From 8d673fa1bf1d578439057f29de6bb19a7820d0a5 Mon Sep 17 00:00:00 2001
From: "Colin J. Brigato" <colin@brigato.fr>
Date: Mon, 3 Sep 2018 00:02:44 +0200
Subject: [PATCH 0001/1938] First pass rewrite of flashmem driver for
 optimization. Lot of changes here. Provides PoC of saving and recalling a tag
 in Standalone mode. Added some printing passthrough to client to azccomodate
 for vt100 eye-candyness. FastREAD mode implemented for flashmem, testable
 from client. Beta but functionnal. Reading the whole flash with 1Kb to 32kb
 buffers was ~730ms, now 380ms Max (even at 24Mhz spi baudrate)

---
 armsrc/Makefile              |  12 +-
 armsrc/Standalone/hf_colin.c | 626 ++++++++++++++++++++++++++++-------
 armsrc/Standalone/hf_colin.h |  22 +-
 armsrc/appmain.c             |  96 ++++--
 armsrc/flashmem.c            | 329 ++++++++++++------
 armsrc/flashmem.h            |  30 +-
 client/cmdflashmem.c         |  16 +-
 client/cmdmain.c             |  26 +-
 8 files changed, 865 insertions(+), 292 deletions(-)

diff --git a/armsrc/Makefile b/armsrc/Makefile
index a0f5c7f5c..fb2a2a91b 100644
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -24,7 +24,7 @@ APP_CFLAGS = -DWITH_CRC \
 			 -DWITH_FLASH \
 			 -DWITH_SMARTCARD \
 			 -DWITH_HFSNOOP \
-			 -DWITH_LF_SAMYRUN \
+			 -DWITH_HF_COLIN \
 			 -fno-strict-aliasing -ffunction-sections -fdata-sections
 
 ### IMPORTANT -  move the commented variable below this line
@@ -106,12 +106,9 @@ ARMSRC = fpgaloader.c \
 	parity.c \
 	usb_cdc.c \
 	cmd.c \
-	lf_samyrun.c \
-    vtsend.c 
-	#	lf_samyrun.c \
-	#	lf_hidbrute.c \
-	#	lf_proxbrute.c \
-	#	hf_mattyrun.c \
+	vtsend.c \
+	hf_colin.c \
+	lib_AT91SAM7.c
 	
 VERSIONSRC = version.c \
 	fpga_version_info.c
@@ -120,7 +117,6 @@ VERSIONSRC = version.c \
 include ../common/Makefile.common
 
 COMMON_FLAGS =  -Os 
-
 OBJS = $(OBJDIR)/fullimage.s19 
 FPGA_COMPRESSOR = ../client/fpga_compress
 
diff --git a/armsrc/Standalone/hf_colin.c b/armsrc/Standalone/hf_colin.c
index 1ba31a9c7..3a34396eb 100644
--- a/armsrc/Standalone/hf_colin.c
+++ b/armsrc/Standalone/hf_colin.c
@@ -12,8 +12,6 @@
 
 #define MF1KSZ 1024
 #define MF1KSZSIZE 64
-//#define FALSE false
-//#define TRUE true
 #define AUTHENTICATION_TIMEOUT 848
 
 uint8_t cjuid[10];
@@ -27,58 +25,328 @@ int curlline;
 
 // Colin's VIGIKPWN sniff/simulate/clone repeat routine for HF Mifare
 
-void cjPrintBigArray(const char *bigar, int len, uint8_t newlines, uint8_t debug) {
+void cjPrintBigArray(const char *bigar, int len, uint8_t newlines, uint8_t debug)
+{
     uint32_t chunksize = (USB_CMD_DATA_SIZE / 4);
     uint8_t totalchunks = len / chunksize;
     uint8_t last_chunksize = len - (totalchunks * chunksize);
     char chunk[chunksize + 1];
     memset(chunk, 0x00, sizeof(chunk));
-    if (debug > 0) {
+    if (debug > 0)
+    {
         Dbprintf("len : %d", len);
         Dbprintf("chunksize : %d bytes", chunksize);
         Dbprintf("totalchunks : %d", totalchunks);
         Dbprintf("last_chunksize: %d", last_chunksize);
     }
-    for (uint8_t i = 0; i < totalchunks; i++) {
+    for (uint8_t i = 0; i < totalchunks; i++)
+    {
         memset(chunk, 0x00, sizeof(chunk));
         memcpy(chunk, &bigar[i * chunksize], chunksize);
         DbprintfEx(FLAG_RAWPRINT, "%s", chunk);
     }
-    if (last_chunksize > 0) {
+    if (last_chunksize > 0)
+    {
         memset(chunk, 0x00, sizeof(chunk));
         memcpy(chunk, &bigar[totalchunks * chunksize], last_chunksize);
         DbprintfEx(FLAG_RAWPRINT, "%s", chunk);
     }
-    if (newlines > 0) {
+    if (newlines > 0)
+    {
         DbprintfEx(FLAG_NOLOG, " ");
     }
 }
 
-void cjSetCursFRight() {
+void cjSetCursFRight()
+{
     vtsend_cursor_position(NULL, 98, (currfline));
     currfline++;
 }
 
-void cjSetCursRight() {
+void cjSetCursRight()
+{
     vtsend_cursor_position(NULL, 59, (currline));
     currline++;
 }
 
-void cjSetCursLeft() {
+void cjSetCursLeft()
+{
     vtsend_cursor_position(NULL, 0, (curlline));
     curlline++;
 }
 
 void cjTabulize() { DbprintfEx(FLAG_RAWPRINT, "\t\t\t"); }
 
-void cjPrintKey(uint64_t key, uint8_t *foundKey, uint16_t sectorNo, uint8_t type) {
+void cjPrintKey(uint64_t key, uint8_t *foundKey, uint16_t sectorNo, uint8_t type)
+{
     char tosendkey[13];
     sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[0], foundKey[1], foundKey[2], foundKey[3], foundKey[4], foundKey[5]);
     cjSetCursRight();
     DbprintfEx(FLAG_NOLOG, "SEC: %02x | KEY : %s | TYP: %d", sectorNo, tosendkey, type);
 }
 
-void RunMod() {
+void SpinOff(uint32_t pause)
+{
+    LED_A_OFF();
+    LED_B_OFF();
+    LED_C_OFF();
+    LED_D_OFF();
+    SpinDelay(pause);
+}
+
+// 0=A, 1=B, 2=C, 3=D
+void SpinErr(uint8_t led, uint32_t speed, uint8_t times)
+{
+    SpinOff(speed);
+    NTIME(times)
+    {
+        switch (led)
+        {
+        case 0:
+            LED_A_INV();
+            break;
+        case 1:
+            LED_B_INV();
+            break;
+        case 2:
+            LED_C_INV();
+            break;
+        case 3:
+            LED_D_INV();
+            break;
+        }
+        SpinDelay(speed);
+    }
+}
+
+void SpinDown(uint32_t speed)
+{
+    SpinOff(speed);
+    LED_D_ON();
+    SpinDelay(speed);
+    LED_D_OFF();
+    LED_C_ON();
+    SpinDelay(speed);
+    LED_C_OFF();
+    LED_B_ON();
+    SpinDelay(speed);
+    LED_B_OFF();
+    LED_A_ON();
+    SpinDelay(speed);
+    LED_A_OFF();
+}
+
+void SpinUp(uint32_t speed)
+{
+    SpinOff(speed);
+    LED_A_ON();
+    SpinDelay(speed);
+    LED_A_OFF();
+    LED_B_ON();
+    SpinDelay(speed);
+    LED_B_OFF();
+    LED_C_ON();
+    SpinDelay(speed);
+    LED_C_OFF();
+    LED_D_ON();
+    SpinDelay(speed);
+    LED_D_OFF();
+}
+
+void TestFlashmemSpeed(size_t buffersize, bool fastmode)
+{
+
+    DbprintfEx(FLAG_NOLOG, "%s---+----[ %s %s[%dKB] %s]", _GREEN_, _WHITE_, _YELLOW_, buffersize / 1024, _WHITE_);
+    uint16_t t = 0;
+
+    LED_B_ON();
+    uint8_t *mem = BigBuf_malloc(buffersize);
+    bool isok = false;
+    size_t len = 0;
+    uint32_t startidx = 0;
+    uint32_t numofbytes = 0x3FFFF;
+
+    if (!FlashInit(fastmode)) {
+        return;
+    }
+    Flash_CheckBusy(BUSY_TIMEOUT);
+
+    //Flash_ReadStat1();
+
+    uint32_t end_time;
+    uint32_t start_time = end_time = GetTickCount();
+
+    for (size_t i = 0; i < numofbytes; i += buffersize)
+    {
+        len = MIN((numofbytes - i), buffersize);
+
+        //isok = Flash_ReadData(startidx + i, mem, len);
+        //uint32_t iend_time;
+        //uint32_t istart_time = iend_time = GetTickCount();
+        if (fastmode)
+        {
+            isok = Flash_FastReadDataCont(startidx + i, mem, len);
+        }
+        else
+        {
+            isok = Flash_ReadDataCont(startidx + i, mem, len);
+        }
+        //iend_time = GetTickCount();
+        //DbprintfEx(FLAG_RAWPRINT, "%s%dms%s>", _YELLOW_, iend_time - istart_time, _WHITE_);
+        //cjSetCursLeft();
+        if (!isok)
+        {
+            Dbprintf("[FAIL] reading flash memory failed ::  | bytes between %d - %d", i, len);
+            return;
+        }
+        //isok = cmd_send(CMD_DOWNLOADED_FLASHMEM, i, len, 0, mem, len);
+        //if (!isok)
+        //	Dbprintf("transfer to client failed ::  | bytes between %d - %d", i, len);
+        t++;
+    }
+    end_time = GetTickCount();
+    DbprintfEx(FLAG_NOLOG, "%s   |--< %s %s%dms%s for FULL_FLASH_READ", _GREEN_, _WHITE_, _YELLOW_, end_time - start_time, _WHITE_);
+    DbprintfEx(FLAG_NOLOG, "%s   `--= %s %d runs of %s~%dms%s each", _GREEN_, _WHITE_, t, _YELLOW_, (end_time - start_time) / t, _WHITE_);
+    DbprintfEx(FLAG_NOLOG, "");
+    //cjSetCursLeft();
+    LED_B_OFF();
+    FlashStop();
+}
+
+void ReadLastTagFromFlash()
+{
+
+    SpinOff(0);
+    LED_A_ON();
+    LED_B_ON();
+    LED_C_ON();
+    LED_D_ON();
+    uint16_t isok = 0;
+    uint32_t startidx = 0;
+    uint16_t len = 1024;
+
+    DbprintfEx(FLAG_NOLOG, "Button HELD ! Using LAST Known TAG for Simulation...");
+    cjSetCursLeft();
+
+    size_t size = len;
+    uint8_t *mem = BigBuf_malloc(size);
+
+    //if (!FlashFastReadInit()){
+    if (!FlashInit(0))
+    {
+        return;
+    }
+    //Flash_ReadStat1();
+
+    uint32_t end_time;
+    uint32_t start_time = end_time = GetTickCount();
+
+    for (size_t i = 0; i < len; i += size)
+    {
+        len = MIN((len - i), size);
+
+        // isok = Flash_FastReadDataCont(startidx + i, mem, len);
+        isok = Flash_ReadDataCont(startidx + i, mem, len);
+        if (isok == len)
+        {
+            //print_result("Chunk: ", mem, len);
+            emlSetMem(mem, 0, 64);
+        }
+        else
+        {
+            DbprintfEx(FLAG_NOLOG, "FlashMem reading failed | %d | %d", len, isok);
+            cjSetCursLeft();
+            SpinOff(100);
+            FlashStop();
+            return;
+        }
+    }
+    end_time = GetTickCount();
+    DbprintfEx(FLAG_NOLOG, "[OK] Last tag recovered from FLASHMEM set to emulator");
+    cjSetCursLeft();
+    DbprintfEx(FLAG_NOLOG, "%s[IN]%s %s%dms%s for TAG_FLASH_READ", _GREEN_, _WHITE_, _YELLOW_, end_time - start_time, _WHITE_);
+    cjSetCursLeft();
+    FlashStop();
+    SpinOff(0);
+    return;
+}
+
+void WriteTagToFlash(uint8_t index, size_t size)
+{
+
+    SpinOff(0);
+    LED_A_ON();
+    LED_B_ON();
+    LED_C_ON();
+    LED_D_ON();
+
+    uint8_t isok = 0;
+    uint16_t res = 0;
+    uint32_t len = size;
+    uint32_t bytes_sent = 0;
+    uint32_t bytes_remaining = len;
+
+    uint8_t data[(size * (16 * 64))/1024];
+    uint8_t buff[PAGESIZE];
+    // cnt = 0;
+    emlGetMem(data, 0, (size * 64)/1024);
+
+    //if (!FlashFastReadInit()){
+    if (!FlashInit(0))
+    {
+        return;
+    }
+    
+    Flash_WriteEnable();
+    Flash_Erase4k(0,0);
+    Flash_CheckBusy(BUSY_TIMEOUT);
+    Flash_WriteEnable();
+
+    uint32_t end_time;
+    uint32_t start_time = end_time = GetTickCount();
+
+    while (bytes_remaining > 0)
+    {
+        uint32_t bytes_in_packet = MIN(FLASH_MEM_BLOCK_SIZE, bytes_remaining);
+
+        memcpy(buff, data + bytes_sent, bytes_in_packet);
+
+        bytes_remaining -= bytes_in_packet;
+        res = Flash_WriteDataCont(bytes_sent + (index * size), buff, bytes_in_packet);
+        bytes_sent += bytes_in_packet;
+
+        isok = (res == bytes_in_packet) ? 1 : 0;
+
+        if (!isok)
+        {
+            DbprintfEx(FLAG_NOLOG, "FlashMem write FAILEd [offset %u]", bytes_sent);
+            cjSetCursLeft();
+            SpinOff(100);
+
+            return;
+        }
+
+        LED_A_INV();
+        LED_B_INV();
+        LED_C_INV();
+        LED_D_INV();
+    }
+    end_time = GetTickCount();
+
+    DbprintfEx(FLAG_NOLOG, "[OK] TAG WRITTEN TO FLASH ! [0-to offset %u]", bytes_sent);
+    cjSetCursLeft();
+    DbprintfEx(FLAG_NOLOG, "%s[IN]%s %s%dms%s for TAG_FLASH_WRITE", _GREEN_, _WHITE_, _YELLOW_, end_time - start_time, _WHITE_);
+    cjSetCursLeft();
+
+    FlashStop();
+
+    SpinOff(0);
+
+    return;
+}
+
+void RunMod()
+{
     currline = 20;
     curlline = 20;
     currfline = 24;
@@ -89,7 +357,7 @@ void RunMod() {
     uint64_t key64;           // Defines current key
     uint8_t *keyBlock = NULL; // Where the keys will be held in memory.
 
-/* VIGIK EXPIRED DUMP FOR STUDY
+    /* VIGIK EXPIRED DUMP FOR STUDY
 Sector 0
 121C7F730208040001FA33F5CB2D021D
 44001049164916491649000000000000
@@ -125,11 +393,11 @@ KEY A : 1KGIV ;
 ACCBITS : 796788[00]+VALUE
 */
 
-//----------------------------
-//   Set of keys to be used.
-//  This should cover ~98% of
-//  French VIGIK system @2017
-//----------------------------
+    //----------------------------
+    //   Set of keys to be used.
+    //  This should cover ~98% of
+    //  French VIGIK system @2017
+    //----------------------------
 
 #define STKEYS 37
 
@@ -177,7 +445,8 @@ ACCBITS : 796788[00]+VALUE
     keyBlock = BigBuf_malloc(STKEYS * 6);
     int mfKeysCnt = sizeof(mfKeys) / sizeof(uint64_t);
 
-    for (int mfKeyCounter = 0; mfKeyCounter < mfKeysCnt; mfKeyCounter++) {
+    for (int mfKeyCounter = 0; mfKeyCounter < mfKeysCnt; mfKeyCounter++)
+    {
         num_to_bytes(mfKeys[mfKeyCounter], 6, (uint8_t *)(keyBlock + mfKeyCounter * 6));
     }
 
@@ -185,10 +454,13 @@ ACCBITS : 796788[00]+VALUE
     //   and why not a simple memset abuse to 0xffize the whole space in one go ?
     // uint8_t foundKey[2][40][6]; //= [ {0xff} ]; /* C99 abusal 6.7.8.21
     uint8_t foundKey[2][40][6];
-    for (uint16_t t = 0; t < 2; t++) {
-        for (uint16_t sectorNo = 0; sectorNo < sectorsCnt; sectorNo++) {
+    for (uint16_t t = 0; t < 2; t++)
+    {
+        for (uint16_t sectorNo = 0; sectorNo < sectorsCnt; sectorNo++)
+        {
             //          validKey[t][sectorNo] = false;
-            for (uint16_t i = 0; i < 6; i++) {
+            for (uint16_t i = 0; i < 6; i++)
+            {
                 foundKey[t][sectorNo][i] = 0xff;
             }
         }
@@ -200,11 +472,6 @@ ACCBITS : 796788[00]+VALUE
     bool allKeysFound = true;
 
     uint32_t size = mfKeysCnt;
-    LED_A_OFF();
-    LED_B_OFF();
-    LED_C_OFF();
-    LED_D_OFF();
-    LED_A_ON();
 
     // banner:
     vtsend_reset(NULL);
@@ -218,7 +485,36 @@ ACCBITS : 796788[00]+VALUE
     currfline = 24;
     cjSetCursLeft();
 
+    SpinDown(50);
+    SpinOff(50);
+    SpinUp(50);
+    SpinOff(50);
+    SpinDown(50);
+
+#if 0
+    DbprintfEx(FLAG_NOLOG, "%s>>%s Will Now Test dumping Full flash [256Kb] (2Mbits)through Bigbuf buffers\n", _GREEN_, _WHITE_);
+    MF_DBGLEVEL = MF_DBG_NONE;
+    DbprintfEx(FLAG_NOLOG, "---------\n%s[A]%s Using NORMAL Reads @Max (24Mhz=MCK/2)\n--------", _GREEN_, _WHITE_);
+    TestFlashmemSpeed(32768,0);
+    TestFlashmemSpeed(16384 + 4096 + 4096,0);
+    TestFlashmemSpeed(16384,0);
+    TestFlashmemSpeed(4096,0);
+    TestFlashmemSpeed(1024,0);
+    SpinDelay(1000);
+    WDT_HIT();
+    DbprintfEx(FLAG_NOLOG, "--------\n%s[B]%s Using FAST Reads @Max (48Mhz=MCK=CPUClock/2=MAXSPI)\n--------", _GREEN_, _WHITE_);
+    TestFlashmemSpeed(32768,1);
+    TestFlashmemSpeed(16384 + 4096 + 4096,1);
+    TestFlashmemSpeed(16384,1);
+    TestFlashmemSpeed(4096,1);
+    TestFlashmemSpeed(1024,1);
+    SpinDelay(1000);
+    WDT_HIT();
+    return;
+#endif
+
 failtag:
+
     vtsend_cursor_position_save(NULL);
     vtsend_set_attribute(NULL, 1);
     vtsend_set_attribute(NULL, 5);
@@ -226,11 +522,32 @@ failtag:
     vtsend_set_attribute(NULL, 0);
 
     iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
-    while (!iso14443a_select_card(cjuid, NULL, &cjcuid, true, 0, true)) {
+    SpinOff(50);
+    LED_A_ON();
+    uint8_t ticker = 0;
+    //while (!BUTTON_PRESS() && !iso14443a_select_card(cjuid, NULL, &cjcuid, true, 0, true))
+    while (!iso14443a_select_card(cjuid, NULL, &cjcuid, true, 0, true))
+    {
         WDT_HIT();
+
+        ticker++;
+        if (ticker % 64 == 0)
+        {
+            LED_A_INV();
+        }
+
+        if (BUTTON_HELD(10) > 0)
+        {
+            WDT_HIT();
+            DbprintfEx(FLAG_NOLOG, "\t\t\t[    READING FLASH   ]");
+            ReadLastTagFromFlash();
+            goto readysim;
+        }
     }
+
+    SpinOff(50);
+
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-    SpinDelay(200);
     vtsend_cursor_position_restore(NULL);
     DbprintfEx(FLAG_NOLOG, "\t\t\t%s[   GOT a Tag !   ]%s", _GREEN_, _WHITE_);
     cjSetCursLeft();
@@ -239,12 +556,16 @@ failtag:
 
     DbprintfEx(FLAG_NOLOG, "\t%sGOT TAG :%s %08x%s", _RED_, _CYAN_, cjcuid, _WHITE_);
 
-    if (cjcuid == 0) {
+    if (cjcuid == 0)
+    {
         cjSetCursLeft();
-
         DbprintfEx(FLAG_NOLOG, "%s>>%s BUG: 0000_CJCUID! Retrying...", _RED_, _WHITE_);
+        SpinErr(0, 100, 8);
         goto failtag;
     }
+
+    SpinOff(50);
+    LED_B_ON();
     cjSetCursRight();
     DbprintfEx(FLAG_NOLOG, "--------+--------------------+-------");
     cjSetCursRight();
@@ -283,31 +604,38 @@ failtag:
     // also we could avoid first UID check for every block
 
     // then let’s expose this “optimal case” of “well known vigik schemes” :
-    for (uint8_t type = 0; type < 2 && !err && !trapped; type++) {
-        for (int sec = 0; sec < sectorsCnt && !err && !trapped; ++sec) {
+    for (uint8_t type = 0; type < 2 && !err && !trapped; type++)
+    {
+        for (int sec = 0; sec < sectorsCnt && !err && !trapped; ++sec)
+        {
             key = cjat91_saMifareChkKeys(sec * 4, type, NULL, size, &keyBlock[0], &key64);
             // key = saMifareChkKeys(sec * 4, type, NULL, size, &keyBlock[0], &key64);
-            if (key == -1) {
+            if (key == -1)
+            {
                 err = 1;
                 allKeysFound = false;
                 // used in “portable” imlementation on microcontroller: it reports back the fail and open the standalone lock
                 // cmd_send(CMD_CJB_FSMSTATE_MENU, 0, 0, 0, 0, 0);
                 break;
-            } else if (key == -2) {
+            }
+            else if (key == -2)
+            {
                 err = 1; // Can't select card.
                 allKeysFound = false;
                 // cmd_send(CMD_CJB_FSMSTATE_MENU, 0, 0, 0, 0, 0);
                 break;
-            } else {
+            }
+            else
+            {
                 /*  BRACE YOURSELF : AS LONG AS WE TRAP A KNOWN KEY, WE STOP CHECKING AND ENFORCE KNOWN SCHEMES */
                 // uint8_t tosendkey[12];
-                char tosendkey[13];
+                char tosendkey[12];
                 num_to_bytes(key64, 6, foundKey[type][sec]);
                 cjSetCursRight();
                 DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %012" PRIx64 " ; TYP: %i", sec, key64, type);
                 /*cmd_send(CMD_CJB_INFORM_CLIENT_KEY, 12, sec, type, tosendkey, 12);*/
-
-                switch (key64) {
+                switch (key64)
+                {
                 /////////////////////////////////////////////////////////
                 // COMMON SCHEME 1  : INFINITRON/HEXACT
                 case 0x484558414354:
@@ -328,7 +656,8 @@ failtag:
                     ;
                     // Type 0 / A first
                     uint16_t t = 0;
-                    for (uint16_t sectorNo = 0; sectorNo < sectorsCnt; sectorNo++) {
+                    for (uint16_t sectorNo = 0; sectorNo < sectorsCnt; sectorNo++)
+                    {
                         num_to_bytes(0x484558414354, 6, foundKey[t][sectorNo]);
                         sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
                                 foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
@@ -474,8 +803,10 @@ failtag:
 
                     // emlClearMem();
                     // A very weak one...
-                    for (uint16_t t = 0; t < 2; t++) {
-                        for (uint16_t sectorNo = 0; sectorNo < sectorsCnt; sectorNo++) {
+                    for (uint16_t t = 0; t < 2; t++)
+                    {
+                        for (uint16_t sectorNo = 0; sectorNo < sectorsCnt; sectorNo++)
+                        {
                             num_to_bytes(key64, 6, foundKey[t][sectorNo]);
                             sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
                                     foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
@@ -509,7 +840,8 @@ failtag:
                     DbprintfEx(FLAG_NOLOG, "%s>>>>>>>>>>>>!*DONE*!<<<<<<<<<<<<<<%s", _GREEN_, _WHITE_);
                     ;
                     t = 0;
-                    for (uint16_t sectorNo = 0; sectorNo < sectorsCnt; sectorNo++) {
+                    for (uint16_t sectorNo = 0; sectorNo < sectorsCnt; sectorNo++)
+                    {
                         num_to_bytes(0x414c41524f4e, 6, foundKey[t][sectorNo]);
                         sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
                                 foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
@@ -519,7 +851,8 @@ failtag:
                         ;
                     }
                     t = 1;
-                    for (uint16_t sectorNo = 0; sectorNo < sectorsCnt; sectorNo++) {
+                    for (uint16_t sectorNo = 0; sectorNo < sectorsCnt; sectorNo++)
+                    {
                         num_to_bytes(0x424c41524f4e, 6, foundKey[t][sectorNo]);
                         sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
                                 foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
@@ -536,21 +869,25 @@ failtag:
         }
     }
 
-    if (!allKeysFound) {
-        // cmd_send(CMD_CJB_FSMSTATE_MENU, 0, 0, 0, 0, 0);
+    if (!allKeysFound)
+    {
         cjSetCursLeft();
         cjTabulize();
         DbprintfEx(FLAG_NOLOG, "%s[ FAIL ]%s\r\n->did not found all the keys :'(", _RED_, _WHITE_);
         cjSetCursLeft();
+        SpinErr(1, 100, 8);
+        SpinOff(100);
         return;
     }
 
     /* Settings keys to emulator */
     emlClearMem();
     uint8_t mblock[16];
-    for (uint8_t sectorNo = 0; sectorNo < sectorsCnt; sectorNo++) {
+    for (uint8_t sectorNo = 0; sectorNo < sectorsCnt; sectorNo++)
+    {
         emlGetMem(mblock, FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 1);
-        for (uint8_t t = 0; t < 2; t++) {
+        for (uint8_t t = 0; t < 2; t++)
+        {
             memcpy(mblock + t * 10, foundKey[t][sectorNo], 6);
         }
         emlSetMem(mblock, FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 1);
@@ -565,27 +902,41 @@ failtag:
 
     DbprintfEx(FLAG_NOLOG, "%s>>%s Filling Emulator <- from A keys...", _YELLOW_, _WHITE_);
     e_MifareECardLoad(sectorsCnt, 0, 0, &filled);
-    if (filled != 1) {
+    if (filled != 1)
+    {
         cjSetCursLeft();
 
         DbprintfEx(FLAG_NOLOG, "%s>>%s W_FAILURE ! %sTrying fallback B keys....", _RED_, _ORANGE_, _WHITE_);
 
         /* no trace, no dbg  */
         e_MifareECardLoad(sectorsCnt, 1, 0, &filled);
-        if (filled != 1) {
+        if (filled != 1)
+        {
             cjSetCursLeft();
 
             DbprintfEx(FLAG_NOLOG, "FATAL:EML_FALLBACKFILL_B");
-            // cmd_send(CMD_CJB_FSMSTATE_MENU, 0, 0, 0, 0, 0);
+            SpinErr(2, 100, 8);
+            SpinOff(100);
             return;
         }
     }
+
     end_time = GetTickCount();
     cjSetCursLeft();
 
     DbprintfEx(FLAG_NOLOG, "%s>>%s Time for VIGIK break :%s%dms%s", _GREEN_, _WHITE_, _YELLOW_, end_time - start_time, _WHITE_);
-    // cmd_send(CMD_CJB_FSMSTATE_MENU, 0, 0, 0, 0, 0);
 
+    vtsend_cursor_position_save(NULL);
+    vtsend_set_attribute(NULL, 1);
+    vtsend_set_attribute(NULL, 5);
+    cjTabulize();
+    DbprintfEx(FLAG_NOLOG, "[    WRITING FLASH   ]");
+    cjSetCursLeft();
+    cjSetCursLeft();
+
+    WriteTagToFlash(0,1024);
+
+readysim:
     // SIM ?
     cjSetCursLeft();
 
@@ -602,12 +953,14 @@ failtag:
 
     cjTabulize();
 
-    vtsend_cursor_position_save(NULL);
-    vtsend_set_attribute(NULL, 1);
-    vtsend_set_attribute(NULL, 5);
     DbprintfEx(FLAG_NOLOG, "[    SIMULATION   ]");
     vtsend_set_attribute(NULL, 0);
-    Mifare1ksim((FLAG_4B_UID_IN_DATA | FLAG_UID_IN_EMUL ), 0, 0, cjuid);
+
+    SpinOff(100);
+    LED_C_ON();
+    Mifare1ksim(FLAG_4B_UID_IN_DATA | FLAG_UID_IN_EMUL, 0, 0, cjuid);
+    LED_C_OFF();
+    SpinOff(50);
     vtsend_cursor_position_restore(NULL);
     DbprintfEx(FLAG_NOLOG, "[   SIMUL ENDED   ]%s", _GREEN_, _WHITE_);
     cjSetCursLeft();
@@ -652,7 +1005,9 @@ failtag:
     DbprintfEx(FLAG_NOLOG, "- [ LA FIN ] -\r\n%s`-> You can take shell back :) ...", _WHITE_);
     cjSetCursLeft();
     vtsend_set_attribute(NULL, 0);
-
+    SpinErr(3, 100, 16);
+    SpinDown(75);
+    SpinOff(100);
     return;
 }
 
@@ -660,7 +1015,8 @@ failtag:
  * - *datain used as error return
  * - tracing is falsed
  */
-void e_MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain) {
+void e_MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)
+{
     MF_DBGLEVEL = MF_DBG_NONE;
 
     uint8_t numSectors = arg0;
@@ -675,9 +1031,6 @@ void e_MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *dat
     byte_t dataoutbuf2[16];
     // uint8_t uid[10];
 
-    LED_A_ON();
-    LED_B_OFF();
-    LED_C_OFF();
     iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
 
     clear_trace();
@@ -686,23 +1039,30 @@ void e_MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *dat
     bool isOK = true;
     // iso14443a_fast_select_card(cjuid, 0);
 
-    if (!iso14443a_select_card(cjuid, NULL, &cjcuid, true, 0, true)) {
+    if (!iso14443a_select_card(cjuid, NULL, &cjcuid, true, 0, true))
+    {
         isOK = false;
         if (MF_DBGLEVEL >= 1)
             DbprintfEx(FLAG_RAWPRINT, "Can't select card");
     }
 
-    for (uint8_t sectorNo = 0; isOK && sectorNo < numSectors; sectorNo++) {
+    for (uint8_t sectorNo = 0; isOK && sectorNo < numSectors; sectorNo++)
+    {
         ui64Key = emlGetKey(sectorNo, keyType);
-        if (sectorNo == 0) {
-            if (isOK && mifare_classic_auth(pcs, cjcuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_FIRST)) {
+        if (sectorNo == 0)
+        {
+            if (isOK && mifare_classic_auth(pcs, cjcuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_FIRST))
+            {
                 isOK = false;
                 if (MF_DBGLEVEL >= 1)
                     DbprintfEx(FLAG_NOLOG, "Sector[%2d]. Auth error", sectorNo);
                 break;
             }
-        } else {
-            if (isOK && mifare_classic_auth(pcs, cjcuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_NESTED)) {
+        }
+        else
+        {
+            if (isOK && mifare_classic_auth(pcs, cjcuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_NESTED))
+            {
                 isOK = false;
                 if (MF_DBGLEVEL >= 1)
                     DbprintfEx(FLAG_NOLOG, "Sector[%2d]. Auth nested error", sectorNo);
@@ -710,29 +1070,38 @@ void e_MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *dat
             }
         }
 
-        for (uint8_t blockNo = 0; isOK && blockNo < NumBlocksPerSector(sectorNo); blockNo++) {
-            if (isOK && mifare_classic_readblock(pcs, cjcuid, FirstBlockOfSector(sectorNo) + blockNo, dataoutbuf)) {
+        for (uint8_t blockNo = 0; isOK && blockNo < NumBlocksPerSector(sectorNo); blockNo++)
+        {
+            if (isOK && mifare_classic_readblock(pcs, cjcuid, FirstBlockOfSector(sectorNo) + blockNo, dataoutbuf))
+            {
                 isOK = false;
                 if (MF_DBGLEVEL >= 1)
                     DbprintfEx(FLAG_NOLOG, "Error reading sector %2d block %2d", sectorNo, blockNo);
                 break;
             };
-            if (isOK) {
+            if (isOK)
+            {
                 *datain = 1;
-                if (blockNo < NumBlocksPerSector(sectorNo) - 1) {
+                if (blockNo < NumBlocksPerSector(sectorNo) - 1)
+                {
                     emlSetMem(dataoutbuf, FirstBlockOfSector(sectorNo) + blockNo, 1);
-                } else { // sector trailer, keep the keys, set only the AC
+                }
+                else
+                { // sector trailer, keep the keys, set only the AC
                     emlGetMem(dataoutbuf2, FirstBlockOfSector(sectorNo) + blockNo, 1);
                     memcpy(&dataoutbuf2[6], &dataoutbuf[6], 4);
                     emlSetMem(dataoutbuf2, FirstBlockOfSector(sectorNo) + blockNo, 1);
                 }
-            } else {
+            }
+            else
+            {
                 *datain = 0;
             }
         }
     }
 
-    if (mifare_classic_halt(pcs, cjcuid)) {
+    if (mifare_classic_halt(pcs, cjcuid))
+    {
         if (MF_DBGLEVEL >= 1)
             DbprintfEx(FLAG_NOLOG, "Halt error");
     };
@@ -741,7 +1110,6 @@ void e_MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *dat
     crypto1_destroy(pcs);
 
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-    LEDsoff();
 
     if (MF_DBGLEVEL >= 2)
         DbpString("EMUL FILL SECTORS FINISHED\n");
@@ -752,7 +1120,8 @@ void e_MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *dat
 /* the chk function is a piwi’ed(tm) check that will try all keys for
 a particular sector. also no tracing no dbg */
 
-int cjat91_saMifareChkKeys(uint8_t blockNo, uint8_t keyType, bool clearTrace, uint8_t keyCount, uint8_t *datain, uint64_t *key) {
+int cjat91_saMifareChkKeys(uint8_t blockNo, uint8_t keyType, bool clearTrace, uint8_t keyCount, uint8_t *datain, uint64_t *key)
+{
     MF_DBGLEVEL = MF_DBG_NONE;
     iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
     set_tracing(false);
@@ -763,40 +1132,41 @@ int cjat91_saMifareChkKeys(uint8_t blockNo, uint8_t keyType, bool clearTrace, ui
     pcs = &mpcs;
     // byte_t isOK = 0;
 
-    for (int i = 0; i < keyCount; ++i) {
-        LEDsoff();
+    for (int i = 0; i < keyCount; ++i)
+    {
 
         /* no need for anticollision. just verify tag is still here */
         // if (!iso14443a_fast_select_card(cjuid, 0)) {
-        if (!iso14443a_select_card(cjuid, NULL, &cjcuid, true, 0, true)) {
+        if (!iso14443a_select_card(cjuid, NULL, &cjcuid, true, 0, true))
+        {
             cjSetCursLeft();
             DbprintfEx(FLAG_NOLOG, "%sFATAL%s : E_MF_LOSTTAG", _RED_, _WHITE_);
             return -1;
         }
 
         uint64_t ui64Key = bytes_to_num(datain + i * 6, 6);
-        if (mifare_classic_auth(pcs, cjcuid, blockNo, keyType, ui64Key, AUTH_FIRST)) {
+        if (mifare_classic_auth(pcs, cjcuid, blockNo, keyType, ui64Key, AUTH_FIRST))
+        {
             uint8_t dummy_answer = 0;
             ReaderTransmit(&dummy_answer, 1, NULL);
             // wait for the card to become ready again
             SpinDelayUs(AUTHENTICATION_TIMEOUT);
             continue;
         }
-        LED_A_ON();
         crypto1_destroy(pcs);
         FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
         *key = ui64Key;
         return i;
     }
-    LED_A_ON();
     crypto1_destroy(pcs);
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 
     return -1;
 }
 
-void saMifareMakeTag(void) {
-    // uint8_t cfail = 0;`
+void saMifareMakeTag(void)
+{
+    uint8_t cfail = 0;
     cjSetCursLeft();
     cjTabulize();
     vtsend_cursor_position_save(NULL);
@@ -808,8 +1178,8 @@ void saMifareMakeTag(void) {
 
     DbprintfEx(FLAG_NOLOG, ">> Write to Special:");
     int flags = 0;
-    LED_A_ON(); // yellow
-    for (int blockNum = 0; blockNum < 16 * 4; blockNum++) {
+    for (int blockNum = 0; blockNum < 16 * 4; blockNum++)
+    {
         uint8_t mblock[16];
         // cnt = 0;
         emlGetMem(mblock, blockNum, 1);
@@ -825,10 +1195,12 @@ void saMifareMakeTag(void) {
         if (blockNum == 16 * 4 - 1)
             flags = 0x04 + 0x10;
 
-        if (saMifareCSetBlock(0, flags & 0xFE, blockNum, mblock)) { //&& cnt <= retry) {
-                                                                    // cnt++;
+        if (saMifareCSetBlock(0, flags & 0xFE, blockNum, mblock))
+        { //&& cnt <= retry) {
+            // cnt++;
             cjSetCursFRight();
-            if (currfline > 53) {
+            if (currfline > 53)
+            {
                 currfline = 54;
             }
             DbprintfEx(FLAG_NOLOG, "Block :%02x %sOK%s", blockNum, _GREEN_, _WHITE_);
@@ -836,14 +1208,16 @@ void saMifareMakeTag(void) {
             //                                                      cfail=1;
             // return;
             continue;
-        } else {
+        }
+        else
+        {
             cjSetCursLeft();
             cjSetCursLeft();
 
             DbprintfEx(FLAG_NOLOG, "`--> %sFAIL%s : CHN_FAIL_BLK_%02x_NOK", _RED_, _WHITE_, blockNum);
             cjSetCursFRight();
             DbprintfEx(FLAG_NOLOG, "%s>>>>%s STOP AT %02x", _RED_, _WHITE_, blockNum);
-
+            cfail++;
             break;
         }
         cjSetCursFRight();
@@ -855,13 +1229,20 @@ void saMifareMakeTag(void) {
                 break;
         } */
     }
+    if (cfail == 0)
+    {
+        SpinUp(50);
+        SpinUp(50);
+        SpinUp(50);
+    }
 }
 
 //-----------------------------------------------------------------------------
 // Matt's StandAlone mod.
 // Work with "magic Chinese" card (email him: ouyangweidaxian@live.cn)
 //-----------------------------------------------------------------------------
-int saMifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain) {
+int saMifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)
+{
 
     // params
     uint8_t needWipe = arg0;
@@ -888,30 +1269,32 @@ int saMifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *data
     uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];
 
     // reset FPGA and LED
-    if (workFlags & 0x08) {
-        LED_A_ON();
-        LED_B_OFF();
-        LED_C_OFF();
+    if (workFlags & 0x08)
+    {
         iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
 
         //  clear_trace();
         set_tracing(FALSE);
     }
 
-    while (true) {
-        // cjSetCursLeft();
+    while (true)
+    {
+        cjSetCursLeft();
 
         // get UID from chip
-        if (workFlags & 0x01) {
+        if (workFlags & 0x01)
+        {
             // if (!iso14443a_fast_select_card(cjuid, 0)) {
 
-            if (!iso14443a_select_card(cjuid, NULL, &cjcuid, true, 0, true)) {
+            if (!iso14443a_select_card(cjuid, NULL, &cjcuid, true, 0, true))
+            {
                 if (MF_DBGLEVEL >= 1)
                     DbprintfEx(FLAG_NOLOG, "Can't select card");
                 break;
             };
 
-            if (mifare_classic_halt(NULL, cjcuid)) {
+            if (mifare_classic_halt(NULL, cjcuid))
+            {
                 if (MF_DBGLEVEL >= 1)
                     DbprintfEx(FLAG_NOLOG, "Halt error");
                 break;
@@ -919,22 +1302,26 @@ int saMifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *data
         };
 
         // reset chip
-        if (needWipe) {
+        if (needWipe)
+        {
             ReaderTransmitBitsPar(wupC1, 7, 0, NULL);
-            if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
+            if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a))
+            {
                 // if (MF_DBGLEVEL >= 1)
                 DbprintfEx(FLAG_NOLOG, "wupC1 error");
                 break;
             };
 
             ReaderTransmit(wipeC, sizeof(wipeC), NULL);
-            if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
+            if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a))
+            {
                 if (MF_DBGLEVEL >= 1)
                     DbprintfEx(FLAG_NOLOG, "wipeC error");
                 break;
             };
 
-            if (mifare_classic_halt(NULL, cjcuid)) {
+            if (mifare_classic_halt(NULL, cjcuid))
+            {
                 if (MF_DBGLEVEL >= 1)
                     DbprintfEx(FLAG_NOLOG, "Halt error");
                 break;
@@ -943,39 +1330,46 @@ int saMifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *data
 
         // chaud
         // write block
-        if (workFlags & 0x02) {
+        if (workFlags & 0x02)
+        {
             ReaderTransmitBitsPar(wupC1, 7, 0, NULL);
-            if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
+            if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a))
+            {
                 // if (MF_DBGLEVEL >= 1)
                 DbprintfEx(FLAG_NOLOG, "wupC1 error");
                 break;
             };
 
             ReaderTransmit(wupC2, sizeof(wupC2), NULL);
-            if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
+            if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a))
+            {
                 // if (MF_DBGLEVEL >= 1)
                 DbprintfEx(FLAG_NOLOG, "wupC2 errorv");
                 break;
             };
         }
 
-        if ((mifare_sendcmd_short(NULL, 0, 0xA0, blockNo, receivedAnswer, receivedAnswerPar, NULL) != 1) || (receivedAnswer[0] != 0x0a)) {
+        if ((mifare_sendcmd_short(NULL, 0, 0xA0, blockNo, receivedAnswer, receivedAnswerPar, NULL) != 1) || (receivedAnswer[0] != 0x0a))
+        {
             // if (MF_DBGLEVEL >= 1)
             DbprintfEx(FLAG_NOLOG, "write block send command error");
             break;
         };
 
         memcpy(d_block, datain, 16);
-	AddCrc14A(d_block,16);
+        AddCrc14A(d_block, 16);
         ReaderTransmit(d_block, sizeof(d_block), NULL);
-        if ((ReaderReceive(receivedAnswer, receivedAnswerPar) != 1) || (receivedAnswer[0] != 0x0a)) {
+        if ((ReaderReceive(receivedAnswer, receivedAnswerPar) != 1) || (receivedAnswer[0] != 0x0a))
+        {
             // if (MF_DBGLEVEL >= 1)
             DbprintfEx(FLAG_NOLOG, "write block send data error");
             break;
         };
 
-        if (workFlags & 0x04) {
-            if (mifare_classic_halt(NULL, cjcuid)) {
+        if (workFlags & 0x04)
+        {
+            if (mifare_classic_halt(NULL, cjcuid))
+            {
                 // if (MF_DBGLEVEL >= 1)
                 cjSetCursFRight();
 
@@ -988,12 +1382,10 @@ int saMifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *data
         break;
     }
 
-    if ((workFlags & 0x10) || (!isOK)) {
+    if ((workFlags & 0x10) || (!isOK))
+    {
         FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-        LEDsoff();
     }
 
     return isOK;
 }
-
-
diff --git a/armsrc/Standalone/hf_colin.h b/armsrc/Standalone/hf_colin.h
index 83c152095..29f8f52e6 100644
--- a/armsrc/Standalone/hf_colin.h
+++ b/armsrc/Standalone/hf_colin.h
@@ -16,18 +16,21 @@
 #ifndef __HF_COLIN_H
 #define __HF_COLIN_H
 
-#include <stdbool.h>    	// for bool
-#include <stdio.h>
-#include <string.h>
-#include "standalone.h" 	// standalone definitions
+
 #include "proxmark3.h"
 #include "mifareutil.h"
 #include "iso14443a.h"
+//#include "printf.h"
 #include "protocols.h"
 #include "util.h"
+#include "standalone.h" // standalone definitions
+#include <stdbool.h>    // for bool
+#include <stdio.h>
+#include <string.h>
+//#include <stdio.h>
 #include "vtsend.h"
 #include "apps.h"
-#include "usb_cmd.h"		// mifare1ksim flags
+#include "printf.h"
 
 #define _RED_ "\x1b[31m"
 #define _GREEN_ "\x1b[32m"
@@ -38,14 +41,19 @@
 #define _WHITE_ "\x1b[0m"
 #define _ORANGE_ _YELLOW_
 
+#define NTIME(n) for (int _index = 0; _index < n; _index++)
+
 int cjat91_saMifareChkKeys(uint8_t blockNo, uint8_t keyType, bool clearTrace, uint8_t keyCount, uint8_t *datain, uint64_t *key);
 void e_MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain);
 void saMifareMakeTag(void);
 int saMifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain);
 void cjPrintBigArray(const char *bigar, int len, uint8_t newlines, uint8_t debug);
+void WriteTagToFlash(uint8_t index, size_t size);
 
 const char clearTerm[8] = {0x1b, 0x5b, 0x48, 0x1b, 0x5b, 0x32, 0x4a, '\0'};
 
+
+
 #define LOGO logo_kigiv
 
 const char sub_banner[] = "                                          From Vigik : \"20 years of (un)security without a single update\"";
@@ -410,7 +418,7 @@ const char logo_kigiv[] = {
     0x38, 0x3b, 0x35, 0x3b, 0x35, 0x39, 0x6d, 0x31, 0x1b, 0x5b, 0x33, 0x38, 0x3b, 0x35, 0x3b, 0x35, 0x39, 0x6d, 0x31, 0x0d, 0x0a};
 unsigned int logo_kigiv_len = 9303;
 
-const char logo_kigiv_nocolor[] = {
+/*const char logo_kigiv_nocolor[] = {
     0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x30, 0x30, 0x30, 0x30, 0x20, 0x20,
     0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
     0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
@@ -494,6 +502,6 @@ const char logo_kigiv_nocolor[] = {
     0x30, 0x31, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x31, 0x31, 0x30, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x30, 0x31, 0x31,
     0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x31, 0x30, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
     0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x31, 0x31, 0x30, 0x31, 0x31, 0x0d, 0x0a};
-unsigned int logo_kigiv_nocolor_len = 2153;
+unsigned int logo_kigiv_nocolor_len = 2153;*/
 
 #endif /* __HF_COLIN_H */
diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index c6e6e0dee..b0538383e 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -33,10 +33,6 @@
 #include "i2c.h"
 #endif
 
-#ifdef WITH_FPC
-#include "usart.h"
-#endif
-
 //=============================================================================
 // A buffer where we can queue things up to be sent through the FPGA, for
 // any purpose (fake tag, as reader, whatever). We go MSB first, since that
@@ -78,26 +74,24 @@ void PrintToSendBuffer(void) {
 }
 
 void print_result(char *name, uint8_t *buf, size_t len) {
-
 	uint8_t *p = buf;
-	uint16_t tmp = len & 0xFFF0;
 
-	for(; p-buf < tmp; p += 16) {
-		Dbprintf("[%s: %02d/%02d] %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x",
+	if ( len % 16 == 0 ) {
+		for(; p-buf < len; p += 16)
+			Dbprintf("[%s:%d/%d] %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x",
 				name,
 				p-buf,
 				len,
 				p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7],p[8], p[9], p[10], p[11], p[12], p[13], p[14], p[15]
 			);
 	}
-	if (len % 16 != 0) {
-		char s[46] = {0};
-		char *sp = s;
-		for (; p-buf < len; p++ ) {
-			sprintf(sp, "%02x ", p[0] );
-			sp += 3;
-		}
-		Dbprintf("[%s: %02d/%02d] %s", name, p-buf, len, s);
+	else {
+		for(; p-buf < len; p += 8)
+			Dbprintf("[%s:%d/%d] %02x %02x %02x %02x %02x %02x %02x %02x",
+				name,
+				p-buf,
+				len,
+				p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7]);
 	}
 }
 
@@ -107,7 +101,7 @@ void print_result(char *name, uint8_t *buf, size_t len) {
 
 void DbpStringEx(char *str, uint32_t cmd) {
 #if DEBUG
-	uint8_t len = strlen(str);
+	byte_t len = strlen(str);
 	cmd_send(CMD_DEBUG_PRINT_STRING, len, cmd, 0, (byte_t*)str, len);
 #endif	
 }
@@ -119,7 +113,7 @@ void DbpString(char *str) {
 }
 
 #if 0
-void DbpIntegers(int x1, int x2, int x3) {
+void DbpIntegers(inst x1, int x2, int x3) {
 	cmd_send(CMD_DEBUG_PRINT_INTEGERS,x1,x2,x3,0,0);
 }
 #endif
@@ -440,7 +434,7 @@ void printStandAloneModes(void) {
 	DbpString("   LF HID corporate 1000 bruteforce - (Federico dotta & Maurizio Agazzini)");
 #endif 
 #if defined(WITH_HF_MATTYRUN)
-	DbpString("   HF Mifare sniff/clone - aka MattyRun (Mat�as A. R� Medina)");
+	DbpString("   HF Mifare sniff/clone - aka MattyRun (Mat�as A. R� Medina)");
 #endif 
 #if defined(WITH_HF_COLIN)
     DbpString("   HF Mifare ultra fast sniff/sim/clone - aka VIGIKPWN (Colin Brigato)");
@@ -448,7 +442,6 @@ void printStandAloneModes(void) {
 	
 	//DbpString("Running ");	
 	//Dbprintf("  Is Device attached to USB| %s", USB_ATTACHED() ? "Yes" : "No"); 
-	//Dbprintf("  Is Device attached to FPC| %s", 0 ? "Yes" : "No"); 
 	//Dbprintf("  Is USB_reconnect value   | %d", GetUSBreconnect() );
 	//Dbprintf("  Is USB_configured value  | %d", GetUSBconfigured() );
 	
@@ -1077,7 +1070,6 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 #endif
 		case CMD_BUFF_CLEAR:
 			BigBuf_Clear();
-			BigBuf_free();
 			break;
 
 		case CMD_MEASURE_ANTENNA_TUNING:
@@ -1114,7 +1106,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 				len = MIN( (numofbytes - i), USB_CMD_DATA_SIZE);
 				isok = cmd_send(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K, i, len, BigBuf_get_traceLen(), mem + startidx + i, len);
 				if (!isok) 
-					Dbprintf("transfer to client failed ::  | bytes between %d - %d (%d)", i, i+len, len);
+					Dbprintf("transfer to client failed ::  | bytes between %d - %d", i, len);
 			}
 			// Trigger a finish downloading signal with an ACK frame
 			// iceman,  when did sending samplingconfig array got attached here?!?
@@ -1160,7 +1152,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 				len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);
 				isok = cmd_send(CMD_DOWNLOADED_EML_BIGBUF, i, len, 0, mem + startidx + i, len);
 				if (!isok) 
-					Dbprintf("transfer to client failed ::  | bytes between %d - %d (%d)", i, i+len, len);
+					Dbprintf("transfer to client failed ::  | bytes between %d - %d", i, len);
 			}
 			// Trigger a finish downloading signal with an ACK frame
 			cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
@@ -1177,6 +1169,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 			uint16_t isok = 0;
 			uint32_t startidx = c->arg[0];
 			uint16_t len = c->arg[1];
+			uint8_t fast = c->arg[2];
 			
 			Dbprintf("FlashMem read | %d - %d", startidx, len);
 			
@@ -1184,14 +1177,23 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 			
 			uint8_t *mem = BigBuf_malloc(size);
 	
+
+			if (fast) {
+				FlashInit(1);
+				//FlashInit();
+				Flash_CheckBusy(BUSY_TIMEOUT);
+			}
 			for(size_t i = 0; i < len; i += size) {
 				len = MIN((len - i), size);
 				
-				memset(mem, 0, len);
-				
 				Dbprintf("FlashMem reading  | %d | %d | %d", startidx + i, i, len);
 				
+				if (!fast){
 				isok = Flash_ReadData(startidx + i, mem, len);
+				}
+				if (fast){
+				isok =	Flash_FastReadDataCont(startidx + i, mem, len);
+				}
 				if ( isok == len ) {
 					print_result("Chunk: ", mem, len);
 				} else {
@@ -1199,6 +1201,9 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 					break;
 				}
 			}
+			if (fast){
+				FlashStop();
+			}
 			LED_B_OFF();
 			break;
 		}
@@ -1271,21 +1276,36 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 			size_t len = 0;
 			uint32_t startidx = c->arg[0];
 			uint32_t numofbytes = c->arg[1];
+			uint8_t fast = c->arg[2];
+
 			// arg0 = startindex
 			// arg1 = length bytes to transfer
 			// arg2 = RFU
+
+
+			if (fast) {
+				FlashInit(1);
+				//FlashInit();
+				Flash_CheckBusy(BUSY_TIMEOUT);
+			}
 			for (size_t i = 0; i < numofbytes; i += USB_CMD_DATA_SIZE) {
 				len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);
-				
+				if (!fast){
 				isok = Flash_ReadData(startidx + i, mem, len);
+				}
+				if (fast){
+				isok =	Flash_FastReadDataCont(startidx + i, mem, len);
+				}
 				if (!isok )
 					Dbprintf("reading flash memory failed ::  | bytes between %d - %d", i, len);
 				
 				isok = cmd_send(CMD_DOWNLOADED_FLASHMEM, i, len, 0, mem, len);
 				if (!isok) 
-					Dbprintf("transfer to client failed ::  | bytes between %d - %d (%d)", i, i+len, len);
+					Dbprintf("transfer to client failed ::  | bytes between %d - %d", i, len);
+			}
+			if (fast){
+				FlashStop();
 			}
-
 			cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
 			LED_B_OFF();
 			break;
@@ -1297,7 +1317,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 			
 			bool isok = Flash_ReadData(FLASH_MEM_SIGNATURE_OFFSET, info->signature, FLASH_MEM_SIGNATURE_LEN);
 
-			if (FlashInit()) {
+			if (FlashInit(0)) {
 				Flash_UniqueID( info->flashid);
 				FlashStop();
 			}
@@ -1392,8 +1412,6 @@ void  __attribute__((noreturn)) AppMain(void) {
 
 	LEDsoff();
 	
-    usb_enable();
-
 	// The FPGA gets its clock from us from PCK0 output, so set that up.
 	AT91C_BASE_PIOA->PIO_BSR = GPIO_PCK0;
 	AT91C_BASE_PIOA->PIO_PDR = GPIO_PCK0;
@@ -1419,16 +1437,22 @@ void  __attribute__((noreturn)) AppMain(void) {
 	StartTickCount();
   	
 #ifdef WITH_LCD
-	LCDInit();
+//	LCDInit();
 #endif
 
 #ifdef WITH_SMARTCARD
-	I2C_init();
+//	I2C_init();
 #endif
 
 #ifdef WITH_FPC
-	usart_init();
+//	usart_init();
 #endif	
+
+	// This is made as late as possible to ensure enumeration without timeout
+	// against device such as http://www.hobbytronics.co.uk/usb-host-board-v2 
+	usb_disable();
+	usb_enable();
+
 	uint8_t rx[sizeof(UsbCommand)];
    
 	for(;;) {
@@ -1464,6 +1488,10 @@ void  __attribute__((noreturn)) AppMain(void) {
 			RunMod();
 #endif
 
+			// when here,  we are no longer in standalone mode.
+			// reseting the variables which keeps track of usb re-attached/configured
+			//SetUSBreconnect(0);
+			//SetUSBconfigured(0);
 		}
 	}
 }
diff --git a/armsrc/flashmem.c b/armsrc/flashmem.c
index 7c5beb47a..b5786fbe9 100644
--- a/armsrc/flashmem.c
+++ b/armsrc/flashmem.c
@@ -1,39 +1,43 @@
 #include "flashmem.h"
 
+
+#define MCK 48000000
+//#define FLASH_BAUD 24000000
+//define FLASH_BAUD 33000000
+#define FLASH_BAUD MCK/2
+#define FLASH_FASTBAUD MCK
+
 /* here: use NCPS2 @ PA10: */
-#define SPI_CSR_NUM      2          		// Chip Select register[] 0,1,2,3  (at91samv512 has 4)
-
-/* PCS_0 for NPCS0, PCS_1 for NPCS1 ... */
-#define PCS_0  ((0<<0)|(1<<1)|(1<<2)|(1<<3)) // 0xE - 1110
-#define PCS_1  ((1<<0)|(0<<1)|(1<<2)|(1<<3)) // 0xD - 1101
-#define PCS_2  ((1<<0)|(1<<1)|(0<<2)|(1<<3)) // 0xB - 1011
-#define PCS_3  ((1<<0)|(1<<1)|(1<<2)|(0<<3)) // 0x7 - 0111
-
-// TODO
-#if (SPI_CSR_NUM == 0)
-#define SPI_MR_PCS       PCS_0
-#elif (SPI_CSR_NUM == 1)
-#define SPI_MR_PCS       PCS_1
-#elif (SPI_CSR_NUM == 2)
-#define SPI_MR_PCS       PCS_2
-#elif (SPI_CSR_NUM == 3)
-#define SPI_MR_PCS       PCS_3
-#else
-#error "SPI_CSR_NUM invalid"
-// not realy - when using an external address decoder...
-// but this code takes over the complete SPI-interace anyway
-#endif
+#define SPI_CSR_NUM      2
+#define SPI_PCS(npcs)       ((~(1 << (npcs)) & 0xF) << 16)
+/// Calculates the value of the CSR SCBR field given the baudrate and MCK.
+#define SPI_SCBR(baudrate, masterClock) ((uint32_t) ((masterClock) / (baudrate)) << 8) 
+/// Calculates the value of the CSR DLYBS field given the desired delay (in ns)
+#define SPI_DLYBS(delay, masterClock) ((uint32_t) ((((masterClock) / 1000000) * (delay)) / 1000) << 16) 
+/// Calculates the value of the CSR DLYBCT field given the desired delay (in ns)
+#define SPI_DLYBCT(delay, masterClock) ((uint32_t) ((((masterClock) / 1000000) * (delay)) / 32000) << 24)
 
 
-/*
-	��ȡָ����Դ�һ��λ�ÿ�ʼ�����Ķ�������ܽ�����оƬ��ȡ��
-	ҳдָ�ÿ��д��Ϊ1-256�ֽڣ����Dz��ܿ�Խ256�ֽڱ߽�
-	����ָ�����ָ�����뽫CS���ߣ����򲻻�ִ��
-*/
 
-void FlashSetup(void) {
-	// PA1	-> SPI_NCS3 chip select (MEM)
-	// PA10 -> SPI_NCS2 chip select (LCD)
+//	initialize
+bool FlashInit(bool fast) {
+	FlashSetup(fast);
+
+	StartTicks();
+
+	if (Flash_CheckBusy(BUSY_TIMEOUT)) {
+		StopTicks();
+		return false;
+	}
+
+	return true;
+}
+
+void FlashSetup(bool fast){
+   //WDT_DISABLE
+    AT91C_BASE_WDTC->WDTC_WDMR = AT91C_WDTC_WDDIS;
+
+	// PA10 -> SPI_NCS2 chip select (FLASHMEM)
 	// PA11 -> SPI_NCS0 chip select (FPGA)
 	// PA12 -> SPI_MISO Master-In Slave-Out
 	// PA13 -> SPI_MOSI Master-Out Slave-In
@@ -54,27 +58,71 @@ void FlashSetup(void) {
 	//enable the SPI Peripheral clock
 	AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_SPI);
 
+
+	//reset spi needs double SWRST, see atmel's errata on this case
+	AT91C_BASE_SPI->SPI_CR = AT91C_SPI_SWRST;
+	AT91C_BASE_SPI->SPI_CR = AT91C_SPI_SWRST;
+
 	// Enable SPI
 	AT91C_BASE_SPI->SPI_CR = AT91C_SPI_SPIEN;
 
 	//	NPCS2 Mode 0
 	AT91C_BASE_SPI->SPI_MR =
-		( 0 << 24)	|		// Delay between chip selects (take default: 6 MCK periods)
-		(0xB << 16)	|		// Peripheral Chip Select (selects SPI_NCS2 or PA10)
-		( 0 << 7)	|		// Local Loopback Disabled
-		( 1 << 4)	|		// Mode Fault Detection disabled
-		( 0 << 2)	|		// Chip selects connected directly to peripheral
-		( 0 << 1) 	|		// Fixed Peripheral Select
-		( 1 << 0);			// Master Mode
+		(0 << 24)	|		// Delay between chip selects = DYLBCS/MCK BUT: 
+		                    // If DLYBCS is less than or equal to six, six MCK periods
+		            	    // will be inserted by default.
+		SPI_PCS(SPI_CSR_NUM) | 		// Peripheral Chip Select (selects SPI_NCS2 or PA10)
+		( 0 << 7)	|		// Disable LLB (1=MOSI2MISO test mode)
+		( 1 << 4)	|		// Disable ModeFault Protection
+		( 0 << 3)  |        // makes spi operate at MCK (1 is MCK/2)
+ 		( 0 << 2)	|		// Chip selects connected directly to peripheral
+		AT91C_SPI_PS_FIXED 	|		// Fixed Peripheral Select
+		AT91C_SPI_MSTR;			// Master Mode
+
+	int baudrate = FLASH_BAUD;
+	uint8_t csaat = 1;
+	int dlybct = 0;
+    if (fast) {
+		baudrate = 	FLASH_FASTBAUD;
+		//csaat = 0;
+		dlybct = MCK/32;
+	}
 
-	//	8 bit
 	AT91C_BASE_SPI->SPI_CSR[2] =
-		( 0 << 24)	|		// Delay between Consecutive Transfers (32 MCK periods)
-		( 0 << 16)	|		// Delay Before SPCK (1 MCK period)
-		( 6 << 8)	|		// Serial Clock Baud Rate (baudrate = MCK/6 = 24Mhz/6 = 4M baud
-		( 0 << 4)	|		// Bits per Transfer (8 bits)
-		( 1 << 3)	|		// Chip Select inactive after transfer
-		( 1 << 1)	|		// Clock Phase data captured on leading edge, changes on following edge
+        SPI_DLYBCT(dlybct,MCK)		| // Delay between Consecutive Transfers (32 MCK periods)
+		SPI_DLYBS(0,MCK)		| // Delay Beforce SPCK CLock		
+		SPI_SCBR(baudrate,MCK)	| // SPI Baudrate Selection
+		AT91C_SPI_BITS_8		|	  // Bits per Transfer (8 bits)
+		//AT91C_SPI_CSAAT	|	// Chip Select inactive after transfer 
+							// 40.4.6.2 SPI: Bad tx_ready Behavior when CSAAT = 1 and SCBR = 1
+							// If the SPI is programmed with CSAAT = 1, SCBR(baudrate) = 1 and two transfers are performed consecutively on
+							// the same slave with an IDLE state between them, the tx_ready signal does not rise after the second data has been
+							// transferred in the shifter. This can imply for example, that the second data is sent twice.
+							// COLIN :: For now we STILL use CSAAT=1 to avoid having to (de)assert  NPCS manually via PIO lines and we deal with delay
+		( csaat << 3) |
+/* Spi modes:
+Mode 	CPOL 	CPHA  NCPHA
+0 	0 	0     1       clock normally low    read on rising edge
+1 	0 	1     0       clock normally low    read on falling edge
+2 	1 	0     1       clock normally high   read on falling edge
+3 	1 	1     0       clock normally high   read on rising edge
+However, page 512 of the AT91SAM7Sx datasheet say "Note that in SPI
+master mode the ATSAM7S512/256/128/64/321/32 does not sample the data
+(MISO) on the opposite edge where data clocks out (MOSI) but the same
+edge is used as shown in Figure 36-3 and Figure 36-4."  Figure 36-3
+shows that CPOL=NCPHA=0 or CPOL=NCPHA=1 samples on the rising edge and
+that the data changes sometime after the rising edge (about 2 ns).  To
+be consistent with normal SPI operation, it is probably safe to say
+that the data changes on the falling edge and should be sampled on the
+rising edge.  Therefore, it appears that NCPHA should be treated the
+same as CPHA.  Thus:
+Mode	CPOL	CPHA	NCPHA
+0	0	0     0       clock normally low    read on rising edge
+1	0 	1     1       clock normally low    read on falling edge
+2	1 	0     0       clock normally high   read on falling edge
+3	1 	1     1       clock normally high   read on rising edge
+*/
+		( 0 << 1)	|		// Clock Phase data captured on leading edge, changes on following edge
 		( 0 << 0);			// Clock Polarity inactive state is logic 0
 
 	//	read first, empty buffer
@@ -82,6 +130,7 @@ void FlashSetup(void) {
 }
 
 void FlashStop(void) {
+	//Bof
 	//* Reset all the Chip Select register
     AT91C_BASE_SPI->SPI_CSR[0] = 0;
     AT91C_BASE_SPI->SPI_CSR[1] = 0;
@@ -104,24 +153,21 @@ void FlashStop(void) {
 
 //	send one byte over SPI
 uint16_t FlashSendByte(uint32_t data) {	
-	uint16_t incoming = 0;
-
-	WDT_HIT();
 
 	// wait until SPI is ready for transfer
-	while ((AT91C_BASE_SPI->SPI_SR & AT91C_SPI_TXEMPTY) == 0) {};
+	//if you are checking for incoming data returned then the TXEMPTY flag is redundant
+	//while ((AT91C_BASE_SPI->SPI_SR & AT91C_SPI_TXEMPTY) == 0) {};
 
 	// send the data
 	AT91C_BASE_SPI->SPI_TDR = data;
 
+    while ((AT91C_BASE_SPI->SPI_SR & AT91C_SPI_TDRE) == 0){};
+
 	// wait recive transfer is complete
-	while ((AT91C_BASE_SPI->SPI_SR & AT91C_SPI_RDRF) == 0)
-		WDT_HIT();
+	while ((AT91C_BASE_SPI->SPI_SR & AT91C_SPI_RDRF) == 0);
 
 	// reading incoming data
-	incoming = ((AT91C_BASE_SPI->SPI_RDR) & 0xFFFF);
-
-	return incoming;
+	return ((AT91C_BASE_SPI->SPI_RDR) & 0xFFFF);
 }
 
 //	send last byte over SPI
@@ -132,41 +178,35 @@ uint16_t FlashSendLastByte(uint32_t data) {
 //	read state register 1
 uint8_t Flash_ReadStat1(void) {
 	FlashSendByte(READSTAT1);
-	uint8_t stat1 = FlashSendLastByte(0xFF);
-//	if ( MF_DBGLEVEL > 3 )  Dbprintf("stat1 [%02x]", stat1);
-	return stat1;
+	return FlashSendLastByte(0xFF);	
 }
 
-// read state register 2
-uint8_t Flash_ReadStat2(void) {
-	FlashSendByte(READSTAT2);
-	uint8_t stat2 = FlashSendLastByte(0xFF);
-//	if ( MF_DBGLEVEL > 3 ) Dbprintf("stat2 [%02x]", stat2);
-	return stat2;
-}
+bool Flash_CheckBusy(uint32_t timeout)
+{
+	WaitUS(WINBOND_WRITE_DELAY);
+	StartCountUS();
+	uint32_t _time = GetCountUS();
 
-// determine whether FLASHMEM is busy
-bool Flash_CheckBusy(uint16_t times) {
-	bool ret = (Flash_ReadStat1() & BUSY);
+	do
+	{
+		if (!(Flash_ReadStat1() & BUSY))
+		{
+			return false;
+		}
+	} while ((GetCountUS() - _time) < timeout);
 
-	if (!ret || !times || !(times--))
-		return ret;
-
-	while (times) {
-		WDT_HIT();
-		SpinDelay(1);
-		ret = (Flash_ReadStat1() & BUSY);
-		if (!ret)
-			break;
-		times--;
+	if (timeout <= (GetCountUS() - _time))
+	{
+		return true;
 	}
-	return ret;
+
+	return false;
 }
 
 // read ID out
 uint8_t Flash_ReadID(void) {
 
-	if (Flash_CheckBusy(100)) return 0;
+	if (Flash_CheckBusy(BUSY_TIMEOUT)) return 0;
 
 	// Manufacture ID / device ID
 	FlashSendByte(ID);
@@ -188,7 +228,7 @@ uint8_t Flash_ReadID(void) {
 // read unique id for chip.
 void Flash_UniqueID(uint8_t *uid) {
 
-	if (Flash_CheckBusy(100)) return;
+	if (Flash_CheckBusy(BUSY_TIMEOUT)) return;
 
 	// reading unique serial number
 	FlashSendByte(UNIQUE_ID);
@@ -209,12 +249,10 @@ void Flash_UniqueID(uint8_t *uid) {
 
 uint16_t Flash_ReadData(uint32_t address, uint8_t *out, uint16_t len) {
 	
-	if (!FlashInit()) return 0;
-	
-	Flash_ReadStat1();
-	
+	if (!FlashInit(0)) return 0;
+		
 	// length should never be zero
-	if (!len || Flash_CheckBusy(100)) return 0;
+	if (!len || Flash_CheckBusy(BUSY_TIMEOUT)) return 0;
 
 	FlashSendByte(READDATA);
 	FlashSendByte((address >> 16) & 0xFF);
@@ -231,6 +269,55 @@ uint16_t Flash_ReadData(uint32_t address, uint8_t *out, uint16_t len) {
 	return len;	
 }
 
+/* This ensure we can ReadData without having to cycle through initialization everytime */
+uint16_t Flash_ReadDataCont(uint32_t address, uint8_t *out, uint16_t len) {
+	
+	// length should never be zero
+	if (!len) return 0;
+
+	FlashSendByte(READDATA);
+	FlashSendByte((address >> 16) & 0xFF);
+	FlashSendByte((address >> 8) & 0xFF);
+	FlashSendByte((address >> 0) & 0xFF);
+
+	uint16_t i = 0;
+	for (; i < (len - 1); i++)
+		out[i] = FlashSendByte(0xFF);
+
+	out[i] = FlashSendLastByte(0xFF);
+	
+	return len;	
+}
+
+uint16_t Flash_FastReadDataCont(uint32_t address, uint8_t *out, uint16_t len) {
+	
+	// length should never be zero
+	if (!len) return 0;
+
+	//if (Flash_CheckBusy(BUSY_TIMEOUT))
+	//{return 0;}
+
+	FlashSendByte(FASTREAD);
+	FlashSendByte((address >> 16) & 0xFF);
+	FlashSendByte((address >> 8) & 0xFF);
+	FlashSendByte((address >> 0) & 0xFF);
+	FlashSendByte(0xFF);
+	//Flash_CheckBusy(BUSY_TIMEOUT);
+
+
+	uint16_t i = 0;
+	for (; i < (len - 1); i++)
+		out[i] = FlashSendByte(0xFF);
+
+	out[i] = FlashSendLastByte(0xFF);
+	
+	return len;	
+}
+
+
+
+////////////////////////////////////////
+
 // Write data can only program one page. A page has 256 bytes. 
 // if len > 256, it might wrap around and overwrite pos 0.
 uint16_t Flash_WriteData(uint32_t address, uint8_t *in, uint16_t len) {
@@ -251,12 +338,13 @@ uint16_t Flash_WriteData(uint32_t address, uint8_t *in, uint16_t len) {
 		return 0;
 	}
 
-	if (!FlashInit()) {
+	if (!FlashInit(0)) {
 		if ( MF_DBGLEVEL > 3 ) Dbprintf("Flash_WriteData init fail");
 		return 0;
 	}
 	
-	Flash_ReadStat1();
+	Flash_CheckBusy(BUSY_TIMEOUT);
+	//Flash_ReadStat1();
 
 	Flash_WriteEnable();
 	
@@ -275,22 +363,61 @@ uint16_t Flash_WriteData(uint32_t address, uint8_t *in, uint16_t len) {
 	return len;	
 }
 
+uint16_t Flash_WriteDataCont(uint32_t address, uint8_t *in, uint16_t len) {
+
+	// length should never be zero
+	if (!len)
+		return 0;
+	
+	//	Max 256 bytes write
+	if (((address & 0xFF) + len) > 256) {
+		Dbprintf("Flash_WriteData 256 fail [ 0x%02x ] [ %u ]", (address & 0xFF)+len, len );
+		return 0;
+	}
+	
+	// out-of-range
+	if ( (( address >> 16 ) & 0xFF ) > MAX_BLOCKS) {
+		Dbprintf("Flash_WriteData,  block out-of-range");
+		return 0;
+	}
+
+
+	//Flash_CheckBusy(100);
+	//SpinDelay(1);
+	Flash_CheckBusy(BUSY_TIMEOUT);
+	//Flash_ReadStat1();
+    Flash_WriteEnable();
+
+	FlashSendByte(PAGEPROG);
+	FlashSendByte((address >> 16) & 0xFF);
+	FlashSendByte((address >> 8) & 0xFF);
+	FlashSendByte((address >> 0) & 0xFF);
+
+	uint16_t i = 0;
+	for (; i < (len - 1); i++)
+		FlashSendByte(in[i]);
+
+	FlashSendLastByte(in[i]);
+
+	return len;	
+}
+
 bool Flash_WipeMemoryPage(uint8_t page) {
-	if (!FlashInit()) {
+	if (!FlashInit(0)) {
 		if ( MF_DBGLEVEL > 3 ) Dbprintf("Flash_WriteData init fail");
 		return false;
 	}
 	Flash_ReadStat1();
 	
 	// Each block is 64Kb. One block erase takes 1s ( 1000ms )
-	Flash_WriteEnable(); Flash_Erase64k(page); Flash_CheckBusy(1000);	
+	Flash_WriteEnable(); Flash_Erase64k(page); Flash_CheckBusy(BUSY_TIMEOUT);	
 
 	FlashStop();
 	return true;	
 }
 // Wipes flash memory completely, fills with 0xFF
 bool Flash_WipeMemory() {
-	if (!FlashInit()) {
+	if (!FlashInit(0)) {
 		if ( MF_DBGLEVEL > 3 ) Dbprintf("Flash_WriteData init fail");
 		return false;
 	}
@@ -298,10 +425,10 @@ bool Flash_WipeMemory() {
 	
 	// Each block is 64Kb.  Four blocks
 	// one block erase takes 1s ( 1000ms )
-	Flash_WriteEnable(); Flash_Erase64k(0); Flash_CheckBusy(1000);	
-	Flash_WriteEnable(); Flash_Erase64k(1); Flash_CheckBusy(1000);
-	Flash_WriteEnable(); Flash_Erase64k(2); Flash_CheckBusy(1000);
-	Flash_WriteEnable(); Flash_Erase64k(3); Flash_CheckBusy(1000);
+	Flash_WriteEnable(); Flash_Erase64k(0); Flash_CheckBusy(BUSY_TIMEOUT);	
+	Flash_WriteEnable(); Flash_Erase64k(1); Flash_CheckBusy(BUSY_TIMEOUT);
+	Flash_WriteEnable(); Flash_Erase64k(2); Flash_CheckBusy(BUSY_TIMEOUT);
+	Flash_WriteEnable(); Flash_Erase64k(3); Flash_CheckBusy(BUSY_TIMEOUT);
 	
 	FlashStop();
 	return true;
@@ -366,25 +493,13 @@ void Flash_EraseChip(void) {
 	FlashSendLastByte(CHIPERASE);
 }
 
-//	initialize
-bool FlashInit(void) {
-	FlashSetup();
 
-	StartTicks();
-	
-	if (Flash_CheckBusy(100)) {
-		StopTicks();
-		return false;
-	}
 
-	if ( MF_DBGLEVEL > 3 ) Dbprintf("FlashInit OK");
-	return true;
-}
 
 void Flashmem_print_status(void) {
 	DbpString("Flash memory");
 
-	if (!FlashInit()) {
+	if (!FlashInit(0)) {
 		DbpString("  init....................FAIL");
 		return;
 	}
@@ -414,4 +529,4 @@ void Flashmem_print_status(void) {
 	);
 	
 	FlashStop();
-}
\ No newline at end of file
+}
diff --git a/armsrc/flashmem.h b/armsrc/flashmem.h
index 198e3392d..3563eb41d 100644
--- a/armsrc/flashmem.h
+++ b/armsrc/flashmem.h
@@ -45,6 +45,7 @@
 #define WRITEENABLE		0x06
 
 #define READDATA		0x03
+#define FASTREAD		0x0B
 #define PAGEPROG		0x02
 
 #define SECTORERASE		0x20
@@ -57,27 +58,17 @@
 //	Not used or not support command
 #define RELEASE			0xAB
 #define POWERDOWN		0xB9
-#define FASTREAD		0x0B
 #define SUSPEND			0x75
 #define RESUME			0x7A
 
+#define BUSY_TIMEOUT  1000000000L
 
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~//
-//					Chip specific instructions 						  //
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~//
-
-//~~~~~~~~~~~~~~~~~~~~~~~~~ Winbond ~~~~~~~~~~~~~~~~~~~~~~~~~//
 #define WINBOND_MANID	0xEF
 #define WINBOND_DEVID	0x11
 #define PAGESIZE	 	0x100
+#define WINBOND_WRITE_DELAY 0x02
 
-//~~~~~~~~~~~~~~~~~~~~~~~~ Microchip ~~~~~~~~~~~~~~~~~~~~~~~~//
-#define MICROCHIP_MANID	0xBF
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~//
-//							Definitions 							  //
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~//
-
-#define SPI_CLK       75000000       //Hex equivalent of 75MHz
+#define SPI_CLK       48000000
 
 #define BUSY          0x01
 #define WRTEN         0x02
@@ -113,14 +104,17 @@
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~//
 extern void Dbprintf(const char *fmt, ...);
-
-void FlashSetup(void);
+bool FlashInit(bool fast);
+void FlashSetup(bool fast);
 void FlashStop(void);
 bool Flash_WaitIdle(void);
 uint8_t Flash_ReadStat1(void);
 uint8_t Flash_ReadStat2(void);
 uint16_t FlashSendByte(uint32_t data);
 
+bool Flash_CheckBusy(uint32_t timeout);
+
+
 void Flash_WriteEnable();
 bool Flash_WipeMemoryPage(uint8_t page);
 bool Flash_WipeMemory();
@@ -128,12 +122,16 @@ bool Flash_Erase4k(uint8_t block, uint8_t sector);
 //bool Flash_Erase32k(uint32_t address);
 bool Flash_Erase64k(uint8_t block);
 
-bool FlashInit();
 
 void Flash_UniqueID(uint8_t *uid);
 uint8_t Flash_ReadID(void);
 uint16_t Flash_ReadData(uint32_t address, uint8_t *out, uint16_t len);
+
+uint16_t Flash_ReadDataCont(uint32_t address, uint8_t *out, uint16_t len);
+uint16_t Flash_FastReadDataCont(uint32_t address, uint8_t *out, uint16_t len);
+
 uint16_t Flash_WriteData(uint32_t address, uint8_t *in, uint16_t len);
+uint16_t Flash_WriteDataCont(uint32_t address, uint8_t *in, uint16_t len);
 void Flashmem_print_status(void);
 
 #endif
\ No newline at end of file
diff --git a/client/cmdflashmem.c b/client/cmdflashmem.c
index 2b86bdcfc..5f83f9263 100644
--- a/client/cmdflashmem.c
+++ b/client/cmdflashmem.c
@@ -15,9 +15,10 @@
 static int CmdHelp(const char *Cmd);
 int usage_flashmem_read(void){
 	PrintAndLogEx(NORMAL, "Read flash memory on device");
-	PrintAndLogEx(NORMAL, "Usage:  mem read o <offset> l <len>");
+	PrintAndLogEx(NORMAL, "Usage:  mem read o <offset> l <len> [f]");
 	PrintAndLogEx(NORMAL, "  o <offset>    :      offset in memory");
 	PrintAndLogEx(NORMAL, "  l <len>       :      length");
+	PrintAndLogEx(NORMAL, "  f             :      fastRead mode");
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Examples:");
 	PrintAndLogEx(NORMAL, "        mem read o 0 l 32");		// read 32 bytes starting at offset 0
@@ -41,6 +42,7 @@ int usage_flashmem_save(void){
 	PrintAndLogEx(NORMAL, "  o <offset>    :      offset in memory");
 	PrintAndLogEx(NORMAL, "  l <length>    :      length");
 	PrintAndLogEx(NORMAL, "  f <filename>  :      file name");
+	PrintAndLogEx(NORMAL, "  +  	       :      fast read mode");
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Examples:");
 	PrintAndLogEx(NORMAL, "        mem save f myfile");					// download whole flashmem to file myfile
@@ -79,9 +81,14 @@ int CmdFlashMemRead(const char *Cmd) {
 	uint8_t cmdp = 0;
 	bool errors = false;
 	uint32_t start_index = 0, len  = 0;
+	uint8_t fast = 0;
 	
 	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
 		switch (tolower(param_getchar(Cmd, cmdp))) {
+		case 'f':
+			fast = 1;
+			cmdp += 1;
+			break;
 		case 'o':
 			start_index = param_get32ex(Cmd, cmdp+1, 0, 10);
 			cmdp += 2;
@@ -107,7 +114,7 @@ int CmdFlashMemRead(const char *Cmd) {
 		return 1;
 	}
 
-	UsbCommand c = {CMD_READ_FLASH_MEM, {start_index, len, 0}};		
+	UsbCommand c = {CMD_READ_FLASH_MEM, {start_index, len, fast}};		
 	clearCommandBuffer();
 	SendCommand(&c);
 	return 0;
@@ -221,6 +228,7 @@ int CmdFlashMemSave(const char *Cmd){
 	uint8_t cmdp = 0;
 	bool errors = false;
 	uint32_t start_index = 0, len = FLASH_MEM_MAX_SIZE;
+	uint8_t fast = 0;
 	
 	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
 		switch (tolower(param_getchar(Cmd, cmdp))) {
@@ -233,6 +241,10 @@ int CmdFlashMemSave(const char *Cmd){
 			start_index = param_get32ex(Cmd, cmdp+1, 0, 10);
 			cmdp += 2;
 			break;
+                case '+':
+                        fast = 1;
+                        cmdp += 1;
+                        break;
 		case 'f':
 			//File handling
 			if ( param_getstr(Cmd, cmdp+1, filename, FILE_PATH_SIZE) >= FILE_PATH_SIZE ) {
diff --git a/client/cmdmain.c b/client/cmdmain.c
index ea118a2f0..ac391f1b8 100644
--- a/client/cmdmain.c
+++ b/client/cmdmain.c
@@ -199,7 +199,31 @@ void UsbCommandReceived(UsbCommand* _ch) {
 			memset(s, 0x00, sizeof(s)); 
 			size_t len = MIN(c->arg[0], USB_CMD_DATA_SIZE);
 			memcpy(s, c->d.asBytes, len);
-			
+		
+		        //#define FLAG_RAWPRINT 0x0111
+		        //#define FLAG_NOOPT 0x0000
+		        //#define FLAG_NOLOG 0x0001
+		        //#define FLAG_NONEWLINE 0x0010
+		        //#define FLAG_NOPROMPT 0x0100
+		        uint64_t flag = c->arg[1];
+		        if (flag > 0) { // FLAG_RAWPRINT) {
+		            switch (flag) {
+		            case FLAG_RAWPRINT: {
+		                printf("%s", s);
+		            } return; break;
+		            case FLAG_NONEWLINE: {
+		                printf("%s\r", s);
+		            } return; break;
+		            case FLAG_NOLOG: {
+		                printf("%s\r\n", s);
+		            } return; break;
+		                // printf("%s", s);
+		                fflush(stdout);
+		                return;
+		            }
+			}
+
+	
 			// print debug line on same row. escape seq \r
 			if ( c->arg[1] == CMD_MEASURE_ANTENNA_TUNING_HF) {
 				PrintAndLogEx(NORMAL, "\r#db# %s", s);

From ecb0f2118462b3b2527311ed2a31b7ba018ccc06 Mon Sep 17 00:00:00 2001
From: xilni <xilni@users.noreply.github.com>
Date: Tue, 4 Sep 2018 22:23:49 -0400
Subject: [PATCH 0002/1938] feature: Handle Kastle format 32 bit cards

---
 client/cmdlfhid.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c
index 08cbc8661..63857751e 100644
--- a/client/cmdlfhid.c
+++ b/client/cmdlfhid.c
@@ -167,6 +167,7 @@ int CmdHIDDemod(const char *Cmd) {
 		PrintAndLogEx(NORMAL, "HID Prox TAG ID: %x%08x%08x (%u)", hi2, hi, lo, (lo>>1) & 0xFFFF);
 	} else {  //standard HID tags <38 bits
 		uint8_t fmtLen = 0;
+		uint32_t cc = 0;
 		uint32_t fc = 0;
 		uint32_t cardnum = 0;
 		if ((( hi >> 5) & 1) == 1){//if bit 38 is set then < 37 bit format is used
@@ -184,6 +185,11 @@ int CmdHIDDemod(const char *Cmd) {
 				cardnum = (lo >> 1) & 0xFFFF;
 				fc = ( lo >> 17) & 0xFF;
 			}
+			if(fmtLen==32 && (lo & 0x40000000)){//if 32 bit and Kastle bit set
+				cardnum = (lo >> 1) & 0xFFFF;
+				fc = (lo >> 17) & 0xFF;
+				cc = (lo >> 25) & 0x1F;
+			}
 			if(fmtLen==34){
 				cardnum = (lo >> 1) & 0xFFFF;
 				fc= ((hi & 1)<< 15) | (lo >> 17);
@@ -202,7 +208,11 @@ int CmdHIDDemod(const char *Cmd) {
 				fc = ((hi & 0xF) << 12) | (lo >> 20);
 			}
 		}
-		PrintAndLogEx(NORMAL, "HID Prox TAG ID: %x%08x (%u) - Format Len: %ubit - FC: %u - Card: %u", hi, lo, (lo>>1) & 0xFFFF, fmtLen, fc, cardnum);
+		if(fmtLen==32 && (lo & 0x40000000)){//if 32 bit and Kastle bit set
+			PrintAndLogEx(NORMAL, "HID Prox TAG (Kastle format) ID: %08x (%u) - Format Len: 32bit - CC: %u - FC: %u - Card: %u", lo, (lo >> 1) & 0xFFFF, cc, fc, cardnum);
+		}else{
+			PrintAndLogEx(NORMAL, "HID Prox TAG ID: %x%08x (%u) - Format Len: %ubit - FC: %u - Card: %u", hi, lo, (lo >> 1) & 0xFFFF, fmtLen, fc, cardnum);
+		}
 	}
 
 	PrintAndLogEx(DEBUG, "DEBUG: HID idx: %d, Len: %d, Printing Demod Buffer:", idx, size);

From 2263c826dbf33a02a63648fbde7736e0f105d502 Mon Sep 17 00:00:00 2001
From: "Colin J. Brigato" <colin@brigato.fr>
Date: Wed, 5 Sep 2018 20:34:28 +0200
Subject: [PATCH 0003/1938] Restore Makefile, temporiraly provide
 Makefile.Colin

---
 armsrc/Makefile       |  65 ++++++++++++---
 armsrc/Makefile.colin | 183 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 239 insertions(+), 9 deletions(-)
 create mode 100644 armsrc/Makefile.colin

diff --git a/armsrc/Makefile b/armsrc/Makefile
index fb2a2a91b..55699b564 100644
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -1,4 +1,4 @@
-#-----------------------------------------------------------------------------
+
 # This code is licensed to you under the terms of the GNU GPL, version 2 or,
 # at your option, any later version. See the LICENSE.txt file for the text of
 # the license.
@@ -24,7 +24,8 @@ APP_CFLAGS = -DWITH_CRC \
 			 -DWITH_FLASH \
 			 -DWITH_SMARTCARD \
 			 -DWITH_HFSNOOP \
-			 -DWITH_HF_COLIN \
+			 -DWITH_LF_SAMYRUN \
+			 -DWITH_FPC \
 			 -fno-strict-aliasing -ffunction-sections -fdata-sections
 
 ### IMPORTANT -  move the commented variable below this line
@@ -54,11 +55,58 @@ SRC_CRAPTO1 = crypto1.c des.c aes.c desfire_key.c desfire_crypto.c mifaredesfire
 SRC_CRC = crc.c crc16.c crc32.c 
 SRC_ICLASS = iclass.c optimized_cipher.c
 SRC_LEGIC = legicrf.c legic_prng.c
-SRC_FLASH = flashmem.c
-SRC_SMARTCARD = i2c.c
-#SRC_FPC = usart.c
 SRC_BEE = bee.c
 
+# RDV40 related hardware support
+ifneq (,$(findstring WITH_FLASH,$(APP_CFLAGS)))
+	SRC_FLASH = flashmem.c
+else
+	SRC_FLASH = 
+endif
+
+ifneq (,$(findstring WITH_SMARTCARD,$(APP_CFLAGS)))
+	SRC_SMARTCARD = i2c.c
+else
+	SRC_SMARTCARD = 
+endif
+
+ifneq (,$(findstring WITH_FPC,$(APP_CFLAGS)))
+	SRC_FPC = usart.c
+else
+	SRC_FPC = 
+endif
+
+# Generic standalone Mode injection of source code
+SRC_STANDALONE =
+# WITH_LF_ICERUN
+ifneq (,$(findstring WITH_LF_ICERUN,$(APP_CFLAGS)))
+	SRC_STANDALONE =
+endif
+# WITH_LF_SAMYRUN
+ifneq (,$(findstring WITH_LF_SAMYRUN,$(APP_CFLAGS)))
+	SRC_STANDALONE = lf_samyrun.c
+endif
+# WITH_LF_PROXBRUTE
+ifneq (,$(findstring WITH_LF_PROXBRUTE,$(APP_CFLAGS)))
+	SRC_STANDALONE = lf_proxbrute.c
+endif
+# WITH_LF_HIDBRUTE
+ifneq (,$(findstring WITH_LF_HIDBRUTE,$(APP_CFLAGS)))
+	SRC_STANDALONE = lf_hidbrute.c 
+endif
+# WITH_HF_YOUNG
+ifneq (,$(findstring WITH_HF_YOUNG,$(APP_CFLAGS)))
+	SRC_STANDALONE = hf_young.c
+endif
+# WITH_HF_MATTYRUN
+ifneq (,$(findstring WITH_HF_MATTYRUN,$(APP_CFLAGS)))
+	SRC_STANDALONE = hf_mattyrun.c
+endif
+# WITH_HF_COLIN
+ifneq (,$(findstring WITH_HF_COLIN,$(APP_CFLAGS)))
+	SRC_STANDALONE = hf_colin.c vtsend.c
+endif
+
 #the FPGA bitstream files. Note: order matters!
 FPGA_BITSTREAMS = fpga_lf.bit fpga_hf.bit
 
@@ -103,12 +151,10 @@ ARMSRC = fpgaloader.c \
 	$(SRC_EMV) \
 	$(SRC_CRC) \
 	$(SRC_FELICA) \
+	$(SRC_STANDALONE) \
 	parity.c \
 	usb_cdc.c \
-	cmd.c \
-	vtsend.c \
-	hf_colin.c \
-	lib_AT91SAM7.c
+	cmd.c
 	
 VERSIONSRC = version.c \
 	fpga_version_info.c
@@ -117,6 +163,7 @@ VERSIONSRC = version.c \
 include ../common/Makefile.common
 
 COMMON_FLAGS =  -Os 
+
 OBJS = $(OBJDIR)/fullimage.s19 
 FPGA_COMPRESSOR = ../client/fpga_compress
 
diff --git a/armsrc/Makefile.colin b/armsrc/Makefile.colin
new file mode 100644
index 000000000..fb2a2a91b
--- /dev/null
+++ b/armsrc/Makefile.colin
@@ -0,0 +1,183 @@
+#-----------------------------------------------------------------------------
+# This code is licensed to you under the terms of the GNU GPL, version 2 or,
+# at your option, any later version. See the LICENSE.txt file for the text of
+# the license.
+#-----------------------------------------------------------------------------
+# Makefile for armsrc, see ../common/Makefile.common for common settings
+#-----------------------------------------------------------------------------
+
+APP_INCLUDES = apps.h
+
+#remove one of the following defines and comment out the relevant line
+#in the next section to remove that particular feature from compilation.
+# NO space,TABs after the "\" sign.  
+APP_CFLAGS = -DWITH_CRC \
+			 -DON_DEVICE \
+			 -DWITH_LF \
+			 -DWITH_HITAG \
+ 			 -DWITH_ISO15693 \
+			 -DWITH_LEGICRF \
+			 -DWITH_ISO14443b \
+			 -DWITH_ISO14443a \
+			 -DWITH_ICLASS \
+			 -DWITH_FELICA \
+			 -DWITH_FLASH \
+			 -DWITH_SMARTCARD \
+			 -DWITH_HFSNOOP \
+			 -DWITH_HF_COLIN \
+			 -fno-strict-aliasing -ffunction-sections -fdata-sections
+
+### IMPORTANT -  move the commented variable below this line
+#			 -DWITH_LCD \
+#			 -DWITH_EMV \
+#			 -DWITH_FPC \
+#
+# Standalone Mods
+#-------------------------------------------------------
+#			 -DWITH_LF_ICERUN
+#			 -DWITH_LF_SAMYRUN
+#			 -DWITH_LF_PROXBRUTE
+#			 -DWITH_LF_HIDBRUTE
+#			 -DWITH_HF_YOUNG
+#			 -DWITH_HF_MATTYRUN
+#			 -DWITH_HF_COLIN
+
+
+SRC_LCD = fonts.c LCD.c
+SRC_LF = lfops.c hitag2.c hitagS.c lfsampling.c pcf7931.c lfdemod.c
+SRC_ISO15693 = iso15693.c iso15693tools.c
+#SRC_ISO14443a = iso14443a.c mifareutil.c mifarecmd.c epa.c mifaresim.c
+SRC_ISO14443a = iso14443a.c mifareutil.c mifarecmd.c epa.c 
+SRC_ISO14443b = iso14443b.c
+SRC_FELICA = felica.c
+SRC_CRAPTO1 = crypto1.c des.c aes.c desfire_key.c desfire_crypto.c mifaredesfire.c
+SRC_CRC = crc.c crc16.c crc32.c 
+SRC_ICLASS = iclass.c optimized_cipher.c
+SRC_LEGIC = legicrf.c legic_prng.c
+SRC_FLASH = flashmem.c
+SRC_SMARTCARD = i2c.c
+#SRC_FPC = usart.c
+SRC_BEE = bee.c
+
+#the FPGA bitstream files. Note: order matters!
+FPGA_BITSTREAMS = fpga_lf.bit fpga_hf.bit
+
+#the zlib source files required for decompressing the fpga config at run time
+SRC_ZLIB = inflate.c inffast.c inftrees.c adler32.c zutil.c
+#additional defines required to compile zlib
+ZLIB_CFLAGS = -DZ_SOLO -DZ_PREFIX -DNO_GZIP -DZLIB_PM3_TUNED
+APP_CFLAGS += $(ZLIB_CFLAGS)
+# zlib includes:
+APP_CFLAGS += -I../zlib
+
+# stdint.h provided locally until GCC 4.5 becomes C99 compliant
+APP_CFLAGS += -I.
+
+# Compile these in thumb mode (small size)
+THUMBSRC = start.c \
+	protocols.c \
+	$(SRC_LCD) \
+	$(SRC_ISO15693) \
+	$(SRC_LF) \
+	$(SRC_ZLIB) \
+	$(SRC_LEGIC) \
+	$(SRC_FLASH) \
+	$(SRC_SMARTCARD) \
+	$(SRC_FPC) \
+	appmain.c \
+	printf.c \
+	util.c \
+	string.c \
+	BigBuf.c \
+	ticks.c \
+	random.c \
+	hfsnoop.c
+
+
+# These are to be compiled in ARM mode
+ARMSRC = fpgaloader.c \
+	$(SRC_ISO14443a) \
+	$(SRC_ISO14443b) \
+	$(SRC_CRAPTO1) \
+	$(SRC_ICLASS) \
+	$(SRC_EMV) \
+	$(SRC_CRC) \
+	$(SRC_FELICA) \
+	parity.c \
+	usb_cdc.c \
+	cmd.c \
+	vtsend.c \
+	hf_colin.c \
+	lib_AT91SAM7.c
+	
+VERSIONSRC = version.c \
+	fpga_version_info.c
+	
+# Do not move this inclusion before the definition of {THUMB,ASM,ARM}SRC
+include ../common/Makefile.common
+
+COMMON_FLAGS =  -Os 
+OBJS = $(OBJDIR)/fullimage.s19 
+FPGA_COMPRESSOR = ../client/fpga_compress
+
+all: $(OBJS)
+
+.DELETE_ON_ERROR:
+
+# version.c should be remade on every compilation
+.PHONY: version.c
+version.c: default_version.c
+	perl ../tools/mkversion.pl .. > $@ || $(COPY) $^ $@ 
+
+fpga_version_info.c: $(FPGA_BITSTREAMS) $(FPGA_COMPRESSOR)
+	$(FPGA_COMPRESSOR) -v $(filter %.bit,$^) $@
+
+$(OBJDIR)/fpga_all.o: $(OBJDIR)/fpga_all.bit.z
+	$(OBJCOPY) -O elf32-littlearm -I binary -B arm --prefix-sections=fpga_all_bit $^ $@
+
+$(OBJDIR)/fpga_all.bit.z: $(FPGA_BITSTREAMS) $(FPGA_COMPRESSOR)
+	$(FPGA_COMPRESSOR) $(filter %.bit,$^) $@  
+
+$(FPGA_COMPRESSOR):
+		make -C ../client $(notdir $(FPGA_COMPRESSOR))
+		
+$(OBJDIR)/fullimage.stage1.elf: $(VERSIONOBJ) $(OBJDIR)/fpga_all.o $(THUMBOBJ) $(ARMOBJ)
+	$(CC) $(LDFLAGS) -Wl,-T,ldscript,-Map,$(patsubst %.elf,%.map,$@) -o $@ $^ $(LIBS)
+
+$(OBJDIR)/fullimage.nodata.bin: $(OBJDIR)/fullimage.stage1.elf
+	$(OBJCOPY) -O binary -I elf32-littlearm --remove-section .data $^ $@
+	
+$(OBJDIR)/fullimage.nodata.o: $(OBJDIR)/fullimage.nodata.bin
+	$(OBJCOPY) -O elf32-littlearm -I binary -B arm --rename-section .data=stage1_image $^ $@
+
+$(OBJDIR)/fullimage.data.bin: $(OBJDIR)/fullimage.stage1.elf
+	$(OBJCOPY) -O binary -I elf32-littlearm --only-section .data $^ $@
+
+$(OBJDIR)/fullimage.data.bin.z: $(OBJDIR)/fullimage.data.bin $(FPGA_COMPRESSOR)
+	$(FPGA_COMPRESSOR) $(filter %.bin,$^) $@  
+	
+$(OBJDIR)/fullimage.data.o: $(OBJDIR)/fullimage.data.bin.z
+	$(OBJCOPY) -O elf32-littlearm -I binary -B arm --rename-section .data=compressed_data $^ $@
+
+$(OBJDIR)/fullimage.elf: $(OBJDIR)/fullimage.nodata.o $(OBJDIR)/fullimage.data.o
+	$(CC) $(LDFLAGS) -Wl,-T,ldscript,-e,_osimage_entry,-Map,$(patsubst %.elf,%.map,$@) -o $@ $^
+
+tarbin: $(OBJS)
+	$(TAR) $(TARFLAGS) ../proxmark3-$(platform)-bin.tar $(OBJS:%=armsrc/%) $(OBJS:%.s19=armsrc/%.elf)
+
+clean:
+	$(DELETE) $(OBJDIR)$(PATHSEP)*.o
+	$(DELETE) $(OBJDIR)$(PATHSEP)*.elf
+	$(DELETE) $(OBJDIR)$(PATHSEP)*.s19
+	$(DELETE) $(OBJDIR)$(PATHSEP)*.map
+	$(DELETE) $(OBJDIR)$(PATHSEP)*.d
+	$(DELETE) $(OBJDIR)$(PATHSEP)*.z
+	$(DELETE) $(OBJDIR)$(PATHSEP)*.bin
+	$(DELETE) version.c
+
+.PHONY: all clean help
+help:
+	@echo Multi-OS Makefile, you are running on $(DETECTED_OS)
+	@echo Possible targets:
+	@echo +	all    - Build the full image $(OBJDIR)/fullimage.s19
+	@echo +	clean             - Clean $(OBJDIR)

From 6ca899d130f4dcf2f8159d23ac5df90f20503d17 Mon Sep 17 00:00:00 2001
From: AntiCat <github@anticat.ch>
Date: Wed, 5 Sep 2018 22:23:18 +0200
Subject: [PATCH 0004/1938] FPGA Hi-Simulate: Formatted code

---
 fpga/hi_simulate.v | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/fpga/hi_simulate.v b/fpga/hi_simulate.v
index 0768c29de..3976de93d 100644
--- a/fpga/hi_simulate.v
+++ b/fpga/hi_simulate.v
@@ -59,7 +59,7 @@ always @(posedge adc_clk)
     ssp_clk_divider <= (ssp_clk_divider + 1);
 
 reg ssp_clk;
-reg ssp_frame;
+
 always @(negedge adc_clk)
 begin
     //If we're in 101, we only need a new bit every 8th carrier bit (53Hz). Otherwise, get next bit at 424Khz
@@ -81,8 +81,6 @@ begin
 end
 
 
-//assign ssp_clk = ssp_clk_divider[4];
-
 // Divide SSP_CLK by 8 to produce the byte framing signal; the phase of
 // this is arbitrary, because it's just a bitstream.
 // One nasty issue, though: I can't make it work with both rx and tx at
@@ -96,12 +94,12 @@ always @(negedge ssp_clk)
     ssp_frame_divider_from_arm <= (ssp_frame_divider_from_arm + 1);
 
 
-
+reg ssp_frame;
 always @(ssp_frame_divider_to_arm or ssp_frame_divider_from_arm or mod_type)
     if(mod_type == 3'b000) // not modulating, so listening, to ARM
         ssp_frame = (ssp_frame_divider_to_arm == 3'b000);
     else
-	ssp_frame = (ssp_frame_divider_from_arm == 3'b000);
+        ssp_frame = (ssp_frame_divider_from_arm == 3'b000);
 
 // Synchronize up the after-hysteresis signal, to produce DIN.
 reg ssp_din;
@@ -116,9 +114,9 @@ always @(mod_type or ssp_clk or ssp_dout)
     else if(mod_type == 3'b001)
         modulating_carrier <= ssp_dout ^ ssp_clk_divider[3]; // XOR means BPSK
     else if(mod_type == 3'b010)
-	modulating_carrier <= ssp_dout & ssp_clk_divider[5]; // switch 212kHz subcarrier on/off
+        modulating_carrier <= ssp_dout & ssp_clk_divider[5]; // switch 212kHz subcarrier on/off
     else if(mod_type == 3'b100 || mod_type == 3'b101)
-	modulating_carrier <= ssp_dout & ssp_clk_divider[4]; // switch 424kHz modulation on/off
+        modulating_carrier <= ssp_dout & ssp_clk_divider[4]; // switch 424kHz modulation on/off
     else
         modulating_carrier <= 1'b0;                           // yet unused
 
@@ -134,8 +132,5 @@ assign pwr_oe4 = modulating_carrier;
 assign pwr_oe3 = 1'b0;
 
 assign dbg = modulating_carrier;
-//reg dbg;
-//always @(ssp_dout)
-//    dbg <= ssp_dout;
 
 endmodule

From cef5dc4e838675ef8b69265d39845e68a127009a Mon Sep 17 00:00:00 2001
From: AntiCat <github@anticat.ch>
Date: Wed, 5 Sep 2018 22:23:20 +0200
Subject: [PATCH 0005/1938] FPGA Hi-Simulate: Fixed documantation

---
 fpga/hi_simulate.v | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fpga/hi_simulate.v b/fpga/hi_simulate.v
index 3976de93d..65b61d6aa 100644
--- a/fpga/hi_simulate.v
+++ b/fpga/hi_simulate.v
@@ -51,8 +51,8 @@ begin
 end
 
 
-// Divide 13.56 MHz by 32 to produce the SSP_CLK
-// The register is bigger to allow higher division factors of up to /128
+// Divide 13.56 MHz to produce various frequencies for SSP_CLK
+// and modulation. 11 bits allow for factors of up to /128.
 reg [10:0] ssp_clk_divider;
 
 always @(posedge adc_clk)
@@ -106,7 +106,7 @@ reg ssp_din;
 always @(posedge ssp_clk)
     ssp_din = after_hysteresis;
 
-// Modulating carrier frequency is fc/16, reuse ssp_clk divider for that
+// Modulating carrier frequency is fc/64 (212kHz) to fc/16 (848kHz). Reuse ssp_clk divider for that.
 reg modulating_carrier;
 always @(mod_type or ssp_clk or ssp_dout)
     if(mod_type == 3'b000)

From 0994c91888bceb7f407d57d713f4b4e50e1fe9a5 Mon Sep 17 00:00:00 2001
From: AntiCat <github@anticat.ch>
Date: Wed, 5 Sep 2018 22:23:22 +0200
Subject: [PATCH 0006/1938] FPGA Hi-Simulate: Freed up 4 LUTs

---
 fpga/hi_simulate.v | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/fpga/hi_simulate.v b/fpga/hi_simulate.v
index 65b61d6aa..92445edb6 100644
--- a/fpga/hi_simulate.v
+++ b/fpga/hi_simulate.v
@@ -62,22 +62,12 @@ reg ssp_clk;
 
 always @(negedge adc_clk)
 begin
-    //If we're in 101, we only need a new bit every 8th carrier bit (53Hz). Otherwise, get next bit at 424Khz
     if(mod_type == 3'b101)
-    begin
-	if(ssp_clk_divider[7:0] == 8'b00000000)
-	    ssp_clk <= 1'b0;
-	if(ssp_clk_divider[7:0] == 8'b10000000)
-	    ssp_clk <= 1'b1;
-
-    end
+      // Get bit every at 53KHz (every 8th carrier bit of 424kHz)
+      ssp_clk <= ssp_clk_divider[7];
     else
-    begin
-	if(ssp_clk_divider[4:0] == 5'd0)//[4:0] == 5'b00000)
-	    ssp_clk <= 1'b1;
-	if(ssp_clk_divider[4:0] == 5'd16) //[4:0] == 5'b10000)
-	    ssp_clk <= 1'b0;
-    end
+      // Get next bit at 424Khz
+      ssp_clk <= ssp_clk_divider[4]
 end
 
 

From e472a21194b407fc201b9e310c74f57f32238486 Mon Sep 17 00:00:00 2001
From: AntiCat <github@anticat.ch>
Date: Wed, 5 Sep 2018 22:23:23 +0200
Subject: [PATCH 0007/1938] FPGA Hi-Simulate: Added 212kHz SSP-Clock option

---
 fpga/fpga_hf.bit   | Bin 42175 -> 42175 bytes
 fpga/hi_simulate.v |   7 +++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/fpga/fpga_hf.bit b/fpga/fpga_hf.bit
index 00e71c432289cab51d023861a43828767f15d241..7e3fc14e2223e60a37b3427515e38c4d3dd62f4b 100644
GIT binary patch
literal 42175
zcma&P4R}-6nJ)Ti?QLgUTeddFWSj)jW!X^S%0|eP5C`Oip{+tZMa}fwhndsUqfn;x
z<TCR(Y42Rx)6-d&O^`8(6-qm9ht6z_n>Z<*3PZpIN;bqz1tG*u)0Qwyj-XEBq$DE<
zZOu>MzDu$t_dNHU=P=JR-4z>Yuf5jyz2EzO?^>lYZ#MsbM6QQu_Ln=p^3Z>6|8hge
z#)rQ2*BcuD?n@hJJ-I_)Z3_PVBa4GU`VyI;;NoSA_`QpG6K$Zf(BkGL!RAmC{WZ~G
z$1VJM_Iv;7%R!PZBDyW;imCrJf-deN+0qasNBwu2`unmV;q&5ucLhmMl<K}jm6rPW
zfAL3`xxe^7xW}daFTNuGasGSQ|G_<#|GRti{P+Ct?@8vqp;F}j<NyEv>A8<@S`?#d
zDkYc1#eXJmMw_6A=}uW{yM|gurMk%}xk0bQTQX}WXWyh-blCA^wGf@!+{F9RT97)_
zJ<_^J3E9Zagf>7U<Re3}M(XYKWy}%A^`N>ZQF4kpDIiyIc8c~9cM|0GSY5=08Du_J
z?t7d$dsu=RBj$FN$$gJI)yl~rw%L>v)MM&<XwF4?ITCifDJ?@csEP1AI=x6C$Lr~`
z^xXGkTtA_k)WW^#RY&MU3OnU;_BDA!eR5Ts#8B}^SdY`o6qa5a-!qA2;*nZCPbWgs
zb40UruI@>f1Zb;ljG6yP7wK@qch2}Jn@^_jeZlBvAuJ&L$&|E_JRjI-&Sj_NKF*IB
zDQ1vOe(4X!N3g{3hr8}(n`MJ-w)<W)_RC#$Mugo?Ps>llaFNJ=PsH$$V=N~x(@yaZ
zDd>2pOQ+w`vb2Y-+MZuHqWq`y5w$qptace=@1sRo?F_x{`XqTfv}kEe{nk*)`_4%U
z3Qx7hD6K#53Zxzg&~+J#d5)U(`T2^>+DThzmrTUiTwNpEF$A;p{Zu0j5wFa@XNUep
zZk09MA8}W@b*F|K2CJka@<;sHG(#|{--=Y7qAtlDBgiVK*Wp=Qcxa#PAIC*ye%>eM
zB#o0c-m0xNi<8uRV4JP^#kF+v{tA4O|E&mR;+P%F>u6bVgSU{nFm8yC&oW1~*DyEu
zV^}ddLBqn6Ts2NtX(=wWI{La3e#E=;OULuSCG`zhWBfrQ$=;$vG$8y*cO5Poh1t(C
zWU23|E(x&5sdlCN47-BA`k_dCo-J|x)U{}(ImTYf&xN782=|EkC_6{b`D@k~55}wL
zAT>B<2RoiiBQ#RpN@)sFh19Y%X)pDAwrU&;DXbp;11&f2{qsJ=qlU%fNe$1u=jg-U
z?{|&UC0Z`LmiBgONB(*KK*uN~yciBUkqSNR>F-*Ne>JQ=c_}|%%d89~5LPM*D3SFo
zGqxhERG^s|b~-<Hqhu7%ToW_Tv@WO3dd(_-bZZs;lokpzif7LM)|^4M8RIg?KD`7l
zs#X|d@g@AHMs2G(*7{O@F6^p7c>>R~)>@_KUU*=q_SbaPX^!?isZHeL%TG_qtL!MA
z&{T5~7Tzbdx8>EkaH}`jbuu4cerp$<l1=Ju1nCqt86Kfs!bNU!PwHHa-LLx*U%o`I
z&2Yhd(in=rR~eTTNz-O0^K;=Z*~q#q+vyF~x3MnrUGgtur~O^JCu@EZ_vGF)cg<yw
zQ4N_6>!5D3Ev)CuyjwI_reG6O-(%d(el8c=-gVkv(Tj3%#?!97NuzQFe>Jk|J*FOq
zjCqf@UQ@&2T6cablYf?>>qsEp1FMeb<4cs>!oO;Yc_y``bPEyhIirQ-N3x~P^XK@A
z+<P9HwUckQc1i!I+|@CJ)o}xXMhCEdj7M1gR34+9)NRy|5k*)X#KV^nn<Woe4NfFm
zij<+ACsy?;>vUpcMxC#mQp3K9vQ(vq_R5XiC}l=|-iPMAKrafU3tMXxlOmKYe|{BJ
zUyCe1?@4J>za=pf7#H{UBiCIQN3m$T-WT`su<lLZlc4%7mvyo7Rii0h;cS_tE6J}q
zo{SdMU!fM}aWrRj?w(G4BW)$0F!q;@(+gBf#u#hB#5FrcO0$KfzDJg9RBLsm+xCsq
zhyg4}vcTUYM56+QOnxp5@=y<9x-FIl79js{#$8?HSD7T9k1sO5ITc^{S6RG|ZBh%U
zjC~B_a<r)WEqmS#<inpj$bL6~O}WIFr5mn$)v6mR?NIkPC6n?7$MQR_1>;zdBbYec
z1K`N5%-lWF`VV@+sm&T!*mBWp)b6A!@we%a?yEMXyNF+6*y6fTgSFDdxipsI;fEzJ
zHK~YSLr5t;ry4_+(&dwpRO>~4SPqbxVpI4f=1k(5o1DNH)(;Yh9Z0QG02JD|w!4U5
zN9Y<IC9nO!1iM8)eHLIhA+A!3?7JWMCDgctwTE7`f}@@w(jZ<-rzh1_N5^F-f;k<_
z$5*;!8D3j0Hyl<?0M?|DWeu&pG?40*>~j8lG9?j`Pw{0~eg;WBkTimB%p&pc0GB7H
z<ExRj$eK*qrpnuK5g0VS&TbdoV>OxHHoSz~^C<i}PAO{OrV)S9S}p^NH3OL~D7``L
zHM}$R%=1RL!mrQ%Lc79mxc*_g_mY}8S8n3Q^6@oPGC^0X!)I^X-qm2IOTsD7fi52c
z9T{?D27bu{HHhwUW+k?;K#%b#tD?<R<Ct0CPE7rlL;p+%Wkbf?1Z>(O8-A3y*X^dq
z9AwB%Mf^%rN(2_0`kERm!2-5F$h->C&S2~X{2IbsgojWk`0*Gmgg{#sJ55dfsFn)&
zm8C0@6_sA6D~oXf0;G0cpX5ia+qM<)3#rl$0k-a{LtYIL()-8hY7$7D)Mnt<A?dr{
zNQUYvdVq1J#h$hfB?hAY9f*Qld{vj!A*&;GN7)i2e4j9rtd91osQgY5zZ6>4i0aR?
zIkZ{SrOjdYHhZt1pEN4t1^il1lX92`5}FTb8P6j%pUm1J1!U9sb;nzDRfMD7o!UEe
zRkk$t{ae=+`e>--Vei?l0)D-1pRmL2xAp&asdYjRMRK_O3g*j`tu5f!1SMuIBD0(E
z)~!Q+l?wc9D-EcN0)D-Y8ElAR$U1d$Ulhp!7sLf}!Zd!(8U%JPQbSgMRWA}2TR=UM
zuQZ-y)A%)K+&a-27Hj*>I_rd^Ubs2mIw3+L@cjaQxw`q)8sz!P+HvD5505WObzM|I
z=3r80;8z-1A|N$RX)(+_ou<n`oT?W!jbE;XDj)9jDEvB0$O(IxKXx?hlUSJr{Q57f
zE6rmFD^zr-d;QDZUOJ462STk=_+`76Q<oEq0UhSbf8;2`6kcEkSEAmS!mlBtf_^Ud
z#yrcmc;%~Oi^n~F?QZ`qx%ju<O<DoJ_9(Oxw+(9-ZCsqeqMeY}>1ee#IgMXba*bY<
zEfc7O@3wGZd(UY%=@r?O37n}d;8(xcGOOYE17F=f*SE!Lh@*r!Lz~yttTtlt0)F+=
z7HUX5(9t?q;9?Z_yh3q-93Dlqa}|TU>I8MA1Jc|dFXvrOz%i`{Pl?VF|6*fq5x@2@
z)bks>H_R4#)c{E0ndzi#-q~gs@#`YLE-+sy?G#-%5MQ?TE~4^wt1qM#@avQsm+)q_
z<?K~`MI?|xf<2W)Zh23mB7XJ88doA42des5V+^>%oM(?U&O*Jxr}4{Ay}Z#;_fW46
z*i!M;gXC#S#`C$(&<&I#7>+7;alwuLHDuX(fK0>9Tx#e<<?SjhOJLJ-dX>T}u?_=B
z_*i44kv4^2lRzS5^=ux$sL#O#K2g{-F^yk0_|IgM<H>5v<mu!+3XX&NDWg^ojG6`h
z^%0)1)<JqV=!vNBQRDVFp84nXWW<a7Yt-&!xmtaj7|;j(MlB<;om5?4#IHf>baMCX
zu?H-l%dj!_e=?r6jYPbFUsqUKh8&>q9(s?KIDs8qwec}R;CF*J<?uA)+Rr|s7mj<g
ztG-2VDqJ2jUl;FNn4MUWe{G`^Vky3-tAUW-Wd#x}0&S^*7__GGD=;;#IEWY<NJMN*
zN)Pvm3OR#+$xf<sjAi&MhIHXhx=krF3sRV!Wz+a|H|tB*UBEqe>yIUCV#XKPoxEGt
zaCbG{m{8LdG3vk~mpGn~=3!eYNEIB<bDS?Z?)7PvSkd?+<{d<tai4=Vc7txZSI})4
z4CfE|87$z}TcDi7Y0o~CE3b)Rr#v}(Tz^?sI^Gejz`u4Nx@%ARJK}TcDL+4MMB}d`
znil>~`1OKQbJ3UtB>i)uX5fx?_C+61_=35qwZOkF(mpj`smc;LAblC6$`6o9{EoS#
zh+ogjKR6+I%KpS%^tv9B<+k?U=(N)$y>FWZ{K^=UJWPwa5ls`SP~4`S=abdppjUPk
z_}AO=1cf6W<W*I-Oke?w(~0BDW5x{p`ZDH=Z!&iJRLJ=7S8N;?jRF@l@T-TO63E!N
zhYbkhyX<Xs&!^nUB7T*y9x)I#s@Qy2Pmr$xY@M<@{ehG9Gw}<h$5QSY0)C}MXnA0(
zc3h?h!v2aPe$D$Mp)&7S^abq}yAcdKw|&3s4^RD`S{^Q+fnUEqeu5Sg=t&*j?`snJ
zn0AGJM*D<!j6OZhzkd4~@;o;Z$N-6G4z@CsaDjhGR-p&g+EDzflK^d$hb_l%G4%--
zK(uN6nlq^PNMuN>RhM{CD~)93C{ybhi1yeN|C;kQJ0YGIfuvc-6yXJI;XPBRy>I&r
z{IWrTfka(zD}Y|<-LAa@UKx(yV$C%Fvej!b8l}dWqlYYy)H16ljp1s<=`?<oGy}hC
zgNEY<|DswMnPAtWN2xY}#8|+u2dI~%Q@<R!?%RMZtg)Pcll2F2Pd<;is`(bGJ?+07
zpDVr{+?6&u;^!28WsDj4RY|Y*EPk(IlNOf08CpCUSf~A({@59OsO=j?{$;c4!SI<y
zDeZmw9UU11)aD4LMCPC3UsL#%@!aTYp<A*k>zQ<+K1()@-*&ajndV>p1|Z2XI@}6I
zkr=<m-k^iQn$Mb##NV6dUr9vVB9$|9P>Y+{>tYyH(*qr)4skW7yvi}UM8LsFJqofx
z#PBNjide)%@t>dfp*chBRl3_jIE3XbyGaBF@$lEhaK?K>oBAz@fVn;wnSZ}_k*>SK
zX>Xl2ngl>Q7*_$mGJuH{V}VWP@?4Vfoat)T!N>$Me}R8JDtf8WF^(YDsS?6?9Q6;@
znDnPuW*WaZSN9|i<nF0Yt6EE9^&(3k289}zq3b#P!c;=8(NU9-TOpb)@X1tt2>imh
z!fIU0>5oWyo}|V})#3Q0$iF~ORyf{{znJ1*&~3nOawuHDuQ%DN*5a&Z6TatFYRZ<s
zrhQYqE)a2JS^>W%c$Wx8jN!P4_hDS_54SF)1ou&Se-Xbf%B~<!8zHuhx(uE$D_L6<
z3sMz<>s>kAQTkyoEf9Dc4YHTkUvQ_~0C5@+WyvCbodzz4(tBF8Mebe-IcuMs{Y8F;
zf->+Ovw&YC0(oB563{%27H82q?V?af?d`v<pdap`H-e#2&w;=AF~b)+70FsClN1_l
ztHSqi^`4b}2t56~KjkhLTQCJQ#+FlW)wAQ}{gt8oTqykzqsaJIfTwgxpJ3JQ(I*pv
z2dlZefM3nDrL(3TwCir#lAIrNS8uJP?qpe@tUX@9FAx2apaU${JaxTBN>o_dD0`8D
z5f8_!QjbHT{0QB$UWhCL?Gm?)`=aGz<|Rd(Bi?tlvC^2jXQ*Ucjp96JS<&rK)U#ci
zZ=vp$AU*~BLhQI|go-bxD_A4Sf8nm8{aA;{8wLLLUEgL|ZyTG~-Od&pm<!GbMm9fF
z)?VaaFR7eaZEULyppLTFm075s_EDX4zxtkBUY(dT0$$mi^beU$>*EwkdWO3E`Zay&
zP<iHoB7T8EA0%%lqA4fAk#^ocDMo-iGx^sEmr~Vwxf|)!X-Jx=`R$Ns`@Y8VzoqoU
z9yy@0F|bJth)9wR`u9?O)WABN=3hGX)F};()#*Kg1KRE!2kWmD%f?vgbbOUir>KdV
zpT}@Ig}vIapu0Wi|C=@b2e;xQ^=G795b7xM3WZ<spcRPsUeK@E!$aFnu4>eBd9{Du
zP4;`|Xl(6>_Dj0zgd>a2b|KF{6Mh&qQh|SsvzM*r)t)D{1>y~aC+74idWG(R`lXdl
z<JW~}6Vk{13Ac}R@39r_su5dRJ=M>|FSfa6VZ{9)tCE|M3Km+dJBMFo*263xU)6I4
zE1`=<*PLNX_~XnM^(WbU>haZou0B~>I*ngHqZ6)rQLz(x<{RV_4awR;c1(oCr!3Py
zr60NmjZ40xq8$360BniAxoR#XbkUTnz`txdXF%R}Q00Q3&MF6x@kwOpHfg%^@#Qb^
z>syH@h%<vhNR-9^h}co9HlDCi!wL1C{m?g(t85w~sA^IUI17V#=6#Y^*H^POlzY#%
zYngis)B`|(hn_CWU4TIw4@q}NyuiQiq&H;~_oTH-`k7pOrF@xoyOZs1iZyQ19?r*?
zQJ!E|>8OLOevzG}@YuqXd)%4CC*=pUcs{<U<Se}}n|9%QLUg(lI^>z!%Bs`d`_8xB
z(2D$v9<z2u6aSBI9u`iGv-J^X(NpxC<9?*8fM18`X{w3)1&bnffN^76mr%Erd-wwX
zN|PkJ9o%zmJV}1Xy^NKR?HY94!6JSoQ1XRh#xiZAJW0D9&xp1Hd48Du`^_n?CvgYR
zN_w|ylHR2S$Fck-z{rkT-r*vCO`_CaEPz(X^Y*@DZ5^wQ%4TY^woMlK*CyIbyOYMK
zdok<ATqKg(M%tdS*VPAS@~`i?fL6n7&t}Z5V{CtL4<AvJJB%32&8eaLp&j_Bo=PRg
zZaZYPVwMTTe~?YZm*QXlhJTJcwg=@C2vo9m4^6UACq9|xU*(hZI@ngZ(4qz!M$V$B
z>zl?GXocwOn8ClSSK^E9KX04eq@Rkf;Lv-sbc*fc;Am6$<ygQk@)@8@oSu=5>ya+r
zHXy7d6lcummUKy)^%}l-*#P5G>Kh}5<x8vhYQ2ltKt8^lSwlc8jMR4f_z?ZwRzUUy
zp^$dWZ7h|KFQp&8Y=x+NNYhYOgk8Yp4589Xc!$j7H2*@L?{0B<&nq})EwR3<+6{Ko
z0ujrs+C(uG7y15IF00od5rtKrA5}G^vvzPAzs|T+TIRBxvl{1&Xq1ql{zDvQjZTH_
zdNe;5&<`c10GYqig~f(ae^%*nW7q~4mcA+c8gaR4i~JH_I03EuJI*4dAO704KhcnJ
zr&%QbJrVFwpp|Un;1|*gNYCQg>6**vmGto<|2hP;`j~|Bc17F}7|tc|FW@pNkRpD)
zFF#C&IM50JjNF3hwgJ#sy)>;KrqTaWlDiReBQc{^K;X}%oQNT&@k>HKd_gwYK&z$H
zEf?9wI^Y+C#0%yO{Cb7<b=KKsL&zJF0?yE4=C!&ks0WLS_yzsYxM%2<_iCH@N&4>+
z4|a&3cETxddr?2k@JV`}P^$yKgwhYq^H{54h61?2zf^Sr4I~Mk(u+Lr*`ewDM0MD4
zC;tS$L}S$4ffV<PNWH-DJ}!G?j(<(#m&?O?#Anq#C0MIIlt%74fr@b@_}5JQY7Ioq
zDt8I(b@>riq*JHZD2yG`@ipREkM`nnf||iq0;vMO0FcQreKuhh@at(M8^*k6YX3lQ
zsIZD^zhWObz^`)!{F?K&I3Yp`zv=*6Ey5GU#YYSSe7&}SU%#V-98mZbVp|ECj09mx
zL9ax@eIg%Uk&;mdsWM^!zwA!64wIES9^NMs)p+JyeONuG8~F!y%Y&tJq@tz%eqS9O
zUg;A(PZs!B$v9K}FR<GAbV7vx9*tD!v@{&`^lMZ2)$STpaJ)gGF#akxDHm-8WNWJn
z`XSjUMM8wv6137*m^=x*D12h|No{KZzaXKgc!yH)1O=pjf_*|iI*Uu_QSN+P_)#AM
ztuoLq)=(U447Eg=`UJR$cQJ)u)%3Ke83WDvODy9>X<StCgCeJg`}5y3WZX?R<vu$w
zVSbDKT&|edxk<ZS{9f*zSi8x5mZ_9L#vM7W8;cz|^Exeeuns5WVZ~E|Mg9e~Fs|kl
z_;pjRxPX4jAB<b-VpCTUzg9!b6=sxK2s98efl^?9j*%7nU)!jg8kp%Ite&$#!~`_P
z=c;jWg-PP-d7vN4L=u_A#dO-&8W=@+`7=I30o7<u<mY{8&K?yP8Py$-myzNE&?V$G
z*)rzoFrUrmOi5`5+NE$AK*qwyz5TejCc>krH)0f2zvZ%S5LA8X$w1qA6@pva*z9Y_
zE%zN?o1Mllsc*tG)kuGaoul6562}-~Zy|1d$IPr2o916iv+`m6unaggfUKXXcUbR0
zQRMl#fPRR~KOiub8S0`1j-RtpR|;s=n_{gl^*GQEH&WUaqHS_E3Osxd@`mEV&1w|W
z_;p7v`=N%MeMOb=4j^eNA7+dAb&XER7I-1x85n)6#pr7XsrkKZ$zbBL`T7w4jYO|(
zRBnxngo|MB5OkzNa6T9#?0o(`CrZ-1%cUe-b_&lN(6RiK4iLy-E-p;r*PLyXfMkl*
z3weYZ4ReTH<cF-r41g?~p9?<cUF40NgzK;bg>COp<wcs5%QKibr+{DJl^D)g7kH)K
zVtX^S&_#88lEnaH>h%cg83Q#*+PhcF(XI?$%iqeYDC}`DrgL=<_?IyfZS<K5mceh;
z$FR^F<OuiKn2XE#xo{9)DGCHlPo-n1bypS`h@hXs$1%WcKEAl?PMYc^y(zXh3wdul
zyEA#PyC!>AI|KoteyiOmhwit06rKH31R$fnpw=cn6hRd`XY=ue{+B{40)CCDi*5k)
z4F`OA6hJnXe?LPdA27fcd2L`pnwq88p8bIZ<<0RdEAp>|LMsRHb%WtTnz71%*Aa1!
z|B-3@a?n2nTB-imo48nb!Cc2~%FT&Ikow#m7$^Qjs#JZ5_#)=OMit1KHS87YOb0Gw
zP9MzA`^20fI;qg}+1Y91B;6;y6TXSo(_)3~8PvX!pRWk1u4{|6)|ss?!WLlbJbESQ
zFUK`V%<8ucE2rc{kuwMBgk1jRwqz~3OESE=?fF&5^S`C|7u*_A@UL;|5se*yn~Sci
zSci$7EaS4&_vHIui{MybSLks+a`=;MoFAHngrADPl%G?NK8K#8hLw0fze2(fi0W!K
zO1mf!8&X=F`WhPX#E^}{s8UcKoWeRpqE@COBx+gcf6XnVci0=KWz0K<8tEgpLZNVx
zf1$k0LBQ8=(JVaBd#y{<Bye*<KU8XAqpWb)1;m99_~px3&!dL@Q~glo%-(ejLOuBf
z68<ROMovF$&Bqt`7xg3-#W41_eLapZHk4%V8|XN<_U>R){7Y8h_2!>voH|8wR97$a
zstA1^&)lAm3qK9AtFEy4Y!WHux@-CISD#lGPHq$@^Yi7mY{F|H?=daI(otN<+Khz3
z!15OLL)77b;}OLBq`FAq;$3~1YImSUI+=UT;9naRZ23)&QnpJX&`MR_uz+y|{Sf{Q
znOn~>Kmab7DJsv=3ouTY9r1L2PW?tW{*qjgLDh7PfM0dq`?WXek8*Lw8*!b?$Cokh
z$2M|;gV;fO=U9h3w08%uw}Fw#Y5Wo;H~CH3l0iO1Bg|>x5T=@u@LR@#XjA$R{2St6
zb;E1sYK&`(Xpn}eoGX6A5pn-XdpIAbL_6t#z$bt<aI^+i_Ii91RFT{#fG#!q82nND
zWZ<&N5YkcvWLdQjYR_tPZiubR<Id0=^!jBuV;<4YQd%_fl7zXDx<vTO$2KG0W9oY(
zU4$hpJZA3ICfX)5-=YeMAi8ROD~fStiuiStnlj#O?Fju3*+PBJZAhL&P0rdejYJOP
z;NPe^>;jwEujWfM(gVp)PZ)>EHv#vWJ&j)*6{4jPgA>$W2T(|{i{hWiciu!VsYIyf
zG4z}qs<0rJKr$H4sC5`ZA}-?U4*V(mCS7xdoR1~7A=G|YKgr6AuIrTZHIbH!W#!+<
z=lL9LtssQVIrWL~MvM6M8XN*mvh9BDLAn@gaw;;l@E?kn)j;Zkes}?q;&c4lfjON)
zUn()M`^!l9jS&<K1^<Rahaqb~KWw7`&d1i&w(4q9BK20W|23c=lIyen<n16nt^tMb
z4^u)`#DM07{?~8mhSL;l8`i!;6Z1pAsMuyMs7s&!2i|ygdi`WvDdQUb)PY=cGx8Dl
zN{Bp@^xx5p_r6iYFB{eJ@R%p1#f&$3=(UO`HNTt;=JZu-8ozib?hIu8bK@TB6@J?o
zZ1wO%^rM(NRqTJYQk>PrjOCb%?Z2?c{7d3njO{D^8A=xWUzL$9V?VrNq*-(2W6}@)
z<^I04f5*ZOwvHM3_=*@rFGiPs8h(;jY;cZWd-iGxx<<{%16DyloR@-rc;9HBqaA_4
z@*jR>UUGdC7cIxVzbNvr3&4w9e=tMW^w60Kr5oRZQwAd~=!g9l{8~-|ZDsuc?Q&52
z?a&eLc6qk4pdW6hxKopfY$|<?4s_OJ?p(%x4HV`R#y3GnxLRV7s#kn*IWT6-E`5~`
zll@xtGk6IQ#&0Z~(f=Bum&W!z6_~)AzX=($V*C@|ux@6XlAehf{jVGrDA*E{w4Bz)
zH6BywFth)KENVdx&DH!olxf?c40}{9$TExip#lGfFn++^aUF8%KkweLwVQf6;~k4;
z=!XHRtch4rZ*ALK<`e$Z-E~$EG;DOl3j9l_LxM+*C2Z8#E1=s{DJ@P6ML$tB-CrIl
z2YyNLT$KS*>O%1g^v%^pfq%WOf8?y_SahcL3jO!v%cF~Kpttprb5F+%{#A03Udc4Y
zzA&b}4&b;?c*e9PAY$k{yjj!_Q9eoEV#tOWV~l}z$=U6QucKsC%<O+b4*dpd+Cf9%
zSG`qHN1fzb?XN2GuR-3^`fLPa9}nKa(e`?>VgvP9e;0*!rJx^<(utL!n18$WG~F+o
zqn}NhItqr6*w$av5BH!FUMjphyWW=9^{^<nGzf{^cSlgz7xcqjnA4Eqm9uLgB0*n$
zY!yf4*$jN2p&#-CQj@(IcBkA*pOEF_>=0C}=Z5@$%D*}WMomv?8Pu^@yA@<@&Th$v
zj1&w-QMC?jSH6X0es)2%F=#Aoy~6@Q*lv7WLRgr=zh01gGiKU-JB`a=rY&NAQGciN
zUf#CuGxbb;4g80oUF;~Ti`sE^CK9H0N83g>;STwiWY_W1SnekH4_}qAe@u3r6{qCl
zSjE)`!gNdiG3~jk75LXqdcxW@3O~u1Ge|W_<1gSXJYv<HD*tMce;onT)*d%H;#ukz
z^BuR?{soY=n$3}Qcp9#Li&vc%k_Kb`CCnjM0s3LvScweI?fWgak+0c?=KL$YoD5~#
zHq4%gp&=WscwAenA99waJ=XMZ0lyNHR`c;3THRQ=jQXUuOQ63@NDc-3x=F8!#g516
z3PF^EUPsz;K2EjdxiZbaI`uYVPh@v2(a)HX=&uj1d4dfX>4Y6LvIYH64~Q<;g$!ty
zU-lDv(1}VPmC5=GWyvD{(oqd^?oTlv>fUy8TTC(tq!RZ`>xX3<z$=FxBV}@ey+I(*
zl+f|KEbl1ruXzfs{!D_EC`%y<`!QTxq)*C<tU19t)H`%avd%VwZtSeOA%6~nsXG8a
z7-EGdTg0!4QFMV7+<ZjO!Vrr_vkwtB5HnIU@Jq%Gv>U*`1Vp)buF)(}AEH+G<?BOd
zj!ivoU&a`TU!-UKJf4tfWF!n<Yb032uXiYIg*pO`b`kZ)aMJUn3ExFD^!dQ0B7Pka
zU?s;et{Zeks<s!BXI6$|VA%!!)h$l4kjpa)zeGCPob*_lN2WWFAyc&l{DN(Re8-Lb
zEG$s>N(6quN;v!><5Cg7?&r`v9e*t=Cz<d&{<^I$>T+z`zogjza#Lrr#x~kp@8+9j
z&A8FdDqFY6T?6PY74XYLFIvEzN;4oGY994)P3;Q^N+8;F|7+fU`pEi;gX#jtQ46#S
zLLv~YWe^iLmXEKYl6U#b?V)3VWN)tj<p8#Zuo9q@&crX4>law8Jfb{Z2y??wN@=8{
z$iM!X9&>6lkPYu9Wu8PmuZY-u8~m$?Uo!4+>90nw7PdnNQ>jeOb?QYG`d>dvo=omT
z+iSO<oz4uyeW|@Ck820z9(#s<NLi&88i=MzwTVFQl{6{tb0OlU^h1yJfxsw)XJpj^
zI%c6yloPn@RJ$>w|Ml0h2Q`xWJFHIhNS^|!I#NW#vlFpnsr6i4lJo9n{CQgx^usZ>
zq*S@(p(qycOZC5e(R#~W!a9jZBT<Mvo9Q9pw&GLq1^+yAB=oT%R0WB|FqPXH*H2Ot
zEqbD;AHHK;bymbs#=k=!QMkjq!^}Gp%m1q2KXi@Ly$pSavt0_dFhE6Wex@V7&U6*@
zL&faSO@<mzdH$6X1VF^P-81|fITvN#c8EgJVx#KeReyO}Kb$p~b6S?|P_IRWUW&bC
z^(ZvAiug6ouNtWbJ$K~FgQ@2^K|$f^UsdRT{e++&3U9wT%9Vcj6Byf!t43HX+78|n
zQ}0>%=OG0v+Xfd7;YCTUh8%>=O#E8tDAm|K!J3UXX=$$i#h##AX-u%0`XPgI+X&eZ
z3B*C(AkpP;js^KA__e6j9Yt38N1C5bL;wL>M2%$x;|2V>Q~WW$0{%nuPI^hgE_jD_
zJN;aycp#z`@axC&y1=;96o9b2>FvJjybp{Fb<{Nfq7t;!(@mL*GvHtFZ)7UcWzEJb
zavw)yrGQ`kiv2mpLu^bz(kSY~YKe#=<8$t*o)l3Me^u+al{N7oVh|UrfoL^)S*(a(
z$CW>-19j9m?Gw4N3qqXovS*6^!>8meIh?IHtc_dO1^9*3VyNpvR(Yz}|GG#YR)=4~
zxZW}_Uk*f`AL`e|a!-X_#ILNp1$%?%*s2@!Z^j}ADdmguBsFqO9IXzjIqlT{jt&E;
zV0n6nLuYfaEu~TRf{6Kd#Q8M;Qq~S&L6Uty|5S~823R}w9B(x62`8bxN9l+AXh5Zl
zQF@Y;5pjVB;|fqU-8qe4s1I*ZNXelS)&Hi%w3N0Hc?|l7ZITvM-(%0q;vT3O8Nk+m
zsCzolCj$SH$ovKW#;;-9z;=MF8I;)gV0$OEFnuHe&@=Xbz0G<bS}KeqzFMa8hO*7m
z2=gUXM=W0_Bud7qs|{1I7|X9yDp_N_0annSjiB2#jbBgkUfs76{uZCLRSu*f8q`^b
z>Df+vPl11ZfKlw;pnP8v)AT5oRwG?YHaq@>Gw@5<M2~xISGEp7CcRg*?CM*tPY!uA
zT?PEwQ<}?%`!yRq&5+EA1|X`AXID`_^vJ%IzA?ieCyLuX@MSEd1XUdK4zVfy5dAOK
z8}~U8&LjjKHLlW8x|0F|+_T`HZ&?kr$^gHbQTx=`=HHZ_HMVRH@CVvU)A>17{`nXE
z9VY`^OIQOG?1XHXv3^0z1%T`|tZ4iZ^Nv*BVmTG`3?{CHAh_lHq6)|g_;re2c7>g`
zl&18$unY{Lp?2a_v*@$6_wstL+W++%2WnvlI|CqV5XM+*HFcNNNHfM>%j+A;KflEe
zoCkhg18gnoFe2<x*At1F7_^-%arHdlU&gnoaokuIKNaf|knV#DzohLz_<b!u@9=Mk
z++%#8ou!k}@Q%n+T03}3Q#a<~TK>1N|4W}-9ad!_@JrQEX)Q%Jc$LZ<h5pyu@(owG
zL)qbSK8IYM$9#!xGw|y(?j8=cFzJK#wO#oW*1x6qtZw|AF$2Hq=zErG58XaaKOmS4
zlMo4iAR42_j?w~td4OMms2@|Q`tQPsmMV8T=2T&U8an(N5UV;N8z!_1$UwRLoH5S1
z!aN|0_;rP@IxQXE*R|i%Ra&8J^Dm_?J=5}yng026fUTxS17oYM(63aRDTm9{d<+*w
z{L%qiK}10Y%g<-~v017zVWT5<at3|@tw=-wTl77to_Q-U*TCkrC@{A}Ju~z}tEY58
zB$5o4OT?fNWjm@jC)CYF{Q8;ygbQx@9ok!oH=G=PVg0bsIy_GSzo0&0W%ljVMsWdL
z-l=WC#nK2a3ixG<v;}`=w{}4hu^f<5dL=HLV*jg|Jt5Ir9caBK4;b|l15}EluhYo1
z7VvA8Oe6xzLUWq-r8(-TR%Mi;OagleD4)k%7WRKN5JqthSg=qv!saRb8bhb1fM1m~
z+Sy{mcKD|CN93`<q}j}{WmA3fY(Bn>c{aPLL+ehWHvYO2y^%a2VuU-rmRaCmX9?Sg
zVnC~#bQ*w&e||d*A^2pXh+p5MZB#1~QTFex-4Vps=PIlCW*3Z7v1v|3v|nIpN${`N
zVfI)=*ozkw+blmJ;tKrB(ZQf=jJc(wQi-UB<wmB84h0u}uZUmWpzR?Z*sr~VunJ#-
zEZ>L>Sw9xAr+*7COHS(HDh%f>fuds6`xFLvoo+vcq*vfyS$d_ji9DCOuFw^usne4|
z&406OvGj};@oPOBkh??fk=D135wTku<4AEw^;+p3EAX!pzf8nHyVM#xWMPfTf$?0`
z6ag0GbDg1cQq094WKK@vMoltmq30spFy!asi-2Dkm*YvHmbk9x<4Y|h3Rp${mDQ2n
zg*U5>p+0P(MUIAjqwEC&_!jUht89m;EVL!Yt(qp@c3BImPh#aUT;$?HTJPF@oN;5s
zJwS)6ecbqv1zd`i7=u*6uTiI~niEo-EZfU{qB{6pNw`Op)qT2vU)w~lYk;FH98iL!
z4w)`c*HadEu&}4`Yt{w&IR!7Ht$cv4iIm)yGIzHoMCj4-%%9*F3(G}sU@mUewX`;*
zKv=F*OLnGz-lpFLLvow)16&isjyGl2(1d`W&90rnzxo{bQqI+Eki$K&&1Y8y&=~;=
zzg6U45vxnsLtqUa6cv04^xhclhJXY7+LVtkzVc2$Kn<A7f-kxb;=;X&S>ix^VJ0$B
z8p+S8^3Qj1-W>?;E*IBhK>_@Vto|)MPXXTbAXYT~h<VRpwpw)WrLG&1f1s8mChmrF
zqxv55X3XR?|3Zs47Q%2KLp4W$%fs5ZOmpl={S*A!CxBMi_T}0~HD}C6*cbR?@ILj<
zz_0H^Ev&KcYG!w<XTD&5o&A!eUBip`)dqbYYT<^vma%faFT*ot(AUNiaUY@ZDB#z#
z8?U+c%C$c8PJXRtIElyj9i8O+B<7-kUk**ShFM=XqA5!tV&MHeuOAli>!K<%qHQ~B
z>k=<ZY-dYq0qb{0sNIv)X6T0~pCZsMz%SMfIA(Iqd;{I&n6U!|m8ITcbx9pPV=>@Y
zj)S1q!UcZ@>k!Sd0)CYkovR@&2HiS!ewwc|t6=tcQYnf>|3>+GdQT2>;Fpi(jED)7
z(S$Kfff@SYJNngQEzul)-Kz-8PVFs>0ulFmq5tK2i=lcKo+$f!dY?j~PZj^@!wS#$
zi}-axCZawvWTj1sA-rA!kSRt6=lL}M`qWFg(*O)B^eNXaipB1-*z5G1{*c<mHjQ7i
z2Jtr5tFaHdeuN?4m85a3=Z734+FF{gCG0ul@E?X+w^?`nHGg-%de5`R<yC9=@9~}s
z`1M1EUDz8ICAFW^8~RZ-7jKKJ3GlBO`@ihm+gK~j91+t|iXgs_f6!zv`VZ*|Q5!ek
zWBzR)M4P+O|Ej000{g!*;8sG-7y4f)=Qgz7bvv9Y_q`s#8UsVy?bJD@ANS<(Yvo*e
zjOI&I_~z<ABy0ouI@`&&i207Wp@?5z`apit_C{*Ii?$aUVVleZ{fB%m=AATW@UQ2o
zS+2EbU-aCP;j`Y<i|xo8%>vO>z^_~S4e1*6+^>b({$cw)9Q8c*Ny(;h)bmb0ALjaB
zw5!`#1zXf}Rs)$?Y&Pt!t{HU;_Fn!ytNvFCY^z69R=Ez+-;&wElCf@}UiCU;b*{$F
zt6rgD;sf^*D|bD)G7#(y-YF>|d@;9G^dBA(*C=S0TV@0F`K2$d&93@a_OcjGco6UT
z-;(%?%Pg!{NbRCjq!_l1wgh-((mMmcZm?7KzEqo|EtMY`Xz*df6nT|{G+Xq~f0GiA
z`Gz2`1?Z<v^HMX_irrr1vyibf)BMY$qXLnCnLvCURvayeiy@a!8ghLmKc~iO#kPF%
z4q5|?k?to`1)5Dza)^$*)X?GI$n9U2XwKJR3cwk&8mA222iBpZ<>&nlRPXE_s&F*O
z@^l~Jo~&_>R{RNmeMqm!#pH2-R@gpo0ovYF^#(P7e~AwDQ;wC9z1#;)l=&zk8;uA0
z85+&9mP1eA`MF4!z)5KEh@X&)CHW2TlyMp&ziVN2e4vx(zGu$AGKFY{jC1OTVqhlY
z@1f&dFW?MG<$L`!=RN-7e)wd@wdHhL+?NEmI!+VLee28nHJQIB;~LR#(hHzeu=T!|
zucIKix$fEE9WyskO#K%88+5${Htazy;5sSb>wZr2^OtF{0mM)0T-}p)dE{X}koNeQ
zhv4rWFh*MID87z$lpiVL*BaU@ebf$@7b#w85c>>EN<L`xBgN$2bH;U-btGHE{p%_#
zgU}CSMx^ww=m)aaF8cx$4@><P{D*Xj!!2LgORUqM5&>qm@n7;(!ZXaam#SM7|I&ZY
zTSNt9UV(aJwKwfb(Fe3bP43ujF?EmHzkG~R5~B#vzo7w&W$dR9Wk}Yk+``p8=~*Mx
zt)un}BEGsP=m2V~=m6C$^GAU@xqBpipFJ)Yo`=HuS%B|+kVjU@58#>c$y9trs!s6E
z$dF^)%hozwNj`2YWZrHF9hc$Tnfe~(pFbUYekcIa$&S+j8OW5~K{xyNZTHONU(lMW
zsE;&hP0$kZidERZT(X?75v;(!##`T@VU^VvNEBwd3pydg?HgzEFTFG4Q*L?Sm-LB9
z|Lm`bH!2s!>UUyA<=(Txubw(z>q4AC!5-(e;GXJc%6SwE_%+{h!9Tw+3Vh#8yP`&v
zZB#->tbPXnYKN=K$IB8X@T(IAa2oLi=ggn*ubb|VWVoXOT!yX+r5|cnboe)-YtMFF
zD9y!Af5|!a?>hRqXLtWWzG64ELpEH(lo1jB$7%jW8A~!>mA{+Sumr^+8zQXGUnbOb
z)BeLxsVW!C&$@F|bSkLL3yF=QI>jnox!<auv&YzFVmEgZ%NVe(fNTNv%xYYRi>IdX
z3zSNPRzgl6CH0<B?k=Dc3FrXTz^~leXm>rWzo9Qzur;pdjuU~Ap2JHcu>TADkg>#|
zAKH`_Ar_Dt7piRb$W@#seW9wh$BO;0W~#u7@?Suw_<5=waA&l2bTm=>9V4TyQQxBQ
z>oaw(7`Ob(*0>3_!}Tc9%W;v(pvUUY&#67@lk}KT<3>GS?aJ8>>)7XA2ji||_h(ro
zf6owsC3V&Y1Dmuv5e~a!746_n%D+**NprK@+A!t}mcl>JfmSF2p+{BNxcDk9cPa|_
z1^)*9vAgMfU=sQvcw7wUcpN48H<XdXn#Qjk;vklm(l@{dcdd>*gnAVWQ8zv}&50~h
z8skDabq^?TEI!7zL>m}B0d%Rc$Ex1NNS`IdsXC_ulgrutnEpU8kzmz&P~9^$XOOb}
z_Yt}b6V`PV7lR;TFN)>ko}FEv$mhc(z0a@G0`jJ6)wqBK1GE3NZgM4d)+f6%`FxnP
zt|%R#2Hmb^*DWL&NIEwqPKuC})jC&m^;=T^O6fClfPhwh*Wu2_*UVikL(iY|js5vZ
zk$*MnJ;zW(rq=l7VJuP9Bshpe`l{Uh%+BXSr62CXa4=s=NQ425e;Q|5&;Xf;FZE0K
zE%@ib`U!c=k0KeVK+VN9ETqPiCiC-U&r@evfOe_2m%2b{GzLUlLFG=7f5Am5TVlYk
zBXTV@rM;KCmMifpf%(ej=Sy1e;Rzcvi4hj2pKSMKANU$uE)LV8Bu1Lezi0RlDWwz`
zV%t>DWwcjqsK>*1V|Fgj%EcG_^O2E6qhqMOZ>SF)aG3yzSfk8+PfU$Vz<)RyU!L)t
z()Q5H)N~AsEkL(A!YX4I{D(Q8UK*v*4fUuhy@M}H2m&B1Mf^gx$#_4lo#MY-0KyW~
zHZq*NBm*h%IIeyxU4ks(poBQudPBb2S__#Kpb2H*yV$Y2l!UrxykreY4hfgoDf%|q
zlUk7BL@BcE>Lu}I`T63mX3^dMx0g(K`2>jA+vcXyy9xW36&5VFa^C~}kULf&jor$p
z#4nAYdY(2qPL`b6|LS+&sDd<oMLQ?{h;j9)^Ec4A#JJ3{(wKT4g<tPUpHp$fwMe|o
z?{l6Q)&la93?=Y>3i@F`>Q%UlJD8_#OM6Ymcr-pwJZJG8{*Knm`8=lFHcxfdoOff}
zGVsfvao>k$KAL~#Og_HgKjd8*xQ4<QGUn95RC*|7aEXfo|2jk;IH5$vK+aRPOx|sy
zUwKVHm#}Xu@Gr=QpTlmHZf%#Is}H+1Ffuwy_@szm^ak3HZ6jzHU8MuUqlohZz#Smk
z@%$Q-`e%%uB-Ypu*jq^Ep$!n~vA;>cWC;J^G=2p}zDJGgamLFy9WoZEJU^eF!9B>~
zFXiVH`zuLV(EUn_%YlO8U%T3&F;*4)htN09QkdF?@Kz_~QXIqqAe*qmyv;875AS%L
zuv=MptAJmZ;N|O6K=uZKk@Xk&S4nQyhVY(&2l$gz8v`gnuNy)lQcjgzT&VM-uoupS
z9T|Drg~i4JWV;CmNuAD*-6(kpj~Wngf{nWH%<3SHD$0qUR{S+r?t7}|JcS`Q3bZXS
zc0I>EaZfcmHK`frZ{YO;iSp-kDZ3X6;QT=x+C)Ad`d!Lijx>mSj7xM>pr4{91^g=o
z{K~CEg<of^kOtbtWxAqS@h{-J*hgTjMgG-|vM_1B&zj{EcCBsN*y6EO)=I-R3;e5<
zzP;YI%@uCV^=;vgqn`gPj#lF~CT>kWzHC<|L6&dr-2?^rAM*<v2VWR4POK~PuiM3M
z5;Ylb^{U(1Z{$K45pP>VrzM2MiNgM`c|SC+i*O}U$~gUwVSqLg{<T~IT=Z|Kw%2{*
z-gP*~;)c9u97*O6^ti&WGuqfRexbL;YgR+nm@5xL)<B?Lk(+sgj{2~`zjn|ID;GL<
zMOn46mv$X9V{FW|pB8Z=hE>N^Ec2>S1zXNtYVY<wiirm}b6hDIAjH?%{Jam%c}Boh
zp6EN$rFaVTmelNv?0OygAY-=`_}6=cafv>kb{^A|%XJrB55SSADiF%ypv$@`ZpnKb
zK)@3EhwmPA0vWBEPP=k0f=vFm(Esx6s{{R)?Blf8S>hz1_s)fJbj-Xm9bXbT^DtlF
z+}Rm#tT`kWsHIh>srnHADl;8l2Hdk;U>Spd(FP|G#05?l6j-zc{<RUqS?W|sGk~7m
zQU`4>tRG|m09i(hs`q1qf2lNRLN-+Rr7%|+IaUa`C=2@G70|AG2<JyF!E}2Sa9kEZ
zw4iZD3r^z~c6&)*ow1F5TwuFR2G4v^9xiKi*7O(qUzt{E)k&j9Jt_-iB9*11a+n7U
ztiytSIH24bSiM{8e0VL6VV6#*h;xA5Q~Dvzy39{S4;r3PHb<Ob%P}r(LV2x)r?RLY
z+Im*5fE-%;Hr-6N9ABiG3+Nmry<-q{V`}We+U-Jps9fCh`ALp55>vpqYq9X^ie%TA
z&ec6>*IfqM4NsQO*S<nMWsPIyY6|Xk8tw8VEA+os!zyX7OIW35Yo~<Al|JoYQYsSe
zS!^;NUoqFm+<>iE**f-D^jNZSpbS7}9FTvz0iP86UvNGI)%hC+O04CwTou3{E(~w3
z2+rt#!L0$d)uCMz9|;_sl3|n3dqKqDpD&H6XC5lKK`-mM?1$q!oDgdI8k{JFj+mT*
zUq6sts;y(8{@F}`n<)D{9nc}dcK~;C-;?*x1KKvRJ8845wR`Z)bg;7_^ZiY}V*d-z
zoP(_h!K^3^gNaCr8ksu~FW^@{VK=4RW}DUQWGW;dAL`2Ggk<BxMg1_tQ4Ol|H&TGD
zBdUDrKpoX$xn}gg#=$GqxXk(VvIw_hzaDZXT-?a>1^w{LW>4A{MkV44>+q5C?J7~b
z8vkOZe`A5(!*_#rEm*>O5mw+|SLmm-NOh$P{A+>A{4un><|3>XIc1+O{S`eY8dS54
zxzuY$|7$%Zx<R`VTBsEJILIS4pfHNSz>NOaujr~c67}wIy`}moLcx{}o)W7Vo5rtx
z%-0EfvFfKRMFH#;IDg}7^f>*$qHS!|OVjvuz7nbt!GCCr1dbL3?c!=>s!s~|^%jA4
zeJ)bPbk^yD=ie$-IRQGhReF31zu@1<xiz*kb%C*4Zrn`Iit7F%e!b)1*o_!ymrf^A
zVG%$-PM+v)7J+{*;@2R3NJrr|oId{$X^>y-Ukb1T$Iq=F_&2Pyv5d-P7k5o^SRlG<
zA0im!T;9jDlll1amsD5c*o~x-sa)pz;CO?b$gpO5f@aH#3>J-0?-~2QSZ8N@dk<$G
zv3D%+8l>q80rly!IT!cj^O%d=ok%R8Fje$4Yh-uCD(12+biUR7H8zp|9<~4LXNh}x
z`6l=e56Tt!K0cg;nYEj0-(%{ha{j}wZwR~Aa=_MA0CYtPMe=plBKrP>fAuA2$8ci6
zQt_&+jhPcJI6Bn%hgY?Neu(n{I%<UZCEr|uEy-o(dUlQu@I{upV;a9K+R0Hv>VU1e
ze6y%IW_I|_@q@<SvNIjbA+DZB`RC(=JdduBx*!~D^C}IG{$0?$WLiHQnezloD@fv|
zmtJ&2PTzp`fvVMGp8ZAr@O_$eK`k7djYgP*GJYJn4hs@OA{K29zod29IK^59J<nsm
zIf$6;b-HfwTke+Dz~wGlox5kVzEMwzfNj{mg?wvbAO=hP`yBit20Z1$QqL?)0<o>U
zaSRdxtaou3>A}&&VXKiF`&)T_E|h;BEOMovkbk!7+@)}tz-|bh(y928s1Jcw5@F@X
zJVRGUeCgP{MySJS3cuh#yn={BRv)X(T{y0+KDEQBfM35RsJm@wsYB-NZt_6p#RfNO
z;@;Nc`BADJ?6a^>Y5@Vrwn4zTMSYHsn=i$S{Vzll9|PukD4}x&TQDNd!lZN-@#`r#
zRR*GFA|7Cg>LJ4STx2HprvSUB`(Jb3rWZ$>u6X^XU%<{(8Q8h%q7J9!5^ti2Uq|r!
zpk1KA*#C9UC<d78f2rLl1^gNmaI+kP55$kOgV(YnxAAINX~I@MzS1Qo{YYXip20I8
zjx`E*lHFu|1Y*dG`r&6doHH@M?yeB~3>5!rT)UCgaZiDNg{`M$!=uIt_A%qR&VcP+
z$4=AJPE7`!#K_NS#DLonyK!M##YQk4xQvZp(ce;Vn|H?k<s*ttj(TIOJ|cx*YcVe4
ze;6%4$4CqKrOw~L_t;vwJh=o%`XsfB^12<0^x0a$Kfe>v4gW?A=iA@{+ho|k^L<v$
z8neb-@XsHhEfQ<B9ZTl1p@xjPj=d?dXKl#b$O`_$6NK~GGVn)LxVtieV<?|ap-@y~
zZ>`jGYkp$R_r&Q)%Xb40L!Lb;!aKZgYdIZ2dMAqh!}BV>2)n(|>le6?T?z}1R-tGw
z@UM61L^8FyJgGH8KMXs_t4iPkD9rHBe+Ajt*OBONy-n{;BR?yWg+x7xCf7{;kbKdy
zoW{sE3e;Lyy)})iaZdri)E-RO4wFo`P!=kVHcBW?1R7ye@umFp$Q!&|q7S2FLj>9d
zQu~*&4vYSI`bfw5QBei8%IA>P-eOl<@yx~j%fPQ=)bjPuTC0|*dlUpHB`0?=tsmyj
z?`<6MOUA7cy-^jw8G?Q&aWUQhDjCJt15vky`Vg{)z+B*&3Ce)dJUdiwfq#SJZNM9k
z+;WI2RPS%x0EkB(m^H({K_}oOthifSV5#T%Sid&T)O+rm(f=A$+hBz^^#EF9EO%_w
zXzt<HCd~qVfq$)B>QeYclcfs3kSg)Uu(_|cz`vHku3W3Or8M*BKZoJiY=S-UnorK`
ze?{20cPx0cY*{HujLQN4${CnnL(^os|K(cFe$rVJH#&wb)k{iaJ)fhlM2`6Q^YNwd
z>o@WqyL_ElNxx65nDA~w9|R}*f<P7fU)$(9Kk8r#u=j+6o}^}<0t-0$hWFqM{>6Uo
zG}&zzS6!ylvgNX8QoAYsAe%C{pnSc7{ujau<=ofU85)F_4@UZP&OvJ-&fl2U57GbP
zeHQLn$;N22)c_+so*9lr!Ud?8nlJRfWY-4Ye%R(6vQ;8lmWwaH<qj78^FN^%R}Xgt
zc6Oa-FN>CJAk}pd&kUbTcE<UK_$17JlA1m4zs|ucQxJZyt43H5BhAIB+Q0m&1HJBS
z*N2MB9QR~*<3K8EiR0!e{OZ(KukV$+V+gDBAW+~JLAHkuJ2=}gH3Ppac<?yF>O4KK
z;~u4<p%M0ox+gyuh91DtN!*2h?pS~=$DeB5mS42N>G)Fnm*KA?gn0%_tHtpsoec|;
zyx9i|`1Lyb$n`Pc*KEj!xaYR4OP%P8{#UlBA6}8C_}-ZJ7qe5zmt>3D$c&T37CuKt
zyH?;|=WW^Uv&}8MUh%IO>}Lz8H&*X~qrQM&<DxT(T4JD8s<0ARtA6S-7BGmq1^)F^
zX@dJAy+dq>aPYgMb+*>AUaI%uduHGlqF`8^g%U^mLwFaM^Sje$4s^h1H?@B-<4Vzu
zL{1L<I$D=G{qQ4W()EG>J1*eYZe$7gGl#s3>6#3UdIz-z%5*fZ4m>q|{zke)vwBYW
zvPJ-pdPw-P*tqAx0GBK==Eg($xyY2X;Zf_JF%&MR$oAcZ`jB=zevWY!@T-Y!8JK_3
zIL$sr2ghn+cb%)e-PkfvV#6mq1HX>Zes>#=<);rV_&3P()cuyQ+kOUq_0uhWpMlB&
zvSAf~>=EsXfLPuAUyl{>>mt%=DCQAbg28?-Dn{T(Iz#(JV5o>+IsH%=u=P?m^cIAS
z>VPj)pA_)xUtC)p<d!u1K6NK*Gv*}w7X72-HW*m}ztY{kkJ&cHUdFpJ{Bqff_0V?G
z{sAQX0)9P@V|JQG0vohL1c^&}Gv<GjZ#r<)|F*dQ>wM{?5jOhb8h{MjmMh|#EhjBF
zre^4eK&xX)&RPXtfaCa9LtaDk#V^|Wi~8XP3vPL}e|bSGh(^@E(+3ljTq??wNcfh@
z3DqTyz8=H(X;?ezkj#DJ&hN1C)rWZfYGW@e=!eQbkF~lZCu{JS+xj$=9I+=_R?s)p
z`SVUE+z6`Yn?RsdpgzPNjb<B_!w32Luz%hk4ebANfL6cH=^L)7_PTXT?f;5S^RMa>
zpcPZ69coMHXE+$&qb_i+3HX;*z%NIKO+@L3+}P^E@2Lw(_2ib71^gOESlI$-rDOk>
zZzZNcrziEHl{wBhjbHAb)dPU7lXX=XyP}f;_C38mg2Jre-*`)&h=v|Pt4?PpMC$Va
z95|`J5q*BW=g#8(ucxg`33N~H(16PvF}P#ZxO`VG7vAp``PaZ2Y;U2!W2=B)B2?w=
zd@<9FQ&y@0^hN$f@M6fsxO<s(fNE1HjozT6+cn$BK*|?tzWgOvQH=jPhU1m+2qnNl
zPNO$rWRU#|{L7-vMr{nscpl~YUol|8{??jSd@_T7<&K>{lWTh+p{eude=qN|(FZB;
zFI!i>%C%WcB@({84LTAMW7t_#;9v018-Ko|$=<R~`xfDxikN2th5ar0)r=1QW#!)U
z(5$4jEmUKGcIDzr8Xa+K-G2H~1VC2M50kBrx!|E1V^Qj>uBEal`!BTLct%D#TBrCI
zue!i-eqGe8^D#o?Z7L%s(A)Np4b3?J@W=9GGDX;$u|dAv9m+P?+D1Hl^JdTUMgE1b
zg7p`;?5Ozat~j9mgf7tn4s0sm*MvB2H`RN_wuI%Y1bfw(7B;RY?v=o0C(pk+^@o(s
zW+(bf8%aLm>o6<WB5~;TrH4ETkgQyM$&xxA7g$=e9`$ob1OxwB6^e(9dL9{$XYzB3
zQXOV(=r)Rf;X;_Q0zxA0!<-&>scD}+e*<M|YaOJ99RI4r>^v_4WKKT5;GfU2tv*K^
z0}%skMIplD<lAEvP65B>z$Pm1tMi=Du+5w|ZSx)nY@Jdk($6^m@RZzI#}mf(O6vYi
z?Ad;E+k?9w%mvx@BL7PB0mDxQRT{yrYTj?U7?BiQH(W*hN{9iS%XX`k_&-s7+>~4G
zU_$p{UqAuBT;ufK>Slr-RYMO@Q_?$b&T4(d+P6AzW>o>d_S2h&>I%)C1pj&gIn%YC
zlx{O)|1#OiZc3hk*){Q(c_{h#p!Sf&K9>mM%hI`eh3OI>xv6olvETf^W#5JYY1FgY
zIFduukiG(bwYtE++6=w5oc%~}r>vT-W!q&YwQ$Dyy_K#l@rI1?m#zO7J-r=12W+Ym
z-`!gC6i%cs;FpWP$d^Z<K6&JCaWH<l_3<_V^3h#x7x#aSDE{S?jMe^u{>5tf*~dP2
z+YRx7)v~!_#`%XCXgfjC=GW?smt(`qNS~`@9L#%xe<fFATZ(h4qjE02*p7vy`c_aB
z9mIP9zqa!i<i}%W6Y;+XY}I4{TX)mbvMyuzi};0w&gvYLg>8g_D*rvZjlpBU?rHp*
z^{lu?OJun{yS@7?g=FAa5S9yKX%bel!uf~iX%l<iTGVasEuC~7AuoN&rhZz+yrRgz
zaKfIxv;#DGoK6g2|5wh)!E;J!K|kD}Y^&?azsufAURAKwUwNBS1{4vS=3lM_sPsNA
zmW@@uu73~sRW?@fNgeyYRvTkQ{)J<sjy)8;SILHZMO_rR1$`oRUKq;Dr<Mlv!*<jb
zO9`tb3)&Upk0)mPn7Rn03;y{#aQ+5X-J<^5myCCvypcn{nm>_#`uq*}{ZL*;Jv+Ws
zm&0YxSs1`x>27-1^ZnX_eu%agTjs~%+>G`NEG3*D1tUi*d|yATEa-=-RfiJ;USm7#
z%?A7%xt<+R7@5DIAO27r((8qPtbVTbV_JaMg8zM)XISq2yfo$CaN($YTCV&XgP>i*
z0tIlLa(*gDeX;+g=UjP7P_rCogw~C{9!JF5<m_qwMZ1)$&pmOCE83-A6dGZ;2y_?x
z8=tC|DC56v*xC>~TQwljI9Nt*UfTnK)IE(~YvJnN=)m9mS?ZNO$Eb#X1Dg#ev1kkY
zYi`*=qd_J*w(sCi8a1QP!<DeGOB$Oh3;gSLu55>ab><gAyP75f)mjC6Q3f;WTpFYz
z{4wVJP<|uUD8c$s^BeFVLc35v)`^pEr~QX>uF*$M%X!bls+%t0SH^n=8_Lv$=SJ5w
z|GFayS7*a9{n5%Bbx-k6I;MJ_r>RDGFICp(-?Q=`;+}X}%y&*~W}u2u_64!!PtQNp
zf5t&iB%)~o>8eg~&o+X#a}4MA8hTJY^H512p+o01q_lT|=ldM=B2~Nxoj`WR{x5-5
z2P<+dd_=ez<9gh{2De|JxShr?%F^j4as1So+0DK;sma-vG{f}rG3=Ad7Wfy%tc3iy
zG@RLwcz(QQse`ZrPm#Ve{u%shp=+xVSPeTHmpD5|-P0gYEUDyB;9uO;iQ!aRY&Fgf
zL;|sxNADu6)!?*#NQkeKv|OrXV~k;3Scd_OE0lYlDg3%ax#j;%PMzDMcnV-FccSkM
z{`DH+e;oi@a#rPzNy${K(;lUBas~IKUD-TecB~83>j(epZ-su?4XIO!^u67U=ix(}
z@^7R|aF5M(RU1>MtI^qNSH`Sl96~*@%XxjnQTjap|Ju9O*tm}CeC}hVOYPFUD{_@B
zBD=$f6hfiQrQ{c4*&41$dXvh{rh3-Uk4wR5^+RnbyFlF^afeHaURerE+d?WA0!qnh
z!3Ksa%TA)WZgNSH1f3`j?FxmE80c1DTE<We`BA_Utg_$SduMjZl@%2z+5#qjh@Z!Y
zbLVyDn{(#ebCET1q|jzR&DyB-ENsui=54|`oxKvxd+HL@{ESz};w{)N@Cx}UE4)cZ
z2X*|$Yy7&{Ttc?PYaFg=^b0`|*Ab^uH(R#9MmhX!S*%RBvkYmd4lvxv-_w~GwvH<P
zx(&PfopbTC=9u_ZUsK6(tUqFhPPZL}Jy_;1oO=-~R&V0-3_hEKu~y5TrIw>Lt>#(E
z%QaRq?ltlKFE9Rx`E%oC(cD`6#C(i~P*Ssd=)q7=W&Ghe)KizVrUyTw)8mPi&nM{Z
z%w5wDGwZofzxeGhnb4-Lx)-<LsPAq<as#WxuQgy0+_L>OO~0^_eMtI6v9MWUc;GUU
zY0JZ;6~%8%!@nVK_TzonmZ3yG%&r+2V#q$kSAH0dv&?^ZT%7RG_f_<o_!9<4;``vQ
z^(921l!(cG<r?0i!Z6N<53KxcAHE$p5(_>F+E4HjzZ2@$T<RD@-qeG2FU7x1*SrUx
zYr%bG7!-P{eE)UH{RC49x8W7S)v8%Hxg7UjBrWIx?LP!<i63Hzv}T<*aqWd92@?%(
z+5pcQ<KeS{{Jo$gtg#6?M7Qz7-wyqUvP9coE!6M6%;OiO+Ykha49IWLw~Y4gFV2+h
zueIhO4qGN~er(F5Og{m@N43`Xq9i&WhW^6`nVbR_{zEj?lK!y(X#49^obVB?aT;NV
z-z1nP!G<qAZ!jL01!whRF?nJPSUB)8@*2os&)m$vK4bk`s9!RE137sJw_PPP7S{wJ
zfWuASe<A-NZt)sBv2`PCp4vG$SAxKisN*+Ii66i>0H*#A{*TyJoSAXl{TcWo#&G%m
z3(dgm;fdqTvw{EcVR>M{J!Agxu;Q;E{~_3_{W-Mos()u^oxEp+BT@EC$8VgVl85MP
zAN($-G6L{fRoGwmv!_{;aQ+7SGl&cqE9QIbb-R7|@JZ~&T&}U!7-uJa#&A~m>9pIH
z1{ik$=CGM-`)ifVCo_`^U2yH=IEG1I-1?b#Usl^+tLS}knzik-er|t^?Q823&F{D$
zAC!Ug+Wx8?47fl}69^h+muL?7OFG;l{*v*Be<5%^wA(`d!(nVP)AiT#Zw+r|2;`Vi
z_80O;xhMGV^cGfoh@ZC+$Z>%m%&#YCTx5Tx!Cyb1#-aEX*l6<8VDY}fCoMx9G6$eU
zO!nPF{QN6;g({9$iRcy4#-LVHPQTqo@%xZDC*ZHMsZ$*8qu#o~_*%M}L-5H#%oh~o
z!@4)h_SY}zLm4f9#`=}G#vXhV-I*&~%VWN@{Us28_@DF-ysl(P7aUaYiZua0z~=AN
zU3syj^y?4hIvmDo`B(NjLtvZ0#34{&C47S=*OhG+v39~6yFO%Q0i?{z%O-r(gq@@m
z&Z&%#!h1IqXXZ44pb1lX2^JaFs<yvG?S3r3ugH<tQ*c?n*(zk4BmTNw>Q3Ni3)dKQ
zFak5${xYtN%;yk)__nnPX?r(L;G!7`ib2r02#fejxNou_5pMC$tY~*G3Yb)9tv{9r
z@*ji9qP`cQU$3$|`6zNe&;ZhxIm1ms&U_!Ii%XinIJ#Uyrs6jCSG=jKc-Gv<4@>SI
z8ISmjgTIiA^0BrH^_v}BwzRf61C8`EW227`?ahSoQ6=N`U<ar>Yt7R~IjpfOR*8K?
z@Z?nFk2+<_{3MB^@fb(?4)9mA5%T+M12Z<0b1`kS&@+t9)S^8!@8i7jeaoX~X5byv
z`43Am`9{3AGyQG24F$(0v&l3#&JsTC$|!zA=0AK&G<&~=Z)usYi8Zs%C+6=V5q+af
z#4)Y-tA@@QY@#h=Ip#QJ2;cv*&2#C@1Wv;5DE^Z6*8>ynAH+Z9*WDlab$!x*h(sLi
z9}LVa^JJSxW4{zXIlX~{2it6X)|2+j1rYRfNby%Ld8Bo~ZRCf&CVW3dzW&o^9l?1O
z_Sas-T?F;W_m}^2q_OnHYdGaTBd~$U_>HFoE5Udy$8X^M<q;A89{P2%ujvB#>zV1p
zX44pe=C4tl3N{vDCVxe|<-a<Tn6<8A<JllKRq$7-Fvqd;3s3+K?eG-U2LQQ>EA21b
z!tC8TY%R0jmJZTk=$Cxc7C`YAJxYhXmOm}dShFh*@g~oCp#YMillbBubSKcSbj&t!
z2b697uGup5Lb|D|6*&Nl(vgUFyUPAUqrY=4cN$j6E2JP6eS+cZ3A=Gn)cmzKxa~^F
zu)~Yu48uY3Qo+xiX#&vv1zX1d0{n+@_z!V6Q8$CTEgXQozt{Ygj!D|u$PqTbmi@H2
z@rlHYg+#u^4STVRR@z^ZzvTB*5TAaZBamYO5go}ge}(afh)H$}HeT{-mA*k+Hoo()
z+obHT)G6$l=;^cHSyOz0)^TUJ@F;^nfya-R`Ag<(JhT1CaQ$+7%zvG?HK0Ax5JM(9
zZGZi35vO+#NB#Hd>an{(TLb6uS5NZ4u87|lq3M<f)3t*Gz2-#@`)kmW?|;FgSixVd
z^t8ABbZZH(eZ5TUMq200R`Em8B#Ni7L^zhSjNgEMwawPFnY`=yF<!!UVZwrjer;Z+
z`RfjGklKaQchV(f-XF)s(`p#b>@tWf;;&-x{jUc`YNxHN{m<eRuWeua4)*V&qlCP>
z?}hq>{D&rNPpre{QWMtUBe;6T3sWRBAt?T$*gSj7?-)V$vkhkOAxos8CS;^9VL$Z4
z^TufM4I1K&qIR$8ib1xKJAYsvhvqgz(G-74`)i1r$>Aqm8!xYwoD!7ryHW=^n3~DH
zQ^RE{5KGrElXxMI@29YnM=*jTxScSkLry8C-oQSVVYnS=rs<jQ&9%J*$IE+if5v%L
zokcNC9Nzd-7W&0EjpJ~8*_e}t*fD5az=J{lUf3zMnE`Sp=y9GXVV|F}I>r(oDEsS#
zy`PGH6La2QHwy4&z5-`;@pl~ivtxP6e~52(u%@P(QR!DNVzG^4^Tb;9ap+>voZ83_
zAlEZP+9*N$__`5Xnw&(xuxPVJ&~^F#mrUD&ZyYf5$7Zvi7=isYE%$j*j^7BPuc@wt
z*S?;V_e8$+sUba70CUUwf{G?Ptv>#)d#_zP7J(Xo&Y;Ba2%k0C6+2+;;k(?_1OSf!
z$&wv@M?Me|rolvxt#oV+3aUgjhV=+CJopM%QA_~r4nRx+7CkE$d(7A)cCpm7tw2!n
z5KF0NO>&a;L?4!31XP=Ic9Y?VEOX(Y41qu>Oi&_}%-3Ss{`|=H*3=3GKu-O6+zO;f
z^($d)qaA)K6WbbsK7d`sQDXC`&4P$y`?Lvj17H9+XrUwjyEBrR^xzD}Y89AO01S-;
zv7n?gde$V5dB*S4PFf>Ez*8djsF6cSO1GI?9`3vDp<1Cp5yBVcAy3O>?M#1yZE;-e
z{2HM9osO%<P!JY2qDctLNP`Vnd9s92@Pj#(8T0EMdt8BY#)h$=M9EBMV_yGmw$n)!
z6c~tkeomGM)vv7XcNt{Dk*H|1*PmuRPO@NYaF?iIJ-MWo@nXA;owP%wBv=)KG)4y{
zT+P=q>J)jeAst(0ECy8W7tSKgm1~s-Wga5CVA!IQxj9?OO!ipc5Es0=)3ueLKPXYp
zn(T=k=-=agAsw3vz^-&^YPl?VD2=rmj$wC?bwIr9-J7nRG7t2>>n%?kQ^tY*<KCa8
zZ}*c*M*q14y}QyortA*k^lnQx_{mVe$W+=S*G`~l1)~pOl>==G>!D>vuh{LaN_P)M
zAT|{1?a$%(l@cMpQ#X(G8GC3KrTkbQ?V)Yd01&L{lzLWomOPPW%N(N+fMDf%m@kx&
zYO`sxeurfp5UO0um^g%*VFpnmluR}TZDQM<lqo@GM<SIqxWAn>I5CR)Wm`tx-=0Y&
zVp}SJ*v?W;jH`Y*lqI)cs;>mpg+}1Dl(Yym&J8->oi#}aoWmSbf)Um#L4Q$}sAr+?
zp0OM2MeaYQ1SzpREJ>+0PjYL4eg&IVpMl6qXk73l`H!73610U}zYIM4h#^a~j8rRL
zsb4eHf;}N9iG*TC2j7~nZ?Gpdh;>jGuXk--PjhVF*dv*pM^Z1AK`ty2<!3Q4rAZ{P
zd;=mGrnPvM$xssgI9+>_Y0=Y|EJ|Sa7~d#%dCBx3O0*1h=abtTb{Huxfh|F2-VK4S
z2iK1I0`iSG0Z6ffIe_h01qYP~tuRc%N8DCB1juxwOSDYF+C~@ryEC<01F$CJY^~pB
z9F-+p2{{oLteMuNuw0UY<N_troX$<T9fL=DBarBAcDcVYGkBy?iO}Zxuh0L}{Kxax
ztAUoe70~vJ_&w)-efrh?5{&<}66inQxM}Op>OYz||3LsYRst<^|C7J_FVBB}_SaV>
zc<$cWZ(Y6riQH8EE3=pXT+0|{A3yGX$*vh&1R835C1h9fa!Am2#MD~mM*Bvzfe2L(
zQ5ByWOfqcR&@v9_cr`{oDS3Gz@NZI2x#md7QFN?%IRc)mpS8~ZTK~$CuF+&QP__7p
zaO=t#TdP2L)RN3bmAp)fpvlJ0k_l>Ze62R5^rsB8jO`g|>Y=2l2BC~=aMPn>(7GB?
z1qxxKdG`%@IV5O5+z&ZKH62%jpdyY2W<-Kn4#5&$1pGjR<g+x5E(RicmT@Cq4i6@3
z-^d#`t4BSH+j*mbx+z%=vf;CGBzf8O?6gr0!fGf7jw|!BCg>1EG8}w*16~f9nn#>s
z^w<abSA&I<Q&qr^+HCZg2gGsjOX(W$@*)t)<hw(Dm$bfspgoj~tNHrP`o+=rUXk{o
zO+!^cgzcej&wj$VgB}veQWa2Z1M{_jmo-5HMD=jYSDBYJL5D!eU~TYzmvuQwvkH*v
zmqmHMArni0)D{CCwwZ%rK*zzcx(b9Mavd(<Wlhi(yvz+=tya1ude+VKOGGjl!~2Ze
zXp3-5RUjI}JVEn0d`32nRRKS$hho&h6M3rv5lf4~xO&zW+Z#(~dJ@TjDj=dUG`OVW
z@^-Rtg9$3)Mo!YPWZ{697XYE2#k=y!2D{rx-T<iiQfIM6b6&uyDXa$nY8I{rkqqyC
z*xJS~%-nrfZ8hMkU%4s@(4^q2he<kKsd#w-=u{&AqrAM3juk<FQ$MSkj#bHZEwg}^
zH9-eJ%b0_7g7D2M`TfF5@c4@GAQ}jknFi~P7Lbsx2$6~M(B{%2(Da+@c|1DI%esQ&
zUQxOWgvrhWB&GqVD3@LM^O-A9E>118pdS2rSYZI7nw*7e`Me-p(yG<1WmXKDCuo!-
zId2uvGJ)Z>XoHXTe%+qM!%{I&sveh?XN>bCM<W8OeT=*;Sv_tCHKBugc%RB(z#lhP
z`zSdt!MN%@Dnw^w_iPC`{Fq3m8UQ7tC1iyVl@lk_3`Rob0}NU6SRk*b@C(_v0c-|%
zOFx@7-9)So$-n;Be>Tt0&-?PJ)j+qU`hV$?|F<%WRJc;9b(<?rjsGoOHY4rU72U#~
za1$Mjs=28yE4^5_C)|oItK}cAa$Qfg3hNRra}!<GGG!gq%BX;nsZe39%L?2;m(`!^
znxlG1?MF8nC_NPmySq>{5~|SU@}DWRq{}zj3jS~PUCqsB|3+B9A(u&pvS0mdsipt3
zGy+Q_urvZoBd|0AOCzu}0-xUz2+m75FyXw!Kfj}})bphgSQ>$)5m*|5r4d*ffzRs*
oz@3kaoUgu<A%Wl0z0YfIWh^53ScXRA-^r*0{2nV`OGTCZ7lBtF_5c6?

literal 42175
zcmb5X0d!N>nJ)TkpJQ{ZBU=aC<hcask!+}NWLwyjI1Z6F#?z+;8Z_M8S<Kwt89`|3
z_R+a+Cu<h%>zdh?49J)Sh0xZ`Fu4cEO`Hzx2tyMmq2$;&i2(-`CaaewnN(0GbrRB=
zgd~O-c;A+6$(glg)_Trb?T);CwD;Nj|G)qH{(tXKk$W=x50PUtmEGU|&CP$)c7IL#
zw$1l_V{7f--nW&ukhA{p8Ula+-4%fV-A8(TU`1n{*;uzCKwGJ3#fqktjZF<J=^I3S
z?KkoB^Pm3r`vW8#L^Lnph{*rf0uIwbqPZqOw)}UR`F&A<@Ol2<9RcDLrmFj>)Q}(l
zCqJsl{NlgvlaPHJN~Y(3_CF%?3-+J=I`et9Pw9WvNB#fNhyNE3QZv81VNirBsE`~2
zjfGTbIr`}a)rxs&G>>HFWfx4-%hX`IFDe`9tY}bODW&QDR|5DXq6Da2K1dihXm8Y;
z?tYe;^agni?Z>5eP?zC-Qx|0sH6Z)M3ocQNOj{4I2pYatZDrIa;uIOy8(FU-^BjA@
z9_l8qttXk69wC#oLFU6Jy|&)NCe?_14lTH(ouGQ#Jy_PlPV*+)pHO^sGJ#K0N<z&%
zC+#@KZqo6Td!;f-H>o-5PE=0Nb*<TUPb%9nRs3+{5S^y_ms|r%T0<k{9#s0-NebHT
z1fFBcKBEOeb8pz2qNB_d|3Y4&Crc|t%&e0mtj7kzPrBf1X3Q|t+ENzljFI4aqGdP5
zxF2JtL2NPnn2r+KD?Dj!JO1ilg~!yt-m;K(h?=ziL#Ab)6VhCC!W$TM)hnIG2_6W$
z=PPkBOsj2oX>4D1<M85Rn9d95=1nR`=~JUwb-%iH%ESamFt1c$M1EI)!C1$MNFe2E
zR7^T0>eH^|+KJB7n3pS|RA<*KH2<Hgb{U>gt(_V4JHw2kah~s>8e3~G+n9aNHa!;o
z$-bv1eA}H*)05(0+PR&*E_Mn3C2bRfG0E==m5(_dA>W7Ee0GQ*;pT|5k&S9{?!G|F
z#_YOJEa<1#>CS*FjkodMpAT3iKUb#M843zlL}|)?SBTOyK~?2$(Gj6d6s+(F#il8(
zmfUgW984HLnz5BmQa!EjQO22^&V~dUSTDXlv6f}OOHeE8Aa9G7Q2MBgYQuVhy`5=j
z3G7TmKBuCf%F%@#<$RcZAkb%x?8CbZKmLjpX4gVftMFGQISuwAb+q{J)=Q%!qQmFE
zTRXs*Lq3KEi?`6Is5filN}5J#NxyqH#yn~Teg3#!t7O)_XYt3{b^d};{Mx+7=xRss
z+wRw6pQNw%qw#g+4~6aWITZyX>?9>4Se;3Fh3ff+l(Le^hI>jc%&u3Xk*2unCCzTx
zLUHnvE-;<lvSG23?A*12*JuZMxE3axI>?OZ2CG8D$MyY%ENfpC3y#u*RJkdX8Xm!~
zygbtfc8X2Q3bSirmG^0Q&)okb`FhO(?oQ|`-u!diy<ai2_T{5ay3B&y-J@)YUu7_v
zeabjp#-i*^D5tXa<ueAfF|mSNBaXCplm<*JWm=4e>NWRH-I=v7Uu(6%EaIBQKBC<W
z_H~h6>wL)aCc3vUXLc=o1?yRiEbJ(DmS-GDBRfkm0Z+2hdH1Y+RbWIO(m0!@UE~pZ
zJ9|xjV(Y}(W}c%hp%Y?-<=UkDPP{yE_@aCJ+8gYwIGo<wrhl8sr66r_zqTDaYOke?
z(MM+RygONTiLO!boLeZ-tbOr<59x+zh`7G5G)sSIxzAT#qqCi8Ox#D=_3EF$zw=k7
zM`*3e57{m>x+5$scK9$b9<9#4XQG7bI5|i=U$}^Nshe&6&snMvD=74c6D~uJXKVQg
z9VT;9^Q-Hn^GxX`<J4iBLf4p<UHAS4hv+KRf8zh8QcEv~2j;sic8N}}!NLtHGv6g(
zUDxP1VFf?npHYzD;@+ky3WnVlc5lYM9L6+VhgG`m*o~cMsbQTvtxTvlwPwSe)~Pkq
zr$cR{=R_^nkFr0BZsz@--qSK6o}*e#_c<+Y$T5q82n`zOW3e%~Zfwyg#)Cdwk7Ltv
z*+(Olj*wqq`;B2<7U^2ch>;Y2j`fOW?TfUC93kP&UjhJOIs!wT%zi>jSU$&Ee1$$`
z8LvJ~H(4{e?aE1-CN#J*QP?i~*acIaW1fH2T()9}Gv+h$S51ktN$iBQj-WyI5ypF=
z?tR{I*D+Sp3Ug@Jf9z~D_o}z``qIpkeb4cNQ4+LFXr1ubg3M0c6D=}g^UY4|Uauqb
zer)(UOqmxYnMyisd04liK8l&u0(}D6b>|DF=uGJL()Hu972dNjv~`B!W2Z%Z-})iN
zn8mL_cAc8-+LS(ROdo9K?o{jz31k+GXew)8+=!dQT79hcpwdr6^mM}ASLQQL(|~Zr
z@f=gmYqX$R>++hBc!jsh*e$$ID~Im((Ho9RQA~OK3bnvp+`D^;vy&w$!j%fAhDGrT
zjhum5`)Z<{!s^p}tjTz0baO=iOSVvZMBHZ;t%v1s`CTDR6GIfRou$eidQMFW-4pZC
z32KkKNLh$p_~DCt=o160lg{|MJB4yVxhnBXxJUE&H9`LdujL9TRrFh`-{k&rY&pFV
zT6xITtLN}5F0H!*_O7v=^i-=JW{tGh^e`<QEzQ1Xn;xbAEgrw1O)XnOj|h*Yx3OF4
zCp};4*V^*<g*7!0W;ifD;quAgM03Hn2+XuJyY3SU;`F+x$8U9w&XE`ISr5>gbbGJ=
zJ>|~qcLBfDX?lU`Y|QHtU(MW|G2oZnt7;y<#+^f~k=OR<RjdmEj4P>_aMkeh31t?)
z)UDLD#>+!Lg6r-IdDm#thj&Rw{Ug{;#=d}G^q_Vd*HXhPjbC(n!@m6t4^(^M=jY<r
z4qA#n&M&iH%(w2=N~5aX5imorxViY%`J9Q};-yQX-sjq_duWu`m%HcS*V}ZJH-$Is
zSN=f1O~WxRj7<(t2VQ7(zZH8YYhM+Pm*`|y;M=Z8AGu$gw3@g(taOT#T7bJ=j}>P3
zbE9#A$GLaDHUcLd@0a+s(ZdC=CQSu?W#*+7Tmd#o{9;>q2M25!g?$ppxKEBbW6Ko_
z_B(-JL%x)JEgg6*J*+C)Mb#lLu{(k-M%IFH8e;X_l_=ZFhNvk7Y<faHDF(Pdq5HD_
z+2`ofuF~<)UPB*`en!W~u>|9o>9I9v<nSv=W7I${d!7k=$7|_S%!>1@iCk3aBvXEu
zufPWs#%@W&C+y~{_UmsuD~#RhDtzM1<Ck=CwiaM6ibbsS{9|lAJx@N{+2D1mVfh@(
zQ9*m~YAU$%0Dn+jYTw$*zTWbr@ug8`d!a9DU;V(Zm&A&+E5w4sFUMC{Uu#qTT6~(g
zW3qOWqdIF}z%K?Arhg46-=Rq!>`{br$ot0D68mdOWjKppRPYv^?Py55u9gMqjA)p2
zP3gxakfmKyN)Eqzv`)jL`qnCov_9jYQQXQFsQ}g&efP5*ejT8lTBW@_RJf>RFD<pT
z@3I3FtH4ad7>z0CWtNXhv??rG&A!Ghd#h1|<z}$25p3)nehE66st*(&iv{Uy{At_O
z$Bv1YMT70P^7u8*fM2N+p&z2psEOQFYcHXJz{3D21mt%W7?S{#=gDt(`@OGJG+cD2
zW7~{B(GgqgP;&V74XlNk%B)4FSY_ykTKw>brmgK^<}7|yQkUs9E0WA_?4~Uvdc4#{
z2>xxS1smk@yJUQbxW(24^RwNw)dp<2*gwfW=B#~DaYSw#3JGPkih#;?3w<^H35{Bz
z%;MJ<fM0Z%?QU15wJWm0l}v<h7u$LKnx>J=K2!pLwj&%sCjAfimuzJ0LKv3_VWAm{
zZ}B3^_HylKtXhM^Ps2dWS^OH4um$YhLX?DAX;i36`x-(};mz6?_!k$1I8!)HGpTu7
zG%xc5(ZIiwdHlLWuZV_L|Eu~6J{@kjS2_@O{sP9M=JD&7blo@}L40_TrbIB}o+z6T
zpRQ@P_jc(y{Q3o=$|QFg3f#_D>ca?t3;3vk7nR84mtT6nHtkX7H8H^-YR|A*>P}VK
z`qAAv{<WS($+UbvC$?6oSHN9xftil!TC|Ze_GLPj0KYtz_ARzV-4#cp!uuDR*y%}k
z|0OIpv!)@fn1(4JT&4mdCL5~4;Xnem+f+)iqw&KR9|JuGTBVg~e$!~~!xG5#`aJ)-
zWS_=g!M$e)ra+@wJ;m6_1|Q|{Ymavq9kjJ}=@ZBl&h}Cbvp8r2$a47gm>J7*#>Z%v
z9DF1Dzi5Z>Oq^~5E}L>Zq4GabEP~w&-(qB*)403XjD-*z*XQvoNvB%t6Rtkc+f#Hz
z_{U?7bS7Od_FkOJzb0uls}nI9VgaCm%rwP=1{xc)_N5tVFSc=;t3oLhXmB;5e2FgG
z^?Ywa8P4u8A@Pg65iqG`nuIN1!dXSnQm-Up=^TEsE~@0(t8AqThrbCV%a1<ZF!tC>
zv-ahn9b968vz&G~4svH{)MXv<nH)rH*deDr!@mYhf4tJmMn!{JvRm<rDXZQD5&NT(
zS@)jBAJNqjM7ialfmbJjKPY}Z1~Zd!@1!z|Uj?7gNvnAae)WlURn%{B?ML7NUfJeO
ztbHkKUm5<@QcH;aF3_OmZFC}(RpX9YL$}#I*|}>4pj6z?iwrhGzY2L;w2kZ*tk-wK
zSkvLGeN`;zR6#j;MS_jfv#gRkQ*5Q!OLbg7&%Tn4C9L`5TTaqy{<RDw(ExY-SpO0`
zX#;%sBOuS%yU+0iVt(*1^ieOPGa4i6RZr%V9DW_7QAa&}O_Z71nAw2X7{Q5*ja?(L
zQ`z`X;@3k|DYOZFyL4y*LHm1%)tdxa*ehJVXMe$Z1^9*S=XFvHUR+N`$LNT|KVq&x
zpUiu<9E-YkCCr4jJ$friBBpcitJ+cWnTXIPvd`()O88l^!t!rtPSCCurh7X=qbuSr
z%e7s3FKb`g;$PUGMUIP-0RC!<j>Bgvm*CSeubr_Re%+w6_KJh}tA!H3F1RL?r`4PL
z7DvpJdHg!SBn^apRmh-%d?{xIKWfy(@yQ(g%Jtbv2T6-WH_=f?4OOTZjVb4DmV;@+
zJhgyR)4-P}0b74&9^u=DDguQ${QBP!gz*Aq4jIZ(KMX(iZJM%!<Px)7PtYa$h#ePo
zNu>=$EU3Ay$|vYEJD74Ol^p*9YomsK_mnc#@ruzv{*-csZpNFps<vXc2IP1;)NKs>
zLcmf^IUb_NZ3G?@G|2r)|1p-H#jlLV7W!c}Q3z)~q;)Jyn}cR;!uhL~bapK?HS2Z|
z?vBa{k`^e$nv$P8342w36;bgInVi?&WZ8rkrvRpdwUC%wl2q)heOZgA**{`O?M-28
zL71{(Rx^9do|ofa*Jw;M^trAm(*nG5YssWio{g+hN)Ep!s$!;BgeEusyA>B+t{q<c
z4;&40_Ao1JU*KONrkSH!eaje^+J!UVR2{-$4q;Jp_|?z4Rj(aSf^zP5d0XPg*j9;*
zwlfh;X6=hFz<W+W-$>p!%}()pUQ&f%61<6AKg#3RF%{F{n9j61$zIs%o{UXL;pfTS
zlgF<^CS*hIPU<d>usP!HQ=ZUHX!W+Md=7rG?#tdE>NnY4eD@~vUOin}PH&iATiciC
zUu}{z3amv5MTKc2MDL^o_ZEiC>KuM8?356&u8}Q)OW8aQcX2x<M863xlfy5KPVnT&
zy81E~vnh$tDAq|Si9~bot4Cze3Tt5kzifBd@iG0-cxI&T-8}!2`w$j)Sn(5RspX34
zRSC@0;j-4|@aq`ua@4HRzsFo79S#o_|2Zp<J}EbnIS0RJm#EpIZ)bmvF$2FAvJ$?_
z_N3?Xuj?YV-@hIEc^k!el~I(4s{C;RqM58LyY3SUo`RdH6>bnXIIANP$g1g-Js`l}
z=jex1Se*@>%0V`zH7$bQNJBqdO?5V$OvZLJW1LR**SD=tNcV1Gf&)q+zhHqEJo-8Q
z)#=@={g^EkU7|L;4*Wv>t*DM@70k-vS5{|BNDe~xOWIXMPf=w^OXd030{Rj6gtc;3
zKpp0`@M(h;vLE#?|Eti(Xf$hIgT)aT-x2a@I`GR{B|y7OYr+B%JEi3G!*}R?5!~!P
zpnOW#`QnKCG2qu_2Lh@@9>1<gwBqiEm9L0QBc+rV{yV!J3`oi8hZjY>qt<s%y!7{d
zd#JWr7f#bSk6q^z?4j&?2LCd5_-b18jis-(?jV1t+h8htm@FQj!@v5<9|T(6nrgYi
z9+Z*}=HB^FWQBnEJ7@3<{0nHc5hL8Ho{R?hymF<A{gzfCz|(!R_|?gPRxKrovJpbV
z2GoulU@j4N;B)*7u;rIg?ihTgtFs%52GtvWq3q7%7hvmQt)ErXZbxm0c8N8a4~g3c
zHA}fW>+5_4Arfm$D$*EZg8YV4_0H>xhRg~04QCF&PVIWwGyc`@?^_+&MKx(>`@VA8
zr7b0G<*a_#uK{inN37yEoVVC7b=GaEohrM9y&Mgsp#=V%Nsmcd@gA_q;HHv3<y{HT
zzb#HG<Mej~9bh2Ozpl~s&gLKPnNXUfV>Df(N`2|?#OL|f0sb`AJOn0H&UelC3_0&*
zi};iD<&m0p<-P2CChDPQDr&~!-(`zvC$DS;|8lXP7>JtMF&a~j$1ESCB>CsZiJ8Vh
zf<9jgVd@C=@uJ(=Xm;KE7aXH$(Tw*D4^+e&xT{mILK3Im_RGLEBA+Ah-lgZ?kOTyr
zJAw7;Q~sd6FXO`i3@u|{&=1)e4XKu}vJwvDPVP=u-m+W9&;Dz9{<WPRRO@(mx}{N#
zQ>EQq<@_0S+tsDcq!P*FmyD5gtJFtb+{<*qOkcOaUQN#OFPB<PQRs*3utiG|{0rS^
z>2!2Zzi<XvOV+-qcpII~a4UTgon~I?sC{b2&nI*IYw;8!qB=ro)Q(0C{GoEixXS@Q
z-#(Xr0gi{kjz8pYirdYS^U9<q<EXO}v-o8jmsq!1neq*`j7zu?T9Uozf>LUA54Ozk
zuh9a;hh(180^VUt&@yt$K=Cjz7w<iXUx!$i@Y)p?dxxSM@tmXVl6anKTlC~`PCvY1
zjHSW929<Z{yjYbgIjUR~Qzw_qcL&OH`r!dSNyj7ZD+nPlRN!*uG+i^mQ$C#455q<u
z{6?U~m5jY3MtSfxz`Dt=O8w_pET<p(y<O+MA*~Pb>Tb(_1^layKTqB(P=IIn*F?ep
zZ3=Gk<pJ~&rk|YnhmwIqgn7;2SJJU01pXB%+Rkn;nfB7ASScOtsIh<!IsEcN4NLOk
z70L+NMv#{fh}eg;dK7zX4*!}qnja`hD{o4@*OtVYZkB?3em9R_@6aiv^R^`_FChR9
zp4($7CY==Zgb3}uY&<_Y{{Un|piDb^lXe0meC<xjzf9q4FFiNA=N}>=JZa?Y-eR3m
zjCq@k=WWk-L)+P8*1nMc(&Tz+9&G*SC;kZ#u@a7e>YP^AaxQCMGXHgk5A^yc*i~_c
z2L}+Z-l?5Q9kI~3mi;c7|C%!3B|0n9CTJH){E9<AG&YDle!au5YT#e+{OqJzKZ1tJ
z!4%fG5|ugr^$p3k+93(P%sU+35ct=ZSXa0<?3=^CmeR9^H>~Z)dUcUy!wpuMUA#67
zAD-i11$3C3VV}WXK_6%ZFf=QZ|1xIdLz(}Y67?p$ahgtnXzU^IFPZ;BpqS%dpK3Sl
z=5}{V`3+q^l*xZxL6)JJ<C7f!`n30z{yW-SMrk=a$?L-<01i6I>ZKN!<6pn0QSJ@;
zgc6~+W%@LkN{BlkB&OM!?0XIsjEN5Nam=EMb|~Oh8>4?g2s|Ql`Bxv8v{Xy%+e!{c
zWlISBi$hUdqrb{t%C3bq{~h306ZaobR61!4@REf7P2(gV2)hqd&hW1`N1yhtxw-{j
zeZ1<b0QiE4vCC#Kv|)~ZXkpA?0iBA;q>y;eux<dz8dP|j9RF%$JGa&e%`B7r%M{un
z31r-B>AytK!{K_NF>WIf@h3E5#hK8^c?^C&X7&Ge-O6a5f6-2}Mj!&&PKUsEv=Qc@
zPE8WAJpT&Ph;^6g3dI)ExHxQ<Y*$Lj7I#=6VmbbG2s&Gk>O|QD`!_gzHz}EzpS#6e
z{xueFumD>!?R9$^()}ulASN0){Sf@i__6>6J};!OskcWf_%o$7_PPg@Z)e{#(E;kD
zD$-gD&!e%Ffl61<GgQOT$l=!+icuAZRCOZUZJQHtDFu|&pyaM(q3pUN|0T}yRl>EC
z{hm&5S~ckoR90)?RuQ)|k6)MQYCFs-vGxMX$nw!U-|2)fWx0>$@#{A<M95cyCYzEB
zxhDZ+aGnequ^IhPsO{`u>`Du|-!T0S_=TbRz)x$3^g%YOA3FTJ%ia=4pNl2}dwZS4
zuR*GfgOQopHPzHYLX=A|t29fXp(mX#d?m0z<n=>X0l{lY`;tN;e1cz-C=AX>N?7g<
zYw>xhKH1n&scfTthJQgw{5=1XtMj1)%aq2vq~3d1+65rX>4zfL=}oT-us@bRFKTTJ
z!>`4t)`p>_v+o)F%Y-WsPzz<)D#L}ALs%WZjagiDw9E0>3l0H}A<IMGP%-5-`aaf2
z-BjBi@0hLMFc*wT{|wcrY+M_p;25U!OBh-(T@_dCY<!q@3~KNa!kq?M-GqO3$CV$p
z+!Xla{49RS`i*WxDeh#<PoGsGacN1yLiNAF8%t&5!_fjC#b5Ip`W~kVnhfdCW-b_-
zw_WRDA7<CWmhoZAtk)fEjhRgNNl%cAVvb(Bx&nJ8^PZs}a#_EzPI8%NM9o2cUCWY<
zyF}&q?yur)a5?uj&4>LHh`K%VLdHk5I^-_X{rm(Ej67z<{tY`CKhO_RDI>k#yrTpl
z;~V~u6cVYqwHPbNBC=0^!5{H{vMvSqUSCoCXjzT#v;(|S1M$hc=g|BfhH4F=N7yEq
zj3=sdV-XY&2m<X&zJ7ziztTY1w=iapsehH0P^JoHjOFyhQ4Jw6=~T!?Qtm^Q)w1q(
zFQ`*ASHJNTcUr;y?w={|qL5=i6j^1};*8yp^k2&BhhY62QIlQvU7B`C{OSgxQBcLE
zox{Hn5{JN3kZPgeuq#>iC+A7*mXe-X{m_Db_$;q&*Aw2i#j^xR+Rwhpx&R7TuNnQY
zv7m~6O?54LDtd)}ZTe;Y3pF0VueOKt__ct3B|XW#>@_s}VeJ<7Vj+@BVanlGPcfHL
z42Fs)Pon{+YO4qsq{aOa@gRPB7QbVBU#>+D#w-gS;NG{gkJ&Sy!>@7JDf-ypm6#U?
zE>}s*<*x87|Ee(3kWlKVJ6?)?2)WZIAhg8kaREfj>4)Rsl^8Q2M3-TqhTxxm#5_Ed
z@UpCZRV?UJ!M{R!DXZeoqEG1F(sJ>mEeBhHdS98rukt=RxfR|Ic}DGOB)AFhu!??4
zc!vqam$eIxz`rEhidVwD8^Ns-zvx}DL;~3<>;wGx42#CT8r0@R6~rX%LBrJvA#s!%
z47?v__BlSa5olGL&_|;v1F&mF$YMTiw^S5OCC9(kQ)Z6^ye|{Th^;l2x-{f~EO6=>
z{$)BA#dlIoO8+i<O+6~hkRD)*9J{zD5l=-!S^M&7!RU+dTJG(!-<VfK4Z<hAl+K7F
zY5yk0nYAzIhy583`81|8Wd=o^rKbzA$~NXTqaX5u8|L->aD!9xZtyW1Zg5j&P<!!V
z5V1{)k+rY>`3LwjyvEkQ8~u0s4Zmwh+t{+G=*0k%m*Khk;jb9_Aciy$Lki6<Owb<Y
z*`kG`Gx!xLA2W|c{3-ouc1G-r`1_FV^in*9oMr{9$okd(1;3_et=crIHQuIC>mO|G
z*y9-mFX<}RbNnlV!oPv5e0$AQ%MT<3T;lIjFzQak^8AZFAk6DS30n#2JY$n|Mr*Lu
z*Yo^q8$I8Os)FOrrRw0CS^>Q`t)lS8#{RML{0pY{Qg^a&8-ht-L4sW(Sq)X40Dfis
zq0|qv5Wqq-K>i`!U}Mxl7C93vs><yn^~3qtV{)k5=&B<qz9`CU$0)U9zbM2E*#-Jx
z7Pcmp12nB-%rhD_FP@y$x^2f4y-X`2F1zd>s8cjoxlbw|(!VEer{W<cryq{XSww(V
zwe*JYkLvYoEDoMRTGVM~-*dcRjH0U7^f^kmIUa}8TW7Y|<`J`s7g1r3e?6q`*1VCp
z1ser^4QJ+#=h&J>IsWwtA)b%;%at~opx{b`Mi;~zv`Q`RJDB5NnLLrSrYXb;Sd>ZS
zy6<lii_LkdIrvpNY$LqfuWROMt%*U`@&Lbr_qxmziL8B%7Wm@`3%T|>>lZ$ImHo8@
zt5boe<IXwthhL%S7L&uFxX4JEHe8&Wbn++rzmUhTW-if63$e$51xwAMHdbox>hwpP
zp;`Qr`LCE6u<ucI7YZ;y+gIo=c7j$5*FNRkEPfp@GVw;b>`i`&zNnVS^^%_yrxl|x
zBG<IP0Ofgjj;llWA@&T~#R&zwSJaCQIsO%zf53<t9$O2c)C779-5OyjdPendJ#5VI
zFPk1J_=%`YYfko@<4G|CWG@I0I3vidDZeXJ{tD|ZH0}N(XHVA25VPrs0TFfO&K&<5
z1Z*AdMYUlUzo-U9v4yR5t)oF~xHLSMe~F;!7Gg7-=5<s&0sue)LMn<m{CdfI+8&4$
zKdL-I?<T&--9Lqsxk|T0kb`E~J(kITSzaDb5F|nS+gv}ufM`^Eul{4jq|Ba2{RWp6
z3q^_2rSW1{B`->eD~@N?Whsb_g~a8&G!?QT@0DDpoPI{%3IoXgdj=E~!`b4HU1suM
zO;ilokVfHF0JW1C^D1*gJg*;qN>}Y>UiTV?`m8EJL3xKh?r;9V-nU{;6lO54qTq)0
zVkcyu6#T|3ncxJX!BuMDhf?!$`r+w#{Gu1I<u$3FY6<aS1O_5A#rgWf5wqi~B*)wb
zSAbAf>Ko6J?{oU$A)~7m{0m_rdx{|PWD;Q=7O<(ba0b5?jDyt<{Qdfb-p5Xc0IU+5
zE>nH$`iGr4{cxufE`{&yQCiKb7W(`Yobf6xiDd9ABHxb>g4d{7PsIZK3t0p5i%jSm
zWb5N)v-nle6n<z8a>rZfS@BC!dbA1DckHI-xRwSs@yv4y?rDJy+C@gSi#o!Qp18?e
zCRmB>8=S>2<iBVqc~U;Z*;n{8aWGx6jeSvW><$2#FZ-Nq{l?+Q*ETtqXfMY8?jQuE
zAiZoiM^J!K&E!|1{_v1-jZ{ooM_y0;2YWC4Jd`&SJR}@*^It$c<cXTfUyL?bUz|{G
z&`t4=<L>Q6GyE$)zlVUH5}Ov$$EK(A)-BS$jPE?Ae{T-|;xSs@s!t+@+@T?c3`gJ0
z@UM04Ejj*`R=c^cT@Mtx)PoVLN56#)ad>`1?=W)w>zCpb4UWMILKNk)K1%rjwNSyd
zyT_5kuW>OIT4rPWr4e+2u%wl3=4S%YV4@73Rn8syAqP9=>#wX0va{lLfj%?nkecOR
z9qI$xLjrz2;ao=GR%yKtnYBBqHlU-<VHUr91hsHfOL&(@yCcgqY$Kqa<X_-u*|pGA
z6;iNiL$1+4a}f8M(r>8PB7r>r3L%Ocu%Q}BTCqyn*Cq8c6`O4i|C)B*RKH}`wJRxF
z4M{MAU+{;rG0VRkll&&sT`-qx^onR6cTZ&I)gauL^Z0eaeolA+H{SO!FJNvz`=hk4
zgnl_+zhP@f9O+S*)dcKoTl`jRYoM^1z?gIR^-Fq=yeWNObOMn5xAHmTG^k}VhB^Ei
zr;n(9965zimPzysf`d%)BLefv;a5`DIoKJt1p%iG`1QwZ<wG)`|LVieMA<yD(lA)~
zc}sbhk8<Q?lDaXAUp4fcSuI0|3AL-IDXkr3pHS4Q-0z#5)eqAJA^V70Wh<ywrw-dc
zQdGrW%4l&AQS<pP{xl%q)^D-TXqUJx4g7kYc8L4>pw8v=L*gGfR@!b4<~2mCJBv+a
zh=$F8KqX;bKjfd#og?lGW#=6?>8_!Y3(95snC=poU}_e>{v=V@2A%ZD3EJ*PN2cIG
z_y?36|B7?Ot9Ex<*@UeQLkmN@h%t}QzMRj0{TM?9Y_+k4j%UQ?v_4T<@7Q5iTBxXR
z$DYHFte=lk?P`Q!AuOeL1dvG-;}L<Knd4vm5F0Y|wvn!x4M*J{pp5N|eMGn{<p)`x
z8KR5eUvSHI8E99_adLMk5IQu;Zj^o5@6u2sggW82Lo@Uw;!0pmFH;hVq8`oT*Rw6i
zb|suDbs!MZ{+a#3L~TaIhuF^{hb-&o;ngK<fmT3Flc}F^jy^5W0d~&XR{?0(@^I0;
z;4)nt1y>bp#5!!4G9w0MO8!7UthfeQqgbvy>ceS|P%g#?yXs986#Y^O%RW7e|9~+E
zBVdSE*mcnysY?M1u8X_cv3qm+;W)hwzX8v$(sh0p8fEXGF%ZEgIsB6R3u+;x7#b8A
z{7TbcueS-Glw{{F>o=YvRG1hgS^fn>dl8uH3!{<aUpp}6-c7n;R;hsXP5O^vU(Zrz
zhv)F?ZF-lG4#s=dt|m}wvR@guuTs+*e3HYjLmb&I47Ku-nb8lEF}W72hTVpqtKYE1
zXy+=)w$e<}Qh%l<2X73Y<nU{ze#2t#iifDKhkg#{@SI=?&C27~2Hru?&;slgM=b82
z(lj<?9wsa73*_;u0%+xlXzlC<(q46GjkELg496$m%i~vx_eF7g+VunFE&j5&%ThzJ
zbLM5yaM3lL$FHY^<X?3Xwr)ytolquVM6jl(=jw;k;`WGZ`a}>**=%i_QdSChNZ_E7
z(+?B$G|5bs@^wH`9cdA^7!42kzWX`;Wh}R~_UIyPHi)0#%MtV$!Ax`bH3YNz`6#k@
z>j{-lq!}ga>3Q3-wLqzsUHAS4eH;io>H2uBU%MI)wz@>D5_K1-{G815uRmZG-jTXw
zCF)W*7EUM!=}u{1bLuxxt)VrfT?q9h5fcy+Z&;_-9I@eB?A8p%b*SHrAE91briaw&
zoqme<uvcg=Dq8hqu71Pe6VHh)qsVq$GM|mtb|P3x(?5}y%RaOAMKBnNU)~V{rzRBj
z**Gv|5wKu5YhP5{hA|J=u6C@&yKo@>MA;?w20oGF$=a8-crsgmI9YZ@j+v1EnnsP{
zuVtTE{K9#MD+2s0rBpyCY0w}WuA;Fh-p^<rzb<OeE%jaqJ;IicPo#PcU$O-S=Ts^A
zV2*zcOC;i2Pp?Kv)l@Nfm7o?9d`k|$dX49zy>_SvksjdB#1>U~hw!#KdkS;-b&;-(
z2Cn#fDt&|mM5F64tI|$ISD1?q{0ICJ$TCdPr5=<4OzAgDp(xT9C-eNvqHAXTKG!3a
zKJ!iKh$PUTgi!A~n#V6w8{poa&>|p_uzLv$R|SAZVcY6xeReI<1stN76~P|UC_$#^
zLR|{mM-f|F6x~i4KV~}0`0<3NO}hi(rAQpy3fNjg`-M4<vs5$sMo1(2Pz!{CR@&}V
zMN$;Y0*vz%5dQsT8?mGD!xtxw8>~50hgo=`AKLEAbOr0xZ2xOYNzCGx4g6~2t{&jm
z1iRD5`L9dh1>kYX%9;FEXnq2_?jR4DY$2i0*Zx|2sWh~jL1#P5@vleOF0nkKh1f#T
zCzemjL>N62uM41&<6mbex(Qx=kvuZM%`|Eh?}5*(P2F8jIsVmSp6R@!XWN9*$llZL
z?9;wo`JVWMnk`q_ljC0(3t?8J8)AqLCqps;p&&;{K?Xz1@h|9X@anEd0Ri0<;I4!T
z!A*nCmYB=GI<|N>Ic09^sZ@2?xxe&h^enIB62Ef%ivhNvm_=WdWxY~AlzqH5@GHl^
z3Q6)5XL;$1<p&);j&0nDf<0?Zo1x|KD+1VpH;yaAIA<3y;g&7DXW*B}^DhZofTTB-
zPb<F5n}4w3b@7RH9sCOi!E*R@g@7|0_B9Uvg@v21Nd0hCt83+bdHf=oRt`z6(n+hl
zzPQud8@GC&symg(uQAr;fU*SIr8#Ihm;O-T%u&b}&f`~KYqt|Ni1(v*832W_%xO|(
zNPi%A{%gUAIRwSE2egZw<V_K5q$(<ktZH|`;<EaDuKw_VGDg6!&<33UGOn5+m_K#S
z#V;DDK>o`jdyRyxO1v>1_(F-DtKV=mY7db|EV{&&7d@2n3KVkqj8lkvzc!)d^+P5u
zm<eA!dobQXGkffDfrihUuiv1(nnx6Uy>vD0D)OX4lTqLWuN=N39c|0nspMZHVuhtm
zt$md55S5m{P5A-)qd0t_q%Bv!v3L($T+mUHR8B@eqT|ACu{MOItL+WetbRxZHwfq2
z(i!^pK@_lcUio`MMYPW~xBgJut0EfQ%)UUK^krV00+GkrE=@a8I>U*Gj&YdY2u=zt
zqFz87FgIW#S>~z;MRWKC&FW!urRLkG8Bu$gSyTi^0OqpD=gQa5{{m_5q;Nd}ckynz
zerkR4wpuzNgsuJBnd4uV#8f2MlfmVWpuGdO4$)@|fz)&IU(+-;)F9S_b~#?r>V-=t
zUv8kz9EdiP|LRaTc*QW>;4fP~P@fw87Xg~QT|G{fcJTvw{<RGI(3`-~-7$)HVzXs9
zKKy)K+8~#H4E&3*lmaL`rdougt-)FmM|sJSn2isqIHI0Z>xDmAiRVZ|gHNC-M}Yi^
zeE#b-c3o}enKA%bl2L~=ig85(SxV30*Q6LLzpKg#g^FYz)^%d-N|8D5FbBUbaM6zX
z-ab}IaoZcv9IT3W17SmEX%4?eEYzG($Wuxo92!zJC>9h$?5EACpYOm>{T|JVnk<gu
zdCa}f>=xA{sHe^0*Y8_KMKG{_Twle`@P>qIwCpZ+(r&a}7I3FszMr&Xz?g2ubkfQv
z90wnS`{cT9Sc}``DeNhV$UZXvh4|Sh=~G6;Fc0i^8A>rcWIdh(95iJg<iAw#LDG7W
zBH11HS{RSt$W%xk%HtQPM*_-il8sV_@I^2k4h_V#oj=d>uO;-fU1@3G_r5N6h~-;R
z!nctMg(vN7E6wpQl|JMFs$HRs(vUgW>JOB0cFIiJwI1Xv<ZysrM>W7!E12)pqu1$n
z*%;uGX%?r~rV1mnPk+IC>@=+=Y*D`<(_ZVXG9PRZM9flh_;o<?FG6^*2uonvhz~VF
z5wDGmSPs7)qn+{pW!|=(mE5vRd`n`}LV5yY1|!Si*BFm>_#;KApQl*DH;&Np+dOLb
zZq<GH`i-B{8H96nroNn=LU8T3^hWkat6sR@`&|8o8dOU}8FD2Vt)MJPjamMc!>>zp
z`CtaEe#S0a_1terKd)v!8CEm#q0|qbwM}U<s&P^TkosXu<%zIxJi*d4_~obqT5YjW
zLw=NgO_gCS#lB224HX^#p?+ga*jJACvqNIRy)6r<LsoQ@&&G#?#VrV*1|)v<$_8kc
zUQagSN`Jn7;|qVPxIO~;`hWsb!@VehP~K+$v3^6Upn)~6*OgU?2dx!tXe<*@PS(&|
z{slDyexs9lB#=qj5C(#V&n}(Azi`%-Ynhr!3>A$9^q|AD2B!d`j*ML({{=50-;cMd
z6i&vLM3p_rH-`XZJ7@L7clg!O`mLxDkT8nZ`(wQ4AvD(aDE)c-`Y0<cj$rV|c^$wG
z4FvW-1@2__VMaeh1<oR&0Jf;U&@akNm<ZmOT{(w;?WS75R<sGBtS5neSZ$mV05XZw
zobZG5%g#)ed~oCXdZfM56{fQUv3eEot7R6y*5G^!uN(3GIa_4z;+yS?EzlTIf0)v?
z=J{7J3flF))>Qcwxc9?p*L(UxdaLtx%RiClU%#*rM~#A4jwAR7?Rp|6PyRNEy>s!)
zeA%9#c1|fv_*sE4Y$CQw;#cHz_$B$E?fZ}|vUkm|>GVa|N^B%gYkX~9KioqoL4T>b
z-COQ})M=xSVRlwL&a_cjyD8@`>kozL#d)h1=_--?GnwLub8G<0*KZu-C%p}m$ok6i
zyr2!-scSiHqyDfyU%xSiS;%=QA7EZf!W%4oEIYx^;nypk3|bu*uZX${cSONC7p*~n
z$K~*An~JJ(Y#ZhZKxd1rL%tG)qgXH8@W2f@W>MhBP`$E-ypOu8pv76G8KGkhBE}qk
zA%h9GBk4(Iadi{5vOqLxxij%0@?Y>;M{MYaeUuTD(h%x#-t%+#HLXo62;(QAZ$OW-
zF=kmm|7%IaX7S7M7M-brN*q!G_A6$CR&rh`rI(^#j<|=F$u$|fu#I;pUW#gs-e`e{
zH&zD_M|laAX{Nph3BHVP87&y6sIT^vX11W}hfLL(EHzOx3GvgxE_OuZ+)=+lyZ6+N
z0xzlvrx#2#YH4?bZGlcQnYA5~_49Tx9kSN?1j_0HB`9Eqp_O{}9#eAl8^>C%Qgga4
zz3xisv~=d@kyE(Q`2u%O$L8SIX`mIndJ&C=>+c1=kMmRE`ro>a=IS>bCDAVUh=;6}
zDufTKBB(z+Lqo#5PfJEW%-UDFU_J7BrhTg=H7lM;E8FbhNWUZA$Y$y{(vB~-0JhT3
z_Yv-P?*GP$&{x5Pcg6r@+hNj~b(i;V44DC2_bMtr3qZ^Vkewsoa)6z~j>ZpP{A=m`
zMhY)hqOQ`>Y;Q=fo#p_tjymXv^CGej?%!ai)xbGa%dbYM8)Q16K-vtgwihL5bL*%-
zl-49orW~~E%L4U>i<~<g5HV!^p(&pu=(riPZ%b<v&L!$$z?Rll8g%?f)Fd%xJ8NIi
z4~>q|YIqX1j33deKG9Z3i)kPEKh%Q2!OU~y`Q<bGxqjDsN|SLTf_UR^*M0%>x+~$j
z^f~;ZW#kr>2(bvVMkj>C2>~M3q2%!E1FSOOII&i`)0OQ=3w|kZ+R9WU=J4yAW*1-r
z{9>um#e3W0JrL@<Z10wgh>>~E&=0ka*4}VYIa{iB^JN)l&bp*BkYq1q*HoUblxS5{
z?v;r!OU8#)4mf<-n9(;-KTo)S1HzB2pBJl4ggqu4^#J+f`TE0gc6|u?;U-x>Z{L-w
z3zxkHKaYs<HRWPq#&&uNu1LMEb>`R?@FI-!DW_=>hk7u3eworZw%lv_c00XnkLb<d
z7s-l_bvgYoR50Q==<tLpHnMVShwnBUxV#FhjEW9}mFDrQV<dxCpaU9kIRQgMMMrCQ
zk}aFTulXZ#JV2{8z^^q;Taj#0*-1^FM+2kJtZAF$NmJ^gZh7s-RazyB|Dlxj0>2Xa
z>)AfCej~$AvHgs(R?yPn%6b~(&8|Jswa%G71&vT?ss*a$eXfVdE0FkJPP^4w02y#F
z^W!UMaR99@bTz{CqJnJS1FVEgXC7J#{*_r%Ykt6dglb+bdVu{ifXri~Y$M?4q&h1U
zW}$4Kek!Hkh}*523H=&7D-K$&O~@vVh`YT0M$~U)o}(=g>^-1WiKVn5)dIg^DH;7R
zgt-s1h#U|vc#Cc5Y~Bpo^$AUjJJSz^lzKvKnCZT%7)EAI`=M{_GHY596})B~MgB|M
z{P@@T(ej#B{lBrFXWz3yJ+za)LmH2!=vQJnccwwsWbujKUO0nak@8_9%B8%<Yy$<c
z5v{zXRXbw)qumDU$@<m)1-<6!$za-#+Bv$$n<ktp;-Ak_FruV#Th?bL=z>J65qxsV
zzGeWI`^q3BqR1KZN@wGZgz*V`iI5daLuWhTthY-hVnKmdFpj?(YBlBDg}O$4h;9>l
znl);B9o|hc?WO*cW7z;2=~?_*&btX}A-0wjy@fuoJ5!@*%RUsA&(TyeV&s#3R00-=
zOan=4fxSAc$}S{|BVghI_ym|0!Z~@&)66=DgkopcOX`P+-pOt2ld6>0FnD<n0_-b=
zBztBp?1D*q@5%<+JE|NL*Fl`!qm`3{z(bv@AExcSTf9zOCsM<oH@z1y)C=HEwOV|T
zCA052bN(w}iggKZr{job+B%M^+1Q61RUh^9v)_gIu$y`<Jg3TdzSH}n@-VZ71bP_S
zV0PX4f{Wrbs}F2wRQeGpLJp0hp!yUwTYgd~JLa?_$+2FT4$Gt<(*Wpe5VTigb=c%A
z|B7>*CV1GDkXtkWzXALL;s;Z%gUYK}-#c1RYwU_6+IfUcgiuEErZxb5zB^u<20(w3
z^>yij4W^7GpdY@%pXcU~Q%0Gwkl(_t%hey2(5?<Z!1vi(>I>rW^r<%X8$x!;0v1dg
zT&@@H-=GtoKw>@3dxd{Q0lOriOfb}MY;-yD^&3Yqi{?($A5J3?2HJHcc7^|A1u6ty
zJ(1&If23|tK<o)9%f)B3%GUR+t%E;A9F=(FVzxdC^&8%K?H&q2pXZR=?V>HE2wWwi
zeUE*Zeb2amV|lE%($c<;RQL;G=|%l@Xr6m5aK`O;31()@<*4sfz4ygk&J89~ndvXw
z0mTm|0bg<gbF=F%>*r6gBm4Z{QmW~b@G1*FVY&Cznj^`Q{#Z^wOsiSgQf#?Jjbd?I
z7RVeTmcy?<(p8-M!+O=Cz#9kmdX!8?Oe&>0`~v@?Ug?&fl;KlEKf=c8$S@LNzh<-i
ztDuS>hJE>x3}?j1`<JktarOC#Hw4tn;a9eP9%zMx5tm6N_9C8)oXZ^ilKcy9*;2fy
z-^kSW4rA~cAu(4!{|EKzkgT7t`~&+~hEGQ2AGFJaPZE_m{ZPt=m{&@vGG5__F?j4l
zU|a+<ea8`z?>TdRnZUM?6^h1tu_2|9hyo|_iP`%3%=u**!5U08F)uWhjW|$<7{({(
z90B<poL`o@O{-7(jV{w0!6gaf4iqA`gN?p4gI^2Y@xonfcYQ(fFDoGVSC(73emd(D
ze2!nXX7DSaT#8>+gLC*-LV10be^~-*s^Q-Ww=-(id-m*vtAuhQGh(MyQ;x@1u$-P_
zUa&3iQ+%gdDR6LR0vAbvk^LfiDr;Z9g0Jzz0`^q}bvHI-+RFoM4E)QVUcQ<QXZ<1S
zH?(JPepqV<e(iEq+C}Zrx5Q8AJHtiocu`z_SHE_Pd9(lU#r4~jTNtj5vWhk-H=_S1
z-kdHD#V#`01@#+!;xjY&CQht;Aa07Feb3X%2iE(MV5l~l(+?dt_|5qIbn#T#r!*pt
zq}P9-+%S><nsiUCO=ay1_@yGP{9^n8mNH;gBcV0Q0rMGJKBC`?%uyusWprTqub{jY
zMHsHS+Jwfvy>HTSLJd_r_Ms{JnB}%OLXlVDTZZJq*;vX4X~0BIvz(=}_SL`ODfomH
zsp6HO_AiUTP)!mEtZN*Z{b$QAX1`0&gai4?w7XOJce=`h>Agp#@Jj%)!&uzR-f$S7
z;Yd!y3D>n)qlt6Aw#&vL)3e51!)Q!ozpF$2mU!Rcwd4EQ9W8rDVOD*pE$p^yd2uHe
z&X8l4{OfrG91W=!vrF`*HLDbdc{Q*bYj!PwU-UTj4q-Z-)CIrcqtY?(FTdSIrKcS7
zF{nS>hI!!@ktFWz=|bR&Z8Hr&*34mXX(cSXNc{Q$VZ7T`+7YWmsK=P)jZ(6aE^L>5
zY~;VDk?V8Y4#fO)N7ee1YmXBS?scn^YjgF7IAIOhP}x)YB!BL1FH)>dFX8@;heJ>0
z^IxMPY4}tGb0d@p__)ttf_{$Z3%)Lw|LO}MN5<BP=y(9aoeh^#OI^`w%X@HEKcofk
z(scOFa`%hMb>m@bve*A}(N4M;ZwfqiY<EsSOwyz{Zo1>KLv-Wk%_+dKJn8lfFK)~0
zhy65#(_YZ$YpOC1qz~aGPOOAoM=Fi1eT^1W(O>{_=pLhvc5|;C>ecVZdbuvpF?cL4
z-;d0H9kH$Rz7=;X4y5x&oj+zfJEIr<oz>;D`eDRz3!wx(4YVqyCq!jh`%CBR^kh#>
z-`yJJ^g|6-u32DP3VBaaa--i=;^qko?#C?)IsNcg62C^=m*;)R&lq2{5pUefe+NV>
zzMQY$m|!T|NV{<R8GVL5?=l^=G%VT){xDa+v7a)Si~1jWf{;Xpb^*oXAfZv3-Saj)
z%gmTx2h>(>**(SfnLn{B)1e9$$l6z^{H2Tz0NL;q?=7mHbS9$@(Id><A8N|qzwvW%
zjRra(8&0u@_z_WZscewm5)GE?J!ez)yKw#sP>*;+%ny`@C^)~S!?~GF@F1(BJpa1H
zp<=bV6SNhk*VN*A6agM=FueZZeE#cx*2Mr@QgT0hzjvGKF@39eHjNnRfD*~tS49C_
zH+!7x=e!R9lB#8Dtk3bRsO4>mXkm6uHFc@vr)%_Z;cpy=TTz}@&StS7Uw_D1e5Y4d
z8-5Q!R!x4PSO#VRAu*r-dWXSXgy-#7-c~=hn<LOJ?v*Rp4*oTRUp+9ZcSUbxLl1jL
z{S`Iv+7vFgL?L1rh&G%5LZPixjY<UjF7E-5Y2>vi4*bGRH97t83jGXcuHhkHqr+;%
zhJE$n#sq)JS1~95C2-n{J5%fd`YGGeT2bzNf^|{J7I>S&>{?h0-pTMURNRfLR{>-t
z31ydgGPR^#{pWoBMqkC{!XST09#wl)60rkok^hRW=I#n`{D`y*pV48DnYUBMw@gu!
zQ5;n^1K%@=jJf(DM~E(A>$qqT+PJe3yuWfk4l?KT!>=MluOgiocO=c)SkWD9eS9F)
zpLRCkj;X94b5vj-X6pUk)Q)nGaI~{>^Vgy+wa|?EX7G!e*ogSD^~E;jFVrjIg>=ED
zvcINJ#U1I|?Mn45e)ZGytX8s;2|9+F?GmA+wGU}k`oWxji28YYMa-*`=ZR=qG(>79
zD*pnXG+&%szi~j_Ip6V`F3(pUrQ1$v5oZPUnKi@Omf89ZgZdC0;cCRq>@|Kg?BR`R
zmZT@N@3d;hEdOdNf00EIljw%@2vltW-;3y=hWOdssm<b7myqX)+zIyX=4<wV*p^hD
zr1v|T4Oh=>{YHW&Oqh&7=r~Rv+L+h=qF>UrmL*!9hM*!K*Gm{v#xUJ!yC;>Km|_F>
zpI26zXwWu0uOGHK5f&QyP9V`W+iUgj$307jqYd@NUCvqk(1GfGqng78CscsKme8-3
z`T28kfL(%_v-ai3H)hUKjgUoF2kze>86WcHG^-zq;;lHg++@4uT^56wAj;}|##ILr
z2Z?<COF~jJ&9gzNK4xDONQ6oK@D7Pzv-%<M3v4Ump2Dxr(4A@5dFcE=#!>$#N)Erq
zldz^VDkLw`?vyuDJh;(oyb!89g+t|L_C3c@*DVCfdXck(;D(%?3<8e?%rUKgVGh5Z
zFyo?jc-^4)lIZ5R2yrm#H5(imG|%O~{s<HfUO}1YW%DdYzWadUfulac{d4LMaV8z~
z1lMldU?1U}6c%L?eS&}Ho}4#FKO7AN?LC9aoAg;^)f#NtZRitN<C4!Y<(iHbxJ=yA
zb25Ik<&yclWqutgw`$`BWdGYHojLrvhsA9F1>_=!X@K_)K~7rN0WuPXPsr6D2B}lj
zO@e=&)1K})80r2#xD3!?tM+{}hhHwT&D9dW#?%kzJ;2>7l-9^cl;r+^BZpr&=D_b7
z`CqRg%zzu@IJS(cAp`z!PW|B}I>8aHfPa~ja$`3tzJs4>^(ohp{QZaW?Bqcam-pKo
zr7v?B+G09ldWP<9kLK{}F?viw?Nt5W&~e)n(Wgq6bUrfx6#fAWE%Sb4{rn@?hmZ}|
zYe%RmqOXj~lO5i1#3cK&>prnykiQQ0=kG83f9Qr?-|rs3)dw|xK)5XBxg37cgdGgH
zJ9Gr?ro1*v79vVSBge+9eaZVb-tg2%usVKm)mYUk>*7%JHh_B}a`;89Pz%kCS}FYM
zVdf3#`%2{@6q(z?2|h!vX+^<O$HSVp)i+p(M3}Zr8rt|wpM3qsQtIFtF4Ia#Dy`9x
zUoJQdMG^TgmW>YwasKOk)*E|iN~{9-!q-iSfVp1F-`{(Ku8LnvfA}_C=QyvIQnngb
zZLHUv`a|fw*sDM*lpR_txI3KTl@0Qw_AGwk{$2sJ3JLi6LA95<MXBUp-fHl#9Da=>
zM6cx<sG<u)h0|jra`5Z%33Fs(QRKh0F0~fiGn$!lcJAmSjWLH`FVe|)kVDUeB-oDq
zvrl<j0LVD%JbhVx!{<Qu--r77eafZI%bmwt_a<a#!T~oUk6*ns+FDP0J5frS6%u0+
z6ZoYekj~*3?(c2&bm;G%n?N$CGTuK?it0706o}Px_;n9OZS#BUsKw@R<}DDb@4+6!
zt+sRO4_DL97d<hZvva6Ftc++AQF#{FGYtPTi(lG8{vv3XJG6FKeOVlixZ0Gz<~PL=
z%Ri@nzMowU1;qwYc7agmz}*(^o%?J%s%M`*F<cmt`-ciXVP`s5SpJihAMqOk{_s8J
z21h+W<a78%ona{(ved{kgaeQfWk2FW5BJTvKPn+(Br5uI_9{y2Z{ymQ!f8a69@6IA
zzcET;)U>(^7|P2z>WHd<c`>+r%sq!+zu>3S0|Uh_<@Y#?*TfGU!)C+HOSWq=pZ|KB
zK63<1OFGMj2?15a-4B5Nj8+33X7Nkj-+R;eN8z@+>*-a|!1ttMxBLDPHVBKeTQeBf
zp?*U=KZHtn9G};^T2@9h|JrYf=c%p=zAmR9dI{C?mh2;b>g$bYhrFizq(%0b#V<k$
zpI_Wcm_-LIi(t9I0tg2i12mkqFM@sj9pT;{sUQAU!j^>wib92dGFN~21&LOW4ej}p
z;9qypzuILp2bm}H_;pUQtpa2x7t+h3IqmvwS%dbb-Qa`*+@9sj!kDnSs=RSn!7_^P
zs5LdV(WKo3<}#4SuQOngmP^}Lsv_;>ms?bec2${XC=lI}wJ&@A6Rg|t%3t}VjPPgi
z!_g}0)-tz2=J0ErP6$k=LSG8ISe;()*DG638%Ut9jD@rI1^o~+y=%mMPMMPT1bX1!
zKct%ig@|+N520(}wd~oi$hw01J&^A2^Pbk~*<Aec^KR3d#&{gYNz=PV->uwFF)s*a
z5>YqDZU+DQ4*m-W7LFgY0)gv#!g?+Hh8p7*|ALXnuZ7M%!;vjoTkpa@+nMn6>ECC6
zrQt>?^9$QqDEl1LADXslZUSE};{S&HAP#hF6Q>=4P)#ylKYtX}@>w_zVc|yHBWtrj
zR+7&1uMyNEHE^<&QDT&cWKut;3+|G*oU7kR&>qC$u$0%N5edz{TUH>~*!Uz@zwsRH
z7oG?><ELm;ny5KBPS8Bt@ky?J<19Vw@P<Px5obOkpl<}6?#@_;|D4a0*AJgJe}f7a
z|Id{7**O~pMP6kvdS*>?a?hOmH!gUAU%0kcnKUn@upvhki>3m&e_oX3^uuvFX|2LN
z70OaV-m@L}^#sTL8z_L!<JVV6%7)th*q>2XLLO}{EdZj`wig?S{bulMnWLMQacz=S
zdAig}uD@1zh`QpnVH6qW_*a3^y#^7;YlROK?j=ve`PwbTtb_acZTs{1)kbkzWr22?
zYMcgOM2e-3vY=Ta=HM5*9tBzruEn(*I51VxvlbU|h~{wd`C0x|f&AB5I44)?zLlyx
z|K-A+7+7Ug)bCeb%Gww7LrswBfNW@LakZA>Xh{4bT#kAs8z)HpP}Uy;tyDEee=8fE
zj>8Tgzg23Uv-nlmrO7_tr6hqYUIC8wEPXrtKX7(?mVdp>QN_glJu>Zu*XvJo_le8q
zb8Fm>uARv#_#AzdIrg=$a$H>X1`+#}Z4G4-VLf^LvZSnPLf=S-Ge;qI>ShA?1;3To
z5AQH{(&Lsd9sNv0705yT9lFyz-l235?lj5T1@4bBW24wwOBfFGa(`NHT&QbDHdTd+
z<cXEAv_ah8tM1Y~VJ+;<9HAQS#(5C!X~IFv2oRskKK)t~+}DaUP8t7(J{EVS-RJKs
zRX-NLN<))*kI6334=si$m)t3YA~<RUXTDCJ#cLEL6FL2`0Qc!d8`8M7BS`lo7LS*_
z-x3U+6-UhC3B}H?7w(^@PV$8GFv3C<N)2g4Y^4LWg$W>9PCx9CrWe!GfZAR39eZJm
zcd_;(S}HJRI~yOG<?pL;-pj!~-PB?FqmLG%7UE%}DhV}pG`sHo3!W6GTkB1nH($CB
z@)0jN8Z+7JV%7I*wkR{-CFt$W>oP3dhk0GIgOMEx<@d&WElsr7%H!7+8Y_h=l2Wdj
z(;dwd@R<R6iyKi_I!3ej_06j8F|P_g|32XyM@aus)GMN!y@ydnIm^EaycB1sKLlEd
z=QmfcaT?5PJPPutSuJLEEoA*6_A_B0$`A{r#`r68M3M3KS%ow4A%TC%Y7LhhA^7{6
zlEhjQCrO(GJ|QK$?u%ao=1crS#R3`}LOssII&K&4bRNI1(WOK~RmlXde?gheX4i+x
zYFJ!@iQ=~$|C$gObCDK};#`{v2l8R}YA;T)S^CF${2DVY(~3LIg{Y+|GKaJV=HgJX
zI1W4K_}3v4IPF!9dmnKymf3g-V50<uAvvob@&yz09_*_&;iwiTM8NhVAeZrm`9*nd
zD`Tf=$Dn${)y!)q%W(fj3(l;`deM*Qi+z8S%<G4T=oEk2u6Y=L{zk>XkQ)~vA`(Wx
zIp_RWap!K^J6S#GbntH5JETvt)wEZRXYTng>fp=B)5~@^9uX5ZhKgc5)VQLN<6pOy
z?udI<IoB~9s<M_(cFX#C;8#SSbN<UkC+X?V;>Yz)>kVqOA;Qaxe3M}`^88D?ZoJT0
zcUsv_H@&xyV2@=kLPQ~AEL9khHrQV<LGMRb@jZ$EhI4<O9}Kw%*7~Ek2vOj+pPYV(
z^Ofof?wf?H@jKMduWKkpp%i)E)c-E8A3jD;c6ic_n{ej($#_j#|9`)755<Hht^a`K
z^usZf9h&F+Z)aU5&ZpRVz_}jI(@g7uynYy`_h=yDKcqh|E+Tw_h|vbeGZ1xKbM8M>
zGi=LVxY_7&>;wN&MD~-p_47b0@B&;3MW>(4T(49GVH`nn9>3K4wXWgX_D~O-Cw`0C
z-gWZ+-ro|6pz{37fr^Epnk_iF(1$;V*k~{ub_R1nBadISgMTNi-3xvGr#!-uZYWR>
zn|{9TbNtJu)#S4k5Dkf6@*>{}3*JxroPHP$M$Y!!`aeO$n%97K{Xsps26=}(|5|W`
zNxX19te4X(tlq|Skaz+ELL<k&PKmg%Jibw<St|2ix&WPw^IA0W{A<MA;qct8ZERAh
z10bavUNlHLhaCT!e~9hCjU2u(s}kLvNU{U$@DefynP>S|!P_dXfsM%eL*UmyWCIFj
z&<KVR;N|!i@QdW>SA8Ua#wdo092pW}2)btVLwdXgX)glXG70y<AQV9(^P=YPuOdQ}
zD|~&dN!&mqQ_uD~dHbO#=J?n8g)uvl_O0Bfvwsrl9oSkK`@&^PdHrw^{+j}x79VHj
zrB7=R62G@>5dtdN$n!6G|NLPqbX8wMzY{Coc2Da;CK1iuq~FG*>B#fTVD$fAd)FQu
zS9RXM`;xDum37zBx=Y4%jvl}wB)sywjw2sESwO)X{8BUi<J!2br;|Tq=%gmocFwK@
zmSYpk#xrpecV;cz;K`7Qz%-$Sk}F}U!Zx6!ZZWB*EX7S>VnA)^3?88F@7&j}w2qt3
z^fiO_5BsOH-=2G3-}!ytIo~-KJvdm2_(SEzDIEKH@2y`@+qtS|3;gx(^no~&ulh)9
zGe5|#JcWg+HVZ3M`N$^&6!6z^9p|YX^GoV6*w5JZk_Vah>n#MUsmZewh)&S6R7YmN
zdV-$B9vSMjjPJLWpG67<{57Q>M<ks2t&08pd69sAVLn96K(g5XIt@<>(T1bATmBd2
zn7(FlPdiqqSaZ?&uROh5)@CivWpIyl`w!FAqnoebS8apE{?}D{Rl&B`G-5bkk<)uW
z=DODu+#dyh$LBBln)MiVuI`x__+9<`U2FDKj;@#U^PSIOt_%II2<$_|Oy<-dnBaoD
z@zql%WKvRwxZBRU3ASRHCRTA4$J`tFy-D?utQTp?AU=w!dcj{w9wF_NoGvmb#tB(3
zRItI(JpQ@~7yT$}X}?ps1^$;@aMS+Cgy%v4;rijMctt#Z8Qzw>Zl#qWY-0t@h>Z+J
z@~qcij`g+$wo(xD-vrwb{B>GgOo-o*D~hw8oiJsLbJS}J^-4gkU<4*Q67;yzOt3Eg
z)w2(s*ocZL#eod#LWUy=8Hk8WJtQg2`u!fu)7TLi<z9IQjX6m>lF;hdC2BibeLx!v
z_zV7*zHvAFFBw<4QJ|<Z5}@t_;rd~Yz2US8tdsnsJDo<J?o1#u1b3<og3Xz1=P85e
z;F0FMsjIJHy1=za&(_~!VujN_h<bT_kvHz6BOIZvD!f6rUQAs?f??h$ia%5tJeLu(
zuk3X+b^|keaZl;~p_Y-#l=_L6kBr~=iLyb4h09~hqau>TMI0|#8+dhc;HRoA4&o1=
z>iF1#*N>y<Wq1`%7uFc_9C1X0NSQ9Pr3~)hKrdq*l415cH<-*t<lKVxaWGbW|I3R%
zbiJ)*1VfQSWiG)8Y$2?``0*P83p#_Mg(ddky*iH!?Ub8$@6$I0h-@FmA(PKaA$|jA
zA{?_hYv=>a9)%<3AWEsZ4t*NNZ#<u!L>ENtf%W`VI+JbQiMW)XQQK({Ss{Kye1tO*
z)uPh9pAA7E7+Nr>ELc{d|8*A8^6ql+t)B6Jyhc~wP}&d+Q5?U4?O=IZ)GdzO(yBay
zJ+cGpoi-K;^MU^bkDi+PVH!2cWetw6R?(jl?qHuSoAmlZ-p_`vl#vg*XCEGKS_Nyl
zg~PD-*Eeu}Sv{w$m)l;<UFxiq0PQSL=Jz#Awh!L_CDqEVp051Rb(}X%YnSDo9Y>je
zzQ}fET>ooPS5;bTqzQM30!XHoGM;|P_zleS8R>t)>2qldJuQI~#BU(}5M_o}0y?%p
zTd499lvzjoVH)upu3Z;Le6OVJq2aGL0-)|kac}eY1?oOs@W1|<9iTP+RkcgX<V8|{
zuxV-Kt@QFPw>-Z8wMY3g_3AOCd|SJc{fpr?yLxy4{N<H7jNdrP;11yYSEp>B_293X
zSrzez(pnDVH*UfijpZZed)eEu|JCr_d-Li$Oh(j$$U^^XlP>D-oQ7*(!OrA!at<F?
zMV~uwg#OpfvUeN|<68FPA<&i$wZaY64u~W4zZR<#V41J<X-l!~)%sTT9t^FsnJ>Im
zohtZWPoWkYo#oj75{NT*;8(iyJVAH-^+UP;bxkaP8_Q5@0a`Cd-tAmZn}(Om9kJ;`
z{2@+LPMMwA<Aj6EU1oo_Rt!?hS==b)`$QIf%f``W992`}{Ljt0$<%DwIvqMV1|9VM
zFS{1Yh8gVMGMuc(nmtEgfnkbNbFy-kddZttpNstfrqS}z=D60l`(yFUZ1d^L+v=yL
z+LD`I2z)*GUv$-KV+eJV#{t^<;M%_{`RfAax^Vw%hF-zVw~<+G9etVu7ffr7^%q=H
z7|46i8rFAVeWPWac`|#8c+ST8_Xy%e!A(>-5a^dM>Scr*GjkOQju4}+$`{lsPo{{!
zaF;zHt`cGMs293Y4s6UD&b<igQ>0qR_(M96B@5_Rqtq|HNmR;<INW(G@AKEqv+7^b
z7kD*?SK=P~O4kG{iUt1qJHoO?zWNQ#J?7v<@}B?YM0ROOk1qt`=b;XH#2H|yv-*oe
zKLknP1!qp;t%Cn`R>cjdywWxKOeRb{YtrL#_k>l1{?~WufCZ*LrrxR!sUx`r&NHgt
z;q_Q}EcjnPr}F}{guvVVaNKw_a^)bSH;13GdUKtYr|)^?S^8MuUj3IfoXeIfV{4P*
zZQ8&N+r|DD;twORwOVk$)(X)(f`BXdUseR?zr6W*$}nM>*XPi@E#m1*^}~s$4(^uz
z7n%Q5h~MZI@Hl2M4KB)@5%nLXn$ampk-Zc8Uu)<|>ABpE`1v0nJ$ZTPVfB96FHSOC
zm}7c#ru+U%4AE*uGw7Gribv6Lq~b*?yqOJz{?`k5FAUCqjiFv2%Ik>pnCCG=c2(yO
z&fzbd%a;9qo~;mf3fy;bKGo)+UZMYWj9$mG;ZPc8;bE&zROMj=J}Q~$fr9__B7JkH
zuHKZdY}zmETxFlMAw^3bmxqM@*AyKgR*%yk)pQW|RNQ`B#bF1x)lHYPiY4Bde<${r
z>}Ql5Zhl|;oH)l;=9XWn`7QGt-#F5O_g5NBj#c;mUV720&SEv?BmUyj<wA4h{qySL
zV*iW5FL)<1+|bC+zntV%wc2j@r}Z2JjgUK;kDzW7{k1PKto<Gxut)lu5J*o4+=%+Z
z{#RpNhDPL$&n>R8bo+4jcOcV*J+f?>*B3H={v@xLXQ{d<!*h6zN`*0$;d|2YqV+?Y
z9Jmz`A@7fZ`(HJrb!4a5_i*!P!T*|}PaRkwecDBOSYRP>M*BC+B)I=DjNg#!hc9z?
zweTVoZRNhj|A3Ce0;#N5=zrx2W+7FYDu`^PDe>5lwnv?!5%gHW|GKP7^9ec#A~RWE
z(^8DXM>vd=bcGu5*C~ELzOC|@dL?_nYU(OKfeJn%6nO|P@V{c%|AO0f_?Y(B3<cYD
z--${r*pe(yL&5)IV5>Ctzd&0mDrf<`i%DkjaOi)*u$KFSFh%NUDzj!uvl!TkGNZ+K
zVgGBLz%2*a@*MoHZ{(gBs<?uALwaOpzTkh|N8cfK9Cs*Hivyx@8VmKkSO-Yt0SfUO
zu)a=G`NL`)!<dPRWHv(k`R#Mge|?VL{7GwW)7Nn9>($KaTyLNDWf<ho&)NSPqK`SQ
zID2N`9ToHZV2jY?gug}<_=}96svn5fQ-}6x>($8&7Tn-}(S%rO!>|wiuVH$ftsVxS
z%CM-0iWVFC^|#n)Ho1C7;D3$MlNEI${vnQieZ#C9j@u}_yzCb%1EK#lhPpSNN+eZ9
zWJQkMR8uj;hKCyomQ}d_m4QE)6p>kJ&x;kq&6hRI^Vk7z&IR!sg7Qr6992Ju>VOL@
zT-$p=@|Sa%1^lI0vveN&)V-3wJ}Ga_MNR{}YT{R;TDX4rKo+y#aALOp4tgQ`1WVlG
z_7|p@QMG9O5HtUjnN&xx##sOLp`-8_U1Ld-6qkA`;}3E2SHLC_xE6pZBro4{*9r(@
zRf-_~(3Y!esF&PI0O-vj5OGR+$HRs7!&!JGKN9e^(zJmv;X8OYu3S+(JRR^CO|)zM
ze8yU<SB<FwQ2N{56sOgD)<l=FSJ}b0Td}i6fOhb^teDg4`g$Z(g^3iyy(ifcAefhr
zAjPIWT1tkX02mVd22y;PiInl6vO{cVu@FqTDO*|itO<^vhcA|%2ZA!Eba;%SgIPlX
z5W3uBK#B-t?lC$t>D-n?w8955RpFWR=$7UfMg4k3l+Co&i6xC*5A*|UC+<X(IuGlG
zj<ZN7g#uurgr@wvz0Rxqgbgaox_n*)3>@neX1o8a32xZRZ__rkh6i{|EZVK4kP-{a
z%rzS`#~P{<F8C@LLul1Y^i`w;_3F@*nF#ANt#RD~c)(1L>(GHZq=fxNlq7iXB;9x)
zSSxfdg^~L~pC&~wt1<QQ0K8<ZaC+HhQ+Irsi4Mcg^s#MbEE|9U!*<*h;g5}pj-cLZ
z0J4<K#F=JNQJHO|^qA4C9)eYwa@LcIhBCI%r);CGA|}C7G)l}?;z|caMT`gIuuN$e
zX}dOVct8&TQoLG`9IGTav*38UV2QaUtLUP=4!6z)G7~-8m&8STb-c<0tuDyS$duq&
z6Fth_%no~dJT~cqZ2*h>6vyw2?lNt!n6cN!tMC=TQUD0g*nb$m*@=2j>+Ugvd;n7R
zX5<rV6}>WN#~&LgYN>wNgQnCt5fr*i*(v()2;)&>r-(~XX6(%L**)=CAk)o_eq{%3
zr<kKiu$gKd17q4v@t@V*LAHpqGPw*SfjeMrVagN{l(|D^;89%5mBmt#>2_Q#Lk}WF
zVBE`3cZUIOVqK=ER>`fASck%$Ev(iw0{tRQNjqDTv53)G0QZY6EM^*9;ch<Aqz>J3
z)t5S;XkDbhEY#yNg~-#>?hciNU<^Kt1UZ(FATtE>%M?Mqq<;0e`URDd0Q%*n#DaQF
zaBYr$Ev1`<VnYX|#(AZ|zj{)MP$yZA58^nQiZaQRP)4d1FV?SV0yB9U=L;E1EALI$
z)any1hyoa`N{Zu68(}^T#-6b+_isBCdqRRFK!cGQyI%rPcosv>Dn>Q|2$hk%BGgau
zh0Ly9(YVu77afv7?@<8kXnYVUg?zfx(JlH`CB}WA@b<Ljr3BByLav$4)-qh`C_CR^
zkE8&$3?L;Cp$bJ6Jcn>}5AZ}GC6tM1o9UvnI$720g1V&HTeF#t$rK(4nZ|=8xxkpx
zeNvcO^q?|>l&BNPG{jSrR_oxQoj!={Y_PbqBsqAfE)b!O*EU`In`<9l`?M5<GQSRJ
z{`<-`FTFQ<<|`76zfugspRe4|`&!K}&tCW!7pyD>q0Hz1<i0l_|Iy|5u1aup?d8X=
zetutSvgYZ_R~`;!6wvVr>o&by@^Ue#Eq4MTy@-zI5p*bXy?Mi*Nkotj(XZgsxDv{k
z=z?Y9E*6!2F&Bi-`jz=maX#~T*(Ye*3ZK=a-;-IA>pC4R1%8oDC*n<ANu{?0aLbcI
zx#sh-pTZSrr~H@>57Z{qp8^PFbnp!IfM-g9Cu1pGwdpwBO68&iWZg#*?=Irykf43w
zcyknoXh6r;0d7Vd1q7Q*_8cz(jw|9mE2Po+z@HB}n3G{vFS17p7K-rlNh=)%Ixfj4
zcox^wN-cF$v=nrB^-570wF}GE<4P&;vY`}tbR6<>G4N%0_dH$>30m^9KhG;Y`rgbk
z`>uF&vIIDOnUx-OuQ*}f7B8PH0lrLnE-!mTA29WJ&|m+#esR=Y(s5Z_d9(xwuRPRk
z>-&`7q`O2kUjl-$f&QAq%OOEaUiR`qpN70#0s<L~L!Pm~%TcuiP*5+8(oSvCh$x*U
zfcwvqyi5gN4hh=hWmgDeehx2(1T8`EEQOb<RhZ&G>qhz|d>ORiI%P3+3M*d%{5DJz
zG@nN-O{cLE;Q0BFL9N_9s6SBx#)D^d>Neif*%OHllmOwkA<UOzUM|cl?v&$Z#Fdn!
zW68oUFV6uYcoy$U!#3zvqSpaIe|ff8NuOt38_CP4z{2wg8cgj=@a`{aoB74*)vKyX
z0T1exDxrXo6dXSzl61Tz;N>}>JrMbC<>k3_91!#$htDdd;~?eJP-YG<hXn0{PzEsv
zCke5(@^B!)LjgcaC_}}rAkiEW3WcyUMp*E$s1$@UbMtwq*vSlJ{9PL?x(=+6+cyBx
z0F=Q06fDDeBTx>`P$v9UDZp@*A9<M09l7`&HfcR$Ge`+#DhAb)becC=r680E9IxUD
z-k<xuN6CVfHcOBa<YUpIq;dgqz{{KvpvByjac@M=%jbgmP*H>X`Cxgas4^L>5*F&|
z7f1dl3d-zuTv3WIRWM*=!UbCCr@Q~@toW}R;SC#Z@NISV4Zi%J`fB5~Yu6l^c_|1V
zS^8C&^8Z$5o-T(<{lB2g*PRneRWD5O+puV477yBRY)UccX)ptnf<SkQba~G3mpO$p
zB`Un^T%g^d%nfuol=-jea-hPYQeR(}=T4sfv*zk@*eo6h$6>K9%SjMF4n=*Txw>5V
zrHdAH`Fc~q|E<2y>!R!YiETMW4wEEx+<l#|7m^lQV4(#TT413C7FuAT1r}Q1Gv5NP
zy##{^_7eZhH^xE(EVRHv3oNw2LJKUkz(Nar=2`%|{0h<U&m>9Ue;kA(UjFMef-i3*
SDJOpiTT13LR@j#EGx-nlfX!L}

diff --git a/fpga/hi_simulate.v b/fpga/hi_simulate.v
index 92445edb6..78650c4a9 100644
--- a/fpga/hi_simulate.v
+++ b/fpga/hi_simulate.v
@@ -65,9 +65,12 @@ begin
     if(mod_type == 3'b101)
       // Get bit every at 53KHz (every 8th carrier bit of 424kHz)
       ssp_clk <= ssp_clk_divider[7];
+    else if(mod_type == 3'b010)
+      // Get next bit at 212kHz
+      ssp_clk <= ssp_clk_divider[5];
     else
       // Get next bit at 424Khz
-      ssp_clk <= ssp_clk_divider[4]
+      ssp_clk <= ssp_clk_divider[4];
 end
 
 
@@ -121,6 +124,6 @@ assign pwr_oe4 = modulating_carrier;
 // This one is always on, so that we can watch the carrier.
 assign pwr_oe3 = 1'b0;
 
-assign dbg = modulating_carrier;
+assign dbg = ssp_din;
 
 endmodule

From 61e4eac2b249e8a4d4b86fe6ea2089c22e87b49f Mon Sep 17 00:00:00 2001
From: AntiCat <github@anticat.ch>
Date: Wed, 5 Sep 2018 22:23:25 +0200
Subject: [PATCH 0008/1938] Legic: Moved card simulator into separate file &
 cleaned interface.

Reader and card simulation have almost no common code. Moreover the sim
uses an SSP Clock at 212kHz for all timings to prevent any drifting from
the PRNG. This clock speed is not available in reader simulation mode (SSP
runs at up to 3.4MHz, and changes speed between TX and RX). For these
reasons having the code in separate files makes it significantly cleaner.
---
 armsrc/Makefile     |   2 +-
 armsrc/appmain.c    |   5 +-
 armsrc/legicrf.c    |  14 ++---
 armsrc/legicrf.h    |   2 +-
 armsrc/legicrfsim.c | 139 ++++++++++++++++++++++++++++++++++++++++++++
 armsrc/legicrfsim.h |  19 ++++++
 client/cmdhflegic.c |  19 +++---
 7 files changed, 176 insertions(+), 24 deletions(-)
 create mode 100644 armsrc/legicrfsim.c
 create mode 100644 armsrc/legicrfsim.h

diff --git a/armsrc/Makefile b/armsrc/Makefile
index d70008e0c..aedcd79a1 100644
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -54,7 +54,7 @@ SRC_FELICA = felica.c
 SRC_CRAPTO1 = crypto1.c des.c aes.c desfire_key.c desfire_crypto.c mifaredesfire.c
 SRC_CRC = crc.c crc16.c crc32.c 
 SRC_ICLASS = iclass.c optimized_cipher.c
-SRC_LEGIC = legicrf.c legic_prng.c
+SRC_LEGIC = legicrf.c legicrfsim.c legic_prng.c
 SRC_BEE = bee.c
 
 # RDV40 related hardware support
diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index c6e6e0dee..a048418d0 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -19,6 +19,7 @@
 #include "printf.h"
 #include "string.h"
 #include "legicrf.h"
+#include "legicrfsim.h"
 #include "lfsampling.h"
 #include "BigBuf.h"
 #include "mifareutil.h"
@@ -796,10 +797,10 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 
 #ifdef WITH_LEGICRF
 		case CMD_SIMULATE_TAG_LEGIC_RF:
-			LegicRfSimulate(c->arg[0], c->arg[1], c->arg[2]);
+			LegicRfSimulate(c->arg[0]);
 			break;
 		case CMD_WRITER_LEGIC_RF:
-			LegicRfWriter( c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+			LegicRfWriter(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
 			break;
 		case CMD_READER_LEGIC_RF:
 			LegicRfReader(c->arg[0], c->arg[1], c->arg[2]);
diff --git a/armsrc/legicrf.c b/armsrc/legicrf.c
index 3a45c4c67..59cda1221 100644
--- a/armsrc/legicrf.c
+++ b/armsrc/legicrf.c
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------------
 // (c) 2009 Henryk Plötz <henryk@ploetzli.ch>
 //     2016 Iceman
-//     2018 AntiCat (rwd rewritten)
+//     2018 AntiCat
 //
 // This code is licensed to you under the terms of the GNU GPL, version 2 or,
 // at your option, any later version. See the LICENSE.txt file for the text of
@@ -16,7 +16,7 @@
 #include "legic_prng.h"         /* legic PRNG impl */
 #include "legic.h"              /* legic_card_select_t struct */
 
-static uint8_t* legic_mem;      /* card memory, used for read, write and sim */
+static uint8_t* legic_mem;      /* card memory, used for read, write */
 static legic_card_select_t card;/* metadata of currently selected card */
 static crc_t legic_crc;
 
@@ -179,7 +179,7 @@ static uint32_t rx_frame(uint8_t len) {
   uint32_t last_frame_start = last_frame_end;
 
   uint32_t frame = 0;
-  for(uint8_t i = 0; i < len; i++) {
+  for(uint8_t i = 0; i < len; ++i) {
     frame |= (rx_bit() ^ legic_prng_get_bit()) << i;
     legic_prng_forward(1);
 
@@ -235,7 +235,7 @@ static bool rx_ack() {
 // Legic Reader
 //-----------------------------------------------------------------------------
 
-int init_card(uint8_t cardtype, legic_card_select_t *p_card) {
+static int init_card(uint8_t cardtype, legic_card_select_t *p_card) {
   p_card->tagtype = cardtype;
 
   switch(p_card->tagtype) {
@@ -314,7 +314,7 @@ static uint32_t setup_phase_reader(uint8_t iv) {
   legic_prng_init(0);
   tx_frame(iv, 7);
 
-  // configure iv
+  // configure prng
   legic_prng_init(iv);
   legic_prng_forward(2);
 
@@ -501,7 +501,3 @@ OUT:
   switch_off();
   StopTicks();
 }
-
-void LegicRfSimulate(int phase, int frame, int reqresp) {
-  cmd_send(CMD_ACK, 0, 0, 0, 0, 0); //TODO Implement
-}
diff --git a/armsrc/legicrf.h b/armsrc/legicrf.h
index 4bcf04899..639687558 100644
--- a/armsrc/legicrf.h
+++ b/armsrc/legicrf.h
@@ -1,5 +1,6 @@
 //-----------------------------------------------------------------------------
 // (c) 2009 Henryk Plötz <henryk@ploetzli.ch>
+//     2018 AntiCat
 //
 // This code is licensed to you under the terms of the GNU GPL, version 2 or,
 // at your option, any later version. See the LICENSE.txt file for the text of
@@ -16,6 +17,5 @@
 extern void LegicRfInfo(void);
 extern void LegicRfReader(uint16_t offset, uint16_t len, uint8_t iv);
 extern void LegicRfWriter(uint16_t offset, uint16_t byte, uint8_t iv, uint8_t *data);
-extern void LegicRfSimulate(int phase, int frame, int reqresp);
 
 #endif /* __LEGICRF_H */
diff --git a/armsrc/legicrfsim.c b/armsrc/legicrfsim.c
new file mode 100644
index 000000000..791082d6b
--- /dev/null
+++ b/armsrc/legicrfsim.c
@@ -0,0 +1,139 @@
+//-----------------------------------------------------------------------------
+// (c) 2009 Henryk Plötz <henryk@ploetzli.ch>
+//     2016 Iceman
+//     2018 AntiCat
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// LEGIC RF simulation code
+//-----------------------------------------------------------------------------
+#include "legicrf.h"
+
+#include "ticks.h"              /* timers */
+#include "crc.h"                /* legic crc-4 */
+#include "legic_prng.h"         /* legic PRNG impl */
+#include "legic.h"              /* legic_card_select_t struct */
+
+static uint8_t* legic_mem;      /* card memory, used for sim */
+static legic_card_select_t card;/* metadata of currently selected card */
+static crc_t legic_crc;
+
+//-----------------------------------------------------------------------------
+// Frame timing and pseudorandom number generator
+//
+// The Prng is forwarded every 99.1us (TAG_BIT_PERIOD), except when the reader is
+// transmitting. In that case the prng has to be forwarded every bit transmitted:
+//  - 31.3us for a 0 (RWD_TIME_0)
+//  - 99.1us for a 1 (RWD_TIME_1)
+//
+// The data dependent timing makes writing comprehensible code significantly
+// harder. The current aproach forwards the prng data based if there is data on
+// air and time based, using GetCountSspClk(), during computational and wait
+// periodes. SSP Clock is clocked by the FPGA at 212 kHz (subcarrier frequency).
+//
+// To not have the necessity to calculate/guess exection time dependend timeouts
+// tx_frame and rx_frame use a shared timestamp to coordinate tx and rx timeslots.
+//-----------------------------------------------------------------------------
+
+static uint32_t last_frame_end; /* ts of last bit of previews rx or tx frame */
+
+#define TAG_FRAME_WAIT       70 /* 330us from READER frame end to TAG frame start */
+#define TAG_BIT_PERIOD       21 /* 99.1us */
+
+#define RWD_TIME_PAUSE        4 /* 18.9us */
+#define RWD_TIME_1           21 /* RWD_TIME_PAUSE 18.9us off + 80.2us on = 99.1us */
+#define RWD_TIME_0           13 /* RWD_TIME_PAUSE 18.9us off + 42.4us on = 61.3us */
+#define RWD_CMD_TIMEOUT      40 /* 40 * 99.1us (arbitrary value) */
+
+//-----------------------------------------------------------------------------
+// Legic Simulator
+//-----------------------------------------------------------------------------
+
+static int32_t init_card(uint8_t cardtype, legic_card_select_t *p_card) {
+  p_card->tagtype = cardtype;
+
+  switch(p_card->tagtype) {
+    case 0:
+      p_card->cmdsize = 6;
+      p_card->addrsize = 5;
+      p_card->cardsize = 22;
+      break;
+    case 1:
+      p_card->cmdsize = 9;
+      p_card->addrsize = 8;
+      p_card->cardsize = 256;
+      break;
+    case 2:
+      p_card->cmdsize = 11;
+      p_card->addrsize = 10;
+      p_card->cardsize = 1024;
+      break;
+    default:
+      p_card->cmdsize = 0;
+      p_card->addrsize = 0;
+      p_card->cardsize = 0;
+      return 2;
+  }
+  return 0;
+}
+
+static void init_tag() {
+  // configure FPGA
+  FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
+  FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_SIMULATOR
+                  | FPGA_HF_SIMULATOR_MODULATE_212K);
+  SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
+
+  // configure SSC with defaults
+  FpgaSetupSsc();
+
+  // first pull output to low to prevent glitches then re-claim GPIO_SSC_DOUT
+  LOW(GPIO_SSC_DOUT);
+  AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
+  AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
+
+  // reserve a cardmem, meaning we can use the tracelog function in bigbuff easier.
+  legic_mem = BigBuf_get_EM_addr();
+
+  // init crc calculator
+  crc_init(&legic_crc, 4, 0x19 >> 1, 0x05, 0);
+
+  // start 212kHz timer (running from SSP Clock)
+  StartCountSspClk();
+}
+
+//-----------------------------------------------------------------------------
+// Command Line Interface
+//
+// Only this function is public / called from appmain.c
+//-----------------------------------------------------------------------------
+
+void LegicRfSimulate(uint8_t cardtype) {
+  // configure ARM and FPGA
+  init_tag();
+
+  // verify command line input
+  if(init_card(cardtype, &card) != 0) {
+    DbpString("Unknown tagtype.");
+    goto OUT;
+  }
+
+  LED_A_ON();
+  DbpString("Starting Legic emulator, press button to end");
+  while(!BUTTON_PRESS()) {
+    WDT_HIT();
+
+    // init coordination timestamp
+    last_frame_end = GetCountSspClk();
+
+    // reset prng
+    legic_prng_init(0);
+  }
+
+OUT:
+  DbpString("Stopped");
+  switch_off();
+  StopTicks();
+}
diff --git a/armsrc/legicrfsim.h b/armsrc/legicrfsim.h
new file mode 100644
index 000000000..c1c8a86e2
--- /dev/null
+++ b/armsrc/legicrfsim.h
@@ -0,0 +1,19 @@
+//-----------------------------------------------------------------------------
+// (c) 2009 Henryk Plötz <henryk@ploetzli.ch>
+//     2018 AntiCat
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// LEGIC RF emulation public interface
+//-----------------------------------------------------------------------------
+
+#ifndef __LEGICRFSIM_H
+#define __LEGICRFSIM_H
+
+#include "proxmark3.h"
+
+extern void LegicRfSimulate(uint8_t tagtype);
+
+#endif /* __LEGICRFSIM_H */
diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index 559209afb..0b744c659 100644
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -46,19 +46,15 @@ int usage_legic_rdmem(void){
 int usage_legic_sim(void){
 	PrintAndLogEx(NORMAL, "Simulates a LEGIC Prime tag. MIM22, MIM256, MIM1024 types can be emulated");
 	PrintAndLogEx(NORMAL, "Use eload/esave to upload a dump into emulator memory");
-	PrintAndLogEx(NORMAL, "Usage:  hf legic sim [h] <tagtype> <phase> <frame> <reqresp>");
+	PrintAndLogEx(NORMAL, "Usage:  hf legic sim [h] <tagtype>");
 	PrintAndLogEx(NORMAL, "Options:");
 	PrintAndLogEx(NORMAL, "      h             : this help");
 	PrintAndLogEx(NORMAL, "      <tagtype>     : 0 = MIM22");
 	PrintAndLogEx(NORMAL, "                    : 1 = MIM256 (default)");
-	PrintAndLogEx(NORMAL, "                    : 2 = MIM1024");	
-	PrintAndLogEx(NORMAL, "      <phase>       : phase drift");
-	PrintAndLogEx(NORMAL, "      <frame>       : frame drift");
-	PrintAndLogEx(NORMAL, "      <reqresp>     : reqresp drift");
+	PrintAndLogEx(NORMAL, "                    : 2 = MIM1024");
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Examples:");
 	PrintAndLogEx(NORMAL, "      hf legic sim");
-	PrintAndLogEx(NORMAL, "      hf legic sim ");
 	return 0;
 }
 int usage_legic_write(void){
@@ -504,12 +500,13 @@ int CmdLegicRdmem(const char *Cmd) {
 	return status;
 }
 
-// should say which tagtype
-// should load a tag to device mem.
-// int phase, int frame, int reqresp
 int CmdLegicRfSim(const char *Cmd) {
-	UsbCommand c = {CMD_SIMULATE_TAG_LEGIC_RF, {6,3,0}};
-	sscanf(Cmd, " %" SCNi64 " %" SCNi64 " %" SCNi64 , &c.arg[0], &c.arg[1], &c.arg[2]);
+
+	char cmdp = param_getchar(Cmd, 0);
+	if ( cmdp == 'H' || cmdp == 'h' ) return usage_legic_sim();
+
+	UsbCommand c = {CMD_SIMULATE_TAG_LEGIC_RF, {1}};
+	sscanf(Cmd, " %" SCNi64, &c.arg[0]);
 	clearCommandBuffer();
 	SendCommand(&c);
 	return 0;

From fe91a3f52f2f4fc68a8578a05d9a4ce0ce86da4d Mon Sep 17 00:00:00 2001
From: AntiCat <github@anticat.ch>
Date: Wed, 5 Sep 2018 22:23:26 +0200
Subject: [PATCH 0009/1938] Legic: Implemented RX and TX for card simulation

---
 armsrc/legicrfsim.c | 192 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 192 insertions(+)

diff --git a/armsrc/legicrfsim.c b/armsrc/legicrfsim.c
index 791082d6b..862078bf7 100644
--- a/armsrc/legicrfsim.c
+++ b/armsrc/legicrfsim.c
@@ -40,12 +40,204 @@ static crc_t legic_crc;
 static uint32_t last_frame_end; /* ts of last bit of previews rx or tx frame */
 
 #define TAG_FRAME_WAIT       70 /* 330us from READER frame end to TAG frame start */
+#define TAG_ACK_WAIT        758 /* 3.57ms from READER frame end to TAG write ACK */
 #define TAG_BIT_PERIOD       21 /* 99.1us */
 
 #define RWD_TIME_PAUSE        4 /* 18.9us */
 #define RWD_TIME_1           21 /* RWD_TIME_PAUSE 18.9us off + 80.2us on = 99.1us */
 #define RWD_TIME_0           13 /* RWD_TIME_PAUSE 18.9us off + 42.4us on = 61.3us */
 #define RWD_CMD_TIMEOUT      40 /* 40 * 99.1us (arbitrary value) */
+#define RWD_MIN_FRAME_LEN     6 /* Shortest frame is 6 bits */
+#define RWD_MAX_FRAME_LEN    23 /* Longest frame is 23 bits */
+
+#define RWD_PULSE             1 /* Pulse is signaled with GPIO_SSC_DIN high */
+#define RWD_PAUSE             0 /* Pause is signaled with GPIO_SSC_DIN low */
+
+//-----------------------------------------------------------------------------
+// Demodulation
+//-----------------------------------------------------------------------------
+
+// Returns true if a pulse/pause is received within timeout
+static inline bool wait_for(bool value, const uint32_t timeout) {
+  while((bool)(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_DIN) != value) {
+    if(GetCountSspClk() > timeout) {
+      return false;
+    }
+  }
+  return true;
+}
+
+// Returns a demedulated bit or -1 on code violation
+//
+// rx_bit decodes bits using a thresholds. rx_bit has to be called by as soon as
+// a frame starts (first pause is received). rx_bit checks for a pause up to
+// 18.9us followed by a pulse of 80.2us or 42.4us:
+//  - A bit length <18.9us is a code violation
+//  - A bit length >80.2us is a 1
+//  - A bit length <80.2us is a 0
+//  - A bit length >148.6us is a code violation
+static inline int8_t rx_bit() {
+  // backup ts for threshold calculation
+  uint32_t bit_start = last_frame_end;
+
+  // wait for pause to end
+  if(!wait_for(RWD_PULSE, bit_start + RWD_TIME_1*3/2)) {
+    return -1;
+  }
+
+  // wait for next pause
+  if(!wait_for(RWD_PAUSE, bit_start + RWD_TIME_1*3/2)) {
+    return -1;
+  }
+
+  // update bit and frame end
+  last_frame_end = GetCountSspClk();
+
+  // check for code violation (bit to short)
+  if(last_frame_end - bit_start < RWD_TIME_PAUSE) {
+    return -1;
+  }
+
+  // apply threshold (average of RWD_TIME_0 and )
+  return (last_frame_end - bit_start > (RWD_TIME_0 + RWD_TIME_1) / 2);
+}
+
+//-----------------------------------------------------------------------------
+// Modulation
+//
+// LEGIC RF uses a very basic load modulation from card to reader:
+//  - Subcarrier on for a 1
+//  - Subcarrier off for for a 0
+//
+// The 212kHz subcarrier is generated by the FPGA as well as a mathcing ssp clk.
+// Each bit is transfered in a 99.1us slot and the first timeslot starts 330us
+// after the final 20us pause generated by the reader.
+//-----------------------------------------------------------------------------
+
+// Transmits a bit
+//
+// Note: The Subcarrier is not disabled during bits to prevent glitches. This is
+//       not mandatory but results in a cleaner signal. tx_frame will disable
+//       the subcarrier when the frame is done.
+static inline void tx_bit(bool bit) {
+  LED_C_ON();
+
+  if(bit) {
+    // modulate subcarrier
+    HIGH(GPIO_SSC_DOUT);
+  } else {
+    // do not modulate subcarrier
+    LOW(GPIO_SSC_DOUT);
+  }
+
+  // wait for tx timeslot to end
+  last_frame_end += TAG_BIT_PERIOD;
+  while(GetCountSspClk() < last_frame_end) { };
+  LED_C_OFF();
+}
+
+//-----------------------------------------------------------------------------
+// Frame Handling
+//
+// The LEGIC RF protocol from reader to card does not include explicit frame
+// start/stop information or length information. The tag detects end of frame
+// trough an extended pulse (>99.1us) without a pause.
+// In reverse direction (card to reader) the number of bites is well known
+// and depends only the command received (IV, ACK, READ or WRITE).
+//-----------------------------------------------------------------------------
+
+static void tx_frame(uint32_t frame, uint8_t len) {
+  // wait for next tx timeslot
+  last_frame_end += TAG_FRAME_WAIT;
+  legic_prng_forward(TAG_FRAME_WAIT/TAG_BIT_PERIOD - 1);
+  while(GetCountSspClk() < last_frame_end) { };
+
+  // transmit frame, MSB first
+  for(uint8_t i = 0; i < len; ++i) {
+    bool bit = (frame >> i) & 0x01;
+    tx_bit(bit ^ legic_prng_get_bit());
+    legic_prng_forward(1);
+  };
+
+  // disable subcarrier
+  LOW(GPIO_SSC_DOUT);
+}
+
+static void tx_ack() {
+  // wait for ack timeslot
+  last_frame_end += TAG_ACK_WAIT;
+  legic_prng_forward(TAG_ACK_WAIT/TAG_BIT_PERIOD - 1);
+  while(GetCountSspClk() < last_frame_end) { };
+
+  // transmit ack (ack is not encrypted)
+  tx_bit(true);
+  legic_prng_forward(1);
+
+  // disable subcarrier
+  LOW(GPIO_SSC_DOUT);
+}
+
+// Returns a demedulated frame or -1 on code violation
+//
+// Since TX to RX delay is arbitrary rx_frame has to:
+//  - detect start of frame (first pause)
+//  - forward prng based on ts/TAG_BIT_PERIOD
+//  - receive the frame
+//  - detect end of frame (last pause)
+static int32_t rx_frame(uint8_t *len) {
+  int32_t frame = 0;
+
+  // add 2 SSP clock cycles (1 for tx and 1 for rx pipeline delay)
+  // those will be substracted at the end of the rx phase
+  last_frame_end -= 2;
+
+  // wait for first pause (start of frame)
+  for(uint8_t i = 0; true; ++i) {
+    // increment prng every TAG_BIT_PERIOD
+    last_frame_end += TAG_BIT_PERIOD;
+    legic_prng_forward(1);
+
+    // if start of frame was received exit delay loop
+    if(wait_for(RWD_PAUSE, last_frame_end)) {
+      last_frame_end = GetCountSspClk();
+      break;
+    }
+
+    // check for code violation
+    if(i > RWD_CMD_TIMEOUT) {
+      return -1;
+    }
+  }
+
+  // receive frame
+  for(*len = 0; true; ++(*len)) {
+    // receive next bit
+    LED_B_ON();
+    int8_t bit = rx_bit();
+    LED_B_OFF();
+
+    // check for code violation and to short / long frame
+    if((bit < 0) && ((*len < RWD_MIN_FRAME_LEN) || (*len > RWD_MAX_FRAME_LEN))) {
+      return -1;
+    }
+
+    // check for code violation caused by end of frame
+    if(bit < 0) {
+      break;
+    }
+
+    // append bit
+    frame |= (bit ^ legic_prng_get_bit()) << (*len);
+    legic_prng_forward(1);
+  }
+
+  // rx_bit sets coordination timestamp to start of pause, append pause duration
+  // and substract 2 SSP clock cycles (1 for rx and 1 for tx pipeline delay) to
+  // obtain exact end of frame.
+  last_frame_end += RWD_TIME_PAUSE - 2;
+
+  return frame;
+}
 
 //-----------------------------------------------------------------------------
 // Legic Simulator

From 2c6c4e5bc64383dd511e70a24501f2b7e0bdb436 Mon Sep 17 00:00:00 2001
From: AntiCat <github@anticat.ch>
Date: Wed, 5 Sep 2018 22:23:28 +0200
Subject: [PATCH 0010/1938] Legic: Implemented trace log

---
 armsrc/legicrfsim.c | 25 +++++++++++++++++++++++++
 client/cmdtrace.c   |  3 ++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/armsrc/legicrfsim.c b/armsrc/legicrfsim.c
index 862078bf7..d73f09857 100644
--- a/armsrc/legicrfsim.c
+++ b/armsrc/legicrfsim.c
@@ -152,6 +152,9 @@ static void tx_frame(uint32_t frame, uint8_t len) {
   legic_prng_forward(TAG_FRAME_WAIT/TAG_BIT_PERIOD - 1);
   while(GetCountSspClk() < last_frame_end) { };
 
+  // backup ts for trace log
+  uint32_t last_frame_start = last_frame_end;
+
   // transmit frame, MSB first
   for(uint8_t i = 0; i < len; ++i) {
     bool bit = (frame >> i) & 0x01;
@@ -161,6 +164,10 @@ static void tx_frame(uint32_t frame, uint8_t len) {
 
   // disable subcarrier
   LOW(GPIO_SSC_DOUT);
+
+  // log
+  uint8_t cmdbytes[] = {len, BYTEx(frame, 0), BYTEx(frame, 1)};
+  LogTrace(cmdbytes, sizeof(cmdbytes), last_frame_start, last_frame_end, NULL, false);
 }
 
 static void tx_ack() {
@@ -169,12 +176,19 @@ static void tx_ack() {
   legic_prng_forward(TAG_ACK_WAIT/TAG_BIT_PERIOD - 1);
   while(GetCountSspClk() < last_frame_end) { };
 
+  // backup ts for trace log
+  uint32_t last_frame_start = last_frame_end;
+
   // transmit ack (ack is not encrypted)
   tx_bit(true);
   legic_prng_forward(1);
 
   // disable subcarrier
   LOW(GPIO_SSC_DOUT);
+
+  // log
+  uint8_t cmdbytes[] = {1, 1};
+  LogTrace(cmdbytes, sizeof(cmdbytes), last_frame_start, last_frame_end, NULL, false);
 }
 
 // Returns a demedulated frame or -1 on code violation
@@ -209,6 +223,9 @@ static int32_t rx_frame(uint8_t *len) {
     }
   }
 
+  // backup ts for trace log
+  uint32_t last_frame_start = last_frame_end;
+
   // receive frame
   for(*len = 0; true; ++(*len)) {
     // receive next bit
@@ -236,6 +253,10 @@ static int32_t rx_frame(uint8_t *len) {
   // obtain exact end of frame.
   last_frame_end += RWD_TIME_PAUSE - 2;
 
+  // log
+  uint8_t cmdbytes[] = {*len, BYTEx(frame, 0), BYTEx(frame, 1), BYTEx(frame, 2)};
+  LogTrace(cmdbytes, sizeof(cmdbytes), last_frame_start, last_frame_end, NULL, true);
+
   return frame;
 }
 
@@ -289,6 +310,10 @@ static void init_tag() {
   // reserve a cardmem, meaning we can use the tracelog function in bigbuff easier.
   legic_mem = BigBuf_get_EM_addr();
 
+  // start trace
+  clear_trace();
+  set_tracing(true);
+
   // init crc calculator
   crc_init(&legic_crc, 4, 0x19 >> 1, 0x05, 0);
 
diff --git a/client/cmdtrace.c b/client/cmdtrace.c
index b30f7898a..537786bb4 100644
--- a/client/cmdtrace.c
+++ b/client/cmdtrace.c
@@ -521,7 +521,8 @@ int CmdTraceList(const char *Cmd) {
 		if ( protocol == ICLASS )
 			PrintAndLogEx(NORMAL, "iClass - Timings are not as accurate");
 		if ( protocol == LEGIC )
-			PrintAndLogEx(NORMAL, "LEGIC - Timings are in ticks (1us == 1.5ticks)");
+			PrintAndLogEx(NORMAL, "LEGIC - Reader Mode: Timings are in ticks (1us == 1.5ticks)\n"
+			                      "        Tag Mode: Timings are in sub carrier periods (1/212 kHz == 4.7us)");
 		if ( protocol == ISO_15693 )
 			PrintAndLogEx(NORMAL, "ISO15693 - Timings are not as accurate");
 		if ( protocol == FELICA )

From cd78b008156e4d1fe084c16757bd5b15036fd49f Mon Sep 17 00:00:00 2001
From: AntiCat <github@anticat.ch>
Date: Wed, 5 Sep 2018 22:23:35 +0200
Subject: [PATCH 0011/1938] Legic: Implemented setup phase for card simulation

---
 armsrc/legicrf.c    | 10 ++---
 armsrc/legicrfsim.c | 89 +++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 90 insertions(+), 9 deletions(-)

diff --git a/armsrc/legicrf.c b/armsrc/legicrf.c
index 59cda1221..00d284926 100644
--- a/armsrc/legicrf.c
+++ b/armsrc/legicrf.c
@@ -302,8 +302,8 @@ static void init_reader(bool clear_mem) {
 // The setup consists of a three way handshake:
 //  - Transmit initialisation vector 7 bits
 //  - Receive card type 6 bits
-//  - Acknowledge frame 6 bits
-static uint32_t setup_phase_reader(uint8_t iv) {
+//  - Transmit Acknowledge 6 bits
+static uint32_t setup_phase(uint8_t iv) {
   // init coordination timestamp
   last_frame_end = GET_TICKS;
 
@@ -398,7 +398,7 @@ void LegicRfInfo(void) {
   init_reader(false);
 
   // establish shared secret and detect card type
-  uint8_t card_type = setup_phase_reader(0x01);
+  uint8_t card_type = setup_phase(0x01);
   if(init_card(card_type, &card) != 0) {
     cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
     goto OUT;
@@ -435,7 +435,7 @@ void LegicRfReader(uint16_t offset, uint16_t len, uint8_t iv) {
   init_reader(false);
 
   // establish shared secret and detect card type
-  uint8_t card_type = setup_phase_reader(iv);
+  uint8_t card_type = setup_phase(iv);
   if(init_card(card_type, &card) != 0) {
     cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
     goto OUT;
@@ -474,7 +474,7 @@ void LegicRfWriter(uint16_t offset, uint16_t len, uint8_t iv, uint8_t *data) {
   }
 
   // establish shared secret and detect card type
-  uint8_t card_type = setup_phase_reader(iv);
+  uint8_t card_type = setup_phase(iv);
   if(init_card(card_type, &card) != 0) {
     cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
     goto OUT;
diff --git a/armsrc/legicrfsim.c b/armsrc/legicrfsim.c
index d73f09857..195aa2738 100644
--- a/armsrc/legicrfsim.c
+++ b/armsrc/legicrfsim.c
@@ -321,6 +321,78 @@ static void init_tag() {
   StartCountSspClk();
 }
 
+// Setup reader to card connection
+//
+// The setup consists of a three way handshake:
+//  - Receive initialisation vector 7 bits
+//  - Transmit card type 6 bits
+//  - Receive Acknowledge 6 bits
+static int32_t setup_phase(legic_card_select_t *p_card) {
+  uint8_t len = 0;
+
+  // init coordination timestamp
+  last_frame_end = GetCountSspClk();
+
+  // reset prng
+  legic_prng_init(0);
+
+  // wait for iv
+  int32_t iv = rx_frame(&len);
+  if((len != 7) || (iv < 0)) {
+    return -1;
+  }
+
+  // configure prng
+  legic_prng_init(iv);
+
+  // reply with card type
+  switch(p_card->tagtype) {
+    case 0:
+      tx_frame(0x0D, 6);
+      break;
+    case 1:
+      tx_frame(0x1D, 6);
+      break;
+    case 2:
+      tx_frame(0x3D, 6);
+      break;
+  }
+
+  // wait for ack
+  int32_t ack = rx_frame(&len);
+  if((len != 6) || (ack < 0)) {
+    return -1;
+  }
+
+  // validate data
+  switch(p_card->tagtype) {
+    case 0:
+      if(ack != 0x19) return -1;
+      break;
+    case 1:
+      if(ack != 0x39) return -1;
+      break;
+    case 2:
+      if(ack != 0x39) return -1;
+      break;
+  }
+
+  // During rx the prng is clocked using the variable reader period.
+  // Since rx_frame detects end of frame by detecting a code violation,
+  // the prng is off by one bit period after each rx phase. Hence, tx
+  // code advances the prng by (TAG_FRAME_WAIT/TAG_BIT_PERIOD - 1).
+  // This is not possible for back to back rx, so this quirk reduces
+  // the gap by one period.
+  last_frame_end += TAG_BIT_PERIOD;
+
+  return 0;
+}
+
+// TODO Commands are left as an exercise to the reader
+static int32_t connected_phase(legic_card_select_t *p_card) {
+  return 0;
+}
+
 //-----------------------------------------------------------------------------
 // Command Line Interface
 //
@@ -342,11 +414,20 @@ void LegicRfSimulate(uint8_t cardtype) {
   while(!BUTTON_PRESS()) {
     WDT_HIT();
 
-    // init coordination timestamp
-    last_frame_end = GetCountSspClk();
+    // wait for carrier, restart after timeout
+    if(!wait_for(RWD_PULSE, GetCountSspClk() + TAG_BIT_PERIOD)) {
+      continue;
+    }
 
-    // reset prng
-    legic_prng_init(0);
+    // wait for connection, restart on error
+    if(setup_phase(&card)) {
+      continue;
+    }
+
+    // conection is established, process commands until one fails
+    while(!connected_phase(&card)) {
+      WDT_HIT();
+    }
   }
 
 OUT:

From 2981fe7ce8db62eaf836daf2136c614105065839 Mon Sep 17 00:00:00 2001
From: AntiCat <github@anticat.ch>
Date: Wed, 5 Sep 2018 22:23:37 +0200
Subject: [PATCH 0012/1938] Legic: Implemented read command for card simulation

---
 armsrc/legicrfsim.c | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/armsrc/legicrfsim.c b/armsrc/legicrfsim.c
index 195aa2738..641907741 100644
--- a/armsrc/legicrfsim.c
+++ b/armsrc/legicrfsim.c
@@ -388,9 +388,33 @@ static int32_t setup_phase(legic_card_select_t *p_card) {
   return 0;
 }
 
-// TODO Commands are left as an exercise to the reader
+static uint8_t calc_crc4(uint16_t cmd, uint8_t cmd_sz, uint8_t value) {
+  crc_clear(&legic_crc);
+  crc_update(&legic_crc, (value << cmd_sz) | cmd, 8 + cmd_sz);
+  return crc_finish(&legic_crc);
+}
+
 static int32_t connected_phase(legic_card_select_t *p_card) {
-  return 0;
+  uint8_t len = 0;
+
+  // wait for command
+  int32_t cmd = rx_frame(&len);
+  if(cmd < 0) {
+    return -1;
+  }
+
+  // check if command is LEGIC_READ
+  if(len == p_card->cmdsize) {
+    // prepare data
+    uint8_t byte = legic_mem[cmd >> 1];
+    uint8_t crc = calc_crc4(cmd, p_card->cmdsize, byte);
+
+    // transmit data
+    tx_frame((crc << 8) | byte, 12);
+    return 0;
+  }
+
+  return -1;
 }
 
 //-----------------------------------------------------------------------------

From e1fa1e659aef8d4537748db2e5f0f0182ab91168 Mon Sep 17 00:00:00 2001
From: AntiCat <github@anticat.ch>
Date: Wed, 5 Sep 2018 22:23:44 +0200
Subject: [PATCH 0013/1938] Legic: Implemented write command for card
 simulation

---
 armsrc/legicrfsim.c | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/armsrc/legicrfsim.c b/armsrc/legicrfsim.c
index 641907741..71c747115 100644
--- a/armsrc/legicrfsim.c
+++ b/armsrc/legicrfsim.c
@@ -411,6 +411,31 @@ static int32_t connected_phase(legic_card_select_t *p_card) {
 
     // transmit data
     tx_frame((crc << 8) | byte, 12);
+
+    return 0;
+  }
+
+  // check if command is LEGIC_WRITE
+  if(len == p_card->cmdsize + 8 + 4) {
+    // decode data
+    uint16_t mask = (1 << p_card->addrsize) - 1;
+    uint16_t addr = (cmd >> 1) & mask;
+    uint8_t  byte = (cmd >> p_card->cmdsize) & 0xff;
+    uint8_t  crc  = (cmd >> (p_card->cmdsize + 8)) & 0xf;
+
+    // check received against calculated crc
+    uint8_t calc_crc = calc_crc4(addr << 1, p_card->cmdsize, byte);
+    if(calc_crc != crc) {
+      Dbprintf("!!! crc mismatch: %x != %x !!!",  calc_crc, crc);
+      return -1;
+    }
+
+    // store data
+    legic_mem[addr] = byte;
+
+    // transmit ack
+    tx_ack();
+
     return 0;
   }
 

From 368fe11df08eeb3a881428c984399eebb4aa106d Mon Sep 17 00:00:00 2001
From: "Colin J. Brigato" <colin@brigato.fr>
Date: Thu, 6 Sep 2018 05:15:52 +0200
Subject: [PATCH 0014/1938] Second Pass rewrite of flashmem. added command 'mem
 spibaud' to switch between 24/48Mhz operation. All is more consistant, less
 messy. All logic rewrittent avoiding multiple flashinit/flashstop. busywait
 is now at it's lowest possible. Beware : 48Mhz is VERY buggy cause of
 sillicon bug (see source for more info), and doesn't give much more than
 24Mhz for now since we doubled nearly every operation speed here.

---
 armsrc/Standalone/hf_colin.c |  74 ++++++++--------
 armsrc/Standalone/hf_colin.h |   1 +
 armsrc/appmain.c             | 130 +++++++++++++---------------
 armsrc/flashmem.c            | 163 +++++++++++++++++------------------
 armsrc/flashmem.h            |  22 ++++-
 5 files changed, 201 insertions(+), 189 deletions(-)

diff --git a/armsrc/Standalone/hf_colin.c b/armsrc/Standalone/hf_colin.c
index 3a34396eb..7259fcab3 100644
--- a/armsrc/Standalone/hf_colin.c
+++ b/armsrc/Standalone/hf_colin.c
@@ -153,10 +153,11 @@ void SpinUp(uint32_t speed)
     LED_D_OFF();
 }
 
-void TestFlashmemSpeed(size_t buffersize, bool fastmode)
+void TestFlashmemSpeed(size_t buffersize, uint32_t spibaudrate)
 {
 
-    DbprintfEx(FLAG_NOLOG, "%s---+----[ %s %s[%dKB] %s]", _GREEN_, _WHITE_, _YELLOW_, buffersize / 1024, _WHITE_);
+    FLASHMEM_SPIBAUDRATE = spibaudrate*1000000;
+    DbprintfEx(FLAG_NOLOG, "%s---+----[ %s %s[%dKB] %s] (%d)", _GREEN_, _WHITE_, _YELLOW_, buffersize / 1024, _WHITE_, FLASHMEM_SPIBAUDRATE);
     uint16_t t = 0;
 
     LED_B_ON();
@@ -166,10 +167,10 @@ void TestFlashmemSpeed(size_t buffersize, bool fastmode)
     uint32_t startidx = 0;
     uint32_t numofbytes = 0x3FFFF;
 
-    if (!FlashInit(fastmode)) {
+    if (!FlashInit()) {
         return;
     }
-    Flash_CheckBusy(BUSY_TIMEOUT);
+    //Flash_CheckBusy(BUSY_TIMEOUT);
 
     //Flash_ReadStat1();
 
@@ -183,14 +184,7 @@ void TestFlashmemSpeed(size_t buffersize, bool fastmode)
         //isok = Flash_ReadData(startidx + i, mem, len);
         //uint32_t iend_time;
         //uint32_t istart_time = iend_time = GetTickCount();
-        if (fastmode)
-        {
-            isok = Flash_FastReadDataCont(startidx + i, mem, len);
-        }
-        else
-        {
-            isok = Flash_ReadDataCont(startidx + i, mem, len);
-        }
+        isok = Flash_ReadDataCont(startidx + i, mem, len);
         //iend_time = GetTickCount();
         //DbprintfEx(FLAG_RAWPRINT, "%s%dms%s>", _YELLOW_, iend_time - istart_time, _WHITE_);
         //cjSetCursLeft();
@@ -199,7 +193,7 @@ void TestFlashmemSpeed(size_t buffersize, bool fastmode)
             Dbprintf("[FAIL] reading flash memory failed ::  | bytes between %d - %d", i, len);
             return;
         }
-        //isok = cmd_send(CMD_DOWNLOADED_FLASHMEM, i, len, 0, mem, len);
+        //isok = cmd_send(CMD_FLASHMEM_DOWNLOADED, i, len, 0, mem, len);
         //if (!isok)
         //	Dbprintf("transfer to client failed ::  | bytes between %d - %d", i, len);
         t++;
@@ -213,6 +207,29 @@ void TestFlashmemSpeed(size_t buffersize, bool fastmode)
     FlashStop();
 }
 
+void TestFlashmemRoutine()
+{
+    DbprintfEx(FLAG_NOLOG, "%s>>%s Will Now Test dumping Full flash [256Kb] (2Mbits)through Bigbuf buffers\n", _GREEN_, _WHITE_);
+    MF_DBGLEVEL = MF_DBG_NONE;
+    //DbprintfEx(FLAG_NOLOG, "---------\n%s[A]%s Using NORMAL Reads @Max (24Mhz=MCK/2)\n--------", _GREEN_, _WHITE_);
+    TestFlashmemSpeed(32768,24);
+    TestFlashmemSpeed(16384 + 4096 + 4096,24);
+    TestFlashmemSpeed(16384,24);
+    TestFlashmemSpeed(4096,24);
+    TestFlashmemSpeed(1024,24);
+    //SpinDelay(1000);
+    //WDT_HIT();
+    //DbprintfEx(FLAG_NOLOG, "--------\n%s[B]%s Using FAST Reads @Max (48Mhz=MCK=CPUClock/2=MAXSPI)\n--------", _GREEN_, _WHITE_);
+    TestFlashmemSpeed(32768,48);
+    TestFlashmemSpeed(16384 + 4096 + 4096,48);
+    TestFlashmemSpeed(16384,48);
+    TestFlashmemSpeed(4096,48);
+    TestFlashmemSpeed(1024,48);
+    //SpinDelay(1000);
+    //WDT_HIT();
+    return;
+}
+
 void ReadLastTagFromFlash()
 {
 
@@ -231,11 +248,12 @@ void ReadLastTagFromFlash()
     size_t size = len;
     uint8_t *mem = BigBuf_malloc(size);
 
-    //if (!FlashFastReadInit()){
-    if (!FlashInit(0))
+    if (!FlashInit())
     {
         return;
     }
+    Flash_CheckBusy(BUSY_TIMEOUT);
+
     //Flash_ReadStat1();
 
     uint32_t end_time;
@@ -256,8 +274,8 @@ void ReadLastTagFromFlash()
         {
             DbprintfEx(FLAG_NOLOG, "FlashMem reading failed | %d | %d", len, isok);
             cjSetCursLeft();
-            SpinOff(100);
             FlashStop();
+            SpinOff(100);
             return;
         }
     }
@@ -292,11 +310,12 @@ void WriteTagToFlash(uint8_t index, size_t size)
     emlGetMem(data, 0, (size * 64)/1024);
 
     //if (!FlashFastReadInit()){
-    if (!FlashInit(0))
+    if (!FlashInit())
     {
         return;
     }
     
+    Flash_CheckBusy(BUSY_TIMEOUT);
     Flash_WriteEnable();
     Flash_Erase4k(0,0);
     Flash_CheckBusy(BUSY_TIMEOUT);
@@ -492,25 +511,8 @@ ACCBITS : 796788[00]+VALUE
     SpinDown(50);
 
 #if 0
-    DbprintfEx(FLAG_NOLOG, "%s>>%s Will Now Test dumping Full flash [256Kb] (2Mbits)through Bigbuf buffers\n", _GREEN_, _WHITE_);
-    MF_DBGLEVEL = MF_DBG_NONE;
-    DbprintfEx(FLAG_NOLOG, "---------\n%s[A]%s Using NORMAL Reads @Max (24Mhz=MCK/2)\n--------", _GREEN_, _WHITE_);
-    TestFlashmemSpeed(32768,0);
-    TestFlashmemSpeed(16384 + 4096 + 4096,0);
-    TestFlashmemSpeed(16384,0);
-    TestFlashmemSpeed(4096,0);
-    TestFlashmemSpeed(1024,0);
-    SpinDelay(1000);
-    WDT_HIT();
-    DbprintfEx(FLAG_NOLOG, "--------\n%s[B]%s Using FAST Reads @Max (48Mhz=MCK=CPUClock/2=MAXSPI)\n--------", _GREEN_, _WHITE_);
-    TestFlashmemSpeed(32768,1);
-    TestFlashmemSpeed(16384 + 4096 + 4096,1);
-    TestFlashmemSpeed(16384,1);
-    TestFlashmemSpeed(4096,1);
-    TestFlashmemSpeed(1024,1);
-    SpinDelay(1000);
-    WDT_HIT();
-    return;
+TestFlashmemRoutine();
+return;
 #endif
 
 failtag:
diff --git a/armsrc/Standalone/hf_colin.h b/armsrc/Standalone/hf_colin.h
index 29f8f52e6..dd3da6322 100644
--- a/armsrc/Standalone/hf_colin.h
+++ b/armsrc/Standalone/hf_colin.h
@@ -52,6 +52,7 @@ void WriteTagToFlash(uint8_t index, size_t size);
 
 const char clearTerm[8] = {0x1b, 0x5b, 0x48, 0x1b, 0x5b, 0x32, 0x4a, '\0'};
 
+void TestFlashmemSpeed(size_t buffersize, uint32_t spibaudrate);
 
 
 #define LOGO logo_kigiv
diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index b0538383e..03502f132 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -33,6 +33,10 @@
 #include "i2c.h"
 #endif
 
+#ifdef WITH_FPC
+#include "usart.h"
+#endif
+
 //=============================================================================
 // A buffer where we can queue things up to be sent through the FPGA, for
 // any purpose (fake tag, as reader, whatever). We go MSB first, since that
@@ -74,24 +78,26 @@ void PrintToSendBuffer(void) {
 }
 
 void print_result(char *name, uint8_t *buf, size_t len) {
-	uint8_t *p = buf;
 
-	if ( len % 16 == 0 ) {
-		for(; p-buf < len; p += 16)
-			Dbprintf("[%s:%d/%d] %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x",
+	uint8_t *p = buf;
+	uint16_t tmp = len & 0xFFF0;
+
+	for(; p-buf < tmp; p += 16) {
+		Dbprintf("[%s: %02d/%02d] %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x",
 				name,
 				p-buf,
 				len,
 				p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7],p[8], p[9], p[10], p[11], p[12], p[13], p[14], p[15]
 			);
 	}
-	else {
-		for(; p-buf < len; p += 8)
-			Dbprintf("[%s:%d/%d] %02x %02x %02x %02x %02x %02x %02x %02x",
-				name,
-				p-buf,
-				len,
-				p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7]);
+	if (len % 16 != 0) {
+		char s[46] = {0};
+		char *sp = s;
+		for (; p-buf < len; p++ ) {
+			sprintf(sp, "%02x ", p[0] );
+			sp += 3;
+		}
+		Dbprintf("[%s: %02d/%02d] %s", name, p-buf, len, s);
 	}
 }
 
@@ -101,7 +107,7 @@ void print_result(char *name, uint8_t *buf, size_t len) {
 
 void DbpStringEx(char *str, uint32_t cmd) {
 #if DEBUG
-	byte_t len = strlen(str);
+	uint8_t len = strlen(str);
 	cmd_send(CMD_DEBUG_PRINT_STRING, len, cmd, 0, (byte_t*)str, len);
 #endif	
 }
@@ -113,7 +119,7 @@ void DbpString(char *str) {
 }
 
 #if 0
-void DbpIntegers(inst x1, int x2, int x3) {
+void DbpIntegers(int x1, int x2, int x3) {
 	cmd_send(CMD_DEBUG_PRINT_INTEGERS,x1,x2,x3,0,0);
 }
 #endif
@@ -442,6 +448,7 @@ void printStandAloneModes(void) {
 	
 	//DbpString("Running ");	
 	//Dbprintf("  Is Device attached to USB| %s", USB_ATTACHED() ? "Yes" : "No"); 
+	//Dbprintf("  Is Device attached to FPC| %s", 0 ? "Yes" : "No"); 
 	//Dbprintf("  Is USB_reconnect value   | %d", GetUSBreconnect() );
 	//Dbprintf("  Is USB_configured value  | %d", GetUSBconfigured() );
 	
@@ -1070,6 +1077,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 #endif
 		case CMD_BUFF_CLEAR:
 			BigBuf_Clear();
+			BigBuf_free();
 			break;
 
 		case CMD_MEASURE_ANTENNA_TUNING:
@@ -1106,7 +1114,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 				len = MIN( (numofbytes - i), USB_CMD_DATA_SIZE);
 				isok = cmd_send(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K, i, len, BigBuf_get_traceLen(), mem + startidx + i, len);
 				if (!isok) 
-					Dbprintf("transfer to client failed ::  | bytes between %d - %d", i, len);
+					Dbprintf("transfer to client failed ::  | bytes between %d - %d (%d)", i, i+len, len);
 			}
 			// Trigger a finish downloading signal with an ACK frame
 			// iceman,  when did sending samplingconfig array got attached here?!?
@@ -1163,37 +1171,30 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 			ReadMem(c->arg[0]);
 			break;
 #ifdef WITH_FLASH	
-		case CMD_READ_FLASH_MEM: {
-
+		case CMD_FLASHMEM_SET_SPIBAUDRATE:
+			FlashmemSetSpiBaudrate(c->arg[0]);
+			break;
+		case CMD_FLASHMEM_READ: {
 			LED_B_ON();
 			uint16_t isok = 0;
 			uint32_t startidx = c->arg[0];
 			uint16_t len = c->arg[1];
-			uint8_t fast = c->arg[2];
+			//uint8_t fast = c->arg[2];
 			
-			Dbprintf("FlashMem read | %d - %d", startidx, len);
+			Dbprintf("FlashMem read | %d - %d | ", startidx, len);
 			
 			size_t size = MIN(USB_CMD_DATA_SIZE, len);
 			
 			uint8_t *mem = BigBuf_malloc(size);
 	
-
-			if (fast) {
-				FlashInit(1);
-				//FlashInit();
-				Flash_CheckBusy(BUSY_TIMEOUT);
-			}
+			FlashInit();
+			//Flash_CheckBusy(BUSY_TIMEOUT);
+			
 			for(size_t i = 0; i < len; i += size) {
 				len = MIN((len - i), size);
 				
-				Dbprintf("FlashMem reading  | %d | %d | %d", startidx + i, i, len);
-				
-				if (!fast){
-				isok = Flash_ReadData(startidx + i, mem, len);
-				}
-				if (fast){
-				isok =	Flash_FastReadDataCont(startidx + i, mem, len);
-				}
+				Dbprintf("FlashMem reading  | %d | %d | %d |", startidx + i, i, len);
+				isok = Flash_ReadDataCont(startidx + i, mem, len);
 				if ( isok == len ) {
 					print_result("Chunk: ", mem, len);
 				} else {
@@ -1201,13 +1202,11 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 					break;
 				}
 			}
-			if (fast){
-				FlashStop();
-			}
+			FlashStop();
 			LED_B_OFF();
 			break;
 		}
-		case CMD_WRITE_FLASH_MEM: {
+		case CMD_FLASHMEM_WRITE: {
 			LED_B_ON();
 			uint8_t isok = 0;
 			uint16_t res = 0;
@@ -1217,6 +1216,14 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 			
 			uint32_t tmp = startidx + len;
 			
+  			if (!FlashInit())
+  		    {
+   		       break;
+  		    }
+    
+  		    Flash_CheckBusy(BUSY_TIMEOUT);
+  		    Flash_WriteEnable();
+
 			// inside 256b page?
 			if ( (tmp & 0xFF) != 0) {				
 				
@@ -1230,27 +1237,28 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 						uint8_t first_len =  (~startidx & 0xFF)+1;
 												
 						// first mem page						
-						res = Flash_WriteData(startidx, data, first_len);
+						res = Flash_WriteDataCont(startidx, data, first_len);
 						
 						// second mem page
-						res = Flash_WriteData(startidx + first_len, data + first_len, len - first_len);
+						res = Flash_WriteDataCont(startidx + first_len, data + first_len, len - first_len);
 						
 						isok = (res == (len - first_len)) ? 1 : 0;
 						
 					} else {
-						res = Flash_WriteData(startidx, data, len);
+						res = Flash_WriteDataCont(startidx, data, len);
 						isok = (res == len) ? 1 : 0;
 					}					
 			} else {				
-				res = Flash_WriteData(startidx, data, len);
+				res = Flash_WriteDataCont(startidx, data, len);
 				isok = (res == len) ? 1 : 0;
 			}
+  		    FlashStop();
 
 			cmd_send(CMD_ACK, isok, 0, 0, 0, 0);
 			LED_B_OFF();
 			break;
 		}
-		case CMD_WIPE_FLASH_MEM: {
+		case CMD_FLASHMEM_WIPE: {
 			LED_B_ON();
 			uint8_t page = c->arg[0];
 			uint8_t initalwipe = c->arg[1];
@@ -1268,7 +1276,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 			LED_B_OFF();
 			break;
 		}
-		case CMD_DOWNLOAND_FLASH_MEM: {
+		case CMD_FLASHMEM_DOWNLOAD: {
 
 			LED_B_ON();
 			uint8_t *mem = BigBuf_malloc(USB_CMD_DATA_SIZE);
@@ -1276,48 +1284,39 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 			size_t len = 0;
 			uint32_t startidx = c->arg[0];
 			uint32_t numofbytes = c->arg[1];
-			uint8_t fast = c->arg[2];
+			//uint8_t fast = c->arg[2];
 
 			// arg0 = startindex
 			// arg1 = length bytes to transfer
 			// arg2 = RFU
 
+				FlashInit();
 
-			if (fast) {
-				FlashInit(1);
-				//FlashInit();
-				Flash_CheckBusy(BUSY_TIMEOUT);
-			}
 			for (size_t i = 0; i < numofbytes; i += USB_CMD_DATA_SIZE) {
 				len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);
-				if (!fast){
-				isok = Flash_ReadData(startidx + i, mem, len);
-				}
-				if (fast){
-				isok =	Flash_FastReadDataCont(startidx + i, mem, len);
-				}
+
+				isok = Flash_ReadDataCont(startidx + i, mem, len);
 				if (!isok )
 					Dbprintf("reading flash memory failed ::  | bytes between %d - %d", i, len);
-				
-				isok = cmd_send(CMD_DOWNLOADED_FLASHMEM, i, len, 0, mem, len);
+
+				isok = cmd_send(CMD_FLASHMEM_DOWNLOADED, i, len, 0, mem, len);
 				if (!isok) 
 					Dbprintf("transfer to client failed ::  | bytes between %d - %d", i, len);
 			}
-			if (fast){
 				FlashStop();
-			}
+		
 			cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
 			LED_B_OFF();
 			break;
 		}
-		case CMD_INFO_FLASH_MEM: {
+		case CMD_FLASHMEM_INFO: {
 
 			LED_B_ON();
 			rdv40_validation_t *info = (rdv40_validation_t*)BigBuf_malloc( sizeof(rdv40_validation_t) );
 			
 			bool isok = Flash_ReadData(FLASH_MEM_SIGNATURE_OFFSET, info->signature, FLASH_MEM_SIGNATURE_LEN);
 
-			if (FlashInit(0)) {
+			if (FlashInit()) {
 				Flash_UniqueID( info->flashid);
 				FlashStop();
 			}
@@ -1437,15 +1436,15 @@ void  __attribute__((noreturn)) AppMain(void) {
 	StartTickCount();
   	
 #ifdef WITH_LCD
-//	LCDInit();
+	LCDInit();
 #endif
 
 #ifdef WITH_SMARTCARD
-//	I2C_init();
+	I2C_init();
 #endif
 
 #ifdef WITH_FPC
-//	usart_init();
+	usart_init();
 #endif	
 
 	// This is made as late as possible to ensure enumeration without timeout
@@ -1487,11 +1486,6 @@ void  __attribute__((noreturn)) AppMain(void) {
 #if defined (WITH_ISO14443a) && ( defined (WITH_HF_YOUNG) || defined(WITH_HF_COLIN) || defined(WITH_HF_MATTYRUN) )
 			RunMod();
 #endif
-
-			// when here,  we are no longer in standalone mode.
-			// reseting the variables which keeps track of usb re-attached/configured
-			//SetUSBreconnect(0);
-			//SetUSBconfigured(0);
 		}
 	}
 }
diff --git a/armsrc/flashmem.c b/armsrc/flashmem.c
index b5786fbe9..f173b66b4 100644
--- a/armsrc/flashmem.c
+++ b/armsrc/flashmem.c
@@ -1,11 +1,6 @@
 #include "flashmem.h"
 
 
-#define MCK 48000000
-//#define FLASH_BAUD 24000000
-//define FLASH_BAUD 33000000
-#define FLASH_BAUD MCK/2
-#define FLASH_FASTBAUD MCK
 
 /* here: use NCPS2 @ PA10: */
 #define SPI_CSR_NUM      2
@@ -18,10 +13,17 @@
 #define SPI_DLYBCT(delay, masterClock) ((uint32_t) ((((masterClock) / 1000000) * (delay)) / 32000) << 24)
 
 
+uint32_t FLASHMEM_SPIBAUDRATE = FLASH_BAUD;
+
+
+void FlashmemSetSpiBaudrate(uint32_t baudrate){
+   FLASHMEM_SPIBAUDRATE = baudrate;
+   Dbprintf("Spi Baudrate : %dMhz", FLASHMEM_SPIBAUDRATE/1000000);
+}
 
 //	initialize
-bool FlashInit(bool fast) {
-	FlashSetup(fast);
+bool FlashInit() {
+	FlashSetup(FLASHMEM_SPIBAUDRATE);
 
 	StartTicks();
 
@@ -33,7 +35,7 @@ bool FlashInit(bool fast) {
 	return true;
 }
 
-void FlashSetup(bool fast){
+void FlashSetup(uint32_t baudrate){
    //WDT_DISABLE
     AT91C_BASE_WDTC->WDTC_WDMR = AT91C_WDTC_WDDIS;
 
@@ -79,13 +81,12 @@ void FlashSetup(bool fast){
 		AT91C_SPI_PS_FIXED 	|		// Fixed Peripheral Select
 		AT91C_SPI_MSTR;			// Master Mode
 
-	int baudrate = FLASH_BAUD;
 	uint8_t csaat = 1;
-	int dlybct = 0;
-    if (fast) {
+	uint32_t dlybct = 0;
+    if (baudrate > FLASH_MINFAST) {
 		baudrate = 	FLASH_FASTBAUD;
 		//csaat = 0;
-		dlybct = MCK/32;
+		dlybct = 1500;
 	}
 
 	AT91C_BASE_SPI->SPI_CSR[2] =
@@ -100,28 +101,28 @@ void FlashSetup(bool fast){
 							// transferred in the shifter. This can imply for example, that the second data is sent twice.
 							// COLIN :: For now we STILL use CSAAT=1 to avoid having to (de)assert  NPCS manually via PIO lines and we deal with delay
 		( csaat << 3) |
-/* Spi modes:
-Mode 	CPOL 	CPHA  NCPHA
-0 	0 	0     1       clock normally low    read on rising edge
-1 	0 	1     0       clock normally low    read on falling edge
-2 	1 	0     1       clock normally high   read on falling edge
-3 	1 	1     0       clock normally high   read on rising edge
-However, page 512 of the AT91SAM7Sx datasheet say "Note that in SPI
-master mode the ATSAM7S512/256/128/64/321/32 does not sample the data
-(MISO) on the opposite edge where data clocks out (MOSI) but the same
-edge is used as shown in Figure 36-3 and Figure 36-4."  Figure 36-3
-shows that CPOL=NCPHA=0 or CPOL=NCPHA=1 samples on the rising edge and
-that the data changes sometime after the rising edge (about 2 ns).  To
-be consistent with normal SPI operation, it is probably safe to say
-that the data changes on the falling edge and should be sampled on the
-rising edge.  Therefore, it appears that NCPHA should be treated the
-same as CPHA.  Thus:
-Mode	CPOL	CPHA	NCPHA
-0	0	0     0       clock normally low    read on rising edge
-1	0 	1     1       clock normally low    read on falling edge
-2	1 	0     0       clock normally high   read on falling edge
-3	1 	1     1       clock normally high   read on rising edge
-*/
+		/* Spi modes:
+			Mode 	CPOL 	CPHA  NCPHA
+			0 	0 	0     1       clock normally low    read on rising edge
+			1 	0 	1     0       clock normally low    read on falling edge
+			2 	1 	0     1       clock normally high   read on falling edge
+			3 	1 	1     0       clock normally high   read on rising edge
+			However, page 512 of the AT91SAM7Sx datasheet say "Note that in SPI
+			master mode the ATSAM7S512/256/128/64/321/32 does not sample the data
+			(MISO) on the opposite edge where data clocks out (MOSI) but the same
+			edge is used as shown in Figure 36-3 and Figure 36-4."  Figure 36-3
+			shows that CPOL=NCPHA=0 or CPOL=NCPHA=1 samples on the rising edge and
+			that the data changes sometime after the rising edge (about 2 ns).  To
+			be consistent with normal SPI operation, it is probably safe to say
+			that the data changes on the falling edge and should be sampled on the
+			rising edge.  Therefore, it appears that NCPHA should be treated the
+			same as CPHA.  Thus:
+			Mode	CPOL	CPHA	NCPHA
+			0	0	0     0       clock normally low    read on rising edge
+			1	0 	1     1       clock normally low    read on falling edge
+			2	1 	0     0       clock normally high   read on falling edge
+			3	1 	1     1       clock normally high   read on rising edge
+		*/
 		( 0 << 1)	|		// Clock Phase data captured on leading edge, changes on following edge
 		( 0 << 0);			// Clock Polarity inactive state is logic 0
 
@@ -161,10 +162,10 @@ uint16_t FlashSendByte(uint32_t data) {
 	// send the data
 	AT91C_BASE_SPI->SPI_TDR = data;
 
-    while ((AT91C_BASE_SPI->SPI_SR & AT91C_SPI_TDRE) == 0){};
+    //while ((AT91C_BASE_SPI->SPI_SR & AT91C_SPI_TDRE) == 0){};
 
 	// wait recive transfer is complete
-	while ((AT91C_BASE_SPI->SPI_SR & AT91C_SPI_RDRF) == 0);
+	while ((AT91C_BASE_SPI->SPI_SR & AT91C_SPI_RDRF) == 0){};
 
 	// reading incoming data
 	return ((AT91C_BASE_SPI->SPI_RDR) & 0xFFFF);
@@ -187,6 +188,8 @@ bool Flash_CheckBusy(uint32_t timeout)
 	StartCountUS();
 	uint32_t _time = GetCountUS();
 
+	if ( MF_DBGLEVEL > 3 ) Dbprintf("Checkbusy in...");
+
 	do
 	{
 		if (!(Flash_ReadStat1() & BUSY))
@@ -249,37 +252,61 @@ void Flash_UniqueID(uint8_t *uid) {
 
 uint16_t Flash_ReadData(uint32_t address, uint8_t *out, uint16_t len) {
 	
-	if (!FlashInit(0)) return 0;
+	if (!FlashInit()) return 0;
 		
 	// length should never be zero
 	if (!len || Flash_CheckBusy(BUSY_TIMEOUT)) return 0;
 
-	FlashSendByte(READDATA);
-	FlashSendByte((address >> 16) & 0xFF);
-	FlashSendByte((address >> 8) & 0xFF);
-	FlashSendByte((address >> 0) & 0xFF);
+
+    uint8_t cmd = READDATA;
+
+	if(FASTFLASH) {
+		cmd = FASTREAD;
+	} 
+
+	FlashSendByte(cmd);
+	Flash_TransferAdresse(address);
+
+	if (FASTFLASH){
+		FlashSendByte(DUMMYBYTE);
+	}
 
 	uint16_t i = 0;
 	for (; i < (len - 1); i++)
 		out[i] = FlashSendByte(0xFF);
 
 	out[i] = FlashSendLastByte(0xFF);
-	
+
+
 	FlashStop();	
 	return len;	
 }
 
+void Flash_TransferAdresse(uint32_t address){
+	FlashSendByte((address >> 16) & 	0xFF);
+	FlashSendByte((address >> 8) & 0xFF);
+	FlashSendByte((address >> 0) & 0xFF);
+}
+
 /* This ensure we can ReadData without having to cycle through initialization everytime */
 uint16_t Flash_ReadDataCont(uint32_t address, uint8_t *out, uint16_t len) {
 	
 	// length should never be zero
 	if (!len) return 0;
+	
+    uint8_t cmd = READDATA;
 
-	FlashSendByte(READDATA);
-	FlashSendByte((address >> 16) & 0xFF);
-	FlashSendByte((address >> 8) & 0xFF);
-	FlashSendByte((address >> 0) & 0xFF);
+	if(FASTFLASH) {
+		cmd = FASTREAD;
+	} 
 
+	FlashSendByte(cmd);
+	Flash_TransferAdresse(address);
+
+    if (FASTFLASH){
+		FlashSendByte(DUMMYBYTE);
+	}
+ 
 	uint16_t i = 0;
 	for (; i < (len - 1); i++)
 		out[i] = FlashSendByte(0xFF);
@@ -289,32 +316,6 @@ uint16_t Flash_ReadDataCont(uint32_t address, uint8_t *out, uint16_t len) {
 	return len;	
 }
 
-uint16_t Flash_FastReadDataCont(uint32_t address, uint8_t *out, uint16_t len) {
-	
-	// length should never be zero
-	if (!len) return 0;
-
-	//if (Flash_CheckBusy(BUSY_TIMEOUT))
-	//{return 0;}
-
-	FlashSendByte(FASTREAD);
-	FlashSendByte((address >> 16) & 0xFF);
-	FlashSendByte((address >> 8) & 0xFF);
-	FlashSendByte((address >> 0) & 0xFF);
-	FlashSendByte(0xFF);
-	//Flash_CheckBusy(BUSY_TIMEOUT);
-
-
-	uint16_t i = 0;
-	for (; i < (len - 1); i++)
-		out[i] = FlashSendByte(0xFF);
-
-	out[i] = FlashSendLastByte(0xFF);
-	
-	return len;	
-}
-
-
 
 ////////////////////////////////////////
 
@@ -338,13 +339,12 @@ uint16_t Flash_WriteData(uint32_t address, uint8_t *in, uint16_t len) {
 		return 0;
 	}
 
-	if (!FlashInit(0)) {
+	if (!FlashInit()) {
 		if ( MF_DBGLEVEL > 3 ) Dbprintf("Flash_WriteData init fail");
 		return 0;
 	}
 	
 	Flash_CheckBusy(BUSY_TIMEOUT);
-	//Flash_ReadStat1();
 
 	Flash_WriteEnable();
 	
@@ -382,10 +382,8 @@ uint16_t Flash_WriteDataCont(uint32_t address, uint8_t *in, uint16_t len) {
 	}
 
 
-	//Flash_CheckBusy(100);
-	//SpinDelay(1);
+
 	Flash_CheckBusy(BUSY_TIMEOUT);
-	//Flash_ReadStat1();
     Flash_WriteEnable();
 
 	FlashSendByte(PAGEPROG);
@@ -403,7 +401,7 @@ uint16_t Flash_WriteDataCont(uint32_t address, uint8_t *in, uint16_t len) {
 }
 
 bool Flash_WipeMemoryPage(uint8_t page) {
-	if (!FlashInit(0)) {
+	if (!FlashInit()) {
 		if ( MF_DBGLEVEL > 3 ) Dbprintf("Flash_WriteData init fail");
 		return false;
 	}
@@ -417,7 +415,7 @@ bool Flash_WipeMemoryPage(uint8_t page) {
 }
 // Wipes flash memory completely, fills with 0xFF
 bool Flash_WipeMemory() {
-	if (!FlashInit(0)) {
+	if (!FlashInit()) {
 		if ( MF_DBGLEVEL > 3 ) Dbprintf("Flash_WriteData init fail");
 		return false;
 	}
@@ -498,12 +496,13 @@ void Flash_EraseChip(void) {
 
 void Flashmem_print_status(void) {
 	DbpString("Flash memory");
+	Dbprintf("  Baudrate................%dMHz",FLASHMEM_SPIBAUDRATE/1000000);
 
-	if (!FlashInit(0)) {
-		DbpString("  init....................FAIL");
+	if (!FlashInit()) {
+		DbpString("  Init....................FAIL");
 		return;
 	}
-	DbpString("  init....................OK");
+	DbpString("  Init....................OK");
 	
 	uint8_t dev_id = Flash_ReadID();
 	switch (dev_id) {
diff --git a/armsrc/flashmem.h b/armsrc/flashmem.h
index 3563eb41d..ae10ea388 100644
--- a/armsrc/flashmem.h
+++ b/armsrc/flashmem.h
@@ -102,15 +102,30 @@
 #define MAX_SECTORS		16
 
 
+
+
+#define MCK 48000000
+//#define FLASH_BAUD 24000000
+#define FLASH_MINFAST 24000000 //33000000
+#define FLASH_BAUD MCK/2
+#define FLASH_FASTBAUD MCK
+#define FLASH_MINBAUD FLASH_FASTBAUD
+
+#define FASTFLASH (FLASHMEM_SPIBAUDRATE > FLASH_MINFAST)
+
+
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~//
 extern void Dbprintf(const char *fmt, ...);
-bool FlashInit(bool fast);
-void FlashSetup(bool fast);
+
+void FlashmemSetSpiBaudrate(uint32_t baudrate);
+bool FlashInit();
+void FlashSetup(uint32_t baudrate);
 void FlashStop(void);
 bool Flash_WaitIdle(void);
 uint8_t Flash_ReadStat1(void);
 uint8_t Flash_ReadStat2(void);
 uint16_t FlashSendByte(uint32_t data);
+void Flash_TransferAdresse(uint32_t address);
 
 bool Flash_CheckBusy(uint32_t timeout);
 
@@ -128,10 +143,11 @@ uint8_t Flash_ReadID(void);
 uint16_t Flash_ReadData(uint32_t address, uint8_t *out, uint16_t len);
 
 uint16_t Flash_ReadDataCont(uint32_t address, uint8_t *out, uint16_t len);
-uint16_t Flash_FastReadDataCont(uint32_t address, uint8_t *out, uint16_t len);
 
 uint16_t Flash_WriteData(uint32_t address, uint8_t *in, uint16_t len);
 uint16_t Flash_WriteDataCont(uint32_t address, uint8_t *in, uint16_t len);
 void Flashmem_print_status(void);
 
+
+
 #endif
\ No newline at end of file

From c74dbb63b8e9768edad04c40b09554c8e1cb32b9 Mon Sep 17 00:00:00 2001
From: "Colin J. Brigato" <colin@brigato.fr>
Date: Thu, 6 Sep 2018 05:24:50 +0200
Subject: [PATCH 0015/1938] Pass 2; commit 2;

---
 client/cmdflashmem.c         | 62 +++++++++++++++++++++++++-----------
 client/cmdmain.c             |  4 +--
 client/hid-flasher/usb_cmd.h | 12 +++----
 include/common.h             |  3 ++
 include/usb_cmd.h            | 16 ++++++----
 tools/mkversion.pl           | 14 ++++++--
 6 files changed, 77 insertions(+), 34 deletions(-)

diff --git a/client/cmdflashmem.c b/client/cmdflashmem.c
index 5f83f9263..43230218f 100644
--- a/client/cmdflashmem.c
+++ b/client/cmdflashmem.c
@@ -12,13 +12,36 @@
 #include "rsa.h"
 #include "sha1.h"
 
+#define MCK 48000000
+//#define FLASH_BAUD 24000000
+#define FLASH_MINFAST 24000000 //33000000
+#define FLASH_BAUD MCK/2
+#define FLASH_FASTBAUD MCK
+#define FLASH_MINBAUD FLASH_FASTBAUD
+
+#define FASTFLASH (FLASHMEM_SPIBAUDRATE > FLASH_MINFAST)
+
 static int CmdHelp(const char *Cmd);
+
+int usage_flashmem_spibaud(void){
+	PrintAndLogEx(NORMAL, "Usage:  mem spibaud [h] <baudrate>");
+	PrintAndLogEx(NORMAL, "Options:");
+	PrintAndLogEx(NORMAL, "           h    this help");	
+	PrintAndLogEx(NORMAL, "      <baudrate>    SPI baudrate in MHz [24|48]");
+	PrintAndLogEx(NORMAL, "           ");
+	PrintAndLogEx(NORMAL, "           If >= 24Mhz, FASTREADS instead of READS instruction will be used.");
+	PrintAndLogEx(NORMAL, "           Reading Flash ID will virtually always fail under 48Mhz setting");
+	PrintAndLogEx(NORMAL, "           Unless you know what you are doing, please stay at 24Mhz");
+	PrintAndLogEx(NORMAL, "Examples:");
+	PrintAndLogEx(NORMAL, "           mem spibaud 48");
+	return 0;
+}
+
 int usage_flashmem_read(void){
 	PrintAndLogEx(NORMAL, "Read flash memory on device");
-	PrintAndLogEx(NORMAL, "Usage:  mem read o <offset> l <len> [f]");
+	PrintAndLogEx(NORMAL, "Usage:  mem read o <offset> l <len>");
 	PrintAndLogEx(NORMAL, "  o <offset>    :      offset in memory");
 	PrintAndLogEx(NORMAL, "  l <len>       :      length");
-	PrintAndLogEx(NORMAL, "  f             :      fastRead mode");
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Examples:");
 	PrintAndLogEx(NORMAL, "        mem read o 0 l 32");		// read 32 bytes starting at offset 0
@@ -42,7 +65,6 @@ int usage_flashmem_save(void){
 	PrintAndLogEx(NORMAL, "  o <offset>    :      offset in memory");
 	PrintAndLogEx(NORMAL, "  l <length>    :      length");
 	PrintAndLogEx(NORMAL, "  f <filename>  :      file name");
-	PrintAndLogEx(NORMAL, "  +  	       :      fast read mode");
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Examples:");
 	PrintAndLogEx(NORMAL, "        mem save f myfile");					// download whole flashmem to file myfile
@@ -81,14 +103,9 @@ int CmdFlashMemRead(const char *Cmd) {
 	uint8_t cmdp = 0;
 	bool errors = false;
 	uint32_t start_index = 0, len  = 0;
-	uint8_t fast = 0;
 	
 	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
 		switch (tolower(param_getchar(Cmd, cmdp))) {
-		case 'f':
-			fast = 1;
-			cmdp += 1;
-			break;
 		case 'o':
 			start_index = param_get32ex(Cmd, cmdp+1, 0, 10);
 			cmdp += 2;
@@ -114,11 +131,24 @@ int CmdFlashMemRead(const char *Cmd) {
 		return 1;
 	}
 
-	UsbCommand c = {CMD_READ_FLASH_MEM, {start_index, len, fast}};		
+	UsbCommand c = {CMD_FLASHMEM_READ, {start_index, len, 0}};		
 	clearCommandBuffer();
 	SendCommand(&c);
 	return 0;
 }
+
+int CmdFlashmemSpiBaudrate(const char *Cmd) {
+
+	char ctmp = param_getchar(Cmd, 0);
+	if (strlen(Cmd) < 1 || ctmp == 'h' || ctmp == 'H') return usage_flashmem_spibaud();
+	uint32_t baudrate = param_get32ex(Cmd, 0, 0, 10);
+	baudrate = baudrate*1000000;
+	if (baudrate != FLASH_BAUD && baudrate != FLASH_MINBAUD ) return usage_flashmem_spibaud();
+	UsbCommand c = {CMD_FLASHMEM_SET_SPIBAUDRATE, {baudrate, 0, 0}};
+	SendCommand(&c);
+	return 0;
+}
+
 int CmdFlashMemLoad(const char *Cmd){
 
 	FILE *f;
@@ -196,7 +226,7 @@ int CmdFlashMemLoad(const char *Cmd){
 	while (bytes_remaining > 0){
 		uint32_t bytes_in_packet = MIN(FLASH_MEM_BLOCK_SIZE, bytes_remaining);
 		
-		UsbCommand c = {CMD_WRITE_FLASH_MEM, {start_index + bytes_sent, bytes_in_packet, 0}};
+		UsbCommand c = {CMD_FLASHMEM_WRITE, {start_index + bytes_sent, bytes_in_packet, 0}};
 				
 		memcpy(c.d.asBytes, dump + bytes_sent, bytes_in_packet);
 		clearCommandBuffer();
@@ -228,7 +258,6 @@ int CmdFlashMemSave(const char *Cmd){
 	uint8_t cmdp = 0;
 	bool errors = false;
 	uint32_t start_index = 0, len = FLASH_MEM_MAX_SIZE;
-	uint8_t fast = 0;
 	
 	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
 		switch (tolower(param_getchar(Cmd, cmdp))) {
@@ -241,10 +270,6 @@ int CmdFlashMemSave(const char *Cmd){
 			start_index = param_get32ex(Cmd, cmdp+1, 0, 10);
 			cmdp += 2;
 			break;
-                case '+':
-                        fast = 1;
-                        cmdp += 1;
-                        break;
 		case 'f':
 			//File handling
 			if ( param_getstr(Cmd, cmdp+1, filename, FILE_PATH_SIZE) >= FILE_PATH_SIZE ) {
@@ -314,7 +339,7 @@ int CmdFlashMemWipe(const char *Cmd){
 	//Validations
 	if (errors || cmdp == 0 ) return usage_flashmem_wipe();			
 			
-	UsbCommand c = {CMD_WIPE_FLASH_MEM, {page, initalwipe, 0}};
+	UsbCommand c = {CMD_FLASHMEM_WIPE, {page, initalwipe, 0}};
 	clearCommandBuffer();
 	SendCommand(&c);
 	UsbCommand resp;
@@ -359,7 +384,7 @@ int CmdFlashMemInfo(const char *Cmd){
 	//Validations
 	if (errors ) return usage_flashmem_info();
 			
-	UsbCommand c = {CMD_INFO_FLASH_MEM, {0, 0, 0}};
+	UsbCommand c = {CMD_FLASHMEM_INFO, {0, 0, 0}};
 	clearCommandBuffer();
 	SendCommand(&c);
 	UsbCommand resp;
@@ -488,7 +513,7 @@ int CmdFlashMemInfo(const char *Cmd){
 
 		if (shall_write) {
 			// save to mem
-			c = (UsbCommand){CMD_WRITE_FLASH_MEM, {FLASH_MEM_SIGNATURE_OFFSET, FLASH_MEM_SIGNATURE_LEN, 0}};				
+			c = (UsbCommand){CMD_FLASHMEM_WRITE, {FLASH_MEM_SIGNATURE_OFFSET, FLASH_MEM_SIGNATURE_LEN, 0}};				
 			memcpy(c.d.asBytes, sign, sizeof(sign));	
 			clearCommandBuffer();
 			SendCommand(&c);
@@ -520,6 +545,7 @@ int CmdFlashMemInfo(const char *Cmd){
 
 static command_t CommandTable[] = {
 	{"help",	CmdHelp,            1, "This help"},
+	{"spibaud", CmdFlashmemSpiBaudrate,	1, "Set Flash memory Spi baudrate [rdv40]"},
 	{"read",	CmdFlashMemRead,	1, "Read Flash memory [rdv40]"},
 	{"info",	CmdFlashMemInfo,	1, "Flash memory information [rdv40]"},
 	{"load",	CmdFlashMemLoad,	1, "Load data into flash memory [rdv40]"},
diff --git a/client/cmdmain.c b/client/cmdmain.c
index 447e83ac8..351152179 100644
--- a/client/cmdmain.c
+++ b/client/cmdmain.c
@@ -298,9 +298,9 @@ bool GetFromDevice(DeviceMemType_t memtype, uint8_t *dest, uint32_t bytes, uint3
 			return dl_it(dest, bytes, start_index, response, ms_timeout, show_warning, CMD_DOWNLOADED_EML_BIGBUF);
 		}
 		case FLASH_MEM: {			
-			UsbCommand c = {CMD_DOWNLOAND_FLASH_MEM, {start_index, bytes, 0}};
+			UsbCommand c = {CMD_FLASHMEM_DOWNLOAD, {start_index, bytes, 0}};
 			SendCommand(&c);
-			return dl_it(dest, bytes, start_index, response, ms_timeout, show_warning, CMD_DOWNLOADED_FLASHMEM);
+			return dl_it(dest, bytes, start_index, response, ms_timeout, show_warning, CMD_FLASHMEM_DOWNLOADED);
 		}
 		case SIM_MEM: {
 			//UsbCommand c = {CMD_DOWNLOAND_SIM_MEM, {start_index, bytes, 0}};
diff --git a/client/hid-flasher/usb_cmd.h b/client/hid-flasher/usb_cmd.h
index 736b11a06..2ced2cd18 100644
--- a/client/hid-flasher/usb_cmd.h
+++ b/client/hid-flasher/usb_cmd.h
@@ -57,12 +57,12 @@ typedef struct {
 #define CMD_DOWNLOADED_EML_BIGBUF										  0x0111
 
 // RDV40, Flash memory operations
-#define CMD_READ_FLASH_MEM												  0x0120
-#define CMD_WRITE_FLASH_MEM												  0x0121
-#define CMD_WIPE_FLASH_MEM												  0x0122
-#define CMD_DOWNLOAND_FLASH_MEM											  0x0123
-#define CMD_DOWNLOADED_FLASHMEM											  0x0124
-#define CMD_INFO_FLASH_MEM												  0x0125
+#define CMD_FLASHMEM_READ												  0x0120
+#define CMD_FLASHMEM_WRITE												  0x0121
+#define CMD_FLASHMEM_WIPE												  0x0122
+#define CMD_FLASHMEM_DOWNLOAD											  0x0123
+#define CMD_FLASHMEM_DOWNLOADED											  0x0124
+#define CMD_FLASHMEM_INFO												  0x0125
 
 // For low-frequency tags
 #define CMD_READ_TI_TYPE                                                  0x0202
diff --git a/include/common.h b/include/common.h
index 8fdb45ab0..8a3f33abd 100644
--- a/include/common.h
+++ b/include/common.h
@@ -30,6 +30,9 @@ typedef unsigned char byte_t;
 #define MF_DBG_EXTENDED      4
 extern int MF_DBGLEVEL;
 
+// Flashmem spi baudrate
+extern uint32_t FLASHMEM_SPIBAUDRATE;
+
 // reader voltage field detector
 #define MF_MINFIELDV      4000
 
diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index 4de39eef4..51df5896b 100644
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -67,13 +67,17 @@ typedef struct{
 #define CMD_DOWNLOAD_EML_BIGBUF											  0x0110
 #define CMD_DOWNLOADED_EML_BIGBUF										  0x0111
 
+
+
+
 // RDV40, Flash memory operations
-#define CMD_READ_FLASH_MEM												  0x0120
-#define CMD_WRITE_FLASH_MEM												  0x0121
-#define CMD_WIPE_FLASH_MEM												  0x0122
-#define CMD_DOWNLOAND_FLASH_MEM											  0x0123
-#define CMD_DOWNLOADED_FLASHMEM											  0x0124
-#define CMD_INFO_FLASH_MEM												  0x0125
+#define CMD_FLASHMEM_READ												  0x0120
+#define CMD_FLASHMEM_WRITE												  0x0121
+#define CMD_FLASHMEM_WIPE												  0x0122
+#define CMD_FLASHMEM_DOWNLOAD											  0x0123
+#define CMD_FLASHMEM_DOWNLOADED											  0x0124
+#define CMD_FLASHMEM_INFO												  0x0125
+#define CMD_FLASHMEM_SET_SPIBAUDRATE                                      0x0126
 
 // RDV40,  Smart card operations
 #define CMD_SMART_RAW													  0x0140
diff --git a/tools/mkversion.pl b/tools/mkversion.pl
index 6bbc1dfec..1acca6efa 100644
--- a/tools/mkversion.pl
+++ b/tools/mkversion.pl
@@ -18,13 +18,23 @@ my $fullgitinfo = 'iceman';
 my $ctime;
 # GIT status  0 = dirty,  1 = clean ,  2 = undecided
 my $clean = 2;
+
 # Do we have acces to git command? 
-my $commandGIT = `bash which git`;
+#######
+# solves some bug on macos i.e: 
+##
+# perl ../tools/mkversion.pl .. > version.c || cp ../common/default_version.c version.c
+# /usr/bin/which: /usr/bin/which: cannot execute binary file
+# fatal: No names found, cannot describe anything.
+##
+# anyway forcing any kind of shell is at least useless, at worst fatal.
+my $commandGIT = "env -S which git";
 
 if ( defined($commandGIT) )  {
 
 	my $githistory = `git fetch --all`;
-	my $gitversion = `git describe --dirty`;
+	# now avoiding the "fatal: No names found, cannot describe anything." error by fallbacking to abbrev hash in such case
+	my $gitversion = `git describe --dirty --always`;
 	my $gitbranch = `git rev-parse --abbrev-ref HEAD`;
 	$clean = $gitversion =~ '-dirty' ? 0 : 1;
 

From 7e12fc0ceb28f322ffe2cef5370ccc3a3f165bac Mon Sep 17 00:00:00 2001
From: "Colin J. Brigato" <colin@brigato.fr>
Date: Thu, 6 Sep 2018 05:34:48 +0200
Subject: [PATCH 0016/1938] Pass 2; commit 3/3;

---
 armsrc/Standalone/hf_colin.c | 6 ++++--
 armsrc/flashmem.c            | 4 ----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/armsrc/Standalone/hf_colin.c b/armsrc/Standalone/hf_colin.c
index 7259fcab3..f19706af1 100644
--- a/armsrc/Standalone/hf_colin.c
+++ b/armsrc/Standalone/hf_colin.c
@@ -318,14 +318,16 @@ void WriteTagToFlash(uint8_t index, size_t size)
     Flash_CheckBusy(BUSY_TIMEOUT);
     Flash_WriteEnable();
     Flash_Erase4k(0,0);
-    Flash_CheckBusy(BUSY_TIMEOUT);
-    Flash_WriteEnable();
 
     uint32_t end_time;
     uint32_t start_time = end_time = GetTickCount();
 
     while (bytes_remaining > 0)
     {
+
+	Flash_CheckBusy(BUSY_TIMEOUT);
+	Flash_WriteEnable();
+
         uint32_t bytes_in_packet = MIN(FLASH_MEM_BLOCK_SIZE, bytes_remaining);
 
         memcpy(buff, data + bytes_sent, bytes_in_packet);
diff --git a/armsrc/flashmem.c b/armsrc/flashmem.c
index f173b66b4..a8642dd74 100644
--- a/armsrc/flashmem.c
+++ b/armsrc/flashmem.c
@@ -382,10 +382,6 @@ uint16_t Flash_WriteDataCont(uint32_t address, uint8_t *in, uint16_t len) {
 	}
 
 
-
-	Flash_CheckBusy(BUSY_TIMEOUT);
-    Flash_WriteEnable();
-
 	FlashSendByte(PAGEPROG);
 	FlashSendByte((address >> 16) & 0xFF);
 	FlashSendByte((address >> 8) & 0xFF);

From 24eaac86810e39a219431daf9bb959323366760d Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Thu, 6 Sep 2018 21:43:20 +0200
Subject: [PATCH 0017/1938] CHG:  the thread comms refactoring from offical pm3
 repo

chg: FPC com speed limited to 115200 when compiled with FPC
chg: USART remake (@drandreas)
---
 armsrc/Makefile       |   2 +-
 armsrc/appmain.c      |  81 ++++---
 armsrc/apps.h         |   4 +-
 armsrc/lfops.c        |   2 +-
 bootrom/bootrom.c     |  10 +-
 client/Makefile       |   5 +-
 client/cmdanalyse.c   |   3 +-
 client/cmddata.h      |   2 +-
 client/cmdflashmem.h  |   2 +-
 client/cmdhffelica.h  |   2 +-
 client/cmdhficlass.h  |   2 +-
 client/cmdhflegic.h   |   2 +-
 client/cmdhfmfu.h     |   1 +
 client/cmdlf.c        |   6 +-
 client/cmdlfawid.c    |   2 +-
 client/cmdlfcotag.h   |   2 +-
 client/cmdlfem4x.h    |   3 +-
 client/cmdlfhid.c     |   2 +-
 client/cmdlfhitag.c   |   2 +-
 client/cmdlfindala.c  |   2 +-
 client/cmdlft55xx.c   |  10 +-
 client/cmdlft55xx.h   |   2 +-
 client/cmdmain.c      | 292 +-----------------------
 client/cmdmain.h      |  28 +--
 client/cmdparser.c    |   3 +-
 client/cmdscript.c    |   1 +
 client/cmdsmartcard.h |   2 +-
 client/cmdtrace.h     |   2 +-
 client/comms.c        | 510 ++++++++++++++++++++++++++++++++++++++++++
 client/comms.h        |  67 ++++++
 client/flash.c        |  41 ++--
 client/flash.h        |   2 +
 client/flasher.c      |  93 ++------
 client/proxmark3.c    | 192 ++--------------
 client/proxmark3.h    |   4 -
 client/scripting.h    |   1 +
 client/ui.c           |  11 +-
 client/ui.h           |   3 +-
 common/cmd.c          |  37 +--
 common/cmd.h          |   3 +-
 common/usart.c        | 316 +++++++++-----------------
 common/usart.h        |  13 +-
 uart/uart.h           |  14 +-
 uart/uart_posix.c     |  32 +--
 uart/uart_win32.c     |  48 ++--
 45 files changed, 915 insertions(+), 949 deletions(-)
 create mode 100644 client/comms.c
 create mode 100644 client/comms.h

diff --git a/armsrc/Makefile b/armsrc/Makefile
index b2ae9f9a2..8f0cd025e 100644
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -104,7 +104,7 @@ ifneq (,$(findstring WITH_HF_MATTYRUN,$(APP_CFLAGS)))
 endif
 # WITH_HF_COLIN
 ifneq (,$(findstring WITH_HF_COLIN,$(APP_CFLAGS)))
-	SRC_STANDALONE = hf_colin.c vtsend.c
+	SRC_STANDALONE = vtsend.c hf_colin.c
 endif
 
 #the FPGA bitstream files. Note: order matters!
diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index e9237c25c..9cb3758af 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -441,7 +441,7 @@ void printStandAloneModes(void) {
 	DbpString("   LF HID corporate 1000 bruteforce - (Federico dotta & Maurizio Agazzini)");
 #endif 
 #if defined(WITH_HF_MATTYRUN)
-	DbpString("   HF Mifare sniff/clone - aka MattyRun (Mat�as A. R� Medina)");
+	DbpString("   HF Mifare sniff/clone - aka MattyRun (Matías A. Ré Medina)");
 #endif 
 #if defined(WITH_HF_COLIN)
     DbpString("   HF Mifare ultra fast sniff/sim/clone - aka VIGIKPWN (Colin Brigato)");
@@ -1063,15 +1063,45 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 
 #ifdef WITH_FPC
 		case CMD_FPC_SEND: {
-//			char header[] = {"*** Iceman Usart ***"};
-//			uint32_t res = usart_writebuffer((uint8_t *)header, sizeof(header), 10000);
+
+			char dest[USB_CMD_DATA_SIZE] = { '\0' };
+
+			static const char* welcome = "Proxmark3 Serial interface ready\n";
+			strncat(dest, welcome, sizeof(dest) - strlen(dest) - 1);
 			
-			//temp++;
-			uint8_t got = usart_read(10000);
-			if ( got > 0 ) {
-				Dbprintf("got %02x", got);			
-				usart_write(got, 10000);
+			sprintf(dest + strlen(dest) - 1, "Arg0  | 0x%" PRIx64 " \n", c->arg[0]);
+			sprintf(dest + strlen(dest) - 1, "Arg1  | 0x%" PRIx64 " \n", c->arg[1]);
+			sprintf(dest + strlen(dest) - 1, "Arg2  | 0x%" PRIx64 " \n", c->arg[2]);
+			sprintf(dest + strlen(dest) - 1, "bytes | 0x%02x 0x%02x 0x%02x 0x%02x \n"
+						,c->d.asBytes[0], c->d.asBytes[1], c->d.asBytes[2], c->d.asBytes[3]);
+			
+/*
+			UsbCommand txcmd;
+			for (size_t i=0; i < sizeof(UsbCommand); i++)
+				((uint8_t*)&txcmd)[i] = 0x00;
+
+			// Compose the outgoing command frame
+			txcmd.cmd = CMD_DEBUG_PRINT_STRING;
+			txcmd.arg[0] = len;
+			txcmd.arg[1] = 0;	
+			txcmd.arg[2] = 0;
+			memcpy(txcmd.d.asBytes, dest, USB_CMD_DATA_SIZE);		
+			usart_writebuffer((uint8_t*)&txcmd, sizeof(UsbCommand));
+*/
+			DbpString("Starting to listen");
+			LED_A_ON();
+			/*
+			uint8_t rx[sizeof(UsbCommand)];
+			usart_init();
+			while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
+				WaitMS(1);
+				if (usart_readbuffer(rx, sizeof(rx)) )
+					DbpString("got 544");
 			}
+			*/
+			cmd_send(CMD_DEBUG_PRINT_STRING, strlen(dest), 0, 0, dest, strlen(dest));
+			//DbpString("finished");
+			LED_A_OFF();
 			cmd_send(CMD_ACK,0,0,0,0,0);
 			break;
 		}
@@ -1114,7 +1144,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 			for(size_t i = 0; i < numofbytes; i += USB_CMD_DATA_SIZE) {
 				len = MIN( (numofbytes - i), USB_CMD_DATA_SIZE);
 				isok = cmd_send(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K, i, len, BigBuf_get_traceLen(), mem + startidx + i, len);
-				if (!isok) 
+				if (isok != 0) 
 					Dbprintf("transfer to client failed ::  | bytes between %d - %d (%d)", i, i+len, len);
 			}
 			// Trigger a finish downloading signal with an ACK frame
@@ -1160,8 +1190,8 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 			for (size_t i = 0; i < numofbytes; i += USB_CMD_DATA_SIZE) {
 				len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);
 				isok = cmd_send(CMD_DOWNLOADED_EML_BIGBUF, i, len, 0, mem + startidx + i, len);
-				if (!isok) 
-					Dbprintf("transfer to client failed ::  | bytes between %d - %d", i, len);
+				if (isok != 0) 
+					Dbprintf("transfer to client failed ::  | bytes between %d - %d (%d)", i, i+len, len);
 			}
 			// Trigger a finish downloading signal with an ACK frame
 			cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
@@ -1180,7 +1210,6 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 			uint16_t isok = 0;
 			uint32_t startidx = c->arg[0];
 			uint16_t len = c->arg[1];
-			//uint8_t fast = c->arg[2];
 			
 			Dbprintf("FlashMem read | %d - %d | ", startidx, len);
 			
@@ -1285,8 +1314,6 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 			size_t len = 0;
 			uint32_t startidx = c->arg[0];
 			uint32_t numofbytes = c->arg[1];
-			//uint8_t fast = c->arg[2];
-
 			// arg0 = startindex
 			// arg1 = length bytes to transfer
 			// arg2 = RFU
@@ -1301,7 +1328,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 					Dbprintf("reading flash memory failed ::  | bytes between %d - %d", i, len);
 
 				isok = cmd_send(CMD_FLASHMEM_DOWNLOADED, i, len, 0, mem, len);
-				if (!isok) 
+				if (isok != 0)
 					Dbprintf("transfer to client failed ::  | bytes between %d - %d", i, len);
 			}
 				FlashStop();
@@ -1458,19 +1485,20 @@ void  __attribute__((noreturn)) AppMain(void) {
 	for(;;) {
 		WDT_HIT();
 		
-#ifdef WITH_FPC
-		// check if there is a FPC USART1 message?
-		/*
-		uint32_t fpc_rxlen = usart_read(rx, sizeof(UsbCommand));
-		if ( fpc_rxlen > 0)
-			Dbprintf("got a package [len %d] %02x", fpc_rxlen, rx[0]);
-		*/
-#endif
-		
 		// Check if there is a usb packet available
-		if ( cmd_receive( (UsbCommand*)rx ) ) {
-			UsbPacketReceived(rx, sizeof(UsbCommand) );
+		if (usb_poll_validate_length()) {
+			if (usb_read(rx, sizeof(rx)) )
+				UsbPacketReceived(rx, sizeof(rx));
 		}
+#ifdef WITH_FPC
+		// Check is there is FPC package available
+		/*
+		usart_init();
+		if (usart_readbuffer(rx, sizeof(rx)) )
+			UsbPacketReceived(rx, sizeof(rx) );
+		*/
+
+#endif
 		
 		// Press button for one second to enter a possible standalone mode
 		if (BUTTON_HELD(1000) > 0) {
@@ -1487,6 +1515,7 @@ void  __attribute__((noreturn)) AppMain(void) {
 #if defined (WITH_ISO14443a) && ( defined (WITH_HF_YOUNG) || defined(WITH_HF_COLIN) || defined(WITH_HF_MATTYRUN) )
 			RunMod();
 #endif
+
 		}
 	}
 }
diff --git a/armsrc/apps.h b/armsrc/apps.h
index 7852d1439..f8d24f4ae 100644
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -230,8 +230,8 @@ void WritePageHitagS(hitag_function htf, hitag_data* htd,int page);
 void check_challenges(bool file_given, byte_t* data);
 
 // cmd.h
-bool cmd_receive(UsbCommand* cmd);
-bool cmd_send(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void* data, size_t len);
+uint8_t cmd_receive(UsbCommand* cmd);
+uint8_t cmd_send(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void* data, size_t len);
 
 // util.h
 void HfSnoop(int , int);
diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index 5afce8549..9d6cfbf0e 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -27,7 +27,7 @@
 #endif
 
 
-#define START_GAP 48*8 // was 250 // SPEC:  1*8 to 50*8 - typ 15*8 (15fc)
+#define START_GAP 52*8 // was 250 // SPEC:  1*8 to 50*8 - typ 15*8 (15fc)
 #define WRITE_GAP 18*8 // was 160 // SPEC:  1*8 to 20*8 - typ 10*8 (10fc)
 #define WRITE_0   24*8 // was 144 // SPEC: 16*8 to 32*8 - typ 24*8 (24fc)
 #define WRITE_1   54*8 // was 400 // SPEC: 48*8 to 64*8 - typ 56*8 (56fc)  432 for T55x7; 448 for E5550
diff --git a/bootrom/bootrom.c b/bootrom/bootrom.c
index 0dcf52b28..d2a18628a 100644
--- a/bootrom/bootrom.c
+++ b/bootrom/bootrom.c
@@ -191,7 +191,7 @@ static void flash_mode(int externally_entered) {
 	start_addr = 0;
 	end_addr = 0;
 	bootrom_unlocked = 0;
-	byte_t rx[sizeof(UsbCommand)];
+	uint8_t rx[sizeof(UsbCommand)];
 
 	usb_enable();
 	
@@ -200,10 +200,12 @@ static void flash_mode(int externally_entered) {
 
 	for(;;) {
 		WDT_HIT();
-		
+				
 		// Check if there is a usb packet available
-		if ( cmd_receive( (UsbCommand*)rx ) )
-			UsbPacketReceived(rx, sizeof(UsbCommand) );
+		if (usb_poll_validate_length()) {
+			if (usb_read(rx, sizeof(rx)) )
+				UsbPacketReceived(rx, sizeof(rx));
+		}
 		
 		if (!externally_entered && !BUTTON_PRESS()) {
 			/* Perform a reset to leave flash mode */
diff --git a/client/Makefile b/client/Makefile
index af2efb26c..f577a6386 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -82,7 +82,7 @@ else
 endif
 
 # RDV40 flag enables flashmemory commands in client.  comment out if you don't have rdv40
-CFLAGS += -DWITH_FLASH -DWITH_SMARTCARD
+CFLAGS += -DWITH_FLASH -DWITH_SMARTCARD -DWITH_FPC
 
 # Flags to generate temporary dependency files
 DEPFLAGS = -MT $@ -MMD -MP -MF $(OBJDIR)/$*.Td
@@ -94,7 +94,8 @@ CORESRCS =  uart_posix.c \
 			ui.c \
 			util.c \
 			util_posix.c \
-			scandir.c
+			scandir.c \
+			comms.c
 
 CMDSRCS =	crapto1/crapto1.c \
 			crapto1/crypto1.c \
diff --git a/client/cmdanalyse.c b/client/cmdanalyse.c
index 1c65b8cc4..490dda9d3 100644
--- a/client/cmdanalyse.c
+++ b/client/cmdanalyse.c
@@ -515,6 +515,7 @@ int CmdAnalyseA(const char *Cmd){
 
 		
 	UsbCommand c = {CMD_FPC_SEND, {0, 0, 0}};
+	memcpy(c.d.asBytes, data, USB_CMD_DATA_SIZE);
 	clearCommandBuffer();
 	SendCommand(&c);
 
@@ -522,7 +523,7 @@ int CmdAnalyseA(const char *Cmd){
 	if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
 		return 1;
 	}
-	PrintAndLogEx(NORMAL, "got ack");
+	PrintAndLogEx(NORMAL, "got ack.  Status %d", resp.arg[0]);
 	return 0;
 		
 	PrintAndLogEx(NORMAL, "-- " _BLUE_(its my message) "\n");
diff --git a/client/cmddata.h b/client/cmddata.h
index dbd735747..27c446ecb 100644
--- a/client/cmddata.h
+++ b/client/cmddata.h
@@ -25,7 +25,7 @@
 #include "proxmark3.h"	// sendcommand
 #include "ui.h"       // for show graph controls
 #include "graph.h"    // for graph data
-#include "usb_cmd.h"  // already included in cmdmain.h and proxmark3.h
+#include "comms.h"
 #include "lfdemod.h"  // for demod code
 #include "crc.h"      // for pyramid checksum maxim
 #include "crc16.h"    // for FDXB demod checksum
diff --git a/client/cmdflashmem.h b/client/cmdflashmem.h
index 99b18b4c5..843c17d6f 100644
--- a/client/cmdflashmem.h
+++ b/client/cmdflashmem.h
@@ -22,7 +22,7 @@
 #include "util.h"
 #include "util_posix.h"			// msclock
 #include "loclass/fileutils.h"	//saveFile
-#include "cmdmain.h"			//getfromdevice
+#include "comms.h"			//getfromdevice
 
 extern int CmdFlashMem(const char *Cmd);
 
diff --git a/client/cmdhffelica.h b/client/cmdhffelica.h
index f82d2d574..bcec38a0b 100644
--- a/client/cmdhffelica.h
+++ b/client/cmdhffelica.h
@@ -21,7 +21,7 @@
 #include "ui.h"
 #include "util.h"
 #include "cmdparser.h"
-#include "cmdmain.h"
+#include "comms.h"		// getfromdevice
 #include "iso14443crc.h"
 #include "cmdhf.h"		// list cmd
 #include "mifare.h" 	// felica_card_select_t struct
diff --git a/client/cmdhficlass.h b/client/cmdhficlass.h
index e9bedf9fe..c53e88f49 100644
--- a/client/cmdhficlass.h
+++ b/client/cmdhficlass.h
@@ -21,7 +21,7 @@
 #include "cmdparser.h"
 #include "common.h"
 #include "util.h"
-#include "cmdmain.h"
+#include "comms.h"
 #include "des.h"
 #include "loclass/cipherutils.h"
 #include "loclass/cipher.h"
diff --git a/client/cmdhflegic.h b/client/cmdhflegic.h
index 645a6b993..4e3c8cc86 100644
--- a/client/cmdhflegic.h
+++ b/client/cmdhflegic.h
@@ -16,7 +16,7 @@
 #include "proxmark3.h"
 #include "ui.h"
 #include "cmdparser.h"
-#include "cmdmain.h"
+#include "comms.h"
 #include "util.h"
 #include "crc.h"
 #include "legic_prng.h"
diff --git a/client/cmdhfmfu.h b/client/cmdhfmfu.h
index da9cfd02f..2e07bae80 100644
--- a/client/cmdhfmfu.h
+++ b/client/cmdhfmfu.h
@@ -9,6 +9,7 @@
 #include "mifare.h"
 #include "util.h"
 #include "protocols.h"
+#include "comms.h"
 
 typedef struct {
 	uint8_t version[8];
diff --git a/client/cmdlf.c b/client/cmdlf.c
index ec9527bcc..ccb781014 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -320,7 +320,7 @@ int CmdLFSetConfig(const char *Cmd) {
 }
 
 bool lf_read(bool silent, uint32_t samples) {
-	if (offline) return false;
+	if ( IsOffline() ) return false;
 	UsbCommand c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_125K, {silent, samples, 0}};
 	clearCommandBuffer();
 	SendCommand(&c);
@@ -342,7 +342,7 @@ bool lf_read(bool silent, uint32_t samples) {
 
 int CmdLFRead(const char *Cmd) {
 	
-	if (offline) return 0;
+	if ( IsOffline() ) return 0;
 	
 	bool errors = false;
 	bool silent = false;
@@ -844,7 +844,7 @@ int CmdLFfind(const char *Cmd) {
 	
 	if (cmdp == 'u') testRaw = 'u';
 	
-	bool isOnline = (!offline && (cmdp != '1') );
+	bool isOnline = (!IsOffline() && (cmdp != '1') );
 	
 	if (isOnline)
 		lf_read(true, 30000);
diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c
index 8b1205e52..420caeb62 100644
--- a/client/cmdlfawid.c
+++ b/client/cmdlfawid.c
@@ -539,7 +539,7 @@ int CmdAWIDBrute(const char *Cmd) {
 	// main loop
 	for (;;){
 	
-		if ( offline ) {
+		if ( IsOffline() ) {
 			PrintAndLogEx(WARNING, "Device offline\n");
 			return  2;
 		}
diff --git a/client/cmdlfcotag.h b/client/cmdlfcotag.h
index 589089a61..e03f7d5f5 100644
--- a/client/cmdlfcotag.h
+++ b/client/cmdlfcotag.h
@@ -15,7 +15,7 @@
 #include "util.h"       // FALSE / TRUE
 #include "cmddata.h"	// getSamples
 #include "cmdparser.h"  // CmdsParse, CmdsHelp
-#include "cmdmain.h"
+#include "comms.h"
 #include "ui.h"			// PrintAndLog
 #include "cmdlf.h"		// Setconfig 
 
diff --git a/client/cmdlfem4x.h b/client/cmdlfem4x.h
index aa044b9c7..676c6fd6b 100644
--- a/client/cmdlfem4x.h
+++ b/client/cmdlfem4x.h
@@ -21,8 +21,7 @@
 #include "graph.h"
 #include "cmdparser.h"
 #include "cmddata.h"
-#include "cmdmain.h"
-#include "cmdmain.h"
+#include "comms.h"
 #include "cmdlf.h"
 #include "lfdemod.h"
 
diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c
index 08cbc8661..02fd9c791 100644
--- a/client/cmdlfhid.c
+++ b/client/cmdlfhid.c
@@ -544,7 +544,7 @@ int CmdHIDBrute(const char *Cmd){
 	// main loop
 	for (;;){
 		
-		if ( offline ) {
+		if ( IsOffline() ) {
 			PrintAndLogEx(WARNING, "Device offline\n");
 			return  2;
 		}
diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index ed2250a0c..69bae1b38 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -20,7 +20,7 @@
 #include "hitag2.h"
 #include "hitagS.h"
 #include "util_posix.h"
-#include "cmdmain.h"
+#include "comms.h"
 #include "cmddata.h"
 
 static int CmdHelp(const char *Cmd);
diff --git a/client/cmdlfindala.c b/client/cmdlfindala.c
index 6f6eb4f37..f4993fb5e 100644
--- a/client/cmdlfindala.c
+++ b/client/cmdlfindala.c
@@ -122,7 +122,7 @@ int CmdIndalaDemod(const char *Cmd) {
 		ans = PSKDemod("32", 0);
 
 	if (!ans){
-		PrintAndLogEx(DEBUG, "DEBUG: Error - Indala can't demod signal: %d",ans);
+		PrintAndLogEx(DEBUG, "DEBUG: Error - Indala can't demod signal: %d", ans);
 		return 0;
 	}
 
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 0982337f3..c4d1e3be6 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -452,7 +452,7 @@ bool DecodeT5555TraceBlock() {
 
 // sanity check. Don't use proxmark if it is offline and you didn't specify useGraphbuf
 static int SanityOfflineCheck( bool useGraphBuffer ){
-	if ( !useGraphBuffer && offline) {
+	if ( !useGraphBuffer && IsOffline() ) {
 		PrintAndLogEx(NORMAL, "Your proxmark3 device is offline. Specify [1] to use graphbuffer data instead");
 		return 0;
 	}
@@ -466,13 +466,11 @@ int CmdT55xxDetect(const char *Cmd){
 	uint32_t password = 0;
 	uint8_t cmdp = 0;
 
-	while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch(param_getchar(Cmd, cmdp)) {
+	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+		switch ( tolower(param_getchar(Cmd, cmdp))) {
 		case 'h':
-		case 'H':
 			return usage_t55xx_detect();
 		case 'p':
-		case 'P':
 			password = param_get32ex(Cmd, cmdp+1, 0, 16);
 			usepwd = true;
 			cmdp += 2;
@@ -1572,7 +1570,7 @@ int CmdT55xxBruteForce(const char *Cmd) {
 		uint64_t testpwd = 0x00;
 		for (uint16_t c = 0; c < keycnt; ++c ) {
 
-			if ( offline ) {
+			if ( IsOffline() ) {
 				PrintAndLogEx(WARNING, "Device offline\n");
 				free(keyBlock);
 				return  2;
diff --git a/client/cmdlft55xx.h b/client/cmdlft55xx.h
index ad170514c..b6c355778 100644
--- a/client/cmdlft55xx.h
+++ b/client/cmdlft55xx.h
@@ -18,7 +18,7 @@
 #include "proxmark3.h"
 #include "ui.h"
 #include "graph.h"
-#include "cmdmain.h"
+#include "comms.h"
 #include "cmdparser.h"
 #include "cmddata.h"
 #include "cmdlf.h"
diff --git a/client/cmdmain.c b/client/cmdmain.c
index 351152179..85d7f19c3 100644
--- a/client/cmdmain.c
+++ b/client/cmdmain.c
@@ -15,18 +15,6 @@ static int CmdQuit(const char *Cmd);
 static int CmdRev(const char *Cmd);
 static int CmdRem(const char *Cmd);
 
-//For storing command that are received from the device
-static UsbCommand cmdBuffer[CMD_BUFFER_SIZE];
-
-//Points to the next empty position to write to
-static int cmd_head = 0;
-
-//Points to the position of the last unread command
-static int cmd_tail = 0;
-
-// to lock cmdBuffer operations from different threads
-static pthread_mutex_t cmdBufferMutex = PTHREAD_MUTEX_INITIALIZER;
-
 static command_t CommandTable[] = {
 	{"help",	CmdHelp,	1, "This help. Use '<command> help' for details of a particular command."},
 	{"analyse", CmdAnalyse, 1, "{ Analyse utils... }"},
@@ -38,7 +26,7 @@ static command_t CommandTable[] = {
 	{"reveng",	CmdRev, 	1, "{ Crc calculations from the software reveng 1.53... }"},
 	{"script",	CmdScript,	1, "{ Scripting commands }"},
 	{"trace",	CmdTrace,	1, "{ Trace manipulation... }"},
-#ifdef WITH_FLASH		
+#ifdef WITH_FLASH
 	{"mem",		CmdFlashMem,	1, "{ RDV40, Flash Memory manipulation... }"},
 #endif
 #ifdef WITH_SMARTCARD
@@ -79,286 +67,10 @@ int CmdRev(const char *Cmd) {
 	return 0;
 }
 
-bool dl_it(uint8_t *dest, uint32_t bytes, uint32_t start_index, UsbCommand *response, size_t ms_timeout, bool show_warning, uint32_t rec_cmd);
-/**
- * @brief This method should be called when sending a new command to the pm3. In case any old
- *  responses from previous commands are stored in the buffer, a call to this method should clear them.
- *  A better method could have been to have explicit command-ACKS, so we can know which ACK goes to which
- *  operation. Right now we'll just have to live with this.
- */
-void clearCommandBuffer() {
-    //This is a very simple operation
-	pthread_mutex_lock(&cmdBufferMutex);
-    cmd_tail = cmd_head;
-	pthread_mutex_unlock(&cmdBufferMutex);
-}
-
-/**
- * @brief storeCommand stores a USB command in a circular buffer
- * @param UC
- */
-void storeCommand(UsbCommand *command) {
-	
-	pthread_mutex_lock(&cmdBufferMutex);
-    if ( ( cmd_head+1) % CMD_BUFFER_SIZE == cmd_tail) {
-        //If these two are equal, we're about to overwrite in the
-        // circular buffer.
-        PrintAndLogEx(FAILED, "WARNING: Command buffer about to overwrite command! This needs to be fixed!");
-		fflush(NULL);
-    }
-    //Store the command at the 'head' location
-    UsbCommand* destination = &cmdBuffer[cmd_head];
-    memcpy(destination, command, sizeof(UsbCommand));
-
-	 //increment head and wrap
-    cmd_head = (cmd_head +1) % CMD_BUFFER_SIZE;	
-	pthread_mutex_unlock(&cmdBufferMutex);
-}
-/**
- * @brief getCommand gets a command from an internal circular buffer.
- * @param response location to write command
- * @return 1 if response was returned, 0 if nothing has been received
- */
-int getCommand(UsbCommand* response) {
-	pthread_mutex_lock(&cmdBufferMutex);
-    //If head == tail, there's nothing to read, or if we just got initialized
-    if (cmd_head == cmd_tail)  {
-		pthread_mutex_unlock(&cmdBufferMutex);
-		return 0;
-	}
-	
-    //Pick out the next unread command
-    UsbCommand* last_unread = &cmdBuffer[cmd_tail];
-    memcpy(response, last_unread, sizeof(UsbCommand));
-
-    //Increment tail - this is a circular buffer, so modulo buffer size
-    cmd_tail = (cmd_tail +1 ) % CMD_BUFFER_SIZE;
-
-	pthread_mutex_unlock(&cmdBufferMutex);
-    return 1;
-}
-
-/**
- * @brief Waits for a certain response type. This method waits for a maximum of
- * ms_timeout milliseconds for a specified response command.
- * @param cmd command to wait for, or CMD_UNKNOWN to take any command.
- * @param response struct to copy received command into.
- * @param ms_timeout display message after 2 seconds
- * @return true if command was returned, otherwise false
- */
-bool WaitForResponseTimeoutW(uint32_t cmd, UsbCommand* response, size_t ms_timeout, bool show_warning) {
-  
-	UsbCommand resp;
-
-	if (response == NULL)
-		response = &resp;
-
-	uint64_t start_time = msclock();
-	
-	// Wait until the command is received
-	while (true) {
-
-		while ( getCommand(response) ) {
-			if (cmd == CMD_UNKNOWN || response->cmd == cmd)
-				return true;			
-		}
-
-		if (msclock() - start_time > ms_timeout)
-			break;
-		
-		if (msclock() - start_time > 3000 && show_warning) {
-			// 3 seconds elapsed (but this doesn't mean the timeout was exceeded)
-			PrintAndLogEx(NORMAL, "Waiting for a response from the proxmark...");
-			PrintAndLogEx(NORMAL, "You can cancel this operation by pressing the pm3 button");
-			show_warning = false;
-		}
-	}
-	return false;
-}
-
-bool WaitForResponseTimeout(uint32_t cmd, UsbCommand* response, size_t ms_timeout) {
-	return WaitForResponseTimeoutW(cmd, response, ms_timeout, true);
-}
-
-bool WaitForResponse(uint32_t cmd, UsbCommand* response) {
-	return WaitForResponseTimeoutW(cmd, response, -1, true);
-}
-
 //-----------------------------------------------------------------------------
 // Entry point into our code: called whenever the user types a command and
 // then presses Enter, which the full command line that they typed.
 //-----------------------------------------------------------------------------
 int CommandReceived(char *Cmd) {
 	return CmdsParse(CommandTable, Cmd);
-}
-
-//-----------------------------------------------------------------------------
-// Entry point into our code: called whenever we received a packet over USB
-// that we weren't necessarily expecting, for example a debug print.
-//-----------------------------------------------------------------------------
-void UsbCommandReceived(UsbCommand* _ch) {
-
-	//UsbCommand *c = malloc(sizeof(UsbCommand));
-	//memset(cp, 0x00, sizeof(*cp));
-
-	pthread_mutex_lock(&cmdBufferMutex);
-	UsbCommand* c = _ch;
-	pthread_mutex_unlock(&cmdBufferMutex);	
-			
-	switch(c->cmd) {
-		// First check if we are handling a debug message
-		case CMD_DEBUG_PRINT_STRING: {
-
-			char s[USB_CMD_DATA_SIZE+1];
-			memset(s, 0x00, sizeof(s)); 
-			size_t len = MIN(c->arg[0], USB_CMD_DATA_SIZE);
-			memcpy(s, c->d.asBytes, len);
-		
-		        //#define FLAG_RAWPRINT 0x0111
-		        //#define FLAG_NOOPT 0x0000
-		        //#define FLAG_NOLOG 0x0001
-		        //#define FLAG_NONEWLINE 0x0010
-		        //#define FLAG_NOPROMPT 0x0100
-		        uint64_t flag = c->arg[1];
-		        if (flag > 0) { // FLAG_RAWPRINT) {
-		            switch (flag) {
-		            case FLAG_RAWPRINT: {
-		                printf("%s", s);
-		            } return; break;
-		            case FLAG_NONEWLINE: {
-		                printf("%s\r", s);
-		            } return; break;
-		            case FLAG_NOLOG: {
-		                printf("%s\r\n", s);
-		            } return; break;
-		                // printf("%s", s);
-		                fflush(stdout);
-		                return;
-		            }
-			}
-
-	
-			// print debug line on same row. escape seq \r
-			if ( c->arg[1] == CMD_MEASURE_ANTENNA_TUNING_HF) {
-				PrintAndLogEx(NORMAL, "\r#db# %s", s);
-			} else {
-				PrintAndLogEx(NORMAL, "#db# %s", s);
-			}
-			fflush(NULL);
-			break;
-		}
-		case CMD_DEBUG_PRINT_INTEGERS: {
-			PrintAndLogEx(NORMAL, "#db# %08x, %08x, %08x", c->arg[0], c->arg[1], c->arg[2]);
-			break;
-		}
-		// iceman:  hw status - down the path on device, runs printusbspeed which starts sending a lot of
-		// CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K packages which is not dealt with. I wonder if simply ignoring them will
-		// work. lets try it. 
-		default: {
-			storeCommand(c);
-			break;
-		}
-	}
-}
-
-/**
-* Data transfer from Proxmark to client. This method times out after
-* ms_timeout milliseconds.
-* @brief GetFromDevice
-* @param memtype Type of memory to download from proxmark
-* @param dest Destination address for transfer
-* @param bytes number of bytes to be transferred
-* @param start_index offset into Proxmark3 BigBuf[]
-* @param response struct to copy last command (CMD_ACK) into
-* @param ms_timeout timeout in milliseconds
-* @param show_warning display message after 2 seconds
-* @return true if command was returned, otherwise false
-*/
-bool GetFromDevice(DeviceMemType_t memtype, uint8_t *dest, uint32_t bytes, uint32_t start_index, UsbCommand *response, size_t ms_timeout, bool show_warning) {
-	
-	if (dest == NULL) return false;
-	if (bytes == 0) return true;
-
-	UsbCommand resp;
-	if (response == NULL)
-		response = &resp;
-
-	// clear 
-	clearCommandBuffer();
-			
-	switch (memtype) {
-		case BIG_BUF: {
-			UsbCommand c = {CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K, {start_index, bytes, 0}};
-			SendCommand(&c);
-			return dl_it(dest, bytes, start_index, response, ms_timeout, show_warning, CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K);
-		}
-		case BIG_BUF_EML: {
-			UsbCommand c = {CMD_DOWNLOAD_EML_BIGBUF, {start_index, bytes, 0}};
-			SendCommand(&c);			
-			return dl_it(dest, bytes, start_index, response, ms_timeout, show_warning, CMD_DOWNLOADED_EML_BIGBUF);
-		}
-		case FLASH_MEM: {			
-			UsbCommand c = {CMD_FLASHMEM_DOWNLOAD, {start_index, bytes, 0}};
-			SendCommand(&c);
-			return dl_it(dest, bytes, start_index, response, ms_timeout, show_warning, CMD_FLASHMEM_DOWNLOADED);
-		}
-		case SIM_MEM: {
-			//UsbCommand c = {CMD_DOWNLOAND_SIM_MEM, {start_index, bytes, 0}};
-			//SendCommand(&c);
-			//return dl_it(dest, bytes, start_index, response, ms_timeout, show_warning, CMD_DOWNLOADED_SIMMEM);
-			return false;
-		}
-	}
-	return false;
-}
-
-bool dl_it(uint8_t *dest, uint32_t bytes, uint32_t start_index, UsbCommand *response, size_t ms_timeout, bool show_warning, uint32_t rec_cmd) {
-	
-	uint32_t bytes_completed = 0;
-	uint64_t start_time = msclock();
-	
-	while (true) {
-		
-		if (getCommand(response)) {
-
-			// sample_buf is a array pointer, located in data.c
-			// arg0 = offset in transfer. Startindex of this chunk
-			// arg1 = length bytes to transfer
-			// arg2 = bigbuff tracelength (?)			
-			if (response->cmd == rec_cmd) {
-				
-				uint32_t offset = response->arg[0];
-				uint32_t copy_bytes = MIN(bytes - bytes_completed, response->arg[1]);
-				//uint32_t tracelen = c->arg[2];
-				
-				// extended bounds check1.  upper limit is USB_CMD_DATA_SIZE
-				// shouldn't happen
-				copy_bytes = MIN(copy_bytes, USB_CMD_DATA_SIZE);
-				
-				// extended bounds check2. 
-				if ( offset + copy_bytes > bytes ) {
-					PrintAndLogEx(FAILED, "ERROR: Out of bounds when downloading from device,  offset %u | len %u | total len %u > buf_size %u", offset, copy_bytes,  offset+copy_bytes,  bytes);
-					break;
-				}			
-		
-				memcpy(dest + offset, response->d.asBytes, copy_bytes);
-				bytes_completed += copy_bytes;
-			} else if (response->cmd == CMD_ACK) {
-				return true;
-			}
-		}
-		
-		if (msclock() - start_time > ms_timeout) {
-			PrintAndLogEx(FAILED, "Timed out while trying to download data from device");
-			break;
-		}
-		
-		if (msclock() - start_time > 3000 && show_warning) {
-			// 3 seconds elapsed (but this doesn't mean the timeout was exceeded)
-			PrintAndLogEx(NORMAL, "Waiting for a response from the proxmark...");
-			PrintAndLogEx(NORMAL, "You can cancel this operation by pressing the pm3 button");
-			show_warning = false;
-		}
-	}
-	return false;
-}
+}
\ No newline at end of file
diff --git a/client/cmdmain.h b/client/cmdmain.h
index de728e11c..74804300d 100644
--- a/client/cmdmain.h
+++ b/client/cmdmain.h
@@ -13,7 +13,6 @@
 
 #include <stdint.h>
 #include <stddef.h>
-#include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -24,7 +23,6 @@
 #include "util.h"
 #include "ui.h"
 #include "cmdparser.h"
-#include "loclass/fileutils.h"
 #include "cmdhf.h"
 #include "cmddata.h"
 #include "cmdhw.h"
@@ -33,26 +31,16 @@
 #include "cmdscript.h"
 #include "cmdcrc.h"
 #include "cmdanalyse.h"
-#include "cmdflashmem.h"	// rdv40 flashmem commands
-#include "cmdsmartcard.h"	// rdv40 smart card ISO7816 commands
 
-//For storing command that are received from the device
-#define CMD_BUFFER_SIZE 100
-typedef enum {
-	BIG_BUF,
-	BIG_BUF_EML,
-	FLASH_MEM,
-	SIM_MEM,
-	} DeviceMemType_t;
-	
-extern void UsbCommandReceived(UsbCommand *c);
+#ifdef WITH_FLASH
+#include "cmdflashmem.h"	// rdv40 flashmem commands
+#endif
+
+#ifdef WITH_SMARTCARD
+#include "cmdsmartcard.h"	// rdv40 smart card ISO7816 commands
+#endif
+
 extern int CommandReceived(char *Cmd);
-extern bool WaitForResponseTimeoutW(uint32_t cmd, UsbCommand* response, size_t ms_timeout, bool show_warning);
-extern bool WaitForResponseTimeout(uint32_t cmd, UsbCommand* response, size_t ms_timeout);
-extern bool WaitForResponse(uint32_t cmd, UsbCommand* response);
-extern void clearCommandBuffer();
 extern command_t* getTopLevelCommandTable();
 
-extern bool GetFromDevice(DeviceMemType_t memtype, uint8_t *dest, uint32_t bytes, uint32_t start_index, UsbCommand *response, size_t ms_timeout, bool show_warning);
-
 #endif
diff --git a/client/cmdparser.c b/client/cmdparser.c
index f12b4966e..974439298 100644
--- a/client/cmdparser.c
+++ b/client/cmdparser.c
@@ -15,12 +15,13 @@
 #include "ui.h"
 #include "cmdparser.h"
 #include "proxmark3.h"
+#include "comms.h"
 
 void CmdsHelp(const command_t Commands[]) {
 	if (Commands[0].Name == NULL) return;
 	int i = 0;
 	while (Commands[i].Name) {
-		if (!offline || Commands[i].Offline)
+		if (!IsOffline() || Commands[i].Offline)
 			PrintAndLogEx(NORMAL, "%-16s %s", Commands[i].Name, Commands[i].Help);
 		++i;
 	}
diff --git a/client/cmdscript.c b/client/cmdscript.c
index a34a42815..7159fa70b 100644
--- a/client/cmdscript.c
+++ b/client/cmdscript.c
@@ -24,6 +24,7 @@
 #include "graph.h"
 #include "cmdparser.h"
 #include "cmdmain.h"
+#include "comms.h"
 #include "cmdscript.h"
 #include "cmdhfmf.h"
 #include "pm3_binlib.h"
diff --git a/client/cmdsmartcard.h b/client/cmdsmartcard.h
index 1c7b5d3f8..5ba453e30 100644
--- a/client/cmdsmartcard.h
+++ b/client/cmdsmartcard.h
@@ -21,7 +21,7 @@
 #include "common.h"
 #include "util.h"
 #include "loclass/fileutils.h"	// saveFile
-#include "cmdmain.h"			// getfromdevice
+#include "comms.h"			// getfromdevice
 #include "emv/emvcore.h"		// decodeTVL
 #include "emv/apduinfo.h"		// APDUcode description
 
diff --git a/client/cmdtrace.h b/client/cmdtrace.h
index 8e940d220..c6ba0cc38 100644
--- a/client/cmdtrace.h
+++ b/client/cmdtrace.h
@@ -24,7 +24,7 @@
 #include "util.h"			// for parsing cli command utils
 #include "ui.h"				// for show graph controls
 #include "cmdparser.h"		// for getting cli commands included in cmdmain.h
-#include "cmdmain.h"		// for sending cmds to device. GetFromBigBuf
+#include "comms.h"		// for sending cmds to device. GetFromBigBuf
 #include "loclass/fileutils.h"		// for saveFile
 
 extern int CmdTrace(const char *Cmd);
diff --git a/client/comms.c b/client/comms.c
new file mode 100644
index 000000000..ec1a36860
--- /dev/null
+++ b/client/comms.c
@@ -0,0 +1,510 @@
+//-----------------------------------------------------------------------------
+// Copyright (C) 2009 Michael Gernoth <michael at gernoth.net>
+// Copyright (C) 2010 iZsh <izsh at fail0verflow.com>
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// Code for communicating with the proxmark3 hardware.
+//-----------------------------------------------------------------------------
+
+#include "comms.h"
+
+// Serial port that we are communicating with the PM3 on.
+static serial_port sp = NULL;
+static char *serial_port_name = NULL;
+
+// If TRUE, then there is no active connection to the PM3, and we will drop commands sent.
+static bool offline;
+
+static communication_arg_t conn;
+
+static pthread_t USB_communication_thread;
+//static pthread_t FPC_communication_thread;
+
+// Transmit buffer.
+static UsbCommand txBuffer;
+static bool txBuffer_pending = false;
+static pthread_mutex_t txBufferMutex = PTHREAD_MUTEX_INITIALIZER;
+static pthread_cond_t txBufferSig = PTHREAD_COND_INITIALIZER;
+
+// Used by UsbReceiveCommand as a ring buffer for messages that are yet to be
+// processed by a command handler (WaitForResponse{,Timeout})
+static UsbCommand rxBuffer[CMD_BUFFER_SIZE];
+
+// Points to the next empty position to write to
+static int cmd_head = 0;
+
+// Points to the position of the last unread command
+static int cmd_tail = 0;
+
+// to lock rxBuffer operations from different threads
+static pthread_mutex_t rxBufferMutex = PTHREAD_MUTEX_INITIALIZER;
+
+// These wrappers are required because it is not possible to access a static
+// global variable outside of the context of a single file.
+void SetOffline(bool value) {
+	offline = value;
+}
+
+bool IsOffline() {
+	return offline;
+}
+
+void SendCommand(UsbCommand *c) {
+
+	#ifdef COMMS_DEBUG
+	PrintAndLogEx(NORMAL, "Sending %d bytes | cmd %04x\n", sizeof(UsbCommand), c->cmd);
+	#endif
+	
+	if (offline) {
+		PrintAndLogEx(NORMAL, "Sending bytes to proxmark failed - offline");
+		return;
+	}
+
+	pthread_mutex_lock(&txBufferMutex);
+	/**
+	This causes hangups at times, when the pm3 unit is unresponsive or disconnected. The main console thread is alive, 
+	but comm thread just spins here. Not good.../holiman
+	**/
+	while (txBuffer_pending) {
+		// wait for communication thread to complete sending a previous commmand		
+		pthread_cond_wait(&txBufferSig, &txBufferMutex); 
+	}
+
+	txBuffer = *c;
+	txBuffer_pending = true;
+	
+	// tell communication thread that a new command can be send	
+	pthread_cond_signal(&txBufferSig);
+
+	pthread_mutex_unlock(&txBufferMutex);
+	
+//__atomic_test_and_set(&txcmd_pending, __ATOMIC_SEQ_CST);
+}
+
+/**
+ * @brief This method should be called when sending a new command to the pm3. In case any old
+ *  responses from previous commands are stored in the buffer, a call to this method should clear them.
+ *  A better method could have been to have explicit command-ACKS, so we can know which ACK goes to which
+ *  operation. Right now we'll just have to live with this.
+ */
+void clearCommandBuffer() {
+	//This is a very simple operation
+	pthread_mutex_lock(&rxBufferMutex);
+	cmd_tail = cmd_head;
+	pthread_mutex_unlock(&rxBufferMutex);
+}
+/**
+ * @brief storeCommand stores a USB command in a circular buffer
+ * @param UC
+ */
+static void storeCommand(UsbCommand *command) {
+	
+	pthread_mutex_lock(&rxBufferMutex);
+    if ( ( cmd_head+1) % CMD_BUFFER_SIZE == cmd_tail) {
+        //If these two are equal, we're about to overwrite in the
+        // circular buffer.
+        PrintAndLogEx(FAILED, "WARNING: Command buffer about to overwrite command! This needs to be fixed!");
+		fflush(NULL);
+    }
+    //Store the command at the 'head' location
+    UsbCommand* destination = &rxBuffer[cmd_head];
+    memcpy(destination, command, sizeof(UsbCommand));
+
+	 //increment head and wrap
+    cmd_head = (cmd_head +1) % CMD_BUFFER_SIZE;	
+	pthread_mutex_unlock(&rxBufferMutex);
+}
+/**
+ * @brief getCommand gets a command from an internal circular buffer.
+ * @param response location to write command
+ * @return 1 if response was returned, 0 if nothing has been received
+ */
+static int getCommand(UsbCommand* response) {
+	pthread_mutex_lock(&rxBufferMutex);
+    //If head == tail, there's nothing to read, or if we just got initialized
+    if (cmd_head == cmd_tail)  {
+		pthread_mutex_unlock(&rxBufferMutex);
+		return 0;
+	}
+	
+    //Pick out the next unread command
+    UsbCommand* last_unread = &rxBuffer[cmd_tail];
+    memcpy(response, last_unread, sizeof(UsbCommand));
+
+    //Increment tail - this is a circular buffer, so modulo buffer size
+    cmd_tail = (cmd_tail +1 ) % CMD_BUFFER_SIZE;
+
+	pthread_mutex_unlock(&rxBufferMutex);
+    return 1;
+}
+
+
+//-----------------------------------------------------------------------------
+// Entry point into our code: called whenever we received a packet over USB
+// that we weren't necessarily expecting, for example a debug print.
+//-----------------------------------------------------------------------------
+static void UsbCommandReceived(UsbCommand* c) {
+			
+	switch(c->cmd) {
+		// First check if we are handling a debug message
+		case CMD_DEBUG_PRINT_STRING: {
+
+			char s[USB_CMD_DATA_SIZE+1];
+			memset(s, 0x00, sizeof(s)); 
+			size_t len = MIN(c->arg[0], USB_CMD_DATA_SIZE);
+			memcpy(s, c->d.asBytes, len);
+			
+					
+			//#define FLAG_RAWPRINT 0x0111
+			//#define FLAG_NOOPT 0x0000
+			//#define FLAG_NOLOG 0x0001
+			//#define FLAG_NONEWLINE 0x0010
+			//#define FLAG_NOPROMPT 0x0100
+			uint64_t flag = c->arg[1];
+			if (flag > 0) { // FLAG_RAWPRINT) {
+				switch (flag) {
+					case FLAG_RAWPRINT:
+						printf("%s", s);
+						return;
+					case FLAG_NONEWLINE:
+						printf("%s\r", s);
+						return;
+					case FLAG_NOLOG:
+						printf("%s\r\n", s);
+						return; 
+				}
+				fflush(stdout);
+				return;
+			}
+
+			// print debug line on same row. escape seq \r
+			if ( c->arg[1] == CMD_MEASURE_ANTENNA_TUNING_HF) {
+				PrintAndLogEx(NORMAL, "\r#db# %s", s);
+			} else {
+				PrintAndLogEx(NORMAL, "#db# %s", s);
+			}
+			fflush(NULL);
+			break;
+		}
+		case CMD_DEBUG_PRINT_INTEGERS: {
+			PrintAndLogEx(NORMAL, "#db# %08x, %08x, %08x", c->arg[0], c->arg[1], c->arg[2]);
+			break;
+		}
+		// iceman:  hw status - down the path on device, runs printusbspeed which starts sending a lot of
+		// CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K packages which is not dealt with. I wonder if simply ignoring them will
+		// work. lets try it. 
+		default: {
+			storeCommand(c);
+			break;
+		}
+	}
+}
+
+/*
+bool hookUpPM3() {	
+	bool ret = false;
+	sp = uart_open( comport );
+
+	if (sp == INVALID_SERIAL_PORT) {
+		PrintAndLogEx(WARNING, "Reconnect failed, retrying...  (reason: invalid serial port)\n");
+		sp = NULL;
+		serial_port_name = NULL;		
+		ret = false;
+		offline = 1;
+	} else if (sp == CLAIMED_SERIAL_PORT) {
+		PrintAndLogEx(WARNING, "Reconnect failed, retrying... (reason: serial port is claimed by another process)\n");
+		sp = NULL;
+		serial_port_name = NULL;
+		ret = false;
+		offline = 1;
+	} else {	
+		PrintAndLogEx(SUCCESS, "Proxmark reconnected\n");
+		serial_port_name = ;
+		ret = true;
+		offline = 0;
+	}
+	return ret;
+}
+*/
+
+void
+#ifdef __has_attribute
+#if __has_attribute(force_align_arg_pointer)
+__attribute__((force_align_arg_pointer)) 
+#endif
+#endif
+*uart_communication(void *targ) {
+	communication_arg_t *conn = (communication_arg_t*)targ;
+	size_t rxlen;	
+	UsbCommand rx;
+	UsbCommand *prx = &rx;
+	
+	//int counter_to_offline = 0;
+	
+	while (conn->run) {
+		rxlen = 0;
+		bool ACK_received = false;
+		if (uart_receive(sp, (uint8_t *)prx, sizeof(UsbCommand) - (prx - &rx), &rxlen) && rxlen) {
+			prx += rxlen;
+			
+			if (prx - &rx < sizeof(UsbCommand)) {
+				PrintAndLogEx(NORMAL, "Foo %d | %d (will loop)", prx - &rx, rxlen);
+				continue;
+			}
+			UsbCommandReceived(&rx);
+			if (rx.cmd == CMD_ACK) {
+				ACK_received = true;
+			}
+		}
+		prx = &rx;
+
+		pthread_mutex_lock(&txBufferMutex);
+
+		if (conn->block_after_ACK) {
+			// if we just received an ACK, wait here until a new command is to be transmitted
+			if (ACK_received) {
+				while (!txBuffer_pending) {
+					pthread_cond_wait(&txBufferSig, &txBufferMutex);
+				}
+			}
+		}
+
+		if (txBuffer_pending) {
+			if (!uart_send(sp, (uint8_t*) &txBuffer, sizeof(UsbCommand))) {
+				//counter_to_offline++;				
+				PrintAndLogEx(WARNING, "sending bytes to proxmark failed");
+			}
+			txBuffer_pending = false;
+			
+			// tell main thread that txBuffer is empty
+			pthread_cond_signal(&txBufferSig);
+		}
+
+		pthread_mutex_unlock(&txBufferMutex);
+	}
+
+	// when this reader thread dies, we close the serial port.
+	uart_close(sp);
+	
+	pthread_exit(NULL);
+	return NULL;
+}
+
+bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode) {
+	
+	char *portname = (char *)port;
+	if (!wait_for_port) {
+		sp = uart_open(portname);
+	} else {
+		PrintAndLogEx(SUCCESS, "Waiting for Proxmark to appear on " _YELLOW_(%s), portname);
+		fflush(stdout);
+		int openCount = 0;
+		do {
+			sp = uart_open(portname);
+			msleep(500);
+			printf("."); fflush(stdout);
+		} while (++openCount < timeout && (sp == INVALID_SERIAL_PORT || sp == CLAIMED_SERIAL_PORT));
+		//PrintAndLogEx(NORMAL, "\n");
+	}
+
+	// check result of uart opening
+	if (sp == INVALID_SERIAL_PORT) {
+		PrintAndLogEx(WARNING, _RED_(ERROR:) "invalid serial port");
+		sp = NULL;
+		serial_port_name = NULL;
+		return false;
+	} else if (sp == CLAIMED_SERIAL_PORT) {
+		PrintAndLogEx(WARNING, _RED_(ERROR:) "serial port is claimed by another process");
+		sp = NULL;
+		serial_port_name = NULL;
+		return false;
+	} else {
+		// start the USB communication thread
+		serial_port_name = portname;
+		conn.run = true;
+		conn.block_after_ACK = flash_mode;
+		pthread_create(&USB_communication_thread, NULL, &uart_communication, &conn);		
+		//pthread_create(&FPC_communication_thread, NULL, &uart_communication, &conn);
+
+		fflush(NULL);
+		// create a mutex to avoid interlacing print commands from our different threads
+		//pthread_mutex_init(&print_lock, NULL);
+		return true;
+	}
+}
+
+void CloseProxmark(void) {
+	conn.run = false;
+	pthread_join(USB_communication_thread, NULL);	
+	//pthread_join(FPC_communication_thread, NULL);
+
+	if (sp) {
+		uart_close(sp);
+	}
+
+#if defined(__linux__) && !defined(NO_UNLINK)
+	// Fix for linux, it seems that it is extremely slow to release the serial port file descriptor /dev/*
+	//
+	// This may be disabled at compile-time with -DNO_UNLINK (used for a JNI-based serial port on Android).
+	if (serial_port_name) {
+		unlink(serial_port_name);
+	}
+#endif
+
+	// Clean up our state
+	sp = NULL;
+	serial_port_name = NULL;
+}
+
+/**
+ * @brief Waits for a certain response type. This method waits for a maximum of
+ * ms_timeout milliseconds for a specified response command.
+ 
+ * @param cmd command to wait for, or CMD_UNKNOWN to take any command.
+ * @param response struct to copy received command into.
+ * @param ms_timeout display message after 3 seconds
+ * @param show_warning display message after 3 seconds
+ * @return true if command was returned, otherwise false
+ */
+bool WaitForResponseTimeoutW(uint32_t cmd, UsbCommand* response, size_t ms_timeout, bool show_warning) {
+  
+	UsbCommand resp;
+
+	if (response == NULL)
+		response = &resp;
+
+	uint64_t start_time = msclock();
+	
+	// Wait until the command is received
+	while (true) {
+
+		while ( getCommand(response) ) {
+			if (cmd == CMD_UNKNOWN || response->cmd == cmd)
+				return true;			
+		}
+
+		if (msclock() - start_time > ms_timeout)
+			break;
+		
+		if (msclock() - start_time > 3000 && show_warning) {
+			// 3 seconds elapsed (but this doesn't mean the timeout was exceeded)
+			PrintAndLogEx(NORMAL, "Waiting for a response from the proxmark...");
+			PrintAndLogEx(NORMAL, "You can cancel this operation by pressing the pm3 button");
+			show_warning = false;
+		}
+	}
+	return false;
+}
+
+bool WaitForResponseTimeout(uint32_t cmd, UsbCommand* response, size_t ms_timeout) {
+	return WaitForResponseTimeoutW(cmd, response, ms_timeout, true);
+}
+
+bool WaitForResponse(uint32_t cmd, UsbCommand* response) {
+	return WaitForResponseTimeoutW(cmd, response, -1, true);
+}
+
+/**
+* Data transfer from Proxmark to client. This method times out after
+* ms_timeout milliseconds.
+* @brief GetFromDevice
+* @param memtype Type of memory to download from proxmark
+* @param dest Destination address for transfer
+* @param bytes number of bytes to be transferred
+* @param start_index offset into Proxmark3 BigBuf[]
+* @param response struct to copy last command (CMD_ACK) into
+* @param ms_timeout timeout in milliseconds
+* @param show_warning display message after 2 seconds
+* @return true if command was returned, otherwise false
+*/
+bool GetFromDevice(DeviceMemType_t memtype, uint8_t *dest, uint32_t bytes, uint32_t start_index, UsbCommand *response, size_t ms_timeout, bool show_warning) {
+	
+	if (dest == NULL) return false;
+	if (bytes == 0) return true;
+
+	UsbCommand resp;
+	if (response == NULL)
+		response = &resp;
+
+	// clear 
+	clearCommandBuffer();
+			
+	switch (memtype) {
+		case BIG_BUF: {
+			UsbCommand c = {CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K, {start_index, bytes, 0}};
+			SendCommand(&c);
+			return dl_it(dest, bytes, start_index, response, ms_timeout, show_warning, CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K);
+		}
+		case BIG_BUF_EML: {
+			UsbCommand c = {CMD_DOWNLOAD_EML_BIGBUF, {start_index, bytes, 0}};
+			SendCommand(&c);			
+			return dl_it(dest, bytes, start_index, response, ms_timeout, show_warning, CMD_DOWNLOADED_EML_BIGBUF);
+		}
+		case FLASH_MEM: {			
+			UsbCommand c = {CMD_FLASHMEM_DOWNLOAD, {start_index, bytes, 0}};
+			SendCommand(&c);
+			return dl_it(dest, bytes, start_index, response, ms_timeout, show_warning, CMD_FLASHMEM_DOWNLOADED);
+		}
+		case SIM_MEM: {
+			//UsbCommand c = {CMD_DOWNLOAND_SIM_MEM, {start_index, bytes, 0}};
+			//SendCommand(&c);
+			//return dl_it(dest, bytes, start_index, response, ms_timeout, show_warning, CMD_DOWNLOADED_SIMMEM);
+			return false;
+		}
+	}
+	return false;
+}
+
+bool dl_it(uint8_t *dest, uint32_t bytes, uint32_t start_index, UsbCommand *response, size_t ms_timeout, bool show_warning, uint32_t rec_cmd) {
+	
+	uint32_t bytes_completed = 0;
+	uint64_t start_time = msclock();
+	
+	while (true) {
+		
+		if (getCommand(response)) {
+
+			// sample_buf is a array pointer, located in data.c
+			// arg0 = offset in transfer. Startindex of this chunk
+			// arg1 = length bytes to transfer
+			// arg2 = bigbuff tracelength (?)			
+			if (response->cmd == rec_cmd) {
+				
+				uint32_t offset = response->arg[0];
+				uint32_t copy_bytes = MIN(bytes - bytes_completed, response->arg[1]);
+				//uint32_t tracelen = c->arg[2];
+				
+				// extended bounds check1.  upper limit is USB_CMD_DATA_SIZE
+				// shouldn't happen
+				copy_bytes = MIN(copy_bytes, USB_CMD_DATA_SIZE);
+				
+				// extended bounds check2. 
+				if ( offset + copy_bytes > bytes ) {
+					PrintAndLogEx(FAILED, "ERROR: Out of bounds when downloading from device,  offset %u | len %u | total len %u > buf_size %u", offset, copy_bytes,  offset+copy_bytes,  bytes);
+					break;
+				}			
+		
+				memcpy(dest + offset, response->d.asBytes, copy_bytes);
+				bytes_completed += copy_bytes;
+			} else if (response->cmd == CMD_ACK) {
+				return true;
+			}
+		}
+		
+		if (msclock() - start_time > ms_timeout) {
+			PrintAndLogEx(FAILED, "Timed out while trying to download data from device");
+			break;
+		}
+		
+		if (msclock() - start_time > 3000 && show_warning) {
+			// 3 seconds elapsed (but this doesn't mean the timeout was exceeded)
+			PrintAndLogEx(NORMAL, "Waiting for a response from the proxmark...");
+			PrintAndLogEx(NORMAL, "You can cancel this operation by pressing the pm3 button");
+			show_warning = false;
+		}
+	}
+	return false;
+}
diff --git a/client/comms.h b/client/comms.h
new file mode 100644
index 000000000..eba0d45d5
--- /dev/null
+++ b/client/comms.h
@@ -0,0 +1,67 @@
+//-----------------------------------------------------------------------------
+// Copyright (C) 2009 Michael Gernoth <michael at gernoth.net>
+// Copyright (C) 2010 iZsh <izsh at fail0verflow.com>
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// Code for communicating with the proxmark3 hardware.
+//-----------------------------------------------------------------------------
+
+#ifndef COMMS_H_
+#define COMMS_H_
+
+#include <stdbool.h>
+#include <pthread.h>
+
+#include "usb_cmd.h"
+#include "uart.h"
+#include "ui.h"
+#include "common.h"
+#include "util_posix.h"
+#include "util.h" 
+
+#if defined(__linux__) && !defined(NO_UNLINK)
+#include <unistd.h>		// for unlink()
+#endif
+
+//For storing command that are received from the device
+#ifndef CMD_BUFFER_SIZE
+#define CMD_BUFFER_SIZE 100
+#endif
+
+typedef enum {
+	BIG_BUF,
+	BIG_BUF_EML,
+	FLASH_MEM,
+	SIM_MEM,
+	} DeviceMemType_t;
+
+typedef struct {
+	bool run; // If TRUE, continue running the uart_communication thread
+	bool block_after_ACK; // if true, block after receiving an ACK package
+} communication_arg_t;
+	
+
+bool dl_it(uint8_t *dest, uint32_t bytes, uint32_t start_index, UsbCommand *response, size_t ms_timeout, bool show_warning, uint32_t rec_cmd);
+
+void SetOffline(bool value);
+bool IsOffline();
+
+void *uart_receiver(void *targ);
+void SendCommand(UsbCommand *c);
+void clearCommandBuffer();
+
+bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode);
+void CloseProxmark(void);
+	
+bool WaitForResponseTimeoutW(uint32_t cmd, UsbCommand* response, size_t ms_timeout, bool show_warning);
+bool WaitForResponseTimeout(uint32_t cmd, UsbCommand* response, size_t ms_timeout);
+bool WaitForResponse(uint32_t cmd, UsbCommand* response);
+
+extern bool GetFromDevice(DeviceMemType_t memtype, uint8_t *dest, uint32_t bytes, uint32_t start_index, UsbCommand *response, size_t ms_timeout, bool show_warning);
+
+#endif
+
+
diff --git a/client/flash.c b/client/flash.c
index ed58c1153..de6fdf7e6 100644
--- a/client/flash.c
+++ b/client/flash.c
@@ -10,11 +10,6 @@
 
 #include "flash.h"
 
-void SendCommand(UsbCommand* txcmd);
-void ReceiveCommand(UsbCommand* rxcmd);
-void CloseProxmark();
-int OpenProxmark();
-
 #define FLASH_START            0x100000
 
 #ifdef HAS_512_FLASH
@@ -192,12 +187,12 @@ int flash_load(flash_file_t *ctx, const char *name, int can_write_bl) {
 
 	fd = fopen(name, "rb");
 	if (!fd) {
-		fprintf(stderr, "Could not open file '%s': ", name);
+		fprintf(stderr, _RED_(Could not open file) "%s  >>> ", name);
 		perror(NULL);
 		goto fail;
 	}
 
-	fprintf(stdout, "Loading ELF file '%s'...\n", name);
+	fprintf(stdout, _BLUE_(Loading ELF file) "%s\n", name);
 
 	if (fread(&ehdr, sizeof(ehdr), 1, fd) != 1) {
 		fprintf(stderr, "Error while reading ELF file header\n");
@@ -268,7 +263,7 @@ static int get_proxmark_state(uint32_t *state) {
 	UsbCommand c = {CMD_DEVICE_INFO};
 	SendCommand(&c);
 	UsbCommand resp;
-	ReceiveCommand(&resp);
+	WaitForResponse(CMD_UNKNOWN, &resp);  // wait for any response. No timeout.
 
 	// Three outcomes:
 	// 1. The old bootrom code will ignore CMD_DEVICE_INFO, but respond with an ACK
@@ -286,7 +281,7 @@ static int get_proxmark_state(uint32_t *state) {
 			*state = resp.arg[0];
 			break;
 		default:
-			fprintf(stderr, "Error: Couldn't get proxmark state, bad response type: 0x%04" PRIx64 "\n", resp.cmd);
+			fprintf(stderr, _RED_(Error:) "Couldn't get proxmark state, bad response type: 0x%04" PRIx64 "\n", resp.cmd);
 			return -1;
 			break;
 	}
@@ -305,7 +300,7 @@ static int enter_bootloader(char *serial_port_name) {
 		return 0;
 
 	if (state & DEVICE_INFO_FLAG_CURRENT_MODE_OS) {
-		fprintf(stdout, "Entering bootloader...\n");
+		fprintf(stdout, _BLUE_(Entering bootloader...) "\n");
 		UsbCommand c;
 		memset(&c, 0, sizeof (c));
 
@@ -325,21 +320,22 @@ static int enter_bootloader(char *serial_port_name) {
 		msleep(100);
 		CloseProxmark();
 
-		fprintf(stdout, "Waiting for Proxmark to reappear on %s", serial_port_name);
-		do {
-			msleep(1000);
-			fprintf(stdout, "."); fflush(stdout);
-		} while ( !OpenProxmark());
-		fprintf(stdout, " Found.\n");
-		return 0;
+		bool opened = OpenProxmark(serial_port_name, true, 60, true);
+		if (opened) {
+			fprintf(stdout, " " _GREEN_(Found) "\n");
+			return 0;
+		} else {
+			fprintf(stdout, _RED_(Error:) "Proxmark not found.\n");
+			return -1;
+		}
 	}
 
-	fprintf(stderr, "Error: Unknown Proxmark mode\n");
+	fprintf(stderr, _RED_(Error:) "Unknown Proxmark mode\n");
 	return -1;
 }
 
 static int wait_for_ack(UsbCommand *ack) {
-	ReceiveCommand(ack);
+	WaitForResponse(CMD_UNKNOWN, ack);
 
 	if (ack->cmd != CMD_ACK) {
 		printf("Error: Unexpected reply 0x%04" PRIx64 " %s (expected ACK)\n",
@@ -378,10 +374,9 @@ int flash_start_flashing(int enable_bl_writes, char *serial_port_name) {
 		SendCommand(&c);
 		return wait_for_ack(&c);
 	} else {
-		fprintf(stderr, "Note: Your bootloader does not understand the new START_FLASH command\n");
-		fprintf(stderr, "      It is recommended that you update your bootloader\n\n");
+		fprintf(stderr, _RED_(Note: Your bootloader does not understand the new START_FLASH command) "\n");
+		fprintf(stderr, _RED_(      It is recommended that you update your bootloader) "\n\n");
 	}
-
 	return 0;
 }
 
@@ -439,7 +434,7 @@ int flash_write(flash_file_t *ctx) {
 			block++;
 			fprintf(stdout, "."); fflush(stdout);
 		}
-		fprintf(stdout, " OK\n");
+		fprintf(stdout, _GREEN_(OK) "\n");
 		fflush(stdout);
 	}
 	return 0;
diff --git a/client/flash.h b/client/flash.h
index ec93a2787..5372df089 100644
--- a/client/flash.h
+++ b/client/flash.h
@@ -21,6 +21,8 @@
 #include "usb_cmd.h"
 #include "at91sam7s512.h"
 #include "util_posix.h"
+#include "util.h"
+#include "comms.h"
 
 typedef struct {
 	void *data;
diff --git a/client/flasher.c b/client/flasher.c
index 48e66d8f9..a20b264b9 100644
--- a/client/flasher.c
+++ b/client/flasher.c
@@ -10,31 +10,16 @@
 #include <stdlib.h>
 #include <string.h>
 #include <inttypes.h>
+#include <pthread.h>
 #include "util_posix.h"
 #include "proxmark3.h"
+#include "util.h"
 #include "flash.h"
-#include "uart.h"
+#include "comms.h"
 #include "usb_cmd.h"
 
 #define MAX_FILES 4
 
-#ifdef _WIN32
-# define unlink(x)
-#else
-# include <unistd.h>
-#endif
-
-#if defined (_WIN32)
-#define SERIAL_PORT_H	"com3"
-#elif defined(__APPLE__)
-#define SERIAL_PORT_H   "/dev/cu.usbmodem888"
-#else
-#define SERIAL_PORT_H	"/dev/ttyACM0"
-#endif
-
-static serial_port sp;
-static char* serial_port_name;
-
 void cmd_debug(UsbCommand* c) {
 	//  Debug
 	printf("UsbCommand length[len=%zd]\n", sizeof(UsbCommand));
@@ -50,49 +35,6 @@ void cmd_debug(UsbCommand* c) {
 	printf("...\n");
 }
 
-void SendCommand(UsbCommand* txcmd) {
-	//  printf("send: ");
-	//  cmd_debug(txcmd);
-	if (!uart_send(sp, (byte_t*)txcmd, sizeof(UsbCommand))) {
-		printf("Sending bytes to proxmark failed\n");
-		exit(1);
-	}
-}
-
-void ReceiveCommand(UsbCommand* rxcmd) {
-	byte_t* prxcmd = (byte_t*)rxcmd;
-	byte_t* prx = prxcmd;
-	size_t rxlen;
-	while (true) {
-		if (uart_receive(sp, prx, sizeof(UsbCommand) - (prx-prxcmd), &rxlen)) {
-			prx += rxlen;
-			if ((prx-prxcmd) >= sizeof(UsbCommand)) {
-				return;
-			}
-		}
-	}
-}
-
-void CloseProxmark() {
-	// Clean up the port
-	uart_close(sp);
-	// Fix for linux, it seems that it is extremely slow to release the serial port file descriptor /dev/*
-	unlink(serial_port_name);
-}
-
-int OpenProxmark() {
-	sp = uart_open(serial_port_name);
-
-	//poll once a second
-	if (sp == INVALID_SERIAL_PORT) {
-		return 0;
-	} else if (sp == CLAIMED_SERIAL_PORT) {
-		fprintf(stderr, "ERROR: serial port is claimed by another process\n");
-		return 0;
-	} 	
-	return 1;
-}
-
 static void usage(char *argv0) {
 	fprintf(stdout, "Usage:   %s <port> [-b] image.elf [image.elf...]\n\n", argv0);
 	fprintf(stdout, "\t-b\tEnable flashing of bootloader area (DANGEROUS)\n\n");
@@ -129,30 +71,28 @@ int main(int argc, char **argv) {
 			}
 		} else {
 			res = flash_load(&files[num_files], argv[i], can_write_bl);
-			if (res < 0) {
-				fprintf(stderr, "Error while loading %s\n", argv[i]);
+			if (res < 0)
 				return -1;
-			}
+
 			fprintf(stderr, "\n");
 			num_files++;
 		}
 	}
+	
+	char* serial_port_name = argv[1];
 
-	serial_port_name = argv[1];
-  
-	fprintf(stdout, "Waiting for Proxmark to appear on %s", serial_port_name);
-	do {
-		msleep(500);
-		fprintf(stderr, "."); fflush(stdout);
-	} while (!OpenProxmark());
-
-	fprintf(stdout, " Found.\n");
+	if (!OpenProxmark(serial_port_name, true, 60, true)) {
+		fprintf(stderr, "Could not find Proxmark on " _RED_(%s) ".\n\n", serial_port_name);
+		return -1;
+	} else {
+		fprintf(stderr, _GREEN_(Found) "\n");
+	}
 
 	res = flash_start_flashing(can_write_bl, serial_port_name);
 	if (res < 0)
 		return -1;
 
-	fprintf(stdout, "\nFlashing...\n");
+	fprintf(stdout, "\n" _BLUE_(Flashing...)"\n");
 
 	for (int i = 0; i < num_files; i++) {
 		res = flash_write(&files[i]);
@@ -162,7 +102,7 @@ int main(int argc, char **argv) {
 		fprintf(stdout, "\n");
 	}
 
-	fprintf(stdout, "Resetting hardware...\n");
+	fprintf(stdout, _BLUE_(Resetting hardware...) "\n");
 
 	res = flash_stop_flashing();
 	if (res < 0)
@@ -170,7 +110,6 @@ int main(int argc, char **argv) {
 
 	CloseProxmark();
 
-	fprintf(stdout, "All done.\n\n");
-	fprintf(stdout, "Have a nice day!\n");
+	fprintf(stdout, _BLUE_(All done.) "\n\nHave a nice day!\n");
 	return 0;
 }
diff --git a/client/proxmark3.c b/client/proxmark3.c
index b7dffe6e7..78230bd36 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -17,55 +17,16 @@
 #include <unistd.h>
 #include <readline/readline.h>
 #include <readline/history.h>
+
+#include "util_posix.h"
 #include "proxgui.h"
 #include "cmdmain.h"
-#include "uart.h"
 #include "ui.h"
 #include "util.h"
 #include "cmdparser.h"
 #include "cmdhw.h"
 #include "whereami.h"
-
-#if defined (_WIN32)
-#define SERIAL_PORT_H	"com3"
-#elif defined(__APPLE__)
-#define SERIAL_PORT_H   "/dev/cu.usbmodem888"
-#else
-#define SERIAL_PORT_H	"/dev/ttyACM0"
-#endif
-
-static serial_port sp;
-static UsbCommand txcmd;
-static char comport[255];
-byte_t rx[sizeof(UsbCommand)];
-byte_t* prx = rx;
-volatile static bool txcmd_pending = false;
-struct receiver_arg {
-	int run;
-};
-
-void SendCommand(UsbCommand *c) {
-	#if 0
-	//pthread_mutex_lock(&print_lock);
-	PrintAndLogEx(NORMAL, "Sending %d bytes\n", sizeof(UsbCommand));
-	//pthread_mutex_unlock(&print_lock);
-	#endif
-
-	if (offline) {
-		PrintAndLogEx(NORMAL, "Sending bytes to proxmark failed - offline");
-		return;
-	}
-	/**
-	The while-loop below causes hangups at times, when the pm3 unit is unresponsive
-	or disconnected. The main console thread is alive, but comm thread just spins here.
-	Not good.../holiman
-	**/
-	while (txcmd_pending);
-
-	txcmd = *c;
-	 __atomic_test_and_set(&txcmd_pending, __ATOMIC_SEQ_CST);
-}
-
+#include "comms.h"
 
 #if defined(__linux__) || (__APPLE__)
 static void showBanner(void){
@@ -83,84 +44,6 @@ static void showBanner(void){
 }
 #endif
 
-bool hookUpPM3() {	
-	bool ret = false;
-	sp = uart_open( comport );
-	
-	//pthread_mutex_lock(&print_lock);
-
-	if (sp == INVALID_SERIAL_PORT) {
-		PrintAndLogEx(WARNING, "Reconnect failed, retrying...  (reason: invalid serial port)\n");
-		sp = NULL;
-		ret = false;
-		offline = 1;
-	} else if (sp == CLAIMED_SERIAL_PORT) {
-		PrintAndLogEx(WARNING, "Reconnect failed, retrying... (reason: serial port is claimed by another process)\n");
-		sp = NULL;
-		ret = false;
-		offline = 1;
-	} else {	
-		PrintAndLogEx(SUCCESS, "Proxmark reconnected\n");
-		ret = true;
-		offline = 0;
-	}
-	//pthread_mutex_unlock(&print_lock);
-	return ret;
-}
-
-// (iceman) if uart_receiver fails a command three times,  we conside the device to be offline.
-void
-#ifdef __has_attribute
-#if __has_attribute(force_align_arg_pointer)
-__attribute__((force_align_arg_pointer)) 
-#endif
-#endif
-*uart_receiver(void *targ) {
-	struct receiver_arg *arg = (struct receiver_arg*)targ;
-	size_t rxlen;
-	bool tmpsignal;
-	int counter_to_offline = 0;
-	
-	while (arg->run) {
-		rxlen = 0;
-		
-		if (uart_receive(sp, prx, sizeof(UsbCommand) - (prx-rx), &rxlen)) {
-			
-			if ( rxlen == 0 ) continue;
-			
-			prx += rxlen;
-			if ( (prx-rx) < sizeof(UsbCommand)) {
-				continue;
-			}
-			
-			UsbCommandReceived((UsbCommand*)rx);
-		}
-		prx = rx;
-
-		__atomic_load(&txcmd_pending, &tmpsignal, __ATOMIC_SEQ_CST);
-		if ( tmpsignal ) {
-			bool res = uart_send(sp, (byte_t*) &txcmd, sizeof(UsbCommand));
-			if (!res) {
-				counter_to_offline++;
-				PrintAndLogEx(NORMAL, "sending bytes to proxmark failed");
-			}
-			 __atomic_clear(&txcmd_pending, __ATOMIC_SEQ_CST);
-			
-			// set offline flag
-			if ( counter_to_offline == 3 ) {
-				__atomic_test_and_set(&offline, __ATOMIC_SEQ_CST);
-				break;
-			}			
-		}
-	}
-
-	// when this reader thread dies, we close the serial port.
-	uart_close(sp);
-	
-	pthread_exit(NULL);
-	return NULL;
-}
-
 void
 #ifdef __has_attribute
 #if __has_attribute(force_align_arg_pointer)
@@ -169,9 +52,7 @@ __attribute__((force_align_arg_pointer))
 #endif
 main_loop(char *script_cmds_file, char *script_cmd, bool usb_present) {
 
-	struct receiver_arg rarg;
 	char *cmd = NULL;
-	pthread_t reader_thread;
 	bool execCommand = (script_cmd != NULL);
 	bool stdinOnPipe = !isatty(STDIN_FILENO);
 	FILE *sf = NULL;
@@ -180,13 +61,14 @@ main_loop(char *script_cmds_file, char *script_cmd, bool usb_present) {
 	PrintAndLogEx(DEBUG, "ISATTY/STDIN_FILENO == %s\n", (stdinOnPipe) ? "true" : "false");
 	
 	if (usb_present) {
-		rarg.run = 1;
-		pthread_create(&reader_thread, NULL, &uart_receiver, &rarg);
+		SetOffline(false);
 		// cache Version information now:
 		if ( execCommand || script_cmds_file || stdinOnPipe)
 			CmdVersion("s");
 		else 
 			CmdVersion("");
+	} else {
+		SetOffline(true);
 	}
 
 	if (script_cmds_file) {
@@ -202,13 +84,14 @@ main_loop(char *script_cmds_file, char *script_cmd, bool usb_present) {
 	while (1) {
 		
 		// this should hook up the PM3 again.
-		if (offline) {
+		/*
+		if ( IsOffline() ) {
 			
 			// sets the global variable, SP and offline)
 			usb_present = hookUpPM3();
 		
 			// usb and the reader_thread is NULL,  create a new reader thread.
-			if (usb_present && !offline) {
+			if (usb_present && !IsOffline() ) {
 				rarg.run = 1;
 				pthread_create(&reader_thread, NULL, &uart_receiver, &rarg);
 				// cache Version information now:
@@ -218,6 +101,7 @@ main_loop(char *script_cmds_file, char *script_cmd, bool usb_present) {
 					CmdVersion("");
 			}
 		}
+		*/
 
 		// If there is a script file
 		if (sf) {
@@ -304,11 +188,7 @@ main_loop(char *script_cmds_file, char *script_cmd, bool usb_present) {
 
 	free(cmd);
 	cmd = NULL;
-			
-	if (usb_present) {
-		rarg.run = 0;
-		pthread_join(reader_thread, NULL);
-	}
+
 }
 
 static void dumpAllHelp(int markdown) {
@@ -346,7 +226,7 @@ static void set_my_executable_path(void) {
 }
 
 static void show_help(bool showFullHelp, char *command_line){
-	PrintAndLogEx(NORMAL, "syntax: %s <port> [-h|-help|-m|-f|-flush|-w|-wait|-c|-command|-l|-lua] [cmd_script_file_name] [command][lua_script_name]\n", command_line);
+	PrintAndLogEx(NORMAL, "syntax: %s <port> [-h | -help | -m | -f | -flush | -w | -wait | -c | -command | -l | -lua] [cmd_script_file_name] [command][lua_script_name]\n", command_line);
 	PrintAndLogEx(NORMAL, "\texample:'%s "SERIAL_PORT_H"'\n\n", command_line);
 	
 	if (showFullHelp){
@@ -384,10 +264,6 @@ int main(int argc, char* argv[]) {
 		show_help(true, argv[0]);
 		return 1;
 	}
-	
-	// lets copy the comport string.
-	memset(comport, 0, sizeof(comport));
-	memcpy(comport, argv[1], strlen(argv[1]));
 
 	for (int i = 1; i < argc; i++) {
 	
@@ -406,7 +282,7 @@ int main(int argc, char* argv[]) {
 
 		// flush output
 		if(strcmp(argv[i], "-f") == 0 || strcmp(argv[i], "-flush") == 0){
-			g_flushAfterWrite = 1;
+			SetFlushAfterWrite(true);
 			PrintAndLogEx(INFO, "Output will be flushed after every print.\n");
 		}
 		
@@ -474,39 +350,11 @@ int main(int argc, char* argv[]) {
 	// set global variables
 	set_my_executable_path();
 	
-	// open uart
-	if (!waitCOMPort) {
-		sp = uart_open(argv[1]);
-	} else {
-		PrintAndLogEx(SUCCESS, "waiting for Proxmark to appear on %s ", argv[1]);
-		fflush(stdout);
-		int openCount = 0;
-		do {
-			sp = uart_open(argv[1]);
-			msleep(500);
-			printf("."); fflush(stdout);
-		} while (++openCount < 30 && (sp == INVALID_SERIAL_PORT || sp == CLAIMED_SERIAL_PORT));
-		PrintAndLogEx(NORMAL, "\n");
-	}
-
-	// check result of uart opening
-	if (sp == INVALID_SERIAL_PORT) {
-		PrintAndLogEx(WARNING, "ERROR: invalid serial port");
-		usb_present = false;
-		offline = 1;
-	} else if (sp == CLAIMED_SERIAL_PORT) {
-		PrintAndLogEx(WARNING, "ERROR: serial port is claimed by another process");
-		usb_present = false;
-		offline = 1;
-	} else {
-		usb_present = true;
-		offline = 0;
-	}
-
-	fflush(NULL);
-	// create a mutex to avoid interlacing print commands from our different threads
-	pthread_mutex_init(&print_lock, NULL);
+	// try to open USB connection to Proxmark
+	usb_present = OpenProxmark(argv[1], waitCOMPort, 20, false);
 
+	
+	printf("\x1b[31m test\n");
 #ifdef HAVE_GUI
 
 #  ifdef _WIN32
@@ -527,8 +375,10 @@ int main(int argc, char* argv[]) {
 	main_loop(script_cmds_file, script_cmd, usb_present);
 #endif	
  
-	// clean up mutex
-	pthread_mutex_destroy(&print_lock);
+ 	// Clean up the port
+	if (usb_present) {
+		CloseProxmark();
+	}
 	
 	exit(0);
 }
\ No newline at end of file
diff --git a/client/proxmark3.h b/client/proxmark3.h
index c68e8275c..0a69e71ba 100644
--- a/client/proxmark3.h
+++ b/client/proxmark3.h
@@ -21,14 +21,10 @@
 extern "C" {
 #endif
 
-void SendCommand(UsbCommand *c);
 const char *get_my_executable_path(void);
 const char *get_my_executable_directory(void);
 void main_loop(char *script_cmds_file, char *script_cmd, bool usb_present);
 
-bool hookUpPM3(void);
-void *uart_receiver(void *targ);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/client/scripting.h b/client/scripting.h
index feb611549..a6aaf157a 100644
--- a/client/scripting.h
+++ b/client/scripting.h
@@ -17,6 +17,7 @@
 #include "proxmark3.h"
 #include "usb_cmd.h"
 #include "cmdmain.h"
+#include "comms.h"
 #include "util.h"
 #include "mifarehost.h"
 #include "crc.h"
diff --git a/client/ui.c b/client/ui.c
index ba2e028a0..a8b45273d 100644
--- a/client/ui.c
+++ b/client/ui.c
@@ -13,8 +13,7 @@
 
 double CursorScaleFactor = 1;
 int PlotGridX=0, PlotGridY=0, PlotGridXdefault= 64, PlotGridYdefault= 64, CursorCPos= 0, CursorDPos= 0;
-int offline;
-int g_flushAfterWrite = 0;  //buzzy
+bool flushAfterWrite = 0;
 int GridOffset = 0;
 bool GridLocked = false;
 bool showDemod = true;
@@ -178,7 +177,7 @@ void PrintAndLog(char *fmt, ...) {
 	}
 	va_end(argptr2);
 
-	if (g_flushAfterWrite == 1)
+	if (flushAfterWrite)
 		fflush(NULL);
 
 	//release lock
@@ -189,7 +188,11 @@ void SetLogFilename(char *fn) {
 	logfilename = fn;
 }
  
-void iceIIR_Butterworth(int *data, const size_t len){
+void SetFlushAfterWrite(bool value) {
+	flushAfterWrite = value;
+}
+
+ void iceIIR_Butterworth(int *data, const size_t len){
 
 	int i,j;
 	
diff --git a/client/ui.h b/client/ui.h
index 6d59393b0..fc3439033 100644
--- a/client/ui.h
+++ b/client/ui.h
@@ -37,14 +37,13 @@ extern void PrintAndLog(char *fmt, ...);
 void PrintAndLogOptions(char *str[][2], size_t size, size_t space);
 void PrintAndLogEx(logLevel_t level, char *fmt, ...);
 extern void SetLogFilename(char *fn);
+void SetFlushAfterWrite(bool value);
 
 extern double CursorScaleFactor;
 extern int PlotGridX, PlotGridY, PlotGridXdefault, PlotGridYdefault, CursorCPos, CursorDPos, GridOffset;
 extern bool GridLocked;
 extern bool showDemod;
 
-extern int offline;
-extern int g_flushAfterWrite;   //buzzy
 //extern uint8_t g_debugMode;
 
 extern pthread_mutex_t print_lock;
diff --git a/common/cmd.c b/common/cmd.c
index 3aa6870ee..281ff0065 100644
--- a/common/cmd.c
+++ b/common/cmd.c
@@ -31,29 +31,9 @@
  */
 #include "cmd.h"
 
-bool cmd_receive(UsbCommand* cmd) {
-
-	// Check if there is a usb packet available
-	if (!usb_poll_validate_length()) return false;
-
-	// Try to retrieve the available command frame
-	usb_read((uint8_t*)cmd, sizeof(UsbCommand));
-
-	// (iceman) this check is wrong.  Since USB can send packages which is not sizeof(usbcommand) 544 bytes.
-	//  hence, I comment it out
-
-	// Check if the transfer was complete
-	//if (rxlen != sizeof(UsbCommand)) return false;
-	// Received command successfully
-	//return true;
-	return true;
-}
-
-bool cmd_send(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void* data, size_t len) {
-
+uint8_t cmd_send(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void* data, size_t len) {
 	UsbCommand txcmd;
 
-	// 0x00 the whole command.
 	for (size_t i=0; i < sizeof(UsbCommand); i++)
 		((uint8_t*)&txcmd)[i] = 0x00;
 
@@ -70,10 +50,15 @@ bool cmd_send(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void* d
 			txcmd.d.asBytes[i] = ((uint8_t*)data)[i];
 		}
 	}
-	 
-	// Send frame and make sure all bytes are transmitted
-	if ( usb_write( (uint8_t*)&txcmd, sizeof(UsbCommand)) != 0)
-		return false;  
 	
-	return true;
+	uint32_t sendlen = 0;
+	// Send frame and make sure all bytes are transmitted
+	sendlen = usb_write( (uint8_t*)&txcmd, sizeof(UsbCommand) );
+
+#ifdef WITH_FPC
+	usart_init();
+	usart_writebuffer( (uint8_t*)&txcmd, sizeof(UsbCommand) );
+#endif
+	
+	return sendlen;
 }
\ No newline at end of file
diff --git a/common/cmd.h b/common/cmd.h
index 0fd2cc142..9aa6bec33 100644
--- a/common/cmd.h
+++ b/common/cmd.h
@@ -39,8 +39,7 @@
 #include "usart.h"
 #include "proxmark3.h"
 
-bool cmd_receive(UsbCommand* cmd);
-bool cmd_send(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void* data, size_t len);
+uint8_t cmd_send(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void* data, size_t len);
 
 #endif // _PROXMARK_CMD_H_
 
diff --git a/common/usart.c b/common/usart.c
index e8e613ddf..b58a7cbaa 100644
--- a/common/usart.c
+++ b/common/usart.c
@@ -1,17 +1,23 @@
+//-----------------------------------------------------------------------------
+// Iceman, July 2018
+// edists by - Anticat, August 2018
+// 
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// The main USART code, for serial communications over FPC connector
+//-----------------------------------------------------------------------------
 #include "usart.h"
-#include "apps.h"
+#include "string.h"
 
-#define USART_INTERRUPT_LEVEL		7
 #define AT91_BAUD_RATE				115200
 
-volatile AT91PS_PDC pPDC 	= AT91C_BASE_PDC_US1;
 volatile AT91PS_USART pUS1	= AT91C_BASE_US1;
-volatile AT91PS_AIC pAIC 	= AT91C_BASE_AIC;
 volatile AT91PS_PIO pPIOA	= AT91C_BASE_PIOA;
+volatile AT91PS_PDC pPDC 	= AT91C_BASE_PDC_US1;
 
-#define usart_rx_ready {(pUS1->US_CSR & AT91C_US_RXRDY)}
-#define usart_tx_ready {(pUS1->US_CSR & AT91C_US_TXRDY)}
-
+/*
 void usart_close(void) {
     // Reset the USART mode
 	pUS1->US_MR = 0;
@@ -25,259 +31,155 @@ void usart_close(void) {
     // Disable all interrupts
     pUS1->US_IDR = 0xFFFFFFFF;
 
-    //* Abort the Peripheral Data Transfers
-    //AT91F_PDC_Close((AT91PS_PDC) &(pUSART->US_RPR));
+    // Abort the Peripheral Data Transfers
+	pUS1->US_PTCR = AT91C_PDC_RXTDIS | AT91C_PDC_TXTDIS;
 
     // Disable receiver and transmitter and stop any activity immediately
     pUS1->US_CR = AT91C_US_TXDIS | AT91C_US_RXDIS | AT91C_US_RSTTX | AT91C_US_RSTRX;
 }
+*/
 
-/// Reads data from an USART peripheral, filling the provided buffer until it
-/// becomes full. This function returns immediately with 1 if the buffer has
-/// been queued for transmission; otherwise 0.
+static uint8_t outbuf[sizeof(UsbCommand)];
+//static uint8_t inbuf[sizeof(UsbCommand)];
+
+
+/// Reads data from an USART peripheral
 /// \param data  Pointer to the buffer where the received data will be stored.
 /// \param len  Size of the data buffer (in bytes).
-uint8_t usart_readbuffer(uint8_t *data, size_t len) {
+inline int usart_readbuffer(uint8_t *data, size_t len) {
+
+	pUS1->US_PTSR = AT91C_PDC_TXTEN;	
+	pUS1->US_PTCR = AT91C_PDC_TXTEN;
 	
 	// Check if the first PDC bank is free
-    if ((pUS1->US_RCR == 0) && (pUS1->US_RNCR == 0)) {
-
+    if (!(pUS1->US_RCR)) {
         pUS1->US_RPR = (uint32_t)data;
         pUS1->US_RCR = len;
-        pUS1->US_PTCR = AT91C_PDC_RXTEN;
-        return 1;
+        return 2;
     }
     // Check if the second PDC bank is free
-    else if (pUS1->US_RNCR == 0) {
-
+    else if (!(pUS1->US_RNCR)) {
         pUS1->US_RNPR = (uint32_t)data;
         pUS1->US_RNCR = len;
         return 1;
     } else {
         return 0;
     }
+	
+	/*
+	pPDC->PDC_PTSR = AT91C_PDC_RXTEN;	
+	pPDC->PDC_PTCR = AT91C_PDC_RXTEN;
+	
+	//check if data is available
+	if (pPDC->PDC_RCR != 0) return -1;
+
+	memcpy(data, inbuf, len);
+
+	//start next transfer
+	pPDC->PDC_RNPR = (uint32_t)inbuf;
+	pPDC->PDC_RNCR = sizeof(inbuf);
+
+	return sizeof(inbuf);
+	*/
 }
+/*
+int16_t usart_writebuffer(uint8_t *data, size_t len) {
 
-/// Reads and return a packet of data on the specified USART peripheral. This
-/// function operates asynchronously, so it waits until some data has been
-/// received.
-/// \param timeout  Time out value (0 -> no timeout).
-uint8_t usart_read(uint32_t timeout) {
-    if (timeout == 0) {
-        while ((pUS1->US_CSR & AT91C_US_RXRDY) == 0) {};
-    }
-    else {
+//	pUS1->US_PTSR = AT91C_PDC_TXTEN;
+	pUS1->US_PTCR = AT91C_PDC_TXTEN;
+	
+	// if buffer is sent
+	if (pUS1->US_TCR != 0) return -1;
+	
+	memcpy(outbuf, data, len);
 
-        while ((pUS1->US_CSR & AT91C_US_RXRDY) == 0) {
+	//start next transfer
+	pUS1->US_TNPR = (uint32_t)outbuf;
+	pUS1->US_TNCR = sizeof(outbuf);
 
-            if (timeout == 0) {
-
-                DbpString("USART_Read: Timed out.");
-                return 0;
-            }
-            timeout--;
-        }
-    }
-	uint8_t res = pUS1->US_RHR;
-	Dbprintf("  usar got %02x", res);
-    return res;
+	return sizeof(outbuf);
 }
+*/
 
-/// Sends one packet of data through the specified USART peripheral. This
-/// function operates synchronously, so it only returns when the data has been
-/// actually sent.
-/// \param data  Data to send including 9nth bit and sync field if necessary (in
-///              the same format as the US_THR register in the datasheet).
-/// \param timeOut  Time out value (0 = no timeout).
-void usart_write( uint8_t data, uint32_t timeout) {
-	if ( timeout == 0) {
-
-		while ((pUS1->US_CSR & AT91C_US_TXEMPTY) == 0) {};
-		
-    } else {
-		while ((pUS1->US_CSR & AT91C_US_TXEMPTY) == 0) {
-
-			if (timeout == 0) {
-				DbpString("USART_Write: Timed out.");
-				return;
-			}
-			timeout--;
-		}
-	}
-	pUS1->US_THR = data;
-}
-
-uint8_t usart_writebuffer(uint8_t *data, size_t len, uint32_t timeout) {
+// works.
+// transfer to client
+inline int16_t usart_writebuffer(uint8_t *data, size_t len) {
 
+	pUS1->US_PTSR = AT91C_PDC_TXTEN;
+	pUS1->US_PTCR = AT91C_PDC_TXTEN;
+	
     // Check if the first PDC bank is free
-    if ((pUS1->US_TCR == 0) && (pUS1->US_TNCR == 0)) {
-
-        pUS1->US_TPR = (uint32_t)data;
-        pUS1->US_TCR = len;
-        pUS1->US_PTCR = AT91C_PDC_TXTEN;
-        return 1;
+    if (!(pUS1->US_TCR)) {
+		
+		memcpy(outbuf, data, len);
+        
+		pUS1->US_TPR = (uint32_t)outbuf;
+        pUS1->US_TCR = sizeof(outbuf);
+		return 2;
     }
     // Check if the second PDC bank is free
-    else if (pUS1->US_TNCR == 0) {
-
-        pUS1->US_TNPR = (uint32_t)data;
-        pUS1->US_TNCR = len;
-        return 1;
-    }
-    else {
+    else if (!(pUS1->US_TNCR)) {
+		memcpy(outbuf, data, len);
+		
+        pUS1->US_TNPR = (uint32_t)outbuf;
+        pUS1->US_TNCR = sizeof(outbuf);
+		return 1;
+    } else {
         return 0;
     }
 }
 
-// interupt version
-void Usart_c_irq_handler(void) {
-	
-	// get Usart status register
-	uint32_t status = pUS1->US_CSR;
-	
-	if ( status & AT91C_US_RXRDY){
-		// Get byte and send
-		pUS1->US_THR = (pUS1->US_RHR & 0x1FF);
-		LED_B_INV();
-	}
-		// tx
-	if ( status & AT91C_US_TXRDY){
-		LED_D_INV();
-	}
-
-
-	if ( status & AT91C_US_OVRE) {
-		// clear US_RXRDY
-		(void)(pUS1->US_RHR & 0x1FF);
-		pUS1->US_THR = ('O' & 0x1FF);
-	}
-
-	// Check error
-	if ( status & AT91C_US_PARE) {
-		 pUS1->US_THR = ('P' & 0x1FF);
-	}
-
-	if ( status & AT91C_US_FRAME) {
- 		 pUS1->US_THR = ('F' & 0x1FF);
-	}
-
-	if ( status & AT91C_US_TIMEOUT){
-		pUS1->US_CR = AT91C_US_STTTO;
-		pUS1->US_THR = ('T' & 0x1FF);
-	}
-	
-	// Reset the status bit
-	pUS1->US_CR = AT91C_US_RSTSTA;
-}
-
-__inline unsigned int AT91F_AIC_ConfigureIt (
-	AT91PS_AIC pAIC,  // \arg pointer to the AIC registers
-	unsigned int irq_id,     // \arg interrupt number to initialize
-	unsigned int priority,   // \arg priority to give to the interrupt
-	unsigned int src_type,   // \arg activation and sense of activation
-	void (*newHandler) (void) ) // \arg address of the interrupt handler
-{
-	unsigned int oldHandler;
-    unsigned int mask;
-
-    oldHandler = pAIC->AIC_SVR[irq_id];
-
-    mask = (0x1 << irq_id);
-    // Disable the interrupt on the interrupt controller
-    pAIC->AIC_IDCR = mask;
-    // Save the interrupt handler routine pointer and the interrupt priority
-    pAIC->AIC_SVR[irq_id] = (unsigned int) newHandler;
-    // Store the Source Mode Register
-    pAIC->AIC_SMR[irq_id] = (src_type | priority);
-    // Clear the interrupt on the interrupt controller
-    pAIC->AIC_ICCR = mask;
-
-	return oldHandler;
-}
-
 void usart_init(void) {
+
+	// disable & reset receiver / transmitter for configuration
+	pUS1->US_CR = (AT91C_US_RSTRX | AT91C_US_RSTTX);
 	
-	// disable & reset  receiver / transmitter
-	pUS1->US_CR = AT91C_US_RSTRX | AT91C_US_RSTTX | AT91C_US_RXDIS | AT91C_US_TXDIS;
-		
-	//enable the USART 1 Peripheral clock
+	//enable the USART1 Peripheral clock
 	AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_US1);
-	
-	// Configure PIO controllers to peripheral mode A
-	pPIOA->PIO_ASR = (AT91C_PA21_RXD1 | AT91C_PA22_TXD1);
-	
-	// Disable PIO control of the following pins, allows use by the SPI peripheral
-	pPIOA->PIO_PDR = (AT91C_PA21_RXD1 | AT91C_PA22_TXD1); 
 
-	// kill pull-ups
-//	pPIOA->PIO_PPUDR = ~(AT91C_PA21_RXD1 | AT91C_PA22_TXD1); 
-//	pPIOA->PIO_MDDR  = (AT91C_PA21_RXD1 | AT91C_PA22_TXD1); 
+	// disable PIO control of receive / transmit pins
+	pPIOA->PIO_PDR |= (AT91C_PA21_RXD1 | AT91C_PA22_TXD1); 
 	
-	//	Pull-up Enable
+	// enable peripheral mode A on receive / transmit pins
+	pPIOA->PIO_ASR |= (AT91C_PA21_RXD1 | AT91C_PA22_TXD1);
+
+	// enable pull-up on receive / transmit pins (see 31.5.1 I/O Lines)
 	pPIOA->PIO_PPUER |= (AT91C_PA21_RXD1 | AT91C_PA22_TXD1);
-	// MultiDriver Enable
-	//pPIOA->PIO_MDER |= (AT91C_PA21_RXD1 | AT91C_PA22_TXD1);
-	
-	// Enable the pins to be controlled
-	pPIOA->PIO_PER |= (AT91C_PA21_RXD1 | AT91C_PA22_TXD1);
-
-	// Configure the pins to be outputs
-	pPIOA->PIO_OER |= AT91C_PA22_TXD1;
-
-	//enable PIO in input mode
-	//pPIOA->PIO_ODR  = AT91C_PA21_RXD1;
 	
     // set mode
     pUS1->US_MR = AT91C_US_USMODE_NORMAL |      // normal mode
-               AT91C_US_CLKS_CLOCK |            // MCK
+               AT91C_US_CLKS_CLOCK |            // MCK (48MHz)
                AT91C_US_CHRL_8_BITS |           // 8 bits
                AT91C_US_PAR_NONE |              // parity: none
                AT91C_US_NBSTOP_1_BIT |          // 1 stop bit
                AT91C_US_CHMODE_NORMAL;          // channel mode: normal
 
-    // baud rate
-    // CD = MCK / (16 * baud)
-    // MCK = 24027428  (pm3 runs on 24MHZ clock PMC_PCKR[0] ) 
-
-	
-    // baudrate 115200
-	//  16*115200 = 1843200
-	//   24027428 / 1843200 ==   13  --< CD
-
-	// baudrate 460800
-	// 16*460800 = 7372800	
-	// 24027428 /  7372800 == 3	
-	pUS1->US_BRGR = 24*1024*1024/(115200*16);	// OVER=0 16
+	// set baudrate to 115200 
+	pUS1->US_BRGR = (48UL*1000*1000) / (115200*16);
 	
 	// Write the Timeguard Register
 	pUS1->US_TTGR = 0;
-
 	pUS1->US_RTOR = 0;
 	pUS1->US_FIDI = 0;
 	pUS1->US_IF = 0;
-
-    // Enable USART IT error and RXRDY
-	// Write to the IER register
-//	pUS1->US_IER = (AT91C_US_TIMEOUT | AT91C_US_FRAME | AT91C_US_OVRE | AT91C_US_RXRDY);
 	
-    // open Usart 1 interrupt
-/*
-	AT91F_AIC_ConfigureIt(
-		pAIC,
-		AT91C_ID_US1,
-		USART_INTERRUPT_LEVEL,
-		AT91C_AIC_SRCTYPE_INT_HIGH_LEVEL,
-		Usart_c_irq_handler
-	);
-*/
-	
-	// enable interupt
-//	pAIC->AIC_IECR = (1 << AT91C_ID_US1);
-	
-	// trigger interrup software
-//	pAIC->AIC_ISCR = (1 << AT91C_ID_US1) ;
-
-    // enable RX + TX
-	pUS1->US_CR = AT91C_US_RXEN | AT91C_US_TXEN;
+	/*
+	//Empty PDC
+	pUS1->US_RNPR = (uint32_t)(char *)0;
+	pUS1->US_RNCR = 0;
+	pUS1->US_RPR = (uint32_t)(char *)0;
+	pUS1->US_RCR = 0;
 
+	pUS1->US_TNPR = (uint32_t)(char *)0;
+	pUS1->US_TNCR = 0;	
+	pUS1->US_TPR = (uint32_t)(char *)0;
+	pUS1->US_TCR = 0;
+	*/
+	
+	//pUS1->US_PTCR = (AT91C_PDC_RXTEN | AT91C_PDC_TXTEN);
+	//pUS1->US_PTSR = (AT91C_PDC_RXTEN | AT91C_PDC_TXTEN);
+	
+	// re-enable receiver / transmitter
+	pUS1->US_CR = (AT91C_US_RXEN | AT91C_US_TXEN);
+	
 }
\ No newline at end of file
diff --git a/common/usart.h b/common/usart.h
index 3623451d5..271a24ba4 100644
--- a/common/usart.h
+++ b/common/usart.h
@@ -4,18 +4,9 @@
 #include <stddef.h>
 #include "proxmark3.h"
 
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~//
-extern void Dbprintf(const char *fmt, ...);
-
 void usart_init(void);
 void usart_close(void);
 
-uint32_t usart_rx_ready();
-uint32_t usart_tx_ready();
-
-uint8_t usart_read(uint32_t timeout);
-uint8_t usart_readbuffer(uint8_t *data, size_t len);
-
-void usart_write( uint8_t data, uint32_t timeout);
-uint8_t usart_writebuffer(uint8_t *data, size_t len, uint32_t timeout);
+int usart_readbuffer(uint8_t *data, size_t len);
+int16_t usart_writebuffer(uint8_t *data, size_t len);
 #endif
diff --git a/uart/uart.h b/uart/uart.h
index ab0f9c076..a1521a58d 100644
--- a/uart/uart.h
+++ b/uart/uart.h
@@ -41,6 +41,16 @@
 #include "common.h"
 #include "util_posix.h" // msclock
 
+
+
+#if defined (_WIN32)
+#define SERIAL_PORT_H	"com3"
+#elif defined(__APPLE__)
+#define SERIAL_PORT_H   "/dev/cu.usbmodem"
+#else
+#define SERIAL_PORT_H	"/dev/ttyACM0"
+#endif
+
 /* serial_port is declared as a void*, which you should cast to whatever type
  * makes sense to your connection method. Both the posix and win32
  * implementations define their own structs in place.
@@ -78,13 +88,13 @@ void uart_close(const serial_port sp);
  * partial read may have completed into the buffer by the corresponding
  * implementation, so pszRxLen should be checked to see if any data was written. 
  */
-bool uart_receive(const serial_port sp, byte_t* pbtRx, size_t pszMaxRxLen, size_t* pszRxLen);
+bool uart_receive(const serial_port sp, uint8_t* pbtRx, size_t pszMaxRxLen, size_t* pszRxLen);
 
 /* Sends a buffer to a given serial port.
  *   pbtTx: A pointer to a buffer containing the data to send.
  *   len: The amount of data to be sent.
  */
-bool uart_send(const serial_port sp, const byte_t* pbtTx, const size_t len);
+bool uart_send(const serial_port sp, const uint8_t* pbtTx, const size_t len);
 
 /* Sets the current speed of the serial port, in baud.
  */
diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index 33bdc525f..20a577ded 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -117,10 +117,19 @@ serial_port uart_open(const char* pcPortName)
   // Flush all lingering data that may exist
   tcflush(sp->fd, TCIOFLUSH);
 
+#ifdef WITH_FPC
+  uart_set_speed(sp, 115200);
+  printf("[=] UART Setting serial baudrate 115200 [FPC enabled]\n");  
+#else	
   // set speed, works for UBUNTU 14.04
-  bool err = uart_set_speed(sp, 460800);
-  if (!err)
-	  uart_set_speed(sp, 115200);  		  
+  bool success = uart_set_speed(sp, 460800);
+  if (success) {
+    printf("[=] UART Setting serial baudrate 460800\n");
+  } else {
+    uart_set_speed(sp, 115200);
+    printf("[=] UART Setting serial baudrate 115200\n");
+  }
+#endif  
   return sp;
 }
 
@@ -144,7 +153,7 @@ void uart_close(const serial_port sp) {
   free(sp);
 }
 
-bool uart_receive(const serial_port sp, byte_t* pbtRx, size_t pszMaxRxLen, size_t* pszRxLen) {
+bool uart_receive(const serial_port sp, uint8_t* pbtRx, size_t pszMaxRxLen, size_t* pszRxLen) {
   int res;
   int byteCount;
   fd_set rfds;
@@ -156,9 +165,9 @@ bool uart_receive(const serial_port sp, byte_t* pbtRx, size_t pszMaxRxLen, size_
   do {
     // Reset file descriptor
     FD_ZERO(&rfds);
-    FD_SET(((serial_port_unix*)sp)->fd,&rfds);
+    FD_SET(((serial_port_unix*)sp)->fd, &rfds);
     tv = timeout;
-    res = select(((serial_port_unix*)sp)->fd+1, &rfds, NULL, NULL, &tv);
+    res = select(((serial_port_unix*)sp)->fd + 1, &rfds, NULL, NULL, &tv);
     
     // Read error
     if (res < 0) {
@@ -186,7 +195,7 @@ bool uart_receive(const serial_port sp, byte_t* pbtRx, size_t pszMaxRxLen, size_
     }
 
     // There is something available, read the data
-    res = read(((serial_port_unix*)sp)->fd, pbtRx+(*pszRxLen), byteCount);
+    res = read(((serial_port_unix*)sp)->fd, pbtRx + (*pszRxLen), byteCount);
 
     // Stop if the OS has some troubles reading the data
     if (res <= 0) return false;
@@ -203,7 +212,7 @@ bool uart_receive(const serial_port sp, byte_t* pbtRx, size_t pszMaxRxLen, size_
   return true;
 }
 
-bool uart_send(const serial_port sp, const byte_t* pbtTx, const size_t len) {
+bool uart_send(const serial_port sp, const uint8_t* pbtTx, const size_t len) {
   int32_t res;
   size_t pos = 0;
   fd_set rfds;
@@ -229,13 +238,10 @@ bool uart_send(const serial_port sp, const byte_t* pbtTx, const size_t len) {
     }
     
     // Send away the bytes
-    res = write(((serial_port_unix*)sp)->fd, pbtTx+pos, len-pos);
+    res = write(((serial_port_unix*)sp)->fd, pbtTx + pos, len - pos);
     
     // Stop if the OS has some troubles sending the data
-    if (res <= 0) {
-		printf("UART:: os troubles (%d)\n", res);
-		return false;
-	}
+    if (res <= 0) return false;
     
     pos += res;
   }
diff --git a/uart/uart_win32.c b/uart/uart_win32.c
index 7be3a8fe9..eef350cda 100644
--- a/uart/uart_win32.c
+++ b/uart/uart_win32.c
@@ -47,16 +47,6 @@ typedef struct {
   DCB dcb;          // Device control settings
   COMMTIMEOUTS ct;  // Serial port time-out configuration
 } serial_port_windows;
-/*
-void upcase(char *p) {
-  while(*p != '\0') {
-    if(*p >= 97 && *p <= 122) {
-      *p -= 32;
-    }
-    ++p;
-  }
-}
-*/
 
 serial_port uart_open(const char* pcPortName) {
 	char acPortName[255];
@@ -110,10 +100,17 @@ serial_port uart_open(const char* pcPortName) {
   
 	PurgeComm(sp->hPort, PURGE_RXABORT | PURGE_RXCLEAR);
 
+#ifdef WITH_FPC
+	uart_set_speed(sp, 115200);
+#else
 	bool success = uart_set_speed(sp, 460800);
-	if (!success)
+	if (success) {
+		printf("[=] UART Setting serial baudrate 460800\n");
+	} else {
 		uart_set_speed(sp, 115200);
-  
+		printf("[=] UART Setting serial baudrate 115200\n");
+	}
+#endif  
 	return sp;
 }
 
@@ -155,32 +152,13 @@ uint32_t uart_get_speed(const serial_port sp) {
 	return 0;
 }
 
-bool uart_receive(const serial_port sp, byte_t* p_rx, size_t pszMaxRxLen, size_t* p_rxlen) {
-	int res = ReadFile(((serial_port_windows*)sp)->hPort, p_rx, pszMaxRxLen, (LPDWORD)p_rxlen, NULL);
-	if ( res == 0 ) {
-		//printf("[!] UART error reading from port\n");
-		return false;
-	}
-	
-	bool read_test = ( pszMaxRxLen ==  *p_rxlen );
-	if ( !read_test && *p_rxlen > 0 ) {
-		printf("[!] UART error, not all data read from port  len %u | read %u\n", pszMaxRxLen, *p_rxlen);
-	}
-	return read_test;
+bool uart_receive(const serial_port sp, uint8_t* p_rx, size_t pszMaxRxLen, size_t* len) {
+	return ReadFile(((serial_port_windows*)sp)->hPort, p_rx, pszMaxRxLen, (LPDWORD)len, NULL);
 }
 
-bool uart_send(const serial_port sp, const byte_t* p_tx, const size_t len) {
+bool uart_send(const serial_port sp, const uint8_t* p_tx, const size_t len) {
 	DWORD txlen = 0;		
-	int res = WriteFile(((serial_port_windows*)sp)->hPort, p_tx, len, &txlen, NULL);
-	if ( res == 0) {
-		printf("[!] UART error writing to port\n");
-		return false;
-	}
-	bool write_test = ( len == txlen );
-	if ( !write_test ) {
-		printf("[!] UART error, not all data written to port  len %u | sent %lu\n", len, txlen);
-	}	
-	return write_test;
+	return WriteFile(((serial_port_windows*)sp)->hPort, p_tx, len, &txlen, NULL);
 }
 
 #endif
\ No newline at end of file

From 3a338f566e6282ac139e79bc1c618aaf40fbe8bd Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Thu, 6 Sep 2018 21:44:53 +0200
Subject: [PATCH 0018/1938] chg: zero mean in hidfskdemod chg: idteck demod
 return values

---
 common/lfdemod.c | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/common/lfdemod.c b/common/lfdemod.c
index 81e9135dc..f5a0611f3 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -1697,11 +1697,11 @@ size_t aggregate_bits(uint8_t *dest, size_t size, uint8_t clk, uint8_t invert, u
 
 //by marshmellow  (from holiman's base)
 // full fsk demod from GraphBuffer wave to decoded 1s and 0s (no mandemod)
-size_t fskdemod(uint8_t *dest, size_t size, uint8_t rfLen, uint8_t invert, uint8_t fchigh, uint8_t fclow, int *startIdx) {
+size_t fskdemod(uint8_t *dest, size_t size, uint8_t rfLen, uint8_t invert, uint8_t fchigh, uint8_t fclow, int *start_idx) {
 	if (signalprop.isnoise) return 0;
 	// FSK demodulator
-	size = fsk_wave_demod(dest, size, fchigh, fclow, startIdx);
-	size = aggregate_bits(dest, size, rfLen, invert, fchigh, fclow, startIdx);
+	size = fsk_wave_demod(dest, size, fchigh, fclow, start_idx);
+	size = aggregate_bits(dest, size, rfLen, invert, fchigh, fclow, start_idx);
 	return size;
 }
 
@@ -1905,6 +1905,16 @@ int HIDdemodFSK(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32
 	
 	if (signalprop.isnoise) return -2;
 		
+	// zero mean data
+	int i, accum = 0;
+	for (i = 10; i < *size; ++i)
+		accum += dest[i];
+	
+	accum /= (*size - 10);
+	
+	for (i = 0; i < *size; ++i)
+		dest[i] -= accum;
+	
 	// FSK demodulator  fsk2a so invert and fc/10/8
 	*size = fskdemod(dest, *size, 50, 1, 10, 8, waveStartIdx); //hid fsk2a
 
@@ -1943,12 +1953,19 @@ int HIDdemodFSK(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32
 int detectIdteck(uint8_t *dest, size_t *size) {
 	//make sure buffer has data
 	if (*size < 64*2) return -1;	
-	size_t startIdx = 0;
+	
+	if (signalprop.isnoise) return -2;
+	
+	size_t start_idx = 0;
 	uint8_t preamble[] = {0,1,0,0,1,0,0,1,0,1,0,0,0,1,0,0,0,1,0,1,0,1,0,0,0,1,0,0,1,0,1,1};
-	if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
-		return -2; //preamble not found
-	if (*size != 64) return -3; // wrong demoded size
-	return (int) startIdx;
+	
+	//preamble not found
+	if (!preambleSearch(dest, preamble, sizeof(preamble), size, &start_idx))
+		return -3; 
+	
+	 // wrong demoded size
+	if (*size != 64) return -4;
+	return (int)start_idx;
 }
 
 int detectIOProx(uint8_t *dest, size_t *size, int *waveStartIdx) {

From bb5804b1b0b38a9a58af657b8694390202a77b6c Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Thu, 6 Sep 2018 21:47:57 +0200
Subject: [PATCH 0019/1938] text

---
 CHANGELOG.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d384e8a61..966d26729 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,9 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [unreleased][unreleased]
-
+ - Chg adaptations for FPC communications (work in progress)  (@iceman)
+ - Fix 'stand-alone Colin' - remake to benefit from flashmem for persistence. (@cjbrigato)
+ - Fix 'LEGIC SIM' - remake of legic sim (@drandreas)
  - Changed 'proxmark3 client threading'  - remake from official repo (@micolous)
  - Add 'rem' - new command that adds a line to the log file (@didierStevens)
  - Fix 'EM410xdemod  empty tag id in lfops.c' (@Defensor7)  

From e5e8c0b5d81714b61a217830bfc3dbd91efbfce7 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Fri, 7 Sep 2018 23:45:08 +0200
Subject: [PATCH 0020/1938] not needed anymore

---
 armsrc/Makefile.colin | 183 ------------------------------------------
 1 file changed, 183 deletions(-)
 delete mode 100644 armsrc/Makefile.colin

diff --git a/armsrc/Makefile.colin b/armsrc/Makefile.colin
deleted file mode 100644
index fb2a2a91b..000000000
--- a/armsrc/Makefile.colin
+++ /dev/null
@@ -1,183 +0,0 @@
-#-----------------------------------------------------------------------------
-# This code is licensed to you under the terms of the GNU GPL, version 2 or,
-# at your option, any later version. See the LICENSE.txt file for the text of
-# the license.
-#-----------------------------------------------------------------------------
-# Makefile for armsrc, see ../common/Makefile.common for common settings
-#-----------------------------------------------------------------------------
-
-APP_INCLUDES = apps.h
-
-#remove one of the following defines and comment out the relevant line
-#in the next section to remove that particular feature from compilation.
-# NO space,TABs after the "\" sign.  
-APP_CFLAGS = -DWITH_CRC \
-			 -DON_DEVICE \
-			 -DWITH_LF \
-			 -DWITH_HITAG \
- 			 -DWITH_ISO15693 \
-			 -DWITH_LEGICRF \
-			 -DWITH_ISO14443b \
-			 -DWITH_ISO14443a \
-			 -DWITH_ICLASS \
-			 -DWITH_FELICA \
-			 -DWITH_FLASH \
-			 -DWITH_SMARTCARD \
-			 -DWITH_HFSNOOP \
-			 -DWITH_HF_COLIN \
-			 -fno-strict-aliasing -ffunction-sections -fdata-sections
-
-### IMPORTANT -  move the commented variable below this line
-#			 -DWITH_LCD \
-#			 -DWITH_EMV \
-#			 -DWITH_FPC \
-#
-# Standalone Mods
-#-------------------------------------------------------
-#			 -DWITH_LF_ICERUN
-#			 -DWITH_LF_SAMYRUN
-#			 -DWITH_LF_PROXBRUTE
-#			 -DWITH_LF_HIDBRUTE
-#			 -DWITH_HF_YOUNG
-#			 -DWITH_HF_MATTYRUN
-#			 -DWITH_HF_COLIN
-
-
-SRC_LCD = fonts.c LCD.c
-SRC_LF = lfops.c hitag2.c hitagS.c lfsampling.c pcf7931.c lfdemod.c
-SRC_ISO15693 = iso15693.c iso15693tools.c
-#SRC_ISO14443a = iso14443a.c mifareutil.c mifarecmd.c epa.c mifaresim.c
-SRC_ISO14443a = iso14443a.c mifareutil.c mifarecmd.c epa.c 
-SRC_ISO14443b = iso14443b.c
-SRC_FELICA = felica.c
-SRC_CRAPTO1 = crypto1.c des.c aes.c desfire_key.c desfire_crypto.c mifaredesfire.c
-SRC_CRC = crc.c crc16.c crc32.c 
-SRC_ICLASS = iclass.c optimized_cipher.c
-SRC_LEGIC = legicrf.c legic_prng.c
-SRC_FLASH = flashmem.c
-SRC_SMARTCARD = i2c.c
-#SRC_FPC = usart.c
-SRC_BEE = bee.c
-
-#the FPGA bitstream files. Note: order matters!
-FPGA_BITSTREAMS = fpga_lf.bit fpga_hf.bit
-
-#the zlib source files required for decompressing the fpga config at run time
-SRC_ZLIB = inflate.c inffast.c inftrees.c adler32.c zutil.c
-#additional defines required to compile zlib
-ZLIB_CFLAGS = -DZ_SOLO -DZ_PREFIX -DNO_GZIP -DZLIB_PM3_TUNED
-APP_CFLAGS += $(ZLIB_CFLAGS)
-# zlib includes:
-APP_CFLAGS += -I../zlib
-
-# stdint.h provided locally until GCC 4.5 becomes C99 compliant
-APP_CFLAGS += -I.
-
-# Compile these in thumb mode (small size)
-THUMBSRC = start.c \
-	protocols.c \
-	$(SRC_LCD) \
-	$(SRC_ISO15693) \
-	$(SRC_LF) \
-	$(SRC_ZLIB) \
-	$(SRC_LEGIC) \
-	$(SRC_FLASH) \
-	$(SRC_SMARTCARD) \
-	$(SRC_FPC) \
-	appmain.c \
-	printf.c \
-	util.c \
-	string.c \
-	BigBuf.c \
-	ticks.c \
-	random.c \
-	hfsnoop.c
-
-
-# These are to be compiled in ARM mode
-ARMSRC = fpgaloader.c \
-	$(SRC_ISO14443a) \
-	$(SRC_ISO14443b) \
-	$(SRC_CRAPTO1) \
-	$(SRC_ICLASS) \
-	$(SRC_EMV) \
-	$(SRC_CRC) \
-	$(SRC_FELICA) \
-	parity.c \
-	usb_cdc.c \
-	cmd.c \
-	vtsend.c \
-	hf_colin.c \
-	lib_AT91SAM7.c
-	
-VERSIONSRC = version.c \
-	fpga_version_info.c
-	
-# Do not move this inclusion before the definition of {THUMB,ASM,ARM}SRC
-include ../common/Makefile.common
-
-COMMON_FLAGS =  -Os 
-OBJS = $(OBJDIR)/fullimage.s19 
-FPGA_COMPRESSOR = ../client/fpga_compress
-
-all: $(OBJS)
-
-.DELETE_ON_ERROR:
-
-# version.c should be remade on every compilation
-.PHONY: version.c
-version.c: default_version.c
-	perl ../tools/mkversion.pl .. > $@ || $(COPY) $^ $@ 
-
-fpga_version_info.c: $(FPGA_BITSTREAMS) $(FPGA_COMPRESSOR)
-	$(FPGA_COMPRESSOR) -v $(filter %.bit,$^) $@
-
-$(OBJDIR)/fpga_all.o: $(OBJDIR)/fpga_all.bit.z
-	$(OBJCOPY) -O elf32-littlearm -I binary -B arm --prefix-sections=fpga_all_bit $^ $@
-
-$(OBJDIR)/fpga_all.bit.z: $(FPGA_BITSTREAMS) $(FPGA_COMPRESSOR)
-	$(FPGA_COMPRESSOR) $(filter %.bit,$^) $@  
-
-$(FPGA_COMPRESSOR):
-		make -C ../client $(notdir $(FPGA_COMPRESSOR))
-		
-$(OBJDIR)/fullimage.stage1.elf: $(VERSIONOBJ) $(OBJDIR)/fpga_all.o $(THUMBOBJ) $(ARMOBJ)
-	$(CC) $(LDFLAGS) -Wl,-T,ldscript,-Map,$(patsubst %.elf,%.map,$@) -o $@ $^ $(LIBS)
-
-$(OBJDIR)/fullimage.nodata.bin: $(OBJDIR)/fullimage.stage1.elf
-	$(OBJCOPY) -O binary -I elf32-littlearm --remove-section .data $^ $@
-	
-$(OBJDIR)/fullimage.nodata.o: $(OBJDIR)/fullimage.nodata.bin
-	$(OBJCOPY) -O elf32-littlearm -I binary -B arm --rename-section .data=stage1_image $^ $@
-
-$(OBJDIR)/fullimage.data.bin: $(OBJDIR)/fullimage.stage1.elf
-	$(OBJCOPY) -O binary -I elf32-littlearm --only-section .data $^ $@
-
-$(OBJDIR)/fullimage.data.bin.z: $(OBJDIR)/fullimage.data.bin $(FPGA_COMPRESSOR)
-	$(FPGA_COMPRESSOR) $(filter %.bin,$^) $@  
-	
-$(OBJDIR)/fullimage.data.o: $(OBJDIR)/fullimage.data.bin.z
-	$(OBJCOPY) -O elf32-littlearm -I binary -B arm --rename-section .data=compressed_data $^ $@
-
-$(OBJDIR)/fullimage.elf: $(OBJDIR)/fullimage.nodata.o $(OBJDIR)/fullimage.data.o
-	$(CC) $(LDFLAGS) -Wl,-T,ldscript,-e,_osimage_entry,-Map,$(patsubst %.elf,%.map,$@) -o $@ $^
-
-tarbin: $(OBJS)
-	$(TAR) $(TARFLAGS) ../proxmark3-$(platform)-bin.tar $(OBJS:%=armsrc/%) $(OBJS:%.s19=armsrc/%.elf)
-
-clean:
-	$(DELETE) $(OBJDIR)$(PATHSEP)*.o
-	$(DELETE) $(OBJDIR)$(PATHSEP)*.elf
-	$(DELETE) $(OBJDIR)$(PATHSEP)*.s19
-	$(DELETE) $(OBJDIR)$(PATHSEP)*.map
-	$(DELETE) $(OBJDIR)$(PATHSEP)*.d
-	$(DELETE) $(OBJDIR)$(PATHSEP)*.z
-	$(DELETE) $(OBJDIR)$(PATHSEP)*.bin
-	$(DELETE) version.c
-
-.PHONY: all clean help
-help:
-	@echo Multi-OS Makefile, you are running on $(DETECTED_OS)
-	@echo Possible targets:
-	@echo +	all    - Build the full image $(OBJDIR)/fullimage.s19
-	@echo +	clean             - Clean $(OBJDIR)

From b7d0786ab818ab277f4923d6e044bd1e6c93e3a8 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Fri, 7 Sep 2018 23:45:52 +0200
Subject: [PATCH 0021/1938] code clean

---
 client/cmdhflegic.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index 0b744c659..b14fa6946 100644
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -45,7 +45,7 @@ int usage_legic_rdmem(void){
 }
 int usage_legic_sim(void){
 	PrintAndLogEx(NORMAL, "Simulates a LEGIC Prime tag. MIM22, MIM256, MIM1024 types can be emulated");
-	PrintAndLogEx(NORMAL, "Use eload/esave to upload a dump into emulator memory");
+	PrintAndLogEx(NORMAL, "Use ELOAD/ESAVE to upload a dump into emulator memory");
 	PrintAndLogEx(NORMAL, "Usage:  hf legic sim [h] <tagtype>");
 	PrintAndLogEx(NORMAL, "Options:");
 	PrintAndLogEx(NORMAL, "      h             : this help");
@@ -502,8 +502,8 @@ int CmdLegicRdmem(const char *Cmd) {
 
 int CmdLegicRfSim(const char *Cmd) {
 
-	char cmdp = param_getchar(Cmd, 0);
-	if ( cmdp == 'H' || cmdp == 'h' ) return usage_legic_sim();
+	char cmdp = tolower(param_getchar(Cmd, 0));
+	if ( strlen(Cmd) = 0 | |cmdp == 'h' ) return usage_legic_sim();
 
 	UsbCommand c = {CMD_SIMULATE_TAG_LEGIC_RF, {1}};
 	sscanf(Cmd, " %" SCNi64, &c.arg[0]);
@@ -520,7 +520,7 @@ int CmdLegicRfWrite(const char *Cmd) {
 	int len = 0, bg, en;
 	uint32_t offset = 0, IV = 0x55;
 	
-	while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
 		switch (tolower(param_getchar(Cmd, cmdp))) {
 		case 'd':
 			// peek at length of the input string so we can
@@ -651,7 +651,7 @@ int CmdLegicCalcCrc(const char *Cmd){
 	int len = 0;
 	int bg, en;
 	
-	while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
 		switch (tolower(param_getchar(Cmd, cmdp))) {
 		case 'd':
 			// peek at length of the input string so we can
@@ -821,7 +821,7 @@ int HFLegicReader(const char *Cmd, bool verbose) {
 	if ( cmdp == 'h' ) return usage_legic_reader();
 	
 	legic_card_select_t card;
-	switch(legic_get_type(&card)){
+	switch (legic_get_type(&card)){
 		case 1: 
 			return 2;
 		case 2: 
@@ -852,7 +852,7 @@ int CmdLegicDump(const char *Cmd){
 	
 	memset(filename, 0, sizeof(filename));
 	
-	while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
 		switch (tolower(param_getchar(Cmd, cmdp))) {
 			case 'h':
 				return usage_legic_dump();
@@ -950,7 +950,7 @@ int CmdLegicRestore(const char *Cmd){
 	
 	memset(filename, 0, sizeof(filename));
 	
-	while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
 		switch (tolower(param_getchar(Cmd, cmdp))) {
 			case 'h':
 				errors = true;

From 51fdde0bbf263d10d45c8244fca1bde2cdd745c1 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Fri, 7 Sep 2018 23:46:44 +0200
Subject: [PATCH 0022/1938] code clean

---
 client/cmddata.c | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/client/cmddata.c b/client/cmddata.c
index 57aec5b70..61e182ca3 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -932,14 +932,13 @@ int CmdAskEdgeDetect(const char *Cmd) {
 /* Print our clock rate */
 // uses data from graphbuffer
 // adjusted to take char parameter for type of modulation to find the clock - by marshmellow.
-int CmdDetectClockRate(const char *Cmd)
-{
-	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) > 6 || strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H')
+int CmdDetectClockRate(const char *Cmd) {
+	char cmdp = tolower(param_getchar(Cmd, 0));
+	if (strlen(Cmd) > 6 || strlen(Cmd) == 0 || cmdp == 'h')
 		return usage_data_detectclock();
 
 	int clock = 0;
-	switch ( tolower(cmdp) ) {
+	switch ( cmdp ) {
 		case 'a' :
 			clock = GetAskClock(Cmd+1, true);
 			break;
@@ -965,16 +964,21 @@ char *GetFSKType(uint8_t fchigh, uint8_t fclow, uint8_t invert)
 	static char fType[8];
 	memset(fType, 0x00, 8);	
 	char *fskType = fType;
-	if (fchigh==10 && fclow==8){
-		if (invert) //fsk2a
+	
+	if (fchigh == 10 && fclow == 8){
+		
+		if (invert)
 			memcpy(fskType, "FSK2a", 5);
-		else //fsk2
+		else
 			memcpy(fskType, "FSK2", 4);
+		
 	} else if (fchigh == 8 && fclow == 5) {
+		
 		if (invert)
 			memcpy(fskType, "FSK1", 4);
 		else
 			memcpy(fskType, "FSK1a", 5);
+		
 	} else {
 		memcpy(fskType, "FSK??", 5);
 	}
@@ -985,8 +989,7 @@ char *GetFSKType(uint8_t fchigh, uint8_t fclow, uint8_t invert)
 //fsk raw demod and print binary
 //takes 4 arguments - Clock, invert, fchigh, fclow
 //defaults: clock = 50, invert=1, fchigh=10, fclow=8 (RF/10 RF/8 (fsk2a))
-int FSKrawDemod(const char *Cmd, bool verbose)
-{
+int FSKrawDemod(const char *Cmd, bool verbose) {
 	//raw fsk demod  no manchester decoding no start bit finding just get binary from wave
 	uint8_t rfLen, invert, fchigh, fclow;
 
@@ -996,18 +999,20 @@ int FSKrawDemod(const char *Cmd, bool verbose)
 	invert = param_get8(Cmd, 1);
 	fchigh = param_get8(Cmd, 2);
 	fclow = param_get8(Cmd, 3);
-	if (strlen(Cmd)>0 && strlen(Cmd)<=2) {
-		if (rfLen==1) {
+	
+	if (strlen(Cmd) > 0 && strlen(Cmd) <= 2) {
+		if (rfLen == 1) {
 			invert = 1;   //if invert option only is used
 			rfLen = 0;
 		}
 	}
 
-	uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
+	uint8_t BitStream[MAX_GRAPH_TRACE_LEN] = {0};
 	size_t BitLen = getFromGraphBuf(BitStream);
-	if (BitLen==0) return 0;
+	if (BitLen == 0) return 0;
+	
 	//get field clock lengths
-	uint16_t fcs=0;
+	uint16_t fcs = 0;
 	if (!fchigh || !fclow) {
 		fcs = countFC(BitStream, BitLen, 1);
 		if (!fcs) {
@@ -1061,7 +1066,7 @@ int PSKDemod(const char *Cmd, bool verbose) {
 	sscanf(Cmd, "%i %i %i", &clk, &invert, &maxErr);
 	if (clk == 1) {
 		invert = 1;
-		clk=0;
+		clk = 0;
 	}
 	if (invert != 0 && invert != 1) {
 		if (g_debugMode || verbose) PrintAndLogEx(WARNING, "Invalid argument: %s", Cmd);

From e29bb51e7604602412353576012e981e4b84ec65 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Fri, 7 Sep 2018 23:47:42 +0200
Subject: [PATCH 0023/1938] chg;:  idea of auto adjusting signal to zero mean
 baseline in order to compensate different antennas

---
 common/lfdemod.c | 32 ++++++++++++++++++++++----------
 common/lfdemod.h |  1 +
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/common/lfdemod.c b/common/lfdemod.c
index f5a0611f3..f1a593221 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -105,6 +105,21 @@ int32_t compute_mean_int(int *in, size_t N) {
 	return mean / (int)N;
 }
 
+
+void zeromean(uint8_t* data, size_t size) {
+			
+	// zero mean data
+	int i, accum = 0;
+	for (i = 10; i < size; ++i)
+		accum += data[i];
+	
+	accum /= (size - 10);
+	
+	for (i = 0; i < size; ++i)
+		data[i] -= accum;
+}
+
+
 //test samples are not just noise
 // By measuring mean and look at amplitude of signal from HIGH / LOW,   we can detect noise
 bool isNoise_int(int *bits, uint32_t size) {
@@ -1841,6 +1856,8 @@ int detectAWID(uint8_t *dest, size_t *size, int *waveStartIdx) {
 
 	if (signalprop.isnoise) return -2;
 
+	zeromean(dest, *size);
+	
 	// FSK2a demodulator  clock 50, invert 1, fcHigh 10, fcLow 8
 	*size = fskdemod(dest, *size, 50, 1, 10, 8, waveStartIdx); //awid fsk2a
 
@@ -1898,22 +1915,15 @@ int Em410xDecode(uint8_t *bits, size_t *size, size_t *start_idx, uint32_t *hi, u
 	return 1;
 }
 
+
 // loop to get raw HID waveform then FSK demodulate the TAG ID from it
 int HIDdemodFSK(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32_t *lo, int *waveStartIdx) {
 	//make sure buffer has data
 	if (*size < 96*50) return -1;
 	
 	if (signalprop.isnoise) return -2;
-		
-	// zero mean data
-	int i, accum = 0;
-	for (i = 10; i < *size; ++i)
-		accum += dest[i];
-	
-	accum /= (*size - 10);
-	
-	for (i = 0; i < *size; ++i)
-		dest[i] -= accum;
+
+	zeromean(dest, *size);
 	
 	// FSK demodulator  fsk2a so invert and fc/10/8
 	*size = fskdemod(dest, *size, 50, 1, 10, 8, waveStartIdx); //hid fsk2a
@@ -1974,6 +1984,8 @@ int detectIOProx(uint8_t *dest, size_t *size, int *waveStartIdx) {
 	
 	if (signalprop.isnoise) return -2;
 	
+	zeromean(dest, *size);
+		
 	// FSK demodulator  RF/64, fsk2a so invert, and fc/10/8
 	*size = fskdemod(dest, *size, 64, 1, 10, 8, waveStartIdx);  //io fsk2a
 	
diff --git a/common/lfdemod.h b/common/lfdemod.h
index f0620801f..3a7f873d7 100644
--- a/common/lfdemod.h
+++ b/common/lfdemod.h
@@ -34,6 +34,7 @@ extern uint32_t	compute_mean_uint(uint8_t *in, size_t N);
 extern int32_t	compute_mean_int(int *in, size_t N);
 bool isNoise_int(int *bits, uint32_t size);
 bool isNoise(uint8_t *bits, uint32_t size);
+extern void zeromean(uint8_t* data, size_t size);
 
 // buffer is unsigned on DEVIE
 #ifdef ON_DEVICE

From 0b673683d921ba9d4e0048034ee5769a877b8c82 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sat, 8 Sep 2018 11:17:31 +0200
Subject: [PATCH 0024/1938] fix: 'hf legic sim'  no assign... (Thanks to @625)

---
 client/cmdhflegic.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index b14fa6946..d64c8b5ba 100644
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -503,7 +503,7 @@ int CmdLegicRdmem(const char *Cmd) {
 int CmdLegicRfSim(const char *Cmd) {
 
 	char cmdp = tolower(param_getchar(Cmd, 0));
-	if ( strlen(Cmd) = 0 | |cmdp == 'h' ) return usage_legic_sim();
+	if ( strlen(Cmd) == 0 | |cmdp == 'h' ) return usage_legic_sim();
 
 	UsbCommand c = {CMD_SIMULATE_TAG_LEGIC_RF, {1}};
 	sscanf(Cmd, " %" SCNi64, &c.arg[0]);

From 0e2dbe742462ade60c2a5613266ea46dff14d14e Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sat, 8 Sep 2018 11:18:10 +0200
Subject: [PATCH 0025/1938] chg: code cleanup

---
 client/cmdanalyse.c  | 12 ++++++------
 client/cmddata.c     |  8 ++++----
 client/cmdflashmem.c |  6 +++---
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/client/cmdanalyse.c b/client/cmdanalyse.c
index 490dda9d3..f756a44c0 100644
--- a/client/cmdanalyse.c
+++ b/client/cmdanalyse.c
@@ -244,8 +244,8 @@ int CmdAnalyseLfsr(const char *Cmd){
 }
 int CmdAnalyseLCR(const char *Cmd) {
 	uint8_t data[50];
-	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) == 0|| cmdp == 'h' || cmdp == 'H') return usage_analyse_lcr();
+	char cmdp = tolower(param_getchar(Cmd, 0));
+	if (strlen(Cmd) == 0|| cmdp == 'h') return usage_analyse_lcr();
 	
 	int len = 0;
 	switch (param_gethex_to_eol(Cmd, 0, data, sizeof(data), &len)) {
@@ -265,8 +265,8 @@ int CmdAnalyseLCR(const char *Cmd) {
 }
 int CmdAnalyseCRC(const char *Cmd) {
 
-	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_analyse_crc();
+	char cmdp = tolower(param_getchar(Cmd, 0));
+	if (strlen(Cmd) == 0 || cmdp == 'h') return usage_analyse_crc();
 	
 	int len = strlen(Cmd);
 	if ( len & 1 ) return usage_analyse_crc();
@@ -867,8 +867,8 @@ int CmdAnalyseNuid(const char *Cmd){
 	uint8_t nuid[4] = {0};	
 	uint8_t uid[7] = {0};
 	int len = 0;
-	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) == 0|| cmdp == 'h' || cmdp == 'H') return usage_analyse_nuid();
+	char cmdp = tolower(param_getchar(Cmd, 0));
+	if (strlen(Cmd) == 0|| cmdp == 'h') return usage_analyse_nuid();
 
 	/* selftest  UID 040D681AB52281  -> NUID 8F430FEF */
 	if (cmdp == 't' || cmdp == 'T') {
diff --git a/client/cmddata.c b/client/cmddata.c
index 61e182ca3..7d8cef081 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -701,8 +701,8 @@ int ASKbiphaseDemod(const char *Cmd, bool verbose)
 //by marshmellow - see ASKbiphaseDemod
 int Cmdaskbiphdemod(const char *Cmd)
 {
-	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) > 25 || cmdp == 'h' || cmdp == 'H') return usage_data_rawdemod_ab();
+	char cmdp = tolower(param_getchar(Cmd, 0));
+	if (strlen(Cmd) > 25 || cmdp == 'h') return usage_data_rawdemod_ab();
 
 	return ASKbiphaseDemod(Cmd, true);
 }
@@ -710,8 +710,8 @@ int Cmdaskbiphdemod(const char *Cmd)
 //by marshmellow - see ASKDemod
 int Cmdaskrawdemod(const char *Cmd)
 {
-	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) > 25 || cmdp == 'h' || cmdp == 'H')	return usage_data_rawdemod_ar();
+	char cmdp = tolower(param_getchar(Cmd, 0));
+	if (strlen(Cmd) > 25 || cmdp == 'h') return usage_data_rawdemod_ar();
 	
 	return ASKDemod(Cmd, true, false, 0);
 }
diff --git a/client/cmdflashmem.c b/client/cmdflashmem.c
index 43230218f..d6d27e6fc 100644
--- a/client/cmdflashmem.c
+++ b/client/cmdflashmem.c
@@ -139,10 +139,10 @@ int CmdFlashMemRead(const char *Cmd) {
 
 int CmdFlashmemSpiBaudrate(const char *Cmd) {
 
-	char ctmp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) < 1 || ctmp == 'h' || ctmp == 'H') return usage_flashmem_spibaud();
+	char ctmp = tolower(param_getchar(Cmd, 0));
+	if (strlen(Cmd) < 1 || ctmp == 'h') return usage_flashmem_spibaud();
 	uint32_t baudrate = param_get32ex(Cmd, 0, 0, 10);
-	baudrate = baudrate*1000000;
+	baudrate = baudrate * 1000000;
 	if (baudrate != FLASH_BAUD && baudrate != FLASH_MINBAUD ) return usage_flashmem_spibaud();
 	UsbCommand c = {CMD_FLASHMEM_SET_SPIBAUDRATE, {baudrate, 0, 0}};
 	SendCommand(&c);

From 65b29410d44a81aa47b0b114357d560bd914fd93 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sat, 8 Sep 2018 11:23:17 +0200
Subject: [PATCH 0026/1938] chg.. space..

---
 client/cmdhflegic.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index d64c8b5ba..281912866 100644
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -503,7 +503,7 @@ int CmdLegicRdmem(const char *Cmd) {
 int CmdLegicRfSim(const char *Cmd) {
 
 	char cmdp = tolower(param_getchar(Cmd, 0));
-	if ( strlen(Cmd) == 0 | |cmdp == 'h' ) return usage_legic_sim();
+	if ( strlen(Cmd) == 0 || cmdp == 'h' ) return usage_legic_sim();
 
 	UsbCommand c = {CMD_SIMULATE_TAG_LEGIC_RF, {1}};
 	sscanf(Cmd, " %" SCNi64, &c.arg[0]);

From 56f3ef2a5584400dc4193b4fe85031810459cc2d Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sat, 8 Sep 2018 12:38:36 +0200
Subject: [PATCH 0027/1938] chg:  helptext  (@drandreas) chg: 'hf legic esave' 
 now saves to both BIN / EML

---
 client/cmdhflegic.c | 18 ++++--------------
 client/cmdhflegic.h |  1 +
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index 281912866..393d73ed0 100644
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -54,7 +54,7 @@ int usage_legic_sim(void){
 	PrintAndLogEx(NORMAL, "                    : 2 = MIM1024");
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      hf legic sim");
+	PrintAndLogEx(NORMAL, "      hf legic sim 2");
 	return 0;
 }
 int usage_legic_write(void){
@@ -1120,7 +1120,7 @@ int CmdLegicELoad(const char *Cmd) {
 }
 
 int CmdLegicESave(const char *Cmd) {
-	FILE *f;
+
 	char filename[FILE_PATH_SIZE];
 	char *fnameptr = filename;
 	int fileNlen, numofbytes, nameParamNo = 1;
@@ -1160,24 +1160,14 @@ int CmdLegicESave(const char *Cmd) {
 		free(data);
 		return 4;
 	}
-
 	// user supplied filename?
 	if (fileNlen < 1)		
 		sprintf(fnameptr,"%02X%02X%02X%02X.bin", data[0], data[1], data[2], data[3]);
 	else
 		sprintf(fnameptr + fileNlen,".bin");
 	
-	// open file
-	f = fopen(filename,"wb");
-	if (!f) { 
-		PrintAndLogEx(WARNING, "Could not create file name %s", filename);
-		free(data);
-		return 1;
-	}
-	fwrite(data, 1, numofbytes, f);
-	fclose(f);
-	free(data);
-	PrintAndLogEx(NORMAL, "\nSaved %d bytes from emulator memory to file: %s", numofbytes, filename);
+	saveFileEML(filename, "eml", data, numofbytes, 8);	
+	saveFile(filename, "bin", data, numofbytes);
 	return 0;
 }
 
diff --git a/client/cmdhflegic.h b/client/cmdhflegic.h
index 4e3c8cc86..6ee08253c 100644
--- a/client/cmdhflegic.h
+++ b/client/cmdhflegic.h
@@ -22,6 +22,7 @@
 #include "legic_prng.h"
 #include "legic.h" // legic_card_select_t struct
 #include "cmdhf.h" // "hf list"
+#include "loclass/fileutils.h"  //saveFile
 
 int CmdHFLegic(const char *Cmd);
 

From 79afc031fcd8db4e9930dae8ea4a7324e8d1a629 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sat, 8 Sep 2018 14:11:51 +0200
Subject: [PATCH 0028/1938] FIX: LF antenna discharge after interfer timings. 
 As suggested by @ts   And thanks to @drandreas who patiently explains fpga
 verilog code to me.

This introduces a new majoe mode, FPGA_MAJOR_MODE_OFF_LF,  which should ONLY be used in sending loops for LF.   Basically the PWR_LO is set HIGH in order to discharge voltage faster.

Once sending is over,  the normal FPGA_MAJOR_MODE_OFF SHALL be used.
---
 armsrc/fpgaloader.h |  12 +++++++-----
 armsrc/lfops.c      |   9 ++++-----
 fpga/fpga_lf.bit    | Bin 42175 -> 42175 bytes
 fpga/fpga_lf.v      |  14 +++++++++-----
 4 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/armsrc/fpgaloader.h b/armsrc/fpgaloader.h
index 21731b571..a1e0d1ee0 100644
--- a/armsrc/fpgaloader.h
+++ b/armsrc/fpgaloader.h
@@ -62,7 +62,9 @@ extern void switch_off(void);
 #define FPGA_MAJOR_MODE_HF_SNOOP				    (4<<5)
 #define FPGA_MAJOR_MODE_HF_FELICA      				(5<<5)
 // BOTH
+#define FPGA_MAJOR_MODE_OFF_LF						(6<<5)
 #define FPGA_MAJOR_MODE_OFF							(7<<5)
+
 // Options for LF_ADC
 #define FPGA_LF_ADC_READER_FIELD					(1<<0)
 // Options for LF_EDGE_DETECT
@@ -76,11 +78,11 @@ extern void switch_off(void);
 #define FPGA_HF_READER_RX_XCORR_SNOOP				(1<<1)
 #define FPGA_HF_READER_RX_XCORR_QUARTER				(1<<2)
 // Options for the HF simulated tag, how to modulate
-#define FPGA_HF_SIMULATOR_NO_MODULATION				(0<<0) // 0000
-#define FPGA_HF_SIMULATOR_MODULATE_BPSK				(1<<0) // 0001
-#define FPGA_HF_SIMULATOR_MODULATE_212K				(2<<0) // 0010
-#define FPGA_HF_SIMULATOR_MODULATE_424K				(4<<0) // 0100
-#define FPGA_HF_SIMULATOR_MODULATE_424K_8BIT		0x5    // 0101
+#define FPGA_HF_SIMULATOR_NO_MODULATION				0x0 // 0000
+#define FPGA_HF_SIMULATOR_MODULATE_BPSK				0x1 // 0001
+#define FPGA_HF_SIMULATOR_MODULATE_212K				0x2 // 0010
+#define FPGA_HF_SIMULATOR_MODULATE_424K				0x4 // 0100
+#define FPGA_HF_SIMULATOR_MODULATE_424K_8BIT		0x5 // 0101
 //  no 848K 
 
 // Options for ISO14443A
diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index 9d6cfbf0e..a957e4dfb 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -26,10 +26,9 @@
 # define OPEN_COIL()	HIGH(GPIO_SSC_DOUT)
 #endif
 
-
-#define START_GAP 52*8 // was 250 // SPEC:  1*8 to 50*8 - typ 15*8 (15fc)
-#define WRITE_GAP 18*8 // was 160 // SPEC:  1*8 to 20*8 - typ 10*8 (10fc)
-#define WRITE_0   24*8 // was 144 // SPEC: 16*8 to 32*8 - typ 24*8 (24fc)
+#define START_GAP 31*8 // was 250 // SPEC:  1*8 to 50*8 - typ 15*8 (15fc)
+#define WRITE_GAP 20*8 // was 160 // SPEC:  1*8 to 20*8 - typ 10*8 (10fc)
+#define WRITE_0   18*8 // was 144 // SPEC: 16*8 to 32*8 - typ 24*8 (24fc)
 #define WRITE_1   54*8 // was 400 // SPEC: 48*8 to 64*8 - typ 56*8 (56fc)  432 for T55x7; 448 for E5550
 #define READ_GAP  15*8 
 
@@ -1260,7 +1259,7 @@ void TurnReadLFOn(uint32_t delay) {
 	WaitUS(delay);
 }
 void TurnReadLF_off(uint32_t delay) {
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF_LF);
 	WaitUS(delay);
 }
 
diff --git a/fpga/fpga_lf.bit b/fpga/fpga_lf.bit
index 44ef60365e23b68c25c2a068972265ff4f8ea495..7d9a840a33150630332b2219d4c4f14ee3ada715 100644
GIT binary patch
literal 42175
zcmeIbeRx#YbuYZmK1cFlX2cvM;i?HCM<bbx$si2^JA?@7Ah4?fEvoCZ^u2lR9Xqs_
zrw?uAG`%lv(`0KTo8iM@;?RbqzP$q>32EJS_=pYuJYYct#<oIfN?huUsp2XQaR)*i
z*_Pq`t$og%nUTP~?|c16pXbfwdE&*H&6)kR)^GjRT6;q?qDAk2MA|*n@H_qg{ht4}
z@pl&VZ@lM|zrDWg_dmIw?xj%2A1+G%kNXxTlk`ancO(}sX}3SxZZDzrG-KhSrMG=#
z>1_+?w~6-lU&H6Gzx?svNs`ov=%%EW;{TdS&DKbEFG!Nhe<uI?8A-zP@}IRNIn+n3
zpQL(=AK&0(NcBa1-wnR!$A-lJ5efDGH~2qCsxRKP4S8+qZ}1BB*m$qnsJC6KcT5tJ
zaulZ!4}gXF6q356k?tYY#;v(Z*JO7gI-!?@a0gAwZaZ;KFKYeVNLsJc6SA!kJ}i78
z-;=No8f`~=_lbg$<Tja_({zv$Za66dfhbQ2LKiMznecIEKSEDXn;XuHizOkU1T!y+
zMvB|e?2Gg^b-B^J&TSy%^aQ<`?Q$bIebi9>DQHj9HR^VwMSao}3VM;QQa43M^$Ak%
zajZwm@8K7IFt;sXziBQV!J9`7n}2Gg#{2bhfA$I6c)T@6VJR+S1L0GsSu<r^`H)Tr
zXnteZ>Y2b6!^hU<(qnQ#A-qYv><j6+^ex$32yYN0-g|n@2>paQ-Dpxjt%Pu1C;PI!
zgrcOM@ivb0fvMxVgaN)o-NP8^s7Uc|?W?JnA2m@tKW|e9=0|&t)co|$dYB%g1#Y-s
zocDy3u;>sqQ>IUx@#fj3znaqL4Px$$$IxeUlPHqSzt!6qETu2lLeOE_W5;XKXS{VE
zpS_RXqArPL8ux|phvi#N$Kl8$E8g;ctCtEiL0uG;x-V?ki*{$ETSQ&`jJG#TYmDBc
zE+?ARePL&K9=$oRG!@C}$GqQ?#(FwJZB95V#ysIG_4Di_NB8u{v!Xy2_qnO2wW`hX
zuq75dPc?n`&iJS};jM*f7_^@f4!#=pgg((o-=bzG-Y1SJGeU>!s`@;am&v9gEuo03
zzpkrw-}Qm1eST<gEca%-YZXTEYOPv}rkbg3M)k$wd0ON|vMWw_>$SuxU{>3B*Odf4
zWn^d%#ie+`8@pNKcQxp9Rv6lDvK`YxpS|Cjy|-%YJW=bl-5T2L6eqm3$Tf1CV4mA}
z!dvNw)PXkoxTjxn+B;<}EG)|R@V9nk^;4dH#jV_wHBIZbIiYo!ks<w*r(ba+PLETY
z4ClnSC%i6}rk<8x&F#yHQ{Gy{r|DOxSU?9&d(=##jhbg$n=@rU_s8(0r+L)u$D18q
z_qaKiekPX{qMP)WJz+whOV<V#6(XDT*912q^8-_CLbMpZ=oyf_eylddZJg=$P`{mC
zlz7jC?t1IBZ<>Df#TuP|6wQSGyynd_(KH<lHPQpL+l}|9T~EJKQ}pX-m_&`X%d{KK
zCFv1w-S@#}diGG+Ol277%ja^jLgcXS|CXewHepQvF<o`KM`7y<o_=YTZz=<u`I6pg
zzmq*UZ)Q<<S0;Jv1IEUZS!UY{L%lupA$eHF2==+)SlmX|Ol^})&!Z<y`&bBVytObX
zGR0<+Fer~fV@-YiB6DN4eTIG|pkGOvnb%!Uzj7a#+GkfkOOpodd{G~-RePTCYf>(<
zqa*rdx+bFxWL?IKvc0gj*wA0E+IaXCtH7^}h*3ti+1uU`wl_bFUyqY5VG~@h^Z8Ih
z3{XOblRfu(`o;Kl#ECiB&zK*xZ8$7zZQ4q0z2SU)(pz^2_%-2l)JLJqHWqGtTTVBu
zQ`A+!TJ)9i>t~E#SM+xnwhGZtG)&MtMz<a9Ur~WyZ#i9AsOKy6wuyD$qyK;=?5=e5
zfS&dAi}6d@L)9O*?Lv5`c#WP&p+6I%!*Y1N7{8RQvjuE;9{}1CrzDWt2`?6hOZqjJ
z9+eAn;dSB+gF-R9q5ivcXaG-^2-92BY4{bj^bz|Kby74r_z?dRbO-n~$tdi4aO_53
z(XTid;8^q$FgL|*7{8RA&*|8-8zZ@y)F7ybI#Q85^i-`E<JY6KK!*FoC<{GMt2uN(
zHB0l4>d$!gX9|9`?+%TK4*L=LVcYx@QGs9Vfk3UWroD*~bFqlfU~k+tlRZ=L>n4R?
zPFH5;UOi5)(NYP2qXNHzaRJDzs2jc{KH+@BY6o_E`=<)O-j)a4X!eV(=9|>vM8DFI
zHj+H{D*W0{v0n>Yp<Cqs)Sh+WUBb33Zo~NX6tz3yQE`QiSh0Qxop{p1#{2<azkpxg
zq6N#teLZKfxHdO#M4MZkaD7^6{2Jg_s$`#wz~v4GUmH&rQ8capoz}-~7{A!6V`nl*
zDJ)=Nv9lKV<?U4uzdq|kvp0=tKP4Rk@ZuzoE34mmUHqEQKxUg6f*<9IncmnHeu;#$
z&58}1M<~U8UQ7=HbFs=j*Tt{jb>5#1Efx<p{wp`G_4ZG0cB!lE1K1s@sMTQ5QR-NS
z{%r8^O9OtnUHy2%jl23-u-=pysa1_%z}z8Nt;5t&gZW98c5ey4YAW#SQL`ntEhqMQ
zK=!rk;@1Icy%4sA=l5dQ`S_Kq#;>or;i3RKXv#zL@oQf-e%)4x#`T-&r*c^;y5R=+
z^*CYS#%C$-3qDe9ir17X@#_tStqpoTt;{yqk#qX>@#{9Xj`eFZHM?eN3Vt2)eaL2a
zMj_4X^+^ZH=;N2o_~j->!=2(qI_R_}XLOzlrPF6~yW=D(@vG1^8hu*-cli@1xwq~S
zJ#L@M#ty-+yDok?T|@qc>{<!0vJ$_{?qkv7;H3SIxhNM&>0L1RFrLNh<5z0F9m>aS
z^Dr%?ZCK?JekCd}&Wf#T%89sq+-}RLo#5~knnneFJwb8jeR<%QvZ7`Dsw?3aumJA2
z19OqE-lorju&lT~el26zDguW;O5iCK_*Ld#X$)sX@1WBUbT`A_D0=!eoqrt`3EC#x
zT=Vda`BzR*C|A3YfVmgS_*KonvNIF(H-z^D{EP9+^EcQ&6L4opzg3R+b~VC2-;jSL
z^(*xKo!xGG@rL{>x>vuIMyRVEi#uAzub@94LpNaJzTt#vCNsqA@vlXs@M}E{8epSI
zaYOz!E?&B8NG`C!$fohH7LR{{h^@DuwK|VMxFP>?^}}ov48|`{zdZhRyIaTnRLxHo
ze#>)OmumpOy!9&cuh{v3e;Grxfa3kt{Ogv&jDRy97ISH{TyP!!_5OfUQ^<BCm;%<c
z3cqfbb?jsNL~K5tGP;0Y)A^U?lNwjQ6q=;Z5scpT@Jj)-rO%TmscXZUci~^z(AQ`S
zwe_1>F`a+;WTYr=6Ax1RC^*^_{<X~#KB*bCc2W&3a1@te6|BUsfM|e`8p|jlZ_K}7
z=X2=%s<l=8>m9~89}8Hx0{rTBB3b>${0k;7gL!^8{$+{N#sF>f`mFqxrfK}^Aq;Q}
zd@amRiGL~ls_xGi`qRbzDe*7Huc|)p(#M4V<c9o9>IDh?qKFLmS0#RVM67;-wo-fE
zd>8(e6we!jMr1smya9gsfrZW5f@8pf>*JS4#KgB@pWlst0ly62+En1z&*Z_%c$B#6
zd_Rl#OyOV6ZaKcu-*eX8{EN4w(Vr^*RoUj#;=K7K>-Sd9uf{L3-Ez!oiTGC<bmm#1
zWEFlPx&o`E^!;e`K+EgR|D5d_`#kjB^GT-hFFo&Ev@x!}<@qZ7s)||l>x-R#r|x}`
z;))ybuWkAIJ+zJ5EZFBM_yxA*akLqE5oa5IjN6p_!wUT3pxm~+NYfxZVc3ll|MKx`
zX337#<yR2>h&l;&{`&aE0k@VST@&53qgaVwFH(1gCiFL)7v)FqiCoq{OW$W)uEH;%
z)q0@S7+@<_FeiIrbQt_=bq0M_zHtV;V33h0S$|r76PRl*6uoqS60fYTz_0BBv#~0k
z?-`>lM(kcQPp!;=D4gl><A;o2&t+l#^7@$h94$#D@-6Evtd|qbHCN!*+ti(k7PU$7
z)E<nhAFwqkKPQ39W&S1KwmMeM+^;{vcHXHgHsn%&V#6odQ^v10#6|5?_(`nAero%!
zSp+U0>1{g{-jxpU>sLWN>~wf>dW;Tc6NO()iXF7yN#w#!)%dl$0JQopJ(m81!n!5(
z57DCo3)WY~5A91<(w&*qx6@DhI-R=YFJ#Q3{u#O1f(=(6=3nm^pTjc2#34ZHM2o-h
zX%?18$E)zm=yvP!`l|$5D&bI_prbNrN93X@`1N1<Z$3|eEgAl_IEUB;{KG2z`j%Xf
zLZ7eF1MY%C_)o-TWBX8xZT433FL+JRui6(JX(ozLv=@2?Dd)nrl<~`WOLWVVxrTA;
z1=*d0%l8^O)*;O*{x#ur*-_b05D+4Ot)l0vk4(d_FYD~{&)raI@Q+pSFQ=_9oF#CF
zY+DNc#=p^#V{QH5UlsWEQJU%CtMzomM6hwEc*A}w(|&LGTqS-TOe9u?1N^E_pEYj-
ze$7}{(l5oo?5+&D3e43I{7ka|`~1PG_#vXZ3`u8mz5pX*bS=k|>iD4xbnsvTU#(|!
za3M^=FVn>+09%sz7f22C!Y#)S&oXCp%s%MgfR=E=ed2C|pFjxWhll7X+3sK)kBKcc
z7<(2R&1a+4_|=2{oS>5y)WPo$kD>~{I{VwvX9?Z80NTZiqEIiuuRO1yg=nhplSq9(
zO*$Ms7!3H=tqx!-2ed-`FxQq3=VD-FwQUkaEQlXE1deZmah#^SnULULlAlo6sK&1Z
zqt$tNh!*sPQ{X#~iE92;uh<so()Z~~c3CdEME@((k0@5e58o0{nXLXgy_M>EDVlF6
zb$&&FUvI#YbnpG(N&TvGS}wFB<N9TX^C{5^{<VwU!e9L_{bG`aoLdRB>wNq%`lySJ
z1^Bg-*UMd<sz0B6m|8>#o!1^S7aR+x(gFV(VGC(tAD*U%w0JI*tbaC>cjI=rDIM@H
z6`xO{&sW7cnaq7Yx8eeAl3mGYri@=|bw;3i7ioN;%b8&}T(tg_mL6N1Z%BFeS+gc!
zNj|n5wq=q-a1yXJhh8)p6m(~$vf%^9dgrj!CT9%69%A7@D=3EzITHZ^s=zPhie$w_
z?TFPzl*3-lh&Ix*6yO&rwl#xeR{Qalnd^B(0KeRA_FYx@wbWI(%xVRL4?mpsBBwig
z9~;En2RtiL=c3P7s2jEpcH>EoP>ojN*Dx<rFD%Jb35GGE-$ke8N9;0wxyXNI(x8$V
zae*F}ds2Yf1kg%F6bqhh8L2r<5)luR>Rl`fLY=m7@T8Ss^ve88Y@t0)JfFUZjg3Ia
z&iXdsJKj^lzfO~z?O42KJM`i$0bVKfl~A-t9mSjad0a&ecAmP^(bE{t)l;1XjBA3f
zX4C-7_yySNFd}lW*@m6(iF{pe9Z_+cfPbB<0T(uNqw&L{EtYoMCXgn$mA1MuS<S!l
zIXh{ZLKtZ`ku-OS5N*9XCowLcf918g^dx7FCPH(a2X-z<#W#qX@4R0&Gdfi8ugg~Q
z?nrVl;v6$O<@Wrb=^Ue^ybk|D+Ka=6E&_>H?o@`cSczZ1%dnL}IO`NGaTAJvc^;aN
zUn7VgZWeVe{KGl)KuU!*@?r@2FFf({Uy`1tZ%Dw_CeW@2+<S^47B;7mv#ZK~@vaLe
zLy=G#jv|t%yq|Ntre*x1R}0JbtS#tGbea|&nwit%;*`@Nu@5WahZ6!}Ly1`K1pNio
z4C_CkNfS1qihrFnJ2pgi>91x+tfZ4@(r-atW+~g%GJc6I^|Ai=u7`e*9>7L2|MGob
z%Whd2TMk1V;Fkf$v8T^`2s*fhVk=F=*^Iw^--p?l2mGrQU)c`W)-Vmuw^x~?^*cGf
z>cEot`o;J)g0LaBUx7yK4s%Fi!VB~<=8Qr9>n!g>XGfoYmi5bt)^Ah!FYa>{eqkFc
z{F3maM)kACztHWBaaH&glVDo~k)d`nWlsS%0r5jw!mr*M#;@IuxlX)6_iKP!bl&;`
zwR(M4dcpkbDXYaXzk@cQoJ_j_c7%vM#_sv*Dt>rx(uwSBIS$&@=G1{(ncwsJ<Kx!`
zZ7-u$Pc+*C!<g$_AKkeEf~dx?98IRW3HX(y$)-iDXf~a*RiL$uUv$7}%kBHSP~3c6
z#`5tovDEoILBA^S>sL4$f7V<oX3B$ZZo*t5+G%jWK8ih75kEv2oZwl_f}-t~=4V7x
zY_p@-O$Gl#w2<vsJzbIe*GDG8bCI{&&l#}_{F<On7aDgFIp`;?XaS4+8r#f#Iez#S
zSlc4+J*U%)?8HR)X}o7q0roJ6AMT<DoaQr`e(?d?+<Tj2I${~^pxwjJuK>SxVMn#N
zW-<L4eAO(?0%D%nW2}`G_$5ud$;4K+rEDEDBWaDKYhT9L1N?e~o`W_;w(BX|mB~*>
z9@W2@er{dt4Eh}KuhWEFiGwG9%f326_@U<`Rq`*5v#uD$GV_{?xacqHOY9fLK{s41
z#SbO&Uy}A@!xRENabmJg3LW|$b72ny{EE|7-cgSN0-m5)23Qa?)6#204%=tbhyxvL
zi3l)<f@AIs2|-HR#khR^qPh)uGpq!w)r3;C23sJ9!D|uluXE6^We&{yB>jv9be6p)
z7f;4()t>kAU)^>D`7h&|Y(JGKuI{84c|%TMXR0=S{1DN?7}sxnsA&F7EORzHv3Mql
zf`=scne$)pnjFS2jX9&4d?>Paur;1ClOpEF4`)3>Pl&_-h79hh%>%y25Qn7suVnH)
ze*TNVzuvMH9A7{<6lEJ8E`Ll$@?rAg^IX3HyHRWhF3W3l8xQ%SxJHMZ_Nw?H!dcGR
z{EAm>yyqCwd2@j8i)3Vf*fMPHv!DNx;qBtb_K$ko{~=sNu4D%$989yrTMIA$wNZw(
z^b2$_lPHAqp@`UqbvE<qCDh07;rb2azf!RLXXqOP0EItRvAE{-sD&`S_i+B}k_Fu%
zJ%}Gh=vhh*C6anQmKPu9Uw|#bjsi_4q+faAAgKC{+7!3(>o+71ncmjA&KsBYZs)l;
z9FM#{zZ^e=o9cueF$za9F%tju)=1B02Nt^+s`u=e%70}Pet9(~=;~a#S$;DQAqoEj
zAFkg}o^S*jchKN9<@}e3pTP>&d+Q$5Z+yMQiytD69XC$V$8w3BzSR3IuHV3}qqS~J
z5qq_h>HrGHgmyDy!L<0{pmHXiL^j+?m#71RF1+6g@?U=rE_}pjWBc4{9Dz1L$d&6i
ze8w?}uiE+mQq1u&_FbaZTMMq=VCJ%|PjLP#vC6DZ*W~uc(PoZ-1>sLs{tN!084<cI
zi}ry=AX=N}ANuthsMgTDK1Wf%L2u6Q=7doRze-;*eldlKc=@kbDl%G)Utn9nFVHT=
zFKh_djYcz*F4u3&P#FaD8MN#79E{5VHrdOY7;}}L0>3ns&*j|TQ#Ubw#ab<ZIL}WB
zzfiw{Zrp_)mip7sYM#_O?!`QhdwNk_zhQPd?b+~f{SkV)w>>*}%G(=3{RZc1d2y8?
zQiwmGhy3@zj`?B3A3|8luob75fM4cVD5R#DO7$D>CvjBfosAUEuZplw>&6$uQS|i-
zYztflmY?I{x4PjDF~|L))qMKabtU~O)o+A1VMkq&%Tm$L4$h@-?>ji2n9xI>eg*X#
zl6418;EqEr7maIn*Gn@;OZer~a2ea8vFOQ$H|Wm>y6v0ZZ0VLS?p#z@Gu~o(`laeO
znwpP??@OOc0a%B({9&k5eq$jVMMuo{_B_$U^bCE?UEN>n5$ABSe$L1s{q}Guh2Gda
z`V{mFX|Dp9=1DqWB;*X}m+@6<9S>zilegzp{YLioGt9PnReZjv!#>kv=Vs=^{%?8l
zLsglEHHDi|#{m5^ZHZems{8RVuHQh+%8e8U;p$WO@edZmov<w(ZsaYURw^5gXtc_0
znNt5c{V>~R|0Q^e0g!S5zP6wL(zp#wffN@VBwu8hZMbT)7eq|07wR_v0UOy|NXh{e
zFm^-~g?-c{Aw2ym)o;MOV=Y9N8!k3<TG!~H8zG&9dQVWl;ZmM1iVsp0_RxSmbfd05
zep5fsp<8p=IxQEaA|or1_L2-_Ffzkl1USfl9TS;>SgJQu@0D$gWW=kKk(K-_Q{y7P
z4huk79m%0ig3*&gVQ!g!(H6PqXgnXXEtGA5h~Yh3wkqr{dh71YeuZ2oxjr&Oj}4Ci
zPPPv{`>(>43YUZU;bC3^XU8ba`&F%b!`fke0_&r2IpAO4q>-ME)Q&IcF?!qTD(o0&
z`5{+^FxZWH`ZZD$UA1j=54?+2GwBJp4FxJar;Q`6sy{*eu*Z>>y>6Qs17cC4DI5~R
zTp#7amk9D-w>z5$nhUEp)_-v2q2UEKfb3=GscdrrLcqU}B}e=)+N={@>g$v{R3Rci
zsmgzGUCP>iUM2(ydA+P_mJ&v5Q@mdLY6=`SbYLz{W7l`(A~Kw$f51M(xGLg@n~eoW
z!~H$y326csftMzgUxo#!s6XUv7k8B)6aiaNv017<m+Lpgpp`fpzFnNQ2DQXQJSn0Q
zo)wQh;9rO71?rU1G5u{ik?GDNFZ_ObId?!#;a>!|Q0j%$gj7VVfOv*_Qh{G5a~=JW
zto|W_;6xwRQ5PpwokPICR@M%<d-^vtglcQI?A`;~^}bePz^LY5@Q9pP4?`Qlbl(l?
zk)Ur{9tR<Z=g>5K{>5K01b}w6=C)DJ<1*Yt;g`?9Y(>P_KFe`Bz@wPLzoMgv_bNxR
zZ^a}8#ZyZ7g}6GievE6(Qi7!~rhmkfD*k0=uubEjU5#9}5if*n#xF*+0Kd+P&Bj+<
z@UOE7V1E^^2nP6N;IiV3N|&2v9|G-aNtu^oSF8tZ2<K`sQnQ+Wov=?vlFpj!ieWms
zHF<9&+j2|fJN2qRLHzI=#+w?CViD}2^oAqfluvV?gZSY=nsgR%-B&U>>2{+gN4IG_
zRL#HQ=7Hrg54Jdvh}fV>Q~B2#I%tD!EfjSQ{NC?kYei_!XwF5}HQ-+sqDH&5)g!_p
zIA*lEAlBeLQ~B2wxzLXGhM9jYv!lNio-6)MF0A5TIr<4Q#cPudp3Pi4<RuqacY^rg
zTZDSHR+zyK2l2z!$U5-2m*t{DCI9+!ddzAb?){XQ<7{4zGRPh=CwspIV6EU^Uk21R
zyO~dWr5#7jPuF+SUzyeX>jdRdHjL_U(E&?u#%&R$fn1#RE8t&JPB_VUB&0VJ%%BDL
zseS89o*fJL*N^G#KE)z0I&Vt|59=2tJO3D0fL}#=Q6P)Q@OO<CxzPgl>Ld%r68{=7
zevdNEZT0b?`eqya%UXRvTr~E(${q&%YaVSIXgdiHpOY_ufPDhN#+28lq+fB%hXCeZ
zwuTZu*j3MN1pI3~)CxQWYNhyBRJNdUj}CC31O7D;0_}36{rY+EuWonSXu~A^l)8_i
z&lUXZ9fqwU$~Ha&0UPoii9k>xGO8yvr5DV<j>xuDuh-|cS5Qd*&d@$Bb^$)E?O_4)
zFZhRKCg+*xbAtZT7S997Y_~W0z@Ax2wh5~K&}vJ;dv7(Lu-i_CvppASALIMso_q<v
zxW2B_P9))eLw8aLVqBzej~pl@c5Ta6@h=CXP`*SCaezr<@(Um=uD*#<{99Z<4?mMI
z8;KPAy$~+a>Antk&7ms(CEI#1oM!lk^CZm0B%K?W@0z*#O8(W9h=muX9T+bVF~WMu
zLhPuSrA?l{!Tih5CH+_DTk@9F>P_`8)0eWh7JAQ#UT;km|DsMSyeQo3T&B*Ua5MVz
z+^mj~HCFg8!ChAT>m31HzE3~Y`wo4`iH`o#JE?1ppL5##^lS;g*dDgoGxE)^(l#;I
zg-N+6Uj%+d@+&I%*ZqWCNxwKpT(-eM_@Qr5^U-*}c*vV)=3n<`+P(S>AIM&igYv@#
zb4dt$j{C#>YfvVN@S~2BbP%XF#A*7Q#=jmOS%UYdH65Rw0iJg6tIO%*J*O<xKJC`W
z#S7Nsxs9*uk9)rb{w0w1(smdnU)|MRbHceDSTInDUn*wRfOYpE00|=tmfx!6U#QmL
zXc#D!F^`2Y>zk>V1GKWs{A-KGZBXvz6R|M{GPJq3f`6eh7S)DZ8$rZwal(D#IPG4U
zb4;t`A2R<s<)yt?zp#;9n1T_lqcL%RIN)Ey0<gtPFpNIm>|n3{fc|XxGN=7)z`tq$
z0d%{wjYD}D*YX|NPma;?4D-rxt>@3H`gs*CtS@r8m&QcQ*f(HPudJ*;e9G&p;*1Vp
zYnTSioYQO73Qtc}{7`<fHw^v-A~s*m4}Ft^sM*T;!%OmZW{9dk+-J<Q*^x@@0&!OQ
z9@qA&CD@VG{|&-Y_9f7GS66CneHp(HKV;g4_@V2&A})<M9h8vZU%Y+5txEh$%=h$*
z6JalJ*&~q=3we4GuW^*QK+I}6aolEGGIpBz*HP@cRi1w3G>iGyG5A`afN%>OGjU#i
ziJFJwpAs9q_v|xO{tKBS{Vr8M|GzfrR|meGzOS(6YWR0O{W3q0;}Rnmp4B5DBlFl)
za{YYQvmeguX-~hX<}xAMm4g|)YJM*L!NTT=maDNB;Ln4{QHg(Lxj%j3`vk`~792-^
zCY{an*f2Eiuf07_lx2=Dv9*{pqVwo84K}G9w9minMx<H{>_a>DEQkm4%S&RXtpRE+
zfO}><{n|GheU_aL`s~WLlU>8nrv@kKq+C=;^y>ltDzK@{B25{<7OZFrjjQkr%%vyt
z=87cfo97$TPqT|)HwH`m3tdOnHJi!6uS1~%9D8xm`d@{(`(QrcUo|#8ZXq?6t1q>w
zy@>b*)(dUCwJ@>#j0JHkMk?(E{&kwZK=a*O^CkTv=$98>3-f!r+!uK*-UObmL7YwR
z<NZ_0e_@ZQcoakJr1dXe=L7t@LjN9r24O?JbI-riqGOTE1B-K$Q~1|~zRd9L3(YM(
zEmmeYHp_fKv{;8_2UpY=ym@B+1*%BQzeLWlLvc#4p#!4Tg)dR!U$g#p<u;m!N|lFD
z2uv|9S-}oB6?RwfuW|cnD>9_V>~XWBF|t)p^j?O2###jY>yY`ghn^Yx`y=mvf!=ny
z3ei7)|7+Hy^*J73z`yQCwD8bqWU;<6{jbz9itt*iamrchy~pPH8G(MWmzx<7Ep(3d
z&<^lLW9xTRe**sH5NGk?5wQZPN*u`{krBHc<s$|BYo;|QQw4L=%)hc9+u8ie`<DP6
zw(qLuUx>WXA@`Bw;2Qa_ly_T`x+K@y<bH5rx&9E<h8n63k2dtzp69Z|qxv5?R~oDN
z*BGLX%1Z(K86EESe0@v(QCH1Rz`rsy1PJP-kVR*)EO7_1ru!Qfx=^Bke|<#^$!7b*
zz2X=R4K>?wGxR=VyPU$mXz-}*0?{JI7rziInES;{Q`T4WuW!;R*|Dqr@4`P!pTe=P
z#3SMP@|3LRU&rXmoNn==``oB~#Z<?>5J<F_0>AVM{Q6;T$%Zyd|9YBvijf_hXTX_s
zqB|?{U$iA1ORd@|=7}xK_c-zF`{vP+oI<oh8NdFPKJ0|fZ3P*T5Kuqw9BFLh99fY6
zGIICFn^(=hYir|y`{TE+3f*<AF{h$)mH96@Za;3$OzSy$%3jJsQf{KT+~<IQU4h1-
zhl~Z6==N2=^3WGcpiqfl>a^FW-Ux?|kA1Z)rssiZU~T36m&N-KF&Vol1AmnTwKFUE
z*9rI%h;KAuDZv??xCNfFg<2WNj+OCiiw3lMNPLL4xv`YFD>QE!|9TbHuj5mRtbPlf
zbUN;e+^n~XlMedB@xu~+rQfulPDQg}9?sLt)d1hL)JOyVh24v^MM5^%=@A==!Xe!j
zBfV-(gZx+A*s9sm{G|9r>wy_DIlmAxafl%%;k2JB;ny0NxEy;;P!I>MERwA>=t94i
zl=&A|r`yMXXkMB6)=y#VI~?XR>G2YN&7^0+wi25_m!6gTCn8J2bB%8geYA>yF>H0Y
ze=o6K5Jsbq4ql|ojA#}7>nd@!tM1L!T@V%)6BApzP!O`Hihn)qY_@JY7GI&S>)DL7
zmw8`$PWG`yid*@dh-f=b4>hlxL9vLCRx=l$G`2o%?q(fyp`7^GjnA6{TI;%u8S8<O
zu?z8Js8$|um41zs@au2sxm?Gkx<lI**v~nOijfJeoqmFe0$K(9>jn7}8>2V?jQh#n
z&XMSW6(E>)*HJ87z`rKxd6`Tliuy+g^yDano8k9<%&ohm%auv)56*uH_ViYfXtpzQ
zkDJMhy@YHR16e74Sd*YF_MTod-vi^>7;{5Ow8;RQ&?Z;HuZY^BCLu_SaiQF+$G|G9
zah2kSs6SNU2<#saF~Dd)2+Jv2>el6TS;8-lW^_AifnOjN$_!rN$eX*iihrSgJ{2kI
zSK+sSc1`GAgbZd5Ppb1@Df1~p{%dG{GYUC4koe&*o0Ii+3BM4_C2*^xU;#!iS(|}=
z*$=>%h<W;@&M%9$R6HNMXg)#n$xN&HnJ)okNzZTb>gPLC5r*TRP?8dhx9z24)PaJB
z7OTv^uBo#Ox_7{>eFU@%BbDtH_@(yh^2h=GV*lGlM<jAkx1Et>QsT{{hRy4x&M(Wh
z@z7<s8BZ9oSIkULowLntkqD**_=WgJUjq6C>vNEDqi`;Ml`V;kFDb_l`TTNwA@s+H
z#XTllaBfL_ineE)b0dEuMl6SaOP&8h{%cKg#cAg!c5*nP>Ag62b3me^<BZ@Yiho^$
zKYtU>XuvI8RujEX-$_>`>QXMR7_Cil8$bW$Mh~mw5?!22!n(_j?UAK=1^<G}C&Qo8
z*<W4Y_V(BB5?`ZR)BF05)qC@-@?S%Bh4(KJ{}p`(p+oMJfL}TDk3~iP>!3)Czyskm
zMFCh+Y)5=PK42z$s`6jmU&X174c1#m*Wm?rIAovdL!L1guE>9}i@sLssm2NAv^OAW
z!tACBzXB|Hvxe~t<2p&5P9$52U&!y=72dh$2ljr=US5|Kx6t>Tw&iBFrvkrJ4k&x`
zn016c$@p~}J?J1<{e=qrLRl1CsQNv_=6)1Kg!wGhpHpI;S&3ipMZ0KqdIeH-MhE?>
z4BJqA)c0247n^rge~5e>wK-cXeV8s8T`Sk_ti-SKxV+)47ph);RIlJ)d1^znu)fF+
zFoh)iy6q4$Rs74ZHU$6D+LzB5MPlWCLdKanqrx4<zlhJi)#L1&*3M%Gh+ArYYQ1&$
z&VO~`v{#D<wV2*v%yXBM$WG;7(K1KV*JGreIKLbY@GGZH+Bgjd+k#MVx4Fg*_hWt#
z5hA^eU-bAYpj9qCZaz+lBXzdE!Fq|>2I6}v@Qd<Jju6%W86hr2#0SwQ7?4W*dPXuj
z%sa0=D*nKo(GMc_B}y>g3Giz!9g@wd@H+jw)*Dh4a@<VE<+AZaRs9BFOGa~=%GGk{
zeuS`TQHWTMA9DVy+m4PmT(+*tWv{4$kkfJ*8^(ZtJxmB=x~qQ;l!^;W=J$sfSQohQ
z`zrHaP`#BvtFsQ;xJZpPV!hhkcz*~sokwYV`DN5g2vvyK6uMoYI?)?@z`q`0`k#-=
z730vaP8-LTL*i5pnXIhtb3K*+(ojm82QGtP4oC0j#f@~jYx8;vHWVMue*pq6L`PR#
zrK<)CZ;)?NL@aWs96wa~FB@sf3kKr7ZZGNgQf3Hj3p~Zof7Nidt8EBv#+P#&^HCAc
zZe>Q67lkr@Aq3~Zvl_;lqW+M?dLUW?Kvu5b*a#P*jXehxJRqo>$TuX!bHFCpXSa-B
z9>*8n^%M+bJPJ2jg<tA)`8Xf@k_)+zqXUjdH~SmKl}azT{t#vJT)z>CZ%fDA%;6YF
zpX7uQ`fT(3jMNkuskfT>`qr!$u7MBfRj-K)1FDTXJI8HgJijN7{MY<}P);OlkEq^N
z^stF$p9a4`G%Tl^fGxm{4MEjaVq6}7NBxF*?V;|m9YvLQ_=r<C+M){1d0YYi$^p$$
zw{u9xv`D=00M38;?-}*`tZ^F727(B?HZvO2%^?J)eBylB!yVLbz>mr~aE+i=j%~xK
zsD&?)aADPb{#Ae_u9Gb(b6m{LY?dtr;MY>}gK{GtFX%N9KgCvxH0yj^G>K@OZrIOK
zryE@;&eZZ00>82-V_QZuQ~D<P2H-fF($4|NK8JCw7`-XQZ5Y4U9%7Zpam;G5jKo2}
z*{j4(@N?^2f5^5jo<e;Bm(|7l1V><g&xJOfF>HR1q=%sI?KVm!uhI_rp+cPN5B*z2
zTyK7Q5#QiYu$dCBBWJ}7QxoKHkOyP;-&3mJz<RwVPRZMIk$r$sC=sm0l=?$u>%8Oh
z!`O#@(5Zrdsd2H*JV{G?LAzd6BZU<W@?Yx}OvDk3!=l9QS+%pr0}gPj3jBHsW1o@5
z*qMI;o31z>qLuNB!-fl-Tl;u^WV17$g%ba&;pqwLH|nHbfPV;Dk!uP19PlrOfX-Dj
zvkk+!OE~t$20!Pc)dg=q@A~){PGKK#U~R_W0qv*ADDq$5GZdFO;k8*p1;Ca~afA)w
z%EoNqmkogtt(5=jtr?~x(oV%K!QoI4v8*r<lTlXUObNff!I2z%mG(lWC<ACkW5rKj
z_3^9b2k3K$>W@5Wcl1W;;U|0#I|`j2_txF7Kg5%ku@LG32(aaW9ooF)wTV+stsu~x
z=ckJhHuM9nIRE9hsfn}slJT4vseORjo6SP${4&=cs*hK{0qe&;5)R-<(+ahf_Sh*;
zcXG4lup2f4v^wu>77Mn<U0?w_X4ucZe(eJ@Mz#DHPJ3N-zb%*TLm_=|BgZLhe|${u
zE(=7}G)}d2-w*r(5i^wT`1vodeuGbYt+*;+26wlegJTawV|zGSiXT2qA7M!9*PnF$
ziP~jodHvave)*iJi5^xx1k@r2O$#K-HdG*y`|RtNs^5SOpOF-w@5!cqe^01GyigkZ
zIYZ&jVby1KUgoOt9OftVu>N{U-+$!oAFqC+%bl4Yyl7AKA%>r67_)twP@oi#U0RbG
zS3X1#f`gs!mI>rs<TacIfz3R+(pGJZjkADFF8Ia9nVHt5vM!I!_JpPaiDmpUo-i1#
zI!>G0TH1!TWbcCWkG}=}RiHk8PwD(JyxcV~G^k4<0GV$$j&Te0r*0!C%rZu+Nim{z
z$ptxH3)rz8u=Cz}<$e*_fAqP%C_V%J^)cDb24B^0RN$A2_ckNmTTjOa78bT|0{?o^
zUR2mVp$Giy0#bEth1G{wwb4rw=dv?G%D+F?f@pmx>CH385A!m?ev|>#^MWDvpluIh
zXLe})+-JtGCj_Hj&wTSQX}-HPFCM|!x7aK33jT$%dDbRNC*vf_DKWqZa0fyXPt<z~
zTAq+6N=LB-78mSA8JAV%L$Rd-zuuCF*nc71>W<h4A`uDy`8i4g=*#@ehD|_PnaiRE
zGjUd;1fl+L)O;%ahUZHZY8<v~_{$<p1CGtfpa}2_vCYLL{Ia!rdNjLWeR!R?*?B<T
z+G>u(>Y1Yzz~ioZ?_vDHZ5u;TyCKr!YDptOIuYs*k3}lthk0hlcZ7dU6rE?NeHdHo
zs)PCs7Dj7RJcs*g3iLK2x2VQ6VdwKaKNrpC?2a=Kg7{$;{$VpImk-CjDCCHu*u23W
z>FviMFZCW5_ywxSJ?tV5B%(O^3~kOekKu{$lX&=Lv-?D_Ew($~Gcxv3OhQn<!RJ#t
zWCCu6I3?h3<lsWUbD%^OeofLd_KuN;qR9@GSBNN{wx;nf9Q#843xS2@5g2^b#R2iF
z@k_S#ug=!D)}m~~fqfo^eU5DcqE+ITZ0`dHS&Xk*9258j-)|4+fXeYhg<pWS#`*`r
zze0WDrvOB|Hy-$h<@&>L(qw81LtP}dPYD(Hg*C-q)h=3>YWdh#1JKGr;I~|V2;6~J
z$@|&!TQD3016+6v!mFM=<owqN&}th(v$%HSBLw`)QI29-ovaV)H^$h5b;6^u#m4;u
zE%zYx+=?eEkQm_CUg4wFVtNqyQ_RmdIRE7U%}@CFHH+N?)~~Q(pz6)pt^$b=BH4y=
z{LuK3S1ms#0LLq%Uw~~<LLT^~_7B$|GHk7t;e|uY&M`kciUW2eQ|4bLZMEAot8@AW
zk#?JN3v9s6OZ3fs=3fK99BgM*f0&kub>ZZ^IvTW7tb?cFL)sG7FR0(>Bu?Xo`$V5L
zw6etlC``&PC2s|SRPwJOxhxmn1lanvT*$|kUoHu+VgKTT`a?01>XK`Dw=mCT=U=|<
zbh+(cujF5o?lQaXPa585;9yZ|&8C(Q+Aq3`3X$`A1%7cEN#?G>yXl{(S)v<rU^i}a
z%|9yF&nu25%s-4Zr5?6Elrp)tS>4gmhfQm9e-!^Jz(2e>b|-z2S~28w#NI}&g}B}0
z;}_Q-qR)1uRj(EQEFYDLL*Y5%MLOU@(O&n~l<^DaQ?fIM5CNV@F8vgOGmLSa!_co+
z;56f-_?Kjx*|0eEB9~!vAqVHp6K|mySheB%qfp{-05@sOZ_3f)<)Ng$k^Y(Xq~O^5
z`Xy@;blAqp-&~qqte7zKDp?l0pmfmT-(vh?zxVwVifDgB>)lXZY{UQ&lnde;g!thE
zmSA-bW*KQ^f?4+Z1HCBdef%Eam!D%@F=^u1vb&?$!hxx0Tp0Wy|8<7c`L7ZEc7xA5
zfG>BN$ih&xB7XQ9q1uqof6XfiZM*^O@K4jWH}*`;IG~p43GfR7nKok7JPH)M2Jyq~
zl(F!hhteowX^y$(KJd81PFot-?Z*#kHnhNmmB_#?9FY*VV_d3eEswejAHSX?ctkQf
z9-b8M&@(IB3t?1;T3zeW=K#MRkt0c*CmPVl9IgY|u~$#X=XyFuVdqB;o9Bn)hYDpn
z#f#3t(ZrSTte!6TyfL@8D1!Lm@*e5rtbOc4sNqCHP&9xs7S88iDeZkDsNCCY{u$zj
z>LRHP>ACh$rr8D-jCgw5Ynl@L%Rx25u!H&y8EtNe2!;8T^@s3?m>sY19FM5G;=Da+
zbq__0H&x&l(7XVelPFOb#Jb^8M-PN6;)e*!L%Zwe7|KnB?<Wt^Jx=)3=^%diH0^L(
zaApl%^=MZb!OyL?7Q#!*@x$k7&_VcmNoXb=Y)y==Zc3k~C*1fb_*W1={4!tx>M#!4
zb=5&vFY4n!;V1Thf0g5ha$<Rx4Q(oLpBc6wnDbC=rC0DTKK~W{ivFrZ{o#hlS9Dlf
zTh+x0Z;x^P{Fa{BJ=-3Rod^wV&GqlwC61@JNUpC#!Jfry%J)ZYd0))gwo~zxn1f{+
zV~j(aa{WBokev!!T>gr$pjKnKfw;Y@`u?a9ps?yH1j+U}jYN-$gUmtw##!-Gddi9R
z!7b!KJ+|K!<DK|34hrf0`omo{V*+^L0>2PiRA6`0&GLDV?^MJOnQg7k`F0h#t7bxh
zF7vP8{-~Ehr58A`;b%>(sS_R*HNY<*T1EWuQNWgech*yOdn$ZRv@)XcN$raGA^Ot`
zgast!aL8+Cs1+G8z9cGKuHQfeff-o~lSf6(hWQRsJSo?29AMjGMvv)9`!oWHk>k1@
zAF<Wq2Ju6a9=F>LuHIW8ms_3K9@EzU)cU;BCUxdt4zHKuUna^nJ{qcnTbMh8u)Lsj
zeFAkMXye&2&4ND${OT3;n)0;@;%@r^0{{9{1%6pq<O0+m!Vgyl?YA0k7ANGgLi96(
z0e<D6DP2d`0=5hm5R_wY`Li6m2>6%s=WY1&zOYX3(5_~?$H2eJ@k8e^2fzM5#J|vE
zu?3@H2l({{_ou%UKeWJ&aa#FA_|q}aE<S2q1ZR9yQ*8iUJa*<^c?TBKWJ6#k?9~Zj
zBG!W=XL(_Id;ak3eKg@hchWj^)#(z^T0KsO`*5hdSgzlAmEP_}I`0s}mh3tc-8uMU
zny?Z)t^y_bx3YYG8I{aCP>w>^axgLlz0*OZrMspW)Xy91QPt4av091?eTVOaLv={Z
zkLP=1Z0myjS1ZR4PlgYmjO_`hZ6v%qjXNJ~uZ_2+rV;W?CEevV=CuT^&I1&Xd~x9)
z`uQ(ex4y}Xz_civphaakKI=^lJf&YJ-COq$pwG%4f~P29w52!;iUtc=#xG8LE#$Ca
zy-<D&F5;joQt{=Y=O23Kzrd0XulRinfy6?cy2#h|;)mWmbNwOiKP2FnseE<iN8!Mf
z3tM-g#J?Uv8y;!>dbn6P*OnJZs7b{=i=Hpx%!W0V7)5RySLJy8f)|C?BB<X0er2Db
z=qR|bKfr)jmhp>ufg9Pa$B%)YoCa(m(8`woa3y}>sI_S}VtW53qm}@RqIy`yFTVdU
zM`nG`O>E4Wf3drnb0Gxv8*}L?*>VN3xcAXFWHXbRm+5Iw2=FUHd^=^t3iGkAyo+OB
z!<^t_p(6hUv~m$PEZ5s$fT(b*;9nd+#JG}h<Na{x>m?!JUmQPdrnnPo5*(I?TB#rg
z3unA}=KR-_@~g!rIBv$~^nyZoQ|v1FG0&o>UtE892tG+K_*X6J=XoiIX{+?(he|Iv
zeu(OtJn+;6?dp_(t#NuGhr=~h{0re4EqWB=nlMz_t56T0gwde_zc8*<5ijl4;Xq)Y
zU*T6({1BtEkT%^d=R2TO96tm$?GlCZ{f9@WWx2^Itu3v<Ca;Z1g&zXYI;_il{_83F
za4OXIzC*Md(-gNbF03+R!7+`S`0+!yPZCiG1~SDj_@E{FT;^ZKC3=#ry5cD;;6!tr
zGh!`4{XCCik;BK?0Ay-h7Xf4k9qit6{RSPT+sTySly%N%fuMjaRuMns`wvxYkjKR_
zVUzoeh@#i$e(p2pzmCxFxES)M>3<TqC&s=~%}<$s;r^&gHo9TywIE_JpFGce&JLX~
z^DiH^!v7|G{K6=v;8zZ=2&M)2g|rv&%X3Z+7?_^`zqtPJRvFrhu;CtxN$(;KigCoF
z62GYRyRaL=R(`LiU&^}(@M{hs93ewR@f4wq)-`!QKVx%7EIsb6sdxY3Z8?>$IwAMl
zNPE3ZKXa?==O01+{1S<<;c50I*rc$vdD_L;ef**twug)M;<m#s;`2m+Esh^9dIk9}
zKYyXle^GM;adpcH^y?Yxww306mHg`&!cu-G-ARC2VjXlI>uurAyPkeA|3axiqiM%9
z19z&he({r5wk<*Z#v{PoWESU%boZ#&=hx*m=3mKj{RVrm>Snx)CW2R%H!k*?7{4su
z8{YlBSSI)d7Wmh2q^OK13W|WsD^(ljUk53cH2Fx^KAIl`Z@S2~u26|zod1gDka12}
zIGW+&D`hiB%r6MLq+bzkLs)LYy2mNR<5G4tz%S-s@VW_Vo`Cs+K~rl1p|bvv&HFNf
zBR0y;5=Ff}f55qEw2WUI4qaq#S7|R=lrzW6_bn$&_;rn#f1$22MmyYC%G}ozLtYPo
z`V0#8lpV{|sA_r5q#neY8g0Ub6(*%Mo0@PyyNq93=)%eP*H^{Us{Sy8BFrsxuZ#DT
z>o*LSqeiB#+iF~KodX^DqY=BzzaF7$E4x$Ckp|p3jI9k{q9{}#akR|8wnIIkr#tml
zdY0q-5(%0S2`0X;j9;CI*~ALSPPRKcQuYDp`|Dt2ZN<8WEAY#bnbw#Yf?GJ~;9Bfj
zaa<0j5@%*u=`wza2ey1|-v-7n<i8M$t35+}|KW@cW&RZ**It~CbPPu9K|ARn;5I_X
zs8g%6D)6iJXY|pNYx`UHyu&hy3$o5T?^w%*tL~4=odVr95s$K-ivy0Oj*2qIWem_;
zuijY?sz?ROHs*-UsojJ?;wY4;nV>sm{E|D;E%50?mo}Jd;X6ZKLm}cl=)9=FufY-9
zMWnRO9@OkC1SBc66zf+-{P2Xke`n&A@JE4P2W6yy`uS7212R#l$bX3m3urZ@zXA|{
znjwJi;lzd<slYFxXxA>CuRT2QyV2~R!Y{r^ssg{Z4C5T)+*qx>#l_vcj7|GRECs>W
z)213jY%%vZ@rOd79`QZ6Y)arTFN}G3w2WV^IYqm&0wK7#f-OE|ib9UQ3jC4?Ye>v0
z;v2S4#1wwHmH72DZJD!n6#VN=TIK+f#*9l^r-MFM;1{ZN7$%0rQQ$=@#}6-2k`bf=
zzYvPiOnFy<GHmo@PY#F{qmWz5f0;EZmFb$`Umkw-iJJ-k#z88?eJ<gbQ0KqS^jt9^
zIEXPG;<2v`VeFpY!u1>2Ej^LH(*JEpDabC=d0s-tW>(^t&9Jp&SIZCRlKJ#{9**>Y
zY%r+bkaXHX{l*D>p@&~Xa83YZ0v0l4*laW7HMdfl?47H>E<$j7?3@`BKN{I8Vv=6f
zSCQkj`4us!<zTu)Gt<zoSIi|nVEv?aU5NU)O-_r5A<?X@?iH3jWbRHQv3ptD&J)!u
zHhAx0{5l~Q+B-b{)f|g#TJf^@w%nfrkj)qT8g>6XM&Sa#F4CX!y~H_9IsXzHGQh95
z2x%|dc&?!XZv3KD^ql^Xh9``S0sq=Xh-VI)|93qn=5`D4uZL;KUeFt=sGrY3<B%i!
z!+B_9H4laVQOu&vzq~-8&p!XM8%Jos+}IJP9zl5w`TaznCn*ybaP4x&v#W?7ic>4Q
zL?kn4v%_#-bg`aT>dMYyWPh1|!KdZ(Ux&g!?gfw$e8>VWe?WjV1N>6<neprSEb}jh
zEo)Ia%JmySOQ*M3uHRTgKI?zQ$(ym^a87p!!2rn)m1FT7%9^;?x)QYOfcUZY1nqId
z*?OBYzZR1SdKbL4Fb$Is8L*K{0<R=nB8<RQrnWObS<)}U{TnB_hj4p94WVDSA{oZA
zgJ#Nd{l<j2s=<5j$FZ+xG`NKh(qPZPpRX$h_@(jv^WDss&p=RRqTl5eEWl<4`1Lv+
zPAj&>bZI`9ZQvqA0&lX*_~o7dD)ku~Qs8nPf>U7!_%-Vhc#Qa47&|@T%y&VPU$wWP
zb_M=e8NX<vpduCH?AW_-A^u%3(O8=+<JXfkDZ2NfhbnI40+)TEP{yxEU{ch3en_Vr
z^`0NobMRZ%@Ox}t3yvQi5p9o#_lYt2z5d&|KVzJabIrd)#>3$@sNcX6Y}_4gO&_-h
zu*Wd2F;Bn#S}gJOi_d=@k_%GrUngFozmT_p%ZN8TBDMh_uHNIH|B_LA5a&igyP!nK
zjDRl#$m#|ElwW_??cDSoi~{u=YFv&Yn1yow3$bqMdIc;p!A=*?4=U<=;lSkdiufVw
z6X-!4K{UBg3clZ2g=lpt#QjqITg<<{CEJ)Pa{b`~?(=tTTy#?~H<aUt><uPpMy==}
zBsY2N7YK;&&aiQhhtdn?UstIs8`&FPCEo(=g6_O2PUT?v3l;H0L<?2fd>(!j^b4ET
zo>sr1`Rg_2s00o30yr>EWZL~3+p@7&&F?vF&djX%0Y?=3LXGhKlzug7t>7Skz-V=a
z9_0HE(MD`>Vtu$AthS_I2JKg|IF#_A?9d5W*sEAvCzLJ4H#q-w*zYRTT=m%n5zAAA
z%JIW7xKFV27P`uv2LxR4{{56Q+bZx2r5%iDt)&eK1aUh0Fs_RDA*W+7v$pvp1nB#P
zGzypzkP8LzLuQC7e#pfqDr|VxzTa+k%)8Pez%S@myAv*gqdi4x?86G|GJTctL+?m3
zpRe>fHfF1HcJEq$hylu{c@zPDfqyZ6xq4ChYx)Z22Of0=elh>rlMBZM-@nl&XXf;M
zu#m8a1t6Nk`;g;@FmV*7T317Sp7+=b@FDGj8AqEwZo~J_<9@c$Fs{H=MG=6B|4Ex2
z92{Pc%(cU97{5?|$nnFM2p36l+5B4q=eBZ)##P`KcAcwK20VoY@6s3u0e&fam_s~V
zU4&Qw|9XR-2aq8`72uc3Z8>J2IH&pp{laEz!dkec_#u&MBh6I$Jl0F;;Hb@axZwnP
zfM19onu#9sW^oM8vl_c=t6TW2Qv6WmzueBg$Sxoe68hX{*f9xxw=3}r(TpLe-bDw;
z9Jq~QWG<dm;1@hbCjt-OMDm4g%LKik5@BIlsdQQ8zi|G`+zS(j4axR!g8q(LqzR9<
zgkQ+`c(?VAse@o>!@3i5fN^$7zam&ub(U%bn^ui$7=ex)xAEhLUj9p6ujF@?sp1I0
z7J5Otx9<4&QzpT`c#kpv;yx>Z;3$sQ_Vc>q{wNE>IhHsX>LLidUX#v?$wh928+&ck
zzyH;K3BS%~u2liXJ92Y>%N27{6b&`@5yTI<!UX&)V)>;eo*&h_xc>4i?>)#xB6jM=
zhe8P@VC)yQZ9<VyKYmCYKg8C;agxA3qdtM-qIvzOq25!_5I>}4N87)n2k}F7K^8Au
zMf^~`2iNkK?EFP~PN?_z_@(YYq;{sjL4PJ`2Z7@kVZ$AsAI2{=E{S6){<to3vK6u1
zdLO?gfM1V+Z(wJ#uz<1P1^SX~WpwDQsGkS@PvrCn!iI=lAc$f9gSFU293a52N4Tqe
z>d>16CH#n%VqAlxwJGk8Uq62ef6E(J7>(Vx?XHpNp+TR2as44uB%`R*W&e<Mr{}!=
zSi^#|$QNAp@Jj-}RG*RmQhlDW>8_W}$MOrt(fI-l3O?%J|I$<?bH&*CA}JV|3jPIC
zAQNMH9R5a^tjlS>O{k6^8l8ZxLFMj3&_VpbJ*)FyY)%uNomb&3&K$Kl*w4b-W9t4W
zt<5nl@FqVjHU|EVC)ohMYWOSlq!sn^>S_+O5vZT9$bT_@C05}H3n~ORoEwPqMN(UR
z{qpNKaG|WO{9a&+j{DVZTqMQ$FN^0#-5;d^o6c-w{8Hw<eE;E1Db=Qize2qz;)lqQ
zp)p@Jby6J!(_i)UOPyafRGG2O#)0w61rdwUK3U>lTz`l@^VkhzzoGEU!(2Qm*Khb^
zM@q{txg54|Q8v#{1^=p;XYLPzpSVBD*&gt(p#JbH<+4K_#gp8)qJD#~0#p3dcSQ;&
zp9sU^R>codQpojDj9+k5$BFR^!YNO`O7}<MPM%<oon~L1_gF>zkhd|SbEW+(5D!=J
zL%h)8dG_LmorMUW|N7be%U%I~ecyT3-G80)U(rL`0{z0x6&sYn5At7LwIPmKb@lo7
z@G9XTSRqkWf9Umx^~+i?4E#DzJFI3G@r~g87waH&2Rb;*(?M|_!TjCa#`W}z^IvRI
zdXu%08sD~X5hgOuNl{V1!FDWhMd`aLIG<E?7qExH`7a(0ObX5l1-6b8d~6SW{6hU9
z@s&Oa@7gGZ1-N6%IOqZt3MKv8sLXPuJ>-K<>im}<-{ATUw&5n1y0O4E9D?6QtwpK+
zus12nYl@MoHTC23s6SL)MYbzZ>N9!>`^<d~@XNTSsjgPodHC~3(dROLQLs!?1s}is
z`wy9RsdQD9;E$d2U%?Vg5$?L+`G?p0_bYkqY7#2*U*61@*P=AQ%KVoH$JOKFwU~lm
z3IhD43|=^D*u3YNe^o3&uof)TU#`Y4Xw&oomg9#C0$}-Ho+gZV?@{N!xFQI!72sD%
zI3u__CH}>um_Dv*{Nhy(h7$-u{E&6WPkT)j%JIW#T@5-9Z;Sh*@C*8N-LX%>FL-(Z
zYz4ww9#&5O_bY(~%p%#=Rpq}ta~kl1l5nh~U+YU|d2E^x#18}0J-y8dZ!I|g#aIw#
z+BH@1^{ZTeSng`j=W_n5)I$%X7z;{ID)?84=9In)+Em03eb_3L@GB64`orm64W5+a
zhtsAdn1m_#RoT^`Kjr+_w5|qiD*0E5pO)~ew5C(=OTkuvU%oH}zplH-rr?)?iK+X!
z3cnQXLfT7K3$J<l72JP#J>99`UsKJXhiGu@tMXqr(61`|x<MNszr6g{4fJco+w;u7
zrkby^zL$K_;K?)r7wjv3;pM-sg9U7D+?A>g^RFA(!*cxa#x@gvufukugkRTPQ(wQl
z{8uGatXLE`z%THW8}!-7FFL+l?|05yA2I5V`a;c7&41!9<n9n1Us-dX_6g@Vt=YpB
z0)4{yC2O|3uurv-LbGMBU2hucX@ay>6OyE*sEKZ-8VO;Y5^DI#FW`ya=6G+-r?gMV
z-?V3sl!XqO!%s@Tb=)ETTeYOg3PJOpl=|Fja7LlWwlXC_8n*XDmfEbU=^5zD-5sAD
zDhWdC8|cg5otQ<XaYeLWr;od{lQnBRp&!C;lH<-w8cuU*T;w2pWsn9CQo<|~9W(jQ
z%S+=*aXyf2iNegXP?M%+X)gDF>$p>s(teA6gJw%laAwP!)@!}$NvY3{p2B4zw^N-g
z2^lSgKn6eY`*Xa<NDf5o6{ZEt9|%%CDb1lIY;45BK*7sGhv7Z39pVqxG%45E4W@Cd
zBs^Qw;i@ODt(wsBo|@FaI{P=w+3AunSd((q6ImKp&(v{aCXxecCW5u-F;W9f_MPUe
zbXizDP-oxSJ1c0Ds#&M~27O%4E(=<dCisa{TCZAdx$H|dHr3QpNx&0}pOD{YjEkgW
zTc%MV81k2GtJf&CIew@9Yw~RBwx+rYVb*|pQu?jqch=lD@QKuKHqAZ}2shp1Jt^tV
z9e3*Y$@8g?G}WC@!Y@G3yeA)UXL)mY$93M*xKKv;&F(Buzer3|tF+cXWU|Id?=?iV
z+C6ez>gJ}J2LhqSdosJ!<_@Q(U;708Ce3!0@axnFfp|{`zja3srDT&`YiemFs12LK
zdf^11^!r@XW7v4oV_In?sD-n!f{tlP&Fjz|JvGiipMAGETd<J)cw}~u<{WLrlN$2J
zrRiFqdv|hnq-I5hAn&$kn>CK+crW6tx~0^Y1zJg(iLi!x;x!<;134rqZB%0k7IL^y
z2Eu@PQu-~7J*BPl^$Yfg744?d6MtOC9et{Pv9TIa`c?WdGLl+^R*>bEg?{KeKMC5f
zS~->aHA<~$qn`MUYP5yUn*N4H<2Va_EYvI{$7!&P;5{uh8;<^8{lBq&_E%X*vS4g*
z?_xogf6K<31vD1hR|WF2)T;SU{6^-=duKJtJDX=^STOF?Af#qB4dF@oJ$LlYy4(1;
zHp^M*3A3H$eX|<zWVTcKEwh=|yb+5Jp%23Sy%6qZq11#znvf{kjvJmpDB-{p;wM3y
zi2mzz*1auRw?+vIlO_ahh@X^ys|*1pP`Jq#+|r9$ntD%I3x~Gf;|q~{S}ez{PY!Kw
zE;XU<YiqCl!?i2d-kB~0ZT@$J#6O2`fA+`ugBw{m_I#xf{PjhhYhG;l$?)k*N?24W
z1Z_U{*<bzs7atq@@tZ6>^pUX#-~8C7-V+V`$1eVH&_)ye4h~)zGmcIX8fUnrMn(l3
zPXXwl&GqbtLh2?%mfk~j9Xu@|tl!8qKBdi(zhuuEnIgnzx&QCpGZmM8fKK7kO#d_A
zST#_eTe)x6bir?7x)D;QE2*uSCODSY$}Pb$>`^s9I~uf;Kc?%H)F#lMvJkW}Qt&SB
zq*-#h;I*+dN2F*M&7&D|nvhmMMa~`9#bpnmUC$mmXgVF2gD2`m4my|wnxkSeI3XVh
zu4<xwYdW6#Po)1_+VybR_fVwwo<8k*xLkTq>9-uCPiv$*Xx4P0$NQ~bVmP)^Mw2#O
z@Lof`z_{tS>_73_IKb2Cxa>c1N|<t|ao@n4)Gsy7Ix$Uf{XT1Viu>flsSh>HI5AD|
z+w@%zmrFo@th8P?)UN=S9gO`R*_5hn(jJ&5NUuM1N6OfQIQ}omS%qmrX>VY?s&F{~
zXbAp$9IRIrE(ZV&q0|QZ&>67omF6rlO`y`abn0^(lQj`-#Wcb3`s@I6DsedgXcoLC
zybr5zIRI!DO24H!)72_?;{VpW>6i4|U=EjPGiimi3eyCC4*Lk2@1XX`Kh0Prxc+;n
zh88-JKE08SPZN%nertu1I@*-HGcs#%njrl-g!@v7%VoQwOpbbyqxCWzGYTtQt`cPF
zw-}BajXN}j%Tt8XdR6#hm1~|ZuLVuT<p7||xa{2VEBdcHXGd>aTsK{CO5^IC0s$4E
z;Cg)~VmPiZ;c}I*ywv19#pP-^E&=qP1-~^Nj!RG83EEWQasbdu2-=7tq(W5@c_92#
z(|$ae;iC?>te}F>1cg18FO*(naxyu?B_62lf*>q&IHsv5r6$*V&rOTrsPYSgkDRv2
zTzFZ^`SaS8J;U-2gcq76Frd;~OwVoPq>u6+mEg`x5)KUV-{KG2lwY8>Fz@bp@H&%r
zxlL$D?52Ire5+E}Z}OA!dn$>SZ{X)?h6G#pehTj;m2AhfR0xf;OcPH^@3H8nq;{JA
zkmk50Ve}?j8>Zzn=a}bdUjIGug=Bszcn@7?RQ1#dD^{K#bZgo?TN3`f=_gOQ-z5X<
zkAeSV<Ee?P6qXX=^*^OCm%i=nEJ@}6CMABKS3MdnKb$JfbLKfypH2Dm+`ssXzmQX&
zP5Wc4xjxt!>dWqH*RHuNO&8Sn*Z(SL{GYbXb#%F;)Ip!=I=Za<lu8|(wpV?nj#aGf
zb>2f$Y{K+Crj+qN(B(iCOL|eE!cy2OlN%^?xy^NUz5k}5O{EG?QR<*gRS>1xeGA%D
zs4$Ekt8nn7)aE+694Pg>>azbr|2@~!Wqjr7Zh1|o>2i7I{YKZ(<?>&@u`ZX}c+&NB
zIcW24x*RlmuZ2J>rwhSPP5&x*@}IU%(6Ji|NnCBq+ayUnzkI_+KmX$AGw|~n`1uU{
zd<K3#13#aEpU=Smk7q#nOK_OrFFDtp2Ay0tVpimIuG{KAe2CZR6rp6~KWzE#4TR>T
zWn(#(_3o{2{4M&!@A*IO4^n;qspd!ZC;8qC%T2yVFM1F5&wDkl_iF#(Juc?w|5z{H
ztNrs{&Ch?z_q+%D=jZn4#<q~Zd9UW@z1lx)R{t~EpZ98h-Yffq{`?%j-epVwf7w4t
oT!BKApPeL$|B{a5Su@_{CxWm1_BBbIg5-zZdybaVQhv+-2SE;0>;M1&

literal 42175
zcmeIbeRNdkbuYZnbB^RA%}8?);H$<MA4al0kU<&*#uy9fAY?}YQWVE&ovy6DW5;c|
zT}~^fU3bykzUiZpY>N+vvE%fTUYa{#l91F*hY#Drp9dln8Dm><xw*ul$(Smx;t*G0
zk_e39{q5&`%#noCu2uihyWS{S_V&@kInUSLzx~^LKMz!u82A21q}@p~|FGwe?)-o5
z`NM@h_uToJKe)T;Pd;-u-9^<cf3`UD-|k(M$<Svg){<FtWAma+bIT2MH&rdVY55Hq
z{Ga}SXjjiA{Cw*xpZvoNNsWlE$Y@#qx0%swjb!`647vQ@<o~`ZLwH{PZ!JR(byMSK
zsLtZY@AG3w^^3ah_xU|PHYEN*B-B6O=O2z#zxcIn$ZJ#gKCe)ZjSs4gdfTNsN05;C
za0>quQWWs71ysw=O6~osjazY%F3I*%VnPpvGjt)>ZYPfG<5~|llGfYwv}`KH28A!|
zE(;|i!)*pCj?z9#yRnQ2g&`_Z+KG`kiDkl%JNq$unws2LQJnIGLdRS5^gvSqZyq<Y
z+=gbKqIb(}+R#`p(S*}R38{}5sy`*|8M;L6Zem=&;0dKb7}qCAy~nX0!+YA?L{aA#
zwz=07^--Fz+nmHhc#qAW8m>rB?T`4WbMtW1_So0N8Ehc@lq%Lv8`rRdk;>RIF@Y_H
zA6uJCPs)X**aq<<PgpO$Py6M<Y^+NRd++Ho<Ma--x`~W_R0**~`cX?gu~)t3Z5-$7
zY2*6HxO0KpDKVmth%A3=cZD~ca9j|^cz`ld(BC38KV37n)04E&jrE8Vo{$yCXg@7<
zV%_33Z=PNHYP8SSMmoPijFZjZ>Y5cUr7zgR<u#?4f%m929h<$I&U;@Un<kw1zSTuo
zK~gIi3gdJ^!?@hO*Sx)9TBCH1usV4xQy`c>@SYs<z9o&j=>Ro3vAh@!1<QX@B8&T6
zU(p!;DiD52e=D1_vE$;fw-%;h&>r5ImKdTvTAZil7(MRI&mm<-Xs{;iYD75Bqj2@N
zb+zu>t}b^q>@y3z>)xzXYf)b@y-j1#_^`KL%d8R&QWM3b2n2mS4QhDeidVd`n-%D4
z*k=|-#H@0ky>HFl6%09?pFgK(so9N<i^JYp6lU!Tz8-eW>(ACl^f6DrQZ%)VRbG@M
zo_?jQ!n8F#P1vheVn{#Y=~v1~(NokUV+Ao52tVyoPj-nT-dd!l=~rV8d#sE1Snf!m
zUvnn!=QUYz!t{6enExJgF8xZbC?z)NKk|h2`s?&dxuTF*ufOH#mwB~k6V?Sb0V)$t
z!lBA6?;j_yhv&-na4Eefl|6L5_1Zm6zk2jL=m~4#Q0z|emN(Btfeu#sI#?7Kg}G2d
zD_u{&veWb{BUVyT#&3&NieYcvcf)2*vWMt%(j9bJQ-W_vnrahl{gm;p*;Y(E2IHCG
zacP!sD$6#rZy8<mtf<?m+VmRtOtXh-M_I9cQF1JPkF1#5rYL-k<K63U8<XNR84HSH
zfc8?O1UmToMdm$|?K4y+?L8^zuBTsxtEcvPT!-E8?BSTFUjcqyGogQhLLhrpDnuLC
zm0m>ft0@4olVU(N*|C8-e||#zDvHqHpR#gvj|)3L6~Fci0EeM~tVA2BDYHh_`S|51
z{AznGwttm3z^#m5FH+k`VsILMo$d<;xatJ21tktn!LMV9;!G^ArSPj{Pgreu@}<f6
zwJWwHcZ!~Nxj*!F<J0*jBi5fgW2v?9@oU_}<>9ouD%0^Qua2gh&Q$!mBfzf>;xz((
z0Tfz(9e&XnYNZ6}ukorwcRc(W0a^v)(#Kc6$9wD?#-8Oi9)7jTc)`bItouniD2sNj
z)ZeO8>*eE@tZ@STVj#Pp=DB7MI;P&^;a79XTwm_<Nqf6&u+1(p8NWuVjIvMiiv1-?
zZYnbczxv~E07e5K6R(>s+{4NEWx)dh7B~vX#;sFWuPPV)QM%*fSE=SJY*Gr7fou|f
zrL*QEj9=y?Akzzz@axtp599uX!S1Z~tkLXD$1l^vFJOTMf8%kvFbg2d1^AU!_PM6O
zeFnIAo%iue>*lox@oOYBgAJZNT$i8ubq@<X{8|BPgEsGZa6D?gNG(o0ufIQj!4zzQ
zzn^mJe%tWoXBvKWi?iZEdekwyVH4E4*GKUSj-mrc@hm+^4URb?ZuRkNw(8++ll%ne
zSJE-_A%1DQJd7*yxJ+J)Ro=MprzYc9eT`aEORZ^!jymj<g!om#_|=><3%N0RP5~JW
zh#Y*sHH9hoRj4A~V>0c=Y=DhaK9cnDtDq_TDw*DX{;a!ZOguvmm<ta93w-?A?c-NX
zSAbtB{YrX4uE<Wuuf!wJ9qd&XSTIbVXYVVo`}jo)zgCpuNA)(kC>NI!WBM6-MJ_JH
zkLxrUziJ%))3o2Z!3Aucp!;ZEr+KGXFbTgp%@Sbi38-Eyi?!HF4X!z!gUieN$M*57
zDg&EYq(&b5OBlRun{i=!>+a!KYd$^z^ZpJc;Tnmztl>Lau8e<0_rK-i*KlG>U=x<;
zqptGadH1UQ6W~|eg>8AyUChpZ8@)`6o%py;ovMwGU!&DI@QXorfg9T|a!!tH87E-}
z_yyAqeqr`14w8h;tW41+BPq>(Vf*-HFn%>1tmZY{gH4QmxC?e3d#osgr(aZ~%=<xQ
z#|}^nyL@SS2?CzbWc*s^pwDONuh8c!Mj))9+HO6-FU_M}HO#*l+G;2CjPXwpY9?YC
zZ@nV;^)?Lxw#-41v^KJk5e09a1N{0e=3hm+hpLNUd0)altjgS)^z<vrzqCQK_DFS0
z-D5W1(`^<ji{85X_~q6xM>|*7Mzw?bj*tGpZOYUXXIhuxU+?y>D50yXLBv*!H&5eV
zwaV9WZnok@{U^rHx|Yg#@e0fH4;B9s9v?Js#?+b5&?#qgscB^3*<6da76JeI5RYpQ
z935JcJ1BaG8tX6#%L4x}%D?j2MstJse)WAay%R#0_nv@%)du`4ZS@ToRys@Ec&4FF
z@OBRHi?`MV=MvrMDj)-X4JA(NdCx!G?cqBw_dRq@-t4LYeuwR0QD5M#*A)I`yMV2u
z#{IN}g*tDZBmC?4X`efPyqd}5R(D<reMT^Y`!kt;x%N1g`xVhA8^^H^>%4UztMK^O
zx`Mu*F6M78)D{}vz3Z^Ecz3!GTkd_U%)f}SpiKY^T$-qEGa&@{MWKZpHP2D21M|Mi
z`6y+a_(QtzzBP@10f4Tjjbg#d)FaRxi~Br{e=W$1uhBP+q%-hHM`fU2;9nx`Y*zS{
zO0TZY3#0JORBE+pRr~riSmWWB2U~WV3HP8N$Lu=rXuZkPuModHY-)FEM)b4d$JFj5
z9_|bHmsW-?`hjS1YBG8w`(sXgM6dMLYYP8@DUia3$Jz{`y4D+elz(XtQOfz~NcEMl
znF}3Eg18KR9iX?m0BuXG2Sqctsr1&O;Nh2(;6DFAE_WW>re8-d%C??#UQhY_OY`xI
z+nmlX$tE7w56g3QYZw01Wc&(Xy@g;Hi*&(RY}LwGwWnVxg<nnJU&%3APD`a(5J0r#
zf{n21)!tf6;a`Sp66{71HhjUdT(zfPK7P3|cEg^hYXJdbyZOAF4?dJjdG87E%jaK9
zO7SlJt8`Xo?8*s!fu~;q|AOwE0v5En%|$({1dJ<!U%!(3%JHc9@Kr75;oh4I@ree<
zTQ84)0g})k^GSOl)CxfMHR}ck`ZWo^yfz?@pFL!{VvG19&6BCDa6J9;@XK~R-`GkY
zf_}O74%v7+CSekODf13LoZ80I#fBa9qTAAA7WF^&)^rO0LXfAQ{)EnFX5|yRrs5ad
z7MRL5H+`;QyLf??ccjlv!7qjz`11@>fGygTO>Q%{OvNw1&2_H1UleFFEpW|Q9h2}2
zt_a&qCSusnaZ6&*CI$NC;}_d89@kQsLH#k{*K!y7H3h%?KEsW78+`udhWG`41MC<O
zz~ky~AB~^ZTM7J&3|Eif*8#*2HxG(S4g!e>&0mOiXR~a|n!BrQPrn$y5Z`dCGgoe*
zM=3SDx}|Q5`6z%4lMvw7jK?^>;chN=`14Z~Y3=W*wwHF~GTvG+esKh*rnm|eSZi~)
z6lbQ5pV2jg#tA)&U(Pk|72}`rcuMnl>}cJO&DO5wu2>{~=tXiqbBbOv+uZoL-YQ?B
z_Tl)Omx&)<pda#jjf)j#Y^Z4@y-Q4rA2zyGycT_(wQj0dT}xkb<95uP96$Ulhu~hJ
z{~;Fw0xIX45E`pLRX3S`4PBGD;;7a~UvL38@w+}@w&oIxzA-(1_?{OR{e^xZ`>)h4
zYfgV;#K$kh5B&($XQgtn&gd)bcXEqh56$WL^-q4_rFxEhlIA(EV-frU<4|Ekse+$3
ziLXMKKNY`v)9#u~-BH5}2-I!ChTJ`oS{C9L#}7>vy<8vguL1Ks-TZKTY&w21ms!ca
zx?pseMTrMP{3^!}hm?7*v1VS+cGZbn)A7q5rHuvVU;5o*W4`I*=3ie9zqE~3lLI2w
z$Q=LU19?%#FDs12^%D43U9PjxE7Lqblkm%<U1Autt0t%0a+u~4BF7Q@@+s9%cu`ib
zd-zL?!tLFOW0T{D%N<zAQF_t9aPoR1_}ARK;@kQr;a8G2a|C8UOG9OnHVsgdl^TlT
z*8xg7F-r{54)hsa-LLSgx*Im32hdF(|4Oa|<s79dw5hkmBj8`auaR5?zfKePXXdC-
zFbY3`g}Z9EUk1O1%>NFkZO+H;#<+lAb?<{;Z4{R<7e^64Tsx#s!!NL;r|c%+7tMDz
z8BM(avdiJuUP`<3Gu1VskJ2S`8QOI7xXSodcLH2yp<C4>^3+cYE$RdyI^1Rwe*Gf9
z;%v<ZOz)6vEi|TLm&31#Z2L&<JKB1BS17U{!LKk3rTEu`zMNjow`b{i!xa9thVc~K
zYADttW{G~fcEG%AGJbh6eCJ7Pz8hOqE$I;~ZhaTf)aE`b{F1(%=dr`!Z?V2ajmI$d
zD1O;Zu=5S4pfXRpFy@a{{SZJFUp$3>p^eUM8r(z=vTb9e{KF~yt9E?V1>-%Z{UF}6
zBz}|@OXfSB8Sc-d_~BqbJN9}P^^xs>n@{0ij9(gp-e^N9Z8L#e<)MQPzsEF~f29v9
z{6e~cg-+xFZP{f9`sLwQlUwWIS2K^xreT63Bq!t7Ume^!-f)3_i7-^m17DRn+Fhyk
zJjV~u%EdPPmKM4s7t<EZBK>P`JH<i7Jb%MQ{%cSsZDgsEh#w|xvtA^PzXSgQ$@1}Q
z82DAB0->t}>;}{hU^oCWf>ROT7h<`Clr&<+Y8!2KcBckK6a5_~p*lkm{2F&!GFXd-
z>^szA$G7PX^fOv+rHio$eqD6hJ22$)_9bfVhoGE_T@WVWSBp&S)f>Cswc8$s0V&W+
z){4&By?WmB58VoI;X8JgVy(G_^t97-#=KE%v17974f6@%^RF?)=h+*KEfK=p=cY3;
zqfW?~rS!7uC1TLiuc9`Wp2*M3#x_)c$N?6Nn!{qR1N_Q@%M5sH%KYoJlX)2VFN5AO
z;Umraa25Td)|$r(K8!iT&y@VvHSW6c*a-rD@#1!e_$9tW88<$t$KkGEnMw%nLvYjZ
z$Gr6#MtuGOFIqT<9xxUjgv)naJOBkL^DjwXr3a*9Th~B<x!6$mlJ<aHI9|0u^mzKk
z{HxEjOQ}qCZ4xGB$h<+kIuF8lRYu(A`7L8JcGF?GXb@VkoDR_n8NXY9myR&z7WB`1
zK8fOA)^qjXGH=j?(WWJG3}n<QKx!T)r8^uy^rLETIxotW?s#7RBL)Sh_HXo@_bujM
zh(dJ5x8;Utql^8M7uT^z)NMY}5%MoXY^0q|>R~aO+*qINfLh&6-=rqzL$fOH_twHR
z8u>j=mjyfDOZIB>;Y~&Xh_-s0RT;rAUz<v-R%Se>XC-XHKrQLt4*1s)LW1p1t)-t;
z0{HS-#xFO*zbY8fz>f3!kUv1J(F2Yt{3}T*;1~AGqf{+BQs!=I*2?^=tAaChI~<c!
zb@vfMg5Ah}P3K?Fa)fF`{DMPOcT^t}OX=?!zb5mqY$l8Tyg&!JV~@nH4S?0>U+XpS
zFVWVsl`$8BllYK6WSlcvJDc-;5&p%|LeQ>p8?Z(3A-$M6VYbhT_v)KG{R00IIk#zd
z>g&m$Rc{(f52SW=%%@FGtu)7?_|<2phs{h5o2{$SHHGM<ypy(J!#4%^)kgPsEF{Da
zzeoMfLTP4_t>yzJ?`H(B9M+xPW-WbJt|)+Zy$0C2p)uYS`x`oj_+fe?_AO7pn17uI
zwNDf^_W4`8VPu9N!224H@GtSQY`4>0YwE<1+?P$?A(nQ%+TUJ)hY!A|z6Je4H&~mX
zU)DS_vvu_@@bp&m<3Ub}Xgl3!f*qrc4Q0$>QRbKrF!*ML>**Kc7b2xOc=!at9x>Ab
z!8%HtAS}b)p5G1s@Fl6-1Ht>SC%!wT=Z1|o#G~}L0{-<=FC4mG|2e(u0Ja|LQ)JCe
zl=Kk4Cg2h;&Tbh;obA=z;$8SvN*slLCB7Hnmo(O!dpqpnz{X^Wq=VRCzIqq9Rg;YM
z=R*8S*|6cmW-)iFu-Q(!n-_^jq1pfoytOb56Iz)hj0^9<h+?vOHv~9}5&pFv7GSST
zOT8pm(XbYXABr}2t6UZGuj5cF#NIvg{;ZR5XI_qfU10ngMws`KdE?NQGaqhsjyj7<
zi3t(mU;FM)z5)LAHa+j!$IbV|)%^vTd?R)tz%S-sgOsJKsM6K;QR7g3M#P<7yWqm|
zNAL^q$8{j5<kOS{ml0|Dmcv0*;o}!6{?+0DZr;S!0<Xll#4GOJQlc0mFTPRIo?$qa
zSc3C($yjl4U2*0Kx@5JF039ad7r$qe-Zc?cU4;30!2v&I9JF~Ka{TbAf#lBE?%Z4U
zlMWRBJ<*EwN-`1i@r&b!drOUju_p17+$U|fs#U~E8Y$#}l9Bk~v+~+(><*++_Vv#z
z0RraI{j!0%jOnc@<JTElA``YgOz)&JF5*aWa%mZNtj^Of#;^D2W=EO9OOzO@J&i!3
zpJN@V%yOS6*Ked+hSomOuu#5CZKe1=y<ERxpjv}sju-*|+5tt&&2d<FQa!oL)o<*}
z1ITU?bDggZG~Z=@UPSU=ezk@RhYHh@=}5!80_>*dzhq*E&iOBF$U-b7-gepw@xrP|
z{_6s40=C~7W1PUh2x@hQse~YY81S!$*k)R=tJ`$8^Lu#(BlvZ|YU+$_6K@&^dI3NW
z)p<w+#u4IIBUdaqu@P}rLW$TdYy?OpLDocwUk3Tr8pmi)3hrfH&R`$|5exjoNc?b|
zCTvVYE=FRwdoKZnL;PZFQr`QhaZYRdJ*2&UQh3jS#yvEde|c@NxGm0>e8b(~mAu2j
z2bDbx;)l8v<HjKEBvS&8ztx?jm=uxtq1WdQ^qE~^OLU^o1t&Hseu%NJ<gwEME$IN?
z8-d+w>;eCZ)^D6fe?V{VHeVcR=}hEfDNipZ*KZiDE1_QqB+9nzRtx;g#x^9b-%y!!
z;1>*08?DVXxMJ9OisvWbUk2yDVEqaL`LE+mvSt^AO_by()%+H`hy6oJQ;aIH$0Q)B
z6;`#6kTl5z{L9u<{>zPdd?)Qz{kb?n57;U?=j&Gr`L8E{U&wa7PQQ>VM&ld$UXiaB
zZYm{~#i~91V*Co$3w^FVme{YKvfu4SBCHtT7uRp7y{hb?Y%gsY)-T$xx{F6q;bwX3
zrQ(Oq!V&$?^}o$N2_UORe~f>ycDS+6Mfn$~qKsv8$DxA&yDa+rKj>OSGb%y7Fm%cS
zzxE8=bJtb%_xI03!pPl}5l6Ls`Nk5)UT-MBj`LsVWK%Y=P1!@`rd|*~cAgl9J&feP
z&RcE$i2^d1=Nt@YzkZZ{W-sS)h4|%#s;*%yc#l5krYH1M^j$(CtS7)P=3j$O6IW}z
zL3`YtZq0rK5`PHA2NBB#`LBD}V`Oa_WiI2Id(nn%CTzIv`5Ron0XivTcI7bdRoD%z
z>6ZvtkP#gk4;>`!9#9xnp2tuN+gn7(UiA`TB)Yi?*Kc@xOdCg^uW=d3Os?G9I<Ajh
zp>&7&*HPG(`0%PT5Ek25ucap9hrloFOx1?-U#QlYXAabzv<ASxx&}bR5I<xjDtYrf
zP;p9d))koRk|fYB2}TWHo%?)J^S(8E3;f=ugYYv)J2o2MlBxX8-Hh)%_VIH3aM)~Z
zjBjozNq6t^#`wnAH$XJh9vdm+7x))p6ldt7cH>F_*`EooB5`IJzwC+n7I=e?E})6J
zwmFG@{pS{ZEnd@+0Kb~-r+bqnWU^|p7U@!K1p<I5EIEk&obhm{RPiw?I(Gelk<<o?
z*?4BNNkicHYFrcEdU^GSJ4&ey)mJM1wdOB!uV+<IZUcM^hu1>!FUpL>sUdEjrq+DI
zf&=VVB)(S0uU}~^ct>5ZFdT6FRTC`m!iD&CR2+f30$6_wG^Z^aw}FE{^Tt)iFYvD&
zKr6&s9?;lPOxELxie^OcYwLhQ*dJ*RxC;Tb_kT$HhFn-e6f}ZgeTIFIedF7(l*d!c
zs;h%Fjnp3=rbRM-3ZBC&)Si!z>A#hFi+$Ru^&6Dv)xp1<HZJ6Vz(7{ce|h|?3)!wl
z=N!^8$hlm%lLK6dymrXjW76oPjibr+sX5|WI<T_o-dKGd@?V}dmCE_AjY&XT{!pWN
zAjOJS%^0UN?y$EOs6VtedJqujpf^JRW1JEWdHTip<?}C_yDHJu6rQL)zpX3%LjFtq
zf}V8~Be7%bM>#(KQfL+Azrepvdl=Uk5X>c}H!eL|zhN|KYXDo;fC2n+t5bydA>&tA
ze;8Cqg7>2&W95Po!I<m!S?O2(?EUoY%4TQHh*;8(HeH)W6ux_7_w-BUznr%2t$7_Q
z>twQDyi!O0%j;oKf2e_fRkf{Om+u2WYi-#YIFlW|<q!E+QC^_Mb?e-QMFSUBFE-;t
z*i8QX9Px3mVm>{kB_ED8iVw@DP9}?Hq3#Fv>!c9vh_@Ch|7F?knj4ZFbh3wNk$821
zZ#TmF4U6{o&ZC&yVa<BR_zZP<SfKXvnD-uzAD)$q>{wT<4#FNg{V5c3fRS-U;#;16
znO7H#cj-BIT}D4;y<@bx>-u5meVY)*4_^m;Tim$irC5u36fcbbKwNZudl>SsM;JYa
z%zHil<$@R<JEZjM-ZKB%2929{c;Jj+*HM*DT?lm0_3+D{HAFIpP*r7zmY1eoZ`$J3
zK)*u%RiI%zL-GEcMy}H$;zr+hZQmY-{Ojl9-H#%j2mU4A{rGbu&5!6m3C0!T*EmM8
z_~e#zGcWePx^wYZ{N$sV1+RLx#qG?njp{Xin+k=bW#&YQ1{~Wm_tqt)Z=Xv6el^;g
zt>p26V%@3C=8ojZKp~klgEoPFnec9snn@k5B@J7H-%G)`eEp)DyJ=W!p)InZM8jYU
z5Nx*d2e%f>^@nWzo^_jh^b>Wz0(1J)k=TfrSOI=jdYGd8jm4#!4YA)B|3~gA#kl|#
zf#17L;FpIx(mKVQ(MCux2_RcwR}Y}1aPMw_FXNZZV+a3|MWAq%tiFf7LP-X)A=+yz
z@I5(0%@5aa;5}plspTeGaIm^4#;m6ppeNziIfRdDiu!tbodab>ogI4+D8?PtXXan;
z+2CI;!Zp7@>_Q3PDR=+r)cB!OBlY!C#ebx3!{GbxQGI6qb%1OM_n<PlxjT8%d|bbW
zUjN!s^d}kO*IM|Hs!av;NqeMz8Ti*G_!3>2jtG7|CmXT|8!lhDC4Z+4;dAuYU;YE;
zUlIH|!|x%Oor5^;k)l3>4pEDf&gc>R`X%^s<+%0~`LydiT{IZKW`_9nw)hS$)i6I!
zFq{<6PiYGynwp=k8PBlpxG6`>5%<x2f_^<h&k07fX#M<Fd3~~KSlouaGmraRM^DHG
z?(?{%=10X3$u41jY7BOXA#9<&WZw-Tf?r2ysjRW}4RoYCBjfg}`P~<(MIxdY;a?NB
zS|*SFH!G)In~GoO=qaZb=@|Q`g_iYc02#bx#l%DWy4#~3c~N07r82hxclJPlHyFXM
z1N33HdPMBE{~mTeHB!BV4%j=nO&Pzy(GY@zoks``X+f?<$4=-5kVWuof|e5^oJAVL
zpyP5?h9<fZ=#Y{6`NFwWE8tHbMK_*t;FEB*27n9(-_x&pZ4_H{DSj1ev{bw<k4<|N
z1QTtd_yv8BDg2_OtS(_VyOWB4h4?iDf3=aJ7GXo9VWrs(2bekIRorK_?tcCYBh3Nh
z>_;6;!YGnuYJLuv@$0nLA49w-;gN0ARbcZ@^e2j6jA+|qOfcuJZ~hy7)R~~?rqpi?
z^ZfKT6zQl~Ob8@$Ojym&5ra(vxD_hXFdSsN7Eq2i2@^47BA9<g@T-?n2dizI?~yRz
z170EGF7|sv{F*BP$EEsG<<*FbUhh`*fXh6Yz4j;=S%_b4x%=czrP}o~|5_Zre^DX6
z9(L@~$PGVDY*-cI*S8&H@!SL;0pp5e2^!%1+fN+=zX<V*>)95U;D#-y7v!QW0+Mr`
zt@*`oz@HECYrBJNvWsfNS#-ZOzaRW-J3X)niLeNMZKvm%R-pb+Y^6ut)To$aKr6Xs
zGQ=+~Z?Gr276@HRJ7rbZi!FAau;0MgL;QLMUT)@ie5bBS*8z|{tS_YR5GqU}@k2ja
zSO6}+E89wN9p4r{E{FKV{Oe{nUecG)+q5qi2baN<ee4^D_{E$k>0%X9aQUEL{oqzl
z=M}dK@e4T@iE0fl#rdX&HhFG?KLww^6yR6fe-B*89N98ui=%jA^O}bEbq^30(XfKf
z<qdn;yq}_9F&`|J@#_MftZ?-#jZmv+=ef_%bDtyl^`3q6@WM0tiQFaoNjH9GbE|kc
zwV3%=G2~y?;3LT;=7Y(G?tx>;MJPwv=?u6k5*YF?&VQw-iuo66K`j_+#$46skbgZ!
zPix6T=H6UdQO>TSc+AEQ=dnll*ThGcTMOZ$+Y_H!T9@wsQnKSEy9MLAA|K+H`CiA0
zpENIvop9dS()yF;o7SAT@=Tt`72#iqcq|`j+OMabmz<^U+C8y_^rGPRl=)ZMc#4uD
zCF_98+D`Lh19f(O!0S&0zc4QQTU09$6W&Dw)fg8Rh1Vj2U;AWX)cgxEm%f2mT<kAU
zY4m{9O8O-H+DFTVnlhW?x$n>tH@!%U^HjN8C*c=h%Sgby8*}J+qvqhM9@s<1uQLDQ
z`i&M|?zr)i)^ZSaJMp?<dnb=8#INm)GBn^+ThtE&W;!?p*=wnION4(tA-~4e@^zwL
z0>2>8{kc0!n<w$FeWG!!>t=+4`!suqfedS!<*`Tb>%6n{;q<Qm@?q!5NX!28Kg1T;
zM+T62jN+FyE^pEjovTh;7iO){Fu)P}!ZiMcadpNY(fdu<`StM+frzoehg}Wui|*#I
zShnktHGj0_2R4Llb=R4!Xc7F<8gU|wv8j5$d{Fuz^`O@#z^_ij+LL-?jd|P7+Y4V#
z&0C$iZPTp6eF!8@!7sbTOz)goki+)gfi&tjaz||yKP>YvtPbpa2C#KnYjxJ;A^1Ec
zz^@8MG*l^%z;65#-RKFZ-{5gg#xFwHFja@`*J~C)#CA{NUqgUM+d<gSpoaos3jdn1
z3$%16a(@dN`!~+p*=ZJGKsfiu*j>gi%=7wqUcXlSU>@>}bM)&a*U6wiQT%$OjnQf}
z!^3HQSRcxrvsIgre-#v3eXKX8b&Q!$)u;Po^O&g8RvE3I-z)6`LT5Kue&3vz?;3^C
z^COB8{Mtu_()>1Ttw(9Mn`)_6*?-<+A$}o#*m>vou>IyB1gE%67*P!IYc9PbGw{Rp
zTKZ?X3<>JkT=Q4C6{W2a{`DBM5+3Pj<#|jC3qed~3V!|lgx*H4etBOBWdLnrD*xI}
zk6Unikb+EpJ+tF52I$4-flWRqBHGT_)M+}KEZ}lMnu|8YZ9fJQ!LL18yT>$zPK8{f
zwcD($lzoMJc<dp5q0fcA$K!*sh2kZ5?|A$fy;*-LtKvu@|2oAS|6ncWzuswF_VGmJ
zDwWrBVH2YGRoHW=#@=iuQ8q8)$MqY9iXTqGuLCmatnWuwXh1H_AkNmP3^ij@z`xk%
zPrARgt1e}4v{0J3Lp)}1{o!Q%QhSv;xR|sNuuyHlZWMT25&UBBbfKJS!^da;FxCkE
zrR=k-cf<Xm!f&C}1i64$k@hmYKq7oUKOPn07fvhZudr)4-up|rh!bI-g9ifQd``~<
z_;r$=wh=AN=-(y`ki&*e7{yWt{L3~n{H=is*y2K?z0ph_V#4CW#d3HB$!uAW^!!72
zb^$2N(Zb48#!VO;)Cz?Yo30ZGqK5SwC9ny0)$}nO@7+u5Ed4I$UD-nEq8`?76xpgf
zi4lE2T`*zZOMSp)(LM~!4daJ9>AclafE7(SKNHK{+M@mj@7|1hk4^X)u1L~>gURd~
zE&~{}K@4+A_!5PtQgyMM|8i)LY2N|M_7S;rWqR4B_;v6lN=?TBzG42Wj-HeAz8PCD
zevh7&%_l)&UZW=;T9~c=i*o*pu*Zs>>t@6{&698fYi-0XIDQCVtpg<D$GN&lznsy&
zCGmzn=)maF*6$&Ni}fPpSVt<e+-7%0iAPb27iYd=z9g4Yjis+ejJoAD?9~MU|H>2R
zzd*Z2tbW$_Y|^3!#5{LRk9gR#V=g^RPs--fzy@&<Cg=K6Y(jj2{+9&!a^BPCZ*|Rb
zX^=Q3T!%P7)<*JGVK*vX4&Xg%-GlSXX<HwwKH@B4*y^J154Q{^Ce_bhaN1|Ab7$g+
zt7x}24q;pq*|s`xnMnTY#T_kK)WtFF^6K>H#XOKYuM6*6(zum29!%aI%O@G6P_{7(
z`UU*z9>|LVS=?vT&&vn31}Dbc>Hsx&n8zS+MMqb({*Y;x8yi_YhaQK5nA~`yV|Sx|
zKBw_(aDF)pdb<}>gX1J@mJ!ZpgW4j~_eJUt1@kXdYm8cm2`hVu7q&U;x<md|F@zOd
z?0zf*SN}zAse|DR(f=0voV9tqoc}UaTtdQw1%6SN%R(+Gq4<&f7d%*}%1WN42gUV{
z$^7dfPTu7w*Uu+;q-aA8-R5g(1C8W1m1X=oO?#c1{LCToqPE0IbANt787E#}u0KT1
z#qjJr&N6sFW}SPutph>b2!5%wyPTOZ5lEz3SGQ?ca^54%e^sR97p)y~O`#)Y>=ns@
z0e0HIXnwc=@4cEFp667>YFIXV116UY#AR&c#p1A;h{<FStnTJE1;m-aTm*LJ97B<s
z3FN7_()>ea4_@eSo84xec$v-DhS-%HKg`zN5t}Pskc$gzH<arScN9=MPSBJwRy~Pi
z^eOg0+(fZ2#IG~-bJ<>iC21if!V0j5KcXMW#o72oUs!*br^jJ=V?7;!(d@!bz}5-p
z0q4U`&3MkwNfG7gYtBLoznVq+ozEVM-JW}ozT7qMR`i)X{j#B7m@h51R8&di{%mB9
zRqoHJT2^g(dww@;=FenX3fZm{sA5|tkwTxL?*P_v{tGstyG<qr^*7mt7zQq%a^7{Y
zf)V_Bhc3B`Y2CQq$|l80jO&PES&MUP$79r~bh($Z<~}F6ELNPE?Huezm{*Fl`MA3z
zTb&VhfL}J$Dp|mKrP!Fu*iHdfLde2!{!6WeX%PEb5^XxE$RX}LVpe;o(ScnRo_-PZ
z3+Zx7Wbg@;fV$`^b{*|?)8pm(!*LEnX-K1t<M?$uUEzW=BH+fI5AbU?_;PCTadtDT
z@5=U4?FH=&{aEfJtl+ql<-Ot7qim!9#^F@U!|}!+_BJ7OR`;f{SwnndP%n@gJJ%n=
zk2=ooli=|6f)>E)|MW(2ve#DcslZ5$M&wgO8oz2n5sP@kLGF)$-Qym&q6+51E$$YS
zZE!f$ZQ>>PN2=?=0Ns#((K{%uPjFo&)}n+(Ib&mIHey_Zl;v+Z^q9u)iF@x+!hFsX
zp^h=+Us@U*|HE!AXducU`D|dd4&7;5f{sP_7f{&ib005LMpRjkYN(G2`BzEf^I!8v
zt2ZRSO5cz>PJVcUSZbq|kAZC1v#Xr{+D91|(Zaa=4rt((MgPU5e>Pi3;@~os+~uJD
z@L=ufnHZOaV_$q;4+DhIFmgqf+o<{tr{yq@tMVlS=K_jXe8>JFeSv4p&#iO);l8RH
zhCjx~QvMG$kF4&w?wG25g6_O#*!&)@KYX%?*dR(xOmuY&!g&idll;Uj#}D_3U2ave
z`X1v;8kdO*SN0iAV;H;t9uL1-;9;Vi3Hi8Gx}g6|zK-e|2$A@qD%+5&5MuJeh8$~Z
zGbZB~`(rivhDP&6v`Oc&0gwpG#>@N*^@j)OTU?f~OCY6{H92nuAiEt;CdChxRc}O+
ztEmg7yU|9~M>m9ke;EeKHu$s`Qna8jtId1|p0I#eTm?^$!mkPNFFuXJX)hE0p^ZMb
zLWsl<8ERMm_QP^?*Ey}dI`LW`*jB22H4Ml}Z?A3x|Kf3B6rBHpfz5-6vG=vL%)f}Q
z-PoypjOuK}&rs+q>ud|f$+RZSe{}%|*{4O2iPK(86(RV^yVpGb5b;A3w#BL9X#r$+
z#qu4ES<Fu-49J^h{POzK&`6-SS@h>x3q^*^w#K}@q3REP{Ne!;euV-R;4*~QJ=@Fm
z8{@#0v|I()LK{rW8#YH=v8F-(OJlb6E!kW^`PsLrDFxV?pr>*TMHN3(^X#4fLd=S7
z0**GjP`y`ZUp{pb*6)a?JB1l@pgSl*zc;zv`8qX^VH^Jd8aFQ&>k0I0H_bJE)tfoF
z_P>KS9hNJ`(tiouxg>8YA^&wmSo|>)`3v}dBV4voIL~Uew-1MO2$nyLA9DQ$;)f?u
zwb)ko3fsep>ZL1j!YB)SIO6$--ubT^hiXpif9c#$&8~TGWj#G^FRVm=d`@I3{^e7}
z`)T2!>K=4LRp9gp*PBDG-$1FGJHJ?su^UY#OhOf}X*b4x+{3Ry)#t@7jRUfeP*bUP
zTx;S{jH1s!^Y$2@|Kj6pc;cVSMkvNcfhCWt<k`c#x_@J_8)y7_g>D{#&?Ya*L<z#d
zPMhaP8uyqe3wIZAe>Ms9r&#?MJBk(-CBnZr5{M^gLpXDUnl20awHi+fp1)xlZ0l?n
z<|2+YZR9p4kBczCL;NLti_b4>i`_ZgpChni=^j1BTv)<ByWV<Dx_<*{l!MKj9(qr}
zpD*K=TCbZ?zX5;4r^y#23V0gR@8}`_dK)p%rKOrd{ZHtJ5_5=yVBI(o_M&;QF5}HJ
z*B?Gj3pAL5Myt<AyI2D6M3}iqv}irtXYc&-*WLMr>h<C(j2&=%3WTnyfU$@C>lB@l
zsLHc-a{M$U5Y25JL)~Dc{_vuUQH%hNVcy-^abJMJ5BV3@$}S(SE$X|t{N7t!Xs(NZ
zo8{>#=f9pBN!BA@nUa1A@**9uk^dSOPk6or*B{~txm_L4ZMJb7K#j}UgTbUSV!5|o
zT)*)+m+);6R|3BlmQVumBkNgtJwJKIdylH$FqcuSg%r|1(=r!9r=xT_s}g)6|9S@A
z1?o4l(3Bs0VZ-;>*75n}k;*L3A>-GCxYDgD=<DHzsZINeME+gI_w<GQYdh^n*f7;y
zJxll@3%(zK3pqrKXUF*b@_u<OmrDLVA5~L*cJGtTC389Uq0Qgo{MUZRCO;JHuc^Ev
zy&LNl;a_K*rTc4AdKdDQFa;pa^orX)m@dSg^1h|&=d*~59%R}@u!j;wvn;HWbQ>xE
z$Gd-n@k`lxWh!C$4>A#ph5QTnWqa5J`>euZZ({$X@u!3x@-HA-!^$d9Dr=+hC-D6$
zM<sMnaS(4U`2MIc|K*3^7#*6rtEQa)YM~nNFB<UstiU&ZU-bO)X?n&%Zfi*R=KUuI
z7jmq7WK|@7c#f7kwaDwyPdx}Y3m|J{M7z$jhhF_*l2G!r4Bt{^8>PAdqlr-I6yaab
z(uY@8Bd=%eAXT<8M7^3i2v+CmmzV!~)Isc&DW{sBQDdW)2Ct0rFV&yFMt}Y*!kAa&
zwNcbVvY&wZL#3xFZ5P9q(+t>BLV`IOoPS{4XI}U0p;v!+vnrcc_=Pns(C|w5hf)3o
z58KWopYkELbrP^OW^5Wrz}pd<ytVM~D>V#l+TuLw*^T}VIKa{j>ks+-*M4ds#1k^&
z8`#DmJ}6A0W@+}+?e^Zo^&7vGH<h+*(7#ImB3CeMeUa-o_Qo%k`PXBJfwU6JUtM2!
z_;Q{sHtiE-{&kUlB^MP?25@Cy4=);*-1Y)Ie5;IK`{{<xnoj*w@DI_Sd&LR)FRDNK
zAA5VA<A={tgM=knims|slVgNJMD$r0o_=xt{2sdd?u}Y<b(dcfc9b3kCC1qA@a(F0
z|3*s|rxF$@e_nyqyWP;Qaq#6V>nY<Gv?+&QjRLlmO+e8#D<cP;lz#F38y5*I(nX#+
zv@M7X<bVZ!42|m#nKz*Xw1VAuH-;h&+9wvsSW(Y<`XymA!L};QTu0XWpGK2=6@qDW
zz)DIO{E&ae3GoCE<NQ(_M(Px|>Cm{##OJ?|wI{eeS*!&gaN|3#a2{=4Pt4Z4xe4Rf
zd-S}E<GmLI+j(?V#Si6F{MuJSIpuOfy-fx{_BlcY&UoU&s&Q|<P=9E0-Fp{@4G})|
zI<{GQIlD4`sXB)OaCxJh9ALi}v3Gko)>5uNe9U@EB>M+;B-7@mx}-C(1Hkbuj8yTj
zEccn~=TX*M!uh882uHM7xH!e365>c0V6=XN+DnNE9+$)bCt?@HkG1D{fD!ycHd)3C
zNOwYE^KmvHIAP?y$L3ElehnJ-4%6<4TTrx>rd^#H;C!4ug?|+~;rDV;Xlf;Lk(=$D
zfr_b+e`U3~^gPO<&Ew)j&a?T3T?3yISBm>2VsVr5UuUqD;+kGX?^w$~yTF&fgZvkO
z>@~sNQTz+_8<cP`inA5~+5rUyaR&d2;@4@Z&hNYeyg=B;{>UHGYw~kEu1Nli&kCiw
z;l&|PCR5$l&C>2O=DAlf|H|^W7{8v84V?BmkFa4wX<$NJwEma;<{Rj9r2eo7DhB*I
z4!c@lK|)&=@Onk_UsBEU82VF`TNuAyr{xS}5&q@Tu9@SeckN-ahc3`{3}lh`p$`Eb
zVM*up>n%K4iG_>em(g@*EH6gk79u2QA@B?T$4TXJqR`@TdG~KLXJaGcO@I^|bHoOp
zwWs1&SU;~0RgECX^Ef~OcHWO~MC#{D^<0*q_!sBwpm9x}eyRI6Jf3pOIGt)+jX>g1
z0exn{$1jh6wL2(NUxHe`MNaw{gkO+iWaapwy6q77WgAGylKHJl8_Y!^S_Hp<u#Cb?
zy9$AjVn!yS_@&x3)^l0QK)&u;^MF{-<BG%&`6i8coqjEybFhCn27AtV%2^w|f5YTs
zU;mJg@m(lwT{yqYi?Y-KkVWE$zAJ*Xm(xPE{d|xI!esnHwyQT*=vaW^JPO$AI4|$V
zCNc|%4LZDD9)6{VVmM>yz-gCo+J{B2xyzl5Ur!1^z_>uX&T1GiKZi~GAYBXMQ;r{o
z_aDwBq(64oeqMjw`fl%yZvb}|c>0C<dFx$Xui`4eR#)3!C-&&Wu=8+k_XqgJ{OkFA
z`%l2OegynlT!3LbPY5KQ!ILn4xE<YC*tzE3x)Yr^XV-7uTX)>q?<kP+<A=<@p44#T
zXpcC?!B2**<2EYlhwy|v{93R07hI8yc!ByfdvIAXhkEoo*-<RV4<ADh6(s$fUbS%C
zc!ChSC|tv~&i_^(_{D8-%mK#%xR8F2{u4RTq5f0}Mh8FA@+!~qrx*h8o^icJqF~rP
zI^N)Rsy6EUa%Iy>+%NGaKx(H<jdvLAc(B2r#J?EY#Hd;?a5UTANQyX@yfyXsmm1d)
z6ESv0;sTB$`}~JI{8Ic2+KsgsMSu3mcv0v2!*(~`6RqC>Y&m|PQLs0D1v;-OAPeG$
z707?d#hmuS`7a4jaP^FXbJ<S(JUq`HZ|ul_0lz@In1~?}hO^1J0l71qdbWK32J&B6
zma9nc`7bO12{@EwJLvqR{8!S0Y{X98nA~L3fSK%w@~;v!rKJwm?+sfm+za|Ld9-`+
z?HFJr|8>!Mex!Cp_wT7NVKc|!Ljnsz{Mt!~J{dTdRC4(KL)6cs{@Fpon%`sdxP~hl
zXs>KK27CB(=jm?l57c1*eXfq2|5_;#qb|ih#9<AowpJtci9!Ku5y^kyE(;s^FQmQX
zLWZp?J8(L<P#rn{ML7S}>Y_x=OM9WK2JkDBTbqgIzrePPL<u|v@k1B13+rXI@4^a(
z{42<R>E5OVY;mBqrGRmT_*Kq-vC9W_0Fg(QL7M-qj9;Ap`qNVNhRPoWeV$9)XK=<4
zzp$ounm$C8eEy5aE@}npqj*C`@r&Aen|7`mv(B^2SBNc;M+BxSf?sa{t*)W_hP2b>
zG8I3ZS)y@zp0-ZMFRq_|aR^4n!u-JBSPvn<FZx5tXce2K--5f3Ah3_Lkrrej*p`Q1
z+I9474(GqlcHBT44b^5z<%0qlG30;({W7%2>9Y<n?$3>fKw;M0_Au9P%wHX=3+}gx
z;8(`u7dg~#4BLzO&Z{VXQ7c>ZfTzSp8NYD;>k}dW;-k&XB4_fohxirlYbw0F8=i1E
ze(2xdJ0L}g9%KG>U-dj1aF$v%Vf@g$KdRZO?iOc3rC}T_VZbJE&Tex3A=-?f&EHcn
zKjJ#4s$9P@!|Q4j_t`I-ZxsH?@o4=9wRJqG#>Mv^T4?N_0*K((Fh_D=F0i<5?2166
zU@U=OLHw{{8EvxT+hUv&eX6qw{0rv-;2##izm9lok*fGuvQMUGAlgDybkrVGdzI}*
zSif<l#?b@hzdr5l=N>UfVn2@n6vFxqb=#p0+Qmd{MJcgNZ_9mGF5-gfw*<7E$h=y@
zw!qaVMAfiNE_CN@2Nm@WghQ2C)d={7Xkkg&LnR=w0wBYaNd4g>90?>K5#PUYlN;ke
zJxJCeJbBCW4>|vZHux3VggWRGG1tQ{&VTK((`HNvSE5La_3Iu1!h)Oo%Jmz&=v*g`
zob>B&Sa2A)&#kZ<Utq!imLy#NB5O-q2OHitZx#Tu4D(6>Ys2wFg-x1;BUCnynRD99
zuWiOXOSHIzCn0`)Mjq$|TJb(a$O0gRK;pZka$6yO@r?mME7?)94tPh6(jaR)yI{jZ
z{9+fYiLio44H!=zmlsil&Ghk$kpJQ(NO9WB2WVx-T-Y&J@8-2AT+PS6)E-lH%P!2I
z3b;8CLj3v>*wzZhuh-bkuyFwJf{7bBMz->0zdnAc^ItY#>m>30hq2v)FOq5)iJi@r
z3^hME{{_!HO@J*JJ<df^-BALmIg0FLSbw+$XoYQ@&yCsqo;3p<;GP-|aTk&QQv1gN
z|3WyuF0oNR$)uPPyTL2R?Y-{SDF3Q{FW+u#9d0=5U@asJKE^eK#f|bWc_h=aA^vT>
z0pStE`Q^;Cc*#+jwGqSS`C<MA7Rl$oz$-_RXV-iMLFNIs!A*^eF#q*2NAgh!13CaW
zrdWljkuYRP0*XleA=p;IyhB_=_d|#ci@CIQKt&XXJw4_4;UPk_Fr%BuJ7k=7jj?$D
zK`IX6Ntu6jaCK;N4|pY?cfh#*$p-&AjB$;4`la$;{VgjKg;gk>GFlJDrG82t(pnB}
z-M={!KjdS}q3)R7;;8w6F@G56E9<;@X8!fO#}I*E0}IF1MZWjR`K8!RBCOv4>vwE7
zwoJTi?d!#+U4k{0tZ3!?4{<-h#rnnlD506)wJ5~z*2n4&(*n5_H*$F2Qt?AR_5~fJ
z3E5`<sa)mKgq>!iSLR<P{EhXAztP{6=L(=F+xi;m#X`$e{?*lV+vaUM-!%8gf|Ghk
zG*)jcB|%0e@h@B(1+*HqkqpY>S187#Bsf|Gzo1_V0){}}&<0pg*k}}1;~=xpcx!n1
zFV8H)-6iH<tN8vXbrDB^Uo~7C@B4?G(u$2VD71?3FYo?d;FqOyzDWtk=mi$0;TQ8S
zxKB`gx2_}xpiQX=e)0LQW`~ah;7kNAcIfUv{7@>+cqrgsIR8b>or-euwNa@PVzdJH
zi(-Bz)gM~mU&=jTBK8OanWp*^#V-MG@GJViC?d9%<A;1HC6GGAuOb}<n#W(zGw#t0
zVEvGuq+wZyi7MmQ0((<OGH-rO;M$GOWIpzFxO`ufNtue^*V-gkrlpp#Yb0$DF_b(#
zByD#ff?sviKQPZi{LmuQ$`TyKdiwGfbpk8Iueq>ei)@s;*C`=!$Cv8(K+s7XWRBpM
zI&oQy9YylxIX7{CtVC}aZO0Q&tP1h#44swxls|959$pK>cu^(7wnX^X--3V58)5y*
zf*6j(J`Rw&-$EiRa{pl-{+X)y_3`U&I2Hb_9X|i!_#u3LJ7(l?0XLR=O-2kM3k5~P
zBzSg}@81Bu70?~u9$J8jVcF~gcYOZE`1Nj9K^yMhaN9~yt5G^X1NfDJqv+!o?%y!l
zONsOPMR}<J-}t;<k3^Wth*76%(`)<z4GzN;_UGQP2iG=fn+y6qMouQ(fnvFSqmfX{
zHw+7KN&^RZ5i#NGXcO81ziiLenTCmRp)Q4R{!0l((LquccwD}I@%gU_Y;|<C#JCLM
ziZm?$pSkg#7zOyncZQ&=fGzJB?1+9G#X{;yh+l~Jl3FhhzYss<3?@c8>HPB3hmcm@
z=JT)Wkcjd5FCV{P>kw-KehqWy<!ZYUPdxAq@k>>z*s<*bXSb=zsm_a2EU-O{;1}vH
zGPp~bL%6L@ZN5x2BJsmZ@aL}>0o%fGeEjmp74k2Jb;Pyq(@(iCS#5{miku37K7wCQ
z(gJCI8CznY8w)4P{R#1FE$!<<49yhZF{I?QoCwDi!7tQrFn;|A6lP(G^Irj}iQpH`
zaZsFQ4uhe#%7i^LBw}U!!g{UfZ~vZlcI74OuR0SWp1;8>7{xCvH>^Y>z3T-M!*PZD
zYdbyZAky9qHQz7h$?7chOF4m);)kd|WVSVzp6s1hsz;wSpFD>AOO5oO%+^DiRdlkb
z7$~plB>vT2Os_|M)OopA#tS;1*JC0!DSpUXv{xUO7c%YjuyqUyylEr&#r~LsTeTax
zRG=HCG9Wc!{XExiII!5;#kKN4S5sC8NWmLaXcevBknkb%95#dvkByYuMCv#8rSP7N
z3LC;n?iQT?Qiygaf?qbSm5{1z16_5?eU8-6pF_T~xd)#(jeuLU&msRpMF-Hq|5ZyM
zs3()^=bH%hzl4BxgD*h4@g#Eoi+gxgw>V}zPIo#nt8PdO``p8r%lR)>tJrJetiuUD
z2Jv8i4tu_Ye}8Xx;t~B#%=6ytx^3loF5_2NcF2p;lVFAA)xju2{3>`W=)%k8`=i(p
z1#24euM~1XDt<UdxdAw?$bTV_sDzMzLBC4A-z$65q{C?s>_*7H=J0+d;05$+5~+#s
zFBLxo|C;%IfotbE|MeqevXl_w7uy82>xOxYQq(4d_;rzR`jzpkg;2j?<F9_W==k=~
z_569Se&Yu2&m8*Nl>UVL3p&U(ljCBE?e+QL6PmAsA^*Z{8%87B%qpwkU=o(`*nwXF
z@nO%d`uQ(AA!Ep=6p%7LP_|<s|56r!5_^@+Y#Z_~$Wn+F;@1VNV7q`N`L_L@*?x#Y
zAwY+af89d|T;6q+B?rqy3{ru84*6FaE+4n)P)j+vO@Lo<)+WLzlv?p{!Zr2vi}PRD
zQM?3dQQYWSxB-4~{_7gzGz!~!iuO6guk-Xu@61w)&B+yVQMT(v@MXojL;P~Bw`ikG
z2IrR{<OCmNR!_#gc^<A9!_@&vjeSTKdd*x%BMwyomu+#z^AFwG-xQna<YBY8DSbUC
z=L@O+jug0OlFWRik6$!<j9zqF?6p$2kq$;8%m!h3i88k_uk`ZEC2cTs(FDSt(J$mL
z<=YF167Ky*A-!xKD#s7M$>EWa_!Ig<>)kuyKNt9g)N)sRhd#@&S>KOW#3*N@lCV-B
zcHtt_iR4|X5B{OKEvTO#t5^rO5T3As!rmgt2z>S5&cjj6r!4V#>gM;1uWYmXxomy{
zSn&KnL%}>={W-#c@~nAE{H3?1%)bsgt;1_u^tgP-0gzdGC&3|+af;oB@8ie0dJAg)
zTS>(?@K?P!h}#UX#&seXlCR8i8|GgwS#G=t&iImSS&elc#{2-$@`#ftJ2pIH3y0jv
z^H(82(T)k+&*pYz#TioXk+3ZN@=hDKiMCYs_kuHS$eqEHX3mI}$mVaU^UH;-Yu;2@
zqxISFjR(ccg!o3OYf}91h{W-zU9nXE5qoa|ur+L;5OH_9RK~A^;zBq6W+=CB+*bQg
z@`g09A>A^5y~)wSjySH3GS1n`R5sci;KH~Ld3%iSKkP+x7fa9>m}SHd1&}B&N`CyX
z;#&Ej)6kuI4K)nUn!v9-1dx%eIU+**;wKFbo^aX=Ns4Z9rEwp?Zg+PO-{AP+u)(wo
z+h)SE&o*2$%(JV%t*LcK{;Tqw_MEfMnmOc!*HB20Bv-40MS0WPtJ^A$Va_!0CUc4S
z7%k%Agz>sa{RWrKv+fYWYtlshAq$%62K5_Uf2fXZbI8=6gz)fnq<#Zx<<viv!?akS
zrB>Y%i9>KMMp{|MuY)qv6`wP+QhN7HUR4Q=+v}uf1@#-M{_yL_;^EFB=bU`5r#a$F
zMCv!7O*7Wsug|05k0VcwHHDSp8xhO*&)3rzsUhEWvMy!ZPqu`90m!;hoAHx!{rp<$
zlZ8^%5~N5VaEgR$$Q1_(>*sL<*qnE$st4f_{wqiZ{tTgyero0&p7QjI>o?eH)ohsQ
z3GvVOA^#<D|KWym{;Pl(K1!Oc*ijP&v2NlC{U{a}&Ljo#L%;s8q$B?&Ud=Ct8;^kZ
zMY-Y)oM;{?<JaRf&xv)26Y{=gI}W3MW1EAGWTd*w@x$%lUpsQKZrp+MAdap8$m$Vn
z#9@u~!pE;H;)iexGgnoJmpi0mkHj+87W{>D>1{X|;@2N4{4!fgiD&eGrI*~6vnWNr
zj?T%}B0Rkizs6|7X}cq_OGo{ovy`#mq&#1M<FQ-!@k@f_TpWO@9Phhe!+5&Df;03o
z)+;@t`y514Rt{QCnb`gMW9DF$q7`pC$bXGs;e7uP^&1*I#(KCSA+!zAz>Fq2(2F(>
z+YQCP4CRw-A#fRYa|RcC_7UO$Vf;|m@coCtFNBX!kcPDwM_2tq)>439<M`WB+O?RA
znCE_`Cp{{8H<f>J*zi@A|H=UrCN9gr_Mw~-=F882MFfBBTz`nJvM+&LiBK*?h`CYz
z#oQBDW=WrRg_98BU%=&+%3t;4q9MPC@UM#!YcYn@YCtdpA;Q0qN9*AC*wf!*^E`9>
z@G07vM>zCnbo01cudqK6{<Rl>p=#ekc?4v8^0*@W>v1_RyP5Al^eN2c_}3XL)1R29
z4`<)8T3zJ7F2}zRhFS^QbvC#*D)f;?Dzn^Y6+dLvD`MTJjw`~yBKIFggYZ-M*Jn#t
zA^#Q7uCUJ${#CT^F|QJpZm&<J!!@16zuF{VYs@&WwaKlQ=U)o8*jLA1<xLy<>gD($
z{ISXOB=q?s_;r95__V?g5(YpP;a`taLr3g;xwH0^zay-SUwr@Je1<K)OE3*C<2i~f
z`2L}n|7zi`mTM*hjf?WHl!Dr@tDz9#Up{jQe-#Rs<6qAZJGU?eTt7dRe<`TtKw_lN
zYpjkiez*&>p(y8BaL=Y+!@rnGh202+GXDzLR`{z>n8d%72g1Jb<TZ`(ucxSXAXcC;
z>C-Ma?V^c^Sd@PSc7ttQEaIz2`PUSh6UGxF@k6k!ENIvF1KRaI{7Yg@VeqFYQG|b?
ze!c+yrOGxY*~7{F%VD=L2y2A>iSVz<@k0a~gT`h4Mf--qzqH&zd+OMu{L57PP^ru$
z#SigInF1AJa;DmZ2>(KLp97dsC47t*p>2uqFVq%F>^fYN;)TURdl=zgxC-@s+64F&
z2ZP2Dj||jms@?GQi}@FyZ@R1<i|{X)clL58=fAk~KL4T@R_Z;@3F}5&_7Do1|HNIy
zCX?ue&Wd}rPdmSB%^r#fq@K8olrKtBXna3@ooVEz3DQ=tAxT=6?w~8FLWV*`@WgNP
zLRZD-v^ny3?b*Y|=d@2lm@!;&8+}@S(w-4~>jeiSqMj;AgUb*Kn)f8=bC+U+xX8ex
zg%BiP#U)t?+N`eV=<P1to|;|l3p0e~^mZ3-PtT@cTygCa^htMiredup^g#Gsa@-ji
z!wJVl4$9vQ(kKv22>4r1iB`_Tzwz@z7IFO?JE3+&&~h|Snk)Tpz2H=2wNKIS&}``m
z&TM(b-CCD=;`jMJN5@~~KsdN8m4L|{z+@hWZ+CS#t_~y9i;J903zk0=q<Rv}VJ{I!
zGj#%;3j_;%Lp`xc{a{Tqa;-hnG!6yAcPd(3elp9oE!F0Qj*4vW9ro{-vva;Mqpu?C
zswXlSSI5+GV<s}aY9=Cm&i2;Zx0*9@Mkw6fTVt>4ni00iR@|XoNw>%uS>q1vcj%K4
zw0b2}IKg^VYAa=Tc2<4Gbb-p_BIzYHH5PCXIyb|RADw4)89|#DZq+|7k7aMDuZar1
zC-_P5tru>sxVQJy+25_7eYoOY=?Pc(Ph5Y!Zn;&zSDwh;SYLBE6g2P2)$R;$o^Of1
z$A97MMRE?m*`49(7l~<VmD95QO5>#W8lp<=PI*W6%KD1?L!shM*@Y*wgEqG~6+POg
z=_54TRl+A|76e*Lzl$gSw{GcxCthz?n%JH!s12LNdf|x-`rKjIc+z27IVGrtv$2AB
zQf^ZLZL)7SXA2fGpN!A$(42#}<4FYt<I=Tm_x8-}c*Ux+aGSi{o^4h*!MJdf9(n4^
z0xKHpS3N6q(Bzg5K~mZ_0{tu$>=X;V>Phe|j6JK};p-O+5i8mi!4rR6FF5)n{bEH!
z_-I&ZT<|e6GFqHgAr4X&vSg|!VH;MfY*fESs1a?{6TeXf3R2g0&zxnv5DFEGsLR3M
zbm#`}X{cC#@b`LtXUptIS;%;Ts{|ReA?#Wd2NNtT1SxFFQzPa`J@Ffvop;Tsm$%NF
zF~EXxs|F!EqrM+c%I~?Qd&Vr|7Hx(D;dbMb5FAgK?F8R4=XIFfxmosoo-o_KuWMdM
z{PsRP37Sx~CZtoa5VZ0I^@R9I*e0%jf{wX2WNOwb;o6J|LF?xy<!=EC7y@Pwhr$*9
z6E}EKLw(m_Yf=A}JAEO3XM^Rqb(#Jx^MWSSeresMf4p?|(tFc|u+6_mNdGXl^gBN<
z?z@MDLoY{#@Q*KUUHj_HcZQChR>I<_5VpDb3%~v2FFiT>^K&dbeB<bY=WgE6b$I5U
z(NljBw$Vh7v)#Jhs5&@Bm{a8jjf@B!PXXw#jkt{6@R3>u?;$F~Xo#mQSU_0+#{?YD
zkskpZPZQjr&HKKGk=p+;r{S^>&{_NyasJN&V|8y`p>y|)=|b=pH%`iQWwf=^1jmCW
zARA4^W&eqzK|A@!be%wLJZ*_8Qn`%*oS|E3hMX>V@3AyTWVLN{9aTw@rO850eTtl0
zE{n?^K)aqjbkH<_<I4!@MGkt(u#UhqN@@V>QNdMB)VJ7lPsURpSf&3h?Q*#6dnnR-
zPq)@#y#ITGZ#hP{F^g`Y84$F|LWlRQE~=!J(#jh3+H}Et4eXv!aLmO<(*(bb13bM9
zE_+Dr1ekKGac}RO>__Tn9G)h)exJ2l#l3QS_WJs&!_x%6P50$+IY9hF!Fv7M`sHBk
zcgp%~WxaO)G(md(p<A-X25l~VM9wHp6N0^g^_qmsAwV-Od+%|uUXyS+1Zc)(zYX@G
z(`(^!s2O6KK*6|l>UL*kD&pFzX@cXw2bdGZW#wN7PrN3)4=3Sr2+%A9-_o4vY85{5
zzs34BMXkz;=C{EdF4Jmhm9$FJ1b+^@37YSy>Yszt1lNBLRS*K@-TEvPDoqs*1>ag_
zWDnM7ZjI0An<hwq4mF42_%e1ynH=>ZN9$rZW)xPqJV}tjx17!Zm!}KCdPRJ(=$hvu
zKGJkt4gosAW#^WU>7Q_pjoh%LX1d@6<La6Q0U;>3UZ05=j_U$ko+PXcntY(RJQ<Dy
zfc}5OZ%v2e;K_Son@PAF0<;psHb`XQXtGmnA$S3yqsqz!Pr^3rp%R7Ivyv<)d=fV5
z7hI%`>!$mY5IW{r1HqH9N#s4L=nMJH;g1Y9nQLOV!Rht9K;CxVPjm;uuBzr8L94Kh
zavN0|sJGU}-!sn{RydOU#D9|+*~>bA2EPv99k!|N7dvRTv%q4(-0jR)f_f6RnPlJ%
z>7cePF!^DB2sdwWg2keKbDnAPkb@_|dn~#lqa7uO=D1fZt0MX{7WfH-L*9-yDg0CP
zKq`14%{$6(_TNK1KyO-Fg89J{WVtZB@=rL=y^TE2YCZ76V0O?jFt8AH8~^ayK;R$4
zR{tvhBeI0$hb*<WhX0+B=vZ{IDUk?&=?m96*Ev(4P5tk=@=7`N*|h&o)u*E4jr_j-
z(xpo-|94sVSN}=as{E^IjsMfODeH2e!r_y!&lGCz6v2)xAZxC-SJkFvrB>RF-5dT)
z`QupC@JZMv++%^jN1&7r`b|Q8dmn+DK~DqCoi6x$KB~**?eFVB*k+P0hf4ixba_%(
zCD5;^4hAY5YGv>(UzejQ{Off2{oWJNWq&Y{i3+FL*Y@cx{NA8pM3>8dERd$@a`203
z|BmSLwBKDum#4S+z@PlzsHgv)KL6Vjg|dE)7dS&5AN{vm|E9%nX5cq7@S7R<%?$iz
z27WUGznOvm|IL8%m*6nLUvi?O*U5F`W+asp{pG)3#%pxsn=|o${~x(*OQAVAIV+l4
zx@@z5^C9}f@A(h+hyIhzkLpk6gBg~a`G8*Z0qma-YFr=G{=s`(%+G&VFFvUK^Fhte
zf6DiK0Q=`R_UG4|#1CqIKB)b}X7xXl{rRBg=Yz68=+AHP>(^}Q|Iq%)sA9h5xEewt
g@Q+iD<RIbjZ~yr1D>C?77`V0fo`dDIl>dtV4?kTI^8f$<

diff --git a/fpga/fpga_lf.v b/fpga/fpga_lf.v
index 1b7a11276..3082b037b 100644
--- a/fpga/fpga_lf.v
+++ b/fpga/fpga_lf.v
@@ -104,15 +104,19 @@ lo_edge_detect le(
 //   000 --  LF reader (generic)
 //   001 --  LF edge detect (generic)
 //   010 --  LF passthrough
-
-mux8 mux_ssp_clk		(major_mode, ssp_clk,   lr_ssp_clk,   le_ssp_clk,         1'b0,   1'b0, 1'b0, 1'b0, 1'b0, 1'b0);
-mux8 mux_ssp_din		(major_mode, ssp_din,   lr_ssp_din,         1'b0,   lp_ssp_din,   1'b0, 1'b0, 1'b0, 1'b0, 1'b0);
-mux8 mux_ssp_frame		(major_mode, ssp_frame, lr_ssp_frame, le_ssp_frame,       1'b0,   1'b0, 1'b0, 1'b0, 1'b0, 1'b0); 
+/*
+FPGA_MAJOR_MODE_OFF_LF	(6<<5)
+FPGA_MAJOR_MODE_OFF		(7<<5)
+*/
+//                                              000           001           010           011   100   101   110   111
+mux8 mux_ssp_clk		(major_mode, ssp_clk,   lr_ssp_clk,   le_ssp_clk,   1'b0,         1'b0, 1'b0, 1'b0, 1'b0, 1'b0);
+mux8 mux_ssp_din		(major_mode, ssp_din,   lr_ssp_din,   1'b0,         lp_ssp_din,   1'b0, 1'b0, 1'b0, 1'b0, 1'b0);
+mux8 mux_ssp_frame		(major_mode, ssp_frame, lr_ssp_frame, le_ssp_frame, 1'b0,         1'b0, 1'b0, 1'b0, 1'b0, 1'b0); 
 mux8 mux_pwr_oe1		(major_mode, pwr_oe1,   lr_pwr_oe1,   le_pwr_oe1,   lp_pwr_oe1,   1'b0, 1'b0, 1'b0, 1'b0, 1'b0);
 mux8 mux_pwr_oe2		(major_mode, pwr_oe2,   lr_pwr_oe2,   le_pwr_oe2,   lp_pwr_oe2,   1'b0, 1'b0, 1'b0, 1'b0, 1'b0); 
 mux8 mux_pwr_oe3		(major_mode, pwr_oe3,   lr_pwr_oe3,   le_pwr_oe3,   lp_pwr_oe3,   1'b0, 1'b0, 1'b0, 1'b0, 1'b0);
 mux8 mux_pwr_oe4		(major_mode, pwr_oe4,   lr_pwr_oe4,   le_pwr_oe4,   lp_pwr_oe4,   1'b0, 1'b0, 1'b0, 1'b0, 1'b0); 
-mux8 mux_pwr_lo			(major_mode, pwr_lo,    lr_pwr_lo,    le_pwr_lo,    lp_pwr_lo,    1'b0, 1'b0, 1'b0, 1'b0, 1'b0); 
+mux8 mux_pr_lo			(major_mode, pwr_lo,    lr_pwr_lo,    le_pwr_lo,    lp_pwr_lo,    1'b0, 1'b0, 1'b0, 1'b1, 1'b0); 
 mux8 mux_pwr_hi			(major_mode, pwr_hi,    lr_pwr_hi,    le_pwr_hi,    lp_pwr_hi,    1'b0, 1'b0, 1'b0, 1'b0, 1'b0); 
 mux8 mux_adc_clk		(major_mode, adc_clk,   lr_adc_clk,   le_adc_clk,   lp_adc_clk,   1'b0, 1'b0, 1'b0, 1'b0, 1'b0); 
 mux8 mux_dbg			(major_mode, dbg,       lr_dbg,       le_dbg,       lp_dbg,       1'b0, 1'b0, 1'b0, 1'b0, 1'b0); 

From 1d51b2cd8f07f2f8352f0bda29f5aa8d593ad0bd Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sat, 8 Sep 2018 14:15:05 +0200
Subject: [PATCH 0029/1938] fix: variable name textual

---
 fpga/fpga_lf.v | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/fpga/fpga_lf.v b/fpga/fpga_lf.v
index 3082b037b..2c0a498d0 100644
--- a/fpga/fpga_lf.v
+++ b/fpga/fpga_lf.v
@@ -104,10 +104,8 @@ lo_edge_detect le(
 //   000 --  LF reader (generic)
 //   001 --  LF edge detect (generic)
 //   010 --  LF passthrough
-/*
-FPGA_MAJOR_MODE_OFF_LF	(6<<5)
-FPGA_MAJOR_MODE_OFF		(7<<5)
-*/
+//   110 --  FPGA_MAJOR_MODE_OFF_LF	(rdv40 specific)
+//   111 --  FPGA_MAJOR_MODE_OFF
 //                                              000           001           010           011   100   101   110   111
 mux8 mux_ssp_clk		(major_mode, ssp_clk,   lr_ssp_clk,   le_ssp_clk,   1'b0,         1'b0, 1'b0, 1'b0, 1'b0, 1'b0);
 mux8 mux_ssp_din		(major_mode, ssp_din,   lr_ssp_din,   1'b0,         lp_ssp_din,   1'b0, 1'b0, 1'b0, 1'b0, 1'b0);
@@ -116,7 +114,7 @@ mux8 mux_pwr_oe1		(major_mode, pwr_oe1,   lr_pwr_oe1,   le_pwr_oe1,   lp_pwr_oe1
 mux8 mux_pwr_oe2		(major_mode, pwr_oe2,   lr_pwr_oe2,   le_pwr_oe2,   lp_pwr_oe2,   1'b0, 1'b0, 1'b0, 1'b0, 1'b0); 
 mux8 mux_pwr_oe3		(major_mode, pwr_oe3,   lr_pwr_oe3,   le_pwr_oe3,   lp_pwr_oe3,   1'b0, 1'b0, 1'b0, 1'b0, 1'b0);
 mux8 mux_pwr_oe4		(major_mode, pwr_oe4,   lr_pwr_oe4,   le_pwr_oe4,   lp_pwr_oe4,   1'b0, 1'b0, 1'b0, 1'b0, 1'b0); 
-mux8 mux_pr_lo			(major_mode, pwr_lo,    lr_pwr_lo,    le_pwr_lo,    lp_pwr_lo,    1'b0, 1'b0, 1'b0, 1'b1, 1'b0); 
+mux8 mux_pwr_lo			(major_mode, pwr_lo,    lr_pwr_lo,    le_pwr_lo,    lp_pwr_lo,    1'b0, 1'b0, 1'b0, 1'b1, 1'b0); 
 mux8 mux_pwr_hi			(major_mode, pwr_hi,    lr_pwr_hi,    le_pwr_hi,    lp_pwr_hi,    1'b0, 1'b0, 1'b0, 1'b0, 1'b0); 
 mux8 mux_adc_clk		(major_mode, adc_clk,   lr_adc_clk,   le_adc_clk,   lp_adc_clk,   1'b0, 1'b0, 1'b0, 1'b0, 1'b0); 
 mux8 mux_dbg			(major_mode, dbg,       lr_dbg,       le_dbg,       lp_dbg,       1'b0, 1'b0, 1'b0, 1'b0, 1'b0); 

From 4e42d11d1535e0966fa308f1fad0675f5da7ce3b Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sat, 8 Sep 2018 20:54:54 +0200
Subject: [PATCH 0030/1938] FIX:  HI/LOW fuzz levels.   (one step for ASK/NZR
 etc)

---
 common/lfdemod.c | 75 ++++++++++++++++++++++++++----------------------
 1 file changed, 40 insertions(+), 35 deletions(-)

diff --git a/common/lfdemod.c b/common/lfdemod.c
index f1a593221..9fbf933f4 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -176,10 +176,14 @@ int getHiLo(uint8_t *bits, size_t size, int *high, int *low, uint8_t fuzzHi, uin
 	if (signalprop.isnoise) return -1; 
 	
 	// add fuzz.
-	*high = ((signalprop.high - 128) * fuzzHi + 12800)/100;
-	*low = ((signalprop.low - 128) * fuzzLo + 12800)/100;
+	*high = (signalprop.high * fuzzHi) / 100;
+	if ( signalprop.low < 0 ) {
+		*low = (signalprop.low * fuzzLo) / 100;
+	} else {	
+		*low = signalprop.low * (100 + (100 - fuzzLo))/100;
+	}
 	
-	if (g_debugMode == 1) 
+	if (g_debugMode > 0) 
 		prnt("getHiLo fuzzed: High %d | Low %d", *high, *low);
 	return 1;
 }
@@ -361,7 +365,7 @@ bool loadWaveCounters(uint8_t *samples, size_t size, int lowToLowWaveLen[], int
 	size_t testsize = (size < 512) ? size : 512;
 
 	if ( getHiLo(samples, testsize, high, low, 80, 80) == -1 ) {
-		if (g_debugMode==2) prnt("DEBUG STT: just noise detected - quitting");
+		if (g_debugMode == 2) prnt("DEBUG STT: just noise detected - quitting");
 		return false; //just noise
 	}
 
@@ -508,7 +512,7 @@ int DetectStrongAskClock(uint8_t *dest, size_t size, int high, int low, int *clo
 	// loop through all samples
 	while (i < size) {
 		// measure from low to low
-		startwave= i;
+		startwave = i;
 
 		getNextHigh(dest, size, high, &i);
 		getNextLow(dest, size, low, &i);
@@ -521,7 +525,7 @@ int DetectStrongAskClock(uint8_t *dest, size_t size, int high, int low, int *clo
 	}
 	
 	// set clock
-	if (g_debugMode==2) prnt("DEBUG ASK: DetectStrongAskClock smallest wave: %d", minClk);
+	if (g_debugMode == 2) prnt("DEBUG ASK: DetectStrongAskClock smallest wave: %d", minClk);
 	*clock = getClosestClock(minClk);
 	if (*clock == 0) 
 		return 0;
@@ -554,7 +558,7 @@ int DetectASKClock(uint8_t *dest, size_t size, int *clock, int maxErr) {
 	if (!clockFnd){
 		if (DetectCleanAskWave(dest, size, peak, low)==1){
 			int ans = DetectStrongAskClock(dest, size, peak, low, clock);
-			if (g_debugMode==2) prnt("DEBUG ASK: detectaskclk Clean Ask Wave Detected: clk %i, ShortestWave: %i", *clock ,ans);
+			if (g_debugMode == 2) prnt("DEBUG ASK: detectaskclk Clean Ask Wave Detected: clk %i, ShortestWave: %i", *clock ,ans);
 			if (ans > 0){
 				return ans; //return shortest wave start position
 			}
@@ -609,9 +613,10 @@ int DetectASKClock(uint8_t *dest, size_t size, int *clock, int maxErr) {
 			}
 			//if we found no errors then we can stop here and a low clock (common clocks)
 			//  this is correct one - return this clock
-			if (g_debugMode == 2) prnt("DEBUG ASK: clk %d, err %d, startpos %d, endpos %d", clk[clkCnt], errCnt, ii, i);
-			if (errCnt==0 && clkCnt<7) { 
-				if (!clockFnd) *clock = clk[clkCnt];
+			//if (g_debugMode == 2) prnt("DEBUG ASK: clk %d, err %d, startpos %d, endpos %d", clk[clkCnt], errCnt, ii, i);
+			if (errCnt == 0 && clkCnt < 7) { 
+				if (!clockFnd) 
+					*clock = clk[clkCnt];
 				return ii;
 			}
 			//if we found errors see if it is lowest so far and save it as best run
@@ -625,13 +630,13 @@ int DetectASKClock(uint8_t *dest, size_t size, int *clock, int maxErr) {
 	uint8_t best = 0;
 	for (k=1; k < clkEnd; ++k){
 		if (bestErr[k] < bestErr[best]){
-			if (bestErr[k] == 0) bestErr[k]=1;
+			if (bestErr[k] == 0) bestErr[k] = 1;
 			// current best bit to error ratio     vs  new bit to error ratio
 			if ( (size/clk[best])/bestErr[best] < (size/clk[k])/bestErr[k] ){
 				best = k;
 			}
 		}
-		if (g_debugMode == 2) prnt("DEBUG ASK: clk %d, # Errors %d, Current Best Clk %d, bestStart %d", clk[k], bestErr[k], clk[best], bestStart[best]);
+		//if (g_debugMode == 2) prnt("DEBUG ASK: clk %d, # Errors %d, Current Best Clk %d, bestStart %d", clk[k], bestErr[k], clk[best], bestStart[best]);
 	}
 	if (!clockFnd) *clock = clk[best];
 	
@@ -672,7 +677,7 @@ int DetectStrongNRZClk(uint8_t *dest, size_t size, int peak, int low, bool *stro
 	if (lowestTransition == 255) 
 		lowestTransition = 0;
 	
-	if (g_debugMode==2) prnt("DEBUG NRZ: detectstrongNRZclk smallest wave: %d", lowestTransition);
+	if (g_debugMode == 2) prnt("DEBUG NRZ: detectstrongNRZclk smallest wave: %d", lowestTransition);
 	// if less than 10% of the samples were not peaks (or 90% were peaks) then we have a strong wave
 	if (transitionSampleCount / size < 10) {
 		*strong = true;
@@ -795,7 +800,7 @@ int DetectNRZClock(uint8_t *dest, size_t size, int clock, size_t *clockStartIdx)
 		} else if (peaksdet[m] > peaksdet[best]){
 			best = m;
 		}
-		if (g_debugMode==2) prnt("DEBUG NRZ: Clk: %d, peaks: %d, minPeak: %d, bestClk: %d, lowestTrs: %d", clk[m], peaksdet[m], minPeak, clk[best], lowestTransition);
+		if (g_debugMode == 2) prnt("DEBUG NRZ: Clk: %d, peaks: %d, minPeak: %d, bestClk: %d, lowestTrs: %d", clk[m], peaksdet[m], minPeak, clk[best], lowestTransition);
 	}
 	*clockStartIdx	= bestStart[best];
 	return clk[best];
@@ -867,7 +872,7 @@ uint16_t countFC(uint8_t *bits, size_t size, uint8_t fskAdj) {
 		} else if(fcCnts[i]>fcCnts[best3]){
 			best3=i;
 		}
-		if (g_debugMode==2) prnt("DEBUG countfc: FC %u, Cnt %u, best fc: %u, best2 fc: %u",fcLens[i],fcCnts[i],fcLens[best1],fcLens[best2]);
+		if (g_debugMode == 2) prnt("DEBUG countfc: FC %u, Cnt %u, best fc: %u, best2 fc: %u",fcLens[i],fcCnts[i],fcLens[best1],fcLens[best2]);
 		if (fcLens[i]==0) break;
 	}
 	if (fcLens[best1]==0) return 0;
@@ -880,7 +885,7 @@ uint16_t countFC(uint8_t *bits, size_t size, uint8_t fskAdj) {
 		fcL=fcLens[best1];
 	}
 	if ((size-180)/fcH/3 > fcCnts[best1]+fcCnts[best2]) {
-		if (g_debugMode==2) prnt("DEBUG countfc: fc is too large: %u > %u. Not psk or fsk",(size-180)/fcH/3,fcCnts[best1]+fcCnts[best2]);
+		if (g_debugMode == 2) prnt("DEBUG countfc: fc is too large: %u > %u. Not psk or fsk",(size-180)/fcH/3,fcCnts[best1]+fcCnts[best2]);
 		return 0; //lots of waves not psk or fsk
 	}
 	// TODO: take top 3 answers and compare to known Field clocks to get top 2
@@ -910,7 +915,7 @@ int DetectPSKClock(uint8_t *dest, size_t size, int clock, size_t *firstPhaseShif
 	
 	*fc = fcs & 0xFF;
 	
-	if (g_debugMode==2) prnt("DEBUG PSK: FC: %d, FC2: %d",*fc, fcs>>8);
+	if (g_debugMode == 2) prnt("DEBUG PSK: FC: %d, FC2: %d",*fc, fcs>>8);
 	
 	if ((fcs >> 8) == 10 && *fc == 8) return 0;
 	
@@ -1068,14 +1073,14 @@ uint8_t detectFSKClk(uint8_t *bits, size_t size, uint8_t fcHigh, uint8_t fcLow,
 		} else if(rfCnts[i] > rfCnts[rfHighest3]){
 			rfHighest3 = i;
 		}
-		if (g_debugMode==2) 
+		if (g_debugMode == 2) 
 			prnt("DEBUG FSK: RF %d, cnts %d", rfLens[i], rfCnts[i]);
 	}  
 	// set allowed clock remainder tolerance to be 1 large field clock length+1 
 	//   we could have mistakenly made a 9 a 10 instead of an 8 or visa versa so rfLens could be 1 FC off  
 	uint8_t tol1 = fcHigh+1; 
 	
-	if (g_debugMode==2) 
+	if (g_debugMode == 2) 
 		prnt("DEBUG FSK: most counted rf values: 1 %d, 2 %d, 3 %d", rfLens[rfHighest], rfLens[rfHighest2], rfLens[rfHighest3]);
 
 	// loop to find the highest clock that has a remainder less than the tolerance
@@ -1086,7 +1091,7 @@ uint8_t detectFSKClk(uint8_t *bits, size_t size, uint8_t fcHigh, uint8_t fcLow,
 		if (rfLens[rfHighest] % clk[ii] < tol1 || rfLens[rfHighest] % clk[ii] > clk[ii]-tol1){
 			if (rfLens[rfHighest2] % clk[ii] < tol1 || rfLens[rfHighest2] % clk[ii] > clk[ii]-tol1){
 				if (rfLens[rfHighest3] % clk[ii] < tol1 || rfLens[rfHighest3] % clk[ii] > clk[ii]-tol1){
-					if (g_debugMode==2) 
+					if (g_debugMode == 2) 
 						prnt("DEBUG FSK: clk %d divides into the 3 most rf values within tolerance",clk[ii]);
 					break;
 				}
@@ -1147,7 +1152,7 @@ bool DetectST(uint8_t *buffer, size_t *size, int *foundclock, size_t *ststart, s
 	clk = getClosestClock(minClk);
 		// clock not found - ERROR
 		if (!clk) {
-			if (g_debugMode==2) prnt("DEBUG STT: clock not found - quitting");
+			if (g_debugMode == 2) prnt("DEBUG STT: clock not found - quitting");
 			return false;
 		}
 	*foundclock = clk;
@@ -1155,10 +1160,10 @@ bool DetectST(uint8_t *buffer, size_t *size, int *foundclock, size_t *ststart, s
 	tol = clk/8;
 	if (!findST(&start, &skip, tmpbuff, waveLen, clk, tol, j, &i)) {
 	// first ST not found - ERROR
-		if (g_debugMode==2) prnt("DEBUG STT: first STT not found - quitting");
+		if (g_debugMode == 2) prnt("DEBUG STT: first STT not found - quitting");
 		return false;
 	} else {
-		if (g_debugMode==2) prnt("DEBUG STT: first STT found at wave: %i, skip: %i, j=%i", start, skip, j);
+		if (g_debugMode == 2) prnt("DEBUG STT: first STT found at wave: %i, skip: %i, j=%i", start, skip, j);
 	}
 	if (waveLen[i+2] > clk*1+tol)
 		phaseoff = 0;
@@ -1174,11 +1179,11 @@ bool DetectST(uint8_t *buffer, size_t *size, int *foundclock, size_t *ststart, s
 	i += 3;
 	if (!findST(&dummy1, &end, tmpbuff, waveLen, clk, tol, j, &i)) {
 	//didn't find second ST - ERROR
-		if (g_debugMode==2) prnt("DEBUG STT: second STT not found - quitting");
+		if (g_debugMode == 2) prnt("DEBUG STT: second STT not found - quitting");
 		return false;
 	}
 	end -= phaseoff;
-	if (g_debugMode==2) prnt("DEBUG STT: start of data: %d end of data: %d, datalen: %d, clk: %d, bits: %d, phaseoff: %d", skip, end, end-skip, clk, (end-skip)/clk, phaseoff);
+	if (g_debugMode == 2) prnt("DEBUG STT: start of data: %d end of data: %d, datalen: %d, clk: %d, bits: %d, phaseoff: %d", skip, end, end-skip, clk, (end-skip)/clk, phaseoff);
 	//now begin to trim out ST so we can use normal demod cmds
 	start = skip;
 	size_t datalen = end - start;
@@ -1190,12 +1195,12 @@ bool DetectST(uint8_t *buffer, size_t *size, int *foundclock, size_t *ststart, s
 		// padd the amount off - could be problematic...  but shouldn't happen often
 		datalen -= datalen % clk;
 	} else {
-		if (g_debugMode==2) prnt("DEBUG STT: datalen not divisible by clk: %u %% %d = %d - quitting", datalen, clk, datalen % clk);
+		if (g_debugMode == 2) prnt("DEBUG STT: datalen not divisible by clk: %u %% %d = %d - quitting", datalen, clk, datalen % clk);
 		return false;
 	}
 	// if datalen is less than one t55xx block - ERROR
 	if (datalen/clk < 8*4) {
-		if (g_debugMode==2) prnt("DEBUG STT: datalen is less than 1 full t55xx block - quitting");		
+		if (g_debugMode == 2) prnt("DEBUG STT: datalen is less than 1 full t55xx block - quitting");		
 		return false;
 	}
 	size_t dataloc = start;
@@ -1211,7 +1216,7 @@ bool DetectST(uint8_t *buffer, size_t *size, int *foundclock, size_t *ststart, s
 	
 	size_t newloc = 0;
 	i=0;
-	if (g_debugMode==2) prnt("DEBUG STT: Starting STT trim - start: %d, datalen: %d ",dataloc, datalen);		
+	if (g_debugMode == 2) prnt("DEBUG STT: Starting STT trim - start: %d, datalen: %d ",dataloc, datalen);		
 	bool firstrun = true;
 	// warning - overwriting buffer given with raw wave data with ST removed...
 	while ( dataloc < bufsize-(clk/2) ) {
@@ -1241,7 +1246,7 @@ bool DetectST(uint8_t *buffer, size_t *size, int *foundclock, size_t *ststart, s
 		}
 		newloc += i;
 		//skip next ST  -  we just assume it will be there from now on...
-		if (g_debugMode==2) prnt("DEBUG STT: skipping STT at %d to %d", dataloc, dataloc+(clk*4));
+		if (g_debugMode == 2) prnt("DEBUG STT: skipping STT at %d to %d", dataloc, dataloc+(clk*4));
 		dataloc += clk*4;
 	}
 	*size = newloc;
@@ -1387,7 +1392,7 @@ int cleanAskRawDemod(uint8_t *bits, size_t *size, int clk, int invert, int high,
 				if (smplCnt > clk-(clk/4)-1) { //full clock
 					if (smplCnt > clk + (clk/4)+1) { //too many samples
 						errCnt++;
-						if (g_debugMode==2) prnt("DEBUG:(cleanAskRawDemod) ASK Modulation Error at: %u", i);
+						if (g_debugMode == 2) prnt("DEBUG:(cleanAskRawDemod) ASK Modulation Error at: %u", i);
 						bits[bitCnt++] = 7;
 					} else if (waveHigh) {
 						bits[bitCnt++] = invert;
@@ -1431,7 +1436,7 @@ int askdemod_ext(uint8_t *bits, size_t *size, int *clk, int *invert, int maxErr,
 	if (*clk==0 || start < 0) return -3;
 	if (*invert != 1) *invert = 0;
 	if (amp==1) askAmp(bits, *size);
-	if (g_debugMode==2) prnt("DEBUG ASK: clk %d, beststart %d, amp %d", *clk, start, amp);
+	if (g_debugMode == 2) prnt("DEBUG ASK: clk %d, beststart %d, amp %d", *clk, start, amp);
 		
 	//start pos from detect ask clock is 1/2 clock offset
 	// NOTE: can be negative (demod assumes rest of wave was there)
@@ -1448,7 +1453,7 @@ int askdemod_ext(uint8_t *bits, size_t *size, int *clk, int *invert, int maxErr,
 	// if clean clipped waves detected run alternate demod
 	if (DetectCleanAskWave(bits, *size, high, low)) {
 
-		if (g_debugMode==2) prnt("DEBUG ASK: Clean Wave Detected - using clean wave demod");
+		if (g_debugMode == 2) prnt("DEBUG ASK: Clean Wave Detected - using clean wave demod");
 		
 		errCnt = cleanAskRawDemod(bits, size, *clk, *invert, high, low, startIdx);
 
@@ -1479,7 +1484,7 @@ int askdemod_ext(uint8_t *bits, size_t *size, int *clk, int *invert, int maxErr,
 				bits[bitnum++] = *invert ^ 1;
 			} else if (i-lastBit >= *clk+tol) {
 				if (bitnum > 0) {
-					if (g_debugMode==2) prnt("DEBUG: (askdemod_ext) Modulation Error at: %u", i);
+					if (g_debugMode == 2) prnt("DEBUG: (askdemod_ext) Modulation Error at: %u", i);
 					bits[bitnum++]=7;
 					errCnt++;						
 				} 
@@ -1545,7 +1550,7 @@ int nrzRawDemod(uint8_t *dest, size_t *size, int *clk, int *invert, int *startId
 			numBits += (i - lastBit + (*clk/4)) / *clk;
 			if (lastBit == 0) {
 				*startIdx = i - (numBits * *clk);
-				if (g_debugMode==2) prnt("DEBUG NRZ: startIdx %i", *startIdx);
+				if (g_debugMode == 2) prnt("DEBUG NRZ: startIdx %i", *startIdx);
 			}
 			lastBit = i-1;
 		}
@@ -1791,7 +1796,7 @@ int pskRawDemod_ext(uint8_t *dest, size_t *size, int *clock, int *invert, int *s
 	*startIdx = firstFullWave - (*clock * numBits)+2;
 	//set start of wave as clock align
 	lastClkBit = firstFullWave;
-	if (g_debugMode==2) prnt("DEBUG PSK: firstFullWave: %u, waveLen: %u, startIdx %i",firstFullWave,fullWaveLen, *startIdx);
+	if (g_debugMode == 2) prnt("DEBUG PSK: firstFullWave: %u, waveLen: %u, startIdx %i",firstFullWave,fullWaveLen, *startIdx);
 	if (g_debugMode == 2) prnt("DEBUG PSK: clk: %d, lastClkBit: %u, fc: %u", *clock, lastClkBit, fc);
 	waveStart = 0;
 	dest[numBits++] = curPhase; //set first read bit

From ba9de80eeb3c63bb78ccc97cb758cc2359db0609 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sun, 9 Sep 2018 11:29:11 +0200
Subject: [PATCH 0031/1938] chg: 'hf legic sim'  break sim by sending another
 cmd

---
 armsrc/legicrfsim.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/armsrc/legicrfsim.c b/armsrc/legicrfsim.c
index 71c747115..1816a29ca 100644
--- a/armsrc/legicrfsim.c
+++ b/armsrc/legicrfsim.c
@@ -460,7 +460,7 @@ void LegicRfSimulate(uint8_t cardtype) {
 
   LED_A_ON();
   DbpString("Starting Legic emulator, press button to end");
-  while(!BUTTON_PRESS()) {
+  while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
     WDT_HIT();
 
     // wait for carrier, restart after timeout

From 90f29bf430a73d3824eab03abc0f7b8886bb3201 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sun, 9 Sep 2018 11:29:37 +0200
Subject: [PATCH 0032/1938] chg:  call specific noise function

---
 armsrc/lfsampling.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/armsrc/lfsampling.c b/armsrc/lfsampling.c
index c419d5781..22171e2c3 100644
--- a/armsrc/lfsampling.c
+++ b/armsrc/lfsampling.c
@@ -204,7 +204,7 @@ uint32_t DoAcquisition(uint8_t decimation, uint32_t bits_per_sample, bool averag
 	}
 	
 	// Ensure that noise check is performed for any device-side processing
-	justNoise(dest, bufsize);
+	isNoise(dest, bufsize);
 	
 	return data.numbits;
 }

From d774e4c84fb59a1ff4f3aa61fd52e92547769883 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sun, 9 Sep 2018 12:34:43 +0200
Subject: [PATCH 0033/1938] Chg:  step2 in the signed vis unsigned graphbuffer
 signal processing. It will break some tone-based demods like ti etc.

---
 client/cmddata.c     |  48 ++++++++-----
 client/cmdlf.c       |  68 +++++++++---------
 client/cmdlfem4x.c   | 138 ++++++++++++++++++------------------
 client/cmdlfindala.c |  40 ++++++-----
 client/cmdlfio.c     |   4 +-
 client/cmdlft55xx.c  |  17 +++--
 common/lfdemod.c     | 164 ++++++++++++++++++++++++++++---------------
 common/lfdemod.h     |  14 ++--
 8 files changed, 276 insertions(+), 217 deletions(-)

diff --git a/client/cmddata.c b/client/cmddata.c
index 7d8cef081..f4bfb3ff4 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -456,8 +456,8 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
 	int maxErr = 100;
 	int maxLen = 0;
 	uint8_t askamp = 0;
-	char amp = param_getchar(Cmd, 0);
-	uint8_t BitStream[MAX_GRAPH_TRACE_LEN] = {0};
+	char amp = tolower(param_getchar(Cmd, 0));
+	uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
 
 	sscanf(Cmd, "%i %i %i %i %c", &clk, &invert, &maxErr, &maxLen, &amp);
 
@@ -473,7 +473,7 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
 		clk = 0;
 	}
 
-	size_t BitLen = getFromGraphBuf(BitStream);
+	size_t BitLen = getFromGraphBuf(bits);
 
 	PrintAndLogEx(DEBUG, "DEBUG: (ASKDemod_ext) Bitlen from grphbuff: %d", BitLen);
 
@@ -483,13 +483,13 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
 
 	int foundclk = 0;
 	//amp before ST check
-	if (amp == 'a' || amp == 'A')
-		askAmp(BitStream, BitLen); 
+	if (amp == 'a')
+		askAmp(bits, BitLen); 
 
 	bool st = false;
 	size_t ststart = 0, stend = 0;
 	if (*stCheck) 
-		st = DetectST(BitStream, &BitLen, &foundclk, &ststart, &stend);
+		st = DetectST(bits, &BitLen, &foundclk, &ststart, &stend);
 
 	if (st) {
 		*stCheck = st;
@@ -501,10 +501,10 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
 	}
 
 	int startIdx = 0;
-	int errCnt = askdemod_ext(BitStream, &BitLen, &clk, &invert, maxErr, askamp, askType, &startIdx);
+	int errCnt = askdemod_ext(bits, &BitLen, &clk, &invert, maxErr, askamp, askType, &startIdx);
 
 	if (errCnt < 0 || BitLen < 16){  //if fatal error (or -1)
-		PrintAndLogEx(DEBUG, "DEBUG: (ASKDemod_ext) No data found errors:%d, invert:%d, bitlen:%d, clock:%d", errCnt, invert, BitLen, clk);
+		PrintAndLogEx(DEBUG, "DEBUG: (ASKDemod_ext) No data found errors:%d, invert:%c, bitlen:%d, clock:%d", errCnt, (invert)?'Y':'N', BitLen, clk);
 		return 0;
 	}
 
@@ -516,7 +516,7 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
 	if (verbose || g_debugMode) PrintAndLogEx(DEBUG, "DEBUG: (ASKDemod_ext) Using clock:%d, invert:%d, bits found:%d", clk, invert, BitLen);
 
 	//output
-	setDemodBuf(BitStream,BitLen,0);
+	setDemodBuf(bits, BitLen, 0);
 	setClockGrid(clk, startIdx);
 
 	if (verbose || g_debugMode){
@@ -1429,6 +1429,7 @@ int getSamples(int n, bool silent) {
 		GraphTraceLen = j;
 		
 		if (!silent) PrintAndLogEx(NORMAL, "Unpacked %d samples" , j );
+		
 	} else {
 		for (int j = 0; j < n; j++) {
 			GraphBuffer[j] = ((int)got[j]) - 128;
@@ -1436,9 +1437,11 @@ int getSamples(int n, bool silent) {
 		GraphTraceLen = n;
 	}
 
-//ICEMAN todo
-  // set signal properties low/high/mean/amplitude and is_noice detection
-	justNoise(GraphBuffer, GraphTraceLen);
+	//ICEMAN todo
+	uint8_t bits[GraphTraceLen];
+	size_t size = getFromGraphBuf(bits);
+	// set signal properties low/high/mean/amplitude and is_noice detection
+	isNoise(bits, size);
 	
 	setClockGrid(0, 0);
 	DemodBufferLen = 0;
@@ -1569,9 +1572,9 @@ int CmdLoad(const char *Cmd) {
 	DemodBufferLen = 0;
 	RepaintGraphWindow();
 	
-//ICEMAN todo	
+	//ICEMAN todo	
 	// set signal properties low/high/mean/amplitude and isnoice detection
-	justNoise(GraphBuffer, GraphTraceLen);
+	isNoise_int(GraphBuffer, GraphTraceLen);
 	return 0;
 }
 
@@ -1637,9 +1640,9 @@ int CmdNorm(const char *Cmd) {
 	}
 	RepaintGraphWindow();
 	
-//ICEMAN todo	
+	//ICEMAN todo	
 	// set signal properties low/high/mean/amplitude and isnoice detection
-	justNoise(GraphBuffer, GraphTraceLen);	
+	isNoise_int(GraphBuffer, GraphTraceLen);	
 	return 0;
 }
 
@@ -1722,7 +1725,12 @@ int CmdDirectionalThreshold(const char *Cmd) {
 
 	PrintAndLogEx(INFO, "Applying Up Threshold: %d, Down Threshold: %d\n", up, down);
 
-	directionalThreshold(GraphBuffer, GraphBuffer,GraphTraceLen, up, down);
+	directionalThreshold(GraphBuffer, GraphBuffer, GraphTraceLen, up, down);
+	
+	//ICEMAN todo	
+	// set signal properties low/high/mean/amplitude and isnoice detection
+	isNoise_int(GraphBuffer, GraphTraceLen);
+	
 	RepaintGraphWindow();
 	return 0;
 }
@@ -1751,7 +1759,7 @@ int CmdZerocrossings(const char *Cmd) {
 
 	//ICEMAN todo	
 	// set signal properties low/high/mean/amplitude and isnoice detection
-	justNoise(GraphBuffer, GraphTraceLen);
+	isNoise_int(GraphBuffer, GraphTraceLen);
 	
 	RepaintGraphWindow();
 	return 0;
@@ -2004,6 +2012,10 @@ int CmdDataIIR(const char *Cmd){
 	uint8_t k = param_get8(Cmd, 0);
 	//iceIIR_Butterworth(GraphBuffer, GraphTraceLen);
 	iceSimple_Filter(GraphBuffer, GraphTraceLen, k);
+	//ICEMAN todo	
+	// set signal properties low/high/mean/amplitude and isnoice detection
+	isNoise_int(GraphBuffer, GraphTraceLen);
+	
 	RepaintGraphWindow();
 	return 0;
 }
diff --git a/client/cmdlf.c b/client/cmdlf.c
index ccb781014..50077add2 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -147,10 +147,9 @@ int CmdLFCommandRead(const char *Cmd) {
 	bool errors = false;
 
   	uint8_t cmdp = 0;
-	while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch(param_getchar(Cmd, cmdp)) {
+	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+		switch (tolower(param_getchar(Cmd, cmdp))) {
 		case 'h':
-		case 'H':
 			return usage_lf_cmdread();
 		case 'c':
 			param_getstr(Cmd, cmdp+1, (char *)&c.d.asBytes, sizeof(c.d.asBytes));
@@ -188,16 +187,20 @@ int CmdLFCommandRead(const char *Cmd) {
 
 int CmdFlexdemod(const char *Cmd) {
 #define LONG_WAIT 100	
-	int i, j, start, bit, sum;
-	int phase = 0;
+	int i, j, start, bit, sum, phase = 0;
 
-	for (i = 0; i < GraphTraceLen; ++i)
-		GraphBuffer[i] = (GraphBuffer[i] < 0) ? -1 : 1;
+	uint8_t data[MAX_GRAPH_TRACE_LEN] = {0};
+	size_t size = getFromGraphBuf(data);
+	if (size == 0) 
+		return 0;
+	
+	for (i = 0; i < size; ++i)
+		data[i] = (data[i] < 0) ? -1 : 1;
 
-	for (start = 0; start < GraphTraceLen - LONG_WAIT; start++) {
-		int first = GraphBuffer[start];
+	for (start = 0; start < size - LONG_WAIT; start++) {
+		int first = data[start];
 		for (i = start; i < start + LONG_WAIT; i++) {
-			if (GraphBuffer[i] != first) {
+			if (data[i] != first) {
 				break;
 			}
 		}
@@ -205,20 +208,21 @@ int CmdFlexdemod(const char *Cmd) {
 			break;
 	}
 	
-	if (start == GraphTraceLen - LONG_WAIT) {
+	if (start == size - LONG_WAIT) {
 		PrintAndLogEx(NORMAL, "nothing to wait for");
 		return 0;
 	}
 
-	GraphBuffer[start] = 2;
-	GraphBuffer[start+1] = -2;
+	data[start] = 4;
+	data[start+1] = 0;
+	
 	uint8_t bits[64] = {0x00};
 
 	i = start;
 	for (bit = 0; bit < 64; bit++) {
 		sum = 0;
 		for (int j = 0; j < 16; j++) {
-			sum += GraphBuffer[i++];
+			sum += data[i++];
 		}
 		bits[bit] = (sum > 0) ? 1 : 0;
 		PrintAndLogEx(NORMAL, "bit %d sum %d", bit, sum);
@@ -227,7 +231,7 @@ int CmdFlexdemod(const char *Cmd) {
 	for (bit = 0; bit < 64; bit++) {
 		sum = 0;
 		for (j = 0; j < 16; j++)
-			sum += GraphBuffer[i++];
+			sum += data[i++];
 
 		if (sum > 0 && bits[bit] != 1) PrintAndLogEx(NORMAL, "oops1 at %d", bit);
 
@@ -235,8 +239,9 @@ int CmdFlexdemod(const char *Cmd) {
 
 	}
 
+	// iceman,  use demod buffer?  blue line?
 	// HACK writing back to graphbuffer.
-	GraphTraceLen = 32*64;
+	GraphTraceLen = 32 * 64;
 	i = 0;
 	for (bit = 0; bit < 64; bit++) {
 		
@@ -261,8 +266,8 @@ int CmdLFSetConfig(const char *Cmd) {
 	uint8_t unsigned_trigg = 0;
 
 	uint8_t cmdp = 0;
-	while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch(param_getchar(Cmd, cmdp)) {
+	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+		switch (param_getchar(Cmd, cmdp)) {
 		case 'h':
 			return usage_lf_config();
 		case 'H':
@@ -348,18 +353,15 @@ int CmdLFRead(const char *Cmd) {
 	bool silent = false;
 	uint32_t samples = 0;
 	uint8_t cmdp = 0;
-	while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch(param_getchar(Cmd, cmdp)) {
+	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+		switch (tolower(param_getchar(Cmd, cmdp))) {
 		case 'h':
-		case 'H':
 			return usage_lf_read();
 		case 's':
-		case 'S':
 			silent = true;
 			cmdp++;
 			break;
 		case 'd':
-		case 'D':  
 			samples = param_get32ex(Cmd, cmdp, 0, 10);
 			cmdp +=2;
 			break;
@@ -377,8 +379,8 @@ int CmdLFRead(const char *Cmd) {
 }
 
 int CmdLFSnoop(const char *Cmd) {
-	uint8_t cmdp = param_getchar(Cmd, 0);
-	if(cmdp == 'h' || cmdp == 'H') return usage_lf_snoop();
+	uint8_t cmdp = tolower(param_getchar(Cmd, 0));
+	if (cmdp == 'h') return usage_lf_snoop();
 	
 	UsbCommand c = {CMD_LF_SNOOP_RAW_ADC_SAMPLES,{0,0,0}};
 	clearCommandBuffer();	
@@ -444,8 +446,8 @@ int CmdLFfskSim(const char *Cmd) {
 	int dataLen = 0;
 	uint8_t cmdp = 0;	
 	
-	while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch(param_getchar(Cmd, cmdp)){
+	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+		switch (param_getchar(Cmd, cmdp)){
 			case 'h':
 				return usage_lf_simfsk();
 			case 'c':
@@ -473,7 +475,7 @@ int CmdLFfskSim(const char *Cmd) {
 				   
 				if (dataLen == 0) errors = true; 
 				if (errors) PrintAndLogEx(WARNING, "Error getting hex data");
-				cmdp+=2;
+				cmdp += 2;
 				break;
 			default:
 				PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
@@ -533,13 +535,12 @@ int CmdLFaskSim(const char *Cmd) {
 	uint8_t encoding = 1, separator = 0, clk = 0, invert = 0;
 	bool errors = false;
 	char hexData[64] = {0x00}; 
-	uint8_t data[255]= {0x00}; // store entered hex data
+	uint8_t data[255] = {0x00}; // store entered hex data
 	int dataLen = 0;
 	uint8_t cmdp = 0;
 	
 	while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch(param_getchar(Cmd, cmdp)) {
-			case 'H':
+		switch (tolower(param_getchar(Cmd, cmdp))) {
 			case 'h': return usage_lf_simask();
 			case 'i':
 				invert = 1;
@@ -632,8 +633,8 @@ int CmdLFpskSim(const char *Cmd) {
 	uint8_t cmdp = 0;
 	uint8_t pskType = 1;
 	
-	while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch(param_getchar(Cmd, cmdp)) {
+	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+		switch (tolower(param_getchar(Cmd, cmdp))) {
 			case 'h':
 				return usage_lf_simpsk();
 			case 'i':
@@ -735,6 +736,7 @@ int CmdLFSimBidir(const char *Cmd) {
 	return 0;
 }
 
+// ICEMAN,  todo,   swap from Graphbuffer.
 int CmdVchDemod(const char *Cmd) {
 	// Is this the entire sync pattern, or does this also include some
 	// data bits that happen to be the same everywhere? That would be
diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 806628fcb..1664a3c2b 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -411,7 +411,7 @@ int CmdEM410xRead(const char *Cmd) {
 // this read loops on device side.
 // uses the demod in lfops.c
 int CmdEM410xRead_device(const char *Cmd) {
-	char cmdp = param_getchar(Cmd, 0);
+	char cmdp = tolower(param_getchar(Cmd, 0));
 	uint8_t findone = (cmdp == '1') ? 1 : 0;
 	UsbCommand c = {CMD_EM410X_DEMOD, {findone, 0, 0}};
 	SendCommand(&c);
@@ -423,13 +423,13 @@ int CmdEM410xRead_device(const char *Cmd) {
 //attempts to demodulate ask while decoding manchester
 //prints binary found and saves in graphbuffer for further commands
 int CmdEM410xDemod(const char *Cmd) {
-	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) > 10 || cmdp == 'h' || cmdp == 'H')	return usage_lf_em410x_demod();
+	char cmdp = tolower(param_getchar(Cmd, 0));
+	if (strlen(Cmd) > 10 || cmdp == 'h') return usage_lf_em410x_demod();
 	
 	uint32_t hi = 0;
 	uint64_t lo = 0;
 
-	if(AskEm410xDemod(Cmd, &hi, &lo, true) != 1) return 0;
+	if (AskEm410xDemod(Cmd, &hi, &lo, true) != 1) return 0;
 	
 	g_em410xid = lo;
 	return 1;
@@ -437,8 +437,8 @@ int CmdEM410xDemod(const char *Cmd) {
 
 // emulate an EM410X tag
 int CmdEM410xSim(const char *Cmd) {
-	char cmdp = param_getchar(Cmd, 0);
-	if (cmdp == 'h' || cmdp == 'H') return usage_lf_em410x_sim();
+	char cmdp = tolower(param_getchar(Cmd, 0));
+	if (cmdp == 'h') return usage_lf_em410x_sim();
 
 	uint8_t uid[5] = {0x00};
 
@@ -594,8 +594,8 @@ int CmdEM410xWatch(const char *Cmd) {
 //currently only supports manchester modulations
 int CmdEM410xWatchnSpoof(const char *Cmd) {
 	
-	char cmdp = param_getchar(Cmd, 0);
-	if (cmdp == 'h' || cmdp == 'H') return usage_lf_em410x_ws();
+	char cmdp = tolower(param_getchar(Cmd, 0));
+	if (cmdp == 'h') return usage_lf_em410x_ws();
 	
 	// loops if the captured ID was in XL-format.
 	CmdEM410xWatch(Cmd);
@@ -784,64 +784,59 @@ uint32_t OutputEM4x50_Block(uint8_t *BitStream, size_t size, bool verbose, bool
  //completed by Marshmellow
 int EM4x50Read(const char *Cmd, bool verbose) {
 	uint8_t fndClk[] = {8,16,32,40,50,64,128};
-	int clk = 0; 
-	int invert = 0;
-	int tol = 0;
-	int i, j, startblock, skip, block, start, end, low, high, minClk;
-	bool complete = false;
-	int tmpbuff[MAX_GRAPH_TRACE_LEN / 64];
+	int clk = 0, invert = 0, tol = 0, phaseoff;
+	int i = 0, j = 0, startblock, skip, block, start, end, low = 0, high = 0, minClk = 255;
 	uint32_t Code[6];
 	char tmp[6];
 	char tmp2[20];
-	int phaseoff;
-	high = low = 0;
+	bool complete = false;
+
+	int tmpbuff[MAX_GRAPH_TRACE_LEN / 64];
 	memset(tmpbuff, 0, sizeof(tmpbuff) );
 
 	// get user entry if any
 	sscanf(Cmd, "%i %i", &clk, &invert);
 	
-	// first get high and low values
-	for (i = 0; i < GraphTraceLen; i++) {
-		if (GraphBuffer[i] > high)
-			high = GraphBuffer[i];
-		else if (GraphBuffer[i] < low)
-			low = GraphBuffer[i];
-	}
+	uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
+	size_t size = getFromGraphBuf(bits);
+	
+	isNoise(bits, size);
+	
+	signal_t *sp = getSignalProperties();
+	high = sp->high;
+	low = sp->low;
 
-	i = 0;
-	j = 0;
-	minClk = 255;
 	// get to first full low to prime loop and skip incomplete first pulse
-	while ((GraphBuffer[i] < high) && (i < GraphTraceLen))
+	while ((bits[i] < high) && (i < size))
 		++i;
-	while ((GraphBuffer[i] > low) && (i < GraphTraceLen))
+	while ((bits[i] > low) && (i < size))
 		++i;
 	skip = i;
 
 	// populate tmpbuff buffer with pulse lengths
-	while (i < GraphTraceLen) {
+	while (i < size) {
 		// measure from low to low
-		while ((GraphBuffer[i] > low) && (i < GraphTraceLen))
+		while ((bits[i] > low) && (i < size))
 			++i;
 		start= i;
-		while ((GraphBuffer[i] < high) && (i < GraphTraceLen))
+		while ((bits[i] < high) && (i < size))
 			++i;
-		while ((GraphBuffer[i] > low) && (i < GraphTraceLen))
+		while ((bits[i] > low) && (i < size))
 			++i;
-		if (j>=(MAX_GRAPH_TRACE_LEN/64)) {
+		if (j >= (MAX_GRAPH_TRACE_LEN/64)) {
 			break;
 		}
-		tmpbuff[j++]= i - start;
-		if (i-start < minClk && i < GraphTraceLen) {
+		tmpbuff[j++] = i - start;
+		if (i-start < minClk && i < size) {
 			minClk = i - start;
 		}
 	}
 	// set clock
 	if (!clk) {
-		for (uint8_t clkCnt = 0; clkCnt<7; clkCnt++) {
-			tol = fndClk[clkCnt]/8;
-			if (minClk >= fndClk[clkCnt]-tol && minClk <= fndClk[clkCnt]+1) { 
-				clk=fndClk[clkCnt];
+		for (uint8_t clkCnt = 0; clkCnt < 7; clkCnt++) {
+			tol = fndClk[clkCnt] / 8;
+			if (minClk >= fndClk[clkCnt] - tol && minClk <= fndClk[clkCnt] + 1) { 
+				clk = fndClk[clkCnt];
 				break;
 			}
 		}
@@ -849,15 +844,15 @@ int EM4x50Read(const char *Cmd, bool verbose) {
 			if (verbose || g_debugMode) PrintAndLogEx(WARNING, "Error: EM4x50 - didn't find a clock");
 			return 0;
 		}
-	} else tol = clk/8;
+	} else tol = clk / 8;
 
 	// look for data start - should be 2 pairs of LW (pulses of clk*3,clk*2)
 	start = -1;
 	for (i= 0; i < j - 4 ; ++i) {
 		skip += tmpbuff[i];
-		if (tmpbuff[i] >= clk*3-tol && tmpbuff[i] <= clk*3+tol)  //3 clocks
-			if (tmpbuff[i+1] >= clk*2-tol && tmpbuff[i+1] <= clk*2+tol)  //2 clocks
-				if (tmpbuff[i+2] >= clk*3-tol && tmpbuff[i+2] <= clk*3+tol) //3 clocks
+		if (tmpbuff[i] >= clk * 3 - tol && tmpbuff[i] <= clk * 3 + tol)  //3 clocks
+			if (tmpbuff[i+1] >= clk * 2 - tol && tmpbuff[i+1] <= clk * 2 + tol)  //2 clocks
+				if (tmpbuff[i+2] >= clk * 3 - tol && tmpbuff[i+2] <= clk * 3 + tol) //3 clocks
 					if (tmpbuff[i+3] >= clk-tol)  //1.5 to 2 clocks - depends on bit following
 					{
 						start= i + 4;
@@ -867,18 +862,20 @@ int EM4x50Read(const char *Cmd, bool verbose) {
 	startblock = i + 4;
 
 	// skip over the remainder of LW
-	skip += tmpbuff[i+1] + tmpbuff[i+2] + clk;
-	if (tmpbuff[i+3]>clk) 
-		phaseoff = tmpbuff[i+3]-clk;
+	skip += (tmpbuff[i+1] + tmpbuff[i+2] + clk);
+	
+	if (tmpbuff[i+3] > clk) 
+		phaseoff = tmpbuff[i+3] - clk;
 	else
 		phaseoff = 0;
+	
 	// now do it again to find the end
 	end = skip;
 	for (i += 3; i < j - 4 ; ++i) {
 		end += tmpbuff[i];
-		if (tmpbuff[i] >= clk*3-tol && tmpbuff[i] <= clk*3+tol)  //3 clocks
-			if (tmpbuff[i+1] >= clk*2-tol && tmpbuff[i+1] <= clk*2+tol)  //2 clocks
-				if (tmpbuff[i+2] >= clk*3-tol && tmpbuff[i+2] <= clk*3+tol) //3 clocks
+		if (tmpbuff[i] >= clk * 3 - tol && tmpbuff[i] <= clk * 3 + tol)  //3 clocks
+			if (tmpbuff[i+1] >= clk * 2 - tol && tmpbuff[i+1] <= clk * 2 + tol)  //2 clocks
+				if (tmpbuff[i+2] >= clk * 3 - tol && tmpbuff[i+2] <= clk * 3 + tol) //3 clocks
 					if (tmpbuff[i+3] >= clk-tol)  //1.5 to 2 clocks - depends on bit following
 					{
 						complete= true;
@@ -897,8 +894,9 @@ int EM4x50Read(const char *Cmd, bool verbose) {
 			return 0;
 		}
 	} else if (start < 0) return 0;
+	
 	start = skip;
-	snprintf(tmp2, sizeof(tmp2),"%d %d 1000 %d", clk, invert, clk*47);
+	snprintf(tmp2, sizeof(tmp2),"%d %d 1000 %d", clk, invert, clk * 47);
 	// save GraphBuffer - to restore it later	
 	save_restoreGB(GRAPH_SAVE);
 	// get rid of leading crap 
@@ -916,17 +914,19 @@ int EM4x50Read(const char *Cmd, bool verbose) {
 		// look for LW before start of next block
 		for ( ; i < j - 4 ; ++i) {
 			skip += tmpbuff[i];
-			if (tmpbuff[i] >= clk*3-tol && tmpbuff[i] <= clk*3+tol)
+			if (tmpbuff[i] >= clk * 3 - tol && tmpbuff[i] <= clk * 3 + tol)
 				if (tmpbuff[i+1] >= clk-tol)
 					break;
 		}
 		if (i >= j-4) break; //next LW not found
 		skip += clk;
-		if (tmpbuff[i+1]>clk)
-			phaseoff = tmpbuff[i+1]-clk;
+		if (tmpbuff[i+1] > clk)
+			phaseoff = tmpbuff[i+1] - clk;
 		else
 			phaseoff = 0;
+		
 		i += 2;
+		
 		if (ASKDemod(tmp2, false, false, 1) < 1) {
 			save_restoreGB(GRAPH_RESTORE);
 			return 0;
@@ -934,14 +934,14 @@ int EM4x50Read(const char *Cmd, bool verbose) {
 		//set DemodBufferLen to just one block
 		DemodBufferLen = skip/clk;
 		//test parities
-		pTest = EM_ByteParityTest(DemodBuffer,DemodBufferLen,5,9,0);	
-		pTest &= EM_EndParityTest(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
-		Code[block] = OutputEM4x50_Block(DemodBuffer,DemodBufferLen,verbose, pTest);
+		Code[block] = OutputEM4x50_Block(DemodBuffer, DemodBufferLen, verbose, pTest);
 		PrintAndLogEx(DEBUG, "\nskipping %d samples, bits:%d", skip, skip/clk);
 		//skip to start of next block
-		snprintf(tmp,sizeof(tmp),"%i",skip);
+		snprintf(tmp, sizeof(tmp), "%i", skip);
 		CmdLtrim(tmp);
 		block++;
 		if (i >= end) break; //in case chip doesn't output 6 blocks
@@ -956,7 +956,7 @@ int EM4x50Read(const char *Cmd, bool verbose) {
 		PrintAndLogEx(NORMAL, "Found data at sample: %i - using clock: %i", start, clk);    
 		end = block;
 		for (block=0; block < end; block++){
-			PrintAndLogEx(NORMAL, "Block %d: %08x",block,Code[block]);
+			PrintAndLogEx(NORMAL, "Block %d: %08x", block, Code[block]);
 		}
 		if (AllPTest) {
 			PrintAndLogEx(NORMAL, "Parities Passed");
@@ -972,19 +972,19 @@ int EM4x50Read(const char *Cmd, bool verbose) {
 }
 
 int CmdEM4x50Read(const char *Cmd) {
-	uint8_t ctmp = param_getchar(Cmd, 0);
-	if ( ctmp == 'H' || ctmp == 'h' ) return usage_lf_em4x50_read();	
+	uint8_t ctmp = tolower(param_getchar(Cmd, 0));
+	if ( ctmp == 'h' ) return usage_lf_em4x50_read();	
 	return EM4x50Read(Cmd, true);
 }
 int CmdEM4x50Write(const char *Cmd){
-	uint8_t ctmp = param_getchar(Cmd, 0);
-	if ( ctmp == 'H' || ctmp == 'h' ) return usage_lf_em4x50_write();
+	uint8_t ctmp = tolower(param_getchar(Cmd, 0));
+	if ( ctmp == 'h' ) return usage_lf_em4x50_write();
 	PrintAndLogEx(NORMAL, "no implemented yet");
 	return 0;
 }
 int CmdEM4x50Dump(const char *Cmd){
-	uint8_t ctmp = param_getchar(Cmd, 0);
-	if ( ctmp == 'H' || ctmp == 'h' ) return usage_lf_em4x50_dump();
+	uint8_t ctmp = tolower(param_getchar(Cmd, 0));
+	if ( ctmp == 'h' ) return usage_lf_em4x50_dump();
 	PrintAndLogEx(NORMAL, "no implemented yet");
 	return 0;
 }
@@ -1000,6 +1000,11 @@ bool downloadSamplesEM(){
 		return false;
 	}
 	setGraphBuf(got, sizeof(got));
+
+	if (isNoise(got, sizeof(got))) {
+		PrintAndLogEx(DEBUG, "No tag found");
+		return false;
+	}
 	return true;
 }
 
@@ -1146,12 +1151,7 @@ int EM4x05ReadWord_ext(uint8_t addr, uint32_t pwd, bool usePwd, uint32_t *word)
 	if ( !downloadSamplesEM() ) {
 		return -1;
 	}
-	int testLen = (GraphTraceLen < 1000) ? GraphTraceLen : 1000;
 	
-	if (justNoise(GraphBuffer, testLen)) {
-		PrintAndLogEx(DEBUG, "No tag found");
-		return -1;
-	}
 	return demodEM4x05resp(word);
 }
 
diff --git a/client/cmdlfindala.c b/client/cmdlfindala.c
index f4993fb5e..dd262e0dc 100644
--- a/client/cmdlfindala.c
+++ b/client/cmdlfindala.c
@@ -184,9 +184,11 @@ int CmdIndalaDemodAlt(const char *Cmd) {
 	int count = 0;
 	int i, j;
 
-	// worst case with GraphTraceLen=64000 is < 4096
+	// worst case with GraphTraceLen=40000 is < 4096
 	// under normal conditions it's < 2048
-
+	uint8_t data[MAX_GRAPH_TRACE_LEN] = {0};
+	size_t datasize = getFromGraphBuf(data);
+	
 	uint8_t rawbits[4096];
 	int rawbit = 0;
 	int worst = 0, worstPos = 0;
@@ -197,9 +199,9 @@ int CmdIndalaDemodAlt(const char *Cmd) {
 	
 	// PrintAndLogEx(NORMAL, "Expecting a bit less than %d raw bits", GraphTraceLen / 32);
 	// loop through raw signal - since we know it is psk1 rf/32 fc/2 skip every other value (+=2)
-	for (i = 0; i < GraphTraceLen-1; i += 2) {
+	for (i = 0; i < datasize-1; i += 2) {
 		count += 1;
-		if ((GraphBuffer[i] > GraphBuffer[i + 1]) && (state != 1)) {
+		if ((data[i] > data[i + 1]) && (state != 1)) {
 			// appears redundant - marshmellow
 			if (state == 0) {
 				for (j = 0; j <  count - 8; j += 16) {
@@ -212,7 +214,7 @@ int CmdIndalaDemodAlt(const char *Cmd) {
 			}
 			state = 1;
 			count = 0;
-		} else if ((GraphBuffer[i] < GraphBuffer[i + 1]) && (state != 0)) {
+		} else if ((data[i] < data[i + 1]) && (state != 0)) {
 			//appears redundant
 			if (state == 1) {
 				for (j = 0; j <  count - 8; j += 16) {
@@ -228,7 +230,7 @@ int CmdIndalaDemodAlt(const char *Cmd) {
 		}
 	}
 	
-	if (rawbit>0){
+	if (rawbit > 0){
 		PrintAndLogEx(NORMAL, "Recovered %d raw bits, expected: %d", rawbit, GraphTraceLen/32);
 		PrintAndLogEx(NORMAL, "worst metric (0=best..7=worst): %d at pos %d", worst, worstPos);
 	} else {
@@ -301,14 +303,14 @@ int CmdIndalaDemodAlt(const char *Cmd) {
 	int idx;
 	uid1 = uid2 = 0;
 	
-	if (uidlen==64){
-		for( idx=0; idx<64; idx++) {
+	if (uidlen == 64){
+		for( idx=0; idx < 64; idx++) {
 				if (showbits[idx] == '0') {
-				uid1=(uid1<<1)|(uid2>>31);
-				uid2=(uid2<<1)|0;
+					uid1 = (uid1<<1) | (uid2>>31);
+					uid2 = (uid2<<1) | 0;
 				} else {
-				uid1=(uid1<<1)|(uid2>>31);
-				uid2=(uid2<<1)|1;
+					uid1 = (uid1<<1) | (uid2>>31);
+					uid2 = (uid2<<1) | 1;
 				} 
 			}
 		PrintAndLogEx(NORMAL, "UID=%s (%x%08x)", showbits, uid1, uid2);
@@ -317,12 +319,12 @@ int CmdIndalaDemodAlt(const char *Cmd) {
 		uid3 = uid4 = uid5 = uid6 = uid7 = 0;
 
 		for( idx=0; idx<224; idx++) {
-				uid1=(uid1<<1)|(uid2>>31);
-				uid2=(uid2<<1)|(uid3>>31);
-				uid3=(uid3<<1)|(uid4>>31);
-				uid4=(uid4<<1)|(uid5>>31);
-				uid5=(uid5<<1)|(uid6>>31);
-				uid6=(uid6<<1)|(uid7>>31);
+				uid1 = (uid1<<1) | (uid2>>31);
+				uid2 = (uid2<<1) | (uid3>>31);
+				uid3 = (uid3<<1) | (uid4>>31);
+				uid4 = (uid4<<1) | (uid5>>31);
+				uid5 = (uid5<<1) | (uid6>>31);
+				uid6 = (uid6<<1) | (uid7>>31);
 			
 			if (showbits[idx] == '0') 
 				uid7 = (uid7<<1) | 0;
@@ -353,7 +355,7 @@ int CmdIndalaDemodAlt(const char *Cmd) {
 	// Remodulating for tag cloning
 	// HACK: 2015-01-04 this will have an impact on our new way of seening lf commands (demod) 
 	// since this changes graphbuffer data.
-	GraphTraceLen = 32*uidlen;
+	GraphTraceLen = 32 * uidlen;
 	i = 0;
 	int phase = 0;
 	for (bit = 0; bit < uidlen; bit++) {
diff --git a/client/cmdlfio.c b/client/cmdlfio.c
index a2bc08217..d2cecec4b 100644
--- a/client/cmdlfio.c
+++ b/client/cmdlfio.c
@@ -83,10 +83,10 @@ int CmdIOProxRead_device(const char *Cmd) {
 int CmdIOProxDemod(const char *Cmd) {
 	int retval = 0;
 	int idx = 0;
-	uint8_t bits[MAX_GRAPH_TRACE_LEN]={0};
+	uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
 	size_t size = getFromGraphBuf(bits);
 	if (size < 65) {
-		if (g_debugMode)PrintAndLogEx(DEBUG, "DEBUG: Error - IO prox not enough samples in GraphBuffer");
+		if (g_debugMode) PrintAndLogEx(DEBUG, "DEBUG: Error - IO prox not enough samples in GraphBuffer");
 		return 0;
 	}	
 	//get binary from fsk wave	
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index c4d1e3be6..7fbf143d3 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -504,12 +504,13 @@ int CmdT55xxDetect(const char *Cmd){
 
 // detect configuration?
 bool tryDetectModulation(){
-	uint8_t hits = 0;
+
 	t55xx_conf_block_t tests[15];
-	int bitRate=0;
-	uint8_t fc1 = 0, fc2 = 0, ans = 0;
-	int clk = 0, firstClockEdge = 0;
+	int bitRate = 0, clk = 0, firstClockEdge = 0;
+	uint8_t hits = 0, fc1 = 0, fc2 = 0, ans = 0;
+	
 	ans = fskClocks(&fc1, &fc2, (uint8_t *)&clk, &firstClockEdge);
+
 	if (ans && ((fc1==10 && fc2==8) || (fc1==8 && fc2==5))) {
 		if ( FSKrawDemod("0 0", false) && test(DEMOD_FSK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)){
 			tests[hits].modulation = DEMOD_FSK;
@@ -1305,15 +1306,13 @@ bool AquireData( uint8_t page, uint8_t block, bool pwdmode, uint32_t password ){
 		return false;
 	}
 
-	//uint8_t got[12288];
-	uint8_t got[7679];
-	if ( !GetFromDevice(BIG_BUF, got, sizeof(got), 0, NULL, 6000, true)) {
+	uint8_t got[8000];
+	if ( !GetFromDevice(BIG_BUF, got, sizeof(got), 0, NULL, 4000, true)) {
 		PrintAndLogEx(WARNING, "command execution time out");
 		return false;
 	}
 	setGraphBuf(got, sizeof(got));
-
-	return !justNoise(GraphBuffer, sizeof(got));
+	return !isNoise(got, sizeof(got));
 }
 
 char * GetBitRateStr(uint32_t id, bool xmode) {
diff --git a/common/lfdemod.c b/common/lfdemod.c
index 9fbf933f4..0525f7ff9 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -105,7 +105,6 @@ int32_t compute_mean_int(int *in, size_t N) {
 	return mean / (int)N;
 }
 
-
 void zeromean(uint8_t* data, size_t size) {
 			
 	// zero mean data
@@ -119,13 +118,13 @@ void zeromean(uint8_t* data, size_t size) {
 		data[i] -= accum;
 }
 
-
 //test samples are not just noise
 // By measuring mean and look at amplitude of signal from HIGH / LOW,   we can detect noise
 bool isNoise_int(int *bits, uint32_t size) {
 	resetSignal();
 	if ( bits == NULL || size < 100 ) return true;
-
+	//zeromean(bits, size);
+	
 	int32_t sum = 0;
 	for ( size_t i = 0; i < size; i++) {
 		if ( bits[i] < signalprop.low ) signalprop.low = bits[i];
@@ -138,7 +137,7 @@ bool isNoise_int(int *bits, uint32_t size) {
 	signalprop.amplitude = ABS(signalprop.high - signalprop.mean);
 	signalprop.isnoise = signalprop.amplitude < NOICE_AMPLITUDE_THRESHOLD;
 	
-	if (g_debugMode == 1) 
+	if (g_debugMode) 
 		printSignal();
 	
 	return signalprop.isnoise;
@@ -149,6 +148,7 @@ bool isNoise_int(int *bits, uint32_t size) {
 bool isNoise(uint8_t *bits, uint32_t size) {
 	resetSignal();
 	if ( bits == NULL || size < 100 ) return true;
+	zeromean(bits, size);
 	
 	uint32_t sum = 0;
 	for ( uint32_t i = 0; i < size; i++) {
@@ -162,7 +162,7 @@ bool isNoise(uint8_t *bits, uint32_t size) {
 	signalprop.amplitude = signalprop.high - signalprop.mean;
 	signalprop.isnoise =  signalprop.amplitude < NOICE_AMPLITUDE_THRESHOLD;
 	
-	if (g_debugMode == 1) 
+	if (g_debugMode) 
 		printSignal();
 
 	return signalprop.isnoise;
@@ -170,22 +170,20 @@ bool isNoise(uint8_t *bits, uint32_t size) {
 
 //by marshmellow
 //get high and low values of a wave with passed in fuzz factor. also return noise test = 1 for passed or 0 for only noise
-int getHiLo(uint8_t *bits, size_t size, int *high, int *low, uint8_t fuzzHi, uint8_t fuzzLo) {
-
-	// just noise - no super good detection. good enough
-	if (signalprop.isnoise) return -1; 
-	
+//void getHiLo(uint8_t *bits, size_t size, int *high, int *low, uint8_t fuzzHi, uint8_t fuzzLo) {
+void getHiLo(int *high, int *low, uint8_t fuzzHi, uint8_t fuzzLo) {
 	// add fuzz.
 	*high = (signalprop.high * fuzzHi) / 100;
 	if ( signalprop.low < 0 ) {
 		*low = (signalprop.low * fuzzLo) / 100;
-	} else {	
-		*low = signalprop.low * (100 + (100 - fuzzLo))/100;
+	} else {
+		uint8_t range = signalprop.high - signalprop.low;
+		
+		*low =  signalprop.low + ((range * (100-fuzzLo))/100);
 	}
 	
-	if (g_debugMode > 0) 
+	if (g_debugMode) 
 		prnt("getHiLo fuzzed: High %d | Low %d", *high, *low);
-	return 1;
 }
 
 // by marshmellow
@@ -361,13 +359,17 @@ void getNextHigh(uint8_t *samples, size_t size, int high, size_t *i) {
 
 // load wave counters
 bool loadWaveCounters(uint8_t *samples, size_t size, int lowToLowWaveLen[], int highToLowWaveLen[], int *waveCnt, int *skip, int *minClk, int *high, int *low) {
-	size_t i=0, firstLow, firstHigh;
-	size_t testsize = (size < 512) ? size : 512;
-
-	if ( getHiLo(samples, testsize, high, low, 80, 80) == -1 ) {
+	size_t i = 0, firstLow, firstHigh;
+	//size_t testsize = (size < 512) ? size : 512;
+	
+	// just noise - no super good detection. good enough
+	if (signalprop.isnoise) {
 		if (g_debugMode == 2) prnt("DEBUG STT: just noise detected - quitting");
-		return false; //just noise
+		return false;
 	}
+	
+	//getHiLo(samples, testsize, high, low, 80, 80);
+	getHiLo(high, low, 80, 80);
 
 	// get to first full low to prime loop and skip incomplete first pulse
 	getNextHigh(samples, size, *high, &i);
@@ -469,7 +471,8 @@ int ManchesterEncode(uint8_t *bits, size_t size) {
 
 // by marshmellow
 // to detect a wave that has heavily clipped (clean) samples
-uint8_t DetectCleanAskWave(uint8_t *dest, size_t size, uint8_t high, uint8_t low) {
+// loop 512 samples,   if 300 of them is deemed maxed out,  we assume the wave is clipped.
+bool DetectCleanAskWave(uint8_t *dest, size_t size, uint8_t high, uint8_t low) {
 	bool allArePeaks = true;
 	uint16_t cntPeaks = 0;
 	size_t loopEnd = 512 + 160;
@@ -484,8 +487,9 @@ uint8_t DetectCleanAskWave(uint8_t *dest, size_t size, uint8_t high, uint8_t low
 		else
 			cntPeaks++;
 	}
+	
 	if (!allArePeaks){
-		if (cntPeaks > 300) return true;
+		if (cntPeaks > 250) return true;
 	}
 	return allArePeaks;
 }
@@ -504,11 +508,13 @@ int DetectStrongAskClock(uint8_t *dest, size_t size, int high, int low, int *clo
 	size_t i = 100;
 	size_t minClk = 512;
 	int shortestWaveIdx = 0;
-
+	
+	if (g_debugMode == 1) prnt("DEBUG ASK: DetectStrongAskClock: hi %d | low  %d ", high, low);
+	
 	// get to first full low to prime loop and skip incomplete first pulse
 	getNextHigh(dest, size, high, &i);
 	getNextLow(dest, size, low, &i);
-
+	
 	// loop through all samples
 	while (i < size) {
 		// measure from low to low
@@ -516,7 +522,7 @@ int DetectStrongAskClock(uint8_t *dest, size_t size, int high, int low, int *clo
 
 		getNextHigh(dest, size, high, &i);
 		getNextLow(dest, size, low, &i);
-		
+
 		//get minimum measured distance
 		if (i-startwave < minClk && i < size) {
 			minClk = i - startwave;
@@ -546,18 +552,29 @@ int DetectASKClock(uint8_t *dest, size_t size, int *clock, int maxErr) {
 	size -= 60; //sometimes there is a strange end wave - filter out this....
 	//if we already have a valid clock
 	uint8_t clockFnd = 0;
-	for (; i < clkEnd; ++i)
-		if (clk[i] == *clock) clockFnd = i;
-		//clock found but continue to find best startpos
+	for (; i < clkEnd; ++i) {
+		if (clk[i] == *clock) {
+			//clock found but continue to find best startpos
+			clockFnd = i;
+		}
+	}
 
+	// just noise - no super good detection. good enough
+	if (signalprop.isnoise) {
+		if (g_debugMode == 2) prnt("DEBUG DetectASKClock: just noise detected - quitting");
+		return -1;
+	}
+	
 	//get high and low peak
-	int peak, low;
-	if (getHiLo(dest, loopCnt, &peak, &low, 75, 75) < 1) return -1;
+	int peak_hi, peak_low;
+	//getHiLo(dest, loopCnt, &peak_hi, &peak_low, 75, 75);
+	getHiLo(&peak_hi, &peak_low, 75, 75);
 	
 	//test for large clean peaks
 	if (!clockFnd){
-		if (DetectCleanAskWave(dest, size, peak, low)==1){
-			int ans = DetectStrongAskClock(dest, size, peak, low, clock);
+		if (DetectCleanAskWave(dest, size, peak_hi, peak_low)){
+		
+			int ans = DetectStrongAskClock(dest, size, peak_hi, peak_low, clock);
 			if (g_debugMode == 2) prnt("DEBUG ASK: detectaskclk Clean Ask Wave Detected: clk %i, ShortestWave: %i", *clock ,ans);
 			if (ans > 0){
 				return ans; //return shortest wave start position
@@ -570,8 +587,8 @@ int DetectASKClock(uint8_t *dest, size_t size, int *clock, int maxErr) {
 	
 	uint16_t ii;
 	uint8_t clkCnt, tol = 0;
-	uint16_t bestErr[]={1000,1000,1000,1000,1000,1000,1000,1000,1000};
-	uint8_t bestStart[]={0,0,0,0,0,0,0,0,0};
+	uint16_t bestErr[] = {1000,1000,1000,1000,1000,1000,1000,1000,1000};
+	uint8_t bestStart[] = {0,0,0,0,0,0,0,0,0};
 	size_t errCnt = 0;
 	size_t arrLoc, loopEnd;
 
@@ -585,9 +602,9 @@ int DetectASKClock(uint8_t *dest, size_t size, int *clock, int maxErr) {
 	//test each valid clock from smallest to greatest to see which lines up
 	for (; clkCnt < clkEnd; clkCnt++) {
 		if (clk[clkCnt] <= 32) {
-			tol=1;
+			tol = 1;
 		} else {
-			tol=0;
+			tol = 0;
 		}
 		//if no errors allowed - keep start within the first clock
 		if (!maxErr && size > clk[clkCnt]*2 + tol && clk[clkCnt] < 128) 
@@ -597,17 +614,17 @@ int DetectASKClock(uint8_t *dest, size_t size, int *clock, int maxErr) {
 
 		//try lining up the peaks by moving starting point (try first few clocks)
 		for (ii=0; ii < loopCnt; ii++){
-			if (dest[ii] < peak && dest[ii] > low) continue;
+			if (dest[ii] < peak_hi && dest[ii] > peak_low) continue;
 
 			errCnt = 0;
 			// now that we have the first one lined up test rest of wave array
 			loopEnd = ((size-ii-tol) / clk[clkCnt]) - 1;
 			for (i=0; i < loopEnd; ++i){
 				arrLoc = ii + (i * clk[clkCnt]);
-				if (dest[arrLoc] >= peak || dest[arrLoc] <= low){
-				}else if (dest[arrLoc-tol] >= peak || dest[arrLoc-tol] <= low){
-				}else if (dest[arrLoc+tol] >= peak || dest[arrLoc+tol] <= low){
-				}else{  //error no peak detected
+				if (dest[arrLoc] >= peak_hi || dest[arrLoc] <= peak_low){
+				} else if (dest[arrLoc-tol] >= peak_hi || dest[arrLoc-tol] <= peak_low){
+				} else if (dest[arrLoc+tol] >= peak_hi || dest[arrLoc+tol] <= peak_low){
+				} else {  //error no peak detected
 					errCnt++;
 				}
 			}
@@ -618,7 +635,7 @@ int DetectASKClock(uint8_t *dest, size_t size, int *clock, int maxErr) {
 				if (!clockFnd) 
 					*clock = clk[clkCnt];
 				return ii;
-			}
+			}	
 			//if we found errors see if it is lowest so far and save it as best run
 			if (errCnt < bestErr[clkCnt]) {
 				bestErr[clkCnt] = errCnt;
@@ -701,10 +718,18 @@ int DetectNRZClock(uint8_t *dest, size_t size, int clock, size_t *clockStartIdx)
 	// size must be larger than 20 here
 	if (size < loopCnt) loopCnt = size-20;
 
+	
+	// just noise - no super good detection. good enough
+	if (signalprop.isnoise) {
+		if (g_debugMode == 2) prnt("DEBUG DetectNZRClock: just noise detected - quitting");
+		return 0;
+	}
+	
 	//get high and low peak
 	int peak, low;
-	if (getHiLo(dest, loopCnt, &peak, &low, 90, 90) < 1) return 0;
-
+	//getHiLo(dest, loopCnt, &peak, &low, 90, 90);
+	getHiLo(&peak, &low, 90, 90);
+	
 	bool strong = false;
 	int lowestTransition = DetectStrongNRZClk(dest, size-20, peak, low, &strong);
 	if (strong) return lowestTransition;
@@ -1431,11 +1456,18 @@ int cleanAskRawDemod(uint8_t *bits, size_t *size, int clk, int invert, int high,
 //by marshmellow
 //attempts to demodulate ask modulations, askType == 0 for ask/raw, askType==1 for ask/manchester
 int askdemod_ext(uint8_t *bits, size_t *size, int *clk, int *invert, int maxErr, uint8_t amp, uint8_t askType, int *startIdx) {
-	if (*size==0) return -1;
-	int start = DetectASKClock(bits, *size, clk, maxErr); //clock default
-	if (*clk==0 || start < 0) return -3;
+	
+	if (*size == 0) return -1;
+	
+	int start = DetectASKClock(bits, *size, clk, maxErr);
+	if (*clk == 0 || start < 0) return -3;
+	
 	if (*invert != 1) *invert = 0;
-	if (amp==1) askAmp(bits, *size);
+	
+	// amplify signal data.
+	// ICEMAN todo,  
+	if (amp == 1) askAmp(bits, *size);
+	
 	if (g_debugMode == 2) prnt("DEBUG ASK: clk %d, beststart %d, amp %d", *clk, start, amp);
 		
 	//start pos from detect ask clock is 1/2 clock offset
@@ -1443,12 +1475,19 @@ int askdemod_ext(uint8_t *bits, size_t *size, int *clk, int *invert, int maxErr,
 	*startIdx = start - (*clk/2); 
 	uint16_t initLoopMax = 1024;
 	if (initLoopMax > *size) initLoopMax = *size;
+	
+	// just noise - no super good detection. good enough
+	if (signalprop.isnoise) {
+		if (g_debugMode == 2) prnt("DEBUG askdemod_ext: just noise detected - quitting");
+		return -2;
+	}
+	
 	// Detect high and lows
 	//25% clip in case highs and lows aren't clipped [marshmellow]
 	int high, low;
-	if (getHiLo(bits, initLoopMax, &high, &low, 75, 75) < 1) 
-		return -2; //just noise
-
+	//getHiLo(bits, initLoopMax, &high, &low, 75, 75);
+	getHiLo(&high, &low, 75, 75);
+	
 	size_t errCnt = 0;
 	// if clean clipped waves detected run alternate demod
 	if (DetectCleanAskWave(bits, *size, high, low)) {
@@ -1461,11 +1500,13 @@ int askdemod_ext(uint8_t *bits, size_t *size, int *clk, int *invert, int maxErr,
 			uint8_t alignPos = 0;
 			errCnt = manrawdecode(bits, size, 0, &alignPos);
 			*startIdx += *clk/2 * alignPos;
+			
 			if (g_debugMode) 
 				prnt("DEBUG: (askdemod_ext) CLEAN: startIdx %i, alignPos %u", *startIdx, alignPos);
 		} 
 		return errCnt;
 	}
+	
 	if (g_debugMode) prnt("DEBUG: (askdemod_ext) Weak wave detected: startIdx %i", *startIdx);
 	
 	int lastBit;  //set first clock check - can go negative
@@ -1477,28 +1518,28 @@ int askdemod_ext(uint8_t *bits, size_t *size, int *clk, int *invert, int maxErr,
 	lastBit = start - *clk;
 
 	for (i = start; i < *size; ++i) {
-		if (i-lastBit >= *clk-tol){
+		if (i - lastBit >= *clk - tol){
 			if (bits[i] >= high) {
 				bits[bitnum++] = *invert;
 			} else if (bits[i] <= low) {
 				bits[bitnum++] = *invert ^ 1;
-			} else if (i-lastBit >= *clk+tol) {
+			} else if (i-lastBit >= *clk + tol) {
 				if (bitnum > 0) {
 					if (g_debugMode == 2) prnt("DEBUG: (askdemod_ext) Modulation Error at: %u", i);
-					bits[bitnum++]=7;
-					errCnt++;						
+					bits[bitnum++] = 7;
+					errCnt++;
 				} 
 			} else { //in tolerance - looking for peak
 				continue;
 			}
 			midBit = 0;
 			lastBit += *clk;
-		} else if (i-lastBit >= (*clk/2-tol) && !midBit && !askType){
+		} else if (i-lastBit >= (*clk/2 - tol) && !midBit && !askType){
 			if (bits[i] >= high) {
 				bits[bitnum++] = *invert;
 			} else if (bits[i] <= low) {
 				bits[bitnum++] = *invert ^ 1;
-			} else if (i-lastBit >= *clk/2+tol) {
+			} else if (i-lastBit >= *clk/2 + tol) {
 				bits[bitnum] = bits[bitnum-1];
 				bitnum++;
 			} else { //in tolerance - looking for peak
@@ -1530,8 +1571,17 @@ int nrzRawDemod(uint8_t *dest, size_t *size, int *clk, int *invert, int *startId
 	if (gLen > *size) 
 		gLen = *size-20;
 	
+	
+	// just noise - no super good detection. good enough
+	if (signalprop.isnoise) {
+		if (g_debugMode == 2) prnt("DEBUG nrzRawDemod: just noise detected - quitting");
+		return -3;
+	}
+	
 	int high, low;
-	if (getHiLo(dest, gLen, &high, &low, 75, 75) < 1) return -3; //25% fuzz on high 25% fuzz on low
+	//getHiLo(dest, gLen, &high, &low, 75, 75);
+	getHiLo(&high, &low, 75, 75);
+	getHiLo(&high, &low, 75, 75);
 
 	uint8_t bit=0;
 	//convert wave samples to 1's and 0's
diff --git a/common/lfdemod.h b/common/lfdemod.h
index 3a7f873d7..48b4b9481 100644
--- a/common/lfdemod.h
+++ b/common/lfdemod.h
@@ -35,14 +35,7 @@ extern int32_t	compute_mean_int(int *in, size_t N);
 bool isNoise_int(int *bits, uint32_t size);
 bool isNoise(uint8_t *bits, uint32_t size);
 extern void zeromean(uint8_t* data, size_t size);
-
-// buffer is unsigned on DEVIE
-#ifdef ON_DEVICE
-	#define justNoise(a, b) isNoise((a), (b))
-#else
-	#define justNoise(a, b) isNoise_int((a), (b))
-#endif
-		
+	
 void getNextLow(uint8_t *samples, size_t size, int low, size_t *i);
 void getNextHigh(uint8_t *samples, size_t size, int high, size_t *i);
 bool loadWaveCounters(uint8_t *samples, size_t size, int lowToLowWaveLen[], int highToLowWaveLen[], int *waveCnt, int *skip, int *minClk, int *high, int *low);
@@ -58,14 +51,15 @@ extern uint32_t bytebits_to_byte(uint8_t *src, size_t numbits);
 extern uint32_t bytebits_to_byteLSBF(uint8_t *src, size_t numbits);
 extern uint16_t countFC(uint8_t *bits, size_t size, uint8_t fskAdj);
 extern int      DetectASKClock(uint8_t *dest, size_t size, int *clock, int maxErr);
-extern uint8_t  DetectCleanAskWave(uint8_t *dest, size_t size, uint8_t high, uint8_t low);
+extern bool		DetectCleanAskWave(uint8_t *dest, size_t size, uint8_t high, uint8_t low);
 extern uint8_t  detectFSKClk(uint8_t *bits, size_t size, uint8_t fcHigh, uint8_t fcLow, int *firstClockEdge);
 extern int      DetectNRZClock(uint8_t *dest, size_t size, int clock, size_t *clockStartIdx);
 extern int      DetectPSKClock(uint8_t *dest, size_t size, int clock, size_t *firstPhaseShift, uint8_t *curPhase, uint8_t *fc);
 extern int      DetectStrongAskClock(uint8_t *dest, size_t size, int high, int low, int *clock);
 extern bool     DetectST(uint8_t *buffer, size_t *size, int *foundclock, size_t *ststart, size_t *stend);
 extern size_t   fskdemod(uint8_t *dest, size_t size, uint8_t rfLen, uint8_t invert, uint8_t fchigh, uint8_t fclow, int *startIdx);
-extern int      getHiLo(uint8_t *bits, size_t size, int *high, int *low, uint8_t fuzzHi, uint8_t fuzzLo);
+//extern void     getHiLo(uint8_t *bits, size_t size, int *high, int *low, uint8_t fuzzHi, uint8_t fuzzLo);
+extern void     getHiLo(int *high, int *low, uint8_t fuzzHi, uint8_t fuzzLo);
 extern uint32_t manchesterEncode2Bytes(uint16_t datain);
 extern int      ManchesterEncode(uint8_t *bits, size_t size);
 extern int      manrawdecode(uint8_t *bits, size_t *size, uint8_t invert, uint8_t *alignPos);

From be5735447806d90f8139c6126cb66da2623b2fc5 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sun, 9 Sep 2018 12:36:16 +0200
Subject: [PATCH 0034/1938] chg:  seems to be a free bug on macos

---
 client/proxmark3.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/client/proxmark3.c b/client/proxmark3.c
index 78230bd36..ae528a9e9 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -186,9 +186,10 @@ main_loop(char *script_cmds_file, char *script_cmd, bool usb_present) {
 	
 	write_history(".history");
 
-	free(cmd);
-	cmd = NULL;
-
+	if (cmd) {
+		free(cmd);
+		cmd = NULL;
+	}		
 }
 
 static void dumpAllHelp(int markdown) {
@@ -353,8 +354,6 @@ int main(int argc, char* argv[]) {
 	// try to open USB connection to Proxmark
 	usb_present = OpenProxmark(argv[1], waitCOMPort, 20, false);
 
-	
-	printf("\x1b[31m test\n");
 #ifdef HAVE_GUI
 
 #  ifdef _WIN32

From 617610302336fd64919d05eb1cdb7128fc8546d6 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sun, 9 Sep 2018 12:36:44 +0200
Subject: [PATCH 0035/1938] cleanup

---
 client/cmdhf15.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index f54dfe7d8..1fe44de0e 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -396,8 +396,8 @@ int usage_15_readmulti(void){
 // Mode 3
 //helptext
 int CmdHF15Demod(const char *Cmd) {
-	char cmdp = param_getchar(Cmd, 0);
-	if (cmdp == 'h' || cmdp == 'H') return usage_15_demod();
+	char cmdp = tolower(param_getchar(Cmd, 0));
+	if (cmdp == 'h') return usage_15_demod();
 	
 	// The sampling rate is 106.353 ksps/s, for T = 18.8 us
 	int i, j;

From c4b3edef8988271ccf2338214fb9a0f0ea699101 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sun, 9 Sep 2018 18:03:49 +0200
Subject: [PATCH 0036/1938] fix:  double free bug on MacOS  (thanks @drandreas)

---
 client/comms.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/comms.c b/client/comms.c
index ec1a36860..e0d0670ff 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -288,6 +288,7 @@ __attribute__((force_align_arg_pointer))
 
 	// when this reader thread dies, we close the serial port.
 	uart_close(sp);
+	sp = NULL;
 	
 	pthread_exit(NULL);
 	return NULL;

From 0a548c5da027c70b9331cf19af6ed5c409b546bb Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sun, 9 Sep 2018 18:08:20 +0200
Subject: [PATCH 0037/1938] clean up

---
 client/cmdlfti.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/client/cmdlfti.c b/client/cmdlfti.c
index 9f32e67f8..e5f3530f0 100644
--- a/client/cmdlfti.c
+++ b/client/cmdlfti.c
@@ -77,9 +77,9 @@ int CmdTIDemod(const char *Cmd)
     1, 1, 1, 1, 1, 1, 1,      -1, -1, -1, -1, -1, -1, -1,
     1, 1, 1, 1, 1, 1, 1, 1
   };
-	int lowLen = sizeof(LowTone)/sizeof(int);
-	int highLen = sizeof(HighTone)/sizeof(int);
-	int convLen = (highLen>lowLen)?highLen:lowLen;
+	int lowLen = sizeof(LowTone) / sizeof(int);
+	int highLen = sizeof(HighTone) / sizeof(int);
+	int convLen = (highLen > lowLen) ? highLen : lowLen;
 	uint16_t crc;
 	int i, j, TagType;
 	int lowSum = 0, highSum = 0;;
@@ -90,15 +90,15 @@ int CmdTIDemod(const char *Cmd)
 		highSum = 0;;
 
 		for (j = 0; j < lowLen; j++) {
-			lowSum += LowTone[j]*GraphBuffer[i+j];
+			lowSum += LowTone[j] * GraphBuffer[i+j];
 		}
 		for (j = 0; j < highLen; j++) {
-			highSum += HighTone[j]*GraphBuffer[i+j];
+			highSum += HighTone[j] * GraphBuffer[i+j];
 		}
 		lowSum = abs((100*lowSum) / lowLen);
 		highSum = abs((100*highSum) / highLen);
-		lowSum = (lowSum<0)?-lowSum:lowSum;
-		highSum = (highSum<0)?-highSum:highSum;
+		lowSum = (lowSum<0) ? -lowSum : lowSum;
+		highSum = (highSum<0) ? -highSum : highSum;
 
 		GraphBuffer[i] = (highSum << 16) | lowSum;
 	}

From bc0ffa9e514a272099d2db2845e2faef85fcb104 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sun, 9 Sep 2018 19:54:22 +0200
Subject: [PATCH 0038/1938] fix: remove zeromean chg: cleanup

---
 common/lfdemod.c | 88 ++++++++++++++++++++++++------------------------
 common/lfdemod.h |  2 +-
 2 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/common/lfdemod.c b/common/lfdemod.c
index 0525f7ff9..f6d4f4d89 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -123,7 +123,6 @@ void zeromean(uint8_t* data, size_t size) {
 bool isNoise_int(int *bits, uint32_t size) {
 	resetSignal();
 	if ( bits == NULL || size < 100 ) return true;
-	//zeromean(bits, size);
 	
 	int32_t sum = 0;
 	for ( size_t i = 0; i < size; i++) {
@@ -148,7 +147,6 @@ bool isNoise_int(int *bits, uint32_t size) {
 bool isNoise(uint8_t *bits, uint32_t size) {
 	resetSignal();
 	if ( bits == NULL || size < 100 ) return true;
-	zeromean(bits, size);
 	
 	uint32_t sum = 0;
 	for ( uint32_t i = 0; i < size; i++) {
@@ -835,7 +833,7 @@ int DetectNRZClock(uint8_t *dest, size_t size, int clock, size_t *clockStartIdx)
 //countFC is to detect the field clock lengths.
 //counts and returns the 2 most common wave lengths
 //mainly used for FSK field clock detection
-uint16_t countFC(uint8_t *bits, size_t size, uint8_t fskAdj) {
+uint16_t countFC(uint8_t *bits, size_t size, bool fskAdj) {
 	uint8_t fcLens[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
 	uint16_t fcCnts[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
 	uint8_t fcLensFnd = 0;
@@ -855,17 +853,18 @@ uint16_t countFC(uint8_t *bits, size_t size, uint8_t fskAdj) {
 			fcCounter++;
 			if (fskAdj){
 				//if we had 5 and now have 9 then go back to 8 (for when we get a fc 9 instead of an 8)
-				if (lastFCcnt==5 && fcCounter==9) fcCounter--;
+				if (lastFCcnt == 5 && fcCounter == 9) fcCounter--;
+				
 				//if fc=9 or 4 add one (for when we get a fc 9 instead of 10 or a 4 instead of a 5)
-				if ((fcCounter==9) || fcCounter==4) fcCounter++;
-			// save last field clock count  (fc/xx)
-			lastFCcnt = fcCounter;
+				if ((fcCounter == 9) || fcCounter == 4) fcCounter++;
+				// save last field clock count  (fc/xx)
+				lastFCcnt = fcCounter;
 			}
 			// find which fcLens to save it to:
-			for (int ii=0; ii<15; ii++){
-				if (fcLens[ii]==fcCounter){
-					fcCnts[ii]++;
-					fcCounter=0;
+			for (int m=0; m<15; m++){
+				if (fcLens[m] == fcCounter){
+					fcCnts[m]++;
+					fcCounter = 0;
 					break;
 				}
 			}
@@ -881,36 +880,37 @@ uint16_t countFC(uint8_t *bits, size_t size, uint8_t fskAdj) {
 		}
 	}
 	
-	uint8_t best1=14, best2=14, best3=14;
-	uint16_t maxCnt1=0;
+	uint8_t best1 = 14, best2 = 14, best3 = 14;
+	uint16_t maxCnt1 = 0;
 	// go through fclens and find which ones are bigest 2  
 	for (i=0; i<15; i++){
 		// get the 3 best FC values
-		if (fcCnts[i]>maxCnt1) {
-			best3=best2;
-			best2=best1;
-			maxCnt1=fcCnts[i];
-			best1=i;
-		} else if(fcCnts[i]>fcCnts[best2]){
-			best3=best2;
-			best2=i;
-		} else if(fcCnts[i]>fcCnts[best3]){
-			best3=i;
+		if (fcCnts[i] > maxCnt1) {
+			best3 = best2;
+			best2 = best1;
+			maxCnt1 = fcCnts[i];
+			best1 = i;
+		} else if(fcCnts[i] > fcCnts[best2]){
+			best3 = best2;
+			best2 = i;
+		} else if(fcCnts[i] > fcCnts[best3]){
+			best3 = i;
 		}
-		if (g_debugMode == 2) prnt("DEBUG countfc: FC %u, Cnt %u, best fc: %u, best2 fc: %u",fcLens[i],fcCnts[i],fcLens[best1],fcLens[best2]);
-		if (fcLens[i]==0) break;
+		if (g_debugMode == 2) prnt("DEBUG countfc: FC %u, Cnt %u, best fc: %u, best2 fc: %u", fcLens[i], fcCnts[i], fcLens[best1], fcLens[best2]);
+		if (fcLens[i] == 0) break;
 	}
-	if (fcLens[best1]==0) return 0;
-	uint8_t fcH=0, fcL=0;
-	if (fcLens[best1]>fcLens[best2]){
-		fcH=fcLens[best1];
-		fcL=fcLens[best2];
+	
+	if (fcLens[best1] == 0) return 0;
+	uint8_t fcH = 0, fcL = 0;
+	if (fcLens[best1] > fcLens[best2]){
+		fcH = fcLens[best1];
+		fcL = fcLens[best2];
 	} else{
-		fcH=fcLens[best2];
-		fcL=fcLens[best1];
+		fcH = fcLens[best2];
+		fcL = fcLens[best1];
 	}
-	if ((size-180)/fcH/3 > fcCnts[best1]+fcCnts[best2]) {
-		if (g_debugMode == 2) prnt("DEBUG countfc: fc is too large: %u > %u. Not psk or fsk",(size-180)/fcH/3,fcCnts[best1]+fcCnts[best2]);
+	if ((size-180)/fcH/3 > fcCnts[best1] + fcCnts[best2]) {
+		if (g_debugMode == 2) prnt("DEBUG countfc: fc is too large: %u > %u. Not psk or fsk", (size-180)/fcH/3, fcCnts[best1] + fcCnts[best2]);
 		return 0; //lots of waves not psk or fsk
 	}
 	// TODO: take top 3 answers and compare to known Field clocks to get top 2
@@ -1036,7 +1036,7 @@ uint8_t detectFSKClk(uint8_t *bits, size_t size, uint8_t fcHigh, uint8_t fcLow,
 	uint16_t rfCounter = 0;
 	uint8_t firstBitFnd = 0;
 	size_t i;
-	uint8_t fcTol = ((fcHigh*100 - fcLow*100)/2 + 50)/100; //(uint8_t)(0.5+(float)(fcHigh-fcLow)/2);
+	uint8_t fcTol = ((fcHigh * 100 - fcLow * 100)/2 + 50)/100; //(uint8_t)(0.5+(float)(fcHigh-fcLow)/2);
 
 	// prime i to first peak / up transition
 	for (i = 160; i < size-20; i++)
@@ -1084,7 +1084,7 @@ uint8_t detectFSKClk(uint8_t *bits, size_t size, uint8_t fcHigh, uint8_t fcLow,
 		}
 		fcCounter = 0;
 	}
-	uint8_t rfHighest=15, rfHighest2=15, rfHighest3=15;
+	uint8_t rfHighest = 15, rfHighest2 = 15, rfHighest3 = 15;
 
 	for (i=0; i<15; i++){
 		//get highest 2 RF values  (might need to get more values to compare or compare all?)
@@ -1111,22 +1111,22 @@ uint8_t detectFSKClk(uint8_t *bits, size_t size, uint8_t fcHigh, uint8_t fcLow,
 	// loop to find the highest clock that has a remainder less than the tolerance
 	//   compare samples counted divided by
 	// test 128 down to 32 (shouldn't be possible to have fc/10 & fc/8 and rf/16 or less)
-	int ii=7;
-	for (; ii>=2; ii--){
-		if (rfLens[rfHighest] % clk[ii] < tol1 || rfLens[rfHighest] % clk[ii] > clk[ii]-tol1){
-			if (rfLens[rfHighest2] % clk[ii] < tol1 || rfLens[rfHighest2] % clk[ii] > clk[ii]-tol1){
-				if (rfLens[rfHighest3] % clk[ii] < tol1 || rfLens[rfHighest3] % clk[ii] > clk[ii]-tol1){
+	int m = 7;
+	for (; m >= 2; m--){
+		if (rfLens[rfHighest] % clk[m] < tol1 || rfLens[rfHighest] % clk[m] > clk[m]-tol1){
+			if (rfLens[rfHighest2] % clk[m] < tol1 || rfLens[rfHighest2] % clk[m] > clk[m]-tol1){
+				if (rfLens[rfHighest3] % clk[m] < tol1 || rfLens[rfHighest3] % clk[m] > clk[m]-tol1){
 					if (g_debugMode == 2) 
-						prnt("DEBUG FSK: clk %d divides into the 3 most rf values within tolerance",clk[ii]);
+						prnt("DEBUG FSK: clk %d divides into the 3 most rf values within tolerance", clk[m]);
 					break;
 				}
 			}
 		}
 	}
 
-	if (ii < 2) return 0; // oops we went too far
+	if (m < 2) return 0; // oops we went too far
 
-	return clk[ii];
+	return clk[m];
 }
 
 
diff --git a/common/lfdemod.h b/common/lfdemod.h
index 48b4b9481..daa5c3c56 100644
--- a/common/lfdemod.h
+++ b/common/lfdemod.h
@@ -49,7 +49,7 @@ extern int      BiphaseRawDecode(uint8_t *bits, size_t *size, int *offset, int i
 extern uint8_t bits_to_array(const uint8_t *bits, size_t size, uint8_t *dest);
 extern uint32_t bytebits_to_byte(uint8_t *src, size_t numbits);
 extern uint32_t bytebits_to_byteLSBF(uint8_t *src, size_t numbits);
-extern uint16_t countFC(uint8_t *bits, size_t size, uint8_t fskAdj);
+extern uint16_t countFC(uint8_t *bits, size_t size, bool fskAdj);
 extern int      DetectASKClock(uint8_t *dest, size_t size, int *clock, int maxErr);
 extern bool		DetectCleanAskWave(uint8_t *dest, size_t size, uint8_t high, uint8_t low);
 extern uint8_t  detectFSKClk(uint8_t *bits, size_t size, uint8_t fcHigh, uint8_t fcLow, int *firstClockEdge);

From fef85d4caa7daafae3bfdfc71a46abcd86795fef Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sun, 9 Sep 2018 19:56:11 +0200
Subject: [PATCH 0039/1938] chg: 'data load' , 'data norm'  etc all commands
 that manipulate graphbuffer need to update signalproperty struct.  But its
 not based on the signed data.

---
 client/cmddata.c | 45 ++++++++++++++++++++++++++++-----------------
 1 file changed, 28 insertions(+), 17 deletions(-)

diff --git a/client/cmddata.c b/client/cmddata.c
index f4bfb3ff4..bcaeaf3bc 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -1007,14 +1007,14 @@ int FSKrawDemod(const char *Cmd, bool verbose) {
 		}
 	}
 
-	uint8_t BitStream[MAX_GRAPH_TRACE_LEN] = {0};
-	size_t BitLen = getFromGraphBuf(BitStream);
+	uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
+	size_t BitLen = getFromGraphBuf(bits);
 	if (BitLen == 0) return 0;
 	
 	//get field clock lengths
 	uint16_t fcs = 0;
 	if (!fchigh || !fclow) {
-		fcs = countFC(BitStream, BitLen, 1);
+		fcs = countFC(bits, BitLen, true);
 		if (!fcs) {
 			fchigh = 10;
 			fclow = 8;
@@ -1026,13 +1026,13 @@ int FSKrawDemod(const char *Cmd, bool verbose) {
 	//get bit clock length
 	if (!rfLen) {
 		int firstClockEdge = 0; //todo - align grid on graph with this...
-		rfLen = detectFSKClk(BitStream, BitLen, fchigh, fclow, &firstClockEdge);
+		rfLen = detectFSKClk(bits, BitLen, fchigh, fclow, &firstClockEdge);
 		if (!rfLen) rfLen = 50;
 	}
 	int startIdx = 0;
-	int size = fskdemod(BitStream, BitLen, rfLen, invert, fchigh, fclow, &startIdx);
+	int size = fskdemod(bits, BitLen, rfLen, invert, fchigh, fclow, &startIdx);
 	if (size > 0) {
-		setDemodBuf(BitStream, size, 0);
+		setDemodBuf(bits, size, 0);
 		setClockGrid(rfLen, startIdx);
 
 		// Now output the bitstream to the scrollback by line of 16 bits
@@ -1574,7 +1574,9 @@ int CmdLoad(const char *Cmd) {
 	
 	//ICEMAN todo	
 	// set signal properties low/high/mean/amplitude and isnoice detection
-	isNoise_int(GraphBuffer, GraphTraceLen);
+	uint8_t bits[GraphTraceLen];
+	size_t size = getFromGraphBuf(bits);
+	isNoise(bits, sizeof(bits));
 	return 0;
 }
 
@@ -1638,11 +1640,13 @@ int CmdNorm(const char *Cmd) {
 			//marshmelow: adjusted *1000 to *256 to make +/- 128 so demod commands still work
 		}
 	}
-	RepaintGraphWindow();
-	
+
 	//ICEMAN todo	
 	// set signal properties low/high/mean/amplitude and isnoice detection
-	isNoise_int(GraphBuffer, GraphTraceLen);	
+	uint8_t bits[GraphTraceLen];
+	size_t size = getFromGraphBuf(bits);
+	isNoise(bits, sizeof(bits));
+	RepaintGraphWindow();
 	return 0;
 }
 
@@ -1729,8 +1733,10 @@ int CmdDirectionalThreshold(const char *Cmd) {
 	
 	//ICEMAN todo	
 	// set signal properties low/high/mean/amplitude and isnoice detection
-	isNoise_int(GraphBuffer, GraphTraceLen);
-	
+	uint8_t bits[GraphTraceLen];
+	size_t size = getFromGraphBuf(bits);
+	isNoise(bits, sizeof(bits));
+
 	RepaintGraphWindow();
 	return 0;
 }
@@ -1759,8 +1765,10 @@ int CmdZerocrossings(const char *Cmd) {
 
 	//ICEMAN todo	
 	// set signal properties low/high/mean/amplitude and isnoice detection
-	isNoise_int(GraphBuffer, GraphTraceLen);
-	
+	uint8_t bits[GraphTraceLen];
+	size_t size = getFromGraphBuf(bits);
+	isNoise(bits, sizeof(bits));
+
 	RepaintGraphWindow();
 	return 0;
 }
@@ -2012,11 +2020,14 @@ int CmdDataIIR(const char *Cmd){
 	uint8_t k = param_get8(Cmd, 0);
 	//iceIIR_Butterworth(GraphBuffer, GraphTraceLen);
 	iceSimple_Filter(GraphBuffer, GraphTraceLen, k);
+
 	//ICEMAN todo	
 	// set signal properties low/high/mean/amplitude and isnoice detection
-	isNoise_int(GraphBuffer, GraphTraceLen);
-	
-	RepaintGraphWindow();
+	uint8_t bits[GraphTraceLen];
+	size_t size = getFromGraphBuf(bits);
+	isNoise(bits, sizeof(bits));
+
+	RepaintGraphWindow();	
 	return 0;
 }
 

From b66a4815818048ab27558e4fe722130f4dccb899 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sun, 9 Sep 2018 19:56:25 +0200
Subject: [PATCH 0040/1938] cleanup

---
 client/graph.c | 38 +++++++++++++++++++-------------------
 client/graph.h |  2 +-
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/client/graph.c b/client/graph.c
index 2e492cf30..2d6a28233 100644
--- a/client/graph.c
+++ b/client/graph.c
@@ -57,7 +57,6 @@ void save_restoreGB(uint8_t saveOpt) {
 	return;
 }
 
-// DETECT CLOCK NOW IN LFDEMOD.C
 void setGraphBuf(uint8_t *buf, size_t size) {
 	if ( buf == NULL ) return;
 	
@@ -73,6 +72,7 @@ void setGraphBuf(uint8_t *buf, size_t size) {
 	RepaintGraphWindow();
 	return;
 }
+
 size_t getFromGraphBuf(uint8_t *buf) {
 	if (buf == NULL ) return 0;
 	uint32_t i;
@@ -102,18 +102,18 @@ int GetAskClock(const char *str, bool printAns) {
 		return clock;
 	
 	// Auto-detect clock
-	uint8_t grph[MAX_GRAPH_TRACE_LEN] = {0};
-	size_t size = getFromGraphBuf(grph);
+	uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
+	size_t size = getFromGraphBuf(bits);
 	if (size == 0) {
 		PrintAndLogEx(WARNING, "Failed to copy from graphbuffer");
 		return -1;
 	}
-	//, size_t *ststart, size_t *stend
+
 	size_t ststart = 0, stend = 0;
-	bool st = DetectST(grph, &size, &clock, &ststart, &stend);
+	bool st = DetectST(bits, &size, &clock, &ststart, &stend);
 	int start = stend;
 	if (st == false) {
-		start = DetectASKClock(grph, size, &clock, 20);
+		start = DetectASKClock(bits, size, &clock, 20);
 	}
 	setClockGrid(clock, start);
 	// Only print this message if we're not looping something
@@ -125,13 +125,13 @@ int GetAskClock(const char *str, bool printAns) {
 
 uint8_t GetPskCarrier(const char *str, bool printAns) {
 	uint8_t carrier = 0;
-	uint8_t grph[MAX_GRAPH_TRACE_LEN] = {0};
-	size_t size = getFromGraphBuf(grph);
+	uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
+	size_t size = getFromGraphBuf(bits);
 	if ( size == 0 ) {
 		PrintAndLogEx(WARNING, "Failed to copy from graphbuffer");
 		return 0;
 	}
-	uint16_t fc = countFC(grph, size, 0);
+	uint16_t fc = countFC(bits, size, false);
 	carrier = fc & 0xFF;
 	if (carrier != 2 && carrier != 4 && carrier != 8) return 0;
 	if (( fc >> 8) == 10 && carrier == 8) return 0;
@@ -194,12 +194,13 @@ int GetFskClock(const char* str, bool printAns) {
 
 	uint8_t fc1 = 0, fc2 = 0, rf1 = 0;
 	int firstClockEdge = 0;
-	int ans = fskClocks(&fc1, &fc2, &rf1, &firstClockEdge);
-	if (ans == 0) 
+	
+	if ( !fskClocks(&fc1, &fc2, &rf1, &firstClockEdge))
 		return 0;
 	
 	if ((fc1==10 && fc2==8) || (fc1==8 && fc2==5)){
-		if (printAns) PrintAndLogEx(NORMAL, "Detected Field Clocks: FC/%d, FC/%d - Bit Clock: RF/%d", fc1, fc2, rf1);
+		if (printAns) 
+			PrintAndLogEx(NORMAL, "Detected Field Clocks: FC/%d, FC/%d - Bit Clock: RF/%d", fc1, fc2, rf1);
 		setClockGrid(rf1, firstClockEdge);
 		return rf1;
 	}
@@ -208,26 +209,25 @@ int GetFskClock(const char* str, bool printAns) {
 	PrintAndLogEx(DEBUG, "Detected Field Clocks: FC/%d, FC/%d - Bit Clock: RF/%d", fc1, fc2, rf1);
 	return 0;
 }
-int fskClocks(uint8_t *fc1, uint8_t *fc2, uint8_t *rf1, int *firstClockEdge) {
+bool fskClocks(uint8_t *fc1, uint8_t *fc2, uint8_t *rf1, int *firstClockEdge) {
 	uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
 	size_t size = getFromGraphBuf(bits);
 	if (size == 0) 
-		return 0;
+		return false;
 	
-	uint16_t ans = countFC(bits, size, 1); 
+	uint16_t ans = countFC(bits, size, true);
 	if (ans == 0) {
 		PrintAndLogEx(DEBUG, "DEBUG: No data found");
-		return 0;
+		return false;
 	}
 	
 	*fc1 = (ans >> 8) & 0xFF;
 	*fc2 = ans & 0xFF;
-	//int firstClockEdge = 0;
 	*rf1 = detectFSKClk(bits, size, *fc1, *fc2, firstClockEdge);
 	if (*rf1 == 0) {
 		PrintAndLogEx(DEBUG, "DEBUG: Clock detect error");
-		return 0;
+		return false;
 	}
-	return 1;
+	return true;
 }
 
diff --git a/client/graph.h b/client/graph.h
index ec6011c27..3e56d09f2 100644
--- a/client/graph.h
+++ b/client/graph.h
@@ -26,7 +26,7 @@ int GetPskClock(const char *str, bool printAns);
 uint8_t GetPskCarrier(const char *str, bool printAns);
 int GetNrzClock(const char *str, bool printAns);
 int GetFskClock(const char *str, bool printAns);
-int fskClocks(uint8_t *fc1, uint8_t *fc2, uint8_t *rf1, int *firstClockEdge);
+bool fskClocks(uint8_t *fc1, uint8_t *fc2, uint8_t *rf1, int *firstClockEdge);
 void setGraphBuf(uint8_t *buff, size_t size);
 void save_restoreGB(uint8_t saveOpt);
 

From c187774a986ce8e2af9f8b5a26aed3e77a17d402 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sun, 9 Sep 2018 22:08:32 +0200
Subject: [PATCH 0041/1938] fix:  hilow fuzzing overlap

---
 common/lfdemod.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/common/lfdemod.c b/common/lfdemod.c
index f6d4f4d89..4ab05bfa9 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -180,6 +180,12 @@ void getHiLo(int *high, int *low, uint8_t fuzzHi, uint8_t fuzzLo) {
 		*low =  signalprop.low + ((range * (100-fuzzLo))/100);
 	}
 	
+	// if fuzzing to great and overlap
+	if ( *high < *low ) {
+		*high = signalprop.high;
+		*low =  signalprop.low;
+	}
+	
 	if (g_debugMode) 
 		prnt("getHiLo fuzzed: High %d | Low %d", *high, *low);
 }
@@ -388,7 +394,7 @@ bool loadWaveCounters(uint8_t *samples, size_t size, int lowToLowWaveLen[], int
 			break;
 
 		highToLowWaveLen[*waveCnt] = i - firstHigh; //first high to first low
-		lowToLowWaveLen[*waveCnt] = i - firstLow;
+		lowToLowWaveLen[*waveCnt] = i - firstLow;	
 		*waveCnt += 1;
 		if (i-firstLow < *minClk && i < size) {
 			*minClk = i - firstLow;

From d42b4f6ddfc918a1489e351dec59297d0fc4c280 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sun, 9 Sep 2018 23:02:41 +0200
Subject: [PATCH 0042/1938] CHG: ask clean wave - better start position in
 signal

---
 common/lfdemod.c | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/common/lfdemod.c b/common/lfdemod.c
index 4ab05bfa9..8f0630d52 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -372,7 +372,6 @@ bool loadWaveCounters(uint8_t *samples, size_t size, int lowToLowWaveLen[], int
 		return false;
 	}
 	
-	//getHiLo(samples, testsize, high, low, 80, 80);
 	getHiLo(high, low, 80, 80);
 
 	// get to first full low to prime loop and skip incomplete first pulse
@@ -513,8 +512,6 @@ int DetectStrongAskClock(uint8_t *dest, size_t size, int high, int low, int *clo
 	size_t minClk = 512;
 	int shortestWaveIdx = 0;
 	
-	if (g_debugMode == 1) prnt("DEBUG ASK: DetectStrongAskClock: hi %d | low  %d ", high, low);
-	
 	// get to first full low to prime loop and skip incomplete first pulse
 	getNextHigh(dest, size, high, &i);
 	getNextLow(dest, size, low, &i);
@@ -1409,10 +1406,15 @@ int manrawdecode(uint8_t *bits, size_t *size, uint8_t invert, uint8_t *alignPos)
 //RETURN: num of errors.  if 0, is ok.
 int cleanAskRawDemod(uint8_t *bits, size_t *size, int clk, int invert, int high, int low, int *startIdx) {
 	*startIdx = 0;
-	size_t bitCnt=0, smplCnt=1, errCnt=0;
-	bool waveHigh = (bits[0] >= high);
+	size_t bitCnt = 0, smplCnt = 1, errCnt = 0, pos = 0;
+
+	uint8_t cl_4 = clk / 4;
+	uint8_t cl_2 = clk / 2;
+
+	getNextHigh(bits, *size, high, &pos);
+	bool waveHigh = true;
 	
-	for (size_t i=1; i < *size; i++){
+	for (size_t i=pos; i < *size; i++){
 		if (bits[i] >= high && waveHigh){
 			smplCnt++;
 		} else if (bits[i] <= low && !waveHigh){
@@ -1420,8 +1422,8 @@ int cleanAskRawDemod(uint8_t *bits, size_t *size, int clk, int invert, int high,
 		} else { //transition
 			if ((bits[i] >= high && !waveHigh) || (bits[i] <= low && waveHigh)){
 
-				if (smplCnt > clk-(clk/4)-1) { //full clock
-					if (smplCnt > clk + (clk/4)+1) { //too many samples
+				if (smplCnt > clk - cl_4 - 1) { //full clock
+					if (smplCnt > clk + cl_4 + 1) { //too many samples
 						errCnt++;
 						if (g_debugMode == 2) prnt("DEBUG:(cleanAskRawDemod) ASK Modulation Error at: %u", i);
 						bits[bitCnt++] = 7;
@@ -1432,18 +1434,18 @@ int cleanAskRawDemod(uint8_t *bits, size_t *size, int clk, int invert, int high,
 						bits[bitCnt++] = invert ^ 1;
 						bits[bitCnt++] = invert ^ 1;
 					}
-					if (*startIdx==0)
-						*startIdx = i-clk;
+					if (*startIdx == 0)
+						*startIdx = i - clk;
 					waveHigh = !waveHigh;  
 					smplCnt = 0;
-				} else if (smplCnt > (clk/2) - (clk/4)-1) { //half clock
+				} else if (smplCnt > cl_2 - cl_4 - 1) { //half clock
 					if (waveHigh) {
 						bits[bitCnt++] = invert;
 					} else if (!waveHigh) {
 						bits[bitCnt++] = invert ^ 1;
 					}
-					if (*startIdx==0)
-						*startIdx = i-(clk/2);
+					if (*startIdx == 0)
+						*startIdx = i - cl_2;
 					waveHigh = !waveHigh;  
 					smplCnt = 0;
 				} else {

From 0a648d482d6c11236753be8fc81c008c8134a612 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sun, 9 Sep 2018 23:16:47 +0200
Subject: [PATCH 0043/1938] chg: remove warning unused variable

---
 client/cmddata.c    | 2 +-
 client/cmdlfawid.c  | 2 +-
 client/cmdlfem4x.c  | 1 -
 client/cmdlfhid.c   | 2 +-
 client/cmdlft55xx.c | 6 +++---
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/client/cmddata.c b/client/cmddata.c
index bcaeaf3bc..8b263e44d 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -1576,7 +1576,7 @@ int CmdLoad(const char *Cmd) {
 	// set signal properties low/high/mean/amplitude and isnoice detection
 	uint8_t bits[GraphTraceLen];
 	size_t size = getFromGraphBuf(bits);
-	isNoise(bits, sizeof(bits));
+	isNoise(bits, size);
 	return 0;
 }
 
diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c
index 420caeb62..b17864dcf 100644
--- a/client/cmdlfawid.c
+++ b/client/cmdlfawid.c
@@ -242,7 +242,7 @@ int CmdAWIDRead_device(const char *Cmd) {
 int CmdAWIDDemod(const char *Cmd) {
 	uint8_t bits[MAX_GRAPH_TRACE_LEN]={0};
 	size_t size = getFromGraphBuf(bits);
-	if (size==0) {
+	if (size == 0) {
 		PrintAndLogEx(DEBUG, "DEBUG: Error - AWID not enough samples");
 		return 0;
 	}
diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 1664a3c2b..1e408bbf6 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -799,7 +799,6 @@ int EM4x50Read(const char *Cmd, bool verbose) {
 	
 	uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
 	size_t size = getFromGraphBuf(bits);
-	
 	isNoise(bits, size);
 	
 	signal_t *sp = getSignalProperties();
diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c
index 02fd9c791..ced656789 100644
--- a/client/cmdlfhid.c
+++ b/client/cmdlfhid.c
@@ -130,7 +130,7 @@ int CmdHIDDemod(const char *Cmd) {
 
 	uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
 	size_t size = getFromGraphBuf(bits);
-	if (size==0) {
+	if (size == 0) {
 		PrintAndLogEx(DEBUG, "DEBUG: Error - HID not enough samples");
 		return 0;
 	}
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 7fbf143d3..9102efc5c 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -538,7 +538,7 @@ bool tryDetectModulation(){
 		}
 	} else {
 		clk = GetAskClock("", false);
-		if (clk>0) {
+		if (clk > 0) {
 			tests[hits].ST = true;
 			// "0 0 1 " == clock auto, invert false, maxError 1.
 			// false = no verbose
@@ -583,7 +583,7 @@ bool tryDetectModulation(){
 			}
 		}
 		clk = GetNrzClock("", false);
-		if (clk>8) { //clock of rf/8 is likely a false positive, so don't use it.
+		if (clk > 8) { //clock of rf/8 is likely a false positive, so don't use it.
 			if ( NRZrawDemod("0 0 1", false)  && test(DEMOD_NRZ, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
 				tests[hits].modulation = DEMOD_NRZ;
 				tests[hits].bitrate = bitRate;
@@ -604,7 +604,7 @@ bool tryDetectModulation(){
 		}
 		
 		clk = GetPskClock("", false);
-		if (clk>0) {
+		if (clk > 0) {
 			// allow undo
 			save_restoreGB(GRAPH_SAVE);
 			// skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)

From 9ee550af45a10b87965576e95d4f67cd5eaf5f6f Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Mon, 10 Sep 2018 21:45:00 +0200
Subject: [PATCH 0044/1938] FIX: lf t55xx detect  works better with adjusted
 timings CHG: applied fpga_off patch.

---
 armsrc/lfops.c | 47 ++++++++++++++++++++++++++---------------------
 1 file changed, 26 insertions(+), 21 deletions(-)

diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index a957e4dfb..612e2a2f4 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -26,10 +26,10 @@
 # define OPEN_COIL()	HIGH(GPIO_SSC_DOUT)
 #endif
 
-#define START_GAP 31*8 // was 250 // SPEC:  1*8 to 50*8 - typ 15*8 (15fc)
-#define WRITE_GAP 20*8 // was 160 // SPEC:  1*8 to 20*8 - typ 10*8 (10fc)
-#define WRITE_0   18*8 // was 144 // SPEC: 16*8 to 32*8 - typ 24*8 (24fc)
-#define WRITE_1   54*8 // was 400 // SPEC: 48*8 to 64*8 - typ 56*8 (56fc)  432 for T55x7; 448 for E5550
+#define START_GAP 28*8 // was 250 // SPEC:  1*8 to 50*8 - typ 15*8 (15fc)
+#define WRITE_GAP 17*8 // was 160 // SPEC:  1*8 to 20*8 - typ 10*8 (10fc)
+#define WRITE_0   15*8 // was 144 // SPEC: 16*8 to 32*8 - typ 24*8 (24fc)
+#define WRITE_1   47*8 // was 400 // SPEC: 48*8 to 64*8 - typ 56*8 (56fc)  432 for T55x7; 448 for E5550
 #define READ_GAP  15*8 
 
 //  VALUES TAKEN FROM EM4x function: SendForward
@@ -68,7 +68,7 @@ void ModThenAcquireRawAdcSamples125k(uint32_t delay_off, uint32_t period_0, uint
 
 	// Make sure the tag is reset
 	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF_LF);
 	WaitMS(500);
 
 	// clear read buffer
@@ -109,7 +109,7 @@ void ModThenAcquireRawAdcSamples125k(uint32_t delay_off, uint32_t period_0, uint
 			if (command[counter] == '0') {
 				// if field already off leave alone (affects timing otherwise)
 				if (off == false) {
-					FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+					FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF_LF);
 					LED_D_OFF();
 					off = true;
 				}
@@ -136,7 +136,7 @@ void ModThenAcquireRawAdcSamples125k(uint32_t delay_off, uint32_t period_0, uint
 				TurnReadLFOn(period_1);
 
 			LED_D_OFF();
-			FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+			FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF_LF);
 			WaitUS(delay_off);
 		}
 
@@ -1269,7 +1269,7 @@ void T55xxWriteBit(int bit) {
 		TurnReadLFOn(WRITE_0);
 	else
 		TurnReadLFOn(WRITE_1);
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF_LF);
 	WaitUS(WRITE_GAP);
 }
 
@@ -1279,14 +1279,15 @@ void T55xxResetRead(void) {
 	//clear buffer now so it does not interfere with timing later
 	BigBuf_Clear_keep_EM();
 
+	StartTicks();
+
 	// Set up FPGA, 125kHz
 	LFSetupFPGAForADC(95, true);
-	StartTicks();
 	// make sure tag is fully powered up...
-	WaitMS(5);
+	WaitMS(6);
 
 	// Trigger T55x7 in mode.
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF_LF);
 	WaitUS(START_GAP);
 
 	// reset tag - op code 00
@@ -1312,13 +1313,15 @@ void T55xxWriteBlockExt(uint32_t Data, uint8_t Block, uint32_t Pwd, uint8_t arg)
 	bool testMode = arg & 0x4;
 	uint32_t i = 0;
 
+	StartTicks();
+		
 	// Set up FPGA, 125kHz
 	LFSetupFPGAForADC(95, true);
-	StartTicks();
+
 	// make sure tag is fully powered up...
-	WaitMS(5);
+	WaitMS(6);
 	// Trigger T55x7 in mode.
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF_LF);
 	WaitUS(START_GAP);
 
 	if (testMode) Dbprintf("TestMODE");
@@ -1396,13 +1399,14 @@ void T55xxReadBlock(uint16_t arg0, uint8_t Block, uint32_t Pwd) {
 	//make sure block is at max 7
 	Block &= 0x7;
 
+	StartTicks();
+
 	// Set up FPGA, 125kHz to power up the tag
 	LFSetupFPGAForADC(95, true);
-	StartTicks();
 	// make sure tag is fully powered up...
-	WaitMS(5);
+	WaitMS(6);
 	// Trigger T55x7 Direct Access Mode with start gap
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF_LF);
 	WaitUS(START_GAP);
 	
 	// Opcode 1[page]
@@ -1440,15 +1444,16 @@ void T55xxReadBlock(uint16_t arg0, uint8_t Block, uint32_t Pwd) {
 void T55xxWakeUp(uint32_t Pwd){
 	LED_B_ON();
 	uint32_t i = 0;
+
+	StartTicks();
 	
 	// Set up FPGA, 125kHz
 	LFSetupFPGAForADC(95, true);
-	StartTicks();
 	// make sure tag is fully powered up...
-	WaitMS(5);
+	WaitMS(6);
 	
 	// Trigger T55x7 Direct Access Mode
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF_LF);
 	WaitUS(START_GAP);
 	
 	// Opcode 10
@@ -1888,7 +1893,7 @@ This triggers a COTAG tag to response
 */
 void Cotag(uint32_t arg0) {
 #ifndef OFF
-# define OFF 	{ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); WaitUS(2035); }
+# define OFF 	{ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF_LF); WaitUS(2035); }
 #endif
 #ifndef ON
 # define ON(x)   { FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | FPGA_LF_ADC_READER_FIELD); WaitUS((x)); }

From 5959cdf62c689886c2f55b6f041536f39264af63 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Mon, 10 Sep 2018 22:49:29 +0200
Subject: [PATCH 0045/1938] chg:  remove some warning of unused variables

---
 client/cmddata.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/cmddata.c b/client/cmddata.c
index 8b263e44d..a9f58b962 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -1645,7 +1645,7 @@ int CmdNorm(const char *Cmd) {
 	// set signal properties low/high/mean/amplitude and isnoice detection
 	uint8_t bits[GraphTraceLen];
 	size_t size = getFromGraphBuf(bits);
-	isNoise(bits, sizeof(bits));
+	isNoise(bits, size);
 	RepaintGraphWindow();
 	return 0;
 }
@@ -1735,7 +1735,7 @@ int CmdDirectionalThreshold(const char *Cmd) {
 	// set signal properties low/high/mean/amplitude and isnoice detection
 	uint8_t bits[GraphTraceLen];
 	size_t size = getFromGraphBuf(bits);
-	isNoise(bits, sizeof(bits));
+	isNoise(bits, size);
 
 	RepaintGraphWindow();
 	return 0;
@@ -1767,7 +1767,7 @@ int CmdZerocrossings(const char *Cmd) {
 	// set signal properties low/high/mean/amplitude and isnoice detection
 	uint8_t bits[GraphTraceLen];
 	size_t size = getFromGraphBuf(bits);
-	isNoise(bits, sizeof(bits));
+	isNoise(bits, size);
 
 	RepaintGraphWindow();
 	return 0;
@@ -2025,7 +2025,7 @@ int CmdDataIIR(const char *Cmd){
 	// set signal properties low/high/mean/amplitude and isnoice detection
 	uint8_t bits[GraphTraceLen];
 	size_t size = getFromGraphBuf(bits);
-	isNoise(bits, sizeof(bits));
+	isNoise(bits, size);
 
 	RepaintGraphWindow();	
 	return 0;

From ba2543b6273c93997c9d0a61b59bd0718771849c Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Tue, 11 Sep 2018 18:35:07 +0200
Subject: [PATCH 0046/1938] ADD: 'lf t55xx deviceconfig'  - command that allows
 for setting t55xx timings via the client.  If run on a RDV40, it also saves
 the config to flashmemory.  This gives you option to have custom timings for
 your custom antenna in order for your RDV40 to work optimal against a t55xx
 tag and with your custom antenna. (@iceman)

---
 CHANGELOG.md                 |  1 +
 armsrc/appmain.c             | 15 ++++--
 armsrc/apps.h                |  4 ++
 armsrc/flashmem.c            |  2 -
 armsrc/lfops.c               | 97 +++++++++++++++++++++++++++++-------
 client/cmdlft55xx.c          | 70 ++++++++++++++++++++++++--
 client/cmdlft55xx.h          |  1 +
 client/hid-flasher/usb_cmd.h |  1 +
 include/common.h             | 11 +++-
 include/usb_cmd.h            |  9 ++++
 10 files changed, 185 insertions(+), 26 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 966d26729..fa2dd86fc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [unreleased][unreleased]
+ - Added 'lf t55xx deviceconfig' - enables custom t55xx timing settings. (RDV40) (@iceman)
  - Chg adaptations for FPC communications (work in progress)  (@iceman)
  - Fix 'stand-alone Colin' - remake to benefit from flashmem for persistence. (@cjbrigato)
  - Fix 'LEGIC SIM' - remake of legic sim (@drandreas)
diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 9cb3758af..f3b2e6c60 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -392,7 +392,8 @@ void SendStatus(void) {
 	I2C_print_status();
 #endif	
 #ifdef WITH_LF
-	printConfig(); //LF Sampling config
+	printConfig(); 		// LF Sampling config
+	printT55xxConfig();	// LF T55XX Config
 #endif	
 	printUSBSpeed();
 	Dbprintf("Various");
@@ -625,6 +626,9 @@ void UsbPacketReceived(uint8_t *packet, int len) {
   
 	switch(c->cmd) {
 #ifdef WITH_LF
+		case CMD_SET_LF_T55XX_CONFIG:
+			setT55xxConfig((t55xx_config *) c->d.asBytes);
+			break;			
 		case CMD_SET_LF_SAMPLING_CONFIG:
 			setSamplingConfig((sample_config *) c->d.asBytes);
 			break;
@@ -701,10 +705,11 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 				c->d.asDwords[4], c->d.asDwords[5], c->d.asDwords[6]
 				);
 			break;
-		case CMD_T55XX_READ_BLOCK:
+		case CMD_T55XX_READ_BLOCK: {				
 			T55xxReadBlock(c->arg[0], c->arg[1], c->arg[2]);
 			break;
-		case CMD_T55XX_WRITE_BLOCK:
+		}
+		case CMD_T55XX_WRITE_BLOCK:		
 			T55xxWriteBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes[0]);
 			break;
 		case CMD_T55XX_WAKEUP:
@@ -1475,6 +1480,10 @@ void  __attribute__((noreturn)) AppMain(void) {
 	usart_init();
 #endif	
 
+#ifdef WITH_FLASH
+	loadT55xxConfig();
+#endif
+
 	// This is made as late as possible to ensure enumeration without timeout
 	// against device such as http://www.hobbytronics.co.uk/usb-host-board-v2 
 	usb_disable();
diff --git a/armsrc/apps.h b/armsrc/apps.h
index f8d24f4ae..81a073904 100644
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -108,6 +108,10 @@ void TurnReadLFOn(uint32_t delay);
 void EM4xReadWord(uint8_t addr, uint32_t pwd, uint8_t usepwd);
 void EM4xWriteWord(uint32_t flag, uint32_t data, uint32_t pwd);
 void Cotag(uint32_t arg0);
+void setT55xxConfig(t55xx_config *c);
+t55xx_config * getT55xxConfig(void);
+void printT55xxConfig(void);
+void loadT55xxConfig(void);
 
 /// iso14443b.h
 void SimulateIso14443bTag(uint32_t pupi);
diff --git a/armsrc/flashmem.c b/armsrc/flashmem.c
index a8642dd74..d7ec37f81 100644
--- a/armsrc/flashmem.c
+++ b/armsrc/flashmem.c
@@ -1,7 +1,5 @@
 #include "flashmem.h"
 
-
-
 /* here: use NCPS2 @ PA10: */
 #define SPI_CSR_NUM      2
 #define SPI_PCS(npcs)       ((~(1 << (npcs)) & 0xF) << 16)
diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index 612e2a2f4..df49da530 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -18,6 +18,8 @@
 #include "lfsampling.h"
 #include "protocols.h"
 #include "usb_cdc.h" // for usb_poll_validate_length
+#include "common.h"
+#include "flashmem.h" // persistence on mem
 
 #ifndef SHORT_COIL
 # define SHORT_COIL()	LOW(GPIO_SSC_DOUT)
@@ -26,11 +28,11 @@
 # define OPEN_COIL()	HIGH(GPIO_SSC_DOUT)
 #endif
 
-#define START_GAP 28*8 // was 250 // SPEC:  1*8 to 50*8 - typ 15*8 (15fc)
-#define WRITE_GAP 17*8 // was 160 // SPEC:  1*8 to 20*8 - typ 10*8 (10fc)
-#define WRITE_0   15*8 // was 144 // SPEC: 16*8 to 32*8 - typ 24*8 (24fc)
-#define WRITE_1   47*8 // was 400 // SPEC: 48*8 to 64*8 - typ 56*8 (56fc)  432 for T55x7; 448 for E5550
-#define READ_GAP  15*8 
+//#define START_GAP 31*8 // was 250 // SPEC:  1*8 to 50*8 - typ 15*8 (15fc)
+//#define WRITE_GAP 8*8 // 17*8 // was 160 // SPEC:  1*8 to 20*8 - typ 10*8 (10fc)
+//#define WRITE_0   15*8 // 18*8 // was 144 // SPEC: 16*8 to 32*8 - typ 24*8 (24fc)
+//#define WRITE_1   47*8 // 50*8 // was 400 // SPEC: 48*8 to 64*8 - typ 56*8 (56fc)  432 for T55x7; 448 for E5550
+//#define READ_GAP  15*8 
 
 //  VALUES TAKEN FROM EM4x function: SendForward
 //  START_GAP = 440;       (55*8) cycles at 125Khz (8us = 1cycle)
@@ -49,7 +51,68 @@
 // new timer:
 //     = 1us = 1.5ticks
 // 1fc = 8us = 12ticks
+/*
+Default LF T55xx config is set to:
+	startgap = 31*8
+	writegap = 17*8
+	write_0 = 15*8
+	write_1 = 47*8
+	read_gap = 15*8
+*/
+t55xx_config t_config = { 31*8, 17*8, 15*8, 47*8, 15*8 } ;
 
+void printT55xxConfig(void) {
+	Dbprintf("LF T55XX config");
+	Dbprintf("  [q] startgap............%d*8 (%d)", t_config.start_gap/8, t_config.start_gap);
+	Dbprintf("  [b] writegap............%d*8 (%d)", t_config.write_gap/8, t_config.write_gap);
+	Dbprintf("  [d] write_0.............%d*8 (%d)", t_config.write_0/8,   t_config.write_0);
+	Dbprintf("  [a] write_1.............%d*8 (%d)", t_config.write_1/8,   t_config.write_1);
+	Dbprintf("  [t] readgap.............%d*8 (%d)", t_config.read_gap/8,  t_config.read_gap);
+}
+void setT55xxConfig(t55xx_config *c) {
+	
+	if (c->start_gap != 0) t_config.start_gap = c->start_gap*8;
+	if (c->write_gap != 0) t_config.write_gap = c->write_gap*8;
+	if (c->write_0   != 0) t_config.write_0 = c->write_0*8;
+	if (c->write_1   != 0) t_config.write_1 = c->write_1*8;
+	if (c->read_gap  != 0) t_config.read_gap = c->read_gap*8;	
+
+	printT55xxConfig();
+	
+#if WITH_FLASH
+    if (!FlashInit())
+        return;
+	
+	Flash_CheckBusy(BUSY_TIMEOUT);
+	
+	uint16_t isok = Flash_WriteDataCont(T55XX_CONFIG_OFFSET, (uint8_t *)&t_config, sizeof(t55xx_config));
+	FlashStop();
+	
+	if ( isok == T55XX_CONFIG_LEN) {
+		if (MF_DBGLEVEL > 1) DbpString("T55XX Config save success");
+	}
+#endif
+}
+
+t55xx_config* getT55xxConfig(void) {
+	return &t_config;
+}
+
+void loadT55xxConfig(void) {
+#if WITH_FLASH
+    if (!FlashInit())
+        return;
+	Flash_CheckBusy(BUSY_TIMEOUT);
+	Flash_WriteEnable();
+	
+	uint16_t isok = Flash_ReadDataCont(T55XX_CONFIG_OFFSET, (uint8_t *)&t_config, T55XX_CONFIG_LEN);
+	FlashStop();
+	
+	if ( isok == T55XX_CONFIG_LEN) {
+		if (MF_DBGLEVEL > 1) DbpString("T55XX Config load success");
+	}
+#endif
+}
 
 /**
  * Function to do a modulation and then get samples.
@@ -1266,11 +1329,11 @@ void TurnReadLF_off(uint32_t delay) {
 // Write one bit to card
 void T55xxWriteBit(int bit) {
 	if (!bit)
-		TurnReadLFOn(WRITE_0);
+		TurnReadLFOn(t_config.write_0);
 	else
-		TurnReadLFOn(WRITE_1);
+		TurnReadLFOn(t_config.write_1);
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF_LF);
-	WaitUS(WRITE_GAP);
+	WaitUS(t_config.write_gap);
 }
 
 // Send T5577 reset command then read stream (see if we can identify the start of the stream)
@@ -1284,17 +1347,17 @@ void T55xxResetRead(void) {
 	// Set up FPGA, 125kHz
 	LFSetupFPGAForADC(95, true);
 	// make sure tag is fully powered up...
-	WaitMS(6);
+	WaitMS(4);
 
 	// Trigger T55x7 in mode.
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF_LF);
-	WaitUS(START_GAP);
+	WaitUS(t_config.start_gap);
 
 	// reset tag - op code 00
 	T55xxWriteBit(0);
 	T55xxWriteBit(0);
 
-	TurnReadLFOn(READ_GAP);
+	TurnReadLFOn(t_config.read_gap);
 
 	// Acquisition
 	DoPartialAcquisition(0, true, BigBuf_max_traceLen(), 0);
@@ -1319,10 +1382,10 @@ void T55xxWriteBlockExt(uint32_t Data, uint8_t Block, uint32_t Pwd, uint8_t arg)
 	LFSetupFPGAForADC(95, true);
 
 	// make sure tag is fully powered up...
-	WaitMS(6);
+	WaitMS(4);
 	// Trigger T55x7 in mode.
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF_LF);
-	WaitUS(START_GAP);
+	WaitUS(t_config.start_gap);
 
 	if (testMode) Dbprintf("TestMODE");
 	// Std Opcode 10
@@ -1404,10 +1467,10 @@ void T55xxReadBlock(uint16_t arg0, uint8_t Block, uint32_t Pwd) {
 	// Set up FPGA, 125kHz to power up the tag
 	LFSetupFPGAForADC(95, true);
 	// make sure tag is fully powered up...
-	WaitMS(6);
+	WaitMS(4);
 	// Trigger T55x7 Direct Access Mode with start gap
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF_LF);
-	WaitUS(START_GAP);
+	WaitUS(t_config.start_gap);
 	
 	// Opcode 1[page]
 	T55xxWriteBit(1);
@@ -1450,11 +1513,11 @@ void T55xxWakeUp(uint32_t Pwd){
 	// Set up FPGA, 125kHz
 	LFSetupFPGAForADC(95, true);
 	// make sure tag is fully powered up...
-	WaitMS(6);
+	WaitMS(4);
 	
 	// Trigger T55x7 Direct Access Mode
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF_LF);
-	WaitUS(START_GAP);
+	WaitUS(t_config.start_gap);
 	
 	// Opcode 10
 	T55xxWriteBit(1);
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 9102efc5c..a1f072425 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -187,6 +187,22 @@ int usage_t55xx_recoverpw(){
 	PrintAndLogEx(NORMAL, "      lf t55xx wipe Q5 -  wipes a t5555 Q5 tag, config block 0x6001F004");
 	return 0;
 }
+int usage_lf_deviceconfig(){
+	PrintAndLogEx(NORMAL, "Usage: lf t55xx deviceconfig a <gap> b <gap> c <gap> d <gap> e <gap>");
+	PrintAndLogEx(NORMAL, "Options:");
+	PrintAndLogEx(NORMAL, "       h             - This help");
+	PrintAndLogEx(NORMAL, "       a <8..28>     - Set start gap");
+	PrintAndLogEx(NORMAL, "       b <8..28>     - Set write gap");
+	PrintAndLogEx(NORMAL, "       c <8..28>     - Set write ZERO gap");
+	PrintAndLogEx(NORMAL, "       d <8..28>     - Set write ONE gap");
+	PrintAndLogEx(NORMAL, "       e <8..28>     - Set read gap");
+	PrintAndLogEx(NORMAL, "");
+	PrintAndLogEx(NORMAL, "Examples:");
+	PrintAndLogEx(NORMAL, "      lf t55xx deviceconfig a 31           - start gap 31*8");
+	PrintAndLogEx(NORMAL, "      lf t55xx deviceconfig a 31 b 20      - start gap 31*8,  write gap 20*8");
+	PrintAndLogEx(NORMAL, "");
+	return 0;
+}
 static int CmdHelp(const char *Cmd);
 
 void printT5xxHeader(uint8_t page){
@@ -461,8 +477,7 @@ static int SanityOfflineCheck( bool useGraphBuffer ){
 
 int CmdT55xxDetect(const char *Cmd){
 	bool errors = false;
-	bool useGB = false;
-	bool usepwd = false;
+	bool useGB = false, usepwd = false;
 	uint32_t password = 0;
 	uint8_t cmdp = 0;
 
@@ -1291,7 +1306,7 @@ int CmdT55xxDump(const char *Cmd){
 	return 1;
 }
 
-bool AquireData( uint8_t page, uint8_t block, bool pwdmode, uint32_t password ){
+bool AquireData( uint8_t page, uint8_t block, bool pwdmode, uint32_t password ) {
 	// arg0 bitmodes:
 	// 	bit0 = pwdmode
 	// 	bit1 = page to read from
@@ -1882,11 +1897,60 @@ int CmdT55xxDetectPage1(const char *Cmd){
 	return success;
 }
 
+int CmdT55xxSetDeviceConfig(const char *Cmd){
+	uint8_t startgap = 0, writegap = 0;
+	uint8_t write0 = 0, write1 = 0, readgap = 0;
+	bool errors = false;
+	uint8_t cmdp = 0;
+	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+		switch (tolower(param_getchar(Cmd, cmdp))) {
+		case 'h':
+			return usage_lf_deviceconfig();
+		case 'a':
+			errors |= param_getdec(Cmd, cmdp+1, &startgap);
+			cmdp += 2;
+			break;
+		case 'b':
+			errors |= param_getdec(Cmd, cmdp+1, &writegap);
+			cmdp += 2;
+			break;
+		case 'c':
+			errors |= param_getdec(Cmd, cmdp+1, &write0);
+			cmdp += 2;
+			break;
+		case 'd':
+			errors |= param_getdec(Cmd, cmdp+1, &write1);
+			cmdp += 2;
+			break;
+		case 'e':
+			errors |= param_getdec(Cmd, cmdp+1, &readgap);
+			cmdp += 2;
+			break;			
+		default:
+			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+			errors = 1;
+			break;
+		}
+	}
+
+	//Validations
+	if (errors || cmdp == 0) return usage_lf_deviceconfig();
+	
+	t55xx_config config = { startgap, writegap, write0, write1, readgap };
+
+	UsbCommand c = {CMD_SET_LF_T55XX_CONFIG, {0,0,0} };
+	memcpy(c.d.asBytes, &config, sizeof(t55xx_config));
+	clearCommandBuffer();
+	SendCommand(&c);
+	return 0;
+}
+
 static command_t CommandTable[] = {
 	{"help",		CmdHelp,           1, "This help"},
 	{"bruteforce",	CmdT55xxBruteForce,0, "<start password> <end password> [i <*.dic>] Simple bruteforce attack to find password"},
 	{"config",		CmdT55xxSetConfig, 1, "Set/Get T55XX configuration (modulation, inverted, offset, rate)"},
 	{"detect",		CmdT55xxDetect,    1, "[1] Try detecting the tag modulation from reading the configuration block."},
+	{"deviceconfig", CmdT55xxSetDeviceConfig, 1, "Set/Get T55XX device configuration (startgap, writegap, write0, write1, readgap"},
 	{"p1detect",	CmdT55xxDetectPage1,1, "[1] Try detecting if this is a t55xx tag by reading page 1"},
 	{"dump",		CmdT55xxDump,      0, "[password] [o] Dump T55xx card block 0-7. Optional [password], [override]"},
 	{"info",		CmdT55xxInfo,      1, "[1] Show T55x7 configuration data (page 0/ blk 0)"},
diff --git a/client/cmdlft55xx.h b/client/cmdlft55xx.h
index b6c355778..15adab0b6 100644
--- a/client/cmdlft55xx.h
+++ b/client/cmdlft55xx.h
@@ -160,6 +160,7 @@ extern bool tryDetectP1(bool getData);
 bool test(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk, bool *Q5);
 int special(const char *Cmd);
 bool AquireData( uint8_t page, uint8_t block, bool pwdmode, uint32_t password );
+bool AquireDataEx( uint8_t page, uint8_t block, bool pwdmode, uint32_t password, uint32_t timing ) ;
 
 bool detectPassword(int password);
 
diff --git a/client/hid-flasher/usb_cmd.h b/client/hid-flasher/usb_cmd.h
index 2ced2cd18..59027c9d3 100644
--- a/client/hid-flasher/usb_cmd.h
+++ b/client/hid-flasher/usb_cmd.h
@@ -105,6 +105,7 @@ typedef struct {
 #define CMD_VIKING_CLONE_TAG                                              0x0222
 #define CMD_T55XX_WAKEUP	                                              0x0224
 #define CMD_COTAG														  0x0225
+#define CMD_SET_LF_T55XX_CONFIG											  0x0226
 
 /* CMD_SET_ADC_MUX: ext1 is 0 for lopkd, 1 for loraw, 2 for hipkd, 3 for hiraw */
 
diff --git a/include/common.h b/include/common.h
index 8a3f33abd..24e085699 100644
--- a/include/common.h
+++ b/include/common.h
@@ -55,7 +55,7 @@ extern uint32_t FLASHMEM_SPIBAUDRATE;
 #endif
 
 #ifndef FLASH_MEM_MAX_SIZE
-# define FLASH_MEM_MAX_SIZE     0x3FFFF
+# define FLASH_MEM_MAX_SIZE     0x3FFFF  // (262143)
 #endif
 
 #ifndef FLASH_MEM_ID_LEN
@@ -70,6 +70,15 @@ extern uint32_t FLASHMEM_SPIBAUDRATE;
 # define FLASH_MEM_SIGNATURE_OFFSET	(FLASH_MEM_MAX_SIZE - FLASH_MEM_SIGNATURE_LEN)
 #endif
 
+#if WITH_FLASH
+#ifndef T55XX_CONFIG_LEN
+# define T55XX_CONFIG_LEN	sizeof( t55xx_config )
+#endif
+
+#ifndef T55XX_CONFIG_OFFSET
+#define T55XX_CONFIG_OFFSET	(FLASH_MEM_MAX_SIZE - FLASH_MEM_SIGNATURE_LEN - T55XX_CONFIG_LEN)
+#endif
+#endif
 
 // RDV40,  validation structure to help identifying that client/firmware is talking with RDV40
 typedef struct {
diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index 51df5896b..d6b240fb6 100644
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -43,6 +43,14 @@ typedef struct{
 	int trigger_threshold;
 } sample_config;
 
+typedef struct{
+	uint16_t start_gap;
+	uint16_t write_gap;
+	uint16_t write_0;
+	uint16_t write_1;
+	uint16_t read_gap; 
+} t55xx_config;
+
 // For the bootloader
 #define CMD_DEVICE_INFO                                                   0x0000
 #define CMD_SETUP_WRITE                                                   0x0001
@@ -130,6 +138,7 @@ typedef struct{
 #define CMD_VIKING_CLONE_TAG                                              0x0222
 #define CMD_T55XX_WAKEUP	                                              0x0224
 #define CMD_COTAG														  0x0225
+#define CMD_SET_LF_T55XX_CONFIG											  0x0226
 
 /* CMD_SET_ADC_MUX: ext1 is 0 for lopkd, 1 for loraw, 2 for hipkd, 3 for hiraw */
 

From dcd0300913cfd205e79a39131cfd579f1b2267e3 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Tue, 11 Sep 2018 22:14:41 +0200
Subject: [PATCH 0047/1938] chg:  helptext

---
 client/cmdlft55xx.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index a1f072425..5ffda3d9b 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -199,11 +199,13 @@ int usage_lf_deviceconfig(){
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Examples:");
 	PrintAndLogEx(NORMAL, "      lf t55xx deviceconfig a 31           - start gap 31*8");
-	PrintAndLogEx(NORMAL, "      lf t55xx deviceconfig a 31 b 20      - start gap 31*8,  write gap 20*8");
+	PrintAndLogEx(NORMAL, "      lf t55xx deviceconfig a 29 b 17 c 15 d 47 e 15   -  Default T55XX");
+	PrintAndLogEx(NORMAL, "      lf t55xx deviceconfig a 55 b 14 c 21 d 30        -  Default EM4305");
 	PrintAndLogEx(NORMAL, "");
 	return 0;
 }
-static int CmdHelp(const char *Cmd);
+
+ CmdHelp(const char *Cmd);
 
 void printT5xxHeader(uint8_t page){
 	PrintAndLogEx(NORMAL, "Reading Page %d:", page);	

From 43c399876f603bb5c9050bf7034a904c929bfcb9 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Wed, 12 Sep 2018 07:59:43 +0200
Subject: [PATCH 0048/1938] chg: helptext

---
 armsrc/lfops.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index df49da530..4bf54791b 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -63,11 +63,11 @@ t55xx_config t_config = { 31*8, 17*8, 15*8, 47*8, 15*8 } ;
 
 void printT55xxConfig(void) {
 	Dbprintf("LF T55XX config");
-	Dbprintf("  [q] startgap............%d*8 (%d)", t_config.start_gap/8, t_config.start_gap);
+	Dbprintf("  [a] startgap............%d*8 (%d)", t_config.start_gap/8, t_config.start_gap);
 	Dbprintf("  [b] writegap............%d*8 (%d)", t_config.write_gap/8, t_config.write_gap);
-	Dbprintf("  [d] write_0.............%d*8 (%d)", t_config.write_0/8,   t_config.write_0);
-	Dbprintf("  [a] write_1.............%d*8 (%d)", t_config.write_1/8,   t_config.write_1);
-	Dbprintf("  [t] readgap.............%d*8 (%d)", t_config.read_gap/8,  t_config.read_gap);
+	Dbprintf("  [c] write_0.............%d*8 (%d)", t_config.write_0/8,   t_config.write_0);
+	Dbprintf("  [d] write_1.............%d*8 (%d)", t_config.write_1/8,   t_config.write_1);
+	Dbprintf("  [e] readgap.............%d*8 (%d)", t_config.read_gap/8,  t_config.read_gap);
 }
 void setT55xxConfig(t55xx_config *c) {
 	
@@ -102,6 +102,7 @@ void loadT55xxConfig(void) {
 #if WITH_FLASH
     if (!FlashInit())
         return;
+	
 	Flash_CheckBusy(BUSY_TIMEOUT);
 	Flash_WriteEnable();
 	
@@ -1317,8 +1318,6 @@ void TurnReadLFOn(uint32_t delay) {
 
 	// measure antenna strength.
 	//int adcval = ((MAX_ADC_LF_VOLTAGE * AvgAdc(ADC_CHAN_LF)) >> 10);
-
-	// Give it a bit of time for the resonant antenna to settle.
 	WaitUS(delay);
 }
 void TurnReadLF_off(uint32_t delay) {

From 1fff6ae09a5a6b07b799d0c000ba73ccd4e03954 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Wed, 12 Sep 2018 08:01:35 +0200
Subject: [PATCH 0049/1938] chg: rename variable

---
 client/graph.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/graph.c b/client/graph.c
index 2d6a28233..4346a8040 100644
--- a/client/graph.c
+++ b/client/graph.c
@@ -111,14 +111,14 @@ int GetAskClock(const char *str, bool printAns) {
 
 	size_t ststart = 0, stend = 0;
 	bool st = DetectST(bits, &size, &clock, &ststart, &stend);
-	int start = stend;
+	int idx = stend;
 	if (st == false) {
-		start = DetectASKClock(bits, size, &clock, 20);
+		idx = DetectASKClock(bits, size, &clock, 20);
 	}
-	setClockGrid(clock, start);
+	setClockGrid(clock, idx);
 	// Only print this message if we're not looping something
 	if (printAns || g_debugMode)
-		PrintAndLogEx(NORMAL, "Auto-detected clock rate: %d, Best Starting Position: %d", clock, start);
+		PrintAndLogEx(NORMAL, "Auto-detected clock rate: %d, Best Starting Position: %d", clock, idx);
 
 	return clock;
 }

From b7a1674bf6227a0231682a0865e099efbd8719f5 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Fri, 14 Sep 2018 08:12:03 +0200
Subject: [PATCH 0050/1938] helptext

---
 client/cmdlfem4x.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 1e408bbf6..762b4fe0b 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -41,7 +41,7 @@ int usage_lf_em410x_write(void) {
 	PrintAndLogEx(NORMAL, "       <card>    - 0|1 T5555 (Q5) / T55x7");
 	PrintAndLogEx(NORMAL, "       <clock>   - 16|32|40|64, optional, set R/F clock rate, defaults to 64");
 	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      lf em 410x_write 0F0368568B");
+	PrintAndLogEx(NORMAL, "      lf em 410x_write 0F0368568B 1       = write ID to t55x7 card");
 	return 0;
 }
 int usage_lf_em410x_ws(void) {

From 54bea5a067ea6f83e405916a7620cc09c6566f93 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Fri, 14 Sep 2018 08:13:42 +0200
Subject: [PATCH 0051/1938] textual

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa2dd86fc..0ebfa7bab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [unreleased][unreleased]
+ - Change 'lf hid' - got an  updated to Kastle format (@xilni)
  - Added 'lf t55xx deviceconfig' - enables custom t55xx timing settings. (RDV40) (@iceman)
  - Chg adaptations for FPC communications (work in progress)  (@iceman)
  - Fix 'stand-alone Colin' - remake to benefit from flashmem for persistence. (@cjbrigato)

From 3e9397e337521d9b4532e9b470a9bed6a916c437 Mon Sep 17 00:00:00 2001
From: TomHarkness <thomas.johnlorren@gmail.com>
Date: Sat, 15 Sep 2018 16:20:44 +1000
Subject: [PATCH 0052/1938] Fix syntax

---
 armsrc/lfops.c | 258 +++++++++++++++++++++++++------------------------
 1 file changed, 130 insertions(+), 128 deletions(-)

diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index 4bf54791b..12da53f9e 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -32,15 +32,15 @@
 //#define WRITE_GAP 8*8 // 17*8 // was 160 // SPEC:  1*8 to 20*8 - typ 10*8 (10fc)
 //#define WRITE_0   15*8 // 18*8 // was 144 // SPEC: 16*8 to 32*8 - typ 24*8 (24fc)
 //#define WRITE_1   47*8 // 50*8 // was 400 // SPEC: 48*8 to 64*8 - typ 56*8 (56fc)  432 for T55x7; 448 for E5550
-//#define READ_GAP  15*8 
+//#define READ_GAP  15*8
 
 //  VALUES TAKEN FROM EM4x function: SendForward
 //  START_GAP = 440;       (55*8) cycles at 125Khz (8us = 1cycle)
 //  WRITE_GAP = 128;       (16*8)
-//  WRITE_1   = 256 32*8;  (32*8) 
+//  WRITE_1   = 256 32*8;  (32*8)
 
 //  These timings work for 4469/4269/4305 (with the 55*8 above)
-//  WRITE_0 = 23*8 , 9*8 
+//  WRITE_0 = 23*8 , 9*8
 
 // Sam7s has several timers, we will use the source TIMER_CLOCK1 (aka AT91C_TC_CLKS_TIMER_DIV1_CLOCK)
 // TIMER_CLOCK1 = MCK/2, MCK is running at 48 MHz, Timer is running at 48/2 = 24 MHz
@@ -70,24 +70,25 @@ void printT55xxConfig(void) {
 	Dbprintf("  [e] readgap.............%d*8 (%d)", t_config.read_gap/8,  t_config.read_gap);
 }
 void setT55xxConfig(t55xx_config *c) {
-	
+
 	if (c->start_gap != 0) t_config.start_gap = c->start_gap*8;
 	if (c->write_gap != 0) t_config.write_gap = c->write_gap*8;
 	if (c->write_0   != 0) t_config.write_0 = c->write_0*8;
 	if (c->write_1   != 0) t_config.write_1 = c->write_1*8;
-	if (c->read_gap  != 0) t_config.read_gap = c->read_gap*8;	
+	if (c->read_gap  != 0) t_config.read_gap = c->read_gap*8;
 
 	printT55xxConfig();
-	
+
 #if WITH_FLASH
-    if (!FlashInit())
+    if (!FlashInit()) {
         return;
-	
+			}
+
 	Flash_CheckBusy(BUSY_TIMEOUT);
-	
+
 	uint16_t isok = Flash_WriteDataCont(T55XX_CONFIG_OFFSET, (uint8_t *)&t_config, sizeof(t55xx_config));
 	FlashStop();
-	
+
 	if ( isok == T55XX_CONFIG_LEN) {
 		if (MF_DBGLEVEL > 1) DbpString("T55XX Config save success");
 	}
@@ -100,15 +101,16 @@ t55xx_config* getT55xxConfig(void) {
 
 void loadT55xxConfig(void) {
 #if WITH_FLASH
-    if (!FlashInit())
+    if (!FlashInit()) {
         return;
-	
+			}
+
 	Flash_CheckBusy(BUSY_TIMEOUT);
 	Flash_WriteEnable();
-	
+
 	uint16_t isok = Flash_ReadDataCont(T55XX_CONFIG_OFFSET, (uint8_t *)&t_config, T55XX_CONFIG_LEN);
 	FlashStop();
-	
+
 	if ( isok == T55XX_CONFIG_LEN) {
 		if (MF_DBGLEVEL > 1) DbpString("T55XX Config load success");
 	}
@@ -139,10 +141,10 @@ void ModThenAcquireRawAdcSamples125k(uint32_t delay_off, uint32_t period_0, uint
 	BigBuf_Clear_keep_EM();
 
 	LFSetupFPGAForADC(sc->divisor, 1);
-	
+
 	// little more time for the tag to fully power up
 	WaitMS(200);
-	
+
 	// if delay_off = 0 then just bitbang 1 = antenna on 0 = off for respective periods.
 	bool bitbang = delay_off == 0;
 	// now modulate the reader field
@@ -156,8 +158,8 @@ void ModThenAcquireRawAdcSamples125k(uint32_t delay_off, uint32_t period_0, uint
 			return;
 		}
 
-		// hack2 needed---  it appears to take about 8-16us to turn the antenna back on 
-		// leading to ~ 1 to 2 125khz samples extra in every off period 
+		// hack2 needed---  it appears to take about 8-16us to turn the antenna back on
+		// leading to ~ 1 to 2 125khz samples extra in every off period
 		// so we should test for last 0 before next 1 and reduce period_0 by this extra amount...
 		// but is this time different for every antenna or other hw builds???  more testing needed
 
@@ -212,10 +214,10 @@ void ModThenAcquireRawAdcSamples125k(uint32_t delay_off, uint32_t period_0, uint
 	// now do the read
 	DoAcquisition_config(false, 0);
 
-	// Turn off antenna	
+	// Turn off antenna
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	// tell client we are done	
-	cmd_send(CMD_ACK,0,0,0,0,0);    
+	// tell client we are done
+	cmd_send(CMD_ACK,0,0,0,0,0);
 }
 
 /* blank r/w tag data stream
@@ -370,7 +372,7 @@ void WriteTIbyte(uint8_t b)
 			LOW(GPIO_SSC_DOUT);
 			WaitUS(1000);
 			// modulate antenna 1ms
-			HIGH(GPIO_SSC_DOUT); 
+			HIGH(GPIO_SSC_DOUT);
 			WaitUS(1000);
 		} else {
 			// stop modulating antenna 0.3ms
@@ -435,7 +437,7 @@ void AcquireTiType(void)
 	for (;;) {
 		if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
 			buf[i] = AT91C_BASE_SSC->SSC_RHR;	// store 32 bit values in buffer
-			i++; 
+			i++;
 			if (i >= TIBUFLEN) break;
 		}
 		WDT_HIT();
@@ -447,7 +449,7 @@ void AcquireTiType(void)
 
 	char *dest = (char *)BigBuf_get_addr();
 	n = TIBUFLEN * 32;
-	
+
 	// unpack buffer
 	for (i = TIBUFLEN-1; i >= 0; i--) {
 		for (j = 0; j < 32; j++) {
@@ -458,7 +460,7 @@ void AcquireTiType(void)
 			}
 		}
 	}
-	
+
 	// reset SSC
 	FpgaSetupSsc();
 }
@@ -489,9 +491,9 @@ void WriteTItag(uint32_t idhi, uint32_t idlo, uint16_t crc)
 	// or listening to the antenna (low)
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_PASSTHRU);
 	StartTicks();
-	
+
 	LED_A_ON();
-	
+
 	// steal this pin from the SSP and use it to control the modulation
 	AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
 	AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
@@ -547,7 +549,7 @@ void SimulateTagLowFrequencyEx(int period, int gap, int ledcontrol, int numcycle
 
 	int i = 0, x = 0;
 	uint8_t *buf = BigBuf_get_addr();
-	
+
 	// set frequency,  get values from 'lf config' command
 	sample_config *sc = getSamplingConfig();
 
@@ -557,7 +559,7 @@ void SimulateTagLowFrequencyEx(int period, int gap, int ledcontrol, int numcycle
 		FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
 	else
 		FpgaSendCommand(FPGA_CMD_SET_DIVISOR, sc->divisor);
-	
+
 	AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT | GPIO_SSC_CLK;
 	AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
 	AT91C_BASE_PIOA->PIO_ODR = GPIO_SSC_CLK;
@@ -567,14 +569,14 @@ void SimulateTagLowFrequencyEx(int period, int gap, int ledcontrol, int numcycle
 		if ( numcycles > -1 ) {
 			if ( x != numcycles ) {
 				++x;
-			} else { 
+			} else {
 				// exit without turning of field
-				return; 
+				return;
 			}
 		}
-	
+
 		if (ledcontrol) LED_D_ON();
-				
+
 		// wait until SSC_CLK goes HIGH
 		// used as a simple detection of a reader field?
 		while (!(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_CLK)) {
@@ -582,12 +584,12 @@ void SimulateTagLowFrequencyEx(int period, int gap, int ledcontrol, int numcycle
 			if ( usb_poll_validate_length() || BUTTON_PRESS() )
 				goto OUT;
 		}
-		
+
 		if(buf[i])
 			OPEN_COIL();
 		else
 			SHORT_COIL();
-	
+
 		//wait until SSC_CLK goes LOW
 		while (AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_CLK) {
 			WDT_HIT();
@@ -595,7 +597,7 @@ void SimulateTagLowFrequencyEx(int period, int gap, int ledcontrol, int numcycle
 			if ( BUTTON_PRESS() )
 				goto OUT;
 		}
-				
+
 		i++;
 		if(i == period) {
 			i = 0;
@@ -604,10 +606,10 @@ void SimulateTagLowFrequencyEx(int period, int gap, int ledcontrol, int numcycle
 				SpinDelayUs(gap);
 			}
 		}
-		
+
 		if (ledcontrol) LED_D_OFF();
 	}
-OUT: 
+OUT:
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 	LED_D_OFF();
 }
@@ -624,7 +626,7 @@ void SimulateTagLowFrequencyBidir(int divisor, int t0)
 // compose fc/5 fc/8  waveform (FSK1)
 
 // compose fc/8 fc/10 waveform (FSK2)
-// also manchester, 
+// also manchester,
 static void fc(int c, int *n)
 {
 	uint8_t *dest = BigBuf_get_addr();
@@ -675,15 +677,15 @@ static void fc(int c, int *n)
 
 // special start of frame marker containing invalid bit sequences
 // this one is focused on HID,  with manchester encoding.
-static void fcSTT(int *n) {	
-	fc(8,  n);	fc(8,  n); // invalid   
+static void fcSTT(int *n) {
+	fc(8,  n);	fc(8,  n); // invalid
 	fc(8,  n);	fc(10, n); // logical 0
 	fc(10, n);	fc(10, n); // invalid
 	fc(8,  n);	fc(10, n); // logical 0
 }
 
 // compose fc/X fc/Y waveform (FSKx)
-static void fcAll(uint8_t fc, int *n, uint8_t clock, uint16_t *modCnt) 
+static void fcAll(uint8_t fc, int *n, uint8_t clock, uint16_t *modCnt)
 {
 	uint8_t *dest = BigBuf_get_addr();
 	uint8_t halfFC = fc/2;
@@ -700,7 +702,7 @@ static void fcAll(uint8_t fc, int *n, uint8_t clock, uint16_t *modCnt)
 		*n += fc;
 	}
 	if (mod>0) (*modCnt)++;
-	if ((mod>0) && modAdjOk){  //fsk2 
+	if ((mod>0) && modAdjOk){  //fsk2
 		if ((*modCnt % modAdj) == 0){ //if 4th 8 length wave in a rf/50 add extra 8 length wave
 			memset(dest+(*n), 0, fc-halfFC);
 			memset(dest+(*n)+(fc-halfFC), 1, halfFC);
@@ -722,15 +724,15 @@ void CmdHIDsimTAGEx( uint32_t hi, uint32_t lo, int ledcontrol, int numcycles) {
 		DbpString("[!] tags can only have 44 bits. - USE lf simfsk for larger tags");
 		return;
 	}
-	
+
 	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
 	set_tracing(false);
-		
+
 	int n = 0, i = 0;
 	/*
 	 HID tag bitstream format
 	 The tag contains a 44bit unique code. This is sent out MSB first in sets of 4 bits
-	 A 1 bit is represented as 6 fc8 and 5 fc10 patterns  (manchester 10) during 2 clock periods. (1bit = 1clock period)  
+	 A 1 bit is represented as 6 fc8 and 5 fc10 patterns  (manchester 10) during 2 clock periods. (1bit = 1clock period)
 	 A 0 bit is represented as 5 fc10 and 6 fc8 patterns  (manchester 01)
 	 A fc8 is inserted before every 4 bits
 	 A special start of frame pattern is used consisting a0b0 where a and b are neither 0
@@ -745,12 +747,12 @@ void CmdHIDsimTAGEx( uint32_t hi, uint32_t lo, int ledcontrol, int numcycles) {
 
 	// special start of frame marker containing invalid bit sequences
 	fcSTT(&n);
-	
+
 	// manchester encode bits 43 to 32
 	for (i=11; i>=0; i--) {
-		
+
 		if ((i%4)==3) fc(0, &n);
-		
+
 		if ((hi>>i) & 1) {
 			fc(10, &n); fc(8,  &n);		// low-high transition
 		} else {
@@ -760,9 +762,9 @@ void CmdHIDsimTAGEx( uint32_t hi, uint32_t lo, int ledcontrol, int numcycles) {
 
 	// manchester encode bits 31 to 0
 	for (i=31; i>=0; i--) {
-		
+
 		if ((i%4)==3) fc(0, &n);
-		
+
 		if ((lo>>i) & 1) {
 			fc(10, &n); fc(8,  &n);		// low-high transition
 		} else {
@@ -790,7 +792,7 @@ void CmdFSKsimTAG(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *bits) {
 	BigBuf_free(); BigBuf_Clear_ext(false);
 	clear_trace();
 	set_tracing(false);
-	
+
 	int ledcontrol = 1, n = 0, i = 0;
 	uint8_t fcHigh = arg1 >> 8;
 	uint8_t fcLow = arg1 & 0xFF;
@@ -799,19 +801,19 @@ void CmdFSKsimTAG(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *bits) {
 	uint8_t stt = (arg2 >> 8) & 1;
 
 	if ( stt ) {
-		//int fsktype = ( fcHigh == 8 && fcLow == 5) ? 1 : 2;			
+		//int fsktype = ( fcHigh == 8 && fcLow == 5) ? 1 : 2;
 		//fcSTT(&n);
 	}
-	
+
 	for (i=0; i<size; i++){
 		if (bits[i])
 			fcAll(fcLow, &n, clk, &modCnt);
 		else
 			fcAll(fcHigh, &n, clk, &modCnt);
 	}
-	
+
 	WDT_HIT();
-	
+
 	Dbprintf("Simulating with fcHigh: %d, fcLow: %d, clk: %d, STT: %d, n: %d", fcHigh, fcLow, clk, stt, n);
 
 	if (ledcontrol)	LED_A_ON();
@@ -851,7 +853,7 @@ static void biphaseSimBit(uint8_t c, int *n, uint8_t clock, uint8_t *phase)
 static void stAskSimBit(int *n, uint8_t clock) {
 	uint8_t *dest = BigBuf_get_addr();
 	uint8_t halfClk = clock/2;
-	//ST = .5 high .5 low 1.5 high .5 low 1 high	
+	//ST = .5 high .5 low 1.5 high .5 low 1 high
 	memset(dest+(*n), 1, halfClk);
 	memset(dest+(*n) + halfClk, 0, halfClk);
 	memset(dest+(*n) + clock, 1, clock + halfClk);
@@ -863,9 +865,9 @@ static void stAskSimBit(int *n, uint8_t clock) {
 // args clock, ask/man or askraw, invert, transmission separator
 void CmdASKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream)
 {
-	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);	
+	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
 	set_tracing(false);
-	
+
 	int ledcontrol = 1, n = 0, i = 0;
 	uint8_t clk = (arg1 >> 8) & 0xFF;
 	uint8_t encoding = arg1 & 0xFF;
@@ -898,7 +900,7 @@ void CmdASKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream)
 		Dbprintf("sorry but separator option not yet available");
 
 	WDT_HIT();
-	
+
 	Dbprintf("Simulating with clk: %d, invert: %d, encoding: %d, separator: %d, n: %d",clk, invert, encoding, separator, n);
 
 	if (ledcontrol)	LED_A_ON();
@@ -932,9 +934,9 @@ static void pskSimBit(uint8_t waveLen, int *n, uint8_t clk, uint8_t *curPhase, b
 // args clock, carrier, invert,
 void CmdPSKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream)
 {
-	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);	
+	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
 	set_tracing(false);
-	
+
 	int ledcontrol = 1, n = 0, i = 0;
 	uint8_t clk = arg1 >> 8;
 	uint8_t carrier = arg1 & 0xFF;
@@ -947,11 +949,11 @@ void CmdPSKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream)
 			pskSimBit(carrier, &n, clk, &curPhase, true);
 		}
 	}
-	
+
 	WDT_HIT();
-	
+
 	Dbprintf("Simulating with Carrier: %d, clk: %d, invert: %d, n: %d",carrier, clk, invert, n);
-		   
+
 	if (ledcontrol)	LED_A_ON();
 	SimulateTagLowFrequency(n, 0, ledcontrol);
 	if (ledcontrol)	LED_A_OFF();
@@ -960,7 +962,7 @@ void CmdPSKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream)
 // loop to get raw HID waveform then FSK demodulate the TAG ID from it
 void CmdHIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol) {
 	uint8_t *dest = BigBuf_get_addr();
-	size_t size = 0; 
+	size_t size = 0;
 	uint32_t hi2 = 0, hi = 0, lo = 0;
 	int idx = 0;
 	int dummyIdx = 0;
@@ -980,7 +982,7 @@ void CmdHIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol)
 		size = 50*128*2; //big enough to catch 2 sequences of largest format
 		idx = HIDdemodFSK(dest, &size, &hi2, &hi, &lo, &dummyIdx);
 		if ( idx < 0 ) continue;
-		
+
 		if (idx > 0 && lo > 0 && (size == 96 || size == 192)){
 			// go over previously decoded manchester data and decode into usable tag ID
 			if (hi2 != 0){ //extra large HID tags  88/192 bits
@@ -994,7 +996,7 @@ void CmdHIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol)
 				uint8_t bitlen = 0;
 				uint32_t fc = 0;
 				uint32_t cardnum = 0;
-				
+
 				if (((hi >> 5) & 1) == 1){//if bit 38 is set then < 37 bit format is used
 					uint32_t lo2 = 0;
 					lo2=(((hi & 31) << 12) | (lo>>20)); //get bits 21-37 to check for format len bit
@@ -1059,9 +1061,9 @@ void CmdHIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol)
 void CmdAWIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol) {
 
 	uint8_t *dest = BigBuf_get_addr();
-	
+
 	//big enough to catch 2 sequences of largest format
-	size_t size = 12800; //50 * 128 * 2; 
+	size_t size = 12800; //50 * 128 * 2;
 
 	int idx = 0, dummyIdx = 0;
 
@@ -1078,7 +1080,7 @@ void CmdAWIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol)
 		// FSK demodulator
 
 		idx = detectAWID(dest, &size, &dummyIdx);
-		
+
 		if (idx <= 0 || size != 96) continue;
 		// Index map
 		// 0            10            20            30              40            50              60
@@ -1169,7 +1171,7 @@ void CmdEM410xdemod(int findone, uint32_t *high, uint64_t *low, int ledcontrol)
 		if (ledcontrol) LED_A_ON();
 
 		DoAcquisition_default(-1, true);
-		
+
 		size  = BigBuf_max_traceLen();
 		//askdemod and manchester decode
 		if (size > 16385) size = 16385; //big enough to catch 2 sequences of largest format
@@ -1177,7 +1179,7 @@ void CmdEM410xdemod(int findone, uint32_t *high, uint64_t *low, int ledcontrol)
 		WDT_HIT();
 
 		if (errCnt < 0) continue;
-	
+
 			errCnt = Em410xDecode(dest, &size, &idx, &hi, &lo);
 			if (errCnt == 1){
 				if (size == 128){
@@ -1208,7 +1210,7 @@ void CmdEM410xdemod(int findone, uint32_t *high, uint64_t *low, int ledcontrol)
 		hi = lo = size = idx = 0;
 		clk = invert = errCnt = 0;
 	}
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);		
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 	DbpString("Stopped");
 	if (ledcontrol) LED_A_OFF();
 }
@@ -1223,9 +1225,9 @@ void CmdIOdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol) {
 	uint16_t number = 0, calccrc = 0;
 
 	size_t size = BigBuf_max_traceLen();
-	
+
 	BigBuf_Clear_keep_EM();
-	
+
 	// Configure to go in 125Khz listen mode
 	LFSetupFPGAForADC(95, true);
 
@@ -1248,7 +1250,7 @@ void CmdIOdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol) {
 			//-----------------------------------------------------------------------------
             //00000000 0 11110000 1 facility 1 version* 1 code*one 1 code*two 1 checksum 11
 			//
-			//Checksum:  
+			//Checksum:
 			//00000000 0 11110000 1 11100000 1 00000001 1 00000011 1 10110110 1 01110101 11
 			//preamble      F0         E0         01         03         B6         75
 			// How to calc checksum,
@@ -1279,7 +1281,7 @@ void CmdIOdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol) {
 				calccrc += bytebits_to_byte(dest+idx+9*i, 8);
 			calccrc &= 0xff;
 			calccrc = 0xff - calccrc;
-			
+
 			char *crcStr = (crc == calccrc) ? "ok" : "!crc";
 
             Dbprintf("IO Prox XSF(%02d)%02x:%05d (%08x%08x)  [%02x %s]", version, facilitycode, number, code, code2, crc, crcStr);
@@ -1297,7 +1299,7 @@ void CmdIOdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol) {
 
 		WDT_HIT();
 	}
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);		
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 	DbpString("Stopped");
 	if (ledcontrol) LED_A_OFF();
 }
@@ -1305,12 +1307,12 @@ void CmdIOdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol) {
 /*------------------------------
  * T5555/T5557/T5567/T5577 routines
  *------------------------------
- * NOTE: T55x7/T5555 configuration register definitions moved to protocols.h 
+ * NOTE: T55x7/T5555 configuration register definitions moved to protocols.h
  *
  * Relevant communication times in microsecond
  * To compensate antenna falling times shorten the write times
  * and enlarge the gap ones.
- * Q5 tags seems to have issues when these values changes. 
+ * Q5 tags seems to have issues when these values changes.
  */
 
 void TurnReadLFOn(uint32_t delay) {
@@ -1363,7 +1365,7 @@ void T55xxResetRead(void) {
 
 	// Turn the field off
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); // field off
-	cmd_send(CMD_ACK,0,0,0,0,0);    
+	cmd_send(CMD_ACK,0,0,0,0,0);
 	LED_A_OFF();
 }
 
@@ -1376,7 +1378,7 @@ void T55xxWriteBlockExt(uint32_t Data, uint8_t Block, uint32_t Pwd, uint8_t arg)
 	uint32_t i = 0;
 
 	StartTicks();
-		
+
 	// Set up FPGA, 125kHz
 	LFSetupFPGAForADC(95, true);
 
@@ -1410,32 +1412,32 @@ void T55xxWriteBlockExt(uint32_t Data, uint8_t Block, uint32_t Pwd, uint8_t arg)
 	// Perform write (nominal is 5.6 ms for T55x7 and 18ms for E5550,
 	// so wait a little more)
 
-	// "there is a clock delay before programming" 
+	// "there is a clock delay before programming"
 	//  - programming takes ~5.6ms for t5577 ~18ms for E5550 or t5567
-	//  so we should wait 1 clock + 5.6ms then read response? 
+	//  so we should wait 1 clock + 5.6ms then read response?
 	//  but we need to know we are dealing with t5577 vs t5567 vs e5550 (or q5) marshmellow...
 	if (testMode) {
-		//TESTMODE TIMING TESTS: 
-		// <566us does nothing 
+		//TESTMODE TIMING TESTS:
+		// <566us does nothing
 		// 566-568 switches between wiping to 0s and doing nothing
 		// 5184 wipes and allows 1 block to be programmed.
 		// indefinite power on wipes and then programs all blocks with bitshifted data sent.
-		TurnReadLFOn(5184); 
+		TurnReadLFOn(5184);
 
 	} else {
 		TurnReadLFOn(20 * 1000);
-	
+
 		//could attempt to do a read to confirm write took
-		// as the tag should repeat back the new block 
-		// until it is reset, but to confirm it we would 
+		// as the tag should repeat back the new block
+		// until it is reset, but to confirm it we would
 		// need to know the current block 0 config mode for
 		// modulation clock an other details to demod the response...
-		// response should be (for t55x7) a 0 bit then (ST if on) 
-		// block data written in on repeat until reset. 
+		// response should be (for t55x7) a 0 bit then (ST if on)
+		// block data written in on repeat until reset.
 
 		//DoPartialAcquisition(20, true, 12000);
 	}
-	
+
 	// turn field off
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 	LED_A_OFF();
@@ -1454,7 +1456,7 @@ void T55xxReadBlock(uint16_t arg0, uint8_t Block, uint32_t Pwd) {
 	uint8_t Page = (arg0 & 0x2) >> 1;
 	uint32_t i = 0;
 	bool RegReadMode = (Block == 0xFF);//regular read mode
-	
+
 	//clear buffer now so it does not interfere with timing later
 	BigBuf_Clear_keep_EM();
 
@@ -1470,7 +1472,7 @@ void T55xxReadBlock(uint16_t arg0, uint8_t Block, uint32_t Pwd) {
 	// Trigger T55x7 Direct Access Mode with start gap
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF_LF);
 	WaitUS(t_config.start_gap);
-	
+
 	// Opcode 1[page]
 	T55xxWriteBit(1);
 	T55xxWriteBit(Page); //Page 0
@@ -1482,24 +1484,24 @@ void T55xxReadBlock(uint16_t arg0, uint8_t Block, uint32_t Pwd) {
 	}
 	// Send a zero bit separation
 	T55xxWriteBit(0);
-	
+
 	// Send Block number (if direct access mode)
 	if (!RegReadMode)
 		for (i = 0x04; i != 0; i >>= 1)
 			T55xxWriteBit(Block & i);
 
 	// Turn field on to read the response
-	// 137*8 seems to get to the start of data pretty well... 
+	// 137*8 seems to get to the start of data pretty well...
 	//  but we want to go past the start and let the repeating data settle in...
-	TurnReadLFOn(210*8); 
-	
+	TurnReadLFOn(210*8);
+
 	// Acquisition
 	// Now do the acquisition
 	DoPartialAcquisition(0, true, 12000, 0);
-	
+
 	// Turn the field off
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); // field off
-	cmd_send(CMD_ACK,0,0,0,0,0);    
+	cmd_send(CMD_ACK,0,0,0,0,0);
 	LED_A_OFF();
 }
 
@@ -1508,16 +1510,16 @@ void T55xxWakeUp(uint32_t Pwd){
 	uint32_t i = 0;
 
 	StartTicks();
-	
+
 	// Set up FPGA, 125kHz
 	LFSetupFPGAForADC(95, true);
 	// make sure tag is fully powered up...
 	WaitMS(4);
-	
+
 	// Trigger T55x7 Direct Access Mode
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF_LF);
 	WaitUS(t_config.start_gap);
-	
+
 	// Opcode 10
 	T55xxWriteBit(1);
 	T55xxWriteBit(0); //Page 0
@@ -1610,7 +1612,7 @@ void CopyIndala64toT55x7(uint32_t hi, uint32_t lo) {
 void CopyIndala224toT55x7(uint32_t uid1, uint32_t uid2, uint32_t uid3, uint32_t uid4, uint32_t uid5, uint32_t uid6, uint32_t uid7) {
 	//Program the 7 data blocks for supplied 224bit UID
 	uint32_t data[] = {0, uid1, uid2, uid3, uid4, uid5, uid6, uid7};
-	// and the block 0 for Indala224 format	
+	// and the block 0 for Indala224 format
 	//Config for Indala (RF/32;PSK2 with RF/2;Maxblock=7)
 	data[0] = T55x7_BITRATE_RF_32 | T55x7_MODULATION_PSK2 | (7 << T55x7_MAXBLOCK_SHIFT);
 	//TODO add selection of chip for Q5 or T55x7
@@ -1708,7 +1710,7 @@ void WriteEM410x(uint32_t card, uint32_t id_hi, uint32_t id_lo) {
 	} else { //t5555 (Q5)
 		data[0] = T5555_SET_BITRATE(clock) | T5555_MODULATION_MANCHESTER | (2 << T5555_MAXBLOCK_SHIFT);
 	}
- 
+
 	WriteT55xx(data, 0, 3);
 
 	LED_D_OFF();
@@ -1721,9 +1723,9 @@ void WriteEM410x(uint32_t card, uint32_t id_hi, uint32_t id_lo) {
 //-----------------------------------
 // EM4469 / EM4305 routines
 //-----------------------------------
-// Below given command set. 
+// Below given command set.
 // Commands are including the even parity, binary mirrored
-#define FWD_CMD_LOGIN   0xC 
+#define FWD_CMD_LOGIN   0xC
 #define FWD_CMD_WRITE   0xA
 #define FWD_CMD_READ    0x9
 #define FWD_CMD_DISABLE 0x5
@@ -1741,7 +1743,7 @@ uint8_t * fwd_write_ptr; //forwardlink bit pointer
 //  VALUES TAKEN FROM EM4x function: SendForward
 //  START_GAP = 440;       (55*8) cycles at 125Khz (8us = 1cycle)
 //  WRITE_GAP = 128;       (16*8)
-//  WRITE_1   = 256 32*8;  (32*8) 
+//  WRITE_1   = 256 32*8;  (32*8)
 
 //  These timings work for 4469/4269/4305 (with the 55*8 above)
 //  WRITE_0 = 23*8 , 9*8
@@ -1829,7 +1831,7 @@ void SendForward(uint8_t fwd_bit_count) {
 // iceman,   21.3us increments for the USclock verification.
 // 55FC * 8us == 440us / 21.3 === 20.65 steps.  could be too short. Go for 56FC instead
 // 32FC * 8us == 256us / 21.3 ==  12.018 steps. ok
-// 16FC * 8us == 128us / 21.3 ==  6.009 steps. ok 
+// 16FC * 8us == 128us / 21.3 ==  6.009 steps. ok
 #ifndef EM_START_GAP
 #define EM_START_GAP 55*8
 #endif
@@ -1839,11 +1841,11 @@ void SendForward(uint8_t fwd_bit_count) {
 
 	// Set up FPGA, 125kHz or 95 divisor
 	LFSetupFPGAForADC(95, true);
-	
+
 	// force 1st mod pulse (start gap must be longer for 4305)
 	fwd_bit_sz--; //prepare next bit modulation
 	fwd_write_ptr++;
-	
+
 	TurnReadLF_off(EM_START_GAP);
 	TurnReadLFOn(18*8);
 
@@ -1874,11 +1876,11 @@ void EM4xReadWord(uint8_t addr, uint32_t pwd, uint8_t usepwd) {
 
 	LED_A_ON();
 	uint8_t len;
-	
+
 	//clear buffer now so it does not interfere with timing later
 	BigBuf_Clear_ext(false);
-	
-	StartTicks();	
+
+	StartTicks();
 	/* should we read answer from Logincommand?
 	*
 	* should receive
@@ -1905,11 +1907,11 @@ void EM4xReadWord(uint8_t addr, uint32_t pwd, uint8_t usepwd) {
 void EM4xWriteWord(uint32_t flag, uint32_t data, uint32_t pwd) {
 
 	LED_A_ON();
-	
+
 	bool usePwd = (flag & 0xF);
 	uint8_t addr = (flag >> 8) & 0xFF;
 	uint8_t len;
-	
+
 	//clear buffer now so it does not interfere with timing later
 	BigBuf_Clear_ext(false);
 	StartTicks();
@@ -1918,7 +1920,7 @@ void EM4xWriteWord(uint32_t flag, uint32_t data, uint32_t pwd) {
 	* should receive
 	* 0000 1010 ok.
 	* 0000 0001 fail
-	**/	
+	**/
 	if (usePwd) EM4xLogin(pwd);
 
 	forward_ptr = forwardLink_data;
@@ -1933,7 +1935,7 @@ void EM4xWriteWord(uint32_t flag, uint32_t data, uint32_t pwd) {
 
 	//Capture response if one exists
 	DoPartialAcquisition(20, true, 6000, 1000);
-	
+
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 	cmd_send(CMD_ACK,0,0,0,0,0);
 	LED_A_OFF();
@@ -1962,27 +1964,27 @@ void Cotag(uint32_t arg0) {
 #endif
 	uint8_t rawsignal = arg0 & 0xF;
 
-	LED_A_ON();	
+	LED_A_ON();
 
 	// Switching to LF image on FPGA. This might empty BigBuff
 	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-	
+
 	//clear buffer now so it does not interfere with timing later
 	BigBuf_Clear_ext(false);
-	
-	// Set up FPGA, 132kHz to power up the tag	
+
+	// Set up FPGA, 132kHz to power up the tag
 	FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 89);
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | FPGA_LF_ADC_READER_FIELD);
 
 	// Connect the A/D to the peak-detected low-frequency path.
 	SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
-	
+
 	// Now set up the SSC to get the ADC samples that are now streaming at us.
 	FpgaSetupSsc();
 
 	// start clock - 1.5ticks is 1us
 	StartTicks();
-	
+
 	//send COTAG start pulse
 	ON(740)  OFF
 	ON(3330) OFF
@@ -1994,10 +1996,10 @@ void Cotag(uint32_t arg0) {
 		case 1: doCotagAcquisitionManchester(); break;
 		case 2: DoAcquisition_config(true, 0); break;
 	}
-	
+
 	// Turn the field off
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); // field off
-	cmd_send(CMD_ACK,0,0,0,0,0);    
+	cmd_send(CMD_ACK,0,0,0,0,0);
 	LEDsoff();
 }
 

From 9d1c3a3538f652200a0437fc40413a404146b7af Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sat, 15 Sep 2018 12:00:53 +0200
Subject: [PATCH 0053/1938] FIX: crash on Bionic libc if CloseProxmark is
 called twice.  (@micolous) https://github.com/Proxmark/proxmark3/pull/672

---
 client/comms.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/client/comms.c b/client/comms.c
index e0d0670ff..21d9ad4a7 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -141,7 +141,6 @@ static int getCommand(UsbCommand* response) {
     return 1;
 }
 
-
 //-----------------------------------------------------------------------------
 // Entry point into our code: called whenever we received a packet over USB
 // that we weren't necessarily expecting, for example a debug print.
@@ -339,9 +338,17 @@ bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode)
 
 void CloseProxmark(void) {
 	conn.run = false;
+
+
+#ifdef __BIONIC__
+	if (USB_communication_thread != 0) {
+		pthread_join(USB_communication_thread, NULL);
+	}
+#else
 	pthread_join(USB_communication_thread, NULL);	
 	//pthread_join(FPC_communication_thread, NULL);
-
+#endif
+	
 	if (sp) {
 		uart_close(sp);
 	}
@@ -358,6 +365,7 @@ void CloseProxmark(void) {
 	// Clean up our state
 	sp = NULL;
 	serial_port_name = NULL;
+	memset(&USB_communication_thread, 0, sizeof(pthread_t));
 }
 
 /**

From 97f9c1a49fefb78205bcc29ecd593715464ee182 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sat, 15 Sep 2018 12:03:01 +0200
Subject: [PATCH 0054/1938] text

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ebfa7bab..8301bfa06 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,8 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [unreleased][unreleased]
+ - Fix 'compiler warning on macos and gcc7.1 or higher'  (@TomHarkness)
+ - Fix 'crash on Bionic libc if CloseProxmark is called twice' (@micolous)
  - Change 'lf hid' - got an  updated to Kastle format (@xilni)
  - Added 'lf t55xx deviceconfig' - enables custom t55xx timing settings. (RDV40) (@iceman)
  - Chg adaptations for FPC communications (work in progress)  (@iceman)

From 1d322686bbe81e7b8713fe38acbee1d352eb7fe0 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sat, 15 Sep 2018 12:58:50 +0200
Subject: [PATCH 0055/1938] CHG:  added possible SE credential identification
 text

---
 client/cmdhficlass.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index 7f0e3aa07..6b57d7efd 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -547,9 +547,14 @@ int HFiClassReader(const char *Cmd, bool loop, bool verbose) {
 			}
 			if (readStatus & FLAG_ICLASS_READER_AIA) {
 				bool legacy = ( memcmp( (uint8_t *)(data + 8*5), "\xff\xff\xff\xff\xff\xff\xff\xff", 8) == 0 );
+				
+				bool se_enabled = ( memcmp( (uint8_t *)(data + 8*5), "\xff\xff\xff\x00\x06\xff\xff\xff", 8) == 0 );
+				
 				PrintAndLogEx(NORMAL, " App IA: %s", sprint_hex(data+8*5, 8));
 				if ( legacy )
-					PrintAndLogEx(SUCCESS, "      : Possible iClass (legacy tag)");
+					PrintAndLogEx(SUCCESS, "      : Possible iClass (legacy credential tag)");
+				else if( se_enabled )
+					PrintAndLogEx(SUCCESS, "      : Possible iClass (SE credential tag)");
 				else
 					PrintAndLogEx(WARNING, "      : Possible iClass (NOT legacy tag)");
 			}

From df706198887b20abaabfdb902fb16004072abf78 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sat, 15 Sep 2018 18:33:16 +0200
Subject: [PATCH 0056/1938] chg:  turn off FPC specific functions (still work
 in progress)

---
 client/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/Makefile b/client/Makefile
index f577a6386..a1d06eb76 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -82,7 +82,7 @@ else
 endif
 
 # RDV40 flag enables flashmemory commands in client.  comment out if you don't have rdv40
-CFLAGS += -DWITH_FLASH -DWITH_SMARTCARD -DWITH_FPC
+CFLAGS += -DWITH_FLASH -DWITH_SMARTCARD 
 
 # Flags to generate temporary dependency files
 DEPFLAGS = -MT $@ -MMD -MP -MF $(OBJDIR)/$*.Td

From 02cc278e195cdba2c043e423d5e2abe2d826b30b Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sun, 16 Sep 2018 20:47:23 +0200
Subject: [PATCH 0057/1938] chg: remove warnings on coverity chg: encapsule
 flasmem function calls

---
 armsrc/Standalone/hf_colin.c | 14 ++++----------
 armsrc/appmain.c             | 19 ++++++++++++++-----
 armsrc/flashmem.c            |  3 ---
 armsrc/iclass.c              |  2 --
 4 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/armsrc/Standalone/hf_colin.c b/armsrc/Standalone/hf_colin.c
index f19706af1..fc0c7967a 100644
--- a/armsrc/Standalone/hf_colin.c
+++ b/armsrc/Standalone/hf_colin.c
@@ -153,8 +153,7 @@ void SpinUp(uint32_t speed)
     LED_D_OFF();
 }
 
-void TestFlashmemSpeed(size_t buffersize, uint32_t spibaudrate)
-{
+void TestFlashmemSpeed(size_t buffersize, uint32_t spibaudrate) {
 
     FLASHMEM_SPIBAUDRATE = spibaudrate*1000000;
     DbprintfEx(FLAG_NOLOG, "%s---+----[ %s %s[%dKB] %s] (%d)", _GREEN_, _WHITE_, _YELLOW_, buffersize / 1024, _WHITE_, FLASHMEM_SPIBAUDRATE);
@@ -230,9 +229,7 @@ void TestFlashmemRoutine()
     return;
 }
 
-void ReadLastTagFromFlash()
-{
-
+void ReadLastTagFromFlash() {
     SpinOff(0);
     LED_A_ON();
     LED_B_ON();
@@ -248,8 +245,7 @@ void ReadLastTagFromFlash()
     size_t size = len;
     uint8_t *mem = BigBuf_malloc(size);
 
-    if (!FlashInit())
-    {
+    if (!FlashInit()) {
         return;
     }
     Flash_CheckBusy(BUSY_TIMEOUT);
@@ -309,9 +305,7 @@ void WriteTagToFlash(uint8_t index, size_t size)
     // cnt = 0;
     emlGetMem(data, 0, (size * 64)/1024);
 
-    //if (!FlashFastReadInit()){
-    if (!FlashInit())
-    {
+    if (!FlashInit()){
         return;
     }
     
diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index f3b2e6c60..8a63f72e4 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -38,6 +38,10 @@
 #include "usart.h"
 #endif
 
+#ifdef WITH_FLASH
+#include "flashmem.h"
+#endif
+
 //=============================================================================
 // A buffer where we can queue things up to be sent through the FPGA, for
 // any purpose (fake tag, as reader, whatever). We go MSB first, since that
@@ -387,7 +391,9 @@ void printUSBSpeed(void) {
 void SendStatus(void) {
 	BigBuf_print_status();
 	Fpga_print_status();
+#ifdef WITH_FLASH	
 	Flashmem_print_status();
+#endif
 #ifdef WITH_SMARTCARD	
 	I2C_print_status();
 #endif	
@@ -1222,7 +1228,9 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 			
 			uint8_t *mem = BigBuf_malloc(size);
 	
-			FlashInit();
+  			if (!FlashInit()) {
+   		       break;
+  		    }
 			//Flash_CheckBusy(BUSY_TIMEOUT);
 			
 			for(size_t i = 0; i < len; i += size) {
@@ -1251,8 +1259,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 			
 			uint32_t tmp = startidx + len;
 			
-  			if (!FlashInit())
-  		    {
+  			if (!FlashInit()) {
    		       break;
   		    }
     
@@ -1322,8 +1329,10 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 			// arg0 = startindex
 			// arg1 = length bytes to transfer
 			// arg2 = RFU
-
-				FlashInit();
+			
+  			if (!FlashInit()) {
+   		       break;
+  		    }
 
 			for (size_t i = 0; i < numofbytes; i += USB_CMD_DATA_SIZE) {
 				len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);
diff --git a/armsrc/flashmem.c b/armsrc/flashmem.c
index d7ec37f81..3007ffbc1 100644
--- a/armsrc/flashmem.c
+++ b/armsrc/flashmem.c
@@ -485,9 +485,6 @@ void Flash_EraseChip(void) {
 	FlashSendLastByte(CHIPERASE);
 }
 
-
-
-
 void Flashmem_print_status(void) {
 	DbpString("Flash memory");
 	Dbprintf("  Baudrate................%dMHz",FLASHMEM_SPIBAUDRATE/1000000);
diff --git a/armsrc/iclass.c b/armsrc/iclass.c
index a5481103b..21cb9f299 100644
--- a/armsrc/iclass.c
+++ b/armsrc/iclass.c
@@ -1815,7 +1815,6 @@ void setupIclassReader() {
 
     SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
 
-    // Reset trace buffer
 	clear_trace();
 	set_tracing(true);
 
@@ -1824,7 +1823,6 @@ void setupIclassReader() {
     FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD);
     SpinDelay(300);
 	
-	// Start the timer
 	StartCountSspClk();
 	
     LED_A_ON();

From d5963434380f0df8538218be6a218dc9eb31842e Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sun, 16 Sep 2018 20:48:39 +0200
Subject: [PATCH 0058/1938] chg: 'lf t55xx deviceconfig' - assume total time, 
 and writeenable when writting...

---
 armsrc/lfops.c | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index 12da53f9e..ce161d6dd 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -59,7 +59,7 @@ Default LF T55xx config is set to:
 	write_1 = 47*8
 	read_gap = 15*8
 */
-t55xx_config t_config = { 31*8, 17*8, 15*8, 47*8, 15*8 } ;
+t55xx_config t_config = { 29*8, 17*8, 15*8, 47*8, 15*8 } ;
 
 void printT55xxConfig(void) {
 	Dbprintf("LF T55XX config");
@@ -69,28 +69,35 @@ void printT55xxConfig(void) {
 	Dbprintf("  [d] write_1.............%d*8 (%d)", t_config.write_1/8,   t_config.write_1);
 	Dbprintf("  [e] readgap.............%d*8 (%d)", t_config.read_gap/8,  t_config.read_gap);
 }
+
 void setT55xxConfig(t55xx_config *c) {
 
-	if (c->start_gap != 0) t_config.start_gap = c->start_gap*8;
-	if (c->write_gap != 0) t_config.write_gap = c->write_gap*8;
-	if (c->write_0   != 0) t_config.write_0 = c->write_0*8;
-	if (c->write_1   != 0) t_config.write_1 = c->write_1*8;
-	if (c->read_gap  != 0) t_config.read_gap = c->read_gap*8;
+	if (c->start_gap != 0) t_config.start_gap = c->start_gap;
+	if (c->write_gap != 0) t_config.write_gap = c->write_gap;
+	if (c->write_0   != 0) t_config.write_0 = c->write_0;
+	if (c->write_1   != 0) t_config.write_1 = c->write_1;
+	if (c->read_gap  != 0) t_config.read_gap = c->read_gap;
 
 	printT55xxConfig();
 
 #if WITH_FLASH
     if (!FlashInit()) {
         return;
-			}
-
+	}
+	
+	uint8_t buf[T55XX_CONFIG_LEN];
+	memcpy(buf, &t_config, T55XX_CONFIG_LEN);
+	
 	Flash_CheckBusy(BUSY_TIMEOUT);
-
-	uint16_t isok = Flash_WriteDataCont(T55XX_CONFIG_OFFSET, (uint8_t *)&t_config, sizeof(t55xx_config));
+	Flash_WriteEnable();
+	uint16_t isok = Flash_WriteDataCont(T55XX_CONFIG_OFFSET, buf, sizeof(buf));
 	FlashStop();
 
 	if ( isok == T55XX_CONFIG_LEN) {
-		if (MF_DBGLEVEL > 1) DbpString("T55XX Config save success");
+		if (MF_DBGLEVEL > 1) {
+			DbpString("T55XX Config save success");
+			Dbhexdump(sizeof(buf), buf, false);
+		}
 	}
 #endif
 }
@@ -103,11 +110,9 @@ void loadT55xxConfig(void) {
 #if WITH_FLASH
     if (!FlashInit()) {
         return;
-			}
+	}
 
 	Flash_CheckBusy(BUSY_TIMEOUT);
-	Flash_WriteEnable();
-
 	uint16_t isok = Flash_ReadDataCont(T55XX_CONFIG_OFFSET, (uint8_t *)&t_config, T55XX_CONFIG_LEN);
 	FlashStop();
 

From 5a95cee5ed5093766e74735e28bb4af1e67c8900 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sun, 16 Sep 2018 20:49:29 +0200
Subject: [PATCH 0059/1938] clean

---
 client/loclass/fileutils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index 49f75ebfa..71f4e02aa 100644
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -57,7 +57,7 @@ int fileExists(const char *filename) {
 
 int saveFile(const char *preferredName, const char *suffix, const void* data, size_t datalen) {
 	int size = sizeof(char) * (strlen(preferredName) + strlen(suffix) + 10);
-	char * fileName = calloc(size,sizeof(char));
+	char * fileName = calloc(size, sizeof(char));
 	int num = 1;
 	sprintf(fileName,"%s.%s", preferredName, suffix);
 	while (fileExists(fileName)) {

From a965dff52c923b7233512f55848c3d4a6ef83ffc Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sun, 16 Sep 2018 20:54:08 +0200
Subject: [PATCH 0060/1938] CHG:  'lf t55xx deviceconfig' - better helptext.
 Command takes timing values in FIELD CLOCK, which is converted to (US) on
 device.

---
 client/cmdlft55xx.c | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 5ffda3d9b..046ee40e3 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -188,24 +188,25 @@ int usage_t55xx_recoverpw(){
 	return 0;
 }
 int usage_lf_deviceconfig(){
+	PrintAndLogEx(NORMAL, "Sets t55x7 timings for direkt commands. The timings are set here in Field Clocks (FC), \nwhich is converted to (US) on device");
 	PrintAndLogEx(NORMAL, "Usage: lf t55xx deviceconfig a <gap> b <gap> c <gap> d <gap> e <gap>");
 	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h             - This help");
-	PrintAndLogEx(NORMAL, "       a <8..28>     - Set start gap");
-	PrintAndLogEx(NORMAL, "       b <8..28>     - Set write gap");
-	PrintAndLogEx(NORMAL, "       c <8..28>     - Set write ZERO gap");
-	PrintAndLogEx(NORMAL, "       d <8..28>     - Set write ONE gap");
-	PrintAndLogEx(NORMAL, "       e <8..28>     - Set read gap");
+	PrintAndLogEx(NORMAL, "       h              - This help");
+	PrintAndLogEx(NORMAL, "       a <8..255>     - Set start gap");
+	PrintAndLogEx(NORMAL, "       b <8..255>     - Set write gap");
+	PrintAndLogEx(NORMAL, "       c <8..255>     - Set write ZERO gap");
+	PrintAndLogEx(NORMAL, "       d <8..255>     - Set write ONE gap");
+	PrintAndLogEx(NORMAL, "       e <8..255>     - Set read gap");
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      lf t55xx deviceconfig a 31           - start gap 31*8");
-	PrintAndLogEx(NORMAL, "      lf t55xx deviceconfig a 29 b 17 c 15 d 47 e 15   -  Default T55XX");
-	PrintAndLogEx(NORMAL, "      lf t55xx deviceconfig a 55 b 14 c 21 d 30        -  Default EM4305");
+	PrintAndLogEx(NORMAL, "      lf t55xx deviceconfig a 31                       - start gap 31*8");
+	PrintAndLogEx(NORMAL, "      lf t55xx deviceconfig a 29 b 17 c 15 d 47 e 15   - default T55XX");
+	PrintAndLogEx(NORMAL, "      lf t55xx deviceconfig a 55 b 14 c 21 d 30        - default EM4305");
 	PrintAndLogEx(NORMAL, "");
 	return 0;
 }
 
- CmdHelp(const char *Cmd);
+CmdHelp(const char *Cmd);
 
 void printT5xxHeader(uint8_t page){
 	PrintAndLogEx(NORMAL, "Reading Page %d:", page);	
@@ -1938,7 +1939,7 @@ int CmdT55xxSetDeviceConfig(const char *Cmd){
 	//Validations
 	if (errors || cmdp == 0) return usage_lf_deviceconfig();
 	
-	t55xx_config config = { startgap, writegap, write0, write1, readgap };
+	t55xx_config config = { startgap*8, writegap*8, write0*8, write1*8, readgap*8 };
 
 	UsbCommand c = {CMD_SET_LF_T55XX_CONFIG, {0,0,0} };
 	memcpy(c.d.asBytes, &config, sizeof(t55xx_config));

From 151ad3b31fa517b4e90d3a0e37dd56ac7ceb54d1 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sun, 16 Sep 2018 22:40:09 +0200
Subject: [PATCH 0061/1938] CHG: missing declaration

---
 client/cmdlft55xx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 046ee40e3..71a26ddd3 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -206,7 +206,7 @@ int usage_lf_deviceconfig(){
 	return 0;
 }
 
-CmdHelp(const char *Cmd);
+int CmdHelp(const char *Cmd);
 
 void printT5xxHeader(uint8_t page){
 	PrintAndLogEx(NORMAL, "Reading Page %d:", page);	

From 5c0517526a65be65962316b14b064fdcc7a391bb Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sun, 16 Sep 2018 23:05:09 +0200
Subject: [PATCH 0062/1938] CHG: 'hf mf csave' CHG: 'hf mf esave'  -

---
 client/cmdhfmf.c | 230 +++++++++++++++--------------------------------
 1 file changed, 74 insertions(+), 156 deletions(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 142dbd3a4..5af1922af 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -2427,80 +2427,49 @@ int CmdHF14AMfELoad(const char *Cmd) {
 	return 0;
 }
 
+#define MFBLOCK_SIZE 16
 int CmdHF14AMfESave(const char *Cmd) {
-	FILE * f;
+
 	char filename[FILE_PATH_SIZE];
 	char * fnameptr = filename;
-	uint8_t buf[64];
-	int i, j, len, numBlocks;
-	int nameParamNo = 1;
-	
+	uint8_t *dump;
+	int len, bytes, nameParamNo = 1;
+	uint16_t blocks;
+
 	memset(filename, 0, sizeof(filename));
-	memset(buf, 0, sizeof(buf));
 
-	char c = param_getchar(Cmd, 0);
-	
-	if ( c == 'h' || c == 'H') return usage_hf14_esave();
+	char c = tolower(param_getchar(Cmd, 0));	
+	if (c == 'h') return usage_hf14_esave();
 
-	switch (c) {
-		case '0' : numBlocks = 5*4; break;
-		case '1' : 
-		case '\0': numBlocks = 16*4; break;
-		case '2' : numBlocks = 32*4; break;
-		case '4' : numBlocks = 256; break;
-		default:  {
-			numBlocks = 16*4;
-			nameParamNo = 0;
-		}
+	blocks = NumOfBlocks(c);
+	bytes = blocks * MFBLOCK_SIZE;	
+
+	dump = malloc(bytes);
+	if (!dump) {
+		PrintAndLogEx(WARNING, "Fail, cannot allocate memory");
+		return 1;
 	}
+	memset(dump, 0, bytes);
+	
+	PrintAndLogEx(INFO, "dowingloading from emulator memory");
+	if (!GetFromDevice( BIG_BUF_EML, dump, bytes, 0, NULL, 2500, false)) {
+		PrintAndLogEx(WARNING, "Fail, transfer from device time-out");
+		free(dump);
+		return 2;
+	}	
 
 	len = param_getstr(Cmd, nameParamNo, filename, sizeof(filename));
-	
 	if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5;
 	
 	// user supplied filename?
 	if (len < 1) {
-		// get filename (UID from memory)
-		if (mfEmlGetMem(buf, 0, 1)) {
-			PrintAndLogEx(WARNING, "Can\'t get UID from block: %d", 0);
-			len = sprintf(fnameptr, "dump");
-			fnameptr += len;
-		}
-		else {
-			for (j = 0; j < 7; j++, fnameptr += 2)
-				sprintf(fnameptr, "%02X", buf[j]);
-		}
-	} else {
-		fnameptr += len;
-	}
-
-	// add file extension
-	sprintf(fnameptr, ".eml"); 
-	
-	// open file
-	f = fopen(filename, "w+");
-
-	if ( !f ) {
-		PrintAndLogEx(WARNING, "Can't open file %s ", filename);
-		return 1;
+		fnameptr += sprintf(fnameptr, "hf-mf-");
+		FillFileNameByUID(fnameptr, dump, "-dump", 4);
 	}
 	
-	// put hex
-	for (i = 0; i < numBlocks; i++) {
-		if (mfEmlGetMem(buf, i, 1)) {
-			PrintAndLogEx(WARNING, "Cant get block: %d", i);
-			break;
-		}
-		for (j = 0; j < 16; j++)
-			fprintf(f, "%02X", buf[j]); 
-		
-		if (i != numBlocks -1)
-			fprintf(f, "\n");
-		printf("."); fflush(stdout);
-	}
-	PrintAndLogEx(NORMAL, "\n");
-	fclose(f);
-	PrintAndLogEx(SUCCESS, "Saved %d blocks to file: %s", numBlocks, filename);
+	saveFile(filename, "bin", dump, bytes);
+	saveFileEML(filename, "eml", dump, bytes, MFBLOCK_SIZE);
+	free(dump);
 	return 0;
 }
 
@@ -2811,75 +2780,50 @@ int CmdHF14AMfCGetSc(const char *Cmd) {
 
 int CmdHF14AMfCSave(const char *Cmd) {
 
-	FILE * feml;
-	FILE * fbin;
-	char filename[2][FILE_PATH_SIZE];
-	char * femlptr = filename[0];
-	char * fbinptr = filename[1];
-	bool fillFromEmulator = false;
-	bool errors = false;
-	bool hasname = false;
-	uint8_t buf[16];
-	int i, j, len, flags;
-	uint8_t numblocks = 0;
-	uint8_t cmdp = 0;
+	char filename[FILE_PATH_SIZE];
+	char * fnameptr = filename;
+	uint8_t *dump;	
+	bool fillEmulator = false;
+	bool errors = false, hasname = false, useuid = false;
+	int i, len, flags;
+	uint8_t numblocks = 0, cmdp = 0;
+	uint16_t bytes = 0;
 	char ctmp;
-	
-	memset(filename, 0, sizeof(filename));
-	memset(buf, 0, sizeof(buf));
 
-	while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		ctmp = param_getchar(Cmd, cmdp);
-		switch(ctmp) {	
+	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+		ctmp = tolower(param_getchar(Cmd, cmdp));
+		switch (ctmp) {	
 		case 'e':
-		case 'E':
-			fillFromEmulator = true;
+			useuid = true;
+			fillEmulator = true;
 			cmdp++;
 			break;
 		case 'h':
-		case 'H':
 			return usage_hf14_csave();
 		case '0':
 		case '1':
 		case '2':
 		case '4':
 			numblocks = NumOfBlocks(ctmp);
+			bytes =  numblocks * MFBLOCK_SIZE;
 			PrintAndLogEx(SUCCESS, "Saving magic mifare %cK", ctmp);
 			cmdp++;
 			break;
 		case 'u':
-		case 'U':
-			// get filename based on UID
-			if (mfCGetBlock(0, buf, MAGIC_SINGLE)) {
-				PrintAndLogEx(FAILED, "Cant get block: %d", 0);
-				femlptr += sprintf(femlptr, "dump");
-				fbinptr += sprintf(fbinptr, "dump");
-			} else {
-				for (j = 0; j < 7; j++) {
-					femlptr += sprintf(femlptr, "%02x", buf[j]); 
-					fbinptr += sprintf(fbinptr, "%02x", buf[j]); 
-				}
-			}
+			useuid = true;
 			hasname = true;
 			cmdp++;			
 			break;
 		case 'o':
-		case 'O':
-			// input file
-			len = param_getstr(Cmd, cmdp+1, filename[0], FILE_PATH_SIZE);
-			len = param_getstr(Cmd, cmdp+1, filename[1], FILE_PATH_SIZE);
-			
+			len = param_getstr(Cmd, cmdp+1, filename, FILE_PATH_SIZE);
 			if (len < 1) {
 				errors = true;
 				break;
 			}
-			
 			if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5;				
 
-			femlptr += len;
-			fbinptr += len;
-
-			hasname = true;					
+			useuid = false;
+			hasname = true;		
 			cmdp += 2;
 			break;			
 		default:
@@ -2889,75 +2833,49 @@ int CmdHF14AMfCSave(const char *Cmd) {
 		}
 	}
 
-	// must have filename when saving.
-	if (!hasname && !fillFromEmulator) errors = true;
+	if (!hasname && !fillEmulator) errors = true;
 	
-	//Validations
 	if (errors || cmdp == 0) return usage_hf14_csave();
-	
-	if (fillFromEmulator) {
-		// put into emulator
-		flags = MAGIC_INIT + MAGIC_WUPC;
-		for (i = 0; i < numblocks; i++) {
-			if (i == 1) flags = 0;
-			if (i == numblocks - 1) flags = MAGIC_HALT + MAGIC_OFF;
-		
-			if (mfCGetBlock(i, buf, flags)) {
-				PrintAndLogEx(WARNING, "Cant get block: %d", i);
-				return 3;
-			}
-			
-			if (mfEmlSetMem(buf, i, 1)) {
-				PrintAndLogEx(WARNING, "Cant set emul block: %d", i);
-				return 3;
-			}
-			printf("."); fflush(stdout);
-		}
-		PrintAndLogEx(NORMAL, "\n");
-		return 0;
-	}
 
-	sprintf(femlptr, ".eml"); 
-	sprintf(fbinptr, ".bin");
-
-	if ((feml = fopen(filename[0], "w+")) == NULL ) {
-		PrintAndLogEx(WARNING, "File not found or locked");
+	dump = malloc(bytes);
+	if (!dump) {
+		PrintAndLogEx(WARNING, "Fail, cannot allocate memory");
 		return 1;
 	}
+	memset(dump, 0, bytes);
 	
-	if ((fbin = fopen(filename[1], "wb")) == NULL) {
-		PrintAndLogEx(WARNING, "File not found or locked");
-		return 1;
-	}
-	
-	// dump to files
 	flags = MAGIC_INIT + MAGIC_WUPC;
 	for (i = 0; i < numblocks; i++) {
 		if (i == 1) flags = 0;
 		if (i == numblocks - 1) flags = MAGIC_HALT + MAGIC_OFF;
 	
-		if (mfCGetBlock(i, buf, flags)) {
+		if (mfCGetBlock(i, dump + (i*MFBLOCK_SIZE), flags)) {
 			PrintAndLogEx(WARNING, "Cant get block: %d", i);
-			break;
+			free(dump);
+			return 2;
 		}
-		// eml
-		for (j = 0; j < 16; j++)
-			fprintf(feml, "%02x", buf[j]); 
-
-		if (i != numblocks -1)		
-			fprintf(feml,"\n");
-		
-		// bin
-		fwrite(buf, 1, sizeof(buf), fbin);
-		printf("."); fflush(stdout);
 	}
-	PrintAndLogEx(NORMAL, "\n");	
-	fflush(feml); fflush(fbin);
-	fclose(feml); fclose(fbin);
-
-	for (uint8_t i=0; i<2; ++i)
-		PrintAndLogEx(SUCCESS, "Saved %d blocks to file: %s", numblocks, filename[i]);
+	
+	if ( useuid ){
+		fnameptr += sprintf(fnameptr, "hf-mf-");		
+		FillFileNameByUID(fnameptr, dump, "-dump", 4);
+	}
+	
+	if (fillEmulator) {
+		PrintAndLogEx(INFO, "uploading to emulator memory");
+		for (i = 0; i < numblocks; i += 5) {			
+			if (mfEmlSetMem(dump + (i*MFBLOCK_SIZE), i, 5)) {
+				PrintAndLogEx(WARNING, "Cant set emul block: %d", i);
+			}
+			printf("."); fflush(stdout);
+		}
+		PrintAndLogEx(NORMAL, "\n");
+		PrintAndLogEx(SUCCESS, "uploaded %d bytes to emulator memory", bytes);
+	}
 
+	saveFile(filename, "bin", dump, bytes);
+	saveFileEML(filename, "eml", dump, bytes, MFBLOCK_SIZE);
+	free(dump);
 	return 0;
 }
 

From f679db96837089bcdd80b4fb61dc20336fb090dd Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sun, 16 Sep 2018 23:07:19 +0200
Subject: [PATCH 0063/1938] textual

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8301bfa06..9f1f9702a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,8 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [unreleased][unreleased]
+ - Change 'hf mf csave' - now saves both EML/BIN formats (@iceman)
+ - Change 'hf mf esave' - now saves both EML/BIN formats (@iceman)
  - Fix 'compiler warning on macos and gcc7.1 or higher'  (@TomHarkness)
  - Fix 'crash on Bionic libc if CloseProxmark is called twice' (@micolous)
  - Change 'lf hid' - got an  updated to Kastle format (@xilni)

From b89b62164d43ed0293cff577f6521c7ba0762dfa Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Tue, 18 Sep 2018 20:28:54 +0200
Subject: [PATCH 0064/1938] added emv tag (@merlokk)
 https://github.com/Proxmark/proxmark3/pull/676

---
 client/emv/emv_tags.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/emv/emv_tags.c b/client/emv/emv_tags.c
index cdd57cb51..a29b15048 100644
--- a/client/emv/emv_tags.c
+++ b/client/emv/emv_tags.c
@@ -272,6 +272,7 @@ static const struct emv_tag emv_tags[] = {
 	{ 0x9f6a, "Unpredictable Number", EMV_TAG_NUMERIC },
 	{ 0x9f6b, "Track 2 Data" },
 	{ 0x9f6c, "Card Transaction Qualifiers (CTQ)", EMV_TAG_BITMASK, &EMV_CTQ },
+	{ 0x9f6e, "Form Factor Indicator" },	
 	{ 0xa5  , "File Control Information (FCI) Proprietary Template" },
 	{ 0xbf0c, "File Control Information (FCI) Issuer Discretionary Data" },
 	{ 0xdf20, "Issuer Proprietary Bitmap (IPB)" },

From dc67b5d7c9301cef64ee2286887243fcc34384c4 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sun, 23 Sep 2018 05:29:55 +0200
Subject: [PATCH 0065/1938] chg: revert fpga_major mode in LF. chg: 'lf t55xx
 deviceconfig'  - persistence to flashmem is now option with param P

---
 armsrc/appmain.c    |  2 +-
 armsrc/apps.h       |  2 +-
 armsrc/flashmem.c   | 48 +++++++++++++++++++++++++++++++++--------
 armsrc/flashmem.h   |  1 +
 armsrc/lfops.c      | 52 ++++++++++++++++++++++++++++-----------------
 client/cmdlft55xx.c | 14 +++++++-----
 client/util.c       |  4 ++--
 common/i2c.c        | 10 ++++-----
 common/protocols.h  |  1 +
 include/common.h    | 32 ++++++++++++++++++++++------
 10 files changed, 117 insertions(+), 49 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 8a63f72e4..a84a33d48 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -633,7 +633,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 	switch(c->cmd) {
 #ifdef WITH_LF
 		case CMD_SET_LF_T55XX_CONFIG:
-			setT55xxConfig((t55xx_config *) c->d.asBytes);
+			setT55xxConfig( c->arg[0], (t55xx_config *) c->d.asBytes);
 			break;			
 		case CMD_SET_LF_SAMPLING_CONFIG:
 			setSamplingConfig((sample_config *) c->d.asBytes);
diff --git a/armsrc/apps.h b/armsrc/apps.h
index 81a073904..1e8524d57 100644
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -108,7 +108,7 @@ void TurnReadLFOn(uint32_t delay);
 void EM4xReadWord(uint8_t addr, uint32_t pwd, uint8_t usepwd);
 void EM4xWriteWord(uint32_t flag, uint32_t data, uint32_t pwd);
 void Cotag(uint32_t arg0);
-void setT55xxConfig(t55xx_config *c);
+void setT55xxConfig(uint8_t arg0, t55xx_config *c);
 t55xx_config * getT55xxConfig(void);
 void printT55xxConfig(void);
 void loadT55xxConfig(void);
diff --git a/armsrc/flashmem.c b/armsrc/flashmem.c
index 3007ffbc1..3a46500ba 100644
--- a/armsrc/flashmem.c
+++ b/armsrc/flashmem.c
@@ -13,7 +13,6 @@
 
 uint32_t FLASHMEM_SPIBAUDRATE = FLASH_BAUD;
 
-
 void FlashmemSetSpiBaudrate(uint32_t baudrate){
    FLASHMEM_SPIBAUDRATE = baudrate;
    Dbprintf("Spi Baudrate : %dMhz", FLASHMEM_SPIBAUDRATE/1000000);
@@ -316,7 +315,6 @@ uint16_t Flash_ReadDataCont(uint32_t address, uint8_t *out, uint16_t len) {
 
 
 ////////////////////////////////////////
-
 // Write data can only program one page. A page has 256 bytes. 
 // if len > 256, it might wrap around and overwrite pos 0.
 uint16_t Flash_WriteData(uint32_t address, uint8_t *in, uint16_t len) {
@@ -361,25 +359,25 @@ uint16_t Flash_WriteData(uint32_t address, uint8_t *in, uint16_t len) {
 	return len;	
 }
 
+
+// length should never be zero
+//	Max 256 bytes write
+// out-of-range
 uint16_t Flash_WriteDataCont(uint32_t address, uint8_t *in, uint16_t len) {
 
-	// length should never be zero
 	if (!len)
 		return 0;
 	
-	//	Max 256 bytes write
 	if (((address & 0xFF) + len) > 256) {
-		Dbprintf("Flash_WriteData 256 fail [ 0x%02x ] [ %u ]", (address & 0xFF)+len, len );
+		Dbprintf("Flash_WriteDataCont 256 fail [ 0x%02x ] [ %u ]", (address & 0xFF)+len, len );
 		return 0;
 	}
 	
-	// out-of-range
 	if ( (( address >> 16 ) & 0xFF ) > MAX_BLOCKS) {
-		Dbprintf("Flash_WriteData,  block out-of-range");
+		Dbprintf("Flash_WriteDataCont,  block out-of-range");
 		return 0;
 	}
 
-
 	FlashSendByte(PAGEPROG);
 	FlashSendByte((address >> 16) & 0xFF);
 	FlashSendByte((address >> 8) & 0xFF);
@@ -390,10 +388,42 @@ uint16_t Flash_WriteDataCont(uint32_t address, uint8_t *in, uint16_t len) {
 		FlashSendByte(in[i]);
 
 	FlashSendLastByte(in[i]);
-
 	return len;	
 }
 
+// assumes valid start 256 based 00 address
+//
+uint16_t Flash_Write(uint32_t address, uint8_t *in, uint16_t len) {
+
+	bool isok;
+	uint16_t res, bytes_sent = 0, bytes_remaining = len;
+    uint8_t buf[FLASH_MEM_BLOCK_SIZE];
+    while (bytes_remaining > 0) {
+
+		Flash_CheckBusy(BUSY_TIMEOUT);
+		Flash_WriteEnable();
+
+        uint32_t bytes_in_packet = MIN(FLASH_MEM_BLOCK_SIZE, bytes_remaining);
+
+        memcpy(buf, in + bytes_sent, bytes_in_packet);
+
+        res = Flash_WriteDataCont(address + bytes_sent, buf, bytes_in_packet);
+
+		bytes_remaining -= bytes_in_packet;
+        bytes_sent += bytes_in_packet;
+
+        isok = (res == bytes_in_packet);
+
+        if (!isok)
+			goto out;
+    }
+
+out:
+	FlashStop();
+	return len;
+}
+
+
 bool Flash_WipeMemoryPage(uint8_t page) {
 	if (!FlashInit()) {
 		if ( MF_DBGLEVEL > 3 ) Dbprintf("Flash_WriteData init fail");
diff --git a/armsrc/flashmem.h b/armsrc/flashmem.h
index ae10ea388..da81363c0 100644
--- a/armsrc/flashmem.h
+++ b/armsrc/flashmem.h
@@ -144,6 +144,7 @@ uint16_t Flash_ReadData(uint32_t address, uint8_t *out, uint16_t len);
 
 uint16_t Flash_ReadDataCont(uint32_t address, uint8_t *out, uint16_t len);
 
+uint16_t Flash_Write(uint32_t address, uint8_t *in, uint16_t len);
 uint16_t Flash_WriteData(uint32_t address, uint8_t *in, uint16_t len);
 uint16_t Flash_WriteDataCont(uint32_t address, uint8_t *in, uint16_t len);
 void Flashmem_print_status(void);
diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index ce161d6dd..18e178c1f 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -70,7 +70,7 @@ void printT55xxConfig(void) {
 	Dbprintf("  [e] readgap.............%d*8 (%d)", t_config.read_gap/8,  t_config.read_gap);
 }
 
-void setT55xxConfig(t55xx_config *c) {
+void setT55xxConfig(uint8_t arg0, t55xx_config *c) {
 
 	if (c->start_gap != 0) t_config.start_gap = c->start_gap;
 	if (c->write_gap != 0) t_config.write_gap = c->write_gap;
@@ -81,24 +81,36 @@ void setT55xxConfig(t55xx_config *c) {
 	printT55xxConfig();
 
 #if WITH_FLASH
+	// shall persist to flashmem
+	if (arg0 == 0) {
+		return;
+	}
+	
     if (!FlashInit()) {
         return;
 	}
 	
-	uint8_t buf[T55XX_CONFIG_LEN];
+	uint8_t *buf = BigBuf_malloc(4096);
+	Flash_CheckBusy(BUSY_TIMEOUT);
+	uint16_t res = Flash_ReadDataCont(T55XX_CONFIG_OFFSET, buf, 4096);
+	if ( res == 0) {
+		FlashStop();
+		BigBuf_free();
+		return;
+	}
+	
 	memcpy(buf, &t_config, T55XX_CONFIG_LEN);
 	
 	Flash_CheckBusy(BUSY_TIMEOUT);
-	Flash_WriteEnable();
-	uint16_t isok = Flash_WriteDataCont(T55XX_CONFIG_OFFSET, buf, sizeof(buf));
-	FlashStop();
+    Flash_WriteEnable();
+	Flash_Erase4k(3, 0xD);	
+	res = Flash_Write(T55XX_CONFIG_OFFSET, buf, 4096);
 
-	if ( isok == T55XX_CONFIG_LEN) {
-		if (MF_DBGLEVEL > 1) {
-			DbpString("T55XX Config save success");
-			Dbhexdump(sizeof(buf), buf, false);
-		}
+	if ( res == 4096 && MF_DBGLEVEL > 1) {
+		DbpString("T55XX Config save success");
 	}
+	
+	BigBuf_free();	
 #endif
 }
 
@@ -139,7 +151,7 @@ void ModThenAcquireRawAdcSamples125k(uint32_t delay_off, uint32_t period_0, uint
 
 	// Make sure the tag is reset
 	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF_LF);
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 	WaitMS(500);
 
 	// clear read buffer
@@ -180,7 +192,7 @@ void ModThenAcquireRawAdcSamples125k(uint32_t delay_off, uint32_t period_0, uint
 			if (command[counter] == '0') {
 				// if field already off leave alone (affects timing otherwise)
 				if (off == false) {
-					FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF_LF);
+					FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 					LED_D_OFF();
 					off = true;
 				}
@@ -207,7 +219,7 @@ void ModThenAcquireRawAdcSamples125k(uint32_t delay_off, uint32_t period_0, uint
 				TurnReadLFOn(period_1);
 
 			LED_D_OFF();
-			FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF_LF);
+			FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 			WaitUS(delay_off);
 		}
 
@@ -1328,7 +1340,7 @@ void TurnReadLFOn(uint32_t delay) {
 	WaitUS(delay);
 }
 void TurnReadLF_off(uint32_t delay) {
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF_LF);
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 	WaitUS(delay);
 }
 
@@ -1338,7 +1350,7 @@ void T55xxWriteBit(int bit) {
 		TurnReadLFOn(t_config.write_0);
 	else
 		TurnReadLFOn(t_config.write_1);
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF_LF);
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 	WaitUS(t_config.write_gap);
 }
 
@@ -1356,7 +1368,7 @@ void T55xxResetRead(void) {
 	WaitMS(4);
 
 	// Trigger T55x7 in mode.
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF_LF);
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 	WaitUS(t_config.start_gap);
 
 	// reset tag - op code 00
@@ -1390,7 +1402,7 @@ void T55xxWriteBlockExt(uint32_t Data, uint8_t Block, uint32_t Pwd, uint8_t arg)
 	// make sure tag is fully powered up...
 	WaitMS(4);
 	// Trigger T55x7 in mode.
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF_LF);
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 	WaitUS(t_config.start_gap);
 
 	if (testMode) Dbprintf("TestMODE");
@@ -1475,7 +1487,7 @@ void T55xxReadBlock(uint16_t arg0, uint8_t Block, uint32_t Pwd) {
 	// make sure tag is fully powered up...
 	WaitMS(4);
 	// Trigger T55x7 Direct Access Mode with start gap
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF_LF);
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 	WaitUS(t_config.start_gap);
 
 	// Opcode 1[page]
@@ -1522,7 +1534,7 @@ void T55xxWakeUp(uint32_t Pwd){
 	WaitMS(4);
 
 	// Trigger T55x7 Direct Access Mode
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF_LF);
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 	WaitUS(t_config.start_gap);
 
 	// Opcode 10
@@ -1962,7 +1974,7 @@ This triggers a COTAG tag to response
 */
 void Cotag(uint32_t arg0) {
 #ifndef OFF
-# define OFF 	{ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF_LF); WaitUS(2035); }
+# define OFF 	{ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); WaitUS(2035); }
 #endif
 #ifndef ON
 # define ON(x)   { FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | FPGA_LF_ADC_READER_FIELD); WaitUS((x)); }
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 71a26ddd3..743d2db9c 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -189,7 +189,7 @@ int usage_t55xx_recoverpw(){
 }
 int usage_lf_deviceconfig(){
 	PrintAndLogEx(NORMAL, "Sets t55x7 timings for direkt commands. The timings are set here in Field Clocks (FC), \nwhich is converted to (US) on device");
-	PrintAndLogEx(NORMAL, "Usage: lf t55xx deviceconfig a <gap> b <gap> c <gap> d <gap> e <gap>");
+	PrintAndLogEx(NORMAL, "Usage: lf t55xx deviceconfig a <gap> b <gap> c <gap> d <gap> e <gap> p");
 	PrintAndLogEx(NORMAL, "Options:");
 	PrintAndLogEx(NORMAL, "       h              - This help");
 	PrintAndLogEx(NORMAL, "       a <8..255>     - Set start gap");
@@ -197,9 +197,9 @@ int usage_lf_deviceconfig(){
 	PrintAndLogEx(NORMAL, "       c <8..255>     - Set write ZERO gap");
 	PrintAndLogEx(NORMAL, "       d <8..255>     - Set write ONE gap");
 	PrintAndLogEx(NORMAL, "       e <8..255>     - Set read gap");
+	PrintAndLogEx(NORMAL, "       p              - persist to flashmemory");
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      lf t55xx deviceconfig a 31                       - start gap 31*8");
 	PrintAndLogEx(NORMAL, "      lf t55xx deviceconfig a 29 b 17 c 15 d 47 e 15   - default T55XX");
 	PrintAndLogEx(NORMAL, "      lf t55xx deviceconfig a 55 b 14 c 21 d 30        - default EM4305");
 	PrintAndLogEx(NORMAL, "");
@@ -1903,7 +1903,7 @@ int CmdT55xxDetectPage1(const char *Cmd){
 int CmdT55xxSetDeviceConfig(const char *Cmd){
 	uint8_t startgap = 0, writegap = 0;
 	uint8_t write0 = 0, write1 = 0, readgap = 0;
-	bool errors = false;
+	bool errors = false, shall_persist = false;
 	uint8_t cmdp = 0;
 	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
 		switch (tolower(param_getchar(Cmd, cmdp))) {
@@ -1928,7 +1928,11 @@ int CmdT55xxSetDeviceConfig(const char *Cmd){
 		case 'e':
 			errors |= param_getdec(Cmd, cmdp+1, &readgap);
 			cmdp += 2;
-			break;			
+			break;
+		case 'p':
+			shall_persist = true;
+			cmdp++;
+			break;
 		default:
 			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
 			errors = 1;
@@ -1941,7 +1945,7 @@ int CmdT55xxSetDeviceConfig(const char *Cmd){
 	
 	t55xx_config config = { startgap*8, writegap*8, write0*8, write1*8, readgap*8 };
 
-	UsbCommand c = {CMD_SET_LF_T55XX_CONFIG, {0,0,0} };
+	UsbCommand c = {CMD_SET_LF_T55XX_CONFIG, {shall_persist,0,0} };
 	memcpy(c.d.asBytes, &config, sizeof(t55xx_config));
 	clearCommandBuffer();
 	SendCommand(&c);
diff --git a/client/util.c b/client/util.c
index 4a256e0b2..6ed6201fa 100644
--- a/client/util.c
+++ b/client/util.c
@@ -110,8 +110,8 @@ void FillFileNameByUID(char *filenamePrefix, uint8_t *uid, const char *ext, int
 		return;
 	}
 	
-	int len=0;
-	len=strlen(filenamePrefix);
+	int len = 0;
+	len = strlen(filenamePrefix);
 	//memset(fn, 0x00, FILE_PATH_SIZE);
 	
 	for (int j = 0; j < uidlen; j++)
diff --git a/common/i2c.c b/common/i2c.c
index 159efcad2..262fd832a 100644
--- a/common/i2c.c
+++ b/common/i2c.c
@@ -88,11 +88,11 @@ void I2C_SetResetStatus(uint8_t LineRST, uint8_t LineSCK, uint8_t LineSDA) {
 // Reset the SIM_Adapter, then  enter the main program
 // Note: the SIM_Adapter will not enter the main program after power up. Please run this function before use SIM_Adapter.
 void I2C_Reset_EnterMainProgram(void) {
-	I2C_SetResetStatus(0, 0, 0);		//	���͸�λ��
+	I2C_SetResetStatus(0, 0, 0);
 	SpinDelay(30);
-	I2C_SetResetStatus(1, 0, 0);		//	�����λ
+	I2C_SetResetStatus(1, 0, 0);
 	SpinDelay(30);
-	I2C_SetResetStatus(1, 1, 1);		//	����������
+	I2C_SetResetStatus(1, 1, 1);
 	SpinDelay(10);
 }
 
@@ -100,9 +100,9 @@ void I2C_Reset_EnterMainProgram(void) {
 // Reset the SIM_Adapter, then enter the bootloader program
 // Reserve��For firmware update.
 void I2C_Reset_EnterBootloader(void) {
-	I2C_SetResetStatus(0, 1, 1);		//	���͸�λ��
+	I2C_SetResetStatus(0, 1, 1);
 	SpinDelay(100);
-	I2C_SetResetStatus(1, 1, 1);		//	�����λ
+	I2C_SetResetStatus(1, 1, 1);
 	SpinDelay(10);
 }
 
diff --git a/common/protocols.h b/common/protocols.h
index 82cea74ad..0f3ef3407 100644
--- a/common/protocols.h
+++ b/common/protocols.h
@@ -304,6 +304,7 @@ ISO 7816-4 Basic interindustry commands. For command APDU's.
 #define ISO7816_GET_CHALLENGE 			0xB4
 #define ISO7816_MANAGE_CHANNEL 			0x70
 
+#define ISO7816_GETSTATUS				0xC0
 // ISO7816-4	For response APDU's
 #define ISO7816_OK						0x9000
 //	6x xx = ERROR
diff --git a/include/common.h b/include/common.h
index 24e085699..90394448c 100644
--- a/include/common.h
+++ b/include/common.h
@@ -50,6 +50,13 @@ extern uint32_t FLASHMEM_SPIBAUDRATE;
 #define RAMFUNC __attribute((long_call, section(".ramfunc")))
 
 // RDV40 Section
+// 256kb divided into 4k sectors.
+// 
+// last 4k sector = signature
+// second last 4k sector = settings
+// third last 4k sector = default MF keys dictionary
+// forth last 4k sector = default LF keys dictionary
+
 #ifndef FLASH_MEM_BLOCK_SIZE
 # define FLASH_MEM_BLOCK_SIZE   256
 #endif
@@ -58,6 +65,11 @@ extern uint32_t FLASHMEM_SPIBAUDRATE;
 # define FLASH_MEM_MAX_SIZE     0x3FFFF  // (262143)
 #endif
 
+#ifndef FLASH_MEM_MAX_4K_SECTOR
+# define FLASH_MEM_MAX_4K_SECTOR   0x3F000
+#endif
+
+
 #ifndef FLASH_MEM_ID_LEN
 # define FLASH_MEM_ID_LEN			8
 #endif
@@ -71,13 +83,21 @@ extern uint32_t FLASHMEM_SPIBAUDRATE;
 #endif
 
 #if WITH_FLASH
-#ifndef T55XX_CONFIG_LEN
-# define T55XX_CONFIG_LEN	sizeof( t55xx_config )
-#endif
+	#ifndef T55XX_CONFIG_LEN
+	# define T55XX_CONFIG_LEN	sizeof( t55xx_config )
+	#endif
 
-#ifndef T55XX_CONFIG_OFFSET
-#define T55XX_CONFIG_OFFSET	(FLASH_MEM_MAX_SIZE - FLASH_MEM_SIGNATURE_LEN - T55XX_CONFIG_LEN)
-#endif
+	#ifndef T55XX_CONFIG_OFFSET
+	# define T55XX_CONFIG_OFFSET	(FLASH_MEM_MAX_4K_SECTOR - 0x2000)
+	#endif
+	
+	#ifndef DEFAULT_MF_KEYS_OFFSET
+	# define DEFAULT_MF_KEYS_OFFSET (FLASH_MEM_MAX_4K_SECTOR - 0x3000)
+	#endif
+	
+	#ifndef DEFAULT_LF_KEYS_OFFSET
+	# define DEFAULT_LF_KEYS_OFFSET (FLASH_MEM_MAX_4K_SECTOR - 0x4000)
+	#endif
 #endif
 
 // RDV40,  validation structure to help identifying that client/firmware is talking with RDV40

From 125884c3d5d01764658a9d2370320025ba997223 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sun, 23 Sep 2018 16:35:40 +0200
Subject: [PATCH 0066/1938] CHG: 'sc raw' - now requests response if inital
 command got 0x61 response

---
 client/cmdsmartcard.c | 87 +++++++++++++++++++++++++++++++------------
 1 file changed, 64 insertions(+), 23 deletions(-)

diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index 7f894abde..3bf12115a 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -62,6 +62,53 @@ int usage_sm_setclock(void) {
 	return 0;
 }
 
+static int smart_wait(uint8_t *data) {
+	UsbCommand resp;
+	if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
+		PrintAndLogEx(WARNING, "smart card response failed");
+		return -1;
+	}
+	
+	uint32_t len = resp.arg[0];	
+	if ( !len ) {
+		PrintAndLogEx(WARNING, "smart card response failed");
+		return -2;			
+	}	
+	memcpy(data, resp.d.asBytes, len);	
+	PrintAndLogEx(SUCCESS, "%s", sprint_hex(data,  len));
+	return len;
+}
+
+static int smart_response(uint8_t *data) {
+		
+	int len = -1; 
+	int datalen = smart_wait(data);	
+	
+	if ( datalen == 3 && data[1] == 0x61 ) {
+		len = data[2];		
+	} else if ( datalen == 2 && data[0] == 0x61 ) {
+		len = data[1];
+	}
+	
+	if (len == -1 ) {
+		goto out;
+	}
+
+	PrintAndLogEx(INFO, "Requesting response");	
+	uint8_t getstatus[] = {0x00, ISO7816_GETSTATUS, 0x00, 0x00, len };
+	UsbCommand cStatus = {CMD_SMART_RAW, {SC_RAW, sizeof(getstatus), 0}};	
+	memcpy(cStatus.d.asBytes, getstatus, sizeof(getstatus) );
+	clearCommandBuffer();
+	SendCommand(&cStatus);
+
+	datalen = smart_wait(data);
+out:
+	if (data)
+		free(data);
+	
+	return datalen;
+}
+
 int CmdSmartRaw(const char *Cmd) {
 
 	int hexlen = 0;
@@ -135,41 +182,35 @@ int CmdSmartRaw(const char *Cmd) {
 	
 	memcpy(c.d.asBytes, data, hexlen );
 	clearCommandBuffer();
-	SendCommand(&c);
-
+	SendCommand(&c);	
+	
 	// reading response from smart card
 	if ( reply ) {
-		UsbCommand resp;
-		if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
-			PrintAndLogEx(WARNING, "smart card response failed");
-			return 1;
-		}
-		uint32_t datalen = resp.arg[0];
-		
-		if ( !datalen ) {
-			PrintAndLogEx(WARNING, "smart card response failed");
-			return 1;			
-		}
 
-		PrintAndLogEx(INFO, "received %i bytes", datalen);
-				
-        if (!datalen)
-            return 1;
+		uint8_t* buf = malloc(USB_CMD_DATA_SIZE);
+		if ( !buf )
+			return 1;		
 		
-		uint8_t *data = resp.d.asBytes;
+		int len = smart_response(buf);
+		if ( len < 0 ) {
+			free(buf);
+			return 2;
+		}
 
 		// TLV decoder
 		if (decodeTLV ) {
 			
-			if (datalen >= 2) {
-				PrintAndLogEx(SUCCESS, "%02x %02x | %s", data[datalen - 2], data[datalen - 1], GetAPDUCodeDescription(data[datalen - 2], data[datalen - 1])); 
+			if (len >= 2) {
+				PrintAndLogEx(SUCCESS, "%02x %02x | %s", buf[len - 2], buf[len - 1], GetAPDUCodeDescription(buf[len - 2], buf[len - 1])); 
 			}
-			if (datalen > 4) {
-				TLVPrintFromBuffer(data, datalen - 2);
+			if (len > 4) {
+				TLVPrintFromBuffer(buf, len - 2);
 			}
 		} else {
-			PrintAndLogEx(SUCCESS, "%s", sprint_hex(data,  datalen)); 
+			PrintAndLogEx(SUCCESS, "%s", sprint_hex(buf, len)); 
 		}
+		
+		free(buf);
 	}
 	return 0;
 }

From f3d1c9ea774dec68473770cbc17f3e919782987c Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sun, 23 Sep 2018 17:05:29 +0200
Subject: [PATCH 0067/1938] chg: 'sc raw' - added response code annotation

---
 client/cmdsmartcard.c | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index 3bf12115a..6fb74b14a 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -73,9 +73,13 @@ static int smart_wait(uint8_t *data) {
 	if ( !len ) {
 		PrintAndLogEx(WARNING, "smart card response failed");
 		return -2;			
-	}	
+	}
 	memcpy(data, resp.d.asBytes, len);	
-	PrintAndLogEx(SUCCESS, "%s", sprint_hex(data,  len));
+	PrintAndLogEx(SUCCESS, "%s", sprint_hex(data,  len));	
+
+	if (len >= 2) {		
+		PrintAndLogEx(SUCCESS, "%02x %02x | %s", data[len - 2], data[len - 1], GetAPDUCodeDescription(data[len - 2], data[len - 1])); 
+	}
 	return len;
 }
 
@@ -84,12 +88,10 @@ static int smart_response(uint8_t *data) {
 	int len = -1; 
 	int datalen = smart_wait(data);	
 	
-	if ( datalen == 3 && data[1] == 0x61 ) {
-		len = data[2];		
-	} else if ( datalen == 2 && data[0] == 0x61 ) {
-		len = data[1];
+	if ( data[datalen - 2] == 0x61 ) {
+		len = data[datalen - 1];
 	}
-	
+
 	if (len == -1 ) {
 		goto out;
 	}
@@ -103,8 +105,6 @@ static int smart_response(uint8_t *data) {
 
 	datalen = smart_wait(data);
 out:
-	if (data)
-		free(data);
 	
 	return datalen;
 }
@@ -206,10 +206,7 @@ int CmdSmartRaw(const char *Cmd) {
 			if (len > 4) {
 				TLVPrintFromBuffer(buf, len - 2);
 			}
-		} else {
-			PrintAndLogEx(SUCCESS, "%s", sprint_hex(buf, len)); 
-		}
-		
+		}		
 		free(buf);
 	}
 	return 0;

From 4fa0835d5f7823b9b850be7c7162a98f9a3973a2 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sun, 23 Sep 2018 20:18:27 +0200
Subject: [PATCH 0068/1938] FIX: APDUCodeTable has more items than 100

---
 client/emv/apduinfo.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/client/emv/apduinfo.c b/client/emv/apduinfo.c
index 81331241c..b1bb84dae 100644
--- a/client/emv/apduinfo.c
+++ b/client/emv/apduinfo.c
@@ -255,7 +255,7 @@ const APDUCode APDUCodeTable[] = {
 	{"9F00", 	APDUCODE_TYPE_NONE, 		"PIN blocked and Unblock Try Counter is 3"},
 	{"9F04", 	APDUCODE_TYPE_NONE, 		"PIN not succesfully verified, PIN blocked and Unblock Try Counter is 3"},
 	{"9FXX", 	APDUCODE_TYPE_NONE, 		"Command successfully executed; 'xx' bytes of data are available and can be requested using GET RESPONSE."},
-	{"9xXX", 	APDUCODE_TYPE_NONE, 		"Application related status, (ISO 7816-3)"}
+	{"9XXX", 	APDUCODE_TYPE_NONE, 		"Application related status, (ISO 7816-3)"}
 };
 const size_t APDUCodeTableLen = sizeof(APDUCodeTable)/sizeof(APDUCode);
 
@@ -280,11 +280,10 @@ int CodeCmp(const char *code1, const char *code2) {
 const APDUCode* const GetAPDUCode(uint8_t sw1, uint8_t sw2) {
 	char buf[6] = {0};
 	int res;
-	int mineq = 100;
+	int mineq = APDUCodeTableLen;
 	int mineqindx = 0;
 	
-	sprintf(&buf[0], "%02X", sw1);
-	sprintf(&buf[2], "%02X", sw2);
+	sprintf(buf, "%02X%02X", sw1, sw2);
 	
 	for (int i = 0; i < APDUCodeTableLen; i++) {
 		res = CodeCmp(APDUCodeTable[i].ID, buf);
@@ -302,7 +301,7 @@ const APDUCode* const GetAPDUCode(uint8_t sw1, uint8_t sw2) {
 	}
 
 	// if we have not equal, but with some 'X'
-	if (mineqindx < 100) {
+	if (mineqindx < APDUCodeTableLen) {
 		return &APDUCodeTable[mineqindx];
 	}
 	

From dbed5d58551b0c35554e1e542bb6857781a61063 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sun, 23 Sep 2018 20:40:37 +0200
Subject: [PATCH 0069/1938] ADD: 'sc brute'  - a naive sfi bruteforcer for
 smartcards.  When a SFI is found,  it is read/printed

A first attempt,  work-in-progress.
---
 client/cmdsmartcard.c | 92 ++++++++++++++++++++++++++++++++++---------
 1 file changed, 73 insertions(+), 19 deletions(-)

diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index 6fb74b14a..e6374db9e 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -15,13 +15,14 @@ int usage_sm_raw(void) {
 	PrintAndLogEx(NORMAL, "Usage: sc raw [h|r|c] d <0A 0B 0C ... hex>");
 	PrintAndLogEx(NORMAL, "       h          :  this help");
 	PrintAndLogEx(NORMAL, "       r          :  do not read response");
-	PrintAndLogEx(NORMAL, "       a          :  active signal field ON without select");
-	PrintAndLogEx(NORMAL, "       s          :  active signal field ON with select");
+	PrintAndLogEx(NORMAL, "       a          :  active smartcard without select");
+	PrintAndLogEx(NORMAL, "       s          :  active smartcard with select");
 	PrintAndLogEx(NORMAL, "       t          :  executes TLV decoder if it possible");
 	PrintAndLogEx(NORMAL, "       d <bytes>  :  bytes to send");
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        sc raw d 11223344");	
+	PrintAndLogEx(NORMAL, "        sc raw d 00a404000e315041592e5359532e444446303100    - “1PAY.SYS.DDF01” PPSE directory");
+	PrintAndLogEx(NORMAL, "        sc raw d 00a404000e325041592e5359532e444446303100    - “2PAY.SYS.DDF01” PPSE directory");
 	return 0;
 }
 int usage_sm_reader(void) {
@@ -61,6 +62,15 @@ int usage_sm_setclock(void) {
 	PrintAndLogEx(NORMAL, "        sc setclock c 2");	
 	return 0;
 }
+int usage_sm_brute(void) {
+	PrintAndLogEx(NORMAL, "Tries to bruteforce SFI, ");
+	PrintAndLogEx(NORMAL, "Usage: sc brute [h]");
+	PrintAndLogEx(NORMAL, "       h          :  this help");
+	PrintAndLogEx(NORMAL, "");
+	PrintAndLogEx(NORMAL, "Examples:");
+	PrintAndLogEx(NORMAL, "        sc brute");
+	return 0;
+}
 
 static int smart_wait(uint8_t *data) {
 	UsbCommand resp;
@@ -75,10 +85,10 @@ static int smart_wait(uint8_t *data) {
 		return -2;			
 	}
 	memcpy(data, resp.d.asBytes, len);	
-	PrintAndLogEx(SUCCESS, "%s", sprint_hex(data,  len));	
+	PrintAndLogEx(SUCCESS, "%s", sprint_hex_inrow_ex(data,  len, 32));	
 
 	if (len >= 2) {		
-		PrintAndLogEx(SUCCESS, "%02x %02x | %s", data[len - 2], data[len - 1], GetAPDUCodeDescription(data[len - 2], data[len - 1])); 
+		PrintAndLogEx(SUCCESS, "%02X%02X | %s", data[len - 2], data[len - 1], GetAPDUCodeDescription(data[len - 2], data[len - 1])); 
 	}
 	return len;
 }
@@ -88,7 +98,7 @@ static int smart_response(uint8_t *data) {
 	int len = -1; 
 	int datalen = smart_wait(data);	
 	
-	if ( data[datalen - 2] == 0x61 ) {
+	if ( data[datalen - 2] == 0x61 || data[datalen - 2] == 0x9F ) {
 		len = data[datalen - 1];
 	}
 
@@ -198,15 +208,9 @@ int CmdSmartRaw(const char *Cmd) {
 		}
 
 		// TLV decoder
-		if (decodeTLV ) {
-			
-			if (len >= 2) {
-				PrintAndLogEx(SUCCESS, "%02x %02x | %s", buf[len - 2], buf[len - 1], GetAPDUCodeDescription(buf[len - 2], buf[len - 1])); 
-			}
-			if (len > 4) {
-				TLVPrintFromBuffer(buf, len - 2);
-			}
-		}		
+		if (decodeTLV && len > 4) {
+			TLVPrintFromBuffer(buf+1, len-2);
+		}
 		free(buf);
 	}
 	return 0;
@@ -469,14 +473,64 @@ int CmdSmartList(const char *Cmd) {
 	return 0;
 }
 
+int CmdSmartBruteforceSFI(const char *Cmd) {
+
+	char ctmp = tolower(param_getchar(Cmd, 0));
+	if (ctmp == 'h') return usage_sm_brute();
+
+	uint8_t data[5] = {0x00, 0xB2, 0x00, 0x00, 0x00};
+
+	PrintAndLogEx(INFO, "Selecting");
+	CmdSmartRaw("d 00a404000e325041592e5359532e444446303100");
+	CmdSmartRaw("d 00a4040007a000000004101000");
+	
+	PrintAndLogEx(INFO, "starting");
+	
+	UsbCommand c = {CMD_SMART_RAW, {SC_RAW, sizeof(data), 0}};
+
+	uint8_t* buf = malloc(USB_CMD_DATA_SIZE);
+	if ( !buf )
+		return 1;		
+		
+	for (uint8_t i=1; i < 4; i++) {
+		for (int p1=1; p1 < 5; p1++) {
+			
+			data[2] = p1;
+			data[3] = (i << 3) + 4;
+
+			memcpy(c.d.asBytes, data, sizeof(data) );
+			clearCommandBuffer();
+			SendCommand(&c);
+			
+			smart_response(buf);
+			
+			// if 0x6C
+			if ( buf[0] == 0x6C ) {
+				data[4]	= buf[1];
+				
+				memcpy(c.d.asBytes, data, sizeof(data) );
+				clearCommandBuffer();
+				SendCommand(&c);
+				smart_response(buf);
+				
+				data[4] = 0;
+			}
+			memset(buf, 0x00, USB_CMD_DATA_SIZE);
+		}
+	}	
+	free(buf);
+	return 0;
+}
+
 static command_t CommandTable[] = {
 	{"help",	CmdHelp,            1, "This help"},
 	{"list",	CmdSmartList,       0, "List ISO 7816 history"},	
-	{"info",	CmdSmartInfo,		1, "Tag information [rdv40]"},
-	{"reader",	CmdSmartReader,		1, "Act like an IS07816 reader [rdv40]"},
-	{"raw",		CmdSmartRaw,		1, "Send raw hex data to tag [rdv40]"},
-	{"upgrade",	CmdSmartUpgrade,	1, "Upgrade firmware [rdv40]"},
+	{"info",	CmdSmartInfo,		1, "Tag information"},
+	{"reader",	CmdSmartReader,		1, "Act like an IS07816 reader"},
+	{"raw",		CmdSmartRaw,		1, "Send raw hex data to tag"},
+	{"upgrade",	CmdSmartUpgrade,	1, "Upgrade firmware"},
 	{"setclock", CmdSmartSetClock,	1, "Set clock speed"},
+	{"brute", 	CmdSmartBruteforceSFI, 1, "Bruteforce SFI"},
 	{NULL, NULL, 0, NULL}
 };
 

From 50143e460d3af81950d20702e3ca69a44613c165 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sun, 23 Sep 2018 20:41:29 +0200
Subject: [PATCH 0070/1938] syntax

---
 client/cmdhf14a.c    | 8 ++++----
 client/cmdhf15.c     | 1 -
 client/cmdhffelica.c | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 617a703e4..418de8ec5 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -657,10 +657,10 @@ int CmdHF14ASniff(const char *Cmd) {
 	int param = 0;	
 	uint8_t ctmp;
 	for (int i = 0; i < 2; i++) {
-		ctmp = param_getchar(Cmd, i);
-		if (ctmp == 'h' || ctmp == 'H') return usage_hf_14a_sniff();
-		if (ctmp == 'c' || ctmp == 'C') param |= 0x01;
-		if (ctmp == 'r' || ctmp == 'R') param |= 0x02;
+		ctmp = tolower(param_getchar(Cmd, i));
+		if (ctmp == 'h') return usage_hf_14a_sniff();
+		if (ctmp == 'c') param |= 0x01;
+		if (ctmp == 'r') param |= 0x02;
 	}
 	UsbCommand c = {CMD_SNOOP_ISO_14443a, {param, 0, 0}};
 	clearCommandBuffer();
diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index 1fe44de0e..d8a212130 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -686,7 +686,6 @@ int CmdHF15Dump(const char*Cmd) {
 		
 		fptr += sprintf(fptr, "hf-15-"); 
 		FillFileNameByUID(fptr,uid,"-dump",sizeof(uid));
-
 	}	
 	// detect blocksize from card :)
 	
diff --git a/client/cmdhffelica.c b/client/cmdhffelica.c
index 25baca523..e8eeceb5e 100644
--- a/client/cmdhffelica.c
+++ b/client/cmdhffelica.c
@@ -350,8 +350,8 @@ uint16_t PrintFliteBlock(uint16_t tracepos, uint8_t *trace,uint16_t tracelen) {
 
 int CmdHFFelicaDumpLite(const char *Cmd) {
 
-	char ctmp = param_getchar(Cmd, 0);
-	if ( ctmp == 'h' || ctmp == 'H') return usage_hf_felica_dumplite();
+	char ctmp = tolower(param_getchar(Cmd, 0));
+	if ( ctmp == 'h') return usage_hf_felica_dumplite();
 
 	PrintAndLogEx(SUCCESS, "FeliCa lite - dump started");
 	PrintAndLogEx(SUCCESS, "press pm3-button to cancel");

From 8792849732313d7625dcfcd499c0d968ba041a3b Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sun, 23 Sep 2018 20:56:33 +0200
Subject: [PATCH 0071/1938] text

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f1f9702a..b0e2cdec9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,8 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [unreleased][unreleased]
+ - Added 'sc brute' - a naive SFI bruteforcer for contact smartcards (RDV40) (@iceman)
+ - Change 'lf t55xx detectconfig' - now optional to persist settings to flashmem (RDV40) (@iceman)
  - Change 'hf mf csave' - now saves both EML/BIN formats (@iceman)
  - Change 'hf mf esave' - now saves both EML/BIN formats (@iceman)
  - Fix 'compiler warning on macos and gcc7.1 or higher'  (@TomHarkness)

From 97c0729289299ab247ed7b277db8fc22158cba05 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Tue, 25 Sep 2018 02:54:51 +0200
Subject: [PATCH 0072/1938] fix: 'sc raw t' - tlv decoding work again chg: 'sc
 brute' - now decodes TLV by default the found SFI chg: 'sc raw' - better
 detection on armside when failing

---
 client/cmdsmartcard.c | 47 ++++++++++++++++++++++++++++++++++---------
 common/i2c.c          | 35 +++++++++-----------------------
 2 files changed, 47 insertions(+), 35 deletions(-)

diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index e6374db9e..f60e04e06 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -72,6 +72,24 @@ int usage_sm_brute(void) {
 	return 0;
 }
 
+static bool smart_select(bool silent) {
+	UsbCommand c = {CMD_SMART_ATR, {0, 0, 0}};
+	clearCommandBuffer();
+	SendCommand(&c);
+	UsbCommand resp;
+	if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2500) ) {
+		if (!silent) PrintAndLogEx(WARNING, "smart card select failed");
+		return false;
+	}
+	
+	uint8_t isok = resp.arg[0] & 0xFF;
+	if (!isok) {
+		if (!silent) PrintAndLogEx(WARNING, "smart card select failed");
+		return false;
+	}	
+	return true;
+}
+
 static int smart_wait(uint8_t *data) {
 	UsbCommand resp;
 	if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
@@ -85,7 +103,7 @@ static int smart_wait(uint8_t *data) {
 		return -2;			
 	}
 	memcpy(data, resp.d.asBytes, len);	
-	PrintAndLogEx(SUCCESS, "%s", sprint_hex_inrow_ex(data,  len, 32));	
+	PrintAndLogEx(SUCCESS, " %d | %s", len, sprint_hex_inrow_ex(data,  len, 32));
 
 	if (len >= 2) {		
 		PrintAndLogEx(SUCCESS, "%02X%02X | %s", data[len - 2], data[len - 1], GetAPDUCodeDescription(data[len - 2], data[len - 1])); 
@@ -197,7 +215,7 @@ int CmdSmartRaw(const char *Cmd) {
 	// reading response from smart card
 	if ( reply ) {
 
-		uint8_t* buf = malloc(USB_CMD_DATA_SIZE);
+		uint8_t* buf = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
 		if ( !buf )
 			return 1;		
 		
@@ -208,9 +226,9 @@ int CmdSmartRaw(const char *Cmd) {
 		}
 
 		// TLV decoder
-		if (decodeTLV && len > 4) {
-			TLVPrintFromBuffer(buf+1, len-2);
-		}
+		if (decodeTLV && len > 4)
+			TLVPrintFromBuffer(buf+1, len-3);
+
 		free(buf);
 	}
 	return 0;
@@ -477,17 +495,22 @@ int CmdSmartBruteforceSFI(const char *Cmd) {
 
 	char ctmp = tolower(param_getchar(Cmd, 0));
 	if (ctmp == 'h') return usage_sm_brute();
-
+	
+	
 	uint8_t data[5] = {0x00, 0xB2, 0x00, 0x00, 0x00};
 
-	PrintAndLogEx(INFO, "Selecting");
+	PrintAndLogEx(INFO, "Selecting card");
+	if ( !smart_select(false) ) {
+		return 1;
+	}
+	
+	PrintAndLogEx(INFO, "Selecting PPSE aid");
 	CmdSmartRaw("d 00a404000e325041592e5359532e444446303100");
 	CmdSmartRaw("d 00a4040007a000000004101000");
 	
 	PrintAndLogEx(INFO, "starting");
 	
-	UsbCommand c = {CMD_SMART_RAW, {SC_RAW, sizeof(data), 0}};
-
+	UsbCommand c = {CMD_SMART_RAW, {SC_RAW, sizeof(data), 0}};	
 	uint8_t* buf = malloc(USB_CMD_DATA_SIZE);
 	if ( !buf )
 		return 1;		
@@ -511,8 +534,12 @@ int CmdSmartBruteforceSFI(const char *Cmd) {
 				memcpy(c.d.asBytes, data, sizeof(data) );
 				clearCommandBuffer();
 				SendCommand(&c);
-				smart_response(buf);
+				uint8_t len = smart_response(buf);
 				
+				// TLV decoder
+				if (len > 4)
+					TLVPrintFromBuffer(buf+1, len-3);
+	
 				data[4] = 0;
 			}
 			memset(buf, 0x00, USB_CMD_DATA_SIZE);
diff --git a/common/i2c.c b/common/i2c.c
index 262fd832a..794564de3 100644
--- a/common/i2c.c
+++ b/common/i2c.c
@@ -34,38 +34,29 @@ volatile unsigned long c;
 void __attribute__((optimize("O0"))) I2CSpinDelayClk(uint16_t delay) {
 	for (c = delay * 2; c; c--) {};
 }
-				  
-//	ͨѶ�ӳٺ���			ommunication delay function	
+
 #define I2C_DELAY_1CLK 		I2CSpinDelayClk(1)
 #define I2C_DELAY_2CLK		I2CSpinDelayClk(2)
 #define I2C_DELAY_XCLK(x)	I2CSpinDelayClk((x))
 
-
 #define  ISO7618_MAX_FRAME 255
 
 void I2C_init(void) {
-	// ���ø�λ���ţ��ر����������������Ĭ�ϸ�
 	// Configure reset pin, close up pull up, push-pull output, default high
 	AT91C_BASE_PIOA->PIO_PPUDR = GPIO_RST;
 	AT91C_BASE_PIOA->PIO_MDDR = GPIO_RST;
   
-	// ���� I2C ���ţ�������������©���
 	// Configure I2C pin, open up, open leakage
 	AT91C_BASE_PIOA->PIO_PPUER |= (GPIO_SCL | GPIO_SDA);	// ������  Open up the pull up
 	AT91C_BASE_PIOA->PIO_MDER |= (GPIO_SCL | GPIO_SDA);
 
-	// Ĭ��������ȫ������
 	// default three lines all pull up
 	AT91C_BASE_PIOA->PIO_SODR |= (GPIO_SCL | GPIO_SDA | GPIO_RST);
 
-	// �������
-	// allow output
 	AT91C_BASE_PIOA->PIO_OER |= (GPIO_SCL | GPIO_SDA | GPIO_RST);
 	AT91C_BASE_PIOA->PIO_PER |= (GPIO_SCL | GPIO_SDA | GPIO_RST);
 }
 
-
-// ���ø�λ״̬
 // set the reset state
 void I2C_SetResetStatus(uint8_t LineRST, uint8_t LineSCK, uint8_t LineSDA) {
 	if (LineRST)
@@ -84,7 +75,6 @@ void I2C_SetResetStatus(uint8_t LineRST, uint8_t LineSCK, uint8_t LineSDA) {
 		LOW(GPIO_SDA);
 }
 
-// �����������
 // Reset the SIM_Adapter, then  enter the main program
 // Note: the SIM_Adapter will not enter the main program after power up. Please run this function before use SIM_Adapter.
 void I2C_Reset_EnterMainProgram(void) {
@@ -96,9 +86,8 @@ void I2C_Reset_EnterMainProgram(void) {
 	SpinDelay(10);
 }
 
-// ��λ��������ģʽ
 // Reset the SIM_Adapter, then enter the bootloader program
-// Reserve��For firmware update.
+// Reserve for firmware update.
 void I2C_Reset_EnterBootloader(void) {
 	I2C_SetResetStatus(0, 1, 1);
 	SpinDelay(100);
@@ -106,7 +95,6 @@ void I2C_Reset_EnterBootloader(void) {
 	SpinDelay(10);
 }
 
-//	�ȴ�ʱ�ӱ��	
 // Wait for the clock to go High.	
 bool WaitSCL_H_delay(uint32_t delay) {
 	while (delay--)	{
@@ -301,7 +289,6 @@ bool I2C_WriteCmd(uint8_t device_cmd, uint8_t device_address) {
 	return true;
 }
 
-// д��1�ֽ����� ����д�����ݣ���д���ַ���������ͣ�
 // Sends 1 byte data (Data to be written, command to be written , SlaveDevice address  ).
 bool I2C_WriteByte(uint8_t data, uint8_t device_cmd, uint8_t device_address) {
 	bool bBreak = true;
@@ -332,8 +319,7 @@ bool I2C_WriteByte(uint8_t data, uint8_t device_cmd, uint8_t device_address) {
 	return true;
 }
 
-//	д��1�����ݣ���д�������ַ����д�볤�ȣ���д���ַ���������ͣ�	
-//Sends a string of data (Array, length, command to be written , SlaveDevice address  ).
+//Sends array of data (Array, length, command to be written , SlaveDevice address  ).
 // len = uint8 (max buffer to write 256bytes)
 bool I2C_BufferWrite(uint8_t *data, uint8_t len, uint8_t device_cmd, uint8_t device_address) {
 	bool bBreak = true;
@@ -371,8 +357,7 @@ bool I2C_BufferWrite(uint8_t *data, uint8_t len, uint8_t device_cmd, uint8_t dev
 	return true;	
 }
 
-// ����1�����ݣ���Ŷ������ݣ����������ȣ���������ַ���������ͣ�
-// read 1 strings of data (Data array, Readout length, command to be written , SlaveDevice address  ).
+// read one array of data (Data array, Readout length, command to be written , SlaveDevice address  ).
 // len = uint8 (max buffer to read 256bytes)
 int16_t I2C_BufferRead(uint8_t *data, uint8_t len, uint8_t device_cmd, uint8_t device_address) {
 
@@ -460,12 +445,10 @@ int16_t I2C_ReadFW(uint8_t *data, uint8_t len, uint8_t msb, uint8_t lsb, uint8_t
 		if (!I2C_WaitAck())
 			break;
 
-		// msb
 		I2C_SendByte(msb);
 		if (!I2C_WaitAck())
 			break;
 
-		// lsb
 		I2C_SendByte(lsb);
 		if (!I2C_WaitAck())
 			break;
@@ -522,12 +505,10 @@ bool I2C_WriteFW(uint8_t *data, uint8_t len, uint8_t msb, uint8_t lsb, uint8_t d
 		if (!I2C_WaitAck())
 			break;
 		
-		// msb
 		I2C_SendByte(msb);
 		if (!I2C_WaitAck())
 			break;
 
-		// lsb
 		I2C_SendByte(lsb);
 		if (!I2C_WaitAck())
 			break;
@@ -698,8 +679,12 @@ void SmartCardRaw( uint64_t arg0, uint64_t arg1, uint8_t *data ) {
 				
 		// read bytes from module
 		len = ISO7618_MAX_FRAME;
-		sc_rx_bytes(resp, &len);
-		LogTrace(resp, len, 0, 0, NULL, false);
+		bool res = sc_rx_bytes(resp, &len);
+		if ( res ) {
+			LogTrace(resp, len, 0, 0, NULL, false);
+		} else {
+			len = 0;
+		}
 	}
 OUT:	
 	cmd_send(CMD_ACK, len, 0, 0, resp, len);

From 7d09a466fb67d3115d790dc7b406a2a093bdb96c Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sat, 6 Oct 2018 13:29:20 +0200
Subject: [PATCH 0073/1938] FIX: OSX disable app-nap during serial comm  
 (@anticat) https://github.com/Proxmark/proxmark3/pull/687

---
 CHANGELOG.md         |  1 +
 client/Makefile      | 19 ++++++++++++++-----
 client/comms.c       | 10 ++++++++++
 client/comms.h       |  1 +
 client/util_darwin.c | 40 ++++++++++++++++++++++++++++++++++++++++
 client/util_darwin.h | 17 +++++++++++++++++
 6 files changed, 83 insertions(+), 5 deletions(-)
 create mode 100644 client/util_darwin.c
 create mode 100644 client/util_darwin.h

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0e2cdec9..e2648fedb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [unreleased][unreleased]
+ - Implemented AppNap API, fixing #283 and #627 OSX USB comm issues (AntiCat)
  - Added 'sc brute' - a naive SFI bruteforcer for contact smartcards (RDV40) (@iceman)
  - Change 'lf t55xx detectconfig' - now optional to persist settings to flashmem (RDV40) (@iceman)
  - Change 'hf mf csave' - now saves both EML/BIN formats (@iceman)
diff --git a/client/Makefile b/client/Makefile
index a1d06eb76..31c9c6a2d 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -34,9 +34,11 @@ LUAPLATFORM = generic
 platform = $(shell uname)
 ifneq (,$(findstring MINGW,$(platform))) 
     LUAPLATFORM = mingw
-    else
+else
 	ifeq ($(platform),Darwin)
     LUAPLATFORM = macosx
+	OBJCSRCS = util_darwin.m
+	LDFLAGS += -framework Foundation	
 else
     LUALIB +=  -ldl
     LDLIBS +=  -ltermcap -lncurses
@@ -223,6 +225,7 @@ QTGUISRCS = proxgui.cpp proxguiqt.cpp proxguiqt.moc.cpp guidummy.cpp
 
 COREOBJS = $(CORESRCS:%.c=$(OBJDIR)/%.o)
 CMDOBJS = $(CMDSRCS:%.c=$(OBJDIR)/%.o)
+OBJCOBJS = $(OBJCSRCS:%.m=$(OBJDIR)/%.o)
 ZLIBOBJS = $(ZLIBSRCS:%.c=$(OBJDIR)/%.o)
 MULTIARCHOBJS = $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_NOSIMD.o) \
 			$(MULTIARCHSRCS:%.c=$(OBJDIR)/%_MMX.o) \
@@ -249,7 +252,7 @@ endif
 
 BINS = proxmark3 flasher fpga_compress
 WINBINS = $(patsubst %, %.exe, $(BINS))
-CLEAN = $(BINS) $(WINBINS) $(COREOBJS) $(CMDOBJS) $(ZLIBOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(OBJDIR)/*.o *.moc.cpp ui/ui_overlays.h lualibs/usb_cmd.lua lualibs/mf_default_keys.lua
+CLEAN = $(BINS) $(WINBINS) $(COREOBJS) $(CMDOBJS) $(OBJCOBJS) $(ZLIBOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(OBJDIR)/*.o *.moc.cpp ui/ui_overlays.h lualibs/usb_cmd.lua lualibs/mf_default_keys.lua
 
 # need to assign dependancies to build these first...
 all: lua_build $(BINS) 
@@ -258,10 +261,10 @@ all-static: LDLIBS:=-static $(LDLIBS)
 all-static: proxmark3 flasher fpga_compress
 
 proxmark3: LDLIBS+=$(LUALIB) $(QTLDLIBS)
-proxmark3: $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(ZLIBOBJS) lualibs/usb_cmd.lua lualibs/mf_default_keys.lua
-	$(LD) $(LDFLAGS) $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(ZLIBOBJS) $(LDLIBS)  -o $@
+proxmark3: $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(OBJCOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(ZLIBOBJS) lualibs/usb_cmd.lua lualibs/mf_default_keys.lua
+	$(LD) $(LDFLAGS) $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(OBJCOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(ZLIBOBJS) $(LDLIBS)  -o $@
 	
-flasher: $(OBJDIR)/flash.o $(OBJDIR)/flasher.o $(COREOBJS)
+flasher: $(OBJDIR)/flash.o $(OBJDIR)/flasher.o $(COREOBJS) $(OBJCOBJS)
 	$(LD) $(LDFLAGS) $^ $(LDLIBS) -o $@
 
 fpga_compress: $(OBJDIR)/fpga_compress.o $(ZLIBOBJS)
@@ -325,6 +328,11 @@ $(OBJDIR)/%.o : %.cpp $(OBJDIR)/%.d
 	$(CXX) $(DEPFLAGS) $(CXXFLAGS) $(QTINCLUDES) -c -o $@ $<
 	$(POSTCOMPILE)
 
+%.o: %.m
+$(OBJDIR)/%.o : %.m $(OBJDIR)/%.d
+	$(CC) $(DEPFLAGS) $(CFLAGS) -c -o $@ $<
+	$(POSTCOMPILE)
+	
 #$(CMDOBJS) $(COREOBJS): $(notdir $(%.c)) %.d
 #	$(CC) $(DEPFLAGS) $(CFLAGS) -c -o $@ $<
 #	$(POSTCOMPILE)
@@ -339,6 +347,7 @@ $(OBJDIR)/%.o : %.cpp $(OBJDIR)/%.d
 
 DEPENDENCY_FILES = $(patsubst %.c, $(OBJDIR)/%.d, $(CORESRCS) $(CMDSRCS) $(ZLIBSRCS) $(MULTIARCHSRCS)) \
 	$(patsubst %.cpp, $(OBJDIR)/%.d, $(QTGUISRCS)) \
+	$(patsubst %.m, $(OBJDIR)/%.d, $(OBJCSRCS)) \
 	$(OBJDIR)/proxmark3.d $(OBJDIR)/flash.d $(OBJDIR)/flasher.d $(OBJDIR)/fpga_compress.d
 
 $(DEPENDENCY_FILES): ;
diff --git a/client/comms.c b/client/comms.c
index 21d9ad4a7..e297e9057 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -242,6 +242,11 @@ __attribute__((force_align_arg_pointer))
 	UsbCommand *prx = &rx;
 	
 	//int counter_to_offline = 0;
+
+#if defined(__MACH__) && defined(__APPLE__)
+	disableAppNap("Proxmark3 polling UART");
+#endif
+	
 	
 	while (conn->run) {
 		rxlen = 0;
@@ -288,6 +293,11 @@ __attribute__((force_align_arg_pointer))
 	// when this reader thread dies, we close the serial port.
 	uart_close(sp);
 	sp = NULL;
+
+#if defined(__MACH__) && defined(__APPLE__)
+	enableAppNap();
+#endif
+
 	
 	pthread_exit(NULL);
 	return NULL;
diff --git a/client/comms.h b/client/comms.h
index eba0d45d5..e311f5e0c 100644
--- a/client/comms.h
+++ b/client/comms.h
@@ -21,6 +21,7 @@
 #include "common.h"
 #include "util_posix.h"
 #include "util.h" 
+#include "util_darwin.h"
 
 #if defined(__linux__) && !defined(NO_UNLINK)
 #include <unistd.h>		// for unlink()
diff --git a/client/util_darwin.c b/client/util_darwin.c
new file mode 100644
index 000000000..d07ebebc4
--- /dev/null
+++ b/client/util_darwin.c
@@ -0,0 +1,40 @@
+//-----------------------------------------------------------------------------
+// (c) 2018 AntiCat
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// macOS framework bindings
+//-----------------------------------------------------------------------------
+
+#import "util_darwin.h"
+
+#import <Foundation/NSString.h>
+#import <Foundation/NSProcessInfo.h>
+
+static id activity = nil;
+
+//OS X Version 10.10 is defined in OS X 10.10 and later
+#if defined(MAC_OS_X_VERSION_10_10)
+void disableAppNap(const char* reason) {
+	if(activity == nil) {
+		//NSLog(@"disableAppNap: %@", @(reason));
+		activity = [[NSProcessInfo processInfo] beginActivityWithOptions:NSActivityBackground reason:@(reason)];
+		[activity retain];
+	}
+}
+
+void enableAppNap() {
+	if(activity != nil) {
+		//NSLog(@"enableAppNap");
+		[[NSProcessInfo processInfo] endActivity:activity];
+		[activity release];
+		activity = nil;
+	}
+}
+
+#else
+void disableAppNap(const char* reason) { }
+void enableAppNap() { }
+#endif
diff --git a/client/util_darwin.h b/client/util_darwin.h
new file mode 100644
index 000000000..923a4dfc0
--- /dev/null
+++ b/client/util_darwin.h
@@ -0,0 +1,17 @@
+//-----------------------------------------------------------------------------
+// (c) 2018 AntiCat
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// macOS framework bindings
+//-----------------------------------------------------------------------------
+
+#ifndef UTIL_DARWIN_H__
+#define UTIL_DARWIN_H__
+
+void disableAppNap(const char* reason);
+void enableAppNap();
+
+#endif
\ No newline at end of file

From 2a24f97355c8f7ee417e1369015c6ac0a7fd2717 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sat, 6 Oct 2018 14:52:50 +0200
Subject: [PATCH 0074/1938] chg:  using three spaces instead of tabs for
 intendention

---
 client/emv/dump.c     | 2 +-
 client/emv/emv_tags.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/emv/dump.c b/client/emv/dump.c
index a699b188d..47de7c3c2 100644
--- a/client/emv/dump.c
+++ b/client/emv/dump.c
@@ -20,7 +20,7 @@
 #include "dump.h"
 
 
-#define PRINT_INDENT(level) 	{for (int i = 0; i < (level); i++) fprintf(f, "\t");}
+#define PRINT_INDENT(level) 	{for (int i = 0; i < (level); i++) fprintf(f, "   ");}
 
 void dump_buffer_simple(const unsigned char *ptr, size_t len, FILE *f)
 {
diff --git a/client/emv/emv_tags.c b/client/emv/emv_tags.c
index a29b15048..fdccb8923 100644
--- a/client/emv/emv_tags.c
+++ b/client/emv/emv_tags.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#define PRINT_INDENT(level) 	{for (int i = 0; i < (level); i++) fprintf(f, "\t");}
+#define PRINT_INDENT(level) 	{for (int i = 0; i < (level); i++) fprintf(f, "   ");}
 
 enum emv_tag_t {
 	EMV_TAG_GENERIC,

From 61d7f74ab9b5ba1520717003d64e746324cb453a Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sat, 6 Oct 2018 14:53:21 +0200
Subject: [PATCH 0075/1938] chg: code clean up

---
 client/emv/cmdemv.c | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index abe4c4727..5ff31770d 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -215,24 +215,19 @@ int CmdHFEMVPPSE(const char *cmd) {
 	while(param_getchar(cmd, cmdp) != 0x00) {
 		char c = param_getchar(cmd, cmdp);
 		if ((c == '-') && (param_getlength(cmd, cmdp) == 2))
-			switch (param_getchar_indx(cmd, 1, cmdp)) {
+			switch (tolower(param_getchar_indx(cmd, 1, cmdp))) {
 				case 'h':
-				case 'H':
 					return usage_emv_ppse();
 				case 's':
-				case 'S':
 					activateField = true;
 					break;
 				case 'k':
-				case 'K':
 					leaveSignalON = true;
 					break;
 				case 'a':
-				case 'A':
 					SetAPDULogging(true);
 					break;
 				case 't':
-				case 'T':
 					decodeTLV = true;
 					break;
 				case '1':
@@ -316,40 +311,31 @@ int CmdHFEMVExec(const char *cmd) {
 	while(param_getchar(cmd, cmdp) != 0x00) {
 		char c = param_getchar(cmd, cmdp);
 		if ((c == '-') && (param_getlength(cmd, cmdp) == 2))
-			switch (param_getchar_indx(cmd, 1, cmdp)) {
+			switch (tolower(param_getchar_indx(cmd, 1, cmdp))) {
 				case 'h':
-				case 'H':
 					return usage_emv_exec();
 				case 's':
-				case 'S':
 					activateField = true;
 					break;
 				case 'a':
-				case 'A':
 					showAPDU = true;
 					break;
 				case 't':
-				case 'T':
 					decodeTLV = true;
 					break;
 				case 'f':
-				case 'F':
 					forceSearch = true;
 					break;
 				case 'x':
-				case 'X':
 					TrType = TT_VSDC;
 					break;
 				case 'v':
-				case 'V':
 					TrType = TT_QVSDCMCHIP;
 					break;
 				case 'c':
-				case 'C':
 					TrType = TT_CDA;
 					break;
 				case 'g':
-				case 'G':
 					GenACGPO = true;
 					break;
 				default:

From 1fb121474e89e321ba79718ac395899573a4bf62 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sun, 7 Oct 2018 09:01:24 +0200
Subject: [PATCH 0076/1938] osx: fix annoying focus behaviour   (@anticat)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/Proxmark/proxmark3/pull/689

OS X has a global menu bar and a per app dock icon. Therefore, all
GUI applications launched from a terminal will become focused - even
if they don’t show any windows. Thereby the terminal loses focus.

Since is it very annoying to re-focus the terminal after each proxmark
client launch, this change makes the client unfocusable during launch
and restores the regular behaviour when a window is created.
---
 client/Makefile                         |  2 +-
 client/proxguiqt.cpp                    | 19 +++++++++++++++++--
 client/util_darwin.h                    |  2 ++
 client/{util_darwin.c => util_darwin.m} | 15 +++++++++++++++
 4 files changed, 35 insertions(+), 3 deletions(-)
 rename client/{util_darwin.c => util_darwin.m} (75%)

diff --git a/client/Makefile b/client/Makefile
index 31c9c6a2d..4d0312e80 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -38,7 +38,7 @@ else
 	ifeq ($(platform),Darwin)
     LUAPLATFORM = macosx
 	OBJCSRCS = util_darwin.m
-	LDFLAGS += -framework Foundation	
+	LDFLAGS += -framework Foundation -framework AppKit	
 else
     LUALIB +=  -ldl
     LDLIBS +=  -ltermcap -lncurses
diff --git a/client/proxguiqt.cpp b/client/proxguiqt.cpp
index 56de71b24..296862e65 100644
--- a/client/proxguiqt.cpp
+++ b/client/proxguiqt.cpp
@@ -27,6 +27,10 @@
 #include "proxgui.h"
 #include <QtGui>
 
+extern "C" {
+#include "util_darwin.h"
+}
+
 bool g_useOverlays = false;
 int g_absVMax = 0;
 int startMax;
@@ -53,9 +57,14 @@ void ProxGuiQT::_ShowGraphWindow(void) {
 	if(!plotapp)
 		return;
 
-	if (!plotwidget)
+	if (!plotwidget) {
+		
+#if defined(__MACH__) && defined(__APPLE__)
+		makeFocusable();
+#endif	
+	
 		plotwidget = new ProxWidget();
-
+	}
 	plotwidget->show();
 }
 
@@ -100,6 +109,12 @@ void ProxGuiQT::MainLoop()
 	//start proxmark thread after starting event loop
 	QTimer::singleShot(200, this, SLOT(_StartProxmarkThread()));
 
+#if defined(__MACH__) && defined(__APPLE__)
+	//Prevent the terminal from loosing focus during launch by making the client unfocusable
+	makeUnfocusable();
+#endif
+
+	
 	plotapp->exec();
 }
 
diff --git a/client/util_darwin.h b/client/util_darwin.h
index 923a4dfc0..c69a551d3 100644
--- a/client/util_darwin.h
+++ b/client/util_darwin.h
@@ -13,5 +13,7 @@
 
 void disableAppNap(const char* reason);
 void enableAppNap();
+void makeUnfocusable();
+void makeFocusable();
 
 #endif
\ No newline at end of file
diff --git a/client/util_darwin.c b/client/util_darwin.m
similarity index 75%
rename from client/util_darwin.c
rename to client/util_darwin.m
index d07ebebc4..9d7583903 100644
--- a/client/util_darwin.c
+++ b/client/util_darwin.m
@@ -12,6 +12,7 @@
 
 #import <Foundation/NSString.h>
 #import <Foundation/NSProcessInfo.h>
+#import <AppKit/NSApplication.h>
 
 static id activity = nil;
 
@@ -38,3 +39,17 @@ void enableAppNap() {
 void disableAppNap(const char* reason) { }
 void enableAppNap() { }
 #endif
+
+
+//OS X Version 10.6 is defined in OS X 10.6 and later
+#if defined(MAC_OS_X_VERSION_10_6)
+void makeUnfocusable() {
+	[NSApp setActivationPolicy:NSApplicationActivationPolicyProhibited];
+}
+void makeFocusable() {
+	[NSApp setActivationPolicy:NSApplicationActivationPolicyRegular];
+}
+#else
+void makeUnfocusable() { }
+void makeFocusable() { }
+#endif
\ No newline at end of file

From 642e5e906c5d5739804578c377d5288db49a5275 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sun, 7 Oct 2018 09:04:59 +0200
Subject: [PATCH 0077/1938] textual

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e2648fedb..848fe6832 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,8 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [unreleased][unreleased]
- - Implemented AppNap API, fixing #283 and #627 OSX USB comm issues (AntiCat)
+ - Fix 'annoying focus behaviour' on OSX  (@Anticat)
+ - Implemented AppNap API, fixing #283 and #627 OSX USB comm issues (@AntiCat)
  - Added 'sc brute' - a naive SFI bruteforcer for contact smartcards (RDV40) (@iceman)
  - Change 'lf t55xx detectconfig' - now optional to persist settings to flashmem (RDV40) (@iceman)
  - Change 'hf mf csave' - now saves both EML/BIN formats (@iceman)

From 769dee7e7a8d8baa6e82a502cc263bace87ff789 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sun, 7 Oct 2018 12:17:21 +0200
Subject: [PATCH 0078/1938] Fix: ControlWidget placement

https://github.com/iceman1001/proxmark3/pull/258
---
 CHANGELOG.md         |  1 +
 client/proxguiqt.cpp | 21 +++++++--------------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 848fe6832..20f1c1f8f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [unreleased][unreleased]
+ - Fix 'Lining up plot and control window' (@anticat)
  - Fix 'annoying focus behaviour' on OSX  (@Anticat)
  - Implemented AppNap API, fixing #283 and #627 OSX USB comm issues (@AntiCat)
  - Added 'sc brute' - a naive SFI bruteforcer for contact smartcards (RDV40) (@iceman)
diff --git a/client/proxguiqt.cpp b/client/proxguiqt.cpp
index 296862e65..15f036b79 100644
--- a/client/proxguiqt.cpp
+++ b/client/proxguiqt.cpp
@@ -172,8 +172,7 @@ ProxWidget::ProxWidget(QWidget *parent, ProxGuiQT *master) : QWidget(parent) {
 	this->master = master;
 	resize(800,500);
 
-	/** Setup the controller widget **/
-
+	// Setup the controller widget
 	controlWidget = new QWidget();
 	opsController = new Ui::Form();
 	opsController->setupUi(controlWidget);
@@ -195,23 +194,17 @@ ProxWidget::ProxWidget(QWidget *parent, ProxGuiQT *master) : QWidget(parent) {
 	QObject::connect(opsController->horizontalSlider_dirthr_down, SIGNAL(valueChanged(int)), this, SLOT(vchange_dthr_down(int)));
 	QObject::connect(opsController->horizontalSlider_askedge, SIGNAL(valueChanged(int)), this, SLOT(vchange_askedge(int)));
 
-	controlWidget->show();
-
 	// Set up the plot widget, which does the actual plotting
-
 	plot = new Plot(this);
-	/*
-	QSlider* slider = new QSlider(Qt::Horizontal);
-	slider->setFocusPolicy(Qt::StrongFocus);
-	slider->setTickPosition(QSlider::TicksBothSides);
-	slider->setTickInterval(10);
-	slider->setSingleStep(1);
-	*/
 	QVBoxLayout *layout = new QVBoxLayout;
-	//layout->addWidget(slider);
 	layout->addWidget(plot);
 	setLayout(layout);
-	//printf("Proxwidget Constructor just set layout\r\n");
+	show(); // places the window on the screen.
+
+	// Move controller widget below plot
+	controlWidget->move(x(),y()+frameSize().height());
+	controlWidget->resize(size().width(), controlWidget->size().height());
+	controlWidget->show();
 }
 
 // not 100% sure what i need in this block

From 29982a6cdc77e7770a248e8626e71f44ef45b239 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sun, 7 Oct 2018 12:32:14 +0200
Subject: [PATCH 0079/1938] CHG: 'make control widget smaller'

---
 client/proxguiqt.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/proxguiqt.cpp b/client/proxguiqt.cpp
index 15f036b79..c8ccba197 100644
--- a/client/proxguiqt.cpp
+++ b/client/proxguiqt.cpp
@@ -170,7 +170,7 @@ void ProxWidget::vchange_dthr_down(int v) {
 }
 ProxWidget::ProxWidget(QWidget *parent, ProxGuiQT *master) : QWidget(parent) {
 	this->master = master;
-	resize(800,500);
+	resize(800, 400);
 
 	// Setup the controller widget
 	controlWidget = new QWidget();
@@ -203,7 +203,7 @@ ProxWidget::ProxWidget(QWidget *parent, ProxGuiQT *master) : QWidget(parent) {
 
 	// Move controller widget below plot
 	controlWidget->move(x(),y()+frameSize().height());
-	controlWidget->resize(size().width(), controlWidget->size().height());
+	controlWidget->resize(size().width(), 200);
 	controlWidget->show();
 }
 
@@ -553,7 +553,7 @@ Plot::Plot(QWidget *parent) : QWidget(parent), GraphStart(0), GraphPixelsPerPoin
 {
 	//Need to set this, otherwise we don't receive keypress events
 	setFocusPolicy( Qt::StrongFocus);
-	resize(600, 300);
+	resize(400, 200);
 
 	QPalette palette(QColor(0,0,0,0));
 	palette.setColor(QPalette::WindowText, QColor(255,255,255));

From 6e1f757047ace3dcabaf3f1a47f14ccf7134b27c Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sun, 7 Oct 2018 16:17:25 +0200
Subject: [PATCH 0080/1938] fix:  warning about %lu  in gcc 8.2.0

---
 client/fpga_compress.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/fpga_compress.c b/client/fpga_compress.c
index 5020914ae..ee9003581 100644
--- a/client/fpga_compress.c
+++ b/client/fpga_compress.c
@@ -97,11 +97,11 @@ int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile, bool hardn
 	i = 0;
 	do {
 
-		if (i >= num_infiles * (hardnested_mode?HARDNESTED_TABLE_SIZE:FPGA_CONFIG_SIZE)) {
+		if (i >= num_infiles * (hardnested_mode ? HARDNESTED_TABLE_SIZE : FPGA_CONFIG_SIZE)) {
 			if (hardnested_mode) {
-				fprintf(stderr, "Input file too big (> %lu bytes). This is probably not a hardnested bitflip state table.\n", HARDNESTED_TABLE_SIZE);
+				fprintf(stderr, "Input file too big (> %llu bytes). This is probably not a hardnested bitflip state table.\n", HARDNESTED_TABLE_SIZE);
 			} else {
-				fprintf(stderr, "Input files too big (total > %lu bytes). These are probably not PM3 FPGA config files.\n", num_infiles*FPGA_CONFIG_SIZE);
+				fprintf(stderr, "Input files too big (total > %llu bytes). These are probably not PM3 FPGA config files.\n", num_infiles * FPGA_CONFIG_SIZE);
 			}
 			for(uint16_t j = 0; j < num_infiles; j++) {
 				fclose(infile[j]);

From 3d312723404a4f7cb08f8c3b6080ddd089b90399 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sun, 7 Oct 2018 16:19:45 +0200
Subject: [PATCH 0081/1938] fix gcc8.2.0

---
 client/fpga_compress.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/fpga_compress.c b/client/fpga_compress.c
index ee9003581..ce0f41982 100644
--- a/client/fpga_compress.c
+++ b/client/fpga_compress.c
@@ -101,7 +101,7 @@ int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile, bool hardn
 			if (hardnested_mode) {
 				fprintf(stderr, "Input file too big (> %llu bytes). This is probably not a hardnested bitflip state table.\n", HARDNESTED_TABLE_SIZE);
 			} else {
-				fprintf(stderr, "Input files too big (total > %llu bytes). These are probably not PM3 FPGA config files.\n", num_infiles * FPGA_CONFIG_SIZE);
+				fprintf(stderr, "Input files too big (total > %lu bytes). These are probably not PM3 FPGA config files.\n", num_infiles * FPGA_CONFIG_SIZE);
 			}
 			for(uint16_t j = 0; j < num_infiles; j++) {
 				fclose(infile[j]);

From ab5233d29f1f2a51fde43ac2cd14e0212575028e Mon Sep 17 00:00:00 2001
From: merlokk <olegmsn@gmail.com>
Date: Thu, 11 Oct 2018 11:48:46 +0300
Subject: [PATCH 0082/1938] now it needs to resolve issues in reveng

---
 client/Makefile              |    3 +-
 client/cliparser/README.md   |   13 +
 client/cliparser/argtable3.c | 5004 ++++++++++++++++++++++++++++++++++
 client/cliparser/argtable3.h |  305 +++
 client/cliparser/cliparser.c |  188 ++
 client/cliparser/cliparser.h |   37 +
 client/cmdhf14a.c            |   89 +
 client/cmdhf14a.h            |    1 +
 client/cmdhfmf.c             |  144 +
 client/cmdhfmf.h             |    2 +
 client/obj/cliparser/.dummy  |    0
 client/reveng/cli.c          |    2 +-
 12 files changed, 5786 insertions(+), 2 deletions(-)
 create mode 100644 client/cliparser/README.md
 create mode 100644 client/cliparser/argtable3.c
 create mode 100644 client/cliparser/argtable3.h
 create mode 100644 client/cliparser/cliparser.c
 create mode 100644 client/cliparser/cliparser.h
 create mode 100644 client/obj/cliparser/.dummy

diff --git a/client/Makefile b/client/Makefile
index 4d0312e80..eaf846610 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -110,6 +110,8 @@ CMDSRCS =	crapto1/crapto1.c \
 			polarssl/sha1.c \
 			polarssl/sha256.c \
 			polarssl/base64.c \
+			cliparser/argtable3.c\
+			cliparser/cliparser.c\
 			loclass/cipher.c \
 			loclass/cipherutils.c \
 			loclass/ikeys.c \
@@ -203,7 +205,6 @@ CMDSRCS =	crapto1/crapto1.c \
 			reveng/bmpbit.c \
 			reveng/model.c \
 			reveng/poly.c \
-			reveng/getopt.c \
 			bucketsort.c
 
 cpu_arch = $(shell uname -m)
diff --git a/client/cliparser/README.md b/client/cliparser/README.md
new file mode 100644
index 000000000..2b321946f
--- /dev/null
+++ b/client/cliparser/README.md
@@ -0,0 +1,13 @@
+# Command line parser
+
+cliparser - librari for proxmark with command line parsing high level functions.
+
+## External libraries:
+
+### argtable
+
+Argtable3 is a single-file, ANSI C, command-line parsing library that parses GNU-style command-line options.
+
+You can download argtable3 from this repository https://github.com/argtable/argtable3
+
+[argtable3 license](https://github.com/argtable/argtable3/blob/master/LICENSE)
diff --git a/client/cliparser/argtable3.c b/client/cliparser/argtable3.c
new file mode 100644
index 000000000..38ce7a24f
--- /dev/null
+++ b/client/cliparser/argtable3.c
@@ -0,0 +1,5004 @@
+/*******************************************************************************
+ * This file is part of the argtable3 library.
+ *
+ * Copyright (C) 1998-2001,2003-2011,2013 Stewart Heitmann
+ * <sheitmann@users.sourceforge.net>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of STEWART HEITMANN nor the  names of its contributors
+ *       may be used to endorse or promote products derived from this software
+ *       without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL STEWART HEITMANN BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ******************************************************************************/
+
+#include "argtable3.h"
+
+// On Windows isspace crashes app in case of using Unicode character set and string to be above ASCII
+// so you have to use _istspace instead of space
+#ifdef UNICODE
+#include <tchar.h>
+    #define ISSPACE _istspace
+#else
+    #define ISSPACE isspace
+#endif
+
+/*******************************************************************************
+ * This file is part of the argtable3 library.
+ *
+ * Copyright (C) 2013 Tom G. Huang
+ * <tomghuang@gmail.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of STEWART HEITMANN nor the  names of its contributors
+ *       may be used to endorse or promote products derived from this software
+ *       without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL STEWART HEITMANN BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ******************************************************************************/
+
+#ifndef ARG_UTILS_H
+#define ARG_UTILS_H
+
+#define ARG_ENABLE_TRACE 0
+#define ARG_ENABLE_LOG 1
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+enum
+{
+    EMINCOUNT = 1,
+    EMAXCOUNT,
+    EBADINT,
+    // The same name define EOVERFLOW in errno.h on windows platform
+#ifdef __STDC_WANT_SECURE_LIB__
+    EOVERFLOW_,
+#else
+    EOVERFLOW,
+#endif
+    EBADDOUBLE,
+    EBADDATE,
+    EREGNOMATCH
+};
+
+
+#if defined(_MSC_VER)
+#define ARG_TRACE(x) \
+    __pragma(warning(push)) \
+    __pragma(warning(disable:4127)) \
+    do { if (ARG_ENABLE_TRACE) dbg_printf x; } while (0) \
+    __pragma(warning(pop))
+
+#define ARG_LOG(x) \
+    __pragma(warning(push)) \
+    __pragma(warning(disable:4127)) \
+    do { if (ARG_ENABLE_LOG) dbg_printf x; } while (0) \
+    __pragma(warning(pop))
+#else
+#define ARG_TRACE(x) \
+    do { if (ARG_ENABLE_TRACE) dbg_printf x; } while (0)
+
+#define ARG_LOG(x) \
+    do { if (ARG_ENABLE_LOG) dbg_printf x; } while (0)
+#endif 
+
+extern void dbg_printf(const char *fmt, ...);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
+/*******************************************************************************
+ * This file is part of the argtable3 library.
+ *
+ * Copyright (C) 1998-2001,2003-2011,2013 Stewart Heitmann
+ * <sheitmann@users.sourceforge.net>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of STEWART HEITMANN nor the  names of its contributors
+ *       may be used to endorse or promote products derived from this software
+ *       without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL STEWART HEITMANN BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ******************************************************************************/
+
+#include <stdarg.h>
+#include <stdio.h>
+
+
+void dbg_printf(const char *fmt, ...)
+{
+    va_list args;
+    va_start(args, fmt);
+    vfprintf(stderr, fmt, args);
+    va_end(args);
+}
+
+/*	$NetBSD: getopt.h,v 1.4 2000/07/07 10:43:54 ad Exp $	*/
+/*	$FreeBSD$ */
+
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
+ * Copyright (c) 2000 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Dieter Baron and Thomas Klausner.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _GETOPT_H_
+#define _GETOPT_H_
+
+#include <sys/cdefs.h>
+
+/*
+ * GNU-like getopt_long()/getopt_long_only() with 4.4BSD optreset extension.
+ * getopt() is declared here too for GNU programs.
+ */
+#define no_argument        0
+#define required_argument  1
+#define optional_argument  2
+
+struct option {
+	/* name of long option */
+	const char *name;
+	/*
+	 * one of no_argument, required_argument, and optional_argument:
+	 * whether option takes an argument
+	 */
+	int has_arg;
+	/* if not NULL, set *flag to val when option found */
+	int *flag;
+	/* if flag not NULL, value to set *flag to; else return value */
+	int val;
+};
+
+__BEGIN_DECLS
+int	getopt_long(int, char * const *, const char *,
+	const struct option *, int *);
+int	getopt_long_only(int, char * const *, const char *,
+	const struct option *, int *);
+#ifndef _GETOPT_DECLARED
+#define	_GETOPT_DECLARED
+int	 getopt(int, char * const [], const char *);
+
+extern char *optarg;			/* getopt(3) external variables */
+extern int optind, opterr, optopt;
+#endif
+#ifndef _OPTRESET_DECLARED
+#define	_OPTRESET_DECLARED
+extern int optreset;			/* getopt(3) external variable */
+#endif
+__END_DECLS
+ 
+#endif /* !_GETOPT_H_ */
+/*	$Id: getopt_long.c,v 1.1 2009/10/16 19:50:28 rodney Exp rodney $	*/
+/*	$OpenBSD: getopt_long.c,v 1.23 2007/10/31 12:34:57 chl Exp $	*/
+/*	$NetBSD: getopt_long.c,v 1.15 2002/01/31 22:43:40 tv Exp $	*/
+
+/*
+ * Copyright (c) 2002 Todd C. Miller <Todd.Miller@courtesan.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Sponsored in part by the Defense Advanced Research Projects
+ * Agency (DARPA) and Air Force Research Laboratory, Air Force
+ * Materiel Command, USAF, under agreement number F39502-99-1-0512.
+ */
+
+// $Id: getopt_long.c,v 1.1 2009/10/16 19:50:28 rodney Exp rodney $"
+
+/*-
+ * Copyright (c) 2000 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Dieter Baron and Thomas Klausner.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#if 0
+#include <err.h>
+#endif
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+
+
+#define	REPLACE_GETOPT		/* use this getopt as the system getopt(3) */
+
+#ifdef REPLACE_GETOPT
+int	opterr = 1;		/* if error message should be printed */
+int	optind = 1;		/* index into parent argv vector */
+int	optopt = '?';		/* character checked for validity */
+int	optreset;		/* reset getopt */
+char    *optarg;		/* argument associated with option */
+#endif
+
+#define PRINT_ERROR	((opterr) && (*options != ':'))
+
+#define FLAG_PERMUTE	0x01	/* permute non-options to the end of argv */
+#define FLAG_ALLARGS	0x02	/* treat non-options as args to option "-1" */
+#define FLAG_LONGONLY	0x04	/* operate as getopt_long_only */
+
+/* return values */
+#define	BADCH		(int)'?'
+#define	BADARG		((*options == ':') ? (int)':' : (int)'?')
+#define	INORDER 	(int)1
+
+#define	EMSG		""
+
+static int getopt_internal(int, char * const *, const char *,
+			   const struct option *, int *, int);
+static int parse_long_options(char * const *, const char *,
+			      const struct option *, int *, int);
+static int gcd(int, int);
+static void permute_args(int, int, int, char * const *);
+
+static char *place = EMSG; /* option letter processing */
+
+/* XXX: set optreset to 1 rather than these two */
+static int nonopt_start = -1; /* first non option argument (for permute) */
+static int nonopt_end = -1;   /* first option after non options (for permute) */
+
+/* Error messages */
+static const char recargchar[] = "option requires an argument -- %c";
+static const char recargstring[] = "option requires an argument -- %s";
+static const char ambig[] = "ambiguous option -- %.*s";
+static const char noarg[] = "option doesn't take an argument -- %.*s";
+static const char illoptchar[] = "unknown option -- %c";
+static const char illoptstring[] = "unknown option -- %s";
+
+
+
+#ifdef _WIN32
+
+/* Windows needs warnx().  We change the definition though:
+ *  1. (another) global is defined, opterrmsg, which holds the error message
+ *  2. errors are always printed out on stderr w/o the program name
+ * Note that opterrmsg always gets set no matter what opterr is set to.  The
+ * error message will not be printed if opterr is 0 as usual.
+ */
+
+#include <stdio.h>
+#include <stdarg.h>
+
+#define MAX_OPTER_MSG_SIZE 128
+
+extern char opterrmsg[MAX_OPTER_MSG_SIZE];
+char opterrmsg[MAX_OPTER_MSG_SIZE]; /* buffer for the last error message */
+
+static void warnx(const char *fmt, ...)
+{
+	va_list ap;
+	va_start(ap, fmt);
+    /*
+    Make sure opterrmsg is always zero-terminated despite the _vsnprintf()
+    implementation specifics and manually suppress the warning.
+    */
+    memset(opterrmsg, 0, sizeof opterrmsg);
+	if (fmt != NULL)
+#ifdef __STDC_WANT_SECURE_LIB__
+        _vsnprintf_s(opterrmsg, MAX_OPTER_MSG_SIZE, sizeof(opterrmsg) - 1, fmt, ap);
+#else
+        _vsnprintf(opterrmsg, sizeof(opterrmsg) - 1, fmt, ap);
+#endif
+	va_end(ap);
+
+	fprintf(stderr, "%s\n", opterrmsg);
+}
+
+#else
+#include <err.h>
+#endif /*_WIN32*/
+
+
+/*
+ * Compute the greatest common divisor of a and b.
+ */
+static int
+gcd(int a, int b)
+{
+	int c;
+
+	c = a % b;
+	while (c != 0) {
+		a = b;
+		b = c;
+		c = a % b;
+	}
+
+	return (b);
+}
+
+/*
+ * Exchange the block from nonopt_start to nonopt_end with the block
+ * from nonopt_end to opt_end (keeping the same order of arguments
+ * in each block).
+ */
+static void
+permute_args(int panonopt_start, int panonopt_end, int opt_end,
+	char * const *nargv)
+{
+	int cstart, cyclelen, i, j, ncycle, nnonopts, nopts, pos;
+	char *swap;
+
+	/*
+	 * compute lengths of blocks and number and size of cycles
+	 */
+	nnonopts = panonopt_end - panonopt_start;
+	nopts = opt_end - panonopt_end;
+	ncycle = gcd(nnonopts, nopts);
+	cyclelen = (opt_end - panonopt_start) / ncycle;
+
+	for (i = 0; i < ncycle; i++) {
+		cstart = panonopt_end+i;
+		pos = cstart;
+		for (j = 0; j < cyclelen; j++) {
+			if (pos >= panonopt_end)
+				pos -= nnonopts;
+			else
+				pos += nopts;
+			swap = nargv[pos];
+			/* LINTED const cast */
+			((char **) nargv)[pos] = nargv[cstart];
+			/* LINTED const cast */
+			((char **)nargv)[cstart] = swap;
+		}
+	}
+}
+
+/*
+ * parse_long_options --
+ *	Parse long options in argc/argv argument vector.
+ * Returns -1 if short_too is set and the option does not match long_options.
+ */
+static int
+parse_long_options(char * const *nargv, const char *options,
+	const struct option *long_options, int *idx, int short_too)
+{
+	char *current_argv, *has_equal;
+	size_t current_argv_len;
+	int i, match;
+
+	current_argv = place;
+	match = -1;
+
+	optind++;
+
+	if ((has_equal = strchr(current_argv, '=')) != NULL) {
+		/* argument found (--option=arg) */
+		current_argv_len = has_equal - current_argv;
+		has_equal++;
+	} else
+		current_argv_len = strlen(current_argv);
+
+	for (i = 0; long_options[i].name; i++) {
+		/* find matching long option */
+		if (strncmp(current_argv, long_options[i].name,
+		    current_argv_len))
+			continue;
+
+		if (strlen(long_options[i].name) == current_argv_len) {
+			/* exact match */
+			match = i;
+			break;
+		}
+		/*
+		 * If this is a known short option, don't allow
+		 * a partial match of a single character.
+		 */
+		if (short_too && current_argv_len == 1)
+			continue;
+
+		if (match == -1)	/* partial match */
+			match = i;
+		else {
+			/* ambiguous abbreviation */
+			if (PRINT_ERROR)
+				warnx(ambig, (int)current_argv_len,
+				     current_argv);
+			optopt = 0;
+			return (BADCH);
+		}
+	}
+	if (match != -1) {		/* option found */
+		if (long_options[match].has_arg == no_argument
+		    && has_equal) {
+			if (PRINT_ERROR)
+				warnx(noarg, (int)current_argv_len,
+				     current_argv);
+			/*
+			 * XXX: GNU sets optopt to val regardless of flag
+			 */
+			if (long_options[match].flag == NULL)
+				optopt = long_options[match].val;
+			else
+				optopt = 0;
+			return (BADARG);
+		}
+		if (long_options[match].has_arg == required_argument ||
+		    long_options[match].has_arg == optional_argument) {
+			if (has_equal)
+				optarg = has_equal;
+			else if (long_options[match].has_arg ==
+			    required_argument) {
+				/*
+				 * optional argument doesn't use next nargv
+				 */
+				optarg = nargv[optind++];
+			}
+		}
+		if ((long_options[match].has_arg == required_argument)
+		    && (optarg == NULL)) {
+			/*
+			 * Missing argument; leading ':' indicates no error
+			 * should be generated.
+			 */
+			if (PRINT_ERROR)
+				warnx(recargstring,
+				    current_argv);
+			/*
+			 * XXX: GNU sets optopt to val regardless of flag
+			 */
+			if (long_options[match].flag == NULL)
+				optopt = long_options[match].val;
+			else
+				optopt = 0;
+			--optind;
+			return (BADARG);
+		}
+	} else {			/* unknown option */
+		if (short_too) {
+			--optind;
+			return (-1);
+		}
+		if (PRINT_ERROR)
+			warnx(illoptstring, current_argv);
+		optopt = 0;
+		return (BADCH);
+	}
+	if (idx)
+		*idx = match;
+	if (long_options[match].flag) {
+		*long_options[match].flag = long_options[match].val;
+		return (0);
+	} else
+		return (long_options[match].val);
+}
+
+/*
+ * getopt_internal --
+ *	Parse argc/argv argument vector.  Called by user level routines.
+ */
+static int
+getopt_internal(int nargc, char * const *nargv, const char *options,
+	const struct option *long_options, int *idx, int flags)
+{
+	char *oli;				/* option letter list index */
+	int optchar, short_too;
+	static int posixly_correct = -1;
+#ifdef __STDC_WANT_SECURE_LIB__
+    char* buffer = NULL;
+    size_t buffer_size = 0;
+    errno_t err = 0;
+#endif
+
+	if (options == NULL)
+		return (-1);
+
+	/*
+	 * Disable GNU extensions if POSIXLY_CORRECT is set or options
+	 * string begins with a '+'.
+	 */
+
+#ifdef __STDC_WANT_SECURE_LIB__
+    if (posixly_correct == -1) {
+        err = _dupenv_s(&buffer, &buffer_size, "POSIXLY_CORRECT") == 0;
+        posixly_correct = buffer != NULL;
+        if(buffer != NULL && err == 0) {
+            free(buffer);
+        }
+    }
+#else
+    if (posixly_correct == -1)
+        posixly_correct = (getenv("POSIXLY_CORRECT") != NULL);
+#endif
+	if (posixly_correct || *options == '+')
+		flags &= ~FLAG_PERMUTE;
+	else if (*options == '-')
+		flags |= FLAG_ALLARGS;
+	if (*options == '+' || *options == '-')
+		options++;
+
+	/*
+	 * XXX Some GNU programs (like cvs) set optind to 0 instead of
+	 * XXX using optreset.  Work around this braindamage.
+	 */
+	if (optind == 0)
+		optind = optreset = 1;
+
+	optarg = NULL;
+	if (optreset)
+		nonopt_start = nonopt_end = -1;
+start:
+	if (optreset || !*place) {		/* update scanning pointer */
+		optreset = 0;
+		if (optind >= nargc) {          /* end of argument vector */
+			place = EMSG;
+			if (nonopt_end != -1) {
+				/* do permutation, if we have to */
+				permute_args(nonopt_start, nonopt_end,
+				    optind, nargv);
+				optind -= nonopt_end - nonopt_start;
+			}
+			else if (nonopt_start != -1) {
+				/*
+				 * If we skipped non-options, set optind
+				 * to the first of them.
+				 */
+				optind = nonopt_start;
+			}
+			nonopt_start = nonopt_end = -1;
+			return (-1);
+		}
+		if (*(place = nargv[optind]) != '-' ||
+		    (place[1] == '\0' && strchr(options, '-') == NULL)) {
+			place = EMSG;		/* found non-option */
+			if (flags & FLAG_ALLARGS) {
+				/*
+				 * GNU extension:
+				 * return non-option as argument to option 1
+				 */
+				optarg = nargv[optind++];
+				return (INORDER);
+			}
+			if (!(flags & FLAG_PERMUTE)) {
+				/*
+				 * If no permutation wanted, stop parsing
+				 * at first non-option.
+				 */
+				return (-1);
+			}
+			/* do permutation */
+			if (nonopt_start == -1)
+				nonopt_start = optind;
+			else if (nonopt_end != -1) {
+				permute_args(nonopt_start, nonopt_end,
+				    optind, nargv);
+				nonopt_start = optind -
+				    (nonopt_end - nonopt_start);
+				nonopt_end = -1;
+			}
+			optind++;
+			/* process next argument */
+			goto start;
+		}
+		if (nonopt_start != -1 && nonopt_end == -1)
+			nonopt_end = optind;
+
+		/*
+		 * If we have "-" do nothing, if "--" we are done.
+		 */
+		if (place[1] != '\0' && *++place == '-' && place[1] == '\0') {
+			optind++;
+			place = EMSG;
+			/*
+			 * We found an option (--), so if we skipped
+			 * non-options, we have to permute.
+			 */
+			if (nonopt_end != -1) {
+				permute_args(nonopt_start, nonopt_end,
+				    optind, nargv);
+				optind -= nonopt_end - nonopt_start;
+			}
+			nonopt_start = nonopt_end = -1;
+			return (-1);
+		}
+	}
+
+	/*
+	 * Check long options if:
+	 *  1) we were passed some
+	 *  2) the arg is not just "-"
+	 *  3) either the arg starts with -- we are getopt_long_only()
+	 */
+	if (long_options != NULL && place != nargv[optind] &&
+	    (*place == '-' || (flags & FLAG_LONGONLY))) {
+		short_too = 0;
+		if (*place == '-')
+			place++;		/* --foo long option */
+		else if (*place != ':' && strchr(options, *place) != NULL)
+			short_too = 1;		/* could be short option too */
+
+		optchar = parse_long_options(nargv, options, long_options,
+		    idx, short_too);
+		if (optchar != -1) {
+			place = EMSG;
+			return (optchar);
+		}
+	}
+
+	if ((optchar = (int)*place++) == (int)':' ||
+	    (optchar == (int)'-' && *place != '\0') ||
+	    (oli = strchr(options, optchar)) == NULL) {
+		/*
+		 * If the user specified "-" and  '-' isn't listed in
+		 * options, return -1 (non-option) as per POSIX.
+		 * Otherwise, it is an unknown option character (or ':').
+		 */
+		if (optchar == (int)'-' && *place == '\0')
+			return (-1);
+		if (!*place)
+			++optind;
+		if (PRINT_ERROR)
+			warnx(illoptchar, optchar);
+		optopt = optchar;
+		return (BADCH);
+	}
+	if (long_options != NULL && optchar == 'W' && oli[1] == ';') {
+		/* -W long-option */
+		if (*place)			/* no space */
+			/* NOTHING */;
+		else if (++optind >= nargc) {	/* no arg */
+			place = EMSG;
+			if (PRINT_ERROR)
+				warnx(recargchar, optchar);
+			optopt = optchar;
+			return (BADARG);
+		} else				/* white space */
+			place = nargv[optind];
+		optchar = parse_long_options(nargv, options, long_options,
+		    idx, 0);
+		place = EMSG;
+		return (optchar);
+	}
+	if (*++oli != ':') {			/* doesn't take argument */
+		if (!*place)
+			++optind;
+	} else {				/* takes (optional) argument */
+		optarg = NULL;
+		if (*place)			/* no white space */
+			optarg = place;
+		else if (oli[1] != ':') {	/* arg not optional */
+			if (++optind >= nargc) {	/* no arg */
+				place = EMSG;
+				if (PRINT_ERROR)
+					warnx(recargchar, optchar);
+				optopt = optchar;
+				return (BADARG);
+			} else
+				optarg = nargv[optind];
+		}
+		place = EMSG;
+		++optind;
+	}
+	/* dump back option letter */
+	return (optchar);
+}
+
+#ifdef REPLACE_GETOPT
+/*
+ * getopt --
+ *	Parse argc/argv argument vector.
+ *
+ * [eventually this will replace the BSD getopt]
+ */
+int
+getopt(int nargc, char * const *nargv, const char *options)
+{
+
+	/*
+	 * We don't pass FLAG_PERMUTE to getopt_internal() since
+	 * the BSD getopt(3) (unlike GNU) has never done this.
+	 *
+	 * Furthermore, since many privileged programs call getopt()
+	 * before dropping privileges it makes sense to keep things
+	 * as simple (and bug-free) as possible.
+	 */
+	return (getopt_internal(nargc, nargv, options, NULL, NULL, 0));
+}
+#endif /* REPLACE_GETOPT */
+
+/*
+ * getopt_long --
+ *	Parse argc/argv argument vector.
+ */
+int
+getopt_long(int nargc, char * const *nargv, const char *options,
+    const struct option *long_options, int *idx)
+{
+
+	return (getopt_internal(nargc, nargv, options, long_options, idx,
+	    FLAG_PERMUTE));
+}
+
+/*
+ * getopt_long_only --
+ *	Parse argc/argv argument vector.
+ */
+int
+getopt_long_only(int nargc, char * const *nargv, const char *options,
+    const struct option *long_options, int *idx)
+{
+
+	return (getopt_internal(nargc, nargv, options, long_options, idx,
+	    FLAG_PERMUTE|FLAG_LONGONLY));
+}
+/*******************************************************************************
+ * This file is part of the argtable3 library.
+ *
+ * Copyright (C) 1998-2001,2003-2011,2013 Stewart Heitmann
+ * <sheitmann@users.sourceforge.net>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of STEWART HEITMANN nor the  names of its contributors
+ *       may be used to endorse or promote products derived from this software
+ *       without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL STEWART HEITMANN BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ******************************************************************************/
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "argtable3.h"
+
+
+char * arg_strptime(const char *buf, const char *fmt, struct tm *tm);
+
+
+static void arg_date_resetfn(struct arg_date *parent)
+{
+    ARG_TRACE(("%s:resetfn(%p)\n", __FILE__, parent));
+    parent->count = 0;
+}
+
+
+static int arg_date_scanfn(struct arg_date *parent, const char *argval)
+{
+    int errorcode = 0;
+
+    if (parent->count == parent->hdr.maxcount)
+    {
+        errorcode = EMAXCOUNT;
+    }
+    else if (!argval)
+    {
+        /* no argument value was given, leave parent->tmval[] unaltered but still count it */
+        parent->count++;
+    }
+    else
+    {
+        const char *pend;
+        struct tm tm = parent->tmval[parent->count];
+
+        /* parse the given argument value, store result in parent->tmval[] */
+        pend = arg_strptime(argval, parent->format, &tm);
+        if (pend && pend[0] == '\0')
+            parent->tmval[parent->count++] = tm;
+        else
+            errorcode = EBADDATE;
+    }
+
+    ARG_TRACE(("%s:scanfn(%p) returns %d\n", __FILE__, parent, errorcode));
+    return errorcode;
+}
+
+
+static int arg_date_checkfn(struct arg_date *parent)
+{
+    int errorcode = (parent->count < parent->hdr.mincount) ? EMINCOUNT : 0;
+
+    ARG_TRACE(("%s:checkfn(%p) returns %d\n", __FILE__, parent, errorcode));
+    return errorcode;
+}
+
+
+static void arg_date_errorfn(
+    struct arg_date *parent,
+    FILE *fp,
+    int errorcode,
+    const char *argval,
+    const char *progname)
+{
+    const char *shortopts = parent->hdr.shortopts;
+    const char *longopts  = parent->hdr.longopts;
+    const char *datatype  = parent->hdr.datatype;
+
+    /* make argval NULL safe */
+    argval = argval ? argval : "";
+
+    fprintf(fp, "%s: ", progname);
+    switch(errorcode)
+    {
+    case EMINCOUNT:
+        fputs("missing option ", fp);
+        arg_print_option(fp, shortopts, longopts, datatype, "\n");
+        break;
+
+    case EMAXCOUNT:
+        fputs("excess option ", fp);
+        arg_print_option(fp, shortopts, longopts, argval, "\n");
+        break;
+
+    case EBADDATE:
+    {
+        struct tm tm;
+        char buff[200];
+
+        fprintf(fp, "illegal timestamp format \"%s\"\n", argval);
+        memset(&tm, 0, sizeof(tm));
+        arg_strptime("1999-12-31 23:59:59", "%F %H:%M:%S", &tm);
+        strftime(buff, sizeof(buff), parent->format, &tm);
+        printf("correct format is \"%s\"\n", buff);
+        break;
+    }
+    }
+}
+
+
+struct arg_date * arg_date0(
+    const char * shortopts,
+    const char * longopts,
+    const char * format,
+    const char *datatype,
+    const char *glossary)
+{
+    return arg_daten(shortopts, longopts, format, datatype, 0, 1, glossary);
+}
+
+
+struct arg_date * arg_date1(
+    const char * shortopts,
+    const char * longopts,
+    const char * format,
+    const char *datatype,
+    const char *glossary)
+{
+    return arg_daten(shortopts, longopts, format, datatype, 1, 1, glossary);
+}
+
+
+struct arg_date * arg_daten(
+    const char * shortopts,
+    const char * longopts,
+    const char * format,
+    const char *datatype,
+    int mincount,
+    int maxcount,
+    const char *glossary)
+{
+    size_t nbytes;
+    struct arg_date *result;
+
+    /* foolproof things by ensuring maxcount is not less than mincount */
+    maxcount = (maxcount < mincount) ? mincount : maxcount;
+
+    /* default time format is the national date format for the locale */
+    if (!format)
+        format = "%x";
+
+    nbytes = sizeof(struct arg_date)         /* storage for struct arg_date */
+        + maxcount * sizeof(struct tm);    /* storage for tmval[maxcount] array */
+
+    /* allocate storage for the arg_date struct + tmval[] array.    */
+    /* we use calloc because we want the tmval[] array zero filled. */
+    result = (struct arg_date *)calloc(1, nbytes);
+    if (result)
+    {
+        /* init the arg_hdr struct */
+        result->hdr.flag      = ARG_HASVALUE;
+        result->hdr.shortopts = shortopts;
+        result->hdr.longopts  = longopts;
+        result->hdr.datatype  = datatype ? datatype : format;
+        result->hdr.glossary  = glossary;
+        result->hdr.mincount  = mincount;
+        result->hdr.maxcount  = maxcount;
+        result->hdr.parent    = result;
+        result->hdr.resetfn   = (arg_resetfn *)arg_date_resetfn;
+        result->hdr.scanfn    = (arg_scanfn *)arg_date_scanfn;
+        result->hdr.checkfn   = (arg_checkfn *)arg_date_checkfn;
+        result->hdr.errorfn   = (arg_errorfn *)arg_date_errorfn;
+
+        /* store the tmval[maxcount] array immediately after the arg_date struct */
+        result->tmval  = (struct tm *)(result + 1);
+
+        /* init the remaining arg_date member variables */
+        result->count = 0;
+        result->format = format;
+    }
+
+    ARG_TRACE(("arg_daten() returns %p\n", result));
+    return result;
+}
+
+
+/*-
+ * Copyright (c) 1997, 1998, 2005, 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code was contributed to The NetBSD Foundation by Klaus Klein.
+ * Heavily optimised by David Laight
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <ctype.h>
+#include <string.h>
+#include <time.h>
+
+/*
+ * We do not implement alternate representations. However, we always
+ * check whether a given modifier is allowed for a certain conversion.
+ */
+#define ALT_E                   0x01
+#define ALT_O                   0x02
+#define LEGAL_ALT(x)            { if (alt_format & ~(x)) return (0); }
+#define TM_YEAR_BASE   (1900)
+
+static int conv_num(const char * *, int *, int, int);
+
+static const char *day[7] = {
+    "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday",
+    "Friday", "Saturday"
+};
+
+static const char *abday[7] = {
+    "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
+};
+
+static const char *mon[12] = {
+    "January", "February", "March", "April", "May", "June", "July",
+    "August", "September", "October", "November", "December"
+};
+
+static const char *abmon[12] = {
+    "Jan", "Feb", "Mar", "Apr", "May", "Jun",
+    "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
+};
+
+static const char *am_pm[2] = {
+    "AM", "PM"
+};
+
+
+static int arg_strcasecmp(const char *s1, const char *s2)
+{
+    const unsigned char *us1 = (const unsigned char *)s1;
+    const unsigned char *us2 = (const unsigned char *)s2;
+    while (tolower(*us1) == tolower(*us2++))
+        if (*us1++ == '\0')
+            return 0;
+
+    return tolower(*us1) - tolower(*--us2);
+}
+
+
+static int arg_strncasecmp(const char *s1, const char *s2, size_t n)
+{
+    if (n != 0)
+    {
+        const unsigned char *us1 = (const unsigned char *)s1;
+        const unsigned char *us2 = (const unsigned char *)s2;
+        do
+        {
+            if (tolower(*us1) != tolower(*us2++))
+                return tolower(*us1) - tolower(*--us2);
+
+            if (*us1++ == '\0')
+                break;
+        } while (--n != 0);
+    }
+
+    return 0;
+}
+
+
+char * arg_strptime(const char *buf, const char *fmt, struct tm *tm)
+{
+    char c;
+    const char *bp;
+    size_t len = 0;
+    int alt_format, i, split_year = 0;
+
+    bp = buf;
+
+    while ((c = *fmt) != '\0') {
+        /* Clear `alternate' modifier prior to new conversion. */
+        alt_format = 0;
+
+        /* Eat up white-space. */
+        if (ISSPACE(c)) {
+            while (ISSPACE(*bp))
+                bp++;
+
+            fmt++;
+            continue;
+        }
+
+        if ((c = *fmt++) != '%')
+            goto literal;
+
+
+again:
+        switch (c = *fmt++)
+        {
+        case '%': /* "%%" is converted to "%". */
+literal:
+            if (c != *bp++)
+                return (0);
+            break;
+
+        /*
+         * "Alternative" modifiers. Just set the appropriate flag
+         * and start over again.
+         */
+        case 'E': /* "%E?" alternative conversion modifier. */
+            LEGAL_ALT(0);
+            alt_format |= ALT_E;
+            goto again;
+
+        case 'O': /* "%O?" alternative conversion modifier. */
+            LEGAL_ALT(0);
+            alt_format |= ALT_O;
+            goto again;
+
+        /*
+         * "Complex" conversion rules, implemented through recursion.
+         */
+        case 'c': /* Date and time, using the locale's format. */
+            LEGAL_ALT(ALT_E);
+            bp = arg_strptime(bp, "%x %X", tm);
+            if (!bp)
+                return (0);
+            break;
+
+        case 'D': /* The date as "%m/%d/%y". */
+            LEGAL_ALT(0);
+            bp = arg_strptime(bp, "%m/%d/%y", tm);
+            if (!bp)
+                return (0);
+            break;
+
+        case 'R': /* The time as "%H:%M". */
+            LEGAL_ALT(0);
+            bp = arg_strptime(bp, "%H:%M", tm);
+            if (!bp)
+                return (0);
+            break;
+
+        case 'r': /* The time in 12-hour clock representation. */
+            LEGAL_ALT(0);
+            bp = arg_strptime(bp, "%I:%M:%S %p", tm);
+            if (!bp)
+                return (0);
+            break;
+
+        case 'T': /* The time as "%H:%M:%S". */
+            LEGAL_ALT(0);
+            bp = arg_strptime(bp, "%H:%M:%S", tm);
+            if (!bp)
+                return (0);
+            break;
+
+        case 'X': /* The time, using the locale's format. */
+            LEGAL_ALT(ALT_E);
+            bp = arg_strptime(bp, "%H:%M:%S", tm);
+            if (!bp)
+                return (0);
+            break;
+
+        case 'x': /* The date, using the locale's format. */
+            LEGAL_ALT(ALT_E);
+            bp = arg_strptime(bp, "%m/%d/%y", tm);
+            if (!bp)
+                return (0);
+            break;
+
+        /*
+         * "Elementary" conversion rules.
+         */
+        case 'A': /* The day of week, using the locale's form. */
+        case 'a':
+            LEGAL_ALT(0);
+            for (i = 0; i < 7; i++) {
+                /* Full name. */
+                len = strlen(day[i]);
+                if (arg_strncasecmp(day[i], bp, len) == 0)
+                    break;
+
+                /* Abbreviated name. */
+                len = strlen(abday[i]);
+                if (arg_strncasecmp(abday[i], bp, len) == 0)
+                    break;
+            }
+
+            /* Nothing matched. */
+            if (i == 7)
+                return (0);
+
+            tm->tm_wday = i;
+            bp += len;
+            break;
+
+        case 'B': /* The month, using the locale's form. */
+        case 'b':
+        case 'h':
+            LEGAL_ALT(0);
+            for (i = 0; i < 12; i++) {
+                /* Full name. */
+                len = strlen(mon[i]);
+                if (arg_strncasecmp(mon[i], bp, len) == 0)
+                    break;
+
+                /* Abbreviated name. */
+                len = strlen(abmon[i]);
+                if (arg_strncasecmp(abmon[i], bp, len) == 0)
+                    break;
+            }
+
+            /* Nothing matched. */
+            if (i == 12)
+                return (0);
+
+            tm->tm_mon = i;
+            bp += len;
+            break;
+
+        case 'C': /* The century number. */
+            LEGAL_ALT(ALT_E);
+            if (!(conv_num(&bp, &i, 0, 99)))
+                return (0);
+
+            if (split_year) {
+                tm->tm_year = (tm->tm_year % 100) + (i * 100);
+            } else {
+                tm->tm_year = i * 100;
+                split_year = 1;
+            }
+            break;
+
+        case 'd': /* The day of month. */
+        case 'e':
+            LEGAL_ALT(ALT_O);
+            if (!(conv_num(&bp, &tm->tm_mday, 1, 31)))
+                return (0);
+            break;
+
+        case 'k': /* The hour (24-hour clock representation). */
+            LEGAL_ALT(0);
+        /* FALLTHROUGH */
+        case 'H':
+            LEGAL_ALT(ALT_O);
+            if (!(conv_num(&bp, &tm->tm_hour, 0, 23)))
+                return (0);
+            break;
+
+        case 'l': /* The hour (12-hour clock representation). */
+            LEGAL_ALT(0);
+        /* FALLTHROUGH */
+        case 'I':
+            LEGAL_ALT(ALT_O);
+            if (!(conv_num(&bp, &tm->tm_hour, 1, 12)))
+                return (0);
+            if (tm->tm_hour == 12)
+                tm->tm_hour = 0;
+            break;
+
+        case 'j': /* The day of year. */
+            LEGAL_ALT(0);
+            if (!(conv_num(&bp, &i, 1, 366)))
+                return (0);
+            tm->tm_yday = i - 1;
+            break;
+
+        case 'M': /* The minute. */
+            LEGAL_ALT(ALT_O);
+            if (!(conv_num(&bp, &tm->tm_min, 0, 59)))
+                return (0);
+            break;
+
+        case 'm': /* The month. */
+            LEGAL_ALT(ALT_O);
+            if (!(conv_num(&bp, &i, 1, 12)))
+                return (0);
+            tm->tm_mon = i - 1;
+            break;
+
+        case 'p': /* The locale's equivalent of AM/PM. */
+            LEGAL_ALT(0);
+            /* AM? */
+            if (arg_strcasecmp(am_pm[0], bp) == 0) {
+                if (tm->tm_hour > 11)
+                    return (0);
+
+                bp += strlen(am_pm[0]);
+                break;
+            }
+            /* PM? */
+            else if (arg_strcasecmp(am_pm[1], bp) == 0) {
+                if (tm->tm_hour > 11)
+                    return (0);
+
+                tm->tm_hour += 12;
+                bp += strlen(am_pm[1]);
+                break;
+            }
+
+            /* Nothing matched. */
+            return (0);
+
+        case 'S': /* The seconds. */
+            LEGAL_ALT(ALT_O);
+            if (!(conv_num(&bp, &tm->tm_sec, 0, 61)))
+                return (0);
+            break;
+
+        case 'U': /* The week of year, beginning on sunday. */
+        case 'W': /* The week of year, beginning on monday. */
+            LEGAL_ALT(ALT_O);
+            /*
+             * XXX This is bogus, as we can not assume any valid
+             * information present in the tm structure at this
+             * point to calculate a real value, so just check the
+             * range for now.
+             */
+            if (!(conv_num(&bp, &i, 0, 53)))
+                return (0);
+            break;
+
+        case 'w': /* The day of week, beginning on sunday. */
+            LEGAL_ALT(ALT_O);
+            if (!(conv_num(&bp, &tm->tm_wday, 0, 6)))
+                return (0);
+            break;
+
+        case 'Y': /* The year. */
+            LEGAL_ALT(ALT_E);
+            if (!(conv_num(&bp, &i, 0, 9999)))
+                return (0);
+
+            tm->tm_year = i - TM_YEAR_BASE;
+            break;
+
+        case 'y': /* The year within 100 years of the epoch. */
+            LEGAL_ALT(ALT_E | ALT_O);
+            if (!(conv_num(&bp, &i, 0, 99)))
+                return (0);
+
+            if (split_year) {
+                tm->tm_year = ((tm->tm_year / 100) * 100) + i;
+                break;
+            }
+            split_year = 1;
+            if (i <= 68)
+                tm->tm_year = i + 2000 - TM_YEAR_BASE;
+            else
+                tm->tm_year = i + 1900 - TM_YEAR_BASE;
+            break;
+
+        /*
+         * Miscellaneous conversions.
+         */
+        case 'n': /* Any kind of white-space. */
+        case 't':
+            LEGAL_ALT(0);
+            while (ISSPACE(*bp))
+                bp++;
+            break;
+
+
+        default: /* Unknown/unsupported conversion. */
+            return (0);
+        }
+
+
+    }
+
+    /* LINTED functional specification */
+    return ((char *)bp);
+}
+
+
+static int conv_num(const char * *buf, int *dest, int llim, int ulim)
+{
+    int result = 0;
+
+    /* The limit also determines the number of valid digits. */
+    int rulim = ulim;
+
+    if (**buf < '0' || **buf > '9')
+        return (0);
+
+    do {
+        result *= 10;
+        result += *(*buf)++ - '0';
+        rulim /= 10;
+    } while ((result * 10 <= ulim) && rulim && **buf >= '0' && **buf <= '9');
+
+    if (result < llim || result > ulim)
+        return (0);
+
+    *dest = result;
+    return (1);
+}
+/*******************************************************************************
+ * This file is part of the argtable3 library.
+ *
+ * Copyright (C) 1998-2001,2003-2011,2013 Stewart Heitmann
+ * <sheitmann@users.sourceforge.net>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of STEWART HEITMANN nor the  names of its contributors
+ *       may be used to endorse or promote products derived from this software
+ *       without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL STEWART HEITMANN BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ******************************************************************************/
+
+#include <stdlib.h>
+
+#include "argtable3.h"
+
+
+static void arg_dbl_resetfn(struct arg_dbl *parent)
+{
+    ARG_TRACE(("%s:resetfn(%p)\n", __FILE__, parent));
+    parent->count = 0;
+}
+
+
+static int arg_dbl_scanfn(struct arg_dbl *parent, const char *argval)
+{
+    int errorcode = 0;
+
+    if (parent->count == parent->hdr.maxcount)
+    {
+        /* maximum number of arguments exceeded */
+        errorcode = EMAXCOUNT;
+    }
+    else if (!argval)
+    {
+        /* a valid argument with no argument value was given. */
+        /* This happens when an optional argument value was invoked. */
+        /* leave parent argument value unaltered but still count the argument. */
+        parent->count++;
+    }
+    else
+    {
+        double val;
+        char *end;
+
+        /* extract double from argval into val */
+        val = strtod(argval, &end);
+
+        /* if success then store result in parent->dval[] array otherwise return error*/
+        if (*end == 0)
+            parent->dval[parent->count++] = val;
+        else
+            errorcode = EBADDOUBLE;
+    }
+
+    ARG_TRACE(("%s:scanfn(%p) returns %d\n", __FILE__, parent, errorcode));
+    return errorcode;
+}
+
+
+static int arg_dbl_checkfn(struct arg_dbl *parent)
+{
+    int errorcode = (parent->count < parent->hdr.mincount) ? EMINCOUNT : 0;
+    
+    ARG_TRACE(("%s:checkfn(%p) returns %d\n", __FILE__, parent, errorcode));
+    return errorcode;
+}
+
+
+static void arg_dbl_errorfn(
+    struct arg_dbl *parent,
+    FILE *fp,
+    int errorcode,
+    const char *argval,
+    const char *progname)
+{
+    const char *shortopts = parent->hdr.shortopts;
+    const char *longopts  = parent->hdr.longopts;
+    const char *datatype  = parent->hdr.datatype;
+
+    /* make argval NULL safe */
+    argval = argval ? argval : "";
+
+    fprintf(fp, "%s: ", progname);
+    switch(errorcode)
+    {
+    case EMINCOUNT:
+        fputs("missing option ", fp);
+        arg_print_option(fp, shortopts, longopts, datatype, "\n");
+        break;
+
+    case EMAXCOUNT:
+        fputs("excess option ", fp);
+        arg_print_option(fp, shortopts, longopts, argval, "\n");
+        break;
+
+    case EBADDOUBLE:
+        fprintf(fp, "invalid argument \"%s\" to option ", argval);
+        arg_print_option(fp, shortopts, longopts, datatype, "\n");
+        break;
+    }
+}
+
+
+struct arg_dbl * arg_dbl0(
+    const char * shortopts,
+    const char * longopts,
+    const char *datatype,
+    const char *glossary)
+{
+    return arg_dbln(shortopts, longopts, datatype, 0, 1, glossary);
+}
+
+
+struct arg_dbl * arg_dbl1(
+    const char * shortopts,
+    const char * longopts,
+    const char *datatype,
+    const char *glossary)
+{
+    return arg_dbln(shortopts, longopts, datatype, 1, 1, glossary);
+}
+
+
+struct arg_dbl * arg_dbln(
+    const char * shortopts,
+    const char * longopts,
+    const char *datatype,
+    int mincount,
+    int maxcount,
+    const char *glossary)
+{
+    size_t nbytes;
+    struct arg_dbl *result;
+
+    /* foolproof things by ensuring maxcount is not less than mincount */
+    maxcount = (maxcount < mincount) ? mincount : maxcount;
+
+    nbytes = sizeof(struct arg_dbl)     /* storage for struct arg_dbl */
+             + (maxcount + 1) * sizeof(double); /* storage for dval[maxcount] array plus one extra for padding to memory boundary */
+
+    result = (struct arg_dbl *)malloc(nbytes);
+    if (result)
+    {
+        size_t addr;
+        size_t rem;
+
+        /* init the arg_hdr struct */
+        result->hdr.flag      = ARG_HASVALUE;
+        result->hdr.shortopts = shortopts;
+        result->hdr.longopts  = longopts;
+        result->hdr.datatype  = datatype ? datatype : "<double>";
+        result->hdr.glossary  = glossary;
+        result->hdr.mincount  = mincount;
+        result->hdr.maxcount  = maxcount;
+        result->hdr.parent    = result;
+        result->hdr.resetfn   = (arg_resetfn *)arg_dbl_resetfn;
+        result->hdr.scanfn    = (arg_scanfn *)arg_dbl_scanfn;
+        result->hdr.checkfn   = (arg_checkfn *)arg_dbl_checkfn;
+        result->hdr.errorfn   = (arg_errorfn *)arg_dbl_errorfn;
+
+        /* Store the dval[maxcount] array on the first double boundary that
+         * immediately follows the arg_dbl struct. We do the memory alignment
+         * purely for SPARC and Motorola systems. They require floats and
+         * doubles to be aligned on natural boundaries.
+         */
+        addr = (size_t)(result + 1);
+        rem  = addr % sizeof(double);
+        result->dval  = (double *)(addr + sizeof(double) - rem);
+        ARG_TRACE(("addr=%p, dval=%p, sizeof(double)=%d rem=%d\n", addr, result->dval, (int)sizeof(double), (int)rem));
+
+        result->count = 0;
+    }
+    
+    ARG_TRACE(("arg_dbln() returns %p\n", result));
+    return result;
+}
+/*******************************************************************************
+ * This file is part of the argtable3 library.
+ *
+ * Copyright (C) 1998-2001,2003-2011,2013 Stewart Heitmann
+ * <sheitmann@users.sourceforge.net>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of STEWART HEITMANN nor the  names of its contributors
+ *       may be used to endorse or promote products derived from this software
+ *       without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL STEWART HEITMANN BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ******************************************************************************/
+
+#include <stdlib.h>
+
+#include "argtable3.h"
+
+
+static void arg_end_resetfn(struct arg_end *parent)
+{
+    ARG_TRACE(("%s:resetfn(%p)\n", __FILE__, parent));
+    parent->count = 0;
+}
+
+static void arg_end_errorfn(
+    void *parent,
+    FILE *fp,
+    int error,
+    const char *argval,
+    const char *progname)
+{
+    /* suppress unreferenced formal parameter warning */
+    (void)parent;
+
+    progname = progname ? progname : "";
+    argval = argval ? argval : "";
+
+    fprintf(fp, "%s: ", progname);
+    switch(error)
+    {
+    case ARG_ELIMIT:
+        fputs("too many errors to display", fp);
+        break;
+    case ARG_EMALLOC:
+        fputs("insufficent memory", fp);
+        break;
+    case ARG_ENOMATCH:
+        fprintf(fp, "unexpected argument \"%s\"", argval);
+        break;
+    case ARG_EMISSARG:
+        fprintf(fp, "option \"%s\" requires an argument", argval);
+        break;
+    case ARG_ELONGOPT:
+        fprintf(fp, "invalid option \"%s\"", argval);
+        break;
+    default:
+        fprintf(fp, "invalid option \"-%c\"", error);
+        break;
+    }
+    
+    fputc('\n', fp);
+}
+
+
+struct arg_end * arg_end(int maxcount)
+{
+    size_t nbytes;
+    struct arg_end *result;
+
+    nbytes = sizeof(struct arg_end)
+             + maxcount * sizeof(int)     /* storage for int error[maxcount] array*/
+             + maxcount * sizeof(void *)  /* storage for void* parent[maxcount] array */
+             + maxcount * sizeof(char *); /* storage for char* argval[maxcount] array */
+
+    result = (struct arg_end *)malloc(nbytes);
+    if (result)
+    {
+        /* init the arg_hdr struct */
+        result->hdr.flag      = ARG_TERMINATOR;
+        result->hdr.shortopts = NULL;
+        result->hdr.longopts  = NULL;
+        result->hdr.datatype  = NULL;
+        result->hdr.glossary  = NULL;
+        result->hdr.mincount  = 1;
+        result->hdr.maxcount  = maxcount;
+        result->hdr.parent    = result;
+        result->hdr.resetfn   = (arg_resetfn *)arg_end_resetfn;
+        result->hdr.scanfn    = NULL;
+        result->hdr.checkfn   = NULL;
+        result->hdr.errorfn   = (arg_errorfn *)arg_end_errorfn;
+
+        /* store error[maxcount] array immediately after struct arg_end */
+        result->error = (int *)(result + 1);
+
+        /* store parent[maxcount] array immediately after error[] array */
+        result->parent = (void * *)(result->error + maxcount );
+
+        /* store argval[maxcount] array immediately after parent[] array */
+        result->argval = (const char * *)(result->parent + maxcount );
+    }
+
+    ARG_TRACE(("arg_end(%d) returns %p\n", maxcount, result));
+    return result;
+}
+
+
+void arg_print_errors(FILE * fp, struct arg_end * end, const char * progname)
+{
+    int i;
+    ARG_TRACE(("arg_errors()\n"));
+    for (i = 0; i < end->count; i++)
+    {
+        struct arg_hdr *errorparent = (struct arg_hdr *)(end->parent[i]);
+        if (errorparent->errorfn)
+            errorparent->errorfn(end->parent[i],
+                                 fp,
+                                 end->error[i],
+                                 end->argval[i],
+                                 progname);
+    }
+}
+/*******************************************************************************
+ * This file is part of the argtable3 library.
+ *
+ * Copyright (C) 1998-2001,2003-2011,2013 Stewart Heitmann
+ * <sheitmann@users.sourceforge.net>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of STEWART HEITMANN nor the  names of its contributors
+ *       may be used to endorse or promote products derived from this software
+ *       without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL STEWART HEITMANN BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ******************************************************************************/
+
+#include <string.h>
+#include <stdlib.h>
+
+#include "argtable3.h"
+
+#ifdef WIN32
+# define FILESEPARATOR1 '\\'
+# define FILESEPARATOR2 '/'
+#else
+# define FILESEPARATOR1 '/'
+# define FILESEPARATOR2 '/'
+#endif
+
+
+static void arg_file_resetfn(struct arg_file *parent)
+{
+    ARG_TRACE(("%s:resetfn(%p)\n", __FILE__, parent));
+    parent->count = 0;
+}
+
+
+/* Returns ptr to the base filename within *filename */
+static const char * arg_basename(const char *filename)
+{
+    const char *result = NULL, *result1, *result2;
+
+    /* Find the last occurrence of eother file separator character. */
+    /* Two alternative file separator chars are supported as legal  */
+    /* file separators but not both together in the same filename.  */
+    result1 = (filename ? strrchr(filename, FILESEPARATOR1) : NULL);
+    result2 = (filename ? strrchr(filename, FILESEPARATOR2) : NULL);
+
+    if (result2)
+        result = result2 + 1;  /* using FILESEPARATOR2 (the alternative file separator) */
+
+    if (result1)
+        result = result1 + 1;  /* using FILESEPARATOR1 (the preferred file separator) */
+
+    if (!result)
+        result = filename;  /* neither file separator was found so basename is the whole filename */
+
+    /* special cases of "." and ".." are not considered basenames */
+    if (result && ( strcmp(".", result) == 0 || strcmp("..", result) == 0 ))
+        result = filename + strlen(filename);
+
+    return result;
+}
+
+
+/* Returns ptr to the file extension within *basename */
+static const char * arg_extension(const char *basename)
+{
+    /* find the last occurrence of '.' in basename */
+    const char *result = (basename ? strrchr(basename, '.') : NULL);
+
+    /* if no '.' was found then return pointer to end of basename */
+    if (basename && !result)
+        result = basename + strlen(basename);
+
+    /* special case: basenames with a single leading dot (eg ".foo") are not considered as true extensions */
+    if (basename && result == basename)
+        result = basename + strlen(basename);
+
+    /* special case: empty extensions (eg "foo.","foo..") are not considered as true extensions */
+    if (basename && result && result[1] == '\0')
+        result = basename + strlen(basename);
+
+    return result;
+}
+
+
+static int arg_file_scanfn(struct arg_file *parent, const char *argval)
+{
+    int errorcode = 0;
+
+    if (parent->count == parent->hdr.maxcount)
+    {
+        /* maximum number of arguments exceeded */
+        errorcode = EMAXCOUNT;
+    }
+    else if (!argval)
+    {
+        /* a valid argument with no argument value was given. */
+        /* This happens when an optional argument value was invoked. */
+        /* leave parent arguiment value unaltered but still count the argument. */
+        parent->count++;
+    }
+    else
+    {
+        parent->filename[parent->count]  = argval;
+        parent->basename[parent->count]  = arg_basename(argval);
+        parent->extension[parent->count] =
+            arg_extension(parent->basename[parent->count]);                                /* only seek extensions within the basename (not the file path)*/
+        parent->count++;
+    }
+
+    ARG_TRACE(("%s4:scanfn(%p) returns %d\n", __FILE__, parent, errorcode));
+    return errorcode;
+}
+
+
+static int arg_file_checkfn(struct arg_file *parent)
+{
+    int errorcode = (parent->count < parent->hdr.mincount) ? EMINCOUNT : 0;
+    
+    ARG_TRACE(("%s:checkfn(%p) returns %d\n", __FILE__, parent, errorcode));
+    return errorcode;
+}
+
+
+static void arg_file_errorfn(
+    struct arg_file *parent,
+    FILE *fp,
+    int errorcode,
+    const char *argval,
+    const char *progname)
+{
+    const char *shortopts = parent->hdr.shortopts;
+    const char *longopts  = parent->hdr.longopts;
+    const char *datatype  = parent->hdr.datatype;
+
+    /* make argval NULL safe */
+    argval = argval ? argval : "";
+
+    fprintf(fp, "%s: ", progname);
+    switch(errorcode)
+    {
+    case EMINCOUNT:
+        fputs("missing option ", fp);
+        arg_print_option(fp, shortopts, longopts, datatype, "\n");
+        break;
+
+    case EMAXCOUNT:
+        fputs("excess option ", fp);
+        arg_print_option(fp, shortopts, longopts, argval, "\n");
+        break;
+
+    default:
+        fprintf(fp, "unknown error at \"%s\"\n", argval);
+    }
+}
+
+
+struct arg_file * arg_file0(
+    const char * shortopts,
+    const char * longopts,
+    const char *datatype,
+    const char *glossary)
+{
+    return arg_filen(shortopts, longopts, datatype, 0, 1, glossary);
+}
+
+
+struct arg_file * arg_file1(
+    const char * shortopts,
+    const char * longopts,
+    const char *datatype,
+    const char *glossary)
+{
+    return arg_filen(shortopts, longopts, datatype, 1, 1, glossary);
+}
+
+
+struct arg_file * arg_filen(
+    const char * shortopts,
+    const char * longopts,
+    const char *datatype,
+    int mincount,
+    int maxcount,
+    const char *glossary)
+{
+    size_t nbytes;
+    struct arg_file *result;
+
+    /* foolproof things by ensuring maxcount is not less than mincount */
+    maxcount = (maxcount < mincount) ? mincount : maxcount;
+
+    nbytes = sizeof(struct arg_file)      /* storage for struct arg_file */
+             + sizeof(char *) * maxcount  /* storage for filename[maxcount] array */
+             + sizeof(char *) * maxcount  /* storage for basename[maxcount] array */
+             + sizeof(char *) * maxcount; /* storage for extension[maxcount] array */
+
+    result = (struct arg_file *)malloc(nbytes);
+    if (result)
+    {
+        int i;
+
+        /* init the arg_hdr struct */
+        result->hdr.flag      = ARG_HASVALUE;
+        result->hdr.shortopts = shortopts;
+        result->hdr.longopts  = longopts;
+        result->hdr.glossary  = glossary;
+        result->hdr.datatype  = datatype ? datatype : "<file>";
+        result->hdr.mincount  = mincount;
+        result->hdr.maxcount  = maxcount;
+        result->hdr.parent    = result;
+        result->hdr.resetfn   = (arg_resetfn *)arg_file_resetfn;
+        result->hdr.scanfn    = (arg_scanfn *)arg_file_scanfn;
+        result->hdr.checkfn   = (arg_checkfn *)arg_file_checkfn;
+        result->hdr.errorfn   = (arg_errorfn *)arg_file_errorfn;
+
+        /* store the filename,basename,extension arrays immediately after the arg_file struct */
+        result->filename  = (const char * *)(result + 1);
+        result->basename  = result->filename + maxcount;
+        result->extension = result->basename + maxcount;
+        result->count = 0;
+
+        /* foolproof the string pointers by initialising them with empty strings */
+        for (i = 0; i < maxcount; i++)
+        {
+            result->filename[i] = "";
+            result->basename[i] = "";
+            result->extension[i] = "";
+        }
+    }
+    
+    ARG_TRACE(("arg_filen() returns %p\n", result));
+    return result;
+}
+/*******************************************************************************
+ * This file is part of the argtable3 library.
+ *
+ * Copyright (C) 1998-2001,2003-2011,2013 Stewart Heitmann
+ * <sheitmann@users.sourceforge.net>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of STEWART HEITMANN nor the  names of its contributors
+ *       may be used to endorse or promote products derived from this software
+ *       without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL STEWART HEITMANN BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ******************************************************************************/
+
+#include <stdlib.h>
+#include <limits.h>
+#include <ctype.h>
+
+#include "argtable3.h"
+
+
+static void arg_int_resetfn(struct arg_int *parent)
+{
+    ARG_TRACE(("%s:resetfn(%p)\n", __FILE__, parent));
+    parent->count = 0;
+}
+
+
+/* strtol0x() is like strtol() except that the numeric string is    */
+/* expected to be prefixed by "0X" where X is a user supplied char. */
+/* The string may optionally be prefixed by white space and + or -  */
+/* as in +0X123 or -0X123.                                          */
+/* Once the prefix has been scanned, the remainder of the numeric   */
+/* string is converted using strtol() with the given base.          */
+/* eg: to parse hex str="-0X12324", specify X='X' and base=16.      */
+/* eg: to parse oct str="+0o12324", specify X='O' and base=8.       */
+/* eg: to parse bin str="-0B01010", specify X='B' and base=2.       */
+/* Failure of conversion is indicated by result where *endptr==str. */
+static long int strtol0X(const char * str,
+                         const char * *endptr,
+                         char X,
+                         int base)
+{
+    long int val;               /* stores result */
+    int s = 1;                    /* sign is +1 or -1 */
+    const char *ptr = str;        /* ptr to current position in str */
+
+    /* skip leading whitespace */
+    while (ISSPACE(*ptr))
+        ptr++;
+    /* printf("1) %s\n",ptr); */
+
+    /* scan optional sign character */
+    switch (*ptr)
+    {
+    case '+':
+        ptr++;
+        s = 1;
+        break;
+    case '-':
+        ptr++;
+        s = -1;
+        break;
+    default:
+        s = 1;
+        break;
+    }
+    /* printf("2) %s\n",ptr); */
+
+    /* '0X' prefix */
+    if ((*ptr++) != '0')
+    {
+        /* printf("failed to detect '0'\n"); */
+        *endptr = str;
+        return 0;
+    }
+    /* printf("3) %s\n",ptr); */
+    if (toupper(*ptr++) != toupper(X))
+    {
+        /* printf("failed to detect '%c'\n",X); */
+        *endptr = str;
+        return 0;
+    }
+    /* printf("4) %s\n",ptr); */
+
+    /* attempt conversion on remainder of string using strtol() */
+    val = strtol(ptr, (char * *)endptr, base);
+    if (*endptr == ptr)
+    {
+        /* conversion failed */
+        *endptr = str;
+        return 0;
+    }
+
+    /* success */
+    return s * val;
+}
+
+
+/* Returns 1 if str matches suffix (case insensitive).    */
+/* Str may contain trailing whitespace, but nothing else. */
+static int detectsuffix(const char *str, const char *suffix)
+{
+    /* scan pairwise through strings until mismatch detected */
+    while( toupper(*str) == toupper(*suffix) )
+    {
+        /* printf("'%c' '%c'\n", *str, *suffix); */
+
+        /* return 1 (success) if match persists until the string terminator */
+        if (*str == '\0')
+            return 1;
+
+        /* next chars */
+        str++;
+        suffix++;
+    }
+    /* printf("'%c' '%c' mismatch\n", *str, *suffix); */
+
+    /* return 0 (fail) if the matching did not consume the entire suffix */
+    if (*suffix != 0)
+        return 0;   /* failed to consume entire suffix */
+
+    /* skip any remaining whitespace in str */
+    while (ISSPACE(*str))
+        str++;
+
+    /* return 1 (success) if we have reached end of str else return 0 (fail) */
+    return (*str == '\0') ? 1 : 0;
+}
+
+
+static int arg_int_scanfn(struct arg_int *parent, const char *argval)
+{
+    int errorcode = 0;
+
+    if (parent->count == parent->hdr.maxcount)
+    {
+        /* maximum number of arguments exceeded */
+        errorcode = EMAXCOUNT;
+    }
+    else if (!argval)
+    {
+        /* a valid argument with no argument value was given. */
+        /* This happens when an optional argument value was invoked. */
+        /* leave parent arguiment value unaltered but still count the argument. */
+        parent->count++;
+    }
+    else
+    {
+        long int val;
+        const char *end;
+
+        /* attempt to extract hex integer (eg: +0x123) from argval into val conversion */
+        val = strtol0X(argval, &end, 'X', 16);
+        if (end == argval)
+        {
+            /* hex failed, attempt octal conversion (eg +0o123) */
+            val = strtol0X(argval, &end, 'O', 8);
+            if (end == argval)
+            {
+                /* octal failed, attempt binary conversion (eg +0B101) */
+                val = strtol0X(argval, &end, 'B', 2);
+                if (end == argval)
+                {
+                    /* binary failed, attempt decimal conversion with no prefix (eg 1234) */
+                    val = strtol(argval, (char * *)&end, 10);
+                    if (end == argval)
+                    {
+                        /* all supported number formats failed */
+                        return EBADINT;
+                    }
+                }
+            }
+        }
+
+        /* Safety check for integer overflow. WARNING: this check    */
+        /* achieves nothing on machines where size(int)==size(long). */
+        if ( val > INT_MAX || val < INT_MIN )
+#ifdef __STDC_WANT_SECURE_LIB__
+            errorcode = EOVERFLOW_;
+#else
+            errorcode = EOVERFLOW;
+#endif
+
+        /* Detect any suffixes (KB,MB,GB) and multiply argument value appropriately. */
+        /* We need to be mindful of integer overflows when using such big numbers.   */
+        if (detectsuffix(end, "KB"))             /* kilobytes */
+        {
+            if ( val > (INT_MAX / 1024) || val < (INT_MIN / 1024) )
+#ifdef __STDC_WANT_SECURE_LIB__
+                errorcode = EOVERFLOW_;          /* Overflow would occur if we proceed */
+#else
+                errorcode = EOVERFLOW;          /* Overflow would occur if we proceed */
+#endif
+            else
+                val *= 1024;                    /* 1KB = 1024 */
+        }
+        else if (detectsuffix(end, "MB"))        /* megabytes */
+        {
+            if ( val > (INT_MAX / 1048576) || val < (INT_MIN / 1048576) )
+#ifdef __STDC_WANT_SECURE_LIB__
+                errorcode = EOVERFLOW_;          /* Overflow would occur if we proceed */
+#else
+                errorcode = EOVERFLOW;          /* Overflow would occur if we proceed */
+#endif
+            else
+                val *= 1048576;                 /* 1MB = 1024*1024 */
+        }
+        else if (detectsuffix(end, "GB"))        /* gigabytes */
+        {
+            if ( val > (INT_MAX / 1073741824) || val < (INT_MIN / 1073741824) )
+#ifdef __STDC_WANT_SECURE_LIB__
+                errorcode = EOVERFLOW_;          /* Overflow would occur if we proceed */
+#else
+                errorcode = EOVERFLOW;          /* Overflow would occur if we proceed */
+#endif
+            else
+                val *= 1073741824;              /* 1GB = 1024*1024*1024 */
+        }
+        else if (!detectsuffix(end, ""))
+            errorcode = EBADINT;                /* invalid suffix detected */
+
+        /* if success then store result in parent->ival[] array */
+        if (errorcode == 0)
+            parent->ival[parent->count++] = val;
+    }
+
+    /* printf("%s:scanfn(%p,%p) returns %d\n",__FILE__,parent,argval,errorcode); */
+    return errorcode;
+}
+
+
+static int arg_int_checkfn(struct arg_int *parent)
+{
+    int errorcode = (parent->count < parent->hdr.mincount) ? EMINCOUNT : 0;
+    /*printf("%s:checkfn(%p) returns %d\n",__FILE__,parent,errorcode);*/
+    return errorcode;
+}
+
+
+static void arg_int_errorfn(
+    struct arg_int *parent,
+    FILE *fp,
+    int errorcode,
+    const char *argval,
+    const char *progname)
+{
+    const char *shortopts = parent->hdr.shortopts;
+    const char *longopts  = parent->hdr.longopts;
+    const char *datatype  = parent->hdr.datatype;
+
+    /* make argval NULL safe */
+    argval = argval ? argval : "";
+
+    fprintf(fp, "%s: ", progname);
+    switch(errorcode)
+    {
+    case EMINCOUNT:
+        fputs("missing option ", fp);
+        arg_print_option(fp, shortopts, longopts, datatype, "\n");
+        break;
+
+    case EMAXCOUNT:
+        fputs("excess option ", fp);
+        arg_print_option(fp, shortopts, longopts, argval, "\n");
+        break;
+
+    case EBADINT:
+        fprintf(fp, "invalid argument \"%s\" to option ", argval);
+        arg_print_option(fp, shortopts, longopts, datatype, "\n");
+        break;
+
+#ifdef __STDC_WANT_SECURE_LIB__
+    case EOVERFLOW_:
+#else
+    case EOVERFLOW:
+#endif
+        fputs("integer overflow at option ", fp);
+        arg_print_option(fp, shortopts, longopts, datatype, " ");
+        fprintf(fp, "(%s is too large)\n", argval);
+        break;
+    }
+}
+
+
+struct arg_int * arg_int0(
+    const char *shortopts,
+    const char *longopts,
+    const char *datatype,
+    const char *glossary)
+{
+    return arg_intn(shortopts, longopts, datatype, 0, 1, glossary);
+}
+
+
+struct arg_int * arg_int1(
+    const char *shortopts,
+    const char *longopts,
+    const char *datatype,
+    const char *glossary)
+{
+    return arg_intn(shortopts, longopts, datatype, 1, 1, glossary);
+}
+
+
+struct arg_int * arg_intn(
+    const char *shortopts,
+    const char *longopts,
+    const char *datatype,
+    int mincount,
+    int maxcount,
+    const char *glossary)
+{
+    size_t nbytes;
+    struct arg_int *result;
+
+    /* foolproof things by ensuring maxcount is not less than mincount */
+    maxcount = (maxcount < mincount) ? mincount : maxcount;
+
+    nbytes = sizeof(struct arg_int)    /* storage for struct arg_int */
+             + maxcount * sizeof(int); /* storage for ival[maxcount] array */
+
+    result = (struct arg_int *)malloc(nbytes);
+    if (result)
+    {
+        /* init the arg_hdr struct */
+        result->hdr.flag      = ARG_HASVALUE;
+        result->hdr.shortopts = shortopts;
+        result->hdr.longopts  = longopts;
+        result->hdr.datatype  = datatype ? datatype : "<int>";
+        result->hdr.glossary  = glossary;
+        result->hdr.mincount  = mincount;
+        result->hdr.maxcount  = maxcount;
+        result->hdr.parent    = result;
+        result->hdr.resetfn   = (arg_resetfn *)arg_int_resetfn;
+        result->hdr.scanfn    = (arg_scanfn *)arg_int_scanfn;
+        result->hdr.checkfn   = (arg_checkfn *)arg_int_checkfn;
+        result->hdr.errorfn   = (arg_errorfn *)arg_int_errorfn;
+
+        /* store the ival[maxcount] array immediately after the arg_int struct */
+        result->ival  = (int *)(result + 1);
+        result->count = 0;
+    }
+    
+    ARG_TRACE(("arg_intn() returns %p\n", result));
+    return result;
+}
+/*******************************************************************************
+ * This file is part of the argtable3 library.
+ *
+ * Copyright (C) 1998-2001,2003-2011,2013 Stewart Heitmann
+ * <sheitmann@users.sourceforge.net>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of STEWART HEITMANN nor the  names of its contributors
+ *       may be used to endorse or promote products derived from this software
+ *       without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL STEWART HEITMANN BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ******************************************************************************/
+
+#include <stdlib.h>
+
+#include "argtable3.h"
+
+
+static void arg_lit_resetfn(struct arg_lit *parent)
+{
+    ARG_TRACE(("%s:resetfn(%p)\n", __FILE__, parent));
+    parent->count = 0;
+}
+
+
+static int arg_lit_scanfn(struct arg_lit *parent, const char *argval)
+{
+    int errorcode = 0;
+    if (parent->count < parent->hdr.maxcount )
+        parent->count++;
+    else
+        errorcode = EMAXCOUNT;
+
+    ARG_TRACE(("%s:scanfn(%p,%s) returns %d\n", __FILE__, parent, argval,
+               errorcode));
+    return errorcode;
+}
+
+
+static int arg_lit_checkfn(struct arg_lit *parent)
+{
+    int errorcode = (parent->count < parent->hdr.mincount) ? EMINCOUNT : 0;
+    ARG_TRACE(("%s:checkfn(%p) returns %d\n", __FILE__, parent, errorcode));
+    return errorcode;
+}
+
+
+static void arg_lit_errorfn(
+    struct arg_lit *parent,
+    FILE *fp,
+    int errorcode,
+    const char *argval,
+    const char *progname)
+{
+    const char *shortopts = parent->hdr.shortopts;
+    const char *longopts  = parent->hdr.longopts;
+    const char *datatype  = parent->hdr.datatype;
+
+    switch(errorcode)
+    {
+    case EMINCOUNT:
+        fprintf(fp, "%s: missing option ", progname);
+        arg_print_option(fp, shortopts, longopts, datatype, "\n");
+        fprintf(fp, "\n");
+        break;
+
+    case EMAXCOUNT:
+        fprintf(fp, "%s: extraneous option ", progname);
+        arg_print_option(fp, shortopts, longopts, datatype, "\n");
+        break;
+    }
+
+    ARG_TRACE(("%s:errorfn(%p, %p, %d, %s, %s)\n", __FILE__, parent, fp,
+               errorcode, argval, progname));
+}
+
+
+struct arg_lit * arg_lit0(
+    const char * shortopts,
+    const char * longopts,
+    const char * glossary)
+{
+    return arg_litn(shortopts, longopts, 0, 1, glossary);
+}
+
+
+struct arg_lit * arg_lit1(
+    const char *shortopts,
+    const char *longopts,
+    const char *glossary)
+{
+    return arg_litn(shortopts, longopts, 1, 1, glossary);
+}
+
+
+struct arg_lit * arg_litn(
+    const char *shortopts,
+    const char *longopts,
+    int mincount,
+    int maxcount,
+    const char *glossary)
+{
+    struct arg_lit *result;
+
+    /* foolproof things by ensuring maxcount is not less than mincount */
+    maxcount = (maxcount < mincount) ? mincount : maxcount;
+
+    result = (struct arg_lit *)malloc(sizeof(struct arg_lit));
+    if (result)
+    {
+        /* init the arg_hdr struct */
+        result->hdr.flag      = 0;
+        result->hdr.shortopts = shortopts;
+        result->hdr.longopts  = longopts;
+        result->hdr.datatype  = NULL;
+        result->hdr.glossary  = glossary;
+        result->hdr.mincount  = mincount;
+        result->hdr.maxcount  = maxcount;
+        result->hdr.parent    = result;
+        result->hdr.resetfn   = (arg_resetfn *)arg_lit_resetfn;
+        result->hdr.scanfn    = (arg_scanfn *)arg_lit_scanfn;
+        result->hdr.checkfn   = (arg_checkfn *)arg_lit_checkfn;
+        result->hdr.errorfn   = (arg_errorfn *)arg_lit_errorfn;
+
+        /* init local variables */
+        result->count = 0;
+    }
+    
+    ARG_TRACE(("arg_litn() returns %p\n", result));
+    return result;
+}
+/*******************************************************************************
+ * This file is part of the argtable3 library.
+ *
+ * Copyright (C) 1998-2001,2003-2011,2013 Stewart Heitmann
+ * <sheitmann@users.sourceforge.net>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of STEWART HEITMANN nor the  names of its contributors
+ *       may be used to endorse or promote products derived from this software
+ *       without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL STEWART HEITMANN BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ******************************************************************************/
+
+#include <stdlib.h>
+
+#include "argtable3.h"
+
+struct arg_rem *arg_rem(const char *datatype, const char *glossary)
+{
+    struct arg_rem *result = (struct arg_rem *)malloc(sizeof(struct arg_rem));
+    if (result)
+    {
+        result->hdr.flag = 0;
+        result->hdr.shortopts = NULL;
+        result->hdr.longopts = NULL;
+        result->hdr.datatype = datatype;
+        result->hdr.glossary = glossary;
+        result->hdr.mincount = 1;
+        result->hdr.maxcount = 1;
+        result->hdr.parent = result;
+        result->hdr.resetfn = NULL;
+        result->hdr.scanfn = NULL;
+        result->hdr.checkfn = NULL;
+        result->hdr.errorfn = NULL;
+    }
+
+    ARG_TRACE(("arg_rem() returns %p\n", result));
+    return result;
+}
+
+/*******************************************************************************
+ * This file is part of the argtable3 library.
+ *
+ * Copyright (C) 1998-2001,2003-2011,2013 Stewart Heitmann
+ * <sheitmann@users.sourceforge.net>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of STEWART HEITMANN nor the  names of its contributors
+ *       may be used to endorse or promote products derived from this software
+ *       without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL STEWART HEITMANN BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ******************************************************************************/
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "argtable3.h"
+
+
+#ifndef _TREX_H_
+#define _TREX_H_
+/***************************************************************
+	T-Rex a tiny regular expression library
+
+	Copyright (C) 2003-2006 Alberto Demichelis
+
+	This software is provided 'as-is', without any express
+	or implied warranty. In no event will the authors be held
+	liable for any damages arising from the use of this software.
+
+	Permission is granted to anyone to use this software for
+	any purpose, including commercial applications, and to alter
+	it and redistribute it freely, subject to the following restrictions:
+
+		1. The origin of this software must not be misrepresented;
+		you must not claim that you wrote the original software.
+		If you use this software in a product, an acknowledgment
+		in the product documentation would be appreciated but
+		is not required.
+
+		2. Altered source versions must be plainly marked as such,
+		and must not be misrepresented as being the original software.
+
+		3. This notice may not be removed or altered from any
+		source distribution.
+
+****************************************************************/
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef _UNICODE
+#define TRexChar unsigned short
+#define MAX_CHAR 0xFFFF
+#define _TREXC(c) L##c
+#define trex_strlen wcslen
+#define trex_printf wprintf
+#else
+#define TRexChar char
+#define MAX_CHAR 0xFF
+#define _TREXC(c) (c)
+#define trex_strlen strlen
+#define trex_printf printf
+#endif
+
+#ifndef TREX_API
+#define TREX_API extern
+#endif
+
+#define TRex_True 1
+#define TRex_False 0
+
+#define TREX_ICASE ARG_REX_ICASE
+
+typedef unsigned int TRexBool;
+typedef struct TRex TRex;
+
+typedef struct {
+	const TRexChar *begin;
+	int len;
+} TRexMatch;
+
+TREX_API TRex *trex_compile(const TRexChar *pattern, const TRexChar **error, int flags);
+TREX_API void trex_free(TRex *exp);
+TREX_API TRexBool trex_match(TRex* exp, const TRexChar* text);
+TREX_API TRexBool trex_search(TRex* exp, const TRexChar* text, const TRexChar** out_begin, const TRexChar** out_end);
+TREX_API TRexBool trex_searchrange(TRex* exp, const TRexChar* text_begin, const TRexChar* text_end, const TRexChar** out_begin, const TRexChar** out_end);
+TREX_API int trex_getsubexpcount(TRex* exp);
+TREX_API TRexBool trex_getsubexp(TRex* exp, int n, TRexMatch *subexp);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
+
+
+struct privhdr
+{
+    const char *pattern;
+    int flags;
+};
+
+
+static void arg_rex_resetfn(struct arg_rex *parent)
+{
+    ARG_TRACE(("%s:resetfn(%p)\n", __FILE__, parent));
+    parent->count = 0;
+}
+
+static int arg_rex_scanfn(struct arg_rex *parent, const char *argval)
+{
+    int errorcode = 0;
+    const TRexChar *error = NULL;
+    TRex *rex = NULL;
+    TRexBool is_match = TRex_False;
+
+    if (parent->count == parent->hdr.maxcount )
+    {
+        /* maximum number of arguments exceeded */
+        errorcode = EMAXCOUNT;
+    }
+    else if (!argval)
+    {
+        /* a valid argument with no argument value was given. */
+        /* This happens when an optional argument value was invoked. */
+        /* leave parent argument value unaltered but still count the argument. */
+        parent->count++;
+    }
+    else
+    {
+        struct privhdr *priv = (struct privhdr *)parent->hdr.priv;
+
+        /* test the current argument value for a match with the regular expression */
+        /* if a match is detected, record the argument value in the arg_rex struct */
+
+        rex = trex_compile(priv->pattern, &error, priv->flags);
+        is_match = trex_match(rex, argval);
+        if (!is_match)
+            errorcode = EREGNOMATCH;
+        else
+            parent->sval[parent->count++] = argval;
+
+        trex_free(rex);
+    }
+
+    ARG_TRACE(("%s:scanfn(%p) returns %d\n",__FILE__,parent,errorcode));
+    return errorcode;
+}
+
+static int arg_rex_checkfn(struct arg_rex *parent)
+{
+    int errorcode = (parent->count < parent->hdr.mincount) ? EMINCOUNT : 0;
+    //struct privhdr *priv = (struct privhdr*)parent->hdr.priv;
+
+    /* free the regex "program" we constructed in resetfn */
+    //regfree(&(priv->regex));
+
+    /*printf("%s:checkfn(%p) returns %d\n",__FILE__,parent,errorcode);*/
+    return errorcode;
+}
+
+static void arg_rex_errorfn(struct arg_rex *parent,
+                    FILE *fp,
+                    int errorcode,
+                    const char *argval,
+                    const char *progname)
+{
+    const char *shortopts = parent->hdr.shortopts;
+    const char *longopts  = parent->hdr.longopts;
+    const char *datatype  = parent->hdr.datatype;
+
+    /* make argval NULL safe */
+    argval = argval ? argval : "";
+
+    fprintf(fp, "%s: ", progname);
+    switch(errorcode)
+    {
+    case EMINCOUNT:
+        fputs("missing option ", fp);
+        arg_print_option(fp, shortopts, longopts, datatype, "\n");
+        break;
+
+    case EMAXCOUNT:
+        fputs("excess option ", fp);
+        arg_print_option(fp, shortopts, longopts, argval, "\n");
+        break;
+
+    case EREGNOMATCH:
+        fputs("illegal value  ", fp);
+        arg_print_option(fp, shortopts, longopts, argval, "\n");
+        break;
+
+    default:
+    {
+        //char errbuff[256];
+        //regerror(errorcode, NULL, errbuff, sizeof(errbuff));
+        //printf("%s\n", errbuff);
+    }
+    break;
+    }
+}
+
+
+struct arg_rex * arg_rex0(const char * shortopts,
+                          const char * longopts,
+                          const char * pattern,
+                          const char *datatype,
+                          int flags,
+                          const char *glossary)
+{
+    return arg_rexn(shortopts,
+                    longopts,
+                    pattern,
+                    datatype,
+                    0,
+                    1,
+                    flags,
+                    glossary);
+}
+
+struct arg_rex * arg_rex1(const char * shortopts,
+                          const char * longopts,
+                          const char * pattern,
+                          const char *datatype,
+                          int flags,
+                          const char *glossary)
+{
+    return arg_rexn(shortopts,
+                    longopts,
+                    pattern,
+                    datatype,
+                    1,
+                    1,
+                    flags,
+                    glossary);
+}
+
+
+struct arg_rex * arg_rexn(const char * shortopts,
+                          const char * longopts,
+                          const char * pattern,
+                          const char *datatype,
+                          int mincount,
+                          int maxcount,
+                          int flags,
+                          const char *glossary)
+{
+    size_t nbytes;
+    struct arg_rex *result;
+    struct privhdr *priv;
+    int i;
+    const TRexChar *error = NULL;
+    TRex *rex = NULL;
+
+    if (!pattern)
+    {
+        printf(
+            "argtable: ERROR - illegal regular expression pattern \"(NULL)\"\n");
+        printf("argtable: Bad argument table.\n");
+        return NULL;
+    }
+
+    /* foolproof things by ensuring maxcount is not less than mincount */
+    maxcount = (maxcount < mincount) ? mincount : maxcount;
+
+    nbytes = sizeof(struct arg_rex)       /* storage for struct arg_rex */
+             + sizeof(struct privhdr)     /* storage for private arg_rex data */
+             + maxcount * sizeof(char *);  /* storage for sval[maxcount] array */
+
+    result = (struct arg_rex *)malloc(nbytes);
+    if (result == NULL)
+        return result;
+
+    /* init the arg_hdr struct */
+    result->hdr.flag      = ARG_HASVALUE;
+    result->hdr.shortopts = shortopts;
+    result->hdr.longopts  = longopts;
+    result->hdr.datatype  = datatype ? datatype : pattern;
+    result->hdr.glossary  = glossary;
+    result->hdr.mincount  = mincount;
+    result->hdr.maxcount  = maxcount;
+    result->hdr.parent    = result;
+    result->hdr.resetfn   = (arg_resetfn *)arg_rex_resetfn;
+    result->hdr.scanfn    = (arg_scanfn *)arg_rex_scanfn;
+    result->hdr.checkfn   = (arg_checkfn *)arg_rex_checkfn;
+    result->hdr.errorfn   = (arg_errorfn *)arg_rex_errorfn;
+
+    /* store the arg_rex_priv struct immediately after the arg_rex struct */
+    result->hdr.priv  = result + 1;
+    priv = (struct privhdr *)(result->hdr.priv);
+    priv->pattern = pattern;
+    priv->flags = flags;
+
+    /* store the sval[maxcount] array immediately after the arg_rex_priv struct */
+    result->sval  = (const char * *)(priv + 1);
+    result->count = 0;
+
+    /* foolproof the string pointers by initializing them to reference empty strings */
+    for (i = 0; i < maxcount; i++)
+        result->sval[i] = "";
+
+    /* here we construct and destroy a regex representation of the regular
+     * expression for no other reason than to force any regex errors to be
+     * trapped now rather than later. If we don't, then errors may go undetected
+     * until an argument is actually parsed.
+     */
+
+    rex = trex_compile(priv->pattern, &error, priv->flags);
+    if (rex == NULL)
+    {
+        ARG_LOG(("argtable: %s \"%s\"\n", error ? error : _TREXC("undefined"), priv->pattern));
+        ARG_LOG(("argtable: Bad argument table.\n"));
+    }
+
+    trex_free(rex);
+
+    ARG_TRACE(("arg_rexn() returns %p\n", result));
+    return result;
+}
+
+
+
+/* see copyright notice in trex.h */
+#include <string.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <setjmp.h>
+
+#ifdef _UINCODE
+#define scisprint iswprint
+#define scstrlen wcslen
+#define scprintf wprintf
+#define _SC(x) L(x)
+#else
+#define scisprint isprint
+#define scstrlen strlen
+#define scprintf printf
+#define _SC(x) (x)
+#endif
+
+#ifdef _DEBUG
+#include <stdio.h>
+
+static const TRexChar *g_nnames[] =
+{
+	_SC("NONE"),_SC("OP_GREEDY"),	_SC("OP_OR"),
+	_SC("OP_EXPR"),_SC("OP_NOCAPEXPR"),_SC("OP_DOT"),	_SC("OP_CLASS"),
+	_SC("OP_CCLASS"),_SC("OP_NCLASS"),_SC("OP_RANGE"),_SC("OP_CHAR"),
+	_SC("OP_EOL"),_SC("OP_BOL"),_SC("OP_WB")
+};
+
+#endif
+#define OP_GREEDY		(MAX_CHAR+1) // * + ? {n}
+#define OP_OR			(MAX_CHAR+2)
+#define OP_EXPR			(MAX_CHAR+3) //parentesis ()
+#define OP_NOCAPEXPR	(MAX_CHAR+4) //parentesis (?:)
+#define OP_DOT			(MAX_CHAR+5)
+#define OP_CLASS		(MAX_CHAR+6)
+#define OP_CCLASS		(MAX_CHAR+7)
+#define OP_NCLASS		(MAX_CHAR+8) //negates class the [^
+#define OP_RANGE		(MAX_CHAR+9)
+#define OP_CHAR			(MAX_CHAR+10)
+#define OP_EOL			(MAX_CHAR+11)
+#define OP_BOL			(MAX_CHAR+12)
+#define OP_WB			(MAX_CHAR+13)
+
+#define TREX_SYMBOL_ANY_CHAR ('.')
+#define TREX_SYMBOL_GREEDY_ONE_OR_MORE ('+')
+#define TREX_SYMBOL_GREEDY_ZERO_OR_MORE ('*')
+#define TREX_SYMBOL_GREEDY_ZERO_OR_ONE ('?')
+#define TREX_SYMBOL_BRANCH ('|')
+#define TREX_SYMBOL_END_OF_STRING ('$')
+#define TREX_SYMBOL_BEGINNING_OF_STRING ('^')
+#define TREX_SYMBOL_ESCAPE_CHAR ('\\')
+
+
+typedef int TRexNodeType;
+
+typedef struct tagTRexNode{
+	TRexNodeType type;
+	int left;
+	int right;
+	int next;
+}TRexNode;
+
+struct TRex{
+	const TRexChar *_eol;
+	const TRexChar *_bol;
+	const TRexChar *_p;
+	int _first;
+	int _op;
+	TRexNode *_nodes;
+	int _nallocated;
+	int _nsize;
+	int _nsubexpr;
+	TRexMatch *_matches;
+	int _currsubexp;
+	void *_jmpbuf;
+	const TRexChar **_error;
+	int _flags;
+};
+
+static int trex_list(TRex *exp);
+
+static int trex_newnode(TRex *exp, TRexNodeType type)
+{
+	TRexNode n;
+	int newid;
+	n.type = type;
+	n.next = n.right = n.left = -1;
+	if(type == OP_EXPR)
+		n.right = exp->_nsubexpr++;
+	if(exp->_nallocated < (exp->_nsize + 1)) {
+		exp->_nallocated *= 2;
+		exp->_nodes = (TRexNode *)realloc(exp->_nodes, exp->_nallocated * sizeof(TRexNode));
+	}
+	exp->_nodes[exp->_nsize++] = n;
+	newid = exp->_nsize - 1;
+	return (int)newid;
+}
+
+static void trex_error(TRex *exp,const TRexChar *error)
+{
+	if(exp->_error) *exp->_error = error;
+	longjmp(*((jmp_buf*)exp->_jmpbuf),-1);
+}
+
+static void trex_expect(TRex *exp, int n){
+	if((*exp->_p) != n)
+		trex_error(exp, _SC("expected paren"));
+	exp->_p++;
+}
+
+static TRexChar trex_escapechar(TRex *exp)
+{
+	if(*exp->_p == TREX_SYMBOL_ESCAPE_CHAR){
+		exp->_p++;
+		switch(*exp->_p) {
+		case 'v': exp->_p++; return '\v';
+		case 'n': exp->_p++; return '\n';
+		case 't': exp->_p++; return '\t';
+		case 'r': exp->_p++; return '\r';
+		case 'f': exp->_p++; return '\f';
+		default: return (*exp->_p++);
+		}
+	} else if(!scisprint(*exp->_p)) trex_error(exp,_SC("letter expected"));
+	return (*exp->_p++);
+}
+
+static int trex_charclass(TRex *exp,int classid)
+{
+	int n = trex_newnode(exp,OP_CCLASS);
+	exp->_nodes[n].left = classid;
+	return n;
+}
+
+static int trex_charnode(TRex *exp,TRexBool isclass)
+{
+	TRexChar t;
+	if(*exp->_p == TREX_SYMBOL_ESCAPE_CHAR) {
+		exp->_p++;
+		switch(*exp->_p) {
+			case 'n': exp->_p++; return trex_newnode(exp,'\n');
+			case 't': exp->_p++; return trex_newnode(exp,'\t');
+			case 'r': exp->_p++; return trex_newnode(exp,'\r');
+			case 'f': exp->_p++; return trex_newnode(exp,'\f');
+			case 'v': exp->_p++; return trex_newnode(exp,'\v');
+			case 'a': case 'A': case 'w': case 'W': case 's': case 'S':
+			case 'd': case 'D': case 'x': case 'X': case 'c': case 'C':
+			case 'p': case 'P': case 'l': case 'u':
+				{
+				t = *exp->_p; exp->_p++;
+				return trex_charclass(exp,t);
+				}
+			case 'b':
+			case 'B':
+				if(!isclass) {
+					int node = trex_newnode(exp,OP_WB);
+					exp->_nodes[node].left = *exp->_p;
+					exp->_p++;
+					return node;
+				} //else default
+			default:
+				t = *exp->_p; exp->_p++;
+				return trex_newnode(exp,t);
+		}
+	}
+	else if(!scisprint(*exp->_p)) {
+
+		trex_error(exp,_SC("letter expected"));
+	}
+	t = *exp->_p; exp->_p++;
+	return trex_newnode(exp,t);
+}
+static int trex_class(TRex *exp)
+{
+	int ret = -1;
+	int first = -1,chain;
+	if(*exp->_p == TREX_SYMBOL_BEGINNING_OF_STRING){
+		ret = trex_newnode(exp,OP_NCLASS);
+		exp->_p++;
+	}else ret = trex_newnode(exp,OP_CLASS);
+
+	if(*exp->_p == ']') trex_error(exp,_SC("empty class"));
+	chain = ret;
+	while(*exp->_p != ']' && exp->_p != exp->_eol) {
+		if(*exp->_p == '-' && first != -1){
+			int r,t;
+			if(*exp->_p++ == ']') trex_error(exp,_SC("unfinished range"));
+			r = trex_newnode(exp,OP_RANGE);
+			if(first>*exp->_p) trex_error(exp,_SC("invalid range"));
+			if(exp->_nodes[first].type == OP_CCLASS) trex_error(exp,_SC("cannot use character classes in ranges"));
+			exp->_nodes[r].left = exp->_nodes[first].type;
+			t = trex_escapechar(exp);
+			exp->_nodes[r].right = t;
+            exp->_nodes[chain].next = r;
+			chain = r;
+			first = -1;
+		}
+		else{
+			if(first!=-1){
+				int c = first;
+				exp->_nodes[chain].next = c;
+				chain = c;
+				first = trex_charnode(exp,TRex_True);
+			}
+			else{
+				first = trex_charnode(exp,TRex_True);
+			}
+		}
+	}
+	if(first!=-1){
+		int c = first;
+		exp->_nodes[chain].next = c;
+		chain = c;
+		first = -1;
+	}
+	/* hack? */
+	exp->_nodes[ret].left = exp->_nodes[ret].next;
+	exp->_nodes[ret].next = -1;
+	return ret;
+}
+
+static int trex_parsenumber(TRex *exp)
+{
+	int ret = *exp->_p-'0';
+	int positions = 10;
+	exp->_p++;
+	while(isdigit(*exp->_p)) {
+		ret = ret*10+(*exp->_p++-'0');
+		if(positions==1000000000) trex_error(exp,_SC("overflow in numeric constant"));
+		positions *= 10;
+	};
+	return ret;
+}
+
+static int trex_element(TRex *exp)
+{
+	int ret = -1;
+	switch(*exp->_p)
+	{
+	case '(': {
+		int expr,newn;
+		exp->_p++;
+
+
+		if(*exp->_p =='?') {
+			exp->_p++;
+			trex_expect(exp,':');
+			expr = trex_newnode(exp,OP_NOCAPEXPR);
+		}
+		else
+			expr = trex_newnode(exp,OP_EXPR);
+		newn = trex_list(exp);
+		exp->_nodes[expr].left = newn;
+		ret = expr;
+		trex_expect(exp,')');
+			  }
+			  break;
+	case '[':
+		exp->_p++;
+		ret = trex_class(exp);
+		trex_expect(exp,']');
+		break;
+	case TREX_SYMBOL_END_OF_STRING: exp->_p++; ret = trex_newnode(exp,OP_EOL);break;
+	case TREX_SYMBOL_ANY_CHAR: exp->_p++; ret = trex_newnode(exp,OP_DOT);break;
+	default:
+		ret = trex_charnode(exp,TRex_False);
+		break;
+	}
+
+	{
+		TRexBool isgreedy = TRex_False;
+		unsigned short p0 = 0, p1 = 0;
+		switch(*exp->_p){
+			case TREX_SYMBOL_GREEDY_ZERO_OR_MORE: p0 = 0; p1 = 0xFFFF; exp->_p++; isgreedy = TRex_True; break;
+			case TREX_SYMBOL_GREEDY_ONE_OR_MORE: p0 = 1; p1 = 0xFFFF; exp->_p++; isgreedy = TRex_True; break;
+			case TREX_SYMBOL_GREEDY_ZERO_OR_ONE: p0 = 0; p1 = 1; exp->_p++; isgreedy = TRex_True; break;
+			case '{':
+				exp->_p++;
+				if(!isdigit(*exp->_p)) trex_error(exp,_SC("number expected"));
+				p0 = (unsigned short)trex_parsenumber(exp);
+				/*******************************/
+				switch(*exp->_p) {
+			case '}':
+				p1 = p0; exp->_p++;
+				break;
+			case ',':
+				exp->_p++;
+				p1 = 0xFFFF;
+				if(isdigit(*exp->_p)){
+					p1 = (unsigned short)trex_parsenumber(exp);
+				}
+				trex_expect(exp,'}');
+				break;
+			default:
+				trex_error(exp,_SC(", or } expected"));
+		}
+		/*******************************/
+		isgreedy = TRex_True;
+		break;
+
+		}
+		if(isgreedy) {
+			int nnode = trex_newnode(exp,OP_GREEDY);
+			exp->_nodes[nnode].left = ret;
+			exp->_nodes[nnode].right = ((p0)<<16)|p1;
+			ret = nnode;
+		}
+	}
+	if((*exp->_p != TREX_SYMBOL_BRANCH) && (*exp->_p != ')') && (*exp->_p != TREX_SYMBOL_GREEDY_ZERO_OR_MORE) && (*exp->_p != TREX_SYMBOL_GREEDY_ONE_OR_MORE) && (*exp->_p != '\0')) {
+		int nnode = trex_element(exp);
+		exp->_nodes[ret].next = nnode;
+	}
+
+	return ret;
+}
+
+static int trex_list(TRex *exp)
+{
+	int ret=-1,e;
+	if(*exp->_p == TREX_SYMBOL_BEGINNING_OF_STRING) {
+		exp->_p++;
+		ret = trex_newnode(exp,OP_BOL);
+	}
+	e = trex_element(exp);
+	if(ret != -1) {
+		exp->_nodes[ret].next = e;
+	}
+	else ret = e;
+
+	if(*exp->_p == TREX_SYMBOL_BRANCH) {
+		int temp,tright;
+		exp->_p++;
+		temp = trex_newnode(exp,OP_OR);
+		exp->_nodes[temp].left = ret;
+		tright = trex_list(exp);
+		exp->_nodes[temp].right = tright;
+		ret = temp;
+	}
+	return ret;
+}
+
+static TRexBool trex_matchcclass(int cclass,TRexChar c)
+{
+	switch(cclass) {
+	case 'a': return isalpha(c)?TRex_True:TRex_False;
+	case 'A': return !isalpha(c)?TRex_True:TRex_False;
+	case 'w': return (isalnum(c) || c == '_')?TRex_True:TRex_False;
+	case 'W': return (!isalnum(c) && c != '_')?TRex_True:TRex_False;
+	case 's': return ISSPACE(c)?TRex_True:TRex_False;
+	case 'S': return !ISSPACE(c)?TRex_True:TRex_False;
+	case 'd': return isdigit(c)?TRex_True:TRex_False;
+	case 'D': return !isdigit(c)?TRex_True:TRex_False;
+	case 'x': return isxdigit(c)?TRex_True:TRex_False;
+	case 'X': return !isxdigit(c)?TRex_True:TRex_False;
+	case 'c': return iscntrl(c)?TRex_True:TRex_False;
+	case 'C': return !iscntrl(c)?TRex_True:TRex_False;
+	case 'p': return ispunct(c)?TRex_True:TRex_False;
+	case 'P': return !ispunct(c)?TRex_True:TRex_False;
+	case 'l': return islower(c)?TRex_True:TRex_False;
+	case 'u': return isupper(c)?TRex_True:TRex_False;
+	}
+	return TRex_False; /*cannot happen*/
+}
+
+static TRexBool trex_matchclass(TRex* exp,TRexNode *node,TRexChar c)
+{
+	do {
+		switch(node->type) {
+			case OP_RANGE:
+				if (exp->_flags & TREX_ICASE)
+				{
+					if(c >= toupper(node->left) && c <= toupper(node->right)) return TRex_True;
+					if(c >= tolower(node->left) && c <= tolower(node->right)) return TRex_True;
+				}
+				else
+				{
+					if(c >= node->left && c <= node->right) return TRex_True;
+				}
+				break;
+			case OP_CCLASS:
+				if(trex_matchcclass(node->left,c)) return TRex_True;
+				break;
+			default:
+				if (exp->_flags & TREX_ICASE)
+				{
+					if (c == tolower(node->type) || c == toupper(node->type)) return TRex_True;
+				}
+				else
+				{
+					if(c == node->type)return TRex_True;
+				}
+
+		}
+	} while((node->next != -1) && (node = &exp->_nodes[node->next]));
+	return TRex_False;
+}
+
+static const TRexChar *trex_matchnode(TRex* exp,TRexNode *node,const TRexChar *str,TRexNode *next)
+{
+
+	TRexNodeType type = node->type;
+	switch(type) {
+	case OP_GREEDY: {
+		//TRexNode *greedystop = (node->next != -1) ? &exp->_nodes[node->next] : NULL;
+		TRexNode *greedystop = NULL;
+		int p0 = (node->right >> 16)&0x0000FFFF, p1 = node->right&0x0000FFFF, nmaches = 0;
+		const TRexChar *s=str, *good = str;
+
+		if(node->next != -1) {
+			greedystop = &exp->_nodes[node->next];
+		}
+		else {
+			greedystop = next;
+		}
+
+		while((nmaches == 0xFFFF || nmaches < p1)) {
+
+			const TRexChar *stop;
+			if(!(s = trex_matchnode(exp,&exp->_nodes[node->left],s,greedystop)))
+				break;
+			nmaches++;
+			good=s;
+			if(greedystop) {
+				//checks that 0 matches satisfy the expression(if so skips)
+				//if not would always stop(for instance if is a '?')
+				if(greedystop->type != OP_GREEDY ||
+				(greedystop->type == OP_GREEDY && ((greedystop->right >> 16)&0x0000FFFF) != 0))
+				{
+					TRexNode *gnext = NULL;
+					if(greedystop->next != -1) {
+						gnext = &exp->_nodes[greedystop->next];
+					}else if(next && next->next != -1){
+						gnext = &exp->_nodes[next->next];
+					}
+					stop = trex_matchnode(exp,greedystop,s,gnext);
+					if(stop) {
+						//if satisfied stop it
+						if(p0 == p1 && p0 == nmaches) break;
+						else if(nmaches >= p0 && p1 == 0xFFFF) break;
+						else if(nmaches >= p0 && nmaches <= p1) break;
+					}
+				}
+			}
+
+			if(s >= exp->_eol)
+				break;
+		}
+		if(p0 == p1 && p0 == nmaches) return good;
+		else if(nmaches >= p0 && p1 == 0xFFFF) return good;
+		else if(nmaches >= p0 && nmaches <= p1) return good;
+		return NULL;
+	}
+	case OP_OR: {
+			const TRexChar *asd = str;
+			TRexNode *temp=&exp->_nodes[node->left];
+			while( (asd = trex_matchnode(exp,temp,asd,NULL)) ) {
+				if(temp->next != -1)
+					temp = &exp->_nodes[temp->next];
+				else
+					return asd;
+			}
+			asd = str;
+			temp = &exp->_nodes[node->right];
+			while( (asd = trex_matchnode(exp,temp,asd,NULL)) ) {
+				if(temp->next != -1)
+					temp = &exp->_nodes[temp->next];
+				else
+					return asd;
+			}
+			return NULL;
+			break;
+	}
+	case OP_EXPR:
+	case OP_NOCAPEXPR:{
+			TRexNode *n = &exp->_nodes[node->left];
+			const TRexChar *cur = str;
+			int capture = -1;
+			if(node->type != OP_NOCAPEXPR && node->right == exp->_currsubexp) {
+				capture = exp->_currsubexp;
+				exp->_matches[capture].begin = cur;
+				exp->_currsubexp++;
+			}
+
+			do {
+				TRexNode *subnext = NULL;
+				if(n->next != -1) {
+					subnext = &exp->_nodes[n->next];
+				}else {
+					subnext = next;
+				}
+				if(!(cur = trex_matchnode(exp,n,cur,subnext))) {
+					if(capture != -1){
+						exp->_matches[capture].begin = 0;
+						exp->_matches[capture].len = 0;
+					}
+					return NULL;
+				}
+			} while((n->next != -1) && (n = &exp->_nodes[n->next]));
+
+			if(capture != -1)
+				exp->_matches[capture].len = (int)(cur - exp->_matches[capture].begin);
+			return cur;
+	}
+	case OP_WB:
+		if((str == exp->_bol && !ISSPACE(*str))
+		 || ((str == exp->_eol && !ISSPACE(*(str-1))))
+		 || ((!ISSPACE(*str) && ISSPACE(*(str+1))))
+		 || ((ISSPACE(*str) && !ISSPACE(*(str+1)))) ) {
+			return (node->left == 'b')?str:NULL;
+		}
+		return (node->left == 'b')?NULL:str;
+	case OP_BOL:
+		if(str == exp->_bol) return str;
+		return NULL;
+	case OP_EOL:
+		if(str == exp->_eol) return str;
+		return NULL;
+	case OP_DOT:
+		str++;
+		return str;
+	case OP_NCLASS:
+	case OP_CLASS:
+		if(trex_matchclass(exp,&exp->_nodes[node->left],*str)?(type == OP_CLASS?TRex_True:TRex_False):(type == OP_NCLASS?TRex_True:TRex_False)) {
+                        str++;
+			return str;
+		}
+		return NULL;
+	case OP_CCLASS:
+		if(trex_matchcclass(node->left,*str)) {
+                        str++;
+			return str;
+		}
+		return NULL;
+	default: /* char */
+		if (exp->_flags & TREX_ICASE)
+		{
+			if(*str != tolower(node->type) && *str != toupper(node->type)) return NULL;
+		}
+		else
+		{
+			if (*str != node->type) return NULL;
+		}
+		str++;
+		return str;
+	}
+	return NULL;
+}
+
+/* public api */
+TRex *trex_compile(const TRexChar *pattern,const TRexChar **error,int flags)
+{
+	TRex *exp = (TRex *)malloc(sizeof(TRex));
+	exp->_eol = exp->_bol = NULL;
+	exp->_p = pattern;
+	exp->_nallocated = (int)scstrlen(pattern) * sizeof(TRexChar);
+	exp->_nodes = (TRexNode *)malloc(exp->_nallocated * sizeof(TRexNode));
+	exp->_nsize = 0;
+	exp->_matches = 0;
+	exp->_nsubexpr = 0;
+	exp->_first = trex_newnode(exp,OP_EXPR);
+	exp->_error = error;
+	exp->_jmpbuf = malloc(sizeof(jmp_buf));
+	exp->_flags = flags;
+	if(setjmp(*((jmp_buf*)exp->_jmpbuf)) == 0) {
+		int res = trex_list(exp);
+		exp->_nodes[exp->_first].left = res;
+		if(*exp->_p!='\0')
+			trex_error(exp,_SC("unexpected character"));
+#ifdef _DEBUG
+		{
+			int nsize,i;
+			TRexNode *t;
+			nsize = exp->_nsize;
+			t = &exp->_nodes[0];
+			scprintf(_SC("\n"));
+			for(i = 0;i < nsize; i++) {
+				if(exp->_nodes[i].type>MAX_CHAR)
+					scprintf(_SC("[%02d] %10s "),i,g_nnames[exp->_nodes[i].type-MAX_CHAR]);
+				else
+					scprintf(_SC("[%02d] %10c "),i,exp->_nodes[i].type);
+				scprintf(_SC("left %02d right %02d next %02d\n"),exp->_nodes[i].left,exp->_nodes[i].right,exp->_nodes[i].next);
+			}
+			scprintf(_SC("\n"));
+		}
+#endif
+		exp->_matches = (TRexMatch *) malloc(exp->_nsubexpr * sizeof(TRexMatch));
+		memset(exp->_matches,0,exp->_nsubexpr * sizeof(TRexMatch));
+	}
+	else{
+		trex_free(exp);
+		return NULL;
+	}
+	return exp;
+}
+
+void trex_free(TRex *exp)
+{
+	if(exp)	{
+		if(exp->_nodes) free(exp->_nodes);
+		if(exp->_jmpbuf) free(exp->_jmpbuf);
+		if(exp->_matches) free(exp->_matches);
+		free(exp);
+	}
+}
+
+TRexBool trex_match(TRex* exp,const TRexChar* text)
+{
+	const TRexChar* res = NULL;
+	exp->_bol = text;
+	exp->_eol = text + scstrlen(text);
+	exp->_currsubexp = 0;
+	res = trex_matchnode(exp,exp->_nodes,text,NULL);
+	if(res == NULL || res != exp->_eol)
+		return TRex_False;
+	return TRex_True;
+}
+
+TRexBool trex_searchrange(TRex* exp,const TRexChar* text_begin,const TRexChar* text_end,const TRexChar** out_begin, const TRexChar** out_end)
+{
+	const TRexChar *cur = NULL;
+	int node = exp->_first;
+	if(text_begin >= text_end) return TRex_False;
+	exp->_bol = text_begin;
+	exp->_eol = text_end;
+	do {
+		cur = text_begin;
+		while(node != -1) {
+			exp->_currsubexp = 0;
+			cur = trex_matchnode(exp,&exp->_nodes[node],cur,NULL);
+			if(!cur)
+				break;
+			node = exp->_nodes[node].next;
+		}
+		text_begin++;
+	} while(cur == NULL && text_begin != text_end);
+
+	if(cur == NULL)
+		return TRex_False;
+
+	--text_begin;
+
+	if(out_begin) *out_begin = text_begin;
+	if(out_end) *out_end = cur;
+	return TRex_True;
+}
+
+TRexBool trex_search(TRex* exp,const TRexChar* text, const TRexChar** out_begin, const TRexChar** out_end)
+{
+	return trex_searchrange(exp,text,text + scstrlen(text),out_begin,out_end);
+}
+
+int trex_getsubexpcount(TRex* exp)
+{
+	return exp->_nsubexpr;
+}
+
+TRexBool trex_getsubexp(TRex* exp, int n, TRexMatch *subexp)
+{
+	if( n<0 || n >= exp->_nsubexpr) return TRex_False;
+	*subexp = exp->_matches[n];
+	return TRex_True;
+}
+/*******************************************************************************
+ * This file is part of the argtable3 library.
+ *
+ * Copyright (C) 1998-2001,2003-2011,2013 Stewart Heitmann
+ * <sheitmann@users.sourceforge.net>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of STEWART HEITMANN nor the  names of its contributors
+ *       may be used to endorse or promote products derived from this software
+ *       without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL STEWART HEITMANN BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ******************************************************************************/
+
+#include <stdlib.h>
+
+#include "argtable3.h"
+
+
+static void arg_str_resetfn(struct arg_str *parent)
+{
+    ARG_TRACE(("%s:resetfn(%p)\n", __FILE__, parent));
+    parent->count = 0;
+}
+
+
+static int arg_str_scanfn(struct arg_str *parent, const char *argval)
+{
+    int errorcode = 0;
+
+    if (parent->count == parent->hdr.maxcount)
+    {
+        /* maximum number of arguments exceeded */
+        errorcode = EMAXCOUNT;
+    }
+    else if (!argval)
+    {
+        /* a valid argument with no argument value was given. */
+        /* This happens when an optional argument value was invoked. */
+        /* leave parent arguiment value unaltered but still count the argument. */
+        parent->count++;
+    }
+    else
+    {
+        parent->sval[parent->count++] = argval;
+    }
+
+    ARG_TRACE(("%s:scanfn(%p) returns %d\n", __FILE__, parent, errorcode));
+    return errorcode;
+}
+
+
+static int arg_str_checkfn(struct arg_str *parent)
+{
+    int errorcode = (parent->count < parent->hdr.mincount) ? EMINCOUNT : 0;
+    
+    ARG_TRACE(("%s:checkfn(%p) returns %d\n", __FILE__, parent, errorcode));
+    return errorcode;
+}
+
+
+static void arg_str_errorfn(
+    struct arg_str *parent,
+    FILE *fp,
+    int errorcode,
+    const char *argval,
+    const char *progname)
+{
+    const char *shortopts = parent->hdr.shortopts;
+    const char *longopts  = parent->hdr.longopts;
+    const char *datatype  = parent->hdr.datatype;
+
+    /* make argval NULL safe */
+    argval = argval ? argval : "";
+
+    fprintf(fp, "%s: ", progname);
+    switch(errorcode)
+    {
+    case EMINCOUNT:
+        fputs("missing option ", fp);
+        arg_print_option(fp, shortopts, longopts, datatype, "\n");
+        break;
+
+    case EMAXCOUNT:
+        fputs("excess option ", fp);
+        arg_print_option(fp, shortopts, longopts, argval, "\n");
+        break;
+    }
+}
+
+
+struct arg_str * arg_str0(
+    const char *shortopts,
+    const char *longopts,
+    const char *datatype,
+    const char *glossary)
+{
+    return arg_strn(shortopts, longopts, datatype, 0, 1, glossary);
+}
+
+
+struct arg_str * arg_str1(
+    const char *shortopts,
+    const char *longopts,
+    const char *datatype,
+    const char *glossary)
+{
+    return arg_strn(shortopts, longopts, datatype, 1, 1, glossary);
+}
+
+
+struct arg_str * arg_strn(
+    const char *shortopts,
+    const char *longopts,
+    const char *datatype,
+    int mincount,
+    int maxcount,
+    const char *glossary)
+{
+    size_t nbytes;
+    struct arg_str *result;
+
+    /* should not allow this stupid error */
+    /* we should return an error code warning this logic error */
+    /* foolproof things by ensuring maxcount is not less than mincount */
+    maxcount = (maxcount < mincount) ? mincount : maxcount;
+
+    nbytes = sizeof(struct arg_str)     /* storage for struct arg_str */
+             + maxcount * sizeof(char *); /* storage for sval[maxcount] array */
+
+    result = (struct arg_str *)malloc(nbytes);
+    if (result)
+    {
+        int i;
+
+        /* init the arg_hdr struct */
+        result->hdr.flag      = ARG_HASVALUE;
+        result->hdr.shortopts = shortopts;
+        result->hdr.longopts  = longopts;
+        result->hdr.datatype  = datatype ? datatype : "<string>";
+        result->hdr.glossary  = glossary;
+        result->hdr.mincount  = mincount;
+        result->hdr.maxcount  = maxcount;
+        result->hdr.parent    = result;
+        result->hdr.resetfn   = (arg_resetfn *)arg_str_resetfn;
+        result->hdr.scanfn    = (arg_scanfn *)arg_str_scanfn;
+        result->hdr.checkfn   = (arg_checkfn *)arg_str_checkfn;
+        result->hdr.errorfn   = (arg_errorfn *)arg_str_errorfn;
+
+        /* store the sval[maxcount] array immediately after the arg_str struct */
+        result->sval  = (const char * *)(result + 1);
+        result->count = 0;
+
+        /* foolproof the string pointers by initialising them to reference empty strings */
+        for (i = 0; i < maxcount; i++)
+            result->sval[i] = "";
+    }
+    
+    ARG_TRACE(("arg_strn() returns %p\n", result));
+    return result;
+}
+/*******************************************************************************
+ * This file is part of the argtable3 library.
+ *
+ * Copyright (C) 1998-2001,2003-2011,2013 Stewart Heitmann
+ * <sheitmann@users.sourceforge.net>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of STEWART HEITMANN nor the  names of its contributors
+ *       may be used to endorse or promote products derived from this software
+ *       without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL STEWART HEITMANN BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ******************************************************************************/
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdlib.h>
+#include <ctype.h>
+
+#include "argtable3.h"
+
+static
+void arg_register_error(struct arg_end *end,
+                        void *parent,
+                        int error,
+                        const char *argval)
+{
+    /* printf("arg_register_error(%p,%p,%d,%s)\n",end,parent,error,argval); */
+    if (end->count < end->hdr.maxcount)
+    {
+        end->error[end->count] = error;
+        end->parent[end->count] = parent;
+        end->argval[end->count] = argval;
+        end->count++;
+    }
+    else
+    {
+        end->error[end->hdr.maxcount - 1]  = ARG_ELIMIT;
+        end->parent[end->hdr.maxcount - 1] = end;
+        end->argval[end->hdr.maxcount - 1] = NULL;
+    }
+}
+
+
+/*
+ * Return index of first table entry with a matching short option
+ * or -1 if no match was found.
+ */
+static
+int find_shortoption(struct arg_hdr * *table, char shortopt)
+{
+    int tabindex;
+    for(tabindex = 0; !(table[tabindex]->flag & ARG_TERMINATOR); tabindex++)
+    {
+        if (table[tabindex]->shortopts &&
+            strchr(table[tabindex]->shortopts, shortopt))
+            return tabindex;
+    }
+    return -1;
+}
+
+
+struct longoptions
+{
+    int getoptval;
+    int noptions;
+    struct option *options;
+};
+
+#if 0
+static
+void dump_longoptions(struct longoptions * longoptions)
+{
+    int i;
+    printf("getoptval = %d\n", longoptions->getoptval);
+    printf("noptions  = %d\n", longoptions->noptions);
+    for (i = 0; i < longoptions->noptions; i++)
+    {
+        printf("options[%d].name    = \"%s\"\n",
+               i,
+               longoptions->options[i].name);
+        printf("options[%d].has_arg = %d\n", i, longoptions->options[i].has_arg);
+        printf("options[%d].flag    = %p\n", i, longoptions->options[i].flag);
+        printf("options[%d].val     = %d\n", i, longoptions->options[i].val);
+    }
+}
+#endif
+
+static
+struct longoptions * alloc_longoptions(struct arg_hdr * *table)
+{
+    struct longoptions *result;
+    size_t nbytes;
+    int noptions = 1;
+    size_t longoptlen = 0;
+    int tabindex;
+
+    /*
+     * Determine the total number of option structs required
+     * by counting the number of comma separated long options
+     * in all table entries and return the count in noptions.
+     * note: noptions starts at 1 not 0 because we getoptlong
+     * requires a NULL option entry to terminate the option array.
+     * While we are at it, count the number of chars required
+     * to store private copies of all the longoption strings
+     * and return that count in logoptlen.
+     */
+    tabindex = 0;
+    do
+    {
+        const char *longopts = table[tabindex]->longopts;
+        longoptlen += (longopts ? strlen(longopts) : 0) + 1;
+        while (longopts)
+        {
+            noptions++;
+            longopts = strchr(longopts + 1, ',');
+        }
+    } while(!(table[tabindex++]->flag & ARG_TERMINATOR));
+    /*printf("%d long options consuming %d chars in total\n",noptions,longoptlen);*/
+
+
+    /* allocate storage for return data structure as: */
+    /* (struct longoptions) + (struct options)[noptions] + char[longoptlen] */
+    nbytes = sizeof(struct longoptions)
+             + sizeof(struct option) * noptions
+             + longoptlen;
+    result = (struct longoptions *)malloc(nbytes);
+    if (result)
+    {
+        int option_index = 0;
+        char *store;
+
+        result->getoptval = 0;
+        result->noptions = noptions;
+        result->options = (struct option *)(result + 1);
+        store = (char *)(result->options + noptions);
+
+        for(tabindex = 0; !(table[tabindex]->flag & ARG_TERMINATOR); tabindex++)
+        {
+            const char *longopts = table[tabindex]->longopts;
+
+            while(longopts && *longopts)
+            {
+                char *storestart = store;
+
+                /* copy progressive longopt strings into the store */
+                while (*longopts != 0 && *longopts != ',')
+                    *store++ = *longopts++;
+                *store++ = 0;
+                if (*longopts == ',')
+                    longopts++;
+                /*fprintf(stderr,"storestart=\"%s\"\n",storestart);*/
+
+                result->options[option_index].name    = storestart;
+                result->options[option_index].flag    = &(result->getoptval);
+                result->options[option_index].val     = tabindex;
+                if (table[tabindex]->flag & ARG_HASOPTVALUE)
+                    result->options[option_index].has_arg = 2;
+                else if (table[tabindex]->flag & ARG_HASVALUE)
+                    result->options[option_index].has_arg = 1;
+                else
+                    result->options[option_index].has_arg = 0;
+
+                option_index++;
+            }
+        }
+        /* terminate the options array with a zero-filled entry */
+        result->options[option_index].name    = 0;
+        result->options[option_index].has_arg = 0;
+        result->options[option_index].flag    = 0;
+        result->options[option_index].val     = 0;
+    }
+
+    /*dump_longoptions(result);*/
+    return result;
+}
+
+static
+char * alloc_shortoptions(struct arg_hdr * *table)
+{
+    char *result;
+    size_t len = 2;
+    int tabindex;
+
+    /* determine the total number of option chars required */
+    for(tabindex = 0; !(table[tabindex]->flag & ARG_TERMINATOR); tabindex++)
+    {
+        struct arg_hdr *hdr = table[tabindex];
+        len += 3 * (hdr->shortopts ? strlen(hdr->shortopts) : 0);
+    }
+
+    result = malloc(len);
+    if (result)
+    {
+        char *res = result;
+
+        /* add a leading ':' so getopt return codes distinguish    */
+        /* unrecognised option and options missing argument values */
+        *res++ = ':';
+
+        for(tabindex = 0; !(table[tabindex]->flag & ARG_TERMINATOR); tabindex++)
+        {
+            struct arg_hdr *hdr = table[tabindex];
+            const char *shortopts = hdr->shortopts;
+            while(shortopts && *shortopts)
+            {
+                *res++ = *shortopts++;
+                if (hdr->flag & ARG_HASVALUE)
+                    *res++ = ':';
+                if (hdr->flag & ARG_HASOPTVALUE)
+                    *res++ = ':';
+            }
+        }
+        /* null terminate the string */
+        *res = 0;
+    }
+
+    /*printf("alloc_shortoptions() returns \"%s\"\n",(result?result:"NULL"));*/
+    return result;
+}
+
+
+/* return index of the table terminator entry */
+static
+int arg_endindex(struct arg_hdr * *table)
+{
+    int tabindex = 0;
+    while (!(table[tabindex]->flag & ARG_TERMINATOR))
+        tabindex++;
+    return tabindex;
+}
+
+
+static
+void arg_parse_tagged(int argc,
+                      char * *argv,
+                      struct arg_hdr * *table,
+                      struct arg_end *endtable)
+{
+    struct longoptions *longoptions;
+    char *shortoptions;
+    int copt;
+
+    /*printf("arg_parse_tagged(%d,%p,%p,%p)\n",argc,argv,table,endtable);*/
+
+    /* allocate short and long option arrays for the given opttable[].   */
+    /* if the allocs fail then put an error msg in the last table entry. */
+    longoptions  = alloc_longoptions(table);
+    shortoptions = alloc_shortoptions(table);
+    if (!longoptions || !shortoptions)
+    {
+        /* one or both memory allocs failed */
+        arg_register_error(endtable, endtable, ARG_EMALLOC, NULL);
+        /* free anything that was allocated (this is null safe) */
+        free(shortoptions);
+        free(longoptions);
+        return;
+    }
+
+    /*dump_longoptions(longoptions);*/
+
+    /* reset getopts internal option-index to zero, and disable error reporting */
+    optind = 0;
+    opterr = 0;
+
+    /* fetch and process args using getopt_long */
+    while( (copt =
+                getopt_long(argc, argv, shortoptions, longoptions->options,
+                            NULL)) != -1)
+    {
+        /*
+           printf("optarg='%s'\n",optarg);
+           printf("optind=%d\n",optind);
+           printf("copt=%c\n",(char)copt);
+           printf("optopt=%c (%d)\n",optopt, (int)(optopt));
+         */
+        switch(copt)
+        {
+        case 0:
+        {
+            int tabindex = longoptions->getoptval;
+            void *parent  = table[tabindex]->parent;
+            /*printf("long option detected from argtable[%d]\n", tabindex);*/
+            if (optarg && optarg[0] == 0 &&
+                (table[tabindex]->flag & ARG_HASVALUE))
+            {
+                /* printf(": long option %s requires an argument\n",argv[optind-1]); */
+                arg_register_error(endtable, endtable, ARG_EMISSARG,
+                                   argv[optind - 1]);
+                /* continue to scan the (empty) argument value to enforce argument count checking */
+            }
+            if (table[tabindex]->scanfn)
+            {
+                int errorcode = table[tabindex]->scanfn(parent, optarg);
+                if (errorcode != 0)
+                    arg_register_error(endtable, parent, errorcode, optarg);
+            }
+        }
+        break;
+
+        case '?':
+            /*
+             * getopt_long() found an unrecognised short option.
+             * if it was a short option its value is in optopt
+             * if it was a long option then optopt=0
+             */
+            switch (optopt)
+            {
+            case 0:
+                /*printf("?0 unrecognised long option %s\n",argv[optind-1]);*/
+                arg_register_error(endtable, endtable, ARG_ELONGOPT,
+                                   argv[optind - 1]);
+                break;
+            default:
+                /*printf("?* unrecognised short option '%c'\n",optopt);*/
+                arg_register_error(endtable, endtable, optopt, NULL);
+                break;
+            }
+            break;
+
+        case ':':
+            /*
+             * getopt_long() found an option with its argument missing.
+             */
+            /*printf(": option %s requires an argument\n",argv[optind-1]); */
+            arg_register_error(endtable, endtable, ARG_EMISSARG,
+                               argv[optind - 1]);
+            break;
+
+        default:
+        {
+            /* getopt_long() found a valid short option */
+            int tabindex = find_shortoption(table, (char)copt);
+            /*printf("short option detected from argtable[%d]\n", tabindex);*/
+            if (tabindex == -1)
+            {
+                /* should never get here - but handle it just in case */
+                /*printf("unrecognised short option %d\n",copt);*/
+                arg_register_error(endtable, endtable, copt, NULL);
+            }
+            else
+            {
+                if (table[tabindex]->scanfn)
+                {
+                    void *parent  = table[tabindex]->parent;
+                    int errorcode = table[tabindex]->scanfn(parent, optarg);
+                    if (errorcode != 0)
+                        arg_register_error(endtable, parent, errorcode, optarg);
+                }
+            }
+            break;
+        }
+        }
+    }
+
+    free(shortoptions);
+    free(longoptions);
+}
+
+
+static
+void arg_parse_untagged(int argc,
+                        char * *argv,
+                        struct arg_hdr * *table,
+                        struct arg_end *endtable)
+{
+    int tabindex = 0;
+    int errorlast = 0;
+    const char *optarglast = NULL;
+    void *parentlast = NULL;
+
+    /*printf("arg_parse_untagged(%d,%p,%p,%p)\n",argc,argv,table,endtable);*/
+    while (!(table[tabindex]->flag & ARG_TERMINATOR))
+    {
+        void *parent;
+        int errorcode;
+
+        /* if we have exhausted our argv[optind] entries then we have finished */
+        if (optind >= argc)
+        {
+            /*printf("arg_parse_untagged(): argv[] exhausted\n");*/
+            return;
+        }
+
+        /* skip table entries with non-null long or short options (they are not untagged entries) */
+        if (table[tabindex]->longopts || table[tabindex]->shortopts)
+        {
+            /*printf("arg_parse_untagged(): skipping argtable[%d] (tagged argument)\n",tabindex);*/
+            tabindex++;
+            continue;
+        }
+
+        /* skip table entries with NULL scanfn */
+        if (!(table[tabindex]->scanfn))
+        {
+            /*printf("arg_parse_untagged(): skipping argtable[%d] (NULL scanfn)\n",tabindex);*/
+            tabindex++;
+            continue;
+        }
+
+        /* attempt to scan the current argv[optind] with the current     */
+        /* table[tabindex] entry. If it succeeds then keep it, otherwise */
+        /* try again with the next table[] entry.                        */
+        parent = table[tabindex]->parent;
+        errorcode = table[tabindex]->scanfn(parent, argv[optind]);
+        if (errorcode == 0)
+        {
+            /* success, move onto next argv[optind] but stay with same table[tabindex] */
+            /*printf("arg_parse_untagged(): argtable[%d] successfully matched\n",tabindex);*/
+            optind++;
+
+            /* clear the last tentative error */
+            errorlast = 0;
+        }
+        else
+        {
+            /* failure, try same argv[optind] with next table[tabindex] entry */
+            /*printf("arg_parse_untagged(): argtable[%d] failed match\n",tabindex);*/
+            tabindex++;
+
+            /* remember this as a tentative error we may wish to reinstate later */
+            errorlast = errorcode;
+            optarglast = argv[optind];
+            parentlast = parent;
+        }
+
+    }
+
+    /* if a tenative error still remains at this point then register it as a proper error */
+    if (errorlast)
+    {
+        arg_register_error(endtable, parentlast, errorlast, optarglast);
+        optind++;
+    }
+
+    /* only get here when not all argv[] entries were consumed */
+    /* register an error for each unused argv[] entry */
+    while (optind < argc)
+    {
+        /*printf("arg_parse_untagged(): argv[%d]=\"%s\" not consumed\n",optind,argv[optind]);*/
+        arg_register_error(endtable, endtable, ARG_ENOMATCH, argv[optind++]);
+    }
+
+    return;
+}
+
+
+static
+void arg_parse_check(struct arg_hdr * *table, struct arg_end *endtable)
+{
+    int tabindex = 0;
+    /* printf("arg_parse_check()\n"); */
+    do
+    {
+        if (table[tabindex]->checkfn)
+        {
+            void *parent  = table[tabindex]->parent;
+            int errorcode = table[tabindex]->checkfn(parent);
+            if (errorcode != 0)
+                arg_register_error(endtable, parent, errorcode, NULL);
+        }
+    } while(!(table[tabindex++]->flag & ARG_TERMINATOR));
+}
+
+
+static
+void arg_reset(void * *argtable)
+{
+    struct arg_hdr * *table = (struct arg_hdr * *)argtable;
+    int tabindex = 0;
+    /*printf("arg_reset(%p)\n",argtable);*/
+    do
+    {
+        if (table[tabindex]->resetfn)
+            table[tabindex]->resetfn(table[tabindex]->parent);
+    } while(!(table[tabindex++]->flag & ARG_TERMINATOR));
+}
+
+
+int arg_parse(int argc, char * *argv, void * *argtable)
+{
+    struct arg_hdr * *table = (struct arg_hdr * *)argtable;
+    struct arg_end *endtable;
+    int endindex;
+    char * *argvcopy = NULL;
+
+    /*printf("arg_parse(%d,%p,%p)\n",argc,argv,argtable);*/
+
+    /* reset any argtable data from previous invocations */
+    arg_reset(argtable);
+
+    /* locate the first end-of-table marker within the array */
+    endindex = arg_endindex(table);
+    endtable = (struct arg_end *)table[endindex];
+
+    /* Special case of argc==0.  This can occur on Texas Instruments DSP. */
+    /* Failure to trap this case results in an unwanted NULL result from  */
+    /* the malloc for argvcopy (next code block).                         */
+    if (argc == 0)
+    {
+        /* We must still perform post-parse checks despite the absence of command line arguments */
+        arg_parse_check(table, endtable);
+
+        /* Now we are finished */
+        return endtable->count;
+    }
+
+    argvcopy = (char **)malloc(sizeof(char *) * (argc + 1));
+    if (argvcopy)
+    {
+        int i;
+
+        /*
+           Fill in the local copy of argv[]. We need a local copy
+           because getopt rearranges argv[] which adversely affects
+           susbsequent parsing attempts.
+         */
+        for (i = 0; i < argc; i++)
+            argvcopy[i] = argv[i];
+
+        argvcopy[argc] = NULL;
+        
+        /* parse the command line (local copy) for tagged options */
+        arg_parse_tagged(argc, argvcopy, table, endtable);
+
+        /* parse the command line (local copy) for untagged options */
+        arg_parse_untagged(argc, argvcopy, table, endtable);
+
+        /* if no errors so far then perform post-parse checks otherwise dont bother */
+        if (endtable->count == 0)
+            arg_parse_check(table, endtable);
+
+        /* release the local copt of argv[] */
+        free(argvcopy);
+    }
+    else
+    {
+        /* memory alloc failed */
+        arg_register_error(endtable, endtable, ARG_EMALLOC, NULL);
+    }
+
+    return endtable->count;
+}
+
+
+/*
+ * Concatenate contents of src[] string onto *pdest[] string.
+ * The *pdest pointer is altered to point to the end of the
+ * target string and *pndest is decremented by the same number
+ * of chars.
+ * Does not append more than *pndest chars into *pdest[]
+ * so as to prevent buffer overruns.
+ * Its something like strncat() but more efficient for repeated
+ * calls on the same destination string.
+ * Example of use:
+ *   char dest[30] = "good"
+ *   size_t ndest = sizeof(dest);
+ *   char *pdest = dest;
+ *   arg_char(&pdest,"bye ",&ndest);
+ *   arg_char(&pdest,"cruel ",&ndest);
+ *   arg_char(&pdest,"world!",&ndest);
+ * Results in:
+ *   dest[] == "goodbye cruel world!"
+ *   ndest  == 10
+ */
+static
+void arg_cat(char * *pdest, const char *src, size_t *pndest)
+{
+    char *dest = *pdest;
+    char *end  = dest + *pndest;
+
+    /*locate null terminator of dest string */
+    while(dest < end && *dest != 0)
+        dest++;
+
+    /* concat src string to dest string */
+    while(dest < end && *src != 0)
+        *dest++ = *src++;
+
+    /* null terminate dest string */
+    *dest = 0;
+
+    /* update *pdest and *pndest */
+    *pndest = end - dest;
+    *pdest  = dest;
+}
+
+
+static
+void arg_cat_option(char *dest,
+                    size_t ndest,
+                    const char *shortopts,
+                    const char *longopts,
+                    const char *datatype,
+                    int optvalue)
+{
+    if (shortopts)
+    {
+        char option[3];
+
+        /* note: option array[] is initialiazed dynamically here to satisfy   */
+        /* a deficiency in the watcom compiler wrt static array initializers. */
+        option[0] = '-';
+        option[1] = shortopts[0];
+        option[2] = 0;
+
+        arg_cat(&dest, option, &ndest);
+        if (datatype)
+        {
+            arg_cat(&dest, " ", &ndest);
+            if (optvalue)
+            {
+                arg_cat(&dest, "[", &ndest);
+                arg_cat(&dest, datatype, &ndest);
+                arg_cat(&dest, "]", &ndest);
+            }
+            else
+                arg_cat(&dest, datatype, &ndest);
+        }
+    }
+    else if (longopts)
+    {
+        size_t ncspn;
+
+        /* add "--" tag prefix */
+        arg_cat(&dest, "--", &ndest);
+
+        /* add comma separated option tag */
+        ncspn = strcspn(longopts, ",");
+#ifdef __STDC_WANT_SECURE_LIB__
+        strncat_s(dest, ndest, longopts, (ncspn < ndest) ? ncspn : ndest);
+#else
+        strncat(dest, longopts, (ncspn < ndest) ? ncspn : ndest);
+#endif
+
+        if (datatype)
+        {
+            arg_cat(&dest, "=", &ndest);
+            if (optvalue)
+            {
+                arg_cat(&dest, "[", &ndest);
+                arg_cat(&dest, datatype, &ndest);
+                arg_cat(&dest, "]", &ndest);
+            }
+            else
+                arg_cat(&dest, datatype, &ndest);
+        }
+    }
+    else if (datatype)
+    {
+        if (optvalue)
+        {
+            arg_cat(&dest, "[", &ndest);
+            arg_cat(&dest, datatype, &ndest);
+            arg_cat(&dest, "]", &ndest);
+        }
+        else
+            arg_cat(&dest, datatype, &ndest);
+    }
+}
+
+static
+void arg_cat_optionv(char *dest,
+                     size_t ndest,
+                     const char *shortopts,
+                     const char *longopts,
+                     const char *datatype,
+                     int optvalue,
+                     const char *separator)
+{
+    separator = separator ? separator : "";
+
+    if (shortopts)
+    {
+        const char *c = shortopts;
+        while(*c)
+        {
+            /* "-a|-b|-c" */
+            char shortopt[3];
+
+            /* note: shortopt array[] is initialiazed dynamically here to satisfy */
+            /* a deficiency in the watcom compiler wrt static array initializers. */
+            shortopt[0] = '-';
+            shortopt[1] = *c;
+            shortopt[2] = 0;
+
+            arg_cat(&dest, shortopt, &ndest);
+            if (*++c)
+                arg_cat(&dest, separator, &ndest);
+        }
+    }
+
+    /* put separator between long opts and short opts */
+    if (shortopts && longopts)
+        arg_cat(&dest, separator, &ndest);
+
+    if (longopts)
+    {
+        const char *c = longopts;
+        while(*c)
+        {
+            size_t ncspn;
+
+            /* add "--" tag prefix */
+            arg_cat(&dest, "--", &ndest);
+
+            /* add comma separated option tag */
+            ncspn = strcspn(c, ",");
+#ifdef __STDC_WANT_SECURE_LIB__
+            strncat_s(dest, ndest, c, (ncspn < ndest) ? ncspn : ndest);
+#else
+            strncat(dest, c, (ncspn < ndest) ? ncspn : ndest);
+#endif
+            c += ncspn;
+
+            /* add given separator in place of comma */
+            if (*c == ',')
+            {
+                arg_cat(&dest, separator, &ndest);
+                c++;
+            }
+        }
+    }
+
+    if (datatype)
+    {
+        if (longopts)
+            arg_cat(&dest, "=", &ndest);
+        else if (shortopts)
+            arg_cat(&dest, " ", &ndest);
+
+        if (optvalue)
+        {
+            arg_cat(&dest, "[", &ndest);
+            arg_cat(&dest, datatype, &ndest);
+            arg_cat(&dest, "]", &ndest);
+        }
+        else
+            arg_cat(&dest, datatype, &ndest);
+    }
+}
+
+
+/* this function should be deprecated because it doesnt consider optional argument values (ARG_HASOPTVALUE) */
+void arg_print_option(FILE *fp,
+                      const char *shortopts,
+                      const char *longopts,
+                      const char *datatype,
+                      const char *suffix)
+{
+    char syntax[200] = "";
+    suffix = suffix ? suffix : "";
+
+    /* there is no way of passing the proper optvalue for optional argument values here, so we must ignore it */
+    arg_cat_optionv(syntax,
+                    sizeof(syntax),
+                    shortopts,
+                    longopts,
+                    datatype,
+                    0,
+                    "|");
+
+    fputs(syntax, fp);
+    fputs(suffix, fp);
+}
+
+
+/*
+ * Print a GNU style [OPTION] string in which all short options that
+ * do not take argument values are presented in abbreviated form, as
+ * in: -xvfsd, or -xvf[sd], or [-xvsfd]
+ */
+static
+void arg_print_gnuswitch(FILE *fp, struct arg_hdr * *table)
+{
+    int tabindex;
+    char *format1 = " -%c";
+    char *format2 = " [-%c";
+    char *suffix = "";
+
+    /* print all mandatory switches that are without argument values */
+    for(tabindex = 0;
+        table[tabindex] && !(table[tabindex]->flag & ARG_TERMINATOR);
+        tabindex++)
+    {
+        /* skip optional options */
+        if (table[tabindex]->mincount < 1)
+            continue;
+
+        /* skip non-short options */
+        if (table[tabindex]->shortopts == NULL)
+            continue;
+
+        /* skip options that take argument values */
+        if (table[tabindex]->flag & ARG_HASVALUE)
+            continue;
+
+        /* print the short option (only the first short option char, ignore multiple choices)*/
+        fprintf(fp, format1, table[tabindex]->shortopts[0]);
+        format1 = "%c";
+        format2 = "[%c";
+    }
+
+    /* print all optional switches that are without argument values */
+    for(tabindex = 0;
+        table[tabindex] && !(table[tabindex]->flag & ARG_TERMINATOR);
+        tabindex++)
+    {
+        /* skip mandatory args */
+        if (table[tabindex]->mincount > 0)
+            continue;
+
+        /* skip args without short options */
+        if (table[tabindex]->shortopts == NULL)
+            continue;
+
+        /* skip args with values */
+        if (table[tabindex]->flag & ARG_HASVALUE)
+            continue;
+
+        /* print first short option */
+        fprintf(fp, format2, table[tabindex]->shortopts[0]);
+        format2 = "%c";
+        suffix = "]";
+    }
+
+    fprintf(fp, "%s", suffix);
+}
+
+
+void arg_print_syntax(FILE *fp, void * *argtable, const char *suffix)
+{
+    struct arg_hdr * *table = (struct arg_hdr * *)argtable;
+    int i, tabindex;
+
+    /* print GNU style [OPTION] string */
+    arg_print_gnuswitch(fp, table);
+
+    /* print remaining options in abbreviated style */
+    for(tabindex = 0;
+        table[tabindex] && !(table[tabindex]->flag & ARG_TERMINATOR);
+        tabindex++)
+    {
+        char syntax[200] = "";
+        const char *shortopts, *longopts, *datatype;
+
+        /* skip short options without arg values (they were printed by arg_print_gnu_switch) */
+        if (table[tabindex]->shortopts &&
+            !(table[tabindex]->flag & ARG_HASVALUE))
+            continue;
+
+        shortopts = table[tabindex]->shortopts;
+        longopts  = table[tabindex]->longopts;
+        datatype  = table[tabindex]->datatype;
+        arg_cat_option(syntax,
+                       sizeof(syntax),
+                       shortopts,
+                       longopts,
+                       datatype,
+                       table[tabindex]->flag & ARG_HASOPTVALUE);
+
+        if (strlen(syntax) > 0)
+        {
+            /* print mandatory instances of this option */
+            for (i = 0; i < table[tabindex]->mincount; i++)
+                fprintf(fp, " %s", syntax);
+
+            /* print optional instances enclosed in "[..]" */
+            switch ( table[tabindex]->maxcount - table[tabindex]->mincount )
+            {
+            case 0:
+                break;
+            case 1:
+                fprintf(fp, " [%s]", syntax);
+                break;
+            case 2:
+                fprintf(fp, " [%s] [%s]", syntax, syntax);
+                break;
+            default:
+                fprintf(fp, " [%s]...", syntax);
+                break;
+            }
+        }
+    }
+
+    if (suffix)
+        fprintf(fp, "%s", suffix);
+}
+
+
+void arg_print_syntaxv(FILE *fp, void * *argtable, const char *suffix)
+{
+    struct arg_hdr * *table = (struct arg_hdr * *)argtable;
+    int i, tabindex;
+
+    /* print remaining options in abbreviated style */
+    for(tabindex = 0;
+        table[tabindex] && !(table[tabindex]->flag & ARG_TERMINATOR);
+        tabindex++)
+    {
+        char syntax[200] = "";
+        const char *shortopts, *longopts, *datatype;
+
+        shortopts = table[tabindex]->shortopts;
+        longopts  = table[tabindex]->longopts;
+        datatype  = table[tabindex]->datatype;
+        arg_cat_optionv(syntax,
+                        sizeof(syntax),
+                        shortopts,
+                        longopts,
+                        datatype,
+                        table[tabindex]->flag & ARG_HASOPTVALUE,
+                        "|");
+
+        /* print mandatory options */
+        for (i = 0; i < table[tabindex]->mincount; i++)
+            fprintf(fp, " %s", syntax);
+
+        /* print optional args enclosed in "[..]" */
+        switch ( table[tabindex]->maxcount - table[tabindex]->mincount )
+        {
+        case 0:
+            break;
+        case 1:
+            fprintf(fp, " [%s]", syntax);
+            break;
+        case 2:
+            fprintf(fp, " [%s] [%s]", syntax, syntax);
+            break;
+        default:
+            fprintf(fp, " [%s]...", syntax);
+            break;
+        }
+    }
+
+    if (suffix)
+        fprintf(fp, "%s", suffix);
+}
+
+
+void arg_print_glossary(FILE *fp, void * *argtable, const char *format)
+{
+    struct arg_hdr * *table = (struct arg_hdr * *)argtable;
+    int tabindex;
+
+    format = format ? format : "  %-20s %s\n";
+    for (tabindex = 0; !(table[tabindex]->flag & ARG_TERMINATOR); tabindex++)
+    {
+        if (table[tabindex]->glossary)
+        {
+            char syntax[200] = "";
+            const char *shortopts = table[tabindex]->shortopts;
+            const char *longopts  = table[tabindex]->longopts;
+            const char *datatype  = table[tabindex]->datatype;
+            const char *glossary  = table[tabindex]->glossary;
+            arg_cat_optionv(syntax,
+                            sizeof(syntax),
+                            shortopts,
+                            longopts,
+                            datatype,
+                            table[tabindex]->flag & ARG_HASOPTVALUE,
+                            ", ");
+            fprintf(fp, format, syntax, glossary);
+        }
+    }
+}
+
+
+/**
+ * Print a piece of text formatted, which means in a column with a
+ * left and a right margin. The lines are wrapped at whitspaces next
+ * to right margin. The function does not indent the first line, but
+ * only the following ones.
+ *
+ * Example:
+ * arg_print_formatted( fp, 0, 5, "Some text that doesn't fit." )
+ * will result in the following output:
+ *
+ * Some
+ * text
+ * that
+ * doesn'
+ * t fit.
+ *
+ * Too long lines will be wrapped in the middle of a word.
+ *
+ * arg_print_formatted( fp, 2, 7, "Some text that doesn't fit." )
+ * will result in the following output:
+ *
+ * Some
+ *   text
+ *   that
+ *   doesn'
+ *   t fit.
+ *
+ * As you see, the first line is not indented. This enables output of
+ * lines, which start in a line where output already happened.
+ *
+ * Author: Uli Fouquet
+ */
+static
+void arg_print_formatted( FILE *fp,
+                          const unsigned lmargin,
+                          const unsigned rmargin,
+                          const char *text )
+{
+    const unsigned textlen = (unsigned)strlen( text );
+    unsigned line_start = 0;
+    unsigned line_end = textlen + 1;
+    const unsigned colwidth = (rmargin - lmargin) + 1;
+
+    /* Someone doesn't like us... */
+    if ( line_end < line_start )
+    { fprintf( fp, "%s\n", text ); }
+
+    while (line_end - 1 > line_start )
+    {
+        /* Eat leading whitespaces. This is essential because while
+           wrapping lines, there will often be a whitespace at beginning
+           of line */
+        while ( ISSPACE(*(text + line_start)) )
+        { line_start++; }
+
+        if ((line_end - line_start) > colwidth )
+        { line_end = line_start + colwidth; }
+
+        /* Find last whitespace, that fits into line */
+        while ( ( line_end > line_start )
+                && ( line_end - line_start > colwidth )
+                && !ISSPACE(*(text + line_end)))
+        { line_end--; }
+
+        /* Do not print trailing whitespace. If this text
+           has got only one line, line_end now points to the
+           last char due to initialization. */
+        line_end--;
+
+        /* Output line of text */
+        while ( line_start < line_end )
+        {
+            fputc(*(text + line_start), fp );
+            line_start++;
+        }
+        fputc( '\n', fp );
+
+        /* Initialize another line */
+        if ( line_end + 1 < textlen )
+        {
+            unsigned i;
+
+            for (i = 0; i < lmargin; i++ )
+            { fputc( ' ', fp ); }
+
+            line_end = textlen;
+        }
+
+        /* If we have to print another line, get also the last char. */
+        line_end++;
+
+    } /* lines of text */
+}
+
+/**
+ * Prints the glossary in strict GNU format.
+ * Differences to arg_print_glossary() are:
+ *   - wraps lines after 80 chars
+ *   - indents lines without shortops
+ *   - does not accept formatstrings
+ *
+ * Contributed by Uli Fouquet
+ */
+void arg_print_glossary_gnu(FILE *fp, void * *argtable )
+{
+    struct arg_hdr * *table = (struct arg_hdr * *)argtable;
+    int tabindex;
+
+    for(tabindex = 0; !(table[tabindex]->flag & ARG_TERMINATOR); tabindex++)
+    {
+        if (table[tabindex]->glossary)
+        {
+            char syntax[200] = "";
+            const char *shortopts = table[tabindex]->shortopts;
+            const char *longopts  = table[tabindex]->longopts;
+            const char *datatype  = table[tabindex]->datatype;
+            const char *glossary  = table[tabindex]->glossary;
+
+            if ( !shortopts && longopts )
+            {
+                /* Indent trailing line by 4 spaces... */
+                memset( syntax, ' ', 4 );
+                *(syntax + 4) = '\0';
+            }
+
+            arg_cat_optionv(syntax,
+                            sizeof(syntax),
+                            shortopts,
+                            longopts,
+                            datatype,
+                            table[tabindex]->flag & ARG_HASOPTVALUE,
+                            ", ");
+
+            /* If syntax fits not into column, print glossary in new line... */
+            if ( strlen(syntax) > 25 )
+            {
+                fprintf( fp, "  %-25s %s\n", syntax, "" );
+                *syntax = '\0';
+            }
+
+            fprintf( fp, "  %-25s ", syntax );
+            arg_print_formatted( fp, 28, 79, glossary );
+        }
+    } /* for each table entry */
+
+    fputc( '\n', fp );
+}
+
+
+/**
+ * Checks the argtable[] array for NULL entries and returns 1
+ * if any are found, zero otherwise.
+ */
+int arg_nullcheck(void * *argtable)
+{
+    struct arg_hdr * *table = (struct arg_hdr * *)argtable;
+    int tabindex;
+    /*printf("arg_nullcheck(%p)\n",argtable);*/
+
+    if (!table)
+        return 1;
+
+    tabindex = 0;
+    do
+    {
+        /*printf("argtable[%d]=%p\n",tabindex,argtable[tabindex]);*/
+        if (!table[tabindex])
+            return 1;
+    } while(!(table[tabindex++]->flag & ARG_TERMINATOR));
+
+    return 0;
+}
+
+
+/*
+ * arg_free() is deprecated in favour of arg_freetable() due to a flaw in its design.
+ * The flaw results in memory leak in the (very rare) case that an intermediate
+ * entry in the argtable array failed its memory allocation while others following
+ * that entry were still allocated ok. Those subsequent allocations will not be
+ * deallocated by arg_free().
+ * Despite the unlikeliness of the problem occurring, and the even unlikelier event
+ * that it has any deliterious effect, it is fixed regardless by replacing arg_free()
+ * with the newer arg_freetable() function.
+ * We still keep arg_free() for backwards compatibility.
+ */
+void arg_free(void * *argtable)
+{
+    struct arg_hdr * *table = (struct arg_hdr * *)argtable;
+    int tabindex = 0;
+    int flag;
+    /*printf("arg_free(%p)\n",argtable);*/
+    do
+    {
+        /*
+           if we encounter a NULL entry then somewhat incorrectly we presume
+           we have come to the end of the array. It isnt strictly true because
+           an intermediate entry could be NULL with other non-NULL entries to follow.
+           The subsequent argtable entries would then not be freed as they should.
+         */
+        if (table[tabindex] == NULL)
+            break;
+
+        flag = table[tabindex]->flag;
+        free(table[tabindex]);
+        table[tabindex++] = NULL;
+
+    } while(!(flag & ARG_TERMINATOR));
+}
+
+/* frees each non-NULL element of argtable[], where n is the size of the number of entries in the array */
+void arg_freetable(void * *argtable, size_t n)
+{
+    struct arg_hdr * *table = (struct arg_hdr * *)argtable;
+    size_t tabindex = 0;
+    /*printf("arg_freetable(%p)\n",argtable);*/
+    for (tabindex = 0; tabindex < n; tabindex++)
+    {
+        if (table[tabindex] == NULL)
+            continue;
+
+        free(table[tabindex]);
+        table[tabindex] = NULL;
+    };
+}
+
diff --git a/client/cliparser/argtable3.h b/client/cliparser/argtable3.h
new file mode 100644
index 000000000..1107de250
--- /dev/null
+++ b/client/cliparser/argtable3.h
@@ -0,0 +1,305 @@
+/*******************************************************************************
+ * This file is part of the argtable3 library.
+ *
+ * Copyright (C) 1998-2001,2003-2011,2013 Stewart Heitmann
+ * <sheitmann@users.sourceforge.net>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of STEWART HEITMANN nor the  names of its contributors
+ *       may be used to endorse or promote products derived from this software
+ *       without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL STEWART HEITMANN BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ******************************************************************************/
+
+#ifndef ARGTABLE3
+#define ARGTABLE3
+
+#include <stdio.h>      /* FILE */
+#include <time.h>       /* struct tm */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define ARG_REX_ICASE 1
+    
+/* bit masks for arg_hdr.flag */
+enum
+{
+    ARG_TERMINATOR=0x1,
+    ARG_HASVALUE=0x2,
+    ARG_HASOPTVALUE=0x4
+};
+
+typedef void (arg_resetfn)(void *parent);
+typedef int  (arg_scanfn)(void *parent, const char *argval);
+typedef int  (arg_checkfn)(void *parent);
+typedef void (arg_errorfn)(void *parent, FILE *fp, int error, const char *argval, const char *progname);
+
+
+/*
+* The arg_hdr struct defines properties that are common to all arg_xxx structs.
+* The argtable library requires each arg_xxx struct to have an arg_hdr
+* struct as its first data member.
+* The argtable library functions then use this data to identify the
+* properties of the command line option, such as its option tags,
+* datatype string, and glossary strings, and so on.
+* Moreover, the arg_hdr struct contains pointers to custom functions that
+* are provided by each arg_xxx struct which perform the tasks of parsing
+* that particular arg_xxx arguments, performing post-parse checks, and
+* reporting errors.
+* These functions are private to the individual arg_xxx source code
+* and are the pointer to them are initiliased by that arg_xxx struct's
+* constructor function. The user could alter them after construction
+* if desired, but the original intention is for them to be set by the
+* constructor and left unaltered.
+*/
+struct arg_hdr
+{
+    char         flag;        /* Modifier flags: ARG_TERMINATOR, ARG_HASVALUE. */
+    const char  *shortopts;   /* String defining the short options */
+    const char  *longopts;    /* String defiing the long options */
+    const char  *datatype;    /* Description of the argument data type */
+    const char  *glossary;    /* Description of the option as shown by arg_print_glossary function */
+    int          mincount;    /* Minimum number of occurences of this option accepted */
+    int          maxcount;    /* Maximum number of occurences if this option accepted */
+    void        *parent;      /* Pointer to parent arg_xxx struct */
+    arg_resetfn *resetfn;     /* Pointer to parent arg_xxx reset function */
+    arg_scanfn  *scanfn;      /* Pointer to parent arg_xxx scan function */
+    arg_checkfn *checkfn;     /* Pointer to parent arg_xxx check function */
+    arg_errorfn *errorfn;     /* Pointer to parent arg_xxx error function */
+    void        *priv;        /* Pointer to private header data for use by arg_xxx functions */
+};
+
+struct arg_rem
+{
+    struct arg_hdr hdr;      /* The mandatory argtable header struct */
+};
+
+struct arg_lit
+{
+    struct arg_hdr hdr;      /* The mandatory argtable header struct */
+    int count;               /* Number of matching command line args */
+};
+
+struct arg_int
+{
+    struct arg_hdr hdr;      /* The mandatory argtable header struct */
+    int count;               /* Number of matching command line args */
+    int *ival;               /* Array of parsed argument values */
+};
+
+struct arg_dbl
+{
+    struct arg_hdr hdr;      /* The mandatory argtable header struct */
+    int count;               /* Number of matching command line args */
+    double *dval;            /* Array of parsed argument values */
+};
+
+struct arg_str
+{
+    struct arg_hdr hdr;      /* The mandatory argtable header struct */
+    int count;               /* Number of matching command line args */
+    const char **sval;       /* Array of parsed argument values */
+};
+
+struct arg_rex
+{
+    struct arg_hdr hdr;      /* The mandatory argtable header struct */
+    int count;               /* Number of matching command line args */
+    const char **sval;       /* Array of parsed argument values */
+};
+
+struct arg_file
+{
+    struct arg_hdr hdr;      /* The mandatory argtable header struct */
+    int count;               /* Number of matching command line args*/
+    const char **filename;   /* Array of parsed filenames  (eg: /home/foo.bar) */
+    const char **basename;   /* Array of parsed basenames  (eg: foo.bar) */
+    const char **extension;  /* Array of parsed extensions (eg: .bar) */
+};
+
+struct arg_date
+{
+    struct arg_hdr hdr;      /* The mandatory argtable header struct */
+    const char *format;      /* strptime format string used to parse the date */
+    int count;               /* Number of matching command line args */
+    struct tm *tmval;        /* Array of parsed time values */
+};
+
+enum {ARG_ELIMIT=1, ARG_EMALLOC, ARG_ENOMATCH, ARG_ELONGOPT, ARG_EMISSARG};
+struct arg_end
+{
+    struct arg_hdr hdr;      /* The mandatory argtable header struct */
+    int count;               /* Number of errors encountered */
+    int *error;              /* Array of error codes */
+    void **parent;           /* Array of pointers to offending arg_xxx struct */
+    const char **argval;     /* Array of pointers to offending argv[] string */
+};
+
+
+/**** arg_xxx constructor functions *********************************/
+
+struct arg_rem* arg_rem(const char* datatype, const char* glossary);
+
+struct arg_lit* arg_lit0(const char* shortopts,
+    const char* longopts,
+    const char* glossary);
+struct arg_lit* arg_lit1(const char* shortopts,
+    const char* longopts,
+    const char *glossary);
+struct arg_lit* arg_litn(const char* shortopts,
+    const char* longopts,
+    int mincount,
+    int maxcount,
+    const char *glossary);
+
+struct arg_key* arg_key0(const char* keyword,
+    int flags,
+    const char* glossary);
+struct arg_key* arg_key1(const char* keyword,
+    int flags,
+    const char* glossary);
+struct arg_key* arg_keyn(const char* keyword,
+    int flags,
+    int mincount,
+    int maxcount,
+    const char* glossary);
+
+struct arg_int* arg_int0(const char* shortopts,
+    const char* longopts,
+    const char* datatype,
+    const char* glossary);
+struct arg_int* arg_int1(const char* shortopts,
+    const char* longopts,
+    const char* datatype,
+    const char *glossary);
+struct arg_int* arg_intn(const char* shortopts,
+    const char* longopts,
+    const char *datatype,
+    int mincount,
+    int maxcount,
+    const char *glossary);
+
+struct arg_dbl* arg_dbl0(const char* shortopts,
+    const char* longopts,
+    const char* datatype,
+    const char* glossary);
+struct arg_dbl* arg_dbl1(const char* shortopts,
+    const char* longopts,
+    const char* datatype,
+    const char *glossary);
+struct arg_dbl* arg_dbln(const char* shortopts,
+    const char* longopts,
+    const char *datatype,
+    int mincount,
+    int maxcount,
+    const char *glossary);
+
+struct arg_str* arg_str0(const char* shortopts,
+    const char* longopts,
+    const char* datatype,
+    const char* glossary);
+struct arg_str* arg_str1(const char* shortopts,
+    const char* longopts,                    
+    const char* datatype,
+    const char *glossary);
+struct arg_str* arg_strn(const char* shortopts,
+    const char* longopts,
+    const char* datatype,
+    int mincount,
+    int maxcount,
+    const char *glossary);
+
+struct arg_rex* arg_rex0(const char* shortopts,
+    const char* longopts,
+    const char* pattern,
+    const char* datatype,
+    int flags,
+    const char* glossary);
+struct arg_rex* arg_rex1(const char* shortopts,
+    const char* longopts,
+    const char* pattern,
+    const char* datatype,
+    int flags,
+    const char *glossary);
+struct arg_rex* arg_rexn(const char* shortopts,
+    const char* longopts,
+    const char* pattern,
+    const char* datatype,
+    int mincount,
+    int maxcount,
+    int flags,
+    const char *glossary);
+
+struct arg_file* arg_file0(const char* shortopts,
+    const char* longopts,
+    const char* datatype,
+    const char* glossary);
+struct arg_file* arg_file1(const char* shortopts,
+    const char* longopts,
+    const char* datatype,
+    const char *glossary);
+struct arg_file* arg_filen(const char* shortopts,
+    const char* longopts,
+    const char* datatype,
+    int mincount,
+    int maxcount,
+    const char *glossary);
+
+struct arg_date* arg_date0(const char* shortopts,
+    const char* longopts,
+    const char* format,
+    const char* datatype,
+    const char* glossary);
+struct arg_date* arg_date1(const char* shortopts,
+    const char* longopts,
+    const char* format,
+    const char* datatype,
+    const char *glossary);
+struct arg_date* arg_daten(const char* shortopts,
+    const char* longopts,
+    const char* format,
+    const char* datatype,
+    int mincount,
+    int maxcount,
+    const char *glossary);
+
+struct arg_end* arg_end(int maxerrors);
+
+
+/**** other functions *******************************************/
+int arg_nullcheck(void **argtable);
+int arg_parse(int argc, char **argv, void **argtable);
+void arg_print_option(FILE *fp, const char *shortopts, const char *longopts, const char *datatype, const char *suffix);
+void arg_print_syntax(FILE *fp, void **argtable, const char *suffix);
+void arg_print_syntaxv(FILE *fp, void **argtable, const char *suffix);
+void arg_print_glossary(FILE *fp, void **argtable, const char *format);
+void arg_print_glossary_gnu(FILE *fp, void **argtable);
+void arg_print_errors(FILE* fp, struct arg_end* end, const char* progname);
+void arg_freetable(void **argtable, size_t n);
+
+/**** deprecated functions, for back-compatibility only ********/
+void arg_free(void **argtable);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/client/cliparser/cliparser.c b/client/cliparser/cliparser.c
new file mode 100644
index 000000000..56be2ca6a
--- /dev/null
+++ b/client/cliparser/cliparser.c
@@ -0,0 +1,188 @@
+//-----------------------------------------------------------------------------
+// Copyright (C) 2017 Merlok
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// Command line parser core commands
+//-----------------------------------------------------------------------------
+
+#include "cliparser.h"
+#include <stdio.h>
+#include <string.h>
+
+void **argtable = NULL;
+size_t argtableLen = 0;
+char *programName = NULL;
+char *programHint = NULL;
+char *programHelp = NULL;
+char buf[500] = {0};
+
+int CLIParserInit(char *vprogramName, char *vprogramHint, char *vprogramHelp) {
+	argtable = NULL;
+	argtableLen = 0;
+	programName = vprogramName;
+	programHint = vprogramHint;
+	programHelp = vprogramHelp;
+	memset(buf, 0x00, 500);
+	
+	return 0;
+}
+
+int CLIParserParseArg(int argc, char **argv, void* vargtable[], size_t vargtableLen, bool allowEmptyExec) { 
+	int nerrors;
+	
+	argtable = vargtable;
+	argtableLen = vargtableLen;
+	
+	/* verify the argtable[] entries were allocated sucessfully */
+	if (arg_nullcheck(argtable) != 0) {
+		/* NULL entries were detected, some allocations must have failed */
+		printf("ERROR: Insufficient memory\n");
+		return 2;
+	}
+	/* Parse the command line as defined by argtable[] */
+	nerrors = arg_parse(argc, argv, argtable);
+	
+	/* special case: '--help' takes precedence over error reporting */
+	if ((argc < 2 && !allowEmptyExec) ||((struct arg_lit *)argtable[0])->count > 0) { // help must be the first record  
+		printf("Usage: %s", programName);
+		arg_print_syntaxv(stdout, argtable, "\n");
+		if (programHint)
+			printf("%s\n\n", programHint);
+		arg_print_glossary(stdout, argtable, "    %-20s %s\n");
+		printf("\n");
+		if (programHelp)
+			printf("%s \n", programHelp);
+		
+		return 1;
+	}
+
+	/* If the parser returned any errors then display them and exit */
+	if (nerrors > 0) {
+		/* Display the error details contained in the arg_end struct.*/
+		arg_print_errors(stdout, ((struct arg_end *)argtable[vargtableLen - 1]), programName);
+		printf("Try '%s --help' for more information.\n", programName);
+		
+		return 3;
+	}	
+	
+	return 0;
+}
+
+enum ParserState {
+	PS_FIRST,
+	PS_ARGUMENT,
+	PS_OPTION,
+};
+
+#define isSpace(c)(c == ' ' || c == '\t')
+
+int CLIParserParseString(const char* str, void* vargtable[], size_t vargtableLen, bool allowEmptyExec) {
+	return CLIParserParseStringEx(str, vargtable, vargtableLen, allowEmptyExec, false);
+}
+
+int CLIParserParseStringEx(const char* str, void* vargtable[], size_t vargtableLen, bool allowEmptyExec, bool clueData) {
+	int argc = 0;
+	char *argv[200] = {NULL};
+	
+	int len = strlen(str);
+	char *bufptr = buf;
+	char *spaceptr = NULL;
+	enum ParserState state = PS_FIRST;
+	
+	argv[argc++] = bufptr;	
+	// param0 = program name
+	memcpy(buf, programName, strlen(programName) + 1); // with 0x00
+	bufptr += strlen(programName) + 1;
+	if (len)
+		argv[argc++] = bufptr;	
+	
+	// parse params
+	for (int i = 0; i < len; i++) {
+		switch(state){
+			case PS_FIRST: // first char
+				if (!clueData || str[i] == '-'){ // first char before space is '-' - next element - option OR not "clueData" for not-option fields
+					state = PS_OPTION;
+
+					if (spaceptr) {
+						bufptr = spaceptr;
+						*bufptr = 0x00;
+						bufptr++;
+						argv[argc++] = bufptr;	
+					}
+				}
+				spaceptr = NULL;
+			case PS_ARGUMENT:
+				if (state == PS_FIRST)
+					state = PS_ARGUMENT;
+				if (isSpace(str[i])) {
+					spaceptr = bufptr;
+					state = PS_FIRST;
+				}
+				*bufptr = str[i];
+				bufptr++;
+				break;
+			case PS_OPTION:
+				if (isSpace(str[i])){
+					state = PS_FIRST;
+
+					*bufptr = 0x00;
+					bufptr++;
+					argv[argc++] = bufptr;	
+					break;
+				}
+				
+				*bufptr = str[i];
+				bufptr++;
+				break;
+		}
+	}
+
+	return CLIParserParseArg(argc, argv, vargtable, vargtableLen, allowEmptyExec);
+}
+
+void CLIParserFree() {
+	arg_freetable(argtable, argtableLen);
+	argtable = NULL;
+	
+	return;
+}
+
+// convertors
+int CLIParamHexToBuf(struct arg_str *argstr, uint8_t *data, int maxdatalen, int *datalen) {
+	*datalen = 0;
+	if (!argstr->count)
+		return 0;
+	
+	char buf[256] = {0};
+	int ibuf = 0;
+	
+	for (int i = 0; i < argstr->count; i++) {
+		int len = strlen(argstr->sval[i]);
+		memcpy(&buf[ibuf], argstr->sval[i], len);
+		ibuf += len;
+	}
+	buf[ibuf] = 0;
+  
+	if (!ibuf)
+		return 0;
+	
+	switch(param_gethex_to_eol(buf, 0, data, maxdatalen, datalen)) {
+	case 1:
+		printf("Parameter error: Invalid HEX value.\n");
+		return 1;
+	case 2:
+		printf("Parameter error: parameter too large.\n");
+		return 2;
+	case 3:
+		printf("Parameter error: Hex string must have even number of digits.\n");
+		return 3;
+	}
+	
+	return 0;
+}
+
+
+
diff --git a/client/cliparser/cliparser.h b/client/cliparser/cliparser.h
new file mode 100644
index 000000000..7c1ced207
--- /dev/null
+++ b/client/cliparser/cliparser.h
@@ -0,0 +1,37 @@
+//-----------------------------------------------------------------------------
+// Copyright (C) 2017 Merlok
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// Command line parser core commands
+//-----------------------------------------------------------------------------
+
+#include "argtable3.h"
+#include "util.h"
+#include <stdbool.h>
+
+#define arg_param_begin arg_lit0("hH",  "help",    "print this help and exit")
+#define arg_param_end arg_end(20)
+
+#define arg_getsize(a) (sizeof(a) / sizeof(a[0]))
+#define arg_get_lit(n)(((struct arg_lit*)argtable[n])->count)
+#define arg_get_int(n)(((struct arg_int*)argtable[n])->ival[0])
+#define arg_get_str(n)((struct arg_str*)argtable[n])
+#define arg_get_str_len(n)(strlen(((struct arg_str*)argtable[n])->sval[0]))
+
+#define arg_strx1(shortopts, longopts, datatype, glossary) (arg_strn((shortopts), (longopts), (datatype), 1, 250, (glossary)))
+#define arg_strx0(shortopts, longopts, datatype, glossary) (arg_strn((shortopts), (longopts), (datatype), 0, 250, (glossary)))
+
+#define CLIExecWithReturn(cmd, atbl, ifempty) if (CLIParserParseString(cmd, atbl, arg_getsize(atbl), ifempty)){CLIParserFree();return 0;}
+#define CLIGetStrBLessWithReturn(paramnum, data, datalen, delta) if (CLIParamHexToBuf(arg_get_str(paramnum), data, sizeof(data) - (delta), datalen)) {CLIParserFree();return 1;}
+#define CLIGetStrWithReturn(paramnum, data, datalen) if (CLIParamHexToBuf(arg_get_str(paramnum), data, sizeof(data), datalen)) {CLIParserFree();return 1;}
+
+extern int CLIParserInit(char *vprogramName, char *vprogramHint, char *vprogramHelp);
+extern int CLIParserParseString(const char* str, void* argtable[], size_t vargtableLen, bool allowEmptyExec);
+extern int CLIParserParseStringEx(const char* str, void* vargtable[], size_t vargtableLen, bool allowEmptyExec, bool clueData);
+extern int CLIParserParseArg(int argc, char **argv, void* argtable[], size_t vargtableLen, bool allowEmptyExec);
+extern void CLIParserFree();
+
+extern int CLIParamHexToBuf(struct arg_str *argstr, uint8_t *data, int maxdatalen, int *datalen);
diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 418de8ec5..fc24356a5 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -668,6 +668,95 @@ int CmdHF14ASniff(const char *Cmd) {
 	return 0;
 }
 
+int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
+	uint16_t cmdc = 0;
+	*dataoutlen = 0;
+	
+	if (activateField) {
+		UsbCommand resp;
+
+		// Anticollision + SELECT card
+		UsbCommand ca = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};
+		SendCommand(&ca);
+		if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
+			PrintAndLogEx(ERROR, "Proxmark connection timeout.");
+			return 1;
+		}
+
+		// check result
+		if (resp.arg[0] == 0) {
+			PrintAndLogEx(NORMAL, "No card in field.");
+			return 1;
+		}
+
+		if (resp.arg[0] != 1 && resp.arg[0] != 2) {
+			PrintAndLogEx(ERROR, "Card not in iso14443-4. res=%d.", resp.arg[0]);
+			return 1;
+		}
+
+		if (resp.arg[0] == 2) {		// 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
+			// get ATS 
+			UsbCommand cr = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT, 2, 0}}; 
+			uint8_t rats[] = { 0xE0, 0x80 }; // FSDI=8 (FSD=256), CID=0
+			memcpy(cr.d.asBytes, rats, 2);
+			SendCommand(&cr);
+			if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
+				PrintAndLogEx(ERROR, "Proxmark connection timeout.");
+				return 1;
+			}
+			
+			if (resp.arg[0] <= 0) { // ats_len
+				PrintAndLogEx(ERROR, "Can't get ATS.");
+				return 1;
+			}
+		}
+	}
+	
+	if (leaveSignalON)
+		cmdc |= ISO14A_NO_DISCONNECT;
+
+	UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_APPEND_CRC | cmdc, (datainlen & 0xFFFF), 0}}; 
+	memcpy(c.d.asBytes, datain, datainlen);
+	SendCommand(&c);
+	
+    uint8_t *recv;
+    UsbCommand resp;
+
+    if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
+        recv = resp.d.asBytes;
+        int iLen = resp.arg[0];
+		
+		*dataoutlen = iLen - 2;
+		if (*dataoutlen < 0)
+			*dataoutlen = 0;
+		
+		if (maxdataoutlen && *dataoutlen > maxdataoutlen) {
+			PrintAndLogEx(ERROR, "Buffer too small(%d). Needs %d bytes", *dataoutlen, maxdataoutlen);
+			return 2;
+		}
+		
+		memcpy(dataout, recv, *dataoutlen);
+		
+        if(!iLen) {
+			PrintAndLogEx(ERROR, "No card response.");
+            return 1;
+		}
+
+		// CRC Check
+		if (iLen == -1) {
+			PrintAndLogEx(ERROR, "ISO 14443A CRC error.");
+			return 3;
+		}
+
+
+    } else {
+        PrintAndLogEx(ERROR, "Reply timeout.");
+		return 4;
+    }
+	
+	return 0;
+}
+
 int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
 	uint16_t cmdc = 0;
 	
diff --git a/client/cmdhf14a.h b/client/cmdhf14a.h
index b2ae5896e..310a2f7d5 100644
--- a/client/cmdhf14a.h
+++ b/client/cmdhf14a.h
@@ -51,6 +51,7 @@ extern int CmdHF14AAntiFuzz(const char *cmd);
 
 extern char* getTagInfo(uint8_t uid);
 extern int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen);									
+extern int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen);
 
 extern int usage_hf_14a_sim(void);
 extern int usage_hf_14a_sniff(void);
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 5af1922af..d76699045 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -3067,6 +3067,149 @@ out:
 	return 0;
 }
 
+int aes_encode(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *output, int length){
+	uint8_t iiv[16] = {0};
+	if (iv)
+		memcpy(iiv, iv, 16);
+	
+	aes_context aes;
+	aes_init(&aes);
+	if (aes_setkey_enc(&aes, key, 128))
+		return 1;
+	if (aes_crypt_cbc(&aes, AES_ENCRYPT, length, iiv, input, output))
+		return 2;
+	aes_free(&aes);
+
+	return 0;
+}
+
+int aes_decode(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *output, int length){
+	uint8_t iiv[16] = {0};
+	if (iv)
+		memcpy(iiv, iv, 16);
+	
+	aes_context aes;
+	aes_init(&aes);
+	if (aes_setkey_dec(&aes, key, 128))
+		return 1;
+	if (aes_crypt_cbc(&aes, AES_DECRYPT, length, iiv, input, output))
+		return 2;
+	aes_free(&aes);
+
+	return 0;
+}
+
+int CmdHF14AMfAuth4(const char *cmd) {
+	uint8_t keyn[20] = {0};
+	int keynlen = 0;
+	uint8_t key[16] = {0};
+	int keylen = 0;
+	uint8_t data[257] = {0};
+	int datalen = 0;
+	
+	uint8_t Rnd1[17] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x00};
+	uint8_t Rnd2[17] = {0};
+	
+	
+	CLIParserInit("hf mf auth4", 
+		"Executes AES authentication command in ISO14443-4", 
+		"Usage:\n\thf mf auth4 4000 000102030405060708090a0b0c0d0e0f -> executes authentication\n"
+			"\thf mf auth4 9003 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -> executes authentication\n");
+
+	void* argtable[] = {
+		arg_param_begin,
+		arg_str1(NULL,  NULL,     "<Key Num (HEX 2 bytes)>", NULL),
+		arg_str1(NULL,  NULL,     "<Key Value (HEX 16 bytes)>", NULL),
+		arg_param_end
+	};
+	CLIExecWithReturn(cmd, argtable, true);
+	
+	CLIGetStrWithReturn(1, keyn, &keynlen);
+	CLIGetStrWithReturn(2, key, &keylen);
+	CLIParserFree();
+	
+	if (keynlen != 2) {
+		PrintAndLogEx(ERROR, "<Key Num> must be 2 bytes long instead of: %d", keynlen);
+		return 1;
+	}
+	
+	if (keylen != 16) {
+		PrintAndLogEx(ERROR, "<Key Value> must be 16 bytes long instead of: %d", keylen);
+		return 1;
+	}
+
+	uint8_t cmd1[] = {0x0a, 0x00, 0x70, keyn[1], keyn[0], 0x00};
+	int res = ExchangeRAW14a(cmd1, sizeof(cmd1), true, true, data, sizeof(data), &datalen);
+	if (res) {
+		PrintAndLog("ERROR exchande raw error: %d", res);
+		return 2;
+	}
+	
+	PrintAndLog("<phase1: %s", sprint_hex(data, datalen));
+		
+	if (datalen < 3) {
+		PrintAndLogEx(ERROR, "card response length: %d", datalen);
+		return 3;
+	}
+	
+	if (data[0] != 0x0a || data[1] != 0x00) {
+		PrintAndLogEx(ERROR, "Framing error in card response. :%s", sprint_hex(data, 2));
+		return 3;
+	}
+
+	if (data[2] != 0x90) {
+		PrintAndLogEx(ERROR, "card response error: %02x", data[2]);
+		return 3;
+	}
+
+	if (datalen != 19) {
+		PrintAndLogEx(ERROR, "card response must be 16 bytes long instead of: %d", datalen);
+		return 3;
+	}
+	
+    aes_decode(NULL, key, &data[3], Rnd2, 16);
+	Rnd2[16] = Rnd2[0];
+	PrintAndLog("Rnd2: %s", sprint_hex(Rnd2, 16));
+
+	uint8_t cmd2[35] = {0};
+	cmd2[0] = 0x0b;
+	cmd2[1] = 0x00;
+	cmd2[2] = 0x72;
+
+	uint8_t raw[32] = {0};
+	memmove(raw, Rnd1, 16);
+	memmove(&raw[16], &Rnd2[1], 16);
+
+    aes_encode(NULL, key, raw, &cmd2[3], 32);
+	PrintAndLog(">phase2: %s", sprint_hex(cmd2, 35));
+	
+	res = ExchangeRAW14a(cmd2, sizeof(cmd2), false, false, data, sizeof(data), &datalen);
+	if (res) {
+		PrintAndLogEx(ERROR, "exchande raw error: %d", res);
+		DropField();
+		return 4;
+	}
+	
+	PrintAndLog("<phase2: %s", sprint_hex(data, datalen));
+
+    aes_decode(NULL, key, &data[3], raw, 32);
+	PrintAndLog("res: %s", sprint_hex(raw, 32));
+	
+	PrintAndLog("Rnd1`: %s", sprint_hex(&raw[4], 16));
+	if (memcmp(&raw[4], &Rnd1[1], 16)) {
+		PrintAndLogEx(ERROR, "\nAuthentication FAILED. rnd not equal");
+		PrintAndLog("rnd1 reader: %s", sprint_hex(&Rnd1[1], 16));
+		PrintAndLog("rnd1   card: %s", sprint_hex(&raw[4], 16));
+		DropField();
+		return 5;
+	}
+
+	DropField();
+	PrintAndLog("\nAuthentication OK");
+	
+	return 0;
+}
+
 static command_t CommandTable[] = {
 	{"help",		CmdHelp,				1, "This help"},
 	{"darkside",	CmdHF14ADarkside,		0, "Darkside attack. read parity error messages."},
@@ -3085,6 +3228,7 @@ static command_t CommandTable[] = {
 	{"restore",		CmdHF14AMfRestore,		0, "Restore MIFARE classic binary file to BLANK tag"},
 	{"wrbl",		CmdHF14AMfWrBl,			0, "Write MIFARE classic block"},
 	{"setmod",		CmdHf14AMfSetMod, 		0, "Set MIFARE Classic EV1 load modulation strength"},	
+	{"auth4",		CmdHF14AMfAuth4,		0, "ISO14443-4 AES authentication"},
 //	{"sniff",		CmdHF14AMfSniff,		0, "Sniff card-reader communication"},
 	{"-----------",	CmdHelp,				1, ""},
 	{"sim",			CmdHF14AMf1kSim,		0, "Simulate MIFARE card"},
diff --git a/client/cmdhfmf.h b/client/cmdhfmf.h
index 987a6d540..3404548d5 100644
--- a/client/cmdhfmf.h
+++ b/client/cmdhfmf.h
@@ -16,6 +16,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <time.h>
+#include <aes.h>
 #include "proxmark3.h"
 #include "iso14443crc.h"
 #include "ui.h"
@@ -29,6 +30,7 @@
 #include "util_posix.h"		// msclock
 #include "mifaredefault.h"  // mifare default key array
 #include "cmdhf14a.h" 		// dropfield
+#include "cliparser/cliparser.h" // argtable
 
 extern int CmdHFMF(const char *Cmd);
 
diff --git a/client/obj/cliparser/.dummy b/client/obj/cliparser/.dummy
new file mode 100644
index 000000000..e69de29bb
diff --git a/client/reveng/cli.c b/client/reveng/cli.c
index 643d70b74..882229d90 100644
--- a/client/reveng/cli.c
+++ b/client/reveng/cli.c
@@ -53,7 +53,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "getopt.h"
+#include "cliparser/argtable3.h"
 #ifdef _WIN32
 #  include <io.h>
 #  include <fcntl.h>

From de31f052848be754d991d67c6b60114ac9461699 Mon Sep 17 00:00:00 2001
From: merlokk <olegmsn@gmail.com>
Date: Thu, 11 Oct 2018 16:54:50 +0300
Subject: [PATCH 0083/1938] ok, compiles)

---
 client/cliparser/argtable3.c | 80 +-----------------------------------
 client/reveng/cli.c          |  4 +-
 2 files changed, 3 insertions(+), 81 deletions(-)

diff --git a/client/cliparser/argtable3.c b/client/cliparser/argtable3.c
index 38ce7a24f..abffa9dc2 100644
--- a/client/cliparser/argtable3.c
+++ b/client/cliparser/argtable3.c
@@ -166,86 +166,8 @@ void dbg_printf(const char *fmt, ...)
     va_end(args);
 }
 
-/*	$NetBSD: getopt.h,v 1.4 2000/07/07 10:43:54 ad Exp $	*/
-/*	$FreeBSD$ */
+#include "getopt.h"
 
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
- * Copyright (c) 2000 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Dieter Baron and Thomas Klausner.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _GETOPT_H_
-#define _GETOPT_H_
-
-#include <sys/cdefs.h>
-
-/*
- * GNU-like getopt_long()/getopt_long_only() with 4.4BSD optreset extension.
- * getopt() is declared here too for GNU programs.
- */
-#define no_argument        0
-#define required_argument  1
-#define optional_argument  2
-
-struct option {
-	/* name of long option */
-	const char *name;
-	/*
-	 * one of no_argument, required_argument, and optional_argument:
-	 * whether option takes an argument
-	 */
-	int has_arg;
-	/* if not NULL, set *flag to val when option found */
-	int *flag;
-	/* if flag not NULL, value to set *flag to; else return value */
-	int val;
-};
-
-__BEGIN_DECLS
-int	getopt_long(int, char * const *, const char *,
-	const struct option *, int *);
-int	getopt_long_only(int, char * const *, const char *,
-	const struct option *, int *);
-#ifndef _GETOPT_DECLARED
-#define	_GETOPT_DECLARED
-int	 getopt(int, char * const [], const char *);
-
-extern char *optarg;			/* getopt(3) external variables */
-extern int optind, opterr, optopt;
-#endif
-#ifndef _OPTRESET_DECLARED
-#define	_OPTRESET_DECLARED
-extern int optreset;			/* getopt(3) external variable */
-#endif
-__END_DECLS
- 
-#endif /* !_GETOPT_H_ */
 /*	$Id: getopt_long.c,v 1.1 2009/10/16 19:50:28 rodney Exp rodney $	*/
 /*	$OpenBSD: getopt_long.c,v 1.23 2007/10/31 12:34:57 chl Exp $	*/
 /*	$NetBSD: getopt_long.c,v 1.15 2002/01/31 22:43:40 tv Exp $	*/
diff --git a/client/reveng/cli.c b/client/reveng/cli.c
index 882229d90..f4b40856a 100644
--- a/client/reveng/cli.c
+++ b/client/reveng/cli.c
@@ -53,7 +53,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "cliparser/argtable3.h"
+#include "cliparser/getopt.h"
 #ifdef _WIN32
 #  include <io.h>
 #  include <fcntl.h>
@@ -96,7 +96,7 @@ int reveng_main(int argc, char *argv[]) {
 
 	SETBMP();
 
-	pos=0;
+//	pos=0; --- not in this ver of getopt
 	optind=1;
 	do {
 		c=getopt(argc, argv, "?A:BDFGLMP:SVXa:bcdefhi:k:lm:p:q:rstuvw:x:yz");

From 4563210a96a1bcd27307ec2bf2f89aba23c4c892 Mon Sep 17 00:00:00 2001
From: merlokk <olegmsn@gmail.com>
Date: Thu, 11 Oct 2018 16:55:21 +0300
Subject: [PATCH 0084/1938] forgot h file

---
 client/cliparser/getopt.h | 80 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 80 insertions(+)
 create mode 100644 client/cliparser/getopt.h

diff --git a/client/cliparser/getopt.h b/client/cliparser/getopt.h
new file mode 100644
index 000000000..789b4d1d4
--- /dev/null
+++ b/client/cliparser/getopt.h
@@ -0,0 +1,80 @@
+/*	$NetBSD: getopt.h,v 1.4 2000/07/07 10:43:54 ad Exp $	*/
+/*	$FreeBSD$ */
+
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
+ * Copyright (c) 2000 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Dieter Baron and Thomas Klausner.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _GETOPT_H_
+#define _GETOPT_H_
+
+#include <sys/cdefs.h>
+
+/*
+ * GNU-like getopt_long()/getopt_long_only() with 4.4BSD optreset extension.
+ * getopt() is declared here too for GNU programs.
+ */
+#define no_argument        0
+#define required_argument  1
+#define optional_argument  2
+
+struct option {
+	/* name of long option */
+	const char *name;
+	/*
+	 * one of no_argument, required_argument, and optional_argument:
+	 * whether option takes an argument
+	 */
+	int has_arg;
+	/* if not NULL, set *flag to val when option found */
+	int *flag;
+	/* if flag not NULL, value to set *flag to; else return value */
+	int val;
+};
+
+__BEGIN_DECLS
+int	getopt_long(int, char * const *, const char *,
+	const struct option *, int *);
+int	getopt_long_only(int, char * const *, const char *,
+	const struct option *, int *);
+#ifndef _GETOPT_DECLARED
+#define	_GETOPT_DECLARED
+int	 getopt(int, char * const [], const char *);
+
+extern char *optarg;			/* getopt(3) external variables */
+extern int optind, opterr, optopt;
+#endif
+#ifndef _OPTRESET_DECLARED
+#define	_OPTRESET_DECLARED
+extern int optreset;			/* getopt(3) external variable */
+#endif
+__END_DECLS
+ 
+#endif /* !_GETOPT_H_ */

From 375aada810ebc73d2e3714ae77f9f7c33fe7cccc Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sat, 13 Oct 2018 11:26:40 +0200
Subject: [PATCH 0085/1938] more keys

---
 client/default_keys.dic | 11 +++++++++++
 client/default_pwd.dic  |  2 ++
 2 files changed, 13 insertions(+)

diff --git a/client/default_keys.dic b/client/default_keys.dic
index 69272317f..2f7e459e4 100644
--- a/client/default_keys.dic
+++ b/client/default_keys.dic
@@ -573,6 +573,17 @@ d58023ba2bdc,-- charlie
 60012e9ba3fa
 #
 de1fcbec764b
+81bfbe8cacba
+bff123126c9b
+2f47741062a0
+b4166b0a27ea
+a170d9b59f95
+400bc9be8976
+d80511fc2ab4
+1fcef3005bcf
+bb467463acd6
+e67c8010502d
+ff58ba1b4478
 # Data from https://pastebin.com/Kz8xp4ev
 2aa05ed1856f
 73068f118c13
diff --git a/client/default_pwd.dic b/client/default_pwd.dic
index 2f18b5ae7..9ef5b9e1e 100644
--- a/client/default_pwd.dic
+++ b/client/default_pwd.dic
@@ -10,6 +10,8 @@
 314159E0,
 # ref. http://www.proxmark.org/forum/viewtopic.php?pid=28115#p28115
 AA55BBBB,
+# ref. http://www.proxmark.org/forum/viewtopic.php?pid=33376#p33376
+A5B4C3D2,
 # ref.  http://www.proxmark.org/forum/viewtopic.php?pid=30379#p30379
 1C0B5848,
 # paxton bullit?

From 2be56183c0075b02107f5f0171f7e68881d1a55d Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sun, 14 Oct 2018 12:02:26 +0200
Subject: [PATCH 0086/1938] fix:  error enum rename

---
 client/cmdhf14a.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index fc24356a5..de1854630 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -679,7 +679,7 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
 		UsbCommand ca = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};
 		SendCommand(&ca);
 		if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-			PrintAndLogEx(ERROR, "Proxmark connection timeout.");
+			PrintAndLogEx(ERR, "Proxmark connection timeout.");
 			return 1;
 		}
 
@@ -690,7 +690,7 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
 		}
 
 		if (resp.arg[0] != 1 && resp.arg[0] != 2) {
-			PrintAndLogEx(ERROR, "Card not in iso14443-4. res=%d.", resp.arg[0]);
+			PrintAndLogEx(ERR, "Card not in iso14443-4. res=%d.", resp.arg[0]);
 			return 1;
 		}
 
@@ -701,12 +701,12 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
 			memcpy(cr.d.asBytes, rats, 2);
 			SendCommand(&cr);
 			if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-				PrintAndLogEx(ERROR, "Proxmark connection timeout.");
+				PrintAndLogEx(ERR, "Proxmark connection timeout.");
 				return 1;
 			}
 			
 			if (resp.arg[0] <= 0) { // ats_len
-				PrintAndLogEx(ERROR, "Can't get ATS.");
+				PrintAndLogEx(ERR, "Can't get ATS.");
 				return 1;
 			}
 		}
@@ -731,26 +731,26 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
 			*dataoutlen = 0;
 		
 		if (maxdataoutlen && *dataoutlen > maxdataoutlen) {
-			PrintAndLogEx(ERROR, "Buffer too small(%d). Needs %d bytes", *dataoutlen, maxdataoutlen);
+			PrintAndLogEx(ERR, "Buffer too small(%d). Needs %d bytes", *dataoutlen, maxdataoutlen);
 			return 2;
 		}
 		
 		memcpy(dataout, recv, *dataoutlen);
 		
         if(!iLen) {
-			PrintAndLogEx(ERROR, "No card response.");
+			PrintAndLogEx(ERR, "No card response.");
             return 1;
 		}
 
 		// CRC Check
 		if (iLen == -1) {
-			PrintAndLogEx(ERROR, "ISO 14443A CRC error.");
+			PrintAndLogEx(ERR, "ISO 14443A CRC error.");
 			return 3;
 		}
 
 
     } else {
-        PrintAndLogEx(ERROR, "Reply timeout.");
+        PrintAndLogEx(ERR, "Reply timeout.");
 		return 4;
     }
 	

From bd34d145f196d653b7962948de6aeba631b4dc05 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sun, 14 Oct 2018 12:05:45 +0200
Subject: [PATCH 0087/1938] fix:  error enum rename

---
 client/cmdhfmf.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index d76699045..f40db51cf 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -3129,12 +3129,12 @@ int CmdHF14AMfAuth4(const char *cmd) {
 	CLIParserFree();
 	
 	if (keynlen != 2) {
-		PrintAndLogEx(ERROR, "<Key Num> must be 2 bytes long instead of: %d", keynlen);
+		PrintAndLogEx(ERR, "<Key Num> must be 2 bytes long instead of: %d", keynlen);
 		return 1;
 	}
 	
 	if (keylen != 16) {
-		PrintAndLogEx(ERROR, "<Key Value> must be 16 bytes long instead of: %d", keylen);
+		PrintAndLogEx(ERR, "<Key Value> must be 16 bytes long instead of: %d", keylen);
 		return 1;
 	}
 
@@ -3148,22 +3148,22 @@ int CmdHF14AMfAuth4(const char *cmd) {
 	PrintAndLog("<phase1: %s", sprint_hex(data, datalen));
 		
 	if (datalen < 3) {
-		PrintAndLogEx(ERROR, "card response length: %d", datalen);
+		PrintAndLogEx(ERR, "card response length: %d", datalen);
 		return 3;
 	}
 	
 	if (data[0] != 0x0a || data[1] != 0x00) {
-		PrintAndLogEx(ERROR, "Framing error in card response. :%s", sprint_hex(data, 2));
+		PrintAndLogEx(ERR, "Framing error in card response. :%s", sprint_hex(data, 2));
 		return 3;
 	}
 
 	if (data[2] != 0x90) {
-		PrintAndLogEx(ERROR, "card response error: %02x", data[2]);
+		PrintAndLogEx(ERR, "card response error: %02x", data[2]);
 		return 3;
 	}
 
 	if (datalen != 19) {
-		PrintAndLogEx(ERROR, "card response must be 16 bytes long instead of: %d", datalen);
+		PrintAndLogEx(ERR, "card response must be 16 bytes long instead of: %d", datalen);
 		return 3;
 	}
 	
@@ -3185,7 +3185,7 @@ int CmdHF14AMfAuth4(const char *cmd) {
 	
 	res = ExchangeRAW14a(cmd2, sizeof(cmd2), false, false, data, sizeof(data), &datalen);
 	if (res) {
-		PrintAndLogEx(ERROR, "exchande raw error: %d", res);
+		PrintAndLogEx(ERR, "exchande raw error: %d", res);
 		DropField();
 		return 4;
 	}
@@ -3197,7 +3197,7 @@ int CmdHF14AMfAuth4(const char *cmd) {
 	
 	PrintAndLog("Rnd1`: %s", sprint_hex(&raw[4], 16));
 	if (memcmp(&raw[4], &Rnd1[1], 16)) {
-		PrintAndLogEx(ERROR, "\nAuthentication FAILED. rnd not equal");
+		PrintAndLogEx(ERR, "\nAuthentication FAILED. rnd not equal");
 		PrintAndLog("rnd1 reader: %s", sprint_hex(&Rnd1[1], 16));
 		PrintAndLog("rnd1   card: %s", sprint_hex(&raw[4], 16));
 		DropField();
@@ -3205,7 +3205,7 @@ int CmdHF14AMfAuth4(const char *cmd) {
 	}
 
 	DropField();
-	PrintAndLog("\nAuthentication OK");
+	PrintAndLogEx(INFO, "Authentication OK");
 	
 	return 0;
 }

From 34c1da7ad424d7156df02fcec950fcfe59657967 Mon Sep 17 00:00:00 2001
From: bogiton <34060135+bogiton@users.noreply.github.com>
Date: Tue, 16 Oct 2018 19:39:29 +0000
Subject: [PATCH 0088/1938] Include the HF_BOG standalone mode

---
 armsrc/Makefile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/armsrc/Makefile b/armsrc/Makefile
index 8f0cd025e..8a576f001 100644
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -24,7 +24,7 @@ APP_CFLAGS = -DWITH_CRC \
 			 -DWITH_FLASH \
 			 -DWITH_SMARTCARD \
 			 -DWITH_HFSNOOP \
-			 -DWITH_LF_SAMYRUN \
+			 -DWITH_HF_BOG \
 			 -DWITH_FPC \
 			 -fno-strict-aliasing -ffunction-sections -fdata-sections
 
@@ -42,6 +42,7 @@ APP_CFLAGS = -DWITH_CRC \
 #			 -DWITH_HF_YOUNG
 #			 -DWITH_HF_MATTYRUN
 #			 -DWITH_HF_COLIN
+#			 -DWITH_HF_BOG
 
 
 SRC_LCD = fonts.c LCD.c
@@ -106,6 +107,10 @@ endif
 ifneq (,$(findstring WITH_HF_COLIN,$(APP_CFLAGS)))
 	SRC_STANDALONE = vtsend.c hf_colin.c
 endif
+# WITH_HF_BOG
+ifneq (,$(findstring WITH_HF_BOG,$(APP_CFLAGS)))
+	SRC_STANDALONE = hf_bog.c
+endif
 
 #the FPGA bitstream files. Note: order matters!
 FPGA_BITSTREAMS = fpga_lf.bit fpga_hf.bit

From 8079613b37640b8f940bf412143b4ec6d9d7cbb6 Mon Sep 17 00:00:00 2001
From: bogiton <34060135+bogiton@users.noreply.github.com>
Date: Tue, 16 Oct 2018 19:41:05 +0000
Subject: [PATCH 0089/1938] Add check for the HF_BOG directive for RunMod

---
 armsrc/appmain.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index a84a33d48..79eba9cf8 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1530,7 +1530,7 @@ void  __attribute__((noreturn)) AppMain(void) {
 			RunMod();
 #endif
 		
-#if defined (WITH_ISO14443a) && ( defined (WITH_HF_YOUNG) || defined(WITH_HF_COLIN) || defined(WITH_HF_MATTYRUN) )
+#if defined (WITH_ISO14443a) && ( defined (WITH_HF_YOUNG) || defined(WITH_HF_COLIN) || defined(WITH_HF_MATTYRUN) || defined(WITH_HF_BOG) )
 			RunMod();
 #endif
 

From 1c2af2a5ed9bb376898178f6de1f2ff7a1f17f97 Mon Sep 17 00:00:00 2001
From: bogiton <34060135+bogiton@users.noreply.github.com>
Date: Tue, 16 Oct 2018 19:50:18 +0000
Subject: [PATCH 0090/1938] Added hf_bog standalone

---
 armsrc/Standalone/hf_bog.c | 366 +++++++++++++++++++++++++++++++++++++
 armsrc/Standalone/hf_bog.h |  31 ++++
 2 files changed, 397 insertions(+)
 create mode 100644 armsrc/Standalone/hf_bog.c
 create mode 100644 armsrc/Standalone/hf_bog.h

diff --git a/armsrc/Standalone/hf_bog.c b/armsrc/Standalone/hf_bog.c
new file mode 100644
index 000000000..5a279ebd9
--- /dev/null
+++ b/armsrc/Standalone/hf_bog.c
@@ -0,0 +1,366 @@
+//-----------------------------------------------------------------------------
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// main code for standalone HF Sniff (and ULC/NTAG/ULEV1 pwd storing)
+//-----------------------------------------------------------------------------
+#include "hf_bog.h"
+
+#define DELAY_READER_AIR2ARM_AS_SNIFFER (2 + 3 + 8) 
+#define DELAY_TAG_AIR2ARM_AS_SNIFFER (3 + 14 + 8) 
+#define MAX_PWDS_PER_SESSION 15
+
+uint8_t ReadCounterFromFlash() {
+	uint8_t mem = 0;
+
+	uint8_t isok = Flash_ReadData(0, &mem, 1);
+	if (isok == 1)
+	{
+		return mem;
+	}
+	
+	Dbprintf("Reading of counter from flashmem failed");
+	return -1;
+}
+
+uint8_t* ReadDataFromFlash(uint8_t datacnt) {
+
+    uint16_t isok = 0;
+	
+	if (!datacnt)
+	{
+		uint8_t *tmp = BigBuf_malloc(4);
+		for (int i=0;i<4;i++)
+			tmp[i] = 0x00;
+		return tmp;
+	}
+	
+	size_t size = (datacnt + 1) * 4;
+	uint8_t *mem = BigBuf_malloc(size);
+	
+	isok = Flash_ReadData(0, mem, (datacnt + 1) * 4);
+	if (isok == ((datacnt + 1) * 4))
+	{
+		Dbprintf("[OK] Data recovered from flashmem");
+		return mem;
+	}
+
+	Dbprintf("FlashMem reading failed | isok = %d", isok);
+	SpinDelay(100);
+	return 0;
+}
+
+/*
+void WriteDataToFlash(uint8_t *data, size_t size)
+{
+    uint8_t isok = 0;
+	
+	isok = Flash_WriteData(0, data, size);
+
+	if (!isok)
+	{
+		Dbprintf("FlashMem write failed");
+		SpinDelay(100);
+
+		return;
+	}
+
+    Dbprintf("[OK] Data written to flash!");
+}
+*/
+
+void EraseMemory()
+{
+    if (!FlashInit()){
+        return;
+    }
+    
+    Flash_CheckBusy(BUSY_TIMEOUT);
+    Flash_WriteEnable();
+    Flash_Erase4k(0,0);
+
+    Dbprintf("[OK] Erased flash!");
+    FlashStop();
+	SpinDelay(100);
+}
+
+
+void WriteDataToFlash(uint8_t* data, size_t size)
+{
+    uint8_t isok = 0;
+    uint16_t res = 0;
+    uint32_t len = size;
+    uint32_t bytes_sent = 0;
+    uint32_t bytes_remaining = len;
+
+    uint8_t buff[PAGESIZE];
+
+    if (!FlashInit()){
+        return;
+    }
+    
+    Flash_CheckBusy(BUSY_TIMEOUT);
+    Flash_WriteEnable();
+    Flash_Erase4k(0,0);
+
+    while (bytes_remaining > 0)
+    {
+		Flash_CheckBusy(BUSY_TIMEOUT);
+		Flash_WriteEnable();
+
+        uint32_t bytes_in_packet = MIN(FLASH_MEM_BLOCK_SIZE, bytes_remaining);
+
+        memcpy(buff, data + bytes_sent, bytes_in_packet);
+
+        bytes_remaining -= bytes_in_packet;
+        res = Flash_WriteDataCont(bytes_sent, buff, bytes_in_packet);
+        bytes_sent += bytes_in_packet;
+
+        isok = (res == bytes_in_packet) ? 1 : 0;
+
+        if (!isok)
+        {
+            Dbprintf("FlashMem write failed [offset %u]", bytes_sent);
+            SpinDelay(100);
+
+            return;
+        }
+    }
+
+    Dbprintf("[OK] Data written to flash! [0-to offset %u]", bytes_sent);
+    FlashStop();
+
+    return;
+}
+
+void RAMFUNC SniffAndStore(uint8_t param) {
+	
+	// Array to store the authpwds
+	uint8_t *capturedPwds = BigBuf_malloc(4 * MAX_PWDS_PER_SESSION);
+	
+	SpinDelay(500);
+
+	/* This is actually copied from SniffIso14443a */
+	
+	iso14443a_setup(FPGA_HF_ISO14443A_SNIFFER);
+	
+	// Allocate memory from BigBuf for some buffers
+	// free all previous allocations first
+	BigBuf_free(); BigBuf_Clear_ext(false);
+	clear_trace();
+	set_tracing(true);
+	
+	// The command (reader -> tag) that we're receiving.
+	uint8_t *receivedCmd = BigBuf_malloc(MAX_FRAME_SIZE);
+	uint8_t *receivedCmdPar = BigBuf_malloc(MAX_PARITY_SIZE);
+	
+	// The response (tag -> reader) that we're receiving.
+	uint8_t *receivedResp = BigBuf_malloc(MAX_FRAME_SIZE);
+	uint8_t *receivedRespPar = BigBuf_malloc(MAX_PARITY_SIZE);
+	
+	// The DMA buffer, used to stream samples from the FPGA
+	uint8_t *dmaBuf = BigBuf_malloc(DMA_BUFFER_SIZE);
+	uint8_t *data = dmaBuf;
+
+	uint8_t previous_data = 0;
+	int dataLen = 0;
+	bool TagIsActive = false;
+	bool ReaderIsActive = false;
+	
+	// Set up the demodulator for tag -> reader responses.
+	DemodInit(receivedResp, receivedRespPar);
+	
+	// Set up the demodulator for the reader -> tag commands
+	UartInit(receivedCmd, receivedCmdPar);
+	
+	// Setup and start DMA.
+	if ( !FpgaSetupSscDma((uint8_t*) dmaBuf, DMA_BUFFER_SIZE) ){
+		if (MF_DBGLEVEL > 1) Dbprintf("FpgaSetupSscDma failed. Exiting"); 
+		return;
+	}
+	
+	tUart* uart = GetUart();
+	tDemod* demod = GetDemod();
+	
+	// We won't start recording the frames that we acquire until we trigger;
+	// a good trigger condition to get started is probably when we see a
+	// response from the tag.
+	// triggered == false -- to wait first for card
+	bool triggered = !(param & 0x03); 
+	
+	uint32_t rsamples = 0;
+	
+	// Current captured passwords counter
+	uint8_t auth_attempts = 0;
+
+	SpinDelay(50);
+	
+	// loop and listen
+	while (!BUTTON_PRESS()) {
+        WDT_HIT();
+        LED_A_ON();
+		
+		int register readBufDataP = data - dmaBuf;
+		int register dmaBufDataP = DMA_BUFFER_SIZE - AT91C_BASE_PDC_SSC->PDC_RCR;
+		if (readBufDataP <= dmaBufDataP)
+			dataLen = dmaBufDataP - readBufDataP;
+		else
+			dataLen = DMA_BUFFER_SIZE - readBufDataP + dmaBufDataP;
+		
+		// test for length of buffer
+		if (dataLen > DMA_BUFFER_SIZE) { // TODO: Check if this works properly
+			Dbprintf("[!] blew circular buffer! | datalen %u", dataLen);
+			break;
+		}
+		if (dataLen < 1) continue;
+
+		// primary buffer was stopped( <-- we lost data!
+		if (!AT91C_BASE_PDC_SSC->PDC_RCR) {
+			AT91C_BASE_PDC_SSC->PDC_RPR = (uint32_t) dmaBuf;
+			AT91C_BASE_PDC_SSC->PDC_RCR = DMA_BUFFER_SIZE;
+			//Dbprintf("[-] RxEmpty ERROR | data length %d", dataLen); // temporary
+		}
+		// secondary buffer sets as primary, secondary buffer was stopped
+		if (!AT91C_BASE_PDC_SSC->PDC_RNCR) {
+			AT91C_BASE_PDC_SSC->PDC_RNPR = (uint32_t) dmaBuf;
+			AT91C_BASE_PDC_SSC->PDC_RNCR = DMA_BUFFER_SIZE;
+		}
+
+		LED_A_OFF();
+		
+		// Need two samples to feed Miller and Manchester-Decoder
+		if (rsamples & 0x01) {
+
+			if (!TagIsActive) {		// no need to try decoding reader data if the tag is sending
+				uint8_t readerdata = (previous_data & 0xF0) | (*data >> 4);
+				if (MillerDecoding(readerdata, (rsamples-1)*4)) {
+					LED_C_ON();
+
+					// check - if there is a short 7bit request from reader
+					if ((!triggered) && (param & 0x02) && (uart->len == 1) && (uart->bitCount == 7)) triggered = true;
+
+					if (triggered) {
+						if ((receivedCmd) && ((receivedCmd[0] == MIFARE_ULEV1_AUTH) || (receivedCmd[0] == MIFARE_ULC_AUTH_1))) {
+							Dbprintf("PWD-AUTH KEY: 0x%02x%02x%02x%02x", receivedCmd[1], receivedCmd[2], receivedCmd[3], receivedCmd[4]);
+							
+							// temporarily save the captured pwd in our array
+							memcpy(&capturedPwds[4 * auth_attempts], receivedCmd+1, 4);
+							auth_attempts++;
+						}
+						
+						if (!LogTrace(receivedCmd, 
+										uart->len, 
+										uart->startTime*16 - DELAY_READER_AIR2ARM_AS_SNIFFER,
+										uart->endTime*16 - DELAY_READER_AIR2ARM_AS_SNIFFER,
+										uart->parity, 
+										true)) break;
+					}
+					/* ready to receive another command. */
+					UartReset();
+					/* reset the demod code, which might have been */
+					/* false-triggered by the commands from the reader. */
+					DemodReset();
+					LED_B_OFF();
+				}
+				ReaderIsActive = (uart->state != STATE_UNSYNCD);
+			}
+
+			// no need to try decoding tag data if the reader is sending - and we cannot afford the time
+			if (!ReaderIsActive) {		
+				uint8_t tagdata = (previous_data << 4) | (*data & 0x0F);
+				if (ManchesterDecoding(tagdata, 0, (rsamples-1)*4)) {
+					LED_B_ON();
+
+					if (!LogTrace(receivedResp, 
+									demod->len, 
+									demod->startTime*16 - DELAY_TAG_AIR2ARM_AS_SNIFFER, 
+									demod->endTime*16 - DELAY_TAG_AIR2ARM_AS_SNIFFER,
+									demod->parity,
+									false)) break;
+
+					if ((!triggered) && (param & 0x01)) triggered = true;
+
+					// ready to receive another response.
+					DemodReset();
+					// reset the Miller decoder including its (now outdated) input buffer
+					UartReset();
+					//UartInit(receivedCmd, receivedCmdPar);
+					LED_C_OFF();
+				} 
+				TagIsActive = (demod->state != DEMOD_UNSYNCD);
+			}
+		}
+
+		previous_data = *data;
+		rsamples++;
+		data++;
+		if (data == dmaBuf + DMA_BUFFER_SIZE) {
+			data = dmaBuf;
+		}
+	} // end main loop
+
+	FpgaDisableSscDma();
+	set_tracing(false);
+	
+	Dbprintf("Stopped sniffing");
+	
+	SpinDelay(200);
+	
+	// Write stuff to flash
+	if (auth_attempts > 0) {
+		Dbprintf("[!] auth_attempts = %u", auth_attempts);
+		
+		// Read from flash the counter of pwds (to be used as flash mem offset)
+		uint8_t pwdcnt = 0;
+		pwdcnt = ReadCounterFromFlash();
+		if (pwdcnt == 255) {
+			// Same as zero
+			pwdcnt = 0;
+		}
+		Dbprintf("[!] PWDs Offset = %u", pwdcnt);
+		
+		uint8_t *previousdata = ReadDataFromFlash(pwdcnt);
+		
+		// total size = (pwdcnt+1)*4 + 4 * auth_attempts
+		size_t total_size = (pwdcnt+1)*4 + 4 * auth_attempts;
+		// create new bigbuf to hold all data
+		uint8_t *total_data = BigBuf_malloc(total_size);
+		
+		// Add the previousdata array into total_data array
+		memcpy(total_data, previousdata, sizeof(*previousdata) * ((pwdcnt+1)*4));
+		
+		// Copy bytes of capturedPwds immediately following bytes of previousdata
+		memcpy(total_data + ((pwdcnt+1)*4), capturedPwds, sizeof(*capturedPwds) * (4 * auth_attempts));
+		
+		// change the counter byte
+		//memset (total_data,pwdcnt + auth_attempts,1);
+		total_data[0] = (uint8_t)(pwdcnt + auth_attempts);
+		
+		//EraseMemory();
+		
+		//for (int i=0;i<(pwdcnt+1)*4 + 4 * auth_attempts;i++)
+		//	Dbprintf("[!] total_data[%d] = 0x%02x", i, total_data[i]);
+		
+		//Flash_WriteData(0, total_data, (pwdcnt+1)*4 + 4 * auth_attempts);
+		WriteDataToFlash(total_data, (pwdcnt+1)*4 + 4 * auth_attempts);
+		
+		SpinDelay(200);
+	}
+}
+
+void RunMod()
+{
+	Dbprintf("Sniffing started");
+    SpinDelay(500);
+	
+	// param:
+	// bit 0 - trigger from first card answer
+	// bit 1 - trigger from first reader 7-bit request	
+	SniffAndStore(0);
+	
+	LEDsoff();
+	
+	SpinDelay(300);
+}
+
diff --git a/armsrc/Standalone/hf_bog.h b/armsrc/Standalone/hf_bog.h
new file mode 100644
index 000000000..8b7d4c695
--- /dev/null
+++ b/armsrc/Standalone/hf_bog.h
@@ -0,0 +1,31 @@
+//-----------------------------------------------------------------------------
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// StandAlone Mod
+//-----------------------------------------------------------------------------
+
+#ifndef FALSE
+#define FALSE 0
+#endif
+
+#ifndef __HF_BOG_H
+#define __HF_BOG_H
+
+#include "proxmark3.h"
+#include "mifareutil.h"
+#include "iso14443a.h"
+#include "protocols.h"
+#include "util.h"
+#include "standalone.h" // standalone definitions
+#include <stdbool.h>    // for bool
+#include <stdio.h>
+#include <string.h>
+#include "apps.h"
+#include "printf.h"
+
+#include "parity.h"
+#include "random.h"
+
+#endif /* __HF_BOG_H */

From 3690914405c3294d754bdd773ee0a70f8f6d5e4d Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Fri, 19 Oct 2018 21:52:23 +0200
Subject: [PATCH 0091/1938] another cloner

---
 client/default_pwd.dic | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/default_pwd.dic b/client/default_pwd.dic
index 9ef5b9e1e..cdc99b5c4 100644
--- a/client/default_pwd.dic
+++ b/client/default_pwd.dic
@@ -2,6 +2,7 @@
 # ref. http://www.proxmark.org/forum/viewtopic.php?id=2022
 51243648,
 000D8787,
+19920427,
 # ref. http://kazus.ru/forums/showpost.php?p=1045937&postcount=77
 05D73B9F,
 # ref. http://www.proxmark.org/forum/viewtopic.php?=

From 58ea9caeae7e02966ecddecc927016b600544dc2 Mon Sep 17 00:00:00 2001
From: Pavel Zhovner <pavel@zhovner.com>
Date: Sun, 21 Oct 2018 18:56:27 +0300
Subject: [PATCH 0092/1938] Added full key set of russian Troika card.
 Dupicates removed, added missed commas

---
 client/default_keys.dic | 148 ++++++++++++++++++++++++----------------
 1 file changed, 90 insertions(+), 58 deletions(-)

diff --git a/client/default_keys.dic b/client/default_keys.dic
index 2f7e459e4..a77418df8 100644
--- a/client/default_keys.dic
+++ b/client/default_keys.dic
@@ -173,7 +173,6 @@ B39AE17435DC,
 #
 # Data from: http://pastebin.com/gQ6nk38G
 D39BB83F5297,
-A27D3804C259,
 85675B200017,
 528C9DFFE28C,
 C82EC29E3235,
@@ -202,15 +201,10 @@ B0C9DD55DD4D,
 A0B0C0D0E0F0,
 A1B1C1D1E1F1,
 #
-# Data from: msk three
-ae3d65a3dad4,
-a73f5dc1d333,
-#
 # Data from: msk social
 2735fc181807,
 2aba9519f574,
 84fd7f7a12b6,
-73068f118c13,
 186d8c4b93f9,
 3a4bba8adaf0,
 8765b17968a2,
@@ -223,7 +217,6 @@ a73f5dc1d333,
 bf23a53c1f63,
 cb9a1f2d7368,
 c7c0adb3284f,
-2b7f3253fac5,
 9f131d8c2057,
 67362d90f973,
 6202a38f69e2,
@@ -335,11 +328,8 @@ a56c2df9a26d,
 #
 # Data from: https://pastebin.com/vbwast74
 #
-2031d1e57a3b,
 68d3f7307c89,
-9189449ea24e,
 568c9083f71c,--Smart Rider. Western Australian Public Transport Cards
-53c11f90822a,
 # Vigik Keys
 # Various sources :
 # * https://github.com/DumpDos/Vigik
@@ -492,7 +482,6 @@ f7a39753d018,
 #
 # Data from TransPert
 2031d1e57a3b,
-68d3f7307c89,
 53c11f90822a,
 9189449ea24e,
 568c9083f71c,
@@ -566,61 +555,104 @@ d58023ba2bdc,-- charlie
 2548a443df28,-- charlie
 2ed3b15e7c0f,-- charlie
 #
-# Data from forum
-6a1987c40a21
-7f33625bc129
+60012e9ba3fa,
 #
-60012e9ba3fa
-#
-de1fcbec764b
-81bfbe8cacba
-bff123126c9b
-2f47741062a0
-b4166b0a27ea
-a170d9b59f95
-400bc9be8976
-d80511fc2ab4
-1fcef3005bcf
-bb467463acd6
-e67c8010502d
-ff58ba1b4478
+de1fcbec764b,
+81bfbe8cacba,
+bff123126c9b,
+2f47741062a0,
+b4166b0a27ea,
+a170d9b59f95,
+400bc9be8976,
+d80511fc2ab4,
+1fcef3005bcf,
+bb467463acd6,
+e67c8010502d,
+ff58ba1b4478,
 # Data from https://pastebin.com/Kz8xp4ev
-2aa05ed1856f
-73068f118c13
-2b7f3253fac5
-eaac88e5dc99
-ae3d65a3dad4
-a73f5dc1d333
-a82607b01c0d
-2910989b6880
-0f1c63013dba
-fbf225dc5d58
+fbf225dc5d58,
 #
 # Data  https://pastebin.com/BEm6bdAE
 # vingcard.txt
-4708111c8604
-3d50d902ea48
-96a301bce267
-6700f10fec09
-7a09cc1db70a
-560f7cff2d81
-66b31e64ca4b
-9e53491f685b
-3a09911d860c
-8a036920ac0c
-361f69d2c462
-d9bcde7fc489
-0c03a720f208
-6018522fac02
+4708111c8604,
+3d50d902ea48,
+96a301bce267,
+6700f10fec09,
+7a09cc1db70a,
+560f7cff2d81,
+66b31e64ca4b,
+9e53491f685b,
+3a09911d860c,
+8a036920ac0c,
+361f69d2c462,
+d9bcde7fc489,
+0c03a720f208,
+6018522fac02,
 #
 # Data from https://pastebin.com/4t2yFMgt
 # Mifare technische Universität Graz TUG
-D58660D1ACDE
-50A11381502C
-C01FC822C6E5
-0854BF31111E
+D58660D1ACDE,
+50A11381502C,
+C01FC822C6E5,
+0854BF31111E,
 # More keys:
-8a19d40cf2b5
-ae8587108640
+8a19d40cf2b5,
+ae8587108640,
 8829DA9DAF76,-- Meriton Suites Syd, Aus ;). Not sure where this came from...
 135b88a94b8b, SafLock standalone door locks.
+#
+# Russian Troika card
+08B386463229,
+0E8F64340BA4,
+0F1C63013DBA,
+2AA05ED1856F,
+2B7F3253FAC5,
+69A32F1C2F19,
+73068F118C13,
+9BECDF3D9273,
+A73F5DC1D333,
+A82607B01C0D,
+AE3D65A3DAD4,
+CD4C61C26E3D,
+D3EAFB5DF46D,
+E35173494A81,
+FBC2793D540B,
+5125974CD391,
+ECF751084A80,
+7545DF809202,
+AB16584C972A,
+7A38E3511A38,
+C8454C154CB5,
+04C297B91308,
+EFCB0E689DB3,
+07894FFEC1D6,
+FBA88F109B32,
+2FE3CB83EA43,
+B90DE525CEB6,
+1CC219E9FEC1,
+A74332F74994,
+764CD061F1E6,
+8F79C4FD8A01,
+CD64E567ABCD,
+CE26ECB95252,
+ABA208516740,
+9868925175BA,
+16A27AF45407,
+372CC880F216,
+3EBCE0925B2F,
+73E5B9D9D3A4,
+0DB520C78C1C,
+70D901648CB9,
+C11F4597EFB5,
+B39D19A280DF,
+403D706BA880,
+7038CD25C408,
+6B02733BB6EC,
+EAAC88E5DC99,
+4ACEC1205D75,
+2910989B6880,
+31C7610DE3B0,
+5EFBAECEF46B,
+F8493407799D,
+6B8BD9860763,
+D3A297DC2698,
\ No newline at end of file

From 22fb92f9c869c144eb2d8475fc735df6c74248a6 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sun, 21 Oct 2018 19:51:22 +0200
Subject: [PATCH 0093/1938] sugar

---
 armsrc/flashmem.c | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/armsrc/flashmem.c b/armsrc/flashmem.c
index 3a46500ba..92204baff 100644
--- a/armsrc/flashmem.c
+++ b/armsrc/flashmem.c
@@ -254,12 +254,7 @@ uint16_t Flash_ReadData(uint32_t address, uint8_t *out, uint16_t len) {
 	// length should never be zero
 	if (!len || Flash_CheckBusy(BUSY_TIMEOUT)) return 0;
 
-
-    uint8_t cmd = READDATA;
-
-	if(FASTFLASH) {
-		cmd = FASTREAD;
-	} 
+    uint8_t cmd = (FASTFLASH) ? FASTREAD : READDATA;
 
 	FlashSendByte(cmd);
 	Flash_TransferAdresse(address);
@@ -273,8 +268,6 @@ uint16_t Flash_ReadData(uint32_t address, uint8_t *out, uint16_t len) {
 		out[i] = FlashSendByte(0xFF);
 
 	out[i] = FlashSendLastByte(0xFF);
-
-
 	FlashStop();	
 	return len;	
 }
@@ -291,11 +284,7 @@ uint16_t Flash_ReadDataCont(uint32_t address, uint8_t *out, uint16_t len) {
 	// length should never be zero
 	if (!len) return 0;
 	
-    uint8_t cmd = READDATA;
-
-	if(FASTFLASH) {
-		cmd = FASTREAD;
-	} 
+    uint8_t cmd = (FASTFLASH) ? FASTREAD : READDATA;
 
 	FlashSendByte(cmd);
 	Flash_TransferAdresse(address);
@@ -309,7 +298,6 @@ uint16_t Flash_ReadDataCont(uint32_t address, uint8_t *out, uint16_t len) {
 		out[i] = FlashSendByte(0xFF);
 
 	out[i] = FlashSendLastByte(0xFF);
-	
 	return len;	
 }
 

From 746299b9ad8a7b72ce46b174044620fc0495a75e Mon Sep 17 00:00:00 2001
From: Hector Sanjuan <code@hector.link>
Date: Sun, 21 Oct 2018 18:24:16 +0200
Subject: [PATCH 0094/1938] Add nonce2key to .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index f3fbe950a..785934f46 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,6 +32,7 @@ luac
 fpga_compress
 mfkey32
 mfkey64
+tools/nonce2key/nonce2key
 
 fpga/*
 !fpga/tests

From 34775c81f57c58837fe86a2ae7d4733150d73331 Mon Sep 17 00:00:00 2001
From: bogiton <34060135+bogiton@users.noreply.github.com>
Date: Sun, 21 Oct 2018 18:29:49 +0000
Subject: [PATCH 0095/1938] Added BogitoRun identification

---
 armsrc/appmain.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 79eba9cf8..2a3ae823a 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -453,7 +453,10 @@ void printStandAloneModes(void) {
 #if defined(WITH_HF_COLIN)
     DbpString("   HF Mifare ultra fast sniff/sim/clone - aka VIGIKPWN (Colin Brigato)");
 #endif
-	
+#if defined(WITH_HF_BOG)
+	DbpString("   HF 14a sniff standalone with ULC/ULEV1/NTAG auth storing in flashmem - aka BogitoRun (Bogito)");
+#endif
+
 	//DbpString("Running ");	
 	//Dbprintf("  Is Device attached to USB| %s", USB_ATTACHED() ? "Yes" : "No"); 
 	//Dbprintf("  Is Device attached to FPC| %s", 0 ? "Yes" : "No"); 

From 4784cfd3fd2acc12d3057e322cbd8cb719a5325c Mon Sep 17 00:00:00 2001
From: Pavel Zhovner <pavel@zhovner.com>
Date: Mon, 22 Oct 2018 22:03:58 +0300
Subject: [PATCH 0096/1938] Added new keys from MifareClassicTool project.
 Remove two dups

---
 client/default_keys.dic | 58 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 55 insertions(+), 3 deletions(-)

diff --git a/client/default_keys.dic b/client/default_keys.dic
index a77418df8..e8f0743d1 100644
--- a/client/default_keys.dic
+++ b/client/default_keys.dic
@@ -484,7 +484,6 @@ f7a39753d018,
 2031d1e57a3b,
 53c11f90822a,
 9189449ea24e,
-568c9083f71c,
 #
 # data from Github
 410b9b40b872,
@@ -598,7 +597,6 @@ C01FC822C6E5,
 # More keys:
 8a19d40cf2b5,
 ae8587108640,
-8829DA9DAF76,-- Meriton Suites Syd, Aus ;). Not sure where this came from...
 135b88a94b8b, SafLock standalone door locks.
 #
 # Russian Troika card
@@ -655,4 +653,58 @@ EAAC88E5DC99,
 5EFBAECEF46B,
 F8493407799D,
 6B8BD9860763,
-D3A297DC2698,
\ No newline at end of file
+D3A297DC2698,
+#
+# Keys from MifareClassicTool project
+044CE1872BC3,
+045CECA15535,
+0BE5FAC8B06A,
+0CE7CD2CC72B,
+0EB23CC8110B,
+0F01CEFF2742,
+0F318130ED18,
+114D6BE9440C,
+18E3A02B5EFF,
+19FC84A3784B,
+1B61B2E78C75,
+22052B480D11,
+3367BFAA91DB,
+3A8A139C20B4,
+42E9B54E51AB,
+46D78E850A7E,
+4B609876BBA3,
+518DC6EEA089,
+6B07877E2C5C,
+7259FA0197C6,
+72F96BDD3714,
+7413B599C4EA,
+77DABC9825E1,
+7A396F0D633D,
+7A86AA203788,
+8791B2CCB5C4,
+8A8D88151A00,
+8C97CD7A0E56,
+8E26E45E7D65,
+9D993C5D4EF4,
+9EA3387A63C1,
+A3FAA6DAFF67,
+A7141147D430,
+AAFB06045877,
+ACFFFFFFFFFF,
+AFCEF64C9913,
+B27ADDFB64B0,
+B81F2B0C2F66,
+B9F8A7D83978,
+BAFF3053B496,
+BB52F8CCE07F,
+BC2D1791DEC1,
+BC4580B7F20B,
+C65D4EAA645B,
+C76BF71A2509,
+D5524F591EED,
+E328A1C7156D,
+E4821A377B75,
+E56AC127DD45,
+EA0FD73CB149,
+FC0001877BF7,
+FD8705E721B0,

From 61ea3109c9d6529c1b1f77c7ff78fe6aafb0f80f Mon Sep 17 00:00:00 2001
From: merlokk <olegmsn@gmail.com>
Date: Wed, 24 Oct 2018 18:18:05 +0300
Subject: [PATCH 0097/1938] start merge

---
 client/Makefile              |   3 +
 client/cliparser/cliparser.c |  45 ++-
 client/cliparser/cliparser.h |   8 +-
 client/cmdhf.c               |   1 +
 client/cmdhf.h               |   1 +
 client/cmdhfmf.c             | 120 +-----
 client/cmdhfmfp.c            | 696 +++++++++++++++++++++++++++++++++++
 client/cmdhfmfp.h            |  18 +
 client/mifare4.c             | 153 ++++++++
 client/mifare4.h             |  35 ++
 common/polarssl/libpcrypto.c |  44 +++
 common/polarssl/libpcrypto.h |  20 +
 12 files changed, 1015 insertions(+), 129 deletions(-)
 create mode 100644 client/cmdhfmfp.c
 create mode 100644 client/cmdhfmfp.h
 create mode 100644 client/mifare4.c
 create mode 100644 client/mifare4.h
 create mode 100644 common/polarssl/libpcrypto.c
 create mode 100644 common/polarssl/libpcrypto.h

diff --git a/client/Makefile b/client/Makefile
index eaf846610..c832d9e49 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -110,6 +110,7 @@ CMDSRCS =	crapto1/crapto1.c \
 			polarssl/sha1.c \
 			polarssl/sha256.c \
 			polarssl/base64.c \
+			polarssl/libpcrypto.c \
 			cliparser/argtable3.c\
 			cliparser/cliparser.c\
 			loclass/cipher.c \
@@ -147,6 +148,7 @@ CMDSRCS =	crapto1/crapto1.c \
 			emv/test/dda_test.c\
 			emv/test/cda_test.c\
 			emv/cmdemv.c \
+            mifare4.c \
 			cmdanalyse.c \
 			cmdhf.c \
 			cmdhflist.c \
@@ -158,6 +160,7 @@ CMDSRCS =	crapto1/crapto1.c \
 			cmdhficlass.c \
 			cmdhfmf.c \
             cmdhfmfu.c \
+            cmdhfmfp.c \
 			cmdhfmfhard.c \
             hardnested/hardnested_bruteforce.c \
 			cmdhfmfdes.c \
diff --git a/client/cliparser/cliparser.c b/client/cliparser/cliparser.c
index 56be2ca6a..954220398 100644
--- a/client/cliparser/cliparser.c
+++ b/client/cliparser/cliparser.c
@@ -153,23 +153,14 @@ void CLIParserFree() {
 // convertors
 int CLIParamHexToBuf(struct arg_str *argstr, uint8_t *data, int maxdatalen, int *datalen) {
 	*datalen = 0;
-	if (!argstr->count)
-		return 0;
 	
-	char buf[256] = {0};
 	int ibuf = 0;
+	uint8_t buf[256] = {0};
+	int res = CLIParamStrToBuf(argstr, buf, maxdatalen * 2, &ibuf); // *2 because here HEX
+	if (res || !ibuf)
+		return res;
 	
-	for (int i = 0; i < argstr->count; i++) {
-		int len = strlen(argstr->sval[i]);
-		memcpy(&buf[ibuf], argstr->sval[i], len);
-		ibuf += len;
-	}
-	buf[ibuf] = 0;
-  
-	if (!ibuf)
-		return 0;
-	
-	switch(param_gethex_to_eol(buf, 0, data, maxdatalen, datalen)) {
+	switch(param_gethex_to_eol((char *)buf, 0, data, maxdatalen, datalen)) {
 	case 1:
 		printf("Parameter error: Invalid HEX value.\n");
 		return 1;
@@ -184,5 +175,31 @@ int CLIParamHexToBuf(struct arg_str *argstr, uint8_t *data, int maxdatalen, int
 	return 0;
 }
 
+int CLIParamStrToBuf(struct arg_str *argstr, uint8_t *data, int maxdatalen, int *datalen) {
+	*datalen = 0;
+	if (!argstr->count)
+		return 0;
+	
+	uint8_t buf[256] = {0};
+	int ibuf = 0;
+	
+	for (int i = 0; i < argstr->count; i++) {
+		int len = strlen(argstr->sval[i]);
+		memcpy(&buf[ibuf], argstr->sval[i], len);
+		ibuf += len;
+	}
+	buf[ibuf] = 0;
+  
+	if (!ibuf)
+		return 0;
+
+	if (ibuf > maxdatalen)
+		return 2;
+	
+	memcpy(data, buf, ibuf);
+	*datalen = ibuf;
+	
+	return 0;
+}
 
 
diff --git a/client/cliparser/cliparser.h b/client/cliparser/cliparser.h
index 7c1ced207..05910ea43 100644
--- a/client/cliparser/cliparser.h
+++ b/client/cliparser/cliparser.h
@@ -17,7 +17,9 @@
 
 #define arg_getsize(a) (sizeof(a) / sizeof(a[0]))
 #define arg_get_lit(n)(((struct arg_lit*)argtable[n])->count)
+#define arg_get_int_count(n)(((struct arg_int*)argtable[n])->count)
 #define arg_get_int(n)(((struct arg_int*)argtable[n])->ival[0])
+#define arg_get_int_def(n,def)(arg_get_int_count(n)?(arg_get_int(n)):(def))
 #define arg_get_str(n)((struct arg_str*)argtable[n])
 #define arg_get_str_len(n)(strlen(((struct arg_str*)argtable[n])->sval[0]))
 
@@ -25,8 +27,9 @@
 #define arg_strx0(shortopts, longopts, datatype, glossary) (arg_strn((shortopts), (longopts), (datatype), 0, 250, (glossary)))
 
 #define CLIExecWithReturn(cmd, atbl, ifempty) if (CLIParserParseString(cmd, atbl, arg_getsize(atbl), ifempty)){CLIParserFree();return 0;}
-#define CLIGetStrBLessWithReturn(paramnum, data, datalen, delta) if (CLIParamHexToBuf(arg_get_str(paramnum), data, sizeof(data) - (delta), datalen)) {CLIParserFree();return 1;}
-#define CLIGetStrWithReturn(paramnum, data, datalen) if (CLIParamHexToBuf(arg_get_str(paramnum), data, sizeof(data), datalen)) {CLIParserFree();return 1;}
+#define CLIGetHexBLessWithReturn(paramnum, data, datalen, delta) if (CLIParamHexToBuf(arg_get_str(paramnum), data, sizeof(data) - (delta), datalen)) {CLIParserFree();return 1;}
+#define CLIGetHexWithReturn(paramnum, data, datalen) if (CLIParamHexToBuf(arg_get_str(paramnum), data, sizeof(data), datalen)) {CLIParserFree();return 1;}
+#define CLIGetStrWithReturn(paramnum, data, datalen) if (CLIParamStrToBuf(arg_get_str(paramnum), data, sizeof(data), datalen)) {CLIParserFree();return 1;}
 
 extern int CLIParserInit(char *vprogramName, char *vprogramHint, char *vprogramHelp);
 extern int CLIParserParseString(const char* str, void* argtable[], size_t vargtableLen, bool allowEmptyExec);
@@ -35,3 +38,4 @@ extern int CLIParserParseArg(int argc, char **argv, void* argtable[], size_t var
 extern void CLIParserFree();
 
 extern int CLIParamHexToBuf(struct arg_str *argstr, uint8_t *data, int maxdatalen, int *datalen);
+extern int CLIParamStrToBuf(struct arg_str *argstr, uint8_t *data, int maxdatalen, int *datalen);
diff --git a/client/cmdhf.c b/client/cmdhf.c
index 594450271..30669d24d 100644
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -117,6 +117,7 @@ static command_t CommandTable[] = {
 	{"legic",       CmdHFLegic,       1, "{ LEGIC RFIDs...                }"},
 	{"iclass",      CmdHFiClass,      1, "{ ICLASS RFIDs...               }"},
 	{"mf",      	CmdHFMF,		  1, "{ MIFARE RFIDs...               }"},
+	{"mfp",			CmdHFMFP,		  1, "{ MIFARE Plus RFIDs...          }"},
 	{"mfu",         CmdHFMFUltra,     1, "{ MIFARE Ultralight RFIDs...    }"},
 	{"mfdes",		CmdHFMFDes,		  1, "{ MIFARE Desfire RFIDs...       }"},
 	{"topaz",		CmdHFTopaz,		  1, "{ TOPAZ (NFC Type 1) RFIDs...   }"},
diff --git a/client/cmdhf.h b/client/cmdhf.h
index be369b626..a4cc2e95c 100644
--- a/client/cmdhf.h
+++ b/client/cmdhf.h
@@ -26,6 +26,7 @@
 #include "cmdhficlass.h"	// ICLASS
 #include "cmdhfmf.h"		// CLASSIC
 #include "cmdhfmfu.h"		// ULTRALIGHT/NTAG etc
+#include "cmdhfmfp.h"		// Mifare Plus
 #include "cmdhfmfdes.h"		// DESFIRE
 #include "cmdhftopaz.h"		// TOPAZ
 #include "cmdhffelica.h"	// ISO18092 / FeliCa
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index f40db51cf..2ef1fd6ba 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -9,6 +9,7 @@
 //-----------------------------------------------------------------------------
 
 #include "cmdhfmf.h"
+#include "mifare4.h"
 
 #define MIFARE_4K_MAXBLOCK 255
 #define MIFARE_2K_MAXBLOCK 128 
@@ -3067,50 +3068,12 @@ out:
 	return 0;
 }
 
-int aes_encode(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *output, int length){
-	uint8_t iiv[16] = {0};
-	if (iv)
-		memcpy(iiv, iv, 16);
-	
-	aes_context aes;
-	aes_init(&aes);
-	if (aes_setkey_enc(&aes, key, 128))
-		return 1;
-	if (aes_crypt_cbc(&aes, AES_ENCRYPT, length, iiv, input, output))
-		return 2;
-	aes_free(&aes);
-
-	return 0;
-}
-
-int aes_decode(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *output, int length){
-	uint8_t iiv[16] = {0};
-	if (iv)
-		memcpy(iiv, iv, 16);
-	
-	aes_context aes;
-	aes_init(&aes);
-	if (aes_setkey_dec(&aes, key, 128))
-		return 1;
-	if (aes_crypt_cbc(&aes, AES_DECRYPT, length, iiv, input, output))
-		return 2;
-	aes_free(&aes);
-
-	return 0;
-}
-
 int CmdHF14AMfAuth4(const char *cmd) {
 	uint8_t keyn[20] = {0};
 	int keynlen = 0;
 	uint8_t key[16] = {0};
 	int keylen = 0;
-	uint8_t data[257] = {0};
-	int datalen = 0;
-	
-	uint8_t Rnd1[17] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x00};
-	uint8_t Rnd2[17] = {0};
-	
-	
+
 	CLIParserInit("hf mf auth4", 
 		"Executes AES authentication command in ISO14443-4", 
 		"Usage:\n\thf mf auth4 4000 000102030405060708090a0b0c0d0e0f -> executes authentication\n"
@@ -3124,90 +3087,21 @@ int CmdHF14AMfAuth4(const char *cmd) {
 	};
 	CLIExecWithReturn(cmd, argtable, true);
 	
-	CLIGetStrWithReturn(1, keyn, &keynlen);
-	CLIGetStrWithReturn(2, key, &keylen);
+	CLIGetHexWithReturn(1, keyn, &keynlen);
+	CLIGetHexWithReturn(2, key, &keylen);
 	CLIParserFree();
 	
 	if (keynlen != 2) {
-		PrintAndLogEx(ERR, "<Key Num> must be 2 bytes long instead of: %d", keynlen);
+		PrintAndLog(ERROR, "<Key Num> must be 2 bytes long instead of: %d", keynlen);
 		return 1;
 	}
 	
 	if (keylen != 16) {
-		PrintAndLogEx(ERR, "<Key Value> must be 16 bytes long instead of: %d", keylen);
+		PrintAndLog(ERROR, "<Key Value> must be 16 bytes long instead of: %d", keylen);
 		return 1;
 	}
 
-	uint8_t cmd1[] = {0x0a, 0x00, 0x70, keyn[1], keyn[0], 0x00};
-	int res = ExchangeRAW14a(cmd1, sizeof(cmd1), true, true, data, sizeof(data), &datalen);
-	if (res) {
-		PrintAndLog("ERROR exchande raw error: %d", res);
-		return 2;
-	}
-	
-	PrintAndLog("<phase1: %s", sprint_hex(data, datalen));
-		
-	if (datalen < 3) {
-		PrintAndLogEx(ERR, "card response length: %d", datalen);
-		return 3;
-	}
-	
-	if (data[0] != 0x0a || data[1] != 0x00) {
-		PrintAndLogEx(ERR, "Framing error in card response. :%s", sprint_hex(data, 2));
-		return 3;
-	}
-
-	if (data[2] != 0x90) {
-		PrintAndLogEx(ERR, "card response error: %02x", data[2]);
-		return 3;
-	}
-
-	if (datalen != 19) {
-		PrintAndLogEx(ERR, "card response must be 16 bytes long instead of: %d", datalen);
-		return 3;
-	}
-	
-    aes_decode(NULL, key, &data[3], Rnd2, 16);
-	Rnd2[16] = Rnd2[0];
-	PrintAndLog("Rnd2: %s", sprint_hex(Rnd2, 16));
-
-	uint8_t cmd2[35] = {0};
-	cmd2[0] = 0x0b;
-	cmd2[1] = 0x00;
-	cmd2[2] = 0x72;
-
-	uint8_t raw[32] = {0};
-	memmove(raw, Rnd1, 16);
-	memmove(&raw[16], &Rnd2[1], 16);
-
-    aes_encode(NULL, key, raw, &cmd2[3], 32);
-	PrintAndLog(">phase2: %s", sprint_hex(cmd2, 35));
-	
-	res = ExchangeRAW14a(cmd2, sizeof(cmd2), false, false, data, sizeof(data), &datalen);
-	if (res) {
-		PrintAndLogEx(ERR, "exchande raw error: %d", res);
-		DropField();
-		return 4;
-	}
-	
-	PrintAndLog("<phase2: %s", sprint_hex(data, datalen));
-
-    aes_decode(NULL, key, &data[3], raw, 32);
-	PrintAndLog("res: %s", sprint_hex(raw, 32));
-	
-	PrintAndLog("Rnd1`: %s", sprint_hex(&raw[4], 16));
-	if (memcmp(&raw[4], &Rnd1[1], 16)) {
-		PrintAndLogEx(ERR, "\nAuthentication FAILED. rnd not equal");
-		PrintAndLog("rnd1 reader: %s", sprint_hex(&Rnd1[1], 16));
-		PrintAndLog("rnd1   card: %s", sprint_hex(&raw[4], 16));
-		DropField();
-		return 5;
-	}
-
-	DropField();
-	PrintAndLogEx(INFO, "Authentication OK");
-	
-	return 0;
+	return MifareAuth4(NULL, keyn, key, true, false, true);
 }
 
 static command_t CommandTable[] = {
diff --git a/client/cmdhfmfp.c b/client/cmdhfmfp.c
new file mode 100644
index 000000000..7f7660df1
--- /dev/null
+++ b/client/cmdhfmfp.c
@@ -0,0 +1,696 @@
+//-----------------------------------------------------------------------------
+// Copyright (C) 2018 Merlok
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// High frequency MIFARE  Plus commands
+//-----------------------------------------------------------------------------
+
+#include "cmdhfmfp.h"
+
+#include <inttypes.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include "comms.h"
+#include "cmdmain.h"
+#include "util.h"
+#include "ui.h"
+#include "cmdhf14a.h"
+#include "mifare.h"
+#include "mifare4.h"
+#include "cliparser/cliparser.h"
+#include "polarssl/libpcrypto.h"
+
+static const uint8_t DefaultKey[16] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
+
+typedef struct {
+	uint8_t Code;
+	const char *Description;
+} PlusErrorsElm;
+
+static const PlusErrorsElm PlusErrors[] = {
+	{0xFF, ""},
+	{0x00, "Unknown error"},
+	{0x06, "Block use error"},
+	{0x07, "Command use error"},
+	{0x08, "Invalid write command"},
+	{0x09, "Invalid block number"},
+	{0x0b, "Command code error"},
+	{0x0c, "Length error"},
+	{0x90, "OK"},
+};
+int PlusErrorsLen = sizeof(PlusErrors) / sizeof(PlusErrorsElm);
+
+const char * GetErrorDescription(uint8_t errorCode) {
+	for(int i = 0; i < PlusErrorsLen; i++)
+		if (errorCode == PlusErrors[i].Code)
+			return PlusErrors[i].Description;
+		
+	return PlusErrors[0].Description;
+}
+
+static int CmdHelp(const char *Cmd);
+
+static bool VerboseMode = false;
+void SetVerboseMode(bool verbose) {
+	VerboseMode = verbose;
+}
+
+int intExchangeRAW14aPlus(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
+	if(VerboseMode)
+		PrintAndLog(">>> %s", sprint_hex(datain, datainlen));
+	
+	int res = ExchangeRAW14a(datain, datainlen, activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
+
+	if(VerboseMode)
+		PrintAndLog("<<< %s", sprint_hex(dataout, *dataoutlen));
+	
+	return res;
+}
+
+int MFPWritePerso(uint8_t *keyNum, uint8_t *key, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
+	uint8_t rcmd[3 + 16] = {0xa8, keyNum[1], keyNum[0], 0x00};
+	memmove(&rcmd[3], key, 16);
+	
+	return intExchangeRAW14aPlus(rcmd, sizeof(rcmd), activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
+}
+
+int MFPCommitPerso(bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
+	uint8_t rcmd[1] = {0xaa};
+	
+	return intExchangeRAW14aPlus(rcmd, sizeof(rcmd), activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
+}
+
+int MFPReadBlock(mf4Session *session, bool plain, uint8_t blockNum, uint8_t blockCount, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
+	uint8_t rcmd[4 + 8] = {(plain?(0x37):(0x33)), blockNum, 0x00, blockCount}; 
+	
+	return intExchangeRAW14aPlus(rcmd, plain?4:sizeof(rcmd), activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
+}
+
+int MFPWriteBlock(mf4Session *session, uint8_t blockNum, uint8_t *data, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
+	uint8_t rcmd[1 + 2 + 16 + 8] = {0xA3, blockNum, 0x00};
+	memmove(&rcmd[3], data, 16);
+	
+	return intExchangeRAW14aPlus(rcmd, sizeof(rcmd), activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
+}
+
+int CmdHFMFPInfo(const char *cmd) {
+	
+	if (cmd && strlen(cmd) > 0)
+		PrintAndLog("WARNING: command don't have any parameters.\n");
+	
+	// info about 14a part
+	CmdHF14AInfo("");
+
+	// Mifare Plus info
+	UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};
+	SendCommand(&c);
+
+	UsbCommand resp;
+	WaitForResponse(CMD_ACK,&resp);
+	
+	iso14a_card_select_t card;
+	memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
+
+	uint64_t select_status = resp.arg[0];		// 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
+	
+	if (select_status == 1 || select_status == 2) {
+		PrintAndLog("----------------------------------------------");
+		PrintAndLog("Mifare Plus info:");
+		
+		// MIFARE Type Identification Procedure
+		// https://www.nxp.com/docs/en/application-note/AN10833.pdf
+		uint16_t ATQA = card.atqa[0] + (card.atqa[1] << 8);
+		if (ATQA == 0x0004) PrintAndLog("ATQA: Mifare Plus 2k 4bUID");
+		if (ATQA == 0x0002) PrintAndLog("ATQA: Mifare Plus 4k 4bUID");
+		if (ATQA == 0x0044) PrintAndLog("ATQA: Mifare Plus 2k 7bUID");
+		if (ATQA == 0x0042) PrintAndLog("ATQA: Mifare Plus 4k 7bUID");
+		
+		uint8_t SLmode = 0xff;
+		if (card.sak == 0x08) {
+			PrintAndLog("SAK: Mifare Plus 2k 7bUID");
+			if (select_status == 2) SLmode = 1;
+		}
+		if (card.sak == 0x18) {
+			PrintAndLog("SAK: Mifare Plus 4k 7bUID");
+			if (select_status == 2) SLmode = 1;
+		}
+		if (card.sak == 0x10) {
+			PrintAndLog("SAK: Mifare Plus 2k");
+			if (select_status == 2) SLmode = 2;
+		}
+		if (card.sak == 0x11) {
+			PrintAndLog("SAK: Mifare Plus 4k");
+			if (select_status == 2) SLmode = 2;
+		}
+		if (card.sak == 0x20) {
+			PrintAndLog("SAK: Mifare Plus SL0/SL3 or Mifare desfire");
+			if (card.ats_len > 0) {
+				SLmode = 3;
+
+				// check SL0
+				uint8_t data[250] = {0};
+				int datalen = 0;
+				// https://github.com/Proxmark/proxmark3/blob/master/client/scripts/mifarePlus.lua#L161
+				uint8_t cmd[3 + 16] = {0xa8, 0x90, 0x90, 0x00};
+				int res = ExchangeRAW14a(cmd, sizeof(cmd), false, false, data, sizeof(data), &datalen);
+				if (!res && datalen > 1 && data[0] == 0x09) {
+					SLmode = 0;
+				}
+			}
+		}
+		
+		if (SLmode != 0xff)
+			PrintAndLog("Mifare Plus SL mode: SL%d", SLmode);
+		else
+			PrintAndLog("Mifare Plus SL mode: unknown(");
+	} else {
+		PrintAndLog("Mifare Plus info not available.");
+	}
+	
+	DropField();
+	
+	return 0;
+}
+
+int CmdHFMFPWritePerso(const char *cmd) {
+	uint8_t keyNum[64] = {0};
+	int keyNumLen = 0;
+	uint8_t key[64] = {0};
+	int keyLen = 0;
+
+	CLIParserInit("hf mfp wrp", 
+		"Executes Write Perso command. Can be used in SL0 mode only.", 
+		"Usage:\n\thf mfp wrp 4000 000102030405060708090a0b0c0d0e0f -> write key (00..0f) to key number 4000 \n"
+			"\thf mfp wrp 4000 -> write default key(0xff..0xff) to key number 4000");
+
+	void* argtable[] = {
+		arg_param_begin,
+		arg_lit0("vV",  "verbose", "show internal data."),
+		arg_str1(NULL,  NULL,      "<HEX key number (2b)>", NULL),
+		arg_strx0(NULL,  NULL,     "<HEX key (16b)>", NULL),
+		arg_param_end
+	};
+	CLIExecWithReturn(cmd, argtable, true);
+	
+	bool verbose = arg_get_lit(1);
+	CLIGetHexWithReturn(2, keyNum, &keyNumLen);
+	CLIGetHexWithReturn(3, key, &keyLen);
+	CLIParserFree();
+	
+	SetVerboseMode(verbose);
+	
+	if (!keyLen) {
+		memmove(key, DefaultKey, 16);
+		keyLen = 16;
+	}
+	
+	if (keyNumLen != 2) {
+		PrintAndLog("Key number length must be 2 bytes instead of: %d", keyNumLen);
+		return 1;
+	}
+	if (keyLen != 16) {
+		PrintAndLog("Key length must be 16 bytes instead of: %d", keyLen);
+		return 1;
+	}
+
+	uint8_t data[250] = {0};
+	int datalen = 0;
+
+	int res = MFPWritePerso(keyNum, key, true, false, data, sizeof(data), &datalen);
+	if (res) {
+		PrintAndLog("Exchange error: %d", res);
+		return res;
+	}
+	
+	if (datalen != 3) {
+		PrintAndLog("Command must return 3 bytes instead of: %d", datalen);
+		return 1;
+	}
+
+	if (data[0] != 0x90) {
+		PrintAndLog("Command error: %02x %s", data[0], GetErrorDescription(data[0]));
+		return 1;
+	}
+	PrintAndLog("Write OK.");
+	
+	return 0;
+}
+
+uint16_t CardAddresses[] = {0x9000, 0x9001, 0x9002, 0x9003, 0x9004, 0xA000, 0xA001, 0xA080, 0xA081, 0xC000, 0xC001};
+
+int CmdHFMFPInitPerso(const char *cmd) {
+	int res;
+	uint8_t key[256] = {0};
+	int keyLen = 0;
+	uint8_t keyNum[2] = {0};
+	uint8_t data[250] = {0};
+	int datalen = 0;
+
+	CLIParserInit("hf mfp initp", 
+		"Executes Write Perso command for all card's keys. Can be used in SL0 mode only.", 
+		"Usage:\n\thf mfp initp 000102030405060708090a0b0c0d0e0f -> fill all the keys with key (00..0f)\n"
+			"\thf mfp initp -vv -> fill all the keys with default key(0xff..0xff) and show all the data exchange");
+
+	void* argtable[] = {
+		arg_param_begin,
+		arg_litn("vV",  "verbose", 0, 2, "show internal data."),
+		arg_strx0(NULL,  NULL,      "<HEX key (16b)>", NULL),
+		arg_param_end
+	};
+	CLIExecWithReturn(cmd, argtable, true);
+	
+	bool verbose = arg_get_lit(1);
+	bool verbose2 = arg_get_lit(1) > 1;
+	CLIGetHexWithReturn(2, key, &keyLen);
+	CLIParserFree();
+
+	if (keyLen && keyLen != 16) {
+		PrintAndLog("Key length must be 16 bytes instead of: %d", keyLen);
+		return 1;
+	}
+	
+	if (!keyLen)
+		memmove(key, DefaultKey, 16);
+
+	SetVerboseMode(verbose2);
+	for (uint16_t sn = 0x4000; sn < 0x4050; sn++) {
+		keyNum[0] = sn >> 8;
+		keyNum[1] = sn & 0xff;
+		res = MFPWritePerso(keyNum, key, (sn == 0x4000), true, data, sizeof(data), &datalen);
+		if (!res && (datalen == 3) && data[0] == 0x09) {
+			PrintAndLog("2k card detected.");
+			break;
+		}
+		if (res || (datalen != 3) || data[0] != 0x90) {
+			PrintAndLog("Write error on address %04x", sn);
+			break;
+		}
+	}
+	
+	SetVerboseMode(verbose);
+	for (int i = 0; i < sizeof(CardAddresses) / 2; i++) {
+		keyNum[0] = CardAddresses[i] >> 8;
+		keyNum[1] = CardAddresses[i] & 0xff;
+		res = MFPWritePerso(keyNum, key, false, true, data, sizeof(data), &datalen);
+		if (!res && (datalen == 3) && data[0] == 0x09) {
+			PrintAndLog("Skipped[%04x]...", CardAddresses[i]);
+		} else {
+			if (res || (datalen != 3) || data[0] != 0x90) {
+				PrintAndLog("Write error on address %04x", CardAddresses[i]);
+				break;
+			}
+		}
+	}
+	
+	DropField();
+	
+	if (res)
+		return res;
+	
+	PrintAndLog("Done.");
+	
+	return 0;
+}
+
+int CmdHFMFPCommitPerso(const char *cmd) {
+	CLIParserInit("hf mfp commitp", 
+		"Executes Commit Perso command. Can be used in SL0 mode only.", 
+		"Usage:\n\thf mfp commitp ->  \n");
+
+	void* argtable[] = {
+		arg_param_begin,
+		arg_lit0("vV",  "verbose", "show internal data."),
+		arg_int0(NULL,  NULL,      "SL mode", NULL),
+		arg_param_end
+	};
+	CLIExecWithReturn(cmd, argtable, true);
+	
+	bool verbose = arg_get_lit(1);
+	CLIParserFree();
+	
+	SetVerboseMode(verbose);
+	
+	uint8_t data[250] = {0};
+	int datalen = 0;
+
+	int res = MFPCommitPerso(true, false, data, sizeof(data), &datalen);
+	if (res) {
+		PrintAndLog("Exchange error: %d", res);
+		return res;
+	}
+	
+	if (datalen != 3) {
+		PrintAndLog("Command must return 3 bytes instead of: %d", datalen);
+		return 1;
+	}
+
+	if (data[0] != 0x90) {
+		PrintAndLog("Command error: %02x %s", data[0], GetErrorDescription(data[0]));
+		return 1;
+	}
+	PrintAndLog("Switch level OK.");
+
+	return 0;
+}
+
+int CmdHFMFPAuth(const char *cmd) {
+	uint8_t keyn[250] = {0};
+	int keynlen = 0;
+	uint8_t key[250] = {0};
+	int keylen = 0;
+	
+	CLIParserInit("hf mfp auth", 
+		"Executes AES authentication command for Mifare Plus card", 
+		"Usage:\n\thf mfp auth 4000 000102030405060708090a0b0c0d0e0f -> executes authentication\n"
+			"\thf mfp auth 9003 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -v -> executes authentication and shows all the system data\n");
+
+	void* argtable[] = {
+		arg_param_begin,
+		arg_lit0("vV",  "verbose", "show internal data."),
+		arg_str1(NULL,  NULL,     "<Key Num (HEX 2 bytes)>", NULL),
+		arg_str1(NULL,  NULL,     "<Key Value (HEX 16 bytes)>", NULL),
+		arg_param_end
+	};
+	CLIExecWithReturn(cmd, argtable, true);
+	
+	bool verbose = arg_get_lit(1);
+	CLIGetHexWithReturn(2, keyn, &keynlen);
+	CLIGetHexWithReturn(3, key, &keylen);
+	CLIParserFree();
+	
+	if (keynlen != 2) {
+		PrintAndLog("ERROR: <Key Num> must be 2 bytes long instead of: %d", keynlen);
+		return 1;
+	}
+	
+	if (keylen != 16) {
+		PrintAndLog("ERROR: <Key Value> must be 16 bytes long instead of: %d", keylen);
+		return 1;
+	}
+
+	return MifareAuth4(NULL, keyn, key, true, false, verbose);
+}
+
+int CmdHFMFPRdbl(const char *cmd) {
+	uint8_t keyn[2] = {0};
+	uint8_t key[250] = {0};
+	int keylen = 0;
+	
+	CLIParserInit("hf mfp rdbl", 
+		"Reads several blocks from Mifare Plus card in plain mode.", 
+		"Usage:\n\thf mfp rdbl 0 000102030405060708090a0b0c0d0e0f -> executes authentication and read block 0 data\n"
+			"\thf mfp rdbl 1 -v -> executes authentication and shows sector 1 data with default key 0xFF..0xFF and some additional data\n");
+
+	void* argtable[] = {
+		arg_param_begin,
+		arg_lit0("vV",  "verbose", "show internal data."),
+		arg_int0("nN",  "count",   "blocks count (by default 1).", NULL),
+		arg_lit0("bB",  "keyb",    "use key B (by default keyA)."),
+		arg_lit0("pP",  "plain",   "plain communication between reader and card."),
+		arg_int1(NULL,  NULL,      "<Block Num (0..255)>", NULL),
+		arg_str0(NULL,  NULL,      "<Key Value (HEX 16 bytes)>", NULL),
+		arg_param_end
+	};
+	CLIExecWithReturn(cmd, argtable, false);
+	
+	bool verbose = arg_get_lit(1);
+	int blocksCount = arg_get_int_def(2, 1);
+	bool keyB = arg_get_lit(3);
+	int plain = arg_get_lit(4) | true;
+	uint32_t blockn = arg_get_int(5);
+	CLIGetHexWithReturn(6, key, &keylen);
+	CLIParserFree();
+	
+	if (!keylen) {
+		memmove(key, DefaultKey, 16);
+		keylen = 16;
+	}
+	
+	if (blockn > 255) {
+		PrintAndLog("ERROR: <Block Num> must be in range [0..255] instead of: %d", blockn);
+		return 1;
+	}
+	
+	if (keylen != 16) {
+		PrintAndLog("ERROR: <Key Value> must be 16 bytes long instead of: %d", keylen);
+		return 1;
+	}
+
+	// 3 blocks - wo iso14443-4 chaining
+	if (blocksCount > 3) {
+		PrintAndLog("ERROR: blocks count must be less than 3 instead of: %d", blocksCount);
+		return 1;
+	}
+	
+	uint8_t sectorNum = mfSectorNum(blockn & 0xff);
+	uint16_t uKeyNum = 0x4000 + sectorNum * 2 + (keyB ? 1 : 0);
+	keyn[0] = uKeyNum >> 8;
+	keyn[1] = uKeyNum & 0xff;
+	if (verbose)
+		PrintAndLog("--block:%d sector[%d]:%02x key:%04x", blockn, mfNumBlocksPerSector(sectorNum), sectorNum, uKeyNum);
+	
+	mf4Session session;
+	int res = MifareAuth4(&session, keyn, key, true, true, verbose);
+	if (res) {
+		PrintAndLog("Authentication error: %d", res);
+		return res;
+	}
+	
+	uint8_t data[250] = {0};
+	int datalen = 0;
+	res = MFPReadBlock(&session, plain, blockn & 0xff, blocksCount, false, false, data, sizeof(data), &datalen);
+	if (res) {
+		PrintAndLog("Read error: %d", res);
+		return res;
+	}
+	
+	if (datalen && data[0] != 0x90) {
+		PrintAndLog("Card read error: %02x %s", data[0], GetErrorDescription(data[0]));
+		return 6;
+	}
+	
+	if (datalen != 1 + blocksCount * 16 + 8 + 2) {
+		PrintAndLog("Error return length:%d", datalen);
+		return 5;
+	}
+
+	int indx = blockn;
+	for(int i = 0; i < blocksCount; i++)  {
+		PrintAndLog("data[%03d]: %s", indx, sprint_hex(&data[1 + i * 16], 16));
+		indx++;
+		if (mfIsSectorTrailer(indx)){
+			PrintAndLog("data[%03d]: ------------------- trailer -------------------", indx);
+			indx++;
+		}
+	}
+
+	if(verbose)
+		PrintAndLog("MAC: %s", sprint_hex(&data[blocksCount * 16 + 1], 8));
+	
+	return 0;
+}
+
+int CmdHFMFPRdsc(const char *cmd) {
+	uint8_t keyn[2] = {0};
+	uint8_t key[250] = {0};
+	int keylen = 0;
+	
+	CLIParserInit("hf mfp rdsc", 
+		"Reads one sector from Mifare Plus card in plain mode.", 
+		"Usage:\n\thf mfp rdsc 0 000102030405060708090a0b0c0d0e0f -> executes authentication and read sector 0 data\n"
+			"\thf mfp rdsc 1 -v -> executes authentication and shows sector 1 data with default key 0xFF..0xFF and some additional data\n");
+
+	void* argtable[] = {
+		arg_param_begin,
+		arg_lit0("vV",  "verbose", "show internal data."),
+		arg_lit0("bB",  "keyb",    "use key B (by default keyA)."),
+		arg_lit0("pP",  "plain",   "plain communication between reader and card."),
+		arg_int1(NULL,  NULL,      "<Sector Num (0..255)>", NULL),
+		arg_str0(NULL,  NULL,      "<Key Value (HEX 16 bytes)>", NULL),
+		arg_param_end
+	};
+	CLIExecWithReturn(cmd, argtable, false);
+	
+	bool verbose = arg_get_lit(1);
+	bool keyB = arg_get_lit(2);
+	bool plain = arg_get_lit(3) | true;
+	uint32_t sectorNum = arg_get_int(4);
+	CLIGetHexWithReturn(5, key, &keylen);
+	CLIParserFree();
+	
+	if (!keylen) {
+		memmove(key, DefaultKey, 16);
+		keylen = 16;
+	}
+	
+	if (sectorNum > 39) {
+		PrintAndLog("ERROR: <Sector Num> must be in range [0..39] instead of: %d", sectorNum);
+		return 1;
+	}
+	
+	if (keylen != 16) {
+		PrintAndLog("ERROR: <Key Value> must be 16 bytes long instead of: %d", keylen);
+		return 1;
+	}
+	
+	uint16_t uKeyNum = 0x4000 + sectorNum * 2 + (keyB ? 1 : 0);
+	keyn[0] = uKeyNum >> 8;
+	keyn[1] = uKeyNum & 0xff;
+	if (verbose)
+		PrintAndLog("--sector[%d]:%02x key:%04x", mfNumBlocksPerSector(sectorNum), sectorNum, uKeyNum);
+	
+	mf4Session session;
+	int res = MifareAuth4(&session, keyn, key, true, true, verbose);
+	if (res) {
+		PrintAndLog("Authentication error: %d", res);
+		return res;
+	}
+	
+	uint8_t data[250] = {0};
+	int datalen = 0;
+	for(int n = mfFirstBlockOfSector(sectorNum); n < mfFirstBlockOfSector(sectorNum) + mfNumBlocksPerSector(sectorNum); n++) {
+		res = MFPReadBlock(&session, plain, n & 0xff, 1, false, true, data, sizeof(data), &datalen);
+		if (res) {
+			PrintAndLog("Read error: %d", res);
+			DropField();
+			return res;
+		}
+		
+		if (datalen && data[0] != 0x90) {
+			PrintAndLog("Card read error: %02x %s", data[0], GetErrorDescription(data[0]));
+			DropField();
+			return 6;
+		}
+		if (datalen != 1 + 16 + 8 + 2) {
+			PrintAndLog("Error return length:%d", datalen);
+			DropField();
+			return 5;
+		}
+
+		PrintAndLog("data[%03d]: %s", n, sprint_hex(&data[1], 16));
+			
+		if(verbose)
+			PrintAndLog("MAC: %s", sprint_hex(&data[1 + 16], 8));
+	}
+	DropField();
+	
+	return 0;
+}
+
+int CmdHFMFPWrbl(const char *cmd) {
+	uint8_t keyn[2] = {0};
+	uint8_t key[250] = {0};
+	int keylen = 0;
+	uint8_t datain[250] = {0};
+	int datainlen = 0;
+	
+	CLIParserInit("hf mfp wrbl", 
+		"Writes one block to Mifare Plus card.", 
+		"Usage:\n\thf mfp wrbl 1 ff0000000000000000000000000000ff 000102030405060708090a0b0c0d0e0f -> writes block 1 data\n"
+			"\thf mfp wrbl 2 ff0000000000000000000000000000ff -v -> writes block 2 data with default key 0xFF..0xFF and some additional data\n");
+
+	void* argtable[] = {
+		arg_param_begin,
+		arg_lit0("vV",  "verbose", "show internal data."),
+		arg_lit0("bB",  "keyb",    "use key B (by default keyA)."),
+		arg_int1(NULL,  NULL,      "<Block Num (0..255)>", NULL),
+		arg_str1(NULL,  NULL,      "<Data (HEX 16 bytes)>", NULL),
+		arg_str0(NULL,  NULL,      "<Key (HEX 16 bytes)>", NULL),
+		arg_param_end
+	};
+	CLIExecWithReturn(cmd, argtable, false);
+	
+	bool verbose = arg_get_lit(1);
+	bool keyB = arg_get_lit(2);
+	uint32_t blockNum = arg_get_int(3);
+	CLIGetHexWithReturn(4, datain, &datainlen);
+	CLIGetHexWithReturn(5, key, &keylen);
+	CLIParserFree();
+	
+	if (!keylen) {
+		memmove(key, DefaultKey, 16);
+		keylen = 16;
+	}
+	
+	if (blockNum > 39) {
+		PrintAndLog("ERROR: <Block Num> must be in range [0..255] instead of: %d", blockNum);
+		return 1;
+	}
+	
+	if (keylen != 16) {
+		PrintAndLog("ERROR: <Key> must be 16 bytes long instead of: %d", keylen);
+		return 1;
+	}
+
+	if (datainlen != 16) {
+		PrintAndLog("ERROR: <Data> must be 16 bytes long instead of: %d", datainlen);
+		return 1;
+	}
+	
+	uint8_t sectorNum = mfSectorNum(blockNum & 0xff);
+	uint16_t uKeyNum = 0x4000 + sectorNum * 2 + (keyB ? 1 : 0);
+	keyn[0] = uKeyNum >> 8;
+	keyn[1] = uKeyNum & 0xff;
+	if (verbose)
+		PrintAndLog("--block:%d sector[%d]:%02x key:%04x", blockNum & 0xff, mfNumBlocksPerSector(sectorNum), sectorNum, uKeyNum);
+	
+	mf4Session session;
+	int res = MifareAuth4(&session, keyn, key, true, true, verbose);
+	if (res) {
+		PrintAndLog("Authentication error: %d", res);
+		return res;
+	}
+
+	uint8_t data[250] = {0};
+	int datalen = 0;
+	res = MFPWriteBlock(&session, blockNum & 0xff, datain, false, false, data, sizeof(data), &datalen);
+	if (res) {
+		PrintAndLog("Write error: %d", res);
+		return res;
+	}
+	
+	if (datalen != 3 && (datalen != 3 + 8)) {
+		PrintAndLog("Error return length:%d", datalen);
+		return 5;
+	}
+	
+	if (datalen && data[0] != 0x90) {
+		PrintAndLog("Card write error: %02x %s", data[0], GetErrorDescription(data[0]));
+		return 6;
+	}
+	
+	if(verbose)
+		PrintAndLog("MAC: %s", sprint_hex(&data[1], 8));
+	
+	return 0;
+}
+
+static command_t CommandTable[] =
+{
+  {"help",             CmdHelp,					1, "This help"},
+  {"info",  	       CmdHFMFPInfo,			0, "Info about Mifare Plus tag"},
+  {"wrp",	  	       CmdHFMFPWritePerso,		0, "Write Perso command"},
+  {"initp",  	       CmdHFMFPInitPerso,		0, "Fills all the card's keys"},
+  {"commitp",  	       CmdHFMFPCommitPerso,		0, "Move card to SL1 or SL3 mode"},
+  {"auth",  	       CmdHFMFPAuth,			0, "Authentication"},
+  {"rdbl",  	       CmdHFMFPRdbl,			0, "Read blocks"},
+  {"rdsc",  	       CmdHFMFPRdsc,			0, "Read sectors"},
+//  {"wrbl",  	       CmdHFMFPWrbl,			0, "Write blocks"},
+  {NULL,               NULL,					0, NULL}
+};
+
+int CmdHFMFP(const char *Cmd) {
+	(void)WaitForResponseTimeout(CMD_ACK,NULL,100);
+	CmdsParse(CommandTable, Cmd);
+	return 0;
+}
+
+int CmdHelp(const char *Cmd) {
+  CmdsHelp(CommandTable);
+  return 0;
+}
diff --git a/client/cmdhfmfp.h b/client/cmdhfmfp.h
new file mode 100644
index 000000000..b1ac7c349
--- /dev/null
+++ b/client/cmdhfmfp.h
@@ -0,0 +1,18 @@
+//-----------------------------------------------------------------------------
+// Copyright (C) 2018 Merlok
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// High frequency MIFARE  Plus commands
+//-----------------------------------------------------------------------------
+#ifndef CMDHFMFP_H__
+#define CMDHFMFP_H__
+
+#include "mifaredefault.h"
+
+extern int CmdHFMFP(const char *Cmd);
+
+
+#endif
\ No newline at end of file
diff --git a/client/mifare4.c b/client/mifare4.c
new file mode 100644
index 000000000..145dd243e
--- /dev/null
+++ b/client/mifare4.c
@@ -0,0 +1,153 @@
+//-----------------------------------------------------------------------------
+// Copyright (C) 2018 Merlok
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// iso14443-4 mifare commands
+//-----------------------------------------------------------------------------
+
+#include "mifare4.h"
+#include <ctype.h>
+#include <string.h>
+#include "cmdhf14a.h"
+#include "util.h"
+#include "ui.h"
+#include "polarssl/libpcrypto.h"
+
+int MifareAuth4(mf4Session *session, uint8_t *keyn, uint8_t *key, bool activateField, bool leaveSignalON, bool verbose) {
+	uint8_t data[257] = {0};
+	int datalen = 0;
+	
+	uint8_t Rnd1[17] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x00};
+	uint8_t Rnd2[17] = {0};
+	
+	if (session)
+		session->Authenticated = false;	
+	
+	uint8_t cmd1[] = {0x70, keyn[1], keyn[0], 0x00};
+	int res = ExchangeRAW14a(cmd1, sizeof(cmd1), activateField, true, data, sizeof(data), &datalen);
+	if (res) {
+		PrintAndLog("ERROR exchande raw error: %d", res);
+		DropField();
+		return 2;
+	}
+	
+	if (verbose)
+		PrintAndLog("<phase1: %s", sprint_hex(data, datalen));
+		
+	if (datalen < 1) {
+		PrintAndLog("ERROR: card response length: %d", datalen);
+		DropField();
+		return 3;
+	}
+	
+	if (data[0] != 0x90) {
+		PrintAndLog("ERROR: card response error: %02x", data[2]);
+		DropField();
+		return 3;
+	}
+
+	if (datalen != 19) { // code 1b + 16b + crc 2b
+		PrintAndLog("ERROR: card response must be 19 bytes long instead of: %d", datalen);
+		DropField();
+		return 3;
+	}
+	
+    aes_decode(NULL, key, &data[1], Rnd2, 16);
+	Rnd2[16] = Rnd2[0];
+	if (verbose)
+		PrintAndLog("Rnd2: %s", sprint_hex(Rnd2, 16));
+
+	uint8_t cmd2[33] = {0};
+	cmd2[0] = 0x72;
+
+	uint8_t raw[32] = {0};
+	memmove(raw, Rnd1, 16);
+	memmove(&raw[16], &Rnd2[1], 16);
+
+	aes_encode(NULL, key, raw, &cmd2[1], 32);
+	if (verbose)
+		PrintAndLog(">phase2: %s", sprint_hex(cmd2, 33));
+	
+	res = ExchangeRAW14a(cmd2, sizeof(cmd2), false, true, data, sizeof(data), &datalen);
+	if (res) {
+		PrintAndLog("ERROR exchande raw error: %d", res);
+		DropField();
+		return 4;
+	}
+	
+	if (verbose)
+		PrintAndLog("<phase2: %s", sprint_hex(data, datalen));
+
+	aes_decode(NULL, key, &data[1], raw, 32);
+	
+	if (verbose) {
+		PrintAndLog("res: %s", sprint_hex(raw, 32));
+		PrintAndLog("Rnd1`: %s", sprint_hex(&raw[4], 16));
+	}
+
+	if (memcmp(&raw[4], &Rnd1[1], 16)) {
+		PrintAndLog("\nERROR: Authentication FAILED. rnd not equal");
+		if (verbose) {
+			PrintAndLog("rnd1 reader: %s", sprint_hex(&Rnd1[1], 16));
+			PrintAndLog("rnd1   card: %s", sprint_hex(&raw[4], 16));
+		}
+		DropField();
+		return 5;
+	}
+
+	if (!leaveSignalON)
+		DropField();
+
+	if (verbose)
+		PrintAndLog("");
+
+	if (session) {
+		session->Authenticated = true;
+		session->KeyNum = keyn[1] + (keyn[0] << 8);
+		memmove(session->Rnd1, Rnd1, 16);
+		memmove(session->Rnd2, Rnd2, 16);
+	}
+	
+	PrintAndLog("Authentication OK");
+	
+	return 0;
+}
+
+// Mifare Memory Structure: up to 32 Sectors with 4 blocks each (1k and 2k cards),
+// plus evtl. 8 sectors with 16 blocks each (4k cards)
+uint8_t mfNumBlocksPerSector(uint8_t sectorNo) {
+	if (sectorNo < 32) 
+		return 4;
+	else
+		return 16;
+}
+
+uint8_t mfFirstBlockOfSector(uint8_t sectorNo) {
+	if (sectorNo < 32)
+		return sectorNo * 4;
+	else
+		return 32 * 4 + (sectorNo - 32) * 16;
+}
+
+uint8_t mfSectorTrailer(uint8_t blockNo) {
+	if (blockNo < 32*4) {
+		return (blockNo | 0x03);
+	} else {
+		return (blockNo | 0x0f);
+	}
+}
+
+bool mfIsSectorTrailer(uint8_t blockNo) {
+	return (blockNo == mfSectorTrailer(blockNo));
+}
+
+uint8_t mfSectorNum(uint8_t blockNo) {
+	if (blockNo < 32 * 4)
+		return blockNo / 4;
+	else
+		return 32 + (blockNo - 32 * 4) / 16;
+		
+}
diff --git a/client/mifare4.h b/client/mifare4.h
new file mode 100644
index 000000000..d26152cb4
--- /dev/null
+++ b/client/mifare4.h
@@ -0,0 +1,35 @@
+//-----------------------------------------------------------------------------
+// Copyright (C) 2018 Merlok
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// iso14443-4 mifare commands
+//-----------------------------------------------------------------------------
+
+#ifndef MIFARE4_H
+#define MIFARE4_H
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <stddef.h>
+
+typedef struct {
+	bool Authenticated;
+	uint16_t KeyNum;
+	uint8_t Rnd1[16];
+	uint8_t Rnd2[16];
+	
+}mf4Session;
+
+extern int MifareAuth4(mf4Session *session, uint8_t *keyn, uint8_t *key, bool activateField, bool leaveSignalON, bool verbose);
+
+extern uint8_t mfNumBlocksPerSector(uint8_t sectorNo);
+extern uint8_t mfFirstBlockOfSector(uint8_t sectorNo);
+extern uint8_t mfSectorTrailer(uint8_t blockNo);
+extern bool mfIsSectorTrailer(uint8_t blockNo);
+extern uint8_t mfSectorNum(uint8_t blockNo);
+
+
+#endif // mifare4.h
diff --git a/common/polarssl/libpcrypto.c b/common/polarssl/libpcrypto.c
new file mode 100644
index 000000000..032c3a18b
--- /dev/null
+++ b/common/polarssl/libpcrypto.c
@@ -0,0 +1,44 @@
+//-----------------------------------------------------------------------------
+// Copyright (C) 2018 Merlok
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// crypto commands
+//-----------------------------------------------------------------------------
+
+#include "polarssl/libpcrypto.h"
+#include <polarssl/aes.h>
+
+int aes_encode(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *output, int length){
+	uint8_t iiv[16] = {0};
+	if (iv)
+		memcpy(iiv, iv, 16);
+	
+	aes_context aes;
+	aes_init(&aes);
+	if (aes_setkey_enc(&aes, key, 128))
+		return 1;
+	if (aes_crypt_cbc(&aes, AES_ENCRYPT, length, iiv, input, output))
+		return 2;
+	aes_free(&aes);
+
+	return 0;
+}
+
+int aes_decode(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *output, int length){
+	uint8_t iiv[16] = {0};
+	if (iv)
+		memcpy(iiv, iv, 16);
+	
+	aes_context aes;
+	aes_init(&aes);
+	if (aes_setkey_dec(&aes, key, 128))
+		return 1;
+	if (aes_crypt_cbc(&aes, AES_DECRYPT, length, iiv, input, output))
+		return 2;
+	aes_free(&aes);
+
+	return 0;
+}
\ No newline at end of file
diff --git a/common/polarssl/libpcrypto.h b/common/polarssl/libpcrypto.h
new file mode 100644
index 000000000..84732cd31
--- /dev/null
+++ b/common/polarssl/libpcrypto.h
@@ -0,0 +1,20 @@
+//-----------------------------------------------------------------------------
+// Copyright (C) 2018 Merlok
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// crypto commands
+//-----------------------------------------------------------------------------
+
+#ifndef LIBPCRYPTO_H
+#define LIBPCRYPTO_H
+
+#include <stdint.h>
+#include <stddef.h>
+
+extern int aes_encode(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *output, int length);
+extern int aes_decode(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *output, int length);
+
+#endif /* libpcrypto.h */

From 8720d10da9ff1b98428b431c2ec9fa24267d3364 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 24 Oct 2018 19:02:14 +0300
Subject: [PATCH 0098/1938] changed logs

---
 client/cmdhfmf.c  |  4 +--
 client/cmdhfmfp.c | 74 +++++++++++++++++++++++------------------------
 2 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 2ef1fd6ba..016025fbc 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -3092,12 +3092,12 @@ int CmdHF14AMfAuth4(const char *cmd) {
 	CLIParserFree();
 	
 	if (keynlen != 2) {
-		PrintAndLog(ERROR, "<Key Num> must be 2 bytes long instead of: %d", keynlen);
+		PrintAndLogEx(ERR, "<Key Num> must be 2 bytes long instead of: %d", keynlen);
 		return 1;
 	}
 	
 	if (keylen != 16) {
-		PrintAndLog(ERROR, "<Key Value> must be 16 bytes long instead of: %d", keylen);
+		PrintAndLogEx(ERR, "<Key Value> must be 16 bytes long instead of: %d", keylen);
 		return 1;
 	}
 
diff --git a/client/cmdhfmfp.c b/client/cmdhfmfp.c
index 7f7660df1..7ba1c2561 100644
--- a/client/cmdhfmfp.c
+++ b/client/cmdhfmfp.c
@@ -62,12 +62,12 @@ void SetVerboseMode(bool verbose) {
 
 int intExchangeRAW14aPlus(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
 	if(VerboseMode)
-		PrintAndLog(">>> %s", sprint_hex(datain, datainlen));
+		PrintAndLogEx(INFO, ">>> %s", sprint_hex(datain, datainlen));
 	
 	int res = ExchangeRAW14a(datain, datainlen, activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
 
 	if(VerboseMode)
-		PrintAndLog("<<< %s", sprint_hex(dataout, *dataoutlen));
+		PrintAndLogEx(INFO, "<<< %s", sprint_hex(dataout, *dataoutlen));
 	
 	return res;
 }
@@ -101,7 +101,7 @@ int MFPWriteBlock(mf4Session *session, uint8_t blockNum, uint8_t *data, bool act
 int CmdHFMFPInfo(const char *cmd) {
 	
 	if (cmd && strlen(cmd) > 0)
-		PrintAndLog("WARNING: command don't have any parameters.\n");
+		PrintAndLogEx(WARNING, "command don't have any parameters.\n");
 	
 	// info about 14a part
 	CmdHF14AInfo("");
@@ -119,8 +119,8 @@ int CmdHFMFPInfo(const char *cmd) {
 	uint64_t select_status = resp.arg[0];		// 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
 	
 	if (select_status == 1 || select_status == 2) {
-		PrintAndLog("----------------------------------------------");
-		PrintAndLog("Mifare Plus info:");
+		PrintAndLogEx(INFO, "----------------------------------------------");
+		PrintAndLogEx(INFO, "Mifare Plus info:");
 		
 		// MIFARE Type Identification Procedure
 		// https://www.nxp.com/docs/en/application-note/AN10833.pdf
@@ -165,11 +165,11 @@ int CmdHFMFPInfo(const char *cmd) {
 		}
 		
 		if (SLmode != 0xff)
-			PrintAndLog("Mifare Plus SL mode: SL%d", SLmode);
+			PrintAndLogEx(INFO, "Mifare Plus SL mode: SL%d", SLmode);
 		else
-			PrintAndLog("Mifare Plus SL mode: unknown(");
+			PrintAndLogEx(WARNING, "Mifare Plus SL mode: unknown(");
 	} else {
-		PrintAndLog("Mifare Plus info not available.");
+		PrintAndLogEx(INFO, "Mifare Plus info not available.");
 	}
 	
 	DropField();
@@ -210,11 +210,11 @@ int CmdHFMFPWritePerso(const char *cmd) {
 	}
 	
 	if (keyNumLen != 2) {
-		PrintAndLog("Key number length must be 2 bytes instead of: %d", keyNumLen);
+		PrintAndLogEx(ERR, "Key number length must be 2 bytes instead of: %d", keyNumLen);
 		return 1;
 	}
 	if (keyLen != 16) {
-		PrintAndLog("Key length must be 16 bytes instead of: %d", keyLen);
+		PrintAndLogEx(ERR, "Key length must be 16 bytes instead of: %d", keyLen);
 		return 1;
 	}
 
@@ -223,20 +223,20 @@ int CmdHFMFPWritePerso(const char *cmd) {
 
 	int res = MFPWritePerso(keyNum, key, true, false, data, sizeof(data), &datalen);
 	if (res) {
-		PrintAndLog("Exchange error: %d", res);
+		PrintAndLogEx(ERR, "Exchange error: %d", res);
 		return res;
 	}
 	
 	if (datalen != 3) {
-		PrintAndLog("Command must return 3 bytes instead of: %d", datalen);
+		PrintAndLogEx(ERR, "Command must return 3 bytes instead of: %d", datalen);
 		return 1;
 	}
 
 	if (data[0] != 0x90) {
-		PrintAndLog("Command error: %02x %s", data[0], GetErrorDescription(data[0]));
+		PrintAndLogEx(ERR, "Command error: %02x %s", data[0], GetErrorDescription(data[0]));
 		return 1;
 	}
-	PrintAndLog("Write OK.");
+	PrintAndLogEx(INFO, "Write OK.");
 	
 	return 0;
 }
@@ -270,7 +270,7 @@ int CmdHFMFPInitPerso(const char *cmd) {
 	CLIParserFree();
 
 	if (keyLen && keyLen != 16) {
-		PrintAndLog("Key length must be 16 bytes instead of: %d", keyLen);
+		PrintAndLogEx(ERR, "Key length must be 16 bytes instead of: %d", keyLen);
 		return 1;
 	}
 	
@@ -283,11 +283,11 @@ int CmdHFMFPInitPerso(const char *cmd) {
 		keyNum[1] = sn & 0xff;
 		res = MFPWritePerso(keyNum, key, (sn == 0x4000), true, data, sizeof(data), &datalen);
 		if (!res && (datalen == 3) && data[0] == 0x09) {
-			PrintAndLog("2k card detected.");
+			PrintAndLogEx(INFO, "2k card detected.");
 			break;
 		}
 		if (res || (datalen != 3) || data[0] != 0x90) {
-			PrintAndLog("Write error on address %04x", sn);
+			PrintAndLogEx(ERR, "Write error on address %04x", sn);
 			break;
 		}
 	}
@@ -298,10 +298,10 @@ int CmdHFMFPInitPerso(const char *cmd) {
 		keyNum[1] = CardAddresses[i] & 0xff;
 		res = MFPWritePerso(keyNum, key, false, true, data, sizeof(data), &datalen);
 		if (!res && (datalen == 3) && data[0] == 0x09) {
-			PrintAndLog("Skipped[%04x]...", CardAddresses[i]);
+			PrintAndLogEx(WARNING, "Skipped[%04x]...", CardAddresses[i]);
 		} else {
 			if (res || (datalen != 3) || data[0] != 0x90) {
-				PrintAndLog("Write error on address %04x", CardAddresses[i]);
+				PrintAndLogEx(ERR, "Write error on address %04x", CardAddresses[i]);
 				break;
 			}
 		}
@@ -312,7 +312,7 @@ int CmdHFMFPInitPerso(const char *cmd) {
 	if (res)
 		return res;
 	
-	PrintAndLog("Done.");
+	PrintAndLogEx(INFO, "Done.");
 	
 	return 0;
 }
@@ -340,20 +340,20 @@ int CmdHFMFPCommitPerso(const char *cmd) {
 
 	int res = MFPCommitPerso(true, false, data, sizeof(data), &datalen);
 	if (res) {
-		PrintAndLog("Exchange error: %d", res);
+		PrintAndLogEx(ERR, "Exchange error: %d", res);
 		return res;
 	}
 	
 	if (datalen != 3) {
-		PrintAndLog("Command must return 3 bytes instead of: %d", datalen);
+		PrintAndLogEx(ERR, "Command must return 3 bytes instead of: %d", datalen);
 		return 1;
 	}
 
 	if (data[0] != 0x90) {
-		PrintAndLog("Command error: %02x %s", data[0], GetErrorDescription(data[0]));
+		PrintAndLogEx(ERR, "Command error: %02x %s", data[0], GetErrorDescription(data[0]));
 		return 1;
 	}
-	PrintAndLog("Switch level OK.");
+	PrintAndLogEx(INFO, "Switch level OK.");
 
 	return 0;
 }
@@ -384,12 +384,12 @@ int CmdHFMFPAuth(const char *cmd) {
 	CLIParserFree();
 	
 	if (keynlen != 2) {
-		PrintAndLog("ERROR: <Key Num> must be 2 bytes long instead of: %d", keynlen);
+		PrintAndLogEx(ERR, "ERROR: <Key Num> must be 2 bytes long instead of: %d", keynlen);
 		return 1;
 	}
 	
 	if (keylen != 16) {
-		PrintAndLog("ERROR: <Key Value> must be 16 bytes long instead of: %d", keylen);
+		PrintAndLogEx(ERR, "ERROR: <Key Value> must be 16 bytes long instead of: %d", keylen);
 		return 1;
 	}
 
@@ -432,18 +432,18 @@ int CmdHFMFPRdbl(const char *cmd) {
 	}
 	
 	if (blockn > 255) {
-		PrintAndLog("ERROR: <Block Num> must be in range [0..255] instead of: %d", blockn);
+		PrintAndLogEx(ERR, "<Block Num> must be in range [0..255] instead of: %d", blockn);
 		return 1;
 	}
 	
 	if (keylen != 16) {
-		PrintAndLog("ERROR: <Key Value> must be 16 bytes long instead of: %d", keylen);
+		PrintAndLogEx(ERR, "<Key Value> must be 16 bytes long instead of: %d", keylen);
 		return 1;
 	}
 
 	// 3 blocks - wo iso14443-4 chaining
 	if (blocksCount > 3) {
-		PrintAndLog("ERROR: blocks count must be less than 3 instead of: %d", blocksCount);
+		PrintAndLogEx(ERR, "blocks count must be less than 3 instead of: %d", blocksCount);
 		return 1;
 	}
 	
@@ -452,12 +452,12 @@ int CmdHFMFPRdbl(const char *cmd) {
 	keyn[0] = uKeyNum >> 8;
 	keyn[1] = uKeyNum & 0xff;
 	if (verbose)
-		PrintAndLog("--block:%d sector[%d]:%02x key:%04x", blockn, mfNumBlocksPerSector(sectorNum), sectorNum, uKeyNum);
+		PrintAndLogEx(INFO, "--block:%d sector[%d]:%02x key:%04x", blockn, mfNumBlocksPerSector(sectorNum), sectorNum, uKeyNum);
 	
 	mf4Session session;
 	int res = MifareAuth4(&session, keyn, key, true, true, verbose);
 	if (res) {
-		PrintAndLog("Authentication error: %d", res);
+		PrintAndLogEx(ERR, "Authentication error: %d", res);
 		return res;
 	}
 	
@@ -465,32 +465,32 @@ int CmdHFMFPRdbl(const char *cmd) {
 	int datalen = 0;
 	res = MFPReadBlock(&session, plain, blockn & 0xff, blocksCount, false, false, data, sizeof(data), &datalen);
 	if (res) {
-		PrintAndLog("Read error: %d", res);
+		PrintAndLogEx(ERR, "Read error: %d", res);
 		return res;
 	}
 	
 	if (datalen && data[0] != 0x90) {
-		PrintAndLog("Card read error: %02x %s", data[0], GetErrorDescription(data[0]));
+		PrintAndLogEx(ERR, "Card read error: %02x %s", data[0], GetErrorDescription(data[0]));
 		return 6;
 	}
 	
 	if (datalen != 1 + blocksCount * 16 + 8 + 2) {
-		PrintAndLog("Error return length:%d", datalen);
+		PrintAndLogEx(ERR, "Error return length:%d", datalen);
 		return 5;
 	}
 
 	int indx = blockn;
 	for(int i = 0; i < blocksCount; i++)  {
-		PrintAndLog("data[%03d]: %s", indx, sprint_hex(&data[1 + i * 16], 16));
+		PrintAndLogEx(INFO, "data[%03d]: %s", indx, sprint_hex(&data[1 + i * 16], 16));
 		indx++;
 		if (mfIsSectorTrailer(indx)){
-			PrintAndLog("data[%03d]: ------------------- trailer -------------------", indx);
+			PrintAndLogEx(INFO, "data[%03d]: ------------------- trailer -------------------", indx);
 			indx++;
 		}
 	}
 
 	if(verbose)
-		PrintAndLog("MAC: %s", sprint_hex(&data[blocksCount * 16 + 1], 8));
+		PrintAndLogEx(INFO, "MAC: %s", sprint_hex(&data[blocksCount * 16 + 1], 8));
 	
 	return 0;
 }

From 0af06c0b63e7afbacd7e1466f0c08be93651eca6 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 24 Oct 2018 19:05:30 +0300
Subject: [PATCH 0099/1938] mifare4 logging

---
 client/mifare4.c | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/client/mifare4.c b/client/mifare4.c
index 145dd243e..494d63e61 100644
--- a/client/mifare4.c
+++ b/client/mifare4.c
@@ -29,28 +29,28 @@ int MifareAuth4(mf4Session *session, uint8_t *keyn, uint8_t *key, bool activateF
 	uint8_t cmd1[] = {0x70, keyn[1], keyn[0], 0x00};
 	int res = ExchangeRAW14a(cmd1, sizeof(cmd1), activateField, true, data, sizeof(data), &datalen);
 	if (res) {
-		PrintAndLog("ERROR exchande raw error: %d", res);
+		PrintAndLogEx(ERR, "Exchande raw error: %d", res);
 		DropField();
 		return 2;
 	}
 	
 	if (verbose)
-		PrintAndLog("<phase1: %s", sprint_hex(data, datalen));
+		PrintAndLogEx(INFO, "<phase1: %s", sprint_hex(data, datalen));
 		
 	if (datalen < 1) {
-		PrintAndLog("ERROR: card response length: %d", datalen);
+		PrintAndLogEx(ERR, "Card response wrong length: %d", datalen);
 		DropField();
 		return 3;
 	}
 	
 	if (data[0] != 0x90) {
-		PrintAndLog("ERROR: card response error: %02x", data[2]);
+		PrintAndLogEx(ERR, "Card response error: %02x", data[2]);
 		DropField();
 		return 3;
 	}
 
 	if (datalen != 19) { // code 1b + 16b + crc 2b
-		PrintAndLog("ERROR: card response must be 19 bytes long instead of: %d", datalen);
+		PrintAndLogEx(ERR, "Card response must be 19 bytes long instead of: %d", datalen);
 		DropField();
 		return 3;
 	}
@@ -58,7 +58,7 @@ int MifareAuth4(mf4Session *session, uint8_t *keyn, uint8_t *key, bool activateF
     aes_decode(NULL, key, &data[1], Rnd2, 16);
 	Rnd2[16] = Rnd2[0];
 	if (verbose)
-		PrintAndLog("Rnd2: %s", sprint_hex(Rnd2, 16));
+		PrintAndLogEx(INFO, "Rnd2: %s", sprint_hex(Rnd2, 16));
 
 	uint8_t cmd2[33] = {0};
 	cmd2[0] = 0x72;
@@ -69,30 +69,30 @@ int MifareAuth4(mf4Session *session, uint8_t *keyn, uint8_t *key, bool activateF
 
 	aes_encode(NULL, key, raw, &cmd2[1], 32);
 	if (verbose)
-		PrintAndLog(">phase2: %s", sprint_hex(cmd2, 33));
+		PrintAndLogEx(INFO, ">phase2: %s", sprint_hex(cmd2, 33));
 	
 	res = ExchangeRAW14a(cmd2, sizeof(cmd2), false, true, data, sizeof(data), &datalen);
 	if (res) {
-		PrintAndLog("ERROR exchande raw error: %d", res);
+		PrintAndLogEx(ERR, "Exchande raw error: %d", res);
 		DropField();
 		return 4;
 	}
 	
 	if (verbose)
-		PrintAndLog("<phase2: %s", sprint_hex(data, datalen));
+		PrintAndLogEx(INFO, "<phase2: %s", sprint_hex(data, datalen));
 
 	aes_decode(NULL, key, &data[1], raw, 32);
 	
 	if (verbose) {
-		PrintAndLog("res: %s", sprint_hex(raw, 32));
-		PrintAndLog("Rnd1`: %s", sprint_hex(&raw[4], 16));
+		PrintAndLogEx(INFO, "res: %s", sprint_hex(raw, 32));
+		PrintAndLogEx(INFO, "Rnd1`: %s", sprint_hex(&raw[4], 16));
 	}
 
 	if (memcmp(&raw[4], &Rnd1[1], 16)) {
-		PrintAndLog("\nERROR: Authentication FAILED. rnd not equal");
+		PrintAndLogEx(ERR, "\nAuthentication FAILED. rnd not equal");
 		if (verbose) {
-			PrintAndLog("rnd1 reader: %s", sprint_hex(&Rnd1[1], 16));
-			PrintAndLog("rnd1   card: %s", sprint_hex(&raw[4], 16));
+			PrintAndLogEx(ERR, "rnd1 reader: %s", sprint_hex(&Rnd1[1], 16));
+			PrintAndLogEx(ERR, "rnd1   card: %s", sprint_hex(&raw[4], 16));
 		}
 		DropField();
 		return 5;
@@ -111,7 +111,7 @@ int MifareAuth4(mf4Session *session, uint8_t *keyn, uint8_t *key, bool activateF
 		memmove(session->Rnd2, Rnd2, 16);
 	}
 	
-	PrintAndLog("Authentication OK");
+	PrintAndLogEx(INFO, "Authentication OK");
 	
 	return 0;
 }

From 122cbe7d1dded6ed384663f38a6996afd1a40f6c Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 24 Oct 2018 19:19:15 +0300
Subject: [PATCH 0100/1938] info and some fix in exchange

---
 client/cmdhf14a.c | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index de1854630..7880bf38f 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -669,10 +669,12 @@ int CmdHF14ASniff(const char *Cmd) {
 }
 
 int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
+	static bool responseNum = false;
 	uint16_t cmdc = 0;
 	*dataoutlen = 0;
 	
 	if (activateField) {
+		responseNum = false;
 		UsbCommand resp;
 
 		// Anticollision + SELECT card
@@ -685,7 +687,7 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
 
 		// check result
 		if (resp.arg[0] == 0) {
-			PrintAndLogEx(NORMAL, "No card in field.");
+			PrintAndLogEx(ERR, "No card in field.");
 			return 1;
 		}
 
@@ -715,8 +717,11 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
 	if (leaveSignalON)
 		cmdc |= ISO14A_NO_DISCONNECT;
 
-	UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_APPEND_CRC | cmdc, (datainlen & 0xFFFF), 0}}; 
-	memcpy(c.d.asBytes, datain, datainlen);
+	UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_APPEND_CRC | cmdc, (datainlen & 0xFFFF) + 2, 0}}; 
+	uint8_t header[] = {0x0a | responseNum, 0x00};
+	responseNum ^= 1;
+	memcpy(c.d.asBytes, header, 2);
+	memcpy(&c.d.asBytes[2], datain, datainlen);
 	SendCommand(&c);
 	
     uint8_t *recv;
@@ -726,6 +731,11 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
         recv = resp.d.asBytes;
         int iLen = resp.arg[0];
 		
+        if(!iLen) {
+			PrintAndLogEx(ERR, "No card response.");
+            return 1;
+		}
+		
 		*dataoutlen = iLen - 2;
 		if (*dataoutlen < 0)
 			*dataoutlen = 0;
@@ -735,13 +745,13 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
 			return 2;
 		}
 		
-		memcpy(dataout, recv, *dataoutlen);
-		
-        if(!iLen) {
-			PrintAndLogEx(ERR, "No card response.");
-            return 1;
+		if (recv[0] != header[0]) {
+			PrintAndLogEx(ERR, "iso14443-4 framing error. Card send %2x must be %2x", dataout[0], header[0]);
+			return 2;
 		}
-
+		
+		memcpy(dataout, &recv[2], *dataoutlen);
+		
 		// CRC Check
 		if (iLen == -1) {
 			PrintAndLogEx(ERR, "ISO 14443A CRC error.");

From b08ce3a1f75db30ffc05f228db28e65b3ef2fdd6 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 24 Oct 2018 19:19:55 +0300
Subject: [PATCH 0101/1938] changed logs

---
 client/cmdhfmfp.c | 58 +++++++++++++++++++++++------------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/client/cmdhfmfp.c b/client/cmdhfmfp.c
index 7ba1c2561..b50b3bdd3 100644
--- a/client/cmdhfmfp.c
+++ b/client/cmdhfmfp.c
@@ -119,36 +119,36 @@ int CmdHFMFPInfo(const char *cmd) {
 	uint64_t select_status = resp.arg[0];		// 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
 	
 	if (select_status == 1 || select_status == 2) {
-		PrintAndLogEx(INFO, "----------------------------------------------");
-		PrintAndLogEx(INFO, "Mifare Plus info:");
+		PrintAndLogEx(NORMAL, "----------------------------------------------");
+		PrintAndLogEx(NORMAL, "Mifare Plus info:");
 		
 		// MIFARE Type Identification Procedure
 		// https://www.nxp.com/docs/en/application-note/AN10833.pdf
 		uint16_t ATQA = card.atqa[0] + (card.atqa[1] << 8);
-		if (ATQA == 0x0004) PrintAndLog("ATQA: Mifare Plus 2k 4bUID");
-		if (ATQA == 0x0002) PrintAndLog("ATQA: Mifare Plus 4k 4bUID");
-		if (ATQA == 0x0044) PrintAndLog("ATQA: Mifare Plus 2k 7bUID");
-		if (ATQA == 0x0042) PrintAndLog("ATQA: Mifare Plus 4k 7bUID");
+		if (ATQA == 0x0004) PrintAndLogEx(INFO, "ATQA: Mifare Plus 2k 4bUID");
+		if (ATQA == 0x0002) PrintAndLogEx(INFO, "ATQA: Mifare Plus 4k 4bUID");
+		if (ATQA == 0x0044) PrintAndLogEx(INFO, "ATQA: Mifare Plus 2k 7bUID");
+		if (ATQA == 0x0042) PrintAndLogEx(INFO, "ATQA: Mifare Plus 4k 7bUID");
 		
 		uint8_t SLmode = 0xff;
 		if (card.sak == 0x08) {
-			PrintAndLog("SAK: Mifare Plus 2k 7bUID");
+			PrintAndLogEx(INFO, "SAK: Mifare Plus 2k 7bUID");
 			if (select_status == 2) SLmode = 1;
 		}
 		if (card.sak == 0x18) {
-			PrintAndLog("SAK: Mifare Plus 4k 7bUID");
+			PrintAndLogEx(INFO, "SAK: Mifare Plus 4k 7bUID");
 			if (select_status == 2) SLmode = 1;
 		}
 		if (card.sak == 0x10) {
-			PrintAndLog("SAK: Mifare Plus 2k");
+			PrintAndLogEx(INFO, "SAK: Mifare Plus 2k");
 			if (select_status == 2) SLmode = 2;
 		}
 		if (card.sak == 0x11) {
-			PrintAndLog("SAK: Mifare Plus 4k");
+			PrintAndLogEx(INFO, "SAK: Mifare Plus 4k");
 			if (select_status == 2) SLmode = 2;
 		}
 		if (card.sak == 0x20) {
-			PrintAndLog("SAK: Mifare Plus SL0/SL3 or Mifare desfire");
+			PrintAndLogEx(INFO, "SAK: Mifare Plus SL0/SL3 or Mifare desfire");
 			if (card.ats_len > 0) {
 				SLmode = 3;
 
@@ -529,12 +529,12 @@ int CmdHFMFPRdsc(const char *cmd) {
 	}
 	
 	if (sectorNum > 39) {
-		PrintAndLog("ERROR: <Sector Num> must be in range [0..39] instead of: %d", sectorNum);
+		PrintAndLogEx(ERR, "<Sector Num> must be in range [0..39] instead of: %d", sectorNum);
 		return 1;
 	}
 	
 	if (keylen != 16) {
-		PrintAndLog("ERROR: <Key Value> must be 16 bytes long instead of: %d", keylen);
+		PrintAndLogEx(ERR, "<Key Value> must be 16 bytes long instead of: %d", keylen);
 		return 1;
 	}
 	
@@ -542,12 +542,12 @@ int CmdHFMFPRdsc(const char *cmd) {
 	keyn[0] = uKeyNum >> 8;
 	keyn[1] = uKeyNum & 0xff;
 	if (verbose)
-		PrintAndLog("--sector[%d]:%02x key:%04x", mfNumBlocksPerSector(sectorNum), sectorNum, uKeyNum);
+		PrintAndLogEx(INFO, "--sector[%d]:%02x key:%04x", mfNumBlocksPerSector(sectorNum), sectorNum, uKeyNum);
 	
 	mf4Session session;
 	int res = MifareAuth4(&session, keyn, key, true, true, verbose);
 	if (res) {
-		PrintAndLog("Authentication error: %d", res);
+		PrintAndLogEx(ERR, "Authentication error: %d", res);
 		return res;
 	}
 	
@@ -556,26 +556,26 @@ int CmdHFMFPRdsc(const char *cmd) {
 	for(int n = mfFirstBlockOfSector(sectorNum); n < mfFirstBlockOfSector(sectorNum) + mfNumBlocksPerSector(sectorNum); n++) {
 		res = MFPReadBlock(&session, plain, n & 0xff, 1, false, true, data, sizeof(data), &datalen);
 		if (res) {
-			PrintAndLog("Read error: %d", res);
+			PrintAndLogEx(ERR, "Read error: %d", res);
 			DropField();
 			return res;
 		}
 		
 		if (datalen && data[0] != 0x90) {
-			PrintAndLog("Card read error: %02x %s", data[0], GetErrorDescription(data[0]));
+			PrintAndLogEx(ERR, "Card read error: %02x %s", data[0], GetErrorDescription(data[0]));
 			DropField();
 			return 6;
 		}
 		if (datalen != 1 + 16 + 8 + 2) {
-			PrintAndLog("Error return length:%d", datalen);
+			PrintAndLogEx(ERR, "Error return length:%d", datalen);
 			DropField();
 			return 5;
 		}
 
-		PrintAndLog("data[%03d]: %s", n, sprint_hex(&data[1], 16));
+		PrintAndLogEx(INFO, "data[%03d]: %s", n, sprint_hex(&data[1], 16));
 			
 		if(verbose)
-			PrintAndLog("MAC: %s", sprint_hex(&data[1 + 16], 8));
+			PrintAndLogEx(INFO, "MAC: %s", sprint_hex(&data[1 + 16], 8));
 	}
 	DropField();
 	
@@ -618,17 +618,17 @@ int CmdHFMFPWrbl(const char *cmd) {
 	}
 	
 	if (blockNum > 39) {
-		PrintAndLog("ERROR: <Block Num> must be in range [0..255] instead of: %d", blockNum);
+		PrintAndLogEx(ERR, "<Block Num> must be in range [0..255] instead of: %d", blockNum);
 		return 1;
 	}
 	
 	if (keylen != 16) {
-		PrintAndLog("ERROR: <Key> must be 16 bytes long instead of: %d", keylen);
+		PrintAndLogEx(ERR, "<Key> must be 16 bytes long instead of: %d", keylen);
 		return 1;
 	}
 
 	if (datainlen != 16) {
-		PrintAndLog("ERROR: <Data> must be 16 bytes long instead of: %d", datainlen);
+		PrintAndLogEx(ERR, "<Data> must be 16 bytes long instead of: %d", datainlen);
 		return 1;
 	}
 	
@@ -637,12 +637,12 @@ int CmdHFMFPWrbl(const char *cmd) {
 	keyn[0] = uKeyNum >> 8;
 	keyn[1] = uKeyNum & 0xff;
 	if (verbose)
-		PrintAndLog("--block:%d sector[%d]:%02x key:%04x", blockNum & 0xff, mfNumBlocksPerSector(sectorNum), sectorNum, uKeyNum);
+		PrintAndLogEx(INFO, "--block:%d sector[%d]:%02x key:%04x", blockNum & 0xff, mfNumBlocksPerSector(sectorNum), sectorNum, uKeyNum);
 	
 	mf4Session session;
 	int res = MifareAuth4(&session, keyn, key, true, true, verbose);
 	if (res) {
-		PrintAndLog("Authentication error: %d", res);
+		PrintAndLogEx(ERR, "Authentication error: %d", res);
 		return res;
 	}
 
@@ -650,22 +650,22 @@ int CmdHFMFPWrbl(const char *cmd) {
 	int datalen = 0;
 	res = MFPWriteBlock(&session, blockNum & 0xff, datain, false, false, data, sizeof(data), &datalen);
 	if (res) {
-		PrintAndLog("Write error: %d", res);
+		PrintAndLogEx(ERR, "Write error: %d", res);
 		return res;
 	}
 	
 	if (datalen != 3 && (datalen != 3 + 8)) {
-		PrintAndLog("Error return length:%d", datalen);
+		PrintAndLogEx(ERR, "Error return length:%d", datalen);
 		return 5;
 	}
 	
 	if (datalen && data[0] != 0x90) {
-		PrintAndLog("Card write error: %02x %s", data[0], GetErrorDescription(data[0]));
+		PrintAndLogEx(ERR, "Card write error: %02x %s", data[0], GetErrorDescription(data[0]));
 		return 6;
 	}
 	
 	if(verbose)
-		PrintAndLog("MAC: %s", sprint_hex(&data[1], 8));
+		PrintAndLogEx(INFO, "MAC: %s", sprint_hex(&data[1], 8));
 	
 	return 0;
 }

From 8bb192fc75b8ef79431d1af567c2341f277e684d Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Fri, 26 Oct 2018 14:12:20 +0300
Subject: [PATCH 0102/1938] added some crypto

---
 client/Makefile               |   1 +
 client/mifare4.c              |  12 ++
 client/mifare4.h              |   2 +
 common/polarssl/aes_cmac128.c | 322 ++++++++++++++++++++++++++++++++++
 common/polarssl/aes_cmac128.h |  81 +++++++++
 common/polarssl/libpcrypto.c  |  40 ++++-
 common/polarssl/libpcrypto.h  |   2 +
 7 files changed, 459 insertions(+), 1 deletion(-)
 create mode 100644 common/polarssl/aes_cmac128.c
 create mode 100644 common/polarssl/aes_cmac128.h

diff --git a/client/Makefile b/client/Makefile
index c832d9e49..a31be08d5 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -105,6 +105,7 @@ CMDSRCS =	crapto1/crapto1.c \
 			tea.c \
 			polarssl/des.c \
 			polarssl/aes.c \
+			polarssl/aes_cmac128.c \
 			polarssl/bignum.c \
 			polarssl/rsa.c \
 			polarssl/sha1.c \
diff --git a/client/mifare4.c b/client/mifare4.c
index 494d63e61..2ca28cb3f 100644
--- a/client/mifare4.c
+++ b/client/mifare4.c
@@ -16,6 +16,18 @@
 #include "ui.h"
 #include "polarssl/libpcrypto.h"
 
+int CalulateMAC(mf4Session *session, uint8_t *data, int datalen, uint8_t *mac, bool verbose) {
+	if (!session || !session->Authenticated || !mac || !data || !datalen)
+		return 1;
+	
+	memset(mac, 0x00, 8);
+	
+	if (verbose)
+		PrintAndLog("MAC data[%d]: %s", datalen, sprint_hex(data, datalen));
+	
+	return aes_cmac8(NULL, session->Key, data, mac, datalen);
+}
+
 int MifareAuth4(mf4Session *session, uint8_t *keyn, uint8_t *key, bool activateField, bool leaveSignalON, bool verbose) {
 	uint8_t data[257] = {0};
 	int datalen = 0;
diff --git a/client/mifare4.h b/client/mifare4.h
index d26152cb4..7867add5d 100644
--- a/client/mifare4.h
+++ b/client/mifare4.h
@@ -17,12 +17,14 @@
 
 typedef struct {
 	bool Authenticated;
+	uint8_t Key[16];
 	uint16_t KeyNum;
 	uint8_t Rnd1[16];
 	uint8_t Rnd2[16];
 	
 }mf4Session;
 
+extern int CalulateMAC(mf4Session *session, uint8_t *data, int datalen, uint8_t *mac, bool verbose);
 extern int MifareAuth4(mf4Session *session, uint8_t *keyn, uint8_t *key, bool activateField, bool leaveSignalON, bool verbose);
 
 extern uint8_t mfNumBlocksPerSector(uint8_t sectorNo);
diff --git a/common/polarssl/aes_cmac128.c b/common/polarssl/aes_cmac128.c
new file mode 100644
index 000000000..595f89b8d
--- /dev/null
+++ b/common/polarssl/aes_cmac128.c
@@ -0,0 +1,322 @@
+/*
+ *  AES-CMAC from NIST Special Publication 800-38B � Recommendation for block cipher modes of operation: The CMAC mode for authentication.
+ *
+ *  Copyright (C) 2006-2014, Brainspark B.V.
+ *  Copyright (C) 2014, Anargyros Plemenos
+ *  Tests added Merkok, 2018
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Reference : https://polarssl.org/discussions/generic/authentication-token
+ *  NIST Special Publication 800-38B � Recommendation for block cipher modes of operation: The CMAC mode for authentication.
+ *  Tests here:
+ *  https://csrc.nist.gov/CSRC/media/Projects/Cryptographic-Standards-and-Guidelines/documents/examples/AES_CMAC.pdf
+*/
+
+#include "polarssl/aes_cmac128.h"
+#include <stdio.h>
+
+#define MIN(a,b)           ((a)<(b)?(a):(b))
+#define _MSB(x)            (((x)[0] & 0x80)?1:0)
+
+#if !defined(POLARSSL_CONFIG_FILE)
+#include "polarssl_config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
+
+#if defined(POLARSSL_AES_C)
+#include "aes.h"
+#endif
+
+#if defined(POLARSSL_PLATFORM_C)
+#include "polarssl/platform.h"
+#else
+#define polarssl_printf printf
+#endif
+
+
+/** 
+ * zero a structure 
+ */
+#define ZERO_STRUCT(x)      memset((char *)&(x), 0, sizeof(x))
+
+/** 
+ * zero a structure given a pointer to the structure 
+ */
+#define ZERO_STRUCTP(x)     do{ if((x) != NULL) memset((char *)(x), 0, sizeof(*(x)));} while(0)
+
+
+/* For CMAC Calculation */
+static unsigned char const_Rb[16] = {
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x87
+};
+static unsigned char const_Zero[16] = {
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+static inline void aes_cmac_128_left_shift_1(const uint8_t in[16], uint8_t out[16])
+{
+	uint8_t overflow = 0;
+	int8_t i;
+
+	for (i = 15; i >= 0; i--) {
+		out[i] = in[i] << 1;
+		out[i] |= overflow;
+		overflow = _MSB(&in[i]);
+	 } 
+}
+
+static inline void aes_cmac_128_xor(const uint8_t in1[16], const uint8_t in2[16], 
+										uint8_t out[16])
+{
+	uint8_t i;
+
+	for (i = 0; i < 16; i++) {
+		out[i] = in1[i] ^ in2[i];
+	}
+}
+
+/*
+ * AES-CMAC-128 context setup
+ */
+void aes_cmac128_starts(aes_cmac128_context *ctx, const uint8_t K[16])
+{
+	uint8_t L[16];
+
+	/* Zero struct of aes_context */
+	ZERO_STRUCTP(ctx);
+	/* Initialize aes_context */
+	aes_setkey_enc(&ctx->aes_key, K, 128);
+
+	/* step 1 - generate subkeys k1 and k2 */
+	aes_crypt_ecb(&ctx->aes_key, AES_ENCRYPT, const_Zero, L);
+
+	if (_MSB(L) == 0) {
+		aes_cmac_128_left_shift_1(L, ctx->K1);
+	} else {
+		uint8_t tmp_block[16];
+
+		aes_cmac_128_left_shift_1(L, tmp_block);
+		aes_cmac_128_xor(tmp_block, const_Rb, ctx->K1);
+		ZERO_STRUCT(tmp_block);
+	}
+
+	if (_MSB(ctx->K1) == 0) {
+		aes_cmac_128_left_shift_1(ctx->K1, ctx->K2);
+	} else {
+		uint8_t tmp_block[16];
+
+		aes_cmac_128_left_shift_1(ctx->K1, tmp_block);
+		aes_cmac_128_xor(tmp_block, const_Rb, ctx->K2);
+		ZERO_STRUCT(tmp_block);
+   }
+
+	ZERO_STRUCT(L);
+}
+
+/*
+ * AES-CMAC-128 process message
+ */
+void aes_cmac128_update(aes_cmac128_context *ctx, const uint8_t *_msg, size_t _msg_len)
+{
+	uint8_t tmp_block[16];
+	uint8_t Y[16];
+	const uint8_t *msg = _msg;
+	size_t msg_len = _msg_len;
+
+	/*
+	 * copy the remembered last block
+	 */
+	ZERO_STRUCT(tmp_block);
+	if (ctx->last_len) {
+		memcpy(tmp_block, ctx->last, ctx->last_len);
+	}
+
+	/*
+	 * check if we expand the block
+	 */
+	if (ctx->last_len < 16) {
+		size_t len = MIN(16 - ctx->last_len, msg_len);
+
+		memcpy(&tmp_block[ctx->last_len], msg, len);
+		memcpy(ctx->last, tmp_block, 16);
+		msg += len;
+		msg_len -= len;
+		ctx->last_len += len;
+	}
+
+	if (msg_len == 0) {
+		/* if it is still the last block, we are done */
+		ZERO_STRUCT(tmp_block);
+		return;
+	}
+
+	/*
+	 * It is not the last block anymore
+	 */
+	ZERO_STRUCT(ctx->last);
+	ctx->last_len = 0;
+
+	/*
+	 * now checksum everything but the last block
+	 */
+	aes_cmac_128_xor(ctx->X, tmp_block, Y);
+	aes_crypt_ecb(&ctx->aes_key, AES_ENCRYPT, Y, ctx->X);
+
+	while (msg_len > 16) {
+		memcpy(tmp_block, msg, 16);
+		msg += 16;
+		msg_len -= 16;
+
+		aes_cmac_128_xor(ctx->X, tmp_block, Y);
+		aes_crypt_ecb(&ctx->aes_key, AES_ENCRYPT, Y, ctx->X);
+	}
+
+	/*
+	 * copy the last block, it will be processed in
+	 * aes_cmac128_final().
+	 */
+	 memcpy(ctx->last, msg, msg_len);
+	 ctx->last_len = msg_len;
+
+	ZERO_STRUCT(tmp_block);
+	ZERO_STRUCT(Y);
+}
+
+/*
+ * AES-CMAC-128 compute T
+ */
+void aes_cmac128_final(aes_cmac128_context *ctx, uint8_t T[16])
+{
+	uint8_t tmp_block[16];
+	uint8_t Y[16];
+
+	if (ctx->last_len < 16) {
+		ctx->last[ctx->last_len] = 0x80;
+		aes_cmac_128_xor(ctx->last, ctx->K2, tmp_block);
+	} else {
+		aes_cmac_128_xor(ctx->last, ctx->K1, tmp_block);
+	}
+
+	aes_cmac_128_xor(tmp_block, ctx->X, Y);
+	aes_crypt_ecb(&ctx->aes_key, AES_ENCRYPT, Y, T);
+
+	ZERO_STRUCT(tmp_block);
+	ZERO_STRUCT(Y);
+	ZERO_STRUCTP(ctx);
+}
+
+/*
+ * Checkup routine
+ * 
+ * https://csrc.nist.gov/projects/cryptographic-standards-and-guidelines/example-values
+ * https://csrc.nist.gov/CSRC/media/Projects/Cryptographic-Standards-and-Guidelines/documents/examples/AES_CMAC.pdf
+ */
+int aes_cmac_self_test( int verbose )
+{
+	unsigned char key[16] = {0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6, 0xAB, 0xF7, 0x15, 0x88, 0x09, 0xCF, 0x4F, 0x3C};
+	unsigned char mac[16] = {0};
+	aes_cmac128_context ctx;
+	int ret;
+
+	// check Example1:
+	if( verbose != 0 )
+		polarssl_printf( "  AES-CMAC-128 zero length data: " );
+	unsigned char ex1data[16] = {0};
+	aes_cmac128_starts(&ctx, key);
+	aes_cmac128_update(&ctx, ex1data, 0);
+	aes_cmac128_final(&ctx, mac);
+	unsigned char ex1res[16] = {0xBB, 0x1D, 0x69, 0x29, 0xE9, 0x59, 0x37, 0x28, 0x7F, 0xA3, 0x7D, 0x12, 0x9B, 0x75, 0x67, 0x46};
+	if(!memcmp(mac, ex1res, 16)) {
+		if( verbose != 0 )
+			polarssl_printf( "passed\n" );
+	} else {
+		polarssl_printf( "failed\n" );
+		ret = 1;
+		goto exit;
+	}
+
+	// check Example2:
+	if( verbose != 0 )    
+		polarssl_printf( "  AES-CMAC-128 one block data  : " );
+	unsigned char ex2data[16] = {0x6B, 0xC1, 0xBE, 0xE2, 0x2E, 0x40, 0x9F, 0x96, 0xE9, 0x3D, 0x7E, 0x11, 0x73, 0x93, 0x17, 0x2A};
+	aes_cmac128_starts(&ctx, key);
+	aes_cmac128_update(&ctx, ex2data, sizeof(ex2data));
+	aes_cmac128_final(&ctx, mac);
+	unsigned char ex2res[16] = {0x07, 0x0A, 0x16, 0xB4, 0x6B, 0x4D, 0x41, 0x44, 0xF7, 0x9B, 0xDD, 0x9D, 0xD0, 0x4A, 0x28, 0x7C};
+	if(!memcmp(mac, ex2res, 16)) {
+		if( verbose != 0 )
+			polarssl_printf( "passed\n" );
+	} else {
+		polarssl_printf( "failed\n" );
+		ret = 1;
+		goto exit;
+	}
+	
+	// check Example3:
+	if( verbose != 0 )
+		polarssl_printf( "  AES-CMAC-128 20 bytes of data: " );
+	unsigned char ex3data[20] = {0x6B, 0xC1, 0xBE, 0xE2, 0x2E, 0x40, 0x9F, 0x96, 0xE9, 0x3D, 0x7E, 0x11, 0x73, 0x93, 0x17, 0x2A, 
+								 0xAE, 0x2D, 0x8A, 0x57};
+	aes_cmac128_starts(&ctx, key);
+	aes_cmac128_update(&ctx, ex3data, sizeof(ex3data));
+	aes_cmac128_final(&ctx, mac);
+	unsigned char ex3res[16] = {0x7D, 0x85, 0x44, 0x9E, 0xA6, 0xEA, 0x19, 0xC8, 0x23, 0xA7, 0xBF, 0x78, 0x83, 0x7D, 0xFA, 0xDE};
+	if(!memcmp(mac, ex3res, 16)) {
+		if( verbose != 0 )
+			polarssl_printf( "passed\n" );
+	} else {
+		polarssl_printf( "failed\n" );
+		ret = 1;
+		goto exit;
+	}
+
+	// check Example4:
+	if( verbose != 0 )
+		polarssl_printf( "  AES-CMAC-128 4 blocks of data: " );
+	unsigned char ex4data[64] = {0x6B, 0xC1, 0xBE, 0xE2, 0x2E, 0x40, 0x9F, 0x96, 0xE9, 0x3D, 0x7E, 0x11, 0x73, 0x93, 0x17, 0x2A,
+								 0xAE, 0x2D, 0x8A, 0x57, 0x1E, 0x03, 0xAC, 0x9C, 0x9E, 0xB7, 0x6F, 0xAC, 0x45, 0xAF, 0x8E, 0x51,
+								 0x30, 0xC8, 0x1C, 0x46, 0xA3, 0x5C, 0xE4, 0x11, 0xE5, 0xFB, 0xC1, 0x19, 0x1A, 0x0A, 0x52, 0xEF,
+								 0xF6, 0x9F, 0x24, 0x45, 0xDF, 0x4F, 0x9B, 0x17, 0xAD, 0x2B, 0x41, 0x7B, 0xE6, 0x6C, 0x37, 0x10};
+	aes_cmac128_starts(&ctx, key);
+	aes_cmac128_update(&ctx, ex4data, sizeof(ex4data));
+	aes_cmac128_final(&ctx, mac);
+	unsigned char ex4res[16] = {0x51, 0xF0, 0xBE, 0xBF, 0x7E, 0x3B, 0x9D, 0x92, 0xFC, 0x49, 0x74, 0x17, 0x79, 0x36, 0x3C, 0xFE};
+	if(!memcmp(mac, ex4res, 16)) {
+		if( verbose != 0 )
+			polarssl_printf( "passed\n" );
+	} else {
+		polarssl_printf( "failed\n" );
+		ret = 1;
+		goto exit;
+	}
+
+	if( verbose != 0 )
+		polarssl_printf( "\n" );
+
+	ret = 0;
+
+exit:
+	return( ret );
+}
+
diff --git a/common/polarssl/aes_cmac128.h b/common/polarssl/aes_cmac128.h
new file mode 100644
index 000000000..b792755fc
--- /dev/null
+++ b/common/polarssl/aes_cmac128.h
@@ -0,0 +1,81 @@
+/*
+ *  AES-CMAC from NIST Special Publication 800-38B � Recommendation for block cipher modes of operation: The CMAC mode for authentication.
+ *
+ *  Copyright (C) 2006-2014, Brainspark B.V.
+ *  Copyright (C) 2014, Anargyros Plemenos
+ *  Tests added Merkok, 2018
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Reference : https://polarssl.org/discussions/generic/authentication-token
+ *  NIST Special Publication 800-38B � Recommendation for block cipher modes of operation: The CMAC mode for authentication.
+ *  Tests here:
+ *  https://csrc.nist.gov/CSRC/media/Projects/Cryptographic-Standards-and-Guidelines/documents/examples/AES_CMAC.pdf
+*/
+
+#include <stdint.h>
+#include <stddef.h>
+#include "aes.h"
+
+typedef struct aes_cmac_128_context {
+    aes_context aes_key;
+
+    uint8_t K1[16];
+    uint8_t K2[16];
+
+    uint8_t X[16];
+
+    uint8_t last[16];
+    size_t last_len;
+}
+aes_cmac128_context;
+
+/*
+ * \brief AES-CMAC-128 context setup
+ *
+ * \param ctx      context to be initialized
+ * \param key      secret key for AES-128
+ */
+void aes_cmac128_starts(aes_cmac128_context *ctx, const uint8_t K[16]);
+
+/*
+ * \brief AES-CMAC-128 process message
+ *
+ * \param ctx      context to be initialized
+ * \param _msg     the given message
+ * \param _msg_len the length of message
+ */
+void aes_cmac128_update(aes_cmac128_context *ctx, const uint8_t *_msg, size_t _msg_len);
+
+/*
+ * \brief AES-CMAC-128 compute T
+ *
+ * \param ctx      context to be initialized
+ * \param T        the generated MAC which is used to validate the message
+ */
+void aes_cmac128_final(aes_cmac128_context *ctx, uint8_t T[16]);
+
+/**
+ * \brief          Checkup routine
+ *
+ * \return         0 if successful, or 1 if the test failed
+ */
+int aes_cmac_self_test( int verbose );
+
diff --git a/common/polarssl/libpcrypto.c b/common/polarssl/libpcrypto.c
index 032c3a18b..d86c97568 100644
--- a/common/polarssl/libpcrypto.c
+++ b/common/polarssl/libpcrypto.c
@@ -10,6 +10,7 @@
 
 #include "polarssl/libpcrypto.h"
 #include <polarssl/aes.h>
+#include <polarssl/aes_cmac128.h>
 
 int aes_encode(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *output, int length){
 	uint8_t iiv[16] = {0};
@@ -41,4 +42,41 @@ int aes_decode(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *output, int l
 	aes_free(&aes);
 
 	return 0;
-}
\ No newline at end of file
+}
+
+//  NIST Special Publication 800-38B � Recommendation for block cipher modes of operation: The CMAC mode for authentication.
+// https://csrc.nist.gov/CSRC/media/Projects/Cryptographic-Standards-and-Guidelines/documents/examples/AES_CMAC.pdf
+int aes_cmac(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *mac, int length) {
+	memset(mac, 0x00, 16);
+	uint8_t iiv[16] = {0};
+	if (iv)
+		memcpy(iiv, iv, 16);
+	
+	// padding:  ISO/IEC 9797-1 Message Authentication Codes (MACs) - Part 1: Mechanisms using a block cipher
+	uint8_t data[2049] = {0}; // length + 16
+	memcpy(data, input, length);
+	data[length] = 0x80;
+	int datalen = (length & 0xfffffff0) + 0x10;
+	
+	//  NIST 800-38B 
+	aes_cmac128_context ctx;
+	aes_cmac128_starts(&ctx, key);
+	aes_cmac128_update(&ctx, data, datalen);
+	aes_cmac128_final(&ctx, mac);
+
+	return 0;
+}
+
+int aes_cmac8(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *mac, int length) {
+	uint8_t cmac[16] = {0};
+	memset(mac, 0x00, 8);
+	
+	int res = aes_cmac(iv, key, input, cmac, length);
+	if (res)
+		return res;
+	
+	for(int i = 0; i < 8; i++) 
+		mac[i] = cmac[i * 2 + 1];
+
+	return 0;
+}
diff --git a/common/polarssl/libpcrypto.h b/common/polarssl/libpcrypto.h
index 84732cd31..1b74c143f 100644
--- a/common/polarssl/libpcrypto.h
+++ b/common/polarssl/libpcrypto.h
@@ -16,5 +16,7 @@
 
 extern int aes_encode(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *output, int length);
 extern int aes_decode(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *output, int length);
+extern int aes_cmac(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *mac, int length);
+extern int aes_cmac8(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *mac, int length);
 
 #endif /* libpcrypto.h */

From 7467368fbc02b33d161801dacf5b6b2fa3c701fd Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Fri, 26 Oct 2018 14:17:08 +0300
Subject: [PATCH 0103/1938] added cmac test

---
 client/emv/test/cryptotest.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/client/emv/test/cryptotest.c b/client/emv/test/cryptotest.c
index 8cc3812c1..b9be38ad5 100644
--- a/client/emv/test/cryptotest.c
+++ b/client/emv/test/cryptotest.c
@@ -14,6 +14,7 @@
 
 #include "bignum.h"
 #include "aes.h"
+#include "aes_cmac128.h"
 #include "des.h"
 #include "rsa.h"
 #include "sha1.h"
@@ -33,6 +34,9 @@ int ExecuteCryptoTests(bool verbose) {
 	res = aes_self_test(verbose);
 	if (res) TestFail = true;
 	
+	res = aes_cmac_self_test(verbose);
+	if (res) TestFail = true;
+	
 	res = des_self_test(verbose);
 	if (res) TestFail = true;
 	

From af278d977bb47e4694ddb24401cb1115c5282af6 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Fri, 26 Oct 2018 14:19:10 +0300
Subject: [PATCH 0104/1938] added SetVerboseMode
 6bb33f377663126fbf645d8faaf00d4a1734f924

---
 client/cmdhfmfp.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/client/cmdhfmfp.c b/client/cmdhfmfp.c
index b50b3bdd3..cc64297e8 100644
--- a/client/cmdhfmfp.c
+++ b/client/cmdhfmfp.c
@@ -426,6 +426,8 @@ int CmdHFMFPRdbl(const char *cmd) {
 	CLIGetHexWithReturn(6, key, &keylen);
 	CLIParserFree();
 	
+	SetVerboseMode(verbose);
+
 	if (!keylen) {
 		memmove(key, DefaultKey, 16);
 		keylen = 16;
@@ -523,6 +525,8 @@ int CmdHFMFPRdsc(const char *cmd) {
 	CLIGetHexWithReturn(5, key, &keylen);
 	CLIParserFree();
 	
+	SetVerboseMode(verbose);
+
 	if (!keylen) {
 		memmove(key, DefaultKey, 16);
 		keylen = 16;
@@ -612,6 +616,8 @@ int CmdHFMFPWrbl(const char *cmd) {
 	CLIGetHexWithReturn(5, key, &keylen);
 	CLIParserFree();
 	
+	SetVerboseMode(verbose);
+
 	if (!keylen) {
 		memmove(key, DefaultKey, 16);
 		keylen = 16;

From 6dc02ff49b339f2db03b99c9c9296760ba3136ae Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Fri, 26 Oct 2018 14:59:07 +0300
Subject: [PATCH 0105/1938] new appveyor

---
 appveyor.yml | 51 +++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 41 insertions(+), 10 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 65aeab1d9..a38ff647b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -66,9 +66,20 @@ clone_script:
     Write-Host "[ OK ]" -ForegroundColor Green
 
 
-    Write-Host "Fill msys\etc\fstab file..." -NoNewLine
+    Write-Host "Fill msys2\etc\fstab file..." -NoNewLine
 
-    New-Item c:\ProxSpace\msys\etc\fstab -type file -force -value "#Win32_Path Mount_Point`nc:\ProxSpace\devkitARM /devkitARM`nc:\ProxSpace\Qt\5.6 /qt `nc:\ProxSpace\pm3 /pm3`n"
+    New-Item c:\ProxSpace\msys2\etc\fstab -type file -force -value "# For a description of the file format, see the Users Guide`n# http://cygwin.com/cygwin-ug-net/using.html#mount-table`nnone / cygdrive binary,posix=0,noacl,user 0 0 `nC:\ProxSpace\pm3 /pm3 ntfs noacl 0 0 `nC:\ProxSpace\gcc-arm-none-eabi /gcc-arm-none-eabi ntfs noacl 0 0 `n"
+
+    Write-Host "[ OK ]" -ForegroundColor Green
+
+
+    Write-Host "Update msys2 packages..." -NoNewLine
+
+    $env:Path = "C:\ProxSpace\msys2\usr\bin;C:\ProxSpace\msys2\mingw32\bin;C:\ProxSpace\gcc-arm-none-eabi\bin;$env:Path"
+
+    C:\ProxSpace\msys2\msys2_shell.cmd -mingw32 -defterm -no-start /dev/null 1> msys1.txt 2>&1
+
+    C:\ProxSpace\msys2\msys2_shell.cmd -mingw32 -defterm -no-start /dev/null 1> msys1.txt 2>&1
 
     Write-Host "[ OK ]" -ForegroundColor Green
 install:
@@ -84,12 +95,25 @@ install:
             }
 build_script:
 - ps: >-
-    $env:Path = "C:\ProxSpace\msys\bin;$env:Path"
+    "C:\ProxSpace\msys2\usr\bin;C:\ProxSpace\msys2\mingw32\bin;C:\ProxSpace\gcc-arm-none-eabi\bin;$env:Path"
+
+
+    $env:MINGW_HOME="C:\ProxSpace\msys2\mingw32"
+
+    $env:MSYS_HOME="C:\ProxSpace\msys2"
+
+    $env:MSYSTEM="MINGW32"
+
+    $env:MINGW_PREFIX="/mingw32"
+
+    $env:SHELL="/bin/bash"
+
+    $env:MSYSTEM_CHOST="i686-w64-mingw32"
 
 
     #make
 
-    bash -lc -i "pwd;make all"
+    bash -c -i 'pwd;make clean;make all'
 
 
     #some checks
@@ -232,8 +256,8 @@ test_script:
     #--- end Job
 
       [bool]$res=$false
-      # Wait 60 sec timeout for Job
-      if(Wait-Job $Job -Timeout 60){
+      # Wait 120 sec timeout for Job
+      if(Wait-Job $Job -Timeout 150){
         $Results = $Job | Receive-Job
         if($Results -like "true"){
           $res=$true
@@ -268,13 +292,20 @@ test_script:
 
     #proxmark logic tests
 
-    ExecTest "proxmark help" "proxmark3 -h" {bash -lc 'cd ~/client;proxmark3 -h | grep -q Execute && echo Passed || echo Failed'}
+    ExecTest "proxmark help" "proxmark3 -h" {bash -lc 'cd ~/client;./proxmark3 -h | grep -q Execute && echo Passed || echo Failed'}
 
-    ExecTest "proxmark help hardnested" "proxmark3 -h" {bash -lc 'cd ~/client;proxmark3 -h | grep -q hardnested && echo Passed || echo Failed'}
+    ExecTest "proxmark help hardnested" "proxmark3 -h" {bash -lc 'cd ~/client;./proxmark3 -h | grep -q hardnested && echo Passed || echo Failed'}
 
-    ExecTest "hf mf offline text" "hf mf" {bash -lc "cd ~/client;proxmark3 comx -c 'hf mf'"} "at_enc"
 
-    ExecTest "hf mf hardnested" "hf mf hardnested" {bash -lc "cd ~/client;proxmark3 comx -c 'hf mf hardnested t 1 000000000000'"} "found:"
+    ExecTest "hf mf offline text" "hf mf" {bash -lc "cd ~/client;./proxmark3 comx -c 'hf mf'"} "at_enc"
+
+    ExecTest "hf mf hardnested" "hf mf hardnested" {bash -lc "cd ~/client;./proxmark3 comx -c 'hf mf hardnested t 1 000000000000'"} "found:"
+
+
+    #proxmark crypto tests
+
+    ExecTest "hf emv test" "hf emv test" {bash -lc "cd ~/client;./proxmark3 comx -c 'hf emv test'"} "Tests ?OK"
+
 
     if ($global:TestsPassed) {
       Write-Host "Tests [ OK ]" -ForegroundColor Green

From 785ab8f73ea7374cd93e7afbbe8b4c74e4646a0a Mon Sep 17 00:00:00 2001
From: bogiton <34060135+bogiton@users.noreply.github.com>
Date: Sun, 28 Oct 2018 12:01:36 +0000
Subject: [PATCH 0106/1938] Baudrate and optimization (removed counter)

---
 armsrc/Standalone/hf_bog.c | 174 +++++++++----------------------------
 1 file changed, 43 insertions(+), 131 deletions(-)

diff --git a/armsrc/Standalone/hf_bog.c b/armsrc/Standalone/hf_bog.c
index 5a279ebd9..38d08c320 100644
--- a/armsrc/Standalone/hf_bog.c
+++ b/armsrc/Standalone/hf_bog.c
@@ -8,68 +8,29 @@
 #include "hf_bog.h"
 
 #define DELAY_READER_AIR2ARM_AS_SNIFFER (2 + 3 + 8) 
-#define DELAY_TAG_AIR2ARM_AS_SNIFFER (3 + 14 + 8) 
-#define MAX_PWDS_PER_SESSION 15
+#define DELAY_TAG_AIR2ARM_AS_SNIFFER (3 + 14 + 8)
 
-uint8_t ReadCounterFromFlash() {
-	uint8_t mem = 0;
+// Maximum number of auth attempts per standalone session
+#define MAX_PWDS_PER_SESSION 20
 
-	uint8_t isok = Flash_ReadData(0, &mem, 1);
-	if (isok == 1)
+
+uint8_t FindOffsetInFlash() {
+	uint8_t mem[4] = { 0x00, 0x00, 0x00, 0x00 };
+	uint8_t eom[4] = { 0xFF, 0xFF, 0xFF, 0xFF };
+	uint8_t memcnt = 0;
+	
+	while (1)
 	{
-		return mem;
+		Flash_ReadData(memcnt, mem, 4);
+		if (memcmp(mem, eom, 4) == 0) {
+			break;
+		}
+		memcnt += 4;
 	}
 	
-	Dbprintf("Reading of counter from flashmem failed");
-	return -1;
+	return memcnt;
 }
 
-uint8_t* ReadDataFromFlash(uint8_t datacnt) {
-
-    uint16_t isok = 0;
-	
-	if (!datacnt)
-	{
-		uint8_t *tmp = BigBuf_malloc(4);
-		for (int i=0;i<4;i++)
-			tmp[i] = 0x00;
-		return tmp;
-	}
-	
-	size_t size = (datacnt + 1) * 4;
-	uint8_t *mem = BigBuf_malloc(size);
-	
-	isok = Flash_ReadData(0, mem, (datacnt + 1) * 4);
-	if (isok == ((datacnt + 1) * 4))
-	{
-		Dbprintf("[OK] Data recovered from flashmem");
-		return mem;
-	}
-
-	Dbprintf("FlashMem reading failed | isok = %d", isok);
-	SpinDelay(100);
-	return 0;
-}
-
-/*
-void WriteDataToFlash(uint8_t *data, size_t size)
-{
-    uint8_t isok = 0;
-	
-	isok = Flash_WriteData(0, data, size);
-
-	if (!isok)
-	{
-		Dbprintf("FlashMem write failed");
-		SpinDelay(100);
-
-		return;
-	}
-
-    Dbprintf("[OK] Data written to flash!");
-}
-*/
-
 void EraseMemory()
 {
     if (!FlashInit()){
@@ -80,60 +41,11 @@ void EraseMemory()
     Flash_WriteEnable();
     Flash_Erase4k(0,0);
 
-    Dbprintf("[OK] Erased flash!");
+    if (MF_DBGLEVEL > 1) Dbprintf("[!] Erased flash!");
     FlashStop();
 	SpinDelay(100);
 }
 
-
-void WriteDataToFlash(uint8_t* data, size_t size)
-{
-    uint8_t isok = 0;
-    uint16_t res = 0;
-    uint32_t len = size;
-    uint32_t bytes_sent = 0;
-    uint32_t bytes_remaining = len;
-
-    uint8_t buff[PAGESIZE];
-
-    if (!FlashInit()){
-        return;
-    }
-    
-    Flash_CheckBusy(BUSY_TIMEOUT);
-    Flash_WriteEnable();
-    Flash_Erase4k(0,0);
-
-    while (bytes_remaining > 0)
-    {
-		Flash_CheckBusy(BUSY_TIMEOUT);
-		Flash_WriteEnable();
-
-        uint32_t bytes_in_packet = MIN(FLASH_MEM_BLOCK_SIZE, bytes_remaining);
-
-        memcpy(buff, data + bytes_sent, bytes_in_packet);
-
-        bytes_remaining -= bytes_in_packet;
-        res = Flash_WriteDataCont(bytes_sent, buff, bytes_in_packet);
-        bytes_sent += bytes_in_packet;
-
-        isok = (res == bytes_in_packet) ? 1 : 0;
-
-        if (!isok)
-        {
-            Dbprintf("FlashMem write failed [offset %u]", bytes_sent);
-            SpinDelay(100);
-
-            return;
-        }
-    }
-
-    Dbprintf("[OK] Data written to flash! [0-to offset %u]", bytes_sent);
-    FlashStop();
-
-    return;
-}
-
 void RAMFUNC SniffAndStore(uint8_t param) {
 	
 	// Array to store the authpwds
@@ -242,7 +154,7 @@ void RAMFUNC SniffAndStore(uint8_t param) {
 
 					if (triggered) {
 						if ((receivedCmd) && ((receivedCmd[0] == MIFARE_ULEV1_AUTH) || (receivedCmd[0] == MIFARE_ULC_AUTH_1))) {
-							Dbprintf("PWD-AUTH KEY: 0x%02x%02x%02x%02x", receivedCmd[1], receivedCmd[2], receivedCmd[3], receivedCmd[4]);
+							if (MF_DBGLEVEL > 1) Dbprintf("PWD-AUTH KEY: 0x%02x%02x%02x%02x", receivedCmd[1], receivedCmd[2], receivedCmd[3], receivedCmd[4]);
 							
 							// temporarily save the captured pwd in our array
 							memcpy(&capturedPwds[4 * auth_attempts], receivedCmd+1, 4);
@@ -309,50 +221,51 @@ void RAMFUNC SniffAndStore(uint8_t param) {
 	
 	// Write stuff to flash
 	if (auth_attempts > 0) {
-		Dbprintf("[!] auth_attempts = %u", auth_attempts);
+		if (MF_DBGLEVEL > 1) Dbprintf("[!] Authentication attempts = %u", auth_attempts);
 		
-		// Read from flash the counter of pwds (to be used as flash mem offset)
-		uint8_t pwdcnt = 0;
-		pwdcnt = ReadCounterFromFlash();
-		if (pwdcnt == 255) {
-			// Same as zero
-			pwdcnt = 0;
-		}
-		Dbprintf("[!] PWDs Offset = %u", pwdcnt);
+		// Setting the SPI Baudrate to 48MHz to avoid the bit-flip issue (https://github.com/RfidResearchGroup/proxmark3/issues/34)
+		FlashmemSetSpiBaudrate(48000000);
 		
-		uint8_t *previousdata = ReadDataFromFlash(pwdcnt);
+		// Find the offset in flash mem to continue writing the auth attempts
+		uint8_t memoffset = FindOffsetInFlash();
+		if (MF_DBGLEVEL > 1) Dbprintf("[!] Memory offset = %u", memoffset);
 		
-		// total size = (pwdcnt+1)*4 + 4 * auth_attempts
-		size_t total_size = (pwdcnt+1)*4 + 4 * auth_attempts;
+		// Get previous data from flash mem
+		uint8_t *previousdata = BigBuf_malloc(memoffset);
+		uint16_t readlen = Flash_ReadData(0, previousdata, memoffset);
+		if (MF_DBGLEVEL > 1) Dbprintf("[!] Read %u bytes from flash mem", readlen);
+				
 		// create new bigbuf to hold all data
+		size_t total_size = memoffset + 4 * auth_attempts;
 		uint8_t *total_data = BigBuf_malloc(total_size);
 		
 		// Add the previousdata array into total_data array
-		memcpy(total_data, previousdata, sizeof(*previousdata) * ((pwdcnt+1)*4));
+		memcpy(total_data, previousdata, memoffset);
 		
 		// Copy bytes of capturedPwds immediately following bytes of previousdata
-		memcpy(total_data + ((pwdcnt+1)*4), capturedPwds, sizeof(*capturedPwds) * (4 * auth_attempts));
+		memcpy(total_data + memoffset, capturedPwds, 4 * auth_attempts);
 		
-		// change the counter byte
-		//memset (total_data,pwdcnt + auth_attempts,1);
-		total_data[0] = (uint8_t)(pwdcnt + auth_attempts);
+		// Erase first page of flash mem
+		EraseMemory();
 		
-		//EraseMemory();
+		//for (int i=0; i<memoffset + 4 * auth_attempts; i++)
+		//	if (MF_DBGLEVEL > 1) Dbprintf("[-] total_data[%d] = 0x%02x", i, total_data[i]);
 		
-		//for (int i=0;i<(pwdcnt+1)*4 + 4 * auth_attempts;i++)
-		//	Dbprintf("[!] total_data[%d] = 0x%02x", i, total_data[i]);
+		// Write total data to flash mem
+		uint16_t writelen = Flash_WriteData(0, total_data, memoffset + 4 * auth_attempts);
+		if (MF_DBGLEVEL > 1) Dbprintf("[!] Wrote %u bytes into flash mem", writelen);
 		
-		//Flash_WriteData(0, total_data, (pwdcnt+1)*4 + 4 * auth_attempts);
-		WriteDataToFlash(total_data, (pwdcnt+1)*4 + 4 * auth_attempts);
+		SpinDelay(100);
 		
-		SpinDelay(200);
+		// Reset the SPI Baudrate to the default value (24MHz)
+		FlashmemSetSpiBaudrate(24000000);
 	}
 }
 
 void RunMod()
 {
 	Dbprintf("Sniffing started");
-    SpinDelay(500);
+    SpinDelay(200);
 	
 	// param:
 	// bit 0 - trigger from first card answer
@@ -363,4 +276,3 @@ void RunMod()
 	
 	SpinDelay(300);
 }
-

From 9bd7770dfe9ee4c540f58c2af901741bd3335e58 Mon Sep 17 00:00:00 2001
From: bogiton <34060135+bogiton@users.noreply.github.com>
Date: Sun, 28 Oct 2018 12:04:44 +0000
Subject: [PATCH 0107/1938] Revert to default standalone mode

---
 armsrc/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/armsrc/Makefile b/armsrc/Makefile
index 8a576f001..d1895e7fa 100644
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -24,7 +24,7 @@ APP_CFLAGS = -DWITH_CRC \
 			 -DWITH_FLASH \
 			 -DWITH_SMARTCARD \
 			 -DWITH_HFSNOOP \
-			 -DWITH_HF_BOG \
+			 -DWITH_LF_SAMYRUN \
 			 -DWITH_FPC \
 			 -fno-strict-aliasing -ffunction-sections -fdata-sections
 

From 43f90181b3e1ded43b4a012925edac8e7a9bf17c Mon Sep 17 00:00:00 2001
From: bogiton <34060135+bogiton@users.noreply.github.com>
Date: Sun, 28 Oct 2018 13:34:42 +0000
Subject: [PATCH 0108/1938] Update hf_bog.c

---
 armsrc/Standalone/hf_bog.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/armsrc/Standalone/hf_bog.c b/armsrc/Standalone/hf_bog.c
index 38d08c320..108c7ad59 100644
--- a/armsrc/Standalone/hf_bog.c
+++ b/armsrc/Standalone/hf_bog.c
@@ -11,7 +11,7 @@
 #define DELAY_TAG_AIR2ARM_AS_SNIFFER (3 + 14 + 8)
 
 // Maximum number of auth attempts per standalone session
-#define MAX_PWDS_PER_SESSION 20
+#define MAX_PWDS_PER_SESSION 64
 
 
 uint8_t FindOffsetInFlash() {
@@ -19,16 +19,16 @@ uint8_t FindOffsetInFlash() {
 	uint8_t eom[4] = { 0xFF, 0xFF, 0xFF, 0xFF };
 	uint8_t memcnt = 0;
 	
-	while (1)
+	while (memcnt < 4096)
 	{
 		Flash_ReadData(memcnt, mem, 4);
 		if (memcmp(mem, eom, 4) == 0) {
-			break;
+			return memcnt;
 		}
 		memcnt += 4;
 	}
 	
-	return memcnt;
+	return 0; // wrap-around
 }
 
 void EraseMemory()
@@ -48,11 +48,6 @@ void EraseMemory()
 
 void RAMFUNC SniffAndStore(uint8_t param) {
 	
-	// Array to store the authpwds
-	uint8_t *capturedPwds = BigBuf_malloc(4 * MAX_PWDS_PER_SESSION);
-	
-	SpinDelay(500);
-
 	/* This is actually copied from SniffIso14443a */
 	
 	iso14443a_setup(FPGA_HF_ISO14443A_SNIFFER);
@@ -63,6 +58,9 @@ void RAMFUNC SniffAndStore(uint8_t param) {
 	clear_trace();
 	set_tracing(true);
 	
+	// Array to store the authpwds
+	uint8_t *capturedPwds = BigBuf_malloc(4 * MAX_PWDS_PER_SESSION);
+	
 	// The command (reader -> tag) that we're receiving.
 	uint8_t *receivedCmd = BigBuf_malloc(MAX_FRAME_SIZE);
 	uint8_t *receivedCmdPar = BigBuf_malloc(MAX_PARITY_SIZE);
@@ -265,7 +263,8 @@ void RAMFUNC SniffAndStore(uint8_t param) {
 void RunMod()
 {
 	Dbprintf("Sniffing started");
-    SpinDelay(200);
+	
+    	SpinDelay(200);
 	
 	// param:
 	// bit 0 - trigger from first card answer

From e14e47735512da332599afbf8fb67fb64fb45348 Mon Sep 17 00:00:00 2001
From: bogiton <34060135+bogiton@users.noreply.github.com>
Date: Sun, 28 Oct 2018 13:48:27 +0000
Subject: [PATCH 0109/1938] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 20f1c1f8f..329eda594 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [unreleased][unreleased]
+ - Added HF sniff standalone mode with optional storing of ULC/NTAG/ULEV1 authentication attempts (@bogiton)
  - Fix 'Lining up plot and control window' (@anticat)
  - Fix 'annoying focus behaviour' on OSX  (@Anticat)
  - Implemented AppNap API, fixing #283 and #627 OSX USB comm issues (@AntiCat)

From 2718e783dc219dec632e996094172a2aaaff1aa9 Mon Sep 17 00:00:00 2001
From: bogiton <34060135+bogiton@users.noreply.github.com>
Date: Sun, 28 Oct 2018 13:54:38 +0000
Subject: [PATCH 0110/1938] Added small description

---
 armsrc/Standalone/hf_bog.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/armsrc/Standalone/hf_bog.c b/armsrc/Standalone/hf_bog.c
index 108c7ad59..761e67b1a 100644
--- a/armsrc/Standalone/hf_bog.c
+++ b/armsrc/Standalone/hf_bog.c
@@ -5,6 +5,19 @@
 //-----------------------------------------------------------------------------
 // main code for standalone HF Sniff (and ULC/NTAG/ULEV1 pwd storing)
 //-----------------------------------------------------------------------------
+
+/*
+This can actually be used in two separate ways.
+It can either be used to just HF 14a sniff on the go and/or grab the 
+authentication attempts for ULC/NTAG/ULEV1 into the flash mem (RDV4).
+
+The retrieved sniffing session can be acquired by connecting the device
+to a client that supports the reconnect capability and issue 'hf 14a list'.
+
+In order to view the grabbed authentication attempts in the flash mem,
+you can simply 'mem read l 256' from the client to view the stored quadlets.
+*/
+
 #include "hf_bog.h"
 
 #define DELAY_READER_AIR2ARM_AS_SNIFFER (2 + 3 + 8) 
@@ -13,7 +26,6 @@
 // Maximum number of auth attempts per standalone session
 #define MAX_PWDS_PER_SESSION 64
 
-
 uint8_t FindOffsetInFlash() {
 	uint8_t mem[4] = { 0x00, 0x00, 0x00, 0x00 };
 	uint8_t eom[4] = { 0xFF, 0xFF, 0xFF, 0xFF };

From bb359b356747ce049d88d3e79551f17ca4b70aba Mon Sep 17 00:00:00 2001
From: indigowor2 <indigowor@now.mefound.com>
Date: Wed, 31 Oct 2018 16:56:14 +0000
Subject: [PATCH 0111/1938] changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 329eda594..9ac0e7328 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -79,6 +79,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
  - Added to `hf 14a apdu` - apdu and tlv results parser (@merlokk)
  - Added 'hf emv' commands  (@merlokk)
  - lots of bug fixes (many many)
+ - Changed hf mfp security. Now it works in all the modes. (drHatson)
 ### Fixed
 - Changed driver file proxmark3.inf to support both old and new Product/Vendor IDs (piwi)
 - Changed start sequence in Qt mode (fix: short commands hangs main Qt thread) (Merlok)

From f29c94954f0d4958ba7947d11a44f61c900d4168 Mon Sep 17 00:00:00 2001
From: indigowor2 <indigowor@now.mefound.com>
Date: Wed, 31 Oct 2018 17:39:32 +0000
Subject: [PATCH 0112/1938] merge

---
 client/cmdhfmfp.c            | 109 +++++++++++++++++++++-------
 client/mifare4.c             | 136 ++++++++++++++++++++++++++++++-----
 client/mifare4.h             |  22 ++++--
 common/polarssl/libpcrypto.c |  10 +--
 4 files changed, 222 insertions(+), 55 deletions(-)

diff --git a/client/cmdhfmfp.c b/client/cmdhfmfp.c
index cc64297e8..78cec3e2c 100644
--- a/client/cmdhfmfp.c
+++ b/client/cmdhfmfp.c
@@ -1,5 +1,6 @@
 //-----------------------------------------------------------------------------
 // Copyright (C) 2018 Merlok
+// Copyright (C) 2018 drHatson
 //
 // This code is licensed to you under the terms of the GNU GPL, version 2 or,
 // at your option, any later version. See the LICENSE.txt file for the text of
@@ -34,13 +35,15 @@ typedef struct {
 
 static const PlusErrorsElm PlusErrors[] = {
 	{0xFF, ""},
-	{0x00, "Unknown error"},
-	{0x06, "Block use error"},
-	{0x07, "Command use error"},
-	{0x08, "Invalid write command"},
-	{0x09, "Invalid block number"},
-	{0x0b, "Command code error"},
+	{0x00, "Transfer cannot be granted within the current authentication."},
+	{0x06, "Access Conditions not fulfilled. Block does not exist, block is not a value block."},
+	{0x07, "Too many read or write commands in the session or in the transaction."},
+	{0x08, "Invalid MAC in command or response"},
+	{0x09, "Block Number is not valid"},
+	{0x0a, "Invalid block number, not existing block number"},
+	{0x0b, "The current command code not available at the current card state."},
 	{0x0c, "Length error"},
+	{0x0f, "General Manipulation Error. Failure in the operation of the PICC (cannot write to the data block), etc."},
 	{0x90, "OK"},
 };
 int PlusErrorsLen = sizeof(PlusErrors) / sizeof(PlusErrorsElm);
@@ -85,17 +88,41 @@ int MFPCommitPerso(bool activateField, bool leaveSignalON, uint8_t *dataout, int
 	return intExchangeRAW14aPlus(rcmd, sizeof(rcmd), activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
 }
 
-int MFPReadBlock(mf4Session *session, bool plain, uint8_t blockNum, uint8_t blockCount, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
+int MFPReadBlock(mf4Session *session, bool plain, uint8_t blockNum, uint8_t blockCount, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen, uint8_t *mac) {
 	uint8_t rcmd[4 + 8] = {(plain?(0x37):(0x33)), blockNum, 0x00, blockCount}; 
+	if (!plain && session)
+		CalculateMAC(session, mtypReadCmd, blockNum, blockCount, rcmd, 4, &rcmd[4], VerboseMode);
 	
-	return intExchangeRAW14aPlus(rcmd, plain?4:sizeof(rcmd), activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
+	int res = intExchangeRAW14aPlus(rcmd, plain?4:sizeof(rcmd), activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
+	if(res)
+		return res;
+
+	if (session) 
+		session->R_Ctr++;
+	
+	if(session && mac && *dataoutlen > 11)
+		CalculateMAC(session, mtypReadResp, blockNum, blockCount, dataout, *dataoutlen - 8 - 2, mac, VerboseMode);
+	
+	return 0;
 }
 
-int MFPWriteBlock(mf4Session *session, uint8_t blockNum, uint8_t *data, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
+int MFPWriteBlock(mf4Session *session, uint8_t blockNum, uint8_t *data, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen, uint8_t *mac) {
 	uint8_t rcmd[1 + 2 + 16 + 8] = {0xA3, blockNum, 0x00};
 	memmove(&rcmd[3], data, 16);
+	if (session)
+		CalculateMAC(session, mtypWriteCmd, blockNum, 1, rcmd, 19, &rcmd[19], VerboseMode);
 	
-	return intExchangeRAW14aPlus(rcmd, sizeof(rcmd), activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
+	int res = intExchangeRAW14aPlus(rcmd, sizeof(rcmd), activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
+	if(res)
+		return res;
+
+	if (session) 
+		session->W_Ctr++;
+	
+	if(session && mac && *dataoutlen > 3)
+		CalculateMAC(session, mtypWriteResp, blockNum, 1, dataout, *dataoutlen, mac, VerboseMode);
+	
+	return 0;
 }
 
 int CmdHFMFPInfo(const char *cmd) {
@@ -402,7 +429,7 @@ int CmdHFMFPRdbl(const char *cmd) {
 	int keylen = 0;
 	
 	CLIParserInit("hf mfp rdbl", 
-		"Reads several blocks from Mifare Plus card in plain mode.", 
+		"Reads several blocks from Mifare Plus card.", 
 		"Usage:\n\thf mfp rdbl 0 000102030405060708090a0b0c0d0e0f -> executes authentication and read block 0 data\n"
 			"\thf mfp rdbl 1 -v -> executes authentication and shows sector 1 data with default key 0xFF..0xFF and some additional data\n");
 
@@ -411,7 +438,7 @@ int CmdHFMFPRdbl(const char *cmd) {
 		arg_lit0("vV",  "verbose", "show internal data."),
 		arg_int0("nN",  "count",   "blocks count (by default 1).", NULL),
 		arg_lit0("bB",  "keyb",    "use key B (by default keyA)."),
-		arg_lit0("pP",  "plain",   "plain communication between reader and card."),
+		arg_lit0("pP",  "plain",   "plain communication mode between reader and card."),
 		arg_int1(NULL,  NULL,      "<Block Num (0..255)>", NULL),
 		arg_str0(NULL,  NULL,      "<Key Value (HEX 16 bytes)>", NULL),
 		arg_param_end
@@ -421,7 +448,7 @@ int CmdHFMFPRdbl(const char *cmd) {
 	bool verbose = arg_get_lit(1);
 	int blocksCount = arg_get_int_def(2, 1);
 	bool keyB = arg_get_lit(3);
-	int plain = arg_get_lit(4) | true;
+	int plain = arg_get_lit(4);
 	uint32_t blockn = arg_get_int(5);
 	CLIGetHexWithReturn(6, key, &keylen);
 	CLIParserFree();
@@ -449,6 +476,10 @@ int CmdHFMFPRdbl(const char *cmd) {
 		return 1;
 	}
 	
+	if (blocksCount > 1 && mfIsSectorTrailer(blockn)) {
+		PrintAndLog("WARNING: trailer!");
+	}
+	
 	uint8_t sectorNum = mfSectorNum(blockn & 0xff);
 	uint16_t uKeyNum = 0x4000 + sectorNum * 2 + (keyB ? 1 : 0);
 	keyn[0] = uKeyNum >> 8;
@@ -465,7 +496,8 @@ int CmdHFMFPRdbl(const char *cmd) {
 	
 	uint8_t data[250] = {0};
 	int datalen = 0;
-	res = MFPReadBlock(&session, plain, blockn & 0xff, blocksCount, false, false, data, sizeof(data), &datalen);
+	uint8_t mac[8] = {0};
+	res = MFPReadBlock(&session, plain, blockn & 0xff, blocksCount, false, false, data, sizeof(data), &datalen, mac);
 	if (res) {
 		PrintAndLogEx(ERR, "Read error: %d", res);
 		return res;
@@ -485,14 +517,20 @@ int CmdHFMFPRdbl(const char *cmd) {
 	for(int i = 0; i < blocksCount; i++)  {
 		PrintAndLogEx(INFO, "data[%03d]: %s", indx, sprint_hex(&data[1 + i * 16], 16));
 		indx++;
-		if (mfIsSectorTrailer(indx)){
+		if (mfIsSectorTrailer(indx) && i != blocksCount - 1){
 			PrintAndLogEx(INFO, "data[%03d]: ------------------- trailer -------------------", indx);
 			indx++;
 		}
 	}
 
+	if (memcmp(&data[blocksCount * 16 + 1], mac, 8)) {
+		PrintAndLogEx(WARNING, "WARNING: mac not equal...");
+		PrintAndLogEx(WARNING, "MAC   card: %s", sprint_hex(&data[blocksCount * 16 + 1], 8));
+		PrintAndLogEx(WARNING, "MAC reader: %s", sprint_hex(mac, 8));
+	} else {	
 	if(verbose)
-		PrintAndLogEx(INFO, "MAC: %s", sprint_hex(&data[blocksCount * 16 + 1], 8));
+			PrintAndLogEx(INFO, "MAC: %s", sprint_hex(&data[blocksCount * 16 + 1], 8));
+	}
 	
 	return 0;
 }
@@ -503,7 +541,7 @@ int CmdHFMFPRdsc(const char *cmd) {
 	int keylen = 0;
 	
 	CLIParserInit("hf mfp rdsc", 
-		"Reads one sector from Mifare Plus card in plain mode.", 
+		"Reads one sector from Mifare Plus card.", 
 		"Usage:\n\thf mfp rdsc 0 000102030405060708090a0b0c0d0e0f -> executes authentication and read sector 0 data\n"
 			"\thf mfp rdsc 1 -v -> executes authentication and shows sector 1 data with default key 0xFF..0xFF and some additional data\n");
 
@@ -511,7 +549,7 @@ int CmdHFMFPRdsc(const char *cmd) {
 		arg_param_begin,
 		arg_lit0("vV",  "verbose", "show internal data."),
 		arg_lit0("bB",  "keyb",    "use key B (by default keyA)."),
-		arg_lit0("pP",  "plain",   "plain communication between reader and card."),
+		arg_lit0("pP",  "plain",   "plain communication mode between reader and card."),
 		arg_int1(NULL,  NULL,      "<Sector Num (0..255)>", NULL),
 		arg_str0(NULL,  NULL,      "<Key Value (HEX 16 bytes)>", NULL),
 		arg_param_end
@@ -520,7 +558,7 @@ int CmdHFMFPRdsc(const char *cmd) {
 	
 	bool verbose = arg_get_lit(1);
 	bool keyB = arg_get_lit(2);
-	bool plain = arg_get_lit(3) | true;
+	bool plain = arg_get_lit(3);
 	uint32_t sectorNum = arg_get_int(4);
 	CLIGetHexWithReturn(5, key, &keylen);
 	CLIParserFree();
@@ -557,8 +595,9 @@ int CmdHFMFPRdsc(const char *cmd) {
 	
 	uint8_t data[250] = {0};
 	int datalen = 0;
+	uint8_t mac[8] = {0};
 	for(int n = mfFirstBlockOfSector(sectorNum); n < mfFirstBlockOfSector(sectorNum) + mfNumBlocksPerSector(sectorNum); n++) {
-		res = MFPReadBlock(&session, plain, n & 0xff, 1, false, true, data, sizeof(data), &datalen);
+		res = MFPReadBlock(&session, plain, n & 0xff, 1, false, true, data, sizeof(data), &datalen, mac);
 		if (res) {
 			PrintAndLogEx(ERR, "Read error: %d", res);
 			DropField();
@@ -578,8 +617,14 @@ int CmdHFMFPRdsc(const char *cmd) {
 
 		PrintAndLogEx(INFO, "data[%03d]: %s", n, sprint_hex(&data[1], 16));
 			
-		if(verbose)
-			PrintAndLogEx(INFO, "MAC: %s", sprint_hex(&data[1 + 16], 8));
+		if (memcmp(&data[1 + 16], mac, 8)) {
+			PrintAndLogEx(WARNING, "WARNING: mac on block %d not equal...", n);
+			PrintAndLogEx(WARNING, "MAC   card: %s", sprint_hex(&data[1 + 16], 8));
+			PrintAndLogEx(WARNING, "MAC reader: %s", sprint_hex(mac, 8));
+		} else {	
+			if(verbose)
+				PrintAndLogEx(INFO, "MAC: %s", sprint_hex(&data[1 + 16], 8));
+		}
 	}
 	DropField();
 	
@@ -654,25 +699,37 @@ int CmdHFMFPWrbl(const char *cmd) {
 
 	uint8_t data[250] = {0};
 	int datalen = 0;
-	res = MFPWriteBlock(&session, blockNum & 0xff, datain, false, false, data, sizeof(data), &datalen);
+	uint8_t mac[8] = {0};
+	res = MFPWriteBlock(&session, blockNum & 0xff, datain, false, false, data, sizeof(data), &datalen, mac);
 	if (res) {
 		PrintAndLogEx(ERR, "Write error: %d", res);
+		DropField();
 		return res;
 	}
 	
 	if (datalen != 3 && (datalen != 3 + 8)) {
 		PrintAndLogEx(ERR, "Error return length:%d", datalen);
+		DropField();
 		return 5;
 	}
 	
 	if (datalen && data[0] != 0x90) {
 		PrintAndLogEx(ERR, "Card write error: %02x %s", data[0], GetErrorDescription(data[0]));
+		DropField();
 		return 6;
 	}
 	
-	if(verbose)
-		PrintAndLogEx(INFO, "MAC: %s", sprint_hex(&data[1], 8));
+	if (memcmp(&data[1], mac, 8)) {
+		PrintAndLogEx(WARNING, "WARNING: mac not equal...");
+		PrintAndLogEx(WARNING, "MAC   card: %s", sprint_hex(&data[1], 8));
+		PrintAndLogEx(WARNING, "MAC reader: %s", sprint_hex(mac, 8));
+	} else {	
+		if(verbose)
+			PrintAndLogEx(INFO, "MAC: %s", sprint_hex(&data[1], 8));
+	}
 	
+	DropField();
+	PrintAndLogEx(INFO, "Write OK.");	
 	return 0;
 }
 
@@ -686,7 +743,7 @@ static command_t CommandTable[] =
   {"auth",  	       CmdHFMFPAuth,			0, "Authentication"},
   {"rdbl",  	       CmdHFMFPRdbl,			0, "Read blocks"},
   {"rdsc",  	       CmdHFMFPRdsc,			0, "Read sectors"},
-//  {"wrbl",  	       CmdHFMFPWrbl,			0, "Write blocks"},
+  {"wrbl",  	       CmdHFMFPWrbl,			0, "Write blocks"},
   {NULL,               NULL,					0, NULL}
 };
 
diff --git a/client/mifare4.c b/client/mifare4.c
index 2ca28cb3f..8f9bd9e67 100644
--- a/client/mifare4.c
+++ b/client/mifare4.c
@@ -1,5 +1,6 @@
 //-----------------------------------------------------------------------------
 // Copyright (C) 2018 Merlok
+// Copyright (C) 2018 drHatson
 //
 // This code is licensed to you under the terms of the GNU GPL, version 2 or,
 // at your option, any later version. See the LICENSE.txt file for the text of
@@ -16,24 +17,85 @@
 #include "ui.h"
 #include "polarssl/libpcrypto.h"
 
-int CalulateMAC(mf4Session *session, uint8_t *data, int datalen, uint8_t *mac, bool verbose) {
-	if (!session || !session->Authenticated || !mac || !data || !datalen)
+int CalculateEncIVCommand(mf4Session *session, uint8_t *iv, bool verbose) {
+	memcpy(&iv[0], session->TI, 4);
+	memcpy(&iv[4], &session->R_Ctr, 2);
+	memcpy(&iv[6], &session->W_Ctr, 2);
+	memcpy(&iv[8], &session->R_Ctr, 2);
+	memcpy(&iv[10], &session->W_Ctr, 2);
+	memcpy(&iv[12], &session->R_Ctr, 2);
+	memcpy(&iv[14], &session->W_Ctr, 2);
+
+	return 0;
+}
+
+int CalculateEncIVResponse(mf4Session *session, uint8_t *iv, bool verbose) {
+	memcpy(&iv[0], &session->R_Ctr, 2);
+	memcpy(&iv[2], &session->W_Ctr, 2);
+	memcpy(&iv[4], &session->R_Ctr, 2);
+	memcpy(&iv[6], &session->W_Ctr, 2);
+	memcpy(&iv[8], &session->R_Ctr, 2);
+	memcpy(&iv[10], &session->W_Ctr, 2);
+	memcpy(&iv[12], session->TI, 4);
+
+	return 0;
+}
+
+
+int CalculateMAC(mf4Session *session, MACType_t mtype, uint8_t blockNum, uint8_t blockCount, uint8_t *data, int datalen, uint8_t *mac, bool verbose) {
+	if (!session || !session->Authenticated || !mac || !data || !datalen || datalen < 1)
 		return 1;
 	
 	memset(mac, 0x00, 8);
 	
-	if (verbose)
-		PrintAndLog("MAC data[%d]: %s", datalen, sprint_hex(data, datalen));
+	uint16_t ctr = session->R_Ctr;
+	switch(mtype) {
+	case mtypWriteCmd:
+	case mtypWriteResp:
+		ctr = session->W_Ctr;
+		break;
+	case mtypReadCmd:
+	case mtypReadResp:
+		break;
+	}
+
+	uint8_t macdata[2049] = {data[0], (ctr & 0xFF), (ctr >> 8), 0};
+	int macdatalen = datalen;
+	memcpy(&macdata[3], session->TI, 4);
+
+	switch(mtype) {
+	case mtypReadCmd:
+		memcpy(&macdata[7], &data[1], datalen - 1);
+		macdatalen = datalen + 6;
+		break;
+	case mtypReadResp:
+		macdata[7] = blockNum;
+		macdata[8] = 0;
+		macdata[9] = blockCount;
+		memcpy(&macdata[10], &data[1], datalen - 1);
+		macdatalen = datalen + 9;
+		break;
+	case mtypWriteCmd:
+		memcpy(&macdata[7], &data[1], datalen - 1);
+		macdatalen = datalen + 6;
+		break;
+	case mtypWriteResp:
+		macdatalen = 1 + 6;
+		break;
+	}
 	
-	return aes_cmac8(NULL, session->Key, data, mac, datalen);
+	if (verbose)
+		PrintAndLog("MAC data[%d]: %s", macdatalen, sprint_hex(macdata, macdatalen));
+	
+	return aes_cmac8(NULL, session->Kmac, macdata, mac, macdatalen);
 }
 
 int MifareAuth4(mf4Session *session, uint8_t *keyn, uint8_t *key, bool activateField, bool leaveSignalON, bool verbose) {
 	uint8_t data[257] = {0};
 	int datalen = 0;
 	
-	uint8_t Rnd1[17] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x00};
-	uint8_t Rnd2[17] = {0};
+	uint8_t RndA[17] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x00};
+	uint8_t RndB[17] = {0};
 	
 	if (session)
 		session->Authenticated = false;	
@@ -67,17 +129,17 @@ int MifareAuth4(mf4Session *session, uint8_t *keyn, uint8_t *key, bool activateF
 		return 3;
 	}
 	
-    aes_decode(NULL, key, &data[1], Rnd2, 16);
-	Rnd2[16] = Rnd2[0];
+    aes_decode(NULL, key, &data[1], RndB, 16);
+	RndB[16] = RndB[0];
 	if (verbose)
-		PrintAndLogEx(INFO, "Rnd2: %s", sprint_hex(Rnd2, 16));
+		PrintAndLogEx(INFO, "RndB: %s", sprint_hex(RndB, 16));
 
 	uint8_t cmd2[33] = {0};
 	cmd2[0] = 0x72;
 
 	uint8_t raw[32] = {0};
-	memmove(raw, Rnd1, 16);
-	memmove(&raw[16], &Rnd2[1], 16);
+	memmove(raw, RndA, 16);
+	memmove(&raw[16], &RndB[1], 16);
 
 	aes_encode(NULL, key, raw, &cmd2[1], 32);
 	if (verbose)
@@ -97,19 +159,49 @@ int MifareAuth4(mf4Session *session, uint8_t *keyn, uint8_t *key, bool activateF
 	
 	if (verbose) {
 		PrintAndLogEx(INFO, "res: %s", sprint_hex(raw, 32));
-		PrintAndLogEx(INFO, "Rnd1`: %s", sprint_hex(&raw[4], 16));
+		PrintAndLogEx(INFO, "RndA`: %s", sprint_hex(&raw[4], 16));
 	}
 
-	if (memcmp(&raw[4], &Rnd1[1], 16)) {
+	if (memcmp(&raw[4], &RndA[1], 16)) {
 		PrintAndLogEx(ERR, "\nAuthentication FAILED. rnd not equal");
 		if (verbose) {
-			PrintAndLogEx(ERR, "rnd1 reader: %s", sprint_hex(&Rnd1[1], 16));
-			PrintAndLogEx(ERR, "rnd1   card: %s", sprint_hex(&raw[4], 16));
+			PrintAndLogEx(ERR, "RndA reader: %s", sprint_hex(&RndA[1], 16));
+			PrintAndLogEx(ERR, "RndA   card: %s", sprint_hex(&raw[4], 16));
 		}
 		DropField();
 		return 5;
 	}
 
+	if (verbose) {
+		PrintAndLogEx(INFO, " TI: %s", sprint_hex(raw, 4));
+		PrintAndLogEx(INFO, "pic: %s", sprint_hex(&raw[20], 6));
+		PrintAndLogEx(INFO, "pcd: %s", sprint_hex(&raw[26], 6));
+	}
+	
+	uint8_t kenc[16] = {0};
+	memcpy(&kenc[0], &RndA[11], 5);
+	memcpy(&kenc[5], &RndB[11], 5);
+	for(int i = 0; i < 5; i++)
+		kenc[10 + i] = RndA[4 + i] ^ RndB[4 + i];
+	kenc[15] = 0x11;
+	
+	aes_encode(NULL, key, kenc, kenc, 16);
+	if (verbose) {
+		PrintAndLogEx(INFO, "kenc: %s", sprint_hex(kenc, 16));
+	}
+	
+	uint8_t kmac[16] = {0};
+	memcpy(&kmac[0], &RndA[7], 5);
+	memcpy(&kmac[5], &RndB[7], 5);
+	for(int i = 0; i < 5; i++)
+		kmac[10 + i] = RndA[0 + i] ^ RndB[0 + i];
+	kmac[15] = 0x22;
+	
+	aes_encode(NULL, key, kmac, kmac, 16);
+	if (verbose) {
+		PrintAndLogEx(INFO, "kmac: %s", sprint_hex(kmac, 16));
+	}	
+	
 	if (!leaveSignalON)
 		DropField();
 
@@ -118,9 +210,17 @@ int MifareAuth4(mf4Session *session, uint8_t *keyn, uint8_t *key, bool activateF
 
 	if (session) {
 		session->Authenticated = true;
+		session->R_Ctr = 0;
+		session->W_Ctr = 0;
 		session->KeyNum = keyn[1] + (keyn[0] << 8);
-		memmove(session->Rnd1, Rnd1, 16);
-		memmove(session->Rnd2, Rnd2, 16);
+		memmove(session->RndA, RndA, 16);
+		memmove(session->RndB, RndB, 16);
+		memmove(session->Key, key, 16);
+		memmove(session->TI, raw, 4);
+		memmove(session->PICCap2, &raw[20], 6);
+		memmove(session->PCDCap2, &raw[26], 6);
+		memmove(session->Kenc, kenc, 16);
+		memmove(session->Kmac, kmac, 16);
 	}
 	
 	PrintAndLogEx(INFO, "Authentication OK");
diff --git a/client/mifare4.h b/client/mifare4.h
index 7867add5d..b85d512f1 100644
--- a/client/mifare4.h
+++ b/client/mifare4.h
@@ -1,5 +1,6 @@
 //-----------------------------------------------------------------------------
 // Copyright (C) 2018 Merlok
+// Copyright (C) 2018 drHatson
 //
 // This code is licensed to you under the terms of the GNU GPL, version 2 or,
 // at your option, any later version. See the LICENSE.txt file for the text of
@@ -19,12 +20,25 @@ typedef struct {
 	bool Authenticated;
 	uint8_t Key[16];
 	uint16_t KeyNum;
-	uint8_t Rnd1[16];
-	uint8_t Rnd2[16];
-	
+	uint8_t RndA[16];
+	uint8_t RndB[16];
+	uint8_t TI[4];
+	uint8_t PICCap2[6];
+	uint8_t PCDCap2[6];
+	uint8_t Kenc[16];
+	uint8_t Kmac[16];
+	uint16_t R_Ctr;
+	uint16_t W_Ctr;
 }mf4Session;
+	
+typedef enum {
+	mtypReadCmd,
+	mtypReadResp,
+	mtypWriteCmd,
+	mtypWriteResp,
+} MACType_t;
 
-extern int CalulateMAC(mf4Session *session, uint8_t *data, int datalen, uint8_t *mac, bool verbose);
+extern int CalculateMAC(mf4Session *session, MACType_t mtype, uint8_t blockNum, uint8_t blockCount, uint8_t *data, int datalen, uint8_t *mac, bool verbose);
 extern int MifareAuth4(mf4Session *session, uint8_t *keyn, uint8_t *key, bool activateField, bool leaveSignalON, bool verbose);
 
 extern uint8_t mfNumBlocksPerSector(uint8_t sectorNo);
diff --git a/common/polarssl/libpcrypto.c b/common/polarssl/libpcrypto.c
index d86c97568..0dea75fac 100644
--- a/common/polarssl/libpcrypto.c
+++ b/common/polarssl/libpcrypto.c
@@ -1,5 +1,6 @@
 //-----------------------------------------------------------------------------
 // Copyright (C) 2018 Merlok
+// Copyright (C) 2018 drHatson
 //
 // This code is licensed to you under the terms of the GNU GPL, version 2 or,
 // at your option, any later version. See the LICENSE.txt file for the text of
@@ -12,6 +13,7 @@
 #include <polarssl/aes.h>
 #include <polarssl/aes_cmac128.h>
 
+// NIST Special Publication 800-38A � Recommendation for block cipher modes of operation: methods and techniques, 2001.
 int aes_encode(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *output, int length){
 	uint8_t iiv[16] = {0};
 	if (iv)
@@ -52,16 +54,10 @@ int aes_cmac(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *mac, int length
 	if (iv)
 		memcpy(iiv, iv, 16);
 	
-	// padding:  ISO/IEC 9797-1 Message Authentication Codes (MACs) - Part 1: Mechanisms using a block cipher
-	uint8_t data[2049] = {0}; // length + 16
-	memcpy(data, input, length);
-	data[length] = 0x80;
-	int datalen = (length & 0xfffffff0) + 0x10;
-	
 	//  NIST 800-38B 
 	aes_cmac128_context ctx;
 	aes_cmac128_starts(&ctx, key);
-	aes_cmac128_update(&ctx, data, datalen);
+	aes_cmac128_update(&ctx, input, length);
 	aes_cmac128_final(&ctx, mac);
 
 	return 0;

From 4da4b33d8d3768389dd59479cf6e779377bda856 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Thu, 1 Nov 2018 19:51:45 +0100
Subject: [PATCH 0113/1938] fix: 'lf t55xx deviceconfig' - bug that failed to
 load default values if wiped flashmem.

---
 armsrc/lfops.c | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index 18e178c1f..021fc2411 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -90,9 +90,9 @@ void setT55xxConfig(uint8_t arg0, t55xx_config *c) {
         return;
 	}
 	
-	uint8_t *buf = BigBuf_malloc(4096);
+	uint8_t *buf = BigBuf_malloc(T55XX_CONFIG_LEN);
 	Flash_CheckBusy(BUSY_TIMEOUT);
-	uint16_t res = Flash_ReadDataCont(T55XX_CONFIG_OFFSET, buf, 4096);
+	uint16_t res = Flash_ReadDataCont(T55XX_CONFIG_OFFSET, buf, T55XX_CONFIG_LEN);
 	if ( res == 0) {
 		FlashStop();
 		BigBuf_free();
@@ -104,9 +104,9 @@ void setT55xxConfig(uint8_t arg0, t55xx_config *c) {
 	Flash_CheckBusy(BUSY_TIMEOUT);
     Flash_WriteEnable();
 	Flash_Erase4k(3, 0xD);	
-	res = Flash_Write(T55XX_CONFIG_OFFSET, buf, 4096);
+	res = Flash_Write(T55XX_CONFIG_OFFSET, buf, T55XX_CONFIG_LEN);
 
-	if ( res == 4096 && MF_DBGLEVEL > 1) {
+	if ( res == T55XX_CONFIG_LEN && MF_DBGLEVEL > 1) {
 		DbpString("T55XX Config save success");
 	}
 	
@@ -124,10 +124,25 @@ void loadT55xxConfig(void) {
         return;
 	}
 
+	uint8_t *buf = BigBuf_malloc(T55XX_CONFIG_LEN);
+	
 	Flash_CheckBusy(BUSY_TIMEOUT);
-	uint16_t isok = Flash_ReadDataCont(T55XX_CONFIG_OFFSET, (uint8_t *)&t_config, T55XX_CONFIG_LEN);
+	uint16_t isok = Flash_ReadDataCont(T55XX_CONFIG_OFFSET, buf, T55XX_CONFIG_LEN);
 	FlashStop();
-
+	
+	// verify read mem is actual data.
+	uint8_t cntA = T55XX_CONFIG_LEN, cntB = T55XX_CONFIG_LEN;
+	for (int i=0; i< T55XX_CONFIG_LEN; i++) {
+		if ( buf[i] == 0xFF) cntA--;
+		if ( buf[i] == 0x00) cntB--;
+	}
+	if ( !cntA || !cntB ) {
+		BigBuf_free();
+		return;
+	}
+	
+	memcpy((uint8_t *)&t_config, buf, T55XX_CONFIG_LEN);
+	
 	if ( isok == T55XX_CONFIG_LEN) {
 		if (MF_DBGLEVEL > 1) DbpString("T55XX Config load success");
 	}

From d30454fc5af3c3dbe684d01d99c17efbdf186dc9 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Fri, 2 Nov 2018 18:27:42 +0100
Subject: [PATCH 0114/1938] fix: fflush(stdout), should sort out the blocking
 pipe problem add:  line length (@merlokk)

---
 client/comms.c     |  6 +++---
 client/proxmark3.c | 12 +++++++-----
 client/ui.c        | 19 ++++++++-----------
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/client/comms.c b/client/comms.c
index e297e9057..7204aa1c4 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -107,7 +107,7 @@ static void storeCommand(UsbCommand *command) {
         //If these two are equal, we're about to overwrite in the
         // circular buffer.
         PrintAndLogEx(FAILED, "WARNING: Command buffer about to overwrite command! This needs to be fixed!");
-		fflush(NULL);
+		fflush(stdout);
     }
     //Store the command at the 'head' location
     UsbCommand* destination = &rxBuffer[cmd_head];
@@ -185,7 +185,7 @@ static void UsbCommandReceived(UsbCommand* c) {
 			} else {
 				PrintAndLogEx(NORMAL, "#db# %s", s);
 			}
-			fflush(NULL);
+			fflush(stdout);
 			break;
 		}
 		case CMD_DEBUG_PRINT_INTEGERS: {
@@ -339,7 +339,7 @@ bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode)
 		pthread_create(&USB_communication_thread, NULL, &uart_communication, &conn);		
 		//pthread_create(&FPC_communication_thread, NULL, &uart_communication, &conn);
 
-		fflush(NULL);
+		fflush(stdout);
 		// create a mutex to avoid interlacing print commands from our different threads
 		//pthread_mutex_init(&print_lock, NULL);
 		return true;
diff --git a/client/proxmark3.c b/client/proxmark3.c
index ae528a9e9..6f664f4ce 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -40,7 +40,7 @@ static void showBanner(void){
 	printf("\nKeep iceman fork alive with a donation!           https://paypal.me/iceman1001/");
 	printf("\nMONERO: 43mNJLpgBVaTvyZmX9ajcohpvVkaRy1kbZPm8tqAb7itZgfuYecgkRF36rXrKFUkwEGeZedPsASRxgv4HPBHvJwyJdyvQuP");
 	printf("\n\n\n");
-	fflush(NULL);
+	fflush(stdout);
 }
 #endif
 
@@ -260,6 +260,8 @@ int main(int argc, char* argv[]) {
 
 	 /* initialize history */
 	using_history();
+
+  	rl_extend_line_buffer(1024);		
   
 	if (argc < 2) {
 		show_help(true, argv[0]);
@@ -282,23 +284,23 @@ int main(int argc, char* argv[]) {
 		}	   
 
 		// flush output
-		if(strcmp(argv[i], "-f") == 0 || strcmp(argv[i], "-flush") == 0){
+		if (strcmp(argv[i], "-f") == 0 || strcmp(argv[i], "-flush") == 0){
 			SetFlushAfterWrite(true);
 			PrintAndLogEx(INFO, "Output will be flushed after every print.\n");
 		}
 		
 		// wait for comport
-		if(strcmp(argv[i], "-w") == 0 || strcmp(argv[i], "-wait") == 0){
+		if (strcmp(argv[i], "-w") == 0 || strcmp(argv[i], "-wait") == 0){
 			waitCOMPort = true;
 		}
 
 		// execute pm3 command
-		if(strcmp(argv[i], "-c") == 0 || strcmp(argv[i], "-command") == 0){
+		if (strcmp(argv[i], "-c") == 0 || strcmp(argv[i], "-command") == 0){
 			executeCommand = true;
 		}
 
 		// execute lua script
-		if(strcmp(argv[i], "-l") == 0 || strcmp(argv[i], "-lua") == 0){
+		if (strcmp(argv[i], "-l") == 0 || strcmp(argv[i], "-lua") == 0){
 			executeCommand = true;
 			addLuaExec = true;
 		}
diff --git a/client/ui.c b/client/ui.c
index a8b45273d..070f75b7a 100644
--- a/client/ui.c
+++ b/client/ui.c
@@ -25,23 +25,20 @@ void PrintAndLogOptions(char *str[][2], size_t size, size_t space) {
 	char buff[2000] = "Options:\n";
 	char format[2000] = "";
 	size_t counts[2] = {0, 0};
-	for(int i = 0; i < size; i++)
-		for(int j = 0 ; j < 2 ; j++)
-			if(counts[j] < strlen(str[i][j]))
-			{
+	for (int i = 0; i < size; i++)
+		for (int j = 0 ; j < 2 ; j++)
+			if (counts[j] < strlen(str[i][j])) {
 				counts[j] = strlen(str[i][j]);
 			}
-	for(int i = 0; i < size; i++)
-    {
-		for(int j = 0; j < 2; j++)
-		{
-			if(j == 0)
+	for (int i = 0; i < size; i++) {
+		for (int j = 0; j < 2; j++) {
+			if (j == 0)
 			    snprintf(format, sizeof(format), "%%%zus%%%zus", space, counts[j]);
             else
                 snprintf(format, sizeof(format), "%%%zus%%-%zus", space, counts[j]);
 			snprintf(buff + strlen(buff), sizeof(buff) - strlen(buff), format, " ", str[i][j]);
 		}
-		if(i<size-1)
+		if (i < size-1)
 			strncat(buff, "\n", sizeof(buff)-strlen(buff) -1);
     }
     PrintAndLogEx(NORMAL, buff);
@@ -178,7 +175,7 @@ void PrintAndLog(char *fmt, ...) {
 	va_end(argptr2);
 
 	if (flushAfterWrite)
-		fflush(NULL);
+		fflush(stdout);
 
 	//release lock
 	pthread_mutex_unlock(&print_lock);  

From b9676e6c93ee63f4dcaa4b1b20adebe5418c493a Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Fri, 2 Nov 2018 18:38:06 +0100
Subject: [PATCH 0115/1938] chg: use signal mean instead of hardcoded
 FSK_PSK_THRESHOLD chg: stricter clock identification chg: askclock detection,
 trying to find a better starting point

---
 common/lfdemod.c | 72 ++++++++++++++++++++++++++++--------------------
 common/lfdemod.h |  2 +-
 2 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/common/lfdemod.c b/common/lfdemod.c
index 8f0630d52..4714cdb69 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -320,14 +320,14 @@ size_t findModStart(uint8_t *src, size_t size, uint8_t expWaveSize) {
 	size_t i = 0;
 	size_t waveSizeCnt = 0;
 	uint8_t thresholdCnt = 0;
-	bool isAboveThreshold = src[i++] >= FSK_PSK_THRESHOLD;
+	bool isAboveThreshold = src[i++] >= signalprop.mean; //FSK_PSK_THRESHOLD;
 	for (; i < size-20; i++ ) {
-		if(src[i] < FSK_PSK_THRESHOLD && isAboveThreshold) {
+		if(src[i] < signalprop.mean && isAboveThreshold) {
 			thresholdCnt++;
 			if (thresholdCnt > 2 && waveSizeCnt < expWaveSize+1) break;			
 			isAboveThreshold = false;
 			waveSizeCnt = 0;
-		} else if (src[i] >= FSK_PSK_THRESHOLD && !isAboveThreshold) {
+		} else if (src[i] >= signalprop.mean && !isAboveThreshold) {
 			thresholdCnt++;
 			if (thresholdCnt > 2 && waveSizeCnt < expWaveSize+1) break;			
 			isAboveThreshold = true;
@@ -337,15 +337,24 @@ size_t findModStart(uint8_t *src, size_t size, uint8_t expWaveSize) {
 		}
 		if (thresholdCnt > 10) break;
 	}
-	if (g_debugMode == 2) prnt("DEBUG: threshold Count reached at %u, count: %u", i, thresholdCnt);
+	if (g_debugMode == 2) prnt("DEBUG: threshold Count reached at index %u, count: %u", i, thresholdCnt);
 	return i;
 }
 
+// iceman:  ranges the old defintion,  becomes very forgiving when clock speed increase.
+//  clocks[i] - (clocks[i]/8) && testclk <= clocks[i]+1 )
+//  8 (7-9)
+// 16 (14-17)
+// 32 (28-33)
+// 40 (35-41)
+// 50 (46-51)
+// 64 (56-65)
+// 128 (112-129)
 int getClosestClock(int testclk) {
 	uint8_t clocks[] = {8,16,32,40,50,64,128};
 
 	for (uint8_t i = 0; i < 7; i++)
-		if ( testclk >= clocks[i] - (clocks[i]/8) && testclk <= clocks[i]+1 )
+		if ( testclk >= clocks[i]-2 && testclk <= clocks[i]+1 )
 			return clocks[i];
 
 	return 0;
@@ -474,7 +483,7 @@ int ManchesterEncode(uint8_t *bits, size_t size) {
 
 // by marshmellow
 // to detect a wave that has heavily clipped (clean) samples
-// loop 512 samples,   if 300 of them is deemed maxed out,  we assume the wave is clipped.
+// loop 512 samples,   if 250 of them is deemed maxed out,  we assume the wave is clipped.
 bool DetectCleanAskWave(uint8_t *dest, size_t size, uint8_t high, uint8_t low) {
 	bool allArePeaks = true;
 	uint16_t cntPeaks = 0;
@@ -516,8 +525,8 @@ int DetectStrongAskClock(uint8_t *dest, size_t size, int high, int low, int *clo
 	getNextHigh(dest, size, high, &i);
 	getNextLow(dest, size, low, &i);
 	
-	// loop through all samples
-	while (i < size) {
+	// loop through all samples (well, we don't want to go out-of-bounds)
+	while (i < size-512) {
 		// measure from low to low
 		startwave = i;
 
@@ -562,36 +571,35 @@ int DetectASKClock(uint8_t *dest, size_t size, int *clock, int maxErr) {
 
 	// just noise - no super good detection. good enough
 	if (signalprop.isnoise) {
-		if (g_debugMode == 2) prnt("DEBUG DetectASKClock: just noise detected - quitting");
+		if (g_debugMode == 2) prnt("DEBUG DetectASKClock: just noise detected - aborting");
 		return -1;
 	}
 	
 	//get high and low peak
 	int peak_hi, peak_low;
-	//getHiLo(dest, loopCnt, &peak_hi, &peak_low, 75, 75);
 	getHiLo(&peak_hi, &peak_low, 75, 75);
 	
 	//test for large clean peaks
 	if (!clockFnd){
 		if (DetectCleanAskWave(dest, size, peak_hi, peak_low)){
 		
-			int ans = DetectStrongAskClock(dest, size, peak_hi, peak_low, clock);
-			if (g_debugMode == 2) prnt("DEBUG ASK: detectaskclk Clean Ask Wave Detected: clk %i, ShortestWave: %i", *clock ,ans);
-			if (ans > 0){
-				return ans; //return shortest wave start position
-			}
+			int idx = DetectStrongAskClock(dest, size, peak_hi, peak_low, clock);
+			if (g_debugMode == 2) 
+				prnt("DEBUG ASK: detectaskclk Clean Ask Wave Detected: clk %i, Best Starting Position: %i", *clock, idx);
+			if (idx > 0)
+				return idx; //return shortest wave start position
+
 		}
 	}
 	// test clock if given as cmd parameter
 	if ( *clock > 0 )
 		clk[0] = *clock;
 	
-	uint16_t ii;
 	uint8_t clkCnt, tol = 0;
+	size_t j = 0;
 	uint16_t bestErr[] = {1000,1000,1000,1000,1000,1000,1000,1000,1000};
 	uint8_t bestStart[] = {0,0,0,0,0,0,0,0,0};
-	size_t errCnt = 0;
-	size_t arrLoc, loopEnd;
+	size_t errCnt = 0, arrLoc, loopEnd;
 
 	if (clockFnd > 0) {
 		clkCnt = clockFnd;
@@ -614,14 +622,17 @@ int DetectASKClock(uint8_t *dest, size_t size, int *clock, int maxErr) {
 		bestErr[clkCnt] = 1000;
 
 		//try lining up the peaks by moving starting point (try first few clocks)
-		for (ii=0; ii < loopCnt; ii++){
-			if (dest[ii] < peak_hi && dest[ii] > peak_low) continue;
 
+		// get to first full low to prime loop and skip incomplete first pulse
+		getNextHigh(dest, size, peak_hi, &j);
+		getNextLow(dest, size, peak_low, &j);
+	
+		for (; j < loopCnt; j++){
 			errCnt = 0;
 			// now that we have the first one lined up test rest of wave array
-			loopEnd = ((size-ii-tol) / clk[clkCnt]) - 1;
+			loopEnd = ((size-j-tol) / clk[clkCnt]) - 1;
 			for (i=0; i < loopEnd; ++i){
-				arrLoc = ii + (i * clk[clkCnt]);
+				arrLoc = j + (i * clk[clkCnt]);
 				if (dest[arrLoc] >= peak_hi || dest[arrLoc] <= peak_low){
 				} else if (dest[arrLoc-tol] >= peak_hi || dest[arrLoc-tol] <= peak_low){
 				} else if (dest[arrLoc+tol] >= peak_hi || dest[arrLoc+tol] <= peak_low){
@@ -631,21 +642,22 @@ int DetectASKClock(uint8_t *dest, size_t size, int *clock, int maxErr) {
 			}
 			//if we found no errors then we can stop here and a low clock (common clocks)
 			//  this is correct one - return this clock
-			//if (g_debugMode == 2) prnt("DEBUG ASK: clk %d, err %d, startpos %d, endpos %d", clk[clkCnt], errCnt, ii, i);
+			//if (g_debugMode == 2) prnt("DEBUG ASK: clk %d, err %d, startpos %d, endpos %d", clk[clkCnt], errCnt, j, i);
 			if (errCnt == 0 && clkCnt < 7) { 
 				if (!clockFnd) 
 					*clock = clk[clkCnt];
-				return ii;
+				return j;
 			}	
 			//if we found errors see if it is lowest so far and save it as best run
 			if (errCnt < bestErr[clkCnt]) {
 				bestErr[clkCnt] = errCnt;
-				bestStart[clkCnt] = ii;
+				bestStart[clkCnt] = j;
 			}
 		}
 	}
-	uint8_t k;
-	uint8_t best = 0;
+	
+	uint8_t k, best = 0;
+	
 	for (k=1; k < clkEnd; ++k){
 		if (bestErr[k] < bestErr[best]){
 			if (bestErr[k] == 0) bestErr[k] = 1;
@@ -1486,7 +1498,7 @@ int askdemod_ext(uint8_t *bits, size_t *size, int *clk, int *invert, int maxErr,
 	
 	// just noise - no super good detection. good enough
 	if (signalprop.isnoise) {
-		if (g_debugMode == 2) prnt("DEBUG askdemod_ext: just noise detected - quitting");
+		if (g_debugMode == 2) prnt("DEBUG askdemod_ext: just noise detected - aborting");
 		return -2;
 	}
 	
@@ -1636,7 +1648,7 @@ size_t fsk_wave_demod(uint8_t *dest, size_t size, uint8_t fchigh, uint8_t fclow,
 	//find start of modulating data in trace 	
 	idx = findModStart(dest, size, fchigh);
 	// Need to threshold first sample
-	dest[0] = (dest[idx] < FSK_PSK_THRESHOLD) ? 0 : 1;
+	dest[0] = (dest[idx] < signalprop.mean) ? 0 : 1;
 	
 	last_transition = idx;
 	idx++;
@@ -1674,7 +1686,7 @@ size_t fsk_wave_demod(uint8_t *dest, size_t size, uint8_t fchigh, uint8_t fclow,
 	for(; idx < size-20; idx++) {
 		
 		// threshold current value
-		dest[idx] = (dest[idx] < FSK_PSK_THRESHOLD) ? 0 : 1;
+		dest[idx] = (dest[idx] < signalprop.mean) ? 0 : 1;
 
 		// Check for 0->1 transition
 		if (dest[idx-1] < dest[idx]) {
diff --git a/common/lfdemod.h b/common/lfdemod.h
index daa5c3c56..43537b18b 100644
--- a/common/lfdemod.h
+++ b/common/lfdemod.h
@@ -19,7 +19,7 @@
 #include <stdlib.h>  // for
 #include <stdbool.h> // for bool
 #include "parity.h"  // for parity test
-
+#include "util.h"	 // for ARRAYLEN
 //generic
 typedef struct {
 	int low;

From 12af27967bcbaa41da984feb42c289b2312ac845 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Fri, 2 Nov 2018 20:47:19 +0100
Subject: [PATCH 0116/1938] fix:  remove gcc7.3.0 warning

---
 client/scandir.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/client/scandir.c b/client/scandir.c
index 6f8778318..12bbef110 100644
--- a/client/scandir.c
+++ b/client/scandir.c
@@ -63,9 +63,10 @@ int scandir (const char *dir,
 	if (err_no != 0) {
 		closedir (dirp);
 		if (nl)	{
-			while (count > 0)
+			while (count > 0) {
 				free (nl[--count]);
-				free (nl);
+			}
+			free (nl);
 		}
 		return -1;
 	}

From 92d89dd5398f097938826833a78a83bb841b5c3a Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sat, 3 Nov 2018 11:10:55 +0100
Subject: [PATCH 0117/1938] fix:   readline not installed on mac by default..

---
 client/proxmark3.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/proxmark3.c b/client/proxmark3.c
index 6f664f4ce..ed7fd245d 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -261,7 +261,9 @@ int main(int argc, char* argv[]) {
 	 /* initialize history */
 	using_history();
 
+#ifdef RL_STATE_READCMD
   	rl_extend_line_buffer(1024);		
+#endif
   
 	if (argc < 2) {
 		show_help(true, argv[0]);

From 1e4847739bcaf5a727dc997c2896e35ae121b204 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sat, 3 Nov 2018 14:22:51 +0100
Subject: [PATCH 0118/1938] chg:  updated the instructions to include  
 libjansson.

---
 README.md | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 7ae1db78c..fdf02f0a2 100644
--- a/README.md
+++ b/README.md
@@ -47,6 +47,9 @@ This fork now compiles just fine on
    - Mac OS X / Homebrew
    - Docker container
 
+## KALI and ARCHLINUX users
+Kali and ArchLinux users usually must kill their modem manager in order for the proxmark3 to enumerate properly.   
+   
 ## Setup and build for UBUNTU
 GC made updates to allow this to build easily on Ubuntu 14.04.2 LTS, 15.10 or 16.04
 See https://github.com/Proxmark/proxmark3/wiki/Ubuntu%20Linux
@@ -57,7 +60,7 @@ I have also added this script to the fork.
 https://github.com/RfidResearchGroup/proxmark3/blob/master/install.sh
 
 - Run
-`sudo apt-get install p7zip git build-essential libreadline5 libreadline-dev libusb-0.1-4 libusb-dev libqt4-dev perl pkg-config wget libncurses5-dev gcc-arm-none-eabi`
+`sudo apt-get install p7zip git build-essential libreadline5 libreadline-dev libusb-0.1-4 libusb-dev libqt4-dev perl pkg-config wget libncurses5-dev gcc-arm-none-eabi libjansson-dev`
 
 - Clone fork
 `git clone https://github.com/RfidResearchGroup/proxmark3.git`
@@ -82,7 +85,7 @@ https://github.com/RfidResearchGroup/proxmark3/blob/master/install.sh
 
 ## Setup and build for ArchLinux
 - Run
-`sudo pacman -Sy base-devel p7zip libusb readline ncurses arm-none-eabi-newlib --needed`
+`sudo pacman -Sy base-devel p7zip libusb readline ncurses libjansson-dev arm-none-eabi-newlib --needed`
 `yaourt -S termcap`
 
 - Clone fork
@@ -148,8 +151,8 @@ Afterwards just clone the iceman repo or download someone elses.
 Read instructions on @Gator96100 repo page. (https://github.com/Gator96100/ProxSpace/)
 
 Links
-- https://github.com/Gator96100/ProxSpace/archive/master.zip
-- https://github.com/Gator96100/ProxSpace/releases/tag/v2.2     (release v2.2   with gcc v5.3.0 arm-none-eabi-gcc v7.1.0)
+- https://github.com/Gator96100/ProxSpace/releases/tag/v3.1   (release v3.1 with gcc v7.3.0 )
+- https://github.com/Gator96100/ProxSpace/releases/tag/v2.2   (release v2.2 with gcc v5.3.0 arm-none-eabi-gcc v7.1.0)
 
 
 ### 7. Build and run

From 3e7d9fde015e2de45ba71615c874e4383e68f146 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Mon, 5 Nov 2018 17:46:32 +0100
Subject: [PATCH 0119/1938] CHG: 'hf mf hardnest'  auto detect supported
 cpu-commandset.  See helptext for more info.  (@piwi)

---
 client/cmdhfmf.c                       | 50 +++++++++++---
 client/cmdhfmf.h                       |  1 +
 client/cmdhfmfhard.c                   | 43 +++++++-----
 client/hardnested/hardnested_bf_core.c | 95 +++++++++++++++++++++-----
 client/hardnested/hardnested_bf_core.h | 12 ++++
 5 files changed, 160 insertions(+), 41 deletions(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 016025fbc..8f7004d66 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -131,6 +131,13 @@ int usage_hf14_hardnested(void){
 	PrintAndLogEx(NORMAL, "      u <UID>   read/write hf-mf-<UID>-nonces.bin instead of default name");
 	PrintAndLogEx(NORMAL, "      f <name>  read/write <name> instead of default name");
 	PrintAndLogEx(NORMAL, "      t         tests?");
+	PrintAndLogEx(NORMAL, "      i <X>     set type of SIMD instructions. Without this flag programs autodetect it.");
+	PrintAndLogEx(NORMAL, "        i 5   = AVX512");
+	PrintAndLogEx(NORMAL, "        i 2   = AVX2");
+	PrintAndLogEx(NORMAL, "        i a   = AVX");
+	PrintAndLogEx(NORMAL, "        i s   = SSE2");
+	PrintAndLogEx(NORMAL, "        i m   = MMX");
+	PrintAndLogEx(NORMAL, "        i n   = none (use CPU regular instruction set)");	
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Examples:");
 	PrintAndLogEx(NORMAL, "      hf mf hardnested 0 A FFFFFFFFFFFF 4 A");
@@ -1252,8 +1259,8 @@ int CmdHF14AMfNestedHard(const char *Cmd) {
 	switch(tolower(param_getchar(Cmd, cmdp))) {
 		case 'h': return usage_hf14_hardnested();
 		case 'r':
-			fptr=GenerateFilename("hf-mf-","-nonces.bin");
-			if(fptr==NULL) 
+			fptr = GenerateFilename("hf-mf-","-nonces.bin");
+			if (fptr == NULL) 
 				strncpy(filename,"nonces.bin", FILE_PATH_SIZE);
 			else
 				strncpy(filename,fptr, FILE_PATH_SIZE);
@@ -1269,10 +1276,10 @@ int CmdHF14AMfNestedHard(const char *Cmd) {
 			if (!param_gethex(Cmd, cmdp+2, trgkey, 12)) {
 				know_target_key = true;
 			}
-			cmdp+=2;
+			cmdp += 2;
 			break;
 		default:
-			if(param_getchar(Cmd, cmdp) == 0x00)
+			if (param_getchar(Cmd, cmdp) == 0x00)
 			{
 				PrintAndLogEx(NORMAL, "Block number is missing");
 				return 1;
@@ -1309,7 +1316,7 @@ int CmdHF14AMfNestedHard(const char *Cmd) {
 			if (ctmp != 'A' && ctmp != 'a') {
 				trgKeyType = 1;
 			}
-			cmdp+=5;
+			cmdp += 5;
 	}
 	if (!param_gethex(Cmd, cmdp, trgkey, 12)) {
 		know_target_key = true;
@@ -1317,14 +1324,13 @@ int CmdHF14AMfNestedHard(const char *Cmd) {
 	}
 
 	while ((ctmp = param_getchar(Cmd, cmdp))) {
-		switch(tolower(ctmp))
-		{
+		switch(tolower(ctmp)) {
 		case 's':
 			slow = true;
 			break;
 		case 'w':
 			nonce_file_write = true;
-			fptr=GenerateFilename("hf-mf-","-nonces.bin");
+			fptr = GenerateFilename("hf-mf-","-nonces.bin");
 			if (fptr == NULL) 
 				return 1;
 			strncpy(filename, fptr, FILE_PATH_SIZE);
@@ -1339,6 +1345,34 @@ int CmdHF14AMfNestedHard(const char *Cmd) {
 			strncpy(filename, szTemp, FILE_PATH_SIZE);
 			cmdp++;
 			break;
+		case 'i': 
+			SetSIMDInstr(SIMD_AUTO);
+			ctmp = tolower(param_getchar(Cmd, cmdp+1));
+			switch (ctmp) {
+				case '5':
+					SetSIMDInstr(SIMD_AVX512);
+					break;
+				case '2':
+					SetSIMDInstr(SIMD_AVX2);
+					break;
+				case 'a':
+					SetSIMDInstr(SIMD_AVX);
+					break;
+				case 's':
+					SetSIMDInstr(SIMD_SSE2);
+					break;
+				case 'm':
+					SetSIMDInstr(SIMD_MMX);
+					break;
+				case 'n':
+					SetSIMDInstr(SIMD_NONE);
+					break;
+				default:
+					PrintAndLog("Unknown SIMD type. %c", ctmp);
+					return 1;
+			}
+			cmdp += 2;
+			break;
 		default:
 			PrintAndLogEx(WARNING, "Unknown parameter '%c'\n", ctmp);
 			usage_hf14_hardnested();
diff --git a/client/cmdhfmf.h b/client/cmdhfmf.h
index 3404548d5..b253ac0bb 100644
--- a/client/cmdhfmf.h
+++ b/client/cmdhfmf.h
@@ -31,6 +31,7 @@
 #include "mifaredefault.h"  // mifare default key array
 #include "cmdhf14a.h" 		// dropfield
 #include "cliparser/cliparser.h" // argtable
+#include "hardnested/hardnested_bf_core.h"	// SetSIMDInstr
 
 extern int CmdHFMF(const char *Cmd);
 
diff --git a/client/cmdhfmfhard.c b/client/cmdhfmfhard.c
index c35664a7f..42e97e4b9 100644
--- a/client/cmdhfmfhard.c
+++ b/client/cmdhfmfhard.c
@@ -33,6 +33,7 @@
 #include "crapto1/crapto1.h"
 #include "parity.h"
 #include "hardnested/hardnested_bruteforce.h"
+#include "hardnested/hardnested_bf_core.h"
 #include "hardnested/hardnested_bitarray_core.h"
 #include "zlib.h"
 
@@ -72,22 +73,27 @@ static float brute_force_per_second;
 
 
 static void get_SIMD_instruction_set(char* instruction_set) {
-#if defined (__i386__) || defined (__x86_64__)	
-	#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))	
-		#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
-	if (__builtin_cpu_supports("avx512f")) strcpy(instruction_set, "AVX512F");
-	else if (__builtin_cpu_supports("avx2")) strcpy(instruction_set, "AVX2");
-		#else 
-	if (__builtin_cpu_supports("avx2")) strcpy(instruction_set, "AVX2");
-		#endif
-	else if (__builtin_cpu_supports("avx")) strcpy(instruction_set, "AVX");
-	else if (__builtin_cpu_supports("sse2")) strcpy(instruction_set, "SSE2");
-	else if (__builtin_cpu_supports("mmx")) strcpy(instruction_set, "MMX");
-	else 
-	#endif
-#endif
-		strcpy(instruction_set, "no");
-}
+	switch(GetSIMDInstrAuto()) {
+		case SIMD_AVX512:
+			strcpy(instruction_set, "AVX512F");
+			break;
+		case SIMD_AVX2:
+			strcpy(instruction_set, "AVX2");
+			break;
+		case SIMD_AVX:
+			strcpy(instruction_set, "AVX");
+			break;
+		case SIMD_SSE2:
+			strcpy(instruction_set, "SSE2");
+			break;
+		case SIMD_MMX:
+			strcpy(instruction_set, "MMX");
+			break;
+		default:
+			strcpy(instruction_set, "no");
+			break;
+	}	
+}		  
 
 
 static void print_progress_header(void) {
@@ -267,6 +273,7 @@ static void init_bitflip_bitarrays(void)
 				if (bytesread != filesize) {
 					PrintAndLogEx(WARNING, "File read error with %s. Aborting...\n", state_file_name);
 					fclose(statesfile);
+					inflateEnd(&compressed_stream);
 					exit(5);
 				}
 				fclose(statesfile);
@@ -2208,6 +2215,10 @@ static void set_test_state(uint8_t byte)
 int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t *trgkey, bool nonce_file_read, bool nonce_file_write, bool slow, int tests, uint64_t *foundkey, char *filename) 
 {
 	char progress_text[80];
+	
+	char instr_set[12] = {0};
+	get_SIMD_instruction_set(instr_set);
+	PrintAndLog("Using %s SIMD core.", instr_set);
 
 	srand((unsigned) time(NULL));
 	brute_force_per_second = brute_force_benchmark();
diff --git a/client/hardnested/hardnested_bf_core.c b/client/hardnested/hardnested_bf_core.c
index 3982a144a..c00434a52 100644
--- a/client/hardnested/hardnested_bf_core.c
+++ b/client/hardnested/hardnested_bf_core.c
@@ -548,44 +548,105 @@ out:
 crack_states_bitsliced_t *crack_states_bitsliced_function_p = &crack_states_bitsliced_dispatch;
 bitslice_test_nonces_t *bitslice_test_nonces_function_p = &bitslice_test_nonces_dispatch;
 
-// determine the available instruction set at runtime and call the correct function
-const uint64_t crack_states_bitsliced_dispatch(uint32_t cuid, uint8_t *best_first_bytes, statelist_t *p, uint32_t *keys_found, uint64_t *num_keys_tested, uint32_t nonces_to_bruteforce, uint8_t *bf_test_nonce_2nd_byte, noncelist_t *nonces) {
+static SIMDExecInstr intSIMDInstr = SIMD_AUTO;
+
+void SetSIMDInstr(SIMDExecInstr instr) {
+	intSIMDInstr = instr;
+	
+	crack_states_bitsliced_function_p = &crack_states_bitsliced_dispatch;
+	bitslice_test_nonces_function_p = &bitslice_test_nonces_dispatch;
+}
+
+SIMDExecInstr GetSIMDInstr() {
+	SIMDExecInstr instr = SIMD_NONE;
+	
 #if defined (__i386__) || defined (__x86_64__)
-	#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))	
+	#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
 		#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2) 
-		if (__builtin_cpu_supports("avx512f")) crack_states_bitsliced_function_p = &crack_states_bitsliced_AVX512;
-		else if (__builtin_cpu_supports("avx2")) crack_states_bitsliced_function_p = &crack_states_bitsliced_AVX2;
+		if (__builtin_cpu_supports("avx512f")) instr = SIMD_AVX512;
+		else if (__builtin_cpu_supports("avx2")) instr = SIMD_AVX2;
 		#else
-		if (__builtin_cpu_supports("avx2")) crack_states_bitsliced_function_p = &crack_states_bitsliced_AVX2;
+		if (__builtin_cpu_supports("avx2")) instr = SIMD_AVX2;
 		#endif
-		else if (__builtin_cpu_supports("avx")) crack_states_bitsliced_function_p = &crack_states_bitsliced_AVX;
-		else if (__builtin_cpu_supports("sse2")) crack_states_bitsliced_function_p = &crack_states_bitsliced_SSE2;
-		else if (__builtin_cpu_supports("mmx")) crack_states_bitsliced_function_p = &crack_states_bitsliced_MMX;
+		else if (__builtin_cpu_supports("avx")) instr = SIMD_AVX;
+		else if (__builtin_cpu_supports("sse2")) instr = SIMD_SSE2;
+		else if (__builtin_cpu_supports("mmx")) instr = SIMD_MMX;
 		else
 	#endif
 #endif
+		instr = SIMD_NONE;
+		
+	return instr;
+}
+
+SIMDExecInstr GetSIMDInstrAuto() {
+	SIMDExecInstr instr = intSIMDInstr;
+	if (instr == SIMD_AUTO)
+		return GetSIMDInstr();
+	
+	return instr;
+}
+
+// determine the available instruction set at runtime and call the correct function
+const uint64_t crack_states_bitsliced_dispatch(uint32_t cuid, uint8_t *best_first_bytes, statelist_t *p, uint32_t *keys_found, uint64_t *num_keys_tested, uint32_t nonces_to_bruteforce, uint8_t *bf_test_nonce_2nd_byte, noncelist_t *nonces) {
+	switch(GetSIMDInstrAuto()) {
+#if defined (__i386__) || defined (__x86_64__)
+	#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))	
+		#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2) 
+		case SIMD_AVX512:
+			crack_states_bitsliced_function_p = &crack_states_bitsliced_AVX512;
+			break;
+		#endif
+		case SIMD_AVX2:
+			crack_states_bitsliced_function_p = &crack_states_bitsliced_AVX2;
+			break;
+		case SIMD_AVX:
+			crack_states_bitsliced_function_p = &crack_states_bitsliced_AVX;
+			break;
+		case SIMD_SSE2:
+			crack_states_bitsliced_function_p = &crack_states_bitsliced_SSE2;
+			break;
+		case SIMD_MMX:
+			crack_states_bitsliced_function_p = &crack_states_bitsliced_MMX;
+			break;
+	#endif
+#endif
+		default:
 		crack_states_bitsliced_function_p = &crack_states_bitsliced_NOSIMD;
+			break;
+	}	
 
     // call the most optimized function for this CPU
     return (*crack_states_bitsliced_function_p)(cuid, best_first_bytes, p, keys_found, num_keys_tested, nonces_to_bruteforce, bf_test_nonce_2nd_byte, nonces);
 }
 
 void bitslice_test_nonces_dispatch(uint32_t nonces_to_bruteforce, uint32_t *bf_test_nonce, uint8_t *bf_test_nonce_par) {
+	switch(GetSIMDInstrAuto()) {
 #if defined (__i386__) || defined (__x86_64__)	
 	#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
 		#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
-		if (__builtin_cpu_supports("avx512f")) bitslice_test_nonces_function_p = &bitslice_test_nonces_AVX512;
-		else if (__builtin_cpu_supports("avx2")) bitslice_test_nonces_function_p = &bitslice_test_nonces_AVX2;
-		#else
-		if (__builtin_cpu_supports("avx2")) bitslice_test_nonces_function_p = &bitslice_test_nonces_AVX2;
+		case SIMD_AVX512:
+			bitslice_test_nonces_function_p = &bitslice_test_nonces_AVX512;
+			break;
 		#endif
-		else if (__builtin_cpu_supports("avx")) bitslice_test_nonces_function_p = &bitslice_test_nonces_AVX;
-		else if (__builtin_cpu_supports("sse2")) bitslice_test_nonces_function_p = &bitslice_test_nonces_SSE2;
-		else if (__builtin_cpu_supports("mmx")) bitslice_test_nonces_function_p = &bitslice_test_nonces_MMX;
-		else
+		case SIMD_AVX2:
+			bitslice_test_nonces_function_p = &bitslice_test_nonces_AVX2;
+			break;
+		case SIMD_AVX:
+			bitslice_test_nonces_function_p = &bitslice_test_nonces_AVX;
+			break;
+		case SIMD_SSE2:
+			bitslice_test_nonces_function_p = &bitslice_test_nonces_SSE2;
+			break;
+		case SIMD_MMX:
+			bitslice_test_nonces_function_p = &bitslice_test_nonces_MMX;
+			break;
 	#endif
 #endif
+		default:
 		bitslice_test_nonces_function_p = &bitslice_test_nonces_NOSIMD;
+			break;
+	}	
 
     // call the most optimized function for this CPU
     (*bitslice_test_nonces_function_p)(nonces_to_bruteforce, bf_test_nonce, bf_test_nonce_par);
diff --git a/client/hardnested/hardnested_bf_core.h b/client/hardnested/hardnested_bf_core.h
index 7a445993e..b3df05474 100644
--- a/client/hardnested/hardnested_bf_core.h
+++ b/client/hardnested/hardnested_bf_core.h
@@ -52,6 +52,18 @@ THE SOFTWARE.
 
 #include "hardnested_bruteforce.h"			// statelist_t
 
+typedef enum {
+	SIMD_AUTO,
+	SIMD_AVX512,
+	SIMD_AVX2,
+	SIMD_AVX,
+	SIMD_SSE2,
+	SIMD_MMX,
+	SIMD_NONE,
+} SIMDExecInstr;
+extern void SetSIMDInstr(SIMDExecInstr instr);
+extern SIMDExecInstr GetSIMDInstrAuto();
+
 extern const uint64_t crack_states_bitsliced(uint32_t cuid, uint8_t *best_first_bytes, statelist_t *p, uint32_t *keys_found, uint64_t *num_keys_tested, uint32_t nonces_to_bruteforce, uint8_t *bf_test_nonces_2nd_byte, noncelist_t *nonces);
 extern void bitslice_test_nonces(uint32_t nonces_to_bruteforce, uint32_t *bf_test_nonces, uint8_t *bf_test_nonce_par);
 

From e60d4b38925caeb692ccd419bb360cfffa8b14bb Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Mon, 5 Nov 2018 17:48:58 +0100
Subject: [PATCH 0120/1938] add: emv json  file (@merlokk) chg: compiler
 warning

---
 client/emv/defparams.json | 58 +++++++++++++++++++++++++++++++++++++++
 client/emv/emv_tags.c     | 17 ++++--------
 client/emv/emv_tags.h     |  1 +
 3 files changed, 65 insertions(+), 11 deletions(-)
 create mode 100644 client/emv/defparams.json

diff --git a/client/emv/defparams.json b/client/emv/defparams.json
new file mode 100644
index 000000000..e615d3239
--- /dev/null
+++ b/client/emv/defparams.json
@@ -0,0 +1,58 @@
+[
+  {
+    "name": "Transaction Date",
+    "tag": "9A",
+    "value": "00 00 00",
+    "length": 3,
+    "hint": "format: YYMMDD"
+  },
+  {
+    "name": "Transaction Type",
+    "tag": "9C",
+    "value": "00",
+    "length": 1,
+    "hint": "00: Goods and service, 01: Cash"
+  },
+  {
+    "name": "Amount, authorized",
+    "tag": "9F 02",
+    "value": "00 00 00 00 01 00",
+    "length": 6,
+    "hint": "amount (numberic) in cents"
+  },
+  {
+    "name": "Transaction Currency Code",
+    "tag": "5F 2A",
+    "value": "09 80",
+    "length": 2,
+    "hint": "USD 840, EUR 978, RUB 643, RUR 810(old), UAH 980, AZN 031, n/a 999"
+  },
+  {
+    "name": "Terminal Country Code",
+    "tag": "9F 1A",
+    "value": "72 75",
+    "length": 2,
+    "hint": "ISO3166: de, en (65 6e), uk(75 6b), ru (72 75), us, ua"
+  },
+  {
+    "name": "Terminal Transaction Qualifiers (TTQ)",
+    "tag": "9F 66",
+    "value": "26 00 00 00",
+    "length": 4,
+    "hint": "qVSDC 26 00 00 00, gen AC from GPO 26 80 00 00, MSD 86 00 00 00, VSDC 46 00 00 00"
+  },
+  {
+    "name": "Unpredictable Number",
+    "tag": "9F 37",
+    "value": "01 02 03 04",
+    "length": 4,
+    "hint": "4 byte random number"
+  },
+  {
+    "name": "Unpredictable Number (MSD for UDOL)",
+    "tag": "9F 6A",
+    "value": "01 02 03 05",
+    "length": 4,
+    "hint": "4 byte random number"
+  }
+]
diff --git a/client/emv/emv_tags.c b/client/emv/emv_tags.c
index fdccb8923..a1bf3d25e 100644
--- a/client/emv/emv_tags.c
+++ b/client/emv/emv_tags.c
@@ -353,15 +353,13 @@ static void emv_tag_dump_dol(const struct tlv *tlv, const struct emv_tag *tag, F
 	}
 }
 
-static void emv_tag_dump_string(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level)
-{
+static void emv_tag_dump_string(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level){
 	fprintf(f, "\tString value '");
 	fwrite(tlv->value, 1, tlv->len, f);
 	fprintf(f, "'\n");
 }
 
-static unsigned long emv_value_numeric(const struct tlv *tlv, unsigned start, unsigned end)
-{
+static unsigned long emv_value_numeric(const struct tlv *tlv, unsigned start, unsigned end) {
 	unsigned long ret = 0;
 	int i;
 
@@ -391,14 +389,12 @@ static unsigned long emv_value_numeric(const struct tlv *tlv, unsigned start, un
 	return ret;
 }
 
-static void emv_tag_dump_numeric(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level)
-{
+static void emv_tag_dump_numeric(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level) {
 	PRINT_INDENT(level);
-	fprintf(f, "\tNumeric value %lu\n", emv_value_numeric(tlv, 0, tlv->len * 2));
+	fprintf(f, "\tNumeric value %" PRIu32 " \n", emv_value_numeric(tlv, 0, tlv->len * 2));
 }
 
-static void emv_tag_dump_yymmdd(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level)
-{
+static void emv_tag_dump_yymmdd(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level) {
 	PRINT_INDENT(level);
 	fprintf(f, "\tDate: 20%02ld.%ld.%ld\n",
 			emv_value_numeric(tlv, 0, 2),
@@ -406,8 +402,7 @@ static void emv_tag_dump_yymmdd(const struct tlv *tlv, const struct emv_tag *tag
 			emv_value_numeric(tlv, 4, 6));
 }
 
-static uint32_t emv_get_binary(const unsigned char *S)
-{
+static uint32_t emv_get_binary(const unsigned char *S) {
 	return (S[0] << 24) | (S[1] << 16) | (S[2] << 8) | (S[3] << 0);
 }
 
diff --git a/client/emv/emv_tags.h b/client/emv/emv_tags.h
index f6d44f015..a9d1eea98 100644
--- a/client/emv/emv_tags.h
+++ b/client/emv/emv_tags.h
@@ -18,6 +18,7 @@
 
 #include "tlv.h"
 #include <stdio.h>
+#include <inttypes.h>
 
 // AC
 # define EMVAC_AC_MASK   0xC0

From e26e9aa7105c979fe52dfd588d1946135ce41af9 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Mon, 5 Nov 2018 18:32:53 +0100
Subject: [PATCH 0121/1938] ADD: added support for lua-script to download from
 Flashmemory.

---
 client/scripting.c | 64 +++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 57 insertions(+), 7 deletions(-)

diff --git a/client/scripting.c b/client/scripting.c
index d981f1d7b..2a7baed0d 100644
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -55,18 +55,17 @@ static int l_SendCommand(lua_State *L){
  */
 static int l_GetFromBigBuf(lua_State *L){
 	
-	int len = 0;
-    int startindex = 0;
+	int len = 0, startindex = 0;
 	
     //Check number of arguments
     int n = lua_gettop(L);
-    if(n == 0) {
+    if (n == 0) {
         //signal error by returning Nil, errorstring
         lua_pushnil(L);
-        lua_pushstring(L,"You need to supply number of len and startindex");
+        lua_pushstring(L, "You need to supply number of bytes and startindex");
         return 2; // two return values
     }
-    if(n >= 2) {
+    if (n >= 2) {
         len = luaL_checknumber(L, 1);
         startindex = luaL_checknumber(L, 2);
     }
@@ -78,11 +77,11 @@ static int l_GetFromBigBuf(lua_State *L){
         lua_pushstring(L,"Allocating memory failed");
         return 2; // two return values
 	}
-		
+
 	if ( !GetFromDevice(BIG_BUF, data, len, startindex, NULL, 2500, false)) {
 		free(data);
 		lua_pushnil(L);
-        lua_pushstring(L,"command execution time out");		
+        lua_pushstring(L, "command execution time out");		
 		return 2;
 	}
 	
@@ -91,6 +90,56 @@ static int l_GetFromBigBuf(lua_State *L){
 	free(data);
 	return 1;// return 1 to signal one return value
 }
+
+/**
+ * @brief The following params expected:
+ * uint8_t *dest
+ * int bytes
+ * int start_index
+ * @param L
+ * @return
+ */
+static int l_GetFromFlashMem(lua_State *L){
+
+#ifndef WITH_FLASH
+	lua_pushnil(L);
+	lua_pushstring(L, "Not compiled with FLASH MEM support");		
+	return 2;
+#else
+	int len = 0, startindex = 0;
+	
+    int n = lua_gettop(L);
+    if (n == 0) {
+        lua_pushnil(L);
+        lua_pushstring(L, "You need to supply number of bytes and startindex");
+        return 2;
+    }
+    if (n >= 2) {
+        len = luaL_checknumber(L, 1);
+        startindex = luaL_checknumber(L, 2);
+    }
+
+	uint8_t *data = calloc(len, sizeof(uint8_t));
+	if ( !data ) {
+        lua_pushnil(L);
+        lua_pushstring(L, "Allocating memory failed");
+        return 2; 
+	}
+	
+	if ( !GetFromDevice(FLASH_MEM, data, len, startindex, NULL, -1, false)) {
+		free(data);
+		lua_pushnil(L);
+        lua_pushstring(L, "command execution time out");		
+		return 2;
+	}
+
+	lua_pushlstring(L,(const char *)data, len);
+	free(data);
+	return 1;
+#endif
+}
+
+
 /**
  * @brief The following params expected:
  * uint32_t cmd
@@ -655,6 +704,7 @@ int set_pm3_libraries(lua_State *L) {
     static const luaL_Reg libs[] = {
         {"SendCommand",                 l_SendCommand},
 		{"GetFromBigBuf",               l_GetFromBigBuf},
+		{"GetFromFlashMem",            	l_GetFromFlashMem},
         {"WaitForResponseTimeout",      l_WaitForResponseTimeout},
 		{"mfDarkside",                  l_mfDarkside},
         {"foobar",                      l_foobar},

From b3ebf73ecc33513aab4d602505559e54c3966987 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Mon, 5 Nov 2018 18:45:46 +0100
Subject: [PATCH 0122/1938] chg: lua - Swapping  param order to make it more
 clear.   From (length,offset)  to  (offset,length)

---
 client/scripting.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/scripting.c b/client/scripting.c
index 2a7baed0d..06356293f 100644
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -66,8 +66,8 @@ static int l_GetFromBigBuf(lua_State *L){
         return 2; // two return values
     }
     if (n >= 2) {
-        len = luaL_checknumber(L, 1);
-        startindex = luaL_checknumber(L, 2);
+        startindex = luaL_checknumber(L, 1);
+		len = luaL_checknumber(L, 2);
     }
 
 	uint8_t *data = calloc(len, sizeof(uint8_t));
@@ -115,8 +115,8 @@ static int l_GetFromFlashMem(lua_State *L){
         return 2;
     }
     if (n >= 2) {
-        len = luaL_checknumber(L, 1);
-        startindex = luaL_checknumber(L, 2);
+        startindex = luaL_checknumber(L, 1);
+		len = luaL_checknumber(L, 2);
     }
 
 	uint8_t *data = calloc(len, sizeof(uint8_t));

From 4d500dff2f7479b3df69c023659f1c0dc306890b Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Mon, 5 Nov 2018 21:20:03 +0100
Subject: [PATCH 0123/1938] textual

---
 client/cmdsmartcard.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index f60e04e06..fc188b951 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -21,8 +21,8 @@ int usage_sm_raw(void) {
 	PrintAndLogEx(NORMAL, "       d <bytes>  :  bytes to send");
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        sc raw d 00a404000e315041592e5359532e444446303100    - “1PAY.SYS.DDF01” PPSE directory");
-	PrintAndLogEx(NORMAL, "        sc raw d 00a404000e325041592e5359532e444446303100    - “2PAY.SYS.DDF01” PPSE directory");
+	PrintAndLogEx(NORMAL, "        sc raw d 00a404000e315041592e5359532e444446303100    - `1PAY.SYS.DDF01` PPSE directory");
+	PrintAndLogEx(NORMAL, "        sc raw d 00a404000e325041592e5359532e444446303100    - `2PAY.SYS.DDF01` PPSE directory");
 	return 0;
 }
 int usage_sm_reader(void) {
@@ -225,7 +225,6 @@ int CmdSmartRaw(const char *Cmd) {
 			return 2;
 		}
 
-		// TLV decoder
 		if (decodeTLV && len > 4)
 			TLVPrintFromBuffer(buf+1, len-3);
 
@@ -496,7 +495,6 @@ int CmdSmartBruteforceSFI(const char *Cmd) {
 	char ctmp = tolower(param_getchar(Cmd, 0));
 	if (ctmp == 'h') return usage_sm_brute();
 	
-	
 	uint8_t data[5] = {0x00, 0xB2, 0x00, 0x00, 0x00};
 
 	PrintAndLogEx(INFO, "Selecting card");

From ecc79838665716acb03c505de7bcb28496b47fc4 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Mon, 5 Nov 2018 22:29:31 +0100
Subject: [PATCH 0124/1938] fix: hf mf hardnested  -  access out of malloc mem.
 (@vdwel) https://github.com/RfidResearchGroup/proxmark3/issues/46    looks
 like increasing size removes the problem.

---
 client/cmdhfmfhard.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdhfmfhard.c b/client/cmdhfmfhard.c
index 42e97e4b9..07e05a81e 100644
--- a/client/cmdhfmfhard.c
+++ b/client/cmdhfmfhard.c
@@ -1750,7 +1750,7 @@ static void add_matching_states(statelist_t *candidates, uint8_t part_sum_a0, ui
 		PrintAndLogEx(WARNING, "Out of memory error in add_matching_states() - statelist.\n");
 		exit(4);
 	}
-	uint32_t *candidates_bitarray = (uint32_t *)malloc_bitarray(sizeof(uint32_t) * (1<<19));
+	uint32_t *candidates_bitarray = (uint32_t *)malloc_bitarray(sizeof(uint32_t) * worstcase_size);
 	if (candidates_bitarray == NULL) {
 		PrintAndLogEx(WARNING, "Out of memory error in add_matching_states() - bitarray.\n");
 		free(candidates->states[odd_even]);

From d58786ed74a82e282ab0b1612db4e9733391443b Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Mon, 5 Nov 2018 22:30:46 +0100
Subject: [PATCH 0125/1938] chg: 'hf iclass chk' - remove some printing

---
 client/cmdhficlass.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index 6b57d7efd..1f0204ba0 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -2047,7 +2047,7 @@ int CmdHFiClassCheckKeys(const char *Cmd) {
 		return 1;
 	}
 	
-	PrintPreCalcMac(keyBlock, keycnt, pre);
+	//PrintPreCalcMac(keyBlock, keycnt, pre);
 
 	// max 42 keys inside USB_COMMAND.  512/4 = 103 mac
 	uint32_t chunksize = keycnt > (USB_CMD_DATA_SIZE/4) ? (USB_CMD_DATA_SIZE/4) : keycnt;

From 98e24013cfe68aef60d129f089ed72ec4c5dcac5 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Mon, 5 Nov 2018 22:34:46 +0100
Subject: [PATCH 0126/1938] chg: 'hf mf chk' -  since the function ends with
 droping the field, lets just make sure the field is off to start with.

---
 armsrc/mifarecmd.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index fcfe99134..7d39b3f29 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -1425,6 +1425,8 @@ OUT:
 
 void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) {
 
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+
 	struct Crypto1State mpcs = {0, 0};
 	struct Crypto1State *pcs;
 	pcs = &mpcs;

From d6d96eb7fecf1378cdfe2c2f8bd875eded7ac466 Mon Sep 17 00:00:00 2001
From: bogiton <34060135+bogiton@users.noreply.github.com>
Date: Tue, 6 Nov 2018 13:36:00 +0000
Subject: [PATCH 0127/1938] Fixed offset bug (thanks iceman)

---
 armsrc/Standalone/hf_bog.c | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/armsrc/Standalone/hf_bog.c b/armsrc/Standalone/hf_bog.c
index 761e67b1a..01232a6a0 100644
--- a/armsrc/Standalone/hf_bog.c
+++ b/armsrc/Standalone/hf_bog.c
@@ -15,7 +15,8 @@ The retrieved sniffing session can be acquired by connecting the device
 to a client that supports the reconnect capability and issue 'hf 14a list'.
 
 In order to view the grabbed authentication attempts in the flash mem,
-you can simply 'mem read l 256' from the client to view the stored quadlets.
+you can simply run 'script run read_pwd_mem' or just 'mem read l 256' 
+from the client to view the stored quadlets.
 */
 
 #include "hf_bog.h"
@@ -31,7 +32,7 @@ uint8_t FindOffsetInFlash() {
 	uint8_t eom[4] = { 0xFF, 0xFF, 0xFF, 0xFF };
 	uint8_t memcnt = 0;
 	
-	while (memcnt < 4096)
+	while (memcnt < 0xFF)
 	{
 		Flash_ReadData(memcnt, mem, 4);
 		if (memcmp(mem, eom, 4) == 0) {
@@ -240,10 +241,20 @@ void RAMFUNC SniffAndStore(uint8_t param) {
 		uint8_t memoffset = FindOffsetInFlash();
 		if (MF_DBGLEVEL > 1) Dbprintf("[!] Memory offset = %u", memoffset);
 		
+		if ((memoffset + 4 * auth_attempts) > 0xFF)
+		{
+			// We opt to keep the new data only
+			memoffset = 0;
+			if (MF_DBGLEVEL > 1) Dbprintf("[!] Size of total data > 256 bytes. Discarding the old data.");
+		}
+		
 		// Get previous data from flash mem
 		uint8_t *previousdata = BigBuf_malloc(memoffset);
-		uint16_t readlen = Flash_ReadData(0, previousdata, memoffset);
-		if (MF_DBGLEVEL > 1) Dbprintf("[!] Read %u bytes from flash mem", readlen);
+		if (memoffset > 0)
+		{
+			uint16_t readlen = Flash_ReadData(0, previousdata, memoffset);
+			if (MF_DBGLEVEL > 1) Dbprintf("[!] Read %u bytes from flash mem", readlen);
+		}
 				
 		// create new bigbuf to hold all data
 		size_t total_size = memoffset + 4 * auth_attempts;
@@ -276,7 +287,7 @@ void RunMod()
 {
 	Dbprintf("Sniffing started");
 	
-    	SpinDelay(200);
+	SpinDelay(200);
 	
 	// param:
 	// bit 0 - trigger from first card answer

From db374585451b2098925abc2c294e269c1dd58d22 Mon Sep 17 00:00:00 2001
From: bogiton <34060135+bogiton@users.noreply.github.com>
Date: Tue, 6 Nov 2018 13:37:34 +0000
Subject: [PATCH 0128/1938] Added lua script to read stored pwds in flashmem

---
 client/scripts/read_pwd_mem.lua | 86 +++++++++++++++++++++++++++++++++
 1 file changed, 86 insertions(+)
 create mode 100644 client/scripts/read_pwd_mem.lua

diff --git a/client/scripts/read_pwd_mem.lua b/client/scripts/read_pwd_mem.lua
new file mode 100644
index 000000000..fbe4d0459
--- /dev/null
+++ b/client/scripts/read_pwd_mem.lua
@@ -0,0 +1,86 @@
+local getopt = require('getopt')
+local bin = require('bin')
+
+author = "Bogito"
+version = 'v1.0.0'
+desc =[[
+This script will read the flash memory of RDV4 and print the stored passwords.
+It was meant to be used as a help tool after using the BogRun standalone mode.
+]]
+usage = [[
+Usage:
+	script run read_pwd_mem -h -o <offset> -l <length>
+
+Arguments:
+	-h             : this help
+	-o <OFFSET>    : Memory offset. Default is 0.
+	-l <LENGTH>    : Length in bytes. Default is 256.
+]]
+example =[[
+Examples:
+	-- This will scan the first 256 bytes of flash memory for stored passwords
+	script run read_pwd_mem
+
+	-- This will scan 256 bytes of flash memory at offset 64 for stored passwords
+	script run read_pwd_mem -o 64
+
+	-- This will scan 32 bytes of flash memory at offset 64 for stored passwords
+	script run read_pwd_mem -o 64 -l 32
+]]
+
+-- Usage help
+local function help()
+	print(desc)
+	print(usage)
+	print(example)
+end
+
+local function main(args)
+
+	local data, err, quadlet, pwdcnt
+	local offset = 0
+	local length = 256
+	
+	-- Read the parameters
+	for o, a in getopt.getopt(args, 'ho:l:') do
+		if o == "h" then return help() end
+		if o == "o" then offset = tonumber(a) end
+		if o == "l" then length = tonumber(a) end
+	end
+	
+	if length < 0 or length > 256 then
+		return print('Error: Length is not valid. Must be less than 256')
+	end
+	
+	if ((offset < 0) or (offset % 4 ~= 0)) then
+		return print('Error: Offset is not valid. Mod-4 values are only allowed.')
+	end
+	
+	print('Offset: ' .. offset)
+	print('Length: ' .. length)
+	print()
+
+    data, err = core.GetFromFlashMem(offset, length)
+
+	if err then 
+		print(err)
+		return
+	end
+	
+    local count, s = bin.unpack('H'..length, data)
+	
+	pwdcnt = 0
+	for i = 1,(length/4),1 
+	do
+		quadlet = string.sub(s, (i-1)*8+1, i*8)
+		if quadlet == "FFFFFFFF" then break end
+		print(string.format("[%02d]",i) .. ' ' .. quadlet)
+		pwdcnt = pwdcnt + 1
+
+	end
+	print()
+	print('Found passwords: ' .. pwdcnt)
+	
+end
+
+main(args)

From 4d124c46f226041b4f0e5ab09013f293c4d7264e Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Tue, 6 Nov 2018 19:13:06 +0100
Subject: [PATCH 0129/1938] chg: 'standlone mode colinrun aka KIGIV' -  made it
 smaller to fit a normal compilation of fullimage

---
 armsrc/Standalone/hf_colin.c | 174 +++++------------------------------
 armsrc/Standalone/hf_colin.h |  14 ++-
 2 files changed, 28 insertions(+), 160 deletions(-)

diff --git a/armsrc/Standalone/hf_colin.c b/armsrc/Standalone/hf_colin.c
index fc0c7967a..18547ee12 100644
--- a/armsrc/Standalone/hf_colin.c
+++ b/armsrc/Standalone/hf_colin.c
@@ -1,5 +1,5 @@
 //-----------------------------------------------------------------------------
-// Colin Brigato, 2016,2017
+// Colin Brigato, 2016, 2017
 // Christian Herrmann, 2017
 //
 // This code is licensed to you under the terms of the GNU GPL, version 2 or,
@@ -21,10 +21,11 @@ int currfline;
 int curlline;
 
 // TODO : Implement fast read of KEYS like in RFIdea
-// als ohttp://ext.delaat.net/rp/2015-2016/p04/report.pdf
+// also http://ext.delaat.net/rp/2015-2016/p04/report.pdf
 
 // Colin's VIGIKPWN sniff/simulate/clone repeat routine for HF Mifare
 
+/*
 void cjPrintBigArray(const char *bigar, int len, uint8_t newlines, uint8_t debug)
 {
     uint32_t chunksize = (USB_CMD_DATA_SIZE / 4);
@@ -56,6 +57,7 @@ void cjPrintBigArray(const char *bigar, int len, uint8_t newlines, uint8_t debug
         DbprintfEx(FLAG_NOLOG, " ");
     }
 }
+*/
 
 void cjSetCursFRight()
 {
@@ -153,83 +155,8 @@ void SpinUp(uint32_t speed)
     LED_D_OFF();
 }
 
-void TestFlashmemSpeed(size_t buffersize, uint32_t spibaudrate) {
-
-    FLASHMEM_SPIBAUDRATE = spibaudrate*1000000;
-    DbprintfEx(FLAG_NOLOG, "%s---+----[ %s %s[%dKB] %s] (%d)", _GREEN_, _WHITE_, _YELLOW_, buffersize / 1024, _WHITE_, FLASHMEM_SPIBAUDRATE);
-    uint16_t t = 0;
-
-    LED_B_ON();
-    uint8_t *mem = BigBuf_malloc(buffersize);
-    bool isok = false;
-    size_t len = 0;
-    uint32_t startidx = 0;
-    uint32_t numofbytes = 0x3FFFF;
-
-    if (!FlashInit()) {
-        return;
-    }
-    //Flash_CheckBusy(BUSY_TIMEOUT);
-
-    //Flash_ReadStat1();
-
-    uint32_t end_time;
-    uint32_t start_time = end_time = GetTickCount();
-
-    for (size_t i = 0; i < numofbytes; i += buffersize)
-    {
-        len = MIN((numofbytes - i), buffersize);
-
-        //isok = Flash_ReadData(startidx + i, mem, len);
-        //uint32_t iend_time;
-        //uint32_t istart_time = iend_time = GetTickCount();
-        isok = Flash_ReadDataCont(startidx + i, mem, len);
-        //iend_time = GetTickCount();
-        //DbprintfEx(FLAG_RAWPRINT, "%s%dms%s>", _YELLOW_, iend_time - istart_time, _WHITE_);
-        //cjSetCursLeft();
-        if (!isok)
-        {
-            Dbprintf("[FAIL] reading flash memory failed ::  | bytes between %d - %d", i, len);
-            return;
-        }
-        //isok = cmd_send(CMD_FLASHMEM_DOWNLOADED, i, len, 0, mem, len);
-        //if (!isok)
-        //	Dbprintf("transfer to client failed ::  | bytes between %d - %d", i, len);
-        t++;
-    }
-    end_time = GetTickCount();
-    DbprintfEx(FLAG_NOLOG, "%s   |--< %s %s%dms%s for FULL_FLASH_READ", _GREEN_, _WHITE_, _YELLOW_, end_time - start_time, _WHITE_);
-    DbprintfEx(FLAG_NOLOG, "%s   `--= %s %d runs of %s~%dms%s each", _GREEN_, _WHITE_, t, _YELLOW_, (end_time - start_time) / t, _WHITE_);
-    DbprintfEx(FLAG_NOLOG, "");
-    //cjSetCursLeft();
-    LED_B_OFF();
-    FlashStop();
-}
-
-void TestFlashmemRoutine()
+void ReadLastTagFromFlash()
 {
-    DbprintfEx(FLAG_NOLOG, "%s>>%s Will Now Test dumping Full flash [256Kb] (2Mbits)through Bigbuf buffers\n", _GREEN_, _WHITE_);
-    MF_DBGLEVEL = MF_DBG_NONE;
-    //DbprintfEx(FLAG_NOLOG, "---------\n%s[A]%s Using NORMAL Reads @Max (24Mhz=MCK/2)\n--------", _GREEN_, _WHITE_);
-    TestFlashmemSpeed(32768,24);
-    TestFlashmemSpeed(16384 + 4096 + 4096,24);
-    TestFlashmemSpeed(16384,24);
-    TestFlashmemSpeed(4096,24);
-    TestFlashmemSpeed(1024,24);
-    //SpinDelay(1000);
-    //WDT_HIT();
-    //DbprintfEx(FLAG_NOLOG, "--------\n%s[B]%s Using FAST Reads @Max (48Mhz=MCK=CPUClock/2=MAXSPI)\n--------", _GREEN_, _WHITE_);
-    TestFlashmemSpeed(32768,48);
-    TestFlashmemSpeed(16384 + 4096 + 4096,48);
-    TestFlashmemSpeed(16384,48);
-    TestFlashmemSpeed(4096,48);
-    TestFlashmemSpeed(1024,48);
-    //SpinDelay(1000);
-    //WDT_HIT();
-    return;
-}
-
-void ReadLastTagFromFlash() {
     SpinOff(0);
     LED_A_ON();
     LED_B_ON();
@@ -250,20 +177,15 @@ void ReadLastTagFromFlash() {
     }
     Flash_CheckBusy(BUSY_TIMEOUT);
 
-    //Flash_ReadStat1();
-
     uint32_t end_time;
     uint32_t start_time = end_time = GetTickCount();
 
     for (size_t i = 0; i < len; i += size)
     {
         len = MIN((len - i), size);
-
-        // isok = Flash_FastReadDataCont(startidx + i, mem, len);
         isok = Flash_ReadDataCont(startidx + i, mem, len);
         if (isok == len)
         {
-            //print_result("Chunk: ", mem, len);
             emlSetMem(mem, 0, 64);
         }
         else
@@ -287,7 +209,6 @@ void ReadLastTagFromFlash() {
 
 void WriteTagToFlash(uint8_t index, size_t size)
 {
-
     SpinOff(0);
     LED_A_ON();
     LED_B_ON();
@@ -302,7 +223,7 @@ void WriteTagToFlash(uint8_t index, size_t size)
 
     uint8_t data[(size * (16 * 64))/1024];
     uint8_t buff[PAGESIZE];
-    // cnt = 0;
+
     emlGetMem(data, 0, (size * 64)/1024);
 
     if (!FlashInit()){
@@ -318,9 +239,8 @@ void WriteTagToFlash(uint8_t index, size_t size)
 
     while (bytes_remaining > 0)
     {
-
-	Flash_CheckBusy(BUSY_TIMEOUT);
-	Flash_WriteEnable();
+		Flash_CheckBusy(BUSY_TIMEOUT);
+		Flash_WriteEnable();
 
         uint32_t bytes_in_packet = MIN(FLASH_MEM_BLOCK_SIZE, bytes_remaining);
 
@@ -337,7 +257,6 @@ void WriteTagToFlash(uint8_t index, size_t size)
             DbprintfEx(FLAG_NOLOG, "FlashMem write FAILEd [offset %u]", bytes_sent);
             cjSetCursLeft();
             SpinOff(100);
-
             return;
         }
 
@@ -352,11 +271,8 @@ void WriteTagToFlash(uint8_t index, size_t size)
     cjSetCursLeft();
     DbprintfEx(FLAG_NOLOG, "%s[IN]%s %s%dms%s for TAG_FLASH_WRITE", _GREEN_, _WHITE_, _YELLOW_, end_time - start_time, _WHITE_);
     cjSetCursLeft();
-
     FlashStop();
-
     SpinOff(0);
-
     return;
 }
 
@@ -473,11 +389,12 @@ ACCBITS : 796788[00]+VALUE
     {
         for (uint16_t sectorNo = 0; sectorNo < sectorsCnt; sectorNo++)
         {
-            //          validKey[t][sectorNo] = false;
-            for (uint16_t i = 0; i < 6; i++)
-            {
-                foundKey[t][sectorNo][i] = 0xff;
-            }
+			foundKey[t][sectorNo][0] = 0xFF;
+			foundKey[t][sectorNo][1] = 0xFF;
+			foundKey[t][sectorNo][2] = 0xFF;
+			foundKey[t][sectorNo][3] = 0xFF;
+			foundKey[t][sectorNo][4] = 0xFF;
+			foundKey[t][sectorNo][5] = 0xFF;			
         }
     }
 
@@ -491,7 +408,6 @@ ACCBITS : 796788[00]+VALUE
     // banner:
     vtsend_reset(NULL);
     DbprintfEx(FLAG_NOLOG, "\r\n%s", clearTerm);
-    cjPrintBigArray(LOGO, sizeof(LOGO), 0, 0);
     DbprintfEx(FLAG_NOLOG, "%s%s%s", _CYAN_, sub_banner, _WHITE_);
     DbprintfEx(FLAG_NOLOG, "%s>>%s C.J.B's MifareFastPwn Started\r\n", _RED_, _WHITE_);
 
@@ -506,11 +422,6 @@ ACCBITS : 796788[00]+VALUE
     SpinOff(50);
     SpinDown(50);
 
-#if 0
-TestFlashmemRoutine();
-return;
-#endif
-
 failtag:
 
     vtsend_cursor_position_save(NULL);
@@ -607,7 +518,7 @@ failtag:
         for (int sec = 0; sec < sectorsCnt && !err && !trapped; ++sec)
         {
             key = cjat91_saMifareChkKeys(sec * 4, type, NULL, size, &keyBlock[0], &key64);
-            // key = saMifareChkKeys(sec * 4, type, NULL, size, &keyBlock[0], &key64);
+
             if (key == -1)
             {
                 err = 1;
@@ -932,7 +843,7 @@ failtag:
     cjSetCursLeft();
     cjSetCursLeft();
 
-    WriteTagToFlash(0,1024);
+    WriteTagToFlash(0, 1024);
 
 readysim:
     // SIM ?
@@ -966,16 +877,6 @@ readysim:
     DbprintfEx(FLAG_NOLOG, "<- We're out of Emulation");
     // END SIM
 
-    /*for (;;) {
-        WDT_HIT();
-
-        int button_action = BUTTON_HELD(500);
-        if (button_action == 0) { // No button action, proceed with sim
-            SpinDelay(100);
-            WDT_HIT();
-
-        } else if (button_action == BUTTON_SINGLE_CLICK) {
-            */
     cjSetCursLeft();
 
     DbprintfEx(FLAG_NOLOG, "-> Trying a clone !");
@@ -987,15 +888,7 @@ readysim:
     DbprintfEx(FLAG_NOLOG, "-> End Cloning.");
     WDT_HIT();
 
-    // break;
-    /*} else if (button_action == BUTTON_HOLD) {
-        DbprintfEx(FLAG_RAWPRINT,"Playtime over. Begin cloning...");
-        iGotoClone = 1;
-        break;
-    }*/
-
     // Debunk...
-    // SpinDelay(300);
     cjSetCursLeft();
     cjTabulize();
     vtsend_set_attribute(NULL, 0);
@@ -1020,14 +913,13 @@ void e_MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *dat
     uint8_t numSectors = arg0;
     uint8_t keyType = arg1;
     uint64_t ui64Key = 0;
-    // uint32_t cuid;
+
     struct Crypto1State mpcs = {0, 0};
     struct Crypto1State *pcs;
     pcs = &mpcs;
 
     byte_t dataoutbuf[16];
     byte_t dataoutbuf2[16];
-    // uint8_t uid[10];
 
     iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
 
@@ -1035,7 +927,6 @@ void e_MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *dat
     set_tracing(false);
 
     bool isOK = true;
-    // iso14443a_fast_select_card(cjuid, 0);
 
     if (!iso14443a_select_card(cjuid, NULL, &cjcuid, true, 0, true))
     {
@@ -1113,22 +1004,17 @@ void e_MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *dat
         DbpString("EMUL FILL SECTORS FINISHED\n");
 }
 
-/* . . . */
-
 /* the chk function is a piwi’ed(tm) check that will try all keys for
 a particular sector. also no tracing no dbg */
-
 int cjat91_saMifareChkKeys(uint8_t blockNo, uint8_t keyType, bool clearTrace, uint8_t keyCount, uint8_t *datain, uint64_t *key)
 {
     MF_DBGLEVEL = MF_DBG_NONE;
     iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
     set_tracing(false);
-    // uint8_t uid[10];
-    // uint32_t cuid;
+
     struct Crypto1State mpcs = {0, 0};
     struct Crypto1State *pcs;
     pcs = &mpcs;
-    // byte_t isOK = 0;
 
     for (int i = 0; i < keyCount; ++i)
     {
@@ -1241,7 +1127,6 @@ void saMifareMakeTag(void)
 //-----------------------------------------------------------------------------
 int saMifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)
 {
-
     // params
     uint8_t needWipe = arg0;
     // bit 0 - need get UID
@@ -1259,9 +1144,7 @@ int saMifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *data
 
     // variables
     byte_t isOK = 0;
-    // uint8_t uid[10] = {0x00};
     uint8_t d_block[18] = {0x00};
-    // uint32_t cuid;
 
     uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];
     uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];
@@ -1270,7 +1153,6 @@ int saMifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *data
     if (workFlags & 0x08)
     {
         iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
-
         //  clear_trace();
         set_tracing(FALSE);
     }
@@ -1282,19 +1164,15 @@ int saMifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *data
         // get UID from chip
         if (workFlags & 0x01)
         {
-            // if (!iso14443a_fast_select_card(cjuid, 0)) {
-
             if (!iso14443a_select_card(cjuid, NULL, &cjcuid, true, 0, true))
             {
-                if (MF_DBGLEVEL >= 1)
-                    DbprintfEx(FLAG_NOLOG, "Can't select card");
+                DbprintfEx(FLAG_NOLOG, "Can't select card");
                 break;
             };
 
             if (mifare_classic_halt(NULL, cjcuid))
             {
-                if (MF_DBGLEVEL >= 1)
-                    DbprintfEx(FLAG_NOLOG, "Halt error");
+                DbprintfEx(FLAG_NOLOG, "Halt error");
                 break;
             };
         };
@@ -1305,7 +1183,6 @@ int saMifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *data
             ReaderTransmitBitsPar(wupC1, 7, 0, NULL);
             if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a))
             {
-                // if (MF_DBGLEVEL >= 1)
                 DbprintfEx(FLAG_NOLOG, "wupC1 error");
                 break;
             };
@@ -1313,15 +1190,13 @@ int saMifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *data
             ReaderTransmit(wipeC, sizeof(wipeC), NULL);
             if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a))
             {
-                if (MF_DBGLEVEL >= 1)
-                    DbprintfEx(FLAG_NOLOG, "wipeC error");
+                DbprintfEx(FLAG_NOLOG, "wipeC error");
                 break;
             };
 
             if (mifare_classic_halt(NULL, cjcuid))
             {
-                if (MF_DBGLEVEL >= 1)
-                    DbprintfEx(FLAG_NOLOG, "Halt error");
+                DbprintfEx(FLAG_NOLOG, "Halt error");
                 break;
             };
         };
@@ -1333,7 +1208,6 @@ int saMifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *data
             ReaderTransmitBitsPar(wupC1, 7, 0, NULL);
             if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a))
             {
-                // if (MF_DBGLEVEL >= 1)
                 DbprintfEx(FLAG_NOLOG, "wupC1 error");
                 break;
             };
@@ -1341,7 +1215,6 @@ int saMifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *data
             ReaderTransmit(wupC2, sizeof(wupC2), NULL);
             if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a))
             {
-                // if (MF_DBGLEVEL >= 1)
                 DbprintfEx(FLAG_NOLOG, "wupC2 errorv");
                 break;
             };
@@ -1349,7 +1222,6 @@ int saMifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *data
 
         if ((mifare_sendcmd_short(NULL, 0, 0xA0, blockNo, receivedAnswer, receivedAnswerPar, NULL) != 1) || (receivedAnswer[0] != 0x0a))
         {
-            // if (MF_DBGLEVEL >= 1)
             DbprintfEx(FLAG_NOLOG, "write block send command error");
             break;
         };
@@ -1359,7 +1231,6 @@ int saMifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *data
         ReaderTransmit(d_block, sizeof(d_block), NULL);
         if ((ReaderReceive(receivedAnswer, receivedAnswerPar) != 1) || (receivedAnswer[0] != 0x0a))
         {
-            // if (MF_DBGLEVEL >= 1)
             DbprintfEx(FLAG_NOLOG, "write block send data error");
             break;
         };
@@ -1368,7 +1239,6 @@ int saMifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *data
         {
             if (mifare_classic_halt(NULL, cjcuid))
             {
-                // if (MF_DBGLEVEL >= 1)
                 cjSetCursFRight();
 
                 DbprintfEx(FLAG_NOLOG, "Halt error");
diff --git a/armsrc/Standalone/hf_colin.h b/armsrc/Standalone/hf_colin.h
index dd3da6322..028c7b5b6 100644
--- a/armsrc/Standalone/hf_colin.h
+++ b/armsrc/Standalone/hf_colin.h
@@ -16,18 +16,15 @@
 #ifndef __HF_COLIN_H
 #define __HF_COLIN_H
 
-
 #include "proxmark3.h"
 #include "mifareutil.h"
 #include "iso14443a.h"
-//#include "printf.h"
 #include "protocols.h"
 #include "util.h"
 #include "standalone.h" // standalone definitions
 #include <stdbool.h>    // for bool
 #include <stdio.h>
 #include <string.h>
-//#include <stdio.h>
 #include "vtsend.h"
 #include "apps.h"
 #include "printf.h"
@@ -47,17 +44,17 @@ int cjat91_saMifareChkKeys(uint8_t blockNo, uint8_t keyType, bool clearTrace, ui
 void e_MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain);
 void saMifareMakeTag(void);
 int saMifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain);
-void cjPrintBigArray(const char *bigar, int len, uint8_t newlines, uint8_t debug);
 void WriteTagToFlash(uint8_t index, size_t size);
 
 const char clearTerm[8] = {0x1b, 0x5b, 0x48, 0x1b, 0x5b, 0x32, 0x4a, '\0'};
 
-void TestFlashmemSpeed(size_t buffersize, uint32_t spibaudrate);
+//void cjPrintBigArray(const char *bigar, int len, uint8_t newlines, uint8_t debug);
+//void TestFlashmemSpeed(size_t buffersize, uint32_t spibaudrate);
 
+//#define LOGO logo_kigiv
 
-#define LOGO logo_kigiv
-
-const char sub_banner[] = "                                          From Vigik : \"20 years of (un)security without a single update\"";
+const char sub_banner[] = "    From Vigik : \"20 years of (un)security without a single update\"";
+/*
 const char logo_kigiv[] = {
     0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x1b, 0x5b, 0x33, 0x38, 0x3b, 0x35,
     0x3b, 0x39, 0x35, 0x6d, 0x30, 0x1b, 0x5b, 0x33, 0x38, 0x3b, 0x35, 0x3b, 0x31, 0x33, 0x37, 0x6d, 0x30, 0x1b, 0x5b, 0x33, 0x38, 0x3b, 0x35, 0x3b, 0x39, 0x35,
@@ -418,6 +415,7 @@ const char logo_kigiv[] = {
     0x31, 0x1b, 0x5b, 0x33, 0x38, 0x3b, 0x35, 0x3b, 0x35, 0x39, 0x6d, 0x31, 0x1b, 0x5b, 0x33, 0x38, 0x3b, 0x35, 0x3b, 0x35, 0x39, 0x6d, 0x30, 0x1b, 0x5b, 0x33,
     0x38, 0x3b, 0x35, 0x3b, 0x35, 0x39, 0x6d, 0x31, 0x1b, 0x5b, 0x33, 0x38, 0x3b, 0x35, 0x3b, 0x35, 0x39, 0x6d, 0x31, 0x0d, 0x0a};
 unsigned int logo_kigiv_len = 9303;
+*/
 
 /*const char logo_kigiv_nocolor[] = {
     0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x30, 0x30, 0x30, 0x30, 0x20, 0x20,

From 5a03ea7135d6a08369a2816f2ca24d24f6fb747c Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Tue, 6 Nov 2018 19:14:19 +0100
Subject: [PATCH 0130/1938] chg: 'standalone mode BogRun' - cleaning

---
 armsrc/Standalone/hf_bog.c | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/armsrc/Standalone/hf_bog.c b/armsrc/Standalone/hf_bog.c
index 761e67b1a..510d08d02 100644
--- a/armsrc/Standalone/hf_bog.c
+++ b/armsrc/Standalone/hf_bog.c
@@ -43,8 +43,7 @@ uint8_t FindOffsetInFlash() {
 	return 0; // wrap-around
 }
 
-void EraseMemory()
-{
+void EraseMemory() {
     if (!FlashInit()){
         return;
     }
@@ -257,10 +256,7 @@ void RAMFUNC SniffAndStore(uint8_t param) {
 		
 		// Erase first page of flash mem
 		EraseMemory();
-		
-		//for (int i=0; i<memoffset + 4 * auth_attempts; i++)
-		//	if (MF_DBGLEVEL > 1) Dbprintf("[-] total_data[%d] = 0x%02x", i, total_data[i]);
-		
+				
 		// Write total data to flash mem
 		uint16_t writelen = Flash_WriteData(0, total_data, memoffset + 4 * auth_attempts);
 		if (MF_DBGLEVEL > 1) Dbprintf("[!] Wrote %u bytes into flash mem", writelen);
@@ -272,18 +268,13 @@ void RAMFUNC SniffAndStore(uint8_t param) {
 	}
 }
 
-void RunMod()
-{
+void RunMod() {
 	Dbprintf("Sniffing started");
 	
-    	SpinDelay(200);
-	
 	// param:
 	// bit 0 - trigger from first card answer
 	// bit 1 - trigger from first reader 7-bit request	
-	SniffAndStore(0);
-	
-	LEDsoff();
-	
+	SniffAndStore(0);	
+	LEDsoff();	
 	SpinDelay(300);
 }

From 078196773cdda29b9873851c5f2f90650fcf93ea Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Tue, 6 Nov 2018 22:20:55 +0100
Subject: [PATCH 0131/1938] CHG: 'standalone bogitorun' -  adapted some ledshow
 from Kigiv mode and increased time for user to stop pressing button after
 triggering the mode..

---
 armsrc/Standalone/hf_bog.c   | 15 ++++++--
 armsrc/Standalone/hf_colin.c | 68 ------------------------------------
 armsrc/Standalone/hf_colin.h |  2 --
 armsrc/util.c                | 64 +++++++++++++++++++++++++++++++++
 armsrc/util.h                | 11 +++++-
 5 files changed, 86 insertions(+), 74 deletions(-)

diff --git a/armsrc/Standalone/hf_bog.c b/armsrc/Standalone/hf_bog.c
index 510d08d02..bea2a1877 100644
--- a/armsrc/Standalone/hf_bog.c
+++ b/armsrc/Standalone/hf_bog.c
@@ -57,10 +57,9 @@ void EraseMemory() {
 	SpinDelay(100);
 }
 
+// This is actually copied from SniffIso14443a
 void RAMFUNC SniffAndStore(uint8_t param) {
 	
-	/* This is actually copied from SniffIso14443a */
-	
 	iso14443a_setup(FPGA_HF_ISO14443A_SNIFFER);
 	
 	// Allocate memory from BigBuf for some buffers
@@ -269,7 +268,16 @@ void RAMFUNC SniffAndStore(uint8_t param) {
 }
 
 void RunMod() {
-	Dbprintf("Sniffing started");
+	
+	Dbprintf(">>  Bogiton 14a Sniff UL/UL-EV1/NTAG a.k.a BogitoRun Started  <<");
+	Dbprintf("Starting to sniff");
+	
+	SpinDown(50);
+    SpinOff(50);
+    SpinUp(50);
+    SpinOff(50);
+    SpinDown(50);
+	SpinDelay(500);
 	
 	// param:
 	// bit 0 - trigger from first card answer
@@ -277,4 +285,5 @@ void RunMod() {
 	SniffAndStore(0);	
 	LEDsoff();	
 	SpinDelay(300);
+	Dbprintf("- [ End ] -> You can take shell back ...");
 }
diff --git a/armsrc/Standalone/hf_colin.c b/armsrc/Standalone/hf_colin.c
index 18547ee12..c91c05766 100644
--- a/armsrc/Standalone/hf_colin.c
+++ b/armsrc/Standalone/hf_colin.c
@@ -87,74 +87,6 @@ void cjPrintKey(uint64_t key, uint8_t *foundKey, uint16_t sectorNo, uint8_t type
     DbprintfEx(FLAG_NOLOG, "SEC: %02x | KEY : %s | TYP: %d", sectorNo, tosendkey, type);
 }
 
-void SpinOff(uint32_t pause)
-{
-    LED_A_OFF();
-    LED_B_OFF();
-    LED_C_OFF();
-    LED_D_OFF();
-    SpinDelay(pause);
-}
-
-// 0=A, 1=B, 2=C, 3=D
-void SpinErr(uint8_t led, uint32_t speed, uint8_t times)
-{
-    SpinOff(speed);
-    NTIME(times)
-    {
-        switch (led)
-        {
-        case 0:
-            LED_A_INV();
-            break;
-        case 1:
-            LED_B_INV();
-            break;
-        case 2:
-            LED_C_INV();
-            break;
-        case 3:
-            LED_D_INV();
-            break;
-        }
-        SpinDelay(speed);
-    }
-}
-
-void SpinDown(uint32_t speed)
-{
-    SpinOff(speed);
-    LED_D_ON();
-    SpinDelay(speed);
-    LED_D_OFF();
-    LED_C_ON();
-    SpinDelay(speed);
-    LED_C_OFF();
-    LED_B_ON();
-    SpinDelay(speed);
-    LED_B_OFF();
-    LED_A_ON();
-    SpinDelay(speed);
-    LED_A_OFF();
-}
-
-void SpinUp(uint32_t speed)
-{
-    SpinOff(speed);
-    LED_A_ON();
-    SpinDelay(speed);
-    LED_A_OFF();
-    LED_B_ON();
-    SpinDelay(speed);
-    LED_B_OFF();
-    LED_C_ON();
-    SpinDelay(speed);
-    LED_C_OFF();
-    LED_D_ON();
-    SpinDelay(speed);
-    LED_D_OFF();
-}
-
 void ReadLastTagFromFlash()
 {
     SpinOff(0);
diff --git a/armsrc/Standalone/hf_colin.h b/armsrc/Standalone/hf_colin.h
index 028c7b5b6..2b7879b6b 100644
--- a/armsrc/Standalone/hf_colin.h
+++ b/armsrc/Standalone/hf_colin.h
@@ -38,8 +38,6 @@
 #define _WHITE_ "\x1b[0m"
 #define _ORANGE_ _YELLOW_
 
-#define NTIME(n) for (int _index = 0; _index < n; _index++)
-
 int cjat91_saMifareChkKeys(uint8_t blockNo, uint8_t keyType, bool clearTrace, uint8_t keyCount, uint8_t *datain, uint64_t *key);
 void e_MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain);
 void saMifareMakeTag(void);
diff --git a/armsrc/util.c b/armsrc/util.c
index b5be57923..77ef3a494 100644
--- a/armsrc/util.c
+++ b/armsrc/util.c
@@ -154,6 +154,70 @@ void LED(int led, int ms) {
 		LED_D_OFF();
 }
 
+void SpinOff(uint32_t pause) {
+    LED_A_OFF();
+    LED_B_OFF();
+    LED_C_OFF();
+    LED_D_OFF();
+    SpinDelay(pause);
+}
+
+// 0=A, 1=B, 2=C, 3=D
+void SpinErr(uint8_t led, uint32_t speed, uint8_t times) {
+    SpinOff(speed);
+    NTIME(times) 
+	{
+        switch (led) {
+        case 0:
+            LED_A_INV();
+            break;
+        case 1:
+            LED_B_INV();
+            break;
+        case 2:
+            LED_C_INV();
+            break;
+        case 3:
+            LED_D_INV();
+            break;
+        }
+        SpinDelay(speed);
+    }
+}
+
+void SpinDown(uint32_t speed) {
+    SpinOff(speed);
+    LED_D_ON();
+    SpinDelay(speed);
+    LED_D_OFF();
+    LED_C_ON();
+    SpinDelay(speed);
+    LED_C_OFF();
+    LED_B_ON();
+    SpinDelay(speed);
+    LED_B_OFF();
+    LED_A_ON();
+    SpinDelay(speed);
+    LED_A_OFF();
+}
+
+void SpinUp(uint32_t speed) {
+    SpinOff(speed);
+    LED_A_ON();
+    SpinDelay(speed);
+    LED_A_OFF();
+    LED_B_ON();
+    SpinDelay(speed);
+    LED_B_OFF();
+    LED_C_ON();
+    SpinDelay(speed);
+    LED_C_OFF();
+    LED_D_ON();
+    SpinDelay(speed);
+    LED_D_OFF();
+}
+
+
 // Determine if a button is double clicked, single clicked,
 // not clicked, or held down (for ms || 1sec)
 // In general, don't use this function unless you expect a
diff --git a/armsrc/util.h b/armsrc/util.h
index 77fd81ee4..cc613b273 100644
--- a/armsrc/util.h
+++ b/armsrc/util.h
@@ -39,6 +39,10 @@
 # define ARRAYLEN(x) (sizeof(x)/sizeof((x)[0]))
 #endif
 
+#ifndef NTIME
+# define NTIME(n) for (int _index = 0; _index < n; _index++)
+#endif
+
 size_t nbytes(size_t nbits);
 
 extern uint32_t reflect(uint32_t v, int b); // used in crc.c ...
@@ -53,7 +57,12 @@ int32_t le24toh (uint8_t data[3]);
 uint8_t hex2int(char hexchar);
 
 void LED(int led, int ms);
-void LEDsoff();
+void LEDsoff(void);
+void SpinOff(uint32_t pause);
+void SpinErr(uint8_t led, uint32_t speed, uint8_t times);
+void SpinDown(uint32_t speed);
+void SpinUp(uint32_t speed);
+
 int BUTTON_CLICKED(int ms);
 int BUTTON_HELD(int ms);
 void FormatVersionInformation(char *dst, int len, const char *prefix, void *version_information);

From c75c0e4e52a64130827951b4bbb55942ac43ab9a Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Wed, 7 Nov 2018 12:21:57 +0100
Subject: [PATCH 0132/1938] chg: cleaning up in lfdemod.c,  currently the ASK
 clock, demod of strong and weak signals

---
 common/lfdemod.c | 126 ++++++++++++++++++++++++++++-------------------
 1 file changed, 75 insertions(+), 51 deletions(-)

diff --git a/common/lfdemod.c b/common/lfdemod.c
index 4714cdb69..6b755d3dc 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -322,7 +322,7 @@ size_t findModStart(uint8_t *src, size_t size, uint8_t expWaveSize) {
 	uint8_t thresholdCnt = 0;
 	bool isAboveThreshold = src[i++] >= signalprop.mean; //FSK_PSK_THRESHOLD;
 	for (; i < size-20; i++ ) {
-		if(src[i] < signalprop.mean && isAboveThreshold) {
+		if (src[i] < signalprop.mean && isAboveThreshold) {
 			thresholdCnt++;
 			if (thresholdCnt > 2 && waveSizeCnt < expWaveSize+1) break;			
 			isAboveThreshold = false;
@@ -341,20 +341,12 @@ size_t findModStart(uint8_t *src, size_t size, uint8_t expWaveSize) {
 	return i;
 }
 
-// iceman:  ranges the old defintion,  becomes very forgiving when clock speed increase.
-//  clocks[i] - (clocks[i]/8) && testclk <= clocks[i]+1 )
-//  8 (7-9)
-// 16 (14-17)
-// 32 (28-33)
-// 40 (35-41)
-// 50 (46-51)
-// 64 (56-65)
-// 128 (112-129)
 int getClosestClock(int testclk) {
-	uint8_t clocks[] = {8,16,32,40,50,64,128};
+	uint16_t clocks[] = {8, 16, 32, 40, 50, 64, 128, 256, 384};
+	uint8_t limit[]  = {1,  2,  4,  4,  5,  8,   8,   8,   8};
 
-	for (uint8_t i = 0; i < 7; i++)
-		if ( testclk >= clocks[i]-2 && testclk <= clocks[i]+1 )
+	for (uint8_t i = 0; i < 9; i++)
+		if ( testclk >= clocks[i]-limit[i] && testclk <= clocks[i]+limit[i] )
 			return clocks[i];
 
 	return 0;
@@ -543,8 +535,9 @@ int DetectStrongAskClock(uint8_t *dest, size_t size, int high, int low, int *clo
 	// set clock
 	if (g_debugMode == 2) prnt("DEBUG ASK: DetectStrongAskClock smallest wave: %d", minClk);
 	*clock = getClosestClock(minClk);
+
 	if (*clock == 0) 
-		return 0;
+		return -1;
 	
 	return shortestWaveIdx;
 }
@@ -554,43 +547,60 @@ int DetectStrongAskClock(uint8_t *dest, size_t size, int high, int low, int *clo
 // maybe somehow adjust peak trimming value based on samples to fix?
 // return start index of best starting position for that clock and return clock (by reference)
 int DetectASKClock(uint8_t *dest, size_t size, int *clock, int maxErr) {
-	size_t i = 1;
-	uint16_t clk[] = {255,8,16,32,40,50,64,100,128,255};
-	uint16_t clkEnd = 9;
-	uint16_t loopCnt = 1500;  //don't need to loop through entire array...  (cotag has clock of 384)
-	if (size <= loopCnt + 60) return -1; //not enough samples
-	size -= 60; //sometimes there is a strange end wave - filter out this....
-	//if we already have a valid clock
-	uint8_t clockFnd = 0;
-	for (; i < clkEnd; ++i) {
-		if (clk[i] == *clock) {
-			//clock found but continue to find best startpos
-			clockFnd = i;
-		}
-	}
 
+	//don't need to loop through entire array. (cotag has clock of 384)
+	uint16_t loopCnt = 1500;  
+
+	// not enough samples
+	if (size <= loopCnt + 60){
+		if (g_debugMode == 2) prnt("DEBUG DetectASKClock: not enough samples - aborting");
+		return -1; 
+	}
+	
 	// just noise - no super good detection. good enough
 	if (signalprop.isnoise) {
 		if (g_debugMode == 2) prnt("DEBUG DetectASKClock: just noise detected - aborting");
-		return -1;
+		return -2;
 	}
 	
-	//get high and low peak
+	size_t i = 1;
+	uint16_t num_clks = 9;
+	// first 255 value pos0 is placeholder for user inputed clock.
+	uint16_t clk[] = {255, 8, 16, 32, 40, 50, 64, 100, 128, 255};
+	
+	// sometimes there is a strange end wave - filter out this
+	size -= 60; 
+
+	// What is purpose?
+	// already have a valid clock?
+	uint8_t found_clk = 0;
+	for (; i < num_clks; ++i) {
+		if (clk[i] == *clock) {
+			found_clk = i;
+		}
+	}
+
+	// threshold 75% of high, low peak
 	int peak_hi, peak_low;
 	getHiLo(&peak_hi, &peak_low, 75, 75);
 	
-	//test for large clean peaks
-	if (!clockFnd){
+	// test for large clean, STRONG, CLIPPED peaks
+	
+	if (!found_clk) {
+		
 		if (DetectCleanAskWave(dest, size, peak_hi, peak_low)){
 		
 			int idx = DetectStrongAskClock(dest, size, peak_hi, peak_low, clock);
 			if (g_debugMode == 2) 
-				prnt("DEBUG ASK: detectaskclk Clean Ask Wave Detected: clk %i, Best Starting Position: %i", *clock, idx);
-			if (idx > 0)
-				return idx; //return shortest wave start position
-
+				prnt("DEBUG ASK: DetectASKClock Clean ASK Wave detected: clk %i, Best Starting Position: %i", *clock, idx);
+			
+			// return shortest wave start position
+			if (idx > -1)
+				return idx;
 		}
 	}
+	// test for weak peaks
+	
 	// test clock if given as cmd parameter
 	if ( *clock > 0 )
 		clk[0] = *clock;
@@ -601,15 +611,15 @@ int DetectASKClock(uint8_t *dest, size_t size, int *clock, int maxErr) {
 	uint8_t bestStart[] = {0,0,0,0,0,0,0,0,0};
 	size_t errCnt = 0, arrLoc, loopEnd;
 
-	if (clockFnd > 0) {
-		clkCnt = clockFnd;
-		clkEnd = clockFnd+1;
+	if (found_clk) {
+		clkCnt = found_clk;
+		num_clks = found_clk + 1;
 	} else {
 		clkCnt = 1;
 	}
 
 	//test each valid clock from smallest to greatest to see which lines up
-	for (; clkCnt < clkEnd; clkCnt++) {
+	for (; clkCnt < num_clks; clkCnt++) {
 		if (clk[clkCnt] <= 32) {
 			tol = 1;
 		} else {
@@ -640,15 +650,15 @@ int DetectASKClock(uint8_t *dest, size_t size, int *clock, int maxErr) {
 					errCnt++;
 				}
 			}
-			//if we found no errors then we can stop here and a low clock (common clocks)
+			// if we found no errors then we can stop here and a low clock (common clocks)
 			//  this is correct one - return this clock
-			//if (g_debugMode == 2) prnt("DEBUG ASK: clk %d, err %d, startpos %d, endpos %d", clk[clkCnt], errCnt, j, i);
+			// if (g_debugMode == 2) prnt("DEBUG ASK: clk %d, err %d, startpos %d, endpos %d", clk[clkCnt], errCnt, j, i);
 			if (errCnt == 0 && clkCnt < 7) { 
-				if (!clockFnd) 
+				if (!found_clk) 
 					*clock = clk[clkCnt];
 				return j;
 			}	
-			//if we found errors see if it is lowest so far and save it as best run
+			// if we found errors see if it is lowest so far and save it as best run
 			if (errCnt < bestErr[clkCnt]) {
 				bestErr[clkCnt] = errCnt;
 				bestStart[clkCnt] = j;
@@ -658,7 +668,7 @@ int DetectASKClock(uint8_t *dest, size_t size, int *clock, int maxErr) {
 	
 	uint8_t k, best = 0;
 	
-	for (k=1; k < clkEnd; ++k){
+	for (k=1; k < num_clks; ++k){
 		if (bestErr[k] < bestErr[best]){
 			if (bestErr[k] == 0) bestErr[k] = 1;
 			// current best bit to error ratio     vs  new bit to error ratio
@@ -668,7 +678,9 @@ int DetectASKClock(uint8_t *dest, size_t size, int *clock, int maxErr) {
 		}
 		//if (g_debugMode == 2) prnt("DEBUG ASK: clk %d, # Errors %d, Current Best Clk %d, bestStart %d", clk[k], bestErr[k], clk[best], bestStart[best]);
 	}
-	if (!clockFnd) *clock = clk[best];
+	
+	if (!found_clk) 
+		*clock = clk[best];
 	
 	return bestStart[best];
 }
@@ -1419,14 +1431,14 @@ int manrawdecode(uint8_t *bits, size_t *size, uint8_t invert, uint8_t *alignPos)
 int cleanAskRawDemod(uint8_t *bits, size_t *size, int clk, int invert, int high, int low, int *startIdx) {
 	*startIdx = 0;
 	size_t bitCnt = 0, smplCnt = 1, errCnt = 0, pos = 0;
-
 	uint8_t cl_4 = clk / 4;
 	uint8_t cl_2 = clk / 2;
-
-	getNextHigh(bits, *size, high, &pos);
 	bool waveHigh = true;
 	
-	for (size_t i=pos; i < *size; i++){
+	getNextHigh(bits, *size, high, &pos);
+
+	// sample counts,   like clock = 32.. it tries to find  32/4 = 8,  32/2 = 16
+	for (size_t i = pos; i < *size; i++){
 		if (bits[i] >= high && waveHigh){
 			smplCnt++;
 		} else if (bits[i] <= low && !waveHigh){
@@ -1434,10 +1446,13 @@ int cleanAskRawDemod(uint8_t *bits, size_t *size, int clk, int invert, int high,
 		} else { //transition
 			if ((bits[i] >= high && !waveHigh) || (bits[i] <= low && waveHigh)){
 
+				// 32-8-1 = 23
+				// 32+8+1 = 41
 				if (smplCnt > clk - cl_4 - 1) { //full clock
+				
 					if (smplCnt > clk + cl_4 + 1) { //too many samples
 						errCnt++;
-						if (g_debugMode == 2) prnt("DEBUG:(cleanAskRawDemod) ASK Modulation Error at: %u", i);
+						if (g_debugMode == 2) prnt("DEBUG ASK: cleanAskRawDemod ASK Modulation Error FULL at: %u  [%u]", i, smplCnt);
 						bits[bitCnt++] = 7;
 					} else if (waveHigh) {
 						bits[bitCnt++] = invert;
@@ -1450,7 +1465,16 @@ int cleanAskRawDemod(uint8_t *bits, size_t *size, int clk, int invert, int high,
 						*startIdx = i - clk;
 					waveHigh = !waveHigh;  
 					smplCnt = 0;
+					
+				// 16-8-1 = 7
 				} else if (smplCnt > cl_2 - cl_4 - 1) { //half clock
+				
+					if (smplCnt > cl_2 + cl_4 + 1) { //too many samples
+						errCnt++;
+						if (g_debugMode == 2) prnt("DEBUG ASK: cleanAskRawDemod ASK Modulation Error HALF at: %u  [%u]", i, smplCnt);
+						bits[bitCnt++] = 7;
+					}
+				
 					if (waveHigh) {
 						bits[bitCnt++] = invert;
 					} else if (!waveHigh) {

From 6ab12db7a0e80faff6df53951fc033d34add4af7 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 7 Nov 2018 18:05:02 +0200
Subject: [PATCH 0133/1938] mbedtls added

---
 client/Makefile                               |   21 +-
 client/cmdhf14b.h                             |    2 +-
 client/cmdhfmf.h                              |    2 +-
 client/cmdhfmfp.c                             |    2 +-
 client/crypto/asn1utils.c                     |   63 +
 client/crypto/asn1utils.h                     |   21 +
 client/crypto/libpcrypto.c                    |  381 ++
 .../polarssl => client/crypto}/libpcrypto.h   |   10 +
 client/emv/crypto_polarssl.c                  |   73 +-
 client/emv/test/cryptotest.c                  |   62 +-
 client/mifare4.c                              |    2 +-
 client/obj/crypto/.dummy                      |    0
 common/mbedtls/Makefile                       |   86 +
 common/mbedtls/aes.c                          | 2125 +++++++++++
 common/mbedtls/aes.h                          |  628 ++++
 common/mbedtls/arc4.c                         |  203 ++
 common/mbedtls/arc4.h                         |  143 +
 common/mbedtls/asn1.h                         |  360 ++
 common/mbedtls/asn1parse.c                    |  391 ++
 common/mbedtls/asn1write.c                    |  392 +++
 common/mbedtls/asn1write.h                    |  242 ++
 common/{polarssl => mbedtls}/base64.c         |   36 +-
 common/{polarssl => mbedtls}/base64.h         |   22 +-
 common/mbedtls/bignum.c                       | 2470 +++++++++++++
 common/mbedtls/bignum.h                       |  774 ++++
 common/mbedtls/blowfish.c                     |  654 ++++
 common/mbedtls/blowfish.h                     |  246 ++
 common/mbedtls/bn_mul.h                       |  895 +++++
 common/mbedtls/camellia.c                     | 1070 ++++++
 common/mbedtls/camellia.h                     |  273 ++
 common/mbedtls/certs.c                        |  405 +++
 common/mbedtls/certs.h                        |  102 +
 common/mbedtls/check_config.h                 |  685 ++++
 common/mbedtls/cipher.c                       | 1108 ++++++
 common/mbedtls/cipher.h                       |  808 +++++
 common/mbedtls/cipher_internal.h              |  127 +
 common/mbedtls/cipher_wrap.c                  | 2274 ++++++++++++
 common/mbedtls/cmac.c                         | 1080 ++++++
 common/mbedtls/cmac.h                         |  208 ++
 common/mbedtls/config.h                       | 3129 +++++++++++++++++
 common/mbedtls/ctr_drbg.c                     |  652 ++++
 common/mbedtls/ctr_drbg.h                     |  332 ++
 common/mbedtls/des.c                          | 1059 ++++++
 common/mbedtls/des.h                          |  352 ++
 common/mbedtls/ecdsa.c                        |  463 +++
 common/mbedtls/ecdsa.h                        |  341 ++
 common/mbedtls/ecp.c                          | 2209 ++++++++++++
 common/mbedtls/ecp.h                          |  766 ++++
 common/mbedtls/ecp_curves.c                   | 1462 ++++++++
 common/mbedtls/ecp_internal.h                 |  295 ++
 common/mbedtls/entropy.c                      |  723 ++++
 common/mbedtls/entropy.h                      |  291 ++
 common/mbedtls/entropy_poll.c                 |  277 ++
 common/mbedtls/entropy_poll.h                 |  112 +
 common/mbedtls/error.c                        |  897 +++++
 common/mbedtls/error.h                        |  124 +
 common/mbedtls/md.c                           |  477 +++
 common/mbedtls/md.h                           |  468 +++
 common/mbedtls/md5.c                          |  497 +++
 common/mbedtls/md5.h                          |  308 ++
 common/mbedtls/md_internal.h                  |  117 +
 common/mbedtls/md_wrap.c                      |  588 ++++
 common/mbedtls/oid.c                          |  757 ++++
 common/mbedtls/oid.h                          |  607 ++++
 common/mbedtls/pem.c                          |  490 +++
 common/mbedtls/pem.h                          |  132 +
 common/mbedtls/pk.c                           |  381 ++
 common/mbedtls/pk.h                           |  620 ++++
 common/mbedtls/pk_internal.h                  |  117 +
 common/mbedtls/pk_wrap.c                      |  525 +++
 common/mbedtls/pkcs12.c                       |  363 ++
 common/mbedtls/pkcs12.h                       |  122 +
 common/mbedtls/pkcs5.c                        |  428 +++
 common/mbedtls/pkcs5.h                        |   97 +
 common/mbedtls/pkparse.c                      | 1449 ++++++++
 common/mbedtls/platform.c                     |  341 ++
 common/mbedtls/platform.h                     |  366 ++
 common/mbedtls/platform_util.c                |   69 +
 common/mbedtls/platform_util.h                |   64 +
 common/mbedtls/rsa.c                          | 2400 +++++++++++++
 common/mbedtls/rsa.h                          | 1133 ++++++
 common/mbedtls/rsa_internal.c                 |  489 +++
 common/mbedtls/rsa_internal.h                 |  228 ++
 common/{polarssl => mbedtls}/sha1.c           |  468 +--
 common/mbedtls/sha1.h                         |  326 ++
 common/{polarssl => mbedtls}/sha256.c         |  214 +-
 common/mbedtls/sha256.h                       |  274 ++
 common/mbedtls/sha512.c                       |  612 ++++
 common/mbedtls/sha512.h                       |  272 ++
 common/mbedtls/threading.c                    |  142 +
 common/mbedtls/threading.h                    |  110 +
 common/mbedtls/timing.c                       |  547 +++
 common/mbedtls/timing.h                       |  155 +
 common/mbedtls/x509.c                         | 1073 ++++++
 common/mbedtls/x509.h                         |  335 ++
 common/mbedtls/x509_crl.c                     |  775 ++++
 common/mbedtls/x509_crl.h                     |  176 +
 common/mbedtls/x509_crt.c                     | 2488 +++++++++++++
 common/mbedtls/x509_crt.h                     |  672 ++++
 common/polarssl/aes.c                         | 1454 --------
 common/polarssl/aes.h                         |  256 --
 common/polarssl/aes_cmac128.c                 |  322 --
 common/polarssl/aes_cmac128.h                 |   81 -
 common/polarssl/bignum.c                      | 2143 -----------
 common/polarssl/bignum.h                      |  685 ----
 common/polarssl/bn_mul.h                      |  864 -----
 common/polarssl/hmac_drbg.c                   |  533 ---
 common/polarssl/hmac_drbg.h                   |  300 --
 common/polarssl/libpcrypto.c                  |   78 -
 common/polarssl/rsa.c                         | 1466 --------
 common/polarssl/rsa.h                         |  597 ----
 common/polarssl/sha1.h                        |  213 --
 common/polarssl/sha256.h                      |  142 -
 113 files changed, 53771 insertions(+), 9565 deletions(-)
 create mode 100644 client/crypto/asn1utils.c
 create mode 100644 client/crypto/asn1utils.h
 create mode 100644 client/crypto/libpcrypto.c
 rename {common/polarssl => client/crypto}/libpcrypto.h (65%)
 create mode 100644 client/obj/crypto/.dummy
 create mode 100644 common/mbedtls/Makefile
 create mode 100644 common/mbedtls/aes.c
 create mode 100644 common/mbedtls/aes.h
 create mode 100644 common/mbedtls/arc4.c
 create mode 100644 common/mbedtls/arc4.h
 create mode 100644 common/mbedtls/asn1.h
 create mode 100644 common/mbedtls/asn1parse.c
 create mode 100644 common/mbedtls/asn1write.c
 create mode 100644 common/mbedtls/asn1write.h
 rename common/{polarssl => mbedtls}/base64.c (87%)
 rename common/{polarssl => mbedtls}/base64.h (77%)
 create mode 100644 common/mbedtls/bignum.c
 create mode 100644 common/mbedtls/bignum.h
 create mode 100644 common/mbedtls/blowfish.c
 create mode 100644 common/mbedtls/blowfish.h
 create mode 100644 common/mbedtls/bn_mul.h
 create mode 100644 common/mbedtls/camellia.c
 create mode 100644 common/mbedtls/camellia.h
 create mode 100644 common/mbedtls/certs.c
 create mode 100644 common/mbedtls/certs.h
 create mode 100644 common/mbedtls/check_config.h
 create mode 100644 common/mbedtls/cipher.c
 create mode 100644 common/mbedtls/cipher.h
 create mode 100644 common/mbedtls/cipher_internal.h
 create mode 100644 common/mbedtls/cipher_wrap.c
 create mode 100644 common/mbedtls/cmac.c
 create mode 100644 common/mbedtls/cmac.h
 create mode 100644 common/mbedtls/config.h
 create mode 100644 common/mbedtls/ctr_drbg.c
 create mode 100644 common/mbedtls/ctr_drbg.h
 create mode 100644 common/mbedtls/des.c
 create mode 100644 common/mbedtls/des.h
 create mode 100644 common/mbedtls/ecdsa.c
 create mode 100644 common/mbedtls/ecdsa.h
 create mode 100644 common/mbedtls/ecp.c
 create mode 100644 common/mbedtls/ecp.h
 create mode 100644 common/mbedtls/ecp_curves.c
 create mode 100644 common/mbedtls/ecp_internal.h
 create mode 100644 common/mbedtls/entropy.c
 create mode 100644 common/mbedtls/entropy.h
 create mode 100644 common/mbedtls/entropy_poll.c
 create mode 100644 common/mbedtls/entropy_poll.h
 create mode 100644 common/mbedtls/error.c
 create mode 100644 common/mbedtls/error.h
 create mode 100644 common/mbedtls/md.c
 create mode 100644 common/mbedtls/md.h
 create mode 100644 common/mbedtls/md5.c
 create mode 100644 common/mbedtls/md5.h
 create mode 100644 common/mbedtls/md_internal.h
 create mode 100644 common/mbedtls/md_wrap.c
 create mode 100644 common/mbedtls/oid.c
 create mode 100644 common/mbedtls/oid.h
 create mode 100644 common/mbedtls/pem.c
 create mode 100644 common/mbedtls/pem.h
 create mode 100644 common/mbedtls/pk.c
 create mode 100644 common/mbedtls/pk.h
 create mode 100644 common/mbedtls/pk_internal.h
 create mode 100644 common/mbedtls/pk_wrap.c
 create mode 100644 common/mbedtls/pkcs12.c
 create mode 100644 common/mbedtls/pkcs12.h
 create mode 100644 common/mbedtls/pkcs5.c
 create mode 100644 common/mbedtls/pkcs5.h
 create mode 100644 common/mbedtls/pkparse.c
 create mode 100644 common/mbedtls/platform.c
 create mode 100644 common/mbedtls/platform.h
 create mode 100644 common/mbedtls/platform_util.c
 create mode 100644 common/mbedtls/platform_util.h
 create mode 100644 common/mbedtls/rsa.c
 create mode 100644 common/mbedtls/rsa.h
 create mode 100644 common/mbedtls/rsa_internal.c
 create mode 100644 common/mbedtls/rsa_internal.h
 rename common/{polarssl => mbedtls}/sha1.c (50%)
 create mode 100644 common/mbedtls/sha1.h
 rename common/{polarssl => mbedtls}/sha256.c (70%)
 create mode 100644 common/mbedtls/sha256.h
 create mode 100644 common/mbedtls/sha512.c
 create mode 100644 common/mbedtls/sha512.h
 create mode 100644 common/mbedtls/threading.c
 create mode 100644 common/mbedtls/threading.h
 create mode 100644 common/mbedtls/timing.c
 create mode 100644 common/mbedtls/timing.h
 create mode 100644 common/mbedtls/x509.c
 create mode 100644 common/mbedtls/x509.h
 create mode 100644 common/mbedtls/x509_crl.c
 create mode 100644 common/mbedtls/x509_crl.h
 create mode 100644 common/mbedtls/x509_crt.c
 create mode 100644 common/mbedtls/x509_crt.h
 delete mode 100644 common/polarssl/aes.c
 delete mode 100644 common/polarssl/aes.h
 delete mode 100644 common/polarssl/aes_cmac128.c
 delete mode 100644 common/polarssl/aes_cmac128.h
 delete mode 100644 common/polarssl/bignum.c
 delete mode 100644 common/polarssl/bignum.h
 delete mode 100644 common/polarssl/bn_mul.h
 delete mode 100644 common/polarssl/hmac_drbg.c
 delete mode 100644 common/polarssl/hmac_drbg.h
 delete mode 100644 common/polarssl/libpcrypto.c
 delete mode 100644 common/polarssl/rsa.c
 delete mode 100644 common/polarssl/rsa.h
 delete mode 100644 common/polarssl/sha1.h
 delete mode 100644 common/polarssl/sha256.h

diff --git a/client/Makefile b/client/Makefile
index a31be08d5..03c4c1288 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -25,6 +25,8 @@ OBJDIR = obj
 
 LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm
 LUALIB = ../liblua/liblua.a
+MBEDTLSLIBPATH = ../common/mbedtls
+MBEDTLSLIB = $(MBEDTLSLIBPATH)/libmbedtls.a
 LDFLAGS = $(ENV_LDFLAGS)
 INCLUDES_CLIENT = -I. -I../include -I../common -I../common/polarssl -I../zlib -I../uart -I/opt/local/include -I../liblua
 CFLAGS = $(ENV_CFLAGS) -std=c99 -D_ISOC99_SOURCE -DPRESETS $(INCLUDES_CLIENT) -Wall -g -O3
@@ -104,14 +106,8 @@ CMDSRCS =	crapto1/crapto1.c \
 			mfkey.c \
 			tea.c \
 			polarssl/des.c \
-			polarssl/aes.c \
-			polarssl/aes_cmac128.c \
-			polarssl/bignum.c \
-			polarssl/rsa.c \
-			polarssl/sha1.c \
-			polarssl/sha256.c \
-			polarssl/base64.c \
-			polarssl/libpcrypto.c \
+			crypto/libpcrypto.c\
+			crypto/asn1utils.c\
 			cliparser/argtable3.c\
 			cliparser/cliparser.c\
 			loclass/cipher.c \
@@ -260,7 +256,7 @@ WINBINS = $(patsubst %, %.exe, $(BINS))
 CLEAN = $(BINS) $(WINBINS) $(COREOBJS) $(CMDOBJS) $(OBJCOBJS) $(ZLIBOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(OBJDIR)/*.o *.moc.cpp ui/ui_overlays.h lualibs/usb_cmd.lua lualibs/mf_default_keys.lua
 
 # need to assign dependancies to build these first...
-all: lua_build $(BINS) 
+all: lua_build mbedtls_build $(BINS) 
 
 all-static: LDLIBS:=-static $(LDLIBS)
 all-static: proxmark3 flasher fpga_compress
@@ -292,6 +288,7 @@ lualibs/mf_default_keys.lua : default_keys.dic
 clean:
 	$(RM) $(CLEAN)
 	cd ../liblua && make clean
+	cd $(MBEDTLSLIBPATH) && make clean
 
 tarbin: $(BINS)
 	$(TAR) $(TARFLAGS) ../proxmark3-$(platform)-bin.tar $(BINS:%=client/%) $(WINBINS:%=client/%)
@@ -299,7 +296,11 @@ tarbin: $(BINS)
 lua_build:
 	@echo Compiling liblua, using platform $(LUAPLATFORM)
 	cd ../liblua && make $(LUAPLATFORM)
-
+	
+mbedtls_build:
+	@echo Compiling mbedtls
+	cd $(MBEDTLSLIBPATH) && make all
+	
 .PHONY: all clean
 
 # easy printing of MAKE VARIABLES
diff --git a/client/cmdhf14b.h b/client/cmdhf14b.h
index 6b44a7304..793949c86 100644
--- a/client/cmdhf14b.h
+++ b/client/cmdhf14b.h
@@ -25,7 +25,7 @@
 #include "cmdhf14a.h"
 #include "cmdhf.h"
 #include "prng.h"
-#include "sha1.h"
+#include "mbedtls/sha1.h"
 #include "mifare.h"		// structs/enum for ISO14B
 #include "protocols.h"	// definitions of ISO14B protocol
 
diff --git a/client/cmdhfmf.h b/client/cmdhfmf.h
index b253ac0bb..eeb7a74f6 100644
--- a/client/cmdhfmf.h
+++ b/client/cmdhfmf.h
@@ -16,7 +16,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <time.h>
-#include <aes.h>
+#include <mbedtls/aes.h>
 #include "proxmark3.h"
 #include "iso14443crc.h"
 #include "ui.h"
diff --git a/client/cmdhfmfp.c b/client/cmdhfmfp.c
index 78cec3e2c..0d7a623d4 100644
--- a/client/cmdhfmfp.c
+++ b/client/cmdhfmfp.c
@@ -24,7 +24,7 @@
 #include "mifare.h"
 #include "mifare4.h"
 #include "cliparser/cliparser.h"
-#include "polarssl/libpcrypto.h"
+#include "crypto/libpcrypto.h"
 
 static const uint8_t DefaultKey[16] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
 
diff --git a/client/crypto/asn1utils.c b/client/crypto/asn1utils.c
new file mode 100644
index 000000000..2a3fe698b
--- /dev/null
+++ b/client/crypto/asn1utils.c
@@ -0,0 +1,63 @@
+//-----------------------------------------------------------------------------
+// Copyright (C) 2018 Merlok
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// asn.1 utils
+//-----------------------------------------------------------------------------
+
+#include "asn1utils.h"
+#include <mbedtls/asn1.h>
+
+int ecdsa_asn1_get_signature(uint8_t *signature, size_t signaturelen, uint8_t *rval, uint8_t *sval) {
+	if (!signature || !signaturelen || !rval || !sval)
+		return 1;
+
+	int res = 0;
+	unsigned char *p = signature;
+	const unsigned char *end = p + signaturelen;
+	size_t len;
+	mbedtls_mpi xmpi;
+
+	if ((res = mbedtls_asn1_get_tag(&p, end, &len, MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE)) == 0) {
+		mbedtls_mpi_init(&xmpi);
+		res = mbedtls_asn1_get_mpi(&p, end, &xmpi);
+		if (res) {
+			mbedtls_mpi_free(&xmpi);
+			goto exit;
+		}
+		
+		res = mbedtls_mpi_write_binary(&xmpi, rval, 32);
+		mbedtls_mpi_free(&xmpi);
+		if (res) 
+			goto exit;
+
+		mbedtls_mpi_init(&xmpi);
+		res = mbedtls_asn1_get_mpi(&p, end, &xmpi);
+		if (res) {
+			mbedtls_mpi_free(&xmpi);
+			goto exit;
+		}
+		
+		res = mbedtls_mpi_write_binary(&xmpi, sval, 32);
+		mbedtls_mpi_free(&xmpi);
+		if (res) 
+			goto exit;
+
+		// check size
+		if (end != p)
+			return 2;
+		}
+
+exit:
+	return res;
+}
+
+int asn1_print(uint8_t *asn1buf, int level) {
+	
+	return 0;
+}
+
+
diff --git a/client/crypto/asn1utils.h b/client/crypto/asn1utils.h
new file mode 100644
index 000000000..2b00f4501
--- /dev/null
+++ b/client/crypto/asn1utils.h
@@ -0,0 +1,21 @@
+//-----------------------------------------------------------------------------
+// Copyright (C) 2018 Merlok
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// asn.1 utils
+//-----------------------------------------------------------------------------
+
+#ifndef ASN1UTILS_H
+#define ASN1UTILS_H
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <stddef.h>
+
+extern int asn1_print(uint8_t *asn1buf, int level);
+extern int ecdsa_asn1_get_signature(uint8_t *signature, size_t signaturelen, uint8_t *rval, uint8_t *sval);
+
+#endif /* asn1utils.h */
diff --git a/client/crypto/libpcrypto.c b/client/crypto/libpcrypto.c
new file mode 100644
index 000000000..030be15a3
--- /dev/null
+++ b/client/crypto/libpcrypto.c
@@ -0,0 +1,381 @@
+//-----------------------------------------------------------------------------
+// Copyright (C) 2018 Merlok
+// Copyright (C) 2018 drHatson
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// crypto commands
+//-----------------------------------------------------------------------------
+
+#include "crypto/libpcrypto.h"
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <mbedtls/asn1.h>
+#include <mbedtls/aes.h>
+#include <mbedtls/cmac.h>
+#include <mbedtls/ecdsa.h>
+#include <mbedtls/sha256.h>
+#include <mbedtls/ctr_drbg.h>
+#include <mbedtls/entropy.h>
+#include <mbedtls/error.h>
+#include <crypto/asn1utils.h>
+#include <util.h>
+
+// NIST Special Publication 800-38A — Recommendation for block cipher modes of operation: methods and techniques, 2001.
+int aes_encode(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *output, int length){
+	uint8_t iiv[16] = {0};
+	if (iv)
+		memcpy(iiv, iv, 16);
+	
+	mbedtls_aes_context aes;
+	mbedtls_aes_init(&aes);
+	if (mbedtls_aes_setkey_enc(&aes, key, 128))
+		return 1;
+	if (mbedtls_aes_crypt_cbc(&aes, MBEDTLS_AES_ENCRYPT, length, iiv, input, output))
+		return 2;
+	mbedtls_aes_free(&aes);
+
+	return 0;
+}
+
+int aes_decode(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *output, int length){
+	uint8_t iiv[16] = {0};
+	if (iv)
+		memcpy(iiv, iv, 16);
+	
+	mbedtls_aes_context aes;
+	mbedtls_aes_init(&aes);
+	if (mbedtls_aes_setkey_dec(&aes, key, 128))
+		return 1;
+	if (mbedtls_aes_crypt_cbc(&aes, MBEDTLS_AES_DECRYPT, length, iiv, input, output))
+		return 2;
+	mbedtls_aes_free(&aes);
+
+	return 0;
+}
+
+// NIST Special Publication 800-38B — Recommendation for block cipher modes of operation: The CMAC mode for authentication.
+// https://csrc.nist.gov/CSRC/media/Projects/Cryptographic-Standards-and-Guidelines/documents/examples/AES_CMAC.pdf
+int aes_cmac(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *mac, int length) {
+	memset(mac, 0x00, 16);
+	
+	//  NIST 800-38B 
+	return mbedtls_aes_cmac_prf_128(key, MBEDTLS_AES_BLOCK_SIZE, input, length, mac);
+}
+
+int aes_cmac8(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *mac, int length) {
+	uint8_t cmac[16] = {0};
+	memset(mac, 0x00, 8);
+	
+	int res = aes_cmac(iv, key, input, cmac, length);
+	if (res)
+		return res;
+	
+	for(int i = 0; i < 8; i++) 
+		mac[i] = cmac[i * 2 + 1];
+
+	return 0;
+}
+
+static uint8_t fixed_rand_value[250] = {0};
+static int fixed_rand(void *rng_state, unsigned char *output, size_t len) {
+	if (len <= 250) {
+		memcpy(output, fixed_rand_value, len);
+	} else {
+		memset(output, 0x00, len);
+	}
+	
+	return 0;
+}
+
+int sha256hash(uint8_t *input, int length, uint8_t *hash) {
+	if (!hash || !input)
+		return 1;
+	
+	mbedtls_sha256_context sctx;
+	mbedtls_sha256_init(&sctx);
+	mbedtls_sha256_starts(&sctx, 0); // SHA-256, not 224 
+	mbedtls_sha256_update(&sctx, input, length);
+	mbedtls_sha256_finish(&sctx, hash);	
+	mbedtls_sha256_free(&sctx);
+	
+	return 0;
+}
+
+int ecdsa_init_str(mbedtls_ecdsa_context *ctx, char * key_d, char *key_x, char *key_y) {
+	if (!ctx)
+		return 1;
+	
+	int res;
+
+	mbedtls_ecdsa_init(ctx);
+	res = mbedtls_ecp_group_load(&ctx->grp, MBEDTLS_ECP_DP_SECP256R1); // secp256r1
+	if (res) 
+		return res;
+	
+	if (key_d) {
+		res = mbedtls_mpi_read_string(&ctx->d, 16, key_d);
+		if (res) 
+			return res;
+	}
+	
+	if (key_x && key_y) {
+		res = mbedtls_ecp_point_read_string(&ctx->Q, 16, key_x, key_y);
+		if (res) 
+			return res;
+	}
+	
+	return 0;
+}
+
+int ecdsa_init(mbedtls_ecdsa_context *ctx, uint8_t * key_d, uint8_t *key_xy) {
+	if (!ctx)
+		return 1;
+	
+	int res;
+
+	mbedtls_ecdsa_init(ctx);
+	res = mbedtls_ecp_group_load(&ctx->grp, MBEDTLS_ECP_DP_SECP256R1); // secp256r1
+	if (res) 
+		return res;
+	
+	if (key_d) {
+		res = mbedtls_mpi_read_binary(&ctx->d, key_d, 32);
+		if (res) 
+			return res;
+	}
+	
+	if (key_xy) {
+		res = mbedtls_ecp_point_read_binary(&ctx->grp, &ctx->Q, key_xy, 32 * 2 + 1);
+		if (res) 
+			return res;
+	}
+	
+	return 0;
+}
+
+int ecdsa_key_create(uint8_t * key_d, uint8_t *key_xy) {
+	int res;
+	mbedtls_ecdsa_context ctx;
+	ecdsa_init(&ctx, NULL, NULL);
+
+
+    mbedtls_entropy_context entropy;
+    mbedtls_ctr_drbg_context ctr_drbg;
+	const char *pers = "ecdsaproxmark";
+
+    mbedtls_entropy_init(&entropy);
+    mbedtls_ctr_drbg_init(&ctr_drbg);
+
+    res = mbedtls_ctr_drbg_seed(&ctr_drbg, mbedtls_entropy_func, &entropy, (const unsigned char *)pers, strlen(pers));
+	if (res)
+        goto exit;
+
+    res = mbedtls_ecdsa_genkey(&ctx, MBEDTLS_ECP_DP_SECP256R1, mbedtls_ctr_drbg_random, &ctr_drbg);
+	if (res)
+		goto exit;
+
+	res = mbedtls_mpi_write_binary(&ctx.d, key_d, 32);
+	if (res)
+		goto exit;
+
+	size_t keylen = 0;
+	uint8_t public_key[200] = {0};
+	res = mbedtls_ecp_point_write_binary(&ctx.grp, &ctx.Q, MBEDTLS_ECP_PF_UNCOMPRESSED, &keylen, public_key, sizeof(public_key));
+	if (res)
+		goto exit;
+	
+	if (keylen != 65) { // 0x04 <key x 32b><key y 32b>
+		res = 1;
+		goto exit;
+	}
+	memcpy(key_xy, public_key, 65);
+
+exit:
+    mbedtls_entropy_free(&entropy);
+    mbedtls_ctr_drbg_free(&ctr_drbg);
+	mbedtls_ecdsa_free(&ctx);
+	return res;
+}
+
+char *ecdsa_get_error(int ret) {
+	static char retstr[300];
+	memset(retstr, 0x00, sizeof(retstr));
+	mbedtls_strerror(ret, retstr, sizeof(retstr));
+	return retstr;
+}
+
+int ecdsa_signature_create(uint8_t *key_d, uint8_t *key_xy, uint8_t *input, int length, uint8_t *signature, size_t *signaturelen) {
+	int res;
+	*signaturelen = 0;
+	
+	uint8_t shahash[32] = {0}; 
+	res = sha256hash(input, length, shahash);
+	if (res)
+		return res;
+
+    mbedtls_entropy_context entropy;
+    mbedtls_ctr_drbg_context ctr_drbg;
+	const char *pers = "ecdsaproxmark";
+
+    mbedtls_entropy_init(&entropy);
+    mbedtls_ctr_drbg_init(&ctr_drbg);
+
+    res = mbedtls_ctr_drbg_seed(&ctr_drbg, mbedtls_entropy_func, &entropy, (const unsigned char *)pers, strlen(pers));
+	if (res)
+        goto exit;
+
+	mbedtls_ecdsa_context ctx;	
+	ecdsa_init(&ctx, key_d, key_xy);
+	res = mbedtls_ecdsa_write_signature(&ctx, MBEDTLS_MD_SHA256, shahash, sizeof(shahash), signature, signaturelen, mbedtls_ctr_drbg_random, &ctr_drbg);
+	
+exit:
+    mbedtls_ctr_drbg_free(&ctr_drbg);
+	mbedtls_ecdsa_free(&ctx);
+	return res;
+}
+
+int ecdsa_signature_create_test(char * key_d, char *key_x, char *key_y, char *random, uint8_t *input, int length, uint8_t *signature, size_t *signaturelen) {
+	int res;
+	*signaturelen = 0;
+	
+	uint8_t shahash[32] = {0}; 
+	res = sha256hash(input, length, shahash);
+	if (res)
+		return res;
+
+	int rndlen = 0;
+	param_gethex_to_eol(random, 0, fixed_rand_value, sizeof(fixed_rand_value), &rndlen);
+	
+	mbedtls_ecdsa_context ctx;	
+	ecdsa_init_str(&ctx, key_d, key_x, key_y);
+	res = mbedtls_ecdsa_write_signature(&ctx, MBEDTLS_MD_SHA256, shahash, sizeof(shahash), signature, signaturelen, fixed_rand, NULL);
+	
+	mbedtls_ecdsa_free(&ctx);
+	return res;
+}
+
+int ecdsa_signature_verify_keystr(char *key_x, char *key_y, uint8_t *input, int length, uint8_t *signature, size_t signaturelen) {
+	int res;
+	uint8_t shahash[32] = {0}; 
+	res = sha256hash(input, length, shahash);
+	if (res)
+		return res;
+
+	mbedtls_ecdsa_context ctx;	
+	ecdsa_init_str(&ctx, NULL, key_x, key_y);
+	res = mbedtls_ecdsa_read_signature(&ctx, shahash, sizeof(shahash), signature, signaturelen);
+	
+	mbedtls_ecdsa_free(&ctx);
+	return res;
+}
+
+int ecdsa_signature_verify(uint8_t *key_xy, uint8_t *input, int length, uint8_t *signature, size_t signaturelen) {
+	int res;
+	uint8_t shahash[32] = {0}; 
+	res = sha256hash(input, length, shahash);
+	if (res)
+		return res;
+
+	mbedtls_ecdsa_context ctx;	
+	ecdsa_init(&ctx, NULL, key_xy);
+	res = mbedtls_ecdsa_read_signature(&ctx, shahash, sizeof(shahash), signature, signaturelen);
+	
+	mbedtls_ecdsa_free(&ctx);
+	return res;
+}
+
+#define T_PRIVATE_KEY "C477F9F65C22CCE20657FAA5B2D1D8122336F851A508A1ED04E479C34985BF96"
+#define T_Q_X         "B7E08AFDFE94BAD3F1DC8C734798BA1C62B3A0AD1E9EA2A38201CD0889BC7A19"
+#define T_Q_Y         "3603F747959DBF7A4BB226E41928729063ADC7AE43529E61B563BBC606CC5E09"
+#define T_K           "7A1A7E52797FC8CAAA435D2A4DACE39158504BF204FBE19F14DBB427FAEE50AE"
+#define T_R           "2B42F576D07F4165FF65D1F3B1500F81E44C316F1F0B3EF57325B69ACA46104F"
+#define T_S           "DC42C2122D6392CD3E3A993A89502A8198C1886FE69D262C4B329BDB6B63FAF1"
+
+int ecdsa_nist_test(bool verbose) {
+	int res;
+	uint8_t input[] = "Example of ECDSA with P-256";
+	int length = strlen((char *)input);
+	uint8_t signature[300] = {0}; 
+	size_t siglen = 0; 
+
+	// NIST ecdsa test
+	if (verbose)
+		printf("  ECDSA NIST test: ");
+	// make signature
+	res = ecdsa_signature_create_test(T_PRIVATE_KEY, T_Q_X, T_Q_Y, T_K, input, length, signature, &siglen);
+//	printf("res: %x signature[%x]: %s\n", (res<0)?-res:res, siglen, sprint_hex(signature, siglen));
+	if (res) 
+		goto exit;
+
+	// check vectors
+	uint8_t rval[300] = {0}; 
+	uint8_t sval[300] = {0}; 
+	res = ecdsa_asn1_get_signature(signature, siglen, rval, sval);
+	if (res)
+		goto exit;
+	
+	int slen = 0;
+	uint8_t rval_s[33] = {0};
+	param_gethex_to_eol(T_R, 0, rval_s, sizeof(rval_s), &slen);
+	uint8_t sval_s[33] = {0}; 
+	param_gethex_to_eol(T_S, 0, sval_s, sizeof(sval_s), &slen);
+	if (strncmp((char *)rval, (char *)rval_s, 32) || strncmp((char *)sval, (char *)sval_s, 32)) {
+		printf("R or S check error\n");
+		res = 100;
+		goto exit;
+	}
+	
+	// verify signature
+	res = ecdsa_signature_verify_keystr(T_Q_X, T_Q_Y, input, length, signature, siglen);
+	if (res) 
+		goto exit;
+		
+	// verify wrong signature
+	input[0] ^= 0xFF;
+	res = ecdsa_signature_verify_keystr(T_Q_X, T_Q_Y, input, length, signature, siglen);
+	if (!res) {
+		res = 1;
+		goto exit;
+	}
+	if (verbose)
+		printf("passed\n");
+
+	// random ecdsa test
+	if (verbose)
+		printf("  ECDSA binary signature create/check test: ");
+
+	uint8_t key_d[32] = {0};
+	uint8_t key_xy[32 * 2 + 2] = {0};
+	memset(signature, 0x00, sizeof(signature));
+	siglen = 0;
+	
+	res = ecdsa_key_create(key_d, key_xy);
+	if (res) 
+		goto exit;
+
+	res = ecdsa_signature_create(key_d, key_xy, input, length, signature, &siglen);
+	if (res) 
+		goto exit;
+
+	res = ecdsa_signature_verify(key_xy, input, length, signature, siglen);
+	if (res) 
+		goto exit;
+
+	input[0] ^= 0xFF;
+	res = ecdsa_signature_verify(key_xy, input, length, signature, siglen);
+	if (!res) 
+		goto exit;
+	
+	if (verbose)
+		printf("passed\n\n");
+	
+	return 0;
+exit:
+	if (verbose)
+		printf("failed\n\n");
+	return res;
+}
diff --git a/common/polarssl/libpcrypto.h b/client/crypto/libpcrypto.h
similarity index 65%
rename from common/polarssl/libpcrypto.h
rename to client/crypto/libpcrypto.h
index 1b74c143f..8d4b4a0d0 100644
--- a/common/polarssl/libpcrypto.h
+++ b/client/crypto/libpcrypto.h
@@ -12,6 +12,7 @@
 #define LIBPCRYPTO_H
 
 #include <stdint.h>
+#include <stdbool.h>
 #include <stddef.h>
 
 extern int aes_encode(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *output, int length);
@@ -19,4 +20,13 @@ extern int aes_decode(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *output
 extern int aes_cmac(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *mac, int length);
 extern int aes_cmac8(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *mac, int length);
 
+extern int sha256hash(uint8_t *input, int length, uint8_t *hash);
+
+extern int ecdsa_key_create(uint8_t * key_d, uint8_t *key_xy);
+extern int ecdsa_signature_create(uint8_t *key_d, uint8_t *key_xy, uint8_t *input, int length, uint8_t *signature, size_t *signaturelen);
+extern int ecdsa_signature_verify(uint8_t *key_xy, uint8_t *input, int length, uint8_t *signature, size_t signaturelen);
+extern char *ecdsa_get_error(int ret);
+
+extern int ecdsa_nist_test(bool verbose);
+
 #endif /* libpcrypto.h */
diff --git a/client/emv/crypto_polarssl.c b/client/emv/crypto_polarssl.c
index cf68b40ea..938535059 100644
--- a/client/emv/crypto_polarssl.c
+++ b/client/emv/crypto_polarssl.c
@@ -24,13 +24,14 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
-#include "rsa.h"
-#include "sha1.h"
+#include "mbedtls/rsa.h"
+#include "mbedtls/sha1.h"
 
 struct crypto_hash_polarssl {
 	struct crypto_hash ch;
-	sha1_context ctx;
+	mbedtls_sha1_context ctx;
 };
 
 static void crypto_hash_polarssl_close(struct crypto_hash *_ch)
@@ -44,7 +45,7 @@ static void crypto_hash_polarssl_write(struct crypto_hash *_ch, const unsigned c
 {
 	struct crypto_hash_polarssl *ch = (struct crypto_hash_polarssl *)_ch;
 
-	sha1_update(&(ch->ctx), buf, len);
+	mbedtls_sha1_update(&(ch->ctx), buf, len);
 }
 
 static unsigned char *crypto_hash_polarssl_read(struct crypto_hash *_ch)
@@ -52,7 +53,7 @@ static unsigned char *crypto_hash_polarssl_read(struct crypto_hash *_ch)
 	struct crypto_hash_polarssl *ch = (struct crypto_hash_polarssl *)_ch;
 
 	static unsigned char sha1sum[20];
-	sha1_finish(&(ch->ctx), sha1sum);
+	mbedtls_sha1_finish(&(ch->ctx), sha1sum);
 	return sha1sum;
 }
 
@@ -71,7 +72,7 @@ static struct crypto_hash *crypto_hash_polarssl_open(enum crypto_algo_hash hash)
 
 	struct crypto_hash_polarssl *ch = malloc(sizeof(*ch));
 
-	sha1_starts(&(ch->ctx));
+	mbedtls_sha1_starts(&(ch->ctx));
 
 	ch->ch.write = crypto_hash_polarssl_write;
 	ch->ch.read = crypto_hash_polarssl_read;
@@ -83,7 +84,7 @@ static struct crypto_hash *crypto_hash_polarssl_open(enum crypto_algo_hash hash)
 
 struct crypto_pk_polarssl {
 	struct crypto_pk cp;
-	rsa_context ctx;
+	mbedtls_rsa_context ctx;
 };
 
 static struct crypto_pk *crypto_pk_polarssl_open_rsa(va_list vl)
@@ -96,13 +97,13 @@ static struct crypto_pk *crypto_pk_polarssl_open_rsa(va_list vl)
 	char *exp = va_arg(vl, char *);	 // E
 	int explen = va_arg(vl, size_t);
 
-	rsa_init(&cp->ctx, RSA_PKCS_V15, 0);
+	mbedtls_rsa_init(&cp->ctx, MBEDTLS_RSA_PKCS_V15, 0);
 	
 	cp->ctx.len = modlen; // size(N) in bytes
-	mpi_read_binary(&cp->ctx.N, (const unsigned char *)mod, modlen);
-	mpi_read_binary(&cp->ctx.E, (const unsigned char *)exp, explen);
+	mbedtls_mpi_read_binary(&cp->ctx.N, (const unsigned char *)mod, modlen);
+	mbedtls_mpi_read_binary(&cp->ctx.E, (const unsigned char *)exp, explen);
 	
-	int res = rsa_check_pubkey(&cp->ctx);
+	int res = mbedtls_rsa_check_pubkey(&cp->ctx);
 	if(res != 0) {
 		fprintf(stderr, "PolarSSL public key error res=%x exp=%d mod=%d.\n", res * -1, explen, modlen);
 		free(cp);
@@ -134,23 +135,23 @@ static struct crypto_pk *crypto_pk_polarssl_open_priv_rsa(va_list vl)
 //	char *inv = va_arg(vl, char *);
 //	int invlen = va_arg(vl, size_t);	
 	
-	rsa_init(&cp->ctx, RSA_PKCS_V15, 0);
+	mbedtls_rsa_init(&cp->ctx, MBEDTLS_RSA_PKCS_V15, 0);
 	
 	cp->ctx.len = modlen; // size(N) in bytes
-	mpi_read_binary(&cp->ctx.N,  (const unsigned char *)mod, modlen);
-	mpi_read_binary(&cp->ctx.E,  (const unsigned char *)exp, explen);
+	mbedtls_mpi_read_binary(&cp->ctx.N,  (const unsigned char *)mod, modlen);
+	mbedtls_mpi_read_binary(&cp->ctx.E,  (const unsigned char *)exp, explen);
 
-	mpi_read_binary(&cp->ctx.D,  (const unsigned char *)d, dlen);
-	mpi_read_binary(&cp->ctx.P,  (const unsigned char *)p, plen);
-	mpi_read_binary(&cp->ctx.Q,  (const unsigned char *)q, qlen);
-	mpi_read_binary(&cp->ctx.DP, (const unsigned char *)dp, dplen);
-	mpi_read_binary(&cp->ctx.DQ, (const unsigned char *)dq, dqlen);
-	mpi_inv_mod(&cp->ctx.QP, &cp->ctx.Q, &cp->ctx.P);
+	mbedtls_mpi_read_binary(&cp->ctx.D,  (const unsigned char *)d, dlen);
+	mbedtls_mpi_read_binary(&cp->ctx.P,  (const unsigned char *)p, plen);
+	mbedtls_mpi_read_binary(&cp->ctx.Q,  (const unsigned char *)q, qlen);
+	mbedtls_mpi_read_binary(&cp->ctx.DP, (const unsigned char *)dp, dplen);
+	mbedtls_mpi_read_binary(&cp->ctx.DQ, (const unsigned char *)dq, dqlen);
+	mbedtls_mpi_inv_mod(&cp->ctx.QP, &cp->ctx.Q, &cp->ctx.P);
 	
-	int res = rsa_check_privkey(&cp->ctx);
+	int res = mbedtls_rsa_check_privkey(&cp->ctx);
 	if(res != 0) {
 		fprintf(stderr, "PolarSSL private key error res=%x exp=%d mod=%d.\n", res * -1, explen, modlen);
-		free(cp);		
+		free(cp);
 		return NULL;
 	}
 
@@ -182,10 +183,10 @@ static struct crypto_pk *crypto_pk_polarssl_genkey_rsa(va_list vl)
 	if (transient) {
 	}
 	
-	int res = rsa_gen_key(&cp->ctx, &myrand, NULL, nbits, exp);
+	int res = mbedtls_rsa_gen_key(&cp->ctx, &myrand, NULL, nbits, exp);
 	if (res) {
 		fprintf(stderr, "PolarSSL private key generation error res=%x exp=%d nbits=%d.\n", res * -1, exp, nbits);
-		free(cp);		
+		free(cp);
 		return NULL;
 	}
 	
@@ -196,7 +197,7 @@ static void crypto_pk_polarssl_close(struct crypto_pk *_cp)
 {
 	struct crypto_pk_polarssl *cp = (struct crypto_pk_polarssl *)_cp;
 
-	rsa_free(&cp->ctx);
+	mbedtls_rsa_free(&cp->ctx);
 	free(cp);
 }
 
@@ -207,7 +208,7 @@ static unsigned char *crypto_pk_polarssl_encrypt(const struct crypto_pk *_cp, co
 	unsigned char *result;
 	
 	*clen = 0;
-	size_t keylen = mpi_size(&cp->ctx.N);
+	size_t keylen = mbedtls_mpi_size(&cp->ctx.N);
 
 	result = malloc(keylen);
 	if (!result) {
@@ -215,9 +216,9 @@ static unsigned char *crypto_pk_polarssl_encrypt(const struct crypto_pk *_cp, co
 		return NULL;
 	}
 
-	res = rsa_public(&cp->ctx, buf, result);
-	if (res) {
-		printf("RSA encrypt failed. Error: %x data len: %zu key len: %zu\n", res * -1, len, keylen);
+	res = mbedtls_rsa_public(&cp->ctx, buf, result);
+	if(res) {
+		printf("RSA encrypt failed. Error: %x data len: %zd key len: %zd\n", res * -1, len, keylen);
 		free(result);
 		return NULL;
 	}
@@ -234,7 +235,7 @@ static unsigned char *crypto_pk_polarssl_decrypt(const struct crypto_pk *_cp, co
 	unsigned char *result;
 	
 	*clen = 0;
-	size_t keylen = mpi_size(&cp->ctx.N);
+	size_t keylen = mbedtls_mpi_size(&cp->ctx.N);
 
 	result = malloc(keylen);
 	if (!result) {
@@ -242,9 +243,9 @@ static unsigned char *crypto_pk_polarssl_decrypt(const struct crypto_pk *_cp, co
 		return NULL;
 	}
 
-	res = rsa_private(&cp->ctx, buf, result); // CHECK???
+	res = mbedtls_rsa_private(&cp->ctx, NULL, NULL, buf, result); // CHECK???
 	if(res) {
-		printf("RSA decrypt failed. Error: %x data len: %zu key len: %zu\n", res * -1, len, keylen);
+		printf("RSA decrypt failed. Error: %x data len: %zd key len: %zd\n", res * -1, len, keylen);
 		free(result);
 		return NULL;
 	}
@@ -269,17 +270,17 @@ static unsigned char *crypto_pk_polarssl_get_parameter(const struct crypto_pk *_
 	switch(param){
 		// mod
 		case 0:
-			*plen = mpi_size(&cp->ctx.N);
+			*plen = mbedtls_mpi_size(&cp->ctx.N);
 			result = malloc(*plen);
 			memset(result, 0x00, *plen);
-			mpi_write_binary(&cp->ctx.N, result, *plen);
+			mbedtls_mpi_write_binary(&cp->ctx.N, result, *plen);
 			break;
 		// exp
 		case 1:
-			*plen = mpi_size(&cp->ctx.E);
+			*plen = mbedtls_mpi_size(&cp->ctx.E);
 			result = malloc(*plen);
 			memset(result, 0x00, *plen);
-			mpi_write_binary(&cp->ctx.E, result, *plen);
+			mbedtls_mpi_write_binary(&cp->ctx.E, result, *plen);
 			break;
 		default:
 			printf("Error get parameter. Param=%d", param);
diff --git a/client/emv/test/cryptotest.c b/client/emv/test/cryptotest.c
index b9be38ad5..1d5891fe0 100644
--- a/client/emv/test/cryptotest.c
+++ b/client/emv/test/cryptotest.c
@@ -12,38 +12,70 @@
 #include "util.h"
 #include "ui.h"
 
-#include "bignum.h"
-#include "aes.h"
-#include "aes_cmac128.h"
-#include "des.h"
-#include "rsa.h"
-#include "sha1.h"
+#include "mbedtls/bignum.h"
+#include "mbedtls/aes.h"
+#include "mbedtls/cmac.h"
+#include "mbedtls/des.h"
+#include "mbedtls/ecp.h"
+#include "mbedtls/rsa.h"
+#include "mbedtls/sha1.h"
+#include "mbedtls/md5.h"
+#include "mbedtls/x509.h"
+#include "mbedtls/base64.h"
+#include "mbedtls/ctr_drbg.h"
+#include "mbedtls/entropy.h"
+#include "mbedtls/timing.h"
 
 #include "crypto_test.h"
 #include "sda_test.h"
 #include "dda_test.h"
 #include "cda_test.h"
+#include "crypto/libpcrypto.h"
 
 int ExecuteCryptoTests(bool verbose) {
 	int res;
 	bool TestFail = false;
 	
-	res = mpi_self_test(verbose);
+	res = mbedtls_mpi_self_test(verbose);
 	if (res) TestFail = true;
 	
-	res = aes_self_test(verbose);
+	res = mbedtls_aes_self_test(verbose);
+	if (res) TestFail = true;
+
+	res = mbedtls_des_self_test(verbose);
 	if (res) TestFail = true;
 	
-	res = aes_cmac_self_test(verbose);
+	res = mbedtls_sha1_self_test(verbose);
+	if (res) TestFail = true;
+
+	res = mbedtls_md5_self_test(verbose);
 	if (res) TestFail = true;
 	
-	res = des_self_test(verbose);
+	res = mbedtls_rsa_self_test(verbose);
 	if (res) TestFail = true;
 	
-	res = sha1_self_test(verbose);
+	res = mbedtls_entropy_self_test(verbose);
+	if (res) TestFail = true;
+
+	res = mbedtls_timing_self_test(verbose);
+	if (res) TestFail = true;
+
+	res = mbedtls_ctr_drbg_self_test(verbose);
 	if (res) TestFail = true;
 	
-	res = rsa_self_test(verbose);
+	res = mbedtls_base64_self_test(verbose);
+	if (res) TestFail = true;
+
+	res = mbedtls_cmac_self_test(verbose);
+	if (res) TestFail = true;
+
+	res = ecdsa_nist_test(verbose);
+	if (res) TestFail = true;
+
+	res = mbedtls_ecp_self_test(verbose);
+	if (res) TestFail = true;
+
+	res = mbedtls_x509_self_test(verbose);
 	if (res) TestFail = true;
 	
 	res = exec_sda_test(verbose);
@@ -58,11 +90,11 @@ int ExecuteCryptoTests(bool verbose) {
 	res = exec_crypto_test(verbose);
 	if (res) TestFail = true;
 
-	PrintAndLogEx(NORMAL, "\n--------------------------");
+	PrintAndLog("\n--------------------------");
 	if (TestFail)
-		PrintAndLogEx(ERR, "Test(s) [ERROR].");
+		PrintAndLog("Test(s) [ERROR].");
 	else
-		PrintAndLogEx(SUCCESS, "Tests [OK].");
+		PrintAndLog("Tests [OK].");
 	
 	return TestFail;
 }
diff --git a/client/mifare4.c b/client/mifare4.c
index 8f9bd9e67..39869ab77 100644
--- a/client/mifare4.c
+++ b/client/mifare4.c
@@ -15,7 +15,7 @@
 #include "cmdhf14a.h"
 #include "util.h"
 #include "ui.h"
-#include "polarssl/libpcrypto.h"
+#include "crypto/libpcrypto.h"
 
 int CalculateEncIVCommand(mf4Session *session, uint8_t *iv, bool verbose) {
 	memcpy(&iv[0], session->TI, 4);
diff --git a/client/obj/crypto/.dummy b/client/obj/crypto/.dummy
new file mode 100644
index 000000000..e69de29bb
diff --git a/common/mbedtls/Makefile b/common/mbedtls/Makefile
new file mode 100644
index 000000000..3e57fdac2
--- /dev/null
+++ b/common/mbedtls/Makefile
@@ -0,0 +1,86 @@
+
+LIB_A = libmbedtls.a
+mbedtls_SOURCES = \
+	aes.c \
+	asn1parse.c \
+	asn1write.c \
+	base64.c \
+	bignum.c \
+	ctr_drbg.c \
+	entropy_poll.c \
+	entropy.c \
+	error.c \
+	timing.c \
+	ecp.c \
+	ecp_curves.c \
+	certs.c \
+	camellia.c \
+	blowfish.c \
+	cipher_wrap.c \
+	cipher.c \
+	cmac.c \
+	des.c \
+	ecdsa.c \
+	md.c \
+	md_wrap.c \
+	md5.c \
+	oid.c \
+	pem.c \
+	arc4.c \
+	pk.c \
+	pk_wrap.c \
+	pkcs5.c \
+	pkcs12.c \
+	pkparse.c \
+	platform.c \
+	platform_util.c \
+	rsa.c \
+	rsa_internal.c \
+	sha1.c \
+	sha256.c \
+	sha512.c \
+	threading.c \
+	x509.c \
+	x509_crl.c \
+	x509_crt.c
+mbedtls_LDFLAGS = \
+	-no-undefined \
+	-export-symbols-regex '^mbedtls_' \
+	-version-info 15:0:11
+
+	
+CFILES = $(filter %.c, $(mbedtls_SOURCES))
+CMDOBJS = $(CFILES:%.c=%.o)
+CLEAN = $(CMDOBJS)
+	
+CC= gcc
+CFLAGS= -O2 -Wall -Wno-unused-variable -Wno-unused-function
+LDFLAGS= $(SYSLDFLAGS) $(mbedtls_LDFLAGS)
+LIBS= -lm $(SYSLIBS) $(MYLIBS)
+DEFAULT_INCLUDES = -I. -I..
+DEFS = -DHAVE_STDINT_H
+
+AR= ar rcs
+RANLIB= ranlib
+RM= rm -f
+TST= echo
+
+SYSLDFLAGS=
+SYSLIBS=
+
+MYLIBS=
+MYOBJS=
+
+all: $(CMDOBJS)
+	$(AR) $(LIB_A) $(CMDOBJS)
+	$(RANLIB) $(LIB_A)
+	
+clean:
+	$(RM) $(CLEAN)
+	$(RM) $(LIB_A)
+	
+%.o: %.c
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(CFLAGS) -c -o $@ $< $(LIBS)
+	
+.PHONY: all clean
+
diff --git a/common/mbedtls/aes.c b/common/mbedtls/aes.c
new file mode 100644
index 000000000..07391ecd5
--- /dev/null
+++ b/common/mbedtls/aes.c
@@ -0,0 +1,2125 @@
+/*
+ *  FIPS-197 compliant AES implementation
+ *
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+/*
+ *  The AES block cipher was designed by Vincent Rijmen and Joan Daemen.
+ *
+ *  http://csrc.nist.gov/encryption/aes/rijndael/Rijndael.pdf
+ *  http://csrc.nist.gov/publications/fips/fips197/fips-197.pdf
+ */
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "mbedtls/config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#if defined(MBEDTLS_AES_C)
+
+#include <string.h>
+
+#include "mbedtls/aes.h"
+#include "mbedtls/platform_util.h"
+#if defined(MBEDTLS_PADLOCK_C)
+#include "mbedtls/padlock.h"
+#endif
+#if defined(MBEDTLS_AESNI_C)
+#include "mbedtls/aesni.h"
+#endif
+
+#if defined(MBEDTLS_SELF_TEST)
+#if defined(MBEDTLS_PLATFORM_C)
+#include "mbedtls/platform.h"
+#else
+#include <stdio.h>
+#define mbedtls_printf printf
+#endif /* MBEDTLS_PLATFORM_C */
+#endif /* MBEDTLS_SELF_TEST */
+
+#if !defined(MBEDTLS_AES_ALT)
+
+/*
+ * 32-bit integer manipulation macros (little endian)
+ */
+#ifndef GET_UINT32_LE
+#define GET_UINT32_LE(n,b,i)                            \
+{                                                       \
+    (n) = ( (uint32_t) (b)[(i)    ]       )             \
+        | ( (uint32_t) (b)[(i) + 1] <<  8 )             \
+        | ( (uint32_t) (b)[(i) + 2] << 16 )             \
+        | ( (uint32_t) (b)[(i) + 3] << 24 );            \
+}
+#endif
+
+#ifndef PUT_UINT32_LE
+#define PUT_UINT32_LE(n,b,i)                                    \
+{                                                               \
+    (b)[(i)    ] = (unsigned char) ( ( (n)       ) & 0xFF );    \
+    (b)[(i) + 1] = (unsigned char) ( ( (n) >>  8 ) & 0xFF );    \
+    (b)[(i) + 2] = (unsigned char) ( ( (n) >> 16 ) & 0xFF );    \
+    (b)[(i) + 3] = (unsigned char) ( ( (n) >> 24 ) & 0xFF );    \
+}
+#endif
+
+#if defined(MBEDTLS_PADLOCK_C) &&                      \
+    ( defined(MBEDTLS_HAVE_X86) || defined(MBEDTLS_PADLOCK_ALIGN16) )
+static int aes_padlock_ace = -1;
+#endif
+
+#if defined(MBEDTLS_AES_ROM_TABLES)
+/*
+ * Forward S-box
+ */
+static const unsigned char FSb[256] =
+{
+    0x63, 0x7C, 0x77, 0x7B, 0xF2, 0x6B, 0x6F, 0xC5,
+    0x30, 0x01, 0x67, 0x2B, 0xFE, 0xD7, 0xAB, 0x76,
+    0xCA, 0x82, 0xC9, 0x7D, 0xFA, 0x59, 0x47, 0xF0,
+    0xAD, 0xD4, 0xA2, 0xAF, 0x9C, 0xA4, 0x72, 0xC0,
+    0xB7, 0xFD, 0x93, 0x26, 0x36, 0x3F, 0xF7, 0xCC,
+    0x34, 0xA5, 0xE5, 0xF1, 0x71, 0xD8, 0x31, 0x15,
+    0x04, 0xC7, 0x23, 0xC3, 0x18, 0x96, 0x05, 0x9A,
+    0x07, 0x12, 0x80, 0xE2, 0xEB, 0x27, 0xB2, 0x75,
+    0x09, 0x83, 0x2C, 0x1A, 0x1B, 0x6E, 0x5A, 0xA0,
+    0x52, 0x3B, 0xD6, 0xB3, 0x29, 0xE3, 0x2F, 0x84,
+    0x53, 0xD1, 0x00, 0xED, 0x20, 0xFC, 0xB1, 0x5B,
+    0x6A, 0xCB, 0xBE, 0x39, 0x4A, 0x4C, 0x58, 0xCF,
+    0xD0, 0xEF, 0xAA, 0xFB, 0x43, 0x4D, 0x33, 0x85,
+    0x45, 0xF9, 0x02, 0x7F, 0x50, 0x3C, 0x9F, 0xA8,
+    0x51, 0xA3, 0x40, 0x8F, 0x92, 0x9D, 0x38, 0xF5,
+    0xBC, 0xB6, 0xDA, 0x21, 0x10, 0xFF, 0xF3, 0xD2,
+    0xCD, 0x0C, 0x13, 0xEC, 0x5F, 0x97, 0x44, 0x17,
+    0xC4, 0xA7, 0x7E, 0x3D, 0x64, 0x5D, 0x19, 0x73,
+    0x60, 0x81, 0x4F, 0xDC, 0x22, 0x2A, 0x90, 0x88,
+    0x46, 0xEE, 0xB8, 0x14, 0xDE, 0x5E, 0x0B, 0xDB,
+    0xE0, 0x32, 0x3A, 0x0A, 0x49, 0x06, 0x24, 0x5C,
+    0xC2, 0xD3, 0xAC, 0x62, 0x91, 0x95, 0xE4, 0x79,
+    0xE7, 0xC8, 0x37, 0x6D, 0x8D, 0xD5, 0x4E, 0xA9,
+    0x6C, 0x56, 0xF4, 0xEA, 0x65, 0x7A, 0xAE, 0x08,
+    0xBA, 0x78, 0x25, 0x2E, 0x1C, 0xA6, 0xB4, 0xC6,
+    0xE8, 0xDD, 0x74, 0x1F, 0x4B, 0xBD, 0x8B, 0x8A,
+    0x70, 0x3E, 0xB5, 0x66, 0x48, 0x03, 0xF6, 0x0E,
+    0x61, 0x35, 0x57, 0xB9, 0x86, 0xC1, 0x1D, 0x9E,
+    0xE1, 0xF8, 0x98, 0x11, 0x69, 0xD9, 0x8E, 0x94,
+    0x9B, 0x1E, 0x87, 0xE9, 0xCE, 0x55, 0x28, 0xDF,
+    0x8C, 0xA1, 0x89, 0x0D, 0xBF, 0xE6, 0x42, 0x68,
+    0x41, 0x99, 0x2D, 0x0F, 0xB0, 0x54, 0xBB, 0x16
+};
+
+/*
+ * Forward tables
+ */
+#define FT \
+\
+    V(A5,63,63,C6), V(84,7C,7C,F8), V(99,77,77,EE), V(8D,7B,7B,F6), \
+    V(0D,F2,F2,FF), V(BD,6B,6B,D6), V(B1,6F,6F,DE), V(54,C5,C5,91), \
+    V(50,30,30,60), V(03,01,01,02), V(A9,67,67,CE), V(7D,2B,2B,56), \
+    V(19,FE,FE,E7), V(62,D7,D7,B5), V(E6,AB,AB,4D), V(9A,76,76,EC), \
+    V(45,CA,CA,8F), V(9D,82,82,1F), V(40,C9,C9,89), V(87,7D,7D,FA), \
+    V(15,FA,FA,EF), V(EB,59,59,B2), V(C9,47,47,8E), V(0B,F0,F0,FB), \
+    V(EC,AD,AD,41), V(67,D4,D4,B3), V(FD,A2,A2,5F), V(EA,AF,AF,45), \
+    V(BF,9C,9C,23), V(F7,A4,A4,53), V(96,72,72,E4), V(5B,C0,C0,9B), \
+    V(C2,B7,B7,75), V(1C,FD,FD,E1), V(AE,93,93,3D), V(6A,26,26,4C), \
+    V(5A,36,36,6C), V(41,3F,3F,7E), V(02,F7,F7,F5), V(4F,CC,CC,83), \
+    V(5C,34,34,68), V(F4,A5,A5,51), V(34,E5,E5,D1), V(08,F1,F1,F9), \
+    V(93,71,71,E2), V(73,D8,D8,AB), V(53,31,31,62), V(3F,15,15,2A), \
+    V(0C,04,04,08), V(52,C7,C7,95), V(65,23,23,46), V(5E,C3,C3,9D), \
+    V(28,18,18,30), V(A1,96,96,37), V(0F,05,05,0A), V(B5,9A,9A,2F), \
+    V(09,07,07,0E), V(36,12,12,24), V(9B,80,80,1B), V(3D,E2,E2,DF), \
+    V(26,EB,EB,CD), V(69,27,27,4E), V(CD,B2,B2,7F), V(9F,75,75,EA), \
+    V(1B,09,09,12), V(9E,83,83,1D), V(74,2C,2C,58), V(2E,1A,1A,34), \
+    V(2D,1B,1B,36), V(B2,6E,6E,DC), V(EE,5A,5A,B4), V(FB,A0,A0,5B), \
+    V(F6,52,52,A4), V(4D,3B,3B,76), V(61,D6,D6,B7), V(CE,B3,B3,7D), \
+    V(7B,29,29,52), V(3E,E3,E3,DD), V(71,2F,2F,5E), V(97,84,84,13), \
+    V(F5,53,53,A6), V(68,D1,D1,B9), V(00,00,00,00), V(2C,ED,ED,C1), \
+    V(60,20,20,40), V(1F,FC,FC,E3), V(C8,B1,B1,79), V(ED,5B,5B,B6), \
+    V(BE,6A,6A,D4), V(46,CB,CB,8D), V(D9,BE,BE,67), V(4B,39,39,72), \
+    V(DE,4A,4A,94), V(D4,4C,4C,98), V(E8,58,58,B0), V(4A,CF,CF,85), \
+    V(6B,D0,D0,BB), V(2A,EF,EF,C5), V(E5,AA,AA,4F), V(16,FB,FB,ED), \
+    V(C5,43,43,86), V(D7,4D,4D,9A), V(55,33,33,66), V(94,85,85,11), \
+    V(CF,45,45,8A), V(10,F9,F9,E9), V(06,02,02,04), V(81,7F,7F,FE), \
+    V(F0,50,50,A0), V(44,3C,3C,78), V(BA,9F,9F,25), V(E3,A8,A8,4B), \
+    V(F3,51,51,A2), V(FE,A3,A3,5D), V(C0,40,40,80), V(8A,8F,8F,05), \
+    V(AD,92,92,3F), V(BC,9D,9D,21), V(48,38,38,70), V(04,F5,F5,F1), \
+    V(DF,BC,BC,63), V(C1,B6,B6,77), V(75,DA,DA,AF), V(63,21,21,42), \
+    V(30,10,10,20), V(1A,FF,FF,E5), V(0E,F3,F3,FD), V(6D,D2,D2,BF), \
+    V(4C,CD,CD,81), V(14,0C,0C,18), V(35,13,13,26), V(2F,EC,EC,C3), \
+    V(E1,5F,5F,BE), V(A2,97,97,35), V(CC,44,44,88), V(39,17,17,2E), \
+    V(57,C4,C4,93), V(F2,A7,A7,55), V(82,7E,7E,FC), V(47,3D,3D,7A), \
+    V(AC,64,64,C8), V(E7,5D,5D,BA), V(2B,19,19,32), V(95,73,73,E6), \
+    V(A0,60,60,C0), V(98,81,81,19), V(D1,4F,4F,9E), V(7F,DC,DC,A3), \
+    V(66,22,22,44), V(7E,2A,2A,54), V(AB,90,90,3B), V(83,88,88,0B), \
+    V(CA,46,46,8C), V(29,EE,EE,C7), V(D3,B8,B8,6B), V(3C,14,14,28), \
+    V(79,DE,DE,A7), V(E2,5E,5E,BC), V(1D,0B,0B,16), V(76,DB,DB,AD), \
+    V(3B,E0,E0,DB), V(56,32,32,64), V(4E,3A,3A,74), V(1E,0A,0A,14), \
+    V(DB,49,49,92), V(0A,06,06,0C), V(6C,24,24,48), V(E4,5C,5C,B8), \
+    V(5D,C2,C2,9F), V(6E,D3,D3,BD), V(EF,AC,AC,43), V(A6,62,62,C4), \
+    V(A8,91,91,39), V(A4,95,95,31), V(37,E4,E4,D3), V(8B,79,79,F2), \
+    V(32,E7,E7,D5), V(43,C8,C8,8B), V(59,37,37,6E), V(B7,6D,6D,DA), \
+    V(8C,8D,8D,01), V(64,D5,D5,B1), V(D2,4E,4E,9C), V(E0,A9,A9,49), \
+    V(B4,6C,6C,D8), V(FA,56,56,AC), V(07,F4,F4,F3), V(25,EA,EA,CF), \
+    V(AF,65,65,CA), V(8E,7A,7A,F4), V(E9,AE,AE,47), V(18,08,08,10), \
+    V(D5,BA,BA,6F), V(88,78,78,F0), V(6F,25,25,4A), V(72,2E,2E,5C), \
+    V(24,1C,1C,38), V(F1,A6,A6,57), V(C7,B4,B4,73), V(51,C6,C6,97), \
+    V(23,E8,E8,CB), V(7C,DD,DD,A1), V(9C,74,74,E8), V(21,1F,1F,3E), \
+    V(DD,4B,4B,96), V(DC,BD,BD,61), V(86,8B,8B,0D), V(85,8A,8A,0F), \
+    V(90,70,70,E0), V(42,3E,3E,7C), V(C4,B5,B5,71), V(AA,66,66,CC), \
+    V(D8,48,48,90), V(05,03,03,06), V(01,F6,F6,F7), V(12,0E,0E,1C), \
+    V(A3,61,61,C2), V(5F,35,35,6A), V(F9,57,57,AE), V(D0,B9,B9,69), \
+    V(91,86,86,17), V(58,C1,C1,99), V(27,1D,1D,3A), V(B9,9E,9E,27), \
+    V(38,E1,E1,D9), V(13,F8,F8,EB), V(B3,98,98,2B), V(33,11,11,22), \
+    V(BB,69,69,D2), V(70,D9,D9,A9), V(89,8E,8E,07), V(A7,94,94,33), \
+    V(B6,9B,9B,2D), V(22,1E,1E,3C), V(92,87,87,15), V(20,E9,E9,C9), \
+    V(49,CE,CE,87), V(FF,55,55,AA), V(78,28,28,50), V(7A,DF,DF,A5), \
+    V(8F,8C,8C,03), V(F8,A1,A1,59), V(80,89,89,09), V(17,0D,0D,1A), \
+    V(DA,BF,BF,65), V(31,E6,E6,D7), V(C6,42,42,84), V(B8,68,68,D0), \
+    V(C3,41,41,82), V(B0,99,99,29), V(77,2D,2D,5A), V(11,0F,0F,1E), \
+    V(CB,B0,B0,7B), V(FC,54,54,A8), V(D6,BB,BB,6D), V(3A,16,16,2C)
+
+#define V(a,b,c,d) 0x##a##b##c##d
+static const uint32_t FT0[256] = { FT };
+#undef V
+
+#if !defined(MBEDTLS_AES_FEWER_TABLES)
+
+#define V(a,b,c,d) 0x##b##c##d##a
+static const uint32_t FT1[256] = { FT };
+#undef V
+
+#define V(a,b,c,d) 0x##c##d##a##b
+static const uint32_t FT2[256] = { FT };
+#undef V
+
+#define V(a,b,c,d) 0x##d##a##b##c
+static const uint32_t FT3[256] = { FT };
+#undef V
+
+#endif /* !MBEDTLS_AES_FEWER_TABLES */
+
+#undef FT
+
+/*
+ * Reverse S-box
+ */
+static const unsigned char RSb[256] =
+{
+    0x52, 0x09, 0x6A, 0xD5, 0x30, 0x36, 0xA5, 0x38,
+    0xBF, 0x40, 0xA3, 0x9E, 0x81, 0xF3, 0xD7, 0xFB,
+    0x7C, 0xE3, 0x39, 0x82, 0x9B, 0x2F, 0xFF, 0x87,
+    0x34, 0x8E, 0x43, 0x44, 0xC4, 0xDE, 0xE9, 0xCB,
+    0x54, 0x7B, 0x94, 0x32, 0xA6, 0xC2, 0x23, 0x3D,
+    0xEE, 0x4C, 0x95, 0x0B, 0x42, 0xFA, 0xC3, 0x4E,
+    0x08, 0x2E, 0xA1, 0x66, 0x28, 0xD9, 0x24, 0xB2,
+    0x76, 0x5B, 0xA2, 0x49, 0x6D, 0x8B, 0xD1, 0x25,
+    0x72, 0xF8, 0xF6, 0x64, 0x86, 0x68, 0x98, 0x16,
+    0xD4, 0xA4, 0x5C, 0xCC, 0x5D, 0x65, 0xB6, 0x92,
+    0x6C, 0x70, 0x48, 0x50, 0xFD, 0xED, 0xB9, 0xDA,
+    0x5E, 0x15, 0x46, 0x57, 0xA7, 0x8D, 0x9D, 0x84,
+    0x90, 0xD8, 0xAB, 0x00, 0x8C, 0xBC, 0xD3, 0x0A,
+    0xF7, 0xE4, 0x58, 0x05, 0xB8, 0xB3, 0x45, 0x06,
+    0xD0, 0x2C, 0x1E, 0x8F, 0xCA, 0x3F, 0x0F, 0x02,
+    0xC1, 0xAF, 0xBD, 0x03, 0x01, 0x13, 0x8A, 0x6B,
+    0x3A, 0x91, 0x11, 0x41, 0x4F, 0x67, 0xDC, 0xEA,
+    0x97, 0xF2, 0xCF, 0xCE, 0xF0, 0xB4, 0xE6, 0x73,
+    0x96, 0xAC, 0x74, 0x22, 0xE7, 0xAD, 0x35, 0x85,
+    0xE2, 0xF9, 0x37, 0xE8, 0x1C, 0x75, 0xDF, 0x6E,
+    0x47, 0xF1, 0x1A, 0x71, 0x1D, 0x29, 0xC5, 0x89,
+    0x6F, 0xB7, 0x62, 0x0E, 0xAA, 0x18, 0xBE, 0x1B,
+    0xFC, 0x56, 0x3E, 0x4B, 0xC6, 0xD2, 0x79, 0x20,
+    0x9A, 0xDB, 0xC0, 0xFE, 0x78, 0xCD, 0x5A, 0xF4,
+    0x1F, 0xDD, 0xA8, 0x33, 0x88, 0x07, 0xC7, 0x31,
+    0xB1, 0x12, 0x10, 0x59, 0x27, 0x80, 0xEC, 0x5F,
+    0x60, 0x51, 0x7F, 0xA9, 0x19, 0xB5, 0x4A, 0x0D,
+    0x2D, 0xE5, 0x7A, 0x9F, 0x93, 0xC9, 0x9C, 0xEF,
+    0xA0, 0xE0, 0x3B, 0x4D, 0xAE, 0x2A, 0xF5, 0xB0,
+    0xC8, 0xEB, 0xBB, 0x3C, 0x83, 0x53, 0x99, 0x61,
+    0x17, 0x2B, 0x04, 0x7E, 0xBA, 0x77, 0xD6, 0x26,
+    0xE1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0C, 0x7D
+};
+
+/*
+ * Reverse tables
+ */
+#define RT \
+\
+    V(50,A7,F4,51), V(53,65,41,7E), V(C3,A4,17,1A), V(96,5E,27,3A), \
+    V(CB,6B,AB,3B), V(F1,45,9D,1F), V(AB,58,FA,AC), V(93,03,E3,4B), \
+    V(55,FA,30,20), V(F6,6D,76,AD), V(91,76,CC,88), V(25,4C,02,F5), \
+    V(FC,D7,E5,4F), V(D7,CB,2A,C5), V(80,44,35,26), V(8F,A3,62,B5), \
+    V(49,5A,B1,DE), V(67,1B,BA,25), V(98,0E,EA,45), V(E1,C0,FE,5D), \
+    V(02,75,2F,C3), V(12,F0,4C,81), V(A3,97,46,8D), V(C6,F9,D3,6B), \
+    V(E7,5F,8F,03), V(95,9C,92,15), V(EB,7A,6D,BF), V(DA,59,52,95), \
+    V(2D,83,BE,D4), V(D3,21,74,58), V(29,69,E0,49), V(44,C8,C9,8E), \
+    V(6A,89,C2,75), V(78,79,8E,F4), V(6B,3E,58,99), V(DD,71,B9,27), \
+    V(B6,4F,E1,BE), V(17,AD,88,F0), V(66,AC,20,C9), V(B4,3A,CE,7D), \
+    V(18,4A,DF,63), V(82,31,1A,E5), V(60,33,51,97), V(45,7F,53,62), \
+    V(E0,77,64,B1), V(84,AE,6B,BB), V(1C,A0,81,FE), V(94,2B,08,F9), \
+    V(58,68,48,70), V(19,FD,45,8F), V(87,6C,DE,94), V(B7,F8,7B,52), \
+    V(23,D3,73,AB), V(E2,02,4B,72), V(57,8F,1F,E3), V(2A,AB,55,66), \
+    V(07,28,EB,B2), V(03,C2,B5,2F), V(9A,7B,C5,86), V(A5,08,37,D3), \
+    V(F2,87,28,30), V(B2,A5,BF,23), V(BA,6A,03,02), V(5C,82,16,ED), \
+    V(2B,1C,CF,8A), V(92,B4,79,A7), V(F0,F2,07,F3), V(A1,E2,69,4E), \
+    V(CD,F4,DA,65), V(D5,BE,05,06), V(1F,62,34,D1), V(8A,FE,A6,C4), \
+    V(9D,53,2E,34), V(A0,55,F3,A2), V(32,E1,8A,05), V(75,EB,F6,A4), \
+    V(39,EC,83,0B), V(AA,EF,60,40), V(06,9F,71,5E), V(51,10,6E,BD), \
+    V(F9,8A,21,3E), V(3D,06,DD,96), V(AE,05,3E,DD), V(46,BD,E6,4D), \
+    V(B5,8D,54,91), V(05,5D,C4,71), V(6F,D4,06,04), V(FF,15,50,60), \
+    V(24,FB,98,19), V(97,E9,BD,D6), V(CC,43,40,89), V(77,9E,D9,67), \
+    V(BD,42,E8,B0), V(88,8B,89,07), V(38,5B,19,E7), V(DB,EE,C8,79), \
+    V(47,0A,7C,A1), V(E9,0F,42,7C), V(C9,1E,84,F8), V(00,00,00,00), \
+    V(83,86,80,09), V(48,ED,2B,32), V(AC,70,11,1E), V(4E,72,5A,6C), \
+    V(FB,FF,0E,FD), V(56,38,85,0F), V(1E,D5,AE,3D), V(27,39,2D,36), \
+    V(64,D9,0F,0A), V(21,A6,5C,68), V(D1,54,5B,9B), V(3A,2E,36,24), \
+    V(B1,67,0A,0C), V(0F,E7,57,93), V(D2,96,EE,B4), V(9E,91,9B,1B), \
+    V(4F,C5,C0,80), V(A2,20,DC,61), V(69,4B,77,5A), V(16,1A,12,1C), \
+    V(0A,BA,93,E2), V(E5,2A,A0,C0), V(43,E0,22,3C), V(1D,17,1B,12), \
+    V(0B,0D,09,0E), V(AD,C7,8B,F2), V(B9,A8,B6,2D), V(C8,A9,1E,14), \
+    V(85,19,F1,57), V(4C,07,75,AF), V(BB,DD,99,EE), V(FD,60,7F,A3), \
+    V(9F,26,01,F7), V(BC,F5,72,5C), V(C5,3B,66,44), V(34,7E,FB,5B), \
+    V(76,29,43,8B), V(DC,C6,23,CB), V(68,FC,ED,B6), V(63,F1,E4,B8), \
+    V(CA,DC,31,D7), V(10,85,63,42), V(40,22,97,13), V(20,11,C6,84), \
+    V(7D,24,4A,85), V(F8,3D,BB,D2), V(11,32,F9,AE), V(6D,A1,29,C7), \
+    V(4B,2F,9E,1D), V(F3,30,B2,DC), V(EC,52,86,0D), V(D0,E3,C1,77), \
+    V(6C,16,B3,2B), V(99,B9,70,A9), V(FA,48,94,11), V(22,64,E9,47), \
+    V(C4,8C,FC,A8), V(1A,3F,F0,A0), V(D8,2C,7D,56), V(EF,90,33,22), \
+    V(C7,4E,49,87), V(C1,D1,38,D9), V(FE,A2,CA,8C), V(36,0B,D4,98), \
+    V(CF,81,F5,A6), V(28,DE,7A,A5), V(26,8E,B7,DA), V(A4,BF,AD,3F), \
+    V(E4,9D,3A,2C), V(0D,92,78,50), V(9B,CC,5F,6A), V(62,46,7E,54), \
+    V(C2,13,8D,F6), V(E8,B8,D8,90), V(5E,F7,39,2E), V(F5,AF,C3,82), \
+    V(BE,80,5D,9F), V(7C,93,D0,69), V(A9,2D,D5,6F), V(B3,12,25,CF), \
+    V(3B,99,AC,C8), V(A7,7D,18,10), V(6E,63,9C,E8), V(7B,BB,3B,DB), \
+    V(09,78,26,CD), V(F4,18,59,6E), V(01,B7,9A,EC), V(A8,9A,4F,83), \
+    V(65,6E,95,E6), V(7E,E6,FF,AA), V(08,CF,BC,21), V(E6,E8,15,EF), \
+    V(D9,9B,E7,BA), V(CE,36,6F,4A), V(D4,09,9F,EA), V(D6,7C,B0,29), \
+    V(AF,B2,A4,31), V(31,23,3F,2A), V(30,94,A5,C6), V(C0,66,A2,35), \
+    V(37,BC,4E,74), V(A6,CA,82,FC), V(B0,D0,90,E0), V(15,D8,A7,33), \
+    V(4A,98,04,F1), V(F7,DA,EC,41), V(0E,50,CD,7F), V(2F,F6,91,17), \
+    V(8D,D6,4D,76), V(4D,B0,EF,43), V(54,4D,AA,CC), V(DF,04,96,E4), \
+    V(E3,B5,D1,9E), V(1B,88,6A,4C), V(B8,1F,2C,C1), V(7F,51,65,46), \
+    V(04,EA,5E,9D), V(5D,35,8C,01), V(73,74,87,FA), V(2E,41,0B,FB), \
+    V(5A,1D,67,B3), V(52,D2,DB,92), V(33,56,10,E9), V(13,47,D6,6D), \
+    V(8C,61,D7,9A), V(7A,0C,A1,37), V(8E,14,F8,59), V(89,3C,13,EB), \
+    V(EE,27,A9,CE), V(35,C9,61,B7), V(ED,E5,1C,E1), V(3C,B1,47,7A), \
+    V(59,DF,D2,9C), V(3F,73,F2,55), V(79,CE,14,18), V(BF,37,C7,73), \
+    V(EA,CD,F7,53), V(5B,AA,FD,5F), V(14,6F,3D,DF), V(86,DB,44,78), \
+    V(81,F3,AF,CA), V(3E,C4,68,B9), V(2C,34,24,38), V(5F,40,A3,C2), \
+    V(72,C3,1D,16), V(0C,25,E2,BC), V(8B,49,3C,28), V(41,95,0D,FF), \
+    V(71,01,A8,39), V(DE,B3,0C,08), V(9C,E4,B4,D8), V(90,C1,56,64), \
+    V(61,84,CB,7B), V(70,B6,32,D5), V(74,5C,6C,48), V(42,57,B8,D0)
+
+#define V(a,b,c,d) 0x##a##b##c##d
+static const uint32_t RT0[256] = { RT };
+#undef V
+
+#if !defined(MBEDTLS_AES_FEWER_TABLES)
+
+#define V(a,b,c,d) 0x##b##c##d##a
+static const uint32_t RT1[256] = { RT };
+#undef V
+
+#define V(a,b,c,d) 0x##c##d##a##b
+static const uint32_t RT2[256] = { RT };
+#undef V
+
+#define V(a,b,c,d) 0x##d##a##b##c
+static const uint32_t RT3[256] = { RT };
+#undef V
+
+#endif /* !MBEDTLS_AES_FEWER_TABLES */
+
+#undef RT
+
+/*
+ * Round constants
+ */
+static const uint32_t RCON[10] =
+{
+    0x00000001, 0x00000002, 0x00000004, 0x00000008,
+    0x00000010, 0x00000020, 0x00000040, 0x00000080,
+    0x0000001B, 0x00000036
+};
+
+#else /* MBEDTLS_AES_ROM_TABLES */
+
+/*
+ * Forward S-box & tables
+ */
+static unsigned char FSb[256];
+static uint32_t FT0[256];
+#if !defined(MBEDTLS_AES_FEWER_TABLES)
+static uint32_t FT1[256];
+static uint32_t FT2[256];
+static uint32_t FT3[256];
+#endif /* !MBEDTLS_AES_FEWER_TABLES */
+
+/*
+ * Reverse S-box & tables
+ */
+static unsigned char RSb[256];
+static uint32_t RT0[256];
+#if !defined(MBEDTLS_AES_FEWER_TABLES)
+static uint32_t RT1[256];
+static uint32_t RT2[256];
+static uint32_t RT3[256];
+#endif /* !MBEDTLS_AES_FEWER_TABLES */
+
+/*
+ * Round constants
+ */
+static uint32_t RCON[10];
+
+/*
+ * Tables generation code
+ */
+#define ROTL8(x) ( ( x << 8 ) & 0xFFFFFFFF ) | ( x >> 24 )
+#define XTIME(x) ( ( x << 1 ) ^ ( ( x & 0x80 ) ? 0x1B : 0x00 ) )
+#define MUL(x,y) ( ( x && y ) ? pow[(log[x]+log[y]) % 255] : 0 )
+
+static int aes_init_done = 0;
+
+static void aes_gen_tables( void )
+{
+    int i, x, y, z;
+    int pow[256];
+    int log[256];
+
+    /*
+     * compute pow and log tables over GF(2^8)
+     */
+    for( i = 0, x = 1; i < 256; i++ )
+    {
+        pow[i] = x;
+        log[x] = i;
+        x = ( x ^ XTIME( x ) ) & 0xFF;
+    }
+
+    /*
+     * calculate the round constants
+     */
+    for( i = 0, x = 1; i < 10; i++ )
+    {
+        RCON[i] = (uint32_t) x;
+        x = XTIME( x ) & 0xFF;
+    }
+
+    /*
+     * generate the forward and reverse S-boxes
+     */
+    FSb[0x00] = 0x63;
+    RSb[0x63] = 0x00;
+
+    for( i = 1; i < 256; i++ )
+    {
+        x = pow[255 - log[i]];
+
+        y  = x; y = ( ( y << 1 ) | ( y >> 7 ) ) & 0xFF;
+        x ^= y; y = ( ( y << 1 ) | ( y >> 7 ) ) & 0xFF;
+        x ^= y; y = ( ( y << 1 ) | ( y >> 7 ) ) & 0xFF;
+        x ^= y; y = ( ( y << 1 ) | ( y >> 7 ) ) & 0xFF;
+        x ^= y ^ 0x63;
+
+        FSb[i] = (unsigned char) x;
+        RSb[x] = (unsigned char) i;
+    }
+
+    /*
+     * generate the forward and reverse tables
+     */
+    for( i = 0; i < 256; i++ )
+    {
+        x = FSb[i];
+        y = XTIME( x ) & 0xFF;
+        z =  ( y ^ x ) & 0xFF;
+
+        FT0[i] = ( (uint32_t) y       ) ^
+                 ( (uint32_t) x <<  8 ) ^
+                 ( (uint32_t) x << 16 ) ^
+                 ( (uint32_t) z << 24 );
+
+#if !defined(MBEDTLS_AES_FEWER_TABLES)
+        FT1[i] = ROTL8( FT0[i] );
+        FT2[i] = ROTL8( FT1[i] );
+        FT3[i] = ROTL8( FT2[i] );
+#endif /* !MBEDTLS_AES_FEWER_TABLES */
+
+        x = RSb[i];
+
+        RT0[i] = ( (uint32_t) MUL( 0x0E, x )       ) ^
+                 ( (uint32_t) MUL( 0x09, x ) <<  8 ) ^
+                 ( (uint32_t) MUL( 0x0D, x ) << 16 ) ^
+                 ( (uint32_t) MUL( 0x0B, x ) << 24 );
+
+#if !defined(MBEDTLS_AES_FEWER_TABLES)
+        RT1[i] = ROTL8( RT0[i] );
+        RT2[i] = ROTL8( RT1[i] );
+        RT3[i] = ROTL8( RT2[i] );
+#endif /* !MBEDTLS_AES_FEWER_TABLES */
+    }
+}
+
+#undef ROTL8
+
+#endif /* MBEDTLS_AES_ROM_TABLES */
+
+#if defined(MBEDTLS_AES_FEWER_TABLES)
+
+#define ROTL8(x)  ( (uint32_t)( ( x ) <<  8 ) + (uint32_t)( ( x ) >> 24 ) )
+#define ROTL16(x) ( (uint32_t)( ( x ) << 16 ) + (uint32_t)( ( x ) >> 16 ) )
+#define ROTL24(x) ( (uint32_t)( ( x ) << 24 ) + (uint32_t)( ( x ) >>  8 ) )
+
+#define AES_RT0(idx) RT0[idx]
+#define AES_RT1(idx) ROTL8(  RT0[idx] )
+#define AES_RT2(idx) ROTL16( RT0[idx] )
+#define AES_RT3(idx) ROTL24( RT0[idx] )
+
+#define AES_FT0(idx) FT0[idx]
+#define AES_FT1(idx) ROTL8(  FT0[idx] )
+#define AES_FT2(idx) ROTL16( FT0[idx] )
+#define AES_FT3(idx) ROTL24( FT0[idx] )
+
+#else /* MBEDTLS_AES_FEWER_TABLES */
+
+#define AES_RT0(idx) RT0[idx]
+#define AES_RT1(idx) RT1[idx]
+#define AES_RT2(idx) RT2[idx]
+#define AES_RT3(idx) RT3[idx]
+
+#define AES_FT0(idx) FT0[idx]
+#define AES_FT1(idx) FT1[idx]
+#define AES_FT2(idx) FT2[idx]
+#define AES_FT3(idx) FT3[idx]
+
+#endif /* MBEDTLS_AES_FEWER_TABLES */
+
+void mbedtls_aes_init( mbedtls_aes_context *ctx )
+{
+    memset( ctx, 0, sizeof( mbedtls_aes_context ) );
+}
+
+void mbedtls_aes_free( mbedtls_aes_context *ctx )
+{
+    if( ctx == NULL )
+        return;
+
+    mbedtls_platform_zeroize( ctx, sizeof( mbedtls_aes_context ) );
+}
+
+#if defined(MBEDTLS_CIPHER_MODE_XTS)
+void mbedtls_aes_xts_init( mbedtls_aes_xts_context *ctx )
+{
+    mbedtls_aes_init( &ctx->crypt );
+    mbedtls_aes_init( &ctx->tweak );
+}
+
+void mbedtls_aes_xts_free( mbedtls_aes_xts_context *ctx )
+{
+    mbedtls_aes_free( &ctx->crypt );
+    mbedtls_aes_free( &ctx->tweak );
+}
+#endif /* MBEDTLS_CIPHER_MODE_XTS */
+
+/*
+ * AES key schedule (encryption)
+ */
+#if !defined(MBEDTLS_AES_SETKEY_ENC_ALT)
+int mbedtls_aes_setkey_enc( mbedtls_aes_context *ctx, const unsigned char *key,
+                    unsigned int keybits )
+{
+    unsigned int i;
+    uint32_t *RK;
+
+#if !defined(MBEDTLS_AES_ROM_TABLES)
+    if( aes_init_done == 0 )
+    {
+        aes_gen_tables();
+        aes_init_done = 1;
+
+    }
+#endif
+
+    switch( keybits )
+    {
+        case 128: ctx->nr = 10; break;
+        case 192: ctx->nr = 12; break;
+        case 256: ctx->nr = 14; break;
+        default : return( MBEDTLS_ERR_AES_INVALID_KEY_LENGTH );
+    }
+
+#if defined(MBEDTLS_PADLOCK_C) && defined(MBEDTLS_PADLOCK_ALIGN16)
+    if( aes_padlock_ace == -1 )
+        aes_padlock_ace = mbedtls_padlock_has_support( MBEDTLS_PADLOCK_ACE );
+
+    if( aes_padlock_ace )
+        ctx->rk = RK = MBEDTLS_PADLOCK_ALIGN16( ctx->buf );
+    else
+#endif
+    ctx->rk = RK = ctx->buf;
+
+#if defined(MBEDTLS_AESNI_C) && defined(MBEDTLS_HAVE_X86_64)
+    if( mbedtls_aesni_has_support( MBEDTLS_AESNI_AES ) )
+        return( mbedtls_aesni_setkey_enc( (unsigned char *) ctx->rk, key, keybits ) );
+#endif
+
+    for( i = 0; i < ( keybits >> 5 ); i++ )
+    {
+        GET_UINT32_LE( RK[i], key, i << 2 );
+    }
+
+    switch( ctx->nr )
+    {
+        case 10:
+
+            for( i = 0; i < 10; i++, RK += 4 )
+            {
+                RK[4]  = RK[0] ^ RCON[i] ^
+                ( (uint32_t) FSb[ ( RK[3] >>  8 ) & 0xFF ]       ) ^
+                ( (uint32_t) FSb[ ( RK[3] >> 16 ) & 0xFF ] <<  8 ) ^
+                ( (uint32_t) FSb[ ( RK[3] >> 24 ) & 0xFF ] << 16 ) ^
+                ( (uint32_t) FSb[ ( RK[3]       ) & 0xFF ] << 24 );
+
+                RK[5]  = RK[1] ^ RK[4];
+                RK[6]  = RK[2] ^ RK[5];
+                RK[7]  = RK[3] ^ RK[6];
+            }
+            break;
+
+        case 12:
+
+            for( i = 0; i < 8; i++, RK += 6 )
+            {
+                RK[6]  = RK[0] ^ RCON[i] ^
+                ( (uint32_t) FSb[ ( RK[5] >>  8 ) & 0xFF ]       ) ^
+                ( (uint32_t) FSb[ ( RK[5] >> 16 ) & 0xFF ] <<  8 ) ^
+                ( (uint32_t) FSb[ ( RK[5] >> 24 ) & 0xFF ] << 16 ) ^
+                ( (uint32_t) FSb[ ( RK[5]       ) & 0xFF ] << 24 );
+
+                RK[7]  = RK[1] ^ RK[6];
+                RK[8]  = RK[2] ^ RK[7];
+                RK[9]  = RK[3] ^ RK[8];
+                RK[10] = RK[4] ^ RK[9];
+                RK[11] = RK[5] ^ RK[10];
+            }
+            break;
+
+        case 14:
+
+            for( i = 0; i < 7; i++, RK += 8 )
+            {
+                RK[8]  = RK[0] ^ RCON[i] ^
+                ( (uint32_t) FSb[ ( RK[7] >>  8 ) & 0xFF ]       ) ^
+                ( (uint32_t) FSb[ ( RK[7] >> 16 ) & 0xFF ] <<  8 ) ^
+                ( (uint32_t) FSb[ ( RK[7] >> 24 ) & 0xFF ] << 16 ) ^
+                ( (uint32_t) FSb[ ( RK[7]       ) & 0xFF ] << 24 );
+
+                RK[9]  = RK[1] ^ RK[8];
+                RK[10] = RK[2] ^ RK[9];
+                RK[11] = RK[3] ^ RK[10];
+
+                RK[12] = RK[4] ^
+                ( (uint32_t) FSb[ ( RK[11]       ) & 0xFF ]       ) ^
+                ( (uint32_t) FSb[ ( RK[11] >>  8 ) & 0xFF ] <<  8 ) ^
+                ( (uint32_t) FSb[ ( RK[11] >> 16 ) & 0xFF ] << 16 ) ^
+                ( (uint32_t) FSb[ ( RK[11] >> 24 ) & 0xFF ] << 24 );
+
+                RK[13] = RK[5] ^ RK[12];
+                RK[14] = RK[6] ^ RK[13];
+                RK[15] = RK[7] ^ RK[14];
+            }
+            break;
+    }
+
+    return( 0 );
+}
+#endif /* !MBEDTLS_AES_SETKEY_ENC_ALT */
+
+/*
+ * AES key schedule (decryption)
+ */
+#if !defined(MBEDTLS_AES_SETKEY_DEC_ALT)
+int mbedtls_aes_setkey_dec( mbedtls_aes_context *ctx, const unsigned char *key,
+                    unsigned int keybits )
+{
+    int i, j, ret;
+    mbedtls_aes_context cty;
+    uint32_t *RK;
+    uint32_t *SK;
+
+    mbedtls_aes_init( &cty );
+
+#if defined(MBEDTLS_PADLOCK_C) && defined(MBEDTLS_PADLOCK_ALIGN16)
+    if( aes_padlock_ace == -1 )
+        aes_padlock_ace = mbedtls_padlock_has_support( MBEDTLS_PADLOCK_ACE );
+
+    if( aes_padlock_ace )
+        ctx->rk = RK = MBEDTLS_PADLOCK_ALIGN16( ctx->buf );
+    else
+#endif
+    ctx->rk = RK = ctx->buf;
+
+    /* Also checks keybits */
+    if( ( ret = mbedtls_aes_setkey_enc( &cty, key, keybits ) ) != 0 )
+        goto exit;
+
+    ctx->nr = cty.nr;
+
+#if defined(MBEDTLS_AESNI_C) && defined(MBEDTLS_HAVE_X86_64)
+    if( mbedtls_aesni_has_support( MBEDTLS_AESNI_AES ) )
+    {
+        mbedtls_aesni_inverse_key( (unsigned char *) ctx->rk,
+                           (const unsigned char *) cty.rk, ctx->nr );
+        goto exit;
+    }
+#endif
+
+    SK = cty.rk + cty.nr * 4;
+
+    *RK++ = *SK++;
+    *RK++ = *SK++;
+    *RK++ = *SK++;
+    *RK++ = *SK++;
+
+    for( i = ctx->nr - 1, SK -= 8; i > 0; i--, SK -= 8 )
+    {
+        for( j = 0; j < 4; j++, SK++ )
+        {
+            *RK++ = AES_RT0( FSb[ ( *SK       ) & 0xFF ] ) ^
+                    AES_RT1( FSb[ ( *SK >>  8 ) & 0xFF ] ) ^
+                    AES_RT2( FSb[ ( *SK >> 16 ) & 0xFF ] ) ^
+                    AES_RT3( FSb[ ( *SK >> 24 ) & 0xFF ] );
+        }
+    }
+
+    *RK++ = *SK++;
+    *RK++ = *SK++;
+    *RK++ = *SK++;
+    *RK++ = *SK++;
+
+exit:
+    mbedtls_aes_free( &cty );
+
+    return( ret );
+}
+
+#if defined(MBEDTLS_CIPHER_MODE_XTS)
+static int mbedtls_aes_xts_decode_keys( const unsigned char *key,
+                                        unsigned int keybits,
+                                        const unsigned char **key1,
+                                        unsigned int *key1bits,
+                                        const unsigned char **key2,
+                                        unsigned int *key2bits )
+{
+    const unsigned int half_keybits = keybits / 2;
+    const unsigned int half_keybytes = half_keybits / 8;
+
+    switch( keybits )
+    {
+        case 256: break;
+        case 512: break;
+        default : return( MBEDTLS_ERR_AES_INVALID_KEY_LENGTH );
+    }
+
+    *key1bits = half_keybits;
+    *key2bits = half_keybits;
+    *key1 = &key[0];
+    *key2 = &key[half_keybytes];
+
+    return 0;
+}
+
+int mbedtls_aes_xts_setkey_enc( mbedtls_aes_xts_context *ctx,
+                                const unsigned char *key,
+                                unsigned int keybits)
+{
+    int ret;
+    const unsigned char *key1, *key2;
+    unsigned int key1bits, key2bits;
+
+    ret = mbedtls_aes_xts_decode_keys( key, keybits, &key1, &key1bits,
+                                       &key2, &key2bits );
+    if( ret != 0 )
+        return( ret );
+
+    /* Set the tweak key. Always set tweak key for the encryption mode. */
+    ret = mbedtls_aes_setkey_enc( &ctx->tweak, key2, key2bits );
+    if( ret != 0 )
+        return( ret );
+
+    /* Set crypt key for encryption. */
+    return mbedtls_aes_setkey_enc( &ctx->crypt, key1, key1bits );
+}
+
+int mbedtls_aes_xts_setkey_dec( mbedtls_aes_xts_context *ctx,
+                                const unsigned char *key,
+                                unsigned int keybits)
+{
+    int ret;
+    const unsigned char *key1, *key2;
+    unsigned int key1bits, key2bits;
+
+    ret = mbedtls_aes_xts_decode_keys( key, keybits, &key1, &key1bits,
+                                       &key2, &key2bits );
+    if( ret != 0 )
+        return( ret );
+
+    /* Set the tweak key. Always set tweak key for encryption. */
+    ret = mbedtls_aes_setkey_enc( &ctx->tweak, key2, key2bits );
+    if( ret != 0 )
+        return( ret );
+
+    /* Set crypt key for decryption. */
+    return mbedtls_aes_setkey_dec( &ctx->crypt, key1, key1bits );
+}
+#endif /* MBEDTLS_CIPHER_MODE_XTS */
+
+#endif /* !MBEDTLS_AES_SETKEY_DEC_ALT */
+
+#define AES_FROUND(X0,X1,X2,X3,Y0,Y1,Y2,Y3)         \
+{                                                   \
+    X0 = *RK++ ^ AES_FT0( ( Y0       ) & 0xFF ) ^   \
+                 AES_FT1( ( Y1 >>  8 ) & 0xFF ) ^   \
+                 AES_FT2( ( Y2 >> 16 ) & 0xFF ) ^   \
+                 AES_FT3( ( Y3 >> 24 ) & 0xFF );    \
+                                                    \
+    X1 = *RK++ ^ AES_FT0( ( Y1       ) & 0xFF ) ^   \
+                 AES_FT1( ( Y2 >>  8 ) & 0xFF ) ^   \
+                 AES_FT2( ( Y3 >> 16 ) & 0xFF ) ^   \
+                 AES_FT3( ( Y0 >> 24 ) & 0xFF );    \
+                                                    \
+    X2 = *RK++ ^ AES_FT0( ( Y2       ) & 0xFF ) ^   \
+                 AES_FT1( ( Y3 >>  8 ) & 0xFF ) ^   \
+                 AES_FT2( ( Y0 >> 16 ) & 0xFF ) ^   \
+                 AES_FT3( ( Y1 >> 24 ) & 0xFF );    \
+                                                    \
+    X3 = *RK++ ^ AES_FT0( ( Y3       ) & 0xFF ) ^   \
+                 AES_FT1( ( Y0 >>  8 ) & 0xFF ) ^   \
+                 AES_FT2( ( Y1 >> 16 ) & 0xFF ) ^   \
+                 AES_FT3( ( Y2 >> 24 ) & 0xFF );    \
+}
+
+#define AES_RROUND(X0,X1,X2,X3,Y0,Y1,Y2,Y3)         \
+{                                                   \
+    X0 = *RK++ ^ AES_RT0( ( Y0       ) & 0xFF ) ^   \
+                 AES_RT1( ( Y3 >>  8 ) & 0xFF ) ^   \
+                 AES_RT2( ( Y2 >> 16 ) & 0xFF ) ^   \
+                 AES_RT3( ( Y1 >> 24 ) & 0xFF );    \
+                                                    \
+    X1 = *RK++ ^ AES_RT0( ( Y1       ) & 0xFF ) ^   \
+                 AES_RT1( ( Y0 >>  8 ) & 0xFF ) ^   \
+                 AES_RT2( ( Y3 >> 16 ) & 0xFF ) ^   \
+                 AES_RT3( ( Y2 >> 24 ) & 0xFF );    \
+                                                    \
+    X2 = *RK++ ^ AES_RT0( ( Y2       ) & 0xFF ) ^   \
+                 AES_RT1( ( Y1 >>  8 ) & 0xFF ) ^   \
+                 AES_RT2( ( Y0 >> 16 ) & 0xFF ) ^   \
+                 AES_RT3( ( Y3 >> 24 ) & 0xFF );    \
+                                                    \
+    X3 = *RK++ ^ AES_RT0( ( Y3       ) & 0xFF ) ^   \
+                 AES_RT1( ( Y2 >>  8 ) & 0xFF ) ^   \
+                 AES_RT2( ( Y1 >> 16 ) & 0xFF ) ^   \
+                 AES_RT3( ( Y0 >> 24 ) & 0xFF );    \
+}
+
+/*
+ * AES-ECB block encryption
+ */
+#if !defined(MBEDTLS_AES_ENCRYPT_ALT)
+int mbedtls_internal_aes_encrypt( mbedtls_aes_context *ctx,
+                                  const unsigned char input[16],
+                                  unsigned char output[16] )
+{
+    int i;
+    uint32_t *RK, X0, X1, X2, X3, Y0, Y1, Y2, Y3;
+
+    RK = ctx->rk;
+
+    GET_UINT32_LE( X0, input,  0 ); X0 ^= *RK++;
+    GET_UINT32_LE( X1, input,  4 ); X1 ^= *RK++;
+    GET_UINT32_LE( X2, input,  8 ); X2 ^= *RK++;
+    GET_UINT32_LE( X3, input, 12 ); X3 ^= *RK++;
+
+    for( i = ( ctx->nr >> 1 ) - 1; i > 0; i-- )
+    {
+        AES_FROUND( Y0, Y1, Y2, Y3, X0, X1, X2, X3 );
+        AES_FROUND( X0, X1, X2, X3, Y0, Y1, Y2, Y3 );
+    }
+
+    AES_FROUND( Y0, Y1, Y2, Y3, X0, X1, X2, X3 );
+
+    X0 = *RK++ ^ \
+            ( (uint32_t) FSb[ ( Y0       ) & 0xFF ]       ) ^
+            ( (uint32_t) FSb[ ( Y1 >>  8 ) & 0xFF ] <<  8 ) ^
+            ( (uint32_t) FSb[ ( Y2 >> 16 ) & 0xFF ] << 16 ) ^
+            ( (uint32_t) FSb[ ( Y3 >> 24 ) & 0xFF ] << 24 );
+
+    X1 = *RK++ ^ \
+            ( (uint32_t) FSb[ ( Y1       ) & 0xFF ]       ) ^
+            ( (uint32_t) FSb[ ( Y2 >>  8 ) & 0xFF ] <<  8 ) ^
+            ( (uint32_t) FSb[ ( Y3 >> 16 ) & 0xFF ] << 16 ) ^
+            ( (uint32_t) FSb[ ( Y0 >> 24 ) & 0xFF ] << 24 );
+
+    X2 = *RK++ ^ \
+            ( (uint32_t) FSb[ ( Y2       ) & 0xFF ]       ) ^
+            ( (uint32_t) FSb[ ( Y3 >>  8 ) & 0xFF ] <<  8 ) ^
+            ( (uint32_t) FSb[ ( Y0 >> 16 ) & 0xFF ] << 16 ) ^
+            ( (uint32_t) FSb[ ( Y1 >> 24 ) & 0xFF ] << 24 );
+
+    X3 = *RK++ ^ \
+            ( (uint32_t) FSb[ ( Y3       ) & 0xFF ]       ) ^
+            ( (uint32_t) FSb[ ( Y0 >>  8 ) & 0xFF ] <<  8 ) ^
+            ( (uint32_t) FSb[ ( Y1 >> 16 ) & 0xFF ] << 16 ) ^
+            ( (uint32_t) FSb[ ( Y2 >> 24 ) & 0xFF ] << 24 );
+
+    PUT_UINT32_LE( X0, output,  0 );
+    PUT_UINT32_LE( X1, output,  4 );
+    PUT_UINT32_LE( X2, output,  8 );
+    PUT_UINT32_LE( X3, output, 12 );
+
+    return( 0 );
+}
+#endif /* !MBEDTLS_AES_ENCRYPT_ALT */
+
+#if !defined(MBEDTLS_DEPRECATED_REMOVED)
+void mbedtls_aes_encrypt( mbedtls_aes_context *ctx,
+                          const unsigned char input[16],
+                          unsigned char output[16] )
+{
+    mbedtls_internal_aes_encrypt( ctx, input, output );
+}
+#endif /* !MBEDTLS_DEPRECATED_REMOVED */
+
+/*
+ * AES-ECB block decryption
+ */
+#if !defined(MBEDTLS_AES_DECRYPT_ALT)
+int mbedtls_internal_aes_decrypt( mbedtls_aes_context *ctx,
+                                  const unsigned char input[16],
+                                  unsigned char output[16] )
+{
+    int i;
+    uint32_t *RK, X0, X1, X2, X3, Y0, Y1, Y2, Y3;
+
+    RK = ctx->rk;
+
+    GET_UINT32_LE( X0, input,  0 ); X0 ^= *RK++;
+    GET_UINT32_LE( X1, input,  4 ); X1 ^= *RK++;
+    GET_UINT32_LE( X2, input,  8 ); X2 ^= *RK++;
+    GET_UINT32_LE( X3, input, 12 ); X3 ^= *RK++;
+
+    for( i = ( ctx->nr >> 1 ) - 1; i > 0; i-- )
+    {
+        AES_RROUND( Y0, Y1, Y2, Y3, X0, X1, X2, X3 );
+        AES_RROUND( X0, X1, X2, X3, Y0, Y1, Y2, Y3 );
+    }
+
+    AES_RROUND( Y0, Y1, Y2, Y3, X0, X1, X2, X3 );
+
+    X0 = *RK++ ^ \
+            ( (uint32_t) RSb[ ( Y0       ) & 0xFF ]       ) ^
+            ( (uint32_t) RSb[ ( Y3 >>  8 ) & 0xFF ] <<  8 ) ^
+            ( (uint32_t) RSb[ ( Y2 >> 16 ) & 0xFF ] << 16 ) ^
+            ( (uint32_t) RSb[ ( Y1 >> 24 ) & 0xFF ] << 24 );
+
+    X1 = *RK++ ^ \
+            ( (uint32_t) RSb[ ( Y1       ) & 0xFF ]       ) ^
+            ( (uint32_t) RSb[ ( Y0 >>  8 ) & 0xFF ] <<  8 ) ^
+            ( (uint32_t) RSb[ ( Y3 >> 16 ) & 0xFF ] << 16 ) ^
+            ( (uint32_t) RSb[ ( Y2 >> 24 ) & 0xFF ] << 24 );
+
+    X2 = *RK++ ^ \
+            ( (uint32_t) RSb[ ( Y2       ) & 0xFF ]       ) ^
+            ( (uint32_t) RSb[ ( Y1 >>  8 ) & 0xFF ] <<  8 ) ^
+            ( (uint32_t) RSb[ ( Y0 >> 16 ) & 0xFF ] << 16 ) ^
+            ( (uint32_t) RSb[ ( Y3 >> 24 ) & 0xFF ] << 24 );
+
+    X3 = *RK++ ^ \
+            ( (uint32_t) RSb[ ( Y3       ) & 0xFF ]       ) ^
+            ( (uint32_t) RSb[ ( Y2 >>  8 ) & 0xFF ] <<  8 ) ^
+            ( (uint32_t) RSb[ ( Y1 >> 16 ) & 0xFF ] << 16 ) ^
+            ( (uint32_t) RSb[ ( Y0 >> 24 ) & 0xFF ] << 24 );
+
+    PUT_UINT32_LE( X0, output,  0 );
+    PUT_UINT32_LE( X1, output,  4 );
+    PUT_UINT32_LE( X2, output,  8 );
+    PUT_UINT32_LE( X3, output, 12 );
+
+    return( 0 );
+}
+#endif /* !MBEDTLS_AES_DECRYPT_ALT */
+
+#if !defined(MBEDTLS_DEPRECATED_REMOVED)
+void mbedtls_aes_decrypt( mbedtls_aes_context *ctx,
+                          const unsigned char input[16],
+                          unsigned char output[16] )
+{
+    mbedtls_internal_aes_decrypt( ctx, input, output );
+}
+#endif /* !MBEDTLS_DEPRECATED_REMOVED */
+
+/*
+ * AES-ECB block encryption/decryption
+ */
+int mbedtls_aes_crypt_ecb( mbedtls_aes_context *ctx,
+                    int mode,
+                    const unsigned char input[16],
+                    unsigned char output[16] )
+{
+#if defined(MBEDTLS_AESNI_C) && defined(MBEDTLS_HAVE_X86_64)
+    if( mbedtls_aesni_has_support( MBEDTLS_AESNI_AES ) )
+        return( mbedtls_aesni_crypt_ecb( ctx, mode, input, output ) );
+#endif
+
+#if defined(MBEDTLS_PADLOCK_C) && defined(MBEDTLS_HAVE_X86)
+    if( aes_padlock_ace )
+    {
+        if( mbedtls_padlock_xcryptecb( ctx, mode, input, output ) == 0 )
+            return( 0 );
+
+        // If padlock data misaligned, we just fall back to
+        // unaccelerated mode
+        //
+    }
+#endif
+
+    if( mode == MBEDTLS_AES_ENCRYPT )
+        return( mbedtls_internal_aes_encrypt( ctx, input, output ) );
+    else
+        return( mbedtls_internal_aes_decrypt( ctx, input, output ) );
+}
+
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+/*
+ * AES-CBC buffer encryption/decryption
+ */
+int mbedtls_aes_crypt_cbc( mbedtls_aes_context *ctx,
+                    int mode,
+                    size_t length,
+                    unsigned char iv[16],
+                    const unsigned char *input,
+                    unsigned char *output )
+{
+    int i;
+    unsigned char temp[16];
+
+    if( length % 16 )
+        return( MBEDTLS_ERR_AES_INVALID_INPUT_LENGTH );
+
+#if defined(MBEDTLS_PADLOCK_C) && defined(MBEDTLS_HAVE_X86)
+    if( aes_padlock_ace )
+    {
+        if( mbedtls_padlock_xcryptcbc( ctx, mode, length, iv, input, output ) == 0 )
+            return( 0 );
+
+        // If padlock data misaligned, we just fall back to
+        // unaccelerated mode
+        //
+    }
+#endif
+
+    if( mode == MBEDTLS_AES_DECRYPT )
+    {
+        while( length > 0 )
+        {
+            memcpy( temp, input, 16 );
+            mbedtls_aes_crypt_ecb( ctx, mode, input, output );
+
+            for( i = 0; i < 16; i++ )
+                output[i] = (unsigned char)( output[i] ^ iv[i] );
+
+            memcpy( iv, temp, 16 );
+
+            input  += 16;
+            output += 16;
+            length -= 16;
+        }
+    }
+    else
+    {
+        while( length > 0 )
+        {
+            for( i = 0; i < 16; i++ )
+                output[i] = (unsigned char)( input[i] ^ iv[i] );
+
+            mbedtls_aes_crypt_ecb( ctx, mode, output, output );
+            memcpy( iv, output, 16 );
+
+            input  += 16;
+            output += 16;
+            length -= 16;
+        }
+    }
+
+    return( 0 );
+}
+#endif /* MBEDTLS_CIPHER_MODE_CBC */
+
+#if defined(MBEDTLS_CIPHER_MODE_XTS)
+
+/* Endianess with 64 bits values */
+#ifndef GET_UINT64_LE
+#define GET_UINT64_LE(n,b,i)                            \
+{                                                       \
+    (n) = ( (uint64_t) (b)[(i) + 7] << 56 )             \
+        | ( (uint64_t) (b)[(i) + 6] << 48 )             \
+        | ( (uint64_t) (b)[(i) + 5] << 40 )             \
+        | ( (uint64_t) (b)[(i) + 4] << 32 )             \
+        | ( (uint64_t) (b)[(i) + 3] << 24 )             \
+        | ( (uint64_t) (b)[(i) + 2] << 16 )             \
+        | ( (uint64_t) (b)[(i) + 1] <<  8 )             \
+        | ( (uint64_t) (b)[(i)    ]       );            \
+}
+#endif
+
+#ifndef PUT_UINT64_LE
+#define PUT_UINT64_LE(n,b,i)                            \
+{                                                       \
+    (b)[(i) + 7] = (unsigned char) ( (n) >> 56 );       \
+    (b)[(i) + 6] = (unsigned char) ( (n) >> 48 );       \
+    (b)[(i) + 5] = (unsigned char) ( (n) >> 40 );       \
+    (b)[(i) + 4] = (unsigned char) ( (n) >> 32 );       \
+    (b)[(i) + 3] = (unsigned char) ( (n) >> 24 );       \
+    (b)[(i) + 2] = (unsigned char) ( (n) >> 16 );       \
+    (b)[(i) + 1] = (unsigned char) ( (n) >>  8 );       \
+    (b)[(i)    ] = (unsigned char) ( (n)       );       \
+}
+#endif
+
+typedef unsigned char mbedtls_be128[16];
+
+/*
+ * GF(2^128) multiplication function
+ *
+ * This function multiplies a field element by x in the polynomial field
+ * representation. It uses 64-bit word operations to gain speed but compensates
+ * for machine endianess and hence works correctly on both big and little
+ * endian machines.
+ */
+static void mbedtls_gf128mul_x_ble( unsigned char r[16],
+                                    const unsigned char x[16] )
+{
+    uint64_t a, b, ra, rb;
+
+    GET_UINT64_LE( a, x, 0 );
+    GET_UINT64_LE( b, x, 8 );
+
+    ra = ( a << 1 )  ^ 0x0087 >> ( 8 - ( ( b >> 63 ) << 3 ) );
+    rb = ( a >> 63 ) | ( b << 1 );
+
+    PUT_UINT64_LE( ra, r, 0 );
+    PUT_UINT64_LE( rb, r, 8 );
+}
+
+/*
+ * AES-XTS buffer encryption/decryption
+ */
+int mbedtls_aes_crypt_xts( mbedtls_aes_xts_context *ctx,
+                           int mode,
+                           size_t length,
+                           const unsigned char data_unit[16],
+                           const unsigned char *input,
+                           unsigned char *output )
+{
+    int ret;
+    size_t blocks = length / 16;
+    size_t leftover = length % 16;
+    unsigned char tweak[16];
+    unsigned char prev_tweak[16];
+    unsigned char tmp[16];
+
+    /* Sectors must be at least 16 bytes. */
+    if( length < 16 )
+        return MBEDTLS_ERR_AES_INVALID_INPUT_LENGTH;
+
+    /* NIST SP 80-38E disallows data units larger than 2**20 blocks. */
+    if( length > ( 1 << 20 ) * 16 )
+        return MBEDTLS_ERR_AES_INVALID_INPUT_LENGTH;
+
+    /* Compute the tweak. */
+    ret = mbedtls_aes_crypt_ecb( &ctx->tweak, MBEDTLS_AES_ENCRYPT,
+                                 data_unit, tweak );
+    if( ret != 0 )
+        return( ret );
+
+    while( blocks-- )
+    {
+        size_t i;
+
+        if( leftover && ( mode == MBEDTLS_AES_DECRYPT ) && blocks == 0 )
+        {
+            /* We are on the last block in a decrypt operation that has
+             * leftover bytes, so we need to use the next tweak for this block,
+             * and this tweak for the lefover bytes. Save the current tweak for
+             * the leftovers and then update the current tweak for use on this,
+             * the last full block. */
+            memcpy( prev_tweak, tweak, sizeof( tweak ) );
+            mbedtls_gf128mul_x_ble( tweak, tweak );
+        }
+
+        for( i = 0; i < 16; i++ )
+            tmp[i] = input[i] ^ tweak[i];
+
+        ret = mbedtls_aes_crypt_ecb( &ctx->crypt, mode, tmp, tmp );
+        if( ret != 0 )
+            return( ret );
+
+        for( i = 0; i < 16; i++ )
+            output[i] = tmp[i] ^ tweak[i];
+
+        /* Update the tweak for the next block. */
+        mbedtls_gf128mul_x_ble( tweak, tweak );
+
+        output += 16;
+        input += 16;
+    }
+
+    if( leftover )
+    {
+        /* If we are on the leftover bytes in a decrypt operation, we need to
+         * use the previous tweak for these bytes (as saved in prev_tweak). */
+        unsigned char *t = mode == MBEDTLS_AES_DECRYPT ? prev_tweak : tweak;
+
+        /* We are now on the final part of the data unit, which doesn't divide
+         * evenly by 16. It's time for ciphertext stealing. */
+        size_t i;
+        unsigned char *prev_output = output - 16;
+
+        /* Copy ciphertext bytes from the previous block to our output for each
+         * byte of cyphertext we won't steal. At the same time, copy the
+         * remainder of the input for this final round (since the loop bounds
+         * are the same). */
+        for( i = 0; i < leftover; i++ )
+        {
+            output[i] = prev_output[i];
+            tmp[i] = input[i] ^ t[i];
+        }
+
+        /* Copy ciphertext bytes from the previous block for input in this
+         * round. */
+        for( ; i < 16; i++ )
+            tmp[i] = prev_output[i] ^ t[i];
+
+        ret = mbedtls_aes_crypt_ecb( &ctx->crypt, mode, tmp, tmp );
+        if( ret != 0 )
+            return ret;
+
+        /* Write the result back to the previous block, overriding the previous
+         * output we copied. */
+        for( i = 0; i < 16; i++ )
+            prev_output[i] = tmp[i] ^ t[i];
+    }
+
+    return( 0 );
+}
+#endif /* MBEDTLS_CIPHER_MODE_XTS */
+
+#if defined(MBEDTLS_CIPHER_MODE_CFB)
+/*
+ * AES-CFB128 buffer encryption/decryption
+ */
+int mbedtls_aes_crypt_cfb128( mbedtls_aes_context *ctx,
+                       int mode,
+                       size_t length,
+                       size_t *iv_off,
+                       unsigned char iv[16],
+                       const unsigned char *input,
+                       unsigned char *output )
+{
+    int c;
+    size_t n = *iv_off;
+
+    if( mode == MBEDTLS_AES_DECRYPT )
+    {
+        while( length-- )
+        {
+            if( n == 0 )
+                mbedtls_aes_crypt_ecb( ctx, MBEDTLS_AES_ENCRYPT, iv, iv );
+
+            c = *input++;
+            *output++ = (unsigned char)( c ^ iv[n] );
+            iv[n] = (unsigned char) c;
+
+            n = ( n + 1 ) & 0x0F;
+        }
+    }
+    else
+    {
+        while( length-- )
+        {
+            if( n == 0 )
+                mbedtls_aes_crypt_ecb( ctx, MBEDTLS_AES_ENCRYPT, iv, iv );
+
+            iv[n] = *output++ = (unsigned char)( iv[n] ^ *input++ );
+
+            n = ( n + 1 ) & 0x0F;
+        }
+    }
+
+    *iv_off = n;
+
+    return( 0 );
+}
+
+/*
+ * AES-CFB8 buffer encryption/decryption
+ */
+int mbedtls_aes_crypt_cfb8( mbedtls_aes_context *ctx,
+                       int mode,
+                       size_t length,
+                       unsigned char iv[16],
+                       const unsigned char *input,
+                       unsigned char *output )
+{
+    unsigned char c;
+    unsigned char ov[17];
+
+    while( length-- )
+    {
+        memcpy( ov, iv, 16 );
+        mbedtls_aes_crypt_ecb( ctx, MBEDTLS_AES_ENCRYPT, iv, iv );
+
+        if( mode == MBEDTLS_AES_DECRYPT )
+            ov[16] = *input;
+
+        c = *output++ = (unsigned char)( iv[0] ^ *input++ );
+
+        if( mode == MBEDTLS_AES_ENCRYPT )
+            ov[16] = c;
+
+        memcpy( iv, ov + 1, 16 );
+    }
+
+    return( 0 );
+}
+#endif /* MBEDTLS_CIPHER_MODE_CFB */
+
+#if defined(MBEDTLS_CIPHER_MODE_OFB)
+/*
+ * AES-OFB (Output Feedback Mode) buffer encryption/decryption
+ */
+int mbedtls_aes_crypt_ofb( mbedtls_aes_context *ctx,
+                           size_t length,
+                           size_t *iv_off,
+                           unsigned char iv[16],
+                           const unsigned char *input,
+                           unsigned char *output )
+{
+    int ret = 0;
+    size_t n = *iv_off;
+
+    while( length-- )
+    {
+        if( n == 0 )
+        {
+            ret = mbedtls_aes_crypt_ecb( ctx, MBEDTLS_AES_ENCRYPT, iv, iv );
+            if( ret != 0 )
+                goto exit;
+        }
+        *output++ =  *input++ ^ iv[n];
+
+        n = ( n + 1 ) & 0x0F;
+    }
+
+    *iv_off = n;
+
+exit:
+    return( ret );
+}
+#endif /* MBEDTLS_CIPHER_MODE_OFB */
+
+#if defined(MBEDTLS_CIPHER_MODE_CTR)
+/*
+ * AES-CTR buffer encryption/decryption
+ */
+int mbedtls_aes_crypt_ctr( mbedtls_aes_context *ctx,
+                       size_t length,
+                       size_t *nc_off,
+                       unsigned char nonce_counter[16],
+                       unsigned char stream_block[16],
+                       const unsigned char *input,
+                       unsigned char *output )
+{
+    int c, i;
+    size_t n = *nc_off;
+
+    if ( n > 0x0F )
+        return( MBEDTLS_ERR_AES_BAD_INPUT_DATA );
+
+    while( length-- )
+    {
+        if( n == 0 ) {
+            mbedtls_aes_crypt_ecb( ctx, MBEDTLS_AES_ENCRYPT, nonce_counter, stream_block );
+
+            for( i = 16; i > 0; i-- )
+                if( ++nonce_counter[i - 1] != 0 )
+                    break;
+        }
+        c = *input++;
+        *output++ = (unsigned char)( c ^ stream_block[n] );
+
+        n = ( n + 1 ) & 0x0F;
+    }
+
+    *nc_off = n;
+
+    return( 0 );
+}
+#endif /* MBEDTLS_CIPHER_MODE_CTR */
+
+#endif /* !MBEDTLS_AES_ALT */
+
+#if defined(MBEDTLS_SELF_TEST)
+/*
+ * AES test vectors from:
+ *
+ * http://csrc.nist.gov/archive/aes/rijndael/rijndael-vals.zip
+ */
+static const unsigned char aes_test_ecb_dec[3][16] =
+{
+    { 0x44, 0x41, 0x6A, 0xC2, 0xD1, 0xF5, 0x3C, 0x58,
+      0x33, 0x03, 0x91, 0x7E, 0x6B, 0xE9, 0xEB, 0xE0 },
+    { 0x48, 0xE3, 0x1E, 0x9E, 0x25, 0x67, 0x18, 0xF2,
+      0x92, 0x29, 0x31, 0x9C, 0x19, 0xF1, 0x5B, 0xA4 },
+    { 0x05, 0x8C, 0xCF, 0xFD, 0xBB, 0xCB, 0x38, 0x2D,
+      0x1F, 0x6F, 0x56, 0x58, 0x5D, 0x8A, 0x4A, 0xDE }
+};
+
+static const unsigned char aes_test_ecb_enc[3][16] =
+{
+    { 0xC3, 0x4C, 0x05, 0x2C, 0xC0, 0xDA, 0x8D, 0x73,
+      0x45, 0x1A, 0xFE, 0x5F, 0x03, 0xBE, 0x29, 0x7F },
+    { 0xF3, 0xF6, 0x75, 0x2A, 0xE8, 0xD7, 0x83, 0x11,
+      0x38, 0xF0, 0x41, 0x56, 0x06, 0x31, 0xB1, 0x14 },
+    { 0x8B, 0x79, 0xEE, 0xCC, 0x93, 0xA0, 0xEE, 0x5D,
+      0xFF, 0x30, 0xB4, 0xEA, 0x21, 0x63, 0x6D, 0xA4 }
+};
+
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+static const unsigned char aes_test_cbc_dec[3][16] =
+{
+    { 0xFA, 0xCA, 0x37, 0xE0, 0xB0, 0xC8, 0x53, 0x73,
+      0xDF, 0x70, 0x6E, 0x73, 0xF7, 0xC9, 0xAF, 0x86 },
+    { 0x5D, 0xF6, 0x78, 0xDD, 0x17, 0xBA, 0x4E, 0x75,
+      0xB6, 0x17, 0x68, 0xC6, 0xAD, 0xEF, 0x7C, 0x7B },
+    { 0x48, 0x04, 0xE1, 0x81, 0x8F, 0xE6, 0x29, 0x75,
+      0x19, 0xA3, 0xE8, 0x8C, 0x57, 0x31, 0x04, 0x13 }
+};
+
+static const unsigned char aes_test_cbc_enc[3][16] =
+{
+    { 0x8A, 0x05, 0xFC, 0x5E, 0x09, 0x5A, 0xF4, 0x84,
+      0x8A, 0x08, 0xD3, 0x28, 0xD3, 0x68, 0x8E, 0x3D },
+    { 0x7B, 0xD9, 0x66, 0xD5, 0x3A, 0xD8, 0xC1, 0xBB,
+      0x85, 0xD2, 0xAD, 0xFA, 0xE8, 0x7B, 0xB1, 0x04 },
+    { 0xFE, 0x3C, 0x53, 0x65, 0x3E, 0x2F, 0x45, 0xB5,
+      0x6F, 0xCD, 0x88, 0xB2, 0xCC, 0x89, 0x8F, 0xF0 }
+};
+#endif /* MBEDTLS_CIPHER_MODE_CBC */
+
+#if defined(MBEDTLS_CIPHER_MODE_CFB)
+/*
+ * AES-CFB128 test vectors from:
+ *
+ * http://csrc.nist.gov/publications/nistpubs/800-38a/sp800-38a.pdf
+ */
+static const unsigned char aes_test_cfb128_key[3][32] =
+{
+    { 0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6,
+      0xAB, 0xF7, 0x15, 0x88, 0x09, 0xCF, 0x4F, 0x3C },
+    { 0x8E, 0x73, 0xB0, 0xF7, 0xDA, 0x0E, 0x64, 0x52,
+      0xC8, 0x10, 0xF3, 0x2B, 0x80, 0x90, 0x79, 0xE5,
+      0x62, 0xF8, 0xEA, 0xD2, 0x52, 0x2C, 0x6B, 0x7B },
+    { 0x60, 0x3D, 0xEB, 0x10, 0x15, 0xCA, 0x71, 0xBE,
+      0x2B, 0x73, 0xAE, 0xF0, 0x85, 0x7D, 0x77, 0x81,
+      0x1F, 0x35, 0x2C, 0x07, 0x3B, 0x61, 0x08, 0xD7,
+      0x2D, 0x98, 0x10, 0xA3, 0x09, 0x14, 0xDF, 0xF4 }
+};
+
+static const unsigned char aes_test_cfb128_iv[16] =
+{
+    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+    0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F
+};
+
+static const unsigned char aes_test_cfb128_pt[64] =
+{
+    0x6B, 0xC1, 0xBE, 0xE2, 0x2E, 0x40, 0x9F, 0x96,
+    0xE9, 0x3D, 0x7E, 0x11, 0x73, 0x93, 0x17, 0x2A,
+    0xAE, 0x2D, 0x8A, 0x57, 0x1E, 0x03, 0xAC, 0x9C,
+    0x9E, 0xB7, 0x6F, 0xAC, 0x45, 0xAF, 0x8E, 0x51,
+    0x30, 0xC8, 0x1C, 0x46, 0xA3, 0x5C, 0xE4, 0x11,
+    0xE5, 0xFB, 0xC1, 0x19, 0x1A, 0x0A, 0x52, 0xEF,
+    0xF6, 0x9F, 0x24, 0x45, 0xDF, 0x4F, 0x9B, 0x17,
+    0xAD, 0x2B, 0x41, 0x7B, 0xE6, 0x6C, 0x37, 0x10
+};
+
+static const unsigned char aes_test_cfb128_ct[3][64] =
+{
+    { 0x3B, 0x3F, 0xD9, 0x2E, 0xB7, 0x2D, 0xAD, 0x20,
+      0x33, 0x34, 0x49, 0xF8, 0xE8, 0x3C, 0xFB, 0x4A,
+      0xC8, 0xA6, 0x45, 0x37, 0xA0, 0xB3, 0xA9, 0x3F,
+      0xCD, 0xE3, 0xCD, 0xAD, 0x9F, 0x1C, 0xE5, 0x8B,
+      0x26, 0x75, 0x1F, 0x67, 0xA3, 0xCB, 0xB1, 0x40,
+      0xB1, 0x80, 0x8C, 0xF1, 0x87, 0xA4, 0xF4, 0xDF,
+      0xC0, 0x4B, 0x05, 0x35, 0x7C, 0x5D, 0x1C, 0x0E,
+      0xEA, 0xC4, 0xC6, 0x6F, 0x9F, 0xF7, 0xF2, 0xE6 },
+    { 0xCD, 0xC8, 0x0D, 0x6F, 0xDD, 0xF1, 0x8C, 0xAB,
+      0x34, 0xC2, 0x59, 0x09, 0xC9, 0x9A, 0x41, 0x74,
+      0x67, 0xCE, 0x7F, 0x7F, 0x81, 0x17, 0x36, 0x21,
+      0x96, 0x1A, 0x2B, 0x70, 0x17, 0x1D, 0x3D, 0x7A,
+      0x2E, 0x1E, 0x8A, 0x1D, 0xD5, 0x9B, 0x88, 0xB1,
+      0xC8, 0xE6, 0x0F, 0xED, 0x1E, 0xFA, 0xC4, 0xC9,
+      0xC0, 0x5F, 0x9F, 0x9C, 0xA9, 0x83, 0x4F, 0xA0,
+      0x42, 0xAE, 0x8F, 0xBA, 0x58, 0x4B, 0x09, 0xFF },
+    { 0xDC, 0x7E, 0x84, 0xBF, 0xDA, 0x79, 0x16, 0x4B,
+      0x7E, 0xCD, 0x84, 0x86, 0x98, 0x5D, 0x38, 0x60,
+      0x39, 0xFF, 0xED, 0x14, 0x3B, 0x28, 0xB1, 0xC8,
+      0x32, 0x11, 0x3C, 0x63, 0x31, 0xE5, 0x40, 0x7B,
+      0xDF, 0x10, 0x13, 0x24, 0x15, 0xE5, 0x4B, 0x92,
+      0xA1, 0x3E, 0xD0, 0xA8, 0x26, 0x7A, 0xE2, 0xF9,
+      0x75, 0xA3, 0x85, 0x74, 0x1A, 0xB9, 0xCE, 0xF8,
+      0x20, 0x31, 0x62, 0x3D, 0x55, 0xB1, 0xE4, 0x71 }
+};
+#endif /* MBEDTLS_CIPHER_MODE_CFB */
+
+#if defined(MBEDTLS_CIPHER_MODE_OFB)
+/*
+ * AES-OFB test vectors from:
+ *
+ * https://csrc.nist.gov/publications/detail/sp/800-38a/final
+ */
+static const unsigned char aes_test_ofb_key[3][32] =
+{
+    { 0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6,
+      0xAB, 0xF7, 0x15, 0x88, 0x09, 0xCF, 0x4F, 0x3C },
+    { 0x8E, 0x73, 0xB0, 0xF7, 0xDA, 0x0E, 0x64, 0x52,
+      0xC8, 0x10, 0xF3, 0x2B, 0x80, 0x90, 0x79, 0xE5,
+      0x62, 0xF8, 0xEA, 0xD2, 0x52, 0x2C, 0x6B, 0x7B },
+    { 0x60, 0x3D, 0xEB, 0x10, 0x15, 0xCA, 0x71, 0xBE,
+      0x2B, 0x73, 0xAE, 0xF0, 0x85, 0x7D, 0x77, 0x81,
+      0x1F, 0x35, 0x2C, 0x07, 0x3B, 0x61, 0x08, 0xD7,
+      0x2D, 0x98, 0x10, 0xA3, 0x09, 0x14, 0xDF, 0xF4 }
+};
+
+static const unsigned char aes_test_ofb_iv[16] =
+{
+    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+    0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F
+};
+
+static const unsigned char aes_test_ofb_pt[64] =
+{
+    0x6B, 0xC1, 0xBE, 0xE2, 0x2E, 0x40, 0x9F, 0x96,
+    0xE9, 0x3D, 0x7E, 0x11, 0x73, 0x93, 0x17, 0x2A,
+    0xAE, 0x2D, 0x8A, 0x57, 0x1E, 0x03, 0xAC, 0x9C,
+    0x9E, 0xB7, 0x6F, 0xAC, 0x45, 0xAF, 0x8E, 0x51,
+    0x30, 0xC8, 0x1C, 0x46, 0xA3, 0x5C, 0xE4, 0x11,
+    0xE5, 0xFB, 0xC1, 0x19, 0x1A, 0x0A, 0x52, 0xEF,
+    0xF6, 0x9F, 0x24, 0x45, 0xDF, 0x4F, 0x9B, 0x17,
+    0xAD, 0x2B, 0x41, 0x7B, 0xE6, 0x6C, 0x37, 0x10
+};
+
+static const unsigned char aes_test_ofb_ct[3][64] =
+{
+    { 0x3B, 0x3F, 0xD9, 0x2E, 0xB7, 0x2D, 0xAD, 0x20,
+      0x33, 0x34, 0x49, 0xF8, 0xE8, 0x3C, 0xFB, 0x4A,
+      0x77, 0x89, 0x50, 0x8d, 0x16, 0x91, 0x8f, 0x03,
+      0xf5, 0x3c, 0x52, 0xda, 0xc5, 0x4e, 0xd8, 0x25,
+      0x97, 0x40, 0x05, 0x1e, 0x9c, 0x5f, 0xec, 0xf6,
+      0x43, 0x44, 0xf7, 0xa8, 0x22, 0x60, 0xed, 0xcc,
+      0x30, 0x4c, 0x65, 0x28, 0xf6, 0x59, 0xc7, 0x78,
+      0x66, 0xa5, 0x10, 0xd9, 0xc1, 0xd6, 0xae, 0x5e },
+    { 0xCD, 0xC8, 0x0D, 0x6F, 0xDD, 0xF1, 0x8C, 0xAB,
+      0x34, 0xC2, 0x59, 0x09, 0xC9, 0x9A, 0x41, 0x74,
+      0xfc, 0xc2, 0x8b, 0x8d, 0x4c, 0x63, 0x83, 0x7c,
+      0x09, 0xe8, 0x17, 0x00, 0xc1, 0x10, 0x04, 0x01,
+      0x8d, 0x9a, 0x9a, 0xea, 0xc0, 0xf6, 0x59, 0x6f,
+      0x55, 0x9c, 0x6d, 0x4d, 0xaf, 0x59, 0xa5, 0xf2,
+      0x6d, 0x9f, 0x20, 0x08, 0x57, 0xca, 0x6c, 0x3e,
+      0x9c, 0xac, 0x52, 0x4b, 0xd9, 0xac, 0xc9, 0x2a },
+    { 0xDC, 0x7E, 0x84, 0xBF, 0xDA, 0x79, 0x16, 0x4B,
+      0x7E, 0xCD, 0x84, 0x86, 0x98, 0x5D, 0x38, 0x60,
+      0x4f, 0xeb, 0xdc, 0x67, 0x40, 0xd2, 0x0b, 0x3a,
+      0xc8, 0x8f, 0x6a, 0xd8, 0x2a, 0x4f, 0xb0, 0x8d,
+      0x71, 0xab, 0x47, 0xa0, 0x86, 0xe8, 0x6e, 0xed,
+      0xf3, 0x9d, 0x1c, 0x5b, 0xba, 0x97, 0xc4, 0x08,
+      0x01, 0x26, 0x14, 0x1d, 0x67, 0xf3, 0x7b, 0xe8,
+      0x53, 0x8f, 0x5a, 0x8b, 0xe7, 0x40, 0xe4, 0x84 }
+};
+#endif /* MBEDTLS_CIPHER_MODE_OFB */
+
+#if defined(MBEDTLS_CIPHER_MODE_CTR)
+/*
+ * AES-CTR test vectors from:
+ *
+ * http://www.faqs.org/rfcs/rfc3686.html
+ */
+
+static const unsigned char aes_test_ctr_key[3][16] =
+{
+    { 0xAE, 0x68, 0x52, 0xF8, 0x12, 0x10, 0x67, 0xCC,
+      0x4B, 0xF7, 0xA5, 0x76, 0x55, 0x77, 0xF3, 0x9E },
+    { 0x7E, 0x24, 0x06, 0x78, 0x17, 0xFA, 0xE0, 0xD7,
+      0x43, 0xD6, 0xCE, 0x1F, 0x32, 0x53, 0x91, 0x63 },
+    { 0x76, 0x91, 0xBE, 0x03, 0x5E, 0x50, 0x20, 0xA8,
+      0xAC, 0x6E, 0x61, 0x85, 0x29, 0xF9, 0xA0, 0xDC }
+};
+
+static const unsigned char aes_test_ctr_nonce_counter[3][16] =
+{
+    { 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 },
+    { 0x00, 0x6C, 0xB6, 0xDB, 0xC0, 0x54, 0x3B, 0x59,
+      0xDA, 0x48, 0xD9, 0x0B, 0x00, 0x00, 0x00, 0x01 },
+    { 0x00, 0xE0, 0x01, 0x7B, 0x27, 0x77, 0x7F, 0x3F,
+      0x4A, 0x17, 0x86, 0xF0, 0x00, 0x00, 0x00, 0x01 }
+};
+
+static const unsigned char aes_test_ctr_pt[3][48] =
+{
+    { 0x53, 0x69, 0x6E, 0x67, 0x6C, 0x65, 0x20, 0x62,
+      0x6C, 0x6F, 0x63, 0x6B, 0x20, 0x6D, 0x73, 0x67 },
+
+    { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+      0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
+      0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+      0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F },
+
+    { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+      0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
+      0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+      0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F,
+      0x20, 0x21, 0x22, 0x23 }
+};
+
+static const unsigned char aes_test_ctr_ct[3][48] =
+{
+    { 0xE4, 0x09, 0x5D, 0x4F, 0xB7, 0xA7, 0xB3, 0x79,
+      0x2D, 0x61, 0x75, 0xA3, 0x26, 0x13, 0x11, 0xB8 },
+    { 0x51, 0x04, 0xA1, 0x06, 0x16, 0x8A, 0x72, 0xD9,
+      0x79, 0x0D, 0x41, 0xEE, 0x8E, 0xDA, 0xD3, 0x88,
+      0xEB, 0x2E, 0x1E, 0xFC, 0x46, 0xDA, 0x57, 0xC8,
+      0xFC, 0xE6, 0x30, 0xDF, 0x91, 0x41, 0xBE, 0x28 },
+    { 0xC1, 0xCF, 0x48, 0xA8, 0x9F, 0x2F, 0xFD, 0xD9,
+      0xCF, 0x46, 0x52, 0xE9, 0xEF, 0xDB, 0x72, 0xD7,
+      0x45, 0x40, 0xA4, 0x2B, 0xDE, 0x6D, 0x78, 0x36,
+      0xD5, 0x9A, 0x5C, 0xEA, 0xAE, 0xF3, 0x10, 0x53,
+      0x25, 0xB2, 0x07, 0x2F }
+};
+
+static const int aes_test_ctr_len[3] =
+    { 16, 32, 36 };
+#endif /* MBEDTLS_CIPHER_MODE_CTR */
+
+#if defined(MBEDTLS_CIPHER_MODE_XTS)
+/*
+ * AES-XTS test vectors from:
+ *
+ * IEEE P1619/D16 Annex B
+ * https://web.archive.org/web/20150629024421/http://grouper.ieee.org/groups/1619/email/pdf00086.pdf
+ * (Archived from original at http://grouper.ieee.org/groups/1619/email/pdf00086.pdf)
+ */
+static const unsigned char aes_test_xts_key[][32] =
+{
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11,
+      0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11,
+      0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22,
+      0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22 },
+    { 0xff, 0xfe, 0xfd, 0xfc, 0xfb, 0xfa, 0xf9, 0xf8,
+      0xf7, 0xf6, 0xf5, 0xf4, 0xf3, 0xf2, 0xf1, 0xf0,
+      0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22,
+      0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22 },
+};
+
+static const unsigned char aes_test_xts_pt32[][32] =
+{
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44,
+      0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44,
+      0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44,
+      0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44 },
+    { 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44,
+      0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44,
+      0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44,
+      0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44 },
+};
+
+static const unsigned char aes_test_xts_ct32[][32] =
+{
+    { 0x91, 0x7c, 0xf6, 0x9e, 0xbd, 0x68, 0xb2, 0xec,
+      0x9b, 0x9f, 0xe9, 0xa3, 0xea, 0xdd, 0xa6, 0x92,
+      0xcd, 0x43, 0xd2, 0xf5, 0x95, 0x98, 0xed, 0x85,
+      0x8c, 0x02, 0xc2, 0x65, 0x2f, 0xbf, 0x92, 0x2e },
+    { 0xc4, 0x54, 0x18, 0x5e, 0x6a, 0x16, 0x93, 0x6e,
+      0x39, 0x33, 0x40, 0x38, 0xac, 0xef, 0x83, 0x8b,
+      0xfb, 0x18, 0x6f, 0xff, 0x74, 0x80, 0xad, 0xc4,
+      0x28, 0x93, 0x82, 0xec, 0xd6, 0xd3, 0x94, 0xf0 },
+    { 0xaf, 0x85, 0x33, 0x6b, 0x59, 0x7a, 0xfc, 0x1a,
+      0x90, 0x0b, 0x2e, 0xb2, 0x1e, 0xc9, 0x49, 0xd2,
+      0x92, 0xdf, 0x4c, 0x04, 0x7e, 0x0b, 0x21, 0x53,
+      0x21, 0x86, 0xa5, 0x97, 0x1a, 0x22, 0x7a, 0x89 },
+};
+
+static const unsigned char aes_test_xts_data_unit[][16] =
+{
+   { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+   { 0x33, 0x33, 0x33, 0x33, 0x33, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+   { 0x33, 0x33, 0x33, 0x33, 0x33, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+};
+
+#endif /* MBEDTLS_CIPHER_MODE_XTS */
+
+/*
+ * Checkup routine
+ */
+int mbedtls_aes_self_test( int verbose )
+{
+    int ret = 0, i, j, u, mode;
+    unsigned int keybits;
+    unsigned char key[32];
+    unsigned char buf[64];
+    const unsigned char *aes_tests;
+#if defined(MBEDTLS_CIPHER_MODE_CBC) || defined(MBEDTLS_CIPHER_MODE_CFB)
+    unsigned char iv[16];
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+    unsigned char prv[16];
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_CTR) || defined(MBEDTLS_CIPHER_MODE_CFB) || \
+    defined(MBEDTLS_CIPHER_MODE_OFB)
+    size_t offset;
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_CTR) || defined(MBEDTLS_CIPHER_MODE_XTS)
+    int len;
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_CTR)
+    unsigned char nonce_counter[16];
+    unsigned char stream_block[16];
+#endif
+    mbedtls_aes_context ctx;
+
+    memset( key, 0, 32 );
+    mbedtls_aes_init( &ctx );
+
+    /*
+     * ECB mode
+     */
+    for( i = 0; i < 6; i++ )
+    {
+        u = i >> 1;
+        keybits = 128 + u * 64;
+        mode = i & 1;
+
+        if( verbose != 0 )
+            mbedtls_printf( "  AES-ECB-%3d (%s): ", keybits,
+                            ( mode == MBEDTLS_AES_DECRYPT ) ? "dec" : "enc" );
+
+        memset( buf, 0, 16 );
+
+        if( mode == MBEDTLS_AES_DECRYPT )
+        {
+            ret = mbedtls_aes_setkey_dec( &ctx, key, keybits );
+            aes_tests = aes_test_ecb_dec[u];
+        }
+        else
+        {
+            ret = mbedtls_aes_setkey_enc( &ctx, key, keybits );
+            aes_tests = aes_test_ecb_enc[u];
+        }
+
+        /*
+         * AES-192 is an optional feature that may be unavailable when
+         * there is an alternative underlying implementation i.e. when
+         * MBEDTLS_AES_ALT is defined.
+         */
+        if( ret == MBEDTLS_ERR_AES_FEATURE_UNAVAILABLE && keybits == 192 )
+        {
+            mbedtls_printf( "skipped\n" );
+            continue;
+        }
+        else if( ret != 0 )
+        {
+            goto exit;
+        }
+
+        for( j = 0; j < 10000; j++ )
+        {
+            ret = mbedtls_aes_crypt_ecb( &ctx, mode, buf, buf );
+            if( ret != 0 )
+                goto exit;
+        }
+
+        if( memcmp( buf, aes_tests, 16 ) != 0 )
+        {
+            ret = 1;
+            goto exit;
+        }
+
+        if( verbose != 0 )
+            mbedtls_printf( "passed\n" );
+    }
+
+    if( verbose != 0 )
+        mbedtls_printf( "\n" );
+
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+    /*
+     * CBC mode
+     */
+    for( i = 0; i < 6; i++ )
+    {
+        u = i >> 1;
+        keybits = 128 + u * 64;
+        mode = i & 1;
+
+        if( verbose != 0 )
+            mbedtls_printf( "  AES-CBC-%3d (%s): ", keybits,
+                            ( mode == MBEDTLS_AES_DECRYPT ) ? "dec" : "enc" );
+
+        memset( iv , 0, 16 );
+        memset( prv, 0, 16 );
+        memset( buf, 0, 16 );
+
+        if( mode == MBEDTLS_AES_DECRYPT )
+        {
+            ret = mbedtls_aes_setkey_dec( &ctx, key, keybits );
+            aes_tests = aes_test_cbc_dec[u];
+        }
+        else
+        {
+            ret = mbedtls_aes_setkey_enc( &ctx, key, keybits );
+            aes_tests = aes_test_cbc_enc[u];
+        }
+
+        /*
+         * AES-192 is an optional feature that may be unavailable when
+         * there is an alternative underlying implementation i.e. when
+         * MBEDTLS_AES_ALT is defined.
+         */
+        if( ret == MBEDTLS_ERR_AES_FEATURE_UNAVAILABLE && keybits == 192 )
+        {
+            mbedtls_printf( "skipped\n" );
+            continue;
+        }
+        else if( ret != 0 )
+        {
+            goto exit;
+        }
+
+        for( j = 0; j < 10000; j++ )
+        {
+            if( mode == MBEDTLS_AES_ENCRYPT )
+            {
+                unsigned char tmp[16];
+
+                memcpy( tmp, prv, 16 );
+                memcpy( prv, buf, 16 );
+                memcpy( buf, tmp, 16 );
+            }
+
+            ret = mbedtls_aes_crypt_cbc( &ctx, mode, 16, iv, buf, buf );
+            if( ret != 0 )
+                goto exit;
+
+        }
+
+        if( memcmp( buf, aes_tests, 16 ) != 0 )
+        {
+            ret = 1;
+            goto exit;
+        }
+
+        if( verbose != 0 )
+            mbedtls_printf( "passed\n" );
+    }
+
+    if( verbose != 0 )
+        mbedtls_printf( "\n" );
+#endif /* MBEDTLS_CIPHER_MODE_CBC */
+
+#if defined(MBEDTLS_CIPHER_MODE_CFB)
+    /*
+     * CFB128 mode
+     */
+    for( i = 0; i < 6; i++ )
+    {
+        u = i >> 1;
+        keybits = 128 + u * 64;
+        mode = i & 1;
+
+        if( verbose != 0 )
+            mbedtls_printf( "  AES-CFB128-%3d (%s): ", keybits,
+                            ( mode == MBEDTLS_AES_DECRYPT ) ? "dec" : "enc" );
+
+        memcpy( iv,  aes_test_cfb128_iv, 16 );
+        memcpy( key, aes_test_cfb128_key[u], keybits / 8 );
+
+        offset = 0;
+        ret = mbedtls_aes_setkey_enc( &ctx, key, keybits );
+        /*
+         * AES-192 is an optional feature that may be unavailable when
+         * there is an alternative underlying implementation i.e. when
+         * MBEDTLS_AES_ALT is defined.
+         */
+        if( ret == MBEDTLS_ERR_AES_FEATURE_UNAVAILABLE && keybits == 192 )
+        {
+            mbedtls_printf( "skipped\n" );
+            continue;
+        }
+        else if( ret != 0 )
+        {
+            goto exit;
+        }
+
+        if( mode == MBEDTLS_AES_DECRYPT )
+        {
+            memcpy( buf, aes_test_cfb128_ct[u], 64 );
+            aes_tests = aes_test_cfb128_pt;
+        }
+        else
+        {
+            memcpy( buf, aes_test_cfb128_pt, 64 );
+            aes_tests = aes_test_cfb128_ct[u];
+        }
+
+        ret = mbedtls_aes_crypt_cfb128( &ctx, mode, 64, &offset, iv, buf, buf );
+        if( ret != 0 )
+            goto exit;
+
+        if( memcmp( buf, aes_tests, 64 ) != 0 )
+        {
+            ret = 1;
+            goto exit;
+        }
+
+        if( verbose != 0 )
+            mbedtls_printf( "passed\n" );
+    }
+
+    if( verbose != 0 )
+        mbedtls_printf( "\n" );
+#endif /* MBEDTLS_CIPHER_MODE_CFB */
+
+#if defined(MBEDTLS_CIPHER_MODE_OFB)
+    /*
+     * OFB mode
+     */
+    for( i = 0; i < 6; i++ )
+    {
+        u = i >> 1;
+        keybits = 128 + u * 64;
+        mode = i & 1;
+
+        if( verbose != 0 )
+            mbedtls_printf( "  AES-OFB-%3d (%s): ", keybits,
+                            ( mode == MBEDTLS_AES_DECRYPT ) ? "dec" : "enc" );
+
+        memcpy( iv,  aes_test_ofb_iv, 16 );
+        memcpy( key, aes_test_ofb_key[u], keybits / 8 );
+
+        offset = 0;
+        ret = mbedtls_aes_setkey_enc( &ctx, key, keybits );
+        /*
+         * AES-192 is an optional feature that may be unavailable when
+         * there is an alternative underlying implementation i.e. when
+         * MBEDTLS_AES_ALT is defined.
+         */
+        if( ret == MBEDTLS_ERR_AES_FEATURE_UNAVAILABLE && keybits == 192 )
+        {
+            mbedtls_printf( "skipped\n" );
+            continue;
+        }
+        else if( ret != 0 )
+        {
+            goto exit;
+        }
+
+        if( mode == MBEDTLS_AES_DECRYPT )
+        {
+            memcpy( buf, aes_test_ofb_ct[u], 64 );
+            aes_tests = aes_test_ofb_pt;
+        }
+        else
+        {
+            memcpy( buf, aes_test_ofb_pt, 64 );
+            aes_tests = aes_test_ofb_ct[u];
+        }
+
+        ret = mbedtls_aes_crypt_ofb( &ctx, 64, &offset, iv, buf, buf );
+        if( ret != 0 )
+            goto exit;
+
+        if( memcmp( buf, aes_tests, 64 ) != 0 )
+        {
+            ret = 1;
+            goto exit;
+        }
+
+        if( verbose != 0 )
+            mbedtls_printf( "passed\n" );
+    }
+
+    if( verbose != 0 )
+        mbedtls_printf( "\n" );
+#endif /* MBEDTLS_CIPHER_MODE_OFB */
+
+#if defined(MBEDTLS_CIPHER_MODE_CTR)
+    /*
+     * CTR mode
+     */
+    for( i = 0; i < 6; i++ )
+    {
+        u = i >> 1;
+        mode = i & 1;
+
+        if( verbose != 0 )
+            mbedtls_printf( "  AES-CTR-128 (%s): ",
+                            ( mode == MBEDTLS_AES_DECRYPT ) ? "dec" : "enc" );
+
+        memcpy( nonce_counter, aes_test_ctr_nonce_counter[u], 16 );
+        memcpy( key, aes_test_ctr_key[u], 16 );
+
+        offset = 0;
+        if( ( ret = mbedtls_aes_setkey_enc( &ctx, key, 128 ) ) != 0 )
+            goto exit;
+
+        len = aes_test_ctr_len[u];
+
+        if( mode == MBEDTLS_AES_DECRYPT )
+        {
+            memcpy( buf, aes_test_ctr_ct[u], len );
+            aes_tests = aes_test_ctr_pt[u];
+        }
+        else
+        {
+            memcpy( buf, aes_test_ctr_pt[u], len );
+            aes_tests = aes_test_ctr_ct[u];
+        }
+
+        ret = mbedtls_aes_crypt_ctr( &ctx, len, &offset, nonce_counter,
+                                     stream_block, buf, buf );
+        if( ret != 0 )
+            goto exit;
+
+        if( memcmp( buf, aes_tests, len ) != 0 )
+        {
+            ret = 1;
+            goto exit;
+        }
+
+        if( verbose != 0 )
+            mbedtls_printf( "passed\n" );
+    }
+
+    if( verbose != 0 )
+        mbedtls_printf( "\n" );
+#endif /* MBEDTLS_CIPHER_MODE_CTR */
+
+#if defined(MBEDTLS_CIPHER_MODE_XTS)
+    {
+    static const int num_tests =
+        sizeof(aes_test_xts_key) / sizeof(*aes_test_xts_key);
+    mbedtls_aes_xts_context ctx_xts;
+
+    /*
+     * XTS mode
+     */
+    mbedtls_aes_xts_init( &ctx_xts );
+
+    for( i = 0; i < num_tests << 1; i++ )
+    {
+        const unsigned char *data_unit;
+        u = i >> 1;
+        mode = i & 1;
+
+        if( verbose != 0 )
+            mbedtls_printf( "  AES-XTS-128 (%s): ",
+                            ( mode == MBEDTLS_AES_DECRYPT ) ? "dec" : "enc" );
+
+        memset( key, 0, sizeof( key ) );
+        memcpy( key, aes_test_xts_key[u], 32 );
+        data_unit = aes_test_xts_data_unit[u];
+
+        len = sizeof( *aes_test_xts_ct32 );
+
+        if( mode == MBEDTLS_AES_DECRYPT )
+        {
+            ret = mbedtls_aes_xts_setkey_dec( &ctx_xts, key, 256 );
+            if( ret != 0)
+                goto exit;
+            memcpy( buf, aes_test_xts_ct32[u], len );
+            aes_tests = aes_test_xts_pt32[u];
+        }
+        else
+        {
+            ret = mbedtls_aes_xts_setkey_enc( &ctx_xts, key, 256 );
+            if( ret != 0)
+                goto exit;
+            memcpy( buf, aes_test_xts_pt32[u], len );
+            aes_tests = aes_test_xts_ct32[u];
+        }
+
+
+        ret = mbedtls_aes_crypt_xts( &ctx_xts, mode, len, data_unit,
+                                     buf, buf );
+        if( ret != 0 )
+            goto exit;
+
+        if( memcmp( buf, aes_tests, len ) != 0 )
+        {
+            ret = 1;
+            goto exit;
+        }
+
+        if( verbose != 0 )
+            mbedtls_printf( "passed\n" );
+    }
+
+    if( verbose != 0 )
+        mbedtls_printf( "\n" );
+
+    mbedtls_aes_xts_free( &ctx_xts );
+    }
+#endif /* MBEDTLS_CIPHER_MODE_XTS */
+
+    ret = 0;
+
+exit:
+    if( ret != 0 && verbose != 0 )
+        mbedtls_printf( "failed\n" );
+
+    mbedtls_aes_free( &ctx );
+
+    return( ret );
+}
+
+#endif /* MBEDTLS_SELF_TEST */
+
+#endif /* MBEDTLS_AES_C */
diff --git a/common/mbedtls/aes.h b/common/mbedtls/aes.h
new file mode 100644
index 000000000..9af6bb729
--- /dev/null
+++ b/common/mbedtls/aes.h
@@ -0,0 +1,628 @@
+/**
+ * \file aes.h
+ *
+ * \brief   This file contains AES definitions and functions.
+ *
+ *          The Advanced Encryption Standard (AES) specifies a FIPS-approved
+ *          cryptographic algorithm that can be used to protect electronic
+ *          data.
+ *
+ *          The AES algorithm is a symmetric block cipher that can
+ *          encrypt and decrypt information. For more information, see
+ *          <em>FIPS Publication 197: Advanced Encryption Standard</em> and
+ *          <em>ISO/IEC 18033-2:2006: Information technology -- Security
+ *          techniques -- Encryption algorithms -- Part 2: Asymmetric
+ *          ciphers</em>.
+ *
+ *          The AES-XTS block mode is standardized by NIST SP 800-38E
+ *          <https://nvlpubs.nist.gov/nistpubs/legacy/sp/nistspecialpublication800-38e.pdf>
+ *          and described in detail by IEEE P1619
+ *          <https://ieeexplore.ieee.org/servlet/opac?punumber=4375278>.
+ */
+
+/*  Copyright (C) 2006-2018, Arm Limited (or its affiliates), All Rights Reserved.
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of Mbed TLS (https://tls.mbed.org)
+ */
+
+#ifndef MBEDTLS_AES_H
+#define MBEDTLS_AES_H
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#include <stddef.h>
+#include <stdint.h>
+
+/* padlock.c and aesni.c rely on these values! */
+#define MBEDTLS_AES_ENCRYPT     1 /**< AES encryption. */
+#define MBEDTLS_AES_DECRYPT     0 /**< AES decryption. */
+
+/* Error codes in range 0x0020-0x0022 */
+#define MBEDTLS_ERR_AES_INVALID_KEY_LENGTH                -0x0020  /**< Invalid key length. */
+#define MBEDTLS_ERR_AES_INVALID_INPUT_LENGTH              -0x0022  /**< Invalid data input length. */
+
+/* Error codes in range 0x0021-0x0025 */
+#define MBEDTLS_ERR_AES_BAD_INPUT_DATA                    -0x0021  /**< Invalid input data. */
+#define MBEDTLS_ERR_AES_FEATURE_UNAVAILABLE               -0x0023  /**< Feature not available. For example, an unsupported AES key size. */
+#define MBEDTLS_ERR_AES_HW_ACCEL_FAILED                   -0x0025  /**< AES hardware accelerator failed. */
+
+#if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && \
+    !defined(inline) && !defined(__cplusplus)
+#define inline __inline
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if !defined(MBEDTLS_AES_ALT)
+// Regular implementation
+//
+
+/**
+ * \brief The AES context-type definition.
+ */
+typedef struct mbedtls_aes_context
+{
+    int nr;                     /*!< The number of rounds. */
+    uint32_t *rk;               /*!< AES round keys. */
+    uint32_t buf[68];           /*!< Unaligned data buffer. This buffer can
+                                     hold 32 extra Bytes, which can be used for
+                                     one of the following purposes:
+                                     <ul><li>Alignment if VIA padlock is
+                                             used.</li>
+                                     <li>Simplifying key expansion in the 256-bit
+                                         case by generating an extra round key.
+                                         </li></ul> */
+}
+mbedtls_aes_context;
+
+#if defined(MBEDTLS_CIPHER_MODE_XTS)
+/**
+ * \brief The AES XTS context-type definition.
+ */
+typedef struct mbedtls_aes_xts_context
+{
+    mbedtls_aes_context crypt; /*!< The AES context to use for AES block
+                                        encryption or decryption. */
+    mbedtls_aes_context tweak; /*!< The AES context used for tweak
+                                        computation. */
+} mbedtls_aes_xts_context;
+#endif /* MBEDTLS_CIPHER_MODE_XTS */
+
+#else  /* MBEDTLS_AES_ALT */
+#include "aes_alt.h"
+#endif /* MBEDTLS_AES_ALT */
+
+/**
+ * \brief          This function initializes the specified AES context.
+ *
+ *                 It must be the first API called before using
+ *                 the context.
+ *
+ * \param ctx      The AES context to initialize.
+ */
+void mbedtls_aes_init( mbedtls_aes_context *ctx );
+
+/**
+ * \brief          This function releases and clears the specified AES context.
+ *
+ * \param ctx      The AES context to clear.
+ */
+void mbedtls_aes_free( mbedtls_aes_context *ctx );
+
+#if defined(MBEDTLS_CIPHER_MODE_XTS)
+/**
+ * \brief          This function initializes the specified AES XTS context.
+ *
+ *                 It must be the first API called before using
+ *                 the context.
+ *
+ * \param ctx      The AES XTS context to initialize.
+ */
+void mbedtls_aes_xts_init( mbedtls_aes_xts_context *ctx );
+
+/**
+ * \brief          This function releases and clears the specified AES XTS context.
+ *
+ * \param ctx      The AES XTS context to clear.
+ */
+void mbedtls_aes_xts_free( mbedtls_aes_xts_context *ctx );
+#endif /* MBEDTLS_CIPHER_MODE_XTS */
+
+/**
+ * \brief          This function sets the encryption key.
+ *
+ * \param ctx      The AES context to which the key should be bound.
+ * \param key      The encryption key.
+ * \param keybits  The size of data passed in bits. Valid options are:
+ *                 <ul><li>128 bits</li>
+ *                 <li>192 bits</li>
+ *                 <li>256 bits</li></ul>
+ *
+ * \return         \c 0 on success.
+ * \return         #MBEDTLS_ERR_AES_INVALID_KEY_LENGTH on failure.
+ */
+int mbedtls_aes_setkey_enc( mbedtls_aes_context *ctx, const unsigned char *key,
+                    unsigned int keybits );
+
+/**
+ * \brief          This function sets the decryption key.
+ *
+ * \param ctx      The AES context to which the key should be bound.
+ * \param key      The decryption key.
+ * \param keybits  The size of data passed. Valid options are:
+ *                 <ul><li>128 bits</li>
+ *                 <li>192 bits</li>
+ *                 <li>256 bits</li></ul>
+ *
+ * \return         \c 0 on success.
+ * \return         #MBEDTLS_ERR_AES_INVALID_KEY_LENGTH on failure.
+ */
+int mbedtls_aes_setkey_dec( mbedtls_aes_context *ctx, const unsigned char *key,
+                    unsigned int keybits );
+
+#if defined(MBEDTLS_CIPHER_MODE_XTS)
+/**
+ * \brief          This function prepares an XTS context for encryption and
+ *                 sets the encryption key.
+ *
+ * \param ctx      The AES XTS context to which the key should be bound.
+ * \param key      The encryption key. This is comprised of the XTS key1
+ *                 concatenated with the XTS key2.
+ * \param keybits  The size of \p key passed in bits. Valid options are:
+ *                 <ul><li>256 bits (each of key1 and key2 is a 128-bit key)</li>
+ *                 <li>512 bits (each of key1 and key2 is a 256-bit key)</li></ul>
+ *
+ * \return         \c 0 on success.
+ * \return         #MBEDTLS_ERR_AES_INVALID_KEY_LENGTH on failure.
+ */
+int mbedtls_aes_xts_setkey_enc( mbedtls_aes_xts_context *ctx,
+                                const unsigned char *key,
+                                unsigned int keybits );
+
+/**
+ * \brief          This function prepares an XTS context for decryption and
+ *                 sets the decryption key.
+ *
+ * \param ctx      The AES XTS context to which the key should be bound.
+ * \param key      The decryption key. This is comprised of the XTS key1
+ *                 concatenated with the XTS key2.
+ * \param keybits  The size of \p key passed in bits. Valid options are:
+ *                 <ul><li>256 bits (each of key1 and key2 is a 128-bit key)</li>
+ *                 <li>512 bits (each of key1 and key2 is a 256-bit key)</li></ul>
+ *
+ * \return         \c 0 on success.
+ * \return         #MBEDTLS_ERR_AES_INVALID_KEY_LENGTH on failure.
+ */
+int mbedtls_aes_xts_setkey_dec( mbedtls_aes_xts_context *ctx,
+                                const unsigned char *key,
+                                unsigned int keybits );
+#endif /* MBEDTLS_CIPHER_MODE_XTS */
+
+/**
+ * \brief          This function performs an AES single-block encryption or
+ *                 decryption operation.
+ *
+ *                 It performs the operation defined in the \p mode parameter
+ *                 (encrypt or decrypt), on the input data buffer defined in
+ *                 the \p input parameter.
+ *
+ *                 mbedtls_aes_init(), and either mbedtls_aes_setkey_enc() or
+ *                 mbedtls_aes_setkey_dec() must be called before the first
+ *                 call to this API with the same context.
+ *
+ * \param ctx      The AES context to use for encryption or decryption.
+ * \param mode     The AES operation: #MBEDTLS_AES_ENCRYPT or
+ *                 #MBEDTLS_AES_DECRYPT.
+ * \param input    The 16-Byte buffer holding the input data.
+ * \param output   The 16-Byte buffer holding the output data.
+
+ * \return         \c 0 on success.
+ */
+int mbedtls_aes_crypt_ecb( mbedtls_aes_context *ctx,
+                    int mode,
+                    const unsigned char input[16],
+                    unsigned char output[16] );
+
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+/**
+ * \brief  This function performs an AES-CBC encryption or decryption operation
+ *         on full blocks.
+ *
+ *         It performs the operation defined in the \p mode
+ *         parameter (encrypt/decrypt), on the input data buffer defined in
+ *         the \p input parameter.
+ *
+ *         It can be called as many times as needed, until all the input
+ *         data is processed. mbedtls_aes_init(), and either
+ *         mbedtls_aes_setkey_enc() or mbedtls_aes_setkey_dec() must be called
+ *         before the first call to this API with the same context.
+ *
+ * \note   This function operates on aligned blocks, that is, the input size
+ *         must be a multiple of the AES block size of 16 Bytes.
+ *
+ * \note   Upon exit, the content of the IV is updated so that you can
+ *         call the same function again on the next
+ *         block(s) of data and get the same result as if it was
+ *         encrypted in one call. This allows a "streaming" usage.
+ *         If you need to retain the contents of the IV, you should
+ *         either save it manually or use the cipher module instead.
+ *
+ *
+ * \param ctx      The AES context to use for encryption or decryption.
+ * \param mode     The AES operation: #MBEDTLS_AES_ENCRYPT or
+ *                 #MBEDTLS_AES_DECRYPT.
+ * \param length   The length of the input data in Bytes. This must be a
+ *                 multiple of the block size (16 Bytes).
+ * \param iv       Initialization vector (updated after use).
+ * \param input    The buffer holding the input data.
+ * \param output   The buffer holding the output data.
+ *
+ * \return         \c 0 on success.
+ * \return         #MBEDTLS_ERR_AES_INVALID_INPUT_LENGTH
+ *                 on failure.
+ */
+int mbedtls_aes_crypt_cbc( mbedtls_aes_context *ctx,
+                    int mode,
+                    size_t length,
+                    unsigned char iv[16],
+                    const unsigned char *input,
+                    unsigned char *output );
+#endif /* MBEDTLS_CIPHER_MODE_CBC */
+
+#if defined(MBEDTLS_CIPHER_MODE_XTS)
+/**
+ * \brief      This function performs an AES-XTS encryption or decryption
+ *             operation for an entire XTS data unit.
+ *
+ *             AES-XTS encrypts or decrypts blocks based on their location as
+ *             defined by a data unit number. The data unit number must be
+ *             provided by \p data_unit.
+ *
+ *             NIST SP 800-38E limits the maximum size of a data unit to 2^20
+ *             AES blocks. If the data unit is larger than this, this function
+ *             returns #MBEDTLS_ERR_AES_INVALID_INPUT_LENGTH.
+ *
+ * \param ctx          The AES XTS context to use for AES XTS operations.
+ * \param mode         The AES operation: #MBEDTLS_AES_ENCRYPT or
+ *                     #MBEDTLS_AES_DECRYPT.
+ * \param length       The length of a data unit in bytes. This can be any
+ *                     length between 16 bytes and 2^24 bytes inclusive
+ *                     (between 1 and 2^20 block cipher blocks).
+ * \param data_unit    The address of the data unit encoded as an array of 16
+ *                     bytes in little-endian format. For disk encryption, this
+ *                     is typically the index of the block device sector that
+ *                     contains the data.
+ * \param input        The buffer holding the input data (which is an entire
+ *                     data unit). This function reads \p length bytes from \p
+ *                     input.
+ * \param output       The buffer holding the output data (which is an entire
+ *                     data unit). This function writes \p length bytes to \p
+ *                     output.
+ *
+ * \return             \c 0 on success.
+ * \return             #MBEDTLS_ERR_AES_INVALID_INPUT_LENGTH if \p length is
+ *                     smaller than an AES block in size (16 bytes) or if \p
+ *                     length is larger than 2^20 blocks (16 MiB).
+ */
+int mbedtls_aes_crypt_xts( mbedtls_aes_xts_context *ctx,
+                           int mode,
+                           size_t length,
+                           const unsigned char data_unit[16],
+                           const unsigned char *input,
+                           unsigned char *output );
+#endif /* MBEDTLS_CIPHER_MODE_XTS */
+
+#if defined(MBEDTLS_CIPHER_MODE_CFB)
+/**
+ * \brief This function performs an AES-CFB128 encryption or decryption
+ *        operation.
+ *
+ *        It performs the operation defined in the \p mode
+ *        parameter (encrypt or decrypt), on the input data buffer
+ *        defined in the \p input parameter.
+ *
+ *        For CFB, you must set up the context with mbedtls_aes_setkey_enc(),
+ *        regardless of whether you are performing an encryption or decryption
+ *        operation, that is, regardless of the \p mode parameter. This is
+ *        because CFB mode uses the same key schedule for encryption and
+ *        decryption.
+ *
+ * \note  Upon exit, the content of the IV is updated so that you can
+ *        call the same function again on the next
+ *        block(s) of data and get the same result as if it was
+ *        encrypted in one call. This allows a "streaming" usage.
+ *        If you need to retain the contents of the
+ *        IV, you must either save it manually or use the cipher
+ *        module instead.
+ *
+ *
+ * \param ctx      The AES context to use for encryption or decryption.
+ * \param mode     The AES operation: #MBEDTLS_AES_ENCRYPT or
+ *                 #MBEDTLS_AES_DECRYPT.
+ * \param length   The length of the input data.
+ * \param iv_off   The offset in IV (updated after use).
+ * \param iv       The initialization vector (updated after use).
+ * \param input    The buffer holding the input data.
+ * \param output   The buffer holding the output data.
+ *
+ * \return         \c 0 on success.
+ */
+int mbedtls_aes_crypt_cfb128( mbedtls_aes_context *ctx,
+                       int mode,
+                       size_t length,
+                       size_t *iv_off,
+                       unsigned char iv[16],
+                       const unsigned char *input,
+                       unsigned char *output );
+
+/**
+ * \brief This function performs an AES-CFB8 encryption or decryption
+ *        operation.
+ *
+ *        It performs the operation defined in the \p mode
+ *        parameter (encrypt/decrypt), on the input data buffer defined
+ *        in the \p input parameter.
+ *
+ *        Due to the nature of CFB, you must use the same key schedule for
+ *        both encryption and decryption operations. Therefore, you must
+ *        use the context initialized with mbedtls_aes_setkey_enc() for
+ *        both #MBEDTLS_AES_ENCRYPT and #MBEDTLS_AES_DECRYPT.
+ *
+ * \note  Upon exit, the content of the IV is updated so that you can
+ *        call the same function again on the next
+ *        block(s) of data and get the same result as if it was
+ *        encrypted in one call. This allows a "streaming" usage.
+ *        If you need to retain the contents of the
+ *        IV, you should either save it manually or use the cipher
+ *        module instead.
+ *
+ *
+ * \param ctx      The AES context to use for encryption or decryption.
+ * \param mode     The AES operation: #MBEDTLS_AES_ENCRYPT or
+ *                 #MBEDTLS_AES_DECRYPT
+ * \param length   The length of the input data.
+ * \param iv       The initialization vector (updated after use).
+ * \param input    The buffer holding the input data.
+ * \param output   The buffer holding the output data.
+ *
+ * \return         \c 0 on success.
+ */
+int mbedtls_aes_crypt_cfb8( mbedtls_aes_context *ctx,
+                    int mode,
+                    size_t length,
+                    unsigned char iv[16],
+                    const unsigned char *input,
+                    unsigned char *output );
+#endif /*MBEDTLS_CIPHER_MODE_CFB */
+
+#if defined(MBEDTLS_CIPHER_MODE_OFB)
+/**
+ * \brief       This function performs an AES-OFB (Output Feedback Mode)
+ *              encryption or decryption operation.
+ *
+ *              For OFB, you must set up the context with
+ *              mbedtls_aes_setkey_enc(), regardless of whether you are
+ *              performing an encryption or decryption operation. This is
+ *              because OFB mode uses the same key schedule for encryption and
+ *              decryption.
+ *
+ *              The OFB operation is identical for encryption or decryption,
+ *              therefore no operation mode needs to be specified.
+ *
+ * \note        Upon exit, the content of iv, the Initialisation Vector, is
+ *              updated so that you can call the same function again on the next
+ *              block(s) of data and get the same result as if it was encrypted
+ *              in one call. This allows a "streaming" usage, by initialising
+ *              iv_off to 0 before the first call, and preserving its value
+ *              between calls.
+ *
+ *              For non-streaming use, the iv should be initialised on each call
+ *              to a unique value, and iv_off set to 0 on each call.
+ *
+ *              If you need to retain the contents of the initialisation vector,
+ *              you must either save it manually or use the cipher module
+ *              instead.
+ *
+ * \warning     For the OFB mode, the initialisation vector must be unique
+ *              every encryption operation. Reuse of an initialisation vector
+ *              will compromise security.
+ *
+ * \param ctx      The AES context to use for encryption or decryption.
+ * \param length   The length of the input data.
+ * \param iv_off   The offset in IV (updated after use).
+ * \param iv       The initialization vector (updated after use).
+ * \param input    The buffer holding the input data.
+ * \param output   The buffer holding the output data.
+ *
+ * \return         \c 0 on success.
+ */
+int mbedtls_aes_crypt_ofb( mbedtls_aes_context *ctx,
+                       size_t length,
+                       size_t *iv_off,
+                       unsigned char iv[16],
+                       const unsigned char *input,
+                       unsigned char *output );
+
+#endif /* MBEDTLS_CIPHER_MODE_OFB */
+
+#if defined(MBEDTLS_CIPHER_MODE_CTR)
+/**
+ * \brief      This function performs an AES-CTR encryption or decryption
+ *             operation.
+ *
+ *             This function performs the operation defined in the \p mode
+ *             parameter (encrypt/decrypt), on the input data buffer
+ *             defined in the \p input parameter.
+ *
+ *             Due to the nature of CTR, you must use the same key schedule
+ *             for both encryption and decryption operations. Therefore, you
+ *             must use the context initialized with mbedtls_aes_setkey_enc()
+ *             for both #MBEDTLS_AES_ENCRYPT and #MBEDTLS_AES_DECRYPT.
+ *
+ * \warning    You must never reuse a nonce value with the same key. Doing so
+ *             would void the encryption for the two messages encrypted with
+ *             the same nonce and key.
+ *
+ *             There are two common strategies for managing nonces with CTR:
+ *
+ *             1. You can handle everything as a single message processed over
+ *             successive calls to this function. In that case, you want to
+ *             set \p nonce_counter and \p nc_off to 0 for the first call, and
+ *             then preserve the values of \p nonce_counter, \p nc_off and \p
+ *             stream_block across calls to this function as they will be
+ *             updated by this function.
+ *
+ *             With this strategy, you must not encrypt more than 2**128
+ *             blocks of data with the same key.
+ *
+ *             2. You can encrypt separate messages by dividing the \p
+ *             nonce_counter buffer in two areas: the first one used for a
+ *             per-message nonce, handled by yourself, and the second one
+ *             updated by this function internally.
+ *
+ *             For example, you might reserve the first 12 bytes for the
+ *             per-message nonce, and the last 4 bytes for internal use. In that
+ *             case, before calling this function on a new message you need to
+ *             set the first 12 bytes of \p nonce_counter to your chosen nonce
+ *             value, the last 4 to 0, and \p nc_off to 0 (which will cause \p
+ *             stream_block to be ignored). That way, you can encrypt at most
+ *             2**96 messages of up to 2**32 blocks each with the same key.
+ *
+ *             The per-message nonce (or information sufficient to reconstruct
+ *             it) needs to be communicated with the ciphertext and must be unique.
+ *             The recommended way to ensure uniqueness is to use a message
+ *             counter. An alternative is to generate random nonces, but this
+ *             limits the number of messages that can be securely encrypted:
+ *             for example, with 96-bit random nonces, you should not encrypt
+ *             more than 2**32 messages with the same key.
+ *
+ *             Note that for both stategies, sizes are measured in blocks and
+ *             that an AES block is 16 bytes.
+ *
+ * \warning    Upon return, \p stream_block contains sensitive data. Its
+ *             content must not be written to insecure storage and should be
+ *             securely discarded as soon as it's no longer needed.
+ *
+ * \param ctx              The AES context to use for encryption or decryption.
+ * \param length           The length of the input data.
+ * \param nc_off           The offset in the current \p stream_block, for
+ *                         resuming within the current cipher stream. The
+ *                         offset pointer should be 0 at the start of a stream.
+ * \param nonce_counter    The 128-bit nonce and counter.
+ * \param stream_block     The saved stream block for resuming. This is
+ *                         overwritten by the function.
+ * \param input            The buffer holding the input data.
+ * \param output           The buffer holding the output data.
+ *
+ * \return                 \c 0 on success.
+ */
+int mbedtls_aes_crypt_ctr( mbedtls_aes_context *ctx,
+                       size_t length,
+                       size_t *nc_off,
+                       unsigned char nonce_counter[16],
+                       unsigned char stream_block[16],
+                       const unsigned char *input,
+                       unsigned char *output );
+#endif /* MBEDTLS_CIPHER_MODE_CTR */
+
+/**
+ * \brief           Internal AES block encryption function. This is only
+ *                  exposed to allow overriding it using
+ *                  \c MBEDTLS_AES_ENCRYPT_ALT.
+ *
+ * \param ctx       The AES context to use for encryption.
+ * \param input     The plaintext block.
+ * \param output    The output (ciphertext) block.
+ *
+ * \return          \c 0 on success.
+ */
+int mbedtls_internal_aes_encrypt( mbedtls_aes_context *ctx,
+                                  const unsigned char input[16],
+                                  unsigned char output[16] );
+
+/**
+ * \brief           Internal AES block decryption function. This is only
+ *                  exposed to allow overriding it using see
+ *                  \c MBEDTLS_AES_DECRYPT_ALT.
+ *
+ * \param ctx       The AES context to use for decryption.
+ * \param input     The ciphertext block.
+ * \param output    The output (plaintext) block.
+ *
+ * \return          \c 0 on success.
+ */
+int mbedtls_internal_aes_decrypt( mbedtls_aes_context *ctx,
+                                  const unsigned char input[16],
+                                  unsigned char output[16] );
+
+#if !defined(MBEDTLS_DEPRECATED_REMOVED)
+#if defined(MBEDTLS_DEPRECATED_WARNING)
+#define MBEDTLS_DEPRECATED      __attribute__((deprecated))
+#else
+#define MBEDTLS_DEPRECATED
+#endif
+/**
+ * \brief           Deprecated internal AES block encryption function
+ *                  without return value.
+ *
+ * \deprecated      Superseded by mbedtls_aes_encrypt_ext() in 2.5.0.
+ *
+ * \param ctx       The AES context to use for encryption.
+ * \param input     Plaintext block.
+ * \param output    Output (ciphertext) block.
+ */
+MBEDTLS_DEPRECATED void mbedtls_aes_encrypt( mbedtls_aes_context *ctx,
+                                             const unsigned char input[16],
+                                             unsigned char output[16] );
+
+/**
+ * \brief           Deprecated internal AES block decryption function
+ *                  without return value.
+ *
+ * \deprecated      Superseded by mbedtls_aes_decrypt_ext() in 2.5.0.
+ *
+ * \param ctx       The AES context to use for decryption.
+ * \param input     Ciphertext block.
+ * \param output    Output (plaintext) block.
+ */
+MBEDTLS_DEPRECATED void mbedtls_aes_decrypt( mbedtls_aes_context *ctx,
+                                             const unsigned char input[16],
+                                             unsigned char output[16] );
+
+#undef MBEDTLS_DEPRECATED
+#endif /* !MBEDTLS_DEPRECATED_REMOVED */
+
+/**
+ * \brief          Checkup routine.
+ *
+ * \return         \c 0 on success.
+ * \return         \c 1 on failure.
+ */
+int mbedtls_aes_self_test( int verbose );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* aes.h */
diff --git a/common/mbedtls/arc4.c b/common/mbedtls/arc4.c
new file mode 100644
index 000000000..22992dd46
--- /dev/null
+++ b/common/mbedtls/arc4.c
@@ -0,0 +1,203 @@
+/*
+ *  An implementation of the ARCFOUR algorithm
+ *
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+/*
+ *  The ARCFOUR algorithm was publicly disclosed on 94/09.
+ *
+ *  http://groups.google.com/group/sci.crypt/msg/10a300c9d21afca0
+ */
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "mbedtls/config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#if defined(MBEDTLS_ARC4_C)
+
+#include "mbedtls/arc4.h"
+#include "mbedtls/platform_util.h"
+
+#include <string.h>
+
+#if defined(MBEDTLS_SELF_TEST)
+#if defined(MBEDTLS_PLATFORM_C)
+#include "mbedtls/platform.h"
+#else
+#include <stdio.h>
+#define mbedtls_printf printf
+#endif /* MBEDTLS_PLATFORM_C */
+#endif /* MBEDTLS_SELF_TEST */
+
+#if !defined(MBEDTLS_ARC4_ALT)
+
+void mbedtls_arc4_init( mbedtls_arc4_context *ctx )
+{
+    memset( ctx, 0, sizeof( mbedtls_arc4_context ) );
+}
+
+void mbedtls_arc4_free( mbedtls_arc4_context *ctx )
+{
+    if( ctx == NULL )
+        return;
+
+    mbedtls_platform_zeroize( ctx, sizeof( mbedtls_arc4_context ) );
+}
+
+/*
+ * ARC4 key schedule
+ */
+void mbedtls_arc4_setup( mbedtls_arc4_context *ctx, const unsigned char *key,
+                 unsigned int keylen )
+{
+    int i, j, a;
+    unsigned int k;
+    unsigned char *m;
+
+    ctx->x = 0;
+    ctx->y = 0;
+    m = ctx->m;
+
+    for( i = 0; i < 256; i++ )
+        m[i] = (unsigned char) i;
+
+    j = k = 0;
+
+    for( i = 0; i < 256; i++, k++ )
+    {
+        if( k >= keylen ) k = 0;
+
+        a = m[i];
+        j = ( j + a + key[k] ) & 0xFF;
+        m[i] = m[j];
+        m[j] = (unsigned char) a;
+    }
+}
+
+/*
+ * ARC4 cipher function
+ */
+int mbedtls_arc4_crypt( mbedtls_arc4_context *ctx, size_t length, const unsigned char *input,
+                unsigned char *output )
+{
+    int x, y, a, b;
+    size_t i;
+    unsigned char *m;
+
+    x = ctx->x;
+    y = ctx->y;
+    m = ctx->m;
+
+    for( i = 0; i < length; i++ )
+    {
+        x = ( x + 1 ) & 0xFF; a = m[x];
+        y = ( y + a ) & 0xFF; b = m[y];
+
+        m[x] = (unsigned char) b;
+        m[y] = (unsigned char) a;
+
+        output[i] = (unsigned char)
+            ( input[i] ^ m[(unsigned char)( a + b )] );
+    }
+
+    ctx->x = x;
+    ctx->y = y;
+
+    return( 0 );
+}
+
+#endif /* !MBEDTLS_ARC4_ALT */
+
+#if defined(MBEDTLS_SELF_TEST)
+/*
+ * ARC4 tests vectors as posted by Eric Rescorla in sep. 1994:
+ *
+ * http://groups.google.com/group/comp.security.misc/msg/10a300c9d21afca0
+ */
+static const unsigned char arc4_test_key[3][8] =
+{
+    { 0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF },
+    { 0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }
+};
+
+static const unsigned char arc4_test_pt[3][8] =
+{
+    { 0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }
+};
+
+static const unsigned char arc4_test_ct[3][8] =
+{
+    { 0x75, 0xB7, 0x87, 0x80, 0x99, 0xE0, 0xC5, 0x96 },
+    { 0x74, 0x94, 0xC2, 0xE7, 0x10, 0x4B, 0x08, 0x79 },
+    { 0xDE, 0x18, 0x89, 0x41, 0xA3, 0x37, 0x5D, 0x3A }
+};
+
+/*
+ * Checkup routine
+ */
+int mbedtls_arc4_self_test( int verbose )
+{
+    int i, ret = 0;
+    unsigned char ibuf[8];
+    unsigned char obuf[8];
+    mbedtls_arc4_context ctx;
+
+    mbedtls_arc4_init( &ctx );
+
+    for( i = 0; i < 3; i++ )
+    {
+        if( verbose != 0 )
+            mbedtls_printf( "  ARC4 test #%d: ", i + 1 );
+
+        memcpy( ibuf, arc4_test_pt[i], 8 );
+
+        mbedtls_arc4_setup( &ctx, arc4_test_key[i], 8 );
+        mbedtls_arc4_crypt( &ctx, 8, ibuf, obuf );
+
+        if( memcmp( obuf, arc4_test_ct[i], 8 ) != 0 )
+        {
+            if( verbose != 0 )
+                mbedtls_printf( "failed\n" );
+
+            ret = 1;
+            goto exit;
+        }
+
+        if( verbose != 0 )
+            mbedtls_printf( "passed\n" );
+    }
+
+    if( verbose != 0 )
+        mbedtls_printf( "\n" );
+
+exit:
+    mbedtls_arc4_free( &ctx );
+
+    return( ret );
+}
+
+#endif /* MBEDTLS_SELF_TEST */
+
+#endif /* MBEDTLS_ARC4_C */
diff --git a/common/mbedtls/arc4.h b/common/mbedtls/arc4.h
new file mode 100644
index 000000000..0355fb8b5
--- /dev/null
+++ b/common/mbedtls/arc4.h
@@ -0,0 +1,143 @@
+/**
+ * \file arc4.h
+ *
+ * \brief The ARCFOUR stream cipher
+ *
+ * \warning   ARC4 is considered a weak cipher and its use constitutes a
+ *            security risk. We recommend considering stronger ciphers instead.
+ */
+/*
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ *
+ */
+#ifndef MBEDTLS_ARC4_H
+#define MBEDTLS_ARC4_H
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#include <stddef.h>
+
+#define MBEDTLS_ERR_ARC4_HW_ACCEL_FAILED                  -0x0019  /**< ARC4 hardware accelerator failed. */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if !defined(MBEDTLS_ARC4_ALT)
+// Regular implementation
+//
+
+/**
+ * \brief     ARC4 context structure
+ *
+ * \warning   ARC4 is considered a weak cipher and its use constitutes a
+ *            security risk. We recommend considering stronger ciphers instead.
+ *
+ */
+typedef struct mbedtls_arc4_context
+{
+    int x;                      /*!< permutation index */
+    int y;                      /*!< permutation index */
+    unsigned char m[256];       /*!< permutation table */
+}
+mbedtls_arc4_context;
+
+#else  /* MBEDTLS_ARC4_ALT */
+#include "arc4_alt.h"
+#endif /* MBEDTLS_ARC4_ALT */
+
+/**
+ * \brief          Initialize ARC4 context
+ *
+ * \param ctx      ARC4 context to be initialized
+ *
+ * \warning        ARC4 is considered a weak cipher and its use constitutes a
+ *                 security risk. We recommend considering stronger ciphers
+ *                 instead.
+ *
+ */
+void mbedtls_arc4_init( mbedtls_arc4_context *ctx );
+
+/**
+ * \brief          Clear ARC4 context
+ *
+ * \param ctx      ARC4 context to be cleared
+ *
+ * \warning        ARC4 is considered a weak cipher and its use constitutes a
+ *                 security risk. We recommend considering stronger ciphers
+ *                 instead.
+ *
+ */
+void mbedtls_arc4_free( mbedtls_arc4_context *ctx );
+
+/**
+ * \brief          ARC4 key schedule
+ *
+ * \param ctx      ARC4 context to be setup
+ * \param key      the secret key
+ * \param keylen   length of the key, in bytes
+ *
+ * \warning        ARC4 is considered a weak cipher and its use constitutes a
+ *                 security risk. We recommend considering stronger ciphers
+ *                 instead.
+ *
+ */
+void mbedtls_arc4_setup( mbedtls_arc4_context *ctx, const unsigned char *key,
+                 unsigned int keylen );
+
+/**
+ * \brief          ARC4 cipher function
+ *
+ * \param ctx      ARC4 context
+ * \param length   length of the input data
+ * \param input    buffer holding the input data
+ * \param output   buffer for the output data
+ *
+ * \return         0 if successful
+ *
+ * \warning        ARC4 is considered a weak cipher and its use constitutes a
+ *                 security risk. We recommend considering stronger ciphers
+ *                 instead.
+ *
+ */
+int mbedtls_arc4_crypt( mbedtls_arc4_context *ctx, size_t length, const unsigned char *input,
+                unsigned char *output );
+
+/**
+ * \brief          Checkup routine
+ *
+ * \return         0 if successful, or 1 if the test failed
+ *
+ * \warning        ARC4 is considered a weak cipher and its use constitutes a
+ *                 security risk. We recommend considering stronger ciphers
+ *                 instead.
+ *
+ */
+int mbedtls_arc4_self_test( int verbose );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* arc4.h */
diff --git a/common/mbedtls/asn1.h b/common/mbedtls/asn1.h
new file mode 100644
index 000000000..00b6f2c0f
--- /dev/null
+++ b/common/mbedtls/asn1.h
@@ -0,0 +1,360 @@
+/**
+ * \file asn1.h
+ *
+ * \brief Generic ASN.1 parsing
+ */
+/*
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+#ifndef MBEDTLS_ASN1_H
+#define MBEDTLS_ASN1_H
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#include <stddef.h>
+
+#if defined(MBEDTLS_BIGNUM_C)
+#include "bignum.h"
+#endif
+
+/**
+ * \addtogroup asn1_module
+ * \{
+ */
+
+/**
+ * \name ASN1 Error codes
+ * These error codes are OR'ed to X509 error codes for
+ * higher error granularity.
+ * ASN1 is a standard to specify data structures.
+ * \{
+ */
+#define MBEDTLS_ERR_ASN1_OUT_OF_DATA                      -0x0060  /**< Out of data when parsing an ASN1 data structure. */
+#define MBEDTLS_ERR_ASN1_UNEXPECTED_TAG                   -0x0062  /**< ASN1 tag was of an unexpected value. */
+#define MBEDTLS_ERR_ASN1_INVALID_LENGTH                   -0x0064  /**< Error when trying to determine the length or invalid length. */
+#define MBEDTLS_ERR_ASN1_LENGTH_MISMATCH                  -0x0066  /**< Actual length differs from expected length. */
+#define MBEDTLS_ERR_ASN1_INVALID_DATA                     -0x0068  /**< Data is invalid. (not used) */
+#define MBEDTLS_ERR_ASN1_ALLOC_FAILED                     -0x006A  /**< Memory allocation failed */
+#define MBEDTLS_ERR_ASN1_BUF_TOO_SMALL                    -0x006C  /**< Buffer too small when writing ASN.1 data structure. */
+
+/* \} name */
+
+/**
+ * \name DER constants
+ * These constants comply with the DER encoded ASN.1 type tags.
+ * DER encoding uses hexadecimal representation.
+ * An example DER sequence is:\n
+ * - 0x02 -- tag indicating INTEGER
+ * - 0x01 -- length in octets
+ * - 0x05 -- value
+ * Such sequences are typically read into \c ::mbedtls_x509_buf.
+ * \{
+ */
+#define MBEDTLS_ASN1_BOOLEAN                 0x01
+#define MBEDTLS_ASN1_INTEGER                 0x02
+#define MBEDTLS_ASN1_BIT_STRING              0x03
+#define MBEDTLS_ASN1_OCTET_STRING            0x04
+#define MBEDTLS_ASN1_NULL                    0x05
+#define MBEDTLS_ASN1_OID                     0x06
+#define MBEDTLS_ASN1_UTF8_STRING             0x0C
+#define MBEDTLS_ASN1_SEQUENCE                0x10
+#define MBEDTLS_ASN1_SET                     0x11
+#define MBEDTLS_ASN1_PRINTABLE_STRING        0x13
+#define MBEDTLS_ASN1_T61_STRING              0x14
+#define MBEDTLS_ASN1_IA5_STRING              0x16
+#define MBEDTLS_ASN1_UTC_TIME                0x17
+#define MBEDTLS_ASN1_GENERALIZED_TIME        0x18
+#define MBEDTLS_ASN1_UNIVERSAL_STRING        0x1C
+#define MBEDTLS_ASN1_BMP_STRING              0x1E
+#define MBEDTLS_ASN1_PRIMITIVE               0x00
+#define MBEDTLS_ASN1_CONSTRUCTED             0x20
+#define MBEDTLS_ASN1_CONTEXT_SPECIFIC        0x80
+
+/*
+ * Bit masks for each of the components of an ASN.1 tag as specified in
+ * ITU X.690 (08/2015), section 8.1 "General rules for encoding",
+ * paragraph 8.1.2.2:
+ *
+ * Bit  8     7   6   5          1
+ *     +-------+-----+------------+
+ *     | Class | P/C | Tag number |
+ *     +-------+-----+------------+
+ */
+#define MBEDTLS_ASN1_TAG_CLASS_MASK          0xC0
+#define MBEDTLS_ASN1_TAG_PC_MASK             0x20
+#define MBEDTLS_ASN1_TAG_VALUE_MASK          0x1F
+
+/* \} name */
+/* \} addtogroup asn1_module */
+
+/** Returns the size of the binary string, without the trailing \\0 */
+#define MBEDTLS_OID_SIZE(x) (sizeof(x) - 1)
+
+/**
+ * Compares an mbedtls_asn1_buf structure to a reference OID.
+ *
+ * Only works for 'defined' oid_str values (MBEDTLS_OID_HMAC_SHA1), you cannot use a
+ * 'unsigned char *oid' here!
+ */
+#define MBEDTLS_OID_CMP(oid_str, oid_buf)                                   \
+        ( ( MBEDTLS_OID_SIZE(oid_str) != (oid_buf)->len ) ||                \
+          memcmp( (oid_str), (oid_buf)->p, (oid_buf)->len) != 0 )
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \name Functions to parse ASN.1 data structures
+ * \{
+ */
+
+/**
+ * Type-length-value structure that allows for ASN1 using DER.
+ */
+typedef struct mbedtls_asn1_buf
+{
+    int tag;                /**< ASN1 type, e.g. MBEDTLS_ASN1_UTF8_STRING. */
+    size_t len;             /**< ASN1 length, in octets. */
+    unsigned char *p;       /**< ASN1 data, e.g. in ASCII. */
+}
+mbedtls_asn1_buf;
+
+/**
+ * Container for ASN1 bit strings.
+ */
+typedef struct mbedtls_asn1_bitstring
+{
+    size_t len;                 /**< ASN1 length, in octets. */
+    unsigned char unused_bits;  /**< Number of unused bits at the end of the string */
+    unsigned char *p;           /**< Raw ASN1 data for the bit string */
+}
+mbedtls_asn1_bitstring;
+
+/**
+ * Container for a sequence of ASN.1 items
+ */
+typedef struct mbedtls_asn1_sequence
+{
+    mbedtls_asn1_buf buf;                   /**< Buffer containing the given ASN.1 item. */
+    struct mbedtls_asn1_sequence *next;    /**< The next entry in the sequence. */
+}
+mbedtls_asn1_sequence;
+
+/**
+ * Container for a sequence or list of 'named' ASN.1 data items
+ */
+typedef struct mbedtls_asn1_named_data
+{
+    mbedtls_asn1_buf oid;                   /**< The object identifier. */
+    mbedtls_asn1_buf val;                   /**< The named value. */
+    struct mbedtls_asn1_named_data *next;  /**< The next entry in the sequence. */
+    unsigned char next_merged;      /**< Merge next item into the current one? */
+}
+mbedtls_asn1_named_data;
+
+/**
+ * \brief       Get the length of an ASN.1 element.
+ *              Updates the pointer to immediately behind the length.
+ *
+ * \param p     The position in the ASN.1 data
+ * \param end   End of data
+ * \param len   The variable that will receive the value
+ *
+ * \return      0 if successful, MBEDTLS_ERR_ASN1_OUT_OF_DATA on reaching
+ *              end of data, MBEDTLS_ERR_ASN1_INVALID_LENGTH if length is
+ *              unparseable.
+ */
+int mbedtls_asn1_get_len( unsigned char **p,
+                  const unsigned char *end,
+                  size_t *len );
+
+/**
+ * \brief       Get the tag and length of the tag. Check for the requested tag.
+ *              Updates the pointer to immediately behind the tag and length.
+ *
+ * \param p     The position in the ASN.1 data
+ * \param end   End of data
+ * \param len   The variable that will receive the length
+ * \param tag   The expected tag
+ *
+ * \return      0 if successful, MBEDTLS_ERR_ASN1_UNEXPECTED_TAG if tag did
+ *              not match requested tag, or another specific ASN.1 error code.
+ */
+int mbedtls_asn1_get_tag( unsigned char **p,
+                  const unsigned char *end,
+                  size_t *len, int tag );
+
+/**
+ * \brief       Retrieve a boolean ASN.1 tag and its value.
+ *              Updates the pointer to immediately behind the full tag.
+ *
+ * \param p     The position in the ASN.1 data
+ * \param end   End of data
+ * \param val   The variable that will receive the value
+ *
+ * \return      0 if successful or a specific ASN.1 error code.
+ */
+int mbedtls_asn1_get_bool( unsigned char **p,
+                   const unsigned char *end,
+                   int *val );
+
+/**
+ * \brief       Retrieve an integer ASN.1 tag and its value.
+ *              Updates the pointer to immediately behind the full tag.
+ *
+ * \param p     The position in the ASN.1 data
+ * \param end   End of data
+ * \param val   The variable that will receive the value
+ *
+ * \return      0 if successful or a specific ASN.1 error code.
+ */
+int mbedtls_asn1_get_int( unsigned char **p,
+                  const unsigned char *end,
+                  int *val );
+
+/**
+ * \brief       Retrieve a bitstring ASN.1 tag and its value.
+ *              Updates the pointer to immediately behind the full tag.
+ *
+ * \param p     The position in the ASN.1 data
+ * \param end   End of data
+ * \param bs    The variable that will receive the value
+ *
+ * \return      0 if successful or a specific ASN.1 error code.
+ */
+int mbedtls_asn1_get_bitstring( unsigned char **p, const unsigned char *end,
+                        mbedtls_asn1_bitstring *bs);
+
+/**
+ * \brief       Retrieve a bitstring ASN.1 tag without unused bits and its
+ *              value.
+ *              Updates the pointer to the beginning of the bit/octet string.
+ *
+ * \param p     The position in the ASN.1 data
+ * \param end   End of data
+ * \param len   Length of the actual bit/octect string in bytes
+ *
+ * \return      0 if successful or a specific ASN.1 error code.
+ */
+int mbedtls_asn1_get_bitstring_null( unsigned char **p, const unsigned char *end,
+                             size_t *len );
+
+/**
+ * \brief       Parses and splits an ASN.1 "SEQUENCE OF <tag>"
+ *              Updated the pointer to immediately behind the full sequence tag.
+ *
+ * \param p     The position in the ASN.1 data
+ * \param end   End of data
+ * \param cur   First variable in the chain to fill
+ * \param tag   Type of sequence
+ *
+ * \return      0 if successful or a specific ASN.1 error code.
+ */
+int mbedtls_asn1_get_sequence_of( unsigned char **p,
+                          const unsigned char *end,
+                          mbedtls_asn1_sequence *cur,
+                          int tag);
+
+#if defined(MBEDTLS_BIGNUM_C)
+/**
+ * \brief       Retrieve a MPI value from an integer ASN.1 tag.
+ *              Updates the pointer to immediately behind the full tag.
+ *
+ * \param p     The position in the ASN.1 data
+ * \param end   End of data
+ * \param X     The MPI that will receive the value
+ *
+ * \return      0 if successful or a specific ASN.1 or MPI error code.
+ */
+int mbedtls_asn1_get_mpi( unsigned char **p,
+                  const unsigned char *end,
+                  mbedtls_mpi *X );
+#endif /* MBEDTLS_BIGNUM_C */
+
+/**
+ * \brief       Retrieve an AlgorithmIdentifier ASN.1 sequence.
+ *              Updates the pointer to immediately behind the full
+ *              AlgorithmIdentifier.
+ *
+ * \param p     The position in the ASN.1 data
+ * \param end   End of data
+ * \param alg   The buffer to receive the OID
+ * \param params The buffer to receive the params (if any)
+ *
+ * \return      0 if successful or a specific ASN.1 or MPI error code.
+ */
+int mbedtls_asn1_get_alg( unsigned char **p,
+                  const unsigned char *end,
+                  mbedtls_asn1_buf *alg, mbedtls_asn1_buf *params );
+
+/**
+ * \brief       Retrieve an AlgorithmIdentifier ASN.1 sequence with NULL or no
+ *              params.
+ *              Updates the pointer to immediately behind the full
+ *              AlgorithmIdentifier.
+ *
+ * \param p     The position in the ASN.1 data
+ * \param end   End of data
+ * \param alg   The buffer to receive the OID
+ *
+ * \return      0 if successful or a specific ASN.1 or MPI error code.
+ */
+int mbedtls_asn1_get_alg_null( unsigned char **p,
+                       const unsigned char *end,
+                       mbedtls_asn1_buf *alg );
+
+/**
+ * \brief       Find a specific named_data entry in a sequence or list based on
+ *              the OID.
+ *
+ * \param list  The list to seek through
+ * \param oid   The OID to look for
+ * \param len   Size of the OID
+ *
+ * \return      NULL if not found, or a pointer to the existing entry.
+ */
+mbedtls_asn1_named_data *mbedtls_asn1_find_named_data( mbedtls_asn1_named_data *list,
+                                       const char *oid, size_t len );
+
+/**
+ * \brief       Free a mbedtls_asn1_named_data entry
+ *
+ * \param entry The named data entry to free
+ */
+void mbedtls_asn1_free_named_data( mbedtls_asn1_named_data *entry );
+
+/**
+ * \brief       Free all entries in a mbedtls_asn1_named_data list
+ *              Head will be set to NULL
+ *
+ * \param head  Pointer to the head of the list of named data entries to free
+ */
+void mbedtls_asn1_free_named_data_list( mbedtls_asn1_named_data **head );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* asn1.h */
diff --git a/common/mbedtls/asn1parse.c b/common/mbedtls/asn1parse.c
new file mode 100644
index 000000000..aeec173ae
--- /dev/null
+++ b/common/mbedtls/asn1parse.c
@@ -0,0 +1,391 @@
+/*
+ *  Generic ASN.1 parsing
+ *
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "mbedtls/config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#if defined(MBEDTLS_ASN1_PARSE_C)
+
+#include "mbedtls/asn1.h"
+#include "mbedtls/platform_util.h"
+
+#include <string.h>
+
+#if defined(MBEDTLS_BIGNUM_C)
+#include "mbedtls/bignum.h"
+#endif
+
+#if defined(MBEDTLS_PLATFORM_C)
+#include "mbedtls/platform.h"
+#else
+#include <stdlib.h>
+#define mbedtls_calloc    calloc
+#define mbedtls_free       free
+#endif
+
+/*
+ * ASN.1 DER decoding routines
+ */
+int mbedtls_asn1_get_len( unsigned char **p,
+                  const unsigned char *end,
+                  size_t *len )
+{
+    if( ( end - *p ) < 1 )
+        return( MBEDTLS_ERR_ASN1_OUT_OF_DATA );
+
+    if( ( **p & 0x80 ) == 0 )
+        *len = *(*p)++;
+    else
+    {
+        switch( **p & 0x7F )
+        {
+        case 1:
+            if( ( end - *p ) < 2 )
+                return( MBEDTLS_ERR_ASN1_OUT_OF_DATA );
+
+            *len = (*p)[1];
+            (*p) += 2;
+            break;
+
+        case 2:
+            if( ( end - *p ) < 3 )
+                return( MBEDTLS_ERR_ASN1_OUT_OF_DATA );
+
+            *len = ( (size_t)(*p)[1] << 8 ) | (*p)[2];
+            (*p) += 3;
+            break;
+
+        case 3:
+            if( ( end - *p ) < 4 )
+                return( MBEDTLS_ERR_ASN1_OUT_OF_DATA );
+
+            *len = ( (size_t)(*p)[1] << 16 ) |
+                   ( (size_t)(*p)[2] << 8  ) | (*p)[3];
+            (*p) += 4;
+            break;
+
+        case 4:
+            if( ( end - *p ) < 5 )
+                return( MBEDTLS_ERR_ASN1_OUT_OF_DATA );
+
+            *len = ( (size_t)(*p)[1] << 24 ) | ( (size_t)(*p)[2] << 16 ) |
+                   ( (size_t)(*p)[3] << 8  ) |           (*p)[4];
+            (*p) += 5;
+            break;
+
+        default:
+            return( MBEDTLS_ERR_ASN1_INVALID_LENGTH );
+        }
+    }
+
+    if( *len > (size_t) ( end - *p ) )
+        return( MBEDTLS_ERR_ASN1_OUT_OF_DATA );
+
+    return( 0 );
+}
+
+int mbedtls_asn1_get_tag( unsigned char **p,
+                  const unsigned char *end,
+                  size_t *len, int tag )
+{
+    if( ( end - *p ) < 1 )
+        return( MBEDTLS_ERR_ASN1_OUT_OF_DATA );
+
+    if( **p != tag )
+        return( MBEDTLS_ERR_ASN1_UNEXPECTED_TAG );
+
+    (*p)++;
+
+    return( mbedtls_asn1_get_len( p, end, len ) );
+}
+
+int mbedtls_asn1_get_bool( unsigned char **p,
+                   const unsigned char *end,
+                   int *val )
+{
+    int ret;
+    size_t len;
+
+    if( ( ret = mbedtls_asn1_get_tag( p, end, &len, MBEDTLS_ASN1_BOOLEAN ) ) != 0 )
+        return( ret );
+
+    if( len != 1 )
+        return( MBEDTLS_ERR_ASN1_INVALID_LENGTH );
+
+    *val = ( **p != 0 ) ? 1 : 0;
+    (*p)++;
+
+    return( 0 );
+}
+
+int mbedtls_asn1_get_int( unsigned char **p,
+                  const unsigned char *end,
+                  int *val )
+{
+    int ret;
+    size_t len;
+
+    if( ( ret = mbedtls_asn1_get_tag( p, end, &len, MBEDTLS_ASN1_INTEGER ) ) != 0 )
+        return( ret );
+
+    if( len == 0 || len > sizeof( int ) || ( **p & 0x80 ) != 0 )
+        return( MBEDTLS_ERR_ASN1_INVALID_LENGTH );
+
+    *val = 0;
+
+    while( len-- > 0 )
+    {
+        *val = ( *val << 8 ) | **p;
+        (*p)++;
+    }
+
+    return( 0 );
+}
+
+#if defined(MBEDTLS_BIGNUM_C)
+int mbedtls_asn1_get_mpi( unsigned char **p,
+                  const unsigned char *end,
+                  mbedtls_mpi *X )
+{
+    int ret;
+    size_t len;
+
+    if( ( ret = mbedtls_asn1_get_tag( p, end, &len, MBEDTLS_ASN1_INTEGER ) ) != 0 )
+        return( ret );
+
+    ret = mbedtls_mpi_read_binary( X, *p, len );
+
+    *p += len;
+
+    return( ret );
+}
+#endif /* MBEDTLS_BIGNUM_C */
+
+int mbedtls_asn1_get_bitstring( unsigned char **p, const unsigned char *end,
+                        mbedtls_asn1_bitstring *bs)
+{
+    int ret;
+
+    /* Certificate type is a single byte bitstring */
+    if( ( ret = mbedtls_asn1_get_tag( p, end, &bs->len, MBEDTLS_ASN1_BIT_STRING ) ) != 0 )
+        return( ret );
+
+    /* Check length, subtract one for actual bit string length */
+    if( bs->len < 1 )
+        return( MBEDTLS_ERR_ASN1_OUT_OF_DATA );
+    bs->len -= 1;
+
+    /* Get number of unused bits, ensure unused bits <= 7 */
+    bs->unused_bits = **p;
+    if( bs->unused_bits > 7 )
+        return( MBEDTLS_ERR_ASN1_INVALID_LENGTH );
+    (*p)++;
+
+    /* Get actual bitstring */
+    bs->p = *p;
+    *p += bs->len;
+
+    if( *p != end )
+        return( MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+
+    return( 0 );
+}
+
+/*
+ * Get a bit string without unused bits
+ */
+int mbedtls_asn1_get_bitstring_null( unsigned char **p, const unsigned char *end,
+                             size_t *len )
+{
+    int ret;
+
+    if( ( ret = mbedtls_asn1_get_tag( p, end, len, MBEDTLS_ASN1_BIT_STRING ) ) != 0 )
+        return( ret );
+
+    if( (*len)-- < 2 || *(*p)++ != 0 )
+        return( MBEDTLS_ERR_ASN1_INVALID_DATA );
+
+    return( 0 );
+}
+
+
+
+/*
+ *  Parses and splits an ASN.1 "SEQUENCE OF <tag>"
+ */
+int mbedtls_asn1_get_sequence_of( unsigned char **p,
+                          const unsigned char *end,
+                          mbedtls_asn1_sequence *cur,
+                          int tag)
+{
+    int ret;
+    size_t len;
+    mbedtls_asn1_buf *buf;
+
+    /* Get main sequence tag */
+    if( ( ret = mbedtls_asn1_get_tag( p, end, &len,
+            MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
+        return( ret );
+
+    if( *p + len != end )
+        return( MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+
+    while( *p < end )
+    {
+        buf = &(cur->buf);
+        buf->tag = **p;
+
+        if( ( ret = mbedtls_asn1_get_tag( p, end, &buf->len, tag ) ) != 0 )
+            return( ret );
+
+        buf->p = *p;
+        *p += buf->len;
+
+        /* Allocate and assign next pointer */
+        if( *p < end )
+        {
+            cur->next = (mbedtls_asn1_sequence*)mbedtls_calloc( 1,
+                                            sizeof( mbedtls_asn1_sequence ) );
+
+            if( cur->next == NULL )
+                return( MBEDTLS_ERR_ASN1_ALLOC_FAILED );
+
+            cur = cur->next;
+        }
+    }
+
+    /* Set final sequence entry's next pointer to NULL */
+    cur->next = NULL;
+
+    if( *p != end )
+        return( MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+
+    return( 0 );
+}
+
+int mbedtls_asn1_get_alg( unsigned char **p,
+                  const unsigned char *end,
+                  mbedtls_asn1_buf *alg, mbedtls_asn1_buf *params )
+{
+    int ret;
+    size_t len;
+
+    if( ( ret = mbedtls_asn1_get_tag( p, end, &len,
+            MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
+        return( ret );
+
+    if( ( end - *p ) < 1 )
+        return( MBEDTLS_ERR_ASN1_OUT_OF_DATA );
+
+    alg->tag = **p;
+    end = *p + len;
+
+    if( ( ret = mbedtls_asn1_get_tag( p, end, &alg->len, MBEDTLS_ASN1_OID ) ) != 0 )
+        return( ret );
+
+    alg->p = *p;
+    *p += alg->len;
+
+    if( *p == end )
+    {
+        mbedtls_platform_zeroize( params, sizeof(mbedtls_asn1_buf) );
+        return( 0 );
+    }
+
+    params->tag = **p;
+    (*p)++;
+
+    if( ( ret = mbedtls_asn1_get_len( p, end, &params->len ) ) != 0 )
+        return( ret );
+
+    params->p = *p;
+    *p += params->len;
+
+    if( *p != end )
+        return( MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+
+    return( 0 );
+}
+
+int mbedtls_asn1_get_alg_null( unsigned char **p,
+                       const unsigned char *end,
+                       mbedtls_asn1_buf *alg )
+{
+    int ret;
+    mbedtls_asn1_buf params;
+
+    memset( &params, 0, sizeof(mbedtls_asn1_buf) );
+
+    if( ( ret = mbedtls_asn1_get_alg( p, end, alg, &params ) ) != 0 )
+        return( ret );
+
+    if( ( params.tag != MBEDTLS_ASN1_NULL && params.tag != 0 ) || params.len != 0 )
+        return( MBEDTLS_ERR_ASN1_INVALID_DATA );
+
+    return( 0 );
+}
+
+void mbedtls_asn1_free_named_data( mbedtls_asn1_named_data *cur )
+{
+    if( cur == NULL )
+        return;
+
+    mbedtls_free( cur->oid.p );
+    mbedtls_free( cur->val.p );
+
+    mbedtls_platform_zeroize( cur, sizeof( mbedtls_asn1_named_data ) );
+}
+
+void mbedtls_asn1_free_named_data_list( mbedtls_asn1_named_data **head )
+{
+    mbedtls_asn1_named_data *cur;
+
+    while( ( cur = *head ) != NULL )
+    {
+        *head = cur->next;
+        mbedtls_asn1_free_named_data( cur );
+        mbedtls_free( cur );
+    }
+}
+
+mbedtls_asn1_named_data *mbedtls_asn1_find_named_data( mbedtls_asn1_named_data *list,
+                                       const char *oid, size_t len )
+{
+    while( list != NULL )
+    {
+        if( list->oid.len == len &&
+            memcmp( list->oid.p, oid, len ) == 0 )
+        {
+            break;
+        }
+
+        list = list->next;
+    }
+
+    return( list );
+}
+
+#endif /* MBEDTLS_ASN1_PARSE_C */
diff --git a/common/mbedtls/asn1write.c b/common/mbedtls/asn1write.c
new file mode 100644
index 000000000..f8e29dc74
--- /dev/null
+++ b/common/mbedtls/asn1write.c
@@ -0,0 +1,392 @@
+/*
+ * ASN.1 buffer writing functionality
+ *
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "mbedtls/config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#if defined(MBEDTLS_ASN1_WRITE_C)
+
+#include "mbedtls/asn1write.h"
+
+#include <string.h>
+
+#if defined(MBEDTLS_PLATFORM_C)
+#include "mbedtls/platform.h"
+#else
+#include <stdlib.h>
+#define mbedtls_calloc    calloc
+#define mbedtls_free       free
+#endif
+
+int mbedtls_asn1_write_len( unsigned char **p, unsigned char *start, size_t len )
+{
+    if( len < 0x80 )
+    {
+        if( *p - start < 1 )
+            return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
+
+        *--(*p) = (unsigned char) len;
+        return( 1 );
+    }
+
+    if( len <= 0xFF )
+    {
+        if( *p - start < 2 )
+            return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
+
+        *--(*p) = (unsigned char) len;
+        *--(*p) = 0x81;
+        return( 2 );
+    }
+
+    if( len <= 0xFFFF )
+    {
+        if( *p - start < 3 )
+            return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
+
+        *--(*p) = ( len       ) & 0xFF;
+        *--(*p) = ( len >>  8 ) & 0xFF;
+        *--(*p) = 0x82;
+        return( 3 );
+    }
+
+    if( len <= 0xFFFFFF )
+    {
+        if( *p - start < 4 )
+            return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
+
+        *--(*p) = ( len       ) & 0xFF;
+        *--(*p) = ( len >>  8 ) & 0xFF;
+        *--(*p) = ( len >> 16 ) & 0xFF;
+        *--(*p) = 0x83;
+        return( 4 );
+    }
+
+#if SIZE_MAX > 0xFFFFFFFF
+    if( len <= 0xFFFFFFFF )
+#endif
+    {
+        if( *p - start < 5 )
+            return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
+
+        *--(*p) = ( len       ) & 0xFF;
+        *--(*p) = ( len >>  8 ) & 0xFF;
+        *--(*p) = ( len >> 16 ) & 0xFF;
+        *--(*p) = ( len >> 24 ) & 0xFF;
+        *--(*p) = 0x84;
+        return( 5 );
+    }
+
+#if SIZE_MAX > 0xFFFFFFFF
+    return( MBEDTLS_ERR_ASN1_INVALID_LENGTH );
+#endif
+}
+
+int mbedtls_asn1_write_tag( unsigned char **p, unsigned char *start, unsigned char tag )
+{
+    if( *p - start < 1 )
+        return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
+
+    *--(*p) = tag;
+
+    return( 1 );
+}
+
+int mbedtls_asn1_write_raw_buffer( unsigned char **p, unsigned char *start,
+                           const unsigned char *buf, size_t size )
+{
+    size_t len = 0;
+
+    if( *p < start || (size_t)( *p - start ) < size )
+        return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
+
+    len = size;
+    (*p) -= len;
+    memcpy( *p, buf, len );
+
+    return( (int) len );
+}
+
+#if defined(MBEDTLS_BIGNUM_C)
+int mbedtls_asn1_write_mpi( unsigned char **p, unsigned char *start, const mbedtls_mpi *X )
+{
+    int ret;
+    size_t len = 0;
+
+    // Write the MPI
+    //
+    len = mbedtls_mpi_size( X );
+
+    if( *p < start || (size_t)( *p - start ) < len )
+        return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
+
+    (*p) -= len;
+    MBEDTLS_MPI_CHK( mbedtls_mpi_write_binary( X, *p, len ) );
+
+    // DER format assumes 2s complement for numbers, so the leftmost bit
+    // should be 0 for positive numbers and 1 for negative numbers.
+    //
+    if( X->s ==1 && **p & 0x80 )
+    {
+        if( *p - start < 1 )
+            return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
+
+        *--(*p) = 0x00;
+        len += 1;
+    }
+
+    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( p, start, len ) );
+    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( p, start, MBEDTLS_ASN1_INTEGER ) );
+
+    ret = (int) len;
+
+cleanup:
+    return( ret );
+}
+#endif /* MBEDTLS_BIGNUM_C */
+
+int mbedtls_asn1_write_null( unsigned char **p, unsigned char *start )
+{
+    int ret;
+    size_t len = 0;
+
+    // Write NULL
+    //
+    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( p, start, 0) );
+    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( p, start, MBEDTLS_ASN1_NULL ) );
+
+    return( (int) len );
+}
+
+int mbedtls_asn1_write_oid( unsigned char **p, unsigned char *start,
+                    const char *oid, size_t oid_len )
+{
+    int ret;
+    size_t len = 0;
+
+    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_raw_buffer( p, start,
+                                  (const unsigned char *) oid, oid_len ) );
+    MBEDTLS_ASN1_CHK_ADD( len , mbedtls_asn1_write_len( p, start, len ) );
+    MBEDTLS_ASN1_CHK_ADD( len , mbedtls_asn1_write_tag( p, start, MBEDTLS_ASN1_OID ) );
+
+    return( (int) len );
+}
+
+int mbedtls_asn1_write_algorithm_identifier( unsigned char **p, unsigned char *start,
+                                     const char *oid, size_t oid_len,
+                                     size_t par_len )
+{
+    int ret;
+    size_t len = 0;
+
+    if( par_len == 0 )
+        MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_null( p, start ) );
+    else
+        len += par_len;
+
+    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_oid( p, start, oid, oid_len ) );
+
+    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( p, start, len ) );
+    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( p, start,
+                                       MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) );
+
+    return( (int) len );
+}
+
+int mbedtls_asn1_write_bool( unsigned char **p, unsigned char *start, int boolean )
+{
+    int ret;
+    size_t len = 0;
+
+    if( *p - start < 1 )
+        return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
+
+    *--(*p) = (boolean) ? 255 : 0;
+    len++;
+
+    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( p, start, len ) );
+    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( p, start, MBEDTLS_ASN1_BOOLEAN ) );
+
+    return( (int) len );
+}
+
+int mbedtls_asn1_write_int( unsigned char **p, unsigned char *start, int val )
+{
+    int ret;
+    size_t len = 0;
+
+    if( *p - start < 1 )
+        return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
+
+    len += 1;
+    *--(*p) = val;
+
+    if( val > 0 && **p & 0x80 )
+    {
+        if( *p - start < 1 )
+            return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
+
+        *--(*p) = 0x00;
+        len += 1;
+    }
+
+    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( p, start, len ) );
+    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( p, start, MBEDTLS_ASN1_INTEGER ) );
+
+    return( (int) len );
+}
+
+int mbedtls_asn1_write_printable_string( unsigned char **p, unsigned char *start,
+                                 const char *text, size_t text_len )
+{
+    int ret;
+    size_t len = 0;
+
+    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_raw_buffer( p, start,
+                  (const unsigned char *) text, text_len ) );
+
+    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( p, start, len ) );
+    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( p, start, MBEDTLS_ASN1_PRINTABLE_STRING ) );
+
+    return( (int) len );
+}
+
+int mbedtls_asn1_write_ia5_string( unsigned char **p, unsigned char *start,
+                           const char *text, size_t text_len )
+{
+    int ret;
+    size_t len = 0;
+
+    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_raw_buffer( p, start,
+                  (const unsigned char *) text, text_len ) );
+
+    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( p, start, len ) );
+    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( p, start, MBEDTLS_ASN1_IA5_STRING ) );
+
+    return( (int) len );
+}
+
+int mbedtls_asn1_write_bitstring( unsigned char **p, unsigned char *start,
+                          const unsigned char *buf, size_t bits )
+{
+    int ret;
+    size_t len = 0, size;
+
+    size = ( bits / 8 ) + ( ( bits % 8 ) ? 1 : 0 );
+
+    // Calculate byte length
+    //
+    if( *p < start || (size_t)( *p - start ) < size + 1 )
+        return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
+
+    len = size + 1;
+    (*p) -= size;
+    memcpy( *p, buf, size );
+
+    // Write unused bits
+    //
+    *--(*p) = (unsigned char) (size * 8 - bits);
+
+    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( p, start, len ) );
+    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( p, start, MBEDTLS_ASN1_BIT_STRING ) );
+
+    return( (int) len );
+}
+
+int mbedtls_asn1_write_octet_string( unsigned char **p, unsigned char *start,
+                             const unsigned char *buf, size_t size )
+{
+    int ret;
+    size_t len = 0;
+
+    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_raw_buffer( p, start, buf, size ) );
+
+    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( p, start, len ) );
+    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( p, start, MBEDTLS_ASN1_OCTET_STRING ) );
+
+    return( (int) len );
+}
+
+mbedtls_asn1_named_data *mbedtls_asn1_store_named_data( mbedtls_asn1_named_data **head,
+                                        const char *oid, size_t oid_len,
+                                        const unsigned char *val,
+                                        size_t val_len )
+{
+    mbedtls_asn1_named_data *cur;
+
+    if( ( cur = mbedtls_asn1_find_named_data( *head, oid, oid_len ) ) == NULL )
+    {
+        // Add new entry if not present yet based on OID
+        //
+        cur = (mbedtls_asn1_named_data*)mbedtls_calloc( 1,
+                                            sizeof(mbedtls_asn1_named_data) );
+        if( cur == NULL )
+            return( NULL );
+
+        cur->oid.len = oid_len;
+        cur->oid.p = mbedtls_calloc( 1, oid_len );
+        if( cur->oid.p == NULL )
+        {
+            mbedtls_free( cur );
+            return( NULL );
+        }
+
+        memcpy( cur->oid.p, oid, oid_len );
+
+        cur->val.len = val_len;
+        cur->val.p = mbedtls_calloc( 1, val_len );
+        if( cur->val.p == NULL )
+        {
+            mbedtls_free( cur->oid.p );
+            mbedtls_free( cur );
+            return( NULL );
+        }
+
+        cur->next = *head;
+        *head = cur;
+    }
+    else if( cur->val.len < val_len )
+    {
+        /*
+         * Enlarge existing value buffer if needed
+         * Preserve old data until the allocation succeeded, to leave list in
+         * a consistent state in case allocation fails.
+         */
+        void *p = mbedtls_calloc( 1, val_len );
+        if( p == NULL )
+            return( NULL );
+
+        mbedtls_free( cur->val.p );
+        cur->val.p = p;
+        cur->val.len = val_len;
+    }
+
+    if( val != NULL )
+        memcpy( cur->val.p, val, val_len );
+
+    return( cur );
+}
+#endif /* MBEDTLS_ASN1_WRITE_C */
diff --git a/common/mbedtls/asn1write.h b/common/mbedtls/asn1write.h
new file mode 100644
index 000000000..0b832e5c2
--- /dev/null
+++ b/common/mbedtls/asn1write.h
@@ -0,0 +1,242 @@
+/**
+ * \file asn1write.h
+ *
+ * \brief ASN.1 buffer writing functionality
+ */
+/*
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+#ifndef MBEDTLS_ASN1_WRITE_H
+#define MBEDTLS_ASN1_WRITE_H
+
+#include "asn1.h"
+
+#define MBEDTLS_ASN1_CHK_ADD(g, f) do { if( ( ret = f ) < 0 ) return( ret ); else   \
+                                g += ret; } while( 0 )
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \brief           Write a length field in ASN.1 format
+ *                  Note: function works backwards in data buffer
+ *
+ * \param p         reference to current position pointer
+ * \param start     start of the buffer (for bounds-checking)
+ * \param len       the length to write
+ *
+ * \return          the length written or a negative error code
+ */
+int mbedtls_asn1_write_len( unsigned char **p, unsigned char *start, size_t len );
+
+/**
+ * \brief           Write a ASN.1 tag in ASN.1 format
+ *                  Note: function works backwards in data buffer
+ *
+ * \param p         reference to current position pointer
+ * \param start     start of the buffer (for bounds-checking)
+ * \param tag       the tag to write
+ *
+ * \return          the length written or a negative error code
+ */
+int mbedtls_asn1_write_tag( unsigned char **p, unsigned char *start,
+                    unsigned char tag );
+
+/**
+ * \brief           Write raw buffer data
+ *                  Note: function works backwards in data buffer
+ *
+ * \param p         reference to current position pointer
+ * \param start     start of the buffer (for bounds-checking)
+ * \param buf       data buffer to write
+ * \param size      length of the data buffer
+ *
+ * \return          the length written or a negative error code
+ */
+int mbedtls_asn1_write_raw_buffer( unsigned char **p, unsigned char *start,
+                           const unsigned char *buf, size_t size );
+
+#if defined(MBEDTLS_BIGNUM_C)
+/**
+ * \brief           Write a big number (MBEDTLS_ASN1_INTEGER) in ASN.1 format
+ *                  Note: function works backwards in data buffer
+ *
+ * \param p         reference to current position pointer
+ * \param start     start of the buffer (for bounds-checking)
+ * \param X         the MPI to write
+ *
+ * \return          the length written or a negative error code
+ */
+int mbedtls_asn1_write_mpi( unsigned char **p, unsigned char *start, const mbedtls_mpi *X );
+#endif /* MBEDTLS_BIGNUM_C */
+
+/**
+ * \brief           Write a NULL tag (MBEDTLS_ASN1_NULL) with zero data in ASN.1 format
+ *                  Note: function works backwards in data buffer
+ *
+ * \param p         reference to current position pointer
+ * \param start     start of the buffer (for bounds-checking)
+ *
+ * \return          the length written or a negative error code
+ */
+int mbedtls_asn1_write_null( unsigned char **p, unsigned char *start );
+
+/**
+ * \brief           Write an OID tag (MBEDTLS_ASN1_OID) and data in ASN.1 format
+ *                  Note: function works backwards in data buffer
+ *
+ * \param p         reference to current position pointer
+ * \param start     start of the buffer (for bounds-checking)
+ * \param oid       the OID to write
+ * \param oid_len   length of the OID
+ *
+ * \return          the length written or a negative error code
+ */
+int mbedtls_asn1_write_oid( unsigned char **p, unsigned char *start,
+                    const char *oid, size_t oid_len );
+
+/**
+ * \brief           Write an AlgorithmIdentifier sequence in ASN.1 format
+ *                  Note: function works backwards in data buffer
+ *
+ * \param p         reference to current position pointer
+ * \param start     start of the buffer (for bounds-checking)
+ * \param oid       the OID of the algorithm
+ * \param oid_len   length of the OID
+ * \param par_len   length of parameters, which must be already written.
+ *                  If 0, NULL parameters are added
+ *
+ * \return          the length written or a negative error code
+ */
+int mbedtls_asn1_write_algorithm_identifier( unsigned char **p, unsigned char *start,
+                                     const char *oid, size_t oid_len,
+                                     size_t par_len );
+
+/**
+ * \brief           Write a boolean tag (MBEDTLS_ASN1_BOOLEAN) and value in ASN.1 format
+ *                  Note: function works backwards in data buffer
+ *
+ * \param p         reference to current position pointer
+ * \param start     start of the buffer (for bounds-checking)
+ * \param boolean   0 or 1
+ *
+ * \return          the length written or a negative error code
+ */
+int mbedtls_asn1_write_bool( unsigned char **p, unsigned char *start, int boolean );
+
+/**
+ * \brief           Write an int tag (MBEDTLS_ASN1_INTEGER) and value in ASN.1 format
+ *                  Note: function works backwards in data buffer
+ *
+ * \param p         reference to current position pointer
+ * \param start     start of the buffer (for bounds-checking)
+ * \param val       the integer value
+ *
+ * \return          the length written or a negative error code
+ */
+int mbedtls_asn1_write_int( unsigned char **p, unsigned char *start, int val );
+
+/**
+ * \brief           Write a printable string tag (MBEDTLS_ASN1_PRINTABLE_STRING) and
+ *                  value in ASN.1 format
+ *                  Note: function works backwards in data buffer
+ *
+ * \param p         reference to current position pointer
+ * \param start     start of the buffer (for bounds-checking)
+ * \param text      the text to write
+ * \param text_len  length of the text
+ *
+ * \return          the length written or a negative error code
+ */
+int mbedtls_asn1_write_printable_string( unsigned char **p, unsigned char *start,
+                                 const char *text, size_t text_len );
+
+/**
+ * \brief           Write an IA5 string tag (MBEDTLS_ASN1_IA5_STRING) and
+ *                  value in ASN.1 format
+ *                  Note: function works backwards in data buffer
+ *
+ * \param p         reference to current position pointer
+ * \param start     start of the buffer (for bounds-checking)
+ * \param text      the text to write
+ * \param text_len  length of the text
+ *
+ * \return          the length written or a negative error code
+ */
+int mbedtls_asn1_write_ia5_string( unsigned char **p, unsigned char *start,
+                           const char *text, size_t text_len );
+
+/**
+ * \brief           Write a bitstring tag (MBEDTLS_ASN1_BIT_STRING) and
+ *                  value in ASN.1 format
+ *                  Note: function works backwards in data buffer
+ *
+ * \param p         reference to current position pointer
+ * \param start     start of the buffer (for bounds-checking)
+ * \param buf       the bitstring
+ * \param bits      the total number of bits in the bitstring
+ *
+ * \return          the length written or a negative error code
+ */
+int mbedtls_asn1_write_bitstring( unsigned char **p, unsigned char *start,
+                          const unsigned char *buf, size_t bits );
+
+/**
+ * \brief           Write an octet string tag (MBEDTLS_ASN1_OCTET_STRING) and
+ *                  value in ASN.1 format
+ *                  Note: function works backwards in data buffer
+ *
+ * \param p         reference to current position pointer
+ * \param start     start of the buffer (for bounds-checking)
+ * \param buf       data buffer to write
+ * \param size      length of the data buffer
+ *
+ * \return          the length written or a negative error code
+ */
+int mbedtls_asn1_write_octet_string( unsigned char **p, unsigned char *start,
+                             const unsigned char *buf, size_t size );
+
+/**
+ * \brief           Create or find a specific named_data entry for writing in a
+ *                  sequence or list based on the OID. If not already in there,
+ *                  a new entry is added to the head of the list.
+ *                  Warning: Destructive behaviour for the val data!
+ *
+ * \param list      Pointer to the location of the head of the list to seek
+ *                  through (will be updated in case of a new entry)
+ * \param oid       The OID to look for
+ * \param oid_len   Size of the OID
+ * \param val       Data to store (can be NULL if you want to fill it by hand)
+ * \param val_len   Minimum length of the data buffer needed
+ *
+ * \return      NULL if if there was a memory allocation error, or a pointer
+ *              to the new / existing entry.
+ */
+mbedtls_asn1_named_data *mbedtls_asn1_store_named_data( mbedtls_asn1_named_data **list,
+                                        const char *oid, size_t oid_len,
+                                        const unsigned char *val,
+                                        size_t val_len );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* MBEDTLS_ASN1_WRITE_H */
diff --git a/common/polarssl/base64.c b/common/mbedtls/base64.c
similarity index 87%
rename from common/polarssl/base64.c
rename to common/mbedtls/base64.c
index d470bae0c..412000217 100644
--- a/common/polarssl/base64.c
+++ b/common/mbedtls/base64.c
@@ -2,35 +2,41 @@
  *  RFC 1521 base64 encoding/decoding
  *
  *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
- *  SPDX-License-Identifier: Apache-2.0
+ *  SPDX-License-Identifier: GPL-2.0
  *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may
- *  not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
  *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  *  This file is part of mbed TLS (https://tls.mbed.org)
  */
 
-#include "polarssl_config.h"
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "mbedtls/config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
 
-//#if defined(MBEDTLS_BASE64_C)
+#if defined(MBEDTLS_BASE64_C)
 
-#include "base64.h"
+#include "mbedtls/base64.h"
 
 #include <stdint.h>
 
 #if defined(MBEDTLS_SELF_TEST)
 #include <string.h>
 #if defined(MBEDTLS_PLATFORM_C)
-#include "platform.h"
+#include "mbedtls/platform.h"
 #else
 #include <stdio.h>
 #define mbedtls_printf printf
@@ -286,4 +292,4 @@ int mbedtls_base64_self_test( int verbose )
 
 #endif /* MBEDTLS_SELF_TEST */
 
-//#endif /* MBEDTLS_BASE64_C */
+#endif /* MBEDTLS_BASE64_C */
diff --git a/common/polarssl/base64.h b/common/mbedtls/base64.h
similarity index 77%
rename from common/polarssl/base64.h
rename to common/mbedtls/base64.h
index 7a64f5216..ce5563e1d 100644
--- a/common/polarssl/base64.h
+++ b/common/mbedtls/base64.h
@@ -5,19 +5,21 @@
  */
 /*
  *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
- *  SPDX-License-Identifier: Apache-2.0
+ *  SPDX-License-Identifier: GPL-2.0
  *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may
- *  not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
  *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  *  This file is part of mbed TLS (https://tls.mbed.org)
  */
diff --git a/common/mbedtls/bignum.c b/common/mbedtls/bignum.c
new file mode 100644
index 000000000..2c9ecbe26
--- /dev/null
+++ b/common/mbedtls/bignum.c
@@ -0,0 +1,2470 @@
+/*
+ *  Multi-precision integer library
+ *
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+
+/*
+ *  The following sources were referenced in the design of this Multi-precision
+ *  Integer library:
+ *
+ *  [1] Handbook of Applied Cryptography - 1997
+ *      Menezes, van Oorschot and Vanstone
+ *
+ *  [2] Multi-Precision Math
+ *      Tom St Denis
+ *      https://github.com/libtom/libtommath/blob/develop/tommath.pdf
+ *
+ *  [3] GNU Multi-Precision Arithmetic Library
+ *      https://gmplib.org/manual/index.html
+ *
+ */
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "mbedtls/config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#if defined(MBEDTLS_BIGNUM_C)
+
+#include "mbedtls/bignum.h"
+#include "mbedtls/bn_mul.h"
+#include "mbedtls/platform_util.h"
+
+#include <string.h>
+
+#if defined(MBEDTLS_PLATFORM_C)
+#include "mbedtls/platform.h"
+#else
+#include <stdio.h>
+#include <stdlib.h>
+#define mbedtls_printf     printf
+#define mbedtls_calloc    calloc
+#define mbedtls_free       free
+#endif
+
+#define ciL    (sizeof(mbedtls_mpi_uint))         /* chars in limb  */
+#define biL    (ciL << 3)               /* bits  in limb  */
+#define biH    (ciL << 2)               /* half limb size */
+
+#define MPI_SIZE_T_MAX  ( (size_t) -1 ) /* SIZE_T_MAX is not standard */
+
+/*
+ * Convert between bits/chars and number of limbs
+ * Divide first in order to avoid potential overflows
+ */
+#define BITS_TO_LIMBS(i)  ( (i) / biL + ( (i) % biL != 0 ) )
+#define CHARS_TO_LIMBS(i) ( (i) / ciL + ( (i) % ciL != 0 ) )
+
+/* Implementation that should never be optimized out by the compiler */
+static void mbedtls_mpi_zeroize( mbedtls_mpi_uint *v, size_t n )
+{
+    mbedtls_platform_zeroize( v, ciL * n );
+}
+
+/*
+ * Initialize one MPI
+ */
+void mbedtls_mpi_init( mbedtls_mpi *X )
+{
+    if( X == NULL )
+        return;
+
+    X->s = 1;
+    X->n = 0;
+    X->p = NULL;
+}
+
+/*
+ * Unallocate one MPI
+ */
+void mbedtls_mpi_free( mbedtls_mpi *X )
+{
+    if( X == NULL )
+        return;
+
+    if( X->p != NULL )
+    {
+        mbedtls_mpi_zeroize( X->p, X->n );
+        mbedtls_free( X->p );
+    }
+
+    X->s = 1;
+    X->n = 0;
+    X->p = NULL;
+}
+
+/*
+ * Enlarge to the specified number of limbs
+ */
+int mbedtls_mpi_grow( mbedtls_mpi *X, size_t nblimbs )
+{
+    mbedtls_mpi_uint *p;
+
+    if( nblimbs > MBEDTLS_MPI_MAX_LIMBS )
+        return( MBEDTLS_ERR_MPI_ALLOC_FAILED );
+
+    if( X->n < nblimbs )
+    {
+        if( ( p = (mbedtls_mpi_uint*)mbedtls_calloc( nblimbs, ciL ) ) == NULL )
+            return( MBEDTLS_ERR_MPI_ALLOC_FAILED );
+
+        if( X->p != NULL )
+        {
+            memcpy( p, X->p, X->n * ciL );
+            mbedtls_mpi_zeroize( X->p, X->n );
+            mbedtls_free( X->p );
+        }
+
+        X->n = nblimbs;
+        X->p = p;
+    }
+
+    return( 0 );
+}
+
+/*
+ * Resize down as much as possible,
+ * while keeping at least the specified number of limbs
+ */
+int mbedtls_mpi_shrink( mbedtls_mpi *X, size_t nblimbs )
+{
+    mbedtls_mpi_uint *p;
+    size_t i;
+
+    /* Actually resize up in this case */
+    if( X->n <= nblimbs )
+        return( mbedtls_mpi_grow( X, nblimbs ) );
+
+    for( i = X->n - 1; i > 0; i-- )
+        if( X->p[i] != 0 )
+            break;
+    i++;
+
+    if( i < nblimbs )
+        i = nblimbs;
+
+    if( ( p = (mbedtls_mpi_uint*)mbedtls_calloc( i, ciL ) ) == NULL )
+        return( MBEDTLS_ERR_MPI_ALLOC_FAILED );
+
+    if( X->p != NULL )
+    {
+        memcpy( p, X->p, i * ciL );
+        mbedtls_mpi_zeroize( X->p, X->n );
+        mbedtls_free( X->p );
+    }
+
+    X->n = i;
+    X->p = p;
+
+    return( 0 );
+}
+
+/*
+ * Copy the contents of Y into X
+ */
+int mbedtls_mpi_copy( mbedtls_mpi *X, const mbedtls_mpi *Y )
+{
+    int ret = 0;
+    size_t i;
+
+    if( X == Y )
+        return( 0 );
+
+    if( Y->p == NULL )
+    {
+        mbedtls_mpi_free( X );
+        return( 0 );
+    }
+
+    for( i = Y->n - 1; i > 0; i-- )
+        if( Y->p[i] != 0 )
+            break;
+    i++;
+
+    X->s = Y->s;
+
+    if( X->n < i )
+    {
+        MBEDTLS_MPI_CHK( mbedtls_mpi_grow( X, i ) );
+    }
+    else
+    {
+        memset( X->p + i, 0, ( X->n - i ) * ciL );
+    }
+
+    memcpy( X->p, Y->p, i * ciL );
+
+cleanup:
+
+    return( ret );
+}
+
+/*
+ * Swap the contents of X and Y
+ */
+void mbedtls_mpi_swap( mbedtls_mpi *X, mbedtls_mpi *Y )
+{
+    mbedtls_mpi T;
+
+    memcpy( &T,  X, sizeof( mbedtls_mpi ) );
+    memcpy(  X,  Y, sizeof( mbedtls_mpi ) );
+    memcpy(  Y, &T, sizeof( mbedtls_mpi ) );
+}
+
+/*
+ * Conditionally assign X = Y, without leaking information
+ * about whether the assignment was made or not.
+ * (Leaking information about the respective sizes of X and Y is ok however.)
+ */
+int mbedtls_mpi_safe_cond_assign( mbedtls_mpi *X, const mbedtls_mpi *Y, unsigned char assign )
+{
+    int ret = 0;
+    size_t i;
+
+    /* make sure assign is 0 or 1 in a time-constant manner */
+    assign = (assign | (unsigned char)-assign) >> 7;
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_grow( X, Y->n ) );
+
+    X->s = X->s * ( 1 - assign ) + Y->s * assign;
+
+    for( i = 0; i < Y->n; i++ )
+        X->p[i] = X->p[i] * ( 1 - assign ) + Y->p[i] * assign;
+
+    for( ; i < X->n; i++ )
+        X->p[i] *= ( 1 - assign );
+
+cleanup:
+    return( ret );
+}
+
+/*
+ * Conditionally swap X and Y, without leaking information
+ * about whether the swap was made or not.
+ * Here it is not ok to simply swap the pointers, which whould lead to
+ * different memory access patterns when X and Y are used afterwards.
+ */
+int mbedtls_mpi_safe_cond_swap( mbedtls_mpi *X, mbedtls_mpi *Y, unsigned char swap )
+{
+    int ret, s;
+    size_t i;
+    mbedtls_mpi_uint tmp;
+
+    if( X == Y )
+        return( 0 );
+
+    /* make sure swap is 0 or 1 in a time-constant manner */
+    swap = (swap | (unsigned char)-swap) >> 7;
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_grow( X, Y->n ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_grow( Y, X->n ) );
+
+    s = X->s;
+    X->s = X->s * ( 1 - swap ) + Y->s * swap;
+    Y->s = Y->s * ( 1 - swap ) +    s * swap;
+
+
+    for( i = 0; i < X->n; i++ )
+    {
+        tmp = X->p[i];
+        X->p[i] = X->p[i] * ( 1 - swap ) + Y->p[i] * swap;
+        Y->p[i] = Y->p[i] * ( 1 - swap ) +     tmp * swap;
+    }
+
+cleanup:
+    return( ret );
+}
+
+/*
+ * Set value from integer
+ */
+int mbedtls_mpi_lset( mbedtls_mpi *X, mbedtls_mpi_sint z )
+{
+    int ret;
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_grow( X, 1 ) );
+    memset( X->p, 0, X->n * ciL );
+
+    X->p[0] = ( z < 0 ) ? -z : z;
+    X->s    = ( z < 0 ) ? -1 : 1;
+
+cleanup:
+
+    return( ret );
+}
+
+/*
+ * Get a specific bit
+ */
+int mbedtls_mpi_get_bit( const mbedtls_mpi *X, size_t pos )
+{
+    if( X->n * biL <= pos )
+        return( 0 );
+
+    return( ( X->p[pos / biL] >> ( pos % biL ) ) & 0x01 );
+}
+
+/*
+ * Set a bit to a specific value of 0 or 1
+ */
+int mbedtls_mpi_set_bit( mbedtls_mpi *X, size_t pos, unsigned char val )
+{
+    int ret = 0;
+    size_t off = pos / biL;
+    size_t idx = pos % biL;
+
+    if( val != 0 && val != 1 )
+        return( MBEDTLS_ERR_MPI_BAD_INPUT_DATA );
+
+    if( X->n * biL <= pos )
+    {
+        if( val == 0 )
+            return( 0 );
+
+        MBEDTLS_MPI_CHK( mbedtls_mpi_grow( X, off + 1 ) );
+    }
+
+    X->p[off] &= ~( (mbedtls_mpi_uint) 0x01 << idx );
+    X->p[off] |= (mbedtls_mpi_uint) val << idx;
+
+cleanup:
+
+    return( ret );
+}
+
+/*
+ * Return the number of less significant zero-bits
+ */
+size_t mbedtls_mpi_lsb( const mbedtls_mpi *X )
+{
+    size_t i, j, count = 0;
+
+    for( i = 0; i < X->n; i++ )
+        for( j = 0; j < biL; j++, count++ )
+            if( ( ( X->p[i] >> j ) & 1 ) != 0 )
+                return( count );
+
+    return( 0 );
+}
+
+/*
+ * Count leading zero bits in a given integer
+ */
+static size_t mbedtls_clz( const mbedtls_mpi_uint x )
+{
+    size_t j;
+    mbedtls_mpi_uint mask = (mbedtls_mpi_uint) 1 << (biL - 1);
+
+    for( j = 0; j < biL; j++ )
+    {
+        if( x & mask ) break;
+
+        mask >>= 1;
+    }
+
+    return j;
+}
+
+/*
+ * Return the number of bits
+ */
+size_t mbedtls_mpi_bitlen( const mbedtls_mpi *X )
+{
+    size_t i, j;
+
+    if( X->n == 0 )
+        return( 0 );
+
+    for( i = X->n - 1; i > 0; i-- )
+        if( X->p[i] != 0 )
+            break;
+
+    j = biL - mbedtls_clz( X->p[i] );
+
+    return( ( i * biL ) + j );
+}
+
+/*
+ * Return the total size in bytes
+ */
+size_t mbedtls_mpi_size( const mbedtls_mpi *X )
+{
+    return( ( mbedtls_mpi_bitlen( X ) + 7 ) >> 3 );
+}
+
+/*
+ * Convert an ASCII character to digit value
+ */
+static int mpi_get_digit( mbedtls_mpi_uint *d, int radix, char c )
+{
+    *d = 255;
+
+    if( c >= 0x30 && c <= 0x39 ) *d = c - 0x30;
+    if( c >= 0x41 && c <= 0x46 ) *d = c - 0x37;
+    if( c >= 0x61 && c <= 0x66 ) *d = c - 0x57;
+
+    if( *d >= (mbedtls_mpi_uint) radix )
+        return( MBEDTLS_ERR_MPI_INVALID_CHARACTER );
+
+    return( 0 );
+}
+
+/*
+ * Import from an ASCII string
+ */
+int mbedtls_mpi_read_string( mbedtls_mpi *X, int radix, const char *s )
+{
+    int ret;
+    size_t i, j, slen, n;
+    mbedtls_mpi_uint d;
+    mbedtls_mpi T;
+
+    if( radix < 2 || radix > 16 )
+        return( MBEDTLS_ERR_MPI_BAD_INPUT_DATA );
+
+    mbedtls_mpi_init( &T );
+
+    slen = strlen( s );
+
+    if( radix == 16 )
+    {
+        if( slen > MPI_SIZE_T_MAX >> 2 )
+            return( MBEDTLS_ERR_MPI_BAD_INPUT_DATA );
+
+        n = BITS_TO_LIMBS( slen << 2 );
+
+        MBEDTLS_MPI_CHK( mbedtls_mpi_grow( X, n ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_lset( X, 0 ) );
+
+        for( i = slen, j = 0; i > 0; i--, j++ )
+        {
+            if( i == 1 && s[i - 1] == '-' )
+            {
+                X->s = -1;
+                break;
+            }
+
+            MBEDTLS_MPI_CHK( mpi_get_digit( &d, radix, s[i - 1] ) );
+            X->p[j / ( 2 * ciL )] |= d << ( ( j % ( 2 * ciL ) ) << 2 );
+        }
+    }
+    else
+    {
+        MBEDTLS_MPI_CHK( mbedtls_mpi_lset( X, 0 ) );
+
+        for( i = 0; i < slen; i++ )
+        {
+            if( i == 0 && s[i] == '-' )
+            {
+                X->s = -1;
+                continue;
+            }
+
+            MBEDTLS_MPI_CHK( mpi_get_digit( &d, radix, s[i] ) );
+            MBEDTLS_MPI_CHK( mbedtls_mpi_mul_int( &T, X, radix ) );
+
+            if( X->s == 1 )
+            {
+                MBEDTLS_MPI_CHK( mbedtls_mpi_add_int( X, &T, d ) );
+            }
+            else
+            {
+                MBEDTLS_MPI_CHK( mbedtls_mpi_sub_int( X, &T, d ) );
+            }
+        }
+    }
+
+cleanup:
+
+    mbedtls_mpi_free( &T );
+
+    return( ret );
+}
+
+/*
+ * Helper to write the digits high-order first
+ */
+static int mpi_write_hlp( mbedtls_mpi *X, int radix, char **p )
+{
+    int ret;
+    mbedtls_mpi_uint r;
+
+    if( radix < 2 || radix > 16 )
+        return( MBEDTLS_ERR_MPI_BAD_INPUT_DATA );
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mod_int( &r, X, radix ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_div_int( X, NULL, X, radix ) );
+
+    if( mbedtls_mpi_cmp_int( X, 0 ) != 0 )
+        MBEDTLS_MPI_CHK( mpi_write_hlp( X, radix, p ) );
+
+    if( r < 10 )
+        *(*p)++ = (char)( r + 0x30 );
+    else
+        *(*p)++ = (char)( r + 0x37 );
+
+cleanup:
+
+    return( ret );
+}
+
+/*
+ * Export into an ASCII string
+ */
+int mbedtls_mpi_write_string( const mbedtls_mpi *X, int radix,
+                              char *buf, size_t buflen, size_t *olen )
+{
+    int ret = 0;
+    size_t n;
+    char *p;
+    mbedtls_mpi T;
+
+    if( radix < 2 || radix > 16 )
+        return( MBEDTLS_ERR_MPI_BAD_INPUT_DATA );
+
+    n = mbedtls_mpi_bitlen( X );
+    if( radix >=  4 ) n >>= 1;
+    if( radix >= 16 ) n >>= 1;
+    /*
+     * Round up the buffer length to an even value to ensure that there is
+     * enough room for hexadecimal values that can be represented in an odd
+     * number of digits.
+     */
+    n += 3 + ( ( n + 1 ) & 1 );
+
+    if( buflen < n )
+    {
+        *olen = n;
+        return( MBEDTLS_ERR_MPI_BUFFER_TOO_SMALL );
+    }
+
+    p = buf;
+    mbedtls_mpi_init( &T );
+
+    if( X->s == -1 )
+        *p++ = '-';
+
+    if( radix == 16 )
+    {
+        int c;
+        size_t i, j, k;
+
+        for( i = X->n, k = 0; i > 0; i-- )
+        {
+            for( j = ciL; j > 0; j-- )
+            {
+                c = ( X->p[i - 1] >> ( ( j - 1 ) << 3) ) & 0xFF;
+
+                if( c == 0 && k == 0 && ( i + j ) != 2 )
+                    continue;
+
+                *(p++) = "0123456789ABCDEF" [c / 16];
+                *(p++) = "0123456789ABCDEF" [c % 16];
+                k = 1;
+            }
+        }
+    }
+    else
+    {
+        MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &T, X ) );
+
+        if( T.s == -1 )
+            T.s = 1;
+
+        MBEDTLS_MPI_CHK( mpi_write_hlp( &T, radix, &p ) );
+    }
+
+    *p++ = '\0';
+    *olen = p - buf;
+
+cleanup:
+
+    mbedtls_mpi_free( &T );
+
+    return( ret );
+}
+
+#if defined(MBEDTLS_FS_IO)
+/*
+ * Read X from an opened file
+ */
+int mbedtls_mpi_read_file( mbedtls_mpi *X, int radix, FILE *fin )
+{
+    mbedtls_mpi_uint d;
+    size_t slen;
+    char *p;
+    /*
+     * Buffer should have space for (short) label and decimal formatted MPI,
+     * newline characters and '\0'
+     */
+    char s[ MBEDTLS_MPI_RW_BUFFER_SIZE ];
+
+    memset( s, 0, sizeof( s ) );
+    if( fgets( s, sizeof( s ) - 1, fin ) == NULL )
+        return( MBEDTLS_ERR_MPI_FILE_IO_ERROR );
+
+    slen = strlen( s );
+    if( slen == sizeof( s ) - 2 )
+        return( MBEDTLS_ERR_MPI_BUFFER_TOO_SMALL );
+
+    if( slen > 0 && s[slen - 1] == '\n' ) { slen--; s[slen] = '\0'; }
+    if( slen > 0 && s[slen - 1] == '\r' ) { slen--; s[slen] = '\0'; }
+
+    p = s + slen;
+    while( p-- > s )
+        if( mpi_get_digit( &d, radix, *p ) != 0 )
+            break;
+
+    return( mbedtls_mpi_read_string( X, radix, p + 1 ) );
+}
+
+/*
+ * Write X into an opened file (or stdout if fout == NULL)
+ */
+int mbedtls_mpi_write_file( const char *p, const mbedtls_mpi *X, int radix, FILE *fout )
+{
+    int ret;
+    size_t n, slen, plen;
+    /*
+     * Buffer should have space for (short) label and decimal formatted MPI,
+     * newline characters and '\0'
+     */
+    char s[ MBEDTLS_MPI_RW_BUFFER_SIZE ];
+
+    memset( s, 0, sizeof( s ) );
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_write_string( X, radix, s, sizeof( s ) - 2, &n ) );
+
+    if( p == NULL ) p = "";
+
+    plen = strlen( p );
+    slen = strlen( s );
+    s[slen++] = '\r';
+    s[slen++] = '\n';
+
+    if( fout != NULL )
+    {
+        if( fwrite( p, 1, plen, fout ) != plen ||
+            fwrite( s, 1, slen, fout ) != slen )
+            return( MBEDTLS_ERR_MPI_FILE_IO_ERROR );
+    }
+    else
+        mbedtls_printf( "%s%s", p, s );
+
+cleanup:
+
+    return( ret );
+}
+#endif /* MBEDTLS_FS_IO */
+
+/*
+ * Import X from unsigned binary data, big endian
+ */
+int mbedtls_mpi_read_binary( mbedtls_mpi *X, const unsigned char *buf, size_t buflen )
+{
+    int ret;
+    size_t i, j;
+    size_t const limbs = CHARS_TO_LIMBS( buflen );
+
+    /* Ensure that target MPI has exactly the necessary number of limbs */
+    if( X->n != limbs )
+    {
+        mbedtls_mpi_free( X );
+        mbedtls_mpi_init( X );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_grow( X, limbs ) );
+    }
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_lset( X, 0 ) );
+
+    for( i = buflen, j = 0; i > 0; i--, j++ )
+        X->p[j / ciL] |= ((mbedtls_mpi_uint) buf[i - 1]) << ((j % ciL) << 3);
+
+cleanup:
+
+    return( ret );
+}
+
+/*
+ * Export X into unsigned binary data, big endian
+ */
+int mbedtls_mpi_write_binary( const mbedtls_mpi *X, unsigned char *buf, size_t buflen )
+{
+    size_t i, j, n;
+
+    n = mbedtls_mpi_size( X );
+
+    if( buflen < n )
+        return( MBEDTLS_ERR_MPI_BUFFER_TOO_SMALL );
+
+    memset( buf, 0, buflen );
+
+    for( i = buflen - 1, j = 0; n > 0; i--, j++, n-- )
+        buf[i] = (unsigned char)( X->p[j / ciL] >> ((j % ciL) << 3) );
+
+    return( 0 );
+}
+
+/*
+ * Left-shift: X <<= count
+ */
+int mbedtls_mpi_shift_l( mbedtls_mpi *X, size_t count )
+{
+    int ret;
+    size_t i, v0, t1;
+    mbedtls_mpi_uint r0 = 0, r1;
+
+    v0 = count / (biL    );
+    t1 = count & (biL - 1);
+
+    i = mbedtls_mpi_bitlen( X ) + count;
+
+    if( X->n * biL < i )
+        MBEDTLS_MPI_CHK( mbedtls_mpi_grow( X, BITS_TO_LIMBS( i ) ) );
+
+    ret = 0;
+
+    /*
+     * shift by count / limb_size
+     */
+    if( v0 > 0 )
+    {
+        for( i = X->n; i > v0; i-- )
+            X->p[i - 1] = X->p[i - v0 - 1];
+
+        for( ; i > 0; i-- )
+            X->p[i - 1] = 0;
+    }
+
+    /*
+     * shift by count % limb_size
+     */
+    if( t1 > 0 )
+    {
+        for( i = v0; i < X->n; i++ )
+        {
+            r1 = X->p[i] >> (biL - t1);
+            X->p[i] <<= t1;
+            X->p[i] |= r0;
+            r0 = r1;
+        }
+    }
+
+cleanup:
+
+    return( ret );
+}
+
+/*
+ * Right-shift: X >>= count
+ */
+int mbedtls_mpi_shift_r( mbedtls_mpi *X, size_t count )
+{
+    size_t i, v0, v1;
+    mbedtls_mpi_uint r0 = 0, r1;
+
+    v0 = count /  biL;
+    v1 = count & (biL - 1);
+
+    if( v0 > X->n || ( v0 == X->n && v1 > 0 ) )
+        return mbedtls_mpi_lset( X, 0 );
+
+    /*
+     * shift by count / limb_size
+     */
+    if( v0 > 0 )
+    {
+        for( i = 0; i < X->n - v0; i++ )
+            X->p[i] = X->p[i + v0];
+
+        for( ; i < X->n; i++ )
+            X->p[i] = 0;
+    }
+
+    /*
+     * shift by count % limb_size
+     */
+    if( v1 > 0 )
+    {
+        for( i = X->n; i > 0; i-- )
+        {
+            r1 = X->p[i - 1] << (biL - v1);
+            X->p[i - 1] >>= v1;
+            X->p[i - 1] |= r0;
+            r0 = r1;
+        }
+    }
+
+    return( 0 );
+}
+
+/*
+ * Compare unsigned values
+ */
+int mbedtls_mpi_cmp_abs( const mbedtls_mpi *X, const mbedtls_mpi *Y )
+{
+    size_t i, j;
+
+    for( i = X->n; i > 0; i-- )
+        if( X->p[i - 1] != 0 )
+            break;
+
+    for( j = Y->n; j > 0; j-- )
+        if( Y->p[j - 1] != 0 )
+            break;
+
+    if( i == 0 && j == 0 )
+        return( 0 );
+
+    if( i > j ) return(  1 );
+    if( j > i ) return( -1 );
+
+    for( ; i > 0; i-- )
+    {
+        if( X->p[i - 1] > Y->p[i - 1] ) return(  1 );
+        if( X->p[i - 1] < Y->p[i - 1] ) return( -1 );
+    }
+
+    return( 0 );
+}
+
+/*
+ * Compare signed values
+ */
+int mbedtls_mpi_cmp_mpi( const mbedtls_mpi *X, const mbedtls_mpi *Y )
+{
+    size_t i, j;
+
+    for( i = X->n; i > 0; i-- )
+        if( X->p[i - 1] != 0 )
+            break;
+
+    for( j = Y->n; j > 0; j-- )
+        if( Y->p[j - 1] != 0 )
+            break;
+
+    if( i == 0 && j == 0 )
+        return( 0 );
+
+    if( i > j ) return(  X->s );
+    if( j > i ) return( -Y->s );
+
+    if( X->s > 0 && Y->s < 0 ) return(  1 );
+    if( Y->s > 0 && X->s < 0 ) return( -1 );
+
+    for( ; i > 0; i-- )
+    {
+        if( X->p[i - 1] > Y->p[i - 1] ) return(  X->s );
+        if( X->p[i - 1] < Y->p[i - 1] ) return( -X->s );
+    }
+
+    return( 0 );
+}
+
+/*
+ * Compare signed values
+ */
+int mbedtls_mpi_cmp_int( const mbedtls_mpi *X, mbedtls_mpi_sint z )
+{
+    mbedtls_mpi Y;
+    mbedtls_mpi_uint p[1];
+
+    *p  = ( z < 0 ) ? -z : z;
+    Y.s = ( z < 0 ) ? -1 : 1;
+    Y.n = 1;
+    Y.p = p;
+
+    return( mbedtls_mpi_cmp_mpi( X, &Y ) );
+}
+
+/*
+ * Unsigned addition: X = |A| + |B|  (HAC 14.7)
+ */
+int mbedtls_mpi_add_abs( mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *B )
+{
+    int ret;
+    size_t i, j;
+    mbedtls_mpi_uint *o, *p, c, tmp;
+
+    if( X == B )
+    {
+        const mbedtls_mpi *T = A; A = X; B = T;
+    }
+
+    if( X != A )
+        MBEDTLS_MPI_CHK( mbedtls_mpi_copy( X, A ) );
+
+    /*
+     * X should always be positive as a result of unsigned additions.
+     */
+    X->s = 1;
+
+    for( j = B->n; j > 0; j-- )
+        if( B->p[j - 1] != 0 )
+            break;
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_grow( X, j ) );
+
+    o = B->p; p = X->p; c = 0;
+
+    /*
+     * tmp is used because it might happen that p == o
+     */
+    for( i = 0; i < j; i++, o++, p++ )
+    {
+        tmp= *o;
+        *p +=  c; c  = ( *p <  c );
+        *p += tmp; c += ( *p < tmp );
+    }
+
+    while( c != 0 )
+    {
+        if( i >= X->n )
+        {
+            MBEDTLS_MPI_CHK( mbedtls_mpi_grow( X, i + 1 ) );
+            p = X->p + i;
+        }
+
+        *p += c; c = ( *p < c ); i++; p++;
+    }
+
+cleanup:
+
+    return( ret );
+}
+
+/*
+ * Helper for mbedtls_mpi subtraction
+ */
+static void mpi_sub_hlp( size_t n, mbedtls_mpi_uint *s, mbedtls_mpi_uint *d )
+{
+    size_t i;
+    mbedtls_mpi_uint c, z;
+
+    for( i = c = 0; i < n; i++, s++, d++ )
+    {
+        z = ( *d <  c );     *d -=  c;
+        c = ( *d < *s ) + z; *d -= *s;
+    }
+
+    while( c != 0 )
+    {
+        z = ( *d < c ); *d -= c;
+        c = z; d++;
+    }
+}
+
+/*
+ * Unsigned subtraction: X = |A| - |B|  (HAC 14.9)
+ */
+int mbedtls_mpi_sub_abs( mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *B )
+{
+    mbedtls_mpi TB;
+    int ret;
+    size_t n;
+
+    if( mbedtls_mpi_cmp_abs( A, B ) < 0 )
+        return( MBEDTLS_ERR_MPI_NEGATIVE_VALUE );
+
+    mbedtls_mpi_init( &TB );
+
+    if( X == B )
+    {
+        MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &TB, B ) );
+        B = &TB;
+    }
+
+    if( X != A )
+        MBEDTLS_MPI_CHK( mbedtls_mpi_copy( X, A ) );
+
+    /*
+     * X should always be positive as a result of unsigned subtractions.
+     */
+    X->s = 1;
+
+    ret = 0;
+
+    for( n = B->n; n > 0; n-- )
+        if( B->p[n - 1] != 0 )
+            break;
+
+    mpi_sub_hlp( n, B->p, X->p );
+
+cleanup:
+
+    mbedtls_mpi_free( &TB );
+
+    return( ret );
+}
+
+/*
+ * Signed addition: X = A + B
+ */
+int mbedtls_mpi_add_mpi( mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *B )
+{
+    int ret, s = A->s;
+
+    if( A->s * B->s < 0 )
+    {
+        if( mbedtls_mpi_cmp_abs( A, B ) >= 0 )
+        {
+            MBEDTLS_MPI_CHK( mbedtls_mpi_sub_abs( X, A, B ) );
+            X->s =  s;
+        }
+        else
+        {
+            MBEDTLS_MPI_CHK( mbedtls_mpi_sub_abs( X, B, A ) );
+            X->s = -s;
+        }
+    }
+    else
+    {
+        MBEDTLS_MPI_CHK( mbedtls_mpi_add_abs( X, A, B ) );
+        X->s = s;
+    }
+
+cleanup:
+
+    return( ret );
+}
+
+/*
+ * Signed subtraction: X = A - B
+ */
+int mbedtls_mpi_sub_mpi( mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *B )
+{
+    int ret, s = A->s;
+
+    if( A->s * B->s > 0 )
+    {
+        if( mbedtls_mpi_cmp_abs( A, B ) >= 0 )
+        {
+            MBEDTLS_MPI_CHK( mbedtls_mpi_sub_abs( X, A, B ) );
+            X->s =  s;
+        }
+        else
+        {
+            MBEDTLS_MPI_CHK( mbedtls_mpi_sub_abs( X, B, A ) );
+            X->s = -s;
+        }
+    }
+    else
+    {
+        MBEDTLS_MPI_CHK( mbedtls_mpi_add_abs( X, A, B ) );
+        X->s = s;
+    }
+
+cleanup:
+
+    return( ret );
+}
+
+/*
+ * Signed addition: X = A + b
+ */
+int mbedtls_mpi_add_int( mbedtls_mpi *X, const mbedtls_mpi *A, mbedtls_mpi_sint b )
+{
+    mbedtls_mpi _B;
+    mbedtls_mpi_uint p[1];
+
+    p[0] = ( b < 0 ) ? -b : b;
+    _B.s = ( b < 0 ) ? -1 : 1;
+    _B.n = 1;
+    _B.p = p;
+
+    return( mbedtls_mpi_add_mpi( X, A, &_B ) );
+}
+
+/*
+ * Signed subtraction: X = A - b
+ */
+int mbedtls_mpi_sub_int( mbedtls_mpi *X, const mbedtls_mpi *A, mbedtls_mpi_sint b )
+{
+    mbedtls_mpi _B;
+    mbedtls_mpi_uint p[1];
+
+    p[0] = ( b < 0 ) ? -b : b;
+    _B.s = ( b < 0 ) ? -1 : 1;
+    _B.n = 1;
+    _B.p = p;
+
+    return( mbedtls_mpi_sub_mpi( X, A, &_B ) );
+}
+
+/*
+ * Helper for mbedtls_mpi multiplication
+ */
+static
+#if defined(__APPLE__) && defined(__arm__)
+/*
+ * Apple LLVM version 4.2 (clang-425.0.24) (based on LLVM 3.2svn)
+ * appears to need this to prevent bad ARM code generation at -O3.
+ */
+__attribute__ ((noinline))
+#endif
+void mpi_mul_hlp( size_t i, mbedtls_mpi_uint *s, mbedtls_mpi_uint *d, mbedtls_mpi_uint b )
+{
+    mbedtls_mpi_uint c = 0, t = 0;
+
+#if defined(MULADDC_HUIT)
+    for( ; i >= 8; i -= 8 )
+    {
+        MULADDC_INIT
+        MULADDC_HUIT
+        MULADDC_STOP
+    }
+
+    for( ; i > 0; i-- )
+    {
+        MULADDC_INIT
+        MULADDC_CORE
+        MULADDC_STOP
+    }
+#else /* MULADDC_HUIT */
+    for( ; i >= 16; i -= 16 )
+    {
+        MULADDC_INIT
+        MULADDC_CORE   MULADDC_CORE
+        MULADDC_CORE   MULADDC_CORE
+        MULADDC_CORE   MULADDC_CORE
+        MULADDC_CORE   MULADDC_CORE
+
+        MULADDC_CORE   MULADDC_CORE
+        MULADDC_CORE   MULADDC_CORE
+        MULADDC_CORE   MULADDC_CORE
+        MULADDC_CORE   MULADDC_CORE
+        MULADDC_STOP
+    }
+
+    for( ; i >= 8; i -= 8 )
+    {
+        MULADDC_INIT
+        MULADDC_CORE   MULADDC_CORE
+        MULADDC_CORE   MULADDC_CORE
+
+        MULADDC_CORE   MULADDC_CORE
+        MULADDC_CORE   MULADDC_CORE
+        MULADDC_STOP
+    }
+
+    for( ; i > 0; i-- )
+    {
+        MULADDC_INIT
+        MULADDC_CORE
+        MULADDC_STOP
+    }
+#endif /* MULADDC_HUIT */
+
+    t++;
+
+    do {
+        *d += c; c = ( *d < c ); d++;
+    }
+    while( c != 0 );
+}
+
+/*
+ * Baseline multiplication: X = A * B  (HAC 14.12)
+ */
+int mbedtls_mpi_mul_mpi( mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *B )
+{
+    int ret;
+    size_t i, j;
+    mbedtls_mpi TA, TB;
+
+    mbedtls_mpi_init( &TA ); mbedtls_mpi_init( &TB );
+
+    if( X == A ) { MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &TA, A ) ); A = &TA; }
+    if( X == B ) { MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &TB, B ) ); B = &TB; }
+
+    for( i = A->n; i > 0; i-- )
+        if( A->p[i - 1] != 0 )
+            break;
+
+    for( j = B->n; j > 0; j-- )
+        if( B->p[j - 1] != 0 )
+            break;
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_grow( X, i + j ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_lset( X, 0 ) );
+
+    for( ; j > 0; j-- )
+        mpi_mul_hlp( i, A->p, X->p + j - 1, B->p[j - 1] );
+
+    X->s = A->s * B->s;
+
+cleanup:
+
+    mbedtls_mpi_free( &TB ); mbedtls_mpi_free( &TA );
+
+    return( ret );
+}
+
+/*
+ * Baseline multiplication: X = A * b
+ */
+int mbedtls_mpi_mul_int( mbedtls_mpi *X, const mbedtls_mpi *A, mbedtls_mpi_uint b )
+{
+    mbedtls_mpi _B;
+    mbedtls_mpi_uint p[1];
+
+    _B.s = 1;
+    _B.n = 1;
+    _B.p = p;
+    p[0] = b;
+
+    return( mbedtls_mpi_mul_mpi( X, A, &_B ) );
+}
+
+/*
+ * Unsigned integer divide - double mbedtls_mpi_uint dividend, u1/u0, and
+ * mbedtls_mpi_uint divisor, d
+ */
+static mbedtls_mpi_uint mbedtls_int_div_int( mbedtls_mpi_uint u1,
+            mbedtls_mpi_uint u0, mbedtls_mpi_uint d, mbedtls_mpi_uint *r )
+{
+#if defined(MBEDTLS_HAVE_UDBL)
+    mbedtls_t_udbl dividend, quotient;
+#else
+    const mbedtls_mpi_uint radix = (mbedtls_mpi_uint) 1 << biH;
+    const mbedtls_mpi_uint uint_halfword_mask = ( (mbedtls_mpi_uint) 1 << biH ) - 1;
+    mbedtls_mpi_uint d0, d1, q0, q1, rAX, r0, quotient;
+    mbedtls_mpi_uint u0_msw, u0_lsw;
+    size_t s;
+#endif
+
+    /*
+     * Check for overflow
+     */
+    if( 0 == d || u1 >= d )
+    {
+        if (r != NULL) *r = ~0;
+
+        return ( ~0 );
+    }
+
+#if defined(MBEDTLS_HAVE_UDBL)
+    dividend  = (mbedtls_t_udbl) u1 << biL;
+    dividend |= (mbedtls_t_udbl) u0;
+    quotient = dividend / d;
+    if( quotient > ( (mbedtls_t_udbl) 1 << biL ) - 1 )
+        quotient = ( (mbedtls_t_udbl) 1 << biL ) - 1;
+
+    if( r != NULL )
+        *r = (mbedtls_mpi_uint)( dividend - (quotient * d ) );
+
+    return (mbedtls_mpi_uint) quotient;
+#else
+
+    /*
+     * Algorithm D, Section 4.3.1 - The Art of Computer Programming
+     *   Vol. 2 - Seminumerical Algorithms, Knuth
+     */
+
+    /*
+     * Normalize the divisor, d, and dividend, u0, u1
+     */
+    s = mbedtls_clz( d );
+    d = d << s;
+
+    u1 = u1 << s;
+    u1 |= ( u0 >> ( biL - s ) ) & ( -(mbedtls_mpi_sint)s >> ( biL - 1 ) );
+    u0 =  u0 << s;
+
+    d1 = d >> biH;
+    d0 = d & uint_halfword_mask;
+
+    u0_msw = u0 >> biH;
+    u0_lsw = u0 & uint_halfword_mask;
+
+    /*
+     * Find the first quotient and remainder
+     */
+    q1 = u1 / d1;
+    r0 = u1 - d1 * q1;
+
+    while( q1 >= radix || ( q1 * d0 > radix * r0 + u0_msw ) )
+    {
+        q1 -= 1;
+        r0 += d1;
+
+        if ( r0 >= radix ) break;
+    }
+
+    rAX = ( u1 * radix ) + ( u0_msw - q1 * d );
+    q0 = rAX / d1;
+    r0 = rAX - q0 * d1;
+
+    while( q0 >= radix || ( q0 * d0 > radix * r0 + u0_lsw ) )
+    {
+        q0 -= 1;
+        r0 += d1;
+
+        if ( r0 >= radix ) break;
+    }
+
+    if (r != NULL)
+        *r = ( rAX * radix + u0_lsw - q0 * d ) >> s;
+
+    quotient = q1 * radix + q0;
+
+    return quotient;
+#endif
+}
+
+/*
+ * Division by mbedtls_mpi: A = Q * B + R  (HAC 14.20)
+ */
+int mbedtls_mpi_div_mpi( mbedtls_mpi *Q, mbedtls_mpi *R, const mbedtls_mpi *A, const mbedtls_mpi *B )
+{
+    int ret;
+    size_t i, n, t, k;
+    mbedtls_mpi X, Y, Z, T1, T2;
+
+    if( mbedtls_mpi_cmp_int( B, 0 ) == 0 )
+        return( MBEDTLS_ERR_MPI_DIVISION_BY_ZERO );
+
+    mbedtls_mpi_init( &X ); mbedtls_mpi_init( &Y ); mbedtls_mpi_init( &Z );
+    mbedtls_mpi_init( &T1 ); mbedtls_mpi_init( &T2 );
+
+    if( mbedtls_mpi_cmp_abs( A, B ) < 0 )
+    {
+        if( Q != NULL ) MBEDTLS_MPI_CHK( mbedtls_mpi_lset( Q, 0 ) );
+        if( R != NULL ) MBEDTLS_MPI_CHK( mbedtls_mpi_copy( R, A ) );
+        return( 0 );
+    }
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &X, A ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &Y, B ) );
+    X.s = Y.s = 1;
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_grow( &Z, A->n + 2 ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &Z,  0 ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_grow( &T1, 2 ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_grow( &T2, 3 ) );
+
+    k = mbedtls_mpi_bitlen( &Y ) % biL;
+    if( k < biL - 1 )
+    {
+        k = biL - 1 - k;
+        MBEDTLS_MPI_CHK( mbedtls_mpi_shift_l( &X, k ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_shift_l( &Y, k ) );
+    }
+    else k = 0;
+
+    n = X.n - 1;
+    t = Y.n - 1;
+    MBEDTLS_MPI_CHK( mbedtls_mpi_shift_l( &Y, biL * ( n - t ) ) );
+
+    while( mbedtls_mpi_cmp_mpi( &X, &Y ) >= 0 )
+    {
+        Z.p[n - t]++;
+        MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &X, &X, &Y ) );
+    }
+    MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &Y, biL * ( n - t ) ) );
+
+    for( i = n; i > t ; i-- )
+    {
+        if( X.p[i] >= Y.p[t] )
+            Z.p[i - t - 1] = ~0;
+        else
+        {
+            Z.p[i - t - 1] = mbedtls_int_div_int( X.p[i], X.p[i - 1],
+                                                            Y.p[t], NULL);
+        }
+
+        Z.p[i - t - 1]++;
+        do
+        {
+            Z.p[i - t - 1]--;
+
+            MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &T1, 0 ) );
+            T1.p[0] = ( t < 1 ) ? 0 : Y.p[t - 1];
+            T1.p[1] = Y.p[t];
+            MBEDTLS_MPI_CHK( mbedtls_mpi_mul_int( &T1, &T1, Z.p[i - t - 1] ) );
+
+            MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &T2, 0 ) );
+            T2.p[0] = ( i < 2 ) ? 0 : X.p[i - 2];
+            T2.p[1] = ( i < 1 ) ? 0 : X.p[i - 1];
+            T2.p[2] = X.p[i];
+        }
+        while( mbedtls_mpi_cmp_mpi( &T1, &T2 ) > 0 );
+
+        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_int( &T1, &Y, Z.p[i - t - 1] ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_shift_l( &T1,  biL * ( i - t - 1 ) ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &X, &X, &T1 ) );
+
+        if( mbedtls_mpi_cmp_int( &X, 0 ) < 0 )
+        {
+            MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &T1, &Y ) );
+            MBEDTLS_MPI_CHK( mbedtls_mpi_shift_l( &T1, biL * ( i - t - 1 ) ) );
+            MBEDTLS_MPI_CHK( mbedtls_mpi_add_mpi( &X, &X, &T1 ) );
+            Z.p[i - t - 1]--;
+        }
+    }
+
+    if( Q != NULL )
+    {
+        MBEDTLS_MPI_CHK( mbedtls_mpi_copy( Q, &Z ) );
+        Q->s = A->s * B->s;
+    }
+
+    if( R != NULL )
+    {
+        MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &X, k ) );
+        X.s = A->s;
+        MBEDTLS_MPI_CHK( mbedtls_mpi_copy( R, &X ) );
+
+        if( mbedtls_mpi_cmp_int( R, 0 ) == 0 )
+            R->s = 1;
+    }
+
+cleanup:
+
+    mbedtls_mpi_free( &X ); mbedtls_mpi_free( &Y ); mbedtls_mpi_free( &Z );
+    mbedtls_mpi_free( &T1 ); mbedtls_mpi_free( &T2 );
+
+    return( ret );
+}
+
+/*
+ * Division by int: A = Q * b + R
+ */
+int mbedtls_mpi_div_int( mbedtls_mpi *Q, mbedtls_mpi *R, const mbedtls_mpi *A, mbedtls_mpi_sint b )
+{
+    mbedtls_mpi _B;
+    mbedtls_mpi_uint p[1];
+
+    p[0] = ( b < 0 ) ? -b : b;
+    _B.s = ( b < 0 ) ? -1 : 1;
+    _B.n = 1;
+    _B.p = p;
+
+    return( mbedtls_mpi_div_mpi( Q, R, A, &_B ) );
+}
+
+/*
+ * Modulo: R = A mod B
+ */
+int mbedtls_mpi_mod_mpi( mbedtls_mpi *R, const mbedtls_mpi *A, const mbedtls_mpi *B )
+{
+    int ret;
+
+    if( mbedtls_mpi_cmp_int( B, 0 ) < 0 )
+        return( MBEDTLS_ERR_MPI_NEGATIVE_VALUE );
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_div_mpi( NULL, R, A, B ) );
+
+    while( mbedtls_mpi_cmp_int( R, 0 ) < 0 )
+      MBEDTLS_MPI_CHK( mbedtls_mpi_add_mpi( R, R, B ) );
+
+    while( mbedtls_mpi_cmp_mpi( R, B ) >= 0 )
+      MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( R, R, B ) );
+
+cleanup:
+
+    return( ret );
+}
+
+/*
+ * Modulo: r = A mod b
+ */
+int mbedtls_mpi_mod_int( mbedtls_mpi_uint *r, const mbedtls_mpi *A, mbedtls_mpi_sint b )
+{
+    size_t i;
+    mbedtls_mpi_uint x, y, z;
+
+    if( b == 0 )
+        return( MBEDTLS_ERR_MPI_DIVISION_BY_ZERO );
+
+    if( b < 0 )
+        return( MBEDTLS_ERR_MPI_NEGATIVE_VALUE );
+
+    /*
+     * handle trivial cases
+     */
+    if( b == 1 )
+    {
+        *r = 0;
+        return( 0 );
+    }
+
+    if( b == 2 )
+    {
+        *r = A->p[0] & 1;
+        return( 0 );
+    }
+
+    /*
+     * general case
+     */
+    for( i = A->n, y = 0; i > 0; i-- )
+    {
+        x  = A->p[i - 1];
+        y  = ( y << biH ) | ( x >> biH );
+        z  = y / b;
+        y -= z * b;
+
+        x <<= biH;
+        y  = ( y << biH ) | ( x >> biH );
+        z  = y / b;
+        y -= z * b;
+    }
+
+    /*
+     * If A is negative, then the current y represents a negative value.
+     * Flipping it to the positive side.
+     */
+    if( A->s < 0 && y != 0 )
+        y = b - y;
+
+    *r = y;
+
+    return( 0 );
+}
+
+/*
+ * Fast Montgomery initialization (thanks to Tom St Denis)
+ */
+static void mpi_montg_init( mbedtls_mpi_uint *mm, const mbedtls_mpi *N )
+{
+    mbedtls_mpi_uint x, m0 = N->p[0];
+    unsigned int i;
+
+    x  = m0;
+    x += ( ( m0 + 2 ) & 4 ) << 1;
+
+    for( i = biL; i >= 8; i /= 2 )
+        x *= ( 2 - ( m0 * x ) );
+
+    *mm = ~x + 1;
+}
+
+/*
+ * Montgomery multiplication: A = A * B * R^-1 mod N  (HAC 14.36)
+ */
+static int mpi_montmul( mbedtls_mpi *A, const mbedtls_mpi *B, const mbedtls_mpi *N, mbedtls_mpi_uint mm,
+                         const mbedtls_mpi *T )
+{
+    size_t i, n, m;
+    mbedtls_mpi_uint u0, u1, *d;
+
+    if( T->n < N->n + 1 || T->p == NULL )
+        return( MBEDTLS_ERR_MPI_BAD_INPUT_DATA );
+
+    memset( T->p, 0, T->n * ciL );
+
+    d = T->p;
+    n = N->n;
+    m = ( B->n < n ) ? B->n : n;
+
+    for( i = 0; i < n; i++ )
+    {
+        /*
+         * T = (T + u0*B + u1*N) / 2^biL
+         */
+        u0 = A->p[i];
+        u1 = ( d[0] + u0 * B->p[0] ) * mm;
+
+        mpi_mul_hlp( m, B->p, d, u0 );
+        mpi_mul_hlp( n, N->p, d, u1 );
+
+        *d++ = u0; d[n + 1] = 0;
+    }
+
+    memcpy( A->p, d, ( n + 1 ) * ciL );
+
+    if( mbedtls_mpi_cmp_abs( A, N ) >= 0 )
+        mpi_sub_hlp( n, N->p, A->p );
+    else
+        /* prevent timing attacks */
+        mpi_sub_hlp( n, A->p, T->p );
+
+    return( 0 );
+}
+
+/*
+ * Montgomery reduction: A = A * R^-1 mod N
+ */
+static int mpi_montred( mbedtls_mpi *A, const mbedtls_mpi *N, mbedtls_mpi_uint mm, const mbedtls_mpi *T )
+{
+    mbedtls_mpi_uint z = 1;
+    mbedtls_mpi U;
+
+    U.n = U.s = (int) z;
+    U.p = &z;
+
+    return( mpi_montmul( A, &U, N, mm, T ) );
+}
+
+/*
+ * Sliding-window exponentiation: X = A^E mod N  (HAC 14.85)
+ */
+int mbedtls_mpi_exp_mod( mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *E, const mbedtls_mpi *N, mbedtls_mpi *_RR )
+{
+    int ret;
+    size_t wbits, wsize, one = 1;
+    size_t i, j, nblimbs;
+    size_t bufsize, nbits;
+    mbedtls_mpi_uint ei, mm, state;
+    mbedtls_mpi RR, T, W[ 2 << MBEDTLS_MPI_WINDOW_SIZE ], Apos;
+    int neg;
+
+    if( mbedtls_mpi_cmp_int( N, 0 ) <= 0 || ( N->p[0] & 1 ) == 0 )
+        return( MBEDTLS_ERR_MPI_BAD_INPUT_DATA );
+
+    if( mbedtls_mpi_cmp_int( E, 0 ) < 0 )
+        return( MBEDTLS_ERR_MPI_BAD_INPUT_DATA );
+
+    /*
+     * Init temps and window size
+     */
+    mpi_montg_init( &mm, N );
+    mbedtls_mpi_init( &RR ); mbedtls_mpi_init( &T );
+    mbedtls_mpi_init( &Apos );
+    memset( W, 0, sizeof( W ) );
+
+    i = mbedtls_mpi_bitlen( E );
+
+    wsize = ( i > 671 ) ? 6 : ( i > 239 ) ? 5 :
+            ( i >  79 ) ? 4 : ( i >  23 ) ? 3 : 1;
+
+    if( wsize > MBEDTLS_MPI_WINDOW_SIZE )
+        wsize = MBEDTLS_MPI_WINDOW_SIZE;
+
+    j = N->n + 1;
+    MBEDTLS_MPI_CHK( mbedtls_mpi_grow( X, j ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_grow( &W[1],  j ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_grow( &T, j * 2 ) );
+
+    /*
+     * Compensate for negative A (and correct at the end)
+     */
+    neg = ( A->s == -1 );
+    if( neg )
+    {
+        MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &Apos, A ) );
+        Apos.s = 1;
+        A = &Apos;
+    }
+
+    /*
+     * If 1st call, pre-compute R^2 mod N
+     */
+    if( _RR == NULL || _RR->p == NULL )
+    {
+        MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &RR, 1 ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_shift_l( &RR, N->n * 2 * biL ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi( &RR, &RR, N ) );
+
+        if( _RR != NULL )
+            memcpy( _RR, &RR, sizeof( mbedtls_mpi ) );
+    }
+    else
+        memcpy( &RR, _RR, sizeof( mbedtls_mpi ) );
+
+    /*
+     * W[1] = A * R^2 * R^-1 mod N = A * R mod N
+     */
+    if( mbedtls_mpi_cmp_mpi( A, N ) >= 0 )
+        MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi( &W[1], A, N ) );
+    else
+        MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &W[1], A ) );
+
+    MBEDTLS_MPI_CHK( mpi_montmul( &W[1], &RR, N, mm, &T ) );
+
+    /*
+     * X = R^2 * R^-1 mod N = R mod N
+     */
+    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( X, &RR ) );
+    MBEDTLS_MPI_CHK( mpi_montred( X, N, mm, &T ) );
+
+    if( wsize > 1 )
+    {
+        /*
+         * W[1 << (wsize - 1)] = W[1] ^ (wsize - 1)
+         */
+        j =  one << ( wsize - 1 );
+
+        MBEDTLS_MPI_CHK( mbedtls_mpi_grow( &W[j], N->n + 1 ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &W[j], &W[1]    ) );
+
+        for( i = 0; i < wsize - 1; i++ )
+            MBEDTLS_MPI_CHK( mpi_montmul( &W[j], &W[j], N, mm, &T ) );
+
+        /*
+         * W[i] = W[i - 1] * W[1]
+         */
+        for( i = j + 1; i < ( one << wsize ); i++ )
+        {
+            MBEDTLS_MPI_CHK( mbedtls_mpi_grow( &W[i], N->n + 1 ) );
+            MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &W[i], &W[i - 1] ) );
+
+            MBEDTLS_MPI_CHK( mpi_montmul( &W[i], &W[1], N, mm, &T ) );
+        }
+    }
+
+    nblimbs = E->n;
+    bufsize = 0;
+    nbits   = 0;
+    wbits   = 0;
+    state   = 0;
+
+    while( 1 )
+    {
+        if( bufsize == 0 )
+        {
+            if( nblimbs == 0 )
+                break;
+
+            nblimbs--;
+
+            bufsize = sizeof( mbedtls_mpi_uint ) << 3;
+        }
+
+        bufsize--;
+
+        ei = (E->p[nblimbs] >> bufsize) & 1;
+
+        /*
+         * skip leading 0s
+         */
+        if( ei == 0 && state == 0 )
+            continue;
+
+        if( ei == 0 && state == 1 )
+        {
+            /*
+             * out of window, square X
+             */
+            MBEDTLS_MPI_CHK( mpi_montmul( X, X, N, mm, &T ) );
+            continue;
+        }
+
+        /*
+         * add ei to current window
+         */
+        state = 2;
+
+        nbits++;
+        wbits |= ( ei << ( wsize - nbits ) );
+
+        if( nbits == wsize )
+        {
+            /*
+             * X = X^wsize R^-1 mod N
+             */
+            for( i = 0; i < wsize; i++ )
+                MBEDTLS_MPI_CHK( mpi_montmul( X, X, N, mm, &T ) );
+
+            /*
+             * X = X * W[wbits] R^-1 mod N
+             */
+            MBEDTLS_MPI_CHK( mpi_montmul( X, &W[wbits], N, mm, &T ) );
+
+            state--;
+            nbits = 0;
+            wbits = 0;
+        }
+    }
+
+    /*
+     * process the remaining bits
+     */
+    for( i = 0; i < nbits; i++ )
+    {
+        MBEDTLS_MPI_CHK( mpi_montmul( X, X, N, mm, &T ) );
+
+        wbits <<= 1;
+
+        if( ( wbits & ( one << wsize ) ) != 0 )
+            MBEDTLS_MPI_CHK( mpi_montmul( X, &W[1], N, mm, &T ) );
+    }
+
+    /*
+     * X = A^E * R * R^-1 mod N = A^E mod N
+     */
+    MBEDTLS_MPI_CHK( mpi_montred( X, N, mm, &T ) );
+
+    if( neg && E->n != 0 && ( E->p[0] & 1 ) != 0 )
+    {
+        X->s = -1;
+        MBEDTLS_MPI_CHK( mbedtls_mpi_add_mpi( X, N, X ) );
+    }
+
+cleanup:
+
+    for( i = ( one << ( wsize - 1 ) ); i < ( one << wsize ); i++ )
+        mbedtls_mpi_free( &W[i] );
+
+    mbedtls_mpi_free( &W[1] ); mbedtls_mpi_free( &T ); mbedtls_mpi_free( &Apos );
+
+    if( _RR == NULL || _RR->p == NULL )
+        mbedtls_mpi_free( &RR );
+
+    return( ret );
+}
+
+/*
+ * Greatest common divisor: G = gcd(A, B)  (HAC 14.54)
+ */
+int mbedtls_mpi_gcd( mbedtls_mpi *G, const mbedtls_mpi *A, const mbedtls_mpi *B )
+{
+    int ret;
+    size_t lz, lzt;
+    mbedtls_mpi TG, TA, TB;
+
+    mbedtls_mpi_init( &TG ); mbedtls_mpi_init( &TA ); mbedtls_mpi_init( &TB );
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &TA, A ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &TB, B ) );
+
+    lz = mbedtls_mpi_lsb( &TA );
+    lzt = mbedtls_mpi_lsb( &TB );
+
+    if( lzt < lz )
+        lz = lzt;
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &TA, lz ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &TB, lz ) );
+
+    TA.s = TB.s = 1;
+
+    while( mbedtls_mpi_cmp_int( &TA, 0 ) != 0 )
+    {
+        MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &TA, mbedtls_mpi_lsb( &TA ) ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &TB, mbedtls_mpi_lsb( &TB ) ) );
+
+        if( mbedtls_mpi_cmp_mpi( &TA, &TB ) >= 0 )
+        {
+            MBEDTLS_MPI_CHK( mbedtls_mpi_sub_abs( &TA, &TA, &TB ) );
+            MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &TA, 1 ) );
+        }
+        else
+        {
+            MBEDTLS_MPI_CHK( mbedtls_mpi_sub_abs( &TB, &TB, &TA ) );
+            MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &TB, 1 ) );
+        }
+    }
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_shift_l( &TB, lz ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( G, &TB ) );
+
+cleanup:
+
+    mbedtls_mpi_free( &TG ); mbedtls_mpi_free( &TA ); mbedtls_mpi_free( &TB );
+
+    return( ret );
+}
+
+/*
+ * Fill X with size bytes of random.
+ *
+ * Use a temporary bytes representation to make sure the result is the same
+ * regardless of the platform endianness (useful when f_rng is actually
+ * deterministic, eg for tests).
+ */
+int mbedtls_mpi_fill_random( mbedtls_mpi *X, size_t size,
+                     int (*f_rng)(void *, unsigned char *, size_t),
+                     void *p_rng )
+{
+    int ret;
+    unsigned char buf[MBEDTLS_MPI_MAX_SIZE];
+
+    if( size > MBEDTLS_MPI_MAX_SIZE )
+        return( MBEDTLS_ERR_MPI_BAD_INPUT_DATA );
+
+    MBEDTLS_MPI_CHK( f_rng( p_rng, buf, size ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_read_binary( X, buf, size ) );
+
+cleanup:
+    mbedtls_platform_zeroize( buf, sizeof( buf ) );
+    return( ret );
+}
+
+/*
+ * Modular inverse: X = A^-1 mod N  (HAC 14.61 / 14.64)
+ */
+int mbedtls_mpi_inv_mod( mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *N )
+{
+    int ret;
+    mbedtls_mpi G, TA, TU, U1, U2, TB, TV, V1, V2;
+
+    if( mbedtls_mpi_cmp_int( N, 1 ) <= 0 )
+        return( MBEDTLS_ERR_MPI_BAD_INPUT_DATA );
+
+    mbedtls_mpi_init( &TA ); mbedtls_mpi_init( &TU ); mbedtls_mpi_init( &U1 ); mbedtls_mpi_init( &U2 );
+    mbedtls_mpi_init( &G ); mbedtls_mpi_init( &TB ); mbedtls_mpi_init( &TV );
+    mbedtls_mpi_init( &V1 ); mbedtls_mpi_init( &V2 );
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_gcd( &G, A, N ) );
+
+    if( mbedtls_mpi_cmp_int( &G, 1 ) != 0 )
+    {
+        ret = MBEDTLS_ERR_MPI_NOT_ACCEPTABLE;
+        goto cleanup;
+    }
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi( &TA, A, N ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &TU, &TA ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &TB, N ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &TV, N ) );
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &U1, 1 ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &U2, 0 ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &V1, 0 ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &V2, 1 ) );
+
+    do
+    {
+        while( ( TU.p[0] & 1 ) == 0 )
+        {
+            MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &TU, 1 ) );
+
+            if( ( U1.p[0] & 1 ) != 0 || ( U2.p[0] & 1 ) != 0 )
+            {
+                MBEDTLS_MPI_CHK( mbedtls_mpi_add_mpi( &U1, &U1, &TB ) );
+                MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &U2, &U2, &TA ) );
+            }
+
+            MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &U1, 1 ) );
+            MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &U2, 1 ) );
+        }
+
+        while( ( TV.p[0] & 1 ) == 0 )
+        {
+            MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &TV, 1 ) );
+
+            if( ( V1.p[0] & 1 ) != 0 || ( V2.p[0] & 1 ) != 0 )
+            {
+                MBEDTLS_MPI_CHK( mbedtls_mpi_add_mpi( &V1, &V1, &TB ) );
+                MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &V2, &V2, &TA ) );
+            }
+
+            MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &V1, 1 ) );
+            MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &V2, 1 ) );
+        }
+
+        if( mbedtls_mpi_cmp_mpi( &TU, &TV ) >= 0 )
+        {
+            MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &TU, &TU, &TV ) );
+            MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &U1, &U1, &V1 ) );
+            MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &U2, &U2, &V2 ) );
+        }
+        else
+        {
+            MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &TV, &TV, &TU ) );
+            MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &V1, &V1, &U1 ) );
+            MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &V2, &V2, &U2 ) );
+        }
+    }
+    while( mbedtls_mpi_cmp_int( &TU, 0 ) != 0 );
+
+    while( mbedtls_mpi_cmp_int( &V1, 0 ) < 0 )
+        MBEDTLS_MPI_CHK( mbedtls_mpi_add_mpi( &V1, &V1, N ) );
+
+    while( mbedtls_mpi_cmp_mpi( &V1, N ) >= 0 )
+        MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &V1, &V1, N ) );
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( X, &V1 ) );
+
+cleanup:
+
+    mbedtls_mpi_free( &TA ); mbedtls_mpi_free( &TU ); mbedtls_mpi_free( &U1 ); mbedtls_mpi_free( &U2 );
+    mbedtls_mpi_free( &G ); mbedtls_mpi_free( &TB ); mbedtls_mpi_free( &TV );
+    mbedtls_mpi_free( &V1 ); mbedtls_mpi_free( &V2 );
+
+    return( ret );
+}
+
+#if defined(MBEDTLS_GENPRIME)
+
+static const int small_prime[] =
+{
+        3,    5,    7,   11,   13,   17,   19,   23,
+       29,   31,   37,   41,   43,   47,   53,   59,
+       61,   67,   71,   73,   79,   83,   89,   97,
+      101,  103,  107,  109,  113,  127,  131,  137,
+      139,  149,  151,  157,  163,  167,  173,  179,
+      181,  191,  193,  197,  199,  211,  223,  227,
+      229,  233,  239,  241,  251,  257,  263,  269,
+      271,  277,  281,  283,  293,  307,  311,  313,
+      317,  331,  337,  347,  349,  353,  359,  367,
+      373,  379,  383,  389,  397,  401,  409,  419,
+      421,  431,  433,  439,  443,  449,  457,  461,
+      463,  467,  479,  487,  491,  499,  503,  509,
+      521,  523,  541,  547,  557,  563,  569,  571,
+      577,  587,  593,  599,  601,  607,  613,  617,
+      619,  631,  641,  643,  647,  653,  659,  661,
+      673,  677,  683,  691,  701,  709,  719,  727,
+      733,  739,  743,  751,  757,  761,  769,  773,
+      787,  797,  809,  811,  821,  823,  827,  829,
+      839,  853,  857,  859,  863,  877,  881,  883,
+      887,  907,  911,  919,  929,  937,  941,  947,
+      953,  967,  971,  977,  983,  991,  997, -103
+};
+
+/*
+ * Small divisors test (X must be positive)
+ *
+ * Return values:
+ * 0: no small factor (possible prime, more tests needed)
+ * 1: certain prime
+ * MBEDTLS_ERR_MPI_NOT_ACCEPTABLE: certain non-prime
+ * other negative: error
+ */
+static int mpi_check_small_factors( const mbedtls_mpi *X )
+{
+    int ret = 0;
+    size_t i;
+    mbedtls_mpi_uint r;
+
+    if( ( X->p[0] & 1 ) == 0 )
+        return( MBEDTLS_ERR_MPI_NOT_ACCEPTABLE );
+
+    for( i = 0; small_prime[i] > 0; i++ )
+    {
+        if( mbedtls_mpi_cmp_int( X, small_prime[i] ) <= 0 )
+            return( 1 );
+
+        MBEDTLS_MPI_CHK( mbedtls_mpi_mod_int( &r, X, small_prime[i] ) );
+
+        if( r == 0 )
+            return( MBEDTLS_ERR_MPI_NOT_ACCEPTABLE );
+    }
+
+cleanup:
+    return( ret );
+}
+
+/*
+ * Miller-Rabin pseudo-primality test  (HAC 4.24)
+ */
+static int mpi_miller_rabin( const mbedtls_mpi *X,
+                             int (*f_rng)(void *, unsigned char *, size_t),
+                             void *p_rng )
+{
+    int ret, count;
+    size_t i, j, k, n, s;
+    mbedtls_mpi W, R, T, A, RR;
+
+    mbedtls_mpi_init( &W ); mbedtls_mpi_init( &R ); mbedtls_mpi_init( &T ); mbedtls_mpi_init( &A );
+    mbedtls_mpi_init( &RR );
+
+    /*
+     * W = |X| - 1
+     * R = W >> lsb( W )
+     */
+    MBEDTLS_MPI_CHK( mbedtls_mpi_sub_int( &W, X, 1 ) );
+    s = mbedtls_mpi_lsb( &W );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &R, &W ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &R, s ) );
+
+    i = mbedtls_mpi_bitlen( X );
+    /*
+     * HAC, table 4.4
+     */
+    n = ( ( i >= 1300 ) ?  2 : ( i >=  850 ) ?  3 :
+          ( i >=  650 ) ?  4 : ( i >=  350 ) ?  8 :
+          ( i >=  250 ) ? 12 : ( i >=  150 ) ? 18 : 27 );
+
+    for( i = 0; i < n; i++ )
+    {
+        /*
+         * pick a random A, 1 < A < |X| - 1
+         */
+        MBEDTLS_MPI_CHK( mbedtls_mpi_fill_random( &A, X->n * ciL, f_rng, p_rng ) );
+
+        if( mbedtls_mpi_cmp_mpi( &A, &W ) >= 0 )
+        {
+            j = mbedtls_mpi_bitlen( &A ) - mbedtls_mpi_bitlen( &W );
+            MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &A, j + 1 ) );
+        }
+        A.p[0] |= 3;
+
+        count = 0;
+        do {
+            MBEDTLS_MPI_CHK( mbedtls_mpi_fill_random( &A, X->n * ciL, f_rng, p_rng ) );
+
+            j = mbedtls_mpi_bitlen( &A );
+            k = mbedtls_mpi_bitlen( &W );
+            if (j > k) {
+                MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &A, j - k ) );
+            }
+
+            if (count++ > 30) {
+                return MBEDTLS_ERR_MPI_NOT_ACCEPTABLE;
+            }
+
+        } while ( mbedtls_mpi_cmp_mpi( &A, &W ) >= 0 ||
+                  mbedtls_mpi_cmp_int( &A, 1 )  <= 0    );
+
+        /*
+         * A = A^R mod |X|
+         */
+        MBEDTLS_MPI_CHK( mbedtls_mpi_exp_mod( &A, &A, &R, X, &RR ) );
+
+        if( mbedtls_mpi_cmp_mpi( &A, &W ) == 0 ||
+            mbedtls_mpi_cmp_int( &A,  1 ) == 0 )
+            continue;
+
+        j = 1;
+        while( j < s && mbedtls_mpi_cmp_mpi( &A, &W ) != 0 )
+        {
+            /*
+             * A = A * A mod |X|
+             */
+            MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &T, &A, &A ) );
+            MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi( &A, &T, X  ) );
+
+            if( mbedtls_mpi_cmp_int( &A, 1 ) == 0 )
+                break;
+
+            j++;
+        }
+
+        /*
+         * not prime if A != |X| - 1 or A == 1
+         */
+        if( mbedtls_mpi_cmp_mpi( &A, &W ) != 0 ||
+            mbedtls_mpi_cmp_int( &A,  1 ) == 0 )
+        {
+            ret = MBEDTLS_ERR_MPI_NOT_ACCEPTABLE;
+            break;
+        }
+    }
+
+cleanup:
+    mbedtls_mpi_free( &W ); mbedtls_mpi_free( &R ); mbedtls_mpi_free( &T ); mbedtls_mpi_free( &A );
+    mbedtls_mpi_free( &RR );
+
+    return( ret );
+}
+
+/*
+ * Pseudo-primality test: small factors, then Miller-Rabin
+ */
+int mbedtls_mpi_is_prime( const mbedtls_mpi *X,
+                  int (*f_rng)(void *, unsigned char *, size_t),
+                  void *p_rng )
+{
+    int ret;
+    mbedtls_mpi XX;
+
+    XX.s = 1;
+    XX.n = X->n;
+    XX.p = X->p;
+
+    if( mbedtls_mpi_cmp_int( &XX, 0 ) == 0 ||
+        mbedtls_mpi_cmp_int( &XX, 1 ) == 0 )
+        return( MBEDTLS_ERR_MPI_NOT_ACCEPTABLE );
+
+    if( mbedtls_mpi_cmp_int( &XX, 2 ) == 0 )
+        return( 0 );
+
+    if( ( ret = mpi_check_small_factors( &XX ) ) != 0 )
+    {
+        if( ret == 1 )
+            return( 0 );
+
+        return( ret );
+    }
+
+    return( mpi_miller_rabin( &XX, f_rng, p_rng ) );
+}
+
+/*
+ * Prime number generation
+ *
+ * If dh_flag is 0 and nbits is at least 1024, then the procedure
+ * follows the RSA probably-prime generation method of FIPS 186-4.
+ * NB. FIPS 186-4 only allows the specific bit lengths of 1024 and 1536.
+ */
+int mbedtls_mpi_gen_prime( mbedtls_mpi *X, size_t nbits, int dh_flag,
+                   int (*f_rng)(void *, unsigned char *, size_t),
+                   void *p_rng )
+{
+#ifdef MBEDTLS_HAVE_INT64
+// ceil(2^63.5)
+#define CEIL_MAXUINT_DIV_SQRT2 0xb504f333f9de6485ULL
+#else
+// ceil(2^31.5)
+#define CEIL_MAXUINT_DIV_SQRT2 0xb504f334U
+#endif
+    int ret = MBEDTLS_ERR_MPI_NOT_ACCEPTABLE;
+    size_t k, n;
+    mbedtls_mpi_uint r;
+    mbedtls_mpi Y;
+
+    if( nbits < 3 || nbits > MBEDTLS_MPI_MAX_BITS )
+        return( MBEDTLS_ERR_MPI_BAD_INPUT_DATA );
+
+    mbedtls_mpi_init( &Y );
+
+    n = BITS_TO_LIMBS( nbits );
+
+    while( 1 )
+    {
+        MBEDTLS_MPI_CHK( mbedtls_mpi_fill_random( X, n * ciL, f_rng, p_rng ) );
+        /* make sure generated number is at least (nbits-1)+0.5 bits (FIPS 186-4 §B.3.3 steps 4.4, 5.5) */
+        if( X->p[n-1] < CEIL_MAXUINT_DIV_SQRT2 ) continue;
+
+        k = n * biL;
+        if( k > nbits ) MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( X, k - nbits ) );
+        X->p[0] |= 1;
+
+        if( dh_flag == 0 )
+        {
+            ret = mbedtls_mpi_is_prime( X, f_rng, p_rng );
+
+            if( ret != MBEDTLS_ERR_MPI_NOT_ACCEPTABLE )
+                goto cleanup;
+        }
+        else
+        {
+            /*
+             * An necessary condition for Y and X = 2Y + 1 to be prime
+             * is X = 2 mod 3 (which is equivalent to Y = 2 mod 3).
+             * Make sure it is satisfied, while keeping X = 3 mod 4
+             */
+
+            X->p[0] |= 2;
+
+            MBEDTLS_MPI_CHK( mbedtls_mpi_mod_int( &r, X, 3 ) );
+            if( r == 0 )
+                MBEDTLS_MPI_CHK( mbedtls_mpi_add_int( X, X, 8 ) );
+            else if( r == 1 )
+                MBEDTLS_MPI_CHK( mbedtls_mpi_add_int( X, X, 4 ) );
+
+            /* Set Y = (X-1) / 2, which is X / 2 because X is odd */
+            MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &Y, X ) );
+            MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &Y, 1 ) );
+
+            while( 1 )
+            {
+                /*
+                 * First, check small factors for X and Y
+                 * before doing Miller-Rabin on any of them
+                 */
+                if( ( ret = mpi_check_small_factors(  X         ) ) == 0 &&
+                    ( ret = mpi_check_small_factors( &Y         ) ) == 0 &&
+                    ( ret = mpi_miller_rabin(  X, f_rng, p_rng  ) ) == 0 &&
+                    ( ret = mpi_miller_rabin( &Y, f_rng, p_rng  ) ) == 0 )
+                    goto cleanup;
+
+                if( ret != MBEDTLS_ERR_MPI_NOT_ACCEPTABLE )
+                    goto cleanup;
+
+                /*
+                 * Next candidates. We want to preserve Y = (X-1) / 2 and
+                 * Y = 1 mod 2 and Y = 2 mod 3 (eq X = 3 mod 4 and X = 2 mod 3)
+                 * so up Y by 6 and X by 12.
+                 */
+                MBEDTLS_MPI_CHK( mbedtls_mpi_add_int(  X,  X, 12 ) );
+                MBEDTLS_MPI_CHK( mbedtls_mpi_add_int( &Y, &Y, 6  ) );
+            }
+        }
+    }
+
+cleanup:
+
+    mbedtls_mpi_free( &Y );
+
+    return( ret );
+}
+
+#endif /* MBEDTLS_GENPRIME */
+
+#if defined(MBEDTLS_SELF_TEST)
+
+#define GCD_PAIR_COUNT  3
+
+static const int gcd_pairs[GCD_PAIR_COUNT][3] =
+{
+    { 693, 609, 21 },
+    { 1764, 868, 28 },
+    { 768454923, 542167814, 1 }
+};
+
+/*
+ * Checkup routine
+ */
+int mbedtls_mpi_self_test( int verbose )
+{
+    int ret, i;
+    mbedtls_mpi A, E, N, X, Y, U, V;
+
+    mbedtls_mpi_init( &A ); mbedtls_mpi_init( &E ); mbedtls_mpi_init( &N ); mbedtls_mpi_init( &X );
+    mbedtls_mpi_init( &Y ); mbedtls_mpi_init( &U ); mbedtls_mpi_init( &V );
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_read_string( &A, 16,
+        "EFE021C2645FD1DC586E69184AF4A31E" \
+        "D5F53E93B5F123FA41680867BA110131" \
+        "944FE7952E2517337780CB0DB80E61AA" \
+        "E7C8DDC6C5C6AADEB34EB38A2F40D5E6" ) );
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_read_string( &E, 16,
+        "B2E7EFD37075B9F03FF989C7C5051C20" \
+        "34D2A323810251127E7BF8625A4F49A5" \
+        "F3E27F4DA8BD59C47D6DAABA4C8127BD" \
+        "5B5C25763222FEFCCFC38B832366C29E" ) );
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_read_string( &N, 16,
+        "0066A198186C18C10B2F5ED9B522752A" \
+        "9830B69916E535C8F047518A889A43A5" \
+        "94B6BED27A168D31D4A52F88925AA8F5" ) );
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &X, &A, &N ) );
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_read_string( &U, 16,
+        "602AB7ECA597A3D6B56FF9829A5E8B85" \
+        "9E857EA95A03512E2BAE7391688D264A" \
+        "A5663B0341DB9CCFD2C4C5F421FEC814" \
+        "8001B72E848A38CAE1C65F78E56ABDEF" \
+        "E12D3C039B8A02D6BE593F0BBBDA56F1" \
+        "ECF677152EF804370C1A305CAF3B5BF1" \
+        "30879B56C61DE584A0F53A2447A51E" ) );
+
+    if( verbose != 0 )
+        mbedtls_printf( "  MPI test #1 (mul_mpi): " );
+
+    if( mbedtls_mpi_cmp_mpi( &X, &U ) != 0 )
+    {
+        if( verbose != 0 )
+            mbedtls_printf( "failed\n" );
+
+        ret = 1;
+        goto cleanup;
+    }
+
+    if( verbose != 0 )
+        mbedtls_printf( "passed\n" );
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_div_mpi( &X, &Y, &A, &N ) );
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_read_string( &U, 16,
+        "256567336059E52CAE22925474705F39A94" ) );
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_read_string( &V, 16,
+        "6613F26162223DF488E9CD48CC132C7A" \
+        "0AC93C701B001B092E4E5B9F73BCD27B" \
+        "9EE50D0657C77F374E903CDFA4C642" ) );
+
+    if( verbose != 0 )
+        mbedtls_printf( "  MPI test #2 (div_mpi): " );
+
+    if( mbedtls_mpi_cmp_mpi( &X, &U ) != 0 ||
+        mbedtls_mpi_cmp_mpi( &Y, &V ) != 0 )
+    {
+        if( verbose != 0 )
+            mbedtls_printf( "failed\n" );
+
+        ret = 1;
+        goto cleanup;
+    }
+
+    if( verbose != 0 )
+        mbedtls_printf( "passed\n" );
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_exp_mod( &X, &A, &E, &N, NULL ) );
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_read_string( &U, 16,
+        "36E139AEA55215609D2816998ED020BB" \
+        "BD96C37890F65171D948E9BC7CBAA4D9" \
+        "325D24D6A3C12710F10A09FA08AB87" ) );
+
+    if( verbose != 0 )
+        mbedtls_printf( "  MPI test #3 (exp_mod): " );
+
+    if( mbedtls_mpi_cmp_mpi( &X, &U ) != 0 )
+    {
+        if( verbose != 0 )
+            mbedtls_printf( "failed\n" );
+
+        ret = 1;
+        goto cleanup;
+    }
+
+    if( verbose != 0 )
+        mbedtls_printf( "passed\n" );
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_inv_mod( &X, &A, &N ) );
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_read_string( &U, 16,
+        "003A0AAEDD7E784FC07D8F9EC6E3BFD5" \
+        "C3DBA76456363A10869622EAC2DD84EC" \
+        "C5B8A74DAC4D09E03B5E0BE779F2DF61" ) );
+
+    if( verbose != 0 )
+        mbedtls_printf( "  MPI test #4 (inv_mod): " );
+
+    if( mbedtls_mpi_cmp_mpi( &X, &U ) != 0 )
+    {
+        if( verbose != 0 )
+            mbedtls_printf( "failed\n" );
+
+        ret = 1;
+        goto cleanup;
+    }
+
+    if( verbose != 0 )
+        mbedtls_printf( "passed\n" );
+
+    if( verbose != 0 )
+        mbedtls_printf( "  MPI test #5 (simple gcd): " );
+
+    for( i = 0; i < GCD_PAIR_COUNT; i++ )
+    {
+        MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &X, gcd_pairs[i][0] ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &Y, gcd_pairs[i][1] ) );
+
+        MBEDTLS_MPI_CHK( mbedtls_mpi_gcd( &A, &X, &Y ) );
+
+        if( mbedtls_mpi_cmp_int( &A, gcd_pairs[i][2] ) != 0 )
+        {
+            if( verbose != 0 )
+                mbedtls_printf( "failed at %d\n", i );
+
+            ret = 1;
+            goto cleanup;
+        }
+    }
+
+    if( verbose != 0 )
+        mbedtls_printf( "passed\n" );
+
+cleanup:
+
+    if( ret != 0 && verbose != 0 )
+        mbedtls_printf( "Unexpected error, return code = %08X\n", ret );
+
+    mbedtls_mpi_free( &A ); mbedtls_mpi_free( &E ); mbedtls_mpi_free( &N ); mbedtls_mpi_free( &X );
+    mbedtls_mpi_free( &Y ); mbedtls_mpi_free( &U ); mbedtls_mpi_free( &V );
+
+    if( verbose != 0 )
+        mbedtls_printf( "\n" );
+
+    return( ret );
+}
+
+#endif /* MBEDTLS_SELF_TEST */
+
+#endif /* MBEDTLS_BIGNUM_C */
diff --git a/common/mbedtls/bignum.h b/common/mbedtls/bignum.h
new file mode 100644
index 000000000..00787908c
--- /dev/null
+++ b/common/mbedtls/bignum.h
@@ -0,0 +1,774 @@
+/**
+ * \file bignum.h
+ *
+ * \brief Multi-precision integer library
+ */
+/*
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+#ifndef MBEDTLS_BIGNUM_H
+#define MBEDTLS_BIGNUM_H
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#include <stddef.h>
+#include <stdint.h>
+
+#if defined(MBEDTLS_FS_IO)
+#include <stdio.h>
+#endif
+
+#define MBEDTLS_ERR_MPI_FILE_IO_ERROR                     -0x0002  /**< An error occurred while reading from or writing to a file. */
+#define MBEDTLS_ERR_MPI_BAD_INPUT_DATA                    -0x0004  /**< Bad input parameters to function. */
+#define MBEDTLS_ERR_MPI_INVALID_CHARACTER                 -0x0006  /**< There is an invalid character in the digit string. */
+#define MBEDTLS_ERR_MPI_BUFFER_TOO_SMALL                  -0x0008  /**< The buffer is too small to write to. */
+#define MBEDTLS_ERR_MPI_NEGATIVE_VALUE                    -0x000A  /**< The input arguments are negative or result in illegal output. */
+#define MBEDTLS_ERR_MPI_DIVISION_BY_ZERO                  -0x000C  /**< The input argument for division is zero, which is not allowed. */
+#define MBEDTLS_ERR_MPI_NOT_ACCEPTABLE                    -0x000E  /**< The input arguments are not acceptable. */
+#define MBEDTLS_ERR_MPI_ALLOC_FAILED                      -0x0010  /**< Memory allocation failed. */
+
+#define MBEDTLS_MPI_CHK(f) do { if( ( ret = f ) != 0 ) goto cleanup; } while( 0 )
+
+/*
+ * Maximum size MPIs are allowed to grow to in number of limbs.
+ */
+#define MBEDTLS_MPI_MAX_LIMBS                             10000
+
+#if !defined(MBEDTLS_MPI_WINDOW_SIZE)
+/*
+ * Maximum window size used for modular exponentiation. Default: 6
+ * Minimum value: 1. Maximum value: 6.
+ *
+ * Result is an array of ( 2 << MBEDTLS_MPI_WINDOW_SIZE ) MPIs used
+ * for the sliding window calculation. (So 64 by default)
+ *
+ * Reduction in size, reduces speed.
+ */
+#define MBEDTLS_MPI_WINDOW_SIZE                           6        /**< Maximum windows size used. */
+#endif /* !MBEDTLS_MPI_WINDOW_SIZE */
+
+#if !defined(MBEDTLS_MPI_MAX_SIZE)
+/*
+ * Maximum size of MPIs allowed in bits and bytes for user-MPIs.
+ * ( Default: 512 bytes => 4096 bits, Maximum tested: 2048 bytes => 16384 bits )
+ *
+ * Note: Calculations can temporarily result in larger MPIs. So the number
+ * of limbs required (MBEDTLS_MPI_MAX_LIMBS) is higher.
+ */
+#define MBEDTLS_MPI_MAX_SIZE                              1024     /**< Maximum number of bytes for usable MPIs. */
+#endif /* !MBEDTLS_MPI_MAX_SIZE */
+
+#define MBEDTLS_MPI_MAX_BITS                              ( 8 * MBEDTLS_MPI_MAX_SIZE )    /**< Maximum number of bits for usable MPIs. */
+
+/*
+ * When reading from files with mbedtls_mpi_read_file() and writing to files with
+ * mbedtls_mpi_write_file() the buffer should have space
+ * for a (short) label, the MPI (in the provided radix), the newline
+ * characters and the '\0'.
+ *
+ * By default we assume at least a 10 char label, a minimum radix of 10
+ * (decimal) and a maximum of 4096 bit numbers (1234 decimal chars).
+ * Autosized at compile time for at least a 10 char label, a minimum radix
+ * of 10 (decimal) for a number of MBEDTLS_MPI_MAX_BITS size.
+ *
+ * This used to be statically sized to 1250 for a maximum of 4096 bit
+ * numbers (1234 decimal chars).
+ *
+ * Calculate using the formula:
+ *  MBEDTLS_MPI_RW_BUFFER_SIZE = ceil(MBEDTLS_MPI_MAX_BITS / ln(10) * ln(2)) +
+ *                                LabelSize + 6
+ */
+#define MBEDTLS_MPI_MAX_BITS_SCALE100          ( 100 * MBEDTLS_MPI_MAX_BITS )
+#define MBEDTLS_LN_2_DIV_LN_10_SCALE100                 332
+#define MBEDTLS_MPI_RW_BUFFER_SIZE             ( ((MBEDTLS_MPI_MAX_BITS_SCALE100 + MBEDTLS_LN_2_DIV_LN_10_SCALE100 - 1) / MBEDTLS_LN_2_DIV_LN_10_SCALE100) + 10 + 6 )
+
+/*
+ * Define the base integer type, architecture-wise.
+ *
+ * 32 or 64-bit integer types can be forced regardless of the underlying
+ * architecture by defining MBEDTLS_HAVE_INT32 or MBEDTLS_HAVE_INT64
+ * respectively and undefining MBEDTLS_HAVE_ASM.
+ *
+ * Double-width integers (e.g. 128-bit in 64-bit architectures) can be
+ * disabled by defining MBEDTLS_NO_UDBL_DIVISION.
+ */
+#if !defined(MBEDTLS_HAVE_INT32)
+    #if defined(_MSC_VER) && defined(_M_AMD64)
+        /* Always choose 64-bit when using MSC */
+        #if !defined(MBEDTLS_HAVE_INT64)
+            #define MBEDTLS_HAVE_INT64
+        #endif /* !MBEDTLS_HAVE_INT64 */
+        typedef  int64_t mbedtls_mpi_sint;
+        typedef uint64_t mbedtls_mpi_uint;
+    #elif defined(__GNUC__) && (                         \
+        defined(__amd64__) || defined(__x86_64__)     || \
+        defined(__ppc64__) || defined(__powerpc64__)  || \
+        defined(__ia64__)  || defined(__alpha__)      || \
+        ( defined(__sparc__) && defined(__arch64__) ) || \
+        defined(__s390x__) || defined(__mips64) )
+        #if !defined(MBEDTLS_HAVE_INT64)
+            #define MBEDTLS_HAVE_INT64
+        #endif /* MBEDTLS_HAVE_INT64 */
+        typedef  int64_t mbedtls_mpi_sint;
+        typedef uint64_t mbedtls_mpi_uint;
+        #if !defined(MBEDTLS_NO_UDBL_DIVISION)
+            /* mbedtls_t_udbl defined as 128-bit unsigned int */
+            typedef unsigned int mbedtls_t_udbl __attribute__((mode(TI)));
+            #define MBEDTLS_HAVE_UDBL
+        #endif /* !MBEDTLS_NO_UDBL_DIVISION */
+    #elif defined(__ARMCC_VERSION) && defined(__aarch64__)
+        /*
+         * __ARMCC_VERSION is defined for both armcc and armclang and
+         * __aarch64__ is only defined by armclang when compiling 64-bit code
+         */
+        #if !defined(MBEDTLS_HAVE_INT64)
+            #define MBEDTLS_HAVE_INT64
+        #endif /* !MBEDTLS_HAVE_INT64 */
+        typedef  int64_t mbedtls_mpi_sint;
+        typedef uint64_t mbedtls_mpi_uint;
+        #if !defined(MBEDTLS_NO_UDBL_DIVISION)
+            /* mbedtls_t_udbl defined as 128-bit unsigned int */
+            typedef __uint128_t mbedtls_t_udbl;
+            #define MBEDTLS_HAVE_UDBL
+        #endif /* !MBEDTLS_NO_UDBL_DIVISION */
+    #elif defined(MBEDTLS_HAVE_INT64)
+        /* Force 64-bit integers with unknown compiler */
+        typedef  int64_t mbedtls_mpi_sint;
+        typedef uint64_t mbedtls_mpi_uint;
+    #endif
+#endif /* !MBEDTLS_HAVE_INT32 */
+
+#if !defined(MBEDTLS_HAVE_INT64)
+    /* Default to 32-bit compilation */
+    #if !defined(MBEDTLS_HAVE_INT32)
+        #define MBEDTLS_HAVE_INT32
+    #endif /* !MBEDTLS_HAVE_INT32 */
+    typedef  int32_t mbedtls_mpi_sint;
+    typedef uint32_t mbedtls_mpi_uint;
+    #if !defined(MBEDTLS_NO_UDBL_DIVISION)
+        typedef uint64_t mbedtls_t_udbl;
+        #define MBEDTLS_HAVE_UDBL
+    #endif /* !MBEDTLS_NO_UDBL_DIVISION */
+#endif /* !MBEDTLS_HAVE_INT64 */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \brief          MPI structure
+ */
+typedef struct mbedtls_mpi
+{
+    int s;              /*!<  integer sign      */
+    size_t n;           /*!<  total # of limbs  */
+    mbedtls_mpi_uint *p;          /*!<  pointer to limbs  */
+}
+mbedtls_mpi;
+
+/**
+ * \brief           Initialize one MPI (make internal references valid)
+ *                  This just makes it ready to be set or freed,
+ *                  but does not define a value for the MPI.
+ *
+ * \param X         One MPI to initialize.
+ */
+void mbedtls_mpi_init( mbedtls_mpi *X );
+
+/**
+ * \brief          Unallocate one MPI
+ *
+ * \param X        One MPI to unallocate.
+ */
+void mbedtls_mpi_free( mbedtls_mpi *X );
+
+/**
+ * \brief          Enlarge to the specified number of limbs
+ *
+ *                 This function does nothing if the MPI is already large enough.
+ *
+ * \param X        MPI to grow
+ * \param nblimbs  The target number of limbs
+ *
+ * \return         0 if successful,
+ *                 MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed
+ */
+int mbedtls_mpi_grow( mbedtls_mpi *X, size_t nblimbs );
+
+/**
+ * \brief          Resize down, keeping at least the specified number of limbs
+ *
+ *                 If \c X is smaller than \c nblimbs, it is resized up
+ *                 instead.
+ *
+ * \param X        MPI to shrink
+ * \param nblimbs  The minimum number of limbs to keep
+ *
+ * \return         0 if successful,
+ *                 MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed
+ *                 (this can only happen when resizing up).
+ */
+int mbedtls_mpi_shrink( mbedtls_mpi *X, size_t nblimbs );
+
+/**
+ * \brief          Copy the contents of Y into X
+ *
+ * \param X        Destination MPI. It is enlarged if necessary.
+ * \param Y        Source MPI.
+ *
+ * \return         0 if successful,
+ *                 MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed
+ */
+int mbedtls_mpi_copy( mbedtls_mpi *X, const mbedtls_mpi *Y );
+
+/**
+ * \brief          Swap the contents of X and Y
+ *
+ * \param X        First MPI value
+ * \param Y        Second MPI value
+ */
+void mbedtls_mpi_swap( mbedtls_mpi *X, mbedtls_mpi *Y );
+
+/**
+ * \brief          Safe conditional assignement X = Y if assign is 1
+ *
+ * \param X        MPI to conditionally assign to
+ * \param Y        Value to be assigned
+ * \param assign   1: perform the assignment, 0: keep X's original value
+ *
+ * \return         0 if successful,
+ *                 MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed,
+ *
+ * \note           This function is equivalent to
+ *                      if( assign ) mbedtls_mpi_copy( X, Y );
+ *                 except that it avoids leaking any information about whether
+ *                 the assignment was done or not (the above code may leak
+ *                 information through branch prediction and/or memory access
+ *                 patterns analysis).
+ */
+int mbedtls_mpi_safe_cond_assign( mbedtls_mpi *X, const mbedtls_mpi *Y, unsigned char assign );
+
+/**
+ * \brief          Safe conditional swap X <-> Y if swap is 1
+ *
+ * \param X        First mbedtls_mpi value
+ * \param Y        Second mbedtls_mpi value
+ * \param assign   1: perform the swap, 0: keep X and Y's original values
+ *
+ * \return         0 if successful,
+ *                 MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed,
+ *
+ * \note           This function is equivalent to
+ *                      if( assign ) mbedtls_mpi_swap( X, Y );
+ *                 except that it avoids leaking any information about whether
+ *                 the assignment was done or not (the above code may leak
+ *                 information through branch prediction and/or memory access
+ *                 patterns analysis).
+ */
+int mbedtls_mpi_safe_cond_swap( mbedtls_mpi *X, mbedtls_mpi *Y, unsigned char assign );
+
+/**
+ * \brief          Set value from integer
+ *
+ * \param X        MPI to set
+ * \param z        Value to use
+ *
+ * \return         0 if successful,
+ *                 MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed
+ */
+int mbedtls_mpi_lset( mbedtls_mpi *X, mbedtls_mpi_sint z );
+
+/**
+ * \brief          Get a specific bit from X
+ *
+ * \param X        MPI to use
+ * \param pos      Zero-based index of the bit in X
+ *
+ * \return         Either a 0 or a 1
+ */
+int mbedtls_mpi_get_bit( const mbedtls_mpi *X, size_t pos );
+
+/**
+ * \brief          Set a bit of X to a specific value of 0 or 1
+ *
+ * \note           Will grow X if necessary to set a bit to 1 in a not yet
+ *                 existing limb. Will not grow if bit should be set to 0
+ *
+ * \param X        MPI to use
+ * \param pos      Zero-based index of the bit in X
+ * \param val      The value to set the bit to (0 or 1)
+ *
+ * \return         0 if successful,
+ *                 MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed,
+ *                 MBEDTLS_ERR_MPI_BAD_INPUT_DATA if val is not 0 or 1
+ */
+int mbedtls_mpi_set_bit( mbedtls_mpi *X, size_t pos, unsigned char val );
+
+/**
+ * \brief          Return the number of zero-bits before the least significant
+ *                 '1' bit
+ *
+ * Note: Thus also the zero-based index of the least significant '1' bit
+ *
+ * \param X        MPI to use
+ */
+size_t mbedtls_mpi_lsb( const mbedtls_mpi *X );
+
+/**
+ * \brief          Return the number of bits up to and including the most
+ *                 significant '1' bit'
+ *
+ * Note: Thus also the one-based index of the most significant '1' bit
+ *
+ * \param X        MPI to use
+ */
+size_t mbedtls_mpi_bitlen( const mbedtls_mpi *X );
+
+/**
+ * \brief          Return the total size in bytes
+ *
+ * \param X        MPI to use
+ */
+size_t mbedtls_mpi_size( const mbedtls_mpi *X );
+
+/**
+ * \brief          Import from an ASCII string
+ *
+ * \param X        Destination MPI
+ * \param radix    Input numeric base
+ * \param s        Null-terminated string buffer
+ *
+ * \return         0 if successful, or a MBEDTLS_ERR_MPI_XXX error code
+ */
+int mbedtls_mpi_read_string( mbedtls_mpi *X, int radix, const char *s );
+
+/**
+ * \brief          Export into an ASCII string
+ *
+ * \param X        Source MPI
+ * \param radix    Output numeric base
+ * \param buf      Buffer to write the string to
+ * \param buflen   Length of buf
+ * \param olen     Length of the string written, including final NUL byte
+ *
+ * \return         0 if successful, or a MBEDTLS_ERR_MPI_XXX error code.
+ *                 *olen is always updated to reflect the amount
+ *                 of data that has (or would have) been written.
+ *
+ * \note           Call this function with buflen = 0 to obtain the
+ *                 minimum required buffer size in *olen.
+ */
+int mbedtls_mpi_write_string( const mbedtls_mpi *X, int radix,
+                              char *buf, size_t buflen, size_t *olen );
+
+#if defined(MBEDTLS_FS_IO)
+/**
+ * \brief          Read MPI from a line in an opened file
+ *
+ * \param X        Destination MPI
+ * \param radix    Input numeric base
+ * \param fin      Input file handle
+ *
+ * \return         0 if successful, MBEDTLS_ERR_MPI_BUFFER_TOO_SMALL if
+ *                 the file read buffer is too small or a
+ *                 MBEDTLS_ERR_MPI_XXX error code
+ *
+ * \note           On success, this function advances the file stream
+ *                 to the end of the current line or to EOF.
+ *
+ *                 The function returns 0 on an empty line.
+ *
+ *                 Leading whitespaces are ignored, as is a
+ *                 '0x' prefix for radix 16.
+ *
+ */
+int mbedtls_mpi_read_file( mbedtls_mpi *X, int radix, FILE *fin );
+
+/**
+ * \brief          Write X into an opened file, or stdout if fout is NULL
+ *
+ * \param p        Prefix, can be NULL
+ * \param X        Source MPI
+ * \param radix    Output numeric base
+ * \param fout     Output file handle (can be NULL)
+ *
+ * \return         0 if successful, or a MBEDTLS_ERR_MPI_XXX error code
+ *
+ * \note           Set fout == NULL to print X on the console.
+ */
+int mbedtls_mpi_write_file( const char *p, const mbedtls_mpi *X, int radix, FILE *fout );
+#endif /* MBEDTLS_FS_IO */
+
+/**
+ * \brief          Import X from unsigned binary data, big endian
+ *
+ * \param X        Destination MPI
+ * \param buf      Input buffer
+ * \param buflen   Input buffer size
+ *
+ * \return         0 if successful,
+ *                 MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed
+ */
+int mbedtls_mpi_read_binary( mbedtls_mpi *X, const unsigned char *buf, size_t buflen );
+
+/**
+ * \brief          Export X into unsigned binary data, big endian.
+ *                 Always fills the whole buffer, which will start with zeros
+ *                 if the number is smaller.
+ *
+ * \param X        Source MPI
+ * \param buf      Output buffer
+ * \param buflen   Output buffer size
+ *
+ * \return         0 if successful,
+ *                 MBEDTLS_ERR_MPI_BUFFER_TOO_SMALL if buf isn't large enough
+ */
+int mbedtls_mpi_write_binary( const mbedtls_mpi *X, unsigned char *buf, size_t buflen );
+
+/**
+ * \brief          Left-shift: X <<= count
+ *
+ * \param X        MPI to shift
+ * \param count    Amount to shift
+ *
+ * \return         0 if successful,
+ *                 MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed
+ */
+int mbedtls_mpi_shift_l( mbedtls_mpi *X, size_t count );
+
+/**
+ * \brief          Right-shift: X >>= count
+ *
+ * \param X        MPI to shift
+ * \param count    Amount to shift
+ *
+ * \return         0 if successful,
+ *                 MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed
+ */
+int mbedtls_mpi_shift_r( mbedtls_mpi *X, size_t count );
+
+/**
+ * \brief          Compare unsigned values
+ *
+ * \param X        Left-hand MPI
+ * \param Y        Right-hand MPI
+ *
+ * \return         1 if |X| is greater than |Y|,
+ *                -1 if |X| is lesser  than |Y| or
+ *                 0 if |X| is equal to |Y|
+ */
+int mbedtls_mpi_cmp_abs( const mbedtls_mpi *X, const mbedtls_mpi *Y );
+
+/**
+ * \brief          Compare signed values
+ *
+ * \param X        Left-hand MPI
+ * \param Y        Right-hand MPI
+ *
+ * \return         1 if X is greater than Y,
+ *                -1 if X is lesser  than Y or
+ *                 0 if X is equal to Y
+ */
+int mbedtls_mpi_cmp_mpi( const mbedtls_mpi *X, const mbedtls_mpi *Y );
+
+/**
+ * \brief          Compare signed values
+ *
+ * \param X        Left-hand MPI
+ * \param z        The integer value to compare to
+ *
+ * \return         1 if X is greater than z,
+ *                -1 if X is lesser  than z or
+ *                 0 if X is equal to z
+ */
+int mbedtls_mpi_cmp_int( const mbedtls_mpi *X, mbedtls_mpi_sint z );
+
+/**
+ * \brief          Unsigned addition: X = |A| + |B|
+ *
+ * \param X        Destination MPI
+ * \param A        Left-hand MPI
+ * \param B        Right-hand MPI
+ *
+ * \return         0 if successful,
+ *                 MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed
+ */
+int mbedtls_mpi_add_abs( mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *B );
+
+/**
+ * \brief          Unsigned subtraction: X = |A| - |B|
+ *
+ * \param X        Destination MPI
+ * \param A        Left-hand MPI
+ * \param B        Right-hand MPI
+ *
+ * \return         0 if successful,
+ *                 MBEDTLS_ERR_MPI_NEGATIVE_VALUE if B is greater than A
+ */
+int mbedtls_mpi_sub_abs( mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *B );
+
+/**
+ * \brief          Signed addition: X = A + B
+ *
+ * \param X        Destination MPI
+ * \param A        Left-hand MPI
+ * \param B        Right-hand MPI
+ *
+ * \return         0 if successful,
+ *                 MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed
+ */
+int mbedtls_mpi_add_mpi( mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *B );
+
+/**
+ * \brief          Signed subtraction: X = A - B
+ *
+ * \param X        Destination MPI
+ * \param A        Left-hand MPI
+ * \param B        Right-hand MPI
+ *
+ * \return         0 if successful,
+ *                 MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed
+ */
+int mbedtls_mpi_sub_mpi( mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *B );
+
+/**
+ * \brief          Signed addition: X = A + b
+ *
+ * \param X        Destination MPI
+ * \param A        Left-hand MPI
+ * \param b        The integer value to add
+ *
+ * \return         0 if successful,
+ *                 MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed
+ */
+int mbedtls_mpi_add_int( mbedtls_mpi *X, const mbedtls_mpi *A, mbedtls_mpi_sint b );
+
+/**
+ * \brief          Signed subtraction: X = A - b
+ *
+ * \param X        Destination MPI
+ * \param A        Left-hand MPI
+ * \param b        The integer value to subtract
+ *
+ * \return         0 if successful,
+ *                 MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed
+ */
+int mbedtls_mpi_sub_int( mbedtls_mpi *X, const mbedtls_mpi *A, mbedtls_mpi_sint b );
+
+/**
+ * \brief          Baseline multiplication: X = A * B
+ *
+ * \param X        Destination MPI
+ * \param A        Left-hand MPI
+ * \param B        Right-hand MPI
+ *
+ * \return         0 if successful,
+ *                 MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed
+ */
+int mbedtls_mpi_mul_mpi( mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *B );
+
+/**
+ * \brief          Baseline multiplication: X = A * b
+ *
+ * \param X        Destination MPI
+ * \param A        Left-hand MPI
+ * \param b        The unsigned integer value to multiply with
+ *
+ * \note           b is unsigned
+ *
+ * \return         0 if successful,
+ *                 MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed
+ */
+int mbedtls_mpi_mul_int( mbedtls_mpi *X, const mbedtls_mpi *A, mbedtls_mpi_uint b );
+
+/**
+ * \brief          Division by mbedtls_mpi: A = Q * B + R
+ *
+ * \param Q        Destination MPI for the quotient
+ * \param R        Destination MPI for the rest value
+ * \param A        Left-hand MPI
+ * \param B        Right-hand MPI
+ *
+ * \return         0 if successful,
+ *                 MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed,
+ *                 MBEDTLS_ERR_MPI_DIVISION_BY_ZERO if B == 0
+ *
+ * \note           Either Q or R can be NULL.
+ */
+int mbedtls_mpi_div_mpi( mbedtls_mpi *Q, mbedtls_mpi *R, const mbedtls_mpi *A, const mbedtls_mpi *B );
+
+/**
+ * \brief          Division by int: A = Q * b + R
+ *
+ * \param Q        Destination MPI for the quotient
+ * \param R        Destination MPI for the rest value
+ * \param A        Left-hand MPI
+ * \param b        Integer to divide by
+ *
+ * \return         0 if successful,
+ *                 MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed,
+ *                 MBEDTLS_ERR_MPI_DIVISION_BY_ZERO if b == 0
+ *
+ * \note           Either Q or R can be NULL.
+ */
+int mbedtls_mpi_div_int( mbedtls_mpi *Q, mbedtls_mpi *R, const mbedtls_mpi *A, mbedtls_mpi_sint b );
+
+/**
+ * \brief          Modulo: R = A mod B
+ *
+ * \param R        Destination MPI for the rest value
+ * \param A        Left-hand MPI
+ * \param B        Right-hand MPI
+ *
+ * \return         0 if successful,
+ *                 MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed,
+ *                 MBEDTLS_ERR_MPI_DIVISION_BY_ZERO if B == 0,
+ *                 MBEDTLS_ERR_MPI_NEGATIVE_VALUE if B < 0
+ */
+int mbedtls_mpi_mod_mpi( mbedtls_mpi *R, const mbedtls_mpi *A, const mbedtls_mpi *B );
+
+/**
+ * \brief          Modulo: r = A mod b
+ *
+ * \param r        Destination mbedtls_mpi_uint
+ * \param A        Left-hand MPI
+ * \param b        Integer to divide by
+ *
+ * \return         0 if successful,
+ *                 MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed,
+ *                 MBEDTLS_ERR_MPI_DIVISION_BY_ZERO if b == 0,
+ *                 MBEDTLS_ERR_MPI_NEGATIVE_VALUE if b < 0
+ */
+int mbedtls_mpi_mod_int( mbedtls_mpi_uint *r, const mbedtls_mpi *A, mbedtls_mpi_sint b );
+
+/**
+ * \brief          Sliding-window exponentiation: X = A^E mod N
+ *
+ * \param X        Destination MPI
+ * \param A        Left-hand MPI
+ * \param E        Exponent MPI
+ * \param N        Modular MPI
+ * \param _RR      Speed-up MPI used for recalculations
+ *
+ * \return         0 if successful,
+ *                 MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed,
+ *                 MBEDTLS_ERR_MPI_BAD_INPUT_DATA if N is negative or even or
+ *                 if E is negative
+ *
+ * \note           _RR is used to avoid re-computing R*R mod N across
+ *                 multiple calls, which speeds up things a bit. It can
+ *                 be set to NULL if the extra performance is unneeded.
+ */
+int mbedtls_mpi_exp_mod( mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *E, const mbedtls_mpi *N, mbedtls_mpi *_RR );
+
+/**
+ * \brief          Fill an MPI X with size bytes of random
+ *
+ * \param X        Destination MPI
+ * \param size     Size in bytes
+ * \param f_rng    RNG function
+ * \param p_rng    RNG parameter
+ *
+ * \return         0 if successful,
+ *                 MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed
+ *
+ * \note           The bytes obtained from the PRNG are interpreted
+ *                 as a big-endian representation of an MPI; this can
+ *                 be relevant in applications like deterministic ECDSA.
+ */
+int mbedtls_mpi_fill_random( mbedtls_mpi *X, size_t size,
+                     int (*f_rng)(void *, unsigned char *, size_t),
+                     void *p_rng );
+
+/**
+ * \brief          Greatest common divisor: G = gcd(A, B)
+ *
+ * \param G        Destination MPI
+ * \param A        Left-hand MPI
+ * \param B        Right-hand MPI
+ *
+ * \return         0 if successful,
+ *                 MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed
+ */
+int mbedtls_mpi_gcd( mbedtls_mpi *G, const mbedtls_mpi *A, const mbedtls_mpi *B );
+
+/**
+ * \brief          Modular inverse: X = A^-1 mod N
+ *
+ * \param X        Destination MPI
+ * \param A        Left-hand MPI
+ * \param N        Right-hand MPI
+ *
+ * \return         0 if successful,
+ *                 MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed,
+ *                 MBEDTLS_ERR_MPI_BAD_INPUT_DATA if N is <= 1,
+                   MBEDTLS_ERR_MPI_NOT_ACCEPTABLE if A has no inverse mod N.
+ */
+int mbedtls_mpi_inv_mod( mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *N );
+
+/**
+ * \brief          Miller-Rabin primality test
+ *
+ * \param X        MPI to check
+ * \param f_rng    RNG function
+ * \param p_rng    RNG parameter
+ *
+ * \return         0 if successful (probably prime),
+ *                 MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed,
+ *                 MBEDTLS_ERR_MPI_NOT_ACCEPTABLE if X is not prime
+ */
+int mbedtls_mpi_is_prime( const mbedtls_mpi *X,
+                  int (*f_rng)(void *, unsigned char *, size_t),
+                  void *p_rng );
+
+/**
+ * \brief          Prime number generation
+ *
+ * \param X        Destination MPI
+ * \param nbits    Required size of X in bits
+ *                 ( 3 <= nbits <= MBEDTLS_MPI_MAX_BITS )
+ * \param dh_flag  If 1, then (X-1)/2 will be prime too
+ * \param f_rng    RNG function
+ * \param p_rng    RNG parameter
+ *
+ * \return         0 if successful (probably prime),
+ *                 MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed,
+ *                 MBEDTLS_ERR_MPI_BAD_INPUT_DATA if nbits is < 3
+ */
+int mbedtls_mpi_gen_prime( mbedtls_mpi *X, size_t nbits, int dh_flag,
+                   int (*f_rng)(void *, unsigned char *, size_t),
+                   void *p_rng );
+
+/**
+ * \brief          Checkup routine
+ *
+ * \return         0 if successful, or 1 if the test failed
+ */
+int mbedtls_mpi_self_test( int verbose );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* bignum.h */
diff --git a/common/mbedtls/blowfish.c b/common/mbedtls/blowfish.c
new file mode 100644
index 000000000..404d24e1f
--- /dev/null
+++ b/common/mbedtls/blowfish.c
@@ -0,0 +1,654 @@
+/*
+ *  Blowfish implementation
+ *
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+/*
+ *  The Blowfish block cipher was designed by Bruce Schneier in 1993.
+ *  http://www.schneier.com/blowfish.html
+ *  http://en.wikipedia.org/wiki/Blowfish_%28cipher%29
+ *
+ */
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "mbedtls/config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#if defined(MBEDTLS_BLOWFISH_C)
+
+#include "mbedtls/blowfish.h"
+#include "mbedtls/platform_util.h"
+
+#include <string.h>
+
+#if !defined(MBEDTLS_BLOWFISH_ALT)
+
+/*
+ * 32-bit integer manipulation macros (big endian)
+ */
+#ifndef GET_UINT32_BE
+#define GET_UINT32_BE(n,b,i)                            \
+{                                                       \
+    (n) = ( (uint32_t) (b)[(i)    ] << 24 )             \
+        | ( (uint32_t) (b)[(i) + 1] << 16 )             \
+        | ( (uint32_t) (b)[(i) + 2] <<  8 )             \
+        | ( (uint32_t) (b)[(i) + 3]       );            \
+}
+#endif
+
+#ifndef PUT_UINT32_BE
+#define PUT_UINT32_BE(n,b,i)                            \
+{                                                       \
+    (b)[(i)    ] = (unsigned char) ( (n) >> 24 );       \
+    (b)[(i) + 1] = (unsigned char) ( (n) >> 16 );       \
+    (b)[(i) + 2] = (unsigned char) ( (n) >>  8 );       \
+    (b)[(i) + 3] = (unsigned char) ( (n)       );       \
+}
+#endif
+
+static const uint32_t P[MBEDTLS_BLOWFISH_ROUNDS + 2] = {
+        0x243F6A88L, 0x85A308D3L, 0x13198A2EL, 0x03707344L,
+        0xA4093822L, 0x299F31D0L, 0x082EFA98L, 0xEC4E6C89L,
+        0x452821E6L, 0x38D01377L, 0xBE5466CFL, 0x34E90C6CL,
+        0xC0AC29B7L, 0xC97C50DDL, 0x3F84D5B5L, 0xB5470917L,
+        0x9216D5D9L, 0x8979FB1BL
+};
+
+/* declarations of data at the end of this file */
+static const uint32_t S[4][256];
+
+static uint32_t F( mbedtls_blowfish_context *ctx, uint32_t x )
+{
+   unsigned short a, b, c, d;
+   uint32_t  y;
+
+   d = (unsigned short)(x & 0xFF);
+   x >>= 8;
+   c = (unsigned short)(x & 0xFF);
+   x >>= 8;
+   b = (unsigned short)(x & 0xFF);
+   x >>= 8;
+   a = (unsigned short)(x & 0xFF);
+   y = ctx->S[0][a] + ctx->S[1][b];
+   y = y ^ ctx->S[2][c];
+   y = y + ctx->S[3][d];
+
+   return( y );
+}
+
+static void blowfish_enc( mbedtls_blowfish_context *ctx, uint32_t *xl, uint32_t *xr )
+{
+    uint32_t  Xl, Xr, temp;
+    short i;
+
+    Xl = *xl;
+    Xr = *xr;
+
+    for( i = 0; i < MBEDTLS_BLOWFISH_ROUNDS; ++i )
+    {
+        Xl = Xl ^ ctx->P[i];
+        Xr = F( ctx, Xl ) ^ Xr;
+
+        temp = Xl;
+        Xl = Xr;
+        Xr = temp;
+    }
+
+    temp = Xl;
+    Xl = Xr;
+    Xr = temp;
+
+    Xr = Xr ^ ctx->P[MBEDTLS_BLOWFISH_ROUNDS];
+    Xl = Xl ^ ctx->P[MBEDTLS_BLOWFISH_ROUNDS + 1];
+
+    *xl = Xl;
+    *xr = Xr;
+}
+
+static void blowfish_dec( mbedtls_blowfish_context *ctx, uint32_t *xl, uint32_t *xr )
+{
+    uint32_t  Xl, Xr, temp;
+    short i;
+
+    Xl = *xl;
+    Xr = *xr;
+
+    for( i = MBEDTLS_BLOWFISH_ROUNDS + 1; i > 1; --i )
+    {
+        Xl = Xl ^ ctx->P[i];
+        Xr = F( ctx, Xl ) ^ Xr;
+
+        temp = Xl;
+        Xl = Xr;
+        Xr = temp;
+    }
+
+    temp = Xl;
+    Xl = Xr;
+    Xr = temp;
+
+    Xr = Xr ^ ctx->P[1];
+    Xl = Xl ^ ctx->P[0];
+
+    *xl = Xl;
+    *xr = Xr;
+}
+
+void mbedtls_blowfish_init( mbedtls_blowfish_context *ctx )
+{
+    memset( ctx, 0, sizeof( mbedtls_blowfish_context ) );
+}
+
+void mbedtls_blowfish_free( mbedtls_blowfish_context *ctx )
+{
+    if( ctx == NULL )
+        return;
+
+    mbedtls_platform_zeroize( ctx, sizeof( mbedtls_blowfish_context ) );
+}
+
+/*
+ * Blowfish key schedule
+ */
+int mbedtls_blowfish_setkey( mbedtls_blowfish_context *ctx, const unsigned char *key,
+                     unsigned int keybits )
+{
+    unsigned int i, j, k;
+    uint32_t data, datal, datar;
+
+    if( keybits < MBEDTLS_BLOWFISH_MIN_KEY_BITS || keybits > MBEDTLS_BLOWFISH_MAX_KEY_BITS ||
+        ( keybits % 8 ) )
+    {
+        return( MBEDTLS_ERR_BLOWFISH_INVALID_KEY_LENGTH );
+    }
+
+    keybits >>= 3;
+
+    for( i = 0; i < 4; i++ )
+    {
+        for( j = 0; j < 256; j++ )
+            ctx->S[i][j] = S[i][j];
+    }
+
+    j = 0;
+    for( i = 0; i < MBEDTLS_BLOWFISH_ROUNDS + 2; ++i )
+    {
+        data = 0x00000000;
+        for( k = 0; k < 4; ++k )
+        {
+            data = ( data << 8 ) | key[j++];
+            if( j >= keybits )
+                j = 0;
+        }
+        ctx->P[i] = P[i] ^ data;
+    }
+
+    datal = 0x00000000;
+    datar = 0x00000000;
+
+    for( i = 0; i < MBEDTLS_BLOWFISH_ROUNDS + 2; i += 2 )
+    {
+        blowfish_enc( ctx, &datal, &datar );
+        ctx->P[i] = datal;
+        ctx->P[i + 1] = datar;
+    }
+
+    for( i = 0; i < 4; i++ )
+    {
+       for( j = 0; j < 256; j += 2 )
+       {
+            blowfish_enc( ctx, &datal, &datar );
+            ctx->S[i][j] = datal;
+            ctx->S[i][j + 1] = datar;
+        }
+    }
+    return( 0 );
+}
+
+/*
+ * Blowfish-ECB block encryption/decryption
+ */
+int mbedtls_blowfish_crypt_ecb( mbedtls_blowfish_context *ctx,
+                    int mode,
+                    const unsigned char input[MBEDTLS_BLOWFISH_BLOCKSIZE],
+                    unsigned char output[MBEDTLS_BLOWFISH_BLOCKSIZE] )
+{
+    uint32_t X0, X1;
+
+    GET_UINT32_BE( X0, input,  0 );
+    GET_UINT32_BE( X1, input,  4 );
+
+    if( mode == MBEDTLS_BLOWFISH_DECRYPT )
+    {
+        blowfish_dec( ctx, &X0, &X1 );
+    }
+    else /* MBEDTLS_BLOWFISH_ENCRYPT */
+    {
+        blowfish_enc( ctx, &X0, &X1 );
+    }
+
+    PUT_UINT32_BE( X0, output,  0 );
+    PUT_UINT32_BE( X1, output,  4 );
+
+    return( 0 );
+}
+
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+/*
+ * Blowfish-CBC buffer encryption/decryption
+ */
+int mbedtls_blowfish_crypt_cbc( mbedtls_blowfish_context *ctx,
+                    int mode,
+                    size_t length,
+                    unsigned char iv[MBEDTLS_BLOWFISH_BLOCKSIZE],
+                    const unsigned char *input,
+                    unsigned char *output )
+{
+    int i;
+    unsigned char temp[MBEDTLS_BLOWFISH_BLOCKSIZE];
+
+    if( length % MBEDTLS_BLOWFISH_BLOCKSIZE )
+        return( MBEDTLS_ERR_BLOWFISH_INVALID_INPUT_LENGTH );
+
+    if( mode == MBEDTLS_BLOWFISH_DECRYPT )
+    {
+        while( length > 0 )
+        {
+            memcpy( temp, input, MBEDTLS_BLOWFISH_BLOCKSIZE );
+            mbedtls_blowfish_crypt_ecb( ctx, mode, input, output );
+
+            for( i = 0; i < MBEDTLS_BLOWFISH_BLOCKSIZE;i++ )
+                output[i] = (unsigned char)( output[i] ^ iv[i] );
+
+            memcpy( iv, temp, MBEDTLS_BLOWFISH_BLOCKSIZE );
+
+            input  += MBEDTLS_BLOWFISH_BLOCKSIZE;
+            output += MBEDTLS_BLOWFISH_BLOCKSIZE;
+            length -= MBEDTLS_BLOWFISH_BLOCKSIZE;
+        }
+    }
+    else
+    {
+        while( length > 0 )
+        {
+            for( i = 0; i < MBEDTLS_BLOWFISH_BLOCKSIZE; i++ )
+                output[i] = (unsigned char)( input[i] ^ iv[i] );
+
+            mbedtls_blowfish_crypt_ecb( ctx, mode, output, output );
+            memcpy( iv, output, MBEDTLS_BLOWFISH_BLOCKSIZE );
+
+            input  += MBEDTLS_BLOWFISH_BLOCKSIZE;
+            output += MBEDTLS_BLOWFISH_BLOCKSIZE;
+            length -= MBEDTLS_BLOWFISH_BLOCKSIZE;
+        }
+    }
+
+    return( 0 );
+}
+#endif /* MBEDTLS_CIPHER_MODE_CBC */
+
+#if defined(MBEDTLS_CIPHER_MODE_CFB)
+/*
+ * Blowfish CFB buffer encryption/decryption
+ */
+int mbedtls_blowfish_crypt_cfb64( mbedtls_blowfish_context *ctx,
+                       int mode,
+                       size_t length,
+                       size_t *iv_off,
+                       unsigned char iv[MBEDTLS_BLOWFISH_BLOCKSIZE],
+                       const unsigned char *input,
+                       unsigned char *output )
+{
+    int c;
+    size_t n = *iv_off;
+
+    if( mode == MBEDTLS_BLOWFISH_DECRYPT )
+    {
+        while( length-- )
+        {
+            if( n == 0 )
+                mbedtls_blowfish_crypt_ecb( ctx, MBEDTLS_BLOWFISH_ENCRYPT, iv, iv );
+
+            c = *input++;
+            *output++ = (unsigned char)( c ^ iv[n] );
+            iv[n] = (unsigned char) c;
+
+            n = ( n + 1 ) % MBEDTLS_BLOWFISH_BLOCKSIZE;
+        }
+    }
+    else
+    {
+        while( length-- )
+        {
+            if( n == 0 )
+                mbedtls_blowfish_crypt_ecb( ctx, MBEDTLS_BLOWFISH_ENCRYPT, iv, iv );
+
+            iv[n] = *output++ = (unsigned char)( iv[n] ^ *input++ );
+
+            n = ( n + 1 ) % MBEDTLS_BLOWFISH_BLOCKSIZE;
+        }
+    }
+
+    *iv_off = n;
+
+    return( 0 );
+}
+#endif /*MBEDTLS_CIPHER_MODE_CFB */
+
+#if defined(MBEDTLS_CIPHER_MODE_CTR)
+/*
+ * Blowfish CTR buffer encryption/decryption
+ */
+int mbedtls_blowfish_crypt_ctr( mbedtls_blowfish_context *ctx,
+                       size_t length,
+                       size_t *nc_off,
+                       unsigned char nonce_counter[MBEDTLS_BLOWFISH_BLOCKSIZE],
+                       unsigned char stream_block[MBEDTLS_BLOWFISH_BLOCKSIZE],
+                       const unsigned char *input,
+                       unsigned char *output )
+{
+    int c, i;
+    size_t n = *nc_off;
+
+    while( length-- )
+    {
+        if( n == 0 ) {
+            mbedtls_blowfish_crypt_ecb( ctx, MBEDTLS_BLOWFISH_ENCRYPT, nonce_counter,
+                                stream_block );
+
+            for( i = MBEDTLS_BLOWFISH_BLOCKSIZE; i > 0; i-- )
+                if( ++nonce_counter[i - 1] != 0 )
+                    break;
+        }
+        c = *input++;
+        *output++ = (unsigned char)( c ^ stream_block[n] );
+
+        n = ( n + 1 ) % MBEDTLS_BLOWFISH_BLOCKSIZE;
+    }
+
+    *nc_off = n;
+
+    return( 0 );
+}
+#endif /* MBEDTLS_CIPHER_MODE_CTR */
+
+static const uint32_t S[4][256] = {
+    {   0xD1310BA6L, 0x98DFB5ACL, 0x2FFD72DBL, 0xD01ADFB7L,
+        0xB8E1AFEDL, 0x6A267E96L, 0xBA7C9045L, 0xF12C7F99L,
+        0x24A19947L, 0xB3916CF7L, 0x0801F2E2L, 0x858EFC16L,
+        0x636920D8L, 0x71574E69L, 0xA458FEA3L, 0xF4933D7EL,
+        0x0D95748FL, 0x728EB658L, 0x718BCD58L, 0x82154AEEL,
+        0x7B54A41DL, 0xC25A59B5L, 0x9C30D539L, 0x2AF26013L,
+        0xC5D1B023L, 0x286085F0L, 0xCA417918L, 0xB8DB38EFL,
+        0x8E79DCB0L, 0x603A180EL, 0x6C9E0E8BL, 0xB01E8A3EL,
+        0xD71577C1L, 0xBD314B27L, 0x78AF2FDAL, 0x55605C60L,
+        0xE65525F3L, 0xAA55AB94L, 0x57489862L, 0x63E81440L,
+        0x55CA396AL, 0x2AAB10B6L, 0xB4CC5C34L, 0x1141E8CEL,
+        0xA15486AFL, 0x7C72E993L, 0xB3EE1411L, 0x636FBC2AL,
+        0x2BA9C55DL, 0x741831F6L, 0xCE5C3E16L, 0x9B87931EL,
+        0xAFD6BA33L, 0x6C24CF5CL, 0x7A325381L, 0x28958677L,
+        0x3B8F4898L, 0x6B4BB9AFL, 0xC4BFE81BL, 0x66282193L,
+        0x61D809CCL, 0xFB21A991L, 0x487CAC60L, 0x5DEC8032L,
+        0xEF845D5DL, 0xE98575B1L, 0xDC262302L, 0xEB651B88L,
+        0x23893E81L, 0xD396ACC5L, 0x0F6D6FF3L, 0x83F44239L,
+        0x2E0B4482L, 0xA4842004L, 0x69C8F04AL, 0x9E1F9B5EL,
+        0x21C66842L, 0xF6E96C9AL, 0x670C9C61L, 0xABD388F0L,
+        0x6A51A0D2L, 0xD8542F68L, 0x960FA728L, 0xAB5133A3L,
+        0x6EEF0B6CL, 0x137A3BE4L, 0xBA3BF050L, 0x7EFB2A98L,
+        0xA1F1651DL, 0x39AF0176L, 0x66CA593EL, 0x82430E88L,
+        0x8CEE8619L, 0x456F9FB4L, 0x7D84A5C3L, 0x3B8B5EBEL,
+        0xE06F75D8L, 0x85C12073L, 0x401A449FL, 0x56C16AA6L,
+        0x4ED3AA62L, 0x363F7706L, 0x1BFEDF72L, 0x429B023DL,
+        0x37D0D724L, 0xD00A1248L, 0xDB0FEAD3L, 0x49F1C09BL,
+        0x075372C9L, 0x80991B7BL, 0x25D479D8L, 0xF6E8DEF7L,
+        0xE3FE501AL, 0xB6794C3BL, 0x976CE0BDL, 0x04C006BAL,
+        0xC1A94FB6L, 0x409F60C4L, 0x5E5C9EC2L, 0x196A2463L,
+        0x68FB6FAFL, 0x3E6C53B5L, 0x1339B2EBL, 0x3B52EC6FL,
+        0x6DFC511FL, 0x9B30952CL, 0xCC814544L, 0xAF5EBD09L,
+        0xBEE3D004L, 0xDE334AFDL, 0x660F2807L, 0x192E4BB3L,
+        0xC0CBA857L, 0x45C8740FL, 0xD20B5F39L, 0xB9D3FBDBL,
+        0x5579C0BDL, 0x1A60320AL, 0xD6A100C6L, 0x402C7279L,
+        0x679F25FEL, 0xFB1FA3CCL, 0x8EA5E9F8L, 0xDB3222F8L,
+        0x3C7516DFL, 0xFD616B15L, 0x2F501EC8L, 0xAD0552ABL,
+        0x323DB5FAL, 0xFD238760L, 0x53317B48L, 0x3E00DF82L,
+        0x9E5C57BBL, 0xCA6F8CA0L, 0x1A87562EL, 0xDF1769DBL,
+        0xD542A8F6L, 0x287EFFC3L, 0xAC6732C6L, 0x8C4F5573L,
+        0x695B27B0L, 0xBBCA58C8L, 0xE1FFA35DL, 0xB8F011A0L,
+        0x10FA3D98L, 0xFD2183B8L, 0x4AFCB56CL, 0x2DD1D35BL,
+        0x9A53E479L, 0xB6F84565L, 0xD28E49BCL, 0x4BFB9790L,
+        0xE1DDF2DAL, 0xA4CB7E33L, 0x62FB1341L, 0xCEE4C6E8L,
+        0xEF20CADAL, 0x36774C01L, 0xD07E9EFEL, 0x2BF11FB4L,
+        0x95DBDA4DL, 0xAE909198L, 0xEAAD8E71L, 0x6B93D5A0L,
+        0xD08ED1D0L, 0xAFC725E0L, 0x8E3C5B2FL, 0x8E7594B7L,
+        0x8FF6E2FBL, 0xF2122B64L, 0x8888B812L, 0x900DF01CL,
+        0x4FAD5EA0L, 0x688FC31CL, 0xD1CFF191L, 0xB3A8C1ADL,
+        0x2F2F2218L, 0xBE0E1777L, 0xEA752DFEL, 0x8B021FA1L,
+        0xE5A0CC0FL, 0xB56F74E8L, 0x18ACF3D6L, 0xCE89E299L,
+        0xB4A84FE0L, 0xFD13E0B7L, 0x7CC43B81L, 0xD2ADA8D9L,
+        0x165FA266L, 0x80957705L, 0x93CC7314L, 0x211A1477L,
+        0xE6AD2065L, 0x77B5FA86L, 0xC75442F5L, 0xFB9D35CFL,
+        0xEBCDAF0CL, 0x7B3E89A0L, 0xD6411BD3L, 0xAE1E7E49L,
+        0x00250E2DL, 0x2071B35EL, 0x226800BBL, 0x57B8E0AFL,
+        0x2464369BL, 0xF009B91EL, 0x5563911DL, 0x59DFA6AAL,
+        0x78C14389L, 0xD95A537FL, 0x207D5BA2L, 0x02E5B9C5L,
+        0x83260376L, 0x6295CFA9L, 0x11C81968L, 0x4E734A41L,
+        0xB3472DCAL, 0x7B14A94AL, 0x1B510052L, 0x9A532915L,
+        0xD60F573FL, 0xBC9BC6E4L, 0x2B60A476L, 0x81E67400L,
+        0x08BA6FB5L, 0x571BE91FL, 0xF296EC6BL, 0x2A0DD915L,
+        0xB6636521L, 0xE7B9F9B6L, 0xFF34052EL, 0xC5855664L,
+        0x53B02D5DL, 0xA99F8FA1L, 0x08BA4799L, 0x6E85076AL   },
+    {   0x4B7A70E9L, 0xB5B32944L, 0xDB75092EL, 0xC4192623L,
+        0xAD6EA6B0L, 0x49A7DF7DL, 0x9CEE60B8L, 0x8FEDB266L,
+        0xECAA8C71L, 0x699A17FFL, 0x5664526CL, 0xC2B19EE1L,
+        0x193602A5L, 0x75094C29L, 0xA0591340L, 0xE4183A3EL,
+        0x3F54989AL, 0x5B429D65L, 0x6B8FE4D6L, 0x99F73FD6L,
+        0xA1D29C07L, 0xEFE830F5L, 0x4D2D38E6L, 0xF0255DC1L,
+        0x4CDD2086L, 0x8470EB26L, 0x6382E9C6L, 0x021ECC5EL,
+        0x09686B3FL, 0x3EBAEFC9L, 0x3C971814L, 0x6B6A70A1L,
+        0x687F3584L, 0x52A0E286L, 0xB79C5305L, 0xAA500737L,
+        0x3E07841CL, 0x7FDEAE5CL, 0x8E7D44ECL, 0x5716F2B8L,
+        0xB03ADA37L, 0xF0500C0DL, 0xF01C1F04L, 0x0200B3FFL,
+        0xAE0CF51AL, 0x3CB574B2L, 0x25837A58L, 0xDC0921BDL,
+        0xD19113F9L, 0x7CA92FF6L, 0x94324773L, 0x22F54701L,
+        0x3AE5E581L, 0x37C2DADCL, 0xC8B57634L, 0x9AF3DDA7L,
+        0xA9446146L, 0x0FD0030EL, 0xECC8C73EL, 0xA4751E41L,
+        0xE238CD99L, 0x3BEA0E2FL, 0x3280BBA1L, 0x183EB331L,
+        0x4E548B38L, 0x4F6DB908L, 0x6F420D03L, 0xF60A04BFL,
+        0x2CB81290L, 0x24977C79L, 0x5679B072L, 0xBCAF89AFL,
+        0xDE9A771FL, 0xD9930810L, 0xB38BAE12L, 0xDCCF3F2EL,
+        0x5512721FL, 0x2E6B7124L, 0x501ADDE6L, 0x9F84CD87L,
+        0x7A584718L, 0x7408DA17L, 0xBC9F9ABCL, 0xE94B7D8CL,
+        0xEC7AEC3AL, 0xDB851DFAL, 0x63094366L, 0xC464C3D2L,
+        0xEF1C1847L, 0x3215D908L, 0xDD433B37L, 0x24C2BA16L,
+        0x12A14D43L, 0x2A65C451L, 0x50940002L, 0x133AE4DDL,
+        0x71DFF89EL, 0x10314E55L, 0x81AC77D6L, 0x5F11199BL,
+        0x043556F1L, 0xD7A3C76BL, 0x3C11183BL, 0x5924A509L,
+        0xF28FE6EDL, 0x97F1FBFAL, 0x9EBABF2CL, 0x1E153C6EL,
+        0x86E34570L, 0xEAE96FB1L, 0x860E5E0AL, 0x5A3E2AB3L,
+        0x771FE71CL, 0x4E3D06FAL, 0x2965DCB9L, 0x99E71D0FL,
+        0x803E89D6L, 0x5266C825L, 0x2E4CC978L, 0x9C10B36AL,
+        0xC6150EBAL, 0x94E2EA78L, 0xA5FC3C53L, 0x1E0A2DF4L,
+        0xF2F74EA7L, 0x361D2B3DL, 0x1939260FL, 0x19C27960L,
+        0x5223A708L, 0xF71312B6L, 0xEBADFE6EL, 0xEAC31F66L,
+        0xE3BC4595L, 0xA67BC883L, 0xB17F37D1L, 0x018CFF28L,
+        0xC332DDEFL, 0xBE6C5AA5L, 0x65582185L, 0x68AB9802L,
+        0xEECEA50FL, 0xDB2F953BL, 0x2AEF7DADL, 0x5B6E2F84L,
+        0x1521B628L, 0x29076170L, 0xECDD4775L, 0x619F1510L,
+        0x13CCA830L, 0xEB61BD96L, 0x0334FE1EL, 0xAA0363CFL,
+        0xB5735C90L, 0x4C70A239L, 0xD59E9E0BL, 0xCBAADE14L,
+        0xEECC86BCL, 0x60622CA7L, 0x9CAB5CABL, 0xB2F3846EL,
+        0x648B1EAFL, 0x19BDF0CAL, 0xA02369B9L, 0x655ABB50L,
+        0x40685A32L, 0x3C2AB4B3L, 0x319EE9D5L, 0xC021B8F7L,
+        0x9B540B19L, 0x875FA099L, 0x95F7997EL, 0x623D7DA8L,
+        0xF837889AL, 0x97E32D77L, 0x11ED935FL, 0x16681281L,
+        0x0E358829L, 0xC7E61FD6L, 0x96DEDFA1L, 0x7858BA99L,
+        0x57F584A5L, 0x1B227263L, 0x9B83C3FFL, 0x1AC24696L,
+        0xCDB30AEBL, 0x532E3054L, 0x8FD948E4L, 0x6DBC3128L,
+        0x58EBF2EFL, 0x34C6FFEAL, 0xFE28ED61L, 0xEE7C3C73L,
+        0x5D4A14D9L, 0xE864B7E3L, 0x42105D14L, 0x203E13E0L,
+        0x45EEE2B6L, 0xA3AAABEAL, 0xDB6C4F15L, 0xFACB4FD0L,
+        0xC742F442L, 0xEF6ABBB5L, 0x654F3B1DL, 0x41CD2105L,
+        0xD81E799EL, 0x86854DC7L, 0xE44B476AL, 0x3D816250L,
+        0xCF62A1F2L, 0x5B8D2646L, 0xFC8883A0L, 0xC1C7B6A3L,
+        0x7F1524C3L, 0x69CB7492L, 0x47848A0BL, 0x5692B285L,
+        0x095BBF00L, 0xAD19489DL, 0x1462B174L, 0x23820E00L,
+        0x58428D2AL, 0x0C55F5EAL, 0x1DADF43EL, 0x233F7061L,
+        0x3372F092L, 0x8D937E41L, 0xD65FECF1L, 0x6C223BDBL,
+        0x7CDE3759L, 0xCBEE7460L, 0x4085F2A7L, 0xCE77326EL,
+        0xA6078084L, 0x19F8509EL, 0xE8EFD855L, 0x61D99735L,
+        0xA969A7AAL, 0xC50C06C2L, 0x5A04ABFCL, 0x800BCADCL,
+        0x9E447A2EL, 0xC3453484L, 0xFDD56705L, 0x0E1E9EC9L,
+        0xDB73DBD3L, 0x105588CDL, 0x675FDA79L, 0xE3674340L,
+        0xC5C43465L, 0x713E38D8L, 0x3D28F89EL, 0xF16DFF20L,
+        0x153E21E7L, 0x8FB03D4AL, 0xE6E39F2BL, 0xDB83ADF7L   },
+    {   0xE93D5A68L, 0x948140F7L, 0xF64C261CL, 0x94692934L,
+        0x411520F7L, 0x7602D4F7L, 0xBCF46B2EL, 0xD4A20068L,
+        0xD4082471L, 0x3320F46AL, 0x43B7D4B7L, 0x500061AFL,
+        0x1E39F62EL, 0x97244546L, 0x14214F74L, 0xBF8B8840L,
+        0x4D95FC1DL, 0x96B591AFL, 0x70F4DDD3L, 0x66A02F45L,
+        0xBFBC09ECL, 0x03BD9785L, 0x7FAC6DD0L, 0x31CB8504L,
+        0x96EB27B3L, 0x55FD3941L, 0xDA2547E6L, 0xABCA0A9AL,
+        0x28507825L, 0x530429F4L, 0x0A2C86DAL, 0xE9B66DFBL,
+        0x68DC1462L, 0xD7486900L, 0x680EC0A4L, 0x27A18DEEL,
+        0x4F3FFEA2L, 0xE887AD8CL, 0xB58CE006L, 0x7AF4D6B6L,
+        0xAACE1E7CL, 0xD3375FECL, 0xCE78A399L, 0x406B2A42L,
+        0x20FE9E35L, 0xD9F385B9L, 0xEE39D7ABL, 0x3B124E8BL,
+        0x1DC9FAF7L, 0x4B6D1856L, 0x26A36631L, 0xEAE397B2L,
+        0x3A6EFA74L, 0xDD5B4332L, 0x6841E7F7L, 0xCA7820FBL,
+        0xFB0AF54EL, 0xD8FEB397L, 0x454056ACL, 0xBA489527L,
+        0x55533A3AL, 0x20838D87L, 0xFE6BA9B7L, 0xD096954BL,
+        0x55A867BCL, 0xA1159A58L, 0xCCA92963L, 0x99E1DB33L,
+        0xA62A4A56L, 0x3F3125F9L, 0x5EF47E1CL, 0x9029317CL,
+        0xFDF8E802L, 0x04272F70L, 0x80BB155CL, 0x05282CE3L,
+        0x95C11548L, 0xE4C66D22L, 0x48C1133FL, 0xC70F86DCL,
+        0x07F9C9EEL, 0x41041F0FL, 0x404779A4L, 0x5D886E17L,
+        0x325F51EBL, 0xD59BC0D1L, 0xF2BCC18FL, 0x41113564L,
+        0x257B7834L, 0x602A9C60L, 0xDFF8E8A3L, 0x1F636C1BL,
+        0x0E12B4C2L, 0x02E1329EL, 0xAF664FD1L, 0xCAD18115L,
+        0x6B2395E0L, 0x333E92E1L, 0x3B240B62L, 0xEEBEB922L,
+        0x85B2A20EL, 0xE6BA0D99L, 0xDE720C8CL, 0x2DA2F728L,
+        0xD0127845L, 0x95B794FDL, 0x647D0862L, 0xE7CCF5F0L,
+        0x5449A36FL, 0x877D48FAL, 0xC39DFD27L, 0xF33E8D1EL,
+        0x0A476341L, 0x992EFF74L, 0x3A6F6EABL, 0xF4F8FD37L,
+        0xA812DC60L, 0xA1EBDDF8L, 0x991BE14CL, 0xDB6E6B0DL,
+        0xC67B5510L, 0x6D672C37L, 0x2765D43BL, 0xDCD0E804L,
+        0xF1290DC7L, 0xCC00FFA3L, 0xB5390F92L, 0x690FED0BL,
+        0x667B9FFBL, 0xCEDB7D9CL, 0xA091CF0BL, 0xD9155EA3L,
+        0xBB132F88L, 0x515BAD24L, 0x7B9479BFL, 0x763BD6EBL,
+        0x37392EB3L, 0xCC115979L, 0x8026E297L, 0xF42E312DL,
+        0x6842ADA7L, 0xC66A2B3BL, 0x12754CCCL, 0x782EF11CL,
+        0x6A124237L, 0xB79251E7L, 0x06A1BBE6L, 0x4BFB6350L,
+        0x1A6B1018L, 0x11CAEDFAL, 0x3D25BDD8L, 0xE2E1C3C9L,
+        0x44421659L, 0x0A121386L, 0xD90CEC6EL, 0xD5ABEA2AL,
+        0x64AF674EL, 0xDA86A85FL, 0xBEBFE988L, 0x64E4C3FEL,
+        0x9DBC8057L, 0xF0F7C086L, 0x60787BF8L, 0x6003604DL,
+        0xD1FD8346L, 0xF6381FB0L, 0x7745AE04L, 0xD736FCCCL,
+        0x83426B33L, 0xF01EAB71L, 0xB0804187L, 0x3C005E5FL,
+        0x77A057BEL, 0xBDE8AE24L, 0x55464299L, 0xBF582E61L,
+        0x4E58F48FL, 0xF2DDFDA2L, 0xF474EF38L, 0x8789BDC2L,
+        0x5366F9C3L, 0xC8B38E74L, 0xB475F255L, 0x46FCD9B9L,
+        0x7AEB2661L, 0x8B1DDF84L, 0x846A0E79L, 0x915F95E2L,
+        0x466E598EL, 0x20B45770L, 0x8CD55591L, 0xC902DE4CL,
+        0xB90BACE1L, 0xBB8205D0L, 0x11A86248L, 0x7574A99EL,
+        0xB77F19B6L, 0xE0A9DC09L, 0x662D09A1L, 0xC4324633L,
+        0xE85A1F02L, 0x09F0BE8CL, 0x4A99A025L, 0x1D6EFE10L,
+        0x1AB93D1DL, 0x0BA5A4DFL, 0xA186F20FL, 0x2868F169L,
+        0xDCB7DA83L, 0x573906FEL, 0xA1E2CE9BL, 0x4FCD7F52L,
+        0x50115E01L, 0xA70683FAL, 0xA002B5C4L, 0x0DE6D027L,
+        0x9AF88C27L, 0x773F8641L, 0xC3604C06L, 0x61A806B5L,
+        0xF0177A28L, 0xC0F586E0L, 0x006058AAL, 0x30DC7D62L,
+        0x11E69ED7L, 0x2338EA63L, 0x53C2DD94L, 0xC2C21634L,
+        0xBBCBEE56L, 0x90BCB6DEL, 0xEBFC7DA1L, 0xCE591D76L,
+        0x6F05E409L, 0x4B7C0188L, 0x39720A3DL, 0x7C927C24L,
+        0x86E3725FL, 0x724D9DB9L, 0x1AC15BB4L, 0xD39EB8FCL,
+        0xED545578L, 0x08FCA5B5L, 0xD83D7CD3L, 0x4DAD0FC4L,
+        0x1E50EF5EL, 0xB161E6F8L, 0xA28514D9L, 0x6C51133CL,
+        0x6FD5C7E7L, 0x56E14EC4L, 0x362ABFCEL, 0xDDC6C837L,
+        0xD79A3234L, 0x92638212L, 0x670EFA8EL, 0x406000E0L  },
+    {   0x3A39CE37L, 0xD3FAF5CFL, 0xABC27737L, 0x5AC52D1BL,
+        0x5CB0679EL, 0x4FA33742L, 0xD3822740L, 0x99BC9BBEL,
+        0xD5118E9DL, 0xBF0F7315L, 0xD62D1C7EL, 0xC700C47BL,
+        0xB78C1B6BL, 0x21A19045L, 0xB26EB1BEL, 0x6A366EB4L,
+        0x5748AB2FL, 0xBC946E79L, 0xC6A376D2L, 0x6549C2C8L,
+        0x530FF8EEL, 0x468DDE7DL, 0xD5730A1DL, 0x4CD04DC6L,
+        0x2939BBDBL, 0xA9BA4650L, 0xAC9526E8L, 0xBE5EE304L,
+        0xA1FAD5F0L, 0x6A2D519AL, 0x63EF8CE2L, 0x9A86EE22L,
+        0xC089C2B8L, 0x43242EF6L, 0xA51E03AAL, 0x9CF2D0A4L,
+        0x83C061BAL, 0x9BE96A4DL, 0x8FE51550L, 0xBA645BD6L,
+        0x2826A2F9L, 0xA73A3AE1L, 0x4BA99586L, 0xEF5562E9L,
+        0xC72FEFD3L, 0xF752F7DAL, 0x3F046F69L, 0x77FA0A59L,
+        0x80E4A915L, 0x87B08601L, 0x9B09E6ADL, 0x3B3EE593L,
+        0xE990FD5AL, 0x9E34D797L, 0x2CF0B7D9L, 0x022B8B51L,
+        0x96D5AC3AL, 0x017DA67DL, 0xD1CF3ED6L, 0x7C7D2D28L,
+        0x1F9F25CFL, 0xADF2B89BL, 0x5AD6B472L, 0x5A88F54CL,
+        0xE029AC71L, 0xE019A5E6L, 0x47B0ACFDL, 0xED93FA9BL,
+        0xE8D3C48DL, 0x283B57CCL, 0xF8D56629L, 0x79132E28L,
+        0x785F0191L, 0xED756055L, 0xF7960E44L, 0xE3D35E8CL,
+        0x15056DD4L, 0x88F46DBAL, 0x03A16125L, 0x0564F0BDL,
+        0xC3EB9E15L, 0x3C9057A2L, 0x97271AECL, 0xA93A072AL,
+        0x1B3F6D9BL, 0x1E6321F5L, 0xF59C66FBL, 0x26DCF319L,
+        0x7533D928L, 0xB155FDF5L, 0x03563482L, 0x8ABA3CBBL,
+        0x28517711L, 0xC20AD9F8L, 0xABCC5167L, 0xCCAD925FL,
+        0x4DE81751L, 0x3830DC8EL, 0x379D5862L, 0x9320F991L,
+        0xEA7A90C2L, 0xFB3E7BCEL, 0x5121CE64L, 0x774FBE32L,
+        0xA8B6E37EL, 0xC3293D46L, 0x48DE5369L, 0x6413E680L,
+        0xA2AE0810L, 0xDD6DB224L, 0x69852DFDL, 0x09072166L,
+        0xB39A460AL, 0x6445C0DDL, 0x586CDECFL, 0x1C20C8AEL,
+        0x5BBEF7DDL, 0x1B588D40L, 0xCCD2017FL, 0x6BB4E3BBL,
+        0xDDA26A7EL, 0x3A59FF45L, 0x3E350A44L, 0xBCB4CDD5L,
+        0x72EACEA8L, 0xFA6484BBL, 0x8D6612AEL, 0xBF3C6F47L,
+        0xD29BE463L, 0x542F5D9EL, 0xAEC2771BL, 0xF64E6370L,
+        0x740E0D8DL, 0xE75B1357L, 0xF8721671L, 0xAF537D5DL,
+        0x4040CB08L, 0x4EB4E2CCL, 0x34D2466AL, 0x0115AF84L,
+        0xE1B00428L, 0x95983A1DL, 0x06B89FB4L, 0xCE6EA048L,
+        0x6F3F3B82L, 0x3520AB82L, 0x011A1D4BL, 0x277227F8L,
+        0x611560B1L, 0xE7933FDCL, 0xBB3A792BL, 0x344525BDL,
+        0xA08839E1L, 0x51CE794BL, 0x2F32C9B7L, 0xA01FBAC9L,
+        0xE01CC87EL, 0xBCC7D1F6L, 0xCF0111C3L, 0xA1E8AAC7L,
+        0x1A908749L, 0xD44FBD9AL, 0xD0DADECBL, 0xD50ADA38L,
+        0x0339C32AL, 0xC6913667L, 0x8DF9317CL, 0xE0B12B4FL,
+        0xF79E59B7L, 0x43F5BB3AL, 0xF2D519FFL, 0x27D9459CL,
+        0xBF97222CL, 0x15E6FC2AL, 0x0F91FC71L, 0x9B941525L,
+        0xFAE59361L, 0xCEB69CEBL, 0xC2A86459L, 0x12BAA8D1L,
+        0xB6C1075EL, 0xE3056A0CL, 0x10D25065L, 0xCB03A442L,
+        0xE0EC6E0EL, 0x1698DB3BL, 0x4C98A0BEL, 0x3278E964L,
+        0x9F1F9532L, 0xE0D392DFL, 0xD3A0342BL, 0x8971F21EL,
+        0x1B0A7441L, 0x4BA3348CL, 0xC5BE7120L, 0xC37632D8L,
+        0xDF359F8DL, 0x9B992F2EL, 0xE60B6F47L, 0x0FE3F11DL,
+        0xE54CDA54L, 0x1EDAD891L, 0xCE6279CFL, 0xCD3E7E6FL,
+        0x1618B166L, 0xFD2C1D05L, 0x848FD2C5L, 0xF6FB2299L,
+        0xF523F357L, 0xA6327623L, 0x93A83531L, 0x56CCCD02L,
+        0xACF08162L, 0x5A75EBB5L, 0x6E163697L, 0x88D273CCL,
+        0xDE966292L, 0x81B949D0L, 0x4C50901BL, 0x71C65614L,
+        0xE6C6C7BDL, 0x327A140AL, 0x45E1D006L, 0xC3F27B9AL,
+        0xC9AA53FDL, 0x62A80F00L, 0xBB25BFE2L, 0x35BDD2F6L,
+        0x71126905L, 0xB2040222L, 0xB6CBCF7CL, 0xCD769C2BL,
+        0x53113EC0L, 0x1640E3D3L, 0x38ABBD60L, 0x2547ADF0L,
+        0xBA38209CL, 0xF746CE76L, 0x77AFA1C5L, 0x20756060L,
+        0x85CBFE4EL, 0x8AE88DD8L, 0x7AAAF9B0L, 0x4CF9AA7EL,
+        0x1948C25CL, 0x02FB8A8CL, 0x01C36AE4L, 0xD6EBE1F9L,
+        0x90D4F869L, 0xA65CDEA0L, 0x3F09252DL, 0xC208E69FL,
+        0xB74E6132L, 0xCE77E25BL, 0x578FDFE3L, 0x3AC372E6L  }
+};
+
+#endif /* !MBEDTLS_BLOWFISH_ALT */
+#endif /* MBEDTLS_BLOWFISH_C */
diff --git a/common/mbedtls/blowfish.h b/common/mbedtls/blowfish.h
new file mode 100644
index 000000000..b63af8cdd
--- /dev/null
+++ b/common/mbedtls/blowfish.h
@@ -0,0 +1,246 @@
+/**
+ * \file blowfish.h
+ *
+ * \brief Blowfish block cipher
+ */
+/*
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+#ifndef MBEDTLS_BLOWFISH_H
+#define MBEDTLS_BLOWFISH_H
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#include <stddef.h>
+#include <stdint.h>
+
+#define MBEDTLS_BLOWFISH_ENCRYPT     1
+#define MBEDTLS_BLOWFISH_DECRYPT     0
+#define MBEDTLS_BLOWFISH_MAX_KEY_BITS     448
+#define MBEDTLS_BLOWFISH_MIN_KEY_BITS     32
+#define MBEDTLS_BLOWFISH_ROUNDS      16         /**< Rounds to use. When increasing this value, make sure to extend the initialisation vectors */
+#define MBEDTLS_BLOWFISH_BLOCKSIZE   8          /* Blowfish uses 64 bit blocks */
+
+#define MBEDTLS_ERR_BLOWFISH_INVALID_KEY_LENGTH                -0x0016  /**< Invalid key length. */
+#define MBEDTLS_ERR_BLOWFISH_HW_ACCEL_FAILED                   -0x0017  /**< Blowfish hardware accelerator failed. */
+#define MBEDTLS_ERR_BLOWFISH_INVALID_INPUT_LENGTH              -0x0018  /**< Invalid data input length. */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if !defined(MBEDTLS_BLOWFISH_ALT)
+// Regular implementation
+//
+
+/**
+ * \brief          Blowfish context structure
+ */
+typedef struct mbedtls_blowfish_context
+{
+    uint32_t P[MBEDTLS_BLOWFISH_ROUNDS + 2];    /*!<  Blowfish round keys    */
+    uint32_t S[4][256];                 /*!<  key dependent S-boxes  */
+}
+mbedtls_blowfish_context;
+
+#else  /* MBEDTLS_BLOWFISH_ALT */
+#include "blowfish_alt.h"
+#endif /* MBEDTLS_BLOWFISH_ALT */
+
+/**
+ * \brief          Initialize Blowfish context
+ *
+ * \param ctx      Blowfish context to be initialized
+ */
+void mbedtls_blowfish_init( mbedtls_blowfish_context *ctx );
+
+/**
+ * \brief          Clear Blowfish context
+ *
+ * \param ctx      Blowfish context to be cleared
+ */
+void mbedtls_blowfish_free( mbedtls_blowfish_context *ctx );
+
+/**
+ * \brief          Blowfish key schedule
+ *
+ * \param ctx      Blowfish context to be initialized
+ * \param key      encryption key
+ * \param keybits  must be between 32 and 448 bits
+ *
+ * \return         0 if successful, or MBEDTLS_ERR_BLOWFISH_INVALID_KEY_LENGTH
+ */
+int mbedtls_blowfish_setkey( mbedtls_blowfish_context *ctx, const unsigned char *key,
+                     unsigned int keybits );
+
+/**
+ * \brief          Blowfish-ECB block encryption/decryption
+ *
+ * \param ctx      Blowfish context
+ * \param mode     MBEDTLS_BLOWFISH_ENCRYPT or MBEDTLS_BLOWFISH_DECRYPT
+ * \param input    8-byte input block
+ * \param output   8-byte output block
+ *
+ * \return         0 if successful
+ */
+int mbedtls_blowfish_crypt_ecb( mbedtls_blowfish_context *ctx,
+                        int mode,
+                        const unsigned char input[MBEDTLS_BLOWFISH_BLOCKSIZE],
+                        unsigned char output[MBEDTLS_BLOWFISH_BLOCKSIZE] );
+
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+/**
+ * \brief          Blowfish-CBC buffer encryption/decryption
+ *                 Length should be a multiple of the block
+ *                 size (8 bytes)
+ *
+ * \note           Upon exit, the content of the IV is updated so that you can
+ *                 call the function same function again on the following
+ *                 block(s) of data and get the same result as if it was
+ *                 encrypted in one call. This allows a "streaming" usage.
+ *                 If on the other hand you need to retain the contents of the
+ *                 IV, you should either save it manually or use the cipher
+ *                 module instead.
+ *
+ * \param ctx      Blowfish context
+ * \param mode     MBEDTLS_BLOWFISH_ENCRYPT or MBEDTLS_BLOWFISH_DECRYPT
+ * \param length   length of the input data
+ * \param iv       initialization vector (updated after use)
+ * \param input    buffer holding the input data
+ * \param output   buffer holding the output data
+ *
+ * \return         0 if successful, or
+ *                 MBEDTLS_ERR_BLOWFISH_INVALID_INPUT_LENGTH
+ */
+int mbedtls_blowfish_crypt_cbc( mbedtls_blowfish_context *ctx,
+                        int mode,
+                        size_t length,
+                        unsigned char iv[MBEDTLS_BLOWFISH_BLOCKSIZE],
+                        const unsigned char *input,
+                        unsigned char *output );
+#endif /* MBEDTLS_CIPHER_MODE_CBC */
+
+#if defined(MBEDTLS_CIPHER_MODE_CFB)
+/**
+ * \brief          Blowfish CFB buffer encryption/decryption.
+ *
+ * \note           Upon exit, the content of the IV is updated so that you can
+ *                 call the function same function again on the following
+ *                 block(s) of data and get the same result as if it was
+ *                 encrypted in one call. This allows a "streaming" usage.
+ *                 If on the other hand you need to retain the contents of the
+ *                 IV, you should either save it manually or use the cipher
+ *                 module instead.
+ *
+ * \param ctx      Blowfish context
+ * \param mode     MBEDTLS_BLOWFISH_ENCRYPT or MBEDTLS_BLOWFISH_DECRYPT
+ * \param length   length of the input data
+ * \param iv_off   offset in IV (updated after use)
+ * \param iv       initialization vector (updated after use)
+ * \param input    buffer holding the input data
+ * \param output   buffer holding the output data
+ *
+ * \return         0 if successful
+ */
+int mbedtls_blowfish_crypt_cfb64( mbedtls_blowfish_context *ctx,
+                          int mode,
+                          size_t length,
+                          size_t *iv_off,
+                          unsigned char iv[MBEDTLS_BLOWFISH_BLOCKSIZE],
+                          const unsigned char *input,
+                          unsigned char *output );
+#endif /*MBEDTLS_CIPHER_MODE_CFB */
+
+#if defined(MBEDTLS_CIPHER_MODE_CTR)
+/**
+ * \brief               Blowfish-CTR buffer encryption/decryption
+ *
+ * \warning    You must never reuse a nonce value with the same key. Doing so
+ *             would void the encryption for the two messages encrypted with
+ *             the same nonce and key.
+ *
+ *             There are two common strategies for managing nonces with CTR:
+ *
+ *             1. You can handle everything as a single message processed over
+ *             successive calls to this function. In that case, you want to
+ *             set \p nonce_counter and \p nc_off to 0 for the first call, and
+ *             then preserve the values of \p nonce_counter, \p nc_off and \p
+ *             stream_block across calls to this function as they will be
+ *             updated by this function.
+ *
+ *             With this strategy, you must not encrypt more than 2**64
+ *             blocks of data with the same key.
+ *
+ *             2. You can encrypt separate messages by dividing the \p
+ *             nonce_counter buffer in two areas: the first one used for a
+ *             per-message nonce, handled by yourself, and the second one
+ *             updated by this function internally.
+ *
+ *             For example, you might reserve the first 4 bytes for the
+ *             per-message nonce, and the last 4 bytes for internal use. In that
+ *             case, before calling this function on a new message you need to
+ *             set the first 4 bytes of \p nonce_counter to your chosen nonce
+ *             value, the last 4 to 0, and \p nc_off to 0 (which will cause \p
+ *             stream_block to be ignored). That way, you can encrypt at most
+ *             2**32 messages of up to 2**32 blocks each with the same key.
+ *
+ *             The per-message nonce (or information sufficient to reconstruct
+ *             it) needs to be communicated with the ciphertext and must be unique.
+ *             The recommended way to ensure uniqueness is to use a message
+ *             counter.
+ *
+ *             Note that for both stategies, sizes are measured in blocks and
+ *             that a Blowfish block is 8 bytes.
+ *
+ * \warning    Upon return, \p stream_block contains sensitive data. Its
+ *             content must not be written to insecure storage and should be
+ *             securely discarded as soon as it's no longer needed.
+ *
+ * \param ctx           Blowfish context
+ * \param length        The length of the data
+ * \param nc_off        The offset in the current stream_block (for resuming
+ *                      within current cipher stream). The offset pointer to
+ *                      should be 0 at the start of a stream.
+ * \param nonce_counter The 64-bit nonce and counter.
+ * \param stream_block  The saved stream-block for resuming. Is overwritten
+ *                      by the function.
+ * \param input         The input data stream
+ * \param output        The output data stream
+ *
+ * \return         0 if successful
+ */
+int mbedtls_blowfish_crypt_ctr( mbedtls_blowfish_context *ctx,
+                        size_t length,
+                        size_t *nc_off,
+                        unsigned char nonce_counter[MBEDTLS_BLOWFISH_BLOCKSIZE],
+                        unsigned char stream_block[MBEDTLS_BLOWFISH_BLOCKSIZE],
+                        const unsigned char *input,
+                        unsigned char *output );
+#endif /* MBEDTLS_CIPHER_MODE_CTR */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* blowfish.h */
diff --git a/common/mbedtls/bn_mul.h b/common/mbedtls/bn_mul.h
new file mode 100644
index 000000000..ff0c9fe23
--- /dev/null
+++ b/common/mbedtls/bn_mul.h
@@ -0,0 +1,895 @@
+/**
+ * \file bn_mul.h
+ *
+ * \brief Multi-precision integer library
+ */
+/*
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+/*
+ *      Multiply source vector [s] with b, add result
+ *       to destination vector [d] and set carry c.
+ *
+ *      Currently supports:
+ *
+ *         . IA-32 (386+)         . AMD64 / EM64T
+ *         . IA-32 (SSE2)         . Motorola 68000
+ *         . PowerPC, 32-bit      . MicroBlaze
+ *         . PowerPC, 64-bit      . TriCore
+ *         . SPARC v8             . ARM v3+
+ *         . Alpha                . MIPS32
+ *         . C, longlong          . C, generic
+ */
+#ifndef MBEDTLS_BN_MUL_H
+#define MBEDTLS_BN_MUL_H
+
+#include "bignum.h"
+
+#if defined(MBEDTLS_HAVE_ASM)
+
+#ifndef asm
+#define asm __asm
+#endif
+
+/* armcc5 --gnu defines __GNUC__ but doesn't support GNU's extended asm */
+#if defined(__GNUC__) && \
+    ( !defined(__ARMCC_VERSION) || __ARMCC_VERSION >= 6000000 )
+
+/*
+ * Disable use of the i386 assembly code below if option -O0, to disable all
+ * compiler optimisations, is passed, detected with __OPTIMIZE__
+ * This is done as the number of registers used in the assembly code doesn't
+ * work with the -O0 option.
+ */
+#if defined(__i386__) && defined(__OPTIMIZE__)
+
+#define MULADDC_INIT                        \
+    asm(                                    \
+        "movl   %%ebx, %0           \n\t"   \
+        "movl   %5, %%esi           \n\t"   \
+        "movl   %6, %%edi           \n\t"   \
+        "movl   %7, %%ecx           \n\t"   \
+        "movl   %8, %%ebx           \n\t"
+
+#define MULADDC_CORE                        \
+        "lodsl                      \n\t"   \
+        "mull   %%ebx               \n\t"   \
+        "addl   %%ecx,   %%eax      \n\t"   \
+        "adcl   $0,      %%edx      \n\t"   \
+        "addl   (%%edi), %%eax      \n\t"   \
+        "adcl   $0,      %%edx      \n\t"   \
+        "movl   %%edx,   %%ecx      \n\t"   \
+        "stosl                      \n\t"
+
+#if defined(MBEDTLS_HAVE_SSE2)
+
+#define MULADDC_HUIT                            \
+        "movd     %%ecx,     %%mm1      \n\t"   \
+        "movd     %%ebx,     %%mm0      \n\t"   \
+        "movd     (%%edi),   %%mm3      \n\t"   \
+        "paddq    %%mm3,     %%mm1      \n\t"   \
+        "movd     (%%esi),   %%mm2      \n\t"   \
+        "pmuludq  %%mm0,     %%mm2      \n\t"   \
+        "movd     4(%%esi),  %%mm4      \n\t"   \
+        "pmuludq  %%mm0,     %%mm4      \n\t"   \
+        "movd     8(%%esi),  %%mm6      \n\t"   \
+        "pmuludq  %%mm0,     %%mm6      \n\t"   \
+        "movd     12(%%esi), %%mm7      \n\t"   \
+        "pmuludq  %%mm0,     %%mm7      \n\t"   \
+        "paddq    %%mm2,     %%mm1      \n\t"   \
+        "movd     4(%%edi),  %%mm3      \n\t"   \
+        "paddq    %%mm4,     %%mm3      \n\t"   \
+        "movd     8(%%edi),  %%mm5      \n\t"   \
+        "paddq    %%mm6,     %%mm5      \n\t"   \
+        "movd     12(%%edi), %%mm4      \n\t"   \
+        "paddq    %%mm4,     %%mm7      \n\t"   \
+        "movd     %%mm1,     (%%edi)    \n\t"   \
+        "movd     16(%%esi), %%mm2      \n\t"   \
+        "pmuludq  %%mm0,     %%mm2      \n\t"   \
+        "psrlq    $32,       %%mm1      \n\t"   \
+        "movd     20(%%esi), %%mm4      \n\t"   \
+        "pmuludq  %%mm0,     %%mm4      \n\t"   \
+        "paddq    %%mm3,     %%mm1      \n\t"   \
+        "movd     24(%%esi), %%mm6      \n\t"   \
+        "pmuludq  %%mm0,     %%mm6      \n\t"   \
+        "movd     %%mm1,     4(%%edi)   \n\t"   \
+        "psrlq    $32,       %%mm1      \n\t"   \
+        "movd     28(%%esi), %%mm3      \n\t"   \
+        "pmuludq  %%mm0,     %%mm3      \n\t"   \
+        "paddq    %%mm5,     %%mm1      \n\t"   \
+        "movd     16(%%edi), %%mm5      \n\t"   \
+        "paddq    %%mm5,     %%mm2      \n\t"   \
+        "movd     %%mm1,     8(%%edi)   \n\t"   \
+        "psrlq    $32,       %%mm1      \n\t"   \
+        "paddq    %%mm7,     %%mm1      \n\t"   \
+        "movd     20(%%edi), %%mm5      \n\t"   \
+        "paddq    %%mm5,     %%mm4      \n\t"   \
+        "movd     %%mm1,     12(%%edi)  \n\t"   \
+        "psrlq    $32,       %%mm1      \n\t"   \
+        "paddq    %%mm2,     %%mm1      \n\t"   \
+        "movd     24(%%edi), %%mm5      \n\t"   \
+        "paddq    %%mm5,     %%mm6      \n\t"   \
+        "movd     %%mm1,     16(%%edi)  \n\t"   \
+        "psrlq    $32,       %%mm1      \n\t"   \
+        "paddq    %%mm4,     %%mm1      \n\t"   \
+        "movd     28(%%edi), %%mm5      \n\t"   \
+        "paddq    %%mm5,     %%mm3      \n\t"   \
+        "movd     %%mm1,     20(%%edi)  \n\t"   \
+        "psrlq    $32,       %%mm1      \n\t"   \
+        "paddq    %%mm6,     %%mm1      \n\t"   \
+        "movd     %%mm1,     24(%%edi)  \n\t"   \
+        "psrlq    $32,       %%mm1      \n\t"   \
+        "paddq    %%mm3,     %%mm1      \n\t"   \
+        "movd     %%mm1,     28(%%edi)  \n\t"   \
+        "addl     $32,       %%edi      \n\t"   \
+        "addl     $32,       %%esi      \n\t"   \
+        "psrlq    $32,       %%mm1      \n\t"   \
+        "movd     %%mm1,     %%ecx      \n\t"
+
+#define MULADDC_STOP                    \
+        "emms                   \n\t"   \
+        "movl   %4, %%ebx       \n\t"   \
+        "movl   %%ecx, %1       \n\t"   \
+        "movl   %%edi, %2       \n\t"   \
+        "movl   %%esi, %3       \n\t"   \
+        : "=m" (t), "=m" (c), "=m" (d), "=m" (s)        \
+        : "m" (t), "m" (s), "m" (d), "m" (c), "m" (b)   \
+        : "eax", "ebx", "ecx", "edx", "esi", "edi"      \
+    );
+
+#else
+
+#define MULADDC_STOP                    \
+        "movl   %4, %%ebx       \n\t"   \
+        "movl   %%ecx, %1       \n\t"   \
+        "movl   %%edi, %2       \n\t"   \
+        "movl   %%esi, %3       \n\t"   \
+        : "=m" (t), "=m" (c), "=m" (d), "=m" (s)        \
+        : "m" (t), "m" (s), "m" (d), "m" (c), "m" (b)   \
+        : "eax", "ebx", "ecx", "edx", "esi", "edi"      \
+    );
+#endif /* SSE2 */
+#endif /* i386 */
+
+#if defined(__amd64__) || defined (__x86_64__)
+
+#define MULADDC_INIT                        \
+    asm(                                    \
+        "xorq   %%r8, %%r8          \n\t"
+
+#define MULADDC_CORE                        \
+        "movq   (%%rsi), %%rax      \n\t"   \
+        "mulq   %%rbx               \n\t"   \
+        "addq   $8,      %%rsi      \n\t"   \
+        "addq   %%rcx,   %%rax      \n\t"   \
+        "movq   %%r8,    %%rcx      \n\t"   \
+        "adcq   $0,      %%rdx      \n\t"   \
+        "nop                        \n\t"   \
+        "addq   %%rax,   (%%rdi)    \n\t"   \
+        "adcq   %%rdx,   %%rcx      \n\t"   \
+        "addq   $8,      %%rdi      \n\t"
+
+#define MULADDC_STOP                        \
+        : "+c" (c), "+D" (d), "+S" (s)      \
+        : "b" (b)                           \
+        : "rax", "rdx", "r8"                \
+    );
+
+#endif /* AMD64 */
+
+#if defined(__mc68020__) || defined(__mcpu32__)
+
+#define MULADDC_INIT                    \
+    asm(                                \
+        "movl   %3, %%a2        \n\t"   \
+        "movl   %4, %%a3        \n\t"   \
+        "movl   %5, %%d3        \n\t"   \
+        "movl   %6, %%d2        \n\t"   \
+        "moveq  #0, %%d0        \n\t"
+
+#define MULADDC_CORE                    \
+        "movel  %%a2@+, %%d1    \n\t"   \
+        "mulul  %%d2, %%d4:%%d1 \n\t"   \
+        "addl   %%d3, %%d1      \n\t"   \
+        "addxl  %%d0, %%d4      \n\t"   \
+        "moveq  #0,   %%d3      \n\t"   \
+        "addl   %%d1, %%a3@+    \n\t"   \
+        "addxl  %%d4, %%d3      \n\t"
+
+#define MULADDC_STOP                    \
+        "movl   %%d3, %0        \n\t"   \
+        "movl   %%a3, %1        \n\t"   \
+        "movl   %%a2, %2        \n\t"   \
+        : "=m" (c), "=m" (d), "=m" (s)              \
+        : "m" (s), "m" (d), "m" (c), "m" (b)        \
+        : "d0", "d1", "d2", "d3", "d4", "a2", "a3"  \
+    );
+
+#define MULADDC_HUIT                        \
+        "movel  %%a2@+,  %%d1       \n\t"   \
+        "mulul  %%d2,    %%d4:%%d1  \n\t"   \
+        "addxl  %%d3,    %%d1       \n\t"   \
+        "addxl  %%d0,    %%d4       \n\t"   \
+        "addl   %%d1,    %%a3@+     \n\t"   \
+        "movel  %%a2@+,  %%d1       \n\t"   \
+        "mulul  %%d2,    %%d3:%%d1  \n\t"   \
+        "addxl  %%d4,    %%d1       \n\t"   \
+        "addxl  %%d0,    %%d3       \n\t"   \
+        "addl   %%d1,    %%a3@+     \n\t"   \
+        "movel  %%a2@+,  %%d1       \n\t"   \
+        "mulul  %%d2,    %%d4:%%d1  \n\t"   \
+        "addxl  %%d3,    %%d1       \n\t"   \
+        "addxl  %%d0,    %%d4       \n\t"   \
+        "addl   %%d1,    %%a3@+     \n\t"   \
+        "movel  %%a2@+,  %%d1       \n\t"   \
+        "mulul  %%d2,    %%d3:%%d1  \n\t"   \
+        "addxl  %%d4,    %%d1       \n\t"   \
+        "addxl  %%d0,    %%d3       \n\t"   \
+        "addl   %%d1,    %%a3@+     \n\t"   \
+        "movel  %%a2@+,  %%d1       \n\t"   \
+        "mulul  %%d2,    %%d4:%%d1  \n\t"   \
+        "addxl  %%d3,    %%d1       \n\t"   \
+        "addxl  %%d0,    %%d4       \n\t"   \
+        "addl   %%d1,    %%a3@+     \n\t"   \
+        "movel  %%a2@+,  %%d1       \n\t"   \
+        "mulul  %%d2,    %%d3:%%d1  \n\t"   \
+        "addxl  %%d4,    %%d1       \n\t"   \
+        "addxl  %%d0,    %%d3       \n\t"   \
+        "addl   %%d1,    %%a3@+     \n\t"   \
+        "movel  %%a2@+,  %%d1       \n\t"   \
+        "mulul  %%d2,    %%d4:%%d1  \n\t"   \
+        "addxl  %%d3,    %%d1       \n\t"   \
+        "addxl  %%d0,    %%d4       \n\t"   \
+        "addl   %%d1,    %%a3@+     \n\t"   \
+        "movel  %%a2@+,  %%d1       \n\t"   \
+        "mulul  %%d2,    %%d3:%%d1  \n\t"   \
+        "addxl  %%d4,    %%d1       \n\t"   \
+        "addxl  %%d0,    %%d3       \n\t"   \
+        "addl   %%d1,    %%a3@+     \n\t"   \
+        "addxl  %%d0,    %%d3       \n\t"
+
+#endif /* MC68000 */
+
+#if defined(__powerpc64__) || defined(__ppc64__)
+
+#if defined(__MACH__) && defined(__APPLE__)
+
+#define MULADDC_INIT                        \
+    asm(                                    \
+        "ld     r3, %3              \n\t"   \
+        "ld     r4, %4              \n\t"   \
+        "ld     r5, %5              \n\t"   \
+        "ld     r6, %6              \n\t"   \
+        "addi   r3, r3, -8          \n\t"   \
+        "addi   r4, r4, -8          \n\t"   \
+        "addic  r5, r5,  0          \n\t"
+
+#define MULADDC_CORE                        \
+        "ldu    r7, 8(r3)           \n\t"   \
+        "mulld  r8, r7, r6          \n\t"   \
+        "mulhdu r9, r7, r6          \n\t"   \
+        "adde   r8, r8, r5          \n\t"   \
+        "ld     r7, 8(r4)           \n\t"   \
+        "addze  r5, r9              \n\t"   \
+        "addc   r8, r8, r7          \n\t"   \
+        "stdu   r8, 8(r4)           \n\t"
+
+#define MULADDC_STOP                        \
+        "addze  r5, r5              \n\t"   \
+        "addi   r4, r4, 8           \n\t"   \
+        "addi   r3, r3, 8           \n\t"   \
+        "std    r5, %0              \n\t"   \
+        "std    r4, %1              \n\t"   \
+        "std    r3, %2              \n\t"   \
+        : "=m" (c), "=m" (d), "=m" (s)              \
+        : "m" (s), "m" (d), "m" (c), "m" (b)        \
+        : "r3", "r4", "r5", "r6", "r7", "r8", "r9"  \
+    );
+
+
+#else /* __MACH__ && __APPLE__ */
+
+#define MULADDC_INIT                        \
+    asm(                                    \
+        "ld     %%r3, %3            \n\t"   \
+        "ld     %%r4, %4            \n\t"   \
+        "ld     %%r5, %5            \n\t"   \
+        "ld     %%r6, %6            \n\t"   \
+        "addi   %%r3, %%r3, -8      \n\t"   \
+        "addi   %%r4, %%r4, -8      \n\t"   \
+        "addic  %%r5, %%r5,  0      \n\t"
+
+#define MULADDC_CORE                        \
+        "ldu    %%r7, 8(%%r3)       \n\t"   \
+        "mulld  %%r8, %%r7, %%r6    \n\t"   \
+        "mulhdu %%r9, %%r7, %%r6    \n\t"   \
+        "adde   %%r8, %%r8, %%r5    \n\t"   \
+        "ld     %%r7, 8(%%r4)       \n\t"   \
+        "addze  %%r5, %%r9          \n\t"   \
+        "addc   %%r8, %%r8, %%r7    \n\t"   \
+        "stdu   %%r8, 8(%%r4)       \n\t"
+
+#define MULADDC_STOP                        \
+        "addze  %%r5, %%r5          \n\t"   \
+        "addi   %%r4, %%r4, 8       \n\t"   \
+        "addi   %%r3, %%r3, 8       \n\t"   \
+        "std    %%r5, %0            \n\t"   \
+        "std    %%r4, %1            \n\t"   \
+        "std    %%r3, %2            \n\t"   \
+        : "=m" (c), "=m" (d), "=m" (s)              \
+        : "m" (s), "m" (d), "m" (c), "m" (b)        \
+        : "r3", "r4", "r5", "r6", "r7", "r8", "r9"  \
+    );
+
+#endif /* __MACH__ && __APPLE__ */
+
+#elif defined(__powerpc__) || defined(__ppc__) /* end PPC64/begin PPC32  */
+
+#if defined(__MACH__) && defined(__APPLE__)
+
+#define MULADDC_INIT                    \
+    asm(                                \
+        "lwz    r3, %3          \n\t"   \
+        "lwz    r4, %4          \n\t"   \
+        "lwz    r5, %5          \n\t"   \
+        "lwz    r6, %6          \n\t"   \
+        "addi   r3, r3, -4      \n\t"   \
+        "addi   r4, r4, -4      \n\t"   \
+        "addic  r5, r5,  0      \n\t"
+
+#define MULADDC_CORE                    \
+        "lwzu   r7, 4(r3)       \n\t"   \
+        "mullw  r8, r7, r6      \n\t"   \
+        "mulhwu r9, r7, r6      \n\t"   \
+        "adde   r8, r8, r5      \n\t"   \
+        "lwz    r7, 4(r4)       \n\t"   \
+        "addze  r5, r9          \n\t"   \
+        "addc   r8, r8, r7      \n\t"   \
+        "stwu   r8, 4(r4)       \n\t"
+
+#define MULADDC_STOP                    \
+        "addze  r5, r5          \n\t"   \
+        "addi   r4, r4, 4       \n\t"   \
+        "addi   r3, r3, 4       \n\t"   \
+        "stw    r5, %0          \n\t"   \
+        "stw    r4, %1          \n\t"   \
+        "stw    r3, %2          \n\t"   \
+        : "=m" (c), "=m" (d), "=m" (s)              \
+        : "m" (s), "m" (d), "m" (c), "m" (b)        \
+        : "r3", "r4", "r5", "r6", "r7", "r8", "r9"  \
+    );
+
+#else /* __MACH__ && __APPLE__ */
+
+#define MULADDC_INIT                        \
+    asm(                                    \
+        "lwz    %%r3, %3            \n\t"   \
+        "lwz    %%r4, %4            \n\t"   \
+        "lwz    %%r5, %5            \n\t"   \
+        "lwz    %%r6, %6            \n\t"   \
+        "addi   %%r3, %%r3, -4      \n\t"   \
+        "addi   %%r4, %%r4, -4      \n\t"   \
+        "addic  %%r5, %%r5,  0      \n\t"
+
+#define MULADDC_CORE                        \
+        "lwzu   %%r7, 4(%%r3)       \n\t"   \
+        "mullw  %%r8, %%r7, %%r6    \n\t"   \
+        "mulhwu %%r9, %%r7, %%r6    \n\t"   \
+        "adde   %%r8, %%r8, %%r5    \n\t"   \
+        "lwz    %%r7, 4(%%r4)       \n\t"   \
+        "addze  %%r5, %%r9          \n\t"   \
+        "addc   %%r8, %%r8, %%r7    \n\t"   \
+        "stwu   %%r8, 4(%%r4)       \n\t"
+
+#define MULADDC_STOP                        \
+        "addze  %%r5, %%r5          \n\t"   \
+        "addi   %%r4, %%r4, 4       \n\t"   \
+        "addi   %%r3, %%r3, 4       \n\t"   \
+        "stw    %%r5, %0            \n\t"   \
+        "stw    %%r4, %1            \n\t"   \
+        "stw    %%r3, %2            \n\t"   \
+        : "=m" (c), "=m" (d), "=m" (s)              \
+        : "m" (s), "m" (d), "m" (c), "m" (b)        \
+        : "r3", "r4", "r5", "r6", "r7", "r8", "r9"  \
+    );
+
+#endif /* __MACH__ && __APPLE__ */
+
+#endif /* PPC32 */
+
+/*
+ * The Sparc(64) assembly is reported to be broken.
+ * Disable it for now, until we're able to fix it.
+ */
+#if 0 && defined(__sparc__)
+#if defined(__sparc64__)
+
+#define MULADDC_INIT                                    \
+    asm(                                                \
+                "ldx     %3, %%o0               \n\t"   \
+                "ldx     %4, %%o1               \n\t"   \
+                "ld      %5, %%o2               \n\t"   \
+                "ld      %6, %%o3               \n\t"
+
+#define MULADDC_CORE                                    \
+                "ld      [%%o0], %%o4           \n\t"   \
+                "inc     4, %%o0                \n\t"   \
+                "ld      [%%o1], %%o5           \n\t"   \
+                "umul    %%o3, %%o4, %%o4       \n\t"   \
+                "addcc   %%o4, %%o2, %%o4       \n\t"   \
+                "rd      %%y, %%g1              \n\t"   \
+                "addx    %%g1, 0, %%g1          \n\t"   \
+                "addcc   %%o4, %%o5, %%o4       \n\t"   \
+                "st      %%o4, [%%o1]           \n\t"   \
+                "addx    %%g1, 0, %%o2          \n\t"   \
+                "inc     4, %%o1                \n\t"
+
+        #define MULADDC_STOP                            \
+                "st      %%o2, %0               \n\t"   \
+                "stx     %%o1, %1               \n\t"   \
+                "stx     %%o0, %2               \n\t"   \
+        : "=m" (c), "=m" (d), "=m" (s)          \
+        : "m" (s), "m" (d), "m" (c), "m" (b)    \
+        : "g1", "o0", "o1", "o2", "o3", "o4",   \
+          "o5"                                  \
+        );
+
+#else /* __sparc64__ */
+
+#define MULADDC_INIT                                    \
+    asm(                                                \
+                "ld      %3, %%o0               \n\t"   \
+                "ld      %4, %%o1               \n\t"   \
+                "ld      %5, %%o2               \n\t"   \
+                "ld      %6, %%o3               \n\t"
+
+#define MULADDC_CORE                                    \
+                "ld      [%%o0], %%o4           \n\t"   \
+                "inc     4, %%o0                \n\t"   \
+                "ld      [%%o1], %%o5           \n\t"   \
+                "umul    %%o3, %%o4, %%o4       \n\t"   \
+                "addcc   %%o4, %%o2, %%o4       \n\t"   \
+                "rd      %%y, %%g1              \n\t"   \
+                "addx    %%g1, 0, %%g1          \n\t"   \
+                "addcc   %%o4, %%o5, %%o4       \n\t"   \
+                "st      %%o4, [%%o1]           \n\t"   \
+                "addx    %%g1, 0, %%o2          \n\t"   \
+                "inc     4, %%o1                \n\t"
+
+#define MULADDC_STOP                                    \
+                "st      %%o2, %0               \n\t"   \
+                "st      %%o1, %1               \n\t"   \
+                "st      %%o0, %2               \n\t"   \
+        : "=m" (c), "=m" (d), "=m" (s)          \
+        : "m" (s), "m" (d), "m" (c), "m" (b)    \
+        : "g1", "o0", "o1", "o2", "o3", "o4",   \
+          "o5"                                  \
+        );
+
+#endif /* __sparc64__ */
+#endif /* __sparc__ */
+
+#if defined(__microblaze__) || defined(microblaze)
+
+#define MULADDC_INIT                    \
+    asm(                                \
+        "lwi   r3,   %3         \n\t"   \
+        "lwi   r4,   %4         \n\t"   \
+        "lwi   r5,   %5         \n\t"   \
+        "lwi   r6,   %6         \n\t"   \
+        "andi  r7,   r6, 0xffff \n\t"   \
+        "bsrli r6,   r6, 16     \n\t"
+
+#define MULADDC_CORE                    \
+        "lhui  r8,   r3,   0    \n\t"   \
+        "addi  r3,   r3,   2    \n\t"   \
+        "lhui  r9,   r3,   0    \n\t"   \
+        "addi  r3,   r3,   2    \n\t"   \
+        "mul   r10,  r9,  r6    \n\t"   \
+        "mul   r11,  r8,  r7    \n\t"   \
+        "mul   r12,  r9,  r7    \n\t"   \
+        "mul   r13,  r8,  r6    \n\t"   \
+        "bsrli  r8, r10,  16    \n\t"   \
+        "bsrli  r9, r11,  16    \n\t"   \
+        "add   r13, r13,  r8    \n\t"   \
+        "add   r13, r13,  r9    \n\t"   \
+        "bslli r10, r10,  16    \n\t"   \
+        "bslli r11, r11,  16    \n\t"   \
+        "add   r12, r12, r10    \n\t"   \
+        "addc  r13, r13,  r0    \n\t"   \
+        "add   r12, r12, r11    \n\t"   \
+        "addc  r13, r13,  r0    \n\t"   \
+        "lwi   r10,  r4,   0    \n\t"   \
+        "add   r12, r12, r10    \n\t"   \
+        "addc  r13, r13,  r0    \n\t"   \
+        "add   r12, r12,  r5    \n\t"   \
+        "addc   r5, r13,  r0    \n\t"   \
+        "swi   r12,  r4,   0    \n\t"   \
+        "addi   r4,  r4,   4    \n\t"
+
+#define MULADDC_STOP                    \
+        "swi   r5,   %0         \n\t"   \
+        "swi   r4,   %1         \n\t"   \
+        "swi   r3,   %2         \n\t"   \
+        : "=m" (c), "=m" (d), "=m" (s)              \
+        : "m" (s), "m" (d), "m" (c), "m" (b)        \
+        : "r3", "r4", "r5", "r6", "r7", "r8",       \
+          "r9", "r10", "r11", "r12", "r13"          \
+    );
+
+#endif /* MicroBlaze */
+
+#if defined(__tricore__)
+
+#define MULADDC_INIT                            \
+    asm(                                        \
+        "ld.a   %%a2, %3                \n\t"   \
+        "ld.a   %%a3, %4                \n\t"   \
+        "ld.w   %%d4, %5                \n\t"   \
+        "ld.w   %%d1, %6                \n\t"   \
+        "xor    %%d5, %%d5              \n\t"
+
+#define MULADDC_CORE                            \
+        "ld.w   %%d0,   [%%a2+]         \n\t"   \
+        "madd.u %%e2, %%e4, %%d0, %%d1  \n\t"   \
+        "ld.w   %%d0,   [%%a3]          \n\t"   \
+        "addx   %%d2,    %%d2,  %%d0    \n\t"   \
+        "addc   %%d3,    %%d3,    0     \n\t"   \
+        "mov    %%d4,    %%d3           \n\t"   \
+        "st.w  [%%a3+],  %%d2           \n\t"
+
+#define MULADDC_STOP                            \
+        "st.w   %0, %%d4                \n\t"   \
+        "st.a   %1, %%a3                \n\t"   \
+        "st.a   %2, %%a2                \n\t"   \
+        : "=m" (c), "=m" (d), "=m" (s)          \
+        : "m" (s), "m" (d), "m" (c), "m" (b)    \
+        : "d0", "d1", "e2", "d4", "a2", "a3"    \
+    );
+
+#endif /* TriCore */
+
+/*
+ * gcc -O0 by default uses r7 for the frame pointer, so it complains about our
+ * use of r7 below, unless -fomit-frame-pointer is passed. Unfortunately,
+ * passing that option is not easy when building with yotta.
+ *
+ * On the other hand, -fomit-frame-pointer is implied by any -Ox options with
+ * x !=0, which we can detect using __OPTIMIZE__ (which is also defined by
+ * clang and armcc5 under the same conditions).
+ *
+ * So, only use the optimized assembly below for optimized build, which avoids
+ * the build error and is pretty reasonable anyway.
+ */
+#if defined(__GNUC__) && !defined(__OPTIMIZE__)
+#define MULADDC_CANNOT_USE_R7
+#endif
+
+#if defined(__arm__) && !defined(MULADDC_CANNOT_USE_R7)
+
+#if defined(__thumb__) && !defined(__thumb2__)
+
+#define MULADDC_INIT                                    \
+    asm(                                                \
+            "ldr    r0, %3                      \n\t"   \
+            "ldr    r1, %4                      \n\t"   \
+            "ldr    r2, %5                      \n\t"   \
+            "ldr    r3, %6                      \n\t"   \
+            "lsr    r7, r3, #16                 \n\t"   \
+            "mov    r9, r7                      \n\t"   \
+            "lsl    r7, r3, #16                 \n\t"   \
+            "lsr    r7, r7, #16                 \n\t"   \
+            "mov    r8, r7                      \n\t"
+
+#define MULADDC_CORE                                    \
+            "ldmia  r0!, {r6}                   \n\t"   \
+            "lsr    r7, r6, #16                 \n\t"   \
+            "lsl    r6, r6, #16                 \n\t"   \
+            "lsr    r6, r6, #16                 \n\t"   \
+            "mov    r4, r8                      \n\t"   \
+            "mul    r4, r6                      \n\t"   \
+            "mov    r3, r9                      \n\t"   \
+            "mul    r6, r3                      \n\t"   \
+            "mov    r5, r9                      \n\t"   \
+            "mul    r5, r7                      \n\t"   \
+            "mov    r3, r8                      \n\t"   \
+            "mul    r7, r3                      \n\t"   \
+            "lsr    r3, r6, #16                 \n\t"   \
+            "add    r5, r5, r3                  \n\t"   \
+            "lsr    r3, r7, #16                 \n\t"   \
+            "add    r5, r5, r3                  \n\t"   \
+            "add    r4, r4, r2                  \n\t"   \
+            "mov    r2, #0                      \n\t"   \
+            "adc    r5, r2                      \n\t"   \
+            "lsl    r3, r6, #16                 \n\t"   \
+            "add    r4, r4, r3                  \n\t"   \
+            "adc    r5, r2                      \n\t"   \
+            "lsl    r3, r7, #16                 \n\t"   \
+            "add    r4, r4, r3                  \n\t"   \
+            "adc    r5, r2                      \n\t"   \
+            "ldr    r3, [r1]                    \n\t"   \
+            "add    r4, r4, r3                  \n\t"   \
+            "adc    r2, r5                      \n\t"   \
+            "stmia  r1!, {r4}                   \n\t"
+
+#define MULADDC_STOP                                    \
+            "str    r2, %0                      \n\t"   \
+            "str    r1, %1                      \n\t"   \
+            "str    r0, %2                      \n\t"   \
+         : "=m" (c),  "=m" (d), "=m" (s)        \
+         : "m" (s), "m" (d), "m" (c), "m" (b)   \
+         : "r0", "r1", "r2", "r3", "r4", "r5",  \
+           "r6", "r7", "r8", "r9", "cc"         \
+         );
+
+#else
+
+#define MULADDC_INIT                                    \
+    asm(                                                \
+            "ldr    r0, %3                      \n\t"   \
+            "ldr    r1, %4                      \n\t"   \
+            "ldr    r2, %5                      \n\t"   \
+            "ldr    r3, %6                      \n\t"
+
+#define MULADDC_CORE                                    \
+            "ldr    r4, [r0], #4                \n\t"   \
+            "mov    r5, #0                      \n\t"   \
+            "ldr    r6, [r1]                    \n\t"   \
+            "umlal  r2, r5, r3, r4              \n\t"   \
+            "adds   r7, r6, r2                  \n\t"   \
+            "adc    r2, r5, #0                  \n\t"   \
+            "str    r7, [r1], #4                \n\t"
+
+#define MULADDC_STOP                                    \
+            "str    r2, %0                      \n\t"   \
+            "str    r1, %1                      \n\t"   \
+            "str    r0, %2                      \n\t"   \
+         : "=m" (c),  "=m" (d), "=m" (s)        \
+         : "m" (s), "m" (d), "m" (c), "m" (b)   \
+         : "r0", "r1", "r2", "r3", "r4", "r5",  \
+           "r6", "r7", "cc"                     \
+         );
+
+#endif /* Thumb */
+
+#endif /* ARMv3 */
+
+#if defined(__alpha__)
+
+#define MULADDC_INIT                    \
+    asm(                                \
+        "ldq    $1, %3          \n\t"   \
+        "ldq    $2, %4          \n\t"   \
+        "ldq    $3, %5          \n\t"   \
+        "ldq    $4, %6          \n\t"
+
+#define MULADDC_CORE                    \
+        "ldq    $6,  0($1)      \n\t"   \
+        "addq   $1,  8, $1      \n\t"   \
+        "mulq   $6, $4, $7      \n\t"   \
+        "umulh  $6, $4, $6      \n\t"   \
+        "addq   $7, $3, $7      \n\t"   \
+        "cmpult $7, $3, $3      \n\t"   \
+        "ldq    $5,  0($2)      \n\t"   \
+        "addq   $7, $5, $7      \n\t"   \
+        "cmpult $7, $5, $5      \n\t"   \
+        "stq    $7,  0($2)      \n\t"   \
+        "addq   $2,  8, $2      \n\t"   \
+        "addq   $6, $3, $3      \n\t"   \
+        "addq   $5, $3, $3      \n\t"
+
+#define MULADDC_STOP                                    \
+        "stq    $3, %0          \n\t"   \
+        "stq    $2, %1          \n\t"   \
+        "stq    $1, %2          \n\t"   \
+        : "=m" (c), "=m" (d), "=m" (s)              \
+        : "m" (s), "m" (d), "m" (c), "m" (b)        \
+        : "$1", "$2", "$3", "$4", "$5", "$6", "$7"  \
+    );
+#endif /* Alpha */
+
+#if defined(__mips__) && !defined(__mips64)
+
+#define MULADDC_INIT                    \
+    asm(                                \
+        "lw     $10, %3         \n\t"   \
+        "lw     $11, %4         \n\t"   \
+        "lw     $12, %5         \n\t"   \
+        "lw     $13, %6         \n\t"
+
+#define MULADDC_CORE                    \
+        "lw     $14, 0($10)     \n\t"   \
+        "multu  $13, $14        \n\t"   \
+        "addi   $10, $10, 4     \n\t"   \
+        "mflo   $14             \n\t"   \
+        "mfhi   $9              \n\t"   \
+        "addu   $14, $12, $14   \n\t"   \
+        "lw     $15, 0($11)     \n\t"   \
+        "sltu   $12, $14, $12   \n\t"   \
+        "addu   $15, $14, $15   \n\t"   \
+        "sltu   $14, $15, $14   \n\t"   \
+        "addu   $12, $12, $9    \n\t"   \
+        "sw     $15, 0($11)     \n\t"   \
+        "addu   $12, $12, $14   \n\t"   \
+        "addi   $11, $11, 4     \n\t"
+
+#define MULADDC_STOP                    \
+        "sw     $12, %0         \n\t"   \
+        "sw     $11, %1         \n\t"   \
+        "sw     $10, %2         \n\t"   \
+        : "=m" (c), "=m" (d), "=m" (s)                      \
+        : "m" (s), "m" (d), "m" (c), "m" (b)                \
+        : "$9", "$10", "$11", "$12", "$13", "$14", "$15"    \
+    );
+
+#endif /* MIPS */
+#endif /* GNUC */
+
+#if (defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__)
+
+#define MULADDC_INIT                            \
+    __asm   mov     esi, s                      \
+    __asm   mov     edi, d                      \
+    __asm   mov     ecx, c                      \
+    __asm   mov     ebx, b
+
+#define MULADDC_CORE                            \
+    __asm   lodsd                               \
+    __asm   mul     ebx                         \
+    __asm   add     eax, ecx                    \
+    __asm   adc     edx, 0                      \
+    __asm   add     eax, [edi]                  \
+    __asm   adc     edx, 0                      \
+    __asm   mov     ecx, edx                    \
+    __asm   stosd
+
+#if defined(MBEDTLS_HAVE_SSE2)
+
+#define EMIT __asm _emit
+
+#define MULADDC_HUIT                            \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0xC9             \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0xC3             \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0x1F             \
+    EMIT 0x0F  EMIT 0xD4  EMIT 0xCB             \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0x16             \
+    EMIT 0x0F  EMIT 0xF4  EMIT 0xD0             \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0x66  EMIT 0x04  \
+    EMIT 0x0F  EMIT 0xF4  EMIT 0xE0             \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0x76  EMIT 0x08  \
+    EMIT 0x0F  EMIT 0xF4  EMIT 0xF0             \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0x7E  EMIT 0x0C  \
+    EMIT 0x0F  EMIT 0xF4  EMIT 0xF8             \
+    EMIT 0x0F  EMIT 0xD4  EMIT 0xCA             \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0x5F  EMIT 0x04  \
+    EMIT 0x0F  EMIT 0xD4  EMIT 0xDC             \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0x6F  EMIT 0x08  \
+    EMIT 0x0F  EMIT 0xD4  EMIT 0xEE             \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0x67  EMIT 0x0C  \
+    EMIT 0x0F  EMIT 0xD4  EMIT 0xFC             \
+    EMIT 0x0F  EMIT 0x7E  EMIT 0x0F             \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0x56  EMIT 0x10  \
+    EMIT 0x0F  EMIT 0xF4  EMIT 0xD0             \
+    EMIT 0x0F  EMIT 0x73  EMIT 0xD1  EMIT 0x20  \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0x66  EMIT 0x14  \
+    EMIT 0x0F  EMIT 0xF4  EMIT 0xE0             \
+    EMIT 0x0F  EMIT 0xD4  EMIT 0xCB             \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0x76  EMIT 0x18  \
+    EMIT 0x0F  EMIT 0xF4  EMIT 0xF0             \
+    EMIT 0x0F  EMIT 0x7E  EMIT 0x4F  EMIT 0x04  \
+    EMIT 0x0F  EMIT 0x73  EMIT 0xD1  EMIT 0x20  \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0x5E  EMIT 0x1C  \
+    EMIT 0x0F  EMIT 0xF4  EMIT 0xD8             \
+    EMIT 0x0F  EMIT 0xD4  EMIT 0xCD             \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0x6F  EMIT 0x10  \
+    EMIT 0x0F  EMIT 0xD4  EMIT 0xD5             \
+    EMIT 0x0F  EMIT 0x7E  EMIT 0x4F  EMIT 0x08  \
+    EMIT 0x0F  EMIT 0x73  EMIT 0xD1  EMIT 0x20  \
+    EMIT 0x0F  EMIT 0xD4  EMIT 0xCF             \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0x6F  EMIT 0x14  \
+    EMIT 0x0F  EMIT 0xD4  EMIT 0xE5             \
+    EMIT 0x0F  EMIT 0x7E  EMIT 0x4F  EMIT 0x0C  \
+    EMIT 0x0F  EMIT 0x73  EMIT 0xD1  EMIT 0x20  \
+    EMIT 0x0F  EMIT 0xD4  EMIT 0xCA             \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0x6F  EMIT 0x18  \
+    EMIT 0x0F  EMIT 0xD4  EMIT 0xF5             \
+    EMIT 0x0F  EMIT 0x7E  EMIT 0x4F  EMIT 0x10  \
+    EMIT 0x0F  EMIT 0x73  EMIT 0xD1  EMIT 0x20  \
+    EMIT 0x0F  EMIT 0xD4  EMIT 0xCC             \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0x6F  EMIT 0x1C  \
+    EMIT 0x0F  EMIT 0xD4  EMIT 0xDD             \
+    EMIT 0x0F  EMIT 0x7E  EMIT 0x4F  EMIT 0x14  \
+    EMIT 0x0F  EMIT 0x73  EMIT 0xD1  EMIT 0x20  \
+    EMIT 0x0F  EMIT 0xD4  EMIT 0xCE             \
+    EMIT 0x0F  EMIT 0x7E  EMIT 0x4F  EMIT 0x18  \
+    EMIT 0x0F  EMIT 0x73  EMIT 0xD1  EMIT 0x20  \
+    EMIT 0x0F  EMIT 0xD4  EMIT 0xCB             \
+    EMIT 0x0F  EMIT 0x7E  EMIT 0x4F  EMIT 0x1C  \
+    EMIT 0x83  EMIT 0xC7  EMIT 0x20             \
+    EMIT 0x83  EMIT 0xC6  EMIT 0x20             \
+    EMIT 0x0F  EMIT 0x73  EMIT 0xD1  EMIT 0x20  \
+    EMIT 0x0F  EMIT 0x7E  EMIT 0xC9
+
+#define MULADDC_STOP                            \
+    EMIT 0x0F  EMIT 0x77                        \
+    __asm   mov     c, ecx                      \
+    __asm   mov     d, edi                      \
+    __asm   mov     s, esi                      \
+
+#else
+
+#define MULADDC_STOP                            \
+    __asm   mov     c, ecx                      \
+    __asm   mov     d, edi                      \
+    __asm   mov     s, esi                      \
+
+#endif /* SSE2 */
+#endif /* MSVC */
+
+#endif /* MBEDTLS_HAVE_ASM */
+
+#if !defined(MULADDC_CORE)
+#if defined(MBEDTLS_HAVE_UDBL)
+
+#define MULADDC_INIT                    \
+{                                       \
+    mbedtls_t_udbl r;                           \
+    mbedtls_mpi_uint r0, r1;
+
+#define MULADDC_CORE                    \
+    r   = *(s++) * (mbedtls_t_udbl) b;          \
+    r0  = (mbedtls_mpi_uint) r;                   \
+    r1  = (mbedtls_mpi_uint)( r >> biL );         \
+    r0 += c;  r1 += (r0 <  c);          \
+    r0 += *d; r1 += (r0 < *d);          \
+    c = r1; *(d++) = r0;
+
+#define MULADDC_STOP                    \
+}
+
+#else
+#define MULADDC_INIT                    \
+{                                       \
+    mbedtls_mpi_uint s0, s1, b0, b1;              \
+    mbedtls_mpi_uint r0, r1, rx, ry;              \
+    b0 = ( b << biH ) >> biH;           \
+    b1 = ( b >> biH );
+
+#define MULADDC_CORE                    \
+    s0 = ( *s << biH ) >> biH;          \
+    s1 = ( *s >> biH ); s++;            \
+    rx = s0 * b1; r0 = s0 * b0;         \
+    ry = s1 * b0; r1 = s1 * b1;         \
+    r1 += ( rx >> biH );                \
+    r1 += ( ry >> biH );                \
+    rx <<= biH; ry <<= biH;             \
+    r0 += rx; r1 += (r0 < rx);          \
+    r0 += ry; r1 += (r0 < ry);          \
+    r0 +=  c; r1 += (r0 <  c);          \
+    r0 += *d; r1 += (r0 < *d);          \
+    c = r1; *(d++) = r0;
+
+#define MULADDC_STOP                    \
+}
+
+#endif /* C (generic)  */
+#endif /* C (longlong) */
+
+#endif /* bn_mul.h */
diff --git a/common/mbedtls/camellia.c b/common/mbedtls/camellia.c
new file mode 100644
index 000000000..3d9ae72c7
--- /dev/null
+++ b/common/mbedtls/camellia.c
@@ -0,0 +1,1070 @@
+/*
+ *  Camellia implementation
+ *
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+/*
+ *  The Camellia block cipher was designed by NTT and Mitsubishi Electric
+ *  Corporation.
+ *
+ *  http://info.isl.ntt.co.jp/crypt/eng/camellia/dl/01espec.pdf
+ */
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "mbedtls/config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#if defined(MBEDTLS_CAMELLIA_C)
+
+#include "mbedtls/camellia.h"
+#include "mbedtls/platform_util.h"
+
+#include <string.h>
+
+#if defined(MBEDTLS_SELF_TEST)
+#if defined(MBEDTLS_PLATFORM_C)
+#include "mbedtls/platform.h"
+#else
+#include <stdio.h>
+#define mbedtls_printf printf
+#endif /* MBEDTLS_PLATFORM_C */
+#endif /* MBEDTLS_SELF_TEST */
+
+#if !defined(MBEDTLS_CAMELLIA_ALT)
+
+/*
+ * 32-bit integer manipulation macros (big endian)
+ */
+#ifndef GET_UINT32_BE
+#define GET_UINT32_BE(n,b,i)                            \
+{                                                       \
+    (n) = ( (uint32_t) (b)[(i)    ] << 24 )             \
+        | ( (uint32_t) (b)[(i) + 1] << 16 )             \
+        | ( (uint32_t) (b)[(i) + 2] <<  8 )             \
+        | ( (uint32_t) (b)[(i) + 3]       );            \
+}
+#endif
+
+#ifndef PUT_UINT32_BE
+#define PUT_UINT32_BE(n,b,i)                            \
+{                                                       \
+    (b)[(i)    ] = (unsigned char) ( (n) >> 24 );       \
+    (b)[(i) + 1] = (unsigned char) ( (n) >> 16 );       \
+    (b)[(i) + 2] = (unsigned char) ( (n) >>  8 );       \
+    (b)[(i) + 3] = (unsigned char) ( (n)       );       \
+}
+#endif
+
+static const unsigned char SIGMA_CHARS[6][8] =
+{
+    { 0xa0, 0x9e, 0x66, 0x7f, 0x3b, 0xcc, 0x90, 0x8b },
+    { 0xb6, 0x7a, 0xe8, 0x58, 0x4c, 0xaa, 0x73, 0xb2 },
+    { 0xc6, 0xef, 0x37, 0x2f, 0xe9, 0x4f, 0x82, 0xbe },
+    { 0x54, 0xff, 0x53, 0xa5, 0xf1, 0xd3, 0x6f, 0x1c },
+    { 0x10, 0xe5, 0x27, 0xfa, 0xde, 0x68, 0x2d, 0x1d },
+    { 0xb0, 0x56, 0x88, 0xc2, 0xb3, 0xe6, 0xc1, 0xfd }
+};
+
+#if defined(MBEDTLS_CAMELLIA_SMALL_MEMORY)
+
+static const unsigned char FSb[256] =
+{
+    112,130, 44,236,179, 39,192,229,228,133, 87, 53,234, 12,174, 65,
+     35,239,107,147, 69, 25,165, 33,237, 14, 79, 78, 29,101,146,189,
+    134,184,175,143,124,235, 31,206, 62, 48,220, 95, 94,197, 11, 26,
+    166,225, 57,202,213, 71, 93, 61,217,  1, 90,214, 81, 86,108, 77,
+    139, 13,154,102,251,204,176, 45,116, 18, 43, 32,240,177,132,153,
+    223, 76,203,194, 52,126,118,  5,109,183,169, 49,209, 23,  4,215,
+     20, 88, 58, 97,222, 27, 17, 28, 50, 15,156, 22, 83, 24,242, 34,
+    254, 68,207,178,195,181,122,145, 36,  8,232,168, 96,252,105, 80,
+    170,208,160,125,161,137, 98,151, 84, 91, 30,149,224,255,100,210,
+     16,196,  0, 72,163,247,117,219,138,  3,230,218,  9, 63,221,148,
+    135, 92,131,  2,205, 74,144, 51,115,103,246,243,157,127,191,226,
+     82,155,216, 38,200, 55,198, 59,129,150,111, 75, 19,190, 99, 46,
+    233,121,167,140,159,110,188,142, 41,245,249,182, 47,253,180, 89,
+    120,152,  6,106,231, 70,113,186,212, 37,171, 66,136,162,141,250,
+    114,  7,185, 85,248,238,172, 10, 54, 73, 42,104, 60, 56,241,164,
+     64, 40,211,123,187,201, 67,193, 21,227,173,244,119,199,128,158
+};
+
+#define SBOX1(n) FSb[(n)]
+#define SBOX2(n) (unsigned char)((FSb[(n)] >> 7 ^ FSb[(n)] << 1) & 0xff)
+#define SBOX3(n) (unsigned char)((FSb[(n)] >> 1 ^ FSb[(n)] << 7) & 0xff)
+#define SBOX4(n) FSb[((n) << 1 ^ (n) >> 7) &0xff]
+
+#else /* MBEDTLS_CAMELLIA_SMALL_MEMORY */
+
+static const unsigned char FSb[256] =
+{
+ 112, 130,  44, 236, 179,  39, 192, 229, 228, 133,  87,  53, 234,  12, 174,  65,
+  35, 239, 107, 147,  69,  25, 165,  33, 237,  14,  79,  78,  29, 101, 146, 189,
+ 134, 184, 175, 143, 124, 235,  31, 206,  62,  48, 220,  95,  94, 197,  11,  26,
+ 166, 225,  57, 202, 213,  71,  93,  61, 217,   1,  90, 214,  81,  86, 108,  77,
+ 139,  13, 154, 102, 251, 204, 176,  45, 116,  18,  43,  32, 240, 177, 132, 153,
+ 223,  76, 203, 194,  52, 126, 118,   5, 109, 183, 169,  49, 209,  23,   4, 215,
+  20,  88,  58,  97, 222,  27,  17,  28,  50,  15, 156,  22,  83,  24, 242,  34,
+ 254,  68, 207, 178, 195, 181, 122, 145,  36,   8, 232, 168,  96, 252, 105,  80,
+ 170, 208, 160, 125, 161, 137,  98, 151,  84,  91,  30, 149, 224, 255, 100, 210,
+  16, 196,   0,  72, 163, 247, 117, 219, 138,   3, 230, 218,   9,  63, 221, 148,
+ 135,  92, 131,   2, 205,  74, 144,  51, 115, 103, 246, 243, 157, 127, 191, 226,
+  82, 155, 216,  38, 200,  55, 198,  59, 129, 150, 111,  75,  19, 190,  99,  46,
+ 233, 121, 167, 140, 159, 110, 188, 142,  41, 245, 249, 182,  47, 253, 180,  89,
+ 120, 152,   6, 106, 231,  70, 113, 186, 212,  37, 171,  66, 136, 162, 141, 250,
+ 114,   7, 185,  85, 248, 238, 172,  10,  54,  73,  42, 104,  60,  56, 241, 164,
+ 64,  40, 211, 123, 187, 201,  67, 193,  21, 227, 173, 244, 119, 199, 128, 158
+};
+
+static const unsigned char FSb2[256] =
+{
+ 224,   5,  88, 217, 103,  78, 129, 203, 201,  11, 174, 106, 213,  24,  93, 130,
+  70, 223, 214,  39, 138,  50,  75,  66, 219,  28, 158, 156,  58, 202,  37, 123,
+  13, 113,  95,  31, 248, 215,  62, 157, 124,  96, 185, 190, 188, 139,  22,  52,
+  77, 195, 114, 149, 171, 142, 186, 122, 179,   2, 180, 173, 162, 172, 216, 154,
+  23,  26,  53, 204, 247, 153,  97,  90, 232,  36,  86,  64, 225,  99,   9,  51,
+ 191, 152, 151, 133, 104, 252, 236,  10, 218, 111,  83,  98, 163,  46,   8, 175,
+  40, 176, 116, 194, 189,  54,  34,  56, 100,  30,  57,  44, 166,  48, 229,  68,
+ 253, 136, 159, 101, 135, 107, 244,  35,  72,  16, 209,  81, 192, 249, 210, 160,
+  85, 161,  65, 250,  67,  19, 196,  47, 168, 182,  60,  43, 193, 255, 200, 165,
+  32, 137,   0, 144,  71, 239, 234, 183,  21,   6, 205, 181,  18, 126, 187,  41,
+  15, 184,   7,   4, 155, 148,  33, 102, 230, 206, 237, 231,  59, 254, 127, 197,
+ 164,  55, 177,  76, 145, 110, 141, 118,   3,  45, 222, 150,  38, 125, 198,  92,
+ 211, 242,  79,  25,  63, 220, 121,  29,  82, 235, 243, 109,  94, 251, 105, 178,
+ 240,  49,  12, 212, 207, 140, 226, 117, 169,  74,  87, 132,  17,  69,  27, 245,
+ 228,  14, 115, 170, 241, 221,  89,  20, 108, 146,  84, 208, 120, 112, 227,  73,
+ 128,  80, 167, 246, 119, 147, 134, 131,  42, 199,  91, 233, 238, 143,   1,  61
+};
+
+static const unsigned char FSb3[256] =
+{
+  56,  65,  22, 118, 217, 147,  96, 242, 114, 194, 171, 154, 117,   6,  87, 160,
+ 145, 247, 181, 201, 162, 140, 210, 144, 246,   7, 167,  39, 142, 178,  73, 222,
+  67,  92, 215, 199,  62, 245, 143, 103,  31,  24, 110, 175,  47, 226, 133,  13,
+  83, 240, 156, 101, 234, 163, 174, 158, 236, 128,  45, 107, 168,  43,  54, 166,
+ 197, 134,  77,  51, 253, 102,  88, 150,  58,   9, 149,  16, 120, 216,  66, 204,
+ 239,  38, 229,  97,  26,  63,  59, 130, 182, 219, 212, 152, 232, 139,   2, 235,
+  10,  44,  29, 176, 111, 141, 136,  14,  25, 135,  78,  11, 169,  12, 121,  17,
+ 127,  34, 231,  89, 225, 218,  61, 200,  18,   4, 116,  84,  48, 126, 180,  40,
+  85, 104,  80, 190, 208, 196,  49, 203,  42, 173,  15, 202, 112, 255,  50, 105,
+   8,  98,   0,  36, 209, 251, 186, 237,  69, 129, 115, 109, 132, 159, 238,  74,
+ 195,  46, 193,   1, 230,  37,  72, 153, 185, 179, 123, 249, 206, 191, 223, 113,
+  41, 205, 108,  19, 100, 155,  99, 157, 192,  75, 183, 165, 137,  95, 177,  23,
+ 244, 188, 211,  70, 207,  55,  94,  71, 148, 250, 252,  91, 151, 254,  90, 172,
+  60,  76,   3,  53, 243,  35, 184,  93, 106, 146, 213,  33,  68,  81, 198, 125,
+  57, 131, 220, 170, 124, 119,  86,   5,  27, 164,  21,  52,  30,  28, 248,  82,
+  32,  20, 233, 189, 221, 228, 161, 224, 138, 241, 214, 122, 187, 227,  64,  79
+};
+
+static const unsigned char FSb4[256] =
+{
+ 112,  44, 179, 192, 228,  87, 234, 174,  35, 107,  69, 165, 237,  79,  29, 146,
+ 134, 175, 124,  31,  62, 220,  94,  11, 166,  57, 213,  93, 217,  90,  81, 108,
+ 139, 154, 251, 176, 116,  43, 240, 132, 223, 203,  52, 118, 109, 169, 209,   4,
+  20,  58, 222,  17,  50, 156,  83, 242, 254, 207, 195, 122,  36, 232,  96, 105,
+ 170, 160, 161,  98,  84,  30, 224, 100,  16,   0, 163, 117, 138, 230,   9, 221,
+ 135, 131, 205, 144, 115, 246, 157, 191,  82, 216, 200, 198, 129, 111,  19,  99,
+ 233, 167, 159, 188,  41, 249,  47, 180, 120,   6, 231, 113, 212, 171, 136, 141,
+ 114, 185, 248, 172,  54,  42,  60, 241,  64, 211, 187,  67,  21, 173, 119, 128,
+ 130, 236,  39, 229, 133,  53,  12,  65, 239, 147,  25,  33,  14,  78, 101, 189,
+ 184, 143, 235, 206,  48,  95, 197,  26, 225, 202,  71,  61,   1, 214,  86,  77,
+  13, 102, 204,  45,  18,  32, 177, 153,  76, 194, 126,   5, 183,  49,  23, 215,
+  88,  97,  27,  28,  15,  22,  24,  34,  68, 178, 181, 145,   8, 168, 252,  80,
+ 208, 125, 137, 151,  91, 149, 255, 210, 196,  72, 247, 219,   3, 218,  63, 148,
+  92,   2,  74,  51, 103, 243, 127, 226, 155,  38,  55,  59, 150,  75, 190,  46,
+ 121, 140, 110, 142, 245, 182, 253,  89, 152, 106,  70, 186,  37,  66, 162, 250,
+  7,  85, 238,  10,  73, 104,  56, 164,  40, 123, 201, 193, 227, 244, 199, 158
+};
+
+#define SBOX1(n) FSb[(n)]
+#define SBOX2(n) FSb2[(n)]
+#define SBOX3(n) FSb3[(n)]
+#define SBOX4(n) FSb4[(n)]
+
+#endif /* MBEDTLS_CAMELLIA_SMALL_MEMORY */
+
+static const unsigned char shifts[2][4][4] =
+{
+    {
+        { 1, 1, 1, 1 }, /* KL */
+        { 0, 0, 0, 0 }, /* KR */
+        { 1, 1, 1, 1 }, /* KA */
+        { 0, 0, 0, 0 }  /* KB */
+    },
+    {
+        { 1, 0, 1, 1 }, /* KL */
+        { 1, 1, 0, 1 }, /* KR */
+        { 1, 1, 1, 0 }, /* KA */
+        { 1, 1, 0, 1 }  /* KB */
+    }
+};
+
+static const signed char indexes[2][4][20] =
+{
+    {
+        {  0,  1,  2,  3,  8,  9, 10, 11, 38, 39,
+          36, 37, 23, 20, 21, 22, 27, -1, -1, 26 }, /* KL -> RK */
+        { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+          -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }, /* KR -> RK */
+        {  4,  5,  6,  7, 12, 13, 14, 15, 16, 17,
+          18, 19, -1, 24, 25, -1, 31, 28, 29, 30 }, /* KA -> RK */
+        { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+          -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }  /* KB -> RK */
+    },
+    {
+        {  0,  1,  2,  3, 61, 62, 63, 60, -1, -1,
+          -1, -1, 27, 24, 25, 26, 35, 32, 33, 34 }, /* KL -> RK */
+        { -1, -1, -1, -1,  8,  9, 10, 11, 16, 17,
+          18, 19, -1, -1, -1, -1, 39, 36, 37, 38 }, /* KR -> RK */
+        { -1, -1, -1, -1, 12, 13, 14, 15, 58, 59,
+          56, 57, 31, 28, 29, 30, -1, -1, -1, -1 }, /* KA -> RK */
+        {  4,  5,  6,  7, 65, 66, 67, 64, 20, 21,
+          22, 23, -1, -1, -1, -1, 43, 40, 41, 42 }  /* KB -> RK */
+    }
+};
+
+static const signed char transposes[2][20] =
+{
+    {
+        21, 22, 23, 20,
+        -1, -1, -1, -1,
+        18, 19, 16, 17,
+        11,  8,  9, 10,
+        15, 12, 13, 14
+    },
+    {
+        25, 26, 27, 24,
+        29, 30, 31, 28,
+        18, 19, 16, 17,
+        -1, -1, -1, -1,
+        -1, -1, -1, -1
+    }
+};
+
+/* Shift macro for 128 bit strings with rotation smaller than 32 bits (!) */
+#define ROTL(DEST, SRC, SHIFT)                                      \
+{                                                                   \
+    (DEST)[0] = (SRC)[0] << (SHIFT) ^ (SRC)[1] >> (32 - (SHIFT));   \
+    (DEST)[1] = (SRC)[1] << (SHIFT) ^ (SRC)[2] >> (32 - (SHIFT));   \
+    (DEST)[2] = (SRC)[2] << (SHIFT) ^ (SRC)[3] >> (32 - (SHIFT));   \
+    (DEST)[3] = (SRC)[3] << (SHIFT) ^ (SRC)[0] >> (32 - (SHIFT));   \
+}
+
+#define FL(XL, XR, KL, KR)                                          \
+{                                                                   \
+    (XR) = ((((XL) & (KL)) << 1) | (((XL) & (KL)) >> 31)) ^ (XR);   \
+    (XL) = ((XR) | (KR)) ^ (XL);                                    \
+}
+
+#define FLInv(YL, YR, KL, KR)                                       \
+{                                                                   \
+    (YL) = ((YR) | (KR)) ^ (YL);                                    \
+    (YR) = ((((YL) & (KL)) << 1) | (((YL) & (KL)) >> 31)) ^ (YR);   \
+}
+
+#define SHIFT_AND_PLACE(INDEX, OFFSET)                      \
+{                                                           \
+    TK[0] = KC[(OFFSET) * 4 + 0];                           \
+    TK[1] = KC[(OFFSET) * 4 + 1];                           \
+    TK[2] = KC[(OFFSET) * 4 + 2];                           \
+    TK[3] = KC[(OFFSET) * 4 + 3];                           \
+                                                            \
+    for( i = 1; i <= 4; i++ )                               \
+        if( shifts[(INDEX)][(OFFSET)][i -1] )               \
+            ROTL(TK + i * 4, TK, ( 15 * i ) % 32);          \
+                                                            \
+    for( i = 0; i < 20; i++ )                               \
+        if( indexes[(INDEX)][(OFFSET)][i] != -1 ) {         \
+            RK[indexes[(INDEX)][(OFFSET)][i]] = TK[ i ];    \
+        }                                                   \
+}
+
+static void camellia_feistel( const uint32_t x[2], const uint32_t k[2],
+                              uint32_t z[2])
+{
+    uint32_t I0, I1;
+    I0 = x[0] ^ k[0];
+    I1 = x[1] ^ k[1];
+
+    I0 = ((uint32_t) SBOX1((I0 >> 24) & 0xFF) << 24) |
+         ((uint32_t) SBOX2((I0 >> 16) & 0xFF) << 16) |
+         ((uint32_t) SBOX3((I0 >>  8) & 0xFF) <<  8) |
+         ((uint32_t) SBOX4((I0      ) & 0xFF)      );
+    I1 = ((uint32_t) SBOX2((I1 >> 24) & 0xFF) << 24) |
+         ((uint32_t) SBOX3((I1 >> 16) & 0xFF) << 16) |
+         ((uint32_t) SBOX4((I1 >>  8) & 0xFF) <<  8) |
+         ((uint32_t) SBOX1((I1      ) & 0xFF)      );
+
+    I0 ^= (I1 << 8) | (I1 >> 24);
+    I1 ^= (I0 << 16) | (I0 >> 16);
+    I0 ^= (I1 >> 8) | (I1 << 24);
+    I1 ^= (I0 >> 8) | (I0 << 24);
+
+    z[0] ^= I1;
+    z[1] ^= I0;
+}
+
+void mbedtls_camellia_init( mbedtls_camellia_context *ctx )
+{
+    memset( ctx, 0, sizeof( mbedtls_camellia_context ) );
+}
+
+void mbedtls_camellia_free( mbedtls_camellia_context *ctx )
+{
+    if( ctx == NULL )
+        return;
+
+    mbedtls_platform_zeroize( ctx, sizeof( mbedtls_camellia_context ) );
+}
+
+/*
+ * Camellia key schedule (encryption)
+ */
+int mbedtls_camellia_setkey_enc( mbedtls_camellia_context *ctx, const unsigned char *key,
+                         unsigned int keybits )
+{
+    int idx;
+    size_t i;
+    uint32_t *RK;
+    unsigned char t[64];
+    uint32_t SIGMA[6][2];
+    uint32_t KC[16];
+    uint32_t TK[20];
+
+    RK = ctx->rk;
+
+    memset( t, 0, 64 );
+    memset( RK, 0, sizeof(ctx->rk) );
+
+    switch( keybits )
+    {
+        case 128: ctx->nr = 3; idx = 0; break;
+        case 192:
+        case 256: ctx->nr = 4; idx = 1; break;
+        default : return( MBEDTLS_ERR_CAMELLIA_INVALID_KEY_LENGTH );
+    }
+
+    for( i = 0; i < keybits / 8; ++i )
+        t[i] = key[i];
+
+    if( keybits == 192 ) {
+        for( i = 0; i < 8; i++ )
+            t[24 + i] = ~t[16 + i];
+    }
+
+    /*
+     * Prepare SIGMA values
+     */
+    for( i = 0; i < 6; i++ ) {
+        GET_UINT32_BE( SIGMA[i][0], SIGMA_CHARS[i], 0 );
+        GET_UINT32_BE( SIGMA[i][1], SIGMA_CHARS[i], 4 );
+    }
+
+    /*
+     * Key storage in KC
+     * Order: KL, KR, KA, KB
+     */
+    memset( KC, 0, sizeof(KC) );
+
+    /* Store KL, KR */
+    for( i = 0; i < 8; i++ )
+        GET_UINT32_BE( KC[i], t, i * 4 );
+
+    /* Generate KA */
+    for( i = 0; i < 4; ++i )
+        KC[8 + i] = KC[i] ^ KC[4 + i];
+
+    camellia_feistel( KC + 8, SIGMA[0], KC + 10 );
+    camellia_feistel( KC + 10, SIGMA[1], KC + 8 );
+
+    for( i = 0; i < 4; ++i )
+        KC[8 + i] ^= KC[i];
+
+    camellia_feistel( KC + 8, SIGMA[2], KC + 10 );
+    camellia_feistel( KC + 10, SIGMA[3], KC + 8 );
+
+    if( keybits > 128 ) {
+        /* Generate KB */
+        for( i = 0; i < 4; ++i )
+            KC[12 + i] = KC[4 + i] ^ KC[8 + i];
+
+        camellia_feistel( KC + 12, SIGMA[4], KC + 14 );
+        camellia_feistel( KC + 14, SIGMA[5], KC + 12 );
+    }
+
+    /*
+     * Generating subkeys
+     */
+
+    /* Manipulating KL */
+    SHIFT_AND_PLACE( idx, 0 );
+
+    /* Manipulating KR */
+    if( keybits > 128 ) {
+        SHIFT_AND_PLACE( idx, 1 );
+    }
+
+    /* Manipulating KA */
+    SHIFT_AND_PLACE( idx, 2 );
+
+    /* Manipulating KB */
+    if( keybits > 128 ) {
+        SHIFT_AND_PLACE( idx, 3 );
+    }
+
+    /* Do transpositions */
+    for( i = 0; i < 20; i++ ) {
+        if( transposes[idx][i] != -1 ) {
+            RK[32 + 12 * idx + i] = RK[transposes[idx][i]];
+        }
+    }
+
+    return( 0 );
+}
+
+/*
+ * Camellia key schedule (decryption)
+ */
+int mbedtls_camellia_setkey_dec( mbedtls_camellia_context *ctx, const unsigned char *key,
+                         unsigned int keybits )
+{
+    int idx, ret;
+    size_t i;
+    mbedtls_camellia_context cty;
+    uint32_t *RK;
+    uint32_t *SK;
+
+    mbedtls_camellia_init( &cty );
+
+    /* Also checks keybits */
+    if( ( ret = mbedtls_camellia_setkey_enc( &cty, key, keybits ) ) != 0 )
+        goto exit;
+
+    ctx->nr = cty.nr;
+    idx = ( ctx->nr == 4 );
+
+    RK = ctx->rk;
+    SK = cty.rk + 24 * 2 + 8 * idx * 2;
+
+    *RK++ = *SK++;
+    *RK++ = *SK++;
+    *RK++ = *SK++;
+    *RK++ = *SK++;
+
+    for( i = 22 + 8 * idx, SK -= 6; i > 0; i--, SK -= 4 )
+    {
+        *RK++ = *SK++;
+        *RK++ = *SK++;
+    }
+
+    SK -= 2;
+
+    *RK++ = *SK++;
+    *RK++ = *SK++;
+    *RK++ = *SK++;
+    *RK++ = *SK++;
+
+exit:
+    mbedtls_camellia_free( &cty );
+
+    return( ret );
+}
+
+/*
+ * Camellia-ECB block encryption/decryption
+ */
+int mbedtls_camellia_crypt_ecb( mbedtls_camellia_context *ctx,
+                    int mode,
+                    const unsigned char input[16],
+                    unsigned char output[16] )
+{
+    int NR;
+    uint32_t *RK, X[4];
+
+    ( (void) mode );
+
+    NR = ctx->nr;
+    RK = ctx->rk;
+
+    GET_UINT32_BE( X[0], input,  0 );
+    GET_UINT32_BE( X[1], input,  4 );
+    GET_UINT32_BE( X[2], input,  8 );
+    GET_UINT32_BE( X[3], input, 12 );
+
+    X[0] ^= *RK++;
+    X[1] ^= *RK++;
+    X[2] ^= *RK++;
+    X[3] ^= *RK++;
+
+    while( NR ) {
+        --NR;
+        camellia_feistel( X, RK, X + 2 );
+        RK += 2;
+        camellia_feistel( X + 2, RK, X );
+        RK += 2;
+        camellia_feistel( X, RK, X + 2 );
+        RK += 2;
+        camellia_feistel( X + 2, RK, X );
+        RK += 2;
+        camellia_feistel( X, RK, X + 2 );
+        RK += 2;
+        camellia_feistel( X + 2, RK, X );
+        RK += 2;
+
+        if( NR ) {
+            FL(X[0], X[1], RK[0], RK[1]);
+            RK += 2;
+            FLInv(X[2], X[3], RK[0], RK[1]);
+            RK += 2;
+        }
+    }
+
+    X[2] ^= *RK++;
+    X[3] ^= *RK++;
+    X[0] ^= *RK++;
+    X[1] ^= *RK++;
+
+    PUT_UINT32_BE( X[2], output,  0 );
+    PUT_UINT32_BE( X[3], output,  4 );
+    PUT_UINT32_BE( X[0], output,  8 );
+    PUT_UINT32_BE( X[1], output, 12 );
+
+    return( 0 );
+}
+
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+/*
+ * Camellia-CBC buffer encryption/decryption
+ */
+int mbedtls_camellia_crypt_cbc( mbedtls_camellia_context *ctx,
+                    int mode,
+                    size_t length,
+                    unsigned char iv[16],
+                    const unsigned char *input,
+                    unsigned char *output )
+{
+    int i;
+    unsigned char temp[16];
+
+    if( length % 16 )
+        return( MBEDTLS_ERR_CAMELLIA_INVALID_INPUT_LENGTH );
+
+    if( mode == MBEDTLS_CAMELLIA_DECRYPT )
+    {
+        while( length > 0 )
+        {
+            memcpy( temp, input, 16 );
+            mbedtls_camellia_crypt_ecb( ctx, mode, input, output );
+
+            for( i = 0; i < 16; i++ )
+                output[i] = (unsigned char)( output[i] ^ iv[i] );
+
+            memcpy( iv, temp, 16 );
+
+            input  += 16;
+            output += 16;
+            length -= 16;
+        }
+    }
+    else
+    {
+        while( length > 0 )
+        {
+            for( i = 0; i < 16; i++ )
+                output[i] = (unsigned char)( input[i] ^ iv[i] );
+
+            mbedtls_camellia_crypt_ecb( ctx, mode, output, output );
+            memcpy( iv, output, 16 );
+
+            input  += 16;
+            output += 16;
+            length -= 16;
+        }
+    }
+
+    return( 0 );
+}
+#endif /* MBEDTLS_CIPHER_MODE_CBC */
+
+#if defined(MBEDTLS_CIPHER_MODE_CFB)
+/*
+ * Camellia-CFB128 buffer encryption/decryption
+ */
+int mbedtls_camellia_crypt_cfb128( mbedtls_camellia_context *ctx,
+                       int mode,
+                       size_t length,
+                       size_t *iv_off,
+                       unsigned char iv[16],
+                       const unsigned char *input,
+                       unsigned char *output )
+{
+    int c;
+    size_t n = *iv_off;
+
+    if( mode == MBEDTLS_CAMELLIA_DECRYPT )
+    {
+        while( length-- )
+        {
+            if( n == 0 )
+                mbedtls_camellia_crypt_ecb( ctx, MBEDTLS_CAMELLIA_ENCRYPT, iv, iv );
+
+            c = *input++;
+            *output++ = (unsigned char)( c ^ iv[n] );
+            iv[n] = (unsigned char) c;
+
+            n = ( n + 1 ) & 0x0F;
+        }
+    }
+    else
+    {
+        while( length-- )
+        {
+            if( n == 0 )
+                mbedtls_camellia_crypt_ecb( ctx, MBEDTLS_CAMELLIA_ENCRYPT, iv, iv );
+
+            iv[n] = *output++ = (unsigned char)( iv[n] ^ *input++ );
+
+            n = ( n + 1 ) & 0x0F;
+        }
+    }
+
+    *iv_off = n;
+
+    return( 0 );
+}
+#endif /* MBEDTLS_CIPHER_MODE_CFB */
+
+#if defined(MBEDTLS_CIPHER_MODE_CTR)
+/*
+ * Camellia-CTR buffer encryption/decryption
+ */
+int mbedtls_camellia_crypt_ctr( mbedtls_camellia_context *ctx,
+                       size_t length,
+                       size_t *nc_off,
+                       unsigned char nonce_counter[16],
+                       unsigned char stream_block[16],
+                       const unsigned char *input,
+                       unsigned char *output )
+{
+    int c, i;
+    size_t n = *nc_off;
+
+    while( length-- )
+    {
+        if( n == 0 ) {
+            mbedtls_camellia_crypt_ecb( ctx, MBEDTLS_CAMELLIA_ENCRYPT, nonce_counter,
+                                stream_block );
+
+            for( i = 16; i > 0; i-- )
+                if( ++nonce_counter[i - 1] != 0 )
+                    break;
+        }
+        c = *input++;
+        *output++ = (unsigned char)( c ^ stream_block[n] );
+
+        n = ( n + 1 ) & 0x0F;
+    }
+
+    *nc_off = n;
+
+    return( 0 );
+}
+#endif /* MBEDTLS_CIPHER_MODE_CTR */
+#endif /* !MBEDTLS_CAMELLIA_ALT */
+
+#if defined(MBEDTLS_SELF_TEST)
+
+/*
+ * Camellia test vectors from:
+ *
+ * http://info.isl.ntt.co.jp/crypt/eng/camellia/technology.html:
+ *   http://info.isl.ntt.co.jp/crypt/eng/camellia/dl/cryptrec/intermediate.txt
+ *   http://info.isl.ntt.co.jp/crypt/eng/camellia/dl/cryptrec/t_camellia.txt
+ *                      (For each bitlength: Key 0, Nr 39)
+ */
+#define CAMELLIA_TESTS_ECB  2
+
+static const unsigned char camellia_test_ecb_key[3][CAMELLIA_TESTS_ECB][32] =
+{
+    {
+        { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef,
+          0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10 },
+        { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }
+    },
+    {
+        { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef,
+          0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10,
+          0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77 },
+        { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }
+    },
+    {
+        { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef,
+          0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10,
+          0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
+          0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff },
+        { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }
+    },
+};
+
+static const unsigned char camellia_test_ecb_plain[CAMELLIA_TESTS_ECB][16] =
+{
+    { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef,
+      0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10 },
+    { 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }
+};
+
+static const unsigned char camellia_test_ecb_cipher[3][CAMELLIA_TESTS_ECB][16] =
+{
+    {
+        { 0x67, 0x67, 0x31, 0x38, 0x54, 0x96, 0x69, 0x73,
+          0x08, 0x57, 0x06, 0x56, 0x48, 0xea, 0xbe, 0x43 },
+        { 0x38, 0x3C, 0x6C, 0x2A, 0xAB, 0xEF, 0x7F, 0xDE,
+          0x25, 0xCD, 0x47, 0x0B, 0xF7, 0x74, 0xA3, 0x31 }
+    },
+    {
+        { 0xb4, 0x99, 0x34, 0x01, 0xb3, 0xe9, 0x96, 0xf8,
+          0x4e, 0xe5, 0xce, 0xe7, 0xd7, 0x9b, 0x09, 0xb9 },
+        { 0xD1, 0x76, 0x3F, 0xC0, 0x19, 0xD7, 0x7C, 0xC9,
+          0x30, 0xBF, 0xF2, 0xA5, 0x6F, 0x7C, 0x93, 0x64 }
+    },
+    {
+        { 0x9a, 0xcc, 0x23, 0x7d, 0xff, 0x16, 0xd7, 0x6c,
+          0x20, 0xef, 0x7c, 0x91, 0x9e, 0x3a, 0x75, 0x09 },
+        { 0x05, 0x03, 0xFB, 0x10, 0xAB, 0x24, 0x1E, 0x7C,
+          0xF4, 0x5D, 0x8C, 0xDE, 0xEE, 0x47, 0x43, 0x35 }
+    }
+};
+
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+#define CAMELLIA_TESTS_CBC  3
+
+static const unsigned char camellia_test_cbc_key[3][32] =
+{
+        { 0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6,
+          0xAB, 0xF7, 0x15, 0x88, 0x09, 0xCF, 0x4F, 0x3C }
+    ,
+        { 0x8E, 0x73, 0xB0, 0xF7, 0xDA, 0x0E, 0x64, 0x52,
+          0xC8, 0x10, 0xF3, 0x2B, 0x80, 0x90, 0x79, 0xE5,
+          0x62, 0xF8, 0xEA, 0xD2, 0x52, 0x2C, 0x6B, 0x7B }
+    ,
+        { 0x60, 0x3D, 0xEB, 0x10, 0x15, 0xCA, 0x71, 0xBE,
+          0x2B, 0x73, 0xAE, 0xF0, 0x85, 0x7D, 0x77, 0x81,
+          0x1F, 0x35, 0x2C, 0x07, 0x3B, 0x61, 0x08, 0xD7,
+          0x2D, 0x98, 0x10, 0xA3, 0x09, 0x14, 0xDF, 0xF4 }
+};
+
+static const unsigned char camellia_test_cbc_iv[16] =
+
+    { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+      0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F }
+;
+
+static const unsigned char camellia_test_cbc_plain[CAMELLIA_TESTS_CBC][16] =
+{
+    { 0x6B, 0xC1, 0xBE, 0xE2, 0x2E, 0x40, 0x9F, 0x96,
+      0xE9, 0x3D, 0x7E, 0x11, 0x73, 0x93, 0x17, 0x2A },
+    { 0xAE, 0x2D, 0x8A, 0x57, 0x1E, 0x03, 0xAC, 0x9C,
+      0x9E, 0xB7, 0x6F, 0xAC, 0x45, 0xAF, 0x8E, 0x51 },
+    { 0x30, 0xC8, 0x1C, 0x46, 0xA3, 0x5C, 0xE4, 0x11,
+      0xE5, 0xFB, 0xC1, 0x19, 0x1A, 0x0A, 0x52, 0xEF }
+
+};
+
+static const unsigned char camellia_test_cbc_cipher[3][CAMELLIA_TESTS_CBC][16] =
+{
+    {
+        { 0x16, 0x07, 0xCF, 0x49, 0x4B, 0x36, 0xBB, 0xF0,
+          0x0D, 0xAE, 0xB0, 0xB5, 0x03, 0xC8, 0x31, 0xAB },
+        { 0xA2, 0xF2, 0xCF, 0x67, 0x16, 0x29, 0xEF, 0x78,
+          0x40, 0xC5, 0xA5, 0xDF, 0xB5, 0x07, 0x48, 0x87 },
+        { 0x0F, 0x06, 0x16, 0x50, 0x08, 0xCF, 0x8B, 0x8B,
+          0x5A, 0x63, 0x58, 0x63, 0x62, 0x54, 0x3E, 0x54 }
+    },
+    {
+        { 0x2A, 0x48, 0x30, 0xAB, 0x5A, 0xC4, 0xA1, 0xA2,
+          0x40, 0x59, 0x55, 0xFD, 0x21, 0x95, 0xCF, 0x93 },
+        { 0x5D, 0x5A, 0x86, 0x9B, 0xD1, 0x4C, 0xE5, 0x42,
+          0x64, 0xF8, 0x92, 0xA6, 0xDD, 0x2E, 0xC3, 0xD5 },
+        { 0x37, 0xD3, 0x59, 0xC3, 0x34, 0x98, 0x36, 0xD8,
+          0x84, 0xE3, 0x10, 0xAD, 0xDF, 0x68, 0xC4, 0x49 }
+    },
+    {
+        { 0xE6, 0xCF, 0xA3, 0x5F, 0xC0, 0x2B, 0x13, 0x4A,
+          0x4D, 0x2C, 0x0B, 0x67, 0x37, 0xAC, 0x3E, 0xDA },
+        { 0x36, 0xCB, 0xEB, 0x73, 0xBD, 0x50, 0x4B, 0x40,
+          0x70, 0xB1, 0xB7, 0xDE, 0x2B, 0x21, 0xEB, 0x50 },
+        { 0xE3, 0x1A, 0x60, 0x55, 0x29, 0x7D, 0x96, 0xCA,
+          0x33, 0x30, 0xCD, 0xF1, 0xB1, 0x86, 0x0A, 0x83 }
+    }
+};
+#endif /* MBEDTLS_CIPHER_MODE_CBC */
+
+#if defined(MBEDTLS_CIPHER_MODE_CTR)
+/*
+ * Camellia-CTR test vectors from:
+ *
+ * http://www.faqs.org/rfcs/rfc5528.html
+ */
+
+static const unsigned char camellia_test_ctr_key[3][16] =
+{
+    { 0xAE, 0x68, 0x52, 0xF8, 0x12, 0x10, 0x67, 0xCC,
+      0x4B, 0xF7, 0xA5, 0x76, 0x55, 0x77, 0xF3, 0x9E },
+    { 0x7E, 0x24, 0x06, 0x78, 0x17, 0xFA, 0xE0, 0xD7,
+      0x43, 0xD6, 0xCE, 0x1F, 0x32, 0x53, 0x91, 0x63 },
+    { 0x76, 0x91, 0xBE, 0x03, 0x5E, 0x50, 0x20, 0xA8,
+      0xAC, 0x6E, 0x61, 0x85, 0x29, 0xF9, 0xA0, 0xDC }
+};
+
+static const unsigned char camellia_test_ctr_nonce_counter[3][16] =
+{
+    { 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 },
+    { 0x00, 0x6C, 0xB6, 0xDB, 0xC0, 0x54, 0x3B, 0x59,
+      0xDA, 0x48, 0xD9, 0x0B, 0x00, 0x00, 0x00, 0x01 },
+    { 0x00, 0xE0, 0x01, 0x7B, 0x27, 0x77, 0x7F, 0x3F,
+      0x4A, 0x17, 0x86, 0xF0, 0x00, 0x00, 0x00, 0x01 }
+};
+
+static const unsigned char camellia_test_ctr_pt[3][48] =
+{
+    { 0x53, 0x69, 0x6E, 0x67, 0x6C, 0x65, 0x20, 0x62,
+      0x6C, 0x6F, 0x63, 0x6B, 0x20, 0x6D, 0x73, 0x67 },
+
+    { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+      0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
+      0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+      0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F },
+
+    { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+      0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
+      0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+      0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F,
+      0x20, 0x21, 0x22, 0x23 }
+};
+
+static const unsigned char camellia_test_ctr_ct[3][48] =
+{
+    { 0xD0, 0x9D, 0xC2, 0x9A, 0x82, 0x14, 0x61, 0x9A,
+      0x20, 0x87, 0x7C, 0x76, 0xDB, 0x1F, 0x0B, 0x3F },
+    { 0xDB, 0xF3, 0xC7, 0x8D, 0xC0, 0x83, 0x96, 0xD4,
+      0xDA, 0x7C, 0x90, 0x77, 0x65, 0xBB, 0xCB, 0x44,
+      0x2B, 0x8E, 0x8E, 0x0F, 0x31, 0xF0, 0xDC, 0xA7,
+      0x2C, 0x74, 0x17, 0xE3, 0x53, 0x60, 0xE0, 0x48 },
+    { 0xB1, 0x9D, 0x1F, 0xCD, 0xCB, 0x75, 0xEB, 0x88,
+      0x2F, 0x84, 0x9C, 0xE2, 0x4D, 0x85, 0xCF, 0x73,
+      0x9C, 0xE6, 0x4B, 0x2B, 0x5C, 0x9D, 0x73, 0xF1,
+      0x4F, 0x2D, 0x5D, 0x9D, 0xCE, 0x98, 0x89, 0xCD,
+      0xDF, 0x50, 0x86, 0x96 }
+};
+
+static const int camellia_test_ctr_len[3] =
+    { 16, 32, 36 };
+#endif /* MBEDTLS_CIPHER_MODE_CTR */
+
+/*
+ * Checkup routine
+ */
+int mbedtls_camellia_self_test( int verbose )
+{
+    int i, j, u, v;
+    unsigned char key[32];
+    unsigned char buf[64];
+    unsigned char src[16];
+    unsigned char dst[16];
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+    unsigned char iv[16];
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_CTR)
+    size_t offset, len;
+    unsigned char nonce_counter[16];
+    unsigned char stream_block[16];
+#endif
+
+    mbedtls_camellia_context ctx;
+
+    memset( key, 0, 32 );
+
+    for( j = 0; j < 6; j++ ) {
+        u = j >> 1;
+    v = j & 1;
+
+    if( verbose != 0 )
+        mbedtls_printf( "  CAMELLIA-ECB-%3d (%s): ", 128 + u * 64,
+                         (v == MBEDTLS_CAMELLIA_DECRYPT) ? "dec" : "enc");
+
+    for( i = 0; i < CAMELLIA_TESTS_ECB; i++ ) {
+        memcpy( key, camellia_test_ecb_key[u][i], 16 + 8 * u );
+
+        if( v == MBEDTLS_CAMELLIA_DECRYPT ) {
+            mbedtls_camellia_setkey_dec( &ctx, key, 128 + u * 64 );
+            memcpy( src, camellia_test_ecb_cipher[u][i], 16 );
+            memcpy( dst, camellia_test_ecb_plain[i], 16 );
+        } else { /* MBEDTLS_CAMELLIA_ENCRYPT */
+            mbedtls_camellia_setkey_enc( &ctx, key, 128 + u * 64 );
+            memcpy( src, camellia_test_ecb_plain[i], 16 );
+            memcpy( dst, camellia_test_ecb_cipher[u][i], 16 );
+        }
+
+        mbedtls_camellia_crypt_ecb( &ctx, v, src, buf );
+
+        if( memcmp( buf, dst, 16 ) != 0 )
+        {
+            if( verbose != 0 )
+                mbedtls_printf( "failed\n" );
+
+            return( 1 );
+        }
+    }
+
+    if( verbose != 0 )
+        mbedtls_printf( "passed\n" );
+    }
+
+    if( verbose != 0 )
+        mbedtls_printf( "\n" );
+
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+    /*
+     * CBC mode
+     */
+    for( j = 0; j < 6; j++ )
+    {
+        u = j >> 1;
+        v = j  & 1;
+
+        if( verbose != 0 )
+            mbedtls_printf( "  CAMELLIA-CBC-%3d (%s): ", 128 + u * 64,
+                             ( v == MBEDTLS_CAMELLIA_DECRYPT ) ? "dec" : "enc" );
+
+        memcpy( src, camellia_test_cbc_iv, 16 );
+        memcpy( dst, camellia_test_cbc_iv, 16 );
+        memcpy( key, camellia_test_cbc_key[u], 16 + 8 * u );
+
+        if( v == MBEDTLS_CAMELLIA_DECRYPT ) {
+            mbedtls_camellia_setkey_dec( &ctx, key, 128 + u * 64 );
+        } else {
+            mbedtls_camellia_setkey_enc( &ctx, key, 128 + u * 64 );
+        }
+
+        for( i = 0; i < CAMELLIA_TESTS_CBC; i++ ) {
+
+            if( v == MBEDTLS_CAMELLIA_DECRYPT ) {
+                memcpy( iv , src, 16 );
+                memcpy( src, camellia_test_cbc_cipher[u][i], 16 );
+                memcpy( dst, camellia_test_cbc_plain[i], 16 );
+            } else { /* MBEDTLS_CAMELLIA_ENCRYPT */
+                memcpy( iv , dst, 16 );
+                memcpy( src, camellia_test_cbc_plain[i], 16 );
+                memcpy( dst, camellia_test_cbc_cipher[u][i], 16 );
+            }
+
+            mbedtls_camellia_crypt_cbc( &ctx, v, 16, iv, src, buf );
+
+            if( memcmp( buf, dst, 16 ) != 0 )
+            {
+                if( verbose != 0 )
+                    mbedtls_printf( "failed\n" );
+
+                return( 1 );
+            }
+        }
+
+        if( verbose != 0 )
+            mbedtls_printf( "passed\n" );
+    }
+#endif /* MBEDTLS_CIPHER_MODE_CBC */
+
+    if( verbose != 0 )
+        mbedtls_printf( "\n" );
+
+#if defined(MBEDTLS_CIPHER_MODE_CTR)
+    /*
+     * CTR mode
+     */
+    for( i = 0; i < 6; i++ )
+    {
+        u = i >> 1;
+        v = i  & 1;
+
+        if( verbose != 0 )
+            mbedtls_printf( "  CAMELLIA-CTR-128 (%s): ",
+                             ( v == MBEDTLS_CAMELLIA_DECRYPT ) ? "dec" : "enc" );
+
+        memcpy( nonce_counter, camellia_test_ctr_nonce_counter[u], 16 );
+        memcpy( key, camellia_test_ctr_key[u], 16 );
+
+        offset = 0;
+        mbedtls_camellia_setkey_enc( &ctx, key, 128 );
+
+        if( v == MBEDTLS_CAMELLIA_DECRYPT )
+        {
+            len = camellia_test_ctr_len[u];
+            memcpy( buf, camellia_test_ctr_ct[u], len );
+
+            mbedtls_camellia_crypt_ctr( &ctx, len, &offset, nonce_counter, stream_block,
+                                buf, buf );
+
+            if( memcmp( buf, camellia_test_ctr_pt[u], len ) != 0 )
+            {
+                if( verbose != 0 )
+                    mbedtls_printf( "failed\n" );
+
+                return( 1 );
+            }
+        }
+        else
+        {
+            len = camellia_test_ctr_len[u];
+            memcpy( buf, camellia_test_ctr_pt[u], len );
+
+            mbedtls_camellia_crypt_ctr( &ctx, len, &offset, nonce_counter, stream_block,
+                                buf, buf );
+
+            if( memcmp( buf, camellia_test_ctr_ct[u], len ) != 0 )
+            {
+                if( verbose != 0 )
+                    mbedtls_printf( "failed\n" );
+
+                return( 1 );
+            }
+        }
+
+        if( verbose != 0 )
+            mbedtls_printf( "passed\n" );
+    }
+
+    if( verbose != 0 )
+        mbedtls_printf( "\n" );
+#endif /* MBEDTLS_CIPHER_MODE_CTR */
+
+    return( 0 );
+}
+
+#endif /* MBEDTLS_SELF_TEST */
+
+#endif /* MBEDTLS_CAMELLIA_C */
diff --git a/common/mbedtls/camellia.h b/common/mbedtls/camellia.h
new file mode 100644
index 000000000..cb36312b4
--- /dev/null
+++ b/common/mbedtls/camellia.h
@@ -0,0 +1,273 @@
+/**
+ * \file camellia.h
+ *
+ * \brief Camellia block cipher
+ */
+/*
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+#ifndef MBEDTLS_CAMELLIA_H
+#define MBEDTLS_CAMELLIA_H
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#include <stddef.h>
+#include <stdint.h>
+
+#define MBEDTLS_CAMELLIA_ENCRYPT     1
+#define MBEDTLS_CAMELLIA_DECRYPT     0
+
+#define MBEDTLS_ERR_CAMELLIA_INVALID_KEY_LENGTH           -0x0024  /**< Invalid key length. */
+#define MBEDTLS_ERR_CAMELLIA_INVALID_INPUT_LENGTH         -0x0026  /**< Invalid data input length. */
+#define MBEDTLS_ERR_CAMELLIA_HW_ACCEL_FAILED              -0x0027  /**< Camellia hardware accelerator failed. */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if !defined(MBEDTLS_CAMELLIA_ALT)
+// Regular implementation
+//
+
+/**
+ * \brief          CAMELLIA context structure
+ */
+typedef struct mbedtls_camellia_context
+{
+    int nr;                     /*!<  number of rounds  */
+    uint32_t rk[68];            /*!<  CAMELLIA round keys    */
+}
+mbedtls_camellia_context;
+
+#else  /* MBEDTLS_CAMELLIA_ALT */
+#include "camellia_alt.h"
+#endif /* MBEDTLS_CAMELLIA_ALT */
+
+/**
+ * \brief          Initialize CAMELLIA context
+ *
+ * \param ctx      CAMELLIA context to be initialized
+ */
+void mbedtls_camellia_init( mbedtls_camellia_context *ctx );
+
+/**
+ * \brief          Clear CAMELLIA context
+ *
+ * \param ctx      CAMELLIA context to be cleared
+ */
+void mbedtls_camellia_free( mbedtls_camellia_context *ctx );
+
+/**
+ * \brief          CAMELLIA key schedule (encryption)
+ *
+ * \param ctx      CAMELLIA context to be initialized
+ * \param key      encryption key
+ * \param keybits  must be 128, 192 or 256
+ *
+ * \return         0 if successful, or MBEDTLS_ERR_CAMELLIA_INVALID_KEY_LENGTH
+ */
+int mbedtls_camellia_setkey_enc( mbedtls_camellia_context *ctx, const unsigned char *key,
+                         unsigned int keybits );
+
+/**
+ * \brief          CAMELLIA key schedule (decryption)
+ *
+ * \param ctx      CAMELLIA context to be initialized
+ * \param key      decryption key
+ * \param keybits  must be 128, 192 or 256
+ *
+ * \return         0 if successful, or MBEDTLS_ERR_CAMELLIA_INVALID_KEY_LENGTH
+ */
+int mbedtls_camellia_setkey_dec( mbedtls_camellia_context *ctx, const unsigned char *key,
+                         unsigned int keybits );
+
+/**
+ * \brief          CAMELLIA-ECB block encryption/decryption
+ *
+ * \param ctx      CAMELLIA context
+ * \param mode     MBEDTLS_CAMELLIA_ENCRYPT or MBEDTLS_CAMELLIA_DECRYPT
+ * \param input    16-byte input block
+ * \param output   16-byte output block
+ *
+ * \return         0 if successful
+ */
+int mbedtls_camellia_crypt_ecb( mbedtls_camellia_context *ctx,
+                    int mode,
+                    const unsigned char input[16],
+                    unsigned char output[16] );
+
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+/**
+ * \brief          CAMELLIA-CBC buffer encryption/decryption
+ *                 Length should be a multiple of the block
+ *                 size (16 bytes)
+ *
+ * \note           Upon exit, the content of the IV is updated so that you can
+ *                 call the function same function again on the following
+ *                 block(s) of data and get the same result as if it was
+ *                 encrypted in one call. This allows a "streaming" usage.
+ *                 If on the other hand you need to retain the contents of the
+ *                 IV, you should either save it manually or use the cipher
+ *                 module instead.
+ *
+ * \param ctx      CAMELLIA context
+ * \param mode     MBEDTLS_CAMELLIA_ENCRYPT or MBEDTLS_CAMELLIA_DECRYPT
+ * \param length   length of the input data
+ * \param iv       initialization vector (updated after use)
+ * \param input    buffer holding the input data
+ * \param output   buffer holding the output data
+ *
+ * \return         0 if successful, or
+ *                 MBEDTLS_ERR_CAMELLIA_INVALID_INPUT_LENGTH
+ */
+int mbedtls_camellia_crypt_cbc( mbedtls_camellia_context *ctx,
+                    int mode,
+                    size_t length,
+                    unsigned char iv[16],
+                    const unsigned char *input,
+                    unsigned char *output );
+#endif /* MBEDTLS_CIPHER_MODE_CBC */
+
+#if defined(MBEDTLS_CIPHER_MODE_CFB)
+/**
+ * \brief          CAMELLIA-CFB128 buffer encryption/decryption
+ *
+ * Note: Due to the nature of CFB you should use the same key schedule for
+ * both encryption and decryption. So a context initialized with
+ * mbedtls_camellia_setkey_enc() for both MBEDTLS_CAMELLIA_ENCRYPT and CAMELLIE_DECRYPT.
+ *
+ * \note           Upon exit, the content of the IV is updated so that you can
+ *                 call the function same function again on the following
+ *                 block(s) of data and get the same result as if it was
+ *                 encrypted in one call. This allows a "streaming" usage.
+ *                 If on the other hand you need to retain the contents of the
+ *                 IV, you should either save it manually or use the cipher
+ *                 module instead.
+ *
+ * \param ctx      CAMELLIA context
+ * \param mode     MBEDTLS_CAMELLIA_ENCRYPT or MBEDTLS_CAMELLIA_DECRYPT
+ * \param length   length of the input data
+ * \param iv_off   offset in IV (updated after use)
+ * \param iv       initialization vector (updated after use)
+ * \param input    buffer holding the input data
+ * \param output   buffer holding the output data
+ *
+ * \return         0 if successful, or
+ *                 MBEDTLS_ERR_CAMELLIA_INVALID_INPUT_LENGTH
+ */
+int mbedtls_camellia_crypt_cfb128( mbedtls_camellia_context *ctx,
+                       int mode,
+                       size_t length,
+                       size_t *iv_off,
+                       unsigned char iv[16],
+                       const unsigned char *input,
+                       unsigned char *output );
+#endif /* MBEDTLS_CIPHER_MODE_CFB */
+
+#if defined(MBEDTLS_CIPHER_MODE_CTR)
+/**
+ * \brief               CAMELLIA-CTR buffer encryption/decryption
+ *
+ * Note: Due to the nature of CTR you should use the same key schedule for
+ * both encryption and decryption. So a context initialized with
+ * mbedtls_camellia_setkey_enc() for both MBEDTLS_CAMELLIA_ENCRYPT and MBEDTLS_CAMELLIA_DECRYPT.
+ *
+ * \warning    You must never reuse a nonce value with the same key. Doing so
+ *             would void the encryption for the two messages encrypted with
+ *             the same nonce and key.
+ *
+ *             There are two common strategies for managing nonces with CTR:
+ *
+ *             1. You can handle everything as a single message processed over
+ *             successive calls to this function. In that case, you want to
+ *             set \p nonce_counter and \p nc_off to 0 for the first call, and
+ *             then preserve the values of \p nonce_counter, \p nc_off and \p
+ *             stream_block across calls to this function as they will be
+ *             updated by this function.
+ *
+ *             With this strategy, you must not encrypt more than 2**128
+ *             blocks of data with the same key.
+ *
+ *             2. You can encrypt separate messages by dividing the \p
+ *             nonce_counter buffer in two areas: the first one used for a
+ *             per-message nonce, handled by yourself, and the second one
+ *             updated by this function internally.
+ *
+ *             For example, you might reserve the first 12 bytes for the
+ *             per-message nonce, and the last 4 bytes for internal use. In that
+ *             case, before calling this function on a new message you need to
+ *             set the first 12 bytes of \p nonce_counter to your chosen nonce
+ *             value, the last 4 to 0, and \p nc_off to 0 (which will cause \p
+ *             stream_block to be ignored). That way, you can encrypt at most
+ *             2**96 messages of up to 2**32 blocks each with the same key.
+ *
+ *             The per-message nonce (or information sufficient to reconstruct
+ *             it) needs to be communicated with the ciphertext and must be unique.
+ *             The recommended way to ensure uniqueness is to use a message
+ *             counter. An alternative is to generate random nonces, but this
+ *             limits the number of messages that can be securely encrypted:
+ *             for example, with 96-bit random nonces, you should not encrypt
+ *             more than 2**32 messages with the same key.
+ *
+ *             Note that for both stategies, sizes are measured in blocks and
+ *             that a CAMELLIA block is 16 bytes.
+ *
+ * \warning    Upon return, \p stream_block contains sensitive data. Its
+ *             content must not be written to insecure storage and should be
+ *             securely discarded as soon as it's no longer needed.
+ *
+ * \param ctx           CAMELLIA context
+ * \param length        The length of the data
+ * \param nc_off        The offset in the current stream_block (for resuming
+ *                      within current cipher stream). The offset pointer to
+ *                      should be 0 at the start of a stream.
+ * \param nonce_counter The 128-bit nonce and counter.
+ * \param stream_block  The saved stream-block for resuming. Is overwritten
+ *                      by the function.
+ * \param input         The input data stream
+ * \param output        The output data stream
+ *
+ * \return         0 if successful
+ */
+int mbedtls_camellia_crypt_ctr( mbedtls_camellia_context *ctx,
+                       size_t length,
+                       size_t *nc_off,
+                       unsigned char nonce_counter[16],
+                       unsigned char stream_block[16],
+                       const unsigned char *input,
+                       unsigned char *output );
+#endif /* MBEDTLS_CIPHER_MODE_CTR */
+
+/**
+ * \brief          Checkup routine
+ *
+ * \return         0 if successful, or 1 if the test failed
+ */
+int mbedtls_camellia_self_test( int verbose );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* camellia.h */
diff --git a/common/mbedtls/certs.c b/common/mbedtls/certs.c
new file mode 100644
index 000000000..dd9d02ba3
--- /dev/null
+++ b/common/mbedtls/certs.c
@@ -0,0 +1,405 @@
+/*
+ *  X.509 test certificates
+ *
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "mbedtls/config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#include "mbedtls/certs.h"
+
+#if defined(MBEDTLS_CERTS_C)
+
+#if defined(MBEDTLS_ECDSA_C)
+#define TEST_CA_CRT_EC                                                  \
+"-----BEGIN CERTIFICATE-----\r\n"                                       \
+"MIICUjCCAdegAwIBAgIJAMFD4n5iQ8zoMAoGCCqGSM49BAMCMD4xCzAJBgNVBAYT\r\n"  \
+"Ak5MMREwDwYDVQQKEwhQb2xhclNTTDEcMBoGA1UEAxMTUG9sYXJzc2wgVGVzdCBF\r\n"  \
+"QyBDQTAeFw0xMzA5MjQxNTQ5NDhaFw0yMzA5MjIxNTQ5NDhaMD4xCzAJBgNVBAYT\r\n"  \
+"Ak5MMREwDwYDVQQKEwhQb2xhclNTTDEcMBoGA1UEAxMTUG9sYXJzc2wgVGVzdCBF\r\n"  \
+"QyBDQTB2MBAGByqGSM49AgEGBSuBBAAiA2IABMPaKzRBN1gvh1b+/Im6KUNLTuBu\r\n"  \
+"ww5XUzM5WNRStJGVOQsj318XJGJI/BqVKc4sLYfCiFKAr9ZqqyHduNMcbli4yuiy\r\n"  \
+"aY7zQa0pw7RfdadHb9UZKVVpmlM7ILRmFmAzHqOBoDCBnTAdBgNVHQ4EFgQUnW0g\r\n"  \
+"JEkBPyvLeLUZvH4kydv7NnwwbgYDVR0jBGcwZYAUnW0gJEkBPyvLeLUZvH4kydv7\r\n"  \
+"NnyhQqRAMD4xCzAJBgNVBAYTAk5MMREwDwYDVQQKEwhQb2xhclNTTDEcMBoGA1UE\r\n"  \
+"AxMTUG9sYXJzc2wgVGVzdCBFQyBDQYIJAMFD4n5iQ8zoMAwGA1UdEwQFMAMBAf8w\r\n"  \
+"CgYIKoZIzj0EAwIDaQAwZgIxAMO0YnNWKJUAfXgSJtJxexn4ipg+kv4znuR50v56\r\n"  \
+"t4d0PCu412mUC6Nnd7izvtE2MgIxAP1nnJQjZ8BWukszFQDG48wxCCyci9qpdSMv\r\n"  \
+"uCjn8pwUOkABXK8Mss90fzCfCEOtIA==\r\n"                                  \
+"-----END CERTIFICATE-----\r\n"
+const char mbedtls_test_ca_crt_ec[] = TEST_CA_CRT_EC;
+const size_t mbedtls_test_ca_crt_ec_len = sizeof( mbedtls_test_ca_crt_ec );
+
+const char mbedtls_test_ca_key_ec[] =
+"-----BEGIN EC PRIVATE KEY-----\r\n"
+"Proc-Type: 4,ENCRYPTED\r\n"
+"DEK-Info: DES-EDE3-CBC,307EAB469933D64E\r\n"
+"\r\n"
+"IxbrRmKcAzctJqPdTQLA4SWyBYYGYJVkYEna+F7Pa5t5Yg/gKADrFKcm6B72e7DG\r\n"
+"ihExtZI648s0zdYw6qSJ74vrPSuWDe5qm93BqsfVH9svtCzWHW0pm1p0KTBCFfUq\r\n"
+"UsuWTITwJImcnlAs1gaRZ3sAWm7cOUidL0fo2G0fYUFNcYoCSLffCFTEHBuPnagb\r\n"
+"a77x/sY1Bvii8S9/XhDTb6pTMx06wzrm\r\n"
+"-----END EC PRIVATE KEY-----\r\n";
+const size_t mbedtls_test_ca_key_ec_len = sizeof( mbedtls_test_ca_key_ec );
+
+const char mbedtls_test_ca_pwd_ec[] = "PolarSSLTest";
+const size_t mbedtls_test_ca_pwd_ec_len = sizeof( mbedtls_test_ca_pwd_ec ) - 1;
+
+const char mbedtls_test_srv_crt_ec[] =
+"-----BEGIN CERTIFICATE-----\r\n"
+"MIICHzCCAaWgAwIBAgIBCTAKBggqhkjOPQQDAjA+MQswCQYDVQQGEwJOTDERMA8G\r\n"
+"A1UEChMIUG9sYXJTU0wxHDAaBgNVBAMTE1BvbGFyc3NsIFRlc3QgRUMgQ0EwHhcN\r\n"
+"MTMwOTI0MTU1MjA0WhcNMjMwOTIyMTU1MjA0WjA0MQswCQYDVQQGEwJOTDERMA8G\r\n"
+"A1UEChMIUG9sYXJTU0wxEjAQBgNVBAMTCWxvY2FsaG9zdDBZMBMGByqGSM49AgEG\r\n"
+"CCqGSM49AwEHA0IABDfMVtl2CR5acj7HWS3/IG7ufPkGkXTQrRS192giWWKSTuUA\r\n"
+"2CMR/+ov0jRdXRa9iojCa3cNVc2KKg76Aci07f+jgZ0wgZowCQYDVR0TBAIwADAd\r\n"
+"BgNVHQ4EFgQUUGGlj9QH2deCAQzlZX+MY0anE74wbgYDVR0jBGcwZYAUnW0gJEkB\r\n"
+"PyvLeLUZvH4kydv7NnyhQqRAMD4xCzAJBgNVBAYTAk5MMREwDwYDVQQKEwhQb2xh\r\n"
+"clNTTDEcMBoGA1UEAxMTUG9sYXJzc2wgVGVzdCBFQyBDQYIJAMFD4n5iQ8zoMAoG\r\n"
+"CCqGSM49BAMCA2gAMGUCMQCaLFzXptui5WQN8LlO3ddh1hMxx6tzgLvT03MTVK2S\r\n"
+"C12r0Lz3ri/moSEpNZWqPjkCMCE2f53GXcYLqyfyJR078c/xNSUU5+Xxl7VZ414V\r\n"
+"fGa5kHvHARBPc8YAIVIqDvHH1Q==\r\n"
+"-----END CERTIFICATE-----\r\n";
+const size_t mbedtls_test_srv_crt_ec_len = sizeof( mbedtls_test_srv_crt_ec );
+
+const char mbedtls_test_srv_key_ec[] =
+"-----BEGIN EC PRIVATE KEY-----\r\n"
+"MHcCAQEEIPEqEyB2AnCoPL/9U/YDHvdqXYbIogTywwyp6/UfDw6noAoGCCqGSM49\r\n"
+"AwEHoUQDQgAEN8xW2XYJHlpyPsdZLf8gbu58+QaRdNCtFLX3aCJZYpJO5QDYIxH/\r\n"
+"6i/SNF1dFr2KiMJrdw1VzYoqDvoByLTt/w==\r\n"
+"-----END EC PRIVATE KEY-----\r\n";
+const size_t mbedtls_test_srv_key_ec_len = sizeof( mbedtls_test_srv_key_ec );
+
+const char mbedtls_test_cli_crt_ec[] =
+"-----BEGIN CERTIFICATE-----\r\n"
+"MIICLDCCAbKgAwIBAgIBDTAKBggqhkjOPQQDAjA+MQswCQYDVQQGEwJOTDERMA8G\r\n"
+"A1UEChMIUG9sYXJTU0wxHDAaBgNVBAMTE1BvbGFyc3NsIFRlc3QgRUMgQ0EwHhcN\r\n"
+"MTMwOTI0MTU1MjA0WhcNMjMwOTIyMTU1MjA0WjBBMQswCQYDVQQGEwJOTDERMA8G\r\n"
+"A1UEChMIUG9sYXJTU0wxHzAdBgNVBAMTFlBvbGFyU1NMIFRlc3QgQ2xpZW50IDIw\r\n"
+"WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARX5a6xc9/TrLuTuIH/Eq7u5lOszlVT\r\n"
+"9jQOzC7jYyUL35ji81xgNpbA1RgUcOV/n9VLRRjlsGzVXPiWj4dwo+THo4GdMIGa\r\n"
+"MAkGA1UdEwQCMAAwHQYDVR0OBBYEFHoAX4Zk/OBd5REQO7LmO8QmP8/iMG4GA1Ud\r\n"
+"IwRnMGWAFJ1tICRJAT8ry3i1Gbx+JMnb+zZ8oUKkQDA+MQswCQYDVQQGEwJOTDER\r\n"
+"MA8GA1UEChMIUG9sYXJTU0wxHDAaBgNVBAMTE1BvbGFyc3NsIFRlc3QgRUMgQ0GC\r\n"
+"CQDBQ+J+YkPM6DAKBggqhkjOPQQDAgNoADBlAjBKZQ17IIOimbmoD/yN7o89u3BM\r\n"
+"lgOsjnhw3fIOoLIWy2WOGsk/LGF++DzvrRzuNiACMQCd8iem1XS4JK7haj8xocpU\r\n"
+"LwjQje5PDGHfd3h9tP38Qknu5bJqws0md2KOKHyeV0U=\r\n"
+"-----END CERTIFICATE-----\r\n";
+const size_t mbedtls_test_cli_crt_ec_len = sizeof( mbedtls_test_cli_crt_ec );
+
+const char mbedtls_test_cli_key_ec[] =
+"-----BEGIN EC PRIVATE KEY-----\r\n"
+"MHcCAQEEIPb3hmTxZ3/mZI3vyk7p3U3wBf+WIop6hDhkFzJhmLcqoAoGCCqGSM49\r\n"
+"AwEHoUQDQgAEV+WusXPf06y7k7iB/xKu7uZTrM5VU/Y0Dswu42MlC9+Y4vNcYDaW\r\n"
+"wNUYFHDlf5/VS0UY5bBs1Vz4lo+HcKPkxw==\r\n"
+"-----END EC PRIVATE KEY-----\r\n";
+const size_t mbedtls_test_cli_key_ec_len = sizeof( mbedtls_test_cli_key_ec );
+#endif /* MBEDTLS_ECDSA_C */
+
+#if defined(MBEDTLS_RSA_C)
+
+#if defined(MBEDTLS_SHA256_C)
+#define TEST_CA_CRT_RSA_SHA256                                          \
+"-----BEGIN CERTIFICATE-----\r\n"                                       \
+"MIIDhzCCAm+gAwIBAgIBADANBgkqhkiG9w0BAQsFADA7MQswCQYDVQQGEwJOTDER\r\n"  \
+"MA8GA1UECgwIUG9sYXJTU0wxGTAXBgNVBAMMEFBvbGFyU1NMIFRlc3QgQ0EwHhcN\r\n"  \
+"MTcwNTA0MTY1NzAxWhcNMjcwNTA1MTY1NzAxWjA7MQswCQYDVQQGEwJOTDERMA8G\r\n"  \
+"A1UECgwIUG9sYXJTU0wxGTAXBgNVBAMMEFBvbGFyU1NMIFRlc3QgQ0EwggEiMA0G\r\n"  \
+"CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDA3zf8F7vglp0/ht6WMn1EpRagzSHx\r\n"  \
+"mdTs6st8GFgIlKXsm8WL3xoemTiZhx57wI053zhdcHgH057Zk+i5clHFzqMwUqny\r\n"  \
+"50BwFMtEonILwuVA+T7lpg6z+exKY8C4KQB0nFc7qKUEkHHxvYPZP9al4jwqj+8n\r\n"  \
+"YMPGn8u67GB9t+aEMr5P+1gmIgNb1LTV+/Xjli5wwOQuvfwu7uJBVcA0Ln0kcmnL\r\n"  \
+"R7EUQIN9Z/SG9jGr8XmksrUuEvmEF/Bibyc+E1ixVA0hmnM3oTDPb5Lc9un8rNsu\r\n"  \
+"KNF+AksjoBXyOGVkCeoMbo4bF6BxyLObyavpw/LPh5aPgAIynplYb6LVAgMBAAGj\r\n"  \
+"gZUwgZIwHQYDVR0OBBYEFLRa5KWz3tJS9rnVppUP6z68x/3/MGMGA1UdIwRcMFqA\r\n"  \
+"FLRa5KWz3tJS9rnVppUP6z68x/3/oT+kPTA7MQswCQYDVQQGEwJOTDERMA8GA1UE\r\n"  \
+"CgwIUG9sYXJTU0wxGTAXBgNVBAMMEFBvbGFyU1NMIFRlc3QgQ0GCAQAwDAYDVR0T\r\n"  \
+"BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAHK/HHrTZMnnVMpde1io+voAtql7j\r\n"  \
+"4sRhLrjD7o3THtwRbDa2diCvpq0Sq23Ng2LMYoXsOxoL/RQK3iN7UKxV3MKPEr0w\r\n"  \
+"XQS+kKQqiT2bsfrjnWMVHZtUOMpm6FNqcdGm/Rss3vKda2lcKl8kUnq/ylc1+QbB\r\n"  \
+"G6A6tUvQcr2ZyWfVg+mM5XkhTrOOXus2OLikb4WwEtJTJRNE0f+yPODSUz0/vT57\r\n"  \
+"ApH0CnB80bYJshYHPHHymOtleAB8KSYtqm75g/YNobjnjB6cm4HkW3OZRVIl6fYY\r\n"  \
+"n20NRVA1Vjs6GAROr4NqW4k/+LofY9y0LLDE+p0oIEKXIsIvhPr39swxSA==\r\n"      \
+"-----END CERTIFICATE-----\r\n"
+
+const char   mbedtls_test_ca_crt_rsa[]   = TEST_CA_CRT_RSA_SHA256;
+const size_t mbedtls_test_ca_crt_rsa_len = sizeof( mbedtls_test_ca_crt_rsa );
+#define TEST_CA_CRT_RSA_SOME
+
+static const char mbedtls_test_ca_crt_rsa_sha256[] = TEST_CA_CRT_RSA_SHA256;
+
+#endif
+
+#if !defined(TEST_CA_CRT_RSA_SOME) || defined(MBEDTLS_SHA1_C)
+#define TEST_CA_CRT_RSA_SHA1                                            \
+"-----BEGIN CERTIFICATE-----\r\n"                                       \
+"MIIDhzCCAm+gAwIBAgIBADANBgkqhkiG9w0BAQUFADA7MQswCQYDVQQGEwJOTDER\r\n"  \
+"MA8GA1UEChMIUG9sYXJTU0wxGTAXBgNVBAMTEFBvbGFyU1NMIFRlc3QgQ0EwHhcN\r\n"  \
+"MTEwMjEyMTQ0NDAwWhcNMjEwMjEyMTQ0NDAwWjA7MQswCQYDVQQGEwJOTDERMA8G\r\n"  \
+"A1UEChMIUG9sYXJTU0wxGTAXBgNVBAMTEFBvbGFyU1NMIFRlc3QgQ0EwggEiMA0G\r\n"  \
+"CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDA3zf8F7vglp0/ht6WMn1EpRagzSHx\r\n"  \
+"mdTs6st8GFgIlKXsm8WL3xoemTiZhx57wI053zhdcHgH057Zk+i5clHFzqMwUqny\r\n"  \
+"50BwFMtEonILwuVA+T7lpg6z+exKY8C4KQB0nFc7qKUEkHHxvYPZP9al4jwqj+8n\r\n"  \
+"YMPGn8u67GB9t+aEMr5P+1gmIgNb1LTV+/Xjli5wwOQuvfwu7uJBVcA0Ln0kcmnL\r\n"  \
+"R7EUQIN9Z/SG9jGr8XmksrUuEvmEF/Bibyc+E1ixVA0hmnM3oTDPb5Lc9un8rNsu\r\n"  \
+"KNF+AksjoBXyOGVkCeoMbo4bF6BxyLObyavpw/LPh5aPgAIynplYb6LVAgMBAAGj\r\n"  \
+"gZUwgZIwDAYDVR0TBAUwAwEB/zAdBgNVHQ4EFgQUtFrkpbPe0lL2udWmlQ/rPrzH\r\n"  \
+"/f8wYwYDVR0jBFwwWoAUtFrkpbPe0lL2udWmlQ/rPrzH/f+hP6Q9MDsxCzAJBgNV\r\n"  \
+"BAYTAk5MMREwDwYDVQQKEwhQb2xhclNTTDEZMBcGA1UEAxMQUG9sYXJTU0wgVGVz\r\n"  \
+"dCBDQYIBADANBgkqhkiG9w0BAQUFAAOCAQEAuP1U2ABUkIslsCfdlc2i94QHHYeJ\r\n"  \
+"SsR4EdgHtdciUI5I62J6Mom+Y0dT/7a+8S6MVMCZP6C5NyNyXw1GWY/YR82XTJ8H\r\n"  \
+"DBJiCTok5DbZ6SzaONBzdWHXwWwmi5vg1dxn7YxrM9d0IjxM27WNKs4sDQhZBQkF\r\n"  \
+"pjmfs2cb4oPl4Y9T9meTx/lvdkRYEug61Jfn6cA+qHpyPYdTH+UshITnmp5/Ztkf\r\n"  \
+"m/UTSLBNFNHesiTZeH31NcxYGdHSme9Nc/gfidRa0FLOCfWxRlFqAI47zG9jAQCZ\r\n"  \
+"7Z2mCGDNMhjQc+BYcdnl0lPXjdDK6V0qCg1dVewhUBcW5gZKzV7e9+DpVA==\r\n"      \
+"-----END CERTIFICATE-----\r\n"
+
+#if !defined (TEST_CA_CRT_RSA_SOME)
+const char   mbedtls_test_ca_crt_rsa[]   = TEST_CA_CRT_RSA_SHA1;
+const size_t mbedtls_test_ca_crt_rsa_len = sizeof( mbedtls_test_ca_crt_rsa );
+#endif
+
+static const char mbedtls_test_ca_crt_rsa_sha1[] = TEST_CA_CRT_RSA_SHA1;
+
+#endif
+
+const char mbedtls_test_ca_key_rsa[] =
+"-----BEGIN RSA PRIVATE KEY-----\r\n"
+"Proc-Type: 4,ENCRYPTED\r\n"
+"DEK-Info: DES-EDE3-CBC,A8A95B05D5B7206B\r\n"
+"\r\n"
+"9Qd9GeArejl1GDVh2lLV1bHt0cPtfbh5h/5zVpAVaFpqtSPMrElp50Rntn9et+JA\r\n"
+"7VOyboR+Iy2t/HU4WvA687k3Bppe9GwKHjHhtl//8xFKwZr3Xb5yO5JUP8AUctQq\r\n"
+"Nb8CLlZyuUC+52REAAthdWgsX+7dJO4yabzUcQ22Tp9JSD0hiL43BlkWYUNK3dAo\r\n"
+"PZlmiptjnzVTjg1MxsBSydZinWOLBV8/JQgxSPo2yD4uEfig28qbvQ2wNIn0pnAb\r\n"
+"GxnSAOazkongEGfvcjIIs+LZN9gXFhxcOh6kc4Q/c99B7QWETwLLkYgZ+z1a9VY9\r\n"
+"gEU7CwCxYCD+h9hY6FPmsK0/lC4O7aeRKpYq00rPPxs6i7phiexg6ax6yTMmArQq\r\n"
+"QmK3TAsJm8V/J5AWpLEV6jAFgRGymGGHnof0DXzVWZidrcZJWTNuGEX90nB3ee2w\r\n"
+"PXJEFWKoD3K3aFcSLdHYr3mLGxP7H9ThQai9VsycxZKS5kwvBKQ//YMrmFfwPk8x\r\n"
+"vTeY4KZMaUrveEel5tWZC94RSMKgxR6cyE1nBXyTQnDOGbfpNNgBKxyKbINWoOJU\r\n"
+"WJZAwlsQn+QzCDwpri7+sV1mS3gBE6UY7aQmnmiiaC2V3Hbphxct/en5QsfDOt1X\r\n"
+"JczSfpRWLlbPznZg8OQh/VgCMA58N5DjOzTIK7sJJ5r+94ZBTCpgAMbF588f0NTR\r\n"
+"KCe4yrxGJR7X02M4nvD4IwOlpsQ8xQxZtOSgXv4LkxvdU9XJJKWZ/XNKJeWztxSe\r\n"
+"Z1vdTc2YfsDBA2SEv33vxHx2g1vqtw8SjDRT2RaQSS0QuSaMJimdOX6mTOCBKk1J\r\n"
+"9Q5mXTrER+/LnK0jEmXsBXWA5bqqVZIyahXSx4VYZ7l7w/PHiUDtDgyRhMMKi4n2\r\n"
+"iQvQcWSQTjrpnlJbca1/DkpRt3YwrvJwdqb8asZU2VrNETh5x0QVefDRLFiVpif/\r\n"
+"tUaeAe/P1F8OkS7OIZDs1SUbv/sD2vMbhNkUoCms3/PvNtdnvgL4F0zhaDpKCmlT\r\n"
+"P8vx49E7v5CyRNmED9zZg4o3wmMqrQO93PtTug3Eu9oVx1zPQM1NVMyBa2+f29DL\r\n"
+"1nuTCeXdo9+ni45xx+jAI4DCwrRdhJ9uzZyC6962H37H6D+5naNvClFR1s6li1Gb\r\n"
+"nqPoiy/OBsEx9CaDGcqQBp5Wme/3XW+6z1ISOx+igwNTVCT14mHdBMbya0eIKft5\r\n"
+"X+GnwtgEMyCYyyWuUct8g4RzErcY9+yW9Om5Hzpx4zOuW4NPZgPDTgK+t2RSL/Yq\r\n"
+"rE1njrgeGYcVeG3f+OftH4s6fPbq7t1A5ZgUscbLMBqr9tK+OqygR4EgKBPsH6Cz\r\n"
+"L6zlv/2RV0qAHvVuDJcIDIgwY5rJtINEm32rhOeFNJwZS5MNIC1czXZx5//ugX7l\r\n"
+"I4sy5nbVhwSjtAk8Xg5dZbdTZ6mIrb7xqH+fdakZor1khG7bC2uIwibD3cSl2XkR\r\n"
+"wN48lslbHnqqagr6Xm1nNOSVl8C/6kbJEsMpLhAezfRtGwvOucoaE+WbeUNolGde\r\n"
+"P/eQiddSf0brnpiLJRh7qZrl9XuqYdpUqnoEdMAfotDOID8OtV7gt8a48ad8VPW2\r\n"
+"-----END RSA PRIVATE KEY-----\r\n";
+const size_t mbedtls_test_ca_key_rsa_len = sizeof( mbedtls_test_ca_key_rsa );
+
+const char mbedtls_test_ca_pwd_rsa[] = "PolarSSLTest";
+const size_t mbedtls_test_ca_pwd_rsa_len = sizeof( mbedtls_test_ca_pwd_rsa ) - 1;
+
+const char mbedtls_test_srv_crt_rsa[] =
+"-----BEGIN CERTIFICATE-----\r\n"
+"MIIDNzCCAh+gAwIBAgIBAjANBgkqhkiG9w0BAQUFADA7MQswCQYDVQQGEwJOTDER\r\n"
+"MA8GA1UEChMIUG9sYXJTU0wxGTAXBgNVBAMTEFBvbGFyU1NMIFRlc3QgQ0EwHhcN\r\n"
+"MTEwMjEyMTQ0NDA2WhcNMjEwMjEyMTQ0NDA2WjA0MQswCQYDVQQGEwJOTDERMA8G\r\n"
+"A1UEChMIUG9sYXJTU0wxEjAQBgNVBAMTCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcN\r\n"
+"AQEBBQADggEPADCCAQoCggEBAMFNo93nzR3RBNdJcriZrA545Do8Ss86ExbQWuTN\r\n"
+"owCIp+4ea5anUrSQ7y1yej4kmvy2NKwk9XfgJmSMnLAofaHa6ozmyRyWvP7BBFKz\r\n"
+"NtSj+uGxdtiQwWG0ZlI2oiZTqqt0Xgd9GYLbKtgfoNkNHC1JZvdbJXNG6AuKT2kM\r\n"
+"tQCQ4dqCEGZ9rlQri2V5kaHiYcPNQEkI7mgM8YuG0ka/0LiqEQMef1aoGh5EGA8P\r\n"
+"hYvai0Re4hjGYi/HZo36Xdh98yeJKQHFkA4/J/EwyEoO79bex8cna8cFPXrEAjya\r\n"
+"HT4P6DSYW8tzS1KW2BGiLICIaTla0w+w3lkvEcf36hIBMJcCAwEAAaNNMEswCQYD\r\n"
+"VR0TBAIwADAdBgNVHQ4EFgQUpQXoZLjc32APUBJNYKhkr02LQ5MwHwYDVR0jBBgw\r\n"
+"FoAUtFrkpbPe0lL2udWmlQ/rPrzH/f8wDQYJKoZIhvcNAQEFBQADggEBAJxnXClY\r\n"
+"oHkbp70cqBrsGXLybA74czbO5RdLEgFs7rHVS9r+c293luS/KdliLScZqAzYVylw\r\n"
+"UfRWvKMoWhHYKp3dEIS4xTXk6/5zXxhv9Rw8SGc8qn6vITHk1S1mPevtekgasY5Y\r\n"
+"iWQuM3h4YVlRH3HHEMAD1TnAexfXHHDFQGe+Bd1iAbz1/sH9H8l4StwX6egvTK3M\r\n"
+"wXRwkKkvjKaEDA9ATbZx0mI8LGsxSuCqe9r9dyjmttd47J1p1Rulz3CLzaRcVIuS\r\n"
+"RRQfaD8neM9c1S/iJ/amTVqJxA1KOdOS5780WhPfSArA+g4qAmSjelc3p4wWpha8\r\n"
+"zhuYwjVuX6JHG0c=\r\n"
+"-----END CERTIFICATE-----\r\n";
+const size_t mbedtls_test_srv_crt_rsa_len = sizeof( mbedtls_test_srv_crt_rsa );
+
+const char mbedtls_test_srv_key_rsa[] =
+"-----BEGIN RSA PRIVATE KEY-----\r\n"
+"MIIEpAIBAAKCAQEAwU2j3efNHdEE10lyuJmsDnjkOjxKzzoTFtBa5M2jAIin7h5r\r\n"
+"lqdStJDvLXJ6PiSa/LY0rCT1d+AmZIycsCh9odrqjObJHJa8/sEEUrM21KP64bF2\r\n"
+"2JDBYbRmUjaiJlOqq3ReB30Zgtsq2B+g2Q0cLUlm91slc0boC4pPaQy1AJDh2oIQ\r\n"
+"Zn2uVCuLZXmRoeJhw81ASQjuaAzxi4bSRr/QuKoRAx5/VqgaHkQYDw+Fi9qLRF7i\r\n"
+"GMZiL8dmjfpd2H3zJ4kpAcWQDj8n8TDISg7v1t7HxydrxwU9esQCPJodPg/oNJhb\r\n"
+"y3NLUpbYEaIsgIhpOVrTD7DeWS8Rx/fqEgEwlwIDAQABAoIBAQCXR0S8EIHFGORZ\r\n"
+"++AtOg6eENxD+xVs0f1IeGz57Tjo3QnXX7VBZNdj+p1ECvhCE/G7XnkgU5hLZX+G\r\n"
+"Z0jkz/tqJOI0vRSdLBbipHnWouyBQ4e/A1yIJdlBtqXxJ1KE/ituHRbNc4j4kL8Z\r\n"
+"/r6pvwnTI0PSx2Eqs048YdS92LT6qAv4flbNDxMn2uY7s4ycS4Q8w1JXnCeaAnYm\r\n"
+"WYI5wxO+bvRELR2Mcz5DmVnL8jRyml6l6582bSv5oufReFIbyPZbQWlXgYnpu6He\r\n"
+"GTc7E1zKYQGG/9+DQUl/1vQuCPqQwny0tQoX2w5tdYpdMdVm+zkLtbajzdTviJJa\r\n"
+"TWzL6lt5AoGBAN86+SVeJDcmQJcv4Eq6UhtRr4QGMiQMz0Sod6ettYxYzMgxtw28\r\n"
+"CIrgpozCc+UaZJLo7UxvC6an85r1b2nKPCLQFaggJ0H4Q0J/sZOhBIXaoBzWxveK\r\n"
+"nupceKdVxGsFi8CDy86DBfiyFivfBj+47BbaQzPBj7C4rK7UlLjab2rDAoGBAN2u\r\n"
+"AM2gchoFiu4v1HFL8D7lweEpi6ZnMJjnEu/dEgGQJFjwdpLnPbsj4c75odQ4Gz8g\r\n"
+"sw9lao9VVzbusoRE/JGI4aTdO0pATXyG7eG1Qu+5Yc1YGXcCrliA2xM9xx+d7f+s\r\n"
+"mPzN+WIEg5GJDYZDjAzHG5BNvi/FfM1C9dOtjv2dAoGAF0t5KmwbjWHBhcVqO4Ic\r\n"
+"BVvN3BIlc1ue2YRXEDlxY5b0r8N4XceMgKmW18OHApZxfl8uPDauWZLXOgl4uepv\r\n"
+"whZC3EuWrSyyICNhLY21Ah7hbIEBPF3L3ZsOwC+UErL+dXWLdB56Jgy3gZaBeW7b\r\n"
+"vDrEnocJbqCm7IukhXHOBK8CgYEAwqdHB0hqyNSzIOGY7v9abzB6pUdA3BZiQvEs\r\n"
+"3LjHVd4HPJ2x0N8CgrBIWOE0q8+0hSMmeE96WW/7jD3fPWwCR5zlXknxBQsfv0gP\r\n"
+"3BC5PR0Qdypz+d+9zfMf625kyit4T/hzwhDveZUzHnk1Cf+IG7Q+TOEnLnWAWBED\r\n"
+"ISOWmrUCgYAFEmRxgwAc/u+D6t0syCwAYh6POtscq9Y0i9GyWk89NzgC4NdwwbBH\r\n"
+"4AgahOxIxXx2gxJnq3yfkJfIjwf0s2DyP0kY2y6Ua1OeomPeY9mrIS4tCuDQ6LrE\r\n"
+"TB6l9VGoxJL4fyHnZb8L5gGvnB1bbD8cL6YPaDiOhcRseC9vBiEuVg==\r\n"
+"-----END RSA PRIVATE KEY-----\r\n";
+const size_t mbedtls_test_srv_key_rsa_len = sizeof( mbedtls_test_srv_key_rsa );
+
+const char mbedtls_test_cli_crt_rsa[] =
+"-----BEGIN CERTIFICATE-----\r\n"
+"MIIDhTCCAm2gAwIBAgIBBDANBgkqhkiG9w0BAQsFADA7MQswCQYDVQQGEwJOTDER\r\n"
+"MA8GA1UECgwIUG9sYXJTU0wxGTAXBgNVBAMMEFBvbGFyU1NMIFRlc3QgQ0EwHhcN\r\n"
+"MTcwNTA1MTMwNzU5WhcNMjcwNTA2MTMwNzU5WjA8MQswCQYDVQQGEwJOTDERMA8G\r\n"
+"A1UECgwIUG9sYXJTU0wxGjAYBgNVBAMMEVBvbGFyU1NMIENsaWVudCAyMIIBIjAN\r\n"
+"BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyHTEzLn5tXnpRdkUYLB9u5Pyax6f\r\n"
+"M60Nj4o8VmXl3ETZzGaFB9X4J7BKNdBjngpuG7fa8H6r7gwQk4ZJGDTzqCrSV/Uu\r\n"
+"1C93KYRhTYJQj6eVSHD1bk2y1RPD0hrt5kPqQhTrdOrA7R/UV06p86jt0uDBMHEw\r\n"
+"MjDV0/YI0FZPRo7yX/k9Z5GIMC5Cst99++UMd//sMcB4j7/Cf8qtbCHWjdmLao5v\r\n"
+"4Jv4EFbMs44TFeY0BGbH7vk2DmqV9gmaBmf0ZXH4yqSxJeD+PIs1BGe64E92hfx/\r\n"
+"/DZrtenNLQNiTrM9AM+vdqBpVoNq0qjU51Bx5rU2BXcFbXvI5MT9TNUhXwIDAQAB\r\n"
+"o4GSMIGPMB0GA1UdDgQWBBRxoQBzckAvVHZeM/xSj7zx3WtGITBjBgNVHSMEXDBa\r\n"
+"gBS0WuSls97SUva51aaVD+s+vMf9/6E/pD0wOzELMAkGA1UEBhMCTkwxETAPBgNV\r\n"
+"BAoMCFBvbGFyU1NMMRkwFwYDVQQDDBBQb2xhclNTTCBUZXN0IENBggEAMAkGA1Ud\r\n"
+"EwQCMAAwDQYJKoZIhvcNAQELBQADggEBAC7yO786NvcHpK8UovKIG9cB32oSQQom\r\n"
+"LoR0eHDRzdqEkoq7yGZufHFiRAAzbMqJfogRtxlrWAeB4y/jGaMBV25IbFOIcH2W\r\n"
+"iCEaMMbG+VQLKNvuC63kmw/Zewc9ThM6Pa1Hcy0axT0faf1B/U01j0FIcw/6mTfK\r\n"
+"D8w48OIwc1yr0JtutCVjig5DC0yznGMt32RyseOLcUe+lfq005v2PAiCozr5X8rE\r\n"
+"ofGZpiM2NqRPePgYy+Vc75Zk28xkRQq1ncprgQb3S4vTsZdScpM9hLf+eMlrgqlj\r\n"
+"c5PLSkXBeLE5+fedkyfTaLxxQlgCpuoOhKBm04/R1pWNzUHyqagjO9Q=\r\n"
+"-----END CERTIFICATE-----\r\n";
+const size_t mbedtls_test_cli_crt_rsa_len = sizeof( mbedtls_test_cli_crt_rsa );
+
+const char mbedtls_test_cli_key_rsa[] =
+"-----BEGIN RSA PRIVATE KEY-----\r\n"
+"MIIEpAIBAAKCAQEAyHTEzLn5tXnpRdkUYLB9u5Pyax6fM60Nj4o8VmXl3ETZzGaF\r\n"
+"B9X4J7BKNdBjngpuG7fa8H6r7gwQk4ZJGDTzqCrSV/Uu1C93KYRhTYJQj6eVSHD1\r\n"
+"bk2y1RPD0hrt5kPqQhTrdOrA7R/UV06p86jt0uDBMHEwMjDV0/YI0FZPRo7yX/k9\r\n"
+"Z5GIMC5Cst99++UMd//sMcB4j7/Cf8qtbCHWjdmLao5v4Jv4EFbMs44TFeY0BGbH\r\n"
+"7vk2DmqV9gmaBmf0ZXH4yqSxJeD+PIs1BGe64E92hfx//DZrtenNLQNiTrM9AM+v\r\n"
+"dqBpVoNq0qjU51Bx5rU2BXcFbXvI5MT9TNUhXwIDAQABAoIBAGdNtfYDiap6bzst\r\n"
+"yhCiI8m9TtrhZw4MisaEaN/ll3XSjaOG2dvV6xMZCMV+5TeXDHOAZnY18Yi18vzz\r\n"
+"4Ut2TnNFzizCECYNaA2fST3WgInnxUkV3YXAyP6CNxJaCmv2aA0yFr2kFVSeaKGt\r\n"
+"ymvljNp2NVkvm7Th8fBQBO7I7AXhz43k0mR7XmPgewe8ApZOG3hstkOaMvbWAvWA\r\n"
+"zCZupdDjZYjOJqlA4eEA4H8/w7F83r5CugeBE8LgEREjLPiyejrU5H1fubEY+h0d\r\n"
+"l5HZBJ68ybTXfQ5U9o/QKA3dd0toBEhhdRUDGzWtjvwkEQfqF1reGWj/tod/gCpf\r\n"
+"DFi6X0ECgYEA4wOv/pjSC3ty6TuOvKX2rOUiBrLXXv2JSxZnMoMiWI5ipLQt+RYT\r\n"
+"VPafL/m7Dn6MbwjayOkcZhBwk5CNz5A6Q4lJ64Mq/lqHznRCQQ2Mc1G8eyDF/fYL\r\n"
+"Ze2pLvwP9VD5jTc2miDfw+MnvJhywRRLcemDFP8k4hQVtm8PMp3ZmNECgYEA4gz7\r\n"
+"wzObR4gn8ibe617uQPZjWzUj9dUHYd+in1gwBCIrtNnaRn9I9U/Q6tegRYpii4ys\r\n"
+"c176NmU+umy6XmuSKV5qD9bSpZWG2nLFnslrN15Lm3fhZxoeMNhBaEDTnLT26yoi\r\n"
+"33gp0mSSWy94ZEqipms+ULF6sY1ZtFW6tpGFoy8CgYAQHhnnvJflIs2ky4q10B60\r\n"
+"ZcxFp3rtDpkp0JxhFLhiizFrujMtZSjYNm5U7KkgPVHhLELEUvCmOnKTt4ap/vZ0\r\n"
+"BxJNe1GZH3pW6SAvGDQpl9sG7uu/vTFP+lCxukmzxB0DrrDcvorEkKMom7ZCCRvW\r\n"
+"KZsZ6YeH2Z81BauRj218kQKBgQCUV/DgKP2985xDTT79N08jUo3hTP5MVYCCuj/+\r\n"
+"UeEw1TvZcx3LJby7P6Xad6a1/BqveaGyFKIfEFIaBUBItk801sDDpDaYc4gL00Xc\r\n"
+"7lFuBHOZkxJYlss5QrGpuOEl9ZwUt5IrFLBdYaKqNHzNVC1pCPfb/JyH6Dr2HUxq\r\n"
+"gxUwAQKBgQCcU6G2L8AG9d9c0UpOyL1tMvFe5Ttw0KjlQVdsh1MP6yigYo9DYuwu\r\n"
+"bHFVW2r0dBTqegP2/KTOxKzaHfC1qf0RGDsUoJCNJrd1cwoCLG8P2EF4w3OBrKqv\r\n"
+"8u4ytY0F+Vlanj5lm3TaoHSVF1+NWPyOTiwevIECGKwSxvlki4fDAA==\r\n"
+"-----END RSA PRIVATE KEY-----\r\n";
+const size_t mbedtls_test_cli_key_rsa_len = sizeof( mbedtls_test_cli_key_rsa );
+#endif /* MBEDTLS_RSA_C */
+
+#if defined(MBEDTLS_PEM_PARSE_C)
+/* Concatenation of all available CA certificates */
+const char mbedtls_test_cas_pem[] =
+#ifdef TEST_CA_CRT_RSA_SHA1
+    TEST_CA_CRT_RSA_SHA1
+#endif
+#ifdef TEST_CA_CRT_RSA_SHA256
+    TEST_CA_CRT_RSA_SHA256
+#endif
+#ifdef TEST_CA_CRT_EC
+    TEST_CA_CRT_EC
+#endif
+    "";
+const size_t mbedtls_test_cas_pem_len = sizeof( mbedtls_test_cas_pem );
+#endif
+
+/* List of all available CA certificates */
+const char * mbedtls_test_cas[] = {
+#if defined(TEST_CA_CRT_RSA_SHA1)
+    mbedtls_test_ca_crt_rsa_sha1,
+#endif
+#if defined(TEST_CA_CRT_RSA_SHA256)
+    mbedtls_test_ca_crt_rsa_sha256,
+#endif
+#if defined(MBEDTLS_ECDSA_C)
+    mbedtls_test_ca_crt_ec,
+#endif
+    NULL
+};
+const size_t mbedtls_test_cas_len[] = {
+#if defined(TEST_CA_CRT_RSA_SHA1)
+    sizeof( mbedtls_test_ca_crt_rsa_sha1 ),
+#endif
+#if defined(TEST_CA_CRT_RSA_SHA256)
+    sizeof( mbedtls_test_ca_crt_rsa_sha256 ),
+#endif
+#if defined(MBEDTLS_ECDSA_C)
+    sizeof( mbedtls_test_ca_crt_ec ),
+#endif
+    0
+};
+
+#if defined(MBEDTLS_RSA_C)
+const char *mbedtls_test_ca_crt  = mbedtls_test_ca_crt_rsa; /* SHA1 or SHA256 */
+const char *mbedtls_test_ca_key  = mbedtls_test_ca_key_rsa;
+const char *mbedtls_test_ca_pwd  = mbedtls_test_ca_pwd_rsa;
+const char *mbedtls_test_srv_crt = mbedtls_test_srv_crt_rsa;
+const char *mbedtls_test_srv_key = mbedtls_test_srv_key_rsa;
+const char *mbedtls_test_cli_crt = mbedtls_test_cli_crt_rsa;
+const char *mbedtls_test_cli_key = mbedtls_test_cli_key_rsa;
+const size_t mbedtls_test_ca_crt_len  = sizeof( mbedtls_test_ca_crt_rsa );
+const size_t mbedtls_test_ca_key_len  = sizeof( mbedtls_test_ca_key_rsa );
+const size_t mbedtls_test_ca_pwd_len  = sizeof( mbedtls_test_ca_pwd_rsa ) - 1;
+const size_t mbedtls_test_srv_crt_len = sizeof( mbedtls_test_srv_crt_rsa );
+const size_t mbedtls_test_srv_key_len = sizeof( mbedtls_test_srv_key_rsa );
+const size_t mbedtls_test_cli_crt_len = sizeof( mbedtls_test_cli_crt_rsa );
+const size_t mbedtls_test_cli_key_len = sizeof( mbedtls_test_cli_key_rsa );
+#else /* ! MBEDTLS_RSA_C, so MBEDTLS_ECDSA_C */
+const char *mbedtls_test_ca_crt  = mbedtls_test_ca_crt_ec;
+const char *mbedtls_test_ca_key  = mbedtls_test_ca_key_ec;
+const char *mbedtls_test_ca_pwd  = mbedtls_test_ca_pwd_ec;
+const char *mbedtls_test_srv_crt = mbedtls_test_srv_crt_ec;
+const char *mbedtls_test_srv_key = mbedtls_test_srv_key_ec;
+const char *mbedtls_test_cli_crt = mbedtls_test_cli_crt_ec;
+const char *mbedtls_test_cli_key = mbedtls_test_cli_key_ec;
+const size_t mbedtls_test_ca_crt_len  = sizeof( mbedtls_test_ca_crt_ec );
+const size_t mbedtls_test_ca_key_len  = sizeof( mbedtls_test_ca_key_ec );
+const size_t mbedtls_test_ca_pwd_len  = sizeof( mbedtls_test_ca_pwd_ec ) - 1;
+const size_t mbedtls_test_srv_crt_len = sizeof( mbedtls_test_srv_crt_ec );
+const size_t mbedtls_test_srv_key_len = sizeof( mbedtls_test_srv_key_ec );
+const size_t mbedtls_test_cli_crt_len = sizeof( mbedtls_test_cli_crt_ec );
+const size_t mbedtls_test_cli_key_len = sizeof( mbedtls_test_cli_key_ec );
+#endif /* MBEDTLS_RSA_C */
+
+#endif /* MBEDTLS_CERTS_C */
diff --git a/common/mbedtls/certs.h b/common/mbedtls/certs.h
new file mode 100644
index 000000000..ae0f84a30
--- /dev/null
+++ b/common/mbedtls/certs.h
@@ -0,0 +1,102 @@
+/**
+ * \file certs.h
+ *
+ * \brief Sample certificates and DHM parameters for testing
+ */
+/*
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+#ifndef MBEDTLS_CERTS_H
+#define MBEDTLS_CERTS_H
+
+#include <stddef.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if defined(MBEDTLS_PEM_PARSE_C)
+/* Concatenation of all CA certificates in PEM format if available */
+extern const char   mbedtls_test_cas_pem[];
+extern const size_t mbedtls_test_cas_pem_len;
+#endif
+
+/* List of all CA certificates, terminated by NULL */
+extern const char * mbedtls_test_cas[];
+extern const size_t mbedtls_test_cas_len[];
+
+/*
+ * Convenience for users who just want a certificate:
+ * RSA by default, or ECDSA if RSA is not available
+ */
+extern const char * mbedtls_test_ca_crt;
+extern const size_t mbedtls_test_ca_crt_len;
+extern const char * mbedtls_test_ca_key;
+extern const size_t mbedtls_test_ca_key_len;
+extern const char * mbedtls_test_ca_pwd;
+extern const size_t mbedtls_test_ca_pwd_len;
+extern const char * mbedtls_test_srv_crt;
+extern const size_t mbedtls_test_srv_crt_len;
+extern const char * mbedtls_test_srv_key;
+extern const size_t mbedtls_test_srv_key_len;
+extern const char * mbedtls_test_cli_crt;
+extern const size_t mbedtls_test_cli_crt_len;
+extern const char * mbedtls_test_cli_key;
+extern const size_t mbedtls_test_cli_key_len;
+
+#if defined(MBEDTLS_ECDSA_C)
+extern const char   mbedtls_test_ca_crt_ec[];
+extern const size_t mbedtls_test_ca_crt_ec_len;
+extern const char   mbedtls_test_ca_key_ec[];
+extern const size_t mbedtls_test_ca_key_ec_len;
+extern const char   mbedtls_test_ca_pwd_ec[];
+extern const size_t mbedtls_test_ca_pwd_ec_len;
+extern const char   mbedtls_test_srv_crt_ec[];
+extern const size_t mbedtls_test_srv_crt_ec_len;
+extern const char   mbedtls_test_srv_key_ec[];
+extern const size_t mbedtls_test_srv_key_ec_len;
+extern const char   mbedtls_test_cli_crt_ec[];
+extern const size_t mbedtls_test_cli_crt_ec_len;
+extern const char   mbedtls_test_cli_key_ec[];
+extern const size_t mbedtls_test_cli_key_ec_len;
+#endif
+
+#if defined(MBEDTLS_RSA_C)
+extern const char   mbedtls_test_ca_crt_rsa[];
+extern const size_t mbedtls_test_ca_crt_rsa_len;
+extern const char   mbedtls_test_ca_key_rsa[];
+extern const size_t mbedtls_test_ca_key_rsa_len;
+extern const char   mbedtls_test_ca_pwd_rsa[];
+extern const size_t mbedtls_test_ca_pwd_rsa_len;
+extern const char   mbedtls_test_srv_crt_rsa[];
+extern const size_t mbedtls_test_srv_crt_rsa_len;
+extern const char   mbedtls_test_srv_key_rsa[];
+extern const size_t mbedtls_test_srv_key_rsa_len;
+extern const char   mbedtls_test_cli_crt_rsa[];
+extern const size_t mbedtls_test_cli_crt_rsa_len;
+extern const char   mbedtls_test_cli_key_rsa[];
+extern const size_t mbedtls_test_cli_key_rsa_len;
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* certs.h */
diff --git a/common/mbedtls/check_config.h b/common/mbedtls/check_config.h
new file mode 100644
index 000000000..a4fa7bdde
--- /dev/null
+++ b/common/mbedtls/check_config.h
@@ -0,0 +1,685 @@
+/**
+ * \file check_config.h
+ *
+ * \brief Consistency checks for configuration options
+ */
+/*
+ *  Copyright (C) 2006-2018, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+
+/*
+ * It is recommended to include this file from your config.h
+ * in order to catch dependency issues early.
+ */
+
+#ifndef MBEDTLS_CHECK_CONFIG_H
+#define MBEDTLS_CHECK_CONFIG_H
+
+/*
+ * We assume CHAR_BIT is 8 in many places. In practice, this is true on our
+ * target platforms, so not an issue, but let's just be extra sure.
+ */
+#include <limits.h>
+#if CHAR_BIT != 8
+#error "mbed TLS requires a platform with 8-bit chars"
+#endif
+
+#if defined(_WIN32)
+#if !defined(MBEDTLS_PLATFORM_C)
+#error "MBEDTLS_PLATFORM_C is required on Windows"
+#endif
+
+/* Fix the config here. Not convenient to put an #ifdef _WIN32 in config.h as
+ * it would confuse config.pl. */
+#if !defined(MBEDTLS_PLATFORM_SNPRINTF_ALT) && \
+    !defined(MBEDTLS_PLATFORM_SNPRINTF_MACRO)
+#define MBEDTLS_PLATFORM_SNPRINTF_ALT
+#endif
+#endif /* _WIN32 */
+
+#if defined(TARGET_LIKE_MBED) && \
+    ( defined(MBEDTLS_NET_C) || defined(MBEDTLS_TIMING_C) )
+#error "The NET and TIMING modules are not available for mbed OS - please use the network and timing functions provided by mbed OS"
+#endif
+
+#if defined(MBEDTLS_DEPRECATED_WARNING) && \
+    !defined(__GNUC__) && !defined(__clang__)
+#error "MBEDTLS_DEPRECATED_WARNING only works with GCC and Clang"
+#endif
+
+#if defined(MBEDTLS_HAVE_TIME_DATE) && !defined(MBEDTLS_HAVE_TIME)
+#error "MBEDTLS_HAVE_TIME_DATE without MBEDTLS_HAVE_TIME does not make sense"
+#endif
+
+#if defined(MBEDTLS_AESNI_C) && !defined(MBEDTLS_HAVE_ASM)
+#error "MBEDTLS_AESNI_C defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_CTR_DRBG_C) && !defined(MBEDTLS_AES_C)
+#error "MBEDTLS_CTR_DRBG_C defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_DHM_C) && !defined(MBEDTLS_BIGNUM_C)
+#error "MBEDTLS_DHM_C defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_SSL_TRUNCATED_HMAC_COMPAT) && !defined(MBEDTLS_SSL_TRUNCATED_HMAC)
+#error "MBEDTLS_SSL_TRUNCATED_HMAC_COMPAT defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_CMAC_C) && \
+    !defined(MBEDTLS_AES_C) && !defined(MBEDTLS_DES_C)
+#error "MBEDTLS_CMAC_C defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_NIST_KW_C) && \
+    ( !defined(MBEDTLS_AES_C) || !defined(MBEDTLS_CIPHER_C) )
+#error "MBEDTLS_NIST_KW_C defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_ECDH_C) && !defined(MBEDTLS_ECP_C)
+#error "MBEDTLS_ECDH_C defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_ECDSA_C) &&            \
+    ( !defined(MBEDTLS_ECP_C) ||           \
+      !defined(MBEDTLS_ASN1_PARSE_C) ||    \
+      !defined(MBEDTLS_ASN1_WRITE_C) )
+#error "MBEDTLS_ECDSA_C defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_ECJPAKE_C) &&           \
+    ( !defined(MBEDTLS_ECP_C) || !defined(MBEDTLS_MD_C) )
+#error "MBEDTLS_ECJPAKE_C defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_ECDSA_DETERMINISTIC) && !defined(MBEDTLS_HMAC_DRBG_C)
+#error "MBEDTLS_ECDSA_DETERMINISTIC defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_ECP_C) && ( !defined(MBEDTLS_BIGNUM_C) || (   \
+    !defined(MBEDTLS_ECP_DP_SECP192R1_ENABLED) &&                  \
+    !defined(MBEDTLS_ECP_DP_SECP224R1_ENABLED) &&                  \
+    !defined(MBEDTLS_ECP_DP_SECP256R1_ENABLED) &&                  \
+    !defined(MBEDTLS_ECP_DP_SECP384R1_ENABLED) &&                  \
+    !defined(MBEDTLS_ECP_DP_SECP521R1_ENABLED) &&                  \
+    !defined(MBEDTLS_ECP_DP_BP256R1_ENABLED)   &&                  \
+    !defined(MBEDTLS_ECP_DP_BP384R1_ENABLED)   &&                  \
+    !defined(MBEDTLS_ECP_DP_BP512R1_ENABLED)   &&                  \
+    !defined(MBEDTLS_ECP_DP_SECP192K1_ENABLED) &&                  \
+    !defined(MBEDTLS_ECP_DP_SECP224K1_ENABLED) &&                  \
+    !defined(MBEDTLS_ECP_DP_SECP256K1_ENABLED) ) )
+#error "MBEDTLS_ECP_C defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_ENTROPY_C) && (!defined(MBEDTLS_SHA512_C) &&      \
+                                    !defined(MBEDTLS_SHA256_C))
+#error "MBEDTLS_ENTROPY_C defined, but not all prerequisites"
+#endif
+#if defined(MBEDTLS_ENTROPY_C) && defined(MBEDTLS_SHA512_C) &&         \
+    defined(MBEDTLS_CTR_DRBG_ENTROPY_LEN) && (MBEDTLS_CTR_DRBG_ENTROPY_LEN > 64)
+#error "MBEDTLS_CTR_DRBG_ENTROPY_LEN value too high"
+#endif
+#if defined(MBEDTLS_ENTROPY_C) &&                                            \
+    ( !defined(MBEDTLS_SHA512_C) || defined(MBEDTLS_ENTROPY_FORCE_SHA256) ) \
+    && defined(MBEDTLS_CTR_DRBG_ENTROPY_LEN) && (MBEDTLS_CTR_DRBG_ENTROPY_LEN > 32)
+#error "MBEDTLS_CTR_DRBG_ENTROPY_LEN value too high"
+#endif
+#if defined(MBEDTLS_ENTROPY_C) && \
+    defined(MBEDTLS_ENTROPY_FORCE_SHA256) && !defined(MBEDTLS_SHA256_C)
+#error "MBEDTLS_ENTROPY_FORCE_SHA256 defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_TEST_NULL_ENTROPY) && \
+    ( !defined(MBEDTLS_ENTROPY_C) || !defined(MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES) )
+#error "MBEDTLS_TEST_NULL_ENTROPY defined, but not all prerequisites"
+#endif
+#if defined(MBEDTLS_TEST_NULL_ENTROPY) && \
+     ( defined(MBEDTLS_ENTROPY_NV_SEED) || defined(MBEDTLS_ENTROPY_HARDWARE_ALT) || \
+    defined(MBEDTLS_HAVEGE_C) )
+#error "MBEDTLS_TEST_NULL_ENTROPY defined, but entropy sources too"
+#endif
+
+#if defined(MBEDTLS_GCM_C) && (                                        \
+        !defined(MBEDTLS_AES_C) && !defined(MBEDTLS_CAMELLIA_C) )
+#error "MBEDTLS_GCM_C defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_ECP_RANDOMIZE_JAC_ALT) && !defined(MBEDTLS_ECP_INTERNAL_ALT)
+#error "MBEDTLS_ECP_RANDOMIZE_JAC_ALT defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_ECP_ADD_MIXED_ALT) && !defined(MBEDTLS_ECP_INTERNAL_ALT)
+#error "MBEDTLS_ECP_ADD_MIXED_ALT defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_ECP_DOUBLE_JAC_ALT) && !defined(MBEDTLS_ECP_INTERNAL_ALT)
+#error "MBEDTLS_ECP_DOUBLE_JAC_ALT defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_ECP_NORMALIZE_JAC_MANY_ALT) && !defined(MBEDTLS_ECP_INTERNAL_ALT)
+#error "MBEDTLS_ECP_NORMALIZE_JAC_MANY_ALT defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_ECP_NORMALIZE_JAC_ALT) && !defined(MBEDTLS_ECP_INTERNAL_ALT)
+#error "MBEDTLS_ECP_NORMALIZE_JAC_ALT defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_ECP_DOUBLE_ADD_MXZ_ALT) && !defined(MBEDTLS_ECP_INTERNAL_ALT)
+#error "MBEDTLS_ECP_DOUBLE_ADD_MXZ_ALT defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_ECP_RANDOMIZE_MXZ_ALT) && !defined(MBEDTLS_ECP_INTERNAL_ALT)
+#error "MBEDTLS_ECP_RANDOMIZE_MXZ_ALT defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_ECP_NORMALIZE_MXZ_ALT) && !defined(MBEDTLS_ECP_INTERNAL_ALT)
+#error "MBEDTLS_ECP_NORMALIZE_MXZ_ALT defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_HAVEGE_C) && !defined(MBEDTLS_TIMING_C)
+#error "MBEDTLS_HAVEGE_C defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_HKDF_C) && !defined(MBEDTLS_MD_C)
+#error "MBEDTLS_HKDF_C defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_HMAC_DRBG_C) && !defined(MBEDTLS_MD_C)
+#error "MBEDTLS_HMAC_DRBG_C defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED) &&                 \
+    ( !defined(MBEDTLS_ECDH_C) || !defined(MBEDTLS_X509_CRT_PARSE_C) )
+#error "MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED) &&                 \
+    ( !defined(MBEDTLS_ECDH_C) || !defined(MBEDTLS_X509_CRT_PARSE_C) )
+#error "MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_KEY_EXCHANGE_DHE_PSK_ENABLED) && !defined(MBEDTLS_DHM_C)
+#error "MBEDTLS_KEY_EXCHANGE_DHE_PSK_ENABLED defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED) &&                     \
+    !defined(MBEDTLS_ECDH_C)
+#error "MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED) &&                   \
+    ( !defined(MBEDTLS_DHM_C) || !defined(MBEDTLS_RSA_C) ||           \
+      !defined(MBEDTLS_X509_CRT_PARSE_C) || !defined(MBEDTLS_PKCS1_V15) )
+#error "MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED) &&                 \
+    ( !defined(MBEDTLS_ECDH_C) || !defined(MBEDTLS_RSA_C) ||          \
+      !defined(MBEDTLS_X509_CRT_PARSE_C) || !defined(MBEDTLS_PKCS1_V15) )
+#error "MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED) &&                 \
+    ( !defined(MBEDTLS_ECDH_C) || !defined(MBEDTLS_ECDSA_C) ||          \
+      !defined(MBEDTLS_X509_CRT_PARSE_C) )
+#error "MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED) &&                   \
+    ( !defined(MBEDTLS_RSA_C) || !defined(MBEDTLS_X509_CRT_PARSE_C) || \
+      !defined(MBEDTLS_PKCS1_V15) )
+#error "MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_KEY_EXCHANGE_RSA_ENABLED) &&                       \
+    ( !defined(MBEDTLS_RSA_C) || !defined(MBEDTLS_X509_CRT_PARSE_C) || \
+      !defined(MBEDTLS_PKCS1_V15) )
+#error "MBEDTLS_KEY_EXCHANGE_RSA_ENABLED defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED) &&                    \
+    ( !defined(MBEDTLS_ECJPAKE_C) || !defined(MBEDTLS_SHA256_C) ||      \
+      !defined(MBEDTLS_ECP_DP_SECP256R1_ENABLED) )
+#error "MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_MEMORY_BUFFER_ALLOC_C) &&                          \
+    ( !defined(MBEDTLS_PLATFORM_C) || !defined(MBEDTLS_PLATFORM_MEMORY) )
+#error "MBEDTLS_MEMORY_BUFFER_ALLOC_C defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_PADLOCK_C) && !defined(MBEDTLS_HAVE_ASM)
+#error "MBEDTLS_PADLOCK_C defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_PEM_PARSE_C) && !defined(MBEDTLS_BASE64_C)
+#error "MBEDTLS_PEM_PARSE_C defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_PEM_WRITE_C) && !defined(MBEDTLS_BASE64_C)
+#error "MBEDTLS_PEM_WRITE_C defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_PK_C) && \
+    ( !defined(MBEDTLS_RSA_C) && !defined(MBEDTLS_ECP_C) )
+#error "MBEDTLS_PK_C defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_PK_PARSE_C) && !defined(MBEDTLS_PK_C)
+#error "MBEDTLS_PK_PARSE_C defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_PK_WRITE_C) && !defined(MBEDTLS_PK_C)
+#error "MBEDTLS_PK_WRITE_C defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_PKCS11_C) && !defined(MBEDTLS_PK_C)
+#error "MBEDTLS_PKCS11_C defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_PLATFORM_EXIT_ALT) && !defined(MBEDTLS_PLATFORM_C)
+#error "MBEDTLS_PLATFORM_EXIT_ALT defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_PLATFORM_EXIT_MACRO) && !defined(MBEDTLS_PLATFORM_C)
+#error "MBEDTLS_PLATFORM_EXIT_MACRO defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_PLATFORM_EXIT_MACRO) &&\
+    ( defined(MBEDTLS_PLATFORM_STD_EXIT) ||\
+        defined(MBEDTLS_PLATFORM_EXIT_ALT) )
+#error "MBEDTLS_PLATFORM_EXIT_MACRO and MBEDTLS_PLATFORM_STD_EXIT/MBEDTLS_PLATFORM_EXIT_ALT cannot be defined simultaneously"
+#endif
+
+#if defined(MBEDTLS_PLATFORM_TIME_ALT) &&\
+    ( !defined(MBEDTLS_PLATFORM_C) ||\
+        !defined(MBEDTLS_HAVE_TIME) )
+#error "MBEDTLS_PLATFORM_TIME_ALT defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_PLATFORM_TIME_MACRO) &&\
+    ( !defined(MBEDTLS_PLATFORM_C) ||\
+        !defined(MBEDTLS_HAVE_TIME) )
+#error "MBEDTLS_PLATFORM_TIME_MACRO defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_PLATFORM_TIME_TYPE_MACRO) &&\
+    ( !defined(MBEDTLS_PLATFORM_C) ||\
+        !defined(MBEDTLS_HAVE_TIME) )
+#error "MBEDTLS_PLATFORM_TIME_TYPE_MACRO defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_PLATFORM_TIME_MACRO) &&\
+    ( defined(MBEDTLS_PLATFORM_STD_TIME) ||\
+        defined(MBEDTLS_PLATFORM_TIME_ALT) )
+#error "MBEDTLS_PLATFORM_TIME_MACRO and MBEDTLS_PLATFORM_STD_TIME/MBEDTLS_PLATFORM_TIME_ALT cannot be defined simultaneously"
+#endif
+
+#if defined(MBEDTLS_PLATFORM_TIME_TYPE_MACRO) &&\
+    ( defined(MBEDTLS_PLATFORM_STD_TIME) ||\
+        defined(MBEDTLS_PLATFORM_TIME_ALT) )
+#error "MBEDTLS_PLATFORM_TIME_TYPE_MACRO and MBEDTLS_PLATFORM_STD_TIME/MBEDTLS_PLATFORM_TIME_ALT cannot be defined simultaneously"
+#endif
+
+#if defined(MBEDTLS_PLATFORM_FPRINTF_ALT) && !defined(MBEDTLS_PLATFORM_C)
+#error "MBEDTLS_PLATFORM_FPRINTF_ALT defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_PLATFORM_FPRINTF_MACRO) && !defined(MBEDTLS_PLATFORM_C)
+#error "MBEDTLS_PLATFORM_FPRINTF_MACRO defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_PLATFORM_FPRINTF_MACRO) &&\
+    ( defined(MBEDTLS_PLATFORM_STD_FPRINTF) ||\
+        defined(MBEDTLS_PLATFORM_FPRINTF_ALT) )
+#error "MBEDTLS_PLATFORM_FPRINTF_MACRO and MBEDTLS_PLATFORM_STD_FPRINTF/MBEDTLS_PLATFORM_FPRINTF_ALT cannot be defined simultaneously"
+#endif
+
+#if defined(MBEDTLS_PLATFORM_FREE_MACRO) &&\
+    ( !defined(MBEDTLS_PLATFORM_C) || !defined(MBEDTLS_PLATFORM_MEMORY) )
+#error "MBEDTLS_PLATFORM_FREE_MACRO defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_PLATFORM_FREE_MACRO) &&\
+    defined(MBEDTLS_PLATFORM_STD_FREE)
+#error "MBEDTLS_PLATFORM_FREE_MACRO and MBEDTLS_PLATFORM_STD_FREE cannot be defined simultaneously"
+#endif
+
+#if defined(MBEDTLS_PLATFORM_FREE_MACRO) && !defined(MBEDTLS_PLATFORM_CALLOC_MACRO)
+#error "MBEDTLS_PLATFORM_CALLOC_MACRO must be defined if MBEDTLS_PLATFORM_FREE_MACRO is"
+#endif
+
+#if defined(MBEDTLS_PLATFORM_CALLOC_MACRO) &&\
+    ( !defined(MBEDTLS_PLATFORM_C) || !defined(MBEDTLS_PLATFORM_MEMORY) )
+#error "MBEDTLS_PLATFORM_CALLOC_MACRO defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_PLATFORM_CALLOC_MACRO) &&\
+    defined(MBEDTLS_PLATFORM_STD_CALLOC)
+#error "MBEDTLS_PLATFORM_CALLOC_MACRO and MBEDTLS_PLATFORM_STD_CALLOC cannot be defined simultaneously"
+#endif
+
+#if defined(MBEDTLS_PLATFORM_CALLOC_MACRO) && !defined(MBEDTLS_PLATFORM_FREE_MACRO)
+#error "MBEDTLS_PLATFORM_FREE_MACRO must be defined if MBEDTLS_PLATFORM_CALLOC_MACRO is"
+#endif
+
+#if defined(MBEDTLS_PLATFORM_MEMORY) && !defined(MBEDTLS_PLATFORM_C)
+#error "MBEDTLS_PLATFORM_MEMORY defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_PLATFORM_PRINTF_ALT) && !defined(MBEDTLS_PLATFORM_C)
+#error "MBEDTLS_PLATFORM_PRINTF_ALT defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_PLATFORM_PRINTF_MACRO) && !defined(MBEDTLS_PLATFORM_C)
+#error "MBEDTLS_PLATFORM_PRINTF_MACRO defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_PLATFORM_PRINTF_MACRO) &&\
+    ( defined(MBEDTLS_PLATFORM_STD_PRINTF) ||\
+        defined(MBEDTLS_PLATFORM_PRINTF_ALT) )
+#error "MBEDTLS_PLATFORM_PRINTF_MACRO and MBEDTLS_PLATFORM_STD_PRINTF/MBEDTLS_PLATFORM_PRINTF_ALT cannot be defined simultaneously"
+#endif
+
+#if defined(MBEDTLS_PLATFORM_SNPRINTF_ALT) && !defined(MBEDTLS_PLATFORM_C)
+#error "MBEDTLS_PLATFORM_SNPRINTF_ALT defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_PLATFORM_SNPRINTF_MACRO) && !defined(MBEDTLS_PLATFORM_C)
+#error "MBEDTLS_PLATFORM_SNPRINTF_MACRO defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_PLATFORM_SNPRINTF_MACRO) &&\
+    ( defined(MBEDTLS_PLATFORM_STD_SNPRINTF) ||\
+        defined(MBEDTLS_PLATFORM_SNPRINTF_ALT) )
+#error "MBEDTLS_PLATFORM_SNPRINTF_MACRO and MBEDTLS_PLATFORM_STD_SNPRINTF/MBEDTLS_PLATFORM_SNPRINTF_ALT cannot be defined simultaneously"
+#endif
+
+#if defined(MBEDTLS_PLATFORM_STD_MEM_HDR) &&\
+    !defined(MBEDTLS_PLATFORM_NO_STD_FUNCTIONS)
+#error "MBEDTLS_PLATFORM_STD_MEM_HDR defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_PLATFORM_STD_CALLOC) && !defined(MBEDTLS_PLATFORM_MEMORY)
+#error "MBEDTLS_PLATFORM_STD_CALLOC defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_PLATFORM_STD_CALLOC) && !defined(MBEDTLS_PLATFORM_MEMORY)
+#error "MBEDTLS_PLATFORM_STD_CALLOC defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_PLATFORM_STD_FREE) && !defined(MBEDTLS_PLATFORM_MEMORY)
+#error "MBEDTLS_PLATFORM_STD_FREE defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_PLATFORM_STD_EXIT) &&\
+    !defined(MBEDTLS_PLATFORM_EXIT_ALT)
+#error "MBEDTLS_PLATFORM_STD_EXIT defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_PLATFORM_STD_TIME) &&\
+    ( !defined(MBEDTLS_PLATFORM_TIME_ALT) ||\
+        !defined(MBEDTLS_HAVE_TIME) )
+#error "MBEDTLS_PLATFORM_STD_TIME defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_PLATFORM_STD_FPRINTF) &&\
+    !defined(MBEDTLS_PLATFORM_FPRINTF_ALT)
+#error "MBEDTLS_PLATFORM_STD_FPRINTF defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_PLATFORM_STD_PRINTF) &&\
+    !defined(MBEDTLS_PLATFORM_PRINTF_ALT)
+#error "MBEDTLS_PLATFORM_STD_PRINTF defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_PLATFORM_STD_SNPRINTF) &&\
+    !defined(MBEDTLS_PLATFORM_SNPRINTF_ALT)
+#error "MBEDTLS_PLATFORM_STD_SNPRINTF defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_ENTROPY_NV_SEED) &&\
+    ( !defined(MBEDTLS_PLATFORM_C) || !defined(MBEDTLS_ENTROPY_C) )
+#error "MBEDTLS_ENTROPY_NV_SEED defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_PLATFORM_NV_SEED_ALT) &&\
+    !defined(MBEDTLS_ENTROPY_NV_SEED)
+#error "MBEDTLS_PLATFORM_NV_SEED_ALT defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_PLATFORM_STD_NV_SEED_READ) &&\
+    !defined(MBEDTLS_PLATFORM_NV_SEED_ALT)
+#error "MBEDTLS_PLATFORM_STD_NV_SEED_READ defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_PLATFORM_STD_NV_SEED_WRITE) &&\
+    !defined(MBEDTLS_PLATFORM_NV_SEED_ALT)
+#error "MBEDTLS_PLATFORM_STD_NV_SEED_WRITE defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_PLATFORM_NV_SEED_READ_MACRO) &&\
+    ( defined(MBEDTLS_PLATFORM_STD_NV_SEED_READ) ||\
+      defined(MBEDTLS_PLATFORM_NV_SEED_ALT) )
+#error "MBEDTLS_PLATFORM_NV_SEED_READ_MACRO and MBEDTLS_PLATFORM_STD_NV_SEED_READ cannot be defined simultaneously"
+#endif
+
+#if defined(MBEDTLS_PLATFORM_NV_SEED_WRITE_MACRO) &&\
+    ( defined(MBEDTLS_PLATFORM_STD_NV_SEED_WRITE) ||\
+      defined(MBEDTLS_PLATFORM_NV_SEED_ALT) )
+#error "MBEDTLS_PLATFORM_NV_SEED_WRITE_MACRO and MBEDTLS_PLATFORM_STD_NV_SEED_WRITE cannot be defined simultaneously"
+#endif
+
+#if defined(MBEDTLS_RSA_C) && ( !defined(MBEDTLS_BIGNUM_C) ||         \
+    !defined(MBEDTLS_OID_C) )
+#error "MBEDTLS_RSA_C defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_RSA_C) && ( !defined(MBEDTLS_PKCS1_V21) &&         \
+    !defined(MBEDTLS_PKCS1_V15) )
+#error "MBEDTLS_RSA_C defined, but none of the PKCS1 versions enabled"
+#endif
+
+#if defined(MBEDTLS_X509_RSASSA_PSS_SUPPORT) &&                        \
+    ( !defined(MBEDTLS_RSA_C) || !defined(MBEDTLS_PKCS1_V21) )
+#error "MBEDTLS_X509_RSASSA_PSS_SUPPORT defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_SSL_PROTO_SSL3) && ( !defined(MBEDTLS_MD5_C) ||     \
+    !defined(MBEDTLS_SHA1_C) )
+#error "MBEDTLS_SSL_PROTO_SSL3 defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_SSL_PROTO_TLS1) && ( !defined(MBEDTLS_MD5_C) ||     \
+    !defined(MBEDTLS_SHA1_C) )
+#error "MBEDTLS_SSL_PROTO_TLS1 defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_SSL_PROTO_TLS1_1) && ( !defined(MBEDTLS_MD5_C) ||     \
+    !defined(MBEDTLS_SHA1_C) )
+#error "MBEDTLS_SSL_PROTO_TLS1_1 defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_SSL_PROTO_TLS1_2) && ( !defined(MBEDTLS_SHA1_C) &&     \
+    !defined(MBEDTLS_SHA256_C) && !defined(MBEDTLS_SHA512_C) )
+#error "MBEDTLS_SSL_PROTO_TLS1_2 defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_SSL_PROTO_DTLS)     && \
+    !defined(MBEDTLS_SSL_PROTO_TLS1_1)  && \
+    !defined(MBEDTLS_SSL_PROTO_TLS1_2)
+#error "MBEDTLS_SSL_PROTO_DTLS defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_SSL_CLI_C) && !defined(MBEDTLS_SSL_TLS_C)
+#error "MBEDTLS_SSL_CLI_C defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_SSL_TLS_C) && ( !defined(MBEDTLS_CIPHER_C) ||     \
+    !defined(MBEDTLS_MD_C) )
+#error "MBEDTLS_SSL_TLS_C defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_SSL_SRV_C) && !defined(MBEDTLS_SSL_TLS_C)
+#error "MBEDTLS_SSL_SRV_C defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_SSL_TLS_C) && (!defined(MBEDTLS_SSL_PROTO_SSL3) && \
+    !defined(MBEDTLS_SSL_PROTO_TLS1) && !defined(MBEDTLS_SSL_PROTO_TLS1_1) && \
+    !defined(MBEDTLS_SSL_PROTO_TLS1_2))
+#error "MBEDTLS_SSL_TLS_C defined, but no protocols are active"
+#endif
+
+#if defined(MBEDTLS_SSL_TLS_C) && (defined(MBEDTLS_SSL_PROTO_SSL3) && \
+    defined(MBEDTLS_SSL_PROTO_TLS1_1) && !defined(MBEDTLS_SSL_PROTO_TLS1))
+#error "Illegal protocol selection"
+#endif
+
+#if defined(MBEDTLS_SSL_TLS_C) && (defined(MBEDTLS_SSL_PROTO_TLS1) && \
+    defined(MBEDTLS_SSL_PROTO_TLS1_2) && !defined(MBEDTLS_SSL_PROTO_TLS1_1))
+#error "Illegal protocol selection"
+#endif
+
+#if defined(MBEDTLS_SSL_TLS_C) && (defined(MBEDTLS_SSL_PROTO_SSL3) && \
+    defined(MBEDTLS_SSL_PROTO_TLS1_2) && (!defined(MBEDTLS_SSL_PROTO_TLS1) || \
+    !defined(MBEDTLS_SSL_PROTO_TLS1_1)))
+#error "Illegal protocol selection"
+#endif
+
+#if defined(MBEDTLS_SSL_DTLS_HELLO_VERIFY) && !defined(MBEDTLS_SSL_PROTO_DTLS)
+#error "MBEDTLS_SSL_DTLS_HELLO_VERIFY  defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_SSL_DTLS_CLIENT_PORT_REUSE) && \
+    !defined(MBEDTLS_SSL_DTLS_HELLO_VERIFY)
+#error "MBEDTLS_SSL_DTLS_CLIENT_PORT_REUSE  defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_SSL_DTLS_ANTI_REPLAY) &&                              \
+    ( !defined(MBEDTLS_SSL_TLS_C) || !defined(MBEDTLS_SSL_PROTO_DTLS) )
+#error "MBEDTLS_SSL_DTLS_ANTI_REPLAY  defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_SSL_DTLS_BADMAC_LIMIT) &&                              \
+    ( !defined(MBEDTLS_SSL_TLS_C) || !defined(MBEDTLS_SSL_PROTO_DTLS) )
+#error "MBEDTLS_SSL_DTLS_BADMAC_LIMIT  defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_SSL_ENCRYPT_THEN_MAC) &&   \
+    !defined(MBEDTLS_SSL_PROTO_TLS1)   &&      \
+    !defined(MBEDTLS_SSL_PROTO_TLS1_1) &&      \
+    !defined(MBEDTLS_SSL_PROTO_TLS1_2)
+#error "MBEDTLS_SSL_ENCRYPT_THEN_MAC defined, but not all prerequsites"
+#endif
+
+#if defined(MBEDTLS_SSL_EXTENDED_MASTER_SECRET) && \
+    !defined(MBEDTLS_SSL_PROTO_TLS1)   &&          \
+    !defined(MBEDTLS_SSL_PROTO_TLS1_1) &&          \
+    !defined(MBEDTLS_SSL_PROTO_TLS1_2)
+#error "MBEDTLS_SSL_EXTENDED_MASTER_SECRET defined, but not all prerequsites"
+#endif
+
+#if defined(MBEDTLS_SSL_TICKET_C) && !defined(MBEDTLS_CIPHER_C)
+#error "MBEDTLS_SSL_TICKET_C defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_SSL_CBC_RECORD_SPLITTING) && \
+    !defined(MBEDTLS_SSL_PROTO_SSL3) && !defined(MBEDTLS_SSL_PROTO_TLS1)
+#error "MBEDTLS_SSL_CBC_RECORD_SPLITTING defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_SSL_SERVER_NAME_INDICATION) && \
+        !defined(MBEDTLS_X509_CRT_PARSE_C)
+#error "MBEDTLS_SSL_SERVER_NAME_INDICATION defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_THREADING_PTHREAD)
+#if !defined(MBEDTLS_THREADING_C) || defined(MBEDTLS_THREADING_IMPL)
+#error "MBEDTLS_THREADING_PTHREAD defined, but not all prerequisites"
+#endif
+#define MBEDTLS_THREADING_IMPL
+#endif
+
+#if defined(MBEDTLS_THREADING_ALT)
+#if !defined(MBEDTLS_THREADING_C) || defined(MBEDTLS_THREADING_IMPL)
+#error "MBEDTLS_THREADING_ALT defined, but not all prerequisites"
+#endif
+#define MBEDTLS_THREADING_IMPL
+#endif
+
+#if defined(MBEDTLS_THREADING_C) && !defined(MBEDTLS_THREADING_IMPL)
+#error "MBEDTLS_THREADING_C defined, single threading implementation required"
+#endif
+#undef MBEDTLS_THREADING_IMPL
+
+#if defined(MBEDTLS_VERSION_FEATURES) && !defined(MBEDTLS_VERSION_C)
+#error "MBEDTLS_VERSION_FEATURES defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_X509_USE_C) && ( !defined(MBEDTLS_BIGNUM_C) ||  \
+    !defined(MBEDTLS_OID_C) || !defined(MBEDTLS_ASN1_PARSE_C) ||      \
+    !defined(MBEDTLS_PK_PARSE_C) )
+#error "MBEDTLS_X509_USE_C defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_X509_CREATE_C) && ( !defined(MBEDTLS_BIGNUM_C) ||  \
+    !defined(MBEDTLS_OID_C) || !defined(MBEDTLS_ASN1_WRITE_C) ||       \
+    !defined(MBEDTLS_PK_WRITE_C) )
+#error "MBEDTLS_X509_CREATE_C defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_X509_CRT_PARSE_C) && ( !defined(MBEDTLS_X509_USE_C) )
+#error "MBEDTLS_X509_CRT_PARSE_C defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_X509_CRL_PARSE_C) && ( !defined(MBEDTLS_X509_USE_C) )
+#error "MBEDTLS_X509_CRL_PARSE_C defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_X509_CSR_PARSE_C) && ( !defined(MBEDTLS_X509_USE_C) )
+#error "MBEDTLS_X509_CSR_PARSE_C defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_X509_CRT_WRITE_C) && ( !defined(MBEDTLS_X509_CREATE_C) )
+#error "MBEDTLS_X509_CRT_WRITE_C defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_X509_CSR_WRITE_C) && ( !defined(MBEDTLS_X509_CREATE_C) )
+#error "MBEDTLS_X509_CSR_WRITE_C defined, but not all prerequisites"
+#endif
+
+#if defined(MBEDTLS_HAVE_INT32) && defined(MBEDTLS_HAVE_INT64)
+#error "MBEDTLS_HAVE_INT32 and MBEDTLS_HAVE_INT64 cannot be defined simultaneously"
+#endif /* MBEDTLS_HAVE_INT32 && MBEDTLS_HAVE_INT64 */
+
+#if ( defined(MBEDTLS_HAVE_INT32) || defined(MBEDTLS_HAVE_INT64) ) && \
+    defined(MBEDTLS_HAVE_ASM)
+#error "MBEDTLS_HAVE_INT32/MBEDTLS_HAVE_INT64 and MBEDTLS_HAVE_ASM cannot be defined simultaneously"
+#endif /* (MBEDTLS_HAVE_INT32 || MBEDTLS_HAVE_INT64) && MBEDTLS_HAVE_ASM */
+
+/*
+ * Avoid warning from -pedantic. This is a convenient place for this
+ * workaround since this is included by every single file before the
+ * #if defined(MBEDTLS_xxx_C) that results in emtpy translation units.
+ */
+typedef int mbedtls_iso_c_forbids_empty_translation_units;
+
+#endif /* MBEDTLS_CHECK_CONFIG_H */
diff --git a/common/mbedtls/cipher.c b/common/mbedtls/cipher.c
new file mode 100644
index 000000000..de9402a2f
--- /dev/null
+++ b/common/mbedtls/cipher.c
@@ -0,0 +1,1108 @@
+/**
+ * \file cipher.c
+ *
+ * \brief Generic cipher wrapper for mbed TLS
+ *
+ * \author Adriaan de Jong <dejong@fox-it.com>
+ *
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "mbedtls/config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#if defined(MBEDTLS_CIPHER_C)
+
+#include "mbedtls/cipher.h"
+#include "mbedtls/cipher_internal.h"
+#include "mbedtls/platform_util.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#if defined(MBEDTLS_CHACHAPOLY_C)
+#include "mbedtls/chachapoly.h"
+#endif
+
+#if defined(MBEDTLS_GCM_C)
+#include "mbedtls/gcm.h"
+#endif
+
+#if defined(MBEDTLS_CCM_C)
+#include "mbedtls/ccm.h"
+#endif
+
+#if defined(MBEDTLS_CHACHA20_C)
+#include "mbedtls/chacha20.h"
+#endif
+
+#if defined(MBEDTLS_CMAC_C)
+#include "mbedtls/cmac.h"
+#endif
+
+#if defined(MBEDTLS_PLATFORM_C)
+#include "mbedtls/platform.h"
+#else
+#define mbedtls_calloc calloc
+#define mbedtls_free   free
+#endif
+
+#if defined(MBEDTLS_GCM_C) || defined(MBEDTLS_CHACHAPOLY_C)
+/* Compare the contents of two buffers in constant time.
+ * Returns 0 if the contents are bitwise identical, otherwise returns
+ * a non-zero value.
+ * This is currently only used by GCM and ChaCha20+Poly1305.
+ */
+static int mbedtls_constant_time_memcmp( const void *v1, const void *v2, size_t len )
+{
+    const unsigned char *p1 = (const unsigned char*) v1;
+    const unsigned char *p2 = (const unsigned char*) v2;
+    size_t i;
+    unsigned char diff;
+
+    for( diff = 0, i = 0; i < len; i++ )
+        diff |= p1[i] ^ p2[i];
+
+    return (int)diff;
+}
+#endif /* MBEDTLS_GCM_C || MBEDTLS_CHACHAPOLY_C */
+
+static int supported_init = 0;
+
+const int *mbedtls_cipher_list( void )
+{
+    const mbedtls_cipher_definition_t *def;
+    int *type;
+
+    if( ! supported_init )
+    {
+        def = mbedtls_cipher_definitions;
+        type = mbedtls_cipher_supported;
+
+        while( def->type != 0 )
+            *type++ = (*def++).type;
+
+        *type = 0;
+
+        supported_init = 1;
+    }
+
+    return( mbedtls_cipher_supported );
+}
+
+const mbedtls_cipher_info_t *mbedtls_cipher_info_from_type( const mbedtls_cipher_type_t cipher_type )
+{
+    const mbedtls_cipher_definition_t *def;
+
+    for( def = mbedtls_cipher_definitions; def->info != NULL; def++ )
+        if( def->type == cipher_type )
+            return( def->info );
+
+    return( NULL );
+}
+
+const mbedtls_cipher_info_t *mbedtls_cipher_info_from_string( const char *cipher_name )
+{
+    const mbedtls_cipher_definition_t *def;
+
+    if( NULL == cipher_name )
+        return( NULL );
+
+    for( def = mbedtls_cipher_definitions; def->info != NULL; def++ )
+        if( !  strcmp( def->info->name, cipher_name ) )
+            return( def->info );
+
+    return( NULL );
+}
+
+const mbedtls_cipher_info_t *mbedtls_cipher_info_from_values( const mbedtls_cipher_id_t cipher_id,
+                                              int key_bitlen,
+                                              const mbedtls_cipher_mode_t mode )
+{
+    const mbedtls_cipher_definition_t *def;
+
+    for( def = mbedtls_cipher_definitions; def->info != NULL; def++ )
+        if( def->info->base->cipher == cipher_id &&
+            def->info->key_bitlen == (unsigned) key_bitlen &&
+            def->info->mode == mode )
+            return( def->info );
+
+    return( NULL );
+}
+
+void mbedtls_cipher_init( mbedtls_cipher_context_t *ctx )
+{
+    memset( ctx, 0, sizeof( mbedtls_cipher_context_t ) );
+}
+
+void mbedtls_cipher_free( mbedtls_cipher_context_t *ctx )
+{
+    if( ctx == NULL )
+        return;
+
+#if defined(MBEDTLS_CMAC_C)
+    if( ctx->cmac_ctx )
+    {
+       mbedtls_platform_zeroize( ctx->cmac_ctx,
+                                 sizeof( mbedtls_cmac_context_t ) );
+       mbedtls_free( ctx->cmac_ctx );
+    }
+#endif
+
+    if( ctx->cipher_ctx )
+        ctx->cipher_info->base->ctx_free_func( ctx->cipher_ctx );
+
+    mbedtls_platform_zeroize( ctx, sizeof(mbedtls_cipher_context_t) );
+}
+
+int mbedtls_cipher_setup( mbedtls_cipher_context_t *ctx, const mbedtls_cipher_info_t *cipher_info )
+{
+    if( NULL == cipher_info || NULL == ctx )
+        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+
+    memset( ctx, 0, sizeof( mbedtls_cipher_context_t ) );
+
+    if( NULL == ( ctx->cipher_ctx = cipher_info->base->ctx_alloc_func() ) )
+        return( MBEDTLS_ERR_CIPHER_ALLOC_FAILED );
+
+    ctx->cipher_info = cipher_info;
+
+#if defined(MBEDTLS_CIPHER_MODE_WITH_PADDING)
+    /*
+     * Ignore possible errors caused by a cipher mode that doesn't use padding
+     */
+#if defined(MBEDTLS_CIPHER_PADDING_PKCS7)
+    (void) mbedtls_cipher_set_padding_mode( ctx, MBEDTLS_PADDING_PKCS7 );
+#else
+    (void) mbedtls_cipher_set_padding_mode( ctx, MBEDTLS_PADDING_NONE );
+#endif
+#endif /* MBEDTLS_CIPHER_MODE_WITH_PADDING */
+
+    return( 0 );
+}
+
+int mbedtls_cipher_setkey( mbedtls_cipher_context_t *ctx, const unsigned char *key,
+        int key_bitlen, const mbedtls_operation_t operation )
+{
+    if( NULL == ctx || NULL == ctx->cipher_info )
+        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+
+    if( ( ctx->cipher_info->flags & MBEDTLS_CIPHER_VARIABLE_KEY_LEN ) == 0 &&
+        (int) ctx->cipher_info->key_bitlen != key_bitlen )
+    {
+        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+    }
+
+    ctx->key_bitlen = key_bitlen;
+    ctx->operation = operation;
+
+    /*
+     * For OFB, CFB and CTR mode always use the encryption key schedule
+     */
+    if( MBEDTLS_ENCRYPT == operation ||
+        MBEDTLS_MODE_CFB == ctx->cipher_info->mode ||
+        MBEDTLS_MODE_OFB == ctx->cipher_info->mode ||
+        MBEDTLS_MODE_CTR == ctx->cipher_info->mode )
+    {
+        return ctx->cipher_info->base->setkey_enc_func( ctx->cipher_ctx, key,
+                ctx->key_bitlen );
+    }
+
+    if( MBEDTLS_DECRYPT == operation )
+        return ctx->cipher_info->base->setkey_dec_func( ctx->cipher_ctx, key,
+                ctx->key_bitlen );
+
+    return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+}
+
+int mbedtls_cipher_set_iv( mbedtls_cipher_context_t *ctx,
+                   const unsigned char *iv, size_t iv_len )
+{
+    size_t actual_iv_size;
+
+    if( NULL == ctx || NULL == ctx->cipher_info || NULL == iv )
+        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+
+    /* avoid buffer overflow in ctx->iv */
+    if( iv_len > MBEDTLS_MAX_IV_LENGTH )
+        return( MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE );
+
+    if( ( ctx->cipher_info->flags & MBEDTLS_CIPHER_VARIABLE_IV_LEN ) != 0 )
+        actual_iv_size = iv_len;
+    else
+    {
+        actual_iv_size = ctx->cipher_info->iv_size;
+
+        /* avoid reading past the end of input buffer */
+        if( actual_iv_size > iv_len )
+            return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+    }
+
+#if defined(MBEDTLS_CHACHA20_C)
+    if ( ctx->cipher_info->type == MBEDTLS_CIPHER_CHACHA20 )
+    {
+        if ( 0 != mbedtls_chacha20_starts( (mbedtls_chacha20_context*)ctx->cipher_ctx,
+                                           iv,
+                                           0U ) ) /* Initial counter value */
+        {
+            return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+        }
+    }
+#endif
+
+    memcpy( ctx->iv, iv, actual_iv_size );
+    ctx->iv_size = actual_iv_size;
+
+    return( 0 );
+}
+
+int mbedtls_cipher_reset( mbedtls_cipher_context_t *ctx )
+{
+    if( NULL == ctx || NULL == ctx->cipher_info )
+        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+
+    ctx->unprocessed_len = 0;
+
+    return( 0 );
+}
+
+#if defined(MBEDTLS_GCM_C) || defined(MBEDTLS_CHACHAPOLY_C)
+int mbedtls_cipher_update_ad( mbedtls_cipher_context_t *ctx,
+                      const unsigned char *ad, size_t ad_len )
+{
+    if( NULL == ctx || NULL == ctx->cipher_info )
+        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+
+#if defined(MBEDTLS_GCM_C)
+    if( MBEDTLS_MODE_GCM == ctx->cipher_info->mode )
+    {
+        return mbedtls_gcm_starts( (mbedtls_gcm_context *) ctx->cipher_ctx, ctx->operation,
+                           ctx->iv, ctx->iv_size, ad, ad_len );
+    }
+#endif
+
+#if defined(MBEDTLS_CHACHAPOLY_C)
+    if (MBEDTLS_CIPHER_CHACHA20_POLY1305 == ctx->cipher_info->type )
+    {
+        int result;
+        mbedtls_chachapoly_mode_t mode;
+
+        mode = ( ctx->operation == MBEDTLS_ENCRYPT )
+                ? MBEDTLS_CHACHAPOLY_ENCRYPT
+                : MBEDTLS_CHACHAPOLY_DECRYPT;
+
+        result = mbedtls_chachapoly_starts( (mbedtls_chachapoly_context*) ctx->cipher_ctx,
+                                                        ctx->iv,
+                                                        mode );
+        if ( result != 0 )
+            return( result );
+
+        return mbedtls_chachapoly_update_aad( (mbedtls_chachapoly_context*) ctx->cipher_ctx,
+                                                          ad, ad_len );
+    }
+#endif
+
+    return( 0 );
+}
+#endif /* MBEDTLS_GCM_C || MBEDTLS_CHACHAPOLY_C */
+
+int mbedtls_cipher_update( mbedtls_cipher_context_t *ctx, const unsigned char *input,
+                   size_t ilen, unsigned char *output, size_t *olen )
+{
+    int ret;
+    size_t block_size = 0;
+
+    if( NULL == ctx || NULL == ctx->cipher_info || NULL == olen )
+    {
+        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+    }
+
+    *olen = 0;
+    block_size = mbedtls_cipher_get_block_size( ctx );
+
+    if( ctx->cipher_info->mode == MBEDTLS_MODE_ECB )
+    {
+        if( ilen != block_size )
+            return( MBEDTLS_ERR_CIPHER_FULL_BLOCK_EXPECTED );
+
+        *olen = ilen;
+
+        if( 0 != ( ret = ctx->cipher_info->base->ecb_func( ctx->cipher_ctx,
+                    ctx->operation, input, output ) ) )
+        {
+            return( ret );
+        }
+
+        return( 0 );
+    }
+
+#if defined(MBEDTLS_GCM_C)
+    if( ctx->cipher_info->mode == MBEDTLS_MODE_GCM )
+    {
+        *olen = ilen;
+        return mbedtls_gcm_update( (mbedtls_gcm_context *) ctx->cipher_ctx, ilen, input,
+                           output );
+    }
+#endif
+
+#if defined(MBEDTLS_CHACHAPOLY_C)
+    if ( ctx->cipher_info->type == MBEDTLS_CIPHER_CHACHA20_POLY1305 )
+    {
+        *olen = ilen;
+        return mbedtls_chachapoly_update( (mbedtls_chachapoly_context*) ctx->cipher_ctx,
+                                                      ilen, input, output );
+    }
+#endif
+
+    if ( 0 == block_size )
+    {
+        return MBEDTLS_ERR_CIPHER_INVALID_CONTEXT;
+    }
+
+    if( input == output &&
+       ( ctx->unprocessed_len != 0 || ilen % block_size ) )
+    {
+        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+    }
+
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+    if( ctx->cipher_info->mode == MBEDTLS_MODE_CBC )
+    {
+        size_t copy_len = 0;
+
+        /*
+         * If there is not enough data for a full block, cache it.
+         */
+        if( ( ctx->operation == MBEDTLS_DECRYPT && NULL != ctx->add_padding &&
+                ilen <= block_size - ctx->unprocessed_len ) ||
+            ( ctx->operation == MBEDTLS_DECRYPT && NULL == ctx->add_padding &&
+                ilen < block_size - ctx->unprocessed_len ) ||
+             ( ctx->operation == MBEDTLS_ENCRYPT &&
+                ilen < block_size - ctx->unprocessed_len ) )
+        {
+            memcpy( &( ctx->unprocessed_data[ctx->unprocessed_len] ), input,
+                    ilen );
+
+            ctx->unprocessed_len += ilen;
+            return( 0 );
+        }
+
+        /*
+         * Process cached data first
+         */
+        if( 0 != ctx->unprocessed_len )
+        {
+            copy_len = block_size - ctx->unprocessed_len;
+
+            memcpy( &( ctx->unprocessed_data[ctx->unprocessed_len] ), input,
+                    copy_len );
+
+            if( 0 != ( ret = ctx->cipher_info->base->cbc_func( ctx->cipher_ctx,
+                    ctx->operation, block_size, ctx->iv,
+                    ctx->unprocessed_data, output ) ) )
+            {
+                return( ret );
+            }
+
+            *olen += block_size;
+            output += block_size;
+            ctx->unprocessed_len = 0;
+
+            input += copy_len;
+            ilen -= copy_len;
+        }
+
+        /*
+         * Cache final, incomplete block
+         */
+        if( 0 != ilen )
+        {
+            if( 0 == block_size )
+            {
+                return MBEDTLS_ERR_CIPHER_INVALID_CONTEXT;
+            }
+
+            /* Encryption: only cache partial blocks
+             * Decryption w/ padding: always keep at least one whole block
+             * Decryption w/o padding: only cache partial blocks
+             */
+            copy_len = ilen % block_size;
+            if( copy_len == 0 &&
+                ctx->operation == MBEDTLS_DECRYPT &&
+                NULL != ctx->add_padding)
+            {
+                copy_len = block_size;
+            }
+
+            memcpy( ctx->unprocessed_data, &( input[ilen - copy_len] ),
+                    copy_len );
+
+            ctx->unprocessed_len += copy_len;
+            ilen -= copy_len;
+        }
+
+        /*
+         * Process remaining full blocks
+         */
+        if( ilen )
+        {
+            if( 0 != ( ret = ctx->cipher_info->base->cbc_func( ctx->cipher_ctx,
+                    ctx->operation, ilen, ctx->iv, input, output ) ) )
+            {
+                return( ret );
+            }
+
+            *olen += ilen;
+        }
+
+        return( 0 );
+    }
+#endif /* MBEDTLS_CIPHER_MODE_CBC */
+
+#if defined(MBEDTLS_CIPHER_MODE_CFB)
+    if( ctx->cipher_info->mode == MBEDTLS_MODE_CFB )
+    {
+        if( 0 != ( ret = ctx->cipher_info->base->cfb_func( ctx->cipher_ctx,
+                ctx->operation, ilen, &ctx->unprocessed_len, ctx->iv,
+                input, output ) ) )
+        {
+            return( ret );
+        }
+
+        *olen = ilen;
+
+        return( 0 );
+    }
+#endif /* MBEDTLS_CIPHER_MODE_CFB */
+
+#if defined(MBEDTLS_CIPHER_MODE_OFB)
+    if( ctx->cipher_info->mode == MBEDTLS_MODE_OFB )
+    {
+        if( 0 != ( ret = ctx->cipher_info->base->ofb_func( ctx->cipher_ctx,
+                ilen, &ctx->unprocessed_len, ctx->iv, input, output ) ) )
+        {
+            return( ret );
+        }
+
+        *olen = ilen;
+
+        return( 0 );
+    }
+#endif /* MBEDTLS_CIPHER_MODE_OFB */
+
+#if defined(MBEDTLS_CIPHER_MODE_CTR)
+    if( ctx->cipher_info->mode == MBEDTLS_MODE_CTR )
+    {
+        if( 0 != ( ret = ctx->cipher_info->base->ctr_func( ctx->cipher_ctx,
+                ilen, &ctx->unprocessed_len, ctx->iv,
+                ctx->unprocessed_data, input, output ) ) )
+        {
+            return( ret );
+        }
+
+        *olen = ilen;
+
+        return( 0 );
+    }
+#endif /* MBEDTLS_CIPHER_MODE_CTR */
+
+#if defined(MBEDTLS_CIPHER_MODE_XTS)
+    if( ctx->cipher_info->mode == MBEDTLS_MODE_XTS )
+    {
+        if( ctx->unprocessed_len > 0 ) {
+            /* We can only process an entire data unit at a time. */
+            return( MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE );
+        }
+
+        ret = ctx->cipher_info->base->xts_func( ctx->cipher_ctx,
+                ctx->operation, ilen, ctx->iv, input, output );
+        if( ret != 0 )
+        {
+            return( ret );
+        }
+
+        *olen = ilen;
+
+        return( 0 );
+    }
+#endif /* MBEDTLS_CIPHER_MODE_XTS */
+
+#if defined(MBEDTLS_CIPHER_MODE_STREAM)
+    if( ctx->cipher_info->mode == MBEDTLS_MODE_STREAM )
+    {
+        if( 0 != ( ret = ctx->cipher_info->base->stream_func( ctx->cipher_ctx,
+                                                    ilen, input, output ) ) )
+        {
+            return( ret );
+        }
+
+        *olen = ilen;
+
+        return( 0 );
+    }
+#endif /* MBEDTLS_CIPHER_MODE_STREAM */
+
+    return( MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE );
+}
+
+#if defined(MBEDTLS_CIPHER_MODE_WITH_PADDING)
+#if defined(MBEDTLS_CIPHER_PADDING_PKCS7)
+/*
+ * PKCS7 (and PKCS5) padding: fill with ll bytes, with ll = padding_len
+ */
+static void add_pkcs_padding( unsigned char *output, size_t output_len,
+        size_t data_len )
+{
+    size_t padding_len = output_len - data_len;
+    unsigned char i;
+
+    for( i = 0; i < padding_len; i++ )
+        output[data_len + i] = (unsigned char) padding_len;
+}
+
+static int get_pkcs_padding( unsigned char *input, size_t input_len,
+        size_t *data_len )
+{
+    size_t i, pad_idx;
+    unsigned char padding_len, bad = 0;
+
+    if( NULL == input || NULL == data_len )
+        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+
+    padding_len = input[input_len - 1];
+    *data_len = input_len - padding_len;
+
+    /* Avoid logical || since it results in a branch */
+    bad |= padding_len > input_len;
+    bad |= padding_len == 0;
+
+    /* The number of bytes checked must be independent of padding_len,
+     * so pick input_len, which is usually 8 or 16 (one block) */
+    pad_idx = input_len - padding_len;
+    for( i = 0; i < input_len; i++ )
+        bad |= ( input[i] ^ padding_len ) * ( i >= pad_idx );
+
+    return( MBEDTLS_ERR_CIPHER_INVALID_PADDING * ( bad != 0 ) );
+}
+#endif /* MBEDTLS_CIPHER_PADDING_PKCS7 */
+
+#if defined(MBEDTLS_CIPHER_PADDING_ONE_AND_ZEROS)
+/*
+ * One and zeros padding: fill with 80 00 ... 00
+ */
+static void add_one_and_zeros_padding( unsigned char *output,
+                                       size_t output_len, size_t data_len )
+{
+    size_t padding_len = output_len - data_len;
+    unsigned char i = 0;
+
+    output[data_len] = 0x80;
+    for( i = 1; i < padding_len; i++ )
+        output[data_len + i] = 0x00;
+}
+
+static int get_one_and_zeros_padding( unsigned char *input, size_t input_len,
+                                      size_t *data_len )
+{
+    size_t i;
+    unsigned char done = 0, prev_done, bad;
+
+    if( NULL == input || NULL == data_len )
+        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+
+    bad = 0x80;
+    *data_len = 0;
+    for( i = input_len; i > 0; i-- )
+    {
+        prev_done = done;
+        done |= ( input[i - 1] != 0 );
+        *data_len |= ( i - 1 ) * ( done != prev_done );
+        bad ^= input[i - 1] * ( done != prev_done );
+    }
+
+    return( MBEDTLS_ERR_CIPHER_INVALID_PADDING * ( bad != 0 ) );
+
+}
+#endif /* MBEDTLS_CIPHER_PADDING_ONE_AND_ZEROS */
+
+#if defined(MBEDTLS_CIPHER_PADDING_ZEROS_AND_LEN)
+/*
+ * Zeros and len padding: fill with 00 ... 00 ll, where ll is padding length
+ */
+static void add_zeros_and_len_padding( unsigned char *output,
+                                       size_t output_len, size_t data_len )
+{
+    size_t padding_len = output_len - data_len;
+    unsigned char i = 0;
+
+    for( i = 1; i < padding_len; i++ )
+        output[data_len + i - 1] = 0x00;
+    output[output_len - 1] = (unsigned char) padding_len;
+}
+
+static int get_zeros_and_len_padding( unsigned char *input, size_t input_len,
+                                      size_t *data_len )
+{
+    size_t i, pad_idx;
+    unsigned char padding_len, bad = 0;
+
+    if( NULL == input || NULL == data_len )
+        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+
+    padding_len = input[input_len - 1];
+    *data_len = input_len - padding_len;
+
+    /* Avoid logical || since it results in a branch */
+    bad |= padding_len > input_len;
+    bad |= padding_len == 0;
+
+    /* The number of bytes checked must be independent of padding_len */
+    pad_idx = input_len - padding_len;
+    for( i = 0; i < input_len - 1; i++ )
+        bad |= input[i] * ( i >= pad_idx );
+
+    return( MBEDTLS_ERR_CIPHER_INVALID_PADDING * ( bad != 0 ) );
+}
+#endif /* MBEDTLS_CIPHER_PADDING_ZEROS_AND_LEN */
+
+#if defined(MBEDTLS_CIPHER_PADDING_ZEROS)
+/*
+ * Zero padding: fill with 00 ... 00
+ */
+static void add_zeros_padding( unsigned char *output,
+                               size_t output_len, size_t data_len )
+{
+    size_t i;
+
+    for( i = data_len; i < output_len; i++ )
+        output[i] = 0x00;
+}
+
+static int get_zeros_padding( unsigned char *input, size_t input_len,
+                              size_t *data_len )
+{
+    size_t i;
+    unsigned char done = 0, prev_done;
+
+    if( NULL == input || NULL == data_len )
+        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+
+    *data_len = 0;
+    for( i = input_len; i > 0; i-- )
+    {
+        prev_done = done;
+        done |= ( input[i-1] != 0 );
+        *data_len |= i * ( done != prev_done );
+    }
+
+    return( 0 );
+}
+#endif /* MBEDTLS_CIPHER_PADDING_ZEROS */
+
+/*
+ * No padding: don't pad :)
+ *
+ * There is no add_padding function (check for NULL in mbedtls_cipher_finish)
+ * but a trivial get_padding function
+ */
+static int get_no_padding( unsigned char *input, size_t input_len,
+                              size_t *data_len )
+{
+    if( NULL == input || NULL == data_len )
+        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+
+    *data_len = input_len;
+
+    return( 0 );
+}
+#endif /* MBEDTLS_CIPHER_MODE_WITH_PADDING */
+
+int mbedtls_cipher_finish( mbedtls_cipher_context_t *ctx,
+                   unsigned char *output, size_t *olen )
+{
+    if( NULL == ctx || NULL == ctx->cipher_info || NULL == olen )
+        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+
+    *olen = 0;
+
+    if( MBEDTLS_MODE_CFB == ctx->cipher_info->mode ||
+        MBEDTLS_MODE_OFB == ctx->cipher_info->mode ||
+        MBEDTLS_MODE_CTR == ctx->cipher_info->mode ||
+        MBEDTLS_MODE_GCM == ctx->cipher_info->mode ||
+        MBEDTLS_MODE_XTS == ctx->cipher_info->mode ||
+        MBEDTLS_MODE_STREAM == ctx->cipher_info->mode )
+    {
+        return( 0 );
+    }
+
+    if ( ( MBEDTLS_CIPHER_CHACHA20          == ctx->cipher_info->type ) ||
+         ( MBEDTLS_CIPHER_CHACHA20_POLY1305 == ctx->cipher_info->type ) )
+    {
+        return( 0 );
+    }
+
+    if( MBEDTLS_MODE_ECB == ctx->cipher_info->mode )
+    {
+        if( ctx->unprocessed_len != 0 )
+            return( MBEDTLS_ERR_CIPHER_FULL_BLOCK_EXPECTED );
+
+        return( 0 );
+    }
+
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+    if( MBEDTLS_MODE_CBC == ctx->cipher_info->mode )
+    {
+        int ret = 0;
+
+        if( MBEDTLS_ENCRYPT == ctx->operation )
+        {
+            /* check for 'no padding' mode */
+            if( NULL == ctx->add_padding )
+            {
+                if( 0 != ctx->unprocessed_len )
+                    return( MBEDTLS_ERR_CIPHER_FULL_BLOCK_EXPECTED );
+
+                return( 0 );
+            }
+
+            ctx->add_padding( ctx->unprocessed_data, mbedtls_cipher_get_iv_size( ctx ),
+                    ctx->unprocessed_len );
+        }
+        else if( mbedtls_cipher_get_block_size( ctx ) != ctx->unprocessed_len )
+        {
+            /*
+             * For decrypt operations, expect a full block,
+             * or an empty block if no padding
+             */
+            if( NULL == ctx->add_padding && 0 == ctx->unprocessed_len )
+                return( 0 );
+
+            return( MBEDTLS_ERR_CIPHER_FULL_BLOCK_EXPECTED );
+        }
+
+        /* cipher block */
+        if( 0 != ( ret = ctx->cipher_info->base->cbc_func( ctx->cipher_ctx,
+                ctx->operation, mbedtls_cipher_get_block_size( ctx ), ctx->iv,
+                ctx->unprocessed_data, output ) ) )
+        {
+            return( ret );
+        }
+
+        /* Set output size for decryption */
+        if( MBEDTLS_DECRYPT == ctx->operation )
+            return ctx->get_padding( output, mbedtls_cipher_get_block_size( ctx ),
+                                     olen );
+
+        /* Set output size for encryption */
+        *olen = mbedtls_cipher_get_block_size( ctx );
+        return( 0 );
+    }
+#else
+    ((void) output);
+#endif /* MBEDTLS_CIPHER_MODE_CBC */
+
+    return( MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE );
+}
+
+#if defined(MBEDTLS_CIPHER_MODE_WITH_PADDING)
+int mbedtls_cipher_set_padding_mode( mbedtls_cipher_context_t *ctx, mbedtls_cipher_padding_t mode )
+{
+    if( NULL == ctx ||
+        MBEDTLS_MODE_CBC != ctx->cipher_info->mode )
+    {
+        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+    }
+
+    switch( mode )
+    {
+#if defined(MBEDTLS_CIPHER_PADDING_PKCS7)
+    case MBEDTLS_PADDING_PKCS7:
+        ctx->add_padding = add_pkcs_padding;
+        ctx->get_padding = get_pkcs_padding;
+        break;
+#endif
+#if defined(MBEDTLS_CIPHER_PADDING_ONE_AND_ZEROS)
+    case MBEDTLS_PADDING_ONE_AND_ZEROS:
+        ctx->add_padding = add_one_and_zeros_padding;
+        ctx->get_padding = get_one_and_zeros_padding;
+        break;
+#endif
+#if defined(MBEDTLS_CIPHER_PADDING_ZEROS_AND_LEN)
+    case MBEDTLS_PADDING_ZEROS_AND_LEN:
+        ctx->add_padding = add_zeros_and_len_padding;
+        ctx->get_padding = get_zeros_and_len_padding;
+        break;
+#endif
+#if defined(MBEDTLS_CIPHER_PADDING_ZEROS)
+    case MBEDTLS_PADDING_ZEROS:
+        ctx->add_padding = add_zeros_padding;
+        ctx->get_padding = get_zeros_padding;
+        break;
+#endif
+    case MBEDTLS_PADDING_NONE:
+        ctx->add_padding = NULL;
+        ctx->get_padding = get_no_padding;
+        break;
+
+    default:
+        return( MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE );
+    }
+
+    return( 0 );
+}
+#endif /* MBEDTLS_CIPHER_MODE_WITH_PADDING */
+
+#if defined(MBEDTLS_GCM_C) || defined(MBEDTLS_CHACHAPOLY_C)
+int mbedtls_cipher_write_tag( mbedtls_cipher_context_t *ctx,
+                      unsigned char *tag, size_t tag_len )
+{
+    if( NULL == ctx || NULL == ctx->cipher_info || NULL == tag )
+        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+
+    if( MBEDTLS_ENCRYPT != ctx->operation )
+        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+
+#if defined(MBEDTLS_GCM_C)
+    if( MBEDTLS_MODE_GCM == ctx->cipher_info->mode )
+        return mbedtls_gcm_finish( (mbedtls_gcm_context *) ctx->cipher_ctx, tag, tag_len );
+#endif
+
+#if defined(MBEDTLS_CHACHAPOLY_C)
+    if ( MBEDTLS_CIPHER_CHACHA20_POLY1305 == ctx->cipher_info->type )
+    {
+        /* Don't allow truncated MAC for Poly1305 */
+        if ( tag_len != 16U )
+            return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+
+        return mbedtls_chachapoly_finish( (mbedtls_chachapoly_context*) ctx->cipher_ctx,
+                                                      tag );
+    }
+#endif
+
+    return( 0 );
+}
+
+int mbedtls_cipher_check_tag( mbedtls_cipher_context_t *ctx,
+                      const unsigned char *tag, size_t tag_len )
+{
+    unsigned char check_tag[16];
+    int ret;
+
+    if( NULL == ctx || NULL == ctx->cipher_info ||
+        MBEDTLS_DECRYPT != ctx->operation )
+    {
+        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+    }
+
+#if defined(MBEDTLS_GCM_C)
+    if( MBEDTLS_MODE_GCM == ctx->cipher_info->mode )
+    {
+        if( tag_len > sizeof( check_tag ) )
+            return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+
+        if( 0 != ( ret = mbedtls_gcm_finish( (mbedtls_gcm_context *) ctx->cipher_ctx,
+                                     check_tag, tag_len ) ) )
+        {
+            return( ret );
+        }
+
+        /* Check the tag in "constant-time" */
+        if( mbedtls_constant_time_memcmp( tag, check_tag, tag_len ) != 0 )
+            return( MBEDTLS_ERR_CIPHER_AUTH_FAILED );
+
+        return( 0 );
+    }
+#endif /* MBEDTLS_GCM_C */
+
+#if defined(MBEDTLS_CHACHAPOLY_C)
+    if ( MBEDTLS_CIPHER_CHACHA20_POLY1305 == ctx->cipher_info->type )
+    {
+        /* Don't allow truncated MAC for Poly1305 */
+        if ( tag_len != sizeof( check_tag ) )
+            return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+
+        ret = mbedtls_chachapoly_finish( (mbedtls_chachapoly_context*) ctx->cipher_ctx,
+                                                     check_tag );
+        if ( ret != 0 )
+        {
+            return( ret );
+        }
+
+        /* Check the tag in "constant-time" */
+        if( mbedtls_constant_time_memcmp( tag, check_tag, tag_len ) != 0 )
+            return( MBEDTLS_ERR_CIPHER_AUTH_FAILED );
+
+        return( 0 );
+    }
+#endif /* MBEDTLS_CHACHAPOLY_C */
+
+    return( 0 );
+}
+#endif /* MBEDTLS_GCM_C || MBEDTLS_CHACHAPOLY_C */
+
+/*
+ * Packet-oriented wrapper for non-AEAD modes
+ */
+int mbedtls_cipher_crypt( mbedtls_cipher_context_t *ctx,
+                  const unsigned char *iv, size_t iv_len,
+                  const unsigned char *input, size_t ilen,
+                  unsigned char *output, size_t *olen )
+{
+    int ret;
+    size_t finish_olen;
+
+    if( ( ret = mbedtls_cipher_set_iv( ctx, iv, iv_len ) ) != 0 )
+        return( ret );
+
+    if( ( ret = mbedtls_cipher_reset( ctx ) ) != 0 )
+        return( ret );
+
+    if( ( ret = mbedtls_cipher_update( ctx, input, ilen, output, olen ) ) != 0 )
+        return( ret );
+
+    if( ( ret = mbedtls_cipher_finish( ctx, output + *olen, &finish_olen ) ) != 0 )
+        return( ret );
+
+    *olen += finish_olen;
+
+    return( 0 );
+}
+
+#if defined(MBEDTLS_CIPHER_MODE_AEAD)
+/*
+ * Packet-oriented encryption for AEAD modes
+ */
+int mbedtls_cipher_auth_encrypt( mbedtls_cipher_context_t *ctx,
+                         const unsigned char *iv, size_t iv_len,
+                         const unsigned char *ad, size_t ad_len,
+                         const unsigned char *input, size_t ilen,
+                         unsigned char *output, size_t *olen,
+                         unsigned char *tag, size_t tag_len )
+{
+#if defined(MBEDTLS_GCM_C)
+    if( MBEDTLS_MODE_GCM == ctx->cipher_info->mode )
+    {
+        *olen = ilen;
+        return( mbedtls_gcm_crypt_and_tag( ctx->cipher_ctx, MBEDTLS_GCM_ENCRYPT, ilen,
+                                   iv, iv_len, ad, ad_len, input, output,
+                                   tag_len, tag ) );
+    }
+#endif /* MBEDTLS_GCM_C */
+#if defined(MBEDTLS_CCM_C)
+    if( MBEDTLS_MODE_CCM == ctx->cipher_info->mode )
+    {
+        *olen = ilen;
+        return( mbedtls_ccm_encrypt_and_tag( ctx->cipher_ctx, ilen,
+                                     iv, iv_len, ad, ad_len, input, output,
+                                     tag, tag_len ) );
+    }
+#endif /* MBEDTLS_CCM_C */
+#if defined(MBEDTLS_CHACHAPOLY_C)
+    if ( MBEDTLS_CIPHER_CHACHA20_POLY1305 == ctx->cipher_info->type )
+    {
+        /* ChachaPoly has fixed length nonce and MAC (tag) */
+        if ( ( iv_len != ctx->cipher_info->iv_size ) ||
+             ( tag_len != 16U ) )
+        {
+            return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+        }
+
+        *olen = ilen;
+        return( mbedtls_chachapoly_encrypt_and_tag( ctx->cipher_ctx,
+                                ilen, iv, ad, ad_len, input, output, tag ) );
+    }
+#endif /* MBEDTLS_CHACHAPOLY_C */
+
+    return( MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE );
+}
+
+/*
+ * Packet-oriented decryption for AEAD modes
+ */
+int mbedtls_cipher_auth_decrypt( mbedtls_cipher_context_t *ctx,
+                         const unsigned char *iv, size_t iv_len,
+                         const unsigned char *ad, size_t ad_len,
+                         const unsigned char *input, size_t ilen,
+                         unsigned char *output, size_t *olen,
+                         const unsigned char *tag, size_t tag_len )
+{
+#if defined(MBEDTLS_GCM_C)
+    if( MBEDTLS_MODE_GCM == ctx->cipher_info->mode )
+    {
+        int ret;
+
+        *olen = ilen;
+        ret = mbedtls_gcm_auth_decrypt( ctx->cipher_ctx, ilen,
+                                iv, iv_len, ad, ad_len,
+                                tag, tag_len, input, output );
+
+        if( ret == MBEDTLS_ERR_GCM_AUTH_FAILED )
+            ret = MBEDTLS_ERR_CIPHER_AUTH_FAILED;
+
+        return( ret );
+    }
+#endif /* MBEDTLS_GCM_C */
+#if defined(MBEDTLS_CCM_C)
+    if( MBEDTLS_MODE_CCM == ctx->cipher_info->mode )
+    {
+        int ret;
+
+        *olen = ilen;
+        ret = mbedtls_ccm_auth_decrypt( ctx->cipher_ctx, ilen,
+                                iv, iv_len, ad, ad_len,
+                                input, output, tag, tag_len );
+
+        if( ret == MBEDTLS_ERR_CCM_AUTH_FAILED )
+            ret = MBEDTLS_ERR_CIPHER_AUTH_FAILED;
+
+        return( ret );
+    }
+#endif /* MBEDTLS_CCM_C */
+#if defined(MBEDTLS_CHACHAPOLY_C)
+    if ( MBEDTLS_CIPHER_CHACHA20_POLY1305 == ctx->cipher_info->type )
+    {
+        int ret;
+
+        /* ChachaPoly has fixed length nonce and MAC (tag) */
+        if ( ( iv_len != ctx->cipher_info->iv_size ) ||
+             ( tag_len != 16U ) )
+        {
+            return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+        }
+
+        *olen = ilen;
+        ret = mbedtls_chachapoly_auth_decrypt( ctx->cipher_ctx, ilen,
+                                iv, ad, ad_len, tag, input, output );
+
+        if( ret == MBEDTLS_ERR_CHACHAPOLY_AUTH_FAILED )
+            ret = MBEDTLS_ERR_CIPHER_AUTH_FAILED;
+
+        return( ret );
+    }
+#endif /* MBEDTLS_CHACHAPOLY_C */
+
+    return( MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE );
+}
+#endif /* MBEDTLS_CIPHER_MODE_AEAD */
+
+#endif /* MBEDTLS_CIPHER_C */
diff --git a/common/mbedtls/cipher.h b/common/mbedtls/cipher.h
new file mode 100644
index 000000000..9e3832dde
--- /dev/null
+++ b/common/mbedtls/cipher.h
@@ -0,0 +1,808 @@
+/**
+ * \file cipher.h
+ *
+ * \brief This file contains an abstraction interface for use with the cipher
+ * primitives provided by the library. It provides a common interface to all of
+ * the available cipher operations.
+ *
+ * \author Adriaan de Jong <dejong@fox-it.com>
+ */
+/*
+ *  Copyright (C) 2006-2018, Arm Limited (or its affiliates), All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of Mbed TLS (https://tls.mbed.org)
+ */
+
+#ifndef MBEDTLS_CIPHER_H
+#define MBEDTLS_CIPHER_H
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#include <stddef.h>
+
+#if defined(MBEDTLS_GCM_C) || defined(MBEDTLS_CCM_C) || defined(MBEDTLS_CHACHAPOLY_C)
+#define MBEDTLS_CIPHER_MODE_AEAD
+#endif
+
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+#define MBEDTLS_CIPHER_MODE_WITH_PADDING
+#endif
+
+#if defined(MBEDTLS_ARC4_C) || defined(MBEDTLS_CIPHER_NULL_CIPHER) || \
+    defined(MBEDTLS_CHACHA20_C)
+#define MBEDTLS_CIPHER_MODE_STREAM
+#endif
+
+#if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && \
+    !defined(inline) && !defined(__cplusplus)
+#define inline __inline
+#endif
+
+#define MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE  -0x6080  /**< The selected feature is not available. */
+#define MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA       -0x6100  /**< Bad input parameters. */
+#define MBEDTLS_ERR_CIPHER_ALLOC_FAILED         -0x6180  /**< Failed to allocate memory. */
+#define MBEDTLS_ERR_CIPHER_INVALID_PADDING      -0x6200  /**< Input data contains invalid padding and is rejected. */
+#define MBEDTLS_ERR_CIPHER_FULL_BLOCK_EXPECTED  -0x6280  /**< Decryption of block requires a full block. */
+#define MBEDTLS_ERR_CIPHER_AUTH_FAILED          -0x6300  /**< Authentication failed (for AEAD modes). */
+#define MBEDTLS_ERR_CIPHER_INVALID_CONTEXT      -0x6380  /**< The context is invalid. For example, because it was freed. */
+#define MBEDTLS_ERR_CIPHER_HW_ACCEL_FAILED      -0x6400  /**< Cipher hardware accelerator failed. */
+
+#define MBEDTLS_CIPHER_VARIABLE_IV_LEN     0x01    /**< Cipher accepts IVs of variable length. */
+#define MBEDTLS_CIPHER_VARIABLE_KEY_LEN    0x02    /**< Cipher accepts keys of variable length. */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \brief     Supported cipher types.
+ *
+ * \warning   RC4 and DES are considered weak ciphers and their use
+ *            constitutes a security risk. Arm recommends considering stronger
+ *            ciphers instead.
+ */
+typedef enum {
+    MBEDTLS_CIPHER_ID_NONE = 0,  /**< Placeholder to mark the end of cipher ID lists. */
+    MBEDTLS_CIPHER_ID_NULL,      /**< The identity cipher, treated as a stream cipher. */
+    MBEDTLS_CIPHER_ID_AES,       /**< The AES cipher. */
+    MBEDTLS_CIPHER_ID_DES,       /**< The DES cipher. */
+    MBEDTLS_CIPHER_ID_3DES,      /**< The Triple DES cipher. */
+    MBEDTLS_CIPHER_ID_CAMELLIA,  /**< The Camellia cipher. */
+    MBEDTLS_CIPHER_ID_BLOWFISH,  /**< The Blowfish cipher. */
+    MBEDTLS_CIPHER_ID_ARC4,      /**< The RC4 cipher. */
+    MBEDTLS_CIPHER_ID_ARIA,      /**< The Aria cipher. */
+    MBEDTLS_CIPHER_ID_CHACHA20,  /**< The ChaCha20 cipher. */
+} mbedtls_cipher_id_t;
+
+/**
+ * \brief     Supported {cipher type, cipher mode} pairs.
+ *
+ * \warning   RC4 and DES are considered weak ciphers and their use
+ *            constitutes a security risk. Arm recommends considering stronger
+ *            ciphers instead.
+ */
+typedef enum {
+    MBEDTLS_CIPHER_NONE = 0,             /**< Placeholder to mark the end of cipher-pair lists. */
+    MBEDTLS_CIPHER_NULL,                 /**< The identity stream cipher. */
+    MBEDTLS_CIPHER_AES_128_ECB,          /**< AES cipher with 128-bit ECB mode. */
+    MBEDTLS_CIPHER_AES_192_ECB,          /**< AES cipher with 192-bit ECB mode. */
+    MBEDTLS_CIPHER_AES_256_ECB,          /**< AES cipher with 256-bit ECB mode. */
+    MBEDTLS_CIPHER_AES_128_CBC,          /**< AES cipher with 128-bit CBC mode. */
+    MBEDTLS_CIPHER_AES_192_CBC,          /**< AES cipher with 192-bit CBC mode. */
+    MBEDTLS_CIPHER_AES_256_CBC,          /**< AES cipher with 256-bit CBC mode. */
+    MBEDTLS_CIPHER_AES_128_CFB128,       /**< AES cipher with 128-bit CFB128 mode. */
+    MBEDTLS_CIPHER_AES_192_CFB128,       /**< AES cipher with 192-bit CFB128 mode. */
+    MBEDTLS_CIPHER_AES_256_CFB128,       /**< AES cipher with 256-bit CFB128 mode. */
+    MBEDTLS_CIPHER_AES_128_CTR,          /**< AES cipher with 128-bit CTR mode. */
+    MBEDTLS_CIPHER_AES_192_CTR,          /**< AES cipher with 192-bit CTR mode. */
+    MBEDTLS_CIPHER_AES_256_CTR,          /**< AES cipher with 256-bit CTR mode. */
+    MBEDTLS_CIPHER_AES_128_GCM,          /**< AES cipher with 128-bit GCM mode. */
+    MBEDTLS_CIPHER_AES_192_GCM,          /**< AES cipher with 192-bit GCM mode. */
+    MBEDTLS_CIPHER_AES_256_GCM,          /**< AES cipher with 256-bit GCM mode. */
+    MBEDTLS_CIPHER_CAMELLIA_128_ECB,     /**< Camellia cipher with 128-bit ECB mode. */
+    MBEDTLS_CIPHER_CAMELLIA_192_ECB,     /**< Camellia cipher with 192-bit ECB mode. */
+    MBEDTLS_CIPHER_CAMELLIA_256_ECB,     /**< Camellia cipher with 256-bit ECB mode. */
+    MBEDTLS_CIPHER_CAMELLIA_128_CBC,     /**< Camellia cipher with 128-bit CBC mode. */
+    MBEDTLS_CIPHER_CAMELLIA_192_CBC,     /**< Camellia cipher with 192-bit CBC mode. */
+    MBEDTLS_CIPHER_CAMELLIA_256_CBC,     /**< Camellia cipher with 256-bit CBC mode. */
+    MBEDTLS_CIPHER_CAMELLIA_128_CFB128,  /**< Camellia cipher with 128-bit CFB128 mode. */
+    MBEDTLS_CIPHER_CAMELLIA_192_CFB128,  /**< Camellia cipher with 192-bit CFB128 mode. */
+    MBEDTLS_CIPHER_CAMELLIA_256_CFB128,  /**< Camellia cipher with 256-bit CFB128 mode. */
+    MBEDTLS_CIPHER_CAMELLIA_128_CTR,     /**< Camellia cipher with 128-bit CTR mode. */
+    MBEDTLS_CIPHER_CAMELLIA_192_CTR,     /**< Camellia cipher with 192-bit CTR mode. */
+    MBEDTLS_CIPHER_CAMELLIA_256_CTR,     /**< Camellia cipher with 256-bit CTR mode. */
+    MBEDTLS_CIPHER_CAMELLIA_128_GCM,     /**< Camellia cipher with 128-bit GCM mode. */
+    MBEDTLS_CIPHER_CAMELLIA_192_GCM,     /**< Camellia cipher with 192-bit GCM mode. */
+    MBEDTLS_CIPHER_CAMELLIA_256_GCM,     /**< Camellia cipher with 256-bit GCM mode. */
+    MBEDTLS_CIPHER_DES_ECB,              /**< DES cipher with ECB mode. */
+    MBEDTLS_CIPHER_DES_CBC,              /**< DES cipher with CBC mode. */
+    MBEDTLS_CIPHER_DES_EDE_ECB,          /**< DES cipher with EDE ECB mode. */
+    MBEDTLS_CIPHER_DES_EDE_CBC,          /**< DES cipher with EDE CBC mode. */
+    MBEDTLS_CIPHER_DES_EDE3_ECB,         /**< DES cipher with EDE3 ECB mode. */
+    MBEDTLS_CIPHER_DES_EDE3_CBC,         /**< DES cipher with EDE3 CBC mode. */
+    MBEDTLS_CIPHER_BLOWFISH_ECB,         /**< Blowfish cipher with ECB mode. */
+    MBEDTLS_CIPHER_BLOWFISH_CBC,         /**< Blowfish cipher with CBC mode. */
+    MBEDTLS_CIPHER_BLOWFISH_CFB64,       /**< Blowfish cipher with CFB64 mode. */
+    MBEDTLS_CIPHER_BLOWFISH_CTR,         /**< Blowfish cipher with CTR mode. */
+    MBEDTLS_CIPHER_ARC4_128,             /**< RC4 cipher with 128-bit mode. */
+    MBEDTLS_CIPHER_AES_128_CCM,          /**< AES cipher with 128-bit CCM mode. */
+    MBEDTLS_CIPHER_AES_192_CCM,          /**< AES cipher with 192-bit CCM mode. */
+    MBEDTLS_CIPHER_AES_256_CCM,          /**< AES cipher with 256-bit CCM mode. */
+    MBEDTLS_CIPHER_CAMELLIA_128_CCM,     /**< Camellia cipher with 128-bit CCM mode. */
+    MBEDTLS_CIPHER_CAMELLIA_192_CCM,     /**< Camellia cipher with 192-bit CCM mode. */
+    MBEDTLS_CIPHER_CAMELLIA_256_CCM,     /**< Camellia cipher with 256-bit CCM mode. */
+    MBEDTLS_CIPHER_ARIA_128_ECB,         /**< Aria cipher with 128-bit key and ECB mode. */
+    MBEDTLS_CIPHER_ARIA_192_ECB,         /**< Aria cipher with 192-bit key and ECB mode. */
+    MBEDTLS_CIPHER_ARIA_256_ECB,         /**< Aria cipher with 256-bit key and ECB mode. */
+    MBEDTLS_CIPHER_ARIA_128_CBC,         /**< Aria cipher with 128-bit key and CBC mode. */
+    MBEDTLS_CIPHER_ARIA_192_CBC,         /**< Aria cipher with 192-bit key and CBC mode. */
+    MBEDTLS_CIPHER_ARIA_256_CBC,         /**< Aria cipher with 256-bit key and CBC mode. */
+    MBEDTLS_CIPHER_ARIA_128_CFB128,      /**< Aria cipher with 128-bit key and CFB-128 mode. */
+    MBEDTLS_CIPHER_ARIA_192_CFB128,      /**< Aria cipher with 192-bit key and CFB-128 mode. */
+    MBEDTLS_CIPHER_ARIA_256_CFB128,      /**< Aria cipher with 256-bit key and CFB-128 mode. */
+    MBEDTLS_CIPHER_ARIA_128_CTR,         /**< Aria cipher with 128-bit key and CTR mode. */
+    MBEDTLS_CIPHER_ARIA_192_CTR,         /**< Aria cipher with 192-bit key and CTR mode. */
+    MBEDTLS_CIPHER_ARIA_256_CTR,         /**< Aria cipher with 256-bit key and CTR mode. */
+    MBEDTLS_CIPHER_ARIA_128_GCM,         /**< Aria cipher with 128-bit key and GCM mode. */
+    MBEDTLS_CIPHER_ARIA_192_GCM,         /**< Aria cipher with 192-bit key and GCM mode. */
+    MBEDTLS_CIPHER_ARIA_256_GCM,         /**< Aria cipher with 256-bit key and GCM mode. */
+    MBEDTLS_CIPHER_ARIA_128_CCM,         /**< Aria cipher with 128-bit key and CCM mode. */
+    MBEDTLS_CIPHER_ARIA_192_CCM,         /**< Aria cipher with 192-bit key and CCM mode. */
+    MBEDTLS_CIPHER_ARIA_256_CCM,         /**< Aria cipher with 256-bit key and CCM mode. */
+    MBEDTLS_CIPHER_AES_128_OFB,          /**< AES 128-bit cipher in OFB mode. */
+    MBEDTLS_CIPHER_AES_192_OFB,          /**< AES 192-bit cipher in OFB mode. */
+    MBEDTLS_CIPHER_AES_256_OFB,          /**< AES 256-bit cipher in OFB mode. */
+    MBEDTLS_CIPHER_AES_128_XTS,          /**< AES 128-bit cipher in XTS block mode. */
+    MBEDTLS_CIPHER_AES_256_XTS,          /**< AES 256-bit cipher in XTS block mode. */
+    MBEDTLS_CIPHER_CHACHA20,             /**< ChaCha20 stream cipher. */
+    MBEDTLS_CIPHER_CHACHA20_POLY1305,    /**< ChaCha20-Poly1305 AEAD cipher. */
+} mbedtls_cipher_type_t;
+
+/** Supported cipher modes. */
+typedef enum {
+    MBEDTLS_MODE_NONE = 0,               /**< None. */
+    MBEDTLS_MODE_ECB,                    /**< The ECB cipher mode. */
+    MBEDTLS_MODE_CBC,                    /**< The CBC cipher mode. */
+    MBEDTLS_MODE_CFB,                    /**< The CFB cipher mode. */
+    MBEDTLS_MODE_OFB,                    /**< The OFB cipher mode. */
+    MBEDTLS_MODE_CTR,                    /**< The CTR cipher mode. */
+    MBEDTLS_MODE_GCM,                    /**< The GCM cipher mode. */
+    MBEDTLS_MODE_STREAM,                 /**< The stream cipher mode. */
+    MBEDTLS_MODE_CCM,                    /**< The CCM cipher mode. */
+    MBEDTLS_MODE_XTS,                    /**< The XTS cipher mode. */
+    MBEDTLS_MODE_CHACHAPOLY,             /**< The ChaCha-Poly cipher mode. */
+} mbedtls_cipher_mode_t;
+
+/** Supported cipher padding types. */
+typedef enum {
+    MBEDTLS_PADDING_PKCS7 = 0,     /**< PKCS7 padding (default).        */
+    MBEDTLS_PADDING_ONE_AND_ZEROS, /**< ISO/IEC 7816-4 padding.         */
+    MBEDTLS_PADDING_ZEROS_AND_LEN, /**< ANSI X.923 padding.             */
+    MBEDTLS_PADDING_ZEROS,         /**< Zero padding (not reversible). */
+    MBEDTLS_PADDING_NONE,          /**< Never pad (full blocks only).   */
+} mbedtls_cipher_padding_t;
+
+/** Type of operation. */
+typedef enum {
+    MBEDTLS_OPERATION_NONE = -1,
+    MBEDTLS_DECRYPT = 0,
+    MBEDTLS_ENCRYPT,
+} mbedtls_operation_t;
+
+enum {
+    /** Undefined key length. */
+    MBEDTLS_KEY_LENGTH_NONE = 0,
+    /** Key length, in bits (including parity), for DES keys. */
+    MBEDTLS_KEY_LENGTH_DES  = 64,
+    /** Key length in bits, including parity, for DES in two-key EDE. */
+    MBEDTLS_KEY_LENGTH_DES_EDE = 128,
+    /** Key length in bits, including parity, for DES in three-key EDE. */
+    MBEDTLS_KEY_LENGTH_DES_EDE3 = 192,
+};
+
+/** Maximum length of any IV, in Bytes. */
+#define MBEDTLS_MAX_IV_LENGTH      16
+/** Maximum block size of any cipher, in Bytes. */
+#define MBEDTLS_MAX_BLOCK_LENGTH   16
+
+/**
+ * Base cipher information (opaque struct).
+ */
+typedef struct mbedtls_cipher_base_t mbedtls_cipher_base_t;
+
+/**
+ * CMAC context (opaque struct).
+ */
+typedef struct mbedtls_cmac_context_t mbedtls_cmac_context_t;
+
+/**
+ * Cipher information. Allows calling cipher functions
+ * in a generic way.
+ */
+typedef struct mbedtls_cipher_info_t
+{
+    /** Full cipher identifier. For example,
+     * MBEDTLS_CIPHER_AES_256_CBC.
+     */
+    mbedtls_cipher_type_t type;
+
+    /** The cipher mode. For example, MBEDTLS_MODE_CBC. */
+    mbedtls_cipher_mode_t mode;
+
+    /** The cipher key length, in bits. This is the
+     * default length for variable sized ciphers.
+     * Includes parity bits for ciphers like DES.
+     */
+    unsigned int key_bitlen;
+
+    /** Name of the cipher. */
+    const char * name;
+
+    /** IV or nonce size, in Bytes.
+     * For ciphers that accept variable IV sizes,
+     * this is the recommended size.
+     */
+    unsigned int iv_size;
+
+    /** Bitflag comprised of MBEDTLS_CIPHER_VARIABLE_IV_LEN and
+     *  MBEDTLS_CIPHER_VARIABLE_KEY_LEN indicating whether the
+     *  cipher supports variable IV or variable key sizes, respectively.
+     */
+    int flags;
+
+    /** The block size, in Bytes. */
+    unsigned int block_size;
+
+    /** Struct for base cipher information and functions. */
+    const mbedtls_cipher_base_t *base;
+
+} mbedtls_cipher_info_t;
+
+/**
+ * Generic cipher context.
+ */
+typedef struct mbedtls_cipher_context_t
+{
+    /** Information about the associated cipher. */
+    const mbedtls_cipher_info_t *cipher_info;
+
+    /** Key length to use. */
+    int key_bitlen;
+
+    /** Operation that the key of the context has been
+     * initialized for.
+     */
+    mbedtls_operation_t operation;
+
+#if defined(MBEDTLS_CIPHER_MODE_WITH_PADDING)
+    /** Padding functions to use, if relevant for
+     * the specific cipher mode.
+     */
+    void (*add_padding)( unsigned char *output, size_t olen, size_t data_len );
+    int (*get_padding)( unsigned char *input, size_t ilen, size_t *data_len );
+#endif
+
+    /** Buffer for input that has not been processed yet. */
+    unsigned char unprocessed_data[MBEDTLS_MAX_BLOCK_LENGTH];
+
+    /** Number of Bytes that have not been processed yet. */
+    size_t unprocessed_len;
+
+    /** Current IV or NONCE_COUNTER for CTR-mode, data unit (or sector) number
+     * for XTS-mode. */
+    unsigned char iv[MBEDTLS_MAX_IV_LENGTH];
+
+    /** IV size in Bytes, for ciphers with variable-length IVs. */
+    size_t iv_size;
+
+    /** The cipher-specific context. */
+    void *cipher_ctx;
+
+#if defined(MBEDTLS_CMAC_C)
+    /** CMAC-specific context. */
+    mbedtls_cmac_context_t *cmac_ctx;
+#endif
+} mbedtls_cipher_context_t;
+
+/**
+ * \brief This function retrieves the list of ciphers supported by the generic
+ * cipher module.
+ *
+ * \return      A statically-allocated array of ciphers. The last entry
+ *              is zero.
+ */
+const int *mbedtls_cipher_list( void );
+
+/**
+ * \brief               This function retrieves the cipher-information
+ *                      structure associated with the given cipher name.
+ *
+ * \param cipher_name   Name of the cipher to search for.
+ *
+ * \return              The cipher information structure associated with the
+ *                      given \p cipher_name.
+ * \return              NULL if the associated cipher information is not found.
+ */
+const mbedtls_cipher_info_t *mbedtls_cipher_info_from_string( const char *cipher_name );
+
+/**
+ * \brief               This function retrieves the cipher-information
+ *                      structure associated with the given cipher type.
+ *
+ * \param cipher_type   Type of the cipher to search for.
+ *
+ * \return              The cipher information structure associated with the
+ *                      given \p cipher_type.
+ * \return              NULL if the associated cipher information is not found.
+ */
+const mbedtls_cipher_info_t *mbedtls_cipher_info_from_type( const mbedtls_cipher_type_t cipher_type );
+
+/**
+ * \brief               This function retrieves the cipher-information
+ *                      structure associated with the given cipher ID,
+ *                      key size and mode.
+ *
+ * \param cipher_id     The ID of the cipher to search for. For example,
+ *                      #MBEDTLS_CIPHER_ID_AES.
+ * \param key_bitlen    The length of the key in bits.
+ * \param mode          The cipher mode. For example, #MBEDTLS_MODE_CBC.
+ *
+ * \return              The cipher information structure associated with the
+ *                      given \p cipher_id.
+ * \return              NULL if the associated cipher information is not found.
+ */
+const mbedtls_cipher_info_t *mbedtls_cipher_info_from_values( const mbedtls_cipher_id_t cipher_id,
+                                              int key_bitlen,
+                                              const mbedtls_cipher_mode_t mode );
+
+/**
+ * \brief               This function initializes a \p cipher_context as NONE.
+ */
+void mbedtls_cipher_init( mbedtls_cipher_context_t *ctx );
+
+/**
+ * \brief               This function frees and clears the cipher-specific
+ *                      context of \p ctx. Freeing \p ctx itself remains the
+ *                      responsibility of the caller.
+ */
+void mbedtls_cipher_free( mbedtls_cipher_context_t *ctx );
+
+
+/**
+ * \brief               This function initializes and fills the cipher-context
+ *                      structure with the appropriate values. It also clears
+ *                      the structure.
+ *
+ * \param ctx           The context to initialize. May not be NULL.
+ * \param cipher_info   The cipher to use.
+ *
+ * \return              \c 0 on success.
+ * \return              #MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA on
+ *                      parameter-verification failure.
+ * \return              #MBEDTLS_ERR_CIPHER_ALLOC_FAILED if allocation of the
+ *                      cipher-specific context fails.
+ *
+ * \internal Currently, the function also clears the structure.
+ * In future versions, the caller will be required to call
+ * mbedtls_cipher_init() on the structure first.
+ */
+int mbedtls_cipher_setup( mbedtls_cipher_context_t *ctx, const mbedtls_cipher_info_t *cipher_info );
+
+/**
+ * \brief        This function returns the block size of the given cipher.
+ *
+ * \param ctx    The context of the cipher. Must be initialized.
+ *
+ * \return       The size of the blocks of the cipher.
+ * \return       0 if \p ctx has not been initialized.
+ */
+static inline unsigned int mbedtls_cipher_get_block_size( const mbedtls_cipher_context_t *ctx )
+{
+    if( NULL == ctx || NULL == ctx->cipher_info )
+        return 0;
+
+    return ctx->cipher_info->block_size;
+}
+
+/**
+ * \brief        This function returns the mode of operation for
+ *               the cipher. For example, MBEDTLS_MODE_CBC.
+ *
+ * \param ctx    The context of the cipher. Must be initialized.
+ *
+ * \return       The mode of operation.
+ * \return       #MBEDTLS_MODE_NONE if \p ctx has not been initialized.
+ */
+static inline mbedtls_cipher_mode_t mbedtls_cipher_get_cipher_mode( const mbedtls_cipher_context_t *ctx )
+{
+    if( NULL == ctx || NULL == ctx->cipher_info )
+        return MBEDTLS_MODE_NONE;
+
+    return ctx->cipher_info->mode;
+}
+
+/**
+ * \brief       This function returns the size of the IV or nonce
+ *              of the cipher, in Bytes.
+ *
+ * \param ctx   The context of the cipher. Must be initialized.
+ *
+ * \return      The recommended IV size if no IV has been set.
+ * \return      \c 0 for ciphers not using an IV or a nonce.
+ * \return      The actual size if an IV has been set.
+ */
+static inline int mbedtls_cipher_get_iv_size( const mbedtls_cipher_context_t *ctx )
+{
+    if( NULL == ctx || NULL == ctx->cipher_info )
+        return 0;
+
+    if( ctx->iv_size != 0 )
+        return (int) ctx->iv_size;
+
+    return (int) ctx->cipher_info->iv_size;
+}
+
+/**
+ * \brief               This function returns the type of the given cipher.
+ *
+ * \param ctx           The context of the cipher. Must be initialized.
+ *
+ * \return              The type of the cipher.
+ * \return              #MBEDTLS_CIPHER_NONE if \p ctx has not been initialized.
+ */
+static inline mbedtls_cipher_type_t mbedtls_cipher_get_type( const mbedtls_cipher_context_t *ctx )
+{
+    if( NULL == ctx || NULL == ctx->cipher_info )
+        return MBEDTLS_CIPHER_NONE;
+
+    return ctx->cipher_info->type;
+}
+
+/**
+ * \brief               This function returns the name of the given cipher
+ *                      as a string.
+ *
+ * \param ctx           The context of the cipher. Must be initialized.
+ *
+ * \return              The name of the cipher.
+ * \return              NULL if \p ctx has not been not initialized.
+ */
+static inline const char *mbedtls_cipher_get_name( const mbedtls_cipher_context_t *ctx )
+{
+    if( NULL == ctx || NULL == ctx->cipher_info )
+        return 0;
+
+    return ctx->cipher_info->name;
+}
+
+/**
+ * \brief               This function returns the key length of the cipher.
+ *
+ * \param ctx           The context of the cipher. Must be initialized.
+ *
+ * \return              The key length of the cipher in bits.
+ * \return              #MBEDTLS_KEY_LENGTH_NONE if ctx \p has not been
+ *                      initialized.
+ */
+static inline int mbedtls_cipher_get_key_bitlen( const mbedtls_cipher_context_t *ctx )
+{
+    if( NULL == ctx || NULL == ctx->cipher_info )
+        return MBEDTLS_KEY_LENGTH_NONE;
+
+    return (int) ctx->cipher_info->key_bitlen;
+}
+
+/**
+ * \brief          This function returns the operation of the given cipher.
+ *
+ * \param ctx      The context of the cipher. Must be initialized.
+ *
+ * \return         The type of operation: #MBEDTLS_ENCRYPT or #MBEDTLS_DECRYPT.
+ * \return         #MBEDTLS_OPERATION_NONE if \p ctx has not been initialized.
+ */
+static inline mbedtls_operation_t mbedtls_cipher_get_operation( const mbedtls_cipher_context_t *ctx )
+{
+    if( NULL == ctx || NULL == ctx->cipher_info )
+        return MBEDTLS_OPERATION_NONE;
+
+    return ctx->operation;
+}
+
+/**
+ * \brief               This function sets the key to use with the given context.
+ *
+ * \param ctx           The generic cipher context. May not be NULL. Must have
+ *                      been initialized using mbedtls_cipher_info_from_type()
+ *                      or mbedtls_cipher_info_from_string().
+ * \param key           The key to use.
+ * \param key_bitlen    The key length to use, in bits.
+ * \param operation     The operation that the key will be used for:
+ *                      #MBEDTLS_ENCRYPT or #MBEDTLS_DECRYPT.
+ *
+ * \return              \c 0 on success.
+ * \return              #MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA on
+ *                      parameter-verification failure.
+ * \return              A cipher-specific error code on failure.
+ */
+int mbedtls_cipher_setkey( mbedtls_cipher_context_t *ctx, const unsigned char *key,
+                   int key_bitlen, const mbedtls_operation_t operation );
+
+#if defined(MBEDTLS_CIPHER_MODE_WITH_PADDING)
+/**
+ * \brief               This function sets the padding mode, for cipher modes
+ *                      that use padding.
+ *
+ *                      The default passing mode is PKCS7 padding.
+ *
+ * \param ctx           The generic cipher context.
+ * \param mode          The padding mode.
+ *
+ * \return              \c 0 on success.
+ * \return              #MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE
+ *                      if the selected padding mode is not supported.
+ * \return              #MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA if the cipher mode
+ *                      does not support padding.
+ */
+int mbedtls_cipher_set_padding_mode( mbedtls_cipher_context_t *ctx, mbedtls_cipher_padding_t mode );
+#endif /* MBEDTLS_CIPHER_MODE_WITH_PADDING */
+
+/**
+ * \brief           This function sets the initialization vector (IV)
+ *                  or nonce.
+ *
+ * \note            Some ciphers do not use IVs nor nonce. For these
+ *                  ciphers, this function has no effect.
+ *
+ * \param ctx       The generic cipher context.
+ * \param iv        The IV to use, or NONCE_COUNTER for CTR-mode ciphers.
+ * \param iv_len    The IV length for ciphers with variable-size IV.
+ *                  This parameter is discarded by ciphers with fixed-size IV.
+ *
+ * \return          \c 0 on success.
+ * \return          #MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA on
+ *                  parameter-verification failure.
+ */
+int mbedtls_cipher_set_iv( mbedtls_cipher_context_t *ctx,
+                   const unsigned char *iv, size_t iv_len );
+
+/**
+ * \brief         This function resets the cipher state.
+ *
+ * \param ctx     The generic cipher context.
+ *
+ * \return        \c 0 on success.
+ * \return        #MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA on
+ *                parameter-verification failure.
+ */
+int mbedtls_cipher_reset( mbedtls_cipher_context_t *ctx );
+
+#if defined(MBEDTLS_GCM_C) || defined(MBEDTLS_CHACHAPOLY_C)
+/**
+ * \brief               This function adds additional data for AEAD ciphers.
+ *                      Currently supported with GCM and ChaCha20+Poly1305.
+ *                      Must be called exactly once, after mbedtls_cipher_reset().
+ *
+ * \param ctx           The generic cipher context.
+ * \param ad            The additional data to use.
+ * \param ad_len        the Length of \p ad.
+ *
+ * \return              \c 0 on success.
+ * \return              A specific error code on failure.
+ */
+int mbedtls_cipher_update_ad( mbedtls_cipher_context_t *ctx,
+                      const unsigned char *ad, size_t ad_len );
+#endif /* MBEDTLS_GCM_C || MBEDTLS_CHACHAPOLY_C */
+
+/**
+ * \brief               The generic cipher update function. It encrypts or
+ *                      decrypts using the given cipher context. Writes as
+ *                      many block-sized blocks of data as possible to output.
+ *                      Any data that cannot be written immediately is either
+ *                      added to the next block, or flushed when
+ *                      mbedtls_cipher_finish() is called.
+ *                      Exception: For MBEDTLS_MODE_ECB, expects a single block
+ *                      in size. For example, 16 Bytes for AES.
+ *
+ * \note                If the underlying cipher is used in GCM mode, all calls
+ *                      to this function, except for the last one before
+ *                      mbedtls_cipher_finish(), must have \p ilen as a
+ *                      multiple of the block size of the cipher.
+ *
+ * \param ctx           The generic cipher context.
+ * \param input         The buffer holding the input data.
+ * \param ilen          The length of the input data.
+ * \param output        The buffer for the output data. Must be able to hold at
+ *                      least \p ilen + block_size. Must not be the same buffer
+ *                      as input.
+ * \param olen          The length of the output data, to be updated with the
+ *                      actual number of Bytes written.
+ *
+ * \return              \c 0 on success.
+ * \return              #MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA on
+ *                      parameter-verification failure.
+ * \return              #MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE on an
+ *                      unsupported mode for a cipher.
+ * \return              A cipher-specific error code on failure.
+ */
+int mbedtls_cipher_update( mbedtls_cipher_context_t *ctx, const unsigned char *input,
+                   size_t ilen, unsigned char *output, size_t *olen );
+
+/**
+ * \brief               The generic cipher finalization function. If data still
+ *                      needs to be flushed from an incomplete block, the data
+ *                      contained in it is padded to the size of
+ *                      the last block, and written to the \p output buffer.
+ *
+ * \param ctx           The generic cipher context.
+ * \param output        The buffer to write data to. Needs block_size available.
+ * \param olen          The length of the data written to the \p output buffer.
+ *
+ * \return              \c 0 on success.
+ * \return              #MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA on
+ *                      parameter-verification failure.
+ * \return              #MBEDTLS_ERR_CIPHER_FULL_BLOCK_EXPECTED on decryption
+ *                      expecting a full block but not receiving one.
+ * \return              #MBEDTLS_ERR_CIPHER_INVALID_PADDING on invalid padding
+ *                      while decrypting.
+ * \return              A cipher-specific error code on failure.
+ */
+int mbedtls_cipher_finish( mbedtls_cipher_context_t *ctx,
+                   unsigned char *output, size_t *olen );
+
+#if defined(MBEDTLS_GCM_C) || defined(MBEDTLS_CHACHAPOLY_C)
+/**
+ * \brief               This function writes a tag for AEAD ciphers.
+ *                      Currently supported with GCM and ChaCha20+Poly1305.
+ *                      Must be called after mbedtls_cipher_finish().
+ *
+ * \param ctx           The generic cipher context.
+ * \param tag           The buffer to write the tag to.
+ * \param tag_len       The length of the tag to write.
+ *
+ * \return              \c 0 on success.
+ * \return              A specific error code on failure.
+ */
+int mbedtls_cipher_write_tag( mbedtls_cipher_context_t *ctx,
+                      unsigned char *tag, size_t tag_len );
+
+/**
+ * \brief               This function checks the tag for AEAD ciphers.
+ *                      Currently supported with GCM and ChaCha20+Poly1305.
+ *                      Must be called after mbedtls_cipher_finish().
+ *
+ * \param ctx           The generic cipher context.
+ * \param tag           The buffer holding the tag.
+ * \param tag_len       The length of the tag to check.
+ *
+ * \return              \c 0 on success.
+ * \return              A specific error code on failure.
+ */
+int mbedtls_cipher_check_tag( mbedtls_cipher_context_t *ctx,
+                      const unsigned char *tag, size_t tag_len );
+#endif /* MBEDTLS_GCM_C || MBEDTLS_CHACHAPOLY_C */
+
+/**
+ * \brief               The generic all-in-one encryption/decryption function,
+ *                      for all ciphers except AEAD constructs.
+ *
+ * \param ctx           The generic cipher context.
+ * \param iv            The IV to use, or NONCE_COUNTER for CTR-mode ciphers.
+ * \param iv_len        The IV length for ciphers with variable-size IV.
+ *                      This parameter is discarded by ciphers with fixed-size
+ *                      IV.
+ * \param input         The buffer holding the input data.
+ * \param ilen          The length of the input data.
+ * \param output        The buffer for the output data. Must be able to hold at
+ *                      least \p ilen + block_size. Must not be the same buffer
+ *                      as input.
+ * \param olen          The length of the output data, to be updated with the
+ *                      actual number of Bytes written.
+ *
+ * \note                Some ciphers do not use IVs nor nonce. For these
+ *                      ciphers, use \p iv = NULL and \p iv_len = 0.
+ *
+ * \return              \c 0 on success.
+ * \return              #MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA on
+ *                      parameter-verification failure.
+ * \return              #MBEDTLS_ERR_CIPHER_FULL_BLOCK_EXPECTED on decryption
+ *                      expecting a full block but not receiving one.
+ * \return              #MBEDTLS_ERR_CIPHER_INVALID_PADDING on invalid padding
+ *                      while decrypting.
+ * \return              A cipher-specific error code on failure.
+ */
+int mbedtls_cipher_crypt( mbedtls_cipher_context_t *ctx,
+                  const unsigned char *iv, size_t iv_len,
+                  const unsigned char *input, size_t ilen,
+                  unsigned char *output, size_t *olen );
+
+#if defined(MBEDTLS_CIPHER_MODE_AEAD)
+/**
+ * \brief               The generic autenticated encryption (AEAD) function.
+ *
+ * \param ctx           The generic cipher context.
+ * \param iv            The IV to use, or NONCE_COUNTER for CTR-mode ciphers.
+ * \param iv_len        The IV length for ciphers with variable-size IV.
+ *                      This parameter is discarded by ciphers with fixed-size IV.
+ * \param ad            The additional data to authenticate.
+ * \param ad_len        The length of \p ad.
+ * \param input         The buffer holding the input data.
+ * \param ilen          The length of the input data.
+ * \param output        The buffer for the output data.
+ *                      Must be able to hold at least \p ilen.
+ * \param olen          The length of the output data, to be updated with the
+ *                      actual number of Bytes written.
+ * \param tag           The buffer for the authentication tag.
+ * \param tag_len       The desired length of the authentication tag.
+ *
+ * \return              \c 0 on success.
+ * \return              #MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA on
+ *                      parameter-verification failure.
+ * \return              A cipher-specific error code on failure.
+ */
+int mbedtls_cipher_auth_encrypt( mbedtls_cipher_context_t *ctx,
+                         const unsigned char *iv, size_t iv_len,
+                         const unsigned char *ad, size_t ad_len,
+                         const unsigned char *input, size_t ilen,
+                         unsigned char *output, size_t *olen,
+                         unsigned char *tag, size_t tag_len );
+
+/**
+ * \brief               The generic autenticated decryption (AEAD) function.
+ *
+ * \note                If the data is not authentic, then the output buffer
+ *                      is zeroed out to prevent the unauthentic plaintext being
+ *                      used, making this interface safer.
+ *
+ * \param ctx           The generic cipher context.
+ * \param iv            The IV to use, or NONCE_COUNTER for CTR-mode ciphers.
+ * \param iv_len        The IV length for ciphers with variable-size IV.
+ *                      This parameter is discarded by ciphers with fixed-size IV.
+ * \param ad            The additional data to be authenticated.
+ * \param ad_len        The length of \p ad.
+ * \param input         The buffer holding the input data.
+ * \param ilen          The length of the input data.
+ * \param output        The buffer for the output data.
+ *                      Must be able to hold at least \p ilen.
+ * \param olen          The length of the output data, to be updated with the
+ *                      actual number of Bytes written.
+ * \param tag           The buffer holding the authentication tag.
+ * \param tag_len       The length of the authentication tag.
+ *
+ * \return              \c 0 on success.
+ * \return              #MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA on
+ *                      parameter-verification failure.
+ * \return              #MBEDTLS_ERR_CIPHER_AUTH_FAILED if data is not authentic.
+ * \return              A cipher-specific error code on failure.
+ */
+int mbedtls_cipher_auth_decrypt( mbedtls_cipher_context_t *ctx,
+                         const unsigned char *iv, size_t iv_len,
+                         const unsigned char *ad, size_t ad_len,
+                         const unsigned char *input, size_t ilen,
+                         unsigned char *output, size_t *olen,
+                         const unsigned char *tag, size_t tag_len );
+#endif /* MBEDTLS_CIPHER_MODE_AEAD */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* MBEDTLS_CIPHER_H */
diff --git a/common/mbedtls/cipher_internal.h b/common/mbedtls/cipher_internal.h
new file mode 100644
index 000000000..9f2858aae
--- /dev/null
+++ b/common/mbedtls/cipher_internal.h
@@ -0,0 +1,127 @@
+/**
+ * \file cipher_internal.h
+ *
+ * \brief Cipher wrappers.
+ *
+ * \author Adriaan de Jong <dejong@fox-it.com>
+ */
+/*
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+#ifndef MBEDTLS_CIPHER_WRAP_H
+#define MBEDTLS_CIPHER_WRAP_H
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#include "cipher.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * Base cipher information. The non-mode specific functions and values.
+ */
+struct mbedtls_cipher_base_t
+{
+    /** Base Cipher type (e.g. MBEDTLS_CIPHER_ID_AES) */
+    mbedtls_cipher_id_t cipher;
+
+    /** Encrypt using ECB */
+    int (*ecb_func)( void *ctx, mbedtls_operation_t mode,
+                     const unsigned char *input, unsigned char *output );
+
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+    /** Encrypt using CBC */
+    int (*cbc_func)( void *ctx, mbedtls_operation_t mode, size_t length,
+                     unsigned char *iv, const unsigned char *input,
+                     unsigned char *output );
+#endif
+
+#if defined(MBEDTLS_CIPHER_MODE_CFB)
+    /** Encrypt using CFB (Full length) */
+    int (*cfb_func)( void *ctx, mbedtls_operation_t mode, size_t length, size_t *iv_off,
+                     unsigned char *iv, const unsigned char *input,
+                     unsigned char *output );
+#endif
+
+#if defined(MBEDTLS_CIPHER_MODE_OFB)
+    /** Encrypt using OFB (Full length) */
+    int (*ofb_func)( void *ctx, size_t length, size_t *iv_off,
+                     unsigned char *iv,
+                     const unsigned char *input,
+                     unsigned char *output );
+#endif
+
+#if defined(MBEDTLS_CIPHER_MODE_CTR)
+    /** Encrypt using CTR */
+    int (*ctr_func)( void *ctx, size_t length, size_t *nc_off,
+                     unsigned char *nonce_counter, unsigned char *stream_block,
+                     const unsigned char *input, unsigned char *output );
+#endif
+
+#if defined(MBEDTLS_CIPHER_MODE_XTS)
+    /** Encrypt or decrypt using XTS. */
+    int (*xts_func)( void *ctx, mbedtls_operation_t mode, size_t length,
+                     const unsigned char data_unit[16],
+                     const unsigned char *input, unsigned char *output );
+#endif
+
+#if defined(MBEDTLS_CIPHER_MODE_STREAM)
+    /** Encrypt using STREAM */
+    int (*stream_func)( void *ctx, size_t length,
+                        const unsigned char *input, unsigned char *output );
+#endif
+
+    /** Set key for encryption purposes */
+    int (*setkey_enc_func)( void *ctx, const unsigned char *key,
+                            unsigned int key_bitlen );
+
+    /** Set key for decryption purposes */
+    int (*setkey_dec_func)( void *ctx, const unsigned char *key,
+                            unsigned int key_bitlen);
+
+    /** Allocate a new context */
+    void * (*ctx_alloc_func)( void );
+
+    /** Free the given context */
+    void (*ctx_free_func)( void *ctx );
+
+};
+
+typedef struct
+{
+    mbedtls_cipher_type_t type;
+    const mbedtls_cipher_info_t *info;
+} mbedtls_cipher_definition_t;
+
+extern const mbedtls_cipher_definition_t mbedtls_cipher_definitions[];
+
+extern int mbedtls_cipher_supported[];
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* MBEDTLS_CIPHER_WRAP_H */
diff --git a/common/mbedtls/cipher_wrap.c b/common/mbedtls/cipher_wrap.c
new file mode 100644
index 000000000..3f81729cc
--- /dev/null
+++ b/common/mbedtls/cipher_wrap.c
@@ -0,0 +1,2274 @@
+/**
+ * \file cipher_wrap.c
+ *
+ * \brief Generic cipher wrapper for mbed TLS
+ *
+ * \author Adriaan de Jong <dejong@fox-it.com>
+ *
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "mbedtls/config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#if defined(MBEDTLS_CIPHER_C)
+
+#include "mbedtls/cipher_internal.h"
+
+#if defined(MBEDTLS_CHACHAPOLY_C)
+#include "mbedtls/chachapoly.h"
+#endif
+
+#if defined(MBEDTLS_AES_C)
+#include "mbedtls/aes.h"
+#endif
+
+#if defined(MBEDTLS_ARC4_C)
+#include "mbedtls/arc4.h"
+#endif
+
+#if defined(MBEDTLS_CAMELLIA_C)
+#include "mbedtls/camellia.h"
+#endif
+
+#if defined(MBEDTLS_ARIA_C)
+#include "mbedtls/aria.h"
+#endif
+
+#if defined(MBEDTLS_DES_C)
+#include "mbedtls/des.h"
+#endif
+
+#if defined(MBEDTLS_BLOWFISH_C)
+#include "mbedtls/blowfish.h"
+#endif
+
+#if defined(MBEDTLS_CHACHA20_C)
+#include "mbedtls/chacha20.h"
+#endif
+
+#if defined(MBEDTLS_GCM_C)
+#include "mbedtls/gcm.h"
+#endif
+
+#if defined(MBEDTLS_CCM_C)
+#include "mbedtls/ccm.h"
+#endif
+
+#if defined(MBEDTLS_CIPHER_NULL_CIPHER)
+#include <string.h>
+#endif
+
+#if defined(MBEDTLS_PLATFORM_C)
+#include "mbedtls/platform.h"
+#else
+#include <stdlib.h>
+#define mbedtls_calloc    calloc
+#define mbedtls_free       free
+#endif
+
+#if defined(MBEDTLS_GCM_C)
+/* shared by all GCM ciphers */
+static void *gcm_ctx_alloc( void )
+{
+    void *ctx = mbedtls_calloc( 1, sizeof( mbedtls_gcm_context ) );
+
+    if( ctx != NULL )
+        mbedtls_gcm_init( (mbedtls_gcm_context *) ctx );
+
+    return( ctx );
+}
+
+static void gcm_ctx_free( void *ctx )
+{
+    mbedtls_gcm_free( ctx );
+    mbedtls_free( ctx );
+}
+#endif /* MBEDTLS_GCM_C */
+
+#if defined(MBEDTLS_CCM_C)
+/* shared by all CCM ciphers */
+static void *ccm_ctx_alloc( void )
+{
+    void *ctx = mbedtls_calloc( 1, sizeof( mbedtls_ccm_context ) );
+
+    if( ctx != NULL )
+        mbedtls_ccm_init( (mbedtls_ccm_context *) ctx );
+
+    return( ctx );
+}
+
+static void ccm_ctx_free( void *ctx )
+{
+    mbedtls_ccm_free( ctx );
+    mbedtls_free( ctx );
+}
+#endif /* MBEDTLS_CCM_C */
+
+#if defined(MBEDTLS_AES_C)
+
+static int aes_crypt_ecb_wrap( void *ctx, mbedtls_operation_t operation,
+        const unsigned char *input, unsigned char *output )
+{
+    return mbedtls_aes_crypt_ecb( (mbedtls_aes_context *) ctx, operation, input, output );
+}
+
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+static int aes_crypt_cbc_wrap( void *ctx, mbedtls_operation_t operation, size_t length,
+        unsigned char *iv, const unsigned char *input, unsigned char *output )
+{
+    return mbedtls_aes_crypt_cbc( (mbedtls_aes_context *) ctx, operation, length, iv, input,
+                          output );
+}
+#endif /* MBEDTLS_CIPHER_MODE_CBC */
+
+#if defined(MBEDTLS_CIPHER_MODE_CFB)
+static int aes_crypt_cfb128_wrap( void *ctx, mbedtls_operation_t operation,
+        size_t length, size_t *iv_off, unsigned char *iv,
+        const unsigned char *input, unsigned char *output )
+{
+    return mbedtls_aes_crypt_cfb128( (mbedtls_aes_context *) ctx, operation, length, iv_off, iv,
+                             input, output );
+}
+#endif /* MBEDTLS_CIPHER_MODE_CFB */
+
+#if defined(MBEDTLS_CIPHER_MODE_OFB)
+static int aes_crypt_ofb_wrap( void *ctx, size_t length, size_t *iv_off,
+        unsigned char *iv, const unsigned char *input, unsigned char *output )
+{
+    return mbedtls_aes_crypt_ofb( (mbedtls_aes_context *) ctx, length, iv_off,
+                                    iv, input, output );
+}
+#endif /* MBEDTLS_CIPHER_MODE_OFB */
+
+#if defined(MBEDTLS_CIPHER_MODE_CTR)
+static int aes_crypt_ctr_wrap( void *ctx, size_t length, size_t *nc_off,
+        unsigned char *nonce_counter, unsigned char *stream_block,
+        const unsigned char *input, unsigned char *output )
+{
+    return mbedtls_aes_crypt_ctr( (mbedtls_aes_context *) ctx, length, nc_off, nonce_counter,
+                          stream_block, input, output );
+}
+#endif /* MBEDTLS_CIPHER_MODE_CTR */
+
+#if defined(MBEDTLS_CIPHER_MODE_XTS)
+static int aes_crypt_xts_wrap( void *ctx, mbedtls_operation_t operation,
+                               size_t length,
+                               const unsigned char data_unit[16],
+                               const unsigned char *input,
+                               unsigned char *output )
+{
+    mbedtls_aes_xts_context *xts_ctx = ctx;
+    int mode;
+
+    switch( operation )
+    {
+        case MBEDTLS_ENCRYPT:
+            mode = MBEDTLS_AES_ENCRYPT;
+            break;
+        case MBEDTLS_DECRYPT:
+            mode = MBEDTLS_AES_DECRYPT;
+            break;
+        default:
+            return MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA;
+    }
+
+    return mbedtls_aes_crypt_xts( xts_ctx, mode, length,
+                                  data_unit, input, output );
+}
+#endif /* MBEDTLS_CIPHER_MODE_XTS */
+
+static int aes_setkey_dec_wrap( void *ctx, const unsigned char *key,
+                                unsigned int key_bitlen )
+{
+    return mbedtls_aes_setkey_dec( (mbedtls_aes_context *) ctx, key, key_bitlen );
+}
+
+static int aes_setkey_enc_wrap( void *ctx, const unsigned char *key,
+                                unsigned int key_bitlen )
+{
+    return mbedtls_aes_setkey_enc( (mbedtls_aes_context *) ctx, key, key_bitlen );
+}
+
+static void * aes_ctx_alloc( void )
+{
+    mbedtls_aes_context *aes = mbedtls_calloc( 1, sizeof( mbedtls_aes_context ) );
+
+    if( aes == NULL )
+        return( NULL );
+
+    mbedtls_aes_init( aes );
+
+    return( aes );
+}
+
+static void aes_ctx_free( void *ctx )
+{
+    mbedtls_aes_free( (mbedtls_aes_context *) ctx );
+    mbedtls_free( ctx );
+}
+
+static const mbedtls_cipher_base_t aes_info = {
+    MBEDTLS_CIPHER_ID_AES,
+    aes_crypt_ecb_wrap,
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+    aes_crypt_cbc_wrap,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_CFB)
+    aes_crypt_cfb128_wrap,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_OFB)
+    aes_crypt_ofb_wrap,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_CTR)
+    aes_crypt_ctr_wrap,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_XTS)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_STREAM)
+    NULL,
+#endif
+    aes_setkey_enc_wrap,
+    aes_setkey_dec_wrap,
+    aes_ctx_alloc,
+    aes_ctx_free
+};
+
+static const mbedtls_cipher_info_t aes_128_ecb_info = {
+    MBEDTLS_CIPHER_AES_128_ECB,
+    MBEDTLS_MODE_ECB,
+    128,
+    "AES-128-ECB",
+    16,
+    0,
+    16,
+    &aes_info
+};
+
+static const mbedtls_cipher_info_t aes_192_ecb_info = {
+    MBEDTLS_CIPHER_AES_192_ECB,
+    MBEDTLS_MODE_ECB,
+    192,
+    "AES-192-ECB",
+    16,
+    0,
+    16,
+    &aes_info
+};
+
+static const mbedtls_cipher_info_t aes_256_ecb_info = {
+    MBEDTLS_CIPHER_AES_256_ECB,
+    MBEDTLS_MODE_ECB,
+    256,
+    "AES-256-ECB",
+    16,
+    0,
+    16,
+    &aes_info
+};
+
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+static const mbedtls_cipher_info_t aes_128_cbc_info = {
+    MBEDTLS_CIPHER_AES_128_CBC,
+    MBEDTLS_MODE_CBC,
+    128,
+    "AES-128-CBC",
+    16,
+    0,
+    16,
+    &aes_info
+};
+
+static const mbedtls_cipher_info_t aes_192_cbc_info = {
+    MBEDTLS_CIPHER_AES_192_CBC,
+    MBEDTLS_MODE_CBC,
+    192,
+    "AES-192-CBC",
+    16,
+    0,
+    16,
+    &aes_info
+};
+
+static const mbedtls_cipher_info_t aes_256_cbc_info = {
+    MBEDTLS_CIPHER_AES_256_CBC,
+    MBEDTLS_MODE_CBC,
+    256,
+    "AES-256-CBC",
+    16,
+    0,
+    16,
+    &aes_info
+};
+#endif /* MBEDTLS_CIPHER_MODE_CBC */
+
+#if defined(MBEDTLS_CIPHER_MODE_CFB)
+static const mbedtls_cipher_info_t aes_128_cfb128_info = {
+    MBEDTLS_CIPHER_AES_128_CFB128,
+    MBEDTLS_MODE_CFB,
+    128,
+    "AES-128-CFB128",
+    16,
+    0,
+    16,
+    &aes_info
+};
+
+static const mbedtls_cipher_info_t aes_192_cfb128_info = {
+    MBEDTLS_CIPHER_AES_192_CFB128,
+    MBEDTLS_MODE_CFB,
+    192,
+    "AES-192-CFB128",
+    16,
+    0,
+    16,
+    &aes_info
+};
+
+static const mbedtls_cipher_info_t aes_256_cfb128_info = {
+    MBEDTLS_CIPHER_AES_256_CFB128,
+    MBEDTLS_MODE_CFB,
+    256,
+    "AES-256-CFB128",
+    16,
+    0,
+    16,
+    &aes_info
+};
+#endif /* MBEDTLS_CIPHER_MODE_CFB */
+
+#if defined(MBEDTLS_CIPHER_MODE_OFB)
+static const mbedtls_cipher_info_t aes_128_ofb_info = {
+    MBEDTLS_CIPHER_AES_128_OFB,
+    MBEDTLS_MODE_OFB,
+    128,
+    "AES-128-OFB",
+    16,
+    0,
+    16,
+    &aes_info
+};
+
+static const mbedtls_cipher_info_t aes_192_ofb_info = {
+    MBEDTLS_CIPHER_AES_192_OFB,
+    MBEDTLS_MODE_OFB,
+    192,
+    "AES-192-OFB",
+    16,
+    0,
+    16,
+    &aes_info
+};
+
+static const mbedtls_cipher_info_t aes_256_ofb_info = {
+    MBEDTLS_CIPHER_AES_256_OFB,
+    MBEDTLS_MODE_OFB,
+    256,
+    "AES-256-OFB",
+    16,
+    0,
+    16,
+    &aes_info
+};
+#endif /* MBEDTLS_CIPHER_MODE_OFB */
+
+#if defined(MBEDTLS_CIPHER_MODE_CTR)
+static const mbedtls_cipher_info_t aes_128_ctr_info = {
+    MBEDTLS_CIPHER_AES_128_CTR,
+    MBEDTLS_MODE_CTR,
+    128,
+    "AES-128-CTR",
+    16,
+    0,
+    16,
+    &aes_info
+};
+
+static const mbedtls_cipher_info_t aes_192_ctr_info = {
+    MBEDTLS_CIPHER_AES_192_CTR,
+    MBEDTLS_MODE_CTR,
+    192,
+    "AES-192-CTR",
+    16,
+    0,
+    16,
+    &aes_info
+};
+
+static const mbedtls_cipher_info_t aes_256_ctr_info = {
+    MBEDTLS_CIPHER_AES_256_CTR,
+    MBEDTLS_MODE_CTR,
+    256,
+    "AES-256-CTR",
+    16,
+    0,
+    16,
+    &aes_info
+};
+#endif /* MBEDTLS_CIPHER_MODE_CTR */
+
+#if defined(MBEDTLS_CIPHER_MODE_XTS)
+static int xts_aes_setkey_enc_wrap( void *ctx, const unsigned char *key,
+                                    unsigned int key_bitlen )
+{
+    mbedtls_aes_xts_context *xts_ctx = ctx;
+    return( mbedtls_aes_xts_setkey_enc( xts_ctx, key, key_bitlen ) );
+}
+
+static int xts_aes_setkey_dec_wrap( void *ctx, const unsigned char *key,
+                                    unsigned int key_bitlen )
+{
+    mbedtls_aes_xts_context *xts_ctx = ctx;
+    return( mbedtls_aes_xts_setkey_dec( xts_ctx, key, key_bitlen ) );
+}
+
+static void *xts_aes_ctx_alloc( void )
+{
+    mbedtls_aes_xts_context *xts_ctx = mbedtls_calloc( 1, sizeof( *xts_ctx ) );
+
+    if( xts_ctx != NULL )
+        mbedtls_aes_xts_init( xts_ctx );
+
+    return( xts_ctx );
+}
+
+static void xts_aes_ctx_free( void *ctx )
+{
+    mbedtls_aes_xts_context *xts_ctx = ctx;
+
+    if( xts_ctx == NULL )
+        return;
+
+    mbedtls_aes_xts_free( xts_ctx );
+    mbedtls_free( xts_ctx );
+}
+
+static const mbedtls_cipher_base_t xts_aes_info = {
+    MBEDTLS_CIPHER_ID_AES,
+    NULL,
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_CFB)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_OFB)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_CTR)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_XTS)
+    aes_crypt_xts_wrap,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_STREAM)
+    NULL,
+#endif
+    xts_aes_setkey_enc_wrap,
+    xts_aes_setkey_dec_wrap,
+    xts_aes_ctx_alloc,
+    xts_aes_ctx_free
+};
+
+static const mbedtls_cipher_info_t aes_128_xts_info = {
+    MBEDTLS_CIPHER_AES_128_XTS,
+    MBEDTLS_MODE_XTS,
+    256,
+    "AES-128-XTS",
+    16,
+    0,
+    16,
+    &xts_aes_info
+};
+
+static const mbedtls_cipher_info_t aes_256_xts_info = {
+    MBEDTLS_CIPHER_AES_256_XTS,
+    MBEDTLS_MODE_XTS,
+    512,
+    "AES-256-XTS",
+    16,
+    0,
+    16,
+    &xts_aes_info
+};
+#endif /* MBEDTLS_CIPHER_MODE_XTS */
+
+#if defined(MBEDTLS_GCM_C)
+static int gcm_aes_setkey_wrap( void *ctx, const unsigned char *key,
+                                unsigned int key_bitlen )
+{
+    return mbedtls_gcm_setkey( (mbedtls_gcm_context *) ctx, MBEDTLS_CIPHER_ID_AES,
+                     key, key_bitlen );
+}
+
+static const mbedtls_cipher_base_t gcm_aes_info = {
+    MBEDTLS_CIPHER_ID_AES,
+    NULL,
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_CFB)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_OFB)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_CTR)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_XTS)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_STREAM)
+    NULL,
+#endif
+    gcm_aes_setkey_wrap,
+    gcm_aes_setkey_wrap,
+    gcm_ctx_alloc,
+    gcm_ctx_free,
+};
+
+static const mbedtls_cipher_info_t aes_128_gcm_info = {
+    MBEDTLS_CIPHER_AES_128_GCM,
+    MBEDTLS_MODE_GCM,
+    128,
+    "AES-128-GCM",
+    12,
+    MBEDTLS_CIPHER_VARIABLE_IV_LEN,
+    16,
+    &gcm_aes_info
+};
+
+static const mbedtls_cipher_info_t aes_192_gcm_info = {
+    MBEDTLS_CIPHER_AES_192_GCM,
+    MBEDTLS_MODE_GCM,
+    192,
+    "AES-192-GCM",
+    12,
+    MBEDTLS_CIPHER_VARIABLE_IV_LEN,
+    16,
+    &gcm_aes_info
+};
+
+static const mbedtls_cipher_info_t aes_256_gcm_info = {
+    MBEDTLS_CIPHER_AES_256_GCM,
+    MBEDTLS_MODE_GCM,
+    256,
+    "AES-256-GCM",
+    12,
+    MBEDTLS_CIPHER_VARIABLE_IV_LEN,
+    16,
+    &gcm_aes_info
+};
+#endif /* MBEDTLS_GCM_C */
+
+#if defined(MBEDTLS_CCM_C)
+static int ccm_aes_setkey_wrap( void *ctx, const unsigned char *key,
+                                unsigned int key_bitlen )
+{
+    return mbedtls_ccm_setkey( (mbedtls_ccm_context *) ctx, MBEDTLS_CIPHER_ID_AES,
+                     key, key_bitlen );
+}
+
+static const mbedtls_cipher_base_t ccm_aes_info = {
+    MBEDTLS_CIPHER_ID_AES,
+    NULL,
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_CFB)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_OFB)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_CTR)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_XTS)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_STREAM)
+    NULL,
+#endif
+    ccm_aes_setkey_wrap,
+    ccm_aes_setkey_wrap,
+    ccm_ctx_alloc,
+    ccm_ctx_free,
+};
+
+static const mbedtls_cipher_info_t aes_128_ccm_info = {
+    MBEDTLS_CIPHER_AES_128_CCM,
+    MBEDTLS_MODE_CCM,
+    128,
+    "AES-128-CCM",
+    12,
+    MBEDTLS_CIPHER_VARIABLE_IV_LEN,
+    16,
+    &ccm_aes_info
+};
+
+static const mbedtls_cipher_info_t aes_192_ccm_info = {
+    MBEDTLS_CIPHER_AES_192_CCM,
+    MBEDTLS_MODE_CCM,
+    192,
+    "AES-192-CCM",
+    12,
+    MBEDTLS_CIPHER_VARIABLE_IV_LEN,
+    16,
+    &ccm_aes_info
+};
+
+static const mbedtls_cipher_info_t aes_256_ccm_info = {
+    MBEDTLS_CIPHER_AES_256_CCM,
+    MBEDTLS_MODE_CCM,
+    256,
+    "AES-256-CCM",
+    12,
+    MBEDTLS_CIPHER_VARIABLE_IV_LEN,
+    16,
+    &ccm_aes_info
+};
+#endif /* MBEDTLS_CCM_C */
+
+#endif /* MBEDTLS_AES_C */
+
+#if defined(MBEDTLS_CAMELLIA_C)
+
+static int camellia_crypt_ecb_wrap( void *ctx, mbedtls_operation_t operation,
+        const unsigned char *input, unsigned char *output )
+{
+    return mbedtls_camellia_crypt_ecb( (mbedtls_camellia_context *) ctx, operation, input,
+                               output );
+}
+
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+static int camellia_crypt_cbc_wrap( void *ctx, mbedtls_operation_t operation,
+        size_t length, unsigned char *iv,
+        const unsigned char *input, unsigned char *output )
+{
+    return mbedtls_camellia_crypt_cbc( (mbedtls_camellia_context *) ctx, operation, length, iv,
+                               input, output );
+}
+#endif /* MBEDTLS_CIPHER_MODE_CBC */
+
+#if defined(MBEDTLS_CIPHER_MODE_CFB)
+static int camellia_crypt_cfb128_wrap( void *ctx, mbedtls_operation_t operation,
+        size_t length, size_t *iv_off, unsigned char *iv,
+        const unsigned char *input, unsigned char *output )
+{
+    return mbedtls_camellia_crypt_cfb128( (mbedtls_camellia_context *) ctx, operation, length,
+                                  iv_off, iv, input, output );
+}
+#endif /* MBEDTLS_CIPHER_MODE_CFB */
+
+#if defined(MBEDTLS_CIPHER_MODE_CTR)
+static int camellia_crypt_ctr_wrap( void *ctx, size_t length, size_t *nc_off,
+        unsigned char *nonce_counter, unsigned char *stream_block,
+        const unsigned char *input, unsigned char *output )
+{
+    return mbedtls_camellia_crypt_ctr( (mbedtls_camellia_context *) ctx, length, nc_off,
+                               nonce_counter, stream_block, input, output );
+}
+#endif /* MBEDTLS_CIPHER_MODE_CTR */
+
+static int camellia_setkey_dec_wrap( void *ctx, const unsigned char *key,
+                                     unsigned int key_bitlen )
+{
+    return mbedtls_camellia_setkey_dec( (mbedtls_camellia_context *) ctx, key, key_bitlen );
+}
+
+static int camellia_setkey_enc_wrap( void *ctx, const unsigned char *key,
+                                     unsigned int key_bitlen )
+{
+    return mbedtls_camellia_setkey_enc( (mbedtls_camellia_context *) ctx, key, key_bitlen );
+}
+
+static void * camellia_ctx_alloc( void )
+{
+    mbedtls_camellia_context *ctx;
+    ctx = mbedtls_calloc( 1, sizeof( mbedtls_camellia_context ) );
+
+    if( ctx == NULL )
+        return( NULL );
+
+    mbedtls_camellia_init( ctx );
+
+    return( ctx );
+}
+
+static void camellia_ctx_free( void *ctx )
+{
+    mbedtls_camellia_free( (mbedtls_camellia_context *) ctx );
+    mbedtls_free( ctx );
+}
+
+static const mbedtls_cipher_base_t camellia_info = {
+    MBEDTLS_CIPHER_ID_CAMELLIA,
+    camellia_crypt_ecb_wrap,
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+    camellia_crypt_cbc_wrap,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_CFB)
+    camellia_crypt_cfb128_wrap,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_OFB)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_CTR)
+    camellia_crypt_ctr_wrap,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_XTS)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_STREAM)
+    NULL,
+#endif
+    camellia_setkey_enc_wrap,
+    camellia_setkey_dec_wrap,
+    camellia_ctx_alloc,
+    camellia_ctx_free
+};
+
+static const mbedtls_cipher_info_t camellia_128_ecb_info = {
+    MBEDTLS_CIPHER_CAMELLIA_128_ECB,
+    MBEDTLS_MODE_ECB,
+    128,
+    "CAMELLIA-128-ECB",
+    16,
+    0,
+    16,
+    &camellia_info
+};
+
+static const mbedtls_cipher_info_t camellia_192_ecb_info = {
+    MBEDTLS_CIPHER_CAMELLIA_192_ECB,
+    MBEDTLS_MODE_ECB,
+    192,
+    "CAMELLIA-192-ECB",
+    16,
+    0,
+    16,
+    &camellia_info
+};
+
+static const mbedtls_cipher_info_t camellia_256_ecb_info = {
+    MBEDTLS_CIPHER_CAMELLIA_256_ECB,
+    MBEDTLS_MODE_ECB,
+    256,
+    "CAMELLIA-256-ECB",
+    16,
+    0,
+    16,
+    &camellia_info
+};
+
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+static const mbedtls_cipher_info_t camellia_128_cbc_info = {
+    MBEDTLS_CIPHER_CAMELLIA_128_CBC,
+    MBEDTLS_MODE_CBC,
+    128,
+    "CAMELLIA-128-CBC",
+    16,
+    0,
+    16,
+    &camellia_info
+};
+
+static const mbedtls_cipher_info_t camellia_192_cbc_info = {
+    MBEDTLS_CIPHER_CAMELLIA_192_CBC,
+    MBEDTLS_MODE_CBC,
+    192,
+    "CAMELLIA-192-CBC",
+    16,
+    0,
+    16,
+    &camellia_info
+};
+
+static const mbedtls_cipher_info_t camellia_256_cbc_info = {
+    MBEDTLS_CIPHER_CAMELLIA_256_CBC,
+    MBEDTLS_MODE_CBC,
+    256,
+    "CAMELLIA-256-CBC",
+    16,
+    0,
+    16,
+    &camellia_info
+};
+#endif /* MBEDTLS_CIPHER_MODE_CBC */
+
+#if defined(MBEDTLS_CIPHER_MODE_CFB)
+static const mbedtls_cipher_info_t camellia_128_cfb128_info = {
+    MBEDTLS_CIPHER_CAMELLIA_128_CFB128,
+    MBEDTLS_MODE_CFB,
+    128,
+    "CAMELLIA-128-CFB128",
+    16,
+    0,
+    16,
+    &camellia_info
+};
+
+static const mbedtls_cipher_info_t camellia_192_cfb128_info = {
+    MBEDTLS_CIPHER_CAMELLIA_192_CFB128,
+    MBEDTLS_MODE_CFB,
+    192,
+    "CAMELLIA-192-CFB128",
+    16,
+    0,
+    16,
+    &camellia_info
+};
+
+static const mbedtls_cipher_info_t camellia_256_cfb128_info = {
+    MBEDTLS_CIPHER_CAMELLIA_256_CFB128,
+    MBEDTLS_MODE_CFB,
+    256,
+    "CAMELLIA-256-CFB128",
+    16,
+    0,
+    16,
+    &camellia_info
+};
+#endif /* MBEDTLS_CIPHER_MODE_CFB */
+
+#if defined(MBEDTLS_CIPHER_MODE_CTR)
+static const mbedtls_cipher_info_t camellia_128_ctr_info = {
+    MBEDTLS_CIPHER_CAMELLIA_128_CTR,
+    MBEDTLS_MODE_CTR,
+    128,
+    "CAMELLIA-128-CTR",
+    16,
+    0,
+    16,
+    &camellia_info
+};
+
+static const mbedtls_cipher_info_t camellia_192_ctr_info = {
+    MBEDTLS_CIPHER_CAMELLIA_192_CTR,
+    MBEDTLS_MODE_CTR,
+    192,
+    "CAMELLIA-192-CTR",
+    16,
+    0,
+    16,
+    &camellia_info
+};
+
+static const mbedtls_cipher_info_t camellia_256_ctr_info = {
+    MBEDTLS_CIPHER_CAMELLIA_256_CTR,
+    MBEDTLS_MODE_CTR,
+    256,
+    "CAMELLIA-256-CTR",
+    16,
+    0,
+    16,
+    &camellia_info
+};
+#endif /* MBEDTLS_CIPHER_MODE_CTR */
+
+#if defined(MBEDTLS_GCM_C)
+static int gcm_camellia_setkey_wrap( void *ctx, const unsigned char *key,
+                                     unsigned int key_bitlen )
+{
+    return mbedtls_gcm_setkey( (mbedtls_gcm_context *) ctx, MBEDTLS_CIPHER_ID_CAMELLIA,
+                     key, key_bitlen );
+}
+
+static const mbedtls_cipher_base_t gcm_camellia_info = {
+    MBEDTLS_CIPHER_ID_CAMELLIA,
+    NULL,
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_CFB)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_OFB)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_CTR)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_XTS)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_STREAM)
+    NULL,
+#endif
+    gcm_camellia_setkey_wrap,
+    gcm_camellia_setkey_wrap,
+    gcm_ctx_alloc,
+    gcm_ctx_free,
+};
+
+static const mbedtls_cipher_info_t camellia_128_gcm_info = {
+    MBEDTLS_CIPHER_CAMELLIA_128_GCM,
+    MBEDTLS_MODE_GCM,
+    128,
+    "CAMELLIA-128-GCM",
+    12,
+    MBEDTLS_CIPHER_VARIABLE_IV_LEN,
+    16,
+    &gcm_camellia_info
+};
+
+static const mbedtls_cipher_info_t camellia_192_gcm_info = {
+    MBEDTLS_CIPHER_CAMELLIA_192_GCM,
+    MBEDTLS_MODE_GCM,
+    192,
+    "CAMELLIA-192-GCM",
+    12,
+    MBEDTLS_CIPHER_VARIABLE_IV_LEN,
+    16,
+    &gcm_camellia_info
+};
+
+static const mbedtls_cipher_info_t camellia_256_gcm_info = {
+    MBEDTLS_CIPHER_CAMELLIA_256_GCM,
+    MBEDTLS_MODE_GCM,
+    256,
+    "CAMELLIA-256-GCM",
+    12,
+    MBEDTLS_CIPHER_VARIABLE_IV_LEN,
+    16,
+    &gcm_camellia_info
+};
+#endif /* MBEDTLS_GCM_C */
+
+#if defined(MBEDTLS_CCM_C)
+static int ccm_camellia_setkey_wrap( void *ctx, const unsigned char *key,
+                                     unsigned int key_bitlen )
+{
+    return mbedtls_ccm_setkey( (mbedtls_ccm_context *) ctx, MBEDTLS_CIPHER_ID_CAMELLIA,
+                     key, key_bitlen );
+}
+
+static const mbedtls_cipher_base_t ccm_camellia_info = {
+    MBEDTLS_CIPHER_ID_CAMELLIA,
+    NULL,
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_CFB)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_OFB)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_CTR)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_XTS)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_STREAM)
+    NULL,
+#endif
+    ccm_camellia_setkey_wrap,
+    ccm_camellia_setkey_wrap,
+    ccm_ctx_alloc,
+    ccm_ctx_free,
+};
+
+static const mbedtls_cipher_info_t camellia_128_ccm_info = {
+    MBEDTLS_CIPHER_CAMELLIA_128_CCM,
+    MBEDTLS_MODE_CCM,
+    128,
+    "CAMELLIA-128-CCM",
+    12,
+    MBEDTLS_CIPHER_VARIABLE_IV_LEN,
+    16,
+    &ccm_camellia_info
+};
+
+static const mbedtls_cipher_info_t camellia_192_ccm_info = {
+    MBEDTLS_CIPHER_CAMELLIA_192_CCM,
+    MBEDTLS_MODE_CCM,
+    192,
+    "CAMELLIA-192-CCM",
+    12,
+    MBEDTLS_CIPHER_VARIABLE_IV_LEN,
+    16,
+    &ccm_camellia_info
+};
+
+static const mbedtls_cipher_info_t camellia_256_ccm_info = {
+    MBEDTLS_CIPHER_CAMELLIA_256_CCM,
+    MBEDTLS_MODE_CCM,
+    256,
+    "CAMELLIA-256-CCM",
+    12,
+    MBEDTLS_CIPHER_VARIABLE_IV_LEN,
+    16,
+    &ccm_camellia_info
+};
+#endif /* MBEDTLS_CCM_C */
+
+#endif /* MBEDTLS_CAMELLIA_C */
+
+#if defined(MBEDTLS_ARIA_C)
+
+static int aria_crypt_ecb_wrap( void *ctx, mbedtls_operation_t operation,
+        const unsigned char *input, unsigned char *output )
+{
+    (void) operation;
+    return mbedtls_aria_crypt_ecb( (mbedtls_aria_context *) ctx, input,
+                               output );
+}
+
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+static int aria_crypt_cbc_wrap( void *ctx, mbedtls_operation_t operation,
+        size_t length, unsigned char *iv,
+        const unsigned char *input, unsigned char *output )
+{
+    return mbedtls_aria_crypt_cbc( (mbedtls_aria_context *) ctx, operation, length, iv,
+                               input, output );
+}
+#endif /* MBEDTLS_CIPHER_MODE_CBC */
+
+#if defined(MBEDTLS_CIPHER_MODE_CFB)
+static int aria_crypt_cfb128_wrap( void *ctx, mbedtls_operation_t operation,
+        size_t length, size_t *iv_off, unsigned char *iv,
+        const unsigned char *input, unsigned char *output )
+{
+    return mbedtls_aria_crypt_cfb128( (mbedtls_aria_context *) ctx, operation, length,
+                                  iv_off, iv, input, output );
+}
+#endif /* MBEDTLS_CIPHER_MODE_CFB */
+
+#if defined(MBEDTLS_CIPHER_MODE_CTR)
+static int aria_crypt_ctr_wrap( void *ctx, size_t length, size_t *nc_off,
+        unsigned char *nonce_counter, unsigned char *stream_block,
+        const unsigned char *input, unsigned char *output )
+{
+    return mbedtls_aria_crypt_ctr( (mbedtls_aria_context *) ctx, length, nc_off,
+                               nonce_counter, stream_block, input, output );
+}
+#endif /* MBEDTLS_CIPHER_MODE_CTR */
+
+static int aria_setkey_dec_wrap( void *ctx, const unsigned char *key,
+                                     unsigned int key_bitlen )
+{
+    return mbedtls_aria_setkey_dec( (mbedtls_aria_context *) ctx, key, key_bitlen );
+}
+
+static int aria_setkey_enc_wrap( void *ctx, const unsigned char *key,
+                                     unsigned int key_bitlen )
+{
+    return mbedtls_aria_setkey_enc( (mbedtls_aria_context *) ctx, key, key_bitlen );
+}
+
+static void * aria_ctx_alloc( void )
+{
+    mbedtls_aria_context *ctx;
+    ctx = mbedtls_calloc( 1, sizeof( mbedtls_aria_context ) );
+
+    if( ctx == NULL )
+        return( NULL );
+
+    mbedtls_aria_init( ctx );
+
+    return( ctx );
+}
+
+static void aria_ctx_free( void *ctx )
+{
+    mbedtls_aria_free( (mbedtls_aria_context *) ctx );
+    mbedtls_free( ctx );
+}
+
+static const mbedtls_cipher_base_t aria_info = {
+    MBEDTLS_CIPHER_ID_ARIA,
+    aria_crypt_ecb_wrap,
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+    aria_crypt_cbc_wrap,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_CFB)
+    aria_crypt_cfb128_wrap,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_OFB)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_CTR)
+    aria_crypt_ctr_wrap,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_XTS)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_STREAM)
+    NULL,
+#endif
+    aria_setkey_enc_wrap,
+    aria_setkey_dec_wrap,
+    aria_ctx_alloc,
+    aria_ctx_free
+};
+
+static const mbedtls_cipher_info_t aria_128_ecb_info = {
+    MBEDTLS_CIPHER_ARIA_128_ECB,
+    MBEDTLS_MODE_ECB,
+    128,
+    "ARIA-128-ECB",
+    16,
+    0,
+    16,
+    &aria_info
+};
+
+static const mbedtls_cipher_info_t aria_192_ecb_info = {
+    MBEDTLS_CIPHER_ARIA_192_ECB,
+    MBEDTLS_MODE_ECB,
+    192,
+    "ARIA-192-ECB",
+    16,
+    0,
+    16,
+    &aria_info
+};
+
+static const mbedtls_cipher_info_t aria_256_ecb_info = {
+    MBEDTLS_CIPHER_ARIA_256_ECB,
+    MBEDTLS_MODE_ECB,
+    256,
+    "ARIA-256-ECB",
+    16,
+    0,
+    16,
+    &aria_info
+};
+
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+static const mbedtls_cipher_info_t aria_128_cbc_info = {
+    MBEDTLS_CIPHER_ARIA_128_CBC,
+    MBEDTLS_MODE_CBC,
+    128,
+    "ARIA-128-CBC",
+    16,
+    0,
+    16,
+    &aria_info
+};
+
+static const mbedtls_cipher_info_t aria_192_cbc_info = {
+    MBEDTLS_CIPHER_ARIA_192_CBC,
+    MBEDTLS_MODE_CBC,
+    192,
+    "ARIA-192-CBC",
+    16,
+    0,
+    16,
+    &aria_info
+};
+
+static const mbedtls_cipher_info_t aria_256_cbc_info = {
+    MBEDTLS_CIPHER_ARIA_256_CBC,
+    MBEDTLS_MODE_CBC,
+    256,
+    "ARIA-256-CBC",
+    16,
+    0,
+    16,
+    &aria_info
+};
+#endif /* MBEDTLS_CIPHER_MODE_CBC */
+
+#if defined(MBEDTLS_CIPHER_MODE_CFB)
+static const mbedtls_cipher_info_t aria_128_cfb128_info = {
+    MBEDTLS_CIPHER_ARIA_128_CFB128,
+    MBEDTLS_MODE_CFB,
+    128,
+    "ARIA-128-CFB128",
+    16,
+    0,
+    16,
+    &aria_info
+};
+
+static const mbedtls_cipher_info_t aria_192_cfb128_info = {
+    MBEDTLS_CIPHER_ARIA_192_CFB128,
+    MBEDTLS_MODE_CFB,
+    192,
+    "ARIA-192-CFB128",
+    16,
+    0,
+    16,
+    &aria_info
+};
+
+static const mbedtls_cipher_info_t aria_256_cfb128_info = {
+    MBEDTLS_CIPHER_ARIA_256_CFB128,
+    MBEDTLS_MODE_CFB,
+    256,
+    "ARIA-256-CFB128",
+    16,
+    0,
+    16,
+    &aria_info
+};
+#endif /* MBEDTLS_CIPHER_MODE_CFB */
+
+#if defined(MBEDTLS_CIPHER_MODE_CTR)
+static const mbedtls_cipher_info_t aria_128_ctr_info = {
+    MBEDTLS_CIPHER_ARIA_128_CTR,
+    MBEDTLS_MODE_CTR,
+    128,
+    "ARIA-128-CTR",
+    16,
+    0,
+    16,
+    &aria_info
+};
+
+static const mbedtls_cipher_info_t aria_192_ctr_info = {
+    MBEDTLS_CIPHER_ARIA_192_CTR,
+    MBEDTLS_MODE_CTR,
+    192,
+    "ARIA-192-CTR",
+    16,
+    0,
+    16,
+    &aria_info
+};
+
+static const mbedtls_cipher_info_t aria_256_ctr_info = {
+    MBEDTLS_CIPHER_ARIA_256_CTR,
+    MBEDTLS_MODE_CTR,
+    256,
+    "ARIA-256-CTR",
+    16,
+    0,
+    16,
+    &aria_info
+};
+#endif /* MBEDTLS_CIPHER_MODE_CTR */
+
+#if defined(MBEDTLS_GCM_C)
+static int gcm_aria_setkey_wrap( void *ctx, const unsigned char *key,
+                                     unsigned int key_bitlen )
+{
+    return mbedtls_gcm_setkey( (mbedtls_gcm_context *) ctx, MBEDTLS_CIPHER_ID_ARIA,
+                     key, key_bitlen );
+}
+
+static const mbedtls_cipher_base_t gcm_aria_info = {
+    MBEDTLS_CIPHER_ID_ARIA,
+    NULL,
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_CFB)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_OFB)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_CTR)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_XTS)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_STREAM)
+    NULL,
+#endif
+    gcm_aria_setkey_wrap,
+    gcm_aria_setkey_wrap,
+    gcm_ctx_alloc,
+    gcm_ctx_free,
+};
+
+static const mbedtls_cipher_info_t aria_128_gcm_info = {
+    MBEDTLS_CIPHER_ARIA_128_GCM,
+    MBEDTLS_MODE_GCM,
+    128,
+    "ARIA-128-GCM",
+    12,
+    MBEDTLS_CIPHER_VARIABLE_IV_LEN,
+    16,
+    &gcm_aria_info
+};
+
+static const mbedtls_cipher_info_t aria_192_gcm_info = {
+    MBEDTLS_CIPHER_ARIA_192_GCM,
+    MBEDTLS_MODE_GCM,
+    192,
+    "ARIA-192-GCM",
+    12,
+    MBEDTLS_CIPHER_VARIABLE_IV_LEN,
+    16,
+    &gcm_aria_info
+};
+
+static const mbedtls_cipher_info_t aria_256_gcm_info = {
+    MBEDTLS_CIPHER_ARIA_256_GCM,
+    MBEDTLS_MODE_GCM,
+    256,
+    "ARIA-256-GCM",
+    12,
+    MBEDTLS_CIPHER_VARIABLE_IV_LEN,
+    16,
+    &gcm_aria_info
+};
+#endif /* MBEDTLS_GCM_C */
+
+#if defined(MBEDTLS_CCM_C)
+static int ccm_aria_setkey_wrap( void *ctx, const unsigned char *key,
+                                     unsigned int key_bitlen )
+{
+    return mbedtls_ccm_setkey( (mbedtls_ccm_context *) ctx, MBEDTLS_CIPHER_ID_ARIA,
+                     key, key_bitlen );
+}
+
+static const mbedtls_cipher_base_t ccm_aria_info = {
+    MBEDTLS_CIPHER_ID_ARIA,
+    NULL,
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_CFB)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_OFB)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_CTR)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_XTS)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_STREAM)
+    NULL,
+#endif
+    ccm_aria_setkey_wrap,
+    ccm_aria_setkey_wrap,
+    ccm_ctx_alloc,
+    ccm_ctx_free,
+};
+
+static const mbedtls_cipher_info_t aria_128_ccm_info = {
+    MBEDTLS_CIPHER_ARIA_128_CCM,
+    MBEDTLS_MODE_CCM,
+    128,
+    "ARIA-128-CCM",
+    12,
+    MBEDTLS_CIPHER_VARIABLE_IV_LEN,
+    16,
+    &ccm_aria_info
+};
+
+static const mbedtls_cipher_info_t aria_192_ccm_info = {
+    MBEDTLS_CIPHER_ARIA_192_CCM,
+    MBEDTLS_MODE_CCM,
+    192,
+    "ARIA-192-CCM",
+    12,
+    MBEDTLS_CIPHER_VARIABLE_IV_LEN,
+    16,
+    &ccm_aria_info
+};
+
+static const mbedtls_cipher_info_t aria_256_ccm_info = {
+    MBEDTLS_CIPHER_ARIA_256_CCM,
+    MBEDTLS_MODE_CCM,
+    256,
+    "ARIA-256-CCM",
+    12,
+    MBEDTLS_CIPHER_VARIABLE_IV_LEN,
+    16,
+    &ccm_aria_info
+};
+#endif /* MBEDTLS_CCM_C */
+
+#endif /* MBEDTLS_ARIA_C */
+
+#if defined(MBEDTLS_DES_C)
+
+static int des_crypt_ecb_wrap( void *ctx, mbedtls_operation_t operation,
+        const unsigned char *input, unsigned char *output )
+{
+    ((void) operation);
+    return mbedtls_des_crypt_ecb( (mbedtls_des_context *) ctx, input, output );
+}
+
+static int des3_crypt_ecb_wrap( void *ctx, mbedtls_operation_t operation,
+        const unsigned char *input, unsigned char *output )
+{
+    ((void) operation);
+    return mbedtls_des3_crypt_ecb( (mbedtls_des3_context *) ctx, input, output );
+}
+
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+static int des_crypt_cbc_wrap( void *ctx, mbedtls_operation_t operation, size_t length,
+        unsigned char *iv, const unsigned char *input, unsigned char *output )
+{
+    return mbedtls_des_crypt_cbc( (mbedtls_des_context *) ctx, operation, length, iv, input,
+                          output );
+}
+#endif /* MBEDTLS_CIPHER_MODE_CBC */
+
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+static int des3_crypt_cbc_wrap( void *ctx, mbedtls_operation_t operation, size_t length,
+        unsigned char *iv, const unsigned char *input, unsigned char *output )
+{
+    return mbedtls_des3_crypt_cbc( (mbedtls_des3_context *) ctx, operation, length, iv, input,
+                           output );
+}
+#endif /* MBEDTLS_CIPHER_MODE_CBC */
+
+static int des_setkey_dec_wrap( void *ctx, const unsigned char *key,
+                                unsigned int key_bitlen )
+{
+    ((void) key_bitlen);
+
+    return mbedtls_des_setkey_dec( (mbedtls_des_context *) ctx, key );
+}
+
+static int des_setkey_enc_wrap( void *ctx, const unsigned char *key,
+                                unsigned int key_bitlen )
+{
+    ((void) key_bitlen);
+
+    return mbedtls_des_setkey_enc( (mbedtls_des_context *) ctx, key );
+}
+
+static int des3_set2key_dec_wrap( void *ctx, const unsigned char *key,
+                                  unsigned int key_bitlen )
+{
+    ((void) key_bitlen);
+
+    return mbedtls_des3_set2key_dec( (mbedtls_des3_context *) ctx, key );
+}
+
+static int des3_set2key_enc_wrap( void *ctx, const unsigned char *key,
+                                  unsigned int key_bitlen )
+{
+    ((void) key_bitlen);
+
+    return mbedtls_des3_set2key_enc( (mbedtls_des3_context *) ctx, key );
+}
+
+static int des3_set3key_dec_wrap( void *ctx, const unsigned char *key,
+                                  unsigned int key_bitlen )
+{
+    ((void) key_bitlen);
+
+    return mbedtls_des3_set3key_dec( (mbedtls_des3_context *) ctx, key );
+}
+
+static int des3_set3key_enc_wrap( void *ctx, const unsigned char *key,
+                                  unsigned int key_bitlen )
+{
+    ((void) key_bitlen);
+
+    return mbedtls_des3_set3key_enc( (mbedtls_des3_context *) ctx, key );
+}
+
+static void * des_ctx_alloc( void )
+{
+    mbedtls_des_context *des = mbedtls_calloc( 1, sizeof( mbedtls_des_context ) );
+
+    if( des == NULL )
+        return( NULL );
+
+    mbedtls_des_init( des );
+
+    return( des );
+}
+
+static void des_ctx_free( void *ctx )
+{
+    mbedtls_des_free( (mbedtls_des_context *) ctx );
+    mbedtls_free( ctx );
+}
+
+static void * des3_ctx_alloc( void )
+{
+    mbedtls_des3_context *des3;
+    des3 = mbedtls_calloc( 1, sizeof( mbedtls_des3_context ) );
+
+    if( des3 == NULL )
+        return( NULL );
+
+    mbedtls_des3_init( des3 );
+
+    return( des3 );
+}
+
+static void des3_ctx_free( void *ctx )
+{
+    mbedtls_des3_free( (mbedtls_des3_context *) ctx );
+    mbedtls_free( ctx );
+}
+
+static const mbedtls_cipher_base_t des_info = {
+    MBEDTLS_CIPHER_ID_DES,
+    des_crypt_ecb_wrap,
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+    des_crypt_cbc_wrap,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_CFB)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_OFB)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_CTR)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_XTS)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_STREAM)
+    NULL,
+#endif
+    des_setkey_enc_wrap,
+    des_setkey_dec_wrap,
+    des_ctx_alloc,
+    des_ctx_free
+};
+
+static const mbedtls_cipher_info_t des_ecb_info = {
+    MBEDTLS_CIPHER_DES_ECB,
+    MBEDTLS_MODE_ECB,
+    MBEDTLS_KEY_LENGTH_DES,
+    "DES-ECB",
+    8,
+    0,
+    8,
+    &des_info
+};
+
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+static const mbedtls_cipher_info_t des_cbc_info = {
+    MBEDTLS_CIPHER_DES_CBC,
+    MBEDTLS_MODE_CBC,
+    MBEDTLS_KEY_LENGTH_DES,
+    "DES-CBC",
+    8,
+    0,
+    8,
+    &des_info
+};
+#endif /* MBEDTLS_CIPHER_MODE_CBC */
+
+static const mbedtls_cipher_base_t des_ede_info = {
+    MBEDTLS_CIPHER_ID_DES,
+    des3_crypt_ecb_wrap,
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+    des3_crypt_cbc_wrap,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_CFB)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_OFB)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_CTR)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_XTS)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_STREAM)
+    NULL,
+#endif
+    des3_set2key_enc_wrap,
+    des3_set2key_dec_wrap,
+    des3_ctx_alloc,
+    des3_ctx_free
+};
+
+static const mbedtls_cipher_info_t des_ede_ecb_info = {
+    MBEDTLS_CIPHER_DES_EDE_ECB,
+    MBEDTLS_MODE_ECB,
+    MBEDTLS_KEY_LENGTH_DES_EDE,
+    "DES-EDE-ECB",
+    8,
+    0,
+    8,
+    &des_ede_info
+};
+
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+static const mbedtls_cipher_info_t des_ede_cbc_info = {
+    MBEDTLS_CIPHER_DES_EDE_CBC,
+    MBEDTLS_MODE_CBC,
+    MBEDTLS_KEY_LENGTH_DES_EDE,
+    "DES-EDE-CBC",
+    8,
+    0,
+    8,
+    &des_ede_info
+};
+#endif /* MBEDTLS_CIPHER_MODE_CBC */
+
+static const mbedtls_cipher_base_t des_ede3_info = {
+    MBEDTLS_CIPHER_ID_3DES,
+    des3_crypt_ecb_wrap,
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+    des3_crypt_cbc_wrap,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_CFB)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_OFB)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_CTR)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_XTS)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_STREAM)
+    NULL,
+#endif
+    des3_set3key_enc_wrap,
+    des3_set3key_dec_wrap,
+    des3_ctx_alloc,
+    des3_ctx_free
+};
+
+static const mbedtls_cipher_info_t des_ede3_ecb_info = {
+    MBEDTLS_CIPHER_DES_EDE3_ECB,
+    MBEDTLS_MODE_ECB,
+    MBEDTLS_KEY_LENGTH_DES_EDE3,
+    "DES-EDE3-ECB",
+    8,
+    0,
+    8,
+    &des_ede3_info
+};
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+static const mbedtls_cipher_info_t des_ede3_cbc_info = {
+    MBEDTLS_CIPHER_DES_EDE3_CBC,
+    MBEDTLS_MODE_CBC,
+    MBEDTLS_KEY_LENGTH_DES_EDE3,
+    "DES-EDE3-CBC",
+    8,
+    0,
+    8,
+    &des_ede3_info
+};
+#endif /* MBEDTLS_CIPHER_MODE_CBC */
+#endif /* MBEDTLS_DES_C */
+
+#if defined(MBEDTLS_BLOWFISH_C)
+
+static int blowfish_crypt_ecb_wrap( void *ctx, mbedtls_operation_t operation,
+        const unsigned char *input, unsigned char *output )
+{
+    return mbedtls_blowfish_crypt_ecb( (mbedtls_blowfish_context *) ctx, operation, input,
+                               output );
+}
+
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+static int blowfish_crypt_cbc_wrap( void *ctx, mbedtls_operation_t operation,
+        size_t length, unsigned char *iv, const unsigned char *input,
+        unsigned char *output )
+{
+    return mbedtls_blowfish_crypt_cbc( (mbedtls_blowfish_context *) ctx, operation, length, iv,
+                               input, output );
+}
+#endif /* MBEDTLS_CIPHER_MODE_CBC */
+
+#if defined(MBEDTLS_CIPHER_MODE_CFB)
+static int blowfish_crypt_cfb64_wrap( void *ctx, mbedtls_operation_t operation,
+        size_t length, size_t *iv_off, unsigned char *iv,
+        const unsigned char *input, unsigned char *output )
+{
+    return mbedtls_blowfish_crypt_cfb64( (mbedtls_blowfish_context *) ctx, operation, length,
+                                 iv_off, iv, input, output );
+}
+#endif /* MBEDTLS_CIPHER_MODE_CFB */
+
+#if defined(MBEDTLS_CIPHER_MODE_CTR)
+static int blowfish_crypt_ctr_wrap( void *ctx, size_t length, size_t *nc_off,
+        unsigned char *nonce_counter, unsigned char *stream_block,
+        const unsigned char *input, unsigned char *output )
+{
+    return mbedtls_blowfish_crypt_ctr( (mbedtls_blowfish_context *) ctx, length, nc_off,
+                               nonce_counter, stream_block, input, output );
+}
+#endif /* MBEDTLS_CIPHER_MODE_CTR */
+
+static int blowfish_setkey_wrap( void *ctx, const unsigned char *key,
+                                 unsigned int key_bitlen )
+{
+    return mbedtls_blowfish_setkey( (mbedtls_blowfish_context *) ctx, key, key_bitlen );
+}
+
+static void * blowfish_ctx_alloc( void )
+{
+    mbedtls_blowfish_context *ctx;
+    ctx = mbedtls_calloc( 1, sizeof( mbedtls_blowfish_context ) );
+
+    if( ctx == NULL )
+        return( NULL );
+
+    mbedtls_blowfish_init( ctx );
+
+    return( ctx );
+}
+
+static void blowfish_ctx_free( void *ctx )
+{
+    mbedtls_blowfish_free( (mbedtls_blowfish_context *) ctx );
+    mbedtls_free( ctx );
+}
+
+static const mbedtls_cipher_base_t blowfish_info = {
+    MBEDTLS_CIPHER_ID_BLOWFISH,
+    blowfish_crypt_ecb_wrap,
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+    blowfish_crypt_cbc_wrap,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_CFB)
+    blowfish_crypt_cfb64_wrap,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_OFB)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_CTR)
+    blowfish_crypt_ctr_wrap,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_XTS)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_STREAM)
+    NULL,
+#endif
+    blowfish_setkey_wrap,
+    blowfish_setkey_wrap,
+    blowfish_ctx_alloc,
+    blowfish_ctx_free
+};
+
+static const mbedtls_cipher_info_t blowfish_ecb_info = {
+    MBEDTLS_CIPHER_BLOWFISH_ECB,
+    MBEDTLS_MODE_ECB,
+    128,
+    "BLOWFISH-ECB",
+    8,
+    MBEDTLS_CIPHER_VARIABLE_KEY_LEN,
+    8,
+    &blowfish_info
+};
+
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+static const mbedtls_cipher_info_t blowfish_cbc_info = {
+    MBEDTLS_CIPHER_BLOWFISH_CBC,
+    MBEDTLS_MODE_CBC,
+    128,
+    "BLOWFISH-CBC",
+    8,
+    MBEDTLS_CIPHER_VARIABLE_KEY_LEN,
+    8,
+    &blowfish_info
+};
+#endif /* MBEDTLS_CIPHER_MODE_CBC */
+
+#if defined(MBEDTLS_CIPHER_MODE_CFB)
+static const mbedtls_cipher_info_t blowfish_cfb64_info = {
+    MBEDTLS_CIPHER_BLOWFISH_CFB64,
+    MBEDTLS_MODE_CFB,
+    128,
+    "BLOWFISH-CFB64",
+    8,
+    MBEDTLS_CIPHER_VARIABLE_KEY_LEN,
+    8,
+    &blowfish_info
+};
+#endif /* MBEDTLS_CIPHER_MODE_CFB */
+
+#if defined(MBEDTLS_CIPHER_MODE_CTR)
+static const mbedtls_cipher_info_t blowfish_ctr_info = {
+    MBEDTLS_CIPHER_BLOWFISH_CTR,
+    MBEDTLS_MODE_CTR,
+    128,
+    "BLOWFISH-CTR",
+    8,
+    MBEDTLS_CIPHER_VARIABLE_KEY_LEN,
+    8,
+    &blowfish_info
+};
+#endif /* MBEDTLS_CIPHER_MODE_CTR */
+#endif /* MBEDTLS_BLOWFISH_C */
+
+#if defined(MBEDTLS_ARC4_C)
+static int arc4_crypt_stream_wrap( void *ctx, size_t length,
+                                   const unsigned char *input,
+                                   unsigned char *output )
+{
+    return( mbedtls_arc4_crypt( (mbedtls_arc4_context *) ctx, length, input, output ) );
+}
+
+static int arc4_setkey_wrap( void *ctx, const unsigned char *key,
+                             unsigned int key_bitlen )
+{
+    /* we get key_bitlen in bits, arc4 expects it in bytes */
+    if( key_bitlen % 8 != 0 )
+        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+
+    mbedtls_arc4_setup( (mbedtls_arc4_context *) ctx, key, key_bitlen / 8 );
+    return( 0 );
+}
+
+static void * arc4_ctx_alloc( void )
+{
+    mbedtls_arc4_context *ctx;
+    ctx = mbedtls_calloc( 1, sizeof( mbedtls_arc4_context ) );
+
+    if( ctx == NULL )
+        return( NULL );
+
+    mbedtls_arc4_init( ctx );
+
+    return( ctx );
+}
+
+static void arc4_ctx_free( void *ctx )
+{
+    mbedtls_arc4_free( (mbedtls_arc4_context *) ctx );
+    mbedtls_free( ctx );
+}
+
+static const mbedtls_cipher_base_t arc4_base_info = {
+    MBEDTLS_CIPHER_ID_ARC4,
+    NULL,
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_CFB)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_OFB)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_CTR)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_XTS)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_STREAM)
+    arc4_crypt_stream_wrap,
+#endif
+    arc4_setkey_wrap,
+    arc4_setkey_wrap,
+    arc4_ctx_alloc,
+    arc4_ctx_free
+};
+
+static const mbedtls_cipher_info_t arc4_128_info = {
+    MBEDTLS_CIPHER_ARC4_128,
+    MBEDTLS_MODE_STREAM,
+    128,
+    "ARC4-128",
+    0,
+    0,
+    1,
+    &arc4_base_info
+};
+#endif /* MBEDTLS_ARC4_C */
+
+#if defined(MBEDTLS_CHACHA20_C)
+
+static int chacha20_setkey_wrap( void *ctx, const unsigned char *key,
+                                 unsigned int key_bitlen )
+{
+    if( key_bitlen != 256U )
+        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+
+    if ( 0 != mbedtls_chacha20_setkey( (mbedtls_chacha20_context*)ctx, key ) )
+        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+
+    return( 0 );
+}
+
+static int chacha20_stream_wrap( void *ctx,  size_t length,
+                                 const unsigned char *input,
+                                 unsigned char *output )
+{
+    int ret;
+
+    ret = mbedtls_chacha20_update( ctx, length, input, output );
+    if( ret == MBEDTLS_ERR_CHACHA20_BAD_INPUT_DATA )
+        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+
+    return( ret );
+}
+
+static void * chacha20_ctx_alloc( void )
+{
+    mbedtls_chacha20_context *ctx;
+    ctx = mbedtls_calloc( 1, sizeof( mbedtls_chacha20_context ) );
+
+    if( ctx == NULL )
+        return( NULL );
+
+    mbedtls_chacha20_init( ctx );
+
+    return( ctx );
+}
+
+static void chacha20_ctx_free( void *ctx )
+{
+    mbedtls_chacha20_free( (mbedtls_chacha20_context *) ctx );
+    mbedtls_free( ctx );
+}
+
+static const mbedtls_cipher_base_t chacha20_base_info = {
+    MBEDTLS_CIPHER_ID_CHACHA20,
+    NULL,
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_CFB)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_OFB)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_CTR)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_XTS)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_STREAM)
+    chacha20_stream_wrap,
+#endif
+    chacha20_setkey_wrap,
+    chacha20_setkey_wrap,
+    chacha20_ctx_alloc,
+    chacha20_ctx_free
+};
+static const mbedtls_cipher_info_t chacha20_info = {
+    MBEDTLS_CIPHER_CHACHA20,
+    MBEDTLS_MODE_STREAM,
+    256,
+    "CHACHA20",
+    12,
+    0,
+    1,
+    &chacha20_base_info
+};
+#endif /* MBEDTLS_CHACHA20_C */
+
+#if defined(MBEDTLS_CHACHAPOLY_C)
+
+static int chachapoly_setkey_wrap( void *ctx,
+                                   const unsigned char *key,
+                                   unsigned int key_bitlen )
+{
+    if( key_bitlen != 256U )
+        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+
+    if ( 0 != mbedtls_chachapoly_setkey( (mbedtls_chachapoly_context*)ctx, key ) )
+        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+
+    return( 0 );
+}
+
+static void * chachapoly_ctx_alloc( void )
+{
+    mbedtls_chachapoly_context *ctx;
+    ctx = mbedtls_calloc( 1, sizeof( mbedtls_chachapoly_context ) );
+
+    if( ctx == NULL )
+        return( NULL );
+
+    mbedtls_chachapoly_init( ctx );
+
+    return( ctx );
+}
+
+static void chachapoly_ctx_free( void *ctx )
+{
+    mbedtls_chachapoly_free( (mbedtls_chachapoly_context *) ctx );
+    mbedtls_free( ctx );
+}
+
+static const mbedtls_cipher_base_t chachapoly_base_info = {
+    MBEDTLS_CIPHER_ID_CHACHA20,
+    NULL,
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_CFB)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_OFB)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_CTR)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_XTS)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_STREAM)
+    NULL,
+#endif
+    chachapoly_setkey_wrap,
+    chachapoly_setkey_wrap,
+    chachapoly_ctx_alloc,
+    chachapoly_ctx_free
+};
+static const mbedtls_cipher_info_t chachapoly_info = {
+    MBEDTLS_CIPHER_CHACHA20_POLY1305,
+    MBEDTLS_MODE_CHACHAPOLY,
+    256,
+    "CHACHA20-POLY1305",
+    12,
+    0,
+    1,
+    &chachapoly_base_info
+};
+#endif /* MBEDTLS_CHACHAPOLY_C */
+
+#if defined(MBEDTLS_CIPHER_NULL_CIPHER)
+static int null_crypt_stream( void *ctx, size_t length,
+                              const unsigned char *input,
+                              unsigned char *output )
+{
+    ((void) ctx);
+    memmove( output, input, length );
+    return( 0 );
+}
+
+static int null_setkey( void *ctx, const unsigned char *key,
+                        unsigned int key_bitlen )
+{
+    ((void) ctx);
+    ((void) key);
+    ((void) key_bitlen);
+
+    return( 0 );
+}
+
+static void * null_ctx_alloc( void )
+{
+    return( (void *) 1 );
+}
+
+static void null_ctx_free( void *ctx )
+{
+    ((void) ctx);
+}
+
+static const mbedtls_cipher_base_t null_base_info = {
+    MBEDTLS_CIPHER_ID_NULL,
+    NULL,
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_CFB)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_OFB)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_CTR)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_XTS)
+    NULL,
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_STREAM)
+    null_crypt_stream,
+#endif
+    null_setkey,
+    null_setkey,
+    null_ctx_alloc,
+    null_ctx_free
+};
+
+static const mbedtls_cipher_info_t null_cipher_info = {
+    MBEDTLS_CIPHER_NULL,
+    MBEDTLS_MODE_STREAM,
+    0,
+    "NULL",
+    0,
+    0,
+    1,
+    &null_base_info
+};
+#endif /* defined(MBEDTLS_CIPHER_NULL_CIPHER) */
+
+const mbedtls_cipher_definition_t mbedtls_cipher_definitions[] =
+{
+#if defined(MBEDTLS_AES_C)
+    { MBEDTLS_CIPHER_AES_128_ECB,          &aes_128_ecb_info },
+    { MBEDTLS_CIPHER_AES_192_ECB,          &aes_192_ecb_info },
+    { MBEDTLS_CIPHER_AES_256_ECB,          &aes_256_ecb_info },
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+    { MBEDTLS_CIPHER_AES_128_CBC,          &aes_128_cbc_info },
+    { MBEDTLS_CIPHER_AES_192_CBC,          &aes_192_cbc_info },
+    { MBEDTLS_CIPHER_AES_256_CBC,          &aes_256_cbc_info },
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_CFB)
+    { MBEDTLS_CIPHER_AES_128_CFB128,       &aes_128_cfb128_info },
+    { MBEDTLS_CIPHER_AES_192_CFB128,       &aes_192_cfb128_info },
+    { MBEDTLS_CIPHER_AES_256_CFB128,       &aes_256_cfb128_info },
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_OFB)
+    { MBEDTLS_CIPHER_AES_128_OFB,          &aes_128_ofb_info },
+    { MBEDTLS_CIPHER_AES_192_OFB,          &aes_192_ofb_info },
+    { MBEDTLS_CIPHER_AES_256_OFB,          &aes_256_ofb_info },
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_CTR)
+    { MBEDTLS_CIPHER_AES_128_CTR,          &aes_128_ctr_info },
+    { MBEDTLS_CIPHER_AES_192_CTR,          &aes_192_ctr_info },
+    { MBEDTLS_CIPHER_AES_256_CTR,          &aes_256_ctr_info },
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_XTS)
+    { MBEDTLS_CIPHER_AES_128_XTS,          &aes_128_xts_info },
+    { MBEDTLS_CIPHER_AES_256_XTS,          &aes_256_xts_info },
+#endif
+#if defined(MBEDTLS_GCM_C)
+    { MBEDTLS_CIPHER_AES_128_GCM,          &aes_128_gcm_info },
+    { MBEDTLS_CIPHER_AES_192_GCM,          &aes_192_gcm_info },
+    { MBEDTLS_CIPHER_AES_256_GCM,          &aes_256_gcm_info },
+#endif
+#if defined(MBEDTLS_CCM_C)
+    { MBEDTLS_CIPHER_AES_128_CCM,          &aes_128_ccm_info },
+    { MBEDTLS_CIPHER_AES_192_CCM,          &aes_192_ccm_info },
+    { MBEDTLS_CIPHER_AES_256_CCM,          &aes_256_ccm_info },
+#endif
+#endif /* MBEDTLS_AES_C */
+
+#if defined(MBEDTLS_ARC4_C)
+    { MBEDTLS_CIPHER_ARC4_128,             &arc4_128_info },
+#endif
+
+#if defined(MBEDTLS_BLOWFISH_C)
+    { MBEDTLS_CIPHER_BLOWFISH_ECB,         &blowfish_ecb_info },
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+    { MBEDTLS_CIPHER_BLOWFISH_CBC,         &blowfish_cbc_info },
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_CFB)
+    { MBEDTLS_CIPHER_BLOWFISH_CFB64,       &blowfish_cfb64_info },
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_CTR)
+    { MBEDTLS_CIPHER_BLOWFISH_CTR,         &blowfish_ctr_info },
+#endif
+#endif /* MBEDTLS_BLOWFISH_C */
+
+#if defined(MBEDTLS_CAMELLIA_C)
+    { MBEDTLS_CIPHER_CAMELLIA_128_ECB,     &camellia_128_ecb_info },
+    { MBEDTLS_CIPHER_CAMELLIA_192_ECB,     &camellia_192_ecb_info },
+    { MBEDTLS_CIPHER_CAMELLIA_256_ECB,     &camellia_256_ecb_info },
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+    { MBEDTLS_CIPHER_CAMELLIA_128_CBC,     &camellia_128_cbc_info },
+    { MBEDTLS_CIPHER_CAMELLIA_192_CBC,     &camellia_192_cbc_info },
+    { MBEDTLS_CIPHER_CAMELLIA_256_CBC,     &camellia_256_cbc_info },
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_CFB)
+    { MBEDTLS_CIPHER_CAMELLIA_128_CFB128,  &camellia_128_cfb128_info },
+    { MBEDTLS_CIPHER_CAMELLIA_192_CFB128,  &camellia_192_cfb128_info },
+    { MBEDTLS_CIPHER_CAMELLIA_256_CFB128,  &camellia_256_cfb128_info },
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_CTR)
+    { MBEDTLS_CIPHER_CAMELLIA_128_CTR,     &camellia_128_ctr_info },
+    { MBEDTLS_CIPHER_CAMELLIA_192_CTR,     &camellia_192_ctr_info },
+    { MBEDTLS_CIPHER_CAMELLIA_256_CTR,     &camellia_256_ctr_info },
+#endif
+#if defined(MBEDTLS_GCM_C)
+    { MBEDTLS_CIPHER_CAMELLIA_128_GCM,     &camellia_128_gcm_info },
+    { MBEDTLS_CIPHER_CAMELLIA_192_GCM,     &camellia_192_gcm_info },
+    { MBEDTLS_CIPHER_CAMELLIA_256_GCM,     &camellia_256_gcm_info },
+#endif
+#if defined(MBEDTLS_CCM_C)
+    { MBEDTLS_CIPHER_CAMELLIA_128_CCM,     &camellia_128_ccm_info },
+    { MBEDTLS_CIPHER_CAMELLIA_192_CCM,     &camellia_192_ccm_info },
+    { MBEDTLS_CIPHER_CAMELLIA_256_CCM,     &camellia_256_ccm_info },
+#endif
+#endif /* MBEDTLS_CAMELLIA_C */
+
+#if defined(MBEDTLS_ARIA_C)
+    { MBEDTLS_CIPHER_ARIA_128_ECB,     &aria_128_ecb_info },
+    { MBEDTLS_CIPHER_ARIA_192_ECB,     &aria_192_ecb_info },
+    { MBEDTLS_CIPHER_ARIA_256_ECB,     &aria_256_ecb_info },
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+    { MBEDTLS_CIPHER_ARIA_128_CBC,     &aria_128_cbc_info },
+    { MBEDTLS_CIPHER_ARIA_192_CBC,     &aria_192_cbc_info },
+    { MBEDTLS_CIPHER_ARIA_256_CBC,     &aria_256_cbc_info },
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_CFB)
+    { MBEDTLS_CIPHER_ARIA_128_CFB128,  &aria_128_cfb128_info },
+    { MBEDTLS_CIPHER_ARIA_192_CFB128,  &aria_192_cfb128_info },
+    { MBEDTLS_CIPHER_ARIA_256_CFB128,  &aria_256_cfb128_info },
+#endif
+#if defined(MBEDTLS_CIPHER_MODE_CTR)
+    { MBEDTLS_CIPHER_ARIA_128_CTR,     &aria_128_ctr_info },
+    { MBEDTLS_CIPHER_ARIA_192_CTR,     &aria_192_ctr_info },
+    { MBEDTLS_CIPHER_ARIA_256_CTR,     &aria_256_ctr_info },
+#endif
+#if defined(MBEDTLS_GCM_C)
+    { MBEDTLS_CIPHER_ARIA_128_GCM,     &aria_128_gcm_info },
+    { MBEDTLS_CIPHER_ARIA_192_GCM,     &aria_192_gcm_info },
+    { MBEDTLS_CIPHER_ARIA_256_GCM,     &aria_256_gcm_info },
+#endif
+#if defined(MBEDTLS_CCM_C)
+    { MBEDTLS_CIPHER_ARIA_128_CCM,     &aria_128_ccm_info },
+    { MBEDTLS_CIPHER_ARIA_192_CCM,     &aria_192_ccm_info },
+    { MBEDTLS_CIPHER_ARIA_256_CCM,     &aria_256_ccm_info },
+#endif
+#endif /* MBEDTLS_ARIA_C */
+
+#if defined(MBEDTLS_DES_C)
+    { MBEDTLS_CIPHER_DES_ECB,              &des_ecb_info },
+    { MBEDTLS_CIPHER_DES_EDE_ECB,          &des_ede_ecb_info },
+    { MBEDTLS_CIPHER_DES_EDE3_ECB,         &des_ede3_ecb_info },
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+    { MBEDTLS_CIPHER_DES_CBC,              &des_cbc_info },
+    { MBEDTLS_CIPHER_DES_EDE_CBC,          &des_ede_cbc_info },
+    { MBEDTLS_CIPHER_DES_EDE3_CBC,         &des_ede3_cbc_info },
+#endif
+#endif /* MBEDTLS_DES_C */
+
+#if defined(MBEDTLS_CHACHA20_C)
+    { MBEDTLS_CIPHER_CHACHA20,             &chacha20_info },
+#endif
+
+#if defined(MBEDTLS_CHACHAPOLY_C)
+    { MBEDTLS_CIPHER_CHACHA20_POLY1305,    &chachapoly_info },
+#endif
+
+#if defined(MBEDTLS_CIPHER_NULL_CIPHER)
+    { MBEDTLS_CIPHER_NULL,                 &null_cipher_info },
+#endif /* MBEDTLS_CIPHER_NULL_CIPHER */
+
+    { MBEDTLS_CIPHER_NONE, NULL }
+};
+
+#define NUM_CIPHERS sizeof mbedtls_cipher_definitions / sizeof mbedtls_cipher_definitions[0]
+int mbedtls_cipher_supported[NUM_CIPHERS];
+
+#endif /* MBEDTLS_CIPHER_C */
diff --git a/common/mbedtls/cmac.c b/common/mbedtls/cmac.c
new file mode 100644
index 000000000..db4a71d72
--- /dev/null
+++ b/common/mbedtls/cmac.c
@@ -0,0 +1,1080 @@
+/**
+ * \file cmac.c
+ *
+ * \brief NIST SP800-38B compliant CMAC implementation for AES and 3DES
+ *
+ *  Copyright (C) 2006-2016, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+
+/*
+ * References:
+ *
+ * - NIST SP 800-38B Recommendation for Block Cipher Modes of Operation: The
+ *      CMAC Mode for Authentication
+ *   http://nvlpubs.nist.gov/nistpubs/SpecialPublications/NIST.SP.800-38b.pdf
+ *
+ * - RFC 4493 - The AES-CMAC Algorithm
+ *   https://tools.ietf.org/html/rfc4493
+ *
+ * - RFC 4615 - The Advanced Encryption Standard-Cipher-based Message
+ *      Authentication Code-Pseudo-Random Function-128 (AES-CMAC-PRF-128)
+ *      Algorithm for the Internet Key Exchange Protocol (IKE)
+ *   https://tools.ietf.org/html/rfc4615
+ *
+ *   Additional test vectors: ISO/IEC 9797-1
+ *
+ */
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "mbedtls/config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#if defined(MBEDTLS_CMAC_C)
+
+#include "mbedtls/cmac.h"
+#include "mbedtls/platform_util.h"
+
+#include <string.h>
+
+
+#if defined(MBEDTLS_PLATFORM_C)
+#include "mbedtls/platform.h"
+#else
+#include <stdlib.h>
+#define mbedtls_calloc     calloc
+#define mbedtls_free       free
+#if defined(MBEDTLS_SELF_TEST)
+#include <stdio.h>
+#define mbedtls_printf     printf
+#endif /* MBEDTLS_SELF_TEST */
+#endif /* MBEDTLS_PLATFORM_C */
+
+#if !defined(MBEDTLS_CMAC_ALT) || defined(MBEDTLS_SELF_TEST)
+
+/*
+ * Multiplication by u in the Galois field of GF(2^n)
+ *
+ * As explained in NIST SP 800-38B, this can be computed:
+ *
+ *   If MSB(p) = 0, then p = (p << 1)
+ *   If MSB(p) = 1, then p = (p << 1) ^ R_n
+ *   with R_64 = 0x1B and  R_128 = 0x87
+ *
+ * Input and output MUST NOT point to the same buffer
+ * Block size must be 8 bytes or 16 bytes - the block sizes for DES and AES.
+ */
+static int cmac_multiply_by_u( unsigned char *output,
+                               const unsigned char *input,
+                               size_t blocksize )
+{
+    const unsigned char R_128 = 0x87;
+    const unsigned char R_64 = 0x1B;
+    unsigned char R_n, mask;
+    unsigned char overflow = 0x00;
+    int i;
+
+    if( blocksize == MBEDTLS_AES_BLOCK_SIZE )
+    {
+        R_n = R_128;
+    }
+    else if( blocksize == MBEDTLS_DES3_BLOCK_SIZE )
+    {
+        R_n = R_64;
+    }
+    else
+    {
+        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+    }
+
+    for( i = (int)blocksize - 1; i >= 0; i-- )
+    {
+        output[i] = input[i] << 1 | overflow;
+        overflow = input[i] >> 7;
+    }
+
+    /* mask = ( input[0] >> 7 ) ? 0xff : 0x00
+     * using bit operations to avoid branches */
+
+    /* MSVC has a warning about unary minus on unsigned, but this is
+     * well-defined and precisely what we want to do here */
+#if defined(_MSC_VER)
+#pragma warning( push )
+#pragma warning( disable : 4146 )
+#endif
+    mask = - ( input[0] >> 7 );
+#if defined(_MSC_VER)
+#pragma warning( pop )
+#endif
+
+    output[ blocksize - 1 ] ^= R_n & mask;
+
+    return( 0 );
+}
+
+/*
+ * Generate subkeys
+ *
+ * - as specified by RFC 4493, section 2.3 Subkey Generation Algorithm
+ */
+static int cmac_generate_subkeys( mbedtls_cipher_context_t *ctx,
+                                  unsigned char* K1, unsigned char* K2 )
+{
+    int ret;
+    unsigned char L[MBEDTLS_CIPHER_BLKSIZE_MAX];
+    size_t olen, block_size;
+
+    mbedtls_platform_zeroize( L, sizeof( L ) );
+
+    block_size = ctx->cipher_info->block_size;
+
+    /* Calculate Ek(0) */
+    if( ( ret = mbedtls_cipher_update( ctx, L, block_size, L, &olen ) ) != 0 )
+        goto exit;
+
+    /*
+     * Generate K1 and K2
+     */
+    if( ( ret = cmac_multiply_by_u( K1, L , block_size ) ) != 0 )
+        goto exit;
+
+    if( ( ret = cmac_multiply_by_u( K2, K1 , block_size ) ) != 0 )
+        goto exit;
+
+exit:
+    mbedtls_platform_zeroize( L, sizeof( L ) );
+
+    return( ret );
+}
+#endif /* !defined(MBEDTLS_CMAC_ALT) || defined(MBEDTLS_SELF_TEST) */
+
+#if !defined(MBEDTLS_CMAC_ALT)
+static void cmac_xor_block( unsigned char *output, const unsigned char *input1,
+                            const unsigned char *input2,
+                            const size_t block_size )
+{
+    size_t idx;
+
+    for( idx = 0; idx < block_size; idx++ )
+        output[ idx ] = input1[ idx ] ^ input2[ idx ];
+}
+
+/*
+ * Create padded last block from (partial) last block.
+ *
+ * We can't use the padding option from the cipher layer, as it only works for
+ * CBC and we use ECB mode, and anyway we need to XOR K1 or K2 in addition.
+ */
+static void cmac_pad( unsigned char padded_block[MBEDTLS_CIPHER_BLKSIZE_MAX],
+                      size_t padded_block_len,
+                      const unsigned char *last_block,
+                      size_t last_block_len )
+{
+    size_t j;
+
+    for( j = 0; j < padded_block_len; j++ )
+    {
+        if( j < last_block_len )
+            padded_block[j] = last_block[j];
+        else if( j == last_block_len )
+            padded_block[j] = 0x80;
+        else
+            padded_block[j] = 0x00;
+    }
+}
+
+int mbedtls_cipher_cmac_starts( mbedtls_cipher_context_t *ctx,
+                                const unsigned char *key, size_t keybits )
+{
+    mbedtls_cipher_type_t type;
+    mbedtls_cmac_context_t *cmac_ctx;
+    int retval;
+
+    if( ctx == NULL || ctx->cipher_info == NULL || key == NULL )
+        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+
+    if( ( retval = mbedtls_cipher_setkey( ctx, key, (int)keybits,
+                                          MBEDTLS_ENCRYPT ) ) != 0 )
+        return( retval );
+
+    type = ctx->cipher_info->type;
+
+    switch( type )
+    {
+        case MBEDTLS_CIPHER_AES_128_ECB:
+        case MBEDTLS_CIPHER_AES_192_ECB:
+        case MBEDTLS_CIPHER_AES_256_ECB:
+        case MBEDTLS_CIPHER_DES_EDE3_ECB:
+            break;
+        default:
+            return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+    }
+
+    /* Allocated and initialise in the cipher context memory for the CMAC
+     * context */
+    cmac_ctx = mbedtls_calloc( 1, sizeof( mbedtls_cmac_context_t ) );
+    if( cmac_ctx == NULL )
+        return( MBEDTLS_ERR_CIPHER_ALLOC_FAILED );
+
+    ctx->cmac_ctx = cmac_ctx;
+
+    mbedtls_platform_zeroize( cmac_ctx->state, sizeof( cmac_ctx->state ) );
+
+    return 0;
+}
+
+int mbedtls_cipher_cmac_update( mbedtls_cipher_context_t *ctx,
+                                const unsigned char *input, size_t ilen )
+{
+    mbedtls_cmac_context_t* cmac_ctx;
+    unsigned char *state;
+    int ret = 0;
+    size_t n, j, olen, block_size;
+
+    if( ctx == NULL || ctx->cipher_info == NULL || input == NULL ||
+        ctx->cmac_ctx == NULL )
+        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+
+    cmac_ctx = ctx->cmac_ctx;
+    block_size = ctx->cipher_info->block_size;
+    state = ctx->cmac_ctx->state;
+
+    /* Is there data still to process from the last call, that's greater in
+     * size than a block? */
+    if( cmac_ctx->unprocessed_len > 0 &&
+        ilen > block_size - cmac_ctx->unprocessed_len )
+    {
+        memcpy( &cmac_ctx->unprocessed_block[cmac_ctx->unprocessed_len],
+                input,
+                block_size - cmac_ctx->unprocessed_len );
+
+        cmac_xor_block( state, cmac_ctx->unprocessed_block, state, block_size );
+
+        if( ( ret = mbedtls_cipher_update( ctx, state, block_size, state,
+                                           &olen ) ) != 0 )
+        {
+           goto exit;
+        }
+
+        input += block_size - cmac_ctx->unprocessed_len;
+        ilen -= block_size - cmac_ctx->unprocessed_len;
+        cmac_ctx->unprocessed_len = 0;
+    }
+
+    /* n is the number of blocks including any final partial block */
+    n = ( ilen + block_size - 1 ) / block_size;
+
+    /* Iterate across the input data in block sized chunks, excluding any
+     * final partial or complete block */
+    for( j = 1; j < n; j++ )
+    {
+        cmac_xor_block( state, input, state, block_size );
+
+        if( ( ret = mbedtls_cipher_update( ctx, state, block_size, state,
+                                           &olen ) ) != 0 )
+           goto exit;
+
+        ilen -= block_size;
+        input += block_size;
+    }
+
+    /* If there is data left over that wasn't aligned to a block */
+    if( ilen > 0 )
+    {
+        memcpy( &cmac_ctx->unprocessed_block[cmac_ctx->unprocessed_len],
+                input,
+                ilen );
+        cmac_ctx->unprocessed_len += ilen;
+    }
+
+exit:
+    return( ret );
+}
+
+int mbedtls_cipher_cmac_finish( mbedtls_cipher_context_t *ctx,
+                                unsigned char *output )
+{
+    mbedtls_cmac_context_t* cmac_ctx;
+    unsigned char *state, *last_block;
+    unsigned char K1[MBEDTLS_CIPHER_BLKSIZE_MAX];
+    unsigned char K2[MBEDTLS_CIPHER_BLKSIZE_MAX];
+    unsigned char M_last[MBEDTLS_CIPHER_BLKSIZE_MAX];
+    int ret;
+    size_t olen, block_size;
+
+    if( ctx == NULL || ctx->cipher_info == NULL || ctx->cmac_ctx == NULL ||
+        output == NULL )
+        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+
+    cmac_ctx = ctx->cmac_ctx;
+    block_size = ctx->cipher_info->block_size;
+    state = cmac_ctx->state;
+
+    mbedtls_platform_zeroize( K1, sizeof( K1 ) );
+    mbedtls_platform_zeroize( K2, sizeof( K2 ) );
+    cmac_generate_subkeys( ctx, K1, K2 );
+
+    last_block = cmac_ctx->unprocessed_block;
+
+    /* Calculate last block */
+    if( cmac_ctx->unprocessed_len < block_size )
+    {
+        cmac_pad( M_last, block_size, last_block, cmac_ctx->unprocessed_len );
+        cmac_xor_block( M_last, M_last, K2, block_size );
+    }
+    else
+    {
+        /* Last block is complete block */
+        cmac_xor_block( M_last, last_block, K1, block_size );
+    }
+
+
+    cmac_xor_block( state, M_last, state, block_size );
+    if( ( ret = mbedtls_cipher_update( ctx, state, block_size, state,
+                                       &olen ) ) != 0 )
+    {
+        goto exit;
+    }
+
+    memcpy( output, state, block_size );
+
+exit:
+    /* Wipe the generated keys on the stack, and any other transients to avoid
+     * side channel leakage */
+    mbedtls_platform_zeroize( K1, sizeof( K1 ) );
+    mbedtls_platform_zeroize( K2, sizeof( K2 ) );
+
+    cmac_ctx->unprocessed_len = 0;
+    mbedtls_platform_zeroize( cmac_ctx->unprocessed_block,
+                              sizeof( cmac_ctx->unprocessed_block ) );
+
+    mbedtls_platform_zeroize( state, MBEDTLS_CIPHER_BLKSIZE_MAX );
+    return( ret );
+}
+
+int mbedtls_cipher_cmac_reset( mbedtls_cipher_context_t *ctx )
+{
+    mbedtls_cmac_context_t* cmac_ctx;
+
+    if( ctx == NULL || ctx->cipher_info == NULL || ctx->cmac_ctx == NULL )
+        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+
+    cmac_ctx = ctx->cmac_ctx;
+
+    /* Reset the internal state */
+    cmac_ctx->unprocessed_len = 0;
+    mbedtls_platform_zeroize( cmac_ctx->unprocessed_block,
+                              sizeof( cmac_ctx->unprocessed_block ) );
+    mbedtls_platform_zeroize( cmac_ctx->state,
+                              sizeof( cmac_ctx->state ) );
+
+    return( 0 );
+}
+
+int mbedtls_cipher_cmac( const mbedtls_cipher_info_t *cipher_info,
+                         const unsigned char *key, size_t keylen,
+                         const unsigned char *input, size_t ilen,
+                         unsigned char *output )
+{
+    mbedtls_cipher_context_t ctx;
+    int ret;
+
+    if( cipher_info == NULL || key == NULL || input == NULL || output == NULL )
+        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+
+    mbedtls_cipher_init( &ctx );
+
+    if( ( ret = mbedtls_cipher_setup( &ctx, cipher_info ) ) != 0 )
+        goto exit;
+
+    ret = mbedtls_cipher_cmac_starts( &ctx, key, keylen );
+    if( ret != 0 )
+        goto exit;
+
+    ret = mbedtls_cipher_cmac_update( &ctx, input, ilen );
+    if( ret != 0 )
+        goto exit;
+
+    ret = mbedtls_cipher_cmac_finish( &ctx, output );
+
+exit:
+    mbedtls_cipher_free( &ctx );
+
+    return( ret );
+}
+
+#if defined(MBEDTLS_AES_C)
+/*
+ * Implementation of AES-CMAC-PRF-128 defined in RFC 4615
+ */
+int mbedtls_aes_cmac_prf_128( const unsigned char *key, size_t key_length,
+                              const unsigned char *input, size_t in_len,
+                              unsigned char *output )
+{
+    int ret;
+    const mbedtls_cipher_info_t *cipher_info;
+    unsigned char zero_key[MBEDTLS_AES_BLOCK_SIZE];
+    unsigned char int_key[MBEDTLS_AES_BLOCK_SIZE];
+
+    if( key == NULL || input == NULL || output == NULL )
+        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+
+    cipher_info = mbedtls_cipher_info_from_type( MBEDTLS_CIPHER_AES_128_ECB );
+    if( cipher_info == NULL )
+    {
+        /* Failing at this point must be due to a build issue */
+        ret = MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE;
+        goto exit;
+    }
+
+    if( key_length == MBEDTLS_AES_BLOCK_SIZE )
+    {
+        /* Use key as is */
+        memcpy( int_key, key, MBEDTLS_AES_BLOCK_SIZE );
+    }
+    else
+    {
+        memset( zero_key, 0, MBEDTLS_AES_BLOCK_SIZE );
+
+        ret = mbedtls_cipher_cmac( cipher_info, zero_key, 128, key,
+                                   key_length, int_key );
+        if( ret != 0 )
+            goto exit;
+    }
+
+    ret = mbedtls_cipher_cmac( cipher_info, int_key, 128, input, in_len,
+                               output );
+
+exit:
+    mbedtls_platform_zeroize( int_key, sizeof( int_key ) );
+
+    return( ret );
+}
+#endif /* MBEDTLS_AES_C */
+
+#endif /* !MBEDTLS_CMAC_ALT */
+
+#if defined(MBEDTLS_SELF_TEST)
+/*
+ * CMAC test data for SP800-38B
+ * http://csrc.nist.gov/groups/ST/toolkit/documents/Examples/AES_CMAC.pdf
+ * http://csrc.nist.gov/groups/ST/toolkit/documents/Examples/TDES_CMAC.pdf
+ *
+ * AES-CMAC-PRF-128 test data from RFC 4615
+ * https://tools.ietf.org/html/rfc4615#page-4
+ */
+
+#define NB_CMAC_TESTS_PER_KEY 4
+#define NB_PRF_TESTS 3
+
+#if defined(MBEDTLS_AES_C) || defined(MBEDTLS_DES_C)
+/* All CMAC test inputs are truncated from the same 64 byte buffer. */
+static const unsigned char test_message[] = {
+    /* PT */
+    0x6b, 0xc1, 0xbe, 0xe2,     0x2e, 0x40, 0x9f, 0x96,
+    0xe9, 0x3d, 0x7e, 0x11,     0x73, 0x93, 0x17, 0x2a,
+    0xae, 0x2d, 0x8a, 0x57,     0x1e, 0x03, 0xac, 0x9c,
+    0x9e, 0xb7, 0x6f, 0xac,     0x45, 0xaf, 0x8e, 0x51,
+    0x30, 0xc8, 0x1c, 0x46,     0xa3, 0x5c, 0xe4, 0x11,
+    0xe5, 0xfb, 0xc1, 0x19,     0x1a, 0x0a, 0x52, 0xef,
+    0xf6, 0x9f, 0x24, 0x45,     0xdf, 0x4f, 0x9b, 0x17,
+    0xad, 0x2b, 0x41, 0x7b,     0xe6, 0x6c, 0x37, 0x10
+};
+#endif /* MBEDTLS_AES_C || MBEDTLS_DES_C */
+
+#if defined(MBEDTLS_AES_C)
+/* Truncation point of message for AES CMAC tests  */
+static const  unsigned int  aes_message_lengths[NB_CMAC_TESTS_PER_KEY] = {
+    /* Mlen */
+    0,
+    16,
+    20,
+    64
+};
+
+/* CMAC-AES128 Test Data */
+static const unsigned char aes_128_key[16] = {
+    0x2b, 0x7e, 0x15, 0x16,     0x28, 0xae, 0xd2, 0xa6,
+    0xab, 0xf7, 0x15, 0x88,     0x09, 0xcf, 0x4f, 0x3c
+};
+static const unsigned char aes_128_subkeys[2][MBEDTLS_AES_BLOCK_SIZE] = {
+    {
+        /* K1 */
+        0xfb, 0xee, 0xd6, 0x18,     0x35, 0x71, 0x33, 0x66,
+        0x7c, 0x85, 0xe0, 0x8f,     0x72, 0x36, 0xa8, 0xde
+    },
+    {
+        /* K2 */
+        0xf7, 0xdd, 0xac, 0x30,     0x6a, 0xe2, 0x66, 0xcc,
+        0xf9, 0x0b, 0xc1, 0x1e,     0xe4, 0x6d, 0x51, 0x3b
+    }
+};
+static const unsigned char aes_128_expected_result[NB_CMAC_TESTS_PER_KEY][MBEDTLS_AES_BLOCK_SIZE] = {
+    {
+        /* Example #1 */
+        0xbb, 0x1d, 0x69, 0x29,     0xe9, 0x59, 0x37, 0x28,
+        0x7f, 0xa3, 0x7d, 0x12,     0x9b, 0x75, 0x67, 0x46
+    },
+    {
+        /* Example #2 */
+        0x07, 0x0a, 0x16, 0xb4,     0x6b, 0x4d, 0x41, 0x44,
+        0xf7, 0x9b, 0xdd, 0x9d,     0xd0, 0x4a, 0x28, 0x7c
+    },
+    {
+        /* Example #3 */
+        0x7d, 0x85, 0x44, 0x9e,     0xa6, 0xea, 0x19, 0xc8,
+        0x23, 0xa7, 0xbf, 0x78,     0x83, 0x7d, 0xfa, 0xde
+    },
+    {
+        /* Example #4 */
+        0x51, 0xf0, 0xbe, 0xbf,     0x7e, 0x3b, 0x9d, 0x92,
+        0xfc, 0x49, 0x74, 0x17,     0x79, 0x36, 0x3c, 0xfe
+    }
+};
+
+/* CMAC-AES192 Test Data */
+static const unsigned char aes_192_key[24] = {
+    0x8e, 0x73, 0xb0, 0xf7,     0xda, 0x0e, 0x64, 0x52,
+    0xc8, 0x10, 0xf3, 0x2b,     0x80, 0x90, 0x79, 0xe5,
+    0x62, 0xf8, 0xea, 0xd2,     0x52, 0x2c, 0x6b, 0x7b
+};
+static const unsigned char aes_192_subkeys[2][MBEDTLS_AES_BLOCK_SIZE] = {
+    {
+        /* K1 */
+        0x44, 0x8a, 0x5b, 0x1c,     0x93, 0x51, 0x4b, 0x27,
+        0x3e, 0xe6, 0x43, 0x9d,     0xd4, 0xda, 0xa2, 0x96
+    },
+    {
+        /* K2 */
+        0x89, 0x14, 0xb6, 0x39,     0x26, 0xa2, 0x96, 0x4e,
+        0x7d, 0xcc, 0x87, 0x3b,     0xa9, 0xb5, 0x45, 0x2c
+    }
+};
+static const unsigned char aes_192_expected_result[NB_CMAC_TESTS_PER_KEY][MBEDTLS_AES_BLOCK_SIZE] = {
+    {
+        /* Example #1 */
+        0xd1, 0x7d, 0xdf, 0x46,     0xad, 0xaa, 0xcd, 0xe5,
+        0x31, 0xca, 0xc4, 0x83,     0xde, 0x7a, 0x93, 0x67
+    },
+    {
+        /* Example #2 */
+        0x9e, 0x99, 0xa7, 0xbf,     0x31, 0xe7, 0x10, 0x90,
+        0x06, 0x62, 0xf6, 0x5e,     0x61, 0x7c, 0x51, 0x84
+    },
+    {
+        /* Example #3 */
+        0x3d, 0x75, 0xc1, 0x94,     0xed, 0x96, 0x07, 0x04,
+        0x44, 0xa9, 0xfa, 0x7e,     0xc7, 0x40, 0xec, 0xf8
+    },
+    {
+        /* Example #4 */
+        0xa1, 0xd5, 0xdf, 0x0e,     0xed, 0x79, 0x0f, 0x79,
+        0x4d, 0x77, 0x58, 0x96,     0x59, 0xf3, 0x9a, 0x11
+    }
+};
+
+/* CMAC-AES256 Test Data */
+static const unsigned char aes_256_key[32] = {
+    0x60, 0x3d, 0xeb, 0x10,     0x15, 0xca, 0x71, 0xbe,
+    0x2b, 0x73, 0xae, 0xf0,     0x85, 0x7d, 0x77, 0x81,
+    0x1f, 0x35, 0x2c, 0x07,     0x3b, 0x61, 0x08, 0xd7,
+    0x2d, 0x98, 0x10, 0xa3,     0x09, 0x14, 0xdf, 0xf4
+};
+static const unsigned char aes_256_subkeys[2][MBEDTLS_AES_BLOCK_SIZE] = {
+    {
+        /* K1 */
+        0xca, 0xd1, 0xed, 0x03,     0x29, 0x9e, 0xed, 0xac,
+        0x2e, 0x9a, 0x99, 0x80,     0x86, 0x21, 0x50, 0x2f
+    },
+    {
+        /* K2 */
+        0x95, 0xa3, 0xda, 0x06,     0x53, 0x3d, 0xdb, 0x58,
+        0x5d, 0x35, 0x33, 0x01,     0x0c, 0x42, 0xa0, 0xd9
+    }
+};
+static const unsigned char aes_256_expected_result[NB_CMAC_TESTS_PER_KEY][MBEDTLS_AES_BLOCK_SIZE] = {
+    {
+        /* Example #1 */
+        0x02, 0x89, 0x62, 0xf6,     0x1b, 0x7b, 0xf8, 0x9e,
+        0xfc, 0x6b, 0x55, 0x1f,     0x46, 0x67, 0xd9, 0x83
+    },
+    {
+        /* Example #2 */
+        0x28, 0xa7, 0x02, 0x3f,     0x45, 0x2e, 0x8f, 0x82,
+        0xbd, 0x4b, 0xf2, 0x8d,     0x8c, 0x37, 0xc3, 0x5c
+    },
+    {
+        /* Example #3 */
+        0x15, 0x67, 0x27, 0xdc,     0x08, 0x78, 0x94, 0x4a,
+        0x02, 0x3c, 0x1f, 0xe0,     0x3b, 0xad, 0x6d, 0x93
+    },
+    {
+        /* Example #4 */
+        0xe1, 0x99, 0x21, 0x90,     0x54, 0x9f, 0x6e, 0xd5,
+        0x69, 0x6a, 0x2c, 0x05,     0x6c, 0x31, 0x54, 0x10
+    }
+};
+#endif /* MBEDTLS_AES_C */
+
+#if defined(MBEDTLS_DES_C)
+/* Truncation point of message for 3DES CMAC tests  */
+static const unsigned int des3_message_lengths[NB_CMAC_TESTS_PER_KEY] = {
+    0,
+    16,
+    20,
+    32
+};
+
+/* CMAC-TDES (Generation) - 2 Key Test Data */
+static const unsigned char des3_2key_key[24] = {
+    /* Key1 */
+    0x01, 0x23, 0x45, 0x67,     0x89, 0xab, 0xcd, 0xef,
+    /* Key2 */
+    0x23, 0x45, 0x67, 0x89,     0xab, 0xcd, 0xEF, 0x01,
+    /* Key3 */
+    0x01, 0x23, 0x45, 0x67,     0x89, 0xab, 0xcd, 0xef
+};
+static const unsigned char des3_2key_subkeys[2][8] = {
+    {
+        /* K1 */
+        0x0d, 0xd2, 0xcb, 0x7a,     0x3d, 0x88, 0x88, 0xd9
+    },
+    {
+        /* K2 */
+        0x1b, 0xa5, 0x96, 0xf4,     0x7b, 0x11, 0x11, 0xb2
+    }
+};
+static const unsigned char des3_2key_expected_result[NB_CMAC_TESTS_PER_KEY][MBEDTLS_DES3_BLOCK_SIZE] = {
+    {
+        /* Sample #1 */
+        0x79, 0xce, 0x52, 0xa7,     0xf7, 0x86, 0xa9, 0x60
+    },
+    {
+        /* Sample #2 */
+        0xcc, 0x18, 0xa0, 0xb7,     0x9a, 0xf2, 0x41, 0x3b
+    },
+    {
+        /* Sample #3 */
+        0xc0, 0x6d, 0x37, 0x7e,     0xcd, 0x10, 0x19, 0x69
+    },
+    {
+        /* Sample #4 */
+        0x9c, 0xd3, 0x35, 0x80,     0xf9, 0xb6, 0x4d, 0xfb
+    }
+};
+
+/* CMAC-TDES (Generation) - 3 Key Test Data */
+static const unsigned char des3_3key_key[24] = {
+    /* Key1 */
+    0x01, 0x23, 0x45, 0x67,     0x89, 0xaa, 0xcd, 0xef,
+    /* Key2 */
+    0x23, 0x45, 0x67, 0x89,     0xab, 0xcd, 0xef, 0x01,
+    /* Key3 */
+    0x45, 0x67, 0x89, 0xab,     0xcd, 0xef, 0x01, 0x23
+};
+static const unsigned char des3_3key_subkeys[2][8] = {
+    {
+        /* K1 */
+        0x9d, 0x74, 0xe7, 0x39,     0x33, 0x17, 0x96, 0xc0
+    },
+    {
+        /* K2 */
+        0x3a, 0xe9, 0xce, 0x72,     0x66, 0x2f, 0x2d, 0x9b
+    }
+};
+static const unsigned char des3_3key_expected_result[NB_CMAC_TESTS_PER_KEY][MBEDTLS_DES3_BLOCK_SIZE] = {
+    {
+        /* Sample #1 */
+        0x7d, 0xb0, 0xd3, 0x7d,     0xf9, 0x36, 0xc5, 0x50
+    },
+    {
+        /* Sample #2 */
+        0x30, 0x23, 0x9c, 0xf1,     0xf5, 0x2e, 0x66, 0x09
+    },
+    {
+        /* Sample #3 */
+        0x6c, 0x9f, 0x3e, 0xe4,     0x92, 0x3f, 0x6b, 0xe2
+    },
+    {
+        /* Sample #4 */
+        0x99, 0x42, 0x9b, 0xd0,     0xbF, 0x79, 0x04, 0xe5
+    }
+};
+
+#endif /* MBEDTLS_DES_C */
+
+#if defined(MBEDTLS_AES_C)
+/* AES AES-CMAC-PRF-128 Test Data */
+static const unsigned char PRFK[] = {
+    /* Key */
+    0x00, 0x01, 0x02, 0x03,     0x04, 0x05, 0x06, 0x07,
+    0x08, 0x09, 0x0a, 0x0b,     0x0c, 0x0d, 0x0e, 0x0f,
+    0xed, 0xcb
+};
+
+/* Sizes in bytes */
+static const size_t PRFKlen[NB_PRF_TESTS] = {
+    18,
+    16,
+    10
+};
+
+/* Message */
+static const unsigned char PRFM[] = {
+    0x00, 0x01, 0x02, 0x03,     0x04, 0x05, 0x06, 0x07,
+    0x08, 0x09, 0x0a, 0x0b,     0x0c, 0x0d, 0x0e, 0x0f,
+    0x10, 0x11, 0x12, 0x13
+};
+
+static const unsigned char PRFT[NB_PRF_TESTS][16] = {
+    {
+        0x84, 0xa3, 0x48, 0xa4,     0xa4, 0x5d, 0x23, 0x5b,
+        0xab, 0xff, 0xfc, 0x0d,     0x2b, 0x4d, 0xa0, 0x9a
+    },
+    {
+        0x98, 0x0a, 0xe8, 0x7b,     0x5f, 0x4c, 0x9c, 0x52,
+        0x14, 0xf5, 0xb6, 0xa8,     0x45, 0x5e, 0x4c, 0x2d
+    },
+    {
+        0x29, 0x0d, 0x9e, 0x11,     0x2e, 0xdb, 0x09, 0xee,
+        0x14, 0x1f, 0xcf, 0x64,     0xc0, 0xb7, 0x2f, 0x3d
+    }
+};
+#endif /* MBEDTLS_AES_C */
+
+static int cmac_test_subkeys( int verbose,
+                              const char* testname,
+                              const unsigned char* key,
+                              int keybits,
+                              const unsigned char* subkeys,
+                              mbedtls_cipher_type_t cipher_type,
+                              int block_size,
+                              int num_tests )
+{
+    int i, ret = 0;
+    mbedtls_cipher_context_t ctx;
+    const mbedtls_cipher_info_t *cipher_info;
+    unsigned char K1[MBEDTLS_CIPHER_BLKSIZE_MAX];
+    unsigned char K2[MBEDTLS_CIPHER_BLKSIZE_MAX];
+
+    cipher_info = mbedtls_cipher_info_from_type( cipher_type );
+    if( cipher_info == NULL )
+    {
+        /* Failing at this point must be due to a build issue */
+        return( MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE );
+    }
+
+    for( i = 0; i < num_tests; i++ )
+    {
+        if( verbose != 0 )
+            mbedtls_printf( "  %s CMAC subkey #%u: ", testname, i + 1 );
+
+        mbedtls_cipher_init( &ctx );
+
+        if( ( ret = mbedtls_cipher_setup( &ctx, cipher_info ) ) != 0 )
+        {
+            if( verbose != 0 )
+                mbedtls_printf( "test execution failed\n" );
+
+            goto cleanup;
+        }
+
+        if( ( ret = mbedtls_cipher_setkey( &ctx, key, keybits,
+                                       MBEDTLS_ENCRYPT ) ) != 0 )
+        {
+            if( verbose != 0 )
+                mbedtls_printf( "test execution failed\n" );
+
+            goto cleanup;
+        }
+
+        ret = cmac_generate_subkeys( &ctx, K1, K2 );
+        if( ret != 0 )
+        {
+           if( verbose != 0 )
+                mbedtls_printf( "failed\n" );
+
+            goto cleanup;
+        }
+
+        if( ( ret = memcmp( K1, subkeys, block_size ) ) != 0  ||
+            ( ret = memcmp( K2, &subkeys[block_size], block_size ) ) != 0 )
+        {
+            if( verbose != 0 )
+                mbedtls_printf( "failed\n" );
+
+            goto cleanup;
+        }
+
+        if( verbose != 0 )
+            mbedtls_printf( "passed\n" );
+
+        mbedtls_cipher_free( &ctx );
+    }
+
+    ret = 0;
+    goto exit;
+
+cleanup:
+    mbedtls_cipher_free( &ctx );
+
+exit:
+    return( ret );
+}
+
+static int cmac_test_wth_cipher( int verbose,
+                                 const char* testname,
+                                 const unsigned char* key,
+                                 int keybits,
+                                 const unsigned char* messages,
+                                 const unsigned int message_lengths[4],
+                                 const unsigned char* expected_result,
+                                 mbedtls_cipher_type_t cipher_type,
+                                 int block_size,
+                                 int num_tests )
+{
+    const mbedtls_cipher_info_t *cipher_info;
+    int i, ret = 0;
+    unsigned char output[MBEDTLS_CIPHER_BLKSIZE_MAX];
+
+    cipher_info = mbedtls_cipher_info_from_type( cipher_type );
+    if( cipher_info == NULL )
+    {
+        /* Failing at this point must be due to a build issue */
+        ret = MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE;
+        goto exit;
+    }
+
+    for( i = 0; i < num_tests; i++ )
+    {
+        if( verbose != 0 )
+            mbedtls_printf( "  %s CMAC #%u: ", testname, i + 1 );
+
+        if( ( ret = mbedtls_cipher_cmac( cipher_info, key, keybits, messages,
+                                         message_lengths[i], output ) ) != 0 )
+        {
+            if( verbose != 0 )
+                mbedtls_printf( "failed\n" );
+            goto exit;
+        }
+
+        if( ( ret = memcmp( output, &expected_result[i * block_size], block_size ) ) != 0 )
+        {
+            if( verbose != 0 )
+                mbedtls_printf( "failed\n" );
+            goto exit;
+        }
+
+        if( verbose != 0 )
+            mbedtls_printf( "passed\n" );
+    }
+    ret = 0;
+
+exit:
+    return( ret );
+}
+
+#if defined(MBEDTLS_AES_C)
+static int test_aes128_cmac_prf( int verbose )
+{
+    int i;
+    int ret;
+    unsigned char output[MBEDTLS_AES_BLOCK_SIZE];
+
+    for( i = 0; i < NB_PRF_TESTS; i++ )
+    {
+        mbedtls_printf( "  AES CMAC 128 PRF #%u: ", i );
+        ret = mbedtls_aes_cmac_prf_128( PRFK, PRFKlen[i], PRFM, 20, output );
+        if( ret != 0 ||
+            memcmp( output, PRFT[i], MBEDTLS_AES_BLOCK_SIZE ) != 0 )
+        {
+
+            if( verbose != 0 )
+                mbedtls_printf( "failed\n" );
+
+            return( ret );
+        }
+        else if( verbose != 0 )
+        {
+            mbedtls_printf( "passed\n" );
+        }
+    }
+    return( ret );
+}
+#endif /* MBEDTLS_AES_C */
+
+int mbedtls_cmac_self_test( int verbose )
+{
+    int ret;
+
+#if defined(MBEDTLS_AES_C)
+    /* AES-128 */
+    if( ( ret = cmac_test_subkeys( verbose,
+                                   "AES 128",
+                                   aes_128_key,
+                                   128,
+                                   (const unsigned char*)aes_128_subkeys,
+                                   MBEDTLS_CIPHER_AES_128_ECB,
+                                   MBEDTLS_AES_BLOCK_SIZE,
+                                   NB_CMAC_TESTS_PER_KEY ) ) != 0 )
+    {
+        return( ret );
+    }
+
+    if( ( ret = cmac_test_wth_cipher( verbose,
+                                      "AES 128",
+                                      aes_128_key,
+                                      128,
+                                      test_message,
+                                      aes_message_lengths,
+                                      (const unsigned char*)aes_128_expected_result,
+                                      MBEDTLS_CIPHER_AES_128_ECB,
+                                      MBEDTLS_AES_BLOCK_SIZE,
+                                      NB_CMAC_TESTS_PER_KEY ) ) != 0 )
+    {
+        return( ret );
+    }
+
+    /* AES-192 */
+    if( ( ret = cmac_test_subkeys( verbose,
+                                   "AES 192",
+                                   aes_192_key,
+                                   192,
+                                   (const unsigned char*)aes_192_subkeys,
+                                   MBEDTLS_CIPHER_AES_192_ECB,
+                                   MBEDTLS_AES_BLOCK_SIZE,
+                                   NB_CMAC_TESTS_PER_KEY ) ) != 0 )
+    {
+        return( ret );
+    }
+
+    if( ( ret = cmac_test_wth_cipher( verbose,
+                                      "AES 192",
+                                      aes_192_key,
+                                      192,
+                                      test_message,
+                                      aes_message_lengths,
+                                      (const unsigned char*)aes_192_expected_result,
+                                      MBEDTLS_CIPHER_AES_192_ECB,
+                                      MBEDTLS_AES_BLOCK_SIZE,
+                                      NB_CMAC_TESTS_PER_KEY ) ) != 0 )
+    {
+        return( ret );
+    }
+
+    /* AES-256 */
+    if( ( ret = cmac_test_subkeys( verbose,
+                                   "AES 256",
+                                   aes_256_key,
+                                   256,
+                                   (const unsigned char*)aes_256_subkeys,
+                                   MBEDTLS_CIPHER_AES_256_ECB,
+                                   MBEDTLS_AES_BLOCK_SIZE,
+                                   NB_CMAC_TESTS_PER_KEY ) ) != 0 )
+    {
+        return( ret );
+    }
+
+    if( ( ret = cmac_test_wth_cipher ( verbose,
+                                       "AES 256",
+                                       aes_256_key,
+                                       256,
+                                       test_message,
+                                       aes_message_lengths,
+                                       (const unsigned char*)aes_256_expected_result,
+                                       MBEDTLS_CIPHER_AES_256_ECB,
+                                       MBEDTLS_AES_BLOCK_SIZE,
+                                       NB_CMAC_TESTS_PER_KEY ) ) != 0 )
+    {
+        return( ret );
+    }
+#endif /* MBEDTLS_AES_C */
+
+#if defined(MBEDTLS_DES_C)
+    /* 3DES 2 key */
+    if( ( ret = cmac_test_subkeys( verbose,
+                                   "3DES 2 key",
+                                   des3_2key_key,
+                                   192,
+                                   (const unsigned char*)des3_2key_subkeys,
+                                   MBEDTLS_CIPHER_DES_EDE3_ECB,
+                                   MBEDTLS_DES3_BLOCK_SIZE,
+                                   NB_CMAC_TESTS_PER_KEY ) ) != 0 )
+    {
+        return( ret );
+    }
+
+    if( ( ret = cmac_test_wth_cipher( verbose,
+                                      "3DES 2 key",
+                                      des3_2key_key,
+                                      192,
+                                      test_message,
+                                      des3_message_lengths,
+                                      (const unsigned char*)des3_2key_expected_result,
+                                      MBEDTLS_CIPHER_DES_EDE3_ECB,
+                                      MBEDTLS_DES3_BLOCK_SIZE,
+                                      NB_CMAC_TESTS_PER_KEY ) ) != 0 )
+    {
+        return( ret );
+    }
+
+    /* 3DES 3 key */
+    if( ( ret = cmac_test_subkeys( verbose,
+                                   "3DES 3 key",
+                                   des3_3key_key,
+                                   192,
+                                   (const unsigned char*)des3_3key_subkeys,
+                                   MBEDTLS_CIPHER_DES_EDE3_ECB,
+                                   MBEDTLS_DES3_BLOCK_SIZE,
+                                   NB_CMAC_TESTS_PER_KEY ) ) != 0 )
+    {
+        return( ret );
+    }
+
+    if( ( ret = cmac_test_wth_cipher( verbose,
+                                      "3DES 3 key",
+                                      des3_3key_key,
+                                      192,
+                                      test_message,
+                                      des3_message_lengths,
+                                      (const unsigned char*)des3_3key_expected_result,
+                                      MBEDTLS_CIPHER_DES_EDE3_ECB,
+                                      MBEDTLS_DES3_BLOCK_SIZE,
+                                      NB_CMAC_TESTS_PER_KEY ) ) != 0 )
+    {
+        return( ret );
+    }
+#endif /* MBEDTLS_DES_C */
+
+#if defined(MBEDTLS_AES_C)
+    if( ( ret = test_aes128_cmac_prf( verbose ) ) != 0 )
+        return( ret );
+#endif /* MBEDTLS_AES_C */
+
+    if( verbose != 0 )
+        mbedtls_printf( "\n" );
+
+    return( 0 );
+}
+
+#endif /* MBEDTLS_SELF_TEST */
+
+#endif /* MBEDTLS_CMAC_C */
diff --git a/common/mbedtls/cmac.h b/common/mbedtls/cmac.h
new file mode 100644
index 000000000..f6fc79b74
--- /dev/null
+++ b/common/mbedtls/cmac.h
@@ -0,0 +1,208 @@
+/**
+ * \file cmac.h
+ *
+ * \brief This file contains CMAC definitions and functions.
+ *
+ * The Cipher-based Message Authentication Code (CMAC) Mode for
+ * Authentication is defined in <em>RFC-4493: The AES-CMAC Algorithm</em>.
+ */
+/*
+ *  Copyright (C) 2015-2018, Arm Limited (or its affiliates), All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of Mbed TLS (https://tls.mbed.org)
+ */
+
+#ifndef MBEDTLS_CMAC_H
+#define MBEDTLS_CMAC_H
+
+#include "cipher.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define MBEDTLS_ERR_CMAC_HW_ACCEL_FAILED -0x007A  /**< CMAC hardware accelerator failed. */
+
+#define MBEDTLS_AES_BLOCK_SIZE          16
+#define MBEDTLS_DES3_BLOCK_SIZE         8
+
+#if defined(MBEDTLS_AES_C)
+#define MBEDTLS_CIPHER_BLKSIZE_MAX      16  /**< The longest block used by CMAC is that of AES. */
+#else
+#define MBEDTLS_CIPHER_BLKSIZE_MAX      8   /**< The longest block used by CMAC is that of 3DES. */
+#endif
+
+#if !defined(MBEDTLS_CMAC_ALT)
+
+/**
+ * The CMAC context structure.
+ */
+struct mbedtls_cmac_context_t
+{
+    /** The internal state of the CMAC algorithm.  */
+    unsigned char       state[MBEDTLS_CIPHER_BLKSIZE_MAX];
+
+    /** Unprocessed data - either data that was not block aligned and is still
+     *  pending processing, or the final block. */
+    unsigned char       unprocessed_block[MBEDTLS_CIPHER_BLKSIZE_MAX];
+
+    /** The length of data pending processing. */
+    size_t              unprocessed_len;
+};
+
+#else  /* !MBEDTLS_CMAC_ALT */
+#include "cmac_alt.h"
+#endif /* !MBEDTLS_CMAC_ALT */
+
+/**
+ * \brief               This function sets the CMAC key, and prepares to authenticate
+ *                      the input data.
+ *                      Must be called with an initialized cipher context.
+ *
+ * \param ctx           The cipher context used for the CMAC operation, initialized
+ *                      as one of the following types: MBEDTLS_CIPHER_AES_128_ECB,
+ *                      MBEDTLS_CIPHER_AES_192_ECB, MBEDTLS_CIPHER_AES_256_ECB,
+ *                      or MBEDTLS_CIPHER_DES_EDE3_ECB.
+ * \param key           The CMAC key.
+ * \param keybits       The length of the CMAC key in bits.
+ *                      Must be supported by the cipher.
+ *
+ * \return              \c 0 on success.
+ * \return              A cipher-specific error code on failure.
+ */
+int mbedtls_cipher_cmac_starts( mbedtls_cipher_context_t *ctx,
+                                const unsigned char *key, size_t keybits );
+
+/**
+ * \brief               This function feeds an input buffer into an ongoing CMAC
+ *                      computation.
+ *
+ *                      It is called between mbedtls_cipher_cmac_starts() or
+ *                      mbedtls_cipher_cmac_reset(), and mbedtls_cipher_cmac_finish().
+ *                      Can be called repeatedly.
+ *
+ * \param ctx           The cipher context used for the CMAC operation.
+ * \param input         The buffer holding the input data.
+ * \param ilen          The length of the input data.
+ *
+ * \return             \c 0 on success.
+ * \return             #MBEDTLS_ERR_MD_BAD_INPUT_DATA
+ *                     if parameter verification fails.
+ */
+int mbedtls_cipher_cmac_update( mbedtls_cipher_context_t *ctx,
+                                const unsigned char *input, size_t ilen );
+
+/**
+ * \brief               This function finishes the CMAC operation, and writes
+ *                      the result to the output buffer.
+ *
+ *                      It is called after mbedtls_cipher_cmac_update().
+ *                      It can be followed by mbedtls_cipher_cmac_reset() and
+ *                      mbedtls_cipher_cmac_update(), or mbedtls_cipher_free().
+ *
+ * \param ctx           The cipher context used for the CMAC operation.
+ * \param output        The output buffer for the CMAC checksum result.
+ *
+ * \return              \c 0 on success.
+ * \return              #MBEDTLS_ERR_MD_BAD_INPUT_DATA
+ *                      if parameter verification fails.
+ */
+int mbedtls_cipher_cmac_finish( mbedtls_cipher_context_t *ctx,
+                                unsigned char *output );
+
+/**
+ * \brief               This function prepares the authentication of another
+ *                      message with the same key as the previous CMAC
+ *                      operation.
+ *
+ *                      It is called after mbedtls_cipher_cmac_finish()
+ *                      and before mbedtls_cipher_cmac_update().
+ *
+ * \param ctx           The cipher context used for the CMAC operation.
+ *
+ * \return              \c 0 on success.
+ * \return              #MBEDTLS_ERR_MD_BAD_INPUT_DATA
+ *                      if parameter verification fails.
+ */
+int mbedtls_cipher_cmac_reset( mbedtls_cipher_context_t *ctx );
+
+/**
+ * \brief               This function calculates the full generic CMAC
+ *                      on the input buffer with the provided key.
+ *
+ *                      The function allocates the context, performs the
+ *                      calculation, and frees the context.
+ *
+ *                      The CMAC result is calculated as
+ *                      output = generic CMAC(cmac key, input buffer).
+ *
+ *
+ * \param cipher_info   The cipher information.
+ * \param key           The CMAC key.
+ * \param keylen        The length of the CMAC key in bits.
+ * \param input         The buffer holding the input data.
+ * \param ilen          The length of the input data.
+ * \param output        The buffer for the generic CMAC result.
+ *
+ * \return              \c 0 on success.
+ * \return              #MBEDTLS_ERR_MD_BAD_INPUT_DATA
+ *                      if parameter verification fails.
+ */
+int mbedtls_cipher_cmac( const mbedtls_cipher_info_t *cipher_info,
+                         const unsigned char *key, size_t keylen,
+                         const unsigned char *input, size_t ilen,
+                         unsigned char *output );
+
+#if defined(MBEDTLS_AES_C)
+/**
+ * \brief           This function implements the AES-CMAC-PRF-128 pseudorandom
+ *                  function, as defined in
+ *                  <em>RFC-4615: The Advanced Encryption Standard-Cipher-based
+ *                  Message Authentication Code-Pseudo-Random Function-128
+ *                  (AES-CMAC-PRF-128) Algorithm for the Internet Key
+ *                  Exchange Protocol (IKE).</em>
+ *
+ * \param key       The key to use.
+ * \param key_len   The key length in Bytes.
+ * \param input     The buffer holding the input data.
+ * \param in_len    The length of the input data in Bytes.
+ * \param output    The buffer holding the generated 16 Bytes of
+ *                  pseudorandom output.
+ *
+ * \return          \c 0 on success.
+ */
+int mbedtls_aes_cmac_prf_128( const unsigned char *key, size_t key_len,
+                              const unsigned char *input, size_t in_len,
+                              unsigned char output[16] );
+#endif /* MBEDTLS_AES_C */
+
+#if defined(MBEDTLS_SELF_TEST) && ( defined(MBEDTLS_AES_C) || defined(MBEDTLS_DES_C) )
+/**
+ * \brief          The CMAC checkup routine.
+ *
+ * \return         \c 0 on success.
+ * \return         \c 1 on failure.
+ */
+int mbedtls_cmac_self_test( int verbose );
+#endif /* MBEDTLS_SELF_TEST && ( MBEDTLS_AES_C || MBEDTLS_DES_C ) */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* MBEDTLS_CMAC_H */
diff --git a/common/mbedtls/config.h b/common/mbedtls/config.h
new file mode 100644
index 000000000..dfda7ca40
--- /dev/null
+++ b/common/mbedtls/config.h
@@ -0,0 +1,3129 @@
+/**
+ * \file config.h
+ *
+ * \brief Configuration options (set of defines)
+ *
+ *  This set of compile-time options may be used to enable
+ *  or disable features selectively, and reduce the global
+ *  memory footprint.
+ */
+/*
+ *  Copyright (C) 2006-2018, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+
+#ifndef MBEDTLS_CONFIG_H
+#define MBEDTLS_CONFIG_H
+
+#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE)
+#define _CRT_SECURE_NO_DEPRECATE 1
+#endif
+
+/**
+ * \name SECTION: System support
+ *
+ * This section sets system specific settings.
+ * \{
+ */
+
+/**
+ * \def MBEDTLS_HAVE_ASM
+ *
+ * The compiler has support for asm().
+ *
+ * Requires support for asm() in compiler.
+ *
+ * Used in:
+ *      library/aria.c
+ *      library/timing.c
+ *      include/mbedtls/bn_mul.h
+ *
+ * Required by:
+ *      MBEDTLS_AESNI_C
+ *      MBEDTLS_PADLOCK_C
+ *
+ * Comment to disable the use of assembly code.
+ */
+//#define MBEDTLS_HAVE_ASM
+
+/**
+ * \def MBEDTLS_NO_UDBL_DIVISION
+ *
+ * The platform lacks support for double-width integer division (64-bit
+ * division on a 32-bit platform, 128-bit division on a 64-bit platform).
+ *
+ * Used in:
+ *      include/mbedtls/bignum.h
+ *      library/bignum.c
+ *
+ * The bignum code uses double-width division to speed up some operations.
+ * Double-width division is often implemented in software that needs to
+ * be linked with the program. The presence of a double-width integer
+ * type is usually detected automatically through preprocessor macros,
+ * but the automatic detection cannot know whether the code needs to
+ * and can be linked with an implementation of division for that type.
+ * By default division is assumed to be usable if the type is present.
+ * Uncomment this option to prevent the use of double-width division.
+ *
+ * Note that division for the native integer type is always required.
+ * Furthermore, a 64-bit type is always required even on a 32-bit
+ * platform, but it need not support multiplication or division. In some
+ * cases it is also desirable to disable some double-width operations. For
+ * example, if double-width division is implemented in software, disabling
+ * it can reduce code size in some embedded targets.
+ */
+//#define MBEDTLS_NO_UDBL_DIVISION
+
+/**
+ * \def MBEDTLS_NO_64BIT_MULTIPLICATION
+ *
+ * The platform lacks support for 32x32 -> 64-bit multiplication.
+ *
+ * Used in:
+ *      library/poly1305.c
+ *
+ * Some parts of the library may use multiplication of two unsigned 32-bit
+ * operands with a 64-bit result in order to speed up computations. On some
+ * platforms, this is not available in hardware and has to be implemented in
+ * software, usually in a library provided by the toolchain.
+ *
+ * Sometimes it is not desirable to have to link to that library. This option
+ * removes the dependency of that library on platforms that lack a hardware
+ * 64-bit multiplier by embedding a software implementation in Mbed TLS.
+ *
+ * Note that depending on the compiler, this may decrease performance compared
+ * to using the library function provided by the toolchain.
+ */
+//#define MBEDTLS_NO_64BIT_MULTIPLICATION
+
+/**
+ * \def MBEDTLS_HAVE_SSE2
+ *
+ * CPU supports SSE2 instruction set.
+ *
+ * Uncomment if the CPU supports SSE2 (IA-32 specific).
+ */
+//#define MBEDTLS_HAVE_SSE2
+
+/**
+ * \def MBEDTLS_HAVE_TIME
+ *
+ * System has time.h and time().
+ * The time does not need to be correct, only time differences are used,
+ * by contrast with MBEDTLS_HAVE_TIME_DATE
+ *
+ * Defining MBEDTLS_HAVE_TIME allows you to specify MBEDTLS_PLATFORM_TIME_ALT,
+ * MBEDTLS_PLATFORM_TIME_MACRO, MBEDTLS_PLATFORM_TIME_TYPE_MACRO and
+ * MBEDTLS_PLATFORM_STD_TIME.
+ *
+ * Comment if your system does not support time functions
+ */
+//#define MBEDTLS_HAVE_TIME
+
+/**
+ * \def MBEDTLS_HAVE_TIME_DATE
+ *
+ * System has time.h and time(), gmtime() and the clock is correct.
+ * The time needs to be correct (not necesarily very accurate, but at least
+ * the date should be correct). This is used to verify the validity period of
+ * X.509 certificates.
+ *
+ * Comment if your system does not have a correct clock.
+ */
+//#define MBEDTLS_HAVE_TIME_DATE
+
+/**
+ * \def MBEDTLS_PLATFORM_MEMORY
+ *
+ * Enable the memory allocation layer.
+ *
+ * By default mbed TLS uses the system-provided calloc() and free().
+ * This allows different allocators (self-implemented or provided) to be
+ * provided to the platform abstraction layer.
+ *
+ * Enabling MBEDTLS_PLATFORM_MEMORY without the
+ * MBEDTLS_PLATFORM_{FREE,CALLOC}_MACROs will provide
+ * "mbedtls_platform_set_calloc_free()" allowing you to set an alternative calloc() and
+ * free() function pointer at runtime.
+ *
+ * Enabling MBEDTLS_PLATFORM_MEMORY and specifying
+ * MBEDTLS_PLATFORM_{CALLOC,FREE}_MACROs will allow you to specify the
+ * alternate function at compile time.
+ *
+ * Requires: MBEDTLS_PLATFORM_C
+ *
+ * Enable this layer to allow use of alternative memory allocators.
+ */
+//#define MBEDTLS_PLATFORM_MEMORY
+
+/**
+ * \def MBEDTLS_PLATFORM_NO_STD_FUNCTIONS
+ *
+ * Do not assign standard functions in the platform layer (e.g. calloc() to
+ * MBEDTLS_PLATFORM_STD_CALLOC and printf() to MBEDTLS_PLATFORM_STD_PRINTF)
+ *
+ * This makes sure there are no linking errors on platforms that do not support
+ * these functions. You will HAVE to provide alternatives, either at runtime
+ * via the platform_set_xxx() functions or at compile time by setting
+ * the MBEDTLS_PLATFORM_STD_XXX defines, or enabling a
+ * MBEDTLS_PLATFORM_XXX_MACRO.
+ *
+ * Requires: MBEDTLS_PLATFORM_C
+ *
+ * Uncomment to prevent default assignment of standard functions in the
+ * platform layer.
+ */
+//#define MBEDTLS_PLATFORM_NO_STD_FUNCTIONS
+
+/**
+ * \def MBEDTLS_PLATFORM_EXIT_ALT
+ *
+ * MBEDTLS_PLATFORM_XXX_ALT: Uncomment a macro to let mbed TLS support the
+ * function in the platform abstraction layer.
+ *
+ * Example: In case you uncomment MBEDTLS_PLATFORM_PRINTF_ALT, mbed TLS will
+ * provide a function "mbedtls_platform_set_printf()" that allows you to set an
+ * alternative printf function pointer.
+ *
+ * All these define require MBEDTLS_PLATFORM_C to be defined!
+ *
+ * \note MBEDTLS_PLATFORM_SNPRINTF_ALT is required on Windows;
+ * it will be enabled automatically by check_config.h
+ *
+ * \warning MBEDTLS_PLATFORM_XXX_ALT cannot be defined at the same time as
+ * MBEDTLS_PLATFORM_XXX_MACRO!
+ *
+ * Requires: MBEDTLS_PLATFORM_TIME_ALT requires MBEDTLS_HAVE_TIME
+ *
+ * Uncomment a macro to enable alternate implementation of specific base
+ * platform function
+ */
+//#define MBEDTLS_PLATFORM_EXIT_ALT
+//#define MBEDTLS_PLATFORM_TIME_ALT
+//#define MBEDTLS_PLATFORM_FPRINTF_ALT
+//#define MBEDTLS_PLATFORM_PRINTF_ALT
+//#define MBEDTLS_PLATFORM_SNPRINTF_ALT
+//#define MBEDTLS_PLATFORM_NV_SEED_ALT
+//#define MBEDTLS_PLATFORM_SETUP_TEARDOWN_ALT
+
+/**
+ * \def MBEDTLS_DEPRECATED_WARNING
+ *
+ * Mark deprecated functions so that they generate a warning if used.
+ * Functions deprecated in one version will usually be removed in the next
+ * version. You can enable this to help you prepare the transition to a new
+ * major version by making sure your code is not using these functions.
+ *
+ * This only works with GCC and Clang. With other compilers, you may want to
+ * use MBEDTLS_DEPRECATED_REMOVED
+ *
+ * Uncomment to get warnings on using deprecated functions.
+ */
+//#define MBEDTLS_DEPRECATED_WARNING
+
+/**
+ * \def MBEDTLS_DEPRECATED_REMOVED
+ *
+ * Remove deprecated functions so that they generate an error if used.
+ * Functions deprecated in one version will usually be removed in the next
+ * version. You can enable this to help you prepare the transition to a new
+ * major version by making sure your code is not using these functions.
+ *
+ * Uncomment to get errors on using deprecated functions.
+ */
+//#define MBEDTLS_DEPRECATED_REMOVED
+
+/* \} name SECTION: System support */
+
+/**
+ * \name SECTION: mbed TLS feature support
+ *
+ * This section sets support for features that are or are not needed
+ * within the modules that are enabled.
+ * \{
+ */
+
+/**
+ * \def MBEDTLS_TIMING_ALT
+ *
+ * Uncomment to provide your own alternate implementation for mbedtls_timing_hardclock(),
+ * mbedtls_timing_get_timer(), mbedtls_set_alarm(), mbedtls_set/get_delay()
+ *
+ * Only works if you have MBEDTLS_TIMING_C enabled.
+ *
+ * You will need to provide a header "timing_alt.h" and an implementation at
+ * compile time.
+ */
+//#define MBEDTLS_TIMING_ALT
+
+/**
+ * \def MBEDTLS_AES_ALT
+ *
+ * MBEDTLS__MODULE_NAME__ALT: Uncomment a macro to let mbed TLS use your
+ * alternate core implementation of a symmetric crypto, an arithmetic or hash
+ * module (e.g. platform specific assembly optimized implementations). Keep
+ * in mind that the function prototypes should remain the same.
+ *
+ * This replaces the whole module. If you only want to replace one of the
+ * functions, use one of the MBEDTLS__FUNCTION_NAME__ALT flags.
+ *
+ * Example: In case you uncomment MBEDTLS_AES_ALT, mbed TLS will no longer
+ * provide the "struct mbedtls_aes_context" definition and omit the base
+ * function declarations and implementations. "aes_alt.h" will be included from
+ * "aes.h" to include the new function definitions.
+ *
+ * Uncomment a macro to enable alternate implementation of the corresponding
+ * module.
+ *
+ * \warning   MD2, MD4, MD5, ARC4, DES and SHA-1 are considered weak and their
+ *            use constitutes a security risk. If possible, we recommend
+ *            avoiding dependencies on them, and considering stronger message
+ *            digests and ciphers instead.
+ *
+ */
+//#define MBEDTLS_AES_ALT
+//#define MBEDTLS_ARC4_ALT
+//#define MBEDTLS_ARIA_ALT
+//#define MBEDTLS_BLOWFISH_ALT
+//#define MBEDTLS_CAMELLIA_ALT
+//#define MBEDTLS_CCM_ALT
+//#define MBEDTLS_CHACHA20_ALT
+//#define MBEDTLS_CHACHAPOLY_ALT
+//#define MBEDTLS_CMAC_ALT
+//#define MBEDTLS_DES_ALT
+//#define MBEDTLS_DHM_ALT
+//#define MBEDTLS_ECJPAKE_ALT
+//#define MBEDTLS_GCM_ALT
+//#define MBEDTLS_NIST_KW_ALT
+//#define MBEDTLS_MD2_ALT
+//#define MBEDTLS_MD4_ALT
+//#define MBEDTLS_MD5_ALT
+//#define MBEDTLS_POLY1305_ALT
+//#define MBEDTLS_RIPEMD160_ALT
+//#define MBEDTLS_RSA_ALT
+//#define MBEDTLS_SHA1_ALT
+//#define MBEDTLS_SHA256_ALT
+//#define MBEDTLS_SHA512_ALT
+//#define MBEDTLS_XTEA_ALT
+
+/*
+ * When replacing the elliptic curve module, pleace consider, that it is
+ * implemented with two .c files:
+ *      - ecp.c
+ *      - ecp_curves.c
+ * You can replace them very much like all the other MBEDTLS__MODULE_NAME__ALT
+ * macros as described above. The only difference is that you have to make sure
+ * that you provide functionality for both .c files.
+ */
+//#define MBEDTLS_ECP_ALT
+
+/**
+ * \def MBEDTLS_MD2_PROCESS_ALT
+ *
+ * MBEDTLS__FUNCTION_NAME__ALT: Uncomment a macro to let mbed TLS use you
+ * alternate core implementation of symmetric crypto or hash function. Keep in
+ * mind that function prototypes should remain the same.
+ *
+ * This replaces only one function. The header file from mbed TLS is still
+ * used, in contrast to the MBEDTLS__MODULE_NAME__ALT flags.
+ *
+ * Example: In case you uncomment MBEDTLS_SHA256_PROCESS_ALT, mbed TLS will
+ * no longer provide the mbedtls_sha1_process() function, but it will still provide
+ * the other function (using your mbedtls_sha1_process() function) and the definition
+ * of mbedtls_sha1_context, so your implementation of mbedtls_sha1_process must be compatible
+ * with this definition.
+ *
+ * \note Because of a signature change, the core AES encryption and decryption routines are
+ *       currently named mbedtls_aes_internal_encrypt and mbedtls_aes_internal_decrypt,
+ *       respectively. When setting up alternative implementations, these functions should
+ *       be overriden, but the wrapper functions mbedtls_aes_decrypt and mbedtls_aes_encrypt
+ *       must stay untouched.
+ *
+ * \note If you use the AES_xxx_ALT macros, then is is recommended to also set
+ *       MBEDTLS_AES_ROM_TABLES in order to help the linker garbage-collect the AES
+ *       tables.
+ *
+ * Uncomment a macro to enable alternate implementation of the corresponding
+ * function.
+ *
+ * \warning   MD2, MD4, MD5, DES and SHA-1 are considered weak and their use
+ *            constitutes a security risk. If possible, we recommend avoiding
+ *            dependencies on them, and considering stronger message digests
+ *            and ciphers instead.
+ *
+ */
+//#define MBEDTLS_MD2_PROCESS_ALT
+//#define MBEDTLS_MD4_PROCESS_ALT
+//#define MBEDTLS_MD5_PROCESS_ALT
+//#define MBEDTLS_RIPEMD160_PROCESS_ALT
+//#define MBEDTLS_SHA1_PROCESS_ALT
+//#define MBEDTLS_SHA256_PROCESS_ALT
+//#define MBEDTLS_SHA512_PROCESS_ALT
+//#define MBEDTLS_DES_SETKEY_ALT
+//#define MBEDTLS_DES_CRYPT_ECB_ALT
+//#define MBEDTLS_DES3_CRYPT_ECB_ALT
+//#define MBEDTLS_AES_SETKEY_ENC_ALT
+//#define MBEDTLS_AES_SETKEY_DEC_ALT
+//#define MBEDTLS_AES_ENCRYPT_ALT
+//#define MBEDTLS_AES_DECRYPT_ALT
+//#define MBEDTLS_ECDH_GEN_PUBLIC_ALT
+//#define MBEDTLS_ECDH_COMPUTE_SHARED_ALT
+//#define MBEDTLS_ECDSA_VERIFY_ALT
+//#define MBEDTLS_ECDSA_SIGN_ALT
+//#define MBEDTLS_ECDSA_GENKEY_ALT
+
+/**
+ * \def MBEDTLS_ECP_INTERNAL_ALT
+ *
+ * Expose a part of the internal interface of the Elliptic Curve Point module.
+ *
+ * MBEDTLS_ECP__FUNCTION_NAME__ALT: Uncomment a macro to let mbed TLS use your
+ * alternative core implementation of elliptic curve arithmetic. Keep in mind
+ * that function prototypes should remain the same.
+ *
+ * This partially replaces one function. The header file from mbed TLS is still
+ * used, in contrast to the MBEDTLS_ECP_ALT flag. The original implementation
+ * is still present and it is used for group structures not supported by the
+ * alternative.
+ *
+ * Any of these options become available by defining MBEDTLS_ECP_INTERNAL_ALT
+ * and implementing the following functions:
+ *      unsigned char mbedtls_internal_ecp_grp_capable(
+ *          const mbedtls_ecp_group *grp )
+ *      int  mbedtls_internal_ecp_init( const mbedtls_ecp_group *grp )
+ *      void mbedtls_internal_ecp_deinit( const mbedtls_ecp_group *grp )
+ * The mbedtls_internal_ecp_grp_capable function should return 1 if the
+ * replacement functions implement arithmetic for the given group and 0
+ * otherwise.
+ * The functions mbedtls_internal_ecp_init and mbedtls_internal_ecp_deinit are
+ * called before and after each point operation and provide an opportunity to
+ * implement optimized set up and tear down instructions.
+ *
+ * Example: In case you uncomment MBEDTLS_ECP_INTERNAL_ALT and
+ * MBEDTLS_ECP_DOUBLE_JAC_ALT, mbed TLS will still provide the ecp_double_jac
+ * function, but will use your mbedtls_internal_ecp_double_jac if the group is
+ * supported (your mbedtls_internal_ecp_grp_capable function returns 1 when
+ * receives it as an argument). If the group is not supported then the original
+ * implementation is used. The other functions and the definition of
+ * mbedtls_ecp_group and mbedtls_ecp_point will not change, so your
+ * implementation of mbedtls_internal_ecp_double_jac and
+ * mbedtls_internal_ecp_grp_capable must be compatible with this definition.
+ *
+ * Uncomment a macro to enable alternate implementation of the corresponding
+ * function.
+ */
+/* Required for all the functions in this section */
+//#define MBEDTLS_ECP_INTERNAL_ALT
+/* Support for Weierstrass curves with Jacobi representation */
+//#define MBEDTLS_ECP_RANDOMIZE_JAC_ALT
+//#define MBEDTLS_ECP_ADD_MIXED_ALT
+//#define MBEDTLS_ECP_DOUBLE_JAC_ALT
+//#define MBEDTLS_ECP_NORMALIZE_JAC_MANY_ALT
+//#define MBEDTLS_ECP_NORMALIZE_JAC_ALT
+/* Support for curves with Montgomery arithmetic */
+//#define MBEDTLS_ECP_DOUBLE_ADD_MXZ_ALT
+//#define MBEDTLS_ECP_RANDOMIZE_MXZ_ALT
+//#define MBEDTLS_ECP_NORMALIZE_MXZ_ALT
+
+/**
+ * \def MBEDTLS_TEST_NULL_ENTROPY
+ *
+ * Enables testing and use of mbed TLS without any configured entropy sources.
+ * This permits use of the library on platforms before an entropy source has
+ * been integrated (see for example the MBEDTLS_ENTROPY_HARDWARE_ALT or the
+ * MBEDTLS_ENTROPY_NV_SEED switches).
+ *
+ * WARNING! This switch MUST be disabled in production builds, and is suitable
+ * only for development.
+ * Enabling the switch negates any security provided by the library.
+ *
+ * Requires MBEDTLS_ENTROPY_C, MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES
+ *
+ */
+//#define MBEDTLS_TEST_NULL_ENTROPY
+
+/**
+ * \def MBEDTLS_ENTROPY_HARDWARE_ALT
+ *
+ * Uncomment this macro to let mbed TLS use your own implementation of a
+ * hardware entropy collector.
+ *
+ * Your function must be called \c mbedtls_hardware_poll(), have the same
+ * prototype as declared in entropy_poll.h, and accept NULL as first argument.
+ *
+ * Uncomment to use your own hardware entropy collector.
+ */
+//#define MBEDTLS_ENTROPY_HARDWARE_ALT
+
+/**
+ * \def MBEDTLS_AES_ROM_TABLES
+ *
+ * Use precomputed AES tables stored in ROM.
+ *
+ * Uncomment this macro to use precomputed AES tables stored in ROM.
+ * Comment this macro to generate AES tables in RAM at runtime.
+ *
+ * Tradeoff: Using precomputed ROM tables reduces RAM usage by ~8kb
+ * (or ~2kb if \c MBEDTLS_AES_FEWER_TABLES is used) and reduces the
+ * initialization time before the first AES operation can be performed.
+ * It comes at the cost of additional ~8kb ROM use (resp. ~2kb if \c
+ * MBEDTLS_AES_FEWER_TABLES below is used), and potentially degraded
+ * performance if ROM access is slower than RAM access.
+ *
+ * This option is independent of \c MBEDTLS_AES_FEWER_TABLES.
+ *
+ */
+//#define MBEDTLS_AES_ROM_TABLES
+
+/**
+ * \def MBEDTLS_AES_FEWER_TABLES
+ *
+ * Use less ROM/RAM for AES tables.
+ *
+ * Uncommenting this macro omits 75% of the AES tables from
+ * ROM / RAM (depending on the value of \c MBEDTLS_AES_ROM_TABLES)
+ * by computing their values on the fly during operations
+ * (the tables are entry-wise rotations of one another).
+ *
+ * Tradeoff: Uncommenting this reduces the RAM / ROM footprint
+ * by ~6kb but at the cost of more arithmetic operations during
+ * runtime. Specifically, one has to compare 4 accesses within
+ * different tables to 4 accesses with additional arithmetic
+ * operations within the same table. The performance gain/loss
+ * depends on the system and memory details.
+ *
+ * This option is independent of \c MBEDTLS_AES_ROM_TABLES.
+ *
+ */
+//#define MBEDTLS_AES_FEWER_TABLES
+
+/**
+ * \def MBEDTLS_CAMELLIA_SMALL_MEMORY
+ *
+ * Use less ROM for the Camellia implementation (saves about 768 bytes).
+ *
+ * Uncomment this macro to use less memory for Camellia.
+ */
+//#define MBEDTLS_CAMELLIA_SMALL_MEMORY
+
+/**
+ * \def MBEDTLS_CIPHER_MODE_CBC
+ *
+ * Enable Cipher Block Chaining mode (CBC) for symmetric ciphers.
+ */
+#define MBEDTLS_CIPHER_MODE_CBC
+
+/**
+ * \def MBEDTLS_CIPHER_MODE_CFB
+ *
+ * Enable Cipher Feedback mode (CFB) for symmetric ciphers.
+ */
+#define MBEDTLS_CIPHER_MODE_CFB
+
+/**
+ * \def MBEDTLS_CIPHER_MODE_CTR
+ *
+ * Enable Counter Block Cipher mode (CTR) for symmetric ciphers.
+ */
+#define MBEDTLS_CIPHER_MODE_CTR
+
+/**
+ * \def MBEDTLS_CIPHER_MODE_OFB
+ *
+ * Enable Output Feedback mode (OFB) for symmetric ciphers.
+ */
+#define MBEDTLS_CIPHER_MODE_OFB
+
+/**
+ * \def MBEDTLS_CIPHER_MODE_XTS
+ *
+ * Enable Xor-encrypt-xor with ciphertext stealing mode (XTS) for AES.
+ */
+#define MBEDTLS_CIPHER_MODE_XTS
+
+/**
+ * \def MBEDTLS_CIPHER_NULL_CIPHER
+ *
+ * Enable NULL cipher.
+ * Warning: Only do so when you know what you are doing. This allows for
+ * encryption or channels without any security!
+ *
+ * Requires MBEDTLS_ENABLE_WEAK_CIPHERSUITES as well to enable
+ * the following ciphersuites:
+ *      MBEDTLS_TLS_ECDH_ECDSA_WITH_NULL_SHA
+ *      MBEDTLS_TLS_ECDH_RSA_WITH_NULL_SHA
+ *      MBEDTLS_TLS_ECDHE_ECDSA_WITH_NULL_SHA
+ *      MBEDTLS_TLS_ECDHE_RSA_WITH_NULL_SHA
+ *      MBEDTLS_TLS_ECDHE_PSK_WITH_NULL_SHA384
+ *      MBEDTLS_TLS_ECDHE_PSK_WITH_NULL_SHA256
+ *      MBEDTLS_TLS_ECDHE_PSK_WITH_NULL_SHA
+ *      MBEDTLS_TLS_DHE_PSK_WITH_NULL_SHA384
+ *      MBEDTLS_TLS_DHE_PSK_WITH_NULL_SHA256
+ *      MBEDTLS_TLS_DHE_PSK_WITH_NULL_SHA
+ *      MBEDTLS_TLS_RSA_WITH_NULL_SHA256
+ *      MBEDTLS_TLS_RSA_WITH_NULL_SHA
+ *      MBEDTLS_TLS_RSA_WITH_NULL_MD5
+ *      MBEDTLS_TLS_RSA_PSK_WITH_NULL_SHA384
+ *      MBEDTLS_TLS_RSA_PSK_WITH_NULL_SHA256
+ *      MBEDTLS_TLS_RSA_PSK_WITH_NULL_SHA
+ *      MBEDTLS_TLS_PSK_WITH_NULL_SHA384
+ *      MBEDTLS_TLS_PSK_WITH_NULL_SHA256
+ *      MBEDTLS_TLS_PSK_WITH_NULL_SHA
+ *
+ * Uncomment this macro to enable the NULL cipher and ciphersuites
+ */
+//#define MBEDTLS_CIPHER_NULL_CIPHER
+
+/**
+ * \def MBEDTLS_CIPHER_PADDING_PKCS7
+ *
+ * MBEDTLS_CIPHER_PADDING_XXX: Uncomment or comment macros to add support for
+ * specific padding modes in the cipher layer with cipher modes that support
+ * padding (e.g. CBC)
+ *
+ * If you disable all padding modes, only full blocks can be used with CBC.
+ *
+ * Enable padding modes in the cipher layer.
+ */
+#define MBEDTLS_CIPHER_PADDING_PKCS7
+#define MBEDTLS_CIPHER_PADDING_ONE_AND_ZEROS
+#define MBEDTLS_CIPHER_PADDING_ZEROS_AND_LEN
+#define MBEDTLS_CIPHER_PADDING_ZEROS
+
+/**
+ * \def MBEDTLS_ENABLE_WEAK_CIPHERSUITES
+ *
+ * Enable weak ciphersuites in SSL / TLS.
+ * Warning: Only do so when you know what you are doing. This allows for
+ * channels with virtually no security at all!
+ *
+ * This enables the following ciphersuites:
+ *      MBEDTLS_TLS_RSA_WITH_DES_CBC_SHA
+ *      MBEDTLS_TLS_DHE_RSA_WITH_DES_CBC_SHA
+ *
+ * Uncomment this macro to enable weak ciphersuites
+ *
+ * \warning   DES is considered a weak cipher and its use constitutes a
+ *            security risk. We recommend considering stronger ciphers instead.
+ */
+//#define MBEDTLS_ENABLE_WEAK_CIPHERSUITES
+
+/**
+ * \def MBEDTLS_REMOVE_ARC4_CIPHERSUITES
+ *
+ * Remove RC4 ciphersuites by default in SSL / TLS.
+ * This flag removes the ciphersuites based on RC4 from the default list as
+ * returned by mbedtls_ssl_list_ciphersuites(). However, it is still possible to
+ * enable (some of) them with mbedtls_ssl_conf_ciphersuites() by including them
+ * explicitly.
+ *
+ * Uncomment this macro to remove RC4 ciphersuites by default.
+ */
+#define MBEDTLS_REMOVE_ARC4_CIPHERSUITES
+
+/**
+ * \def MBEDTLS_ECP_DP_SECP192R1_ENABLED
+ *
+ * MBEDTLS_ECP_XXXX_ENABLED: Enables specific curves within the Elliptic Curve
+ * module.  By default all supported curves are enabled.
+ *
+ * Comment macros to disable the curve and functions for it
+ */
+#define MBEDTLS_ECP_DP_SECP192R1_ENABLED
+#define MBEDTLS_ECP_DP_SECP224R1_ENABLED
+#define MBEDTLS_ECP_DP_SECP256R1_ENABLED
+#define MBEDTLS_ECP_DP_SECP384R1_ENABLED
+#define MBEDTLS_ECP_DP_SECP521R1_ENABLED
+#define MBEDTLS_ECP_DP_SECP192K1_ENABLED
+#define MBEDTLS_ECP_DP_SECP224K1_ENABLED
+#define MBEDTLS_ECP_DP_SECP256K1_ENABLED
+#define MBEDTLS_ECP_DP_BP256R1_ENABLED
+#define MBEDTLS_ECP_DP_BP384R1_ENABLED
+#define MBEDTLS_ECP_DP_BP512R1_ENABLED
+#define MBEDTLS_ECP_DP_CURVE25519_ENABLED
+#define MBEDTLS_ECP_DP_CURVE448_ENABLED
+
+/**
+ * \def MBEDTLS_ECP_NIST_OPTIM
+ *
+ * Enable specific 'modulo p' routines for each NIST prime.
+ * Depending on the prime and architecture, makes operations 4 to 8 times
+ * faster on the corresponding curve.
+ *
+ * Comment this macro to disable NIST curves optimisation.
+ */
+#define MBEDTLS_ECP_NIST_OPTIM
+
+/**
+ * \def MBEDTLS_ECDSA_DETERMINISTIC
+ *
+ * Enable deterministic ECDSA (RFC 6979).
+ * Standard ECDSA is "fragile" in the sense that lack of entropy when signing
+ * may result in a compromise of the long-term signing key. This is avoided by
+ * the deterministic variant.
+ *
+ * Requires: MBEDTLS_HMAC_DRBG_C
+ *
+ * Comment this macro to disable deterministic ECDSA.
+ */
+//#define MBEDTLS_ECDSA_DETERMINISTIC
+
+/**
+ * \def MBEDTLS_KEY_EXCHANGE_PSK_ENABLED
+ *
+ * Enable the PSK based ciphersuite modes in SSL / TLS.
+ *
+ * This enables the following ciphersuites (if other requisites are
+ * enabled as well):
+ *      MBEDTLS_TLS_PSK_WITH_AES_256_GCM_SHA384
+ *      MBEDTLS_TLS_PSK_WITH_AES_256_CBC_SHA384
+ *      MBEDTLS_TLS_PSK_WITH_AES_256_CBC_SHA
+ *      MBEDTLS_TLS_PSK_WITH_CAMELLIA_256_GCM_SHA384
+ *      MBEDTLS_TLS_PSK_WITH_CAMELLIA_256_CBC_SHA384
+ *      MBEDTLS_TLS_PSK_WITH_AES_128_GCM_SHA256
+ *      MBEDTLS_TLS_PSK_WITH_AES_128_CBC_SHA256
+ *      MBEDTLS_TLS_PSK_WITH_AES_128_CBC_SHA
+ *      MBEDTLS_TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256
+ *      MBEDTLS_TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256
+ *      MBEDTLS_TLS_PSK_WITH_3DES_EDE_CBC_SHA
+ *      MBEDTLS_TLS_PSK_WITH_RC4_128_SHA
+ */
+#define MBEDTLS_KEY_EXCHANGE_PSK_ENABLED
+
+/**
+ * \def MBEDTLS_KEY_EXCHANGE_DHE_PSK_ENABLED
+ *
+ * Enable the DHE-PSK based ciphersuite modes in SSL / TLS.
+ *
+ * Requires: MBEDTLS_DHM_C
+ *
+ * This enables the following ciphersuites (if other requisites are
+ * enabled as well):
+ *      MBEDTLS_TLS_DHE_PSK_WITH_AES_256_GCM_SHA384
+ *      MBEDTLS_TLS_DHE_PSK_WITH_AES_256_CBC_SHA384
+ *      MBEDTLS_TLS_DHE_PSK_WITH_AES_256_CBC_SHA
+ *      MBEDTLS_TLS_DHE_PSK_WITH_CAMELLIA_256_GCM_SHA384
+ *      MBEDTLS_TLS_DHE_PSK_WITH_CAMELLIA_256_CBC_SHA384
+ *      MBEDTLS_TLS_DHE_PSK_WITH_AES_128_GCM_SHA256
+ *      MBEDTLS_TLS_DHE_PSK_WITH_AES_128_CBC_SHA256
+ *      MBEDTLS_TLS_DHE_PSK_WITH_AES_128_CBC_SHA
+ *      MBEDTLS_TLS_DHE_PSK_WITH_CAMELLIA_128_GCM_SHA256
+ *      MBEDTLS_TLS_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256
+ *      MBEDTLS_TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA
+ *      MBEDTLS_TLS_DHE_PSK_WITH_RC4_128_SHA
+ *
+ * \warning    Using DHE constitutes a security risk as it
+ *             is not possible to validate custom DH parameters.
+ *             If possible, it is recommended users should consider
+ *             preferring other methods of key exchange.
+ *             See dhm.h for more details.
+ *
+ */
+//#define MBEDTLS_KEY_EXCHANGE_DHE_PSK_ENABLED
+
+/**
+ * \def MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED
+ *
+ * Enable the ECDHE-PSK based ciphersuite modes in SSL / TLS.
+ *
+ * Requires: MBEDTLS_ECDH_C
+ *
+ * This enables the following ciphersuites (if other requisites are
+ * enabled as well):
+ *      MBEDTLS_TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384
+ *      MBEDTLS_TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA
+ *      MBEDTLS_TLS_ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384
+ *      MBEDTLS_TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256
+ *      MBEDTLS_TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA
+ *      MBEDTLS_TLS_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256
+ *      MBEDTLS_TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA
+ *      MBEDTLS_TLS_ECDHE_PSK_WITH_RC4_128_SHA
+ */
+#define MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED
+
+/**
+ * \def MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED
+ *
+ * Enable the RSA-PSK based ciphersuite modes in SSL / TLS.
+ *
+ * Requires: MBEDTLS_RSA_C, MBEDTLS_PKCS1_V15,
+ *           MBEDTLS_X509_CRT_PARSE_C
+ *
+ * This enables the following ciphersuites (if other requisites are
+ * enabled as well):
+ *      MBEDTLS_TLS_RSA_PSK_WITH_AES_256_GCM_SHA384
+ *      MBEDTLS_TLS_RSA_PSK_WITH_AES_256_CBC_SHA384
+ *      MBEDTLS_TLS_RSA_PSK_WITH_AES_256_CBC_SHA
+ *      MBEDTLS_TLS_RSA_PSK_WITH_CAMELLIA_256_GCM_SHA384
+ *      MBEDTLS_TLS_RSA_PSK_WITH_CAMELLIA_256_CBC_SHA384
+ *      MBEDTLS_TLS_RSA_PSK_WITH_AES_128_GCM_SHA256
+ *      MBEDTLS_TLS_RSA_PSK_WITH_AES_128_CBC_SHA256
+ *      MBEDTLS_TLS_RSA_PSK_WITH_AES_128_CBC_SHA
+ *      MBEDTLS_TLS_RSA_PSK_WITH_CAMELLIA_128_GCM_SHA256
+ *      MBEDTLS_TLS_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256
+ *      MBEDTLS_TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA
+ *      MBEDTLS_TLS_RSA_PSK_WITH_RC4_128_SHA
+ */
+#define MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED
+
+/**
+ * \def MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
+ *
+ * Enable the RSA-only based ciphersuite modes in SSL / TLS.
+ *
+ * Requires: MBEDTLS_RSA_C, MBEDTLS_PKCS1_V15,
+ *           MBEDTLS_X509_CRT_PARSE_C
+ *
+ * This enables the following ciphersuites (if other requisites are
+ * enabled as well):
+ *      MBEDTLS_TLS_RSA_WITH_AES_256_GCM_SHA384
+ *      MBEDTLS_TLS_RSA_WITH_AES_256_CBC_SHA256
+ *      MBEDTLS_TLS_RSA_WITH_AES_256_CBC_SHA
+ *      MBEDTLS_TLS_RSA_WITH_CAMELLIA_256_GCM_SHA384
+ *      MBEDTLS_TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256
+ *      MBEDTLS_TLS_RSA_WITH_CAMELLIA_256_CBC_SHA
+ *      MBEDTLS_TLS_RSA_WITH_AES_128_GCM_SHA256
+ *      MBEDTLS_TLS_RSA_WITH_AES_128_CBC_SHA256
+ *      MBEDTLS_TLS_RSA_WITH_AES_128_CBC_SHA
+ *      MBEDTLS_TLS_RSA_WITH_CAMELLIA_128_GCM_SHA256
+ *      MBEDTLS_TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256
+ *      MBEDTLS_TLS_RSA_WITH_CAMELLIA_128_CBC_SHA
+ *      MBEDTLS_TLS_RSA_WITH_3DES_EDE_CBC_SHA
+ *      MBEDTLS_TLS_RSA_WITH_RC4_128_SHA
+ *      MBEDTLS_TLS_RSA_WITH_RC4_128_MD5
+ */
+#define MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
+
+/**
+ * \def MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED
+ *
+ * Enable the DHE-RSA based ciphersuite modes in SSL / TLS.
+ *
+ * Requires: MBEDTLS_DHM_C, MBEDTLS_RSA_C, MBEDTLS_PKCS1_V15,
+ *           MBEDTLS_X509_CRT_PARSE_C
+ *
+ * This enables the following ciphersuites (if other requisites are
+ * enabled as well):
+ *      MBEDTLS_TLS_DHE_RSA_WITH_AES_256_GCM_SHA384
+ *      MBEDTLS_TLS_DHE_RSA_WITH_AES_256_CBC_SHA256
+ *      MBEDTLS_TLS_DHE_RSA_WITH_AES_256_CBC_SHA
+ *      MBEDTLS_TLS_DHE_RSA_WITH_CAMELLIA_256_GCM_SHA384
+ *      MBEDTLS_TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256
+ *      MBEDTLS_TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA
+ *      MBEDTLS_TLS_DHE_RSA_WITH_AES_128_GCM_SHA256
+ *      MBEDTLS_TLS_DHE_RSA_WITH_AES_128_CBC_SHA256
+ *      MBEDTLS_TLS_DHE_RSA_WITH_AES_128_CBC_SHA
+ *      MBEDTLS_TLS_DHE_RSA_WITH_CAMELLIA_128_GCM_SHA256
+ *      MBEDTLS_TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256
+ *      MBEDTLS_TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA
+ *      MBEDTLS_TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA
+ *
+ * \warning    Using DHE constitutes a security risk as it
+ *             is not possible to validate custom DH parameters.
+ *             If possible, it is recommended users should consider
+ *             preferring other methods of key exchange.
+ *             See dhm.h for more details.
+ *
+ */
+//#define MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED
+
+/**
+ * \def MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED
+ *
+ * Enable the ECDHE-RSA based ciphersuite modes in SSL / TLS.
+ *
+ * Requires: MBEDTLS_ECDH_C, MBEDTLS_RSA_C, MBEDTLS_PKCS1_V15,
+ *           MBEDTLS_X509_CRT_PARSE_C
+ *
+ * This enables the following ciphersuites (if other requisites are
+ * enabled as well):
+ *      MBEDTLS_TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
+ *      MBEDTLS_TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384
+ *      MBEDTLS_TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA
+ *      MBEDTLS_TLS_ECDHE_RSA_WITH_CAMELLIA_256_GCM_SHA384
+ *      MBEDTLS_TLS_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384
+ *      MBEDTLS_TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
+ *      MBEDTLS_TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256
+ *      MBEDTLS_TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA
+ *      MBEDTLS_TLS_ECDHE_RSA_WITH_CAMELLIA_128_GCM_SHA256
+ *      MBEDTLS_TLS_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256
+ *      MBEDTLS_TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA
+ *      MBEDTLS_TLS_ECDHE_RSA_WITH_RC4_128_SHA
+ */
+#define MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED
+
+/**
+ * \def MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
+ *
+ * Enable the ECDHE-ECDSA based ciphersuite modes in SSL / TLS.
+ *
+ * Requires: MBEDTLS_ECDH_C, MBEDTLS_ECDSA_C, MBEDTLS_X509_CRT_PARSE_C,
+ *
+ * This enables the following ciphersuites (if other requisites are
+ * enabled as well):
+ *      MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
+ *      MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384
+ *      MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA
+ *      MBEDTLS_TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_GCM_SHA384
+ *      MBEDTLS_TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384
+ *      MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
+ *      MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256
+ *      MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA
+ *      MBEDTLS_TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_GCM_SHA256
+ *      MBEDTLS_TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256
+ *      MBEDTLS_TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA
+ *      MBEDTLS_TLS_ECDHE_ECDSA_WITH_RC4_128_SHA
+ */
+#define MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
+
+/**
+ * \def MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED
+ *
+ * Enable the ECDH-ECDSA based ciphersuite modes in SSL / TLS.
+ *
+ * Requires: MBEDTLS_ECDH_C, MBEDTLS_X509_CRT_PARSE_C
+ *
+ * This enables the following ciphersuites (if other requisites are
+ * enabled as well):
+ *      MBEDTLS_TLS_ECDH_ECDSA_WITH_RC4_128_SHA
+ *      MBEDTLS_TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA
+ *      MBEDTLS_TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA
+ *      MBEDTLS_TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA
+ *      MBEDTLS_TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256
+ *      MBEDTLS_TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384
+ *      MBEDTLS_TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256
+ *      MBEDTLS_TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384
+ *      MBEDTLS_TLS_ECDH_ECDSA_WITH_CAMELLIA_128_CBC_SHA256
+ *      MBEDTLS_TLS_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384
+ *      MBEDTLS_TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256
+ *      MBEDTLS_TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384
+ */
+#define MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED
+
+/**
+ * \def MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED
+ *
+ * Enable the ECDH-RSA based ciphersuite modes in SSL / TLS.
+ *
+ * Requires: MBEDTLS_ECDH_C, MBEDTLS_X509_CRT_PARSE_C
+ *
+ * This enables the following ciphersuites (if other requisites are
+ * enabled as well):
+ *      MBEDTLS_TLS_ECDH_RSA_WITH_RC4_128_SHA
+ *      MBEDTLS_TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA
+ *      MBEDTLS_TLS_ECDH_RSA_WITH_AES_128_CBC_SHA
+ *      MBEDTLS_TLS_ECDH_RSA_WITH_AES_256_CBC_SHA
+ *      MBEDTLS_TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256
+ *      MBEDTLS_TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384
+ *      MBEDTLS_TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256
+ *      MBEDTLS_TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384
+ *      MBEDTLS_TLS_ECDH_RSA_WITH_CAMELLIA_128_CBC_SHA256
+ *      MBEDTLS_TLS_ECDH_RSA_WITH_CAMELLIA_256_CBC_SHA384
+ *      MBEDTLS_TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256
+ *      MBEDTLS_TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384
+ */
+#define MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED
+
+/**
+ * \def MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED
+ *
+ * Enable the ECJPAKE based ciphersuite modes in SSL / TLS.
+ *
+ * \warning This is currently experimental. EC J-PAKE support is based on the
+ * Thread v1.0.0 specification; incompatible changes to the specification
+ * might still happen. For this reason, this is disabled by default.
+ *
+ * Requires: MBEDTLS_ECJPAKE_C
+ *           MBEDTLS_SHA256_C
+ *           MBEDTLS_ECP_DP_SECP256R1_ENABLED
+ *
+ * This enables the following ciphersuites (if other requisites are
+ * enabled as well):
+ *      MBEDTLS_TLS_ECJPAKE_WITH_AES_128_CCM_8
+ */
+//#define MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED
+
+/**
+ * \def MBEDTLS_PK_PARSE_EC_EXTENDED
+ *
+ * Enhance support for reading EC keys using variants of SEC1 not allowed by
+ * RFC 5915 and RFC 5480.
+ *
+ * Currently this means parsing the SpecifiedECDomain choice of EC
+ * parameters (only known groups are supported, not arbitrary domains, to
+ * avoid validation issues).
+ *
+ * Disable if you only need to support RFC 5915 + 5480 key formats.
+ */
+#define MBEDTLS_PK_PARSE_EC_EXTENDED
+
+/**
+ * \def MBEDTLS_ERROR_STRERROR_DUMMY
+ *
+ * Enable a dummy error function to make use of mbedtls_strerror() in
+ * third party libraries easier when MBEDTLS_ERROR_C is disabled
+ * (no effect when MBEDTLS_ERROR_C is enabled).
+ *
+ * You can safely disable this if MBEDTLS_ERROR_C is enabled, or if you're
+ * not using mbedtls_strerror() or error_strerror() in your application.
+ *
+ * Disable if you run into name conflicts and want to really remove the
+ * mbedtls_strerror()
+ */
+#define MBEDTLS_ERROR_STRERROR_DUMMY
+
+/**
+ * \def MBEDTLS_GENPRIME
+ *
+ * Enable the prime-number generation code.
+ *
+ * Requires: MBEDTLS_BIGNUM_C
+ */
+#define MBEDTLS_GENPRIME
+
+/**
+ * \def MBEDTLS_FS_IO
+ *
+ * Enable functions that use the filesystem.
+ */
+#define MBEDTLS_FS_IO
+
+/**
+ * \def MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES
+ *
+ * Do not add default entropy sources. These are the platform specific,
+ * mbedtls_timing_hardclock and HAVEGE based poll functions.
+ *
+ * This is useful to have more control over the added entropy sources in an
+ * application.
+ *
+ * Uncomment this macro to prevent loading of default entropy functions.
+ */
+//#define MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES
+
+/**
+ * \def MBEDTLS_NO_PLATFORM_ENTROPY
+ *
+ * Do not use built-in platform entropy functions.
+ * This is useful if your platform does not support
+ * standards like the /dev/urandom or Windows CryptoAPI.
+ *
+ * Uncomment this macro to disable the built-in platform entropy functions.
+ */
+//#define MBEDTLS_NO_PLATFORM_ENTROPY
+
+/**
+ * \def MBEDTLS_ENTROPY_FORCE_SHA256
+ *
+ * Force the entropy accumulator to use a SHA-256 accumulator instead of the
+ * default SHA-512 based one (if both are available).
+ *
+ * Requires: MBEDTLS_SHA256_C
+ *
+ * On 32-bit systems SHA-256 can be much faster than SHA-512. Use this option
+ * if you have performance concerns.
+ *
+ * This option is only useful if both MBEDTLS_SHA256_C and
+ * MBEDTLS_SHA512_C are defined. Otherwise the available hash module is used.
+ */
+//#define MBEDTLS_ENTROPY_FORCE_SHA256
+
+/**
+ * \def MBEDTLS_ENTROPY_NV_SEED
+ *
+ * Enable the non-volatile (NV) seed file-based entropy source.
+ * (Also enables the NV seed read/write functions in the platform layer)
+ *
+ * This is crucial (if not required) on systems that do not have a
+ * cryptographic entropy source (in hardware or kernel) available.
+ *
+ * Requires: MBEDTLS_ENTROPY_C, MBEDTLS_PLATFORM_C
+ *
+ * \note The read/write functions that are used by the entropy source are
+ *       determined in the platform layer, and can be modified at runtime and/or
+ *       compile-time depending on the flags (MBEDTLS_PLATFORM_NV_SEED_*) used.
+ *
+ * \note If you use the default implementation functions that read a seedfile
+ *       with regular fopen(), please make sure you make a seedfile with the
+ *       proper name (defined in MBEDTLS_PLATFORM_STD_NV_SEED_FILE) and at
+ *       least MBEDTLS_ENTROPY_BLOCK_SIZE bytes in size that can be read from
+ *       and written to or you will get an entropy source error! The default
+ *       implementation will only use the first MBEDTLS_ENTROPY_BLOCK_SIZE
+ *       bytes from the file.
+ *
+ * \note The entropy collector will write to the seed file before entropy is
+ *       given to an external source, to update it.
+ */
+//#define MBEDTLS_ENTROPY_NV_SEED
+
+/**
+ * \def MBEDTLS_MEMORY_DEBUG
+ *
+ * Enable debugging of buffer allocator memory issues. Automatically prints
+ * (to stderr) all (fatal) messages on memory allocation issues. Enables
+ * function for 'debug output' of allocated memory.
+ *
+ * Requires: MBEDTLS_MEMORY_BUFFER_ALLOC_C
+ *
+ * Uncomment this macro to let the buffer allocator print out error messages.
+ */
+//#define MBEDTLS_MEMORY_DEBUG
+
+/**
+ * \def MBEDTLS_MEMORY_BACKTRACE
+ *
+ * Include backtrace information with each allocated block.
+ *
+ * Requires: MBEDTLS_MEMORY_BUFFER_ALLOC_C
+ *           GLIBC-compatible backtrace() an backtrace_symbols() support
+ *
+ * Uncomment this macro to include backtrace information
+ */
+//#define MBEDTLS_MEMORY_BACKTRACE
+
+/**
+ * \def MBEDTLS_PK_RSA_ALT_SUPPORT
+ *
+ * Support external private RSA keys (eg from a HSM) in the PK layer.
+ *
+ * Comment this macro to disable support for external private RSA keys.
+ */
+#define MBEDTLS_PK_RSA_ALT_SUPPORT
+
+/**
+ * \def MBEDTLS_PKCS1_V15
+ *
+ * Enable support for PKCS#1 v1.5 encoding.
+ *
+ * Requires: MBEDTLS_RSA_C
+ *
+ * This enables support for PKCS#1 v1.5 operations.
+ */
+#define MBEDTLS_PKCS1_V15
+
+/**
+ * \def MBEDTLS_PKCS1_V21
+ *
+ * Enable support for PKCS#1 v2.1 encoding.
+ *
+ * Requires: MBEDTLS_MD_C, MBEDTLS_RSA_C
+ *
+ * This enables support for RSAES-OAEP and RSASSA-PSS operations.
+ */
+#define MBEDTLS_PKCS1_V21
+
+/**
+ * \def MBEDTLS_RSA_NO_CRT
+ *
+ * Do not use the Chinese Remainder Theorem
+ * for the RSA private operation.
+ *
+ * Uncomment this macro to disable the use of CRT in RSA.
+ *
+ */
+//#define MBEDTLS_RSA_NO_CRT
+
+/**
+ * \def MBEDTLS_SELF_TEST
+ *
+ * Enable the checkup functions (*_self_test).
+ */
+#define MBEDTLS_SELF_TEST
+
+/**
+ * \def MBEDTLS_SHA256_SMALLER
+ *
+ * Enable an implementation of SHA-256 that has lower ROM footprint but also
+ * lower performance.
+ *
+ * The default implementation is meant to be a reasonnable compromise between
+ * performance and size. This version optimizes more aggressively for size at
+ * the expense of performance. Eg on Cortex-M4 it reduces the size of
+ * mbedtls_sha256_process() from ~2KB to ~0.5KB for a performance hit of about
+ * 30%.
+ *
+ * Uncomment to enable the smaller implementation of SHA256.
+ */
+//#define MBEDTLS_SHA256_SMALLER
+
+/**
+ * \def MBEDTLS_SSL_ALL_ALERT_MESSAGES
+ *
+ * Enable sending of alert messages in case of encountered errors as per RFC.
+ * If you choose not to send the alert messages, mbed TLS can still communicate
+ * with other servers, only debugging of failures is harder.
+ *
+ * The advantage of not sending alert messages, is that no information is given
+ * about reasons for failures thus preventing adversaries of gaining intel.
+ *
+ * Enable sending of all alert messages
+ */
+#define MBEDTLS_SSL_ALL_ALERT_MESSAGES
+
+/**
+ * \def MBEDTLS_SSL_ASYNC_PRIVATE
+ *
+ * Enable asynchronous external private key operations in SSL. This allows
+ * you to configure an SSL connection to call an external cryptographic
+ * module to perform private key operations instead of performing the
+ * operation inside the library.
+ *
+ */
+//#define MBEDTLS_SSL_ASYNC_PRIVATE
+
+/**
+ * \def MBEDTLS_SSL_DEBUG_ALL
+ *
+ * Enable the debug messages in SSL module for all issues.
+ * Debug messages have been disabled in some places to prevent timing
+ * attacks due to (unbalanced) debugging function calls.
+ *
+ * If you need all error reporting you should enable this during debugging,
+ * but remove this for production servers that should log as well.
+ *
+ * Uncomment this macro to report all debug messages on errors introducing
+ * a timing side-channel.
+ *
+ */
+//#define MBEDTLS_SSL_DEBUG_ALL
+
+/** \def MBEDTLS_SSL_ENCRYPT_THEN_MAC
+ *
+ * Enable support for Encrypt-then-MAC, RFC 7366.
+ *
+ * This allows peers that both support it to use a more robust protection for
+ * ciphersuites using CBC, providing deep resistance against timing attacks
+ * on the padding or underlying cipher.
+ *
+ * This only affects CBC ciphersuites, and is useless if none is defined.
+ *
+ * Requires: MBEDTLS_SSL_PROTO_TLS1    or
+ *           MBEDTLS_SSL_PROTO_TLS1_1  or
+ *           MBEDTLS_SSL_PROTO_TLS1_2
+ *
+ * Comment this macro to disable support for Encrypt-then-MAC
+ */
+#define MBEDTLS_SSL_ENCRYPT_THEN_MAC
+
+/** \def MBEDTLS_SSL_EXTENDED_MASTER_SECRET
+ *
+ * Enable support for Extended Master Secret, aka Session Hash
+ * (draft-ietf-tls-session-hash-02).
+ *
+ * This was introduced as "the proper fix" to the Triple Handshake familiy of
+ * attacks, but it is recommended to always use it (even if you disable
+ * renegotiation), since it actually fixes a more fundamental issue in the
+ * original SSL/TLS design, and has implications beyond Triple Handshake.
+ *
+ * Requires: MBEDTLS_SSL_PROTO_TLS1    or
+ *           MBEDTLS_SSL_PROTO_TLS1_1  or
+ *           MBEDTLS_SSL_PROTO_TLS1_2
+ *
+ * Comment this macro to disable support for Extended Master Secret.
+ */
+#define MBEDTLS_SSL_EXTENDED_MASTER_SECRET
+
+/**
+ * \def MBEDTLS_SSL_FALLBACK_SCSV
+ *
+ * Enable support for FALLBACK_SCSV (draft-ietf-tls-downgrade-scsv-00).
+ *
+ * For servers, it is recommended to always enable this, unless you support
+ * only one version of TLS, or know for sure that none of your clients
+ * implements a fallback strategy.
+ *
+ * For clients, you only need this if you're using a fallback strategy, which
+ * is not recommended in the first place, unless you absolutely need it to
+ * interoperate with buggy (version-intolerant) servers.
+ *
+ * Comment this macro to disable support for FALLBACK_SCSV
+ */
+#define MBEDTLS_SSL_FALLBACK_SCSV
+
+/**
+ * \def MBEDTLS_SSL_HW_RECORD_ACCEL
+ *
+ * Enable hooking functions in SSL module for hardware acceleration of
+ * individual records.
+ *
+ * Uncomment this macro to enable hooking functions.
+ */
+//#define MBEDTLS_SSL_HW_RECORD_ACCEL
+
+/**
+ * \def MBEDTLS_SSL_CBC_RECORD_SPLITTING
+ *
+ * Enable 1/n-1 record splitting for CBC mode in SSLv3 and TLS 1.0.
+ *
+ * This is a countermeasure to the BEAST attack, which also minimizes the risk
+ * of interoperability issues compared to sending 0-length records.
+ *
+ * Comment this macro to disable 1/n-1 record splitting.
+ */
+#define MBEDTLS_SSL_CBC_RECORD_SPLITTING
+
+/**
+ * \def MBEDTLS_SSL_RENEGOTIATION
+ *
+ * Disable support for TLS renegotiation.
+ *
+ * The two main uses of renegotiation are (1) refresh keys on long-lived
+ * connections and (2) client authentication after the initial handshake.
+ * If you don't need renegotiation, it's probably better to disable it, since
+ * it has been associated with security issues in the past and is easy to
+ * misuse/misunderstand.
+ *
+ * Comment this to disable support for renegotiation.
+ *
+ * \note   Even if this option is disabled, both client and server are aware
+ *         of the Renegotiation Indication Extension (RFC 5746) used to
+ *         prevent the SSL renegotiation attack (see RFC 5746 Sect. 1).
+ *         (See \c mbedtls_ssl_conf_legacy_renegotiation for the
+ *          configuration of this extension).
+ *
+ */
+#define MBEDTLS_SSL_RENEGOTIATION
+
+/**
+ * \def MBEDTLS_SSL_SRV_SUPPORT_SSLV2_CLIENT_HELLO
+ *
+ * Enable support for receiving and parsing SSLv2 Client Hello messages for the
+ * SSL Server module (MBEDTLS_SSL_SRV_C).
+ *
+ * Uncomment this macro to enable support for SSLv2 Client Hello messages.
+ */
+//#define MBEDTLS_SSL_SRV_SUPPORT_SSLV2_CLIENT_HELLO
+
+/**
+ * \def MBEDTLS_SSL_SRV_RESPECT_CLIENT_PREFERENCE
+ *
+ * Pick the ciphersuite according to the client's preferences rather than ours
+ * in the SSL Server module (MBEDTLS_SSL_SRV_C).
+ *
+ * Uncomment this macro to respect client's ciphersuite order
+ */
+//#define MBEDTLS_SSL_SRV_RESPECT_CLIENT_PREFERENCE
+
+/**
+ * \def MBEDTLS_SSL_MAX_FRAGMENT_LENGTH
+ *
+ * Enable support for RFC 6066 max_fragment_length extension in SSL.
+ *
+ * Comment this macro to disable support for the max_fragment_length extension
+ */
+#define MBEDTLS_SSL_MAX_FRAGMENT_LENGTH
+
+/**
+ * \def MBEDTLS_SSL_PROTO_SSL3
+ *
+ * Enable support for SSL 3.0.
+ *
+ * Requires: MBEDTLS_MD5_C
+ *           MBEDTLS_SHA1_C
+ *
+ * Comment this macro to disable support for SSL 3.0
+ */
+//#define MBEDTLS_SSL_PROTO_SSL3
+
+/**
+ * \def MBEDTLS_SSL_PROTO_TLS1
+ *
+ * Enable support for TLS 1.0.
+ *
+ * Requires: MBEDTLS_MD5_C
+ *           MBEDTLS_SHA1_C
+ *
+ * Comment this macro to disable support for TLS 1.0
+ */
+#define MBEDTLS_SSL_PROTO_TLS1
+
+/**
+ * \def MBEDTLS_SSL_PROTO_TLS1_1
+ *
+ * Enable support for TLS 1.1 (and DTLS 1.0 if DTLS is enabled).
+ *
+ * Requires: MBEDTLS_MD5_C
+ *           MBEDTLS_SHA1_C
+ *
+ * Comment this macro to disable support for TLS 1.1 / DTLS 1.0
+ */
+#define MBEDTLS_SSL_PROTO_TLS1_1
+
+/**
+ * \def MBEDTLS_SSL_PROTO_TLS1_2
+ *
+ * Enable support for TLS 1.2 (and DTLS 1.2 if DTLS is enabled).
+ *
+ * Requires: MBEDTLS_SHA1_C or MBEDTLS_SHA256_C or MBEDTLS_SHA512_C
+ *           (Depends on ciphersuites)
+ *
+ * Comment this macro to disable support for TLS 1.2 / DTLS 1.2
+ */
+#define MBEDTLS_SSL_PROTO_TLS1_2
+
+/**
+ * \def MBEDTLS_SSL_PROTO_DTLS
+ *
+ * Enable support for DTLS (all available versions).
+ *
+ * Enable this and MBEDTLS_SSL_PROTO_TLS1_1 to enable DTLS 1.0,
+ * and/or this and MBEDTLS_SSL_PROTO_TLS1_2 to enable DTLS 1.2.
+ *
+ * Requires: MBEDTLS_SSL_PROTO_TLS1_1
+ *        or MBEDTLS_SSL_PROTO_TLS1_2
+ *
+ * Comment this macro to disable support for DTLS
+ */
+#define MBEDTLS_SSL_PROTO_DTLS
+
+/**
+ * \def MBEDTLS_SSL_ALPN
+ *
+ * Enable support for RFC 7301 Application Layer Protocol Negotiation.
+ *
+ * Comment this macro to disable support for ALPN.
+ */
+#define MBEDTLS_SSL_ALPN
+
+/**
+ * \def MBEDTLS_SSL_DTLS_ANTI_REPLAY
+ *
+ * Enable support for the anti-replay mechanism in DTLS.
+ *
+ * Requires: MBEDTLS_SSL_TLS_C
+ *           MBEDTLS_SSL_PROTO_DTLS
+ *
+ * \warning Disabling this is often a security risk!
+ * See mbedtls_ssl_conf_dtls_anti_replay() for details.
+ *
+ * Comment this to disable anti-replay in DTLS.
+ */
+//#define MBEDTLS_SSL_DTLS_ANTI_REPLAY
+
+/**
+ * \def MBEDTLS_SSL_DTLS_HELLO_VERIFY
+ *
+ * Enable support for HelloVerifyRequest on DTLS servers.
+ *
+ * This feature is highly recommended to prevent DTLS servers being used as
+ * amplifiers in DoS attacks against other hosts. It should always be enabled
+ * unless you know for sure amplification cannot be a problem in the
+ * environment in which your server operates.
+ *
+ * \warning Disabling this can ba a security risk! (see above)
+ *
+ * Requires: MBEDTLS_SSL_PROTO_DTLS
+ *
+ * Comment this to disable support for HelloVerifyRequest.
+ */
+#define MBEDTLS_SSL_DTLS_HELLO_VERIFY
+
+/**
+ * \def MBEDTLS_SSL_DTLS_CLIENT_PORT_REUSE
+ *
+ * Enable server-side support for clients that reconnect from the same port.
+ *
+ * Some clients unexpectedly close the connection and try to reconnect using the
+ * same source port. This needs special support from the server to handle the
+ * new connection securely, as described in section 4.2.8 of RFC 6347. This
+ * flag enables that support.
+ *
+ * Requires: MBEDTLS_SSL_DTLS_HELLO_VERIFY
+ *
+ * Comment this to disable support for clients reusing the source port.
+ */
+#define MBEDTLS_SSL_DTLS_CLIENT_PORT_REUSE
+
+/**
+ * \def MBEDTLS_SSL_DTLS_BADMAC_LIMIT
+ *
+ * Enable support for a limit of records with bad MAC.
+ *
+ * See mbedtls_ssl_conf_dtls_badmac_limit().
+ *
+ * Requires: MBEDTLS_SSL_PROTO_DTLS
+ */
+//#define MBEDTLS_SSL_DTLS_BADMAC_LIMIT
+
+/**
+ * \def MBEDTLS_SSL_SESSION_TICKETS
+ *
+ * Enable support for RFC 5077 session tickets in SSL.
+ * Client-side, provides full support for session tickets (maintainance of a
+ * session store remains the responsibility of the application, though).
+ * Server-side, you also need to provide callbacks for writing and parsing
+ * tickets, including authenticated encryption and key management. Example
+ * callbacks are provided by MBEDTLS_SSL_TICKET_C.
+ *
+ * Comment this macro to disable support for SSL session tickets
+ */
+#define MBEDTLS_SSL_SESSION_TICKETS
+
+/**
+ * \def MBEDTLS_SSL_EXPORT_KEYS
+ *
+ * Enable support for exporting key block and master secret.
+ * This is required for certain users of TLS, e.g. EAP-TLS.
+ *
+ * Comment this macro to disable support for key export
+ */
+#define MBEDTLS_SSL_EXPORT_KEYS
+
+/**
+ * \def MBEDTLS_SSL_SERVER_NAME_INDICATION
+ *
+ * Enable support for RFC 6066 server name indication (SNI) in SSL.
+ *
+ * Requires: MBEDTLS_X509_CRT_PARSE_C
+ *
+ * Comment this macro to disable support for server name indication in SSL
+ */
+#define MBEDTLS_SSL_SERVER_NAME_INDICATION
+
+/**
+ * \def MBEDTLS_SSL_TRUNCATED_HMAC
+ *
+ * Enable support for RFC 6066 truncated HMAC in SSL.
+ *
+ * Comment this macro to disable support for truncated HMAC in SSL
+ */
+#define MBEDTLS_SSL_TRUNCATED_HMAC
+
+/**
+ * \def MBEDTLS_SSL_TRUNCATED_HMAC_COMPAT
+ *
+ * Fallback to old (pre-2.7), non-conforming implementation of the truncated
+ * HMAC extension which also truncates the HMAC key. Note that this option is
+ * only meant for a transitory upgrade period and is likely to be removed in
+ * a future version of the library.
+ *
+ * \warning The old implementation is non-compliant and has a security weakness
+ *          (2^80 brute force attack on the HMAC key used for a single,
+ *          uninterrupted connection). This should only be enabled temporarily
+ *          when (1) the use of truncated HMAC is essential in order to save
+ *          bandwidth, and (2) the peer is an Mbed TLS stack that doesn't use
+ *          the fixed implementation yet (pre-2.7).
+ *
+ * \deprecated This option is deprecated and will likely be removed in a
+ *             future version of Mbed TLS.
+ *
+ * Uncomment to fallback to old, non-compliant truncated HMAC implementation.
+ *
+ * Requires: MBEDTLS_SSL_TRUNCATED_HMAC
+ */
+//#define MBEDTLS_SSL_TRUNCATED_HMAC_COMPAT
+
+/**
+ * \def MBEDTLS_THREADING_ALT
+ *
+ * Provide your own alternate threading implementation.
+ *
+ * Requires: MBEDTLS_THREADING_C
+ *
+ * Uncomment this to allow your own alternate threading implementation.
+ */
+//#define MBEDTLS_THREADING_ALT
+
+/**
+ * \def MBEDTLS_THREADING_PTHREAD
+ *
+ * Enable the pthread wrapper layer for the threading layer.
+ *
+ * Requires: MBEDTLS_THREADING_C
+ *
+ * Uncomment this to enable pthread mutexes.
+ */
+//#define MBEDTLS_THREADING_PTHREAD
+
+/**
+ * \def MBEDTLS_VERSION_FEATURES
+ *
+ * Allow run-time checking of compile-time enabled features. Thus allowing users
+ * to check at run-time if the library is for instance compiled with threading
+ * support via mbedtls_version_check_feature().
+ *
+ * Requires: MBEDTLS_VERSION_C
+ *
+ * Comment this to disable run-time checking and save ROM space
+ */
+#define MBEDTLS_VERSION_FEATURES
+
+/**
+ * \def MBEDTLS_X509_ALLOW_EXTENSIONS_NON_V3
+ *
+ * If set, the X509 parser will not break-off when parsing an X509 certificate
+ * and encountering an extension in a v1 or v2 certificate.
+ *
+ * Uncomment to prevent an error.
+ */
+//#define MBEDTLS_X509_ALLOW_EXTENSIONS_NON_V3
+
+/**
+ * \def MBEDTLS_X509_ALLOW_UNSUPPORTED_CRITICAL_EXTENSION
+ *
+ * If set, the X509 parser will not break-off when parsing an X509 certificate
+ * and encountering an unknown critical extension.
+ *
+ * \warning Depending on your PKI use, enabling this can be a security risk!
+ *
+ * Uncomment to prevent an error.
+ */
+//#define MBEDTLS_X509_ALLOW_UNSUPPORTED_CRITICAL_EXTENSION
+
+/**
+ * \def MBEDTLS_X509_CHECK_KEY_USAGE
+ *
+ * Enable verification of the keyUsage extension (CA and leaf certificates).
+ *
+ * Disabling this avoids problems with mis-issued and/or misused
+ * (intermediate) CA and leaf certificates.
+ *
+ * \warning Depending on your PKI use, disabling this can be a security risk!
+ *
+ * Comment to skip keyUsage checking for both CA and leaf certificates.
+ */
+#define MBEDTLS_X509_CHECK_KEY_USAGE
+
+/**
+ * \def MBEDTLS_X509_CHECK_EXTENDED_KEY_USAGE
+ *
+ * Enable verification of the extendedKeyUsage extension (leaf certificates).
+ *
+ * Disabling this avoids problems with mis-issued and/or misused certificates.
+ *
+ * \warning Depending on your PKI use, disabling this can be a security risk!
+ *
+ * Comment to skip extendedKeyUsage checking for certificates.
+ */
+#define MBEDTLS_X509_CHECK_EXTENDED_KEY_USAGE
+
+/**
+ * \def MBEDTLS_X509_RSASSA_PSS_SUPPORT
+ *
+ * Enable parsing and verification of X.509 certificates, CRLs and CSRS
+ * signed with RSASSA-PSS (aka PKCS#1 v2.1).
+ *
+ * Comment this macro to disallow using RSASSA-PSS in certificates.
+ */
+#define MBEDTLS_X509_RSASSA_PSS_SUPPORT
+
+/**
+ * \def MBEDTLS_ZLIB_SUPPORT
+ *
+ * If set, the SSL/TLS module uses ZLIB to support compression and
+ * decompression of packet data.
+ *
+ * \warning TLS-level compression MAY REDUCE SECURITY! See for example the
+ * CRIME attack. Before enabling this option, you should examine with care if
+ * CRIME or similar exploits may be a applicable to your use case.
+ *
+ * \note Currently compression can't be used with DTLS.
+ *
+ * \deprecated This feature is deprecated and will be removed
+ *             in the next major revision of the library.
+ *
+ * Used in: library/ssl_tls.c
+ *          library/ssl_cli.c
+ *          library/ssl_srv.c
+ *
+ * This feature requires zlib library and headers to be present.
+ *
+ * Uncomment to enable use of ZLIB
+ */
+//#define MBEDTLS_ZLIB_SUPPORT
+/* \} name SECTION: mbed TLS feature support */
+
+/**
+ * \name SECTION: mbed TLS modules
+ *
+ * This section enables or disables entire modules in mbed TLS
+ * \{
+ */
+
+/**
+ * \def MBEDTLS_AESNI_C
+ *
+ * Enable AES-NI support on x86-64.
+ *
+ * Module:  library/aesni.c
+ * Caller:  library/aes.c
+ *
+ * Requires: MBEDTLS_HAVE_ASM
+ *
+ * This modules adds support for the AES-NI instructions on x86-64
+ */
+//#define MBEDTLS_AESNI_C
+
+/**
+ * \def MBEDTLS_AES_C
+ *
+ * Enable the AES block cipher.
+ *
+ * Module:  library/aes.c
+ * Caller:  library/cipher.c
+ *          library/pem.c
+ *          library/ctr_drbg.c
+ *
+ * This module enables the following ciphersuites (if other requisites are
+ * enabled as well):
+ *      MBEDTLS_TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA
+ *      MBEDTLS_TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA
+ *      MBEDTLS_TLS_ECDH_RSA_WITH_AES_128_CBC_SHA
+ *      MBEDTLS_TLS_ECDH_RSA_WITH_AES_256_CBC_SHA
+ *      MBEDTLS_TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256
+ *      MBEDTLS_TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384
+ *      MBEDTLS_TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256
+ *      MBEDTLS_TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384
+ *      MBEDTLS_TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256
+ *      MBEDTLS_TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384
+ *      MBEDTLS_TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256
+ *      MBEDTLS_TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384
+ *      MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
+ *      MBEDTLS_TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
+ *      MBEDTLS_TLS_DHE_RSA_WITH_AES_256_GCM_SHA384
+ *      MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384
+ *      MBEDTLS_TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384
+ *      MBEDTLS_TLS_DHE_RSA_WITH_AES_256_CBC_SHA256
+ *      MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA
+ *      MBEDTLS_TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA
+ *      MBEDTLS_TLS_DHE_RSA_WITH_AES_256_CBC_SHA
+ *      MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
+ *      MBEDTLS_TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
+ *      MBEDTLS_TLS_DHE_RSA_WITH_AES_128_GCM_SHA256
+ *      MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256
+ *      MBEDTLS_TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256
+ *      MBEDTLS_TLS_DHE_RSA_WITH_AES_128_CBC_SHA256
+ *      MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA
+ *      MBEDTLS_TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA
+ *      MBEDTLS_TLS_DHE_RSA_WITH_AES_128_CBC_SHA
+ *      MBEDTLS_TLS_DHE_PSK_WITH_AES_256_GCM_SHA384
+ *      MBEDTLS_TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384
+ *      MBEDTLS_TLS_DHE_PSK_WITH_AES_256_CBC_SHA384
+ *      MBEDTLS_TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA
+ *      MBEDTLS_TLS_DHE_PSK_WITH_AES_256_CBC_SHA
+ *      MBEDTLS_TLS_DHE_PSK_WITH_AES_128_GCM_SHA256
+ *      MBEDTLS_TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256
+ *      MBEDTLS_TLS_DHE_PSK_WITH_AES_128_CBC_SHA256
+ *      MBEDTLS_TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA
+ *      MBEDTLS_TLS_DHE_PSK_WITH_AES_128_CBC_SHA
+ *      MBEDTLS_TLS_RSA_WITH_AES_256_GCM_SHA384
+ *      MBEDTLS_TLS_RSA_WITH_AES_256_CBC_SHA256
+ *      MBEDTLS_TLS_RSA_WITH_AES_256_CBC_SHA
+ *      MBEDTLS_TLS_RSA_WITH_AES_128_GCM_SHA256
+ *      MBEDTLS_TLS_RSA_WITH_AES_128_CBC_SHA256
+ *      MBEDTLS_TLS_RSA_WITH_AES_128_CBC_SHA
+ *      MBEDTLS_TLS_RSA_PSK_WITH_AES_256_GCM_SHA384
+ *      MBEDTLS_TLS_RSA_PSK_WITH_AES_256_CBC_SHA384
+ *      MBEDTLS_TLS_RSA_PSK_WITH_AES_256_CBC_SHA
+ *      MBEDTLS_TLS_RSA_PSK_WITH_AES_128_GCM_SHA256
+ *      MBEDTLS_TLS_RSA_PSK_WITH_AES_128_CBC_SHA256
+ *      MBEDTLS_TLS_RSA_PSK_WITH_AES_128_CBC_SHA
+ *      MBEDTLS_TLS_PSK_WITH_AES_256_GCM_SHA384
+ *      MBEDTLS_TLS_PSK_WITH_AES_256_CBC_SHA384
+ *      MBEDTLS_TLS_PSK_WITH_AES_256_CBC_SHA
+ *      MBEDTLS_TLS_PSK_WITH_AES_128_GCM_SHA256
+ *      MBEDTLS_TLS_PSK_WITH_AES_128_CBC_SHA256
+ *      MBEDTLS_TLS_PSK_WITH_AES_128_CBC_SHA
+ *
+ * PEM_PARSE uses AES for decrypting encrypted keys.
+ */
+#define MBEDTLS_AES_C
+
+/**
+ * \def MBEDTLS_ARC4_C
+ *
+ * Enable the ARCFOUR stream cipher.
+ *
+ * Module:  library/arc4.c
+ * Caller:  library/cipher.c
+ *
+ * This module enables the following ciphersuites (if other requisites are
+ * enabled as well):
+ *      MBEDTLS_TLS_ECDH_ECDSA_WITH_RC4_128_SHA
+ *      MBEDTLS_TLS_ECDH_RSA_WITH_RC4_128_SHA
+ *      MBEDTLS_TLS_ECDHE_ECDSA_WITH_RC4_128_SHA
+ *      MBEDTLS_TLS_ECDHE_RSA_WITH_RC4_128_SHA
+ *      MBEDTLS_TLS_ECDHE_PSK_WITH_RC4_128_SHA
+ *      MBEDTLS_TLS_DHE_PSK_WITH_RC4_128_SHA
+ *      MBEDTLS_TLS_RSA_WITH_RC4_128_SHA
+ *      MBEDTLS_TLS_RSA_WITH_RC4_128_MD5
+ *      MBEDTLS_TLS_RSA_PSK_WITH_RC4_128_SHA
+ *      MBEDTLS_TLS_PSK_WITH_RC4_128_SHA
+ *
+ * \warning   ARC4 is considered a weak cipher and its use constitutes a
+ *            security risk. If possible, we recommend avoidng dependencies on
+ *            it, and considering stronger ciphers instead.
+ *
+ */
+#define MBEDTLS_ARC4_C
+
+/**
+ * \def MBEDTLS_ASN1_PARSE_C
+ *
+ * Enable the generic ASN1 parser.
+ *
+ * Module:  library/asn1.c
+ * Caller:  library/x509.c
+ *          library/dhm.c
+ *          library/pkcs12.c
+ *          library/pkcs5.c
+ *          library/pkparse.c
+ */
+#define MBEDTLS_ASN1_PARSE_C
+
+/**
+ * \def MBEDTLS_ASN1_WRITE_C
+ *
+ * Enable the generic ASN1 writer.
+ *
+ * Module:  library/asn1write.c
+ * Caller:  library/ecdsa.c
+ *          library/pkwrite.c
+ *          library/x509_create.c
+ *          library/x509write_crt.c
+ *          library/x509write_csr.c
+ */
+#define MBEDTLS_ASN1_WRITE_C
+
+/**
+ * \def MBEDTLS_BASE64_C
+ *
+ * Enable the Base64 module.
+ *
+ * Module:  library/base64.c
+ * Caller:  library/pem.c
+ *
+ * This module is required for PEM support (required by X.509).
+ */
+#define MBEDTLS_BASE64_C
+
+/**
+ * \def MBEDTLS_BIGNUM_C
+ *
+ * Enable the multi-precision integer library.
+ *
+ * Module:  library/bignum.c
+ * Caller:  library/dhm.c
+ *          library/ecp.c
+ *          library/ecdsa.c
+ *          library/rsa.c
+ *          library/rsa_internal.c
+ *          library/ssl_tls.c
+ *
+ * This module is required for RSA, DHM and ECC (ECDH, ECDSA) support.
+ */
+#define MBEDTLS_BIGNUM_C
+
+/**
+ * \def MBEDTLS_BLOWFISH_C
+ *
+ * Enable the Blowfish block cipher.
+ *
+ * Module:  library/blowfish.c
+ */
+#define MBEDTLS_BLOWFISH_C
+
+/**
+ * \def MBEDTLS_CAMELLIA_C
+ *
+ * Enable the Camellia block cipher.
+ *
+ * Module:  library/camellia.c
+ * Caller:  library/cipher.c
+ *
+ * This module enables the following ciphersuites (if other requisites are
+ * enabled as well):
+ *      MBEDTLS_TLS_ECDH_ECDSA_WITH_CAMELLIA_128_CBC_SHA256
+ *      MBEDTLS_TLS_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384
+ *      MBEDTLS_TLS_ECDH_RSA_WITH_CAMELLIA_128_CBC_SHA256
+ *      MBEDTLS_TLS_ECDH_RSA_WITH_CAMELLIA_256_CBC_SHA384
+ *      MBEDTLS_TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256
+ *      MBEDTLS_TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384
+ *      MBEDTLS_TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256
+ *      MBEDTLS_TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384
+ *      MBEDTLS_TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_GCM_SHA384
+ *      MBEDTLS_TLS_ECDHE_RSA_WITH_CAMELLIA_256_GCM_SHA384
+ *      MBEDTLS_TLS_DHE_RSA_WITH_CAMELLIA_256_GCM_SHA384
+ *      MBEDTLS_TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384
+ *      MBEDTLS_TLS_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384
+ *      MBEDTLS_TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256
+ *      MBEDTLS_TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA
+ *      MBEDTLS_TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_GCM_SHA256
+ *      MBEDTLS_TLS_ECDHE_RSA_WITH_CAMELLIA_128_GCM_SHA256
+ *      MBEDTLS_TLS_DHE_RSA_WITH_CAMELLIA_128_GCM_SHA256
+ *      MBEDTLS_TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256
+ *      MBEDTLS_TLS_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256
+ *      MBEDTLS_TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256
+ *      MBEDTLS_TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA
+ *      MBEDTLS_TLS_DHE_PSK_WITH_CAMELLIA_256_GCM_SHA384
+ *      MBEDTLS_TLS_ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384
+ *      MBEDTLS_TLS_DHE_PSK_WITH_CAMELLIA_256_CBC_SHA384
+ *      MBEDTLS_TLS_DHE_PSK_WITH_CAMELLIA_128_GCM_SHA256
+ *      MBEDTLS_TLS_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256
+ *      MBEDTLS_TLS_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256
+ *      MBEDTLS_TLS_RSA_WITH_CAMELLIA_256_GCM_SHA384
+ *      MBEDTLS_TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256
+ *      MBEDTLS_TLS_RSA_WITH_CAMELLIA_256_CBC_SHA
+ *      MBEDTLS_TLS_RSA_WITH_CAMELLIA_128_GCM_SHA256
+ *      MBEDTLS_TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256
+ *      MBEDTLS_TLS_RSA_WITH_CAMELLIA_128_CBC_SHA
+ *      MBEDTLS_TLS_RSA_PSK_WITH_CAMELLIA_256_GCM_SHA384
+ *      MBEDTLS_TLS_RSA_PSK_WITH_CAMELLIA_256_CBC_SHA384
+ *      MBEDTLS_TLS_RSA_PSK_WITH_CAMELLIA_128_GCM_SHA256
+ *      MBEDTLS_TLS_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256
+ *      MBEDTLS_TLS_PSK_WITH_CAMELLIA_256_GCM_SHA384
+ *      MBEDTLS_TLS_PSK_WITH_CAMELLIA_256_CBC_SHA384
+ *      MBEDTLS_TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256
+ *      MBEDTLS_TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256
+ */
+#define MBEDTLS_CAMELLIA_C
+
+/**
+ * \def MBEDTLS_ARIA_C
+ *
+ * Enable the ARIA block cipher.
+ *
+ * Module:  library/aria.c
+ * Caller:  library/cipher.c
+ *
+ * This module enables the following ciphersuites (if other requisites are
+ * enabled as well):
+ *
+ *      MBEDTLS_TLS_RSA_WITH_ARIA_128_CBC_SHA256
+ *      MBEDTLS_TLS_RSA_WITH_ARIA_256_CBC_SHA384
+ *      MBEDTLS_TLS_DHE_RSA_WITH_ARIA_128_CBC_SHA256
+ *      MBEDTLS_TLS_DHE_RSA_WITH_ARIA_256_CBC_SHA384
+ *      MBEDTLS_TLS_ECDHE_ECDSA_WITH_ARIA_128_CBC_SHA256
+ *      MBEDTLS_TLS_ECDHE_ECDSA_WITH_ARIA_256_CBC_SHA384
+ *      MBEDTLS_TLS_ECDH_ECDSA_WITH_ARIA_128_CBC_SHA256
+ *      MBEDTLS_TLS_ECDH_ECDSA_WITH_ARIA_256_CBC_SHA384
+ *      MBEDTLS_TLS_ECDHE_RSA_WITH_ARIA_128_CBC_SHA256
+ *      MBEDTLS_TLS_ECDHE_RSA_WITH_ARIA_256_CBC_SHA384
+ *      MBEDTLS_TLS_ECDH_RSA_WITH_ARIA_128_CBC_SHA256
+ *      MBEDTLS_TLS_ECDH_RSA_WITH_ARIA_256_CBC_SHA384
+ *      MBEDTLS_TLS_RSA_WITH_ARIA_128_GCM_SHA256
+ *      MBEDTLS_TLS_RSA_WITH_ARIA_256_GCM_SHA384
+ *      MBEDTLS_TLS_DHE_RSA_WITH_ARIA_128_GCM_SHA256
+ *      MBEDTLS_TLS_DHE_RSA_WITH_ARIA_256_GCM_SHA384
+ *      MBEDTLS_TLS_ECDHE_ECDSA_WITH_ARIA_128_GCM_SHA256
+ *      MBEDTLS_TLS_ECDHE_ECDSA_WITH_ARIA_256_GCM_SHA384
+ *      MBEDTLS_TLS_ECDH_ECDSA_WITH_ARIA_128_GCM_SHA256
+ *      MBEDTLS_TLS_ECDH_ECDSA_WITH_ARIA_256_GCM_SHA384
+ *      MBEDTLS_TLS_ECDHE_RSA_WITH_ARIA_128_GCM_SHA256
+ *      MBEDTLS_TLS_ECDHE_RSA_WITH_ARIA_256_GCM_SHA384
+ *      MBEDTLS_TLS_ECDH_RSA_WITH_ARIA_128_GCM_SHA256
+ *      MBEDTLS_TLS_ECDH_RSA_WITH_ARIA_256_GCM_SHA384
+ *      MBEDTLS_TLS_PSK_WITH_ARIA_128_CBC_SHA256
+ *      MBEDTLS_TLS_PSK_WITH_ARIA_256_CBC_SHA384
+ *      MBEDTLS_TLS_DHE_PSK_WITH_ARIA_128_CBC_SHA256
+ *      MBEDTLS_TLS_DHE_PSK_WITH_ARIA_256_CBC_SHA384
+ *      MBEDTLS_TLS_RSA_PSK_WITH_ARIA_128_CBC_SHA256
+ *      MBEDTLS_TLS_RSA_PSK_WITH_ARIA_256_CBC_SHA384
+ *      MBEDTLS_TLS_PSK_WITH_ARIA_128_GCM_SHA256
+ *      MBEDTLS_TLS_PSK_WITH_ARIA_256_GCM_SHA384
+ *      MBEDTLS_TLS_DHE_PSK_WITH_ARIA_128_GCM_SHA256
+ *      MBEDTLS_TLS_DHE_PSK_WITH_ARIA_256_GCM_SHA384
+ *      MBEDTLS_TLS_RSA_PSK_WITH_ARIA_128_GCM_SHA256
+ *      MBEDTLS_TLS_RSA_PSK_WITH_ARIA_256_GCM_SHA384
+ *      MBEDTLS_TLS_ECDHE_PSK_WITH_ARIA_128_CBC_SHA256
+ *      MBEDTLS_TLS_ECDHE_PSK_WITH_ARIA_256_CBC_SHA384
+ */
+//#define MBEDTLS_ARIA_C
+
+/**
+ * \def MBEDTLS_CCM_C
+ *
+ * Enable the Counter with CBC-MAC (CCM) mode for 128-bit block cipher.
+ *
+ * Module:  library/ccm.c
+ *
+ * Requires: MBEDTLS_AES_C or MBEDTLS_CAMELLIA_C
+ *
+ * This module enables the AES-CCM ciphersuites, if other requisites are
+ * enabled as well.
+ */
+//#define MBEDTLS_CCM_C
+
+/**
+ * \def MBEDTLS_CERTS_C
+ *
+ * Enable the test certificates.
+ *
+ * Module:  library/certs.c
+ * Caller:
+ *
+ * This module is used for testing (ssl_client/server).
+ */
+#define MBEDTLS_CERTS_C
+
+/**
+ * \def MBEDTLS_CHACHA20_C
+ *
+ * Enable the ChaCha20 stream cipher.
+ *
+ * Module:  library/chacha20.c
+ */
+//#define MBEDTLS_CHACHA20_C
+
+/**
+ * \def MBEDTLS_CHACHAPOLY_C
+ *
+ * Enable the ChaCha20-Poly1305 AEAD algorithm.
+ *
+ * Module:  library/chachapoly.c
+ *
+ * This module requires: MBEDTLS_CHACHA20_C, MBEDTLS_POLY1305_C
+ */
+//#define MBEDTLS_CHACHAPOLY_C
+
+/**
+ * \def MBEDTLS_CIPHER_C
+ *
+ * Enable the generic cipher layer.
+ *
+ * Module:  library/cipher.c
+ * Caller:  library/ssl_tls.c
+ *
+ * Uncomment to enable generic cipher wrappers.
+ */
+#define MBEDTLS_CIPHER_C
+
+/**
+ * \def MBEDTLS_CMAC_C
+ *
+ * Enable the CMAC (Cipher-based Message Authentication Code) mode for block
+ * ciphers.
+ *
+ * Module:  library/cmac.c
+ *
+ * Requires: MBEDTLS_AES_C or MBEDTLS_DES_C
+ *
+ */
+#define MBEDTLS_CMAC_C
+
+/**
+ * \def MBEDTLS_CTR_DRBG_C
+ *
+ * Enable the CTR_DRBG AES-256-based random generator.
+ *
+ * Module:  library/ctr_drbg.c
+ * Caller:
+ *
+ * Requires: MBEDTLS_AES_C
+ *
+ * This module provides the CTR_DRBG AES-256 random number generator.
+ */
+#define MBEDTLS_CTR_DRBG_C
+
+/**
+ * \def MBEDTLS_DEBUG_C
+ *
+ * Enable the debug functions.
+ *
+ * Module:  library/debug.c
+ * Caller:  library/ssl_cli.c
+ *          library/ssl_srv.c
+ *          library/ssl_tls.c
+ *
+ * This module provides debugging functions.
+ */
+#define MBEDTLS_DEBUG_C
+
+/**
+ * \def MBEDTLS_DES_C
+ *
+ * Enable the DES block cipher.
+ *
+ * Module:  library/des.c
+ * Caller:  library/pem.c
+ *          library/cipher.c
+ *
+ * This module enables the following ciphersuites (if other requisites are
+ * enabled as well):
+ *      MBEDTLS_TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA
+ *      MBEDTLS_TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA
+ *      MBEDTLS_TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA
+ *      MBEDTLS_TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA
+ *      MBEDTLS_TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA
+ *      MBEDTLS_TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA
+ *      MBEDTLS_TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA
+ *      MBEDTLS_TLS_RSA_WITH_3DES_EDE_CBC_SHA
+ *      MBEDTLS_TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA
+ *      MBEDTLS_TLS_PSK_WITH_3DES_EDE_CBC_SHA
+ *
+ * PEM_PARSE uses DES/3DES for decrypting encrypted keys.
+ *
+ * \warning   DES is considered a weak cipher and its use constitutes a
+ *            security risk. We recommend considering stronger ciphers instead.
+ */
+#define MBEDTLS_DES_C
+
+/**
+ * \def MBEDTLS_DHM_C
+ *
+ * Enable the Diffie-Hellman-Merkle module.
+ *
+ * Module:  library/dhm.c
+ * Caller:  library/ssl_cli.c
+ *          library/ssl_srv.c
+ *
+ * This module is used by the following key exchanges:
+ *      DHE-RSA, DHE-PSK
+ *
+ * \warning    Using DHE constitutes a security risk as it
+ *             is not possible to validate custom DH parameters.
+ *             If possible, it is recommended users should consider
+ *             preferring other methods of key exchange.
+ *             See dhm.h for more details.
+ *
+ */
+//#define MBEDTLS_DHM_C
+
+/**
+ * \def MBEDTLS_ECDH_C
+ *
+ * Enable the elliptic curve Diffie-Hellman library.
+ *
+ * Module:  library/ecdh.c
+ * Caller:  library/ssl_cli.c
+ *          library/ssl_srv.c
+ *
+ * This module is used by the following key exchanges:
+ *      ECDHE-ECDSA, ECDHE-RSA, DHE-PSK
+ *
+ * Requires: MBEDTLS_ECP_C
+ */
+#define MBEDTLS_ECDH_C
+
+/**
+ * \def MBEDTLS_ECDSA_C
+ *
+ * Enable the elliptic curve DSA library.
+ *
+ * Module:  library/ecdsa.c
+ * Caller:
+ *
+ * This module is used by the following key exchanges:
+ *      ECDHE-ECDSA
+ *
+ * Requires: MBEDTLS_ECP_C, MBEDTLS_ASN1_WRITE_C, MBEDTLS_ASN1_PARSE_C
+ */
+#define MBEDTLS_ECDSA_C
+
+/**
+ * \def MBEDTLS_ECJPAKE_C
+ *
+ * Enable the elliptic curve J-PAKE library.
+ *
+ * \warning This is currently experimental. EC J-PAKE support is based on the
+ * Thread v1.0.0 specification; incompatible changes to the specification
+ * might still happen. For this reason, this is disabled by default.
+ *
+ * Module:  library/ecjpake.c
+ * Caller:
+ *
+ * This module is used by the following key exchanges:
+ *      ECJPAKE
+ *
+ * Requires: MBEDTLS_ECP_C, MBEDTLS_MD_C
+ */
+//#define MBEDTLS_ECJPAKE_C
+
+/**
+ * \def MBEDTLS_ECP_C
+ *
+ * Enable the elliptic curve over GF(p) library.
+ *
+ * Module:  library/ecp.c
+ * Caller:  library/ecdh.c
+ *          library/ecdsa.c
+ *          library/ecjpake.c
+ *
+ * Requires: MBEDTLS_BIGNUM_C and at least one MBEDTLS_ECP_DP_XXX_ENABLED
+ */
+#define MBEDTLS_ECP_C
+
+/**
+ * \def MBEDTLS_ENTROPY_C
+ *
+ * Enable the platform-specific entropy code.
+ *
+ * Module:  library/entropy.c
+ * Caller:
+ *
+ * Requires: MBEDTLS_SHA512_C or MBEDTLS_SHA256_C
+ *
+ * This module provides a generic entropy pool
+ */
+#define MBEDTLS_ENTROPY_C
+
+/**
+ * \def MBEDTLS_ERROR_C
+ *
+ * Enable error code to error string conversion.
+ *
+ * Module:  library/error.c
+ * Caller:
+ *
+ * This module enables mbedtls_strerror().
+ */
+#define MBEDTLS_ERROR_C
+
+/**
+ * \def MBEDTLS_GCM_C
+ *
+ * Enable the Galois/Counter Mode (GCM) for AES.
+ *
+ * Module:  library/gcm.c
+ *
+ * Requires: MBEDTLS_AES_C or MBEDTLS_CAMELLIA_C
+ *
+ * This module enables the AES-GCM and CAMELLIA-GCM ciphersuites, if other
+ * requisites are enabled as well.
+ */
+//#define MBEDTLS_GCM_C
+
+/**
+ * \def MBEDTLS_HAVEGE_C
+ *
+ * Enable the HAVEGE random generator.
+ *
+ * Warning: the HAVEGE random generator is not suitable for virtualized
+ *          environments
+ *
+ * Warning: the HAVEGE random generator is dependent on timing and specific
+ *          processor traits. It is therefore not advised to use HAVEGE as
+ *          your applications primary random generator or primary entropy pool
+ *          input. As a secondary input to your entropy pool, it IS able add
+ *          the (limited) extra entropy it provides.
+ *
+ * Module:  library/havege.c
+ * Caller:
+ *
+ * Requires: MBEDTLS_TIMING_C
+ *
+ * Uncomment to enable the HAVEGE random generator.
+ */
+//#define MBEDTLS_HAVEGE_C
+
+/**
+ * \def MBEDTLS_HKDF_C
+ *
+ * Enable the HKDF algorithm (RFC 5869).
+ *
+ * Module:  library/hkdf.c
+ * Caller:
+ *
+ * Requires: MBEDTLS_MD_C
+ *
+ * This module adds support for the Hashed Message Authentication Code
+ * (HMAC)-based key derivation function (HKDF).
+ */
+//#define MBEDTLS_HKDF_C
+
+/**
+ * \def MBEDTLS_HMAC_DRBG_C
+ *
+ * Enable the HMAC_DRBG random generator.
+ *
+ * Module:  library/hmac_drbg.c
+ * Caller:
+ *
+ * Requires: MBEDTLS_MD_C
+ *
+ * Uncomment to enable the HMAC_DRBG random number geerator.
+ */
+//#define MBEDTLS_HMAC_DRBG_C
+
+/**
+ * \def MBEDTLS_NIST_KW_C
+ *
+ * Enable the Key Wrapping mode for 128-bit block ciphers,
+ * as defined in NIST SP 800-38F. Only KW and KWP modes
+ * are supported. At the moment, only AES is approved by NIST.
+ *
+ * Module:  library/nist_kw.c
+ *
+ * Requires: MBEDTLS_AES_C and MBEDTLS_CIPHER_C
+ */
+//#define MBEDTLS_NIST_KW_C
+
+/**
+ * \def MBEDTLS_MD_C
+ *
+ * Enable the generic message digest layer.
+ *
+ * Module:  library/md.c
+ * Caller:
+ *
+ * Uncomment to enable generic message digest wrappers.
+ */
+#define MBEDTLS_MD_C
+
+/**
+ * \def MBEDTLS_MD2_C
+ *
+ * Enable the MD2 hash algorithm.
+ *
+ * Module:  library/md2.c
+ * Caller:
+ *
+ * Uncomment to enable support for (rare) MD2-signed X.509 certs.
+ *
+ * \warning   MD2 is considered a weak message digest and its use constitutes a
+ *            security risk. If possible, we recommend avoiding dependencies on
+ *            it, and considering stronger message digests instead.
+ *
+ */
+//#define MBEDTLS_MD2_C
+
+/**
+ * \def MBEDTLS_MD4_C
+ *
+ * Enable the MD4 hash algorithm.
+ *
+ * Module:  library/md4.c
+ * Caller:
+ *
+ * Uncomment to enable support for (rare) MD4-signed X.509 certs.
+ *
+ * \warning   MD4 is considered a weak message digest and its use constitutes a
+ *            security risk. If possible, we recommend avoiding dependencies on
+ *            it, and considering stronger message digests instead.
+ *
+ */
+//#define MBEDTLS_MD4_C
+
+/**
+ * \def MBEDTLS_MD5_C
+ *
+ * Enable the MD5 hash algorithm.
+ *
+ * Module:  library/md5.c
+ * Caller:  library/md.c
+ *          library/pem.c
+ *          library/ssl_tls.c
+ *
+ * This module is required for SSL/TLS up to version 1.1, and for TLS 1.2
+ * depending on the handshake parameters. Further, it is used for checking
+ * MD5-signed certificates, and for PBKDF1 when decrypting PEM-encoded
+ * encrypted keys.
+ *
+ * \warning   MD5 is considered a weak message digest and its use constitutes a
+ *            security risk. If possible, we recommend avoiding dependencies on
+ *            it, and considering stronger message digests instead.
+ *
+ */
+#define MBEDTLS_MD5_C
+
+/**
+ * \def MBEDTLS_MEMORY_BUFFER_ALLOC_C
+ *
+ * Enable the buffer allocator implementation that makes use of a (stack)
+ * based buffer to 'allocate' dynamic memory. (replaces calloc() and free()
+ * calls)
+ *
+ * Module:  library/memory_buffer_alloc.c
+ *
+ * Requires: MBEDTLS_PLATFORM_C
+ *           MBEDTLS_PLATFORM_MEMORY (to use it within mbed TLS)
+ *
+ * Enable this module to enable the buffer memory allocator.
+ */
+//#define MBEDTLS_MEMORY_BUFFER_ALLOC_C
+
+/**
+ * \def MBEDTLS_NET_C
+ *
+ * Enable the TCP and UDP over IPv6/IPv4 networking routines.
+ *
+ * \note This module only works on POSIX/Unix (including Linux, BSD and OS X)
+ * and Windows. For other platforms, you'll want to disable it, and write your
+ * own networking callbacks to be passed to \c mbedtls_ssl_set_bio().
+ *
+ * \note See also our Knowledge Base article about porting to a new
+ * environment:
+ * https://tls.mbed.org/kb/how-to/how-do-i-port-mbed-tls-to-a-new-environment-OS
+ *
+ * Module:  library/net_sockets.c
+ *
+ * This module provides networking routines.
+ */
+//#define MBEDTLS_NET_C
+
+/**
+ * \def MBEDTLS_OID_C
+ *
+ * Enable the OID database.
+ *
+ * Module:  library/oid.c
+ * Caller:  library/asn1write.c
+ *          library/pkcs5.c
+ *          library/pkparse.c
+ *          library/pkwrite.c
+ *          library/rsa.c
+ *          library/x509.c
+ *          library/x509_create.c
+ *          library/x509_crl.c
+ *          library/x509_crt.c
+ *          library/x509_csr.c
+ *          library/x509write_crt.c
+ *          library/x509write_csr.c
+ *
+ * This modules translates between OIDs and internal values.
+ */
+#define MBEDTLS_OID_C
+
+/**
+ * \def MBEDTLS_PADLOCK_C
+ *
+ * Enable VIA Padlock support on x86.
+ *
+ * Module:  library/padlock.c
+ * Caller:  library/aes.c
+ *
+ * Requires: MBEDTLS_HAVE_ASM
+ *
+ * This modules adds support for the VIA PadLock on x86.
+ */
+//#define MBEDTLS_PADLOCK_C
+
+/**
+ * \def MBEDTLS_PEM_PARSE_C
+ *
+ * Enable PEM decoding / parsing.
+ *
+ * Module:  library/pem.c
+ * Caller:  library/dhm.c
+ *          library/pkparse.c
+ *          library/x509_crl.c
+ *          library/x509_crt.c
+ *          library/x509_csr.c
+ *
+ * Requires: MBEDTLS_BASE64_C
+ *
+ * This modules adds support for decoding / parsing PEM files.
+ */
+#define MBEDTLS_PEM_PARSE_C
+
+/**
+ * \def MBEDTLS_PEM_WRITE_C
+ *
+ * Enable PEM encoding / writing.
+ *
+ * Module:  library/pem.c
+ * Caller:  library/pkwrite.c
+ *          library/x509write_crt.c
+ *          library/x509write_csr.c
+ *
+ * Requires: MBEDTLS_BASE64_C
+ *
+ * This modules adds support for encoding / writing PEM files.
+ */
+#define MBEDTLS_PEM_WRITE_C
+
+/**
+ * \def MBEDTLS_PK_C
+ *
+ * Enable the generic public (asymetric) key layer.
+ *
+ * Module:  library/pk.c
+ * Caller:  library/ssl_tls.c
+ *          library/ssl_cli.c
+ *          library/ssl_srv.c
+ *
+ * Requires: MBEDTLS_RSA_C or MBEDTLS_ECP_C
+ *
+ * Uncomment to enable generic public key wrappers.
+ */
+#define MBEDTLS_PK_C
+
+/**
+ * \def MBEDTLS_PK_PARSE_C
+ *
+ * Enable the generic public (asymetric) key parser.
+ *
+ * Module:  library/pkparse.c
+ * Caller:  library/x509_crt.c
+ *          library/x509_csr.c
+ *
+ * Requires: MBEDTLS_PK_C
+ *
+ * Uncomment to enable generic public key parse functions.
+ */
+#define MBEDTLS_PK_PARSE_C
+
+/**
+ * \def MBEDTLS_PK_WRITE_C
+ *
+ * Enable the generic public (asymetric) key writer.
+ *
+ * Module:  library/pkwrite.c
+ * Caller:  library/x509write.c
+ *
+ * Requires: MBEDTLS_PK_C
+ *
+ * Uncomment to enable generic public key write functions.
+ */
+#define MBEDTLS_PK_WRITE_C
+
+/**
+ * \def MBEDTLS_PKCS5_C
+ *
+ * Enable PKCS#5 functions.
+ *
+ * Module:  library/pkcs5.c
+ *
+ * Requires: MBEDTLS_MD_C
+ *
+ * This module adds support for the PKCS#5 functions.
+ */
+#define MBEDTLS_PKCS5_C
+
+/**
+ * \def MBEDTLS_PKCS11_C
+ *
+ * Enable wrapper for PKCS#11 smartcard support.
+ *
+ * Module:  library/pkcs11.c
+ * Caller:  library/pk.c
+ *
+ * Requires: MBEDTLS_PK_C
+ *
+ * This module enables SSL/TLS PKCS #11 smartcard support.
+ * Requires the presence of the PKCS#11 helper library (libpkcs11-helper)
+ */
+//#define MBEDTLS_PKCS11_C
+
+/**
+ * \def MBEDTLS_PKCS12_C
+ *
+ * Enable PKCS#12 PBE functions.
+ * Adds algorithms for parsing PKCS#8 encrypted private keys
+ *
+ * Module:  library/pkcs12.c
+ * Caller:  library/pkparse.c
+ *
+ * Requires: MBEDTLS_ASN1_PARSE_C, MBEDTLS_CIPHER_C, MBEDTLS_MD_C
+ * Can use:  MBEDTLS_ARC4_C
+ *
+ * This module enables PKCS#12 functions.
+ */
+#define MBEDTLS_PKCS12_C
+
+/**
+ * \def MBEDTLS_PLATFORM_C
+ *
+ * Enable the platform abstraction layer that allows you to re-assign
+ * functions like calloc(), free(), snprintf(), printf(), fprintf(), exit().
+ *
+ * Enabling MBEDTLS_PLATFORM_C enables to use of MBEDTLS_PLATFORM_XXX_ALT
+ * or MBEDTLS_PLATFORM_XXX_MACRO directives, allowing the functions mentioned
+ * above to be specified at runtime or compile time respectively.
+ *
+ * \note This abstraction layer must be enabled on Windows (including MSYS2)
+ * as other module rely on it for a fixed snprintf implementation.
+ *
+ * Module:  library/platform.c
+ * Caller:  Most other .c files
+ *
+ * This module enables abstraction of common (libc) functions.
+ */
+#define MBEDTLS_PLATFORM_C
+
+/**
+ * \def MBEDTLS_POLY1305_C
+ *
+ * Enable the Poly1305 MAC algorithm.
+ *
+ * Module:  library/poly1305.c
+ * Caller:  library/chachapoly.c
+ */
+//#define MBEDTLS_POLY1305_C
+
+/**
+ * \def MBEDTLS_RIPEMD160_C
+ *
+ * Enable the RIPEMD-160 hash algorithm.
+ *
+ * Module:  library/ripemd160.c
+ * Caller:  library/md.c
+ *
+ */
+//#define MBEDTLS_RIPEMD160_C
+
+/**
+ * \def MBEDTLS_RSA_C
+ *
+ * Enable the RSA public-key cryptosystem.
+ *
+ * Module:  library/rsa.c
+ *          library/rsa_internal.c
+ * Caller:  library/ssl_cli.c
+ *          library/ssl_srv.c
+ *          library/ssl_tls.c
+ *          library/x509.c
+ *
+ * This module is used by the following key exchanges:
+ *      RSA, DHE-RSA, ECDHE-RSA, RSA-PSK
+ *
+ * Requires: MBEDTLS_BIGNUM_C, MBEDTLS_OID_C
+ */
+#define MBEDTLS_RSA_C
+
+/**
+ * \def MBEDTLS_SHA1_C
+ *
+ * Enable the SHA1 cryptographic hash algorithm.
+ *
+ * Module:  library/sha1.c
+ * Caller:  library/md.c
+ *          library/ssl_cli.c
+ *          library/ssl_srv.c
+ *          library/ssl_tls.c
+ *          library/x509write_crt.c
+ *
+ * This module is required for SSL/TLS up to version 1.1, for TLS 1.2
+ * depending on the handshake parameters, and for SHA1-signed certificates.
+ *
+ * \warning   SHA-1 is considered a weak message digest and its use constitutes
+ *            a security risk. If possible, we recommend avoiding dependencies
+ *            on it, and considering stronger message digests instead.
+ *
+ */
+#define MBEDTLS_SHA1_C
+
+/**
+ * \def MBEDTLS_SHA256_C
+ *
+ * Enable the SHA-224 and SHA-256 cryptographic hash algorithms.
+ *
+ * Module:  library/sha256.c
+ * Caller:  library/entropy.c
+ *          library/md.c
+ *          library/ssl_cli.c
+ *          library/ssl_srv.c
+ *          library/ssl_tls.c
+ *
+ * This module adds support for SHA-224 and SHA-256.
+ * This module is required for the SSL/TLS 1.2 PRF function.
+ */
+#define MBEDTLS_SHA256_C
+
+/**
+ * \def MBEDTLS_SHA512_C
+ *
+ * Enable the SHA-384 and SHA-512 cryptographic hash algorithms.
+ *
+ * Module:  library/sha512.c
+ * Caller:  library/entropy.c
+ *          library/md.c
+ *          library/ssl_cli.c
+ *          library/ssl_srv.c
+ *
+ * This module adds support for SHA-384 and SHA-512.
+ */
+#define MBEDTLS_SHA512_C
+
+/**
+ * \def MBEDTLS_SSL_CACHE_C
+ *
+ * Enable simple SSL cache implementation.
+ *
+ * Module:  library/ssl_cache.c
+ * Caller:
+ *
+ * Requires: MBEDTLS_SSL_CACHE_C
+ */
+#define MBEDTLS_SSL_CACHE_C
+
+/**
+ * \def MBEDTLS_SSL_COOKIE_C
+ *
+ * Enable basic implementation of DTLS cookies for hello verification.
+ *
+ * Module:  library/ssl_cookie.c
+ * Caller:
+ */
+#define MBEDTLS_SSL_COOKIE_C
+
+/**
+ * \def MBEDTLS_SSL_TICKET_C
+ *
+ * Enable an implementation of TLS server-side callbacks for session tickets.
+ *
+ * Module:  library/ssl_ticket.c
+ * Caller:
+ *
+ * Requires: MBEDTLS_CIPHER_C
+ */
+#define MBEDTLS_SSL_TICKET_C
+
+/**
+ * \def MBEDTLS_SSL_CLI_C
+ *
+ * Enable the SSL/TLS client code.
+ *
+ * Module:  library/ssl_cli.c
+ * Caller:
+ *
+ * Requires: MBEDTLS_SSL_TLS_C
+ *
+ * This module is required for SSL/TLS client support.
+ */
+//#define MBEDTLS_SSL_CLI_C
+
+/**
+ * \def MBEDTLS_SSL_SRV_C
+ *
+ * Enable the SSL/TLS server code.
+ *
+ * Module:  library/ssl_srv.c
+ * Caller:
+ *
+ * Requires: MBEDTLS_SSL_TLS_C
+ *
+ * This module is required for SSL/TLS server support.
+ */
+//#define MBEDTLS_SSL_SRV_C
+
+/**
+ * \def MBEDTLS_SSL_TLS_C
+ *
+ * Enable the generic SSL/TLS code.
+ *
+ * Module:  library/ssl_tls.c
+ * Caller:  library/ssl_cli.c
+ *          library/ssl_srv.c
+ *
+ * Requires: MBEDTLS_CIPHER_C, MBEDTLS_MD_C
+ *           and at least one of the MBEDTLS_SSL_PROTO_XXX defines
+ *
+ * This module is required for SSL/TLS.
+ */
+//#define MBEDTLS_SSL_TLS_C
+
+/**
+ * \def MBEDTLS_THREADING_C
+ *
+ * Enable the threading abstraction layer.
+ * By default mbed TLS assumes it is used in a non-threaded environment or that
+ * contexts are not shared between threads. If you do intend to use contexts
+ * between threads, you will need to enable this layer to prevent race
+ * conditions. See also our Knowledge Base article about threading:
+ * https://tls.mbed.org/kb/development/thread-safety-and-multi-threading
+ *
+ * Module:  library/threading.c
+ *
+ * This allows different threading implementations (self-implemented or
+ * provided).
+ *
+ * You will have to enable either MBEDTLS_THREADING_ALT or
+ * MBEDTLS_THREADING_PTHREAD.
+ *
+ * Enable this layer to allow use of mutexes within mbed TLS
+ */
+//#define MBEDTLS_THREADING_C
+
+/**
+ * \def MBEDTLS_TIMING_C
+ *
+ * Enable the semi-portable timing interface.
+ *
+ * \note The provided implementation only works on POSIX/Unix (including Linux,
+ * BSD and OS X) and Windows. On other platforms, you can either disable that
+ * module and provide your own implementations of the callbacks needed by
+ * \c mbedtls_ssl_set_timer_cb() for DTLS, or leave it enabled and provide
+ * your own implementation of the whole module by setting
+ * \c MBEDTLS_TIMING_ALT in the current file.
+ *
+ * \note See also our Knowledge Base article about porting to a new
+ * environment:
+ * https://tls.mbed.org/kb/how-to/how-do-i-port-mbed-tls-to-a-new-environment-OS
+ *
+ * Module:  library/timing.c
+ * Caller:  library/havege.c
+ *
+ * This module is used by the HAVEGE random number generator.
+ */
+#define MBEDTLS_TIMING_C
+
+/**
+ * \def MBEDTLS_VERSION_C
+ *
+ * Enable run-time version information.
+ *
+ * Module:  library/version.c
+ *
+ * This module provides run-time version information.
+ */
+#define MBEDTLS_VERSION_C
+
+/**
+ * \def MBEDTLS_X509_USE_C
+ *
+ * Enable X.509 core for using certificates.
+ *
+ * Module:  library/x509.c
+ * Caller:  library/x509_crl.c
+ *          library/x509_crt.c
+ *          library/x509_csr.c
+ *
+ * Requires: MBEDTLS_ASN1_PARSE_C, MBEDTLS_BIGNUM_C, MBEDTLS_OID_C,
+ *           MBEDTLS_PK_PARSE_C
+ *
+ * This module is required for the X.509 parsing modules.
+ */
+#define MBEDTLS_X509_USE_C
+
+/**
+ * \def MBEDTLS_X509_CRT_PARSE_C
+ *
+ * Enable X.509 certificate parsing.
+ *
+ * Module:  library/x509_crt.c
+ * Caller:  library/ssl_cli.c
+ *          library/ssl_srv.c
+ *          library/ssl_tls.c
+ *
+ * Requires: MBEDTLS_X509_USE_C
+ *
+ * This module is required for X.509 certificate parsing.
+ */
+#define MBEDTLS_X509_CRT_PARSE_C
+
+/**
+ * \def MBEDTLS_X509_CRL_PARSE_C
+ *
+ * Enable X.509 CRL parsing.
+ *
+ * Module:  library/x509_crl.c
+ * Caller:  library/x509_crt.c
+ *
+ * Requires: MBEDTLS_X509_USE_C
+ *
+ * This module is required for X.509 CRL parsing.
+ */
+#define MBEDTLS_X509_CRL_PARSE_C
+
+/**
+ * \def MBEDTLS_X509_CSR_PARSE_C
+ *
+ * Enable X.509 Certificate Signing Request (CSR) parsing.
+ *
+ * Module:  library/x509_csr.c
+ * Caller:  library/x509_crt_write.c
+ *
+ * Requires: MBEDTLS_X509_USE_C
+ *
+ * This module is used for reading X.509 certificate request.
+ */
+#define MBEDTLS_X509_CSR_PARSE_C
+
+/**
+ * \def MBEDTLS_X509_CREATE_C
+ *
+ * Enable X.509 core for creating certificates.
+ *
+ * Module:  library/x509_create.c
+ *
+ * Requires: MBEDTLS_BIGNUM_C, MBEDTLS_OID_C, MBEDTLS_PK_WRITE_C
+ *
+ * This module is the basis for creating X.509 certificates and CSRs.
+ */
+#define MBEDTLS_X509_CREATE_C
+
+/**
+ * \def MBEDTLS_X509_CRT_WRITE_C
+ *
+ * Enable creating X.509 certificates.
+ *
+ * Module:  library/x509_crt_write.c
+ *
+ * Requires: MBEDTLS_X509_CREATE_C
+ *
+ * This module is required for X.509 certificate creation.
+ */
+#define MBEDTLS_X509_CRT_WRITE_C
+
+/**
+ * \def MBEDTLS_X509_CSR_WRITE_C
+ *
+ * Enable creating X.509 Certificate Signing Requests (CSR).
+ *
+ * Module:  library/x509_csr_write.c
+ *
+ * Requires: MBEDTLS_X509_CREATE_C
+ *
+ * This module is required for X.509 certificate request writing.
+ */
+#define MBEDTLS_X509_CSR_WRITE_C
+
+/**
+ * \def MBEDTLS_XTEA_C
+ *
+ * Enable the XTEA block cipher.
+ *
+ * Module:  library/xtea.c
+ * Caller:
+ */
+//#define MBEDTLS_XTEA_C
+
+/* \} name SECTION: mbed TLS modules */
+
+/**
+ * \name SECTION: Module configuration options
+ *
+ * This section allows for the setting of module specific sizes and
+ * configuration options. The default values are already present in the
+ * relevant header files and should suffice for the regular use cases.
+ *
+ * Our advice is to enable options and change their values here
+ * only if you have a good reason and know the consequences.
+ *
+ * Please check the respective header file for documentation on these
+ * parameters (to prevent duplicate documentation).
+ * \{
+ */
+
+/* MPI / BIGNUM options */
+//#define MBEDTLS_MPI_WINDOW_SIZE            6 /**< Maximum windows size used. */
+//#define MBEDTLS_MPI_MAX_SIZE            1024 /**< Maximum number of bytes for usable MPIs. */
+
+/* CTR_DRBG options */
+//#define MBEDTLS_CTR_DRBG_ENTROPY_LEN               48 /**< Amount of entropy used per seed by default (48 with SHA-512, 32 with SHA-256) */
+//#define MBEDTLS_CTR_DRBG_RESEED_INTERVAL        10000 /**< Interval before reseed is performed by default */
+//#define MBEDTLS_CTR_DRBG_MAX_INPUT                256 /**< Maximum number of additional input bytes */
+//#define MBEDTLS_CTR_DRBG_MAX_REQUEST             1024 /**< Maximum number of requested bytes per call */
+//#define MBEDTLS_CTR_DRBG_MAX_SEED_INPUT           384 /**< Maximum size of (re)seed buffer */
+
+/* HMAC_DRBG options */
+//#define MBEDTLS_HMAC_DRBG_RESEED_INTERVAL   10000 /**< Interval before reseed is performed by default */
+//#define MBEDTLS_HMAC_DRBG_MAX_INPUT           256 /**< Maximum number of additional input bytes */
+//#define MBEDTLS_HMAC_DRBG_MAX_REQUEST        1024 /**< Maximum number of requested bytes per call */
+//#define MBEDTLS_HMAC_DRBG_MAX_SEED_INPUT      384 /**< Maximum size of (re)seed buffer */
+
+/* ECP options */
+//#define MBEDTLS_ECP_MAX_BITS             521 /**< Maximum bit size of groups */
+//#define MBEDTLS_ECP_WINDOW_SIZE            6 /**< Maximum window size used */
+//#define MBEDTLS_ECP_FIXED_POINT_OPTIM      1 /**< Enable fixed-point speed-up */
+
+/* Entropy options */
+//#define MBEDTLS_ENTROPY_MAX_SOURCES                20 /**< Maximum number of sources supported */
+//#define MBEDTLS_ENTROPY_MAX_GATHER                128 /**< Maximum amount requested from entropy sources */
+//#define MBEDTLS_ENTROPY_MIN_HARDWARE               32 /**< Default minimum number of bytes required for the hardware entropy source mbedtls_hardware_poll() before entropy is released */
+
+/* Memory buffer allocator options */
+//#define MBEDTLS_MEMORY_ALIGN_MULTIPLE      4 /**< Align on multiples of this value */
+
+/* Platform options */
+//#define MBEDTLS_PLATFORM_STD_MEM_HDR   <stdlib.h> /**< Header to include if MBEDTLS_PLATFORM_NO_STD_FUNCTIONS is defined. Don't define if no header is needed. */
+//#define MBEDTLS_PLATFORM_STD_CALLOC        calloc /**< Default allocator to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_FREE            free /**< Default free to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_EXIT            exit /**< Default exit to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_TIME            time /**< Default time to use, can be undefined. MBEDTLS_HAVE_TIME must be enabled */
+//#define MBEDTLS_PLATFORM_STD_FPRINTF      fprintf /**< Default fprintf to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_PRINTF        printf /**< Default printf to use, can be undefined */
+/* Note: your snprintf must correclty zero-terminate the buffer! */
+//#define MBEDTLS_PLATFORM_STD_SNPRINTF    snprintf /**< Default snprintf to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_EXIT_SUCCESS       0 /**< Default exit value to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_EXIT_FAILURE       1 /**< Default exit value to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_NV_SEED_READ   mbedtls_platform_std_nv_seed_read /**< Default nv_seed_read function to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_NV_SEED_WRITE  mbedtls_platform_std_nv_seed_write /**< Default nv_seed_write function to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_NV_SEED_FILE  "seedfile" /**< Seed file to read/write with default implementation */
+
+/* To Use Function Macros MBEDTLS_PLATFORM_C must be enabled */
+/* MBEDTLS_PLATFORM_XXX_MACRO and MBEDTLS_PLATFORM_XXX_ALT cannot both be defined */
+//#define MBEDTLS_PLATFORM_CALLOC_MACRO        calloc /**< Default allocator macro to use, can be undefined */
+//#define MBEDTLS_PLATFORM_FREE_MACRO            free /**< Default free macro to use, can be undefined */
+//#define MBEDTLS_PLATFORM_EXIT_MACRO            exit /**< Default exit macro to use, can be undefined */
+//#define MBEDTLS_PLATFORM_TIME_MACRO            time /**< Default time macro to use, can be undefined. MBEDTLS_HAVE_TIME must be enabled */
+//#define MBEDTLS_PLATFORM_TIME_TYPE_MACRO       time_t /**< Default time macro to use, can be undefined. MBEDTLS_HAVE_TIME must be enabled */
+//#define MBEDTLS_PLATFORM_FPRINTF_MACRO      fprintf /**< Default fprintf macro to use, can be undefined */
+//#define MBEDTLS_PLATFORM_PRINTF_MACRO        printf /**< Default printf macro to use, can be undefined */
+/* Note: your snprintf must correclty zero-terminate the buffer! */
+//#define MBEDTLS_PLATFORM_SNPRINTF_MACRO    snprintf /**< Default snprintf macro to use, can be undefined */
+//#define MBEDTLS_PLATFORM_NV_SEED_READ_MACRO   mbedtls_platform_std_nv_seed_read /**< Default nv_seed_read function to use, can be undefined */
+//#define MBEDTLS_PLATFORM_NV_SEED_WRITE_MACRO  mbedtls_platform_std_nv_seed_write /**< Default nv_seed_write function to use, can be undefined */
+
+/* SSL Cache options */
+//#define MBEDTLS_SSL_CACHE_DEFAULT_TIMEOUT       86400 /**< 1 day  */
+//#define MBEDTLS_SSL_CACHE_DEFAULT_MAX_ENTRIES      50 /**< Maximum entries in cache */
+
+/* SSL options */
+
+/** \def MBEDTLS_SSL_MAX_CONTENT_LEN
+ *
+ * Maximum fragment length in bytes.
+ *
+ * Determines the size of both the incoming and outgoing TLS I/O buffers.
+ *
+ * Uncommenting MBEDTLS_SSL_IN_CONTENT_LEN and/or MBEDTLS_SSL_OUT_CONTENT_LEN
+ * will override this length by setting maximum incoming and/or outgoing
+ * fragment length, respectively.
+ */
+//#define MBEDTLS_SSL_MAX_CONTENT_LEN             16384
+
+/** \def MBEDTLS_SSL_IN_CONTENT_LEN
+ *
+ * Maximum incoming fragment length in bytes.
+ *
+ * Uncomment to set the size of the inward TLS buffer independently of the
+ * outward buffer.
+ */
+//#define MBEDTLS_SSL_IN_CONTENT_LEN              16384
+
+/** \def MBEDTLS_SSL_OUT_CONTENT_LEN
+ *
+ * Maximum outgoing fragment length in bytes.
+ *
+ * Uncomment to set the size of the outward TLS buffer independently of the
+ * inward buffer.
+ *
+ * It is possible to save RAM by setting a smaller outward buffer, while keeping
+ * the default inward 16384 byte buffer to conform to the TLS specification.
+ *
+ * The minimum required outward buffer size is determined by the handshake
+ * protocol's usage. Handshaking will fail if the outward buffer is too small.
+ * The specific size requirement depends on the configured ciphers and any
+ * certificate data which is sent during the handshake.
+ *
+ * For absolute minimum RAM usage, it's best to enable
+ * MBEDTLS_SSL_MAX_FRAGMENT_LENGTH and reduce MBEDTLS_SSL_MAX_CONTENT_LEN. This
+ * reduces both incoming and outgoing buffer sizes. However this is only
+ * guaranteed if the other end of the connection also supports the TLS
+ * max_fragment_len extension. Otherwise the connection may fail.
+ */
+//#define MBEDTLS_SSL_OUT_CONTENT_LEN             16384
+
+/** \def MBEDTLS_SSL_DTLS_MAX_BUFFERING
+ *
+ * Maximum number of heap-allocated bytes for the purpose of
+ * DTLS handshake message reassembly and future message buffering.
+ *
+ * This should be at least 9/8 * MBEDTLSSL_IN_CONTENT_LEN
+ * to account for a reassembled handshake message of maximum size,
+ * together with its reassembly bitmap.
+ *
+ * A value of 2 * MBEDTLS_SSL_IN_CONTENT_LEN (32768 by default)
+ * should be sufficient for all practical situations as it allows
+ * to reassembly a large handshake message (such as a certificate)
+ * while buffering multiple smaller handshake messages.
+ *
+ */
+//#define MBEDTLS_SSL_DTLS_MAX_BUFFERING             32768
+
+//#define MBEDTLS_SSL_DEFAULT_TICKET_LIFETIME     86400 /**< Lifetime of session tickets (if enabled) */
+//#define MBEDTLS_PSK_MAX_LEN               32 /**< Max size of TLS pre-shared keys, in bytes (default 256 bits) */
+//#define MBEDTLS_SSL_COOKIE_TIMEOUT        60 /**< Default expiration delay of DTLS cookies, in seconds if HAVE_TIME, or in number of cookies issued */
+
+/**
+ * Complete list of ciphersuites to use, in order of preference.
+ *
+ * \warning No dependency checking is done on that field! This option can only
+ * be used to restrict the set of available ciphersuites. It is your
+ * responsibility to make sure the needed modules are active.
+ *
+ * Use this to save a few hundred bytes of ROM (default ordering of all
+ * available ciphersuites) and a few to a few hundred bytes of RAM.
+ *
+ * The value below is only an example, not the default.
+ */
+//#define MBEDTLS_SSL_CIPHERSUITES MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
+
+/* X509 options */
+//#define MBEDTLS_X509_MAX_INTERMEDIATE_CA   8   /**< Maximum number of intermediate CAs in a verification chain. */
+//#define MBEDTLS_X509_MAX_FILE_PATH_LEN     512 /**< Maximum length of a path/filename string in bytes including the null terminator character ('\0'). */
+
+/**
+ * Allow SHA-1 in the default TLS configuration for certificate signing.
+ * Without this build-time option, SHA-1 support must be activated explicitly
+ * through mbedtls_ssl_conf_cert_profile. Turning on this option is not
+ * recommended because of it is possible to generate SHA-1 collisions, however
+ * this may be safe for legacy infrastructure where additional controls apply.
+ *
+ * \warning   SHA-1 is considered a weak message digest and its use constitutes
+ *            a security risk. If possible, we recommend avoiding dependencies
+ *            on it, and considering stronger message digests instead.
+ *
+ */
+// #define MBEDTLS_TLS_DEFAULT_ALLOW_SHA1_IN_CERTIFICATES
+
+/**
+ * Allow SHA-1 in the default TLS configuration for TLS 1.2 handshake
+ * signature and ciphersuite selection. Without this build-time option, SHA-1
+ * support must be activated explicitly through mbedtls_ssl_conf_sig_hashes.
+ * The use of SHA-1 in TLS <= 1.1 and in HMAC-SHA-1 is always allowed by
+ * default. At the time of writing, there is no practical attack on the use
+ * of SHA-1 in handshake signatures, hence this option is turned on by default
+ * to preserve compatibility with existing peers, but the general
+ * warning applies nonetheless:
+ *
+ * \warning   SHA-1 is considered a weak message digest and its use constitutes
+ *            a security risk. If possible, we recommend avoiding dependencies
+ *            on it, and considering stronger message digests instead.
+ *
+ */
+#define MBEDTLS_TLS_DEFAULT_ALLOW_SHA1_IN_KEY_EXCHANGE
+
+/**
+ * Uncomment the macro to let mbed TLS use your alternate implementation of
+ * mbedtls_platform_zeroize(). This replaces the default implementation in
+ * platform_util.c.
+ *
+ * mbedtls_platform_zeroize() is a widely used function across the library to
+ * zero a block of memory. The implementation is expected to be secure in the
+ * sense that it has been written to prevent the compiler from removing calls
+ * to mbedtls_platform_zeroize() as part of redundant code elimination
+ * optimizations. However, it is difficult to guarantee that calls to
+ * mbedtls_platform_zeroize() will not be optimized by the compiler as older
+ * versions of the C language standards do not provide a secure implementation
+ * of memset(). Therefore, MBEDTLS_PLATFORM_ZEROIZE_ALT enables users to
+ * configure their own implementation of mbedtls_platform_zeroize(), for
+ * example by using directives specific to their compiler, features from newer
+ * C standards (e.g using memset_s() in C11) or calling a secure memset() from
+ * their system (e.g explicit_bzero() in BSD).
+ */
+//#define MBEDTLS_PLATFORM_ZEROIZE_ALT
+
+/* \} name SECTION: Customisation configuration options */
+
+/* Target and application specific configurations */
+//#define YOTTA_CFG_MBEDTLS_TARGET_CONFIG_FILE "target_config.h"
+
+#if defined(TARGET_LIKE_MBED) && defined(YOTTA_CFG_MBEDTLS_TARGET_CONFIG_FILE)
+#include YOTTA_CFG_MBEDTLS_TARGET_CONFIG_FILE
+#endif
+
+/*
+ * Allow user to override any previous default.
+ *
+ * Use two macro names for that, as:
+ * - with yotta the prefix YOTTA_CFG_ is forced
+ * - without yotta is looks weird to have a YOTTA prefix.
+ */
+#if defined(YOTTA_CFG_MBEDTLS_USER_CONFIG_FILE)
+#include YOTTA_CFG_MBEDTLS_USER_CONFIG_FILE
+#elif defined(MBEDTLS_USER_CONFIG_FILE)
+#include MBEDTLS_USER_CONFIG_FILE
+#endif
+
+#include "check_config.h"
+
+#endif /* MBEDTLS_CONFIG_H */
diff --git a/common/mbedtls/ctr_drbg.c b/common/mbedtls/ctr_drbg.c
new file mode 100644
index 000000000..ebbba1a7d
--- /dev/null
+++ b/common/mbedtls/ctr_drbg.c
@@ -0,0 +1,652 @@
+/*
+ *  CTR_DRBG implementation based on AES-256 (NIST SP 800-90)
+ *
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+/*
+ *  The NIST SP 800-90 DRBGs are described in the following publication.
+ *
+ *  http://csrc.nist.gov/publications/nistpubs/800-90/SP800-90revised_March2007.pdf
+ */
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "mbedtls/config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#if defined(MBEDTLS_CTR_DRBG_C)
+
+#include "mbedtls/ctr_drbg.h"
+#include "mbedtls/platform_util.h"
+
+#include <string.h>
+
+#if defined(MBEDTLS_FS_IO)
+#include <stdio.h>
+#endif
+
+#if defined(MBEDTLS_SELF_TEST)
+#if defined(MBEDTLS_PLATFORM_C)
+#include "mbedtls/platform.h"
+#else
+#include <stdio.h>
+#define mbedtls_printf printf
+#endif /* MBEDTLS_PLATFORM_C */
+#endif /* MBEDTLS_SELF_TEST */
+
+/*
+ * CTR_DRBG context initialization
+ */
+void mbedtls_ctr_drbg_init( mbedtls_ctr_drbg_context *ctx )
+{
+    memset( ctx, 0, sizeof( mbedtls_ctr_drbg_context ) );
+
+#if defined(MBEDTLS_THREADING_C)
+    mbedtls_mutex_init( &ctx->mutex );
+#endif
+}
+
+/*
+ * Non-public function wrapped by mbedtls_ctr_drbg_seed(). Necessary to allow
+ * NIST tests to succeed (which require known length fixed entropy)
+ */
+int mbedtls_ctr_drbg_seed_entropy_len(
+                   mbedtls_ctr_drbg_context *ctx,
+                   int (*f_entropy)(void *, unsigned char *, size_t),
+                   void *p_entropy,
+                   const unsigned char *custom,
+                   size_t len,
+                   size_t entropy_len )
+{
+    int ret;
+    unsigned char key[MBEDTLS_CTR_DRBG_KEYSIZE];
+
+    memset( key, 0, MBEDTLS_CTR_DRBG_KEYSIZE );
+
+    mbedtls_aes_init( &ctx->aes_ctx );
+
+    ctx->f_entropy = f_entropy;
+    ctx->p_entropy = p_entropy;
+
+    ctx->entropy_len = entropy_len;
+    ctx->reseed_interval = MBEDTLS_CTR_DRBG_RESEED_INTERVAL;
+
+    /*
+     * Initialize with an empty key
+     */
+    if( ( ret = mbedtls_aes_setkey_enc( &ctx->aes_ctx, key, MBEDTLS_CTR_DRBG_KEYBITS ) ) != 0 )
+    {
+        return( ret );
+    }
+
+    if( ( ret = mbedtls_ctr_drbg_reseed( ctx, custom, len ) ) != 0 )
+    {
+        return( ret );
+    }
+    return( 0 );
+}
+
+int mbedtls_ctr_drbg_seed( mbedtls_ctr_drbg_context *ctx,
+                   int (*f_entropy)(void *, unsigned char *, size_t),
+                   void *p_entropy,
+                   const unsigned char *custom,
+                   size_t len )
+{
+    return( mbedtls_ctr_drbg_seed_entropy_len( ctx, f_entropy, p_entropy, custom, len,
+                                       MBEDTLS_CTR_DRBG_ENTROPY_LEN ) );
+}
+
+void mbedtls_ctr_drbg_free( mbedtls_ctr_drbg_context *ctx )
+{
+    if( ctx == NULL )
+        return;
+
+#if defined(MBEDTLS_THREADING_C)
+    mbedtls_mutex_free( &ctx->mutex );
+#endif
+    mbedtls_aes_free( &ctx->aes_ctx );
+    mbedtls_platform_zeroize( ctx, sizeof( mbedtls_ctr_drbg_context ) );
+}
+
+void mbedtls_ctr_drbg_set_prediction_resistance( mbedtls_ctr_drbg_context *ctx, int resistance )
+{
+    ctx->prediction_resistance = resistance;
+}
+
+void mbedtls_ctr_drbg_set_entropy_len( mbedtls_ctr_drbg_context *ctx, size_t len )
+{
+    ctx->entropy_len = len;
+}
+
+void mbedtls_ctr_drbg_set_reseed_interval( mbedtls_ctr_drbg_context *ctx, int interval )
+{
+    ctx->reseed_interval = interval;
+}
+
+static int block_cipher_df( unsigned char *output,
+                            const unsigned char *data, size_t data_len )
+{
+    unsigned char buf[MBEDTLS_CTR_DRBG_MAX_SEED_INPUT + MBEDTLS_CTR_DRBG_BLOCKSIZE + 16];
+    unsigned char tmp[MBEDTLS_CTR_DRBG_SEEDLEN];
+    unsigned char key[MBEDTLS_CTR_DRBG_KEYSIZE];
+    unsigned char chain[MBEDTLS_CTR_DRBG_BLOCKSIZE];
+    unsigned char *p, *iv;
+    mbedtls_aes_context aes_ctx;
+    int ret = 0;
+
+    int i, j;
+    size_t buf_len, use_len;
+
+    if( data_len > MBEDTLS_CTR_DRBG_MAX_SEED_INPUT )
+        return( MBEDTLS_ERR_CTR_DRBG_INPUT_TOO_BIG );
+
+    memset( buf, 0, MBEDTLS_CTR_DRBG_MAX_SEED_INPUT + MBEDTLS_CTR_DRBG_BLOCKSIZE + 16 );
+    mbedtls_aes_init( &aes_ctx );
+
+    /*
+     * Construct IV (16 bytes) and S in buffer
+     * IV = Counter (in 32-bits) padded to 16 with zeroes
+     * S = Length input string (in 32-bits) || Length of output (in 32-bits) ||
+     *     data || 0x80
+     *     (Total is padded to a multiple of 16-bytes with zeroes)
+     */
+    p = buf + MBEDTLS_CTR_DRBG_BLOCKSIZE;
+    *p++ = ( data_len >> 24 ) & 0xff;
+    *p++ = ( data_len >> 16 ) & 0xff;
+    *p++ = ( data_len >> 8  ) & 0xff;
+    *p++ = ( data_len       ) & 0xff;
+    p += 3;
+    *p++ = MBEDTLS_CTR_DRBG_SEEDLEN;
+    memcpy( p, data, data_len );
+    p[data_len] = 0x80;
+
+    buf_len = MBEDTLS_CTR_DRBG_BLOCKSIZE + 8 + data_len + 1;
+
+    for( i = 0; i < MBEDTLS_CTR_DRBG_KEYSIZE; i++ )
+        key[i] = i;
+
+    if( ( ret = mbedtls_aes_setkey_enc( &aes_ctx, key, MBEDTLS_CTR_DRBG_KEYBITS ) ) != 0 )
+    {
+        goto exit;
+    }
+
+    /*
+     * Reduce data to MBEDTLS_CTR_DRBG_SEEDLEN bytes of data
+     */
+    for( j = 0; j < MBEDTLS_CTR_DRBG_SEEDLEN; j += MBEDTLS_CTR_DRBG_BLOCKSIZE )
+    {
+        p = buf;
+        memset( chain, 0, MBEDTLS_CTR_DRBG_BLOCKSIZE );
+        use_len = buf_len;
+
+        while( use_len > 0 )
+        {
+            for( i = 0; i < MBEDTLS_CTR_DRBG_BLOCKSIZE; i++ )
+                chain[i] ^= p[i];
+            p += MBEDTLS_CTR_DRBG_BLOCKSIZE;
+            use_len -= ( use_len >= MBEDTLS_CTR_DRBG_BLOCKSIZE ) ?
+                       MBEDTLS_CTR_DRBG_BLOCKSIZE : use_len;
+
+            if( ( ret = mbedtls_aes_crypt_ecb( &aes_ctx, MBEDTLS_AES_ENCRYPT, chain, chain ) ) != 0 )
+            {
+                goto exit;
+            }
+        }
+
+        memcpy( tmp + j, chain, MBEDTLS_CTR_DRBG_BLOCKSIZE );
+
+        /*
+         * Update IV
+         */
+        buf[3]++;
+    }
+
+    /*
+     * Do final encryption with reduced data
+     */
+    if( ( ret = mbedtls_aes_setkey_enc( &aes_ctx, tmp, MBEDTLS_CTR_DRBG_KEYBITS ) ) != 0 )
+    {
+        goto exit;
+    }
+    iv = tmp + MBEDTLS_CTR_DRBG_KEYSIZE;
+    p = output;
+
+    for( j = 0; j < MBEDTLS_CTR_DRBG_SEEDLEN; j += MBEDTLS_CTR_DRBG_BLOCKSIZE )
+    {
+        if( ( ret = mbedtls_aes_crypt_ecb( &aes_ctx, MBEDTLS_AES_ENCRYPT, iv, iv ) ) != 0 )
+        {
+            goto exit;
+        }
+        memcpy( p, iv, MBEDTLS_CTR_DRBG_BLOCKSIZE );
+        p += MBEDTLS_CTR_DRBG_BLOCKSIZE;
+    }
+exit:
+    mbedtls_aes_free( &aes_ctx );
+    /*
+    * tidy up the stack
+    */
+    mbedtls_platform_zeroize( buf, sizeof( buf ) );
+    mbedtls_platform_zeroize( tmp, sizeof( tmp ) );
+    mbedtls_platform_zeroize( key, sizeof( key ) );
+    mbedtls_platform_zeroize( chain, sizeof( chain ) );
+    if( 0 != ret )
+    {
+        /*
+        * wipe partial seed from memory
+        */
+        mbedtls_platform_zeroize( output, MBEDTLS_CTR_DRBG_SEEDLEN );
+    }
+
+    return( ret );
+}
+
+static int ctr_drbg_update_internal( mbedtls_ctr_drbg_context *ctx,
+                              const unsigned char data[MBEDTLS_CTR_DRBG_SEEDLEN] )
+{
+    unsigned char tmp[MBEDTLS_CTR_DRBG_SEEDLEN];
+    unsigned char *p = tmp;
+    int i, j;
+    int ret = 0;
+
+    memset( tmp, 0, MBEDTLS_CTR_DRBG_SEEDLEN );
+
+    for( j = 0; j < MBEDTLS_CTR_DRBG_SEEDLEN; j += MBEDTLS_CTR_DRBG_BLOCKSIZE )
+    {
+        /*
+         * Increase counter
+         */
+        for( i = MBEDTLS_CTR_DRBG_BLOCKSIZE; i > 0; i-- )
+            if( ++ctx->counter[i - 1] != 0 )
+                break;
+
+        /*
+         * Crypt counter block
+         */
+        if( ( ret = mbedtls_aes_crypt_ecb( &ctx->aes_ctx, MBEDTLS_AES_ENCRYPT, ctx->counter, p ) ) != 0 )
+        {
+            return( ret );
+        }
+
+        p += MBEDTLS_CTR_DRBG_BLOCKSIZE;
+    }
+
+    for( i = 0; i < MBEDTLS_CTR_DRBG_SEEDLEN; i++ )
+        tmp[i] ^= data[i];
+
+    /*
+     * Update key and counter
+     */
+    if( ( ret = mbedtls_aes_setkey_enc( &ctx->aes_ctx, tmp, MBEDTLS_CTR_DRBG_KEYBITS ) ) != 0 )
+    {
+        return( ret );
+    }
+    memcpy( ctx->counter, tmp + MBEDTLS_CTR_DRBG_KEYSIZE, MBEDTLS_CTR_DRBG_BLOCKSIZE );
+
+    return( 0 );
+}
+
+void mbedtls_ctr_drbg_update( mbedtls_ctr_drbg_context *ctx,
+                      const unsigned char *additional, size_t add_len )
+{
+    unsigned char add_input[MBEDTLS_CTR_DRBG_SEEDLEN];
+
+    if( add_len > 0 )
+    {
+        /* MAX_INPUT would be more logical here, but we have to match
+         * block_cipher_df()'s limits since we can't propagate errors */
+        if( add_len > MBEDTLS_CTR_DRBG_MAX_SEED_INPUT )
+            add_len = MBEDTLS_CTR_DRBG_MAX_SEED_INPUT;
+
+        block_cipher_df( add_input, additional, add_len );
+        ctr_drbg_update_internal( ctx, add_input );
+    }
+}
+
+int mbedtls_ctr_drbg_reseed( mbedtls_ctr_drbg_context *ctx,
+                     const unsigned char *additional, size_t len )
+{
+    unsigned char seed[MBEDTLS_CTR_DRBG_MAX_SEED_INPUT];
+    size_t seedlen = 0;
+    int ret;
+
+    if( ctx->entropy_len > MBEDTLS_CTR_DRBG_MAX_SEED_INPUT ||
+        len > MBEDTLS_CTR_DRBG_MAX_SEED_INPUT - ctx->entropy_len )
+        return( MBEDTLS_ERR_CTR_DRBG_INPUT_TOO_BIG );
+
+    memset( seed, 0, MBEDTLS_CTR_DRBG_MAX_SEED_INPUT );
+
+    /*
+     * Gather entropy_len bytes of entropy to seed state
+     */
+    if( 0 != ctx->f_entropy( ctx->p_entropy, seed,
+                             ctx->entropy_len ) )
+    {
+        return( MBEDTLS_ERR_CTR_DRBG_ENTROPY_SOURCE_FAILED );
+    }
+
+    seedlen += ctx->entropy_len;
+
+    /*
+     * Add additional data
+     */
+    if( additional && len )
+    {
+        memcpy( seed + seedlen, additional, len );
+        seedlen += len;
+    }
+
+    /*
+     * Reduce to 384 bits
+     */
+    if( ( ret = block_cipher_df( seed, seed, seedlen ) ) != 0 )
+    {
+        return( ret );
+    }
+
+    /*
+     * Update state
+     */
+    if( ( ret = ctr_drbg_update_internal( ctx, seed ) ) != 0 )
+    {
+        return( ret );
+    }
+    ctx->reseed_counter = 1;
+
+    return( 0 );
+}
+
+int mbedtls_ctr_drbg_random_with_add( void *p_rng,
+                              unsigned char *output, size_t output_len,
+                              const unsigned char *additional, size_t add_len )
+{
+    int ret = 0;
+    mbedtls_ctr_drbg_context *ctx = (mbedtls_ctr_drbg_context *) p_rng;
+    unsigned char add_input[MBEDTLS_CTR_DRBG_SEEDLEN];
+    unsigned char *p = output;
+    unsigned char tmp[MBEDTLS_CTR_DRBG_BLOCKSIZE];
+    int i;
+    size_t use_len;
+
+    if( output_len > MBEDTLS_CTR_DRBG_MAX_REQUEST )
+        return( MBEDTLS_ERR_CTR_DRBG_REQUEST_TOO_BIG );
+
+    if( add_len > MBEDTLS_CTR_DRBG_MAX_INPUT )
+        return( MBEDTLS_ERR_CTR_DRBG_INPUT_TOO_BIG );
+
+    memset( add_input, 0, MBEDTLS_CTR_DRBG_SEEDLEN );
+
+    if( ctx->reseed_counter > ctx->reseed_interval ||
+        ctx->prediction_resistance )
+    {
+        if( ( ret = mbedtls_ctr_drbg_reseed( ctx, additional, add_len ) ) != 0 )
+        {
+            return( ret );
+        }
+        add_len = 0;
+    }
+
+    if( add_len > 0 )
+    {
+        if( ( ret = block_cipher_df( add_input, additional, add_len ) ) != 0 )
+        {
+            return( ret );
+        }
+        if( ( ret = ctr_drbg_update_internal( ctx, add_input ) ) != 0 )
+        {
+            return( ret );
+        }
+    }
+
+    while( output_len > 0 )
+    {
+        /*
+         * Increase counter
+         */
+        for( i = MBEDTLS_CTR_DRBG_BLOCKSIZE; i > 0; i-- )
+            if( ++ctx->counter[i - 1] != 0 )
+                break;
+
+        /*
+         * Crypt counter block
+         */
+        if( ( ret = mbedtls_aes_crypt_ecb( &ctx->aes_ctx, MBEDTLS_AES_ENCRYPT, ctx->counter, tmp ) ) != 0 )
+        {
+            return( ret );
+        }
+
+        use_len = ( output_len > MBEDTLS_CTR_DRBG_BLOCKSIZE ) ? MBEDTLS_CTR_DRBG_BLOCKSIZE :
+                                                       output_len;
+        /*
+         * Copy random block to destination
+         */
+        memcpy( p, tmp, use_len );
+        p += use_len;
+        output_len -= use_len;
+    }
+
+    if( ( ret = ctr_drbg_update_internal( ctx, add_input ) ) != 0 )
+    {
+        return( ret );
+    }
+
+    ctx->reseed_counter++;
+
+    return( 0 );
+}
+
+int mbedtls_ctr_drbg_random( void *p_rng, unsigned char *output, size_t output_len )
+{
+    int ret;
+    mbedtls_ctr_drbg_context *ctx = (mbedtls_ctr_drbg_context *) p_rng;
+
+#if defined(MBEDTLS_THREADING_C)
+    if( ( ret = mbedtls_mutex_lock( &ctx->mutex ) ) != 0 )
+        return( ret );
+#endif
+
+    ret = mbedtls_ctr_drbg_random_with_add( ctx, output, output_len, NULL, 0 );
+
+#if defined(MBEDTLS_THREADING_C)
+    if( mbedtls_mutex_unlock( &ctx->mutex ) != 0 )
+        return( MBEDTLS_ERR_THREADING_MUTEX_ERROR );
+#endif
+
+    return( ret );
+}
+
+#if defined(MBEDTLS_FS_IO)
+int mbedtls_ctr_drbg_write_seed_file( mbedtls_ctr_drbg_context *ctx, const char *path )
+{
+    int ret = MBEDTLS_ERR_CTR_DRBG_FILE_IO_ERROR;
+    FILE *f;
+    unsigned char buf[ MBEDTLS_CTR_DRBG_MAX_INPUT ];
+
+    if( ( f = fopen( path, "wb" ) ) == NULL )
+        return( MBEDTLS_ERR_CTR_DRBG_FILE_IO_ERROR );
+
+    if( ( ret = mbedtls_ctr_drbg_random( ctx, buf, MBEDTLS_CTR_DRBG_MAX_INPUT ) ) != 0 )
+        goto exit;
+
+    if( fwrite( buf, 1, MBEDTLS_CTR_DRBG_MAX_INPUT, f ) != MBEDTLS_CTR_DRBG_MAX_INPUT )
+        ret = MBEDTLS_ERR_CTR_DRBG_FILE_IO_ERROR;
+    else
+        ret = 0;
+
+exit:
+    mbedtls_platform_zeroize( buf, sizeof( buf ) );
+
+    fclose( f );
+    return( ret );
+}
+
+int mbedtls_ctr_drbg_update_seed_file( mbedtls_ctr_drbg_context *ctx, const char *path )
+{
+    int ret = 0;
+    FILE *f;
+    size_t n;
+    unsigned char buf[ MBEDTLS_CTR_DRBG_MAX_INPUT ];
+
+    if( ( f = fopen( path, "rb" ) ) == NULL )
+        return( MBEDTLS_ERR_CTR_DRBG_FILE_IO_ERROR );
+
+    fseek( f, 0, SEEK_END );
+    n = (size_t) ftell( f );
+    fseek( f, 0, SEEK_SET );
+
+    if( n > MBEDTLS_CTR_DRBG_MAX_INPUT )
+    {
+        fclose( f );
+        return( MBEDTLS_ERR_CTR_DRBG_INPUT_TOO_BIG );
+    }
+
+    if( fread( buf, 1, n, f ) != n )
+        ret = MBEDTLS_ERR_CTR_DRBG_FILE_IO_ERROR;
+    else
+        mbedtls_ctr_drbg_update( ctx, buf, n );
+
+    fclose( f );
+
+    mbedtls_platform_zeroize( buf, sizeof( buf ) );
+
+    if( ret != 0 )
+        return( ret );
+
+    return( mbedtls_ctr_drbg_write_seed_file( ctx, path ) );
+}
+#endif /* MBEDTLS_FS_IO */
+
+#if defined(MBEDTLS_SELF_TEST)
+
+static const unsigned char entropy_source_pr[96] =
+    { 0xc1, 0x80, 0x81, 0xa6, 0x5d, 0x44, 0x02, 0x16,
+      0x19, 0xb3, 0xf1, 0x80, 0xb1, 0xc9, 0x20, 0x02,
+      0x6a, 0x54, 0x6f, 0x0c, 0x70, 0x81, 0x49, 0x8b,
+      0x6e, 0xa6, 0x62, 0x52, 0x6d, 0x51, 0xb1, 0xcb,
+      0x58, 0x3b, 0xfa, 0xd5, 0x37, 0x5f, 0xfb, 0xc9,
+      0xff, 0x46, 0xd2, 0x19, 0xc7, 0x22, 0x3e, 0x95,
+      0x45, 0x9d, 0x82, 0xe1, 0xe7, 0x22, 0x9f, 0x63,
+      0x31, 0x69, 0xd2, 0x6b, 0x57, 0x47, 0x4f, 0xa3,
+      0x37, 0xc9, 0x98, 0x1c, 0x0b, 0xfb, 0x91, 0x31,
+      0x4d, 0x55, 0xb9, 0xe9, 0x1c, 0x5a, 0x5e, 0xe4,
+      0x93, 0x92, 0xcf, 0xc5, 0x23, 0x12, 0xd5, 0x56,
+      0x2c, 0x4a, 0x6e, 0xff, 0xdc, 0x10, 0xd0, 0x68 };
+
+static const unsigned char entropy_source_nopr[64] =
+    { 0x5a, 0x19, 0x4d, 0x5e, 0x2b, 0x31, 0x58, 0x14,
+      0x54, 0xde, 0xf6, 0x75, 0xfb, 0x79, 0x58, 0xfe,
+      0xc7, 0xdb, 0x87, 0x3e, 0x56, 0x89, 0xfc, 0x9d,
+      0x03, 0x21, 0x7c, 0x68, 0xd8, 0x03, 0x38, 0x20,
+      0xf9, 0xe6, 0x5e, 0x04, 0xd8, 0x56, 0xf3, 0xa9,
+      0xc4, 0x4a, 0x4c, 0xbd, 0xc1, 0xd0, 0x08, 0x46,
+      0xf5, 0x98, 0x3d, 0x77, 0x1c, 0x1b, 0x13, 0x7e,
+      0x4e, 0x0f, 0x9d, 0x8e, 0xf4, 0x09, 0xf9, 0x2e };
+
+static const unsigned char nonce_pers_pr[16] =
+    { 0xd2, 0x54, 0xfc, 0xff, 0x02, 0x1e, 0x69, 0xd2,
+      0x29, 0xc9, 0xcf, 0xad, 0x85, 0xfa, 0x48, 0x6c };
+
+static const unsigned char nonce_pers_nopr[16] =
+    { 0x1b, 0x54, 0xb8, 0xff, 0x06, 0x42, 0xbf, 0xf5,
+      0x21, 0xf1, 0x5c, 0x1c, 0x0b, 0x66, 0x5f, 0x3f };
+
+static const unsigned char result_pr[16] =
+    { 0x34, 0x01, 0x16, 0x56, 0xb4, 0x29, 0x00, 0x8f,
+      0x35, 0x63, 0xec, 0xb5, 0xf2, 0x59, 0x07, 0x23 };
+
+static const unsigned char result_nopr[16] =
+    { 0xa0, 0x54, 0x30, 0x3d, 0x8a, 0x7e, 0xa9, 0x88,
+      0x9d, 0x90, 0x3e, 0x07, 0x7c, 0x6f, 0x21, 0x8f };
+
+static size_t test_offset;
+static int ctr_drbg_self_test_entropy( void *data, unsigned char *buf,
+                                       size_t len )
+{
+    const unsigned char *p = data;
+    memcpy( buf, p + test_offset, len );
+    test_offset += len;
+    return( 0 );
+}
+
+#define CHK( c )    if( (c) != 0 )                          \
+                    {                                       \
+                        if( verbose != 0 )                  \
+                            mbedtls_printf( "failed\n" );  \
+                        return( 1 );                        \
+                    }
+
+/*
+ * Checkup routine
+ */
+int mbedtls_ctr_drbg_self_test( int verbose )
+{
+    mbedtls_ctr_drbg_context ctx;
+    unsigned char buf[16];
+
+    mbedtls_ctr_drbg_init( &ctx );
+
+    /*
+     * Based on a NIST CTR_DRBG test vector (PR = True)
+     */
+    if( verbose != 0 )
+        mbedtls_printf( "  CTR_DRBG (PR = TRUE) : " );
+
+    test_offset = 0;
+    CHK( mbedtls_ctr_drbg_seed_entropy_len( &ctx, ctr_drbg_self_test_entropy,
+                                (void *) entropy_source_pr, nonce_pers_pr, 16, 32 ) );
+    mbedtls_ctr_drbg_set_prediction_resistance( &ctx, MBEDTLS_CTR_DRBG_PR_ON );
+    CHK( mbedtls_ctr_drbg_random( &ctx, buf, MBEDTLS_CTR_DRBG_BLOCKSIZE ) );
+    CHK( mbedtls_ctr_drbg_random( &ctx, buf, MBEDTLS_CTR_DRBG_BLOCKSIZE ) );
+    CHK( memcmp( buf, result_pr, MBEDTLS_CTR_DRBG_BLOCKSIZE ) );
+
+    mbedtls_ctr_drbg_free( &ctx );
+
+    if( verbose != 0 )
+        mbedtls_printf( "passed\n" );
+
+    /*
+     * Based on a NIST CTR_DRBG test vector (PR = FALSE)
+     */
+    if( verbose != 0 )
+        mbedtls_printf( "  CTR_DRBG (PR = FALSE): " );
+
+    mbedtls_ctr_drbg_init( &ctx );
+
+    test_offset = 0;
+    CHK( mbedtls_ctr_drbg_seed_entropy_len( &ctx, ctr_drbg_self_test_entropy,
+                            (void *) entropy_source_nopr, nonce_pers_nopr, 16, 32 ) );
+    CHK( mbedtls_ctr_drbg_random( &ctx, buf, 16 ) );
+    CHK( mbedtls_ctr_drbg_reseed( &ctx, NULL, 0 ) );
+    CHK( mbedtls_ctr_drbg_random( &ctx, buf, 16 ) );
+    CHK( memcmp( buf, result_nopr, 16 ) );
+
+    mbedtls_ctr_drbg_free( &ctx );
+
+    if( verbose != 0 )
+        mbedtls_printf( "passed\n" );
+
+    if( verbose != 0 )
+            mbedtls_printf( "\n" );
+
+    return( 0 );
+}
+#endif /* MBEDTLS_SELF_TEST */
+
+#endif /* MBEDTLS_CTR_DRBG_C */
diff --git a/common/mbedtls/ctr_drbg.h b/common/mbedtls/ctr_drbg.h
new file mode 100644
index 000000000..5d62f9bea
--- /dev/null
+++ b/common/mbedtls/ctr_drbg.h
@@ -0,0 +1,332 @@
+/**
+ * \file ctr_drbg.h
+ *
+ * \brief    This file contains CTR_DRBG definitions and functions.
+ *
+ * CTR_DRBG is a standardized way of building a PRNG from a block-cipher
+ * in counter mode operation, as defined in <em>NIST SP 800-90A:
+ * Recommendation for Random Number Generation Using Deterministic Random
+ * Bit Generators</em>.
+ *
+ * The Mbed TLS implementation of CTR_DRBG uses AES-256 as the underlying
+ * block cipher.
+ */
+/*
+ *  Copyright (C) 2006-2018, Arm Limited (or its affiliates), All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of Mbed TLS (https://tls.mbed.org)
+ */
+
+#ifndef MBEDTLS_CTR_DRBG_H
+#define MBEDTLS_CTR_DRBG_H
+
+#include "aes.h"
+
+#if defined(MBEDTLS_THREADING_C)
+#include "threading.h"
+#endif
+
+#define MBEDTLS_ERR_CTR_DRBG_ENTROPY_SOURCE_FAILED        -0x0034  /**< The entropy source failed. */
+#define MBEDTLS_ERR_CTR_DRBG_REQUEST_TOO_BIG              -0x0036  /**< The requested random buffer length is too big. */
+#define MBEDTLS_ERR_CTR_DRBG_INPUT_TOO_BIG                -0x0038  /**< The input (entropy + additional data) is too large. */
+#define MBEDTLS_ERR_CTR_DRBG_FILE_IO_ERROR                -0x003A  /**< Read or write error in file. */
+
+#define MBEDTLS_CTR_DRBG_BLOCKSIZE          16 /**< The block size used by the cipher. */
+#define MBEDTLS_CTR_DRBG_KEYSIZE            32 /**< The key size used by the cipher. */
+#define MBEDTLS_CTR_DRBG_KEYBITS            ( MBEDTLS_CTR_DRBG_KEYSIZE * 8 ) /**< The key size for the DRBG operation, in bits. */
+#define MBEDTLS_CTR_DRBG_SEEDLEN            ( MBEDTLS_CTR_DRBG_KEYSIZE + MBEDTLS_CTR_DRBG_BLOCKSIZE ) /**< The seed length, calculated as (counter + AES key). */
+
+/**
+ * \name SECTION: Module settings
+ *
+ * The configuration options you can set for this module are in this section.
+ * Either change them in config.h or define them using the compiler command
+ * line.
+ * \{
+ */
+
+#if !defined(MBEDTLS_CTR_DRBG_ENTROPY_LEN)
+#if defined(MBEDTLS_SHA512_C) && !defined(MBEDTLS_ENTROPY_FORCE_SHA256)
+#define MBEDTLS_CTR_DRBG_ENTROPY_LEN        48
+/**< The amount of entropy used per seed by default:
+ * <ul><li>48 with SHA-512.</li>
+ * <li>32 with SHA-256.</li></ul>
+ */
+#else
+#define MBEDTLS_CTR_DRBG_ENTROPY_LEN        32
+/**< Amount of entropy used per seed by default:
+ * <ul><li>48 with SHA-512.</li>
+ * <li>32 with SHA-256.</li></ul>
+ */
+#endif
+#endif
+
+#if !defined(MBEDTLS_CTR_DRBG_RESEED_INTERVAL)
+#define MBEDTLS_CTR_DRBG_RESEED_INTERVAL    10000
+/**< The interval before reseed is performed by default. */
+#endif
+
+#if !defined(MBEDTLS_CTR_DRBG_MAX_INPUT)
+#define MBEDTLS_CTR_DRBG_MAX_INPUT          256
+/**< The maximum number of additional input Bytes. */
+#endif
+
+#if !defined(MBEDTLS_CTR_DRBG_MAX_REQUEST)
+#define MBEDTLS_CTR_DRBG_MAX_REQUEST        1024
+/**< The maximum number of requested Bytes per call. */
+#endif
+
+#if !defined(MBEDTLS_CTR_DRBG_MAX_SEED_INPUT)
+#define MBEDTLS_CTR_DRBG_MAX_SEED_INPUT     384
+/**< The maximum size of seed or reseed buffer. */
+#endif
+
+/* \} name SECTION: Module settings */
+
+#define MBEDTLS_CTR_DRBG_PR_OFF             0
+/**< Prediction resistance is disabled. */
+#define MBEDTLS_CTR_DRBG_PR_ON              1
+/**< Prediction resistance is enabled. */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \brief          The CTR_DRBG context structure.
+ */
+typedef struct mbedtls_ctr_drbg_context
+{
+    unsigned char counter[16];  /*!< The counter (V). */
+    int reseed_counter;         /*!< The reseed counter. */
+    int prediction_resistance;  /*!< This determines whether prediction
+                                     resistance is enabled, that is
+                                     whether to systematically reseed before
+                                     each random generation. */
+    size_t entropy_len;         /*!< The amount of entropy grabbed on each
+                                     seed or reseed operation. */
+    int reseed_interval;        /*!< The reseed interval. */
+
+    mbedtls_aes_context aes_ctx;        /*!< The AES context. */
+
+    /*
+     * Callbacks (Entropy)
+     */
+    int (*f_entropy)(void *, unsigned char *, size_t);
+                                /*!< The entropy callback function. */
+
+    void *p_entropy;            /*!< The context for the entropy function. */
+
+#if defined(MBEDTLS_THREADING_C)
+    mbedtls_threading_mutex_t mutex;
+#endif
+}
+mbedtls_ctr_drbg_context;
+
+/**
+ * \brief               This function initializes the CTR_DRBG context,
+ *                      and prepares it for mbedtls_ctr_drbg_seed()
+ *                      or mbedtls_ctr_drbg_free().
+ *
+ * \param ctx           The CTR_DRBG context to initialize.
+ */
+void mbedtls_ctr_drbg_init( mbedtls_ctr_drbg_context *ctx );
+
+/**
+ * \brief               This function seeds and sets up the CTR_DRBG
+ *                      entropy source for future reseeds.
+ *
+ * \note Personalization data can be provided in addition to the more generic
+ *       entropy source, to make this instantiation as unique as possible.
+ *
+ * \param ctx           The CTR_DRBG context to seed.
+ * \param f_entropy     The entropy callback, taking as arguments the
+ *                      \p p_entropy context, the buffer to fill, and the
+                        length of the buffer.
+ * \param p_entropy     The entropy context.
+ * \param custom        Personalization data, that is device-specific
+                        identifiers. Can be NULL.
+ * \param len           The length of the personalization data.
+ *
+ * \return              \c 0 on success.
+ * \return              #MBEDTLS_ERR_CTR_DRBG_ENTROPY_SOURCE_FAILED on failure.
+ */
+int mbedtls_ctr_drbg_seed( mbedtls_ctr_drbg_context *ctx,
+                   int (*f_entropy)(void *, unsigned char *, size_t),
+                   void *p_entropy,
+                   const unsigned char *custom,
+                   size_t len );
+
+/**
+ * \brief               This function clears CTR_CRBG context data.
+ *
+ * \param ctx           The CTR_DRBG context to clear.
+ */
+void mbedtls_ctr_drbg_free( mbedtls_ctr_drbg_context *ctx );
+
+/**
+ * \brief               This function turns prediction resistance on or off.
+ *                      The default value is off.
+ *
+ * \note                If enabled, entropy is gathered at the beginning of
+ *                      every call to mbedtls_ctr_drbg_random_with_add().
+ *                      Only use this if your entropy source has sufficient
+ *                      throughput.
+ *
+ * \param ctx           The CTR_DRBG context.
+ * \param resistance    #MBEDTLS_CTR_DRBG_PR_ON or #MBEDTLS_CTR_DRBG_PR_OFF.
+ */
+void mbedtls_ctr_drbg_set_prediction_resistance( mbedtls_ctr_drbg_context *ctx,
+                                         int resistance );
+
+/**
+ * \brief               This function sets the amount of entropy grabbed on each
+ *                      seed or reseed. The default value is
+ *                      #MBEDTLS_CTR_DRBG_ENTROPY_LEN.
+ *
+ * \param ctx           The CTR_DRBG context.
+ * \param len           The amount of entropy to grab.
+ */
+void mbedtls_ctr_drbg_set_entropy_len( mbedtls_ctr_drbg_context *ctx,
+                               size_t len );
+
+/**
+ * \brief               This function sets the reseed interval.
+ *                      The default value is #MBEDTLS_CTR_DRBG_RESEED_INTERVAL.
+ *
+ * \param ctx           The CTR_DRBG context.
+ * \param interval      The reseed interval.
+ */
+void mbedtls_ctr_drbg_set_reseed_interval( mbedtls_ctr_drbg_context *ctx,
+                                   int interval );
+
+/**
+ * \brief               This function reseeds the CTR_DRBG context, that is
+ *                      extracts data from the entropy source.
+ *
+ * \param ctx           The CTR_DRBG context.
+ * \param additional    Additional data to add to the state. Can be NULL.
+ * \param len           The length of the additional data.
+ *
+ * \return              \c 0 on success.
+ * \return              #MBEDTLS_ERR_CTR_DRBG_ENTROPY_SOURCE_FAILED on failure.
+ */
+int mbedtls_ctr_drbg_reseed( mbedtls_ctr_drbg_context *ctx,
+                     const unsigned char *additional, size_t len );
+
+/**
+ * \brief              This function updates the state of the CTR_DRBG context.
+ *
+ * \note               If \p add_len is greater than
+ *                     #MBEDTLS_CTR_DRBG_MAX_SEED_INPUT, only the first
+ *                     #MBEDTLS_CTR_DRBG_MAX_SEED_INPUT Bytes are used.
+ *                     The remaining Bytes are silently discarded.
+ *
+ * \param ctx          The CTR_DRBG context.
+ * \param additional   The data to update the state with.
+ * \param add_len      Length of \p additional data.
+ *
+ */
+void mbedtls_ctr_drbg_update( mbedtls_ctr_drbg_context *ctx,
+                      const unsigned char *additional, size_t add_len );
+
+/**
+ * \brief   This function updates a CTR_DRBG instance with additional
+ *          data and uses it to generate random data.
+ *
+ * \note    The function automatically reseeds if the reseed counter is exceeded.
+ *
+ * \param p_rng         The CTR_DRBG context. This must be a pointer to a
+ *                      #mbedtls_ctr_drbg_context structure.
+ * \param output        The buffer to fill.
+ * \param output_len    The length of the buffer.
+ * \param additional    Additional data to update. Can be NULL.
+ * \param add_len       The length of the additional data.
+ *
+ * \return    \c 0 on success.
+ * \return    #MBEDTLS_ERR_CTR_DRBG_ENTROPY_SOURCE_FAILED or
+ *            #MBEDTLS_ERR_CTR_DRBG_REQUEST_TOO_BIG on failure.
+ */
+int mbedtls_ctr_drbg_random_with_add( void *p_rng,
+                              unsigned char *output, size_t output_len,
+                              const unsigned char *additional, size_t add_len );
+
+/**
+ * \brief   This function uses CTR_DRBG to generate random data.
+ *
+ * \note    The function automatically reseeds if the reseed counter is exceeded.
+ *
+ * \param p_rng         The CTR_DRBG context. This must be a pointer to a
+ *                      #mbedtls_ctr_drbg_context structure.
+ * \param output        The buffer to fill.
+ * \param output_len    The length of the buffer.
+ *
+ * \return              \c 0 on success.
+ * \return              #MBEDTLS_ERR_CTR_DRBG_ENTROPY_SOURCE_FAILED or
+ *                      #MBEDTLS_ERR_CTR_DRBG_REQUEST_TOO_BIG on failure.
+ */
+int mbedtls_ctr_drbg_random( void *p_rng,
+                     unsigned char *output, size_t output_len );
+
+#if defined(MBEDTLS_FS_IO)
+/**
+ * \brief               This function writes a seed file.
+ *
+ * \param ctx           The CTR_DRBG context.
+ * \param path          The name of the file.
+ *
+ * \return              \c 0 on success.
+ * \return              #MBEDTLS_ERR_CTR_DRBG_FILE_IO_ERROR on file error.
+ * \return              #MBEDTLS_ERR_CTR_DRBG_ENTROPY_SOURCE_FAILED on
+ *                      failure.
+ */
+int mbedtls_ctr_drbg_write_seed_file( mbedtls_ctr_drbg_context *ctx, const char *path );
+
+/**
+ * \brief               This function reads and updates a seed file. The seed
+ *                      is added to this instance.
+ *
+ * \param ctx           The CTR_DRBG context.
+ * \param path          The name of the file.
+ *
+ * \return              \c 0 on success.
+ * \return              #MBEDTLS_ERR_CTR_DRBG_FILE_IO_ERROR on file error.
+ * \return              #MBEDTLS_ERR_CTR_DRBG_ENTROPY_SOURCE_FAILED or
+ *                      #MBEDTLS_ERR_CTR_DRBG_INPUT_TOO_BIG on failure.
+ */
+int mbedtls_ctr_drbg_update_seed_file( mbedtls_ctr_drbg_context *ctx, const char *path );
+#endif /* MBEDTLS_FS_IO */
+
+/**
+ * \brief               The CTR_DRBG checkup routine.
+ *
+ * \return              \c 0 on success.
+ * \return              \c 1 on failure.
+ */
+int mbedtls_ctr_drbg_self_test( int verbose );
+
+/* Internal functions (do not call directly) */
+int mbedtls_ctr_drbg_seed_entropy_len( mbedtls_ctr_drbg_context *,
+                               int (*)(void *, unsigned char *, size_t), void *,
+                               const unsigned char *, size_t, size_t );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ctr_drbg.h */
diff --git a/common/mbedtls/des.c b/common/mbedtls/des.c
new file mode 100644
index 000000000..5c4e2cc98
--- /dev/null
+++ b/common/mbedtls/des.c
@@ -0,0 +1,1059 @@
+/*
+ *  FIPS-46-3 compliant Triple-DES implementation
+ *
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+/*
+ *  DES, on which TDES is based, was originally designed by Horst Feistel
+ *  at IBM in 1974, and was adopted as a standard by NIST (formerly NBS).
+ *
+ *  http://csrc.nist.gov/publications/fips/fips46-3/fips46-3.pdf
+ */
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "mbedtls/config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#if defined(MBEDTLS_DES_C)
+
+#include "mbedtls/des.h"
+#include "mbedtls/platform_util.h"
+
+#include <string.h>
+
+#if defined(MBEDTLS_SELF_TEST)
+#if defined(MBEDTLS_PLATFORM_C)
+#include "mbedtls/platform.h"
+#else
+#include <stdio.h>
+#define mbedtls_printf printf
+#endif /* MBEDTLS_PLATFORM_C */
+#endif /* MBEDTLS_SELF_TEST */
+
+#if !defined(MBEDTLS_DES_ALT)
+
+/*
+ * 32-bit integer manipulation macros (big endian)
+ */
+#ifndef GET_UINT32_BE
+#define GET_UINT32_BE(n,b,i)                            \
+{                                                       \
+    (n) = ( (uint32_t) (b)[(i)    ] << 24 )             \
+        | ( (uint32_t) (b)[(i) + 1] << 16 )             \
+        | ( (uint32_t) (b)[(i) + 2] <<  8 )             \
+        | ( (uint32_t) (b)[(i) + 3]       );            \
+}
+#endif
+
+#ifndef PUT_UINT32_BE
+#define PUT_UINT32_BE(n,b,i)                            \
+{                                                       \
+    (b)[(i)    ] = (unsigned char) ( (n) >> 24 );       \
+    (b)[(i) + 1] = (unsigned char) ( (n) >> 16 );       \
+    (b)[(i) + 2] = (unsigned char) ( (n) >>  8 );       \
+    (b)[(i) + 3] = (unsigned char) ( (n)       );       \
+}
+#endif
+
+/*
+ * Expanded DES S-boxes
+ */
+static const uint32_t SB1[64] =
+{
+    0x01010400, 0x00000000, 0x00010000, 0x01010404,
+    0x01010004, 0x00010404, 0x00000004, 0x00010000,
+    0x00000400, 0x01010400, 0x01010404, 0x00000400,
+    0x01000404, 0x01010004, 0x01000000, 0x00000004,
+    0x00000404, 0x01000400, 0x01000400, 0x00010400,
+    0x00010400, 0x01010000, 0x01010000, 0x01000404,
+    0x00010004, 0x01000004, 0x01000004, 0x00010004,
+    0x00000000, 0x00000404, 0x00010404, 0x01000000,
+    0x00010000, 0x01010404, 0x00000004, 0x01010000,
+    0x01010400, 0x01000000, 0x01000000, 0x00000400,
+    0x01010004, 0x00010000, 0x00010400, 0x01000004,
+    0x00000400, 0x00000004, 0x01000404, 0x00010404,
+    0x01010404, 0x00010004, 0x01010000, 0x01000404,
+    0x01000004, 0x00000404, 0x00010404, 0x01010400,
+    0x00000404, 0x01000400, 0x01000400, 0x00000000,
+    0x00010004, 0x00010400, 0x00000000, 0x01010004
+};
+
+static const uint32_t SB2[64] =
+{
+    0x80108020, 0x80008000, 0x00008000, 0x00108020,
+    0x00100000, 0x00000020, 0x80100020, 0x80008020,
+    0x80000020, 0x80108020, 0x80108000, 0x80000000,
+    0x80008000, 0x00100000, 0x00000020, 0x80100020,
+    0x00108000, 0x00100020, 0x80008020, 0x00000000,
+    0x80000000, 0x00008000, 0x00108020, 0x80100000,
+    0x00100020, 0x80000020, 0x00000000, 0x00108000,
+    0x00008020, 0x80108000, 0x80100000, 0x00008020,
+    0x00000000, 0x00108020, 0x80100020, 0x00100000,
+    0x80008020, 0x80100000, 0x80108000, 0x00008000,
+    0x80100000, 0x80008000, 0x00000020, 0x80108020,
+    0x00108020, 0x00000020, 0x00008000, 0x80000000,
+    0x00008020, 0x80108000, 0x00100000, 0x80000020,
+    0x00100020, 0x80008020, 0x80000020, 0x00100020,
+    0x00108000, 0x00000000, 0x80008000, 0x00008020,
+    0x80000000, 0x80100020, 0x80108020, 0x00108000
+};
+
+static const uint32_t SB3[64] =
+{
+    0x00000208, 0x08020200, 0x00000000, 0x08020008,
+    0x08000200, 0x00000000, 0x00020208, 0x08000200,
+    0x00020008, 0x08000008, 0x08000008, 0x00020000,
+    0x08020208, 0x00020008, 0x08020000, 0x00000208,
+    0x08000000, 0x00000008, 0x08020200, 0x00000200,
+    0x00020200, 0x08020000, 0x08020008, 0x00020208,
+    0x08000208, 0x00020200, 0x00020000, 0x08000208,
+    0x00000008, 0x08020208, 0x00000200, 0x08000000,
+    0x08020200, 0x08000000, 0x00020008, 0x00000208,
+    0x00020000, 0x08020200, 0x08000200, 0x00000000,
+    0x00000200, 0x00020008, 0x08020208, 0x08000200,
+    0x08000008, 0x00000200, 0x00000000, 0x08020008,
+    0x08000208, 0x00020000, 0x08000000, 0x08020208,
+    0x00000008, 0x00020208, 0x00020200, 0x08000008,
+    0x08020000, 0x08000208, 0x00000208, 0x08020000,
+    0x00020208, 0x00000008, 0x08020008, 0x00020200
+};
+
+static const uint32_t SB4[64] =
+{
+    0x00802001, 0x00002081, 0x00002081, 0x00000080,
+    0x00802080, 0x00800081, 0x00800001, 0x00002001,
+    0x00000000, 0x00802000, 0x00802000, 0x00802081,
+    0x00000081, 0x00000000, 0x00800080, 0x00800001,
+    0x00000001, 0x00002000, 0x00800000, 0x00802001,
+    0x00000080, 0x00800000, 0x00002001, 0x00002080,
+    0x00800081, 0x00000001, 0x00002080, 0x00800080,
+    0x00002000, 0x00802080, 0x00802081, 0x00000081,
+    0x00800080, 0x00800001, 0x00802000, 0x00802081,
+    0x00000081, 0x00000000, 0x00000000, 0x00802000,
+    0x00002080, 0x00800080, 0x00800081, 0x00000001,
+    0x00802001, 0x00002081, 0x00002081, 0x00000080,
+    0x00802081, 0x00000081, 0x00000001, 0x00002000,
+    0x00800001, 0x00002001, 0x00802080, 0x00800081,
+    0x00002001, 0x00002080, 0x00800000, 0x00802001,
+    0x00000080, 0x00800000, 0x00002000, 0x00802080
+};
+
+static const uint32_t SB5[64] =
+{
+    0x00000100, 0x02080100, 0x02080000, 0x42000100,
+    0x00080000, 0x00000100, 0x40000000, 0x02080000,
+    0x40080100, 0x00080000, 0x02000100, 0x40080100,
+    0x42000100, 0x42080000, 0x00080100, 0x40000000,
+    0x02000000, 0x40080000, 0x40080000, 0x00000000,
+    0x40000100, 0x42080100, 0x42080100, 0x02000100,
+    0x42080000, 0x40000100, 0x00000000, 0x42000000,
+    0x02080100, 0x02000000, 0x42000000, 0x00080100,
+    0x00080000, 0x42000100, 0x00000100, 0x02000000,
+    0x40000000, 0x02080000, 0x42000100, 0x40080100,
+    0x02000100, 0x40000000, 0x42080000, 0x02080100,
+    0x40080100, 0x00000100, 0x02000000, 0x42080000,
+    0x42080100, 0x00080100, 0x42000000, 0x42080100,
+    0x02080000, 0x00000000, 0x40080000, 0x42000000,
+    0x00080100, 0x02000100, 0x40000100, 0x00080000,
+    0x00000000, 0x40080000, 0x02080100, 0x40000100
+};
+
+static const uint32_t SB6[64] =
+{
+    0x20000010, 0x20400000, 0x00004000, 0x20404010,
+    0x20400000, 0x00000010, 0x20404010, 0x00400000,
+    0x20004000, 0x00404010, 0x00400000, 0x20000010,
+    0x00400010, 0x20004000, 0x20000000, 0x00004010,
+    0x00000000, 0x00400010, 0x20004010, 0x00004000,
+    0x00404000, 0x20004010, 0x00000010, 0x20400010,
+    0x20400010, 0x00000000, 0x00404010, 0x20404000,
+    0x00004010, 0x00404000, 0x20404000, 0x20000000,
+    0x20004000, 0x00000010, 0x20400010, 0x00404000,
+    0x20404010, 0x00400000, 0x00004010, 0x20000010,
+    0x00400000, 0x20004000, 0x20000000, 0x00004010,
+    0x20000010, 0x20404010, 0x00404000, 0x20400000,
+    0x00404010, 0x20404000, 0x00000000, 0x20400010,
+    0x00000010, 0x00004000, 0x20400000, 0x00404010,
+    0x00004000, 0x00400010, 0x20004010, 0x00000000,
+    0x20404000, 0x20000000, 0x00400010, 0x20004010
+};
+
+static const uint32_t SB7[64] =
+{
+    0x00200000, 0x04200002, 0x04000802, 0x00000000,
+    0x00000800, 0x04000802, 0x00200802, 0x04200800,
+    0x04200802, 0x00200000, 0x00000000, 0x04000002,
+    0x00000002, 0x04000000, 0x04200002, 0x00000802,
+    0x04000800, 0x00200802, 0x00200002, 0x04000800,
+    0x04000002, 0x04200000, 0x04200800, 0x00200002,
+    0x04200000, 0x00000800, 0x00000802, 0x04200802,
+    0x00200800, 0x00000002, 0x04000000, 0x00200800,
+    0x04000000, 0x00200800, 0x00200000, 0x04000802,
+    0x04000802, 0x04200002, 0x04200002, 0x00000002,
+    0x00200002, 0x04000000, 0x04000800, 0x00200000,
+    0x04200800, 0x00000802, 0x00200802, 0x04200800,
+    0x00000802, 0x04000002, 0x04200802, 0x04200000,
+    0x00200800, 0x00000000, 0x00000002, 0x04200802,
+    0x00000000, 0x00200802, 0x04200000, 0x00000800,
+    0x04000002, 0x04000800, 0x00000800, 0x00200002
+};
+
+static const uint32_t SB8[64] =
+{
+    0x10001040, 0x00001000, 0x00040000, 0x10041040,
+    0x10000000, 0x10001040, 0x00000040, 0x10000000,
+    0x00040040, 0x10040000, 0x10041040, 0x00041000,
+    0x10041000, 0x00041040, 0x00001000, 0x00000040,
+    0x10040000, 0x10000040, 0x10001000, 0x00001040,
+    0x00041000, 0x00040040, 0x10040040, 0x10041000,
+    0x00001040, 0x00000000, 0x00000000, 0x10040040,
+    0x10000040, 0x10001000, 0x00041040, 0x00040000,
+    0x00041040, 0x00040000, 0x10041000, 0x00001000,
+    0x00000040, 0x10040040, 0x00001000, 0x00041040,
+    0x10001000, 0x00000040, 0x10000040, 0x10040000,
+    0x10040040, 0x10000000, 0x00040000, 0x10001040,
+    0x00000000, 0x10041040, 0x00040040, 0x10000040,
+    0x10040000, 0x10001000, 0x10001040, 0x00000000,
+    0x10041040, 0x00041000, 0x00041000, 0x00001040,
+    0x00001040, 0x00040040, 0x10000000, 0x10041000
+};
+
+/*
+ * PC1: left and right halves bit-swap
+ */
+static const uint32_t LHs[16] =
+{
+    0x00000000, 0x00000001, 0x00000100, 0x00000101,
+    0x00010000, 0x00010001, 0x00010100, 0x00010101,
+    0x01000000, 0x01000001, 0x01000100, 0x01000101,
+    0x01010000, 0x01010001, 0x01010100, 0x01010101
+};
+
+static const uint32_t RHs[16] =
+{
+    0x00000000, 0x01000000, 0x00010000, 0x01010000,
+    0x00000100, 0x01000100, 0x00010100, 0x01010100,
+    0x00000001, 0x01000001, 0x00010001, 0x01010001,
+    0x00000101, 0x01000101, 0x00010101, 0x01010101,
+};
+
+/*
+ * Initial Permutation macro
+ */
+#define DES_IP(X,Y)                                             \
+{                                                               \
+    T = ((X >>  4) ^ Y) & 0x0F0F0F0F; Y ^= T; X ^= (T <<  4);   \
+    T = ((X >> 16) ^ Y) & 0x0000FFFF; Y ^= T; X ^= (T << 16);   \
+    T = ((Y >>  2) ^ X) & 0x33333333; X ^= T; Y ^= (T <<  2);   \
+    T = ((Y >>  8) ^ X) & 0x00FF00FF; X ^= T; Y ^= (T <<  8);   \
+    Y = ((Y << 1) | (Y >> 31)) & 0xFFFFFFFF;                    \
+    T = (X ^ Y) & 0xAAAAAAAA; Y ^= T; X ^= T;                   \
+    X = ((X << 1) | (X >> 31)) & 0xFFFFFFFF;                    \
+}
+
+/*
+ * Final Permutation macro
+ */
+#define DES_FP(X,Y)                                             \
+{                                                               \
+    X = ((X << 31) | (X >> 1)) & 0xFFFFFFFF;                    \
+    T = (X ^ Y) & 0xAAAAAAAA; X ^= T; Y ^= T;                   \
+    Y = ((Y << 31) | (Y >> 1)) & 0xFFFFFFFF;                    \
+    T = ((Y >>  8) ^ X) & 0x00FF00FF; X ^= T; Y ^= (T <<  8);   \
+    T = ((Y >>  2) ^ X) & 0x33333333; X ^= T; Y ^= (T <<  2);   \
+    T = ((X >> 16) ^ Y) & 0x0000FFFF; Y ^= T; X ^= (T << 16);   \
+    T = ((X >>  4) ^ Y) & 0x0F0F0F0F; Y ^= T; X ^= (T <<  4);   \
+}
+
+/*
+ * DES round macro
+ */
+#define DES_ROUND(X,Y)                          \
+{                                               \
+    T = *SK++ ^ X;                              \
+    Y ^= SB8[ (T      ) & 0x3F ] ^              \
+         SB6[ (T >>  8) & 0x3F ] ^              \
+         SB4[ (T >> 16) & 0x3F ] ^              \
+         SB2[ (T >> 24) & 0x3F ];               \
+                                                \
+    T = *SK++ ^ ((X << 28) | (X >> 4));         \
+    Y ^= SB7[ (T      ) & 0x3F ] ^              \
+         SB5[ (T >>  8) & 0x3F ] ^              \
+         SB3[ (T >> 16) & 0x3F ] ^              \
+         SB1[ (T >> 24) & 0x3F ];               \
+}
+
+#define SWAP(a,b) { uint32_t t = a; a = b; b = t; t = 0; }
+
+void mbedtls_des_init( mbedtls_des_context *ctx )
+{
+    memset( ctx, 0, sizeof( mbedtls_des_context ) );
+}
+
+void mbedtls_des_free( mbedtls_des_context *ctx )
+{
+    if( ctx == NULL )
+        return;
+
+    mbedtls_platform_zeroize( ctx, sizeof( mbedtls_des_context ) );
+}
+
+void mbedtls_des3_init( mbedtls_des3_context *ctx )
+{
+    memset( ctx, 0, sizeof( mbedtls_des3_context ) );
+}
+
+void mbedtls_des3_free( mbedtls_des3_context *ctx )
+{
+    if( ctx == NULL )
+        return;
+
+    mbedtls_platform_zeroize( ctx, sizeof( mbedtls_des3_context ) );
+}
+
+static const unsigned char odd_parity_table[128] = { 1,  2,  4,  7,  8,
+        11, 13, 14, 16, 19, 21, 22, 25, 26, 28, 31, 32, 35, 37, 38, 41, 42, 44,
+        47, 49, 50, 52, 55, 56, 59, 61, 62, 64, 67, 69, 70, 73, 74, 76, 79, 81,
+        82, 84, 87, 88, 91, 93, 94, 97, 98, 100, 103, 104, 107, 109, 110, 112,
+        115, 117, 118, 121, 122, 124, 127, 128, 131, 133, 134, 137, 138, 140,
+        143, 145, 146, 148, 151, 152, 155, 157, 158, 161, 162, 164, 167, 168,
+        171, 173, 174, 176, 179, 181, 182, 185, 186, 188, 191, 193, 194, 196,
+        199, 200, 203, 205, 206, 208, 211, 213, 214, 217, 218, 220, 223, 224,
+        227, 229, 230, 233, 234, 236, 239, 241, 242, 244, 247, 248, 251, 253,
+        254 };
+
+void mbedtls_des_key_set_parity( unsigned char key[MBEDTLS_DES_KEY_SIZE] )
+{
+    int i;
+
+    for( i = 0; i < MBEDTLS_DES_KEY_SIZE; i++ )
+        key[i] = odd_parity_table[key[i] / 2];
+}
+
+/*
+ * Check the given key's parity, returns 1 on failure, 0 on SUCCESS
+ */
+int mbedtls_des_key_check_key_parity( const unsigned char key[MBEDTLS_DES_KEY_SIZE] )
+{
+    int i;
+
+    for( i = 0; i < MBEDTLS_DES_KEY_SIZE; i++ )
+        if( key[i] != odd_parity_table[key[i] / 2] )
+            return( 1 );
+
+    return( 0 );
+}
+
+/*
+ * Table of weak and semi-weak keys
+ *
+ * Source: http://en.wikipedia.org/wiki/Weak_key
+ *
+ * Weak:
+ * Alternating ones + zeros (0x0101010101010101)
+ * Alternating 'F' + 'E' (0xFEFEFEFEFEFEFEFE)
+ * '0xE0E0E0E0F1F1F1F1'
+ * '0x1F1F1F1F0E0E0E0E'
+ *
+ * Semi-weak:
+ * 0x011F011F010E010E and 0x1F011F010E010E01
+ * 0x01E001E001F101F1 and 0xE001E001F101F101
+ * 0x01FE01FE01FE01FE and 0xFE01FE01FE01FE01
+ * 0x1FE01FE00EF10EF1 and 0xE01FE01FF10EF10E
+ * 0x1FFE1FFE0EFE0EFE and 0xFE1FFE1FFE0EFE0E
+ * 0xE0FEE0FEF1FEF1FE and 0xFEE0FEE0FEF1FEF1
+ *
+ */
+
+#define WEAK_KEY_COUNT 16
+
+static const unsigned char weak_key_table[WEAK_KEY_COUNT][MBEDTLS_DES_KEY_SIZE] =
+{
+    { 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 },
+    { 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE },
+    { 0x1F, 0x1F, 0x1F, 0x1F, 0x0E, 0x0E, 0x0E, 0x0E },
+    { 0xE0, 0xE0, 0xE0, 0xE0, 0xF1, 0xF1, 0xF1, 0xF1 },
+
+    { 0x01, 0x1F, 0x01, 0x1F, 0x01, 0x0E, 0x01, 0x0E },
+    { 0x1F, 0x01, 0x1F, 0x01, 0x0E, 0x01, 0x0E, 0x01 },
+    { 0x01, 0xE0, 0x01, 0xE0, 0x01, 0xF1, 0x01, 0xF1 },
+    { 0xE0, 0x01, 0xE0, 0x01, 0xF1, 0x01, 0xF1, 0x01 },
+    { 0x01, 0xFE, 0x01, 0xFE, 0x01, 0xFE, 0x01, 0xFE },
+    { 0xFE, 0x01, 0xFE, 0x01, 0xFE, 0x01, 0xFE, 0x01 },
+    { 0x1F, 0xE0, 0x1F, 0xE0, 0x0E, 0xF1, 0x0E, 0xF1 },
+    { 0xE0, 0x1F, 0xE0, 0x1F, 0xF1, 0x0E, 0xF1, 0x0E },
+    { 0x1F, 0xFE, 0x1F, 0xFE, 0x0E, 0xFE, 0x0E, 0xFE },
+    { 0xFE, 0x1F, 0xFE, 0x1F, 0xFE, 0x0E, 0xFE, 0x0E },
+    { 0xE0, 0xFE, 0xE0, 0xFE, 0xF1, 0xFE, 0xF1, 0xFE },
+    { 0xFE, 0xE0, 0xFE, 0xE0, 0xFE, 0xF1, 0xFE, 0xF1 }
+};
+
+int mbedtls_des_key_check_weak( const unsigned char key[MBEDTLS_DES_KEY_SIZE] )
+{
+    int i;
+
+    for( i = 0; i < WEAK_KEY_COUNT; i++ )
+        if( memcmp( weak_key_table[i], key, MBEDTLS_DES_KEY_SIZE) == 0 )
+            return( 1 );
+
+    return( 0 );
+}
+
+#if !defined(MBEDTLS_DES_SETKEY_ALT)
+void mbedtls_des_setkey( uint32_t SK[32], const unsigned char key[MBEDTLS_DES_KEY_SIZE] )
+{
+    int i;
+    uint32_t X, Y, T;
+
+    GET_UINT32_BE( X, key, 0 );
+    GET_UINT32_BE( Y, key, 4 );
+
+    /*
+     * Permuted Choice 1
+     */
+    T =  ((Y >>  4) ^ X) & 0x0F0F0F0F;  X ^= T; Y ^= (T <<  4);
+    T =  ((Y      ) ^ X) & 0x10101010;  X ^= T; Y ^= (T      );
+
+    X =   (LHs[ (X      ) & 0xF] << 3) | (LHs[ (X >>  8) & 0xF ] << 2)
+        | (LHs[ (X >> 16) & 0xF] << 1) | (LHs[ (X >> 24) & 0xF ]     )
+        | (LHs[ (X >>  5) & 0xF] << 7) | (LHs[ (X >> 13) & 0xF ] << 6)
+        | (LHs[ (X >> 21) & 0xF] << 5) | (LHs[ (X >> 29) & 0xF ] << 4);
+
+    Y =   (RHs[ (Y >>  1) & 0xF] << 3) | (RHs[ (Y >>  9) & 0xF ] << 2)
+        | (RHs[ (Y >> 17) & 0xF] << 1) | (RHs[ (Y >> 25) & 0xF ]     )
+        | (RHs[ (Y >>  4) & 0xF] << 7) | (RHs[ (Y >> 12) & 0xF ] << 6)
+        | (RHs[ (Y >> 20) & 0xF] << 5) | (RHs[ (Y >> 28) & 0xF ] << 4);
+
+    X &= 0x0FFFFFFF;
+    Y &= 0x0FFFFFFF;
+
+    /*
+     * calculate subkeys
+     */
+    for( i = 0; i < 16; i++ )
+    {
+        if( i < 2 || i == 8 || i == 15 )
+        {
+            X = ((X <<  1) | (X >> 27)) & 0x0FFFFFFF;
+            Y = ((Y <<  1) | (Y >> 27)) & 0x0FFFFFFF;
+        }
+        else
+        {
+            X = ((X <<  2) | (X >> 26)) & 0x0FFFFFFF;
+            Y = ((Y <<  2) | (Y >> 26)) & 0x0FFFFFFF;
+        }
+
+        *SK++ =   ((X <<  4) & 0x24000000) | ((X << 28) & 0x10000000)
+                | ((X << 14) & 0x08000000) | ((X << 18) & 0x02080000)
+                | ((X <<  6) & 0x01000000) | ((X <<  9) & 0x00200000)
+                | ((X >>  1) & 0x00100000) | ((X << 10) & 0x00040000)
+                | ((X <<  2) & 0x00020000) | ((X >> 10) & 0x00010000)
+                | ((Y >> 13) & 0x00002000) | ((Y >>  4) & 0x00001000)
+                | ((Y <<  6) & 0x00000800) | ((Y >>  1) & 0x00000400)
+                | ((Y >> 14) & 0x00000200) | ((Y      ) & 0x00000100)
+                | ((Y >>  5) & 0x00000020) | ((Y >> 10) & 0x00000010)
+                | ((Y >>  3) & 0x00000008) | ((Y >> 18) & 0x00000004)
+                | ((Y >> 26) & 0x00000002) | ((Y >> 24) & 0x00000001);
+
+        *SK++ =   ((X << 15) & 0x20000000) | ((X << 17) & 0x10000000)
+                | ((X << 10) & 0x08000000) | ((X << 22) & 0x04000000)
+                | ((X >>  2) & 0x02000000) | ((X <<  1) & 0x01000000)
+                | ((X << 16) & 0x00200000) | ((X << 11) & 0x00100000)
+                | ((X <<  3) & 0x00080000) | ((X >>  6) & 0x00040000)
+                | ((X << 15) & 0x00020000) | ((X >>  4) & 0x00010000)
+                | ((Y >>  2) & 0x00002000) | ((Y <<  8) & 0x00001000)
+                | ((Y >> 14) & 0x00000808) | ((Y >>  9) & 0x00000400)
+                | ((Y      ) & 0x00000200) | ((Y <<  7) & 0x00000100)
+                | ((Y >>  7) & 0x00000020) | ((Y >>  3) & 0x00000011)
+                | ((Y <<  2) & 0x00000004) | ((Y >> 21) & 0x00000002);
+    }
+}
+#endif /* !MBEDTLS_DES_SETKEY_ALT */
+
+/*
+ * DES key schedule (56-bit, encryption)
+ */
+int mbedtls_des_setkey_enc( mbedtls_des_context *ctx, const unsigned char key[MBEDTLS_DES_KEY_SIZE] )
+{
+    mbedtls_des_setkey( ctx->sk, key );
+
+    return( 0 );
+}
+
+/*
+ * DES key schedule (56-bit, decryption)
+ */
+int mbedtls_des_setkey_dec( mbedtls_des_context *ctx, const unsigned char key[MBEDTLS_DES_KEY_SIZE] )
+{
+    int i;
+
+    mbedtls_des_setkey( ctx->sk, key );
+
+    for( i = 0; i < 16; i += 2 )
+    {
+        SWAP( ctx->sk[i    ], ctx->sk[30 - i] );
+        SWAP( ctx->sk[i + 1], ctx->sk[31 - i] );
+    }
+
+    return( 0 );
+}
+
+static void des3_set2key( uint32_t esk[96],
+                          uint32_t dsk[96],
+                          const unsigned char key[MBEDTLS_DES_KEY_SIZE*2] )
+{
+    int i;
+
+    mbedtls_des_setkey( esk, key );
+    mbedtls_des_setkey( dsk + 32, key + 8 );
+
+    for( i = 0; i < 32; i += 2 )
+    {
+        dsk[i     ] = esk[30 - i];
+        dsk[i +  1] = esk[31 - i];
+
+        esk[i + 32] = dsk[62 - i];
+        esk[i + 33] = dsk[63 - i];
+
+        esk[i + 64] = esk[i    ];
+        esk[i + 65] = esk[i + 1];
+
+        dsk[i + 64] = dsk[i    ];
+        dsk[i + 65] = dsk[i + 1];
+    }
+}
+
+/*
+ * Triple-DES key schedule (112-bit, encryption)
+ */
+int mbedtls_des3_set2key_enc( mbedtls_des3_context *ctx,
+                      const unsigned char key[MBEDTLS_DES_KEY_SIZE * 2] )
+{
+    uint32_t sk[96];
+
+    des3_set2key( ctx->sk, sk, key );
+    mbedtls_platform_zeroize( sk,  sizeof( sk ) );
+
+    return( 0 );
+}
+
+/*
+ * Triple-DES key schedule (112-bit, decryption)
+ */
+int mbedtls_des3_set2key_dec( mbedtls_des3_context *ctx,
+                      const unsigned char key[MBEDTLS_DES_KEY_SIZE * 2] )
+{
+    uint32_t sk[96];
+
+    des3_set2key( sk, ctx->sk, key );
+    mbedtls_platform_zeroize( sk,  sizeof( sk ) );
+
+    return( 0 );
+}
+
+static void des3_set3key( uint32_t esk[96],
+                          uint32_t dsk[96],
+                          const unsigned char key[24] )
+{
+    int i;
+
+    mbedtls_des_setkey( esk, key );
+    mbedtls_des_setkey( dsk + 32, key +  8 );
+    mbedtls_des_setkey( esk + 64, key + 16 );
+
+    for( i = 0; i < 32; i += 2 )
+    {
+        dsk[i     ] = esk[94 - i];
+        dsk[i +  1] = esk[95 - i];
+
+        esk[i + 32] = dsk[62 - i];
+        esk[i + 33] = dsk[63 - i];
+
+        dsk[i + 64] = esk[30 - i];
+        dsk[i + 65] = esk[31 - i];
+    }
+}
+
+/*
+ * Triple-DES key schedule (168-bit, encryption)
+ */
+int mbedtls_des3_set3key_enc( mbedtls_des3_context *ctx,
+                      const unsigned char key[MBEDTLS_DES_KEY_SIZE * 3] )
+{
+    uint32_t sk[96];
+
+    des3_set3key( ctx->sk, sk, key );
+    mbedtls_platform_zeroize( sk,  sizeof( sk ) );
+
+    return( 0 );
+}
+
+/*
+ * Triple-DES key schedule (168-bit, decryption)
+ */
+int mbedtls_des3_set3key_dec( mbedtls_des3_context *ctx,
+                      const unsigned char key[MBEDTLS_DES_KEY_SIZE * 3] )
+{
+    uint32_t sk[96];
+
+    des3_set3key( sk, ctx->sk, key );
+    mbedtls_platform_zeroize( sk,  sizeof( sk ) );
+
+    return( 0 );
+}
+
+/*
+ * DES-ECB block encryption/decryption
+ */
+#if !defined(MBEDTLS_DES_CRYPT_ECB_ALT)
+int mbedtls_des_crypt_ecb( mbedtls_des_context *ctx,
+                    const unsigned char input[8],
+                    unsigned char output[8] )
+{
+    int i;
+    uint32_t X, Y, T, *SK;
+
+    SK = ctx->sk;
+
+    GET_UINT32_BE( X, input, 0 );
+    GET_UINT32_BE( Y, input, 4 );
+
+    DES_IP( X, Y );
+
+    for( i = 0; i < 8; i++ )
+    {
+        DES_ROUND( Y, X );
+        DES_ROUND( X, Y );
+    }
+
+    DES_FP( Y, X );
+
+    PUT_UINT32_BE( Y, output, 0 );
+    PUT_UINT32_BE( X, output, 4 );
+
+    return( 0 );
+}
+#endif /* !MBEDTLS_DES_CRYPT_ECB_ALT */
+
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+/*
+ * DES-CBC buffer encryption/decryption
+ */
+int mbedtls_des_crypt_cbc( mbedtls_des_context *ctx,
+                    int mode,
+                    size_t length,
+                    unsigned char iv[8],
+                    const unsigned char *input,
+                    unsigned char *output )
+{
+    int i;
+    unsigned char temp[8];
+
+    if( length % 8 )
+        return( MBEDTLS_ERR_DES_INVALID_INPUT_LENGTH );
+
+    if( mode == MBEDTLS_DES_ENCRYPT )
+    {
+        while( length > 0 )
+        {
+            for( i = 0; i < 8; i++ )
+                output[i] = (unsigned char)( input[i] ^ iv[i] );
+
+            mbedtls_des_crypt_ecb( ctx, output, output );
+            memcpy( iv, output, 8 );
+
+            input  += 8;
+            output += 8;
+            length -= 8;
+        }
+    }
+    else /* MBEDTLS_DES_DECRYPT */
+    {
+        while( length > 0 )
+        {
+            memcpy( temp, input, 8 );
+            mbedtls_des_crypt_ecb( ctx, input, output );
+
+            for( i = 0; i < 8; i++ )
+                output[i] = (unsigned char)( output[i] ^ iv[i] );
+
+            memcpy( iv, temp, 8 );
+
+            input  += 8;
+            output += 8;
+            length -= 8;
+        }
+    }
+
+    return( 0 );
+}
+#endif /* MBEDTLS_CIPHER_MODE_CBC */
+
+/*
+ * 3DES-ECB block encryption/decryption
+ */
+#if !defined(MBEDTLS_DES3_CRYPT_ECB_ALT)
+int mbedtls_des3_crypt_ecb( mbedtls_des3_context *ctx,
+                     const unsigned char input[8],
+                     unsigned char output[8] )
+{
+    int i;
+    uint32_t X, Y, T, *SK;
+
+    SK = ctx->sk;
+
+    GET_UINT32_BE( X, input, 0 );
+    GET_UINT32_BE( Y, input, 4 );
+
+    DES_IP( X, Y );
+
+    for( i = 0; i < 8; i++ )
+    {
+        DES_ROUND( Y, X );
+        DES_ROUND( X, Y );
+    }
+
+    for( i = 0; i < 8; i++ )
+    {
+        DES_ROUND( X, Y );
+        DES_ROUND( Y, X );
+    }
+
+    for( i = 0; i < 8; i++ )
+    {
+        DES_ROUND( Y, X );
+        DES_ROUND( X, Y );
+    }
+
+    DES_FP( Y, X );
+
+    PUT_UINT32_BE( Y, output, 0 );
+    PUT_UINT32_BE( X, output, 4 );
+
+    return( 0 );
+}
+#endif /* !MBEDTLS_DES3_CRYPT_ECB_ALT */
+
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+/*
+ * 3DES-CBC buffer encryption/decryption
+ */
+int mbedtls_des3_crypt_cbc( mbedtls_des3_context *ctx,
+                     int mode,
+                     size_t length,
+                     unsigned char iv[8],
+                     const unsigned char *input,
+                     unsigned char *output )
+{
+    int i;
+    unsigned char temp[8];
+
+    if( length % 8 )
+        return( MBEDTLS_ERR_DES_INVALID_INPUT_LENGTH );
+
+    if( mode == MBEDTLS_DES_ENCRYPT )
+    {
+        while( length > 0 )
+        {
+            for( i = 0; i < 8; i++ )
+                output[i] = (unsigned char)( input[i] ^ iv[i] );
+
+            mbedtls_des3_crypt_ecb( ctx, output, output );
+            memcpy( iv, output, 8 );
+
+            input  += 8;
+            output += 8;
+            length -= 8;
+        }
+    }
+    else /* MBEDTLS_DES_DECRYPT */
+    {
+        while( length > 0 )
+        {
+            memcpy( temp, input, 8 );
+            mbedtls_des3_crypt_ecb( ctx, input, output );
+
+            for( i = 0; i < 8; i++ )
+                output[i] = (unsigned char)( output[i] ^ iv[i] );
+
+            memcpy( iv, temp, 8 );
+
+            input  += 8;
+            output += 8;
+            length -= 8;
+        }
+    }
+
+    return( 0 );
+}
+#endif /* MBEDTLS_CIPHER_MODE_CBC */
+
+#endif /* !MBEDTLS_DES_ALT */
+
+#if defined(MBEDTLS_SELF_TEST)
+/*
+ * DES and 3DES test vectors from:
+ *
+ * http://csrc.nist.gov/groups/STM/cavp/documents/des/tripledes-vectors.zip
+ */
+static const unsigned char des3_test_keys[24] =
+{
+    0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF,
+    0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF, 0x01,
+    0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF, 0x01, 0x23
+};
+
+static const unsigned char des3_test_buf[8] =
+{
+    0x4E, 0x6F, 0x77, 0x20, 0x69, 0x73, 0x20, 0x74
+};
+
+static const unsigned char des3_test_ecb_dec[3][8] =
+{
+    { 0xCD, 0xD6, 0x4F, 0x2F, 0x94, 0x27, 0xC1, 0x5D },
+    { 0x69, 0x96, 0xC8, 0xFA, 0x47, 0xA2, 0xAB, 0xEB },
+    { 0x83, 0x25, 0x39, 0x76, 0x44, 0x09, 0x1A, 0x0A }
+};
+
+static const unsigned char des3_test_ecb_enc[3][8] =
+{
+    { 0x6A, 0x2A, 0x19, 0xF4, 0x1E, 0xCA, 0x85, 0x4B },
+    { 0x03, 0xE6, 0x9F, 0x5B, 0xFA, 0x58, 0xEB, 0x42 },
+    { 0xDD, 0x17, 0xE8, 0xB8, 0xB4, 0x37, 0xD2, 0x32 }
+};
+
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+static const unsigned char des3_test_iv[8] =
+{
+    0x12, 0x34, 0x56, 0x78, 0x90, 0xAB, 0xCD, 0xEF,
+};
+
+static const unsigned char des3_test_cbc_dec[3][8] =
+{
+    { 0x12, 0x9F, 0x40, 0xB9, 0xD2, 0x00, 0x56, 0xB3 },
+    { 0x47, 0x0E, 0xFC, 0x9A, 0x6B, 0x8E, 0xE3, 0x93 },
+    { 0xC5, 0xCE, 0xCF, 0x63, 0xEC, 0xEC, 0x51, 0x4C }
+};
+
+static const unsigned char des3_test_cbc_enc[3][8] =
+{
+    { 0x54, 0xF1, 0x5A, 0xF6, 0xEB, 0xE3, 0xA4, 0xB4 },
+    { 0x35, 0x76, 0x11, 0x56, 0x5F, 0xA1, 0x8E, 0x4D },
+    { 0xCB, 0x19, 0x1F, 0x85, 0xD1, 0xED, 0x84, 0x39 }
+};
+#endif /* MBEDTLS_CIPHER_MODE_CBC */
+
+/*
+ * Checkup routine
+ */
+int mbedtls_des_self_test( int verbose )
+{
+    int i, j, u, v, ret = 0;
+    mbedtls_des_context ctx;
+    mbedtls_des3_context ctx3;
+    unsigned char buf[8];
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+    unsigned char prv[8];
+    unsigned char iv[8];
+#endif
+
+    mbedtls_des_init( &ctx );
+    mbedtls_des3_init( &ctx3 );
+    /*
+     * ECB mode
+     */
+    for( i = 0; i < 6; i++ )
+    {
+        u = i >> 1;
+        v = i  & 1;
+
+        if( verbose != 0 )
+            mbedtls_printf( "  DES%c-ECB-%3d (%s): ",
+                             ( u == 0 ) ? ' ' : '3', 56 + u * 56,
+                             ( v == MBEDTLS_DES_DECRYPT ) ? "dec" : "enc" );
+
+        memcpy( buf, des3_test_buf, 8 );
+
+        switch( i )
+        {
+        case 0:
+            mbedtls_des_setkey_dec( &ctx, des3_test_keys );
+            break;
+
+        case 1:
+            mbedtls_des_setkey_enc( &ctx, des3_test_keys );
+            break;
+
+        case 2:
+            mbedtls_des3_set2key_dec( &ctx3, des3_test_keys );
+            break;
+
+        case 3:
+            mbedtls_des3_set2key_enc( &ctx3, des3_test_keys );
+            break;
+
+        case 4:
+            mbedtls_des3_set3key_dec( &ctx3, des3_test_keys );
+            break;
+
+        case 5:
+            mbedtls_des3_set3key_enc( &ctx3, des3_test_keys );
+            break;
+
+        default:
+            return( 1 );
+        }
+
+        for( j = 0; j < 10000; j++ )
+        {
+            if( u == 0 )
+                mbedtls_des_crypt_ecb( &ctx, buf, buf );
+            else
+                mbedtls_des3_crypt_ecb( &ctx3, buf, buf );
+        }
+
+        if( ( v == MBEDTLS_DES_DECRYPT &&
+                memcmp( buf, des3_test_ecb_dec[u], 8 ) != 0 ) ||
+            ( v != MBEDTLS_DES_DECRYPT &&
+                memcmp( buf, des3_test_ecb_enc[u], 8 ) != 0 ) )
+        {
+            if( verbose != 0 )
+                mbedtls_printf( "failed\n" );
+
+            ret = 1;
+            goto exit;
+        }
+
+        if( verbose != 0 )
+            mbedtls_printf( "passed\n" );
+    }
+
+    if( verbose != 0 )
+        mbedtls_printf( "\n" );
+
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+    /*
+     * CBC mode
+     */
+    for( i = 0; i < 6; i++ )
+    {
+        u = i >> 1;
+        v = i  & 1;
+
+        if( verbose != 0 )
+            mbedtls_printf( "  DES%c-CBC-%3d (%s): ",
+                             ( u == 0 ) ? ' ' : '3', 56 + u * 56,
+                             ( v == MBEDTLS_DES_DECRYPT ) ? "dec" : "enc" );
+
+        memcpy( iv,  des3_test_iv,  8 );
+        memcpy( prv, des3_test_iv,  8 );
+        memcpy( buf, des3_test_buf, 8 );
+
+        switch( i )
+        {
+        case 0:
+            mbedtls_des_setkey_dec( &ctx, des3_test_keys );
+            break;
+
+        case 1:
+            mbedtls_des_setkey_enc( &ctx, des3_test_keys );
+            break;
+
+        case 2:
+            mbedtls_des3_set2key_dec( &ctx3, des3_test_keys );
+            break;
+
+        case 3:
+            mbedtls_des3_set2key_enc( &ctx3, des3_test_keys );
+            break;
+
+        case 4:
+            mbedtls_des3_set3key_dec( &ctx3, des3_test_keys );
+            break;
+
+        case 5:
+            mbedtls_des3_set3key_enc( &ctx3, des3_test_keys );
+            break;
+
+        default:
+            return( 1 );
+        }
+
+        if( v == MBEDTLS_DES_DECRYPT )
+        {
+            for( j = 0; j < 10000; j++ )
+            {
+                if( u == 0 )
+                    mbedtls_des_crypt_cbc( &ctx, v, 8, iv, buf, buf );
+                else
+                    mbedtls_des3_crypt_cbc( &ctx3, v, 8, iv, buf, buf );
+            }
+        }
+        else
+        {
+            for( j = 0; j < 10000; j++ )
+            {
+                unsigned char tmp[8];
+
+                if( u == 0 )
+                    mbedtls_des_crypt_cbc( &ctx, v, 8, iv, buf, buf );
+                else
+                    mbedtls_des3_crypt_cbc( &ctx3, v, 8, iv, buf, buf );
+
+                memcpy( tmp, prv, 8 );
+                memcpy( prv, buf, 8 );
+                memcpy( buf, tmp, 8 );
+            }
+
+            memcpy( buf, prv, 8 );
+        }
+
+        if( ( v == MBEDTLS_DES_DECRYPT &&
+                memcmp( buf, des3_test_cbc_dec[u], 8 ) != 0 ) ||
+            ( v != MBEDTLS_DES_DECRYPT &&
+                memcmp( buf, des3_test_cbc_enc[u], 8 ) != 0 ) )
+        {
+            if( verbose != 0 )
+                mbedtls_printf( "failed\n" );
+
+            ret = 1;
+            goto exit;
+        }
+
+        if( verbose != 0 )
+            mbedtls_printf( "passed\n" );
+    }
+#endif /* MBEDTLS_CIPHER_MODE_CBC */
+
+    if( verbose != 0 )
+        mbedtls_printf( "\n" );
+
+exit:
+    mbedtls_des_free( &ctx );
+    mbedtls_des3_free( &ctx3 );
+
+    return( ret );
+}
+
+#endif /* MBEDTLS_SELF_TEST */
+
+#endif /* MBEDTLS_DES_C */
diff --git a/common/mbedtls/des.h b/common/mbedtls/des.h
new file mode 100644
index 000000000..9406e0ae5
--- /dev/null
+++ b/common/mbedtls/des.h
@@ -0,0 +1,352 @@
+/**
+ * \file des.h
+ *
+ * \brief DES block cipher
+ *
+ * \warning   DES is considered a weak cipher and its use constitutes a
+ *            security risk. We recommend considering stronger ciphers
+ *            instead.
+ */
+/*
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ *
+ */
+#ifndef MBEDTLS_DES_H
+#define MBEDTLS_DES_H
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#include <stddef.h>
+#include <stdint.h>
+
+#define MBEDTLS_DES_ENCRYPT     1
+#define MBEDTLS_DES_DECRYPT     0
+
+#define MBEDTLS_ERR_DES_INVALID_INPUT_LENGTH              -0x0032  /**< The data input has an invalid length. */
+#define MBEDTLS_ERR_DES_HW_ACCEL_FAILED                   -0x0033  /**< DES hardware accelerator failed. */
+
+#define MBEDTLS_DES_KEY_SIZE    8
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if !defined(MBEDTLS_DES_ALT)
+// Regular implementation
+//
+
+/**
+ * \brief          DES context structure
+ *
+ * \warning        DES is considered a weak cipher and its use constitutes a
+ *                 security risk. We recommend considering stronger ciphers
+ *                 instead.
+ */
+typedef struct mbedtls_des_context
+{
+    uint32_t sk[32];            /*!<  DES subkeys       */
+}
+mbedtls_des_context;
+
+/**
+ * \brief          Triple-DES context structure
+ */
+typedef struct mbedtls_des3_context
+{
+    uint32_t sk[96];            /*!<  3DES subkeys      */
+}
+mbedtls_des3_context;
+
+#else  /* MBEDTLS_DES_ALT */
+#include "des_alt.h"
+#endif /* MBEDTLS_DES_ALT */
+
+/**
+ * \brief          Initialize DES context
+ *
+ * \param ctx      DES context to be initialized
+ *
+ * \warning        DES is considered a weak cipher and its use constitutes a
+ *                 security risk. We recommend considering stronger ciphers
+ *                 instead.
+ */
+void mbedtls_des_init( mbedtls_des_context *ctx );
+
+/**
+ * \brief          Clear DES context
+ *
+ * \param ctx      DES context to be cleared
+ *
+ * \warning        DES is considered a weak cipher and its use constitutes a
+ *                 security risk. We recommend considering stronger ciphers
+ *                 instead.
+ */
+void mbedtls_des_free( mbedtls_des_context *ctx );
+
+/**
+ * \brief          Initialize Triple-DES context
+ *
+ * \param ctx      DES3 context to be initialized
+ */
+void mbedtls_des3_init( mbedtls_des3_context *ctx );
+
+/**
+ * \brief          Clear Triple-DES context
+ *
+ * \param ctx      DES3 context to be cleared
+ */
+void mbedtls_des3_free( mbedtls_des3_context *ctx );
+
+/**
+ * \brief          Set key parity on the given key to odd.
+ *
+ *                 DES keys are 56 bits long, but each byte is padded with
+ *                 a parity bit to allow verification.
+ *
+ * \param key      8-byte secret key
+ *
+ * \warning        DES is considered a weak cipher and its use constitutes a
+ *                 security risk. We recommend considering stronger ciphers
+ *                 instead.
+ */
+void mbedtls_des_key_set_parity( unsigned char key[MBEDTLS_DES_KEY_SIZE] );
+
+/**
+ * \brief          Check that key parity on the given key is odd.
+ *
+ *                 DES keys are 56 bits long, but each byte is padded with
+ *                 a parity bit to allow verification.
+ *
+ * \param key      8-byte secret key
+ *
+ * \return         0 is parity was ok, 1 if parity was not correct.
+ *
+ * \warning        DES is considered a weak cipher and its use constitutes a
+ *                 security risk. We recommend considering stronger ciphers
+ *                 instead.
+ */
+int mbedtls_des_key_check_key_parity( const unsigned char key[MBEDTLS_DES_KEY_SIZE] );
+
+/**
+ * \brief          Check that key is not a weak or semi-weak DES key
+ *
+ * \param key      8-byte secret key
+ *
+ * \return         0 if no weak key was found, 1 if a weak key was identified.
+ *
+ * \warning        DES is considered a weak cipher and its use constitutes a
+ *                 security risk. We recommend considering stronger ciphers
+ *                 instead.
+ */
+int mbedtls_des_key_check_weak( const unsigned char key[MBEDTLS_DES_KEY_SIZE] );
+
+/**
+ * \brief          DES key schedule (56-bit, encryption)
+ *
+ * \param ctx      DES context to be initialized
+ * \param key      8-byte secret key
+ *
+ * \return         0
+ *
+ * \warning        DES is considered a weak cipher and its use constitutes a
+ *                 security risk. We recommend considering stronger ciphers
+ *                 instead.
+ */
+int mbedtls_des_setkey_enc( mbedtls_des_context *ctx, const unsigned char key[MBEDTLS_DES_KEY_SIZE] );
+
+/**
+ * \brief          DES key schedule (56-bit, decryption)
+ *
+ * \param ctx      DES context to be initialized
+ * \param key      8-byte secret key
+ *
+ * \return         0
+ *
+ * \warning        DES is considered a weak cipher and its use constitutes a
+ *                 security risk. We recommend considering stronger ciphers
+ *                 instead.
+ */
+int mbedtls_des_setkey_dec( mbedtls_des_context *ctx, const unsigned char key[MBEDTLS_DES_KEY_SIZE] );
+
+/**
+ * \brief          Triple-DES key schedule (112-bit, encryption)
+ *
+ * \param ctx      3DES context to be initialized
+ * \param key      16-byte secret key
+ *
+ * \return         0
+ */
+int mbedtls_des3_set2key_enc( mbedtls_des3_context *ctx,
+                      const unsigned char key[MBEDTLS_DES_KEY_SIZE * 2] );
+
+/**
+ * \brief          Triple-DES key schedule (112-bit, decryption)
+ *
+ * \param ctx      3DES context to be initialized
+ * \param key      16-byte secret key
+ *
+ * \return         0
+ */
+int mbedtls_des3_set2key_dec( mbedtls_des3_context *ctx,
+                      const unsigned char key[MBEDTLS_DES_KEY_SIZE * 2] );
+
+/**
+ * \brief          Triple-DES key schedule (168-bit, encryption)
+ *
+ * \param ctx      3DES context to be initialized
+ * \param key      24-byte secret key
+ *
+ * \return         0
+ */
+int mbedtls_des3_set3key_enc( mbedtls_des3_context *ctx,
+                      const unsigned char key[MBEDTLS_DES_KEY_SIZE * 3] );
+
+/**
+ * \brief          Triple-DES key schedule (168-bit, decryption)
+ *
+ * \param ctx      3DES context to be initialized
+ * \param key      24-byte secret key
+ *
+ * \return         0
+ */
+int mbedtls_des3_set3key_dec( mbedtls_des3_context *ctx,
+                      const unsigned char key[MBEDTLS_DES_KEY_SIZE * 3] );
+
+/**
+ * \brief          DES-ECB block encryption/decryption
+ *
+ * \param ctx      DES context
+ * \param input    64-bit input block
+ * \param output   64-bit output block
+ *
+ * \return         0 if successful
+ *
+ * \warning        DES is considered a weak cipher and its use constitutes a
+ *                 security risk. We recommend considering stronger ciphers
+ *                 instead.
+ */
+int mbedtls_des_crypt_ecb( mbedtls_des_context *ctx,
+                    const unsigned char input[8],
+                    unsigned char output[8] );
+
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+/**
+ * \brief          DES-CBC buffer encryption/decryption
+ *
+ * \note           Upon exit, the content of the IV is updated so that you can
+ *                 call the function same function again on the following
+ *                 block(s) of data and get the same result as if it was
+ *                 encrypted in one call. This allows a "streaming" usage.
+ *                 If on the other hand you need to retain the contents of the
+ *                 IV, you should either save it manually or use the cipher
+ *                 module instead.
+ *
+ * \param ctx      DES context
+ * \param mode     MBEDTLS_DES_ENCRYPT or MBEDTLS_DES_DECRYPT
+ * \param length   length of the input data
+ * \param iv       initialization vector (updated after use)
+ * \param input    buffer holding the input data
+ * \param output   buffer holding the output data
+ *
+ * \warning        DES is considered a weak cipher and its use constitutes a
+ *                 security risk. We recommend considering stronger ciphers
+ *                 instead.
+ */
+int mbedtls_des_crypt_cbc( mbedtls_des_context *ctx,
+                    int mode,
+                    size_t length,
+                    unsigned char iv[8],
+                    const unsigned char *input,
+                    unsigned char *output );
+#endif /* MBEDTLS_CIPHER_MODE_CBC */
+
+/**
+ * \brief          3DES-ECB block encryption/decryption
+ *
+ * \param ctx      3DES context
+ * \param input    64-bit input block
+ * \param output   64-bit output block
+ *
+ * \return         0 if successful
+ */
+int mbedtls_des3_crypt_ecb( mbedtls_des3_context *ctx,
+                     const unsigned char input[8],
+                     unsigned char output[8] );
+
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
+/**
+ * \brief          3DES-CBC buffer encryption/decryption
+ *
+ * \note           Upon exit, the content of the IV is updated so that you can
+ *                 call the function same function again on the following
+ *                 block(s) of data and get the same result as if it was
+ *                 encrypted in one call. This allows a "streaming" usage.
+ *                 If on the other hand you need to retain the contents of the
+ *                 IV, you should either save it manually or use the cipher
+ *                 module instead.
+ *
+ * \param ctx      3DES context
+ * \param mode     MBEDTLS_DES_ENCRYPT or MBEDTLS_DES_DECRYPT
+ * \param length   length of the input data
+ * \param iv       initialization vector (updated after use)
+ * \param input    buffer holding the input data
+ * \param output   buffer holding the output data
+ *
+ * \return         0 if successful, or MBEDTLS_ERR_DES_INVALID_INPUT_LENGTH
+ */
+int mbedtls_des3_crypt_cbc( mbedtls_des3_context *ctx,
+                     int mode,
+                     size_t length,
+                     unsigned char iv[8],
+                     const unsigned char *input,
+                     unsigned char *output );
+#endif /* MBEDTLS_CIPHER_MODE_CBC */
+
+/**
+ * \brief          Internal function for key expansion.
+ *                 (Only exposed to allow overriding it,
+ *                 see MBEDTLS_DES_SETKEY_ALT)
+ *
+ * \param SK       Round keys
+ * \param key      Base key
+ *
+ * \warning        DES is considered a weak cipher and its use constitutes a
+ *                 security risk. We recommend considering stronger ciphers
+ *                 instead.
+ */
+void mbedtls_des_setkey( uint32_t SK[32],
+                         const unsigned char key[MBEDTLS_DES_KEY_SIZE] );
+
+/**
+ * \brief          Checkup routine
+ *
+ * \return         0 if successful, or 1 if the test failed
+ */
+int mbedtls_des_self_test( int verbose );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* des.h */
diff --git a/common/mbedtls/ecdsa.c b/common/mbedtls/ecdsa.c
new file mode 100644
index 000000000..e97e6cb43
--- /dev/null
+++ b/common/mbedtls/ecdsa.c
@@ -0,0 +1,463 @@
+/*
+ *  Elliptic curve DSA
+ *
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+
+/*
+ * References:
+ *
+ * SEC1 http://www.secg.org/index.php?action=secg,docs_secg
+ */
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "mbedtls/config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#if defined(MBEDTLS_ECDSA_C)
+
+#include "mbedtls/ecdsa.h"
+#include "mbedtls/asn1write.h"
+
+#include <string.h>
+
+#if defined(MBEDTLS_ECDSA_DETERMINISTIC)
+#include "mbedtls/hmac_drbg.h"
+#endif
+
+/*
+ * Derive a suitable integer for group grp from a buffer of length len
+ * SEC1 4.1.3 step 5 aka SEC1 4.1.4 step 3
+ */
+static int derive_mpi( const mbedtls_ecp_group *grp, mbedtls_mpi *x,
+                       const unsigned char *buf, size_t blen )
+{
+    int ret;
+    size_t n_size = ( grp->nbits + 7 ) / 8;
+    size_t use_size = blen > n_size ? n_size : blen;
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_read_binary( x, buf, use_size ) );
+    if( use_size * 8 > grp->nbits )
+        MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( x, use_size * 8 - grp->nbits ) );
+
+    /* While at it, reduce modulo N */
+    if( mbedtls_mpi_cmp_mpi( x, &grp->N ) >= 0 )
+        MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( x, x, &grp->N ) );
+
+cleanup:
+    return( ret );
+}
+
+#if !defined(MBEDTLS_ECDSA_SIGN_ALT)
+/*
+ * Compute ECDSA signature of a hashed message (SEC1 4.1.3)
+ * Obviously, compared to SEC1 4.1.3, we skip step 4 (hash message)
+ */
+int mbedtls_ecdsa_sign( mbedtls_ecp_group *grp, mbedtls_mpi *r, mbedtls_mpi *s,
+                const mbedtls_mpi *d, const unsigned char *buf, size_t blen,
+                int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
+{
+    int ret, key_tries, sign_tries, blind_tries;
+    mbedtls_ecp_point R;
+    mbedtls_mpi k, e, t;
+
+    /* Fail cleanly on curves such as Curve25519 that can't be used for ECDSA */
+    if( grp->N.p == NULL )
+        return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
+
+    /* Make sure d is in range 1..n-1 */
+    if( mbedtls_mpi_cmp_int( d, 1 ) < 0 || mbedtls_mpi_cmp_mpi( d, &grp->N ) >= 0 )
+        return( MBEDTLS_ERR_ECP_INVALID_KEY );
+
+    mbedtls_ecp_point_init( &R );
+    mbedtls_mpi_init( &k ); mbedtls_mpi_init( &e ); mbedtls_mpi_init( &t );
+
+    sign_tries = 0;
+    do
+    {
+        /*
+         * Steps 1-3: generate a suitable ephemeral keypair
+         * and set r = xR mod n
+         */
+        key_tries = 0;
+        do
+        {
+            MBEDTLS_MPI_CHK( mbedtls_ecp_gen_keypair( grp, &k, &R, f_rng, p_rng ) );
+            MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi( r, &R.X, &grp->N ) );
+
+            if( key_tries++ > 10 )
+            {
+                ret = MBEDTLS_ERR_ECP_RANDOM_FAILED;
+                goto cleanup;
+            }
+        }
+        while( mbedtls_mpi_cmp_int( r, 0 ) == 0 );
+
+        /*
+         * Step 5: derive MPI from hashed message
+         */
+        MBEDTLS_MPI_CHK( derive_mpi( grp, &e, buf, blen ) );
+
+        /*
+         * Generate a random value to blind inv_mod in next step,
+         * avoiding a potential timing leak.
+         */
+        blind_tries = 0;
+        do
+        {
+            size_t n_size = ( grp->nbits + 7 ) / 8;
+            MBEDTLS_MPI_CHK( mbedtls_mpi_fill_random( &t, n_size, f_rng, p_rng ) );
+            MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &t, 8 * n_size - grp->nbits ) );
+
+            /* See mbedtls_ecp_gen_keypair() */
+            if( ++blind_tries > 30 )
+                return( MBEDTLS_ERR_ECP_RANDOM_FAILED );
+        }
+        while( mbedtls_mpi_cmp_int( &t, 1 ) < 0 ||
+               mbedtls_mpi_cmp_mpi( &t, &grp->N ) >= 0 );
+
+        /*
+         * Step 6: compute s = (e + r * d) / k = t (e + rd) / (kt) mod n
+         */
+        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( s, r, d ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_add_mpi( &e, &e, s ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &e, &e, &t ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &k, &k, &t ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_inv_mod( s, &k, &grp->N ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( s, s, &e ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi( s, s, &grp->N ) );
+
+        if( sign_tries++ > 10 )
+        {
+            ret = MBEDTLS_ERR_ECP_RANDOM_FAILED;
+            goto cleanup;
+        }
+    }
+    while( mbedtls_mpi_cmp_int( s, 0 ) == 0 );
+
+cleanup:
+    mbedtls_ecp_point_free( &R );
+    mbedtls_mpi_free( &k ); mbedtls_mpi_free( &e ); mbedtls_mpi_free( &t );
+
+    return( ret );
+}
+#endif /* MBEDTLS_ECDSA_SIGN_ALT */
+
+#if defined(MBEDTLS_ECDSA_DETERMINISTIC)
+/*
+ * Deterministic signature wrapper
+ */
+int mbedtls_ecdsa_sign_det( mbedtls_ecp_group *grp, mbedtls_mpi *r, mbedtls_mpi *s,
+                    const mbedtls_mpi *d, const unsigned char *buf, size_t blen,
+                    mbedtls_md_type_t md_alg )
+{
+    int ret;
+    mbedtls_hmac_drbg_context rng_ctx;
+    unsigned char data[2 * MBEDTLS_ECP_MAX_BYTES];
+    size_t grp_len = ( grp->nbits + 7 ) / 8;
+    const mbedtls_md_info_t *md_info;
+    mbedtls_mpi h;
+
+    if( ( md_info = mbedtls_md_info_from_type( md_alg ) ) == NULL )
+        return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
+
+    mbedtls_mpi_init( &h );
+    mbedtls_hmac_drbg_init( &rng_ctx );
+
+    /* Use private key and message hash (reduced) to initialize HMAC_DRBG */
+    MBEDTLS_MPI_CHK( mbedtls_mpi_write_binary( d, data, grp_len ) );
+    MBEDTLS_MPI_CHK( derive_mpi( grp, &h, buf, blen ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_write_binary( &h, data + grp_len, grp_len ) );
+    mbedtls_hmac_drbg_seed_buf( &rng_ctx, md_info, data, 2 * grp_len );
+
+    ret = mbedtls_ecdsa_sign( grp, r, s, d, buf, blen,
+                      mbedtls_hmac_drbg_random, &rng_ctx );
+
+cleanup:
+    mbedtls_hmac_drbg_free( &rng_ctx );
+    mbedtls_mpi_free( &h );
+
+    return( ret );
+}
+#endif /* MBEDTLS_ECDSA_DETERMINISTIC */
+
+#if !defined(MBEDTLS_ECDSA_VERIFY_ALT)
+/*
+ * Verify ECDSA signature of hashed message (SEC1 4.1.4)
+ * Obviously, compared to SEC1 4.1.3, we skip step 2 (hash message)
+ */
+int mbedtls_ecdsa_verify( mbedtls_ecp_group *grp,
+                  const unsigned char *buf, size_t blen,
+                  const mbedtls_ecp_point *Q, const mbedtls_mpi *r, const mbedtls_mpi *s)
+{
+    int ret;
+    mbedtls_mpi e, s_inv, u1, u2;
+    mbedtls_ecp_point R;
+
+    mbedtls_ecp_point_init( &R );
+    mbedtls_mpi_init( &e ); mbedtls_mpi_init( &s_inv ); mbedtls_mpi_init( &u1 ); mbedtls_mpi_init( &u2 );
+
+    /* Fail cleanly on curves such as Curve25519 that can't be used for ECDSA */
+    if( grp->N.p == NULL )
+        return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
+
+    /*
+     * Step 1: make sure r and s are in range 1..n-1
+     */
+    if( mbedtls_mpi_cmp_int( r, 1 ) < 0 || mbedtls_mpi_cmp_mpi( r, &grp->N ) >= 0 ||
+        mbedtls_mpi_cmp_int( s, 1 ) < 0 || mbedtls_mpi_cmp_mpi( s, &grp->N ) >= 0 )
+    {
+        ret = MBEDTLS_ERR_ECP_VERIFY_FAILED;
+        goto cleanup;
+    }
+
+    /*
+     * Additional precaution: make sure Q is valid
+     */
+    MBEDTLS_MPI_CHK( mbedtls_ecp_check_pubkey( grp, Q ) );
+
+    /*
+     * Step 3: derive MPI from hashed message
+     */
+    MBEDTLS_MPI_CHK( derive_mpi( grp, &e, buf, blen ) );
+
+    /*
+     * Step 4: u1 = e / s mod n, u2 = r / s mod n
+     */
+    MBEDTLS_MPI_CHK( mbedtls_mpi_inv_mod( &s_inv, s, &grp->N ) );
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &u1, &e, &s_inv ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi( &u1, &u1, &grp->N ) );
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &u2, r, &s_inv ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi( &u2, &u2, &grp->N ) );
+
+    /*
+     * Step 5: R = u1 G + u2 Q
+     *
+     * Since we're not using any secret data, no need to pass a RNG to
+     * mbedtls_ecp_mul() for countermesures.
+     */
+    MBEDTLS_MPI_CHK( mbedtls_ecp_muladd( grp, &R, &u1, &grp->G, &u2, Q ) );
+
+    if( mbedtls_ecp_is_zero( &R ) )
+    {
+        ret = MBEDTLS_ERR_ECP_VERIFY_FAILED;
+        goto cleanup;
+    }
+
+    /*
+     * Step 6: convert xR to an integer (no-op)
+     * Step 7: reduce xR mod n (gives v)
+     */
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi( &R.X, &R.X, &grp->N ) );
+
+    /*
+     * Step 8: check if v (that is, R.X) is equal to r
+     */
+    if( mbedtls_mpi_cmp_mpi( &R.X, r ) != 0 )
+    {
+        ret = MBEDTLS_ERR_ECP_VERIFY_FAILED;
+        goto cleanup;
+    }
+
+cleanup:
+    mbedtls_ecp_point_free( &R );
+    mbedtls_mpi_free( &e ); mbedtls_mpi_free( &s_inv ); mbedtls_mpi_free( &u1 ); mbedtls_mpi_free( &u2 );
+
+    return( ret );
+}
+#endif /* MBEDTLS_ECDSA_VERIFY_ALT */
+
+/*
+ * Convert a signature (given by context) to ASN.1
+ */
+static int ecdsa_signature_to_asn1( const mbedtls_mpi *r, const mbedtls_mpi *s,
+                                    unsigned char *sig, size_t *slen )
+{
+    int ret;
+    unsigned char buf[MBEDTLS_ECDSA_MAX_LEN];
+    unsigned char *p = buf + sizeof( buf );
+    size_t len = 0;
+
+    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_mpi( &p, buf, s ) );
+    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_mpi( &p, buf, r ) );
+
+    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( &p, buf, len ) );
+    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( &p, buf,
+                                       MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) );
+
+    memcpy( sig, p, len );
+    *slen = len;
+
+    return( 0 );
+}
+
+/*
+ * Compute and write signature
+ */
+int mbedtls_ecdsa_write_signature( mbedtls_ecdsa_context *ctx, mbedtls_md_type_t md_alg,
+                           const unsigned char *hash, size_t hlen,
+                           unsigned char *sig, size_t *slen,
+                           int (*f_rng)(void *, unsigned char *, size_t),
+                           void *p_rng )
+{
+    int ret;
+    mbedtls_mpi r, s;
+
+    mbedtls_mpi_init( &r );
+    mbedtls_mpi_init( &s );
+
+#if defined(MBEDTLS_ECDSA_DETERMINISTIC)
+    (void) f_rng;
+    (void) p_rng;
+
+    MBEDTLS_MPI_CHK( mbedtls_ecdsa_sign_det( &ctx->grp, &r, &s, &ctx->d,
+                             hash, hlen, md_alg ) );
+#else
+    (void) md_alg;
+
+    MBEDTLS_MPI_CHK( mbedtls_ecdsa_sign( &ctx->grp, &r, &s, &ctx->d,
+                         hash, hlen, f_rng, p_rng ) );
+#endif
+
+    MBEDTLS_MPI_CHK( ecdsa_signature_to_asn1( &r, &s, sig, slen ) );
+
+cleanup:
+    mbedtls_mpi_free( &r );
+    mbedtls_mpi_free( &s );
+
+    return( ret );
+}
+
+#if ! defined(MBEDTLS_DEPRECATED_REMOVED) && \
+    defined(MBEDTLS_ECDSA_DETERMINISTIC)
+int mbedtls_ecdsa_write_signature_det( mbedtls_ecdsa_context *ctx,
+                               const unsigned char *hash, size_t hlen,
+                               unsigned char *sig, size_t *slen,
+                               mbedtls_md_type_t md_alg )
+{
+    return( mbedtls_ecdsa_write_signature( ctx, md_alg, hash, hlen, sig, slen,
+                                   NULL, NULL ) );
+}
+#endif
+
+/*
+ * Read and check signature
+ */
+int mbedtls_ecdsa_read_signature( mbedtls_ecdsa_context *ctx,
+                          const unsigned char *hash, size_t hlen,
+                          const unsigned char *sig, size_t slen )
+{
+    int ret;
+    unsigned char *p = (unsigned char *) sig;
+    const unsigned char *end = sig + slen;
+    size_t len;
+    mbedtls_mpi r, s;
+
+    mbedtls_mpi_init( &r );
+    mbedtls_mpi_init( &s );
+
+    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len,
+                    MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
+    {
+        ret += MBEDTLS_ERR_ECP_BAD_INPUT_DATA;
+        goto cleanup;
+    }
+
+    if( p + len != end )
+    {
+        ret = MBEDTLS_ERR_ECP_BAD_INPUT_DATA +
+              MBEDTLS_ERR_ASN1_LENGTH_MISMATCH;
+        goto cleanup;
+    }
+
+    if( ( ret = mbedtls_asn1_get_mpi( &p, end, &r ) ) != 0 ||
+        ( ret = mbedtls_asn1_get_mpi( &p, end, &s ) ) != 0 )
+    {
+        ret += MBEDTLS_ERR_ECP_BAD_INPUT_DATA;
+        goto cleanup;
+    }
+
+    if( ( ret = mbedtls_ecdsa_verify( &ctx->grp, hash, hlen,
+                              &ctx->Q, &r, &s ) ) != 0 )
+        goto cleanup;
+
+    /* At this point we know that the buffer starts with a valid signature.
+     * Return 0 if the buffer just contains the signature, and a specific
+     * error code if the valid signature is followed by more data. */
+    if( p != end )
+        ret = MBEDTLS_ERR_ECP_SIG_LEN_MISMATCH;
+
+cleanup:
+    mbedtls_mpi_free( &r );
+    mbedtls_mpi_free( &s );
+
+    return( ret );
+}
+
+#if !defined(MBEDTLS_ECDSA_GENKEY_ALT)
+/*
+ * Generate key pair
+ */
+int mbedtls_ecdsa_genkey( mbedtls_ecdsa_context *ctx, mbedtls_ecp_group_id gid,
+                  int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
+{
+    return( mbedtls_ecp_group_load( &ctx->grp, gid ) ||
+            mbedtls_ecp_gen_keypair( &ctx->grp, &ctx->d, &ctx->Q, f_rng, p_rng ) );
+}
+#endif /* MBEDTLS_ECDSA_GENKEY_ALT */
+
+/*
+ * Set context from an mbedtls_ecp_keypair
+ */
+int mbedtls_ecdsa_from_keypair( mbedtls_ecdsa_context *ctx, const mbedtls_ecp_keypair *key )
+{
+    int ret;
+
+    if( ( ret = mbedtls_ecp_group_copy( &ctx->grp, &key->grp ) ) != 0 ||
+        ( ret = mbedtls_mpi_copy( &ctx->d, &key->d ) ) != 0 ||
+        ( ret = mbedtls_ecp_copy( &ctx->Q, &key->Q ) ) != 0 )
+    {
+        mbedtls_ecdsa_free( ctx );
+    }
+
+    return( ret );
+}
+
+/*
+ * Initialize context
+ */
+void mbedtls_ecdsa_init( mbedtls_ecdsa_context *ctx )
+{
+    mbedtls_ecp_keypair_init( ctx );
+}
+
+/*
+ * Free context
+ */
+void mbedtls_ecdsa_free( mbedtls_ecdsa_context *ctx )
+{
+    mbedtls_ecp_keypair_free( ctx );
+}
+
+#endif /* MBEDTLS_ECDSA_C */
diff --git a/common/mbedtls/ecdsa.h b/common/mbedtls/ecdsa.h
new file mode 100644
index 000000000..a56cc0a54
--- /dev/null
+++ b/common/mbedtls/ecdsa.h
@@ -0,0 +1,341 @@
+/**
+ * \file ecdsa.h
+ *
+ * \brief This file contains ECDSA definitions and functions.
+ *
+ * The Elliptic Curve Digital Signature Algorithm (ECDSA) is defined in
+ * <em>Standards for Efficient Cryptography Group (SECG):
+ * SEC1 Elliptic Curve Cryptography</em>.
+ * The use of ECDSA for TLS is defined in <em>RFC-4492: Elliptic Curve
+ * Cryptography (ECC) Cipher Suites for Transport Layer Security (TLS)</em>.
+ *
+ */
+/*
+ *  Copyright (C) 2006-2018, Arm Limited (or its affiliates), All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of Mbed TLS (https://tls.mbed.org)
+ */
+
+#ifndef MBEDTLS_ECDSA_H
+#define MBEDTLS_ECDSA_H
+
+#include "ecp.h"
+#include "md.h"
+
+/*
+ * RFC-4492 page 20:
+ *
+ *     Ecdsa-Sig-Value ::= SEQUENCE {
+ *         r       INTEGER,
+ *         s       INTEGER
+ *     }
+ *
+ * Size is at most
+ *    1 (tag) + 1 (len) + 1 (initial 0) + ECP_MAX_BYTES for each of r and s,
+ *    twice that + 1 (tag) + 2 (len) for the sequence
+ * (assuming ECP_MAX_BYTES is less than 126 for r and s,
+ * and less than 124 (total len <= 255) for the sequence)
+ */
+#if MBEDTLS_ECP_MAX_BYTES > 124
+#error "MBEDTLS_ECP_MAX_BYTES bigger than expected, please fix MBEDTLS_ECDSA_MAX_LEN"
+#endif
+/** The maximal size of an ECDSA signature in Bytes. */
+#define MBEDTLS_ECDSA_MAX_LEN  ( 3 + 2 * ( 3 + MBEDTLS_ECP_MAX_BYTES ) )
+
+/**
+ * \brief           The ECDSA context structure.
+ */
+typedef mbedtls_ecp_keypair mbedtls_ecdsa_context;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \brief           This function computes the ECDSA signature of a
+ *                  previously-hashed message.
+ *
+ * \note            The deterministic version is usually preferred.
+ *
+ * \note            If the bitlength of the message hash is larger than the
+ *                  bitlength of the group order, then the hash is truncated
+ *                  as defined in <em>Standards for Efficient Cryptography Group
+ *                  (SECG): SEC1 Elliptic Curve Cryptography</em>, section
+ *                  4.1.3, step 5.
+ *
+ * \see             ecp.h
+ *
+ * \param grp       The ECP group.
+ * \param r         The first output integer.
+ * \param s         The second output integer.
+ * \param d         The private signing key.
+ * \param buf       The message hash.
+ * \param blen      The length of \p buf.
+ * \param f_rng     The RNG function.
+ * \param p_rng     The RNG context.
+ *
+ * \return          \c 0 on success.
+ * \return          An \c MBEDTLS_ERR_ECP_XXX
+ *                  or \c MBEDTLS_MPI_XXX error code on failure.
+ */
+int mbedtls_ecdsa_sign( mbedtls_ecp_group *grp, mbedtls_mpi *r, mbedtls_mpi *s,
+                const mbedtls_mpi *d, const unsigned char *buf, size_t blen,
+                int (*f_rng)(void *, unsigned char *, size_t), void *p_rng );
+
+#if defined(MBEDTLS_ECDSA_DETERMINISTIC)
+/**
+ * \brief           This function computes the ECDSA signature of a
+ *                  previously-hashed message, deterministic version.
+ *
+ *                  For more information, see <em>RFC-6979: Deterministic
+ *                  Usage of the Digital Signature Algorithm (DSA) and Elliptic
+ *                  Curve Digital Signature Algorithm (ECDSA)</em>.
+ *
+ * \note            If the bitlength of the message hash is larger than the
+ *                  bitlength of the group order, then the hash is truncated as
+ *                  defined in <em>Standards for Efficient Cryptography Group
+ *                  (SECG): SEC1 Elliptic Curve Cryptography</em>, section
+ *                  4.1.3, step 5.
+ *
+ * \see             ecp.h
+ *
+ * \param grp       The ECP group.
+ * \param r         The first output integer.
+ * \param s         The second output integer.
+ * \param d         The private signing key.
+ * \param buf       The message hash.
+ * \param blen      The length of \p buf.
+ * \param md_alg    The MD algorithm used to hash the message.
+ *
+ * \return          \c 0 on success.
+ * \return          An \c MBEDTLS_ERR_ECP_XXX or \c MBEDTLS_MPI_XXX
+ *                  error code on failure.
+ */
+int mbedtls_ecdsa_sign_det( mbedtls_ecp_group *grp, mbedtls_mpi *r, mbedtls_mpi *s,
+                    const mbedtls_mpi *d, const unsigned char *buf, size_t blen,
+                    mbedtls_md_type_t md_alg );
+#endif /* MBEDTLS_ECDSA_DETERMINISTIC */
+
+/**
+ * \brief           This function verifies the ECDSA signature of a
+ *                  previously-hashed message.
+ *
+ * \note            If the bitlength of the message hash is larger than the
+ *                  bitlength of the group order, then the hash is truncated as
+ *                  defined in <em>Standards for Efficient Cryptography Group
+ *                  (SECG): SEC1 Elliptic Curve Cryptography</em>, section
+ *                  4.1.4, step 3.
+ *
+ * \see             ecp.h
+ *
+ * \param grp       The ECP group.
+ * \param buf       The message hash.
+ * \param blen      The length of \p buf.
+ * \param Q         The public key to use for verification.
+ * \param r         The first integer of the signature.
+ * \param s         The second integer of the signature.
+ *
+ * \return          \c 0 on success.
+ * \return          #MBEDTLS_ERR_ECP_BAD_INPUT_DATA if the signature
+ *                  is invalid.
+ * \return          An \c MBEDTLS_ERR_ECP_XXX or \c MBEDTLS_MPI_XXX
+ *                  error code on failure for any other reason.
+ */
+int mbedtls_ecdsa_verify( mbedtls_ecp_group *grp,
+                  const unsigned char *buf, size_t blen,
+                  const mbedtls_ecp_point *Q, const mbedtls_mpi *r, const mbedtls_mpi *s);
+
+/**
+ * \brief           This function computes the ECDSA signature and writes it
+ *                  to a buffer, serialized as defined in <em>RFC-4492:
+ *                  Elliptic Curve Cryptography (ECC) Cipher Suites for
+ *                  Transport Layer Security (TLS)</em>.
+ *
+ * \warning         It is not thread-safe to use the same context in
+ *                  multiple threads.
+ *
+ * \note            The deterministic version is used if
+ *                  #MBEDTLS_ECDSA_DETERMINISTIC is defined. For more
+ *                  information, see <em>RFC-6979: Deterministic Usage
+ *                  of the Digital Signature Algorithm (DSA) and Elliptic
+ *                  Curve Digital Signature Algorithm (ECDSA)</em>.
+ *
+ * \note            The \p sig buffer must be at least twice as large as the
+ *                  size of the curve used, plus 9. For example, 73 Bytes if
+ *                  a 256-bit curve is used. A buffer length of
+ *                  #MBEDTLS_ECDSA_MAX_LEN is always safe.
+ *
+ * \note            If the bitlength of the message hash is larger than the
+ *                  bitlength of the group order, then the hash is truncated as
+ *                  defined in <em>Standards for Efficient Cryptography Group
+ *                  (SECG): SEC1 Elliptic Curve Cryptography</em>, section
+ *                  4.1.3, step 5.
+ *
+ * \see             ecp.h
+ *
+ * \param ctx       The ECDSA context.
+ * \param md_alg    The message digest that was used to hash the message.
+ * \param hash      The message hash.
+ * \param hlen      The length of the hash.
+ * \param sig       The buffer that holds the signature.
+ * \param slen      The length of the signature written.
+ * \param f_rng     The RNG function.
+ * \param p_rng     The RNG context.
+ *
+ * \return          \c 0 on success.
+ * \return          An \c MBEDTLS_ERR_ECP_XXX, \c MBEDTLS_ERR_MPI_XXX or
+ *                  \c MBEDTLS_ERR_ASN1_XXX error code on failure.
+ */
+int mbedtls_ecdsa_write_signature( mbedtls_ecdsa_context *ctx, mbedtls_md_type_t md_alg,
+                           const unsigned char *hash, size_t hlen,
+                           unsigned char *sig, size_t *slen,
+                           int (*f_rng)(void *, unsigned char *, size_t),
+                           void *p_rng );
+
+#if defined(MBEDTLS_ECDSA_DETERMINISTIC)
+#if ! defined(MBEDTLS_DEPRECATED_REMOVED)
+#if defined(MBEDTLS_DEPRECATED_WARNING)
+#define MBEDTLS_DEPRECATED    __attribute__((deprecated))
+#else
+#define MBEDTLS_DEPRECATED
+#endif
+/**
+ * \brief           This function computes an ECDSA signature and writes
+ *                  it to a buffer, serialized as defined in <em>RFC-4492:
+ *                  Elliptic Curve Cryptography (ECC) Cipher Suites for
+ *                  Transport Layer Security (TLS)</em>.
+ *
+ *                  The deterministic version is defined in <em>RFC-6979:
+ *                  Deterministic Usage of the Digital Signature Algorithm (DSA)
+ *                  and Elliptic Curve Digital Signature Algorithm (ECDSA)</em>.
+ *
+ * \warning         It is not thread-safe to use the same context in
+ *                  multiple threads.
+ *
+ * \note            The \p sig buffer must be at least twice as large as the
+ *                  size of the curve used, plus 9. For example, 73 Bytes if a
+ *                  256-bit curve is used. A buffer length of
+ *                  #MBEDTLS_ECDSA_MAX_LEN is always safe.
+ *
+ * \note            If the bitlength of the message hash is larger than the
+ *                  bitlength of the group order, then the hash is truncated as
+ *                  defined in <em>Standards for Efficient Cryptography Group
+ *                  (SECG): SEC1 Elliptic Curve Cryptography</em>, section
+ *                  4.1.3, step 5.
+ *
+ * \see             ecp.h
+ *
+ * \deprecated      Superseded by mbedtls_ecdsa_write_signature() in
+ *                  Mbed TLS version 2.0 and later.
+ *
+ * \param ctx       The ECDSA context.
+ * \param hash      The message hash.
+ * \param hlen      The length of the hash.
+ * \param sig       The buffer that holds the signature.
+ * \param slen      The length of the signature written.
+ * \param md_alg    The MD algorithm used to hash the message.
+ *
+ * \return          \c 0 on success.
+ * \return          An \c MBEDTLS_ERR_ECP_XXX, \c MBEDTLS_ERR_MPI_XXX or
+ *                  \c MBEDTLS_ERR_ASN1_XXX error code on failure.
+ */
+int mbedtls_ecdsa_write_signature_det( mbedtls_ecdsa_context *ctx,
+                               const unsigned char *hash, size_t hlen,
+                               unsigned char *sig, size_t *slen,
+                               mbedtls_md_type_t md_alg ) MBEDTLS_DEPRECATED;
+#undef MBEDTLS_DEPRECATED
+#endif /* MBEDTLS_DEPRECATED_REMOVED */
+#endif /* MBEDTLS_ECDSA_DETERMINISTIC */
+
+/**
+ * \brief           This function reads and verifies an ECDSA signature.
+ *
+ * \note            If the bitlength of the message hash is larger than the
+ *                  bitlength of the group order, then the hash is truncated as
+ *                  defined in <em>Standards for Efficient Cryptography Group
+ *                  (SECG): SEC1 Elliptic Curve Cryptography</em>, section
+ *                  4.1.4, step 3.
+ *
+ * \see             ecp.h
+ *
+ * \param ctx       The ECDSA context.
+ * \param hash      The message hash.
+ * \param hlen      The size of the hash.
+ * \param sig       The signature to read and verify.
+ * \param slen      The size of \p sig.
+ *
+ * \return          \c 0 on success.
+ * \return          #MBEDTLS_ERR_ECP_BAD_INPUT_DATA if signature is invalid.
+ * \return          #MBEDTLS_ERR_ECP_SIG_LEN_MISMATCH if there is a valid
+ *                  signature in \p sig, but its length is less than \p siglen.
+ * \return          An \c MBEDTLS_ERR_ECP_XXX or \c MBEDTLS_ERR_MPI_XXX
+ *                  error code on failure for any other reason.
+ */
+int mbedtls_ecdsa_read_signature( mbedtls_ecdsa_context *ctx,
+                          const unsigned char *hash, size_t hlen,
+                          const unsigned char *sig, size_t slen );
+
+/**
+ * \brief          This function generates an ECDSA keypair on the given curve.
+ *
+ * \see            ecp.h
+ *
+ * \param ctx      The ECDSA context to store the keypair in.
+ * \param gid      The elliptic curve to use. One of the various
+ *                 \c MBEDTLS_ECP_DP_XXX macros depending on configuration.
+ * \param f_rng    The RNG function.
+ * \param p_rng    The RNG context.
+ *
+ * \return         \c 0 on success.
+ * \return         An \c MBEDTLS_ERR_ECP_XXX code on failure.
+ */
+int mbedtls_ecdsa_genkey( mbedtls_ecdsa_context *ctx, mbedtls_ecp_group_id gid,
+                  int (*f_rng)(void *, unsigned char *, size_t), void *p_rng );
+
+/**
+ * \brief           This function sets an ECDSA context from an EC key pair.
+ *
+ * \see             ecp.h
+ *
+ * \param ctx       The ECDSA context to set.
+ * \param key       The EC key to use.
+ *
+ * \return          \c 0 on success.
+ * \return          An \c MBEDTLS_ERR_ECP_XXX code on failure.
+ */
+int mbedtls_ecdsa_from_keypair( mbedtls_ecdsa_context *ctx, const mbedtls_ecp_keypair *key );
+
+/**
+ * \brief           This function initializes an ECDSA context.
+ *
+ * \param ctx       The ECDSA context to initialize.
+ */
+void mbedtls_ecdsa_init( mbedtls_ecdsa_context *ctx );
+
+/**
+ * \brief           This function frees an ECDSA context.
+ *
+ * \param ctx       The ECDSA context to free.
+ */
+void mbedtls_ecdsa_free( mbedtls_ecdsa_context *ctx );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ecdsa.h */
diff --git a/common/mbedtls/ecp.c b/common/mbedtls/ecp.c
new file mode 100644
index 000000000..028c7fe30
--- /dev/null
+++ b/common/mbedtls/ecp.c
@@ -0,0 +1,2209 @@
+/*
+ *  Elliptic curves over GF(p): generic functions
+ *
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+
+/*
+ * References:
+ *
+ * SEC1 http://www.secg.org/index.php?action=secg,docs_secg
+ * GECC = Guide to Elliptic Curve Cryptography - Hankerson, Menezes, Vanstone
+ * FIPS 186-3 http://csrc.nist.gov/publications/fips/fips186-3/fips_186-3.pdf
+ * RFC 4492 for the related TLS structures and constants
+ * RFC 7748 for the Curve448 and Curve25519 curve definitions
+ *
+ * [Curve25519] http://cr.yp.to/ecdh/curve25519-20060209.pdf
+ *
+ * [2] CORON, Jean-S'ebastien. Resistance against differential power analysis
+ *     for elliptic curve cryptosystems. In : Cryptographic Hardware and
+ *     Embedded Systems. Springer Berlin Heidelberg, 1999. p. 292-302.
+ *     <http://link.springer.com/chapter/10.1007/3-540-48059-5_25>
+ *
+ * [3] HEDABOU, Mustapha, PINEL, Pierre, et B'EN'ETEAU, Lucien. A comb method to
+ *     render ECC resistant against Side Channel Attacks. IACR Cryptology
+ *     ePrint Archive, 2004, vol. 2004, p. 342.
+ *     <http://eprint.iacr.org/2004/342.pdf>
+ */
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "mbedtls/config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#if defined(MBEDTLS_ECP_C)
+
+#include "mbedtls/ecp.h"
+#include "mbedtls/threading.h"
+#include "mbedtls/platform_util.h"
+
+#include <string.h>
+
+#if !defined(MBEDTLS_ECP_ALT)
+
+#if defined(MBEDTLS_PLATFORM_C)
+#include "mbedtls/platform.h"
+#else
+#include <stdlib.h>
+#include <stdio.h>
+#define mbedtls_printf     printf
+#define mbedtls_calloc    calloc
+#define mbedtls_free       free
+#endif
+
+#include "mbedtls/ecp_internal.h"
+
+#if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && \
+    !defined(inline) && !defined(__cplusplus)
+#define inline __inline
+#endif
+
+#if defined(MBEDTLS_SELF_TEST)
+/*
+ * Counts of point addition and doubling, and field multiplications.
+ * Used to test resistance of point multiplication to simple timing attacks.
+ */
+static unsigned long add_count, dbl_count, mul_count;
+#endif
+
+#if defined(MBEDTLS_ECP_DP_SECP192R1_ENABLED) ||   \
+    defined(MBEDTLS_ECP_DP_SECP224R1_ENABLED) ||   \
+    defined(MBEDTLS_ECP_DP_SECP256R1_ENABLED) ||   \
+    defined(MBEDTLS_ECP_DP_SECP384R1_ENABLED) ||   \
+    defined(MBEDTLS_ECP_DP_SECP521R1_ENABLED) ||   \
+    defined(MBEDTLS_ECP_DP_BP256R1_ENABLED)   ||   \
+    defined(MBEDTLS_ECP_DP_BP384R1_ENABLED)   ||   \
+    defined(MBEDTLS_ECP_DP_BP512R1_ENABLED)   ||   \
+    defined(MBEDTLS_ECP_DP_SECP192K1_ENABLED) ||   \
+    defined(MBEDTLS_ECP_DP_SECP224K1_ENABLED) ||   \
+    defined(MBEDTLS_ECP_DP_SECP256K1_ENABLED)
+#define ECP_SHORTWEIERSTRASS
+#endif
+
+#if defined(MBEDTLS_ECP_DP_CURVE25519_ENABLED) || \
+    defined(MBEDTLS_ECP_DP_CURVE448_ENABLED)
+#define ECP_MONTGOMERY
+#endif
+
+/*
+ * Curve types: internal for now, might be exposed later
+ */
+typedef enum
+{
+    ECP_TYPE_NONE = 0,
+    ECP_TYPE_SHORT_WEIERSTRASS,    /* y^2 = x^3 + a x + b      */
+    ECP_TYPE_MONTGOMERY,           /* y^2 = x^3 + a x^2 + x    */
+} ecp_curve_type;
+
+/*
+ * List of supported curves:
+ *  - internal ID
+ *  - TLS NamedCurve ID (RFC 4492 sec. 5.1.1, RFC 7071 sec. 2)
+ *  - size in bits
+ *  - readable name
+ *
+ * Curves are listed in order: largest curves first, and for a given size,
+ * fastest curves first. This provides the default order for the SSL module.
+ *
+ * Reminder: update profiles in x509_crt.c when adding a new curves!
+ */
+static const mbedtls_ecp_curve_info ecp_supported_curves[] =
+{
+#if defined(MBEDTLS_ECP_DP_SECP521R1_ENABLED)
+    { MBEDTLS_ECP_DP_SECP521R1,    25,     521,    "secp521r1"         },
+#endif
+#if defined(MBEDTLS_ECP_DP_BP512R1_ENABLED)
+    { MBEDTLS_ECP_DP_BP512R1,      28,     512,    "brainpoolP512r1"   },
+#endif
+#if defined(MBEDTLS_ECP_DP_SECP384R1_ENABLED)
+    { MBEDTLS_ECP_DP_SECP384R1,    24,     384,    "secp384r1"         },
+#endif
+#if defined(MBEDTLS_ECP_DP_BP384R1_ENABLED)
+    { MBEDTLS_ECP_DP_BP384R1,      27,     384,    "brainpoolP384r1"   },
+#endif
+#if defined(MBEDTLS_ECP_DP_SECP256R1_ENABLED)
+    { MBEDTLS_ECP_DP_SECP256R1,    23,     256,    "secp256r1"         },
+#endif
+#if defined(MBEDTLS_ECP_DP_SECP256K1_ENABLED)
+    { MBEDTLS_ECP_DP_SECP256K1,    22,     256,    "secp256k1"         },
+#endif
+#if defined(MBEDTLS_ECP_DP_BP256R1_ENABLED)
+    { MBEDTLS_ECP_DP_BP256R1,      26,     256,    "brainpoolP256r1"   },
+#endif
+#if defined(MBEDTLS_ECP_DP_SECP224R1_ENABLED)
+    { MBEDTLS_ECP_DP_SECP224R1,    21,     224,    "secp224r1"         },
+#endif
+#if defined(MBEDTLS_ECP_DP_SECP224K1_ENABLED)
+    { MBEDTLS_ECP_DP_SECP224K1,    20,     224,    "secp224k1"         },
+#endif
+#if defined(MBEDTLS_ECP_DP_SECP192R1_ENABLED)
+    { MBEDTLS_ECP_DP_SECP192R1,    19,     192,    "secp192r1"         },
+#endif
+#if defined(MBEDTLS_ECP_DP_SECP192K1_ENABLED)
+    { MBEDTLS_ECP_DP_SECP192K1,    18,     192,    "secp192k1"         },
+#endif
+    { MBEDTLS_ECP_DP_NONE,          0,     0,      NULL                },
+};
+
+#define ECP_NB_CURVES   sizeof( ecp_supported_curves ) /    \
+                        sizeof( ecp_supported_curves[0] )
+
+static mbedtls_ecp_group_id ecp_supported_grp_id[ECP_NB_CURVES];
+
+/*
+ * List of supported curves and associated info
+ */
+const mbedtls_ecp_curve_info *mbedtls_ecp_curve_list( void )
+{
+    return( ecp_supported_curves );
+}
+
+/*
+ * List of supported curves, group ID only
+ */
+const mbedtls_ecp_group_id *mbedtls_ecp_grp_id_list( void )
+{
+    static int init_done = 0;
+
+    if( ! init_done )
+    {
+        size_t i = 0;
+        const mbedtls_ecp_curve_info *curve_info;
+
+        for( curve_info = mbedtls_ecp_curve_list();
+             curve_info->grp_id != MBEDTLS_ECP_DP_NONE;
+             curve_info++ )
+        {
+            ecp_supported_grp_id[i++] = curve_info->grp_id;
+        }
+        ecp_supported_grp_id[i] = MBEDTLS_ECP_DP_NONE;
+
+        init_done = 1;
+    }
+
+    return( ecp_supported_grp_id );
+}
+
+/*
+ * Get the curve info for the internal identifier
+ */
+const mbedtls_ecp_curve_info *mbedtls_ecp_curve_info_from_grp_id( mbedtls_ecp_group_id grp_id )
+{
+    const mbedtls_ecp_curve_info *curve_info;
+
+    for( curve_info = mbedtls_ecp_curve_list();
+         curve_info->grp_id != MBEDTLS_ECP_DP_NONE;
+         curve_info++ )
+    {
+        if( curve_info->grp_id == grp_id )
+            return( curve_info );
+    }
+
+    return( NULL );
+}
+
+/*
+ * Get the curve info from the TLS identifier
+ */
+const mbedtls_ecp_curve_info *mbedtls_ecp_curve_info_from_tls_id( uint16_t tls_id )
+{
+    const mbedtls_ecp_curve_info *curve_info;
+
+    for( curve_info = mbedtls_ecp_curve_list();
+         curve_info->grp_id != MBEDTLS_ECP_DP_NONE;
+         curve_info++ )
+    {
+        if( curve_info->tls_id == tls_id )
+            return( curve_info );
+    }
+
+    return( NULL );
+}
+
+/*
+ * Get the curve info from the name
+ */
+const mbedtls_ecp_curve_info *mbedtls_ecp_curve_info_from_name( const char *name )
+{
+    const mbedtls_ecp_curve_info *curve_info;
+
+    for( curve_info = mbedtls_ecp_curve_list();
+         curve_info->grp_id != MBEDTLS_ECP_DP_NONE;
+         curve_info++ )
+    {
+        if( strcmp( curve_info->name, name ) == 0 )
+            return( curve_info );
+    }
+
+    return( NULL );
+}
+
+/*
+ * Get the type of a curve
+ */
+static inline ecp_curve_type ecp_get_type( const mbedtls_ecp_group *grp )
+{
+    if( grp->G.X.p == NULL )
+        return( ECP_TYPE_NONE );
+
+    if( grp->G.Y.p == NULL )
+        return( ECP_TYPE_MONTGOMERY );
+    else
+        return( ECP_TYPE_SHORT_WEIERSTRASS );
+}
+
+/*
+ * Initialize (the components of) a point
+ */
+void mbedtls_ecp_point_init( mbedtls_ecp_point *pt )
+{
+    if( pt == NULL )
+        return;
+
+    mbedtls_mpi_init( &pt->X );
+    mbedtls_mpi_init( &pt->Y );
+    mbedtls_mpi_init( &pt->Z );
+}
+
+/*
+ * Initialize (the components of) a group
+ */
+void mbedtls_ecp_group_init( mbedtls_ecp_group *grp )
+{
+    if( grp == NULL )
+        return;
+
+    memset( grp, 0, sizeof( mbedtls_ecp_group ) );
+}
+
+/*
+ * Initialize (the components of) a key pair
+ */
+void mbedtls_ecp_keypair_init( mbedtls_ecp_keypair *key )
+{
+    if( key == NULL )
+        return;
+
+    mbedtls_ecp_group_init( &key->grp );
+    mbedtls_mpi_init( &key->d );
+    mbedtls_ecp_point_init( &key->Q );
+}
+
+/*
+ * Unallocate (the components of) a point
+ */
+void mbedtls_ecp_point_free( mbedtls_ecp_point *pt )
+{
+    if( pt == NULL )
+        return;
+
+    mbedtls_mpi_free( &( pt->X ) );
+    mbedtls_mpi_free( &( pt->Y ) );
+    mbedtls_mpi_free( &( pt->Z ) );
+}
+
+/*
+ * Unallocate (the components of) a group
+ */
+void mbedtls_ecp_group_free( mbedtls_ecp_group *grp )
+{
+    size_t i;
+
+    if( grp == NULL )
+        return;
+
+    if( grp->h != 1 )
+    {
+        mbedtls_mpi_free( &grp->P );
+        mbedtls_mpi_free( &grp->A );
+        mbedtls_mpi_free( &grp->B );
+        mbedtls_ecp_point_free( &grp->G );
+        mbedtls_mpi_free( &grp->N );
+    }
+
+    if( grp->T != NULL )
+    {
+        for( i = 0; i < grp->T_size; i++ )
+            mbedtls_ecp_point_free( &grp->T[i] );
+        mbedtls_free( grp->T );
+    }
+
+    mbedtls_platform_zeroize( grp, sizeof( mbedtls_ecp_group ) );
+}
+
+/*
+ * Unallocate (the components of) a key pair
+ */
+void mbedtls_ecp_keypair_free( mbedtls_ecp_keypair *key )
+{
+    if( key == NULL )
+        return;
+
+    mbedtls_ecp_group_free( &key->grp );
+    mbedtls_mpi_free( &key->d );
+    mbedtls_ecp_point_free( &key->Q );
+}
+
+/*
+ * Copy the contents of a point
+ */
+int mbedtls_ecp_copy( mbedtls_ecp_point *P, const mbedtls_ecp_point *Q )
+{
+    int ret;
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &P->X, &Q->X ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &P->Y, &Q->Y ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &P->Z, &Q->Z ) );
+
+cleanup:
+    return( ret );
+}
+
+/*
+ * Copy the contents of a group object
+ */
+int mbedtls_ecp_group_copy( mbedtls_ecp_group *dst, const mbedtls_ecp_group *src )
+{
+    return mbedtls_ecp_group_load( dst, src->id );
+}
+
+/*
+ * Set point to zero
+ */
+int mbedtls_ecp_set_zero( mbedtls_ecp_point *pt )
+{
+    int ret;
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &pt->X , 1 ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &pt->Y , 1 ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &pt->Z , 0 ) );
+
+cleanup:
+    return( ret );
+}
+
+/*
+ * Tell if a point is zero
+ */
+int mbedtls_ecp_is_zero( mbedtls_ecp_point *pt )
+{
+    return( mbedtls_mpi_cmp_int( &pt->Z, 0 ) == 0 );
+}
+
+/*
+ * Compare two points lazyly
+ */
+int mbedtls_ecp_point_cmp( const mbedtls_ecp_point *P,
+                           const mbedtls_ecp_point *Q )
+{
+    if( mbedtls_mpi_cmp_mpi( &P->X, &Q->X ) == 0 &&
+        mbedtls_mpi_cmp_mpi( &P->Y, &Q->Y ) == 0 &&
+        mbedtls_mpi_cmp_mpi( &P->Z, &Q->Z ) == 0 )
+    {
+        return( 0 );
+    }
+
+    return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
+}
+
+/*
+ * Import a non-zero point from ASCII strings
+ */
+int mbedtls_ecp_point_read_string( mbedtls_ecp_point *P, int radix,
+                           const char *x, const char *y )
+{
+    int ret;
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_read_string( &P->X, radix, x ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_read_string( &P->Y, radix, y ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &P->Z, 1 ) );
+
+cleanup:
+    return( ret );
+}
+
+/*
+ * Export a point into unsigned binary data (SEC1 2.3.3)
+ */
+int mbedtls_ecp_point_write_binary( const mbedtls_ecp_group *grp, const mbedtls_ecp_point *P,
+                            int format, size_t *olen,
+                            unsigned char *buf, size_t buflen )
+{
+    int ret = 0;
+    size_t plen;
+
+    if( format != MBEDTLS_ECP_PF_UNCOMPRESSED &&
+        format != MBEDTLS_ECP_PF_COMPRESSED )
+        return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
+
+    /*
+     * Common case: P == 0
+     */
+    if( mbedtls_mpi_cmp_int( &P->Z, 0 ) == 0 )
+    {
+        if( buflen < 1 )
+            return( MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL );
+
+        buf[0] = 0x00;
+        *olen = 1;
+
+        return( 0 );
+    }
+
+    plen = mbedtls_mpi_size( &grp->P );
+
+    if( format == MBEDTLS_ECP_PF_UNCOMPRESSED )
+    {
+        *olen = 2 * plen + 1;
+
+        if( buflen < *olen )
+            return( MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL );
+
+        buf[0] = 0x04;
+        MBEDTLS_MPI_CHK( mbedtls_mpi_write_binary( &P->X, buf + 1, plen ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_write_binary( &P->Y, buf + 1 + plen, plen ) );
+    }
+    else if( format == MBEDTLS_ECP_PF_COMPRESSED )
+    {
+        *olen = plen + 1;
+
+        if( buflen < *olen )
+            return( MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL );
+
+        buf[0] = 0x02 + mbedtls_mpi_get_bit( &P->Y, 0 );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_write_binary( &P->X, buf + 1, plen ) );
+    }
+
+cleanup:
+    return( ret );
+}
+
+/*
+ * Import a point from unsigned binary data (SEC1 2.3.4)
+ */
+int mbedtls_ecp_point_read_binary( const mbedtls_ecp_group *grp, mbedtls_ecp_point *pt,
+                           const unsigned char *buf, size_t ilen )
+{
+    int ret;
+    size_t plen;
+
+    if( ilen < 1 )
+        return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
+
+    if( buf[0] == 0x00 )
+    {
+        if( ilen == 1 )
+            return( mbedtls_ecp_set_zero( pt ) );
+        else
+            return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
+    }
+
+    plen = mbedtls_mpi_size( &grp->P );
+
+    if( buf[0] != 0x04 )
+        return( MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE );
+
+    if( ilen != 2 * plen + 1 )
+        return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_read_binary( &pt->X, buf + 1, plen ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_read_binary( &pt->Y, buf + 1 + plen, plen ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &pt->Z, 1 ) );
+
+cleanup:
+    return( ret );
+}
+
+/*
+ * Import a point from a TLS ECPoint record (RFC 4492)
+ *      struct {
+ *          opaque point <1..2^8-1>;
+ *      } ECPoint;
+ */
+int mbedtls_ecp_tls_read_point( const mbedtls_ecp_group *grp, mbedtls_ecp_point *pt,
+                        const unsigned char **buf, size_t buf_len )
+{
+    unsigned char data_len;
+    const unsigned char *buf_start;
+
+    /*
+     * We must have at least two bytes (1 for length, at least one for data)
+     */
+    if( buf_len < 2 )
+        return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
+
+    data_len = *(*buf)++;
+    if( data_len < 1 || data_len > buf_len - 1 )
+        return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
+
+    /*
+     * Save buffer start for read_binary and update buf
+     */
+    buf_start = *buf;
+    *buf += data_len;
+
+    return mbedtls_ecp_point_read_binary( grp, pt, buf_start, data_len );
+}
+
+/*
+ * Export a point as a TLS ECPoint record (RFC 4492)
+ *      struct {
+ *          opaque point <1..2^8-1>;
+ *      } ECPoint;
+ */
+int mbedtls_ecp_tls_write_point( const mbedtls_ecp_group *grp, const mbedtls_ecp_point *pt,
+                         int format, size_t *olen,
+                         unsigned char *buf, size_t blen )
+{
+    int ret;
+
+    /*
+     * buffer length must be at least one, for our length byte
+     */
+    if( blen < 1 )
+        return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
+
+    if( ( ret = mbedtls_ecp_point_write_binary( grp, pt, format,
+                    olen, buf + 1, blen - 1) ) != 0 )
+        return( ret );
+
+    /*
+     * write length to the first byte and update total length
+     */
+    buf[0] = (unsigned char) *olen;
+    ++*olen;
+
+    return( 0 );
+}
+
+/*
+ * Set a group from an ECParameters record (RFC 4492)
+ */
+int mbedtls_ecp_tls_read_group( mbedtls_ecp_group *grp, const unsigned char **buf, size_t len )
+{
+    uint16_t tls_id;
+    const mbedtls_ecp_curve_info *curve_info;
+
+    /*
+     * We expect at least three bytes (see below)
+     */
+    if( len < 3 )
+        return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
+
+    /*
+     * First byte is curve_type; only named_curve is handled
+     */
+    if( *(*buf)++ != MBEDTLS_ECP_TLS_NAMED_CURVE )
+        return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
+
+    /*
+     * Next two bytes are the namedcurve value
+     */
+    tls_id = *(*buf)++;
+    tls_id <<= 8;
+    tls_id |= *(*buf)++;
+
+    if( ( curve_info = mbedtls_ecp_curve_info_from_tls_id( tls_id ) ) == NULL )
+        return( MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE );
+
+    return mbedtls_ecp_group_load( grp, curve_info->grp_id );
+}
+
+/*
+ * Write the ECParameters record corresponding to a group (RFC 4492)
+ */
+int mbedtls_ecp_tls_write_group( const mbedtls_ecp_group *grp, size_t *olen,
+                         unsigned char *buf, size_t blen )
+{
+    const mbedtls_ecp_curve_info *curve_info;
+
+    if( ( curve_info = mbedtls_ecp_curve_info_from_grp_id( grp->id ) ) == NULL )
+        return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
+
+    /*
+     * We are going to write 3 bytes (see below)
+     */
+    *olen = 3;
+    if( blen < *olen )
+        return( MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL );
+
+    /*
+     * First byte is curve_type, always named_curve
+     */
+    *buf++ = MBEDTLS_ECP_TLS_NAMED_CURVE;
+
+    /*
+     * Next two bytes are the namedcurve value
+     */
+    buf[0] = curve_info->tls_id >> 8;
+    buf[1] = curve_info->tls_id & 0xFF;
+
+    return( 0 );
+}
+
+/*
+ * Wrapper around fast quasi-modp functions, with fall-back to mbedtls_mpi_mod_mpi.
+ * See the documentation of struct mbedtls_ecp_group.
+ *
+ * This function is in the critial loop for mbedtls_ecp_mul, so pay attention to perf.
+ */
+static int ecp_modp( mbedtls_mpi *N, const mbedtls_ecp_group *grp )
+{
+    int ret;
+
+    if( grp->modp == NULL )
+        return( mbedtls_mpi_mod_mpi( N, N, &grp->P ) );
+
+    /* N->s < 0 is a much faster test, which fails only if N is 0 */
+    if( ( N->s < 0 && mbedtls_mpi_cmp_int( N, 0 ) != 0 ) ||
+        mbedtls_mpi_bitlen( N ) > 2 * grp->pbits )
+    {
+        return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
+    }
+
+    MBEDTLS_MPI_CHK( grp->modp( N ) );
+
+    /* N->s < 0 is a much faster test, which fails only if N is 0 */
+    while( N->s < 0 && mbedtls_mpi_cmp_int( N, 0 ) != 0 )
+        MBEDTLS_MPI_CHK( mbedtls_mpi_add_mpi( N, N, &grp->P ) );
+
+    while( mbedtls_mpi_cmp_mpi( N, &grp->P ) >= 0 )
+        /* we known P, N and the result are positive */
+        MBEDTLS_MPI_CHK( mbedtls_mpi_sub_abs( N, N, &grp->P ) );
+
+cleanup:
+    return( ret );
+}
+
+/*
+ * Fast mod-p functions expect their argument to be in the 0..p^2 range.
+ *
+ * In order to guarantee that, we need to ensure that operands of
+ * mbedtls_mpi_mul_mpi are in the 0..p range. So, after each operation we will
+ * bring the result back to this range.
+ *
+ * The following macros are shortcuts for doing that.
+ */
+
+/*
+ * Reduce a mbedtls_mpi mod p in-place, general case, to use after mbedtls_mpi_mul_mpi
+ */
+#if defined(MBEDTLS_SELF_TEST)
+#define INC_MUL_COUNT   mul_count++;
+#else
+#define INC_MUL_COUNT
+#endif
+
+#define MOD_MUL( N )    do { MBEDTLS_MPI_CHK( ecp_modp( &N, grp ) ); INC_MUL_COUNT } \
+                        while( 0 )
+
+/*
+ * Reduce a mbedtls_mpi mod p in-place, to use after mbedtls_mpi_sub_mpi
+ * N->s < 0 is a very fast test, which fails only if N is 0
+ */
+#define MOD_SUB( N )                                \
+    while( N.s < 0 && mbedtls_mpi_cmp_int( &N, 0 ) != 0 )   \
+        MBEDTLS_MPI_CHK( mbedtls_mpi_add_mpi( &N, &N, &grp->P ) )
+
+/*
+ * Reduce a mbedtls_mpi mod p in-place, to use after mbedtls_mpi_add_mpi and mbedtls_mpi_mul_int.
+ * We known P, N and the result are positive, so sub_abs is correct, and
+ * a bit faster.
+ */
+#define MOD_ADD( N )                                \
+    while( mbedtls_mpi_cmp_mpi( &N, &grp->P ) >= 0 )        \
+        MBEDTLS_MPI_CHK( mbedtls_mpi_sub_abs( &N, &N, &grp->P ) )
+
+#if defined(ECP_SHORTWEIERSTRASS)
+/*
+ * For curves in short Weierstrass form, we do all the internal operations in
+ * Jacobian coordinates.
+ *
+ * For multiplication, we'll use a comb method with coutermeasueres against
+ * SPA, hence timing attacks.
+ */
+
+/*
+ * Normalize jacobian coordinates so that Z == 0 || Z == 1  (GECC 3.2.1)
+ * Cost: 1N := 1I + 3M + 1S
+ */
+static int ecp_normalize_jac( const mbedtls_ecp_group *grp, mbedtls_ecp_point *pt )
+{
+    int ret;
+    mbedtls_mpi Zi, ZZi;
+
+    if( mbedtls_mpi_cmp_int( &pt->Z, 0 ) == 0 )
+        return( 0 );
+
+#if defined(MBEDTLS_ECP_NORMALIZE_JAC_ALT)
+    if ( mbedtls_internal_ecp_grp_capable( grp ) )
+    {
+        return mbedtls_internal_ecp_normalize_jac( grp, pt );
+    }
+#endif /* MBEDTLS_ECP_NORMALIZE_JAC_ALT */
+    mbedtls_mpi_init( &Zi ); mbedtls_mpi_init( &ZZi );
+
+    /*
+     * X = X / Z^2  mod p
+     */
+    MBEDTLS_MPI_CHK( mbedtls_mpi_inv_mod( &Zi,      &pt->Z,     &grp->P ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &ZZi,     &Zi,        &Zi     ) ); MOD_MUL( ZZi );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &pt->X,   &pt->X,     &ZZi    ) ); MOD_MUL( pt->X );
+
+    /*
+     * Y = Y / Z^3  mod p
+     */
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &pt->Y,   &pt->Y,     &ZZi    ) ); MOD_MUL( pt->Y );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &pt->Y,   &pt->Y,     &Zi     ) ); MOD_MUL( pt->Y );
+
+    /*
+     * Z = 1
+     */
+    MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &pt->Z, 1 ) );
+
+cleanup:
+
+    mbedtls_mpi_free( &Zi ); mbedtls_mpi_free( &ZZi );
+
+    return( ret );
+}
+
+/*
+ * Normalize jacobian coordinates of an array of (pointers to) points,
+ * using Montgomery's trick to perform only one inversion mod P.
+ * (See for example Cohen's "A Course in Computational Algebraic Number
+ * Theory", Algorithm 10.3.4.)
+ *
+ * Warning: fails (returning an error) if one of the points is zero!
+ * This should never happen, see choice of w in ecp_mul_comb().
+ *
+ * Cost: 1N(t) := 1I + (6t - 3)M + 1S
+ */
+static int ecp_normalize_jac_many( const mbedtls_ecp_group *grp,
+                                   mbedtls_ecp_point *T[], size_t t_len )
+{
+    int ret;
+    size_t i;
+    mbedtls_mpi *c, u, Zi, ZZi;
+
+    if( t_len < 2 )
+        return( ecp_normalize_jac( grp, *T ) );
+
+#if defined(MBEDTLS_ECP_NORMALIZE_JAC_MANY_ALT)
+    if ( mbedtls_internal_ecp_grp_capable( grp ) )
+    {
+        return mbedtls_internal_ecp_normalize_jac_many(grp, T, t_len);
+    }
+#endif
+
+    if( ( c = mbedtls_calloc( t_len, sizeof( mbedtls_mpi ) ) ) == NULL )
+        return( MBEDTLS_ERR_ECP_ALLOC_FAILED );
+
+    mbedtls_mpi_init( &u ); mbedtls_mpi_init( &Zi ); mbedtls_mpi_init( &ZZi );
+
+    /*
+     * c[i] = Z_0 * ... * Z_i
+     */
+    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &c[0], &T[0]->Z ) );
+    for( i = 1; i < t_len; i++ )
+    {
+        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &c[i], &c[i-1], &T[i]->Z ) );
+        MOD_MUL( c[i] );
+    }
+
+    /*
+     * u = 1 / (Z_0 * ... * Z_n) mod P
+     */
+    MBEDTLS_MPI_CHK( mbedtls_mpi_inv_mod( &u, &c[t_len-1], &grp->P ) );
+
+    for( i = t_len - 1; ; i-- )
+    {
+        /*
+         * Zi = 1 / Z_i mod p
+         * u = 1 / (Z_0 * ... * Z_i) mod P
+         */
+        if( i == 0 ) {
+            MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &Zi, &u ) );
+        }
+        else
+        {
+            MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &Zi, &u, &c[i-1]  ) ); MOD_MUL( Zi );
+            MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &u,  &u, &T[i]->Z ) ); MOD_MUL( u );
+        }
+
+        /*
+         * proceed as in normalize()
+         */
+        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &ZZi,     &Zi,      &Zi  ) ); MOD_MUL( ZZi );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &T[i]->X, &T[i]->X, &ZZi ) ); MOD_MUL( T[i]->X );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &T[i]->Y, &T[i]->Y, &ZZi ) ); MOD_MUL( T[i]->Y );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &T[i]->Y, &T[i]->Y, &Zi  ) ); MOD_MUL( T[i]->Y );
+
+        /*
+         * Post-precessing: reclaim some memory by shrinking coordinates
+         * - not storing Z (always 1)
+         * - shrinking other coordinates, but still keeping the same number of
+         *   limbs as P, as otherwise it will too likely be regrown too fast.
+         */
+        MBEDTLS_MPI_CHK( mbedtls_mpi_shrink( &T[i]->X, grp->P.n ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_shrink( &T[i]->Y, grp->P.n ) );
+        mbedtls_mpi_free( &T[i]->Z );
+
+        if( i == 0 )
+            break;
+    }
+
+cleanup:
+
+    mbedtls_mpi_free( &u ); mbedtls_mpi_free( &Zi ); mbedtls_mpi_free( &ZZi );
+    for( i = 0; i < t_len; i++ )
+        mbedtls_mpi_free( &c[i] );
+    mbedtls_free( c );
+
+    return( ret );
+}
+
+/*
+ * Conditional point inversion: Q -> -Q = (Q.X, -Q.Y, Q.Z) without leak.
+ * "inv" must be 0 (don't invert) or 1 (invert) or the result will be invalid
+ */
+static int ecp_safe_invert_jac( const mbedtls_ecp_group *grp,
+                            mbedtls_ecp_point *Q,
+                            unsigned char inv )
+{
+    int ret;
+    unsigned char nonzero;
+    mbedtls_mpi mQY;
+
+    mbedtls_mpi_init( &mQY );
+
+    /* Use the fact that -Q.Y mod P = P - Q.Y unless Q.Y == 0 */
+    MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &mQY, &grp->P, &Q->Y ) );
+    nonzero = mbedtls_mpi_cmp_int( &Q->Y, 0 ) != 0;
+    MBEDTLS_MPI_CHK( mbedtls_mpi_safe_cond_assign( &Q->Y, &mQY, inv & nonzero ) );
+
+cleanup:
+    mbedtls_mpi_free( &mQY );
+
+    return( ret );
+}
+
+/*
+ * Point doubling R = 2 P, Jacobian coordinates
+ *
+ * Based on http://www.hyperelliptic.org/EFD/g1p/auto-shortw-jacobian.html#doubling-dbl-1998-cmo-2 .
+ *
+ * We follow the variable naming fairly closely. The formula variations that trade a MUL for a SQR
+ * (plus a few ADDs) aren't useful as our bignum implementation doesn't distinguish squaring.
+ *
+ * Standard optimizations are applied when curve parameter A is one of { 0, -3 }.
+ *
+ * Cost: 1D := 3M + 4S          (A ==  0)
+ *             4M + 4S          (A == -3)
+ *             3M + 6S + 1a     otherwise
+ */
+static int ecp_double_jac( const mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
+                           const mbedtls_ecp_point *P )
+{
+    int ret;
+    mbedtls_mpi M, S, T, U;
+
+#if defined(MBEDTLS_SELF_TEST)
+    dbl_count++;
+#endif
+
+#if defined(MBEDTLS_ECP_DOUBLE_JAC_ALT)
+    if ( mbedtls_internal_ecp_grp_capable( grp ) )
+    {
+        return mbedtls_internal_ecp_double_jac( grp, R, P );
+    }
+#endif /* MBEDTLS_ECP_DOUBLE_JAC_ALT */
+
+    mbedtls_mpi_init( &M ); mbedtls_mpi_init( &S ); mbedtls_mpi_init( &T ); mbedtls_mpi_init( &U );
+
+    /* Special case for A = -3 */
+    if( grp->A.p == NULL )
+    {
+        /* M = 3(X + Z^2)(X - Z^2) */
+        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &S,  &P->Z,  &P->Z   ) ); MOD_MUL( S );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_add_mpi( &T,  &P->X,  &S      ) ); MOD_ADD( T );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &U,  &P->X,  &S      ) ); MOD_SUB( U );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &S,  &T,     &U      ) ); MOD_MUL( S );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_int( &M,  &S,     3       ) ); MOD_ADD( M );
+    }
+    else
+    {
+        /* M = 3.X^2 */
+        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &S,  &P->X,  &P->X   ) ); MOD_MUL( S );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_int( &M,  &S,     3       ) ); MOD_ADD( M );
+
+        /* Optimize away for "koblitz" curves with A = 0 */
+        if( mbedtls_mpi_cmp_int( &grp->A, 0 ) != 0 )
+        {
+            /* M += A.Z^4 */
+            MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &S,  &P->Z,  &P->Z   ) ); MOD_MUL( S );
+            MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &T,  &S,     &S      ) ); MOD_MUL( T );
+            MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &S,  &T,     &grp->A ) ); MOD_MUL( S );
+            MBEDTLS_MPI_CHK( mbedtls_mpi_add_mpi( &M,  &M,     &S      ) ); MOD_ADD( M );
+        }
+    }
+
+    /* S = 4.X.Y^2 */
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &T,  &P->Y,  &P->Y   ) ); MOD_MUL( T );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_shift_l( &T,  1               ) ); MOD_ADD( T );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &S,  &P->X,  &T      ) ); MOD_MUL( S );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_shift_l( &S,  1               ) ); MOD_ADD( S );
+
+    /* U = 8.Y^4 */
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &U,  &T,     &T      ) ); MOD_MUL( U );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_shift_l( &U,  1               ) ); MOD_ADD( U );
+
+    /* T = M^2 - 2.S */
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &T,  &M,     &M      ) ); MOD_MUL( T );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &T,  &T,     &S      ) ); MOD_SUB( T );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &T,  &T,     &S      ) ); MOD_SUB( T );
+
+    /* S = M(S - T) - U */
+    MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &S,  &S,     &T      ) ); MOD_SUB( S );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &S,  &S,     &M      ) ); MOD_MUL( S );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &S,  &S,     &U      ) ); MOD_SUB( S );
+
+    /* U = 2.Y.Z */
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &U,  &P->Y,  &P->Z   ) ); MOD_MUL( U );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_shift_l( &U,  1               ) ); MOD_ADD( U );
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &R->X, &T ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &R->Y, &S ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &R->Z, &U ) );
+
+cleanup:
+    mbedtls_mpi_free( &M ); mbedtls_mpi_free( &S ); mbedtls_mpi_free( &T ); mbedtls_mpi_free( &U );
+
+    return( ret );
+}
+
+/*
+ * Addition: R = P + Q, mixed affine-Jacobian coordinates (GECC 3.22)
+ *
+ * The coordinates of Q must be normalized (= affine),
+ * but those of P don't need to. R is not normalized.
+ *
+ * Special cases: (1) P or Q is zero, (2) R is zero, (3) P == Q.
+ * None of these cases can happen as intermediate step in ecp_mul_comb():
+ * - at each step, P, Q and R are multiples of the base point, the factor
+ *   being less than its order, so none of them is zero;
+ * - Q is an odd multiple of the base point, P an even multiple,
+ *   due to the choice of precomputed points in the modified comb method.
+ * So branches for these cases do not leak secret information.
+ *
+ * We accept Q->Z being unset (saving memory in tables) as meaning 1.
+ *
+ * Cost: 1A := 8M + 3S
+ */
+static int ecp_add_mixed( const mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
+                          const mbedtls_ecp_point *P, const mbedtls_ecp_point *Q )
+{
+    int ret;
+    mbedtls_mpi T1, T2, T3, T4, X, Y, Z;
+
+#if defined(MBEDTLS_SELF_TEST)
+    add_count++;
+#endif
+
+#if defined(MBEDTLS_ECP_ADD_MIXED_ALT)
+    if ( mbedtls_internal_ecp_grp_capable( grp ) )
+    {
+        return mbedtls_internal_ecp_add_mixed( grp, R, P, Q );
+    }
+#endif /* MBEDTLS_ECP_ADD_MIXED_ALT */
+
+    /*
+     * Trivial cases: P == 0 or Q == 0 (case 1)
+     */
+    if( mbedtls_mpi_cmp_int( &P->Z, 0 ) == 0 )
+        return( mbedtls_ecp_copy( R, Q ) );
+
+    if( Q->Z.p != NULL && mbedtls_mpi_cmp_int( &Q->Z, 0 ) == 0 )
+        return( mbedtls_ecp_copy( R, P ) );
+
+    /*
+     * Make sure Q coordinates are normalized
+     */
+    if( Q->Z.p != NULL && mbedtls_mpi_cmp_int( &Q->Z, 1 ) != 0 )
+        return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
+
+    mbedtls_mpi_init( &T1 ); mbedtls_mpi_init( &T2 ); mbedtls_mpi_init( &T3 ); mbedtls_mpi_init( &T4 );
+    mbedtls_mpi_init( &X ); mbedtls_mpi_init( &Y ); mbedtls_mpi_init( &Z );
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &T1,  &P->Z,  &P->Z ) );  MOD_MUL( T1 );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &T2,  &T1,    &P->Z ) );  MOD_MUL( T2 );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &T1,  &T1,    &Q->X ) );  MOD_MUL( T1 );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &T2,  &T2,    &Q->Y ) );  MOD_MUL( T2 );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &T1,  &T1,    &P->X ) );  MOD_SUB( T1 );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &T2,  &T2,    &P->Y ) );  MOD_SUB( T2 );
+
+    /* Special cases (2) and (3) */
+    if( mbedtls_mpi_cmp_int( &T1, 0 ) == 0 )
+    {
+        if( mbedtls_mpi_cmp_int( &T2, 0 ) == 0 )
+        {
+            ret = ecp_double_jac( grp, R, P );
+            goto cleanup;
+        }
+        else
+        {
+            ret = mbedtls_ecp_set_zero( R );
+            goto cleanup;
+        }
+    }
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &Z,   &P->Z,  &T1   ) );  MOD_MUL( Z  );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &T3,  &T1,    &T1   ) );  MOD_MUL( T3 );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &T4,  &T3,    &T1   ) );  MOD_MUL( T4 );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &T3,  &T3,    &P->X ) );  MOD_MUL( T3 );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_int( &T1,  &T3,    2     ) );  MOD_ADD( T1 );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &X,   &T2,    &T2   ) );  MOD_MUL( X  );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &X,   &X,     &T1   ) );  MOD_SUB( X  );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &X,   &X,     &T4   ) );  MOD_SUB( X  );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &T3,  &T3,    &X    ) );  MOD_SUB( T3 );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &T3,  &T3,    &T2   ) );  MOD_MUL( T3 );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &T4,  &T4,    &P->Y ) );  MOD_MUL( T4 );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &Y,   &T3,    &T4   ) );  MOD_SUB( Y  );
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &R->X, &X ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &R->Y, &Y ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &R->Z, &Z ) );
+
+cleanup:
+
+    mbedtls_mpi_free( &T1 ); mbedtls_mpi_free( &T2 ); mbedtls_mpi_free( &T3 ); mbedtls_mpi_free( &T4 );
+    mbedtls_mpi_free( &X ); mbedtls_mpi_free( &Y ); mbedtls_mpi_free( &Z );
+
+    return( ret );
+}
+
+/*
+ * Randomize jacobian coordinates:
+ * (X, Y, Z) -> (l^2 X, l^3 Y, l Z) for random l
+ * This is sort of the reverse operation of ecp_normalize_jac().
+ *
+ * This countermeasure was first suggested in [2].
+ */
+static int ecp_randomize_jac( const mbedtls_ecp_group *grp, mbedtls_ecp_point *pt,
+                int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
+{
+    int ret;
+    mbedtls_mpi l, ll;
+    size_t p_size;
+    int count = 0;
+
+#if defined(MBEDTLS_ECP_RANDOMIZE_JAC_ALT)
+    if ( mbedtls_internal_ecp_grp_capable( grp ) )
+    {
+        return mbedtls_internal_ecp_randomize_jac( grp, pt, f_rng, p_rng );
+    }
+#endif /* MBEDTLS_ECP_RANDOMIZE_JAC_ALT */
+
+    p_size = ( grp->pbits + 7 ) / 8;
+    mbedtls_mpi_init( &l ); mbedtls_mpi_init( &ll );
+
+    /* Generate l such that 1 < l < p */
+    do
+    {
+        MBEDTLS_MPI_CHK( mbedtls_mpi_fill_random( &l, p_size, f_rng, p_rng ) );
+
+        while( mbedtls_mpi_cmp_mpi( &l, &grp->P ) >= 0 )
+            MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &l, 1 ) );
+
+        if( count++ > 10 )
+            return( MBEDTLS_ERR_ECP_RANDOM_FAILED );
+    }
+    while( mbedtls_mpi_cmp_int( &l, 1 ) <= 0 );
+
+    /* Z = l * Z */
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &pt->Z,   &pt->Z,     &l  ) ); MOD_MUL( pt->Z );
+
+    /* X = l^2 * X */
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &ll,      &l,         &l  ) ); MOD_MUL( ll );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &pt->X,   &pt->X,     &ll ) ); MOD_MUL( pt->X );
+
+    /* Y = l^3 * Y */
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &ll,      &ll,        &l  ) ); MOD_MUL( ll );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &pt->Y,   &pt->Y,     &ll ) ); MOD_MUL( pt->Y );
+
+cleanup:
+    mbedtls_mpi_free( &l ); mbedtls_mpi_free( &ll );
+
+    return( ret );
+}
+
+/*
+ * Check and define parameters used by the comb method (see below for details)
+ */
+#if MBEDTLS_ECP_WINDOW_SIZE < 2 || MBEDTLS_ECP_WINDOW_SIZE > 7
+#error "MBEDTLS_ECP_WINDOW_SIZE out of bounds"
+#endif
+
+/* d = ceil( n / w ) */
+#define COMB_MAX_D      ( MBEDTLS_ECP_MAX_BITS + 1 ) / 2
+
+/* number of precomputed points */
+#define COMB_MAX_PRE    ( 1 << ( MBEDTLS_ECP_WINDOW_SIZE - 1 ) )
+
+/*
+ * Compute the representation of m that will be used with our comb method.
+ *
+ * The basic comb method is described in GECC 3.44 for example. We use a
+ * modified version that provides resistance to SPA by avoiding zero
+ * digits in the representation as in [3]. We modify the method further by
+ * requiring that all K_i be odd, which has the small cost that our
+ * representation uses one more K_i, due to carries.
+ *
+ * Also, for the sake of compactness, only the seven low-order bits of x[i]
+ * are used to represent K_i, and the msb of x[i] encodes the the sign (s_i in
+ * the paper): it is set if and only if if s_i == -1;
+ *
+ * Calling conventions:
+ * - x is an array of size d + 1
+ * - w is the size, ie number of teeth, of the comb, and must be between
+ *   2 and 7 (in practice, between 2 and MBEDTLS_ECP_WINDOW_SIZE)
+ * - m is the MPI, expected to be odd and such that bitlength(m) <= w * d
+ *   (the result will be incorrect if these assumptions are not satisfied)
+ */
+static void ecp_comb_fixed( unsigned char x[], size_t d,
+                            unsigned char w, const mbedtls_mpi *m )
+{
+    size_t i, j;
+    unsigned char c, cc, adjust;
+
+    memset( x, 0, d+1 );
+
+    /* First get the classical comb values (except for x_d = 0) */
+    for( i = 0; i < d; i++ )
+        for( j = 0; j < w; j++ )
+            x[i] |= mbedtls_mpi_get_bit( m, i + d * j ) << j;
+
+    /* Now make sure x_1 .. x_d are odd */
+    c = 0;
+    for( i = 1; i <= d; i++ )
+    {
+        /* Add carry and update it */
+        cc   = x[i] & c;
+        x[i] = x[i] ^ c;
+        c = cc;
+
+        /* Adjust if needed, avoiding branches */
+        adjust = 1 - ( x[i] & 0x01 );
+        c   |= x[i] & ( x[i-1] * adjust );
+        x[i] = x[i] ^ ( x[i-1] * adjust );
+        x[i-1] |= adjust << 7;
+    }
+}
+
+/*
+ * Precompute points for the comb method
+ *
+ * If i = i_{w-1} ... i_1 is the binary representation of i, then
+ * T[i] = i_{w-1} 2^{(w-1)d} P + ... + i_1 2^d P + P
+ *
+ * T must be able to hold 2^{w - 1} elements
+ *
+ * Cost: d(w-1) D + (2^{w-1} - 1) A + 1 N(w-1) + 1 N(2^{w-1} - 1)
+ */
+static int ecp_precompute_comb( const mbedtls_ecp_group *grp,
+                                mbedtls_ecp_point T[], const mbedtls_ecp_point *P,
+                                unsigned char w, size_t d )
+{
+    int ret;
+    unsigned char i, k;
+    size_t j;
+    mbedtls_ecp_point *cur, *TT[COMB_MAX_PRE - 1];
+
+    /*
+     * Set T[0] = P and
+     * T[2^{l-1}] = 2^{dl} P for l = 1 .. w-1 (this is not the final value)
+     */
+    MBEDTLS_MPI_CHK( mbedtls_ecp_copy( &T[0], P ) );
+
+    k = 0;
+    for( i = 1; i < ( 1U << ( w - 1 ) ); i <<= 1 )
+    {
+        cur = T + i;
+        MBEDTLS_MPI_CHK( mbedtls_ecp_copy( cur, T + ( i >> 1 ) ) );
+        for( j = 0; j < d; j++ )
+            MBEDTLS_MPI_CHK( ecp_double_jac( grp, cur, cur ) );
+
+        TT[k++] = cur;
+    }
+
+    MBEDTLS_MPI_CHK( ecp_normalize_jac_many( grp, TT, k ) );
+
+    /*
+     * Compute the remaining ones using the minimal number of additions
+     * Be careful to update T[2^l] only after using it!
+     */
+    k = 0;
+    for( i = 1; i < ( 1U << ( w - 1 ) ); i <<= 1 )
+    {
+        j = i;
+        while( j-- )
+        {
+            MBEDTLS_MPI_CHK( ecp_add_mixed( grp, &T[i + j], &T[j], &T[i] ) );
+            TT[k++] = &T[i + j];
+        }
+    }
+
+    MBEDTLS_MPI_CHK( ecp_normalize_jac_many( grp, TT, k ) );
+
+cleanup:
+
+    return( ret );
+}
+
+/*
+ * Select precomputed point: R = sign(i) * T[ abs(i) / 2 ]
+ */
+static int ecp_select_comb( const mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
+                            const mbedtls_ecp_point T[], unsigned char t_len,
+                            unsigned char i )
+{
+    int ret;
+    unsigned char ii, j;
+
+    /* Ignore the "sign" bit and scale down */
+    ii =  ( i & 0x7Fu ) >> 1;
+
+    /* Read the whole table to thwart cache-based timing attacks */
+    for( j = 0; j < t_len; j++ )
+    {
+        MBEDTLS_MPI_CHK( mbedtls_mpi_safe_cond_assign( &R->X, &T[j].X, j == ii ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_safe_cond_assign( &R->Y, &T[j].Y, j == ii ) );
+    }
+
+    /* Safely invert result if i is "negative" */
+    MBEDTLS_MPI_CHK( ecp_safe_invert_jac( grp, R, i >> 7 ) );
+
+cleanup:
+    return( ret );
+}
+
+/*
+ * Core multiplication algorithm for the (modified) comb method.
+ * This part is actually common with the basic comb method (GECC 3.44)
+ *
+ * Cost: d A + d D + 1 R
+ */
+static int ecp_mul_comb_core( const mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
+                              const mbedtls_ecp_point T[], unsigned char t_len,
+                              const unsigned char x[], size_t d,
+                              int (*f_rng)(void *, unsigned char *, size_t),
+                              void *p_rng )
+{
+    int ret;
+    mbedtls_ecp_point Txi;
+    size_t i;
+
+    mbedtls_ecp_point_init( &Txi );
+
+    /* Start with a non-zero point and randomize its coordinates */
+    i = d;
+    MBEDTLS_MPI_CHK( ecp_select_comb( grp, R, T, t_len, x[i] ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &R->Z, 1 ) );
+    if( f_rng != 0 )
+        MBEDTLS_MPI_CHK( ecp_randomize_jac( grp, R, f_rng, p_rng ) );
+
+    while( i-- != 0 )
+    {
+        MBEDTLS_MPI_CHK( ecp_double_jac( grp, R, R ) );
+        MBEDTLS_MPI_CHK( ecp_select_comb( grp, &Txi, T, t_len, x[i] ) );
+        MBEDTLS_MPI_CHK( ecp_add_mixed( grp, R, R, &Txi ) );
+    }
+
+cleanup:
+
+    mbedtls_ecp_point_free( &Txi );
+
+    return( ret );
+}
+
+/*
+ * Multiplication using the comb method,
+ * for curves in short Weierstrass form
+ */
+static int ecp_mul_comb( mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
+                         const mbedtls_mpi *m, const mbedtls_ecp_point *P,
+                         int (*f_rng)(void *, unsigned char *, size_t),
+                         void *p_rng )
+{
+    int ret;
+    unsigned char w, m_is_odd, p_eq_g, pre_len, i;
+    size_t d;
+    unsigned char k[COMB_MAX_D + 1];
+    mbedtls_ecp_point *T;
+    mbedtls_mpi M, mm;
+
+    mbedtls_mpi_init( &M );
+    mbedtls_mpi_init( &mm );
+
+    /* we need N to be odd to trnaform m in an odd number, check now */
+    if( mbedtls_mpi_get_bit( &grp->N, 0 ) != 1 )
+        return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
+
+    /*
+     * Minimize the number of multiplications, that is minimize
+     * 10 * d * w + 18 * 2^(w-1) + 11 * d + 7 * w, with d = ceil( nbits / w )
+     * (see costs of the various parts, with 1S = 1M)
+     */
+    w = grp->nbits >= 384 ? 5 : 4;
+
+    /*
+     * If P == G, pre-compute a bit more, since this may be re-used later.
+     * Just adding one avoids upping the cost of the first mul too much,
+     * and the memory cost too.
+     */
+#if MBEDTLS_ECP_FIXED_POINT_OPTIM == 1
+    p_eq_g = ( mbedtls_mpi_cmp_mpi( &P->Y, &grp->G.Y ) == 0 &&
+               mbedtls_mpi_cmp_mpi( &P->X, &grp->G.X ) == 0 );
+    if( p_eq_g )
+        w++;
+#else
+    p_eq_g = 0;
+#endif
+
+    /*
+     * Make sure w is within bounds.
+     * (The last test is useful only for very small curves in the test suite.)
+     */
+    if( w > MBEDTLS_ECP_WINDOW_SIZE )
+        w = MBEDTLS_ECP_WINDOW_SIZE;
+    if( w >= grp->nbits )
+        w = 2;
+
+    /* Other sizes that depend on w */
+    pre_len = 1U << ( w - 1 );
+    d = ( grp->nbits + w - 1 ) / w;
+
+    /*
+     * Prepare precomputed points: if P == G we want to
+     * use grp->T if already initialized, or initialize it.
+     */
+    T = p_eq_g ? grp->T : NULL;
+
+    if( T == NULL )
+    {
+        T = mbedtls_calloc( pre_len, sizeof( mbedtls_ecp_point ) );
+        if( T == NULL )
+        {
+            ret = MBEDTLS_ERR_ECP_ALLOC_FAILED;
+            goto cleanup;
+        }
+
+        MBEDTLS_MPI_CHK( ecp_precompute_comb( grp, T, P, w, d ) );
+
+        if( p_eq_g )
+        {
+            grp->T = T;
+            grp->T_size = pre_len;
+        }
+    }
+
+    /*
+     * Make sure M is odd (M = m or M = N - m, since N is odd)
+     * using the fact that m * P = - (N - m) * P
+     */
+    m_is_odd = ( mbedtls_mpi_get_bit( m, 0 ) == 1 );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &M, m ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &mm, &grp->N, m ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_safe_cond_assign( &M, &mm, ! m_is_odd ) );
+
+    /*
+     * Go for comb multiplication, R = M * P
+     */
+    ecp_comb_fixed( k, d, w, &M );
+    MBEDTLS_MPI_CHK( ecp_mul_comb_core( grp, R, T, pre_len, k, d, f_rng, p_rng ) );
+
+    /*
+     * Now get m * P from M * P and normalize it
+     */
+    MBEDTLS_MPI_CHK( ecp_safe_invert_jac( grp, R, ! m_is_odd ) );
+    MBEDTLS_MPI_CHK( ecp_normalize_jac( grp, R ) );
+
+cleanup:
+
+    /* There are two cases where T is not stored in grp:
+     * - P != G
+     * - An intermediate operation failed before setting grp->T
+     * In either case, T must be freed.
+     */
+    if( T != NULL && T != grp->T )
+    {
+        for( i = 0; i < pre_len; i++ )
+            mbedtls_ecp_point_free( &T[i] );
+        mbedtls_free( T );
+    }
+
+    mbedtls_mpi_free( &M );
+    mbedtls_mpi_free( &mm );
+
+    if( ret != 0 )
+        mbedtls_ecp_point_free( R );
+
+    return( ret );
+}
+
+#endif /* ECP_SHORTWEIERSTRASS */
+
+#if defined(ECP_MONTGOMERY)
+/*
+ * For Montgomery curves, we do all the internal arithmetic in projective
+ * coordinates. Import/export of points uses only the x coordinates, which is
+ * internaly represented as X / Z.
+ *
+ * For scalar multiplication, we'll use a Montgomery ladder.
+ */
+
+/*
+ * Normalize Montgomery x/z coordinates: X = X/Z, Z = 1
+ * Cost: 1M + 1I
+ */
+static int ecp_normalize_mxz( const mbedtls_ecp_group *grp, mbedtls_ecp_point *P )
+{
+    int ret;
+
+#if defined(MBEDTLS_ECP_NORMALIZE_MXZ_ALT)
+    if ( mbedtls_internal_ecp_grp_capable( grp ) )
+    {
+        return mbedtls_internal_ecp_normalize_mxz( grp, P );
+    }
+#endif /* MBEDTLS_ECP_NORMALIZE_MXZ_ALT */
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_inv_mod( &P->Z, &P->Z, &grp->P ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &P->X, &P->X, &P->Z ) ); MOD_MUL( P->X );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &P->Z, 1 ) );
+
+cleanup:
+    return( ret );
+}
+
+/*
+ * Randomize projective x/z coordinates:
+ * (X, Z) -> (l X, l Z) for random l
+ * This is sort of the reverse operation of ecp_normalize_mxz().
+ *
+ * This countermeasure was first suggested in [2].
+ * Cost: 2M
+ */
+static int ecp_randomize_mxz( const mbedtls_ecp_group *grp, mbedtls_ecp_point *P,
+                int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
+{
+    int ret;
+    mbedtls_mpi l;
+    size_t p_size;
+    int count = 0;
+
+#if defined(MBEDTLS_ECP_RANDOMIZE_MXZ_ALT)
+    if ( mbedtls_internal_ecp_grp_capable( grp ) )
+    {
+        return mbedtls_internal_ecp_randomize_mxz( grp, P, f_rng, p_rng );
+    }
+#endif /* MBEDTLS_ECP_RANDOMIZE_MXZ_ALT */
+
+    p_size = ( grp->pbits + 7 ) / 8;
+    mbedtls_mpi_init( &l );
+
+    /* Generate l such that 1 < l < p */
+    do
+    {
+        MBEDTLS_MPI_CHK( mbedtls_mpi_fill_random( &l, p_size, f_rng, p_rng ) );
+
+        while( mbedtls_mpi_cmp_mpi( &l, &grp->P ) >= 0 )
+            MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &l, 1 ) );
+
+        if( count++ > 10 )
+            return( MBEDTLS_ERR_ECP_RANDOM_FAILED );
+    }
+    while( mbedtls_mpi_cmp_int( &l, 1 ) <= 0 );
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &P->X, &P->X, &l ) ); MOD_MUL( P->X );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &P->Z, &P->Z, &l ) ); MOD_MUL( P->Z );
+
+cleanup:
+    mbedtls_mpi_free( &l );
+
+    return( ret );
+}
+
+/*
+ * Double-and-add: R = 2P, S = P + Q, with d = X(P - Q),
+ * for Montgomery curves in x/z coordinates.
+ *
+ * http://www.hyperelliptic.org/EFD/g1p/auto-code/montgom/xz/ladder/mladd-1987-m.op3
+ * with
+ * d =  X1
+ * P = (X2, Z2)
+ * Q = (X3, Z3)
+ * R = (X4, Z4)
+ * S = (X5, Z5)
+ * and eliminating temporary variables tO, ..., t4.
+ *
+ * Cost: 5M + 4S
+ */
+static int ecp_double_add_mxz( const mbedtls_ecp_group *grp,
+                               mbedtls_ecp_point *R, mbedtls_ecp_point *S,
+                               const mbedtls_ecp_point *P, const mbedtls_ecp_point *Q,
+                               const mbedtls_mpi *d )
+{
+    int ret;
+    mbedtls_mpi A, AA, B, BB, E, C, D, DA, CB;
+
+#if defined(MBEDTLS_ECP_DOUBLE_ADD_MXZ_ALT)
+    if ( mbedtls_internal_ecp_grp_capable( grp ) )
+    {
+        return mbedtls_internal_ecp_double_add_mxz( grp, R, S, P, Q, d );
+    }
+#endif /* MBEDTLS_ECP_DOUBLE_ADD_MXZ_ALT */
+
+    mbedtls_mpi_init( &A ); mbedtls_mpi_init( &AA ); mbedtls_mpi_init( &B );
+    mbedtls_mpi_init( &BB ); mbedtls_mpi_init( &E ); mbedtls_mpi_init( &C );
+    mbedtls_mpi_init( &D ); mbedtls_mpi_init( &DA ); mbedtls_mpi_init( &CB );
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_add_mpi( &A,    &P->X,   &P->Z ) ); MOD_ADD( A    );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &AA,   &A,      &A    ) ); MOD_MUL( AA   );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &B,    &P->X,   &P->Z ) ); MOD_SUB( B    );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &BB,   &B,      &B    ) ); MOD_MUL( BB   );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &E,    &AA,     &BB   ) ); MOD_SUB( E    );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_add_mpi( &C,    &Q->X,   &Q->Z ) ); MOD_ADD( C    );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &D,    &Q->X,   &Q->Z ) ); MOD_SUB( D    );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &DA,   &D,      &A    ) ); MOD_MUL( DA   );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &CB,   &C,      &B    ) ); MOD_MUL( CB   );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_add_mpi( &S->X, &DA,     &CB   ) ); MOD_MUL( S->X );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &S->X, &S->X,   &S->X ) ); MOD_MUL( S->X );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &S->Z, &DA,     &CB   ) ); MOD_SUB( S->Z );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &S->Z, &S->Z,   &S->Z ) ); MOD_MUL( S->Z );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &S->Z, d,       &S->Z ) ); MOD_MUL( S->Z );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &R->X, &AA,     &BB   ) ); MOD_MUL( R->X );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &R->Z, &grp->A, &E    ) ); MOD_MUL( R->Z );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_add_mpi( &R->Z, &BB,     &R->Z ) ); MOD_ADD( R->Z );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &R->Z, &E,      &R->Z ) ); MOD_MUL( R->Z );
+
+cleanup:
+    mbedtls_mpi_free( &A ); mbedtls_mpi_free( &AA ); mbedtls_mpi_free( &B );
+    mbedtls_mpi_free( &BB ); mbedtls_mpi_free( &E ); mbedtls_mpi_free( &C );
+    mbedtls_mpi_free( &D ); mbedtls_mpi_free( &DA ); mbedtls_mpi_free( &CB );
+
+    return( ret );
+}
+
+/*
+ * Multiplication with Montgomery ladder in x/z coordinates,
+ * for curves in Montgomery form
+ */
+static int ecp_mul_mxz( mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
+                        const mbedtls_mpi *m, const mbedtls_ecp_point *P,
+                        int (*f_rng)(void *, unsigned char *, size_t),
+                        void *p_rng )
+{
+    int ret;
+    size_t i;
+    unsigned char b;
+    mbedtls_ecp_point RP;
+    mbedtls_mpi PX;
+
+    mbedtls_ecp_point_init( &RP ); mbedtls_mpi_init( &PX );
+
+    /* Save PX and read from P before writing to R, in case P == R */
+    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &PX, &P->X ) );
+    MBEDTLS_MPI_CHK( mbedtls_ecp_copy( &RP, P ) );
+
+    /* Set R to zero in modified x/z coordinates */
+    MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &R->X, 1 ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &R->Z, 0 ) );
+    mbedtls_mpi_free( &R->Y );
+
+    /* RP.X might be sligtly larger than P, so reduce it */
+    MOD_ADD( RP.X );
+
+    /* Randomize coordinates of the starting point */
+    if( f_rng != NULL )
+        MBEDTLS_MPI_CHK( ecp_randomize_mxz( grp, &RP, f_rng, p_rng ) );
+
+    /* Loop invariant: R = result so far, RP = R + P */
+    i = mbedtls_mpi_bitlen( m ); /* one past the (zero-based) most significant bit */
+    while( i-- > 0 )
+    {
+        b = mbedtls_mpi_get_bit( m, i );
+        /*
+         *  if (b) R = 2R + P else R = 2R,
+         * which is:
+         *  if (b) double_add( RP, R, RP, R )
+         *  else   double_add( R, RP, R, RP )
+         * but using safe conditional swaps to avoid leaks
+         */
+        MBEDTLS_MPI_CHK( mbedtls_mpi_safe_cond_swap( &R->X, &RP.X, b ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_safe_cond_swap( &R->Z, &RP.Z, b ) );
+        MBEDTLS_MPI_CHK( ecp_double_add_mxz( grp, R, &RP, R, &RP, &PX ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_safe_cond_swap( &R->X, &RP.X, b ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_safe_cond_swap( &R->Z, &RP.Z, b ) );
+    }
+
+    MBEDTLS_MPI_CHK( ecp_normalize_mxz( grp, R ) );
+
+cleanup:
+    mbedtls_ecp_point_free( &RP ); mbedtls_mpi_free( &PX );
+
+    return( ret );
+}
+
+#endif /* ECP_MONTGOMERY */
+
+/*
+ * Multiplication R = m * P
+ */
+int mbedtls_ecp_mul( mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
+             const mbedtls_mpi *m, const mbedtls_ecp_point *P,
+             int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
+{
+    int ret = MBEDTLS_ERR_ECP_BAD_INPUT_DATA;
+#if defined(MBEDTLS_ECP_INTERNAL_ALT)
+    char is_grp_capable = 0;
+#endif
+
+    /* Common sanity checks */
+    if( mbedtls_mpi_cmp_int( &P->Z, 1 ) != 0 )
+        return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
+
+    if( ( ret = mbedtls_ecp_check_privkey( grp, m ) ) != 0 ||
+        ( ret = mbedtls_ecp_check_pubkey( grp, P ) ) != 0 )
+        return( ret );
+
+#if defined(MBEDTLS_ECP_INTERNAL_ALT)
+    if ( is_grp_capable = mbedtls_internal_ecp_grp_capable( grp )  )
+    {
+        MBEDTLS_MPI_CHK( mbedtls_internal_ecp_init( grp ) );
+    }
+
+#endif /* MBEDTLS_ECP_INTERNAL_ALT */
+#if defined(ECP_MONTGOMERY)
+    if( ecp_get_type( grp ) == ECP_TYPE_MONTGOMERY )
+        ret = ecp_mul_mxz( grp, R, m, P, f_rng, p_rng );
+
+#endif
+#if defined(ECP_SHORTWEIERSTRASS)
+    if( ecp_get_type( grp ) == ECP_TYPE_SHORT_WEIERSTRASS )
+        ret = ecp_mul_comb( grp, R, m, P, f_rng, p_rng );
+
+#endif
+#if defined(MBEDTLS_ECP_INTERNAL_ALT)
+cleanup:
+
+    if ( is_grp_capable )
+    {
+        mbedtls_internal_ecp_free( grp );
+    }
+
+#endif /* MBEDTLS_ECP_INTERNAL_ALT */
+    return( ret );
+}
+
+#if defined(ECP_SHORTWEIERSTRASS)
+/*
+ * Check that an affine point is valid as a public key,
+ * short weierstrass curves (SEC1 3.2.3.1)
+ */
+static int ecp_check_pubkey_sw( const mbedtls_ecp_group *grp, const mbedtls_ecp_point *pt )
+{
+    int ret;
+    mbedtls_mpi YY, RHS;
+
+    /* pt coordinates must be normalized for our checks */
+    if( mbedtls_mpi_cmp_int( &pt->X, 0 ) < 0 ||
+        mbedtls_mpi_cmp_int( &pt->Y, 0 ) < 0 ||
+        mbedtls_mpi_cmp_mpi( &pt->X, &grp->P ) >= 0 ||
+        mbedtls_mpi_cmp_mpi( &pt->Y, &grp->P ) >= 0 )
+        return( MBEDTLS_ERR_ECP_INVALID_KEY );
+
+    mbedtls_mpi_init( &YY ); mbedtls_mpi_init( &RHS );
+
+    /*
+     * YY = Y^2
+     * RHS = X (X^2 + A) + B = X^3 + A X + B
+     */
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &YY,  &pt->Y,   &pt->Y  ) );  MOD_MUL( YY  );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &RHS, &pt->X,   &pt->X  ) );  MOD_MUL( RHS );
+
+    /* Special case for A = -3 */
+    if( grp->A.p == NULL )
+    {
+        MBEDTLS_MPI_CHK( mbedtls_mpi_sub_int( &RHS, &RHS, 3       ) );  MOD_SUB( RHS );
+    }
+    else
+    {
+        MBEDTLS_MPI_CHK( mbedtls_mpi_add_mpi( &RHS, &RHS, &grp->A ) );  MOD_ADD( RHS );
+    }
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &RHS, &RHS,     &pt->X  ) );  MOD_MUL( RHS );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_add_mpi( &RHS, &RHS,     &grp->B ) );  MOD_ADD( RHS );
+
+    if( mbedtls_mpi_cmp_mpi( &YY, &RHS ) != 0 )
+        ret = MBEDTLS_ERR_ECP_INVALID_KEY;
+
+cleanup:
+
+    mbedtls_mpi_free( &YY ); mbedtls_mpi_free( &RHS );
+
+    return( ret );
+}
+#endif /* ECP_SHORTWEIERSTRASS */
+
+/*
+ * R = m * P with shortcuts for m == 1 and m == -1
+ * NOT constant-time - ONLY for short Weierstrass!
+ */
+static int mbedtls_ecp_mul_shortcuts( mbedtls_ecp_group *grp,
+                                      mbedtls_ecp_point *R,
+                                      const mbedtls_mpi *m,
+                                      const mbedtls_ecp_point *P )
+{
+    int ret;
+
+    if( mbedtls_mpi_cmp_int( m, 1 ) == 0 )
+    {
+        MBEDTLS_MPI_CHK( mbedtls_ecp_copy( R, P ) );
+    }
+    else if( mbedtls_mpi_cmp_int( m, -1 ) == 0 )
+    {
+        MBEDTLS_MPI_CHK( mbedtls_ecp_copy( R, P ) );
+        if( mbedtls_mpi_cmp_int( &R->Y, 0 ) != 0 )
+            MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &R->Y, &grp->P, &R->Y ) );
+    }
+    else
+    {
+        MBEDTLS_MPI_CHK( mbedtls_ecp_mul( grp, R, m, P, NULL, NULL ) );
+    }
+
+cleanup:
+    return( ret );
+}
+
+/*
+ * Linear combination
+ * NOT constant-time
+ */
+int mbedtls_ecp_muladd( mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
+             const mbedtls_mpi *m, const mbedtls_ecp_point *P,
+             const mbedtls_mpi *n, const mbedtls_ecp_point *Q )
+{
+    int ret;
+    mbedtls_ecp_point mP;
+#if defined(MBEDTLS_ECP_INTERNAL_ALT)
+    char is_grp_capable = 0;
+#endif
+
+    if( ecp_get_type( grp ) != ECP_TYPE_SHORT_WEIERSTRASS )
+        return( MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE );
+
+    mbedtls_ecp_point_init( &mP );
+
+    MBEDTLS_MPI_CHK( mbedtls_ecp_mul_shortcuts( grp, &mP, m, P ) );
+    MBEDTLS_MPI_CHK( mbedtls_ecp_mul_shortcuts( grp, R,   n, Q ) );
+
+#if defined(MBEDTLS_ECP_INTERNAL_ALT)
+    if (  is_grp_capable = mbedtls_internal_ecp_grp_capable( grp )  )
+    {
+        MBEDTLS_MPI_CHK( mbedtls_internal_ecp_init( grp ) );
+    }
+
+#endif /* MBEDTLS_ECP_INTERNAL_ALT */
+    MBEDTLS_MPI_CHK( ecp_add_mixed( grp, R, &mP, R ) );
+    MBEDTLS_MPI_CHK( ecp_normalize_jac( grp, R ) );
+
+cleanup:
+
+#if defined(MBEDTLS_ECP_INTERNAL_ALT)
+    if ( is_grp_capable )
+    {
+        mbedtls_internal_ecp_free( grp );
+    }
+
+#endif /* MBEDTLS_ECP_INTERNAL_ALT */
+    mbedtls_ecp_point_free( &mP );
+
+    return( ret );
+}
+
+
+#if defined(ECP_MONTGOMERY)
+/*
+ * Check validity of a public key for Montgomery curves with x-only schemes
+ */
+static int ecp_check_pubkey_mx( const mbedtls_ecp_group *grp, const mbedtls_ecp_point *pt )
+{
+    /* [Curve25519 p. 5] Just check X is the correct number of bytes */
+    /* Allow any public value, if it's too big then we'll just reduce it mod p
+     * (RFC 7748 sec. 5 para. 3). */
+    if( mbedtls_mpi_size( &pt->X ) > ( grp->nbits + 7 ) / 8 )
+        return( MBEDTLS_ERR_ECP_INVALID_KEY );
+
+    return( 0 );
+}
+#endif /* ECP_MONTGOMERY */
+
+/*
+ * Check that a point is valid as a public key
+ */
+int mbedtls_ecp_check_pubkey( const mbedtls_ecp_group *grp, const mbedtls_ecp_point *pt )
+{
+    /* Must use affine coordinates */
+    if( mbedtls_mpi_cmp_int( &pt->Z, 1 ) != 0 )
+        return( MBEDTLS_ERR_ECP_INVALID_KEY );
+
+#if defined(ECP_MONTGOMERY)
+    if( ecp_get_type( grp ) == ECP_TYPE_MONTGOMERY )
+        return( ecp_check_pubkey_mx( grp, pt ) );
+#endif
+#if defined(ECP_SHORTWEIERSTRASS)
+    if( ecp_get_type( grp ) == ECP_TYPE_SHORT_WEIERSTRASS )
+        return( ecp_check_pubkey_sw( grp, pt ) );
+#endif
+    return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
+}
+
+/*
+ * Check that an mbedtls_mpi is valid as a private key
+ */
+int mbedtls_ecp_check_privkey( const mbedtls_ecp_group *grp, const mbedtls_mpi *d )
+{
+#if defined(ECP_MONTGOMERY)
+    if( ecp_get_type( grp ) == ECP_TYPE_MONTGOMERY )
+    {
+        /* see RFC 7748 sec. 5 para. 5 */
+        if( mbedtls_mpi_get_bit( d, 0 ) != 0 ||
+            mbedtls_mpi_get_bit( d, 1 ) != 0 ||
+            mbedtls_mpi_bitlen( d ) - 1 != grp->nbits ) /* mbedtls_mpi_bitlen is one-based! */
+            return( MBEDTLS_ERR_ECP_INVALID_KEY );
+
+        /* see [Curve25519] page 5 */
+        if( grp->nbits == 254 && mbedtls_mpi_get_bit( d, 2 ) != 0 )
+            return( MBEDTLS_ERR_ECP_INVALID_KEY );
+
+        return( 0 );
+    }
+#endif /* ECP_MONTGOMERY */
+#if defined(ECP_SHORTWEIERSTRASS)
+    if( ecp_get_type( grp ) == ECP_TYPE_SHORT_WEIERSTRASS )
+    {
+        /* see SEC1 3.2 */
+        if( mbedtls_mpi_cmp_int( d, 1 ) < 0 ||
+            mbedtls_mpi_cmp_mpi( d, &grp->N ) >= 0 )
+            return( MBEDTLS_ERR_ECP_INVALID_KEY );
+        else
+            return( 0 );
+    }
+#endif /* ECP_SHORTWEIERSTRASS */
+
+    return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
+}
+
+/*
+ * Generate a keypair with configurable base point
+ */
+int mbedtls_ecp_gen_keypair_base( mbedtls_ecp_group *grp,
+                     const mbedtls_ecp_point *G,
+                     mbedtls_mpi *d, mbedtls_ecp_point *Q,
+                     int (*f_rng)(void *, unsigned char *, size_t),
+                     void *p_rng )
+{
+    int ret;
+    size_t n_size = ( grp->nbits + 7 ) / 8;
+
+#if defined(ECP_MONTGOMERY)
+    if( ecp_get_type( grp ) == ECP_TYPE_MONTGOMERY )
+    {
+        /* [M225] page 5 */
+        size_t b;
+
+        do {
+            MBEDTLS_MPI_CHK( mbedtls_mpi_fill_random( d, n_size, f_rng, p_rng ) );
+        } while( mbedtls_mpi_bitlen( d ) == 0);
+
+        /* Make sure the most significant bit is nbits */
+        b = mbedtls_mpi_bitlen( d ) - 1; /* mbedtls_mpi_bitlen is one-based */
+        if( b > grp->nbits )
+            MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( d, b - grp->nbits ) );
+        else
+            MBEDTLS_MPI_CHK( mbedtls_mpi_set_bit( d, grp->nbits, 1 ) );
+
+        /* Make sure the last two bits are unset for Curve448, three bits for
+           Curve25519 */
+        MBEDTLS_MPI_CHK( mbedtls_mpi_set_bit( d, 0, 0 ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_set_bit( d, 1, 0 ) );
+        if( grp->nbits == 254 )
+        {
+            MBEDTLS_MPI_CHK( mbedtls_mpi_set_bit( d, 2, 0 ) );
+        }
+    }
+    else
+#endif /* ECP_MONTGOMERY */
+#if defined(ECP_SHORTWEIERSTRASS)
+    if( ecp_get_type( grp ) == ECP_TYPE_SHORT_WEIERSTRASS )
+    {
+        /* SEC1 3.2.1: Generate d such that 1 <= n < N */
+        int count = 0;
+
+        /*
+         * Match the procedure given in RFC 6979 (deterministic ECDSA):
+         * - use the same byte ordering;
+         * - keep the leftmost nbits bits of the generated octet string;
+         * - try until result is in the desired range.
+         * This also avoids any biais, which is especially important for ECDSA.
+         */
+        do
+        {
+            MBEDTLS_MPI_CHK( mbedtls_mpi_fill_random( d, n_size, f_rng, p_rng ) );
+            MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( d, 8 * n_size - grp->nbits ) );
+
+            /*
+             * Each try has at worst a probability 1/2 of failing (the msb has
+             * a probability 1/2 of being 0, and then the result will be < N),
+             * so after 30 tries failure probability is a most 2**(-30).
+             *
+             * For most curves, 1 try is enough with overwhelming probability,
+             * since N starts with a lot of 1s in binary, but some curves
+             * such as secp224k1 are actually very close to the worst case.
+             */
+            if( ++count > 30 )
+                return( MBEDTLS_ERR_ECP_RANDOM_FAILED );
+        }
+        while( mbedtls_mpi_cmp_int( d, 1 ) < 0 ||
+               mbedtls_mpi_cmp_mpi( d, &grp->N ) >= 0 );
+    }
+    else
+#endif /* ECP_SHORTWEIERSTRASS */
+        return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
+
+cleanup:
+    if( ret != 0 )
+        return( ret );
+
+    return( mbedtls_ecp_mul( grp, Q, d, G, f_rng, p_rng ) );
+}
+
+/*
+ * Generate key pair, wrapper for conventional base point
+ */
+int mbedtls_ecp_gen_keypair( mbedtls_ecp_group *grp,
+                             mbedtls_mpi *d, mbedtls_ecp_point *Q,
+                             int (*f_rng)(void *, unsigned char *, size_t),
+                             void *p_rng )
+{
+    return( mbedtls_ecp_gen_keypair_base( grp, &grp->G, d, Q, f_rng, p_rng ) );
+}
+
+/*
+ * Generate a keypair, prettier wrapper
+ */
+int mbedtls_ecp_gen_key( mbedtls_ecp_group_id grp_id, mbedtls_ecp_keypair *key,
+                int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
+{
+    int ret;
+
+    if( ( ret = mbedtls_ecp_group_load( &key->grp, grp_id ) ) != 0 )
+        return( ret );
+
+    return( mbedtls_ecp_gen_keypair( &key->grp, &key->d, &key->Q, f_rng, p_rng ) );
+}
+
+/*
+ * Check a public-private key pair
+ */
+int mbedtls_ecp_check_pub_priv( const mbedtls_ecp_keypair *pub, const mbedtls_ecp_keypair *prv )
+{
+    int ret;
+    mbedtls_ecp_point Q;
+    mbedtls_ecp_group grp;
+
+    if( pub->grp.id == MBEDTLS_ECP_DP_NONE ||
+        pub->grp.id != prv->grp.id ||
+        mbedtls_mpi_cmp_mpi( &pub->Q.X, &prv->Q.X ) ||
+        mbedtls_mpi_cmp_mpi( &pub->Q.Y, &prv->Q.Y ) ||
+        mbedtls_mpi_cmp_mpi( &pub->Q.Z, &prv->Q.Z ) )
+    {
+        return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
+    }
+
+    mbedtls_ecp_point_init( &Q );
+    mbedtls_ecp_group_init( &grp );
+
+    /* mbedtls_ecp_mul() needs a non-const group... */
+    mbedtls_ecp_group_copy( &grp, &prv->grp );
+
+    /* Also checks d is valid */
+    MBEDTLS_MPI_CHK( mbedtls_ecp_mul( &grp, &Q, &prv->d, &prv->grp.G, NULL, NULL ) );
+
+    if( mbedtls_mpi_cmp_mpi( &Q.X, &prv->Q.X ) ||
+        mbedtls_mpi_cmp_mpi( &Q.Y, &prv->Q.Y ) ||
+        mbedtls_mpi_cmp_mpi( &Q.Z, &prv->Q.Z ) )
+    {
+        ret = MBEDTLS_ERR_ECP_BAD_INPUT_DATA;
+        goto cleanup;
+    }
+
+cleanup:
+    mbedtls_ecp_point_free( &Q );
+    mbedtls_ecp_group_free( &grp );
+
+    return( ret );
+}
+
+#if defined(MBEDTLS_SELF_TEST)
+
+/*
+ * Checkup routine
+ */
+int mbedtls_ecp_self_test( int verbose )
+{
+    int ret;
+    size_t i;
+    mbedtls_ecp_group grp;
+    mbedtls_ecp_point R, P;
+    mbedtls_mpi m;
+    unsigned long add_c_prev, dbl_c_prev, mul_c_prev;
+    /* exponents especially adapted for secp192r1 */
+    const char *exponents[] =
+    {
+        "000000000000000000000000000000000000000000000001", /* one */
+        "FFFFFFFFFFFFFFFFFFFFFFFF99DEF836146BC9B1B4D22830", /* N - 1 */
+        "5EA6F389A38B8BC81E767753B15AA5569E1782E30ABE7D25", /* random */
+        "400000000000000000000000000000000000000000000000", /* one and zeros */
+        "7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF", /* all ones */
+        "555555555555555555555555555555555555555555555555", /* 101010... */
+    };
+
+    mbedtls_ecp_group_init( &grp );
+    mbedtls_ecp_point_init( &R );
+    mbedtls_ecp_point_init( &P );
+    mbedtls_mpi_init( &m );
+
+    /* Use secp192r1 if available, or any available curve */
+#if defined(MBEDTLS_ECP_DP_SECP192R1_ENABLED)
+    MBEDTLS_MPI_CHK( mbedtls_ecp_group_load( &grp, MBEDTLS_ECP_DP_SECP192R1 ) );
+#else
+    MBEDTLS_MPI_CHK( mbedtls_ecp_group_load( &grp, mbedtls_ecp_curve_list()->grp_id ) );
+#endif
+
+    if( verbose != 0 )
+        mbedtls_printf( "  ECP test #1 (constant op_count, base point G): " );
+
+    /* Do a dummy multiplication first to trigger precomputation */
+    MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &m, 2 ) );
+    MBEDTLS_MPI_CHK( mbedtls_ecp_mul( &grp, &P, &m, &grp.G, NULL, NULL ) );
+
+    add_count = 0;
+    dbl_count = 0;
+    mul_count = 0;
+    MBEDTLS_MPI_CHK( mbedtls_mpi_read_string( &m, 16, exponents[0] ) );
+    MBEDTLS_MPI_CHK( mbedtls_ecp_mul( &grp, &R, &m, &grp.G, NULL, NULL ) );
+
+    for( i = 1; i < sizeof( exponents ) / sizeof( exponents[0] ); i++ )
+    {
+        add_c_prev = add_count;
+        dbl_c_prev = dbl_count;
+        mul_c_prev = mul_count;
+        add_count = 0;
+        dbl_count = 0;
+        mul_count = 0;
+
+        MBEDTLS_MPI_CHK( mbedtls_mpi_read_string( &m, 16, exponents[i] ) );
+        MBEDTLS_MPI_CHK( mbedtls_ecp_mul( &grp, &R, &m, &grp.G, NULL, NULL ) );
+
+        if( add_count != add_c_prev ||
+            dbl_count != dbl_c_prev ||
+            mul_count != mul_c_prev )
+        {
+            if( verbose != 0 )
+                mbedtls_printf( "failed (%u)\n", (unsigned int) i );
+
+            ret = 1;
+            goto cleanup;
+        }
+    }
+
+    if( verbose != 0 )
+        mbedtls_printf( "passed\n" );
+
+    if( verbose != 0 )
+        mbedtls_printf( "  ECP test #2 (constant op_count, other point): " );
+    /* We computed P = 2G last time, use it */
+
+    add_count = 0;
+    dbl_count = 0;
+    mul_count = 0;
+    MBEDTLS_MPI_CHK( mbedtls_mpi_read_string( &m, 16, exponents[0] ) );
+    MBEDTLS_MPI_CHK( mbedtls_ecp_mul( &grp, &R, &m, &P, NULL, NULL ) );
+
+    for( i = 1; i < sizeof( exponents ) / sizeof( exponents[0] ); i++ )
+    {
+        add_c_prev = add_count;
+        dbl_c_prev = dbl_count;
+        mul_c_prev = mul_count;
+        add_count = 0;
+        dbl_count = 0;
+        mul_count = 0;
+
+        MBEDTLS_MPI_CHK( mbedtls_mpi_read_string( &m, 16, exponents[i] ) );
+        MBEDTLS_MPI_CHK( mbedtls_ecp_mul( &grp, &R, &m, &P, NULL, NULL ) );
+
+        if( add_count != add_c_prev ||
+            dbl_count != dbl_c_prev ||
+            mul_count != mul_c_prev )
+        {
+            if( verbose != 0 )
+                mbedtls_printf( "failed (%u)\n", (unsigned int) i );
+
+            ret = 1;
+            goto cleanup;
+        }
+    }
+
+    if( verbose != 0 )
+        mbedtls_printf( "passed\n" );
+
+cleanup:
+
+    if( ret < 0 && verbose != 0 )
+        mbedtls_printf( "Unexpected error, return code = %08X\n", ret );
+
+    mbedtls_ecp_group_free( &grp );
+    mbedtls_ecp_point_free( &R );
+    mbedtls_ecp_point_free( &P );
+    mbedtls_mpi_free( &m );
+
+    if( verbose != 0 )
+        mbedtls_printf( "\n" );
+
+    return( ret );
+}
+
+#endif /* MBEDTLS_SELF_TEST */
+
+#endif /* !MBEDTLS_ECP_ALT */
+
+#endif /* MBEDTLS_ECP_C */
diff --git a/common/mbedtls/ecp.h b/common/mbedtls/ecp.h
new file mode 100644
index 000000000..1821a72f8
--- /dev/null
+++ b/common/mbedtls/ecp.h
@@ -0,0 +1,766 @@
+/**
+ * \file ecp.h
+ *
+ * \brief This file provides an API for Elliptic Curves over GF(P) (ECP).
+ *
+ * The use of ECP in cryptography and TLS is defined in
+ * <em>Standards for Efficient Cryptography Group (SECG): SEC1
+ * Elliptic Curve Cryptography</em> and
+ * <em>RFC-4492: Elliptic Curve Cryptography (ECC) Cipher Suites
+ * for Transport Layer Security (TLS)</em>.
+ *
+ * <em>RFC-2409: The Internet Key Exchange (IKE)</em> defines ECP
+ * group types.
+ *
+ */
+
+/*
+ *  Copyright (C) 2006-2018, Arm Limited (or its affiliates), All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of Mbed TLS (https://tls.mbed.org)
+ */
+
+#ifndef MBEDTLS_ECP_H
+#define MBEDTLS_ECP_H
+
+#include "bignum.h"
+
+/*
+ * ECP error codes
+ */
+#define MBEDTLS_ERR_ECP_BAD_INPUT_DATA                    -0x4F80  /**< Bad input parameters to function. */
+#define MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL                  -0x4F00  /**< The buffer is too small to write to. */
+#define MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE               -0x4E80  /**< The requested feature is not available, for example, the requested curve is not supported. */
+#define MBEDTLS_ERR_ECP_VERIFY_FAILED                     -0x4E00  /**< The signature is not valid. */
+#define MBEDTLS_ERR_ECP_ALLOC_FAILED                      -0x4D80  /**< Memory allocation failed. */
+#define MBEDTLS_ERR_ECP_RANDOM_FAILED                     -0x4D00  /**< Generation of random value, such as ephemeral key, failed. */
+#define MBEDTLS_ERR_ECP_INVALID_KEY                       -0x4C80  /**< Invalid private or public key. */
+#define MBEDTLS_ERR_ECP_SIG_LEN_MISMATCH                  -0x4C00  /**< The buffer contains a valid signature followed by more data. */
+#define MBEDTLS_ERR_ECP_HW_ACCEL_FAILED                   -0x4B80  /**< The ECP hardware accelerator failed. */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * Domain-parameter identifiers: curve, subgroup, and generator.
+ *
+ * \note Only curves over prime fields are supported.
+ *
+ * \warning This library does not support validation of arbitrary domain
+ * parameters. Therefore, only standardized domain parameters from trusted
+ * sources should be used. See mbedtls_ecp_group_load().
+ */
+typedef enum
+{
+    MBEDTLS_ECP_DP_NONE = 0,       /*!< Curve not defined. */
+    MBEDTLS_ECP_DP_SECP192R1,      /*!< Domain parameters for the 192-bit curve defined by FIPS 186-4 and SEC1. */
+    MBEDTLS_ECP_DP_SECP224R1,      /*!< Domain parameters for the 224-bit curve defined by FIPS 186-4 and SEC1. */
+    MBEDTLS_ECP_DP_SECP256R1,      /*!< Domain parameters for the 256-bit curve defined by FIPS 186-4 and SEC1. */
+    MBEDTLS_ECP_DP_SECP384R1,      /*!< Domain parameters for the 384-bit curve defined by FIPS 186-4 and SEC1. */
+    MBEDTLS_ECP_DP_SECP521R1,      /*!< Domain parameters for the 521-bit curve defined by FIPS 186-4 and SEC1. */
+    MBEDTLS_ECP_DP_BP256R1,        /*!< Domain parameters for 256-bit Brainpool curve. */
+    MBEDTLS_ECP_DP_BP384R1,        /*!< Domain parameters for 384-bit Brainpool curve. */
+    MBEDTLS_ECP_DP_BP512R1,        /*!< Domain parameters for 512-bit Brainpool curve. */
+    MBEDTLS_ECP_DP_CURVE25519,     /*!< Domain parameters for Curve25519. */
+    MBEDTLS_ECP_DP_SECP192K1,      /*!< Domain parameters for 192-bit "Koblitz" curve. */
+    MBEDTLS_ECP_DP_SECP224K1,      /*!< Domain parameters for 224-bit "Koblitz" curve. */
+    MBEDTLS_ECP_DP_SECP256K1,      /*!< Domain parameters for 256-bit "Koblitz" curve. */
+    MBEDTLS_ECP_DP_CURVE448,       /*!< Domain parameters for Curve448. */
+} mbedtls_ecp_group_id;
+
+/**
+ * The number of supported curves, plus one for #MBEDTLS_ECP_DP_NONE.
+ *
+ * \note Montgomery curves are currently excluded.
+ */
+#define MBEDTLS_ECP_DP_MAX     12
+
+/**
+ * Curve information, for use by other modules.
+ */
+typedef struct mbedtls_ecp_curve_info
+{
+    mbedtls_ecp_group_id grp_id;    /*!< An internal identifier. */
+    uint16_t tls_id;                /*!< The TLS NamedCurve identifier. */
+    uint16_t bit_size;              /*!< The curve size in bits. */
+    const char *name;               /*!< A human-friendly name. */
+} mbedtls_ecp_curve_info;
+
+/**
+ * \brief           The ECP point structure, in Jacobian coordinates.
+ *
+ * \note            All functions expect and return points satisfying
+ *                  the following condition: <code>Z == 0</code> or
+ *                  <code>Z == 1</code>. Other values of \p Z are
+ *                  used only by internal functions.
+ *                  The point is zero, or "at infinity", if <code>Z == 0</code>.
+ *                  Otherwise, \p X and \p Y are its standard (affine)
+ *                  coordinates.
+ */
+typedef struct mbedtls_ecp_point
+{
+    mbedtls_mpi X;          /*!< The X coordinate of the ECP point. */
+    mbedtls_mpi Y;          /*!< The Y coordinate of the ECP point. */
+    mbedtls_mpi Z;          /*!< The Z coordinate of the ECP point. */
+}
+mbedtls_ecp_point;
+
+#if !defined(MBEDTLS_ECP_ALT)
+/*
+ * default mbed TLS elliptic curve arithmetic implementation
+ *
+ * (in case MBEDTLS_ECP_ALT is defined then the developer has to provide an
+ * alternative implementation for the whole module and it will replace this
+ * one.)
+ */
+
+/**
+ * \brief           The ECP group structure.
+ *
+ * We consider two types of curve equations:
+ * <ul><li>Short Weierstrass: <code>y^2 = x^3 + A x + B mod P</code>
+ * (SEC1 + RFC-4492)</li>
+ * <li>Montgomery: <code>y^2 = x^3 + A x^2 + x mod P</code> (Curve25519,
+ * Curve448)</li></ul>
+ * In both cases, the generator (\p G) for a prime-order subgroup is fixed.
+ *
+ * For Short Weierstrass, this subgroup is the whole curve, and its
+ * cardinality is denoted by \p N. Our code requires that \p N is an
+ * odd prime as mbedtls_ecp_mul() requires an odd number, and
+ * mbedtls_ecdsa_sign() requires that it is prime for blinding purposes.
+ *
+ * For Montgomery curves, we do not store \p A, but <code>(A + 2) / 4</code>,
+ * which is the quantity used in the formulas. Additionally, \p nbits is
+ * not the size of \p N but the required size for private keys.
+ *
+ * If \p modp is NULL, reduction modulo \p P is done using a generic algorithm.
+ * Otherwise, \p modp must point to a function that takes an \p mbedtls_mpi in the
+ * range of <code>0..2^(2*pbits)-1</code>, and transforms it in-place to an integer
+ * which is congruent mod \p P to the given MPI, and is close enough to \p pbits
+ * in size, so that it may be efficiently brought in the 0..P-1 range by a few
+ * additions or subtractions. Therefore, it is only an approximative modular
+ * reduction. It must return 0 on success and non-zero on failure.
+ *
+ */
+typedef struct mbedtls_ecp_group
+{
+    mbedtls_ecp_group_id id;    /*!< An internal group identifier. */
+    mbedtls_mpi P;              /*!< The prime modulus of the base field. */
+    mbedtls_mpi A;              /*!< For Short Weierstrass: \p A in the equation. For
+                                     Montgomery curves: <code>(A + 2) / 4</code>. */
+    mbedtls_mpi B;              /*!< For Short Weierstrass: \p B in the equation.
+                                     For Montgomery curves: unused. */
+    mbedtls_ecp_point G;        /*!< The generator of the subgroup used. */
+    mbedtls_mpi N;              /*!< The order of \p G. */
+    size_t pbits;               /*!< The number of bits in \p P.*/
+    size_t nbits;               /*!< For Short Weierstrass: The number of bits in \p P.
+                                     For Montgomery curves: the number of bits in the
+                                     private keys. */
+    unsigned int h;             /*!< \internal 1 if the constants are static. */
+    int (*modp)(mbedtls_mpi *); /*!< The function for fast pseudo-reduction
+                                     mod \p P (see above).*/
+    int (*t_pre)(mbedtls_ecp_point *, void *);  /*!< Unused. */
+    int (*t_post)(mbedtls_ecp_point *, void *); /*!< Unused. */
+    void *t_data;               /*!< Unused. */
+    mbedtls_ecp_point *T;       /*!< Pre-computed points for ecp_mul_comb(). */
+    size_t T_size;              /*!< The number of pre-computed points. */
+}
+mbedtls_ecp_group;
+
+/**
+ * \name SECTION: Module settings
+ *
+ * The configuration options you can set for this module are in this section.
+ * Either change them in config.h, or define them using the compiler command line.
+ * \{
+ */
+
+#if !defined(MBEDTLS_ECP_MAX_BITS)
+/**
+ * The maximum size of the groups, that is, of \c N and \c P.
+ */
+#define MBEDTLS_ECP_MAX_BITS     521   /**< The maximum size of groups, in bits. */
+#endif
+
+#define MBEDTLS_ECP_MAX_BYTES    ( ( MBEDTLS_ECP_MAX_BITS + 7 ) / 8 )
+#define MBEDTLS_ECP_MAX_PT_LEN   ( 2 * MBEDTLS_ECP_MAX_BYTES + 1 )
+
+#if !defined(MBEDTLS_ECP_WINDOW_SIZE)
+/*
+ * Maximum "window" size used for point multiplication.
+ * Default: 6.
+ * Minimum value: 2. Maximum value: 7.
+ *
+ * Result is an array of at most ( 1 << ( MBEDTLS_ECP_WINDOW_SIZE - 1 ) )
+ * points used for point multiplication. This value is directly tied to EC
+ * peak memory usage, so decreasing it by one should roughly cut memory usage
+ * by two (if large curves are in use).
+ *
+ * Reduction in size may reduce speed, but larger curves are impacted first.
+ * Sample performances (in ECDHE handshakes/s, with FIXED_POINT_OPTIM = 1):
+ *      w-size:     6       5       4       3       2
+ *      521       145     141     135     120      97
+ *      384       214     209     198     177     146
+ *      256       320     320     303     262     226
+ *      224       475     475     453     398     342
+ *      192       640     640     633     587     476
+ */
+#define MBEDTLS_ECP_WINDOW_SIZE    6   /**< The maximum window size used. */
+#endif /* MBEDTLS_ECP_WINDOW_SIZE */
+
+#if !defined(MBEDTLS_ECP_FIXED_POINT_OPTIM)
+/*
+ * Trade memory for speed on fixed-point multiplication.
+ *
+ * This speeds up repeated multiplication of the generator (that is, the
+ * multiplication in ECDSA signatures, and half of the multiplications in
+ * ECDSA verification and ECDHE) by a factor roughly 3 to 4.
+ *
+ * The cost is increasing EC peak memory usage by a factor roughly 2.
+ *
+ * Change this value to 0 to reduce peak memory usage.
+ */
+#define MBEDTLS_ECP_FIXED_POINT_OPTIM  1   /**< Enable fixed-point speed-up. */
+#endif /* MBEDTLS_ECP_FIXED_POINT_OPTIM */
+
+/* \} name SECTION: Module settings */
+
+#else  /* MBEDTLS_ECP_ALT */
+#include "ecp_alt.h"
+#endif /* MBEDTLS_ECP_ALT */
+
+/**
+ * \brief    The ECP key-pair structure.
+ *
+ * A generic key-pair that may be used for ECDSA and fixed ECDH, for example.
+ *
+ * \note    Members are deliberately in the same order as in the
+ *          ::mbedtls_ecdsa_context structure.
+ */
+typedef struct mbedtls_ecp_keypair
+{
+    mbedtls_ecp_group grp;      /*!<  Elliptic curve and base point     */
+    mbedtls_mpi d;              /*!<  our secret value                  */
+    mbedtls_ecp_point Q;        /*!<  our public value                  */
+}
+mbedtls_ecp_keypair;
+
+/*
+ * Point formats, from RFC 4492's enum ECPointFormat
+ */
+#define MBEDTLS_ECP_PF_UNCOMPRESSED    0   /**< Uncompressed point format. */
+#define MBEDTLS_ECP_PF_COMPRESSED      1   /**< Compressed point format. */
+
+/*
+ * Some other constants from RFC 4492
+ */
+#define MBEDTLS_ECP_TLS_NAMED_CURVE    3   /**< The named_curve of ECCurveType. */
+
+/**
+ * \brief           This function retrieves the information defined in
+ *                  mbedtls_ecp_curve_info() for all supported curves in order
+ *                  of preference.
+ *
+ * \return          A statically allocated array. The last entry is 0.
+ */
+const mbedtls_ecp_curve_info *mbedtls_ecp_curve_list( void );
+
+/**
+ * \brief           This function retrieves the list of internal group
+ *                  identifiers of all supported curves in the order of
+ *                  preference.
+ *
+ * \return          A statically allocated array,
+ *                  terminated with MBEDTLS_ECP_DP_NONE.
+ */
+const mbedtls_ecp_group_id *mbedtls_ecp_grp_id_list( void );
+
+/**
+ * \brief           This function retrieves curve information from an internal
+ *                  group identifier.
+ *
+ * \param grp_id    An \c MBEDTLS_ECP_DP_XXX value.
+ *
+ * \return          The associated curve information on success.
+ * \return          NULL on failure.
+ */
+const mbedtls_ecp_curve_info *mbedtls_ecp_curve_info_from_grp_id( mbedtls_ecp_group_id grp_id );
+
+/**
+ * \brief           This function retrieves curve information from a TLS
+ *                  NamedCurve value.
+ *
+ * \param tls_id    An \c MBEDTLS_ECP_DP_XXX value.
+ *
+ * \return          The associated curve information on success.
+ * \return          NULL on failure.
+ */
+const mbedtls_ecp_curve_info *mbedtls_ecp_curve_info_from_tls_id( uint16_t tls_id );
+
+/**
+ * \brief           This function retrieves curve information from a
+ *                  human-readable name.
+ *
+ * \param name      The human-readable name.
+ *
+ * \return          The associated curve information on success.
+ * \return          NULL on failure.
+ */
+const mbedtls_ecp_curve_info *mbedtls_ecp_curve_info_from_name( const char *name );
+
+/**
+ * \brief           This function initializes a point as zero.
+ *
+ * \param pt        The point to initialize.
+ */
+void mbedtls_ecp_point_init( mbedtls_ecp_point *pt );
+
+/**
+ * \brief           This function initializes an ECP group context
+ *                  without loading any domain parameters.
+ *
+ * \note            After this function is called, domain parameters
+ *                  for various ECP groups can be loaded through the
+ *                  mbedtls_ecp_load() or mbedtls_ecp_tls_read_group()
+ *                  functions.
+ */
+void mbedtls_ecp_group_init( mbedtls_ecp_group *grp );
+
+/**
+ * \brief           This function initializes a key pair as an invalid one.
+ *
+ * \param key       The key pair to initialize.
+ */
+void mbedtls_ecp_keypair_init( mbedtls_ecp_keypair *key );
+
+/**
+ * \brief           This function frees the components of a point.
+ *
+ * \param pt        The point to free.
+ */
+void mbedtls_ecp_point_free( mbedtls_ecp_point *pt );
+
+/**
+ * \brief           This function frees the components of an ECP group.
+ * \param grp       The group to free.
+ */
+void mbedtls_ecp_group_free( mbedtls_ecp_group *grp );
+
+/**
+ * \brief           This function frees the components of a key pair.
+ * \param key       The key pair to free.
+ */
+void mbedtls_ecp_keypair_free( mbedtls_ecp_keypair *key );
+
+/**
+ * \brief           This function copies the contents of point \p Q into
+ *                  point \p P.
+ *
+ * \param P         The destination point.
+ * \param Q         The source point.
+ *
+ * \return          \c 0 on success.
+ * \return          #MBEDTLS_ERR_MPI_ALLOC_FAILED on memory-allocation failure.
+ */
+int mbedtls_ecp_copy( mbedtls_ecp_point *P, const mbedtls_ecp_point *Q );
+
+/**
+ * \brief           This function copies the contents of group \p src into
+ *                  group \p dst.
+ *
+ * \param dst       The destination group.
+ * \param src       The source group.
+ *
+ * \return          \c 0 on success.
+ * \return          #MBEDTLS_ERR_MPI_ALLOC_FAILED on memory-allocation failure.
+ */
+int mbedtls_ecp_group_copy( mbedtls_ecp_group *dst, const mbedtls_ecp_group *src );
+
+/**
+ * \brief           This function sets a point to zero.
+ *
+ * \param pt        The point to set.
+ *
+ * \return          \c 0 on success.
+ * \return          #MBEDTLS_ERR_MPI_ALLOC_FAILED on memory-allocation failure.
+ */
+int mbedtls_ecp_set_zero( mbedtls_ecp_point *pt );
+
+/**
+ * \brief           This function checks if a point is zero.
+ *
+ * \param pt        The point to test.
+ *
+ * \return          \c 1 if the point is zero.
+ * \return          \c 0 if the point is non-zero.
+ */
+int mbedtls_ecp_is_zero( mbedtls_ecp_point *pt );
+
+/**
+ * \brief           This function compares two points.
+ *
+ * \note            This assumes that the points are normalized. Otherwise,
+ *                  they may compare as "not equal" even if they are.
+ *
+ * \param P         The first point to compare.
+ * \param Q         The second point to compare.
+ *
+ * \return          \c 0 if the points are equal.
+ * \return          #MBEDTLS_ERR_ECP_BAD_INPUT_DATA if the points are not equal.
+ */
+int mbedtls_ecp_point_cmp( const mbedtls_ecp_point *P,
+                           const mbedtls_ecp_point *Q );
+
+/**
+ * \brief           This function imports a non-zero point from two ASCII
+ *                  strings.
+ *
+ * \param P         The destination point.
+ * \param radix     The numeric base of the input.
+ * \param x         The first affine coordinate, as a null-terminated string.
+ * \param y         The second affine coordinate, as a null-terminated string.
+ *
+ * \return          \c 0 on success.
+ * \return          An \c MBEDTLS_ERR_MPI_XXX error code on failure.
+ */
+int mbedtls_ecp_point_read_string( mbedtls_ecp_point *P, int radix,
+                           const char *x, const char *y );
+
+/**
+ * \brief           This function exports a point into unsigned binary data.
+ *
+ * \param grp       The group to which the point should belong.
+ * \param P         The point to export.
+ * \param format    The point format. Should be an \c MBEDTLS_ECP_PF_XXX macro.
+ * \param olen      The length of the output.
+ * \param buf       The output buffer.
+ * \param buflen    The length of the output buffer.
+ *
+ * \return          \c 0 on success.
+ * \return          #MBEDTLS_ERR_ECP_BAD_INPUT_DATA
+ *                  or #MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL on failure.
+ */
+int mbedtls_ecp_point_write_binary( const mbedtls_ecp_group *grp, const mbedtls_ecp_point *P,
+                            int format, size_t *olen,
+                            unsigned char *buf, size_t buflen );
+
+/**
+ * \brief           This function imports a point from unsigned binary data.
+ *
+ * \note            This function does not check that the point actually
+ *                  belongs to the given group, see mbedtls_ecp_check_pubkey()
+ *                  for that.
+ *
+ * \param grp       The group to which the point should belong.
+ * \param P         The point to import.
+ * \param buf       The input buffer.
+ * \param ilen      The length of the input.
+ *
+ * \return          \c 0 on success.
+ * \return          #MBEDTLS_ERR_ECP_BAD_INPUT_DATA if input is invalid.
+ * \return          #MBEDTLS_ERR_MPI_ALLOC_FAILED on memory-allocation failure.
+ * \return          #MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE if the point format
+ *                  is not implemented.
+ *
+ */
+int mbedtls_ecp_point_read_binary( const mbedtls_ecp_group *grp, mbedtls_ecp_point *P,
+                           const unsigned char *buf, size_t ilen );
+
+/**
+ * \brief           This function imports a point from a TLS ECPoint record.
+ *
+ * \note            On function return, \p buf is updated to point to immediately
+ *                  after the ECPoint record.
+ *
+ * \param grp       The ECP group used.
+ * \param pt        The destination point.
+ * \param buf       The address of the pointer to the start of the input buffer.
+ * \param len       The length of the buffer.
+ *
+ * \return          \c 0 on success.
+ * \return          An \c MBEDTLS_ERR_MPI_XXX error code on initialization failure.
+ * \return          #MBEDTLS_ERR_ECP_BAD_INPUT_DATA if input is invalid.
+ */
+int mbedtls_ecp_tls_read_point( const mbedtls_ecp_group *grp, mbedtls_ecp_point *pt,
+                        const unsigned char **buf, size_t len );
+
+/**
+ * \brief           This function exports a point as a TLS ECPoint record.
+ *
+ * \param grp       The ECP group used.
+ * \param pt        The point format to export to. The point format is an
+ *                  \c MBEDTLS_ECP_PF_XXX constant.
+ * \param format    The export format.
+ * \param olen      The length of the data written.
+ * \param buf       The buffer to write to.
+ * \param blen      The length of the buffer.
+ *
+ * \return          \c 0 on success.
+ * \return          #MBEDTLS_ERR_ECP_BAD_INPUT_DATA or
+ *                  #MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL on failure.
+ */
+int mbedtls_ecp_tls_write_point( const mbedtls_ecp_group *grp, const mbedtls_ecp_point *pt,
+                         int format, size_t *olen,
+                         unsigned char *buf, size_t blen );
+
+/**
+ * \brief           This function sets a group using standardized domain parameters.
+ *
+ * \note            The index should be a value of the NamedCurve enum,
+ *                  as defined in <em>RFC-4492: Elliptic Curve Cryptography
+ *                  (ECC) Cipher Suites for Transport Layer Security (TLS)</em>,
+ *                  usually in the form of an \c MBEDTLS_ECP_DP_XXX macro.
+ *
+ * \param grp       The destination group.
+ * \param id        The identifier of the domain parameter set to load.
+ *
+ * \return          \c 0 on success,
+ * \return          An \c MBEDTLS_ERR_MPI_XXX error code on initialization failure.
+ * \return          #MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE for unkownn groups.
+
+ */
+int mbedtls_ecp_group_load( mbedtls_ecp_group *grp, mbedtls_ecp_group_id id );
+
+/**
+ * \brief           This function sets a group from a TLS ECParameters record.
+ *
+ * \note            \p buf is updated to point right after the ECParameters record
+ *                  on exit.
+ *
+ * \param grp       The destination group.
+ * \param buf       The address of the pointer to the start of the input buffer.
+ * \param len       The length of the buffer.
+ *
+ * \return          \c 0 on success.
+ * \return          An \c MBEDTLS_ERR_MPI_XXX error code on initialization failure.
+ * \return          #MBEDTLS_ERR_ECP_BAD_INPUT_DATA if input is invalid.
+ */
+int mbedtls_ecp_tls_read_group( mbedtls_ecp_group *grp, const unsigned char **buf, size_t len );
+
+/**
+ * \brief           This function writes the TLS ECParameters record for a group.
+ *
+ * \param grp       The ECP group used.
+ * \param olen      The number of Bytes written.
+ * \param buf       The buffer to write to.
+ * \param blen      The length of the buffer.
+ *
+ * \return          \c 0 on success.
+ * \return          #MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL on failure.
+ */
+int mbedtls_ecp_tls_write_group( const mbedtls_ecp_group *grp, size_t *olen,
+                         unsigned char *buf, size_t blen );
+
+/**
+ * \brief           This function performs multiplication of a point by
+ *                  an integer: \p R = \p m * \p P.
+ *
+ *                  It is not thread-safe to use same group in multiple threads.
+ *
+ * \note            To prevent timing attacks, this function
+ *                  executes the exact same sequence of base-field
+ *                  operations for any valid \p m. It avoids any if-branch or
+ *                  array index depending on the value of \p m.
+ *
+ * \note            If \p f_rng is not NULL, it is used to randomize
+ *                  intermediate results to prevent potential timing attacks
+ *                  targeting these results. We recommend always providing
+ *                  a non-NULL \p f_rng. The overhead is negligible.
+ *
+ * \param grp       The ECP group.
+ * \param R         The destination point.
+ * \param m         The integer by which to multiply.
+ * \param P         The point to multiply.
+ * \param f_rng     The RNG function.
+ * \param p_rng     The RNG context.
+ *
+ * \return          \c 0 on success.
+ * \return          #MBEDTLS_ERR_ECP_INVALID_KEY if \p m is not a valid private
+ *                  key, or \p P is not a valid public key.
+ * \return          #MBEDTLS_ERR_MPI_ALLOC_FAILED on memory-allocation failure.
+ */
+int mbedtls_ecp_mul( mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
+             const mbedtls_mpi *m, const mbedtls_ecp_point *P,
+             int (*f_rng)(void *, unsigned char *, size_t), void *p_rng );
+
+/**
+ * \brief           This function performs multiplication and addition of two
+ *                  points by integers: \p R = \p m * \p P + \p n * \p Q
+ *
+ *                  It is not thread-safe to use same group in multiple threads.
+ *
+ * \note            In contrast to mbedtls_ecp_mul(), this function does not
+ *                  guarantee a constant execution flow and timing.
+ *
+ * \param grp       The ECP group.
+ * \param R         The destination point.
+ * \param m         The integer by which to multiply \p P.
+ * \param P         The point to multiply by \p m.
+ * \param n         The integer by which to multiply \p Q.
+ * \param Q         The point to be multiplied by \p n.
+ *
+ * \return          \c 0 on success.
+ * \return          #MBEDTLS_ERR_ECP_INVALID_KEY if \p m or \p n are not
+ *                  valid private keys, or \p P or \p Q are not valid public
+ *                  keys.
+ * \return          #MBEDTLS_ERR_MPI_ALLOC_FAILED on memory-allocation failure.
+ */
+int mbedtls_ecp_muladd( mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
+             const mbedtls_mpi *m, const mbedtls_ecp_point *P,
+             const mbedtls_mpi *n, const mbedtls_ecp_point *Q );
+
+/**
+ * \brief           This function checks that a point is a valid public key
+ *                  on this curve.
+ *
+ *                  It only checks that the point is non-zero, has
+ *                  valid coordinates and lies on the curve. It does not verify
+ *                  that it is indeed a multiple of \p G. This additional
+ *                  check is computationally more expensive, is not required
+ *                  by standards, and should not be necessary if the group
+ *                  used has a small cofactor. In particular, it is useless for
+ *                  the NIST groups which all have a cofactor of 1.
+ *
+ * \note            This function uses bare components rather than an
+ *                  ::mbedtls_ecp_keypair structure, to ease use with other
+ *                  structures, such as ::mbedtls_ecdh_context or
+ *                  ::mbedtls_ecdsa_context.
+ *
+ * \param grp       The curve the point should lie on.
+ * \param pt        The point to check.
+ *
+ * \return          \c 0 if the point is a valid public key.
+ * \return          #MBEDTLS_ERR_ECP_INVALID_KEY on failure.
+ */
+int mbedtls_ecp_check_pubkey( const mbedtls_ecp_group *grp, const mbedtls_ecp_point *pt );
+
+/**
+ * \brief           This function checks that an \p mbedtls_mpi is a valid private
+ *                  key for this curve.
+ *
+ * \note            This function uses bare components rather than an
+ *                  ::mbedtls_ecp_keypair structure to ease use with other
+ *                  structures, such as ::mbedtls_ecdh_context or
+ *                  ::mbedtls_ecdsa_context.
+ *
+ * \param grp       The group used.
+ * \param d         The integer to check.
+ *
+ * \return          \c 0 if the point is a valid private key.
+ * \return          #MBEDTLS_ERR_ECP_INVALID_KEY on failure.
+ */
+int mbedtls_ecp_check_privkey( const mbedtls_ecp_group *grp, const mbedtls_mpi *d );
+
+/**
+ * \brief           This function generates a keypair with a configurable base
+ *                  point.
+ *
+ * \note            This function uses bare components rather than an
+ *                  ::mbedtls_ecp_keypair structure to ease use with other
+ *                  structures, such as ::mbedtls_ecdh_context or
+ *                  ::mbedtls_ecdsa_context.
+ *
+ * \param grp       The ECP group.
+ * \param G         The chosen base point.
+ * \param d         The destination MPI (secret part).
+ * \param Q         The destination point (public part).
+ * \param f_rng     The RNG function.
+ * \param p_rng     The RNG context.
+ *
+ * \return          \c 0 on success.
+ * \return          An \c MBEDTLS_ERR_ECP_XXX or \c MBEDTLS_MPI_XXX error code
+ *                  on failure.
+ */
+int mbedtls_ecp_gen_keypair_base( mbedtls_ecp_group *grp,
+                     const mbedtls_ecp_point *G,
+                     mbedtls_mpi *d, mbedtls_ecp_point *Q,
+                     int (*f_rng)(void *, unsigned char *, size_t),
+                     void *p_rng );
+
+/**
+ * \brief           This function generates an ECP keypair.
+ *
+ * \note            This function uses bare components rather than an
+ *                  ::mbedtls_ecp_keypair structure to ease use with other
+ *                  structures, such as ::mbedtls_ecdh_context or
+ *                  ::mbedtls_ecdsa_context.
+ *
+ * \param grp       The ECP group.
+ * \param d         The destination MPI (secret part).
+ * \param Q         The destination point (public part).
+ * \param f_rng     The RNG function.
+ * \param p_rng     The RNG context.
+ *
+ * \return          \c 0 on success.
+ * \return          An \c MBEDTLS_ERR_ECP_XXX or \c MBEDTLS_MPI_XXX error code
+ *                  on failure.
+ */
+int mbedtls_ecp_gen_keypair( mbedtls_ecp_group *grp, mbedtls_mpi *d, mbedtls_ecp_point *Q,
+                     int (*f_rng)(void *, unsigned char *, size_t),
+                     void *p_rng );
+
+/**
+ * \brief           This function generates an ECP key.
+ *
+ * \param grp_id    The ECP group identifier.
+ * \param key       The destination key.
+ * \param f_rng     The RNG function.
+ * \param p_rng     The RNG context.
+ *
+ * \return          \c 0 on success.
+ * \return          An \c MBEDTLS_ERR_ECP_XXX or \c MBEDTLS_MPI_XXX error code
+ *                  on failure.
+ */
+int mbedtls_ecp_gen_key( mbedtls_ecp_group_id grp_id, mbedtls_ecp_keypair *key,
+                int (*f_rng)(void *, unsigned char *, size_t), void *p_rng );
+
+/**
+ * \brief           This function checks that the keypair objects
+ *                  \p pub and \p prv have the same group and the
+ *                  same public point, and that the private key in
+ *                  \p prv is consistent with the public key.
+ *
+ * \param pub       The keypair structure holding the public key.
+ *                  If it contains a private key, that part is ignored.
+ * \param prv       The keypair structure holding the full keypair.
+ *
+ * \return          \c 0 on success, meaning that the keys are valid and match.
+ * \return          #MBEDTLS_ERR_ECP_BAD_INPUT_DATA if the keys are invalid or do not match.
+ * \return          An \c MBEDTLS_ERR_ECP_XXX or an \c MBEDTLS_ERR_MPI_XXX
+ *                  error code on calculation failure.
+ */
+int mbedtls_ecp_check_pub_priv( const mbedtls_ecp_keypair *pub, const mbedtls_ecp_keypair *prv );
+
+#if defined(MBEDTLS_SELF_TEST)
+
+/**
+ * \brief          The ECP checkup routine.
+ *
+ * \return         \c 0 on success.
+ * \return         \c 1 on failure.
+ */
+int mbedtls_ecp_self_test( int verbose );
+
+#endif /* MBEDTLS_SELF_TEST */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ecp.h */
diff --git a/common/mbedtls/ecp_curves.c b/common/mbedtls/ecp_curves.c
new file mode 100644
index 000000000..01efe8ba9
--- /dev/null
+++ b/common/mbedtls/ecp_curves.c
@@ -0,0 +1,1462 @@
+/*
+ *  Elliptic curves over GF(p): curve-specific data and functions
+ *
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "mbedtls/config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#if defined(MBEDTLS_ECP_C)
+
+#include "mbedtls/ecp.h"
+
+#include <string.h>
+
+#if !defined(MBEDTLS_ECP_ALT)
+
+#if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && \
+    !defined(inline) && !defined(__cplusplus)
+#define inline __inline
+#endif
+
+/*
+ * Conversion macros for embedded constants:
+ * build lists of mbedtls_mpi_uint's from lists of unsigned char's grouped by 8, 4 or 2
+ */
+#if defined(MBEDTLS_HAVE_INT32)
+
+#define BYTES_TO_T_UINT_4( a, b, c, d )             \
+    ( (mbedtls_mpi_uint) a <<  0 ) |                          \
+    ( (mbedtls_mpi_uint) b <<  8 ) |                          \
+    ( (mbedtls_mpi_uint) c << 16 ) |                          \
+    ( (mbedtls_mpi_uint) d << 24 )
+
+#define BYTES_TO_T_UINT_2( a, b )                   \
+    BYTES_TO_T_UINT_4( a, b, 0, 0 )
+
+#define BYTES_TO_T_UINT_8( a, b, c, d, e, f, g, h ) \
+    BYTES_TO_T_UINT_4( a, b, c, d ),                \
+    BYTES_TO_T_UINT_4( e, f, g, h )
+
+#else /* 64-bits */
+
+#define BYTES_TO_T_UINT_8( a, b, c, d, e, f, g, h ) \
+    ( (mbedtls_mpi_uint) a <<  0 ) |                          \
+    ( (mbedtls_mpi_uint) b <<  8 ) |                          \
+    ( (mbedtls_mpi_uint) c << 16 ) |                          \
+    ( (mbedtls_mpi_uint) d << 24 ) |                          \
+    ( (mbedtls_mpi_uint) e << 32 ) |                          \
+    ( (mbedtls_mpi_uint) f << 40 ) |                          \
+    ( (mbedtls_mpi_uint) g << 48 ) |                          \
+    ( (mbedtls_mpi_uint) h << 56 )
+
+#define BYTES_TO_T_UINT_4( a, b, c, d )             \
+    BYTES_TO_T_UINT_8( a, b, c, d, 0, 0, 0, 0 )
+
+#define BYTES_TO_T_UINT_2( a, b )                   \
+    BYTES_TO_T_UINT_8( a, b, 0, 0, 0, 0, 0, 0 )
+
+#endif /* bits in mbedtls_mpi_uint */
+
+/*
+ * Note: the constants are in little-endian order
+ * to be directly usable in MPIs
+ */
+
+/*
+ * Domain parameters for secp192r1
+ */
+#if defined(MBEDTLS_ECP_DP_SECP192R1_ENABLED)
+static const mbedtls_mpi_uint secp192r1_p[] = {
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+};
+static const mbedtls_mpi_uint secp192r1_b[] = {
+    BYTES_TO_T_UINT_8( 0xB1, 0xB9, 0x46, 0xC1, 0xEC, 0xDE, 0xB8, 0xFE ),
+    BYTES_TO_T_UINT_8( 0x49, 0x30, 0x24, 0x72, 0xAB, 0xE9, 0xA7, 0x0F ),
+    BYTES_TO_T_UINT_8( 0xE7, 0x80, 0x9C, 0xE5, 0x19, 0x05, 0x21, 0x64 ),
+};
+static const mbedtls_mpi_uint secp192r1_gx[] = {
+    BYTES_TO_T_UINT_8( 0x12, 0x10, 0xFF, 0x82, 0xFD, 0x0A, 0xFF, 0xF4 ),
+    BYTES_TO_T_UINT_8( 0x00, 0x88, 0xA1, 0x43, 0xEB, 0x20, 0xBF, 0x7C ),
+    BYTES_TO_T_UINT_8( 0xF6, 0x90, 0x30, 0xB0, 0x0E, 0xA8, 0x8D, 0x18 ),
+};
+static const mbedtls_mpi_uint secp192r1_gy[] = {
+    BYTES_TO_T_UINT_8( 0x11, 0x48, 0x79, 0x1E, 0xA1, 0x77, 0xF9, 0x73 ),
+    BYTES_TO_T_UINT_8( 0xD5, 0xCD, 0x24, 0x6B, 0xED, 0x11, 0x10, 0x63 ),
+    BYTES_TO_T_UINT_8( 0x78, 0xDA, 0xC8, 0xFF, 0x95, 0x2B, 0x19, 0x07 ),
+};
+static const mbedtls_mpi_uint secp192r1_n[] = {
+    BYTES_TO_T_UINT_8( 0x31, 0x28, 0xD2, 0xB4, 0xB1, 0xC9, 0x6B, 0x14 ),
+    BYTES_TO_T_UINT_8( 0x36, 0xF8, 0xDE, 0x99, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+};
+#endif /* MBEDTLS_ECP_DP_SECP192R1_ENABLED */
+
+/*
+ * Domain parameters for secp224r1
+ */
+#if defined(MBEDTLS_ECP_DP_SECP224R1_ENABLED)
+static const mbedtls_mpi_uint secp224r1_p[] = {
+    BYTES_TO_T_UINT_8( 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 ),
+    BYTES_TO_T_UINT_8( 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00 ),
+};
+static const mbedtls_mpi_uint secp224r1_b[] = {
+    BYTES_TO_T_UINT_8( 0xB4, 0xFF, 0x55, 0x23, 0x43, 0x39, 0x0B, 0x27 ),
+    BYTES_TO_T_UINT_8( 0xBA, 0xD8, 0xBF, 0xD7, 0xB7, 0xB0, 0x44, 0x50 ),
+    BYTES_TO_T_UINT_8( 0x56, 0x32, 0x41, 0xF5, 0xAB, 0xB3, 0x04, 0x0C ),
+    BYTES_TO_T_UINT_4( 0x85, 0x0A, 0x05, 0xB4 ),
+};
+static const mbedtls_mpi_uint secp224r1_gx[] = {
+    BYTES_TO_T_UINT_8( 0x21, 0x1D, 0x5C, 0x11, 0xD6, 0x80, 0x32, 0x34 ),
+    BYTES_TO_T_UINT_8( 0x22, 0x11, 0xC2, 0x56, 0xD3, 0xC1, 0x03, 0x4A ),
+    BYTES_TO_T_UINT_8( 0xB9, 0x90, 0x13, 0x32, 0x7F, 0xBF, 0xB4, 0x6B ),
+    BYTES_TO_T_UINT_4( 0xBD, 0x0C, 0x0E, 0xB7 ),
+};
+static const mbedtls_mpi_uint secp224r1_gy[] = {
+    BYTES_TO_T_UINT_8( 0x34, 0x7E, 0x00, 0x85, 0x99, 0x81, 0xD5, 0x44 ),
+    BYTES_TO_T_UINT_8( 0x64, 0x47, 0x07, 0x5A, 0xA0, 0x75, 0x43, 0xCD ),
+    BYTES_TO_T_UINT_8( 0xE6, 0xDF, 0x22, 0x4C, 0xFB, 0x23, 0xF7, 0xB5 ),
+    BYTES_TO_T_UINT_4( 0x88, 0x63, 0x37, 0xBD ),
+};
+static const mbedtls_mpi_uint secp224r1_n[] = {
+    BYTES_TO_T_UINT_8( 0x3D, 0x2A, 0x5C, 0x5C, 0x45, 0x29, 0xDD, 0x13 ),
+    BYTES_TO_T_UINT_8( 0x3E, 0xF0, 0xB8, 0xE0, 0xA2, 0x16, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_4( 0xFF, 0xFF, 0xFF, 0xFF ),
+};
+#endif /* MBEDTLS_ECP_DP_SECP224R1_ENABLED */
+
+/*
+ * Domain parameters for secp256r1
+ */
+#if defined(MBEDTLS_ECP_DP_SECP256R1_ENABLED)
+static const mbedtls_mpi_uint secp256r1_p[] = {
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00 ),
+    BYTES_TO_T_UINT_8( 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 ),
+    BYTES_TO_T_UINT_8( 0x01, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF ),
+};
+static const mbedtls_mpi_uint secp256r1_b[] = {
+    BYTES_TO_T_UINT_8( 0x4B, 0x60, 0xD2, 0x27, 0x3E, 0x3C, 0xCE, 0x3B ),
+    BYTES_TO_T_UINT_8( 0xF6, 0xB0, 0x53, 0xCC, 0xB0, 0x06, 0x1D, 0x65 ),
+    BYTES_TO_T_UINT_8( 0xBC, 0x86, 0x98, 0x76, 0x55, 0xBD, 0xEB, 0xB3 ),
+    BYTES_TO_T_UINT_8( 0xE7, 0x93, 0x3A, 0xAA, 0xD8, 0x35, 0xC6, 0x5A ),
+};
+static const mbedtls_mpi_uint secp256r1_gx[] = {
+    BYTES_TO_T_UINT_8( 0x96, 0xC2, 0x98, 0xD8, 0x45, 0x39, 0xA1, 0xF4 ),
+    BYTES_TO_T_UINT_8( 0xA0, 0x33, 0xEB, 0x2D, 0x81, 0x7D, 0x03, 0x77 ),
+    BYTES_TO_T_UINT_8( 0xF2, 0x40, 0xA4, 0x63, 0xE5, 0xE6, 0xBC, 0xF8 ),
+    BYTES_TO_T_UINT_8( 0x47, 0x42, 0x2C, 0xE1, 0xF2, 0xD1, 0x17, 0x6B ),
+};
+static const mbedtls_mpi_uint secp256r1_gy[] = {
+    BYTES_TO_T_UINT_8( 0xF5, 0x51, 0xBF, 0x37, 0x68, 0x40, 0xB6, 0xCB ),
+    BYTES_TO_T_UINT_8( 0xCE, 0x5E, 0x31, 0x6B, 0x57, 0x33, 0xCE, 0x2B ),
+    BYTES_TO_T_UINT_8( 0x16, 0x9E, 0x0F, 0x7C, 0x4A, 0xEB, 0xE7, 0x8E ),
+    BYTES_TO_T_UINT_8( 0x9B, 0x7F, 0x1A, 0xFE, 0xE2, 0x42, 0xE3, 0x4F ),
+};
+static const mbedtls_mpi_uint secp256r1_n[] = {
+    BYTES_TO_T_UINT_8( 0x51, 0x25, 0x63, 0xFC, 0xC2, 0xCA, 0xB9, 0xF3 ),
+    BYTES_TO_T_UINT_8( 0x84, 0x9E, 0x17, 0xA7, 0xAD, 0xFA, 0xE6, 0xBC ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF ),
+};
+#endif /* MBEDTLS_ECP_DP_SECP256R1_ENABLED */
+
+/*
+ * Domain parameters for secp384r1
+ */
+#if defined(MBEDTLS_ECP_DP_SECP384R1_ENABLED)
+static const mbedtls_mpi_uint secp384r1_p[] = {
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00 ),
+    BYTES_TO_T_UINT_8( 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+};
+static const mbedtls_mpi_uint secp384r1_b[] = {
+    BYTES_TO_T_UINT_8( 0xEF, 0x2A, 0xEC, 0xD3, 0xED, 0xC8, 0x85, 0x2A ),
+    BYTES_TO_T_UINT_8( 0x9D, 0xD1, 0x2E, 0x8A, 0x8D, 0x39, 0x56, 0xC6 ),
+    BYTES_TO_T_UINT_8( 0x5A, 0x87, 0x13, 0x50, 0x8F, 0x08, 0x14, 0x03 ),
+    BYTES_TO_T_UINT_8( 0x12, 0x41, 0x81, 0xFE, 0x6E, 0x9C, 0x1D, 0x18 ),
+    BYTES_TO_T_UINT_8( 0x19, 0x2D, 0xF8, 0xE3, 0x6B, 0x05, 0x8E, 0x98 ),
+    BYTES_TO_T_UINT_8( 0xE4, 0xE7, 0x3E, 0xE2, 0xA7, 0x2F, 0x31, 0xB3 ),
+};
+static const mbedtls_mpi_uint secp384r1_gx[] = {
+    BYTES_TO_T_UINT_8( 0xB7, 0x0A, 0x76, 0x72, 0x38, 0x5E, 0x54, 0x3A ),
+    BYTES_TO_T_UINT_8( 0x6C, 0x29, 0x55, 0xBF, 0x5D, 0xF2, 0x02, 0x55 ),
+    BYTES_TO_T_UINT_8( 0x38, 0x2A, 0x54, 0x82, 0xE0, 0x41, 0xF7, 0x59 ),
+    BYTES_TO_T_UINT_8( 0x98, 0x9B, 0xA7, 0x8B, 0x62, 0x3B, 0x1D, 0x6E ),
+    BYTES_TO_T_UINT_8( 0x74, 0xAD, 0x20, 0xF3, 0x1E, 0xC7, 0xB1, 0x8E ),
+    BYTES_TO_T_UINT_8( 0x37, 0x05, 0x8B, 0xBE, 0x22, 0xCA, 0x87, 0xAA ),
+};
+static const mbedtls_mpi_uint secp384r1_gy[] = {
+    BYTES_TO_T_UINT_8( 0x5F, 0x0E, 0xEA, 0x90, 0x7C, 0x1D, 0x43, 0x7A ),
+    BYTES_TO_T_UINT_8( 0x9D, 0x81, 0x7E, 0x1D, 0xCE, 0xB1, 0x60, 0x0A ),
+    BYTES_TO_T_UINT_8( 0xC0, 0xB8, 0xF0, 0xB5, 0x13, 0x31, 0xDA, 0xE9 ),
+    BYTES_TO_T_UINT_8( 0x7C, 0x14, 0x9A, 0x28, 0xBD, 0x1D, 0xF4, 0xF8 ),
+    BYTES_TO_T_UINT_8( 0x29, 0xDC, 0x92, 0x92, 0xBF, 0x98, 0x9E, 0x5D ),
+    BYTES_TO_T_UINT_8( 0x6F, 0x2C, 0x26, 0x96, 0x4A, 0xDE, 0x17, 0x36 ),
+};
+static const mbedtls_mpi_uint secp384r1_n[] = {
+    BYTES_TO_T_UINT_8( 0x73, 0x29, 0xC5, 0xCC, 0x6A, 0x19, 0xEC, 0xEC ),
+    BYTES_TO_T_UINT_8( 0x7A, 0xA7, 0xB0, 0x48, 0xB2, 0x0D, 0x1A, 0x58 ),
+    BYTES_TO_T_UINT_8( 0xDF, 0x2D, 0x37, 0xF4, 0x81, 0x4D, 0x63, 0xC7 ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+};
+#endif /* MBEDTLS_ECP_DP_SECP384R1_ENABLED */
+
+/*
+ * Domain parameters for secp521r1
+ */
+#if defined(MBEDTLS_ECP_DP_SECP521R1_ENABLED)
+static const mbedtls_mpi_uint secp521r1_p[] = {
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_2( 0xFF, 0x01 ),
+};
+static const mbedtls_mpi_uint secp521r1_b[] = {
+    BYTES_TO_T_UINT_8( 0x00, 0x3F, 0x50, 0x6B, 0xD4, 0x1F, 0x45, 0xEF ),
+    BYTES_TO_T_UINT_8( 0xF1, 0x34, 0x2C, 0x3D, 0x88, 0xDF, 0x73, 0x35 ),
+    BYTES_TO_T_UINT_8( 0x07, 0xBF, 0xB1, 0x3B, 0xBD, 0xC0, 0x52, 0x16 ),
+    BYTES_TO_T_UINT_8( 0x7B, 0x93, 0x7E, 0xEC, 0x51, 0x39, 0x19, 0x56 ),
+    BYTES_TO_T_UINT_8( 0xE1, 0x09, 0xF1, 0x8E, 0x91, 0x89, 0xB4, 0xB8 ),
+    BYTES_TO_T_UINT_8( 0xF3, 0x15, 0xB3, 0x99, 0x5B, 0x72, 0xDA, 0xA2 ),
+    BYTES_TO_T_UINT_8( 0xEE, 0x40, 0x85, 0xB6, 0xA0, 0x21, 0x9A, 0x92 ),
+    BYTES_TO_T_UINT_8( 0x1F, 0x9A, 0x1C, 0x8E, 0x61, 0xB9, 0x3E, 0x95 ),
+    BYTES_TO_T_UINT_2( 0x51, 0x00 ),
+};
+static const mbedtls_mpi_uint secp521r1_gx[] = {
+    BYTES_TO_T_UINT_8( 0x66, 0xBD, 0xE5, 0xC2, 0x31, 0x7E, 0x7E, 0xF9 ),
+    BYTES_TO_T_UINT_8( 0x9B, 0x42, 0x6A, 0x85, 0xC1, 0xB3, 0x48, 0x33 ),
+    BYTES_TO_T_UINT_8( 0xDE, 0xA8, 0xFF, 0xA2, 0x27, 0xC1, 0x1D, 0xFE ),
+    BYTES_TO_T_UINT_8( 0x28, 0x59, 0xE7, 0xEF, 0x77, 0x5E, 0x4B, 0xA1 ),
+    BYTES_TO_T_UINT_8( 0xBA, 0x3D, 0x4D, 0x6B, 0x60, 0xAF, 0x28, 0xF8 ),
+    BYTES_TO_T_UINT_8( 0x21, 0xB5, 0x3F, 0x05, 0x39, 0x81, 0x64, 0x9C ),
+    BYTES_TO_T_UINT_8( 0x42, 0xB4, 0x95, 0x23, 0x66, 0xCB, 0x3E, 0x9E ),
+    BYTES_TO_T_UINT_8( 0xCD, 0xE9, 0x04, 0x04, 0xB7, 0x06, 0x8E, 0x85 ),
+    BYTES_TO_T_UINT_2( 0xC6, 0x00 ),
+};
+static const mbedtls_mpi_uint secp521r1_gy[] = {
+    BYTES_TO_T_UINT_8( 0x50, 0x66, 0xD1, 0x9F, 0x76, 0x94, 0xBE, 0x88 ),
+    BYTES_TO_T_UINT_8( 0x40, 0xC2, 0x72, 0xA2, 0x86, 0x70, 0x3C, 0x35 ),
+    BYTES_TO_T_UINT_8( 0x61, 0x07, 0xAD, 0x3F, 0x01, 0xB9, 0x50, 0xC5 ),
+    BYTES_TO_T_UINT_8( 0x40, 0x26, 0xF4, 0x5E, 0x99, 0x72, 0xEE, 0x97 ),
+    BYTES_TO_T_UINT_8( 0x2C, 0x66, 0x3E, 0x27, 0x17, 0xBD, 0xAF, 0x17 ),
+    BYTES_TO_T_UINT_8( 0x68, 0x44, 0x9B, 0x57, 0x49, 0x44, 0xF5, 0x98 ),
+    BYTES_TO_T_UINT_8( 0xD9, 0x1B, 0x7D, 0x2C, 0xB4, 0x5F, 0x8A, 0x5C ),
+    BYTES_TO_T_UINT_8( 0x04, 0xC0, 0x3B, 0x9A, 0x78, 0x6A, 0x29, 0x39 ),
+    BYTES_TO_T_UINT_2( 0x18, 0x01 ),
+};
+static const mbedtls_mpi_uint secp521r1_n[] = {
+    BYTES_TO_T_UINT_8( 0x09, 0x64, 0x38, 0x91, 0x1E, 0xB7, 0x6F, 0xBB ),
+    BYTES_TO_T_UINT_8( 0xAE, 0x47, 0x9C, 0x89, 0xB8, 0xC9, 0xB5, 0x3B ),
+    BYTES_TO_T_UINT_8( 0xD0, 0xA5, 0x09, 0xF7, 0x48, 0x01, 0xCC, 0x7F ),
+    BYTES_TO_T_UINT_8( 0x6B, 0x96, 0x2F, 0xBF, 0x83, 0x87, 0x86, 0x51 ),
+    BYTES_TO_T_UINT_8( 0xFA, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_2( 0xFF, 0x01 ),
+};
+#endif /* MBEDTLS_ECP_DP_SECP521R1_ENABLED */
+
+#if defined(MBEDTLS_ECP_DP_SECP192K1_ENABLED)
+static const mbedtls_mpi_uint secp192k1_p[] = {
+    BYTES_TO_T_UINT_8( 0x37, 0xEE, 0xFF, 0xFF, 0xFE, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+};
+static const mbedtls_mpi_uint secp192k1_a[] = {
+    BYTES_TO_T_UINT_2( 0x00, 0x00 ),
+};
+static const mbedtls_mpi_uint secp192k1_b[] = {
+    BYTES_TO_T_UINT_2( 0x03, 0x00 ),
+};
+static const mbedtls_mpi_uint secp192k1_gx[] = {
+    BYTES_TO_T_UINT_8( 0x7D, 0x6C, 0xE0, 0xEA, 0xB1, 0xD1, 0xA5, 0x1D ),
+    BYTES_TO_T_UINT_8( 0x34, 0xF4, 0xB7, 0x80, 0x02, 0x7D, 0xB0, 0x26 ),
+    BYTES_TO_T_UINT_8( 0xAE, 0xE9, 0x57, 0xC0, 0x0E, 0xF1, 0x4F, 0xDB ),
+};
+static const mbedtls_mpi_uint secp192k1_gy[] = {
+    BYTES_TO_T_UINT_8( 0x9D, 0x2F, 0x5E, 0xD9, 0x88, 0xAA, 0x82, 0x40 ),
+    BYTES_TO_T_UINT_8( 0x34, 0x86, 0xBE, 0x15, 0xD0, 0x63, 0x41, 0x84 ),
+    BYTES_TO_T_UINT_8( 0xA7, 0x28, 0x56, 0x9C, 0x6D, 0x2F, 0x2F, 0x9B ),
+};
+static const mbedtls_mpi_uint secp192k1_n[] = {
+    BYTES_TO_T_UINT_8( 0x8D, 0xFD, 0xDE, 0x74, 0x6A, 0x46, 0x69, 0x0F ),
+    BYTES_TO_T_UINT_8( 0x17, 0xFC, 0xF2, 0x26, 0xFE, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+};
+#endif /* MBEDTLS_ECP_DP_SECP192K1_ENABLED */
+
+#if defined(MBEDTLS_ECP_DP_SECP224K1_ENABLED)
+static const mbedtls_mpi_uint secp224k1_p[] = {
+    BYTES_TO_T_UINT_8( 0x6D, 0xE5, 0xFF, 0xFF, 0xFE, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_4( 0xFF, 0xFF, 0xFF, 0xFF ),
+};
+static const mbedtls_mpi_uint secp224k1_a[] = {
+    BYTES_TO_T_UINT_2( 0x00, 0x00 ),
+};
+static const mbedtls_mpi_uint secp224k1_b[] = {
+    BYTES_TO_T_UINT_2( 0x05, 0x00 ),
+};
+static const mbedtls_mpi_uint secp224k1_gx[] = {
+    BYTES_TO_T_UINT_8( 0x5C, 0xA4, 0xB7, 0xB6, 0x0E, 0x65, 0x7E, 0x0F ),
+    BYTES_TO_T_UINT_8( 0xA9, 0x75, 0x70, 0xE4, 0xE9, 0x67, 0xA4, 0x69 ),
+    BYTES_TO_T_UINT_8( 0xA1, 0x28, 0xFC, 0x30, 0xDF, 0x99, 0xF0, 0x4D ),
+    BYTES_TO_T_UINT_4( 0x33, 0x5B, 0x45, 0xA1 ),
+};
+static const mbedtls_mpi_uint secp224k1_gy[] = {
+    BYTES_TO_T_UINT_8( 0xA5, 0x61, 0x6D, 0x55, 0xDB, 0x4B, 0xCA, 0xE2 ),
+    BYTES_TO_T_UINT_8( 0x59, 0xBD, 0xB0, 0xC0, 0xF7, 0x19, 0xE3, 0xF7 ),
+    BYTES_TO_T_UINT_8( 0xD6, 0xFB, 0xCA, 0x82, 0x42, 0x34, 0xBA, 0x7F ),
+    BYTES_TO_T_UINT_4( 0xED, 0x9F, 0x08, 0x7E ),
+};
+static const mbedtls_mpi_uint secp224k1_n[] = {
+    BYTES_TO_T_UINT_8( 0xF7, 0xB1, 0x9F, 0x76, 0x71, 0xA9, 0xF0, 0xCA ),
+    BYTES_TO_T_UINT_8( 0x84, 0x61, 0xEC, 0xD2, 0xE8, 0xDC, 0x01, 0x00 ),
+    BYTES_TO_T_UINT_8( 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 ),
+    BYTES_TO_T_UINT_8( 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 ),
+};
+#endif /* MBEDTLS_ECP_DP_SECP224K1_ENABLED */
+
+#if defined(MBEDTLS_ECP_DP_SECP256K1_ENABLED)
+static const mbedtls_mpi_uint secp256k1_p[] = {
+    BYTES_TO_T_UINT_8( 0x2F, 0xFC, 0xFF, 0xFF, 0xFE, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+};
+static const mbedtls_mpi_uint secp256k1_a[] = {
+    BYTES_TO_T_UINT_2( 0x00, 0x00 ),
+};
+static const mbedtls_mpi_uint secp256k1_b[] = {
+    BYTES_TO_T_UINT_2( 0x07, 0x00 ),
+};
+static const mbedtls_mpi_uint secp256k1_gx[] = {
+    BYTES_TO_T_UINT_8( 0x98, 0x17, 0xF8, 0x16, 0x5B, 0x81, 0xF2, 0x59 ),
+    BYTES_TO_T_UINT_8( 0xD9, 0x28, 0xCE, 0x2D, 0xDB, 0xFC, 0x9B, 0x02 ),
+    BYTES_TO_T_UINT_8( 0x07, 0x0B, 0x87, 0xCE, 0x95, 0x62, 0xA0, 0x55 ),
+    BYTES_TO_T_UINT_8( 0xAC, 0xBB, 0xDC, 0xF9, 0x7E, 0x66, 0xBE, 0x79 ),
+};
+static const mbedtls_mpi_uint secp256k1_gy[] = {
+    BYTES_TO_T_UINT_8( 0xB8, 0xD4, 0x10, 0xFB, 0x8F, 0xD0, 0x47, 0x9C ),
+    BYTES_TO_T_UINT_8( 0x19, 0x54, 0x85, 0xA6, 0x48, 0xB4, 0x17, 0xFD ),
+    BYTES_TO_T_UINT_8( 0xA8, 0x08, 0x11, 0x0E, 0xFC, 0xFB, 0xA4, 0x5D ),
+    BYTES_TO_T_UINT_8( 0x65, 0xC4, 0xA3, 0x26, 0x77, 0xDA, 0x3A, 0x48 ),
+};
+static const mbedtls_mpi_uint secp256k1_n[] = {
+    BYTES_TO_T_UINT_8( 0x41, 0x41, 0x36, 0xD0, 0x8C, 0x5E, 0xD2, 0xBF ),
+    BYTES_TO_T_UINT_8( 0x3B, 0xA0, 0x48, 0xAF, 0xE6, 0xDC, 0xAE, 0xBA ),
+    BYTES_TO_T_UINT_8( 0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+};
+#endif /* MBEDTLS_ECP_DP_SECP256K1_ENABLED */
+
+/*
+ * Domain parameters for brainpoolP256r1 (RFC 5639 3.4)
+ */
+#if defined(MBEDTLS_ECP_DP_BP256R1_ENABLED)
+static const mbedtls_mpi_uint brainpoolP256r1_p[] = {
+    BYTES_TO_T_UINT_8( 0x77, 0x53, 0x6E, 0x1F, 0x1D, 0x48, 0x13, 0x20 ),
+    BYTES_TO_T_UINT_8( 0x28, 0x20, 0x26, 0xD5, 0x23, 0xF6, 0x3B, 0x6E ),
+    BYTES_TO_T_UINT_8( 0x72, 0x8D, 0x83, 0x9D, 0x90, 0x0A, 0x66, 0x3E ),
+    BYTES_TO_T_UINT_8( 0xBC, 0xA9, 0xEE, 0xA1, 0xDB, 0x57, 0xFB, 0xA9 ),
+};
+static const mbedtls_mpi_uint brainpoolP256r1_a[] = {
+    BYTES_TO_T_UINT_8( 0xD9, 0xB5, 0x30, 0xF3, 0x44, 0x4B, 0x4A, 0xE9 ),
+    BYTES_TO_T_UINT_8( 0x6C, 0x5C, 0xDC, 0x26, 0xC1, 0x55, 0x80, 0xFB ),
+    BYTES_TO_T_UINT_8( 0xE7, 0xFF, 0x7A, 0x41, 0x30, 0x75, 0xF6, 0xEE ),
+    BYTES_TO_T_UINT_8( 0x57, 0x30, 0x2C, 0xFC, 0x75, 0x09, 0x5A, 0x7D ),
+};
+static const mbedtls_mpi_uint brainpoolP256r1_b[] = {
+    BYTES_TO_T_UINT_8( 0xB6, 0x07, 0x8C, 0xFF, 0x18, 0xDC, 0xCC, 0x6B ),
+    BYTES_TO_T_UINT_8( 0xCE, 0xE1, 0xF7, 0x5C, 0x29, 0x16, 0x84, 0x95 ),
+    BYTES_TO_T_UINT_8( 0xBF, 0x7C, 0xD7, 0xBB, 0xD9, 0xB5, 0x30, 0xF3 ),
+    BYTES_TO_T_UINT_8( 0x44, 0x4B, 0x4A, 0xE9, 0x6C, 0x5C, 0xDC, 0x26 ),
+};
+static const mbedtls_mpi_uint brainpoolP256r1_gx[] = {
+    BYTES_TO_T_UINT_8( 0x62, 0x32, 0xCE, 0x9A, 0xBD, 0x53, 0x44, 0x3A ),
+    BYTES_TO_T_UINT_8( 0xC2, 0x23, 0xBD, 0xE3, 0xE1, 0x27, 0xDE, 0xB9 ),
+    BYTES_TO_T_UINT_8( 0xAF, 0xB7, 0x81, 0xFC, 0x2F, 0x48, 0x4B, 0x2C ),
+    BYTES_TO_T_UINT_8( 0xCB, 0x57, 0x7E, 0xCB, 0xB9, 0xAE, 0xD2, 0x8B ),
+};
+static const mbedtls_mpi_uint brainpoolP256r1_gy[] = {
+    BYTES_TO_T_UINT_8( 0x97, 0x69, 0x04, 0x2F, 0xC7, 0x54, 0x1D, 0x5C ),
+    BYTES_TO_T_UINT_8( 0x54, 0x8E, 0xED, 0x2D, 0x13, 0x45, 0x77, 0xC2 ),
+    BYTES_TO_T_UINT_8( 0xC9, 0x1D, 0x61, 0x14, 0x1A, 0x46, 0xF8, 0x97 ),
+    BYTES_TO_T_UINT_8( 0xFD, 0xC4, 0xDA, 0xC3, 0x35, 0xF8, 0x7E, 0x54 ),
+};
+static const mbedtls_mpi_uint brainpoolP256r1_n[] = {
+    BYTES_TO_T_UINT_8( 0xA7, 0x56, 0x48, 0x97, 0x82, 0x0E, 0x1E, 0x90 ),
+    BYTES_TO_T_UINT_8( 0xF7, 0xA6, 0x61, 0xB5, 0xA3, 0x7A, 0x39, 0x8C ),
+    BYTES_TO_T_UINT_8( 0x71, 0x8D, 0x83, 0x9D, 0x90, 0x0A, 0x66, 0x3E ),
+    BYTES_TO_T_UINT_8( 0xBC, 0xA9, 0xEE, 0xA1, 0xDB, 0x57, 0xFB, 0xA9 ),
+};
+#endif /* MBEDTLS_ECP_DP_BP256R1_ENABLED */
+
+/*
+ * Domain parameters for brainpoolP384r1 (RFC 5639 3.6)
+ */
+#if defined(MBEDTLS_ECP_DP_BP384R1_ENABLED)
+static const mbedtls_mpi_uint brainpoolP384r1_p[] = {
+    BYTES_TO_T_UINT_8( 0x53, 0xEC, 0x07, 0x31, 0x13, 0x00, 0x47, 0x87 ),
+    BYTES_TO_T_UINT_8( 0x71, 0x1A, 0x1D, 0x90, 0x29, 0xA7, 0xD3, 0xAC ),
+    BYTES_TO_T_UINT_8( 0x23, 0x11, 0xB7, 0x7F, 0x19, 0xDA, 0xB1, 0x12 ),
+    BYTES_TO_T_UINT_8( 0xB4, 0x56, 0x54, 0xED, 0x09, 0x71, 0x2F, 0x15 ),
+    BYTES_TO_T_UINT_8( 0xDF, 0x41, 0xE6, 0x50, 0x7E, 0x6F, 0x5D, 0x0F ),
+    BYTES_TO_T_UINT_8( 0x28, 0x6D, 0x38, 0xA3, 0x82, 0x1E, 0xB9, 0x8C ),
+};
+static const mbedtls_mpi_uint brainpoolP384r1_a[] = {
+    BYTES_TO_T_UINT_8( 0x26, 0x28, 0xCE, 0x22, 0xDD, 0xC7, 0xA8, 0x04 ),
+    BYTES_TO_T_UINT_8( 0xEB, 0xD4, 0x3A, 0x50, 0x4A, 0x81, 0xA5, 0x8A ),
+    BYTES_TO_T_UINT_8( 0x0F, 0xF9, 0x91, 0xBA, 0xEF, 0x65, 0x91, 0x13 ),
+    BYTES_TO_T_UINT_8( 0x87, 0x27, 0xB2, 0x4F, 0x8E, 0xA2, 0xBE, 0xC2 ),
+    BYTES_TO_T_UINT_8( 0xA0, 0xAF, 0x05, 0xCE, 0x0A, 0x08, 0x72, 0x3C ),
+    BYTES_TO_T_UINT_8( 0x0C, 0x15, 0x8C, 0x3D, 0xC6, 0x82, 0xC3, 0x7B ),
+};
+static const mbedtls_mpi_uint brainpoolP384r1_b[] = {
+    BYTES_TO_T_UINT_8( 0x11, 0x4C, 0x50, 0xFA, 0x96, 0x86, 0xB7, 0x3A ),
+    BYTES_TO_T_UINT_8( 0x94, 0xC9, 0xDB, 0x95, 0x02, 0x39, 0xB4, 0x7C ),
+    BYTES_TO_T_UINT_8( 0xD5, 0x62, 0xEB, 0x3E, 0xA5, 0x0E, 0x88, 0x2E ),
+    BYTES_TO_T_UINT_8( 0xA6, 0xD2, 0xDC, 0x07, 0xE1, 0x7D, 0xB7, 0x2F ),
+    BYTES_TO_T_UINT_8( 0x7C, 0x44, 0xF0, 0x16, 0x54, 0xB5, 0x39, 0x8B ),
+    BYTES_TO_T_UINT_8( 0x26, 0x28, 0xCE, 0x22, 0xDD, 0xC7, 0xA8, 0x04 ),
+};
+static const mbedtls_mpi_uint brainpoolP384r1_gx[] = {
+    BYTES_TO_T_UINT_8( 0x1E, 0xAF, 0xD4, 0x47, 0xE2, 0xB2, 0x87, 0xEF ),
+    BYTES_TO_T_UINT_8( 0xAA, 0x46, 0xD6, 0x36, 0x34, 0xE0, 0x26, 0xE8 ),
+    BYTES_TO_T_UINT_8( 0xE8, 0x10, 0xBD, 0x0C, 0xFE, 0xCA, 0x7F, 0xDB ),
+    BYTES_TO_T_UINT_8( 0xE3, 0x4F, 0xF1, 0x7E, 0xE7, 0xA3, 0x47, 0x88 ),
+    BYTES_TO_T_UINT_8( 0x6B, 0x3F, 0xC1, 0xB7, 0x81, 0x3A, 0xA6, 0xA2 ),
+    BYTES_TO_T_UINT_8( 0xFF, 0x45, 0xCF, 0x68, 0xF0, 0x64, 0x1C, 0x1D ),
+};
+static const mbedtls_mpi_uint brainpoolP384r1_gy[] = {
+    BYTES_TO_T_UINT_8( 0x15, 0x53, 0x3C, 0x26, 0x41, 0x03, 0x82, 0x42 ),
+    BYTES_TO_T_UINT_8( 0x11, 0x81, 0x91, 0x77, 0x21, 0x46, 0x46, 0x0E ),
+    BYTES_TO_T_UINT_8( 0x28, 0x29, 0x91, 0xF9, 0x4F, 0x05, 0x9C, 0xE1 ),
+    BYTES_TO_T_UINT_8( 0x64, 0x58, 0xEC, 0xFE, 0x29, 0x0B, 0xB7, 0x62 ),
+    BYTES_TO_T_UINT_8( 0x52, 0xD5, 0xCF, 0x95, 0x8E, 0xEB, 0xB1, 0x5C ),
+    BYTES_TO_T_UINT_8( 0xA4, 0xC2, 0xF9, 0x20, 0x75, 0x1D, 0xBE, 0x8A ),
+};
+static const mbedtls_mpi_uint brainpoolP384r1_n[] = {
+    BYTES_TO_T_UINT_8( 0x65, 0x65, 0x04, 0xE9, 0x02, 0x32, 0x88, 0x3B ),
+    BYTES_TO_T_UINT_8( 0x10, 0xC3, 0x7F, 0x6B, 0xAF, 0xB6, 0x3A, 0xCF ),
+    BYTES_TO_T_UINT_8( 0xA7, 0x25, 0x04, 0xAC, 0x6C, 0x6E, 0x16, 0x1F ),
+    BYTES_TO_T_UINT_8( 0xB3, 0x56, 0x54, 0xED, 0x09, 0x71, 0x2F, 0x15 ),
+    BYTES_TO_T_UINT_8( 0xDF, 0x41, 0xE6, 0x50, 0x7E, 0x6F, 0x5D, 0x0F ),
+    BYTES_TO_T_UINT_8( 0x28, 0x6D, 0x38, 0xA3, 0x82, 0x1E, 0xB9, 0x8C ),
+};
+#endif /* MBEDTLS_ECP_DP_BP384R1_ENABLED */
+
+/*
+ * Domain parameters for brainpoolP512r1 (RFC 5639 3.7)
+ */
+#if defined(MBEDTLS_ECP_DP_BP512R1_ENABLED)
+static const mbedtls_mpi_uint brainpoolP512r1_p[] = {
+    BYTES_TO_T_UINT_8( 0xF3, 0x48, 0x3A, 0x58, 0x56, 0x60, 0xAA, 0x28 ),
+    BYTES_TO_T_UINT_8( 0x85, 0xC6, 0x82, 0x2D, 0x2F, 0xFF, 0x81, 0x28 ),
+    BYTES_TO_T_UINT_8( 0xE6, 0x80, 0xA3, 0xE6, 0x2A, 0xA1, 0xCD, 0xAE ),
+    BYTES_TO_T_UINT_8( 0x42, 0x68, 0xC6, 0x9B, 0x00, 0x9B, 0x4D, 0x7D ),
+    BYTES_TO_T_UINT_8( 0x71, 0x08, 0x33, 0x70, 0xCA, 0x9C, 0x63, 0xD6 ),
+    BYTES_TO_T_UINT_8( 0x0E, 0xD2, 0xC9, 0xB3, 0xB3, 0x8D, 0x30, 0xCB ),
+    BYTES_TO_T_UINT_8( 0x07, 0xFC, 0xC9, 0x33, 0xAE, 0xE6, 0xD4, 0x3F ),
+    BYTES_TO_T_UINT_8( 0x8B, 0xC4, 0xE9, 0xDB, 0xB8, 0x9D, 0xDD, 0xAA ),
+};
+static const mbedtls_mpi_uint brainpoolP512r1_a[] = {
+    BYTES_TO_T_UINT_8( 0xCA, 0x94, 0xFC, 0x77, 0x4D, 0xAC, 0xC1, 0xE7 ),
+    BYTES_TO_T_UINT_8( 0xB9, 0xC7, 0xF2, 0x2B, 0xA7, 0x17, 0x11, 0x7F ),
+    BYTES_TO_T_UINT_8( 0xB5, 0xC8, 0x9A, 0x8B, 0xC9, 0xF1, 0x2E, 0x0A ),
+    BYTES_TO_T_UINT_8( 0xA1, 0x3A, 0x25, 0xA8, 0x5A, 0x5D, 0xED, 0x2D ),
+    BYTES_TO_T_UINT_8( 0xBC, 0x63, 0x98, 0xEA, 0xCA, 0x41, 0x34, 0xA8 ),
+    BYTES_TO_T_UINT_8( 0x10, 0x16, 0xF9, 0x3D, 0x8D, 0xDD, 0xCB, 0x94 ),
+    BYTES_TO_T_UINT_8( 0xC5, 0x4C, 0x23, 0xAC, 0x45, 0x71, 0x32, 0xE2 ),
+    BYTES_TO_T_UINT_8( 0x89, 0x3B, 0x60, 0x8B, 0x31, 0xA3, 0x30, 0x78 ),
+};
+static const mbedtls_mpi_uint brainpoolP512r1_b[] = {
+    BYTES_TO_T_UINT_8( 0x23, 0xF7, 0x16, 0x80, 0x63, 0xBD, 0x09, 0x28 ),
+    BYTES_TO_T_UINT_8( 0xDD, 0xE5, 0xBA, 0x5E, 0xB7, 0x50, 0x40, 0x98 ),
+    BYTES_TO_T_UINT_8( 0x67, 0x3E, 0x08, 0xDC, 0xCA, 0x94, 0xFC, 0x77 ),
+    BYTES_TO_T_UINT_8( 0x4D, 0xAC, 0xC1, 0xE7, 0xB9, 0xC7, 0xF2, 0x2B ),
+    BYTES_TO_T_UINT_8( 0xA7, 0x17, 0x11, 0x7F, 0xB5, 0xC8, 0x9A, 0x8B ),
+    BYTES_TO_T_UINT_8( 0xC9, 0xF1, 0x2E, 0x0A, 0xA1, 0x3A, 0x25, 0xA8 ),
+    BYTES_TO_T_UINT_8( 0x5A, 0x5D, 0xED, 0x2D, 0xBC, 0x63, 0x98, 0xEA ),
+    BYTES_TO_T_UINT_8( 0xCA, 0x41, 0x34, 0xA8, 0x10, 0x16, 0xF9, 0x3D ),
+};
+static const mbedtls_mpi_uint brainpoolP512r1_gx[] = {
+    BYTES_TO_T_UINT_8( 0x22, 0xF8, 0xB9, 0xBC, 0x09, 0x22, 0x35, 0x8B ),
+    BYTES_TO_T_UINT_8( 0x68, 0x5E, 0x6A, 0x40, 0x47, 0x50, 0x6D, 0x7C ),
+    BYTES_TO_T_UINT_8( 0x5F, 0x7D, 0xB9, 0x93, 0x7B, 0x68, 0xD1, 0x50 ),
+    BYTES_TO_T_UINT_8( 0x8D, 0xD4, 0xD0, 0xE2, 0x78, 0x1F, 0x3B, 0xFF ),
+    BYTES_TO_T_UINT_8( 0x8E, 0x09, 0xD0, 0xF4, 0xEE, 0x62, 0x3B, 0xB4 ),
+    BYTES_TO_T_UINT_8( 0xC1, 0x16, 0xD9, 0xB5, 0x70, 0x9F, 0xED, 0x85 ),
+    BYTES_TO_T_UINT_8( 0x93, 0x6A, 0x4C, 0x9C, 0x2E, 0x32, 0x21, 0x5A ),
+    BYTES_TO_T_UINT_8( 0x64, 0xD9, 0x2E, 0xD8, 0xBD, 0xE4, 0xAE, 0x81 ),
+};
+static const mbedtls_mpi_uint brainpoolP512r1_gy[] = {
+    BYTES_TO_T_UINT_8( 0x92, 0x08, 0xD8, 0x3A, 0x0F, 0x1E, 0xCD, 0x78 ),
+    BYTES_TO_T_UINT_8( 0x06, 0x54, 0xF0, 0xA8, 0x2F, 0x2B, 0xCA, 0xD1 ),
+    BYTES_TO_T_UINT_8( 0xAE, 0x63, 0x27, 0x8A, 0xD8, 0x4B, 0xCA, 0x5B ),
+    BYTES_TO_T_UINT_8( 0x5E, 0x48, 0x5F, 0x4A, 0x49, 0xDE, 0xDC, 0xB2 ),
+    BYTES_TO_T_UINT_8( 0x11, 0x81, 0x1F, 0x88, 0x5B, 0xC5, 0x00, 0xA0 ),
+    BYTES_TO_T_UINT_8( 0x1A, 0x7B, 0xA5, 0x24, 0x00, 0xF7, 0x09, 0xF2 ),
+    BYTES_TO_T_UINT_8( 0xFD, 0x22, 0x78, 0xCF, 0xA9, 0xBF, 0xEA, 0xC0 ),
+    BYTES_TO_T_UINT_8( 0xEC, 0x32, 0x63, 0x56, 0x5D, 0x38, 0xDE, 0x7D ),
+};
+static const mbedtls_mpi_uint brainpoolP512r1_n[] = {
+    BYTES_TO_T_UINT_8( 0x69, 0x00, 0xA9, 0x9C, 0x82, 0x96, 0x87, 0xB5 ),
+    BYTES_TO_T_UINT_8( 0xDD, 0xDA, 0x5D, 0x08, 0x81, 0xD3, 0xB1, 0x1D ),
+    BYTES_TO_T_UINT_8( 0x47, 0x10, 0xAC, 0x7F, 0x19, 0x61, 0x86, 0x41 ),
+    BYTES_TO_T_UINT_8( 0x19, 0x26, 0xA9, 0x4C, 0x41, 0x5C, 0x3E, 0x55 ),
+    BYTES_TO_T_UINT_8( 0x70, 0x08, 0x33, 0x70, 0xCA, 0x9C, 0x63, 0xD6 ),
+    BYTES_TO_T_UINT_8( 0x0E, 0xD2, 0xC9, 0xB3, 0xB3, 0x8D, 0x30, 0xCB ),
+    BYTES_TO_T_UINT_8( 0x07, 0xFC, 0xC9, 0x33, 0xAE, 0xE6, 0xD4, 0x3F ),
+    BYTES_TO_T_UINT_8( 0x8B, 0xC4, 0xE9, 0xDB, 0xB8, 0x9D, 0xDD, 0xAA ),
+};
+#endif /* MBEDTLS_ECP_DP_BP512R1_ENABLED */
+
+/*
+ * Create an MPI from embedded constants
+ * (assumes len is an exact multiple of sizeof mbedtls_mpi_uint)
+ */
+static inline void ecp_mpi_load( mbedtls_mpi *X, const mbedtls_mpi_uint *p, size_t len )
+{
+    X->s = 1;
+    X->n = len / sizeof( mbedtls_mpi_uint );
+    X->p = (mbedtls_mpi_uint *) p;
+}
+
+/*
+ * Set an MPI to static value 1
+ */
+static inline void ecp_mpi_set1( mbedtls_mpi *X )
+{
+    static mbedtls_mpi_uint one[] = { 1 };
+    X->s = 1;
+    X->n = 1;
+    X->p = one;
+}
+
+/*
+ * Make group available from embedded constants
+ */
+static int ecp_group_load( mbedtls_ecp_group *grp,
+                           const mbedtls_mpi_uint *p,  size_t plen,
+                           const mbedtls_mpi_uint *a,  size_t alen,
+                           const mbedtls_mpi_uint *b,  size_t blen,
+                           const mbedtls_mpi_uint *gx, size_t gxlen,
+                           const mbedtls_mpi_uint *gy, size_t gylen,
+                           const mbedtls_mpi_uint *n,  size_t nlen)
+{
+    ecp_mpi_load( &grp->P, p, plen );
+    if( a != NULL )
+        ecp_mpi_load( &grp->A, a, alen );
+    ecp_mpi_load( &grp->B, b, blen );
+    ecp_mpi_load( &grp->N, n, nlen );
+
+    ecp_mpi_load( &grp->G.X, gx, gxlen );
+    ecp_mpi_load( &grp->G.Y, gy, gylen );
+    ecp_mpi_set1( &grp->G.Z );
+
+    grp->pbits = mbedtls_mpi_bitlen( &grp->P );
+    grp->nbits = mbedtls_mpi_bitlen( &grp->N );
+
+    grp->h = 1;
+
+    return( 0 );
+}
+
+#if defined(MBEDTLS_ECP_NIST_OPTIM)
+/* Forward declarations */
+#if defined(MBEDTLS_ECP_DP_SECP192R1_ENABLED)
+static int ecp_mod_p192( mbedtls_mpi * );
+#endif
+#if defined(MBEDTLS_ECP_DP_SECP224R1_ENABLED)
+static int ecp_mod_p224( mbedtls_mpi * );
+#endif
+#if defined(MBEDTLS_ECP_DP_SECP256R1_ENABLED)
+static int ecp_mod_p256( mbedtls_mpi * );
+#endif
+#if defined(MBEDTLS_ECP_DP_SECP384R1_ENABLED)
+static int ecp_mod_p384( mbedtls_mpi * );
+#endif
+#if defined(MBEDTLS_ECP_DP_SECP521R1_ENABLED)
+static int ecp_mod_p521( mbedtls_mpi * );
+#endif
+
+#define NIST_MODP( P )      grp->modp = ecp_mod_ ## P;
+#else
+#define NIST_MODP( P )
+#endif /* MBEDTLS_ECP_NIST_OPTIM */
+
+/* Additional forward declarations */
+#if defined(MBEDTLS_ECP_DP_CURVE25519_ENABLED)
+static int ecp_mod_p255( mbedtls_mpi * );
+#endif
+#if defined(MBEDTLS_ECP_DP_CURVE448_ENABLED)
+static int ecp_mod_p448( mbedtls_mpi * );
+#endif
+#if defined(MBEDTLS_ECP_DP_SECP192K1_ENABLED)
+static int ecp_mod_p192k1( mbedtls_mpi * );
+#endif
+#if defined(MBEDTLS_ECP_DP_SECP224K1_ENABLED)
+static int ecp_mod_p224k1( mbedtls_mpi * );
+#endif
+#if defined(MBEDTLS_ECP_DP_SECP256K1_ENABLED)
+static int ecp_mod_p256k1( mbedtls_mpi * );
+#endif
+
+#define LOAD_GROUP_A( G )   ecp_group_load( grp,            \
+                            G ## _p,  sizeof( G ## _p  ),   \
+                            G ## _a,  sizeof( G ## _a  ),   \
+                            G ## _b,  sizeof( G ## _b  ),   \
+                            G ## _gx, sizeof( G ## _gx ),   \
+                            G ## _gy, sizeof( G ## _gy ),   \
+                            G ## _n,  sizeof( G ## _n  ) )
+
+#define LOAD_GROUP( G )     ecp_group_load( grp,            \
+                            G ## _p,  sizeof( G ## _p  ),   \
+                            NULL,     0,                    \
+                            G ## _b,  sizeof( G ## _b  ),   \
+                            G ## _gx, sizeof( G ## _gx ),   \
+                            G ## _gy, sizeof( G ## _gy ),   \
+                            G ## _n,  sizeof( G ## _n  ) )
+
+#if defined(MBEDTLS_ECP_DP_CURVE25519_ENABLED)
+/*
+ * Specialized function for creating the Curve25519 group
+ */
+static int ecp_use_curve25519( mbedtls_ecp_group *grp )
+{
+    int ret;
+
+    /* Actually ( A + 2 ) / 4 */
+    MBEDTLS_MPI_CHK( mbedtls_mpi_read_string( &grp->A, 16, "01DB42" ) );
+
+    /* P = 2^255 - 19 */
+    MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &grp->P, 1 ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_shift_l( &grp->P, 255 ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_sub_int( &grp->P, &grp->P, 19 ) );
+    grp->pbits = mbedtls_mpi_bitlen( &grp->P );
+
+    /* N = 2^252 + 27742317777372353535851937790883648493 */
+    MBEDTLS_MPI_CHK( mbedtls_mpi_read_string( &grp->N, 16,
+                                              "14DEF9DEA2F79CD65812631A5CF5D3ED" ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_set_bit( &grp->N, 252, 1 ) );
+
+    /* Y intentionally not set, since we use x/z coordinates.
+     * This is used as a marker to identify Montgomery curves! */
+    MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &grp->G.X, 9 ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &grp->G.Z, 1 ) );
+    mbedtls_mpi_free( &grp->G.Y );
+
+    /* Actually, the required msb for private keys */
+    grp->nbits = 254;
+
+cleanup:
+    if( ret != 0 )
+        mbedtls_ecp_group_free( grp );
+
+    return( ret );
+}
+#endif /* MBEDTLS_ECP_DP_CURVE25519_ENABLED */
+
+#if defined(MBEDTLS_ECP_DP_CURVE448_ENABLED)
+/*
+ * Specialized function for creating the Curve448 group
+ */
+static int ecp_use_curve448( mbedtls_ecp_group *grp )
+{
+    mbedtls_mpi Ns;
+    int ret;
+
+    mbedtls_mpi_init( &Ns );
+
+    /* Actually ( A + 2 ) / 4 */
+    MBEDTLS_MPI_CHK( mbedtls_mpi_read_string( &grp->A, 16, "98AA" ) );
+
+    /* P = 2^448 - 2^224 - 1 */
+    MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &grp->P, 1 ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_shift_l( &grp->P, 224 ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_sub_int( &grp->P, &grp->P, 1 ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_shift_l( &grp->P, 224 ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_sub_int( &grp->P, &grp->P, 1 ) );
+    grp->pbits = mbedtls_mpi_bitlen( &grp->P );
+
+    /* Y intentionally not set, since we use x/z coordinates.
+     * This is used as a marker to identify Montgomery curves! */
+    MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &grp->G.X, 5 ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &grp->G.Z, 1 ) );
+    mbedtls_mpi_free( &grp->G.Y );
+
+    /* N = 2^446 - 13818066809895115352007386748515426880336692474882178609894547503885 */
+    MBEDTLS_MPI_CHK( mbedtls_mpi_set_bit( &grp->N, 446, 1 ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_read_string( &Ns, 16,
+                                              "8335DC163BB124B65129C96FDE933D8D723A70AADC873D6D54A7BB0D" ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &grp->N, &grp->N, &Ns ) );
+
+    /* Actually, the required msb for private keys */
+    grp->nbits = 447;
+
+cleanup:
+    mbedtls_mpi_free( &Ns );
+    if( ret != 0 )
+        mbedtls_ecp_group_free( grp );
+
+    return( ret );
+}
+#endif /* MBEDTLS_ECP_DP_CURVE448_ENABLED */
+
+/*
+ * Set a group using well-known domain parameters
+ */
+int mbedtls_ecp_group_load( mbedtls_ecp_group *grp, mbedtls_ecp_group_id id )
+{
+    mbedtls_ecp_group_free( grp );
+
+    grp->id = id;
+
+    switch( id )
+    {
+#if defined(MBEDTLS_ECP_DP_SECP192R1_ENABLED)
+        case MBEDTLS_ECP_DP_SECP192R1:
+            NIST_MODP( p192 );
+            return( LOAD_GROUP( secp192r1 ) );
+#endif /* MBEDTLS_ECP_DP_SECP192R1_ENABLED */
+
+#if defined(MBEDTLS_ECP_DP_SECP224R1_ENABLED)
+        case MBEDTLS_ECP_DP_SECP224R1:
+            NIST_MODP( p224 );
+            return( LOAD_GROUP( secp224r1 ) );
+#endif /* MBEDTLS_ECP_DP_SECP224R1_ENABLED */
+
+#if defined(MBEDTLS_ECP_DP_SECP256R1_ENABLED)
+        case MBEDTLS_ECP_DP_SECP256R1:
+            NIST_MODP( p256 );
+            return( LOAD_GROUP( secp256r1 ) );
+#endif /* MBEDTLS_ECP_DP_SECP256R1_ENABLED */
+
+#if defined(MBEDTLS_ECP_DP_SECP384R1_ENABLED)
+        case MBEDTLS_ECP_DP_SECP384R1:
+            NIST_MODP( p384 );
+            return( LOAD_GROUP( secp384r1 ) );
+#endif /* MBEDTLS_ECP_DP_SECP384R1_ENABLED */
+
+#if defined(MBEDTLS_ECP_DP_SECP521R1_ENABLED)
+        case MBEDTLS_ECP_DP_SECP521R1:
+            NIST_MODP( p521 );
+            return( LOAD_GROUP( secp521r1 ) );
+#endif /* MBEDTLS_ECP_DP_SECP521R1_ENABLED */
+
+#if defined(MBEDTLS_ECP_DP_SECP192K1_ENABLED)
+        case MBEDTLS_ECP_DP_SECP192K1:
+            grp->modp = ecp_mod_p192k1;
+            return( LOAD_GROUP_A( secp192k1 ) );
+#endif /* MBEDTLS_ECP_DP_SECP192K1_ENABLED */
+
+#if defined(MBEDTLS_ECP_DP_SECP224K1_ENABLED)
+        case MBEDTLS_ECP_DP_SECP224K1:
+            grp->modp = ecp_mod_p224k1;
+            return( LOAD_GROUP_A( secp224k1 ) );
+#endif /* MBEDTLS_ECP_DP_SECP224K1_ENABLED */
+
+#if defined(MBEDTLS_ECP_DP_SECP256K1_ENABLED)
+        case MBEDTLS_ECP_DP_SECP256K1:
+            grp->modp = ecp_mod_p256k1;
+            return( LOAD_GROUP_A( secp256k1 ) );
+#endif /* MBEDTLS_ECP_DP_SECP256K1_ENABLED */
+
+#if defined(MBEDTLS_ECP_DP_BP256R1_ENABLED)
+        case MBEDTLS_ECP_DP_BP256R1:
+            return( LOAD_GROUP_A( brainpoolP256r1 ) );
+#endif /* MBEDTLS_ECP_DP_BP256R1_ENABLED */
+
+#if defined(MBEDTLS_ECP_DP_BP384R1_ENABLED)
+        case MBEDTLS_ECP_DP_BP384R1:
+            return( LOAD_GROUP_A( brainpoolP384r1 ) );
+#endif /* MBEDTLS_ECP_DP_BP384R1_ENABLED */
+
+#if defined(MBEDTLS_ECP_DP_BP512R1_ENABLED)
+        case MBEDTLS_ECP_DP_BP512R1:
+            return( LOAD_GROUP_A( brainpoolP512r1 ) );
+#endif /* MBEDTLS_ECP_DP_BP512R1_ENABLED */
+
+#if defined(MBEDTLS_ECP_DP_CURVE25519_ENABLED)
+        case MBEDTLS_ECP_DP_CURVE25519:
+            grp->modp = ecp_mod_p255;
+            return( ecp_use_curve25519( grp ) );
+#endif /* MBEDTLS_ECP_DP_CURVE25519_ENABLED */
+
+#if defined(MBEDTLS_ECP_DP_CURVE448_ENABLED)
+        case MBEDTLS_ECP_DP_CURVE448:
+            grp->modp = ecp_mod_p448;
+            return( ecp_use_curve448( grp ) );
+#endif /* MBEDTLS_ECP_DP_CURVE448_ENABLED */
+
+        default:
+            mbedtls_ecp_group_free( grp );
+            return( MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE );
+    }
+}
+
+#if defined(MBEDTLS_ECP_NIST_OPTIM)
+/*
+ * Fast reduction modulo the primes used by the NIST curves.
+ *
+ * These functions are critical for speed, but not needed for correct
+ * operations. So, we make the choice to heavily rely on the internals of our
+ * bignum library, which creates a tight coupling between these functions and
+ * our MPI implementation.  However, the coupling between the ECP module and
+ * MPI remains loose, since these functions can be deactivated at will.
+ */
+
+#if defined(MBEDTLS_ECP_DP_SECP192R1_ENABLED)
+/*
+ * Compared to the way things are presented in FIPS 186-3 D.2,
+ * we proceed in columns, from right (least significant chunk) to left,
+ * adding chunks to N in place, and keeping a carry for the next chunk.
+ * This avoids moving things around in memory, and uselessly adding zeros,
+ * compared to the more straightforward, line-oriented approach.
+ *
+ * For this prime we need to handle data in chunks of 64 bits.
+ * Since this is always a multiple of our basic mbedtls_mpi_uint, we can
+ * use a mbedtls_mpi_uint * to designate such a chunk, and small loops to handle it.
+ */
+
+/* Add 64-bit chunks (dst += src) and update carry */
+static inline void add64( mbedtls_mpi_uint *dst, mbedtls_mpi_uint *src, mbedtls_mpi_uint *carry )
+{
+    unsigned char i;
+    mbedtls_mpi_uint c = 0;
+    for( i = 0; i < 8 / sizeof( mbedtls_mpi_uint ); i++, dst++, src++ )
+    {
+        *dst += c;      c  = ( *dst < c );
+        *dst += *src;   c += ( *dst < *src );
+    }
+    *carry += c;
+}
+
+/* Add carry to a 64-bit chunk and update carry */
+static inline void carry64( mbedtls_mpi_uint *dst, mbedtls_mpi_uint *carry )
+{
+    unsigned char i;
+    for( i = 0; i < 8 / sizeof( mbedtls_mpi_uint ); i++, dst++ )
+    {
+        *dst += *carry;
+        *carry  = ( *dst < *carry );
+    }
+}
+
+#define WIDTH       8 / sizeof( mbedtls_mpi_uint )
+#define A( i )      N->p + i * WIDTH
+#define ADD( i )    add64( p, A( i ), &c )
+#define NEXT        p += WIDTH; carry64( p, &c )
+#define LAST        p += WIDTH; *p = c; while( ++p < end ) *p = 0
+
+/*
+ * Fast quasi-reduction modulo p192 (FIPS 186-3 D.2.1)
+ */
+static int ecp_mod_p192( mbedtls_mpi *N )
+{
+    int ret;
+    mbedtls_mpi_uint c = 0;
+    mbedtls_mpi_uint *p, *end;
+
+    /* Make sure we have enough blocks so that A(5) is legal */
+    MBEDTLS_MPI_CHK( mbedtls_mpi_grow( N, 6 * WIDTH ) );
+
+    p = N->p;
+    end = p + N->n;
+
+    ADD( 3 ); ADD( 5 );             NEXT; // A0 += A3 + A5
+    ADD( 3 ); ADD( 4 ); ADD( 5 );   NEXT; // A1 += A3 + A4 + A5
+    ADD( 4 ); ADD( 5 );             LAST; // A2 += A4 + A5
+
+cleanup:
+    return( ret );
+}
+
+#undef WIDTH
+#undef A
+#undef ADD
+#undef NEXT
+#undef LAST
+#endif /* MBEDTLS_ECP_DP_SECP192R1_ENABLED */
+
+#if defined(MBEDTLS_ECP_DP_SECP224R1_ENABLED) ||   \
+    defined(MBEDTLS_ECP_DP_SECP256R1_ENABLED) ||   \
+    defined(MBEDTLS_ECP_DP_SECP384R1_ENABLED)
+/*
+ * The reader is advised to first understand ecp_mod_p192() since the same
+ * general structure is used here, but with additional complications:
+ * (1) chunks of 32 bits, and (2) subtractions.
+ */
+
+/*
+ * For these primes, we need to handle data in chunks of 32 bits.
+ * This makes it more complicated if we use 64 bits limbs in MPI,
+ * which prevents us from using a uniform access method as for p192.
+ *
+ * So, we define a mini abstraction layer to access 32 bit chunks,
+ * load them in 'cur' for work, and store them back from 'cur' when done.
+ *
+ * While at it, also define the size of N in terms of 32-bit chunks.
+ */
+#define LOAD32      cur = A( i );
+
+#if defined(MBEDTLS_HAVE_INT32)  /* 32 bit */
+
+#define MAX32       N->n
+#define A( j )      N->p[j]
+#define STORE32     N->p[i] = cur;
+
+#else                               /* 64-bit */
+
+#define MAX32       N->n * 2
+#define A( j ) j % 2 ? (uint32_t)( N->p[j/2] >> 32 ) : (uint32_t)( N->p[j/2] )
+#define STORE32                                   \
+    if( i % 2 ) {                                 \
+        N->p[i/2] &= 0x00000000FFFFFFFF;          \
+        N->p[i/2] |= ((mbedtls_mpi_uint) cur) << 32;        \
+    } else {                                      \
+        N->p[i/2] &= 0xFFFFFFFF00000000;          \
+        N->p[i/2] |= (mbedtls_mpi_uint) cur;                \
+    }
+
+#endif /* sizeof( mbedtls_mpi_uint ) */
+
+/*
+ * Helpers for addition and subtraction of chunks, with signed carry.
+ */
+static inline void add32( uint32_t *dst, uint32_t src, signed char *carry )
+{
+    *dst += src;
+    *carry += ( *dst < src );
+}
+
+static inline void sub32( uint32_t *dst, uint32_t src, signed char *carry )
+{
+    *carry -= ( *dst < src );
+    *dst -= src;
+}
+
+#define ADD( j )    add32( &cur, A( j ), &c );
+#define SUB( j )    sub32( &cur, A( j ), &c );
+
+/*
+ * Helpers for the main 'loop'
+ * (see fix_negative for the motivation of C)
+ */
+#define INIT( b )                                           \
+    int ret;                                                \
+    signed char c = 0, cc;                                  \
+    uint32_t cur;                                           \
+    size_t i = 0, bits = b;                                 \
+    mbedtls_mpi C;                                                  \
+    mbedtls_mpi_uint Cp[ b / 8 / sizeof( mbedtls_mpi_uint) + 1 ];               \
+                                                            \
+    C.s = 1;                                                \
+    C.n = b / 8 / sizeof( mbedtls_mpi_uint) + 1;                      \
+    C.p = Cp;                                               \
+    memset( Cp, 0, C.n * sizeof( mbedtls_mpi_uint ) );                \
+                                                            \
+    MBEDTLS_MPI_CHK( mbedtls_mpi_grow( N, b * 2 / 8 / sizeof( mbedtls_mpi_uint ) ) ); \
+    LOAD32;
+
+#define NEXT                    \
+    STORE32; i++; LOAD32;       \
+    cc = c; c = 0;              \
+    if( cc < 0 )                \
+        sub32( &cur, -cc, &c ); \
+    else                        \
+        add32( &cur, cc, &c );  \
+
+#define LAST                                    \
+    STORE32; i++;                               \
+    cur = c > 0 ? c : 0; STORE32;               \
+    cur = 0; while( ++i < MAX32 ) { STORE32; }  \
+    if( c < 0 ) fix_negative( N, c, &C, bits );
+
+/*
+ * If the result is negative, we get it in the form
+ * c * 2^(bits + 32) + N, with c negative and N positive shorter than 'bits'
+ */
+static inline int fix_negative( mbedtls_mpi *N, signed char c, mbedtls_mpi *C, size_t bits )
+{
+    int ret;
+
+    /* C = - c * 2^(bits + 32) */
+#if !defined(MBEDTLS_HAVE_INT64)
+    ((void) bits);
+#else
+    if( bits == 224 )
+        C->p[ C->n - 1 ] = ((mbedtls_mpi_uint) -c) << 32;
+    else
+#endif
+        C->p[ C->n - 1 ] = (mbedtls_mpi_uint) -c;
+
+    /* N = - ( C - N ) */
+    MBEDTLS_MPI_CHK( mbedtls_mpi_sub_abs( N, C, N ) );
+    N->s = -1;
+
+cleanup:
+
+    return( ret );
+}
+
+#if defined(MBEDTLS_ECP_DP_SECP224R1_ENABLED)
+/*
+ * Fast quasi-reduction modulo p224 (FIPS 186-3 D.2.2)
+ */
+static int ecp_mod_p224( mbedtls_mpi *N )
+{
+    INIT( 224 );
+
+    SUB(  7 ); SUB( 11 );               NEXT; // A0 += -A7 - A11
+    SUB(  8 ); SUB( 12 );               NEXT; // A1 += -A8 - A12
+    SUB(  9 ); SUB( 13 );               NEXT; // A2 += -A9 - A13
+    SUB( 10 ); ADD(  7 ); ADD( 11 );    NEXT; // A3 += -A10 + A7 + A11
+    SUB( 11 ); ADD(  8 ); ADD( 12 );    NEXT; // A4 += -A11 + A8 + A12
+    SUB( 12 ); ADD(  9 ); ADD( 13 );    NEXT; // A5 += -A12 + A9 + A13
+    SUB( 13 ); ADD( 10 );               LAST; // A6 += -A13 + A10
+
+cleanup:
+    return( ret );
+}
+#endif /* MBEDTLS_ECP_DP_SECP224R1_ENABLED */
+
+#if defined(MBEDTLS_ECP_DP_SECP256R1_ENABLED)
+/*
+ * Fast quasi-reduction modulo p256 (FIPS 186-3 D.2.3)
+ */
+static int ecp_mod_p256( mbedtls_mpi *N )
+{
+    INIT( 256 );
+
+    ADD(  8 ); ADD(  9 );
+    SUB( 11 ); SUB( 12 ); SUB( 13 ); SUB( 14 );             NEXT; // A0
+
+    ADD(  9 ); ADD( 10 );
+    SUB( 12 ); SUB( 13 ); SUB( 14 ); SUB( 15 );             NEXT; // A1
+
+    ADD( 10 ); ADD( 11 );
+    SUB( 13 ); SUB( 14 ); SUB( 15 );                        NEXT; // A2
+
+    ADD( 11 ); ADD( 11 ); ADD( 12 ); ADD( 12 ); ADD( 13 );
+    SUB( 15 ); SUB(  8 ); SUB(  9 );                        NEXT; // A3
+
+    ADD( 12 ); ADD( 12 ); ADD( 13 ); ADD( 13 ); ADD( 14 );
+    SUB(  9 ); SUB( 10 );                                   NEXT; // A4
+
+    ADD( 13 ); ADD( 13 ); ADD( 14 ); ADD( 14 ); ADD( 15 );
+    SUB( 10 ); SUB( 11 );                                   NEXT; // A5
+
+    ADD( 14 ); ADD( 14 ); ADD( 15 ); ADD( 15 ); ADD( 14 ); ADD( 13 );
+    SUB(  8 ); SUB(  9 );                                   NEXT; // A6
+
+    ADD( 15 ); ADD( 15 ); ADD( 15 ); ADD( 8 );
+    SUB( 10 ); SUB( 11 ); SUB( 12 ); SUB( 13 );             LAST; // A7
+
+cleanup:
+    return( ret );
+}
+#endif /* MBEDTLS_ECP_DP_SECP256R1_ENABLED */
+
+#if defined(MBEDTLS_ECP_DP_SECP384R1_ENABLED)
+/*
+ * Fast quasi-reduction modulo p384 (FIPS 186-3 D.2.4)
+ */
+static int ecp_mod_p384( mbedtls_mpi *N )
+{
+    INIT( 384 );
+
+    ADD( 12 ); ADD( 21 ); ADD( 20 );
+    SUB( 23 );                                              NEXT; // A0
+
+    ADD( 13 ); ADD( 22 ); ADD( 23 );
+    SUB( 12 ); SUB( 20 );                                   NEXT; // A2
+
+    ADD( 14 ); ADD( 23 );
+    SUB( 13 ); SUB( 21 );                                   NEXT; // A2
+
+    ADD( 15 ); ADD( 12 ); ADD( 20 ); ADD( 21 );
+    SUB( 14 ); SUB( 22 ); SUB( 23 );                        NEXT; // A3
+
+    ADD( 21 ); ADD( 21 ); ADD( 16 ); ADD( 13 ); ADD( 12 ); ADD( 20 ); ADD( 22 );
+    SUB( 15 ); SUB( 23 ); SUB( 23 );                        NEXT; // A4
+
+    ADD( 22 ); ADD( 22 ); ADD( 17 ); ADD( 14 ); ADD( 13 ); ADD( 21 ); ADD( 23 );
+    SUB( 16 );                                              NEXT; // A5
+
+    ADD( 23 ); ADD( 23 ); ADD( 18 ); ADD( 15 ); ADD( 14 ); ADD( 22 );
+    SUB( 17 );                                              NEXT; // A6
+
+    ADD( 19 ); ADD( 16 ); ADD( 15 ); ADD( 23 );
+    SUB( 18 );                                              NEXT; // A7
+
+    ADD( 20 ); ADD( 17 ); ADD( 16 );
+    SUB( 19 );                                              NEXT; // A8
+
+    ADD( 21 ); ADD( 18 ); ADD( 17 );
+    SUB( 20 );                                              NEXT; // A9
+
+    ADD( 22 ); ADD( 19 ); ADD( 18 );
+    SUB( 21 );                                              NEXT; // A10
+
+    ADD( 23 ); ADD( 20 ); ADD( 19 );
+    SUB( 22 );                                              LAST; // A11
+
+cleanup:
+    return( ret );
+}
+#endif /* MBEDTLS_ECP_DP_SECP384R1_ENABLED */
+
+#undef A
+#undef LOAD32
+#undef STORE32
+#undef MAX32
+#undef INIT
+#undef NEXT
+#undef LAST
+
+#endif /* MBEDTLS_ECP_DP_SECP224R1_ENABLED ||
+          MBEDTLS_ECP_DP_SECP256R1_ENABLED ||
+          MBEDTLS_ECP_DP_SECP384R1_ENABLED */
+
+#if defined(MBEDTLS_ECP_DP_SECP521R1_ENABLED)
+/*
+ * Here we have an actual Mersenne prime, so things are more straightforward.
+ * However, chunks are aligned on a 'weird' boundary (521 bits).
+ */
+
+/* Size of p521 in terms of mbedtls_mpi_uint */
+#define P521_WIDTH      ( 521 / 8 / sizeof( mbedtls_mpi_uint ) + 1 )
+
+/* Bits to keep in the most significant mbedtls_mpi_uint */
+#define P521_MASK       0x01FF
+
+/*
+ * Fast quasi-reduction modulo p521 (FIPS 186-3 D.2.5)
+ * Write N as A1 + 2^521 A0, return A0 + A1
+ */
+static int ecp_mod_p521( mbedtls_mpi *N )
+{
+    int ret;
+    size_t i;
+    mbedtls_mpi M;
+    mbedtls_mpi_uint Mp[P521_WIDTH + 1];
+    /* Worst case for the size of M is when mbedtls_mpi_uint is 16 bits:
+     * we need to hold bits 513 to 1056, which is 34 limbs, that is
+     * P521_WIDTH + 1. Otherwise P521_WIDTH is enough. */
+
+    if( N->n < P521_WIDTH )
+        return( 0 );
+
+    /* M = A1 */
+    M.s = 1;
+    M.n = N->n - ( P521_WIDTH - 1 );
+    if( M.n > P521_WIDTH + 1 )
+        M.n = P521_WIDTH + 1;
+    M.p = Mp;
+    memcpy( Mp, N->p + P521_WIDTH - 1, M.n * sizeof( mbedtls_mpi_uint ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &M, 521 % ( 8 * sizeof( mbedtls_mpi_uint ) ) ) );
+
+    /* N = A0 */
+    N->p[P521_WIDTH - 1] &= P521_MASK;
+    for( i = P521_WIDTH; i < N->n; i++ )
+        N->p[i] = 0;
+
+    /* N = A0 + A1 */
+    MBEDTLS_MPI_CHK( mbedtls_mpi_add_abs( N, N, &M ) );
+
+cleanup:
+    return( ret );
+}
+
+#undef P521_WIDTH
+#undef P521_MASK
+#endif /* MBEDTLS_ECP_DP_SECP521R1_ENABLED */
+
+#endif /* MBEDTLS_ECP_NIST_OPTIM */
+
+#if defined(MBEDTLS_ECP_DP_CURVE25519_ENABLED)
+
+/* Size of p255 in terms of mbedtls_mpi_uint */
+#define P255_WIDTH      ( 255 / 8 / sizeof( mbedtls_mpi_uint ) + 1 )
+
+/*
+ * Fast quasi-reduction modulo p255 = 2^255 - 19
+ * Write N as A0 + 2^255 A1, return A0 + 19 * A1
+ */
+static int ecp_mod_p255( mbedtls_mpi *N )
+{
+    int ret;
+    size_t i;
+    mbedtls_mpi M;
+    mbedtls_mpi_uint Mp[P255_WIDTH + 2];
+
+    if( N->n < P255_WIDTH )
+        return( 0 );
+
+    /* M = A1 */
+    M.s = 1;
+    M.n = N->n - ( P255_WIDTH - 1 );
+    if( M.n > P255_WIDTH + 1 )
+        return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
+    M.p = Mp;
+    memset( Mp, 0, sizeof Mp );
+    memcpy( Mp, N->p + P255_WIDTH - 1, M.n * sizeof( mbedtls_mpi_uint ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &M, 255 % ( 8 * sizeof( mbedtls_mpi_uint ) ) ) );
+    M.n++; /* Make room for multiplication by 19 */
+
+    /* N = A0 */
+    MBEDTLS_MPI_CHK( mbedtls_mpi_set_bit( N, 255, 0 ) );
+    for( i = P255_WIDTH; i < N->n; i++ )
+        N->p[i] = 0;
+
+    /* N = A0 + 19 * A1 */
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_int( &M, &M, 19 ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_add_abs( N, N, &M ) );
+
+cleanup:
+    return( ret );
+}
+#endif /* MBEDTLS_ECP_DP_CURVE25519_ENABLED */
+
+#if defined(MBEDTLS_ECP_DP_CURVE448_ENABLED)
+
+/* Size of p448 in terms of mbedtls_mpi_uint */
+#define P448_WIDTH      ( 448 / 8 / sizeof( mbedtls_mpi_uint ) )
+
+/* Number of limbs fully occupied by 2^224 (max), and limbs used by it (min) */
+#define DIV_ROUND_UP( X, Y ) ( ( ( X ) + ( Y ) - 1 ) / ( Y ) )
+#define P224_WIDTH_MIN   ( 28 / sizeof( mbedtls_mpi_uint ) )
+#define P224_WIDTH_MAX   DIV_ROUND_UP( 28, sizeof( mbedtls_mpi_uint ) )
+#define P224_UNUSED_BITS ( ( P224_WIDTH_MAX * sizeof( mbedtls_mpi_uint ) * 8 ) - 224 )
+
+/*
+ * Fast quasi-reduction modulo p448 = 2^448 - 2^224 - 1
+ * Write N as A0 + 2^448 A1 and A1 as B0 + 2^224 B1, and return
+ * A0 + A1 + B1 + (B0 + B1) * 2^224.  This is different to the reference
+ * implementation of Curve448, which uses its own special 56-bit limbs rather
+ * than a generic bignum library.  We could squeeze some extra speed out on
+ * 32-bit machines by splitting N up into 32-bit limbs and doing the
+ * arithmetic using the limbs directly as we do for the NIST primes above,
+ * but for 64-bit targets it should use half the number of operations if we do
+ * the reduction with 224-bit limbs, since mpi_add_mpi will then use 64-bit adds.
+ */
+static int ecp_mod_p448( mbedtls_mpi *N )
+{
+    int ret;
+    size_t i;
+    mbedtls_mpi M, Q;
+    mbedtls_mpi_uint Mp[P448_WIDTH + 1], Qp[P448_WIDTH];
+
+    if( N->n <= P448_WIDTH )
+        return( 0 );
+
+    /* M = A1 */
+    M.s = 1;
+    M.n = N->n - ( P448_WIDTH );
+    if( M.n > P448_WIDTH )
+        /* Shouldn't be called with N larger than 2^896! */
+        return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
+    M.p = Mp;
+    memset( Mp, 0, sizeof( Mp ) );
+    memcpy( Mp, N->p + P448_WIDTH, M.n * sizeof( mbedtls_mpi_uint ) );
+
+    /* N = A0 */
+    for( i = P448_WIDTH; i < N->n; i++ )
+        N->p[i] = 0;
+
+    /* N += A1 */
+    MBEDTLS_MPI_CHK( mbedtls_mpi_add_mpi( N, N, &M ) );
+
+    /* Q = B1, N += B1 */
+    Q = M;
+    Q.p = Qp;
+    memcpy( Qp, Mp, sizeof( Qp ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &Q, 224 ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_add_mpi( N, N, &Q ) );
+
+    /* M = (B0 + B1) * 2^224, N += M */
+    if( sizeof( mbedtls_mpi_uint ) > 4 )
+        Mp[P224_WIDTH_MIN] &= ( (mbedtls_mpi_uint)-1 ) >> ( P224_UNUSED_BITS );
+    for( i = P224_WIDTH_MAX; i < M.n; ++i )
+        Mp[i] = 0;
+    MBEDTLS_MPI_CHK( mbedtls_mpi_add_mpi( &M, &M, &Q ) );
+    M.n = P448_WIDTH + 1; /* Make room for shifted carry bit from the addition */
+    MBEDTLS_MPI_CHK( mbedtls_mpi_shift_l( &M, 224 ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_add_mpi( N, N, &M ) );
+
+cleanup:
+    return( ret );
+}
+#endif /* MBEDTLS_ECP_DP_CURVE448_ENABLED */
+
+#if defined(MBEDTLS_ECP_DP_SECP192K1_ENABLED) ||   \
+    defined(MBEDTLS_ECP_DP_SECP224K1_ENABLED) ||   \
+    defined(MBEDTLS_ECP_DP_SECP256K1_ENABLED)
+/*
+ * Fast quasi-reduction modulo P = 2^s - R,
+ * with R about 33 bits, used by the Koblitz curves.
+ *
+ * Write N as A0 + 2^224 A1, return A0 + R * A1.
+ * Actually do two passes, since R is big.
+ */
+#define P_KOBLITZ_MAX   ( 256 / 8 / sizeof( mbedtls_mpi_uint ) )  // Max limbs in P
+#define P_KOBLITZ_R     ( 8 / sizeof( mbedtls_mpi_uint ) )        // Limbs in R
+static inline int ecp_mod_koblitz( mbedtls_mpi *N, mbedtls_mpi_uint *Rp, size_t p_limbs,
+                                   size_t adjust, size_t shift, mbedtls_mpi_uint mask )
+{
+    int ret;
+    size_t i;
+    mbedtls_mpi M, R;
+    mbedtls_mpi_uint Mp[P_KOBLITZ_MAX + P_KOBLITZ_R + 1];
+
+    if( N->n < p_limbs )
+        return( 0 );
+
+    /* Init R */
+    R.s = 1;
+    R.p = Rp;
+    R.n = P_KOBLITZ_R;
+
+    /* Common setup for M */
+    M.s = 1;
+    M.p = Mp;
+
+    /* M = A1 */
+    M.n = N->n - ( p_limbs - adjust );
+    if( M.n > p_limbs + adjust )
+        M.n = p_limbs + adjust;
+    memset( Mp, 0, sizeof Mp );
+    memcpy( Mp, N->p + p_limbs - adjust, M.n * sizeof( mbedtls_mpi_uint ) );
+    if( shift != 0 )
+        MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &M, shift ) );
+    M.n += R.n; /* Make room for multiplication by R */
+
+    /* N = A0 */
+    if( mask != 0 )
+        N->p[p_limbs - 1] &= mask;
+    for( i = p_limbs; i < N->n; i++ )
+        N->p[i] = 0;
+
+    /* N = A0 + R * A1 */
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &M, &M, &R ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_add_abs( N, N, &M ) );
+
+    /* Second pass */
+
+    /* M = A1 */
+    M.n = N->n - ( p_limbs - adjust );
+    if( M.n > p_limbs + adjust )
+        M.n = p_limbs + adjust;
+    memset( Mp, 0, sizeof Mp );
+    memcpy( Mp, N->p + p_limbs - adjust, M.n * sizeof( mbedtls_mpi_uint ) );
+    if( shift != 0 )
+        MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &M, shift ) );
+    M.n += R.n; /* Make room for multiplication by R */
+
+    /* N = A0 */
+    if( mask != 0 )
+        N->p[p_limbs - 1] &= mask;
+    for( i = p_limbs; i < N->n; i++ )
+        N->p[i] = 0;
+
+    /* N = A0 + R * A1 */
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &M, &M, &R ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_add_abs( N, N, &M ) );
+
+cleanup:
+    return( ret );
+}
+#endif /* MBEDTLS_ECP_DP_SECP192K1_ENABLED) ||
+          MBEDTLS_ECP_DP_SECP224K1_ENABLED) ||
+          MBEDTLS_ECP_DP_SECP256K1_ENABLED) */
+
+#if defined(MBEDTLS_ECP_DP_SECP192K1_ENABLED)
+/*
+ * Fast quasi-reduction modulo p192k1 = 2^192 - R,
+ * with R = 2^32 + 2^12 + 2^8 + 2^7 + 2^6 + 2^3 + 1 = 0x0100001119
+ */
+static int ecp_mod_p192k1( mbedtls_mpi *N )
+{
+    static mbedtls_mpi_uint Rp[] = {
+        BYTES_TO_T_UINT_8( 0xC9, 0x11, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 ) };
+
+    return( ecp_mod_koblitz( N, Rp, 192 / 8 / sizeof( mbedtls_mpi_uint ), 0, 0, 0 ) );
+}
+#endif /* MBEDTLS_ECP_DP_SECP192K1_ENABLED */
+
+#if defined(MBEDTLS_ECP_DP_SECP224K1_ENABLED)
+/*
+ * Fast quasi-reduction modulo p224k1 = 2^224 - R,
+ * with R = 2^32 + 2^12 + 2^11 + 2^9 + 2^7 + 2^4 + 2 + 1 = 0x0100001A93
+ */
+static int ecp_mod_p224k1( mbedtls_mpi *N )
+{
+    static mbedtls_mpi_uint Rp[] = {
+        BYTES_TO_T_UINT_8( 0x93, 0x1A, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 ) };
+
+#if defined(MBEDTLS_HAVE_INT64)
+    return( ecp_mod_koblitz( N, Rp, 4, 1, 32, 0xFFFFFFFF ) );
+#else
+    return( ecp_mod_koblitz( N, Rp, 224 / 8 / sizeof( mbedtls_mpi_uint ), 0, 0, 0 ) );
+#endif
+}
+
+#endif /* MBEDTLS_ECP_DP_SECP224K1_ENABLED */
+
+#if defined(MBEDTLS_ECP_DP_SECP256K1_ENABLED)
+/*
+ * Fast quasi-reduction modulo p256k1 = 2^256 - R,
+ * with R = 2^32 + 2^9 + 2^8 + 2^7 + 2^6 + 2^4 + 1 = 0x01000003D1
+ */
+static int ecp_mod_p256k1( mbedtls_mpi *N )
+{
+    static mbedtls_mpi_uint Rp[] = {
+        BYTES_TO_T_UINT_8( 0xD1, 0x03, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 ) };
+    return( ecp_mod_koblitz( N, Rp, 256 / 8 / sizeof( mbedtls_mpi_uint ), 0, 0, 0 ) );
+}
+#endif /* MBEDTLS_ECP_DP_SECP256K1_ENABLED */
+
+#endif /* !MBEDTLS_ECP_ALT */
+
+#endif /* MBEDTLS_ECP_C */
diff --git a/common/mbedtls/ecp_internal.h b/common/mbedtls/ecp_internal.h
new file mode 100644
index 000000000..73bccd426
--- /dev/null
+++ b/common/mbedtls/ecp_internal.h
@@ -0,0 +1,295 @@
+/**
+ * \file ecp_internal.h
+ *
+ * \brief Function declarations for alternative implementation of elliptic curve
+ * point arithmetic.
+ */
+/*
+ *  Copyright (C) 2016, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+
+/*
+ * References:
+ *
+ * [1] BERNSTEIN, Daniel J. Curve25519: new Diffie-Hellman speed records.
+ *     <http://cr.yp.to/ecdh/curve25519-20060209.pdf>
+ *
+ * [2] CORON, Jean-S'ebastien. Resistance against differential power analysis
+ *     for elliptic curve cryptosystems. In : Cryptographic Hardware and
+ *     Embedded Systems. Springer Berlin Heidelberg, 1999. p. 292-302.
+ *     <http://link.springer.com/chapter/10.1007/3-540-48059-5_25>
+ *
+ * [3] HEDABOU, Mustapha, PINEL, Pierre, et B'EN'ETEAU, Lucien. A comb method to
+ *     render ECC resistant against Side Channel Attacks. IACR Cryptology
+ *     ePrint Archive, 2004, vol. 2004, p. 342.
+ *     <http://eprint.iacr.org/2004/342.pdf>
+ *
+ * [4] Certicom Research. SEC 2: Recommended Elliptic Curve Domain Parameters.
+ *     <http://www.secg.org/sec2-v2.pdf>
+ *
+ * [5] HANKERSON, Darrel, MENEZES, Alfred J., VANSTONE, Scott. Guide to Elliptic
+ *     Curve Cryptography.
+ *
+ * [6] Digital Signature Standard (DSS), FIPS 186-4.
+ *     <http://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.186-4.pdf>
+ *
+ * [7] Elliptic Curve Cryptography (ECC) Cipher Suites for Transport Layer
+ *     Security (TLS), RFC 4492.
+ *     <https://tools.ietf.org/search/rfc4492>
+ *
+ * [8] <http://www.hyperelliptic.org/EFD/g1p/auto-shortw-jacobian.html>
+ *
+ * [9] COHEN, Henri. A Course in Computational Algebraic Number Theory.
+ *     Springer Science & Business Media, 1 Aug 2000
+ */
+
+#ifndef MBEDTLS_ECP_INTERNAL_H
+#define MBEDTLS_ECP_INTERNAL_H
+
+#if defined(MBEDTLS_ECP_INTERNAL_ALT)
+
+/**
+ * \brief           Indicate if the Elliptic Curve Point module extension can
+ *                  handle the group.
+ *
+ * \param grp       The pointer to the elliptic curve group that will be the
+ *                  basis of the cryptographic computations.
+ *
+ * \return          Non-zero if successful.
+ */
+unsigned char mbedtls_internal_ecp_grp_capable( const mbedtls_ecp_group *grp );
+
+/**
+ * \brief           Initialise the Elliptic Curve Point module extension.
+ *
+ *                  If mbedtls_internal_ecp_grp_capable returns true for a
+ *                  group, this function has to be able to initialise the
+ *                  module for it.
+ *
+ *                  This module can be a driver to a crypto hardware
+ *                  accelerator, for which this could be an initialise function.
+ *
+ * \param grp       The pointer to the group the module needs to be
+ *                  initialised for.
+ *
+ * \return          0 if successful.
+ */
+int mbedtls_internal_ecp_init( const mbedtls_ecp_group *grp );
+
+/**
+ * \brief           Frees and deallocates the Elliptic Curve Point module
+ *                  extension.
+ *
+ * \param grp       The pointer to the group the module was initialised for.
+ */
+void mbedtls_internal_ecp_free( const mbedtls_ecp_group *grp );
+
+#if defined(ECP_SHORTWEIERSTRASS)
+
+#if defined(MBEDTLS_ECP_RANDOMIZE_JAC_ALT)
+/**
+ * \brief           Randomize jacobian coordinates:
+ *                  (X, Y, Z) -> (l^2 X, l^3 Y, l Z) for random l.
+ *
+ * \param grp       Pointer to the group representing the curve.
+ *
+ * \param pt        The point on the curve to be randomised, given with Jacobian
+ *                  coordinates.
+ *
+ * \param f_rng     A function pointer to the random number generator.
+ *
+ * \param p_rng     A pointer to the random number generator state.
+ *
+ * \return          0 if successful.
+ */
+int mbedtls_internal_ecp_randomize_jac( const mbedtls_ecp_group *grp,
+        mbedtls_ecp_point *pt, int (*f_rng)(void *, unsigned char *, size_t),
+        void *p_rng );
+#endif
+
+#if defined(MBEDTLS_ECP_ADD_MIXED_ALT)
+/**
+ * \brief           Addition: R = P + Q, mixed affine-Jacobian coordinates.
+ *
+ *                  The coordinates of Q must be normalized (= affine),
+ *                  but those of P don't need to. R is not normalized.
+ *
+ *                  This function is used only as a subrutine of
+ *                  ecp_mul_comb().
+ *
+ *                  Special cases: (1) P or Q is zero, (2) R is zero,
+ *                      (3) P == Q.
+ *                  None of these cases can happen as intermediate step in
+ *                  ecp_mul_comb():
+ *                      - at each step, P, Q and R are multiples of the base
+ *                      point, the factor being less than its order, so none of
+ *                      them is zero;
+ *                      - Q is an odd multiple of the base point, P an even
+ *                      multiple, due to the choice of precomputed points in the
+ *                      modified comb method.
+ *                  So branches for these cases do not leak secret information.
+ *
+ *                  We accept Q->Z being unset (saving memory in tables) as
+ *                  meaning 1.
+ *
+ *                  Cost in field operations if done by [5] 3.22:
+ *                      1A := 8M + 3S
+ *
+ * \param grp       Pointer to the group representing the curve.
+ *
+ * \param R         Pointer to a point structure to hold the result.
+ *
+ * \param P         Pointer to the first summand, given with Jacobian
+ *                  coordinates
+ *
+ * \param Q         Pointer to the second summand, given with affine
+ *                  coordinates.
+ *
+ * \return          0 if successful.
+ */
+int mbedtls_internal_ecp_add_mixed( const mbedtls_ecp_group *grp,
+        mbedtls_ecp_point *R, const mbedtls_ecp_point *P,
+        const mbedtls_ecp_point *Q );
+#endif
+
+/**
+ * \brief           Point doubling R = 2 P, Jacobian coordinates.
+ *
+ *                  Cost:   1D := 3M + 4S    (A ==  0)
+ *                          4M + 4S          (A == -3)
+ *                          3M + 6S + 1a     otherwise
+ *                  when the implementation is based on the "dbl-1998-cmo-2"
+ *                  doubling formulas in [8] and standard optimizations are
+ *                  applied when curve parameter A is one of { 0, -3 }.
+ *
+ * \param grp       Pointer to the group representing the curve.
+ *
+ * \param R         Pointer to a point structure to hold the result.
+ *
+ * \param P         Pointer to the point that has to be doubled, given with
+ *                  Jacobian coordinates.
+ *
+ * \return          0 if successful.
+ */
+#if defined(MBEDTLS_ECP_DOUBLE_JAC_ALT)
+int mbedtls_internal_ecp_double_jac( const mbedtls_ecp_group *grp,
+        mbedtls_ecp_point *R, const mbedtls_ecp_point *P );
+#endif
+
+/**
+ * \brief           Normalize jacobian coordinates of an array of (pointers to)
+ *                  points.
+ *
+ *                  Using Montgomery's trick to perform only one inversion mod P
+ *                  the cost is:
+ *                      1N(t) := 1I + (6t - 3)M + 1S
+ *                  (See for example Algorithm 10.3.4. in [9])
+ *
+ *                  This function is used only as a subrutine of
+ *                  ecp_mul_comb().
+ *
+ *                  Warning: fails (returning an error) if one of the points is
+ *                  zero!
+ *                  This should never happen, see choice of w in ecp_mul_comb().
+ *
+ * \param grp       Pointer to the group representing the curve.
+ *
+ * \param T         Array of pointers to the points to normalise.
+ *
+ * \param t_len     Number of elements in the array.
+ *
+ * \return          0 if successful,
+ *                      an error if one of the points is zero.
+ */
+#if defined(MBEDTLS_ECP_NORMALIZE_JAC_MANY_ALT)
+int mbedtls_internal_ecp_normalize_jac_many( const mbedtls_ecp_group *grp,
+        mbedtls_ecp_point *T[], size_t t_len );
+#endif
+
+/**
+ * \brief           Normalize jacobian coordinates so that Z == 0 || Z == 1.
+ *
+ *                  Cost in field operations if done by [5] 3.2.1:
+ *                      1N := 1I + 3M + 1S
+ *
+ * \param grp       Pointer to the group representing the curve.
+ *
+ * \param pt        pointer to the point to be normalised. This is an
+ *                  input/output parameter.
+ *
+ * \return          0 if successful.
+ */
+#if defined(MBEDTLS_ECP_NORMALIZE_JAC_ALT)
+int mbedtls_internal_ecp_normalize_jac( const mbedtls_ecp_group *grp,
+        mbedtls_ecp_point *pt );
+#endif
+
+#endif /* ECP_SHORTWEIERSTRASS */
+
+#if defined(ECP_MONTGOMERY)
+
+#if defined(MBEDTLS_ECP_DOUBLE_ADD_MXZ_ALT)
+int mbedtls_internal_ecp_double_add_mxz( const mbedtls_ecp_group *grp,
+        mbedtls_ecp_point *R, mbedtls_ecp_point *S, const mbedtls_ecp_point *P,
+        const mbedtls_ecp_point *Q, const mbedtls_mpi *d );
+#endif
+
+/**
+ * \brief           Randomize projective x/z coordinates:
+ *                      (X, Z) -> (l X, l Z) for random l
+ *
+ * \param grp       pointer to the group representing the curve
+ *
+ * \param P         the point on the curve to be randomised given with
+ *                  projective coordinates. This is an input/output parameter.
+ *
+ * \param f_rng     a function pointer to the random number generator
+ *
+ * \param p_rng     a pointer to the random number generator state
+ *
+ * \return          0 if successful
+ */
+#if defined(MBEDTLS_ECP_RANDOMIZE_MXZ_ALT)
+int mbedtls_internal_ecp_randomize_mxz( const mbedtls_ecp_group *grp,
+        mbedtls_ecp_point *P, int (*f_rng)(void *, unsigned char *, size_t),
+        void *p_rng );
+#endif
+
+/**
+ * \brief           Normalize Montgomery x/z coordinates: X = X/Z, Z = 1.
+ *
+ * \param grp       pointer to the group representing the curve
+ *
+ * \param P         pointer to the point to be normalised. This is an
+ *                  input/output parameter.
+ *
+ * \return          0 if successful
+ */
+#if defined(MBEDTLS_ECP_NORMALIZE_MXZ_ALT)
+int mbedtls_internal_ecp_normalize_mxz( const mbedtls_ecp_group *grp,
+        mbedtls_ecp_point *P );
+#endif
+
+#endif /* ECP_MONTGOMERY */
+
+#endif /* MBEDTLS_ECP_INTERNAL_ALT */
+
+#endif /* ecp_internal.h */
+
diff --git a/common/mbedtls/entropy.c b/common/mbedtls/entropy.c
new file mode 100644
index 000000000..33f925155
--- /dev/null
+++ b/common/mbedtls/entropy.c
@@ -0,0 +1,723 @@
+/*
+ *  Entropy accumulator implementation
+ *
+ *  Copyright (C) 2006-2016, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "mbedtls/config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#if defined(MBEDTLS_ENTROPY_C)
+
+#if defined(MBEDTLS_TEST_NULL_ENTROPY)
+#warning "**** WARNING!  MBEDTLS_TEST_NULL_ENTROPY defined! "
+#warning "**** THIS BUILD HAS NO DEFINED ENTROPY SOURCES "
+#warning "**** THIS BUILD IS *NOT* SUITABLE FOR PRODUCTION USE "
+#endif
+
+#include "mbedtls/entropy.h"
+#include "mbedtls/entropy_poll.h"
+#include "mbedtls/platform_util.h"
+
+#include <string.h>
+
+#if defined(MBEDTLS_FS_IO)
+#include <stdio.h>
+#endif
+
+#if defined(MBEDTLS_ENTROPY_NV_SEED)
+#include "mbedtls/platform.h"
+#endif
+
+#if defined(MBEDTLS_SELF_TEST)
+#if defined(MBEDTLS_PLATFORM_C)
+#include "mbedtls/platform.h"
+#else
+#include <stdio.h>
+#define mbedtls_printf     printf
+#endif /* MBEDTLS_PLATFORM_C */
+#endif /* MBEDTLS_SELF_TEST */
+
+#if defined(MBEDTLS_HAVEGE_C)
+#include "mbedtls/havege.h"
+#endif
+
+#define ENTROPY_MAX_LOOP    256     /**< Maximum amount to loop before error */
+
+void mbedtls_entropy_init( mbedtls_entropy_context *ctx )
+{
+    ctx->source_count = 0;
+    memset( ctx->source, 0, sizeof( ctx->source ) );
+
+#if defined(MBEDTLS_THREADING_C)
+    mbedtls_mutex_init( &ctx->mutex );
+#endif
+
+    ctx->accumulator_started = 0;
+#if defined(MBEDTLS_ENTROPY_SHA512_ACCUMULATOR)
+    mbedtls_sha512_init( &ctx->accumulator );
+#else
+    mbedtls_sha256_init( &ctx->accumulator );
+#endif
+#if defined(MBEDTLS_HAVEGE_C)
+    mbedtls_havege_init( &ctx->havege_data );
+#endif
+
+    /* Reminder: Update ENTROPY_HAVE_STRONG in the test files
+     *           when adding more strong entropy sources here. */
+
+#if defined(MBEDTLS_TEST_NULL_ENTROPY)
+    mbedtls_entropy_add_source( ctx, mbedtls_null_entropy_poll, NULL,
+                                1, MBEDTLS_ENTROPY_SOURCE_STRONG );
+#endif
+
+#if !defined(MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES)
+#if !defined(MBEDTLS_NO_PLATFORM_ENTROPY)
+    mbedtls_entropy_add_source( ctx, mbedtls_platform_entropy_poll, NULL,
+                                MBEDTLS_ENTROPY_MIN_PLATFORM,
+                                MBEDTLS_ENTROPY_SOURCE_STRONG );
+#endif
+#if defined(MBEDTLS_TIMING_C)
+    mbedtls_entropy_add_source( ctx, mbedtls_hardclock_poll, NULL,
+                                MBEDTLS_ENTROPY_MIN_HARDCLOCK,
+                                MBEDTLS_ENTROPY_SOURCE_WEAK );
+#endif
+#if defined(MBEDTLS_HAVEGE_C)
+    mbedtls_entropy_add_source( ctx, mbedtls_havege_poll, &ctx->havege_data,
+                                MBEDTLS_ENTROPY_MIN_HAVEGE,
+                                MBEDTLS_ENTROPY_SOURCE_STRONG );
+#endif
+#if defined(MBEDTLS_ENTROPY_HARDWARE_ALT)
+    mbedtls_entropy_add_source( ctx, mbedtls_hardware_poll, NULL,
+                                MBEDTLS_ENTROPY_MIN_HARDWARE,
+                                MBEDTLS_ENTROPY_SOURCE_STRONG );
+#endif
+#if defined(MBEDTLS_ENTROPY_NV_SEED)
+    mbedtls_entropy_add_source( ctx, mbedtls_nv_seed_poll, NULL,
+                                MBEDTLS_ENTROPY_BLOCK_SIZE,
+                                MBEDTLS_ENTROPY_SOURCE_STRONG );
+    ctx->initial_entropy_run = 0;
+#endif
+#endif /* MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES */
+}
+
+void mbedtls_entropy_free( mbedtls_entropy_context *ctx )
+{
+#if defined(MBEDTLS_HAVEGE_C)
+    mbedtls_havege_free( &ctx->havege_data );
+#endif
+#if defined(MBEDTLS_THREADING_C)
+    mbedtls_mutex_free( &ctx->mutex );
+#endif
+#if defined(MBEDTLS_ENTROPY_SHA512_ACCUMULATOR)
+    mbedtls_sha512_free( &ctx->accumulator );
+#else
+    mbedtls_sha256_free( &ctx->accumulator );
+#endif
+#if defined(MBEDTLS_ENTROPY_NV_SEED)
+    ctx->initial_entropy_run = 0;
+#endif
+    ctx->source_count = 0;
+    mbedtls_platform_zeroize( ctx->source, sizeof( ctx->source ) );
+    ctx->accumulator_started = 0;
+}
+
+int mbedtls_entropy_add_source( mbedtls_entropy_context *ctx,
+                        mbedtls_entropy_f_source_ptr f_source, void *p_source,
+                        size_t threshold, int strong )
+{
+    int idx, ret = 0;
+
+#if defined(MBEDTLS_THREADING_C)
+    if( ( ret = mbedtls_mutex_lock( &ctx->mutex ) ) != 0 )
+        return( ret );
+#endif
+
+    idx = ctx->source_count;
+    if( idx >= MBEDTLS_ENTROPY_MAX_SOURCES )
+    {
+        ret = MBEDTLS_ERR_ENTROPY_MAX_SOURCES;
+        goto exit;
+    }
+
+    ctx->source[idx].f_source  = f_source;
+    ctx->source[idx].p_source  = p_source;
+    ctx->source[idx].threshold = threshold;
+    ctx->source[idx].strong    = strong;
+
+    ctx->source_count++;
+
+exit:
+#if defined(MBEDTLS_THREADING_C)
+    if( mbedtls_mutex_unlock( &ctx->mutex ) != 0 )
+        return( MBEDTLS_ERR_THREADING_MUTEX_ERROR );
+#endif
+
+    return( ret );
+}
+
+/*
+ * Entropy accumulator update
+ */
+static int entropy_update( mbedtls_entropy_context *ctx, unsigned char source_id,
+                           const unsigned char *data, size_t len )
+{
+    unsigned char header[2];
+    unsigned char tmp[MBEDTLS_ENTROPY_BLOCK_SIZE];
+    size_t use_len = len;
+    const unsigned char *p = data;
+    int ret = 0;
+
+    if( use_len > MBEDTLS_ENTROPY_BLOCK_SIZE )
+    {
+#if defined(MBEDTLS_ENTROPY_SHA512_ACCUMULATOR)
+        if( ( ret = mbedtls_sha512_ret( data, len, tmp, 0 ) ) != 0 )
+            goto cleanup;
+#else
+        if( ( ret = mbedtls_sha256_ret( data, len, tmp, 0 ) ) != 0 )
+            goto cleanup;
+#endif
+        p = tmp;
+        use_len = MBEDTLS_ENTROPY_BLOCK_SIZE;
+    }
+
+    header[0] = source_id;
+    header[1] = use_len & 0xFF;
+
+    /*
+     * Start the accumulator if this has not already happened. Note that
+     * it is sufficient to start the accumulator here only because all calls to
+     * gather entropy eventually execute this code.
+     */
+#if defined(MBEDTLS_ENTROPY_SHA512_ACCUMULATOR)
+    if( ctx->accumulator_started == 0 &&
+        ( ret = mbedtls_sha512_starts_ret( &ctx->accumulator, 0 ) ) != 0 )
+        goto cleanup;
+    else
+        ctx->accumulator_started = 1;
+    if( ( ret = mbedtls_sha512_update_ret( &ctx->accumulator, header, 2 ) ) != 0 )
+        goto cleanup;
+    ret = mbedtls_sha512_update_ret( &ctx->accumulator, p, use_len );
+#else
+    if( ctx->accumulator_started == 0 &&
+        ( ret = mbedtls_sha256_starts_ret( &ctx->accumulator, 0 ) ) != 0 )
+        goto cleanup;
+    else
+        ctx->accumulator_started = 1;
+    if( ( ret = mbedtls_sha256_update_ret( &ctx->accumulator, header, 2 ) ) != 0 )
+        goto cleanup;
+    ret = mbedtls_sha256_update_ret( &ctx->accumulator, p, use_len );
+#endif
+
+cleanup:
+    mbedtls_platform_zeroize( tmp, sizeof( tmp ) );
+
+    return( ret );
+}
+
+int mbedtls_entropy_update_manual( mbedtls_entropy_context *ctx,
+                           const unsigned char *data, size_t len )
+{
+    int ret;
+
+#if defined(MBEDTLS_THREADING_C)
+    if( ( ret = mbedtls_mutex_lock( &ctx->mutex ) ) != 0 )
+        return( ret );
+#endif
+
+    ret = entropy_update( ctx, MBEDTLS_ENTROPY_SOURCE_MANUAL, data, len );
+
+#if defined(MBEDTLS_THREADING_C)
+    if( mbedtls_mutex_unlock( &ctx->mutex ) != 0 )
+        return( MBEDTLS_ERR_THREADING_MUTEX_ERROR );
+#endif
+
+    return( ret );
+}
+
+/*
+ * Run through the different sources to add entropy to our accumulator
+ */
+static int entropy_gather_internal( mbedtls_entropy_context *ctx )
+{
+    int ret, i, have_one_strong = 0;
+    unsigned char buf[MBEDTLS_ENTROPY_MAX_GATHER];
+    size_t olen;
+
+    if( ctx->source_count == 0 )
+        return( MBEDTLS_ERR_ENTROPY_NO_SOURCES_DEFINED );
+
+    /*
+     * Run through our entropy sources
+     */
+    for( i = 0; i < ctx->source_count; i++ )
+    {
+        if( ctx->source[i].strong == MBEDTLS_ENTROPY_SOURCE_STRONG )
+            have_one_strong = 1;
+
+        olen = 0;
+        if( ( ret = ctx->source[i].f_source( ctx->source[i].p_source,
+                        buf, MBEDTLS_ENTROPY_MAX_GATHER, &olen ) ) != 0 )
+        {
+            goto cleanup;
+        }
+
+        /*
+         * Add if we actually gathered something
+         */
+        if( olen > 0 )
+        {
+            if( ( ret = entropy_update( ctx, (unsigned char) i,
+                                        buf, olen ) ) != 0 )
+                return( ret );
+            ctx->source[i].size += olen;
+        }
+    }
+
+    if( have_one_strong == 0 )
+        ret = MBEDTLS_ERR_ENTROPY_NO_STRONG_SOURCE;
+
+cleanup:
+    mbedtls_platform_zeroize( buf, sizeof( buf ) );
+
+    return( ret );
+}
+
+/*
+ * Thread-safe wrapper for entropy_gather_internal()
+ */
+int mbedtls_entropy_gather( mbedtls_entropy_context *ctx )
+{
+    int ret;
+
+#if defined(MBEDTLS_THREADING_C)
+    if( ( ret = mbedtls_mutex_lock( &ctx->mutex ) ) != 0 )
+        return( ret );
+#endif
+
+    ret = entropy_gather_internal( ctx );
+
+#if defined(MBEDTLS_THREADING_C)
+    if( mbedtls_mutex_unlock( &ctx->mutex ) != 0 )
+        return( MBEDTLS_ERR_THREADING_MUTEX_ERROR );
+#endif
+
+    return( ret );
+}
+
+int mbedtls_entropy_func( void *data, unsigned char *output, size_t len )
+{
+    int ret, count = 0, i, done;
+    mbedtls_entropy_context *ctx = (mbedtls_entropy_context *) data;
+    unsigned char buf[MBEDTLS_ENTROPY_BLOCK_SIZE];
+
+    if( len > MBEDTLS_ENTROPY_BLOCK_SIZE )
+        return( MBEDTLS_ERR_ENTROPY_SOURCE_FAILED );
+
+#if defined(MBEDTLS_ENTROPY_NV_SEED)
+    /* Update the NV entropy seed before generating any entropy for outside
+     * use.
+     */
+    if( ctx->initial_entropy_run == 0 )
+    {
+        ctx->initial_entropy_run = 1;
+        if( ( ret = mbedtls_entropy_update_nv_seed( ctx ) ) != 0 )
+            return( ret );
+    }
+#endif
+
+#if defined(MBEDTLS_THREADING_C)
+    if( ( ret = mbedtls_mutex_lock( &ctx->mutex ) ) != 0 )
+        return( ret );
+#endif
+
+    /*
+     * Always gather extra entropy before a call
+     */
+    do
+    {
+        if( count++ > ENTROPY_MAX_LOOP )
+        {
+            ret = MBEDTLS_ERR_ENTROPY_SOURCE_FAILED;
+            goto exit;
+        }
+
+        if( ( ret = entropy_gather_internal( ctx ) ) != 0 )
+            goto exit;
+
+        done = 1;
+        for( i = 0; i < ctx->source_count; i++ )
+            if( ctx->source[i].size < ctx->source[i].threshold )
+                done = 0;
+    }
+    while( ! done );
+
+    memset( buf, 0, MBEDTLS_ENTROPY_BLOCK_SIZE );
+
+#if defined(MBEDTLS_ENTROPY_SHA512_ACCUMULATOR)
+    /*
+     * Note that at this stage it is assumed that the accumulator was started
+     * in a previous call to entropy_update(). If this is not guaranteed, the
+     * code below will fail.
+     */
+    if( ( ret = mbedtls_sha512_finish_ret( &ctx->accumulator, buf ) ) != 0 )
+        goto exit;
+
+    /*
+     * Reset accumulator and counters and recycle existing entropy
+     */
+    mbedtls_sha512_free( &ctx->accumulator );
+    mbedtls_sha512_init( &ctx->accumulator );
+    if( ( ret = mbedtls_sha512_starts_ret( &ctx->accumulator, 0 ) ) != 0 )
+        goto exit;
+    if( ( ret = mbedtls_sha512_update_ret( &ctx->accumulator, buf,
+                                           MBEDTLS_ENTROPY_BLOCK_SIZE ) ) != 0 )
+        goto exit;
+
+    /*
+     * Perform second SHA-512 on entropy
+     */
+    if( ( ret = mbedtls_sha512_ret( buf, MBEDTLS_ENTROPY_BLOCK_SIZE,
+                                    buf, 0 ) ) != 0 )
+        goto exit;
+#else /* MBEDTLS_ENTROPY_SHA512_ACCUMULATOR */
+    if( ( ret = mbedtls_sha256_finish_ret( &ctx->accumulator, buf ) ) != 0 )
+        goto exit;
+
+    /*
+     * Reset accumulator and counters and recycle existing entropy
+     */
+    mbedtls_sha256_free( &ctx->accumulator );
+    mbedtls_sha256_init( &ctx->accumulator );
+    if( ( ret = mbedtls_sha256_starts_ret( &ctx->accumulator, 0 ) ) != 0 )
+        goto exit;
+    if( ( ret = mbedtls_sha256_update_ret( &ctx->accumulator, buf,
+                                           MBEDTLS_ENTROPY_BLOCK_SIZE ) ) != 0 )
+        goto exit;
+
+    /*
+     * Perform second SHA-256 on entropy
+     */
+    if( ( ret = mbedtls_sha256_ret( buf, MBEDTLS_ENTROPY_BLOCK_SIZE,
+                                    buf, 0 ) ) != 0 )
+        goto exit;
+#endif /* MBEDTLS_ENTROPY_SHA512_ACCUMULATOR */
+
+    for( i = 0; i < ctx->source_count; i++ )
+        ctx->source[i].size = 0;
+
+    memcpy( output, buf, len );
+
+    ret = 0;
+
+exit:
+    mbedtls_platform_zeroize( buf, sizeof( buf ) );
+
+#if defined(MBEDTLS_THREADING_C)
+    if( mbedtls_mutex_unlock( &ctx->mutex ) != 0 )
+        return( MBEDTLS_ERR_THREADING_MUTEX_ERROR );
+#endif
+
+    return( ret );
+}
+
+#if defined(MBEDTLS_ENTROPY_NV_SEED)
+int mbedtls_entropy_update_nv_seed( mbedtls_entropy_context *ctx )
+{
+    int ret = MBEDTLS_ERR_ENTROPY_FILE_IO_ERROR;
+    unsigned char buf[MBEDTLS_ENTROPY_BLOCK_SIZE];
+
+    /* Read new seed  and write it to NV */
+    if( ( ret = mbedtls_entropy_func( ctx, buf, MBEDTLS_ENTROPY_BLOCK_SIZE ) ) != 0 )
+        return( ret );
+
+    if( mbedtls_nv_seed_write( buf, MBEDTLS_ENTROPY_BLOCK_SIZE ) < 0 )
+        return( MBEDTLS_ERR_ENTROPY_FILE_IO_ERROR );
+
+    /* Manually update the remaining stream with a separator value to diverge */
+    memset( buf, 0, MBEDTLS_ENTROPY_BLOCK_SIZE );
+    ret = mbedtls_entropy_update_manual( ctx, buf, MBEDTLS_ENTROPY_BLOCK_SIZE );
+
+    return( ret );
+}
+#endif /* MBEDTLS_ENTROPY_NV_SEED */
+
+#if defined(MBEDTLS_FS_IO)
+int mbedtls_entropy_write_seed_file( mbedtls_entropy_context *ctx, const char *path )
+{
+    int ret = MBEDTLS_ERR_ENTROPY_FILE_IO_ERROR;
+    FILE *f;
+    unsigned char buf[MBEDTLS_ENTROPY_BLOCK_SIZE];
+
+    if( ( f = fopen( path, "wb" ) ) == NULL )
+        return( MBEDTLS_ERR_ENTROPY_FILE_IO_ERROR );
+
+    if( ( ret = mbedtls_entropy_func( ctx, buf, MBEDTLS_ENTROPY_BLOCK_SIZE ) ) != 0 )
+        goto exit;
+
+    if( fwrite( buf, 1, MBEDTLS_ENTROPY_BLOCK_SIZE, f ) != MBEDTLS_ENTROPY_BLOCK_SIZE )
+    {
+        ret = MBEDTLS_ERR_ENTROPY_FILE_IO_ERROR;
+        goto exit;
+    }
+
+    ret = 0;
+
+exit:
+    mbedtls_platform_zeroize( buf, sizeof( buf ) );
+
+    fclose( f );
+    return( ret );
+}
+
+int mbedtls_entropy_update_seed_file( mbedtls_entropy_context *ctx, const char *path )
+{
+    int ret = 0;
+    FILE *f;
+    size_t n;
+    unsigned char buf[ MBEDTLS_ENTROPY_MAX_SEED_SIZE ];
+
+    if( ( f = fopen( path, "rb" ) ) == NULL )
+        return( MBEDTLS_ERR_ENTROPY_FILE_IO_ERROR );
+
+    fseek( f, 0, SEEK_END );
+    n = (size_t) ftell( f );
+    fseek( f, 0, SEEK_SET );
+
+    if( n > MBEDTLS_ENTROPY_MAX_SEED_SIZE )
+        n = MBEDTLS_ENTROPY_MAX_SEED_SIZE;
+
+    if( fread( buf, 1, n, f ) != n )
+        ret = MBEDTLS_ERR_ENTROPY_FILE_IO_ERROR;
+    else
+        ret = mbedtls_entropy_update_manual( ctx, buf, n );
+
+    fclose( f );
+
+    mbedtls_platform_zeroize( buf, sizeof( buf ) );
+
+    if( ret != 0 )
+        return( ret );
+
+    return( mbedtls_entropy_write_seed_file( ctx, path ) );
+}
+#endif /* MBEDTLS_FS_IO */
+
+#if defined(MBEDTLS_SELF_TEST)
+#if !defined(MBEDTLS_TEST_NULL_ENTROPY)
+/*
+ * Dummy source function
+ */
+static int entropy_dummy_source( void *data, unsigned char *output,
+                                 size_t len, size_t *olen )
+{
+    ((void) data);
+
+    memset( output, 0x2a, len );
+    *olen = len;
+
+    return( 0 );
+}
+#endif /* !MBEDTLS_TEST_NULL_ENTROPY */
+
+#if defined(MBEDTLS_ENTROPY_HARDWARE_ALT)
+
+static int mbedtls_entropy_source_self_test_gather( unsigned char *buf, size_t buf_len )
+{
+    int ret = 0;
+    size_t entropy_len = 0;
+    size_t olen = 0;
+    size_t attempts = buf_len;
+
+    while( attempts > 0 && entropy_len < buf_len )
+    {
+        if( ( ret = mbedtls_hardware_poll( NULL, buf + entropy_len,
+            buf_len - entropy_len, &olen ) ) != 0 )
+            return( ret );
+
+        entropy_len += olen;
+        attempts--;
+    }
+
+    if( entropy_len < buf_len )
+    {
+        ret = 1;
+    }
+
+    return( ret );
+}
+
+
+static int mbedtls_entropy_source_self_test_check_bits( const unsigned char *buf,
+                                                        size_t buf_len )
+{
+    unsigned char set= 0xFF;
+    unsigned char unset = 0x00;
+    size_t i;
+
+    for( i = 0; i < buf_len; i++ )
+    {
+        set &= buf[i];
+        unset |= buf[i];
+    }
+
+    return( set == 0xFF || unset == 0x00 );
+}
+
+/*
+ * A test to ensure hat the entropy sources are functioning correctly
+ * and there is no obvious failure. The test performs the following checks:
+ *  - The entropy source is not providing only 0s (all bits unset) or 1s (all
+ *    bits set).
+ *  - The entropy source is not providing values in a pattern. Because the
+ *    hardware could be providing data in an arbitrary length, this check polls
+ *    the hardware entropy source twice and compares the result to ensure they
+ *    are not equal.
+ *  - The error code returned by the entropy source is not an error.
+ */
+int mbedtls_entropy_source_self_test( int verbose )
+{
+    int ret = 0;
+    unsigned char buf0[2 * sizeof( unsigned long long int )];
+    unsigned char buf1[2 * sizeof( unsigned long long int )];
+
+    if( verbose != 0 )
+        mbedtls_printf( "  ENTROPY_BIAS test: " );
+
+    memset( buf0, 0x00, sizeof( buf0 ) );
+    memset( buf1, 0x00, sizeof( buf1 ) );
+
+    if( ( ret = mbedtls_entropy_source_self_test_gather( buf0, sizeof( buf0 ) ) ) != 0 )
+        goto cleanup;
+    if( ( ret = mbedtls_entropy_source_self_test_gather( buf1, sizeof( buf1 ) ) ) != 0 )
+        goto cleanup;
+
+    /* Make sure that the returned values are not all 0 or 1 */
+    if( ( ret = mbedtls_entropy_source_self_test_check_bits( buf0, sizeof( buf0 ) ) ) != 0 )
+        goto cleanup;
+    if( ( ret = mbedtls_entropy_source_self_test_check_bits( buf1, sizeof( buf1 ) ) ) != 0 )
+        goto cleanup;
+
+    /* Make sure that the entropy source is not returning values in a
+     * pattern */
+    ret = memcmp( buf0, buf1, sizeof( buf0 ) ) == 0;
+
+cleanup:
+    if( verbose != 0 )
+    {
+        if( ret != 0 )
+            mbedtls_printf( "failed\n" );
+        else
+            mbedtls_printf( "passed\n" );
+
+        mbedtls_printf( "\n" );
+    }
+
+    return( ret != 0 );
+}
+
+#endif /* MBEDTLS_ENTROPY_HARDWARE_ALT */
+
+/*
+ * The actual entropy quality is hard to test, but we can at least
+ * test that the functions don't cause errors and write the correct
+ * amount of data to buffers.
+ */
+int mbedtls_entropy_self_test( int verbose )
+{
+    int ret = 1;
+#if !defined(MBEDTLS_TEST_NULL_ENTROPY)
+    mbedtls_entropy_context ctx;
+    unsigned char buf[MBEDTLS_ENTROPY_BLOCK_SIZE] = { 0 };
+    unsigned char acc[MBEDTLS_ENTROPY_BLOCK_SIZE] = { 0 };
+    size_t i, j;
+#endif /* !MBEDTLS_TEST_NULL_ENTROPY */
+
+    if( verbose != 0 )
+        mbedtls_printf( "  ENTROPY test: " );
+
+#if !defined(MBEDTLS_TEST_NULL_ENTROPY)
+    mbedtls_entropy_init( &ctx );
+
+    /* First do a gather to make sure we have default sources */
+    if( ( ret = mbedtls_entropy_gather( &ctx ) ) != 0 )
+        goto cleanup;
+
+    ret = mbedtls_entropy_add_source( &ctx, entropy_dummy_source, NULL, 16,
+                                      MBEDTLS_ENTROPY_SOURCE_WEAK );
+    if( ret != 0 )
+        goto cleanup;
+
+    if( ( ret = mbedtls_entropy_update_manual( &ctx, buf, sizeof buf ) ) != 0 )
+        goto cleanup;
+
+    /*
+     * To test that mbedtls_entropy_func writes correct number of bytes:
+     * - use the whole buffer and rely on ASan to detect overruns
+     * - collect entropy 8 times and OR the result in an accumulator:
+     *   any byte should then be 0 with probably 2^(-64), so requiring
+     *   each of the 32 or 64 bytes to be non-zero has a false failure rate
+     *   of at most 2^(-58) which is acceptable.
+     */
+    for( i = 0; i < 8; i++ )
+    {
+        if( ( ret = mbedtls_entropy_func( &ctx, buf, sizeof( buf ) ) ) != 0 )
+            goto cleanup;
+
+        for( j = 0; j < sizeof( buf ); j++ )
+            acc[j] |= buf[j];
+    }
+
+    for( j = 0; j < sizeof( buf ); j++ )
+    {
+        if( acc[j] == 0 )
+        {
+            ret = 1;
+            goto cleanup;
+        }
+    }
+
+#if defined(MBEDTLS_ENTROPY_HARDWARE_ALT)
+    if( ( ret = mbedtls_entropy_source_self_test( 0 ) ) != 0 )
+        goto cleanup;
+#endif
+
+cleanup:
+    mbedtls_entropy_free( &ctx );
+#endif /* !MBEDTLS_TEST_NULL_ENTROPY */
+
+    if( verbose != 0 )
+    {
+        if( ret != 0 )
+            mbedtls_printf( "failed\n" );
+        else
+            mbedtls_printf( "passed\n" );
+
+        mbedtls_printf( "\n" );
+    }
+
+    return( ret != 0 );
+}
+#endif /* MBEDTLS_SELF_TEST */
+
+#endif /* MBEDTLS_ENTROPY_C */
diff --git a/common/mbedtls/entropy.h b/common/mbedtls/entropy.h
new file mode 100644
index 000000000..b1e8c4cd5
--- /dev/null
+++ b/common/mbedtls/entropy.h
@@ -0,0 +1,291 @@
+/**
+ * \file entropy.h
+ *
+ * \brief Entropy accumulator implementation
+ */
+/*
+ *  Copyright (C) 2006-2016, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+#ifndef MBEDTLS_ENTROPY_H
+#define MBEDTLS_ENTROPY_H
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#include <stddef.h>
+
+#if defined(MBEDTLS_SHA512_C) && !defined(MBEDTLS_ENTROPY_FORCE_SHA256)
+#include "sha512.h"
+#define MBEDTLS_ENTROPY_SHA512_ACCUMULATOR
+#else
+#if defined(MBEDTLS_SHA256_C)
+#define MBEDTLS_ENTROPY_SHA256_ACCUMULATOR
+#include "sha256.h"
+#endif
+#endif
+
+#if defined(MBEDTLS_THREADING_C)
+#include "threading.h"
+#endif
+
+#if defined(MBEDTLS_HAVEGE_C)
+#include "havege.h"
+#endif
+
+#define MBEDTLS_ERR_ENTROPY_SOURCE_FAILED                 -0x003C  /**< Critical entropy source failure. */
+#define MBEDTLS_ERR_ENTROPY_MAX_SOURCES                   -0x003E  /**< No more sources can be added. */
+#define MBEDTLS_ERR_ENTROPY_NO_SOURCES_DEFINED            -0x0040  /**< No sources have been added to poll. */
+#define MBEDTLS_ERR_ENTROPY_NO_STRONG_SOURCE              -0x003D  /**< No strong sources have been added to poll. */
+#define MBEDTLS_ERR_ENTROPY_FILE_IO_ERROR                 -0x003F  /**< Read/write error in file. */
+
+/**
+ * \name SECTION: Module settings
+ *
+ * The configuration options you can set for this module are in this section.
+ * Either change them in config.h or define them on the compiler command line.
+ * \{
+ */
+
+#if !defined(MBEDTLS_ENTROPY_MAX_SOURCES)
+#define MBEDTLS_ENTROPY_MAX_SOURCES     20      /**< Maximum number of sources supported */
+#endif
+
+#if !defined(MBEDTLS_ENTROPY_MAX_GATHER)
+#define MBEDTLS_ENTROPY_MAX_GATHER      128     /**< Maximum amount requested from entropy sources */
+#endif
+
+/* \} name SECTION: Module settings */
+
+#if defined(MBEDTLS_ENTROPY_SHA512_ACCUMULATOR)
+#define MBEDTLS_ENTROPY_BLOCK_SIZE      64      /**< Block size of entropy accumulator (SHA-512) */
+#else
+#define MBEDTLS_ENTROPY_BLOCK_SIZE      32      /**< Block size of entropy accumulator (SHA-256) */
+#endif
+
+#define MBEDTLS_ENTROPY_MAX_SEED_SIZE   1024    /**< Maximum size of seed we read from seed file */
+#define MBEDTLS_ENTROPY_SOURCE_MANUAL   MBEDTLS_ENTROPY_MAX_SOURCES
+
+#define MBEDTLS_ENTROPY_SOURCE_STRONG   1       /**< Entropy source is strong   */
+#define MBEDTLS_ENTROPY_SOURCE_WEAK     0       /**< Entropy source is weak     */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \brief           Entropy poll callback pointer
+ *
+ * \param data      Callback-specific data pointer
+ * \param output    Data to fill
+ * \param len       Maximum size to provide
+ * \param olen      The actual amount of bytes put into the buffer (Can be 0)
+ *
+ * \return          0 if no critical failures occurred,
+ *                  MBEDTLS_ERR_ENTROPY_SOURCE_FAILED otherwise
+ */
+typedef int (*mbedtls_entropy_f_source_ptr)(void *data, unsigned char *output, size_t len,
+                            size_t *olen);
+
+/**
+ * \brief           Entropy source state
+ */
+typedef struct mbedtls_entropy_source_state
+{
+    mbedtls_entropy_f_source_ptr    f_source;   /**< The entropy source callback */
+    void *          p_source;   /**< The callback data pointer */
+    size_t          size;       /**< Amount received in bytes */
+    size_t          threshold;  /**< Minimum bytes required before release */
+    int             strong;     /**< Is the source strong? */
+}
+mbedtls_entropy_source_state;
+
+/**
+ * \brief           Entropy context structure
+ */
+typedef struct mbedtls_entropy_context
+{
+    int accumulator_started;
+#if defined(MBEDTLS_ENTROPY_SHA512_ACCUMULATOR)
+    mbedtls_sha512_context  accumulator;
+#else
+    mbedtls_sha256_context  accumulator;
+#endif
+    int             source_count;
+    mbedtls_entropy_source_state    source[MBEDTLS_ENTROPY_MAX_SOURCES];
+#if defined(MBEDTLS_HAVEGE_C)
+    mbedtls_havege_state    havege_data;
+#endif
+#if defined(MBEDTLS_THREADING_C)
+    mbedtls_threading_mutex_t mutex;    /*!< mutex                  */
+#endif
+#if defined(MBEDTLS_ENTROPY_NV_SEED)
+    int initial_entropy_run;
+#endif
+}
+mbedtls_entropy_context;
+
+/**
+ * \brief           Initialize the context
+ *
+ * \param ctx       Entropy context to initialize
+ */
+void mbedtls_entropy_init( mbedtls_entropy_context *ctx );
+
+/**
+ * \brief           Free the data in the context
+ *
+ * \param ctx       Entropy context to free
+ */
+void mbedtls_entropy_free( mbedtls_entropy_context *ctx );
+
+/**
+ * \brief           Adds an entropy source to poll
+ *                  (Thread-safe if MBEDTLS_THREADING_C is enabled)
+ *
+ * \param ctx       Entropy context
+ * \param f_source  Entropy function
+ * \param p_source  Function data
+ * \param threshold Minimum required from source before entropy is released
+ *                  ( with mbedtls_entropy_func() ) (in bytes)
+ * \param strong    MBEDTLS_ENTROPY_SOURCE_STRONG or
+ *                  MBEDTLS_ENTROPY_SOURCE_WEAK.
+ *                  At least one strong source needs to be added.
+ *                  Weaker sources (such as the cycle counter) can be used as
+ *                  a complement.
+ *
+ * \return          0 if successful or MBEDTLS_ERR_ENTROPY_MAX_SOURCES
+ */
+int mbedtls_entropy_add_source( mbedtls_entropy_context *ctx,
+                        mbedtls_entropy_f_source_ptr f_source, void *p_source,
+                        size_t threshold, int strong );
+
+/**
+ * \brief           Trigger an extra gather poll for the accumulator
+ *                  (Thread-safe if MBEDTLS_THREADING_C is enabled)
+ *
+ * \param ctx       Entropy context
+ *
+ * \return          0 if successful, or MBEDTLS_ERR_ENTROPY_SOURCE_FAILED
+ */
+int mbedtls_entropy_gather( mbedtls_entropy_context *ctx );
+
+/**
+ * \brief           Retrieve entropy from the accumulator
+ *                  (Maximum length: MBEDTLS_ENTROPY_BLOCK_SIZE)
+ *                  (Thread-safe if MBEDTLS_THREADING_C is enabled)
+ *
+ * \param data      Entropy context
+ * \param output    Buffer to fill
+ * \param len       Number of bytes desired, must be at most MBEDTLS_ENTROPY_BLOCK_SIZE
+ *
+ * \return          0 if successful, or MBEDTLS_ERR_ENTROPY_SOURCE_FAILED
+ */
+int mbedtls_entropy_func( void *data, unsigned char *output, size_t len );
+
+/**
+ * \brief           Add data to the accumulator manually
+ *                  (Thread-safe if MBEDTLS_THREADING_C is enabled)
+ *
+ * \param ctx       Entropy context
+ * \param data      Data to add
+ * \param len       Length of data
+ *
+ * \return          0 if successful
+ */
+int mbedtls_entropy_update_manual( mbedtls_entropy_context *ctx,
+                           const unsigned char *data, size_t len );
+
+#if defined(MBEDTLS_ENTROPY_NV_SEED)
+/**
+ * \brief           Trigger an update of the seed file in NV by using the
+ *                  current entropy pool.
+ *
+ * \param ctx       Entropy context
+ *
+ * \return          0 if successful
+ */
+int mbedtls_entropy_update_nv_seed( mbedtls_entropy_context *ctx );
+#endif /* MBEDTLS_ENTROPY_NV_SEED */
+
+#if defined(MBEDTLS_FS_IO)
+/**
+ * \brief               Write a seed file
+ *
+ * \param ctx           Entropy context
+ * \param path          Name of the file
+ *
+ * \return              0 if successful,
+ *                      MBEDTLS_ERR_ENTROPY_FILE_IO_ERROR on file error, or
+ *                      MBEDTLS_ERR_ENTROPY_SOURCE_FAILED
+ */
+int mbedtls_entropy_write_seed_file( mbedtls_entropy_context *ctx, const char *path );
+
+/**
+ * \brief               Read and update a seed file. Seed is added to this
+ *                      instance. No more than MBEDTLS_ENTROPY_MAX_SEED_SIZE bytes are
+ *                      read from the seed file. The rest is ignored.
+ *
+ * \param ctx           Entropy context
+ * \param path          Name of the file
+ *
+ * \return              0 if successful,
+ *                      MBEDTLS_ERR_ENTROPY_FILE_IO_ERROR on file error,
+ *                      MBEDTLS_ERR_ENTROPY_SOURCE_FAILED
+ */
+int mbedtls_entropy_update_seed_file( mbedtls_entropy_context *ctx, const char *path );
+#endif /* MBEDTLS_FS_IO */
+
+#if defined(MBEDTLS_SELF_TEST)
+/**
+ * \brief          Checkup routine
+ *
+ *                 This module self-test also calls the entropy self-test,
+ *                 mbedtls_entropy_source_self_test();
+ *
+ * \return         0 if successful, or 1 if a test failed
+ */
+int mbedtls_entropy_self_test( int verbose );
+
+#if defined(MBEDTLS_ENTROPY_HARDWARE_ALT)
+/**
+ * \brief          Checkup routine
+ *
+ *                 Verifies the integrity of the hardware entropy source
+ *                 provided by the function 'mbedtls_hardware_poll()'.
+ *
+ *                 Note this is the only hardware entropy source that is known
+ *                 at link time, and other entropy sources configured
+ *                 dynamically at runtime by the function
+ *                 mbedtls_entropy_add_source() will not be tested.
+ *
+ * \return         0 if successful, or 1 if a test failed
+ */
+int mbedtls_entropy_source_self_test( int verbose );
+#endif /* MBEDTLS_ENTROPY_HARDWARE_ALT */
+#endif /* MBEDTLS_SELF_TEST */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* entropy.h */
diff --git a/common/mbedtls/entropy_poll.c b/common/mbedtls/entropy_poll.c
new file mode 100644
index 000000000..e8b8da86e
--- /dev/null
+++ b/common/mbedtls/entropy_poll.c
@@ -0,0 +1,277 @@
+/*
+ *  Platform-specific and custom entropy polling functions
+ *
+ *  Copyright (C) 2006-2016, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+
+#if defined(__linux__)
+/* Ensure that syscall() is available even when compiling with -std=c99 */
+#define _GNU_SOURCE
+#endif
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "mbedtls/config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#include <string.h>
+
+#if defined(MBEDTLS_ENTROPY_C)
+
+#include "mbedtls/entropy.h"
+#include "mbedtls/entropy_poll.h"
+
+#if defined(MBEDTLS_TIMING_C)
+#include "mbedtls/timing.h"
+#endif
+#if defined(MBEDTLS_HAVEGE_C)
+#include "mbedtls/havege.h"
+#endif
+#if defined(MBEDTLS_ENTROPY_NV_SEED)
+#include "mbedtls/platform.h"
+#endif
+
+#if !defined(MBEDTLS_NO_PLATFORM_ENTROPY)
+
+#if !defined(unix) && !defined(__unix__) && !defined(__unix) && \
+    !defined(__APPLE__) && !defined(_WIN32) && !defined(__QNXNTO__) && \
+    !defined(__HAIKU__)
+#error "Platform entropy sources only work on Unix and Windows, see MBEDTLS_NO_PLATFORM_ENTROPY in config.h"
+#endif
+
+#if defined(_WIN32) && !defined(EFIX64) && !defined(EFI32)
+
+#if !defined(_WIN32_WINNT)
+#define _WIN32_WINNT 0x0400
+#endif
+#include <windows.h>
+#include <wincrypt.h>
+
+int mbedtls_platform_entropy_poll( void *data, unsigned char *output, size_t len,
+                           size_t *olen )
+{
+    HCRYPTPROV provider;
+    ((void) data);
+    *olen = 0;
+
+    if( CryptAcquireContext( &provider, NULL, NULL,
+                              PROV_RSA_FULL, CRYPT_VERIFYCONTEXT ) == FALSE )
+    {
+        return( MBEDTLS_ERR_ENTROPY_SOURCE_FAILED );
+    }
+
+    if( CryptGenRandom( provider, (DWORD) len, output ) == FALSE )
+    {
+        CryptReleaseContext( provider, 0 );
+        return( MBEDTLS_ERR_ENTROPY_SOURCE_FAILED );
+    }
+
+    CryptReleaseContext( provider, 0 );
+    *olen = len;
+
+    return( 0 );
+}
+#else /* _WIN32 && !EFIX64 && !EFI32 */
+
+/*
+ * Test for Linux getrandom() support.
+ * Since there is no wrapper in the libc yet, use the generic syscall wrapper
+ * available in GNU libc and compatible libc's (eg uClibc).
+ */
+#if defined(__linux__) && defined(__GLIBC__)
+#include <unistd.h>
+#include <sys/syscall.h>
+#if defined(SYS_getrandom)
+#define HAVE_GETRANDOM
+
+static int getrandom_wrapper( void *buf, size_t buflen, unsigned int flags )
+{
+    /* MemSan cannot understand that the syscall writes to the buffer */
+#if defined(__has_feature)
+#if __has_feature(memory_sanitizer)
+    memset( buf, 0, buflen );
+#endif
+#endif
+
+    return( syscall( SYS_getrandom, buf, buflen, flags ) );
+}
+
+#include <sys/utsname.h>
+/* Check if version is at least 3.17.0 */
+static int check_version_3_17_plus( void )
+{
+    int minor;
+    struct utsname un;
+    const char *ver;
+
+    /* Get version information */
+    uname(&un);
+    ver = un.release;
+
+    /* Check major version; assume a single digit */
+    if( ver[0] < '3' || ver[0] > '9' || ver [1] != '.' )
+        return( -1 );
+
+    if( ver[0] - '0' > 3 )
+        return( 0 );
+
+    /* Ok, so now we know major == 3, check minor.
+     * Assume 1 or 2 digits. */
+    if( ver[2] < '0' || ver[2] > '9' )
+        return( -1 );
+
+    minor = ver[2] - '0';
+
+    if( ver[3] >= '0' && ver[3] <= '9' )
+        minor = 10 * minor + ver[3] - '0';
+    else if( ver [3] != '.' )
+        return( -1 );
+
+    if( minor < 17 )
+        return( -1 );
+
+    return( 0 );
+}
+static int has_getrandom = -1;
+#endif /* SYS_getrandom */
+#endif /* __linux__ */
+
+#include <stdio.h>
+
+int mbedtls_platform_entropy_poll( void *data,
+                           unsigned char *output, size_t len, size_t *olen )
+{
+    FILE *file;
+    size_t read_len;
+    ((void) data);
+
+#if defined(HAVE_GETRANDOM)
+    if( has_getrandom == -1 )
+        has_getrandom = ( check_version_3_17_plus() == 0 );
+
+    if( has_getrandom )
+    {
+        int ret;
+
+        if( ( ret = getrandom_wrapper( output, len, 0 ) ) < 0 )
+            return( MBEDTLS_ERR_ENTROPY_SOURCE_FAILED );
+
+        *olen = ret;
+        return( 0 );
+    }
+#endif /* HAVE_GETRANDOM */
+
+    *olen = 0;
+
+    file = fopen( "/dev/urandom", "rb" );
+    if( file == NULL )
+        return( MBEDTLS_ERR_ENTROPY_SOURCE_FAILED );
+
+    read_len = fread( output, 1, len, file );
+    if( read_len != len )
+    {
+        fclose( file );
+        return( MBEDTLS_ERR_ENTROPY_SOURCE_FAILED );
+    }
+
+    fclose( file );
+    *olen = len;
+
+    return( 0 );
+}
+#endif /* _WIN32 && !EFIX64 && !EFI32 */
+#endif /* !MBEDTLS_NO_PLATFORM_ENTROPY */
+
+#if defined(MBEDTLS_TEST_NULL_ENTROPY)
+int mbedtls_null_entropy_poll( void *data,
+                    unsigned char *output, size_t len, size_t *olen )
+{
+    ((void) data);
+    ((void) output);
+    *olen = 0;
+
+    if( len < sizeof(unsigned char) )
+        return( 0 );
+
+    *olen = sizeof(unsigned char);
+
+    return( 0 );
+}
+#endif
+
+#if defined(MBEDTLS_TIMING_C)
+int mbedtls_hardclock_poll( void *data,
+                    unsigned char *output, size_t len, size_t *olen )
+{
+    unsigned long timer = mbedtls_timing_hardclock();
+    ((void) data);
+    *olen = 0;
+
+    if( len < sizeof(unsigned long) )
+        return( 0 );
+
+    memcpy( output, &timer, sizeof(unsigned long) );
+    *olen = sizeof(unsigned long);
+
+    return( 0 );
+}
+#endif /* MBEDTLS_TIMING_C */
+
+#if defined(MBEDTLS_HAVEGE_C)
+int mbedtls_havege_poll( void *data,
+                 unsigned char *output, size_t len, size_t *olen )
+{
+    mbedtls_havege_state *hs = (mbedtls_havege_state *) data;
+    *olen = 0;
+
+    if( mbedtls_havege_random( hs, output, len ) != 0 )
+        return( MBEDTLS_ERR_ENTROPY_SOURCE_FAILED );
+
+    *olen = len;
+
+    return( 0 );
+}
+#endif /* MBEDTLS_HAVEGE_C */
+
+#if defined(MBEDTLS_ENTROPY_NV_SEED)
+int mbedtls_nv_seed_poll( void *data,
+                          unsigned char *output, size_t len, size_t *olen )
+{
+    unsigned char buf[MBEDTLS_ENTROPY_BLOCK_SIZE];
+    size_t use_len = MBEDTLS_ENTROPY_BLOCK_SIZE;
+    ((void) data);
+
+    memset( buf, 0, MBEDTLS_ENTROPY_BLOCK_SIZE );
+
+    if( mbedtls_nv_seed_read( buf, MBEDTLS_ENTROPY_BLOCK_SIZE ) < 0 )
+      return( MBEDTLS_ERR_ENTROPY_SOURCE_FAILED );
+
+    if( len < use_len )
+      use_len = len;
+
+    memcpy( output, buf, use_len );
+    *olen = use_len;
+
+    return( 0 );
+}
+#endif /* MBEDTLS_ENTROPY_NV_SEED */
+
+#endif /* MBEDTLS_ENTROPY_C */
diff --git a/common/mbedtls/entropy_poll.h b/common/mbedtls/entropy_poll.h
new file mode 100644
index 000000000..d48b8555b
--- /dev/null
+++ b/common/mbedtls/entropy_poll.h
@@ -0,0 +1,112 @@
+/**
+ * \file entropy_poll.h
+ *
+ * \brief Platform-specific and custom entropy polling functions
+ */
+/*
+ *  Copyright (C) 2006-2016, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+#ifndef MBEDTLS_ENTROPY_POLL_H
+#define MBEDTLS_ENTROPY_POLL_H
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#include <stddef.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Default thresholds for built-in sources, in bytes
+ */
+#define MBEDTLS_ENTROPY_MIN_PLATFORM     32     /**< Minimum for platform source    */
+#define MBEDTLS_ENTROPY_MIN_HAVEGE       32     /**< Minimum for HAVEGE             */
+#define MBEDTLS_ENTROPY_MIN_HARDCLOCK     4     /**< Minimum for mbedtls_timing_hardclock()        */
+#if !defined(MBEDTLS_ENTROPY_MIN_HARDWARE)
+#define MBEDTLS_ENTROPY_MIN_HARDWARE     32     /**< Minimum for the hardware source */
+#endif
+
+/**
+ * \brief           Entropy poll callback that provides 0 entropy.
+ */
+#if defined(MBEDTLS_TEST_NULL_ENTROPY)
+    int mbedtls_null_entropy_poll( void *data,
+                                unsigned char *output, size_t len, size_t *olen );
+#endif
+
+#if !defined(MBEDTLS_NO_PLATFORM_ENTROPY)
+/**
+ * \brief           Platform-specific entropy poll callback
+ */
+int mbedtls_platform_entropy_poll( void *data,
+                           unsigned char *output, size_t len, size_t *olen );
+#endif
+
+#if defined(MBEDTLS_HAVEGE_C)
+/**
+ * \brief           HAVEGE based entropy poll callback
+ *
+ * Requires an HAVEGE state as its data pointer.
+ */
+int mbedtls_havege_poll( void *data,
+                 unsigned char *output, size_t len, size_t *olen );
+#endif
+
+#if defined(MBEDTLS_TIMING_C)
+/**
+ * \brief           mbedtls_timing_hardclock-based entropy poll callback
+ */
+int mbedtls_hardclock_poll( void *data,
+                    unsigned char *output, size_t len, size_t *olen );
+#endif
+
+#if defined(MBEDTLS_ENTROPY_HARDWARE_ALT)
+/**
+ * \brief           Entropy poll callback for a hardware source
+ *
+ * \warning         This is not provided by mbed TLS!
+ *                  See \c MBEDTLS_ENTROPY_HARDWARE_ALT in config.h.
+ *
+ * \note            This must accept NULL as its first argument.
+ */
+int mbedtls_hardware_poll( void *data,
+                           unsigned char *output, size_t len, size_t *olen );
+#endif
+
+#if defined(MBEDTLS_ENTROPY_NV_SEED)
+/**
+ * \brief           Entropy poll callback for a non-volatile seed file
+ *
+ * \note            This must accept NULL as its first argument.
+ */
+int mbedtls_nv_seed_poll( void *data,
+                          unsigned char *output, size_t len, size_t *olen );
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* entropy_poll.h */
diff --git a/common/mbedtls/error.c b/common/mbedtls/error.c
new file mode 100644
index 000000000..d8c0ddc60
--- /dev/null
+++ b/common/mbedtls/error.c
@@ -0,0 +1,897 @@
+/*
+ *  Error message information
+ *
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "mbedtls/config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#if defined(MBEDTLS_ERROR_C) || defined(MBEDTLS_ERROR_STRERROR_DUMMY)
+#include "mbedtls/error.h"
+#include <string.h>
+#endif
+
+#if defined(MBEDTLS_PLATFORM_C)
+#include "mbedtls/platform.h"
+#else
+#define mbedtls_snprintf snprintf
+#define mbedtls_time_t   time_t
+#endif
+
+#if defined(MBEDTLS_ERROR_C)
+
+#include <stdio.h>
+
+#if defined(MBEDTLS_AES_C)
+#include "mbedtls/aes.h"
+#endif
+
+#if defined(MBEDTLS_ARC4_C)
+#include "mbedtls/arc4.h"
+#endif
+
+#if defined(MBEDTLS_ARIA_C)
+#include "mbedtls/aria.h"
+#endif
+
+#if defined(MBEDTLS_BASE64_C)
+#include "mbedtls/base64.h"
+#endif
+
+#if defined(MBEDTLS_BIGNUM_C)
+#include "mbedtls/bignum.h"
+#endif
+
+#if defined(MBEDTLS_BLOWFISH_C)
+#include "mbedtls/blowfish.h"
+#endif
+
+#if defined(MBEDTLS_CAMELLIA_C)
+#include "mbedtls/camellia.h"
+#endif
+
+#if defined(MBEDTLS_CCM_C)
+#include "mbedtls/ccm.h"
+#endif
+
+#if defined(MBEDTLS_CHACHA20_C)
+#include "mbedtls/chacha20.h"
+#endif
+
+#if defined(MBEDTLS_CHACHAPOLY_C)
+#include "mbedtls/chachapoly.h"
+#endif
+
+#if defined(MBEDTLS_CIPHER_C)
+#include "mbedtls/cipher.h"
+#endif
+
+#if defined(MBEDTLS_CMAC_C)
+#include "mbedtls/cmac.h"
+#endif
+
+#if defined(MBEDTLS_CTR_DRBG_C)
+#include "mbedtls/ctr_drbg.h"
+#endif
+
+#if defined(MBEDTLS_DES_C)
+#include "mbedtls/des.h"
+#endif
+
+#if defined(MBEDTLS_DHM_C)
+#include "mbedtls/dhm.h"
+#endif
+
+#if defined(MBEDTLS_ECP_C)
+#include "mbedtls/ecp.h"
+#endif
+
+#if defined(MBEDTLS_ENTROPY_C)
+#include "mbedtls/entropy.h"
+#endif
+
+#if defined(MBEDTLS_GCM_C)
+#include "mbedtls/gcm.h"
+#endif
+
+#if defined(MBEDTLS_HKDF_C)
+#include "mbedtls/hkdf.h"
+#endif
+
+#if defined(MBEDTLS_HMAC_DRBG_C)
+#include "mbedtls/hmac_drbg.h"
+#endif
+
+#if defined(MBEDTLS_MD_C)
+#include "mbedtls/md.h"
+#endif
+
+#if defined(MBEDTLS_MD2_C)
+#include "mbedtls/md2.h"
+#endif
+
+#if defined(MBEDTLS_MD4_C)
+#include "mbedtls/md4.h"
+#endif
+
+#if defined(MBEDTLS_MD5_C)
+#include "mbedtls/md5.h"
+#endif
+
+#if defined(MBEDTLS_NET_C)
+#include "mbedtls/net_sockets.h"
+#endif
+
+#if defined(MBEDTLS_OID_C)
+#include "mbedtls/oid.h"
+#endif
+
+#if defined(MBEDTLS_PADLOCK_C)
+#include "mbedtls/padlock.h"
+#endif
+
+#if defined(MBEDTLS_PEM_PARSE_C) || defined(MBEDTLS_PEM_WRITE_C)
+#include "mbedtls/pem.h"
+#endif
+
+#if defined(MBEDTLS_PK_C)
+#include "mbedtls/pk.h"
+#endif
+
+#if defined(MBEDTLS_PKCS12_C)
+#include "mbedtls/pkcs12.h"
+#endif
+
+#if defined(MBEDTLS_PKCS5_C)
+#include "mbedtls/pkcs5.h"
+#endif
+
+#if defined(MBEDTLS_POLY1305_C)
+#include "mbedtls/poly1305.h"
+#endif
+
+#if defined(MBEDTLS_RIPEMD160_C)
+#include "mbedtls/ripemd160.h"
+#endif
+
+#if defined(MBEDTLS_RSA_C)
+#include "mbedtls/rsa.h"
+#endif
+
+#if defined(MBEDTLS_SHA1_C)
+#include "mbedtls/sha1.h"
+#endif
+
+#if defined(MBEDTLS_SHA256_C)
+#include "mbedtls/sha256.h"
+#endif
+
+#if defined(MBEDTLS_SHA512_C)
+#include "mbedtls/sha512.h"
+#endif
+
+#if defined(MBEDTLS_SSL_TLS_C)
+#include "mbedtls/ssl.h"
+#endif
+
+#if defined(MBEDTLS_THREADING_C)
+#include "mbedtls/threading.h"
+#endif
+
+#if defined(MBEDTLS_X509_USE_C) || defined(MBEDTLS_X509_CREATE_C)
+#include "mbedtls/x509.h"
+#endif
+
+#if defined(MBEDTLS_XTEA_C)
+#include "mbedtls/xtea.h"
+#endif
+
+
+void mbedtls_strerror( int ret, char *buf, size_t buflen )
+{
+    size_t len;
+    int use_ret;
+
+    if( buflen == 0 )
+        return;
+
+    memset( buf, 0x00, buflen );
+
+    if( ret < 0 )
+        ret = -ret;
+
+    if( ret & 0xFF80 )
+    {
+        use_ret = ret & 0xFF80;
+
+        // High level error codes
+        //
+        // BEGIN generated code
+#if defined(MBEDTLS_CIPHER_C)
+        if( use_ret == -(MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE) )
+            mbedtls_snprintf( buf, buflen, "CIPHER - The selected feature is not available" );
+        if( use_ret == -(MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA) )
+            mbedtls_snprintf( buf, buflen, "CIPHER - Bad input parameters" );
+        if( use_ret == -(MBEDTLS_ERR_CIPHER_ALLOC_FAILED) )
+            mbedtls_snprintf( buf, buflen, "CIPHER - Failed to allocate memory" );
+        if( use_ret == -(MBEDTLS_ERR_CIPHER_INVALID_PADDING) )
+            mbedtls_snprintf( buf, buflen, "CIPHER - Input data contains invalid padding and is rejected" );
+        if( use_ret == -(MBEDTLS_ERR_CIPHER_FULL_BLOCK_EXPECTED) )
+            mbedtls_snprintf( buf, buflen, "CIPHER - Decryption of block requires a full block" );
+        if( use_ret == -(MBEDTLS_ERR_CIPHER_AUTH_FAILED) )
+            mbedtls_snprintf( buf, buflen, "CIPHER - Authentication failed (for AEAD modes)" );
+        if( use_ret == -(MBEDTLS_ERR_CIPHER_INVALID_CONTEXT) )
+            mbedtls_snprintf( buf, buflen, "CIPHER - The context is invalid. For example, because it was freed" );
+        if( use_ret == -(MBEDTLS_ERR_CIPHER_HW_ACCEL_FAILED) )
+            mbedtls_snprintf( buf, buflen, "CIPHER - Cipher hardware accelerator failed" );
+#endif /* MBEDTLS_CIPHER_C */
+
+#if defined(MBEDTLS_DHM_C)
+        if( use_ret == -(MBEDTLS_ERR_DHM_BAD_INPUT_DATA) )
+            mbedtls_snprintf( buf, buflen, "DHM - Bad input parameters" );
+        if( use_ret == -(MBEDTLS_ERR_DHM_READ_PARAMS_FAILED) )
+            mbedtls_snprintf( buf, buflen, "DHM - Reading of the DHM parameters failed" );
+        if( use_ret == -(MBEDTLS_ERR_DHM_MAKE_PARAMS_FAILED) )
+            mbedtls_snprintf( buf, buflen, "DHM - Making of the DHM parameters failed" );
+        if( use_ret == -(MBEDTLS_ERR_DHM_READ_PUBLIC_FAILED) )
+            mbedtls_snprintf( buf, buflen, "DHM - Reading of the public values failed" );
+        if( use_ret == -(MBEDTLS_ERR_DHM_MAKE_PUBLIC_FAILED) )
+            mbedtls_snprintf( buf, buflen, "DHM - Making of the public value failed" );
+        if( use_ret == -(MBEDTLS_ERR_DHM_CALC_SECRET_FAILED) )
+            mbedtls_snprintf( buf, buflen, "DHM - Calculation of the DHM secret failed" );
+        if( use_ret == -(MBEDTLS_ERR_DHM_INVALID_FORMAT) )
+            mbedtls_snprintf( buf, buflen, "DHM - The ASN.1 data is not formatted correctly" );
+        if( use_ret == -(MBEDTLS_ERR_DHM_ALLOC_FAILED) )
+            mbedtls_snprintf( buf, buflen, "DHM - Allocation of memory failed" );
+        if( use_ret == -(MBEDTLS_ERR_DHM_FILE_IO_ERROR) )
+            mbedtls_snprintf( buf, buflen, "DHM - Read or write of file failed" );
+        if( use_ret == -(MBEDTLS_ERR_DHM_HW_ACCEL_FAILED) )
+            mbedtls_snprintf( buf, buflen, "DHM - DHM hardware accelerator failed" );
+        if( use_ret == -(MBEDTLS_ERR_DHM_SET_GROUP_FAILED) )
+            mbedtls_snprintf( buf, buflen, "DHM - Setting the modulus and generator failed" );
+#endif /* MBEDTLS_DHM_C */
+
+#if defined(MBEDTLS_ECP_C)
+        if( use_ret == -(MBEDTLS_ERR_ECP_BAD_INPUT_DATA) )
+            mbedtls_snprintf( buf, buflen, "ECP - Bad input parameters to function" );
+        if( use_ret == -(MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL) )
+            mbedtls_snprintf( buf, buflen, "ECP - The buffer is too small to write to" );
+        if( use_ret == -(MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE) )
+            mbedtls_snprintf( buf, buflen, "ECP - The requested feature is not available, for example, the requested curve is not supported" );
+        if( use_ret == -(MBEDTLS_ERR_ECP_VERIFY_FAILED) )
+            mbedtls_snprintf( buf, buflen, "ECP - The signature is not valid" );
+        if( use_ret == -(MBEDTLS_ERR_ECP_ALLOC_FAILED) )
+            mbedtls_snprintf( buf, buflen, "ECP - Memory allocation failed" );
+        if( use_ret == -(MBEDTLS_ERR_ECP_RANDOM_FAILED) )
+            mbedtls_snprintf( buf, buflen, "ECP - Generation of random value, such as ephemeral key, failed" );
+        if( use_ret == -(MBEDTLS_ERR_ECP_INVALID_KEY) )
+            mbedtls_snprintf( buf, buflen, "ECP - Invalid private or public key" );
+        if( use_ret == -(MBEDTLS_ERR_ECP_SIG_LEN_MISMATCH) )
+            mbedtls_snprintf( buf, buflen, "ECP - The buffer contains a valid signature followed by more data" );
+        if( use_ret == -(MBEDTLS_ERR_ECP_HW_ACCEL_FAILED) )
+            mbedtls_snprintf( buf, buflen, "ECP - The ECP hardware accelerator failed" );
+#endif /* MBEDTLS_ECP_C */
+
+#if defined(MBEDTLS_MD_C)
+        if( use_ret == -(MBEDTLS_ERR_MD_FEATURE_UNAVAILABLE) )
+            mbedtls_snprintf( buf, buflen, "MD - The selected feature is not available" );
+        if( use_ret == -(MBEDTLS_ERR_MD_BAD_INPUT_DATA) )
+            mbedtls_snprintf( buf, buflen, "MD - Bad input parameters to function" );
+        if( use_ret == -(MBEDTLS_ERR_MD_ALLOC_FAILED) )
+            mbedtls_snprintf( buf, buflen, "MD - Failed to allocate memory" );
+        if( use_ret == -(MBEDTLS_ERR_MD_FILE_IO_ERROR) )
+            mbedtls_snprintf( buf, buflen, "MD - Opening or reading of file failed" );
+        if( use_ret == -(MBEDTLS_ERR_MD_HW_ACCEL_FAILED) )
+            mbedtls_snprintf( buf, buflen, "MD - MD hardware accelerator failed" );
+#endif /* MBEDTLS_MD_C */
+
+#if defined(MBEDTLS_PEM_PARSE_C) || defined(MBEDTLS_PEM_WRITE_C)
+        if( use_ret == -(MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT) )
+            mbedtls_snprintf( buf, buflen, "PEM - No PEM header or footer found" );
+        if( use_ret == -(MBEDTLS_ERR_PEM_INVALID_DATA) )
+            mbedtls_snprintf( buf, buflen, "PEM - PEM string is not as expected" );
+        if( use_ret == -(MBEDTLS_ERR_PEM_ALLOC_FAILED) )
+            mbedtls_snprintf( buf, buflen, "PEM - Failed to allocate memory" );
+        if( use_ret == -(MBEDTLS_ERR_PEM_INVALID_ENC_IV) )
+            mbedtls_snprintf( buf, buflen, "PEM - RSA IV is not in hex-format" );
+        if( use_ret == -(MBEDTLS_ERR_PEM_UNKNOWN_ENC_ALG) )
+            mbedtls_snprintf( buf, buflen, "PEM - Unsupported key encryption algorithm" );
+        if( use_ret == -(MBEDTLS_ERR_PEM_PASSWORD_REQUIRED) )
+            mbedtls_snprintf( buf, buflen, "PEM - Private key password can't be empty" );
+        if( use_ret == -(MBEDTLS_ERR_PEM_PASSWORD_MISMATCH) )
+            mbedtls_snprintf( buf, buflen, "PEM - Given private key password does not allow for correct decryption" );
+        if( use_ret == -(MBEDTLS_ERR_PEM_FEATURE_UNAVAILABLE) )
+            mbedtls_snprintf( buf, buflen, "PEM - Unavailable feature, e.g. hashing/encryption combination" );
+        if( use_ret == -(MBEDTLS_ERR_PEM_BAD_INPUT_DATA) )
+            mbedtls_snprintf( buf, buflen, "PEM - Bad input parameters to function" );
+#endif /* MBEDTLS_PEM_PARSE_C || MBEDTLS_PEM_WRITE_C */
+
+#if defined(MBEDTLS_PK_C)
+        if( use_ret == -(MBEDTLS_ERR_PK_ALLOC_FAILED) )
+            mbedtls_snprintf( buf, buflen, "PK - Memory allocation failed" );
+        if( use_ret == -(MBEDTLS_ERR_PK_TYPE_MISMATCH) )
+            mbedtls_snprintf( buf, buflen, "PK - Type mismatch, eg attempt to encrypt with an ECDSA key" );
+        if( use_ret == -(MBEDTLS_ERR_PK_BAD_INPUT_DATA) )
+            mbedtls_snprintf( buf, buflen, "PK - Bad input parameters to function" );
+        if( use_ret == -(MBEDTLS_ERR_PK_FILE_IO_ERROR) )
+            mbedtls_snprintf( buf, buflen, "PK - Read/write of file failed" );
+        if( use_ret == -(MBEDTLS_ERR_PK_KEY_INVALID_VERSION) )
+            mbedtls_snprintf( buf, buflen, "PK - Unsupported key version" );
+        if( use_ret == -(MBEDTLS_ERR_PK_KEY_INVALID_FORMAT) )
+            mbedtls_snprintf( buf, buflen, "PK - Invalid key tag or value" );
+        if( use_ret == -(MBEDTLS_ERR_PK_UNKNOWN_PK_ALG) )
+            mbedtls_snprintf( buf, buflen, "PK - Key algorithm is unsupported (only RSA and EC are supported)" );
+        if( use_ret == -(MBEDTLS_ERR_PK_PASSWORD_REQUIRED) )
+            mbedtls_snprintf( buf, buflen, "PK - Private key password can't be empty" );
+        if( use_ret == -(MBEDTLS_ERR_PK_PASSWORD_MISMATCH) )
+            mbedtls_snprintf( buf, buflen, "PK - Given private key password does not allow for correct decryption" );
+        if( use_ret == -(MBEDTLS_ERR_PK_INVALID_PUBKEY) )
+            mbedtls_snprintf( buf, buflen, "PK - The pubkey tag or value is invalid (only RSA and EC are supported)" );
+        if( use_ret == -(MBEDTLS_ERR_PK_INVALID_ALG) )
+            mbedtls_snprintf( buf, buflen, "PK - The algorithm tag or value is invalid" );
+        if( use_ret == -(MBEDTLS_ERR_PK_UNKNOWN_NAMED_CURVE) )
+            mbedtls_snprintf( buf, buflen, "PK - Elliptic curve is unsupported (only NIST curves are supported)" );
+        if( use_ret == -(MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE) )
+            mbedtls_snprintf( buf, buflen, "PK - Unavailable feature, e.g. RSA disabled for RSA key" );
+        if( use_ret == -(MBEDTLS_ERR_PK_SIG_LEN_MISMATCH) )
+            mbedtls_snprintf( buf, buflen, "PK - The buffer contains a valid signature followed by more data" );
+        if( use_ret == -(MBEDTLS_ERR_PK_HW_ACCEL_FAILED) )
+            mbedtls_snprintf( buf, buflen, "PK - PK hardware accelerator failed" );
+#endif /* MBEDTLS_PK_C */
+
+#if defined(MBEDTLS_PKCS12_C)
+        if( use_ret == -(MBEDTLS_ERR_PKCS12_BAD_INPUT_DATA) )
+            mbedtls_snprintf( buf, buflen, "PKCS12 - Bad input parameters to function" );
+        if( use_ret == -(MBEDTLS_ERR_PKCS12_FEATURE_UNAVAILABLE) )
+            mbedtls_snprintf( buf, buflen, "PKCS12 - Feature not available, e.g. unsupported encryption scheme" );
+        if( use_ret == -(MBEDTLS_ERR_PKCS12_PBE_INVALID_FORMAT) )
+            mbedtls_snprintf( buf, buflen, "PKCS12 - PBE ASN.1 data not as expected" );
+        if( use_ret == -(MBEDTLS_ERR_PKCS12_PASSWORD_MISMATCH) )
+            mbedtls_snprintf( buf, buflen, "PKCS12 - Given private key password does not allow for correct decryption" );
+#endif /* MBEDTLS_PKCS12_C */
+
+#if defined(MBEDTLS_PKCS5_C)
+        if( use_ret == -(MBEDTLS_ERR_PKCS5_BAD_INPUT_DATA) )
+            mbedtls_snprintf( buf, buflen, "PKCS5 - Bad input parameters to function" );
+        if( use_ret == -(MBEDTLS_ERR_PKCS5_INVALID_FORMAT) )
+            mbedtls_snprintf( buf, buflen, "PKCS5 - Unexpected ASN.1 data" );
+        if( use_ret == -(MBEDTLS_ERR_PKCS5_FEATURE_UNAVAILABLE) )
+            mbedtls_snprintf( buf, buflen, "PKCS5 - Requested encryption or digest alg not available" );
+        if( use_ret == -(MBEDTLS_ERR_PKCS5_PASSWORD_MISMATCH) )
+            mbedtls_snprintf( buf, buflen, "PKCS5 - Given private key password does not allow for correct decryption" );
+#endif /* MBEDTLS_PKCS5_C */
+
+#if defined(MBEDTLS_RSA_C)
+        if( use_ret == -(MBEDTLS_ERR_RSA_BAD_INPUT_DATA) )
+            mbedtls_snprintf( buf, buflen, "RSA - Bad input parameters to function" );
+        if( use_ret == -(MBEDTLS_ERR_RSA_INVALID_PADDING) )
+            mbedtls_snprintf( buf, buflen, "RSA - Input data contains invalid padding and is rejected" );
+        if( use_ret == -(MBEDTLS_ERR_RSA_KEY_GEN_FAILED) )
+            mbedtls_snprintf( buf, buflen, "RSA - Something failed during generation of a key" );
+        if( use_ret == -(MBEDTLS_ERR_RSA_KEY_CHECK_FAILED) )
+            mbedtls_snprintf( buf, buflen, "RSA - Key failed to pass the validity check of the library" );
+        if( use_ret == -(MBEDTLS_ERR_RSA_PUBLIC_FAILED) )
+            mbedtls_snprintf( buf, buflen, "RSA - The public key operation failed" );
+        if( use_ret == -(MBEDTLS_ERR_RSA_PRIVATE_FAILED) )
+            mbedtls_snprintf( buf, buflen, "RSA - The private key operation failed" );
+        if( use_ret == -(MBEDTLS_ERR_RSA_VERIFY_FAILED) )
+            mbedtls_snprintf( buf, buflen, "RSA - The PKCS#1 verification failed" );
+        if( use_ret == -(MBEDTLS_ERR_RSA_OUTPUT_TOO_LARGE) )
+            mbedtls_snprintf( buf, buflen, "RSA - The output buffer for decryption is not large enough" );
+        if( use_ret == -(MBEDTLS_ERR_RSA_RNG_FAILED) )
+            mbedtls_snprintf( buf, buflen, "RSA - The random generator failed to generate non-zeros" );
+        if( use_ret == -(MBEDTLS_ERR_RSA_UNSUPPORTED_OPERATION) )
+            mbedtls_snprintf( buf, buflen, "RSA - The implementation does not offer the requested operation, for example, because of security violations or lack of functionality" );
+        if( use_ret == -(MBEDTLS_ERR_RSA_HW_ACCEL_FAILED) )
+            mbedtls_snprintf( buf, buflen, "RSA - RSA hardware accelerator failed" );
+#endif /* MBEDTLS_RSA_C */
+
+#if defined(MBEDTLS_SSL_TLS_C)
+        if( use_ret == -(MBEDTLS_ERR_SSL_FEATURE_UNAVAILABLE) )
+            mbedtls_snprintf( buf, buflen, "SSL - The requested feature is not available" );
+        if( use_ret == -(MBEDTLS_ERR_SSL_BAD_INPUT_DATA) )
+            mbedtls_snprintf( buf, buflen, "SSL - Bad input parameters to function" );
+        if( use_ret == -(MBEDTLS_ERR_SSL_INVALID_MAC) )
+            mbedtls_snprintf( buf, buflen, "SSL - Verification of the message MAC failed" );
+        if( use_ret == -(MBEDTLS_ERR_SSL_INVALID_RECORD) )
+            mbedtls_snprintf( buf, buflen, "SSL - An invalid SSL record was received" );
+        if( use_ret == -(MBEDTLS_ERR_SSL_CONN_EOF) )
+            mbedtls_snprintf( buf, buflen, "SSL - The connection indicated an EOF" );
+        if( use_ret == -(MBEDTLS_ERR_SSL_UNKNOWN_CIPHER) )
+            mbedtls_snprintf( buf, buflen, "SSL - An unknown cipher was received" );
+        if( use_ret == -(MBEDTLS_ERR_SSL_NO_CIPHER_CHOSEN) )
+            mbedtls_snprintf( buf, buflen, "SSL - The server has no ciphersuites in common with the client" );
+        if( use_ret == -(MBEDTLS_ERR_SSL_NO_RNG) )
+            mbedtls_snprintf( buf, buflen, "SSL - No RNG was provided to the SSL module" );
+        if( use_ret == -(MBEDTLS_ERR_SSL_NO_CLIENT_CERTIFICATE) )
+            mbedtls_snprintf( buf, buflen, "SSL - No client certification received from the client, but required by the authentication mode" );
+        if( use_ret == -(MBEDTLS_ERR_SSL_CERTIFICATE_TOO_LARGE) )
+            mbedtls_snprintf( buf, buflen, "SSL - Our own certificate(s) is/are too large to send in an SSL message" );
+        if( use_ret == -(MBEDTLS_ERR_SSL_CERTIFICATE_REQUIRED) )
+            mbedtls_snprintf( buf, buflen, "SSL - The own certificate is not set, but needed by the server" );
+        if( use_ret == -(MBEDTLS_ERR_SSL_PRIVATE_KEY_REQUIRED) )
+            mbedtls_snprintf( buf, buflen, "SSL - The own private key or pre-shared key is not set, but needed" );
+        if( use_ret == -(MBEDTLS_ERR_SSL_CA_CHAIN_REQUIRED) )
+            mbedtls_snprintf( buf, buflen, "SSL - No CA Chain is set, but required to operate" );
+        if( use_ret == -(MBEDTLS_ERR_SSL_UNEXPECTED_MESSAGE) )
+            mbedtls_snprintf( buf, buflen, "SSL - An unexpected message was received from our peer" );
+        if( use_ret == -(MBEDTLS_ERR_SSL_FATAL_ALERT_MESSAGE) )
+        {
+            mbedtls_snprintf( buf, buflen, "SSL - A fatal alert message was received from our peer" );
+            return;
+        }
+        if( use_ret == -(MBEDTLS_ERR_SSL_PEER_VERIFY_FAILED) )
+            mbedtls_snprintf( buf, buflen, "SSL - Verification of our peer failed" );
+        if( use_ret == -(MBEDTLS_ERR_SSL_PEER_CLOSE_NOTIFY) )
+            mbedtls_snprintf( buf, buflen, "SSL - The peer notified us that the connection is going to be closed" );
+        if( use_ret == -(MBEDTLS_ERR_SSL_BAD_HS_CLIENT_HELLO) )
+            mbedtls_snprintf( buf, buflen, "SSL - Processing of the ClientHello handshake message failed" );
+        if( use_ret == -(MBEDTLS_ERR_SSL_BAD_HS_SERVER_HELLO) )
+            mbedtls_snprintf( buf, buflen, "SSL - Processing of the ServerHello handshake message failed" );
+        if( use_ret == -(MBEDTLS_ERR_SSL_BAD_HS_CERTIFICATE) )
+            mbedtls_snprintf( buf, buflen, "SSL - Processing of the Certificate handshake message failed" );
+        if( use_ret == -(MBEDTLS_ERR_SSL_BAD_HS_CERTIFICATE_REQUEST) )
+            mbedtls_snprintf( buf, buflen, "SSL - Processing of the CertificateRequest handshake message failed" );
+        if( use_ret == -(MBEDTLS_ERR_SSL_BAD_HS_SERVER_KEY_EXCHANGE) )
+            mbedtls_snprintf( buf, buflen, "SSL - Processing of the ServerKeyExchange handshake message failed" );
+        if( use_ret == -(MBEDTLS_ERR_SSL_BAD_HS_SERVER_HELLO_DONE) )
+            mbedtls_snprintf( buf, buflen, "SSL - Processing of the ServerHelloDone handshake message failed" );
+        if( use_ret == -(MBEDTLS_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE) )
+            mbedtls_snprintf( buf, buflen, "SSL - Processing of the ClientKeyExchange handshake message failed" );
+        if( use_ret == -(MBEDTLS_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE_RP) )
+            mbedtls_snprintf( buf, buflen, "SSL - Processing of the ClientKeyExchange handshake message failed in DHM / ECDH Read Public" );
+        if( use_ret == -(MBEDTLS_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE_CS) )
+            mbedtls_snprintf( buf, buflen, "SSL - Processing of the ClientKeyExchange handshake message failed in DHM / ECDH Calculate Secret" );
+        if( use_ret == -(MBEDTLS_ERR_SSL_BAD_HS_CERTIFICATE_VERIFY) )
+            mbedtls_snprintf( buf, buflen, "SSL - Processing of the CertificateVerify handshake message failed" );
+        if( use_ret == -(MBEDTLS_ERR_SSL_BAD_HS_CHANGE_CIPHER_SPEC) )
+            mbedtls_snprintf( buf, buflen, "SSL - Processing of the ChangeCipherSpec handshake message failed" );
+        if( use_ret == -(MBEDTLS_ERR_SSL_BAD_HS_FINISHED) )
+            mbedtls_snprintf( buf, buflen, "SSL - Processing of the Finished handshake message failed" );
+        if( use_ret == -(MBEDTLS_ERR_SSL_ALLOC_FAILED) )
+            mbedtls_snprintf( buf, buflen, "SSL - Memory allocation failed" );
+        if( use_ret == -(MBEDTLS_ERR_SSL_HW_ACCEL_FAILED) )
+            mbedtls_snprintf( buf, buflen, "SSL - Hardware acceleration function returned with error" );
+        if( use_ret == -(MBEDTLS_ERR_SSL_HW_ACCEL_FALLTHROUGH) )
+            mbedtls_snprintf( buf, buflen, "SSL - Hardware acceleration function skipped / left alone data" );
+        if( use_ret == -(MBEDTLS_ERR_SSL_COMPRESSION_FAILED) )
+            mbedtls_snprintf( buf, buflen, "SSL - Processing of the compression / decompression failed" );
+        if( use_ret == -(MBEDTLS_ERR_SSL_BAD_HS_PROTOCOL_VERSION) )
+            mbedtls_snprintf( buf, buflen, "SSL - Handshake protocol not within min/max boundaries" );
+        if( use_ret == -(MBEDTLS_ERR_SSL_BAD_HS_NEW_SESSION_TICKET) )
+            mbedtls_snprintf( buf, buflen, "SSL - Processing of the NewSessionTicket handshake message failed" );
+        if( use_ret == -(MBEDTLS_ERR_SSL_SESSION_TICKET_EXPIRED) )
+            mbedtls_snprintf( buf, buflen, "SSL - Session ticket has expired" );
+        if( use_ret == -(MBEDTLS_ERR_SSL_PK_TYPE_MISMATCH) )
+            mbedtls_snprintf( buf, buflen, "SSL - Public key type mismatch (eg, asked for RSA key exchange and presented EC key)" );
+        if( use_ret == -(MBEDTLS_ERR_SSL_UNKNOWN_IDENTITY) )
+            mbedtls_snprintf( buf, buflen, "SSL - Unknown identity received (eg, PSK identity)" );
+        if( use_ret == -(MBEDTLS_ERR_SSL_INTERNAL_ERROR) )
+            mbedtls_snprintf( buf, buflen, "SSL - Internal error (eg, unexpected failure in lower-level module)" );
+        if( use_ret == -(MBEDTLS_ERR_SSL_COUNTER_WRAPPING) )
+            mbedtls_snprintf( buf, buflen, "SSL - A counter would wrap (eg, too many messages exchanged)" );
+        if( use_ret == -(MBEDTLS_ERR_SSL_WAITING_SERVER_HELLO_RENEGO) )
+            mbedtls_snprintf( buf, buflen, "SSL - Unexpected message at ServerHello in renegotiation" );
+        if( use_ret == -(MBEDTLS_ERR_SSL_HELLO_VERIFY_REQUIRED) )
+            mbedtls_snprintf( buf, buflen, "SSL - DTLS client must retry for hello verification" );
+        if( use_ret == -(MBEDTLS_ERR_SSL_BUFFER_TOO_SMALL) )
+            mbedtls_snprintf( buf, buflen, "SSL - A buffer is too small to receive or write a message" );
+        if( use_ret == -(MBEDTLS_ERR_SSL_NO_USABLE_CIPHERSUITE) )
+            mbedtls_snprintf( buf, buflen, "SSL - None of the common ciphersuites is usable (eg, no suitable certificate, see debug messages)" );
+        if( use_ret == -(MBEDTLS_ERR_SSL_WANT_READ) )
+            mbedtls_snprintf( buf, buflen, "SSL - No data of requested type currently available on underlying transport" );
+        if( use_ret == -(MBEDTLS_ERR_SSL_WANT_WRITE) )
+            mbedtls_snprintf( buf, buflen, "SSL - Connection requires a write call" );
+        if( use_ret == -(MBEDTLS_ERR_SSL_TIMEOUT) )
+            mbedtls_snprintf( buf, buflen, "SSL - The operation timed out" );
+        if( use_ret == -(MBEDTLS_ERR_SSL_CLIENT_RECONNECT) )
+            mbedtls_snprintf( buf, buflen, "SSL - The client initiated a reconnect from the same port" );
+        if( use_ret == -(MBEDTLS_ERR_SSL_UNEXPECTED_RECORD) )
+            mbedtls_snprintf( buf, buflen, "SSL - Record header looks valid but is not expected" );
+        if( use_ret == -(MBEDTLS_ERR_SSL_NON_FATAL) )
+            mbedtls_snprintf( buf, buflen, "SSL - The alert message received indicates a non-fatal error" );
+        if( use_ret == -(MBEDTLS_ERR_SSL_INVALID_VERIFY_HASH) )
+            mbedtls_snprintf( buf, buflen, "SSL - Couldn't set the hash for verifying CertificateVerify" );
+        if( use_ret == -(MBEDTLS_ERR_SSL_CONTINUE_PROCESSING) )
+            mbedtls_snprintf( buf, buflen, "SSL - Internal-only message signaling that further message-processing should be done" );
+        if( use_ret == -(MBEDTLS_ERR_SSL_ASYNC_IN_PROGRESS) )
+            mbedtls_snprintf( buf, buflen, "SSL - The asynchronous operation is not completed yet" );
+        if( use_ret == -(MBEDTLS_ERR_SSL_EARLY_MESSAGE) )
+            mbedtls_snprintf( buf, buflen, "SSL - Internal-only message signaling that a message arrived early" );
+#endif /* MBEDTLS_SSL_TLS_C */
+
+#if defined(MBEDTLS_X509_USE_C) || defined(MBEDTLS_X509_CREATE_C)
+        if( use_ret == -(MBEDTLS_ERR_X509_FEATURE_UNAVAILABLE) )
+            mbedtls_snprintf( buf, buflen, "X509 - Unavailable feature, e.g. RSA hashing/encryption combination" );
+        if( use_ret == -(MBEDTLS_ERR_X509_UNKNOWN_OID) )
+            mbedtls_snprintf( buf, buflen, "X509 - Requested OID is unknown" );
+        if( use_ret == -(MBEDTLS_ERR_X509_INVALID_FORMAT) )
+            mbedtls_snprintf( buf, buflen, "X509 - The CRT/CRL/CSR format is invalid, e.g. different type expected" );
+        if( use_ret == -(MBEDTLS_ERR_X509_INVALID_VERSION) )
+            mbedtls_snprintf( buf, buflen, "X509 - The CRT/CRL/CSR version element is invalid" );
+        if( use_ret == -(MBEDTLS_ERR_X509_INVALID_SERIAL) )
+            mbedtls_snprintf( buf, buflen, "X509 - The serial tag or value is invalid" );
+        if( use_ret == -(MBEDTLS_ERR_X509_INVALID_ALG) )
+            mbedtls_snprintf( buf, buflen, "X509 - The algorithm tag or value is invalid" );
+        if( use_ret == -(MBEDTLS_ERR_X509_INVALID_NAME) )
+            mbedtls_snprintf( buf, buflen, "X509 - The name tag or value is invalid" );
+        if( use_ret == -(MBEDTLS_ERR_X509_INVALID_DATE) )
+            mbedtls_snprintf( buf, buflen, "X509 - The date tag or value is invalid" );
+        if( use_ret == -(MBEDTLS_ERR_X509_INVALID_SIGNATURE) )
+            mbedtls_snprintf( buf, buflen, "X509 - The signature tag or value invalid" );
+        if( use_ret == -(MBEDTLS_ERR_X509_INVALID_EXTENSIONS) )
+            mbedtls_snprintf( buf, buflen, "X509 - The extension tag or value is invalid" );
+        if( use_ret == -(MBEDTLS_ERR_X509_UNKNOWN_VERSION) )
+            mbedtls_snprintf( buf, buflen, "X509 - CRT/CRL/CSR has an unsupported version number" );
+        if( use_ret == -(MBEDTLS_ERR_X509_UNKNOWN_SIG_ALG) )
+            mbedtls_snprintf( buf, buflen, "X509 - Signature algorithm (oid) is unsupported" );
+        if( use_ret == -(MBEDTLS_ERR_X509_SIG_MISMATCH) )
+            mbedtls_snprintf( buf, buflen, "X509 - Signature algorithms do not match. (see \\c ::mbedtls_x509_crt sig_oid)" );
+        if( use_ret == -(MBEDTLS_ERR_X509_CERT_VERIFY_FAILED) )
+            mbedtls_snprintf( buf, buflen, "X509 - Certificate verification failed, e.g. CRL, CA or signature check failed" );
+        if( use_ret == -(MBEDTLS_ERR_X509_CERT_UNKNOWN_FORMAT) )
+            mbedtls_snprintf( buf, buflen, "X509 - Format not recognized as DER or PEM" );
+        if( use_ret == -(MBEDTLS_ERR_X509_BAD_INPUT_DATA) )
+            mbedtls_snprintf( buf, buflen, "X509 - Input invalid" );
+        if( use_ret == -(MBEDTLS_ERR_X509_ALLOC_FAILED) )
+            mbedtls_snprintf( buf, buflen, "X509 - Allocation of memory failed" );
+        if( use_ret == -(MBEDTLS_ERR_X509_FILE_IO_ERROR) )
+            mbedtls_snprintf( buf, buflen, "X509 - Read/write of file failed" );
+        if( use_ret == -(MBEDTLS_ERR_X509_BUFFER_TOO_SMALL) )
+            mbedtls_snprintf( buf, buflen, "X509 - Destination buffer is too small" );
+        if( use_ret == -(MBEDTLS_ERR_X509_FATAL_ERROR) )
+            mbedtls_snprintf( buf, buflen, "X509 - A fatal error occured, eg the chain is too long or the vrfy callback failed" );
+#endif /* MBEDTLS_X509_USE_C || MBEDTLS_X509_CREATE_C */
+        // END generated code
+
+        if( strlen( buf ) == 0 )
+            mbedtls_snprintf( buf, buflen, "UNKNOWN ERROR CODE (%04X)", use_ret );
+    }
+
+    use_ret = ret & ~0xFF80;
+
+    if( use_ret == 0 )
+        return;
+
+    // If high level code is present, make a concatenation between both
+    // error strings.
+    //
+    len = strlen( buf );
+
+    if( len > 0 )
+    {
+        if( buflen - len < 5 )
+            return;
+
+        mbedtls_snprintf( buf + len, buflen - len, " : " );
+
+        buf += len + 3;
+        buflen -= len + 3;
+    }
+
+    // Low level error codes
+    //
+    // BEGIN generated code
+#if defined(MBEDTLS_AES_C)
+    if( use_ret == -(MBEDTLS_ERR_AES_INVALID_KEY_LENGTH) )
+        mbedtls_snprintf( buf, buflen, "AES - Invalid key length" );
+    if( use_ret == -(MBEDTLS_ERR_AES_INVALID_INPUT_LENGTH) )
+        mbedtls_snprintf( buf, buflen, "AES - Invalid data input length" );
+    if( use_ret == -(MBEDTLS_ERR_AES_BAD_INPUT_DATA) )
+        mbedtls_snprintf( buf, buflen, "AES - Invalid input data" );
+    if( use_ret == -(MBEDTLS_ERR_AES_FEATURE_UNAVAILABLE) )
+        mbedtls_snprintf( buf, buflen, "AES - Feature not available. For example, an unsupported AES key size" );
+    if( use_ret == -(MBEDTLS_ERR_AES_HW_ACCEL_FAILED) )
+        mbedtls_snprintf( buf, buflen, "AES - AES hardware accelerator failed" );
+#endif /* MBEDTLS_AES_C */
+
+#if defined(MBEDTLS_ARC4_C)
+    if( use_ret == -(MBEDTLS_ERR_ARC4_HW_ACCEL_FAILED) )
+        mbedtls_snprintf( buf, buflen, "ARC4 - ARC4 hardware accelerator failed" );
+#endif /* MBEDTLS_ARC4_C */
+
+#if defined(MBEDTLS_ARIA_C)
+    if( use_ret == -(MBEDTLS_ERR_ARIA_INVALID_KEY_LENGTH) )
+        mbedtls_snprintf( buf, buflen, "ARIA - Invalid key length" );
+    if( use_ret == -(MBEDTLS_ERR_ARIA_INVALID_INPUT_LENGTH) )
+        mbedtls_snprintf( buf, buflen, "ARIA - Invalid data input length" );
+    if( use_ret == -(MBEDTLS_ERR_ARIA_FEATURE_UNAVAILABLE) )
+        mbedtls_snprintf( buf, buflen, "ARIA - Feature not available. For example, an unsupported ARIA key size" );
+    if( use_ret == -(MBEDTLS_ERR_ARIA_HW_ACCEL_FAILED) )
+        mbedtls_snprintf( buf, buflen, "ARIA - ARIA hardware accelerator failed" );
+#endif /* MBEDTLS_ARIA_C */
+
+#if defined(MBEDTLS_ASN1_PARSE_C)
+    if( use_ret == -(MBEDTLS_ERR_ASN1_OUT_OF_DATA) )
+        mbedtls_snprintf( buf, buflen, "ASN1 - Out of data when parsing an ASN1 data structure" );
+    if( use_ret == -(MBEDTLS_ERR_ASN1_UNEXPECTED_TAG) )
+        mbedtls_snprintf( buf, buflen, "ASN1 - ASN1 tag was of an unexpected value" );
+    if( use_ret == -(MBEDTLS_ERR_ASN1_INVALID_LENGTH) )
+        mbedtls_snprintf( buf, buflen, "ASN1 - Error when trying to determine the length or invalid length" );
+    if( use_ret == -(MBEDTLS_ERR_ASN1_LENGTH_MISMATCH) )
+        mbedtls_snprintf( buf, buflen, "ASN1 - Actual length differs from expected length" );
+    if( use_ret == -(MBEDTLS_ERR_ASN1_INVALID_DATA) )
+        mbedtls_snprintf( buf, buflen, "ASN1 - Data is invalid. (not used)" );
+    if( use_ret == -(MBEDTLS_ERR_ASN1_ALLOC_FAILED) )
+        mbedtls_snprintf( buf, buflen, "ASN1 - Memory allocation failed" );
+    if( use_ret == -(MBEDTLS_ERR_ASN1_BUF_TOO_SMALL) )
+        mbedtls_snprintf( buf, buflen, "ASN1 - Buffer too small when writing ASN.1 data structure" );
+#endif /* MBEDTLS_ASN1_PARSE_C */
+
+#if defined(MBEDTLS_BASE64_C)
+    if( use_ret == -(MBEDTLS_ERR_BASE64_BUFFER_TOO_SMALL) )
+        mbedtls_snprintf( buf, buflen, "BASE64 - Output buffer too small" );
+    if( use_ret == -(MBEDTLS_ERR_BASE64_INVALID_CHARACTER) )
+        mbedtls_snprintf( buf, buflen, "BASE64 - Invalid character in input" );
+#endif /* MBEDTLS_BASE64_C */
+
+#if defined(MBEDTLS_BIGNUM_C)
+    if( use_ret == -(MBEDTLS_ERR_MPI_FILE_IO_ERROR) )
+        mbedtls_snprintf( buf, buflen, "BIGNUM - An error occurred while reading from or writing to a file" );
+    if( use_ret == -(MBEDTLS_ERR_MPI_BAD_INPUT_DATA) )
+        mbedtls_snprintf( buf, buflen, "BIGNUM - Bad input parameters to function" );
+    if( use_ret == -(MBEDTLS_ERR_MPI_INVALID_CHARACTER) )
+        mbedtls_snprintf( buf, buflen, "BIGNUM - There is an invalid character in the digit string" );
+    if( use_ret == -(MBEDTLS_ERR_MPI_BUFFER_TOO_SMALL) )
+        mbedtls_snprintf( buf, buflen, "BIGNUM - The buffer is too small to write to" );
+    if( use_ret == -(MBEDTLS_ERR_MPI_NEGATIVE_VALUE) )
+        mbedtls_snprintf( buf, buflen, "BIGNUM - The input arguments are negative or result in illegal output" );
+    if( use_ret == -(MBEDTLS_ERR_MPI_DIVISION_BY_ZERO) )
+        mbedtls_snprintf( buf, buflen, "BIGNUM - The input argument for division is zero, which is not allowed" );
+    if( use_ret == -(MBEDTLS_ERR_MPI_NOT_ACCEPTABLE) )
+        mbedtls_snprintf( buf, buflen, "BIGNUM - The input arguments are not acceptable" );
+    if( use_ret == -(MBEDTLS_ERR_MPI_ALLOC_FAILED) )
+        mbedtls_snprintf( buf, buflen, "BIGNUM - Memory allocation failed" );
+#endif /* MBEDTLS_BIGNUM_C */
+
+#if defined(MBEDTLS_BLOWFISH_C)
+    if( use_ret == -(MBEDTLS_ERR_BLOWFISH_INVALID_KEY_LENGTH) )
+        mbedtls_snprintf( buf, buflen, "BLOWFISH - Invalid key length" );
+    if( use_ret == -(MBEDTLS_ERR_BLOWFISH_HW_ACCEL_FAILED) )
+        mbedtls_snprintf( buf, buflen, "BLOWFISH - Blowfish hardware accelerator failed" );
+    if( use_ret == -(MBEDTLS_ERR_BLOWFISH_INVALID_INPUT_LENGTH) )
+        mbedtls_snprintf( buf, buflen, "BLOWFISH - Invalid data input length" );
+#endif /* MBEDTLS_BLOWFISH_C */
+
+#if defined(MBEDTLS_CAMELLIA_C)
+    if( use_ret == -(MBEDTLS_ERR_CAMELLIA_INVALID_KEY_LENGTH) )
+        mbedtls_snprintf( buf, buflen, "CAMELLIA - Invalid key length" );
+    if( use_ret == -(MBEDTLS_ERR_CAMELLIA_INVALID_INPUT_LENGTH) )
+        mbedtls_snprintf( buf, buflen, "CAMELLIA - Invalid data input length" );
+    if( use_ret == -(MBEDTLS_ERR_CAMELLIA_HW_ACCEL_FAILED) )
+        mbedtls_snprintf( buf, buflen, "CAMELLIA - Camellia hardware accelerator failed" );
+#endif /* MBEDTLS_CAMELLIA_C */
+
+#if defined(MBEDTLS_CCM_C)
+    if( use_ret == -(MBEDTLS_ERR_CCM_BAD_INPUT) )
+        mbedtls_snprintf( buf, buflen, "CCM - Bad input parameters to the function" );
+    if( use_ret == -(MBEDTLS_ERR_CCM_AUTH_FAILED) )
+        mbedtls_snprintf( buf, buflen, "CCM - Authenticated decryption failed" );
+    if( use_ret == -(MBEDTLS_ERR_CCM_HW_ACCEL_FAILED) )
+        mbedtls_snprintf( buf, buflen, "CCM - CCM hardware accelerator failed" );
+#endif /* MBEDTLS_CCM_C */
+
+#if defined(MBEDTLS_CHACHA20_C)
+    if( use_ret == -(MBEDTLS_ERR_CHACHA20_BAD_INPUT_DATA) )
+        mbedtls_snprintf( buf, buflen, "CHACHA20 - Invalid input parameter(s)" );
+    if( use_ret == -(MBEDTLS_ERR_CHACHA20_FEATURE_UNAVAILABLE) )
+        mbedtls_snprintf( buf, buflen, "CHACHA20 - Feature not available. For example, s part of the API is not implemented" );
+    if( use_ret == -(MBEDTLS_ERR_CHACHA20_HW_ACCEL_FAILED) )
+        mbedtls_snprintf( buf, buflen, "CHACHA20 - Chacha20 hardware accelerator failed" );
+#endif /* MBEDTLS_CHACHA20_C */
+
+#if defined(MBEDTLS_CHACHAPOLY_C)
+    if( use_ret == -(MBEDTLS_ERR_CHACHAPOLY_BAD_STATE) )
+        mbedtls_snprintf( buf, buflen, "CHACHAPOLY - The requested operation is not permitted in the current state" );
+    if( use_ret == -(MBEDTLS_ERR_CHACHAPOLY_AUTH_FAILED) )
+        mbedtls_snprintf( buf, buflen, "CHACHAPOLY - Authenticated decryption failed: data was not authentic" );
+#endif /* MBEDTLS_CHACHAPOLY_C */
+
+#if defined(MBEDTLS_CMAC_C)
+    if( use_ret == -(MBEDTLS_ERR_CMAC_HW_ACCEL_FAILED) )
+        mbedtls_snprintf( buf, buflen, "CMAC - CMAC hardware accelerator failed" );
+#endif /* MBEDTLS_CMAC_C */
+
+#if defined(MBEDTLS_CTR_DRBG_C)
+    if( use_ret == -(MBEDTLS_ERR_CTR_DRBG_ENTROPY_SOURCE_FAILED) )
+        mbedtls_snprintf( buf, buflen, "CTR_DRBG - The entropy source failed" );
+    if( use_ret == -(MBEDTLS_ERR_CTR_DRBG_REQUEST_TOO_BIG) )
+        mbedtls_snprintf( buf, buflen, "CTR_DRBG - The requested random buffer length is too big" );
+    if( use_ret == -(MBEDTLS_ERR_CTR_DRBG_INPUT_TOO_BIG) )
+        mbedtls_snprintf( buf, buflen, "CTR_DRBG - The input (entropy + additional data) is too large" );
+    if( use_ret == -(MBEDTLS_ERR_CTR_DRBG_FILE_IO_ERROR) )
+        mbedtls_snprintf( buf, buflen, "CTR_DRBG - Read or write error in file" );
+#endif /* MBEDTLS_CTR_DRBG_C */
+
+#if defined(MBEDTLS_DES_C)
+    if( use_ret == -(MBEDTLS_ERR_DES_INVALID_INPUT_LENGTH) )
+        mbedtls_snprintf( buf, buflen, "DES - The data input has an invalid length" );
+    if( use_ret == -(MBEDTLS_ERR_DES_HW_ACCEL_FAILED) )
+        mbedtls_snprintf( buf, buflen, "DES - DES hardware accelerator failed" );
+#endif /* MBEDTLS_DES_C */
+
+#if defined(MBEDTLS_ENTROPY_C)
+    if( use_ret == -(MBEDTLS_ERR_ENTROPY_SOURCE_FAILED) )
+        mbedtls_snprintf( buf, buflen, "ENTROPY - Critical entropy source failure" );
+    if( use_ret == -(MBEDTLS_ERR_ENTROPY_MAX_SOURCES) )
+        mbedtls_snprintf( buf, buflen, "ENTROPY - No more sources can be added" );
+    if( use_ret == -(MBEDTLS_ERR_ENTROPY_NO_SOURCES_DEFINED) )
+        mbedtls_snprintf( buf, buflen, "ENTROPY - No sources have been added to poll" );
+    if( use_ret == -(MBEDTLS_ERR_ENTROPY_NO_STRONG_SOURCE) )
+        mbedtls_snprintf( buf, buflen, "ENTROPY - No strong sources have been added to poll" );
+    if( use_ret == -(MBEDTLS_ERR_ENTROPY_FILE_IO_ERROR) )
+        mbedtls_snprintf( buf, buflen, "ENTROPY - Read/write error in file" );
+#endif /* MBEDTLS_ENTROPY_C */
+
+#if defined(MBEDTLS_GCM_C)
+    if( use_ret == -(MBEDTLS_ERR_GCM_AUTH_FAILED) )
+        mbedtls_snprintf( buf, buflen, "GCM - Authenticated decryption failed" );
+    if( use_ret == -(MBEDTLS_ERR_GCM_HW_ACCEL_FAILED) )
+        mbedtls_snprintf( buf, buflen, "GCM - GCM hardware accelerator failed" );
+    if( use_ret == -(MBEDTLS_ERR_GCM_BAD_INPUT) )
+        mbedtls_snprintf( buf, buflen, "GCM - Bad input parameters to function" );
+#endif /* MBEDTLS_GCM_C */
+
+#if defined(MBEDTLS_HKDF_C)
+    if( use_ret == -(MBEDTLS_ERR_HKDF_BAD_INPUT_DATA) )
+        mbedtls_snprintf( buf, buflen, "HKDF - Bad input parameters to function" );
+#endif /* MBEDTLS_HKDF_C */
+
+#if defined(MBEDTLS_HMAC_DRBG_C)
+    if( use_ret == -(MBEDTLS_ERR_HMAC_DRBG_REQUEST_TOO_BIG) )
+        mbedtls_snprintf( buf, buflen, "HMAC_DRBG - Too many random requested in single call" );
+    if( use_ret == -(MBEDTLS_ERR_HMAC_DRBG_INPUT_TOO_BIG) )
+        mbedtls_snprintf( buf, buflen, "HMAC_DRBG - Input too large (Entropy + additional)" );
+    if( use_ret == -(MBEDTLS_ERR_HMAC_DRBG_FILE_IO_ERROR) )
+        mbedtls_snprintf( buf, buflen, "HMAC_DRBG - Read/write error in file" );
+    if( use_ret == -(MBEDTLS_ERR_HMAC_DRBG_ENTROPY_SOURCE_FAILED) )
+        mbedtls_snprintf( buf, buflen, "HMAC_DRBG - The entropy source failed" );
+#endif /* MBEDTLS_HMAC_DRBG_C */
+
+#if defined(MBEDTLS_MD2_C)
+    if( use_ret == -(MBEDTLS_ERR_MD2_HW_ACCEL_FAILED) )
+        mbedtls_snprintf( buf, buflen, "MD2 - MD2 hardware accelerator failed" );
+#endif /* MBEDTLS_MD2_C */
+
+#if defined(MBEDTLS_MD4_C)
+    if( use_ret == -(MBEDTLS_ERR_MD4_HW_ACCEL_FAILED) )
+        mbedtls_snprintf( buf, buflen, "MD4 - MD4 hardware accelerator failed" );
+#endif /* MBEDTLS_MD4_C */
+
+#if defined(MBEDTLS_MD5_C)
+    if( use_ret == -(MBEDTLS_ERR_MD5_HW_ACCEL_FAILED) )
+        mbedtls_snprintf( buf, buflen, "MD5 - MD5 hardware accelerator failed" );
+#endif /* MBEDTLS_MD5_C */
+
+#if defined(MBEDTLS_NET_C)
+    if( use_ret == -(MBEDTLS_ERR_NET_SOCKET_FAILED) )
+        mbedtls_snprintf( buf, buflen, "NET - Failed to open a socket" );
+    if( use_ret == -(MBEDTLS_ERR_NET_CONNECT_FAILED) )
+        mbedtls_snprintf( buf, buflen, "NET - The connection to the given server / port failed" );
+    if( use_ret == -(MBEDTLS_ERR_NET_BIND_FAILED) )
+        mbedtls_snprintf( buf, buflen, "NET - Binding of the socket failed" );
+    if( use_ret == -(MBEDTLS_ERR_NET_LISTEN_FAILED) )
+        mbedtls_snprintf( buf, buflen, "NET - Could not listen on the socket" );
+    if( use_ret == -(MBEDTLS_ERR_NET_ACCEPT_FAILED) )
+        mbedtls_snprintf( buf, buflen, "NET - Could not accept the incoming connection" );
+    if( use_ret == -(MBEDTLS_ERR_NET_RECV_FAILED) )
+        mbedtls_snprintf( buf, buflen, "NET - Reading information from the socket failed" );
+    if( use_ret == -(MBEDTLS_ERR_NET_SEND_FAILED) )
+        mbedtls_snprintf( buf, buflen, "NET - Sending information through the socket failed" );
+    if( use_ret == -(MBEDTLS_ERR_NET_CONN_RESET) )
+        mbedtls_snprintf( buf, buflen, "NET - Connection was reset by peer" );
+    if( use_ret == -(MBEDTLS_ERR_NET_UNKNOWN_HOST) )
+        mbedtls_snprintf( buf, buflen, "NET - Failed to get an IP address for the given hostname" );
+    if( use_ret == -(MBEDTLS_ERR_NET_BUFFER_TOO_SMALL) )
+        mbedtls_snprintf( buf, buflen, "NET - Buffer is too small to hold the data" );
+    if( use_ret == -(MBEDTLS_ERR_NET_INVALID_CONTEXT) )
+        mbedtls_snprintf( buf, buflen, "NET - The context is invalid, eg because it was free()ed" );
+    if( use_ret == -(MBEDTLS_ERR_NET_POLL_FAILED) )
+        mbedtls_snprintf( buf, buflen, "NET - Polling the net context failed" );
+    if( use_ret == -(MBEDTLS_ERR_NET_BAD_INPUT_DATA) )
+        mbedtls_snprintf( buf, buflen, "NET - Input invalid" );
+#endif /* MBEDTLS_NET_C */
+
+#if defined(MBEDTLS_OID_C)
+    if( use_ret == -(MBEDTLS_ERR_OID_NOT_FOUND) )
+        mbedtls_snprintf( buf, buflen, "OID - OID is not found" );
+    if( use_ret == -(MBEDTLS_ERR_OID_BUF_TOO_SMALL) )
+        mbedtls_snprintf( buf, buflen, "OID - output buffer is too small" );
+#endif /* MBEDTLS_OID_C */
+
+#if defined(MBEDTLS_PADLOCK_C)
+    if( use_ret == -(MBEDTLS_ERR_PADLOCK_DATA_MISALIGNED) )
+        mbedtls_snprintf( buf, buflen, "PADLOCK - Input data should be aligned" );
+#endif /* MBEDTLS_PADLOCK_C */
+
+#if defined(MBEDTLS_POLY1305_C)
+    if( use_ret == -(MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA) )
+        mbedtls_snprintf( buf, buflen, "POLY1305 - Invalid input parameter(s)" );
+    if( use_ret == -(MBEDTLS_ERR_POLY1305_FEATURE_UNAVAILABLE) )
+        mbedtls_snprintf( buf, buflen, "POLY1305 - Feature not available. For example, s part of the API is not implemented" );
+    if( use_ret == -(MBEDTLS_ERR_POLY1305_HW_ACCEL_FAILED) )
+        mbedtls_snprintf( buf, buflen, "POLY1305 - Poly1305 hardware accelerator failed" );
+#endif /* MBEDTLS_POLY1305_C */
+
+#if defined(MBEDTLS_RIPEMD160_C)
+    if( use_ret == -(MBEDTLS_ERR_RIPEMD160_HW_ACCEL_FAILED) )
+        mbedtls_snprintf( buf, buflen, "RIPEMD160 - RIPEMD160 hardware accelerator failed" );
+#endif /* MBEDTLS_RIPEMD160_C */
+
+#if defined(MBEDTLS_SHA1_C)
+    if( use_ret == -(MBEDTLS_ERR_SHA1_HW_ACCEL_FAILED) )
+        mbedtls_snprintf( buf, buflen, "SHA1 - SHA-1 hardware accelerator failed" );
+#endif /* MBEDTLS_SHA1_C */
+
+#if defined(MBEDTLS_SHA256_C)
+    if( use_ret == -(MBEDTLS_ERR_SHA256_HW_ACCEL_FAILED) )
+        mbedtls_snprintf( buf, buflen, "SHA256 - SHA-256 hardware accelerator failed" );
+#endif /* MBEDTLS_SHA256_C */
+
+#if defined(MBEDTLS_SHA512_C)
+    if( use_ret == -(MBEDTLS_ERR_SHA512_HW_ACCEL_FAILED) )
+        mbedtls_snprintf( buf, buflen, "SHA512 - SHA-512 hardware accelerator failed" );
+#endif /* MBEDTLS_SHA512_C */
+
+#if defined(MBEDTLS_THREADING_C)
+    if( use_ret == -(MBEDTLS_ERR_THREADING_FEATURE_UNAVAILABLE) )
+        mbedtls_snprintf( buf, buflen, "THREADING - The selected feature is not available" );
+    if( use_ret == -(MBEDTLS_ERR_THREADING_BAD_INPUT_DATA) )
+        mbedtls_snprintf( buf, buflen, "THREADING - Bad input parameters to function" );
+    if( use_ret == -(MBEDTLS_ERR_THREADING_MUTEX_ERROR) )
+        mbedtls_snprintf( buf, buflen, "THREADING - Locking / unlocking / free failed with error code" );
+#endif /* MBEDTLS_THREADING_C */
+
+#if defined(MBEDTLS_XTEA_C)
+    if( use_ret == -(MBEDTLS_ERR_XTEA_INVALID_INPUT_LENGTH) )
+        mbedtls_snprintf( buf, buflen, "XTEA - The data input has an invalid length" );
+    if( use_ret == -(MBEDTLS_ERR_XTEA_HW_ACCEL_FAILED) )
+        mbedtls_snprintf( buf, buflen, "XTEA - XTEA hardware accelerator failed" );
+#endif /* MBEDTLS_XTEA_C */
+    // END generated code
+
+    if( strlen( buf ) != 0 )
+        return;
+
+    mbedtls_snprintf( buf, buflen, "UNKNOWN ERROR CODE (%04X)", use_ret );
+}
+
+#else /* MBEDTLS_ERROR_C */
+
+#if defined(MBEDTLS_ERROR_STRERROR_DUMMY)
+
+/*
+ * Provide an non-function in case MBEDTLS_ERROR_C is not defined
+ */
+void mbedtls_strerror( int ret, char *buf, size_t buflen )
+{
+    ((void) ret);
+
+    if( buflen > 0 )
+        buf[0] = '\0';
+}
+
+#endif /* MBEDTLS_ERROR_STRERROR_DUMMY */
+
+#endif /* MBEDTLS_ERROR_C */
diff --git a/common/mbedtls/error.h b/common/mbedtls/error.h
new file mode 100644
index 000000000..432179084
--- /dev/null
+++ b/common/mbedtls/error.h
@@ -0,0 +1,124 @@
+/**
+ * \file error.h
+ *
+ * \brief Error to string translation
+ */
+/*
+ *  Copyright (C) 2006-2018, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+#ifndef MBEDTLS_ERROR_H
+#define MBEDTLS_ERROR_H
+
+#include <stddef.h>
+
+/**
+ * Error code layout.
+ *
+ * Currently we try to keep all error codes within the negative space of 16
+ * bits signed integers to support all platforms (-0x0001 - -0x7FFF). In
+ * addition we'd like to give two layers of information on the error if
+ * possible.
+ *
+ * For that purpose the error codes are segmented in the following manner:
+ *
+ * 16 bit error code bit-segmentation
+ *
+ * 1 bit  - Unused (sign bit)
+ * 3 bits - High level module ID
+ * 5 bits - Module-dependent error code
+ * 7 bits - Low level module errors
+ *
+ * For historical reasons, low-level error codes are divided in even and odd,
+ * even codes were assigned first, and -1 is reserved for other errors.
+ *
+ * Low-level module errors (0x0002-0x007E, 0x0003-0x007F)
+ *
+ * Module   Nr  Codes assigned
+ * MPI       7  0x0002-0x0010
+ * GCM       3  0x0012-0x0014   0x0013-0x0013
+ * BLOWFISH  3  0x0016-0x0018   0x0017-0x0017
+ * THREADING 3  0x001A-0x001E
+ * AES       5  0x0020-0x0022   0x0021-0x0025
+ * CAMELLIA  3  0x0024-0x0026   0x0027-0x0027
+ * XTEA      2  0x0028-0x0028   0x0029-0x0029
+ * BASE64    2  0x002A-0x002C
+ * OID       1  0x002E-0x002E   0x000B-0x000B
+ * PADLOCK   1  0x0030-0x0030
+ * DES       2  0x0032-0x0032   0x0033-0x0033
+ * CTR_DBRG  4  0x0034-0x003A
+ * ENTROPY   3  0x003C-0x0040   0x003D-0x003F
+ * NET      13  0x0042-0x0052   0x0043-0x0049
+ * ARIA      4  0x0058-0x005E
+ * ASN1      7  0x0060-0x006C
+ * CMAC      1  0x007A-0x007A
+ * PBKDF2    1  0x007C-0x007C
+ * HMAC_DRBG 4                  0x0003-0x0009
+ * CCM       3                  0x000D-0x0011
+ * ARC4      1                  0x0019-0x0019
+ * MD2       1                  0x002B-0x002B
+ * MD4       1                  0x002D-0x002D
+ * MD5       1                  0x002F-0x002F
+ * RIPEMD160 1                  0x0031-0x0031
+ * SHA1      1                  0x0035-0x0035
+ * SHA256    1                  0x0037-0x0037
+ * SHA512    1                  0x0039-0x0039
+ * CHACHA20  3                  0x0051-0x0055
+ * POLY1305  3                  0x0057-0x005B
+ * CHACHAPOLY 2 0x0054-0x0056
+ *
+ * High-level module nr (3 bits - 0x0...-0x7...)
+ * Name      ID  Nr of Errors
+ * PEM       1   9
+ * PKCS#12   1   4 (Started from top)
+ * X509      2   20
+ * PKCS5     2   4 (Started from top)
+ * DHM       3   11
+ * PK        3   15 (Started from top)
+ * RSA       4   11
+ * ECP       4   9 (Started from top)
+ * MD        5   5
+ * HKDF      5   1 (Started from top)
+ * CIPHER    6   8
+ * SSL       6   22 (Started from top)
+ * SSL       7   31
+ *
+ * Module dependent error code (5 bits 0x.00.-0x.F8.)
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \brief Translate a mbed TLS error code into a string representation,
+ *        Result is truncated if necessary and always includes a terminating
+ *        null byte.
+ *
+ * \param errnum    error code
+ * \param buffer    buffer to place representation in
+ * \param buflen    length of the buffer
+ */
+void mbedtls_strerror( int errnum, char *buffer, size_t buflen );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* error.h */
diff --git a/common/mbedtls/md.c b/common/mbedtls/md.c
new file mode 100644
index 000000000..0530621b0
--- /dev/null
+++ b/common/mbedtls/md.c
@@ -0,0 +1,477 @@
+/**
+ * \file mbedtls_md.c
+ *
+ * \brief Generic message digest wrapper for mbed TLS
+ *
+ * \author Adriaan de Jong <dejong@fox-it.com>
+ *
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "mbedtls/config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#if defined(MBEDTLS_MD_C)
+
+#include "mbedtls/md.h"
+#include "mbedtls/md_internal.h"
+#include "mbedtls/platform_util.h"
+
+#if defined(MBEDTLS_PLATFORM_C)
+#include "mbedtls/platform.h"
+#else
+#include <stdlib.h>
+#define mbedtls_calloc    calloc
+#define mbedtls_free       free
+#endif
+
+#include <string.h>
+
+#if defined(MBEDTLS_FS_IO)
+#include <stdio.h>
+#endif
+
+/*
+ * Reminder: update profiles in x509_crt.c when adding a new hash!
+ */
+static const int supported_digests[] = {
+
+#if defined(MBEDTLS_SHA512_C)
+        MBEDTLS_MD_SHA512,
+        MBEDTLS_MD_SHA384,
+#endif
+
+#if defined(MBEDTLS_SHA256_C)
+        MBEDTLS_MD_SHA256,
+        MBEDTLS_MD_SHA224,
+#endif
+
+#if defined(MBEDTLS_SHA1_C)
+        MBEDTLS_MD_SHA1,
+#endif
+
+#if defined(MBEDTLS_RIPEMD160_C)
+        MBEDTLS_MD_RIPEMD160,
+#endif
+
+#if defined(MBEDTLS_MD5_C)
+        MBEDTLS_MD_MD5,
+#endif
+
+#if defined(MBEDTLS_MD4_C)
+        MBEDTLS_MD_MD4,
+#endif
+
+#if defined(MBEDTLS_MD2_C)
+        MBEDTLS_MD_MD2,
+#endif
+
+        MBEDTLS_MD_NONE
+};
+
+const int *mbedtls_md_list( void )
+{
+    return( supported_digests );
+}
+
+const mbedtls_md_info_t *mbedtls_md_info_from_string( const char *md_name )
+{
+    if( NULL == md_name )
+        return( NULL );
+
+    /* Get the appropriate digest information */
+#if defined(MBEDTLS_MD2_C)
+    if( !strcmp( "MD2", md_name ) )
+        return mbedtls_md_info_from_type( MBEDTLS_MD_MD2 );
+#endif
+#if defined(MBEDTLS_MD4_C)
+    if( !strcmp( "MD4", md_name ) )
+        return mbedtls_md_info_from_type( MBEDTLS_MD_MD4 );
+#endif
+#if defined(MBEDTLS_MD5_C)
+    if( !strcmp( "MD5", md_name ) )
+        return mbedtls_md_info_from_type( MBEDTLS_MD_MD5 );
+#endif
+#if defined(MBEDTLS_RIPEMD160_C)
+    if( !strcmp( "RIPEMD160", md_name ) )
+        return mbedtls_md_info_from_type( MBEDTLS_MD_RIPEMD160 );
+#endif
+#if defined(MBEDTLS_SHA1_C)
+    if( !strcmp( "SHA1", md_name ) || !strcmp( "SHA", md_name ) )
+        return mbedtls_md_info_from_type( MBEDTLS_MD_SHA1 );
+#endif
+#if defined(MBEDTLS_SHA256_C)
+    if( !strcmp( "SHA224", md_name ) )
+        return mbedtls_md_info_from_type( MBEDTLS_MD_SHA224 );
+    if( !strcmp( "SHA256", md_name ) )
+        return mbedtls_md_info_from_type( MBEDTLS_MD_SHA256 );
+#endif
+#if defined(MBEDTLS_SHA512_C)
+    if( !strcmp( "SHA384", md_name ) )
+        return mbedtls_md_info_from_type( MBEDTLS_MD_SHA384 );
+    if( !strcmp( "SHA512", md_name ) )
+        return mbedtls_md_info_from_type( MBEDTLS_MD_SHA512 );
+#endif
+    return( NULL );
+}
+
+const mbedtls_md_info_t *mbedtls_md_info_from_type( mbedtls_md_type_t md_type )
+{
+    switch( md_type )
+    {
+#if defined(MBEDTLS_MD2_C)
+        case MBEDTLS_MD_MD2:
+            return( &mbedtls_md2_info );
+#endif
+#if defined(MBEDTLS_MD4_C)
+        case MBEDTLS_MD_MD4:
+            return( &mbedtls_md4_info );
+#endif
+#if defined(MBEDTLS_MD5_C)
+        case MBEDTLS_MD_MD5:
+            return( &mbedtls_md5_info );
+#endif
+#if defined(MBEDTLS_RIPEMD160_C)
+        case MBEDTLS_MD_RIPEMD160:
+            return( &mbedtls_ripemd160_info );
+#endif
+#if defined(MBEDTLS_SHA1_C)
+        case MBEDTLS_MD_SHA1:
+            return( &mbedtls_sha1_info );
+#endif
+#if defined(MBEDTLS_SHA256_C)
+        case MBEDTLS_MD_SHA224:
+            return( &mbedtls_sha224_info );
+        case MBEDTLS_MD_SHA256:
+            return( &mbedtls_sha256_info );
+#endif
+#if defined(MBEDTLS_SHA512_C)
+        case MBEDTLS_MD_SHA384:
+            return( &mbedtls_sha384_info );
+        case MBEDTLS_MD_SHA512:
+            return( &mbedtls_sha512_info );
+#endif
+        default:
+            return( NULL );
+    }
+}
+
+void mbedtls_md_init( mbedtls_md_context_t *ctx )
+{
+    memset( ctx, 0, sizeof( mbedtls_md_context_t ) );
+}
+
+void mbedtls_md_free( mbedtls_md_context_t *ctx )
+{
+    if( ctx == NULL || ctx->md_info == NULL )
+        return;
+
+    if( ctx->md_ctx != NULL )
+        ctx->md_info->ctx_free_func( ctx->md_ctx );
+
+    if( ctx->hmac_ctx != NULL )
+    {
+        mbedtls_platform_zeroize( ctx->hmac_ctx,
+                                  2 * ctx->md_info->block_size );
+        mbedtls_free( ctx->hmac_ctx );
+    }
+
+    mbedtls_platform_zeroize( ctx, sizeof( mbedtls_md_context_t ) );
+}
+
+int mbedtls_md_clone( mbedtls_md_context_t *dst,
+                      const mbedtls_md_context_t *src )
+{
+    if( dst == NULL || dst->md_info == NULL ||
+        src == NULL || src->md_info == NULL ||
+        dst->md_info != src->md_info )
+    {
+        return( MBEDTLS_ERR_MD_BAD_INPUT_DATA );
+    }
+
+    dst->md_info->clone_func( dst->md_ctx, src->md_ctx );
+
+    return( 0 );
+}
+
+#if ! defined(MBEDTLS_DEPRECATED_REMOVED)
+int mbedtls_md_init_ctx( mbedtls_md_context_t *ctx, const mbedtls_md_info_t *md_info )
+{
+    return mbedtls_md_setup( ctx, md_info, 1 );
+}
+#endif
+
+int mbedtls_md_setup( mbedtls_md_context_t *ctx, const mbedtls_md_info_t *md_info, int hmac )
+{
+    if( md_info == NULL || ctx == NULL )
+        return( MBEDTLS_ERR_MD_BAD_INPUT_DATA );
+
+    if( ( ctx->md_ctx = md_info->ctx_alloc_func() ) == NULL )
+        return( MBEDTLS_ERR_MD_ALLOC_FAILED );
+
+    if( hmac != 0 )
+    {
+        ctx->hmac_ctx = mbedtls_calloc( 2, md_info->block_size );
+        if( ctx->hmac_ctx == NULL )
+        {
+            md_info->ctx_free_func( ctx->md_ctx );
+            return( MBEDTLS_ERR_MD_ALLOC_FAILED );
+        }
+    }
+
+    ctx->md_info = md_info;
+
+    return( 0 );
+}
+
+int mbedtls_md_starts( mbedtls_md_context_t *ctx )
+{
+    if( ctx == NULL || ctx->md_info == NULL )
+        return( MBEDTLS_ERR_MD_BAD_INPUT_DATA );
+
+    return( ctx->md_info->starts_func( ctx->md_ctx ) );
+}
+
+int mbedtls_md_update( mbedtls_md_context_t *ctx, const unsigned char *input, size_t ilen )
+{
+    if( ctx == NULL || ctx->md_info == NULL )
+        return( MBEDTLS_ERR_MD_BAD_INPUT_DATA );
+
+    return( ctx->md_info->update_func( ctx->md_ctx, input, ilen ) );
+}
+
+int mbedtls_md_finish( mbedtls_md_context_t *ctx, unsigned char *output )
+{
+    if( ctx == NULL || ctx->md_info == NULL )
+        return( MBEDTLS_ERR_MD_BAD_INPUT_DATA );
+
+    return( ctx->md_info->finish_func( ctx->md_ctx, output ) );
+}
+
+int mbedtls_md( const mbedtls_md_info_t *md_info, const unsigned char *input, size_t ilen,
+            unsigned char *output )
+{
+    if( md_info == NULL )
+        return( MBEDTLS_ERR_MD_BAD_INPUT_DATA );
+
+    return( md_info->digest_func( input, ilen, output ) );
+}
+
+#if defined(MBEDTLS_FS_IO)
+int mbedtls_md_file( const mbedtls_md_info_t *md_info, const char *path, unsigned char *output )
+{
+    int ret;
+    FILE *f;
+    size_t n;
+    mbedtls_md_context_t ctx;
+    unsigned char buf[1024];
+
+    if( md_info == NULL )
+        return( MBEDTLS_ERR_MD_BAD_INPUT_DATA );
+
+    if( ( f = fopen( path, "rb" ) ) == NULL )
+        return( MBEDTLS_ERR_MD_FILE_IO_ERROR );
+
+    mbedtls_md_init( &ctx );
+
+    if( ( ret = mbedtls_md_setup( &ctx, md_info, 0 ) ) != 0 )
+        goto cleanup;
+
+    if( ( ret = md_info->starts_func( ctx.md_ctx ) ) != 0 )
+        goto cleanup;
+
+    while( ( n = fread( buf, 1, sizeof( buf ), f ) ) > 0 )
+        if( ( ret = md_info->update_func( ctx.md_ctx, buf, n ) ) != 0 )
+            goto cleanup;
+
+    if( ferror( f ) != 0 )
+        ret = MBEDTLS_ERR_MD_FILE_IO_ERROR;
+    else
+        ret = md_info->finish_func( ctx.md_ctx, output );
+
+cleanup:
+    mbedtls_platform_zeroize( buf, sizeof( buf ) );
+    fclose( f );
+    mbedtls_md_free( &ctx );
+
+    return( ret );
+}
+#endif /* MBEDTLS_FS_IO */
+
+int mbedtls_md_hmac_starts( mbedtls_md_context_t *ctx, const unsigned char *key, size_t keylen )
+{
+    int ret;
+    unsigned char sum[MBEDTLS_MD_MAX_SIZE];
+    unsigned char *ipad, *opad;
+    size_t i;
+
+    if( ctx == NULL || ctx->md_info == NULL || ctx->hmac_ctx == NULL )
+        return( MBEDTLS_ERR_MD_BAD_INPUT_DATA );
+
+    if( keylen > (size_t) ctx->md_info->block_size )
+    {
+        if( ( ret = ctx->md_info->starts_func( ctx->md_ctx ) ) != 0 )
+            goto cleanup;
+        if( ( ret = ctx->md_info->update_func( ctx->md_ctx, key, keylen ) ) != 0 )
+            goto cleanup;
+        if( ( ret = ctx->md_info->finish_func( ctx->md_ctx, sum ) ) != 0 )
+            goto cleanup;
+
+        keylen = ctx->md_info->size;
+        key = sum;
+    }
+
+    ipad = (unsigned char *) ctx->hmac_ctx;
+    opad = (unsigned char *) ctx->hmac_ctx + ctx->md_info->block_size;
+
+    memset( ipad, 0x36, ctx->md_info->block_size );
+    memset( opad, 0x5C, ctx->md_info->block_size );
+
+    for( i = 0; i < keylen; i++ )
+    {
+        ipad[i] = (unsigned char)( ipad[i] ^ key[i] );
+        opad[i] = (unsigned char)( opad[i] ^ key[i] );
+    }
+
+    if( ( ret = ctx->md_info->starts_func( ctx->md_ctx ) ) != 0 )
+        goto cleanup;
+    if( ( ret = ctx->md_info->update_func( ctx->md_ctx, ipad,
+                                           ctx->md_info->block_size ) ) != 0 )
+        goto cleanup;
+
+cleanup:
+    mbedtls_platform_zeroize( sum, sizeof( sum ) );
+
+    return( ret );
+}
+
+int mbedtls_md_hmac_update( mbedtls_md_context_t *ctx, const unsigned char *input, size_t ilen )
+{
+    if( ctx == NULL || ctx->md_info == NULL || ctx->hmac_ctx == NULL )
+        return( MBEDTLS_ERR_MD_BAD_INPUT_DATA );
+
+    return( ctx->md_info->update_func( ctx->md_ctx, input, ilen ) );
+}
+
+int mbedtls_md_hmac_finish( mbedtls_md_context_t *ctx, unsigned char *output )
+{
+    int ret;
+    unsigned char tmp[MBEDTLS_MD_MAX_SIZE];
+    unsigned char *opad;
+
+    if( ctx == NULL || ctx->md_info == NULL || ctx->hmac_ctx == NULL )
+        return( MBEDTLS_ERR_MD_BAD_INPUT_DATA );
+
+    opad = (unsigned char *) ctx->hmac_ctx + ctx->md_info->block_size;
+
+    if( ( ret = ctx->md_info->finish_func( ctx->md_ctx, tmp ) ) != 0 )
+        return( ret );
+    if( ( ret = ctx->md_info->starts_func( ctx->md_ctx ) ) != 0 )
+        return( ret );
+    if( ( ret = ctx->md_info->update_func( ctx->md_ctx, opad,
+                                           ctx->md_info->block_size ) ) != 0 )
+        return( ret );
+    if( ( ret = ctx->md_info->update_func( ctx->md_ctx, tmp,
+                                           ctx->md_info->size ) ) != 0 )
+        return( ret );
+    return( ctx->md_info->finish_func( ctx->md_ctx, output ) );
+}
+
+int mbedtls_md_hmac_reset( mbedtls_md_context_t *ctx )
+{
+    int ret;
+    unsigned char *ipad;
+
+    if( ctx == NULL || ctx->md_info == NULL || ctx->hmac_ctx == NULL )
+        return( MBEDTLS_ERR_MD_BAD_INPUT_DATA );
+
+    ipad = (unsigned char *) ctx->hmac_ctx;
+
+    if( ( ret = ctx->md_info->starts_func( ctx->md_ctx ) ) != 0 )
+        return( ret );
+    return( ctx->md_info->update_func( ctx->md_ctx, ipad,
+                                       ctx->md_info->block_size ) );
+}
+
+int mbedtls_md_hmac( const mbedtls_md_info_t *md_info,
+                     const unsigned char *key, size_t keylen,
+                     const unsigned char *input, size_t ilen,
+                     unsigned char *output )
+{
+    mbedtls_md_context_t ctx;
+    int ret;
+
+    if( md_info == NULL )
+        return( MBEDTLS_ERR_MD_BAD_INPUT_DATA );
+
+    mbedtls_md_init( &ctx );
+
+    if( ( ret = mbedtls_md_setup( &ctx, md_info, 1 ) ) != 0 )
+        goto cleanup;
+
+    if( ( ret = mbedtls_md_hmac_starts( &ctx, key, keylen ) ) != 0 )
+        goto cleanup;
+    if( ( ret = mbedtls_md_hmac_update( &ctx, input, ilen ) ) != 0 )
+        goto cleanup;
+    if( ( ret = mbedtls_md_hmac_finish( &ctx, output ) ) != 0 )
+        goto cleanup;
+
+cleanup:
+    mbedtls_md_free( &ctx );
+
+    return( ret );
+}
+
+int mbedtls_md_process( mbedtls_md_context_t *ctx, const unsigned char *data )
+{
+    if( ctx == NULL || ctx->md_info == NULL )
+        return( MBEDTLS_ERR_MD_BAD_INPUT_DATA );
+
+    return( ctx->md_info->process_func( ctx->md_ctx, data ) );
+}
+
+unsigned char mbedtls_md_get_size( const mbedtls_md_info_t *md_info )
+{
+    if( md_info == NULL )
+        return( 0 );
+
+    return md_info->size;
+}
+
+mbedtls_md_type_t mbedtls_md_get_type( const mbedtls_md_info_t *md_info )
+{
+    if( md_info == NULL )
+        return( MBEDTLS_MD_NONE );
+
+    return md_info->type;
+}
+
+const char *mbedtls_md_get_name( const mbedtls_md_info_t *md_info )
+{
+    if( md_info == NULL )
+        return( NULL );
+
+    return md_info->name;
+}
+
+#endif /* MBEDTLS_MD_C */
diff --git a/common/mbedtls/md.h b/common/mbedtls/md.h
new file mode 100644
index 000000000..797d5ff3e
--- /dev/null
+++ b/common/mbedtls/md.h
@@ -0,0 +1,468 @@
+ /**
+ * \file md.h
+ *
+ * \brief This file contains the generic message-digest wrapper.
+ *
+ * \author Adriaan de Jong <dejong@fox-it.com>
+ */
+/*
+ *  Copyright (C) 2006-2018, Arm Limited (or its affiliates), All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of Mbed TLS (https://tls.mbed.org)
+ */
+
+#ifndef MBEDTLS_MD_H
+#define MBEDTLS_MD_H
+
+#include <stddef.h>
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#define MBEDTLS_ERR_MD_FEATURE_UNAVAILABLE                -0x5080  /**< The selected feature is not available. */
+#define MBEDTLS_ERR_MD_BAD_INPUT_DATA                     -0x5100  /**< Bad input parameters to function. */
+#define MBEDTLS_ERR_MD_ALLOC_FAILED                       -0x5180  /**< Failed to allocate memory. */
+#define MBEDTLS_ERR_MD_FILE_IO_ERROR                      -0x5200  /**< Opening or reading of file failed. */
+#define MBEDTLS_ERR_MD_HW_ACCEL_FAILED                    -0x5280  /**< MD hardware accelerator failed. */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \brief     Supported message digests.
+ *
+ * \warning   MD2, MD4, MD5 and SHA-1 are considered weak message digests and
+ *            their use constitutes a security risk. We recommend considering
+ *            stronger message digests instead.
+ *
+ */
+typedef enum {
+    MBEDTLS_MD_NONE=0,    /**< None. */
+    MBEDTLS_MD_MD2,       /**< The MD2 message digest. */
+    MBEDTLS_MD_MD4,       /**< The MD4 message digest. */
+    MBEDTLS_MD_MD5,       /**< The MD5 message digest. */
+    MBEDTLS_MD_SHA1,      /**< The SHA-1 message digest. */
+    MBEDTLS_MD_SHA224,    /**< The SHA-224 message digest. */
+    MBEDTLS_MD_SHA256,    /**< The SHA-256 message digest. */
+    MBEDTLS_MD_SHA384,    /**< The SHA-384 message digest. */
+    MBEDTLS_MD_SHA512,    /**< The SHA-512 message digest. */
+    MBEDTLS_MD_RIPEMD160, /**< The RIPEMD-160 message digest. */
+} mbedtls_md_type_t;
+
+#if defined(MBEDTLS_SHA512_C)
+#define MBEDTLS_MD_MAX_SIZE         64  /* longest known is SHA512 */
+#else
+#define MBEDTLS_MD_MAX_SIZE         32  /* longest known is SHA256 or less */
+#endif
+
+/**
+ * Opaque struct defined in md_internal.h.
+ */
+typedef struct mbedtls_md_info_t mbedtls_md_info_t;
+
+/**
+ * The generic message-digest context.
+ */
+typedef struct mbedtls_md_context_t
+{
+    /** Information about the associated message digest. */
+    const mbedtls_md_info_t *md_info;
+
+    /** The digest-specific context. */
+    void *md_ctx;
+
+    /** The HMAC part of the context. */
+    void *hmac_ctx;
+} mbedtls_md_context_t;
+
+/**
+ * \brief           This function returns the list of digests supported by the
+ *                  generic digest module.
+ *
+ * \return          A statically allocated array of digests. Each element
+ *                  in the returned list is an integer belonging to the
+ *                  message-digest enumeration #mbedtls_md_type_t.
+ *                  The last entry is 0.
+ */
+const int *mbedtls_md_list( void );
+
+/**
+ * \brief           This function returns the message-digest information
+ *                  associated with the given digest name.
+ *
+ * \param md_name   The name of the digest to search for.
+ *
+ * \return          The message-digest information associated with \p md_name.
+ * \return          NULL if the associated message-digest information is not found.
+ */
+const mbedtls_md_info_t *mbedtls_md_info_from_string( const char *md_name );
+
+/**
+ * \brief           This function returns the message-digest information
+ *                  associated with the given digest type.
+ *
+ * \param md_type   The type of digest to search for.
+ *
+ * \return          The message-digest information associated with \p md_type.
+ * \return          NULL if the associated message-digest information is not found.
+ */
+const mbedtls_md_info_t *mbedtls_md_info_from_type( mbedtls_md_type_t md_type );
+
+/**
+ * \brief           This function initializes a message-digest context without
+ *                  binding it to a particular message-digest algorithm.
+ *
+ *                  This function should always be called first. It prepares the
+ *                  context for mbedtls_md_setup() for binding it to a
+ *                  message-digest algorithm.
+ */
+void mbedtls_md_init( mbedtls_md_context_t *ctx );
+
+/**
+ * \brief           This function clears the internal structure of \p ctx and
+ *                  frees any embedded internal structure, but does not free
+ *                  \p ctx itself.
+ *
+ *                  If you have called mbedtls_md_setup() on \p ctx, you must
+ *                  call mbedtls_md_free() when you are no longer using the
+ *                  context.
+ *                  Calling this function if you have previously
+ *                  called mbedtls_md_init() and nothing else is optional.
+ *                  You must not call this function if you have not called
+ *                  mbedtls_md_init().
+ */
+void mbedtls_md_free( mbedtls_md_context_t *ctx );
+
+#if ! defined(MBEDTLS_DEPRECATED_REMOVED)
+#if defined(MBEDTLS_DEPRECATED_WARNING)
+#define MBEDTLS_DEPRECATED    __attribute__((deprecated))
+#else
+#define MBEDTLS_DEPRECATED
+#endif
+/**
+ * \brief           This function selects the message digest algorithm to use,
+ *                  and allocates internal structures.
+ *
+ *                  It should be called after mbedtls_md_init() or mbedtls_md_free().
+ *                  Makes it necessary to call mbedtls_md_free() later.
+ *
+ * \deprecated      Superseded by mbedtls_md_setup() in 2.0.0
+ *
+ * \param ctx       The context to set up.
+ * \param md_info   The information structure of the message-digest algorithm
+ *                  to use.
+ *
+ * \return          \c 0 on success.
+ * \return          #MBEDTLS_ERR_MD_BAD_INPUT_DATA on parameter-verification
+ *                  failure.
+ * \return          #MBEDTLS_ERR_MD_ALLOC_FAILED on memory-allocation failure.
+ */
+int mbedtls_md_init_ctx( mbedtls_md_context_t *ctx, const mbedtls_md_info_t *md_info ) MBEDTLS_DEPRECATED;
+#undef MBEDTLS_DEPRECATED
+#endif /* MBEDTLS_DEPRECATED_REMOVED */
+
+/**
+ * \brief           This function selects the message digest algorithm to use,
+ *                  and allocates internal structures.
+ *
+ *                  It should be called after mbedtls_md_init() or
+ *                  mbedtls_md_free(). Makes it necessary to call
+ *                  mbedtls_md_free() later.
+ *
+ * \param ctx       The context to set up.
+ * \param md_info   The information structure of the message-digest algorithm
+ *                  to use.
+ * \param hmac      Defines if HMAC is used. 0: HMAC is not used (saves some memory),
+ *                  or non-zero: HMAC is used with this context.
+ *
+ * \return          \c 0 on success.
+ * \return          #MBEDTLS_ERR_MD_BAD_INPUT_DATA on parameter-verification
+ *                  failure.
+ * \return          #MBEDTLS_ERR_MD_ALLOC_FAILED on memory-allocation failure.
+ */
+int mbedtls_md_setup( mbedtls_md_context_t *ctx, const mbedtls_md_info_t *md_info, int hmac );
+
+/**
+ * \brief           This function clones the state of an message-digest
+ *                  context.
+ *
+ * \note            You must call mbedtls_md_setup() on \c dst before calling
+ *                  this function.
+ *
+ * \note            The two contexts must have the same type,
+ *                  for example, both are SHA-256.
+ *
+ * \warning         This function clones the message-digest state, not the
+ *                  HMAC state.
+ *
+ * \param dst       The destination context.
+ * \param src       The context to be cloned.
+ *
+ * \return          \c 0 on success.
+ * \return          #MBEDTLS_ERR_MD_BAD_INPUT_DATA on parameter-verification failure.
+ */
+int mbedtls_md_clone( mbedtls_md_context_t *dst,
+                      const mbedtls_md_context_t *src );
+
+/**
+ * \brief           This function extracts the message-digest size from the
+ *                  message-digest information structure.
+ *
+ * \param md_info   The information structure of the message-digest algorithm
+ *                  to use.
+ *
+ * \return          The size of the message-digest output in Bytes.
+ */
+unsigned char mbedtls_md_get_size( const mbedtls_md_info_t *md_info );
+
+/**
+ * \brief           This function extracts the message-digest type from the
+ *                  message-digest information structure.
+ *
+ * \param md_info   The information structure of the message-digest algorithm
+ *                  to use.
+ *
+ * \return          The type of the message digest.
+ */
+mbedtls_md_type_t mbedtls_md_get_type( const mbedtls_md_info_t *md_info );
+
+/**
+ * \brief           This function extracts the message-digest name from the
+ *                  message-digest information structure.
+ *
+ * \param md_info   The information structure of the message-digest algorithm
+ *                  to use.
+ *
+ * \return          The name of the message digest.
+ */
+const char *mbedtls_md_get_name( const mbedtls_md_info_t *md_info );
+
+/**
+ * \brief           This function starts a message-digest computation.
+ *
+ *                  You must call this function after setting up the context
+ *                  with mbedtls_md_setup(), and before passing data with
+ *                  mbedtls_md_update().
+ *
+ * \param ctx       The generic message-digest context.
+ *
+ * \return          \c 0 on success.
+ * \return          #MBEDTLS_ERR_MD_BAD_INPUT_DATA on parameter-verification
+ *                  failure.
+ */
+int mbedtls_md_starts( mbedtls_md_context_t *ctx );
+
+/**
+ * \brief           This function feeds an input buffer into an ongoing
+ *                  message-digest computation.
+ *
+ *                  You must call mbedtls_md_starts() before calling this
+ *                  function. You may call this function multiple times.
+ *                  Afterwards, call mbedtls_md_finish().
+ *
+ * \param ctx       The generic message-digest context.
+ * \param input     The buffer holding the input data.
+ * \param ilen      The length of the input data.
+ *
+ * \return          \c 0 on success.
+ * \return          #MBEDTLS_ERR_MD_BAD_INPUT_DATA on parameter-verification
+ *                  failure.
+ */
+int mbedtls_md_update( mbedtls_md_context_t *ctx, const unsigned char *input, size_t ilen );
+
+/**
+ * \brief           This function finishes the digest operation,
+ *                  and writes the result to the output buffer.
+ *
+ *                  Call this function after a call to mbedtls_md_starts(),
+ *                  followed by any number of calls to mbedtls_md_update().
+ *                  Afterwards, you may either clear the context with
+ *                  mbedtls_md_free(), or call mbedtls_md_starts() to reuse
+ *                  the context for another digest operation with the same
+ *                  algorithm.
+ *
+ * \param ctx       The generic message-digest context.
+ * \param output    The buffer for the generic message-digest checksum result.
+ *
+ * \return          \c 0 on success.
+ * \return          #MBEDTLS_ERR_MD_BAD_INPUT_DATA on parameter-verification
+ *                  failure.
+ */
+int mbedtls_md_finish( mbedtls_md_context_t *ctx, unsigned char *output );
+
+/**
+ * \brief          This function calculates the message-digest of a buffer,
+ *                 with respect to a configurable message-digest algorithm
+ *                 in a single call.
+ *
+ *                 The result is calculated as
+ *                 Output = message_digest(input buffer).
+ *
+ * \param md_info  The information structure of the message-digest algorithm
+ *                 to use.
+ * \param input    The buffer holding the data.
+ * \param ilen     The length of the input data.
+ * \param output   The generic message-digest checksum result.
+ *
+ * \return         \c 0 on success.
+ * \return         #MBEDTLS_ERR_MD_BAD_INPUT_DATA on parameter-verification
+ *                 failure.
+ */
+int mbedtls_md( const mbedtls_md_info_t *md_info, const unsigned char *input, size_t ilen,
+        unsigned char *output );
+
+#if defined(MBEDTLS_FS_IO)
+/**
+ * \brief          This function calculates the message-digest checksum
+ *                 result of the contents of the provided file.
+ *
+ *                 The result is calculated as
+ *                 Output = message_digest(file contents).
+ *
+ * \param md_info  The information structure of the message-digest algorithm
+ *                 to use.
+ * \param path     The input file name.
+ * \param output   The generic message-digest checksum result.
+ *
+ * \return         \c 0 on success.
+ * \return         #MBEDTLS_ERR_MD_FILE_IO_ERROR on an I/O error accessing
+ *                 the file pointed by \p path.
+ * \return         #MBEDTLS_ERR_MD_BAD_INPUT_DATA if \p md_info was NULL.
+ */
+int mbedtls_md_file( const mbedtls_md_info_t *md_info, const char *path,
+                     unsigned char *output );
+#endif /* MBEDTLS_FS_IO */
+
+/**
+ * \brief           This function sets the HMAC key and prepares to
+ *                  authenticate a new message.
+ *
+ *                  Call this function after mbedtls_md_setup(), to use
+ *                  the MD context for an HMAC calculation, then call
+ *                  mbedtls_md_hmac_update() to provide the input data, and
+ *                  mbedtls_md_hmac_finish() to get the HMAC value.
+ *
+ * \param ctx       The message digest context containing an embedded HMAC
+ *                  context.
+ * \param key       The HMAC secret key.
+ * \param keylen    The length of the HMAC key in Bytes.
+ *
+ * \return          \c 0 on success.
+ * \return          #MBEDTLS_ERR_MD_BAD_INPUT_DATA on parameter-verification
+ *                  failure.
+ */
+int mbedtls_md_hmac_starts( mbedtls_md_context_t *ctx, const unsigned char *key,
+                    size_t keylen );
+
+/**
+ * \brief           This function feeds an input buffer into an ongoing HMAC
+ *                  computation.
+ *
+ *                  Call mbedtls_md_hmac_starts() or mbedtls_md_hmac_reset()
+ *                  before calling this function.
+ *                  You may call this function multiple times to pass the
+ *                  input piecewise.
+ *                  Afterwards, call mbedtls_md_hmac_finish().
+ *
+ * \param ctx       The message digest context containing an embedded HMAC
+ *                  context.
+ * \param input     The buffer holding the input data.
+ * \param ilen      The length of the input data.
+ *
+ * \return          \c 0 on success.
+ * \return          #MBEDTLS_ERR_MD_BAD_INPUT_DATA on parameter-verification
+ *                  failure.
+ */
+int mbedtls_md_hmac_update( mbedtls_md_context_t *ctx, const unsigned char *input,
+                    size_t ilen );
+
+/**
+ * \brief           This function finishes the HMAC operation, and writes
+ *                  the result to the output buffer.
+ *
+ *                  Call this function after mbedtls_md_hmac_starts() and
+ *                  mbedtls_md_hmac_update() to get the HMAC value. Afterwards
+ *                  you may either call mbedtls_md_free() to clear the context,
+ *                  or call mbedtls_md_hmac_reset() to reuse the context with
+ *                  the same HMAC key.
+ *
+ * \param ctx       The message digest context containing an embedded HMAC
+ *                  context.
+ * \param output    The generic HMAC checksum result.
+ *
+ * \return          \c 0 on success.
+ * \return          #MBEDTLS_ERR_MD_BAD_INPUT_DATA on parameter-verification
+ *                  failure.
+ */
+int mbedtls_md_hmac_finish( mbedtls_md_context_t *ctx, unsigned char *output);
+
+/**
+ * \brief           This function prepares to authenticate a new message with
+ *                  the same key as the previous HMAC operation.
+ *
+ *                  You may call this function after mbedtls_md_hmac_finish().
+ *                  Afterwards call mbedtls_md_hmac_update() to pass the new
+ *                  input.
+ *
+ * \param ctx       The message digest context containing an embedded HMAC
+ *                  context.
+ *
+ * \return          \c 0 on success.
+ * \return          #MBEDTLS_ERR_MD_BAD_INPUT_DATA on parameter-verification
+ *                  failure.
+ */
+int mbedtls_md_hmac_reset( mbedtls_md_context_t *ctx );
+
+/**
+ * \brief          This function calculates the full generic HMAC
+ *                 on the input buffer with the provided key.
+ *
+ *                 The function allocates the context, performs the
+ *                 calculation, and frees the context.
+ *
+ *                 The HMAC result is calculated as
+ *                 output = generic HMAC(hmac key, input buffer).
+ *
+ * \param md_info  The information structure of the message-digest algorithm
+ *                 to use.
+ * \param key      The HMAC secret key.
+ * \param keylen   The length of the HMAC secret key in Bytes.
+ * \param input    The buffer holding the input data.
+ * \param ilen     The length of the input data.
+ * \param output   The generic HMAC result.
+ *
+ * \return         \c 0 on success.
+ * \return         #MBEDTLS_ERR_MD_BAD_INPUT_DATA on parameter-verification
+ *                 failure.
+ */
+int mbedtls_md_hmac( const mbedtls_md_info_t *md_info, const unsigned char *key, size_t keylen,
+                const unsigned char *input, size_t ilen,
+                unsigned char *output );
+
+/* Internal use */
+int mbedtls_md_process( mbedtls_md_context_t *ctx, const unsigned char *data );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* MBEDTLS_MD_H */
diff --git a/common/mbedtls/md5.c b/common/mbedtls/md5.c
new file mode 100644
index 000000000..e0b4c768b
--- /dev/null
+++ b/common/mbedtls/md5.c
@@ -0,0 +1,497 @@
+/*
+ *  RFC 1321 compliant MD5 implementation
+ *
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+/*
+ *  The MD5 algorithm was designed by Ron Rivest in 1991.
+ *
+ *  http://www.ietf.org/rfc/rfc1321.txt
+ */
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "mbedtls/config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#if defined(MBEDTLS_MD5_C)
+
+#include "mbedtls/md5.h"
+#include "mbedtls/platform_util.h"
+
+#include <string.h>
+
+#if defined(MBEDTLS_SELF_TEST)
+#if defined(MBEDTLS_PLATFORM_C)
+#include "mbedtls/platform.h"
+#else
+#include <stdio.h>
+#define mbedtls_printf printf
+#endif /* MBEDTLS_PLATFORM_C */
+#endif /* MBEDTLS_SELF_TEST */
+
+#if !defined(MBEDTLS_MD5_ALT)
+
+/*
+ * 32-bit integer manipulation macros (little endian)
+ */
+#ifndef GET_UINT32_LE
+#define GET_UINT32_LE(n,b,i)                            \
+{                                                       \
+    (n) = ( (uint32_t) (b)[(i)    ]       )             \
+        | ( (uint32_t) (b)[(i) + 1] <<  8 )             \
+        | ( (uint32_t) (b)[(i) + 2] << 16 )             \
+        | ( (uint32_t) (b)[(i) + 3] << 24 );            \
+}
+#endif
+
+#ifndef PUT_UINT32_LE
+#define PUT_UINT32_LE(n,b,i)                                    \
+{                                                               \
+    (b)[(i)    ] = (unsigned char) ( ( (n)       ) & 0xFF );    \
+    (b)[(i) + 1] = (unsigned char) ( ( (n) >>  8 ) & 0xFF );    \
+    (b)[(i) + 2] = (unsigned char) ( ( (n) >> 16 ) & 0xFF );    \
+    (b)[(i) + 3] = (unsigned char) ( ( (n) >> 24 ) & 0xFF );    \
+}
+#endif
+
+void mbedtls_md5_init( mbedtls_md5_context *ctx )
+{
+    memset( ctx, 0, sizeof( mbedtls_md5_context ) );
+}
+
+void mbedtls_md5_free( mbedtls_md5_context *ctx )
+{
+    if( ctx == NULL )
+        return;
+
+    mbedtls_platform_zeroize( ctx, sizeof( mbedtls_md5_context ) );
+}
+
+void mbedtls_md5_clone( mbedtls_md5_context *dst,
+                        const mbedtls_md5_context *src )
+{
+    *dst = *src;
+}
+
+/*
+ * MD5 context setup
+ */
+int mbedtls_md5_starts_ret( mbedtls_md5_context *ctx )
+{
+    ctx->total[0] = 0;
+    ctx->total[1] = 0;
+
+    ctx->state[0] = 0x67452301;
+    ctx->state[1] = 0xEFCDAB89;
+    ctx->state[2] = 0x98BADCFE;
+    ctx->state[3] = 0x10325476;
+
+    return( 0 );
+}
+
+#if !defined(MBEDTLS_DEPRECATED_REMOVED)
+void mbedtls_md5_starts( mbedtls_md5_context *ctx )
+{
+    mbedtls_md5_starts_ret( ctx );
+}
+#endif
+
+#if !defined(MBEDTLS_MD5_PROCESS_ALT)
+int mbedtls_internal_md5_process( mbedtls_md5_context *ctx,
+                                  const unsigned char data[64] )
+{
+    uint32_t X[16], A, B, C, D;
+
+    GET_UINT32_LE( X[ 0], data,  0 );
+    GET_UINT32_LE( X[ 1], data,  4 );
+    GET_UINT32_LE( X[ 2], data,  8 );
+    GET_UINT32_LE( X[ 3], data, 12 );
+    GET_UINT32_LE( X[ 4], data, 16 );
+    GET_UINT32_LE( X[ 5], data, 20 );
+    GET_UINT32_LE( X[ 6], data, 24 );
+    GET_UINT32_LE( X[ 7], data, 28 );
+    GET_UINT32_LE( X[ 8], data, 32 );
+    GET_UINT32_LE( X[ 9], data, 36 );
+    GET_UINT32_LE( X[10], data, 40 );
+    GET_UINT32_LE( X[11], data, 44 );
+    GET_UINT32_LE( X[12], data, 48 );
+    GET_UINT32_LE( X[13], data, 52 );
+    GET_UINT32_LE( X[14], data, 56 );
+    GET_UINT32_LE( X[15], data, 60 );
+
+#define S(x,n) ((x << n) | ((x & 0xFFFFFFFF) >> (32 - n)))
+
+#define P(a,b,c,d,k,s,t)                                \
+{                                                       \
+    a += F(b,c,d) + X[k] + t; a = S(a,s) + b;           \
+}
+
+    A = ctx->state[0];
+    B = ctx->state[1];
+    C = ctx->state[2];
+    D = ctx->state[3];
+
+#define F(x,y,z) (z ^ (x & (y ^ z)))
+
+    P( A, B, C, D,  0,  7, 0xD76AA478 );
+    P( D, A, B, C,  1, 12, 0xE8C7B756 );
+    P( C, D, A, B,  2, 17, 0x242070DB );
+    P( B, C, D, A,  3, 22, 0xC1BDCEEE );
+    P( A, B, C, D,  4,  7, 0xF57C0FAF );
+    P( D, A, B, C,  5, 12, 0x4787C62A );
+    P( C, D, A, B,  6, 17, 0xA8304613 );
+    P( B, C, D, A,  7, 22, 0xFD469501 );
+    P( A, B, C, D,  8,  7, 0x698098D8 );
+    P( D, A, B, C,  9, 12, 0x8B44F7AF );
+    P( C, D, A, B, 10, 17, 0xFFFF5BB1 );
+    P( B, C, D, A, 11, 22, 0x895CD7BE );
+    P( A, B, C, D, 12,  7, 0x6B901122 );
+    P( D, A, B, C, 13, 12, 0xFD987193 );
+    P( C, D, A, B, 14, 17, 0xA679438E );
+    P( B, C, D, A, 15, 22, 0x49B40821 );
+
+#undef F
+
+#define F(x,y,z) (y ^ (z & (x ^ y)))
+
+    P( A, B, C, D,  1,  5, 0xF61E2562 );
+    P( D, A, B, C,  6,  9, 0xC040B340 );
+    P( C, D, A, B, 11, 14, 0x265E5A51 );
+    P( B, C, D, A,  0, 20, 0xE9B6C7AA );
+    P( A, B, C, D,  5,  5, 0xD62F105D );
+    P( D, A, B, C, 10,  9, 0x02441453 );
+    P( C, D, A, B, 15, 14, 0xD8A1E681 );
+    P( B, C, D, A,  4, 20, 0xE7D3FBC8 );
+    P( A, B, C, D,  9,  5, 0x21E1CDE6 );
+    P( D, A, B, C, 14,  9, 0xC33707D6 );
+    P( C, D, A, B,  3, 14, 0xF4D50D87 );
+    P( B, C, D, A,  8, 20, 0x455A14ED );
+    P( A, B, C, D, 13,  5, 0xA9E3E905 );
+    P( D, A, B, C,  2,  9, 0xFCEFA3F8 );
+    P( C, D, A, B,  7, 14, 0x676F02D9 );
+    P( B, C, D, A, 12, 20, 0x8D2A4C8A );
+
+#undef F
+
+#define F(x,y,z) (x ^ y ^ z)
+
+    P( A, B, C, D,  5,  4, 0xFFFA3942 );
+    P( D, A, B, C,  8, 11, 0x8771F681 );
+    P( C, D, A, B, 11, 16, 0x6D9D6122 );
+    P( B, C, D, A, 14, 23, 0xFDE5380C );
+    P( A, B, C, D,  1,  4, 0xA4BEEA44 );
+    P( D, A, B, C,  4, 11, 0x4BDECFA9 );
+    P( C, D, A, B,  7, 16, 0xF6BB4B60 );
+    P( B, C, D, A, 10, 23, 0xBEBFBC70 );
+    P( A, B, C, D, 13,  4, 0x289B7EC6 );
+    P( D, A, B, C,  0, 11, 0xEAA127FA );
+    P( C, D, A, B,  3, 16, 0xD4EF3085 );
+    P( B, C, D, A,  6, 23, 0x04881D05 );
+    P( A, B, C, D,  9,  4, 0xD9D4D039 );
+    P( D, A, B, C, 12, 11, 0xE6DB99E5 );
+    P( C, D, A, B, 15, 16, 0x1FA27CF8 );
+    P( B, C, D, A,  2, 23, 0xC4AC5665 );
+
+#undef F
+
+#define F(x,y,z) (y ^ (x | ~z))
+
+    P( A, B, C, D,  0,  6, 0xF4292244 );
+    P( D, A, B, C,  7, 10, 0x432AFF97 );
+    P( C, D, A, B, 14, 15, 0xAB9423A7 );
+    P( B, C, D, A,  5, 21, 0xFC93A039 );
+    P( A, B, C, D, 12,  6, 0x655B59C3 );
+    P( D, A, B, C,  3, 10, 0x8F0CCC92 );
+    P( C, D, A, B, 10, 15, 0xFFEFF47D );
+    P( B, C, D, A,  1, 21, 0x85845DD1 );
+    P( A, B, C, D,  8,  6, 0x6FA87E4F );
+    P( D, A, B, C, 15, 10, 0xFE2CE6E0 );
+    P( C, D, A, B,  6, 15, 0xA3014314 );
+    P( B, C, D, A, 13, 21, 0x4E0811A1 );
+    P( A, B, C, D,  4,  6, 0xF7537E82 );
+    P( D, A, B, C, 11, 10, 0xBD3AF235 );
+    P( C, D, A, B,  2, 15, 0x2AD7D2BB );
+    P( B, C, D, A,  9, 21, 0xEB86D391 );
+
+#undef F
+
+    ctx->state[0] += A;
+    ctx->state[1] += B;
+    ctx->state[2] += C;
+    ctx->state[3] += D;
+
+    return( 0 );
+}
+
+#if !defined(MBEDTLS_DEPRECATED_REMOVED)
+void mbedtls_md5_process( mbedtls_md5_context *ctx,
+                          const unsigned char data[64] )
+{
+    mbedtls_internal_md5_process( ctx, data );
+}
+#endif
+#endif /* !MBEDTLS_MD5_PROCESS_ALT */
+
+/*
+ * MD5 process buffer
+ */
+int mbedtls_md5_update_ret( mbedtls_md5_context *ctx,
+                            const unsigned char *input,
+                            size_t ilen )
+{
+    int ret;
+    size_t fill;
+    uint32_t left;
+
+    if( ilen == 0 )
+        return( 0 );
+
+    left = ctx->total[0] & 0x3F;
+    fill = 64 - left;
+
+    ctx->total[0] += (uint32_t) ilen;
+    ctx->total[0] &= 0xFFFFFFFF;
+
+    if( ctx->total[0] < (uint32_t) ilen )
+        ctx->total[1]++;
+
+    if( left && ilen >= fill )
+    {
+        memcpy( (void *) (ctx->buffer + left), input, fill );
+        if( ( ret = mbedtls_internal_md5_process( ctx, ctx->buffer ) ) != 0 )
+            return( ret );
+
+        input += fill;
+        ilen  -= fill;
+        left = 0;
+    }
+
+    while( ilen >= 64 )
+    {
+        if( ( ret = mbedtls_internal_md5_process( ctx, input ) ) != 0 )
+            return( ret );
+
+        input += 64;
+        ilen  -= 64;
+    }
+
+    if( ilen > 0 )
+    {
+        memcpy( (void *) (ctx->buffer + left), input, ilen );
+    }
+
+    return( 0 );
+}
+
+#if !defined(MBEDTLS_DEPRECATED_REMOVED)
+void mbedtls_md5_update( mbedtls_md5_context *ctx,
+                         const unsigned char *input,
+                         size_t ilen )
+{
+    mbedtls_md5_update_ret( ctx, input, ilen );
+}
+#endif
+
+/*
+ * MD5 final digest
+ */
+int mbedtls_md5_finish_ret( mbedtls_md5_context *ctx,
+                            unsigned char output[16] )
+{
+    int ret;
+    uint32_t used;
+    uint32_t high, low;
+
+    /*
+     * Add padding: 0x80 then 0x00 until 8 bytes remain for the length
+     */
+    used = ctx->total[0] & 0x3F;
+
+    ctx->buffer[used++] = 0x80;
+
+    if( used <= 56 )
+    {
+        /* Enough room for padding + length in current block */
+        memset( ctx->buffer + used, 0, 56 - used );
+    }
+    else
+    {
+        /* We'll need an extra block */
+        memset( ctx->buffer + used, 0, 64 - used );
+
+        if( ( ret = mbedtls_internal_md5_process( ctx, ctx->buffer ) ) != 0 )
+            return( ret );
+
+        memset( ctx->buffer, 0, 56 );
+    }
+
+    /*
+     * Add message length
+     */
+    high = ( ctx->total[0] >> 29 )
+         | ( ctx->total[1] <<  3 );
+    low  = ( ctx->total[0] <<  3 );
+
+    PUT_UINT32_LE( low,  ctx->buffer, 56 );
+    PUT_UINT32_LE( high, ctx->buffer, 60 );
+
+    if( ( ret = mbedtls_internal_md5_process( ctx, ctx->buffer ) ) != 0 )
+        return( ret );
+
+    /*
+     * Output final state
+     */
+    PUT_UINT32_LE( ctx->state[0], output,  0 );
+    PUT_UINT32_LE( ctx->state[1], output,  4 );
+    PUT_UINT32_LE( ctx->state[2], output,  8 );
+    PUT_UINT32_LE( ctx->state[3], output, 12 );
+
+    return( 0 );
+}
+
+#if !defined(MBEDTLS_DEPRECATED_REMOVED)
+void mbedtls_md5_finish( mbedtls_md5_context *ctx,
+                         unsigned char output[16] )
+{
+    mbedtls_md5_finish_ret( ctx, output );
+}
+#endif
+
+#endif /* !MBEDTLS_MD5_ALT */
+
+/*
+ * output = MD5( input buffer )
+ */
+int mbedtls_md5_ret( const unsigned char *input,
+                     size_t ilen,
+                     unsigned char output[16] )
+{
+    int ret;
+    mbedtls_md5_context ctx;
+
+    mbedtls_md5_init( &ctx );
+
+    if( ( ret = mbedtls_md5_starts_ret( &ctx ) ) != 0 )
+        goto exit;
+
+    if( ( ret = mbedtls_md5_update_ret( &ctx, input, ilen ) ) != 0 )
+        goto exit;
+
+    if( ( ret = mbedtls_md5_finish_ret( &ctx, output ) ) != 0 )
+        goto exit;
+
+exit:
+    mbedtls_md5_free( &ctx );
+
+    return( ret );
+}
+
+#if !defined(MBEDTLS_DEPRECATED_REMOVED)
+void mbedtls_md5( const unsigned char *input,
+                  size_t ilen,
+                  unsigned char output[16] )
+{
+    mbedtls_md5_ret( input, ilen, output );
+}
+#endif
+
+#if defined(MBEDTLS_SELF_TEST)
+/*
+ * RFC 1321 test vectors
+ */
+static const unsigned char md5_test_buf[7][81] =
+{
+    { "" },
+    { "a" },
+    { "abc" },
+    { "message digest" },
+    { "abcdefghijklmnopqrstuvwxyz" },
+    { "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789" },
+    { "12345678901234567890123456789012345678901234567890123456789012"
+      "345678901234567890" }
+};
+
+static const size_t md5_test_buflen[7] =
+{
+    0, 1, 3, 14, 26, 62, 80
+};
+
+static const unsigned char md5_test_sum[7][16] =
+{
+    { 0xD4, 0x1D, 0x8C, 0xD9, 0x8F, 0x00, 0xB2, 0x04,
+      0xE9, 0x80, 0x09, 0x98, 0xEC, 0xF8, 0x42, 0x7E },
+    { 0x0C, 0xC1, 0x75, 0xB9, 0xC0, 0xF1, 0xB6, 0xA8,
+      0x31, 0xC3, 0x99, 0xE2, 0x69, 0x77, 0x26, 0x61 },
+    { 0x90, 0x01, 0x50, 0x98, 0x3C, 0xD2, 0x4F, 0xB0,
+      0xD6, 0x96, 0x3F, 0x7D, 0x28, 0xE1, 0x7F, 0x72 },
+    { 0xF9, 0x6B, 0x69, 0x7D, 0x7C, 0xB7, 0x93, 0x8D,
+      0x52, 0x5A, 0x2F, 0x31, 0xAA, 0xF1, 0x61, 0xD0 },
+    { 0xC3, 0xFC, 0xD3, 0xD7, 0x61, 0x92, 0xE4, 0x00,
+      0x7D, 0xFB, 0x49, 0x6C, 0xCA, 0x67, 0xE1, 0x3B },
+    { 0xD1, 0x74, 0xAB, 0x98, 0xD2, 0x77, 0xD9, 0xF5,
+      0xA5, 0x61, 0x1C, 0x2C, 0x9F, 0x41, 0x9D, 0x9F },
+    { 0x57, 0xED, 0xF4, 0xA2, 0x2B, 0xE3, 0xC9, 0x55,
+      0xAC, 0x49, 0xDA, 0x2E, 0x21, 0x07, 0xB6, 0x7A }
+};
+
+/*
+ * Checkup routine
+ */
+int mbedtls_md5_self_test( int verbose )
+{
+    int i, ret = 0;
+    unsigned char md5sum[16];
+
+    for( i = 0; i < 7; i++ )
+    {
+        if( verbose != 0 )
+            mbedtls_printf( "  MD5 test #%d: ", i + 1 );
+
+        ret = mbedtls_md5_ret( md5_test_buf[i], md5_test_buflen[i], md5sum );
+        if( ret != 0 )
+            goto fail;
+
+        if( memcmp( md5sum, md5_test_sum[i], 16 ) != 0 )
+        {
+            ret = 1;
+            goto fail;
+        }
+
+        if( verbose != 0 )
+            mbedtls_printf( "passed\n" );
+    }
+
+    if( verbose != 0 )
+        mbedtls_printf( "\n" );
+
+    return( 0 );
+
+fail:
+    if( verbose != 0 )
+        mbedtls_printf( "failed\n" );
+
+    return( ret );
+}
+
+#endif /* MBEDTLS_SELF_TEST */
+
+#endif /* MBEDTLS_MD5_C */
diff --git a/common/mbedtls/md5.h b/common/mbedtls/md5.h
new file mode 100644
index 000000000..d3af51fb0
--- /dev/null
+++ b/common/mbedtls/md5.h
@@ -0,0 +1,308 @@
+/**
+ * \file md5.h
+ *
+ * \brief MD5 message digest algorithm (hash function)
+ *
+ * \warning   MD5 is considered a weak message digest and its use constitutes a
+ *            security risk. We recommend considering stronger message
+ *            digests instead.
+ */
+/*
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+#ifndef MBEDTLS_MD5_H
+#define MBEDTLS_MD5_H
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#include <stddef.h>
+#include <stdint.h>
+
+#define MBEDTLS_ERR_MD5_HW_ACCEL_FAILED                   -0x002F  /**< MD5 hardware accelerator failed */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if !defined(MBEDTLS_MD5_ALT)
+// Regular implementation
+//
+
+/**
+ * \brief          MD5 context structure
+ *
+ * \warning        MD5 is considered a weak message digest and its use
+ *                 constitutes a security risk. We recommend considering
+ *                 stronger message digests instead.
+ *
+ */
+typedef struct mbedtls_md5_context
+{
+    uint32_t total[2];          /*!< number of bytes processed  */
+    uint32_t state[4];          /*!< intermediate digest state  */
+    unsigned char buffer[64];   /*!< data block being processed */
+}
+mbedtls_md5_context;
+
+#else  /* MBEDTLS_MD5_ALT */
+#include "md5_alt.h"
+#endif /* MBEDTLS_MD5_ALT */
+
+/**
+ * \brief          Initialize MD5 context
+ *
+ * \param ctx      MD5 context to be initialized
+ *
+ * \warning        MD5 is considered a weak message digest and its use
+ *                 constitutes a security risk. We recommend considering
+ *                 stronger message digests instead.
+ *
+ */
+void mbedtls_md5_init( mbedtls_md5_context *ctx );
+
+/**
+ * \brief          Clear MD5 context
+ *
+ * \param ctx      MD5 context to be cleared
+ *
+ * \warning        MD5 is considered a weak message digest and its use
+ *                 constitutes a security risk. We recommend considering
+ *                 stronger message digests instead.
+ *
+ */
+void mbedtls_md5_free( mbedtls_md5_context *ctx );
+
+/**
+ * \brief          Clone (the state of) an MD5 context
+ *
+ * \param dst      The destination context
+ * \param src      The context to be cloned
+ *
+ * \warning        MD5 is considered a weak message digest and its use
+ *                 constitutes a security risk. We recommend considering
+ *                 stronger message digests instead.
+ *
+ */
+void mbedtls_md5_clone( mbedtls_md5_context *dst,
+                        const mbedtls_md5_context *src );
+
+/**
+ * \brief          MD5 context setup
+ *
+ * \param ctx      context to be initialized
+ *
+ * \return         0 if successful
+ *
+ * \warning        MD5 is considered a weak message digest and its use
+ *                 constitutes a security risk. We recommend considering
+ *                 stronger message digests instead.
+ *
+ */
+int mbedtls_md5_starts_ret( mbedtls_md5_context *ctx );
+
+/**
+ * \brief          MD5 process buffer
+ *
+ * \param ctx      MD5 context
+ * \param input    buffer holding the data
+ * \param ilen     length of the input data
+ *
+ * \return         0 if successful
+ *
+ * \warning        MD5 is considered a weak message digest and its use
+ *                 constitutes a security risk. We recommend considering
+ *                 stronger message digests instead.
+ *
+ */
+int mbedtls_md5_update_ret( mbedtls_md5_context *ctx,
+                            const unsigned char *input,
+                            size_t ilen );
+
+/**
+ * \brief          MD5 final digest
+ *
+ * \param ctx      MD5 context
+ * \param output   MD5 checksum result
+ *
+ * \return         0 if successful
+ *
+ * \warning        MD5 is considered a weak message digest and its use
+ *                 constitutes a security risk. We recommend considering
+ *                 stronger message digests instead.
+ *
+ */
+int mbedtls_md5_finish_ret( mbedtls_md5_context *ctx,
+                            unsigned char output[16] );
+
+/**
+ * \brief          MD5 process data block (internal use only)
+ *
+ * \param ctx      MD5 context
+ * \param data     buffer holding one block of data
+ *
+ * \return         0 if successful
+ *
+ * \warning        MD5 is considered a weak message digest and its use
+ *                 constitutes a security risk. We recommend considering
+ *                 stronger message digests instead.
+ *
+ */
+int mbedtls_internal_md5_process( mbedtls_md5_context *ctx,
+                                  const unsigned char data[64] );
+
+#if !defined(MBEDTLS_DEPRECATED_REMOVED)
+#if defined(MBEDTLS_DEPRECATED_WARNING)
+#define MBEDTLS_DEPRECATED      __attribute__((deprecated))
+#else
+#define MBEDTLS_DEPRECATED
+#endif
+/**
+ * \brief          MD5 context setup
+ *
+ * \deprecated     Superseded by mbedtls_md5_starts_ret() in 2.7.0
+ *
+ * \param ctx      context to be initialized
+ *
+ * \warning        MD5 is considered a weak message digest and its use
+ *                 constitutes a security risk. We recommend considering
+ *                 stronger message digests instead.
+ *
+ */
+MBEDTLS_DEPRECATED void mbedtls_md5_starts( mbedtls_md5_context *ctx );
+
+/**
+ * \brief          MD5 process buffer
+ *
+ * \deprecated     Superseded by mbedtls_md5_update_ret() in 2.7.0
+ *
+ * \param ctx      MD5 context
+ * \param input    buffer holding the data
+ * \param ilen     length of the input data
+ *
+ * \warning        MD5 is considered a weak message digest and its use
+ *                 constitutes a security risk. We recommend considering
+ *                 stronger message digests instead.
+ *
+ */
+MBEDTLS_DEPRECATED void mbedtls_md5_update( mbedtls_md5_context *ctx,
+                                            const unsigned char *input,
+                                            size_t ilen );
+
+/**
+ * \brief          MD5 final digest
+ *
+ * \deprecated     Superseded by mbedtls_md5_finish_ret() in 2.7.0
+ *
+ * \param ctx      MD5 context
+ * \param output   MD5 checksum result
+ *
+ * \warning        MD5 is considered a weak message digest and its use
+ *                 constitutes a security risk. We recommend considering
+ *                 stronger message digests instead.
+ *
+ */
+MBEDTLS_DEPRECATED void mbedtls_md5_finish( mbedtls_md5_context *ctx,
+                                            unsigned char output[16] );
+
+/**
+ * \brief          MD5 process data block (internal use only)
+ *
+ * \deprecated     Superseded by mbedtls_internal_md5_process() in 2.7.0
+ *
+ * \param ctx      MD5 context
+ * \param data     buffer holding one block of data
+ *
+ * \warning        MD5 is considered a weak message digest and its use
+ *                 constitutes a security risk. We recommend considering
+ *                 stronger message digests instead.
+ *
+ */
+MBEDTLS_DEPRECATED void mbedtls_md5_process( mbedtls_md5_context *ctx,
+                                             const unsigned char data[64] );
+
+#undef MBEDTLS_DEPRECATED
+#endif /* !MBEDTLS_DEPRECATED_REMOVED */
+
+/**
+ * \brief          Output = MD5( input buffer )
+ *
+ * \param input    buffer holding the data
+ * \param ilen     length of the input data
+ * \param output   MD5 checksum result
+ *
+ * \return         0 if successful
+ *
+ * \warning        MD5 is considered a weak message digest and its use
+ *                 constitutes a security risk. We recommend considering
+ *                 stronger message digests instead.
+ *
+ */
+int mbedtls_md5_ret( const unsigned char *input,
+                     size_t ilen,
+                     unsigned char output[16] );
+
+#if !defined(MBEDTLS_DEPRECATED_REMOVED)
+#if defined(MBEDTLS_DEPRECATED_WARNING)
+#define MBEDTLS_DEPRECATED      __attribute__((deprecated))
+#else
+#define MBEDTLS_DEPRECATED
+#endif
+/**
+ * \brief          Output = MD5( input buffer )
+ *
+ * \deprecated     Superseded by mbedtls_md5_ret() in 2.7.0
+ *
+ * \param input    buffer holding the data
+ * \param ilen     length of the input data
+ * \param output   MD5 checksum result
+ *
+ * \warning        MD5 is considered a weak message digest and its use
+ *                 constitutes a security risk. We recommend considering
+ *                 stronger message digests instead.
+ *
+ */
+MBEDTLS_DEPRECATED void mbedtls_md5( const unsigned char *input,
+                                     size_t ilen,
+                                     unsigned char output[16] );
+
+#undef MBEDTLS_DEPRECATED
+#endif /* !MBEDTLS_DEPRECATED_REMOVED */
+
+/**
+ * \brief          Checkup routine
+ *
+ * \return         0 if successful, or 1 if the test failed
+ *
+ * \warning        MD5 is considered a weak message digest and its use
+ *                 constitutes a security risk. We recommend considering
+ *                 stronger message digests instead.
+ *
+ */
+int mbedtls_md5_self_test( int verbose );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* mbedtls_md5.h */
diff --git a/common/mbedtls/md_internal.h b/common/mbedtls/md_internal.h
new file mode 100644
index 000000000..b917cf34d
--- /dev/null
+++ b/common/mbedtls/md_internal.h
@@ -0,0 +1,117 @@
+/**
+ * \file md_internal.h
+ *
+ * \brief Message digest wrappers.
+ *
+ * \warning This in an internal header. Do not include directly.
+ *
+ * \author Adriaan de Jong <dejong@fox-it.com>
+ */
+/*
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+#ifndef MBEDTLS_MD_WRAP_H
+#define MBEDTLS_MD_WRAP_H
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#include "md.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * Message digest information.
+ * Allows message digest functions to be called in a generic way.
+ */
+struct mbedtls_md_info_t
+{
+    /** Digest identifier */
+    mbedtls_md_type_t type;
+
+    /** Name of the message digest */
+    const char * name;
+
+    /** Output length of the digest function in bytes */
+    int size;
+
+    /** Block length of the digest function in bytes */
+    int block_size;
+
+    /** Digest initialisation function */
+    int (*starts_func)( void *ctx );
+
+    /** Digest update function */
+    int (*update_func)( void *ctx, const unsigned char *input, size_t ilen );
+
+    /** Digest finalisation function */
+    int (*finish_func)( void *ctx, unsigned char *output );
+
+    /** Generic digest function */
+    int (*digest_func)( const unsigned char *input, size_t ilen,
+                        unsigned char *output );
+
+    /** Allocate a new context */
+    void * (*ctx_alloc_func)( void );
+
+    /** Free the given context */
+    void (*ctx_free_func)( void *ctx );
+
+    /** Clone state from a context */
+    void (*clone_func)( void *dst, const void *src );
+
+    /** Internal use only */
+    int (*process_func)( void *ctx, const unsigned char *input );
+};
+
+#if defined(MBEDTLS_MD2_C)
+extern const mbedtls_md_info_t mbedtls_md2_info;
+#endif
+#if defined(MBEDTLS_MD4_C)
+extern const mbedtls_md_info_t mbedtls_md4_info;
+#endif
+#if defined(MBEDTLS_MD5_C)
+extern const mbedtls_md_info_t mbedtls_md5_info;
+#endif
+#if defined(MBEDTLS_RIPEMD160_C)
+extern const mbedtls_md_info_t mbedtls_ripemd160_info;
+#endif
+#if defined(MBEDTLS_SHA1_C)
+extern const mbedtls_md_info_t mbedtls_sha1_info;
+#endif
+#if defined(MBEDTLS_SHA256_C)
+extern const mbedtls_md_info_t mbedtls_sha224_info;
+extern const mbedtls_md_info_t mbedtls_sha256_info;
+#endif
+#if defined(MBEDTLS_SHA512_C)
+extern const mbedtls_md_info_t mbedtls_sha384_info;
+extern const mbedtls_md_info_t mbedtls_sha512_info;
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* MBEDTLS_MD_WRAP_H */
diff --git a/common/mbedtls/md_wrap.c b/common/mbedtls/md_wrap.c
new file mode 100644
index 000000000..97067b042
--- /dev/null
+++ b/common/mbedtls/md_wrap.c
@@ -0,0 +1,588 @@
+/**
+ * \file md_wrap.c
+ *
+ * \brief Generic message digest wrapper for mbed TLS
+ *
+ * \author Adriaan de Jong <dejong@fox-it.com>
+ *
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "mbedtls/config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#if defined(MBEDTLS_MD_C)
+
+#include "mbedtls/md_internal.h"
+
+#if defined(MBEDTLS_MD2_C)
+#include "mbedtls/md2.h"
+#endif
+
+#if defined(MBEDTLS_MD4_C)
+#include "mbedtls/md4.h"
+#endif
+
+#if defined(MBEDTLS_MD5_C)
+#include "mbedtls/md5.h"
+#endif
+
+#if defined(MBEDTLS_RIPEMD160_C)
+#include "mbedtls/ripemd160.h"
+#endif
+
+#if defined(MBEDTLS_SHA1_C)
+#include "mbedtls/sha1.h"
+#endif
+
+#if defined(MBEDTLS_SHA256_C)
+#include "mbedtls/sha256.h"
+#endif
+
+#if defined(MBEDTLS_SHA512_C)
+#include "mbedtls/sha512.h"
+#endif
+
+#if defined(MBEDTLS_PLATFORM_C)
+#include "mbedtls/platform.h"
+#else
+#include <stdlib.h>
+#define mbedtls_calloc    calloc
+#define mbedtls_free       free
+#endif
+
+#if defined(MBEDTLS_MD2_C)
+
+static int md2_starts_wrap( void *ctx )
+{
+    return( mbedtls_md2_starts_ret( (mbedtls_md2_context *) ctx ) );
+}
+
+static int md2_update_wrap( void *ctx, const unsigned char *input,
+                             size_t ilen )
+{
+    return( mbedtls_md2_update_ret( (mbedtls_md2_context *) ctx, input, ilen ) );
+}
+
+static int md2_finish_wrap( void *ctx, unsigned char *output )
+{
+    return( mbedtls_md2_finish_ret( (mbedtls_md2_context *) ctx, output ) );
+}
+
+static void *md2_ctx_alloc( void )
+{
+    void *ctx = mbedtls_calloc( 1, sizeof( mbedtls_md2_context ) );
+
+    if( ctx != NULL )
+        mbedtls_md2_init( (mbedtls_md2_context *) ctx );
+
+    return( ctx );
+}
+
+static void md2_ctx_free( void *ctx )
+{
+    mbedtls_md2_free( (mbedtls_md2_context *) ctx );
+    mbedtls_free( ctx );
+}
+
+static void md2_clone_wrap( void *dst, const void *src )
+{
+    mbedtls_md2_clone( (mbedtls_md2_context *) dst,
+                 (const mbedtls_md2_context *) src );
+}
+
+static int md2_process_wrap( void *ctx, const unsigned char *data )
+{
+    ((void) data);
+
+    return( mbedtls_internal_md2_process( (mbedtls_md2_context *) ctx ) );
+}
+
+const mbedtls_md_info_t mbedtls_md2_info = {
+    MBEDTLS_MD_MD2,
+    "MD2",
+    16,
+    16,
+    md2_starts_wrap,
+    md2_update_wrap,
+    md2_finish_wrap,
+    mbedtls_md2_ret,
+    md2_ctx_alloc,
+    md2_ctx_free,
+    md2_clone_wrap,
+    md2_process_wrap,
+};
+
+#endif /* MBEDTLS_MD2_C */
+
+#if defined(MBEDTLS_MD4_C)
+
+static int md4_starts_wrap( void *ctx )
+{
+    return( mbedtls_md4_starts_ret( (mbedtls_md4_context *) ctx ) );
+}
+
+static int md4_update_wrap( void *ctx, const unsigned char *input,
+                             size_t ilen )
+{
+    return( mbedtls_md4_update_ret( (mbedtls_md4_context *) ctx, input, ilen ) );
+}
+
+static int md4_finish_wrap( void *ctx, unsigned char *output )
+{
+    return( mbedtls_md4_finish_ret( (mbedtls_md4_context *) ctx, output ) );
+}
+
+static void *md4_ctx_alloc( void )
+{
+    void *ctx = mbedtls_calloc( 1, sizeof( mbedtls_md4_context ) );
+
+    if( ctx != NULL )
+        mbedtls_md4_init( (mbedtls_md4_context *) ctx );
+
+    return( ctx );
+}
+
+static void md4_ctx_free( void *ctx )
+{
+    mbedtls_md4_free( (mbedtls_md4_context *) ctx );
+    mbedtls_free( ctx );
+}
+
+static void md4_clone_wrap( void *dst, const void *src )
+{
+    mbedtls_md4_clone( (mbedtls_md4_context *) dst,
+                       (const mbedtls_md4_context *) src );
+}
+
+static int md4_process_wrap( void *ctx, const unsigned char *data )
+{
+    return( mbedtls_internal_md4_process( (mbedtls_md4_context *) ctx, data ) );
+}
+
+const mbedtls_md_info_t mbedtls_md4_info = {
+    MBEDTLS_MD_MD4,
+    "MD4",
+    16,
+    64,
+    md4_starts_wrap,
+    md4_update_wrap,
+    md4_finish_wrap,
+    mbedtls_md4_ret,
+    md4_ctx_alloc,
+    md4_ctx_free,
+    md4_clone_wrap,
+    md4_process_wrap,
+};
+
+#endif /* MBEDTLS_MD4_C */
+
+#if defined(MBEDTLS_MD5_C)
+
+static int md5_starts_wrap( void *ctx )
+{
+    return( mbedtls_md5_starts_ret( (mbedtls_md5_context *) ctx ) );
+}
+
+static int md5_update_wrap( void *ctx, const unsigned char *input,
+                             size_t ilen )
+{
+    return( mbedtls_md5_update_ret( (mbedtls_md5_context *) ctx, input, ilen ) );
+}
+
+static int md5_finish_wrap( void *ctx, unsigned char *output )
+{
+    return( mbedtls_md5_finish_ret( (mbedtls_md5_context *) ctx, output ) );
+}
+
+static void *md5_ctx_alloc( void )
+{
+    void *ctx = mbedtls_calloc( 1, sizeof( mbedtls_md5_context ) );
+
+    if( ctx != NULL )
+        mbedtls_md5_init( (mbedtls_md5_context *) ctx );
+
+    return( ctx );
+}
+
+static void md5_ctx_free( void *ctx )
+{
+    mbedtls_md5_free( (mbedtls_md5_context *) ctx );
+    mbedtls_free( ctx );
+}
+
+static void md5_clone_wrap( void *dst, const void *src )
+{
+    mbedtls_md5_clone( (mbedtls_md5_context *) dst,
+                       (const mbedtls_md5_context *) src );
+}
+
+static int md5_process_wrap( void *ctx, const unsigned char *data )
+{
+    return( mbedtls_internal_md5_process( (mbedtls_md5_context *) ctx, data ) );
+}
+
+const mbedtls_md_info_t mbedtls_md5_info = {
+    MBEDTLS_MD_MD5,
+    "MD5",
+    16,
+    64,
+    md5_starts_wrap,
+    md5_update_wrap,
+    md5_finish_wrap,
+    mbedtls_md5_ret,
+    md5_ctx_alloc,
+    md5_ctx_free,
+    md5_clone_wrap,
+    md5_process_wrap,
+};
+
+#endif /* MBEDTLS_MD5_C */
+
+#if defined(MBEDTLS_RIPEMD160_C)
+
+static int ripemd160_starts_wrap( void *ctx )
+{
+    return( mbedtls_ripemd160_starts_ret( (mbedtls_ripemd160_context *) ctx ) );
+}
+
+static int ripemd160_update_wrap( void *ctx, const unsigned char *input,
+                                   size_t ilen )
+{
+    return( mbedtls_ripemd160_update_ret( (mbedtls_ripemd160_context *) ctx,
+                                          input, ilen ) );
+}
+
+static int ripemd160_finish_wrap( void *ctx, unsigned char *output )
+{
+    return( mbedtls_ripemd160_finish_ret( (mbedtls_ripemd160_context *) ctx,
+                                          output ) );
+}
+
+static void *ripemd160_ctx_alloc( void )
+{
+    void *ctx = mbedtls_calloc( 1, sizeof( mbedtls_ripemd160_context ) );
+
+    if( ctx != NULL )
+        mbedtls_ripemd160_init( (mbedtls_ripemd160_context *) ctx );
+
+    return( ctx );
+}
+
+static void ripemd160_ctx_free( void *ctx )
+{
+    mbedtls_ripemd160_free( (mbedtls_ripemd160_context *) ctx );
+    mbedtls_free( ctx );
+}
+
+static void ripemd160_clone_wrap( void *dst, const void *src )
+{
+    mbedtls_ripemd160_clone( (mbedtls_ripemd160_context *) dst,
+                       (const mbedtls_ripemd160_context *) src );
+}
+
+static int ripemd160_process_wrap( void *ctx, const unsigned char *data )
+{
+    return( mbedtls_internal_ripemd160_process(
+                                (mbedtls_ripemd160_context *) ctx, data ) );
+}
+
+const mbedtls_md_info_t mbedtls_ripemd160_info = {
+    MBEDTLS_MD_RIPEMD160,
+    "RIPEMD160",
+    20,
+    64,
+    ripemd160_starts_wrap,
+    ripemd160_update_wrap,
+    ripemd160_finish_wrap,
+    mbedtls_ripemd160_ret,
+    ripemd160_ctx_alloc,
+    ripemd160_ctx_free,
+    ripemd160_clone_wrap,
+    ripemd160_process_wrap,
+};
+
+#endif /* MBEDTLS_RIPEMD160_C */
+
+#if defined(MBEDTLS_SHA1_C)
+
+static int sha1_starts_wrap( void *ctx )
+{
+    return( mbedtls_sha1_starts_ret( (mbedtls_sha1_context *) ctx ) );
+}
+
+static int sha1_update_wrap( void *ctx, const unsigned char *input,
+                              size_t ilen )
+{
+    return( mbedtls_sha1_update_ret( (mbedtls_sha1_context *) ctx,
+                                     input, ilen ) );
+}
+
+static int sha1_finish_wrap( void *ctx, unsigned char *output )
+{
+    return( mbedtls_sha1_finish_ret( (mbedtls_sha1_context *) ctx, output ) );
+}
+
+static void *sha1_ctx_alloc( void )
+{
+    void *ctx = mbedtls_calloc( 1, sizeof( mbedtls_sha1_context ) );
+
+    if( ctx != NULL )
+        mbedtls_sha1_init( (mbedtls_sha1_context *) ctx );
+
+    return( ctx );
+}
+
+static void sha1_clone_wrap( void *dst, const void *src )
+{
+    mbedtls_sha1_clone( (mbedtls_sha1_context *) dst,
+                  (const mbedtls_sha1_context *) src );
+}
+
+static void sha1_ctx_free( void *ctx )
+{
+    mbedtls_sha1_free( (mbedtls_sha1_context *) ctx );
+    mbedtls_free( ctx );
+}
+
+static int sha1_process_wrap( void *ctx, const unsigned char *data )
+{
+    return( mbedtls_internal_sha1_process( (mbedtls_sha1_context *) ctx,
+                                           data ) );
+}
+
+const mbedtls_md_info_t mbedtls_sha1_info = {
+    MBEDTLS_MD_SHA1,
+    "SHA1",
+    20,
+    64,
+    sha1_starts_wrap,
+    sha1_update_wrap,
+    sha1_finish_wrap,
+    mbedtls_sha1_ret,
+    sha1_ctx_alloc,
+    sha1_ctx_free,
+    sha1_clone_wrap,
+    sha1_process_wrap,
+};
+
+#endif /* MBEDTLS_SHA1_C */
+
+/*
+ * Wrappers for generic message digests
+ */
+#if defined(MBEDTLS_SHA256_C)
+
+static int sha224_starts_wrap( void *ctx )
+{
+    return( mbedtls_sha256_starts_ret( (mbedtls_sha256_context *) ctx, 1 ) );
+}
+
+static int sha224_update_wrap( void *ctx, const unsigned char *input,
+                                size_t ilen )
+{
+    return( mbedtls_sha256_update_ret( (mbedtls_sha256_context *) ctx,
+                                       input, ilen ) );
+}
+
+static int sha224_finish_wrap( void *ctx, unsigned char *output )
+{
+    return( mbedtls_sha256_finish_ret( (mbedtls_sha256_context *) ctx,
+                                       output ) );
+}
+
+static int sha224_wrap( const unsigned char *input, size_t ilen,
+                        unsigned char *output )
+{
+    return( mbedtls_sha256_ret( input, ilen, output, 1 ) );
+}
+
+static void *sha224_ctx_alloc( void )
+{
+    void *ctx = mbedtls_calloc( 1, sizeof( mbedtls_sha256_context ) );
+
+    if( ctx != NULL )
+        mbedtls_sha256_init( (mbedtls_sha256_context *) ctx );
+
+    return( ctx );
+}
+
+static void sha224_ctx_free( void *ctx )
+{
+    mbedtls_sha256_free( (mbedtls_sha256_context *) ctx );
+    mbedtls_free( ctx );
+}
+
+static void sha224_clone_wrap( void *dst, const void *src )
+{
+    mbedtls_sha256_clone( (mbedtls_sha256_context *) dst,
+                    (const mbedtls_sha256_context *) src );
+}
+
+static int sha224_process_wrap( void *ctx, const unsigned char *data )
+{
+    return( mbedtls_internal_sha256_process( (mbedtls_sha256_context *) ctx,
+                                             data ) );
+}
+
+const mbedtls_md_info_t mbedtls_sha224_info = {
+    MBEDTLS_MD_SHA224,
+    "SHA224",
+    28,
+    64,
+    sha224_starts_wrap,
+    sha224_update_wrap,
+    sha224_finish_wrap,
+    sha224_wrap,
+    sha224_ctx_alloc,
+    sha224_ctx_free,
+    sha224_clone_wrap,
+    sha224_process_wrap,
+};
+
+static int sha256_starts_wrap( void *ctx )
+{
+    return( mbedtls_sha256_starts_ret( (mbedtls_sha256_context *) ctx, 0 ) );
+}
+
+static int sha256_wrap( const unsigned char *input, size_t ilen,
+                        unsigned char *output )
+{
+    return( mbedtls_sha256_ret( input, ilen, output, 0 ) );
+}
+
+const mbedtls_md_info_t mbedtls_sha256_info = {
+    MBEDTLS_MD_SHA256,
+    "SHA256",
+    32,
+    64,
+    sha256_starts_wrap,
+    sha224_update_wrap,
+    sha224_finish_wrap,
+    sha256_wrap,
+    sha224_ctx_alloc,
+    sha224_ctx_free,
+    sha224_clone_wrap,
+    sha224_process_wrap,
+};
+
+#endif /* MBEDTLS_SHA256_C */
+
+#if defined(MBEDTLS_SHA512_C)
+
+static int sha384_starts_wrap( void *ctx )
+{
+    return( mbedtls_sha512_starts_ret( (mbedtls_sha512_context *) ctx, 1 ) );
+}
+
+static int sha384_update_wrap( void *ctx, const unsigned char *input,
+                               size_t ilen )
+{
+    return( mbedtls_sha512_update_ret( (mbedtls_sha512_context *) ctx,
+                                       input, ilen ) );
+}
+
+static int sha384_finish_wrap( void *ctx, unsigned char *output )
+{
+    return( mbedtls_sha512_finish_ret( (mbedtls_sha512_context *) ctx,
+                                       output ) );
+}
+
+static int sha384_wrap( const unsigned char *input, size_t ilen,
+                        unsigned char *output )
+{
+    return( mbedtls_sha512_ret( input, ilen, output, 1 ) );
+}
+
+static void *sha384_ctx_alloc( void )
+{
+    void *ctx = mbedtls_calloc( 1, sizeof( mbedtls_sha512_context ) );
+
+    if( ctx != NULL )
+        mbedtls_sha512_init( (mbedtls_sha512_context *) ctx );
+
+    return( ctx );
+}
+
+static void sha384_ctx_free( void *ctx )
+{
+    mbedtls_sha512_free( (mbedtls_sha512_context *) ctx );
+    mbedtls_free( ctx );
+}
+
+static void sha384_clone_wrap( void *dst, const void *src )
+{
+    mbedtls_sha512_clone( (mbedtls_sha512_context *) dst,
+                    (const mbedtls_sha512_context *) src );
+}
+
+static int sha384_process_wrap( void *ctx, const unsigned char *data )
+{
+    return( mbedtls_internal_sha512_process( (mbedtls_sha512_context *) ctx,
+                                             data ) );
+}
+
+const mbedtls_md_info_t mbedtls_sha384_info = {
+    MBEDTLS_MD_SHA384,
+    "SHA384",
+    48,
+    128,
+    sha384_starts_wrap,
+    sha384_update_wrap,
+    sha384_finish_wrap,
+    sha384_wrap,
+    sha384_ctx_alloc,
+    sha384_ctx_free,
+    sha384_clone_wrap,
+    sha384_process_wrap,
+};
+
+static int sha512_starts_wrap( void *ctx )
+{
+    return( mbedtls_sha512_starts_ret( (mbedtls_sha512_context *) ctx, 0 ) );
+}
+
+static int sha512_wrap( const unsigned char *input, size_t ilen,
+                        unsigned char *output )
+{
+    return( mbedtls_sha512_ret( input, ilen, output, 0 ) );
+}
+
+const mbedtls_md_info_t mbedtls_sha512_info = {
+    MBEDTLS_MD_SHA512,
+    "SHA512",
+    64,
+    128,
+    sha512_starts_wrap,
+    sha384_update_wrap,
+    sha384_finish_wrap,
+    sha512_wrap,
+    sha384_ctx_alloc,
+    sha384_ctx_free,
+    sha384_clone_wrap,
+    sha384_process_wrap,
+};
+
+#endif /* MBEDTLS_SHA512_C */
+
+#endif /* MBEDTLS_MD_C */
diff --git a/common/mbedtls/oid.c b/common/mbedtls/oid.c
new file mode 100644
index 000000000..962bd189a
--- /dev/null
+++ b/common/mbedtls/oid.c
@@ -0,0 +1,757 @@
+/**
+ * \file oid.c
+ *
+ * \brief Object Identifier (OID) database
+ *
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "mbedtls/config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#if defined(MBEDTLS_OID_C)
+
+#include "mbedtls/oid.h"
+#include "mbedtls/rsa.h"
+
+#include <stdio.h>
+#include <string.h>
+
+#if defined(MBEDTLS_PLATFORM_C)
+#include "mbedtls/platform.h"
+#else
+#define mbedtls_snprintf snprintf
+#endif
+
+#if defined(MBEDTLS_X509_USE_C) || defined(MBEDTLS_X509_CREATE_C)
+#include "mbedtls/x509.h"
+#endif
+
+/*
+ * Macro to automatically add the size of #define'd OIDs
+ */
+#define ADD_LEN(s)      s, MBEDTLS_OID_SIZE(s)
+
+/*
+ * Macro to generate an internal function for oid_XXX_from_asn1() (used by
+ * the other functions)
+ */
+#define FN_OID_TYPED_FROM_ASN1( TYPE_T, NAME, LIST )                        \
+static const TYPE_T * oid_ ## NAME ## _from_asn1( const mbedtls_asn1_buf *oid )     \
+{                                                                           \
+    const TYPE_T *p = LIST;                                                 \
+    const mbedtls_oid_descriptor_t *cur = (const mbedtls_oid_descriptor_t *) p;             \
+    if( p == NULL || oid == NULL ) return( NULL );                          \
+    while( cur->asn1 != NULL ) {                                            \
+        if( cur->asn1_len == oid->len &&                                    \
+            memcmp( cur->asn1, oid->p, oid->len ) == 0 ) {                  \
+            return( p );                                                    \
+        }                                                                   \
+        p++;                                                                \
+        cur = (const mbedtls_oid_descriptor_t *) p;                                 \
+    }                                                                       \
+    return( NULL );                                                         \
+}
+
+/*
+ * Macro to generate a function for retrieving a single attribute from the
+ * descriptor of an mbedtls_oid_descriptor_t wrapper.
+ */
+#define FN_OID_GET_DESCRIPTOR_ATTR1(FN_NAME, TYPE_T, TYPE_NAME, ATTR1_TYPE, ATTR1) \
+int FN_NAME( const mbedtls_asn1_buf *oid, ATTR1_TYPE * ATTR1 )                  \
+{                                                                       \
+    const TYPE_T *data = oid_ ## TYPE_NAME ## _from_asn1( oid );        \
+    if( data == NULL ) return( MBEDTLS_ERR_OID_NOT_FOUND );            \
+    *ATTR1 = data->descriptor.ATTR1;                                    \
+    return( 0 );                                                        \
+}
+
+/*
+ * Macro to generate a function for retrieving a single attribute from an
+ * mbedtls_oid_descriptor_t wrapper.
+ */
+#define FN_OID_GET_ATTR1(FN_NAME, TYPE_T, TYPE_NAME, ATTR1_TYPE, ATTR1) \
+int FN_NAME( const mbedtls_asn1_buf *oid, ATTR1_TYPE * ATTR1 )                  \
+{                                                                       \
+    const TYPE_T *data = oid_ ## TYPE_NAME ## _from_asn1( oid );        \
+    if( data == NULL ) return( MBEDTLS_ERR_OID_NOT_FOUND );            \
+    *ATTR1 = data->ATTR1;                                               \
+    return( 0 );                                                        \
+}
+
+/*
+ * Macro to generate a function for retrieving two attributes from an
+ * mbedtls_oid_descriptor_t wrapper.
+ */
+#define FN_OID_GET_ATTR2(FN_NAME, TYPE_T, TYPE_NAME, ATTR1_TYPE, ATTR1,     \
+                         ATTR2_TYPE, ATTR2)                                 \
+int FN_NAME( const mbedtls_asn1_buf *oid, ATTR1_TYPE * ATTR1, ATTR2_TYPE * ATTR2 )  \
+{                                                                           \
+    const TYPE_T *data = oid_ ## TYPE_NAME ## _from_asn1( oid );            \
+    if( data == NULL ) return( MBEDTLS_ERR_OID_NOT_FOUND );                \
+    *ATTR1 = data->ATTR1;                                                   \
+    *ATTR2 = data->ATTR2;                                                   \
+    return( 0 );                                                            \
+}
+
+/*
+ * Macro to generate a function for retrieving the OID based on a single
+ * attribute from a mbedtls_oid_descriptor_t wrapper.
+ */
+#define FN_OID_GET_OID_BY_ATTR1(FN_NAME, TYPE_T, LIST, ATTR1_TYPE, ATTR1)   \
+int FN_NAME( ATTR1_TYPE ATTR1, const char **oid, size_t *olen )             \
+{                                                                           \
+    const TYPE_T *cur = LIST;                                               \
+    while( cur->descriptor.asn1 != NULL ) {                                 \
+        if( cur->ATTR1 == ATTR1 ) {                                         \
+            *oid = cur->descriptor.asn1;                                    \
+            *olen = cur->descriptor.asn1_len;                               \
+            return( 0 );                                                    \
+        }                                                                   \
+        cur++;                                                              \
+    }                                                                       \
+    return( MBEDTLS_ERR_OID_NOT_FOUND );                                   \
+}
+
+/*
+ * Macro to generate a function for retrieving the OID based on two
+ * attributes from a mbedtls_oid_descriptor_t wrapper.
+ */
+#define FN_OID_GET_OID_BY_ATTR2(FN_NAME, TYPE_T, LIST, ATTR1_TYPE, ATTR1,   \
+                                ATTR2_TYPE, ATTR2)                          \
+int FN_NAME( ATTR1_TYPE ATTR1, ATTR2_TYPE ATTR2, const char **oid ,         \
+             size_t *olen )                                                 \
+{                                                                           \
+    const TYPE_T *cur = LIST;                                               \
+    while( cur->descriptor.asn1 != NULL ) {                                 \
+        if( cur->ATTR1 == ATTR1 && cur->ATTR2 == ATTR2 ) {                  \
+            *oid = cur->descriptor.asn1;                                    \
+            *olen = cur->descriptor.asn1_len;                               \
+            return( 0 );                                                    \
+        }                                                                   \
+        cur++;                                                              \
+    }                                                                       \
+    return( MBEDTLS_ERR_OID_NOT_FOUND );                                   \
+}
+
+#if defined(MBEDTLS_X509_USE_C) || defined(MBEDTLS_X509_CREATE_C)
+/*
+ * For X520 attribute types
+ */
+typedef struct {
+    mbedtls_oid_descriptor_t    descriptor;
+    const char          *short_name;
+} oid_x520_attr_t;
+
+static const oid_x520_attr_t oid_x520_attr_type[] =
+{
+    {
+        { ADD_LEN( MBEDTLS_OID_AT_CN ),          "id-at-commonName",               "Common Name" },
+        "CN",
+    },
+    {
+        { ADD_LEN( MBEDTLS_OID_AT_COUNTRY ),     "id-at-countryName",              "Country" },
+        "C",
+    },
+    {
+        { ADD_LEN( MBEDTLS_OID_AT_LOCALITY ),    "id-at-locality",                 "Locality" },
+        "L",
+    },
+    {
+        { ADD_LEN( MBEDTLS_OID_AT_STATE ),       "id-at-state",                    "State" },
+        "ST",
+    },
+    {
+        { ADD_LEN( MBEDTLS_OID_AT_ORGANIZATION ),"id-at-organizationName",         "Organization" },
+        "O",
+    },
+    {
+        { ADD_LEN( MBEDTLS_OID_AT_ORG_UNIT ),    "id-at-organizationalUnitName",   "Org Unit" },
+        "OU",
+    },
+    {
+        { ADD_LEN( MBEDTLS_OID_PKCS9_EMAIL ),    "emailAddress",                   "E-mail address" },
+        "emailAddress",
+    },
+    {
+        { ADD_LEN( MBEDTLS_OID_AT_SERIAL_NUMBER ),"id-at-serialNumber",            "Serial number" },
+        "serialNumber",
+    },
+    {
+        { ADD_LEN( MBEDTLS_OID_AT_POSTAL_ADDRESS ),"id-at-postalAddress",          "Postal address" },
+        "postalAddress",
+    },
+    {
+        { ADD_LEN( MBEDTLS_OID_AT_POSTAL_CODE ), "id-at-postalCode",               "Postal code" },
+        "postalCode",
+    },
+    {
+        { ADD_LEN( MBEDTLS_OID_AT_SUR_NAME ),    "id-at-surName",                  "Surname" },
+        "SN",
+    },
+    {
+        { ADD_LEN( MBEDTLS_OID_AT_GIVEN_NAME ),  "id-at-givenName",                "Given name" },
+        "GN",
+    },
+    {
+        { ADD_LEN( MBEDTLS_OID_AT_INITIALS ),    "id-at-initials",                 "Initials" },
+        "initials",
+    },
+    {
+        { ADD_LEN( MBEDTLS_OID_AT_GENERATION_QUALIFIER ), "id-at-generationQualifier", "Generation qualifier" },
+        "generationQualifier",
+    },
+    {
+        { ADD_LEN( MBEDTLS_OID_AT_TITLE ),       "id-at-title",                    "Title" },
+        "title",
+    },
+    {
+        { ADD_LEN( MBEDTLS_OID_AT_DN_QUALIFIER ),"id-at-dnQualifier",              "Distinguished Name qualifier" },
+        "dnQualifier",
+    },
+    {
+        { ADD_LEN( MBEDTLS_OID_AT_PSEUDONYM ),   "id-at-pseudonym",                "Pseudonym" },
+        "pseudonym",
+    },
+    {
+        { ADD_LEN( MBEDTLS_OID_DOMAIN_COMPONENT ), "id-domainComponent",           "Domain component" },
+        "DC",
+    },
+    {
+        { ADD_LEN( MBEDTLS_OID_AT_UNIQUE_IDENTIFIER ), "id-at-uniqueIdentifier",    "Unique Identifier" },
+        "uniqueIdentifier",
+    },
+    {
+        { NULL, 0, NULL, NULL },
+        NULL,
+    }
+};
+
+FN_OID_TYPED_FROM_ASN1(oid_x520_attr_t, x520_attr, oid_x520_attr_type)
+FN_OID_GET_ATTR1(mbedtls_oid_get_attr_short_name, oid_x520_attr_t, x520_attr, const char *, short_name)
+
+/*
+ * For X509 extensions
+ */
+typedef struct {
+    mbedtls_oid_descriptor_t    descriptor;
+    int                 ext_type;
+} oid_x509_ext_t;
+
+static const oid_x509_ext_t oid_x509_ext[] =
+{
+    {
+        { ADD_LEN( MBEDTLS_OID_BASIC_CONSTRAINTS ),    "id-ce-basicConstraints",   "Basic Constraints" },
+        MBEDTLS_X509_EXT_BASIC_CONSTRAINTS,
+    },
+    {
+        { ADD_LEN( MBEDTLS_OID_KEY_USAGE ),            "id-ce-keyUsage",           "Key Usage" },
+        MBEDTLS_X509_EXT_KEY_USAGE,
+    },
+    {
+        { ADD_LEN( MBEDTLS_OID_EXTENDED_KEY_USAGE ),   "id-ce-extKeyUsage",        "Extended Key Usage" },
+        MBEDTLS_X509_EXT_EXTENDED_KEY_USAGE,
+    },
+    {
+        { ADD_LEN( MBEDTLS_OID_SUBJECT_ALT_NAME ),     "id-ce-subjectAltName",     "Subject Alt Name" },
+        MBEDTLS_X509_EXT_SUBJECT_ALT_NAME,
+    },
+    {
+        { ADD_LEN( MBEDTLS_OID_NS_CERT_TYPE ),         "id-netscape-certtype",     "Netscape Certificate Type" },
+        MBEDTLS_X509_EXT_NS_CERT_TYPE,
+    },
+    {
+        { NULL, 0, NULL, NULL },
+        0,
+    },
+};
+
+FN_OID_TYPED_FROM_ASN1(oid_x509_ext_t, x509_ext, oid_x509_ext)
+FN_OID_GET_ATTR1(mbedtls_oid_get_x509_ext_type, oid_x509_ext_t, x509_ext, int, ext_type)
+
+static const mbedtls_oid_descriptor_t oid_ext_key_usage[] =
+{
+    { ADD_LEN( MBEDTLS_OID_SERVER_AUTH ),      "id-kp-serverAuth",      "TLS Web Server Authentication" },
+    { ADD_LEN( MBEDTLS_OID_CLIENT_AUTH ),      "id-kp-clientAuth",      "TLS Web Client Authentication" },
+    { ADD_LEN( MBEDTLS_OID_CODE_SIGNING ),     "id-kp-codeSigning",     "Code Signing" },
+    { ADD_LEN( MBEDTLS_OID_EMAIL_PROTECTION ), "id-kp-emailProtection", "E-mail Protection" },
+    { ADD_LEN( MBEDTLS_OID_TIME_STAMPING ),    "id-kp-timeStamping",    "Time Stamping" },
+    { ADD_LEN( MBEDTLS_OID_OCSP_SIGNING ),     "id-kp-OCSPSigning",     "OCSP Signing" },
+    { NULL, 0, NULL, NULL },
+};
+
+FN_OID_TYPED_FROM_ASN1(mbedtls_oid_descriptor_t, ext_key_usage, oid_ext_key_usage)
+FN_OID_GET_ATTR1(mbedtls_oid_get_extended_key_usage, mbedtls_oid_descriptor_t, ext_key_usage, const char *, description)
+#endif /* MBEDTLS_X509_USE_C || MBEDTLS_X509_CREATE_C */
+
+#if defined(MBEDTLS_MD_C)
+/*
+ * For SignatureAlgorithmIdentifier
+ */
+typedef struct {
+    mbedtls_oid_descriptor_t    descriptor;
+    mbedtls_md_type_t           md_alg;
+    mbedtls_pk_type_t           pk_alg;
+} oid_sig_alg_t;
+
+static const oid_sig_alg_t oid_sig_alg[] =
+{
+#if defined(MBEDTLS_RSA_C)
+#if defined(MBEDTLS_MD2_C)
+    {
+        { ADD_LEN( MBEDTLS_OID_PKCS1_MD2 ),        "md2WithRSAEncryption",     "RSA with MD2" },
+        MBEDTLS_MD_MD2,      MBEDTLS_PK_RSA,
+    },
+#endif /* MBEDTLS_MD2_C */
+#if defined(MBEDTLS_MD4_C)
+    {
+        { ADD_LEN( MBEDTLS_OID_PKCS1_MD4 ),        "md4WithRSAEncryption",     "RSA with MD4" },
+        MBEDTLS_MD_MD4,      MBEDTLS_PK_RSA,
+    },
+#endif /* MBEDTLS_MD4_C */
+#if defined(MBEDTLS_MD5_C)
+    {
+        { ADD_LEN( MBEDTLS_OID_PKCS1_MD5 ),        "md5WithRSAEncryption",     "RSA with MD5" },
+        MBEDTLS_MD_MD5,      MBEDTLS_PK_RSA,
+    },
+#endif /* MBEDTLS_MD5_C */
+#if defined(MBEDTLS_SHA1_C)
+    {
+        { ADD_LEN( MBEDTLS_OID_PKCS1_SHA1 ),       "sha-1WithRSAEncryption",   "RSA with SHA1" },
+        MBEDTLS_MD_SHA1,     MBEDTLS_PK_RSA,
+    },
+#endif /* MBEDTLS_SHA1_C */
+#if defined(MBEDTLS_SHA256_C)
+    {
+        { ADD_LEN( MBEDTLS_OID_PKCS1_SHA224 ),     "sha224WithRSAEncryption",  "RSA with SHA-224" },
+        MBEDTLS_MD_SHA224,   MBEDTLS_PK_RSA,
+    },
+    {
+        { ADD_LEN( MBEDTLS_OID_PKCS1_SHA256 ),     "sha256WithRSAEncryption",  "RSA with SHA-256" },
+        MBEDTLS_MD_SHA256,   MBEDTLS_PK_RSA,
+    },
+#endif /* MBEDTLS_SHA256_C */
+#if defined(MBEDTLS_SHA512_C)
+    {
+        { ADD_LEN( MBEDTLS_OID_PKCS1_SHA384 ),     "sha384WithRSAEncryption",  "RSA with SHA-384" },
+        MBEDTLS_MD_SHA384,   MBEDTLS_PK_RSA,
+    },
+    {
+        { ADD_LEN( MBEDTLS_OID_PKCS1_SHA512 ),     "sha512WithRSAEncryption",  "RSA with SHA-512" },
+        MBEDTLS_MD_SHA512,   MBEDTLS_PK_RSA,
+    },
+#endif /* MBEDTLS_SHA512_C */
+#if defined(MBEDTLS_SHA1_C)
+    {
+        { ADD_LEN( MBEDTLS_OID_RSA_SHA_OBS ),      "sha-1WithRSAEncryption",   "RSA with SHA1" },
+        MBEDTLS_MD_SHA1,     MBEDTLS_PK_RSA,
+    },
+#endif /* MBEDTLS_SHA1_C */
+#endif /* MBEDTLS_RSA_C */
+#if defined(MBEDTLS_ECDSA_C)
+#if defined(MBEDTLS_SHA1_C)
+    {
+        { ADD_LEN( MBEDTLS_OID_ECDSA_SHA1 ),       "ecdsa-with-SHA1",      "ECDSA with SHA1" },
+        MBEDTLS_MD_SHA1,     MBEDTLS_PK_ECDSA,
+    },
+#endif /* MBEDTLS_SHA1_C */
+#if defined(MBEDTLS_SHA256_C)
+    {
+        { ADD_LEN( MBEDTLS_OID_ECDSA_SHA224 ),     "ecdsa-with-SHA224",    "ECDSA with SHA224" },
+        MBEDTLS_MD_SHA224,   MBEDTLS_PK_ECDSA,
+    },
+    {
+        { ADD_LEN( MBEDTLS_OID_ECDSA_SHA256 ),     "ecdsa-with-SHA256",    "ECDSA with SHA256" },
+        MBEDTLS_MD_SHA256,   MBEDTLS_PK_ECDSA,
+    },
+#endif /* MBEDTLS_SHA256_C */
+#if defined(MBEDTLS_SHA512_C)
+    {
+        { ADD_LEN( MBEDTLS_OID_ECDSA_SHA384 ),     "ecdsa-with-SHA384",    "ECDSA with SHA384" },
+        MBEDTLS_MD_SHA384,   MBEDTLS_PK_ECDSA,
+    },
+    {
+        { ADD_LEN( MBEDTLS_OID_ECDSA_SHA512 ),     "ecdsa-with-SHA512",    "ECDSA with SHA512" },
+        MBEDTLS_MD_SHA512,   MBEDTLS_PK_ECDSA,
+    },
+#endif /* MBEDTLS_SHA512_C */
+#endif /* MBEDTLS_ECDSA_C */
+#if defined(MBEDTLS_RSA_C)
+    {
+        { ADD_LEN( MBEDTLS_OID_RSASSA_PSS ),        "RSASSA-PSS",           "RSASSA-PSS" },
+        MBEDTLS_MD_NONE,     MBEDTLS_PK_RSASSA_PSS,
+    },
+#endif /* MBEDTLS_RSA_C */
+    {
+        { NULL, 0, NULL, NULL },
+        MBEDTLS_MD_NONE, MBEDTLS_PK_NONE,
+    },
+};
+
+FN_OID_TYPED_FROM_ASN1(oid_sig_alg_t, sig_alg, oid_sig_alg)
+FN_OID_GET_DESCRIPTOR_ATTR1(mbedtls_oid_get_sig_alg_desc, oid_sig_alg_t, sig_alg, const char *, description)
+FN_OID_GET_ATTR2(mbedtls_oid_get_sig_alg, oid_sig_alg_t, sig_alg, mbedtls_md_type_t, md_alg, mbedtls_pk_type_t, pk_alg)
+FN_OID_GET_OID_BY_ATTR2(mbedtls_oid_get_oid_by_sig_alg, oid_sig_alg_t, oid_sig_alg, mbedtls_pk_type_t, pk_alg, mbedtls_md_type_t, md_alg)
+#endif /* MBEDTLS_MD_C */
+
+/*
+ * For PublicKeyInfo (PKCS1, RFC 5480)
+ */
+typedef struct {
+    mbedtls_oid_descriptor_t    descriptor;
+    mbedtls_pk_type_t           pk_alg;
+} oid_pk_alg_t;
+
+static const oid_pk_alg_t oid_pk_alg[] =
+{
+    {
+        { ADD_LEN( MBEDTLS_OID_PKCS1_RSA ),      "rsaEncryption",   "RSA" },
+        MBEDTLS_PK_RSA,
+    },
+    {
+        { ADD_LEN( MBEDTLS_OID_EC_ALG_UNRESTRICTED ),  "id-ecPublicKey",   "Generic EC key" },
+        MBEDTLS_PK_ECKEY,
+    },
+    {
+        { ADD_LEN( MBEDTLS_OID_EC_ALG_ECDH ),          "id-ecDH",          "EC key for ECDH" },
+        MBEDTLS_PK_ECKEY_DH,
+    },
+    {
+        { NULL, 0, NULL, NULL },
+        MBEDTLS_PK_NONE,
+    },
+};
+
+FN_OID_TYPED_FROM_ASN1(oid_pk_alg_t, pk_alg, oid_pk_alg)
+FN_OID_GET_ATTR1(mbedtls_oid_get_pk_alg, oid_pk_alg_t, pk_alg, mbedtls_pk_type_t, pk_alg)
+FN_OID_GET_OID_BY_ATTR1(mbedtls_oid_get_oid_by_pk_alg, oid_pk_alg_t, oid_pk_alg, mbedtls_pk_type_t, pk_alg)
+
+#if defined(MBEDTLS_ECP_C)
+/*
+ * For namedCurve (RFC 5480)
+ */
+typedef struct {
+    mbedtls_oid_descriptor_t    descriptor;
+    mbedtls_ecp_group_id        grp_id;
+} oid_ecp_grp_t;
+
+static const oid_ecp_grp_t oid_ecp_grp[] =
+{
+#if defined(MBEDTLS_ECP_DP_SECP192R1_ENABLED)
+    {
+        { ADD_LEN( MBEDTLS_OID_EC_GRP_SECP192R1 ), "secp192r1",    "secp192r1" },
+        MBEDTLS_ECP_DP_SECP192R1,
+    },
+#endif /* MBEDTLS_ECP_DP_SECP192R1_ENABLED */
+#if defined(MBEDTLS_ECP_DP_SECP224R1_ENABLED)
+    {
+        { ADD_LEN( MBEDTLS_OID_EC_GRP_SECP224R1 ), "secp224r1",    "secp224r1" },
+        MBEDTLS_ECP_DP_SECP224R1,
+    },
+#endif /* MBEDTLS_ECP_DP_SECP224R1_ENABLED */
+#if defined(MBEDTLS_ECP_DP_SECP256R1_ENABLED)
+    {
+        { ADD_LEN( MBEDTLS_OID_EC_GRP_SECP256R1 ), "secp256r1",    "secp256r1" },
+        MBEDTLS_ECP_DP_SECP256R1,
+    },
+#endif /* MBEDTLS_ECP_DP_SECP256R1_ENABLED */
+#if defined(MBEDTLS_ECP_DP_SECP384R1_ENABLED)
+    {
+        { ADD_LEN( MBEDTLS_OID_EC_GRP_SECP384R1 ), "secp384r1",    "secp384r1" },
+        MBEDTLS_ECP_DP_SECP384R1,
+    },
+#endif /* MBEDTLS_ECP_DP_SECP384R1_ENABLED */
+#if defined(MBEDTLS_ECP_DP_SECP521R1_ENABLED)
+    {
+        { ADD_LEN( MBEDTLS_OID_EC_GRP_SECP521R1 ), "secp521r1",    "secp521r1" },
+        MBEDTLS_ECP_DP_SECP521R1,
+    },
+#endif /* MBEDTLS_ECP_DP_SECP521R1_ENABLED */
+#if defined(MBEDTLS_ECP_DP_SECP192K1_ENABLED)
+    {
+        { ADD_LEN( MBEDTLS_OID_EC_GRP_SECP192K1 ), "secp192k1",    "secp192k1" },
+        MBEDTLS_ECP_DP_SECP192K1,
+    },
+#endif /* MBEDTLS_ECP_DP_SECP192K1_ENABLED */
+#if defined(MBEDTLS_ECP_DP_SECP224K1_ENABLED)
+    {
+        { ADD_LEN( MBEDTLS_OID_EC_GRP_SECP224K1 ), "secp224k1",    "secp224k1" },
+        MBEDTLS_ECP_DP_SECP224K1,
+    },
+#endif /* MBEDTLS_ECP_DP_SECP224K1_ENABLED */
+#if defined(MBEDTLS_ECP_DP_SECP256K1_ENABLED)
+    {
+        { ADD_LEN( MBEDTLS_OID_EC_GRP_SECP256K1 ), "secp256k1",    "secp256k1" },
+        MBEDTLS_ECP_DP_SECP256K1,
+    },
+#endif /* MBEDTLS_ECP_DP_SECP256K1_ENABLED */
+#if defined(MBEDTLS_ECP_DP_BP256R1_ENABLED)
+    {
+        { ADD_LEN( MBEDTLS_OID_EC_GRP_BP256R1 ),   "brainpoolP256r1","brainpool256r1" },
+        MBEDTLS_ECP_DP_BP256R1,
+    },
+#endif /* MBEDTLS_ECP_DP_BP256R1_ENABLED */
+#if defined(MBEDTLS_ECP_DP_BP384R1_ENABLED)
+    {
+        { ADD_LEN( MBEDTLS_OID_EC_GRP_BP384R1 ),   "brainpoolP384r1","brainpool384r1" },
+        MBEDTLS_ECP_DP_BP384R1,
+    },
+#endif /* MBEDTLS_ECP_DP_BP384R1_ENABLED */
+#if defined(MBEDTLS_ECP_DP_BP512R1_ENABLED)
+    {
+        { ADD_LEN( MBEDTLS_OID_EC_GRP_BP512R1 ),   "brainpoolP512r1","brainpool512r1" },
+        MBEDTLS_ECP_DP_BP512R1,
+    },
+#endif /* MBEDTLS_ECP_DP_BP512R1_ENABLED */
+    {
+        { NULL, 0, NULL, NULL },
+        MBEDTLS_ECP_DP_NONE,
+    },
+};
+
+FN_OID_TYPED_FROM_ASN1(oid_ecp_grp_t, grp_id, oid_ecp_grp)
+FN_OID_GET_ATTR1(mbedtls_oid_get_ec_grp, oid_ecp_grp_t, grp_id, mbedtls_ecp_group_id, grp_id)
+FN_OID_GET_OID_BY_ATTR1(mbedtls_oid_get_oid_by_ec_grp, oid_ecp_grp_t, oid_ecp_grp, mbedtls_ecp_group_id, grp_id)
+#endif /* MBEDTLS_ECP_C */
+
+#if defined(MBEDTLS_CIPHER_C)
+/*
+ * For PKCS#5 PBES2 encryption algorithm
+ */
+typedef struct {
+    mbedtls_oid_descriptor_t    descriptor;
+    mbedtls_cipher_type_t       cipher_alg;
+} oid_cipher_alg_t;
+
+static const oid_cipher_alg_t oid_cipher_alg[] =
+{
+    {
+        { ADD_LEN( MBEDTLS_OID_DES_CBC ),              "desCBC",       "DES-CBC" },
+        MBEDTLS_CIPHER_DES_CBC,
+    },
+    {
+        { ADD_LEN( MBEDTLS_OID_DES_EDE3_CBC ),         "des-ede3-cbc", "DES-EDE3-CBC" },
+        MBEDTLS_CIPHER_DES_EDE3_CBC,
+    },
+    {
+        { NULL, 0, NULL, NULL },
+        MBEDTLS_CIPHER_NONE,
+    },
+};
+
+FN_OID_TYPED_FROM_ASN1(oid_cipher_alg_t, cipher_alg, oid_cipher_alg)
+FN_OID_GET_ATTR1(mbedtls_oid_get_cipher_alg, oid_cipher_alg_t, cipher_alg, mbedtls_cipher_type_t, cipher_alg)
+#endif /* MBEDTLS_CIPHER_C */
+
+#if defined(MBEDTLS_MD_C)
+/*
+ * For digestAlgorithm
+ */
+typedef struct {
+    mbedtls_oid_descriptor_t    descriptor;
+    mbedtls_md_type_t           md_alg;
+} oid_md_alg_t;
+
+static const oid_md_alg_t oid_md_alg[] =
+{
+#if defined(MBEDTLS_MD2_C)
+    {
+        { ADD_LEN( MBEDTLS_OID_DIGEST_ALG_MD2 ),       "id-md2",       "MD2" },
+        MBEDTLS_MD_MD2,
+    },
+#endif /* MBEDTLS_MD2_C */
+#if defined(MBEDTLS_MD4_C)
+    {
+        { ADD_LEN( MBEDTLS_OID_DIGEST_ALG_MD4 ),       "id-md4",       "MD4" },
+        MBEDTLS_MD_MD4,
+    },
+#endif /* MBEDTLS_MD4_C */
+#if defined(MBEDTLS_MD5_C)
+    {
+        { ADD_LEN( MBEDTLS_OID_DIGEST_ALG_MD5 ),       "id-md5",       "MD5" },
+        MBEDTLS_MD_MD5,
+    },
+#endif /* MBEDTLS_MD5_C */
+#if defined(MBEDTLS_SHA1_C)
+    {
+        { ADD_LEN( MBEDTLS_OID_DIGEST_ALG_SHA1 ),      "id-sha1",      "SHA-1" },
+        MBEDTLS_MD_SHA1,
+    },
+#endif /* MBEDTLS_SHA1_C */
+#if defined(MBEDTLS_SHA256_C)
+    {
+        { ADD_LEN( MBEDTLS_OID_DIGEST_ALG_SHA224 ),    "id-sha224",    "SHA-224" },
+        MBEDTLS_MD_SHA224,
+    },
+    {
+        { ADD_LEN( MBEDTLS_OID_DIGEST_ALG_SHA256 ),    "id-sha256",    "SHA-256" },
+        MBEDTLS_MD_SHA256,
+    },
+#endif /* MBEDTLS_SHA256_C */
+#if defined(MBEDTLS_SHA512_C)
+    {
+        { ADD_LEN( MBEDTLS_OID_DIGEST_ALG_SHA384 ),    "id-sha384",    "SHA-384" },
+        MBEDTLS_MD_SHA384,
+    },
+    {
+        { ADD_LEN( MBEDTLS_OID_DIGEST_ALG_SHA512 ),    "id-sha512",    "SHA-512" },
+        MBEDTLS_MD_SHA512,
+    },
+#endif /* MBEDTLS_SHA512_C */
+    {
+        { NULL, 0, NULL, NULL },
+        MBEDTLS_MD_NONE,
+    },
+};
+
+FN_OID_TYPED_FROM_ASN1(oid_md_alg_t, md_alg, oid_md_alg)
+FN_OID_GET_ATTR1(mbedtls_oid_get_md_alg, oid_md_alg_t, md_alg, mbedtls_md_type_t, md_alg)
+FN_OID_GET_OID_BY_ATTR1(mbedtls_oid_get_oid_by_md, oid_md_alg_t, oid_md_alg, mbedtls_md_type_t, md_alg)
+
+/*
+ * For HMAC digestAlgorithm
+ */
+typedef struct {
+    mbedtls_oid_descriptor_t    descriptor;
+    mbedtls_md_type_t           md_hmac;
+} oid_md_hmac_t;
+
+static const oid_md_hmac_t oid_md_hmac[] =
+{
+#if defined(MBEDTLS_SHA1_C)
+    {
+        { ADD_LEN( MBEDTLS_OID_HMAC_SHA1 ),      "hmacSHA1",      "HMAC-SHA-1" },
+        MBEDTLS_MD_SHA1,
+    },
+#endif /* MBEDTLS_SHA1_C */
+#if defined(MBEDTLS_SHA256_C)
+    {
+        { ADD_LEN( MBEDTLS_OID_HMAC_SHA224 ),    "hmacSHA224",    "HMAC-SHA-224" },
+        MBEDTLS_MD_SHA224,
+    },
+    {
+        { ADD_LEN( MBEDTLS_OID_HMAC_SHA256 ),    "hmacSHA256",    "HMAC-SHA-256" },
+        MBEDTLS_MD_SHA256,
+    },
+#endif /* MBEDTLS_SHA256_C */
+#if defined(MBEDTLS_SHA512_C)
+    {
+        { ADD_LEN( MBEDTLS_OID_HMAC_SHA384 ),    "hmacSHA384",    "HMAC-SHA-384" },
+        MBEDTLS_MD_SHA384,
+    },
+    {
+        { ADD_LEN( MBEDTLS_OID_HMAC_SHA512 ),    "hmacSHA512",    "HMAC-SHA-512" },
+        MBEDTLS_MD_SHA512,
+    },
+#endif /* MBEDTLS_SHA512_C */
+    {
+        { NULL, 0, NULL, NULL },
+        MBEDTLS_MD_NONE,
+    },
+};
+
+FN_OID_TYPED_FROM_ASN1(oid_md_hmac_t, md_hmac, oid_md_hmac)
+FN_OID_GET_ATTR1(mbedtls_oid_get_md_hmac, oid_md_hmac_t, md_hmac, mbedtls_md_type_t, md_hmac)
+#endif /* MBEDTLS_MD_C */
+
+#if defined(MBEDTLS_PKCS12_C)
+/*
+ * For PKCS#12 PBEs
+ */
+typedef struct {
+    mbedtls_oid_descriptor_t    descriptor;
+    mbedtls_md_type_t           md_alg;
+    mbedtls_cipher_type_t       cipher_alg;
+} oid_pkcs12_pbe_alg_t;
+
+static const oid_pkcs12_pbe_alg_t oid_pkcs12_pbe_alg[] =
+{
+    {
+        { ADD_LEN( MBEDTLS_OID_PKCS12_PBE_SHA1_DES3_EDE_CBC ), "pbeWithSHAAnd3-KeyTripleDES-CBC", "PBE with SHA1 and 3-Key 3DES" },
+        MBEDTLS_MD_SHA1,      MBEDTLS_CIPHER_DES_EDE3_CBC,
+    },
+    {
+        { ADD_LEN( MBEDTLS_OID_PKCS12_PBE_SHA1_DES2_EDE_CBC ), "pbeWithSHAAnd2-KeyTripleDES-CBC", "PBE with SHA1 and 2-Key 3DES" },
+        MBEDTLS_MD_SHA1,      MBEDTLS_CIPHER_DES_EDE_CBC,
+    },
+    {
+        { NULL, 0, NULL, NULL },
+        MBEDTLS_MD_NONE, MBEDTLS_CIPHER_NONE,
+    },
+};
+
+FN_OID_TYPED_FROM_ASN1(oid_pkcs12_pbe_alg_t, pkcs12_pbe_alg, oid_pkcs12_pbe_alg)
+FN_OID_GET_ATTR2(mbedtls_oid_get_pkcs12_pbe_alg, oid_pkcs12_pbe_alg_t, pkcs12_pbe_alg, mbedtls_md_type_t, md_alg, mbedtls_cipher_type_t, cipher_alg)
+#endif /* MBEDTLS_PKCS12_C */
+
+#define OID_SAFE_SNPRINTF                               \
+    do {                                                \
+        if( ret < 0 || (size_t) ret >= n )              \
+            return( MBEDTLS_ERR_OID_BUF_TOO_SMALL );    \
+                                                        \
+        n -= (size_t) ret;                              \
+        p += (size_t) ret;                              \
+    } while( 0 )
+
+/* Return the x.y.z.... style numeric string for the given OID */
+int mbedtls_oid_get_numeric_string( char *buf, size_t size,
+                            const mbedtls_asn1_buf *oid )
+{
+    int ret;
+    size_t i, n;
+    unsigned int value;
+    char *p;
+
+    p = buf;
+    n = size;
+
+    /* First byte contains first two dots */
+    if( oid->len > 0 )
+    {
+        ret = mbedtls_snprintf( p, n, "%d.%d", oid->p[0] / 40, oid->p[0] % 40 );
+        OID_SAFE_SNPRINTF;
+    }
+
+    value = 0;
+    for( i = 1; i < oid->len; i++ )
+    {
+        /* Prevent overflow in value. */
+        if( ( ( value << 7 ) >> 7 ) != value )
+            return( MBEDTLS_ERR_OID_BUF_TOO_SMALL );
+
+        value <<= 7;
+        value += oid->p[i] & 0x7F;
+
+        if( !( oid->p[i] & 0x80 ) )
+        {
+            /* Last byte */
+            ret = mbedtls_snprintf( p, n, ".%d", value );
+            OID_SAFE_SNPRINTF;
+            value = 0;
+        }
+    }
+
+    return( (int) ( size - n ) );
+}
+
+#endif /* MBEDTLS_OID_C */
diff --git a/common/mbedtls/oid.h b/common/mbedtls/oid.h
new file mode 100644
index 000000000..1ea4a3f16
--- /dev/null
+++ b/common/mbedtls/oid.h
@@ -0,0 +1,607 @@
+/**
+ * \file oid.h
+ *
+ * \brief Object Identifier (OID) database
+ */
+/*
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+#ifndef MBEDTLS_OID_H
+#define MBEDTLS_OID_H
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#include "asn1.h"
+#include "pk.h"
+
+#include <stddef.h>
+
+#if defined(MBEDTLS_CIPHER_C)
+#include "cipher.h"
+#endif
+
+#if defined(MBEDTLS_MD_C)
+#include "md.h"
+#endif
+
+#if defined(MBEDTLS_X509_USE_C) || defined(MBEDTLS_X509_CREATE_C)
+#include "x509.h"
+#endif
+
+#define MBEDTLS_ERR_OID_NOT_FOUND                         -0x002E  /**< OID is not found. */
+#define MBEDTLS_ERR_OID_BUF_TOO_SMALL                     -0x000B  /**< output buffer is too small */
+
+/*
+ * Top level OID tuples
+ */
+#define MBEDTLS_OID_ISO_MEMBER_BODIES           "\x2a"          /* {iso(1) member-body(2)} */
+#define MBEDTLS_OID_ISO_IDENTIFIED_ORG          "\x2b"          /* {iso(1) identified-organization(3)} */
+#define MBEDTLS_OID_ISO_CCITT_DS                "\x55"          /* {joint-iso-ccitt(2) ds(5)} */
+#define MBEDTLS_OID_ISO_ITU_COUNTRY             "\x60"          /* {joint-iso-itu-t(2) country(16)} */
+
+/*
+ * ISO Member bodies OID parts
+ */
+#define MBEDTLS_OID_COUNTRY_US                  "\x86\x48"      /* {us(840)} */
+#define MBEDTLS_OID_ORG_RSA_DATA_SECURITY       "\x86\xf7\x0d"  /* {rsadsi(113549)} */
+#define MBEDTLS_OID_RSA_COMPANY                 MBEDTLS_OID_ISO_MEMBER_BODIES MBEDTLS_OID_COUNTRY_US \
+                                        MBEDTLS_OID_ORG_RSA_DATA_SECURITY /* {iso(1) member-body(2) us(840) rsadsi(113549)} */
+#define MBEDTLS_OID_ORG_ANSI_X9_62              "\xce\x3d" /* ansi-X9-62(10045) */
+#define MBEDTLS_OID_ANSI_X9_62                  MBEDTLS_OID_ISO_MEMBER_BODIES MBEDTLS_OID_COUNTRY_US \
+                                        MBEDTLS_OID_ORG_ANSI_X9_62
+
+/*
+ * ISO Identified organization OID parts
+ */
+#define MBEDTLS_OID_ORG_DOD                     "\x06"          /* {dod(6)} */
+#define MBEDTLS_OID_ORG_OIW                     "\x0e"
+#define MBEDTLS_OID_OIW_SECSIG                  MBEDTLS_OID_ORG_OIW "\x03"
+#define MBEDTLS_OID_OIW_SECSIG_ALG              MBEDTLS_OID_OIW_SECSIG "\x02"
+#define MBEDTLS_OID_OIW_SECSIG_SHA1             MBEDTLS_OID_OIW_SECSIG_ALG "\x1a"
+#define MBEDTLS_OID_ORG_CERTICOM                "\x81\x04"  /* certicom(132) */
+#define MBEDTLS_OID_CERTICOM                    MBEDTLS_OID_ISO_IDENTIFIED_ORG MBEDTLS_OID_ORG_CERTICOM
+#define MBEDTLS_OID_ORG_TELETRUST               "\x24" /* teletrust(36) */
+#define MBEDTLS_OID_TELETRUST                   MBEDTLS_OID_ISO_IDENTIFIED_ORG MBEDTLS_OID_ORG_TELETRUST
+
+/*
+ * ISO ITU OID parts
+ */
+#define MBEDTLS_OID_ORGANIZATION                "\x01"          /* {organization(1)} */
+#define MBEDTLS_OID_ISO_ITU_US_ORG              MBEDTLS_OID_ISO_ITU_COUNTRY MBEDTLS_OID_COUNTRY_US MBEDTLS_OID_ORGANIZATION /* {joint-iso-itu-t(2) country(16) us(840) organization(1)} */
+
+#define MBEDTLS_OID_ORG_GOV                     "\x65"          /* {gov(101)} */
+#define MBEDTLS_OID_GOV                         MBEDTLS_OID_ISO_ITU_US_ORG MBEDTLS_OID_ORG_GOV /* {joint-iso-itu-t(2) country(16) us(840) organization(1) gov(101)} */
+
+#define MBEDTLS_OID_ORG_NETSCAPE                "\x86\xF8\x42"  /* {netscape(113730)} */
+#define MBEDTLS_OID_NETSCAPE                    MBEDTLS_OID_ISO_ITU_US_ORG MBEDTLS_OID_ORG_NETSCAPE /* Netscape OID {joint-iso-itu-t(2) country(16) us(840) organization(1) netscape(113730)} */
+
+/* ISO arc for standard certificate and CRL extensions */
+#define MBEDTLS_OID_ID_CE                       MBEDTLS_OID_ISO_CCITT_DS "\x1D" /**< id-ce OBJECT IDENTIFIER  ::=  {joint-iso-ccitt(2) ds(5) 29} */
+
+#define MBEDTLS_OID_NIST_ALG                    MBEDTLS_OID_GOV "\x03\x04" /** { joint-iso-itu-t(2) country(16) us(840) organization(1) gov(101) csor(3) nistAlgorithm(4) */
+
+/**
+ * Private Internet Extensions
+ * { iso(1) identified-organization(3) dod(6) internet(1)
+ *                      security(5) mechanisms(5) pkix(7) }
+ */
+#define MBEDTLS_OID_PKIX                        MBEDTLS_OID_ISO_IDENTIFIED_ORG MBEDTLS_OID_ORG_DOD "\x01\x05\x05\x07"
+
+/*
+ * Arc for standard naming attributes
+ */
+#define MBEDTLS_OID_AT                          MBEDTLS_OID_ISO_CCITT_DS "\x04" /**< id-at OBJECT IDENTIFIER ::= {joint-iso-ccitt(2) ds(5) 4} */
+#define MBEDTLS_OID_AT_CN                       MBEDTLS_OID_AT "\x03" /**< id-at-commonName AttributeType:= {id-at 3} */
+#define MBEDTLS_OID_AT_SUR_NAME                 MBEDTLS_OID_AT "\x04" /**< id-at-surName AttributeType:= {id-at 4} */
+#define MBEDTLS_OID_AT_SERIAL_NUMBER            MBEDTLS_OID_AT "\x05" /**< id-at-serialNumber AttributeType:= {id-at 5} */
+#define MBEDTLS_OID_AT_COUNTRY                  MBEDTLS_OID_AT "\x06" /**< id-at-countryName AttributeType:= {id-at 6} */
+#define MBEDTLS_OID_AT_LOCALITY                 MBEDTLS_OID_AT "\x07" /**< id-at-locality AttributeType:= {id-at 7} */
+#define MBEDTLS_OID_AT_STATE                    MBEDTLS_OID_AT "\x08" /**< id-at-state AttributeType:= {id-at 8} */
+#define MBEDTLS_OID_AT_ORGANIZATION             MBEDTLS_OID_AT "\x0A" /**< id-at-organizationName AttributeType:= {id-at 10} */
+#define MBEDTLS_OID_AT_ORG_UNIT                 MBEDTLS_OID_AT "\x0B" /**< id-at-organizationalUnitName AttributeType:= {id-at 11} */
+#define MBEDTLS_OID_AT_TITLE                    MBEDTLS_OID_AT "\x0C" /**< id-at-title AttributeType:= {id-at 12} */
+#define MBEDTLS_OID_AT_POSTAL_ADDRESS           MBEDTLS_OID_AT "\x10" /**< id-at-postalAddress AttributeType:= {id-at 16} */
+#define MBEDTLS_OID_AT_POSTAL_CODE              MBEDTLS_OID_AT "\x11" /**< id-at-postalCode AttributeType:= {id-at 17} */
+#define MBEDTLS_OID_AT_GIVEN_NAME               MBEDTLS_OID_AT "\x2A" /**< id-at-givenName AttributeType:= {id-at 42} */
+#define MBEDTLS_OID_AT_INITIALS                 MBEDTLS_OID_AT "\x2B" /**< id-at-initials AttributeType:= {id-at 43} */
+#define MBEDTLS_OID_AT_GENERATION_QUALIFIER     MBEDTLS_OID_AT "\x2C" /**< id-at-generationQualifier AttributeType:= {id-at 44} */
+#define MBEDTLS_OID_AT_UNIQUE_IDENTIFIER        MBEDTLS_OID_AT "\x2D" /**< id-at-uniqueIdentifier AttributType:= {id-at 45} */
+#define MBEDTLS_OID_AT_DN_QUALIFIER             MBEDTLS_OID_AT "\x2E" /**< id-at-dnQualifier AttributeType:= {id-at 46} */
+#define MBEDTLS_OID_AT_PSEUDONYM                MBEDTLS_OID_AT "\x41" /**< id-at-pseudonym AttributeType:= {id-at 65} */
+
+#define MBEDTLS_OID_DOMAIN_COMPONENT            "\x09\x92\x26\x89\x93\xF2\x2C\x64\x01\x19" /** id-domainComponent AttributeType:= {itu-t(0) data(9) pss(2342) ucl(19200300) pilot(100) pilotAttributeType(1) domainComponent(25)} */
+
+/*
+ * OIDs for standard certificate extensions
+ */
+#define MBEDTLS_OID_AUTHORITY_KEY_IDENTIFIER    MBEDTLS_OID_ID_CE "\x23" /**< id-ce-authorityKeyIdentifier OBJECT IDENTIFIER ::=  { id-ce 35 } */
+#define MBEDTLS_OID_SUBJECT_KEY_IDENTIFIER      MBEDTLS_OID_ID_CE "\x0E" /**< id-ce-subjectKeyIdentifier OBJECT IDENTIFIER ::=  { id-ce 14 } */
+#define MBEDTLS_OID_KEY_USAGE                   MBEDTLS_OID_ID_CE "\x0F" /**< id-ce-keyUsage OBJECT IDENTIFIER ::=  { id-ce 15 } */
+#define MBEDTLS_OID_CERTIFICATE_POLICIES        MBEDTLS_OID_ID_CE "\x20" /**< id-ce-certificatePolicies OBJECT IDENTIFIER ::=  { id-ce 32 } */
+#define MBEDTLS_OID_POLICY_MAPPINGS             MBEDTLS_OID_ID_CE "\x21" /**< id-ce-policyMappings OBJECT IDENTIFIER ::=  { id-ce 33 } */
+#define MBEDTLS_OID_SUBJECT_ALT_NAME            MBEDTLS_OID_ID_CE "\x11" /**< id-ce-subjectAltName OBJECT IDENTIFIER ::=  { id-ce 17 } */
+#define MBEDTLS_OID_ISSUER_ALT_NAME             MBEDTLS_OID_ID_CE "\x12" /**< id-ce-issuerAltName OBJECT IDENTIFIER ::=  { id-ce 18 } */
+#define MBEDTLS_OID_SUBJECT_DIRECTORY_ATTRS     MBEDTLS_OID_ID_CE "\x09" /**< id-ce-subjectDirectoryAttributes OBJECT IDENTIFIER ::=  { id-ce 9 } */
+#define MBEDTLS_OID_BASIC_CONSTRAINTS           MBEDTLS_OID_ID_CE "\x13" /**< id-ce-basicConstraints OBJECT IDENTIFIER ::=  { id-ce 19 } */
+#define MBEDTLS_OID_NAME_CONSTRAINTS            MBEDTLS_OID_ID_CE "\x1E" /**< id-ce-nameConstraints OBJECT IDENTIFIER ::=  { id-ce 30 } */
+#define MBEDTLS_OID_POLICY_CONSTRAINTS          MBEDTLS_OID_ID_CE "\x24" /**< id-ce-policyConstraints OBJECT IDENTIFIER ::=  { id-ce 36 } */
+#define MBEDTLS_OID_EXTENDED_KEY_USAGE          MBEDTLS_OID_ID_CE "\x25" /**< id-ce-extKeyUsage OBJECT IDENTIFIER ::= { id-ce 37 } */
+#define MBEDTLS_OID_CRL_DISTRIBUTION_POINTS     MBEDTLS_OID_ID_CE "\x1F" /**< id-ce-cRLDistributionPoints OBJECT IDENTIFIER ::=  { id-ce 31 } */
+#define MBEDTLS_OID_INIHIBIT_ANYPOLICY          MBEDTLS_OID_ID_CE "\x36" /**< id-ce-inhibitAnyPolicy OBJECT IDENTIFIER ::=  { id-ce 54 } */
+#define MBEDTLS_OID_FRESHEST_CRL                MBEDTLS_OID_ID_CE "\x2E" /**< id-ce-freshestCRL OBJECT IDENTIFIER ::=  { id-ce 46 } */
+
+/*
+ * Netscape certificate extensions
+ */
+#define MBEDTLS_OID_NS_CERT                 MBEDTLS_OID_NETSCAPE "\x01"
+#define MBEDTLS_OID_NS_CERT_TYPE            MBEDTLS_OID_NS_CERT  "\x01"
+#define MBEDTLS_OID_NS_BASE_URL             MBEDTLS_OID_NS_CERT  "\x02"
+#define MBEDTLS_OID_NS_REVOCATION_URL       MBEDTLS_OID_NS_CERT  "\x03"
+#define MBEDTLS_OID_NS_CA_REVOCATION_URL    MBEDTLS_OID_NS_CERT  "\x04"
+#define MBEDTLS_OID_NS_RENEWAL_URL          MBEDTLS_OID_NS_CERT  "\x07"
+#define MBEDTLS_OID_NS_CA_POLICY_URL        MBEDTLS_OID_NS_CERT  "\x08"
+#define MBEDTLS_OID_NS_SSL_SERVER_NAME      MBEDTLS_OID_NS_CERT  "\x0C"
+#define MBEDTLS_OID_NS_COMMENT              MBEDTLS_OID_NS_CERT  "\x0D"
+#define MBEDTLS_OID_NS_DATA_TYPE            MBEDTLS_OID_NETSCAPE "\x02"
+#define MBEDTLS_OID_NS_CERT_SEQUENCE        MBEDTLS_OID_NS_DATA_TYPE "\x05"
+
+/*
+ * OIDs for CRL extensions
+ */
+#define MBEDTLS_OID_PRIVATE_KEY_USAGE_PERIOD    MBEDTLS_OID_ID_CE "\x10"
+#define MBEDTLS_OID_CRL_NUMBER                  MBEDTLS_OID_ID_CE "\x14" /**< id-ce-cRLNumber OBJECT IDENTIFIER ::= { id-ce 20 } */
+
+/*
+ * X.509 v3 Extended key usage OIDs
+ */
+#define MBEDTLS_OID_ANY_EXTENDED_KEY_USAGE      MBEDTLS_OID_EXTENDED_KEY_USAGE "\x00" /**< anyExtendedKeyUsage OBJECT IDENTIFIER ::= { id-ce-extKeyUsage 0 } */
+
+#define MBEDTLS_OID_KP                          MBEDTLS_OID_PKIX "\x03" /**< id-kp OBJECT IDENTIFIER ::= { id-pkix 3 } */
+#define MBEDTLS_OID_SERVER_AUTH                 MBEDTLS_OID_KP "\x01" /**< id-kp-serverAuth OBJECT IDENTIFIER ::= { id-kp 1 } */
+#define MBEDTLS_OID_CLIENT_AUTH                 MBEDTLS_OID_KP "\x02" /**< id-kp-clientAuth OBJECT IDENTIFIER ::= { id-kp 2 } */
+#define MBEDTLS_OID_CODE_SIGNING                MBEDTLS_OID_KP "\x03" /**< id-kp-codeSigning OBJECT IDENTIFIER ::= { id-kp 3 } */
+#define MBEDTLS_OID_EMAIL_PROTECTION            MBEDTLS_OID_KP "\x04" /**< id-kp-emailProtection OBJECT IDENTIFIER ::= { id-kp 4 } */
+#define MBEDTLS_OID_TIME_STAMPING               MBEDTLS_OID_KP "\x08" /**< id-kp-timeStamping OBJECT IDENTIFIER ::= { id-kp 8 } */
+#define MBEDTLS_OID_OCSP_SIGNING                MBEDTLS_OID_KP "\x09" /**< id-kp-OCSPSigning OBJECT IDENTIFIER ::= { id-kp 9 } */
+
+/*
+ * PKCS definition OIDs
+ */
+
+#define MBEDTLS_OID_PKCS                MBEDTLS_OID_RSA_COMPANY "\x01" /**< pkcs OBJECT IDENTIFIER ::= { iso(1) member-body(2) us(840) rsadsi(113549) 1 } */
+#define MBEDTLS_OID_PKCS1               MBEDTLS_OID_PKCS "\x01" /**< pkcs-1 OBJECT IDENTIFIER ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) 1 } */
+#define MBEDTLS_OID_PKCS5               MBEDTLS_OID_PKCS "\x05" /**< pkcs-5 OBJECT IDENTIFIER ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) 5 } */
+#define MBEDTLS_OID_PKCS9               MBEDTLS_OID_PKCS "\x09" /**< pkcs-9 OBJECT IDENTIFIER ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) 9 } */
+#define MBEDTLS_OID_PKCS12              MBEDTLS_OID_PKCS "\x0c" /**< pkcs-12 OBJECT IDENTIFIER ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) 12 } */
+
+/*
+ * PKCS#1 OIDs
+ */
+#define MBEDTLS_OID_PKCS1_RSA           MBEDTLS_OID_PKCS1 "\x01" /**< rsaEncryption OBJECT IDENTIFIER ::= { pkcs-1 1 } */
+#define MBEDTLS_OID_PKCS1_MD2           MBEDTLS_OID_PKCS1 "\x02" /**< md2WithRSAEncryption ::= { pkcs-1 2 } */
+#define MBEDTLS_OID_PKCS1_MD4           MBEDTLS_OID_PKCS1 "\x03" /**< md4WithRSAEncryption ::= { pkcs-1 3 } */
+#define MBEDTLS_OID_PKCS1_MD5           MBEDTLS_OID_PKCS1 "\x04" /**< md5WithRSAEncryption ::= { pkcs-1 4 } */
+#define MBEDTLS_OID_PKCS1_SHA1          MBEDTLS_OID_PKCS1 "\x05" /**< sha1WithRSAEncryption ::= { pkcs-1 5 } */
+#define MBEDTLS_OID_PKCS1_SHA224        MBEDTLS_OID_PKCS1 "\x0e" /**< sha224WithRSAEncryption ::= { pkcs-1 14 } */
+#define MBEDTLS_OID_PKCS1_SHA256        MBEDTLS_OID_PKCS1 "\x0b" /**< sha256WithRSAEncryption ::= { pkcs-1 11 } */
+#define MBEDTLS_OID_PKCS1_SHA384        MBEDTLS_OID_PKCS1 "\x0c" /**< sha384WithRSAEncryption ::= { pkcs-1 12 } */
+#define MBEDTLS_OID_PKCS1_SHA512        MBEDTLS_OID_PKCS1 "\x0d" /**< sha512WithRSAEncryption ::= { pkcs-1 13 } */
+
+#define MBEDTLS_OID_RSA_SHA_OBS         "\x2B\x0E\x03\x02\x1D"
+
+#define MBEDTLS_OID_PKCS9_EMAIL         MBEDTLS_OID_PKCS9 "\x01" /**< emailAddress AttributeType ::= { pkcs-9 1 } */
+
+/* RFC 4055 */
+#define MBEDTLS_OID_RSASSA_PSS          MBEDTLS_OID_PKCS1 "\x0a" /**< id-RSASSA-PSS ::= { pkcs-1 10 } */
+#define MBEDTLS_OID_MGF1                MBEDTLS_OID_PKCS1 "\x08" /**< id-mgf1 ::= { pkcs-1 8 } */
+
+/*
+ * Digest algorithms
+ */
+#define MBEDTLS_OID_DIGEST_ALG_MD2              MBEDTLS_OID_RSA_COMPANY "\x02\x02" /**< id-mbedtls_md2 OBJECT IDENTIFIER ::= { iso(1) member-body(2) us(840) rsadsi(113549) digestAlgorithm(2) 2 } */
+#define MBEDTLS_OID_DIGEST_ALG_MD4              MBEDTLS_OID_RSA_COMPANY "\x02\x04" /**< id-mbedtls_md4 OBJECT IDENTIFIER ::= { iso(1) member-body(2) us(840) rsadsi(113549) digestAlgorithm(2) 4 } */
+#define MBEDTLS_OID_DIGEST_ALG_MD5              MBEDTLS_OID_RSA_COMPANY "\x02\x05" /**< id-mbedtls_md5 OBJECT IDENTIFIER ::= { iso(1) member-body(2) us(840) rsadsi(113549) digestAlgorithm(2) 5 } */
+#define MBEDTLS_OID_DIGEST_ALG_SHA1             MBEDTLS_OID_ISO_IDENTIFIED_ORG MBEDTLS_OID_OIW_SECSIG_SHA1 /**< id-mbedtls_sha1 OBJECT IDENTIFIER ::= { iso(1) identified-organization(3) oiw(14) secsig(3) algorithms(2) 26 } */
+#define MBEDTLS_OID_DIGEST_ALG_SHA224           MBEDTLS_OID_NIST_ALG "\x02\x04" /**< id-sha224 OBJECT IDENTIFIER ::= { joint-iso-itu-t(2) country(16) us(840) organization(1) gov(101) csor(3) nistalgorithm(4) hashalgs(2) 4 } */
+#define MBEDTLS_OID_DIGEST_ALG_SHA256           MBEDTLS_OID_NIST_ALG "\x02\x01" /**< id-mbedtls_sha256 OBJECT IDENTIFIER ::= { joint-iso-itu-t(2) country(16) us(840) organization(1) gov(101) csor(3) nistalgorithm(4) hashalgs(2) 1 } */
+
+#define MBEDTLS_OID_DIGEST_ALG_SHA384           MBEDTLS_OID_NIST_ALG "\x02\x02" /**< id-sha384 OBJECT IDENTIFIER ::= { joint-iso-itu-t(2) country(16) us(840) organization(1) gov(101) csor(3) nistalgorithm(4) hashalgs(2) 2 } */
+
+#define MBEDTLS_OID_DIGEST_ALG_SHA512           MBEDTLS_OID_NIST_ALG "\x02\x03" /**< id-mbedtls_sha512 OBJECT IDENTIFIER ::= { joint-iso-itu-t(2) country(16) us(840) organization(1) gov(101) csor(3) nistalgorithm(4) hashalgs(2) 3 } */
+
+#define MBEDTLS_OID_HMAC_SHA1                   MBEDTLS_OID_RSA_COMPANY "\x02\x07" /**< id-hmacWithSHA1 OBJECT IDENTIFIER ::= { iso(1) member-body(2) us(840) rsadsi(113549) digestAlgorithm(2) 7 } */
+
+#define MBEDTLS_OID_HMAC_SHA224                 MBEDTLS_OID_RSA_COMPANY "\x02\x08" /**< id-hmacWithSHA224 OBJECT IDENTIFIER ::= { iso(1) member-body(2) us(840) rsadsi(113549) digestAlgorithm(2) 8 } */
+
+#define MBEDTLS_OID_HMAC_SHA256                 MBEDTLS_OID_RSA_COMPANY "\x02\x09" /**< id-hmacWithSHA256 OBJECT IDENTIFIER ::= { iso(1) member-body(2) us(840) rsadsi(113549) digestAlgorithm(2) 9 } */
+
+#define MBEDTLS_OID_HMAC_SHA384                 MBEDTLS_OID_RSA_COMPANY "\x02\x0A" /**< id-hmacWithSHA384 OBJECT IDENTIFIER ::= { iso(1) member-body(2) us(840) rsadsi(113549) digestAlgorithm(2) 10 } */
+
+#define MBEDTLS_OID_HMAC_SHA512                 MBEDTLS_OID_RSA_COMPANY "\x02\x0B" /**< id-hmacWithSHA512 OBJECT IDENTIFIER ::= { iso(1) member-body(2) us(840) rsadsi(113549) digestAlgorithm(2) 11 } */
+
+/*
+ * Encryption algorithms
+ */
+#define MBEDTLS_OID_DES_CBC                     MBEDTLS_OID_ISO_IDENTIFIED_ORG MBEDTLS_OID_OIW_SECSIG_ALG "\x07" /**< desCBC OBJECT IDENTIFIER ::= { iso(1) identified-organization(3) oiw(14) secsig(3) algorithms(2) 7 } */
+#define MBEDTLS_OID_DES_EDE3_CBC                MBEDTLS_OID_RSA_COMPANY "\x03\x07" /**< des-ede3-cbc OBJECT IDENTIFIER ::= { iso(1) member-body(2) -- us(840) rsadsi(113549) encryptionAlgorithm(3) 7 } */
+#define MBEDTLS_OID_AES                         MBEDTLS_OID_NIST_ALG "\x01" /** aes OBJECT IDENTIFIER ::= { joint-iso-itu-t(2) country(16) us(840) organization(1) gov(101) csor(3) nistAlgorithm(4) 1 } */
+
+/*
+ * Key Wrapping algorithms
+ */
+/*
+ * RFC 5649
+ */
+#define MBEDTLS_OID_AES128_KW                   MBEDTLS_OID_AES "\x05" /** id-aes128-wrap     OBJECT IDENTIFIER ::= { aes 5 } */
+#define MBEDTLS_OID_AES128_KWP                  MBEDTLS_OID_AES "\x08" /** id-aes128-wrap-pad OBJECT IDENTIFIER ::= { aes 8 } */
+#define MBEDTLS_OID_AES192_KW                   MBEDTLS_OID_AES "\x19" /** id-aes192-wrap     OBJECT IDENTIFIER ::= { aes 25 } */
+#define MBEDTLS_OID_AES192_KWP                  MBEDTLS_OID_AES "\x1c" /** id-aes192-wrap-pad OBJECT IDENTIFIER ::= { aes 28 } */
+#define MBEDTLS_OID_AES256_KW                   MBEDTLS_OID_AES "\x2d" /** id-aes256-wrap     OBJECT IDENTIFIER ::= { aes 45 } */
+#define MBEDTLS_OID_AES256_KWP                  MBEDTLS_OID_AES "\x30" /** id-aes256-wrap-pad OBJECT IDENTIFIER ::= { aes 48 } */
+/*
+ * PKCS#5 OIDs
+ */
+#define MBEDTLS_OID_PKCS5_PBKDF2                MBEDTLS_OID_PKCS5 "\x0c" /**< id-PBKDF2 OBJECT IDENTIFIER ::= {pkcs-5 12} */
+#define MBEDTLS_OID_PKCS5_PBES2                 MBEDTLS_OID_PKCS5 "\x0d" /**< id-PBES2 OBJECT IDENTIFIER ::= {pkcs-5 13} */
+#define MBEDTLS_OID_PKCS5_PBMAC1                MBEDTLS_OID_PKCS5 "\x0e" /**< id-PBMAC1 OBJECT IDENTIFIER ::= {pkcs-5 14} */
+
+/*
+ * PKCS#5 PBES1 algorithms
+ */
+#define MBEDTLS_OID_PKCS5_PBE_MD2_DES_CBC       MBEDTLS_OID_PKCS5 "\x01" /**< pbeWithMD2AndDES-CBC OBJECT IDENTIFIER ::= {pkcs-5 1} */
+#define MBEDTLS_OID_PKCS5_PBE_MD2_RC2_CBC       MBEDTLS_OID_PKCS5 "\x04" /**< pbeWithMD2AndRC2-CBC OBJECT IDENTIFIER ::= {pkcs-5 4} */
+#define MBEDTLS_OID_PKCS5_PBE_MD5_DES_CBC       MBEDTLS_OID_PKCS5 "\x03" /**< pbeWithMD5AndDES-CBC OBJECT IDENTIFIER ::= {pkcs-5 3} */
+#define MBEDTLS_OID_PKCS5_PBE_MD5_RC2_CBC       MBEDTLS_OID_PKCS5 "\x06" /**< pbeWithMD5AndRC2-CBC OBJECT IDENTIFIER ::= {pkcs-5 6} */
+#define MBEDTLS_OID_PKCS5_PBE_SHA1_DES_CBC      MBEDTLS_OID_PKCS5 "\x0a" /**< pbeWithSHA1AndDES-CBC OBJECT IDENTIFIER ::= {pkcs-5 10} */
+#define MBEDTLS_OID_PKCS5_PBE_SHA1_RC2_CBC      MBEDTLS_OID_PKCS5 "\x0b" /**< pbeWithSHA1AndRC2-CBC OBJECT IDENTIFIER ::= {pkcs-5 11} */
+
+/*
+ * PKCS#8 OIDs
+ */
+#define MBEDTLS_OID_PKCS9_CSR_EXT_REQ           MBEDTLS_OID_PKCS9 "\x0e" /**< extensionRequest OBJECT IDENTIFIER ::= {pkcs-9 14} */
+
+/*
+ * PKCS#12 PBE OIDs
+ */
+#define MBEDTLS_OID_PKCS12_PBE                      MBEDTLS_OID_PKCS12 "\x01" /**< pkcs-12PbeIds OBJECT IDENTIFIER ::= {pkcs-12 1} */
+
+#define MBEDTLS_OID_PKCS12_PBE_SHA1_RC4_128         MBEDTLS_OID_PKCS12_PBE "\x01" /**< pbeWithSHAAnd128BitRC4 OBJECT IDENTIFIER ::= {pkcs-12PbeIds 1} */
+#define MBEDTLS_OID_PKCS12_PBE_SHA1_RC4_40          MBEDTLS_OID_PKCS12_PBE "\x02" /**< pbeWithSHAAnd40BitRC4 OBJECT IDENTIFIER ::= {pkcs-12PbeIds 2} */
+#define MBEDTLS_OID_PKCS12_PBE_SHA1_DES3_EDE_CBC    MBEDTLS_OID_PKCS12_PBE "\x03" /**< pbeWithSHAAnd3-KeyTripleDES-CBC OBJECT IDENTIFIER ::= {pkcs-12PbeIds 3} */
+#define MBEDTLS_OID_PKCS12_PBE_SHA1_DES2_EDE_CBC    MBEDTLS_OID_PKCS12_PBE "\x04" /**< pbeWithSHAAnd2-KeyTripleDES-CBC OBJECT IDENTIFIER ::= {pkcs-12PbeIds 4} */
+#define MBEDTLS_OID_PKCS12_PBE_SHA1_RC2_128_CBC     MBEDTLS_OID_PKCS12_PBE "\x05" /**< pbeWithSHAAnd128BitRC2-CBC OBJECT IDENTIFIER ::= {pkcs-12PbeIds 5} */
+#define MBEDTLS_OID_PKCS12_PBE_SHA1_RC2_40_CBC      MBEDTLS_OID_PKCS12_PBE "\x06" /**< pbeWithSHAAnd40BitRC2-CBC OBJECT IDENTIFIER ::= {pkcs-12PbeIds 6} */
+
+/*
+ * EC key algorithms from RFC 5480
+ */
+
+/* id-ecPublicKey OBJECT IDENTIFIER ::= {
+ *       iso(1) member-body(2) us(840) ansi-X9-62(10045) keyType(2) 1 } */
+#define MBEDTLS_OID_EC_ALG_UNRESTRICTED         MBEDTLS_OID_ANSI_X9_62 "\x02\01"
+
+/*   id-ecDH OBJECT IDENTIFIER ::= {
+ *     iso(1) identified-organization(3) certicom(132)
+ *     schemes(1) ecdh(12) } */
+#define MBEDTLS_OID_EC_ALG_ECDH                 MBEDTLS_OID_CERTICOM "\x01\x0c"
+
+/*
+ * ECParameters namedCurve identifiers, from RFC 5480, RFC 5639, and SEC2
+ */
+
+/* secp192r1 OBJECT IDENTIFIER ::= {
+ *   iso(1) member-body(2) us(840) ansi-X9-62(10045) curves(3) prime(1) 1 } */
+#define MBEDTLS_OID_EC_GRP_SECP192R1        MBEDTLS_OID_ANSI_X9_62 "\x03\x01\x01"
+
+/* secp224r1 OBJECT IDENTIFIER ::= {
+ *   iso(1) identified-organization(3) certicom(132) curve(0) 33 } */
+#define MBEDTLS_OID_EC_GRP_SECP224R1        MBEDTLS_OID_CERTICOM "\x00\x21"
+
+/* secp256r1 OBJECT IDENTIFIER ::= {
+ *   iso(1) member-body(2) us(840) ansi-X9-62(10045) curves(3) prime(1) 7 } */
+#define MBEDTLS_OID_EC_GRP_SECP256R1        MBEDTLS_OID_ANSI_X9_62 "\x03\x01\x07"
+
+/* secp384r1 OBJECT IDENTIFIER ::= {
+ *   iso(1) identified-organization(3) certicom(132) curve(0) 34 } */
+#define MBEDTLS_OID_EC_GRP_SECP384R1        MBEDTLS_OID_CERTICOM "\x00\x22"
+
+/* secp521r1 OBJECT IDENTIFIER ::= {
+ *   iso(1) identified-organization(3) certicom(132) curve(0) 35 } */
+#define MBEDTLS_OID_EC_GRP_SECP521R1        MBEDTLS_OID_CERTICOM "\x00\x23"
+
+/* secp192k1 OBJECT IDENTIFIER ::= {
+ *   iso(1) identified-organization(3) certicom(132) curve(0) 31 } */
+#define MBEDTLS_OID_EC_GRP_SECP192K1        MBEDTLS_OID_CERTICOM "\x00\x1f"
+
+/* secp224k1 OBJECT IDENTIFIER ::= {
+ *   iso(1) identified-organization(3) certicom(132) curve(0) 32 } */
+#define MBEDTLS_OID_EC_GRP_SECP224K1        MBEDTLS_OID_CERTICOM "\x00\x20"
+
+/* secp256k1 OBJECT IDENTIFIER ::= {
+ *   iso(1) identified-organization(3) certicom(132) curve(0) 10 } */
+#define MBEDTLS_OID_EC_GRP_SECP256K1        MBEDTLS_OID_CERTICOM "\x00\x0a"
+
+/* RFC 5639 4.1
+ * ecStdCurvesAndGeneration OBJECT IDENTIFIER::= {iso(1)
+ * identified-organization(3) teletrust(36) algorithm(3) signature-
+ * algorithm(3) ecSign(2) 8}
+ * ellipticCurve OBJECT IDENTIFIER ::= {ecStdCurvesAndGeneration 1}
+ * versionOne OBJECT IDENTIFIER ::= {ellipticCurve 1} */
+#define MBEDTLS_OID_EC_BRAINPOOL_V1         MBEDTLS_OID_TELETRUST "\x03\x03\x02\x08\x01\x01"
+
+/* brainpoolP256r1 OBJECT IDENTIFIER ::= {versionOne 7} */
+#define MBEDTLS_OID_EC_GRP_BP256R1          MBEDTLS_OID_EC_BRAINPOOL_V1 "\x07"
+
+/* brainpoolP384r1 OBJECT IDENTIFIER ::= {versionOne 11} */
+#define MBEDTLS_OID_EC_GRP_BP384R1          MBEDTLS_OID_EC_BRAINPOOL_V1 "\x0B"
+
+/* brainpoolP512r1 OBJECT IDENTIFIER ::= {versionOne 13} */
+#define MBEDTLS_OID_EC_GRP_BP512R1          MBEDTLS_OID_EC_BRAINPOOL_V1 "\x0D"
+
+/*
+ * SEC1 C.1
+ *
+ * prime-field OBJECT IDENTIFIER ::= { id-fieldType 1 }
+ * id-fieldType OBJECT IDENTIFIER ::= { ansi-X9-62 fieldType(1)}
+ */
+#define MBEDTLS_OID_ANSI_X9_62_FIELD_TYPE   MBEDTLS_OID_ANSI_X9_62 "\x01"
+#define MBEDTLS_OID_ANSI_X9_62_PRIME_FIELD  MBEDTLS_OID_ANSI_X9_62_FIELD_TYPE "\x01"
+
+/*
+ * ECDSA signature identifiers, from RFC 5480
+ */
+#define MBEDTLS_OID_ANSI_X9_62_SIG          MBEDTLS_OID_ANSI_X9_62 "\x04" /* signatures(4) */
+#define MBEDTLS_OID_ANSI_X9_62_SIG_SHA2     MBEDTLS_OID_ANSI_X9_62_SIG "\x03" /* ecdsa-with-SHA2(3) */
+
+/* ecdsa-with-SHA1 OBJECT IDENTIFIER ::= {
+ *   iso(1) member-body(2) us(840) ansi-X9-62(10045) signatures(4) 1 } */
+#define MBEDTLS_OID_ECDSA_SHA1              MBEDTLS_OID_ANSI_X9_62_SIG "\x01"
+
+/* ecdsa-with-SHA224 OBJECT IDENTIFIER ::= {
+ *   iso(1) member-body(2) us(840) ansi-X9-62(10045) signatures(4)
+ *   ecdsa-with-SHA2(3) 1 } */
+#define MBEDTLS_OID_ECDSA_SHA224            MBEDTLS_OID_ANSI_X9_62_SIG_SHA2 "\x01"
+
+/* ecdsa-with-SHA256 OBJECT IDENTIFIER ::= {
+ *   iso(1) member-body(2) us(840) ansi-X9-62(10045) signatures(4)
+ *   ecdsa-with-SHA2(3) 2 } */
+#define MBEDTLS_OID_ECDSA_SHA256            MBEDTLS_OID_ANSI_X9_62_SIG_SHA2 "\x02"
+
+/* ecdsa-with-SHA384 OBJECT IDENTIFIER ::= {
+ *   iso(1) member-body(2) us(840) ansi-X9-62(10045) signatures(4)
+ *   ecdsa-with-SHA2(3) 3 } */
+#define MBEDTLS_OID_ECDSA_SHA384            MBEDTLS_OID_ANSI_X9_62_SIG_SHA2 "\x03"
+
+/* ecdsa-with-SHA512 OBJECT IDENTIFIER ::= {
+ *   iso(1) member-body(2) us(840) ansi-X9-62(10045) signatures(4)
+ *   ecdsa-with-SHA2(3) 4 } */
+#define MBEDTLS_OID_ECDSA_SHA512            MBEDTLS_OID_ANSI_X9_62_SIG_SHA2 "\x04"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \brief Base OID descriptor structure
+ */
+typedef struct mbedtls_oid_descriptor_t
+{
+    const char *asn1;               /*!< OID ASN.1 representation       */
+    size_t asn1_len;                /*!< length of asn1                 */
+    const char *name;               /*!< official name (e.g. from RFC)  */
+    const char *description;        /*!< human friendly description     */
+} mbedtls_oid_descriptor_t;
+
+/**
+ * \brief           Translate an ASN.1 OID into its numeric representation
+ *                  (e.g. "\x2A\x86\x48\x86\xF7\x0D" into "1.2.840.113549")
+ *
+ * \param buf       buffer to put representation in
+ * \param size      size of the buffer
+ * \param oid       OID to translate
+ *
+ * \return          Length of the string written (excluding final NULL) or
+ *                  MBEDTLS_ERR_OID_BUF_TOO_SMALL in case of error
+ */
+int mbedtls_oid_get_numeric_string( char *buf, size_t size, const mbedtls_asn1_buf *oid );
+
+#if defined(MBEDTLS_X509_USE_C) || defined(MBEDTLS_X509_CREATE_C)
+/**
+ * \brief          Translate an X.509 extension OID into local values
+ *
+ * \param oid      OID to use
+ * \param ext_type place to store the extension type
+ *
+ * \return         0 if successful, or MBEDTLS_ERR_OID_NOT_FOUND
+ */
+int mbedtls_oid_get_x509_ext_type( const mbedtls_asn1_buf *oid, int *ext_type );
+#endif
+
+/**
+ * \brief          Translate an X.509 attribute type OID into the short name
+ *                 (e.g. the OID for an X520 Common Name into "CN")
+ *
+ * \param oid      OID to use
+ * \param short_name    place to store the string pointer
+ *
+ * \return         0 if successful, or MBEDTLS_ERR_OID_NOT_FOUND
+ */
+int mbedtls_oid_get_attr_short_name( const mbedtls_asn1_buf *oid, const char **short_name );
+
+/**
+ * \brief          Translate PublicKeyAlgorithm OID into pk_type
+ *
+ * \param oid      OID to use
+ * \param pk_alg   place to store public key algorithm
+ *
+ * \return         0 if successful, or MBEDTLS_ERR_OID_NOT_FOUND
+ */
+int mbedtls_oid_get_pk_alg( const mbedtls_asn1_buf *oid, mbedtls_pk_type_t *pk_alg );
+
+/**
+ * \brief          Translate pk_type into PublicKeyAlgorithm OID
+ *
+ * \param pk_alg   Public key type to look for
+ * \param oid      place to store ASN.1 OID string pointer
+ * \param olen     length of the OID
+ *
+ * \return         0 if successful, or MBEDTLS_ERR_OID_NOT_FOUND
+ */
+int mbedtls_oid_get_oid_by_pk_alg( mbedtls_pk_type_t pk_alg,
+                           const char **oid, size_t *olen );
+
+#if defined(MBEDTLS_ECP_C)
+/**
+ * \brief          Translate NamedCurve OID into an EC group identifier
+ *
+ * \param oid      OID to use
+ * \param grp_id   place to store group id
+ *
+ * \return         0 if successful, or MBEDTLS_ERR_OID_NOT_FOUND
+ */
+int mbedtls_oid_get_ec_grp( const mbedtls_asn1_buf *oid, mbedtls_ecp_group_id *grp_id );
+
+/**
+ * \brief          Translate EC group identifier into NamedCurve OID
+ *
+ * \param grp_id   EC group identifier
+ * \param oid      place to store ASN.1 OID string pointer
+ * \param olen     length of the OID
+ *
+ * \return         0 if successful, or MBEDTLS_ERR_OID_NOT_FOUND
+ */
+int mbedtls_oid_get_oid_by_ec_grp( mbedtls_ecp_group_id grp_id,
+                           const char **oid, size_t *olen );
+#endif /* MBEDTLS_ECP_C */
+
+#if defined(MBEDTLS_MD_C)
+/**
+ * \brief          Translate SignatureAlgorithm OID into md_type and pk_type
+ *
+ * \param oid      OID to use
+ * \param md_alg   place to store message digest algorithm
+ * \param pk_alg   place to store public key algorithm
+ *
+ * \return         0 if successful, or MBEDTLS_ERR_OID_NOT_FOUND
+ */
+int mbedtls_oid_get_sig_alg( const mbedtls_asn1_buf *oid,
+                     mbedtls_md_type_t *md_alg, mbedtls_pk_type_t *pk_alg );
+
+/**
+ * \brief          Translate SignatureAlgorithm OID into description
+ *
+ * \param oid      OID to use
+ * \param desc     place to store string pointer
+ *
+ * \return         0 if successful, or MBEDTLS_ERR_OID_NOT_FOUND
+ */
+int mbedtls_oid_get_sig_alg_desc( const mbedtls_asn1_buf *oid, const char **desc );
+
+/**
+ * \brief          Translate md_type and pk_type into SignatureAlgorithm OID
+ *
+ * \param md_alg   message digest algorithm
+ * \param pk_alg   public key algorithm
+ * \param oid      place to store ASN.1 OID string pointer
+ * \param olen     length of the OID
+ *
+ * \return         0 if successful, or MBEDTLS_ERR_OID_NOT_FOUND
+ */
+int mbedtls_oid_get_oid_by_sig_alg( mbedtls_pk_type_t pk_alg, mbedtls_md_type_t md_alg,
+                            const char **oid, size_t *olen );
+
+/**
+ * \brief          Translate hash algorithm OID into md_type
+ *
+ * \param oid      OID to use
+ * \param md_alg   place to store message digest algorithm
+ *
+ * \return         0 if successful, or MBEDTLS_ERR_OID_NOT_FOUND
+ */
+int mbedtls_oid_get_md_alg( const mbedtls_asn1_buf *oid, mbedtls_md_type_t *md_alg );
+
+/**
+ * \brief          Translate hmac algorithm OID into md_type
+ *
+ * \param oid      OID to use
+ * \param md_hmac  place to store message hmac algorithm
+ *
+ * \return         0 if successful, or MBEDTLS_ERR_OID_NOT_FOUND
+ */
+int mbedtls_oid_get_md_hmac( const mbedtls_asn1_buf *oid, mbedtls_md_type_t *md_hmac );
+#endif /* MBEDTLS_MD_C */
+
+/**
+ * \brief          Translate Extended Key Usage OID into description
+ *
+ * \param oid      OID to use
+ * \param desc     place to store string pointer
+ *
+ * \return         0 if successful, or MBEDTLS_ERR_OID_NOT_FOUND
+ */
+int mbedtls_oid_get_extended_key_usage( const mbedtls_asn1_buf *oid, const char **desc );
+
+/**
+ * \brief          Translate md_type into hash algorithm OID
+ *
+ * \param md_alg   message digest algorithm
+ * \param oid      place to store ASN.1 OID string pointer
+ * \param olen     length of the OID
+ *
+ * \return         0 if successful, or MBEDTLS_ERR_OID_NOT_FOUND
+ */
+int mbedtls_oid_get_oid_by_md( mbedtls_md_type_t md_alg, const char **oid, size_t *olen );
+
+#if defined(MBEDTLS_CIPHER_C)
+/**
+ * \brief          Translate encryption algorithm OID into cipher_type
+ *
+ * \param oid           OID to use
+ * \param cipher_alg    place to store cipher algorithm
+ *
+ * \return         0 if successful, or MBEDTLS_ERR_OID_NOT_FOUND
+ */
+int mbedtls_oid_get_cipher_alg( const mbedtls_asn1_buf *oid, mbedtls_cipher_type_t *cipher_alg );
+#endif /* MBEDTLS_CIPHER_C */
+
+#if defined(MBEDTLS_PKCS12_C)
+/**
+ * \brief          Translate PKCS#12 PBE algorithm OID into md_type and
+ *                 cipher_type
+ *
+ * \param oid           OID to use
+ * \param md_alg        place to store message digest algorithm
+ * \param cipher_alg    place to store cipher algorithm
+ *
+ * \return         0 if successful, or MBEDTLS_ERR_OID_NOT_FOUND
+ */
+int mbedtls_oid_get_pkcs12_pbe_alg( const mbedtls_asn1_buf *oid, mbedtls_md_type_t *md_alg,
+                            mbedtls_cipher_type_t *cipher_alg );
+#endif /* MBEDTLS_PKCS12_C */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* oid.h */
diff --git a/common/mbedtls/pem.c b/common/mbedtls/pem.c
new file mode 100644
index 000000000..3436d07ef
--- /dev/null
+++ b/common/mbedtls/pem.c
@@ -0,0 +1,490 @@
+/*
+ *  Privacy Enhanced Mail (PEM) decoding
+ *
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "mbedtls/config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#if defined(MBEDTLS_PEM_PARSE_C) || defined(MBEDTLS_PEM_WRITE_C)
+
+#include "mbedtls/pem.h"
+#include "mbedtls/base64.h"
+#include "mbedtls/des.h"
+#include "mbedtls/aes.h"
+#include "mbedtls/md5.h"
+#include "mbedtls/cipher.h"
+#include "mbedtls/platform_util.h"
+
+#include <string.h>
+
+#if defined(MBEDTLS_PLATFORM_C)
+#include "mbedtls/platform.h"
+#else
+#include <stdlib.h>
+#define mbedtls_calloc    calloc
+#define mbedtls_free       free
+#endif
+
+#if defined(MBEDTLS_PEM_PARSE_C)
+void mbedtls_pem_init( mbedtls_pem_context *ctx )
+{
+    memset( ctx, 0, sizeof( mbedtls_pem_context ) );
+}
+
+#if defined(MBEDTLS_MD5_C) && defined(MBEDTLS_CIPHER_MODE_CBC) &&         \
+    ( defined(MBEDTLS_DES_C) || defined(MBEDTLS_AES_C) )
+/*
+ * Read a 16-byte hex string and convert it to binary
+ */
+static int pem_get_iv( const unsigned char *s, unsigned char *iv,
+                       size_t iv_len )
+{
+    size_t i, j, k;
+
+    memset( iv, 0, iv_len );
+
+    for( i = 0; i < iv_len * 2; i++, s++ )
+    {
+        if( *s >= '0' && *s <= '9' ) j = *s - '0'; else
+        if( *s >= 'A' && *s <= 'F' ) j = *s - '7'; else
+        if( *s >= 'a' && *s <= 'f' ) j = *s - 'W'; else
+            return( MBEDTLS_ERR_PEM_INVALID_ENC_IV );
+
+        k = ( ( i & 1 ) != 0 ) ? j : j << 4;
+
+        iv[i >> 1] = (unsigned char)( iv[i >> 1] | k );
+    }
+
+    return( 0 );
+}
+
+static int pem_pbkdf1( unsigned char *key, size_t keylen,
+                       unsigned char *iv,
+                       const unsigned char *pwd, size_t pwdlen )
+{
+    mbedtls_md5_context md5_ctx;
+    unsigned char md5sum[16];
+    size_t use_len;
+    int ret;
+
+    mbedtls_md5_init( &md5_ctx );
+
+    /*
+     * key[ 0..15] = MD5(pwd || IV)
+     */
+    if( ( ret = mbedtls_md5_starts_ret( &md5_ctx ) ) != 0 )
+        goto exit;
+    if( ( ret = mbedtls_md5_update_ret( &md5_ctx, pwd, pwdlen ) ) != 0 )
+        goto exit;
+    if( ( ret = mbedtls_md5_update_ret( &md5_ctx, iv,  8 ) ) != 0 )
+        goto exit;
+    if( ( ret = mbedtls_md5_finish_ret( &md5_ctx, md5sum ) ) != 0 )
+        goto exit;
+
+    if( keylen <= 16 )
+    {
+        memcpy( key, md5sum, keylen );
+        goto exit;
+    }
+
+    memcpy( key, md5sum, 16 );
+
+    /*
+     * key[16..23] = MD5(key[ 0..15] || pwd || IV])
+     */
+    if( ( ret = mbedtls_md5_starts_ret( &md5_ctx ) ) != 0 )
+        goto exit;
+    if( ( ret = mbedtls_md5_update_ret( &md5_ctx, md5sum, 16 ) ) != 0 )
+        goto exit;
+    if( ( ret = mbedtls_md5_update_ret( &md5_ctx, pwd, pwdlen ) ) != 0 )
+        goto exit;
+    if( ( ret = mbedtls_md5_update_ret( &md5_ctx, iv, 8 ) ) != 0 )
+        goto exit;
+    if( ( ret = mbedtls_md5_finish_ret( &md5_ctx, md5sum ) ) != 0 )
+        goto exit;
+
+    use_len = 16;
+    if( keylen < 32 )
+        use_len = keylen - 16;
+
+    memcpy( key + 16, md5sum, use_len );
+
+exit:
+    mbedtls_md5_free( &md5_ctx );
+    mbedtls_platform_zeroize( md5sum, 16 );
+
+    return( ret );
+}
+
+#if defined(MBEDTLS_DES_C)
+/*
+ * Decrypt with DES-CBC, using PBKDF1 for key derivation
+ */
+static int pem_des_decrypt( unsigned char des_iv[8],
+                            unsigned char *buf, size_t buflen,
+                            const unsigned char *pwd, size_t pwdlen )
+{
+    mbedtls_des_context des_ctx;
+    unsigned char des_key[8];
+    int ret;
+
+    mbedtls_des_init( &des_ctx );
+
+    if( ( ret = pem_pbkdf1( des_key, 8, des_iv, pwd, pwdlen ) ) != 0 )
+        goto exit;
+
+    if( ( ret = mbedtls_des_setkey_dec( &des_ctx, des_key ) ) != 0 )
+        goto exit;
+    ret = mbedtls_des_crypt_cbc( &des_ctx, MBEDTLS_DES_DECRYPT, buflen,
+                     des_iv, buf, buf );
+
+exit:
+    mbedtls_des_free( &des_ctx );
+    mbedtls_platform_zeroize( des_key, 8 );
+
+    return( ret );
+}
+
+/*
+ * Decrypt with 3DES-CBC, using PBKDF1 for key derivation
+ */
+static int pem_des3_decrypt( unsigned char des3_iv[8],
+                             unsigned char *buf, size_t buflen,
+                             const unsigned char *pwd, size_t pwdlen )
+{
+    mbedtls_des3_context des3_ctx;
+    unsigned char des3_key[24];
+    int ret;
+
+    mbedtls_des3_init( &des3_ctx );
+
+    if( ( ret = pem_pbkdf1( des3_key, 24, des3_iv, pwd, pwdlen ) ) != 0 )
+        goto exit;
+
+    if( ( ret = mbedtls_des3_set3key_dec( &des3_ctx, des3_key ) ) != 0 )
+        goto exit;
+    ret = mbedtls_des3_crypt_cbc( &des3_ctx, MBEDTLS_DES_DECRYPT, buflen,
+                     des3_iv, buf, buf );
+
+exit:
+    mbedtls_des3_free( &des3_ctx );
+    mbedtls_platform_zeroize( des3_key, 24 );
+
+    return( ret );
+}
+#endif /* MBEDTLS_DES_C */
+
+#if defined(MBEDTLS_AES_C)
+/*
+ * Decrypt with AES-XXX-CBC, using PBKDF1 for key derivation
+ */
+static int pem_aes_decrypt( unsigned char aes_iv[16], unsigned int keylen,
+                            unsigned char *buf, size_t buflen,
+                            const unsigned char *pwd, size_t pwdlen )
+{
+    mbedtls_aes_context aes_ctx;
+    unsigned char aes_key[32];
+    int ret;
+
+    mbedtls_aes_init( &aes_ctx );
+
+    if( ( ret = pem_pbkdf1( aes_key, keylen, aes_iv, pwd, pwdlen ) ) != 0 )
+        goto exit;
+
+    if( ( ret = mbedtls_aes_setkey_dec( &aes_ctx, aes_key, keylen * 8 ) ) != 0 )
+        goto exit;
+    ret = mbedtls_aes_crypt_cbc( &aes_ctx, MBEDTLS_AES_DECRYPT, buflen,
+                     aes_iv, buf, buf );
+
+exit:
+    mbedtls_aes_free( &aes_ctx );
+    mbedtls_platform_zeroize( aes_key, keylen );
+
+    return( ret );
+}
+#endif /* MBEDTLS_AES_C */
+
+#endif /* MBEDTLS_MD5_C && MBEDTLS_CIPHER_MODE_CBC &&
+          ( MBEDTLS_AES_C || MBEDTLS_DES_C ) */
+
+int mbedtls_pem_read_buffer( mbedtls_pem_context *ctx, const char *header, const char *footer,
+                     const unsigned char *data, const unsigned char *pwd,
+                     size_t pwdlen, size_t *use_len )
+{
+    int ret, enc;
+    size_t len;
+    unsigned char *buf;
+    const unsigned char *s1, *s2, *end;
+#if defined(MBEDTLS_MD5_C) && defined(MBEDTLS_CIPHER_MODE_CBC) &&         \
+    ( defined(MBEDTLS_DES_C) || defined(MBEDTLS_AES_C) )
+    unsigned char pem_iv[16];
+    mbedtls_cipher_type_t enc_alg = MBEDTLS_CIPHER_NONE;
+#else
+    ((void) pwd);
+    ((void) pwdlen);
+#endif /* MBEDTLS_MD5_C && MBEDTLS_CIPHER_MODE_CBC &&
+          ( MBEDTLS_AES_C || MBEDTLS_DES_C ) */
+
+    if( ctx == NULL )
+        return( MBEDTLS_ERR_PEM_BAD_INPUT_DATA );
+
+    s1 = (unsigned char *) strstr( (const char *) data, header );
+
+    if( s1 == NULL )
+        return( MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT );
+
+    s2 = (unsigned char *) strstr( (const char *) data, footer );
+
+    if( s2 == NULL || s2 <= s1 )
+        return( MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT );
+
+    s1 += strlen( header );
+    if( *s1 == ' '  ) s1++;
+    if( *s1 == '\r' ) s1++;
+    if( *s1 == '\n' ) s1++;
+    else return( MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT );
+
+    end = s2;
+    end += strlen( footer );
+    if( *end == ' '  ) end++;
+    if( *end == '\r' ) end++;
+    if( *end == '\n' ) end++;
+    *use_len = end - data;
+
+    enc = 0;
+
+    if( s2 - s1 >= 22 && memcmp( s1, "Proc-Type: 4,ENCRYPTED", 22 ) == 0 )
+    {
+#if defined(MBEDTLS_MD5_C) && defined(MBEDTLS_CIPHER_MODE_CBC) &&         \
+    ( defined(MBEDTLS_DES_C) || defined(MBEDTLS_AES_C) )
+        enc++;
+
+        s1 += 22;
+        if( *s1 == '\r' ) s1++;
+        if( *s1 == '\n' ) s1++;
+        else return( MBEDTLS_ERR_PEM_INVALID_DATA );
+
+
+#if defined(MBEDTLS_DES_C)
+        if( s2 - s1 >= 23 && memcmp( s1, "DEK-Info: DES-EDE3-CBC,", 23 ) == 0 )
+        {
+            enc_alg = MBEDTLS_CIPHER_DES_EDE3_CBC;
+
+            s1 += 23;
+            if( s2 - s1 < 16 || pem_get_iv( s1, pem_iv, 8 ) != 0 )
+                return( MBEDTLS_ERR_PEM_INVALID_ENC_IV );
+
+            s1 += 16;
+        }
+        else if( s2 - s1 >= 18 && memcmp( s1, "DEK-Info: DES-CBC,", 18 ) == 0 )
+        {
+            enc_alg = MBEDTLS_CIPHER_DES_CBC;
+
+            s1 += 18;
+            if( s2 - s1 < 16 || pem_get_iv( s1, pem_iv, 8) != 0 )
+                return( MBEDTLS_ERR_PEM_INVALID_ENC_IV );
+
+            s1 += 16;
+        }
+#endif /* MBEDTLS_DES_C */
+
+#if defined(MBEDTLS_AES_C)
+        if( s2 - s1 >= 14 && memcmp( s1, "DEK-Info: AES-", 14 ) == 0 )
+        {
+            if( s2 - s1 < 22 )
+                return( MBEDTLS_ERR_PEM_UNKNOWN_ENC_ALG );
+            else if( memcmp( s1, "DEK-Info: AES-128-CBC,", 22 ) == 0 )
+                enc_alg = MBEDTLS_CIPHER_AES_128_CBC;
+            else if( memcmp( s1, "DEK-Info: AES-192-CBC,", 22 ) == 0 )
+                enc_alg = MBEDTLS_CIPHER_AES_192_CBC;
+            else if( memcmp( s1, "DEK-Info: AES-256-CBC,", 22 ) == 0 )
+                enc_alg = MBEDTLS_CIPHER_AES_256_CBC;
+            else
+                return( MBEDTLS_ERR_PEM_UNKNOWN_ENC_ALG );
+
+            s1 += 22;
+            if( s2 - s1 < 32 || pem_get_iv( s1, pem_iv, 16 ) != 0 )
+                return( MBEDTLS_ERR_PEM_INVALID_ENC_IV );
+
+            s1 += 32;
+        }
+#endif /* MBEDTLS_AES_C */
+
+        if( enc_alg == MBEDTLS_CIPHER_NONE )
+            return( MBEDTLS_ERR_PEM_UNKNOWN_ENC_ALG );
+
+        if( *s1 == '\r' ) s1++;
+        if( *s1 == '\n' ) s1++;
+        else return( MBEDTLS_ERR_PEM_INVALID_DATA );
+#else
+        return( MBEDTLS_ERR_PEM_FEATURE_UNAVAILABLE );
+#endif /* MBEDTLS_MD5_C && MBEDTLS_CIPHER_MODE_CBC &&
+          ( MBEDTLS_AES_C || MBEDTLS_DES_C ) */
+    }
+
+    if( s1 >= s2 )
+        return( MBEDTLS_ERR_PEM_INVALID_DATA );
+
+    ret = mbedtls_base64_decode( NULL, 0, &len, s1, s2 - s1 );
+
+    if( ret == MBEDTLS_ERR_BASE64_INVALID_CHARACTER )
+        return( MBEDTLS_ERR_PEM_INVALID_DATA + ret );
+
+    if( ( buf = mbedtls_calloc( 1, len ) ) == NULL )
+        return( MBEDTLS_ERR_PEM_ALLOC_FAILED );
+
+    if( ( ret = mbedtls_base64_decode( buf, len, &len, s1, s2 - s1 ) ) != 0 )
+    {
+        mbedtls_platform_zeroize( buf, len );
+        mbedtls_free( buf );
+        return( MBEDTLS_ERR_PEM_INVALID_DATA + ret );
+    }
+
+    if( enc != 0 )
+    {
+#if defined(MBEDTLS_MD5_C) && defined(MBEDTLS_CIPHER_MODE_CBC) &&         \
+    ( defined(MBEDTLS_DES_C) || defined(MBEDTLS_AES_C) )
+        if( pwd == NULL )
+        {
+            mbedtls_platform_zeroize( buf, len );
+            mbedtls_free( buf );
+            return( MBEDTLS_ERR_PEM_PASSWORD_REQUIRED );
+        }
+
+        ret = 0;
+
+#if defined(MBEDTLS_DES_C)
+        if( enc_alg == MBEDTLS_CIPHER_DES_EDE3_CBC )
+            ret = pem_des3_decrypt( pem_iv, buf, len, pwd, pwdlen );
+        else if( enc_alg == MBEDTLS_CIPHER_DES_CBC )
+            ret = pem_des_decrypt( pem_iv, buf, len, pwd, pwdlen );
+#endif /* MBEDTLS_DES_C */
+
+#if defined(MBEDTLS_AES_C)
+        if( enc_alg == MBEDTLS_CIPHER_AES_128_CBC )
+            ret = pem_aes_decrypt( pem_iv, 16, buf, len, pwd, pwdlen );
+        else if( enc_alg == MBEDTLS_CIPHER_AES_192_CBC )
+            ret = pem_aes_decrypt( pem_iv, 24, buf, len, pwd, pwdlen );
+        else if( enc_alg == MBEDTLS_CIPHER_AES_256_CBC )
+            ret = pem_aes_decrypt( pem_iv, 32, buf, len, pwd, pwdlen );
+#endif /* MBEDTLS_AES_C */
+
+        if( ret != 0 )
+        {
+            mbedtls_free( buf );
+            return( ret );
+        }
+
+        /*
+         * The result will be ASN.1 starting with a SEQUENCE tag, with 1 to 3
+         * length bytes (allow 4 to be sure) in all known use cases.
+         *
+         * Use that as a heuristic to try to detect password mismatches.
+         */
+        if( len <= 2 || buf[0] != 0x30 || buf[1] > 0x83 )
+        {
+            mbedtls_platform_zeroize( buf, len );
+            mbedtls_free( buf );
+            return( MBEDTLS_ERR_PEM_PASSWORD_MISMATCH );
+        }
+#else
+        mbedtls_platform_zeroize( buf, len );
+        mbedtls_free( buf );
+        return( MBEDTLS_ERR_PEM_FEATURE_UNAVAILABLE );
+#endif /* MBEDTLS_MD5_C && MBEDTLS_CIPHER_MODE_CBC &&
+          ( MBEDTLS_AES_C || MBEDTLS_DES_C ) */
+    }
+
+    ctx->buf = buf;
+    ctx->buflen = len;
+
+    return( 0 );
+}
+
+void mbedtls_pem_free( mbedtls_pem_context *ctx )
+{
+    if( ctx->buf != NULL )
+        mbedtls_platform_zeroize( ctx->buf, ctx->buflen );
+    mbedtls_free( ctx->buf );
+    mbedtls_free( ctx->info );
+
+    mbedtls_platform_zeroize( ctx, sizeof( mbedtls_pem_context ) );
+}
+#endif /* MBEDTLS_PEM_PARSE_C */
+
+#if defined(MBEDTLS_PEM_WRITE_C)
+int mbedtls_pem_write_buffer( const char *header, const char *footer,
+                      const unsigned char *der_data, size_t der_len,
+                      unsigned char *buf, size_t buf_len, size_t *olen )
+{
+    int ret;
+    unsigned char *encode_buf = NULL, *c, *p = buf;
+    size_t len = 0, use_len, add_len = 0;
+
+    mbedtls_base64_encode( NULL, 0, &use_len, der_data, der_len );
+    add_len = strlen( header ) + strlen( footer ) + ( use_len / 64 ) + 1;
+
+    if( use_len + add_len > buf_len )
+    {
+        *olen = use_len + add_len;
+        return( MBEDTLS_ERR_BASE64_BUFFER_TOO_SMALL );
+    }
+
+    if( use_len != 0 &&
+        ( ( encode_buf = mbedtls_calloc( 1, use_len ) ) == NULL ) )
+        return( MBEDTLS_ERR_PEM_ALLOC_FAILED );
+
+    if( ( ret = mbedtls_base64_encode( encode_buf, use_len, &use_len, der_data,
+                               der_len ) ) != 0 )
+    {
+        mbedtls_free( encode_buf );
+        return( ret );
+    }
+
+    memcpy( p, header, strlen( header ) );
+    p += strlen( header );
+    c = encode_buf;
+
+    while( use_len )
+    {
+        len = ( use_len > 64 ) ? 64 : use_len;
+        memcpy( p, c, len );
+        use_len -= len;
+        p += len;
+        c += len;
+        *p++ = '\n';
+    }
+
+    memcpy( p, footer, strlen( footer ) );
+    p += strlen( footer );
+
+    *p++ = '\0';
+    *olen = p - buf;
+
+    mbedtls_free( encode_buf );
+    return( 0 );
+}
+#endif /* MBEDTLS_PEM_WRITE_C */
+#endif /* MBEDTLS_PEM_PARSE_C || MBEDTLS_PEM_WRITE_C */
diff --git a/common/mbedtls/pem.h b/common/mbedtls/pem.h
new file mode 100644
index 000000000..c0e5e025c
--- /dev/null
+++ b/common/mbedtls/pem.h
@@ -0,0 +1,132 @@
+/**
+ * \file pem.h
+ *
+ * \brief Privacy Enhanced Mail (PEM) decoding
+ */
+/*
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+#ifndef MBEDTLS_PEM_H
+#define MBEDTLS_PEM_H
+
+#include <stddef.h>
+
+/**
+ * \name PEM Error codes
+ * These error codes are returned in case of errors reading the
+ * PEM data.
+ * \{
+ */
+#define MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT          -0x1080  /**< No PEM header or footer found. */
+#define MBEDTLS_ERR_PEM_INVALID_DATA                      -0x1100  /**< PEM string is not as expected. */
+#define MBEDTLS_ERR_PEM_ALLOC_FAILED                      -0x1180  /**< Failed to allocate memory. */
+#define MBEDTLS_ERR_PEM_INVALID_ENC_IV                    -0x1200  /**< RSA IV is not in hex-format. */
+#define MBEDTLS_ERR_PEM_UNKNOWN_ENC_ALG                   -0x1280  /**< Unsupported key encryption algorithm. */
+#define MBEDTLS_ERR_PEM_PASSWORD_REQUIRED                 -0x1300  /**< Private key password can't be empty. */
+#define MBEDTLS_ERR_PEM_PASSWORD_MISMATCH                 -0x1380  /**< Given private key password does not allow for correct decryption. */
+#define MBEDTLS_ERR_PEM_FEATURE_UNAVAILABLE               -0x1400  /**< Unavailable feature, e.g. hashing/encryption combination. */
+#define MBEDTLS_ERR_PEM_BAD_INPUT_DATA                    -0x1480  /**< Bad input parameters to function. */
+/* \} name */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if defined(MBEDTLS_PEM_PARSE_C)
+/**
+ * \brief       PEM context structure
+ */
+typedef struct mbedtls_pem_context
+{
+    unsigned char *buf;     /*!< buffer for decoded data             */
+    size_t buflen;          /*!< length of the buffer                */
+    unsigned char *info;    /*!< buffer for extra header information */
+}
+mbedtls_pem_context;
+
+/**
+ * \brief       PEM context setup
+ *
+ * \param ctx   context to be initialized
+ */
+void mbedtls_pem_init( mbedtls_pem_context *ctx );
+
+/**
+ * \brief       Read a buffer for PEM information and store the resulting
+ *              data into the specified context buffers.
+ *
+ * \param ctx       context to use
+ * \param header    header string to seek and expect
+ * \param footer    footer string to seek and expect
+ * \param data      source data to look in (must be nul-terminated)
+ * \param pwd       password for decryption (can be NULL)
+ * \param pwdlen    length of password
+ * \param use_len   destination for total length used (set after header is
+ *                  correctly read, so unless you get
+ *                  MBEDTLS_ERR_PEM_BAD_INPUT_DATA or
+ *                  MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT, use_len is
+ *                  the length to skip)
+ *
+ * \note            Attempts to check password correctness by verifying if
+ *                  the decrypted text starts with an ASN.1 sequence of
+ *                  appropriate length
+ *
+ * \return          0 on success, or a specific PEM error code
+ */
+int mbedtls_pem_read_buffer( mbedtls_pem_context *ctx, const char *header, const char *footer,
+                     const unsigned char *data,
+                     const unsigned char *pwd,
+                     size_t pwdlen, size_t *use_len );
+
+/**
+ * \brief       PEM context memory freeing
+ *
+ * \param ctx   context to be freed
+ */
+void mbedtls_pem_free( mbedtls_pem_context *ctx );
+#endif /* MBEDTLS_PEM_PARSE_C */
+
+#if defined(MBEDTLS_PEM_WRITE_C)
+/**
+ * \brief           Write a buffer of PEM information from a DER encoded
+ *                  buffer.
+ *
+ * \param header    header string to write
+ * \param footer    footer string to write
+ * \param der_data  DER data to write
+ * \param der_len   length of the DER data
+ * \param buf       buffer to write to
+ * \param buf_len   length of output buffer
+ * \param olen      total length written / required (if buf_len is not enough)
+ *
+ * \return          0 on success, or a specific PEM or BASE64 error code. On
+ *                  MBEDTLS_ERR_BASE64_BUFFER_TOO_SMALL olen is the required
+ *                  size.
+ */
+int mbedtls_pem_write_buffer( const char *header, const char *footer,
+                      const unsigned char *der_data, size_t der_len,
+                      unsigned char *buf, size_t buf_len, size_t *olen );
+#endif /* MBEDTLS_PEM_WRITE_C */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* pem.h */
diff --git a/common/mbedtls/pk.c b/common/mbedtls/pk.c
new file mode 100644
index 000000000..784b66963
--- /dev/null
+++ b/common/mbedtls/pk.c
@@ -0,0 +1,381 @@
+/*
+ *  Public Key abstraction layer
+ *
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "mbedtls/config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#if defined(MBEDTLS_PK_C)
+#include "mbedtls/pk.h"
+#include "mbedtls/pk_internal.h"
+
+#include "mbedtls/platform_util.h"
+
+#if defined(MBEDTLS_RSA_C)
+#include "mbedtls/rsa.h"
+#endif
+#if defined(MBEDTLS_ECP_C)
+#include "mbedtls/ecp.h"
+#endif
+#if defined(MBEDTLS_ECDSA_C)
+#include "mbedtls/ecdsa.h"
+#endif
+
+#include <limits.h>
+#include <stdint.h>
+
+/*
+ * Initialise a mbedtls_pk_context
+ */
+void mbedtls_pk_init( mbedtls_pk_context *ctx )
+{
+    if( ctx == NULL )
+        return;
+
+    ctx->pk_info = NULL;
+    ctx->pk_ctx = NULL;
+}
+
+/*
+ * Free (the components of) a mbedtls_pk_context
+ */
+void mbedtls_pk_free( mbedtls_pk_context *ctx )
+{
+    if( ctx == NULL || ctx->pk_info == NULL )
+        return;
+
+    ctx->pk_info->ctx_free_func( ctx->pk_ctx );
+
+    mbedtls_platform_zeroize( ctx, sizeof( mbedtls_pk_context ) );
+}
+
+/*
+ * Get pk_info structure from type
+ */
+const mbedtls_pk_info_t * mbedtls_pk_info_from_type( mbedtls_pk_type_t pk_type )
+{
+    switch( pk_type ) {
+#if defined(MBEDTLS_RSA_C)
+        case MBEDTLS_PK_RSA:
+            return( &mbedtls_rsa_info );
+#endif
+#if defined(MBEDTLS_ECP_C)
+        case MBEDTLS_PK_ECKEY:
+            return( &mbedtls_eckey_info );
+        case MBEDTLS_PK_ECKEY_DH:
+            return( &mbedtls_eckeydh_info );
+#endif
+#if defined(MBEDTLS_ECDSA_C)
+        case MBEDTLS_PK_ECDSA:
+            return( &mbedtls_ecdsa_info );
+#endif
+        /* MBEDTLS_PK_RSA_ALT omitted on purpose */
+        default:
+            return( NULL );
+    }
+}
+
+/*
+ * Initialise context
+ */
+int mbedtls_pk_setup( mbedtls_pk_context *ctx, const mbedtls_pk_info_t *info )
+{
+    if( ctx == NULL || info == NULL || ctx->pk_info != NULL )
+        return( MBEDTLS_ERR_PK_BAD_INPUT_DATA );
+
+    if( ( ctx->pk_ctx = info->ctx_alloc_func() ) == NULL )
+        return( MBEDTLS_ERR_PK_ALLOC_FAILED );
+
+    ctx->pk_info = info;
+
+    return( 0 );
+}
+
+#if defined(MBEDTLS_PK_RSA_ALT_SUPPORT)
+/*
+ * Initialize an RSA-alt context
+ */
+int mbedtls_pk_setup_rsa_alt( mbedtls_pk_context *ctx, void * key,
+                         mbedtls_pk_rsa_alt_decrypt_func decrypt_func,
+                         mbedtls_pk_rsa_alt_sign_func sign_func,
+                         mbedtls_pk_rsa_alt_key_len_func key_len_func )
+{
+    mbedtls_rsa_alt_context *rsa_alt;
+    const mbedtls_pk_info_t *info = &mbedtls_rsa_alt_info;
+
+    if( ctx == NULL || ctx->pk_info != NULL )
+        return( MBEDTLS_ERR_PK_BAD_INPUT_DATA );
+
+    if( ( ctx->pk_ctx = info->ctx_alloc_func() ) == NULL )
+        return( MBEDTLS_ERR_PK_ALLOC_FAILED );
+
+    ctx->pk_info = info;
+
+    rsa_alt = (mbedtls_rsa_alt_context *) ctx->pk_ctx;
+
+    rsa_alt->key = key;
+    rsa_alt->decrypt_func = decrypt_func;
+    rsa_alt->sign_func = sign_func;
+    rsa_alt->key_len_func = key_len_func;
+
+    return( 0 );
+}
+#endif /* MBEDTLS_PK_RSA_ALT_SUPPORT */
+
+/*
+ * Tell if a PK can do the operations of the given type
+ */
+int mbedtls_pk_can_do( const mbedtls_pk_context *ctx, mbedtls_pk_type_t type )
+{
+    /* null or NONE context can't do anything */
+    if( ctx == NULL || ctx->pk_info == NULL )
+        return( 0 );
+
+    return( ctx->pk_info->can_do( type ) );
+}
+
+/*
+ * Helper for mbedtls_pk_sign and mbedtls_pk_verify
+ */
+static inline int pk_hashlen_helper( mbedtls_md_type_t md_alg, size_t *hash_len )
+{
+    const mbedtls_md_info_t *md_info;
+
+    if( *hash_len != 0 )
+        return( 0 );
+
+    if( ( md_info = mbedtls_md_info_from_type( md_alg ) ) == NULL )
+        return( -1 );
+
+    *hash_len = mbedtls_md_get_size( md_info );
+    return( 0 );
+}
+
+/*
+ * Verify a signature
+ */
+int mbedtls_pk_verify( mbedtls_pk_context *ctx, mbedtls_md_type_t md_alg,
+               const unsigned char *hash, size_t hash_len,
+               const unsigned char *sig, size_t sig_len )
+{
+    if( ctx == NULL || ctx->pk_info == NULL ||
+        pk_hashlen_helper( md_alg, &hash_len ) != 0 )
+        return( MBEDTLS_ERR_PK_BAD_INPUT_DATA );
+
+    if( ctx->pk_info->verify_func == NULL )
+        return( MBEDTLS_ERR_PK_TYPE_MISMATCH );
+
+    return( ctx->pk_info->verify_func( ctx->pk_ctx, md_alg, hash, hash_len,
+                                       sig, sig_len ) );
+}
+
+/*
+ * Verify a signature with options
+ */
+int mbedtls_pk_verify_ext( mbedtls_pk_type_t type, const void *options,
+                   mbedtls_pk_context *ctx, mbedtls_md_type_t md_alg,
+                   const unsigned char *hash, size_t hash_len,
+                   const unsigned char *sig, size_t sig_len )
+{
+    if( ctx == NULL || ctx->pk_info == NULL )
+        return( MBEDTLS_ERR_PK_BAD_INPUT_DATA );
+
+    if( ! mbedtls_pk_can_do( ctx, type ) )
+        return( MBEDTLS_ERR_PK_TYPE_MISMATCH );
+
+    if( type == MBEDTLS_PK_RSASSA_PSS )
+    {
+#if defined(MBEDTLS_RSA_C) && defined(MBEDTLS_PKCS1_V21)
+        int ret;
+        const mbedtls_pk_rsassa_pss_options *pss_opts;
+
+#if SIZE_MAX > UINT_MAX
+        if( md_alg == MBEDTLS_MD_NONE && UINT_MAX < hash_len )
+            return( MBEDTLS_ERR_PK_BAD_INPUT_DATA );
+#endif /* SIZE_MAX > UINT_MAX */
+
+        if( options == NULL )
+            return( MBEDTLS_ERR_PK_BAD_INPUT_DATA );
+
+        pss_opts = (const mbedtls_pk_rsassa_pss_options *) options;
+
+        if( sig_len < mbedtls_pk_get_len( ctx ) )
+            return( MBEDTLS_ERR_RSA_VERIFY_FAILED );
+
+        ret = mbedtls_rsa_rsassa_pss_verify_ext( mbedtls_pk_rsa( *ctx ),
+                NULL, NULL, MBEDTLS_RSA_PUBLIC,
+                md_alg, (unsigned int) hash_len, hash,
+                pss_opts->mgf1_hash_id,
+                pss_opts->expected_salt_len,
+                sig );
+        if( ret != 0 )
+            return( ret );
+
+        if( sig_len > mbedtls_pk_get_len( ctx ) )
+            return( MBEDTLS_ERR_PK_SIG_LEN_MISMATCH );
+
+        return( 0 );
+#else
+        return( MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE );
+#endif /* MBEDTLS_RSA_C && MBEDTLS_PKCS1_V21 */
+    }
+
+    /* General case: no options */
+    if( options != NULL )
+        return( MBEDTLS_ERR_PK_BAD_INPUT_DATA );
+
+    return( mbedtls_pk_verify( ctx, md_alg, hash, hash_len, sig, sig_len ) );
+}
+
+/*
+ * Make a signature
+ */
+int mbedtls_pk_sign( mbedtls_pk_context *ctx, mbedtls_md_type_t md_alg,
+             const unsigned char *hash, size_t hash_len,
+             unsigned char *sig, size_t *sig_len,
+             int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
+{
+    if( ctx == NULL || ctx->pk_info == NULL ||
+        pk_hashlen_helper( md_alg, &hash_len ) != 0 )
+        return( MBEDTLS_ERR_PK_BAD_INPUT_DATA );
+
+    if( ctx->pk_info->sign_func == NULL )
+        return( MBEDTLS_ERR_PK_TYPE_MISMATCH );
+
+    return( ctx->pk_info->sign_func( ctx->pk_ctx, md_alg, hash, hash_len,
+                                     sig, sig_len, f_rng, p_rng ) );
+}
+
+/*
+ * Decrypt message
+ */
+int mbedtls_pk_decrypt( mbedtls_pk_context *ctx,
+                const unsigned char *input, size_t ilen,
+                unsigned char *output, size_t *olen, size_t osize,
+                int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
+{
+    if( ctx == NULL || ctx->pk_info == NULL )
+        return( MBEDTLS_ERR_PK_BAD_INPUT_DATA );
+
+    if( ctx->pk_info->decrypt_func == NULL )
+        return( MBEDTLS_ERR_PK_TYPE_MISMATCH );
+
+    return( ctx->pk_info->decrypt_func( ctx->pk_ctx, input, ilen,
+                output, olen, osize, f_rng, p_rng ) );
+}
+
+/*
+ * Encrypt message
+ */
+int mbedtls_pk_encrypt( mbedtls_pk_context *ctx,
+                const unsigned char *input, size_t ilen,
+                unsigned char *output, size_t *olen, size_t osize,
+                int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
+{
+    if( ctx == NULL || ctx->pk_info == NULL )
+        return( MBEDTLS_ERR_PK_BAD_INPUT_DATA );
+
+    if( ctx->pk_info->encrypt_func == NULL )
+        return( MBEDTLS_ERR_PK_TYPE_MISMATCH );
+
+    return( ctx->pk_info->encrypt_func( ctx->pk_ctx, input, ilen,
+                output, olen, osize, f_rng, p_rng ) );
+}
+
+/*
+ * Check public-private key pair
+ */
+int mbedtls_pk_check_pair( const mbedtls_pk_context *pub, const mbedtls_pk_context *prv )
+{
+    if( pub == NULL || pub->pk_info == NULL ||
+        prv == NULL || prv->pk_info == NULL ||
+        prv->pk_info->check_pair_func == NULL )
+    {
+        return( MBEDTLS_ERR_PK_BAD_INPUT_DATA );
+    }
+
+    if( prv->pk_info->type == MBEDTLS_PK_RSA_ALT )
+    {
+        if( pub->pk_info->type != MBEDTLS_PK_RSA )
+            return( MBEDTLS_ERR_PK_TYPE_MISMATCH );
+    }
+    else
+    {
+        if( pub->pk_info != prv->pk_info )
+            return( MBEDTLS_ERR_PK_TYPE_MISMATCH );
+    }
+
+    return( prv->pk_info->check_pair_func( pub->pk_ctx, prv->pk_ctx ) );
+}
+
+/*
+ * Get key size in bits
+ */
+size_t mbedtls_pk_get_bitlen( const mbedtls_pk_context *ctx )
+{
+    if( ctx == NULL || ctx->pk_info == NULL )
+        return( 0 );
+
+    return( ctx->pk_info->get_bitlen( ctx->pk_ctx ) );
+}
+
+/*
+ * Export debug information
+ */
+int mbedtls_pk_debug( const mbedtls_pk_context *ctx, mbedtls_pk_debug_item *items )
+{
+    if( ctx == NULL || ctx->pk_info == NULL )
+        return( MBEDTLS_ERR_PK_BAD_INPUT_DATA );
+
+    if( ctx->pk_info->debug_func == NULL )
+        return( MBEDTLS_ERR_PK_TYPE_MISMATCH );
+
+    ctx->pk_info->debug_func( ctx->pk_ctx, items );
+    return( 0 );
+}
+
+/*
+ * Access the PK type name
+ */
+const char *mbedtls_pk_get_name( const mbedtls_pk_context *ctx )
+{
+    if( ctx == NULL || ctx->pk_info == NULL )
+        return( "invalid PK" );
+
+    return( ctx->pk_info->name );
+}
+
+/*
+ * Access the PK type
+ */
+mbedtls_pk_type_t mbedtls_pk_get_type( const mbedtls_pk_context *ctx )
+{
+    if( ctx == NULL || ctx->pk_info == NULL )
+        return( MBEDTLS_PK_NONE );
+
+    return( ctx->pk_info->type );
+}
+
+#endif /* MBEDTLS_PK_C */
diff --git a/common/mbedtls/pk.h b/common/mbedtls/pk.h
new file mode 100644
index 000000000..f75dc2f8d
--- /dev/null
+++ b/common/mbedtls/pk.h
@@ -0,0 +1,620 @@
+/**
+ * \file pk.h
+ *
+ * \brief Public Key abstraction layer
+ */
+/*
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+
+#ifndef MBEDTLS_PK_H
+#define MBEDTLS_PK_H
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#include "md.h"
+
+#if defined(MBEDTLS_RSA_C)
+#include "rsa.h"
+#endif
+
+#if defined(MBEDTLS_ECP_C)
+#include "ecp.h"
+#endif
+
+#if defined(MBEDTLS_ECDSA_C)
+#include "ecdsa.h"
+#endif
+
+#if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && \
+    !defined(inline) && !defined(__cplusplus)
+#define inline __inline
+#endif
+
+#define MBEDTLS_ERR_PK_ALLOC_FAILED        -0x3F80  /**< Memory allocation failed. */
+#define MBEDTLS_ERR_PK_TYPE_MISMATCH       -0x3F00  /**< Type mismatch, eg attempt to encrypt with an ECDSA key */
+#define MBEDTLS_ERR_PK_BAD_INPUT_DATA      -0x3E80  /**< Bad input parameters to function. */
+#define MBEDTLS_ERR_PK_FILE_IO_ERROR       -0x3E00  /**< Read/write of file failed. */
+#define MBEDTLS_ERR_PK_KEY_INVALID_VERSION -0x3D80  /**< Unsupported key version */
+#define MBEDTLS_ERR_PK_KEY_INVALID_FORMAT  -0x3D00  /**< Invalid key tag or value. */
+#define MBEDTLS_ERR_PK_UNKNOWN_PK_ALG      -0x3C80  /**< Key algorithm is unsupported (only RSA and EC are supported). */
+#define MBEDTLS_ERR_PK_PASSWORD_REQUIRED   -0x3C00  /**< Private key password can't be empty. */
+#define MBEDTLS_ERR_PK_PASSWORD_MISMATCH   -0x3B80  /**< Given private key password does not allow for correct decryption. */
+#define MBEDTLS_ERR_PK_INVALID_PUBKEY      -0x3B00  /**< The pubkey tag or value is invalid (only RSA and EC are supported). */
+#define MBEDTLS_ERR_PK_INVALID_ALG         -0x3A80  /**< The algorithm tag or value is invalid. */
+#define MBEDTLS_ERR_PK_UNKNOWN_NAMED_CURVE -0x3A00  /**< Elliptic curve is unsupported (only NIST curves are supported). */
+#define MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE -0x3980  /**< Unavailable feature, e.g. RSA disabled for RSA key. */
+#define MBEDTLS_ERR_PK_SIG_LEN_MISMATCH    -0x3900  /**< The buffer contains a valid signature followed by more data. */
+#define MBEDTLS_ERR_PK_HW_ACCEL_FAILED     -0x3880  /**< PK hardware accelerator failed. */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \brief          Public key types
+ */
+typedef enum {
+    MBEDTLS_PK_NONE=0,
+    MBEDTLS_PK_RSA,
+    MBEDTLS_PK_ECKEY,
+    MBEDTLS_PK_ECKEY_DH,
+    MBEDTLS_PK_ECDSA,
+    MBEDTLS_PK_RSA_ALT,
+    MBEDTLS_PK_RSASSA_PSS,
+} mbedtls_pk_type_t;
+
+/**
+ * \brief           Options for RSASSA-PSS signature verification.
+ *                  See \c mbedtls_rsa_rsassa_pss_verify_ext()
+ */
+typedef struct mbedtls_pk_rsassa_pss_options
+{
+    mbedtls_md_type_t mgf1_hash_id;
+    int expected_salt_len;
+
+} mbedtls_pk_rsassa_pss_options;
+
+/**
+ * \brief           Types for interfacing with the debug module
+ */
+typedef enum
+{
+    MBEDTLS_PK_DEBUG_NONE = 0,
+    MBEDTLS_PK_DEBUG_MPI,
+    MBEDTLS_PK_DEBUG_ECP,
+} mbedtls_pk_debug_type;
+
+/**
+ * \brief           Item to send to the debug module
+ */
+typedef struct mbedtls_pk_debug_item
+{
+    mbedtls_pk_debug_type type;
+    const char *name;
+    void *value;
+} mbedtls_pk_debug_item;
+
+/** Maximum number of item send for debugging, plus 1 */
+#define MBEDTLS_PK_DEBUG_MAX_ITEMS 3
+
+/**
+ * \brief           Public key information and operations
+ */
+typedef struct mbedtls_pk_info_t mbedtls_pk_info_t;
+
+/**
+ * \brief           Public key container
+ */
+typedef struct mbedtls_pk_context
+{
+    const mbedtls_pk_info_t *   pk_info; /**< Public key informations        */
+    void *                      pk_ctx;  /**< Underlying public key context  */
+} mbedtls_pk_context;
+
+#if defined(MBEDTLS_RSA_C)
+/**
+ * Quick access to an RSA context inside a PK context.
+ *
+ * \warning You must make sure the PK context actually holds an RSA context
+ * before using this function!
+ */
+static inline mbedtls_rsa_context *mbedtls_pk_rsa( const mbedtls_pk_context pk )
+{
+    return( (mbedtls_rsa_context *) (pk).pk_ctx );
+}
+#endif /* MBEDTLS_RSA_C */
+
+#if defined(MBEDTLS_ECP_C)
+/**
+ * Quick access to an EC context inside a PK context.
+ *
+ * \warning You must make sure the PK context actually holds an EC context
+ * before using this function!
+ */
+static inline mbedtls_ecp_keypair *mbedtls_pk_ec( const mbedtls_pk_context pk )
+{
+    return( (mbedtls_ecp_keypair *) (pk).pk_ctx );
+}
+#endif /* MBEDTLS_ECP_C */
+
+#if defined(MBEDTLS_PK_RSA_ALT_SUPPORT)
+/**
+ * \brief           Types for RSA-alt abstraction
+ */
+typedef int (*mbedtls_pk_rsa_alt_decrypt_func)( void *ctx, int mode, size_t *olen,
+                    const unsigned char *input, unsigned char *output,
+                    size_t output_max_len );
+typedef int (*mbedtls_pk_rsa_alt_sign_func)( void *ctx,
+                    int (*f_rng)(void *, unsigned char *, size_t), void *p_rng,
+                    int mode, mbedtls_md_type_t md_alg, unsigned int hashlen,
+                    const unsigned char *hash, unsigned char *sig );
+typedef size_t (*mbedtls_pk_rsa_alt_key_len_func)( void *ctx );
+#endif /* MBEDTLS_PK_RSA_ALT_SUPPORT */
+
+/**
+ * \brief           Return information associated with the given PK type
+ *
+ * \param pk_type   PK type to search for.
+ *
+ * \return          The PK info associated with the type or NULL if not found.
+ */
+const mbedtls_pk_info_t *mbedtls_pk_info_from_type( mbedtls_pk_type_t pk_type );
+
+/**
+ * \brief           Initialize a mbedtls_pk_context (as NONE)
+ */
+void mbedtls_pk_init( mbedtls_pk_context *ctx );
+
+/**
+ * \brief           Free a mbedtls_pk_context
+ */
+void mbedtls_pk_free( mbedtls_pk_context *ctx );
+
+/**
+ * \brief           Initialize a PK context with the information given
+ *                  and allocates the type-specific PK subcontext.
+ *
+ * \param ctx       Context to initialize. Must be empty (type NONE).
+ * \param info      Information to use
+ *
+ * \return          0 on success,
+ *                  MBEDTLS_ERR_PK_BAD_INPUT_DATA on invalid input,
+ *                  MBEDTLS_ERR_PK_ALLOC_FAILED on allocation failure.
+ *
+ * \note            For contexts holding an RSA-alt key, use
+ *                  \c mbedtls_pk_setup_rsa_alt() instead.
+ */
+int mbedtls_pk_setup( mbedtls_pk_context *ctx, const mbedtls_pk_info_t *info );
+
+#if defined(MBEDTLS_PK_RSA_ALT_SUPPORT)
+/**
+ * \brief           Initialize an RSA-alt context
+ *
+ * \param ctx       Context to initialize. Must be empty (type NONE).
+ * \param key       RSA key pointer
+ * \param decrypt_func  Decryption function
+ * \param sign_func     Signing function
+ * \param key_len_func  Function returning key length in bytes
+ *
+ * \return          0 on success, or MBEDTLS_ERR_PK_BAD_INPUT_DATA if the
+ *                  context wasn't already initialized as RSA_ALT.
+ *
+ * \note            This function replaces \c mbedtls_pk_setup() for RSA-alt.
+ */
+int mbedtls_pk_setup_rsa_alt( mbedtls_pk_context *ctx, void * key,
+                         mbedtls_pk_rsa_alt_decrypt_func decrypt_func,
+                         mbedtls_pk_rsa_alt_sign_func sign_func,
+                         mbedtls_pk_rsa_alt_key_len_func key_len_func );
+#endif /* MBEDTLS_PK_RSA_ALT_SUPPORT */
+
+/**
+ * \brief           Get the size in bits of the underlying key
+ *
+ * \param ctx       Context to use
+ *
+ * \return          Key size in bits, or 0 on error
+ */
+size_t mbedtls_pk_get_bitlen( const mbedtls_pk_context *ctx );
+
+/**
+ * \brief           Get the length in bytes of the underlying key
+ * \param ctx       Context to use
+ *
+ * \return          Key length in bytes, or 0 on error
+ */
+static inline size_t mbedtls_pk_get_len( const mbedtls_pk_context *ctx )
+{
+    return( ( mbedtls_pk_get_bitlen( ctx ) + 7 ) / 8 );
+}
+
+/**
+ * \brief           Tell if a context can do the operation given by type
+ *
+ * \param ctx       Context to test
+ * \param type      Target type
+ *
+ * \return          0 if context can't do the operations,
+ *                  1 otherwise.
+ */
+int mbedtls_pk_can_do( const mbedtls_pk_context *ctx, mbedtls_pk_type_t type );
+
+/**
+ * \brief           Verify signature (including padding if relevant).
+ *
+ * \param ctx       PK context to use
+ * \param md_alg    Hash algorithm used (see notes)
+ * \param hash      Hash of the message to sign
+ * \param hash_len  Hash length or 0 (see notes)
+ * \param sig       Signature to verify
+ * \param sig_len   Signature length
+ *
+ * \return          0 on success (signature is valid),
+ *                  #MBEDTLS_ERR_PK_SIG_LEN_MISMATCH if there is a valid
+ *                  signature in sig but its length is less than \p siglen,
+ *                  or a specific error code.
+ *
+ * \note            For RSA keys, the default padding type is PKCS#1 v1.5.
+ *                  Use \c mbedtls_pk_verify_ext( MBEDTLS_PK_RSASSA_PSS, ... )
+ *                  to verify RSASSA_PSS signatures.
+ *
+ * \note            If hash_len is 0, then the length associated with md_alg
+ *                  is used instead, or an error returned if it is invalid.
+ *
+ * \note            md_alg may be MBEDTLS_MD_NONE, only if hash_len != 0
+ */
+int mbedtls_pk_verify( mbedtls_pk_context *ctx, mbedtls_md_type_t md_alg,
+               const unsigned char *hash, size_t hash_len,
+               const unsigned char *sig, size_t sig_len );
+
+/**
+ * \brief           Verify signature, with options.
+ *                  (Includes verification of the padding depending on type.)
+ *
+ * \param type      Signature type (inc. possible padding type) to verify
+ * \param options   Pointer to type-specific options, or NULL
+ * \param ctx       PK context to use
+ * \param md_alg    Hash algorithm used (see notes)
+ * \param hash      Hash of the message to sign
+ * \param hash_len  Hash length or 0 (see notes)
+ * \param sig       Signature to verify
+ * \param sig_len   Signature length
+ *
+ * \return          0 on success (signature is valid),
+ *                  #MBEDTLS_ERR_PK_TYPE_MISMATCH if the PK context can't be
+ *                  used for this type of signatures,
+ *                  #MBEDTLS_ERR_PK_SIG_LEN_MISMATCH if there is a valid
+ *                  signature in sig but its length is less than \p siglen,
+ *                  or a specific error code.
+ *
+ * \note            If hash_len is 0, then the length associated with md_alg
+ *                  is used instead, or an error returned if it is invalid.
+ *
+ * \note            md_alg may be MBEDTLS_MD_NONE, only if hash_len != 0
+ *
+ * \note            If type is MBEDTLS_PK_RSASSA_PSS, then options must point
+ *                  to a mbedtls_pk_rsassa_pss_options structure,
+ *                  otherwise it must be NULL.
+ */
+int mbedtls_pk_verify_ext( mbedtls_pk_type_t type, const void *options,
+                   mbedtls_pk_context *ctx, mbedtls_md_type_t md_alg,
+                   const unsigned char *hash, size_t hash_len,
+                   const unsigned char *sig, size_t sig_len );
+
+/**
+ * \brief           Make signature, including padding if relevant.
+ *
+ * \param ctx       PK context to use - must hold a private key
+ * \param md_alg    Hash algorithm used (see notes)
+ * \param hash      Hash of the message to sign
+ * \param hash_len  Hash length or 0 (see notes)
+ * \param sig       Place to write the signature
+ * \param sig_len   Number of bytes written
+ * \param f_rng     RNG function
+ * \param p_rng     RNG parameter
+ *
+ * \return          0 on success, or a specific error code.
+ *
+ * \note            For RSA keys, the default padding type is PKCS#1 v1.5.
+ *                  There is no interface in the PK module to make RSASSA-PSS
+ *                  signatures yet.
+ *
+ * \note            If hash_len is 0, then the length associated with md_alg
+ *                  is used instead, or an error returned if it is invalid.
+ *
+ * \note            For RSA, md_alg may be MBEDTLS_MD_NONE if hash_len != 0.
+ *                  For ECDSA, md_alg may never be MBEDTLS_MD_NONE.
+ */
+int mbedtls_pk_sign( mbedtls_pk_context *ctx, mbedtls_md_type_t md_alg,
+             const unsigned char *hash, size_t hash_len,
+             unsigned char *sig, size_t *sig_len,
+             int (*f_rng)(void *, unsigned char *, size_t), void *p_rng );
+
+/**
+ * \brief           Decrypt message (including padding if relevant).
+ *
+ * \param ctx       PK context to use - must hold a private key
+ * \param input     Input to decrypt
+ * \param ilen      Input size
+ * \param output    Decrypted output
+ * \param olen      Decrypted message length
+ * \param osize     Size of the output buffer
+ * \param f_rng     RNG function
+ * \param p_rng     RNG parameter
+ *
+ * \note            For RSA keys, the default padding type is PKCS#1 v1.5.
+ *
+ * \return          0 on success, or a specific error code.
+ */
+int mbedtls_pk_decrypt( mbedtls_pk_context *ctx,
+                const unsigned char *input, size_t ilen,
+                unsigned char *output, size_t *olen, size_t osize,
+                int (*f_rng)(void *, unsigned char *, size_t), void *p_rng );
+
+/**
+ * \brief           Encrypt message (including padding if relevant).
+ *
+ * \param ctx       PK context to use
+ * \param input     Message to encrypt
+ * \param ilen      Message size
+ * \param output    Encrypted output
+ * \param olen      Encrypted output length
+ * \param osize     Size of the output buffer
+ * \param f_rng     RNG function
+ * \param p_rng     RNG parameter
+ *
+ * \note            For RSA keys, the default padding type is PKCS#1 v1.5.
+ *
+ * \return          0 on success, or a specific error code.
+ */
+int mbedtls_pk_encrypt( mbedtls_pk_context *ctx,
+                const unsigned char *input, size_t ilen,
+                unsigned char *output, size_t *olen, size_t osize,
+                int (*f_rng)(void *, unsigned char *, size_t), void *p_rng );
+
+/**
+ * \brief           Check if a public-private pair of keys matches.
+ *
+ * \param pub       Context holding a public key.
+ * \param prv       Context holding a private (and public) key.
+ *
+ * \return          0 on success or MBEDTLS_ERR_PK_BAD_INPUT_DATA
+ */
+int mbedtls_pk_check_pair( const mbedtls_pk_context *pub, const mbedtls_pk_context *prv );
+
+/**
+ * \brief           Export debug information
+ *
+ * \param ctx       Context to use
+ * \param items     Place to write debug items
+ *
+ * \return          0 on success or MBEDTLS_ERR_PK_BAD_INPUT_DATA
+ */
+int mbedtls_pk_debug( const mbedtls_pk_context *ctx, mbedtls_pk_debug_item *items );
+
+/**
+ * \brief           Access the type name
+ *
+ * \param ctx       Context to use
+ *
+ * \return          Type name on success, or "invalid PK"
+ */
+const char * mbedtls_pk_get_name( const mbedtls_pk_context *ctx );
+
+/**
+ * \brief           Get the key type
+ *
+ * \param ctx       Context to use
+ *
+ * \return          Type on success, or MBEDTLS_PK_NONE
+ */
+mbedtls_pk_type_t mbedtls_pk_get_type( const mbedtls_pk_context *ctx );
+
+#if defined(MBEDTLS_PK_PARSE_C)
+/** \ingroup pk_module */
+/**
+ * \brief           Parse a private key in PEM or DER format
+ *
+ * \param ctx       key to be initialized
+ * \param key       input buffer
+ * \param keylen    size of the buffer
+ *                  (including the terminating null byte for PEM data)
+ * \param pwd       password for decryption (optional)
+ * \param pwdlen    size of the password
+ *
+ * \note            On entry, ctx must be empty, either freshly initialised
+ *                  with mbedtls_pk_init() or reset with mbedtls_pk_free(). If you need a
+ *                  specific key type, check the result with mbedtls_pk_can_do().
+ *
+ * \note            The key is also checked for correctness.
+ *
+ * \return          0 if successful, or a specific PK or PEM error code
+ */
+int mbedtls_pk_parse_key( mbedtls_pk_context *ctx,
+                  const unsigned char *key, size_t keylen,
+                  const unsigned char *pwd, size_t pwdlen );
+
+/** \ingroup pk_module */
+/**
+ * \brief           Parse a public key in PEM or DER format
+ *
+ * \param ctx       key to be initialized
+ * \param key       input buffer
+ * \param keylen    size of the buffer
+ *                  (including the terminating null byte for PEM data)
+ *
+ * \note            On entry, ctx must be empty, either freshly initialised
+ *                  with mbedtls_pk_init() or reset with mbedtls_pk_free(). If you need a
+ *                  specific key type, check the result with mbedtls_pk_can_do().
+ *
+ * \note            The key is also checked for correctness.
+ *
+ * \return          0 if successful, or a specific PK or PEM error code
+ */
+int mbedtls_pk_parse_public_key( mbedtls_pk_context *ctx,
+                         const unsigned char *key, size_t keylen );
+
+#if defined(MBEDTLS_FS_IO)
+/** \ingroup pk_module */
+/**
+ * \brief           Load and parse a private key
+ *
+ * \param ctx       key to be initialized
+ * \param path      filename to read the private key from
+ * \param password  password to decrypt the file (can be NULL)
+ *
+ * \note            On entry, ctx must be empty, either freshly initialised
+ *                  with mbedtls_pk_init() or reset with mbedtls_pk_free(). If you need a
+ *                  specific key type, check the result with mbedtls_pk_can_do().
+ *
+ * \note            The key is also checked for correctness.
+ *
+ * \return          0 if successful, or a specific PK or PEM error code
+ */
+int mbedtls_pk_parse_keyfile( mbedtls_pk_context *ctx,
+                      const char *path, const char *password );
+
+/** \ingroup pk_module */
+/**
+ * \brief           Load and parse a public key
+ *
+ * \param ctx       key to be initialized
+ * \param path      filename to read the public key from
+ *
+ * \note            On entry, ctx must be empty, either freshly initialised
+ *                  with mbedtls_pk_init() or reset with mbedtls_pk_free(). If
+ *                  you need a specific key type, check the result with
+ *                  mbedtls_pk_can_do().
+ *
+ * \note            The key is also checked for correctness.
+ *
+ * \return          0 if successful, or a specific PK or PEM error code
+ */
+int mbedtls_pk_parse_public_keyfile( mbedtls_pk_context *ctx, const char *path );
+#endif /* MBEDTLS_FS_IO */
+#endif /* MBEDTLS_PK_PARSE_C */
+
+#if defined(MBEDTLS_PK_WRITE_C)
+/**
+ * \brief           Write a private key to a PKCS#1 or SEC1 DER structure
+ *                  Note: data is written at the end of the buffer! Use the
+ *                        return value to determine where you should start
+ *                        using the buffer
+ *
+ * \param ctx       private to write away
+ * \param buf       buffer to write to
+ * \param size      size of the buffer
+ *
+ * \return          length of data written if successful, or a specific
+ *                  error code
+ */
+int mbedtls_pk_write_key_der( mbedtls_pk_context *ctx, unsigned char *buf, size_t size );
+
+/**
+ * \brief           Write a public key to a SubjectPublicKeyInfo DER structure
+ *                  Note: data is written at the end of the buffer! Use the
+ *                        return value to determine where you should start
+ *                        using the buffer
+ *
+ * \param ctx       public key to write away
+ * \param buf       buffer to write to
+ * \param size      size of the buffer
+ *
+ * \return          length of data written if successful, or a specific
+ *                  error code
+ */
+int mbedtls_pk_write_pubkey_der( mbedtls_pk_context *ctx, unsigned char *buf, size_t size );
+
+#if defined(MBEDTLS_PEM_WRITE_C)
+/**
+ * \brief           Write a public key to a PEM string
+ *
+ * \param ctx       public key to write away
+ * \param buf       buffer to write to
+ * \param size      size of the buffer
+ *
+ * \return          0 if successful, or a specific error code
+ */
+int mbedtls_pk_write_pubkey_pem( mbedtls_pk_context *ctx, unsigned char *buf, size_t size );
+
+/**
+ * \brief           Write a private key to a PKCS#1 or SEC1 PEM string
+ *
+ * \param ctx       private to write away
+ * \param buf       buffer to write to
+ * \param size      size of the buffer
+ *
+ * \return          0 if successful, or a specific error code
+ */
+int mbedtls_pk_write_key_pem( mbedtls_pk_context *ctx, unsigned char *buf, size_t size );
+#endif /* MBEDTLS_PEM_WRITE_C */
+#endif /* MBEDTLS_PK_WRITE_C */
+
+/*
+ * WARNING: Low-level functions. You probably do not want to use these unless
+ *          you are certain you do ;)
+ */
+
+#if defined(MBEDTLS_PK_PARSE_C)
+/**
+ * \brief           Parse a SubjectPublicKeyInfo DER structure
+ *
+ * \param p         the position in the ASN.1 data
+ * \param end       end of the buffer
+ * \param pk        the key to fill
+ *
+ * \return          0 if successful, or a specific PK error code
+ */
+int mbedtls_pk_parse_subpubkey( unsigned char **p, const unsigned char *end,
+                        mbedtls_pk_context *pk );
+#endif /* MBEDTLS_PK_PARSE_C */
+
+#if defined(MBEDTLS_PK_WRITE_C)
+/**
+ * \brief           Write a subjectPublicKey to ASN.1 data
+ *                  Note: function works backwards in data buffer
+ *
+ * \param p         reference to current position pointer
+ * \param start     start of the buffer (for bounds-checking)
+ * \param key       public key to write away
+ *
+ * \return          the length written or a negative error code
+ */
+int mbedtls_pk_write_pubkey( unsigned char **p, unsigned char *start,
+                     const mbedtls_pk_context *key );
+#endif /* MBEDTLS_PK_WRITE_C */
+
+/*
+ * Internal module functions. You probably do not want to use these unless you
+ * know you do.
+ */
+#if defined(MBEDTLS_FS_IO)
+int mbedtls_pk_load_file( const char *path, unsigned char **buf, size_t *n );
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* MBEDTLS_PK_H */
diff --git a/common/mbedtls/pk_internal.h b/common/mbedtls/pk_internal.h
new file mode 100644
index 000000000..685cd5757
--- /dev/null
+++ b/common/mbedtls/pk_internal.h
@@ -0,0 +1,117 @@
+/**
+ * \file pk_internal.h
+ *
+ * \brief Public Key abstraction layer: wrapper functions
+ */
+/*
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+
+#ifndef MBEDTLS_PK_WRAP_H
+#define MBEDTLS_PK_WRAP_H
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#include "pk.h"
+
+struct mbedtls_pk_info_t
+{
+    /** Public key type */
+    mbedtls_pk_type_t type;
+
+    /** Type name */
+    const char *name;
+
+    /** Get key size in bits */
+    size_t (*get_bitlen)( const void * );
+
+    /** Tell if the context implements this type (e.g. ECKEY can do ECDSA) */
+    int (*can_do)( mbedtls_pk_type_t type );
+
+    /** Verify signature */
+    int (*verify_func)( void *ctx, mbedtls_md_type_t md_alg,
+                        const unsigned char *hash, size_t hash_len,
+                        const unsigned char *sig, size_t sig_len );
+
+    /** Make signature */
+    int (*sign_func)( void *ctx, mbedtls_md_type_t md_alg,
+                      const unsigned char *hash, size_t hash_len,
+                      unsigned char *sig, size_t *sig_len,
+                      int (*f_rng)(void *, unsigned char *, size_t),
+                      void *p_rng );
+
+    /** Decrypt message */
+    int (*decrypt_func)( void *ctx, const unsigned char *input, size_t ilen,
+                         unsigned char *output, size_t *olen, size_t osize,
+                         int (*f_rng)(void *, unsigned char *, size_t),
+                         void *p_rng );
+
+    /** Encrypt message */
+    int (*encrypt_func)( void *ctx, const unsigned char *input, size_t ilen,
+                         unsigned char *output, size_t *olen, size_t osize,
+                         int (*f_rng)(void *, unsigned char *, size_t),
+                         void *p_rng );
+
+    /** Check public-private key pair */
+    int (*check_pair_func)( const void *pub, const void *prv );
+
+    /** Allocate a new context */
+    void * (*ctx_alloc_func)( void );
+
+    /** Free the given context */
+    void (*ctx_free_func)( void *ctx );
+
+    /** Interface with the debug module */
+    void (*debug_func)( const void *ctx, mbedtls_pk_debug_item *items );
+
+};
+#if defined(MBEDTLS_PK_RSA_ALT_SUPPORT)
+/* Container for RSA-alt */
+typedef struct
+{
+    void *key;
+    mbedtls_pk_rsa_alt_decrypt_func decrypt_func;
+    mbedtls_pk_rsa_alt_sign_func sign_func;
+    mbedtls_pk_rsa_alt_key_len_func key_len_func;
+} mbedtls_rsa_alt_context;
+#endif
+
+#if defined(MBEDTLS_RSA_C)
+extern const mbedtls_pk_info_t mbedtls_rsa_info;
+#endif
+
+#if defined(MBEDTLS_ECP_C)
+extern const mbedtls_pk_info_t mbedtls_eckey_info;
+extern const mbedtls_pk_info_t mbedtls_eckeydh_info;
+#endif
+
+#if defined(MBEDTLS_ECDSA_C)
+extern const mbedtls_pk_info_t mbedtls_ecdsa_info;
+#endif
+
+#if defined(MBEDTLS_PK_RSA_ALT_SUPPORT)
+extern const mbedtls_pk_info_t mbedtls_rsa_alt_info;
+#endif
+
+#endif /* MBEDTLS_PK_WRAP_H */
diff --git a/common/mbedtls/pk_wrap.c b/common/mbedtls/pk_wrap.c
new file mode 100644
index 000000000..7c4275ec5
--- /dev/null
+++ b/common/mbedtls/pk_wrap.c
@@ -0,0 +1,525 @@
+/*
+ *  Public Key abstraction layer: wrapper functions
+ *
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "mbedtls/config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#if defined(MBEDTLS_PK_C)
+#include "mbedtls/pk_internal.h"
+
+/* Even if RSA not activated, for the sake of RSA-alt */
+#include "mbedtls/rsa.h"
+
+#include <string.h>
+
+#if defined(MBEDTLS_ECP_C)
+#include "mbedtls/ecp.h"
+#endif
+
+#if defined(MBEDTLS_ECDSA_C)
+#include "mbedtls/ecdsa.h"
+#endif
+
+#if defined(MBEDTLS_PK_RSA_ALT_SUPPORT)
+#include "mbedtls/platform_util.h"
+#endif
+
+#if defined(MBEDTLS_PLATFORM_C)
+#include "mbedtls/platform.h"
+#else
+#include <stdlib.h>
+#define mbedtls_calloc    calloc
+#define mbedtls_free       free
+#endif
+
+#include <limits.h>
+#include <stdint.h>
+
+#if defined(MBEDTLS_RSA_C)
+static int rsa_can_do( mbedtls_pk_type_t type )
+{
+    return( type == MBEDTLS_PK_RSA ||
+            type == MBEDTLS_PK_RSASSA_PSS );
+}
+
+static size_t rsa_get_bitlen( const void *ctx )
+{
+    const mbedtls_rsa_context * rsa = (const mbedtls_rsa_context *) ctx;
+    return( 8 * mbedtls_rsa_get_len( rsa ) );
+}
+
+static int rsa_verify_wrap( void *ctx, mbedtls_md_type_t md_alg,
+                   const unsigned char *hash, size_t hash_len,
+                   const unsigned char *sig, size_t sig_len )
+{
+    int ret;
+    mbedtls_rsa_context * rsa = (mbedtls_rsa_context *) ctx;
+    size_t rsa_len = mbedtls_rsa_get_len( rsa );
+
+#if SIZE_MAX > UINT_MAX
+    if( md_alg == MBEDTLS_MD_NONE && UINT_MAX < hash_len )
+        return( MBEDTLS_ERR_PK_BAD_INPUT_DATA );
+#endif /* SIZE_MAX > UINT_MAX */
+
+    if( sig_len < rsa_len )
+        return( MBEDTLS_ERR_RSA_VERIFY_FAILED );
+
+    if( ( ret = mbedtls_rsa_pkcs1_verify( rsa, NULL, NULL,
+                                  MBEDTLS_RSA_PUBLIC, md_alg,
+                                  (unsigned int) hash_len, hash, sig ) ) != 0 )
+        return( ret );
+
+    /* The buffer contains a valid signature followed by extra data.
+     * We have a special error code for that so that so that callers can
+     * use mbedtls_pk_verify() to check "Does the buffer start with a
+     * valid signature?" and not just "Does the buffer contain a valid
+     * signature?". */
+    if( sig_len > rsa_len )
+        return( MBEDTLS_ERR_PK_SIG_LEN_MISMATCH );
+
+    return( 0 );
+}
+
+static int rsa_sign_wrap( void *ctx, mbedtls_md_type_t md_alg,
+                   const unsigned char *hash, size_t hash_len,
+                   unsigned char *sig, size_t *sig_len,
+                   int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
+{
+    mbedtls_rsa_context * rsa = (mbedtls_rsa_context *) ctx;
+
+#if SIZE_MAX > UINT_MAX
+    if( md_alg == MBEDTLS_MD_NONE && UINT_MAX < hash_len )
+        return( MBEDTLS_ERR_PK_BAD_INPUT_DATA );
+#endif /* SIZE_MAX > UINT_MAX */
+
+    *sig_len = mbedtls_rsa_get_len( rsa );
+
+    return( mbedtls_rsa_pkcs1_sign( rsa, f_rng, p_rng, MBEDTLS_RSA_PRIVATE,
+                md_alg, (unsigned int) hash_len, hash, sig ) );
+}
+
+static int rsa_decrypt_wrap( void *ctx,
+                    const unsigned char *input, size_t ilen,
+                    unsigned char *output, size_t *olen, size_t osize,
+                    int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
+{
+    mbedtls_rsa_context * rsa = (mbedtls_rsa_context *) ctx;
+
+    if( ilen != mbedtls_rsa_get_len( rsa ) )
+        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+
+    return( mbedtls_rsa_pkcs1_decrypt( rsa, f_rng, p_rng,
+                MBEDTLS_RSA_PRIVATE, olen, input, output, osize ) );
+}
+
+static int rsa_encrypt_wrap( void *ctx,
+                    const unsigned char *input, size_t ilen,
+                    unsigned char *output, size_t *olen, size_t osize,
+                    int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
+{
+    mbedtls_rsa_context * rsa = (mbedtls_rsa_context *) ctx;
+    *olen = mbedtls_rsa_get_len( rsa );
+
+    if( *olen > osize )
+        return( MBEDTLS_ERR_RSA_OUTPUT_TOO_LARGE );
+
+    return( mbedtls_rsa_pkcs1_encrypt( rsa, f_rng, p_rng, MBEDTLS_RSA_PUBLIC,
+                                       ilen, input, output ) );
+}
+
+static int rsa_check_pair_wrap( const void *pub, const void *prv )
+{
+    return( mbedtls_rsa_check_pub_priv( (const mbedtls_rsa_context *) pub,
+                                (const mbedtls_rsa_context *) prv ) );
+}
+
+static void *rsa_alloc_wrap( void )
+{
+    void *ctx = mbedtls_calloc( 1, sizeof( mbedtls_rsa_context ) );
+
+    if( ctx != NULL )
+        mbedtls_rsa_init( (mbedtls_rsa_context *) ctx, 0, 0 );
+
+    return( ctx );
+}
+
+static void rsa_free_wrap( void *ctx )
+{
+    mbedtls_rsa_free( (mbedtls_rsa_context *) ctx );
+    mbedtls_free( ctx );
+}
+
+static void rsa_debug( const void *ctx, mbedtls_pk_debug_item *items )
+{
+    items->type = MBEDTLS_PK_DEBUG_MPI;
+    items->name = "rsa.N";
+    items->value = &( ((mbedtls_rsa_context *) ctx)->N );
+
+    items++;
+
+    items->type = MBEDTLS_PK_DEBUG_MPI;
+    items->name = "rsa.E";
+    items->value = &( ((mbedtls_rsa_context *) ctx)->E );
+}
+
+const mbedtls_pk_info_t mbedtls_rsa_info = {
+    MBEDTLS_PK_RSA,
+    "RSA",
+    rsa_get_bitlen,
+    rsa_can_do,
+    rsa_verify_wrap,
+    rsa_sign_wrap,
+    rsa_decrypt_wrap,
+    rsa_encrypt_wrap,
+    rsa_check_pair_wrap,
+    rsa_alloc_wrap,
+    rsa_free_wrap,
+    rsa_debug,
+};
+#endif /* MBEDTLS_RSA_C */
+
+#if defined(MBEDTLS_ECP_C)
+/*
+ * Generic EC key
+ */
+static int eckey_can_do( mbedtls_pk_type_t type )
+{
+    return( type == MBEDTLS_PK_ECKEY ||
+            type == MBEDTLS_PK_ECKEY_DH ||
+            type == MBEDTLS_PK_ECDSA );
+}
+
+static size_t eckey_get_bitlen( const void *ctx )
+{
+    return( ((mbedtls_ecp_keypair *) ctx)->grp.pbits );
+}
+
+#if defined(MBEDTLS_ECDSA_C)
+/* Forward declarations */
+static int ecdsa_verify_wrap( void *ctx, mbedtls_md_type_t md_alg,
+                       const unsigned char *hash, size_t hash_len,
+                       const unsigned char *sig, size_t sig_len );
+
+static int ecdsa_sign_wrap( void *ctx, mbedtls_md_type_t md_alg,
+                   const unsigned char *hash, size_t hash_len,
+                   unsigned char *sig, size_t *sig_len,
+                   int (*f_rng)(void *, unsigned char *, size_t), void *p_rng );
+
+static int eckey_verify_wrap( void *ctx, mbedtls_md_type_t md_alg,
+                       const unsigned char *hash, size_t hash_len,
+                       const unsigned char *sig, size_t sig_len )
+{
+    int ret;
+    mbedtls_ecdsa_context ecdsa;
+
+    mbedtls_ecdsa_init( &ecdsa );
+
+    if( ( ret = mbedtls_ecdsa_from_keypair( &ecdsa, ctx ) ) == 0 )
+        ret = ecdsa_verify_wrap( &ecdsa, md_alg, hash, hash_len, sig, sig_len );
+
+    mbedtls_ecdsa_free( &ecdsa );
+
+    return( ret );
+}
+
+static int eckey_sign_wrap( void *ctx, mbedtls_md_type_t md_alg,
+                   const unsigned char *hash, size_t hash_len,
+                   unsigned char *sig, size_t *sig_len,
+                   int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
+{
+    int ret;
+    mbedtls_ecdsa_context ecdsa;
+
+    mbedtls_ecdsa_init( &ecdsa );
+
+    if( ( ret = mbedtls_ecdsa_from_keypair( &ecdsa, ctx ) ) == 0 )
+        ret = ecdsa_sign_wrap( &ecdsa, md_alg, hash, hash_len, sig, sig_len,
+                               f_rng, p_rng );
+
+    mbedtls_ecdsa_free( &ecdsa );
+
+    return( ret );
+}
+
+#endif /* MBEDTLS_ECDSA_C */
+
+static int eckey_check_pair( const void *pub, const void *prv )
+{
+    return( mbedtls_ecp_check_pub_priv( (const mbedtls_ecp_keypair *) pub,
+                                (const mbedtls_ecp_keypair *) prv ) );
+}
+
+static void *eckey_alloc_wrap( void )
+{
+    void *ctx = mbedtls_calloc( 1, sizeof( mbedtls_ecp_keypair ) );
+
+    if( ctx != NULL )
+        mbedtls_ecp_keypair_init( ctx );
+
+    return( ctx );
+}
+
+static void eckey_free_wrap( void *ctx )
+{
+    mbedtls_ecp_keypair_free( (mbedtls_ecp_keypair *) ctx );
+    mbedtls_free( ctx );
+}
+
+static void eckey_debug( const void *ctx, mbedtls_pk_debug_item *items )
+{
+    items->type = MBEDTLS_PK_DEBUG_ECP;
+    items->name = "eckey.Q";
+    items->value = &( ((mbedtls_ecp_keypair *) ctx)->Q );
+}
+
+const mbedtls_pk_info_t mbedtls_eckey_info = {
+    MBEDTLS_PK_ECKEY,
+    "EC",
+    eckey_get_bitlen,
+    eckey_can_do,
+#if defined(MBEDTLS_ECDSA_C)
+    eckey_verify_wrap,
+    eckey_sign_wrap,
+#else
+    NULL,
+    NULL,
+#endif
+    NULL,
+    NULL,
+    eckey_check_pair,
+    eckey_alloc_wrap,
+    eckey_free_wrap,
+    eckey_debug,
+};
+
+/*
+ * EC key restricted to ECDH
+ */
+static int eckeydh_can_do( mbedtls_pk_type_t type )
+{
+    return( type == MBEDTLS_PK_ECKEY ||
+            type == MBEDTLS_PK_ECKEY_DH );
+}
+
+const mbedtls_pk_info_t mbedtls_eckeydh_info = {
+    MBEDTLS_PK_ECKEY_DH,
+    "EC_DH",
+    eckey_get_bitlen,         /* Same underlying key structure */
+    eckeydh_can_do,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    eckey_check_pair,
+    eckey_alloc_wrap,       /* Same underlying key structure */
+    eckey_free_wrap,        /* Same underlying key structure */
+    eckey_debug,            /* Same underlying key structure */
+};
+#endif /* MBEDTLS_ECP_C */
+
+#if defined(MBEDTLS_ECDSA_C)
+static int ecdsa_can_do( mbedtls_pk_type_t type )
+{
+    return( type == MBEDTLS_PK_ECDSA );
+}
+
+static int ecdsa_verify_wrap( void *ctx, mbedtls_md_type_t md_alg,
+                       const unsigned char *hash, size_t hash_len,
+                       const unsigned char *sig, size_t sig_len )
+{
+    int ret;
+    ((void) md_alg);
+
+    ret = mbedtls_ecdsa_read_signature( (mbedtls_ecdsa_context *) ctx,
+                                hash, hash_len, sig, sig_len );
+
+    if( ret == MBEDTLS_ERR_ECP_SIG_LEN_MISMATCH )
+        return( MBEDTLS_ERR_PK_SIG_LEN_MISMATCH );
+
+    return( ret );
+}
+
+static int ecdsa_sign_wrap( void *ctx, mbedtls_md_type_t md_alg,
+                   const unsigned char *hash, size_t hash_len,
+                   unsigned char *sig, size_t *sig_len,
+                   int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
+{
+    return( mbedtls_ecdsa_write_signature( (mbedtls_ecdsa_context *) ctx,
+                md_alg, hash, hash_len, sig, sig_len, f_rng, p_rng ) );
+}
+
+static void *ecdsa_alloc_wrap( void )
+{
+    void *ctx = mbedtls_calloc( 1, sizeof( mbedtls_ecdsa_context ) );
+
+    if( ctx != NULL )
+        mbedtls_ecdsa_init( (mbedtls_ecdsa_context *) ctx );
+
+    return( ctx );
+}
+
+static void ecdsa_free_wrap( void *ctx )
+{
+    mbedtls_ecdsa_free( (mbedtls_ecdsa_context *) ctx );
+    mbedtls_free( ctx );
+}
+
+const mbedtls_pk_info_t mbedtls_ecdsa_info = {
+    MBEDTLS_PK_ECDSA,
+    "ECDSA",
+    eckey_get_bitlen,     /* Compatible key structures */
+    ecdsa_can_do,
+    ecdsa_verify_wrap,
+    ecdsa_sign_wrap,
+    NULL,
+    NULL,
+    eckey_check_pair,   /* Compatible key structures */
+    ecdsa_alloc_wrap,
+    ecdsa_free_wrap,
+    eckey_debug,        /* Compatible key structures */
+};
+#endif /* MBEDTLS_ECDSA_C */
+
+#if defined(MBEDTLS_PK_RSA_ALT_SUPPORT)
+/*
+ * Support for alternative RSA-private implementations
+ */
+
+static int rsa_alt_can_do( mbedtls_pk_type_t type )
+{
+    return( type == MBEDTLS_PK_RSA );
+}
+
+static size_t rsa_alt_get_bitlen( const void *ctx )
+{
+    const mbedtls_rsa_alt_context *rsa_alt = (const mbedtls_rsa_alt_context *) ctx;
+
+    return( 8 * rsa_alt->key_len_func( rsa_alt->key ) );
+}
+
+static int rsa_alt_sign_wrap( void *ctx, mbedtls_md_type_t md_alg,
+                   const unsigned char *hash, size_t hash_len,
+                   unsigned char *sig, size_t *sig_len,
+                   int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
+{
+    mbedtls_rsa_alt_context *rsa_alt = (mbedtls_rsa_alt_context *) ctx;
+
+#if SIZE_MAX > UINT_MAX
+    if( UINT_MAX < hash_len )
+        return( MBEDTLS_ERR_PK_BAD_INPUT_DATA );
+#endif /* SIZE_MAX > UINT_MAX */
+
+    *sig_len = rsa_alt->key_len_func( rsa_alt->key );
+
+    return( rsa_alt->sign_func( rsa_alt->key, f_rng, p_rng, MBEDTLS_RSA_PRIVATE,
+                md_alg, (unsigned int) hash_len, hash, sig ) );
+}
+
+static int rsa_alt_decrypt_wrap( void *ctx,
+                    const unsigned char *input, size_t ilen,
+                    unsigned char *output, size_t *olen, size_t osize,
+                    int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
+{
+    mbedtls_rsa_alt_context *rsa_alt = (mbedtls_rsa_alt_context *) ctx;
+
+    ((void) f_rng);
+    ((void) p_rng);
+
+    if( ilen != rsa_alt->key_len_func( rsa_alt->key ) )
+        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+
+    return( rsa_alt->decrypt_func( rsa_alt->key,
+                MBEDTLS_RSA_PRIVATE, olen, input, output, osize ) );
+}
+
+#if defined(MBEDTLS_RSA_C)
+static int rsa_alt_check_pair( const void *pub, const void *prv )
+{
+    unsigned char sig[MBEDTLS_MPI_MAX_SIZE];
+    unsigned char hash[32];
+    size_t sig_len = 0;
+    int ret;
+
+    if( rsa_alt_get_bitlen( prv ) != rsa_get_bitlen( pub ) )
+        return( MBEDTLS_ERR_RSA_KEY_CHECK_FAILED );
+
+    memset( hash, 0x2a, sizeof( hash ) );
+
+    if( ( ret = rsa_alt_sign_wrap( (void *) prv, MBEDTLS_MD_NONE,
+                                   hash, sizeof( hash ),
+                                   sig, &sig_len, NULL, NULL ) ) != 0 )
+    {
+        return( ret );
+    }
+
+    if( rsa_verify_wrap( (void *) pub, MBEDTLS_MD_NONE,
+                         hash, sizeof( hash ), sig, sig_len ) != 0 )
+    {
+        return( MBEDTLS_ERR_RSA_KEY_CHECK_FAILED );
+    }
+
+    return( 0 );
+}
+#endif /* MBEDTLS_RSA_C */
+
+static void *rsa_alt_alloc_wrap( void )
+{
+    void *ctx = mbedtls_calloc( 1, sizeof( mbedtls_rsa_alt_context ) );
+
+    if( ctx != NULL )
+        memset( ctx, 0, sizeof( mbedtls_rsa_alt_context ) );
+
+    return( ctx );
+}
+
+static void rsa_alt_free_wrap( void *ctx )
+{
+    mbedtls_platform_zeroize( ctx, sizeof( mbedtls_rsa_alt_context ) );
+    mbedtls_free( ctx );
+}
+
+const mbedtls_pk_info_t mbedtls_rsa_alt_info = {
+    MBEDTLS_PK_RSA_ALT,
+    "RSA-alt",
+    rsa_alt_get_bitlen,
+    rsa_alt_can_do,
+    NULL,
+    rsa_alt_sign_wrap,
+    rsa_alt_decrypt_wrap,
+    NULL,
+#if defined(MBEDTLS_RSA_C)
+    rsa_alt_check_pair,
+#else
+    NULL,
+#endif
+    rsa_alt_alloc_wrap,
+    rsa_alt_free_wrap,
+    NULL,
+};
+
+#endif /* MBEDTLS_PK_RSA_ALT_SUPPORT */
+
+#endif /* MBEDTLS_PK_C */
diff --git a/common/mbedtls/pkcs12.c b/common/mbedtls/pkcs12.c
new file mode 100644
index 000000000..3d93bfe93
--- /dev/null
+++ b/common/mbedtls/pkcs12.c
@@ -0,0 +1,363 @@
+/*
+ *  PKCS#12 Personal Information Exchange Syntax
+ *
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+/*
+ *  The PKCS #12 Personal Information Exchange Syntax Standard v1.1
+ *
+ *  http://www.rsa.com/rsalabs/pkcs/files/h11301-wp-pkcs-12v1-1-personal-information-exchange-syntax.pdf
+ *  ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-12/pkcs-12v1-1.asn
+ */
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "mbedtls/config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#if defined(MBEDTLS_PKCS12_C)
+
+#include "mbedtls/pkcs12.h"
+#include "mbedtls/asn1.h"
+#include "mbedtls/cipher.h"
+#include "mbedtls/platform_util.h"
+
+#include <string.h>
+
+#if defined(MBEDTLS_ARC4_C)
+#include "mbedtls/arc4.h"
+#endif
+
+#if defined(MBEDTLS_DES_C)
+#include "mbedtls/des.h"
+#endif
+
+static int pkcs12_parse_pbe_params( mbedtls_asn1_buf *params,
+                                    mbedtls_asn1_buf *salt, int *iterations )
+{
+    int ret;
+    unsigned char **p = &params->p;
+    const unsigned char *end = params->p + params->len;
+
+    /*
+     *  pkcs-12PbeParams ::= SEQUENCE {
+     *    salt          OCTET STRING,
+     *    iterations    INTEGER
+     *  }
+     *
+     */
+    if( params->tag != ( MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) )
+        return( MBEDTLS_ERR_PKCS12_PBE_INVALID_FORMAT +
+                MBEDTLS_ERR_ASN1_UNEXPECTED_TAG );
+
+    if( ( ret = mbedtls_asn1_get_tag( p, end, &salt->len, MBEDTLS_ASN1_OCTET_STRING ) ) != 0 )
+        return( MBEDTLS_ERR_PKCS12_PBE_INVALID_FORMAT + ret );
+
+    salt->p = *p;
+    *p += salt->len;
+
+    if( ( ret = mbedtls_asn1_get_int( p, end, iterations ) ) != 0 )
+        return( MBEDTLS_ERR_PKCS12_PBE_INVALID_FORMAT + ret );
+
+    if( *p != end )
+        return( MBEDTLS_ERR_PKCS12_PBE_INVALID_FORMAT +
+                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+
+    return( 0 );
+}
+
+#define PKCS12_MAX_PWDLEN 128
+
+static int pkcs12_pbe_derive_key_iv( mbedtls_asn1_buf *pbe_params, mbedtls_md_type_t md_type,
+                                     const unsigned char *pwd,  size_t pwdlen,
+                                     unsigned char *key, size_t keylen,
+                                     unsigned char *iv,  size_t ivlen )
+{
+    int ret, iterations = 0;
+    mbedtls_asn1_buf salt;
+    size_t i;
+    unsigned char unipwd[PKCS12_MAX_PWDLEN * 2 + 2];
+
+    if( pwdlen > PKCS12_MAX_PWDLEN )
+        return( MBEDTLS_ERR_PKCS12_BAD_INPUT_DATA );
+
+    memset( &salt, 0, sizeof(mbedtls_asn1_buf) );
+    memset( &unipwd, 0, sizeof(unipwd) );
+
+    if( ( ret = pkcs12_parse_pbe_params( pbe_params, &salt,
+                                         &iterations ) ) != 0 )
+        return( ret );
+
+    for( i = 0; i < pwdlen; i++ )
+        unipwd[i * 2 + 1] = pwd[i];
+
+    if( ( ret = mbedtls_pkcs12_derivation( key, keylen, unipwd, pwdlen * 2 + 2,
+                                   salt.p, salt.len, md_type,
+                                   MBEDTLS_PKCS12_DERIVE_KEY, iterations ) ) != 0 )
+    {
+        return( ret );
+    }
+
+    if( iv == NULL || ivlen == 0 )
+        return( 0 );
+
+    if( ( ret = mbedtls_pkcs12_derivation( iv, ivlen, unipwd, pwdlen * 2 + 2,
+                                   salt.p, salt.len, md_type,
+                                   MBEDTLS_PKCS12_DERIVE_IV, iterations ) ) != 0 )
+    {
+        return( ret );
+    }
+    return( 0 );
+}
+
+#undef PKCS12_MAX_PWDLEN
+
+int mbedtls_pkcs12_pbe_sha1_rc4_128( mbedtls_asn1_buf *pbe_params, int mode,
+                             const unsigned char *pwd,  size_t pwdlen,
+                             const unsigned char *data, size_t len,
+                             unsigned char *output )
+{
+#if !defined(MBEDTLS_ARC4_C)
+    ((void) pbe_params);
+    ((void) mode);
+    ((void) pwd);
+    ((void) pwdlen);
+    ((void) data);
+    ((void) len);
+    ((void) output);
+    return( MBEDTLS_ERR_PKCS12_FEATURE_UNAVAILABLE );
+#else
+    int ret;
+    unsigned char key[16];
+    mbedtls_arc4_context ctx;
+    ((void) mode);
+
+    mbedtls_arc4_init( &ctx );
+
+    if( ( ret = pkcs12_pbe_derive_key_iv( pbe_params, MBEDTLS_MD_SHA1,
+                                          pwd, pwdlen,
+                                          key, 16, NULL, 0 ) ) != 0 )
+    {
+        return( ret );
+    }
+
+    mbedtls_arc4_setup( &ctx, key, 16 );
+    if( ( ret = mbedtls_arc4_crypt( &ctx, len, data, output ) ) != 0 )
+        goto exit;
+
+exit:
+    mbedtls_platform_zeroize( key, sizeof( key ) );
+    mbedtls_arc4_free( &ctx );
+
+    return( ret );
+#endif /* MBEDTLS_ARC4_C */
+}
+
+int mbedtls_pkcs12_pbe( mbedtls_asn1_buf *pbe_params, int mode,
+                mbedtls_cipher_type_t cipher_type, mbedtls_md_type_t md_type,
+                const unsigned char *pwd,  size_t pwdlen,
+                const unsigned char *data, size_t len,
+                unsigned char *output )
+{
+    int ret, keylen = 0;
+    unsigned char key[32];
+    unsigned char iv[16];
+    const mbedtls_cipher_info_t *cipher_info;
+    mbedtls_cipher_context_t cipher_ctx;
+    size_t olen = 0;
+
+    cipher_info = mbedtls_cipher_info_from_type( cipher_type );
+    if( cipher_info == NULL )
+        return( MBEDTLS_ERR_PKCS12_FEATURE_UNAVAILABLE );
+
+    keylen = cipher_info->key_bitlen / 8;
+
+    if( ( ret = pkcs12_pbe_derive_key_iv( pbe_params, md_type, pwd, pwdlen,
+                                          key, keylen,
+                                          iv, cipher_info->iv_size ) ) != 0 )
+    {
+        return( ret );
+    }
+
+    mbedtls_cipher_init( &cipher_ctx );
+
+    if( ( ret = mbedtls_cipher_setup( &cipher_ctx, cipher_info ) ) != 0 )
+        goto exit;
+
+    if( ( ret = mbedtls_cipher_setkey( &cipher_ctx, key, 8 * keylen, (mbedtls_operation_t) mode ) ) != 0 )
+        goto exit;
+
+    if( ( ret = mbedtls_cipher_set_iv( &cipher_ctx, iv, cipher_info->iv_size ) ) != 0 )
+        goto exit;
+
+    if( ( ret = mbedtls_cipher_reset( &cipher_ctx ) ) != 0 )
+        goto exit;
+
+    if( ( ret = mbedtls_cipher_update( &cipher_ctx, data, len,
+                                output, &olen ) ) != 0 )
+    {
+        goto exit;
+    }
+
+    if( ( ret = mbedtls_cipher_finish( &cipher_ctx, output + olen, &olen ) ) != 0 )
+        ret = MBEDTLS_ERR_PKCS12_PASSWORD_MISMATCH;
+
+exit:
+    mbedtls_platform_zeroize( key, sizeof( key ) );
+    mbedtls_platform_zeroize( iv,  sizeof( iv  ) );
+    mbedtls_cipher_free( &cipher_ctx );
+
+    return( ret );
+}
+
+static void pkcs12_fill_buffer( unsigned char *data, size_t data_len,
+                                const unsigned char *filler, size_t fill_len )
+{
+    unsigned char *p = data;
+    size_t use_len;
+
+    while( data_len > 0 )
+    {
+        use_len = ( data_len > fill_len ) ? fill_len : data_len;
+        memcpy( p, filler, use_len );
+        p += use_len;
+        data_len -= use_len;
+    }
+}
+
+int mbedtls_pkcs12_derivation( unsigned char *data, size_t datalen,
+                       const unsigned char *pwd, size_t pwdlen,
+                       const unsigned char *salt, size_t saltlen,
+                       mbedtls_md_type_t md_type, int id, int iterations )
+{
+    int ret;
+    unsigned int j;
+
+    unsigned char diversifier[128];
+    unsigned char salt_block[128], pwd_block[128], hash_block[128];
+    unsigned char hash_output[MBEDTLS_MD_MAX_SIZE];
+    unsigned char *p;
+    unsigned char c;
+
+    size_t hlen, use_len, v, i;
+
+    const mbedtls_md_info_t *md_info;
+    mbedtls_md_context_t md_ctx;
+
+    // This version only allows max of 64 bytes of password or salt
+    if( datalen > 128 || pwdlen > 64 || saltlen > 64 )
+        return( MBEDTLS_ERR_PKCS12_BAD_INPUT_DATA );
+
+    md_info = mbedtls_md_info_from_type( md_type );
+    if( md_info == NULL )
+        return( MBEDTLS_ERR_PKCS12_FEATURE_UNAVAILABLE );
+
+    mbedtls_md_init( &md_ctx );
+
+    if( ( ret = mbedtls_md_setup( &md_ctx, md_info, 0 ) ) != 0 )
+        return( ret );
+    hlen = mbedtls_md_get_size( md_info );
+
+    if( hlen <= 32 )
+        v = 64;
+    else
+        v = 128;
+
+    memset( diversifier, (unsigned char) id, v );
+
+    pkcs12_fill_buffer( salt_block, v, salt, saltlen );
+    pkcs12_fill_buffer( pwd_block,  v, pwd,  pwdlen  );
+
+    p = data;
+    while( datalen > 0 )
+    {
+        // Calculate hash( diversifier || salt_block || pwd_block )
+        if( ( ret = mbedtls_md_starts( &md_ctx ) ) != 0 )
+            goto exit;
+
+        if( ( ret = mbedtls_md_update( &md_ctx, diversifier, v ) ) != 0 )
+            goto exit;
+
+        if( ( ret = mbedtls_md_update( &md_ctx, salt_block, v ) ) != 0 )
+            goto exit;
+
+        if( ( ret = mbedtls_md_update( &md_ctx, pwd_block, v ) ) != 0 )
+            goto exit;
+
+        if( ( ret = mbedtls_md_finish( &md_ctx, hash_output ) ) != 0 )
+            goto exit;
+
+        // Perform remaining ( iterations - 1 ) recursive hash calculations
+        for( i = 1; i < (size_t) iterations; i++ )
+        {
+            if( ( ret = mbedtls_md( md_info, hash_output, hlen, hash_output ) ) != 0 )
+                goto exit;
+        }
+
+        use_len = ( datalen > hlen ) ? hlen : datalen;
+        memcpy( p, hash_output, use_len );
+        datalen -= use_len;
+        p += use_len;
+
+        if( datalen == 0 )
+            break;
+
+        // Concatenating copies of hash_output into hash_block (B)
+        pkcs12_fill_buffer( hash_block, v, hash_output, hlen );
+
+        // B += 1
+        for( i = v; i > 0; i-- )
+            if( ++hash_block[i - 1] != 0 )
+                break;
+
+        // salt_block += B
+        c = 0;
+        for( i = v; i > 0; i-- )
+        {
+            j = salt_block[i - 1] + hash_block[i - 1] + c;
+            c = (unsigned char) (j >> 8);
+            salt_block[i - 1] = j & 0xFF;
+        }
+
+        // pwd_block  += B
+        c = 0;
+        for( i = v; i > 0; i-- )
+        {
+            j = pwd_block[i - 1] + hash_block[i - 1] + c;
+            c = (unsigned char) (j >> 8);
+            pwd_block[i - 1] = j & 0xFF;
+        }
+    }
+
+    ret = 0;
+
+exit:
+    mbedtls_platform_zeroize( salt_block, sizeof( salt_block ) );
+    mbedtls_platform_zeroize( pwd_block, sizeof( pwd_block ) );
+    mbedtls_platform_zeroize( hash_block, sizeof( hash_block ) );
+    mbedtls_platform_zeroize( hash_output, sizeof( hash_output ) );
+
+    mbedtls_md_free( &md_ctx );
+
+    return( ret );
+}
+
+#endif /* MBEDTLS_PKCS12_C */
diff --git a/common/mbedtls/pkcs12.h b/common/mbedtls/pkcs12.h
new file mode 100644
index 000000000..f2230fa9b
--- /dev/null
+++ b/common/mbedtls/pkcs12.h
@@ -0,0 +1,122 @@
+/**
+ * \file pkcs12.h
+ *
+ * \brief PKCS#12 Personal Information Exchange Syntax
+ */
+/*
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+#ifndef MBEDTLS_PKCS12_H
+#define MBEDTLS_PKCS12_H
+
+#include "md.h"
+#include "cipher.h"
+#include "asn1.h"
+
+#include <stddef.h>
+
+#define MBEDTLS_ERR_PKCS12_BAD_INPUT_DATA                 -0x1F80  /**< Bad input parameters to function. */
+#define MBEDTLS_ERR_PKCS12_FEATURE_UNAVAILABLE            -0x1F00  /**< Feature not available, e.g. unsupported encryption scheme. */
+#define MBEDTLS_ERR_PKCS12_PBE_INVALID_FORMAT             -0x1E80  /**< PBE ASN.1 data not as expected. */
+#define MBEDTLS_ERR_PKCS12_PASSWORD_MISMATCH              -0x1E00  /**< Given private key password does not allow for correct decryption. */
+
+#define MBEDTLS_PKCS12_DERIVE_KEY       1   /**< encryption/decryption key */
+#define MBEDTLS_PKCS12_DERIVE_IV        2   /**< initialization vector     */
+#define MBEDTLS_PKCS12_DERIVE_MAC_KEY   3   /**< integrity / MAC key       */
+
+#define MBEDTLS_PKCS12_PBE_DECRYPT      0
+#define MBEDTLS_PKCS12_PBE_ENCRYPT      1
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \brief            PKCS12 Password Based function (encryption / decryption)
+ *                   for pbeWithSHAAnd128BitRC4
+ *
+ * \param pbe_params an ASN1 buffer containing the pkcs-12PbeParams structure
+ * \param mode       either MBEDTLS_PKCS12_PBE_ENCRYPT or MBEDTLS_PKCS12_PBE_DECRYPT
+ * \param pwd        the password used (may be NULL if no password is used)
+ * \param pwdlen     length of the password (may be 0)
+ * \param input      the input data
+ * \param len        data length
+ * \param output     the output buffer
+ *
+ * \return           0 if successful, or a MBEDTLS_ERR_XXX code
+ */
+int mbedtls_pkcs12_pbe_sha1_rc4_128( mbedtls_asn1_buf *pbe_params, int mode,
+                             const unsigned char *pwd,  size_t pwdlen,
+                             const unsigned char *input, size_t len,
+                             unsigned char *output );
+
+/**
+ * \brief            PKCS12 Password Based function (encryption / decryption)
+ *                   for cipher-based and mbedtls_md-based PBE's
+ *
+ * \param pbe_params an ASN1 buffer containing the pkcs-12PbeParams structure
+ * \param mode       either MBEDTLS_PKCS12_PBE_ENCRYPT or MBEDTLS_PKCS12_PBE_DECRYPT
+ * \param cipher_type the cipher used
+ * \param md_type     the mbedtls_md used
+ * \param pwd        the password used (may be NULL if no password is used)
+ * \param pwdlen     length of the password (may be 0)
+ * \param input      the input data
+ * \param len        data length
+ * \param output     the output buffer
+ *
+ * \return           0 if successful, or a MBEDTLS_ERR_XXX code
+ */
+int mbedtls_pkcs12_pbe( mbedtls_asn1_buf *pbe_params, int mode,
+                mbedtls_cipher_type_t cipher_type, mbedtls_md_type_t md_type,
+                const unsigned char *pwd,  size_t pwdlen,
+                const unsigned char *input, size_t len,
+                unsigned char *output );
+
+/**
+ * \brief            The PKCS#12 derivation function uses a password and a salt
+ *                   to produce pseudo-random bits for a particular "purpose".
+ *
+ *                   Depending on the given id, this function can produce an
+ *                   encryption/decryption key, an nitialization vector or an
+ *                   integrity key.
+ *
+ * \param data       buffer to store the derived data in
+ * \param datalen    length to fill
+ * \param pwd        password to use (may be NULL if no password is used)
+ * \param pwdlen     length of the password (may be 0)
+ * \param salt       salt buffer to use
+ * \param saltlen    length of the salt
+ * \param mbedtls_md         mbedtls_md type to use during the derivation
+ * \param id         id that describes the purpose (can be MBEDTLS_PKCS12_DERIVE_KEY,
+ *                   MBEDTLS_PKCS12_DERIVE_IV or MBEDTLS_PKCS12_DERIVE_MAC_KEY)
+ * \param iterations number of iterations
+ *
+ * \return          0 if successful, or a MD, BIGNUM type error.
+ */
+int mbedtls_pkcs12_derivation( unsigned char *data, size_t datalen,
+                       const unsigned char *pwd, size_t pwdlen,
+                       const unsigned char *salt, size_t saltlen,
+                       mbedtls_md_type_t mbedtls_md, int id, int iterations );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* pkcs12.h */
diff --git a/common/mbedtls/pkcs5.c b/common/mbedtls/pkcs5.c
new file mode 100644
index 000000000..e62d663d2
--- /dev/null
+++ b/common/mbedtls/pkcs5.c
@@ -0,0 +1,428 @@
+/**
+ * \file pkcs5.c
+ *
+ * \brief PKCS#5 functions
+ *
+ * \author Mathias Olsson <mathias@kompetensum.com>
+ *
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+/*
+ * PKCS#5 includes PBKDF2 and more
+ *
+ * http://tools.ietf.org/html/rfc2898 (Specification)
+ * http://tools.ietf.org/html/rfc6070 (Test vectors)
+ */
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "mbedtls/config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#if defined(MBEDTLS_PKCS5_C)
+
+#include "mbedtls/pkcs5.h"
+
+#if defined(MBEDTLS_ASN1_PARSE_C)
+#include "mbedtls/asn1.h"
+#include "mbedtls/cipher.h"
+#include "mbedtls/oid.h"
+#endif /* MBEDTLS_ASN1_PARSE_C */
+
+#include <string.h>
+
+#if defined(MBEDTLS_PLATFORM_C)
+#include "mbedtls/platform.h"
+#else
+#include <stdio.h>
+#define mbedtls_printf printf
+#endif
+
+#if !defined(MBEDTLS_ASN1_PARSE_C)
+int mbedtls_pkcs5_pbes2( const mbedtls_asn1_buf *pbe_params, int mode,
+                 const unsigned char *pwd,  size_t pwdlen,
+                 const unsigned char *data, size_t datalen,
+                 unsigned char *output )
+{
+    ((void) pbe_params);
+    ((void) mode);
+    ((void) pwd);
+    ((void) pwdlen);
+    ((void) data);
+    ((void) datalen);
+    ((void) output);
+    return( MBEDTLS_ERR_PKCS5_FEATURE_UNAVAILABLE );
+}
+#else
+static int pkcs5_parse_pbkdf2_params( const mbedtls_asn1_buf *params,
+                                      mbedtls_asn1_buf *salt, int *iterations,
+                                      int *keylen, mbedtls_md_type_t *md_type )
+{
+    int ret;
+    mbedtls_asn1_buf prf_alg_oid;
+    unsigned char *p = params->p;
+    const unsigned char *end = params->p + params->len;
+
+    if( params->tag != ( MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) )
+        return( MBEDTLS_ERR_PKCS5_INVALID_FORMAT +
+                MBEDTLS_ERR_ASN1_UNEXPECTED_TAG );
+    /*
+     *  PBKDF2-params ::= SEQUENCE {
+     *    salt              OCTET STRING,
+     *    iterationCount    INTEGER,
+     *    keyLength         INTEGER OPTIONAL
+     *    prf               AlgorithmIdentifier DEFAULT algid-hmacWithSHA1
+     *  }
+     *
+     */
+    if( ( ret = mbedtls_asn1_get_tag( &p, end, &salt->len, MBEDTLS_ASN1_OCTET_STRING ) ) != 0 )
+        return( MBEDTLS_ERR_PKCS5_INVALID_FORMAT + ret );
+
+    salt->p = p;
+    p += salt->len;
+
+    if( ( ret = mbedtls_asn1_get_int( &p, end, iterations ) ) != 0 )
+        return( MBEDTLS_ERR_PKCS5_INVALID_FORMAT + ret );
+
+    if( p == end )
+        return( 0 );
+
+    if( ( ret = mbedtls_asn1_get_int( &p, end, keylen ) ) != 0 )
+    {
+        if( ret != MBEDTLS_ERR_ASN1_UNEXPECTED_TAG )
+            return( MBEDTLS_ERR_PKCS5_INVALID_FORMAT + ret );
+    }
+
+    if( p == end )
+        return( 0 );
+
+    if( ( ret = mbedtls_asn1_get_alg_null( &p, end, &prf_alg_oid ) ) != 0 )
+        return( MBEDTLS_ERR_PKCS5_INVALID_FORMAT + ret );
+
+    if( mbedtls_oid_get_md_hmac( &prf_alg_oid, md_type ) != 0 )
+        return( MBEDTLS_ERR_PKCS5_FEATURE_UNAVAILABLE );
+
+    if( p != end )
+        return( MBEDTLS_ERR_PKCS5_INVALID_FORMAT +
+                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+
+    return( 0 );
+}
+
+int mbedtls_pkcs5_pbes2( const mbedtls_asn1_buf *pbe_params, int mode,
+                 const unsigned char *pwd,  size_t pwdlen,
+                 const unsigned char *data, size_t datalen,
+                 unsigned char *output )
+{
+    int ret, iterations = 0, keylen = 0;
+    unsigned char *p, *end;
+    mbedtls_asn1_buf kdf_alg_oid, enc_scheme_oid, kdf_alg_params, enc_scheme_params;
+    mbedtls_asn1_buf salt;
+    mbedtls_md_type_t md_type = MBEDTLS_MD_SHA1;
+    unsigned char key[32], iv[32];
+    size_t olen = 0;
+    const mbedtls_md_info_t *md_info;
+    const mbedtls_cipher_info_t *cipher_info;
+    mbedtls_md_context_t md_ctx;
+    mbedtls_cipher_type_t cipher_alg;
+    mbedtls_cipher_context_t cipher_ctx;
+
+    p = pbe_params->p;
+    end = p + pbe_params->len;
+
+    /*
+     *  PBES2-params ::= SEQUENCE {
+     *    keyDerivationFunc AlgorithmIdentifier {{PBES2-KDFs}},
+     *    encryptionScheme AlgorithmIdentifier {{PBES2-Encs}}
+     *  }
+     */
+    if( pbe_params->tag != ( MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) )
+        return( MBEDTLS_ERR_PKCS5_INVALID_FORMAT +
+                MBEDTLS_ERR_ASN1_UNEXPECTED_TAG );
+
+    if( ( ret = mbedtls_asn1_get_alg( &p, end, &kdf_alg_oid, &kdf_alg_params ) ) != 0 )
+        return( MBEDTLS_ERR_PKCS5_INVALID_FORMAT + ret );
+
+    // Only PBKDF2 supported at the moment
+    //
+    if( MBEDTLS_OID_CMP( MBEDTLS_OID_PKCS5_PBKDF2, &kdf_alg_oid ) != 0 )
+        return( MBEDTLS_ERR_PKCS5_FEATURE_UNAVAILABLE );
+
+    if( ( ret = pkcs5_parse_pbkdf2_params( &kdf_alg_params,
+                                           &salt, &iterations, &keylen,
+                                           &md_type ) ) != 0 )
+    {
+        return( ret );
+    }
+
+    md_info = mbedtls_md_info_from_type( md_type );
+    if( md_info == NULL )
+        return( MBEDTLS_ERR_PKCS5_FEATURE_UNAVAILABLE );
+
+    if( ( ret = mbedtls_asn1_get_alg( &p, end, &enc_scheme_oid,
+                              &enc_scheme_params ) ) != 0 )
+    {
+        return( MBEDTLS_ERR_PKCS5_INVALID_FORMAT + ret );
+    }
+
+    if( mbedtls_oid_get_cipher_alg( &enc_scheme_oid, &cipher_alg ) != 0 )
+        return( MBEDTLS_ERR_PKCS5_FEATURE_UNAVAILABLE );
+
+    cipher_info = mbedtls_cipher_info_from_type( cipher_alg );
+    if( cipher_info == NULL )
+        return( MBEDTLS_ERR_PKCS5_FEATURE_UNAVAILABLE );
+
+    /*
+     * The value of keylen from pkcs5_parse_pbkdf2_params() is ignored
+     * since it is optional and we don't know if it was set or not
+     */
+    keylen = cipher_info->key_bitlen / 8;
+
+    if( enc_scheme_params.tag != MBEDTLS_ASN1_OCTET_STRING ||
+        enc_scheme_params.len != cipher_info->iv_size )
+    {
+        return( MBEDTLS_ERR_PKCS5_INVALID_FORMAT );
+    }
+
+    mbedtls_md_init( &md_ctx );
+    mbedtls_cipher_init( &cipher_ctx );
+
+    memcpy( iv, enc_scheme_params.p, enc_scheme_params.len );
+
+    if( ( ret = mbedtls_md_setup( &md_ctx, md_info, 1 ) ) != 0 )
+        goto exit;
+
+    if( ( ret = mbedtls_pkcs5_pbkdf2_hmac( &md_ctx, pwd, pwdlen, salt.p, salt.len,
+                                   iterations, keylen, key ) ) != 0 )
+    {
+        goto exit;
+    }
+
+    if( ( ret = mbedtls_cipher_setup( &cipher_ctx, cipher_info ) ) != 0 )
+        goto exit;
+
+    if( ( ret = mbedtls_cipher_setkey( &cipher_ctx, key, 8 * keylen, (mbedtls_operation_t) mode ) ) != 0 )
+        goto exit;
+
+    if( ( ret = mbedtls_cipher_crypt( &cipher_ctx, iv, enc_scheme_params.len,
+                              data, datalen, output, &olen ) ) != 0 )
+        ret = MBEDTLS_ERR_PKCS5_PASSWORD_MISMATCH;
+
+exit:
+    mbedtls_md_free( &md_ctx );
+    mbedtls_cipher_free( &cipher_ctx );
+
+    return( ret );
+}
+#endif /* MBEDTLS_ASN1_PARSE_C */
+
+int mbedtls_pkcs5_pbkdf2_hmac( mbedtls_md_context_t *ctx, const unsigned char *password,
+                       size_t plen, const unsigned char *salt, size_t slen,
+                       unsigned int iteration_count,
+                       uint32_t key_length, unsigned char *output )
+{
+    int ret, j;
+    unsigned int i;
+    unsigned char md1[MBEDTLS_MD_MAX_SIZE];
+    unsigned char work[MBEDTLS_MD_MAX_SIZE];
+    unsigned char md_size = mbedtls_md_get_size( ctx->md_info );
+    size_t use_len;
+    unsigned char *out_p = output;
+    unsigned char counter[4];
+
+    memset( counter, 0, 4 );
+    counter[3] = 1;
+
+#if UINT_MAX > 0xFFFFFFFF
+    if( iteration_count > 0xFFFFFFFF )
+        return( MBEDTLS_ERR_PKCS5_BAD_INPUT_DATA );
+#endif
+
+    while( key_length )
+    {
+        // U1 ends up in work
+        //
+        if( ( ret = mbedtls_md_hmac_starts( ctx, password, plen ) ) != 0 )
+            return( ret );
+
+        if( ( ret = mbedtls_md_hmac_update( ctx, salt, slen ) ) != 0 )
+            return( ret );
+
+        if( ( ret = mbedtls_md_hmac_update( ctx, counter, 4 ) ) != 0 )
+            return( ret );
+
+        if( ( ret = mbedtls_md_hmac_finish( ctx, work ) ) != 0 )
+            return( ret );
+
+        memcpy( md1, work, md_size );
+
+        for( i = 1; i < iteration_count; i++ )
+        {
+            // U2 ends up in md1
+            //
+            if( ( ret = mbedtls_md_hmac_starts( ctx, password, plen ) ) != 0 )
+                return( ret );
+
+            if( ( ret = mbedtls_md_hmac_update( ctx, md1, md_size ) ) != 0 )
+                return( ret );
+
+            if( ( ret = mbedtls_md_hmac_finish( ctx, md1 ) ) != 0 )
+                return( ret );
+
+            // U1 xor U2
+            //
+            for( j = 0; j < md_size; j++ )
+                work[j] ^= md1[j];
+        }
+
+        use_len = ( key_length < md_size ) ? key_length : md_size;
+        memcpy( out_p, work, use_len );
+
+        key_length -= (uint32_t) use_len;
+        out_p += use_len;
+
+        for( i = 4; i > 0; i-- )
+            if( ++counter[i - 1] != 0 )
+                break;
+    }
+
+    return( 0 );
+}
+
+#if defined(MBEDTLS_SELF_TEST)
+
+#if !defined(MBEDTLS_SHA1_C)
+int mbedtls_pkcs5_self_test( int verbose )
+{
+    if( verbose != 0 )
+        mbedtls_printf( "  PBKDF2 (SHA1): skipped\n\n" );
+
+    return( 0 );
+}
+#else
+
+#define MAX_TESTS   6
+
+static const size_t plen[MAX_TESTS] =
+    { 8, 8, 8, 24, 9 };
+
+static const unsigned char password[MAX_TESTS][32] =
+{
+    "password",
+    "password",
+    "password",
+    "passwordPASSWORDpassword",
+    "pass\0word",
+};
+
+static const size_t slen[MAX_TESTS] =
+    { 4, 4, 4, 36, 5 };
+
+static const unsigned char salt[MAX_TESTS][40] =
+{
+    "salt",
+    "salt",
+    "salt",
+    "saltSALTsaltSALTsaltSALTsaltSALTsalt",
+    "sa\0lt",
+};
+
+static const uint32_t it_cnt[MAX_TESTS] =
+    { 1, 2, 4096, 4096, 4096 };
+
+static const uint32_t key_len[MAX_TESTS] =
+    { 20, 20, 20, 25, 16 };
+
+static const unsigned char result_key[MAX_TESTS][32] =
+{
+    { 0x0c, 0x60, 0xc8, 0x0f, 0x96, 0x1f, 0x0e, 0x71,
+      0xf3, 0xa9, 0xb5, 0x24, 0xaf, 0x60, 0x12, 0x06,
+      0x2f, 0xe0, 0x37, 0xa6 },
+    { 0xea, 0x6c, 0x01, 0x4d, 0xc7, 0x2d, 0x6f, 0x8c,
+      0xcd, 0x1e, 0xd9, 0x2a, 0xce, 0x1d, 0x41, 0xf0,
+      0xd8, 0xde, 0x89, 0x57 },
+    { 0x4b, 0x00, 0x79, 0x01, 0xb7, 0x65, 0x48, 0x9a,
+      0xbe, 0xad, 0x49, 0xd9, 0x26, 0xf7, 0x21, 0xd0,
+      0x65, 0xa4, 0x29, 0xc1 },
+    { 0x3d, 0x2e, 0xec, 0x4f, 0xe4, 0x1c, 0x84, 0x9b,
+      0x80, 0xc8, 0xd8, 0x36, 0x62, 0xc0, 0xe4, 0x4a,
+      0x8b, 0x29, 0x1a, 0x96, 0x4c, 0xf2, 0xf0, 0x70,
+      0x38 },
+    { 0x56, 0xfa, 0x6a, 0xa7, 0x55, 0x48, 0x09, 0x9d,
+      0xcc, 0x37, 0xd7, 0xf0, 0x34, 0x25, 0xe0, 0xc3 },
+};
+
+int mbedtls_pkcs5_self_test( int verbose )
+{
+    mbedtls_md_context_t sha1_ctx;
+    const mbedtls_md_info_t *info_sha1;
+    int ret, i;
+    unsigned char key[64];
+
+    mbedtls_md_init( &sha1_ctx );
+
+    info_sha1 = mbedtls_md_info_from_type( MBEDTLS_MD_SHA1 );
+    if( info_sha1 == NULL )
+    {
+        ret = 1;
+        goto exit;
+    }
+
+    if( ( ret = mbedtls_md_setup( &sha1_ctx, info_sha1, 1 ) ) != 0 )
+    {
+        ret = 1;
+        goto exit;
+    }
+
+    for( i = 0; i < MAX_TESTS; i++ )
+    {
+        if( verbose != 0 )
+            mbedtls_printf( "  PBKDF2 (SHA1) #%d: ", i );
+
+        ret = mbedtls_pkcs5_pbkdf2_hmac( &sha1_ctx, password[i], plen[i], salt[i],
+                                  slen[i], it_cnt[i], key_len[i], key );
+        if( ret != 0 ||
+            memcmp( result_key[i], key, key_len[i] ) != 0 )
+        {
+            if( verbose != 0 )
+                mbedtls_printf( "failed\n" );
+
+            ret = 1;
+            goto exit;
+        }
+
+        if( verbose != 0 )
+            mbedtls_printf( "passed\n" );
+    }
+
+    if( verbose != 0 )
+        mbedtls_printf( "\n" );
+
+exit:
+    mbedtls_md_free( &sha1_ctx );
+
+    return( ret );
+}
+#endif /* MBEDTLS_SHA1_C */
+
+#endif /* MBEDTLS_SELF_TEST */
+
+#endif /* MBEDTLS_PKCS5_C */
diff --git a/common/mbedtls/pkcs5.h b/common/mbedtls/pkcs5.h
new file mode 100644
index 000000000..7b6acf580
--- /dev/null
+++ b/common/mbedtls/pkcs5.h
@@ -0,0 +1,97 @@
+/**
+ * \file pkcs5.h
+ *
+ * \brief PKCS#5 functions
+ *
+ * \author Mathias Olsson <mathias@kompetensum.com>
+ */
+/*
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+#ifndef MBEDTLS_PKCS5_H
+#define MBEDTLS_PKCS5_H
+
+#include "asn1.h"
+#include "md.h"
+
+#include <stddef.h>
+#include <stdint.h>
+
+#define MBEDTLS_ERR_PKCS5_BAD_INPUT_DATA                  -0x2f80  /**< Bad input parameters to function. */
+#define MBEDTLS_ERR_PKCS5_INVALID_FORMAT                  -0x2f00  /**< Unexpected ASN.1 data. */
+#define MBEDTLS_ERR_PKCS5_FEATURE_UNAVAILABLE             -0x2e80  /**< Requested encryption or digest alg not available. */
+#define MBEDTLS_ERR_PKCS5_PASSWORD_MISMATCH               -0x2e00  /**< Given private key password does not allow for correct decryption. */
+
+#define MBEDTLS_PKCS5_DECRYPT      0
+#define MBEDTLS_PKCS5_ENCRYPT      1
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \brief          PKCS#5 PBES2 function
+ *
+ * \param pbe_params the ASN.1 algorithm parameters
+ * \param mode       either MBEDTLS_PKCS5_DECRYPT or MBEDTLS_PKCS5_ENCRYPT
+ * \param pwd        password to use when generating key
+ * \param pwdlen     length of password
+ * \param data       data to process
+ * \param datalen    length of data
+ * \param output     output buffer
+ *
+ * \returns        0 on success, or a MBEDTLS_ERR_XXX code if verification fails.
+ */
+int mbedtls_pkcs5_pbes2( const mbedtls_asn1_buf *pbe_params, int mode,
+                 const unsigned char *pwd,  size_t pwdlen,
+                 const unsigned char *data, size_t datalen,
+                 unsigned char *output );
+
+/**
+ * \brief          PKCS#5 PBKDF2 using HMAC
+ *
+ * \param ctx      Generic HMAC context
+ * \param password Password to use when generating key
+ * \param plen     Length of password
+ * \param salt     Salt to use when generating key
+ * \param slen     Length of salt
+ * \param iteration_count       Iteration count
+ * \param key_length            Length of generated key in bytes
+ * \param output   Generated key. Must be at least as big as key_length
+ *
+ * \returns        0 on success, or a MBEDTLS_ERR_XXX code if verification fails.
+ */
+int mbedtls_pkcs5_pbkdf2_hmac( mbedtls_md_context_t *ctx, const unsigned char *password,
+                       size_t plen, const unsigned char *salt, size_t slen,
+                       unsigned int iteration_count,
+                       uint32_t key_length, unsigned char *output );
+
+/**
+ * \brief          Checkup routine
+ *
+ * \return         0 if successful, or 1 if the test failed
+ */
+int mbedtls_pkcs5_self_test( int verbose );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* pkcs5.h */
diff --git a/common/mbedtls/pkparse.c b/common/mbedtls/pkparse.c
new file mode 100644
index 000000000..a687076b0
--- /dev/null
+++ b/common/mbedtls/pkparse.c
@@ -0,0 +1,1449 @@
+/*
+ *  Public Key layer for parsing key files and structures
+ *
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "mbedtls/config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#if defined(MBEDTLS_PK_PARSE_C)
+
+#include "mbedtls/pk.h"
+#include "mbedtls/asn1.h"
+#include "mbedtls/oid.h"
+#include "mbedtls/platform_util.h"
+
+#include <string.h>
+
+#if defined(MBEDTLS_RSA_C)
+#include "mbedtls/rsa.h"
+#endif
+#if defined(MBEDTLS_ECP_C)
+#include "mbedtls/ecp.h"
+#endif
+#if defined(MBEDTLS_ECDSA_C)
+#include "mbedtls/ecdsa.h"
+#endif
+#if defined(MBEDTLS_PEM_PARSE_C)
+#include "mbedtls/pem.h"
+#endif
+#if defined(MBEDTLS_PKCS5_C)
+#include "mbedtls/pkcs5.h"
+#endif
+#if defined(MBEDTLS_PKCS12_C)
+#include "mbedtls/pkcs12.h"
+#endif
+
+#if defined(MBEDTLS_PLATFORM_C)
+#include "mbedtls/platform.h"
+#else
+#include <stdlib.h>
+#define mbedtls_calloc    calloc
+#define mbedtls_free       free
+#endif
+
+#if defined(MBEDTLS_FS_IO)
+/*
+ * Load all data from a file into a given buffer.
+ *
+ * The file is expected to contain either PEM or DER encoded data.
+ * A terminating null byte is always appended. It is included in the announced
+ * length only if the data looks like it is PEM encoded.
+ */
+int mbedtls_pk_load_file( const char *path, unsigned char **buf, size_t *n )
+{
+    FILE *f;
+    long size;
+
+    if( ( f = fopen( path, "rb" ) ) == NULL )
+        return( MBEDTLS_ERR_PK_FILE_IO_ERROR );
+
+    fseek( f, 0, SEEK_END );
+    if( ( size = ftell( f ) ) == -1 )
+    {
+        fclose( f );
+        return( MBEDTLS_ERR_PK_FILE_IO_ERROR );
+    }
+    fseek( f, 0, SEEK_SET );
+
+    *n = (size_t) size;
+
+    if( *n + 1 == 0 ||
+        ( *buf = mbedtls_calloc( 1, *n + 1 ) ) == NULL )
+    {
+        fclose( f );
+        return( MBEDTLS_ERR_PK_ALLOC_FAILED );
+    }
+
+    if( fread( *buf, 1, *n, f ) != *n )
+    {
+        fclose( f );
+
+        mbedtls_platform_zeroize( *buf, *n );
+        mbedtls_free( *buf );
+
+        return( MBEDTLS_ERR_PK_FILE_IO_ERROR );
+    }
+
+    fclose( f );
+
+    (*buf)[*n] = '\0';
+
+    if( strstr( (const char *) *buf, "-----BEGIN " ) != NULL )
+        ++*n;
+
+    return( 0 );
+}
+
+/*
+ * Load and parse a private key
+ */
+int mbedtls_pk_parse_keyfile( mbedtls_pk_context *ctx,
+                      const char *path, const char *pwd )
+{
+    int ret;
+    size_t n;
+    unsigned char *buf;
+
+    if( ( ret = mbedtls_pk_load_file( path, &buf, &n ) ) != 0 )
+        return( ret );
+
+    if( pwd == NULL )
+        ret = mbedtls_pk_parse_key( ctx, buf, n, NULL, 0 );
+    else
+        ret = mbedtls_pk_parse_key( ctx, buf, n,
+                (const unsigned char *) pwd, strlen( pwd ) );
+
+    mbedtls_platform_zeroize( buf, n );
+    mbedtls_free( buf );
+
+    return( ret );
+}
+
+/*
+ * Load and parse a public key
+ */
+int mbedtls_pk_parse_public_keyfile( mbedtls_pk_context *ctx, const char *path )
+{
+    int ret;
+    size_t n;
+    unsigned char *buf;
+
+    if( ( ret = mbedtls_pk_load_file( path, &buf, &n ) ) != 0 )
+        return( ret );
+
+    ret = mbedtls_pk_parse_public_key( ctx, buf, n );
+
+    mbedtls_platform_zeroize( buf, n );
+    mbedtls_free( buf );
+
+    return( ret );
+}
+#endif /* MBEDTLS_FS_IO */
+
+#if defined(MBEDTLS_ECP_C)
+/* Minimally parse an ECParameters buffer to and mbedtls_asn1_buf
+ *
+ * ECParameters ::= CHOICE {
+ *   namedCurve         OBJECT IDENTIFIER
+ *   specifiedCurve     SpecifiedECDomain -- = SEQUENCE { ... }
+ *   -- implicitCurve   NULL
+ * }
+ */
+static int pk_get_ecparams( unsigned char **p, const unsigned char *end,
+                            mbedtls_asn1_buf *params )
+{
+    int ret;
+
+    if ( end - *p < 1 )
+        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT +
+                MBEDTLS_ERR_ASN1_OUT_OF_DATA );
+
+    /* Tag may be either OID or SEQUENCE */
+    params->tag = **p;
+    if( params->tag != MBEDTLS_ASN1_OID
+#if defined(MBEDTLS_PK_PARSE_EC_EXTENDED)
+            && params->tag != ( MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE )
+#endif
+            )
+    {
+        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT +
+                MBEDTLS_ERR_ASN1_UNEXPECTED_TAG );
+    }
+
+    if( ( ret = mbedtls_asn1_get_tag( p, end, &params->len, params->tag ) ) != 0 )
+    {
+        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret );
+    }
+
+    params->p = *p;
+    *p += params->len;
+
+    if( *p != end )
+        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT +
+                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+
+    return( 0 );
+}
+
+#if defined(MBEDTLS_PK_PARSE_EC_EXTENDED)
+/*
+ * Parse a SpecifiedECDomain (SEC 1 C.2) and (mostly) fill the group with it.
+ * WARNING: the resulting group should only be used with
+ * pk_group_id_from_specified(), since its base point may not be set correctly
+ * if it was encoded compressed.
+ *
+ *  SpecifiedECDomain ::= SEQUENCE {
+ *      version SpecifiedECDomainVersion(ecdpVer1 | ecdpVer2 | ecdpVer3, ...),
+ *      fieldID FieldID {{FieldTypes}},
+ *      curve Curve,
+ *      base ECPoint,
+ *      order INTEGER,
+ *      cofactor INTEGER OPTIONAL,
+ *      hash HashAlgorithm OPTIONAL,
+ *      ...
+ *  }
+ *
+ * We only support prime-field as field type, and ignore hash and cofactor.
+ */
+static int pk_group_from_specified( const mbedtls_asn1_buf *params, mbedtls_ecp_group *grp )
+{
+    int ret;
+    unsigned char *p = params->p;
+    const unsigned char * const end = params->p + params->len;
+    const unsigned char *end_field, *end_curve;
+    size_t len;
+    int ver;
+
+    /* SpecifiedECDomainVersion ::= INTEGER { 1, 2, 3 } */
+    if( ( ret = mbedtls_asn1_get_int( &p, end, &ver ) ) != 0 )
+        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret );
+
+    if( ver < 1 || ver > 3 )
+        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT );
+
+    /*
+     * FieldID { FIELD-ID:IOSet } ::= SEQUENCE { -- Finite field
+     *       fieldType FIELD-ID.&id({IOSet}),
+     *       parameters FIELD-ID.&Type({IOSet}{@fieldType})
+     * }
+     */
+    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len,
+            MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
+        return( ret );
+
+    end_field = p + len;
+
+    /*
+     * FIELD-ID ::= TYPE-IDENTIFIER
+     * FieldTypes FIELD-ID ::= {
+     *       { Prime-p IDENTIFIED BY prime-field } |
+     *       { Characteristic-two IDENTIFIED BY characteristic-two-field }
+     * }
+     * prime-field OBJECT IDENTIFIER ::= { id-fieldType 1 }
+     */
+    if( ( ret = mbedtls_asn1_get_tag( &p, end_field, &len, MBEDTLS_ASN1_OID ) ) != 0 )
+        return( ret );
+
+    if( len != MBEDTLS_OID_SIZE( MBEDTLS_OID_ANSI_X9_62_PRIME_FIELD ) ||
+        memcmp( p, MBEDTLS_OID_ANSI_X9_62_PRIME_FIELD, len ) != 0 )
+    {
+        return( MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE );
+    }
+
+    p += len;
+
+    /* Prime-p ::= INTEGER -- Field of size p. */
+    if( ( ret = mbedtls_asn1_get_mpi( &p, end_field, &grp->P ) ) != 0 )
+        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret );
+
+    grp->pbits = mbedtls_mpi_bitlen( &grp->P );
+
+    if( p != end_field )
+        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT +
+                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+
+    /*
+     * Curve ::= SEQUENCE {
+     *       a FieldElement,
+     *       b FieldElement,
+     *       seed BIT STRING OPTIONAL
+     *       -- Shall be present if used in SpecifiedECDomain
+     *       -- with version equal to ecdpVer2 or ecdpVer3
+     * }
+     */
+    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len,
+            MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
+        return( ret );
+
+    end_curve = p + len;
+
+    /*
+     * FieldElement ::= OCTET STRING
+     * containing an integer in the case of a prime field
+     */
+    if( ( ret = mbedtls_asn1_get_tag( &p, end_curve, &len, MBEDTLS_ASN1_OCTET_STRING ) ) != 0 ||
+        ( ret = mbedtls_mpi_read_binary( &grp->A, p, len ) ) != 0 )
+    {
+        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret );
+    }
+
+    p += len;
+
+    if( ( ret = mbedtls_asn1_get_tag( &p, end_curve, &len, MBEDTLS_ASN1_OCTET_STRING ) ) != 0 ||
+        ( ret = mbedtls_mpi_read_binary( &grp->B, p, len ) ) != 0 )
+    {
+        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret );
+    }
+
+    p += len;
+
+    /* Ignore seed BIT STRING OPTIONAL */
+    if( ( ret = mbedtls_asn1_get_tag( &p, end_curve, &len, MBEDTLS_ASN1_BIT_STRING ) ) == 0 )
+        p += len;
+
+    if( p != end_curve )
+        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT +
+                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+
+    /*
+     * ECPoint ::= OCTET STRING
+     */
+    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len, MBEDTLS_ASN1_OCTET_STRING ) ) != 0 )
+        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret );
+
+    if( ( ret = mbedtls_ecp_point_read_binary( grp, &grp->G,
+                                      ( const unsigned char *) p, len ) ) != 0 )
+    {
+        /*
+         * If we can't read the point because it's compressed, cheat by
+         * reading only the X coordinate and the parity bit of Y.
+         */
+        if( ret != MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE ||
+            ( p[0] != 0x02 && p[0] != 0x03 ) ||
+            len != mbedtls_mpi_size( &grp->P ) + 1 ||
+            mbedtls_mpi_read_binary( &grp->G.X, p + 1, len - 1 ) != 0 ||
+            mbedtls_mpi_lset( &grp->G.Y, p[0] - 2 ) != 0 ||
+            mbedtls_mpi_lset( &grp->G.Z, 1 ) != 0 )
+        {
+            return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT );
+        }
+    }
+
+    p += len;
+
+    /*
+     * order INTEGER
+     */
+    if( ( ret = mbedtls_asn1_get_mpi( &p, end, &grp->N ) ) != 0 )
+        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret );
+
+    grp->nbits = mbedtls_mpi_bitlen( &grp->N );
+
+    /*
+     * Allow optional elements by purposefully not enforcing p == end here.
+     */
+
+    return( 0 );
+}
+
+/*
+ * Find the group id associated with an (almost filled) group as generated by
+ * pk_group_from_specified(), or return an error if unknown.
+ */
+static int pk_group_id_from_group( const mbedtls_ecp_group *grp, mbedtls_ecp_group_id *grp_id )
+{
+    int ret = 0;
+    mbedtls_ecp_group ref;
+    const mbedtls_ecp_group_id *id;
+
+    mbedtls_ecp_group_init( &ref );
+
+    for( id = mbedtls_ecp_grp_id_list(); *id != MBEDTLS_ECP_DP_NONE; id++ )
+    {
+        /* Load the group associated to that id */
+        mbedtls_ecp_group_free( &ref );
+        MBEDTLS_MPI_CHK( mbedtls_ecp_group_load( &ref, *id ) );
+
+        /* Compare to the group we were given, starting with easy tests */
+        if( grp->pbits == ref.pbits && grp->nbits == ref.nbits &&
+            mbedtls_mpi_cmp_mpi( &grp->P, &ref.P ) == 0 &&
+            mbedtls_mpi_cmp_mpi( &grp->A, &ref.A ) == 0 &&
+            mbedtls_mpi_cmp_mpi( &grp->B, &ref.B ) == 0 &&
+            mbedtls_mpi_cmp_mpi( &grp->N, &ref.N ) == 0 &&
+            mbedtls_mpi_cmp_mpi( &grp->G.X, &ref.G.X ) == 0 &&
+            mbedtls_mpi_cmp_mpi( &grp->G.Z, &ref.G.Z ) == 0 &&
+            /* For Y we may only know the parity bit, so compare only that */
+            mbedtls_mpi_get_bit( &grp->G.Y, 0 ) == mbedtls_mpi_get_bit( &ref.G.Y, 0 ) )
+        {
+            break;
+        }
+
+    }
+
+cleanup:
+    mbedtls_ecp_group_free( &ref );
+
+    *grp_id = *id;
+
+    if( ret == 0 && *id == MBEDTLS_ECP_DP_NONE )
+        ret = MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE;
+
+    return( ret );
+}
+
+/*
+ * Parse a SpecifiedECDomain (SEC 1 C.2) and find the associated group ID
+ */
+static int pk_group_id_from_specified( const mbedtls_asn1_buf *params,
+                                       mbedtls_ecp_group_id *grp_id )
+{
+    int ret;
+    mbedtls_ecp_group grp;
+
+    mbedtls_ecp_group_init( &grp );
+
+    if( ( ret = pk_group_from_specified( params, &grp ) ) != 0 )
+        goto cleanup;
+
+    ret = pk_group_id_from_group( &grp, grp_id );
+
+cleanup:
+    mbedtls_ecp_group_free( &grp );
+
+    return( ret );
+}
+#endif /* MBEDTLS_PK_PARSE_EC_EXTENDED */
+
+/*
+ * Use EC parameters to initialise an EC group
+ *
+ * ECParameters ::= CHOICE {
+ *   namedCurve         OBJECT IDENTIFIER
+ *   specifiedCurve     SpecifiedECDomain -- = SEQUENCE { ... }
+ *   -- implicitCurve   NULL
+ */
+static int pk_use_ecparams( const mbedtls_asn1_buf *params, mbedtls_ecp_group *grp )
+{
+    int ret;
+    mbedtls_ecp_group_id grp_id;
+
+    if( params->tag == MBEDTLS_ASN1_OID )
+    {
+        if( mbedtls_oid_get_ec_grp( params, &grp_id ) != 0 )
+            return( MBEDTLS_ERR_PK_UNKNOWN_NAMED_CURVE );
+    }
+    else
+    {
+#if defined(MBEDTLS_PK_PARSE_EC_EXTENDED)
+        if( ( ret = pk_group_id_from_specified( params, &grp_id ) ) != 0 )
+            return( ret );
+#else
+        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT );
+#endif
+    }
+
+    /*
+     * grp may already be initilialized; if so, make sure IDs match
+     */
+    if( grp->id != MBEDTLS_ECP_DP_NONE && grp->id != grp_id )
+        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT );
+
+    if( ( ret = mbedtls_ecp_group_load( grp, grp_id ) ) != 0 )
+        return( ret );
+
+    return( 0 );
+}
+
+/*
+ * EC public key is an EC point
+ *
+ * The caller is responsible for clearing the structure upon failure if
+ * desired. Take care to pass along the possible ECP_FEATURE_UNAVAILABLE
+ * return code of mbedtls_ecp_point_read_binary() and leave p in a usable state.
+ */
+static int pk_get_ecpubkey( unsigned char **p, const unsigned char *end,
+                            mbedtls_ecp_keypair *key )
+{
+    int ret;
+
+    if( ( ret = mbedtls_ecp_point_read_binary( &key->grp, &key->Q,
+                    (const unsigned char *) *p, end - *p ) ) == 0 )
+    {
+        ret = mbedtls_ecp_check_pubkey( &key->grp, &key->Q );
+    }
+
+    /*
+     * We know mbedtls_ecp_point_read_binary consumed all bytes or failed
+     */
+    *p = (unsigned char *) end;
+
+    return( ret );
+}
+#endif /* MBEDTLS_ECP_C */
+
+#if defined(MBEDTLS_RSA_C)
+/*
+ *  RSAPublicKey ::= SEQUENCE {
+ *      modulus           INTEGER,  -- n
+ *      publicExponent    INTEGER   -- e
+ *  }
+ */
+static int pk_get_rsapubkey( unsigned char **p,
+                             const unsigned char *end,
+                             mbedtls_rsa_context *rsa )
+{
+    int ret;
+    size_t len;
+
+    if( ( ret = mbedtls_asn1_get_tag( p, end, &len,
+            MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
+        return( MBEDTLS_ERR_PK_INVALID_PUBKEY + ret );
+
+    if( *p + len != end )
+        return( MBEDTLS_ERR_PK_INVALID_PUBKEY +
+                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+
+    /* Import N */
+    if( ( ret = mbedtls_asn1_get_tag( p, end, &len, MBEDTLS_ASN1_INTEGER ) ) != 0 )
+        return( MBEDTLS_ERR_PK_INVALID_PUBKEY + ret );
+
+    if( ( ret = mbedtls_rsa_import_raw( rsa, *p, len, NULL, 0, NULL, 0,
+                                        NULL, 0, NULL, 0 ) ) != 0 )
+        return( MBEDTLS_ERR_PK_INVALID_PUBKEY );
+
+    *p += len;
+
+    /* Import E */
+    if( ( ret = mbedtls_asn1_get_tag( p, end, &len, MBEDTLS_ASN1_INTEGER ) ) != 0 )
+        return( MBEDTLS_ERR_PK_INVALID_PUBKEY + ret );
+
+    if( ( ret = mbedtls_rsa_import_raw( rsa, NULL, 0, NULL, 0, NULL, 0,
+                                        NULL, 0, *p, len ) ) != 0 )
+        return( MBEDTLS_ERR_PK_INVALID_PUBKEY );
+
+    *p += len;
+
+    if( mbedtls_rsa_complete( rsa ) != 0 ||
+        mbedtls_rsa_check_pubkey( rsa ) != 0 )
+    {
+        return( MBEDTLS_ERR_PK_INVALID_PUBKEY );
+    }
+
+    if( *p != end )
+        return( MBEDTLS_ERR_PK_INVALID_PUBKEY +
+                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+
+    return( 0 );
+}
+#endif /* MBEDTLS_RSA_C */
+
+/* Get a PK algorithm identifier
+ *
+ *  AlgorithmIdentifier  ::=  SEQUENCE  {
+ *       algorithm               OBJECT IDENTIFIER,
+ *       parameters              ANY DEFINED BY algorithm OPTIONAL  }
+ */
+static int pk_get_pk_alg( unsigned char **p,
+                          const unsigned char *end,
+                          mbedtls_pk_type_t *pk_alg, mbedtls_asn1_buf *params )
+{
+    int ret;
+    mbedtls_asn1_buf alg_oid;
+
+    memset( params, 0, sizeof(mbedtls_asn1_buf) );
+
+    if( ( ret = mbedtls_asn1_get_alg( p, end, &alg_oid, params ) ) != 0 )
+        return( MBEDTLS_ERR_PK_INVALID_ALG + ret );
+
+    if( mbedtls_oid_get_pk_alg( &alg_oid, pk_alg ) != 0 )
+        return( MBEDTLS_ERR_PK_UNKNOWN_PK_ALG );
+
+    /*
+     * No parameters with RSA (only for EC)
+     */
+    if( *pk_alg == MBEDTLS_PK_RSA &&
+            ( ( params->tag != MBEDTLS_ASN1_NULL && params->tag != 0 ) ||
+                params->len != 0 ) )
+    {
+        return( MBEDTLS_ERR_PK_INVALID_ALG );
+    }
+
+    return( 0 );
+}
+
+/*
+ *  SubjectPublicKeyInfo  ::=  SEQUENCE  {
+ *       algorithm            AlgorithmIdentifier,
+ *       subjectPublicKey     BIT STRING }
+ */
+int mbedtls_pk_parse_subpubkey( unsigned char **p, const unsigned char *end,
+                        mbedtls_pk_context *pk )
+{
+    int ret;
+    size_t len;
+    mbedtls_asn1_buf alg_params;
+    mbedtls_pk_type_t pk_alg = MBEDTLS_PK_NONE;
+    const mbedtls_pk_info_t *pk_info;
+
+    if( ( ret = mbedtls_asn1_get_tag( p, end, &len,
+                    MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
+    {
+        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret );
+    }
+
+    end = *p + len;
+
+    if( ( ret = pk_get_pk_alg( p, end, &pk_alg, &alg_params ) ) != 0 )
+        return( ret );
+
+    if( ( ret = mbedtls_asn1_get_bitstring_null( p, end, &len ) ) != 0 )
+        return( MBEDTLS_ERR_PK_INVALID_PUBKEY + ret );
+
+    if( *p + len != end )
+        return( MBEDTLS_ERR_PK_INVALID_PUBKEY +
+                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+
+    if( ( pk_info = mbedtls_pk_info_from_type( pk_alg ) ) == NULL )
+        return( MBEDTLS_ERR_PK_UNKNOWN_PK_ALG );
+
+    if( ( ret = mbedtls_pk_setup( pk, pk_info ) ) != 0 )
+        return( ret );
+
+#if defined(MBEDTLS_RSA_C)
+    if( pk_alg == MBEDTLS_PK_RSA )
+    {
+        ret = pk_get_rsapubkey( p, end, mbedtls_pk_rsa( *pk ) );
+    } else
+#endif /* MBEDTLS_RSA_C */
+#if defined(MBEDTLS_ECP_C)
+    if( pk_alg == MBEDTLS_PK_ECKEY_DH || pk_alg == MBEDTLS_PK_ECKEY )
+    {
+        ret = pk_use_ecparams( &alg_params, &mbedtls_pk_ec( *pk )->grp );
+        if( ret == 0 )
+            ret = pk_get_ecpubkey( p, end, mbedtls_pk_ec( *pk ) );
+    } else
+#endif /* MBEDTLS_ECP_C */
+        ret = MBEDTLS_ERR_PK_UNKNOWN_PK_ALG;
+
+    if( ret == 0 && *p != end )
+        ret = MBEDTLS_ERR_PK_INVALID_PUBKEY
+              MBEDTLS_ERR_ASN1_LENGTH_MISMATCH;
+
+    if( ret != 0 )
+        mbedtls_pk_free( pk );
+
+    return( ret );
+}
+
+#if defined(MBEDTLS_RSA_C)
+/*
+ * Parse a PKCS#1 encoded private RSA key
+ */
+static int pk_parse_key_pkcs1_der( mbedtls_rsa_context *rsa,
+                                   const unsigned char *key,
+                                   size_t keylen )
+{
+    int ret, version;
+    size_t len;
+    unsigned char *p, *end;
+
+    mbedtls_mpi T;
+    mbedtls_mpi_init( &T );
+
+    p = (unsigned char *) key;
+    end = p + keylen;
+
+    /*
+     * This function parses the RSAPrivateKey (PKCS#1)
+     *
+     *  RSAPrivateKey ::= SEQUENCE {
+     *      version           Version,
+     *      modulus           INTEGER,  -- n
+     *      publicExponent    INTEGER,  -- e
+     *      privateExponent   INTEGER,  -- d
+     *      prime1            INTEGER,  -- p
+     *      prime2            INTEGER,  -- q
+     *      exponent1         INTEGER,  -- d mod (p-1)
+     *      exponent2         INTEGER,  -- d mod (q-1)
+     *      coefficient       INTEGER,  -- (inverse of q) mod p
+     *      otherPrimeInfos   OtherPrimeInfos OPTIONAL
+     *  }
+     */
+    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len,
+            MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
+    {
+        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret );
+    }
+
+    end = p + len;
+
+    if( ( ret = mbedtls_asn1_get_int( &p, end, &version ) ) != 0 )
+    {
+        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret );
+    }
+
+    if( version != 0 )
+    {
+        return( MBEDTLS_ERR_PK_KEY_INVALID_VERSION );
+    }
+
+    /* Import N */
+    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len,
+                                      MBEDTLS_ASN1_INTEGER ) ) != 0 ||
+        ( ret = mbedtls_rsa_import_raw( rsa, p, len, NULL, 0, NULL, 0,
+                                        NULL, 0, NULL, 0 ) ) != 0 )
+        goto cleanup;
+    p += len;
+
+    /* Import E */
+    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len,
+                                      MBEDTLS_ASN1_INTEGER ) ) != 0 ||
+        ( ret = mbedtls_rsa_import_raw( rsa, NULL, 0, NULL, 0, NULL, 0,
+                                        NULL, 0, p, len ) ) != 0 )
+        goto cleanup;
+    p += len;
+
+    /* Import D */
+    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len,
+                                      MBEDTLS_ASN1_INTEGER ) ) != 0 ||
+        ( ret = mbedtls_rsa_import_raw( rsa, NULL, 0, NULL, 0, NULL, 0,
+                                        p, len, NULL, 0 ) ) != 0 )
+        goto cleanup;
+    p += len;
+
+    /* Import P */
+    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len,
+                                      MBEDTLS_ASN1_INTEGER ) ) != 0 ||
+        ( ret = mbedtls_rsa_import_raw( rsa, NULL, 0, p, len, NULL, 0,
+                                        NULL, 0, NULL, 0 ) ) != 0 )
+        goto cleanup;
+    p += len;
+
+    /* Import Q */
+    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len,
+                                      MBEDTLS_ASN1_INTEGER ) ) != 0 ||
+        ( ret = mbedtls_rsa_import_raw( rsa, NULL, 0, NULL, 0, p, len,
+                                        NULL, 0, NULL, 0 ) ) != 0 )
+        goto cleanup;
+    p += len;
+
+    /* Complete the RSA private key */
+    if( ( ret = mbedtls_rsa_complete( rsa ) ) != 0 )
+        goto cleanup;
+
+    /* Check optional parameters */
+    if( ( ret = mbedtls_asn1_get_mpi( &p, end, &T ) ) != 0 ||
+        ( ret = mbedtls_asn1_get_mpi( &p, end, &T ) ) != 0 ||
+        ( ret = mbedtls_asn1_get_mpi( &p, end, &T ) ) != 0 )
+        goto cleanup;
+
+    if( p != end )
+    {
+        ret = MBEDTLS_ERR_PK_KEY_INVALID_FORMAT +
+              MBEDTLS_ERR_ASN1_LENGTH_MISMATCH ;
+    }
+
+cleanup:
+
+    mbedtls_mpi_free( &T );
+
+    if( ret != 0 )
+    {
+        /* Wrap error code if it's coming from a lower level */
+        if( ( ret & 0xff80 ) == 0 )
+            ret = MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret;
+        else
+            ret = MBEDTLS_ERR_PK_KEY_INVALID_FORMAT;
+
+        mbedtls_rsa_free( rsa );
+    }
+
+    return( ret );
+}
+#endif /* MBEDTLS_RSA_C */
+
+#if defined(MBEDTLS_ECP_C)
+/*
+ * Parse a SEC1 encoded private EC key
+ */
+static int pk_parse_key_sec1_der( mbedtls_ecp_keypair *eck,
+                                  const unsigned char *key,
+                                  size_t keylen )
+{
+    int ret;
+    int version, pubkey_done;
+    size_t len;
+    mbedtls_asn1_buf params;
+    unsigned char *p = (unsigned char *) key;
+    unsigned char *end = p + keylen;
+    unsigned char *end2;
+
+    /*
+     * RFC 5915, or SEC1 Appendix C.4
+     *
+     * ECPrivateKey ::= SEQUENCE {
+     *      version        INTEGER { ecPrivkeyVer1(1) } (ecPrivkeyVer1),
+     *      privateKey     OCTET STRING,
+     *      parameters [0] ECParameters {{ NamedCurve }} OPTIONAL,
+     *      publicKey  [1] BIT STRING OPTIONAL
+     *    }
+     */
+    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len,
+            MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
+    {
+        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret );
+    }
+
+    end = p + len;
+
+    if( ( ret = mbedtls_asn1_get_int( &p, end, &version ) ) != 0 )
+        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret );
+
+    if( version != 1 )
+        return( MBEDTLS_ERR_PK_KEY_INVALID_VERSION );
+
+    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len, MBEDTLS_ASN1_OCTET_STRING ) ) != 0 )
+        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret );
+
+    if( ( ret = mbedtls_mpi_read_binary( &eck->d, p, len ) ) != 0 )
+    {
+        mbedtls_ecp_keypair_free( eck );
+        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret );
+    }
+
+    p += len;
+
+    pubkey_done = 0;
+    if( p != end )
+    {
+        /*
+         * Is 'parameters' present?
+         */
+        if( ( ret = mbedtls_asn1_get_tag( &p, end, &len,
+                        MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_CONSTRUCTED | 0 ) ) == 0 )
+        {
+            if( ( ret = pk_get_ecparams( &p, p + len, &params) ) != 0 ||
+                ( ret = pk_use_ecparams( &params, &eck->grp )  ) != 0 )
+            {
+                mbedtls_ecp_keypair_free( eck );
+                return( ret );
+            }
+        }
+        else if( ret != MBEDTLS_ERR_ASN1_UNEXPECTED_TAG )
+        {
+            mbedtls_ecp_keypair_free( eck );
+            return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret );
+        }
+    }
+
+    if( p != end )
+    {
+        /*
+         * Is 'publickey' present? If not, or if we can't read it (eg because it
+         * is compressed), create it from the private key.
+         */
+        if( ( ret = mbedtls_asn1_get_tag( &p, end, &len,
+                        MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_CONSTRUCTED | 1 ) ) == 0 )
+        {
+            end2 = p + len;
+
+            if( ( ret = mbedtls_asn1_get_bitstring_null( &p, end2, &len ) ) != 0 )
+                return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret );
+
+            if( p + len != end2 )
+                return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT +
+                        MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+
+            if( ( ret = pk_get_ecpubkey( &p, end2, eck ) ) == 0 )
+                pubkey_done = 1;
+            else
+            {
+                /*
+                 * The only acceptable failure mode of pk_get_ecpubkey() above
+                 * is if the point format is not recognized.
+                 */
+                if( ret != MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE )
+                    return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT );
+            }
+        }
+        else if( ret != MBEDTLS_ERR_ASN1_UNEXPECTED_TAG )
+        {
+            mbedtls_ecp_keypair_free( eck );
+            return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret );
+        }
+    }
+
+    if( ! pubkey_done &&
+        ( ret = mbedtls_ecp_mul( &eck->grp, &eck->Q, &eck->d, &eck->grp.G,
+                                                      NULL, NULL ) ) != 0 )
+    {
+        mbedtls_ecp_keypair_free( eck );
+        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret );
+    }
+
+    if( ( ret = mbedtls_ecp_check_privkey( &eck->grp, &eck->d ) ) != 0 )
+    {
+        mbedtls_ecp_keypair_free( eck );
+        return( ret );
+    }
+
+    return( 0 );
+}
+#endif /* MBEDTLS_ECP_C */
+
+/*
+ * Parse an unencrypted PKCS#8 encoded private key
+ *
+ * Notes:
+ *
+ * - This function does not own the key buffer. It is the
+ *   responsibility of the caller to take care of zeroizing
+ *   and freeing it after use.
+ *
+ * - The function is responsible for freeing the provided
+ *   PK context on failure.
+ *
+ */
+static int pk_parse_key_pkcs8_unencrypted_der(
+                                    mbedtls_pk_context *pk,
+                                    const unsigned char* key,
+                                    size_t keylen )
+{
+    int ret, version;
+    size_t len;
+    mbedtls_asn1_buf params;
+    unsigned char *p = (unsigned char *) key;
+    unsigned char *end = p + keylen;
+    mbedtls_pk_type_t pk_alg = MBEDTLS_PK_NONE;
+    const mbedtls_pk_info_t *pk_info;
+
+    /*
+     * This function parses the PrivateKeyInfo object (PKCS#8 v1.2 = RFC 5208)
+     *
+     *    PrivateKeyInfo ::= SEQUENCE {
+     *      version                   Version,
+     *      privateKeyAlgorithm       PrivateKeyAlgorithmIdentifier,
+     *      privateKey                PrivateKey,
+     *      attributes           [0]  IMPLICIT Attributes OPTIONAL }
+     *
+     *    Version ::= INTEGER
+     *    PrivateKeyAlgorithmIdentifier ::= AlgorithmIdentifier
+     *    PrivateKey ::= OCTET STRING
+     *
+     *  The PrivateKey OCTET STRING is a SEC1 ECPrivateKey
+     */
+
+    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len,
+            MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
+    {
+        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret );
+    }
+
+    end = p + len;
+
+    if( ( ret = mbedtls_asn1_get_int( &p, end, &version ) ) != 0 )
+        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret );
+
+    if( version != 0 )
+        return( MBEDTLS_ERR_PK_KEY_INVALID_VERSION + ret );
+
+    if( ( ret = pk_get_pk_alg( &p, end, &pk_alg, &params ) ) != 0 )
+        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret );
+
+    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len, MBEDTLS_ASN1_OCTET_STRING ) ) != 0 )
+        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret );
+
+    if( len < 1 )
+        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT +
+                MBEDTLS_ERR_ASN1_OUT_OF_DATA );
+
+    if( ( pk_info = mbedtls_pk_info_from_type( pk_alg ) ) == NULL )
+        return( MBEDTLS_ERR_PK_UNKNOWN_PK_ALG );
+
+    if( ( ret = mbedtls_pk_setup( pk, pk_info ) ) != 0 )
+        return( ret );
+
+#if defined(MBEDTLS_RSA_C)
+    if( pk_alg == MBEDTLS_PK_RSA )
+    {
+        if( ( ret = pk_parse_key_pkcs1_der( mbedtls_pk_rsa( *pk ), p, len ) ) != 0 )
+        {
+            mbedtls_pk_free( pk );
+            return( ret );
+        }
+    } else
+#endif /* MBEDTLS_RSA_C */
+#if defined(MBEDTLS_ECP_C)
+    if( pk_alg == MBEDTLS_PK_ECKEY || pk_alg == MBEDTLS_PK_ECKEY_DH )
+    {
+        if( ( ret = pk_use_ecparams( &params, &mbedtls_pk_ec( *pk )->grp ) ) != 0 ||
+            ( ret = pk_parse_key_sec1_der( mbedtls_pk_ec( *pk ), p, len )  ) != 0 )
+        {
+            mbedtls_pk_free( pk );
+            return( ret );
+        }
+    } else
+#endif /* MBEDTLS_ECP_C */
+        return( MBEDTLS_ERR_PK_UNKNOWN_PK_ALG );
+
+    return( 0 );
+}
+
+/*
+ * Parse an encrypted PKCS#8 encoded private key
+ *
+ * To save space, the decryption happens in-place on the given key buffer.
+ * Also, while this function may modify the keybuffer, it doesn't own it,
+ * and instead it is the responsibility of the caller to zeroize and properly
+ * free it after use.
+ *
+ */
+#if defined(MBEDTLS_PKCS12_C) || defined(MBEDTLS_PKCS5_C)
+static int pk_parse_key_pkcs8_encrypted_der(
+                                    mbedtls_pk_context *pk,
+                                    unsigned char *key, size_t keylen,
+                                    const unsigned char *pwd, size_t pwdlen )
+{
+    int ret, decrypted = 0;
+    size_t len;
+    unsigned char *buf;
+    unsigned char *p, *end;
+    mbedtls_asn1_buf pbe_alg_oid, pbe_params;
+#if defined(MBEDTLS_PKCS12_C)
+    mbedtls_cipher_type_t cipher_alg;
+    mbedtls_md_type_t md_alg;
+#endif
+
+    p = key;
+    end = p + keylen;
+
+    if( pwdlen == 0 )
+        return( MBEDTLS_ERR_PK_PASSWORD_REQUIRED );
+
+    /*
+     * This function parses the EncryptedPrivateKeyInfo object (PKCS#8)
+     *
+     *  EncryptedPrivateKeyInfo ::= SEQUENCE {
+     *    encryptionAlgorithm  EncryptionAlgorithmIdentifier,
+     *    encryptedData        EncryptedData
+     *  }
+     *
+     *  EncryptionAlgorithmIdentifier ::= AlgorithmIdentifier
+     *
+     *  EncryptedData ::= OCTET STRING
+     *
+     *  The EncryptedData OCTET STRING is a PKCS#8 PrivateKeyInfo
+     *
+     */
+    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len,
+            MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
+    {
+        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret );
+    }
+
+    end = p + len;
+
+    if( ( ret = mbedtls_asn1_get_alg( &p, end, &pbe_alg_oid, &pbe_params ) ) != 0 )
+        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret );
+
+    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len, MBEDTLS_ASN1_OCTET_STRING ) ) != 0 )
+        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret );
+
+    buf = p;
+
+    /*
+     * Decrypt EncryptedData with appropriate PBE
+     */
+#if defined(MBEDTLS_PKCS12_C)
+    if( mbedtls_oid_get_pkcs12_pbe_alg( &pbe_alg_oid, &md_alg, &cipher_alg ) == 0 )
+    {
+        if( ( ret = mbedtls_pkcs12_pbe( &pbe_params, MBEDTLS_PKCS12_PBE_DECRYPT,
+                                cipher_alg, md_alg,
+                                pwd, pwdlen, p, len, buf ) ) != 0 )
+        {
+            if( ret == MBEDTLS_ERR_PKCS12_PASSWORD_MISMATCH )
+                return( MBEDTLS_ERR_PK_PASSWORD_MISMATCH );
+
+            return( ret );
+        }
+
+        decrypted = 1;
+    }
+    else if( MBEDTLS_OID_CMP( MBEDTLS_OID_PKCS12_PBE_SHA1_RC4_128, &pbe_alg_oid ) == 0 )
+    {
+        if( ( ret = mbedtls_pkcs12_pbe_sha1_rc4_128( &pbe_params,
+                                             MBEDTLS_PKCS12_PBE_DECRYPT,
+                                             pwd, pwdlen,
+                                             p, len, buf ) ) != 0 )
+        {
+            return( ret );
+        }
+
+        // Best guess for password mismatch when using RC4. If first tag is
+        // not MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE
+        //
+        if( *buf != ( MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) )
+            return( MBEDTLS_ERR_PK_PASSWORD_MISMATCH );
+
+        decrypted = 1;
+    }
+    else
+#endif /* MBEDTLS_PKCS12_C */
+#if defined(MBEDTLS_PKCS5_C)
+    if( MBEDTLS_OID_CMP( MBEDTLS_OID_PKCS5_PBES2, &pbe_alg_oid ) == 0 )
+    {
+        if( ( ret = mbedtls_pkcs5_pbes2( &pbe_params, MBEDTLS_PKCS5_DECRYPT, pwd, pwdlen,
+                                  p, len, buf ) ) != 0 )
+        {
+            if( ret == MBEDTLS_ERR_PKCS5_PASSWORD_MISMATCH )
+                return( MBEDTLS_ERR_PK_PASSWORD_MISMATCH );
+
+            return( ret );
+        }
+
+        decrypted = 1;
+    }
+    else
+#endif /* MBEDTLS_PKCS5_C */
+    {
+        ((void) pwd);
+    }
+
+    if( decrypted == 0 )
+        return( MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE );
+
+    return( pk_parse_key_pkcs8_unencrypted_der( pk, buf, len ) );
+}
+#endif /* MBEDTLS_PKCS12_C || MBEDTLS_PKCS5_C */
+
+/*
+ * Parse a private key
+ */
+int mbedtls_pk_parse_key( mbedtls_pk_context *pk,
+                  const unsigned char *key, size_t keylen,
+                  const unsigned char *pwd, size_t pwdlen )
+{
+    int ret;
+    const mbedtls_pk_info_t *pk_info;
+
+#if defined(MBEDTLS_PEM_PARSE_C)
+    size_t len;
+    mbedtls_pem_context pem;
+
+    mbedtls_pem_init( &pem );
+
+#if defined(MBEDTLS_RSA_C)
+    /* Avoid calling mbedtls_pem_read_buffer() on non-null-terminated string */
+    if( keylen == 0 || key[keylen - 1] != '\0' )
+        ret = MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT;
+    else
+        ret = mbedtls_pem_read_buffer( &pem,
+                               "-----BEGIN RSA PRIVATE KEY-----",
+                               "-----END RSA PRIVATE KEY-----",
+                               key, pwd, pwdlen, &len );
+
+    if( ret == 0 )
+    {
+        pk_info = mbedtls_pk_info_from_type( MBEDTLS_PK_RSA );
+        if( ( ret = mbedtls_pk_setup( pk, pk_info ) ) != 0 ||
+            ( ret = pk_parse_key_pkcs1_der( mbedtls_pk_rsa( *pk ),
+                                            pem.buf, pem.buflen ) ) != 0 )
+        {
+            mbedtls_pk_free( pk );
+        }
+
+        mbedtls_pem_free( &pem );
+        return( ret );
+    }
+    else if( ret == MBEDTLS_ERR_PEM_PASSWORD_MISMATCH )
+        return( MBEDTLS_ERR_PK_PASSWORD_MISMATCH );
+    else if( ret == MBEDTLS_ERR_PEM_PASSWORD_REQUIRED )
+        return( MBEDTLS_ERR_PK_PASSWORD_REQUIRED );
+    else if( ret != MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT )
+        return( ret );
+#endif /* MBEDTLS_RSA_C */
+
+#if defined(MBEDTLS_ECP_C)
+    /* Avoid calling mbedtls_pem_read_buffer() on non-null-terminated string */
+    if( keylen == 0 || key[keylen - 1] != '\0' )
+        ret = MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT;
+    else
+        ret = mbedtls_pem_read_buffer( &pem,
+                               "-----BEGIN EC PRIVATE KEY-----",
+                               "-----END EC PRIVATE KEY-----",
+                               key, pwd, pwdlen, &len );
+    if( ret == 0 )
+    {
+        pk_info = mbedtls_pk_info_from_type( MBEDTLS_PK_ECKEY );
+
+        if( ( ret = mbedtls_pk_setup( pk, pk_info ) ) != 0 ||
+            ( ret = pk_parse_key_sec1_der( mbedtls_pk_ec( *pk ),
+                                           pem.buf, pem.buflen ) ) != 0 )
+        {
+            mbedtls_pk_free( pk );
+        }
+
+        mbedtls_pem_free( &pem );
+        return( ret );
+    }
+    else if( ret == MBEDTLS_ERR_PEM_PASSWORD_MISMATCH )
+        return( MBEDTLS_ERR_PK_PASSWORD_MISMATCH );
+    else if( ret == MBEDTLS_ERR_PEM_PASSWORD_REQUIRED )
+        return( MBEDTLS_ERR_PK_PASSWORD_REQUIRED );
+    else if( ret != MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT )
+        return( ret );
+#endif /* MBEDTLS_ECP_C */
+
+    /* Avoid calling mbedtls_pem_read_buffer() on non-null-terminated string */
+    if( keylen == 0 || key[keylen - 1] != '\0' )
+        ret = MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT;
+    else
+        ret = mbedtls_pem_read_buffer( &pem,
+                               "-----BEGIN PRIVATE KEY-----",
+                               "-----END PRIVATE KEY-----",
+                               key, NULL, 0, &len );
+    if( ret == 0 )
+    {
+        if( ( ret = pk_parse_key_pkcs8_unencrypted_der( pk,
+                                                pem.buf, pem.buflen ) ) != 0 )
+        {
+            mbedtls_pk_free( pk );
+        }
+
+        mbedtls_pem_free( &pem );
+        return( ret );
+    }
+    else if( ret != MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT )
+        return( ret );
+
+#if defined(MBEDTLS_PKCS12_C) || defined(MBEDTLS_PKCS5_C)
+    /* Avoid calling mbedtls_pem_read_buffer() on non-null-terminated string */
+    if( keylen == 0 || key[keylen - 1] != '\0' )
+        ret = MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT;
+    else
+        ret = mbedtls_pem_read_buffer( &pem,
+                               "-----BEGIN ENCRYPTED PRIVATE KEY-----",
+                               "-----END ENCRYPTED PRIVATE KEY-----",
+                               key, NULL, 0, &len );
+    if( ret == 0 )
+    {
+        if( ( ret = pk_parse_key_pkcs8_encrypted_der( pk,
+                                                      pem.buf, pem.buflen,
+                                                      pwd, pwdlen ) ) != 0 )
+        {
+            mbedtls_pk_free( pk );
+        }
+
+        mbedtls_pem_free( &pem );
+        return( ret );
+    }
+    else if( ret != MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT )
+        return( ret );
+#endif /* MBEDTLS_PKCS12_C || MBEDTLS_PKCS5_C */
+#else
+    ((void) pwd);
+    ((void) pwdlen);
+#endif /* MBEDTLS_PEM_PARSE_C */
+
+    /*
+     * At this point we only know it's not a PEM formatted key. Could be any
+     * of the known DER encoded private key formats
+     *
+     * We try the different DER format parsers to see if one passes without
+     * error
+     */
+#if defined(MBEDTLS_PKCS12_C) || defined(MBEDTLS_PKCS5_C)
+    {
+        unsigned char *key_copy;
+
+        if( keylen == 0 )
+            return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT );
+
+        if( ( key_copy = mbedtls_calloc( 1, keylen ) ) == NULL )
+            return( MBEDTLS_ERR_PK_ALLOC_FAILED );
+
+        memcpy( key_copy, key, keylen );
+
+        ret = pk_parse_key_pkcs8_encrypted_der( pk, key_copy, keylen,
+                                                pwd, pwdlen );
+
+        mbedtls_platform_zeroize( key_copy, keylen );
+        mbedtls_free( key_copy );
+    }
+
+    if( ret == 0 )
+        return( 0 );
+
+    mbedtls_pk_free( pk );
+
+    if( ret == MBEDTLS_ERR_PK_PASSWORD_MISMATCH )
+    {
+        return( ret );
+    }
+#endif /* MBEDTLS_PKCS12_C || MBEDTLS_PKCS5_C */
+
+    if( ( ret = pk_parse_key_pkcs8_unencrypted_der( pk, key, keylen ) ) == 0 )
+        return( 0 );
+
+    mbedtls_pk_free( pk );
+
+#if defined(MBEDTLS_RSA_C)
+
+    pk_info = mbedtls_pk_info_from_type( MBEDTLS_PK_RSA );
+    if( ( ret = mbedtls_pk_setup( pk, pk_info ) ) != 0 ||
+        ( ret = pk_parse_key_pkcs1_der( mbedtls_pk_rsa( *pk ),
+                                        key, keylen ) ) != 0 )
+    {
+        mbedtls_pk_free( pk );
+    }
+    else
+    {
+        return( 0 );
+    }
+
+#endif /* MBEDTLS_RSA_C */
+
+#if defined(MBEDTLS_ECP_C)
+
+    pk_info = mbedtls_pk_info_from_type( MBEDTLS_PK_ECKEY );
+    if( ( ret = mbedtls_pk_setup( pk, pk_info ) ) != 0 ||
+        ( ret = pk_parse_key_sec1_der( mbedtls_pk_ec( *pk ),
+                                       key, keylen ) ) != 0 )
+    {
+        mbedtls_pk_free( pk );
+    }
+    else
+    {
+        return( 0 );
+    }
+
+#endif /* MBEDTLS_ECP_C */
+
+    return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT );
+}
+
+/*
+ * Parse a public key
+ */
+int mbedtls_pk_parse_public_key( mbedtls_pk_context *ctx,
+                         const unsigned char *key, size_t keylen )
+{
+    int ret;
+    unsigned char *p;
+#if defined(MBEDTLS_RSA_C)
+    const mbedtls_pk_info_t *pk_info;
+#endif
+#if defined(MBEDTLS_PEM_PARSE_C)
+    size_t len;
+    mbedtls_pem_context pem;
+
+    mbedtls_pem_init( &pem );
+#if defined(MBEDTLS_RSA_C)
+    /* Avoid calling mbedtls_pem_read_buffer() on non-null-terminated string */
+    if( keylen == 0 || key[keylen - 1] != '\0' )
+        ret = MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT;
+    else
+        ret = mbedtls_pem_read_buffer( &pem,
+                               "-----BEGIN RSA PUBLIC KEY-----",
+                               "-----END RSA PUBLIC KEY-----",
+                               key, NULL, 0, &len );
+
+    if( ret == 0 )
+    {
+        p = pem.buf;
+        if( ( pk_info = mbedtls_pk_info_from_type( MBEDTLS_PK_RSA ) ) == NULL )
+            return( MBEDTLS_ERR_PK_UNKNOWN_PK_ALG );
+
+        if( ( ret = mbedtls_pk_setup( ctx, pk_info ) ) != 0 )
+            return( ret );
+
+        if ( ( ret = pk_get_rsapubkey( &p, p + pem.buflen, mbedtls_pk_rsa( *ctx ) ) ) != 0 )
+            mbedtls_pk_free( ctx );
+
+        mbedtls_pem_free( &pem );
+        return( ret );
+    }
+    else if( ret != MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT )
+    {
+        mbedtls_pem_free( &pem );
+        return( ret );
+    }
+#endif /* MBEDTLS_RSA_C */
+
+    /* Avoid calling mbedtls_pem_read_buffer() on non-null-terminated string */
+    if( keylen == 0 || key[keylen - 1] != '\0' )
+        ret = MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT;
+    else
+        ret = mbedtls_pem_read_buffer( &pem,
+                "-----BEGIN PUBLIC KEY-----",
+                "-----END PUBLIC KEY-----",
+                key, NULL, 0, &len );
+
+    if( ret == 0 )
+    {
+        /*
+         * Was PEM encoded
+         */
+        p = pem.buf;
+
+        ret = mbedtls_pk_parse_subpubkey( &p,  p + pem.buflen, ctx );
+        mbedtls_pem_free( &pem );
+        return( ret );
+    }
+    else if( ret != MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT )
+    {
+        mbedtls_pem_free( &pem );
+        return( ret );
+    }
+    mbedtls_pem_free( &pem );
+#endif /* MBEDTLS_PEM_PARSE_C */
+
+#if defined(MBEDTLS_RSA_C)
+    if( ( pk_info = mbedtls_pk_info_from_type( MBEDTLS_PK_RSA ) ) == NULL )
+        return( MBEDTLS_ERR_PK_UNKNOWN_PK_ALG );
+
+    if( ( ret = mbedtls_pk_setup( ctx, pk_info ) ) != 0 )
+        return( ret );
+
+    p = (unsigned char *)key;
+    ret = pk_get_rsapubkey( &p, p + keylen, mbedtls_pk_rsa( *ctx ) );
+    if( ret == 0 )
+    {
+        return( ret );
+    }
+    mbedtls_pk_free( ctx );
+    if( ret != ( MBEDTLS_ERR_PK_INVALID_PUBKEY + MBEDTLS_ERR_ASN1_UNEXPECTED_TAG ) )
+    {
+        return( ret );
+    }
+#endif /* MBEDTLS_RSA_C */
+    p = (unsigned char *) key;
+
+    ret = mbedtls_pk_parse_subpubkey( &p, p + keylen, ctx );
+
+    return( ret );
+}
+
+#endif /* MBEDTLS_PK_PARSE_C */
diff --git a/common/mbedtls/platform.c b/common/mbedtls/platform.c
new file mode 100644
index 000000000..3ddb7f7ad
--- /dev/null
+++ b/common/mbedtls/platform.c
@@ -0,0 +1,341 @@
+/*
+ *  Platform abstraction layer
+ *
+ *  Copyright (C) 2006-2016, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "mbedtls/config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#if defined(MBEDTLS_PLATFORM_C)
+
+#include "mbedtls/platform.h"
+#include "mbedtls/platform_util.h"
+
+#if defined(MBEDTLS_PLATFORM_MEMORY)
+#if !defined(MBEDTLS_PLATFORM_STD_CALLOC)
+static void *platform_calloc_uninit( size_t n, size_t size )
+{
+    ((void) n);
+    ((void) size);
+    return( NULL );
+}
+
+#define MBEDTLS_PLATFORM_STD_CALLOC   platform_calloc_uninit
+#endif /* !MBEDTLS_PLATFORM_STD_CALLOC */
+
+#if !defined(MBEDTLS_PLATFORM_STD_FREE)
+static void platform_free_uninit( void *ptr )
+{
+    ((void) ptr);
+}
+
+#define MBEDTLS_PLATFORM_STD_FREE     platform_free_uninit
+#endif /* !MBEDTLS_PLATFORM_STD_FREE */
+
+static void * (*mbedtls_calloc_func)( size_t, size_t ) = MBEDTLS_PLATFORM_STD_CALLOC;
+static void (*mbedtls_free_func)( void * ) = MBEDTLS_PLATFORM_STD_FREE;
+
+void * mbedtls_calloc( size_t nmemb, size_t size )
+{
+    return (*mbedtls_calloc_func)( nmemb, size );
+}
+
+void mbedtls_free( void * ptr )
+{
+    (*mbedtls_free_func)( ptr );
+}
+
+int mbedtls_platform_set_calloc_free( void * (*calloc_func)( size_t, size_t ),
+                              void (*free_func)( void * ) )
+{
+    mbedtls_calloc_func = calloc_func;
+    mbedtls_free_func = free_func;
+    return( 0 );
+}
+#endif /* MBEDTLS_PLATFORM_MEMORY */
+
+#if defined(_WIN32)
+#include <stdarg.h>
+int mbedtls_platform_win32_snprintf( char *s, size_t n, const char *fmt, ... )
+{
+    int ret;
+    va_list argp;
+
+    /* Avoid calling the invalid parameter handler by checking ourselves */
+    if( s == NULL || n == 0 || fmt == NULL )
+        return( -1 );
+
+    va_start( argp, fmt );
+#if defined(_TRUNCATE) && !defined(__MINGW32__)
+    ret = _vsnprintf_s( s, n, _TRUNCATE, fmt, argp );
+#else
+    ret = _vsnprintf( s, n, fmt, argp );
+    if( ret < 0 || (size_t) ret == n )
+    {
+        s[n-1] = '\0';
+        ret = -1;
+    }
+#endif
+    va_end( argp );
+
+    return( ret );
+}
+#endif
+
+#if defined(MBEDTLS_PLATFORM_SNPRINTF_ALT)
+#if !defined(MBEDTLS_PLATFORM_STD_SNPRINTF)
+/*
+ * Make dummy function to prevent NULL pointer dereferences
+ */
+static int platform_snprintf_uninit( char * s, size_t n,
+                                     const char * format, ... )
+{
+    ((void) s);
+    ((void) n);
+    ((void) format);
+    return( 0 );
+}
+
+#define MBEDTLS_PLATFORM_STD_SNPRINTF    platform_snprintf_uninit
+#endif /* !MBEDTLS_PLATFORM_STD_SNPRINTF */
+
+int (*mbedtls_snprintf)( char * s, size_t n,
+                          const char * format,
+                          ... ) = MBEDTLS_PLATFORM_STD_SNPRINTF;
+
+int mbedtls_platform_set_snprintf( int (*snprintf_func)( char * s, size_t n,
+                                                 const char * format,
+                                                 ... ) )
+{
+    mbedtls_snprintf = snprintf_func;
+    return( 0 );
+}
+#endif /* MBEDTLS_PLATFORM_SNPRINTF_ALT */
+
+#if defined(MBEDTLS_PLATFORM_PRINTF_ALT)
+#if !defined(MBEDTLS_PLATFORM_STD_PRINTF)
+/*
+ * Make dummy function to prevent NULL pointer dereferences
+ */
+static int platform_printf_uninit( const char *format, ... )
+{
+    ((void) format);
+    return( 0 );
+}
+
+#define MBEDTLS_PLATFORM_STD_PRINTF    platform_printf_uninit
+#endif /* !MBEDTLS_PLATFORM_STD_PRINTF */
+
+int (*mbedtls_printf)( const char *, ... ) = MBEDTLS_PLATFORM_STD_PRINTF;
+
+int mbedtls_platform_set_printf( int (*printf_func)( const char *, ... ) )
+{
+    mbedtls_printf = printf_func;
+    return( 0 );
+}
+#endif /* MBEDTLS_PLATFORM_PRINTF_ALT */
+
+#if defined(MBEDTLS_PLATFORM_FPRINTF_ALT)
+#if !defined(MBEDTLS_PLATFORM_STD_FPRINTF)
+/*
+ * Make dummy function to prevent NULL pointer dereferences
+ */
+static int platform_fprintf_uninit( FILE *stream, const char *format, ... )
+{
+    ((void) stream);
+    ((void) format);
+    return( 0 );
+}
+
+#define MBEDTLS_PLATFORM_STD_FPRINTF   platform_fprintf_uninit
+#endif /* !MBEDTLS_PLATFORM_STD_FPRINTF */
+
+int (*mbedtls_fprintf)( FILE *, const char *, ... ) =
+                                        MBEDTLS_PLATFORM_STD_FPRINTF;
+
+int mbedtls_platform_set_fprintf( int (*fprintf_func)( FILE *, const char *, ... ) )
+{
+    mbedtls_fprintf = fprintf_func;
+    return( 0 );
+}
+#endif /* MBEDTLS_PLATFORM_FPRINTF_ALT */
+
+#if defined(MBEDTLS_PLATFORM_EXIT_ALT)
+#if !defined(MBEDTLS_PLATFORM_STD_EXIT)
+/*
+ * Make dummy function to prevent NULL pointer dereferences
+ */
+static void platform_exit_uninit( int status )
+{
+    ((void) status);
+}
+
+#define MBEDTLS_PLATFORM_STD_EXIT   platform_exit_uninit
+#endif /* !MBEDTLS_PLATFORM_STD_EXIT */
+
+void (*mbedtls_exit)( int status ) = MBEDTLS_PLATFORM_STD_EXIT;
+
+int mbedtls_platform_set_exit( void (*exit_func)( int status ) )
+{
+    mbedtls_exit = exit_func;
+    return( 0 );
+}
+#endif /* MBEDTLS_PLATFORM_EXIT_ALT */
+
+#if defined(MBEDTLS_HAVE_TIME)
+
+#if defined(MBEDTLS_PLATFORM_TIME_ALT)
+#if !defined(MBEDTLS_PLATFORM_STD_TIME)
+/*
+ * Make dummy function to prevent NULL pointer dereferences
+ */
+static mbedtls_time_t platform_time_uninit( mbedtls_time_t* timer )
+{
+    ((void) timer);
+    return( 0 );
+}
+
+#define MBEDTLS_PLATFORM_STD_TIME   platform_time_uninit
+#endif /* !MBEDTLS_PLATFORM_STD_TIME */
+
+mbedtls_time_t (*mbedtls_time)( mbedtls_time_t* timer ) = MBEDTLS_PLATFORM_STD_TIME;
+
+int mbedtls_platform_set_time( mbedtls_time_t (*time_func)( mbedtls_time_t* timer ) )
+{
+    mbedtls_time = time_func;
+    return( 0 );
+}
+#endif /* MBEDTLS_PLATFORM_TIME_ALT */
+
+#endif /* MBEDTLS_HAVE_TIME */
+
+#if defined(MBEDTLS_ENTROPY_NV_SEED)
+#if !defined(MBEDTLS_PLATFORM_NO_STD_FUNCTIONS) && defined(MBEDTLS_FS_IO)
+/* Default implementations for the platform independent seed functions use
+ * standard libc file functions to read from and write to a pre-defined filename
+ */
+int mbedtls_platform_std_nv_seed_read( unsigned char *buf, size_t buf_len )
+{
+    FILE *file;
+    size_t n;
+
+    if( ( file = fopen( MBEDTLS_PLATFORM_STD_NV_SEED_FILE, "rb" ) ) == NULL )
+        return( -1 );
+
+    if( ( n = fread( buf, 1, buf_len, file ) ) != buf_len )
+    {
+        fclose( file );
+        mbedtls_platform_zeroize( buf, buf_len );
+        return( -1 );
+    }
+
+    fclose( file );
+    return( (int)n );
+}
+
+int mbedtls_platform_std_nv_seed_write( unsigned char *buf, size_t buf_len )
+{
+    FILE *file;
+    size_t n;
+
+    if( ( file = fopen( MBEDTLS_PLATFORM_STD_NV_SEED_FILE, "w" ) ) == NULL )
+        return -1;
+
+    if( ( n = fwrite( buf, 1, buf_len, file ) ) != buf_len )
+    {
+        fclose( file );
+        return -1;
+    }
+
+    fclose( file );
+    return( (int)n );
+}
+#endif /* MBEDTLS_PLATFORM_NO_STD_FUNCTIONS */
+
+#if defined(MBEDTLS_PLATFORM_NV_SEED_ALT)
+#if !defined(MBEDTLS_PLATFORM_STD_NV_SEED_READ)
+/*
+ * Make dummy function to prevent NULL pointer dereferences
+ */
+static int platform_nv_seed_read_uninit( unsigned char *buf, size_t buf_len )
+{
+    ((void) buf);
+    ((void) buf_len);
+    return( -1 );
+}
+
+#define MBEDTLS_PLATFORM_STD_NV_SEED_READ   platform_nv_seed_read_uninit
+#endif /* !MBEDTLS_PLATFORM_STD_NV_SEED_READ */
+
+#if !defined(MBEDTLS_PLATFORM_STD_NV_SEED_WRITE)
+/*
+ * Make dummy function to prevent NULL pointer dereferences
+ */
+static int platform_nv_seed_write_uninit( unsigned char *buf, size_t buf_len )
+{
+    ((void) buf);
+    ((void) buf_len);
+    return( -1 );
+}
+
+#define MBEDTLS_PLATFORM_STD_NV_SEED_WRITE   platform_nv_seed_write_uninit
+#endif /* !MBEDTLS_PLATFORM_STD_NV_SEED_WRITE */
+
+int (*mbedtls_nv_seed_read)( unsigned char *buf, size_t buf_len ) =
+            MBEDTLS_PLATFORM_STD_NV_SEED_READ;
+int (*mbedtls_nv_seed_write)( unsigned char *buf, size_t buf_len ) =
+            MBEDTLS_PLATFORM_STD_NV_SEED_WRITE;
+
+int mbedtls_platform_set_nv_seed(
+        int (*nv_seed_read_func)( unsigned char *buf, size_t buf_len ),
+        int (*nv_seed_write_func)( unsigned char *buf, size_t buf_len ) )
+{
+    mbedtls_nv_seed_read = nv_seed_read_func;
+    mbedtls_nv_seed_write = nv_seed_write_func;
+    return( 0 );
+}
+#endif /* MBEDTLS_PLATFORM_NV_SEED_ALT */
+#endif /* MBEDTLS_ENTROPY_NV_SEED */
+
+#if !defined(MBEDTLS_PLATFORM_SETUP_TEARDOWN_ALT)
+/*
+ * Placeholder platform setup that does nothing by default
+ */
+int mbedtls_platform_setup( mbedtls_platform_context *ctx )
+{
+    (void)ctx;
+
+    return( 0 );
+}
+
+/*
+ * Placeholder platform teardown that does nothing by default
+ */
+void mbedtls_platform_teardown( mbedtls_platform_context *ctx )
+{
+    (void)ctx;
+}
+#endif /* MBEDTLS_PLATFORM_SETUP_TEARDOWN_ALT */
+
+#endif /* MBEDTLS_PLATFORM_C */
diff --git a/common/mbedtls/platform.h b/common/mbedtls/platform.h
new file mode 100644
index 000000000..818f44d4d
--- /dev/null
+++ b/common/mbedtls/platform.h
@@ -0,0 +1,366 @@
+/**
+ * \file platform.h
+ *
+ * \brief This file contains the definitions and functions of the
+ *        Mbed TLS platform abstraction layer.
+ *
+ *        The platform abstraction layer removes the need for the library
+ *        to directly link to standard C library functions or operating
+ *        system services, making the library easier to port and embed.
+ *        Application developers and users of the library can provide their own
+ *        implementations of these functions, or implementations specific to
+ *        their platform, which can be statically linked to the library or
+ *        dynamically configured at runtime.
+ */
+/*
+ *  Copyright (C) 2006-2018, Arm Limited (or its affiliates), All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of Mbed TLS (https://tls.mbed.org)
+ */
+#ifndef MBEDTLS_PLATFORM_H
+#define MBEDTLS_PLATFORM_H
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#if defined(MBEDTLS_HAVE_TIME)
+#include "platform_time.h"
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \name SECTION: Module settings
+ *
+ * The configuration options you can set for this module are in this section.
+ * Either change them in config.h or define them on the compiler command line.
+ * \{
+ */
+
+#if !defined(MBEDTLS_PLATFORM_NO_STD_FUNCTIONS)
+#include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
+#if !defined(MBEDTLS_PLATFORM_STD_SNPRINTF)
+#if defined(_WIN32)
+#define MBEDTLS_PLATFORM_STD_SNPRINTF   mbedtls_platform_win32_snprintf /**< The default \c snprintf function to use.  */
+#else
+#define MBEDTLS_PLATFORM_STD_SNPRINTF   snprintf /**< The default \c snprintf function to use.  */
+#endif
+#endif
+#if !defined(MBEDTLS_PLATFORM_STD_PRINTF)
+#define MBEDTLS_PLATFORM_STD_PRINTF   printf /**< The default \c printf function to use. */
+#endif
+#if !defined(MBEDTLS_PLATFORM_STD_FPRINTF)
+#define MBEDTLS_PLATFORM_STD_FPRINTF fprintf /**< The default \c fprintf function to use. */
+#endif
+#if !defined(MBEDTLS_PLATFORM_STD_CALLOC)
+#define MBEDTLS_PLATFORM_STD_CALLOC   calloc /**< The default \c calloc function to use. */
+#endif
+#if !defined(MBEDTLS_PLATFORM_STD_FREE)
+#define MBEDTLS_PLATFORM_STD_FREE       free /**< The default \c free function to use. */
+#endif
+#if !defined(MBEDTLS_PLATFORM_STD_EXIT)
+#define MBEDTLS_PLATFORM_STD_EXIT      exit /**< The default \c exit function to use. */
+#endif
+#if !defined(MBEDTLS_PLATFORM_STD_TIME)
+#define MBEDTLS_PLATFORM_STD_TIME       time    /**< The default \c time function to use. */
+#endif
+#if !defined(MBEDTLS_PLATFORM_STD_EXIT_SUCCESS)
+#define MBEDTLS_PLATFORM_STD_EXIT_SUCCESS  EXIT_SUCCESS /**< The default exit value to use. */
+#endif
+#if !defined(MBEDTLS_PLATFORM_STD_EXIT_FAILURE)
+#define MBEDTLS_PLATFORM_STD_EXIT_FAILURE  EXIT_FAILURE /**< The default exit value to use. */
+#endif
+#if defined(MBEDTLS_FS_IO)
+#if !defined(MBEDTLS_PLATFORM_STD_NV_SEED_READ)
+#define MBEDTLS_PLATFORM_STD_NV_SEED_READ   mbedtls_platform_std_nv_seed_read
+#endif
+#if !defined(MBEDTLS_PLATFORM_STD_NV_SEED_WRITE)
+#define MBEDTLS_PLATFORM_STD_NV_SEED_WRITE  mbedtls_platform_std_nv_seed_write
+#endif
+#if !defined(MBEDTLS_PLATFORM_STD_NV_SEED_FILE)
+#define MBEDTLS_PLATFORM_STD_NV_SEED_FILE   "seedfile"
+#endif
+#endif /* MBEDTLS_FS_IO */
+#else /* MBEDTLS_PLATFORM_NO_STD_FUNCTIONS */
+#if defined(MBEDTLS_PLATFORM_STD_MEM_HDR)
+#include MBEDTLS_PLATFORM_STD_MEM_HDR
+#endif
+#endif /* MBEDTLS_PLATFORM_NO_STD_FUNCTIONS */
+
+
+/* \} name SECTION: Module settings */
+
+/*
+ * The function pointers for calloc and free.
+ */
+#if defined(MBEDTLS_PLATFORM_MEMORY)
+#if defined(MBEDTLS_PLATFORM_FREE_MACRO) && \
+    defined(MBEDTLS_PLATFORM_CALLOC_MACRO)
+#define mbedtls_free       MBEDTLS_PLATFORM_FREE_MACRO
+#define mbedtls_calloc     MBEDTLS_PLATFORM_CALLOC_MACRO
+#else
+/* For size_t */
+#include <stddef.h>
+extern void *mbedtls_calloc( size_t n, size_t size );
+extern void mbedtls_free( void *ptr );
+
+/**
+ * \brief               This function dynamically sets the memory-management
+ *                      functions used by the library, during runtime.
+ *
+ * \param calloc_func   The \c calloc function implementation.
+ * \param free_func     The \c free function implementation.
+ *
+ * \return              \c 0.
+ */
+int mbedtls_platform_set_calloc_free( void * (*calloc_func)( size_t, size_t ),
+                              void (*free_func)( void * ) );
+#endif /* MBEDTLS_PLATFORM_FREE_MACRO && MBEDTLS_PLATFORM_CALLOC_MACRO */
+#else /* !MBEDTLS_PLATFORM_MEMORY */
+#define mbedtls_free       free
+#define mbedtls_calloc     calloc
+#endif /* MBEDTLS_PLATFORM_MEMORY && !MBEDTLS_PLATFORM_{FREE,CALLOC}_MACRO */
+
+/*
+ * The function pointers for fprintf
+ */
+#if defined(MBEDTLS_PLATFORM_FPRINTF_ALT)
+/* We need FILE * */
+#include <stdio.h>
+extern int (*mbedtls_fprintf)( FILE *stream, const char *format, ... );
+
+/**
+ * \brief                This function dynamically configures the fprintf
+ *                       function that is called when the
+ *                       mbedtls_fprintf() function is invoked by the library.
+ *
+ * \param fprintf_func   The \c fprintf function implementation.
+ *
+ * \return               \c 0.
+ */
+int mbedtls_platform_set_fprintf( int (*fprintf_func)( FILE *stream, const char *,
+                                               ... ) );
+#else
+#if defined(MBEDTLS_PLATFORM_FPRINTF_MACRO)
+#define mbedtls_fprintf    MBEDTLS_PLATFORM_FPRINTF_MACRO
+#else
+#define mbedtls_fprintf    fprintf
+#endif /* MBEDTLS_PLATFORM_FPRINTF_MACRO */
+#endif /* MBEDTLS_PLATFORM_FPRINTF_ALT */
+
+/*
+ * The function pointers for printf
+ */
+#if defined(MBEDTLS_PLATFORM_PRINTF_ALT)
+extern int (*mbedtls_printf)( const char *format, ... );
+
+/**
+ * \brief               This function dynamically configures the snprintf
+ *                      function that is called when the mbedtls_snprintf()
+ *                      function is invoked by the library.
+ *
+ * \param printf_func   The \c printf function implementation.
+ *
+ * \return              \c 0 on success.
+ */
+int mbedtls_platform_set_printf( int (*printf_func)( const char *, ... ) );
+#else /* !MBEDTLS_PLATFORM_PRINTF_ALT */
+#if defined(MBEDTLS_PLATFORM_PRINTF_MACRO)
+#define mbedtls_printf     MBEDTLS_PLATFORM_PRINTF_MACRO
+#else
+#define mbedtls_printf     printf
+#endif /* MBEDTLS_PLATFORM_PRINTF_MACRO */
+#endif /* MBEDTLS_PLATFORM_PRINTF_ALT */
+
+/*
+ * The function pointers for snprintf
+ *
+ * The snprintf implementation should conform to C99:
+ * - it *must* always correctly zero-terminate the buffer
+ *   (except when n == 0, then it must leave the buffer untouched)
+ * - however it is acceptable to return -1 instead of the required length when
+ *   the destination buffer is too short.
+ */
+#if defined(_WIN32)
+/* For Windows (inc. MSYS2), we provide our own fixed implementation */
+int mbedtls_platform_win32_snprintf( char *s, size_t n, const char *fmt, ... );
+#endif
+
+#if defined(MBEDTLS_PLATFORM_SNPRINTF_ALT)
+extern int (*mbedtls_snprintf)( char * s, size_t n, const char * format, ... );
+
+/**
+ * \brief                 This function allows configuring a custom
+ *                        \c snprintf function pointer.
+ *
+ * \param snprintf_func   The \c snprintf function implementation.
+ *
+ * \return                \c 0 on success.
+ */
+int mbedtls_platform_set_snprintf( int (*snprintf_func)( char * s, size_t n,
+                                                 const char * format, ... ) );
+#else /* MBEDTLS_PLATFORM_SNPRINTF_ALT */
+#if defined(MBEDTLS_PLATFORM_SNPRINTF_MACRO)
+#define mbedtls_snprintf   MBEDTLS_PLATFORM_SNPRINTF_MACRO
+#else
+#define mbedtls_snprintf   MBEDTLS_PLATFORM_STD_SNPRINTF
+#endif /* MBEDTLS_PLATFORM_SNPRINTF_MACRO */
+#endif /* MBEDTLS_PLATFORM_SNPRINTF_ALT */
+
+/*
+ * The function pointers for exit
+ */
+#if defined(MBEDTLS_PLATFORM_EXIT_ALT)
+extern void (*mbedtls_exit)( int status );
+
+/**
+ * \brief             This function dynamically configures the exit
+ *                    function that is called when the mbedtls_exit()
+ *                    function is invoked by the library.
+ *
+ * \param exit_func   The \c exit function implementation.
+ *
+ * \return            \c 0 on success.
+ */
+int mbedtls_platform_set_exit( void (*exit_func)( int status ) );
+#else
+#if defined(MBEDTLS_PLATFORM_EXIT_MACRO)
+#define mbedtls_exit   MBEDTLS_PLATFORM_EXIT_MACRO
+#else
+#define mbedtls_exit   exit
+#endif /* MBEDTLS_PLATFORM_EXIT_MACRO */
+#endif /* MBEDTLS_PLATFORM_EXIT_ALT */
+
+/*
+ * The default exit values
+ */
+#if defined(MBEDTLS_PLATFORM_STD_EXIT_SUCCESS)
+#define MBEDTLS_EXIT_SUCCESS MBEDTLS_PLATFORM_STD_EXIT_SUCCESS
+#else
+#define MBEDTLS_EXIT_SUCCESS 0
+#endif
+#if defined(MBEDTLS_PLATFORM_STD_EXIT_FAILURE)
+#define MBEDTLS_EXIT_FAILURE MBEDTLS_PLATFORM_STD_EXIT_FAILURE
+#else
+#define MBEDTLS_EXIT_FAILURE 1
+#endif
+
+/*
+ * The function pointers for reading from and writing a seed file to
+ * Non-Volatile storage (NV) in a platform-independent way
+ *
+ * Only enabled when the NV seed entropy source is enabled
+ */
+#if defined(MBEDTLS_ENTROPY_NV_SEED)
+#if !defined(MBEDTLS_PLATFORM_NO_STD_FUNCTIONS) && defined(MBEDTLS_FS_IO)
+/* Internal standard platform definitions */
+int mbedtls_platform_std_nv_seed_read( unsigned char *buf, size_t buf_len );
+int mbedtls_platform_std_nv_seed_write( unsigned char *buf, size_t buf_len );
+#endif
+
+#if defined(MBEDTLS_PLATFORM_NV_SEED_ALT)
+extern int (*mbedtls_nv_seed_read)( unsigned char *buf, size_t buf_len );
+extern int (*mbedtls_nv_seed_write)( unsigned char *buf, size_t buf_len );
+
+/**
+ * \brief   This function allows configuring custom seed file writing and
+ *          reading functions.
+ *
+ * \param   nv_seed_read_func   The seed reading function implementation.
+ * \param   nv_seed_write_func  The seed writing function implementation.
+ *
+ * \return  \c 0 on success.
+ */
+int mbedtls_platform_set_nv_seed(
+            int (*nv_seed_read_func)( unsigned char *buf, size_t buf_len ),
+            int (*nv_seed_write_func)( unsigned char *buf, size_t buf_len )
+            );
+#else
+#if defined(MBEDTLS_PLATFORM_NV_SEED_READ_MACRO) && \
+    defined(MBEDTLS_PLATFORM_NV_SEED_WRITE_MACRO)
+#define mbedtls_nv_seed_read    MBEDTLS_PLATFORM_NV_SEED_READ_MACRO
+#define mbedtls_nv_seed_write   MBEDTLS_PLATFORM_NV_SEED_WRITE_MACRO
+#else
+#define mbedtls_nv_seed_read    mbedtls_platform_std_nv_seed_read
+#define mbedtls_nv_seed_write   mbedtls_platform_std_nv_seed_write
+#endif
+#endif /* MBEDTLS_PLATFORM_NV_SEED_ALT */
+#endif /* MBEDTLS_ENTROPY_NV_SEED */
+
+#if !defined(MBEDTLS_PLATFORM_SETUP_TEARDOWN_ALT)
+
+/**
+ * \brief   The platform context structure.
+ *
+ * \note    This structure may be used to assist platform-specific
+ *          setup or teardown operations.
+ */
+typedef struct mbedtls_platform_context
+{
+    char dummy; /**< A placeholder member, as empty structs are not portable. */
+}
+mbedtls_platform_context;
+
+#else
+#include "platform_alt.h"
+#endif /* !MBEDTLS_PLATFORM_SETUP_TEARDOWN_ALT */
+
+/**
+ * \brief   This function performs any platform-specific initialization
+ *          operations.
+ *
+ * \note    This function should be called before any other library functions.
+ *
+ *          Its implementation is platform-specific, and unless
+ *          platform-specific code is provided, it does nothing.
+ *
+ * \note    The usage and necessity of this function is dependent on the platform.
+ *
+ * \param   ctx     The platform context.
+ *
+ * \return  \c 0 on success.
+ */
+int mbedtls_platform_setup( mbedtls_platform_context *ctx );
+/**
+ * \brief   This function performs any platform teardown operations.
+ *
+ * \note    This function should be called after every other Mbed TLS module
+ *          has been correctly freed using the appropriate free function.
+ *
+ *          Its implementation is platform-specific, and unless
+ *          platform-specific code is provided, it does nothing.
+ *
+ * \note    The usage and necessity of this function is dependent on the platform.
+ *
+ * \param   ctx     The platform context.
+ *
+ */
+void mbedtls_platform_teardown( mbedtls_platform_context *ctx );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* platform.h */
diff --git a/common/mbedtls/platform_util.c b/common/mbedtls/platform_util.c
new file mode 100644
index 000000000..0be18aca6
--- /dev/null
+++ b/common/mbedtls/platform_util.c
@@ -0,0 +1,69 @@
+/*
+ * Common and shared functions used by multiple modules in the Mbed TLS
+ * library.
+ *
+ *  Copyright (C) 2018, Arm Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of Mbed TLS (https://tls.mbed.org)
+ */
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "mbedtls/config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#include "mbedtls/platform_util.h"
+
+#include <stddef.h>
+#include <string.h>
+
+#if !defined(MBEDTLS_PLATFORM_ZEROIZE_ALT)
+/*
+ * This implementation should never be optimized out by the compiler
+ *
+ * This implementation for mbedtls_platform_zeroize() was inspired from Colin
+ * Percival's blog article at:
+ *
+ * http://www.daemonology.net/blog/2014-09-04-how-to-zero-a-buffer.html
+ *
+ * It uses a volatile function pointer to the standard memset(). Because the
+ * pointer is volatile the compiler expects it to change at
+ * any time and will not optimize out the call that could potentially perform
+ * other operations on the input buffer instead of just setting it to 0.
+ * Nevertheless, as pointed out by davidtgoldblatt on Hacker News
+ * (refer to http://www.daemonology.net/blog/2014-09-05-erratum.html for
+ * details), optimizations of the following form are still possible:
+ *
+ * if( memset_func != memset )
+ *     memset_func( buf, 0, len );
+ *
+ * Note that it is extremely difficult to guarantee that
+ * mbedtls_platform_zeroize() will not be optimized out by aggressive compilers
+ * in a portable way. For this reason, Mbed TLS also provides the configuration
+ * option MBEDTLS_PLATFORM_ZEROIZE_ALT, which allows users to configure
+ * mbedtls_platform_zeroize() to use a suitable implementation for their
+ * platform and needs.
+ */
+static void * (* const volatile memset_func)( void *, int, size_t ) = memset;
+
+void mbedtls_platform_zeroize( void *buf, size_t len )
+{
+    memset_func( buf, 0, len );
+}
+#endif /* MBEDTLS_PLATFORM_ZEROIZE_ALT */
diff --git a/common/mbedtls/platform_util.h b/common/mbedtls/platform_util.h
new file mode 100644
index 000000000..79404ce67
--- /dev/null
+++ b/common/mbedtls/platform_util.h
@@ -0,0 +1,64 @@
+/**
+ * \file platform_util.h
+ *
+ * \brief Common and shared functions used by multiple modules in the Mbed TLS
+ *        library.
+ */
+/*
+ *  Copyright (C) 2018, Arm Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of Mbed TLS (https://tls.mbed.org)
+ */
+#ifndef MBEDTLS_PLATFORM_UTIL_H
+#define MBEDTLS_PLATFORM_UTIL_H
+
+#include <stddef.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \brief       Securely zeroize a buffer
+ *
+ *              The function is meant to wipe the data contained in a buffer so
+ *              that it can no longer be recovered even if the program memory
+ *              is later compromised. Call this function on sensitive data
+ *              stored on the stack before returning from a function, and on
+ *              sensitive data stored on the heap before freeing the heap
+ *              object.
+ *
+ *              It is extremely difficult to guarantee that calls to
+ *              mbedtls_platform_zeroize() are not removed by aggressive
+ *              compiler optimizations in a portable way. For this reason, Mbed
+ *              TLS provides the configuration option
+ *              MBEDTLS_PLATFORM_ZEROIZE_ALT, which allows users to configure
+ *              mbedtls_platform_zeroize() to use a suitable implementation for
+ *              their platform and needs
+ *
+ * \param buf   Buffer to be zeroized
+ * \param len   Length of the buffer in bytes
+ *
+ */
+void mbedtls_platform_zeroize( void *buf, size_t len );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* MBEDTLS_PLATFORM_UTIL_H */
diff --git a/common/mbedtls/rsa.c b/common/mbedtls/rsa.c
new file mode 100644
index 000000000..f26cf6a8b
--- /dev/null
+++ b/common/mbedtls/rsa.c
@@ -0,0 +1,2400 @@
+/*
+ *  The RSA public-key cryptosystem
+ *
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+
+/*
+ *  The following sources were referenced in the design of this implementation
+ *  of the RSA algorithm:
+ *
+ *  [1] A method for obtaining digital signatures and public-key cryptosystems
+ *      R Rivest, A Shamir, and L Adleman
+ *      http://people.csail.mit.edu/rivest/pubs.html#RSA78
+ *
+ *  [2] Handbook of Applied Cryptography - 1997, Chapter 8
+ *      Menezes, van Oorschot and Vanstone
+ *
+ *  [3] Malware Guard Extension: Using SGX to Conceal Cache Attacks
+ *      Michael Schwarz, Samuel Weiser, Daniel Gruss, Clémentine Maurice and
+ *      Stefan Mangard
+ *      https://arxiv.org/abs/1702.08719v2
+ *
+ */
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "mbedtls/config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#if defined(MBEDTLS_RSA_C)
+
+#include "mbedtls/rsa.h"
+#include "mbedtls/rsa_internal.h"
+#include "mbedtls/oid.h"
+#include "mbedtls/platform_util.h"
+
+#include <string.h>
+
+#if defined(MBEDTLS_PKCS1_V21)
+#include "mbedtls/md.h"
+#endif
+
+#if defined(MBEDTLS_PKCS1_V15) && !defined(__OpenBSD__)
+#include <stdlib.h>
+#endif
+
+#if defined(MBEDTLS_PLATFORM_C)
+#include "mbedtls/platform.h"
+#else
+#include <stdio.h>
+#define mbedtls_printf printf
+#define mbedtls_calloc calloc
+#define mbedtls_free   free
+#endif
+
+#if !defined(MBEDTLS_RSA_ALT)
+
+#if defined(MBEDTLS_PKCS1_V15)
+/* constant-time buffer comparison */
+static inline int mbedtls_safer_memcmp( const void *a, const void *b, size_t n )
+{
+    size_t i;
+    const unsigned char *A = (const unsigned char *) a;
+    const unsigned char *B = (const unsigned char *) b;
+    unsigned char diff = 0;
+
+    for( i = 0; i < n; i++ )
+        diff |= A[i] ^ B[i];
+
+    return( diff );
+}
+#endif /* MBEDTLS_PKCS1_V15 */
+
+int mbedtls_rsa_import( mbedtls_rsa_context *ctx,
+                        const mbedtls_mpi *N,
+                        const mbedtls_mpi *P, const mbedtls_mpi *Q,
+                        const mbedtls_mpi *D, const mbedtls_mpi *E )
+{
+    int ret;
+
+    if( ( N != NULL && ( ret = mbedtls_mpi_copy( &ctx->N, N ) ) != 0 ) ||
+        ( P != NULL && ( ret = mbedtls_mpi_copy( &ctx->P, P ) ) != 0 ) ||
+        ( Q != NULL && ( ret = mbedtls_mpi_copy( &ctx->Q, Q ) ) != 0 ) ||
+        ( D != NULL && ( ret = mbedtls_mpi_copy( &ctx->D, D ) ) != 0 ) ||
+        ( E != NULL && ( ret = mbedtls_mpi_copy( &ctx->E, E ) ) != 0 ) )
+    {
+        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA + ret );
+    }
+
+    if( N != NULL )
+        ctx->len = mbedtls_mpi_size( &ctx->N );
+
+    return( 0 );
+}
+
+int mbedtls_rsa_import_raw( mbedtls_rsa_context *ctx,
+                            unsigned char const *N, size_t N_len,
+                            unsigned char const *P, size_t P_len,
+                            unsigned char const *Q, size_t Q_len,
+                            unsigned char const *D, size_t D_len,
+                            unsigned char const *E, size_t E_len )
+{
+    int ret = 0;
+
+    if( N != NULL )
+    {
+        MBEDTLS_MPI_CHK( mbedtls_mpi_read_binary( &ctx->N, N, N_len ) );
+        ctx->len = mbedtls_mpi_size( &ctx->N );
+    }
+
+    if( P != NULL )
+        MBEDTLS_MPI_CHK( mbedtls_mpi_read_binary( &ctx->P, P, P_len ) );
+
+    if( Q != NULL )
+        MBEDTLS_MPI_CHK( mbedtls_mpi_read_binary( &ctx->Q, Q, Q_len ) );
+
+    if( D != NULL )
+        MBEDTLS_MPI_CHK( mbedtls_mpi_read_binary( &ctx->D, D, D_len ) );
+
+    if( E != NULL )
+        MBEDTLS_MPI_CHK( mbedtls_mpi_read_binary( &ctx->E, E, E_len ) );
+
+cleanup:
+
+    if( ret != 0 )
+        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA + ret );
+
+    return( 0 );
+}
+
+/*
+ * Checks whether the context fields are set in such a way
+ * that the RSA primitives will be able to execute without error.
+ * It does *not* make guarantees for consistency of the parameters.
+ */
+static int rsa_check_context( mbedtls_rsa_context const *ctx, int is_priv,
+                              int blinding_needed )
+{
+#if !defined(MBEDTLS_RSA_NO_CRT)
+    /* blinding_needed is only used for NO_CRT to decide whether
+     * P,Q need to be present or not. */
+    ((void) blinding_needed);
+#endif
+
+    if( ctx->len != mbedtls_mpi_size( &ctx->N ) ||
+        ctx->len > MBEDTLS_MPI_MAX_SIZE )
+    {
+        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    }
+
+    /*
+     * 1. Modular exponentiation needs positive, odd moduli.
+     */
+
+    /* Modular exponentiation wrt. N is always used for
+     * RSA public key operations. */
+    if( mbedtls_mpi_cmp_int( &ctx->N, 0 ) <= 0 ||
+        mbedtls_mpi_get_bit( &ctx->N, 0 ) == 0  )
+    {
+        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    }
+
+#if !defined(MBEDTLS_RSA_NO_CRT)
+    /* Modular exponentiation for P and Q is only
+     * used for private key operations and if CRT
+     * is used. */
+    if( is_priv &&
+        ( mbedtls_mpi_cmp_int( &ctx->P, 0 ) <= 0 ||
+          mbedtls_mpi_get_bit( &ctx->P, 0 ) == 0 ||
+          mbedtls_mpi_cmp_int( &ctx->Q, 0 ) <= 0 ||
+          mbedtls_mpi_get_bit( &ctx->Q, 0 ) == 0  ) )
+    {
+        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    }
+#endif /* !MBEDTLS_RSA_NO_CRT */
+
+    /*
+     * 2. Exponents must be positive
+     */
+
+    /* Always need E for public key operations */
+    if( mbedtls_mpi_cmp_int( &ctx->E, 0 ) <= 0 )
+        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+
+#if defined(MBEDTLS_RSA_NO_CRT)
+    /* For private key operations, use D or DP & DQ
+     * as (unblinded) exponents. */
+    if( is_priv && mbedtls_mpi_cmp_int( &ctx->D, 0 ) <= 0 )
+        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+#else
+    if( is_priv &&
+        ( mbedtls_mpi_cmp_int( &ctx->DP, 0 ) <= 0 ||
+          mbedtls_mpi_cmp_int( &ctx->DQ, 0 ) <= 0  ) )
+    {
+        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    }
+#endif /* MBEDTLS_RSA_NO_CRT */
+
+    /* Blinding shouldn't make exponents negative either,
+     * so check that P, Q >= 1 if that hasn't yet been
+     * done as part of 1. */
+#if defined(MBEDTLS_RSA_NO_CRT)
+    if( is_priv && blinding_needed &&
+        ( mbedtls_mpi_cmp_int( &ctx->P, 0 ) <= 0 ||
+          mbedtls_mpi_cmp_int( &ctx->Q, 0 ) <= 0 ) )
+    {
+        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    }
+#endif
+
+    /* It wouldn't lead to an error if it wasn't satisfied,
+     * but check for QP >= 1 nonetheless. */
+#if !defined(MBEDTLS_RSA_NO_CRT)
+    if( is_priv &&
+        mbedtls_mpi_cmp_int( &ctx->QP, 0 ) <= 0 )
+    {
+        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    }
+#endif
+
+    return( 0 );
+}
+
+int mbedtls_rsa_complete( mbedtls_rsa_context *ctx )
+{
+    int ret = 0;
+
+    const int have_N = ( mbedtls_mpi_cmp_int( &ctx->N, 0 ) != 0 );
+    const int have_P = ( mbedtls_mpi_cmp_int( &ctx->P, 0 ) != 0 );
+    const int have_Q = ( mbedtls_mpi_cmp_int( &ctx->Q, 0 ) != 0 );
+    const int have_D = ( mbedtls_mpi_cmp_int( &ctx->D, 0 ) != 0 );
+    const int have_E = ( mbedtls_mpi_cmp_int( &ctx->E, 0 ) != 0 );
+
+    /*
+     * Check whether provided parameters are enough
+     * to deduce all others. The following incomplete
+     * parameter sets for private keys are supported:
+     *
+     * (1) P, Q missing.
+     * (2) D and potentially N missing.
+     *
+     */
+
+    const int n_missing  =              have_P &&  have_Q &&  have_D && have_E;
+    const int pq_missing =   have_N && !have_P && !have_Q &&  have_D && have_E;
+    const int d_missing  =              have_P &&  have_Q && !have_D && have_E;
+    const int is_pub     =   have_N && !have_P && !have_Q && !have_D && have_E;
+
+    /* These three alternatives are mutually exclusive */
+    const int is_priv = n_missing || pq_missing || d_missing;
+
+    if( !is_priv && !is_pub )
+        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+
+    /*
+     * Step 1: Deduce N if P, Q are provided.
+     */
+
+    if( !have_N && have_P && have_Q )
+    {
+        if( ( ret = mbedtls_mpi_mul_mpi( &ctx->N, &ctx->P,
+                                         &ctx->Q ) ) != 0 )
+        {
+            return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA + ret );
+        }
+
+        ctx->len = mbedtls_mpi_size( &ctx->N );
+    }
+
+    /*
+     * Step 2: Deduce and verify all remaining core parameters.
+     */
+
+    if( pq_missing )
+    {
+        ret = mbedtls_rsa_deduce_primes( &ctx->N, &ctx->E, &ctx->D,
+                                         &ctx->P, &ctx->Q );
+        if( ret != 0 )
+            return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA + ret );
+
+    }
+    else if( d_missing )
+    {
+        if( ( ret = mbedtls_rsa_deduce_private_exponent( &ctx->P,
+                                                         &ctx->Q,
+                                                         &ctx->E,
+                                                         &ctx->D ) ) != 0 )
+        {
+            return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA + ret );
+        }
+    }
+
+    /*
+     * Step 3: Deduce all additional parameters specific
+     *         to our current RSA implementation.
+     */
+
+#if !defined(MBEDTLS_RSA_NO_CRT)
+    if( is_priv )
+    {
+        ret = mbedtls_rsa_deduce_crt( &ctx->P,  &ctx->Q,  &ctx->D,
+                                      &ctx->DP, &ctx->DQ, &ctx->QP );
+        if( ret != 0 )
+            return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA + ret );
+    }
+#endif /* MBEDTLS_RSA_NO_CRT */
+
+    /*
+     * Step 3: Basic sanity checks
+     */
+
+    return( rsa_check_context( ctx, is_priv, 1 ) );
+}
+
+int mbedtls_rsa_export_raw( const mbedtls_rsa_context *ctx,
+                            unsigned char *N, size_t N_len,
+                            unsigned char *P, size_t P_len,
+                            unsigned char *Q, size_t Q_len,
+                            unsigned char *D, size_t D_len,
+                            unsigned char *E, size_t E_len )
+{
+    int ret = 0;
+
+    /* Check if key is private or public */
+    const int is_priv =
+        mbedtls_mpi_cmp_int( &ctx->N, 0 ) != 0 &&
+        mbedtls_mpi_cmp_int( &ctx->P, 0 ) != 0 &&
+        mbedtls_mpi_cmp_int( &ctx->Q, 0 ) != 0 &&
+        mbedtls_mpi_cmp_int( &ctx->D, 0 ) != 0 &&
+        mbedtls_mpi_cmp_int( &ctx->E, 0 ) != 0;
+
+    if( !is_priv )
+    {
+        /* If we're trying to export private parameters for a public key,
+         * something must be wrong. */
+        if( P != NULL || Q != NULL || D != NULL )
+            return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+
+    }
+
+    if( N != NULL )
+        MBEDTLS_MPI_CHK( mbedtls_mpi_write_binary( &ctx->N, N, N_len ) );
+
+    if( P != NULL )
+        MBEDTLS_MPI_CHK( mbedtls_mpi_write_binary( &ctx->P, P, P_len ) );
+
+    if( Q != NULL )
+        MBEDTLS_MPI_CHK( mbedtls_mpi_write_binary( &ctx->Q, Q, Q_len ) );
+
+    if( D != NULL )
+        MBEDTLS_MPI_CHK( mbedtls_mpi_write_binary( &ctx->D, D, D_len ) );
+
+    if( E != NULL )
+        MBEDTLS_MPI_CHK( mbedtls_mpi_write_binary( &ctx->E, E, E_len ) );
+
+cleanup:
+
+    return( ret );
+}
+
+int mbedtls_rsa_export( const mbedtls_rsa_context *ctx,
+                        mbedtls_mpi *N, mbedtls_mpi *P, mbedtls_mpi *Q,
+                        mbedtls_mpi *D, mbedtls_mpi *E )
+{
+    int ret;
+
+    /* Check if key is private or public */
+    int is_priv =
+        mbedtls_mpi_cmp_int( &ctx->N, 0 ) != 0 &&
+        mbedtls_mpi_cmp_int( &ctx->P, 0 ) != 0 &&
+        mbedtls_mpi_cmp_int( &ctx->Q, 0 ) != 0 &&
+        mbedtls_mpi_cmp_int( &ctx->D, 0 ) != 0 &&
+        mbedtls_mpi_cmp_int( &ctx->E, 0 ) != 0;
+
+    if( !is_priv )
+    {
+        /* If we're trying to export private parameters for a public key,
+         * something must be wrong. */
+        if( P != NULL || Q != NULL || D != NULL )
+            return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+
+    }
+
+    /* Export all requested core parameters. */
+
+    if( ( N != NULL && ( ret = mbedtls_mpi_copy( N, &ctx->N ) ) != 0 ) ||
+        ( P != NULL && ( ret = mbedtls_mpi_copy( P, &ctx->P ) ) != 0 ) ||
+        ( Q != NULL && ( ret = mbedtls_mpi_copy( Q, &ctx->Q ) ) != 0 ) ||
+        ( D != NULL && ( ret = mbedtls_mpi_copy( D, &ctx->D ) ) != 0 ) ||
+        ( E != NULL && ( ret = mbedtls_mpi_copy( E, &ctx->E ) ) != 0 ) )
+    {
+        return( ret );
+    }
+
+    return( 0 );
+}
+
+/*
+ * Export CRT parameters
+ * This must also be implemented if CRT is not used, for being able to
+ * write DER encoded RSA keys. The helper function mbedtls_rsa_deduce_crt
+ * can be used in this case.
+ */
+int mbedtls_rsa_export_crt( const mbedtls_rsa_context *ctx,
+                            mbedtls_mpi *DP, mbedtls_mpi *DQ, mbedtls_mpi *QP )
+{
+    int ret;
+
+    /* Check if key is private or public */
+    int is_priv =
+        mbedtls_mpi_cmp_int( &ctx->N, 0 ) != 0 &&
+        mbedtls_mpi_cmp_int( &ctx->P, 0 ) != 0 &&
+        mbedtls_mpi_cmp_int( &ctx->Q, 0 ) != 0 &&
+        mbedtls_mpi_cmp_int( &ctx->D, 0 ) != 0 &&
+        mbedtls_mpi_cmp_int( &ctx->E, 0 ) != 0;
+
+    if( !is_priv )
+        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+
+#if !defined(MBEDTLS_RSA_NO_CRT)
+    /* Export all requested blinding parameters. */
+    if( ( DP != NULL && ( ret = mbedtls_mpi_copy( DP, &ctx->DP ) ) != 0 ) ||
+        ( DQ != NULL && ( ret = mbedtls_mpi_copy( DQ, &ctx->DQ ) ) != 0 ) ||
+        ( QP != NULL && ( ret = mbedtls_mpi_copy( QP, &ctx->QP ) ) != 0 ) )
+    {
+        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA + ret );
+    }
+#else
+    if( ( ret = mbedtls_rsa_deduce_crt( &ctx->P, &ctx->Q, &ctx->D,
+                                        DP, DQ, QP ) ) != 0 )
+    {
+        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA + ret );
+    }
+#endif
+
+    return( 0 );
+}
+
+/*
+ * Initialize an RSA context
+ */
+void mbedtls_rsa_init( mbedtls_rsa_context *ctx,
+               int padding,
+               int hash_id )
+{
+    memset( ctx, 0, sizeof( mbedtls_rsa_context ) );
+
+    mbedtls_rsa_set_padding( ctx, padding, hash_id );
+
+#if defined(MBEDTLS_THREADING_C)
+    mbedtls_mutex_init( &ctx->mutex );
+#endif
+}
+
+/*
+ * Set padding for an existing RSA context
+ */
+void mbedtls_rsa_set_padding( mbedtls_rsa_context *ctx, int padding, int hash_id )
+{
+    ctx->padding = padding;
+    ctx->hash_id = hash_id;
+}
+
+/*
+ * Get length in bytes of RSA modulus
+ */
+
+size_t mbedtls_rsa_get_len( const mbedtls_rsa_context *ctx )
+{
+    return( ctx->len );
+}
+
+
+#if defined(MBEDTLS_GENPRIME)
+
+/*
+ * Generate an RSA keypair
+ *
+ * This generation method follows the RSA key pair generation procedure of
+ * FIPS 186-4 if 2^16 < exponent < 2^256 and nbits = 2048 or nbits = 3072.
+ */
+int mbedtls_rsa_gen_key( mbedtls_rsa_context *ctx,
+                 int (*f_rng)(void *, unsigned char *, size_t),
+                 void *p_rng,
+                 unsigned int nbits, int exponent )
+{
+    int ret;
+    mbedtls_mpi H, G, L;
+
+    if( f_rng == NULL || nbits < 128 || exponent < 3 )
+        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+
+    if( nbits % 2 )
+        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+
+    mbedtls_mpi_init( &H );
+    mbedtls_mpi_init( &G );
+    mbedtls_mpi_init( &L );
+
+    /*
+     * find primes P and Q with Q < P so that:
+     * 1.  |P-Q| > 2^( nbits / 2 - 100 )
+     * 2.  GCD( E, (P-1)*(Q-1) ) == 1
+     * 3.  E^-1 mod LCM(P-1, Q-1) > 2^( nbits / 2 )
+     */
+    MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &ctx->E, exponent ) );
+
+    do
+    {
+        MBEDTLS_MPI_CHK( mbedtls_mpi_gen_prime( &ctx->P, nbits >> 1, 0,
+                                                f_rng, p_rng ) );
+
+        MBEDTLS_MPI_CHK( mbedtls_mpi_gen_prime( &ctx->Q, nbits >> 1, 0,
+                                                f_rng, p_rng ) );
+
+        /* make sure the difference between p and q is not too small (FIPS 186-4 §B.3.3 step 5.4) */
+        MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &H, &ctx->P, &ctx->Q ) );
+        if( mbedtls_mpi_bitlen( &H ) <= ( ( nbits >= 200 ) ? ( ( nbits >> 1 ) - 99 ) : 0 ) )
+            continue;
+
+        /* not required by any standards, but some users rely on the fact that P > Q */
+        if( H.s < 0 )
+            mbedtls_mpi_swap( &ctx->P, &ctx->Q );
+
+        /* Temporarily replace P,Q by P-1, Q-1 */
+        MBEDTLS_MPI_CHK( mbedtls_mpi_sub_int( &ctx->P, &ctx->P, 1 ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_sub_int( &ctx->Q, &ctx->Q, 1 ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &H, &ctx->P, &ctx->Q ) );
+
+        /* check GCD( E, (P-1)*(Q-1) ) == 1 (FIPS 186-4 §B.3.1 criterion 2(a)) */
+        MBEDTLS_MPI_CHK( mbedtls_mpi_gcd( &G, &ctx->E, &H  ) );
+        if( mbedtls_mpi_cmp_int( &G, 1 ) != 0 )
+            continue;
+
+        /* compute smallest possible D = E^-1 mod LCM(P-1, Q-1) (FIPS 186-4 §B.3.1 criterion 3(b)) */
+        MBEDTLS_MPI_CHK( mbedtls_mpi_gcd( &G, &ctx->P, &ctx->Q ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_div_mpi( &L, NULL, &H, &G ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_inv_mod( &ctx->D, &ctx->E, &L ) );
+
+        if( mbedtls_mpi_bitlen( &ctx->D ) <= ( ( nbits + 1 ) / 2 ) ) // (FIPS 186-4 §B.3.1 criterion 3(a))
+            continue;
+
+        break;
+    }
+    while( 1 );
+
+    /* Restore P,Q */
+    MBEDTLS_MPI_CHK( mbedtls_mpi_add_int( &ctx->P,  &ctx->P, 1 ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_add_int( &ctx->Q,  &ctx->Q, 1 ) );
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &ctx->N, &ctx->P, &ctx->Q ) );
+
+    ctx->len = mbedtls_mpi_size( &ctx->N );
+
+#if !defined(MBEDTLS_RSA_NO_CRT)
+    /*
+     * DP = D mod (P - 1)
+     * DQ = D mod (Q - 1)
+     * QP = Q^-1 mod P
+     */
+    MBEDTLS_MPI_CHK( mbedtls_rsa_deduce_crt( &ctx->P, &ctx->Q, &ctx->D,
+                                             &ctx->DP, &ctx->DQ, &ctx->QP ) );
+#endif /* MBEDTLS_RSA_NO_CRT */
+
+    /* Double-check */
+    MBEDTLS_MPI_CHK( mbedtls_rsa_check_privkey( ctx ) );
+
+cleanup:
+
+    mbedtls_mpi_free( &H );
+    mbedtls_mpi_free( &G );
+    mbedtls_mpi_free( &L );
+
+    if( ret != 0 )
+    {
+        mbedtls_rsa_free( ctx );
+        return( MBEDTLS_ERR_RSA_KEY_GEN_FAILED + ret );
+    }
+
+    return( 0 );
+}
+
+#endif /* MBEDTLS_GENPRIME */
+
+/*
+ * Check a public RSA key
+ */
+int mbedtls_rsa_check_pubkey( const mbedtls_rsa_context *ctx )
+{
+    if( rsa_check_context( ctx, 0 /* public */, 0 /* no blinding */ ) != 0 )
+        return( MBEDTLS_ERR_RSA_KEY_CHECK_FAILED );
+
+    if( mbedtls_mpi_bitlen( &ctx->N ) < 128 )
+    {
+        return( MBEDTLS_ERR_RSA_KEY_CHECK_FAILED );
+    }
+
+    if( mbedtls_mpi_get_bit( &ctx->E, 0 ) == 0 ||
+        mbedtls_mpi_bitlen( &ctx->E )     < 2  ||
+        mbedtls_mpi_cmp_mpi( &ctx->E, &ctx->N ) >= 0 )
+    {
+        return( MBEDTLS_ERR_RSA_KEY_CHECK_FAILED );
+    }
+
+    return( 0 );
+}
+
+/*
+ * Check for the consistency of all fields in an RSA private key context
+ */
+int mbedtls_rsa_check_privkey( const mbedtls_rsa_context *ctx )
+{
+    if( mbedtls_rsa_check_pubkey( ctx ) != 0 ||
+        rsa_check_context( ctx, 1 /* private */, 1 /* blinding */ ) != 0 )
+    {
+        return( MBEDTLS_ERR_RSA_KEY_CHECK_FAILED );
+    }
+
+    if( mbedtls_rsa_validate_params( &ctx->N, &ctx->P, &ctx->Q,
+                                     &ctx->D, &ctx->E, NULL, NULL ) != 0 )
+    {
+        return( MBEDTLS_ERR_RSA_KEY_CHECK_FAILED );
+    }
+
+#if !defined(MBEDTLS_RSA_NO_CRT)
+    else if( mbedtls_rsa_validate_crt( &ctx->P, &ctx->Q, &ctx->D,
+                                       &ctx->DP, &ctx->DQ, &ctx->QP ) != 0 )
+    {
+        return( MBEDTLS_ERR_RSA_KEY_CHECK_FAILED );
+    }
+#endif
+
+    return( 0 );
+}
+
+/*
+ * Check if contexts holding a public and private key match
+ */
+int mbedtls_rsa_check_pub_priv( const mbedtls_rsa_context *pub,
+                                const mbedtls_rsa_context *prv )
+{
+    if( mbedtls_rsa_check_pubkey( pub )  != 0 ||
+        mbedtls_rsa_check_privkey( prv ) != 0 )
+    {
+        return( MBEDTLS_ERR_RSA_KEY_CHECK_FAILED );
+    }
+
+    if( mbedtls_mpi_cmp_mpi( &pub->N, &prv->N ) != 0 ||
+        mbedtls_mpi_cmp_mpi( &pub->E, &prv->E ) != 0 )
+    {
+        return( MBEDTLS_ERR_RSA_KEY_CHECK_FAILED );
+    }
+
+    return( 0 );
+}
+
+/*
+ * Do an RSA public key operation
+ */
+int mbedtls_rsa_public( mbedtls_rsa_context *ctx,
+                const unsigned char *input,
+                unsigned char *output )
+{
+    int ret;
+    size_t olen;
+    mbedtls_mpi T;
+
+    if( rsa_check_context( ctx, 0 /* public */, 0 /* no blinding */ ) )
+        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+
+    mbedtls_mpi_init( &T );
+
+#if defined(MBEDTLS_THREADING_C)
+    if( ( ret = mbedtls_mutex_lock( &ctx->mutex ) ) != 0 )
+        return( ret );
+#endif
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_read_binary( &T, input, ctx->len ) );
+
+    if( mbedtls_mpi_cmp_mpi( &T, &ctx->N ) >= 0 )
+    {
+        ret = MBEDTLS_ERR_MPI_BAD_INPUT_DATA;
+        goto cleanup;
+    }
+
+    olen = ctx->len;
+    MBEDTLS_MPI_CHK( mbedtls_mpi_exp_mod( &T, &T, &ctx->E, &ctx->N, &ctx->RN ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_write_binary( &T, output, olen ) );
+
+cleanup:
+#if defined(MBEDTLS_THREADING_C)
+    if( mbedtls_mutex_unlock( &ctx->mutex ) != 0 )
+        return( MBEDTLS_ERR_THREADING_MUTEX_ERROR );
+#endif
+
+    mbedtls_mpi_free( &T );
+
+    if( ret != 0 )
+        return( MBEDTLS_ERR_RSA_PUBLIC_FAILED + ret );
+
+    return( 0 );
+}
+
+/*
+ * Generate or update blinding values, see section 10 of:
+ *  KOCHER, Paul C. Timing attacks on implementations of Diffie-Hellman, RSA,
+ *  DSS, and other systems. In : Advances in Cryptology-CRYPTO'96. Springer
+ *  Berlin Heidelberg, 1996. p. 104-113.
+ */
+static int rsa_prepare_blinding( mbedtls_rsa_context *ctx,
+                 int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
+{
+    int ret, count = 0;
+
+    if( ctx->Vf.p != NULL )
+    {
+        /* We already have blinding values, just update them by squaring */
+        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &ctx->Vi, &ctx->Vi, &ctx->Vi ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi( &ctx->Vi, &ctx->Vi, &ctx->N ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &ctx->Vf, &ctx->Vf, &ctx->Vf ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi( &ctx->Vf, &ctx->Vf, &ctx->N ) );
+
+        goto cleanup;
+    }
+
+    /* Unblinding value: Vf = random number, invertible mod N */
+    do {
+        if( count++ > 10 )
+            return( MBEDTLS_ERR_RSA_RNG_FAILED );
+
+        MBEDTLS_MPI_CHK( mbedtls_mpi_fill_random( &ctx->Vf, ctx->len - 1, f_rng, p_rng ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_gcd( &ctx->Vi, &ctx->Vf, &ctx->N ) );
+    } while( mbedtls_mpi_cmp_int( &ctx->Vi, 1 ) != 0 );
+
+    /* Blinding value: Vi =  Vf^(-e) mod N */
+    MBEDTLS_MPI_CHK( mbedtls_mpi_inv_mod( &ctx->Vi, &ctx->Vf, &ctx->N ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_exp_mod( &ctx->Vi, &ctx->Vi, &ctx->E, &ctx->N, &ctx->RN ) );
+
+
+cleanup:
+    return( ret );
+}
+
+/*
+ * Exponent blinding supposed to prevent side-channel attacks using multiple
+ * traces of measurements to recover the RSA key. The more collisions are there,
+ * the more bits of the key can be recovered. See [3].
+ *
+ * Collecting n collisions with m bit long blinding value requires 2^(m-m/n)
+ * observations on avarage.
+ *
+ * For example with 28 byte blinding to achieve 2 collisions the adversary has
+ * to make 2^112 observations on avarage.
+ *
+ * (With the currently (as of 2017 April) known best algorithms breaking 2048
+ * bit RSA requires approximately as much time as trying out 2^112 random keys.
+ * Thus in this sense with 28 byte blinding the security is not reduced by
+ * side-channel attacks like the one in [3])
+ *
+ * This countermeasure does not help if the key recovery is possible with a
+ * single trace.
+ */
+#define RSA_EXPONENT_BLINDING 28
+
+/*
+ * Do an RSA private key operation
+ */
+int mbedtls_rsa_private( mbedtls_rsa_context *ctx,
+                 int (*f_rng)(void *, unsigned char *, size_t),
+                 void *p_rng,
+                 const unsigned char *input,
+                 unsigned char *output )
+{
+    int ret;
+    size_t olen;
+
+    /* Temporary holding the result */
+    mbedtls_mpi T;
+
+    /* Temporaries holding P-1, Q-1 and the
+     * exponent blinding factor, respectively. */
+    mbedtls_mpi P1, Q1, R;
+
+#if !defined(MBEDTLS_RSA_NO_CRT)
+    /* Temporaries holding the results mod p resp. mod q. */
+    mbedtls_mpi TP, TQ;
+
+    /* Temporaries holding the blinded exponents for
+     * the mod p resp. mod q computation (if used). */
+    mbedtls_mpi DP_blind, DQ_blind;
+
+    /* Pointers to actual exponents to be used - either the unblinded
+     * or the blinded ones, depending on the presence of a PRNG. */
+    mbedtls_mpi *DP = &ctx->DP;
+    mbedtls_mpi *DQ = &ctx->DQ;
+#else
+    /* Temporary holding the blinded exponent (if used). */
+    mbedtls_mpi D_blind;
+
+    /* Pointer to actual exponent to be used - either the unblinded
+     * or the blinded one, depending on the presence of a PRNG. */
+    mbedtls_mpi *D = &ctx->D;
+#endif /* MBEDTLS_RSA_NO_CRT */
+
+    /* Temporaries holding the initial input and the double
+     * checked result; should be the same in the end. */
+    mbedtls_mpi I, C;
+
+    if( rsa_check_context( ctx, 1             /* private key checks */,
+                                f_rng != NULL /* blinding y/n       */ ) != 0 )
+    {
+        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    }
+
+#if defined(MBEDTLS_THREADING_C)
+    if( ( ret = mbedtls_mutex_lock( &ctx->mutex ) ) != 0 )
+        return( ret );
+#endif
+
+    /* MPI Initialization */
+    mbedtls_mpi_init( &T );
+
+    mbedtls_mpi_init( &P1 );
+    mbedtls_mpi_init( &Q1 );
+    mbedtls_mpi_init( &R );
+
+    if( f_rng != NULL )
+    {
+#if defined(MBEDTLS_RSA_NO_CRT)
+        mbedtls_mpi_init( &D_blind );
+#else
+        mbedtls_mpi_init( &DP_blind );
+        mbedtls_mpi_init( &DQ_blind );
+#endif
+    }
+
+#if !defined(MBEDTLS_RSA_NO_CRT)
+    mbedtls_mpi_init( &TP ); mbedtls_mpi_init( &TQ );
+#endif
+
+    mbedtls_mpi_init( &I );
+    mbedtls_mpi_init( &C );
+
+    /* End of MPI initialization */
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_read_binary( &T, input, ctx->len ) );
+    if( mbedtls_mpi_cmp_mpi( &T, &ctx->N ) >= 0 )
+    {
+        ret = MBEDTLS_ERR_MPI_BAD_INPUT_DATA;
+        goto cleanup;
+    }
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &I, &T ) );
+
+    if( f_rng != NULL )
+    {
+        /*
+         * Blinding
+         * T = T * Vi mod N
+         */
+        MBEDTLS_MPI_CHK( rsa_prepare_blinding( ctx, f_rng, p_rng ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &T, &T, &ctx->Vi ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi( &T, &T, &ctx->N ) );
+
+        /*
+         * Exponent blinding
+         */
+        MBEDTLS_MPI_CHK( mbedtls_mpi_sub_int( &P1, &ctx->P, 1 ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_sub_int( &Q1, &ctx->Q, 1 ) );
+
+#if defined(MBEDTLS_RSA_NO_CRT)
+        /*
+         * D_blind = ( P - 1 ) * ( Q - 1 ) * R + D
+         */
+        MBEDTLS_MPI_CHK( mbedtls_mpi_fill_random( &R, RSA_EXPONENT_BLINDING,
+                         f_rng, p_rng ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &D_blind, &P1, &Q1 ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &D_blind, &D_blind, &R ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_add_mpi( &D_blind, &D_blind, &ctx->D ) );
+
+        D = &D_blind;
+#else
+        /*
+         * DP_blind = ( P - 1 ) * R + DP
+         */
+        MBEDTLS_MPI_CHK( mbedtls_mpi_fill_random( &R, RSA_EXPONENT_BLINDING,
+                         f_rng, p_rng ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &DP_blind, &P1, &R ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_add_mpi( &DP_blind, &DP_blind,
+                    &ctx->DP ) );
+
+        DP = &DP_blind;
+
+        /*
+         * DQ_blind = ( Q - 1 ) * R + DQ
+         */
+        MBEDTLS_MPI_CHK( mbedtls_mpi_fill_random( &R, RSA_EXPONENT_BLINDING,
+                         f_rng, p_rng ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &DQ_blind, &Q1, &R ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_add_mpi( &DQ_blind, &DQ_blind,
+                    &ctx->DQ ) );
+
+        DQ = &DQ_blind;
+#endif /* MBEDTLS_RSA_NO_CRT */
+    }
+
+#if defined(MBEDTLS_RSA_NO_CRT)
+    MBEDTLS_MPI_CHK( mbedtls_mpi_exp_mod( &T, &T, D, &ctx->N, &ctx->RN ) );
+#else
+    /*
+     * Faster decryption using the CRT
+     *
+     * TP = input ^ dP mod P
+     * TQ = input ^ dQ mod Q
+     */
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_exp_mod( &TP, &T, DP, &ctx->P, &ctx->RP ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_exp_mod( &TQ, &T, DQ, &ctx->Q, &ctx->RQ ) );
+
+    /*
+     * T = (TP - TQ) * (Q^-1 mod P) mod P
+     */
+    MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &T, &TP, &TQ ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &TP, &T, &ctx->QP ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi( &T, &TP, &ctx->P ) );
+
+    /*
+     * T = TQ + T * Q
+     */
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &TP, &T, &ctx->Q ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_add_mpi( &T, &TQ, &TP ) );
+#endif /* MBEDTLS_RSA_NO_CRT */
+
+    if( f_rng != NULL )
+    {
+        /*
+         * Unblind
+         * T = T * Vf mod N
+         */
+        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &T, &T, &ctx->Vf ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi( &T, &T, &ctx->N ) );
+    }
+
+    /* Verify the result to prevent glitching attacks. */
+    MBEDTLS_MPI_CHK( mbedtls_mpi_exp_mod( &C, &T, &ctx->E,
+                                          &ctx->N, &ctx->RN ) );
+    if( mbedtls_mpi_cmp_mpi( &C, &I ) != 0 )
+    {
+        ret = MBEDTLS_ERR_RSA_VERIFY_FAILED;
+        goto cleanup;
+    }
+
+    olen = ctx->len;
+    MBEDTLS_MPI_CHK( mbedtls_mpi_write_binary( &T, output, olen ) );
+
+cleanup:
+#if defined(MBEDTLS_THREADING_C)
+    if( mbedtls_mutex_unlock( &ctx->mutex ) != 0 )
+        return( MBEDTLS_ERR_THREADING_MUTEX_ERROR );
+#endif
+
+    mbedtls_mpi_free( &P1 );
+    mbedtls_mpi_free( &Q1 );
+    mbedtls_mpi_free( &R );
+
+    if( f_rng != NULL )
+    {
+#if defined(MBEDTLS_RSA_NO_CRT)
+        mbedtls_mpi_free( &D_blind );
+#else
+        mbedtls_mpi_free( &DP_blind );
+        mbedtls_mpi_free( &DQ_blind );
+#endif
+    }
+
+    mbedtls_mpi_free( &T );
+
+#if !defined(MBEDTLS_RSA_NO_CRT)
+    mbedtls_mpi_free( &TP ); mbedtls_mpi_free( &TQ );
+#endif
+
+    mbedtls_mpi_free( &C );
+    mbedtls_mpi_free( &I );
+
+    if( ret != 0 )
+        return( MBEDTLS_ERR_RSA_PRIVATE_FAILED + ret );
+
+    return( 0 );
+}
+
+#if defined(MBEDTLS_PKCS1_V21)
+/**
+ * Generate and apply the MGF1 operation (from PKCS#1 v2.1) to a buffer.
+ *
+ * \param dst       buffer to mask
+ * \param dlen      length of destination buffer
+ * \param src       source of the mask generation
+ * \param slen      length of the source buffer
+ * \param md_ctx    message digest context to use
+ */
+static int mgf_mask( unsigned char *dst, size_t dlen, unsigned char *src,
+                      size_t slen, mbedtls_md_context_t *md_ctx )
+{
+    unsigned char mask[MBEDTLS_MD_MAX_SIZE];
+    unsigned char counter[4];
+    unsigned char *p;
+    unsigned int hlen;
+    size_t i, use_len;
+    int ret = 0;
+
+    memset( mask, 0, MBEDTLS_MD_MAX_SIZE );
+    memset( counter, 0, 4 );
+
+    hlen = mbedtls_md_get_size( md_ctx->md_info );
+
+    /* Generate and apply dbMask */
+    p = dst;
+
+    while( dlen > 0 )
+    {
+        use_len = hlen;
+        if( dlen < hlen )
+            use_len = dlen;
+
+        if( ( ret = mbedtls_md_starts( md_ctx ) ) != 0 )
+            goto exit;
+        if( ( ret = mbedtls_md_update( md_ctx, src, slen ) ) != 0 )
+            goto exit;
+        if( ( ret = mbedtls_md_update( md_ctx, counter, 4 ) ) != 0 )
+            goto exit;
+        if( ( ret = mbedtls_md_finish( md_ctx, mask ) ) != 0 )
+            goto exit;
+
+        for( i = 0; i < use_len; ++i )
+            *p++ ^= mask[i];
+
+        counter[3]++;
+
+        dlen -= use_len;
+    }
+
+exit:
+    mbedtls_platform_zeroize( mask, sizeof( mask ) );
+
+    return( ret );
+}
+#endif /* MBEDTLS_PKCS1_V21 */
+
+#if defined(MBEDTLS_PKCS1_V21)
+/*
+ * Implementation of the PKCS#1 v2.1 RSAES-OAEP-ENCRYPT function
+ */
+int mbedtls_rsa_rsaes_oaep_encrypt( mbedtls_rsa_context *ctx,
+                            int (*f_rng)(void *, unsigned char *, size_t),
+                            void *p_rng,
+                            int mode,
+                            const unsigned char *label, size_t label_len,
+                            size_t ilen,
+                            const unsigned char *input,
+                            unsigned char *output )
+{
+    size_t olen;
+    int ret;
+    unsigned char *p = output;
+    unsigned int hlen;
+    const mbedtls_md_info_t *md_info;
+    mbedtls_md_context_t md_ctx;
+
+    if( mode == MBEDTLS_RSA_PRIVATE && ctx->padding != MBEDTLS_RSA_PKCS_V21 )
+        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+
+    if( f_rng == NULL )
+        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+
+    md_info = mbedtls_md_info_from_type( (mbedtls_md_type_t) ctx->hash_id );
+    if( md_info == NULL )
+        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+
+    olen = ctx->len;
+    hlen = mbedtls_md_get_size( md_info );
+
+    /* first comparison checks for overflow */
+    if( ilen + 2 * hlen + 2 < ilen || olen < ilen + 2 * hlen + 2 )
+        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+
+    memset( output, 0, olen );
+
+    *p++ = 0;
+
+    /* Generate a random octet string seed */
+    if( ( ret = f_rng( p_rng, p, hlen ) ) != 0 )
+        return( MBEDTLS_ERR_RSA_RNG_FAILED + ret );
+
+    p += hlen;
+
+    /* Construct DB */
+    if( ( ret = mbedtls_md( md_info, label, label_len, p ) ) != 0 )
+        return( ret );
+    p += hlen;
+    p += olen - 2 * hlen - 2 - ilen;
+    *p++ = 1;
+    memcpy( p, input, ilen );
+
+    mbedtls_md_init( &md_ctx );
+    if( ( ret = mbedtls_md_setup( &md_ctx, md_info, 0 ) ) != 0 )
+        goto exit;
+
+    /* maskedDB: Apply dbMask to DB */
+    if( ( ret = mgf_mask( output + hlen + 1, olen - hlen - 1, output + 1, hlen,
+                          &md_ctx ) ) != 0 )
+        goto exit;
+
+    /* maskedSeed: Apply seedMask to seed */
+    if( ( ret = mgf_mask( output + 1, hlen, output + hlen + 1, olen - hlen - 1,
+                          &md_ctx ) ) != 0 )
+        goto exit;
+
+exit:
+    mbedtls_md_free( &md_ctx );
+
+    if( ret != 0 )
+        return( ret );
+
+    return( ( mode == MBEDTLS_RSA_PUBLIC )
+            ? mbedtls_rsa_public(  ctx, output, output )
+            : mbedtls_rsa_private( ctx, f_rng, p_rng, output, output ) );
+}
+#endif /* MBEDTLS_PKCS1_V21 */
+
+#if defined(MBEDTLS_PKCS1_V15)
+/*
+ * Implementation of the PKCS#1 v2.1 RSAES-PKCS1-V1_5-ENCRYPT function
+ */
+int mbedtls_rsa_rsaes_pkcs1_v15_encrypt( mbedtls_rsa_context *ctx,
+                                 int (*f_rng)(void *, unsigned char *, size_t),
+                                 void *p_rng,
+                                 int mode, size_t ilen,
+                                 const unsigned char *input,
+                                 unsigned char *output )
+{
+    size_t nb_pad, olen;
+    int ret;
+    unsigned char *p = output;
+
+    if( mode == MBEDTLS_RSA_PRIVATE && ctx->padding != MBEDTLS_RSA_PKCS_V15 )
+        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+
+    // We don't check p_rng because it won't be dereferenced here
+    if( f_rng == NULL || input == NULL || output == NULL )
+        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+
+    olen = ctx->len;
+
+    /* first comparison checks for overflow */
+    if( ilen + 11 < ilen || olen < ilen + 11 )
+        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+
+    nb_pad = olen - 3 - ilen;
+
+    *p++ = 0;
+    if( mode == MBEDTLS_RSA_PUBLIC )
+    {
+        *p++ = MBEDTLS_RSA_CRYPT;
+
+        while( nb_pad-- > 0 )
+        {
+            int rng_dl = 100;
+
+            do {
+                ret = f_rng( p_rng, p, 1 );
+            } while( *p == 0 && --rng_dl && ret == 0 );
+
+            /* Check if RNG failed to generate data */
+            if( rng_dl == 0 || ret != 0 )
+                return( MBEDTLS_ERR_RSA_RNG_FAILED + ret );
+
+            p++;
+        }
+    }
+    else
+    {
+        *p++ = MBEDTLS_RSA_SIGN;
+
+        while( nb_pad-- > 0 )
+            *p++ = 0xFF;
+    }
+
+    *p++ = 0;
+    memcpy( p, input, ilen );
+
+    return( ( mode == MBEDTLS_RSA_PUBLIC )
+            ? mbedtls_rsa_public(  ctx, output, output )
+            : mbedtls_rsa_private( ctx, f_rng, p_rng, output, output ) );
+}
+#endif /* MBEDTLS_PKCS1_V15 */
+
+/*
+ * Add the message padding, then do an RSA operation
+ */
+int mbedtls_rsa_pkcs1_encrypt( mbedtls_rsa_context *ctx,
+                       int (*f_rng)(void *, unsigned char *, size_t),
+                       void *p_rng,
+                       int mode, size_t ilen,
+                       const unsigned char *input,
+                       unsigned char *output )
+{
+    switch( ctx->padding )
+    {
+#if defined(MBEDTLS_PKCS1_V15)
+        case MBEDTLS_RSA_PKCS_V15:
+            return mbedtls_rsa_rsaes_pkcs1_v15_encrypt( ctx, f_rng, p_rng, mode, ilen,
+                                                input, output );
+#endif
+
+#if defined(MBEDTLS_PKCS1_V21)
+        case MBEDTLS_RSA_PKCS_V21:
+            return mbedtls_rsa_rsaes_oaep_encrypt( ctx, f_rng, p_rng, mode, NULL, 0,
+                                           ilen, input, output );
+#endif
+
+        default:
+            return( MBEDTLS_ERR_RSA_INVALID_PADDING );
+    }
+}
+
+#if defined(MBEDTLS_PKCS1_V21)
+/*
+ * Implementation of the PKCS#1 v2.1 RSAES-OAEP-DECRYPT function
+ */
+int mbedtls_rsa_rsaes_oaep_decrypt( mbedtls_rsa_context *ctx,
+                            int (*f_rng)(void *, unsigned char *, size_t),
+                            void *p_rng,
+                            int mode,
+                            const unsigned char *label, size_t label_len,
+                            size_t *olen,
+                            const unsigned char *input,
+                            unsigned char *output,
+                            size_t output_max_len )
+{
+    int ret;
+    size_t ilen, i, pad_len;
+    unsigned char *p, bad, pad_done;
+    unsigned char buf[MBEDTLS_MPI_MAX_SIZE];
+    unsigned char lhash[MBEDTLS_MD_MAX_SIZE];
+    unsigned int hlen;
+    const mbedtls_md_info_t *md_info;
+    mbedtls_md_context_t md_ctx;
+
+    /*
+     * Parameters sanity checks
+     */
+    if( mode == MBEDTLS_RSA_PRIVATE && ctx->padding != MBEDTLS_RSA_PKCS_V21 )
+        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+
+    ilen = ctx->len;
+
+    if( ilen < 16 || ilen > sizeof( buf ) )
+        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+
+    md_info = mbedtls_md_info_from_type( (mbedtls_md_type_t) ctx->hash_id );
+    if( md_info == NULL )
+        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+
+    hlen = mbedtls_md_get_size( md_info );
+
+    // checking for integer underflow
+    if( 2 * hlen + 2 > ilen )
+        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+
+    /*
+     * RSA operation
+     */
+    ret = ( mode == MBEDTLS_RSA_PUBLIC )
+          ? mbedtls_rsa_public(  ctx, input, buf )
+          : mbedtls_rsa_private( ctx, f_rng, p_rng, input, buf );
+
+    if( ret != 0 )
+        goto cleanup;
+
+    /*
+     * Unmask data and generate lHash
+     */
+    mbedtls_md_init( &md_ctx );
+    if( ( ret = mbedtls_md_setup( &md_ctx, md_info, 0 ) ) != 0 )
+    {
+        mbedtls_md_free( &md_ctx );
+        goto cleanup;
+    }
+
+    /* seed: Apply seedMask to maskedSeed */
+    if( ( ret = mgf_mask( buf + 1, hlen, buf + hlen + 1, ilen - hlen - 1,
+                          &md_ctx ) ) != 0 ||
+    /* DB: Apply dbMask to maskedDB */
+        ( ret = mgf_mask( buf + hlen + 1, ilen - hlen - 1, buf + 1, hlen,
+                          &md_ctx ) ) != 0 )
+    {
+        mbedtls_md_free( &md_ctx );
+        goto cleanup;
+    }
+
+    mbedtls_md_free( &md_ctx );
+
+    /* Generate lHash */
+    if( ( ret = mbedtls_md( md_info, label, label_len, lhash ) ) != 0 )
+        goto cleanup;
+
+    /*
+     * Check contents, in "constant-time"
+     */
+    p = buf;
+    bad = 0;
+
+    bad |= *p++; /* First byte must be 0 */
+
+    p += hlen; /* Skip seed */
+
+    /* Check lHash */
+    for( i = 0; i < hlen; i++ )
+        bad |= lhash[i] ^ *p++;
+
+    /* Get zero-padding len, but always read till end of buffer
+     * (minus one, for the 01 byte) */
+    pad_len = 0;
+    pad_done = 0;
+    for( i = 0; i < ilen - 2 * hlen - 2; i++ )
+    {
+        pad_done |= p[i];
+        pad_len += ((pad_done | (unsigned char)-pad_done) >> 7) ^ 1;
+    }
+
+    p += pad_len;
+    bad |= *p++ ^ 0x01;
+
+    /*
+     * The only information "leaked" is whether the padding was correct or not
+     * (eg, no data is copied if it was not correct). This meets the
+     * recommendations in PKCS#1 v2.2: an opponent cannot distinguish between
+     * the different error conditions.
+     */
+    if( bad != 0 )
+    {
+        ret = MBEDTLS_ERR_RSA_INVALID_PADDING;
+        goto cleanup;
+    }
+
+    if( ilen - ( p - buf ) > output_max_len )
+    {
+        ret = MBEDTLS_ERR_RSA_OUTPUT_TOO_LARGE;
+        goto cleanup;
+    }
+
+    *olen = ilen - (p - buf);
+    memcpy( output, p, *olen );
+    ret = 0;
+
+cleanup:
+    mbedtls_platform_zeroize( buf, sizeof( buf ) );
+    mbedtls_platform_zeroize( lhash, sizeof( lhash ) );
+
+    return( ret );
+}
+#endif /* MBEDTLS_PKCS1_V21 */
+
+#if defined(MBEDTLS_PKCS1_V15)
+/*
+ * Implementation of the PKCS#1 v2.1 RSAES-PKCS1-V1_5-DECRYPT function
+ */
+int mbedtls_rsa_rsaes_pkcs1_v15_decrypt( mbedtls_rsa_context *ctx,
+                                 int (*f_rng)(void *, unsigned char *, size_t),
+                                 void *p_rng,
+                                 int mode, size_t *olen,
+                                 const unsigned char *input,
+                                 unsigned char *output,
+                                 size_t output_max_len)
+{
+    int ret;
+    size_t ilen, pad_count = 0, i;
+    unsigned char *p, bad, pad_done = 0;
+    unsigned char buf[MBEDTLS_MPI_MAX_SIZE];
+
+    if( mode == MBEDTLS_RSA_PRIVATE && ctx->padding != MBEDTLS_RSA_PKCS_V15 )
+        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+
+    ilen = ctx->len;
+
+    if( ilen < 16 || ilen > sizeof( buf ) )
+        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+
+    ret = ( mode == MBEDTLS_RSA_PUBLIC )
+          ? mbedtls_rsa_public(  ctx, input, buf )
+          : mbedtls_rsa_private( ctx, f_rng, p_rng, input, buf );
+
+    if( ret != 0 )
+        goto cleanup;
+
+    p = buf;
+    bad = 0;
+
+    /*
+     * Check and get padding len in "constant-time"
+     */
+    bad |= *p++; /* First byte must be 0 */
+
+    /* This test does not depend on secret data */
+    if( mode == MBEDTLS_RSA_PRIVATE )
+    {
+        bad |= *p++ ^ MBEDTLS_RSA_CRYPT;
+
+        /* Get padding len, but always read till end of buffer
+         * (minus one, for the 00 byte) */
+        for( i = 0; i < ilen - 3; i++ )
+        {
+            pad_done  |= ((p[i] | (unsigned char)-p[i]) >> 7) ^ 1;
+            pad_count += ((pad_done | (unsigned char)-pad_done) >> 7) ^ 1;
+        }
+
+        p += pad_count;
+        bad |= *p++; /* Must be zero */
+    }
+    else
+    {
+        bad |= *p++ ^ MBEDTLS_RSA_SIGN;
+
+        /* Get padding len, but always read till end of buffer
+         * (minus one, for the 00 byte) */
+        for( i = 0; i < ilen - 3; i++ )
+        {
+            pad_done |= ( p[i] != 0xFF );
+            pad_count += ( pad_done == 0 );
+        }
+
+        p += pad_count;
+        bad |= *p++; /* Must be zero */
+    }
+
+    bad |= ( pad_count < 8 );
+
+    if( bad )
+    {
+        ret = MBEDTLS_ERR_RSA_INVALID_PADDING;
+        goto cleanup;
+    }
+
+    if( ilen - ( p - buf ) > output_max_len )
+    {
+        ret = MBEDTLS_ERR_RSA_OUTPUT_TOO_LARGE;
+        goto cleanup;
+    }
+
+    *olen = ilen - (p - buf);
+    memcpy( output, p, *olen );
+    ret = 0;
+
+cleanup:
+    mbedtls_platform_zeroize( buf, sizeof( buf ) );
+
+    return( ret );
+}
+#endif /* MBEDTLS_PKCS1_V15 */
+
+/*
+ * Do an RSA operation, then remove the message padding
+ */
+int mbedtls_rsa_pkcs1_decrypt( mbedtls_rsa_context *ctx,
+                       int (*f_rng)(void *, unsigned char *, size_t),
+                       void *p_rng,
+                       int mode, size_t *olen,
+                       const unsigned char *input,
+                       unsigned char *output,
+                       size_t output_max_len)
+{
+    switch( ctx->padding )
+    {
+#if defined(MBEDTLS_PKCS1_V15)
+        case MBEDTLS_RSA_PKCS_V15:
+            return mbedtls_rsa_rsaes_pkcs1_v15_decrypt( ctx, f_rng, p_rng, mode, olen,
+                                                input, output, output_max_len );
+#endif
+
+#if defined(MBEDTLS_PKCS1_V21)
+        case MBEDTLS_RSA_PKCS_V21:
+            return mbedtls_rsa_rsaes_oaep_decrypt( ctx, f_rng, p_rng, mode, NULL, 0,
+                                           olen, input, output,
+                                           output_max_len );
+#endif
+
+        default:
+            return( MBEDTLS_ERR_RSA_INVALID_PADDING );
+    }
+}
+
+#if defined(MBEDTLS_PKCS1_V21)
+/*
+ * Implementation of the PKCS#1 v2.1 RSASSA-PSS-SIGN function
+ */
+int mbedtls_rsa_rsassa_pss_sign( mbedtls_rsa_context *ctx,
+                         int (*f_rng)(void *, unsigned char *, size_t),
+                         void *p_rng,
+                         int mode,
+                         mbedtls_md_type_t md_alg,
+                         unsigned int hashlen,
+                         const unsigned char *hash,
+                         unsigned char *sig )
+{
+    size_t olen;
+    unsigned char *p = sig;
+    unsigned char salt[MBEDTLS_MD_MAX_SIZE];
+    unsigned int slen, hlen, offset = 0;
+    int ret;
+    size_t msb;
+    const mbedtls_md_info_t *md_info;
+    mbedtls_md_context_t md_ctx;
+
+    if( mode == MBEDTLS_RSA_PRIVATE && ctx->padding != MBEDTLS_RSA_PKCS_V21 )
+        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+
+    if( f_rng == NULL )
+        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+
+    olen = ctx->len;
+
+    if( md_alg != MBEDTLS_MD_NONE )
+    {
+        /* Gather length of hash to sign */
+        md_info = mbedtls_md_info_from_type( md_alg );
+        if( md_info == NULL )
+            return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+
+        hashlen = mbedtls_md_get_size( md_info );
+    }
+
+    md_info = mbedtls_md_info_from_type( (mbedtls_md_type_t) ctx->hash_id );
+    if( md_info == NULL )
+        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+
+    hlen = mbedtls_md_get_size( md_info );
+    slen = hlen;
+
+    if( olen < hlen + slen + 2 )
+        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+
+    memset( sig, 0, olen );
+
+    /* Generate salt of length slen */
+    if( ( ret = f_rng( p_rng, salt, slen ) ) != 0 )
+        return( MBEDTLS_ERR_RSA_RNG_FAILED + ret );
+
+    /* Note: EMSA-PSS encoding is over the length of N - 1 bits */
+    msb = mbedtls_mpi_bitlen( &ctx->N ) - 1;
+    p += olen - hlen * 2 - 2;
+    *p++ = 0x01;
+    memcpy( p, salt, slen );
+    p += slen;
+
+    mbedtls_md_init( &md_ctx );
+    if( ( ret = mbedtls_md_setup( &md_ctx, md_info, 0 ) ) != 0 )
+        goto exit;
+
+    /* Generate H = Hash( M' ) */
+    if( ( ret = mbedtls_md_starts( &md_ctx ) ) != 0 )
+        goto exit;
+    if( ( ret = mbedtls_md_update( &md_ctx, p, 8 ) ) != 0 )
+        goto exit;
+    if( ( ret = mbedtls_md_update( &md_ctx, hash, hashlen ) ) != 0 )
+        goto exit;
+    if( ( ret = mbedtls_md_update( &md_ctx, salt, slen ) ) != 0 )
+        goto exit;
+    if( ( ret = mbedtls_md_finish( &md_ctx, p ) ) != 0 )
+        goto exit;
+
+    /* Compensate for boundary condition when applying mask */
+    if( msb % 8 == 0 )
+        offset = 1;
+
+    /* maskedDB: Apply dbMask to DB */
+    if( ( ret = mgf_mask( sig + offset, olen - hlen - 1 - offset, p, hlen,
+                          &md_ctx ) ) != 0 )
+        goto exit;
+
+    msb = mbedtls_mpi_bitlen( &ctx->N ) - 1;
+    sig[0] &= 0xFF >> ( olen * 8 - msb );
+
+    p += hlen;
+    *p++ = 0xBC;
+
+    mbedtls_platform_zeroize( salt, sizeof( salt ) );
+
+exit:
+    mbedtls_md_free( &md_ctx );
+
+    if( ret != 0 )
+        return( ret );
+
+    return( ( mode == MBEDTLS_RSA_PUBLIC )
+            ? mbedtls_rsa_public(  ctx, sig, sig )
+            : mbedtls_rsa_private( ctx, f_rng, p_rng, sig, sig ) );
+}
+#endif /* MBEDTLS_PKCS1_V21 */
+
+#if defined(MBEDTLS_PKCS1_V15)
+/*
+ * Implementation of the PKCS#1 v2.1 RSASSA-PKCS1-V1_5-SIGN function
+ */
+
+/* Construct a PKCS v1.5 encoding of a hashed message
+ *
+ * This is used both for signature generation and verification.
+ *
+ * Parameters:
+ * - md_alg:  Identifies the hash algorithm used to generate the given hash;
+ *            MBEDTLS_MD_NONE if raw data is signed.
+ * - hashlen: Length of hash in case hashlen is MBEDTLS_MD_NONE.
+ * - hash:    Buffer containing the hashed message or the raw data.
+ * - dst_len: Length of the encoded message.
+ * - dst:     Buffer to hold the encoded message.
+ *
+ * Assumptions:
+ * - hash has size hashlen if md_alg == MBEDTLS_MD_NONE.
+ * - hash has size corresponding to md_alg if md_alg != MBEDTLS_MD_NONE.
+ * - dst points to a buffer of size at least dst_len.
+ *
+ */
+static int rsa_rsassa_pkcs1_v15_encode( mbedtls_md_type_t md_alg,
+                                        unsigned int hashlen,
+                                        const unsigned char *hash,
+                                        size_t dst_len,
+                                        unsigned char *dst )
+{
+    size_t oid_size  = 0;
+    size_t nb_pad    = dst_len;
+    unsigned char *p = dst;
+    const char *oid  = NULL;
+
+    /* Are we signing hashed or raw data? */
+    if( md_alg != MBEDTLS_MD_NONE )
+    {
+        const mbedtls_md_info_t *md_info = mbedtls_md_info_from_type( md_alg );
+        if( md_info == NULL )
+            return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+
+        if( mbedtls_oid_get_oid_by_md( md_alg, &oid, &oid_size ) != 0 )
+            return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+
+        hashlen = mbedtls_md_get_size( md_info );
+
+        /* Double-check that 8 + hashlen + oid_size can be used as a
+         * 1-byte ASN.1 length encoding and that there's no overflow. */
+        if( 8 + hashlen + oid_size  >= 0x80         ||
+            10 + hashlen            <  hashlen      ||
+            10 + hashlen + oid_size <  10 + hashlen )
+            return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+
+        /*
+         * Static bounds check:
+         * - Need 10 bytes for five tag-length pairs.
+         *   (Insist on 1-byte length encodings to protect against variants of
+         *    Bleichenbacher's forgery attack against lax PKCS#1v1.5 verification)
+         * - Need hashlen bytes for hash
+         * - Need oid_size bytes for hash alg OID.
+         */
+        if( nb_pad < 10 + hashlen + oid_size )
+            return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+        nb_pad -= 10 + hashlen + oid_size;
+    }
+    else
+    {
+        if( nb_pad < hashlen )
+            return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+
+        nb_pad -= hashlen;
+    }
+
+    /* Need space for signature header and padding delimiter (3 bytes),
+     * and 8 bytes for the minimal padding */
+    if( nb_pad < 3 + 8 )
+        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    nb_pad -= 3;
+
+    /* Now nb_pad is the amount of memory to be filled
+     * with padding, and at least 8 bytes long. */
+
+    /* Write signature header and padding */
+    *p++ = 0;
+    *p++ = MBEDTLS_RSA_SIGN;
+    memset( p, 0xFF, nb_pad );
+    p += nb_pad;
+    *p++ = 0;
+
+    /* Are we signing raw data? */
+    if( md_alg == MBEDTLS_MD_NONE )
+    {
+        memcpy( p, hash, hashlen );
+        return( 0 );
+    }
+
+    /* Signing hashed data, add corresponding ASN.1 structure
+     *
+     * DigestInfo ::= SEQUENCE {
+     *   digestAlgorithm DigestAlgorithmIdentifier,
+     *   digest Digest }
+     * DigestAlgorithmIdentifier ::= AlgorithmIdentifier
+     * Digest ::= OCTET STRING
+     *
+     * Schematic:
+     * TAG-SEQ + LEN [ TAG-SEQ + LEN [ TAG-OID  + LEN [ OID  ]
+     *                                 TAG-NULL + LEN [ NULL ] ]
+     *                 TAG-OCTET + LEN [ HASH ] ]
+     */
+    *p++ = MBEDTLS_ASN1_SEQUENCE | MBEDTLS_ASN1_CONSTRUCTED;
+    *p++ = (unsigned char)( 0x08 + oid_size + hashlen );
+    *p++ = MBEDTLS_ASN1_SEQUENCE | MBEDTLS_ASN1_CONSTRUCTED;
+    *p++ = (unsigned char)( 0x04 + oid_size );
+    *p++ = MBEDTLS_ASN1_OID;
+    *p++ = (unsigned char) oid_size;
+    memcpy( p, oid, oid_size );
+    p += oid_size;
+    *p++ = MBEDTLS_ASN1_NULL;
+    *p++ = 0x00;
+    *p++ = MBEDTLS_ASN1_OCTET_STRING;
+    *p++ = (unsigned char) hashlen;
+    memcpy( p, hash, hashlen );
+    p += hashlen;
+
+    /* Just a sanity-check, should be automatic
+     * after the initial bounds check. */
+    if( p != dst + dst_len )
+    {
+        mbedtls_platform_zeroize( dst, dst_len );
+        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    }
+
+    return( 0 );
+}
+
+/*
+ * Do an RSA operation to sign the message digest
+ */
+int mbedtls_rsa_rsassa_pkcs1_v15_sign( mbedtls_rsa_context *ctx,
+                               int (*f_rng)(void *, unsigned char *, size_t),
+                               void *p_rng,
+                               int mode,
+                               mbedtls_md_type_t md_alg,
+                               unsigned int hashlen,
+                               const unsigned char *hash,
+                               unsigned char *sig )
+{
+    int ret;
+    unsigned char *sig_try = NULL, *verif = NULL;
+
+    if( mode == MBEDTLS_RSA_PRIVATE && ctx->padding != MBEDTLS_RSA_PKCS_V15 )
+        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+
+    /*
+     * Prepare PKCS1-v1.5 encoding (padding and hash identifier)
+     */
+
+    if( ( ret = rsa_rsassa_pkcs1_v15_encode( md_alg, hashlen, hash,
+                                             ctx->len, sig ) ) != 0 )
+        return( ret );
+
+    /*
+     * Call respective RSA primitive
+     */
+
+    if( mode == MBEDTLS_RSA_PUBLIC )
+    {
+        /* Skip verification on a public key operation */
+        return( mbedtls_rsa_public( ctx, sig, sig ) );
+    }
+
+    /* Private key operation
+     *
+     * In order to prevent Lenstra's attack, make the signature in a
+     * temporary buffer and check it before returning it.
+     */
+
+    sig_try = mbedtls_calloc( 1, ctx->len );
+    if( sig_try == NULL )
+        return( MBEDTLS_ERR_MPI_ALLOC_FAILED );
+
+    verif = mbedtls_calloc( 1, ctx->len );
+    if( verif == NULL )
+    {
+        mbedtls_free( sig_try );
+        return( MBEDTLS_ERR_MPI_ALLOC_FAILED );
+    }
+
+    MBEDTLS_MPI_CHK( mbedtls_rsa_private( ctx, f_rng, p_rng, sig, sig_try ) );
+    MBEDTLS_MPI_CHK( mbedtls_rsa_public( ctx, sig_try, verif ) );
+
+    if( mbedtls_safer_memcmp( verif, sig, ctx->len ) != 0 )
+    {
+        ret = MBEDTLS_ERR_RSA_PRIVATE_FAILED;
+        goto cleanup;
+    }
+
+    memcpy( sig, sig_try, ctx->len );
+
+cleanup:
+    mbedtls_free( sig_try );
+    mbedtls_free( verif );
+
+    return( ret );
+}
+#endif /* MBEDTLS_PKCS1_V15 */
+
+/*
+ * Do an RSA operation to sign the message digest
+ */
+int mbedtls_rsa_pkcs1_sign( mbedtls_rsa_context *ctx,
+                    int (*f_rng)(void *, unsigned char *, size_t),
+                    void *p_rng,
+                    int mode,
+                    mbedtls_md_type_t md_alg,
+                    unsigned int hashlen,
+                    const unsigned char *hash,
+                    unsigned char *sig )
+{
+    switch( ctx->padding )
+    {
+#if defined(MBEDTLS_PKCS1_V15)
+        case MBEDTLS_RSA_PKCS_V15:
+            return mbedtls_rsa_rsassa_pkcs1_v15_sign( ctx, f_rng, p_rng, mode, md_alg,
+                                              hashlen, hash, sig );
+#endif
+
+#if defined(MBEDTLS_PKCS1_V21)
+        case MBEDTLS_RSA_PKCS_V21:
+            return mbedtls_rsa_rsassa_pss_sign( ctx, f_rng, p_rng, mode, md_alg,
+                                        hashlen, hash, sig );
+#endif
+
+        default:
+            return( MBEDTLS_ERR_RSA_INVALID_PADDING );
+    }
+}
+
+#if defined(MBEDTLS_PKCS1_V21)
+/*
+ * Implementation of the PKCS#1 v2.1 RSASSA-PSS-VERIFY function
+ */
+int mbedtls_rsa_rsassa_pss_verify_ext( mbedtls_rsa_context *ctx,
+                               int (*f_rng)(void *, unsigned char *, size_t),
+                               void *p_rng,
+                               int mode,
+                               mbedtls_md_type_t md_alg,
+                               unsigned int hashlen,
+                               const unsigned char *hash,
+                               mbedtls_md_type_t mgf1_hash_id,
+                               int expected_salt_len,
+                               const unsigned char *sig )
+{
+    int ret;
+    size_t siglen;
+    unsigned char *p;
+    unsigned char *hash_start;
+    unsigned char result[MBEDTLS_MD_MAX_SIZE];
+    unsigned char zeros[8];
+    unsigned int hlen;
+    size_t observed_salt_len, msb;
+    const mbedtls_md_info_t *md_info;
+    mbedtls_md_context_t md_ctx;
+    unsigned char buf[MBEDTLS_MPI_MAX_SIZE];
+
+    if( mode == MBEDTLS_RSA_PRIVATE && ctx->padding != MBEDTLS_RSA_PKCS_V21 )
+        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+
+    siglen = ctx->len;
+
+    if( siglen < 16 || siglen > sizeof( buf ) )
+        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+
+    ret = ( mode == MBEDTLS_RSA_PUBLIC )
+          ? mbedtls_rsa_public(  ctx, sig, buf )
+          : mbedtls_rsa_private( ctx, f_rng, p_rng, sig, buf );
+
+    if( ret != 0 )
+        return( ret );
+
+    p = buf;
+
+    if( buf[siglen - 1] != 0xBC )
+        return( MBEDTLS_ERR_RSA_INVALID_PADDING );
+
+    if( md_alg != MBEDTLS_MD_NONE )
+    {
+        /* Gather length of hash to sign */
+        md_info = mbedtls_md_info_from_type( md_alg );
+        if( md_info == NULL )
+            return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+
+        hashlen = mbedtls_md_get_size( md_info );
+    }
+
+    md_info = mbedtls_md_info_from_type( mgf1_hash_id );
+    if( md_info == NULL )
+        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+
+    hlen = mbedtls_md_get_size( md_info );
+
+    memset( zeros, 0, 8 );
+
+    /*
+     * Note: EMSA-PSS verification is over the length of N - 1 bits
+     */
+    msb = mbedtls_mpi_bitlen( &ctx->N ) - 1;
+
+    if( buf[0] >> ( 8 - siglen * 8 + msb ) )
+        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+
+    /* Compensate for boundary condition when applying mask */
+    if( msb % 8 == 0 )
+    {
+        p++;
+        siglen -= 1;
+    }
+
+    if( siglen < hlen + 2 )
+        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    hash_start = p + siglen - hlen - 1;
+
+    mbedtls_md_init( &md_ctx );
+    if( ( ret = mbedtls_md_setup( &md_ctx, md_info, 0 ) ) != 0 )
+        goto exit;
+
+    ret = mgf_mask( p, siglen - hlen - 1, hash_start, hlen, &md_ctx );
+    if( ret != 0 )
+        goto exit;
+
+    buf[0] &= 0xFF >> ( siglen * 8 - msb );
+
+    while( p < hash_start - 1 && *p == 0 )
+        p++;
+
+    if( *p++ != 0x01 )
+    {
+        ret = MBEDTLS_ERR_RSA_INVALID_PADDING;
+        goto exit;
+    }
+
+    observed_salt_len = hash_start - p;
+
+    if( expected_salt_len != MBEDTLS_RSA_SALT_LEN_ANY &&
+        observed_salt_len != (size_t) expected_salt_len )
+    {
+        ret = MBEDTLS_ERR_RSA_INVALID_PADDING;
+        goto exit;
+    }
+
+    /*
+     * Generate H = Hash( M' )
+     */
+    ret = mbedtls_md_starts( &md_ctx );
+    if ( ret != 0 )
+        goto exit;
+    ret = mbedtls_md_update( &md_ctx, zeros, 8 );
+    if ( ret != 0 )
+        goto exit;
+    ret = mbedtls_md_update( &md_ctx, hash, hashlen );
+    if ( ret != 0 )
+        goto exit;
+    ret = mbedtls_md_update( &md_ctx, p, observed_salt_len );
+    if ( ret != 0 )
+        goto exit;
+    ret = mbedtls_md_finish( &md_ctx, result );
+    if ( ret != 0 )
+        goto exit;
+
+    if( memcmp( hash_start, result, hlen ) != 0 )
+    {
+        ret = MBEDTLS_ERR_RSA_VERIFY_FAILED;
+        goto exit;
+    }
+
+exit:
+    mbedtls_md_free( &md_ctx );
+
+    return( ret );
+}
+
+/*
+ * Simplified PKCS#1 v2.1 RSASSA-PSS-VERIFY function
+ */
+int mbedtls_rsa_rsassa_pss_verify( mbedtls_rsa_context *ctx,
+                           int (*f_rng)(void *, unsigned char *, size_t),
+                           void *p_rng,
+                           int mode,
+                           mbedtls_md_type_t md_alg,
+                           unsigned int hashlen,
+                           const unsigned char *hash,
+                           const unsigned char *sig )
+{
+    mbedtls_md_type_t mgf1_hash_id = ( ctx->hash_id != MBEDTLS_MD_NONE )
+                             ? (mbedtls_md_type_t) ctx->hash_id
+                             : md_alg;
+
+    return( mbedtls_rsa_rsassa_pss_verify_ext( ctx, f_rng, p_rng, mode,
+                                       md_alg, hashlen, hash,
+                                       mgf1_hash_id, MBEDTLS_RSA_SALT_LEN_ANY,
+                                       sig ) );
+
+}
+#endif /* MBEDTLS_PKCS1_V21 */
+
+#if defined(MBEDTLS_PKCS1_V15)
+/*
+ * Implementation of the PKCS#1 v2.1 RSASSA-PKCS1-v1_5-VERIFY function
+ */
+int mbedtls_rsa_rsassa_pkcs1_v15_verify( mbedtls_rsa_context *ctx,
+                                 int (*f_rng)(void *, unsigned char *, size_t),
+                                 void *p_rng,
+                                 int mode,
+                                 mbedtls_md_type_t md_alg,
+                                 unsigned int hashlen,
+                                 const unsigned char *hash,
+                                 const unsigned char *sig )
+{
+    int ret = 0;
+    const size_t sig_len = ctx->len;
+    unsigned char *encoded = NULL, *encoded_expected = NULL;
+
+    if( mode == MBEDTLS_RSA_PRIVATE && ctx->padding != MBEDTLS_RSA_PKCS_V15 )
+        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+
+    /*
+     * Prepare expected PKCS1 v1.5 encoding of hash.
+     */
+
+    if( ( encoded          = mbedtls_calloc( 1, sig_len ) ) == NULL ||
+        ( encoded_expected = mbedtls_calloc( 1, sig_len ) ) == NULL )
+    {
+        ret = MBEDTLS_ERR_MPI_ALLOC_FAILED;
+        goto cleanup;
+    }
+
+    if( ( ret = rsa_rsassa_pkcs1_v15_encode( md_alg, hashlen, hash, sig_len,
+                                             encoded_expected ) ) != 0 )
+        goto cleanup;
+
+    /*
+     * Apply RSA primitive to get what should be PKCS1 encoded hash.
+     */
+
+    ret = ( mode == MBEDTLS_RSA_PUBLIC )
+          ? mbedtls_rsa_public(  ctx, sig, encoded )
+          : mbedtls_rsa_private( ctx, f_rng, p_rng, sig, encoded );
+    if( ret != 0 )
+        goto cleanup;
+
+    /*
+     * Compare
+     */
+
+    if( ( ret = mbedtls_safer_memcmp( encoded, encoded_expected,
+                                      sig_len ) ) != 0 )
+    {
+        ret = MBEDTLS_ERR_RSA_VERIFY_FAILED;
+        goto cleanup;
+    }
+
+cleanup:
+
+    if( encoded != NULL )
+    {
+        mbedtls_platform_zeroize( encoded, sig_len );
+        mbedtls_free( encoded );
+    }
+
+    if( encoded_expected != NULL )
+    {
+        mbedtls_platform_zeroize( encoded_expected, sig_len );
+        mbedtls_free( encoded_expected );
+    }
+
+    return( ret );
+}
+#endif /* MBEDTLS_PKCS1_V15 */
+
+/*
+ * Do an RSA operation and check the message digest
+ */
+int mbedtls_rsa_pkcs1_verify( mbedtls_rsa_context *ctx,
+                      int (*f_rng)(void *, unsigned char *, size_t),
+                      void *p_rng,
+                      int mode,
+                      mbedtls_md_type_t md_alg,
+                      unsigned int hashlen,
+                      const unsigned char *hash,
+                      const unsigned char *sig )
+{
+    switch( ctx->padding )
+    {
+#if defined(MBEDTLS_PKCS1_V15)
+        case MBEDTLS_RSA_PKCS_V15:
+            return mbedtls_rsa_rsassa_pkcs1_v15_verify( ctx, f_rng, p_rng, mode, md_alg,
+                                                hashlen, hash, sig );
+#endif
+
+#if defined(MBEDTLS_PKCS1_V21)
+        case MBEDTLS_RSA_PKCS_V21:
+            return mbedtls_rsa_rsassa_pss_verify( ctx, f_rng, p_rng, mode, md_alg,
+                                          hashlen, hash, sig );
+#endif
+
+        default:
+            return( MBEDTLS_ERR_RSA_INVALID_PADDING );
+    }
+}
+
+/*
+ * Copy the components of an RSA key
+ */
+int mbedtls_rsa_copy( mbedtls_rsa_context *dst, const mbedtls_rsa_context *src )
+{
+    int ret;
+
+    dst->ver = src->ver;
+    dst->len = src->len;
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &dst->N, &src->N ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &dst->E, &src->E ) );
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &dst->D, &src->D ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &dst->P, &src->P ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &dst->Q, &src->Q ) );
+
+#if !defined(MBEDTLS_RSA_NO_CRT)
+    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &dst->DP, &src->DP ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &dst->DQ, &src->DQ ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &dst->QP, &src->QP ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &dst->RP, &src->RP ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &dst->RQ, &src->RQ ) );
+#endif
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &dst->RN, &src->RN ) );
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &dst->Vi, &src->Vi ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &dst->Vf, &src->Vf ) );
+
+    dst->padding = src->padding;
+    dst->hash_id = src->hash_id;
+
+cleanup:
+    if( ret != 0 )
+        mbedtls_rsa_free( dst );
+
+    return( ret );
+}
+
+/*
+ * Free the components of an RSA key
+ */
+void mbedtls_rsa_free( mbedtls_rsa_context *ctx )
+{
+    mbedtls_mpi_free( &ctx->Vi ); mbedtls_mpi_free( &ctx->Vf );
+    mbedtls_mpi_free( &ctx->RN ); mbedtls_mpi_free( &ctx->D  );
+    mbedtls_mpi_free( &ctx->Q  ); mbedtls_mpi_free( &ctx->P  );
+    mbedtls_mpi_free( &ctx->E  ); mbedtls_mpi_free( &ctx->N  );
+
+#if !defined(MBEDTLS_RSA_NO_CRT)
+    mbedtls_mpi_free( &ctx->RQ ); mbedtls_mpi_free( &ctx->RP );
+    mbedtls_mpi_free( &ctx->QP ); mbedtls_mpi_free( &ctx->DQ );
+    mbedtls_mpi_free( &ctx->DP );
+#endif /* MBEDTLS_RSA_NO_CRT */
+
+#if defined(MBEDTLS_THREADING_C)
+    mbedtls_mutex_free( &ctx->mutex );
+#endif
+}
+
+#endif /* !MBEDTLS_RSA_ALT */
+
+#if defined(MBEDTLS_SELF_TEST)
+
+#include "mbedtls/sha1.h"
+
+/*
+ * Example RSA-1024 keypair, for test purposes
+ */
+#define KEY_LEN 128
+
+#define RSA_N   "9292758453063D803DD603D5E777D788" \
+                "8ED1D5BF35786190FA2F23EBC0848AEA" \
+                "DDA92CA6C3D80B32C4D109BE0F36D6AE" \
+                "7130B9CED7ACDF54CFC7555AC14EEBAB" \
+                "93A89813FBF3C4F8066D2D800F7C38A8" \
+                "1AE31942917403FF4946B0A83D3D3E05" \
+                "EE57C6F5F5606FB5D4BC6CD34EE0801A" \
+                "5E94BB77B07507233A0BC7BAC8F90F79"
+
+#define RSA_E   "10001"
+
+#define RSA_D   "24BF6185468786FDD303083D25E64EFC" \
+                "66CA472BC44D253102F8B4A9D3BFA750" \
+                "91386C0077937FE33FA3252D28855837" \
+                "AE1B484A8A9A45F7EE8C0C634F99E8CD" \
+                "DF79C5CE07EE72C7F123142198164234" \
+                "CABB724CF78B8173B9F880FC86322407" \
+                "AF1FEDFDDE2BEB674CA15F3E81A1521E" \
+                "071513A1E85B5DFA031F21ECAE91A34D"
+
+#define RSA_P   "C36D0EB7FCD285223CFB5AABA5BDA3D8" \
+                "2C01CAD19EA484A87EA4377637E75500" \
+                "FCB2005C5C7DD6EC4AC023CDA285D796" \
+                "C3D9E75E1EFC42488BB4F1D13AC30A57"
+
+#define RSA_Q   "C000DF51A7C77AE8D7C7370C1FF55B69" \
+                "E211C2B9E5DB1ED0BF61D0D9899620F4" \
+                "910E4168387E3C30AA1E00C339A79508" \
+                "8452DD96A9A5EA5D9DCA68DA636032AF"
+
+#define PT_LEN  24
+#define RSA_PT  "\xAA\xBB\xCC\x03\x02\x01\x00\xFF\xFF\xFF\xFF\xFF" \
+                "\x11\x22\x33\x0A\x0B\x0C\xCC\xDD\xDD\xDD\xDD\xDD"
+
+#if defined(MBEDTLS_PKCS1_V15)
+static int myrand( void *rng_state, unsigned char *output, size_t len )
+{
+#if !defined(__OpenBSD__)
+    size_t i;
+
+    if( rng_state != NULL )
+        rng_state  = NULL;
+
+    for( i = 0; i < len; ++i )
+        output[i] = rand();
+#else
+    if( rng_state != NULL )
+        rng_state = NULL;
+
+    arc4random_buf( output, len );
+#endif /* !OpenBSD */
+
+    return( 0 );
+}
+#endif /* MBEDTLS_PKCS1_V15 */
+
+/*
+ * Checkup routine
+ */
+int mbedtls_rsa_self_test( int verbose )
+{
+    int ret = 0;
+#if defined(MBEDTLS_PKCS1_V15)
+    size_t len;
+    mbedtls_rsa_context rsa;
+    unsigned char rsa_plaintext[PT_LEN];
+    unsigned char rsa_decrypted[PT_LEN];
+    unsigned char rsa_ciphertext[KEY_LEN];
+#if defined(MBEDTLS_SHA1_C)
+    unsigned char sha1sum[20];
+#endif
+
+    mbedtls_mpi K;
+
+    mbedtls_mpi_init( &K );
+    mbedtls_rsa_init( &rsa, MBEDTLS_RSA_PKCS_V15, 0 );
+
+    MBEDTLS_MPI_CHK( mbedtls_mpi_read_string( &K, 16, RSA_N  ) );
+    MBEDTLS_MPI_CHK( mbedtls_rsa_import( &rsa, &K, NULL, NULL, NULL, NULL ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_read_string( &K, 16, RSA_P  ) );
+    MBEDTLS_MPI_CHK( mbedtls_rsa_import( &rsa, NULL, &K, NULL, NULL, NULL ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_read_string( &K, 16, RSA_Q  ) );
+    MBEDTLS_MPI_CHK( mbedtls_rsa_import( &rsa, NULL, NULL, &K, NULL, NULL ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_read_string( &K, 16, RSA_D  ) );
+    MBEDTLS_MPI_CHK( mbedtls_rsa_import( &rsa, NULL, NULL, NULL, &K, NULL ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_read_string( &K, 16, RSA_E  ) );
+    MBEDTLS_MPI_CHK( mbedtls_rsa_import( &rsa, NULL, NULL, NULL, NULL, &K ) );
+
+    MBEDTLS_MPI_CHK( mbedtls_rsa_complete( &rsa ) );
+
+    if( verbose != 0 )
+        mbedtls_printf( "  RSA key validation: " );
+
+    if( mbedtls_rsa_check_pubkey(  &rsa ) != 0 ||
+        mbedtls_rsa_check_privkey( &rsa ) != 0 )
+    {
+        if( verbose != 0 )
+            mbedtls_printf( "failed\n" );
+
+        ret = 1;
+        goto cleanup;
+    }
+
+    if( verbose != 0 )
+        mbedtls_printf( "passed\n  PKCS#1 encryption : " );
+
+    memcpy( rsa_plaintext, RSA_PT, PT_LEN );
+
+    if( mbedtls_rsa_pkcs1_encrypt( &rsa, myrand, NULL, MBEDTLS_RSA_PUBLIC,
+                                   PT_LEN, rsa_plaintext,
+                                   rsa_ciphertext ) != 0 )
+    {
+        if( verbose != 0 )
+            mbedtls_printf( "failed\n" );
+
+        ret = 1;
+        goto cleanup;
+    }
+
+    if( verbose != 0 )
+        mbedtls_printf( "passed\n  PKCS#1 decryption : " );
+
+    if( mbedtls_rsa_pkcs1_decrypt( &rsa, myrand, NULL, MBEDTLS_RSA_PRIVATE,
+                                   &len, rsa_ciphertext, rsa_decrypted,
+                                   sizeof(rsa_decrypted) ) != 0 )
+    {
+        if( verbose != 0 )
+            mbedtls_printf( "failed\n" );
+
+        ret = 1;
+        goto cleanup;
+    }
+
+    if( memcmp( rsa_decrypted, rsa_plaintext, len ) != 0 )
+    {
+        if( verbose != 0 )
+            mbedtls_printf( "failed\n" );
+
+        ret = 1;
+        goto cleanup;
+    }
+
+    if( verbose != 0 )
+        mbedtls_printf( "passed\n" );
+
+#if defined(MBEDTLS_SHA1_C)
+    if( verbose != 0 )
+        mbedtls_printf( "  PKCS#1 data sign  : " );
+
+    if( mbedtls_sha1_ret( rsa_plaintext, PT_LEN, sha1sum ) != 0 )
+    {
+        if( verbose != 0 )
+            mbedtls_printf( "failed\n" );
+
+        return( 1 );
+    }
+
+    if( mbedtls_rsa_pkcs1_sign( &rsa, myrand, NULL,
+                                MBEDTLS_RSA_PRIVATE, MBEDTLS_MD_SHA1, 0,
+                                sha1sum, rsa_ciphertext ) != 0 )
+    {
+        if( verbose != 0 )
+            mbedtls_printf( "failed\n" );
+
+        ret = 1;
+        goto cleanup;
+    }
+
+    if( verbose != 0 )
+        mbedtls_printf( "passed\n  PKCS#1 sig. verify: " );
+
+    if( mbedtls_rsa_pkcs1_verify( &rsa, NULL, NULL,
+                                  MBEDTLS_RSA_PUBLIC, MBEDTLS_MD_SHA1, 0,
+                                  sha1sum, rsa_ciphertext ) != 0 )
+    {
+        if( verbose != 0 )
+            mbedtls_printf( "failed\n" );
+
+        ret = 1;
+        goto cleanup;
+    }
+
+    if( verbose != 0 )
+        mbedtls_printf( "passed\n" );
+#endif /* MBEDTLS_SHA1_C */
+
+    if( verbose != 0 )
+        mbedtls_printf( "\n" );
+
+cleanup:
+    mbedtls_mpi_free( &K );
+    mbedtls_rsa_free( &rsa );
+#else /* MBEDTLS_PKCS1_V15 */
+    ((void) verbose);
+#endif /* MBEDTLS_PKCS1_V15 */
+    return( ret );
+}
+
+#endif /* MBEDTLS_SELF_TEST */
+
+#endif /* MBEDTLS_RSA_C */
diff --git a/common/mbedtls/rsa.h b/common/mbedtls/rsa.h
new file mode 100644
index 000000000..7be7863c8
--- /dev/null
+++ b/common/mbedtls/rsa.h
@@ -0,0 +1,1133 @@
+/**
+ * \file rsa.h
+ *
+ * \brief This file provides an API for the RSA public-key cryptosystem.
+ *
+ * The RSA public-key cryptosystem is defined in <em>Public-Key
+ * Cryptography Standards (PKCS) #1 v1.5: RSA Encryption</em>
+ * and <em>Public-Key Cryptography Standards (PKCS) #1 v2.1:
+ * RSA Cryptography Specifications</em>.
+ *
+ */
+/*
+ *  Copyright (C) 2006-2018, Arm Limited (or its affiliates), All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of Mbed TLS (https://tls.mbed.org)
+ */
+#ifndef MBEDTLS_RSA_H
+#define MBEDTLS_RSA_H
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#include "bignum.h"
+#include "md.h"
+
+#if defined(MBEDTLS_THREADING_C)
+#include "threading.h"
+#endif
+
+/*
+ * RSA Error codes
+ */
+#define MBEDTLS_ERR_RSA_BAD_INPUT_DATA                    -0x4080  /**< Bad input parameters to function. */
+#define MBEDTLS_ERR_RSA_INVALID_PADDING                   -0x4100  /**< Input data contains invalid padding and is rejected. */
+#define MBEDTLS_ERR_RSA_KEY_GEN_FAILED                    -0x4180  /**< Something failed during generation of a key. */
+#define MBEDTLS_ERR_RSA_KEY_CHECK_FAILED                  -0x4200  /**< Key failed to pass the validity check of the library. */
+#define MBEDTLS_ERR_RSA_PUBLIC_FAILED                     -0x4280  /**< The public key operation failed. */
+#define MBEDTLS_ERR_RSA_PRIVATE_FAILED                    -0x4300  /**< The private key operation failed. */
+#define MBEDTLS_ERR_RSA_VERIFY_FAILED                     -0x4380  /**< The PKCS#1 verification failed. */
+#define MBEDTLS_ERR_RSA_OUTPUT_TOO_LARGE                  -0x4400  /**< The output buffer for decryption is not large enough. */
+#define MBEDTLS_ERR_RSA_RNG_FAILED                        -0x4480  /**< The random generator failed to generate non-zeros. */
+#define MBEDTLS_ERR_RSA_UNSUPPORTED_OPERATION             -0x4500  /**< The implementation does not offer the requested operation, for example, because of security violations or lack of functionality. */
+#define MBEDTLS_ERR_RSA_HW_ACCEL_FAILED                   -0x4580  /**< RSA hardware accelerator failed. */
+
+/*
+ * RSA constants
+ */
+#define MBEDTLS_RSA_PUBLIC      0 /**< Request private key operation. */
+#define MBEDTLS_RSA_PRIVATE     1 /**< Request public key operation. */
+
+#define MBEDTLS_RSA_PKCS_V15    0 /**< Use PKCS#1 v1.5 encoding. */
+#define MBEDTLS_RSA_PKCS_V21    1 /**< Use PKCS#1 v2.1 encoding. */
+
+#define MBEDTLS_RSA_SIGN        1 /**< Identifier for RSA signature operations. */
+#define MBEDTLS_RSA_CRYPT       2 /**< Identifier for RSA encryption and decryption operations. */
+
+#define MBEDTLS_RSA_SALT_LEN_ANY    -1
+
+/*
+ * The above constants may be used even if the RSA module is compile out,
+ * eg for alternative (PKCS#11) RSA implemenations in the PK layers.
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if !defined(MBEDTLS_RSA_ALT)
+// Regular implementation
+//
+
+/**
+ * \brief   The RSA context structure.
+ *
+ * \note    Direct manipulation of the members of this structure
+ *          is deprecated. All manipulation should instead be done through
+ *          the public interface functions.
+ */
+typedef struct mbedtls_rsa_context
+{
+    int ver;                    /*!<  Always 0.*/
+    size_t len;                 /*!<  The size of \p N in Bytes. */
+
+    mbedtls_mpi N;              /*!<  The public modulus. */
+    mbedtls_mpi E;              /*!<  The public exponent. */
+
+    mbedtls_mpi D;              /*!<  The private exponent. */
+    mbedtls_mpi P;              /*!<  The first prime factor. */
+    mbedtls_mpi Q;              /*!<  The second prime factor. */
+
+    mbedtls_mpi DP;             /*!<  <code>D % (P - 1)</code>. */
+    mbedtls_mpi DQ;             /*!<  <code>D % (Q - 1)</code>. */
+    mbedtls_mpi QP;             /*!<  <code>1 / (Q % P)</code>. */
+
+    mbedtls_mpi RN;             /*!<  cached <code>R^2 mod N</code>. */
+
+    mbedtls_mpi RP;             /*!<  cached <code>R^2 mod P</code>. */
+    mbedtls_mpi RQ;             /*!<  cached <code>R^2 mod Q</code>. */
+
+    mbedtls_mpi Vi;             /*!<  The cached blinding value. */
+    mbedtls_mpi Vf;             /*!<  The cached un-blinding value. */
+
+    int padding;                /*!< Selects padding mode:
+                                     #MBEDTLS_RSA_PKCS_V15 for 1.5 padding and
+                                     #MBEDTLS_RSA_PKCS_V21 for OAEP or PSS. */
+    int hash_id;                /*!< Hash identifier of mbedtls_md_type_t type,
+                                     as specified in md.h for use in the MGF
+                                     mask generating function used in the
+                                     EME-OAEP and EMSA-PSS encodings. */
+#if defined(MBEDTLS_THREADING_C)
+    mbedtls_threading_mutex_t mutex;    /*!<  Thread-safety mutex. */
+#endif
+}
+mbedtls_rsa_context;
+
+#else  /* MBEDTLS_RSA_ALT */
+#include "rsa_alt.h"
+#endif /* MBEDTLS_RSA_ALT */
+
+/**
+ * \brief          This function initializes an RSA context.
+ *
+ * \note           Set padding to #MBEDTLS_RSA_PKCS_V21 for the RSAES-OAEP
+ *                 encryption scheme and the RSASSA-PSS signature scheme.
+ *
+ * \note           The \p hash_id parameter is ignored when using
+ *                 #MBEDTLS_RSA_PKCS_V15 padding.
+ *
+ * \note           The choice of padding mode is strictly enforced for private key
+ *                 operations, since there might be security concerns in
+ *                 mixing padding modes. For public key operations it is
+ *                 a default value, which can be overriden by calling specific
+ *                 \c rsa_rsaes_xxx or \c rsa_rsassa_xxx functions.
+ *
+ * \note           The hash selected in \p hash_id is always used for OEAP
+ *                 encryption. For PSS signatures, it is always used for
+ *                 making signatures, but can be overriden for verifying them.
+ *                 If set to #MBEDTLS_MD_NONE, it is always overriden.
+ *
+ * \param ctx      The RSA context to initialize.
+ * \param padding  Selects padding mode: #MBEDTLS_RSA_PKCS_V15 or
+ *                 #MBEDTLS_RSA_PKCS_V21.
+ * \param hash_id  The hash identifier of #mbedtls_md_type_t type, if
+ *                 \p padding is #MBEDTLS_RSA_PKCS_V21.
+ */
+void mbedtls_rsa_init( mbedtls_rsa_context *ctx,
+                       int padding,
+                       int hash_id);
+
+/**
+ * \brief          This function imports a set of core parameters into an
+ *                 RSA context.
+ *
+ * \note           This function can be called multiple times for successive
+ *                 imports, if the parameters are not simultaneously present.
+ *
+ *                 Any sequence of calls to this function should be followed
+ *                 by a call to mbedtls_rsa_complete(), which checks and
+ *                 completes the provided information to a ready-for-use
+ *                 public or private RSA key.
+ *
+ * \note           See mbedtls_rsa_complete() for more information on which
+ *                 parameters are necessary to set up a private or public
+ *                 RSA key.
+ *
+ * \note           The imported parameters are copied and need not be preserved
+ *                 for the lifetime of the RSA context being set up.
+ *
+ * \param ctx      The initialized RSA context to store the parameters in.
+ * \param N        The RSA modulus, or NULL.
+ * \param P        The first prime factor of \p N, or NULL.
+ * \param Q        The second prime factor of \p N, or NULL.
+ * \param D        The private exponent, or NULL.
+ * \param E        The public exponent, or NULL.
+ *
+ * \return         \c 0 on success.
+ * \return         A non-zero error code on failure.
+ */
+int mbedtls_rsa_import( mbedtls_rsa_context *ctx,
+                        const mbedtls_mpi *N,
+                        const mbedtls_mpi *P, const mbedtls_mpi *Q,
+                        const mbedtls_mpi *D, const mbedtls_mpi *E );
+
+/**
+ * \brief          This function imports core RSA parameters, in raw big-endian
+ *                 binary format, into an RSA context.
+ *
+ * \note           This function can be called multiple times for successive
+ *                 imports, if the parameters are not simultaneously present.
+ *
+ *                 Any sequence of calls to this function should be followed
+ *                 by a call to mbedtls_rsa_complete(), which checks and
+ *                 completes the provided information to a ready-for-use
+ *                 public or private RSA key.
+ *
+ * \note           See mbedtls_rsa_complete() for more information on which
+ *                 parameters are necessary to set up a private or public
+ *                 RSA key.
+ *
+ * \note           The imported parameters are copied and need not be preserved
+ *                 for the lifetime of the RSA context being set up.
+ *
+ * \param ctx      The initialized RSA context to store the parameters in.
+ * \param N        The RSA modulus, or NULL.
+ * \param N_len    The Byte length of \p N, ignored if \p N == NULL.
+ * \param P        The first prime factor of \p N, or NULL.
+ * \param P_len    The Byte length of \p P, ignored if \p P == NULL.
+ * \param Q        The second prime factor of \p N, or NULL.
+ * \param Q_len    The Byte length of \p Q, ignored if \p Q == NULL.
+ * \param D        The private exponent, or NULL.
+ * \param D_len    The Byte length of \p D, ignored if \p D == NULL.
+ * \param E        The public exponent, or NULL.
+ * \param E_len    The Byte length of \p E, ignored if \p E == NULL.
+ *
+ * \return         \c 0 on success.
+ * \return         A non-zero error code on failure.
+ */
+int mbedtls_rsa_import_raw( mbedtls_rsa_context *ctx,
+                            unsigned char const *N, size_t N_len,
+                            unsigned char const *P, size_t P_len,
+                            unsigned char const *Q, size_t Q_len,
+                            unsigned char const *D, size_t D_len,
+                            unsigned char const *E, size_t E_len );
+
+/**
+ * \brief          This function completes an RSA context from
+ *                 a set of imported core parameters.
+ *
+ *                 To setup an RSA public key, precisely \p N and \p E
+ *                 must have been imported.
+ *
+ *                 To setup an RSA private key, sufficient information must
+ *                 be present for the other parameters to be derivable.
+ *
+ *                 The default implementation supports the following:
+ *                 <ul><li>Derive \p P, \p Q from \p N, \p D, \p E.</li>
+ *                 <li>Derive \p N, \p D from \p P, \p Q, \p E.</li></ul>
+ *                 Alternative implementations need not support these.
+ *
+ *                 If this function runs successfully, it guarantees that
+ *                 the RSA context can be used for RSA operations without
+ *                 the risk of failure or crash.
+ *
+ * \warning        This function need not perform consistency checks
+ *                 for the imported parameters. In particular, parameters that
+ *                 are not needed by the implementation might be silently
+ *                 discarded and left unchecked. To check the consistency
+ *                 of the key material, see mbedtls_rsa_check_privkey().
+ *
+ * \param ctx      The initialized RSA context holding imported parameters.
+ *
+ * \return         \c 0 on success.
+ * \return         #MBEDTLS_ERR_RSA_BAD_INPUT_DATA if the attempted derivations
+ *                 failed.
+ *
+ */
+int mbedtls_rsa_complete( mbedtls_rsa_context *ctx );
+
+/**
+ * \brief          This function exports the core parameters of an RSA key.
+ *
+ *                 If this function runs successfully, the non-NULL buffers
+ *                 pointed to by \p N, \p P, \p Q, \p D, and \p E are fully
+ *                 written, with additional unused space filled leading by
+ *                 zero Bytes.
+ *
+ *                 Possible reasons for returning
+ *                 #MBEDTLS_ERR_RSA_UNSUPPORTED_OPERATION:<ul>
+ *                 <li>An alternative RSA implementation is in use, which
+ *                 stores the key externally, and either cannot or should
+ *                 not export it into RAM.</li>
+ *                 <li>A SW or HW implementation might not support a certain
+ *                 deduction. For example, \p P, \p Q from \p N, \p D,
+ *                 and \p E if the former are not part of the
+ *                 implementation.</li></ul>
+ *
+ *                 If the function fails due to an unsupported operation,
+ *                 the RSA context stays intact and remains usable.
+ *
+ * \param ctx      The initialized RSA context.
+ * \param N        The MPI to hold the RSA modulus, or NULL.
+ * \param P        The MPI to hold the first prime factor of \p N, or NULL.
+ * \param Q        The MPI to hold the second prime factor of \p N, or NULL.
+ * \param D        The MPI to hold the private exponent, or NULL.
+ * \param E        The MPI to hold the public exponent, or NULL.
+ *
+ * \return         \c 0 on success.
+ * \return         #MBEDTLS_ERR_RSA_UNSUPPORTED_OPERATION if exporting the
+ *                 requested parameters cannot be done due to missing
+ *                 functionality or because of security policies.
+ * \return         A non-zero return code on any other failure.
+ *
+ */
+int mbedtls_rsa_export( const mbedtls_rsa_context *ctx,
+                        mbedtls_mpi *N, mbedtls_mpi *P, mbedtls_mpi *Q,
+                        mbedtls_mpi *D, mbedtls_mpi *E );
+
+/**
+ * \brief          This function exports core parameters of an RSA key
+ *                 in raw big-endian binary format.
+ *
+ *                 If this function runs successfully, the non-NULL buffers
+ *                 pointed to by \p N, \p P, \p Q, \p D, and \p E are fully
+ *                 written, with additional unused space filled leading by
+ *                 zero Bytes.
+ *
+ *                 Possible reasons for returning
+ *                 #MBEDTLS_ERR_RSA_UNSUPPORTED_OPERATION:<ul>
+ *                 <li>An alternative RSA implementation is in use, which
+ *                 stores the key externally, and either cannot or should
+ *                 not export it into RAM.</li>
+ *                 <li>A SW or HW implementation might not support a certain
+ *                 deduction. For example, \p P, \p Q from \p N, \p D,
+ *                 and \p E if the former are not part of the
+ *                 implementation.</li></ul>
+ *                 If the function fails due to an unsupported operation,
+ *                 the RSA context stays intact and remains usable.
+ *
+ * \note           The length parameters are ignored if the corresponding
+ *                 buffer pointers are NULL.
+ *
+ * \param ctx      The initialized RSA context.
+ * \param N        The Byte array to store the RSA modulus, or NULL.
+ * \param N_len    The size of the buffer for the modulus.
+ * \param P        The Byte array to hold the first prime factor of \p N, or
+ *                 NULL.
+ * \param P_len    The size of the buffer for the first prime factor.
+ * \param Q        The Byte array to hold the second prime factor of \p N, or
+ *                 NULL.
+ * \param Q_len    The size of the buffer for the second prime factor.
+ * \param D        The Byte array to hold the private exponent, or NULL.
+ * \param D_len    The size of the buffer for the private exponent.
+ * \param E        The Byte array to hold the public exponent, or NULL.
+ * \param E_len    The size of the buffer for the public exponent.
+ *
+ * \return         \c 0 on success.
+ * \return         #MBEDTLS_ERR_RSA_UNSUPPORTED_OPERATION if exporting the
+ *                 requested parameters cannot be done due to missing
+ *                 functionality or because of security policies.
+ * \return         A non-zero return code on any other failure.
+ */
+int mbedtls_rsa_export_raw( const mbedtls_rsa_context *ctx,
+                            unsigned char *N, size_t N_len,
+                            unsigned char *P, size_t P_len,
+                            unsigned char *Q, size_t Q_len,
+                            unsigned char *D, size_t D_len,
+                            unsigned char *E, size_t E_len );
+
+/**
+ * \brief          This function exports CRT parameters of a private RSA key.
+ *
+ * \note           Alternative RSA implementations not using CRT-parameters
+ *                 internally can implement this function based on
+ *                 mbedtls_rsa_deduce_opt().
+ *
+ * \param ctx      The initialized RSA context.
+ * \param DP       The MPI to hold D modulo P-1, or NULL.
+ * \param DQ       The MPI to hold D modulo Q-1, or NULL.
+ * \param QP       The MPI to hold modular inverse of Q modulo P, or NULL.
+ *
+ * \return         \c 0 on success.
+ * \return         A non-zero error code on failure.
+ *
+ */
+int mbedtls_rsa_export_crt( const mbedtls_rsa_context *ctx,
+                            mbedtls_mpi *DP, mbedtls_mpi *DQ, mbedtls_mpi *QP );
+
+/**
+ * \brief          This function sets padding for an already initialized RSA
+ *                 context. See mbedtls_rsa_init() for details.
+ *
+ * \param ctx      The RSA context to be set.
+ * \param padding  Selects padding mode: #MBEDTLS_RSA_PKCS_V15 or
+ *                 #MBEDTLS_RSA_PKCS_V21.
+ * \param hash_id  The #MBEDTLS_RSA_PKCS_V21 hash identifier.
+ */
+void mbedtls_rsa_set_padding( mbedtls_rsa_context *ctx, int padding,
+                              int hash_id);
+
+/**
+ * \brief          This function retrieves the length of RSA modulus in Bytes.
+ *
+ * \param ctx      The initialized RSA context.
+ *
+ * \return         The length of the RSA modulus in Bytes.
+ *
+ */
+size_t mbedtls_rsa_get_len( const mbedtls_rsa_context *ctx );
+
+/**
+ * \brief          This function generates an RSA keypair.
+ *
+ * \note           mbedtls_rsa_init() must be called before this function,
+ *                 to set up the RSA context.
+ *
+ * \param ctx      The RSA context used to hold the key.
+ * \param f_rng    The RNG function.
+ * \param p_rng    The RNG context.
+ * \param nbits    The size of the public key in bits.
+ * \param exponent The public exponent. For example, 65537.
+ *
+ * \return         \c 0 on success.
+ * \return         An \c MBEDTLS_ERR_RSA_XXX error code on failure.
+ */
+int mbedtls_rsa_gen_key( mbedtls_rsa_context *ctx,
+                         int (*f_rng)(void *, unsigned char *, size_t),
+                         void *p_rng,
+                         unsigned int nbits, int exponent );
+
+/**
+ * \brief          This function checks if a context contains at least an RSA
+ *                 public key.
+ *
+ *                 If the function runs successfully, it is guaranteed that
+ *                 enough information is present to perform an RSA public key
+ *                 operation using mbedtls_rsa_public().
+ *
+ * \param ctx      The RSA context to check.
+ *
+ * \return         \c 0 on success.
+ * \return         An \c MBEDTLS_ERR_RSA_XXX error code on failure.
+ *
+ */
+int mbedtls_rsa_check_pubkey( const mbedtls_rsa_context *ctx );
+
+/**
+ * \brief      This function checks if a context contains an RSA private key
+ *             and perform basic consistency checks.
+ *
+ * \note       The consistency checks performed by this function not only
+ *             ensure that mbedtls_rsa_private() can be called successfully
+ *             on the given context, but that the various parameters are
+ *             mutually consistent with high probability, in the sense that
+ *             mbedtls_rsa_public() and mbedtls_rsa_private() are inverses.
+ *
+ * \warning    This function should catch accidental misconfigurations
+ *             like swapping of parameters, but it cannot establish full
+ *             trust in neither the quality nor the consistency of the key
+ *             material that was used to setup the given RSA context:
+ *             <ul><li>Consistency: Imported parameters that are irrelevant
+ *             for the implementation might be silently dropped. If dropped,
+ *             the current function does not have access to them,
+ *             and therefore cannot check them. See mbedtls_rsa_complete().
+ *             If you want to check the consistency of the entire
+ *             content of an PKCS1-encoded RSA private key, for example, you
+ *             should use mbedtls_rsa_validate_params() before setting
+ *             up the RSA context.
+ *             Additionally, if the implementation performs empirical checks,
+ *             these checks substantiate but do not guarantee consistency.</li>
+ *             <li>Quality: This function is not expected to perform
+ *             extended quality assessments like checking that the prime
+ *             factors are safe. Additionally, it is the responsibility of the
+ *             user to ensure the trustworthiness of the source of his RSA
+ *             parameters, which goes beyond what is effectively checkable
+ *             by the library.</li></ul>
+ *
+ * \param ctx  The RSA context to check.
+ *
+ * \return     \c 0 on success.
+ * \return     An \c MBEDTLS_ERR_RSA_XXX error code on failure.
+ */
+int mbedtls_rsa_check_privkey( const mbedtls_rsa_context *ctx );
+
+/**
+ * \brief          This function checks a public-private RSA key pair.
+ *
+ *                 It checks each of the contexts, and makes sure they match.
+ *
+ * \param pub      The RSA context holding the public key.
+ * \param prv      The RSA context holding the private key.
+ *
+ * \return         \c 0 on success.
+ * \return         An \c MBEDTLS_ERR_RSA_XXX error code on failure.
+ */
+int mbedtls_rsa_check_pub_priv( const mbedtls_rsa_context *pub,
+                                const mbedtls_rsa_context *prv );
+
+/**
+ * \brief          This function performs an RSA public key operation.
+ *
+ * \note           This function does not handle message padding.
+ *
+ * \note           Make sure to set \p input[0] = 0 or ensure that
+ *                 input is smaller than \p N.
+ *
+ * \note           The input and output buffers must be large
+ *                 enough. For example, 128 Bytes if RSA-1024 is used.
+ *
+ * \param ctx      The RSA context.
+ * \param input    The input buffer.
+ * \param output   The output buffer.
+ *
+ * \return         \c 0 on success.
+ * \return         An \c MBEDTLS_ERR_RSA_XXX error code on failure.
+ */
+int mbedtls_rsa_public( mbedtls_rsa_context *ctx,
+                const unsigned char *input,
+                unsigned char *output );
+
+/**
+ * \brief          This function performs an RSA private key operation.
+ *
+ * \note           The input and output buffers must be large
+ *                 enough. For example, 128 Bytes if RSA-1024 is used.
+ *
+ * \note           Blinding is used if and only if a PRNG is provided.
+ *
+ * \note           If blinding is used, both the base of exponentation
+ *                 and the exponent are blinded, providing protection
+ *                 against some side-channel attacks.
+ *
+ * \warning        It is deprecated and a security risk to not provide
+ *                 a PRNG here and thereby prevent the use of blinding.
+ *                 Future versions of the library may enforce the presence
+ *                 of a PRNG.
+ *
+ * \param ctx      The RSA context.
+ * \param f_rng    The RNG function. Needed for blinding.
+ * \param p_rng    The RNG context.
+ * \param input    The input buffer.
+ * \param output   The output buffer.
+ *
+ * \return         \c 0 on success.
+ * \return         An \c MBEDTLS_ERR_RSA_XXX error code on failure.
+ *
+ */
+int mbedtls_rsa_private( mbedtls_rsa_context *ctx,
+                 int (*f_rng)(void *, unsigned char *, size_t),
+                 void *p_rng,
+                 const unsigned char *input,
+                 unsigned char *output );
+
+/**
+ * \brief          This function adds the message padding, then performs an RSA
+ *                 operation.
+ *
+ *                 It is the generic wrapper for performing a PKCS#1 encryption
+ *                 operation using the \p mode from the context.
+ *
+ * \note           The input and output buffers must be as large as the size
+ *                 of \p ctx->N. For example, 128 Bytes if RSA-1024 is used.
+ *
+ * \deprecated     It is deprecated and discouraged to call this function
+ *                 in #MBEDTLS_RSA_PRIVATE mode. Future versions of the library
+ *                 are likely to remove the \p mode argument and have it
+ *                 implicitly set to #MBEDTLS_RSA_PUBLIC.
+ *
+ * \note           Alternative implementations of RSA need not support
+ *                 mode being set to #MBEDTLS_RSA_PRIVATE and might instead
+ *                 return #MBEDTLS_ERR_RSA_UNSUPPORTED_OPERATION.
+ *
+ * \param ctx      The RSA context.
+ * \param f_rng    The RNG function. Needed for padding, PKCS#1 v2.1
+ *                 encoding, and #MBEDTLS_RSA_PRIVATE.
+ * \param p_rng    The RNG context.
+ * \param mode     #MBEDTLS_RSA_PUBLIC or #MBEDTLS_RSA_PRIVATE.
+ * \param ilen     The length of the plaintext.
+ * \param input    The buffer holding the data to encrypt.
+ * \param output   The buffer used to hold the ciphertext.
+ *
+ * \return         \c 0 on success.
+ * \return         An \c MBEDTLS_ERR_RSA_XXX error code on failure.
+ */
+int mbedtls_rsa_pkcs1_encrypt( mbedtls_rsa_context *ctx,
+                       int (*f_rng)(void *, unsigned char *, size_t),
+                       void *p_rng,
+                       int mode, size_t ilen,
+                       const unsigned char *input,
+                       unsigned char *output );
+
+/**
+ * \brief          This function performs a PKCS#1 v1.5 encryption operation
+ *                 (RSAES-PKCS1-v1_5-ENCRYPT).
+ *
+ * \note           The output buffer must be as large as the size
+ *                 of \p ctx->N. For example, 128 Bytes if RSA-1024 is used.
+ *
+ * \deprecated     It is deprecated and discouraged to call this function
+ *                 in #MBEDTLS_RSA_PRIVATE mode. Future versions of the library
+ *                 are likely to remove the \p mode argument and have it
+ *                 implicitly set to #MBEDTLS_RSA_PUBLIC.
+ *
+ * \note           Alternative implementations of RSA need not support
+ *                 mode being set to #MBEDTLS_RSA_PRIVATE and might instead
+ *                 return #MBEDTLS_ERR_RSA_UNSUPPORTED_OPERATION.
+ *
+ * \param ctx      The RSA context.
+ * \param f_rng    The RNG function. Needed for padding and
+ *                 #MBEDTLS_RSA_PRIVATE.
+ * \param p_rng    The RNG context.
+ * \param mode     #MBEDTLS_RSA_PUBLIC or #MBEDTLS_RSA_PRIVATE.
+ * \param ilen     The length of the plaintext.
+ * \param input    The buffer holding the data to encrypt.
+ * \param output   The buffer used to hold the ciphertext.
+ *
+ * \return         \c 0 on success.
+ * \return         An \c MBEDTLS_ERR_RSA_XXX error code on failure.
+ */
+int mbedtls_rsa_rsaes_pkcs1_v15_encrypt( mbedtls_rsa_context *ctx,
+                                 int (*f_rng)(void *, unsigned char *, size_t),
+                                 void *p_rng,
+                                 int mode, size_t ilen,
+                                 const unsigned char *input,
+                                 unsigned char *output );
+
+/**
+ * \brief            This function performs a PKCS#1 v2.1 OAEP encryption
+ *                   operation (RSAES-OAEP-ENCRYPT).
+ *
+ * \note             The output buffer must be as large as the size
+ *                   of ctx->N. For example, 128 Bytes if RSA-1024 is used.
+ *
+ * \deprecated       It is deprecated and discouraged to call this function
+ *                   in #MBEDTLS_RSA_PRIVATE mode. Future versions of the library
+ *                   are likely to remove the \p mode argument and have it
+ *                   implicitly set to #MBEDTLS_RSA_PUBLIC.
+ *
+ * \note             Alternative implementations of RSA need not support
+ *                   mode being set to #MBEDTLS_RSA_PRIVATE and might instead
+ *                   return #MBEDTLS_ERR_RSA_UNSUPPORTED_OPERATION.
+ *
+ * \param ctx        The RSA context.
+ * \param f_rng      The RNG function. Needed for padding and PKCS#1 v2.1
+ *                   encoding and #MBEDTLS_RSA_PRIVATE.
+ * \param p_rng      The RNG context.
+ * \param mode       #MBEDTLS_RSA_PUBLIC or #MBEDTLS_RSA_PRIVATE.
+ * \param label      The buffer holding the custom label to use.
+ * \param label_len  The length of the label.
+ * \param ilen       The length of the plaintext.
+ * \param input      The buffer holding the data to encrypt.
+ * \param output     The buffer used to hold the ciphertext.
+ *
+ * \return           \c 0 on success.
+ * \return           An \c MBEDTLS_ERR_RSA_XXX error code on failure.
+ */
+int mbedtls_rsa_rsaes_oaep_encrypt( mbedtls_rsa_context *ctx,
+                            int (*f_rng)(void *, unsigned char *, size_t),
+                            void *p_rng,
+                            int mode,
+                            const unsigned char *label, size_t label_len,
+                            size_t ilen,
+                            const unsigned char *input,
+                            unsigned char *output );
+
+/**
+ * \brief          This function performs an RSA operation, then removes the
+ *                 message padding.
+ *
+ *                 It is the generic wrapper for performing a PKCS#1 decryption
+ *                 operation using the \p mode from the context.
+ *
+ * \note           The output buffer length \c output_max_len should be
+ *                 as large as the size \p ctx->len of \p ctx->N (for example,
+ *                 128 Bytes if RSA-1024 is used) to be able to hold an
+ *                 arbitrary decrypted message. If it is not large enough to
+ *                 hold the decryption of the particular ciphertext provided,
+ *                 the function returns \c MBEDTLS_ERR_RSA_OUTPUT_TOO_LARGE.
+ *
+ * \note           The input buffer must be as large as the size
+ *                 of \p ctx->N. For example, 128 Bytes if RSA-1024 is used.
+ *
+ * \deprecated     It is deprecated and discouraged to call this function
+ *                 in #MBEDTLS_RSA_PUBLIC mode. Future versions of the library
+ *                 are likely to remove the \p mode argument and have it
+ *                 implicitly set to #MBEDTLS_RSA_PRIVATE.
+ *
+ * \note           Alternative implementations of RSA need not support
+ *                 mode being set to #MBEDTLS_RSA_PUBLIC and might instead
+ *                 return #MBEDTLS_ERR_RSA_UNSUPPORTED_OPERATION.
+ *
+ * \param ctx      The RSA context.
+ * \param f_rng    The RNG function. Only needed for #MBEDTLS_RSA_PRIVATE.
+ * \param p_rng    The RNG context.
+ * \param mode     #MBEDTLS_RSA_PUBLIC or #MBEDTLS_RSA_PRIVATE.
+ * \param olen     The length of the plaintext.
+ * \param input    The buffer holding the encrypted data.
+ * \param output   The buffer used to hold the plaintext.
+ * \param output_max_len    The maximum length of the output buffer.
+ *
+ * \return         \c 0 on success.
+ * \return         An \c MBEDTLS_ERR_RSA_XXX error code on failure.
+ */
+int mbedtls_rsa_pkcs1_decrypt( mbedtls_rsa_context *ctx,
+                       int (*f_rng)(void *, unsigned char *, size_t),
+                       void *p_rng,
+                       int mode, size_t *olen,
+                       const unsigned char *input,
+                       unsigned char *output,
+                       size_t output_max_len );
+
+/**
+ * \brief          This function performs a PKCS#1 v1.5 decryption
+ *                 operation (RSAES-PKCS1-v1_5-DECRYPT).
+ *
+ * \note           The output buffer length \c output_max_len should be
+ *                 as large as the size \p ctx->len of \p ctx->N, for example,
+ *                 128 Bytes if RSA-1024 is used, to be able to hold an
+ *                 arbitrary decrypted message. If it is not large enough to
+ *                 hold the decryption of the particular ciphertext provided,
+ *                 the function returns #MBEDTLS_ERR_RSA_OUTPUT_TOO_LARGE.
+ *
+ * \note           The input buffer must be as large as the size
+ *                 of \p ctx->N. For example, 128 Bytes if RSA-1024 is used.
+ *
+ * \deprecated     It is deprecated and discouraged to call this function
+ *                 in #MBEDTLS_RSA_PUBLIC mode. Future versions of the library
+ *                 are likely to remove the \p mode argument and have it
+ *                 implicitly set to #MBEDTLS_RSA_PRIVATE.
+ *
+ * \note           Alternative implementations of RSA need not support
+ *                 mode being set to #MBEDTLS_RSA_PUBLIC and might instead
+ *                 return #MBEDTLS_ERR_RSA_UNSUPPORTED_OPERATION.
+ *
+ * \param ctx      The RSA context.
+ * \param f_rng    The RNG function. Only needed for #MBEDTLS_RSA_PRIVATE.
+ * \param p_rng    The RNG context.
+ * \param mode     #MBEDTLS_RSA_PUBLIC or #MBEDTLS_RSA_PRIVATE.
+ * \param olen     The length of the plaintext.
+ * \param input    The buffer holding the encrypted data.
+ * \param output   The buffer to hold the plaintext.
+ * \param output_max_len    The maximum length of the output buffer.
+ *
+ * \return         \c 0 on success.
+ * \return         An \c MBEDTLS_ERR_RSA_XXX error code on failure.
+ *
+ */
+int mbedtls_rsa_rsaes_pkcs1_v15_decrypt( mbedtls_rsa_context *ctx,
+                                 int (*f_rng)(void *, unsigned char *, size_t),
+                                 void *p_rng,
+                                 int mode, size_t *olen,
+                                 const unsigned char *input,
+                                 unsigned char *output,
+                                 size_t output_max_len );
+
+/**
+ * \brief            This function performs a PKCS#1 v2.1 OAEP decryption
+ *                   operation (RSAES-OAEP-DECRYPT).
+ *
+ * \note             The output buffer length \c output_max_len should be
+ *                   as large as the size \p ctx->len of \p ctx->N, for
+ *                   example, 128 Bytes if RSA-1024 is used, to be able to
+ *                   hold an arbitrary decrypted message. If it is not
+ *                   large enough to hold the decryption of the particular
+ *                   ciphertext provided, the function returns
+ *                   #MBEDTLS_ERR_RSA_OUTPUT_TOO_LARGE.
+ *
+ * \note             The input buffer must be as large as the size
+ *                   of \p ctx->N. For example, 128 Bytes if RSA-1024 is used.
+ *
+ * \deprecated       It is deprecated and discouraged to call this function
+ *                   in #MBEDTLS_RSA_PUBLIC mode. Future versions of the library
+ *                   are likely to remove the \p mode argument and have it
+ *                   implicitly set to #MBEDTLS_RSA_PRIVATE.
+ *
+ * \note             Alternative implementations of RSA need not support
+ *                   mode being set to #MBEDTLS_RSA_PUBLIC and might instead
+ *                   return #MBEDTLS_ERR_RSA_UNSUPPORTED_OPERATION.
+ *
+ * \param ctx        The RSA context.
+ * \param f_rng      The RNG function. Only needed for #MBEDTLS_RSA_PRIVATE.
+ * \param p_rng      The RNG context.
+ * \param mode       #MBEDTLS_RSA_PUBLIC or #MBEDTLS_RSA_PRIVATE.
+ * \param label      The buffer holding the custom label to use.
+ * \param label_len  The length of the label.
+ * \param olen       The length of the plaintext.
+ * \param input      The buffer holding the encrypted data.
+ * \param output     The buffer to hold the plaintext.
+ * \param output_max_len    The maximum length of the output buffer.
+ *
+ * \return         \c 0 on success.
+ * \return         An \c MBEDTLS_ERR_RSA_XXX error code on failure.
+ */
+int mbedtls_rsa_rsaes_oaep_decrypt( mbedtls_rsa_context *ctx,
+                            int (*f_rng)(void *, unsigned char *, size_t),
+                            void *p_rng,
+                            int mode,
+                            const unsigned char *label, size_t label_len,
+                            size_t *olen,
+                            const unsigned char *input,
+                            unsigned char *output,
+                            size_t output_max_len );
+
+/**
+ * \brief          This function performs a private RSA operation to sign
+ *                 a message digest using PKCS#1.
+ *
+ *                 It is the generic wrapper for performing a PKCS#1
+ *                 signature using the \p mode from the context.
+ *
+ * \note           The \p sig buffer must be as large as the size
+ *                 of \p ctx->N. For example, 128 Bytes if RSA-1024 is used.
+ *
+ * \note           For PKCS#1 v2.1 encoding, see comments on
+ *                 mbedtls_rsa_rsassa_pss_sign() for details on
+ *                 \p md_alg and \p hash_id.
+ *
+ * \deprecated     It is deprecated and discouraged to call this function
+ *                 in #MBEDTLS_RSA_PUBLIC mode. Future versions of the library
+ *                 are likely to remove the \p mode argument and have it
+ *                 implicitly set to #MBEDTLS_RSA_PRIVATE.
+ *
+ * \note           Alternative implementations of RSA need not support
+ *                 mode being set to #MBEDTLS_RSA_PUBLIC and might instead
+ *                 return #MBEDTLS_ERR_RSA_UNSUPPORTED_OPERATION.
+ *
+ * \param ctx      The RSA context.
+ * \param f_rng    The RNG function. Needed for PKCS#1 v2.1 encoding and for
+ *                 #MBEDTLS_RSA_PRIVATE.
+ * \param p_rng    The RNG context.
+ * \param mode     #MBEDTLS_RSA_PUBLIC or #MBEDTLS_RSA_PRIVATE.
+ * \param md_alg   The message-digest algorithm used to hash the original data.
+ *                 Use #MBEDTLS_MD_NONE for signing raw data.
+ * \param hashlen  The length of the message digest. Only used if \p md_alg is #MBEDTLS_MD_NONE.
+ * \param hash     The buffer holding the message digest.
+ * \param sig      The buffer to hold the ciphertext.
+ *
+ * \return         \c 0 if the signing operation was successful.
+ * \return         An \c MBEDTLS_ERR_RSA_XXX error code on failure.
+ */
+int mbedtls_rsa_pkcs1_sign( mbedtls_rsa_context *ctx,
+                    int (*f_rng)(void *, unsigned char *, size_t),
+                    void *p_rng,
+                    int mode,
+                    mbedtls_md_type_t md_alg,
+                    unsigned int hashlen,
+                    const unsigned char *hash,
+                    unsigned char *sig );
+
+/**
+ * \brief          This function performs a PKCS#1 v1.5 signature
+ *                 operation (RSASSA-PKCS1-v1_5-SIGN).
+ *
+ * \note           The \p sig buffer must be as large as the size
+ *                 of \p ctx->N. For example, 128 Bytes if RSA-1024 is used.
+ *
+ * \deprecated     It is deprecated and discouraged to call this function
+ *                 in #MBEDTLS_RSA_PUBLIC mode. Future versions of the library
+ *                 are likely to remove the \p mode argument and have it
+ *                 implicitly set to #MBEDTLS_RSA_PRIVATE.
+ *
+ * \note           Alternative implementations of RSA need not support
+ *                 mode being set to #MBEDTLS_RSA_PUBLIC and might instead
+ *                 return #MBEDTLS_ERR_RSA_UNSUPPORTED_OPERATION.
+ *
+ * \param ctx      The RSA context.
+ * \param f_rng    The RNG function. Only needed for #MBEDTLS_RSA_PRIVATE.
+ * \param p_rng    The RNG context.
+ * \param mode     #MBEDTLS_RSA_PUBLIC or #MBEDTLS_RSA_PRIVATE.
+ * \param md_alg   The message-digest algorithm used to hash the original data.
+ *                 Use #MBEDTLS_MD_NONE for signing raw data.
+ * \param hashlen  The length of the message digest. Only used if \p md_alg is #MBEDTLS_MD_NONE.
+ * \param hash     The buffer holding the message digest.
+ * \param sig      The buffer to hold the ciphertext.
+ *
+ * \return         \c 0 if the signing operation was successful.
+ * \return         An \c MBEDTLS_ERR_RSA_XXX error code on failure.
+ */
+int mbedtls_rsa_rsassa_pkcs1_v15_sign( mbedtls_rsa_context *ctx,
+                               int (*f_rng)(void *, unsigned char *, size_t),
+                               void *p_rng,
+                               int mode,
+                               mbedtls_md_type_t md_alg,
+                               unsigned int hashlen,
+                               const unsigned char *hash,
+                               unsigned char *sig );
+
+/**
+ * \brief          This function performs a PKCS#1 v2.1 PSS signature
+ *                 operation (RSASSA-PSS-SIGN).
+ *
+ * \note           The \p sig buffer must be as large as the size
+ *                 of \p ctx->N. For example, 128 Bytes if RSA-1024 is used.
+ *
+ * \note           The \p hash_id in the RSA context is the one used for the
+ *                 encoding. \p md_alg in the function call is the type of hash
+ *                 that is encoded. According to <em>RFC-3447: Public-Key
+ *                 Cryptography Standards (PKCS) #1 v2.1: RSA Cryptography
+ *                 Specifications</em> it is advised to keep both hashes the
+ *                 same.
+ *
+ * \deprecated     It is deprecated and discouraged to call this function
+ *                 in #MBEDTLS_RSA_PUBLIC mode. Future versions of the library
+ *                 are likely to remove the \p mode argument and have it
+ *                 implicitly set to #MBEDTLS_RSA_PRIVATE.
+ *
+ * \note           Alternative implementations of RSA need not support
+ *                 mode being set to #MBEDTLS_RSA_PUBLIC and might instead
+ *                 return #MBEDTLS_ERR_RSA_UNSUPPORTED_OPERATION.
+ *
+ * \param ctx      The RSA context.
+ * \param f_rng    The RNG function. Needed for PKCS#1 v2.1 encoding and for
+ *                 #MBEDTLS_RSA_PRIVATE.
+ * \param p_rng    The RNG context.
+ * \param mode     #MBEDTLS_RSA_PUBLIC or #MBEDTLS_RSA_PRIVATE.
+ * \param md_alg   The message-digest algorithm used to hash the original data.
+ *                 Use #MBEDTLS_MD_NONE for signing raw data.
+ * \param hashlen  The length of the message digest. Only used if \p md_alg is #MBEDTLS_MD_NONE.
+ * \param hash     The buffer holding the message digest.
+ * \param sig      The buffer to hold the ciphertext.
+ *
+ * \return         \c 0 if the signing operation was successful.
+ * \return         An \c MBEDTLS_ERR_RSA_XXX error code on failure.
+ */
+int mbedtls_rsa_rsassa_pss_sign( mbedtls_rsa_context *ctx,
+                         int (*f_rng)(void *, unsigned char *, size_t),
+                         void *p_rng,
+                         int mode,
+                         mbedtls_md_type_t md_alg,
+                         unsigned int hashlen,
+                         const unsigned char *hash,
+                         unsigned char *sig );
+
+/**
+ * \brief          This function performs a public RSA operation and checks
+ *                 the message digest.
+ *
+ *                 This is the generic wrapper for performing a PKCS#1
+ *                 verification using the mode from the context.
+ *
+ * \note           The \p sig buffer must be as large as the size
+ *                 of \p ctx->N. For example, 128 Bytes if RSA-1024 is used.
+ *
+ * \note           For PKCS#1 v2.1 encoding, see comments on
+ *                 mbedtls_rsa_rsassa_pss_verify() about \p md_alg and
+ *                 \p hash_id.
+ *
+ * \deprecated     It is deprecated and discouraged to call this function
+ *                 in #MBEDTLS_RSA_PRIVATE mode. Future versions of the library
+ *                 are likely to remove the \p mode argument and have it
+ *                 set to #MBEDTLS_RSA_PUBLIC.
+ *
+ * \note           Alternative implementations of RSA need not support
+ *                 mode being set to #MBEDTLS_RSA_PRIVATE and might instead
+ *                 return #MBEDTLS_ERR_RSA_UNSUPPORTED_OPERATION.
+ *
+ * \param ctx      The RSA public key context.
+ * \param f_rng    The RNG function. Only needed for #MBEDTLS_RSA_PRIVATE.
+ * \param p_rng    The RNG context.
+ * \param mode     #MBEDTLS_RSA_PUBLIC or #MBEDTLS_RSA_PRIVATE.
+ * \param md_alg   The message-digest algorithm used to hash the original data.
+ *                 Use #MBEDTLS_MD_NONE for signing raw data.
+ * \param hashlen  The length of the message digest. Only used if \p md_alg is #MBEDTLS_MD_NONE.
+ * \param hash     The buffer holding the message digest.
+ * \param sig      The buffer holding the ciphertext.
+ *
+ * \return         \c 0 if the verify operation was successful.
+ * \return         An \c MBEDTLS_ERR_RSA_XXX error code on failure.
+ */
+int mbedtls_rsa_pkcs1_verify( mbedtls_rsa_context *ctx,
+                      int (*f_rng)(void *, unsigned char *, size_t),
+                      void *p_rng,
+                      int mode,
+                      mbedtls_md_type_t md_alg,
+                      unsigned int hashlen,
+                      const unsigned char *hash,
+                      const unsigned char *sig );
+
+/**
+ * \brief          This function performs a PKCS#1 v1.5 verification
+ *                 operation (RSASSA-PKCS1-v1_5-VERIFY).
+ *
+ * \note           The \p sig buffer must be as large as the size
+ *                 of \p ctx->N. For example, 128 Bytes if RSA-1024 is used.
+ *
+ * \deprecated     It is deprecated and discouraged to call this function
+ *                 in #MBEDTLS_RSA_PRIVATE mode. Future versions of the library
+ *                 are likely to remove the \p mode argument and have it
+ *                 set to #MBEDTLS_RSA_PUBLIC.
+ *
+ * \note           Alternative implementations of RSA need not support
+ *                 mode being set to #MBEDTLS_RSA_PRIVATE and might instead
+ *                 return #MBEDTLS_ERR_RSA_UNSUPPORTED_OPERATION.
+ *
+ * \param ctx      The RSA public key context.
+ * \param f_rng    The RNG function. Only needed for #MBEDTLS_RSA_PRIVATE.
+ * \param p_rng    The RNG context.
+ * \param mode     #MBEDTLS_RSA_PUBLIC or #MBEDTLS_RSA_PRIVATE.
+ * \param md_alg   The message-digest algorithm used to hash the original data.
+ *                 Use #MBEDTLS_MD_NONE for signing raw data.
+ * \param hashlen  The length of the message digest. Only used if \p md_alg is #MBEDTLS_MD_NONE.
+ * \param hash     The buffer holding the message digest.
+ * \param sig      The buffer holding the ciphertext.
+ *
+ * \return         \c 0 if the verify operation was successful.
+ * \return         An \c MBEDTLS_ERR_RSA_XXX error code on failure.
+ */
+int mbedtls_rsa_rsassa_pkcs1_v15_verify( mbedtls_rsa_context *ctx,
+                                 int (*f_rng)(void *, unsigned char *, size_t),
+                                 void *p_rng,
+                                 int mode,
+                                 mbedtls_md_type_t md_alg,
+                                 unsigned int hashlen,
+                                 const unsigned char *hash,
+                                 const unsigned char *sig );
+
+/**
+ * \brief          This function performs a PKCS#1 v2.1 PSS verification
+ *                 operation (RSASSA-PSS-VERIFY).
+ *
+ *                 The hash function for the MGF mask generating function
+ *                 is that specified in the RSA context.
+ *
+ * \note           The \p sig buffer must be as large as the size
+ *                 of \p ctx->N. For example, 128 Bytes if RSA-1024 is used.
+ *
+ * \note           The \p hash_id in the RSA context is the one used for the
+ *                 verification. \p md_alg in the function call is the type of
+ *                 hash that is verified. According to <em>RFC-3447: Public-Key
+ *                 Cryptography Standards (PKCS) #1 v2.1: RSA Cryptography
+ *                 Specifications</em> it is advised to keep both hashes the
+ *                 same. If \p hash_id in the RSA context is unset,
+ *                 the \p md_alg from the function call is used.
+ *
+ * \deprecated     It is deprecated and discouraged to call this function
+ *                 in #MBEDTLS_RSA_PRIVATE mode. Future versions of the library
+ *                 are likely to remove the \p mode argument and have it
+ *                 implicitly set to #MBEDTLS_RSA_PUBLIC.
+ *
+ * \note           Alternative implementations of RSA need not support
+ *                 mode being set to #MBEDTLS_RSA_PRIVATE and might instead
+ *                 return #MBEDTLS_ERR_RSA_UNSUPPORTED_OPERATION.
+ *
+ * \param ctx      The RSA public key context.
+ * \param f_rng    The RNG function. Only needed for #MBEDTLS_RSA_PRIVATE.
+ * \param p_rng    The RNG context.
+ * \param mode     #MBEDTLS_RSA_PUBLIC or #MBEDTLS_RSA_PRIVATE.
+ * \param md_alg   The message-digest algorithm used to hash the original data.
+ *                 Use #MBEDTLS_MD_NONE for signing raw data.
+ * \param hashlen  The length of the message digest. Only used if \p md_alg is #MBEDTLS_MD_NONE.
+ * \param hash     The buffer holding the message digest.
+ * \param sig      The buffer holding the ciphertext.
+ *
+ * \return         \c 0 if the verify operation was successful.
+ * \return         An \c MBEDTLS_ERR_RSA_XXX error code on failure.
+ */
+int mbedtls_rsa_rsassa_pss_verify( mbedtls_rsa_context *ctx,
+                           int (*f_rng)(void *, unsigned char *, size_t),
+                           void *p_rng,
+                           int mode,
+                           mbedtls_md_type_t md_alg,
+                           unsigned int hashlen,
+                           const unsigned char *hash,
+                           const unsigned char *sig );
+
+/**
+ * \brief          This function performs a PKCS#1 v2.1 PSS verification
+ *                 operation (RSASSA-PSS-VERIFY).
+ *
+ *                 The hash function for the MGF mask generating function
+ *                 is that specified in \p mgf1_hash_id.
+ *
+ * \note           The \p sig buffer must be as large as the size
+ *                 of \p ctx->N. For example, 128 Bytes if RSA-1024 is used.
+ *
+ * \note           The \p hash_id in the RSA context is ignored.
+ *
+ * \param ctx      The RSA public key context.
+ * \param f_rng    The RNG function. Only needed for #MBEDTLS_RSA_PRIVATE.
+ * \param p_rng    The RNG context.
+ * \param mode     #MBEDTLS_RSA_PUBLIC or #MBEDTLS_RSA_PRIVATE.
+ * \param md_alg   The message-digest algorithm used to hash the original data.
+ *                 Use #MBEDTLS_MD_NONE for signing raw data.
+ * \param hashlen  The length of the message digest. Only used if \p md_alg is
+ *                 #MBEDTLS_MD_NONE.
+ * \param hash     The buffer holding the message digest.
+ * \param mgf1_hash_id       The message digest used for mask generation.
+ * \param expected_salt_len  The length of the salt used in padding. Use
+ *                           #MBEDTLS_RSA_SALT_LEN_ANY to accept any salt length.
+ * \param sig      The buffer holding the ciphertext.
+ *
+ * \return         \c 0 if the verify operation was successful.
+ * \return         An \c MBEDTLS_ERR_RSA_XXX error code on failure.
+ */
+int mbedtls_rsa_rsassa_pss_verify_ext( mbedtls_rsa_context *ctx,
+                               int (*f_rng)(void *, unsigned char *, size_t),
+                               void *p_rng,
+                               int mode,
+                               mbedtls_md_type_t md_alg,
+                               unsigned int hashlen,
+                               const unsigned char *hash,
+                               mbedtls_md_type_t mgf1_hash_id,
+                               int expected_salt_len,
+                               const unsigned char *sig );
+
+/**
+ * \brief          This function copies the components of an RSA context.
+ *
+ * \param dst      The destination context.
+ * \param src      The source context.
+ *
+ * \return         \c 0 on success.
+ * \return         #MBEDTLS_ERR_MPI_ALLOC_FAILED on memory allocation failure.
+ */
+int mbedtls_rsa_copy( mbedtls_rsa_context *dst, const mbedtls_rsa_context *src );
+
+/**
+ * \brief          This function frees the components of an RSA key.
+ *
+ * \param ctx      The RSA Context to free.
+ */
+void mbedtls_rsa_free( mbedtls_rsa_context *ctx );
+
+/**
+ * \brief          The RSA checkup routine.
+ *
+ * \return         \c 0 on success.
+ * \return         \c 1 on failure.
+ */
+int mbedtls_rsa_self_test( int verbose );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* rsa.h */
diff --git a/common/mbedtls/rsa_internal.c b/common/mbedtls/rsa_internal.c
new file mode 100644
index 000000000..36c37f893
--- /dev/null
+++ b/common/mbedtls/rsa_internal.c
@@ -0,0 +1,489 @@
+/*
+ *  Helper functions for the RSA module
+ *
+ *  Copyright (C) 2006-2017, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ *
+ */
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "mbedtls/config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#if defined(MBEDTLS_RSA_C)
+
+#include "mbedtls/rsa.h"
+#include "mbedtls/bignum.h"
+#include "mbedtls/rsa_internal.h"
+
+/*
+ * Compute RSA prime factors from public and private exponents
+ *
+ * Summary of algorithm:
+ * Setting F := lcm(P-1,Q-1), the idea is as follows:
+ *
+ * (a) For any 1 <= X < N with gcd(X,N)=1, we have X^F = 1 modulo N, so X^(F/2)
+ *     is a square root of 1 in Z/NZ. Since Z/NZ ~= Z/PZ x Z/QZ by CRT and the
+ *     square roots of 1 in Z/PZ and Z/QZ are +1 and -1, this leaves the four
+ *     possibilities X^(F/2) = (+-1, +-1). If it happens that X^(F/2) = (-1,+1)
+ *     or (+1,-1), then gcd(X^(F/2) + 1, N) will be equal to one of the prime
+ *     factors of N.
+ *
+ * (b) If we don't know F/2 but (F/2) * K for some odd (!) K, then the same
+ *     construction still applies since (-)^K is the identity on the set of
+ *     roots of 1 in Z/NZ.
+ *
+ * The public and private key primitives (-)^E and (-)^D are mutually inverse
+ * bijections on Z/NZ if and only if (-)^(DE) is the identity on Z/NZ, i.e.
+ * if and only if DE - 1 is a multiple of F, say DE - 1 = F * L.
+ * Splitting L = 2^t * K with K odd, we have
+ *
+ *   DE - 1 = FL = (F/2) * (2^(t+1)) * K,
+ *
+ * so (F / 2) * K is among the numbers
+ *
+ *   (DE - 1) >> 1, (DE - 1) >> 2, ..., (DE - 1) >> ord
+ *
+ * where ord is the order of 2 in (DE - 1).
+ * We can therefore iterate through these numbers apply the construction
+ * of (a) and (b) above to attempt to factor N.
+ *
+ */
+int mbedtls_rsa_deduce_primes( mbedtls_mpi const *N,
+                     mbedtls_mpi const *E, mbedtls_mpi const *D,
+                     mbedtls_mpi *P, mbedtls_mpi *Q )
+{
+    int ret = 0;
+
+    uint16_t attempt;  /* Number of current attempt  */
+    uint16_t iter;     /* Number of squares computed in the current attempt */
+
+    uint16_t order;    /* Order of 2 in DE - 1 */
+
+    mbedtls_mpi T;  /* Holds largest odd divisor of DE - 1     */
+    mbedtls_mpi K;  /* Temporary holding the current candidate */
+
+    const unsigned char primes[] = { 2,
+           3,    5,    7,   11,   13,   17,   19,   23,
+          29,   31,   37,   41,   43,   47,   53,   59,
+          61,   67,   71,   73,   79,   83,   89,   97,
+         101,  103,  107,  109,  113,  127,  131,  137,
+         139,  149,  151,  157,  163,  167,  173,  179,
+         181,  191,  193,  197,  199,  211,  223,  227,
+         229,  233,  239,  241,  251
+    };
+
+    const size_t num_primes = sizeof( primes ) / sizeof( *primes );
+
+    if( P == NULL || Q == NULL || P->p != NULL || Q->p != NULL )
+        return( MBEDTLS_ERR_MPI_BAD_INPUT_DATA );
+
+    if( mbedtls_mpi_cmp_int( N, 0 ) <= 0 ||
+        mbedtls_mpi_cmp_int( D, 1 ) <= 0 ||
+        mbedtls_mpi_cmp_mpi( D, N ) >= 0 ||
+        mbedtls_mpi_cmp_int( E, 1 ) <= 0 ||
+        mbedtls_mpi_cmp_mpi( E, N ) >= 0 )
+    {
+        return( MBEDTLS_ERR_MPI_BAD_INPUT_DATA );
+    }
+
+    /*
+     * Initializations and temporary changes
+     */
+
+    mbedtls_mpi_init( &K );
+    mbedtls_mpi_init( &T );
+
+    /* T := DE - 1 */
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &T, D,  E ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_sub_int( &T, &T, 1 ) );
+
+    if( ( order = (uint16_t) mbedtls_mpi_lsb( &T ) ) == 0 )
+    {
+        ret = MBEDTLS_ERR_MPI_BAD_INPUT_DATA;
+        goto cleanup;
+    }
+
+    /* After this operation, T holds the largest odd divisor of DE - 1. */
+    MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &T, order ) );
+
+    /*
+     * Actual work
+     */
+
+    /* Skip trying 2 if N == 1 mod 8 */
+    attempt = 0;
+    if( N->p[0] % 8 == 1 )
+        attempt = 1;
+
+    for( ; attempt < num_primes; ++attempt )
+    {
+        mbedtls_mpi_lset( &K, primes[attempt] );
+
+        /* Check if gcd(K,N) = 1 */
+        MBEDTLS_MPI_CHK( mbedtls_mpi_gcd( P, &K, N ) );
+        if( mbedtls_mpi_cmp_int( P, 1 ) != 0 )
+            continue;
+
+        /* Go through K^T + 1, K^(2T) + 1, K^(4T) + 1, ...
+         * and check whether they have nontrivial GCD with N. */
+        MBEDTLS_MPI_CHK( mbedtls_mpi_exp_mod( &K, &K, &T, N,
+                             Q /* temporarily use Q for storing Montgomery
+                                * multiplication helper values */ ) );
+
+        for( iter = 1; iter <= order; ++iter )
+        {
+            /* If we reach 1 prematurely, there's no point
+             * in continuing to square K */
+            if( mbedtls_mpi_cmp_int( &K, 1 ) == 0 )
+                break;
+
+            MBEDTLS_MPI_CHK( mbedtls_mpi_add_int( &K, &K, 1 ) );
+            MBEDTLS_MPI_CHK( mbedtls_mpi_gcd( P, &K, N ) );
+
+            if( mbedtls_mpi_cmp_int( P, 1 ) ==  1 &&
+                mbedtls_mpi_cmp_mpi( P, N ) == -1 )
+            {
+                /*
+                 * Have found a nontrivial divisor P of N.
+                 * Set Q := N / P.
+                 */
+
+                MBEDTLS_MPI_CHK( mbedtls_mpi_div_mpi( Q, NULL, N, P ) );
+                goto cleanup;
+            }
+
+            MBEDTLS_MPI_CHK( mbedtls_mpi_sub_int( &K, &K, 1 ) );
+            MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &K, &K, &K ) );
+            MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi( &K, &K, N ) );
+        }
+
+        /*
+         * If we get here, then either we prematurely aborted the loop because
+         * we reached 1, or K holds primes[attempt]^(DE - 1) mod N, which must
+         * be 1 if D,E,N were consistent.
+         * Check if that's the case and abort if not, to avoid very long,
+         * yet eventually failing, computations if N,D,E were not sane.
+         */
+        if( mbedtls_mpi_cmp_int( &K, 1 ) != 0 )
+        {
+            break;
+        }
+    }
+
+    ret = MBEDTLS_ERR_MPI_BAD_INPUT_DATA;
+
+cleanup:
+
+    mbedtls_mpi_free( &K );
+    mbedtls_mpi_free( &T );
+    return( ret );
+}
+
+/*
+ * Given P, Q and the public exponent E, deduce D.
+ * This is essentially a modular inversion.
+ */
+int mbedtls_rsa_deduce_private_exponent( mbedtls_mpi const *P,
+                                         mbedtls_mpi const *Q,
+                                         mbedtls_mpi const *E,
+                                         mbedtls_mpi *D )
+{
+    int ret = 0;
+    mbedtls_mpi K, L;
+
+    if( D == NULL || mbedtls_mpi_cmp_int( D, 0 ) != 0 )
+        return( MBEDTLS_ERR_MPI_BAD_INPUT_DATA );
+
+    if( mbedtls_mpi_cmp_int( P, 1 ) <= 0 ||
+        mbedtls_mpi_cmp_int( Q, 1 ) <= 0 ||
+        mbedtls_mpi_cmp_int( E, 0 ) == 0 )
+    {
+        return( MBEDTLS_ERR_MPI_BAD_INPUT_DATA );
+    }
+
+    mbedtls_mpi_init( &K );
+    mbedtls_mpi_init( &L );
+
+    /* Temporarily put K := P-1 and L := Q-1 */
+    MBEDTLS_MPI_CHK( mbedtls_mpi_sub_int( &K, P, 1 ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_sub_int( &L, Q, 1 ) );
+
+    /* Temporarily put D := gcd(P-1, Q-1) */
+    MBEDTLS_MPI_CHK( mbedtls_mpi_gcd( D, &K, &L ) );
+
+    /* K := LCM(P-1, Q-1) */
+    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &K, &K, &L ) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_div_mpi( &K, NULL, &K, D ) );
+
+    /* Compute modular inverse of E in LCM(P-1, Q-1) */
+    MBEDTLS_MPI_CHK( mbedtls_mpi_inv_mod( D, E, &K ) );
+
+cleanup:
+
+    mbedtls_mpi_free( &K );
+    mbedtls_mpi_free( &L );
+
+    return( ret );
+}
+
+/*
+ * Check that RSA CRT parameters are in accordance with core parameters.
+ */
+int mbedtls_rsa_validate_crt( const mbedtls_mpi *P,  const mbedtls_mpi *Q,
+                              const mbedtls_mpi *D,  const mbedtls_mpi *DP,
+                              const mbedtls_mpi *DQ, const mbedtls_mpi *QP )
+{
+    int ret = 0;
+
+    mbedtls_mpi K, L;
+    mbedtls_mpi_init( &K );
+    mbedtls_mpi_init( &L );
+
+    /* Check that DP - D == 0 mod P - 1 */
+    if( DP != NULL )
+    {
+        if( P == NULL )
+        {
+            ret = MBEDTLS_ERR_RSA_BAD_INPUT_DATA;
+            goto cleanup;
+        }
+
+        MBEDTLS_MPI_CHK( mbedtls_mpi_sub_int( &K, P, 1 ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &L, DP, D ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi( &L, &L, &K ) );
+
+        if( mbedtls_mpi_cmp_int( &L, 0 ) != 0 )
+        {
+            ret = MBEDTLS_ERR_RSA_KEY_CHECK_FAILED;
+            goto cleanup;
+        }
+    }
+
+    /* Check that DQ - D == 0 mod Q - 1 */
+    if( DQ != NULL )
+    {
+        if( Q == NULL )
+        {
+            ret = MBEDTLS_ERR_RSA_BAD_INPUT_DATA;
+            goto cleanup;
+        }
+
+        MBEDTLS_MPI_CHK( mbedtls_mpi_sub_int( &K, Q, 1 ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &L, DQ, D ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi( &L, &L, &K ) );
+
+        if( mbedtls_mpi_cmp_int( &L, 0 ) != 0 )
+        {
+            ret = MBEDTLS_ERR_RSA_KEY_CHECK_FAILED;
+            goto cleanup;
+        }
+    }
+
+    /* Check that QP * Q - 1 == 0 mod P */
+    if( QP != NULL )
+    {
+        if( P == NULL || Q == NULL )
+        {
+            ret = MBEDTLS_ERR_RSA_BAD_INPUT_DATA;
+            goto cleanup;
+        }
+
+        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &K, QP, Q ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_sub_int( &K, &K, 1 ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi( &K, &K, P ) );
+        if( mbedtls_mpi_cmp_int( &K, 0 ) != 0 )
+        {
+            ret = MBEDTLS_ERR_RSA_KEY_CHECK_FAILED;
+            goto cleanup;
+        }
+    }
+
+cleanup:
+
+    /* Wrap MPI error codes by RSA check failure error code */
+    if( ret != 0 &&
+        ret != MBEDTLS_ERR_RSA_KEY_CHECK_FAILED &&
+        ret != MBEDTLS_ERR_RSA_BAD_INPUT_DATA )
+    {
+        ret += MBEDTLS_ERR_RSA_KEY_CHECK_FAILED;
+    }
+
+    mbedtls_mpi_free( &K );
+    mbedtls_mpi_free( &L );
+
+    return( ret );
+}
+
+/*
+ * Check that core RSA parameters are sane.
+ */
+int mbedtls_rsa_validate_params( const mbedtls_mpi *N, const mbedtls_mpi *P,
+                                 const mbedtls_mpi *Q, const mbedtls_mpi *D,
+                                 const mbedtls_mpi *E,
+                                 int (*f_rng)(void *, unsigned char *, size_t),
+                                 void *p_rng )
+{
+    int ret = 0;
+    mbedtls_mpi K, L;
+
+    mbedtls_mpi_init( &K );
+    mbedtls_mpi_init( &L );
+
+    /*
+     * Step 1: If PRNG provided, check that P and Q are prime
+     */
+
+#if defined(MBEDTLS_GENPRIME)
+    if( f_rng != NULL && P != NULL &&
+        ( ret = mbedtls_mpi_is_prime( P, f_rng, p_rng ) ) != 0 )
+    {
+        ret = MBEDTLS_ERR_RSA_KEY_CHECK_FAILED;
+        goto cleanup;
+    }
+
+    if( f_rng != NULL && Q != NULL &&
+        ( ret = mbedtls_mpi_is_prime( Q, f_rng, p_rng ) ) != 0 )
+    {
+        ret = MBEDTLS_ERR_RSA_KEY_CHECK_FAILED;
+        goto cleanup;
+    }
+#else
+    ((void) f_rng);
+    ((void) p_rng);
+#endif /* MBEDTLS_GENPRIME */
+
+    /*
+     * Step 2: Check that 1 < N = P * Q
+     */
+
+    if( P != NULL && Q != NULL && N != NULL )
+    {
+        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &K, P, Q ) );
+        if( mbedtls_mpi_cmp_int( N, 1 )  <= 0 ||
+            mbedtls_mpi_cmp_mpi( &K, N ) != 0 )
+        {
+            ret = MBEDTLS_ERR_RSA_KEY_CHECK_FAILED;
+            goto cleanup;
+        }
+    }
+
+    /*
+     * Step 3: Check and 1 < D, E < N if present.
+     */
+
+    if( N != NULL && D != NULL && E != NULL )
+    {
+        if ( mbedtls_mpi_cmp_int( D, 1 ) <= 0 ||
+             mbedtls_mpi_cmp_int( E, 1 ) <= 0 ||
+             mbedtls_mpi_cmp_mpi( D, N ) >= 0 ||
+             mbedtls_mpi_cmp_mpi( E, N ) >= 0 )
+        {
+            ret = MBEDTLS_ERR_RSA_KEY_CHECK_FAILED;
+            goto cleanup;
+        }
+    }
+
+    /*
+     * Step 4: Check that D, E are inverse modulo P-1 and Q-1
+     */
+
+    if( P != NULL && Q != NULL && D != NULL && E != NULL )
+    {
+        if( mbedtls_mpi_cmp_int( P, 1 ) <= 0 ||
+            mbedtls_mpi_cmp_int( Q, 1 ) <= 0 )
+        {
+            ret = MBEDTLS_ERR_RSA_KEY_CHECK_FAILED;
+            goto cleanup;
+        }
+
+        /* Compute DE-1 mod P-1 */
+        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &K, D, E ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_sub_int( &K, &K, 1 ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_sub_int( &L, P, 1 ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi( &K, &K, &L ) );
+        if( mbedtls_mpi_cmp_int( &K, 0 ) != 0 )
+        {
+            ret = MBEDTLS_ERR_RSA_KEY_CHECK_FAILED;
+            goto cleanup;
+        }
+
+        /* Compute DE-1 mod Q-1 */
+        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &K, D, E ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_sub_int( &K, &K, 1 ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_sub_int( &L, Q, 1 ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi( &K, &K, &L ) );
+        if( mbedtls_mpi_cmp_int( &K, 0 ) != 0 )
+        {
+            ret = MBEDTLS_ERR_RSA_KEY_CHECK_FAILED;
+            goto cleanup;
+        }
+    }
+
+cleanup:
+
+    mbedtls_mpi_free( &K );
+    mbedtls_mpi_free( &L );
+
+    /* Wrap MPI error codes by RSA check failure error code */
+    if( ret != 0 && ret != MBEDTLS_ERR_RSA_KEY_CHECK_FAILED )
+    {
+        ret += MBEDTLS_ERR_RSA_KEY_CHECK_FAILED;
+    }
+
+    return( ret );
+}
+
+int mbedtls_rsa_deduce_crt( const mbedtls_mpi *P, const mbedtls_mpi *Q,
+                            const mbedtls_mpi *D, mbedtls_mpi *DP,
+                            mbedtls_mpi *DQ, mbedtls_mpi *QP )
+{
+    int ret = 0;
+    mbedtls_mpi K;
+    mbedtls_mpi_init( &K );
+
+    /* DP = D mod P-1 */
+    if( DP != NULL )
+    {
+        MBEDTLS_MPI_CHK( mbedtls_mpi_sub_int( &K, P, 1  ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi( DP, D, &K ) );
+    }
+
+    /* DQ = D mod Q-1 */
+    if( DQ != NULL )
+    {
+        MBEDTLS_MPI_CHK( mbedtls_mpi_sub_int( &K, Q, 1  ) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi( DQ, D, &K ) );
+    }
+
+    /* QP = Q^{-1} mod P */
+    if( QP != NULL )
+    {
+        MBEDTLS_MPI_CHK( mbedtls_mpi_inv_mod( QP, Q, P ) );
+    }
+
+cleanup:
+    mbedtls_mpi_free( &K );
+
+    return( ret );
+}
+
+#endif /* MBEDTLS_RSA_C */
diff --git a/common/mbedtls/rsa_internal.h b/common/mbedtls/rsa_internal.h
new file mode 100644
index 000000000..8ee0bfe34
--- /dev/null
+++ b/common/mbedtls/rsa_internal.h
@@ -0,0 +1,228 @@
+/**
+ * \file rsa_internal.h
+ *
+ * \brief Context-independent RSA helper functions
+ *
+ *  This module declares some RSA-related helper functions useful when
+ *  implementing the RSA interface. These functions are provided in a separate
+ *  compilation unit in order to make it easy for designers of alternative RSA
+ *  implementations to use them in their own code, as it is conceived that the
+ *  functionality they provide will be necessary for most complete
+ *  implementations.
+ *
+ *  End-users of Mbed TLS who are not providing their own alternative RSA
+ *  implementations should not use these functions directly, and should instead
+ *  use only the functions declared in rsa.h.
+ *
+ *  The interface provided by this module will be maintained through LTS (Long
+ *  Term Support) branches of Mbed TLS, but may otherwise be subject to change,
+ *  and must be considered an internal interface of the library.
+ *
+ *  There are two classes of helper functions:
+ *
+ *  (1) Parameter-generating helpers. These are:
+ *      - mbedtls_rsa_deduce_primes
+ *      - mbedtls_rsa_deduce_private_exponent
+ *      - mbedtls_rsa_deduce_crt
+ *       Each of these functions takes a set of core RSA parameters and
+ *       generates some other, or CRT related parameters.
+ *
+ *  (2) Parameter-checking helpers. These are:
+ *      - mbedtls_rsa_validate_params
+ *      - mbedtls_rsa_validate_crt
+ *      They take a set of core or CRT related RSA parameters and check their
+ *      validity.
+ *
+ */
+/*
+ *  Copyright (C) 2006-2017, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ *
+ */
+
+#ifndef MBEDTLS_RSA_INTERNAL_H
+#define MBEDTLS_RSA_INTERNAL_H
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#include "bignum.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/**
+ * \brief          Compute RSA prime moduli P, Q from public modulus N=PQ
+ *                 and a pair of private and public key.
+ *
+ * \note           This is a 'static' helper function not operating on
+ *                 an RSA context. Alternative implementations need not
+ *                 overwrite it.
+ *
+ * \param N        RSA modulus N = PQ, with P, Q to be found
+ * \param E        RSA public exponent
+ * \param D        RSA private exponent
+ * \param P        Pointer to MPI holding first prime factor of N on success
+ * \param Q        Pointer to MPI holding second prime factor of N on success
+ *
+ * \return
+ *                 - 0 if successful. In this case, P and Q constitute a
+ *                   factorization of N.
+ *                 - A non-zero error code otherwise.
+ *
+ * \note           It is neither checked that P, Q are prime nor that
+ *                 D, E are modular inverses wrt. P-1 and Q-1. For that,
+ *                 use the helper function \c mbedtls_rsa_validate_params.
+ *
+ */
+int mbedtls_rsa_deduce_primes( mbedtls_mpi const *N, mbedtls_mpi const *E,
+                               mbedtls_mpi const *D,
+                               mbedtls_mpi *P, mbedtls_mpi *Q );
+
+/**
+ * \brief          Compute RSA private exponent from
+ *                 prime moduli and public key.
+ *
+ * \note           This is a 'static' helper function not operating on
+ *                 an RSA context. Alternative implementations need not
+ *                 overwrite it.
+ *
+ * \param P        First prime factor of RSA modulus
+ * \param Q        Second prime factor of RSA modulus
+ * \param E        RSA public exponent
+ * \param D        Pointer to MPI holding the private exponent on success.
+ *
+ * \return
+ *                 - 0 if successful. In this case, D is set to a simultaneous
+ *                   modular inverse of E modulo both P-1 and Q-1.
+ *                 - A non-zero error code otherwise.
+ *
+ * \note           This function does not check whether P and Q are primes.
+ *
+ */
+int mbedtls_rsa_deduce_private_exponent( mbedtls_mpi const *P,
+                                         mbedtls_mpi const *Q,
+                                         mbedtls_mpi const *E,
+                                         mbedtls_mpi *D );
+
+
+/**
+ * \brief          Generate RSA-CRT parameters
+ *
+ * \note           This is a 'static' helper function not operating on
+ *                 an RSA context. Alternative implementations need not
+ *                 overwrite it.
+ *
+ * \param P        First prime factor of N
+ * \param Q        Second prime factor of N
+ * \param D        RSA private exponent
+ * \param DP       Output variable for D modulo P-1
+ * \param DQ       Output variable for D modulo Q-1
+ * \param QP       Output variable for the modular inverse of Q modulo P.
+ *
+ * \return         0 on success, non-zero error code otherwise.
+ *
+ * \note           This function does not check whether P, Q are
+ *                 prime and whether D is a valid private exponent.
+ *
+ */
+int mbedtls_rsa_deduce_crt( const mbedtls_mpi *P, const mbedtls_mpi *Q,
+                            const mbedtls_mpi *D, mbedtls_mpi *DP,
+                            mbedtls_mpi *DQ, mbedtls_mpi *QP );
+
+
+/**
+ * \brief          Check validity of core RSA parameters
+ *
+ * \note           This is a 'static' helper function not operating on
+ *                 an RSA context. Alternative implementations need not
+ *                 overwrite it.
+ *
+ * \param N        RSA modulus N = PQ
+ * \param P        First prime factor of N
+ * \param Q        Second prime factor of N
+ * \param D        RSA private exponent
+ * \param E        RSA public exponent
+ * \param f_rng    PRNG to be used for primality check, or NULL
+ * \param p_rng    PRNG context for f_rng, or NULL
+ *
+ * \return
+ *                 - 0 if the following conditions are satisfied
+ *                   if all relevant parameters are provided:
+ *                    - P prime if f_rng != NULL (%)
+ *                    - Q prime if f_rng != NULL (%)
+ *                    - 1 < N = P * Q
+ *                    - 1 < D, E < N
+ *                    - D and E are modular inverses modulo P-1 and Q-1
+ *                   (%) This is only done if MBEDTLS_GENPRIME is defined.
+ *                 - A non-zero error code otherwise.
+ *
+ * \note           The function can be used with a restricted set of arguments
+ *                 to perform specific checks only. E.g., calling it with
+ *                 (-,P,-,-,-) and a PRNG amounts to a primality check for P.
+ */
+int mbedtls_rsa_validate_params( const mbedtls_mpi *N, const mbedtls_mpi *P,
+                                 const mbedtls_mpi *Q, const mbedtls_mpi *D,
+                                 const mbedtls_mpi *E,
+                                 int (*f_rng)(void *, unsigned char *, size_t),
+                                 void *p_rng );
+
+/**
+ * \brief          Check validity of RSA CRT parameters
+ *
+ * \note           This is a 'static' helper function not operating on
+ *                 an RSA context. Alternative implementations need not
+ *                 overwrite it.
+ *
+ * \param P        First prime factor of RSA modulus
+ * \param Q        Second prime factor of RSA modulus
+ * \param D        RSA private exponent
+ * \param DP       MPI to check for D modulo P-1
+ * \param DQ       MPI to check for D modulo P-1
+ * \param QP       MPI to check for the modular inverse of Q modulo P.
+ *
+ * \return
+ *                 - 0 if the following conditions are satisfied:
+ *                    - D = DP mod P-1 if P, D, DP != NULL
+ *                    - Q = DQ mod P-1 if P, D, DQ != NULL
+ *                    - QP = Q^-1 mod P if P, Q, QP != NULL
+ *                 - \c MBEDTLS_ERR_RSA_KEY_CHECK_FAILED if check failed,
+ *                   potentially including \c MBEDTLS_ERR_MPI_XXX if some
+ *                   MPI calculations failed.
+ *                 - \c MBEDTLS_ERR_RSA_BAD_INPUT_DATA if insufficient
+ *                   data was provided to check DP, DQ or QP.
+ *
+ * \note           The function can be used with a restricted set of arguments
+ *                 to perform specific checks only. E.g., calling it with the
+ *                 parameters (P, -, D, DP, -, -) will check DP = D mod P-1.
+ */
+int mbedtls_rsa_validate_crt( const mbedtls_mpi *P,  const mbedtls_mpi *Q,
+                              const mbedtls_mpi *D,  const mbedtls_mpi *DP,
+                              const mbedtls_mpi *DQ, const mbedtls_mpi *QP );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* rsa_internal.h */
diff --git a/common/polarssl/sha1.c b/common/mbedtls/sha1.c
similarity index 50%
rename from common/polarssl/sha1.c
rename to common/mbedtls/sha1.c
index 3cd2e0555..9981c5a9d 100644
--- a/common/polarssl/sha1.c
+++ b/common/mbedtls/sha1.c
@@ -1,9 +1,8 @@
 /*
  *  FIPS-180-1 compliant SHA-1 implementation
  *
- *  Copyright (C) 2006-2014, ARM Limited, All Rights Reserved
- *
- *  This file is part of mbed TLS (https://tls.mbed.org)
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -18,6 +17,8 @@
  *  You should have received a copy of the GNU General Public License along
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
  */
 /*
  *  The SHA-1 standard was published by NIST in 1993.
@@ -25,39 +26,29 @@
  *  http://www.itl.nist.gov/fipspubs/fip180-1.htm
  */
 
-#if !defined(POLARSSL_CONFIG_FILE)
-//#include "polarssl/config.h"
-#define POLARSSL_SHA1_C
-
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "mbedtls/config.h"
 #else
-#include POLARSSL_CONFIG_FILE
+#include MBEDTLS_CONFIG_FILE
 #endif
 
-#if defined(POLARSSL_SHA1_C)
+#if defined(MBEDTLS_SHA1_C)
 
-#include "sha1.h"
+#include "mbedtls/sha1.h"
+#include "mbedtls/platform_util.h"
 
 #include <string.h>
 
-#if defined(POLARSSL_FS_IO)
-#include <stdio.h>
-#endif
-
-#if defined(POLARSSL_SELF_TEST)
-#if defined(POLARSSL_PLATFORM_C)
-#include "polarssl/platform.h"
+#if defined(MBEDTLS_SELF_TEST)
+#if defined(MBEDTLS_PLATFORM_C)
+#include "mbedtls/platform.h"
 #else
 #include <stdio.h>
-#define polarssl_printf printf
-#endif /* POLARSSL_PLATFORM_C */
-#endif /* POLARSSL_SELF_TEST */
+#define mbedtls_printf printf
+#endif /* MBEDTLS_PLATFORM_C */
+#endif /* MBEDTLS_SELF_TEST */
 
-/* Implementation that should never be optimized out by the compiler */
-static void polarssl_zeroize( void *v, size_t n ) {
-    volatile unsigned char *p = v; while( n-- ) *p++ = 0;
-}
-
-#if !defined(POLARSSL_SHA1_ALT)
+#if !defined(MBEDTLS_SHA1_ALT)
 
 /*
  * 32-bit integer manipulation macros (big endian)
@@ -82,23 +73,29 @@ static void polarssl_zeroize( void *v, size_t n ) {
 }
 #endif
 
-void sha1_init( sha1_context *ctx )
+void mbedtls_sha1_init( mbedtls_sha1_context *ctx )
 {
-    memset( ctx, 0, sizeof( sha1_context ) );
+    memset( ctx, 0, sizeof( mbedtls_sha1_context ) );
 }
 
-void sha1_free( sha1_context *ctx )
+void mbedtls_sha1_free( mbedtls_sha1_context *ctx )
 {
     if( ctx == NULL )
         return;
 
-    polarssl_zeroize( ctx, sizeof( sha1_context ) );
+    mbedtls_platform_zeroize( ctx, sizeof( mbedtls_sha1_context ) );
+}
+
+void mbedtls_sha1_clone( mbedtls_sha1_context *dst,
+                         const mbedtls_sha1_context *src )
+{
+    *dst = *src;
 }
 
 /*
  * SHA-1 context setup
  */
-void sha1_starts( sha1_context *ctx )
+int mbedtls_sha1_starts_ret( mbedtls_sha1_context *ctx )
 {
     ctx->total[0] = 0;
     ctx->total[1] = 0;
@@ -108,9 +105,20 @@ void sha1_starts( sha1_context *ctx )
     ctx->state[2] = 0x98BADCFE;
     ctx->state[3] = 0x10325476;
     ctx->state[4] = 0xC3D2E1F0;
+
+    return( 0 );
 }
 
-void sha1_process( sha1_context *ctx, const unsigned char data[64] )
+#if !defined(MBEDTLS_DEPRECATED_REMOVED)
+void mbedtls_sha1_starts( mbedtls_sha1_context *ctx )
+{
+    mbedtls_sha1_starts_ret( ctx );
+}
+#endif
+
+#if !defined(MBEDTLS_SHA1_PROCESS_ALT)
+int mbedtls_internal_sha1_process( mbedtls_sha1_context *ctx,
+                                   const unsigned char data[64] )
 {
     uint32_t temp, W[16], A, B, C, D, E;
 
@@ -264,18 +272,32 @@ void sha1_process( sha1_context *ctx, const unsigned char data[64] )
     ctx->state[2] += C;
     ctx->state[3] += D;
     ctx->state[4] += E;
+
+    return( 0 );
 }
 
+#if !defined(MBEDTLS_DEPRECATED_REMOVED)
+void mbedtls_sha1_process( mbedtls_sha1_context *ctx,
+                           const unsigned char data[64] )
+{
+    mbedtls_internal_sha1_process( ctx, data );
+}
+#endif
+#endif /* !MBEDTLS_SHA1_PROCESS_ALT */
+
 /*
  * SHA-1 process buffer
  */
-void sha1_update( sha1_context *ctx, const unsigned char *input, size_t ilen )
+int mbedtls_sha1_update_ret( mbedtls_sha1_context *ctx,
+                             const unsigned char *input,
+                             size_t ilen )
 {
+    int ret;
     size_t fill;
     uint32_t left;
 
     if( ilen == 0 )
-        return;
+        return( 0 );
 
     left = ctx->total[0] & 0x3F;
     fill = 64 - left;
@@ -289,7 +311,10 @@ void sha1_update( sha1_context *ctx, const unsigned char *input, size_t ilen )
     if( left && ilen >= fill )
     {
         memcpy( (void *) (ctx->buffer + left), input, fill );
-        sha1_process( ctx, ctx->buffer );
+
+        if( ( ret = mbedtls_internal_sha1_process( ctx, ctx->buffer ) ) != 0 )
+            return( ret );
+
         input += fill;
         ilen  -= fill;
         left = 0;
@@ -297,184 +322,133 @@ void sha1_update( sha1_context *ctx, const unsigned char *input, size_t ilen )
 
     while( ilen >= 64 )
     {
-        sha1_process( ctx, input );
+        if( ( ret = mbedtls_internal_sha1_process( ctx, input ) ) != 0 )
+            return( ret );
+
         input += 64;
         ilen  -= 64;
     }
 
     if( ilen > 0 )
         memcpy( (void *) (ctx->buffer + left), input, ilen );
+
+    return( 0 );
 }
 
-static const unsigned char sha1_padding[64] =
+#if !defined(MBEDTLS_DEPRECATED_REMOVED)
+void mbedtls_sha1_update( mbedtls_sha1_context *ctx,
+                          const unsigned char *input,
+                          size_t ilen )
 {
- 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
+    mbedtls_sha1_update_ret( ctx, input, ilen );
+}
+#endif
 
 /*
  * SHA-1 final digest
  */
-void sha1_finish( sha1_context *ctx, unsigned char output[20] )
+int mbedtls_sha1_finish_ret( mbedtls_sha1_context *ctx,
+                             unsigned char output[20] )
 {
-    uint32_t last, padn;
+    int ret;
+    uint32_t used;
     uint32_t high, low;
-    unsigned char msglen[8];
 
+    /*
+     * Add padding: 0x80 then 0x00 until 8 bytes remain for the length
+     */
+    used = ctx->total[0] & 0x3F;
+
+    ctx->buffer[used++] = 0x80;
+
+    if( used <= 56 )
+    {
+        /* Enough room for padding + length in current block */
+        memset( ctx->buffer + used, 0, 56 - used );
+    }
+    else
+    {
+        /* We'll need an extra block */
+        memset( ctx->buffer + used, 0, 64 - used );
+
+        if( ( ret = mbedtls_internal_sha1_process( ctx, ctx->buffer ) ) != 0 )
+            return( ret );
+
+        memset( ctx->buffer, 0, 56 );
+    }
+
+    /*
+     * Add message length
+     */
     high = ( ctx->total[0] >> 29 )
          | ( ctx->total[1] <<  3 );
     low  = ( ctx->total[0] <<  3 );
 
-    PUT_UINT32_BE( high, msglen, 0 );
-    PUT_UINT32_BE( low,  msglen, 4 );
+    PUT_UINT32_BE( high, ctx->buffer, 56 );
+    PUT_UINT32_BE( low,  ctx->buffer, 60 );
 
-    last = ctx->total[0] & 0x3F;
-    padn = ( last < 56 ) ? ( 56 - last ) : ( 120 - last );
-
-    sha1_update( ctx, sha1_padding, padn );
-    sha1_update( ctx, msglen, 8 );
+    if( ( ret = mbedtls_internal_sha1_process( ctx, ctx->buffer ) ) != 0 )
+        return( ret );
 
+    /*
+     * Output final state
+     */
     PUT_UINT32_BE( ctx->state[0], output,  0 );
     PUT_UINT32_BE( ctx->state[1], output,  4 );
     PUT_UINT32_BE( ctx->state[2], output,  8 );
     PUT_UINT32_BE( ctx->state[3], output, 12 );
     PUT_UINT32_BE( ctx->state[4], output, 16 );
+
+    return( 0 );
 }
 
-#endif /* !POLARSSL_SHA1_ALT */
+#if !defined(MBEDTLS_DEPRECATED_REMOVED)
+void mbedtls_sha1_finish( mbedtls_sha1_context *ctx,
+                          unsigned char output[20] )
+{
+    mbedtls_sha1_finish_ret( ctx, output );
+}
+#endif
+
+#endif /* !MBEDTLS_SHA1_ALT */
 
 /*
  * output = SHA-1( input buffer )
  */
-void sha1( const unsigned char *input, size_t ilen, unsigned char output[20] )
+int mbedtls_sha1_ret( const unsigned char *input,
+                      size_t ilen,
+                      unsigned char output[20] )
 {
-    sha1_context ctx;
+    int ret;
+    mbedtls_sha1_context ctx;
 
-    sha1_init( &ctx );
-    sha1_starts( &ctx );
-    sha1_update( &ctx, input, ilen );
-    sha1_finish( &ctx, output );
-    sha1_free( &ctx );
+    mbedtls_sha1_init( &ctx );
+
+    if( ( ret = mbedtls_sha1_starts_ret( &ctx ) ) != 0 )
+        goto exit;
+
+    if( ( ret = mbedtls_sha1_update_ret( &ctx, input, ilen ) ) != 0 )
+        goto exit;
+
+    if( ( ret = mbedtls_sha1_finish_ret( &ctx, output ) ) != 0 )
+        goto exit;
+
+exit:
+    mbedtls_sha1_free( &ctx );
+
+    return( ret );
 }
 
-#if defined(POLARSSL_FS_IO)
-/*
- * output = SHA-1( file contents )
- */
-int sha1_file( const char *path, unsigned char output[20] )
+#if !defined(MBEDTLS_DEPRECATED_REMOVED)
+void mbedtls_sha1( const unsigned char *input,
+                   size_t ilen,
+                   unsigned char output[20] )
 {
-    FILE *f;
-    size_t n;
-    sha1_context ctx;
-    unsigned char buf[1024];
-
-    if( ( f = fopen( path, "rb" ) ) == NULL )
-        return( POLARSSL_ERR_SHA1_FILE_IO_ERROR );
-
-    sha1_init( &ctx );
-    sha1_starts( &ctx );
-
-    while( ( n = fread( buf, 1, sizeof( buf ), f ) ) > 0 )
-        sha1_update( &ctx, buf, n );
-
-    sha1_finish( &ctx, output );
-    sha1_free( &ctx );
-
-    if( ferror( f ) != 0 )
-    {
-        fclose( f );
-        return( POLARSSL_ERR_SHA1_FILE_IO_ERROR );
-    }
-
-    fclose( f );
-    return( 0 );
+    mbedtls_sha1_ret( input, ilen, output );
 }
-#endif /* POLARSSL_FS_IO */
+#endif
 
-/*
- * SHA-1 HMAC context setup
- */
-void sha1_hmac_starts( sha1_context *ctx, const unsigned char *key,
-                       size_t keylen )
-{
-    size_t i;
-    unsigned char sum[20];
-
-    if( keylen > 64 )
-    {
-        sha1( key, keylen, sum );
-        keylen = 20;
-        key = sum;
-    }
-
-    memset( ctx->ipad, 0x36, 64 );
-    memset( ctx->opad, 0x5C, 64 );
-
-    for( i = 0; i < keylen; i++ )
-    {
-        ctx->ipad[i] = (unsigned char)( ctx->ipad[i] ^ key[i] );
-        ctx->opad[i] = (unsigned char)( ctx->opad[i] ^ key[i] );
-    }
-
-    sha1_starts( ctx );
-    sha1_update( ctx, ctx->ipad, 64 );
-
-    polarssl_zeroize( sum, sizeof( sum ) );
-}
-
-/*
- * SHA-1 HMAC process buffer
- */
-void sha1_hmac_update( sha1_context *ctx, const unsigned char *input,
-                       size_t ilen )
-{
-    sha1_update( ctx, input, ilen );
-}
-
-/*
- * SHA-1 HMAC final digest
- */
-void sha1_hmac_finish( sha1_context *ctx, unsigned char output[20] )
-{
-    unsigned char tmpbuf[20];
-
-    sha1_finish( ctx, tmpbuf );
-    sha1_starts( ctx );
-    sha1_update( ctx, ctx->opad, 64 );
-    sha1_update( ctx, tmpbuf, 20 );
-    sha1_finish( ctx, output );
-
-    polarssl_zeroize( tmpbuf, sizeof( tmpbuf ) );
-}
-
-/*
- * SHA1 HMAC context reset
- */
-void sha1_hmac_reset( sha1_context *ctx )
-{
-    sha1_starts( ctx );
-    sha1_update( ctx, ctx->ipad, 64 );
-}
-
-/*
- * output = HMAC-SHA-1( hmac key, input buffer )
- */
-void sha1_hmac( const unsigned char *key, size_t keylen,
-                const unsigned char *input, size_t ilen,
-                unsigned char output[20] )
-{
-    sha1_context ctx;
-
-    sha1_init( &ctx );
-    sha1_hmac_starts( &ctx, key, keylen );
-    sha1_hmac_update( &ctx, input, ilen );
-    sha1_hmac_finish( &ctx, output );
-    sha1_free( &ctx );
-}
-
-#if defined(POLARSSL_SELF_TEST)
+#if defined(MBEDTLS_SELF_TEST)
 /*
  * FIPS-180-1 test vectors
  */
@@ -485,7 +459,7 @@ static const unsigned char sha1_test_buf[3][57] =
     { "" }
 };
 
-static const int sha1_test_buflen[3] =
+static const size_t sha1_test_buflen[3] =
 {
     3, 56, 1000
 };
@@ -500,83 +474,17 @@ static const unsigned char sha1_test_sum[3][20] =
       0xEB, 0x2B, 0xDB, 0xAD, 0x27, 0x31, 0x65, 0x34, 0x01, 0x6F }
 };
 
-/*
- * RFC 2202 test vectors
- */
-static const unsigned char sha1_hmac_test_key[7][26] =
-{
-    { "\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B"
-      "\x0B\x0B\x0B\x0B" },
-    { "Jefe" },
-    { "\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA"
-      "\xAA\xAA\xAA\xAA" },
-    { "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F\x10"
-      "\x11\x12\x13\x14\x15\x16\x17\x18\x19" },
-    { "\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C"
-      "\x0C\x0C\x0C\x0C" },
-    { "" }, /* 0xAA 80 times */
-    { "" }
-};
-
-static const int sha1_hmac_test_keylen[7] =
-{
-    20, 4, 20, 25, 20, 80, 80
-};
-
-static const unsigned char sha1_hmac_test_buf[7][74] =
-{
-    { "Hi There" },
-    { "what do ya want for nothing?" },
-    { "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD"
-      "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD"
-      "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD"
-      "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD"
-      "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD" },
-    { "\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD"
-      "\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD"
-      "\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD"
-      "\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD"
-      "\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD" },
-    { "Test With Truncation" },
-    { "Test Using Larger Than Block-Size Key - Hash Key First" },
-    { "Test Using Larger Than Block-Size Key and Larger"
-      " Than One Block-Size Data" }
-};
-
-static const int sha1_hmac_test_buflen[7] =
-{
-    8, 28, 50, 50, 20, 54, 73
-};
-
-static const unsigned char sha1_hmac_test_sum[7][20] =
-{
-    { 0xB6, 0x17, 0x31, 0x86, 0x55, 0x05, 0x72, 0x64, 0xE2, 0x8B,
-      0xC0, 0xB6, 0xFB, 0x37, 0x8C, 0x8E, 0xF1, 0x46, 0xBE, 0x00 },
-    { 0xEF, 0xFC, 0xDF, 0x6A, 0xE5, 0xEB, 0x2F, 0xA2, 0xD2, 0x74,
-      0x16, 0xD5, 0xF1, 0x84, 0xDF, 0x9C, 0x25, 0x9A, 0x7C, 0x79 },
-    { 0x12, 0x5D, 0x73, 0x42, 0xB9, 0xAC, 0x11, 0xCD, 0x91, 0xA3,
-      0x9A, 0xF4, 0x8A, 0xA1, 0x7B, 0x4F, 0x63, 0xF1, 0x75, 0xD3 },
-    { 0x4C, 0x90, 0x07, 0xF4, 0x02, 0x62, 0x50, 0xC6, 0xBC, 0x84,
-      0x14, 0xF9, 0xBF, 0x50, 0xC8, 0x6C, 0x2D, 0x72, 0x35, 0xDA },
-    { 0x4C, 0x1A, 0x03, 0x42, 0x4B, 0x55, 0xE0, 0x7F, 0xE7, 0xF2,
-      0x7B, 0xE1 },
-    { 0xAA, 0x4A, 0xE5, 0xE1, 0x52, 0x72, 0xD0, 0x0E, 0x95, 0x70,
-      0x56, 0x37, 0xCE, 0x8A, 0x3B, 0x55, 0xED, 0x40, 0x21, 0x12 },
-    { 0xE8, 0xE9, 0x9D, 0x0F, 0x45, 0x23, 0x7D, 0x78, 0x6D, 0x6B,
-      0xBA, 0xA7, 0x96, 0x5C, 0x78, 0x08, 0xBB, 0xFF, 0x1A, 0x91 }
-};
-
 /*
  * Checkup routine
  */
-int sha1_self_test( int verbose )
+int mbedtls_sha1_self_test( int verbose )
 {
     int i, j, buflen, ret = 0;
     unsigned char buf[1024];
     unsigned char sha1sum[20];
-    sha1_context ctx;
+    mbedtls_sha1_context ctx;
 
-    sha1_init( &ctx );
+    mbedtls_sha1_init( &ctx );
 
     /*
      * SHA-1
@@ -584,82 +492,58 @@ int sha1_self_test( int verbose )
     for( i = 0; i < 3; i++ )
     {
         if( verbose != 0 )
-            polarssl_printf( "  SHA-1 test #%d: ", i + 1 );
+            mbedtls_printf( "  SHA-1 test #%d: ", i + 1 );
 
-        sha1_starts( &ctx );
+        if( ( ret = mbedtls_sha1_starts_ret( &ctx ) ) != 0 )
+            goto fail;
 
         if( i == 2 )
         {
             memset( buf, 'a', buflen = 1000 );
 
             for( j = 0; j < 1000; j++ )
-                sha1_update( &ctx, buf, buflen );
+            {
+                ret = mbedtls_sha1_update_ret( &ctx, buf, buflen );
+                if( ret != 0 )
+                    goto fail;
+            }
         }
         else
-            sha1_update( &ctx, sha1_test_buf[i],
-                               sha1_test_buflen[i] );
+        {
+            ret = mbedtls_sha1_update_ret( &ctx, sha1_test_buf[i],
+                                           sha1_test_buflen[i] );
+            if( ret != 0 )
+                goto fail;
+        }
 
-        sha1_finish( &ctx, sha1sum );
+        if( ( ret = mbedtls_sha1_finish_ret( &ctx, sha1sum ) ) != 0 )
+            goto fail;
 
         if( memcmp( sha1sum, sha1_test_sum[i], 20 ) != 0 )
         {
-            if( verbose != 0 )
-                polarssl_printf( "failed\n" );
-
             ret = 1;
-            goto exit;
+            goto fail;
         }
 
         if( verbose != 0 )
-            polarssl_printf( "passed\n" );
+            mbedtls_printf( "passed\n" );
     }
 
     if( verbose != 0 )
-        polarssl_printf( "\n" );
+        mbedtls_printf( "\n" );
 
-    for( i = 0; i < 7; i++ )
-    {
-        if( verbose != 0 )
-            polarssl_printf( "  HMAC-SHA-1 test #%d: ", i + 1 );
-
-        if( i == 5 || i == 6 )
-        {
-            memset( buf, 0xAA, buflen = 80 );
-            sha1_hmac_starts( &ctx, buf, buflen );
-        }
-        else
-            sha1_hmac_starts( &ctx, sha1_hmac_test_key[i],
-                                    sha1_hmac_test_keylen[i] );
-
-        sha1_hmac_update( &ctx, sha1_hmac_test_buf[i],
-                                sha1_hmac_test_buflen[i] );
-
-        sha1_hmac_finish( &ctx, sha1sum );
-
-        buflen = ( i == 4 ) ? 12 : 20;
-
-        if( memcmp( sha1sum, sha1_hmac_test_sum[i], buflen ) != 0 )
-        {
-            if( verbose != 0 )
-                polarssl_printf( "failed\n" );
-
-            ret = 1;
-            goto exit;
-        }
-
-        if( verbose != 0 )
-            polarssl_printf( "passed\n" );
-    }
+    goto exit;
 
+fail:
     if( verbose != 0 )
-        polarssl_printf( "\n" );
+        mbedtls_printf( "failed\n" );
 
 exit:
-    sha1_free( &ctx );
+    mbedtls_sha1_free( &ctx );
 
     return( ret );
 }
 
-#endif /* POLARSSL_SELF_TEST */
+#endif /* MBEDTLS_SELF_TEST */
 
-#endif /* POLARSSL_SHA1_C */
+#endif /* MBEDTLS_SHA1_C */
diff --git a/common/mbedtls/sha1.h b/common/mbedtls/sha1.h
new file mode 100644
index 000000000..872fe1b05
--- /dev/null
+++ b/common/mbedtls/sha1.h
@@ -0,0 +1,326 @@
+/**
+ * \file sha1.h
+ *
+ * \brief This file contains SHA-1 definitions and functions.
+ *
+ * The Secure Hash Algorithm 1 (SHA-1) cryptographic hash function is defined in
+ * <em>FIPS 180-4: Secure Hash Standard (SHS)</em>.
+ *
+ * \warning   SHA-1 is considered a weak message digest and its use constitutes
+ *            a security risk. We recommend considering stronger message
+ *            digests instead.
+ */
+/*
+ *  Copyright (C) 2006-2018, Arm Limited (or its affiliates), All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of Mbed TLS (https://tls.mbed.org)
+ */
+#ifndef MBEDTLS_SHA1_H
+#define MBEDTLS_SHA1_H
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#include <stddef.h>
+#include <stdint.h>
+
+#define MBEDTLS_ERR_SHA1_HW_ACCEL_FAILED                  -0x0035  /**< SHA-1 hardware accelerator failed */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if !defined(MBEDTLS_SHA1_ALT)
+// Regular implementation
+//
+
+/**
+ * \brief          The SHA-1 context structure.
+ *
+ * \warning        SHA-1 is considered a weak message digest and its use
+ *                 constitutes a security risk. We recommend considering
+ *                 stronger message digests instead.
+ *
+ */
+typedef struct mbedtls_sha1_context
+{
+    uint32_t total[2];          /*!< The number of Bytes processed.  */
+    uint32_t state[5];          /*!< The intermediate digest state.  */
+    unsigned char buffer[64];   /*!< The data block being processed. */
+}
+mbedtls_sha1_context;
+
+#else  /* MBEDTLS_SHA1_ALT */
+#include "sha1_alt.h"
+#endif /* MBEDTLS_SHA1_ALT */
+
+/**
+ * \brief          This function initializes a SHA-1 context.
+ *
+ * \warning        SHA-1 is considered a weak message digest and its use
+ *                 constitutes a security risk. We recommend considering
+ *                 stronger message digests instead.
+ *
+ * \param ctx      The SHA-1 context to initialize.
+ *
+ */
+void mbedtls_sha1_init( mbedtls_sha1_context *ctx );
+
+/**
+ * \brief          This function clears a SHA-1 context.
+ *
+ * \warning        SHA-1 is considered a weak message digest and its use
+ *                 constitutes a security risk. We recommend considering
+ *                 stronger message digests instead.
+ *
+ * \param ctx      The SHA-1 context to clear.
+ *
+ */
+void mbedtls_sha1_free( mbedtls_sha1_context *ctx );
+
+/**
+ * \brief          This function clones the state of a SHA-1 context.
+ *
+ * \warning        SHA-1 is considered a weak message digest and its use
+ *                 constitutes a security risk. We recommend considering
+ *                 stronger message digests instead.
+ *
+ * \param dst      The SHA-1 context to clone to.
+ * \param src      The SHA-1 context to clone from.
+ *
+ */
+void mbedtls_sha1_clone( mbedtls_sha1_context *dst,
+                         const mbedtls_sha1_context *src );
+
+/**
+ * \brief          This function starts a SHA-1 checksum calculation.
+ *
+ * \warning        SHA-1 is considered a weak message digest and its use
+ *                 constitutes a security risk. We recommend considering
+ *                 stronger message digests instead.
+ *
+ * \param ctx      The SHA-1 context to initialize.
+ *
+ * \return         \c 0 on success.
+ *
+ */
+int mbedtls_sha1_starts_ret( mbedtls_sha1_context *ctx );
+
+/**
+ * \brief          This function feeds an input buffer into an ongoing SHA-1
+ *                 checksum calculation.
+ *
+ * \warning        SHA-1 is considered a weak message digest and its use
+ *                 constitutes a security risk. We recommend considering
+ *                 stronger message digests instead.
+ *
+ * \param ctx      The SHA-1 context.
+ * \param input    The buffer holding the input data.
+ * \param ilen     The length of the input data.
+ *
+ * \return         \c 0 on success.
+ */
+int mbedtls_sha1_update_ret( mbedtls_sha1_context *ctx,
+                             const unsigned char *input,
+                             size_t ilen );
+
+/**
+ * \brief          This function finishes the SHA-1 operation, and writes
+ *                 the result to the output buffer.
+ *
+ * \warning        SHA-1 is considered a weak message digest and its use
+ *                 constitutes a security risk. We recommend considering
+ *                 stronger message digests instead.
+ *
+ * \param ctx      The SHA-1 context.
+ * \param output   The SHA-1 checksum result.
+ *
+ * \return         \c 0 on success.
+ */
+int mbedtls_sha1_finish_ret( mbedtls_sha1_context *ctx,
+                             unsigned char output[20] );
+
+/**
+ * \brief          SHA-1 process data block (internal use only).
+ *
+ * \warning        SHA-1 is considered a weak message digest and its use
+ *                 constitutes a security risk. We recommend considering
+ *                 stronger message digests instead.
+ *
+ * \param ctx      The SHA-1 context.
+ * \param data     The data block being processed.
+ *
+ * \return         \c 0 on success.
+ *
+ */
+int mbedtls_internal_sha1_process( mbedtls_sha1_context *ctx,
+                                   const unsigned char data[64] );
+
+#if !defined(MBEDTLS_DEPRECATED_REMOVED)
+#if defined(MBEDTLS_DEPRECATED_WARNING)
+#define MBEDTLS_DEPRECATED      __attribute__((deprecated))
+#else
+#define MBEDTLS_DEPRECATED
+#endif
+/**
+ * \brief          This function starts a SHA-1 checksum calculation.
+ *
+ * \warning        SHA-1 is considered a weak message digest and its use
+ *                 constitutes a security risk. We recommend considering
+ *                 stronger message digests instead.
+ *
+ * \deprecated     Superseded by mbedtls_sha1_starts_ret() in 2.7.0.
+ *
+ * \param ctx      The SHA-1 context to initialize.
+ *
+ */
+MBEDTLS_DEPRECATED void mbedtls_sha1_starts( mbedtls_sha1_context *ctx );
+
+/**
+ * \brief          This function feeds an input buffer into an ongoing SHA-1
+ *                 checksum calculation.
+ *
+ * \warning        SHA-1 is considered a weak message digest and its use
+ *                 constitutes a security risk. We recommend considering
+ *                 stronger message digests instead.
+ *
+ * \deprecated     Superseded by mbedtls_sha1_update_ret() in 2.7.0.
+ *
+ * \param ctx      The SHA-1 context.
+ * \param input    The buffer holding the input data.
+ * \param ilen     The length of the input data.
+ *
+ */
+MBEDTLS_DEPRECATED void mbedtls_sha1_update( mbedtls_sha1_context *ctx,
+                                             const unsigned char *input,
+                                             size_t ilen );
+
+/**
+ * \brief          This function finishes the SHA-1 operation, and writes
+ *                 the result to the output buffer.
+ *
+ * \warning        SHA-1 is considered a weak message digest and its use
+ *                 constitutes a security risk. We recommend considering
+ *                 stronger message digests instead.
+ *
+ * \deprecated     Superseded by mbedtls_sha1_finish_ret() in 2.7.0.
+ *
+ * \param ctx      The SHA-1 context.
+ * \param output   The SHA-1 checksum result.
+ *
+ */
+MBEDTLS_DEPRECATED void mbedtls_sha1_finish( mbedtls_sha1_context *ctx,
+                                             unsigned char output[20] );
+
+/**
+ * \brief          SHA-1 process data block (internal use only).
+ *
+ * \warning        SHA-1 is considered a weak message digest and its use
+ *                 constitutes a security risk. We recommend considering
+ *                 stronger message digests instead.
+ *
+ * \deprecated     Superseded by mbedtls_internal_sha1_process() in 2.7.0.
+ *
+ * \param ctx      The SHA-1 context.
+ * \param data     The data block being processed.
+ *
+ */
+MBEDTLS_DEPRECATED void mbedtls_sha1_process( mbedtls_sha1_context *ctx,
+                                              const unsigned char data[64] );
+
+#undef MBEDTLS_DEPRECATED
+#endif /* !MBEDTLS_DEPRECATED_REMOVED */
+
+/**
+ * \brief          This function calculates the SHA-1 checksum of a buffer.
+ *
+ *                 The function allocates the context, performs the
+ *                 calculation, and frees the context.
+ *
+ *                 The SHA-1 result is calculated as
+ *                 output = SHA-1(input buffer).
+ *
+ * \warning        SHA-1 is considered a weak message digest and its use
+ *                 constitutes a security risk. We recommend considering
+ *                 stronger message digests instead.
+ *
+ * \param input    The buffer holding the input data.
+ * \param ilen     The length of the input data.
+ * \param output   The SHA-1 checksum result.
+ *
+ * \return         \c 0 on success.
+ *
+ */
+int mbedtls_sha1_ret( const unsigned char *input,
+                      size_t ilen,
+                      unsigned char output[20] );
+
+#if !defined(MBEDTLS_DEPRECATED_REMOVED)
+#if defined(MBEDTLS_DEPRECATED_WARNING)
+#define MBEDTLS_DEPRECATED      __attribute__((deprecated))
+#else
+#define MBEDTLS_DEPRECATED
+#endif
+/**
+ * \brief          This function calculates the SHA-1 checksum of a buffer.
+ *
+ *                 The function allocates the context, performs the
+ *                 calculation, and frees the context.
+ *
+ *                 The SHA-1 result is calculated as
+ *                 output = SHA-1(input buffer).
+ *
+ * \warning        SHA-1 is considered a weak message digest and its use
+ *                 constitutes a security risk. We recommend considering
+ *                 stronger message digests instead.
+ *
+ * \deprecated     Superseded by mbedtls_sha1_ret() in 2.7.0
+ *
+ * \param input    The buffer holding the input data.
+ * \param ilen     The length of the input data.
+ * \param output   The SHA-1 checksum result.
+ *
+ */
+MBEDTLS_DEPRECATED void mbedtls_sha1( const unsigned char *input,
+                                      size_t ilen,
+                                      unsigned char output[20] );
+
+#undef MBEDTLS_DEPRECATED
+#endif /* !MBEDTLS_DEPRECATED_REMOVED */
+
+/**
+ * \brief          The SHA-1 checkup routine.
+ *
+ * \warning        SHA-1 is considered a weak message digest and its use
+ *                 constitutes a security risk. We recommend considering
+ *                 stronger message digests instead.
+ *
+ * \return         \c 0 on success.
+ * \return         \c 1 on failure.
+ *
+ */
+int mbedtls_sha1_self_test( int verbose );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* mbedtls_sha1.h */
diff --git a/common/polarssl/sha256.c b/common/mbedtls/sha256.c
similarity index 70%
rename from common/polarssl/sha256.c
rename to common/mbedtls/sha256.c
index d5e702218..06b5f7a7b 100644
--- a/common/polarssl/sha256.c
+++ b/common/mbedtls/sha256.c
@@ -1,9 +1,8 @@
 /*
  *  FIPS-180-2 compliant SHA-256 implementation
  *
- *  Copyright (C) 2006-2014, ARM Limited, All Rights Reserved
- *
- *  This file is part of mbed TLS (https://tls.mbed.org)
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -18,6 +17,8 @@
  *  You should have received a copy of the GNU General Public License along
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
  */
 /*
  *  The SHA-256 Secure Hash Standard was published by NIST in 2002.
@@ -26,7 +27,7 @@
  */
 
 #if !defined(MBEDTLS_CONFIG_FILE)
-//#include "mbedtls/config.h"
+#include "mbedtls/config.h"
 #else
 #include MBEDTLS_CONFIG_FILE
 #endif
@@ -34,6 +35,7 @@
 #if defined(MBEDTLS_SHA256_C)
 
 #include "mbedtls/sha256.h"
+#include "mbedtls/platform_util.h"
 
 #include <string.h>
 
@@ -42,15 +44,13 @@
 #include "mbedtls/platform.h"
 #else
 #include <stdio.h>
+#include <stdlib.h>
 #define mbedtls_printf printf
+#define mbedtls_calloc    calloc
+#define mbedtls_free       free
 #endif /* MBEDTLS_PLATFORM_C */
 #endif /* MBEDTLS_SELF_TEST */
 
-/* Implementation that should never be optimized out by the compiler */
-static void mbedtls_zeroize( void *v, size_t n ) {
-    volatile unsigned char *p = v; while( n-- ) *p++ = 0;
-}
-
 #if !defined(MBEDTLS_SHA256_ALT)
 
 /*
@@ -86,7 +86,7 @@ void mbedtls_sha256_free( mbedtls_sha256_context *ctx )
     if( ctx == NULL )
         return;
 
-    mbedtls_zeroize( ctx, sizeof( mbedtls_sha256_context ) );
+    mbedtls_platform_zeroize( ctx, sizeof( mbedtls_sha256_context ) );
 }
 
 void mbedtls_sha256_clone( mbedtls_sha256_context *dst,
@@ -98,7 +98,7 @@ void mbedtls_sha256_clone( mbedtls_sha256_context *dst,
 /*
  * SHA-256 context setup
  */
-void mbedtls_sha256_starts( mbedtls_sha256_context *ctx, int is224 )
+int mbedtls_sha256_starts_ret( mbedtls_sha256_context *ctx, int is224 )
 {
     ctx->total[0] = 0;
     ctx->total[1] = 0;
@@ -129,8 +129,18 @@ void mbedtls_sha256_starts( mbedtls_sha256_context *ctx, int is224 )
     }
 
     ctx->is224 = is224;
+
+    return( 0 );
 }
 
+#if !defined(MBEDTLS_DEPRECATED_REMOVED)
+void mbedtls_sha256_starts( mbedtls_sha256_context *ctx,
+                            int is224 )
+{
+    mbedtls_sha256_starts_ret( ctx, is224 );
+}
+#endif
+
 #if !defined(MBEDTLS_SHA256_PROCESS_ALT)
 static const uint32_t K[] =
 {
@@ -177,7 +187,8 @@ static const uint32_t K[] =
     d += temp1; h = temp1 + temp2;              \
 }
 
-void mbedtls_sha256_process( mbedtls_sha256_context *ctx, const unsigned char data[64] )
+int mbedtls_internal_sha256_process( mbedtls_sha256_context *ctx,
+                                const unsigned char data[64] )
 {
     uint32_t temp1, temp2, W[64];
     uint32_t A[8];
@@ -230,20 +241,32 @@ void mbedtls_sha256_process( mbedtls_sha256_context *ctx, const unsigned char da
 
     for( i = 0; i < 8; i++ )
         ctx->state[i] += A[i];
+
+    return( 0 );
 }
+
+#if !defined(MBEDTLS_DEPRECATED_REMOVED)
+void mbedtls_sha256_process( mbedtls_sha256_context *ctx,
+                             const unsigned char data[64] )
+{
+    mbedtls_internal_sha256_process( ctx, data );
+}
+#endif
 #endif /* !MBEDTLS_SHA256_PROCESS_ALT */
 
 /*
  * SHA-256 process buffer
  */
-void mbedtls_sha256_update( mbedtls_sha256_context *ctx, const unsigned char *input,
-                    size_t ilen )
+int mbedtls_sha256_update_ret( mbedtls_sha256_context *ctx,
+                               const unsigned char *input,
+                               size_t ilen )
 {
+    int ret;
     size_t fill;
     uint32_t left;
 
     if( ilen == 0 )
-        return;
+        return( 0 );
 
     left = ctx->total[0] & 0x3F;
     fill = 64 - left;
@@ -257,7 +280,10 @@ void mbedtls_sha256_update( mbedtls_sha256_context *ctx, const unsigned char *in
     if( left && ilen >= fill )
     {
         memcpy( (void *) (ctx->buffer + left), input, fill );
-        mbedtls_sha256_process( ctx, ctx->buffer );
+
+        if( ( ret = mbedtls_internal_sha256_process( ctx, ctx->buffer ) ) != 0 )
+            return( ret );
+
         input += fill;
         ilen  -= fill;
         left = 0;
@@ -265,45 +291,77 @@ void mbedtls_sha256_update( mbedtls_sha256_context *ctx, const unsigned char *in
 
     while( ilen >= 64 )
     {
-        mbedtls_sha256_process( ctx, input );
+        if( ( ret = mbedtls_internal_sha256_process( ctx, input ) ) != 0 )
+            return( ret );
+
         input += 64;
         ilen  -= 64;
     }
 
     if( ilen > 0 )
         memcpy( (void *) (ctx->buffer + left), input, ilen );
+
+    return( 0 );
 }
 
-static const unsigned char sha256_padding[64] =
+#if !defined(MBEDTLS_DEPRECATED_REMOVED)
+void mbedtls_sha256_update( mbedtls_sha256_context *ctx,
+                            const unsigned char *input,
+                            size_t ilen )
 {
- 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
+    mbedtls_sha256_update_ret( ctx, input, ilen );
+}
+#endif
 
 /*
  * SHA-256 final digest
  */
-void mbedtls_sha256_finish( mbedtls_sha256_context *ctx, unsigned char output[32] )
+int mbedtls_sha256_finish_ret( mbedtls_sha256_context *ctx,
+                               unsigned char output[32] )
 {
-    uint32_t last, padn;
+    int ret;
+    uint32_t used;
     uint32_t high, low;
-    unsigned char msglen[8];
 
+    /*
+     * Add padding: 0x80 then 0x00 until 8 bytes remain for the length
+     */
+    used = ctx->total[0] & 0x3F;
+
+    ctx->buffer[used++] = 0x80;
+
+    if( used <= 56 )
+    {
+        /* Enough room for padding + length in current block */
+        memset( ctx->buffer + used, 0, 56 - used );
+    }
+    else
+    {
+        /* We'll need an extra block */
+        memset( ctx->buffer + used, 0, 64 - used );
+
+        if( ( ret = mbedtls_internal_sha256_process( ctx, ctx->buffer ) ) != 0 )
+            return( ret );
+
+        memset( ctx->buffer, 0, 56 );
+    }
+
+    /*
+     * Add message length
+     */
     high = ( ctx->total[0] >> 29 )
          | ( ctx->total[1] <<  3 );
     low  = ( ctx->total[0] <<  3 );
 
-    PUT_UINT32_BE( high, msglen, 0 );
-    PUT_UINT32_BE( low,  msglen, 4 );
+    PUT_UINT32_BE( high, ctx->buffer, 56 );
+    PUT_UINT32_BE( low,  ctx->buffer, 60 );
 
-    last = ctx->total[0] & 0x3F;
-    padn = ( last < 56 ) ? ( 56 - last ) : ( 120 - last );
-
-    mbedtls_sha256_update( ctx, sha256_padding, padn );
-    mbedtls_sha256_update( ctx, msglen, 8 );
+    if( ( ret = mbedtls_internal_sha256_process( ctx, ctx->buffer ) ) != 0 )
+        return( ret );
 
+    /*
+     * Output final state
+     */
     PUT_UINT32_BE( ctx->state[0], output,  0 );
     PUT_UINT32_BE( ctx->state[1], output,  4 );
     PUT_UINT32_BE( ctx->state[2], output,  8 );
@@ -314,25 +372,58 @@ void mbedtls_sha256_finish( mbedtls_sha256_context *ctx, unsigned char output[32
 
     if( ctx->is224 == 0 )
         PUT_UINT32_BE( ctx->state[7], output, 28 );
+
+    return( 0 );
 }
 
+#if !defined(MBEDTLS_DEPRECATED_REMOVED)
+void mbedtls_sha256_finish( mbedtls_sha256_context *ctx,
+                            unsigned char output[32] )
+{
+    mbedtls_sha256_finish_ret( ctx, output );
+}
+#endif
+
 #endif /* !MBEDTLS_SHA256_ALT */
 
 /*
  * output = SHA-256( input buffer )
  */
-void mbedtls_sha256( const unsigned char *input, size_t ilen,
-             unsigned char output[32], int is224 )
+int mbedtls_sha256_ret( const unsigned char *input,
+                        size_t ilen,
+                        unsigned char output[32],
+                        int is224 )
 {
+    int ret;
     mbedtls_sha256_context ctx;
 
     mbedtls_sha256_init( &ctx );
-    mbedtls_sha256_starts( &ctx, is224 );
-    mbedtls_sha256_update( &ctx, input, ilen );
-    mbedtls_sha256_finish( &ctx, output );
+
+    if( ( ret = mbedtls_sha256_starts_ret( &ctx, is224 ) ) != 0 )
+        goto exit;
+
+    if( ( ret = mbedtls_sha256_update_ret( &ctx, input, ilen ) ) != 0 )
+        goto exit;
+
+    if( ( ret = mbedtls_sha256_finish_ret( &ctx, output ) ) != 0 )
+        goto exit;
+
+exit:
     mbedtls_sha256_free( &ctx );
+
+    return( ret );
 }
 
+#if !defined(MBEDTLS_DEPRECATED_REMOVED)
+void mbedtls_sha256( const unsigned char *input,
+                     size_t ilen,
+                     unsigned char output[32],
+                     int is224 )
+{
+    mbedtls_sha256_ret( input, ilen, output, is224 );
+}
+#endif
+
 #if defined(MBEDTLS_SELF_TEST)
 /*
  * FIPS-180-2 test vectors
@@ -344,7 +435,7 @@ static const unsigned char sha256_test_buf[3][57] =
     { "" }
 };
 
-static const int sha256_test_buflen[3] =
+static const size_t sha256_test_buflen[3] =
 {
     3, 56, 1000
 };
@@ -390,10 +481,19 @@ static const unsigned char sha256_test_sum[6][32] =
 int mbedtls_sha256_self_test( int verbose )
 {
     int i, j, k, buflen, ret = 0;
-    unsigned char buf[1024];
+    unsigned char *buf;
     unsigned char sha256sum[32];
     mbedtls_sha256_context ctx;
 
+    buf = mbedtls_calloc( 1024, sizeof(unsigned char) );
+    if( NULL == buf )
+    {
+        if( verbose != 0 )
+            mbedtls_printf( "Buffer allocation failed\n" );
+
+        return( 1 );
+    }
+
     mbedtls_sha256_init( &ctx );
 
     for( i = 0; i < 6; i++ )
@@ -404,28 +504,37 @@ int mbedtls_sha256_self_test( int verbose )
         if( verbose != 0 )
             mbedtls_printf( "  SHA-%d test #%d: ", 256 - k * 32, j + 1 );
 
-        mbedtls_sha256_starts( &ctx, k );
+        if( ( ret = mbedtls_sha256_starts_ret( &ctx, k ) ) != 0 )
+            goto fail;
 
         if( j == 2 )
         {
             memset( buf, 'a', buflen = 1000 );
 
             for( j = 0; j < 1000; j++ )
-                mbedtls_sha256_update( &ctx, buf, buflen );
+            {
+                ret = mbedtls_sha256_update_ret( &ctx, buf, buflen );
+                if( ret != 0 )
+                    goto fail;
+            }
+
         }
         else
-            mbedtls_sha256_update( &ctx, sha256_test_buf[j],
-                                 sha256_test_buflen[j] );
+        {
+            ret = mbedtls_sha256_update_ret( &ctx, sha256_test_buf[j],
+                                             sha256_test_buflen[j] );
+            if( ret != 0 )
+                 goto fail;
+        }
+
+        if( ( ret = mbedtls_sha256_finish_ret( &ctx, sha256sum ) ) != 0 )
+            goto fail;
 
-        mbedtls_sha256_finish( &ctx, sha256sum );
 
         if( memcmp( sha256sum, sha256_test_sum[i], 32 - k * 4 ) != 0 )
         {
-            if( verbose != 0 )
-                mbedtls_printf( "failed\n" );
-
             ret = 1;
-            goto exit;
+            goto fail;
         }
 
         if( verbose != 0 )
@@ -435,8 +544,15 @@ int mbedtls_sha256_self_test( int verbose )
     if( verbose != 0 )
         mbedtls_printf( "\n" );
 
+    goto exit;
+
+fail:
+    if( verbose != 0 )
+        mbedtls_printf( "failed\n" );
+
 exit:
     mbedtls_sha256_free( &ctx );
+    mbedtls_free( buf );
 
     return( ret );
 }
diff --git a/common/mbedtls/sha256.h b/common/mbedtls/sha256.h
new file mode 100644
index 000000000..0aebdde25
--- /dev/null
+++ b/common/mbedtls/sha256.h
@@ -0,0 +1,274 @@
+/**
+ * \file sha256.h
+ *
+ * \brief This file contains SHA-224 and SHA-256 definitions and functions.
+ *
+ * The Secure Hash Algorithms 224 and 256 (SHA-224 and SHA-256) cryptographic
+ * hash functions are defined in <em>FIPS 180-4: Secure Hash Standard (SHS)</em>.
+ */
+/*
+ *  Copyright (C) 2006-2018, Arm Limited (or its affiliates), All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of Mbed TLS (https://tls.mbed.org)
+ */
+#ifndef MBEDTLS_SHA256_H
+#define MBEDTLS_SHA256_H
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#include <stddef.h>
+#include <stdint.h>
+
+#define MBEDTLS_ERR_SHA256_HW_ACCEL_FAILED                -0x0037  /**< SHA-256 hardware accelerator failed */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if !defined(MBEDTLS_SHA256_ALT)
+// Regular implementation
+//
+
+/**
+ * \brief          The SHA-256 context structure.
+ *
+ *                 The structure is used both for SHA-256 and for SHA-224
+ *                 checksum calculations. The choice between these two is
+ *                 made in the call to mbedtls_sha256_starts_ret().
+ */
+typedef struct mbedtls_sha256_context
+{
+    uint32_t total[2];          /*!< The number of Bytes processed.  */
+    uint32_t state[8];          /*!< The intermediate digest state.  */
+    unsigned char buffer[64];   /*!< The data block being processed. */
+    int is224;                  /*!< Determines which function to use:
+                                     0: Use SHA-256, or 1: Use SHA-224. */
+}
+mbedtls_sha256_context;
+
+#else  /* MBEDTLS_SHA256_ALT */
+#include "sha256_alt.h"
+#endif /* MBEDTLS_SHA256_ALT */
+
+/**
+ * \brief          This function initializes a SHA-256 context.
+ *
+ * \param ctx      The SHA-256 context to initialize.
+ */
+void mbedtls_sha256_init( mbedtls_sha256_context *ctx );
+
+/**
+ * \brief          This function clears a SHA-256 context.
+ *
+ * \param ctx      The SHA-256 context to clear.
+ */
+void mbedtls_sha256_free( mbedtls_sha256_context *ctx );
+
+/**
+ * \brief          This function clones the state of a SHA-256 context.
+ *
+ * \param dst      The destination context.
+ * \param src      The context to clone.
+ */
+void mbedtls_sha256_clone( mbedtls_sha256_context *dst,
+                           const mbedtls_sha256_context *src );
+
+/**
+ * \brief          This function starts a SHA-224 or SHA-256 checksum
+ *                 calculation.
+ *
+ * \param ctx      The context to initialize.
+ * \param is224    Determines which function to use:
+ *                 0: Use SHA-256, or 1: Use SHA-224.
+ *
+ * \return         \c 0 on success.
+ */
+int mbedtls_sha256_starts_ret( mbedtls_sha256_context *ctx, int is224 );
+
+/**
+ * \brief          This function feeds an input buffer into an ongoing
+ *                 SHA-256 checksum calculation.
+ *
+ * \param ctx      The SHA-256 context.
+ * \param input    The buffer holding the data.
+ * \param ilen     The length of the input data.
+ *
+ * \return         \c 0 on success.
+ */
+int mbedtls_sha256_update_ret( mbedtls_sha256_context *ctx,
+                               const unsigned char *input,
+                               size_t ilen );
+
+/**
+ * \brief          This function finishes the SHA-256 operation, and writes
+ *                 the result to the output buffer.
+ *
+ * \param ctx      The SHA-256 context.
+ * \param output   The SHA-224 or SHA-256 checksum result.
+ *
+ * \return         \c 0 on success.
+ */
+int mbedtls_sha256_finish_ret( mbedtls_sha256_context *ctx,
+                               unsigned char output[32] );
+
+/**
+ * \brief          This function processes a single data block within
+ *                 the ongoing SHA-256 computation. This function is for
+ *                 internal use only.
+ *
+ * \param ctx      The SHA-256 context.
+ * \param data     The buffer holding one block of data.
+ *
+ * \return         \c 0 on success.
+ */
+int mbedtls_internal_sha256_process( mbedtls_sha256_context *ctx,
+                                     const unsigned char data[64] );
+
+#if !defined(MBEDTLS_DEPRECATED_REMOVED)
+#if defined(MBEDTLS_DEPRECATED_WARNING)
+#define MBEDTLS_DEPRECATED      __attribute__((deprecated))
+#else
+#define MBEDTLS_DEPRECATED
+#endif
+/**
+ * \brief          This function starts a SHA-224 or SHA-256 checksum
+ *                 calculation.
+ *
+ *
+ * \deprecated     Superseded by mbedtls_sha256_starts_ret() in 2.7.0.
+ *
+ * \param ctx      The context to initialize.
+ * \param is224    Determines which function to use:
+ *                 0: Use SHA-256, or 1: Use SHA-224.
+ */
+MBEDTLS_DEPRECATED void mbedtls_sha256_starts( mbedtls_sha256_context *ctx,
+                                               int is224 );
+
+/**
+ * \brief          This function feeds an input buffer into an ongoing
+ *                 SHA-256 checksum calculation.
+ *
+ * \deprecated     Superseded by mbedtls_sha256_update_ret() in 2.7.0.
+ *
+ * \param ctx      The SHA-256 context to initialize.
+ * \param input    The buffer holding the data.
+ * \param ilen     The length of the input data.
+ */
+MBEDTLS_DEPRECATED void mbedtls_sha256_update( mbedtls_sha256_context *ctx,
+                                               const unsigned char *input,
+                                               size_t ilen );
+
+/**
+ * \brief          This function finishes the SHA-256 operation, and writes
+ *                 the result to the output buffer.
+ *
+ * \deprecated     Superseded by mbedtls_sha256_finish_ret() in 2.7.0.
+ *
+ * \param ctx      The SHA-256 context.
+ * \param output   The SHA-224 or SHA-256 checksum result.
+ */
+MBEDTLS_DEPRECATED void mbedtls_sha256_finish( mbedtls_sha256_context *ctx,
+                                               unsigned char output[32] );
+
+/**
+ * \brief          This function processes a single data block within
+ *                 the ongoing SHA-256 computation. This function is for
+ *                 internal use only.
+ *
+ * \deprecated     Superseded by mbedtls_internal_sha256_process() in 2.7.0.
+ *
+ * \param ctx      The SHA-256 context.
+ * \param data     The buffer holding one block of data.
+ */
+MBEDTLS_DEPRECATED void mbedtls_sha256_process( mbedtls_sha256_context *ctx,
+                                                const unsigned char data[64] );
+
+#undef MBEDTLS_DEPRECATED
+#endif /* !MBEDTLS_DEPRECATED_REMOVED */
+
+/**
+ * \brief          This function calculates the SHA-224 or SHA-256
+ *                 checksum of a buffer.
+ *
+ *                 The function allocates the context, performs the
+ *                 calculation, and frees the context.
+ *
+ *                 The SHA-256 result is calculated as
+ *                 output = SHA-256(input buffer).
+ *
+ * \param input    The buffer holding the input data.
+ * \param ilen     The length of the input data.
+ * \param output   The SHA-224 or SHA-256 checksum result.
+ * \param is224    Determines which function to use:
+ *                 0: Use SHA-256, or 1: Use SHA-224.
+ */
+int mbedtls_sha256_ret( const unsigned char *input,
+                        size_t ilen,
+                        unsigned char output[32],
+                        int is224 );
+
+#if !defined(MBEDTLS_DEPRECATED_REMOVED)
+#if defined(MBEDTLS_DEPRECATED_WARNING)
+#define MBEDTLS_DEPRECATED      __attribute__((deprecated))
+#else
+#define MBEDTLS_DEPRECATED
+#endif
+
+/**
+ * \brief          This function calculates the SHA-224 or SHA-256 checksum
+ *                 of a buffer.
+ *
+ *                 The function allocates the context, performs the
+ *                 calculation, and frees the context.
+ *
+ *                 The SHA-256 result is calculated as
+ *                 output = SHA-256(input buffer).
+ *
+ * \deprecated     Superseded by mbedtls_sha256_ret() in 2.7.0.
+ *
+ * \param input    The buffer holding the data.
+ * \param ilen     The length of the input data.
+ * \param output   The SHA-224 or SHA-256 checksum result.
+ * \param is224    Determines which function to use:
+ *                 0: Use SHA-256, or 1: Use SHA-224.
+ */
+MBEDTLS_DEPRECATED void mbedtls_sha256( const unsigned char *input,
+                                        size_t ilen,
+                                        unsigned char output[32],
+                                        int is224 );
+
+#undef MBEDTLS_DEPRECATED
+#endif /* !MBEDTLS_DEPRECATED_REMOVED */
+
+/**
+ * \brief          The SHA-224 and SHA-256 checkup routine.
+ *
+ * \return         \c 0 on success.
+ * \return         \c 1 on failure.
+ */
+int mbedtls_sha256_self_test( int verbose );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* mbedtls_sha256.h */
diff --git a/common/mbedtls/sha512.c b/common/mbedtls/sha512.c
new file mode 100644
index 000000000..331965dae
--- /dev/null
+++ b/common/mbedtls/sha512.c
@@ -0,0 +1,612 @@
+/*
+ *  FIPS-180-2 compliant SHA-384/512 implementation
+ *
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+/*
+ *  The SHA-512 Secure Hash Standard was published by NIST in 2002.
+ *
+ *  http://csrc.nist.gov/publications/fips/fips180-2/fips180-2.pdf
+ */
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "mbedtls/config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#if defined(MBEDTLS_SHA512_C)
+
+#include "mbedtls/sha512.h"
+#include "mbedtls/platform_util.h"
+
+#if defined(_MSC_VER) || defined(__WATCOMC__)
+  #define UL64(x) x##ui64
+#else
+  #define UL64(x) x##ULL
+#endif
+
+#include <string.h>
+
+#if defined(MBEDTLS_SELF_TEST)
+#if defined(MBEDTLS_PLATFORM_C)
+#include "mbedtls/platform.h"
+#else
+#include <stdio.h>
+#include <stdlib.h>
+#define mbedtls_printf printf
+#define mbedtls_calloc    calloc
+#define mbedtls_free       free
+#endif /* MBEDTLS_PLATFORM_C */
+#endif /* MBEDTLS_SELF_TEST */
+
+#if !defined(MBEDTLS_SHA512_ALT)
+
+/*
+ * 64-bit integer manipulation macros (big endian)
+ */
+#ifndef GET_UINT64_BE
+#define GET_UINT64_BE(n,b,i)                            \
+{                                                       \
+    (n) = ( (uint64_t) (b)[(i)    ] << 56 )       \
+        | ( (uint64_t) (b)[(i) + 1] << 48 )       \
+        | ( (uint64_t) (b)[(i) + 2] << 40 )       \
+        | ( (uint64_t) (b)[(i) + 3] << 32 )       \
+        | ( (uint64_t) (b)[(i) + 4] << 24 )       \
+        | ( (uint64_t) (b)[(i) + 5] << 16 )       \
+        | ( (uint64_t) (b)[(i) + 6] <<  8 )       \
+        | ( (uint64_t) (b)[(i) + 7]       );      \
+}
+#endif /* GET_UINT64_BE */
+
+#ifndef PUT_UINT64_BE
+#define PUT_UINT64_BE(n,b,i)                            \
+{                                                       \
+    (b)[(i)    ] = (unsigned char) ( (n) >> 56 );       \
+    (b)[(i) + 1] = (unsigned char) ( (n) >> 48 );       \
+    (b)[(i) + 2] = (unsigned char) ( (n) >> 40 );       \
+    (b)[(i) + 3] = (unsigned char) ( (n) >> 32 );       \
+    (b)[(i) + 4] = (unsigned char) ( (n) >> 24 );       \
+    (b)[(i) + 5] = (unsigned char) ( (n) >> 16 );       \
+    (b)[(i) + 6] = (unsigned char) ( (n) >>  8 );       \
+    (b)[(i) + 7] = (unsigned char) ( (n)       );       \
+}
+#endif /* PUT_UINT64_BE */
+
+void mbedtls_sha512_init( mbedtls_sha512_context *ctx )
+{
+    memset( ctx, 0, sizeof( mbedtls_sha512_context ) );
+}
+
+void mbedtls_sha512_free( mbedtls_sha512_context *ctx )
+{
+    if( ctx == NULL )
+        return;
+
+    mbedtls_platform_zeroize( ctx, sizeof( mbedtls_sha512_context ) );
+}
+
+void mbedtls_sha512_clone( mbedtls_sha512_context *dst,
+                           const mbedtls_sha512_context *src )
+{
+    *dst = *src;
+}
+
+/*
+ * SHA-512 context setup
+ */
+int mbedtls_sha512_starts_ret( mbedtls_sha512_context *ctx, int is384 )
+{
+    ctx->total[0] = 0;
+    ctx->total[1] = 0;
+
+    if( is384 == 0 )
+    {
+        /* SHA-512 */
+        ctx->state[0] = UL64(0x6A09E667F3BCC908);
+        ctx->state[1] = UL64(0xBB67AE8584CAA73B);
+        ctx->state[2] = UL64(0x3C6EF372FE94F82B);
+        ctx->state[3] = UL64(0xA54FF53A5F1D36F1);
+        ctx->state[4] = UL64(0x510E527FADE682D1);
+        ctx->state[5] = UL64(0x9B05688C2B3E6C1F);
+        ctx->state[6] = UL64(0x1F83D9ABFB41BD6B);
+        ctx->state[7] = UL64(0x5BE0CD19137E2179);
+    }
+    else
+    {
+        /* SHA-384 */
+        ctx->state[0] = UL64(0xCBBB9D5DC1059ED8);
+        ctx->state[1] = UL64(0x629A292A367CD507);
+        ctx->state[2] = UL64(0x9159015A3070DD17);
+        ctx->state[3] = UL64(0x152FECD8F70E5939);
+        ctx->state[4] = UL64(0x67332667FFC00B31);
+        ctx->state[5] = UL64(0x8EB44A8768581511);
+        ctx->state[6] = UL64(0xDB0C2E0D64F98FA7);
+        ctx->state[7] = UL64(0x47B5481DBEFA4FA4);
+    }
+
+    ctx->is384 = is384;
+
+    return( 0 );
+}
+
+#if !defined(MBEDTLS_DEPRECATED_REMOVED)
+void mbedtls_sha512_starts( mbedtls_sha512_context *ctx,
+                            int is384 )
+{
+    mbedtls_sha512_starts_ret( ctx, is384 );
+}
+#endif
+
+#if !defined(MBEDTLS_SHA512_PROCESS_ALT)
+
+/*
+ * Round constants
+ */
+static const uint64_t K[80] =
+{
+    UL64(0x428A2F98D728AE22),  UL64(0x7137449123EF65CD),
+    UL64(0xB5C0FBCFEC4D3B2F),  UL64(0xE9B5DBA58189DBBC),
+    UL64(0x3956C25BF348B538),  UL64(0x59F111F1B605D019),
+    UL64(0x923F82A4AF194F9B),  UL64(0xAB1C5ED5DA6D8118),
+    UL64(0xD807AA98A3030242),  UL64(0x12835B0145706FBE),
+    UL64(0x243185BE4EE4B28C),  UL64(0x550C7DC3D5FFB4E2),
+    UL64(0x72BE5D74F27B896F),  UL64(0x80DEB1FE3B1696B1),
+    UL64(0x9BDC06A725C71235),  UL64(0xC19BF174CF692694),
+    UL64(0xE49B69C19EF14AD2),  UL64(0xEFBE4786384F25E3),
+    UL64(0x0FC19DC68B8CD5B5),  UL64(0x240CA1CC77AC9C65),
+    UL64(0x2DE92C6F592B0275),  UL64(0x4A7484AA6EA6E483),
+    UL64(0x5CB0A9DCBD41FBD4),  UL64(0x76F988DA831153B5),
+    UL64(0x983E5152EE66DFAB),  UL64(0xA831C66D2DB43210),
+    UL64(0xB00327C898FB213F),  UL64(0xBF597FC7BEEF0EE4),
+    UL64(0xC6E00BF33DA88FC2),  UL64(0xD5A79147930AA725),
+    UL64(0x06CA6351E003826F),  UL64(0x142929670A0E6E70),
+    UL64(0x27B70A8546D22FFC),  UL64(0x2E1B21385C26C926),
+    UL64(0x4D2C6DFC5AC42AED),  UL64(0x53380D139D95B3DF),
+    UL64(0x650A73548BAF63DE),  UL64(0x766A0ABB3C77B2A8),
+    UL64(0x81C2C92E47EDAEE6),  UL64(0x92722C851482353B),
+    UL64(0xA2BFE8A14CF10364),  UL64(0xA81A664BBC423001),
+    UL64(0xC24B8B70D0F89791),  UL64(0xC76C51A30654BE30),
+    UL64(0xD192E819D6EF5218),  UL64(0xD69906245565A910),
+    UL64(0xF40E35855771202A),  UL64(0x106AA07032BBD1B8),
+    UL64(0x19A4C116B8D2D0C8),  UL64(0x1E376C085141AB53),
+    UL64(0x2748774CDF8EEB99),  UL64(0x34B0BCB5E19B48A8),
+    UL64(0x391C0CB3C5C95A63),  UL64(0x4ED8AA4AE3418ACB),
+    UL64(0x5B9CCA4F7763E373),  UL64(0x682E6FF3D6B2B8A3),
+    UL64(0x748F82EE5DEFB2FC),  UL64(0x78A5636F43172F60),
+    UL64(0x84C87814A1F0AB72),  UL64(0x8CC702081A6439EC),
+    UL64(0x90BEFFFA23631E28),  UL64(0xA4506CEBDE82BDE9),
+    UL64(0xBEF9A3F7B2C67915),  UL64(0xC67178F2E372532B),
+    UL64(0xCA273ECEEA26619C),  UL64(0xD186B8C721C0C207),
+    UL64(0xEADA7DD6CDE0EB1E),  UL64(0xF57D4F7FEE6ED178),
+    UL64(0x06F067AA72176FBA),  UL64(0x0A637DC5A2C898A6),
+    UL64(0x113F9804BEF90DAE),  UL64(0x1B710B35131C471B),
+    UL64(0x28DB77F523047D84),  UL64(0x32CAAB7B40C72493),
+    UL64(0x3C9EBE0A15C9BEBC),  UL64(0x431D67C49C100D4C),
+    UL64(0x4CC5D4BECB3E42B6),  UL64(0x597F299CFC657E2A),
+    UL64(0x5FCB6FAB3AD6FAEC),  UL64(0x6C44198C4A475817)
+};
+
+int mbedtls_internal_sha512_process( mbedtls_sha512_context *ctx,
+                                     const unsigned char data[128] )
+{
+    int i;
+    uint64_t temp1, temp2, W[80];
+    uint64_t A, B, C, D, E, F, G, H;
+
+#define  SHR(x,n) (x >> n)
+#define ROTR(x,n) (SHR(x,n) | (x << (64 - n)))
+
+#define S0(x) (ROTR(x, 1) ^ ROTR(x, 8) ^  SHR(x, 7))
+#define S1(x) (ROTR(x,19) ^ ROTR(x,61) ^  SHR(x, 6))
+
+#define S2(x) (ROTR(x,28) ^ ROTR(x,34) ^ ROTR(x,39))
+#define S3(x) (ROTR(x,14) ^ ROTR(x,18) ^ ROTR(x,41))
+
+#define F0(x,y,z) ((x & y) | (z & (x | y)))
+#define F1(x,y,z) (z ^ (x & (y ^ z)))
+
+#define P(a,b,c,d,e,f,g,h,x,K)                  \
+{                                               \
+    temp1 = h + S3(e) + F1(e,f,g) + K + x;      \
+    temp2 = S2(a) + F0(a,b,c);                  \
+    d += temp1; h = temp1 + temp2;              \
+}
+
+    for( i = 0; i < 16; i++ )
+    {
+        GET_UINT64_BE( W[i], data, i << 3 );
+    }
+
+    for( ; i < 80; i++ )
+    {
+        W[i] = S1(W[i -  2]) + W[i -  7] +
+               S0(W[i - 15]) + W[i - 16];
+    }
+
+    A = ctx->state[0];
+    B = ctx->state[1];
+    C = ctx->state[2];
+    D = ctx->state[3];
+    E = ctx->state[4];
+    F = ctx->state[5];
+    G = ctx->state[6];
+    H = ctx->state[7];
+    i = 0;
+
+    do
+    {
+        P( A, B, C, D, E, F, G, H, W[i], K[i] ); i++;
+        P( H, A, B, C, D, E, F, G, W[i], K[i] ); i++;
+        P( G, H, A, B, C, D, E, F, W[i], K[i] ); i++;
+        P( F, G, H, A, B, C, D, E, W[i], K[i] ); i++;
+        P( E, F, G, H, A, B, C, D, W[i], K[i] ); i++;
+        P( D, E, F, G, H, A, B, C, W[i], K[i] ); i++;
+        P( C, D, E, F, G, H, A, B, W[i], K[i] ); i++;
+        P( B, C, D, E, F, G, H, A, W[i], K[i] ); i++;
+    }
+    while( i < 80 );
+
+    ctx->state[0] += A;
+    ctx->state[1] += B;
+    ctx->state[2] += C;
+    ctx->state[3] += D;
+    ctx->state[4] += E;
+    ctx->state[5] += F;
+    ctx->state[6] += G;
+    ctx->state[7] += H;
+
+    return( 0 );
+}
+
+#if !defined(MBEDTLS_DEPRECATED_REMOVED)
+void mbedtls_sha512_process( mbedtls_sha512_context *ctx,
+                             const unsigned char data[128] )
+{
+    mbedtls_internal_sha512_process( ctx, data );
+}
+#endif
+#endif /* !MBEDTLS_SHA512_PROCESS_ALT */
+
+/*
+ * SHA-512 process buffer
+ */
+int mbedtls_sha512_update_ret( mbedtls_sha512_context *ctx,
+                               const unsigned char *input,
+                               size_t ilen )
+{
+    int ret;
+    size_t fill;
+    unsigned int left;
+
+    if( ilen == 0 )
+        return( 0 );
+
+    left = (unsigned int) (ctx->total[0] & 0x7F);
+    fill = 128 - left;
+
+    ctx->total[0] += (uint64_t) ilen;
+
+    if( ctx->total[0] < (uint64_t) ilen )
+        ctx->total[1]++;
+
+    if( left && ilen >= fill )
+    {
+        memcpy( (void *) (ctx->buffer + left), input, fill );
+
+        if( ( ret = mbedtls_internal_sha512_process( ctx, ctx->buffer ) ) != 0 )
+            return( ret );
+
+        input += fill;
+        ilen  -= fill;
+        left = 0;
+    }
+
+    while( ilen >= 128 )
+    {
+        if( ( ret = mbedtls_internal_sha512_process( ctx, input ) ) != 0 )
+            return( ret );
+
+        input += 128;
+        ilen  -= 128;
+    }
+
+    if( ilen > 0 )
+        memcpy( (void *) (ctx->buffer + left), input, ilen );
+
+    return( 0 );
+}
+
+#if !defined(MBEDTLS_DEPRECATED_REMOVED)
+void mbedtls_sha512_update( mbedtls_sha512_context *ctx,
+                            const unsigned char *input,
+                            size_t ilen )
+{
+    mbedtls_sha512_update_ret( ctx, input, ilen );
+}
+#endif
+
+/*
+ * SHA-512 final digest
+ */
+int mbedtls_sha512_finish_ret( mbedtls_sha512_context *ctx,
+                               unsigned char output[64] )
+{
+    int ret;
+    unsigned used;
+    uint64_t high, low;
+
+    /*
+     * Add padding: 0x80 then 0x00 until 16 bytes remain for the length
+     */
+    used = ctx->total[0] & 0x7F;
+
+    ctx->buffer[used++] = 0x80;
+
+    if( used <= 112 )
+    {
+        /* Enough room for padding + length in current block */
+        memset( ctx->buffer + used, 0, 112 - used );
+    }
+    else
+    {
+        /* We'll need an extra block */
+        memset( ctx->buffer + used, 0, 128 - used );
+
+        if( ( ret = mbedtls_internal_sha512_process( ctx, ctx->buffer ) ) != 0 )
+            return( ret );
+
+        memset( ctx->buffer, 0, 112 );
+    }
+
+    /*
+     * Add message length
+     */
+    high = ( ctx->total[0] >> 61 )
+         | ( ctx->total[1] <<  3 );
+    low  = ( ctx->total[0] <<  3 );
+
+    PUT_UINT64_BE( high, ctx->buffer, 112 );
+    PUT_UINT64_BE( low,  ctx->buffer, 120 );
+
+    if( ( ret = mbedtls_internal_sha512_process( ctx, ctx->buffer ) ) != 0 )
+        return( ret );
+
+    /*
+     * Output final state
+     */
+    PUT_UINT64_BE( ctx->state[0], output,  0 );
+    PUT_UINT64_BE( ctx->state[1], output,  8 );
+    PUT_UINT64_BE( ctx->state[2], output, 16 );
+    PUT_UINT64_BE( ctx->state[3], output, 24 );
+    PUT_UINT64_BE( ctx->state[4], output, 32 );
+    PUT_UINT64_BE( ctx->state[5], output, 40 );
+
+    if( ctx->is384 == 0 )
+    {
+        PUT_UINT64_BE( ctx->state[6], output, 48 );
+        PUT_UINT64_BE( ctx->state[7], output, 56 );
+    }
+
+    return( 0 );
+}
+
+#if !defined(MBEDTLS_DEPRECATED_REMOVED)
+void mbedtls_sha512_finish( mbedtls_sha512_context *ctx,
+                            unsigned char output[64] )
+{
+    mbedtls_sha512_finish_ret( ctx, output );
+}
+#endif
+
+#endif /* !MBEDTLS_SHA512_ALT */
+
+/*
+ * output = SHA-512( input buffer )
+ */
+int mbedtls_sha512_ret( const unsigned char *input,
+                    size_t ilen,
+                    unsigned char output[64],
+                    int is384 )
+{
+    int ret;
+    mbedtls_sha512_context ctx;
+
+    mbedtls_sha512_init( &ctx );
+
+    if( ( ret = mbedtls_sha512_starts_ret( &ctx, is384 ) ) != 0 )
+        goto exit;
+
+    if( ( ret = mbedtls_sha512_update_ret( &ctx, input, ilen ) ) != 0 )
+        goto exit;
+
+    if( ( ret = mbedtls_sha512_finish_ret( &ctx, output ) ) != 0 )
+        goto exit;
+
+exit:
+    mbedtls_sha512_free( &ctx );
+
+    return( ret );
+}
+
+#if !defined(MBEDTLS_DEPRECATED_REMOVED)
+void mbedtls_sha512( const unsigned char *input,
+                     size_t ilen,
+                     unsigned char output[64],
+                     int is384 )
+{
+    mbedtls_sha512_ret( input, ilen, output, is384 );
+}
+#endif
+
+#if defined(MBEDTLS_SELF_TEST)
+
+/*
+ * FIPS-180-2 test vectors
+ */
+static const unsigned char sha512_test_buf[3][113] =
+{
+    { "abc" },
+    { "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmn"
+      "hijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu" },
+    { "" }
+};
+
+static const size_t sha512_test_buflen[3] =
+{
+    3, 112, 1000
+};
+
+static const unsigned char sha512_test_sum[6][64] =
+{
+    /*
+     * SHA-384 test vectors
+     */
+    { 0xCB, 0x00, 0x75, 0x3F, 0x45, 0xA3, 0x5E, 0x8B,
+      0xB5, 0xA0, 0x3D, 0x69, 0x9A, 0xC6, 0x50, 0x07,
+      0x27, 0x2C, 0x32, 0xAB, 0x0E, 0xDE, 0xD1, 0x63,
+      0x1A, 0x8B, 0x60, 0x5A, 0x43, 0xFF, 0x5B, 0xED,
+      0x80, 0x86, 0x07, 0x2B, 0xA1, 0xE7, 0xCC, 0x23,
+      0x58, 0xBA, 0xEC, 0xA1, 0x34, 0xC8, 0x25, 0xA7 },
+    { 0x09, 0x33, 0x0C, 0x33, 0xF7, 0x11, 0x47, 0xE8,
+      0x3D, 0x19, 0x2F, 0xC7, 0x82, 0xCD, 0x1B, 0x47,
+      0x53, 0x11, 0x1B, 0x17, 0x3B, 0x3B, 0x05, 0xD2,
+      0x2F, 0xA0, 0x80, 0x86, 0xE3, 0xB0, 0xF7, 0x12,
+      0xFC, 0xC7, 0xC7, 0x1A, 0x55, 0x7E, 0x2D, 0xB9,
+      0x66, 0xC3, 0xE9, 0xFA, 0x91, 0x74, 0x60, 0x39 },
+    { 0x9D, 0x0E, 0x18, 0x09, 0x71, 0x64, 0x74, 0xCB,
+      0x08, 0x6E, 0x83, 0x4E, 0x31, 0x0A, 0x4A, 0x1C,
+      0xED, 0x14, 0x9E, 0x9C, 0x00, 0xF2, 0x48, 0x52,
+      0x79, 0x72, 0xCE, 0xC5, 0x70, 0x4C, 0x2A, 0x5B,
+      0x07, 0xB8, 0xB3, 0xDC, 0x38, 0xEC, 0xC4, 0xEB,
+      0xAE, 0x97, 0xDD, 0xD8, 0x7F, 0x3D, 0x89, 0x85 },
+
+    /*
+     * SHA-512 test vectors
+     */
+    { 0xDD, 0xAF, 0x35, 0xA1, 0x93, 0x61, 0x7A, 0xBA,
+      0xCC, 0x41, 0x73, 0x49, 0xAE, 0x20, 0x41, 0x31,
+      0x12, 0xE6, 0xFA, 0x4E, 0x89, 0xA9, 0x7E, 0xA2,
+      0x0A, 0x9E, 0xEE, 0xE6, 0x4B, 0x55, 0xD3, 0x9A,
+      0x21, 0x92, 0x99, 0x2A, 0x27, 0x4F, 0xC1, 0xA8,
+      0x36, 0xBA, 0x3C, 0x23, 0xA3, 0xFE, 0xEB, 0xBD,
+      0x45, 0x4D, 0x44, 0x23, 0x64, 0x3C, 0xE8, 0x0E,
+      0x2A, 0x9A, 0xC9, 0x4F, 0xA5, 0x4C, 0xA4, 0x9F },
+    { 0x8E, 0x95, 0x9B, 0x75, 0xDA, 0xE3, 0x13, 0xDA,
+      0x8C, 0xF4, 0xF7, 0x28, 0x14, 0xFC, 0x14, 0x3F,
+      0x8F, 0x77, 0x79, 0xC6, 0xEB, 0x9F, 0x7F, 0xA1,
+      0x72, 0x99, 0xAE, 0xAD, 0xB6, 0x88, 0x90, 0x18,
+      0x50, 0x1D, 0x28, 0x9E, 0x49, 0x00, 0xF7, 0xE4,
+      0x33, 0x1B, 0x99, 0xDE, 0xC4, 0xB5, 0x43, 0x3A,
+      0xC7, 0xD3, 0x29, 0xEE, 0xB6, 0xDD, 0x26, 0x54,
+      0x5E, 0x96, 0xE5, 0x5B, 0x87, 0x4B, 0xE9, 0x09 },
+    { 0xE7, 0x18, 0x48, 0x3D, 0x0C, 0xE7, 0x69, 0x64,
+      0x4E, 0x2E, 0x42, 0xC7, 0xBC, 0x15, 0xB4, 0x63,
+      0x8E, 0x1F, 0x98, 0xB1, 0x3B, 0x20, 0x44, 0x28,
+      0x56, 0x32, 0xA8, 0x03, 0xAF, 0xA9, 0x73, 0xEB,
+      0xDE, 0x0F, 0xF2, 0x44, 0x87, 0x7E, 0xA6, 0x0A,
+      0x4C, 0xB0, 0x43, 0x2C, 0xE5, 0x77, 0xC3, 0x1B,
+      0xEB, 0x00, 0x9C, 0x5C, 0x2C, 0x49, 0xAA, 0x2E,
+      0x4E, 0xAD, 0xB2, 0x17, 0xAD, 0x8C, 0xC0, 0x9B }
+};
+
+/*
+ * Checkup routine
+ */
+int mbedtls_sha512_self_test( int verbose )
+{
+    int i, j, k, buflen, ret = 0;
+    unsigned char *buf;
+    unsigned char sha512sum[64];
+    mbedtls_sha512_context ctx;
+
+    buf = mbedtls_calloc( 1024, sizeof(unsigned char) );
+    if( NULL == buf )
+    {
+        if( verbose != 0 )
+            mbedtls_printf( "Buffer allocation failed\n" );
+
+        return( 1 );
+    }
+
+    mbedtls_sha512_init( &ctx );
+
+    for( i = 0; i < 6; i++ )
+    {
+        j = i % 3;
+        k = i < 3;
+
+        if( verbose != 0 )
+            mbedtls_printf( "  SHA-%d test #%d: ", 512 - k * 128, j + 1 );
+
+        if( ( ret = mbedtls_sha512_starts_ret( &ctx, k ) ) != 0 )
+            goto fail;
+
+        if( j == 2 )
+        {
+            memset( buf, 'a', buflen = 1000 );
+
+            for( j = 0; j < 1000; j++ )
+            {
+                ret = mbedtls_sha512_update_ret( &ctx, buf, buflen );
+                if( ret != 0 )
+                    goto fail;
+            }
+        }
+        else
+        {
+            ret = mbedtls_sha512_update_ret( &ctx, sha512_test_buf[j],
+                                             sha512_test_buflen[j] );
+            if( ret != 0 )
+                goto fail;
+        }
+
+        if( ( ret = mbedtls_sha512_finish_ret( &ctx, sha512sum ) ) != 0 )
+            goto fail;
+
+        if( memcmp( sha512sum, sha512_test_sum[i], 64 - k * 16 ) != 0 )
+        {
+            ret = 1;
+            goto fail;
+        }
+
+        if( verbose != 0 )
+            mbedtls_printf( "passed\n" );
+    }
+
+    if( verbose != 0 )
+        mbedtls_printf( "\n" );
+
+    goto exit;
+
+fail:
+    if( verbose != 0 )
+        mbedtls_printf( "failed\n" );
+
+exit:
+    mbedtls_sha512_free( &ctx );
+    mbedtls_free( buf );
+
+    return( ret );
+}
+
+#endif /* MBEDTLS_SELF_TEST */
+
+#endif /* MBEDTLS_SHA512_C */
diff --git a/common/mbedtls/sha512.h b/common/mbedtls/sha512.h
new file mode 100644
index 000000000..18f6a1802
--- /dev/null
+++ b/common/mbedtls/sha512.h
@@ -0,0 +1,272 @@
+/**
+ * \file sha512.h
+ * \brief This file contains SHA-384 and SHA-512 definitions and functions.
+ *
+ * The Secure Hash Algorithms 384 and 512 (SHA-384 and SHA-512) cryptographic
+ * hash functions are defined in <em>FIPS 180-4: Secure Hash Standard (SHS)</em>.
+ */
+/*
+ *  Copyright (C) 2006-2018, Arm Limited (or its affiliates), All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of Mbed TLS (https://tls.mbed.org)
+ */
+#ifndef MBEDTLS_SHA512_H
+#define MBEDTLS_SHA512_H
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#include <stddef.h>
+#include <stdint.h>
+
+#define MBEDTLS_ERR_SHA512_HW_ACCEL_FAILED                -0x0039  /**< SHA-512 hardware accelerator failed */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if !defined(MBEDTLS_SHA512_ALT)
+// Regular implementation
+//
+
+/**
+ * \brief          The SHA-512 context structure.
+ *
+ *                 The structure is used both for SHA-384 and for SHA-512
+ *                 checksum calculations. The choice between these two is
+ *                 made in the call to mbedtls_sha512_starts_ret().
+ */
+typedef struct mbedtls_sha512_context
+{
+    uint64_t total[2];          /*!< The number of Bytes processed. */
+    uint64_t state[8];          /*!< The intermediate digest state. */
+    unsigned char buffer[128];  /*!< The data block being processed. */
+    int is384;                  /*!< Determines which function to use:
+                                     0: Use SHA-512, or 1: Use SHA-384. */
+}
+mbedtls_sha512_context;
+
+#else  /* MBEDTLS_SHA512_ALT */
+#include "sha512_alt.h"
+#endif /* MBEDTLS_SHA512_ALT */
+
+/**
+ * \brief          This function initializes a SHA-512 context.
+ *
+ * \param ctx      The SHA-512 context to initialize.
+ */
+void mbedtls_sha512_init( mbedtls_sha512_context *ctx );
+
+/**
+ * \brief          This function clears a SHA-512 context.
+ *
+ * \param ctx      The SHA-512 context to clear.
+ */
+void mbedtls_sha512_free( mbedtls_sha512_context *ctx );
+
+/**
+ * \brief          This function clones the state of a SHA-512 context.
+ *
+ * \param dst      The destination context.
+ * \param src      The context to clone.
+ */
+void mbedtls_sha512_clone( mbedtls_sha512_context *dst,
+                           const mbedtls_sha512_context *src );
+
+/**
+ * \brief          This function starts a SHA-384 or SHA-512 checksum
+ *                 calculation.
+ *
+ * \param ctx      The SHA-512 context to initialize.
+ * \param is384    Determines which function to use:
+ *                 0: Use SHA-512, or 1: Use SHA-384.
+ *
+ * \return         \c 0 on success.
+ */
+int mbedtls_sha512_starts_ret( mbedtls_sha512_context *ctx, int is384 );
+
+/**
+ * \brief          This function feeds an input buffer into an ongoing
+ *                 SHA-512 checksum calculation.
+ *
+ * \param ctx      The SHA-512 context.
+ * \param input    The buffer holding the input data.
+ * \param ilen     The length of the input data.
+ *
+ * \return         \c 0 on success.
+ */
+int mbedtls_sha512_update_ret( mbedtls_sha512_context *ctx,
+                    const unsigned char *input,
+                    size_t ilen );
+
+/**
+ * \brief          This function finishes the SHA-512 operation, and writes
+ *                 the result to the output buffer. This function is for
+ *                 internal use only.
+ *
+ * \param ctx      The SHA-512 context.
+ * \param output   The SHA-384 or SHA-512 checksum result.
+ *
+ * \return         \c 0 on success.
+ */
+int mbedtls_sha512_finish_ret( mbedtls_sha512_context *ctx,
+                               unsigned char output[64] );
+
+/**
+ * \brief          This function processes a single data block within
+ *                 the ongoing SHA-512 computation.
+ *
+ * \param ctx      The SHA-512 context.
+ * \param data     The buffer holding one block of data.
+ *
+ * \return         \c 0 on success.
+ */
+int mbedtls_internal_sha512_process( mbedtls_sha512_context *ctx,
+                                     const unsigned char data[128] );
+#if !defined(MBEDTLS_DEPRECATED_REMOVED)
+#if defined(MBEDTLS_DEPRECATED_WARNING)
+#define MBEDTLS_DEPRECATED      __attribute__((deprecated))
+#else
+#define MBEDTLS_DEPRECATED
+#endif
+/**
+ * \brief          This function starts a SHA-384 or SHA-512 checksum
+ *                 calculation.
+ *
+ * \deprecated     Superseded by mbedtls_sha512_starts_ret() in 2.7.0
+ *
+ * \param ctx      The SHA-512 context to initialize.
+ * \param is384    Determines which function to use:
+ *                 0: Use SHA-512, or 1: Use SHA-384.
+ */
+MBEDTLS_DEPRECATED void mbedtls_sha512_starts( mbedtls_sha512_context *ctx,
+                                               int is384 );
+
+/**
+ * \brief          This function feeds an input buffer into an ongoing
+ *                 SHA-512 checksum calculation.
+ *
+ * \deprecated     Superseded by mbedtls_sha512_update_ret() in 2.7.0.
+ *
+ * \param ctx      The SHA-512 context.
+ * \param input    The buffer holding the data.
+ * \param ilen     The length of the input data.
+ */
+MBEDTLS_DEPRECATED void mbedtls_sha512_update( mbedtls_sha512_context *ctx,
+                                               const unsigned char *input,
+                                               size_t ilen );
+
+/**
+ * \brief          This function finishes the SHA-512 operation, and writes
+ *                 the result to the output buffer.
+ *
+ * \deprecated     Superseded by mbedtls_sha512_finish_ret() in 2.7.0.
+ *
+ * \param ctx      The SHA-512 context.
+ * \param output   The SHA-384 or SHA-512 checksum result.
+ */
+MBEDTLS_DEPRECATED void mbedtls_sha512_finish( mbedtls_sha512_context *ctx,
+                                               unsigned char output[64] );
+
+/**
+ * \brief          This function processes a single data block within
+ *                 the ongoing SHA-512 computation. This function is for
+ *                 internal use only.
+ *
+ * \deprecated     Superseded by mbedtls_internal_sha512_process() in 2.7.0.
+ *
+ * \param ctx      The SHA-512 context.
+ * \param data     The buffer holding one block of data.
+ */
+MBEDTLS_DEPRECATED void mbedtls_sha512_process(
+                                            mbedtls_sha512_context *ctx,
+                                            const unsigned char data[128] );
+
+#undef MBEDTLS_DEPRECATED
+#endif /* !MBEDTLS_DEPRECATED_REMOVED */
+
+/**
+ * \brief          This function calculates the SHA-512 or SHA-384
+ *                 checksum of a buffer.
+ *
+ *                 The function allocates the context, performs the
+ *                 calculation, and frees the context.
+ *
+ *                 The SHA-512 result is calculated as
+ *                 output = SHA-512(input buffer).
+ *
+ * \param input    The buffer holding the input data.
+ * \param ilen     The length of the input data.
+ * \param output   The SHA-384 or SHA-512 checksum result.
+ * \param is384    Determines which function to use:
+ *                 0: Use SHA-512, or 1: Use SHA-384.
+ *
+ * \return         \c 0 on success.
+ */
+int mbedtls_sha512_ret( const unsigned char *input,
+                        size_t ilen,
+                        unsigned char output[64],
+                        int is384 );
+
+#if !defined(MBEDTLS_DEPRECATED_REMOVED)
+#if defined(MBEDTLS_DEPRECATED_WARNING)
+#define MBEDTLS_DEPRECATED      __attribute__((deprecated))
+#else
+#define MBEDTLS_DEPRECATED
+#endif
+/**
+ * \brief          This function calculates the SHA-512 or SHA-384
+ *                 checksum of a buffer.
+ *
+ *                 The function allocates the context, performs the
+ *                 calculation, and frees the context.
+ *
+ *                 The SHA-512 result is calculated as
+ *                 output = SHA-512(input buffer).
+ *
+ * \deprecated     Superseded by mbedtls_sha512_ret() in 2.7.0
+ *
+ * \param input    The buffer holding the data.
+ * \param ilen     The length of the input data.
+ * \param output   The SHA-384 or SHA-512 checksum result.
+ * \param is384    Determines which function to use:
+ *                 0: Use SHA-512, or 1: Use SHA-384.
+ */
+MBEDTLS_DEPRECATED void mbedtls_sha512( const unsigned char *input,
+                                        size_t ilen,
+                                        unsigned char output[64],
+                                        int is384 );
+
+#undef MBEDTLS_DEPRECATED
+#endif /* !MBEDTLS_DEPRECATED_REMOVED */
+ /**
+ * \brief          The SHA-384 or SHA-512 checkup routine.
+ *
+ * \return         \c 0 on success.
+ * \return         \c 1 on failure.
+ */
+int mbedtls_sha512_self_test( int verbose );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* mbedtls_sha512.h */
diff --git a/common/mbedtls/threading.c b/common/mbedtls/threading.c
new file mode 100644
index 000000000..f7997ac95
--- /dev/null
+++ b/common/mbedtls/threading.c
@@ -0,0 +1,142 @@
+/*
+ *  Threading abstraction layer
+ *
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "mbedtls/config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#if defined(MBEDTLS_THREADING_C)
+
+#include "mbedtls/threading.h"
+
+#if defined(MBEDTLS_THREADING_PTHREAD)
+static void threading_mutex_init_pthread( mbedtls_threading_mutex_t *mutex )
+{
+    if( mutex == NULL )
+        return;
+
+    mutex->is_valid = pthread_mutex_init( &mutex->mutex, NULL ) == 0;
+}
+
+static void threading_mutex_free_pthread( mbedtls_threading_mutex_t *mutex )
+{
+    if( mutex == NULL || !mutex->is_valid )
+        return;
+
+    (void) pthread_mutex_destroy( &mutex->mutex );
+    mutex->is_valid = 0;
+}
+
+static int threading_mutex_lock_pthread( mbedtls_threading_mutex_t *mutex )
+{
+    if( mutex == NULL || ! mutex->is_valid )
+        return( MBEDTLS_ERR_THREADING_BAD_INPUT_DATA );
+
+    if( pthread_mutex_lock( &mutex->mutex ) != 0 )
+        return( MBEDTLS_ERR_THREADING_MUTEX_ERROR );
+
+    return( 0 );
+}
+
+static int threading_mutex_unlock_pthread( mbedtls_threading_mutex_t *mutex )
+{
+    if( mutex == NULL || ! mutex->is_valid )
+        return( MBEDTLS_ERR_THREADING_BAD_INPUT_DATA );
+
+    if( pthread_mutex_unlock( &mutex->mutex ) != 0 )
+        return( MBEDTLS_ERR_THREADING_MUTEX_ERROR );
+
+    return( 0 );
+}
+
+void (*mbedtls_mutex_init)( mbedtls_threading_mutex_t * ) = threading_mutex_init_pthread;
+void (*mbedtls_mutex_free)( mbedtls_threading_mutex_t * ) = threading_mutex_free_pthread;
+int (*mbedtls_mutex_lock)( mbedtls_threading_mutex_t * ) = threading_mutex_lock_pthread;
+int (*mbedtls_mutex_unlock)( mbedtls_threading_mutex_t * ) = threading_mutex_unlock_pthread;
+
+/*
+ * With phtreads we can statically initialize mutexes
+ */
+#define MUTEX_INIT  = { PTHREAD_MUTEX_INITIALIZER, 1 }
+
+#endif /* MBEDTLS_THREADING_PTHREAD */
+
+#if defined(MBEDTLS_THREADING_ALT)
+static int threading_mutex_fail( mbedtls_threading_mutex_t *mutex )
+{
+    ((void) mutex );
+    return( MBEDTLS_ERR_THREADING_BAD_INPUT_DATA );
+}
+static void threading_mutex_dummy( mbedtls_threading_mutex_t *mutex )
+{
+    ((void) mutex );
+    return;
+}
+
+void (*mbedtls_mutex_init)( mbedtls_threading_mutex_t * ) = threading_mutex_dummy;
+void (*mbedtls_mutex_free)( mbedtls_threading_mutex_t * ) = threading_mutex_dummy;
+int (*mbedtls_mutex_lock)( mbedtls_threading_mutex_t * ) = threading_mutex_fail;
+int (*mbedtls_mutex_unlock)( mbedtls_threading_mutex_t * ) = threading_mutex_fail;
+
+/*
+ * Set functions pointers and initialize global mutexes
+ */
+void mbedtls_threading_set_alt( void (*mutex_init)( mbedtls_threading_mutex_t * ),
+                       void (*mutex_free)( mbedtls_threading_mutex_t * ),
+                       int (*mutex_lock)( mbedtls_threading_mutex_t * ),
+                       int (*mutex_unlock)( mbedtls_threading_mutex_t * ) )
+{
+    mbedtls_mutex_init = mutex_init;
+    mbedtls_mutex_free = mutex_free;
+    mbedtls_mutex_lock = mutex_lock;
+    mbedtls_mutex_unlock = mutex_unlock;
+
+#if defined(MBEDTLS_FS_IO)
+    mbedtls_mutex_init( &mbedtls_threading_readdir_mutex );
+#endif
+}
+
+/*
+ * Free global mutexes
+ */
+void mbedtls_threading_free_alt( void )
+{
+#if defined(MBEDTLS_FS_IO)
+    mbedtls_mutex_free( &mbedtls_threading_readdir_mutex );
+#endif
+}
+#endif /* MBEDTLS_THREADING_ALT */
+
+/*
+ * Define global mutexes
+ */
+#ifndef MUTEX_INIT
+#define MUTEX_INIT
+#endif
+#if defined(MBEDTLS_FS_IO)
+mbedtls_threading_mutex_t mbedtls_threading_readdir_mutex MUTEX_INIT;
+#endif
+
+#endif /* MBEDTLS_THREADING_C */
diff --git a/common/mbedtls/threading.h b/common/mbedtls/threading.h
new file mode 100644
index 000000000..bd68d5aa9
--- /dev/null
+++ b/common/mbedtls/threading.h
@@ -0,0 +1,110 @@
+/**
+ * \file threading.h
+ *
+ * \brief Threading abstraction layer
+ */
+/*
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+#ifndef MBEDTLS_THREADING_H
+#define MBEDTLS_THREADING_H
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#include <stdlib.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define MBEDTLS_ERR_THREADING_FEATURE_UNAVAILABLE         -0x001A  /**< The selected feature is not available. */
+#define MBEDTLS_ERR_THREADING_BAD_INPUT_DATA              -0x001C  /**< Bad input parameters to function. */
+#define MBEDTLS_ERR_THREADING_MUTEX_ERROR                 -0x001E  /**< Locking / unlocking / free failed with error code. */
+
+#if defined(MBEDTLS_THREADING_PTHREAD)
+#include <pthread.h>
+typedef struct mbedtls_threading_mutex_t
+{
+    pthread_mutex_t mutex;
+    char is_valid;
+} mbedtls_threading_mutex_t;
+#endif
+
+#if defined(MBEDTLS_THREADING_ALT)
+/* You should define the mbedtls_threading_mutex_t type in your header */
+#include "threading_alt.h"
+
+/**
+ * \brief           Set your alternate threading implementation function
+ *                  pointers and initialize global mutexes. If used, this
+ *                  function must be called once in the main thread before any
+ *                  other mbed TLS function is called, and
+ *                  mbedtls_threading_free_alt() must be called once in the main
+ *                  thread after all other mbed TLS functions.
+ *
+ * \note            mutex_init() and mutex_free() don't return a status code.
+ *                  If mutex_init() fails, it should leave its argument (the
+ *                  mutex) in a state such that mutex_lock() will fail when
+ *                  called with this argument.
+ *
+ * \param mutex_init    the init function implementation
+ * \param mutex_free    the free function implementation
+ * \param mutex_lock    the lock function implementation
+ * \param mutex_unlock  the unlock function implementation
+ */
+void mbedtls_threading_set_alt( void (*mutex_init)( mbedtls_threading_mutex_t * ),
+                       void (*mutex_free)( mbedtls_threading_mutex_t * ),
+                       int (*mutex_lock)( mbedtls_threading_mutex_t * ),
+                       int (*mutex_unlock)( mbedtls_threading_mutex_t * ) );
+
+/**
+ * \brief               Free global mutexes.
+ */
+void mbedtls_threading_free_alt( void );
+#endif /* MBEDTLS_THREADING_ALT */
+
+#if defined(MBEDTLS_THREADING_C)
+/*
+ * The function pointers for mutex_init, mutex_free, mutex_ and mutex_unlock
+ *
+ * All these functions are expected to work or the result will be undefined.
+ */
+extern void (*mbedtls_mutex_init)( mbedtls_threading_mutex_t *mutex );
+extern void (*mbedtls_mutex_free)( mbedtls_threading_mutex_t *mutex );
+extern int (*mbedtls_mutex_lock)( mbedtls_threading_mutex_t *mutex );
+extern int (*mbedtls_mutex_unlock)( mbedtls_threading_mutex_t *mutex );
+
+/*
+ * Global mutexes
+ */
+#if defined(MBEDTLS_FS_IO)
+extern mbedtls_threading_mutex_t mbedtls_threading_readdir_mutex;
+#endif
+#endif /* MBEDTLS_THREADING_C */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* threading.h */
diff --git a/common/mbedtls/timing.c b/common/mbedtls/timing.c
new file mode 100644
index 000000000..fb2519181
--- /dev/null
+++ b/common/mbedtls/timing.c
@@ -0,0 +1,547 @@
+/*
+ *  Portable interface to the CPU cycle counter
+ *
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "mbedtls/config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#if defined(MBEDTLS_SELF_TEST) && defined(MBEDTLS_PLATFORM_C)
+#include "mbedtls/platform.h"
+#else
+#include <stdio.h>
+#define mbedtls_printf     printf
+#endif
+
+#if defined(MBEDTLS_TIMING_C)
+
+#include "mbedtls/timing.h"
+
+#if !defined(MBEDTLS_TIMING_ALT)
+
+#if !defined(unix) && !defined(__unix__) && !defined(__unix) && \
+    !defined(__APPLE__) && !defined(_WIN32) && !defined(__QNXNTO__) && \
+    !defined(__HAIKU__)
+#error "This module only works on Unix and Windows, see MBEDTLS_TIMING_C in config.h"
+#endif
+
+#ifndef asm
+#define asm __asm
+#endif
+
+#if defined(_WIN32) && !defined(EFIX64) && !defined(EFI32)
+
+#include <windows.h>
+#include <winbase.h>
+
+struct _hr_time
+{
+    LARGE_INTEGER start;
+};
+
+#else
+
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/time.h>
+#include <signal.h>
+#include <time.h>
+
+struct _hr_time
+{
+    struct timeval start;
+};
+
+#endif /* _WIN32 && !EFIX64 && !EFI32 */
+
+#if !defined(HAVE_HARDCLOCK) && defined(MBEDTLS_HAVE_ASM) &&  \
+    ( defined(_MSC_VER) && defined(_M_IX86) ) || defined(__WATCOMC__)
+
+#define HAVE_HARDCLOCK
+
+unsigned long mbedtls_timing_hardclock( void )
+{
+    unsigned long tsc;
+    __asm   rdtsc
+    __asm   mov  [tsc], eax
+    return( tsc );
+}
+#endif /* !HAVE_HARDCLOCK && MBEDTLS_HAVE_ASM &&
+          ( _MSC_VER && _M_IX86 ) || __WATCOMC__ */
+
+/* some versions of mingw-64 have 32-bit longs even on x84_64 */
+#if !defined(HAVE_HARDCLOCK) && defined(MBEDTLS_HAVE_ASM) &&  \
+    defined(__GNUC__) && ( defined(__i386__) || (                       \
+    ( defined(__amd64__) || defined( __x86_64__) ) && __SIZEOF_LONG__ == 4 ) )
+
+#define HAVE_HARDCLOCK
+
+unsigned long mbedtls_timing_hardclock( void )
+{
+    unsigned long lo, hi;
+    asm volatile( "rdtsc" : "=a" (lo), "=d" (hi) );
+    return( lo );
+}
+#endif /* !HAVE_HARDCLOCK && MBEDTLS_HAVE_ASM &&
+          __GNUC__ && __i386__ */
+
+#if !defined(HAVE_HARDCLOCK) && defined(MBEDTLS_HAVE_ASM) &&  \
+    defined(__GNUC__) && ( defined(__amd64__) || defined(__x86_64__) )
+
+#define HAVE_HARDCLOCK
+
+unsigned long mbedtls_timing_hardclock( void )
+{
+    unsigned long lo, hi;
+    asm volatile( "rdtsc" : "=a" (lo), "=d" (hi) );
+    return( lo | ( hi << 32 ) );
+}
+#endif /* !HAVE_HARDCLOCK && MBEDTLS_HAVE_ASM &&
+          __GNUC__ && ( __amd64__ || __x86_64__ ) */
+
+#if !defined(HAVE_HARDCLOCK) && defined(MBEDTLS_HAVE_ASM) &&  \
+    defined(__GNUC__) && ( defined(__powerpc__) || defined(__ppc__) )
+
+#define HAVE_HARDCLOCK
+
+unsigned long mbedtls_timing_hardclock( void )
+{
+    unsigned long tbl, tbu0, tbu1;
+
+    do
+    {
+        asm volatile( "mftbu %0" : "=r" (tbu0) );
+        asm volatile( "mftb  %0" : "=r" (tbl ) );
+        asm volatile( "mftbu %0" : "=r" (tbu1) );
+    }
+    while( tbu0 != tbu1 );
+
+    return( tbl );
+}
+#endif /* !HAVE_HARDCLOCK && MBEDTLS_HAVE_ASM &&
+          __GNUC__ && ( __powerpc__ || __ppc__ ) */
+
+#if !defined(HAVE_HARDCLOCK) && defined(MBEDTLS_HAVE_ASM) &&  \
+    defined(__GNUC__) && defined(__sparc64__)
+
+#if defined(__OpenBSD__)
+#warning OpenBSD does not allow access to tick register using software version instead
+#else
+#define HAVE_HARDCLOCK
+
+unsigned long mbedtls_timing_hardclock( void )
+{
+    unsigned long tick;
+    asm volatile( "rdpr %%tick, %0;" : "=&r" (tick) );
+    return( tick );
+}
+#endif /* __OpenBSD__ */
+#endif /* !HAVE_HARDCLOCK && MBEDTLS_HAVE_ASM &&
+          __GNUC__ && __sparc64__ */
+
+#if !defined(HAVE_HARDCLOCK) && defined(MBEDTLS_HAVE_ASM) &&  \
+    defined(__GNUC__) && defined(__sparc__) && !defined(__sparc64__)
+
+#define HAVE_HARDCLOCK
+
+unsigned long mbedtls_timing_hardclock( void )
+{
+    unsigned long tick;
+    asm volatile( ".byte 0x83, 0x41, 0x00, 0x00" );
+    asm volatile( "mov   %%g1, %0" : "=r" (tick) );
+    return( tick );
+}
+#endif /* !HAVE_HARDCLOCK && MBEDTLS_HAVE_ASM &&
+          __GNUC__ && __sparc__ && !__sparc64__ */
+
+#if !defined(HAVE_HARDCLOCK) && defined(MBEDTLS_HAVE_ASM) &&      \
+    defined(__GNUC__) && defined(__alpha__)
+
+#define HAVE_HARDCLOCK
+
+unsigned long mbedtls_timing_hardclock( void )
+{
+    unsigned long cc;
+    asm volatile( "rpcc %0" : "=r" (cc) );
+    return( cc & 0xFFFFFFFF );
+}
+#endif /* !HAVE_HARDCLOCK && MBEDTLS_HAVE_ASM &&
+          __GNUC__ && __alpha__ */
+
+#if !defined(HAVE_HARDCLOCK) && defined(MBEDTLS_HAVE_ASM) &&      \
+    defined(__GNUC__) && defined(__ia64__)
+
+#define HAVE_HARDCLOCK
+
+unsigned long mbedtls_timing_hardclock( void )
+{
+    unsigned long itc;
+    asm volatile( "mov %0 = ar.itc" : "=r" (itc) );
+    return( itc );
+}
+#endif /* !HAVE_HARDCLOCK && MBEDTLS_HAVE_ASM &&
+          __GNUC__ && __ia64__ */
+
+#if !defined(HAVE_HARDCLOCK) && defined(_MSC_VER) && \
+    !defined(EFIX64) && !defined(EFI32)
+
+#define HAVE_HARDCLOCK
+
+unsigned long mbedtls_timing_hardclock( void )
+{
+    LARGE_INTEGER offset;
+
+    QueryPerformanceCounter( &offset );
+
+    return( (unsigned long)( offset.QuadPart ) );
+}
+#endif /* !HAVE_HARDCLOCK && _MSC_VER && !EFIX64 && !EFI32 */
+
+#if !defined(HAVE_HARDCLOCK)
+
+#define HAVE_HARDCLOCK
+
+static int hardclock_init = 0;
+static struct timeval tv_init;
+
+unsigned long mbedtls_timing_hardclock( void )
+{
+    struct timeval tv_cur;
+
+    if( hardclock_init == 0 )
+    {
+#ifdef __MINGW32__
+        mingw_gettimeofday( &tv_init, NULL );
+#else
+        gettimeofday( &tv_init, NULL );
+#endif
+        hardclock_init = 1;
+    }
+
+#ifdef __MINGW32__
+    mingw_gettimeofday( &tv_cur, NULL );
+#else
+    gettimeofday( &tv_cur, NULL );
+#endif
+    return( ( tv_cur.tv_sec  - tv_init.tv_sec  ) * 1000000
+          + ( tv_cur.tv_usec - tv_init.tv_usec ) );
+}
+#endif /* !HAVE_HARDCLOCK */
+
+volatile int mbedtls_timing_alarmed = 0;
+
+#if defined(_WIN32) && !defined(EFIX64) && !defined(EFI32)
+
+unsigned long mbedtls_timing_get_timer( struct mbedtls_timing_hr_time *val, int reset )
+{
+    struct _hr_time *t = (struct _hr_time *) val;
+
+    if( reset )
+    {
+        QueryPerformanceCounter( &t->start );
+        return( 0 );
+    }
+    else
+    {
+        unsigned long delta;
+        LARGE_INTEGER now, hfreq;
+        QueryPerformanceCounter(  &now );
+        QueryPerformanceFrequency( &hfreq );
+        delta = (unsigned long)( ( now.QuadPart - t->start.QuadPart ) * 1000ul
+                                 / hfreq.QuadPart );
+        return( delta );
+    }
+}
+
+/* It's OK to use a global because alarm() is supposed to be global anyway */
+static DWORD alarmMs;
+
+static DWORD WINAPI TimerProc( LPVOID TimerContext )
+{
+    ((void) TimerContext);
+    Sleep( alarmMs );
+    mbedtls_timing_alarmed = 1;
+    return( TRUE );
+}
+
+void mbedtls_set_alarm( int seconds )
+{
+    DWORD ThreadId;
+
+    if( seconds == 0 )
+    {
+        /* No need to create a thread for this simple case.
+         * Also, this shorcut is more reliable at least on MinGW32 */
+        mbedtls_timing_alarmed = 1;
+        return;
+    }
+
+    mbedtls_timing_alarmed = 0;
+    alarmMs = seconds * 1000;
+    CloseHandle( CreateThread( NULL, 0, TimerProc, NULL, 0, &ThreadId ) );
+}
+
+#else /* _WIN32 && !EFIX64 && !EFI32 */
+
+unsigned long mbedtls_timing_get_timer( struct mbedtls_timing_hr_time *val, int reset )
+{
+    struct _hr_time *t = (struct _hr_time *) val;
+
+    if( reset )
+    {
+        gettimeofday( &t->start, NULL );
+        return( 0 );
+    }
+    else
+    {
+        unsigned long delta;
+        struct timeval now;
+        gettimeofday( &now, NULL );
+        delta = ( now.tv_sec  - t->start.tv_sec  ) * 1000ul
+              + ( now.tv_usec - t->start.tv_usec ) / 1000;
+        return( delta );
+    }
+}
+
+static void sighandler( int signum )
+{
+    mbedtls_timing_alarmed = 1;
+    signal( signum, sighandler );
+}
+
+void mbedtls_set_alarm( int seconds )
+{
+    mbedtls_timing_alarmed = 0;
+    signal( SIGALRM, sighandler );
+    alarm( seconds );
+    if( seconds == 0 )
+    {
+        /* alarm(0) cancelled any previous pending alarm, but the
+           handler won't fire, so raise the flag straight away. */
+        mbedtls_timing_alarmed = 1;
+    }
+}
+
+#endif /* _WIN32 && !EFIX64 && !EFI32 */
+
+/*
+ * Set delays to watch
+ */
+void mbedtls_timing_set_delay( void *data, uint32_t int_ms, uint32_t fin_ms )
+{
+    mbedtls_timing_delay_context *ctx = (mbedtls_timing_delay_context *) data;
+
+    ctx->int_ms = int_ms;
+    ctx->fin_ms = fin_ms;
+
+    if( fin_ms != 0 )
+        (void) mbedtls_timing_get_timer( &ctx->timer, 1 );
+}
+
+/*
+ * Get number of delays expired
+ */
+int mbedtls_timing_get_delay( void *data )
+{
+    mbedtls_timing_delay_context *ctx = (mbedtls_timing_delay_context *) data;
+    unsigned long elapsed_ms;
+
+    if( ctx->fin_ms == 0 )
+        return( -1 );
+
+    elapsed_ms = mbedtls_timing_get_timer( &ctx->timer, 0 );
+
+    if( elapsed_ms >= ctx->fin_ms )
+        return( 2 );
+
+    if( elapsed_ms >= ctx->int_ms )
+        return( 1 );
+
+    return( 0 );
+}
+
+#endif /* !MBEDTLS_TIMING_ALT */
+
+#if defined(MBEDTLS_SELF_TEST)
+
+/*
+ * Busy-waits for the given number of milliseconds.
+ * Used for testing mbedtls_timing_hardclock.
+ */
+static void busy_msleep( unsigned long msec )
+{
+    struct mbedtls_timing_hr_time hires;
+    unsigned long i = 0; /* for busy-waiting */
+    volatile unsigned long j; /* to prevent optimisation */
+
+    (void) mbedtls_timing_get_timer( &hires, 1 );
+
+    while( mbedtls_timing_get_timer( &hires, 0 ) < msec )
+        i++;
+
+    j = i;
+    (void) j;
+}
+
+#define FAIL    do                                                      \
+    {                                                                   \
+        if( verbose != 0 )                                              \
+        {                                                               \
+            mbedtls_printf( "failed at line %d\n", __LINE__ );          \
+            mbedtls_printf( " cycles=%lu ratio=%lu millisecs=%lu secs=%lu hardfail=%d a=%lu b=%lu\n", \
+                            cycles, ratio, millisecs, secs, hardfail,   \
+                            (unsigned long) a, (unsigned long) b );     \
+            mbedtls_printf( " elapsed(hires)=%lu elapsed(ctx)=%lu status(ctx)=%d\n", \
+                            mbedtls_timing_get_timer( &hires, 0 ),      \
+                            mbedtls_timing_get_timer( &ctx.timer, 0 ),  \
+                            mbedtls_timing_get_delay( &ctx ) );         \
+        }                                                               \
+        return( 1 );                                                    \
+    } while( 0 )
+
+/*
+ * Checkup routine
+ *
+ * Warning: this is work in progress, some tests may not be reliable enough
+ * yet! False positives may happen.
+ */
+int mbedtls_timing_self_test( int verbose )
+{
+    unsigned long cycles = 0, ratio = 0;
+    unsigned long millisecs = 0, secs = 0;
+    int hardfail = 0;
+    struct mbedtls_timing_hr_time hires;
+    uint32_t a = 0, b = 0;
+    mbedtls_timing_delay_context ctx;
+
+    if( verbose != 0 )
+        mbedtls_printf( "  TIMING tests note: will take some time!\n" );
+
+    if( verbose != 0 )
+        mbedtls_printf( "  TIMING test #1 (set_alarm / get_timer): " );
+
+    {
+        secs = 1;
+
+        (void) mbedtls_timing_get_timer( &hires, 1 );
+
+        mbedtls_set_alarm( (int) secs );
+        while( !mbedtls_timing_alarmed )
+            ;
+
+        millisecs = mbedtls_timing_get_timer( &hires, 0 );
+
+        /* For some reason on Windows it looks like alarm has an extra delay
+         * (maybe related to creating a new thread). Allow some room here. */
+        if( millisecs < 800 * secs || millisecs > 1200 * secs + 300 )
+            FAIL;
+    }
+
+    if( verbose != 0 )
+        mbedtls_printf( "passed\n" );
+
+    if( verbose != 0 )
+        mbedtls_printf( "  TIMING test #2 (set/get_delay        ): " );
+
+    {
+        a = 800;
+        b = 400;
+        mbedtls_timing_set_delay( &ctx, a, a + b );          /* T = 0 */
+
+        busy_msleep( a - a / 4 );                      /* T = a - a/4 */
+        if( mbedtls_timing_get_delay( &ctx ) != 0 )
+            FAIL;
+
+        busy_msleep( a / 4 + b / 4 );                  /* T = a + b/4 */
+        if( mbedtls_timing_get_delay( &ctx ) != 1 )
+            FAIL;
+
+        busy_msleep( b );                          /* T = a + b + b/4 */
+        if( mbedtls_timing_get_delay( &ctx ) != 2 )
+            FAIL;
+    }
+
+    mbedtls_timing_set_delay( &ctx, 0, 0 );
+    busy_msleep( 200 );
+    if( mbedtls_timing_get_delay( &ctx ) != -1 )
+        FAIL;
+
+    if( verbose != 0 )
+        mbedtls_printf( "passed\n" );
+
+    if( verbose != 0 )
+        mbedtls_printf( "  TIMING test #3 (hardclock / get_timer): " );
+
+    /*
+     * Allow one failure for possible counter wrapping.
+     * On a 4Ghz 32-bit machine the cycle counter wraps about once per second;
+     * since the whole test is about 10ms, it shouldn't happen twice in a row.
+     */
+
+hard_test:
+    if( hardfail > 1 )
+    {
+        if( verbose != 0 )
+            mbedtls_printf( "failed (ignored)\n" );
+
+        goto hard_test_done;
+    }
+
+    /* Get a reference ratio cycles/ms */
+    millisecs = 1;
+    cycles = mbedtls_timing_hardclock();
+    busy_msleep( millisecs );
+    cycles = mbedtls_timing_hardclock() - cycles;
+    ratio = cycles / millisecs;
+
+    /* Check that the ratio is mostly constant */
+    for( millisecs = 2; millisecs <= 4; millisecs++ )
+    {
+        cycles = mbedtls_timing_hardclock();
+        busy_msleep( millisecs );
+        cycles = mbedtls_timing_hardclock() - cycles;
+
+        /* Allow variation up to 20% */
+        if( cycles / millisecs < ratio - ratio / 5 ||
+            cycles / millisecs > ratio + ratio / 5 )
+        {
+            hardfail++;
+            goto hard_test;
+        }
+    }
+
+    if( verbose != 0 )
+        mbedtls_printf( "passed\n" );
+
+hard_test_done:
+
+    if( verbose != 0 )
+        mbedtls_printf( "\n" );
+
+    return( 0 );
+}
+
+#endif /* MBEDTLS_SELF_TEST */
+
+#endif /* MBEDTLS_TIMING_C */
diff --git a/common/mbedtls/timing.h b/common/mbedtls/timing.h
new file mode 100644
index 000000000..74b5f7108
--- /dev/null
+++ b/common/mbedtls/timing.h
@@ -0,0 +1,155 @@
+/**
+ * \file timing.h
+ *
+ * \brief Portable interface to timeouts and to the CPU cycle counter
+ */
+/*
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+#ifndef MBEDTLS_TIMING_H
+#define MBEDTLS_TIMING_H
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if !defined(MBEDTLS_TIMING_ALT)
+// Regular implementation
+//
+
+/**
+ * \brief          timer structure
+ */
+struct mbedtls_timing_hr_time
+{
+    unsigned char opaque[32];
+};
+
+/**
+ * \brief          Context for mbedtls_timing_set/get_delay()
+ */
+typedef struct mbedtls_timing_delay_context
+{
+    struct mbedtls_timing_hr_time   timer;
+    uint32_t                        int_ms;
+    uint32_t                        fin_ms;
+} mbedtls_timing_delay_context;
+
+#else  /* MBEDTLS_TIMING_ALT */
+#include "timing_alt.h"
+#endif /* MBEDTLS_TIMING_ALT */
+
+extern volatile int mbedtls_timing_alarmed;
+
+/**
+ * \brief          Return the CPU cycle counter value
+ *
+ * \warning        This is only a best effort! Do not rely on this!
+ *                 In particular, it is known to be unreliable on virtual
+ *                 machines.
+ *
+ * \note           This value starts at an unspecified origin and
+ *                 may wrap around.
+ */
+unsigned long mbedtls_timing_hardclock( void );
+
+/**
+ * \brief          Return the elapsed time in milliseconds
+ *
+ * \param val      points to a timer structure
+ * \param reset    If 0, query the elapsed time. Otherwise (re)start the timer.
+ *
+ * \return         Elapsed time since the previous reset in ms. When
+ *                 restarting, this is always 0.
+ *
+ * \note           To initialize a timer, call this function with reset=1.
+ *
+ *                 Determining the elapsed time and resetting the timer is not
+ *                 atomic on all platforms, so after the sequence
+ *                 `{ get_timer(1); ...; time1 = get_timer(1); ...; time2 =
+ *                 get_timer(0) }` the value time1+time2 is only approximately
+ *                 the delay since the first reset.
+ */
+unsigned long mbedtls_timing_get_timer( struct mbedtls_timing_hr_time *val, int reset );
+
+/**
+ * \brief          Setup an alarm clock
+ *
+ * \param seconds  delay before the "mbedtls_timing_alarmed" flag is set
+ *                 (must be >=0)
+ *
+ * \warning        Only one alarm at a time  is supported. In a threaded
+ *                 context, this means one for the whole process, not one per
+ *                 thread.
+ */
+void mbedtls_set_alarm( int seconds );
+
+/**
+ * \brief          Set a pair of delays to watch
+ *                 (See \c mbedtls_timing_get_delay().)
+ *
+ * \param data     Pointer to timing data.
+ *                 Must point to a valid \c mbedtls_timing_delay_context struct.
+ * \param int_ms   First (intermediate) delay in milliseconds.
+ *                 The effect if int_ms > fin_ms is unspecified.
+ * \param fin_ms   Second (final) delay in milliseconds.
+ *                 Pass 0 to cancel the current delay.
+ *
+ * \note           To set a single delay, either use \c mbedtls_timing_set_timer
+ *                 directly or use this function with int_ms == fin_ms.
+ */
+void mbedtls_timing_set_delay( void *data, uint32_t int_ms, uint32_t fin_ms );
+
+/**
+ * \brief          Get the status of delays
+ *                 (Memory helper: number of delays passed.)
+ *
+ * \param data     Pointer to timing data
+ *                 Must point to a valid \c mbedtls_timing_delay_context struct.
+ *
+ * \return         -1 if cancelled (fin_ms = 0),
+ *                  0 if none of the delays are passed,
+ *                  1 if only the intermediate delay is passed,
+ *                  2 if the final delay is passed.
+ */
+int mbedtls_timing_get_delay( void *data );
+
+#if defined(MBEDTLS_SELF_TEST)
+/**
+ * \brief          Checkup routine
+ *
+ * \return         0 if successful, or 1 if a test failed
+ */
+int mbedtls_timing_self_test( int verbose );
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* timing.h */
diff --git a/common/mbedtls/x509.c b/common/mbedtls/x509.c
new file mode 100644
index 000000000..c2f72a52b
--- /dev/null
+++ b/common/mbedtls/x509.c
@@ -0,0 +1,1073 @@
+/*
+ *  X.509 common functions for parsing and verification
+ *
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+/*
+ *  The ITU-T X.509 standard defines a certificate format for PKI.
+ *
+ *  http://www.ietf.org/rfc/rfc5280.txt (Certificates and CRLs)
+ *  http://www.ietf.org/rfc/rfc3279.txt (Alg IDs for CRLs)
+ *  http://www.ietf.org/rfc/rfc2986.txt (CSRs, aka PKCS#10)
+ *
+ *  http://www.itu.int/ITU-T/studygroups/com17/languages/X.680-0207.pdf
+ *  http://www.itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf
+ */
+
+/* Ensure gmtime_r is available even with -std=c99; must be included before
+ * config.h, which pulls in glibc's features.h. Harmless on other platforms. */
+#define _POSIX_C_SOURCE 200112L
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "mbedtls/config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#if defined(MBEDTLS_X509_USE_C)
+
+#include "mbedtls/x509.h"
+#include "mbedtls/asn1.h"
+#include "mbedtls/oid.h"
+
+#include <stdio.h>
+#include <string.h>
+
+#if defined(MBEDTLS_PEM_PARSE_C)
+#include "mbedtls/pem.h"
+#endif
+
+#if defined(MBEDTLS_PLATFORM_C)
+#include "mbedtls/platform.h"
+#else
+#include <stdio.h>
+#include <stdlib.h>
+#define mbedtls_free      free
+#define mbedtls_calloc    calloc
+#define mbedtls_printf    printf
+#define mbedtls_snprintf  snprintf
+#endif
+
+#if defined(MBEDTLS_HAVE_TIME)
+#include "mbedtls/platform_time.h"
+#endif
+#if defined(MBEDTLS_HAVE_TIME_DATE)
+#include <time.h>
+#endif
+
+#define CHECK(code) if( ( ret = code ) != 0 ){ return( ret ); }
+#define CHECK_RANGE(min, max, val) if( val < min || val > max ){ return( ret ); }
+
+/*
+ *  CertificateSerialNumber  ::=  INTEGER
+ */
+int mbedtls_x509_get_serial( unsigned char **p, const unsigned char *end,
+                     mbedtls_x509_buf *serial )
+{
+    int ret;
+
+    if( ( end - *p ) < 1 )
+        return( MBEDTLS_ERR_X509_INVALID_SERIAL +
+                MBEDTLS_ERR_ASN1_OUT_OF_DATA );
+
+    if( **p != ( MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_PRIMITIVE | 2 ) &&
+        **p !=   MBEDTLS_ASN1_INTEGER )
+        return( MBEDTLS_ERR_X509_INVALID_SERIAL +
+                MBEDTLS_ERR_ASN1_UNEXPECTED_TAG );
+
+    serial->tag = *(*p)++;
+
+    if( ( ret = mbedtls_asn1_get_len( p, end, &serial->len ) ) != 0 )
+        return( MBEDTLS_ERR_X509_INVALID_SERIAL + ret );
+
+    serial->p = *p;
+    *p += serial->len;
+
+    return( 0 );
+}
+
+/* Get an algorithm identifier without parameters (eg for signatures)
+ *
+ *  AlgorithmIdentifier  ::=  SEQUENCE  {
+ *       algorithm               OBJECT IDENTIFIER,
+ *       parameters              ANY DEFINED BY algorithm OPTIONAL  }
+ */
+int mbedtls_x509_get_alg_null( unsigned char **p, const unsigned char *end,
+                       mbedtls_x509_buf *alg )
+{
+    int ret;
+
+    if( ( ret = mbedtls_asn1_get_alg_null( p, end, alg ) ) != 0 )
+        return( MBEDTLS_ERR_X509_INVALID_ALG + ret );
+
+    return( 0 );
+}
+
+/*
+ * Parse an algorithm identifier with (optional) paramaters
+ */
+int mbedtls_x509_get_alg( unsigned char **p, const unsigned char *end,
+                  mbedtls_x509_buf *alg, mbedtls_x509_buf *params )
+{
+    int ret;
+
+    if( ( ret = mbedtls_asn1_get_alg( p, end, alg, params ) ) != 0 )
+        return( MBEDTLS_ERR_X509_INVALID_ALG + ret );
+
+    return( 0 );
+}
+
+#if defined(MBEDTLS_X509_RSASSA_PSS_SUPPORT)
+/*
+ * HashAlgorithm ::= AlgorithmIdentifier
+ *
+ * AlgorithmIdentifier  ::=  SEQUENCE  {
+ *      algorithm               OBJECT IDENTIFIER,
+ *      parameters              ANY DEFINED BY algorithm OPTIONAL  }
+ *
+ * For HashAlgorithm, parameters MUST be NULL or absent.
+ */
+static int x509_get_hash_alg( const mbedtls_x509_buf *alg, mbedtls_md_type_t *md_alg )
+{
+    int ret;
+    unsigned char *p;
+    const unsigned char *end;
+    mbedtls_x509_buf md_oid;
+    size_t len;
+
+    /* Make sure we got a SEQUENCE and setup bounds */
+    if( alg->tag != ( MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) )
+        return( MBEDTLS_ERR_X509_INVALID_ALG +
+                MBEDTLS_ERR_ASN1_UNEXPECTED_TAG );
+
+    p = (unsigned char *) alg->p;
+    end = p + alg->len;
+
+    if( p >= end )
+        return( MBEDTLS_ERR_X509_INVALID_ALG +
+                MBEDTLS_ERR_ASN1_OUT_OF_DATA );
+
+    /* Parse md_oid */
+    md_oid.tag = *p;
+
+    if( ( ret = mbedtls_asn1_get_tag( &p, end, &md_oid.len, MBEDTLS_ASN1_OID ) ) != 0 )
+        return( MBEDTLS_ERR_X509_INVALID_ALG + ret );
+
+    md_oid.p = p;
+    p += md_oid.len;
+
+    /* Get md_alg from md_oid */
+    if( ( ret = mbedtls_oid_get_md_alg( &md_oid, md_alg ) ) != 0 )
+        return( MBEDTLS_ERR_X509_INVALID_ALG + ret );
+
+    /* Make sure params is absent of NULL */
+    if( p == end )
+        return( 0 );
+
+    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len, MBEDTLS_ASN1_NULL ) ) != 0 || len != 0 )
+        return( MBEDTLS_ERR_X509_INVALID_ALG + ret );
+
+    if( p != end )
+        return( MBEDTLS_ERR_X509_INVALID_ALG +
+                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+
+    return( 0 );
+}
+
+/*
+ *    RSASSA-PSS-params  ::=  SEQUENCE  {
+ *       hashAlgorithm     [0] HashAlgorithm DEFAULT sha1Identifier,
+ *       maskGenAlgorithm  [1] MaskGenAlgorithm DEFAULT mgf1SHA1Identifier,
+ *       saltLength        [2] INTEGER DEFAULT 20,
+ *       trailerField      [3] INTEGER DEFAULT 1  }
+ *    -- Note that the tags in this Sequence are explicit.
+ *
+ * RFC 4055 (which defines use of RSASSA-PSS in PKIX) states that the value
+ * of trailerField MUST be 1, and PKCS#1 v2.2 doesn't even define any other
+ * option. Enfore this at parsing time.
+ */
+int mbedtls_x509_get_rsassa_pss_params( const mbedtls_x509_buf *params,
+                                mbedtls_md_type_t *md_alg, mbedtls_md_type_t *mgf_md,
+                                int *salt_len )
+{
+    int ret;
+    unsigned char *p;
+    const unsigned char *end, *end2;
+    size_t len;
+    mbedtls_x509_buf alg_id, alg_params;
+
+    /* First set everything to defaults */
+    *md_alg = MBEDTLS_MD_SHA1;
+    *mgf_md = MBEDTLS_MD_SHA1;
+    *salt_len = 20;
+
+    /* Make sure params is a SEQUENCE and setup bounds */
+    if( params->tag != ( MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) )
+        return( MBEDTLS_ERR_X509_INVALID_ALG +
+                MBEDTLS_ERR_ASN1_UNEXPECTED_TAG );
+
+    p = (unsigned char *) params->p;
+    end = p + params->len;
+
+    if( p == end )
+        return( 0 );
+
+    /*
+     * HashAlgorithm
+     */
+    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len,
+                    MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_CONSTRUCTED | 0 ) ) == 0 )
+    {
+        end2 = p + len;
+
+        /* HashAlgorithm ::= AlgorithmIdentifier (without parameters) */
+        if( ( ret = mbedtls_x509_get_alg_null( &p, end2, &alg_id ) ) != 0 )
+            return( ret );
+
+        if( ( ret = mbedtls_oid_get_md_alg( &alg_id, md_alg ) ) != 0 )
+            return( MBEDTLS_ERR_X509_INVALID_ALG + ret );
+
+        if( p != end2 )
+            return( MBEDTLS_ERR_X509_INVALID_ALG +
+                    MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+    }
+    else if( ret != MBEDTLS_ERR_ASN1_UNEXPECTED_TAG )
+        return( MBEDTLS_ERR_X509_INVALID_ALG + ret );
+
+    if( p == end )
+        return( 0 );
+
+    /*
+     * MaskGenAlgorithm
+     */
+    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len,
+                    MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_CONSTRUCTED | 1 ) ) == 0 )
+    {
+        end2 = p + len;
+
+        /* MaskGenAlgorithm ::= AlgorithmIdentifier (params = HashAlgorithm) */
+        if( ( ret = mbedtls_x509_get_alg( &p, end2, &alg_id, &alg_params ) ) != 0 )
+            return( ret );
+
+        /* Only MFG1 is recognised for now */
+        if( MBEDTLS_OID_CMP( MBEDTLS_OID_MGF1, &alg_id ) != 0 )
+            return( MBEDTLS_ERR_X509_FEATURE_UNAVAILABLE +
+                    MBEDTLS_ERR_OID_NOT_FOUND );
+
+        /* Parse HashAlgorithm */
+        if( ( ret = x509_get_hash_alg( &alg_params, mgf_md ) ) != 0 )
+            return( ret );
+
+        if( p != end2 )
+            return( MBEDTLS_ERR_X509_INVALID_ALG +
+                    MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+    }
+    else if( ret != MBEDTLS_ERR_ASN1_UNEXPECTED_TAG )
+        return( MBEDTLS_ERR_X509_INVALID_ALG + ret );
+
+    if( p == end )
+        return( 0 );
+
+    /*
+     * salt_len
+     */
+    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len,
+                    MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_CONSTRUCTED | 2 ) ) == 0 )
+    {
+        end2 = p + len;
+
+        if( ( ret = mbedtls_asn1_get_int( &p, end2, salt_len ) ) != 0 )
+            return( MBEDTLS_ERR_X509_INVALID_ALG + ret );
+
+        if( p != end2 )
+            return( MBEDTLS_ERR_X509_INVALID_ALG +
+                    MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+    }
+    else if( ret != MBEDTLS_ERR_ASN1_UNEXPECTED_TAG )
+        return( MBEDTLS_ERR_X509_INVALID_ALG + ret );
+
+    if( p == end )
+        return( 0 );
+
+    /*
+     * trailer_field (if present, must be 1)
+     */
+    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len,
+                    MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_CONSTRUCTED | 3 ) ) == 0 )
+    {
+        int trailer_field;
+
+        end2 = p + len;
+
+        if( ( ret = mbedtls_asn1_get_int( &p, end2, &trailer_field ) ) != 0 )
+            return( MBEDTLS_ERR_X509_INVALID_ALG + ret );
+
+        if( p != end2 )
+            return( MBEDTLS_ERR_X509_INVALID_ALG +
+                    MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+
+        if( trailer_field != 1 )
+            return( MBEDTLS_ERR_X509_INVALID_ALG );
+    }
+    else if( ret != MBEDTLS_ERR_ASN1_UNEXPECTED_TAG )
+        return( MBEDTLS_ERR_X509_INVALID_ALG + ret );
+
+    if( p != end )
+        return( MBEDTLS_ERR_X509_INVALID_ALG +
+                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+
+    return( 0 );
+}
+#endif /* MBEDTLS_X509_RSASSA_PSS_SUPPORT */
+
+/*
+ *  AttributeTypeAndValue ::= SEQUENCE {
+ *    type     AttributeType,
+ *    value    AttributeValue }
+ *
+ *  AttributeType ::= OBJECT IDENTIFIER
+ *
+ *  AttributeValue ::= ANY DEFINED BY AttributeType
+ */
+static int x509_get_attr_type_value( unsigned char **p,
+                                     const unsigned char *end,
+                                     mbedtls_x509_name *cur )
+{
+    int ret;
+    size_t len;
+    mbedtls_x509_buf *oid;
+    mbedtls_x509_buf *val;
+
+    if( ( ret = mbedtls_asn1_get_tag( p, end, &len,
+            MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
+        return( MBEDTLS_ERR_X509_INVALID_NAME + ret );
+
+    if( ( end - *p ) < 1 )
+        return( MBEDTLS_ERR_X509_INVALID_NAME +
+                MBEDTLS_ERR_ASN1_OUT_OF_DATA );
+
+    oid = &cur->oid;
+    oid->tag = **p;
+
+    if( ( ret = mbedtls_asn1_get_tag( p, end, &oid->len, MBEDTLS_ASN1_OID ) ) != 0 )
+        return( MBEDTLS_ERR_X509_INVALID_NAME + ret );
+
+    oid->p = *p;
+    *p += oid->len;
+
+    if( ( end - *p ) < 1 )
+        return( MBEDTLS_ERR_X509_INVALID_NAME +
+                MBEDTLS_ERR_ASN1_OUT_OF_DATA );
+
+    if( **p != MBEDTLS_ASN1_BMP_STRING && **p != MBEDTLS_ASN1_UTF8_STRING      &&
+        **p != MBEDTLS_ASN1_T61_STRING && **p != MBEDTLS_ASN1_PRINTABLE_STRING &&
+        **p != MBEDTLS_ASN1_IA5_STRING && **p != MBEDTLS_ASN1_UNIVERSAL_STRING &&
+        **p != MBEDTLS_ASN1_BIT_STRING )
+        return( MBEDTLS_ERR_X509_INVALID_NAME +
+                MBEDTLS_ERR_ASN1_UNEXPECTED_TAG );
+
+    val = &cur->val;
+    val->tag = *(*p)++;
+
+    if( ( ret = mbedtls_asn1_get_len( p, end, &val->len ) ) != 0 )
+        return( MBEDTLS_ERR_X509_INVALID_NAME + ret );
+
+    val->p = *p;
+    *p += val->len;
+
+    cur->next = NULL;
+
+    return( 0 );
+}
+
+/*
+ *  Name ::= CHOICE { -- only one possibility for now --
+ *       rdnSequence  RDNSequence }
+ *
+ *  RDNSequence ::= SEQUENCE OF RelativeDistinguishedName
+ *
+ *  RelativeDistinguishedName ::=
+ *    SET OF AttributeTypeAndValue
+ *
+ *  AttributeTypeAndValue ::= SEQUENCE {
+ *    type     AttributeType,
+ *    value    AttributeValue }
+ *
+ *  AttributeType ::= OBJECT IDENTIFIER
+ *
+ *  AttributeValue ::= ANY DEFINED BY AttributeType
+ *
+ * The data structure is optimized for the common case where each RDN has only
+ * one element, which is represented as a list of AttributeTypeAndValue.
+ * For the general case we still use a flat list, but we mark elements of the
+ * same set so that they are "merged" together in the functions that consume
+ * this list, eg mbedtls_x509_dn_gets().
+ */
+int mbedtls_x509_get_name( unsigned char **p, const unsigned char *end,
+                   mbedtls_x509_name *cur )
+{
+    int ret;
+    size_t set_len;
+    const unsigned char *end_set;
+
+    /* don't use recursion, we'd risk stack overflow if not optimized */
+    while( 1 )
+    {
+        /*
+         * parse SET
+         */
+        if( ( ret = mbedtls_asn1_get_tag( p, end, &set_len,
+                MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SET ) ) != 0 )
+            return( MBEDTLS_ERR_X509_INVALID_NAME + ret );
+
+        end_set  = *p + set_len;
+
+        while( 1 )
+        {
+            if( ( ret = x509_get_attr_type_value( p, end_set, cur ) ) != 0 )
+                return( ret );
+
+            if( *p == end_set )
+                break;
+
+            /* Mark this item as being no the only one in a set */
+            cur->next_merged = 1;
+
+            cur->next = mbedtls_calloc( 1, sizeof( mbedtls_x509_name ) );
+
+            if( cur->next == NULL )
+                return( MBEDTLS_ERR_X509_ALLOC_FAILED );
+
+            cur = cur->next;
+        }
+
+        /*
+         * continue until end of SEQUENCE is reached
+         */
+        if( *p == end )
+            return( 0 );
+
+        cur->next = mbedtls_calloc( 1, sizeof( mbedtls_x509_name ) );
+
+        if( cur->next == NULL )
+            return( MBEDTLS_ERR_X509_ALLOC_FAILED );
+
+        cur = cur->next;
+    }
+}
+
+static int x509_parse_int( unsigned char **p, size_t n, int *res )
+{
+    *res = 0;
+
+    for( ; n > 0; --n )
+    {
+        if( ( **p < '0') || ( **p > '9' ) )
+            return ( MBEDTLS_ERR_X509_INVALID_DATE );
+
+        *res *= 10;
+        *res += ( *(*p)++ - '0' );
+    }
+
+    return( 0 );
+}
+
+static int x509_date_is_valid(const mbedtls_x509_time *t )
+{
+    int ret = MBEDTLS_ERR_X509_INVALID_DATE;
+    int month_len;
+
+    CHECK_RANGE( 0, 9999, t->year );
+    CHECK_RANGE( 0, 23,   t->hour );
+    CHECK_RANGE( 0, 59,   t->min  );
+    CHECK_RANGE( 0, 59,   t->sec  );
+
+    switch( t->mon )
+    {
+        case 1: case 3: case 5: case 7: case 8: case 10: case 12:
+            month_len = 31;
+            break;
+        case 4: case 6: case 9: case 11:
+            month_len = 30;
+            break;
+        case 2:
+            if( ( !( t->year % 4 ) && t->year % 100 ) ||
+                !( t->year % 400 ) )
+                month_len = 29;
+            else
+                month_len = 28;
+            break;
+        default:
+            return( ret );
+    }
+    CHECK_RANGE( 1, month_len, t->day );
+
+    return( 0 );
+}
+
+/*
+ * Parse an ASN1_UTC_TIME (yearlen=2) or ASN1_GENERALIZED_TIME (yearlen=4)
+ * field.
+ */
+static int x509_parse_time( unsigned char **p, size_t len, size_t yearlen,
+                            mbedtls_x509_time *tm )
+{
+    int ret;
+
+    /*
+     * Minimum length is 10 or 12 depending on yearlen
+     */
+    if ( len < yearlen + 8 )
+        return ( MBEDTLS_ERR_X509_INVALID_DATE );
+    len -= yearlen + 8;
+
+    /*
+     * Parse year, month, day, hour, minute
+     */
+    CHECK( x509_parse_int( p, yearlen, &tm->year ) );
+    if ( 2 == yearlen )
+    {
+        if ( tm->year < 50 )
+            tm->year += 100;
+
+        tm->year += 1900;
+    }
+
+    CHECK( x509_parse_int( p, 2, &tm->mon ) );
+    CHECK( x509_parse_int( p, 2, &tm->day ) );
+    CHECK( x509_parse_int( p, 2, &tm->hour ) );
+    CHECK( x509_parse_int( p, 2, &tm->min ) );
+
+    /*
+     * Parse seconds if present
+     */
+    if ( len >= 2 )
+    {
+        CHECK( x509_parse_int( p, 2, &tm->sec ) );
+        len -= 2;
+    }
+    else
+        return ( MBEDTLS_ERR_X509_INVALID_DATE );
+
+    /*
+     * Parse trailing 'Z' if present
+     */
+    if ( 1 == len && 'Z' == **p )
+    {
+        (*p)++;
+        len--;
+    }
+
+    /*
+     * We should have parsed all characters at this point
+     */
+    if ( 0 != len )
+        return ( MBEDTLS_ERR_X509_INVALID_DATE );
+
+    CHECK( x509_date_is_valid( tm ) );
+
+    return ( 0 );
+}
+
+/*
+ *  Time ::= CHOICE {
+ *       utcTime        UTCTime,
+ *       generalTime    GeneralizedTime }
+ */
+int mbedtls_x509_get_time( unsigned char **p, const unsigned char *end,
+                           mbedtls_x509_time *tm )
+{
+    int ret;
+    size_t len, year_len;
+    unsigned char tag;
+
+    if( ( end - *p ) < 1 )
+        return( MBEDTLS_ERR_X509_INVALID_DATE +
+                MBEDTLS_ERR_ASN1_OUT_OF_DATA );
+
+    tag = **p;
+
+    if( tag == MBEDTLS_ASN1_UTC_TIME )
+        year_len = 2;
+    else if( tag == MBEDTLS_ASN1_GENERALIZED_TIME )
+        year_len = 4;
+    else
+        return( MBEDTLS_ERR_X509_INVALID_DATE +
+                MBEDTLS_ERR_ASN1_UNEXPECTED_TAG );
+
+    (*p)++;
+    ret = mbedtls_asn1_get_len( p, end, &len );
+
+    if( ret != 0 )
+        return( MBEDTLS_ERR_X509_INVALID_DATE + ret );
+
+    return x509_parse_time( p, len, year_len, tm );
+}
+
+int mbedtls_x509_get_sig( unsigned char **p, const unsigned char *end, mbedtls_x509_buf *sig )
+{
+    int ret;
+    size_t len;
+    int tag_type;
+
+    if( ( end - *p ) < 1 )
+        return( MBEDTLS_ERR_X509_INVALID_SIGNATURE +
+                MBEDTLS_ERR_ASN1_OUT_OF_DATA );
+
+    tag_type = **p;
+
+    if( ( ret = mbedtls_asn1_get_bitstring_null( p, end, &len ) ) != 0 )
+        return( MBEDTLS_ERR_X509_INVALID_SIGNATURE + ret );
+
+    sig->tag = tag_type;
+    sig->len = len;
+    sig->p = *p;
+
+    *p += len;
+
+    return( 0 );
+}
+
+/*
+ * Get signature algorithm from alg OID and optional parameters
+ */
+int mbedtls_x509_get_sig_alg( const mbedtls_x509_buf *sig_oid, const mbedtls_x509_buf *sig_params,
+                      mbedtls_md_type_t *md_alg, mbedtls_pk_type_t *pk_alg,
+                      void **sig_opts )
+{
+    int ret;
+
+    if( *sig_opts != NULL )
+        return( MBEDTLS_ERR_X509_BAD_INPUT_DATA );
+
+    if( ( ret = mbedtls_oid_get_sig_alg( sig_oid, md_alg, pk_alg ) ) != 0 )
+        return( MBEDTLS_ERR_X509_UNKNOWN_SIG_ALG + ret );
+
+#if defined(MBEDTLS_X509_RSASSA_PSS_SUPPORT)
+    if( *pk_alg == MBEDTLS_PK_RSASSA_PSS )
+    {
+        mbedtls_pk_rsassa_pss_options *pss_opts;
+
+        pss_opts = mbedtls_calloc( 1, sizeof( mbedtls_pk_rsassa_pss_options ) );
+        if( pss_opts == NULL )
+            return( MBEDTLS_ERR_X509_ALLOC_FAILED );
+
+        ret = mbedtls_x509_get_rsassa_pss_params( sig_params,
+                                          md_alg,
+                                          &pss_opts->mgf1_hash_id,
+                                          &pss_opts->expected_salt_len );
+        if( ret != 0 )
+        {
+            mbedtls_free( pss_opts );
+            return( ret );
+        }
+
+        *sig_opts = (void *) pss_opts;
+    }
+    else
+#endif /* MBEDTLS_X509_RSASSA_PSS_SUPPORT */
+    {
+        /* Make sure parameters are absent or NULL */
+        if( ( sig_params->tag != MBEDTLS_ASN1_NULL && sig_params->tag != 0 ) ||
+              sig_params->len != 0 )
+        return( MBEDTLS_ERR_X509_INVALID_ALG );
+    }
+
+    return( 0 );
+}
+
+/*
+ * X.509 Extensions (No parsing of extensions, pointer should
+ * be either manually updated or extensions should be parsed!)
+ */
+int mbedtls_x509_get_ext( unsigned char **p, const unsigned char *end,
+                  mbedtls_x509_buf *ext, int tag )
+{
+    int ret;
+    size_t len;
+
+    if( *p == end )
+        return( 0 );
+
+    ext->tag = **p;
+
+    if( ( ret = mbedtls_asn1_get_tag( p, end, &ext->len,
+            MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_CONSTRUCTED | tag ) ) != 0 )
+        return( ret );
+
+    ext->p = *p;
+    end = *p + ext->len;
+
+    /*
+     * Extensions  ::=  SEQUENCE SIZE (1..MAX) OF Extension
+     *
+     * Extension  ::=  SEQUENCE  {
+     *      extnID      OBJECT IDENTIFIER,
+     *      critical    BOOLEAN DEFAULT FALSE,
+     *      extnValue   OCTET STRING  }
+     */
+    if( ( ret = mbedtls_asn1_get_tag( p, end, &len,
+            MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
+        return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret );
+
+    if( end != *p + len )
+        return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
+                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+
+    return( 0 );
+}
+
+/*
+ * Store the name in printable form into buf; no more
+ * than size characters will be written
+ */
+int mbedtls_x509_dn_gets( char *buf, size_t size, const mbedtls_x509_name *dn )
+{
+    int ret;
+    size_t i, n;
+    unsigned char c, merge = 0;
+    const mbedtls_x509_name *name;
+    const char *short_name = NULL;
+    char s[MBEDTLS_X509_MAX_DN_NAME_SIZE], *p;
+
+    memset( s, 0, sizeof( s ) );
+
+    name = dn;
+    p = buf;
+    n = size;
+
+    while( name != NULL )
+    {
+        if( !name->oid.p )
+        {
+            name = name->next;
+            continue;
+        }
+
+        if( name != dn )
+        {
+            ret = mbedtls_snprintf( p, n, merge ? " + " : ", " );
+            MBEDTLS_X509_SAFE_SNPRINTF;
+        }
+
+        ret = mbedtls_oid_get_attr_short_name( &name->oid, &short_name );
+
+        if( ret == 0 )
+            ret = mbedtls_snprintf( p, n, "%s=", short_name );
+        else
+            ret = mbedtls_snprintf( p, n, "\?\?=" );
+        MBEDTLS_X509_SAFE_SNPRINTF;
+
+        for( i = 0; i < name->val.len; i++ )
+        {
+            if( i >= sizeof( s ) - 1 )
+                break;
+
+            c = name->val.p[i];
+            if( c < 32 || c == 127 || ( c > 128 && c < 160 ) )
+                 s[i] = '?';
+            else s[i] = c;
+        }
+        s[i] = '\0';
+        ret = mbedtls_snprintf( p, n, "%s", s );
+        MBEDTLS_X509_SAFE_SNPRINTF;
+
+        merge = name->next_merged;
+        name = name->next;
+    }
+
+    return( (int) ( size - n ) );
+}
+
+/*
+ * Store the serial in printable form into buf; no more
+ * than size characters will be written
+ */
+int mbedtls_x509_serial_gets( char *buf, size_t size, const mbedtls_x509_buf *serial )
+{
+    int ret;
+    size_t i, n, nr;
+    char *p;
+
+    p = buf;
+    n = size;
+
+    nr = ( serial->len <= 32 )
+        ? serial->len  : 28;
+
+    for( i = 0; i < nr; i++ )
+    {
+        if( i == 0 && nr > 1 && serial->p[i] == 0x0 )
+            continue;
+
+        ret = mbedtls_snprintf( p, n, "%02X%s",
+                serial->p[i], ( i < nr - 1 ) ? ":" : "" );
+        MBEDTLS_X509_SAFE_SNPRINTF;
+    }
+
+    if( nr != serial->len )
+    {
+        ret = mbedtls_snprintf( p, n, "...." );
+        MBEDTLS_X509_SAFE_SNPRINTF;
+    }
+
+    return( (int) ( size - n ) );
+}
+
+/*
+ * Helper for writing signature algorithms
+ */
+int mbedtls_x509_sig_alg_gets( char *buf, size_t size, const mbedtls_x509_buf *sig_oid,
+                       mbedtls_pk_type_t pk_alg, mbedtls_md_type_t md_alg,
+                       const void *sig_opts )
+{
+    int ret;
+    char *p = buf;
+    size_t n = size;
+    const char *desc = NULL;
+
+    ret = mbedtls_oid_get_sig_alg_desc( sig_oid, &desc );
+    if( ret != 0 )
+        ret = mbedtls_snprintf( p, n, "???"  );
+    else
+        ret = mbedtls_snprintf( p, n, "%s", desc );
+    MBEDTLS_X509_SAFE_SNPRINTF;
+
+#if defined(MBEDTLS_X509_RSASSA_PSS_SUPPORT)
+    if( pk_alg == MBEDTLS_PK_RSASSA_PSS )
+    {
+        const mbedtls_pk_rsassa_pss_options *pss_opts;
+        const mbedtls_md_info_t *md_info, *mgf_md_info;
+
+        pss_opts = (const mbedtls_pk_rsassa_pss_options *) sig_opts;
+
+        md_info = mbedtls_md_info_from_type( md_alg );
+        mgf_md_info = mbedtls_md_info_from_type( pss_opts->mgf1_hash_id );
+
+        ret = mbedtls_snprintf( p, n, " (%s, MGF1-%s, 0x%02X)",
+                              md_info ? mbedtls_md_get_name( md_info ) : "???",
+                              mgf_md_info ? mbedtls_md_get_name( mgf_md_info ) : "???",
+                              pss_opts->expected_salt_len );
+        MBEDTLS_X509_SAFE_SNPRINTF;
+    }
+#else
+    ((void) pk_alg);
+    ((void) md_alg);
+    ((void) sig_opts);
+#endif /* MBEDTLS_X509_RSASSA_PSS_SUPPORT */
+
+    return( (int)( size - n ) );
+}
+
+/*
+ * Helper for writing "RSA key size", "EC key size", etc
+ */
+int mbedtls_x509_key_size_helper( char *buf, size_t buf_size, const char *name )
+{
+    char *p = buf;
+    size_t n = buf_size;
+    int ret;
+
+    ret = mbedtls_snprintf( p, n, "%s key size", name );
+    MBEDTLS_X509_SAFE_SNPRINTF;
+
+    return( 0 );
+}
+
+#if defined(MBEDTLS_HAVE_TIME_DATE)
+/*
+ * Set the time structure to the current time.
+ * Return 0 on success, non-zero on failure.
+ */
+static int x509_get_current_time( mbedtls_x509_time *now )
+{
+    struct tm *lt, tm_buf;
+    mbedtls_time_t tt;
+    int ret = 0;
+
+    tt = mbedtls_time( NULL );
+#if defined(_WIN32) && !defined(EFIX64) && !defined(EFI32)
+    lt = gmtime_s( &tm_buf, &tt ) == 0 ? &tm_buf : NULL;
+#else
+    lt = gmtime_r( &tt, &tm_buf );
+#endif
+
+    if( lt == NULL )
+        ret = -1;
+    else
+    {
+        now->year = lt->tm_year + 1900;
+        now->mon  = lt->tm_mon  + 1;
+        now->day  = lt->tm_mday;
+        now->hour = lt->tm_hour;
+        now->min  = lt->tm_min;
+        now->sec  = lt->tm_sec;
+    }
+
+    return( ret );
+}
+
+/*
+ * Return 0 if before <= after, 1 otherwise
+ */
+static int x509_check_time( const mbedtls_x509_time *before, const mbedtls_x509_time *after )
+{
+    if( before->year  > after->year )
+        return( 1 );
+
+    if( before->year == after->year &&
+        before->mon   > after->mon )
+        return( 1 );
+
+    if( before->year == after->year &&
+        before->mon  == after->mon  &&
+        before->day   > after->day )
+        return( 1 );
+
+    if( before->year == after->year &&
+        before->mon  == after->mon  &&
+        before->day  == after->day  &&
+        before->hour  > after->hour )
+        return( 1 );
+
+    if( before->year == after->year &&
+        before->mon  == after->mon  &&
+        before->day  == after->day  &&
+        before->hour == after->hour &&
+        before->min   > after->min  )
+        return( 1 );
+
+    if( before->year == after->year &&
+        before->mon  == after->mon  &&
+        before->day  == after->day  &&
+        before->hour == after->hour &&
+        before->min  == after->min  &&
+        before->sec   > after->sec  )
+        return( 1 );
+
+    return( 0 );
+}
+
+int mbedtls_x509_time_is_past( const mbedtls_x509_time *to )
+{
+    mbedtls_x509_time now;
+
+    if( x509_get_current_time( &now ) != 0 )
+        return( 1 );
+
+    return( x509_check_time( &now, to ) );
+}
+
+int mbedtls_x509_time_is_future( const mbedtls_x509_time *from )
+{
+    mbedtls_x509_time now;
+
+    if( x509_get_current_time( &now ) != 0 )
+        return( 1 );
+
+    return( x509_check_time( from, &now ) );
+}
+
+#else  /* MBEDTLS_HAVE_TIME_DATE */
+
+int mbedtls_x509_time_is_past( const mbedtls_x509_time *to )
+{
+    ((void) to);
+    return( 0 );
+}
+
+int mbedtls_x509_time_is_future( const mbedtls_x509_time *from )
+{
+    ((void) from);
+    return( 0 );
+}
+#endif /* MBEDTLS_HAVE_TIME_DATE */
+
+#if defined(MBEDTLS_SELF_TEST)
+
+#include "mbedtls/x509_crt.h"
+#include "mbedtls/certs.h"
+
+/*
+ * Checkup routine
+ */
+int mbedtls_x509_self_test( int verbose )
+{
+#if defined(MBEDTLS_CERTS_C) && defined(MBEDTLS_SHA256_C)
+    int ret;
+    uint32_t flags;
+    mbedtls_x509_crt cacert;
+    mbedtls_x509_crt clicert;
+
+    if( verbose != 0 )
+        mbedtls_printf( "  X.509 certificate load: " );
+
+    mbedtls_x509_crt_init( &clicert );
+
+    ret = mbedtls_x509_crt_parse( &clicert, (const unsigned char *) mbedtls_test_cli_crt,
+                           mbedtls_test_cli_crt_len );
+    if( ret != 0 )
+    {
+        if( verbose != 0 )
+            mbedtls_printf( "failed\n" );
+
+        return( ret );
+    }
+
+    mbedtls_x509_crt_init( &cacert );
+
+    ret = mbedtls_x509_crt_parse( &cacert, (const unsigned char *) mbedtls_test_ca_crt,
+                          mbedtls_test_ca_crt_len );
+    if( ret != 0 )
+    {
+        if( verbose != 0 )
+            mbedtls_printf( "failed\n" );
+
+        return( ret );
+    }
+
+    if( verbose != 0 )
+        mbedtls_printf( "passed\n  X.509 signature verify: ");
+
+    ret = mbedtls_x509_crt_verify( &clicert, &cacert, NULL, NULL, &flags, NULL, NULL );
+    if( ret != 0 )
+    {
+        if( verbose != 0 )
+            mbedtls_printf( "failed\n" );
+
+        return( ret );
+    }
+
+    if( verbose != 0 )
+        mbedtls_printf( "passed\n\n");
+
+    mbedtls_x509_crt_free( &cacert  );
+    mbedtls_x509_crt_free( &clicert );
+
+    return( 0 );
+#else
+    ((void) verbose);
+    return( 0 );
+#endif /* MBEDTLS_CERTS_C && MBEDTLS_SHA1_C */
+}
+
+#endif /* MBEDTLS_SELF_TEST */
+
+#endif /* MBEDTLS_X509_USE_C */
diff --git a/common/mbedtls/x509.h b/common/mbedtls/x509.h
new file mode 100644
index 000000000..0f0ef2eed
--- /dev/null
+++ b/common/mbedtls/x509.h
@@ -0,0 +1,335 @@
+/**
+ * \file x509.h
+ *
+ * \brief X.509 generic defines and structures
+ */
+/*
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+#ifndef MBEDTLS_X509_H
+#define MBEDTLS_X509_H
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#include "asn1.h"
+#include "pk.h"
+
+#if defined(MBEDTLS_RSA_C)
+#include "rsa.h"
+#endif
+
+/**
+ * \addtogroup x509_module
+ * \{
+ */
+
+#if !defined(MBEDTLS_X509_MAX_INTERMEDIATE_CA)
+/**
+ * Maximum number of intermediate CAs in a verification chain.
+ * That is, maximum length of the chain, excluding the end-entity certificate
+ * and the trusted root certificate.
+ *
+ * Set this to a low value to prevent an adversary from making you waste
+ * resources verifying an overlong certificate chain.
+ */
+#define MBEDTLS_X509_MAX_INTERMEDIATE_CA   8
+#endif
+
+/**
+ * \name X509 Error codes
+ * \{
+ */
+#define MBEDTLS_ERR_X509_FEATURE_UNAVAILABLE              -0x2080  /**< Unavailable feature, e.g. RSA hashing/encryption combination. */
+#define MBEDTLS_ERR_X509_UNKNOWN_OID                      -0x2100  /**< Requested OID is unknown. */
+#define MBEDTLS_ERR_X509_INVALID_FORMAT                   -0x2180  /**< The CRT/CRL/CSR format is invalid, e.g. different type expected. */
+#define MBEDTLS_ERR_X509_INVALID_VERSION                  -0x2200  /**< The CRT/CRL/CSR version element is invalid. */
+#define MBEDTLS_ERR_X509_INVALID_SERIAL                   -0x2280  /**< The serial tag or value is invalid. */
+#define MBEDTLS_ERR_X509_INVALID_ALG                      -0x2300  /**< The algorithm tag or value is invalid. */
+#define MBEDTLS_ERR_X509_INVALID_NAME                     -0x2380  /**< The name tag or value is invalid. */
+#define MBEDTLS_ERR_X509_INVALID_DATE                     -0x2400  /**< The date tag or value is invalid. */
+#define MBEDTLS_ERR_X509_INVALID_SIGNATURE                -0x2480  /**< The signature tag or value invalid. */
+#define MBEDTLS_ERR_X509_INVALID_EXTENSIONS               -0x2500  /**< The extension tag or value is invalid. */
+#define MBEDTLS_ERR_X509_UNKNOWN_VERSION                  -0x2580  /**< CRT/CRL/CSR has an unsupported version number. */
+#define MBEDTLS_ERR_X509_UNKNOWN_SIG_ALG                  -0x2600  /**< Signature algorithm (oid) is unsupported. */
+#define MBEDTLS_ERR_X509_SIG_MISMATCH                     -0x2680  /**< Signature algorithms do not match. (see \c ::mbedtls_x509_crt sig_oid) */
+#define MBEDTLS_ERR_X509_CERT_VERIFY_FAILED               -0x2700  /**< Certificate verification failed, e.g. CRL, CA or signature check failed. */
+#define MBEDTLS_ERR_X509_CERT_UNKNOWN_FORMAT              -0x2780  /**< Format not recognized as DER or PEM. */
+#define MBEDTLS_ERR_X509_BAD_INPUT_DATA                   -0x2800  /**< Input invalid. */
+#define MBEDTLS_ERR_X509_ALLOC_FAILED                     -0x2880  /**< Allocation of memory failed. */
+#define MBEDTLS_ERR_X509_FILE_IO_ERROR                    -0x2900  /**< Read/write of file failed. */
+#define MBEDTLS_ERR_X509_BUFFER_TOO_SMALL                 -0x2980  /**< Destination buffer is too small. */
+#define MBEDTLS_ERR_X509_FATAL_ERROR                      -0x3000  /**< A fatal error occured, eg the chain is too long or the vrfy callback failed. */
+/* \} name */
+
+/**
+ * \name X509 Verify codes
+ * \{
+ */
+/* Reminder: update x509_crt_verify_strings[] in library/x509_crt.c */
+#define MBEDTLS_X509_BADCERT_EXPIRED             0x01  /**< The certificate validity has expired. */
+#define MBEDTLS_X509_BADCERT_REVOKED             0x02  /**< The certificate has been revoked (is on a CRL). */
+#define MBEDTLS_X509_BADCERT_CN_MISMATCH         0x04  /**< The certificate Common Name (CN) does not match with the expected CN. */
+#define MBEDTLS_X509_BADCERT_NOT_TRUSTED         0x08  /**< The certificate is not correctly signed by the trusted CA. */
+#define MBEDTLS_X509_BADCRL_NOT_TRUSTED          0x10  /**< The CRL is not correctly signed by the trusted CA. */
+#define MBEDTLS_X509_BADCRL_EXPIRED              0x20  /**< The CRL is expired. */
+#define MBEDTLS_X509_BADCERT_MISSING             0x40  /**< Certificate was missing. */
+#define MBEDTLS_X509_BADCERT_SKIP_VERIFY         0x80  /**< Certificate verification was skipped. */
+#define MBEDTLS_X509_BADCERT_OTHER             0x0100  /**< Other reason (can be used by verify callback) */
+#define MBEDTLS_X509_BADCERT_FUTURE            0x0200  /**< The certificate validity starts in the future. */
+#define MBEDTLS_X509_BADCRL_FUTURE             0x0400  /**< The CRL is from the future */
+#define MBEDTLS_X509_BADCERT_KEY_USAGE         0x0800  /**< Usage does not match the keyUsage extension. */
+#define MBEDTLS_X509_BADCERT_EXT_KEY_USAGE     0x1000  /**< Usage does not match the extendedKeyUsage extension. */
+#define MBEDTLS_X509_BADCERT_NS_CERT_TYPE      0x2000  /**< Usage does not match the nsCertType extension. */
+#define MBEDTLS_X509_BADCERT_BAD_MD            0x4000  /**< The certificate is signed with an unacceptable hash. */
+#define MBEDTLS_X509_BADCERT_BAD_PK            0x8000  /**< The certificate is signed with an unacceptable PK alg (eg RSA vs ECDSA). */
+#define MBEDTLS_X509_BADCERT_BAD_KEY         0x010000  /**< The certificate is signed with an unacceptable key (eg bad curve, RSA too short). */
+#define MBEDTLS_X509_BADCRL_BAD_MD           0x020000  /**< The CRL is signed with an unacceptable hash. */
+#define MBEDTLS_X509_BADCRL_BAD_PK           0x040000  /**< The CRL is signed with an unacceptable PK alg (eg RSA vs ECDSA). */
+#define MBEDTLS_X509_BADCRL_BAD_KEY          0x080000  /**< The CRL is signed with an unacceptable key (eg bad curve, RSA too short). */
+
+/* \} name */
+/* \} addtogroup x509_module */
+
+/*
+ * X.509 v3 Key Usage Extension flags
+ * Reminder: update x509_info_key_usage() when adding new flags.
+ */
+#define MBEDTLS_X509_KU_DIGITAL_SIGNATURE            (0x80)  /* bit 0 */
+#define MBEDTLS_X509_KU_NON_REPUDIATION              (0x40)  /* bit 1 */
+#define MBEDTLS_X509_KU_KEY_ENCIPHERMENT             (0x20)  /* bit 2 */
+#define MBEDTLS_X509_KU_DATA_ENCIPHERMENT            (0x10)  /* bit 3 */
+#define MBEDTLS_X509_KU_KEY_AGREEMENT                (0x08)  /* bit 4 */
+#define MBEDTLS_X509_KU_KEY_CERT_SIGN                (0x04)  /* bit 5 */
+#define MBEDTLS_X509_KU_CRL_SIGN                     (0x02)  /* bit 6 */
+#define MBEDTLS_X509_KU_ENCIPHER_ONLY                (0x01)  /* bit 7 */
+#define MBEDTLS_X509_KU_DECIPHER_ONLY              (0x8000)  /* bit 8 */
+
+/*
+ * Netscape certificate types
+ * (http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn3.html)
+ */
+
+#define MBEDTLS_X509_NS_CERT_TYPE_SSL_CLIENT         (0x80)  /* bit 0 */
+#define MBEDTLS_X509_NS_CERT_TYPE_SSL_SERVER         (0x40)  /* bit 1 */
+#define MBEDTLS_X509_NS_CERT_TYPE_EMAIL              (0x20)  /* bit 2 */
+#define MBEDTLS_X509_NS_CERT_TYPE_OBJECT_SIGNING     (0x10)  /* bit 3 */
+#define MBEDTLS_X509_NS_CERT_TYPE_RESERVED           (0x08)  /* bit 4 */
+#define MBEDTLS_X509_NS_CERT_TYPE_SSL_CA             (0x04)  /* bit 5 */
+#define MBEDTLS_X509_NS_CERT_TYPE_EMAIL_CA           (0x02)  /* bit 6 */
+#define MBEDTLS_X509_NS_CERT_TYPE_OBJECT_SIGNING_CA  (0x01)  /* bit 7 */
+
+/*
+ * X.509 extension types
+ *
+ * Comments refer to the status for using certificates. Status can be
+ * different for writing certificates or reading CRLs or CSRs.
+ */
+#define MBEDTLS_X509_EXT_AUTHORITY_KEY_IDENTIFIER    (1 << 0)
+#define MBEDTLS_X509_EXT_SUBJECT_KEY_IDENTIFIER      (1 << 1)
+#define MBEDTLS_X509_EXT_KEY_USAGE                   (1 << 2)
+#define MBEDTLS_X509_EXT_CERTIFICATE_POLICIES        (1 << 3)
+#define MBEDTLS_X509_EXT_POLICY_MAPPINGS             (1 << 4)
+#define MBEDTLS_X509_EXT_SUBJECT_ALT_NAME            (1 << 5)    /* Supported (DNS) */
+#define MBEDTLS_X509_EXT_ISSUER_ALT_NAME             (1 << 6)
+#define MBEDTLS_X509_EXT_SUBJECT_DIRECTORY_ATTRS     (1 << 7)
+#define MBEDTLS_X509_EXT_BASIC_CONSTRAINTS           (1 << 8)    /* Supported */
+#define MBEDTLS_X509_EXT_NAME_CONSTRAINTS            (1 << 9)
+#define MBEDTLS_X509_EXT_POLICY_CONSTRAINTS          (1 << 10)
+#define MBEDTLS_X509_EXT_EXTENDED_KEY_USAGE          (1 << 11)
+#define MBEDTLS_X509_EXT_CRL_DISTRIBUTION_POINTS     (1 << 12)
+#define MBEDTLS_X509_EXT_INIHIBIT_ANYPOLICY          (1 << 13)
+#define MBEDTLS_X509_EXT_FRESHEST_CRL                (1 << 14)
+
+#define MBEDTLS_X509_EXT_NS_CERT_TYPE                (1 << 16)
+
+/*
+ * Storage format identifiers
+ * Recognized formats: PEM and DER
+ */
+#define MBEDTLS_X509_FORMAT_DER                 1
+#define MBEDTLS_X509_FORMAT_PEM                 2
+
+#define MBEDTLS_X509_MAX_DN_NAME_SIZE         256 /**< Maximum value size of a DN entry */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \addtogroup x509_module
+ * \{ */
+
+/**
+ * \name Structures for parsing X.509 certificates, CRLs and CSRs
+ * \{
+ */
+
+/**
+ * Type-length-value structure that allows for ASN1 using DER.
+ */
+typedef mbedtls_asn1_buf mbedtls_x509_buf;
+
+/**
+ * Container for ASN1 bit strings.
+ */
+typedef mbedtls_asn1_bitstring mbedtls_x509_bitstring;
+
+/**
+ * Container for ASN1 named information objects.
+ * It allows for Relative Distinguished Names (e.g. cn=localhost,ou=code,etc.).
+ */
+typedef mbedtls_asn1_named_data mbedtls_x509_name;
+
+/**
+ * Container for a sequence of ASN.1 items
+ */
+typedef mbedtls_asn1_sequence mbedtls_x509_sequence;
+
+/** Container for date and time (precision in seconds). */
+typedef struct mbedtls_x509_time
+{
+    int year, mon, day;         /**< Date. */
+    int hour, min, sec;         /**< Time. */
+}
+mbedtls_x509_time;
+
+/** \} name Structures for parsing X.509 certificates, CRLs and CSRs */
+/** \} addtogroup x509_module */
+
+/**
+ * \brief          Store the certificate DN in printable form into buf;
+ *                 no more than size characters will be written.
+ *
+ * \param buf      Buffer to write to
+ * \param size     Maximum size of buffer
+ * \param dn       The X509 name to represent
+ *
+ * \return         The length of the string written (not including the
+ *                 terminated nul byte), or a negative error code.
+ */
+int mbedtls_x509_dn_gets( char *buf, size_t size, const mbedtls_x509_name *dn );
+
+/**
+ * \brief          Store the certificate serial in printable form into buf;
+ *                 no more than size characters will be written.
+ *
+ * \param buf      Buffer to write to
+ * \param size     Maximum size of buffer
+ * \param serial   The X509 serial to represent
+ *
+ * \return         The length of the string written (not including the
+ *                 terminated nul byte), or a negative error code.
+ */
+int mbedtls_x509_serial_gets( char *buf, size_t size, const mbedtls_x509_buf *serial );
+
+/**
+ * \brief          Check a given mbedtls_x509_time against the system time
+ *                 and tell if it's in the past.
+ *
+ * \note           Intended usage is "if( is_past( valid_to ) ) ERROR".
+ *                 Hence the return value of 1 if on internal errors.
+ *
+ * \param to       mbedtls_x509_time to check
+ *
+ * \return         1 if the given time is in the past or an error occured,
+ *                 0 otherwise.
+ */
+int mbedtls_x509_time_is_past( const mbedtls_x509_time *to );
+
+/**
+ * \brief          Check a given mbedtls_x509_time against the system time
+ *                 and tell if it's in the future.
+ *
+ * \note           Intended usage is "if( is_future( valid_from ) ) ERROR".
+ *                 Hence the return value of 1 if on internal errors.
+ *
+ * \param from     mbedtls_x509_time to check
+ *
+ * \return         1 if the given time is in the future or an error occured,
+ *                 0 otherwise.
+ */
+int mbedtls_x509_time_is_future( const mbedtls_x509_time *from );
+
+/**
+ * \brief          Checkup routine
+ *
+ * \return         0 if successful, or 1 if the test failed
+ */
+int mbedtls_x509_self_test( int verbose );
+
+/*
+ * Internal module functions. You probably do not want to use these unless you
+ * know you do.
+ */
+int mbedtls_x509_get_name( unsigned char **p, const unsigned char *end,
+                   mbedtls_x509_name *cur );
+int mbedtls_x509_get_alg_null( unsigned char **p, const unsigned char *end,
+                       mbedtls_x509_buf *alg );
+int mbedtls_x509_get_alg( unsigned char **p, const unsigned char *end,
+                  mbedtls_x509_buf *alg, mbedtls_x509_buf *params );
+#if defined(MBEDTLS_X509_RSASSA_PSS_SUPPORT)
+int mbedtls_x509_get_rsassa_pss_params( const mbedtls_x509_buf *params,
+                                mbedtls_md_type_t *md_alg, mbedtls_md_type_t *mgf_md,
+                                int *salt_len );
+#endif
+int mbedtls_x509_get_sig( unsigned char **p, const unsigned char *end, mbedtls_x509_buf *sig );
+int mbedtls_x509_get_sig_alg( const mbedtls_x509_buf *sig_oid, const mbedtls_x509_buf *sig_params,
+                      mbedtls_md_type_t *md_alg, mbedtls_pk_type_t *pk_alg,
+                      void **sig_opts );
+int mbedtls_x509_get_time( unsigned char **p, const unsigned char *end,
+                   mbedtls_x509_time *t );
+int mbedtls_x509_get_serial( unsigned char **p, const unsigned char *end,
+                     mbedtls_x509_buf *serial );
+int mbedtls_x509_get_ext( unsigned char **p, const unsigned char *end,
+                  mbedtls_x509_buf *ext, int tag );
+int mbedtls_x509_sig_alg_gets( char *buf, size_t size, const mbedtls_x509_buf *sig_oid,
+                       mbedtls_pk_type_t pk_alg, mbedtls_md_type_t md_alg,
+                       const void *sig_opts );
+int mbedtls_x509_key_size_helper( char *buf, size_t buf_size, const char *name );
+int mbedtls_x509_string_to_names( mbedtls_asn1_named_data **head, const char *name );
+int mbedtls_x509_set_extension( mbedtls_asn1_named_data **head, const char *oid, size_t oid_len,
+                        int critical, const unsigned char *val,
+                        size_t val_len );
+int mbedtls_x509_write_extensions( unsigned char **p, unsigned char *start,
+                           mbedtls_asn1_named_data *first );
+int mbedtls_x509_write_names( unsigned char **p, unsigned char *start,
+                      mbedtls_asn1_named_data *first );
+int mbedtls_x509_write_sig( unsigned char **p, unsigned char *start,
+                    const char *oid, size_t oid_len,
+                    unsigned char *sig, size_t size );
+
+#define MBEDTLS_X509_SAFE_SNPRINTF                          \
+    do {                                                    \
+        if( ret < 0 || (size_t) ret >= n )                  \
+            return( MBEDTLS_ERR_X509_BUFFER_TOO_SMALL );    \
+                                                            \
+        n -= (size_t) ret;                                  \
+        p += (size_t) ret;                                  \
+    } while( 0 )
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* x509.h */
diff --git a/common/mbedtls/x509_crl.c b/common/mbedtls/x509_crl.c
new file mode 100644
index 000000000..12e196a30
--- /dev/null
+++ b/common/mbedtls/x509_crl.c
@@ -0,0 +1,775 @@
+/*
+ *  X.509 Certidicate Revocation List (CRL) parsing
+ *
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+/*
+ *  The ITU-T X.509 standard defines a certificate format for PKI.
+ *
+ *  http://www.ietf.org/rfc/rfc5280.txt (Certificates and CRLs)
+ *  http://www.ietf.org/rfc/rfc3279.txt (Alg IDs for CRLs)
+ *  http://www.ietf.org/rfc/rfc2986.txt (CSRs, aka PKCS#10)
+ *
+ *  http://www.itu.int/ITU-T/studygroups/com17/languages/X.680-0207.pdf
+ *  http://www.itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf
+ */
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "mbedtls/config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#if defined(MBEDTLS_X509_CRL_PARSE_C)
+
+#include "mbedtls/x509_crl.h"
+#include "mbedtls/oid.h"
+#include "mbedtls/platform_util.h"
+
+#include <string.h>
+
+#if defined(MBEDTLS_PEM_PARSE_C)
+#include "mbedtls/pem.h"
+#endif
+
+#if defined(MBEDTLS_PLATFORM_C)
+#include "mbedtls/platform.h"
+#else
+#include <stdlib.h>
+#include <stdio.h>
+#define mbedtls_free       free
+#define mbedtls_calloc    calloc
+#define mbedtls_snprintf   snprintf
+#endif
+
+#if defined(_WIN32) && !defined(EFIX64) && !defined(EFI32)
+#include <windows.h>
+#else
+#include <time.h>
+#endif
+
+#if defined(MBEDTLS_FS_IO) || defined(EFIX64) || defined(EFI32)
+#include <stdio.h>
+#endif
+
+/*
+ *  Version  ::=  INTEGER  {  v1(0), v2(1)  }
+ */
+static int x509_crl_get_version( unsigned char **p,
+                             const unsigned char *end,
+                             int *ver )
+{
+    int ret;
+
+    if( ( ret = mbedtls_asn1_get_int( p, end, ver ) ) != 0 )
+    {
+        if( ret == MBEDTLS_ERR_ASN1_UNEXPECTED_TAG )
+        {
+            *ver = 0;
+            return( 0 );
+        }
+
+        return( MBEDTLS_ERR_X509_INVALID_VERSION + ret );
+    }
+
+    return( 0 );
+}
+
+/*
+ * X.509 CRL v2 extensions
+ *
+ * We currently don't parse any extension's content, but we do check that the
+ * list of extensions is well-formed and abort on critical extensions (that
+ * are unsupported as we don't support any extension so far)
+ */
+static int x509_get_crl_ext( unsigned char **p,
+                             const unsigned char *end,
+                             mbedtls_x509_buf *ext )
+{
+    int ret;
+
+    /*
+     * crlExtensions           [0]  EXPLICIT Extensions OPTIONAL
+     *                              -- if present, version MUST be v2
+     */
+    if( ( ret = mbedtls_x509_get_ext( p, end, ext, 0 ) ) != 0 )
+    {
+        if( ret == MBEDTLS_ERR_ASN1_UNEXPECTED_TAG )
+            return( 0 );
+
+        return( ret );
+    }
+
+    while( *p < end )
+    {
+        /*
+         * Extension  ::=  SEQUENCE  {
+         *      extnID      OBJECT IDENTIFIER,
+         *      critical    BOOLEAN DEFAULT FALSE,
+         *      extnValue   OCTET STRING  }
+         */
+        int is_critical = 0;
+        const unsigned char *end_ext_data;
+        size_t len;
+
+        /* Get enclosing sequence tag */
+        if( ( ret = mbedtls_asn1_get_tag( p, end, &len,
+                MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
+            return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret );
+
+        end_ext_data = *p + len;
+
+        /* Get OID (currently ignored) */
+        if( ( ret = mbedtls_asn1_get_tag( p, end_ext_data, &len,
+                                          MBEDTLS_ASN1_OID ) ) != 0 )
+        {
+            return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret );
+        }
+        *p += len;
+
+        /* Get optional critical */
+        if( ( ret = mbedtls_asn1_get_bool( p, end_ext_data,
+                                           &is_critical ) ) != 0 &&
+            ( ret != MBEDTLS_ERR_ASN1_UNEXPECTED_TAG ) )
+        {
+            return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret );
+        }
+
+        /* Data should be octet string type */
+        if( ( ret = mbedtls_asn1_get_tag( p, end_ext_data, &len,
+                MBEDTLS_ASN1_OCTET_STRING ) ) != 0 )
+            return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret );
+
+        /* Ignore data so far and just check its length */
+        *p += len;
+        if( *p != end_ext_data )
+            return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
+                    MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+
+        /* Abort on (unsupported) critical extensions */
+        if( is_critical )
+            return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
+                    MBEDTLS_ERR_ASN1_UNEXPECTED_TAG );
+    }
+
+    if( *p != end )
+        return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
+                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+
+    return( 0 );
+}
+
+/*
+ * X.509 CRL v2 entry extensions (no extensions parsed yet.)
+ */
+static int x509_get_crl_entry_ext( unsigned char **p,
+                             const unsigned char *end,
+                             mbedtls_x509_buf *ext )
+{
+    int ret;
+    size_t len = 0;
+
+    /* OPTIONAL */
+    if( end <= *p )
+        return( 0 );
+
+    ext->tag = **p;
+    ext->p = *p;
+
+    /*
+     * Get CRL-entry extension sequence header
+     * crlEntryExtensions      Extensions OPTIONAL  -- if present, MUST be v2
+     */
+    if( ( ret = mbedtls_asn1_get_tag( p, end, &ext->len,
+            MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
+    {
+        if( ret == MBEDTLS_ERR_ASN1_UNEXPECTED_TAG )
+        {
+            ext->p = NULL;
+            return( 0 );
+        }
+        return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret );
+    }
+
+    end = *p + ext->len;
+
+    if( end != *p + ext->len )
+        return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
+                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+
+    while( *p < end )
+    {
+        if( ( ret = mbedtls_asn1_get_tag( p, end, &len,
+                MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
+            return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret );
+
+        *p += len;
+    }
+
+    if( *p != end )
+        return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
+                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+
+    return( 0 );
+}
+
+/*
+ * X.509 CRL Entries
+ */
+static int x509_get_entries( unsigned char **p,
+                             const unsigned char *end,
+                             mbedtls_x509_crl_entry *entry )
+{
+    int ret;
+    size_t entry_len;
+    mbedtls_x509_crl_entry *cur_entry = entry;
+
+    if( *p == end )
+        return( 0 );
+
+    if( ( ret = mbedtls_asn1_get_tag( p, end, &entry_len,
+            MBEDTLS_ASN1_SEQUENCE | MBEDTLS_ASN1_CONSTRUCTED ) ) != 0 )
+    {
+        if( ret == MBEDTLS_ERR_ASN1_UNEXPECTED_TAG )
+            return( 0 );
+
+        return( ret );
+    }
+
+    end = *p + entry_len;
+
+    while( *p < end )
+    {
+        size_t len2;
+        const unsigned char *end2;
+
+        if( ( ret = mbedtls_asn1_get_tag( p, end, &len2,
+                MBEDTLS_ASN1_SEQUENCE | MBEDTLS_ASN1_CONSTRUCTED ) ) != 0 )
+        {
+            return( ret );
+        }
+
+        cur_entry->raw.tag = **p;
+        cur_entry->raw.p = *p;
+        cur_entry->raw.len = len2;
+        end2 = *p + len2;
+
+        if( ( ret = mbedtls_x509_get_serial( p, end2, &cur_entry->serial ) ) != 0 )
+            return( ret );
+
+        if( ( ret = mbedtls_x509_get_time( p, end2,
+                                   &cur_entry->revocation_date ) ) != 0 )
+            return( ret );
+
+        if( ( ret = x509_get_crl_entry_ext( p, end2,
+                                            &cur_entry->entry_ext ) ) != 0 )
+            return( ret );
+
+        if( *p < end )
+        {
+            cur_entry->next = mbedtls_calloc( 1, sizeof( mbedtls_x509_crl_entry ) );
+
+            if( cur_entry->next == NULL )
+                return( MBEDTLS_ERR_X509_ALLOC_FAILED );
+
+            cur_entry = cur_entry->next;
+        }
+    }
+
+    return( 0 );
+}
+
+/*
+ * Parse one  CRLs in DER format and append it to the chained list
+ */
+int mbedtls_x509_crl_parse_der( mbedtls_x509_crl *chain,
+                        const unsigned char *buf, size_t buflen )
+{
+    int ret;
+    size_t len;
+    unsigned char *p = NULL, *end = NULL;
+    mbedtls_x509_buf sig_params1, sig_params2, sig_oid2;
+    mbedtls_x509_crl *crl = chain;
+
+    /*
+     * Check for valid input
+     */
+    if( crl == NULL || buf == NULL )
+        return( MBEDTLS_ERR_X509_BAD_INPUT_DATA );
+
+    memset( &sig_params1, 0, sizeof( mbedtls_x509_buf ) );
+    memset( &sig_params2, 0, sizeof( mbedtls_x509_buf ) );
+    memset( &sig_oid2, 0, sizeof( mbedtls_x509_buf ) );
+
+    /*
+     * Add new CRL on the end of the chain if needed.
+     */
+    while( crl->version != 0 && crl->next != NULL )
+        crl = crl->next;
+
+    if( crl->version != 0 && crl->next == NULL )
+    {
+        crl->next = mbedtls_calloc( 1, sizeof( mbedtls_x509_crl ) );
+
+        if( crl->next == NULL )
+        {
+            mbedtls_x509_crl_free( crl );
+            return( MBEDTLS_ERR_X509_ALLOC_FAILED );
+        }
+
+        mbedtls_x509_crl_init( crl->next );
+        crl = crl->next;
+    }
+
+    /*
+     * Copy raw DER-encoded CRL
+     */
+    if( buflen == 0 )
+        return( MBEDTLS_ERR_X509_INVALID_FORMAT );
+
+    p = mbedtls_calloc( 1, buflen );
+    if( p == NULL )
+        return( MBEDTLS_ERR_X509_ALLOC_FAILED );
+
+    memcpy( p, buf, buflen );
+
+    crl->raw.p = p;
+    crl->raw.len = buflen;
+
+    end = p + buflen;
+
+    /*
+     * CertificateList  ::=  SEQUENCE  {
+     *      tbsCertList          TBSCertList,
+     *      signatureAlgorithm   AlgorithmIdentifier,
+     *      signatureValue       BIT STRING  }
+     */
+    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len,
+            MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
+    {
+        mbedtls_x509_crl_free( crl );
+        return( MBEDTLS_ERR_X509_INVALID_FORMAT );
+    }
+
+    if( len != (size_t) ( end - p ) )
+    {
+        mbedtls_x509_crl_free( crl );
+        return( MBEDTLS_ERR_X509_INVALID_FORMAT +
+                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+    }
+
+    /*
+     * TBSCertList  ::=  SEQUENCE  {
+     */
+    crl->tbs.p = p;
+
+    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len,
+            MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
+    {
+        mbedtls_x509_crl_free( crl );
+        return( MBEDTLS_ERR_X509_INVALID_FORMAT + ret );
+    }
+
+    end = p + len;
+    crl->tbs.len = end - crl->tbs.p;
+
+    /*
+     * Version  ::=  INTEGER  OPTIONAL {  v1(0), v2(1)  }
+     *               -- if present, MUST be v2
+     *
+     * signature            AlgorithmIdentifier
+     */
+    if( ( ret = x509_crl_get_version( &p, end, &crl->version ) ) != 0 ||
+        ( ret = mbedtls_x509_get_alg( &p, end, &crl->sig_oid, &sig_params1 ) ) != 0 )
+    {
+        mbedtls_x509_crl_free( crl );
+        return( ret );
+    }
+
+    if( crl->version < 0 || crl->version > 1 )
+    {
+        mbedtls_x509_crl_free( crl );
+        return( MBEDTLS_ERR_X509_UNKNOWN_VERSION );
+    }
+
+    crl->version++;
+
+    if( ( ret = mbedtls_x509_get_sig_alg( &crl->sig_oid, &sig_params1,
+                                  &crl->sig_md, &crl->sig_pk,
+                                  &crl->sig_opts ) ) != 0 )
+    {
+        mbedtls_x509_crl_free( crl );
+        return( MBEDTLS_ERR_X509_UNKNOWN_SIG_ALG );
+    }
+
+    /*
+     * issuer               Name
+     */
+    crl->issuer_raw.p = p;
+
+    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len,
+            MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
+    {
+        mbedtls_x509_crl_free( crl );
+        return( MBEDTLS_ERR_X509_INVALID_FORMAT + ret );
+    }
+
+    if( ( ret = mbedtls_x509_get_name( &p, p + len, &crl->issuer ) ) != 0 )
+    {
+        mbedtls_x509_crl_free( crl );
+        return( ret );
+    }
+
+    crl->issuer_raw.len = p - crl->issuer_raw.p;
+
+    /*
+     * thisUpdate          Time
+     * nextUpdate          Time OPTIONAL
+     */
+    if( ( ret = mbedtls_x509_get_time( &p, end, &crl->this_update ) ) != 0 )
+    {
+        mbedtls_x509_crl_free( crl );
+        return( ret );
+    }
+
+    if( ( ret = mbedtls_x509_get_time( &p, end, &crl->next_update ) ) != 0 )
+    {
+        if( ret != ( MBEDTLS_ERR_X509_INVALID_DATE +
+                        MBEDTLS_ERR_ASN1_UNEXPECTED_TAG ) &&
+            ret != ( MBEDTLS_ERR_X509_INVALID_DATE +
+                        MBEDTLS_ERR_ASN1_OUT_OF_DATA ) )
+        {
+            mbedtls_x509_crl_free( crl );
+            return( ret );
+        }
+    }
+
+    /*
+     * revokedCertificates    SEQUENCE OF SEQUENCE   {
+     *      userCertificate        CertificateSerialNumber,
+     *      revocationDate         Time,
+     *      crlEntryExtensions     Extensions OPTIONAL
+     *                                   -- if present, MUST be v2
+     *                        } OPTIONAL
+     */
+    if( ( ret = x509_get_entries( &p, end, &crl->entry ) ) != 0 )
+    {
+        mbedtls_x509_crl_free( crl );
+        return( ret );
+    }
+
+    /*
+     * crlExtensions          EXPLICIT Extensions OPTIONAL
+     *                              -- if present, MUST be v2
+     */
+    if( crl->version == 2 )
+    {
+        ret = x509_get_crl_ext( &p, end, &crl->crl_ext );
+
+        if( ret != 0 )
+        {
+            mbedtls_x509_crl_free( crl );
+            return( ret );
+        }
+    }
+
+    if( p != end )
+    {
+        mbedtls_x509_crl_free( crl );
+        return( MBEDTLS_ERR_X509_INVALID_FORMAT +
+                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+    }
+
+    end = crl->raw.p + crl->raw.len;
+
+    /*
+     *  signatureAlgorithm   AlgorithmIdentifier,
+     *  signatureValue       BIT STRING
+     */
+    if( ( ret = mbedtls_x509_get_alg( &p, end, &sig_oid2, &sig_params2 ) ) != 0 )
+    {
+        mbedtls_x509_crl_free( crl );
+        return( ret );
+    }
+
+    if( crl->sig_oid.len != sig_oid2.len ||
+        memcmp( crl->sig_oid.p, sig_oid2.p, crl->sig_oid.len ) != 0 ||
+        sig_params1.len != sig_params2.len ||
+        ( sig_params1.len != 0 &&
+          memcmp( sig_params1.p, sig_params2.p, sig_params1.len ) != 0 ) )
+    {
+        mbedtls_x509_crl_free( crl );
+        return( MBEDTLS_ERR_X509_SIG_MISMATCH );
+    }
+
+    if( ( ret = mbedtls_x509_get_sig( &p, end, &crl->sig ) ) != 0 )
+    {
+        mbedtls_x509_crl_free( crl );
+        return( ret );
+    }
+
+    if( p != end )
+    {
+        mbedtls_x509_crl_free( crl );
+        return( MBEDTLS_ERR_X509_INVALID_FORMAT +
+                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+    }
+
+    return( 0 );
+}
+
+/*
+ * Parse one or more CRLs and add them to the chained list
+ */
+int mbedtls_x509_crl_parse( mbedtls_x509_crl *chain, const unsigned char *buf, size_t buflen )
+{
+#if defined(MBEDTLS_PEM_PARSE_C)
+    int ret;
+    size_t use_len;
+    mbedtls_pem_context pem;
+    int is_pem = 0;
+
+    if( chain == NULL || buf == NULL )
+        return( MBEDTLS_ERR_X509_BAD_INPUT_DATA );
+
+    do
+    {
+        mbedtls_pem_init( &pem );
+
+        // Avoid calling mbedtls_pem_read_buffer() on non-null-terminated
+        // string
+        if( buflen == 0 || buf[buflen - 1] != '\0' )
+            ret = MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT;
+        else
+            ret = mbedtls_pem_read_buffer( &pem,
+                                           "-----BEGIN X509 CRL-----",
+                                           "-----END X509 CRL-----",
+                                            buf, NULL, 0, &use_len );
+
+        if( ret == 0 )
+        {
+            /*
+             * Was PEM encoded
+             */
+            is_pem = 1;
+
+            buflen -= use_len;
+            buf += use_len;
+
+            if( ( ret = mbedtls_x509_crl_parse_der( chain,
+                                            pem.buf, pem.buflen ) ) != 0 )
+            {
+                mbedtls_pem_free( &pem );
+                return( ret );
+            }
+        }
+        else if( is_pem )
+        {
+            mbedtls_pem_free( &pem );
+            return( ret );
+        }
+
+        mbedtls_pem_free( &pem );
+    }
+    /* In the PEM case, buflen is 1 at the end, for the terminated NULL byte.
+     * And a valid CRL cannot be less than 1 byte anyway. */
+    while( is_pem && buflen > 1 );
+
+    if( is_pem )
+        return( 0 );
+    else
+#endif /* MBEDTLS_PEM_PARSE_C */
+        return( mbedtls_x509_crl_parse_der( chain, buf, buflen ) );
+}
+
+#if defined(MBEDTLS_FS_IO)
+/*
+ * Load one or more CRLs and add them to the chained list
+ */
+int mbedtls_x509_crl_parse_file( mbedtls_x509_crl *chain, const char *path )
+{
+    int ret;
+    size_t n;
+    unsigned char *buf;
+
+    if( ( ret = mbedtls_pk_load_file( path, &buf, &n ) ) != 0 )
+        return( ret );
+
+    ret = mbedtls_x509_crl_parse( chain, buf, n );
+
+    mbedtls_platform_zeroize( buf, n );
+    mbedtls_free( buf );
+
+    return( ret );
+}
+#endif /* MBEDTLS_FS_IO */
+
+/*
+ * Return an informational string about the certificate.
+ */
+#define BEFORE_COLON    14
+#define BC              "14"
+/*
+ * Return an informational string about the CRL.
+ */
+int mbedtls_x509_crl_info( char *buf, size_t size, const char *prefix,
+                   const mbedtls_x509_crl *crl )
+{
+    int ret;
+    size_t n;
+    char *p;
+    const mbedtls_x509_crl_entry *entry;
+
+    p = buf;
+    n = size;
+
+    ret = mbedtls_snprintf( p, n, "%sCRL version   : %d",
+                               prefix, crl->version );
+    MBEDTLS_X509_SAFE_SNPRINTF;
+
+    ret = mbedtls_snprintf( p, n, "\n%sissuer name   : ", prefix );
+    MBEDTLS_X509_SAFE_SNPRINTF;
+    ret = mbedtls_x509_dn_gets( p, n, &crl->issuer );
+    MBEDTLS_X509_SAFE_SNPRINTF;
+
+    ret = mbedtls_snprintf( p, n, "\n%sthis update   : " \
+                   "%04d-%02d-%02d %02d:%02d:%02d", prefix,
+                   crl->this_update.year, crl->this_update.mon,
+                   crl->this_update.day,  crl->this_update.hour,
+                   crl->this_update.min,  crl->this_update.sec );
+    MBEDTLS_X509_SAFE_SNPRINTF;
+
+    ret = mbedtls_snprintf( p, n, "\n%snext update   : " \
+                   "%04d-%02d-%02d %02d:%02d:%02d", prefix,
+                   crl->next_update.year, crl->next_update.mon,
+                   crl->next_update.day,  crl->next_update.hour,
+                   crl->next_update.min,  crl->next_update.sec );
+    MBEDTLS_X509_SAFE_SNPRINTF;
+
+    entry = &crl->entry;
+
+    ret = mbedtls_snprintf( p, n, "\n%sRevoked certificates:",
+                               prefix );
+    MBEDTLS_X509_SAFE_SNPRINTF;
+
+    while( entry != NULL && entry->raw.len != 0 )
+    {
+        ret = mbedtls_snprintf( p, n, "\n%sserial number: ",
+                               prefix );
+        MBEDTLS_X509_SAFE_SNPRINTF;
+
+        ret = mbedtls_x509_serial_gets( p, n, &entry->serial );
+        MBEDTLS_X509_SAFE_SNPRINTF;
+
+        ret = mbedtls_snprintf( p, n, " revocation date: " \
+                   "%04d-%02d-%02d %02d:%02d:%02d",
+                   entry->revocation_date.year, entry->revocation_date.mon,
+                   entry->revocation_date.day,  entry->revocation_date.hour,
+                   entry->revocation_date.min,  entry->revocation_date.sec );
+        MBEDTLS_X509_SAFE_SNPRINTF;
+
+        entry = entry->next;
+    }
+
+    ret = mbedtls_snprintf( p, n, "\n%ssigned using  : ", prefix );
+    MBEDTLS_X509_SAFE_SNPRINTF;
+
+    ret = mbedtls_x509_sig_alg_gets( p, n, &crl->sig_oid, crl->sig_pk, crl->sig_md,
+                             crl->sig_opts );
+    MBEDTLS_X509_SAFE_SNPRINTF;
+
+    ret = mbedtls_snprintf( p, n, "\n" );
+    MBEDTLS_X509_SAFE_SNPRINTF;
+
+    return( (int) ( size - n ) );
+}
+
+/*
+ * Initialize a CRL chain
+ */
+void mbedtls_x509_crl_init( mbedtls_x509_crl *crl )
+{
+    memset( crl, 0, sizeof(mbedtls_x509_crl) );
+}
+
+/*
+ * Unallocate all CRL data
+ */
+void mbedtls_x509_crl_free( mbedtls_x509_crl *crl )
+{
+    mbedtls_x509_crl *crl_cur = crl;
+    mbedtls_x509_crl *crl_prv;
+    mbedtls_x509_name *name_cur;
+    mbedtls_x509_name *name_prv;
+    mbedtls_x509_crl_entry *entry_cur;
+    mbedtls_x509_crl_entry *entry_prv;
+
+    if( crl == NULL )
+        return;
+
+    do
+    {
+#if defined(MBEDTLS_X509_RSASSA_PSS_SUPPORT)
+        mbedtls_free( crl_cur->sig_opts );
+#endif
+
+        name_cur = crl_cur->issuer.next;
+        while( name_cur != NULL )
+        {
+            name_prv = name_cur;
+            name_cur = name_cur->next;
+            mbedtls_platform_zeroize( name_prv, sizeof( mbedtls_x509_name ) );
+            mbedtls_free( name_prv );
+        }
+
+        entry_cur = crl_cur->entry.next;
+        while( entry_cur != NULL )
+        {
+            entry_prv = entry_cur;
+            entry_cur = entry_cur->next;
+            mbedtls_platform_zeroize( entry_prv,
+                                      sizeof( mbedtls_x509_crl_entry ) );
+            mbedtls_free( entry_prv );
+        }
+
+        if( crl_cur->raw.p != NULL )
+        {
+            mbedtls_platform_zeroize( crl_cur->raw.p, crl_cur->raw.len );
+            mbedtls_free( crl_cur->raw.p );
+        }
+
+        crl_cur = crl_cur->next;
+    }
+    while( crl_cur != NULL );
+
+    crl_cur = crl;
+    do
+    {
+        crl_prv = crl_cur;
+        crl_cur = crl_cur->next;
+
+        mbedtls_platform_zeroize( crl_prv, sizeof( mbedtls_x509_crl ) );
+        if( crl_prv != crl )
+            mbedtls_free( crl_prv );
+    }
+    while( crl_cur != NULL );
+}
+
+#endif /* MBEDTLS_X509_CRL_PARSE_C */
diff --git a/common/mbedtls/x509_crl.h b/common/mbedtls/x509_crl.h
new file mode 100644
index 000000000..99f6e7126
--- /dev/null
+++ b/common/mbedtls/x509_crl.h
@@ -0,0 +1,176 @@
+/**
+ * \file x509_crl.h
+ *
+ * \brief X.509 certificate revocation list parsing
+ */
+/*
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+#ifndef MBEDTLS_X509_CRL_H
+#define MBEDTLS_X509_CRL_H
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#include "x509.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \addtogroup x509_module
+ * \{ */
+
+/**
+ * \name Structures and functions for parsing CRLs
+ * \{
+ */
+
+/**
+ * Certificate revocation list entry.
+ * Contains the CA-specific serial numbers and revocation dates.
+ */
+typedef struct mbedtls_x509_crl_entry
+{
+    mbedtls_x509_buf raw;
+
+    mbedtls_x509_buf serial;
+
+    mbedtls_x509_time revocation_date;
+
+    mbedtls_x509_buf entry_ext;
+
+    struct mbedtls_x509_crl_entry *next;
+}
+mbedtls_x509_crl_entry;
+
+/**
+ * Certificate revocation list structure.
+ * Every CRL may have multiple entries.
+ */
+typedef struct mbedtls_x509_crl
+{
+    mbedtls_x509_buf raw;           /**< The raw certificate data (DER). */
+    mbedtls_x509_buf tbs;           /**< The raw certificate body (DER). The part that is To Be Signed. */
+
+    int version;            /**< CRL version (1=v1, 2=v2) */
+    mbedtls_x509_buf sig_oid;       /**< CRL signature type identifier */
+
+    mbedtls_x509_buf issuer_raw;    /**< The raw issuer data (DER). */
+
+    mbedtls_x509_name issuer;       /**< The parsed issuer data (named information object). */
+
+    mbedtls_x509_time this_update;
+    mbedtls_x509_time next_update;
+
+    mbedtls_x509_crl_entry entry;   /**< The CRL entries containing the certificate revocation times for this CA. */
+
+    mbedtls_x509_buf crl_ext;
+
+    mbedtls_x509_buf sig_oid2;
+    mbedtls_x509_buf sig;
+    mbedtls_md_type_t sig_md;           /**< Internal representation of the MD algorithm of the signature algorithm, e.g. MBEDTLS_MD_SHA256 */
+    mbedtls_pk_type_t sig_pk;           /**< Internal representation of the Public Key algorithm of the signature algorithm, e.g. MBEDTLS_PK_RSA */
+    void *sig_opts;             /**< Signature options to be passed to mbedtls_pk_verify_ext(), e.g. for RSASSA-PSS */
+
+    struct mbedtls_x509_crl *next;
+}
+mbedtls_x509_crl;
+
+/**
+ * \brief          Parse a DER-encoded CRL and append it to the chained list
+ *
+ * \param chain    points to the start of the chain
+ * \param buf      buffer holding the CRL data in DER format
+ * \param buflen   size of the buffer
+ *                 (including the terminating null byte for PEM data)
+ *
+ * \return         0 if successful, or a specific X509 or PEM error code
+ */
+int mbedtls_x509_crl_parse_der( mbedtls_x509_crl *chain,
+                        const unsigned char *buf, size_t buflen );
+/**
+ * \brief          Parse one or more CRLs and append them to the chained list
+ *
+ * \note           Mutliple CRLs are accepted only if using PEM format
+ *
+ * \param chain    points to the start of the chain
+ * \param buf      buffer holding the CRL data in PEM or DER format
+ * \param buflen   size of the buffer
+ *                 (including the terminating null byte for PEM data)
+ *
+ * \return         0 if successful, or a specific X509 or PEM error code
+ */
+int mbedtls_x509_crl_parse( mbedtls_x509_crl *chain, const unsigned char *buf, size_t buflen );
+
+#if defined(MBEDTLS_FS_IO)
+/**
+ * \brief          Load one or more CRLs and append them to the chained list
+ *
+ * \note           Mutliple CRLs are accepted only if using PEM format
+ *
+ * \param chain    points to the start of the chain
+ * \param path     filename to read the CRLs from (in PEM or DER encoding)
+ *
+ * \return         0 if successful, or a specific X509 or PEM error code
+ */
+int mbedtls_x509_crl_parse_file( mbedtls_x509_crl *chain, const char *path );
+#endif /* MBEDTLS_FS_IO */
+
+/**
+ * \brief          Returns an informational string about the CRL.
+ *
+ * \param buf      Buffer to write to
+ * \param size     Maximum size of buffer
+ * \param prefix   A line prefix
+ * \param crl      The X509 CRL to represent
+ *
+ * \return         The length of the string written (not including the
+ *                 terminated nul byte), or a negative error code.
+ */
+int mbedtls_x509_crl_info( char *buf, size_t size, const char *prefix,
+                   const mbedtls_x509_crl *crl );
+
+/**
+ * \brief          Initialize a CRL (chain)
+ *
+ * \param crl      CRL chain to initialize
+ */
+void mbedtls_x509_crl_init( mbedtls_x509_crl *crl );
+
+/**
+ * \brief          Unallocate all CRL data
+ *
+ * \param crl      CRL chain to free
+ */
+void mbedtls_x509_crl_free( mbedtls_x509_crl *crl );
+
+/* \} name */
+/* \} addtogroup x509_module */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* mbedtls_x509_crl.h */
diff --git a/common/mbedtls/x509_crt.c b/common/mbedtls/x509_crt.c
new file mode 100644
index 000000000..925bddf1c
--- /dev/null
+++ b/common/mbedtls/x509_crt.c
@@ -0,0 +1,2488 @@
+/*
+ *  X.509 certificate parsing and verification
+ *
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+/*
+ *  The ITU-T X.509 standard defines a certificate format for PKI.
+ *
+ *  http://www.ietf.org/rfc/rfc5280.txt (Certificates and CRLs)
+ *  http://www.ietf.org/rfc/rfc3279.txt (Alg IDs for CRLs)
+ *  http://www.ietf.org/rfc/rfc2986.txt (CSRs, aka PKCS#10)
+ *
+ *  http://www.itu.int/ITU-T/studygroups/com17/languages/X.680-0207.pdf
+ *  http://www.itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf
+ *
+ *  [SIRO] https://cabforum.org/wp-content/uploads/Chunghwatelecom201503cabforumV4.pdf
+ */
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "mbedtls/config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#if defined(MBEDTLS_X509_CRT_PARSE_C)
+
+#include "mbedtls/x509_crt.h"
+#include "mbedtls/oid.h"
+#include "mbedtls/platform_util.h"
+
+#include <stdio.h>
+#include <string.h>
+
+#if defined(MBEDTLS_PEM_PARSE_C)
+#include "mbedtls/pem.h"
+#endif
+
+#if defined(MBEDTLS_PLATFORM_C)
+#include "mbedtls/platform.h"
+#else
+#include <stdlib.h>
+#define mbedtls_free       free
+#define mbedtls_calloc    calloc
+#define mbedtls_snprintf   snprintf
+#endif
+
+#if defined(MBEDTLS_THREADING_C)
+#include "mbedtls/threading.h"
+#endif
+
+#if defined(_WIN32) && !defined(EFIX64) && !defined(EFI32)
+#include <windows.h>
+#else
+#include <time.h>
+#endif
+
+#if defined(MBEDTLS_FS_IO)
+#include <stdio.h>
+#if !defined(_WIN32) || defined(EFIX64) || defined(EFI32)
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <dirent.h>
+#endif /* !_WIN32 || EFIX64 || EFI32 */
+#endif
+
+/*
+ * Item in a verification chain: cert and flags for it
+ */
+typedef struct {
+    mbedtls_x509_crt *crt;
+    uint32_t flags;
+} x509_crt_verify_chain_item;
+
+/*
+ * Max size of verification chain: end-entity + intermediates + trusted root
+ */
+#define X509_MAX_VERIFY_CHAIN_SIZE    ( MBEDTLS_X509_MAX_INTERMEDIATE_CA + 2 )
+
+/*
+ * Default profile
+ */
+const mbedtls_x509_crt_profile mbedtls_x509_crt_profile_default =
+{
+#if defined(MBEDTLS_TLS_DEFAULT_ALLOW_SHA1_IN_CERTIFICATES)
+    /* Allow SHA-1 (weak, but still safe in controlled environments) */
+    MBEDTLS_X509_ID_FLAG( MBEDTLS_MD_SHA1 ) |
+#endif
+    /* Only SHA-2 hashes */
+    MBEDTLS_X509_ID_FLAG( MBEDTLS_MD_SHA224 ) |
+    MBEDTLS_X509_ID_FLAG( MBEDTLS_MD_SHA256 ) |
+    MBEDTLS_X509_ID_FLAG( MBEDTLS_MD_SHA384 ) |
+    MBEDTLS_X509_ID_FLAG( MBEDTLS_MD_SHA512 ),
+    0xFFFFFFF, /* Any PK alg    */
+    0xFFFFFFF, /* Any curve     */
+    2048,
+};
+
+/*
+ * Next-default profile
+ */
+const mbedtls_x509_crt_profile mbedtls_x509_crt_profile_next =
+{
+    /* Hashes from SHA-256 and above */
+    MBEDTLS_X509_ID_FLAG( MBEDTLS_MD_SHA256 ) |
+    MBEDTLS_X509_ID_FLAG( MBEDTLS_MD_SHA384 ) |
+    MBEDTLS_X509_ID_FLAG( MBEDTLS_MD_SHA512 ),
+    0xFFFFFFF, /* Any PK alg    */
+#if defined(MBEDTLS_ECP_C)
+    /* Curves at or above 128-bit security level */
+    MBEDTLS_X509_ID_FLAG( MBEDTLS_ECP_DP_SECP256R1 ) |
+    MBEDTLS_X509_ID_FLAG( MBEDTLS_ECP_DP_SECP384R1 ) |
+    MBEDTLS_X509_ID_FLAG( MBEDTLS_ECP_DP_SECP521R1 ) |
+    MBEDTLS_X509_ID_FLAG( MBEDTLS_ECP_DP_BP256R1 ) |
+    MBEDTLS_X509_ID_FLAG( MBEDTLS_ECP_DP_BP384R1 ) |
+    MBEDTLS_X509_ID_FLAG( MBEDTLS_ECP_DP_BP512R1 ) |
+    MBEDTLS_X509_ID_FLAG( MBEDTLS_ECP_DP_SECP256K1 ),
+#else
+    0,
+#endif
+    2048,
+};
+
+/*
+ * NSA Suite B Profile
+ */
+const mbedtls_x509_crt_profile mbedtls_x509_crt_profile_suiteb =
+{
+    /* Only SHA-256 and 384 */
+    MBEDTLS_X509_ID_FLAG( MBEDTLS_MD_SHA256 ) |
+    MBEDTLS_X509_ID_FLAG( MBEDTLS_MD_SHA384 ),
+    /* Only ECDSA */
+    MBEDTLS_X509_ID_FLAG( MBEDTLS_PK_ECDSA ) |
+    MBEDTLS_X509_ID_FLAG( MBEDTLS_PK_ECKEY ),
+#if defined(MBEDTLS_ECP_C)
+    /* Only NIST P-256 and P-384 */
+    MBEDTLS_X509_ID_FLAG( MBEDTLS_ECP_DP_SECP256R1 ) |
+    MBEDTLS_X509_ID_FLAG( MBEDTLS_ECP_DP_SECP384R1 ),
+#else
+    0,
+#endif
+    0,
+};
+
+/*
+ * Check md_alg against profile
+ * Return 0 if md_alg is acceptable for this profile, -1 otherwise
+ */
+static int x509_profile_check_md_alg( const mbedtls_x509_crt_profile *profile,
+                                      mbedtls_md_type_t md_alg )
+{
+    if( md_alg == MBEDTLS_MD_NONE )
+        return( -1 );
+
+    if( ( profile->allowed_mds & MBEDTLS_X509_ID_FLAG( md_alg ) ) != 0 )
+        return( 0 );
+
+    return( -1 );
+}
+
+/*
+ * Check pk_alg against profile
+ * Return 0 if pk_alg is acceptable for this profile, -1 otherwise
+ */
+static int x509_profile_check_pk_alg( const mbedtls_x509_crt_profile *profile,
+                                      mbedtls_pk_type_t pk_alg )
+{
+    if( pk_alg == MBEDTLS_PK_NONE )
+        return( -1 );
+
+    if( ( profile->allowed_pks & MBEDTLS_X509_ID_FLAG( pk_alg ) ) != 0 )
+        return( 0 );
+
+    return( -1 );
+}
+
+/*
+ * Check key against profile
+ * Return 0 if pk is acceptable for this profile, -1 otherwise
+ */
+static int x509_profile_check_key( const mbedtls_x509_crt_profile *profile,
+                                   const mbedtls_pk_context *pk )
+{
+    const mbedtls_pk_type_t pk_alg = mbedtls_pk_get_type( pk );
+
+#if defined(MBEDTLS_RSA_C)
+    if( pk_alg == MBEDTLS_PK_RSA || pk_alg == MBEDTLS_PK_RSASSA_PSS )
+    {
+        if( mbedtls_pk_get_bitlen( pk ) >= profile->rsa_min_bitlen )
+            return( 0 );
+
+        return( -1 );
+    }
+#endif
+
+#if defined(MBEDTLS_ECP_C)
+    if( pk_alg == MBEDTLS_PK_ECDSA ||
+        pk_alg == MBEDTLS_PK_ECKEY ||
+        pk_alg == MBEDTLS_PK_ECKEY_DH )
+    {
+        const mbedtls_ecp_group_id gid = mbedtls_pk_ec( *pk )->grp.id;
+
+        if( gid == MBEDTLS_ECP_DP_NONE )
+            return( -1 );
+
+        if( ( profile->allowed_curves & MBEDTLS_X509_ID_FLAG( gid ) ) != 0 )
+            return( 0 );
+
+        return( -1 );
+    }
+#endif
+
+    return( -1 );
+}
+
+/*
+ *  Version  ::=  INTEGER  {  v1(0), v2(1), v3(2)  }
+ */
+static int x509_get_version( unsigned char **p,
+                             const unsigned char *end,
+                             int *ver )
+{
+    int ret;
+    size_t len;
+
+    if( ( ret = mbedtls_asn1_get_tag( p, end, &len,
+            MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_CONSTRUCTED | 0 ) ) != 0 )
+    {
+        if( ret == MBEDTLS_ERR_ASN1_UNEXPECTED_TAG )
+        {
+            *ver = 0;
+            return( 0 );
+        }
+
+        return( ret );
+    }
+
+    end = *p + len;
+
+    if( ( ret = mbedtls_asn1_get_int( p, end, ver ) ) != 0 )
+        return( MBEDTLS_ERR_X509_INVALID_VERSION + ret );
+
+    if( *p != end )
+        return( MBEDTLS_ERR_X509_INVALID_VERSION +
+                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+
+    return( 0 );
+}
+
+/*
+ *  Validity ::= SEQUENCE {
+ *       notBefore      Time,
+ *       notAfter       Time }
+ */
+static int x509_get_dates( unsigned char **p,
+                           const unsigned char *end,
+                           mbedtls_x509_time *from,
+                           mbedtls_x509_time *to )
+{
+    int ret;
+    size_t len;
+
+    if( ( ret = mbedtls_asn1_get_tag( p, end, &len,
+            MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
+        return( MBEDTLS_ERR_X509_INVALID_DATE + ret );
+
+    end = *p + len;
+
+    if( ( ret = mbedtls_x509_get_time( p, end, from ) ) != 0 )
+        return( ret );
+
+    if( ( ret = mbedtls_x509_get_time( p, end, to ) ) != 0 )
+        return( ret );
+
+    if( *p != end )
+        return( MBEDTLS_ERR_X509_INVALID_DATE +
+                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+
+    return( 0 );
+}
+
+/*
+ * X.509 v2/v3 unique identifier (not parsed)
+ */
+static int x509_get_uid( unsigned char **p,
+                         const unsigned char *end,
+                         mbedtls_x509_buf *uid, int n )
+{
+    int ret;
+
+    if( *p == end )
+        return( 0 );
+
+    uid->tag = **p;
+
+    if( ( ret = mbedtls_asn1_get_tag( p, end, &uid->len,
+            MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_CONSTRUCTED | n ) ) != 0 )
+    {
+        if( ret == MBEDTLS_ERR_ASN1_UNEXPECTED_TAG )
+            return( 0 );
+
+        return( ret );
+    }
+
+    uid->p = *p;
+    *p += uid->len;
+
+    return( 0 );
+}
+
+static int x509_get_basic_constraints( unsigned char **p,
+                                       const unsigned char *end,
+                                       int *ca_istrue,
+                                       int *max_pathlen )
+{
+    int ret;
+    size_t len;
+
+    /*
+     * BasicConstraints ::= SEQUENCE {
+     *      cA                      BOOLEAN DEFAULT FALSE,
+     *      pathLenConstraint       INTEGER (0..MAX) OPTIONAL }
+     */
+    *ca_istrue = 0; /* DEFAULT FALSE */
+    *max_pathlen = 0; /* endless */
+
+    if( ( ret = mbedtls_asn1_get_tag( p, end, &len,
+            MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
+        return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret );
+
+    if( *p == end )
+        return( 0 );
+
+    if( ( ret = mbedtls_asn1_get_bool( p, end, ca_istrue ) ) != 0 )
+    {
+        if( ret == MBEDTLS_ERR_ASN1_UNEXPECTED_TAG )
+            ret = mbedtls_asn1_get_int( p, end, ca_istrue );
+
+        if( ret != 0 )
+            return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret );
+
+        if( *ca_istrue != 0 )
+            *ca_istrue = 1;
+    }
+
+    if( *p == end )
+        return( 0 );
+
+    if( ( ret = mbedtls_asn1_get_int( p, end, max_pathlen ) ) != 0 )
+        return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret );
+
+    if( *p != end )
+        return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
+                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+
+    (*max_pathlen)++;
+
+    return( 0 );
+}
+
+static int x509_get_ns_cert_type( unsigned char **p,
+                                       const unsigned char *end,
+                                       unsigned char *ns_cert_type)
+{
+    int ret;
+    mbedtls_x509_bitstring bs = { 0, 0, NULL };
+
+    if( ( ret = mbedtls_asn1_get_bitstring( p, end, &bs ) ) != 0 )
+        return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret );
+
+    if( bs.len != 1 )
+        return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
+                MBEDTLS_ERR_ASN1_INVALID_LENGTH );
+
+    /* Get actual bitstring */
+    *ns_cert_type = *bs.p;
+    return( 0 );
+}
+
+static int x509_get_key_usage( unsigned char **p,
+                               const unsigned char *end,
+                               unsigned int *key_usage)
+{
+    int ret;
+    size_t i;
+    mbedtls_x509_bitstring bs = { 0, 0, NULL };
+
+    if( ( ret = mbedtls_asn1_get_bitstring( p, end, &bs ) ) != 0 )
+        return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret );
+
+    if( bs.len < 1 )
+        return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
+                MBEDTLS_ERR_ASN1_INVALID_LENGTH );
+
+    /* Get actual bitstring */
+    *key_usage = 0;
+    for( i = 0; i < bs.len && i < sizeof( unsigned int ); i++ )
+    {
+        *key_usage |= (unsigned int) bs.p[i] << (8*i);
+    }
+
+    return( 0 );
+}
+
+/*
+ * ExtKeyUsageSyntax ::= SEQUENCE SIZE (1..MAX) OF KeyPurposeId
+ *
+ * KeyPurposeId ::= OBJECT IDENTIFIER
+ */
+static int x509_get_ext_key_usage( unsigned char **p,
+                               const unsigned char *end,
+                               mbedtls_x509_sequence *ext_key_usage)
+{
+    int ret;
+
+    if( ( ret = mbedtls_asn1_get_sequence_of( p, end, ext_key_usage, MBEDTLS_ASN1_OID ) ) != 0 )
+        return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret );
+
+    /* Sequence length must be >= 1 */
+    if( ext_key_usage->buf.p == NULL )
+        return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
+                MBEDTLS_ERR_ASN1_INVALID_LENGTH );
+
+    return( 0 );
+}
+
+/*
+ * SubjectAltName ::= GeneralNames
+ *
+ * GeneralNames ::= SEQUENCE SIZE (1..MAX) OF GeneralName
+ *
+ * GeneralName ::= CHOICE {
+ *      otherName                       [0]     OtherName,
+ *      rfc822Name                      [1]     IA5String,
+ *      dNSName                         [2]     IA5String,
+ *      x400Address                     [3]     ORAddress,
+ *      directoryName                   [4]     Name,
+ *      ediPartyName                    [5]     EDIPartyName,
+ *      uniformResourceIdentifier       [6]     IA5String,
+ *      iPAddress                       [7]     OCTET STRING,
+ *      registeredID                    [8]     OBJECT IDENTIFIER }
+ *
+ * OtherName ::= SEQUENCE {
+ *      type-id    OBJECT IDENTIFIER,
+ *      value      [0] EXPLICIT ANY DEFINED BY type-id }
+ *
+ * EDIPartyName ::= SEQUENCE {
+ *      nameAssigner            [0]     DirectoryString OPTIONAL,
+ *      partyName               [1]     DirectoryString }
+ *
+ * NOTE: we only parse and use dNSName at this point.
+ */
+static int x509_get_subject_alt_name( unsigned char **p,
+                                      const unsigned char *end,
+                                      mbedtls_x509_sequence *subject_alt_name )
+{
+    int ret;
+    size_t len, tag_len;
+    mbedtls_asn1_buf *buf;
+    unsigned char tag;
+    mbedtls_asn1_sequence *cur = subject_alt_name;
+
+    /* Get main sequence tag */
+    if( ( ret = mbedtls_asn1_get_tag( p, end, &len,
+            MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
+        return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret );
+
+    if( *p + len != end )
+        return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
+                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+
+    while( *p < end )
+    {
+        if( ( end - *p ) < 1 )
+            return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
+                    MBEDTLS_ERR_ASN1_OUT_OF_DATA );
+
+        tag = **p;
+        (*p)++;
+        if( ( ret = mbedtls_asn1_get_len( p, end, &tag_len ) ) != 0 )
+            return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret );
+
+        if( ( tag & MBEDTLS_ASN1_TAG_CLASS_MASK ) !=
+                MBEDTLS_ASN1_CONTEXT_SPECIFIC )
+        {
+            return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
+                    MBEDTLS_ERR_ASN1_UNEXPECTED_TAG );
+        }
+
+        /* Skip everything but DNS name */
+        if( tag != ( MBEDTLS_ASN1_CONTEXT_SPECIFIC | 2 ) )
+        {
+            *p += tag_len;
+            continue;
+        }
+
+        /* Allocate and assign next pointer */
+        if( cur->buf.p != NULL )
+        {
+            if( cur->next != NULL )
+                return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS );
+
+            cur->next = mbedtls_calloc( 1, sizeof( mbedtls_asn1_sequence ) );
+
+            if( cur->next == NULL )
+                return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
+                        MBEDTLS_ERR_ASN1_ALLOC_FAILED );
+
+            cur = cur->next;
+        }
+
+        buf = &(cur->buf);
+        buf->tag = tag;
+        buf->p = *p;
+        buf->len = tag_len;
+        *p += buf->len;
+    }
+
+    /* Set final sequence entry's next pointer to NULL */
+    cur->next = NULL;
+
+    if( *p != end )
+        return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
+                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+
+    return( 0 );
+}
+
+/*
+ * X.509 v3 extensions
+ *
+ */
+static int x509_get_crt_ext( unsigned char **p,
+                             const unsigned char *end,
+                             mbedtls_x509_crt *crt )
+{
+    int ret;
+    size_t len;
+    unsigned char *end_ext_data, *end_ext_octet;
+
+    if( ( ret = mbedtls_x509_get_ext( p, end, &crt->v3_ext, 3 ) ) != 0 )
+    {
+        if( ret == MBEDTLS_ERR_ASN1_UNEXPECTED_TAG )
+            return( 0 );
+
+        return( ret );
+    }
+
+    while( *p < end )
+    {
+        /*
+         * Extension  ::=  SEQUENCE  {
+         *      extnID      OBJECT IDENTIFIER,
+         *      critical    BOOLEAN DEFAULT FALSE,
+         *      extnValue   OCTET STRING  }
+         */
+        mbedtls_x509_buf extn_oid = {0, 0, NULL};
+        int is_critical = 0; /* DEFAULT FALSE */
+        int ext_type = 0;
+
+        if( ( ret = mbedtls_asn1_get_tag( p, end, &len,
+                MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
+            return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret );
+
+        end_ext_data = *p + len;
+
+        /* Get extension ID */
+        if( ( ret = mbedtls_asn1_get_tag( p, end_ext_data, &extn_oid.len,
+                                          MBEDTLS_ASN1_OID ) ) != 0 )
+            return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret );
+
+        extn_oid.tag = MBEDTLS_ASN1_OID;
+        extn_oid.p = *p;
+        *p += extn_oid.len;
+
+        /* Get optional critical */
+        if( ( ret = mbedtls_asn1_get_bool( p, end_ext_data, &is_critical ) ) != 0 &&
+            ( ret != MBEDTLS_ERR_ASN1_UNEXPECTED_TAG ) )
+            return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret );
+
+        /* Data should be octet string type */
+        if( ( ret = mbedtls_asn1_get_tag( p, end_ext_data, &len,
+                MBEDTLS_ASN1_OCTET_STRING ) ) != 0 )
+            return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret );
+
+        end_ext_octet = *p + len;
+
+        if( end_ext_octet != end_ext_data )
+            return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
+                    MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+
+        /*
+         * Detect supported extensions
+         */
+        ret = mbedtls_oid_get_x509_ext_type( &extn_oid, &ext_type );
+
+        if( ret != 0 )
+        {
+            /* No parser found, skip extension */
+            *p = end_ext_octet;
+
+#if !defined(MBEDTLS_X509_ALLOW_UNSUPPORTED_CRITICAL_EXTENSION)
+            if( is_critical )
+            {
+                /* Data is marked as critical: fail */
+                return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
+                        MBEDTLS_ERR_ASN1_UNEXPECTED_TAG );
+            }
+#endif
+            continue;
+        }
+
+        /* Forbid repeated extensions */
+        if( ( crt->ext_types & ext_type ) != 0 )
+            return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS );
+
+        crt->ext_types |= ext_type;
+
+        switch( ext_type )
+        {
+        case MBEDTLS_X509_EXT_BASIC_CONSTRAINTS:
+            /* Parse basic constraints */
+            if( ( ret = x509_get_basic_constraints( p, end_ext_octet,
+                    &crt->ca_istrue, &crt->max_pathlen ) ) != 0 )
+                return( ret );
+            break;
+
+        case MBEDTLS_X509_EXT_KEY_USAGE:
+            /* Parse key usage */
+            if( ( ret = x509_get_key_usage( p, end_ext_octet,
+                    &crt->key_usage ) ) != 0 )
+                return( ret );
+            break;
+
+        case MBEDTLS_X509_EXT_EXTENDED_KEY_USAGE:
+            /* Parse extended key usage */
+            if( ( ret = x509_get_ext_key_usage( p, end_ext_octet,
+                    &crt->ext_key_usage ) ) != 0 )
+                return( ret );
+            break;
+
+        case MBEDTLS_X509_EXT_SUBJECT_ALT_NAME:
+            /* Parse subject alt name */
+            if( ( ret = x509_get_subject_alt_name( p, end_ext_octet,
+                    &crt->subject_alt_names ) ) != 0 )
+                return( ret );
+            break;
+
+        case MBEDTLS_X509_EXT_NS_CERT_TYPE:
+            /* Parse netscape certificate type */
+            if( ( ret = x509_get_ns_cert_type( p, end_ext_octet,
+                    &crt->ns_cert_type ) ) != 0 )
+                return( ret );
+            break;
+
+        default:
+            return( MBEDTLS_ERR_X509_FEATURE_UNAVAILABLE );
+        }
+    }
+
+    if( *p != end )
+        return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
+                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+
+    return( 0 );
+}
+
+/*
+ * Parse and fill a single X.509 certificate in DER format
+ */
+static int x509_crt_parse_der_core( mbedtls_x509_crt *crt, const unsigned char *buf,
+                                    size_t buflen )
+{
+    int ret;
+    size_t len;
+    unsigned char *p, *end, *crt_end;
+    mbedtls_x509_buf sig_params1, sig_params2, sig_oid2;
+
+    memset( &sig_params1, 0, sizeof( mbedtls_x509_buf ) );
+    memset( &sig_params2, 0, sizeof( mbedtls_x509_buf ) );
+    memset( &sig_oid2, 0, sizeof( mbedtls_x509_buf ) );
+
+    /*
+     * Check for valid input
+     */
+    if( crt == NULL || buf == NULL )
+        return( MBEDTLS_ERR_X509_BAD_INPUT_DATA );
+
+    // Use the original buffer until we figure out actual length
+    p = (unsigned char*) buf;
+    len = buflen;
+    end = p + len;
+
+    /*
+     * Certificate  ::=  SEQUENCE  {
+     *      tbsCertificate       TBSCertificate,
+     *      signatureAlgorithm   AlgorithmIdentifier,
+     *      signatureValue       BIT STRING  }
+     */
+    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len,
+            MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
+    {
+        mbedtls_x509_crt_free( crt );
+        return( MBEDTLS_ERR_X509_INVALID_FORMAT );
+    }
+
+    if( len > (size_t) ( end - p ) )
+    {
+        mbedtls_x509_crt_free( crt );
+        return( MBEDTLS_ERR_X509_INVALID_FORMAT +
+                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+    }
+    crt_end = p + len;
+
+    // Create and populate a new buffer for the raw field
+    crt->raw.len = crt_end - buf;
+    crt->raw.p = p = mbedtls_calloc( 1, crt->raw.len );
+    if( p == NULL )
+        return( MBEDTLS_ERR_X509_ALLOC_FAILED );
+
+    memcpy( p, buf, crt->raw.len );
+
+    // Direct pointers to the new buffer
+    p += crt->raw.len - len;
+    end = crt_end = p + len;
+
+    /*
+     * TBSCertificate  ::=  SEQUENCE  {
+     */
+    crt->tbs.p = p;
+
+    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len,
+            MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
+    {
+        mbedtls_x509_crt_free( crt );
+        return( MBEDTLS_ERR_X509_INVALID_FORMAT + ret );
+    }
+
+    end = p + len;
+    crt->tbs.len = end - crt->tbs.p;
+
+    /*
+     * Version  ::=  INTEGER  {  v1(0), v2(1), v3(2)  }
+     *
+     * CertificateSerialNumber  ::=  INTEGER
+     *
+     * signature            AlgorithmIdentifier
+     */
+    if( ( ret = x509_get_version(  &p, end, &crt->version  ) ) != 0 ||
+        ( ret = mbedtls_x509_get_serial(   &p, end, &crt->serial   ) ) != 0 ||
+        ( ret = mbedtls_x509_get_alg(      &p, end, &crt->sig_oid,
+                                            &sig_params1 ) ) != 0 )
+    {
+        mbedtls_x509_crt_free( crt );
+        return( ret );
+    }
+
+    if( crt->version < 0 || crt->version > 2 )
+    {
+        mbedtls_x509_crt_free( crt );
+        return( MBEDTLS_ERR_X509_UNKNOWN_VERSION );
+    }
+
+    crt->version++;
+
+    if( ( ret = mbedtls_x509_get_sig_alg( &crt->sig_oid, &sig_params1,
+                                  &crt->sig_md, &crt->sig_pk,
+                                  &crt->sig_opts ) ) != 0 )
+    {
+        mbedtls_x509_crt_free( crt );
+        return( ret );
+    }
+
+    /*
+     * issuer               Name
+     */
+    crt->issuer_raw.p = p;
+
+    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len,
+            MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
+    {
+        mbedtls_x509_crt_free( crt );
+        return( MBEDTLS_ERR_X509_INVALID_FORMAT + ret );
+    }
+
+    if( ( ret = mbedtls_x509_get_name( &p, p + len, &crt->issuer ) ) != 0 )
+    {
+        mbedtls_x509_crt_free( crt );
+        return( ret );
+    }
+
+    crt->issuer_raw.len = p - crt->issuer_raw.p;
+
+    /*
+     * Validity ::= SEQUENCE {
+     *      notBefore      Time,
+     *      notAfter       Time }
+     *
+     */
+    if( ( ret = x509_get_dates( &p, end, &crt->valid_from,
+                                         &crt->valid_to ) ) != 0 )
+    {
+        mbedtls_x509_crt_free( crt );
+        return( ret );
+    }
+
+    /*
+     * subject              Name
+     */
+    crt->subject_raw.p = p;
+
+    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len,
+            MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
+    {
+        mbedtls_x509_crt_free( crt );
+        return( MBEDTLS_ERR_X509_INVALID_FORMAT + ret );
+    }
+
+    if( len && ( ret = mbedtls_x509_get_name( &p, p + len, &crt->subject ) ) != 0 )
+    {
+        mbedtls_x509_crt_free( crt );
+        return( ret );
+    }
+
+    crt->subject_raw.len = p - crt->subject_raw.p;
+
+    /*
+     * SubjectPublicKeyInfo
+     */
+    if( ( ret = mbedtls_pk_parse_subpubkey( &p, end, &crt->pk ) ) != 0 )
+    {
+        mbedtls_x509_crt_free( crt );
+        return( ret );
+    }
+
+    /*
+     *  issuerUniqueID  [1]  IMPLICIT UniqueIdentifier OPTIONAL,
+     *                       -- If present, version shall be v2 or v3
+     *  subjectUniqueID [2]  IMPLICIT UniqueIdentifier OPTIONAL,
+     *                       -- If present, version shall be v2 or v3
+     *  extensions      [3]  EXPLICIT Extensions OPTIONAL
+     *                       -- If present, version shall be v3
+     */
+    if( crt->version == 2 || crt->version == 3 )
+    {
+        ret = x509_get_uid( &p, end, &crt->issuer_id,  1 );
+        if( ret != 0 )
+        {
+            mbedtls_x509_crt_free( crt );
+            return( ret );
+        }
+    }
+
+    if( crt->version == 2 || crt->version == 3 )
+    {
+        ret = x509_get_uid( &p, end, &crt->subject_id,  2 );
+        if( ret != 0 )
+        {
+            mbedtls_x509_crt_free( crt );
+            return( ret );
+        }
+    }
+
+#if !defined(MBEDTLS_X509_ALLOW_EXTENSIONS_NON_V3)
+    if( crt->version == 3 )
+#endif
+    {
+        ret = x509_get_crt_ext( &p, end, crt );
+        if( ret != 0 )
+        {
+            mbedtls_x509_crt_free( crt );
+            return( ret );
+        }
+    }
+
+    if( p != end )
+    {
+        mbedtls_x509_crt_free( crt );
+        return( MBEDTLS_ERR_X509_INVALID_FORMAT +
+                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+    }
+
+    end = crt_end;
+
+    /*
+     *  }
+     *  -- end of TBSCertificate
+     *
+     *  signatureAlgorithm   AlgorithmIdentifier,
+     *  signatureValue       BIT STRING
+     */
+    if( ( ret = mbedtls_x509_get_alg( &p, end, &sig_oid2, &sig_params2 ) ) != 0 )
+    {
+        mbedtls_x509_crt_free( crt );
+        return( ret );
+    }
+
+    if( crt->sig_oid.len != sig_oid2.len ||
+        memcmp( crt->sig_oid.p, sig_oid2.p, crt->sig_oid.len ) != 0 ||
+        sig_params1.len != sig_params2.len ||
+        ( sig_params1.len != 0 &&
+          memcmp( sig_params1.p, sig_params2.p, sig_params1.len ) != 0 ) )
+    {
+        mbedtls_x509_crt_free( crt );
+        return( MBEDTLS_ERR_X509_SIG_MISMATCH );
+    }
+
+    if( ( ret = mbedtls_x509_get_sig( &p, end, &crt->sig ) ) != 0 )
+    {
+        mbedtls_x509_crt_free( crt );
+        return( ret );
+    }
+
+    if( p != end )
+    {
+        mbedtls_x509_crt_free( crt );
+        return( MBEDTLS_ERR_X509_INVALID_FORMAT +
+                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+    }
+
+    return( 0 );
+}
+
+/*
+ * Parse one X.509 certificate in DER format from a buffer and add them to a
+ * chained list
+ */
+int mbedtls_x509_crt_parse_der( mbedtls_x509_crt *chain, const unsigned char *buf,
+                        size_t buflen )
+{
+    int ret;
+    mbedtls_x509_crt *crt = chain, *prev = NULL;
+
+    /*
+     * Check for valid input
+     */
+    if( crt == NULL || buf == NULL )
+        return( MBEDTLS_ERR_X509_BAD_INPUT_DATA );
+
+    while( crt->version != 0 && crt->next != NULL )
+    {
+        prev = crt;
+        crt = crt->next;
+    }
+
+    /*
+     * Add new certificate on the end of the chain if needed.
+     */
+    if( crt->version != 0 && crt->next == NULL )
+    {
+        crt->next = mbedtls_calloc( 1, sizeof( mbedtls_x509_crt ) );
+
+        if( crt->next == NULL )
+            return( MBEDTLS_ERR_X509_ALLOC_FAILED );
+
+        prev = crt;
+        mbedtls_x509_crt_init( crt->next );
+        crt = crt->next;
+    }
+
+    if( ( ret = x509_crt_parse_der_core( crt, buf, buflen ) ) != 0 )
+    {
+        if( prev )
+            prev->next = NULL;
+
+        if( crt != chain )
+            mbedtls_free( crt );
+
+        return( ret );
+    }
+
+    return( 0 );
+}
+
+/*
+ * Parse one or more PEM certificates from a buffer and add them to the chained
+ * list
+ */
+int mbedtls_x509_crt_parse( mbedtls_x509_crt *chain, const unsigned char *buf, size_t buflen )
+{
+#if defined(MBEDTLS_PEM_PARSE_C)
+    int success = 0, first_error = 0, total_failed = 0;
+    int buf_format = MBEDTLS_X509_FORMAT_DER;
+#endif
+
+    /*
+     * Check for valid input
+     */
+    if( chain == NULL || buf == NULL )
+        return( MBEDTLS_ERR_X509_BAD_INPUT_DATA );
+
+    /*
+     * Determine buffer content. Buffer contains either one DER certificate or
+     * one or more PEM certificates.
+     */
+#if defined(MBEDTLS_PEM_PARSE_C)
+    if( buflen != 0 && buf[buflen - 1] == '\0' &&
+        strstr( (const char *) buf, "-----BEGIN CERTIFICATE-----" ) != NULL )
+    {
+        buf_format = MBEDTLS_X509_FORMAT_PEM;
+    }
+
+    if( buf_format == MBEDTLS_X509_FORMAT_DER )
+        return mbedtls_x509_crt_parse_der( chain, buf, buflen );
+#else
+    return mbedtls_x509_crt_parse_der( chain, buf, buflen );
+#endif
+
+#if defined(MBEDTLS_PEM_PARSE_C)
+    if( buf_format == MBEDTLS_X509_FORMAT_PEM )
+    {
+        int ret;
+        mbedtls_pem_context pem;
+
+        /* 1 rather than 0 since the terminating NULL byte is counted in */
+        while( buflen > 1 )
+        {
+            size_t use_len;
+            mbedtls_pem_init( &pem );
+
+            /* If we get there, we know the string is null-terminated */
+            ret = mbedtls_pem_read_buffer( &pem,
+                           "-----BEGIN CERTIFICATE-----",
+                           "-----END CERTIFICATE-----",
+                           buf, NULL, 0, &use_len );
+
+            if( ret == 0 )
+            {
+                /*
+                 * Was PEM encoded
+                 */
+                buflen -= use_len;
+                buf += use_len;
+            }
+            else if( ret == MBEDTLS_ERR_PEM_BAD_INPUT_DATA )
+            {
+                return( ret );
+            }
+            else if( ret != MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT )
+            {
+                mbedtls_pem_free( &pem );
+
+                /*
+                 * PEM header and footer were found
+                 */
+                buflen -= use_len;
+                buf += use_len;
+
+                if( first_error == 0 )
+                    first_error = ret;
+
+                total_failed++;
+                continue;
+            }
+            else
+                break;
+
+            ret = mbedtls_x509_crt_parse_der( chain, pem.buf, pem.buflen );
+
+            mbedtls_pem_free( &pem );
+
+            if( ret != 0 )
+            {
+                /*
+                 * Quit parsing on a memory error
+                 */
+                if( ret == MBEDTLS_ERR_X509_ALLOC_FAILED )
+                    return( ret );
+
+                if( first_error == 0 )
+                    first_error = ret;
+
+                total_failed++;
+                continue;
+            }
+
+            success = 1;
+        }
+    }
+
+    if( success )
+        return( total_failed );
+    else if( first_error )
+        return( first_error );
+    else
+        return( MBEDTLS_ERR_X509_CERT_UNKNOWN_FORMAT );
+#endif /* MBEDTLS_PEM_PARSE_C */
+}
+
+#if defined(MBEDTLS_FS_IO)
+/*
+ * Load one or more certificates and add them to the chained list
+ */
+int mbedtls_x509_crt_parse_file( mbedtls_x509_crt *chain, const char *path )
+{
+    int ret;
+    size_t n;
+    unsigned char *buf;
+
+    if( ( ret = mbedtls_pk_load_file( path, &buf, &n ) ) != 0 )
+        return( ret );
+
+    ret = mbedtls_x509_crt_parse( chain, buf, n );
+
+    mbedtls_platform_zeroize( buf, n );
+    mbedtls_free( buf );
+
+    return( ret );
+}
+
+int mbedtls_x509_crt_parse_path( mbedtls_x509_crt *chain, const char *path )
+{
+    int ret = 0;
+#if defined(_WIN32) && !defined(EFIX64) && !defined(EFI32)
+    int w_ret;
+    WCHAR szDir[MAX_PATH];
+    char filename[MAX_PATH];
+    char *p;
+    size_t len = strlen( path );
+
+    WIN32_FIND_DATAW file_data;
+    HANDLE hFind;
+
+    if( len > MAX_PATH - 3 )
+        return( MBEDTLS_ERR_X509_BAD_INPUT_DATA );
+
+    memset( szDir, 0, sizeof(szDir) );
+    memset( filename, 0, MAX_PATH );
+    memcpy( filename, path, len );
+    filename[len++] = '\\';
+    p = filename + len;
+    filename[len++] = '*';
+
+    w_ret = MultiByteToWideChar( CP_ACP, 0, filename, (int)len, szDir,
+                                 MAX_PATH - 3 );
+    if( w_ret == 0 )
+        return( MBEDTLS_ERR_X509_BAD_INPUT_DATA );
+
+    hFind = FindFirstFileW( szDir, &file_data );
+    if( hFind == INVALID_HANDLE_VALUE )
+        return( MBEDTLS_ERR_X509_FILE_IO_ERROR );
+
+    len = MAX_PATH - len;
+    do
+    {
+        memset( p, 0, len );
+
+        if( file_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY )
+            continue;
+
+        w_ret = WideCharToMultiByte( CP_ACP, 0, file_data.cFileName,
+                                     lstrlenW( file_data.cFileName ),
+                                     p, (int) len - 1,
+                                     NULL, NULL );
+        if( w_ret == 0 )
+        {
+            ret = MBEDTLS_ERR_X509_FILE_IO_ERROR;
+            goto cleanup;
+        }
+
+        w_ret = mbedtls_x509_crt_parse_file( chain, filename );
+        if( w_ret < 0 )
+            ret++;
+        else
+            ret += w_ret;
+    }
+    while( FindNextFileW( hFind, &file_data ) != 0 );
+
+    if( GetLastError() != ERROR_NO_MORE_FILES )
+        ret = MBEDTLS_ERR_X509_FILE_IO_ERROR;
+
+cleanup:
+    FindClose( hFind );
+#else /* _WIN32 */
+    int t_ret;
+    int snp_ret;
+    struct stat sb;
+    struct dirent *entry;
+    char entry_name[MBEDTLS_X509_MAX_FILE_PATH_LEN];
+    DIR *dir = opendir( path );
+
+    if( dir == NULL )
+        return( MBEDTLS_ERR_X509_FILE_IO_ERROR );
+
+#if defined(MBEDTLS_THREADING_C)
+    if( ( ret = mbedtls_mutex_lock( &mbedtls_threading_readdir_mutex ) ) != 0 )
+    {
+        closedir( dir );
+        return( ret );
+    }
+#endif /* MBEDTLS_THREADING_C */
+
+    while( ( entry = readdir( dir ) ) != NULL )
+    {
+        snp_ret = mbedtls_snprintf( entry_name, sizeof entry_name,
+                                    "%s/%s", path, entry->d_name );
+
+        if( snp_ret < 0 || (size_t)snp_ret >= sizeof entry_name )
+        {
+            ret = MBEDTLS_ERR_X509_BUFFER_TOO_SMALL;
+            goto cleanup;
+        }
+        else if( stat( entry_name, &sb ) == -1 )
+        {
+            ret = MBEDTLS_ERR_X509_FILE_IO_ERROR;
+            goto cleanup;
+        }
+
+        if( !S_ISREG( sb.st_mode ) )
+            continue;
+
+        // Ignore parse errors
+        //
+        t_ret = mbedtls_x509_crt_parse_file( chain, entry_name );
+        if( t_ret < 0 )
+            ret++;
+        else
+            ret += t_ret;
+    }
+
+cleanup:
+    closedir( dir );
+
+#if defined(MBEDTLS_THREADING_C)
+    if( mbedtls_mutex_unlock( &mbedtls_threading_readdir_mutex ) != 0 )
+        ret = MBEDTLS_ERR_THREADING_MUTEX_ERROR;
+#endif /* MBEDTLS_THREADING_C */
+
+#endif /* _WIN32 */
+
+    return( ret );
+}
+#endif /* MBEDTLS_FS_IO */
+
+static int x509_info_subject_alt_name( char **buf, size_t *size,
+                                       const mbedtls_x509_sequence *subject_alt_name )
+{
+    size_t i;
+    size_t n = *size;
+    char *p = *buf;
+    const mbedtls_x509_sequence *cur = subject_alt_name;
+    const char *sep = "";
+    size_t sep_len = 0;
+
+    while( cur != NULL )
+    {
+        if( cur->buf.len + sep_len >= n )
+        {
+            *p = '\0';
+            return( MBEDTLS_ERR_X509_BUFFER_TOO_SMALL );
+        }
+
+        n -= cur->buf.len + sep_len;
+        for( i = 0; i < sep_len; i++ )
+            *p++ = sep[i];
+        for( i = 0; i < cur->buf.len; i++ )
+            *p++ = cur->buf.p[i];
+
+        sep = ", ";
+        sep_len = 2;
+
+        cur = cur->next;
+    }
+
+    *p = '\0';
+
+    *size = n;
+    *buf = p;
+
+    return( 0 );
+}
+
+#define PRINT_ITEM(i)                           \
+    {                                           \
+        ret = mbedtls_snprintf( p, n, "%s" i, sep );    \
+        MBEDTLS_X509_SAFE_SNPRINTF;                        \
+        sep = ", ";                             \
+    }
+
+#define CERT_TYPE(type,name)                    \
+    if( ns_cert_type & type )                   \
+        PRINT_ITEM( name );
+
+static int x509_info_cert_type( char **buf, size_t *size,
+                                unsigned char ns_cert_type )
+{
+    int ret;
+    size_t n = *size;
+    char *p = *buf;
+    const char *sep = "";
+
+    CERT_TYPE( MBEDTLS_X509_NS_CERT_TYPE_SSL_CLIENT,         "SSL Client" );
+    CERT_TYPE( MBEDTLS_X509_NS_CERT_TYPE_SSL_SERVER,         "SSL Server" );
+    CERT_TYPE( MBEDTLS_X509_NS_CERT_TYPE_EMAIL,              "Email" );
+    CERT_TYPE( MBEDTLS_X509_NS_CERT_TYPE_OBJECT_SIGNING,     "Object Signing" );
+    CERT_TYPE( MBEDTLS_X509_NS_CERT_TYPE_RESERVED,           "Reserved" );
+    CERT_TYPE( MBEDTLS_X509_NS_CERT_TYPE_SSL_CA,             "SSL CA" );
+    CERT_TYPE( MBEDTLS_X509_NS_CERT_TYPE_EMAIL_CA,           "Email CA" );
+    CERT_TYPE( MBEDTLS_X509_NS_CERT_TYPE_OBJECT_SIGNING_CA,  "Object Signing CA" );
+
+    *size = n;
+    *buf = p;
+
+    return( 0 );
+}
+
+#define KEY_USAGE(code,name)    \
+    if( key_usage & code )      \
+        PRINT_ITEM( name );
+
+static int x509_info_key_usage( char **buf, size_t *size,
+                                unsigned int key_usage )
+{
+    int ret;
+    size_t n = *size;
+    char *p = *buf;
+    const char *sep = "";
+
+    KEY_USAGE( MBEDTLS_X509_KU_DIGITAL_SIGNATURE,    "Digital Signature" );
+    KEY_USAGE( MBEDTLS_X509_KU_NON_REPUDIATION,      "Non Repudiation" );
+    KEY_USAGE( MBEDTLS_X509_KU_KEY_ENCIPHERMENT,     "Key Encipherment" );
+    KEY_USAGE( MBEDTLS_X509_KU_DATA_ENCIPHERMENT,    "Data Encipherment" );
+    KEY_USAGE( MBEDTLS_X509_KU_KEY_AGREEMENT,        "Key Agreement" );
+    KEY_USAGE( MBEDTLS_X509_KU_KEY_CERT_SIGN,        "Key Cert Sign" );
+    KEY_USAGE( MBEDTLS_X509_KU_CRL_SIGN,             "CRL Sign" );
+    KEY_USAGE( MBEDTLS_X509_KU_ENCIPHER_ONLY,        "Encipher Only" );
+    KEY_USAGE( MBEDTLS_X509_KU_DECIPHER_ONLY,        "Decipher Only" );
+
+    *size = n;
+    *buf = p;
+
+    return( 0 );
+}
+
+static int x509_info_ext_key_usage( char **buf, size_t *size,
+                                    const mbedtls_x509_sequence *extended_key_usage )
+{
+    int ret;
+    const char *desc;
+    size_t n = *size;
+    char *p = *buf;
+    const mbedtls_x509_sequence *cur = extended_key_usage;
+    const char *sep = "";
+
+    while( cur != NULL )
+    {
+        if( mbedtls_oid_get_extended_key_usage( &cur->buf, &desc ) != 0 )
+            desc = "???";
+
+        ret = mbedtls_snprintf( p, n, "%s%s", sep, desc );
+        MBEDTLS_X509_SAFE_SNPRINTF;
+
+        sep = ", ";
+
+        cur = cur->next;
+    }
+
+    *size = n;
+    *buf = p;
+
+    return( 0 );
+}
+
+/*
+ * Return an informational string about the certificate.
+ */
+#define BEFORE_COLON    18
+#define BC              "18"
+int mbedtls_x509_crt_info( char *buf, size_t size, const char *prefix,
+                   const mbedtls_x509_crt *crt )
+{
+    int ret;
+    size_t n;
+    char *p;
+    char key_size_str[BEFORE_COLON];
+
+    p = buf;
+    n = size;
+
+    if( NULL == crt )
+    {
+        ret = mbedtls_snprintf( p, n, "\nCertificate is uninitialised!\n" );
+        MBEDTLS_X509_SAFE_SNPRINTF;
+
+        return( (int) ( size - n ) );
+    }
+
+    ret = mbedtls_snprintf( p, n, "%scert. version     : %d\n",
+                               prefix, crt->version );
+    MBEDTLS_X509_SAFE_SNPRINTF;
+    ret = mbedtls_snprintf( p, n, "%sserial number     : ",
+                               prefix );
+    MBEDTLS_X509_SAFE_SNPRINTF;
+
+    ret = mbedtls_x509_serial_gets( p, n, &crt->serial );
+    MBEDTLS_X509_SAFE_SNPRINTF;
+
+    ret = mbedtls_snprintf( p, n, "\n%sissuer name       : ", prefix );
+    MBEDTLS_X509_SAFE_SNPRINTF;
+    ret = mbedtls_x509_dn_gets( p, n, &crt->issuer  );
+    MBEDTLS_X509_SAFE_SNPRINTF;
+
+    ret = mbedtls_snprintf( p, n, "\n%ssubject name      : ", prefix );
+    MBEDTLS_X509_SAFE_SNPRINTF;
+    ret = mbedtls_x509_dn_gets( p, n, &crt->subject );
+    MBEDTLS_X509_SAFE_SNPRINTF;
+
+    ret = mbedtls_snprintf( p, n, "\n%sissued  on        : " \
+                   "%04d-%02d-%02d %02d:%02d:%02d", prefix,
+                   crt->valid_from.year, crt->valid_from.mon,
+                   crt->valid_from.day,  crt->valid_from.hour,
+                   crt->valid_from.min,  crt->valid_from.sec );
+    MBEDTLS_X509_SAFE_SNPRINTF;
+
+    ret = mbedtls_snprintf( p, n, "\n%sexpires on        : " \
+                   "%04d-%02d-%02d %02d:%02d:%02d", prefix,
+                   crt->valid_to.year, crt->valid_to.mon,
+                   crt->valid_to.day,  crt->valid_to.hour,
+                   crt->valid_to.min,  crt->valid_to.sec );
+    MBEDTLS_X509_SAFE_SNPRINTF;
+
+    ret = mbedtls_snprintf( p, n, "\n%ssigned using      : ", prefix );
+    MBEDTLS_X509_SAFE_SNPRINTF;
+
+    ret = mbedtls_x509_sig_alg_gets( p, n, &crt->sig_oid, crt->sig_pk,
+                             crt->sig_md, crt->sig_opts );
+    MBEDTLS_X509_SAFE_SNPRINTF;
+
+    /* Key size */
+    if( ( ret = mbedtls_x509_key_size_helper( key_size_str, BEFORE_COLON,
+                                      mbedtls_pk_get_name( &crt->pk ) ) ) != 0 )
+    {
+        return( ret );
+    }
+
+    ret = mbedtls_snprintf( p, n, "\n%s%-" BC "s: %d bits", prefix, key_size_str,
+                          (int) mbedtls_pk_get_bitlen( &crt->pk ) );
+    MBEDTLS_X509_SAFE_SNPRINTF;
+
+    /*
+     * Optional extensions
+     */
+
+    if( crt->ext_types & MBEDTLS_X509_EXT_BASIC_CONSTRAINTS )
+    {
+        ret = mbedtls_snprintf( p, n, "\n%sbasic constraints : CA=%s", prefix,
+                        crt->ca_istrue ? "true" : "false" );
+        MBEDTLS_X509_SAFE_SNPRINTF;
+
+        if( crt->max_pathlen > 0 )
+        {
+            ret = mbedtls_snprintf( p, n, ", max_pathlen=%d", crt->max_pathlen - 1 );
+            MBEDTLS_X509_SAFE_SNPRINTF;
+        }
+    }
+
+    if( crt->ext_types & MBEDTLS_X509_EXT_SUBJECT_ALT_NAME )
+    {
+        ret = mbedtls_snprintf( p, n, "\n%ssubject alt name  : ", prefix );
+        MBEDTLS_X509_SAFE_SNPRINTF;
+
+        if( ( ret = x509_info_subject_alt_name( &p, &n,
+                                            &crt->subject_alt_names ) ) != 0 )
+            return( ret );
+    }
+
+    if( crt->ext_types & MBEDTLS_X509_EXT_NS_CERT_TYPE )
+    {
+        ret = mbedtls_snprintf( p, n, "\n%scert. type        : ", prefix );
+        MBEDTLS_X509_SAFE_SNPRINTF;
+
+        if( ( ret = x509_info_cert_type( &p, &n, crt->ns_cert_type ) ) != 0 )
+            return( ret );
+    }
+
+    if( crt->ext_types & MBEDTLS_X509_EXT_KEY_USAGE )
+    {
+        ret = mbedtls_snprintf( p, n, "\n%skey usage         : ", prefix );
+        MBEDTLS_X509_SAFE_SNPRINTF;
+
+        if( ( ret = x509_info_key_usage( &p, &n, crt->key_usage ) ) != 0 )
+            return( ret );
+    }
+
+    if( crt->ext_types & MBEDTLS_X509_EXT_EXTENDED_KEY_USAGE )
+    {
+        ret = mbedtls_snprintf( p, n, "\n%sext key usage     : ", prefix );
+        MBEDTLS_X509_SAFE_SNPRINTF;
+
+        if( ( ret = x509_info_ext_key_usage( &p, &n,
+                                             &crt->ext_key_usage ) ) != 0 )
+            return( ret );
+    }
+
+    ret = mbedtls_snprintf( p, n, "\n" );
+    MBEDTLS_X509_SAFE_SNPRINTF;
+
+    return( (int) ( size - n ) );
+}
+
+struct x509_crt_verify_string {
+    int code;
+    const char *string;
+};
+
+static const struct x509_crt_verify_string x509_crt_verify_strings[] = {
+    { MBEDTLS_X509_BADCERT_EXPIRED,       "The certificate validity has expired" },
+    { MBEDTLS_X509_BADCERT_REVOKED,       "The certificate has been revoked (is on a CRL)" },
+    { MBEDTLS_X509_BADCERT_CN_MISMATCH,   "The certificate Common Name (CN) does not match with the expected CN" },
+    { MBEDTLS_X509_BADCERT_NOT_TRUSTED,   "The certificate is not correctly signed by the trusted CA" },
+    { MBEDTLS_X509_BADCRL_NOT_TRUSTED,    "The CRL is not correctly signed by the trusted CA" },
+    { MBEDTLS_X509_BADCRL_EXPIRED,        "The CRL is expired" },
+    { MBEDTLS_X509_BADCERT_MISSING,       "Certificate was missing" },
+    { MBEDTLS_X509_BADCERT_SKIP_VERIFY,   "Certificate verification was skipped" },
+    { MBEDTLS_X509_BADCERT_OTHER,         "Other reason (can be used by verify callback)" },
+    { MBEDTLS_X509_BADCERT_FUTURE,        "The certificate validity starts in the future" },
+    { MBEDTLS_X509_BADCRL_FUTURE,         "The CRL is from the future" },
+    { MBEDTLS_X509_BADCERT_KEY_USAGE,     "Usage does not match the keyUsage extension" },
+    { MBEDTLS_X509_BADCERT_EXT_KEY_USAGE, "Usage does not match the extendedKeyUsage extension" },
+    { MBEDTLS_X509_BADCERT_NS_CERT_TYPE,  "Usage does not match the nsCertType extension" },
+    { MBEDTLS_X509_BADCERT_BAD_MD,        "The certificate is signed with an unacceptable hash." },
+    { MBEDTLS_X509_BADCERT_BAD_PK,        "The certificate is signed with an unacceptable PK alg (eg RSA vs ECDSA)." },
+    { MBEDTLS_X509_BADCERT_BAD_KEY,       "The certificate is signed with an unacceptable key (eg bad curve, RSA too short)." },
+    { MBEDTLS_X509_BADCRL_BAD_MD,         "The CRL is signed with an unacceptable hash." },
+    { MBEDTLS_X509_BADCRL_BAD_PK,         "The CRL is signed with an unacceptable PK alg (eg RSA vs ECDSA)." },
+    { MBEDTLS_X509_BADCRL_BAD_KEY,        "The CRL is signed with an unacceptable key (eg bad curve, RSA too short)." },
+    { 0, NULL }
+};
+
+int mbedtls_x509_crt_verify_info( char *buf, size_t size, const char *prefix,
+                          uint32_t flags )
+{
+    int ret;
+    const struct x509_crt_verify_string *cur;
+    char *p = buf;
+    size_t n = size;
+
+    for( cur = x509_crt_verify_strings; cur->string != NULL ; cur++ )
+    {
+        if( ( flags & cur->code ) == 0 )
+            continue;
+
+        ret = mbedtls_snprintf( p, n, "%s%s\n", prefix, cur->string );
+        MBEDTLS_X509_SAFE_SNPRINTF;
+        flags ^= cur->code;
+    }
+
+    if( flags != 0 )
+    {
+        ret = mbedtls_snprintf( p, n, "%sUnknown reason "
+                                       "(this should not happen)\n", prefix );
+        MBEDTLS_X509_SAFE_SNPRINTF;
+    }
+
+    return( (int) ( size - n ) );
+}
+
+#if defined(MBEDTLS_X509_CHECK_KEY_USAGE)
+int mbedtls_x509_crt_check_key_usage( const mbedtls_x509_crt *crt,
+                                      unsigned int usage )
+{
+    unsigned int usage_must, usage_may;
+    unsigned int may_mask = MBEDTLS_X509_KU_ENCIPHER_ONLY
+                          | MBEDTLS_X509_KU_DECIPHER_ONLY;
+
+    if( ( crt->ext_types & MBEDTLS_X509_EXT_KEY_USAGE ) == 0 )
+        return( 0 );
+
+    usage_must = usage & ~may_mask;
+
+    if( ( ( crt->key_usage & ~may_mask ) & usage_must ) != usage_must )
+        return( MBEDTLS_ERR_X509_BAD_INPUT_DATA );
+
+    usage_may = usage & may_mask;
+
+    if( ( ( crt->key_usage & may_mask ) | usage_may ) != usage_may )
+        return( MBEDTLS_ERR_X509_BAD_INPUT_DATA );
+
+    return( 0 );
+}
+#endif
+
+#if defined(MBEDTLS_X509_CHECK_EXTENDED_KEY_USAGE)
+int mbedtls_x509_crt_check_extended_key_usage( const mbedtls_x509_crt *crt,
+                                       const char *usage_oid,
+                                       size_t usage_len )
+{
+    const mbedtls_x509_sequence *cur;
+
+    /* Extension is not mandatory, absent means no restriction */
+    if( ( crt->ext_types & MBEDTLS_X509_EXT_EXTENDED_KEY_USAGE ) == 0 )
+        return( 0 );
+
+    /*
+     * Look for the requested usage (or wildcard ANY) in our list
+     */
+    for( cur = &crt->ext_key_usage; cur != NULL; cur = cur->next )
+    {
+        const mbedtls_x509_buf *cur_oid = &cur->buf;
+
+        if( cur_oid->len == usage_len &&
+            memcmp( cur_oid->p, usage_oid, usage_len ) == 0 )
+        {
+            return( 0 );
+        }
+
+        if( MBEDTLS_OID_CMP( MBEDTLS_OID_ANY_EXTENDED_KEY_USAGE, cur_oid ) == 0 )
+            return( 0 );
+    }
+
+    return( MBEDTLS_ERR_X509_BAD_INPUT_DATA );
+}
+#endif /* MBEDTLS_X509_CHECK_EXTENDED_KEY_USAGE */
+
+#if defined(MBEDTLS_X509_CRL_PARSE_C)
+/*
+ * Return 1 if the certificate is revoked, or 0 otherwise.
+ */
+int mbedtls_x509_crt_is_revoked( const mbedtls_x509_crt *crt, const mbedtls_x509_crl *crl )
+{
+    const mbedtls_x509_crl_entry *cur = &crl->entry;
+
+    while( cur != NULL && cur->serial.len != 0 )
+    {
+        if( crt->serial.len == cur->serial.len &&
+            memcmp( crt->serial.p, cur->serial.p, crt->serial.len ) == 0 )
+        {
+            if( mbedtls_x509_time_is_past( &cur->revocation_date ) )
+                return( 1 );
+        }
+
+        cur = cur->next;
+    }
+
+    return( 0 );
+}
+
+/*
+ * Check that the given certificate is not revoked according to the CRL.
+ * Skip validation if no CRL for the given CA is present.
+ */
+static int x509_crt_verifycrl( mbedtls_x509_crt *crt, mbedtls_x509_crt *ca,
+                               mbedtls_x509_crl *crl_list,
+                               const mbedtls_x509_crt_profile *profile )
+{
+    int flags = 0;
+    unsigned char hash[MBEDTLS_MD_MAX_SIZE];
+    const mbedtls_md_info_t *md_info;
+
+    if( ca == NULL )
+        return( flags );
+
+    while( crl_list != NULL )
+    {
+        if( crl_list->version == 0 ||
+            crl_list->issuer_raw.len != ca->subject_raw.len ||
+            memcmp( crl_list->issuer_raw.p, ca->subject_raw.p,
+                    crl_list->issuer_raw.len ) != 0 )
+        {
+            crl_list = crl_list->next;
+            continue;
+        }
+
+        /*
+         * Check if the CA is configured to sign CRLs
+         */
+#if defined(MBEDTLS_X509_CHECK_KEY_USAGE)
+        if( mbedtls_x509_crt_check_key_usage( ca, MBEDTLS_X509_KU_CRL_SIGN ) != 0 )
+        {
+            flags |= MBEDTLS_X509_BADCRL_NOT_TRUSTED;
+            break;
+        }
+#endif
+
+        /*
+         * Check if CRL is correctly signed by the trusted CA
+         */
+        if( x509_profile_check_md_alg( profile, crl_list->sig_md ) != 0 )
+            flags |= MBEDTLS_X509_BADCRL_BAD_MD;
+
+        if( x509_profile_check_pk_alg( profile, crl_list->sig_pk ) != 0 )
+            flags |= MBEDTLS_X509_BADCRL_BAD_PK;
+
+        md_info = mbedtls_md_info_from_type( crl_list->sig_md );
+        if( mbedtls_md( md_info, crl_list->tbs.p, crl_list->tbs.len, hash ) != 0 )
+        {
+            /* Note: this can't happen except after an internal error */
+            flags |= MBEDTLS_X509_BADCRL_NOT_TRUSTED;
+            break;
+        }
+
+        if( x509_profile_check_key( profile, &ca->pk ) != 0 )
+            flags |= MBEDTLS_X509_BADCERT_BAD_KEY;
+
+        if( mbedtls_pk_verify_ext( crl_list->sig_pk, crl_list->sig_opts, &ca->pk,
+                           crl_list->sig_md, hash, mbedtls_md_get_size( md_info ),
+                           crl_list->sig.p, crl_list->sig.len ) != 0 )
+        {
+            flags |= MBEDTLS_X509_BADCRL_NOT_TRUSTED;
+            break;
+        }
+
+        /*
+         * Check for validity of CRL (Do not drop out)
+         */
+        if( mbedtls_x509_time_is_past( &crl_list->next_update ) )
+            flags |= MBEDTLS_X509_BADCRL_EXPIRED;
+
+        if( mbedtls_x509_time_is_future( &crl_list->this_update ) )
+            flags |= MBEDTLS_X509_BADCRL_FUTURE;
+
+        /*
+         * Check if certificate is revoked
+         */
+        if( mbedtls_x509_crt_is_revoked( crt, crl_list ) )
+        {
+            flags |= MBEDTLS_X509_BADCERT_REVOKED;
+            break;
+        }
+
+        crl_list = crl_list->next;
+    }
+
+    return( flags );
+}
+#endif /* MBEDTLS_X509_CRL_PARSE_C */
+
+/*
+ * Like memcmp, but case-insensitive and always returns -1 if different
+ */
+static int x509_memcasecmp( const void *s1, const void *s2, size_t len )
+{
+    size_t i;
+    unsigned char diff;
+    const unsigned char *n1 = s1, *n2 = s2;
+
+    for( i = 0; i < len; i++ )
+    {
+        diff = n1[i] ^ n2[i];
+
+        if( diff == 0 )
+            continue;
+
+        if( diff == 32 &&
+            ( ( n1[i] >= 'a' && n1[i] <= 'z' ) ||
+              ( n1[i] >= 'A' && n1[i] <= 'Z' ) ) )
+        {
+            continue;
+        }
+
+        return( -1 );
+    }
+
+    return( 0 );
+}
+
+/*
+ * Return 0 if name matches wildcard, -1 otherwise
+ */
+static int x509_check_wildcard( const char *cn, const mbedtls_x509_buf *name )
+{
+    size_t i;
+    size_t cn_idx = 0, cn_len = strlen( cn );
+
+    /* We can't have a match if there is no wildcard to match */
+    if( name->len < 3 || name->p[0] != '*' || name->p[1] != '.' )
+        return( -1 );
+
+    for( i = 0; i < cn_len; ++i )
+    {
+        if( cn[i] == '.' )
+        {
+            cn_idx = i;
+            break;
+        }
+    }
+
+    if( cn_idx == 0 )
+        return( -1 );
+
+    if( cn_len - cn_idx == name->len - 1 &&
+        x509_memcasecmp( name->p + 1, cn + cn_idx, name->len - 1 ) == 0 )
+    {
+        return( 0 );
+    }
+
+    return( -1 );
+}
+
+/*
+ * Compare two X.509 strings, case-insensitive, and allowing for some encoding
+ * variations (but not all).
+ *
+ * Return 0 if equal, -1 otherwise.
+ */
+static int x509_string_cmp( const mbedtls_x509_buf *a, const mbedtls_x509_buf *b )
+{
+    if( a->tag == b->tag &&
+        a->len == b->len &&
+        memcmp( a->p, b->p, b->len ) == 0 )
+    {
+        return( 0 );
+    }
+
+    if( ( a->tag == MBEDTLS_ASN1_UTF8_STRING || a->tag == MBEDTLS_ASN1_PRINTABLE_STRING ) &&
+        ( b->tag == MBEDTLS_ASN1_UTF8_STRING || b->tag == MBEDTLS_ASN1_PRINTABLE_STRING ) &&
+        a->len == b->len &&
+        x509_memcasecmp( a->p, b->p, b->len ) == 0 )
+    {
+        return( 0 );
+    }
+
+    return( -1 );
+}
+
+/*
+ * Compare two X.509 Names (aka rdnSequence).
+ *
+ * See RFC 5280 section 7.1, though we don't implement the whole algorithm:
+ * we sometimes return unequal when the full algorithm would return equal,
+ * but never the other way. (In particular, we don't do Unicode normalisation
+ * or space folding.)
+ *
+ * Return 0 if equal, -1 otherwise.
+ */
+static int x509_name_cmp( const mbedtls_x509_name *a, const mbedtls_x509_name *b )
+{
+    /* Avoid recursion, it might not be optimised by the compiler */
+    while( a != NULL || b != NULL )
+    {
+        if( a == NULL || b == NULL )
+            return( -1 );
+
+        /* type */
+        if( a->oid.tag != b->oid.tag ||
+            a->oid.len != b->oid.len ||
+            memcmp( a->oid.p, b->oid.p, b->oid.len ) != 0 )
+        {
+            return( -1 );
+        }
+
+        /* value */
+        if( x509_string_cmp( &a->val, &b->val ) != 0 )
+            return( -1 );
+
+        /* structure of the list of sets */
+        if( a->next_merged != b->next_merged )
+            return( -1 );
+
+        a = a->next;
+        b = b->next;
+    }
+
+    /* a == NULL == b */
+    return( 0 );
+}
+
+/*
+ * Check the signature of a certificate by its parent
+ */
+static int x509_crt_check_signature( const mbedtls_x509_crt *child,
+                                     mbedtls_x509_crt *parent )
+{
+    const mbedtls_md_info_t *md_info;
+    unsigned char hash[MBEDTLS_MD_MAX_SIZE];
+
+    md_info = mbedtls_md_info_from_type( child->sig_md );
+    if( mbedtls_md( md_info, child->tbs.p, child->tbs.len, hash ) != 0 )
+    {
+        /* Note: this can't happen except after an internal error */
+        return( -1 );
+    }
+
+    if( mbedtls_pk_verify_ext( child->sig_pk, child->sig_opts, &parent->pk,
+                child->sig_md, hash, mbedtls_md_get_size( md_info ),
+                child->sig.p, child->sig.len ) != 0 )
+    {
+        return( -1 );
+    }
+
+    return( 0 );
+}
+
+/*
+ * Check if 'parent' is a suitable parent (signing CA) for 'child'.
+ * Return 0 if yes, -1 if not.
+ *
+ * top means parent is a locally-trusted certificate
+ */
+static int x509_crt_check_parent( const mbedtls_x509_crt *child,
+                                  const mbedtls_x509_crt *parent,
+                                  int top )
+{
+    int need_ca_bit;
+
+    /* Parent must be the issuer */
+    if( x509_name_cmp( &child->issuer, &parent->subject ) != 0 )
+        return( -1 );
+
+    /* Parent must have the basicConstraints CA bit set as a general rule */
+    need_ca_bit = 1;
+
+    /* Exception: v1/v2 certificates that are locally trusted. */
+    if( top && parent->version < 3 )
+        need_ca_bit = 0;
+
+    if( need_ca_bit && ! parent->ca_istrue )
+        return( -1 );
+
+#if defined(MBEDTLS_X509_CHECK_KEY_USAGE)
+    if( need_ca_bit &&
+        mbedtls_x509_crt_check_key_usage( parent, MBEDTLS_X509_KU_KEY_CERT_SIGN ) != 0 )
+    {
+        return( -1 );
+    }
+#endif
+
+    return( 0 );
+}
+
+/*
+ * Find a suitable parent for child in candidates, or return NULL.
+ *
+ * Here suitable is defined as:
+ *  1. subject name matches child's issuer
+ *  2. if necessary, the CA bit is set and key usage allows signing certs
+ *  3. for trusted roots, the signature is correct
+ *  4. pathlen constraints are satisfied
+ *
+ * If there's a suitable candidate which is also time-valid, return the first
+ * such. Otherwise, return the first suitable candidate (or NULL if there is
+ * none).
+ *
+ * The rationale for this rule is that someone could have a list of trusted
+ * roots with two versions on the same root with different validity periods.
+ * (At least one user reported having such a list and wanted it to just work.)
+ * The reason we don't just require time-validity is that generally there is
+ * only one version, and if it's expired we want the flags to state that
+ * rather than NOT_TRUSTED, as would be the case if we required it here.
+ *
+ * The rationale for rule 3 (signature for trusted roots) is that users might
+ * have two versions of the same CA with different keys in their list, and the
+ * way we select the correct one is by checking the signature (as we don't
+ * rely on key identifier extensions). (This is one way users might choose to
+ * handle key rollover, another relies on self-issued certs, see [SIRO].)
+ *
+ * Arguments:
+ *  - [in] child: certificate for which we're looking for a parent
+ *  - [in] candidates: chained list of potential parents
+ *  - [in] top: 1 if candidates consists of trusted roots, ie we're at the top
+ *         of the chain, 0 otherwise
+ *  - [in] path_cnt: number of intermediates seen so far
+ *  - [in] self_cnt: number of self-signed intermediates seen so far
+ *         (will never be greater than path_cnt)
+ *
+ * Return value:
+ *  - the first suitable parent found (see above regarding time-validity)
+ *  - NULL if no suitable parent was found
+ */
+static mbedtls_x509_crt *x509_crt_find_parent_in( mbedtls_x509_crt *child,
+                                                  mbedtls_x509_crt *candidates,
+                                                  int top,
+                                                  size_t path_cnt,
+                                                  size_t self_cnt )
+{
+    mbedtls_x509_crt *parent, *badtime_parent = NULL;
+
+    for( parent = candidates; parent != NULL; parent = parent->next )
+    {
+        /* basic parenting skills (name, CA bit, key usage) */
+        if( x509_crt_check_parent( child, parent, top ) != 0 )
+            continue;
+
+        /* +1 because stored max_pathlen is 1 higher that the actual value */
+        if( parent->max_pathlen > 0 &&
+            (size_t) parent->max_pathlen < 1 + path_cnt - self_cnt )
+        {
+            continue;
+        }
+
+        /* Signature */
+        if( top && x509_crt_check_signature( child, parent ) != 0 )
+        {
+            continue;
+        }
+
+        /* optional time check */
+        if( mbedtls_x509_time_is_past( &parent->valid_to ) ||
+            mbedtls_x509_time_is_future( &parent->valid_from ) )
+        {
+            if( badtime_parent == NULL )
+                badtime_parent = parent;
+
+            continue;
+        }
+
+        break;
+    }
+
+    if( parent == NULL )
+        parent = badtime_parent;
+
+    return( parent );
+}
+
+/*
+ * Find a parent in trusted CAs or the provided chain, or return NULL.
+ *
+ * Searches in trusted CAs first, and return the first suitable parent found
+ * (see find_parent_in() for definition of suitable).
+ *
+ * Arguments:
+ *  - [in] child: certificate for which we're looking for a parent, followed
+ *         by a chain of possible intermediates
+ *  - [in] trust_ca: locally trusted CAs
+ *  - [out] 1 if parent was found in trust_ca, 0 if found in provided chain
+ *  - [in] path_cnt: number of intermediates seen so far
+ *  - [in] self_cnt: number of self-signed intermediates seen so far
+ *         (will always be no greater than path_cnt)
+ *
+ * Return value:
+ *  - the first suitable parent found (see find_parent_in() for "suitable")
+ *  - NULL if no suitable parent was found
+ */
+static mbedtls_x509_crt *x509_crt_find_parent( mbedtls_x509_crt *child,
+                                               mbedtls_x509_crt *trust_ca,
+                                               int *parent_is_trusted,
+                                               size_t path_cnt,
+                                               size_t self_cnt )
+{
+    mbedtls_x509_crt *parent;
+
+    /* Look for a parent in trusted CAs */
+    *parent_is_trusted = 1;
+    parent = x509_crt_find_parent_in( child, trust_ca, 1, path_cnt, self_cnt );
+
+    if( parent != NULL )
+        return( parent );
+
+    /* Look for a parent upwards the chain */
+    *parent_is_trusted = 0;
+    return( x509_crt_find_parent_in( child, child->next, 0, path_cnt, self_cnt ) );
+}
+
+/*
+ * Check if an end-entity certificate is locally trusted
+ *
+ * Currently we require such certificates to be self-signed (actually only
+ * check for self-issued as self-signatures are not checked)
+ */
+static int x509_crt_check_ee_locally_trusted(
+                    mbedtls_x509_crt *crt,
+                    mbedtls_x509_crt *trust_ca )
+{
+    mbedtls_x509_crt *cur;
+
+    /* must be self-issued */
+    if( x509_name_cmp( &crt->issuer, &crt->subject ) != 0 )
+        return( -1 );
+
+    /* look for an exact match with trusted cert */
+    for( cur = trust_ca; cur != NULL; cur = cur->next )
+    {
+        if( crt->raw.len == cur->raw.len &&
+            memcmp( crt->raw.p, cur->raw.p, crt->raw.len ) == 0 )
+        {
+            return( 0 );
+        }
+    }
+
+    /* too bad */
+    return( -1 );
+}
+
+/*
+ * Build and verify a certificate chain
+ *
+ * Given a peer-provided list of certificates EE, C1, ..., Cn and
+ * a list of trusted certs R1, ... Rp, try to build and verify a chain
+ *      EE, Ci1, ... Ciq [, Rj]
+ * such that every cert in the chain is a child of the next one,
+ * jumping to a trusted root as early as possible.
+ *
+ * Verify that chain and return it with flags for all issues found.
+ *
+ * Special cases:
+ * - EE == Rj -> return a one-element list containing it
+ * - EE, Ci1, ..., Ciq cannot be continued with a trusted root
+ *   -> return that chain with NOT_TRUSTED set on Ciq
+ *
+ * Arguments:
+ *  - [in] crt: the cert list EE, C1, ..., Cn
+ *  - [in] trust_ca: the trusted list R1, ..., Rp
+ *  - [in] ca_crl, profile: as in verify_with_profile()
+ *  - [out] ver_chain, chain_len: the built and verified chain
+ *
+ * Return value:
+ *  - non-zero if the chain could not be fully built and examined
+ *  - 0 is the chain was successfully built and examined,
+ *      even if it was found to be invalid
+ */
+static int x509_crt_verify_chain(
+                mbedtls_x509_crt *crt,
+                mbedtls_x509_crt *trust_ca,
+                mbedtls_x509_crl *ca_crl,
+                const mbedtls_x509_crt_profile *profile,
+                x509_crt_verify_chain_item ver_chain[X509_MAX_VERIFY_CHAIN_SIZE],
+                size_t *chain_len )
+{
+    uint32_t *flags;
+    mbedtls_x509_crt *child;
+    mbedtls_x509_crt *parent;
+    int parent_is_trusted = 0;
+    int child_is_trusted = 0;
+    size_t self_cnt = 0;
+
+    child = crt;
+    *chain_len = 0;
+
+    while( 1 ) {
+        /* Add certificate to the verification chain */
+        ver_chain[*chain_len].crt = child;
+        flags = &ver_chain[*chain_len].flags;
+        ++*chain_len;
+
+        /* Check time-validity (all certificates) */
+        if( mbedtls_x509_time_is_past( &child->valid_to ) )
+            *flags |= MBEDTLS_X509_BADCERT_EXPIRED;
+
+        if( mbedtls_x509_time_is_future( &child->valid_from ) )
+            *flags |= MBEDTLS_X509_BADCERT_FUTURE;
+
+        /* Stop here for trusted roots (but not for trusted EE certs) */
+        if( child_is_trusted )
+            return( 0 );
+
+        /* Check signature algorithm: MD & PK algs */
+        if( x509_profile_check_md_alg( profile, child->sig_md ) != 0 )
+            *flags |= MBEDTLS_X509_BADCERT_BAD_MD;
+
+        if( x509_profile_check_pk_alg( profile, child->sig_pk ) != 0 )
+            *flags |= MBEDTLS_X509_BADCERT_BAD_PK;
+
+        /* Special case: EE certs that are locally trusted */
+        if( *chain_len == 1 &&
+            x509_crt_check_ee_locally_trusted( child, trust_ca ) == 0 )
+        {
+            return( 0 );
+        }
+
+        /* Look for a parent in trusted CAs or up the chain */
+        parent = x509_crt_find_parent( child, trust_ca, &parent_is_trusted,
+                                       *chain_len - 1, self_cnt );
+
+        /* No parent? We're done here */
+        if( parent == NULL )
+        {
+            *flags |= MBEDTLS_X509_BADCERT_NOT_TRUSTED;
+            return( 0 );
+        }
+
+        /* Count intermediate self-issued (not necessarily self-signed) certs.
+         * These can occur with some strategies for key rollover, see [SIRO],
+         * and should be excluded from max_pathlen checks. */
+        if( *chain_len != 1 &&
+            x509_name_cmp( &child->issuer, &child->subject ) == 0 )
+        {
+            self_cnt++;
+        }
+
+        /* path_cnt is 0 for the first intermediate CA,
+         * and if parent is trusted it's not an intermediate CA */
+        if( ! parent_is_trusted &&
+            *chain_len > MBEDTLS_X509_MAX_INTERMEDIATE_CA )
+        {
+            /* return immediately to avoid overflow the chain array */
+            return( MBEDTLS_ERR_X509_FATAL_ERROR );
+        }
+
+        /* if parent is trusted, the signature was checked by find_parent() */
+        if( ! parent_is_trusted && x509_crt_check_signature( child, parent ) != 0 )
+            *flags |= MBEDTLS_X509_BADCERT_NOT_TRUSTED;
+
+        /* check size of signing key */
+        if( x509_profile_check_key( profile, &parent->pk ) != 0 )
+            *flags |= MBEDTLS_X509_BADCERT_BAD_KEY;
+
+#if defined(MBEDTLS_X509_CRL_PARSE_C)
+        /* Check trusted CA's CRL for the given crt */
+        *flags |= x509_crt_verifycrl( child, parent, ca_crl, profile );
+#else
+        (void) ca_crl;
+#endif
+
+        /* prepare for next iteration */
+        child = parent;
+        parent = NULL;
+        child_is_trusted = parent_is_trusted;
+    }
+}
+
+/*
+ * Check for CN match
+ */
+static int x509_crt_check_cn( const mbedtls_x509_buf *name,
+                              const char *cn, size_t cn_len )
+{
+    /* try exact match */
+    if( name->len == cn_len &&
+        x509_memcasecmp( cn, name->p, cn_len ) == 0 )
+    {
+        return( 0 );
+    }
+
+    /* try wildcard match */
+    if( x509_check_wildcard( cn, name ) == 0 )
+    {
+        return( 0 );
+    }
+
+    return( -1 );
+}
+
+/*
+ * Verify the requested CN - only call this if cn is not NULL!
+ */
+static void x509_crt_verify_name( const mbedtls_x509_crt *crt,
+                                  const char *cn,
+                                  uint32_t *flags )
+{
+    const mbedtls_x509_name *name;
+    const mbedtls_x509_sequence *cur;
+    size_t cn_len = strlen( cn );
+
+    if( crt->ext_types & MBEDTLS_X509_EXT_SUBJECT_ALT_NAME )
+    {
+        for( cur = &crt->subject_alt_names; cur != NULL; cur = cur->next )
+        {
+            if( x509_crt_check_cn( &cur->buf, cn, cn_len ) == 0 )
+                break;
+        }
+
+        if( cur == NULL )
+            *flags |= MBEDTLS_X509_BADCERT_CN_MISMATCH;
+    }
+    else
+    {
+        for( name = &crt->subject; name != NULL; name = name->next )
+        {
+            if( MBEDTLS_OID_CMP( MBEDTLS_OID_AT_CN, &name->oid ) == 0 &&
+                x509_crt_check_cn( &name->val, cn, cn_len ) == 0 )
+            {
+                break;
+            }
+        }
+
+        if( name == NULL )
+            *flags |= MBEDTLS_X509_BADCERT_CN_MISMATCH;
+    }
+}
+
+/*
+ * Merge the flags for all certs in the chain, after calling callback
+ */
+static int x509_crt_merge_flags_with_cb(
+           uint32_t *flags,
+           x509_crt_verify_chain_item ver_chain[X509_MAX_VERIFY_CHAIN_SIZE],
+           size_t chain_len,
+           int (*f_vrfy)(void *, mbedtls_x509_crt *, int, uint32_t *),
+           void *p_vrfy )
+{
+    int ret;
+    size_t i;
+    uint32_t cur_flags;
+
+    for( i = chain_len; i != 0; --i )
+    {
+        cur_flags = ver_chain[i-1].flags;
+
+        if( NULL != f_vrfy )
+            if( ( ret = f_vrfy( p_vrfy, ver_chain[i-1].crt, (int) i-1, &cur_flags ) ) != 0 )
+                return( ret );
+
+        *flags |= cur_flags;
+    }
+
+    return( 0 );
+}
+
+/*
+ * Verify the certificate validity
+ */
+int mbedtls_x509_crt_verify( mbedtls_x509_crt *crt,
+                     mbedtls_x509_crt *trust_ca,
+                     mbedtls_x509_crl *ca_crl,
+                     const char *cn, uint32_t *flags,
+                     int (*f_vrfy)(void *, mbedtls_x509_crt *, int, uint32_t *),
+                     void *p_vrfy )
+{
+    return( mbedtls_x509_crt_verify_with_profile( crt, trust_ca, ca_crl,
+                &mbedtls_x509_crt_profile_default, cn, flags, f_vrfy, p_vrfy ) );
+}
+
+/*
+ * Verify the certificate validity, with profile
+ *
+ * This function:
+ *  - checks the requested CN (if any)
+ *  - checks the type and size of the EE cert's key,
+ *    as that isn't done as part of chain building/verification currently
+ *  - builds and verifies the chain
+ *  - then calls the callback and merges the flags
+ */
+int mbedtls_x509_crt_verify_with_profile( mbedtls_x509_crt *crt,
+                     mbedtls_x509_crt *trust_ca,
+                     mbedtls_x509_crl *ca_crl,
+                     const mbedtls_x509_crt_profile *profile,
+                     const char *cn, uint32_t *flags,
+                     int (*f_vrfy)(void *, mbedtls_x509_crt *, int, uint32_t *),
+                     void *p_vrfy )
+{
+    int ret;
+    mbedtls_pk_type_t pk_type;
+    x509_crt_verify_chain_item ver_chain[X509_MAX_VERIFY_CHAIN_SIZE];
+    size_t chain_len;
+    uint32_t *ee_flags = &ver_chain[0].flags;
+
+    *flags = 0;
+    memset( ver_chain, 0, sizeof( ver_chain ) );
+    chain_len = 0;
+
+    if( profile == NULL )
+    {
+        ret = MBEDTLS_ERR_X509_BAD_INPUT_DATA;
+        goto exit;
+    }
+
+    /* check name if requested */
+    if( cn != NULL )
+        x509_crt_verify_name( crt, cn, ee_flags );
+
+    /* Check the type and size of the key */
+    pk_type = mbedtls_pk_get_type( &crt->pk );
+
+    if( x509_profile_check_pk_alg( profile, pk_type ) != 0 )
+        *ee_flags |= MBEDTLS_X509_BADCERT_BAD_PK;
+
+    if( x509_profile_check_key( profile, &crt->pk ) != 0 )
+        *ee_flags |= MBEDTLS_X509_BADCERT_BAD_KEY;
+
+    /* Check the chain */
+    ret = x509_crt_verify_chain( crt, trust_ca, ca_crl, profile,
+                                 ver_chain, &chain_len );
+    if( ret != 0 )
+        goto exit;
+
+    /* Build final flags, calling callback on the way if any */
+    ret = x509_crt_merge_flags_with_cb( flags,
+                                        ver_chain, chain_len, f_vrfy, p_vrfy );
+
+exit:
+    /* prevent misuse of the vrfy callback - VERIFY_FAILED would be ignored by
+     * the SSL module for authmode optional, but non-zero return from the
+     * callback means a fatal error so it shouldn't be ignored */
+    if( ret == MBEDTLS_ERR_X509_CERT_VERIFY_FAILED )
+        ret = MBEDTLS_ERR_X509_FATAL_ERROR;
+
+    if( ret != 0 )
+    {
+        *flags = (uint32_t) -1;
+        return( ret );
+    }
+
+    if( *flags != 0 )
+        return( MBEDTLS_ERR_X509_CERT_VERIFY_FAILED );
+
+    return( 0 );
+}
+
+/*
+ * Initialize a certificate chain
+ */
+void mbedtls_x509_crt_init( mbedtls_x509_crt *crt )
+{
+    memset( crt, 0, sizeof(mbedtls_x509_crt) );
+}
+
+/*
+ * Unallocate all certificate data
+ */
+void mbedtls_x509_crt_free( mbedtls_x509_crt *crt )
+{
+    mbedtls_x509_crt *cert_cur = crt;
+    mbedtls_x509_crt *cert_prv;
+    mbedtls_x509_name *name_cur;
+    mbedtls_x509_name *name_prv;
+    mbedtls_x509_sequence *seq_cur;
+    mbedtls_x509_sequence *seq_prv;
+
+    if( crt == NULL )
+        return;
+
+    do
+    {
+        mbedtls_pk_free( &cert_cur->pk );
+
+#if defined(MBEDTLS_X509_RSASSA_PSS_SUPPORT)
+        mbedtls_free( cert_cur->sig_opts );
+#endif
+
+        name_cur = cert_cur->issuer.next;
+        while( name_cur != NULL )
+        {
+            name_prv = name_cur;
+            name_cur = name_cur->next;
+            mbedtls_platform_zeroize( name_prv, sizeof( mbedtls_x509_name ) );
+            mbedtls_free( name_prv );
+        }
+
+        name_cur = cert_cur->subject.next;
+        while( name_cur != NULL )
+        {
+            name_prv = name_cur;
+            name_cur = name_cur->next;
+            mbedtls_platform_zeroize( name_prv, sizeof( mbedtls_x509_name ) );
+            mbedtls_free( name_prv );
+        }
+
+        seq_cur = cert_cur->ext_key_usage.next;
+        while( seq_cur != NULL )
+        {
+            seq_prv = seq_cur;
+            seq_cur = seq_cur->next;
+            mbedtls_platform_zeroize( seq_prv,
+                                      sizeof( mbedtls_x509_sequence ) );
+            mbedtls_free( seq_prv );
+        }
+
+        seq_cur = cert_cur->subject_alt_names.next;
+        while( seq_cur != NULL )
+        {
+            seq_prv = seq_cur;
+            seq_cur = seq_cur->next;
+            mbedtls_platform_zeroize( seq_prv,
+                                      sizeof( mbedtls_x509_sequence ) );
+            mbedtls_free( seq_prv );
+        }
+
+        if( cert_cur->raw.p != NULL )
+        {
+            mbedtls_platform_zeroize( cert_cur->raw.p, cert_cur->raw.len );
+            mbedtls_free( cert_cur->raw.p );
+        }
+
+        cert_cur = cert_cur->next;
+    }
+    while( cert_cur != NULL );
+
+    cert_cur = crt;
+    do
+    {
+        cert_prv = cert_cur;
+        cert_cur = cert_cur->next;
+
+        mbedtls_platform_zeroize( cert_prv, sizeof( mbedtls_x509_crt ) );
+        if( cert_prv != crt )
+            mbedtls_free( cert_prv );
+    }
+    while( cert_cur != NULL );
+}
+
+#endif /* MBEDTLS_X509_CRT_PARSE_C */
diff --git a/common/mbedtls/x509_crt.h b/common/mbedtls/x509_crt.h
new file mode 100644
index 000000000..4f7f7afb9
--- /dev/null
+++ b/common/mbedtls/x509_crt.h
@@ -0,0 +1,672 @@
+/**
+ * \file x509_crt.h
+ *
+ * \brief X.509 certificate parsing and writing
+ */
+/*
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+#ifndef MBEDTLS_X509_CRT_H
+#define MBEDTLS_X509_CRT_H
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#include "x509.h"
+#include "x509_crl.h"
+
+/**
+ * \addtogroup x509_module
+ * \{
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \name Structures and functions for parsing and writing X.509 certificates
+ * \{
+ */
+
+/**
+ * Container for an X.509 certificate. The certificate may be chained.
+ */
+typedef struct mbedtls_x509_crt
+{
+    mbedtls_x509_buf raw;               /**< The raw certificate data (DER). */
+    mbedtls_x509_buf tbs;               /**< The raw certificate body (DER). The part that is To Be Signed. */
+
+    int version;                /**< The X.509 version. (1=v1, 2=v2, 3=v3) */
+    mbedtls_x509_buf serial;            /**< Unique id for certificate issued by a specific CA. */
+    mbedtls_x509_buf sig_oid;           /**< Signature algorithm, e.g. sha1RSA */
+
+    mbedtls_x509_buf issuer_raw;        /**< The raw issuer data (DER). Used for quick comparison. */
+    mbedtls_x509_buf subject_raw;       /**< The raw subject data (DER). Used for quick comparison. */
+
+    mbedtls_x509_name issuer;           /**< The parsed issuer data (named information object). */
+    mbedtls_x509_name subject;          /**< The parsed subject data (named information object). */
+
+    mbedtls_x509_time valid_from;       /**< Start time of certificate validity. */
+    mbedtls_x509_time valid_to;         /**< End time of certificate validity. */
+
+    mbedtls_pk_context pk;              /**< Container for the public key context. */
+
+    mbedtls_x509_buf issuer_id;         /**< Optional X.509 v2/v3 issuer unique identifier. */
+    mbedtls_x509_buf subject_id;        /**< Optional X.509 v2/v3 subject unique identifier. */
+    mbedtls_x509_buf v3_ext;            /**< Optional X.509 v3 extensions.  */
+    mbedtls_x509_sequence subject_alt_names;    /**< Optional list of Subject Alternative Names (Only dNSName supported). */
+
+    int ext_types;              /**< Bit string containing detected and parsed extensions */
+    int ca_istrue;              /**< Optional Basic Constraint extension value: 1 if this certificate belongs to a CA, 0 otherwise. */
+    int max_pathlen;            /**< Optional Basic Constraint extension value: The maximum path length to the root certificate. Path length is 1 higher than RFC 5280 'meaning', so 1+ */
+
+    unsigned int key_usage;     /**< Optional key usage extension value: See the values in x509.h */
+
+    mbedtls_x509_sequence ext_key_usage; /**< Optional list of extended key usage OIDs. */
+
+    unsigned char ns_cert_type; /**< Optional Netscape certificate type extension value: See the values in x509.h */
+
+    mbedtls_x509_buf sig;               /**< Signature: hash of the tbs part signed with the private key. */
+    mbedtls_md_type_t sig_md;           /**< Internal representation of the MD algorithm of the signature algorithm, e.g. MBEDTLS_MD_SHA256 */
+    mbedtls_pk_type_t sig_pk;           /**< Internal representation of the Public Key algorithm of the signature algorithm, e.g. MBEDTLS_PK_RSA */
+    void *sig_opts;             /**< Signature options to be passed to mbedtls_pk_verify_ext(), e.g. for RSASSA-PSS */
+
+    struct mbedtls_x509_crt *next;     /**< Next certificate in the CA-chain. */
+}
+mbedtls_x509_crt;
+
+/**
+ * Build flag from an algorithm/curve identifier (pk, md, ecp)
+ * Since 0 is always XXX_NONE, ignore it.
+ */
+#define MBEDTLS_X509_ID_FLAG( id )   ( 1 << ( id - 1 ) )
+
+/**
+ * Security profile for certificate verification.
+ *
+ * All lists are bitfields, built by ORing flags from MBEDTLS_X509_ID_FLAG().
+ */
+typedef struct mbedtls_x509_crt_profile
+{
+    uint32_t allowed_mds;       /**< MDs for signatures         */
+    uint32_t allowed_pks;       /**< PK algs for signatures     */
+    uint32_t allowed_curves;    /**< Elliptic curves for ECDSA  */
+    uint32_t rsa_min_bitlen;    /**< Minimum size for RSA keys  */
+}
+mbedtls_x509_crt_profile;
+
+#define MBEDTLS_X509_CRT_VERSION_1              0
+#define MBEDTLS_X509_CRT_VERSION_2              1
+#define MBEDTLS_X509_CRT_VERSION_3              2
+
+#define MBEDTLS_X509_RFC5280_MAX_SERIAL_LEN 32
+#define MBEDTLS_X509_RFC5280_UTC_TIME_LEN   15
+
+#if !defined( MBEDTLS_X509_MAX_FILE_PATH_LEN )
+#define MBEDTLS_X509_MAX_FILE_PATH_LEN 512
+#endif
+
+/**
+ * Container for writing a certificate (CRT)
+ */
+typedef struct mbedtls_x509write_cert
+{
+    int version;
+    mbedtls_mpi serial;
+    mbedtls_pk_context *subject_key;
+    mbedtls_pk_context *issuer_key;
+    mbedtls_asn1_named_data *subject;
+    mbedtls_asn1_named_data *issuer;
+    mbedtls_md_type_t md_alg;
+    char not_before[MBEDTLS_X509_RFC5280_UTC_TIME_LEN + 1];
+    char not_after[MBEDTLS_X509_RFC5280_UTC_TIME_LEN + 1];
+    mbedtls_asn1_named_data *extensions;
+}
+mbedtls_x509write_cert;
+
+#if defined(MBEDTLS_X509_CRT_PARSE_C)
+/**
+ * Default security profile. Should provide a good balance between security
+ * and compatibility with current deployments.
+ */
+extern const mbedtls_x509_crt_profile mbedtls_x509_crt_profile_default;
+
+/**
+ * Expected next default profile. Recommended for new deployments.
+ * Currently targets a 128-bit security level, except for RSA-2048.
+ */
+extern const mbedtls_x509_crt_profile mbedtls_x509_crt_profile_next;
+
+/**
+ * NSA Suite B profile.
+ */
+extern const mbedtls_x509_crt_profile mbedtls_x509_crt_profile_suiteb;
+
+/**
+ * \brief          Parse a single DER formatted certificate and add it
+ *                 to the chained list.
+ *
+ * \param chain    points to the start of the chain
+ * \param buf      buffer holding the certificate DER data
+ * \param buflen   size of the buffer
+ *
+ * \return         0 if successful, or a specific X509 or PEM error code
+ */
+int mbedtls_x509_crt_parse_der( mbedtls_x509_crt *chain, const unsigned char *buf,
+                        size_t buflen );
+
+/**
+ * \brief          Parse one or more certificates and add them
+ *                 to the chained list. Parses permissively. If some
+ *                 certificates can be parsed, the result is the number
+ *                 of failed certificates it encountered. If none complete
+ *                 correctly, the first error is returned.
+ *
+ * \param chain    points to the start of the chain
+ * \param buf      buffer holding the certificate data in PEM or DER format
+ * \param buflen   size of the buffer
+ *                 (including the terminating null byte for PEM data)
+ *
+ * \return         0 if all certificates parsed successfully, a positive number
+ *                 if partly successful or a specific X509 or PEM error code
+ */
+int mbedtls_x509_crt_parse( mbedtls_x509_crt *chain, const unsigned char *buf, size_t buflen );
+
+#if defined(MBEDTLS_FS_IO)
+/**
+ * \brief          Load one or more certificates and add them
+ *                 to the chained list. Parses permissively. If some
+ *                 certificates can be parsed, the result is the number
+ *                 of failed certificates it encountered. If none complete
+ *                 correctly, the first error is returned.
+ *
+ * \param chain    points to the start of the chain
+ * \param path     filename to read the certificates from
+ *
+ * \return         0 if all certificates parsed successfully, a positive number
+ *                 if partly successful or a specific X509 or PEM error code
+ */
+int mbedtls_x509_crt_parse_file( mbedtls_x509_crt *chain, const char *path );
+
+/**
+ * \brief          Load one or more certificate files from a path and add them
+ *                 to the chained list. Parses permissively. If some
+ *                 certificates can be parsed, the result is the number
+ *                 of failed certificates it encountered. If none complete
+ *                 correctly, the first error is returned.
+ *
+ * \param chain    points to the start of the chain
+ * \param path     directory / folder to read the certificate files from
+ *
+ * \return         0 if all certificates parsed successfully, a positive number
+ *                 if partly successful or a specific X509 or PEM error code
+ */
+int mbedtls_x509_crt_parse_path( mbedtls_x509_crt *chain, const char *path );
+#endif /* MBEDTLS_FS_IO */
+
+/**
+ * \brief          Returns an informational string about the
+ *                 certificate.
+ *
+ * \param buf      Buffer to write to
+ * \param size     Maximum size of buffer
+ * \param prefix   A line prefix
+ * \param crt      The X509 certificate to represent
+ *
+ * \return         The length of the string written (not including the
+ *                 terminated nul byte), or a negative error code.
+ */
+int mbedtls_x509_crt_info( char *buf, size_t size, const char *prefix,
+                   const mbedtls_x509_crt *crt );
+
+/**
+ * \brief          Returns an informational string about the
+ *                 verification status of a certificate.
+ *
+ * \param buf      Buffer to write to
+ * \param size     Maximum size of buffer
+ * \param prefix   A line prefix
+ * \param flags    Verification flags created by mbedtls_x509_crt_verify()
+ *
+ * \return         The length of the string written (not including the
+ *                 terminated nul byte), or a negative error code.
+ */
+int mbedtls_x509_crt_verify_info( char *buf, size_t size, const char *prefix,
+                          uint32_t flags );
+
+/**
+ * \brief          Verify the certificate signature
+ *
+ *                 The verify callback is a user-supplied callback that
+ *                 can clear / modify / add flags for a certificate. If set,
+ *                 the verification callback is called for each
+ *                 certificate in the chain (from the trust-ca down to the
+ *                 presented crt). The parameters for the callback are:
+ *                 (void *parameter, mbedtls_x509_crt *crt, int certificate_depth,
+ *                 int *flags). With the flags representing current flags for
+ *                 that specific certificate and the certificate depth from
+ *                 the bottom (Peer cert depth = 0).
+ *
+ *                 All flags left after returning from the callback
+ *                 are also returned to the application. The function should
+ *                 return 0 for anything (including invalid certificates)
+ *                 other than fatal error, as a non-zero return code
+ *                 immediately aborts the verification process. For fatal
+ *                 errors, a specific error code should be used (different
+ *                 from MBEDTLS_ERR_X509_CERT_VERIFY_FAILED which should not
+ *                 be returned at this point), or MBEDTLS_ERR_X509_FATAL_ERROR
+ *                 can be used if no better code is available.
+ *
+ * \note           In case verification failed, the results can be displayed
+ *                 using \c mbedtls_x509_crt_verify_info()
+ *
+ * \note           Same as \c mbedtls_x509_crt_verify_with_profile() with the
+ *                 default security profile.
+ *
+ * \note           It is your responsibility to provide up-to-date CRLs for
+ *                 all trusted CAs. If no CRL is provided for the CA that was
+ *                 used to sign the certificate, CRL verification is skipped
+ *                 silently, that is *without* setting any flag.
+ *
+ * \note           The \c trust_ca list can contain two types of certificates:
+ *                 (1) those of trusted root CAs, so that certificates
+ *                 chaining up to those CAs will be trusted, and (2)
+ *                 self-signed end-entity certificates to be trusted (for
+ *                 specific peers you know) - in that case, the self-signed
+ *                 certificate doesn't need to have the CA bit set.
+ *
+ * \param crt      a certificate (chain) to be verified
+ * \param trust_ca the list of trusted CAs (see note above)
+ * \param ca_crl   the list of CRLs for trusted CAs (see note above)
+ * \param cn       expected Common Name (can be set to
+ *                 NULL if the CN must not be verified)
+ * \param flags    result of the verification
+ * \param f_vrfy   verification function
+ * \param p_vrfy   verification parameter
+ *
+ * \return         0 (and flags set to 0) if the chain was verified and valid,
+ *                 MBEDTLS_ERR_X509_CERT_VERIFY_FAILED if the chain was verified
+ *                 but found to be invalid, in which case *flags will have one
+ *                 or more MBEDTLS_X509_BADCERT_XXX or MBEDTLS_X509_BADCRL_XXX
+ *                 flags set, or another error (and flags set to 0xffffffff)
+ *                 in case of a fatal error encountered during the
+ *                 verification process.
+ */
+int mbedtls_x509_crt_verify( mbedtls_x509_crt *crt,
+                     mbedtls_x509_crt *trust_ca,
+                     mbedtls_x509_crl *ca_crl,
+                     const char *cn, uint32_t *flags,
+                     int (*f_vrfy)(void *, mbedtls_x509_crt *, int, uint32_t *),
+                     void *p_vrfy );
+
+/**
+ * \brief          Verify the certificate signature according to profile
+ *
+ * \note           Same as \c mbedtls_x509_crt_verify(), but with explicit
+ *                 security profile.
+ *
+ * \note           The restrictions on keys (RSA minimum size, allowed curves
+ *                 for ECDSA) apply to all certificates: trusted root,
+ *                 intermediate CAs if any, and end entity certificate.
+ *
+ * \param crt      a certificate (chain) to be verified
+ * \param trust_ca the list of trusted CAs
+ * \param ca_crl   the list of CRLs for trusted CAs
+ * \param profile  security profile for verification
+ * \param cn       expected Common Name (can be set to
+ *                 NULL if the CN must not be verified)
+ * \param flags    result of the verification
+ * \param f_vrfy   verification function
+ * \param p_vrfy   verification parameter
+ *
+ * \return         0 if successful or MBEDTLS_ERR_X509_CERT_VERIFY_FAILED
+ *                 in which case *flags will have one or more
+ *                 MBEDTLS_X509_BADCERT_XXX or MBEDTLS_X509_BADCRL_XXX flags
+ *                 set,
+ *                 or another error in case of a fatal error encountered
+ *                 during the verification process.
+ */
+int mbedtls_x509_crt_verify_with_profile( mbedtls_x509_crt *crt,
+                     mbedtls_x509_crt *trust_ca,
+                     mbedtls_x509_crl *ca_crl,
+                     const mbedtls_x509_crt_profile *profile,
+                     const char *cn, uint32_t *flags,
+                     int (*f_vrfy)(void *, mbedtls_x509_crt *, int, uint32_t *),
+                     void *p_vrfy );
+
+#if defined(MBEDTLS_X509_CHECK_KEY_USAGE)
+/**
+ * \brief          Check usage of certificate against keyUsage extension.
+ *
+ * \param crt      Leaf certificate used.
+ * \param usage    Intended usage(s) (eg MBEDTLS_X509_KU_KEY_ENCIPHERMENT
+ *                 before using the certificate to perform an RSA key
+ *                 exchange).
+ *
+ * \note           Except for decipherOnly and encipherOnly, a bit set in the
+ *                 usage argument means this bit MUST be set in the
+ *                 certificate. For decipherOnly and encipherOnly, it means
+ *                 that bit MAY be set.
+ *
+ * \return         0 is these uses of the certificate are allowed,
+ *                 MBEDTLS_ERR_X509_BAD_INPUT_DATA if the keyUsage extension
+ *                 is present but does not match the usage argument.
+ *
+ * \note           You should only call this function on leaf certificates, on
+ *                 (intermediate) CAs the keyUsage extension is automatically
+ *                 checked by \c mbedtls_x509_crt_verify().
+ */
+int mbedtls_x509_crt_check_key_usage( const mbedtls_x509_crt *crt,
+                                      unsigned int usage );
+#endif /* MBEDTLS_X509_CHECK_KEY_USAGE) */
+
+#if defined(MBEDTLS_X509_CHECK_EXTENDED_KEY_USAGE)
+/**
+ * \brief           Check usage of certificate against extendedKeyUsage.
+ *
+ * \param crt       Leaf certificate used.
+ * \param usage_oid Intended usage (eg MBEDTLS_OID_SERVER_AUTH or
+ *                  MBEDTLS_OID_CLIENT_AUTH).
+ * \param usage_len Length of usage_oid (eg given by MBEDTLS_OID_SIZE()).
+ *
+ * \return          0 if this use of the certificate is allowed,
+ *                  MBEDTLS_ERR_X509_BAD_INPUT_DATA if not.
+ *
+ * \note            Usually only makes sense on leaf certificates.
+ */
+int mbedtls_x509_crt_check_extended_key_usage( const mbedtls_x509_crt *crt,
+                                               const char *usage_oid,
+                                               size_t usage_len );
+#endif /* MBEDTLS_X509_CHECK_EXTENDED_KEY_USAGE */
+
+#if defined(MBEDTLS_X509_CRL_PARSE_C)
+/**
+ * \brief          Verify the certificate revocation status
+ *
+ * \param crt      a certificate to be verified
+ * \param crl      the CRL to verify against
+ *
+ * \return         1 if the certificate is revoked, 0 otherwise
+ *
+ */
+int mbedtls_x509_crt_is_revoked( const mbedtls_x509_crt *crt, const mbedtls_x509_crl *crl );
+#endif /* MBEDTLS_X509_CRL_PARSE_C */
+
+/**
+ * \brief          Initialize a certificate (chain)
+ *
+ * \param crt      Certificate chain to initialize
+ */
+void mbedtls_x509_crt_init( mbedtls_x509_crt *crt );
+
+/**
+ * \brief          Unallocate all certificate data
+ *
+ * \param crt      Certificate chain to free
+ */
+void mbedtls_x509_crt_free( mbedtls_x509_crt *crt );
+#endif /* MBEDTLS_X509_CRT_PARSE_C */
+
+/* \} name */
+/* \} addtogroup x509_module */
+
+#if defined(MBEDTLS_X509_CRT_WRITE_C)
+/**
+ * \brief           Initialize a CRT writing context
+ *
+ * \param ctx       CRT context to initialize
+ */
+void mbedtls_x509write_crt_init( mbedtls_x509write_cert *ctx );
+
+/**
+ * \brief           Set the verion for a Certificate
+ *                  Default: MBEDTLS_X509_CRT_VERSION_3
+ *
+ * \param ctx       CRT context to use
+ * \param version   version to set (MBEDTLS_X509_CRT_VERSION_1, MBEDTLS_X509_CRT_VERSION_2 or
+ *                                  MBEDTLS_X509_CRT_VERSION_3)
+ */
+void mbedtls_x509write_crt_set_version( mbedtls_x509write_cert *ctx, int version );
+
+/**
+ * \brief           Set the serial number for a Certificate.
+ *
+ * \param ctx       CRT context to use
+ * \param serial    serial number to set
+ *
+ * \return          0 if successful
+ */
+int mbedtls_x509write_crt_set_serial( mbedtls_x509write_cert *ctx, const mbedtls_mpi *serial );
+
+/**
+ * \brief           Set the validity period for a Certificate
+ *                  Timestamps should be in string format for UTC timezone
+ *                  i.e. "YYYYMMDDhhmmss"
+ *                  e.g. "20131231235959" for December 31st 2013
+ *                       at 23:59:59
+ *
+ * \param ctx       CRT context to use
+ * \param not_before    not_before timestamp
+ * \param not_after     not_after timestamp
+ *
+ * \return          0 if timestamp was parsed successfully, or
+ *                  a specific error code
+ */
+int mbedtls_x509write_crt_set_validity( mbedtls_x509write_cert *ctx, const char *not_before,
+                                const char *not_after );
+
+/**
+ * \brief           Set the issuer name for a Certificate
+ *                  Issuer names should contain a comma-separated list
+ *                  of OID types and values:
+ *                  e.g. "C=UK,O=ARM,CN=mbed TLS CA"
+ *
+ * \param ctx           CRT context to use
+ * \param issuer_name   issuer name to set
+ *
+ * \return          0 if issuer name was parsed successfully, or
+ *                  a specific error code
+ */
+int mbedtls_x509write_crt_set_issuer_name( mbedtls_x509write_cert *ctx,
+                                   const char *issuer_name );
+
+/**
+ * \brief           Set the subject name for a Certificate
+ *                  Subject names should contain a comma-separated list
+ *                  of OID types and values:
+ *                  e.g. "C=UK,O=ARM,CN=mbed TLS Server 1"
+ *
+ * \param ctx           CRT context to use
+ * \param subject_name  subject name to set
+ *
+ * \return          0 if subject name was parsed successfully, or
+ *                  a specific error code
+ */
+int mbedtls_x509write_crt_set_subject_name( mbedtls_x509write_cert *ctx,
+                                    const char *subject_name );
+
+/**
+ * \brief           Set the subject public key for the certificate
+ *
+ * \param ctx       CRT context to use
+ * \param key       public key to include
+ */
+void mbedtls_x509write_crt_set_subject_key( mbedtls_x509write_cert *ctx, mbedtls_pk_context *key );
+
+/**
+ * \brief           Set the issuer key used for signing the certificate
+ *
+ * \param ctx       CRT context to use
+ * \param key       private key to sign with
+ */
+void mbedtls_x509write_crt_set_issuer_key( mbedtls_x509write_cert *ctx, mbedtls_pk_context *key );
+
+/**
+ * \brief           Set the MD algorithm to use for the signature
+ *                  (e.g. MBEDTLS_MD_SHA1)
+ *
+ * \param ctx       CRT context to use
+ * \param md_alg    MD algorithm to use
+ */
+void mbedtls_x509write_crt_set_md_alg( mbedtls_x509write_cert *ctx, mbedtls_md_type_t md_alg );
+
+/**
+ * \brief           Generic function to add to or replace an extension in the
+ *                  CRT
+ *
+ * \param ctx       CRT context to use
+ * \param oid       OID of the extension
+ * \param oid_len   length of the OID
+ * \param critical  if the extension is critical (per the RFC's definition)
+ * \param val       value of the extension OCTET STRING
+ * \param val_len   length of the value data
+ *
+ * \return          0 if successful, or a MBEDTLS_ERR_X509_ALLOC_FAILED
+ */
+int mbedtls_x509write_crt_set_extension( mbedtls_x509write_cert *ctx,
+                                 const char *oid, size_t oid_len,
+                                 int critical,
+                                 const unsigned char *val, size_t val_len );
+
+/**
+ * \brief           Set the basicConstraints extension for a CRT
+ *
+ * \param ctx       CRT context to use
+ * \param is_ca     is this a CA certificate
+ * \param max_pathlen   maximum length of certificate chains below this
+ *                      certificate (only for CA certificates, -1 is
+ *                      inlimited)
+ *
+ * \return          0 if successful, or a MBEDTLS_ERR_X509_ALLOC_FAILED
+ */
+int mbedtls_x509write_crt_set_basic_constraints( mbedtls_x509write_cert *ctx,
+                                         int is_ca, int max_pathlen );
+
+#if defined(MBEDTLS_SHA1_C)
+/**
+ * \brief           Set the subjectKeyIdentifier extension for a CRT
+ *                  Requires that mbedtls_x509write_crt_set_subject_key() has been
+ *                  called before
+ *
+ * \param ctx       CRT context to use
+ *
+ * \return          0 if successful, or a MBEDTLS_ERR_X509_ALLOC_FAILED
+ */
+int mbedtls_x509write_crt_set_subject_key_identifier( mbedtls_x509write_cert *ctx );
+
+/**
+ * \brief           Set the authorityKeyIdentifier extension for a CRT
+ *                  Requires that mbedtls_x509write_crt_set_issuer_key() has been
+ *                  called before
+ *
+ * \param ctx       CRT context to use
+ *
+ * \return          0 if successful, or a MBEDTLS_ERR_X509_ALLOC_FAILED
+ */
+int mbedtls_x509write_crt_set_authority_key_identifier( mbedtls_x509write_cert *ctx );
+#endif /* MBEDTLS_SHA1_C */
+
+/**
+ * \brief           Set the Key Usage Extension flags
+ *                  (e.g. MBEDTLS_X509_KU_DIGITAL_SIGNATURE | MBEDTLS_X509_KU_KEY_CERT_SIGN)
+ *
+ * \param ctx       CRT context to use
+ * \param key_usage key usage flags to set
+ *
+ * \return          0 if successful, or MBEDTLS_ERR_X509_ALLOC_FAILED
+ */
+int mbedtls_x509write_crt_set_key_usage( mbedtls_x509write_cert *ctx,
+                                         unsigned int key_usage );
+
+/**
+ * \brief           Set the Netscape Cert Type flags
+ *                  (e.g. MBEDTLS_X509_NS_CERT_TYPE_SSL_CLIENT | MBEDTLS_X509_NS_CERT_TYPE_EMAIL)
+ *
+ * \param ctx           CRT context to use
+ * \param ns_cert_type  Netscape Cert Type flags to set
+ *
+ * \return          0 if successful, or MBEDTLS_ERR_X509_ALLOC_FAILED
+ */
+int mbedtls_x509write_crt_set_ns_cert_type( mbedtls_x509write_cert *ctx,
+                                    unsigned char ns_cert_type );
+
+/**
+ * \brief           Free the contents of a CRT write context
+ *
+ * \param ctx       CRT context to free
+ */
+void mbedtls_x509write_crt_free( mbedtls_x509write_cert *ctx );
+
+/**
+ * \brief           Write a built up certificate to a X509 DER structure
+ *                  Note: data is written at the end of the buffer! Use the
+ *                        return value to determine where you should start
+ *                        using the buffer
+ *
+ * \param ctx       certificate to write away
+ * \param buf       buffer to write to
+ * \param size      size of the buffer
+ * \param f_rng     RNG function (for signature, see note)
+ * \param p_rng     RNG parameter
+ *
+ * \return          length of data written if successful, or a specific
+ *                  error code
+ *
+ * \note            f_rng may be NULL if RSA is used for signature and the
+ *                  signature is made offline (otherwise f_rng is desirable
+ *                  for countermeasures against timing attacks).
+ *                  ECDSA signatures always require a non-NULL f_rng.
+ */
+int mbedtls_x509write_crt_der( mbedtls_x509write_cert *ctx, unsigned char *buf, size_t size,
+                       int (*f_rng)(void *, unsigned char *, size_t),
+                       void *p_rng );
+
+#if defined(MBEDTLS_PEM_WRITE_C)
+/**
+ * \brief           Write a built up certificate to a X509 PEM string
+ *
+ * \param ctx       certificate to write away
+ * \param buf       buffer to write to
+ * \param size      size of the buffer
+ * \param f_rng     RNG function (for signature, see note)
+ * \param p_rng     RNG parameter
+ *
+ * \return          0 if successful, or a specific error code
+ *
+ * \note            f_rng may be NULL if RSA is used for signature and the
+ *                  signature is made offline (otherwise f_rng is desirable
+ *                  for countermeasures against timing attacks).
+ *                  ECDSA signatures always require a non-NULL f_rng.
+ */
+int mbedtls_x509write_crt_pem( mbedtls_x509write_cert *ctx, unsigned char *buf, size_t size,
+                       int (*f_rng)(void *, unsigned char *, size_t),
+                       void *p_rng );
+#endif /* MBEDTLS_PEM_WRITE_C */
+#endif /* MBEDTLS_X509_CRT_WRITE_C */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* mbedtls_x509_crt.h */
diff --git a/common/polarssl/aes.c b/common/polarssl/aes.c
deleted file mode 100644
index 36f735d4c..000000000
--- a/common/polarssl/aes.c
+++ /dev/null
@@ -1,1454 +0,0 @@
-/*
- *  FIPS-197 compliant AES implementation
- *
- *  Copyright (C) 2006-2014, Brainspark B.V.
- *
- *  This file is part of PolarSSL (http://www.polarssl.org)
- *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
- *
- *  All rights reserved.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-/*
- *  The AES block cipher was designed by Vincent Rijmen and Joan Daemen.
- *
- *  http://csrc.nist.gov/encryption/aes/rijndael/Rijndael.pdf
- *  http://csrc.nist.gov/publications/fips/fips197/fips-197.pdf
- */
-
-#if !defined(POLARSSL_CONFIG_FILE)
-#include "polarssl_config.h"
-#else
-#include POLARSSL_CONFIG_FILE
-#endif
-
-#if defined(POLARSSL_AES_C)
-
-#include "aes.h"
-#if defined(POLARSSL_PADLOCK_C)
-#include "polarssl/padlock.h"
-#endif
-#if defined(POLARSSL_AESNI_C)
-#include "polarssl/aesni.h"
-#endif
-
-#if defined(POLARSSL_PLATFORM_C)
-#include "polarssl/platform.h"
-#else
-#define polarssl_printf printf
-#endif
-
-#if !defined(POLARSSL_AES_ALT)
-
-/* Implementation that should never be optimized out by the compiler */
-static void polarssl_zeroize( void *v, size_t n ) {
-    volatile unsigned char *p = v; while( n-- ) *p++ = 0;
-}
-
-/*
- * 32-bit integer manipulation macros (little endian)
- */
-#ifndef GET_UINT32_LE
-#define GET_UINT32_LE(n,b,i)                            \
-{                                                       \
-    (n) = ( (uint32_t) (b)[(i)    ]       )             \
-        | ( (uint32_t) (b)[(i) + 1] <<  8 )             \
-        | ( (uint32_t) (b)[(i) + 2] << 16 )             \
-        | ( (uint32_t) (b)[(i) + 3] << 24 );            \
-}
-#endif
-
-#ifndef PUT_UINT32_LE
-#define PUT_UINT32_LE(n,b,i)                            \
-{                                                       \
-    (b)[(i)    ] = (unsigned char) ( (n)       );       \
-    (b)[(i) + 1] = (unsigned char) ( (n) >>  8 );       \
-    (b)[(i) + 2] = (unsigned char) ( (n) >> 16 );       \
-    (b)[(i) + 3] = (unsigned char) ( (n) >> 24 );       \
-}
-#endif
-
-#if defined(POLARSSL_PADLOCK_C) &&                      \
-    ( defined(POLARSSL_HAVE_X86) || defined(PADLOCK_ALIGN16) )
-static int aes_padlock_ace = -1;
-#endif
-
-#if defined(POLARSSL_AES_ROM_TABLES)
-/*
- * Forward S-box
- */
-static const unsigned char FSb[256] =
-{
-    0x63, 0x7C, 0x77, 0x7B, 0xF2, 0x6B, 0x6F, 0xC5,
-    0x30, 0x01, 0x67, 0x2B, 0xFE, 0xD7, 0xAB, 0x76,
-    0xCA, 0x82, 0xC9, 0x7D, 0xFA, 0x59, 0x47, 0xF0,
-    0xAD, 0xD4, 0xA2, 0xAF, 0x9C, 0xA4, 0x72, 0xC0,
-    0xB7, 0xFD, 0x93, 0x26, 0x36, 0x3F, 0xF7, 0xCC,
-    0x34, 0xA5, 0xE5, 0xF1, 0x71, 0xD8, 0x31, 0x15,
-    0x04, 0xC7, 0x23, 0xC3, 0x18, 0x96, 0x05, 0x9A,
-    0x07, 0x12, 0x80, 0xE2, 0xEB, 0x27, 0xB2, 0x75,
-    0x09, 0x83, 0x2C, 0x1A, 0x1B, 0x6E, 0x5A, 0xA0,
-    0x52, 0x3B, 0xD6, 0xB3, 0x29, 0xE3, 0x2F, 0x84,
-    0x53, 0xD1, 0x00, 0xED, 0x20, 0xFC, 0xB1, 0x5B,
-    0x6A, 0xCB, 0xBE, 0x39, 0x4A, 0x4C, 0x58, 0xCF,
-    0xD0, 0xEF, 0xAA, 0xFB, 0x43, 0x4D, 0x33, 0x85,
-    0x45, 0xF9, 0x02, 0x7F, 0x50, 0x3C, 0x9F, 0xA8,
-    0x51, 0xA3, 0x40, 0x8F, 0x92, 0x9D, 0x38, 0xF5,
-    0xBC, 0xB6, 0xDA, 0x21, 0x10, 0xFF, 0xF3, 0xD2,
-    0xCD, 0x0C, 0x13, 0xEC, 0x5F, 0x97, 0x44, 0x17,
-    0xC4, 0xA7, 0x7E, 0x3D, 0x64, 0x5D, 0x19, 0x73,
-    0x60, 0x81, 0x4F, 0xDC, 0x22, 0x2A, 0x90, 0x88,
-    0x46, 0xEE, 0xB8, 0x14, 0xDE, 0x5E, 0x0B, 0xDB,
-    0xE0, 0x32, 0x3A, 0x0A, 0x49, 0x06, 0x24, 0x5C,
-    0xC2, 0xD3, 0xAC, 0x62, 0x91, 0x95, 0xE4, 0x79,
-    0xE7, 0xC8, 0x37, 0x6D, 0x8D, 0xD5, 0x4E, 0xA9,
-    0x6C, 0x56, 0xF4, 0xEA, 0x65, 0x7A, 0xAE, 0x08,
-    0xBA, 0x78, 0x25, 0x2E, 0x1C, 0xA6, 0xB4, 0xC6,
-    0xE8, 0xDD, 0x74, 0x1F, 0x4B, 0xBD, 0x8B, 0x8A,
-    0x70, 0x3E, 0xB5, 0x66, 0x48, 0x03, 0xF6, 0x0E,
-    0x61, 0x35, 0x57, 0xB9, 0x86, 0xC1, 0x1D, 0x9E,
-    0xE1, 0xF8, 0x98, 0x11, 0x69, 0xD9, 0x8E, 0x94,
-    0x9B, 0x1E, 0x87, 0xE9, 0xCE, 0x55, 0x28, 0xDF,
-    0x8C, 0xA1, 0x89, 0x0D, 0xBF, 0xE6, 0x42, 0x68,
-    0x41, 0x99, 0x2D, 0x0F, 0xB0, 0x54, 0xBB, 0x16
-};
-
-/*
- * Forward tables
- */
-#define FT \
-\
-    V(A5,63,63,C6), V(84,7C,7C,F8), V(99,77,77,EE), V(8D,7B,7B,F6), \
-    V(0D,F2,F2,FF), V(BD,6B,6B,D6), V(B1,6F,6F,DE), V(54,C5,C5,91), \
-    V(50,30,30,60), V(03,01,01,02), V(A9,67,67,CE), V(7D,2B,2B,56), \
-    V(19,FE,FE,E7), V(62,D7,D7,B5), V(E6,AB,AB,4D), V(9A,76,76,EC), \
-    V(45,CA,CA,8F), V(9D,82,82,1F), V(40,C9,C9,89), V(87,7D,7D,FA), \
-    V(15,FA,FA,EF), V(EB,59,59,B2), V(C9,47,47,8E), V(0B,F0,F0,FB), \
-    V(EC,AD,AD,41), V(67,D4,D4,B3), V(FD,A2,A2,5F), V(EA,AF,AF,45), \
-    V(BF,9C,9C,23), V(F7,A4,A4,53), V(96,72,72,E4), V(5B,C0,C0,9B), \
-    V(C2,B7,B7,75), V(1C,FD,FD,E1), V(AE,93,93,3D), V(6A,26,26,4C), \
-    V(5A,36,36,6C), V(41,3F,3F,7E), V(02,F7,F7,F5), V(4F,CC,CC,83), \
-    V(5C,34,34,68), V(F4,A5,A5,51), V(34,E5,E5,D1), V(08,F1,F1,F9), \
-    V(93,71,71,E2), V(73,D8,D8,AB), V(53,31,31,62), V(3F,15,15,2A), \
-    V(0C,04,04,08), V(52,C7,C7,95), V(65,23,23,46), V(5E,C3,C3,9D), \
-    V(28,18,18,30), V(A1,96,96,37), V(0F,05,05,0A), V(B5,9A,9A,2F), \
-    V(09,07,07,0E), V(36,12,12,24), V(9B,80,80,1B), V(3D,E2,E2,DF), \
-    V(26,EB,EB,CD), V(69,27,27,4E), V(CD,B2,B2,7F), V(9F,75,75,EA), \
-    V(1B,09,09,12), V(9E,83,83,1D), V(74,2C,2C,58), V(2E,1A,1A,34), \
-    V(2D,1B,1B,36), V(B2,6E,6E,DC), V(EE,5A,5A,B4), V(FB,A0,A0,5B), \
-    V(F6,52,52,A4), V(4D,3B,3B,76), V(61,D6,D6,B7), V(CE,B3,B3,7D), \
-    V(7B,29,29,52), V(3E,E3,E3,DD), V(71,2F,2F,5E), V(97,84,84,13), \
-    V(F5,53,53,A6), V(68,D1,D1,B9), V(00,00,00,00), V(2C,ED,ED,C1), \
-    V(60,20,20,40), V(1F,FC,FC,E3), V(C8,B1,B1,79), V(ED,5B,5B,B6), \
-    V(BE,6A,6A,D4), V(46,CB,CB,8D), V(D9,BE,BE,67), V(4B,39,39,72), \
-    V(DE,4A,4A,94), V(D4,4C,4C,98), V(E8,58,58,B0), V(4A,CF,CF,85), \
-    V(6B,D0,D0,BB), V(2A,EF,EF,C5), V(E5,AA,AA,4F), V(16,FB,FB,ED), \
-    V(C5,43,43,86), V(D7,4D,4D,9A), V(55,33,33,66), V(94,85,85,11), \
-    V(CF,45,45,8A), V(10,F9,F9,E9), V(06,02,02,04), V(81,7F,7F,FE), \
-    V(F0,50,50,A0), V(44,3C,3C,78), V(BA,9F,9F,25), V(E3,A8,A8,4B), \
-    V(F3,51,51,A2), V(FE,A3,A3,5D), V(C0,40,40,80), V(8A,8F,8F,05), \
-    V(AD,92,92,3F), V(BC,9D,9D,21), V(48,38,38,70), V(04,F5,F5,F1), \
-    V(DF,BC,BC,63), V(C1,B6,B6,77), V(75,DA,DA,AF), V(63,21,21,42), \
-    V(30,10,10,20), V(1A,FF,FF,E5), V(0E,F3,F3,FD), V(6D,D2,D2,BF), \
-    V(4C,CD,CD,81), V(14,0C,0C,18), V(35,13,13,26), V(2F,EC,EC,C3), \
-    V(E1,5F,5F,BE), V(A2,97,97,35), V(CC,44,44,88), V(39,17,17,2E), \
-    V(57,C4,C4,93), V(F2,A7,A7,55), V(82,7E,7E,FC), V(47,3D,3D,7A), \
-    V(AC,64,64,C8), V(E7,5D,5D,BA), V(2B,19,19,32), V(95,73,73,E6), \
-    V(A0,60,60,C0), V(98,81,81,19), V(D1,4F,4F,9E), V(7F,DC,DC,A3), \
-    V(66,22,22,44), V(7E,2A,2A,54), V(AB,90,90,3B), V(83,88,88,0B), \
-    V(CA,46,46,8C), V(29,EE,EE,C7), V(D3,B8,B8,6B), V(3C,14,14,28), \
-    V(79,DE,DE,A7), V(E2,5E,5E,BC), V(1D,0B,0B,16), V(76,DB,DB,AD), \
-    V(3B,E0,E0,DB), V(56,32,32,64), V(4E,3A,3A,74), V(1E,0A,0A,14), \
-    V(DB,49,49,92), V(0A,06,06,0C), V(6C,24,24,48), V(E4,5C,5C,B8), \
-    V(5D,C2,C2,9F), V(6E,D3,D3,BD), V(EF,AC,AC,43), V(A6,62,62,C4), \
-    V(A8,91,91,39), V(A4,95,95,31), V(37,E4,E4,D3), V(8B,79,79,F2), \
-    V(32,E7,E7,D5), V(43,C8,C8,8B), V(59,37,37,6E), V(B7,6D,6D,DA), \
-    V(8C,8D,8D,01), V(64,D5,D5,B1), V(D2,4E,4E,9C), V(E0,A9,A9,49), \
-    V(B4,6C,6C,D8), V(FA,56,56,AC), V(07,F4,F4,F3), V(25,EA,EA,CF), \
-    V(AF,65,65,CA), V(8E,7A,7A,F4), V(E9,AE,AE,47), V(18,08,08,10), \
-    V(D5,BA,BA,6F), V(88,78,78,F0), V(6F,25,25,4A), V(72,2E,2E,5C), \
-    V(24,1C,1C,38), V(F1,A6,A6,57), V(C7,B4,B4,73), V(51,C6,C6,97), \
-    V(23,E8,E8,CB), V(7C,DD,DD,A1), V(9C,74,74,E8), V(21,1F,1F,3E), \
-    V(DD,4B,4B,96), V(DC,BD,BD,61), V(86,8B,8B,0D), V(85,8A,8A,0F), \
-    V(90,70,70,E0), V(42,3E,3E,7C), V(C4,B5,B5,71), V(AA,66,66,CC), \
-    V(D8,48,48,90), V(05,03,03,06), V(01,F6,F6,F7), V(12,0E,0E,1C), \
-    V(A3,61,61,C2), V(5F,35,35,6A), V(F9,57,57,AE), V(D0,B9,B9,69), \
-    V(91,86,86,17), V(58,C1,C1,99), V(27,1D,1D,3A), V(B9,9E,9E,27), \
-    V(38,E1,E1,D9), V(13,F8,F8,EB), V(B3,98,98,2B), V(33,11,11,22), \
-    V(BB,69,69,D2), V(70,D9,D9,A9), V(89,8E,8E,07), V(A7,94,94,33), \
-    V(B6,9B,9B,2D), V(22,1E,1E,3C), V(92,87,87,15), V(20,E9,E9,C9), \
-    V(49,CE,CE,87), V(FF,55,55,AA), V(78,28,28,50), V(7A,DF,DF,A5), \
-    V(8F,8C,8C,03), V(F8,A1,A1,59), V(80,89,89,09), V(17,0D,0D,1A), \
-    V(DA,BF,BF,65), V(31,E6,E6,D7), V(C6,42,42,84), V(B8,68,68,D0), \
-    V(C3,41,41,82), V(B0,99,99,29), V(77,2D,2D,5A), V(11,0F,0F,1E), \
-    V(CB,B0,B0,7B), V(FC,54,54,A8), V(D6,BB,BB,6D), V(3A,16,16,2C)
-
-#define V(a,b,c,d) 0x##a##b##c##d
-static const uint32_t FT0[256] = { FT };
-#undef V
-
-#define V(a,b,c,d) 0x##b##c##d##a
-static const uint32_t FT1[256] = { FT };
-#undef V
-
-#define V(a,b,c,d) 0x##c##d##a##b
-static const uint32_t FT2[256] = { FT };
-#undef V
-
-#define V(a,b,c,d) 0x##d##a##b##c
-static const uint32_t FT3[256] = { FT };
-#undef V
-
-#undef FT
-
-/*
- * Reverse S-box
- */
-static const unsigned char RSb[256] =
-{
-    0x52, 0x09, 0x6A, 0xD5, 0x30, 0x36, 0xA5, 0x38,
-    0xBF, 0x40, 0xA3, 0x9E, 0x81, 0xF3, 0xD7, 0xFB,
-    0x7C, 0xE3, 0x39, 0x82, 0x9B, 0x2F, 0xFF, 0x87,
-    0x34, 0x8E, 0x43, 0x44, 0xC4, 0xDE, 0xE9, 0xCB,
-    0x54, 0x7B, 0x94, 0x32, 0xA6, 0xC2, 0x23, 0x3D,
-    0xEE, 0x4C, 0x95, 0x0B, 0x42, 0xFA, 0xC3, 0x4E,
-    0x08, 0x2E, 0xA1, 0x66, 0x28, 0xD9, 0x24, 0xB2,
-    0x76, 0x5B, 0xA2, 0x49, 0x6D, 0x8B, 0xD1, 0x25,
-    0x72, 0xF8, 0xF6, 0x64, 0x86, 0x68, 0x98, 0x16,
-    0xD4, 0xA4, 0x5C, 0xCC, 0x5D, 0x65, 0xB6, 0x92,
-    0x6C, 0x70, 0x48, 0x50, 0xFD, 0xED, 0xB9, 0xDA,
-    0x5E, 0x15, 0x46, 0x57, 0xA7, 0x8D, 0x9D, 0x84,
-    0x90, 0xD8, 0xAB, 0x00, 0x8C, 0xBC, 0xD3, 0x0A,
-    0xF7, 0xE4, 0x58, 0x05, 0xB8, 0xB3, 0x45, 0x06,
-    0xD0, 0x2C, 0x1E, 0x8F, 0xCA, 0x3F, 0x0F, 0x02,
-    0xC1, 0xAF, 0xBD, 0x03, 0x01, 0x13, 0x8A, 0x6B,
-    0x3A, 0x91, 0x11, 0x41, 0x4F, 0x67, 0xDC, 0xEA,
-    0x97, 0xF2, 0xCF, 0xCE, 0xF0, 0xB4, 0xE6, 0x73,
-    0x96, 0xAC, 0x74, 0x22, 0xE7, 0xAD, 0x35, 0x85,
-    0xE2, 0xF9, 0x37, 0xE8, 0x1C, 0x75, 0xDF, 0x6E,
-    0x47, 0xF1, 0x1A, 0x71, 0x1D, 0x29, 0xC5, 0x89,
-    0x6F, 0xB7, 0x62, 0x0E, 0xAA, 0x18, 0xBE, 0x1B,
-    0xFC, 0x56, 0x3E, 0x4B, 0xC6, 0xD2, 0x79, 0x20,
-    0x9A, 0xDB, 0xC0, 0xFE, 0x78, 0xCD, 0x5A, 0xF4,
-    0x1F, 0xDD, 0xA8, 0x33, 0x88, 0x07, 0xC7, 0x31,
-    0xB1, 0x12, 0x10, 0x59, 0x27, 0x80, 0xEC, 0x5F,
-    0x60, 0x51, 0x7F, 0xA9, 0x19, 0xB5, 0x4A, 0x0D,
-    0x2D, 0xE5, 0x7A, 0x9F, 0x93, 0xC9, 0x9C, 0xEF,
-    0xA0, 0xE0, 0x3B, 0x4D, 0xAE, 0x2A, 0xF5, 0xB0,
-    0xC8, 0xEB, 0xBB, 0x3C, 0x83, 0x53, 0x99, 0x61,
-    0x17, 0x2B, 0x04, 0x7E, 0xBA, 0x77, 0xD6, 0x26,
-    0xE1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0C, 0x7D
-};
-
-/*
- * Reverse tables
- */
-#define RT \
-\
-    V(50,A7,F4,51), V(53,65,41,7E), V(C3,A4,17,1A), V(96,5E,27,3A), \
-    V(CB,6B,AB,3B), V(F1,45,9D,1F), V(AB,58,FA,AC), V(93,03,E3,4B), \
-    V(55,FA,30,20), V(F6,6D,76,AD), V(91,76,CC,88), V(25,4C,02,F5), \
-    V(FC,D7,E5,4F), V(D7,CB,2A,C5), V(80,44,35,26), V(8F,A3,62,B5), \
-    V(49,5A,B1,DE), V(67,1B,BA,25), V(98,0E,EA,45), V(E1,C0,FE,5D), \
-    V(02,75,2F,C3), V(12,F0,4C,81), V(A3,97,46,8D), V(C6,F9,D3,6B), \
-    V(E7,5F,8F,03), V(95,9C,92,15), V(EB,7A,6D,BF), V(DA,59,52,95), \
-    V(2D,83,BE,D4), V(D3,21,74,58), V(29,69,E0,49), V(44,C8,C9,8E), \
-    V(6A,89,C2,75), V(78,79,8E,F4), V(6B,3E,58,99), V(DD,71,B9,27), \
-    V(B6,4F,E1,BE), V(17,AD,88,F0), V(66,AC,20,C9), V(B4,3A,CE,7D), \
-    V(18,4A,DF,63), V(82,31,1A,E5), V(60,33,51,97), V(45,7F,53,62), \
-    V(E0,77,64,B1), V(84,AE,6B,BB), V(1C,A0,81,FE), V(94,2B,08,F9), \
-    V(58,68,48,70), V(19,FD,45,8F), V(87,6C,DE,94), V(B7,F8,7B,52), \
-    V(23,D3,73,AB), V(E2,02,4B,72), V(57,8F,1F,E3), V(2A,AB,55,66), \
-    V(07,28,EB,B2), V(03,C2,B5,2F), V(9A,7B,C5,86), V(A5,08,37,D3), \
-    V(F2,87,28,30), V(B2,A5,BF,23), V(BA,6A,03,02), V(5C,82,16,ED), \
-    V(2B,1C,CF,8A), V(92,B4,79,A7), V(F0,F2,07,F3), V(A1,E2,69,4E), \
-    V(CD,F4,DA,65), V(D5,BE,05,06), V(1F,62,34,D1), V(8A,FE,A6,C4), \
-    V(9D,53,2E,34), V(A0,55,F3,A2), V(32,E1,8A,05), V(75,EB,F6,A4), \
-    V(39,EC,83,0B), V(AA,EF,60,40), V(06,9F,71,5E), V(51,10,6E,BD), \
-    V(F9,8A,21,3E), V(3D,06,DD,96), V(AE,05,3E,DD), V(46,BD,E6,4D), \
-    V(B5,8D,54,91), V(05,5D,C4,71), V(6F,D4,06,04), V(FF,15,50,60), \
-    V(24,FB,98,19), V(97,E9,BD,D6), V(CC,43,40,89), V(77,9E,D9,67), \
-    V(BD,42,E8,B0), V(88,8B,89,07), V(38,5B,19,E7), V(DB,EE,C8,79), \
-    V(47,0A,7C,A1), V(E9,0F,42,7C), V(C9,1E,84,F8), V(00,00,00,00), \
-    V(83,86,80,09), V(48,ED,2B,32), V(AC,70,11,1E), V(4E,72,5A,6C), \
-    V(FB,FF,0E,FD), V(56,38,85,0F), V(1E,D5,AE,3D), V(27,39,2D,36), \
-    V(64,D9,0F,0A), V(21,A6,5C,68), V(D1,54,5B,9B), V(3A,2E,36,24), \
-    V(B1,67,0A,0C), V(0F,E7,57,93), V(D2,96,EE,B4), V(9E,91,9B,1B), \
-    V(4F,C5,C0,80), V(A2,20,DC,61), V(69,4B,77,5A), V(16,1A,12,1C), \
-    V(0A,BA,93,E2), V(E5,2A,A0,C0), V(43,E0,22,3C), V(1D,17,1B,12), \
-    V(0B,0D,09,0E), V(AD,C7,8B,F2), V(B9,A8,B6,2D), V(C8,A9,1E,14), \
-    V(85,19,F1,57), V(4C,07,75,AF), V(BB,DD,99,EE), V(FD,60,7F,A3), \
-    V(9F,26,01,F7), V(BC,F5,72,5C), V(C5,3B,66,44), V(34,7E,FB,5B), \
-    V(76,29,43,8B), V(DC,C6,23,CB), V(68,FC,ED,B6), V(63,F1,E4,B8), \
-    V(CA,DC,31,D7), V(10,85,63,42), V(40,22,97,13), V(20,11,C6,84), \
-    V(7D,24,4A,85), V(F8,3D,BB,D2), V(11,32,F9,AE), V(6D,A1,29,C7), \
-    V(4B,2F,9E,1D), V(F3,30,B2,DC), V(EC,52,86,0D), V(D0,E3,C1,77), \
-    V(6C,16,B3,2B), V(99,B9,70,A9), V(FA,48,94,11), V(22,64,E9,47), \
-    V(C4,8C,FC,A8), V(1A,3F,F0,A0), V(D8,2C,7D,56), V(EF,90,33,22), \
-    V(C7,4E,49,87), V(C1,D1,38,D9), V(FE,A2,CA,8C), V(36,0B,D4,98), \
-    V(CF,81,F5,A6), V(28,DE,7A,A5), V(26,8E,B7,DA), V(A4,BF,AD,3F), \
-    V(E4,9D,3A,2C), V(0D,92,78,50), V(9B,CC,5F,6A), V(62,46,7E,54), \
-    V(C2,13,8D,F6), V(E8,B8,D8,90), V(5E,F7,39,2E), V(F5,AF,C3,82), \
-    V(BE,80,5D,9F), V(7C,93,D0,69), V(A9,2D,D5,6F), V(B3,12,25,CF), \
-    V(3B,99,AC,C8), V(A7,7D,18,10), V(6E,63,9C,E8), V(7B,BB,3B,DB), \
-    V(09,78,26,CD), V(F4,18,59,6E), V(01,B7,9A,EC), V(A8,9A,4F,83), \
-    V(65,6E,95,E6), V(7E,E6,FF,AA), V(08,CF,BC,21), V(E6,E8,15,EF), \
-    V(D9,9B,E7,BA), V(CE,36,6F,4A), V(D4,09,9F,EA), V(D6,7C,B0,29), \
-    V(AF,B2,A4,31), V(31,23,3F,2A), V(30,94,A5,C6), V(C0,66,A2,35), \
-    V(37,BC,4E,74), V(A6,CA,82,FC), V(B0,D0,90,E0), V(15,D8,A7,33), \
-    V(4A,98,04,F1), V(F7,DA,EC,41), V(0E,50,CD,7F), V(2F,F6,91,17), \
-    V(8D,D6,4D,76), V(4D,B0,EF,43), V(54,4D,AA,CC), V(DF,04,96,E4), \
-    V(E3,B5,D1,9E), V(1B,88,6A,4C), V(B8,1F,2C,C1), V(7F,51,65,46), \
-    V(04,EA,5E,9D), V(5D,35,8C,01), V(73,74,87,FA), V(2E,41,0B,FB), \
-    V(5A,1D,67,B3), V(52,D2,DB,92), V(33,56,10,E9), V(13,47,D6,6D), \
-    V(8C,61,D7,9A), V(7A,0C,A1,37), V(8E,14,F8,59), V(89,3C,13,EB), \
-    V(EE,27,A9,CE), V(35,C9,61,B7), V(ED,E5,1C,E1), V(3C,B1,47,7A), \
-    V(59,DF,D2,9C), V(3F,73,F2,55), V(79,CE,14,18), V(BF,37,C7,73), \
-    V(EA,CD,F7,53), V(5B,AA,FD,5F), V(14,6F,3D,DF), V(86,DB,44,78), \
-    V(81,F3,AF,CA), V(3E,C4,68,B9), V(2C,34,24,38), V(5F,40,A3,C2), \
-    V(72,C3,1D,16), V(0C,25,E2,BC), V(8B,49,3C,28), V(41,95,0D,FF), \
-    V(71,01,A8,39), V(DE,B3,0C,08), V(9C,E4,B4,D8), V(90,C1,56,64), \
-    V(61,84,CB,7B), V(70,B6,32,D5), V(74,5C,6C,48), V(42,57,B8,D0)
-
-#define V(a,b,c,d) 0x##a##b##c##d
-static const uint32_t RT0[256] = { RT };
-#undef V
-
-#define V(a,b,c,d) 0x##b##c##d##a
-static const uint32_t RT1[256] = { RT };
-#undef V
-
-#define V(a,b,c,d) 0x##c##d##a##b
-static const uint32_t RT2[256] = { RT };
-#undef V
-
-#define V(a,b,c,d) 0x##d##a##b##c
-static const uint32_t RT3[256] = { RT };
-#undef V
-
-#undef RT
-
-/*
- * Round constants
- */
-static const uint32_t RCON[10] =
-{
-    0x00000001, 0x00000002, 0x00000004, 0x00000008,
-    0x00000010, 0x00000020, 0x00000040, 0x00000080,
-    0x0000001B, 0x00000036
-};
-
-#else /* POLARSSL_AES_ROM_TABLES */
-
-/*
- * Forward S-box & tables
- */
-static unsigned char FSb[256];
-static uint32_t FT0[256];
-static uint32_t FT1[256];
-static uint32_t FT2[256];
-static uint32_t FT3[256];
-
-/*
- * Reverse S-box & tables
- */
-static unsigned char RSb[256];
-static uint32_t RT0[256];
-static uint32_t RT1[256];
-static uint32_t RT2[256];
-static uint32_t RT3[256];
-
-/*
- * Round constants
- */
-static uint32_t RCON[10];
-
-/*
- * Tables generation code
- */
-#define ROTL8(x) ( ( x << 8 ) & 0xFFFFFFFF ) | ( x >> 24 )
-#define XTIME(x) ( ( x << 1 ) ^ ( ( x & 0x80 ) ? 0x1B : 0x00 ) )
-#define MUL(x,y) ( ( x && y ) ? pow[(log[x]+log[y]) % 255] : 0 )
-
-static int aes_init_done = 0;
-
-static void aes_gen_tables( void )
-{
-    int i, x, y, z;
-    int pow[256];
-    int log[256];
-
-    /*
-     * compute pow and log tables over GF(2^8)
-     */
-    for( i = 0, x = 1; i < 256; i++ )
-    {
-        pow[i] = x;
-        log[x] = i;
-        x = ( x ^ XTIME( x ) ) & 0xFF;
-    }
-
-    /*
-     * calculate the round constants
-     */
-    for( i = 0, x = 1; i < 10; i++ )
-    {
-        RCON[i] = (uint32_t) x;
-        x = XTIME( x ) & 0xFF;
-    }
-
-    /*
-     * generate the forward and reverse S-boxes
-     */
-    FSb[0x00] = 0x63;
-    RSb[0x63] = 0x00;
-
-    for( i = 1; i < 256; i++ )
-    {
-        x = pow[255 - log[i]];
-
-        y  = x; y = ( ( y << 1 ) | ( y >> 7 ) ) & 0xFF;
-        x ^= y; y = ( ( y << 1 ) | ( y >> 7 ) ) & 0xFF;
-        x ^= y; y = ( ( y << 1 ) | ( y >> 7 ) ) & 0xFF;
-        x ^= y; y = ( ( y << 1 ) | ( y >> 7 ) ) & 0xFF;
-        x ^= y ^ 0x63;
-
-        FSb[i] = (unsigned char) x;
-        RSb[x] = (unsigned char) i;
-    }
-
-    /*
-     * generate the forward and reverse tables
-     */
-    for( i = 0; i < 256; i++ )
-    {
-        x = FSb[i];
-        y = XTIME( x ) & 0xFF;
-        z =  ( y ^ x ) & 0xFF;
-
-        FT0[i] = ( (uint32_t) y       ) ^
-                 ( (uint32_t) x <<  8 ) ^
-                 ( (uint32_t) x << 16 ) ^
-                 ( (uint32_t) z << 24 );
-
-        FT1[i] = ROTL8( FT0[i] );
-        FT2[i] = ROTL8( FT1[i] );
-        FT3[i] = ROTL8( FT2[i] );
-
-        x = RSb[i];
-
-        RT0[i] = ( (uint32_t) MUL( 0x0E, x )       ) ^
-                 ( (uint32_t) MUL( 0x09, x ) <<  8 ) ^
-                 ( (uint32_t) MUL( 0x0D, x ) << 16 ) ^
-                 ( (uint32_t) MUL( 0x0B, x ) << 24 );
-
-        RT1[i] = ROTL8( RT0[i] );
-        RT2[i] = ROTL8( RT1[i] );
-        RT3[i] = ROTL8( RT2[i] );
-    }
-}
-
-#endif /* POLARSSL_AES_ROM_TABLES */
-
-void aes_init( aes_context *ctx )
-{
-    memset( ctx, 0, sizeof( aes_context ) );
-}
-
-void aes_free( aes_context *ctx )
-{
-    if( ctx == NULL )
-        return;
-
-    polarssl_zeroize( ctx, sizeof( aes_context ) );
-}
-
-/*
- * AES key schedule (encryption)
- */
-int aes_setkey_enc( aes_context *ctx, const unsigned char *key,
-                    unsigned int keysize )
-{
-    unsigned int i;
-    uint32_t *RK;
-
-#if !defined(POLARSSL_AES_ROM_TABLES)
-    if( aes_init_done == 0 )
-    {
-        aes_gen_tables();
-        aes_init_done = 1;
-
-    }
-#endif
-
-    switch( keysize )
-    {
-        case 128: ctx->nr = 10; break;
-        case 192: ctx->nr = 12; break;
-        case 256: ctx->nr = 14; break;
-        default : return( POLARSSL_ERR_AES_INVALID_KEY_LENGTH );
-    }
-
-#if defined(POLARSSL_PADLOCK_C) && defined(PADLOCK_ALIGN16)
-    if( aes_padlock_ace == -1 )
-        aes_padlock_ace = padlock_supports( PADLOCK_ACE );
-
-    if( aes_padlock_ace )
-        ctx->rk = RK = PADLOCK_ALIGN16( ctx->buf );
-    else
-#endif
-    ctx->rk = RK = ctx->buf;
-
-#if defined(POLARSSL_AESNI_C) && defined(POLARSSL_HAVE_X86_64)
-    if( aesni_supports( POLARSSL_AESNI_AES ) )
-        return( aesni_setkey_enc( (unsigned char *) ctx->rk, key, keysize ) );
-#endif
-
-    for( i = 0; i < ( keysize >> 5 ); i++ )
-    {
-        GET_UINT32_LE( RK[i], key, i << 2 );
-    }
-
-    switch( ctx->nr )
-    {
-        case 10:
-
-            for( i = 0; i < 10; i++, RK += 4 )
-            {
-                RK[4]  = RK[0] ^ RCON[i] ^
-                ( (uint32_t) FSb[ ( RK[3] >>  8 ) & 0xFF ]       ) ^
-                ( (uint32_t) FSb[ ( RK[3] >> 16 ) & 0xFF ] <<  8 ) ^
-                ( (uint32_t) FSb[ ( RK[3] >> 24 ) & 0xFF ] << 16 ) ^
-                ( (uint32_t) FSb[ ( RK[3]       ) & 0xFF ] << 24 );
-
-                RK[5]  = RK[1] ^ RK[4];
-                RK[6]  = RK[2] ^ RK[5];
-                RK[7]  = RK[3] ^ RK[6];
-            }
-            break;
-
-        case 12:
-
-            for( i = 0; i < 8; i++, RK += 6 )
-            {
-                RK[6]  = RK[0] ^ RCON[i] ^
-                ( (uint32_t) FSb[ ( RK[5] >>  8 ) & 0xFF ]       ) ^
-                ( (uint32_t) FSb[ ( RK[5] >> 16 ) & 0xFF ] <<  8 ) ^
-                ( (uint32_t) FSb[ ( RK[5] >> 24 ) & 0xFF ] << 16 ) ^
-                ( (uint32_t) FSb[ ( RK[5]       ) & 0xFF ] << 24 );
-
-                RK[7]  = RK[1] ^ RK[6];
-                RK[8]  = RK[2] ^ RK[7];
-                RK[9]  = RK[3] ^ RK[8];
-                RK[10] = RK[4] ^ RK[9];
-                RK[11] = RK[5] ^ RK[10];
-            }
-            break;
-
-        case 14:
-
-            for( i = 0; i < 7; i++, RK += 8 )
-            {
-                RK[8]  = RK[0] ^ RCON[i] ^
-                ( (uint32_t) FSb[ ( RK[7] >>  8 ) & 0xFF ]       ) ^
-                ( (uint32_t) FSb[ ( RK[7] >> 16 ) & 0xFF ] <<  8 ) ^
-                ( (uint32_t) FSb[ ( RK[7] >> 24 ) & 0xFF ] << 16 ) ^
-                ( (uint32_t) FSb[ ( RK[7]       ) & 0xFF ] << 24 );
-
-                RK[9]  = RK[1] ^ RK[8];
-                RK[10] = RK[2] ^ RK[9];
-                RK[11] = RK[3] ^ RK[10];
-
-                RK[12] = RK[4] ^
-                ( (uint32_t) FSb[ ( RK[11]       ) & 0xFF ]       ) ^
-                ( (uint32_t) FSb[ ( RK[11] >>  8 ) & 0xFF ] <<  8 ) ^
-                ( (uint32_t) FSb[ ( RK[11] >> 16 ) & 0xFF ] << 16 ) ^
-                ( (uint32_t) FSb[ ( RK[11] >> 24 ) & 0xFF ] << 24 );
-
-                RK[13] = RK[5] ^ RK[12];
-                RK[14] = RK[6] ^ RK[13];
-                RK[15] = RK[7] ^ RK[14];
-            }
-            break;
-    }
-
-    return( 0 );
-}
-
-/*
- * AES key schedule (decryption)
- */
-int aes_setkey_dec( aes_context *ctx, const unsigned char *key,
-                    unsigned int keysize )
-{
-    int i, j, ret;
-    aes_context cty;
-    uint32_t *RK;
-    uint32_t *SK;
-
-    aes_init( &cty );
-
-#if defined(POLARSSL_PADLOCK_C) && defined(PADLOCK_ALIGN16)
-    if( aes_padlock_ace == -1 )
-        aes_padlock_ace = padlock_supports( PADLOCK_ACE );
-
-    if( aes_padlock_ace )
-        ctx->rk = RK = PADLOCK_ALIGN16( ctx->buf );
-    else
-#endif
-    ctx->rk = RK = ctx->buf;
-
-    /* Also checks keysize */
-    if( ( ret = aes_setkey_enc( &cty, key, keysize ) ) != 0 )
-        goto exit;
-
-    ctx->nr = cty.nr;
-
-#if defined(POLARSSL_AESNI_C) && defined(POLARSSL_HAVE_X86_64)
-    if( aesni_supports( POLARSSL_AESNI_AES ) )
-    {
-        aesni_inverse_key( (unsigned char *) ctx->rk,
-                           (const unsigned char *) cty.rk, ctx->nr );
-        goto exit;
-    }
-#endif
-
-    SK = cty.rk + cty.nr * 4;
-
-    *RK++ = *SK++;
-    *RK++ = *SK++;
-    *RK++ = *SK++;
-    *RK++ = *SK++;
-
-    for( i = ctx->nr - 1, SK -= 8; i > 0; i--, SK -= 8 )
-    {
-        for( j = 0; j < 4; j++, SK++ )
-        {
-            *RK++ = RT0[ FSb[ ( *SK       ) & 0xFF ] ] ^
-                    RT1[ FSb[ ( *SK >>  8 ) & 0xFF ] ] ^
-                    RT2[ FSb[ ( *SK >> 16 ) & 0xFF ] ] ^
-                    RT3[ FSb[ ( *SK >> 24 ) & 0xFF ] ];
-        }
-    }
-
-    *RK++ = *SK++;
-    *RK++ = *SK++;
-    *RK++ = *SK++;
-    *RK++ = *SK++;
-
-exit:
-    aes_free( &cty );
-
-    return( ret );
-}
-
-#define AES_FROUND(X0,X1,X2,X3,Y0,Y1,Y2,Y3)     \
-{                                               \
-    X0 = *RK++ ^ FT0[ ( Y0       ) & 0xFF ] ^   \
-                 FT1[ ( Y1 >>  8 ) & 0xFF ] ^   \
-                 FT2[ ( Y2 >> 16 ) & 0xFF ] ^   \
-                 FT3[ ( Y3 >> 24 ) & 0xFF ];    \
-                                                \
-    X1 = *RK++ ^ FT0[ ( Y1       ) & 0xFF ] ^   \
-                 FT1[ ( Y2 >>  8 ) & 0xFF ] ^   \
-                 FT2[ ( Y3 >> 16 ) & 0xFF ] ^   \
-                 FT3[ ( Y0 >> 24 ) & 0xFF ];    \
-                                                \
-    X2 = *RK++ ^ FT0[ ( Y2       ) & 0xFF ] ^   \
-                 FT1[ ( Y3 >>  8 ) & 0xFF ] ^   \
-                 FT2[ ( Y0 >> 16 ) & 0xFF ] ^   \
-                 FT3[ ( Y1 >> 24 ) & 0xFF ];    \
-                                                \
-    X3 = *RK++ ^ FT0[ ( Y3       ) & 0xFF ] ^   \
-                 FT1[ ( Y0 >>  8 ) & 0xFF ] ^   \
-                 FT2[ ( Y1 >> 16 ) & 0xFF ] ^   \
-                 FT3[ ( Y2 >> 24 ) & 0xFF ];    \
-}
-
-#define AES_RROUND(X0,X1,X2,X3,Y0,Y1,Y2,Y3)     \
-{                                               \
-    X0 = *RK++ ^ RT0[ ( Y0       ) & 0xFF ] ^   \
-                 RT1[ ( Y3 >>  8 ) & 0xFF ] ^   \
-                 RT2[ ( Y2 >> 16 ) & 0xFF ] ^   \
-                 RT3[ ( Y1 >> 24 ) & 0xFF ];    \
-                                                \
-    X1 = *RK++ ^ RT0[ ( Y1       ) & 0xFF ] ^   \
-                 RT1[ ( Y0 >>  8 ) & 0xFF ] ^   \
-                 RT2[ ( Y3 >> 16 ) & 0xFF ] ^   \
-                 RT3[ ( Y2 >> 24 ) & 0xFF ];    \
-                                                \
-    X2 = *RK++ ^ RT0[ ( Y2       ) & 0xFF ] ^   \
-                 RT1[ ( Y1 >>  8 ) & 0xFF ] ^   \
-                 RT2[ ( Y0 >> 16 ) & 0xFF ] ^   \
-                 RT3[ ( Y3 >> 24 ) & 0xFF ];    \
-                                                \
-    X3 = *RK++ ^ RT0[ ( Y3       ) & 0xFF ] ^   \
-                 RT1[ ( Y2 >>  8 ) & 0xFF ] ^   \
-                 RT2[ ( Y1 >> 16 ) & 0xFF ] ^   \
-                 RT3[ ( Y0 >> 24 ) & 0xFF ];    \
-}
-
-/*
- * AES-ECB block encryption/decryption
- */
-int aes_crypt_ecb( aes_context *ctx,
-                    int mode,
-                    const unsigned char input[16],
-                    unsigned char output[16] )
-{
-    int i;
-    uint32_t *RK, X0, X1, X2, X3, Y0, Y1, Y2, Y3;
-
-#if defined(POLARSSL_AESNI_C) && defined(POLARSSL_HAVE_X86_64)
-    if( aesni_supports( POLARSSL_AESNI_AES ) )
-        return( aesni_crypt_ecb( ctx, mode, input, output ) );
-#endif
-
-#if defined(POLARSSL_PADLOCK_C) && defined(POLARSSL_HAVE_X86)
-    if( aes_padlock_ace )
-    {
-        if( padlock_xcryptecb( ctx, mode, input, output ) == 0 )
-            return( 0 );
-
-        // If padlock data misaligned, we just fall back to
-        // unaccelerated mode
-        //
-    }
-#endif
-
-    RK = ctx->rk;
-
-    GET_UINT32_LE( X0, input,  0 ); X0 ^= *RK++;
-    GET_UINT32_LE( X1, input,  4 ); X1 ^= *RK++;
-    GET_UINT32_LE( X2, input,  8 ); X2 ^= *RK++;
-    GET_UINT32_LE( X3, input, 12 ); X3 ^= *RK++;
-
-    if( mode == AES_DECRYPT )
-    {
-        for( i = ( ctx->nr >> 1 ) - 1; i > 0; i-- )
-        {
-            AES_RROUND( Y0, Y1, Y2, Y3, X0, X1, X2, X3 );
-            AES_RROUND( X0, X1, X2, X3, Y0, Y1, Y2, Y3 );
-        }
-
-        AES_RROUND( Y0, Y1, Y2, Y3, X0, X1, X2, X3 );
-
-        X0 = *RK++ ^ \
-                ( (uint32_t) RSb[ ( Y0       ) & 0xFF ]       ) ^
-                ( (uint32_t) RSb[ ( Y3 >>  8 ) & 0xFF ] <<  8 ) ^
-                ( (uint32_t) RSb[ ( Y2 >> 16 ) & 0xFF ] << 16 ) ^
-                ( (uint32_t) RSb[ ( Y1 >> 24 ) & 0xFF ] << 24 );
-
-        X1 = *RK++ ^ \
-                ( (uint32_t) RSb[ ( Y1       ) & 0xFF ]       ) ^
-                ( (uint32_t) RSb[ ( Y0 >>  8 ) & 0xFF ] <<  8 ) ^
-                ( (uint32_t) RSb[ ( Y3 >> 16 ) & 0xFF ] << 16 ) ^
-                ( (uint32_t) RSb[ ( Y2 >> 24 ) & 0xFF ] << 24 );
-
-        X2 = *RK++ ^ \
-                ( (uint32_t) RSb[ ( Y2       ) & 0xFF ]       ) ^
-                ( (uint32_t) RSb[ ( Y1 >>  8 ) & 0xFF ] <<  8 ) ^
-                ( (uint32_t) RSb[ ( Y0 >> 16 ) & 0xFF ] << 16 ) ^
-                ( (uint32_t) RSb[ ( Y3 >> 24 ) & 0xFF ] << 24 );
-
-        X3 = *RK++ ^ \
-                ( (uint32_t) RSb[ ( Y3       ) & 0xFF ]       ) ^
-                ( (uint32_t) RSb[ ( Y2 >>  8 ) & 0xFF ] <<  8 ) ^
-                ( (uint32_t) RSb[ ( Y1 >> 16 ) & 0xFF ] << 16 ) ^
-                ( (uint32_t) RSb[ ( Y0 >> 24 ) & 0xFF ] << 24 );
-    }
-    else /* AES_ENCRYPT */
-    {
-        for( i = ( ctx->nr >> 1 ) - 1; i > 0; i-- )
-        {
-            AES_FROUND( Y0, Y1, Y2, Y3, X0, X1, X2, X3 );
-            AES_FROUND( X0, X1, X2, X3, Y0, Y1, Y2, Y3 );
-        }
-
-        AES_FROUND( Y0, Y1, Y2, Y3, X0, X1, X2, X3 );
-
-        X0 = *RK++ ^ \
-                ( (uint32_t) FSb[ ( Y0       ) & 0xFF ]       ) ^
-                ( (uint32_t) FSb[ ( Y1 >>  8 ) & 0xFF ] <<  8 ) ^
-                ( (uint32_t) FSb[ ( Y2 >> 16 ) & 0xFF ] << 16 ) ^
-                ( (uint32_t) FSb[ ( Y3 >> 24 ) & 0xFF ] << 24 );
-
-        X1 = *RK++ ^ \
-                ( (uint32_t) FSb[ ( Y1       ) & 0xFF ]       ) ^
-                ( (uint32_t) FSb[ ( Y2 >>  8 ) & 0xFF ] <<  8 ) ^
-                ( (uint32_t) FSb[ ( Y3 >> 16 ) & 0xFF ] << 16 ) ^
-                ( (uint32_t) FSb[ ( Y0 >> 24 ) & 0xFF ] << 24 );
-
-        X2 = *RK++ ^ \
-                ( (uint32_t) FSb[ ( Y2       ) & 0xFF ]       ) ^
-                ( (uint32_t) FSb[ ( Y3 >>  8 ) & 0xFF ] <<  8 ) ^
-                ( (uint32_t) FSb[ ( Y0 >> 16 ) & 0xFF ] << 16 ) ^
-                ( (uint32_t) FSb[ ( Y1 >> 24 ) & 0xFF ] << 24 );
-
-        X3 = *RK++ ^ \
-                ( (uint32_t) FSb[ ( Y3       ) & 0xFF ]       ) ^
-                ( (uint32_t) FSb[ ( Y0 >>  8 ) & 0xFF ] <<  8 ) ^
-                ( (uint32_t) FSb[ ( Y1 >> 16 ) & 0xFF ] << 16 ) ^
-                ( (uint32_t) FSb[ ( Y2 >> 24 ) & 0xFF ] << 24 );
-    }
-
-    PUT_UINT32_LE( X0, output,  0 );
-    PUT_UINT32_LE( X1, output,  4 );
-    PUT_UINT32_LE( X2, output,  8 );
-    PUT_UINT32_LE( X3, output, 12 );
-
-    return( 0 );
-}
-
-#if defined(POLARSSL_CIPHER_MODE_CBC)
-/*
- * AES-CBC buffer encryption/decryption
- */
-int aes_crypt_cbc( aes_context *ctx,
-                    int mode,
-                    size_t length,
-                    unsigned char iv[16],
-                    const unsigned char *input,
-                    unsigned char *output )
-{
-    int i;
-    unsigned char temp[16];
-
-    if( length % 16 )
-        return( POLARSSL_ERR_AES_INVALID_INPUT_LENGTH );
-
-#if defined(POLARSSL_PADLOCK_C) && defined(POLARSSL_HAVE_X86)
-    if( aes_padlock_ace )
-    {
-        if( padlock_xcryptcbc( ctx, mode, length, iv, input, output ) == 0 )
-            return( 0 );
-
-        // If padlock data misaligned, we just fall back to
-        // unaccelerated mode
-        //
-    }
-#endif
-
-    if( mode == AES_DECRYPT )
-    {
-        while( length > 0 )
-        {
-            memcpy( temp, input, 16 );
-            aes_crypt_ecb( ctx, mode, input, output );
-
-            for( i = 0; i < 16; i++ )
-                output[i] = (unsigned char)( output[i] ^ iv[i] );
-
-            memcpy( iv, temp, 16 );
-
-            input  += 16;
-            output += 16;
-            length -= 16;
-        }
-    }
-    else
-    {
-        while( length > 0 )
-        {
-            for( i = 0; i < 16; i++ )
-                output[i] = (unsigned char)( input[i] ^ iv[i] );
-
-            aes_crypt_ecb( ctx, mode, output, output );
-            memcpy( iv, output, 16 );
-
-            input  += 16;
-            output += 16;
-            length -= 16;
-        }
-    }
-
-    return( 0 );
-}
-#endif /* POLARSSL_CIPHER_MODE_CBC */
-
-#if defined(POLARSSL_CIPHER_MODE_CFB)
-/*
- * AES-CFB128 buffer encryption/decryption
- */
-int aes_crypt_cfb128( aes_context *ctx,
-                       int mode,
-                       size_t length,
-                       size_t *iv_off,
-                       unsigned char iv[16],
-                       const unsigned char *input,
-                       unsigned char *output )
-{
-    int c;
-    size_t n = *iv_off;
-
-    if( mode == AES_DECRYPT )
-    {
-        while( length-- )
-        {
-            if( n == 0 )
-                aes_crypt_ecb( ctx, AES_ENCRYPT, iv, iv );
-
-            c = *input++;
-            *output++ = (unsigned char)( c ^ iv[n] );
-            iv[n] = (unsigned char) c;
-
-            n = ( n + 1 ) & 0x0F;
-        }
-    }
-    else
-    {
-        while( length-- )
-        {
-            if( n == 0 )
-                aes_crypt_ecb( ctx, AES_ENCRYPT, iv, iv );
-
-            iv[n] = *output++ = (unsigned char)( iv[n] ^ *input++ );
-
-            n = ( n + 1 ) & 0x0F;
-        }
-    }
-
-    *iv_off = n;
-
-    return( 0 );
-}
-
-/*
- * AES-CFB8 buffer encryption/decryption
- */
-#include <stdio.h>
-int aes_crypt_cfb8( aes_context *ctx,
-                       int mode,
-                       size_t length,
-                       unsigned char iv[16],
-                       const unsigned char *input,
-                       unsigned char *output )
-{
-    unsigned char c;
-    unsigned char ov[17];
-
-    while( length-- )
-    {
-        memcpy( ov, iv, 16 );
-        aes_crypt_ecb( ctx, AES_ENCRYPT, iv, iv );
-
-        if( mode == AES_DECRYPT )
-            ov[16] = *input;
-
-        c = *output++ = (unsigned char)( iv[0] ^ *input++ );
-
-        if( mode == AES_ENCRYPT )
-            ov[16] = c;
-
-        memcpy( iv, ov + 1, 16 );
-    }
-
-    return( 0 );
-}
-#endif /*POLARSSL_CIPHER_MODE_CFB */
-
-#if defined(POLARSSL_CIPHER_MODE_CTR)
-/*
- * AES-CTR buffer encryption/decryption
- */
-int aes_crypt_ctr( aes_context *ctx,
-                       size_t length,
-                       size_t *nc_off,
-                       unsigned char nonce_counter[16],
-                       unsigned char stream_block[16],
-                       const unsigned char *input,
-                       unsigned char *output )
-{
-    int c, i;
-    size_t n = *nc_off;
-
-    while( length-- )
-    {
-        if( n == 0 ) {
-            aes_crypt_ecb( ctx, AES_ENCRYPT, nonce_counter, stream_block );
-
-            for( i = 16; i > 0; i-- )
-                if( ++nonce_counter[i - 1] != 0 )
-                    break;
-        }
-        c = *input++;
-        *output++ = (unsigned char)( c ^ stream_block[n] );
-
-        n = ( n + 1 ) & 0x0F;
-    }
-
-    *nc_off = n;
-
-    return( 0 );
-}
-#endif /* POLARSSL_CIPHER_MODE_CTR */
-
-#endif /* !POLARSSL_AES_ALT */
-
-#if defined(POLARSSL_SELF_TEST)
-
-#include <stdio.h>
-
-/*
- * AES test vectors from:
- *
- * http://csrc.nist.gov/archive/aes/rijndael/rijndael-vals.zip
- */
-static const unsigned char aes_test_ecb_dec[3][16] =
-{
-    { 0x44, 0x41, 0x6A, 0xC2, 0xD1, 0xF5, 0x3C, 0x58,
-      0x33, 0x03, 0x91, 0x7E, 0x6B, 0xE9, 0xEB, 0xE0 },
-    { 0x48, 0xE3, 0x1E, 0x9E, 0x25, 0x67, 0x18, 0xF2,
-      0x92, 0x29, 0x31, 0x9C, 0x19, 0xF1, 0x5B, 0xA4 },
-    { 0x05, 0x8C, 0xCF, 0xFD, 0xBB, 0xCB, 0x38, 0x2D,
-      0x1F, 0x6F, 0x56, 0x58, 0x5D, 0x8A, 0x4A, 0xDE }
-};
-
-static const unsigned char aes_test_ecb_enc[3][16] =
-{
-    { 0xC3, 0x4C, 0x05, 0x2C, 0xC0, 0xDA, 0x8D, 0x73,
-      0x45, 0x1A, 0xFE, 0x5F, 0x03, 0xBE, 0x29, 0x7F },
-    { 0xF3, 0xF6, 0x75, 0x2A, 0xE8, 0xD7, 0x83, 0x11,
-      0x38, 0xF0, 0x41, 0x56, 0x06, 0x31, 0xB1, 0x14 },
-    { 0x8B, 0x79, 0xEE, 0xCC, 0x93, 0xA0, 0xEE, 0x5D,
-      0xFF, 0x30, 0xB4, 0xEA, 0x21, 0x63, 0x6D, 0xA4 }
-};
-
-#if defined(POLARSSL_CIPHER_MODE_CBC)
-static const unsigned char aes_test_cbc_dec[3][16] =
-{
-    { 0xFA, 0xCA, 0x37, 0xE0, 0xB0, 0xC8, 0x53, 0x73,
-      0xDF, 0x70, 0x6E, 0x73, 0xF7, 0xC9, 0xAF, 0x86 },
-    { 0x5D, 0xF6, 0x78, 0xDD, 0x17, 0xBA, 0x4E, 0x75,
-      0xB6, 0x17, 0x68, 0xC6, 0xAD, 0xEF, 0x7C, 0x7B },
-    { 0x48, 0x04, 0xE1, 0x81, 0x8F, 0xE6, 0x29, 0x75,
-      0x19, 0xA3, 0xE8, 0x8C, 0x57, 0x31, 0x04, 0x13 }
-};
-
-static const unsigned char aes_test_cbc_enc[3][16] =
-{
-    { 0x8A, 0x05, 0xFC, 0x5E, 0x09, 0x5A, 0xF4, 0x84,
-      0x8A, 0x08, 0xD3, 0x28, 0xD3, 0x68, 0x8E, 0x3D },
-    { 0x7B, 0xD9, 0x66, 0xD5, 0x3A, 0xD8, 0xC1, 0xBB,
-      0x85, 0xD2, 0xAD, 0xFA, 0xE8, 0x7B, 0xB1, 0x04 },
-    { 0xFE, 0x3C, 0x53, 0x65, 0x3E, 0x2F, 0x45, 0xB5,
-      0x6F, 0xCD, 0x88, 0xB2, 0xCC, 0x89, 0x8F, 0xF0 }
-};
-#endif /* POLARSSL_CIPHER_MODE_CBC */
-
-#if defined(POLARSSL_CIPHER_MODE_CFB)
-/*
- * AES-CFB128 test vectors from:
- *
- * http://csrc.nist.gov/publications/nistpubs/800-38a/sp800-38a.pdf
- */
-static const unsigned char aes_test_cfb128_key[3][32] =
-{
-    { 0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6,
-      0xAB, 0xF7, 0x15, 0x88, 0x09, 0xCF, 0x4F, 0x3C },
-    { 0x8E, 0x73, 0xB0, 0xF7, 0xDA, 0x0E, 0x64, 0x52,
-      0xC8, 0x10, 0xF3, 0x2B, 0x80, 0x90, 0x79, 0xE5,
-      0x62, 0xF8, 0xEA, 0xD2, 0x52, 0x2C, 0x6B, 0x7B },
-    { 0x60, 0x3D, 0xEB, 0x10, 0x15, 0xCA, 0x71, 0xBE,
-      0x2B, 0x73, 0xAE, 0xF0, 0x85, 0x7D, 0x77, 0x81,
-      0x1F, 0x35, 0x2C, 0x07, 0x3B, 0x61, 0x08, 0xD7,
-      0x2D, 0x98, 0x10, 0xA3, 0x09, 0x14, 0xDF, 0xF4 }
-};
-
-static const unsigned char aes_test_cfb128_iv[16] =
-{
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-    0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F
-};
-
-static const unsigned char aes_test_cfb128_pt[64] =
-{
-    0x6B, 0xC1, 0xBE, 0xE2, 0x2E, 0x40, 0x9F, 0x96,
-    0xE9, 0x3D, 0x7E, 0x11, 0x73, 0x93, 0x17, 0x2A,
-    0xAE, 0x2D, 0x8A, 0x57, 0x1E, 0x03, 0xAC, 0x9C,
-    0x9E, 0xB7, 0x6F, 0xAC, 0x45, 0xAF, 0x8E, 0x51,
-    0x30, 0xC8, 0x1C, 0x46, 0xA3, 0x5C, 0xE4, 0x11,
-    0xE5, 0xFB, 0xC1, 0x19, 0x1A, 0x0A, 0x52, 0xEF,
-    0xF6, 0x9F, 0x24, 0x45, 0xDF, 0x4F, 0x9B, 0x17,
-    0xAD, 0x2B, 0x41, 0x7B, 0xE6, 0x6C, 0x37, 0x10
-};
-
-static const unsigned char aes_test_cfb128_ct[3][64] =
-{
-    { 0x3B, 0x3F, 0xD9, 0x2E, 0xB7, 0x2D, 0xAD, 0x20,
-      0x33, 0x34, 0x49, 0xF8, 0xE8, 0x3C, 0xFB, 0x4A,
-      0xC8, 0xA6, 0x45, 0x37, 0xA0, 0xB3, 0xA9, 0x3F,
-      0xCD, 0xE3, 0xCD, 0xAD, 0x9F, 0x1C, 0xE5, 0x8B,
-      0x26, 0x75, 0x1F, 0x67, 0xA3, 0xCB, 0xB1, 0x40,
-      0xB1, 0x80, 0x8C, 0xF1, 0x87, 0xA4, 0xF4, 0xDF,
-      0xC0, 0x4B, 0x05, 0x35, 0x7C, 0x5D, 0x1C, 0x0E,
-      0xEA, 0xC4, 0xC6, 0x6F, 0x9F, 0xF7, 0xF2, 0xE6 },
-    { 0xCD, 0xC8, 0x0D, 0x6F, 0xDD, 0xF1, 0x8C, 0xAB,
-      0x34, 0xC2, 0x59, 0x09, 0xC9, 0x9A, 0x41, 0x74,
-      0x67, 0xCE, 0x7F, 0x7F, 0x81, 0x17, 0x36, 0x21,
-      0x96, 0x1A, 0x2B, 0x70, 0x17, 0x1D, 0x3D, 0x7A,
-      0x2E, 0x1E, 0x8A, 0x1D, 0xD5, 0x9B, 0x88, 0xB1,
-      0xC8, 0xE6, 0x0F, 0xED, 0x1E, 0xFA, 0xC4, 0xC9,
-      0xC0, 0x5F, 0x9F, 0x9C, 0xA9, 0x83, 0x4F, 0xA0,
-      0x42, 0xAE, 0x8F, 0xBA, 0x58, 0x4B, 0x09, 0xFF },
-    { 0xDC, 0x7E, 0x84, 0xBF, 0xDA, 0x79, 0x16, 0x4B,
-      0x7E, 0xCD, 0x84, 0x86, 0x98, 0x5D, 0x38, 0x60,
-      0x39, 0xFF, 0xED, 0x14, 0x3B, 0x28, 0xB1, 0xC8,
-      0x32, 0x11, 0x3C, 0x63, 0x31, 0xE5, 0x40, 0x7B,
-      0xDF, 0x10, 0x13, 0x24, 0x15, 0xE5, 0x4B, 0x92,
-      0xA1, 0x3E, 0xD0, 0xA8, 0x26, 0x7A, 0xE2, 0xF9,
-      0x75, 0xA3, 0x85, 0x74, 0x1A, 0xB9, 0xCE, 0xF8,
-      0x20, 0x31, 0x62, 0x3D, 0x55, 0xB1, 0xE4, 0x71 }
-};
-#endif /* POLARSSL_CIPHER_MODE_CFB */
-
-#if defined(POLARSSL_CIPHER_MODE_CTR)
-/*
- * AES-CTR test vectors from:
- *
- * http://www.faqs.org/rfcs/rfc3686.html
- */
-
-static const unsigned char aes_test_ctr_key[3][16] =
-{
-    { 0xAE, 0x68, 0x52, 0xF8, 0x12, 0x10, 0x67, 0xCC,
-      0x4B, 0xF7, 0xA5, 0x76, 0x55, 0x77, 0xF3, 0x9E },
-    { 0x7E, 0x24, 0x06, 0x78, 0x17, 0xFA, 0xE0, 0xD7,
-      0x43, 0xD6, 0xCE, 0x1F, 0x32, 0x53, 0x91, 0x63 },
-    { 0x76, 0x91, 0xBE, 0x03, 0x5E, 0x50, 0x20, 0xA8,
-      0xAC, 0x6E, 0x61, 0x85, 0x29, 0xF9, 0xA0, 0xDC }
-};
-
-static const unsigned char aes_test_ctr_nonce_counter[3][16] =
-{
-    { 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 },
-    { 0x00, 0x6C, 0xB6, 0xDB, 0xC0, 0x54, 0x3B, 0x59,
-      0xDA, 0x48, 0xD9, 0x0B, 0x00, 0x00, 0x00, 0x01 },
-    { 0x00, 0xE0, 0x01, 0x7B, 0x27, 0x77, 0x7F, 0x3F,
-      0x4A, 0x17, 0x86, 0xF0, 0x00, 0x00, 0x00, 0x01 }
-};
-
-static const unsigned char aes_test_ctr_pt[3][48] =
-{
-    { 0x53, 0x69, 0x6E, 0x67, 0x6C, 0x65, 0x20, 0x62,
-      0x6C, 0x6F, 0x63, 0x6B, 0x20, 0x6D, 0x73, 0x67 },
-
-    { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-      0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
-      0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
-      0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F },
-
-    { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-      0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
-      0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
-      0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F,
-      0x20, 0x21, 0x22, 0x23 }
-};
-
-static const unsigned char aes_test_ctr_ct[3][48] =
-{
-    { 0xE4, 0x09, 0x5D, 0x4F, 0xB7, 0xA7, 0xB3, 0x79,
-      0x2D, 0x61, 0x75, 0xA3, 0x26, 0x13, 0x11, 0xB8 },
-    { 0x51, 0x04, 0xA1, 0x06, 0x16, 0x8A, 0x72, 0xD9,
-      0x79, 0x0D, 0x41, 0xEE, 0x8E, 0xDA, 0xD3, 0x88,
-      0xEB, 0x2E, 0x1E, 0xFC, 0x46, 0xDA, 0x57, 0xC8,
-      0xFC, 0xE6, 0x30, 0xDF, 0x91, 0x41, 0xBE, 0x28 },
-    { 0xC1, 0xCF, 0x48, 0xA8, 0x9F, 0x2F, 0xFD, 0xD9,
-      0xCF, 0x46, 0x52, 0xE9, 0xEF, 0xDB, 0x72, 0xD7,
-      0x45, 0x40, 0xA4, 0x2B, 0xDE, 0x6D, 0x78, 0x36,
-      0xD5, 0x9A, 0x5C, 0xEA, 0xAE, 0xF3, 0x10, 0x53,
-      0x25, 0xB2, 0x07, 0x2F }
-};
-
-static const int aes_test_ctr_len[3] =
-    { 16, 32, 36 };
-#endif /* POLARSSL_CIPHER_MODE_CTR */
-
-/*
- * Checkup routine
- */
-int aes_self_test( int verbose )
-{
-    int ret = 0, i, j, u, v;
-    unsigned char key[32];
-    unsigned char buf[64];
-    unsigned char iv[16];
-#if defined(POLARSSL_CIPHER_MODE_CBC)
-    unsigned char prv[16];
-#endif
-#if defined(POLARSSL_CIPHER_MODE_CTR) || defined(POLARSSL_CIPHER_MODE_CFB)
-    size_t offset;
-#endif
-#if defined(POLARSSL_CIPHER_MODE_CTR)
-    int len;
-    unsigned char nonce_counter[16];
-    unsigned char stream_block[16];
-#endif
-    aes_context ctx;
-
-    memset( key, 0, 32 );
-    aes_init( &ctx );
-
-    /*
-     * ECB mode
-     */
-    for( i = 0; i < 6; i++ )
-    {
-        u = i >> 1;
-        v = i  & 1;
-
-        if( verbose != 0 )
-            polarssl_printf( "  AES-ECB-%3d (%s): ", 128 + u * 64,
-                             ( v == AES_DECRYPT ) ? "dec" : "enc" );
-
-        memset( buf, 0, 16 );
-
-        if( v == AES_DECRYPT )
-        {
-            aes_setkey_dec( &ctx, key, 128 + u * 64 );
-
-            for( j = 0; j < 10000; j++ )
-                aes_crypt_ecb( &ctx, v, buf, buf );
-
-            if( memcmp( buf, aes_test_ecb_dec[u], 16 ) != 0 )
-            {
-                if( verbose != 0 )
-                    polarssl_printf( "failed\n" );
-
-                ret = 1;
-                goto exit;
-            }
-        }
-        else
-        {
-            aes_setkey_enc( &ctx, key, 128 + u * 64 );
-
-            for( j = 0; j < 10000; j++ )
-                aes_crypt_ecb( &ctx, v, buf, buf );
-
-            if( memcmp( buf, aes_test_ecb_enc[u], 16 ) != 0 )
-            {
-                if( verbose != 0 )
-                    polarssl_printf( "failed\n" );
-
-                ret = 1;
-                goto exit;
-            }
-        }
-
-        if( verbose != 0 )
-            polarssl_printf( "passed\n" );
-    }
-
-    if( verbose != 0 )
-        polarssl_printf( "\n" );
-
-#if defined(POLARSSL_CIPHER_MODE_CBC)
-    /*
-     * CBC mode
-     */
-    for( i = 0; i < 6; i++ )
-    {
-        u = i >> 1;
-        v = i  & 1;
-
-        if( verbose != 0 )
-            polarssl_printf( "  AES-CBC-%3d (%s): ", 128 + u * 64,
-                             ( v == AES_DECRYPT ) ? "dec" : "enc" );
-
-        memset( iv , 0, 16 );
-        memset( prv, 0, 16 );
-        memset( buf, 0, 16 );
-
-        if( v == AES_DECRYPT )
-        {
-            aes_setkey_dec( &ctx, key, 128 + u * 64 );
-
-            for( j = 0; j < 10000; j++ )
-                aes_crypt_cbc( &ctx, v, 16, iv, buf, buf );
-
-            if( memcmp( buf, aes_test_cbc_dec[u], 16 ) != 0 )
-            {
-                if( verbose != 0 )
-                    polarssl_printf( "failed\n" );
-
-                ret = 1;
-                goto exit;
-            }
-        }
-        else
-        {
-            aes_setkey_enc( &ctx, key, 128 + u * 64 );
-
-            for( j = 0; j < 10000; j++ )
-            {
-                unsigned char tmp[16];
-
-                aes_crypt_cbc( &ctx, v, 16, iv, buf, buf );
-
-                memcpy( tmp, prv, 16 );
-                memcpy( prv, buf, 16 );
-                memcpy( buf, tmp, 16 );
-            }
-
-            if( memcmp( prv, aes_test_cbc_enc[u], 16 ) != 0 )
-            {
-                if( verbose != 0 )
-                    polarssl_printf( "failed\n" );
-
-                ret = 1;
-                goto exit;
-            }
-        }
-
-        if( verbose != 0 )
-            polarssl_printf( "passed\n" );
-    }
-
-    if( verbose != 0 )
-        polarssl_printf( "\n" );
-#endif /* POLARSSL_CIPHER_MODE_CBC */
-
-#if defined(POLARSSL_CIPHER_MODE_CFB)
-    /*
-     * CFB128 mode
-     */
-    for( i = 0; i < 6; i++ )
-    {
-        u = i >> 1;
-        v = i  & 1;
-
-        if( verbose != 0 )
-            polarssl_printf( "  AES-CFB128-%3d (%s): ", 128 + u * 64,
-                             ( v == AES_DECRYPT ) ? "dec" : "enc" );
-
-        memcpy( iv,  aes_test_cfb128_iv, 16 );
-        memcpy( key, aes_test_cfb128_key[u], 16 + u * 8 );
-
-        offset = 0;
-        aes_setkey_enc( &ctx, key, 128 + u * 64 );
-
-        if( v == AES_DECRYPT )
-        {
-            memcpy( buf, aes_test_cfb128_ct[u], 64 );
-            aes_crypt_cfb128( &ctx, v, 64, &offset, iv, buf, buf );
-
-            if( memcmp( buf, aes_test_cfb128_pt, 64 ) != 0 )
-            {
-                if( verbose != 0 )
-                    polarssl_printf( "failed\n" );
-
-                ret = 1;
-                goto exit;
-            }
-        }
-        else
-        {
-            memcpy( buf, aes_test_cfb128_pt, 64 );
-            aes_crypt_cfb128( &ctx, v, 64, &offset, iv, buf, buf );
-
-            if( memcmp( buf, aes_test_cfb128_ct[u], 64 ) != 0 )
-            {
-                if( verbose != 0 )
-                    polarssl_printf( "failed\n" );
-
-                ret = 1;
-                goto exit;
-            }
-        }
-
-        if( verbose != 0 )
-            polarssl_printf( "passed\n" );
-    }
-
-    if( verbose != 0 )
-        polarssl_printf( "\n" );
-#endif /* POLARSSL_CIPHER_MODE_CFB */
-
-#if defined(POLARSSL_CIPHER_MODE_CTR)
-    /*
-     * CTR mode
-     */
-    for( i = 0; i < 6; i++ )
-    {
-        u = i >> 1;
-        v = i  & 1;
-
-        if( verbose != 0 )
-            polarssl_printf( "  AES-CTR-128 (%s): ",
-                             ( v == AES_DECRYPT ) ? "dec" : "enc" );
-
-        memcpy( nonce_counter, aes_test_ctr_nonce_counter[u], 16 );
-        memcpy( key, aes_test_ctr_key[u], 16 );
-
-        offset = 0;
-        aes_setkey_enc( &ctx, key, 128 );
-
-        if( v == AES_DECRYPT )
-        {
-            len = aes_test_ctr_len[u];
-            memcpy( buf, aes_test_ctr_ct[u], len );
-
-            aes_crypt_ctr( &ctx, len, &offset, nonce_counter, stream_block,
-                           buf, buf );
-
-            if( memcmp( buf, aes_test_ctr_pt[u], len ) != 0 )
-            {
-                if( verbose != 0 )
-                    polarssl_printf( "failed\n" );
-
-                ret = 1;
-                goto exit;
-            }
-        }
-        else
-        {
-            len = aes_test_ctr_len[u];
-            memcpy( buf, aes_test_ctr_pt[u], len );
-
-            aes_crypt_ctr( &ctx, len, &offset, nonce_counter, stream_block,
-                           buf, buf );
-
-            if( memcmp( buf, aes_test_ctr_ct[u], len ) != 0 )
-            {
-                if( verbose != 0 )
-                    polarssl_printf( "failed\n" );
-
-                ret = 1;
-                goto exit;
-            }
-        }
-
-        if( verbose != 0 )
-            polarssl_printf( "passed\n" );
-    }
-
-    if( verbose != 0 )
-        polarssl_printf( "\n" );
-#endif /* POLARSSL_CIPHER_MODE_CTR */
-
-    ret = 0;
-
-exit:
-    aes_free( &ctx );
-
-    return( ret );
-}
-
-#endif /* POLARSSL_SELF_TEST */
-
-#endif /* POLARSSL_AES_C */
diff --git a/common/polarssl/aes.h b/common/polarssl/aes.h
deleted file mode 100644
index 299cb4cdf..000000000
--- a/common/polarssl/aes.h
+++ /dev/null
@@ -1,256 +0,0 @@
-/**
- * \file aes.h
- *
- * \brief AES block cipher
- *
- *  Copyright (C) 2006-2014, Brainspark B.V.
- *
- *  This file is part of PolarSSL (http://www.polarssl.org)
- *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
- *
- *  All rights reserved.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifndef POLARSSL_AES_H
-#define POLARSSL_AES_H
-
-#if !defined(POLARSSL_CONFIG_FILE)
-#include "polarssl_config.h"
-#else
-#include POLARSSL_CONFIG_FILE
-#endif
-
-#include <string.h>
-
-#if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32)
-#include <basetsd.h>
-typedef UINT32 uint32_t;
-#else
-#include <inttypes.h>
-#endif
-
-/* padlock.c and aesni.c rely on these values! */
-#define AES_ENCRYPT     1
-#define AES_DECRYPT     0
-
-#define POLARSSL_ERR_AES_INVALID_KEY_LENGTH                -0x0020  /**< Invalid key length. */
-#define POLARSSL_ERR_AES_INVALID_INPUT_LENGTH              -0x0022  /**< Invalid data input length. */
-
-#if !defined(POLARSSL_AES_ALT)
-// Regular implementation
-//
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * \brief          AES context structure
- *
- * \note           buf is able to hold 32 extra bytes, which can be used:
- *                 - for alignment purposes if VIA padlock is used, and/or
- *                 - to simplify key expansion in the 256-bit case by
- *                 generating an extra round key
- */
-typedef struct
-{
-    int nr;                     /*!<  number of rounds  */
-    uint32_t *rk;               /*!<  AES round keys    */
-    uint32_t buf[68];           /*!<  unaligned data    */
-}
-aes_context;
-
-/**
- * \brief          Initialize AES context
- *
- * \param ctx      AES context to be initialized
- */
-void aes_init( aes_context *ctx );
-
-/**
- * \brief          Clear AES context
- *
- * \param ctx      AES context to be cleared
- */
-void aes_free( aes_context *ctx );
-
-/**
- * \brief          AES key schedule (encryption)
- *
- * \param ctx      AES context to be initialized
- * \param key      encryption key
- * \param keysize  must be 128, 192 or 256
- *
- * \return         0 if successful, or POLARSSL_ERR_AES_INVALID_KEY_LENGTH
- */
-int aes_setkey_enc( aes_context *ctx, const unsigned char *key,
-                    unsigned int keysize );
-
-/**
- * \brief          AES key schedule (decryption)
- *
- * \param ctx      AES context to be initialized
- * \param key      decryption key
- * \param keysize  must be 128, 192 or 256
- *
- * \return         0 if successful, or POLARSSL_ERR_AES_INVALID_KEY_LENGTH
- */
-int aes_setkey_dec( aes_context *ctx, const unsigned char *key,
-                    unsigned int keysize );
-
-/**
- * \brief          AES-ECB block encryption/decryption
- *
- * \param ctx      AES context
- * \param mode     AES_ENCRYPT or AES_DECRYPT
- * \param input    16-byte input block
- * \param output   16-byte output block
- *
- * \return         0 if successful
- */
-int aes_crypt_ecb( aes_context *ctx,
-                    int mode,
-                    const unsigned char input[16],
-                    unsigned char output[16] );
-#if defined(POLARSSL_CIPHER_MODE_CBC)
-/**
- * \brief          AES-CBC buffer encryption/decryption
- *                 Length should be a multiple of the block
- *                 size (16 bytes)
- *
- * \param ctx      AES context
- * \param mode     AES_ENCRYPT or AES_DECRYPT
- * \param length   length of the input data
- * \param iv       initialization vector (updated after use)
- * \param input    buffer holding the input data
- * \param output   buffer holding the output data
- *
- * \return         0 if successful, or POLARSSL_ERR_AES_INVALID_INPUT_LENGTH
- */
-int aes_crypt_cbc( aes_context *ctx,
-                    int mode,
-                    size_t length,
-                    unsigned char iv[16],
-                    const unsigned char *input,
-                    unsigned char *output );
-#endif /* POLARSSL_CIPHER_MODE_CBC */
-
-#if defined(POLARSSL_CIPHER_MODE_CFB)
-/**
- * \brief          AES-CFB128 buffer encryption/decryption.
- *
- * Note: Due to the nature of CFB you should use the same key schedule for
- * both encryption and decryption. So a context initialized with
- * aes_setkey_enc() for both AES_ENCRYPT and AES_DECRYPT.
- *
- * \param ctx      AES context
- * \param mode     AES_ENCRYPT or AES_DECRYPT
- * \param length   length of the input data
- * \param iv_off   offset in IV (updated after use)
- * \param iv       initialization vector (updated after use)
- * \param input    buffer holding the input data
- * \param output   buffer holding the output data
- *
- * \return         0 if successful
- */
-int aes_crypt_cfb128( aes_context *ctx,
-                       int mode,
-                       size_t length,
-                       size_t *iv_off,
-                       unsigned char iv[16],
-                       const unsigned char *input,
-                       unsigned char *output );
-
-/**
- * \brief          AES-CFB8 buffer encryption/decryption.
- *
- * Note: Due to the nature of CFB you should use the same key schedule for
- * both encryption and decryption. So a context initialized with
- * aes_setkey_enc() for both AES_ENCRYPT and AES_DECRYPT.
- *
- * \param ctx      AES context
- * \param mode     AES_ENCRYPT or AES_DECRYPT
- * \param length   length of the input data
- * \param iv       initialization vector (updated after use)
- * \param input    buffer holding the input data
- * \param output   buffer holding the output data
- *
- * \return         0 if successful
- */
-int aes_crypt_cfb8( aes_context *ctx,
-                    int mode,
-                    size_t length,
-                    unsigned char iv[16],
-                    const unsigned char *input,
-                    unsigned char *output );
-#endif /*POLARSSL_CIPHER_MODE_CFB */
-
-#if defined(POLARSSL_CIPHER_MODE_CTR)
-/**
- * \brief               AES-CTR buffer encryption/decryption
- *
- * Warning: You have to keep the maximum use of your counter in mind!
- *
- * Note: Due to the nature of CTR you should use the same key schedule for
- * both encryption and decryption. So a context initialized with
- * aes_setkey_enc() for both AES_ENCRYPT and AES_DECRYPT.
- *
- * \param ctx           AES context
- * \param length        The length of the data
- * \param nc_off        The offset in the current stream_block (for resuming
- *                      within current cipher stream). The offset pointer to
- *                      should be 0 at the start of a stream.
- * \param nonce_counter The 128-bit nonce and counter.
- * \param stream_block  The saved stream-block for resuming. Is overwritten
- *                      by the function.
- * \param input         The input data stream
- * \param output        The output data stream
- *
- * \return         0 if successful
- */
-int aes_crypt_ctr( aes_context *ctx,
-                       size_t length,
-                       size_t *nc_off,
-                       unsigned char nonce_counter[16],
-                       unsigned char stream_block[16],
-                       const unsigned char *input,
-                       unsigned char *output );
-#endif /* POLARSSL_CIPHER_MODE_CTR */
-
-#ifdef __cplusplus
-}
-#endif
-
-#else  /* POLARSSL_AES_ALT */
-#include "aes_alt.h"
-#endif /* POLARSSL_AES_ALT */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * \brief          Checkup routine
- *
- * \return         0 if successful, or 1 if the test failed
- */
-int aes_self_test( int verbose );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* aes.h */
diff --git a/common/polarssl/aes_cmac128.c b/common/polarssl/aes_cmac128.c
deleted file mode 100644
index 595f89b8d..000000000
--- a/common/polarssl/aes_cmac128.c
+++ /dev/null
@@ -1,322 +0,0 @@
-/*
- *  AES-CMAC from NIST Special Publication 800-38B � Recommendation for block cipher modes of operation: The CMAC mode for authentication.
- *
- *  Copyright (C) 2006-2014, Brainspark B.V.
- *  Copyright (C) 2014, Anargyros Plemenos
- *  Tests added Merkok, 2018
- *
- *  This file is part of PolarSSL (http://www.polarssl.org)
- *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
- *
- *  All rights reserved.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- *  Reference : https://polarssl.org/discussions/generic/authentication-token
- *  NIST Special Publication 800-38B � Recommendation for block cipher modes of operation: The CMAC mode for authentication.
- *  Tests here:
- *  https://csrc.nist.gov/CSRC/media/Projects/Cryptographic-Standards-and-Guidelines/documents/examples/AES_CMAC.pdf
-*/
-
-#include "polarssl/aes_cmac128.h"
-#include <stdio.h>
-
-#define MIN(a,b)           ((a)<(b)?(a):(b))
-#define _MSB(x)            (((x)[0] & 0x80)?1:0)
-
-#if !defined(POLARSSL_CONFIG_FILE)
-#include "polarssl_config.h"
-#else
-#include POLARSSL_CONFIG_FILE
-#endif
-
-#if defined(POLARSSL_AES_C)
-#include "aes.h"
-#endif
-
-#if defined(POLARSSL_PLATFORM_C)
-#include "polarssl/platform.h"
-#else
-#define polarssl_printf printf
-#endif
-
-
-/** 
- * zero a structure 
- */
-#define ZERO_STRUCT(x)      memset((char *)&(x), 0, sizeof(x))
-
-/** 
- * zero a structure given a pointer to the structure 
- */
-#define ZERO_STRUCTP(x)     do{ if((x) != NULL) memset((char *)(x), 0, sizeof(*(x)));} while(0)
-
-
-/* For CMAC Calculation */
-static unsigned char const_Rb[16] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x87
-};
-static unsigned char const_Zero[16] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-};
-
-static inline void aes_cmac_128_left_shift_1(const uint8_t in[16], uint8_t out[16])
-{
-	uint8_t overflow = 0;
-	int8_t i;
-
-	for (i = 15; i >= 0; i--) {
-		out[i] = in[i] << 1;
-		out[i] |= overflow;
-		overflow = _MSB(&in[i]);
-	 } 
-}
-
-static inline void aes_cmac_128_xor(const uint8_t in1[16], const uint8_t in2[16], 
-										uint8_t out[16])
-{
-	uint8_t i;
-
-	for (i = 0; i < 16; i++) {
-		out[i] = in1[i] ^ in2[i];
-	}
-}
-
-/*
- * AES-CMAC-128 context setup
- */
-void aes_cmac128_starts(aes_cmac128_context *ctx, const uint8_t K[16])
-{
-	uint8_t L[16];
-
-	/* Zero struct of aes_context */
-	ZERO_STRUCTP(ctx);
-	/* Initialize aes_context */
-	aes_setkey_enc(&ctx->aes_key, K, 128);
-
-	/* step 1 - generate subkeys k1 and k2 */
-	aes_crypt_ecb(&ctx->aes_key, AES_ENCRYPT, const_Zero, L);
-
-	if (_MSB(L) == 0) {
-		aes_cmac_128_left_shift_1(L, ctx->K1);
-	} else {
-		uint8_t tmp_block[16];
-
-		aes_cmac_128_left_shift_1(L, tmp_block);
-		aes_cmac_128_xor(tmp_block, const_Rb, ctx->K1);
-		ZERO_STRUCT(tmp_block);
-	}
-
-	if (_MSB(ctx->K1) == 0) {
-		aes_cmac_128_left_shift_1(ctx->K1, ctx->K2);
-	} else {
-		uint8_t tmp_block[16];
-
-		aes_cmac_128_left_shift_1(ctx->K1, tmp_block);
-		aes_cmac_128_xor(tmp_block, const_Rb, ctx->K2);
-		ZERO_STRUCT(tmp_block);
-   }
-
-	ZERO_STRUCT(L);
-}
-
-/*
- * AES-CMAC-128 process message
- */
-void aes_cmac128_update(aes_cmac128_context *ctx, const uint8_t *_msg, size_t _msg_len)
-{
-	uint8_t tmp_block[16];
-	uint8_t Y[16];
-	const uint8_t *msg = _msg;
-	size_t msg_len = _msg_len;
-
-	/*
-	 * copy the remembered last block
-	 */
-	ZERO_STRUCT(tmp_block);
-	if (ctx->last_len) {
-		memcpy(tmp_block, ctx->last, ctx->last_len);
-	}
-
-	/*
-	 * check if we expand the block
-	 */
-	if (ctx->last_len < 16) {
-		size_t len = MIN(16 - ctx->last_len, msg_len);
-
-		memcpy(&tmp_block[ctx->last_len], msg, len);
-		memcpy(ctx->last, tmp_block, 16);
-		msg += len;
-		msg_len -= len;
-		ctx->last_len += len;
-	}
-
-	if (msg_len == 0) {
-		/* if it is still the last block, we are done */
-		ZERO_STRUCT(tmp_block);
-		return;
-	}
-
-	/*
-	 * It is not the last block anymore
-	 */
-	ZERO_STRUCT(ctx->last);
-	ctx->last_len = 0;
-
-	/*
-	 * now checksum everything but the last block
-	 */
-	aes_cmac_128_xor(ctx->X, tmp_block, Y);
-	aes_crypt_ecb(&ctx->aes_key, AES_ENCRYPT, Y, ctx->X);
-
-	while (msg_len > 16) {
-		memcpy(tmp_block, msg, 16);
-		msg += 16;
-		msg_len -= 16;
-
-		aes_cmac_128_xor(ctx->X, tmp_block, Y);
-		aes_crypt_ecb(&ctx->aes_key, AES_ENCRYPT, Y, ctx->X);
-	}
-
-	/*
-	 * copy the last block, it will be processed in
-	 * aes_cmac128_final().
-	 */
-	 memcpy(ctx->last, msg, msg_len);
-	 ctx->last_len = msg_len;
-
-	ZERO_STRUCT(tmp_block);
-	ZERO_STRUCT(Y);
-}
-
-/*
- * AES-CMAC-128 compute T
- */
-void aes_cmac128_final(aes_cmac128_context *ctx, uint8_t T[16])
-{
-	uint8_t tmp_block[16];
-	uint8_t Y[16];
-
-	if (ctx->last_len < 16) {
-		ctx->last[ctx->last_len] = 0x80;
-		aes_cmac_128_xor(ctx->last, ctx->K2, tmp_block);
-	} else {
-		aes_cmac_128_xor(ctx->last, ctx->K1, tmp_block);
-	}
-
-	aes_cmac_128_xor(tmp_block, ctx->X, Y);
-	aes_crypt_ecb(&ctx->aes_key, AES_ENCRYPT, Y, T);
-
-	ZERO_STRUCT(tmp_block);
-	ZERO_STRUCT(Y);
-	ZERO_STRUCTP(ctx);
-}
-
-/*
- * Checkup routine
- * 
- * https://csrc.nist.gov/projects/cryptographic-standards-and-guidelines/example-values
- * https://csrc.nist.gov/CSRC/media/Projects/Cryptographic-Standards-and-Guidelines/documents/examples/AES_CMAC.pdf
- */
-int aes_cmac_self_test( int verbose )
-{
-	unsigned char key[16] = {0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6, 0xAB, 0xF7, 0x15, 0x88, 0x09, 0xCF, 0x4F, 0x3C};
-	unsigned char mac[16] = {0};
-	aes_cmac128_context ctx;
-	int ret;
-
-	// check Example1:
-	if( verbose != 0 )
-		polarssl_printf( "  AES-CMAC-128 zero length data: " );
-	unsigned char ex1data[16] = {0};
-	aes_cmac128_starts(&ctx, key);
-	aes_cmac128_update(&ctx, ex1data, 0);
-	aes_cmac128_final(&ctx, mac);
-	unsigned char ex1res[16] = {0xBB, 0x1D, 0x69, 0x29, 0xE9, 0x59, 0x37, 0x28, 0x7F, 0xA3, 0x7D, 0x12, 0x9B, 0x75, 0x67, 0x46};
-	if(!memcmp(mac, ex1res, 16)) {
-		if( verbose != 0 )
-			polarssl_printf( "passed\n" );
-	} else {
-		polarssl_printf( "failed\n" );
-		ret = 1;
-		goto exit;
-	}
-
-	// check Example2:
-	if( verbose != 0 )    
-		polarssl_printf( "  AES-CMAC-128 one block data  : " );
-	unsigned char ex2data[16] = {0x6B, 0xC1, 0xBE, 0xE2, 0x2E, 0x40, 0x9F, 0x96, 0xE9, 0x3D, 0x7E, 0x11, 0x73, 0x93, 0x17, 0x2A};
-	aes_cmac128_starts(&ctx, key);
-	aes_cmac128_update(&ctx, ex2data, sizeof(ex2data));
-	aes_cmac128_final(&ctx, mac);
-	unsigned char ex2res[16] = {0x07, 0x0A, 0x16, 0xB4, 0x6B, 0x4D, 0x41, 0x44, 0xF7, 0x9B, 0xDD, 0x9D, 0xD0, 0x4A, 0x28, 0x7C};
-	if(!memcmp(mac, ex2res, 16)) {
-		if( verbose != 0 )
-			polarssl_printf( "passed\n" );
-	} else {
-		polarssl_printf( "failed\n" );
-		ret = 1;
-		goto exit;
-	}
-	
-	// check Example3:
-	if( verbose != 0 )
-		polarssl_printf( "  AES-CMAC-128 20 bytes of data: " );
-	unsigned char ex3data[20] = {0x6B, 0xC1, 0xBE, 0xE2, 0x2E, 0x40, 0x9F, 0x96, 0xE9, 0x3D, 0x7E, 0x11, 0x73, 0x93, 0x17, 0x2A, 
-								 0xAE, 0x2D, 0x8A, 0x57};
-	aes_cmac128_starts(&ctx, key);
-	aes_cmac128_update(&ctx, ex3data, sizeof(ex3data));
-	aes_cmac128_final(&ctx, mac);
-	unsigned char ex3res[16] = {0x7D, 0x85, 0x44, 0x9E, 0xA6, 0xEA, 0x19, 0xC8, 0x23, 0xA7, 0xBF, 0x78, 0x83, 0x7D, 0xFA, 0xDE};
-	if(!memcmp(mac, ex3res, 16)) {
-		if( verbose != 0 )
-			polarssl_printf( "passed\n" );
-	} else {
-		polarssl_printf( "failed\n" );
-		ret = 1;
-		goto exit;
-	}
-
-	// check Example4:
-	if( verbose != 0 )
-		polarssl_printf( "  AES-CMAC-128 4 blocks of data: " );
-	unsigned char ex4data[64] = {0x6B, 0xC1, 0xBE, 0xE2, 0x2E, 0x40, 0x9F, 0x96, 0xE9, 0x3D, 0x7E, 0x11, 0x73, 0x93, 0x17, 0x2A,
-								 0xAE, 0x2D, 0x8A, 0x57, 0x1E, 0x03, 0xAC, 0x9C, 0x9E, 0xB7, 0x6F, 0xAC, 0x45, 0xAF, 0x8E, 0x51,
-								 0x30, 0xC8, 0x1C, 0x46, 0xA3, 0x5C, 0xE4, 0x11, 0xE5, 0xFB, 0xC1, 0x19, 0x1A, 0x0A, 0x52, 0xEF,
-								 0xF6, 0x9F, 0x24, 0x45, 0xDF, 0x4F, 0x9B, 0x17, 0xAD, 0x2B, 0x41, 0x7B, 0xE6, 0x6C, 0x37, 0x10};
-	aes_cmac128_starts(&ctx, key);
-	aes_cmac128_update(&ctx, ex4data, sizeof(ex4data));
-	aes_cmac128_final(&ctx, mac);
-	unsigned char ex4res[16] = {0x51, 0xF0, 0xBE, 0xBF, 0x7E, 0x3B, 0x9D, 0x92, 0xFC, 0x49, 0x74, 0x17, 0x79, 0x36, 0x3C, 0xFE};
-	if(!memcmp(mac, ex4res, 16)) {
-		if( verbose != 0 )
-			polarssl_printf( "passed\n" );
-	} else {
-		polarssl_printf( "failed\n" );
-		ret = 1;
-		goto exit;
-	}
-
-	if( verbose != 0 )
-		polarssl_printf( "\n" );
-
-	ret = 0;
-
-exit:
-	return( ret );
-}
-
diff --git a/common/polarssl/aes_cmac128.h b/common/polarssl/aes_cmac128.h
deleted file mode 100644
index b792755fc..000000000
--- a/common/polarssl/aes_cmac128.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- *  AES-CMAC from NIST Special Publication 800-38B � Recommendation for block cipher modes of operation: The CMAC mode for authentication.
- *
- *  Copyright (C) 2006-2014, Brainspark B.V.
- *  Copyright (C) 2014, Anargyros Plemenos
- *  Tests added Merkok, 2018
- *
- *  This file is part of PolarSSL (http://www.polarssl.org)
- *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
- *
- *  All rights reserved.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- *  Reference : https://polarssl.org/discussions/generic/authentication-token
- *  NIST Special Publication 800-38B � Recommendation for block cipher modes of operation: The CMAC mode for authentication.
- *  Tests here:
- *  https://csrc.nist.gov/CSRC/media/Projects/Cryptographic-Standards-and-Guidelines/documents/examples/AES_CMAC.pdf
-*/
-
-#include <stdint.h>
-#include <stddef.h>
-#include "aes.h"
-
-typedef struct aes_cmac_128_context {
-    aes_context aes_key;
-
-    uint8_t K1[16];
-    uint8_t K2[16];
-
-    uint8_t X[16];
-
-    uint8_t last[16];
-    size_t last_len;
-}
-aes_cmac128_context;
-
-/*
- * \brief AES-CMAC-128 context setup
- *
- * \param ctx      context to be initialized
- * \param key      secret key for AES-128
- */
-void aes_cmac128_starts(aes_cmac128_context *ctx, const uint8_t K[16]);
-
-/*
- * \brief AES-CMAC-128 process message
- *
- * \param ctx      context to be initialized
- * \param _msg     the given message
- * \param _msg_len the length of message
- */
-void aes_cmac128_update(aes_cmac128_context *ctx, const uint8_t *_msg, size_t _msg_len);
-
-/*
- * \brief AES-CMAC-128 compute T
- *
- * \param ctx      context to be initialized
- * \param T        the generated MAC which is used to validate the message
- */
-void aes_cmac128_final(aes_cmac128_context *ctx, uint8_t T[16]);
-
-/**
- * \brief          Checkup routine
- *
- * \return         0 if successful, or 1 if the test failed
- */
-int aes_cmac_self_test( int verbose );
-
diff --git a/common/polarssl/bignum.c b/common/polarssl/bignum.c
deleted file mode 100644
index d22dd5c7d..000000000
--- a/common/polarssl/bignum.c
+++ /dev/null
@@ -1,2143 +0,0 @@
-/*
- *  Multi-precision integer library
- *
- *  Copyright (C) 2006-2010, Brainspark B.V.
- *
- *  This file is part of PolarSSL (http://www.polarssl.org)
- *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
- *
- *  All rights reserved.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-/*
- *  This MPI implementation is based on:
- *
- *  http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf
- *  http://www.stillhq.com/extracted/gnupg-api/mpi/
- *  http://math.libtomcrypt.com/files/tommath.pdf
- */
-
-#include "polarssl_config.h"
-
-#if defined(POLARSSL_BIGNUM_C)
-
-#include "bignum.h"
-#include "bn_mul.h"
-
-#include <stdlib.h>
-
-#define ciL    (sizeof(t_uint))         /* chars in limb  */
-#define biL    (ciL << 3)               /* bits  in limb  */
-#define biH    (ciL << 2)               /* half limb size */
-
-/*
- * Convert between bits/chars and number of limbs
- */
-#define BITS_TO_LIMBS(i)  (((i) + biL - 1) / biL)
-#define CHARS_TO_LIMBS(i) (((i) + ciL - 1) / ciL)
-
-/*
- * Initialize one MPI
- */
-void mpi_init( mpi *X )
-{
-    if( X == NULL )
-        return;
-
-    X->s = 1;
-    X->n = 0;
-    X->p = NULL;
-}
-
-/*
- * Unallocate one MPI
- */
-void mpi_free( mpi *X )
-{
-    if( X == NULL )
-        return;
-
-    if( X->p != NULL )
-    {
-        memset( X->p, 0, X->n * ciL );
-        free( X->p );
-    }
-
-    X->s = 1;
-    X->n = 0;
-    X->p = NULL;
-}
-
-/*
- * Enlarge to the specified number of limbs
- */
-int mpi_grow( mpi *X, size_t nblimbs )
-{
-    t_uint *p;
-
-    if( nblimbs > POLARSSL_MPI_MAX_LIMBS )
-        return( POLARSSL_ERR_MPI_MALLOC_FAILED );
-
-    if( X->n < nblimbs )
-    {
-        if( ( p = (t_uint *) malloc( nblimbs * ciL ) ) == NULL )
-            return( POLARSSL_ERR_MPI_MALLOC_FAILED );
-
-        memset( p, 0, nblimbs * ciL );
-
-        if( X->p != NULL )
-        {
-            memcpy( p, X->p, X->n * ciL );
-            memset( X->p, 0, X->n * ciL );
-            free( X->p );
-        }
-
-        X->n = nblimbs;
-        X->p = p;
-    }
-
-    return( 0 );
-}
-
-/*
- * Copy the contents of Y into X
- */
-int mpi_copy( mpi *X, const mpi *Y )
-{
-    int ret;
-    size_t i;
-
-    if( X == Y )
-        return( 0 );
-
-    for( i = Y->n - 1; i > 0; i-- )
-        if( Y->p[i] != 0 )
-            break;
-    i++;
-
-    X->s = Y->s;
-
-    MPI_CHK( mpi_grow( X, i ) );
-
-    memset( X->p, 0, X->n * ciL );
-    memcpy( X->p, Y->p, i * ciL );
-
-cleanup:
-
-    return( ret );
-}
-
-/*
- * Swap the contents of X and Y
- */
-void mpi_swap( mpi *X, mpi *Y )
-{
-    mpi T;
-
-    memcpy( &T,  X, sizeof( mpi ) );
-    memcpy(  X,  Y, sizeof( mpi ) );
-    memcpy(  Y, &T, sizeof( mpi ) );
-}
-
-/*
- * Set value from integer
- */
-int mpi_lset( mpi *X, t_sint z )
-{
-    int ret;
-
-    MPI_CHK( mpi_grow( X, 1 ) );
-    memset( X->p, 0, X->n * ciL );
-
-    X->p[0] = ( z < 0 ) ? -z : z;
-    X->s    = ( z < 0 ) ? -1 : 1;
-
-cleanup:
-
-    return( ret );
-}
-
-/*
- * Get a specific bit
- */
-int mpi_get_bit( const mpi *X, size_t pos )
-{
-    if( X->n * biL <= pos )
-        return( 0 );
-
-    return ( X->p[pos / biL] >> ( pos % biL ) ) & 0x01;
-}
-
-/*
- * Set a bit to a specific value of 0 or 1
- */
-int mpi_set_bit( mpi *X, size_t pos, unsigned char val )
-{
-    int ret = 0;
-    size_t off = pos / biL;
-    size_t idx = pos % biL;
-
-    if( val != 0 && val != 1 )
-        return POLARSSL_ERR_MPI_BAD_INPUT_DATA;
-        
-    if( X->n * biL <= pos )
-    {
-        if( val == 0 )
-            return ( 0 );
-
-        MPI_CHK( mpi_grow( X, off + 1 ) );
-    }
-
-    X->p[off] = ( X->p[off] & ~( 0x01 << idx ) ) | ( val << idx );
-
-cleanup:
-    
-    return( ret );
-}
-
-/*
- * Return the number of least significant bits
- */
-size_t mpi_lsb( const mpi *X )
-{
-    size_t i, j, count = 0;
-
-    for( i = 0; i < X->n; i++ )
-        for( j = 0; j < biL; j++, count++ )
-            if( ( ( X->p[i] >> j ) & 1 ) != 0 )
-                return( count );
-
-    return( 0 );
-}
-
-/*
- * Return the number of most significant bits
- */
-size_t mpi_msb( const mpi *X )
-{
-    size_t i, j;
-
-    for( i = X->n - 1; i > 0; i-- )
-        if( X->p[i] != 0 )
-            break;
-
-    for( j = biL; j > 0; j-- )
-        if( ( ( X->p[i] >> ( j - 1 ) ) & 1 ) != 0 )
-            break;
-
-    return( ( i * biL ) + j );
-}
-
-/*
- * Return the total size in bytes
- */
-size_t mpi_size( const mpi *X )
-{
-    return( ( mpi_msb( X ) + 7 ) >> 3 );
-}
-
-/*
- * Convert an ASCII character to digit value
- */
-static int mpi_get_digit( t_uint *d, int radix, char c )
-{
-    *d = 255;
-
-    if( c >= 0x30 && c <= 0x39 ) *d = c - 0x30;
-    if( c >= 0x41 && c <= 0x46 ) *d = c - 0x37;
-    if( c >= 0x61 && c <= 0x66 ) *d = c - 0x57;
-
-    if( *d >= (t_uint) radix )
-        return( POLARSSL_ERR_MPI_INVALID_CHARACTER );
-
-    return( 0 );
-}
-
-/*
- * Import from an ASCII string
- */
-int mpi_read_string( mpi *X, int radix, const char *s )
-{
-    int ret;
-    size_t i, j, slen, n;
-    t_uint d;
-    mpi T;
-
-    if( radix < 2 || radix > 16 )
-        return( POLARSSL_ERR_MPI_BAD_INPUT_DATA );
-
-    mpi_init( &T );
-
-    slen = strlen( s );
-
-    if( radix == 16 )
-    {
-        n = BITS_TO_LIMBS( slen << 2 );
-
-        MPI_CHK( mpi_grow( X, n ) );
-        MPI_CHK( mpi_lset( X, 0 ) );
-
-        for( i = slen, j = 0; i > 0; i--, j++ )
-        {
-            if( i == 1 && s[i - 1] == '-' )
-            {
-                X->s = -1;
-                break;
-            }
-
-            MPI_CHK( mpi_get_digit( &d, radix, s[i - 1] ) );
-            X->p[j / (2 * ciL)] |= d << ( (j % (2 * ciL)) << 2 );
-        }
-    }
-    else
-    {
-        MPI_CHK( mpi_lset( X, 0 ) );
-
-        for( i = 0; i < slen; i++ )
-        {
-            if( i == 0 && s[i] == '-' )
-            {
-                X->s = -1;
-                continue;
-            }
-
-            MPI_CHK( mpi_get_digit( &d, radix, s[i] ) );
-            MPI_CHK( mpi_mul_int( &T, X, radix ) );
-
-            if( X->s == 1 )
-            {
-                MPI_CHK( mpi_add_int( X, &T, d ) );
-            }
-            else
-            {
-                MPI_CHK( mpi_sub_int( X, &T, d ) );
-            }
-        }
-    }
-
-cleanup:
-
-    mpi_free( &T );
-
-    return( ret );
-}
-
-/*
- * Helper to write the digits high-order first
- */
-static int mpi_write_hlp( mpi *X, int radix, char **p )
-{
-    int ret;
-    t_uint r;
-
-    if( radix < 2 || radix > 16 )
-        return( POLARSSL_ERR_MPI_BAD_INPUT_DATA );
-
-    MPI_CHK( mpi_mod_int( &r, X, radix ) );
-    MPI_CHK( mpi_div_int( X, NULL, X, radix ) );
-
-    if( mpi_cmp_int( X, 0 ) != 0 )
-        MPI_CHK( mpi_write_hlp( X, radix, p ) );
-
-    if( r < 10 )
-        *(*p)++ = (char)( r + 0x30 );
-    else
-        *(*p)++ = (char)( r + 0x37 );
-
-cleanup:
-
-    return( ret );
-}
-
-/*
- * Export into an ASCII string
- */
-int mpi_write_string( const mpi *X, int radix, char *s, size_t *slen )
-{
-    int ret = 0;
-    size_t n;
-    char *p;
-    mpi T;
-
-    if( radix < 2 || radix > 16 )
-        return( POLARSSL_ERR_MPI_BAD_INPUT_DATA );
-
-    n = mpi_msb( X );
-    if( radix >=  4 ) n >>= 1;
-    if( radix >= 16 ) n >>= 1;
-    n += 3;
-
-    if( *slen < n )
-    {
-        *slen = n;
-        return( POLARSSL_ERR_MPI_BUFFER_TOO_SMALL );
-    }
-
-    p = s;
-    mpi_init( &T );
-
-    if( X->s == -1 )
-        *p++ = '-';
-
-    if( radix == 16 )
-    {
-        int c;
-        size_t i, j, k;
-
-        for( i = X->n, k = 0; i > 0; i-- )
-        {
-            for( j = ciL; j > 0; j-- )
-            {
-                c = ( X->p[i - 1] >> ( ( j - 1 ) << 3) ) & 0xFF;
-
-                if( c == 0 && k == 0 && ( i + j + 3 ) != 0 )
-                    continue;
-
-                *(p++) = "0123456789ABCDEF" [c / 16];
-                *(p++) = "0123456789ABCDEF" [c % 16];
-                k = 1;
-            }
-        }
-    }
-    else
-    {
-        MPI_CHK( mpi_copy( &T, X ) );
-
-        if( T.s == -1 )
-            T.s = 1;
-
-        MPI_CHK( mpi_write_hlp( &T, radix, &p ) );
-    }
-
-    *p++ = '\0';
-    *slen = p - s;
-
-cleanup:
-
-    mpi_free( &T );
-
-    return( ret );
-}
-
-#if defined(POLARSSL_FS_IO)
-/*
- * Read X from an opened file
- */
-int mpi_read_file( mpi *X, int radix, FILE *fin )
-{
-    t_uint d;
-    size_t slen;
-    char *p;
-    /*
-     * Buffer should have space for (short) label and decimal formatted MPI,
-     * newline characters and '\0'
-     */
-    char s[ POLARSSL_MPI_RW_BUFFER_SIZE ];
-
-    memset( s, 0, sizeof( s ) );
-    if( fgets( s, sizeof( s ) - 1, fin ) == NULL )
-        return( POLARSSL_ERR_MPI_FILE_IO_ERROR );
-
-    slen = strlen( s );
-    if( slen == sizeof( s ) - 2 )
-        return( POLARSSL_ERR_MPI_BUFFER_TOO_SMALL );
-
-    if( s[slen - 1] == '\n' ) { slen--; s[slen] = '\0'; }
-    if( s[slen - 1] == '\r' ) { slen--; s[slen] = '\0'; }
-
-    p = s + slen;
-    while( --p >= s )
-        if( mpi_get_digit( &d, radix, *p ) != 0 )
-            break;
-
-    return( mpi_read_string( X, radix, p + 1 ) );
-}
-
-/*
- * Write X into an opened file (or stdout if fout == NULL)
- */
-int mpi_write_file( const char *p, const mpi *X, int radix, FILE *fout )
-{
-    int ret;
-    size_t n, slen, plen;
-    /*
-     * Buffer should have space for (short) label and decimal formatted MPI,
-     * newline characters and '\0'
-     */
-    char s[ POLARSSL_MPI_RW_BUFFER_SIZE ];
-
-    n = sizeof( s );
-    memset( s, 0, n );
-    n -= 2;
-
-    MPI_CHK( mpi_write_string( X, radix, s, (size_t *) &n ) );
-
-    if( p == NULL ) p = "";
-
-    plen = strlen( p );
-    slen = strlen( s );
-    s[slen++] = '\r';
-    s[slen++] = '\n';
-
-    if( fout != NULL )
-    {
-        if( fwrite( p, 1, plen, fout ) != plen ||
-            fwrite( s, 1, slen, fout ) != slen )
-            return( POLARSSL_ERR_MPI_FILE_IO_ERROR );
-    }
-    else
-        printf( "%s%s", p, s );
-
-cleanup:
-
-    return( ret );
-}
-#endif /* POLARSSL_FS_IO */
-
-/*
- * Import X from unsigned binary data, big endian
- */
-int mpi_read_binary( mpi *X, const unsigned char *buf, size_t buflen )
-{
-    int ret;
-    size_t i, j, n;
-
-    for( n = 0; n < buflen; n++ )
-        if( buf[n] != 0 )
-            break;
-
-    MPI_CHK( mpi_grow( X, CHARS_TO_LIMBS( buflen - n ) ) );
-    MPI_CHK( mpi_lset( X, 0 ) );
-
-    for( i = buflen, j = 0; i > n; i--, j++ )
-        X->p[j / ciL] |= ((t_uint) buf[i - 1]) << ((j % ciL) << 3);
-
-cleanup:
-
-    return( ret );
-}
-
-/*
- * Export X into unsigned binary data, big endian
- */
-int mpi_write_binary( const mpi *X, unsigned char *buf, size_t buflen )
-{
-    size_t i, j, n;
-
-    n = mpi_size( X );
-
-    if( buflen < n )
-        return( POLARSSL_ERR_MPI_BUFFER_TOO_SMALL );
-
-    memset( buf, 0, buflen );
-
-    for( i = buflen - 1, j = 0; n > 0; i--, j++, n-- )
-        buf[i] = (unsigned char)( X->p[j / ciL] >> ((j % ciL) << 3) );
-
-    return( 0 );
-}
-
-/*
- * Left-shift: X <<= count
- */
-int mpi_shift_l( mpi *X, size_t count )
-{
-    int ret;
-    size_t i, v0, t1;
-    t_uint r0 = 0, r1;
-
-    v0 = count / (biL    );
-    t1 = count & (biL - 1);
-
-    i = mpi_msb( X ) + count;
-
-    if( X->n * biL < i )
-        MPI_CHK( mpi_grow( X, BITS_TO_LIMBS( i ) ) );
-
-    ret = 0;
-
-    /*
-     * shift by count / limb_size
-     */
-    if( v0 > 0 )
-    {
-        for( i = X->n; i > v0; i-- )
-            X->p[i - 1] = X->p[i - v0 - 1];
-
-        for( ; i > 0; i-- )
-            X->p[i - 1] = 0;
-    }
-
-    /*
-     * shift by count % limb_size
-     */
-    if( t1 > 0 )
-    {
-        for( i = v0; i < X->n; i++ )
-        {
-            r1 = X->p[i] >> (biL - t1);
-            X->p[i] <<= t1;
-            X->p[i] |= r0;
-            r0 = r1;
-        }
-    }
-
-cleanup:
-
-    return( ret );
-}
-
-/*
- * Right-shift: X >>= count
- */
-int mpi_shift_r( mpi *X, size_t count )
-{
-    size_t i, v0, v1;
-    t_uint r0 = 0, r1;
-
-    v0 = count /  biL;
-    v1 = count & (biL - 1);
-
-    if( v0 > X->n || ( v0 == X->n && v1 > 0 ) )
-        return mpi_lset( X, 0 );
-
-    /*
-     * shift by count / limb_size
-     */
-    if( v0 > 0 )
-    {
-        for( i = 0; i < X->n - v0; i++ )
-            X->p[i] = X->p[i + v0];
-
-        for( ; i < X->n; i++ )
-            X->p[i] = 0;
-    }
-
-    /*
-     * shift by count % limb_size
-     */
-    if( v1 > 0 )
-    {
-        for( i = X->n; i > 0; i-- )
-        {
-            r1 = X->p[i - 1] << (biL - v1);
-            X->p[i - 1] >>= v1;
-            X->p[i - 1] |= r0;
-            r0 = r1;
-        }
-    }
-
-    return( 0 );
-}
-
-/*
- * Compare unsigned values
- */
-int mpi_cmp_abs( const mpi *X, const mpi *Y )
-{
-    size_t i, j;
-
-    for( i = X->n; i > 0; i-- )
-        if( X->p[i - 1] != 0 )
-            break;
-
-    for( j = Y->n; j > 0; j-- )
-        if( Y->p[j - 1] != 0 )
-            break;
-
-    if( i == 0 && j == 0 )
-        return( 0 );
-
-    if( i > j ) return(  1 );
-    if( j > i ) return( -1 );
-
-    for( ; i > 0; i-- )
-    {
-        if( X->p[i - 1] > Y->p[i - 1] ) return(  1 );
-        if( X->p[i - 1] < Y->p[i - 1] ) return( -1 );
-    }
-
-    return( 0 );
-}
-
-/*
- * Compare signed values
- */
-int mpi_cmp_mpi( const mpi *X, const mpi *Y )
-{
-    size_t i, j;
-
-    for( i = X->n; i > 0; i-- )
-        if( X->p[i - 1] != 0 )
-            break;
-
-    for( j = Y->n; j > 0; j-- )
-        if( Y->p[j - 1] != 0 )
-            break;
-
-    if( i == 0 && j == 0 )
-        return( 0 );
-
-    if( i > j ) return(  X->s );
-    if( j > i ) return( -Y->s );
-
-    if( X->s > 0 && Y->s < 0 ) return(  1 );
-    if( Y->s > 0 && X->s < 0 ) return( -1 );
-
-    for( ; i > 0; i-- )
-    {
-        if( X->p[i - 1] > Y->p[i - 1] ) return(  X->s );
-        if( X->p[i - 1] < Y->p[i - 1] ) return( -X->s );
-    }
-
-    return( 0 );
-}
-
-/*
- * Compare signed values
- */
-int mpi_cmp_int( const mpi *X, t_sint z )
-{
-    mpi Y;
-    t_uint p[1];
-
-    *p  = ( z < 0 ) ? -z : z;
-    Y.s = ( z < 0 ) ? -1 : 1;
-    Y.n = 1;
-    Y.p = p;
-
-    return( mpi_cmp_mpi( X, &Y ) );
-}
-
-/*
- * Unsigned addition: X = |A| + |B|  (HAC 14.7)
- */
-int mpi_add_abs( mpi *X, const mpi *A, const mpi *B )
-{
-    int ret;
-    size_t i, j;
-    t_uint *o, *p, c;
-
-    if( X == B )
-    {
-        const mpi *T = A; A = X; B = T;
-    }
-
-    if( X != A )
-        MPI_CHK( mpi_copy( X, A ) );
-   
-    /*
-     * X should always be positive as a result of unsigned additions.
-     */
-    X->s = 1;
-
-    for( j = B->n; j > 0; j-- )
-        if( B->p[j - 1] != 0 )
-            break;
-
-    MPI_CHK( mpi_grow( X, j ) );
-
-    o = B->p; p = X->p; c = 0;
-
-    for( i = 0; i < j; i++, o++, p++ )
-    {
-        *p +=  c; c  = ( *p <  c );
-        *p += *o; c += ( *p < *o );
-    }
-
-    while( c != 0 )
-    {
-        if( i >= X->n )
-        {
-            MPI_CHK( mpi_grow( X, i + 1 ) );
-            p = X->p + i;
-        }
-
-        *p += c; c = ( *p < c ); i++; p++;
-    }
-
-cleanup:
-
-    return( ret );
-}
-
-/*
- * Helper for mpi substraction
- */
-static void mpi_sub_hlp( size_t n, t_uint *s, t_uint *d )
-{
-    size_t i;
-    t_uint c, z;
-
-    for( i = c = 0; i < n; i++, s++, d++ )
-    {
-        z = ( *d <  c );     *d -=  c;
-        c = ( *d < *s ) + z; *d -= *s;
-    }
-
-    while( c != 0 )
-    {
-        z = ( *d < c ); *d -= c;
-        c = z; i++; d++;
-    }
-}
-
-/*
- * Unsigned substraction: X = |A| - |B|  (HAC 14.9)
- */
-int mpi_sub_abs( mpi *X, const mpi *A, const mpi *B )
-{
-    mpi TB;
-    int ret;
-    size_t n;
-
-    if( mpi_cmp_abs( A, B ) < 0 )
-        return( POLARSSL_ERR_MPI_NEGATIVE_VALUE );
-
-    mpi_init( &TB );
-
-    if( X == B )
-    {
-        MPI_CHK( mpi_copy( &TB, B ) );
-        B = &TB;
-    }
-
-    if( X != A )
-        MPI_CHK( mpi_copy( X, A ) );
-
-    /*
-     * X should always be positive as a result of unsigned substractions.
-     */
-    X->s = 1;
-
-    ret = 0;
-
-    for( n = B->n; n > 0; n-- )
-        if( B->p[n - 1] != 0 )
-            break;
-
-    mpi_sub_hlp( n, B->p, X->p );
-
-cleanup:
-
-    mpi_free( &TB );
-
-    return( ret );
-}
-
-/*
- * Signed addition: X = A + B
- */
-int mpi_add_mpi( mpi *X, const mpi *A, const mpi *B )
-{
-    int ret, s = A->s;
-
-    if( A->s * B->s < 0 )
-    {
-        if( mpi_cmp_abs( A, B ) >= 0 )
-        {
-            MPI_CHK( mpi_sub_abs( X, A, B ) );
-            X->s =  s;
-        }
-        else
-        {
-            MPI_CHK( mpi_sub_abs( X, B, A ) );
-            X->s = -s;
-        }
-    }
-    else
-    {
-        MPI_CHK( mpi_add_abs( X, A, B ) );
-        X->s = s;
-    }
-
-cleanup:
-
-    return( ret );
-}
-
-/*
- * Signed substraction: X = A - B
- */
-int mpi_sub_mpi( mpi *X, const mpi *A, const mpi *B )
-{
-    int ret, s = A->s;
-
-    if( A->s * B->s > 0 )
-    {
-        if( mpi_cmp_abs( A, B ) >= 0 )
-        {
-            MPI_CHK( mpi_sub_abs( X, A, B ) );
-            X->s =  s;
-        }
-        else
-        {
-            MPI_CHK( mpi_sub_abs( X, B, A ) );
-            X->s = -s;
-        }
-    }
-    else
-    {
-        MPI_CHK( mpi_add_abs( X, A, B ) );
-        X->s = s;
-    }
-
-cleanup:
-
-    return( ret );
-}
-
-/*
- * Signed addition: X = A + b
- */
-int mpi_add_int( mpi *X, const mpi *A, t_sint b )
-{
-    mpi _B;
-    t_uint p[1];
-
-    p[0] = ( b < 0 ) ? -b : b;
-    _B.s = ( b < 0 ) ? -1 : 1;
-    _B.n = 1;
-    _B.p = p;
-
-    return( mpi_add_mpi( X, A, &_B ) );
-}
-
-/*
- * Signed substraction: X = A - b
- */
-int mpi_sub_int( mpi *X, const mpi *A, t_sint b )
-{
-    mpi _B;
-    t_uint p[1];
-
-    p[0] = ( b < 0 ) ? -b : b;
-    _B.s = ( b < 0 ) ? -1 : 1;
-    _B.n = 1;
-    _B.p = p;
-
-    return( mpi_sub_mpi( X, A, &_B ) );
-}
-
-/*
- * Helper for mpi multiplication
- */
-static
-#if defined(__APPLE__) && defined(__arm__)
-/*
- * Apple LLVM version 4.2 (clang-425.0.24) (based on LLVM 3.2svn)
- * appears to need this to prevent bad ARM code generation at -O3.
- */
-__attribute__ ((noinline))
-#endif
-void mpi_mul_hlp( size_t i, t_uint *s, t_uint *d, t_uint b )
-{
-    t_uint c = 0, t = 0;
-
-#if defined(MULADDC_HUIT)
-    for( ; i >= 8; i -= 8 )
-    {
-        MULADDC_INIT
-        MULADDC_HUIT
-        MULADDC_STOP
-    }
-
-    for( ; i > 0; i-- )
-    {
-        MULADDC_INIT
-        MULADDC_CORE
-        MULADDC_STOP
-    }
-#else
-    for( ; i >= 16; i -= 16 )
-    {
-        MULADDC_INIT
-        MULADDC_CORE   MULADDC_CORE
-        MULADDC_CORE   MULADDC_CORE
-        MULADDC_CORE   MULADDC_CORE
-        MULADDC_CORE   MULADDC_CORE
-
-        MULADDC_CORE   MULADDC_CORE
-        MULADDC_CORE   MULADDC_CORE
-        MULADDC_CORE   MULADDC_CORE
-        MULADDC_CORE   MULADDC_CORE
-        MULADDC_STOP
-    }
-
-    for( ; i >= 8; i -= 8 )
-    {
-        MULADDC_INIT
-        MULADDC_CORE   MULADDC_CORE
-        MULADDC_CORE   MULADDC_CORE
-
-        MULADDC_CORE   MULADDC_CORE
-        MULADDC_CORE   MULADDC_CORE
-        MULADDC_STOP
-    }
-
-    for( ; i > 0; i-- )
-    {
-        MULADDC_INIT
-        MULADDC_CORE
-        MULADDC_STOP
-    }
-#endif
-
-    t++;
-
-    do {
-        *d += c; c = ( *d < c ); d++;
-    }
-    while( c != 0 );
-}
-
-/*
- * Baseline multiplication: X = A * B  (HAC 14.12)
- */
-int mpi_mul_mpi( mpi *X, const mpi *A, const mpi *B )
-{
-    int ret;
-    size_t i, j;
-    mpi TA, TB;
-
-    mpi_init( &TA ); mpi_init( &TB );
-
-    if( X == A ) { MPI_CHK( mpi_copy( &TA, A ) ); A = &TA; }
-    if( X == B ) { MPI_CHK( mpi_copy( &TB, B ) ); B = &TB; }
-
-    for( i = A->n; i > 0; i-- )
-        if( A->p[i - 1] != 0 )
-            break;
-
-    for( j = B->n; j > 0; j-- )
-        if( B->p[j - 1] != 0 )
-            break;
-
-    MPI_CHK( mpi_grow( X, i + j ) );
-    MPI_CHK( mpi_lset( X, 0 ) );
-
-    for( i++; j > 0; j-- )
-        mpi_mul_hlp( i - 1, A->p, X->p + j - 1, B->p[j - 1] );
-
-    X->s = A->s * B->s;
-
-cleanup:
-
-    mpi_free( &TB ); mpi_free( &TA );
-
-    return( ret );
-}
-
-/*
- * Baseline multiplication: X = A * b
- */
-int mpi_mul_int( mpi *X, const mpi *A, t_sint b )
-{
-    mpi _B;
-    t_uint p[1];
-
-    _B.s = 1;
-    _B.n = 1;
-    _B.p = p;
-    p[0] = b;
-
-    return( mpi_mul_mpi( X, A, &_B ) );
-}
-
-/*
- * Division by mpi: A = Q * B + R  (HAC 14.20)
- */
-int mpi_div_mpi( mpi *Q, mpi *R, const mpi *A, const mpi *B )
-{
-    int ret;
-    size_t i, n, t, k;
-    mpi X, Y, Z, T1, T2;
-
-    if( mpi_cmp_int( B, 0 ) == 0 )
-        return( POLARSSL_ERR_MPI_DIVISION_BY_ZERO );
-
-    mpi_init( &X ); mpi_init( &Y ); mpi_init( &Z );
-    mpi_init( &T1 ); mpi_init( &T2 );
-
-    if( mpi_cmp_abs( A, B ) < 0 )
-    {
-        if( Q != NULL ) MPI_CHK( mpi_lset( Q, 0 ) );
-        if( R != NULL ) MPI_CHK( mpi_copy( R, A ) );
-        return( 0 );
-    }
-
-    MPI_CHK( mpi_copy( &X, A ) );
-    MPI_CHK( mpi_copy( &Y, B ) );
-    X.s = Y.s = 1;
-
-    MPI_CHK( mpi_grow( &Z, A->n + 2 ) );
-    MPI_CHK( mpi_lset( &Z,  0 ) );
-    MPI_CHK( mpi_grow( &T1, 2 ) );
-    MPI_CHK( mpi_grow( &T2, 3 ) );
-
-    k = mpi_msb( &Y ) % biL;
-    if( k < biL - 1 )
-    {
-        k = biL - 1 - k;
-        MPI_CHK( mpi_shift_l( &X, k ) );
-        MPI_CHK( mpi_shift_l( &Y, k ) );
-    }
-    else k = 0;
-
-    n = X.n - 1;
-    t = Y.n - 1;
-    MPI_CHK( mpi_shift_l( &Y, biL * (n - t) ) );
-
-    while( mpi_cmp_mpi( &X, &Y ) >= 0 )
-    {
-        Z.p[n - t]++;
-        mpi_sub_mpi( &X, &X, &Y );
-    }
-    mpi_shift_r( &Y, biL * (n - t) );
-
-    for( i = n; i > t ; i-- )
-    {
-        if( X.p[i] >= Y.p[t] )
-            Z.p[i - t - 1] = ~0;
-        else
-        {
-#if defined(POLARSSL_HAVE_UDBL)
-            t_udbl r;
-
-            r  = (t_udbl) X.p[i] << biL;
-            r |= (t_udbl) X.p[i - 1];
-            r /= Y.p[t];
-            if( r > ((t_udbl) 1 << biL) - 1)
-                r = ((t_udbl) 1 << biL) - 1;
-
-            Z.p[i - t - 1] = (t_uint) r;
-#else
-            /*
-             * __udiv_qrnnd_c, from gmp/longlong.h
-             */
-            t_uint q0, q1, r0, r1;
-            t_uint d0, d1, d, m;
-
-            d  = Y.p[t];
-            d0 = ( d << biH ) >> biH;
-            d1 = ( d >> biH );
-
-            q1 = X.p[i] / d1;
-            r1 = X.p[i] - d1 * q1;
-            r1 <<= biH;
-            r1 |= ( X.p[i - 1] >> biH );
-
-            m = q1 * d0;
-            if( r1 < m )
-            {
-                q1--, r1 += d;
-                while( r1 >= d && r1 < m )
-                    q1--, r1 += d;
-            }
-            r1 -= m;
-
-            q0 = r1 / d1;
-            r0 = r1 - d1 * q0;
-            r0 <<= biH;
-            r0 |= ( X.p[i - 1] << biH ) >> biH;
-
-            m = q0 * d0;
-            if( r0 < m )
-            {
-                q0--, r0 += d;
-                while( r0 >= d && r0 < m )
-                    q0--, r0 += d;
-            }
-            r0 -= m;
-
-            Z.p[i - t - 1] = ( q1 << biH ) | q0;
-#endif
-        }
-
-        Z.p[i - t - 1]++;
-        do
-        {
-            Z.p[i - t - 1]--;
-
-            MPI_CHK( mpi_lset( &T1, 0 ) );
-            T1.p[0] = (t < 1) ? 0 : Y.p[t - 1];
-            T1.p[1] = Y.p[t];
-            MPI_CHK( mpi_mul_int( &T1, &T1, Z.p[i - t - 1] ) );
-
-            MPI_CHK( mpi_lset( &T2, 0 ) );
-            T2.p[0] = (i < 2) ? 0 : X.p[i - 2];
-            T2.p[1] = (i < 1) ? 0 : X.p[i - 1];
-            T2.p[2] = X.p[i];
-        }
-        while( mpi_cmp_mpi( &T1, &T2 ) > 0 );
-
-        MPI_CHK( mpi_mul_int( &T1, &Y, Z.p[i - t - 1] ) );
-        MPI_CHK( mpi_shift_l( &T1,  biL * (i - t - 1) ) );
-        MPI_CHK( mpi_sub_mpi( &X, &X, &T1 ) );
-
-        if( mpi_cmp_int( &X, 0 ) < 0 )
-        {
-            MPI_CHK( mpi_copy( &T1, &Y ) );
-            MPI_CHK( mpi_shift_l( &T1, biL * (i - t - 1) ) );
-            MPI_CHK( mpi_add_mpi( &X, &X, &T1 ) );
-            Z.p[i - t - 1]--;
-        }
-    }
-
-    if( Q != NULL )
-    {
-        mpi_copy( Q, &Z );
-        Q->s = A->s * B->s;
-    }
-
-    if( R != NULL )
-    {
-        mpi_shift_r( &X, k );
-        X.s = A->s;
-        mpi_copy( R, &X );
-
-        if( mpi_cmp_int( R, 0 ) == 0 )
-            R->s = 1;
-    }
-
-cleanup:
-
-    mpi_free( &X ); mpi_free( &Y ); mpi_free( &Z );
-    mpi_free( &T1 ); mpi_free( &T2 );
-
-    return( ret );
-}
-
-/*
- * Division by int: A = Q * b + R
- */
-int mpi_div_int( mpi *Q, mpi *R, const mpi *A, t_sint b )
-{
-    mpi _B;
-    t_uint p[1];
-
-    p[0] = ( b < 0 ) ? -b : b;
-    _B.s = ( b < 0 ) ? -1 : 1;
-    _B.n = 1;
-    _B.p = p;
-
-    return( mpi_div_mpi( Q, R, A, &_B ) );
-}
-
-/*
- * Modulo: R = A mod B
- */
-int mpi_mod_mpi( mpi *R, const mpi *A, const mpi *B )
-{
-    int ret;
-
-    if( mpi_cmp_int( B, 0 ) < 0 )
-        return POLARSSL_ERR_MPI_NEGATIVE_VALUE;
-
-    MPI_CHK( mpi_div_mpi( NULL, R, A, B ) );
-
-    while( mpi_cmp_int( R, 0 ) < 0 )
-      MPI_CHK( mpi_add_mpi( R, R, B ) );
-
-    while( mpi_cmp_mpi( R, B ) >= 0 )
-      MPI_CHK( mpi_sub_mpi( R, R, B ) );
-
-cleanup:
-
-    return( ret );
-}
-
-/*
- * Modulo: r = A mod b
- */
-int mpi_mod_int( t_uint *r, const mpi *A, t_sint b )
-{
-    size_t i;
-    t_uint x, y, z;
-
-    if( b == 0 )
-        return( POLARSSL_ERR_MPI_DIVISION_BY_ZERO );
-
-    if( b < 0 )
-        return POLARSSL_ERR_MPI_NEGATIVE_VALUE;
-
-    /*
-     * handle trivial cases
-     */
-    if( b == 1 )
-    {
-        *r = 0;
-        return( 0 );
-    }
-
-    if( b == 2 )
-    {
-        *r = A->p[0] & 1;
-        return( 0 );
-    }
-
-    /*
-     * general case
-     */
-    for( i = A->n, y = 0; i > 0; i-- )
-    {
-        x  = A->p[i - 1];
-        y  = ( y << biH ) | ( x >> biH );
-        z  = y / b;
-        y -= z * b;
-
-        x <<= biH;
-        y  = ( y << biH ) | ( x >> biH );
-        z  = y / b;
-        y -= z * b;
-    }
-
-    /*
-     * If A is negative, then the current y represents a negative value.
-     * Flipping it to the positive side.
-     */
-    if( A->s < 0 && y != 0 )
-        y = b - y;
-
-    *r = y;
-
-    return( 0 );
-}
-
-/*
- * Fast Montgomery initialization (thanks to Tom St Denis)
- */
-static void mpi_montg_init( t_uint *mm, const mpi *N )
-{
-    t_uint x, m0 = N->p[0];
-
-    x  = m0;
-    x += ( ( m0 + 2 ) & 4 ) << 1;
-    x *= ( 2 - ( m0 * x ) );
-
-    if( biL >= 16 ) x *= ( 2 - ( m0 * x ) );
-    if( biL >= 32 ) x *= ( 2 - ( m0 * x ) );
-    if( biL >= 64 ) x *= ( 2 - ( m0 * x ) );
-
-    *mm = ~x + 1;
-}
-
-/*
- * Montgomery multiplication: A = A * B * R^-1 mod N  (HAC 14.36)
- */
-static void mpi_montmul( mpi *A, const mpi *B, const mpi *N, t_uint mm, const mpi *T )
-{
-    size_t i, n, m;
-    t_uint u0, u1, *d;
-
-    memset( T->p, 0, T->n * ciL );
-
-    d = T->p;
-    n = N->n;
-    m = ( B->n < n ) ? B->n : n;
-
-    for( i = 0; i < n; i++ )
-    {
-        /*
-         * T = (T + u0*B + u1*N) / 2^biL
-         */
-        u0 = A->p[i];
-        u1 = ( d[0] + u0 * B->p[0] ) * mm;
-
-        mpi_mul_hlp( m, B->p, d, u0 );
-        mpi_mul_hlp( n, N->p, d, u1 );
-
-        *d++ = u0; d[n + 1] = 0;
-    }
-
-    memcpy( A->p, d, (n + 1) * ciL );
-
-    if( mpi_cmp_abs( A, N ) >= 0 )
-        mpi_sub_hlp( n, N->p, A->p );
-    else
-        /* prevent timing attacks */
-        mpi_sub_hlp( n, A->p, T->p );
-}
-
-/*
- * Montgomery reduction: A = A * R^-1 mod N
- */
-static void mpi_montred( mpi *A, const mpi *N, t_uint mm, const mpi *T )
-{
-    t_uint z = 1;
-    mpi U;
-
-    U.n = U.s = (int) z;
-    U.p = &z;
-
-    mpi_montmul( A, &U, N, mm, T );
-}
-
-/*
- * Sliding-window exponentiation: X = A^E mod N  (HAC 14.85)
- */
-int mpi_exp_mod( mpi *X, const mpi *A, const mpi *E, const mpi *N, mpi *_RR )
-{
-    int ret;
-    size_t wbits, wsize, one = 1;
-    size_t i, j, nblimbs;
-    size_t bufsize, nbits;
-    t_uint ei, mm, state;
-    mpi RR, T, W[ 2 << POLARSSL_MPI_WINDOW_SIZE ], Apos;
-    int neg;
-
-    if( mpi_cmp_int( N, 0 ) < 0 || ( N->p[0] & 1 ) == 0 )
-        return( POLARSSL_ERR_MPI_BAD_INPUT_DATA );
-
-    if( mpi_cmp_int( E, 0 ) < 0 )
-        return( POLARSSL_ERR_MPI_BAD_INPUT_DATA );
-
-    /*
-     * Init temps and window size
-     */
-    mpi_montg_init( &mm, N );
-    mpi_init( &RR ); mpi_init( &T );
-    memset( W, 0, sizeof( W ) );
-
-    i = mpi_msb( E );
-
-    wsize = ( i > 671 ) ? 6 : ( i > 239 ) ? 5 :
-            ( i >  79 ) ? 4 : ( i >  23 ) ? 3 : 1;
-
-    if( wsize > POLARSSL_MPI_WINDOW_SIZE )
-        wsize = POLARSSL_MPI_WINDOW_SIZE;
-
-    j = N->n + 1;
-    MPI_CHK( mpi_grow( X, j ) );
-    MPI_CHK( mpi_grow( &W[1],  j ) );
-    MPI_CHK( mpi_grow( &T, j * 2 ) );
-
-    /*
-     * Compensate for negative A (and correct at the end)
-     */
-    neg = ( A->s == -1 );
-
-    mpi_init( &Apos );
-    if( neg )
-    {
-        MPI_CHK( mpi_copy( &Apos, A ) );
-        Apos.s = 1;
-        A = &Apos;
-    }
-
-    /*
-     * If 1st call, pre-compute R^2 mod N
-     */
-    if( _RR == NULL || _RR->p == NULL )
-    {
-        MPI_CHK( mpi_lset( &RR, 1 ) );
-        MPI_CHK( mpi_shift_l( &RR, N->n * 2 * biL ) );
-        MPI_CHK( mpi_mod_mpi( &RR, &RR, N ) );
-
-        if( _RR != NULL )
-            memcpy( _RR, &RR, sizeof( mpi ) );
-    }
-    else
-        memcpy( &RR, _RR, sizeof( mpi ) );
-
-    /*
-     * W[1] = A * R^2 * R^-1 mod N = A * R mod N
-     */
-    if( mpi_cmp_mpi( A, N ) >= 0 )
-        mpi_mod_mpi( &W[1], A, N );
-    else   mpi_copy( &W[1], A );
-
-    mpi_montmul( &W[1], &RR, N, mm, &T );
-
-    /*
-     * X = R^2 * R^-1 mod N = R mod N
-     */
-    MPI_CHK( mpi_copy( X, &RR ) );
-    mpi_montred( X, N, mm, &T );
-
-    if( wsize > 1 )
-    {
-        /*
-         * W[1 << (wsize - 1)] = W[1] ^ (wsize - 1)
-         */
-        j =  one << (wsize - 1);
-
-        MPI_CHK( mpi_grow( &W[j], N->n + 1 ) );
-        MPI_CHK( mpi_copy( &W[j], &W[1]    ) );
-
-        for( i = 0; i < wsize - 1; i++ )
-            mpi_montmul( &W[j], &W[j], N, mm, &T );
-    
-        /*
-         * W[i] = W[i - 1] * W[1]
-         */
-        for( i = j + 1; i < (one << wsize); i++ )
-        {
-            MPI_CHK( mpi_grow( &W[i], N->n + 1 ) );
-            MPI_CHK( mpi_copy( &W[i], &W[i - 1] ) );
-
-            mpi_montmul( &W[i], &W[1], N, mm, &T );
-        }
-    }
-
-    nblimbs = E->n;
-    bufsize = 0;
-    nbits   = 0;
-    wbits   = 0;
-    state   = 0;
-
-    while( 1 )
-    {
-        if( bufsize == 0 )
-        {
-            if( nblimbs-- == 0 )
-                break;
-
-            bufsize = sizeof( t_uint ) << 3;
-        }
-
-        bufsize--;
-
-        ei = (E->p[nblimbs] >> bufsize) & 1;
-
-        /*
-         * skip leading 0s
-         */
-        if( ei == 0 && state == 0 )
-            continue;
-
-        if( ei == 0 && state == 1 )
-        {
-            /*
-             * out of window, square X
-             */
-            mpi_montmul( X, X, N, mm, &T );
-            continue;
-        }
-
-        /*
-         * add ei to current window
-         */
-        state = 2;
-
-        nbits++;
-        wbits |= (ei << (wsize - nbits));
-
-        if( nbits == wsize )
-        {
-            /*
-             * X = X^wsize R^-1 mod N
-             */
-            for( i = 0; i < wsize; i++ )
-                mpi_montmul( X, X, N, mm, &T );
-
-            /*
-             * X = X * W[wbits] R^-1 mod N
-             */
-            mpi_montmul( X, &W[wbits], N, mm, &T );
-
-            state--;
-            nbits = 0;
-            wbits = 0;
-        }
-    }
-
-    /*
-     * process the remaining bits
-     */
-    for( i = 0; i < nbits; i++ )
-    {
-        mpi_montmul( X, X, N, mm, &T );
-
-        wbits <<= 1;
-
-        if( (wbits & (one << wsize)) != 0 )
-            mpi_montmul( X, &W[1], N, mm, &T );
-    }
-
-    /*
-     * X = A^E * R * R^-1 mod N = A^E mod N
-     */
-    mpi_montred( X, N, mm, &T );
-
-    if( neg )
-    {
-        X->s = -1;
-        mpi_add_mpi( X, N, X );
-    }
-
-cleanup:
-
-    for( i = (one << (wsize - 1)); i < (one << wsize); i++ )
-        mpi_free( &W[i] );
-
-    mpi_free( &W[1] ); mpi_free( &T ); mpi_free( &Apos );
-
-    if( _RR == NULL )
-        mpi_free( &RR );
-
-    return( ret );
-}
-
-/*
- * Greatest common divisor: G = gcd(A, B)  (HAC 14.54)
- */
-int mpi_gcd( mpi *G, const mpi *A, const mpi *B )
-{
-    int ret;
-    size_t lz, lzt;
-    mpi TG, TA, TB;
-
-    mpi_init( &TG ); mpi_init( &TA ); mpi_init( &TB );
-
-    MPI_CHK( mpi_copy( &TA, A ) );
-    MPI_CHK( mpi_copy( &TB, B ) );
-
-    lz = mpi_lsb( &TA );
-    lzt = mpi_lsb( &TB );
-
-    if ( lzt < lz )
-        lz = lzt;
-
-    MPI_CHK( mpi_shift_r( &TA, lz ) );
-    MPI_CHK( mpi_shift_r( &TB, lz ) );
-
-    TA.s = TB.s = 1;
-
-    while( mpi_cmp_int( &TA, 0 ) != 0 )
-    {
-        MPI_CHK( mpi_shift_r( &TA, mpi_lsb( &TA ) ) );
-        MPI_CHK( mpi_shift_r( &TB, mpi_lsb( &TB ) ) );
-
-        if( mpi_cmp_mpi( &TA, &TB ) >= 0 )
-        {
-            MPI_CHK( mpi_sub_abs( &TA, &TA, &TB ) );
-            MPI_CHK( mpi_shift_r( &TA, 1 ) );
-        }
-        else
-        {
-            MPI_CHK( mpi_sub_abs( &TB, &TB, &TA ) );
-            MPI_CHK( mpi_shift_r( &TB, 1 ) );
-        }
-    }
-
-    MPI_CHK( mpi_shift_l( &TB, lz ) );
-    MPI_CHK( mpi_copy( G, &TB ) );
-
-cleanup:
-
-    mpi_free( &TG ); mpi_free( &TA ); mpi_free( &TB );
-
-    return( ret );
-}
-
-int mpi_fill_random( mpi *X, size_t size,
-                     int (*f_rng)(void *, unsigned char *, size_t),
-                     void *p_rng )
-{
-    int ret;
-
-    MPI_CHK( mpi_grow( X, CHARS_TO_LIMBS( size ) ) );
-    MPI_CHK( mpi_lset( X, 0 ) );
-
-    MPI_CHK( f_rng( p_rng, (unsigned char *) X->p, size ) );
-
-cleanup:
-    return( ret );
-}
-
-/*
- * Modular inverse: X = A^-1 mod N  (HAC 14.61 / 14.64)
- */
-int mpi_inv_mod( mpi *X, const mpi *A, const mpi *N )
-{
-    int ret;
-    mpi G, TA, TU, U1, U2, TB, TV, V1, V2;
-
-    if( mpi_cmp_int( N, 0 ) <= 0 )
-        return( POLARSSL_ERR_MPI_BAD_INPUT_DATA );
-
-    mpi_init( &TA ); mpi_init( &TU ); mpi_init( &U1 ); mpi_init( &U2 );
-    mpi_init( &G ); mpi_init( &TB ); mpi_init( &TV );
-    mpi_init( &V1 ); mpi_init( &V2 );
-
-    MPI_CHK( mpi_gcd( &G, A, N ) );
-
-    if( mpi_cmp_int( &G, 1 ) != 0 )
-    {
-        ret = POLARSSL_ERR_MPI_NOT_ACCEPTABLE;
-        goto cleanup;
-    }
-
-    MPI_CHK( mpi_mod_mpi( &TA, A, N ) );
-    MPI_CHK( mpi_copy( &TU, &TA ) );
-    MPI_CHK( mpi_copy( &TB, N ) );
-    MPI_CHK( mpi_copy( &TV, N ) );
-
-    MPI_CHK( mpi_lset( &U1, 1 ) );
-    MPI_CHK( mpi_lset( &U2, 0 ) );
-    MPI_CHK( mpi_lset( &V1, 0 ) );
-    MPI_CHK( mpi_lset( &V2, 1 ) );
-
-    do
-    {
-        while( ( TU.p[0] & 1 ) == 0 )
-        {
-            MPI_CHK( mpi_shift_r( &TU, 1 ) );
-
-            if( ( U1.p[0] & 1 ) != 0 || ( U2.p[0] & 1 ) != 0 )
-            {
-                MPI_CHK( mpi_add_mpi( &U1, &U1, &TB ) );
-                MPI_CHK( mpi_sub_mpi( &U2, &U2, &TA ) );
-            }
-
-            MPI_CHK( mpi_shift_r( &U1, 1 ) );
-            MPI_CHK( mpi_shift_r( &U2, 1 ) );
-        }
-
-        while( ( TV.p[0] & 1 ) == 0 )
-        {
-            MPI_CHK( mpi_shift_r( &TV, 1 ) );
-
-            if( ( V1.p[0] & 1 ) != 0 || ( V2.p[0] & 1 ) != 0 )
-            {
-                MPI_CHK( mpi_add_mpi( &V1, &V1, &TB ) );
-                MPI_CHK( mpi_sub_mpi( &V2, &V2, &TA ) );
-            }
-
-            MPI_CHK( mpi_shift_r( &V1, 1 ) );
-            MPI_CHK( mpi_shift_r( &V2, 1 ) );
-        }
-
-        if( mpi_cmp_mpi( &TU, &TV ) >= 0 )
-        {
-            MPI_CHK( mpi_sub_mpi( &TU, &TU, &TV ) );
-            MPI_CHK( mpi_sub_mpi( &U1, &U1, &V1 ) );
-            MPI_CHK( mpi_sub_mpi( &U2, &U2, &V2 ) );
-        }
-        else
-        {
-            MPI_CHK( mpi_sub_mpi( &TV, &TV, &TU ) );
-            MPI_CHK( mpi_sub_mpi( &V1, &V1, &U1 ) );
-            MPI_CHK( mpi_sub_mpi( &V2, &V2, &U2 ) );
-        }
-    }
-    while( mpi_cmp_int( &TU, 0 ) != 0 );
-
-    while( mpi_cmp_int( &V1, 0 ) < 0 )
-        MPI_CHK( mpi_add_mpi( &V1, &V1, N ) );
-
-    while( mpi_cmp_mpi( &V1, N ) >= 0 )
-        MPI_CHK( mpi_sub_mpi( &V1, &V1, N ) );
-
-    MPI_CHK( mpi_copy( X, &V1 ) );
-
-cleanup:
-
-    mpi_free( &TA ); mpi_free( &TU ); mpi_free( &U1 ); mpi_free( &U2 );
-    mpi_free( &G ); mpi_free( &TB ); mpi_free( &TV );
-    mpi_free( &V1 ); mpi_free( &V2 );
-
-    return( ret );
-}
-
-#if defined(POLARSSL_GENPRIME)
-
-static const int small_prime[] =
-{
-        3,    5,    7,   11,   13,   17,   19,   23,
-       29,   31,   37,   41,   43,   47,   53,   59,
-       61,   67,   71,   73,   79,   83,   89,   97,
-      101,  103,  107,  109,  113,  127,  131,  137,
-      139,  149,  151,  157,  163,  167,  173,  179,
-      181,  191,  193,  197,  199,  211,  223,  227,
-      229,  233,  239,  241,  251,  257,  263,  269,
-      271,  277,  281,  283,  293,  307,  311,  313,
-      317,  331,  337,  347,  349,  353,  359,  367,
-      373,  379,  383,  389,  397,  401,  409,  419,
-      421,  431,  433,  439,  443,  449,  457,  461,
-      463,  467,  479,  487,  491,  499,  503,  509,
-      521,  523,  541,  547,  557,  563,  569,  571,
-      577,  587,  593,  599,  601,  607,  613,  617,
-      619,  631,  641,  643,  647,  653,  659,  661,
-      673,  677,  683,  691,  701,  709,  719,  727,
-      733,  739,  743,  751,  757,  761,  769,  773,
-      787,  797,  809,  811,  821,  823,  827,  829,
-      839,  853,  857,  859,  863,  877,  881,  883,
-      887,  907,  911,  919,  929,  937,  941,  947,
-      953,  967,  971,  977,  983,  991,  997, -103
-};
-
-/*
- * Miller-Rabin primality test  (HAC 4.24)
- */
-int mpi_is_prime( mpi *X,
-                  int (*f_rng)(void *, unsigned char *, size_t),
-                  void *p_rng )
-{
-    int ret, xs;
-    size_t i, j, n, s;
-    mpi W, R, T, A, RR;
-
-    if( mpi_cmp_int( X, 0 ) == 0 ||
-        mpi_cmp_int( X, 1 ) == 0 )
-        return( POLARSSL_ERR_MPI_NOT_ACCEPTABLE );
-
-    if( mpi_cmp_int( X, 2 ) == 0 )
-        return( 0 );
-
-    mpi_init( &W ); mpi_init( &R ); mpi_init( &T ); mpi_init( &A );
-    mpi_init( &RR );
-
-    xs = X->s; X->s = 1;
-
-    /*
-     * test trivial factors first
-     */
-    if( ( X->p[0] & 1 ) == 0 )
-        return( POLARSSL_ERR_MPI_NOT_ACCEPTABLE );
-
-    for( i = 0; small_prime[i] > 0; i++ )
-    {
-        t_uint r;
-
-        if( mpi_cmp_int( X, small_prime[i] ) <= 0 )
-            return( 0 );
-
-        MPI_CHK( mpi_mod_int( &r, X, small_prime[i] ) );
-
-        if( r == 0 )
-            return( POLARSSL_ERR_MPI_NOT_ACCEPTABLE );
-    }
-
-    /*
-     * W = |X| - 1
-     * R = W >> lsb( W )
-     */
-    MPI_CHK( mpi_sub_int( &W, X, 1 ) );
-    s = mpi_lsb( &W );
-    MPI_CHK( mpi_copy( &R, &W ) );
-    MPI_CHK( mpi_shift_r( &R, s ) );
-
-    i = mpi_msb( X );
-    /*
-     * HAC, table 4.4
-     */
-    n = ( ( i >= 1300 ) ?  2 : ( i >=  850 ) ?  3 :
-          ( i >=  650 ) ?  4 : ( i >=  350 ) ?  8 :
-          ( i >=  250 ) ? 12 : ( i >=  150 ) ? 18 : 27 );
-
-    for( i = 0; i < n; i++ )
-    {
-        /*
-         * pick a random A, 1 < A < |X| - 1
-         */
-        MPI_CHK( mpi_fill_random( &A, X->n * ciL, f_rng, p_rng ) );
-
-        if( mpi_cmp_mpi( &A, &W ) >= 0 )
-        {
-            j = mpi_msb( &A ) - mpi_msb( &W );
-            MPI_CHK( mpi_shift_r( &A, j + 1 ) );
-        }
-        A.p[0] |= 3;
-
-        /*
-         * A = A^R mod |X|
-         */
-        MPI_CHK( mpi_exp_mod( &A, &A, &R, X, &RR ) );
-
-        if( mpi_cmp_mpi( &A, &W ) == 0 ||
-            mpi_cmp_int( &A,  1 ) == 0 )
-            continue;
-
-        j = 1;
-        while( j < s && mpi_cmp_mpi( &A, &W ) != 0 )
-        {
-            /*
-             * A = A * A mod |X|
-             */
-            MPI_CHK( mpi_mul_mpi( &T, &A, &A ) );
-            MPI_CHK( mpi_mod_mpi( &A, &T, X  ) );
-
-            if( mpi_cmp_int( &A, 1 ) == 0 )
-                break;
-
-            j++;
-        }
-
-        /*
-         * not prime if A != |X| - 1 or A == 1
-         */
-        if( mpi_cmp_mpi( &A, &W ) != 0 ||
-            mpi_cmp_int( &A,  1 ) == 0 )
-        {
-            ret = POLARSSL_ERR_MPI_NOT_ACCEPTABLE;
-            break;
-        }
-    }
-
-cleanup:
-
-    X->s = xs;
-
-    mpi_free( &W ); mpi_free( &R ); mpi_free( &T ); mpi_free( &A );
-    mpi_free( &RR );
-
-    return( ret );
-}
-
-/*
- * Prime number generation
- */
-int mpi_gen_prime( mpi *X, size_t nbits, int dh_flag,
-                   int (*f_rng)(void *, unsigned char *, size_t),
-                   void *p_rng )
-{
-    int ret;
-    size_t k, n;
-    mpi Y;
-
-    if( nbits < 3 || nbits > POLARSSL_MPI_MAX_BITS )
-        return( POLARSSL_ERR_MPI_BAD_INPUT_DATA );
-
-    mpi_init( &Y );
-
-    n = BITS_TO_LIMBS( nbits );
-
-    MPI_CHK( mpi_fill_random( X, n * ciL, f_rng, p_rng ) );
-
-    k = mpi_msb( X );
-    if( k < nbits ) MPI_CHK( mpi_shift_l( X, nbits - k ) );
-    if( k > nbits ) MPI_CHK( mpi_shift_r( X, k - nbits ) );
-
-    X->p[0] |= 3;
-
-    if( dh_flag == 0 )
-    {
-        while( ( ret = mpi_is_prime( X, f_rng, p_rng ) ) != 0 )
-        {
-            if( ret != POLARSSL_ERR_MPI_NOT_ACCEPTABLE )
-                goto cleanup;
-
-            MPI_CHK( mpi_add_int( X, X, 2 ) );
-        }
-    }
-    else
-    {
-        MPI_CHK( mpi_sub_int( &Y, X, 1 ) );
-        MPI_CHK( mpi_shift_r( &Y, 1 ) );
-
-        while( 1 )
-        {
-            if( ( ret = mpi_is_prime( X, f_rng, p_rng ) ) == 0 )
-            {
-                if( ( ret = mpi_is_prime( &Y, f_rng, p_rng ) ) == 0 )
-                    break;
-
-                if( ret != POLARSSL_ERR_MPI_NOT_ACCEPTABLE )
-                    goto cleanup;
-            }
-
-            if( ret != POLARSSL_ERR_MPI_NOT_ACCEPTABLE )
-                goto cleanup;
-
-            MPI_CHK( mpi_add_int( &Y, X, 1 ) );
-            MPI_CHK( mpi_add_int(  X, X, 2 ) );
-            MPI_CHK( mpi_shift_r( &Y, 1 ) );
-        }
-    }
-
-cleanup:
-
-    mpi_free( &Y );
-
-    return( ret );
-}
-
-#endif
-
-#if defined(POLARSSL_SELF_TEST)
-
-#define GCD_PAIR_COUNT  3
-
-static const int gcd_pairs[GCD_PAIR_COUNT][3] =
-{
-    { 693, 609, 21 },
-    { 1764, 868, 28 },
-    { 768454923, 542167814, 1 }
-};
-
-/*
- * Checkup routine
- */
-int mpi_self_test( int verbose )
-{
-    int ret, i;
-    mpi A, E, N, X, Y, U, V;
-
-    mpi_init( &A ); mpi_init( &E ); mpi_init( &N ); mpi_init( &X );
-    mpi_init( &Y ); mpi_init( &U ); mpi_init( &V );
-
-    MPI_CHK( mpi_read_string( &A, 16,
-        "EFE021C2645FD1DC586E69184AF4A31E" \
-        "D5F53E93B5F123FA41680867BA110131" \
-        "944FE7952E2517337780CB0DB80E61AA" \
-        "E7C8DDC6C5C6AADEB34EB38A2F40D5E6" ) );
-
-    MPI_CHK( mpi_read_string( &E, 16,
-        "B2E7EFD37075B9F03FF989C7C5051C20" \
-        "34D2A323810251127E7BF8625A4F49A5" \
-        "F3E27F4DA8BD59C47D6DAABA4C8127BD" \
-        "5B5C25763222FEFCCFC38B832366C29E" ) );
-
-    MPI_CHK( mpi_read_string( &N, 16,
-        "0066A198186C18C10B2F5ED9B522752A" \
-        "9830B69916E535C8F047518A889A43A5" \
-        "94B6BED27A168D31D4A52F88925AA8F5" ) );
-
-    MPI_CHK( mpi_mul_mpi( &X, &A, &N ) );
-
-    MPI_CHK( mpi_read_string( &U, 16,
-        "602AB7ECA597A3D6B56FF9829A5E8B85" \
-        "9E857EA95A03512E2BAE7391688D264A" \
-        "A5663B0341DB9CCFD2C4C5F421FEC814" \
-        "8001B72E848A38CAE1C65F78E56ABDEF" \
-        "E12D3C039B8A02D6BE593F0BBBDA56F1" \
-        "ECF677152EF804370C1A305CAF3B5BF1" \
-        "30879B56C61DE584A0F53A2447A51E" ) );
-
-    if( verbose != 0 )
-        printf( "  MPI test #1 (mul_mpi): " );
-
-    if( mpi_cmp_mpi( &X, &U ) != 0 )
-    {
-        if( verbose != 0 )
-            printf( "failed\n" );
-
-        return( 1 );
-    }
-
-    if( verbose != 0 )
-        printf( "passed\n" );
-
-    MPI_CHK( mpi_div_mpi( &X, &Y, &A, &N ) );
-
-    MPI_CHK( mpi_read_string( &U, 16,
-        "256567336059E52CAE22925474705F39A94" ) );
-
-    MPI_CHK( mpi_read_string( &V, 16,
-        "6613F26162223DF488E9CD48CC132C7A" \
-        "0AC93C701B001B092E4E5B9F73BCD27B" \
-        "9EE50D0657C77F374E903CDFA4C642" ) );
-
-    if( verbose != 0 )
-        printf( "  MPI test #2 (div_mpi): " );
-
-    if( mpi_cmp_mpi( &X, &U ) != 0 ||
-        mpi_cmp_mpi( &Y, &V ) != 0 )
-    {
-        if( verbose != 0 )
-            printf( "failed\n" );
-
-        return( 1 );
-    }
-
-    if( verbose != 0 )
-        printf( "passed\n" );
-
-    MPI_CHK( mpi_exp_mod( &X, &A, &E, &N, NULL ) );
-
-    MPI_CHK( mpi_read_string( &U, 16,
-        "36E139AEA55215609D2816998ED020BB" \
-        "BD96C37890F65171D948E9BC7CBAA4D9" \
-        "325D24D6A3C12710F10A09FA08AB87" ) );
-
-    if( verbose != 0 )
-        printf( "  MPI test #3 (exp_mod): " );
-
-    if( mpi_cmp_mpi( &X, &U ) != 0 )
-    {
-        if( verbose != 0 )
-            printf( "failed\n" );
-
-        return( 1 );
-    }
-
-    if( verbose != 0 )
-        printf( "passed\n" );
-
-#if defined(POLARSSL_GENPRIME)
-    MPI_CHK( mpi_inv_mod( &X, &A, &N ) );
-
-    MPI_CHK( mpi_read_string( &U, 16,
-        "003A0AAEDD7E784FC07D8F9EC6E3BFD5" \
-        "C3DBA76456363A10869622EAC2DD84EC" \
-        "C5B8A74DAC4D09E03B5E0BE779F2DF61" ) );
-
-    if( verbose != 0 )
-        printf( "  MPI test #4 (inv_mod): " );
-
-    if( mpi_cmp_mpi( &X, &U ) != 0 )
-    {
-        if( verbose != 0 )
-            printf( "failed\n" );
-
-        return( 1 );
-    }
-
-    if( verbose != 0 )
-        printf( "passed\n" );
-#endif
-
-    if( verbose != 0 )
-        printf( "  MPI test #5 (simple gcd): " );
-
-    for ( i = 0; i < GCD_PAIR_COUNT; i++)
-    {
-        MPI_CHK( mpi_lset( &X, gcd_pairs[i][0] ) );
-        MPI_CHK( mpi_lset( &Y, gcd_pairs[i][1] ) );
-
-	    MPI_CHK( mpi_gcd( &A, &X, &Y ) );
-
-	    if( mpi_cmp_int( &A, gcd_pairs[i][2] ) != 0 )
-	    {
-		    if( verbose != 0 )
-			    printf( "failed at %d\n", i );
-
-		    return( 1 );
-	    }
-    }
-
-    if( verbose != 0 )
-        printf( "passed\n" );
-
-cleanup:
-
-    if( ret != 0 && verbose != 0 )
-        printf( "Unexpected error, return code = %08X\n", ret );
-
-    mpi_free( &A ); mpi_free( &E ); mpi_free( &N ); mpi_free( &X );
-    mpi_free( &Y ); mpi_free( &U ); mpi_free( &V );
-
-    if( verbose != 0 )
-        printf( "\n" );
-
-    return( ret );
-}
-
-#endif
-
-#endif
diff --git a/common/polarssl/bignum.h b/common/polarssl/bignum.h
deleted file mode 100644
index 5eaf1a57b..000000000
--- a/common/polarssl/bignum.h
+++ /dev/null
@@ -1,685 +0,0 @@
-/**
- * \file bignum.h
- *
- * \brief  Multi-precision integer library
- *
- *  Copyright (C) 2006-2013, Brainspark B.V.
- *
- *  This file is part of PolarSSL (http://www.polarssl.org)
- *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
- *
- *  All rights reserved.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifndef POLARSSL_BIGNUM_H
-#define POLARSSL_BIGNUM_H
-
-#include <stdio.h>
-#include <string.h>
-
-#include "polarssl_config.h"
-
-#ifdef _MSC_VER
-#include <basetsd.h>
-#if (_MSC_VER <= 1200)
-typedef   signed short  int16_t;
-typedef unsigned short uint16_t;
-#else
-typedef  INT16  int16_t;
-typedef UINT16 uint16_t;
-#endif
-typedef  INT32  int32_t;
-typedef  INT64  int64_t;
-typedef UINT32 uint32_t;
-typedef UINT64 uint64_t;
-#else
-#include <inttypes.h>
-#endif
-
-#define POLARSSL_ERR_MPI_FILE_IO_ERROR                     -0x0002  /**< An error occurred while reading from or writing to a file. */
-#define POLARSSL_ERR_MPI_BAD_INPUT_DATA                    -0x0004  /**< Bad input parameters to function. */
-#define POLARSSL_ERR_MPI_INVALID_CHARACTER                 -0x0006  /**< There is an invalid character in the digit string. */
-#define POLARSSL_ERR_MPI_BUFFER_TOO_SMALL                  -0x0008  /**< The buffer is too small to write to. */
-#define POLARSSL_ERR_MPI_NEGATIVE_VALUE                    -0x000A  /**< The input arguments are negative or result in illegal output. */
-#define POLARSSL_ERR_MPI_DIVISION_BY_ZERO                  -0x000C  /**< The input argument for division is zero, which is not allowed. */
-#define POLARSSL_ERR_MPI_NOT_ACCEPTABLE                    -0x000E  /**< The input arguments are not acceptable. */
-#define POLARSSL_ERR_MPI_MALLOC_FAILED                     -0x0010  /**< Memory allocation failed. */
-
-#define MPI_CHK(f) if( ( ret = f ) != 0 ) goto cleanup
-
-/*
- * Maximum size MPIs are allowed to grow to in number of limbs.
- */
-#define POLARSSL_MPI_MAX_LIMBS                             10000
-
-#if !defined(POLARSSL_CONFIG_OPTIONS)
-/*
- * Maximum window size used for modular exponentiation. Default: 6
- * Minimum value: 1. Maximum value: 6.
- *
- * Result is an array of ( 2 << POLARSSL_MPI_WINDOW_SIZE ) MPIs used
- * for the sliding window calculation. (So 64 by default)
- *
- * Reduction in size, reduces speed.
- */
-#define POLARSSL_MPI_WINDOW_SIZE                           6        /**< Maximum windows size used. */
-
-/*
- * Maximum size of MPIs allowed in bits and bytes for user-MPIs.
- * ( Default: 512 bytes => 4096 bits, Maximum tested: 2048 bytes => 16384 bits )
- *
- * Note: Calculations can results temporarily in larger MPIs. So the number
- * of limbs required (POLARSSL_MPI_MAX_LIMBS) is higher.
- */
-#define POLARSSL_MPI_MAX_SIZE                              512      /**< Maximum number of bytes for usable MPIs. */
-
-#endif /* !POLARSSL_CONFIG_OPTIONS */
-
-#define POLARSSL_MPI_MAX_BITS                              ( 8 * POLARSSL_MPI_MAX_SIZE )    /**< Maximum number of bits for usable MPIs. */
-
-/*
- * When reading from files with mpi_read_file() and writing to files with
- * mpi_write_file() the buffer should have space
- * for a (short) label, the MPI (in the provided radix), the newline
- * characters and the '\0'.
- *
- * By default we assume at least a 10 char label, a minimum radix of 10
- * (decimal) and a maximum of 4096 bit numbers (1234 decimal chars).
- * Autosized at compile time for at least a 10 char label, a minimum radix
- * of 10 (decimal) for a number of POLARSSL_MPI_MAX_BITS size.
- *
- * This used to be statically sized to 1250 for a maximum of 4096 bit
- * numbers (1234 decimal chars).
- *
- * Calculate using the formula:
- *  POLARSSL_MPI_RW_BUFFER_SIZE = ceil(POLARSSL_MPI_MAX_BITS / ln(10) * ln(2)) +
- *                                LabelSize + 6
- */
-#define POLARSSL_MPI_MAX_BITS_SCALE100          ( 100 * POLARSSL_MPI_MAX_BITS )
-#define LN_2_DIV_LN_10_SCALE100                 332
-#define POLARSSL_MPI_RW_BUFFER_SIZE             ( ((POLARSSL_MPI_MAX_BITS_SCALE100 + LN_2_DIV_LN_10_SCALE100 - 1) / LN_2_DIV_LN_10_SCALE100) + 10 + 6 )
-
-/*
- * Define the base integer type, architecture-wise
- */
-#if defined(POLARSSL_HAVE_INT8)
-typedef   signed char  t_sint;
-typedef unsigned char  t_uint;
-typedef uint16_t       t_udbl;
-#define POLARSSL_HAVE_UDBL
-#else
-#if defined(POLARSSL_HAVE_INT16)
-typedef  int16_t t_sint;
-typedef uint16_t t_uint;
-typedef uint32_t t_udbl;
-#define POLARSSL_HAVE_UDBL
-#else
-  #if ( defined(_MSC_VER) && defined(_M_AMD64) )
-    typedef  int64_t t_sint;
-    typedef uint64_t t_uint;
-  #else
-    #if ( defined(__GNUC__) && (                          \
-          defined(__amd64__) || defined(__x86_64__)    || \
-          defined(__ppc64__) || defined(__powerpc64__) || \
-          defined(__ia64__)  || defined(__alpha__)     || \
-          (defined(__sparc__) && defined(__arch64__))  || \
-          defined(__s390x__) ) )
-       typedef  int64_t t_sint;
-       typedef uint64_t t_uint;
-       typedef unsigned int t_udbl __attribute__((mode(TI)));
-       #define POLARSSL_HAVE_UDBL
-    #else
-       typedef  int32_t t_sint;
-       typedef uint32_t t_uint;
-       #if ( defined(_MSC_VER) && defined(_M_IX86) )
-         typedef uint64_t t_udbl;
-         #define POLARSSL_HAVE_UDBL
-       #else
-         #if defined( POLARSSL_HAVE_LONGLONG )
-           typedef unsigned long long t_udbl;
-           #define POLARSSL_HAVE_UDBL
-         #endif
-       #endif
-    #endif
-  #endif
-#endif /* POLARSSL_HAVE_INT16 */
-#endif /* POLARSSL_HAVE_INT8  */
-
-/**
- * \brief          MPI structure
- */
-typedef struct
-{
-    int s;              /*!<  integer sign      */
-    size_t n;           /*!<  total # of limbs  */
-    t_uint *p;          /*!<  pointer to limbs  */
-}
-mpi;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * \brief           Initialize one MPI
- *
- * \param X         One MPI to initialize.
- */
-void mpi_init( mpi *X );
-
-/**
- * \brief          Unallocate one MPI
- *
- * \param X        One MPI to unallocate.
- */
-void mpi_free( mpi *X );
-
-/**
- * \brief          Enlarge to the specified number of limbs
- *
- * \param X        MPI to grow
- * \param nblimbs  The target number of limbs
- *
- * \return         0 if successful,
- *                 POLARSSL_ERR_MPI_MALLOC_FAILED if memory allocation failed
- */
-int mpi_grow( mpi *X, size_t nblimbs );
-
-/**
- * \brief          Copy the contents of Y into X
- *
- * \param X        Destination MPI
- * \param Y        Source MPI
- *
- * \return         0 if successful,
- *                 POLARSSL_ERR_MPI_MALLOC_FAILED if memory allocation failed
- */
-int mpi_copy( mpi *X, const mpi *Y );
-
-/**
- * \brief          Swap the contents of X and Y
- *
- * \param X        First MPI value
- * \param Y        Second MPI value
- */
-void mpi_swap( mpi *X, mpi *Y );
-
-/**
- * \brief          Set value from integer
- *
- * \param X        MPI to set
- * \param z        Value to use
- *
- * \return         0 if successful,
- *                 POLARSSL_ERR_MPI_MALLOC_FAILED if memory allocation failed
- */
-int mpi_lset( mpi *X, t_sint z );
-
-/**
- * \brief          Get a specific bit from X
- *
- * \param X        MPI to use
- * \param pos      Zero-based index of the bit in X
- *
- * \return         Either a 0 or a 1
- */
-int mpi_get_bit( const mpi *X, size_t pos );
-
-/**
- * \brief          Set a bit of X to a specific value of 0 or 1
- *
- * \note           Will grow X if necessary to set a bit to 1 in a not yet
- *                 existing limb. Will not grow if bit should be set to 0
- *
- * \param X        MPI to use
- * \param pos      Zero-based index of the bit in X
- * \param val      The value to set the bit to (0 or 1)
- *
- * \return         0 if successful,
- *                 POLARSSL_ERR_MPI_MALLOC_FAILED if memory allocation failed,
- *                 POLARSSL_ERR_MPI_BAD_INPUT_DATA if val is not 0 or 1
- */
-int mpi_set_bit( mpi *X, size_t pos, unsigned char val );
-
-/**
- * \brief          Return the number of zero-bits before the least significant
- *                 '1' bit
- *
- * Note: Thus also the zero-based index of the least significant '1' bit
- *
- * \param X        MPI to use
- */
-size_t mpi_lsb( const mpi *X );
-
-/**
- * \brief          Return the number of bits up to and including the most
- *                 significant '1' bit'
- *
- * Note: Thus also the one-based index of the most significant '1' bit
- *
- * \param X        MPI to use
- */
-size_t mpi_msb( const mpi *X );
-
-/**
- * \brief          Return the total size in bytes
- *
- * \param X        MPI to use
- */
-size_t mpi_size( const mpi *X );
-
-/**
- * \brief          Import from an ASCII string
- *
- * \param X        Destination MPI
- * \param radix    Input numeric base
- * \param s        Null-terminated string buffer
- *
- * \return         0 if successful, or a POLARSSL_ERR_MPI_XXX error code
- */
-int mpi_read_string( mpi *X, int radix, const char *s );
-
-/**
- * \brief          Export into an ASCII string
- *
- * \param X        Source MPI
- * \param radix    Output numeric base
- * \param s        String buffer
- * \param slen     String buffer size
- *
- * \return         0 if successful, or a POLARSSL_ERR_MPI_XXX error code.
- *                 *slen is always updated to reflect the amount
- *                 of data that has (or would have) been written.
- *
- * \note           Call this function with *slen = 0 to obtain the
- *                 minimum required buffer size in *slen.
- */
-int mpi_write_string( const mpi *X, int radix, char *s, size_t *slen );
-
-#if defined(POLARSSL_FS_IO)
-/**
- * \brief          Read X from an opened file
- *
- * \param X        Destination MPI
- * \param radix    Input numeric base
- * \param fin      Input file handle
- *
- * \return         0 if successful, POLARSSL_ERR_MPI_BUFFER_TOO_SMALL if
- *                 the file read buffer is too small or a
- *                 POLARSSL_ERR_MPI_XXX error code
- */
-int mpi_read_file( mpi *X, int radix, FILE *fin );
-
-/**
- * \brief          Write X into an opened file, or stdout if fout is NULL
- *
- * \param p        Prefix, can be NULL
- * \param X        Source MPI
- * \param radix    Output numeric base
- * \param fout     Output file handle (can be NULL)
- *
- * \return         0 if successful, or a POLARSSL_ERR_MPI_XXX error code
- *
- * \note           Set fout == NULL to print X on the console.
- */
-int mpi_write_file( const char *p, const mpi *X, int radix, FILE *fout );
-#endif /* POLARSSL_FS_IO */
-
-/**
- * \brief          Import X from unsigned binary data, big endian
- *
- * \param X        Destination MPI
- * \param buf      Input buffer
- * \param buflen   Input buffer size
- *
- * \return         0 if successful,
- *                 POLARSSL_ERR_MPI_MALLOC_FAILED if memory allocation failed
- */
-int mpi_read_binary( mpi *X, const unsigned char *buf, size_t buflen );
-
-/**
- * \brief          Export X into unsigned binary data, big endian
- *
- * \param X        Source MPI
- * \param buf      Output buffer
- * \param buflen   Output buffer size
- *
- * \return         0 if successful,
- *                 POLARSSL_ERR_MPI_BUFFER_TOO_SMALL if buf isn't large enough
- */
-int mpi_write_binary( const mpi *X, unsigned char *buf, size_t buflen );
-
-/**
- * \brief          Left-shift: X <<= count
- *
- * \param X        MPI to shift
- * \param count    Amount to shift
- *
- * \return         0 if successful,
- *                 POLARSSL_ERR_MPI_MALLOC_FAILED if memory allocation failed
- */
-int mpi_shift_l( mpi *X, size_t count );
-
-/**
- * \brief          Right-shift: X >>= count
- *
- * \param X        MPI to shift
- * \param count    Amount to shift
- *
- * \return         0 if successful,
- *                 POLARSSL_ERR_MPI_MALLOC_FAILED if memory allocation failed
- */
-int mpi_shift_r( mpi *X, size_t count );
-
-/**
- * \brief          Compare unsigned values
- *
- * \param X        Left-hand MPI
- * \param Y        Right-hand MPI
- *
- * \return         1 if |X| is greater than |Y|,
- *                -1 if |X| is lesser  than |Y| or
- *                 0 if |X| is equal to |Y|
- */
-int mpi_cmp_abs( const mpi *X, const mpi *Y );
-
-/**
- * \brief          Compare signed values
- *
- * \param X        Left-hand MPI
- * \param Y        Right-hand MPI
- *
- * \return         1 if X is greater than Y,
- *                -1 if X is lesser  than Y or
- *                 0 if X is equal to Y
- */
-int mpi_cmp_mpi( const mpi *X, const mpi *Y );
-
-/**
- * \brief          Compare signed values
- *
- * \param X        Left-hand MPI
- * \param z        The integer value to compare to
- *
- * \return         1 if X is greater than z,
- *                -1 if X is lesser  than z or
- *                 0 if X is equal to z
- */
-int mpi_cmp_int( const mpi *X, t_sint z );
-
-/**
- * \brief          Unsigned addition: X = |A| + |B|
- *
- * \param X        Destination MPI
- * \param A        Left-hand MPI
- * \param B        Right-hand MPI
- *
- * \return         0 if successful,
- *                 POLARSSL_ERR_MPI_MALLOC_FAILED if memory allocation failed
- */
-int mpi_add_abs( mpi *X, const mpi *A, const mpi *B );
-
-/**
- * \brief          Unsigned substraction: X = |A| - |B|
- *
- * \param X        Destination MPI
- * \param A        Left-hand MPI
- * \param B        Right-hand MPI
- *
- * \return         0 if successful,
- *                 POLARSSL_ERR_MPI_NEGATIVE_VALUE if B is greater than A
- */
-int mpi_sub_abs( mpi *X, const mpi *A, const mpi *B );
-
-/**
- * \brief          Signed addition: X = A + B
- *
- * \param X        Destination MPI
- * \param A        Left-hand MPI
- * \param B        Right-hand MPI
- *
- * \return         0 if successful,
- *                 POLARSSL_ERR_MPI_MALLOC_FAILED if memory allocation failed
- */
-int mpi_add_mpi( mpi *X, const mpi *A, const mpi *B );
-
-/**
- * \brief          Signed substraction: X = A - B
- *
- * \param X        Destination MPI
- * \param A        Left-hand MPI
- * \param B        Right-hand MPI
- *
- * \return         0 if successful,
- *                 POLARSSL_ERR_MPI_MALLOC_FAILED if memory allocation failed
- */
-int mpi_sub_mpi( mpi *X, const mpi *A, const mpi *B );
-
-/**
- * \brief          Signed addition: X = A + b
- *
- * \param X        Destination MPI
- * \param A        Left-hand MPI
- * \param b        The integer value to add
- *
- * \return         0 if successful,
- *                 POLARSSL_ERR_MPI_MALLOC_FAILED if memory allocation failed
- */
-int mpi_add_int( mpi *X, const mpi *A, t_sint b );
-
-/**
- * \brief          Signed substraction: X = A - b
- *
- * \param X        Destination MPI
- * \param A        Left-hand MPI
- * \param b        The integer value to subtract
- *
- * \return         0 if successful,
- *                 POLARSSL_ERR_MPI_MALLOC_FAILED if memory allocation failed
- */
-int mpi_sub_int( mpi *X, const mpi *A, t_sint b );
-
-/**
- * \brief          Baseline multiplication: X = A * B
- *
- * \param X        Destination MPI
- * \param A        Left-hand MPI
- * \param B        Right-hand MPI
- *
- * \return         0 if successful,
- *                 POLARSSL_ERR_MPI_MALLOC_FAILED if memory allocation failed
- */
-int mpi_mul_mpi( mpi *X, const mpi *A, const mpi *B );
-
-/**
- * \brief          Baseline multiplication: X = A * b
- *                 Note: b is an unsigned integer type, thus
- *                 Negative values of b are ignored.
- *
- * \param X        Destination MPI
- * \param A        Left-hand MPI
- * \param b        The integer value to multiply with
- *
- * \return         0 if successful,
- *                 POLARSSL_ERR_MPI_MALLOC_FAILED if memory allocation failed
- */
-int mpi_mul_int( mpi *X, const mpi *A, t_sint b );
-
-/**
- * \brief          Division by mpi: A = Q * B + R
- *
- * \param Q        Destination MPI for the quotient
- * \param R        Destination MPI for the rest value
- * \param A        Left-hand MPI
- * \param B        Right-hand MPI
- *
- * \return         0 if successful,
- *                 POLARSSL_ERR_MPI_MALLOC_FAILED if memory allocation failed,
- *                 POLARSSL_ERR_MPI_DIVISION_BY_ZERO if B == 0
- *
- * \note           Either Q or R can be NULL.
- */
-int mpi_div_mpi( mpi *Q, mpi *R, const mpi *A, const mpi *B );
-
-/**
- * \brief          Division by int: A = Q * b + R
- *
- * \param Q        Destination MPI for the quotient
- * \param R        Destination MPI for the rest value
- * \param A        Left-hand MPI
- * \param b        Integer to divide by
- *
- * \return         0 if successful,
- *                 POLARSSL_ERR_MPI_MALLOC_FAILED if memory allocation failed,
- *                 POLARSSL_ERR_MPI_DIVISION_BY_ZERO if b == 0
- *
- * \note           Either Q or R can be NULL.
- */
-int mpi_div_int( mpi *Q, mpi *R, const mpi *A, t_sint b );
-
-/**
- * \brief          Modulo: R = A mod B
- *
- * \param R        Destination MPI for the rest value
- * \param A        Left-hand MPI
- * \param B        Right-hand MPI
- *
- * \return         0 if successful,
- *                 POLARSSL_ERR_MPI_MALLOC_FAILED if memory allocation failed,
- *                 POLARSSL_ERR_MPI_DIVISION_BY_ZERO if B == 0,
- *                 POLARSSL_ERR_MPI_NEGATIVE_VALUE if B < 0
- */
-int mpi_mod_mpi( mpi *R, const mpi *A, const mpi *B );
-
-/**
- * \brief          Modulo: r = A mod b
- *
- * \param r        Destination t_uint
- * \param A        Left-hand MPI
- * \param b        Integer to divide by
- *
- * \return         0 if successful,
- *                 POLARSSL_ERR_MPI_MALLOC_FAILED if memory allocation failed,
- *                 POLARSSL_ERR_MPI_DIVISION_BY_ZERO if b == 0,
- *                 POLARSSL_ERR_MPI_NEGATIVE_VALUE if b < 0
- */
-int mpi_mod_int( t_uint *r, const mpi *A, t_sint b );
-
-/**
- * \brief          Sliding-window exponentiation: X = A^E mod N
- *
- * \param X        Destination MPI 
- * \param A        Left-hand MPI
- * \param E        Exponent MPI
- * \param N        Modular MPI
- * \param _RR      Speed-up MPI used for recalculations
- *
- * \return         0 if successful,
- *                 POLARSSL_ERR_MPI_MALLOC_FAILED if memory allocation failed,
- *                 POLARSSL_ERR_MPI_BAD_INPUT_DATA if N is negative or even or if
- *                 E is negative
- *
- * \note           _RR is used to avoid re-computing R*R mod N across
- *                 multiple calls, which speeds up things a bit. It can
- *                 be set to NULL if the extra performance is unneeded.
- */
-int mpi_exp_mod( mpi *X, const mpi *A, const mpi *E, const mpi *N, mpi *_RR );
-
-/**
- * \brief          Fill an MPI X with size bytes of random
- *
- * \param X        Destination MPI
- * \param size     Size in bytes
- * \param f_rng    RNG function
- * \param p_rng    RNG parameter
- *
- * \return         0 if successful,
- *                 POLARSSL_ERR_MPI_MALLOC_FAILED if memory allocation failed
- */
-int mpi_fill_random( mpi *X, size_t size,
-                     int (*f_rng)(void *, unsigned char *, size_t),
-                     void *p_rng );
-
-/**
- * \brief          Greatest common divisor: G = gcd(A, B)
- *
- * \param G        Destination MPI
- * \param A        Left-hand MPI
- * \param B        Right-hand MPI
- *
- * \return         0 if successful,
- *                 POLARSSL_ERR_MPI_MALLOC_FAILED if memory allocation failed
- */
-int mpi_gcd( mpi *G, const mpi *A, const mpi *B );
-
-/**
- * \brief          Modular inverse: X = A^-1 mod N
- *
- * \param X        Destination MPI
- * \param A        Left-hand MPI
- * \param N        Right-hand MPI
- *
- * \return         0 if successful,
- *                 POLARSSL_ERR_MPI_MALLOC_FAILED if memory allocation failed,
- *                 POLARSSL_ERR_MPI_BAD_INPUT_DATA if N is negative or nil
-                   POLARSSL_ERR_MPI_NOT_ACCEPTABLE if A has no inverse mod N
- */
-int mpi_inv_mod( mpi *X, const mpi *A, const mpi *N );
-
-/**
- * \brief          Miller-Rabin primality test
- *
- * \param X        MPI to check
- * \param f_rng    RNG function
- * \param p_rng    RNG parameter
- *
- * \return         0 if successful (probably prime),
- *                 POLARSSL_ERR_MPI_MALLOC_FAILED if memory allocation failed,
- *                 POLARSSL_ERR_MPI_NOT_ACCEPTABLE if X is not prime
- */
-int mpi_is_prime( mpi *X,
-                  int (*f_rng)(void *, unsigned char *, size_t),
-                  void *p_rng );
-
-/**
- * \brief          Prime number generation
- *
- * \param X        Destination MPI
- * \param nbits    Required size of X in bits ( 3 <= nbits <= POLARSSL_MPI_MAX_BITS )
- * \param dh_flag  If 1, then (X-1)/2 will be prime too
- * \param f_rng    RNG function
- * \param p_rng    RNG parameter
- *
- * \return         0 if successful (probably prime),
- *                 POLARSSL_ERR_MPI_MALLOC_FAILED if memory allocation failed,
- *                 POLARSSL_ERR_MPI_BAD_INPUT_DATA if nbits is < 3
- */
-int mpi_gen_prime( mpi *X, size_t nbits, int dh_flag,
-                   int (*f_rng)(void *, unsigned char *, size_t),
-                   void *p_rng );
-
-/**
- * \brief          Checkup routine
- *
- * \return         0 if successful, or 1 if the test failed
- */
-int mpi_self_test( int verbose );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* bignum.h */
diff --git a/common/polarssl/bn_mul.h b/common/polarssl/bn_mul.h
deleted file mode 100644
index 1c2da136a..000000000
--- a/common/polarssl/bn_mul.h
+++ /dev/null
@@ -1,864 +0,0 @@
-/**
- * \file bn_mul.h
- *
- * \brief  Multi-precision integer library
- *
- *  Copyright (C) 2006-2010, Brainspark B.V.
- *
- *  This file is part of PolarSSL (http://www.polarssl.org)
- *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
- *
- *  All rights reserved.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-/*
- *      Multiply source vector [s] with b, add result
- *       to destination vector [d] and set carry c.
- *
- *      Currently supports:
- *
- *         . IA-32 (386+)         . AMD64 / EM64T
- *         . IA-32 (SSE2)         . Motorola 68000
- *         . PowerPC, 32-bit      . MicroBlaze
- *         . PowerPC, 64-bit      . TriCore
- *         . SPARC v8             . ARM v3+
- *         . Alpha                . MIPS32
- *         . C, longlong          . C, generic
- */
-#ifndef POLARSSL_BN_MUL_H
-#define POLARSSL_BN_MUL_H
-
-#include "bignum.h"
-
-#if defined(POLARSSL_HAVE_ASM)
-
-#if defined(__GNUC__)
-#if defined(__i386__)
-
-#define MULADDC_INIT                \
-    asm( "                          \
-        movl   %%ebx, %0;           \
-        movl   %5, %%esi;           \
-        movl   %6, %%edi;           \
-        movl   %7, %%ecx;           \
-        movl   %8, %%ebx;           \
-        "
-
-#define MULADDC_CORE                \
-        "                           \
-        lodsl;                      \
-        mull   %%ebx;               \
-        addl   %%ecx,   %%eax;      \
-        adcl   $0,      %%edx;      \
-        addl   (%%edi), %%eax;      \
-        adcl   $0,      %%edx;      \
-        movl   %%edx,   %%ecx;      \
-        stosl;                      \
-        "
-
-#if defined(POLARSSL_HAVE_SSE2)
-
-#define MULADDC_HUIT                    \
-        "                               \
-        movd     %%ecx,     %%mm1;      \
-        movd     %%ebx,     %%mm0;      \
-        movd     (%%edi),   %%mm3;      \
-        paddq    %%mm3,     %%mm1;      \
-        movd     (%%esi),   %%mm2;      \
-        pmuludq  %%mm0,     %%mm2;      \
-        movd     4(%%esi),  %%mm4;      \
-        pmuludq  %%mm0,     %%mm4;      \
-        movd     8(%%esi),  %%mm6;      \
-        pmuludq  %%mm0,     %%mm6;      \
-        movd     12(%%esi), %%mm7;      \
-        pmuludq  %%mm0,     %%mm7;      \
-        paddq    %%mm2,     %%mm1;      \
-        movd     4(%%edi),  %%mm3;      \
-        paddq    %%mm4,     %%mm3;      \
-        movd     8(%%edi),  %%mm5;      \
-        paddq    %%mm6,     %%mm5;      \
-        movd     12(%%edi), %%mm4;      \
-        paddq    %%mm4,     %%mm7;      \
-        movd     %%mm1,     (%%edi);    \
-        movd     16(%%esi), %%mm2;      \
-        pmuludq  %%mm0,     %%mm2;      \
-        psrlq    $32,       %%mm1;      \
-        movd     20(%%esi), %%mm4;      \
-        pmuludq  %%mm0,     %%mm4;      \
-        paddq    %%mm3,     %%mm1;      \
-        movd     24(%%esi), %%mm6;      \
-        pmuludq  %%mm0,     %%mm6;      \
-        movd     %%mm1,     4(%%edi);   \
-        psrlq    $32,       %%mm1;      \
-        movd     28(%%esi), %%mm3;      \
-        pmuludq  %%mm0,     %%mm3;      \
-        paddq    %%mm5,     %%mm1;      \
-        movd     16(%%edi), %%mm5;      \
-        paddq    %%mm5,     %%mm2;      \
-        movd     %%mm1,     8(%%edi);   \
-        psrlq    $32,       %%mm1;      \
-        paddq    %%mm7,     %%mm1;      \
-        movd     20(%%edi), %%mm5;      \
-        paddq    %%mm5,     %%mm4;      \
-        movd     %%mm1,     12(%%edi);  \
-        psrlq    $32,       %%mm1;      \
-        paddq    %%mm2,     %%mm1;      \
-        movd     24(%%edi), %%mm5;      \
-        paddq    %%mm5,     %%mm6;      \
-        movd     %%mm1,     16(%%edi);  \
-        psrlq    $32,       %%mm1;      \
-        paddq    %%mm4,     %%mm1;      \
-        movd     28(%%edi), %%mm5;      \
-        paddq    %%mm5,     %%mm3;      \
-        movd     %%mm1,     20(%%edi);  \
-        psrlq    $32,       %%mm1;      \
-        paddq    %%mm6,     %%mm1;      \
-        movd     %%mm1,     24(%%edi);  \
-        psrlq    $32,       %%mm1;      \
-        paddq    %%mm3,     %%mm1;      \
-        movd     %%mm1,     28(%%edi);  \
-        addl     $32,       %%edi;      \
-        addl     $32,       %%esi;      \
-        psrlq    $32,       %%mm1;      \
-        movd     %%mm1,     %%ecx;      \
-        "
-
-#define MULADDC_STOP            \
-        "                       \
-        emms;                   \
-        movl   %4, %%ebx;       \
-        movl   %%ecx, %1;       \
-        movl   %%edi, %2;       \
-        movl   %%esi, %3;       \
-        "                       \
-        : "=m" (t), "=m" (c), "=m" (d), "=m" (s)        \
-        : "m" (t), "m" (s), "m" (d), "m" (c), "m" (b)   \
-        : "eax", "ecx", "edx", "esi", "edi"             \
-    );
-
-#else
-
-#define MULADDC_STOP            \
-        "                       \
-        movl   %4, %%ebx;       \
-        movl   %%ecx, %1;       \
-        movl   %%edi, %2;       \
-        movl   %%esi, %3;       \
-        "                       \
-        : "=m" (t), "=m" (c), "=m" (d), "=m" (s)        \
-        : "m" (t), "m" (s), "m" (d), "m" (c), "m" (b)   \
-        : "eax", "ecx", "edx", "esi", "edi"             \
-    );
-#endif /* SSE2 */
-#endif /* i386 */
-
-#if defined(__amd64__) || defined (__x86_64__)
-
-#define MULADDC_INIT                            \
-    asm( "movq   %0, %%rsi      " :: "m" (s));  \
-    asm( "movq   %0, %%rdi      " :: "m" (d));  \
-    asm( "movq   %0, %%rcx      " :: "m" (c));  \
-    asm( "movq   %0, %%rbx      " :: "m" (b));  \
-    asm( "xorq   %r8, %r8       " );
-
-#define MULADDC_CORE                            \
-    asm( "movq  (%rsi),%rax     " );            \
-    asm( "mulq   %rbx           " );            \
-    asm( "addq   $8,   %rsi     " );            \
-    asm( "addq   %rcx, %rax     " );            \
-    asm( "movq   %r8,  %rcx     " );            \
-    asm( "adcq   $0,   %rdx     " );            \
-    asm( "nop                   " );            \
-    asm( "addq   %rax, (%rdi)   " );            \
-    asm( "adcq   %rdx, %rcx     " );            \
-    asm( "addq   $8,   %rdi     " );
-
-#define MULADDC_STOP                            \
-    asm( "movq   %%rcx, %0      " : "=m" (c));  \
-    asm( "movq   %%rdi, %0      " : "=m" (d));  \
-    asm( "movq   %%rsi, %0      " : "=m" (s) :: \
-    "rax", "rcx", "rdx", "rbx", "rsi", "rdi", "r8" );
-
-#endif /* AMD64 */
-
-#if defined(__mc68020__) || defined(__mcpu32__)
-
-#define MULADDC_INIT                            \
-    asm( "movl   %0, %%a2       " :: "m" (s));  \
-    asm( "movl   %0, %%a3       " :: "m" (d));  \
-    asm( "movl   %0, %%d3       " :: "m" (c));  \
-    asm( "movl   %0, %%d2       " :: "m" (b));  \
-    asm( "moveq  #0, %d0        " );
-
-#define MULADDC_CORE                            \
-    asm( "movel  %a2@+, %d1     " );            \
-    asm( "mulul  %d2, %d4:%d1   " );            \
-    asm( "addl   %d3, %d1       " );            \
-    asm( "addxl  %d0, %d4       " );            \
-    asm( "moveq  #0,  %d3       " );            \
-    asm( "addl   %d1, %a3@+     " );            \
-    asm( "addxl  %d4, %d3       " );
-
-#define MULADDC_STOP                            \
-    asm( "movl   %%d3, %0       " : "=m" (c));  \
-    asm( "movl   %%a3, %0       " : "=m" (d));  \
-    asm( "movl   %%a2, %0       " : "=m" (s) :: \
-    "d0", "d1", "d2", "d3", "d4", "a2", "a3" );
-
-#define MULADDC_HUIT                            \
-    asm( "movel  %a2@+, %d1     " );            \
-    asm( "mulul  %d2, %d4:%d1   " );            \
-    asm( "addxl  %d3, %d1       " );            \
-    asm( "addxl  %d0, %d4       " );            \
-    asm( "addl   %d1, %a3@+     " );            \
-    asm( "movel  %a2@+, %d1     " );            \
-    asm( "mulul  %d2, %d3:%d1   " );            \
-    asm( "addxl  %d4, %d1       " );            \
-    asm( "addxl  %d0, %d3       " );            \
-    asm( "addl   %d1, %a3@+     " );            \
-    asm( "movel  %a2@+, %d1     " );            \
-    asm( "mulul  %d2, %d4:%d1   " );            \
-    asm( "addxl  %d3, %d1       " );            \
-    asm( "addxl  %d0, %d4       " );            \
-    asm( "addl   %d1, %a3@+     " );            \
-    asm( "movel  %a2@+, %d1     " );            \
-    asm( "mulul  %d2, %d3:%d1   " );            \
-    asm( "addxl  %d4, %d1       " );            \
-    asm( "addxl  %d0, %d3       " );            \
-    asm( "addl   %d1, %a3@+     " );            \
-    asm( "movel  %a2@+, %d1     " );            \
-    asm( "mulul  %d2, %d4:%d1   " );            \
-    asm( "addxl  %d3, %d1       " );            \
-    asm( "addxl  %d0, %d4       " );            \
-    asm( "addl   %d1, %a3@+     " );            \
-    asm( "movel  %a2@+, %d1     " );            \
-    asm( "mulul  %d2, %d3:%d1   " );            \
-    asm( "addxl  %d4, %d1       " );            \
-    asm( "addxl  %d0, %d3       " );            \
-    asm( "addl   %d1, %a3@+     " );            \
-    asm( "movel  %a2@+, %d1     " );            \
-    asm( "mulul  %d2, %d4:%d1   " );            \
-    asm( "addxl  %d3, %d1       " );            \
-    asm( "addxl  %d0, %d4       " );            \
-    asm( "addl   %d1, %a3@+     " );            \
-    asm( "movel  %a2@+, %d1     " );            \
-    asm( "mulul  %d2, %d3:%d1   " );            \
-    asm( "addxl  %d4, %d1       " );            \
-    asm( "addxl  %d0, %d3       " );            \
-    asm( "addl   %d1, %a3@+     " );            \
-    asm( "addxl  %d0, %d3       " );
-
-#endif /* MC68000 */
-
-#if defined(__powerpc__)   || defined(__ppc__)
-#if defined(__powerpc64__) || defined(__ppc64__)
-
-#if defined(__MACH__) && defined(__APPLE__)
-
-#define MULADDC_INIT                            \
-    asm( "ld     r3, %0         " :: "m" (s));  \
-    asm( "ld     r4, %0         " :: "m" (d));  \
-    asm( "ld     r5, %0         " :: "m" (c));  \
-    asm( "ld     r6, %0         " :: "m" (b));  \
-    asm( "addi   r3, r3, -8     " );            \
-    asm( "addi   r4, r4, -8     " );            \
-    asm( "addic  r5, r5,  0     " );
-
-#define MULADDC_CORE                            \
-    asm( "ldu    r7, 8(r3)      " );            \
-    asm( "mulld  r8, r7, r6     " );            \
-    asm( "mulhdu r9, r7, r6     " );            \
-    asm( "adde   r8, r8, r5     " );            \
-    asm( "ld     r7, 8(r4)      " );            \
-    asm( "addze  r5, r9         " );            \
-    asm( "addc   r8, r8, r7     " );            \
-    asm( "stdu   r8, 8(r4)      " );
-
-#define MULADDC_STOP                            \
-    asm( "addze  r5, r5         " );            \
-    asm( "addi   r4, r4, 8      " );            \
-    asm( "addi   r3, r3, 8      " );            \
-    asm( "std    r5, %0         " : "=m" (c));  \
-    asm( "std    r4, %0         " : "=m" (d));  \
-    asm( "std    r3, %0         " : "=m" (s) :: \
-    "r3", "r4", "r5", "r6", "r7", "r8", "r9" );
-
-#else
-
-#define MULADDC_INIT                            \
-    asm( "ld     %%r3, %0       " :: "m" (s));  \
-    asm( "ld     %%r4, %0       " :: "m" (d));  \
-    asm( "ld     %%r5, %0       " :: "m" (c));  \
-    asm( "ld     %%r6, %0       " :: "m" (b));  \
-    asm( "addi   %r3, %r3, -8   " );            \
-    asm( "addi   %r4, %r4, -8   " );            \
-    asm( "addic  %r5, %r5,  0   " );
-
-#define MULADDC_CORE                            \
-    asm( "ldu    %r7, 8(%r3)    " );            \
-    asm( "mulld  %r8, %r7, %r6  " );            \
-    asm( "mulhdu %r9, %r7, %r6  " );            \
-    asm( "adde   %r8, %r8, %r5  " );            \
-    asm( "ld     %r7, 8(%r4)    " );            \
-    asm( "addze  %r5, %r9       " );            \
-    asm( "addc   %r8, %r8, %r7  " );            \
-    asm( "stdu   %r8, 8(%r4)    " );
-
-#define MULADDC_STOP                            \
-    asm( "addze  %r5, %r5       " );            \
-    asm( "addi   %r4, %r4, 8    " );            \
-    asm( "addi   %r3, %r3, 8    " );            \
-    asm( "std    %%r5, %0       " : "=m" (c));  \
-    asm( "std    %%r4, %0       " : "=m" (d));  \
-    asm( "std    %%r3, %0       " : "=m" (s) :: \
-    "r3", "r4", "r5", "r6", "r7", "r8", "r9" );
-
-#endif
-
-#else /* PPC32 */
-
-#if defined(__MACH__) && defined(__APPLE__)
-
-#define MULADDC_INIT                            \
-    asm( "lwz    r3, %0         " :: "m" (s));  \
-    asm( "lwz    r4, %0         " :: "m" (d));  \
-    asm( "lwz    r5, %0         " :: "m" (c));  \
-    asm( "lwz    r6, %0         " :: "m" (b));  \
-    asm( "addi   r3, r3, -4     " );            \
-    asm( "addi   r4, r4, -4     " );            \
-    asm( "addic  r5, r5,  0     " );
-
-#define MULADDC_CORE                            \
-    asm( "lwzu   r7, 4(r3)      " );            \
-    asm( "mullw  r8, r7, r6     " );            \
-    asm( "mulhwu r9, r7, r6     " );            \
-    asm( "adde   r8, r8, r5     " );            \
-    asm( "lwz    r7, 4(r4)      " );            \
-    asm( "addze  r5, r9         " );            \
-    asm( "addc   r8, r8, r7     " );            \
-    asm( "stwu   r8, 4(r4)      " );
-
-#define MULADDC_STOP                            \
-    asm( "addze  r5, r5         " );            \
-    asm( "addi   r4, r4, 4      " );            \
-    asm( "addi   r3, r3, 4      " );            \
-    asm( "stw    r5, %0         " : "=m" (c));  \
-    asm( "stw    r4, %0         " : "=m" (d));  \
-    asm( "stw    r3, %0         " : "=m" (s) :: \
-    "r3", "r4", "r5", "r6", "r7", "r8", "r9" );
-
-#else
-
-#define MULADDC_INIT                            \
-    asm( "lwz    %%r3, %0       " :: "m" (s));  \
-    asm( "lwz    %%r4, %0       " :: "m" (d));  \
-    asm( "lwz    %%r5, %0       " :: "m" (c));  \
-    asm( "lwz    %%r6, %0       " :: "m" (b));  \
-    asm( "addi   %r3, %r3, -4   " );            \
-    asm( "addi   %r4, %r4, -4   " );            \
-    asm( "addic  %r5, %r5,  0   " );
-
-#define MULADDC_CORE                            \
-    asm( "lwzu   %r7, 4(%r3)    " );            \
-    asm( "mullw  %r8, %r7, %r6  " );            \
-    asm( "mulhwu %r9, %r7, %r6  " );            \
-    asm( "adde   %r8, %r8, %r5  " );            \
-    asm( "lwz    %r7, 4(%r4)    " );            \
-    asm( "addze  %r5, %r9       " );            \
-    asm( "addc   %r8, %r8, %r7  " );            \
-    asm( "stwu   %r8, 4(%r4)    " );
-
-#define MULADDC_STOP                            \
-    asm( "addze  %r5, %r5       " );            \
-    asm( "addi   %r4, %r4, 4    " );            \
-    asm( "addi   %r3, %r3, 4    " );            \
-    asm( "stw    %%r5, %0       " : "=m" (c));  \
-    asm( "stw    %%r4, %0       " : "=m" (d));  \
-    asm( "stw    %%r3, %0       " : "=m" (s) :: \
-    "r3", "r4", "r5", "r6", "r7", "r8", "r9" );
-
-#endif
-
-#endif /* PPC32 */
-#endif /* PPC64 */
-
-#if defined(__sparc__) && defined(__sparc64__)
-
-#define MULADDC_INIT                            \
-    asm(                                        \
-         "                                      \
-                ldx     %3, %%o0;               \
-                ldx     %4, %%o1;               \
-                ld      %5, %%o2;               \
-                ld      %6, %%o3;               \
-         "
-
-#define MULADDC_CORE                            \
-         "                                      \
-                ld      [%%o0], %%o4;           \
-                inc     4, %%o0;                \
-                ld      [%%o1], %%o5;           \
-                umul    %%o3, %%o4, %%o4;       \
-                addcc   %%o4, %%o2, %%o4;       \
-                rd      %%y, %%g1;              \
-                addx    %%g1, 0, %%g1;          \
-                addcc   %%o4, %%o5, %%o4;       \
-                st      %%o4, [%%o1];           \
-                addx    %%g1, 0, %%o2;          \
-                inc     4, %%o1;                \
-        "
-
-#define MULADDC_STOP                            \
-        "                                       \
-                st      %%o2, %0;               \
-                stx     %%o1, %1;               \
-                stx     %%o0, %2;               \
-        "                                       \
-        : "=m" (c), "=m" (d), "=m" (s)          \
-        : "m" (s), "m" (d), "m" (c), "m" (b)    \
-        : "g1", "o0", "o1", "o2", "o3", "o4",   \
-          "o5"                                  \
-        );
-#endif /* SPARCv9 */
-
-#if defined(__sparc__) && !defined(__sparc64__)
-
-#define MULADDC_INIT                            \
-    asm(                                        \
-         "                                      \
-                ld      %3, %%o0;               \
-                ld      %4, %%o1;               \
-                ld      %5, %%o2;               \
-                ld      %6, %%o3;               \
-         "
-
-#define MULADDC_CORE                            \
-         "                                      \
-                ld      [%%o0], %%o4;           \
-                inc     4, %%o0;                \
-                ld      [%%o1], %%o5;           \
-                umul    %%o3, %%o4, %%o4;       \
-                addcc   %%o4, %%o2, %%o4;       \
-                rd      %%y, %%g1;              \
-                addx    %%g1, 0, %%g1;          \
-                addcc   %%o4, %%o5, %%o4;       \
-                st      %%o4, [%%o1];           \
-                addx    %%g1, 0, %%o2;          \
-                inc     4, %%o1;                \
-        "
-
-#define MULADDC_STOP                            \
-        "                                       \
-                st      %%o2, %0;               \
-                st      %%o1, %1;               \
-                st      %%o0, %2;               \
-        "                                       \
-        : "=m" (c), "=m" (d), "=m" (s)          \
-        : "m" (s), "m" (d), "m" (c), "m" (b)    \
-        : "g1", "o0", "o1", "o2", "o3", "o4",   \
-          "o5"                                  \
-        );
-
-#endif /* SPARCv8 */
-
-#if defined(__microblaze__) || defined(microblaze)
-
-#define MULADDC_INIT                            \
-    asm( "lwi   r3,   %0        " :: "m" (s));  \
-    asm( "lwi   r4,   %0        " :: "m" (d));  \
-    asm( "lwi   r5,   %0        " :: "m" (c));  \
-    asm( "lwi   r6,   %0        " :: "m" (b));  \
-    asm( "andi  r7,   r6, 0xffff" );            \
-    asm( "bsrli r6,   r6, 16    " );
-
-#define MULADDC_CORE                            \
-    asm( "lhui  r8,   r3,   0   " );            \
-    asm( "addi  r3,   r3,   2   " );            \
-    asm( "lhui  r9,   r3,   0   " );            \
-    asm( "addi  r3,   r3,   2   " );            \
-    asm( "mul   r10,  r9,  r6   " );            \
-    asm( "mul   r11,  r8,  r7   " );            \
-    asm( "mul   r12,  r9,  r7   " );            \
-    asm( "mul   r13,  r8,  r6   " );            \
-    asm( "bsrli  r8, r10,  16   " );            \
-    asm( "bsrli  r9, r11,  16   " );            \
-    asm( "add   r13, r13,  r8   " );            \
-    asm( "add   r13, r13,  r9   " );            \
-    asm( "bslli r10, r10,  16   " );            \
-    asm( "bslli r11, r11,  16   " );            \
-    asm( "add   r12, r12, r10   " );            \
-    asm( "addc  r13, r13,  r0   " );            \
-    asm( "add   r12, r12, r11   " );            \
-    asm( "addc  r13, r13,  r0   " );            \
-    asm( "lwi   r10,  r4,   0   " );            \
-    asm( "add   r12, r12, r10   " );            \
-    asm( "addc  r13, r13,  r0   " );            \
-    asm( "add   r12, r12,  r5   " );            \
-    asm( "addc   r5, r13,  r0   " );            \
-    asm( "swi   r12,  r4,   0   " );            \
-    asm( "addi   r4,  r4,   4   " );
-
-#define MULADDC_STOP                            \
-    asm( "swi   r5,   %0        " : "=m" (c));  \
-    asm( "swi   r4,   %0        " : "=m" (d));  \
-    asm( "swi   r3,   %0        " : "=m" (s) :: \
-     "r3", "r4" , "r5" , "r6" , "r7" , "r8" ,   \
-     "r9", "r10", "r11", "r12", "r13" );
-
-#endif /* MicroBlaze */
-
-#if defined(__tricore__)
-
-#define MULADDC_INIT                            \
-    asm( "ld.a   %%a2, %0       " :: "m" (s));  \
-    asm( "ld.a   %%a3, %0       " :: "m" (d));  \
-    asm( "ld.w   %%d4, %0       " :: "m" (c));  \
-    asm( "ld.w   %%d1, %0       " :: "m" (b));  \
-    asm( "xor    %d5, %d5       " );
-
-#define MULADDC_CORE                            \
-    asm( "ld.w   %d0,   [%a2+]      " );        \
-    asm( "madd.u %e2, %e4, %d0, %d1 " );        \
-    asm( "ld.w   %d0,   [%a3]       " );        \
-    asm( "addx   %d2,    %d2,  %d0  " );        \
-    asm( "addc   %d3,    %d3,    0  " );        \
-    asm( "mov    %d4,    %d3        " );        \
-    asm( "st.w  [%a3+],  %d2        " );
-
-#define MULADDC_STOP                            \
-    asm( "st.w   %0, %%d4       " : "=m" (c));  \
-    asm( "st.a   %0, %%a3       " : "=m" (d));  \
-    asm( "st.a   %0, %%a2       " : "=m" (s) :: \
-    "d0", "d1", "e2", "d4", "a2", "a3" );
-
-#endif /* TriCore */
-
-#if defined(__arm__)
-
-#if defined(__thumb__) && !defined(__thumb2__)
-
-#define MULADDC_INIT                            \
-    asm(                                        \
-         "                                      \
-            ldr    r0, %3;                      \
-            ldr    r1, %4;                      \
-            ldr    r2, %5;                      \
-            ldr    r3, %6;                      \
-            lsr    r7, r3, #16;                 \
-            mov    r9, r7;                      \
-            lsl    r7, r3, #16;                 \
-            lsr    r7, r7, #16;                 \
-            mov    r8, r7;                      \
-         "
-
-#define MULADDC_CORE                            \
-         "                                      \
-            ldmia  r0!, {r6};                   \
-            lsr    r7, r6, #16;                 \
-            lsl    r6, r6, #16;                 \
-            lsr    r6, r6, #16;                 \
-            mov    r4, r8;                      \
-            mul    r4, r6;                      \
-            mov    r3, r9;                      \
-            mul    r6, r3;                      \
-            mov    r5, r9;                      \
-            mul    r5, r7;                      \
-            mov    r3, r8;                      \
-            mul    r7, r3;                      \
-            lsr    r3, r6, #16;                 \
-            add    r5, r5, r3;                  \
-            lsr    r3, r7, #16;                 \
-            add    r5, r5, r3;                  \
-            add    r4, r4, r2;                  \
-            mov    r2, #0;                      \
-            adc    r5, r2;                      \
-            lsl    r3, r6, #16;                 \
-            add    r4, r4, r3;                  \
-            adc    r5, r2;                      \
-            lsl    r3, r7, #16;                 \
-            add    r4, r4, r3;                  \
-            adc    r5, r2;                      \
-            ldr    r3, [r1];                    \
-            add    r4, r4, r3;                  \
-            adc    r2, r5;                      \
-            stmia  r1!, {r4};                   \
-         "
-
-#define MULADDC_STOP                            \
-         "                                      \
-            str    r2, %0;                      \
-            str    r1, %1;                      \
-            str    r0, %2;                      \
-         "                                      \
-         : "=m" (c),  "=m" (d), "=m" (s)        \
-         : "m" (s), "m" (d), "m" (c), "m" (b)   \
-         : "r0", "r1", "r2", "r3", "r4", "r5",  \
-           "r6", "r7", "r8", "r9", "cc"         \
-         );
-
-#else
-
-#define MULADDC_INIT                            \
-    asm(                                        \
-         "                                     \
-            ldr    r0, %3;                      \
-            ldr    r1, %4;                      \
-            ldr    r2, %5;                      \
-            ldr    r3, %6;                      \
-         "
-
-#define MULADDC_CORE                            \
-         "                                      \
-            ldr    r4, [r0], #4;                \
-            mov    r5, #0;                      \
-            ldr    r6, [r1];                    \
-            umlal  r2, r5, r3, r4;              \
-            adds   r7, r6, r2;                  \
-            adc    r2, r5, #0;                  \
-            str    r7, [r1], #4;                \
-         "
-
-#define MULADDC_STOP                            \
-         "                                      \
-            str    r2, %0;                      \
-            str    r1, %1;                      \
-            str    r0, %2;                      \
-         "                                      \
-         : "=m" (c),  "=m" (d), "=m" (s)        \
-         : "m" (s), "m" (d), "m" (c), "m" (b)   \
-         : "r0", "r1", "r2", "r3", "r4", "r5",  \
-           "r6", "r7", "cc"                     \
-         );
-
-#endif /* Thumb */
-
-#endif /* ARMv3 */
-
-#if defined(__alpha__)
-
-#define MULADDC_INIT                            \
-    asm( "ldq    $1, %0         " :: "m" (s));  \
-    asm( "ldq    $2, %0         " :: "m" (d));  \
-    asm( "ldq    $3, %0         " :: "m" (c));  \
-    asm( "ldq    $4, %0         " :: "m" (b));
-
-#define MULADDC_CORE                            \
-    asm( "ldq    $6,  0($1)     " );            \
-    asm( "addq   $1,  8, $1     " );            \
-    asm( "mulq   $6, $4, $7     " );            \
-    asm( "umulh  $6, $4, $6     " );            \
-    asm( "addq   $7, $3, $7     " );            \
-    asm( "cmpult $7, $3, $3     " );            \
-    asm( "ldq    $5,  0($2)     " );            \
-    asm( "addq   $7, $5, $7     " );            \
-    asm( "cmpult $7, $5, $5     " );            \
-    asm( "stq    $7,  0($2)     " );            \
-    asm( "addq   $2,  8, $2     " );            \
-    asm( "addq   $6, $3, $3     " );            \
-    asm( "addq   $5, $3, $3     " );
-
-#define MULADDC_STOP                            \
-    asm( "stq    $3, %0         " : "=m" (c));  \
-    asm( "stq    $2, %0         " : "=m" (d));  \
-    asm( "stq    $1, %0         " : "=m" (s) :: \
-    "$1", "$2", "$3", "$4", "$5", "$6", "$7" );
-
-#endif /* Alpha */
-
-#if defined(__mips__)
-
-#define MULADDC_INIT                            \
-    asm( "lw     $10, %0        " :: "m" (s));  \
-    asm( "lw     $11, %0        " :: "m" (d));  \
-    asm( "lw     $12, %0        " :: "m" (c));  \
-    asm( "lw     $13, %0        " :: "m" (b));
-
-#define MULADDC_CORE                            \
-    asm( "lw     $14, 0($10)    " );            \
-    asm( "multu  $13, $14       " );            \
-    asm( "addi   $10, $10, 4    " );            \
-    asm( "mflo   $14            " );            \
-    asm( "mfhi   $9             " );            \
-    asm( "addu   $14, $12, $14  " );            \
-    asm( "lw     $15, 0($11)    " );            \
-    asm( "sltu   $12, $14, $12  " );            \
-    asm( "addu   $15, $14, $15  " );            \
-    asm( "sltu   $14, $15, $14  " );            \
-    asm( "addu   $12, $12, $9   " );            \
-    asm( "sw     $15, 0($11)    " );            \
-    asm( "addu   $12, $12, $14  " );            \
-    asm( "addi   $11, $11, 4    " );
-
-#define MULADDC_STOP                            \
-    asm( "sw     $12, %0        " : "=m" (c));  \
-    asm( "sw     $11, %0        " : "=m" (d));  \
-    asm( "sw     $10, %0        " : "=m" (s) :: \
-    "$9", "$10", "$11", "$12", "$13", "$14", "$15" );
-
-#endif /* MIPS */
-#endif /* GNUC */
-
-#if (defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__)
-
-#define MULADDC_INIT                            \
-    __asm   mov     esi, s                      \
-    __asm   mov     edi, d                      \
-    __asm   mov     ecx, c                      \
-    __asm   mov     ebx, b
-
-#define MULADDC_CORE                            \
-    __asm   lodsd                               \
-    __asm   mul     ebx                         \
-    __asm   add     eax, ecx                    \
-    __asm   adc     edx, 0                      \
-    __asm   add     eax, [edi]                  \
-    __asm   adc     edx, 0                      \
-    __asm   mov     ecx, edx                    \
-    __asm   stosd
-
-#if defined(POLARSSL_HAVE_SSE2)
-
-#define EMIT __asm _emit
-
-#define MULADDC_HUIT                            \
-    EMIT 0x0F  EMIT 0x6E  EMIT 0xC9             \
-    EMIT 0x0F  EMIT 0x6E  EMIT 0xC3             \
-    EMIT 0x0F  EMIT 0x6E  EMIT 0x1F             \
-    EMIT 0x0F  EMIT 0xD4  EMIT 0xCB             \
-    EMIT 0x0F  EMIT 0x6E  EMIT 0x16             \
-    EMIT 0x0F  EMIT 0xF4  EMIT 0xD0             \
-    EMIT 0x0F  EMIT 0x6E  EMIT 0x66  EMIT 0x04  \
-    EMIT 0x0F  EMIT 0xF4  EMIT 0xE0             \
-    EMIT 0x0F  EMIT 0x6E  EMIT 0x76  EMIT 0x08  \
-    EMIT 0x0F  EMIT 0xF4  EMIT 0xF0             \
-    EMIT 0x0F  EMIT 0x6E  EMIT 0x7E  EMIT 0x0C  \
-    EMIT 0x0F  EMIT 0xF4  EMIT 0xF8             \
-    EMIT 0x0F  EMIT 0xD4  EMIT 0xCA             \
-    EMIT 0x0F  EMIT 0x6E  EMIT 0x5F  EMIT 0x04  \
-    EMIT 0x0F  EMIT 0xD4  EMIT 0xDC             \
-    EMIT 0x0F  EMIT 0x6E  EMIT 0x6F  EMIT 0x08  \
-    EMIT 0x0F  EMIT 0xD4  EMIT 0xEE             \
-    EMIT 0x0F  EMIT 0x6E  EMIT 0x67  EMIT 0x0C  \
-    EMIT 0x0F  EMIT 0xD4  EMIT 0xFC             \
-    EMIT 0x0F  EMIT 0x7E  EMIT 0x0F             \
-    EMIT 0x0F  EMIT 0x6E  EMIT 0x56  EMIT 0x10  \
-    EMIT 0x0F  EMIT 0xF4  EMIT 0xD0             \
-    EMIT 0x0F  EMIT 0x73  EMIT 0xD1  EMIT 0x20  \
-    EMIT 0x0F  EMIT 0x6E  EMIT 0x66  EMIT 0x14  \
-    EMIT 0x0F  EMIT 0xF4  EMIT 0xE0             \
-    EMIT 0x0F  EMIT 0xD4  EMIT 0xCB             \
-    EMIT 0x0F  EMIT 0x6E  EMIT 0x76  EMIT 0x18  \
-    EMIT 0x0F  EMIT 0xF4  EMIT 0xF0             \
-    EMIT 0x0F  EMIT 0x7E  EMIT 0x4F  EMIT 0x04  \
-    EMIT 0x0F  EMIT 0x73  EMIT 0xD1  EMIT 0x20  \
-    EMIT 0x0F  EMIT 0x6E  EMIT 0x5E  EMIT 0x1C  \
-    EMIT 0x0F  EMIT 0xF4  EMIT 0xD8             \
-    EMIT 0x0F  EMIT 0xD4  EMIT 0xCD             \
-    EMIT 0x0F  EMIT 0x6E  EMIT 0x6F  EMIT 0x10  \
-    EMIT 0x0F  EMIT 0xD4  EMIT 0xD5             \
-    EMIT 0x0F  EMIT 0x7E  EMIT 0x4F  EMIT 0x08  \
-    EMIT 0x0F  EMIT 0x73  EMIT 0xD1  EMIT 0x20  \
-    EMIT 0x0F  EMIT 0xD4  EMIT 0xCF             \
-    EMIT 0x0F  EMIT 0x6E  EMIT 0x6F  EMIT 0x14  \
-    EMIT 0x0F  EMIT 0xD4  EMIT 0xE5             \
-    EMIT 0x0F  EMIT 0x7E  EMIT 0x4F  EMIT 0x0C  \
-    EMIT 0x0F  EMIT 0x73  EMIT 0xD1  EMIT 0x20  \
-    EMIT 0x0F  EMIT 0xD4  EMIT 0xCA             \
-    EMIT 0x0F  EMIT 0x6E  EMIT 0x6F  EMIT 0x18  \
-    EMIT 0x0F  EMIT 0xD4  EMIT 0xF5             \
-    EMIT 0x0F  EMIT 0x7E  EMIT 0x4F  EMIT 0x10  \
-    EMIT 0x0F  EMIT 0x73  EMIT 0xD1  EMIT 0x20  \
-    EMIT 0x0F  EMIT 0xD4  EMIT 0xCC             \
-    EMIT 0x0F  EMIT 0x6E  EMIT 0x6F  EMIT 0x1C  \
-    EMIT 0x0F  EMIT 0xD4  EMIT 0xDD             \
-    EMIT 0x0F  EMIT 0x7E  EMIT 0x4F  EMIT 0x14  \
-    EMIT 0x0F  EMIT 0x73  EMIT 0xD1  EMIT 0x20  \
-    EMIT 0x0F  EMIT 0xD4  EMIT 0xCE             \
-    EMIT 0x0F  EMIT 0x7E  EMIT 0x4F  EMIT 0x18  \
-    EMIT 0x0F  EMIT 0x73  EMIT 0xD1  EMIT 0x20  \
-    EMIT 0x0F  EMIT 0xD4  EMIT 0xCB             \
-    EMIT 0x0F  EMIT 0x7E  EMIT 0x4F  EMIT 0x1C  \
-    EMIT 0x83  EMIT 0xC7  EMIT 0x20             \
-    EMIT 0x83  EMIT 0xC6  EMIT 0x20             \
-    EMIT 0x0F  EMIT 0x73  EMIT 0xD1  EMIT 0x20  \
-    EMIT 0x0F  EMIT 0x7E  EMIT 0xC9
-
-#define MULADDC_STOP                            \
-    EMIT 0x0F  EMIT 0x77                        \
-    __asm   mov     c, ecx                      \
-    __asm   mov     d, edi                      \
-    __asm   mov     s, esi                      \
-
-#else
-
-#define MULADDC_STOP                            \
-    __asm   mov     c, ecx                      \
-    __asm   mov     d, edi                      \
-    __asm   mov     s, esi                      \
-
-#endif /* SSE2 */
-#endif /* MSVC */
-
-#endif /* POLARSSL_HAVE_ASM */
-
-#if !defined(MULADDC_CORE)
-#if defined(POLARSSL_HAVE_UDBL)
-
-#define MULADDC_INIT                    \
-{                                       \
-    t_udbl r;                           \
-    t_uint r0, r1;
-
-#define MULADDC_CORE                    \
-    r   = *(s++) * (t_udbl) b;          \
-    r0  = r;                            \
-    r1  = r >> biL;                     \
-    r0 += c;  r1 += (r0 <  c);          \
-    r0 += *d; r1 += (r0 < *d);          \
-    c = r1; *(d++) = r0;
-
-#define MULADDC_STOP                    \
-}
-
-#else
-#define MULADDC_INIT                    \
-{                                       \
-    t_uint s0, s1, b0, b1;              \
-    t_uint r0, r1, rx, ry;              \
-    b0 = ( b << biH ) >> biH;           \
-    b1 = ( b >> biH );
-
-#define MULADDC_CORE                    \
-    s0 = ( *s << biH ) >> biH;          \
-    s1 = ( *s >> biH ); s++;            \
-    rx = s0 * b1; r0 = s0 * b0;         \
-    ry = s1 * b0; r1 = s1 * b1;         \
-    r1 += ( rx >> biH );                \
-    r1 += ( ry >> biH );                \
-    rx <<= biH; ry <<= biH;             \
-    r0 += rx; r1 += (r0 < rx);          \
-    r0 += ry; r1 += (r0 < ry);          \
-    r0 +=  c; r1 += (r0 <  c);          \
-    r0 += *d; r1 += (r0 < *d);          \
-    c = r1; *(d++) = r0;
-
-#define MULADDC_STOP                    \
-}
-
-#endif /* C (generic)  */
-#endif /* C (longlong) */
-
-#endif /* bn_mul.h */
diff --git a/common/polarssl/hmac_drbg.c b/common/polarssl/hmac_drbg.c
deleted file mode 100644
index 5c4ee6def..000000000
--- a/common/polarssl/hmac_drbg.c
+++ /dev/null
@@ -1,533 +0,0 @@
-/*
- *  HMAC_DRBG implementation (NIST SP 800-90)
- *
- *  Copyright (C) 2014, ARM Limited, All Rights Reserved
- *
- *  This file is part of mbed TLS (https://tls.mbed.org)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-/*
- *  The NIST SP 800-90A DRBGs are described in the following publication.
- *  http://csrc.nist.gov/publications/nistpubs/800-90A/SP800-90A.pdf
- *  References below are based on rev. 1 (January 2012).
- */
-
-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
-
-#if defined(MBEDTLS_HMAC_DRBG_C)
-
-#include "mbedtls/hmac_drbg.h"
-
-#include <string.h>
-
-#if defined(MBEDTLS_FS_IO)
-#include <stdio.h>
-#endif
-
-#if defined(MBEDTLS_SELF_TEST)
-#if defined(MBEDTLS_PLATFORM_C)
-#include "mbedtls/platform.h"
-#else
-#include <stdio.h>
-#define mbedtls_printf printf
-#endif /* MBEDTLS_SELF_TEST */
-#endif /* MBEDTLS_PLATFORM_C */
-
-/* Implementation that should never be optimized out by the compiler */
-static void mbedtls_zeroize( void *v, size_t n ) {
-    volatile unsigned char *p = v; while( n-- ) *p++ = 0;
-}
-
-/*
- * HMAC_DRBG context initialization
- */
-void mbedtls_hmac_drbg_init( mbedtls_hmac_drbg_context *ctx )
-{
-    memset( ctx, 0, sizeof( mbedtls_hmac_drbg_context ) );
-
-#if defined(MBEDTLS_THREADING_C)
-    mbedtls_mutex_init( &ctx->mutex );
-#endif
-}
-
-/*
- * HMAC_DRBG update, using optional additional data (10.1.2.2)
- */
-void mbedtls_hmac_drbg_update( mbedtls_hmac_drbg_context *ctx,
-                       const unsigned char *additional, size_t add_len )
-{
-    size_t md_len = mbedtls_md_get_size( ctx->md_ctx.md_info );
-    unsigned char rounds = ( additional != NULL && add_len != 0 ) ? 2 : 1;
-    unsigned char sep[1];
-    unsigned char K[MBEDTLS_MD_MAX_SIZE];
-
-    for( sep[0] = 0; sep[0] < rounds; sep[0]++ )
-    {
-        /* Step 1 or 4 */
-        mbedtls_md_hmac_reset( &ctx->md_ctx );
-        mbedtls_md_hmac_update( &ctx->md_ctx, ctx->V, md_len );
-        mbedtls_md_hmac_update( &ctx->md_ctx, sep, 1 );
-        if( rounds == 2 )
-            mbedtls_md_hmac_update( &ctx->md_ctx, additional, add_len );
-        mbedtls_md_hmac_finish( &ctx->md_ctx, K );
-
-        /* Step 2 or 5 */
-        mbedtls_md_hmac_starts( &ctx->md_ctx, K, md_len );
-        mbedtls_md_hmac_update( &ctx->md_ctx, ctx->V, md_len );
-        mbedtls_md_hmac_finish( &ctx->md_ctx, ctx->V );
-    }
-}
-
-/*
- * Simplified HMAC_DRBG initialisation (for use with deterministic ECDSA)
- */
-int mbedtls_hmac_drbg_seed_buf( mbedtls_hmac_drbg_context *ctx,
-                        const mbedtls_md_info_t * md_info,
-                        const unsigned char *data, size_t data_len )
-{
-    int ret;
-
-    if( ( ret = mbedtls_md_setup( &ctx->md_ctx, md_info, 1 ) ) != 0 )
-        return( ret );
-
-    /*
-     * Set initial working state.
-     * Use the V memory location, which is currently all 0, to initialize the
-     * MD context with an all-zero key. Then set V to its initial value.
-     */
-    mbedtls_md_hmac_starts( &ctx->md_ctx, ctx->V, mbedtls_md_get_size( md_info ) );
-    memset( ctx->V, 0x01, mbedtls_md_get_size( md_info ) );
-
-    mbedtls_hmac_drbg_update( ctx, data, data_len );
-
-    return( 0 );
-}
-
-/*
- * HMAC_DRBG reseeding: 10.1.2.4 (arabic) + 9.2 (Roman)
- */
-int mbedtls_hmac_drbg_reseed( mbedtls_hmac_drbg_context *ctx,
-                      const unsigned char *additional, size_t len )
-{
-    unsigned char seed[MBEDTLS_HMAC_DRBG_MAX_SEED_INPUT];
-    size_t seedlen;
-
-    /* III. Check input length */
-    if( len > MBEDTLS_HMAC_DRBG_MAX_INPUT ||
-        ctx->entropy_len + len > MBEDTLS_HMAC_DRBG_MAX_SEED_INPUT )
-    {
-        return( MBEDTLS_ERR_HMAC_DRBG_INPUT_TOO_BIG );
-    }
-
-    memset( seed, 0, MBEDTLS_HMAC_DRBG_MAX_SEED_INPUT );
-
-    /* IV. Gather entropy_len bytes of entropy for the seed */
-    if( ctx->f_entropy( ctx->p_entropy, seed, ctx->entropy_len ) != 0 )
-        return( MBEDTLS_ERR_HMAC_DRBG_ENTROPY_SOURCE_FAILED );
-
-    seedlen = ctx->entropy_len;
-
-    /* 1. Concatenate entropy and additional data if any */
-    if( additional != NULL && len != 0 )
-    {
-        memcpy( seed + seedlen, additional, len );
-        seedlen += len;
-    }
-
-    /* 2. Update state */
-    mbedtls_hmac_drbg_update( ctx, seed, seedlen );
-
-    /* 3. Reset reseed_counter */
-    ctx->reseed_counter = 1;
-
-    /* 4. Done */
-    return( 0 );
-}
-
-/*
- * HMAC_DRBG initialisation (10.1.2.3 + 9.1)
- */
-int mbedtls_hmac_drbg_seed( mbedtls_hmac_drbg_context *ctx,
-                    const mbedtls_md_info_t * md_info,
-                    int (*f_entropy)(void *, unsigned char *, size_t),
-                    void *p_entropy,
-                    const unsigned char *custom,
-                    size_t len )
-{
-    int ret;
-    size_t entropy_len, md_size;
-
-    if( ( ret = mbedtls_md_setup( &ctx->md_ctx, md_info, 1 ) ) != 0 )
-        return( ret );
-
-    md_size = mbedtls_md_get_size( md_info );
-
-    /*
-     * Set initial working state.
-     * Use the V memory location, which is currently all 0, to initialize the
-     * MD context with an all-zero key. Then set V to its initial value.
-     */
-    mbedtls_md_hmac_starts( &ctx->md_ctx, ctx->V, md_size );
-    memset( ctx->V, 0x01, md_size );
-
-    ctx->f_entropy = f_entropy;
-    ctx->p_entropy = p_entropy;
-
-    ctx->reseed_interval = MBEDTLS_HMAC_DRBG_RESEED_INTERVAL;
-
-    /*
-     * See SP800-57 5.6.1 (p. 65-66) for the security strength provided by
-     * each hash function, then according to SP800-90A rev1 10.1 table 2,
-     * min_entropy_len (in bits) is security_strength.
-     *
-     * (This also matches the sizes used in the NIST test vectors.)
-     */
-    entropy_len = md_size <= 20 ? 16 : /* 160-bits hash -> 128 bits */
-                  md_size <= 28 ? 24 : /* 224-bits hash -> 192 bits */
-                                  32;  /* better (256+) -> 256 bits */
-
-    /*
-     * For initialisation, use more entropy to emulate a nonce
-     * (Again, matches test vectors.)
-     */
-    ctx->entropy_len = entropy_len * 3 / 2;
-
-    if( ( ret = mbedtls_hmac_drbg_reseed( ctx, custom, len ) ) != 0 )
-        return( ret );
-
-    ctx->entropy_len = entropy_len;
-
-    return( 0 );
-}
-
-/*
- * Set prediction resistance
- */
-void mbedtls_hmac_drbg_set_prediction_resistance( mbedtls_hmac_drbg_context *ctx,
-                                          int resistance )
-{
-    ctx->prediction_resistance = resistance;
-}
-
-/*
- * Set entropy length grabbed for reseeds
- */
-void mbedtls_hmac_drbg_set_entropy_len( mbedtls_hmac_drbg_context *ctx, size_t len )
-{
-    ctx->entropy_len = len;
-}
-
-/*
- * Set reseed interval
- */
-void mbedtls_hmac_drbg_set_reseed_interval( mbedtls_hmac_drbg_context *ctx, int interval )
-{
-    ctx->reseed_interval = interval;
-}
-
-/*
- * HMAC_DRBG random function with optional additional data:
- * 10.1.2.5 (arabic) + 9.3 (Roman)
- */
-int mbedtls_hmac_drbg_random_with_add( void *p_rng,
-                               unsigned char *output, size_t out_len,
-                               const unsigned char *additional, size_t add_len )
-{
-    int ret;
-    mbedtls_hmac_drbg_context *ctx = (mbedtls_hmac_drbg_context *) p_rng;
-    size_t md_len = mbedtls_md_get_size( ctx->md_ctx.md_info );
-    size_t left = out_len;
-    unsigned char *out = output;
-
-    /* II. Check request length */
-    if( out_len > MBEDTLS_HMAC_DRBG_MAX_REQUEST )
-        return( MBEDTLS_ERR_HMAC_DRBG_REQUEST_TOO_BIG );
-
-    /* III. Check input length */
-    if( add_len > MBEDTLS_HMAC_DRBG_MAX_INPUT )
-        return( MBEDTLS_ERR_HMAC_DRBG_INPUT_TOO_BIG );
-
-    /* 1. (aka VII and IX) Check reseed counter and PR */
-    if( ctx->f_entropy != NULL && /* For no-reseeding instances */
-        ( ctx->prediction_resistance == MBEDTLS_HMAC_DRBG_PR_ON ||
-          ctx->reseed_counter > ctx->reseed_interval ) )
-    {
-        if( ( ret = mbedtls_hmac_drbg_reseed( ctx, additional, add_len ) ) != 0 )
-            return( ret );
-
-        add_len = 0; /* VII.4 */
-    }
-
-    /* 2. Use additional data if any */
-    if( additional != NULL && add_len != 0 )
-        mbedtls_hmac_drbg_update( ctx, additional, add_len );
-
-    /* 3, 4, 5. Generate bytes */
-    while( left != 0 )
-    {
-        size_t use_len = left > md_len ? md_len : left;
-
-        mbedtls_md_hmac_reset( &ctx->md_ctx );
-        mbedtls_md_hmac_update( &ctx->md_ctx, ctx->V, md_len );
-        mbedtls_md_hmac_finish( &ctx->md_ctx, ctx->V );
-
-        memcpy( out, ctx->V, use_len );
-        out += use_len;
-        left -= use_len;
-    }
-
-    /* 6. Update */
-    mbedtls_hmac_drbg_update( ctx, additional, add_len );
-
-    /* 7. Update reseed counter */
-    ctx->reseed_counter++;
-
-    /* 8. Done */
-    return( 0 );
-}
-
-/*
- * HMAC_DRBG random function
- */
-int mbedtls_hmac_drbg_random( void *p_rng, unsigned char *output, size_t out_len )
-{
-    int ret;
-    mbedtls_hmac_drbg_context *ctx = (mbedtls_hmac_drbg_context *) p_rng;
-
-#if defined(MBEDTLS_THREADING_C)
-    if( ( ret = mbedtls_mutex_lock( &ctx->mutex ) ) != 0 )
-        return( ret );
-#endif
-
-    ret = mbedtls_hmac_drbg_random_with_add( ctx, output, out_len, NULL, 0 );
-
-#if defined(MBEDTLS_THREADING_C)
-    if( mbedtls_mutex_unlock( &ctx->mutex ) != 0 )
-        return( MBEDTLS_ERR_THREADING_MUTEX_ERROR );
-#endif
-
-    return( ret );
-}
-
-/*
- * Free an HMAC_DRBG context
- */
-void mbedtls_hmac_drbg_free( mbedtls_hmac_drbg_context *ctx )
-{
-    if( ctx == NULL )
-        return;
-
-#if defined(MBEDTLS_THREADING_C)
-    mbedtls_mutex_free( &ctx->mutex );
-#endif
-    mbedtls_md_free( &ctx->md_ctx );
-    mbedtls_zeroize( ctx, sizeof( mbedtls_hmac_drbg_context ) );
-}
-
-#if defined(MBEDTLS_FS_IO)
-int mbedtls_hmac_drbg_write_seed_file( mbedtls_hmac_drbg_context *ctx, const char *path )
-{
-    int ret;
-    FILE *f;
-    unsigned char buf[ MBEDTLS_HMAC_DRBG_MAX_INPUT ];
-
-    if( ( f = fopen( path, "wb" ) ) == NULL )
-        return( MBEDTLS_ERR_HMAC_DRBG_FILE_IO_ERROR );
-
-    if( ( ret = mbedtls_hmac_drbg_random( ctx, buf, sizeof( buf ) ) ) != 0 )
-        goto exit;
-
-    if( fwrite( buf, 1, sizeof( buf ), f ) != sizeof( buf ) )
-    {
-        ret = MBEDTLS_ERR_HMAC_DRBG_FILE_IO_ERROR;
-        goto exit;
-    }
-
-    ret = 0;
-
-exit:
-    fclose( f );
-    return( ret );
-}
-
-int mbedtls_hmac_drbg_update_seed_file( mbedtls_hmac_drbg_context *ctx, const char *path )
-{
-    FILE *f;
-    size_t n;
-    unsigned char buf[ MBEDTLS_HMAC_DRBG_MAX_INPUT ];
-
-    if( ( f = fopen( path, "rb" ) ) == NULL )
-        return( MBEDTLS_ERR_HMAC_DRBG_FILE_IO_ERROR );
-
-    fseek( f, 0, SEEK_END );
-    n = (size_t) ftell( f );
-    fseek( f, 0, SEEK_SET );
-
-    if( n > MBEDTLS_HMAC_DRBG_MAX_INPUT )
-    {
-        fclose( f );
-        return( MBEDTLS_ERR_HMAC_DRBG_INPUT_TOO_BIG );
-    }
-
-    if( fread( buf, 1, n, f ) != n )
-    {
-        fclose( f );
-        return( MBEDTLS_ERR_HMAC_DRBG_FILE_IO_ERROR );
-    }
-
-    fclose( f );
-
-    mbedtls_hmac_drbg_update( ctx, buf, n );
-
-    return( mbedtls_hmac_drbg_write_seed_file( ctx, path ) );
-}
-#endif /* MBEDTLS_FS_IO */
-
-
-#if defined(MBEDTLS_SELF_TEST)
-
-#if !defined(MBEDTLS_SHA1_C)
-/* Dummy checkup routine */
-int mbedtls_hmac_drbg_self_test( int verbose )
-{
-
-    if( verbose != 0 )
-        mbedtls_printf( "\n" );
-
-    return( 0 );
-}
-#else
-
-#define OUTPUT_LEN  80
-
-/* From a NIST PR=true test vector */
-static const unsigned char entropy_pr[] = {
-    0xa0, 0xc9, 0xab, 0x58, 0xf1, 0xe2, 0xe5, 0xa4, 0xde, 0x3e, 0xbd, 0x4f,
-    0xf7, 0x3e, 0x9c, 0x5b, 0x64, 0xef, 0xd8, 0xca, 0x02, 0x8c, 0xf8, 0x11,
-    0x48, 0xa5, 0x84, 0xfe, 0x69, 0xab, 0x5a, 0xee, 0x42, 0xaa, 0x4d, 0x42,
-    0x17, 0x60, 0x99, 0xd4, 0x5e, 0x13, 0x97, 0xdc, 0x40, 0x4d, 0x86, 0xa3,
-    0x7b, 0xf5, 0x59, 0x54, 0x75, 0x69, 0x51, 0xe4 };
-static const unsigned char result_pr[OUTPUT_LEN] = {
-    0x9a, 0x00, 0xa2, 0xd0, 0x0e, 0xd5, 0x9b, 0xfe, 0x31, 0xec, 0xb1, 0x39,
-    0x9b, 0x60, 0x81, 0x48, 0xd1, 0x96, 0x9d, 0x25, 0x0d, 0x3c, 0x1e, 0x94,
-    0x10, 0x10, 0x98, 0x12, 0x93, 0x25, 0xca, 0xb8, 0xfc, 0xcc, 0x2d, 0x54,
-    0x73, 0x19, 0x70, 0xc0, 0x10, 0x7a, 0xa4, 0x89, 0x25, 0x19, 0x95, 0x5e,
-    0x4b, 0xc6, 0x00, 0x1d, 0x7f, 0x4e, 0x6a, 0x2b, 0xf8, 0xa3, 0x01, 0xab,
-    0x46, 0x05, 0x5c, 0x09, 0xa6, 0x71, 0x88, 0xf1, 0xa7, 0x40, 0xee, 0xf3,
-    0xe1, 0x5c, 0x02, 0x9b, 0x44, 0xaf, 0x03, 0x44 };
-
-/* From a NIST PR=false test vector */
-static const unsigned char entropy_nopr[] = {
-    0x79, 0x34, 0x9b, 0xbf, 0x7c, 0xdd, 0xa5, 0x79, 0x95, 0x57, 0x86, 0x66,
-    0x21, 0xc9, 0x13, 0x83, 0x11, 0x46, 0x73, 0x3a, 0xbf, 0x8c, 0x35, 0xc8,
-    0xc7, 0x21, 0x5b, 0x5b, 0x96, 0xc4, 0x8e, 0x9b, 0x33, 0x8c, 0x74, 0xe3,
-    0xe9, 0x9d, 0xfe, 0xdf };
-static const unsigned char result_nopr[OUTPUT_LEN] = {
-    0xc6, 0xa1, 0x6a, 0xb8, 0xd4, 0x20, 0x70, 0x6f, 0x0f, 0x34, 0xab, 0x7f,
-    0xec, 0x5a, 0xdc, 0xa9, 0xd8, 0xca, 0x3a, 0x13, 0x3e, 0x15, 0x9c, 0xa6,
-    0xac, 0x43, 0xc6, 0xf8, 0xa2, 0xbe, 0x22, 0x83, 0x4a, 0x4c, 0x0a, 0x0a,
-    0xff, 0xb1, 0x0d, 0x71, 0x94, 0xf1, 0xc1, 0xa5, 0xcf, 0x73, 0x22, 0xec,
-    0x1a, 0xe0, 0x96, 0x4e, 0xd4, 0xbf, 0x12, 0x27, 0x46, 0xe0, 0x87, 0xfd,
-    0xb5, 0xb3, 0xe9, 0x1b, 0x34, 0x93, 0xd5, 0xbb, 0x98, 0xfa, 0xed, 0x49,
-    0xe8, 0x5f, 0x13, 0x0f, 0xc8, 0xa4, 0x59, 0xb7 };
-
-/* "Entropy" from buffer */
-static size_t test_offset;
-static int hmac_drbg_self_test_entropy( void *data,
-                                        unsigned char *buf, size_t len )
-{
-    const unsigned char *p = data;
-    memcpy( buf, p + test_offset, len );
-    test_offset += len;
-    return( 0 );
-}
-
-#define CHK( c )    if( (c) != 0 )                          \
-                    {                                       \
-                        if( verbose != 0 )                  \
-                            mbedtls_printf( "failed\n" );  \
-                        return( 1 );                        \
-                    }
-
-/*
- * Checkup routine for HMAC_DRBG with SHA-1
- */
-int mbedtls_hmac_drbg_self_test( int verbose )
-{
-    mbedtls_hmac_drbg_context ctx;
-    unsigned char buf[OUTPUT_LEN];
-    const mbedtls_md_info_t *md_info = mbedtls_md_info_from_type( MBEDTLS_MD_SHA1 );
-
-    mbedtls_hmac_drbg_init( &ctx );
-
-    /*
-     * PR = True
-     */
-    if( verbose != 0 )
-        mbedtls_printf( "  HMAC_DRBG (PR = True) : " );
-
-    test_offset = 0;
-    CHK( mbedtls_hmac_drbg_seed( &ctx, md_info,
-                         hmac_drbg_self_test_entropy, (void *) entropy_pr,
-                         NULL, 0 ) );
-    mbedtls_hmac_drbg_set_prediction_resistance( &ctx, MBEDTLS_HMAC_DRBG_PR_ON );
-    CHK( mbedtls_hmac_drbg_random( &ctx, buf, OUTPUT_LEN ) );
-    CHK( mbedtls_hmac_drbg_random( &ctx, buf, OUTPUT_LEN ) );
-    CHK( memcmp( buf, result_pr, OUTPUT_LEN ) );
-    mbedtls_hmac_drbg_free( &ctx );
-
-    mbedtls_hmac_drbg_free( &ctx );
-
-    if( verbose != 0 )
-        mbedtls_printf( "passed\n" );
-
-    /*
-     * PR = False
-     */
-    if( verbose != 0 )
-        mbedtls_printf( "  HMAC_DRBG (PR = False) : " );
-
-    mbedtls_hmac_drbg_init( &ctx );
-
-    test_offset = 0;
-    CHK( mbedtls_hmac_drbg_seed( &ctx, md_info,
-                         hmac_drbg_self_test_entropy, (void *) entropy_nopr,
-                         NULL, 0 ) );
-    CHK( mbedtls_hmac_drbg_reseed( &ctx, NULL, 0 ) );
-    CHK( mbedtls_hmac_drbg_random( &ctx, buf, OUTPUT_LEN ) );
-    CHK( mbedtls_hmac_drbg_random( &ctx, buf, OUTPUT_LEN ) );
-    CHK( memcmp( buf, result_nopr, OUTPUT_LEN ) );
-    mbedtls_hmac_drbg_free( &ctx );
-
-    mbedtls_hmac_drbg_free( &ctx );
-
-    if( verbose != 0 )
-        mbedtls_printf( "passed\n" );
-
-    if( verbose != 0 )
-        mbedtls_printf( "\n" );
-
-    return( 0 );
-}
-#endif /* MBEDTLS_SHA1_C */
-#endif /* MBEDTLS_SELF_TEST */
-
-#endif /* MBEDTLS_HMAC_DRBG_C */
diff --git a/common/polarssl/hmac_drbg.h b/common/polarssl/hmac_drbg.h
deleted file mode 100644
index eeac3e320..000000000
--- a/common/polarssl/hmac_drbg.h
+++ /dev/null
@@ -1,300 +0,0 @@
-/**
- * \file hmac_drbg.h
- *
- * \brief HMAC_DRBG (NIST SP 800-90A)
- *
- *  Copyright (C) 2014, ARM Limited, All Rights Reserved
- *
- *  This file is part of mbed TLS (https://tls.mbed.org)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifndef MBEDTLS_HMAC_DRBG_H
-#define MBEDTLS_HMAC_DRBG_H
-
-#include "md.h"
-
-#if defined(MBEDTLS_THREADING_C)
-#include "mbedtls/threading.h"
-#endif
-
-/*
- * Error codes
- */
-#define MBEDTLS_ERR_HMAC_DRBG_REQUEST_TOO_BIG              -0x0003  /**< Too many random requested in single call. */
-#define MBEDTLS_ERR_HMAC_DRBG_INPUT_TOO_BIG                -0x0005  /**< Input too large (Entropy + additional). */
-#define MBEDTLS_ERR_HMAC_DRBG_FILE_IO_ERROR                -0x0007  /**< Read/write error in file. */
-#define MBEDTLS_ERR_HMAC_DRBG_ENTROPY_SOURCE_FAILED        -0x0009  /**< The entropy source failed. */
-
-/**
- * \name SECTION: Module settings
- *
- * The configuration options you can set for this module are in this section.
- * Either change them in config.h or define them on the compiler command line.
- * \{
- */
-
-#if !defined(MBEDTLS_HMAC_DRBG_RESEED_INTERVAL)
-#define MBEDTLS_HMAC_DRBG_RESEED_INTERVAL   10000   /**< Interval before reseed is performed by default */
-#endif
-
-#if !defined(MBEDTLS_HMAC_DRBG_MAX_INPUT)
-#define MBEDTLS_HMAC_DRBG_MAX_INPUT         256     /**< Maximum number of additional input bytes */
-#endif
-
-#if !defined(MBEDTLS_HMAC_DRBG_MAX_REQUEST)
-#define MBEDTLS_HMAC_DRBG_MAX_REQUEST       1024    /**< Maximum number of requested bytes per call */
-#endif
-
-#if !defined(MBEDTLS_HMAC_DRBG_MAX_SEED_INPUT)
-#define MBEDTLS_HMAC_DRBG_MAX_SEED_INPUT    384     /**< Maximum size of (re)seed buffer */
-#endif
-
-/* \} name SECTION: Module settings */
-
-#define MBEDTLS_HMAC_DRBG_PR_OFF   0   /**< No prediction resistance       */
-#define MBEDTLS_HMAC_DRBG_PR_ON    1   /**< Prediction resistance enabled  */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * HMAC_DRBG context.
- */
-typedef struct
-{
-    /* Working state: the key K is not stored explicitely,
-     * but is implied by the HMAC context */
-    mbedtls_md_context_t md_ctx;                    /*!< HMAC context (inc. K)  */
-    unsigned char V[MBEDTLS_MD_MAX_SIZE];  /*!< V in the spec          */
-    int reseed_counter;                     /*!< reseed counter         */
-
-    /* Administrative state */
-    size_t entropy_len;         /*!< entropy bytes grabbed on each (re)seed */
-    int prediction_resistance;  /*!< enable prediction resistance (Automatic
-                                     reseed before every random generation) */
-    int reseed_interval;        /*!< reseed interval   */
-
-    /* Callbacks */
-    int (*f_entropy)(void *, unsigned char *, size_t); /*!< entropy function */
-    void *p_entropy;            /*!< context for the entropy function        */
-
-#if defined(MBEDTLS_THREADING_C)
-    mbedtls_threading_mutex_t mutex;
-#endif
-} mbedtls_hmac_drbg_context;
-
-/**
- * \brief               HMAC_DRBG context initialization
- *                      Makes the context ready for mbetls_hmac_drbg_seed(),
- *                      mbedtls_hmac_drbg_seed_buf() or
- *                      mbedtls_hmac_drbg_free().
- *
- * \param ctx           HMAC_DRBG context to be initialized
- */
-void mbedtls_hmac_drbg_init( mbedtls_hmac_drbg_context *ctx );
-
-/**
- * \brief               HMAC_DRBG initial seeding
- *                      Seed and setup entropy source for future reseeds.
- *
- * \param ctx           HMAC_DRBG context to be seeded
- * \param md_info       MD algorithm to use for HMAC_DRBG
- * \param f_entropy     Entropy callback (p_entropy, buffer to fill, buffer
- *                      length)
- * \param p_entropy     Entropy context
- * \param custom        Personalization data (Device specific identifiers)
- *                      (Can be NULL)
- * \param len           Length of personalization data
- *
- * \note                The "security strength" as defined by NIST is set to:
- *                      128 bits if md_alg is SHA-1,
- *                      192 bits if md_alg is SHA-224,
- *                      256 bits if md_alg is SHA-256 or higher.
- *                      Note that SHA-256 is just as efficient as SHA-224.
- *
- * \return              0 if successful, or
- *                      MBEDTLS_ERR_MD_BAD_INPUT_DATA, or
- *                      MBEDTLS_ERR_MD_ALLOC_FAILED, or
- *                      MBEDTLS_ERR_HMAC_DRBG_ENTROPY_SOURCE_FAILED.
- */
-int mbedtls_hmac_drbg_seed( mbedtls_hmac_drbg_context *ctx,
-                    const mbedtls_md_info_t * md_info,
-                    int (*f_entropy)(void *, unsigned char *, size_t),
-                    void *p_entropy,
-                    const unsigned char *custom,
-                    size_t len );
-
-/**
- * \brief               Initilisation of simpified HMAC_DRBG (never reseeds).
- *                      (For use with deterministic ECDSA.)
- *
- * \param ctx           HMAC_DRBG context to be initialised
- * \param md_info       MD algorithm to use for HMAC_DRBG
- * \param data          Concatenation of entropy string and additional data
- * \param data_len      Length of data in bytes
- *
- * \return              0 if successful, or
- *                      MBEDTLS_ERR_MD_BAD_INPUT_DATA, or
- *                      MBEDTLS_ERR_MD_ALLOC_FAILED.
- */
-int mbedtls_hmac_drbg_seed_buf( mbedtls_hmac_drbg_context *ctx,
-                        const mbedtls_md_info_t * md_info,
-                        const unsigned char *data, size_t data_len );
-
-/**
- * \brief               Enable / disable prediction resistance (Default: Off)
- *
- * Note: If enabled, entropy is used for ctx->entropy_len before each call!
- *       Only use this if you have ample supply of good entropy!
- *
- * \param ctx           HMAC_DRBG context
- * \param resistance    MBEDTLS_HMAC_DRBG_PR_ON or MBEDTLS_HMAC_DRBG_PR_OFF
- */
-void mbedtls_hmac_drbg_set_prediction_resistance( mbedtls_hmac_drbg_context *ctx,
-                                          int resistance );
-
-/**
- * \brief               Set the amount of entropy grabbed on each reseed
- *                      (Default: given by the security strength, which
- *                      depends on the hash used, see \c mbedtls_hmac_drbg_init() )
- *
- * \param ctx           HMAC_DRBG context
- * \param len           Amount of entropy to grab, in bytes
- */
-void mbedtls_hmac_drbg_set_entropy_len( mbedtls_hmac_drbg_context *ctx,
-                                size_t len );
-
-/**
- * \brief               Set the reseed interval
- *                      (Default: MBEDTLS_HMAC_DRBG_RESEED_INTERVAL)
- *
- * \param ctx           HMAC_DRBG context
- * \param interval      Reseed interval
- */
-void mbedtls_hmac_drbg_set_reseed_interval( mbedtls_hmac_drbg_context *ctx,
-                                    int interval );
-
-/**
- * \brief               HMAC_DRBG update state
- *
- * \param ctx           HMAC_DRBG context
- * \param additional    Additional data to update state with, or NULL
- * \param add_len       Length of additional data, or 0
- *
- * \note                Additional data is optional, pass NULL and 0 as second
- *                      third argument if no additional data is being used.
- */
-void mbedtls_hmac_drbg_update( mbedtls_hmac_drbg_context *ctx,
-                       const unsigned char *additional, size_t add_len );
-
-/**
- * \brief               HMAC_DRBG reseeding (extracts data from entropy source)
- *
- * \param ctx           HMAC_DRBG context
- * \param additional    Additional data to add to state (Can be NULL)
- * \param len           Length of additional data
- *
- * \return              0 if successful, or
- *                      MBEDTLS_ERR_HMAC_DRBG_ENTROPY_SOURCE_FAILED
- */
-int mbedtls_hmac_drbg_reseed( mbedtls_hmac_drbg_context *ctx,
-                      const unsigned char *additional, size_t len );
-
-/**
- * \brief               HMAC_DRBG generate random with additional update input
- *
- * Note: Automatically reseeds if reseed_counter is reached or PR is enabled.
- *
- * \param p_rng         HMAC_DRBG context
- * \param output        Buffer to fill
- * \param output_len    Length of the buffer
- * \param additional    Additional data to update with (can be NULL)
- * \param add_len       Length of additional data (can be 0)
- *
- * \return              0 if successful, or
- *                      MBEDTLS_ERR_HMAC_DRBG_ENTROPY_SOURCE_FAILED, or
- *                      MBEDTLS_ERR_HMAC_DRBG_REQUEST_TOO_BIG, or
- *                      MBEDTLS_ERR_HMAC_DRBG_INPUT_TOO_BIG.
- */
-int mbedtls_hmac_drbg_random_with_add( void *p_rng,
-                               unsigned char *output, size_t output_len,
-                               const unsigned char *additional,
-                               size_t add_len );
-
-/**
- * \brief               HMAC_DRBG generate random
- *
- * Note: Automatically reseeds if reseed_counter is reached or PR is enabled.
- *
- * \param p_rng         HMAC_DRBG context
- * \param output        Buffer to fill
- * \param out_len       Length of the buffer
- *
- * \return              0 if successful, or
- *                      MBEDTLS_ERR_HMAC_DRBG_ENTROPY_SOURCE_FAILED, or
- *                      MBEDTLS_ERR_HMAC_DRBG_REQUEST_TOO_BIG
- */
-int mbedtls_hmac_drbg_random( void *p_rng, unsigned char *output, size_t out_len );
-
-/**
- * \brief               Free an HMAC_DRBG context
- *
- * \param ctx           HMAC_DRBG context to free.
- */
-void mbedtls_hmac_drbg_free( mbedtls_hmac_drbg_context *ctx );
-
-#if defined(MBEDTLS_FS_IO)
-/**
- * \brief               Write a seed file
- *
- * \param ctx           HMAC_DRBG context
- * \param path          Name of the file
- *
- * \return              0 if successful, 1 on file error, or
- *                      MBEDTLS_ERR_HMAC_DRBG_ENTROPY_SOURCE_FAILED
- */
-int mbedtls_hmac_drbg_write_seed_file( mbedtls_hmac_drbg_context *ctx, const char *path );
-
-/**
- * \brief               Read and update a seed file. Seed is added to this
- *                      instance
- *
- * \param ctx           HMAC_DRBG context
- * \param path          Name of the file
- *
- * \return              0 if successful, 1 on file error,
- *                      MBEDTLS_ERR_HMAC_DRBG_ENTROPY_SOURCE_FAILED or
- *                      MBEDTLS_ERR_HMAC_DRBG_INPUT_TOO_BIG
- */
-int mbedtls_hmac_drbg_update_seed_file( mbedtls_hmac_drbg_context *ctx, const char *path );
-#endif /* MBEDTLS_FS_IO */
-
-
-#if defined(MBEDTLS_SELF_TEST)
-/**
- * \brief               Checkup routine
- *
- * \return              0 if successful, or 1 if the test failed
- */
-int mbedtls_hmac_drbg_self_test( int verbose );
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* hmac_drbg.h */
diff --git a/common/polarssl/libpcrypto.c b/common/polarssl/libpcrypto.c
deleted file mode 100644
index 0dea75fac..000000000
--- a/common/polarssl/libpcrypto.c
+++ /dev/null
@@ -1,78 +0,0 @@
-//-----------------------------------------------------------------------------
-// Copyright (C) 2018 Merlok
-// Copyright (C) 2018 drHatson
-//
-// This code is licensed to you under the terms of the GNU GPL, version 2 or,
-// at your option, any later version. See the LICENSE.txt file for the text of
-// the license.
-//-----------------------------------------------------------------------------
-// crypto commands
-//-----------------------------------------------------------------------------
-
-#include "polarssl/libpcrypto.h"
-#include <polarssl/aes.h>
-#include <polarssl/aes_cmac128.h>
-
-// NIST Special Publication 800-38A � Recommendation for block cipher modes of operation: methods and techniques, 2001.
-int aes_encode(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *output, int length){
-	uint8_t iiv[16] = {0};
-	if (iv)
-		memcpy(iiv, iv, 16);
-	
-	aes_context aes;
-	aes_init(&aes);
-	if (aes_setkey_enc(&aes, key, 128))
-		return 1;
-	if (aes_crypt_cbc(&aes, AES_ENCRYPT, length, iiv, input, output))
-		return 2;
-	aes_free(&aes);
-
-	return 0;
-}
-
-int aes_decode(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *output, int length){
-	uint8_t iiv[16] = {0};
-	if (iv)
-		memcpy(iiv, iv, 16);
-	
-	aes_context aes;
-	aes_init(&aes);
-	if (aes_setkey_dec(&aes, key, 128))
-		return 1;
-	if (aes_crypt_cbc(&aes, AES_DECRYPT, length, iiv, input, output))
-		return 2;
-	aes_free(&aes);
-
-	return 0;
-}
-
-//  NIST Special Publication 800-38B � Recommendation for block cipher modes of operation: The CMAC mode for authentication.
-// https://csrc.nist.gov/CSRC/media/Projects/Cryptographic-Standards-and-Guidelines/documents/examples/AES_CMAC.pdf
-int aes_cmac(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *mac, int length) {
-	memset(mac, 0x00, 16);
-	uint8_t iiv[16] = {0};
-	if (iv)
-		memcpy(iiv, iv, 16);
-	
-	//  NIST 800-38B 
-	aes_cmac128_context ctx;
-	aes_cmac128_starts(&ctx, key);
-	aes_cmac128_update(&ctx, input, length);
-	aes_cmac128_final(&ctx, mac);
-
-	return 0;
-}
-
-int aes_cmac8(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *mac, int length) {
-	uint8_t cmac[16] = {0};
-	memset(mac, 0x00, 8);
-	
-	int res = aes_cmac(iv, key, input, cmac, length);
-	if (res)
-		return res;
-	
-	for(int i = 0; i < 8; i++) 
-		mac[i] = cmac[i * 2 + 1];
-
-	return 0;
-}
diff --git a/common/polarssl/rsa.c b/common/polarssl/rsa.c
deleted file mode 100644
index 9872274ba..000000000
--- a/common/polarssl/rsa.c
+++ /dev/null
@@ -1,1466 +0,0 @@
-/*
- *  The RSA public-key cryptosystem
- *
- *  Copyright (C) 2006-2011, Brainspark B.V.
- *
- *  This file is part of PolarSSL (http://www.polarssl.org)
- *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
- *
- *  All rights reserved.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-/*
- *  RSA was designed by Ron Rivest, Adi Shamir and Len Adleman.
- *
- *  http://theory.lcs.mit.edu/~rivest/rsapaper.pdf
- *  http://www.cacr.math.uwaterloo.ca/hac/about/chap8.pdf
- */
-
-#include "polarssl_config.h"
-
-#if defined(POLARSSL_RSA_C)
-
-#include "rsa.h"
-
-#if defined(POLARSSL_PKCS1_V21)
-#include "md.h"
-#endif
-
-#include <stdlib.h>
-#include <stdio.h>
-
-/*
- * Initialize an RSA context
- */
-void rsa_init( rsa_context *ctx,
-               int padding,
-               int hash_id )
-{
-    memset( ctx, 0, sizeof( rsa_context ) );
-
-    ctx->padding = padding;
-    ctx->hash_id = hash_id;
-}
-
-#if defined(POLARSSL_GENPRIME)
-
-/*
- * Generate an RSA keypair
- */
-int rsa_gen_key( rsa_context *ctx,
-                 int (*f_rng)(void *, unsigned char *, size_t),
-                 void *p_rng,
-                 unsigned int nbits, int exponent )
-{
-    int ret;
-    mpi P1, Q1, H, G;
-
-    if( f_rng == NULL || nbits < 128 || exponent < 3 )
-        return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
-
-    mpi_init( &P1 ); mpi_init( &Q1 ); mpi_init( &H ); mpi_init( &G );
-
-    /*
-     * find primes P and Q with Q < P so that:
-     * GCD( E, (P-1)*(Q-1) ) == 1
-     */
-    MPI_CHK( mpi_lset( &ctx->E, exponent ) );
-
-    do
-    {
-        MPI_CHK( mpi_gen_prime( &ctx->P, ( nbits + 1 ) >> 1, 0, 
-                                f_rng, p_rng ) );
-
-        MPI_CHK( mpi_gen_prime( &ctx->Q, ( nbits + 1 ) >> 1, 0,
-                                f_rng, p_rng ) );
-
-        if( mpi_cmp_mpi( &ctx->P, &ctx->Q ) < 0 )
-            mpi_swap( &ctx->P, &ctx->Q );
-
-        if( mpi_cmp_mpi( &ctx->P, &ctx->Q ) == 0 )
-            continue;
-
-        MPI_CHK( mpi_mul_mpi( &ctx->N, &ctx->P, &ctx->Q ) );
-        if( mpi_msb( &ctx->N ) != nbits )
-            continue;
-
-        MPI_CHK( mpi_sub_int( &P1, &ctx->P, 1 ) );
-        MPI_CHK( mpi_sub_int( &Q1, &ctx->Q, 1 ) );
-        MPI_CHK( mpi_mul_mpi( &H, &P1, &Q1 ) );
-        MPI_CHK( mpi_gcd( &G, &ctx->E, &H  ) );
-    }
-    while( mpi_cmp_int( &G, 1 ) != 0 );
-
-    /*
-     * D  = E^-1 mod ((P-1)*(Q-1))
-     * DP = D mod (P - 1)
-     * DQ = D mod (Q - 1)
-     * QP = Q^-1 mod P
-     */
-    MPI_CHK( mpi_inv_mod( &ctx->D , &ctx->E, &H  ) );
-    MPI_CHK( mpi_mod_mpi( &ctx->DP, &ctx->D, &P1 ) );
-    MPI_CHK( mpi_mod_mpi( &ctx->DQ, &ctx->D, &Q1 ) );
-    MPI_CHK( mpi_inv_mod( &ctx->QP, &ctx->Q, &ctx->P ) );
-
-    ctx->len = ( mpi_msb( &ctx->N ) + 7 ) >> 3;
-
-cleanup:
-
-    mpi_free( &P1 ); mpi_free( &Q1 ); mpi_free( &H ); mpi_free( &G );
-
-    if( ret != 0 )
-    {
-        rsa_free( ctx );
-        return( POLARSSL_ERR_RSA_KEY_GEN_FAILED + ret );
-    }
-
-    return( 0 );   
-}
-
-#endif
-
-/*
- * Check a public RSA key
- */
-int rsa_check_pubkey( const rsa_context *ctx )
-{
-    if( !ctx->N.p || !ctx->E.p )
-        return( POLARSSL_ERR_RSA_KEY_CHECK_FAILED );
-
-    if( ( ctx->N.p[0] & 1 ) == 0 || 
-        ( ctx->E.p[0] & 1 ) == 0 )
-        return( POLARSSL_ERR_RSA_KEY_CHECK_FAILED );
-
-    if( mpi_msb( &ctx->N ) < 128 ||
-        mpi_msb( &ctx->N ) > POLARSSL_MPI_MAX_BITS )
-        return( POLARSSL_ERR_RSA_KEY_CHECK_FAILED );
-
-    if( mpi_msb( &ctx->E ) < 2 ||
-        mpi_msb( &ctx->E ) > 64 )
-        return( POLARSSL_ERR_RSA_KEY_CHECK_FAILED );
-
-    return( 0 );
-}
-
-/*
- * Check a private RSA key
- */
-int rsa_check_privkey( const rsa_context *ctx )
-{
-    int ret;
-    mpi PQ, DE, P1, Q1, H, I, G, G2, L1, L2, DP, DQ, QP;
-
-    if( ( ret = rsa_check_pubkey( ctx ) ) != 0 )
-        return( ret );
-
-    if( !ctx->P.p || !ctx->Q.p || !ctx->D.p )
-        return( POLARSSL_ERR_RSA_KEY_CHECK_FAILED );
-
-    mpi_init( &PQ ); mpi_init( &DE ); mpi_init( &P1 ); mpi_init( &Q1 );
-    mpi_init( &H  ); mpi_init( &I  ); mpi_init( &G  ); mpi_init( &G2 );
-    mpi_init( &L1 ); mpi_init( &L2 ); mpi_init( &DP ); mpi_init( &DQ );
-    mpi_init( &QP );
-
-    MPI_CHK( mpi_mul_mpi( &PQ, &ctx->P, &ctx->Q ) );
-    MPI_CHK( mpi_mul_mpi( &DE, &ctx->D, &ctx->E ) );
-    MPI_CHK( mpi_sub_int( &P1, &ctx->P, 1 ) );
-    MPI_CHK( mpi_sub_int( &Q1, &ctx->Q, 1 ) );
-    MPI_CHK( mpi_mul_mpi( &H, &P1, &Q1 ) );
-    MPI_CHK( mpi_gcd( &G, &ctx->E, &H  ) );
-
-    MPI_CHK( mpi_gcd( &G2, &P1, &Q1 ) );
-    MPI_CHK( mpi_div_mpi( &L1, &L2, &H, &G2 ) );  
-    MPI_CHK( mpi_mod_mpi( &I, &DE, &L1  ) );
-
-    MPI_CHK( mpi_mod_mpi( &DP, &ctx->D, &P1 ) );
-    MPI_CHK( mpi_mod_mpi( &DQ, &ctx->D, &Q1 ) );
-    MPI_CHK( mpi_inv_mod( &QP, &ctx->Q, &ctx->P ) );
-    /*
-     * Check for a valid PKCS1v2 private key
-     */
-    if( mpi_cmp_mpi( &PQ, &ctx->N ) != 0 ||
-        mpi_cmp_mpi( &DP, &ctx->DP ) != 0 ||
-        mpi_cmp_mpi( &DQ, &ctx->DQ ) != 0 ||
-        mpi_cmp_mpi( &QP, &ctx->QP ) != 0 ||
-        mpi_cmp_int( &L2, 0 ) != 0 ||
-        mpi_cmp_int( &I, 1 ) != 0 ||
-        mpi_cmp_int( &G, 1 ) != 0 )
-    {
-        ret = POLARSSL_ERR_RSA_KEY_CHECK_FAILED;
-    }
-    
-cleanup:
-    mpi_free( &PQ ); mpi_free( &DE ); mpi_free( &P1 ); mpi_free( &Q1 );
-    mpi_free( &H  ); mpi_free( &I  ); mpi_free( &G  ); mpi_free( &G2 );
-    mpi_free( &L1 ); mpi_free( &L2 ); mpi_free( &DP ); mpi_free( &DQ );
-    mpi_free( &QP );
-
-    if( ret == POLARSSL_ERR_RSA_KEY_CHECK_FAILED )
-        return( ret );
-
-    if( ret != 0 )
-        return( POLARSSL_ERR_RSA_KEY_CHECK_FAILED + ret );
-
-    return( 0 );
-}
-
-/*
- * Do an RSA public key operation
- */
-int rsa_public( rsa_context *ctx,
-                const unsigned char *input,
-                unsigned char *output )
-{
-    int ret;
-    size_t olen;
-    mpi T;
-
-    mpi_init( &T );
-
-    MPI_CHK( mpi_read_binary( &T, input, ctx->len ) );
-
-    if( mpi_cmp_mpi( &T, &ctx->N ) >= 0 )
-    {
-        mpi_free( &T );
-        return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
-    }
-
-    olen = ctx->len;
-    MPI_CHK( mpi_exp_mod( &T, &T, &ctx->E, &ctx->N, &ctx->RN ) );
-    MPI_CHK( mpi_write_binary( &T, output, olen ) );
-
-cleanup:
-
-    mpi_free( &T );
-
-    if( ret != 0 )
-        return( POLARSSL_ERR_RSA_PUBLIC_FAILED + ret );
-
-    return( 0 );
-}
-
-/*
- * Do an RSA private key operation
- */
-int rsa_private( rsa_context *ctx,
-                 const unsigned char *input,
-                 unsigned char *output )
-{
-    int ret;
-    size_t olen;
-    mpi T, T1, T2;
-
-    mpi_init( &T ); mpi_init( &T1 ); mpi_init( &T2 );
-
-    MPI_CHK( mpi_read_binary( &T, input, ctx->len ) );
-
-    if( mpi_cmp_mpi( &T, &ctx->N ) >= 0 )
-    {
-        mpi_free( &T );
-        return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
-    }
-
-#if defined(POLARSSL_RSA_NO_CRT)
-    MPI_CHK( mpi_exp_mod( &T, &T, &ctx->D, &ctx->N, &ctx->RN ) );
-#else
-    /*
-     * faster decryption using the CRT
-     *
-     * T1 = input ^ dP mod P
-     * T2 = input ^ dQ mod Q
-     */
-    MPI_CHK( mpi_exp_mod( &T1, &T, &ctx->DP, &ctx->P, &ctx->RP ) );
-    MPI_CHK( mpi_exp_mod( &T2, &T, &ctx->DQ, &ctx->Q, &ctx->RQ ) );
-
-    /*
-     * T = (T1 - T2) * (Q^-1 mod P) mod P
-     */
-    MPI_CHK( mpi_sub_mpi( &T, &T1, &T2 ) );
-    MPI_CHK( mpi_mul_mpi( &T1, &T, &ctx->QP ) );
-    MPI_CHK( mpi_mod_mpi( &T, &T1, &ctx->P ) );
-
-    /*
-     * output = T2 + T * Q
-     */
-    MPI_CHK( mpi_mul_mpi( &T1, &T, &ctx->Q ) );
-    MPI_CHK( mpi_add_mpi( &T, &T2, &T1 ) );
-#endif
-
-    olen = ctx->len;
-    MPI_CHK( mpi_write_binary( &T, output, olen ) );
-
-cleanup:
-
-    mpi_free( &T ); mpi_free( &T1 ); mpi_free( &T2 );
-
-    if( ret != 0 )
-        return( POLARSSL_ERR_RSA_PRIVATE_FAILED + ret );
-
-    return( 0 );
-}
-
-#if defined(POLARSSL_PKCS1_V21)
-/**
- * Generate and apply the MGF1 operation (from PKCS#1 v2.1) to a buffer.
- *
- * \param dst       buffer to mask
- * \param dlen      length of destination buffer
- * \param src       source of the mask generation
- * \param slen      length of the source buffer
- * \param md_ctx    message digest context to use
- */
-static void mgf_mask( unsigned char *dst, size_t dlen, unsigned char *src, size_t slen,  
-                       md_context_t *md_ctx )
-{
-    unsigned char mask[POLARSSL_MD_MAX_SIZE];
-    unsigned char counter[4];
-    unsigned char *p;
-    unsigned int hlen;
-    size_t i, use_len;
-
-    memset( mask, 0, POLARSSL_MD_MAX_SIZE );
-    memset( counter, 0, 4 );
-
-    hlen = md_ctx->md_info->size;
-
-    // Generate and apply dbMask
-    //
-    p = dst;
-
-    while( dlen > 0 )
-    {
-        use_len = hlen;
-        if( dlen < hlen )
-            use_len = dlen;
-
-        md_starts( md_ctx );
-        md_update( md_ctx, src, slen );
-        md_update( md_ctx, counter, 4 );
-        md_finish( md_ctx, mask );
-
-        for( i = 0; i < use_len; ++i )
-            *p++ ^= mask[i];
-
-        counter[3]++;
-
-        dlen -= use_len;
-    }
-}
-#endif
-
-#if defined(POLARSSL_PKCS1_V21)
-/*
- * Implementation of the PKCS#1 v2.1 RSAES-OAEP-ENCRYPT function
- */
-int rsa_rsaes_oaep_encrypt( rsa_context *ctx,
-                            int (*f_rng)(void *, unsigned char *, size_t),
-                            void *p_rng,
-                            int mode,
-                            const unsigned char *label, size_t label_len,
-                            size_t ilen,
-                            const unsigned char *input,
-                            unsigned char *output )
-{
-    size_t olen;
-    int ret;
-    unsigned char *p = output;
-    unsigned int hlen;
-    const md_info_t *md_info;
-    md_context_t md_ctx;
-
-    if( ctx->padding != RSA_PKCS_V21 || f_rng == NULL )
-        return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
-
-    md_info = md_info_from_type( ctx->hash_id );
-
-    if( md_info == NULL )
-        return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
-
-    olen = ctx->len;
-    hlen = md_get_size( md_info );
-
-    if( olen < ilen + 2 * hlen + 2 || f_rng == NULL )
-        return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
-
-    memset( output, 0, olen );
-
-    *p++ = 0;
-
-    // Generate a random octet string seed
-    //
-    if( ( ret = f_rng( p_rng, p, hlen ) ) != 0 )
-        return( POLARSSL_ERR_RSA_RNG_FAILED + ret );
-
-    p += hlen;
-
-    // Construct DB
-    //
-    md( md_info, label, label_len, p );
-    p += hlen;
-    p += olen - 2 * hlen - 2 - ilen;
-    *p++ = 1;
-    memcpy( p, input, ilen );
-
-    md_init_ctx( &md_ctx, md_info );
-
-    // maskedDB: Apply dbMask to DB
-    //
-    mgf_mask( output + hlen + 1, olen - hlen - 1, output + 1, hlen,
-               &md_ctx );
-
-    // maskedSeed: Apply seedMask to seed
-    //
-    mgf_mask( output + 1, hlen, output + hlen + 1, olen - hlen - 1,
-               &md_ctx );
-
-    md_free_ctx( &md_ctx );
-
-    return( ( mode == RSA_PUBLIC )
-            ? rsa_public(  ctx, output, output )
-            : rsa_private( ctx, output, output ) );
-}
-#endif /* POLARSSL_PKCS1_V21 */
-
-/*
- * Implementation of the PKCS#1 v2.1 RSAES-PKCS1-V1_5-ENCRYPT function
- */
-int rsa_rsaes_pkcs1_v15_encrypt( rsa_context *ctx,
-                                 int (*f_rng)(void *, unsigned char *, size_t),
-                                 void *p_rng,
-                                 int mode, size_t ilen,
-                                 const unsigned char *input,
-                                 unsigned char *output )
-{
-    size_t nb_pad, olen;
-    int ret;
-    unsigned char *p = output;
-
-    if( ctx->padding != RSA_PKCS_V15 || f_rng == NULL )
-        return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
-
-    olen = ctx->len;
-
-    if( olen < ilen + 11 )
-        return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
-
-    nb_pad = olen - 3 - ilen;
-
-    *p++ = 0;
-    if( mode == RSA_PUBLIC )
-    {
-        *p++ = RSA_CRYPT;
-
-        while( nb_pad-- > 0 )
-        {
-            int rng_dl = 100;
-
-            do {
-                ret = f_rng( p_rng, p, 1 );
-            } while( *p == 0 && --rng_dl && ret == 0 );
-
-            // Check if RNG failed to generate data
-            //
-            if( rng_dl == 0 || ret != 0)
-                return POLARSSL_ERR_RSA_RNG_FAILED + ret;
-
-            p++;
-        }
-    }
-    else
-    {
-        *p++ = RSA_SIGN;
-
-        while( nb_pad-- > 0 )
-            *p++ = 0xFF;
-    }
-
-    *p++ = 0;
-    memcpy( p, input, ilen );
-
-    return( ( mode == RSA_PUBLIC )
-            ? rsa_public(  ctx, output, output )
-            : rsa_private( ctx, output, output ) );
-}
-
-/*
- * Add the message padding, then do an RSA operation
- */
-int rsa_pkcs1_encrypt( rsa_context *ctx,
-                       int (*f_rng)(void *, unsigned char *, size_t),
-                       void *p_rng,
-                       int mode, size_t ilen,
-                       const unsigned char *input,
-                       unsigned char *output )
-{
-    switch( ctx->padding )
-    {
-        case RSA_PKCS_V15:
-            return rsa_rsaes_pkcs1_v15_encrypt( ctx, f_rng, p_rng, mode, ilen,
-                                                input, output );
-
-#if defined(POLARSSL_PKCS1_V21)
-        case RSA_PKCS_V21:
-            return rsa_rsaes_oaep_encrypt( ctx, f_rng, p_rng, mode, NULL, 0,
-                                           ilen, input, output );
-#endif
-
-        default:
-            return( POLARSSL_ERR_RSA_INVALID_PADDING );
-    }
-}
-
-#if defined(POLARSSL_PKCS1_V21)
-/*
- * Implementation of the PKCS#1 v2.1 RSAES-OAEP-DECRYPT function
- */
-int rsa_rsaes_oaep_decrypt( rsa_context *ctx,
-                            int mode, 
-                            const unsigned char *label, size_t label_len,
-                            size_t *olen,
-                            const unsigned char *input,
-                            unsigned char *output,
-                            size_t output_max_len )
-{
-    int ret;
-    size_t ilen;
-    unsigned char *p;
-    unsigned char buf[POLARSSL_MPI_MAX_SIZE];
-    unsigned char lhash[POLARSSL_MD_MAX_SIZE];
-    unsigned int hlen;
-    const md_info_t *md_info;
-    md_context_t md_ctx;
-
-    if( ctx->padding != RSA_PKCS_V21 )
-        return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
-
-    ilen = ctx->len;
-
-    if( ilen < 16 || ilen > sizeof( buf ) )
-        return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
-
-    ret = ( mode == RSA_PUBLIC )
-          ? rsa_public(  ctx, input, buf )
-          : rsa_private( ctx, input, buf );
-
-    if( ret != 0 )
-        return( ret );
-
-    p = buf;
-
-    if( *p++ != 0 )
-        return( POLARSSL_ERR_RSA_INVALID_PADDING );
-
-    md_info = md_info_from_type( ctx->hash_id );
-    if( md_info == NULL )
-        return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
-
-    hlen = md_get_size( md_info );
-
-    md_init_ctx( &md_ctx, md_info );
-
-    // Generate lHash
-    //
-    md( md_info, label, label_len, lhash );
-
-    // seed: Apply seedMask to maskedSeed
-    //
-    mgf_mask( buf + 1, hlen, buf + hlen + 1, ilen - hlen - 1,
-               &md_ctx );
-
-    // DB: Apply dbMask to maskedDB
-    //
-    mgf_mask( buf + hlen + 1, ilen - hlen - 1, buf + 1, hlen,
-               &md_ctx );
-
-    p += hlen;
-    md_free_ctx( &md_ctx );
-
-    // Check validity
-    //
-    if( memcmp( lhash, p, hlen ) != 0 )
-        return( POLARSSL_ERR_RSA_INVALID_PADDING );
-
-    p += hlen;
-
-    while( *p == 0 && p < buf + ilen )
-        p++;
-
-    if( p == buf + ilen )
-        return( POLARSSL_ERR_RSA_INVALID_PADDING );
-
-    if( *p++ != 0x01 )
-        return( POLARSSL_ERR_RSA_INVALID_PADDING );
-
-    if (ilen - (p - buf) > output_max_len)
-        return( POLARSSL_ERR_RSA_OUTPUT_TOO_LARGE );
-
-    *olen = ilen - (p - buf);
-    memcpy( output, p, *olen );
-
-    return( 0 );
-}
-#endif /* POLARSSL_PKCS1_V21 */
-
-/*
- * Implementation of the PKCS#1 v2.1 RSAES-PKCS1-V1_5-DECRYPT function
- */
-int rsa_rsaes_pkcs1_v15_decrypt( rsa_context *ctx,
-                                 int mode, size_t *olen,
-                                 const unsigned char *input,
-                                 unsigned char *output,
-                                 size_t output_max_len)
-{
-    int ret, correct = 1;
-    size_t ilen, pad_count = 0;
-    unsigned char *p, *q;
-    unsigned char bt;
-    unsigned char buf[POLARSSL_MPI_MAX_SIZE];
-
-    if( ctx->padding != RSA_PKCS_V15 )
-        return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
-
-    ilen = ctx->len;
-
-    if( ilen < 16 || ilen > sizeof( buf ) )
-        return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
-
-    ret = ( mode == RSA_PUBLIC )
-          ? rsa_public(  ctx, input, buf )
-          : rsa_private( ctx, input, buf );
-
-    if( ret != 0 )
-        return( ret );
-
-    p = buf;
-
-    if( *p++ != 0 )
-        correct = 0;
-
-    bt = *p++;
-    if( ( bt != RSA_CRYPT && mode == RSA_PRIVATE ) ||
-        ( bt != RSA_SIGN && mode == RSA_PUBLIC ) )
-    {
-        correct = 0;
-    }
-
-    if( bt == RSA_CRYPT )
-    {
-        while( *p != 0 && p < buf + ilen - 1 )
-            pad_count += ( *p++ != 0 );
-
-        correct &= ( *p == 0 && p < buf + ilen - 1 );
-
-        q = p;
-
-        // Also pass over all other bytes to reduce timing differences
-        //
-        while ( q < buf + ilen - 1 )
-            pad_count += ( *q++ != 0 );
-
-        // Prevent compiler optimization of pad_count
-        //
-        correct |= pad_count & 0x100000; /* Always 0 unless 1M bit keys */
-        p++;
-    }
-    else
-    {
-        while( *p == 0xFF && p < buf + ilen - 1 )
-            pad_count += ( *p++ == 0xFF );
-
-        correct &= ( *p == 0 && p < buf + ilen - 1 );
-
-        q = p;
-
-        // Also pass over all other bytes to reduce timing differences
-        //
-        while ( q < buf + ilen - 1 )
-            pad_count += ( *q++ != 0 );
-
-        // Prevent compiler optimization of pad_count
-        //
-        correct |= pad_count & 0x100000; /* Always 0 unless 1M bit keys */
-        p++;
-    }
-
-    if( correct == 0 )
-        return( POLARSSL_ERR_RSA_INVALID_PADDING );
-
-    if (ilen - (p - buf) > output_max_len)
-        return( POLARSSL_ERR_RSA_OUTPUT_TOO_LARGE );
-
-    *olen = ilen - (p - buf);
-    memcpy( output, p, *olen );
-
-    return( 0 );
-}
-
-/*
- * Do an RSA operation, then remove the message padding
- */
-int rsa_pkcs1_decrypt( rsa_context *ctx,
-                       int mode, size_t *olen,
-                       const unsigned char *input,
-                       unsigned char *output,
-                       size_t output_max_len)
-{
-    switch( ctx->padding )
-    {
-        case RSA_PKCS_V15:
-            return rsa_rsaes_pkcs1_v15_decrypt( ctx, mode, olen, input, output,
-                                                output_max_len );
-
-#if defined(POLARSSL_PKCS1_V21)
-        case RSA_PKCS_V21:
-            return rsa_rsaes_oaep_decrypt( ctx, mode, NULL, 0, olen, input,
-                                           output, output_max_len );
-#endif
-
-        default:
-            return( POLARSSL_ERR_RSA_INVALID_PADDING );
-    }
-}
-
-#if defined(POLARSSL_PKCS1_V21)
-/*
- * Implementation of the PKCS#1 v2.1 RSASSA-PSS-SIGN function
- */
-int rsa_rsassa_pss_sign( rsa_context *ctx,
-                         int (*f_rng)(void *, unsigned char *, size_t),
-                         void *p_rng,
-                         int mode,
-                         int hash_id,
-                         unsigned int hashlen,
-                         const unsigned char *hash,
-                         unsigned char *sig )
-{
-    size_t olen;
-    unsigned char *p = sig;
-    unsigned char salt[POLARSSL_MD_MAX_SIZE];
-    unsigned int slen, hlen, offset = 0;
-    int ret;
-    size_t msb;
-    const md_info_t *md_info;
-    md_context_t md_ctx;
-
-    if( ctx->padding != RSA_PKCS_V21 || f_rng == NULL )
-        return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
-
-    olen = ctx->len;
-
-    switch( hash_id )
-    {
-        case SIG_RSA_MD2:
-        case SIG_RSA_MD4:
-        case SIG_RSA_MD5:
-            hashlen = 16;
-            break;
-
-        case SIG_RSA_SHA1:
-            hashlen = 20;
-            break;
-
-        case SIG_RSA_SHA224:
-            hashlen = 28;
-            break;
-
-        case SIG_RSA_SHA256:
-            hashlen = 32;
-            break;
-
-        case SIG_RSA_SHA384:
-            hashlen = 48;
-            break;
-
-        case SIG_RSA_SHA512:
-            hashlen = 64;
-            break;
-
-        default:
-            return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
-    }
-
-    md_info = md_info_from_type( ctx->hash_id );
-    if( md_info == NULL )
-        return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
-
-    hlen = md_get_size( md_info );
-    slen = hlen;
-
-    if( olen < hlen + slen + 2 )
-        return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
-
-    memset( sig, 0, olen );
-
-    msb = mpi_msb( &ctx->N ) - 1;
-
-    // Generate salt of length slen
-    //
-    if( ( ret = f_rng( p_rng, salt, slen ) ) != 0 )
-        return( POLARSSL_ERR_RSA_RNG_FAILED + ret );
-
-    // Note: EMSA-PSS encoding is over the length of N - 1 bits
-    //
-    msb = mpi_msb( &ctx->N ) - 1;
-    p += olen - hlen * 2 - 2;
-    *p++ = 0x01;
-    memcpy( p, salt, slen );
-    p += slen;
-
-    md_init_ctx( &md_ctx, md_info );
-
-    // Generate H = Hash( M' )
-    //
-    md_starts( &md_ctx );
-    md_update( &md_ctx, p, 8 );
-    md_update( &md_ctx, hash, hashlen );
-    md_update( &md_ctx, salt, slen );
-    md_finish( &md_ctx, p );
-
-    // Compensate for boundary condition when applying mask
-    //
-    if( msb % 8 == 0 )
-        offset = 1;
-
-    // maskedDB: Apply dbMask to DB
-    //
-    mgf_mask( sig + offset, olen - hlen - 1 - offset, p, hlen, &md_ctx );
-
-    md_free_ctx( &md_ctx );
-
-    msb = mpi_msb( &ctx->N ) - 1;
-    sig[0] &= 0xFF >> ( olen * 8 - msb );
-
-    p += hlen;
-    *p++ = 0xBC;
-
-    return( ( mode == RSA_PUBLIC )
-            ? rsa_public(  ctx, sig, sig )
-            : rsa_private( ctx, sig, sig ) );
-}
-#endif /* POLARSSL_PKCS1_V21 */
-
-/*
- * Implementation of the PKCS#1 v2.1 RSASSA-PKCS1-V1_5-SIGN function
- */
-/*
- * Do an RSA operation to sign the message digest
- */
-int rsa_rsassa_pkcs1_v15_sign( rsa_context *ctx,
-                               int mode,
-                               int hash_id,
-                               unsigned int hashlen,
-                               const unsigned char *hash,
-                               unsigned char *sig )
-{
-    size_t nb_pad, olen;
-    unsigned char *p = sig;
-
-    if( ctx->padding != RSA_PKCS_V15 )
-        return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
-
-    olen = ctx->len;
-
-    switch( hash_id )
-    {
-        case SIG_RSA_RAW:
-            nb_pad = olen - 3 - hashlen;
-            break;
-
-        case SIG_RSA_MD2:
-        case SIG_RSA_MD4:
-        case SIG_RSA_MD5:
-            nb_pad = olen - 3 - 34;
-            break;
-
-        case SIG_RSA_SHA1:
-            nb_pad = olen - 3 - 35;
-            break;
-
-        case SIG_RSA_SHA224:
-            nb_pad = olen - 3 - 47;
-            break;
-
-        case SIG_RSA_SHA256:
-            nb_pad = olen - 3 - 51;
-            break;
-
-        case SIG_RSA_SHA384:
-            nb_pad = olen - 3 - 67;
-            break;
-
-        case SIG_RSA_SHA512:
-            nb_pad = olen - 3 - 83;
-            break;
-
-
-        default:
-            return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
-    }
-
-    if( ( nb_pad < 8 ) || ( nb_pad > olen ) )
-        return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
-
-    *p++ = 0;
-    *p++ = RSA_SIGN;
-    memset( p, 0xFF, nb_pad );
-    p += nb_pad;
-    *p++ = 0;
-
-    switch( hash_id )
-    {
-        case SIG_RSA_RAW:
-            memcpy( p, hash, hashlen );
-            break;
-
-        case SIG_RSA_MD2:
-            memcpy( p, ASN1_HASH_MDX, 18 );
-            memcpy( p + 18, hash, 16 );
-            p[13] = 2; break;
-
-        case SIG_RSA_MD4:
-            memcpy( p, ASN1_HASH_MDX, 18 );
-            memcpy( p + 18, hash, 16 );
-            p[13] = 4; break;
-
-        case SIG_RSA_MD5:
-            memcpy( p, ASN1_HASH_MDX, 18 );
-            memcpy( p + 18, hash, 16 );
-            p[13] = 5; break;
-
-        case SIG_RSA_SHA1:
-            memcpy( p, ASN1_HASH_SHA1, 15 );
-            memcpy( p + 15, hash, 20 );
-            break;
-
-        case SIG_RSA_SHA224:
-            memcpy( p, ASN1_HASH_SHA2X, 19 );
-            memcpy( p + 19, hash, 28 );
-            p[1] += 28; p[14] = 4; p[18] += 28; break;
-
-        case SIG_RSA_SHA256:
-            memcpy( p, ASN1_HASH_SHA2X, 19 );
-            memcpy( p + 19, hash, 32 );
-            p[1] += 32; p[14] = 1; p[18] += 32; break;
-
-        case SIG_RSA_SHA384:
-            memcpy( p, ASN1_HASH_SHA2X, 19 );
-            memcpy( p + 19, hash, 48 );
-            p[1] += 48; p[14] = 2; p[18] += 48; break;
-
-        case SIG_RSA_SHA512:
-            memcpy( p, ASN1_HASH_SHA2X, 19 );
-            memcpy( p + 19, hash, 64 );
-            p[1] += 64; p[14] = 3; p[18] += 64; break;
-
-        default:
-            return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
-    }
-
-    return( ( mode == RSA_PUBLIC )
-            ? rsa_public(  ctx, sig, sig )
-            : rsa_private( ctx, sig, sig ) );
-}
-
-/*
- * Do an RSA operation to sign the message digest
- */
-int rsa_pkcs1_sign( rsa_context *ctx,
-                    int (*f_rng)(void *, unsigned char *, size_t),
-                    void *p_rng,
-                    int mode,
-                    int hash_id,
-                    unsigned int hashlen,
-                    const unsigned char *hash,
-                    unsigned char *sig )
-{
-    switch( ctx->padding )
-    {
-        case RSA_PKCS_V15:
-            return rsa_rsassa_pkcs1_v15_sign( ctx, mode, hash_id,
-                                              hashlen, hash, sig );
-
-#if defined(POLARSSL_PKCS1_V21)
-        case RSA_PKCS_V21:
-            return rsa_rsassa_pss_sign( ctx, f_rng, p_rng, mode, hash_id,
-                                        hashlen, hash, sig );
-#endif
-
-        default:
-            return( POLARSSL_ERR_RSA_INVALID_PADDING );
-    }
-}
-
-#if defined(POLARSSL_PKCS1_V21)
-/*
- * Implementation of the PKCS#1 v2.1 RSASSA-PSS-VERIFY function
- */
-int rsa_rsassa_pss_verify( rsa_context *ctx,
-                           int mode,
-                           int hash_id,
-                           unsigned int hashlen,
-                           const unsigned char *hash,
-                           unsigned char *sig )
-{
-    int ret;
-    size_t siglen;
-    unsigned char *p;
-    unsigned char buf[POLARSSL_MPI_MAX_SIZE];
-    unsigned char result[POLARSSL_MD_MAX_SIZE];
-    unsigned char zeros[8];
-    unsigned int hlen;
-    size_t slen, msb;
-    const md_info_t *md_info;
-    md_context_t md_ctx;
-
-    if( ctx->padding != RSA_PKCS_V21 )
-        return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
-
-    siglen = ctx->len;
-
-    if( siglen < 16 || siglen > sizeof( buf ) )
-        return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
-
-    ret = ( mode == RSA_PUBLIC )
-          ? rsa_public(  ctx, sig, buf )
-          : rsa_private( ctx, sig, buf );
-
-    if( ret != 0 )
-        return( ret );
-
-    p = buf;
-
-    if( buf[siglen - 1] != 0xBC )
-        return( POLARSSL_ERR_RSA_INVALID_PADDING );
-
-    switch( hash_id )
-    {
-        case SIG_RSA_MD2:
-        case SIG_RSA_MD4:
-        case SIG_RSA_MD5:
-            hashlen = 16;
-            break;
-
-        case SIG_RSA_SHA1:
-            hashlen = 20;
-            break;
-
-        case SIG_RSA_SHA224:
-            hashlen = 28;
-            break;
-
-        case SIG_RSA_SHA256:
-            hashlen = 32;
-            break;
-
-        case SIG_RSA_SHA384:
-            hashlen = 48;
-            break;
-
-        case SIG_RSA_SHA512:
-            hashlen = 64;
-            break;
-
-        default:
-            return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
-    }
-
-    md_info = md_info_from_type( ctx->hash_id );
-    if( md_info == NULL )
-        return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
-
-    hlen = md_get_size( md_info );
-    slen = siglen - hlen - 1;
-
-    memset( zeros, 0, 8 );
-
-    // Note: EMSA-PSS verification is over the length of N - 1 bits
-    //
-    msb = mpi_msb( &ctx->N ) - 1;
-
-    // Compensate for boundary condition when applying mask
-    //
-    if( msb % 8 == 0 )
-    {
-        p++;
-        siglen -= 1;
-    }
-    if( buf[0] >> ( 8 - siglen * 8 + msb ) )
-        return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
-
-    md_init_ctx( &md_ctx, md_info );
-
-    mgf_mask( p, siglen - hlen - 1, p + siglen - hlen - 1, hlen, &md_ctx );
-
-    buf[0] &= 0xFF >> ( siglen * 8 - msb );
-
-    while( *p == 0 && p < buf + siglen )
-        p++;
-
-    if( p == buf + siglen ||
-        *p++ != 0x01 )
-    {
-        md_free_ctx( &md_ctx );
-        return( POLARSSL_ERR_RSA_INVALID_PADDING );
-    }
-
-    slen -= p - buf;
-
-    // Generate H = Hash( M' )
-    //
-    md_starts( &md_ctx );
-    md_update( &md_ctx, zeros, 8 );
-    md_update( &md_ctx, hash, hashlen );
-    md_update( &md_ctx, p, slen );
-    md_finish( &md_ctx, result );
-
-    md_free_ctx( &md_ctx );
-
-    if( memcmp( p + slen, result, hlen ) == 0 )
-        return( 0 );
-    else
-        return( POLARSSL_ERR_RSA_VERIFY_FAILED );
-}
-#endif /* POLARSSL_PKCS1_V21 */
-
-/*
- * Implementation of the PKCS#1 v2.1 RSASSA-PKCS1-v1_5-VERIFY function
- */
-int rsa_rsassa_pkcs1_v15_verify( rsa_context *ctx,
-                                 int mode,
-                                 int hash_id,
-                                 unsigned int hashlen,
-                                 const unsigned char *hash,
-                                 unsigned char *sig )
-{
-    int ret;
-    size_t len, siglen;
-    unsigned char *p, c;
-    unsigned char buf[POLARSSL_MPI_MAX_SIZE];
-
-    if( ctx->padding != RSA_PKCS_V15 )
-        return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
-
-    siglen = ctx->len;
-
-    if( siglen < 16 || siglen > sizeof( buf ) )
-        return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
-
-    ret = ( mode == RSA_PUBLIC )
-          ? rsa_public(  ctx, sig, buf )
-          : rsa_private( ctx, sig, buf );
-
-    if( ret != 0 )
-        return( ret );
-
-    p = buf;
-
-    if( *p++ != 0 || *p++ != RSA_SIGN )
-        return( POLARSSL_ERR_RSA_INVALID_PADDING );
-
-    while( *p != 0 )
-    {
-        if( p >= buf + siglen - 1 || *p != 0xFF )
-            return( POLARSSL_ERR_RSA_INVALID_PADDING );
-        p++;
-    }
-    p++;
-
-    len = siglen - ( p - buf );
-
-    if( len == 33 && hash_id == SIG_RSA_SHA1 )
-    {
-        if( memcmp( p, ASN1_HASH_SHA1_ALT, 13 ) == 0 &&
-                memcmp( p + 13, hash, 20 ) == 0 )
-            return( 0 );
-        else
-            return( POLARSSL_ERR_RSA_VERIFY_FAILED );
-    }
-    if( len == 34 )
-    {
-        c = p[13];
-        p[13] = 0;
-
-        if( memcmp( p, ASN1_HASH_MDX, 18 ) != 0 )
-            return( POLARSSL_ERR_RSA_VERIFY_FAILED );
-
-        if( ( c == 2 && hash_id == SIG_RSA_MD2 ) ||
-                ( c == 4 && hash_id == SIG_RSA_MD4 ) ||
-                ( c == 5 && hash_id == SIG_RSA_MD5 ) )
-        {
-            if( memcmp( p + 18, hash, 16 ) == 0 )
-                return( 0 );
-            else
-                return( POLARSSL_ERR_RSA_VERIFY_FAILED );
-        }
-    }
-
-    if( len == 35 && hash_id == SIG_RSA_SHA1 )
-    {
-        if( memcmp( p, ASN1_HASH_SHA1, 15 ) == 0 &&
-                memcmp( p + 15, hash, 20 ) == 0 )
-            return( 0 );
-        else
-            return( POLARSSL_ERR_RSA_VERIFY_FAILED );
-    }
-    if( ( len == 19 + 28 && p[14] == 4 && hash_id == SIG_RSA_SHA224 ) ||
-            ( len == 19 + 32 && p[14] == 1 && hash_id == SIG_RSA_SHA256 ) ||
-            ( len == 19 + 48 && p[14] == 2 && hash_id == SIG_RSA_SHA384 ) ||
-            ( len == 19 + 64 && p[14] == 3 && hash_id == SIG_RSA_SHA512 ) )
-    {
-        c = p[1] - 17;
-        p[1] = 17;
-        p[14] = 0;
-
-        if( p[18] == c &&
-                memcmp( p, ASN1_HASH_SHA2X, 18 ) == 0 &&
-                memcmp( p + 19, hash, c ) == 0 )
-            return( 0 );
-        else
-            return( POLARSSL_ERR_RSA_VERIFY_FAILED );
-    }
-
-    if( len == hashlen && hash_id == SIG_RSA_RAW )
-    {
-        if( memcmp( p, hash, hashlen ) == 0 )
-            return( 0 );
-        else
-            return( POLARSSL_ERR_RSA_VERIFY_FAILED );
-    }
-
-    return( POLARSSL_ERR_RSA_INVALID_PADDING );
-}
-
-/*
- * Do an RSA operation and check the message digest
- */
-int rsa_pkcs1_verify( rsa_context *ctx,
-                      int mode,
-                      int hash_id,
-                      unsigned int hashlen,
-                      const unsigned char *hash,
-                      unsigned char *sig )
-{
-    switch( ctx->padding )
-    {
-        case RSA_PKCS_V15:
-            return rsa_rsassa_pkcs1_v15_verify( ctx, mode, hash_id,
-                                                hashlen, hash, sig );
-
-#if defined(POLARSSL_PKCS1_V21)
-        case RSA_PKCS_V21:
-            return rsa_rsassa_pss_verify( ctx, mode, hash_id,
-                                          hashlen, hash, sig );
-#endif
-
-        default:
-            return( POLARSSL_ERR_RSA_INVALID_PADDING );
-    }
-}
-
-/*
- * Free the components of an RSA key
- */
-void rsa_free( rsa_context *ctx )
-{
-    mpi_free( &ctx->RQ ); mpi_free( &ctx->RP ); mpi_free( &ctx->RN );
-    mpi_free( &ctx->QP ); mpi_free( &ctx->DQ ); mpi_free( &ctx->DP );
-    mpi_free( &ctx->Q  ); mpi_free( &ctx->P  ); mpi_free( &ctx->D );
-    mpi_free( &ctx->E  ); mpi_free( &ctx->N  );
-}
-
-#if defined(POLARSSL_SELF_TEST)
-
-#include "polarssl/sha1.h"
-
-/*
- * Example RSA-1024 keypair, for test purposes
- */
-#define KEY_LEN 128
-
-#define RSA_N   "9292758453063D803DD603D5E777D788" \
-                "8ED1D5BF35786190FA2F23EBC0848AEA" \
-                "DDA92CA6C3D80B32C4D109BE0F36D6AE" \
-                "7130B9CED7ACDF54CFC7555AC14EEBAB" \
-                "93A89813FBF3C4F8066D2D800F7C38A8" \
-                "1AE31942917403FF4946B0A83D3D3E05" \
-                "EE57C6F5F5606FB5D4BC6CD34EE0801A" \
-                "5E94BB77B07507233A0BC7BAC8F90F79"
-
-#define RSA_E   "10001"
-
-#define RSA_D   "24BF6185468786FDD303083D25E64EFC" \
-                "66CA472BC44D253102F8B4A9D3BFA750" \
-                "91386C0077937FE33FA3252D28855837" \
-                "AE1B484A8A9A45F7EE8C0C634F99E8CD" \
-                "DF79C5CE07EE72C7F123142198164234" \
-                "CABB724CF78B8173B9F880FC86322407" \
-                "AF1FEDFDDE2BEB674CA15F3E81A1521E" \
-                "071513A1E85B5DFA031F21ECAE91A34D"
-
-#define RSA_P   "C36D0EB7FCD285223CFB5AABA5BDA3D8" \
-                "2C01CAD19EA484A87EA4377637E75500" \
-                "FCB2005C5C7DD6EC4AC023CDA285D796" \
-                "C3D9E75E1EFC42488BB4F1D13AC30A57"
-
-#define RSA_Q   "C000DF51A7C77AE8D7C7370C1FF55B69" \
-                "E211C2B9E5DB1ED0BF61D0D9899620F4" \
-                "910E4168387E3C30AA1E00C339A79508" \
-                "8452DD96A9A5EA5D9DCA68DA636032AF"
-
-#define RSA_DP  "C1ACF567564274FB07A0BBAD5D26E298" \
-                "3C94D22288ACD763FD8E5600ED4A702D" \
-                "F84198A5F06C2E72236AE490C93F07F8" \
-                "3CC559CD27BC2D1CA488811730BB5725"
-
-#define RSA_DQ  "4959CBF6F8FEF750AEE6977C155579C7" \
-                "D8AAEA56749EA28623272E4F7D0592AF" \
-                "7C1F1313CAC9471B5C523BFE592F517B" \
-                "407A1BD76C164B93DA2D32A383E58357"
-
-#define RSA_QP  "9AE7FBC99546432DF71896FC239EADAE" \
-                "F38D18D2B2F0E2DD275AA977E2BF4411" \
-                "F5A3B2A5D33605AEBBCCBA7FEB9F2D2F" \
-                "A74206CEC169D74BF5A8C50D6F48EA08"
-
-#define PT_LEN  24
-#define RSA_PT  "\xAA\xBB\xCC\x03\x02\x01\x00\xFF\xFF\xFF\xFF\xFF" \
-                "\x11\x22\x33\x0A\x0B\x0C\xCC\xDD\xDD\xDD\xDD\xDD"
-
-static int myrand( void *rng_state, unsigned char *output, size_t len )
-{
-    size_t i;
-
-    if( rng_state != NULL )
-        rng_state  = NULL;
-
-    for( i = 0; i < len; ++i )
-        output[i] = rand();
-    
-    return( 0 );
-}
-
-/*
- * Checkup routine
- */
-int rsa_self_test( int verbose )
-{
-    size_t len;
-    rsa_context rsa;
-    unsigned char rsa_plaintext[PT_LEN];
-    unsigned char rsa_decrypted[PT_LEN];
-    unsigned char rsa_ciphertext[KEY_LEN];
-#if defined(POLARSSL_SHA1_C)
-    unsigned char sha1sum[20];
-#endif
-
-    rsa_init( &rsa, RSA_PKCS_V15, 0 );
-
-    rsa.len = KEY_LEN;
-    mpi_read_string( &rsa.N , 16, RSA_N  );
-    mpi_read_string( &rsa.E , 16, RSA_E  );
-    mpi_read_string( &rsa.D , 16, RSA_D  );
-    mpi_read_string( &rsa.P , 16, RSA_P  );
-    mpi_read_string( &rsa.Q , 16, RSA_Q  );
-    mpi_read_string( &rsa.DP, 16, RSA_DP );
-    mpi_read_string( &rsa.DQ, 16, RSA_DQ );
-    mpi_read_string( &rsa.QP, 16, RSA_QP );
-
-    if( verbose != 0 )
-        printf( "  RSA key validation: " );
-
-    if( rsa_check_pubkey(  &rsa ) != 0 ||
-        rsa_check_privkey( &rsa ) != 0 )
-    {
-        if( verbose != 0 )
-            printf( "failed\n" );
-
-        return( 1 );
-    }
-
-    if( verbose != 0 )
-        printf( "passed\n  PKCS#1 encryption : " );
-
-    memcpy( rsa_plaintext, RSA_PT, PT_LEN );
-
-    if( rsa_pkcs1_encrypt( &rsa, &myrand, NULL, RSA_PUBLIC, PT_LEN,
-                           rsa_plaintext, rsa_ciphertext ) != 0 )
-    {
-        if( verbose != 0 )
-            printf( "failed\n" );
-
-        return( 1 );
-    }
-
-    if( verbose != 0 )
-        printf( "passed\n  PKCS#1 decryption : " );
-
-    if( rsa_pkcs1_decrypt( &rsa, RSA_PRIVATE, &len,
-                           rsa_ciphertext, rsa_decrypted,
-                           sizeof(rsa_decrypted) ) != 0 )
-    {
-        if( verbose != 0 )
-            printf( "failed\n" );
-
-        return( 1 );
-    }
-
-    if( memcmp( rsa_decrypted, rsa_plaintext, len ) != 0 )
-    {
-        if( verbose != 0 )
-            printf( "failed\n" );
-
-        return( 1 );
-    }
-
-#if defined(POLARSSL_SHA1_C)
-    if( verbose != 0 )
-        printf( "passed\n  PKCS#1 data sign  : " );
-
-    sha1( rsa_plaintext, PT_LEN, sha1sum );
-
-    if( rsa_pkcs1_sign( &rsa, NULL, NULL, RSA_PRIVATE, SIG_RSA_SHA1, 20,
-                        sha1sum, rsa_ciphertext ) != 0 )
-    {
-        if( verbose != 0 )
-            printf( "failed\n" );
-
-        return( 1 );
-    }
-
-    if( verbose != 0 )
-        printf( "passed\n  PKCS#1 sig. verify: " );
-
-    if( rsa_pkcs1_verify( &rsa, RSA_PUBLIC, SIG_RSA_SHA1, 20,
-                          sha1sum, rsa_ciphertext ) != 0 )
-    {
-        if( verbose != 0 )
-            printf( "failed\n" );
-
-        return( 1 );
-    }
-
-    if( verbose != 0 )
-        printf( "passed\n\n" );
-#endif /* POLARSSL_SHA1_C */
-
-    rsa_free( &rsa );
-
-    return( 0 );
-}
-
-#endif
-
-#endif
diff --git a/common/polarssl/rsa.h b/common/polarssl/rsa.h
deleted file mode 100644
index f9a022026..000000000
--- a/common/polarssl/rsa.h
+++ /dev/null
@@ -1,597 +0,0 @@
-/**
- * \file rsa.h
- *
- * \brief The RSA public-key cryptosystem
- *
- *  Copyright (C) 2006-2010, Brainspark B.V.
- *
- *  This file is part of PolarSSL (http://www.polarssl.org)
- *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
- *
- *  All rights reserved.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifndef POLARSSL_RSA_H
-#define POLARSSL_RSA_H
-
-#include "bignum.h"
-
-/*
- * RSA Error codes
- */
-#define POLARSSL_ERR_RSA_BAD_INPUT_DATA                    -0x4080  /**< Bad input parameters to function. */
-#define POLARSSL_ERR_RSA_INVALID_PADDING                   -0x4100  /**< Input data contains invalid padding and is rejected. */
-#define POLARSSL_ERR_RSA_KEY_GEN_FAILED                    -0x4180  /**< Something failed during generation of a key. */
-#define POLARSSL_ERR_RSA_KEY_CHECK_FAILED                  -0x4200  /**< Key failed to pass the libraries validity check. */
-#define POLARSSL_ERR_RSA_PUBLIC_FAILED                     -0x4280  /**< The public key operation failed. */
-#define POLARSSL_ERR_RSA_PRIVATE_FAILED                    -0x4300  /**< The private key operation failed. */
-#define POLARSSL_ERR_RSA_VERIFY_FAILED                     -0x4380  /**< The PKCS#1 verification failed. */
-#define POLARSSL_ERR_RSA_OUTPUT_TOO_LARGE                  -0x4400  /**< The output buffer for decryption is not large enough. */
-#define POLARSSL_ERR_RSA_RNG_FAILED                        -0x4480  /**< The random generator failed to generate non-zeros. */
-
-/*
- * PKCS#1 constants
- */
-#define SIG_RSA_RAW     0
-#define SIG_RSA_MD2     2
-#define SIG_RSA_MD4     3
-#define SIG_RSA_MD5     4
-#define SIG_RSA_SHA1    5
-#define SIG_RSA_SHA224 14
-#define SIG_RSA_SHA256 11
-#define SIG_RSA_SHA384 12
-#define SIG_RSA_SHA512 13
-
-#define RSA_PUBLIC      0
-#define RSA_PRIVATE     1
-
-#define RSA_PKCS_V15    0
-#define RSA_PKCS_V21    1
-
-#define RSA_SIGN        1
-#define RSA_CRYPT       2
-
-#define ASN1_STR_CONSTRUCTED_SEQUENCE   "\x30"
-#define ASN1_STR_NULL                   "\x05"
-#define ASN1_STR_OID                    "\x06"
-#define ASN1_STR_OCTET_STRING           "\x04"
-
-#define OID_DIGEST_ALG_MDX              "\x2A\x86\x48\x86\xF7\x0D\x02\x00"
-#define OID_HASH_ALG_SHA1               "\x2b\x0e\x03\x02\x1a"
-#define OID_HASH_ALG_SHA2X              "\x60\x86\x48\x01\x65\x03\x04\x02\x00"
-
-#define OID_ISO_MEMBER_BODIES           "\x2a"
-#define OID_ISO_IDENTIFIED_ORG          "\x2b"
-
-/*
- * ISO Member bodies OID parts
- */
-#define OID_COUNTRY_US                  "\x86\x48"
-#define OID_RSA_DATA_SECURITY           "\x86\xf7\x0d"
-
-/*
- * ISO Identified organization OID parts
- */
-#define OID_OIW_SECSIG_SHA1             "\x0e\x03\x02\x1a"
-
-/*
- * DigestInfo ::= SEQUENCE {
- *   digestAlgorithm DigestAlgorithmIdentifier,
- *   digest Digest }
- *
- * DigestAlgorithmIdentifier ::= AlgorithmIdentifier
- *
- * Digest ::= OCTET STRING
- */
-#define ASN1_HASH_MDX                           \
-(                                               \
-    ASN1_STR_CONSTRUCTED_SEQUENCE "\x20"        \
-      ASN1_STR_CONSTRUCTED_SEQUENCE "\x0C"      \
-        ASN1_STR_OID "\x08"                     \
-      OID_DIGEST_ALG_MDX                        \
-    ASN1_STR_NULL "\x00"                        \
-      ASN1_STR_OCTET_STRING "\x10"              \
-)
-
-#define ASN1_HASH_SHA1                          \
-    ASN1_STR_CONSTRUCTED_SEQUENCE "\x21"        \
-      ASN1_STR_CONSTRUCTED_SEQUENCE "\x09"      \
-        ASN1_STR_OID "\x05"                     \
-      OID_HASH_ALG_SHA1                         \
-        ASN1_STR_NULL "\x00"                    \
-      ASN1_STR_OCTET_STRING "\x14"
-
-#define ASN1_HASH_SHA1_ALT                      \
-    ASN1_STR_CONSTRUCTED_SEQUENCE "\x1F"        \
-      ASN1_STR_CONSTRUCTED_SEQUENCE "\x07"      \
-        ASN1_STR_OID "\x05"                     \
-      OID_HASH_ALG_SHA1                         \
-      ASN1_STR_OCTET_STRING "\x14"
-
-#define ASN1_HASH_SHA2X                         \
-    ASN1_STR_CONSTRUCTED_SEQUENCE "\x11"        \
-      ASN1_STR_CONSTRUCTED_SEQUENCE "\x0d"      \
-        ASN1_STR_OID "\x09"                     \
-      OID_HASH_ALG_SHA2X                        \
-        ASN1_STR_NULL "\x00"                    \
-      ASN1_STR_OCTET_STRING "\x00"
-
-/**
- * \brief          RSA context structure
- */
-typedef struct
-{
-    int ver;                    /*!<  always 0          */
-    size_t len;                 /*!<  size(N) in chars  */
-
-    mpi N;                      /*!<  public modulus    */
-    mpi E;                      /*!<  public exponent   */
-
-    mpi D;                      /*!<  private exponent  */
-    mpi P;                      /*!<  1st prime factor  */
-    mpi Q;                      /*!<  2nd prime factor  */
-    mpi DP;                     /*!<  D % (P - 1)       */
-    mpi DQ;                     /*!<  D % (Q - 1)       */
-    mpi QP;                     /*!<  1 / (Q % P)       */
-
-    mpi RN;                     /*!<  cached R^2 mod N  */
-    mpi RP;                     /*!<  cached R^2 mod P  */
-    mpi RQ;                     /*!<  cached R^2 mod Q  */
-
-    int padding;                /*!<  RSA_PKCS_V15 for 1.5 padding and
-                                      RSA_PKCS_v21 for OAEP/PSS         */
-    int hash_id;                /*!<  Hash identifier of md_type_t as
-                                      specified in the md.h header file
-                                      for the EME-OAEP and EMSA-PSS
-                                      encoding                          */
-}
-rsa_context;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * \brief          Initialize an RSA context
- *
- *                 Note: Set padding to RSA_PKCS_V21 for the RSAES-OAEP
- *                 encryption scheme and the RSASSA-PSS signature scheme.
- *
- * \param ctx      RSA context to be initialized
- * \param padding  RSA_PKCS_V15 or RSA_PKCS_V21
- * \param hash_id  RSA_PKCS_V21 hash identifier
- *
- * \note           The hash_id parameter is actually ignored
- *                 when using RSA_PKCS_V15 padding.
- */
-void rsa_init( rsa_context *ctx,
-               int padding,
-               int hash_id);
-
-/**
- * \brief          Generate an RSA keypair
- *
- * \param ctx      RSA context that will hold the key
- * \param f_rng    RNG function
- * \param p_rng    RNG parameter
- * \param nbits    size of the public key in bits
- * \param exponent public exponent (e.g., 65537)
- *
- * \note           rsa_init() must be called beforehand to setup
- *                 the RSA context.
- *
- * \return         0 if successful, or an POLARSSL_ERR_RSA_XXX error code
- */
-int rsa_gen_key( rsa_context *ctx,
-                 int (*f_rng)(void *, unsigned char *, size_t),
-                 void *p_rng,
-                 unsigned int nbits, int exponent );
-
-/**
- * \brief          Check a public RSA key
- *
- * \param ctx      RSA context to be checked
- *
- * \return         0 if successful, or an POLARSSL_ERR_RSA_XXX error code
- */
-int rsa_check_pubkey( const rsa_context *ctx );
-
-/**
- * \brief          Check a private RSA key
- *
- * \param ctx      RSA context to be checked
- *
- * \return         0 if successful, or an POLARSSL_ERR_RSA_XXX error code
- */
-int rsa_check_privkey( const rsa_context *ctx );
-
-/**
- * \brief          Do an RSA public key operation
- *
- * \param ctx      RSA context
- * \param input    input buffer
- * \param output   output buffer
- *
- * \return         0 if successful, or an POLARSSL_ERR_RSA_XXX error code
- *
- * \note           This function does NOT take care of message
- *                 padding. Also, be sure to set input[0] = 0 or assure that
- *                 input is smaller than N.
- *
- * \note           The input and output buffers must be large
- *                 enough (eg. 128 bytes if RSA-1024 is used).
- */
-int rsa_public( rsa_context *ctx,
-                const unsigned char *input,
-                unsigned char *output );
-
-/**
- * \brief          Do an RSA private key operation
- *
- * \param ctx      RSA context
- * \param input    input buffer
- * \param output   output buffer
- *
- * \return         0 if successful, or an POLARSSL_ERR_RSA_XXX error code
- *
- * \note           The input and output buffers must be large
- *                 enough (eg. 128 bytes if RSA-1024 is used).
- */
-int rsa_private( rsa_context *ctx,
-                 const unsigned char *input,
-                 unsigned char *output );
-
-/**
- * \brief          Generic wrapper to perform a PKCS#1 encryption using the
- *                 mode from the context. Add the message padding, then do an
- *                 RSA operation.
- *
- * \param ctx      RSA context
- * \param f_rng    RNG function (Needed for padding and PKCS#1 v2.1 encoding)
- * \param p_rng    RNG parameter
- * \param mode     RSA_PUBLIC or RSA_PRIVATE
- * \param ilen     contains the plaintext length
- * \param input    buffer holding the data to be encrypted
- * \param output   buffer that will hold the ciphertext
- *
- * \return         0 if successful, or an POLARSSL_ERR_RSA_XXX error code
- *
- * \note           The output buffer must be as large as the size
- *                 of ctx->N (eg. 128 bytes if RSA-1024 is used).
- */
-int rsa_pkcs1_encrypt( rsa_context *ctx,
-                       int (*f_rng)(void *, unsigned char *, size_t),
-                       void *p_rng,
-                       int mode, size_t ilen,
-                       const unsigned char *input,
-                       unsigned char *output );
-
-/**
- * \brief          Perform a PKCS#1 v1.5 encryption (RSAES-PKCS1-v1_5-ENCRYPT)
- *
- * \param ctx      RSA context
- * \param f_rng    RNG function (Needed for padding)
- * \param p_rng    RNG parameter
- * \param mode     RSA_PUBLIC or RSA_PRIVATE
- * \param ilen     contains the plaintext length
- * \param input    buffer holding the data to be encrypted
- * \param output   buffer that will hold the ciphertext
- *
- * \return         0 if successful, or an POLARSSL_ERR_RSA_XXX error code
- *
- * \note           The output buffer must be as large as the size
- *                 of ctx->N (eg. 128 bytes if RSA-1024 is used).
- */
-int rsa_rsaes_pkcs1_v15_encrypt( rsa_context *ctx,
-                                 int (*f_rng)(void *, unsigned char *, size_t),
-                                 void *p_rng,
-                                 int mode, size_t ilen,
-                                 const unsigned char *input,
-                                 unsigned char *output );
-
-/**
- * \brief          Perform a PKCS#1 v2.1 OAEP encryption (RSAES-OAEP-ENCRYPT)
- *
- * \param ctx      RSA context
- * \param f_rng    RNG function (Needed for padding and PKCS#1 v2.1 encoding)
- * \param p_rng    RNG parameter
- * \param mode     RSA_PUBLIC or RSA_PRIVATE
- * \param label    buffer holding the custom label to use
- * \param label_len contains the label length
- * \param ilen     contains the plaintext length
- * \param input    buffer holding the data to be encrypted
- * \param output   buffer that will hold the ciphertext
- *
- * \return         0 if successful, or an POLARSSL_ERR_RSA_XXX error code
- *
- * \note           The output buffer must be as large as the size
- *                 of ctx->N (eg. 128 bytes if RSA-1024 is used).
- */
-int rsa_rsaes_oaep_encrypt( rsa_context *ctx,
-                            int (*f_rng)(void *, unsigned char *, size_t),
-                            void *p_rng,
-                            int mode,
-                            const unsigned char *label, size_t label_len,
-                            size_t ilen,
-                            const unsigned char *input,
-                            unsigned char *output );
-
-/**
- * \brief          Generic wrapper to perform a PKCS#1 decryption using the
- *                 mode from the context. Do an RSA operation, then remove
- *                 the message padding
- *
- * \param ctx      RSA context
- * \param mode     RSA_PUBLIC or RSA_PRIVATE
- * \param olen     will contain the plaintext length
- * \param input    buffer holding the encrypted data
- * \param output   buffer that will hold the plaintext
- * \param output_max_len    maximum length of the output buffer
- *
- * \return         0 if successful, or an POLARSSL_ERR_RSA_XXX error code
- *
- * \note           The output buffer must be as large as the size
- *                 of ctx->N (eg. 128 bytes if RSA-1024 is used) otherwise
- *                 an error is thrown.
- */
-int rsa_pkcs1_decrypt( rsa_context *ctx,
-                       int mode, size_t *olen,
-                       const unsigned char *input,
-                       unsigned char *output,
-                       size_t output_max_len );
-
-/**
- * \brief          Perform a PKCS#1 v1.5 decryption (RSAES-PKCS1-v1_5-DECRYPT)
- *
- * \param ctx      RSA context
- * \param mode     RSA_PUBLIC or RSA_PRIVATE
- * \param olen     will contain the plaintext length
- * \param input    buffer holding the encrypted data
- * \param output   buffer that will hold the plaintext
- * \param output_max_len    maximum length of the output buffer
- *
- * \return         0 if successful, or an POLARSSL_ERR_RSA_XXX error code
- *
- * \note           The output buffer must be as large as the size
- *                 of ctx->N (eg. 128 bytes if RSA-1024 is used) otherwise
- *                 an error is thrown.
- */
-int rsa_rsaes_pkcs1_v15_decrypt( rsa_context *ctx,
-                                 int mode, size_t *olen,
-                                 const unsigned char *input,
-                                 unsigned char *output,
-                                 size_t output_max_len );
-
-/**
- * \brief          Perform a PKCS#1 v2.1 OAEP decryption (RSAES-OAEP-DECRYPT)
- *
- * \param ctx      RSA context
- * \param mode     RSA_PUBLIC or RSA_PRIVATE
- * \param label    buffer holding the custom label to use
- * \param label_len contains the label length
- * \param olen     will contain the plaintext length
- * \param input    buffer holding the encrypted data
- * \param output   buffer that will hold the plaintext
- * \param output_max_len    maximum length of the output buffer
- *
- * \return         0 if successful, or an POLARSSL_ERR_RSA_XXX error code
- *
- * \note           The output buffer must be as large as the size
- *                 of ctx->N (eg. 128 bytes if RSA-1024 is used) otherwise
- *                 an error is thrown.
- */
-int rsa_rsaes_oaep_decrypt( rsa_context *ctx,
-                            int mode,
-                            const unsigned char *label, size_t label_len,
-                            size_t *olen,
-                            const unsigned char *input,
-                            unsigned char *output,
-                            size_t output_max_len );
-
-/**
- * \brief          Generic wrapper to perform a PKCS#1 signature using the
- *                 mode from the context. Do a private RSA operation to sign
- *                 a message digest
- *
- * \param ctx      RSA context
- * \param f_rng    RNG function (Needed for PKCS#1 v2.1 encoding)
- * \param p_rng    RNG parameter
- * \param mode     RSA_PUBLIC or RSA_PRIVATE
- * \param hash_id  SIG_RSA_RAW, SIG_RSA_MD{2,4,5} or SIG_RSA_SHA{1,224,256,384,512}
- * \param hashlen  message digest length (for SIG_RSA_RAW only)
- * \param hash     buffer holding the message digest
- * \param sig      buffer that will hold the ciphertext
- *
- * \return         0 if the signing operation was successful,
- *                 or an POLARSSL_ERR_RSA_XXX error code
- *
- * \note           The "sig" buffer must be as large as the size
- *                 of ctx->N (eg. 128 bytes if RSA-1024 is used).
- *
- * \note           In case of PKCS#1 v2.1 encoding keep in mind that
- *                 the hash_id in the RSA context is the one used for the
- *                 encoding. hash_id in the function call is the type of hash
- *                 that is encoded. According to RFC 3447 it is advised to
- *                 keep both hashes the same.
- */
-int rsa_pkcs1_sign( rsa_context *ctx,
-                    int (*f_rng)(void *, unsigned char *, size_t),
-                    void *p_rng,
-                    int mode,
-                    int hash_id,
-                    unsigned int hashlen,
-                    const unsigned char *hash,
-                    unsigned char *sig );
-
-/**
- * \brief          Perform a PKCS#1 v1.5 signature (RSASSA-PKCS1-v1_5-SIGN)
- *
- * \param ctx      RSA context
- * \param mode     RSA_PUBLIC or RSA_PRIVATE
- * \param hash_id  SIG_RSA_RAW, SIG_RSA_MD{2,4,5} or SIG_RSA_SHA{1,224,256,384,512}
- * \param hashlen  message digest length (for SIG_RSA_RAW only)
- * \param hash     buffer holding the message digest
- * \param sig      buffer that will hold the ciphertext
- *
- * \return         0 if the signing operation was successful,
- *                 or an POLARSSL_ERR_RSA_XXX error code
- *
- * \note           The "sig" buffer must be as large as the size
- *                 of ctx->N (eg. 128 bytes if RSA-1024 is used).
- */
-int rsa_rsassa_pkcs1_v15_sign( rsa_context *ctx,
-                               int mode,
-                               int hash_id,
-                               unsigned int hashlen,
-                               const unsigned char *hash,
-                               unsigned char *sig );
-
-/**
- * \brief          Perform a PKCS#1 v2.1 PSS signature (RSASSA-PSS-SIGN)
- *
- * \param ctx      RSA context
- * \param f_rng    RNG function (Needed for PKCS#1 v2.1 encoding)
- * \param p_rng    RNG parameter
- * \param mode     RSA_PUBLIC or RSA_PRIVATE
- * \param hash_id  SIG_RSA_RAW, SIG_RSA_MD{2,4,5} or SIG_RSA_SHA{1,224,256,384,512}
- * \param hashlen  message digest length (for SIG_RSA_RAW only)
- * \param hash     buffer holding the message digest
- * \param sig      buffer that will hold the ciphertext
- *
- * \return         0 if the signing operation was successful,
- *                 or an POLARSSL_ERR_RSA_XXX error code
- *
- * \note           The "sig" buffer must be as large as the size
- *                 of ctx->N (eg. 128 bytes if RSA-1024 is used).
- *
- * \note           In case of PKCS#1 v2.1 encoding keep in mind that
- *                 the hash_id in the RSA context is the one used for the
- *                 encoding. hash_id in the function call is the type of hash
- *                 that is encoded. According to RFC 3447 it is advised to
- *                 keep both hashes the same.
- */
-int rsa_rsassa_pss_sign( rsa_context *ctx,
-                         int (*f_rng)(void *, unsigned char *, size_t),
-                         void *p_rng,
-                         int mode,
-                         int hash_id,
-                         unsigned int hashlen,
-                         const unsigned char *hash,
-                         unsigned char *sig );
-
-/**
- * \brief          Generic wrapper to perform a PKCS#1 verification using the
- *                 mode from the context. Do a public RSA operation and check
- *                 the message digest
- *
- * \param ctx      points to an RSA public key
- * \param mode     RSA_PUBLIC or RSA_PRIVATE
- * \param hash_id  SIG_RSA_RAW, SIG_RSA_MD{2,4,5} or SIG_RSA_SHA{1,224,256,384,512}
- * \param hashlen  message digest length (for SIG_RSA_RAW only)
- * \param hash     buffer holding the message digest
- * \param sig      buffer holding the ciphertext
- *
- * \return         0 if the verify operation was successful,
- *                 or an POLARSSL_ERR_RSA_XXX error code
- *
- * \note           The "sig" buffer must be as large as the size
- *                 of ctx->N (eg. 128 bytes if RSA-1024 is used).
- *
- * \note           In case of PKCS#1 v2.1 encoding keep in mind that
- *                 the hash_id in the RSA context is the one used for the
- *                 verification. hash_id in the function call is the type of hash
- *                 that is verified. According to RFC 3447 it is advised to
- *                 keep both hashes the same.
- */
-int rsa_pkcs1_verify( rsa_context *ctx,
-                      int mode,
-                      int hash_id,
-                      unsigned int hashlen,
-                      const unsigned char *hash,
-                      unsigned char *sig );
-
-/**
- * \brief          Perform a PKCS#1 v1.5 verification (RSASSA-PKCS1-v1_5-VERIFY)
- *
- * \param ctx      points to an RSA public key
- * \param mode     RSA_PUBLIC or RSA_PRIVATE
- * \param hash_id  SIG_RSA_RAW, SIG_RSA_MD{2,4,5} or SIG_RSA_SHA{1,224,256,384,512}
- * \param hashlen  message digest length (for SIG_RSA_RAW only)
- * \param hash     buffer holding the message digest
- * \param sig      buffer holding the ciphertext
- *
- * \return         0 if the verify operation was successful,
- *                 or an POLARSSL_ERR_RSA_XXX error code
- *
- * \note           The "sig" buffer must be as large as the size
- *                 of ctx->N (eg. 128 bytes if RSA-1024 is used).
- */
-int rsa_rsassa_pkcs1_v15_verify( rsa_context *ctx,
-                                 int mode,
-                                 int hash_id,
-                                 unsigned int hashlen,
-                                 const unsigned char *hash,
-                                 unsigned char *sig );
-
-/**
- * \brief          Perform a PKCS#1 v2.1 PSS verification (RSASSA-PSS-VERIFY)
- * \brief          Do a public RSA and check the message digest
- *
- * \param ctx      points to an RSA public key
- * \param mode     RSA_PUBLIC or RSA_PRIVATE
- * \param hash_id  SIG_RSA_RAW, SIG_RSA_MD{2,4,5} or SIG_RSA_SHA{1,224,256,384,512}
- * \param hashlen  message digest length (for SIG_RSA_RAW only)
- * \param hash     buffer holding the message digest
- * \param sig      buffer holding the ciphertext
- *
- * \return         0 if the verify operation was successful,
- *                 or an POLARSSL_ERR_RSA_XXX error code
- *
- * \note           The "sig" buffer must be as large as the size
- *                 of ctx->N (eg. 128 bytes if RSA-1024 is used).
- *
- * \note           In case of PKCS#1 v2.1 encoding keep in mind that
- *                 the hash_id in the RSA context is the one used for the
- *                 verification. hash_id in the function call is the type of hash
- *                 that is verified. According to RFC 3447 it is advised to
- *                 keep both hashes the same.
- */
-int rsa_rsassa_pss_verify( rsa_context *ctx,
-                           int mode,
-                           int hash_id,
-                           unsigned int hashlen,
-                           const unsigned char *hash,
-                           unsigned char *sig );
-
-/**
- * \brief          Free the components of an RSA key
- *
- * \param ctx      RSA Context to free
- */
-void rsa_free( rsa_context *ctx );
-
-/**
- * \brief          Checkup routine
- *
- * \return         0 if successful, or 1 if the test failed
- */
-int rsa_self_test( int verbose );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* rsa.h */
diff --git a/common/polarssl/sha1.h b/common/polarssl/sha1.h
deleted file mode 100644
index 99ccb7b63..000000000
--- a/common/polarssl/sha1.h
+++ /dev/null
@@ -1,213 +0,0 @@
-/**
- * \file sha1.h
- *
- * \brief SHA-1 cryptographic hash function
- *
- *  Copyright (C) 2006-2014, ARM Limited, All Rights Reserved
- *
- *  This file is part of mbed TLS (https://tls.mbed.org)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifndef POLARSSL_SHA1_H
-#define POLARSSL_SHA1_H
-
-#if !defined(POLARSSL_CONFIG_FILE)
-#include "polarssl_config.h"
-/**
- * \def POLARSSL_SHA1_C
- *
- * Enable the SHA1 cryptographic hash algorithm.
- *
- * Module:  library/sha1.c
- * Caller:  library/md.c
- *          library/ssl_cli.c
- *          library/ssl_srv.c
- *          library/ssl_tls.c
- *          library/x509write_crt.c
- *
- * This module is required for SSL/TLS and SHA1-signed certificates.
- */
-#define POLARSSL_SHA1_C
-
-#else
-#include POLARSSL_CONFIG_FILE
-#endif
-
-#include <stddef.h>
-
-#if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32)
-#include <basetsd.h>
-typedef UINT32 uint32_t;
-#else
-#include <inttypes.h>
-#endif
-
-#define POLARSSL_ERR_SHA1_FILE_IO_ERROR                -0x0076  /**< Read/write error in file. */
-
-#if !defined(POLARSSL_SHA1_ALT)
-// Regular implementation
-//
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * \brief          SHA-1 context structure
- */
-typedef struct
-{
-    uint32_t total[2];          /*!< number of bytes processed  */
-    uint32_t state[5];          /*!< intermediate digest state  */
-    unsigned char buffer[64];   /*!< data block being processed */
-
-    unsigned char ipad[64];     /*!< HMAC: inner padding        */
-    unsigned char opad[64];     /*!< HMAC: outer padding        */
-}
-sha1_context;
-
-/**
- * \brief          Initialize SHA-1 context
- *
- * \param ctx      SHA-1 context to be initialized
- */
-void sha1_init( sha1_context *ctx );
-
-/**
- * \brief          Clear SHA-1 context
- *
- * \param ctx      SHA-1 context to be cleared
- */
-void sha1_free( sha1_context *ctx );
-
-/**
- * \brief          SHA-1 context setup
- *
- * \param ctx      context to be initialized
- */
-void sha1_starts( sha1_context *ctx );
-
-/**
- * \brief          SHA-1 process buffer
- *
- * \param ctx      SHA-1 context
- * \param input    buffer holding the  data
- * \param ilen     length of the input data
- */
-void sha1_update( sha1_context *ctx, const unsigned char *input, size_t ilen );
-
-/**
- * \brief          SHA-1 final digest
- *
- * \param ctx      SHA-1 context
- * \param output   SHA-1 checksum result
- */
-void sha1_finish( sha1_context *ctx, unsigned char output[20] );
-
-/* Internal use */
-void sha1_process( sha1_context *ctx, const unsigned char data[64] );
-
-#ifdef __cplusplus
-}
-#endif
-
-#else  /* POLARSSL_SHA1_ALT */
-#include "sha1_alt.h"
-#endif /* POLARSSL_SHA1_ALT */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * \brief          Output = SHA-1( input buffer )
- *
- * \param input    buffer holding the  data
- * \param ilen     length of the input data
- * \param output   SHA-1 checksum result
- */
-void sha1( const unsigned char *input, size_t ilen, unsigned char output[20] );
-
-/**
- * \brief          Output = SHA-1( file contents )
- *
- * \param path     input file name
- * \param output   SHA-1 checksum result
- *
- * \return         0 if successful, or POLARSSL_ERR_SHA1_FILE_IO_ERROR
- */
-int sha1_file( const char *path, unsigned char output[20] );
-
-/**
- * \brief          SHA-1 HMAC context setup
- *
- * \param ctx      HMAC context to be initialized
- * \param key      HMAC secret key
- * \param keylen   length of the HMAC key
- */
-void sha1_hmac_starts( sha1_context *ctx, const unsigned char *key,
-                       size_t keylen );
-
-/**
- * \brief          SHA-1 HMAC process buffer
- *
- * \param ctx      HMAC context
- * \param input    buffer holding the  data
- * \param ilen     length of the input data
- */
-void sha1_hmac_update( sha1_context *ctx, const unsigned char *input,
-                       size_t ilen );
-
-/**
- * \brief          SHA-1 HMAC final digest
- *
- * \param ctx      HMAC context
- * \param output   SHA-1 HMAC checksum result
- */
-void sha1_hmac_finish( sha1_context *ctx, unsigned char output[20] );
-
-/**
- * \brief          SHA-1 HMAC context reset
- *
- * \param ctx      HMAC context to be reset
- */
-void sha1_hmac_reset( sha1_context *ctx );
-
-/**
- * \brief          Output = HMAC-SHA-1( hmac key, input buffer )
- *
- * \param key      HMAC secret key
- * \param keylen   length of the HMAC key
- * \param input    buffer holding the  data
- * \param ilen     length of the input data
- * \param output   HMAC-SHA-1 result
- */
-void sha1_hmac( const unsigned char *key, size_t keylen,
-                const unsigned char *input, size_t ilen,
-                unsigned char output[20] );
-
-/**
- * \brief          Checkup routine
- *
- * \return         0 if successful, or 1 if the test failed
- */
-int sha1_self_test( int verbose );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* sha1.h */
diff --git a/common/polarssl/sha256.h b/common/polarssl/sha256.h
deleted file mode 100644
index 0dbc4b256..000000000
--- a/common/polarssl/sha256.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/**
- * \file mbedtls_sha256.h
- *
- * \brief SHA-224 and SHA-256 cryptographic hash function
- *
- *  Copyright (C) 2006-2014, ARM Limited, All Rights Reserved
- *
- *  This file is part of mbed TLS (https://tls.mbed.org)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifndef MBEDTLS_SHA256_H
-#define MBEDTLS_SHA256_H
-
-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
-
-#include <stddef.h>
-#include <stdint.h>
-
-#if !defined(MBEDTLS_SHA256_ALT)
-// Regular implementation
-//
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * \brief          SHA-256 context structure
- */
-typedef struct
-{
-    uint32_t total[2];          /*!< number of bytes processed  */
-    uint32_t state[8];          /*!< intermediate digest state  */
-    unsigned char buffer[64];   /*!< data block being processed */
-    int is224;                  /*!< 0 => SHA-256, else SHA-224 */
-}
-mbedtls_sha256_context;
-
-/**
- * \brief          Initialize SHA-256 context
- *
- * \param ctx      SHA-256 context to be initialized
- */
-void mbedtls_sha256_init( mbedtls_sha256_context *ctx );
-
-/**
- * \brief          Clear SHA-256 context
- *
- * \param ctx      SHA-256 context to be cleared
- */
-void mbedtls_sha256_free( mbedtls_sha256_context *ctx );
-
-/**
- * \brief          Clone (the state of) a SHA-256 context
- *
- * \param dst      The destination context
- * \param src      The context to be cloned
- */
-void mbedtls_sha256_clone( mbedtls_sha256_context *dst,
-                           const mbedtls_sha256_context *src );
-
-/**
- * \brief          SHA-256 context setup
- *
- * \param ctx      context to be initialized
- * \param is224    0 = use SHA256, 1 = use SHA224
- */
-void mbedtls_sha256_starts( mbedtls_sha256_context *ctx, int is224 );
-
-/**
- * \brief          SHA-256 process buffer
- *
- * \param ctx      SHA-256 context
- * \param input    buffer holding the  data
- * \param ilen     length of the input data
- */
-void mbedtls_sha256_update( mbedtls_sha256_context *ctx, const unsigned char *input,
-                    size_t ilen );
-
-/**
- * \brief          SHA-256 final digest
- *
- * \param ctx      SHA-256 context
- * \param output   SHA-224/256 checksum result
- */
-void mbedtls_sha256_finish( mbedtls_sha256_context *ctx, unsigned char output[32] );
-
-/* Internal use */
-void mbedtls_sha256_process( mbedtls_sha256_context *ctx, const unsigned char data[64] );
-
-#ifdef __cplusplus
-}
-#endif
-
-#else  /* MBEDTLS_SHA256_ALT */
-#include "sha256_alt.h"
-#endif /* MBEDTLS_SHA256_ALT */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * \brief          Output = SHA-256( input buffer )
- *
- * \param input    buffer holding the  data
- * \param ilen     length of the input data
- * \param output   SHA-224/256 checksum result
- * \param is224    0 = use SHA256, 1 = use SHA224
- */
-void mbedtls_sha256( const unsigned char *input, size_t ilen,
-           unsigned char output[32], int is224 );
-
-/**
- * \brief          Checkup routine
- *
- * \return         0 if successful, or 1 if the test failed
- */
-int mbedtls_sha256_self_test( int verbose );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* mbedtls_sha256.h */

From aaf7b25c016511ac1b67690bbc912c454c09a9d3 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 7 Nov 2018 18:17:17 +0200
Subject: [PATCH 0134/1938] cmdflashmem fixed for mbedtls

---
 client/cmdflashmem.c | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/client/cmdflashmem.c b/client/cmdflashmem.c
index d6d27e6fc..62f341a24 100644
--- a/client/cmdflashmem.c
+++ b/client/cmdflashmem.c
@@ -9,8 +9,8 @@
 //-----------------------------------------------------------------------------
 #include "cmdflashmem.h"
 
-#include "rsa.h"
-#include "sha1.h"
+#include "mbedtls/rsa.h"
+#include "mbedtls/sha1.h"
 
 #define MCK 48000000
 //#define FLASH_BAUD 24000000
@@ -358,7 +358,7 @@ int CmdFlashMemWipe(const char *Cmd){
 int CmdFlashMemInfo(const char *Cmd){
 
 	uint8_t sha_hash[20] = {0};
-	rsa_context rsa;
+	mbedtls_rsa_context rsa;
 	
 	uint8_t cmdp = 0;
 	bool errors = false,  shall_write = false, shall_sign = false;
@@ -404,7 +404,7 @@ int CmdFlashMemInfo(const char *Cmd){
 	memcpy(&mem, (rdv40_validation_t *)resp.d.asBytes, sizeof(rdv40_validation_t));
 
 	// Flash ID hash (sha1)
-	sha1( mem.flashid, sizeof(mem.flashid), sha_hash );
+	mbedtls_sha1( mem.flashid, sizeof(mem.flashid), sha_hash );
 	
 	// print header
 	PrintAndLogEx(INFO, "\n--- Flash memory Information ---------");
@@ -471,22 +471,22 @@ int CmdFlashMemInfo(const char *Cmd){
 				
 #define KEY_LEN 128
 
-	rsa_init(&rsa, RSA_PKCS_V15, 0);
+	mbedtls_rsa_init(&rsa, MBEDTLS_RSA_PKCS_V15, 0);
 
 	rsa.len = KEY_LEN;
 
-	mpi_read_string( &rsa.N , 16, RSA_N  );
-	mpi_read_string( &rsa.E , 16, RSA_E  );
-	mpi_read_string( &rsa.D , 16, RSA_D  );
-	mpi_read_string( &rsa.P , 16, RSA_P  );
-	mpi_read_string( &rsa.Q , 16, RSA_Q  );
-	mpi_read_string( &rsa.DP, 16, RSA_DP );
-	mpi_read_string( &rsa.DQ, 16, RSA_DQ );
-	mpi_read_string( &rsa.QP, 16, RSA_QP );
+	mbedtls_mpi_read_string( &rsa.N , 16, RSA_N  );
+	mbedtls_mpi_read_string( &rsa.E , 16, RSA_E  );
+	mbedtls_mpi_read_string( &rsa.D , 16, RSA_D  );
+	mbedtls_mpi_read_string( &rsa.P , 16, RSA_P  );
+	mbedtls_mpi_read_string( &rsa.Q , 16, RSA_Q  );
+	mbedtls_mpi_read_string( &rsa.DP, 16, RSA_DP );
+	mbedtls_mpi_read_string( &rsa.DQ, 16, RSA_DQ );
+	mbedtls_mpi_read_string( &rsa.QP, 16, RSA_QP );
 
 	PrintAndLogEx(INFO, "KEY length   | %d", KEY_LEN);
 		
-	bool is_keyok = ( rsa_check_pubkey(  &rsa ) == 0 || rsa_check_privkey( &rsa ) == 0 );
+	bool is_keyok = ( mbedtls_rsa_check_pubkey(  &rsa ) == 0 || mbedtls_rsa_check_privkey( &rsa ) == 0 );
 	if (is_keyok)
 		PrintAndLogEx(SUCCESS, "RSA key validation ok");
 	else
@@ -505,7 +505,7 @@ int CmdFlashMemInfo(const char *Cmd){
 	// Signing (private key)
 	if (shall_sign) {
 			
-		int is_signed = rsa_pkcs1_sign( &rsa, NULL, NULL, RSA_PRIVATE, SIG_RSA_SHA1, 20, sha_hash, sign );
+		int is_signed = mbedtls_rsa_pkcs1_sign( &rsa, NULL, NULL, MBEDTLS_RSA_PRIVATE, MBEDTLS_MD_SHA1, 20, sha_hash, sign );
 		if (is_signed == 0) 
 			PrintAndLogEx(SUCCESS, "RSA Signing ok");
 		else
@@ -533,13 +533,13 @@ int CmdFlashMemInfo(const char *Cmd){
 	}
 	
 	// Verify (public key)
-	int is_verified = rsa_pkcs1_verify( &rsa, RSA_PUBLIC, SIG_RSA_SHA1, 20, sha_hash, from_device );
+	int is_verified = mbedtls_rsa_pkcs1_verify( &rsa, NULL, NULL, MBEDTLS_RSA_PUBLIC, MBEDTLS_MD_SHA1, 20, sha_hash, from_device );
 	if (is_verified == 0)
 		PrintAndLogEx(SUCCESS, "RSA Verification ok");
 	else
 		PrintAndLogEx(FAILED, "RSA Verification failed");
 
-	rsa_free(&rsa);
+	mbedtls_rsa_free(&rsa);
 	return 0;
 }
 

From f0741798e67b5f59a72252f2b0dab8956ccf97bc Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 7 Nov 2018 18:20:24 +0200
Subject: [PATCH 0135/1938] fix scripting

---
 client/scripting.c | 34 +++++++++++++++++-----------------
 client/scripting.h |  4 ++--
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/client/scripting.c b/client/scripting.c
index 06356293f..f0fa9b2f4 100644
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -331,10 +331,10 @@ static int l_aes128decrypt_cbc(lua_State *L) {
 		aes_key[i / 2] = tmp & 0xFF;
 	}
 
-    aes_context ctx;
-    aes_init(&ctx);
-	aes_setkey_dec(&ctx, aes_key, 128);
-	aes_crypt_cbc(&ctx, AES_DECRYPT, sizeof(indata), iv, indata, outdata );
+    mbedtls_aes_context ctx;
+    mbedtls_aes_init(&ctx);
+	mbedtls_aes_setkey_dec(&ctx, aes_key, 128);
+	mbedtls_aes_crypt_cbc(&ctx, MBEDTLS_AES_DECRYPT, sizeof(indata), iv, indata, outdata );
     //Push decrypted array as a string
 	lua_pushlstring(L,(const char *)&outdata, sizeof(outdata));
 	return 1;// return 1 to signal one return value
@@ -360,10 +360,10 @@ static int l_aes128decrypt_ecb(lua_State *L) {
 		sscanf(&p_key[i], "%02x", &tmp);
 		aes_key[i / 2] = tmp & 0xFF;
 	}
-    aes_context ctx;
-    aes_init(&ctx);
-	aes_setkey_dec(&ctx, aes_key, 128);
-	aes_crypt_ecb(&ctx, AES_DECRYPT, indata, outdata );
+    mbedtls_aes_context ctx;
+    mbedtls_aes_init(&ctx);
+	mbedtls_aes_setkey_dec(&ctx, aes_key, 128);
+	mbedtls_aes_crypt_ecb(&ctx, MBEDTLS_AES_DECRYPT, indata, outdata );
 
     //Push decrypted array as a string
 	lua_pushlstring(L,(const char *)&outdata, sizeof(outdata));
@@ -392,10 +392,10 @@ static int l_aes128encrypt_cbc(lua_State *L) {
 		aes_key[i / 2] = tmp & 0xFF;
 	}
 
-    aes_context ctx;
-    aes_init(&ctx);
-	aes_setkey_enc(&ctx, aes_key, 128);
-	aes_crypt_cbc(&ctx, AES_ENCRYPT, sizeof(indata), iv, indata, outdata );
+    mbedtls_aes_context ctx;
+    mbedtls_aes_init(&ctx);
+	mbedtls_aes_setkey_enc(&ctx, aes_key, 128);
+	mbedtls_aes_crypt_cbc(&ctx, MBEDTLS_AES_ENCRYPT, sizeof(indata), iv, indata, outdata );
 	//Push encrypted array as a string
 	lua_pushlstring(L,(const char *)&outdata, sizeof(outdata));
 	return 1;// return 1 to signal one return value
@@ -421,10 +421,10 @@ static int l_aes128encrypt_ecb(lua_State *L) {
 		sscanf(&p_key[i], "%02x", &tmp);
 		aes_key[i / 2] = tmp & 0xFF;
 	}	
-    aes_context ctx;
-    aes_init(&ctx);
-	aes_setkey_enc(&ctx, aes_key, 128);
-	aes_crypt_ecb(&ctx, AES_ENCRYPT, indata, outdata );
+    mbedtls_aes_context ctx;
+    mbedtls_aes_init(&ctx);
+	mbedtls_aes_setkey_enc(&ctx, aes_key, 128);
+	mbedtls_aes_crypt_ecb(&ctx, MBEDTLS_AES_ENCRYPT, indata, outdata );
 	//Push encrypted array as a string
 	lua_pushlstring(L,(const char *)&outdata, sizeof(outdata));
 	return 1;// return 1 to signal one return value
@@ -498,7 +498,7 @@ static int l_sha1(lua_State *L) {
 	size_t size;
 	const char *p_str = luaL_checklstring(L, 1, &size);	
 	unsigned char outdata[20] = {0x00};                                                                                                                                                                     
-    sha1( (uint8_t*) p_str, size, outdata);                                                                                                                                                                 
+    mbedtls_sha1( (uint8_t*) p_str, size, outdata);                                                                                                                                                                 
     lua_pushlstring(L, (const char *)&outdata, sizeof(outdata));
     return 1;	
 }
diff --git a/client/scripting.h b/client/scripting.h
index a6aaf157a..4d39a6c6f 100644
--- a/client/scripting.h
+++ b/client/scripting.h
@@ -23,8 +23,8 @@
 #include "crc.h"
 #include "crc16.h"
 #include "crc64.h"
-#include "sha1.h"
-#include "aes.h"
+#include "mbedtls/sha1.h"
+#include "mbedtls/aes.h"
 #include "cmdcrc.h"
 #include "cmdhfmfhard.h"
 #include "cmdhfmfu.h"

From d0c6889c714a12beb653128eaad0e347790d5fcb Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 7 Nov 2018 18:27:22 +0200
Subject: [PATCH 0136/1938] fix warning in emv_tags.c

---
 client/emv/emv_tags.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/emv/emv_tags.c b/client/emv/emv_tags.c
index a1bf3d25e..0cb1e6e64 100644
--- a/client/emv/emv_tags.c
+++ b/client/emv/emv_tags.c
@@ -391,7 +391,7 @@ static unsigned long emv_value_numeric(const struct tlv *tlv, unsigned start, un
 
 static void emv_tag_dump_numeric(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level) {
 	PRINT_INDENT(level);
-	fprintf(f, "\tNumeric value %" PRIu32 " \n", emv_value_numeric(tlv, 0, tlv->len * 2));
+	fprintf(f, "\tNumeric value %lu \n", emv_value_numeric(tlv, 0, tlv->len * 2));
 }
 
 static void emv_tag_dump_yymmdd(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level) {

From ec1e04342c966f810b62b10017c58f9cfdb7f9fc Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 7 Nov 2018 18:31:36 +0200
Subject: [PATCH 0137/1938] compiles

---
 client/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/Makefile b/client/Makefile
index 03c4c1288..38cad33cf 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -28,7 +28,7 @@ LUALIB = ../liblua/liblua.a
 MBEDTLSLIBPATH = ../common/mbedtls
 MBEDTLSLIB = $(MBEDTLSLIBPATH)/libmbedtls.a
 LDFLAGS = $(ENV_LDFLAGS)
-INCLUDES_CLIENT = -I. -I../include -I../common -I../common/polarssl -I../zlib -I../uart -I/opt/local/include -I../liblua
+INCLUDES_CLIENT = -I. -I../include -I../common -I../common/polarssl -I../zlib -I../uart -I/opt/local/include -I../liblua -I$(MBEDTLSLIBPATH)
 CFLAGS = $(ENV_CFLAGS) -std=c99 -D_ISOC99_SOURCE -DPRESETS $(INCLUDES_CLIENT) -Wall -g -O3
 CXXFLAGS = -I../include -Wall -O3
 
@@ -261,7 +261,7 @@ all: lua_build mbedtls_build $(BINS)
 all-static: LDLIBS:=-static $(LDLIBS)
 all-static: proxmark3 flasher fpga_compress
 
-proxmark3: LDLIBS+=$(LUALIB) $(QTLDLIBS)
+proxmark3: LDLIBS+=$(LUALIB) $(QTLDLIBS) $(MBEDTLSLIB)
 proxmark3: $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(OBJCOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(ZLIBOBJS) lualibs/usb_cmd.lua lualibs/mf_default_keys.lua
 	$(LD) $(LDFLAGS) $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(OBJCOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(ZLIBOBJS) $(LDLIBS)  -o $@
 	

From 3731ca19d28e0c1bac3ef02cb2770fd98eaf1e46 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Thu, 8 Nov 2018 01:16:27 +0100
Subject: [PATCH 0138/1938] chg: 'hf mf fchk' - filename

---
 client/cmdhfmf.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 8f7004d66..7cdd44af1 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -1621,12 +1621,12 @@ out:
 
 		FILE *fkeys = fopen(fptr,"wb");
 		if (fkeys == NULL) { 
-			PrintAndLogEx(WARNING, "Could not create file %s", filename);
+			PrintAndLogEx(WARNING, "Could not create file %s", fptr);
 			free(keyBlock);
 			free(e_sector);
 			return 1;
 		}
-		PrintAndLogEx(NORMAL, "Printing keys to binary file %s...", filename);
+		PrintAndLogEx(NORMAL, "Printing keys to binary file %s...", fptr);
 	
 		for (i=0; i<sectorsCnt; i++) {
 			num_to_bytes(e_sector[i].Key[0], 6, tempkey);
@@ -1639,7 +1639,7 @@ out:
 		}
 
 		fclose(fkeys);
-		PrintAndLogEx(NORMAL, "Found keys have been dumped to file %s. 0xffffffffffff has been inserted for unknown keys.", filename);			
+		PrintAndLogEx(NORMAL, "Found keys have been dumped to %s --> 0xffffffffffff has been inserted for unknown keys.", fptr);			
 	}
 	
 	free(keyBlock);

From affee79b692d28cdaff06d2333065208a59b714d Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Thu, 8 Nov 2018 13:45:57 +0100
Subject: [PATCH 0139/1938] fix 'sc raw' - now raw command automatically adjust
 when getting a 0x6C response code and resend command.

---
 client/cmdsmartcard.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index fc188b951..675b9a9b7 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -224,6 +224,21 @@ int CmdSmartRaw(const char *Cmd) {
 			free(buf);
 			return 2;
 		}
+		
+		if ( buf[0] == 0x6C ) {
+			data[4]	= buf[1];
+			
+			memcpy(c.d.asBytes, data, sizeof(data) );
+			clearCommandBuffer();
+			SendCommand(&c);
+			len = smart_response(buf);
+			
+			// TLV decoder
+			if (len > 4)
+				TLVPrintFromBuffer(buf+1, len-3);
+
+			data[4] = 0;
+		}
 
 		if (decodeTLV && len > 4)
 			TLVPrintFromBuffer(buf+1, len-3);

From 4fed815b88f0a7e715a9a233b486db75034b25db Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Thu, 8 Nov 2018 17:29:58 +0200
Subject: [PATCH 0140/1938] added core files. need to add: 1. jansson (maybe
 needs jansson-devel) 2. arm and client side of exchangeapdu14a

---
 client/Makefile      |   4 +-
 client/cmdhf.c       |  27 ++-
 client/cmdhf.h       |   1 +
 client/cmdhffido.c   | 550 +++++++++++++++++++++++++++++++++++++++++++
 client/cmdhffido.h   |  27 +++
 client/emv/emvcore.h |   3 +
 client/emv/emvjson.c | 385 ++++++++++++++++++++++++++++++
 client/emv/emvjson.h |  40 ++++
 client/util.c        |  17 +-
 9 files changed, 1031 insertions(+), 23 deletions(-)
 create mode 100644 client/cmdhffido.c
 create mode 100644 client/cmdhffido.h
 create mode 100644 client/emv/emvjson.c
 create mode 100644 client/emv/emvjson.h

diff --git a/client/Makefile b/client/Makefile
index a31be08d5..1e6ad4426 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -23,7 +23,7 @@ ENV_CFLAGS := $(CFLAGS)
 VPATH = ../common ../zlib ../uart
 OBJDIR = obj
 
-LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm
+LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm -ljansson
 LUALIB = ../liblua/liblua.a
 LDFLAGS = $(ENV_LDFLAGS)
 INCLUDES_CLIENT = -I. -I../include -I../common -I../common/polarssl -I../zlib -I../uart -I/opt/local/include -I../liblua
@@ -134,6 +134,7 @@ CMDSRCS =	crapto1/crapto1.c \
 			lfdemod.c \
 			emv/crypto_polarssl.c\
 			emv/crypto.c\
+			emv/emvjson.c\
 			emv/emv_pk.c\
 			emv/emv_pki.c\
 			emv/emv_pki_priv.c\
@@ -166,6 +167,7 @@ CMDSRCS =	crapto1/crapto1.c \
             hardnested/hardnested_bruteforce.c \
 			cmdhfmfdes.c \
 			cmdhftopaz.c \
+			cmdhffido.c \
 			cmdhffelica.c \
 			cmdhw.c \
 			cmdlf.c \
diff --git a/client/cmdhf.c b/client/cmdhf.c
index 30669d24d..65b6bd33d 100644
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -108,19 +108,20 @@ int CmdHFSnoop(const char *Cmd) {
 
 static command_t CommandTable[] = {
 	{"help",        CmdHelp,          1, "This help"},
-	{"14a",         CmdHF14A,         1, "{ ISO14443A RFIDs...            }"},
-	{"14b",         CmdHF14B,         1, "{ ISO14443B RFIDs...            }"},
-	{"15",          CmdHF15,          1, "{ ISO15693 RFIDs...             }"},
-	{"epa",         CmdHFEPA,         1, "{ German Identification Card... }"},
-	{"emv",         CmdHFEMV,         1, "{ EMV RFIDs...                  }"},
-	{"felica",      CmdHFFelica,      1, "{ ISO18092 / Felica RFIDs...    }"},
-	{"legic",       CmdHFLegic,       1, "{ LEGIC RFIDs...                }"},
-	{"iclass",      CmdHFiClass,      1, "{ ICLASS RFIDs...               }"},
-	{"mf",      	CmdHFMF,		  1, "{ MIFARE RFIDs...               }"},
-	{"mfp",			CmdHFMFP,		  1, "{ MIFARE Plus RFIDs...          }"},
-	{"mfu",         CmdHFMFUltra,     1, "{ MIFARE Ultralight RFIDs...    }"},
-	{"mfdes",		CmdHFMFDes,		  1, "{ MIFARE Desfire RFIDs...       }"},
-	{"topaz",		CmdHFTopaz,		  1, "{ TOPAZ (NFC Type 1) RFIDs...   }"},
+	{"14a",         CmdHF14A,         1, "{ ISO14443A RFIDs...               }"},
+	{"14b",         CmdHF14B,         1, "{ ISO14443B RFIDs...               }"},
+	{"15",          CmdHF15,          1, "{ ISO15693 RFIDs...                }"},
+	{"epa",         CmdHFEPA,         1, "{ German Identification Card...    }"},
+	{"emv",         CmdHFEMV,         1, "{ EMV RFIDs...                     }"},
+	{"felica",      CmdHFFelica,      1, "{ ISO18092 / Felica RFIDs...       }"},
+	{"legic",       CmdHFLegic,       1, "{ LEGIC RFIDs...                   }"},
+	{"iclass",      CmdHFiClass,      1, "{ ICLASS RFIDs...                  }"},
+	{"mf",      	CmdHFMF,		  1, "{ MIFARE RFIDs...                  }"},
+	{"mfp",			CmdHFMFP,		  1, "{ MIFARE Plus RFIDs...             }"},
+	{"mfu",         CmdHFMFUltra,     1, "{ MIFARE Ultralight RFIDs...       }"},
+	{"mfdes",		CmdHFMFDes,		  1, "{ MIFARE Desfire RFIDs...          }"},
+	{"topaz",		CmdHFTopaz,		  1, "{ TOPAZ (NFC Type 1) RFIDs...      }"},
+	{"fido",		CmdHFFido,		  1, "{ FIDO and FIDO2 authenticators... }"},
 	{"list", 		CmdTraceList,	  0, "List protocol data in trace buffer"},	
 	{"tune",		CmdHFTune,	      0, "Continuously measure HF antenna tuning"},
 	{"search",      CmdHFSearch,      1, "Search for known HF tags [preliminary]"},
diff --git a/client/cmdhf.h b/client/cmdhf.h
index a4cc2e95c..bd191ead5 100644
--- a/client/cmdhf.h
+++ b/client/cmdhf.h
@@ -31,6 +31,7 @@
 #include "cmdhftopaz.h"		// TOPAZ
 #include "cmdhffelica.h"	// ISO18092 / FeliCa
 #include "emv/cmdemv.h"		// EMV				  
+#include "cmdhffido.h"		// FIDO authenticators
 #include "cmdtrace.h"		// trace list
 
 extern int CmdHF(const char *Cmd);
diff --git a/client/cmdhffido.c b/client/cmdhffido.c
new file mode 100644
index 000000000..fd97ace54
--- /dev/null
+++ b/client/cmdhffido.c
@@ -0,0 +1,550 @@
+//-----------------------------------------------------------------------------
+// Copyright (C) 2018 Merlok
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// High frequency MIFARE  Plus commands
+//-----------------------------------------------------------------------------
+//
+//  Documentation here:
+//
+// FIDO Alliance specifications
+// https://fidoalliance.org/download/
+// FIDO NFC Protocol Specification v1.0
+// https://fidoalliance.org/specs/fido-u2f-v1.2-ps-20170411/fido-u2f-nfc-protocol-v1.2-ps-20170411.html
+// FIDO U2F Raw Message Formats
+// https://fidoalliance.org/specs/fido-u2f-v1.2-ps-20170411/fido-u2f-raw-message-formats-v1.2-ps-20170411.html
+//-----------------------------------------------------------------------------
+
+
+#include "cmdhffido.h"
+
+#include <inttypes.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <unistd.h>
+#include <jansson.h>
+#include "comms.h"
+#include "cmdmain.h"
+#include "util.h"
+#include "ui.h"
+#include "proxmark3.h"
+#include "cmdhf14a.h"
+#include "mifare.h"
+#include "emv/emvcore.h"
+#include "emv/emvjson.h"
+#include "emv/dump.h"
+#include "cliparser/cliparser.h"
+
+static int CmdHelp(const char *Cmd);
+
+int FIDOSelect(bool ActivateField, bool LeaveFieldON, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
+	uint8_t data[] = {0xA0, 0x00, 0x00, 0x06, 0x47, 0x2F, 0x00, 0x01};
+	
+	return EMVSelect(ActivateField, LeaveFieldON, data, sizeof(data), Result, MaxResultLen, ResultLen, sw, NULL);
+}
+
+int FIDOExchange(sAPDU apdu, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
+	int res = EMVExchange(true, apdu, Result, MaxResultLen, ResultLen, sw, NULL);
+	if (res == 5) // apdu result (sw) not a 0x9000
+		res = 0;
+	// software chaining
+	while (!res && (*sw >> 8) == 0x61) {
+		size_t oldlen = *ResultLen;
+		res = EMVExchange(true, (sAPDU){0x00, 0xC0, 0x00, 0x00, 0x00, NULL}, &Result[oldlen], MaxResultLen - oldlen, ResultLen, sw, NULL);
+		if (res == 5) // apdu result (sw) not a 0x9000
+			res = 0;
+		
+		*ResultLen += oldlen;
+		if (*ResultLen > MaxResultLen) 
+			return 100;
+	}
+	return res;
+}
+
+int FIDORegister(uint8_t *params, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
+	return FIDOExchange((sAPDU){0x00, 0x01, 0x03, 0x00, 64, params}, Result, MaxResultLen, ResultLen, sw);
+}
+
+int FIDOAuthentication(uint8_t *params, uint8_t paramslen, uint8_t controlb, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
+	return FIDOExchange((sAPDU){0x00, 0x02, controlb, 0x00, paramslen, params}, Result, MaxResultLen, ResultLen, sw);
+}
+
+int FIDO2GetInfo(uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
+	uint8_t data[] = {0x04};
+	return FIDOExchange((sAPDU){0x80, 0x10, 0x00, 0x00, sizeof(data), data}, Result, MaxResultLen, ResultLen, sw);
+}
+
+int CmdHFFidoInfo(const char *cmd) {
+	
+	if (cmd && strlen(cmd) > 0)
+		PrintAndLog("WARNING: command don't have any parameters.\n");
+	
+	// info about 14a part
+	CmdHF14AInfo("");
+
+	// FIDO info
+	PrintAndLog("--------------------------------------------"); 
+	SetAPDULogging(false);
+	
+	uint8_t buf[APDU_RES_LEN] = {0};
+	size_t len = 0;
+	uint16_t sw = 0;
+	int res = FIDOSelect(true, true, buf, sizeof(buf), &len, &sw);
+
+	if (res) {
+		DropField();
+		return res;
+	}
+	
+	if (sw != 0x9000) {
+		if (sw)
+			PrintAndLog("Not a FIDO card! APDU response: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
+		else
+			PrintAndLog("APDU exchange error. Card returns 0x0000."); 
+		
+		DropField();
+		return 0;
+	}
+	
+	if (!strncmp((char *)buf, "U2F_V2", 7)) {
+		if (!strncmp((char *)buf, "FIDO_2_0", 8)) {
+			PrintAndLog("FIDO2 authenricator detected. Version: %.*s", len, buf); 
+		} else {
+			PrintAndLog("FIDO authenricator detected (not standard U2F)."); 
+			PrintAndLog("Non U2F authenticator version:"); 
+			dump_buffer((const unsigned char *)buf, len, NULL, 0);
+		}
+	} else {
+		PrintAndLog("FIDO U2F authenricator detected. Version: %.*s", len, buf); 
+	}
+
+	res = FIDO2GetInfo(buf, sizeof(buf), &len, &sw);
+	DropField();
+	if (res) {
+		return res;
+	}
+	if (sw != 0x9000) {
+		PrintAndLog("FIDO2 version not exists (%04x - %s).", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
+		
+		return 0;
+	}
+
+	PrintAndLog("FIDO2 version: (%d)", len); 
+	dump_buffer((const unsigned char *)buf, len, NULL, 0);
+	
+	return 0;
+}
+
+json_t *OpenJson(int paramnum, char *fname, void* argtable[], bool *err) {	
+	json_t *root = NULL;
+	json_error_t error;
+	*err = false;
+
+	uint8_t jsonname[250] ={0};
+	char *cjsonname = (char *)jsonname;
+	int jsonnamelen = 0;
+	
+	// CLIGetStrWithReturn(paramnum, jsonname, &jsonnamelen);
+	if (CLIParamStrToBuf(arg_get_str(paramnum), jsonname, sizeof(jsonname), &jsonnamelen))  {
+		CLIParserFree();
+		return NULL;
+	}
+	
+	// current path + file name
+	if (!strstr(cjsonname, ".json"))
+		strcat(cjsonname, ".json");
+	
+	if (jsonnamelen) {
+		strcpy(fname, get_my_executable_directory());
+		strcat(fname, cjsonname);
+		if (access(fname, F_OK) != -1) {
+			root = json_load_file(fname, 0, &error);
+			if (!root) {
+				PrintAndLog("ERROR: json error on line %d: %s", error.line, error.text);
+				*err = true;
+				return NULL; 
+			}
+			
+			if (!json_is_object(root)) {
+				PrintAndLog("ERROR: Invalid json format. root must be an object.");
+				json_decref(root);
+				*err = true;
+				return NULL; 
+			}
+			
+		} else {
+			root = json_object();
+		}
+	}
+	return root;
+}
+
+int CmdHFFidoRegister(const char *cmd) {
+	uint8_t data[64] = {0};
+	int chlen = 0;
+	uint8_t cdata[250] = {0};
+	int applen = 0;
+	uint8_t adata[250] = {0};
+	json_t *root = NULL;
+	
+	CLIParserInit("hf fido reg", 
+		"Initiate a U2F token registration. Needs two 32-byte hash number. \nchallenge parameter (32b) and application parameter (32b).", 
+		"Usage:\n\thf fido reg -> execute command with 2 parameters, filled 0x00\n"
+			"\thf fido reg 000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f 000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f -> execute command with parameters"
+			"\thf fido reg -p s0 s1 -> execute command with plain parameters");
+
+	void* argtable[] = {
+		arg_param_begin,
+		arg_lit0("aA",  "apdu",     "show APDU reqests and responses"),
+		arg_lit0("vV",  "verbose",  "show technical data"),
+		arg_lit0("pP",  "plain",    "send plain ASCII to challenge and application parameters instead of HEX"),
+		arg_str0("jJ",  "json",		"fido.json", "JSON input / output file name for parameters."),
+		arg_str0(NULL,  NULL,       "<HEX/ASCII challenge parameter (32b HEX/1..16 chars)>", NULL),
+		arg_str0(NULL,  NULL,       "<HEX/ASCII application parameter (32b HEX/1..16 chars)>", NULL),
+		arg_param_end
+	};
+	CLIExecWithReturn(cmd, argtable, true);
+	
+	bool APDULogging = arg_get_lit(1);
+	bool verbose = arg_get_lit(2);
+	bool paramsPlain = arg_get_lit(3);
+
+	char fname[250] = {0};
+	bool err;
+	root = OpenJson(4, fname, argtable, &err);
+	if(err)
+		return 1;
+	if (root) {	
+		size_t jlen;
+		JsonLoadBufAsHex(root, "$.ChallengeParam", data, 32, &jlen);
+		JsonLoadBufAsHex(root, "$.ApplicationParam", &data[32], 32, &jlen);
+	}
+	
+	if (paramsPlain) {
+		memset(cdata, 0x00, 32);
+		CLIGetStrWithReturn(5, cdata, &chlen);
+		if (chlen && chlen > 16) {
+			PrintAndLog("ERROR: challenge parameter length in ASCII mode must be less than 16 chars instead of: %d", chlen);
+			return 1;
+		}
+	} else {
+		CLIGetHexWithReturn(5, cdata, &chlen);
+		if (chlen && chlen != 32) {
+			PrintAndLog("ERROR: challenge parameter length must be 32 bytes only.");
+			return 1;
+		}
+	}
+	if (chlen)
+		memmove(data, cdata, 32);
+	
+	
+	if (paramsPlain) {
+		memset(adata, 0x00, 32);
+		CLIGetStrWithReturn(6, adata, &applen);
+		if (applen && applen > 16) {
+			PrintAndLog("ERROR: application parameter length in ASCII mode must be less than 16 chars instead of: %d", applen);
+			return 1;
+		}
+	} else {
+		CLIGetHexWithReturn(6, adata, &applen);
+		if (applen && applen != 32) {
+			PrintAndLog("ERROR: application parameter length must be 32 bytes only.");
+			return 1;
+		}
+	}
+	if (applen)
+		memmove(&data[32], adata, 32);
+	
+	CLIParserFree();	
+	
+	SetAPDULogging(APDULogging);
+
+	// challenge parameter [32 bytes] - The challenge parameter is the SHA-256 hash of the Client Data, a stringified JSON data structure that the FIDO Client prepares
+	// application parameter [32 bytes] - The application parameter is the SHA-256 hash of the UTF-8 encoding of the application identity
+	
+	uint8_t buf[2048] = {0};
+	size_t len = 0;
+	uint16_t sw = 0;
+
+	DropField();
+	int res = FIDOSelect(true, true, buf, sizeof(buf), &len, &sw);
+
+	if (res) {
+		PrintAndLog("Can't select authenticator. res=%x. Exit...", res);
+		DropField();
+		return res;
+	}
+	
+	if (sw != 0x9000) {
+		PrintAndLog("Can't select FIDO application. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
+		DropField();
+		return 2;
+	}
+
+	res = FIDORegister(data, buf,  sizeof(buf), &len, &sw);
+	DropField();
+	if (res) {
+		PrintAndLog("Can't execute register command. res=%x. Exit...", res);
+		return res;
+	}
+	
+	if (sw != 0x9000) {
+		PrintAndLog("ERROR execute register command. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
+		return 3;
+	}
+	
+	PrintAndLog("");
+	if (APDULogging)
+		PrintAndLog("---------------------------------------------------------------");
+	PrintAndLog("data len: %d", len);
+	if (verbose) {
+		PrintAndLog("--------------data----------------------");
+		dump_buffer((const unsigned char *)buf, len, NULL, 0);
+		PrintAndLog("--------------data----------------------");
+	}
+
+	if (buf[0] != 0x05) {
+		PrintAndLog("ERROR: First byte must be 0x05, but it %2x", buf[0]);
+		return 5;
+	}
+	PrintAndLog("User public key: %s", sprint_hex(&buf[1], 65));
+	
+	uint8_t keyHandleLen = buf[66];
+	PrintAndLog("Key handle[%d]: %s", keyHandleLen, sprint_hex(&buf[67], keyHandleLen));
+	
+	int derp = 67 + keyHandleLen;
+	int derLen = (buf[derp + 2] << 8) + buf[derp + 3] + 4;
+	// needs to decode DER certificate
+	if (verbose) {
+		PrintAndLog("DER certificate[%d]:------------------DER-------------------", derLen);
+		dump_buffer_simple((const unsigned char *)&buf[67 + keyHandleLen], derLen, NULL);
+		PrintAndLog("\n----------------DER---------------------");
+	} else {
+		PrintAndLog("DER certificate[%d]: %s...", derLen, sprint_hex(&buf[derp], 20));
+	}
+	
+	
+	int hashp = 1 + 65 + 1 + keyHandleLen + derLen;
+	PrintAndLog("Hash[%d]: %s", len - hashp, sprint_hex(&buf[hashp], len - hashp));
+	
+	// check ANSI X9.62 format ECDSA signature (on P-256)
+	
+	PrintAndLog("\nauth command: ");
+	printf("hf fido auth %s%s", paramsPlain?"-p ":"", sprint_hex_inrow(&buf[67], keyHandleLen));
+	if(chlen || applen)
+		printf(" %s", paramsPlain?(char *)cdata:sprint_hex_inrow(cdata, 32));
+	if(applen)
+		printf(" %s", paramsPlain?(char *)adata:sprint_hex_inrow(adata, 32));
+	printf("\n");
+	
+	if (root) {
+		JsonSaveBufAsHex(root, "ChallengeParam", data, 32);
+		JsonSaveBufAsHex(root, "ApplicationParam", &data[32], 32);
+		JsonSaveInt(root, "KeyHandleLen", keyHandleLen);
+		JsonSaveBufAsHexCompact(root, "KeyHandle", &buf[67], keyHandleLen);
+		JsonSaveBufAsHexCompact(root, "DER", &buf[67 + keyHandleLen], derLen);
+	
+		res = json_dump_file(root, fname, JSON_INDENT(2));
+		if (res) {
+			PrintAndLog("ERROR: can't save the file: %s", fname);
+			return 200;
+		}
+		PrintAndLog("File `%s` saved.", fname);
+		
+		// free json object
+		json_decref(root);
+	}
+	
+	return 0;
+};
+
+int CmdHFFidoAuthenticate(const char *cmd) {
+	uint8_t data[512] = {0};
+	uint8_t hdata[250] = {0};
+	int hdatalen = 0;
+	uint8_t keyHandleLen = 0;
+	json_t *root = NULL;
+	
+	CLIParserInit("hf fido auth", 
+		"Initiate a U2F token authentication. Needs key handle and two 32-byte hash number. \nkey handle(var 0..255), challenge parameter (32b) and application parameter (32b).", 
+		"Usage:\n\thf fido auth 000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f -> execute command with 2 parameters, filled 0x00 and key handle\n"
+			"\thf fido auth 000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f "
+				"000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f 000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f -> execute command with parameters");
+
+	void* argtable[] = {
+		arg_param_begin,
+		arg_lit0("aA",  "apdu",     "show APDU reqests and responses"),
+		arg_lit0("vV",  "verbose",  "show technical data"),
+		arg_lit0("pP",  "plain",    "send plain ASCII to challenge and application parameters instead of HEX"),
+		arg_rem("default mode:",    "dont-enforce-user-presence-and-sign"),
+		arg_lit0("uU",  "user",     "mode: enforce-user-presence-and-sign"),
+		arg_lit0("cC",  "check",    "mode: check-only"),
+		arg_str0("jJ",  "json",		"fido.json", "JSON input / output file name for parameters."),
+		arg_str0(NULL,  NULL,       "<HEX key handle (var 0..255b)>", NULL),
+		arg_str0(NULL,  NULL,       "<HEX/ASCII challenge parameter (32b HEX/1..16 chars)>", NULL),
+		arg_str0(NULL,  NULL,       "<HEX/ASCII application parameter (32b HEX/1..16 chars)>", NULL),
+		arg_param_end
+	};
+	CLIExecWithReturn(cmd, argtable, true);
+	
+	bool APDULogging = arg_get_lit(1);
+	//bool verbose = arg_get_lit(2);
+	bool paramsPlain = arg_get_lit(3);
+	uint8_t controlByte = 0x08;
+	if (arg_get_lit(5))
+		controlByte = 0x03;
+	if (arg_get_lit(6))
+		controlByte = 0x07;
+
+	char fname[250] = {0};
+	bool err;
+	root = OpenJson(7, fname, argtable, &err);
+	if(err)
+		return 1;
+	if (root) {	
+		size_t jlen;
+		JsonLoadBufAsHex(root, "$.ChallengeParam", data, 32, &jlen);
+		JsonLoadBufAsHex(root, "$.ApplicationParam", &data[32], 32, &jlen);
+		JsonLoadBufAsHex(root, "$.KeyHandle", &data[65], 512 - 67, &jlen);
+		keyHandleLen = jlen & 0xff;
+		data[64] = keyHandleLen;
+	} 
+
+	CLIGetHexWithReturn(8, hdata, &hdatalen);
+	if (hdatalen > 255) {
+		PrintAndLog("ERROR: application parameter length must be less than 255.");
+		return 1;
+	}
+	if (hdatalen) {
+		keyHandleLen = hdatalen;
+		data[64] = keyHandleLen;
+		memmove(&data[65], hdata, keyHandleLen);
+	}
+
+	if (paramsPlain) {
+		memset(hdata, 0x00, 32);
+		CLIGetStrWithReturn(9, hdata, &hdatalen);
+		if (hdatalen && hdatalen > 16) {
+			PrintAndLog("ERROR: challenge parameter length in ASCII mode must be less than 16 chars instead of: %d", hdatalen);
+			return 1;
+		}
+	} else {
+		CLIGetHexWithReturn(9, hdata, &hdatalen);
+		if (hdatalen && hdatalen != 32) {
+			PrintAndLog("ERROR: challenge parameter length must be 32 bytes only.");
+			return 1;
+		}
+	}
+	if (hdatalen)
+		memmove(data, hdata, 32);
+
+	if (paramsPlain) {
+		memset(hdata, 0x00, 32);
+		CLIGetStrWithReturn(10, hdata, &hdatalen);
+		if (hdatalen && hdatalen > 16) {
+			PrintAndLog("ERROR: application parameter length in ASCII mode must be less than 16 chars instead of: %d", hdatalen);
+			return 1;
+		}
+	} else {
+		CLIGetHexWithReturn(10, hdata, &hdatalen);
+		if (hdatalen && hdatalen != 32) {
+			PrintAndLog("ERROR: application parameter length must be 32 bytes only.");
+			return 1;
+		}
+	}
+	if (hdatalen)
+		memmove(&data[32], hdata, 32);
+
+	CLIParserFree();	
+	
+	SetAPDULogging(APDULogging);
+
+	// (in parameter) conrtol byte 0x07 - check only, 0x03 - user presense + cign. 0x08 - sign only
+ 	// challenge parameter [32 bytes]
+	// application parameter [32 bytes]
+	// key handle length [1b] = N
+	// key handle [N]
+
+	uint8_t datalen = 32 + 32 + 1 + keyHandleLen;
+	
+	uint8_t buf[2048] = {0};
+	size_t len = 0;
+	uint16_t sw = 0;
+
+	DropField();
+	int res = FIDOSelect(true, true, buf, sizeof(buf), &len, &sw);
+
+	if (res) {
+		PrintAndLog("Can't select authenticator. res=%x. Exit...", res);
+		DropField();
+		return res;
+	}
+	
+	if (sw != 0x9000) {
+		PrintAndLog("Can't select FIDO application. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
+		DropField();
+		return 2;
+	}
+
+	res = FIDOAuthentication(data, datalen, controlByte,  buf,  sizeof(buf), &len, &sw);
+	DropField();
+	if (res) {
+		PrintAndLog("Can't execute authentication command. res=%x. Exit...", res);
+		return res;
+	}
+	
+	if (sw != 0x9000) {
+		PrintAndLog("ERROR execute authentication command. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
+		return 3;
+	}
+	
+	PrintAndLog("---------------------------------------------------------------");
+	PrintAndLog("User presence: %s", (buf[0]?"verified":"not verified"));
+	uint32_t cntr =  (uint32_t)bytes_to_num(&buf[1], 4);
+	PrintAndLog("Counter: %d", cntr);
+	PrintAndLog("Hash[%d]: %s", len - 5, sprint_hex(&buf[5], len - 5));
+
+	if (root) {
+		JsonSaveBufAsHex(root, "ChallengeParam", data, 32);
+		JsonSaveBufAsHex(root, "ApplicationParam", &data[32], 32);
+		JsonSaveInt(root, "KeyHandleLen", keyHandleLen);
+		JsonSaveBufAsHexCompact(root, "KeyHandle", &data[65], keyHandleLen);
+		JsonSaveInt(root, "Counter", cntr);
+	
+		res = json_dump_file(root, fname, JSON_INDENT(2));
+		if (res) {
+			PrintAndLog("ERROR: can't save the file: %s", fname);
+			return 200;
+		}
+		PrintAndLog("File `%s` saved.", fname);
+		
+		// free json object
+		json_decref(root);
+	}
+	return 0;
+};
+
+static command_t CommandTable[] =
+{
+  {"help",             CmdHelp,					1, "This help."},
+  {"info",  	       CmdHFFidoInfo,			0, "Info about FIDO tag."},
+  {"reg",  	  	 	   CmdHFFidoRegister,		0, "FIDO U2F Registration Message."},
+  {"auth",  	       CmdHFFidoAuthenticate,	0, "FIDO U2F Authentication Message."},
+  {NULL,               NULL,					0, NULL}
+};
+
+int CmdHFFido(const char *Cmd) {
+	(void)WaitForResponseTimeout(CMD_ACK,NULL,100);
+	CmdsParse(CommandTable, Cmd);
+	return 0;
+}
+
+int CmdHelp(const char *Cmd) {
+  CmdsHelp(CommandTable);
+  return 0;
+}
diff --git a/client/cmdhffido.h b/client/cmdhffido.h
new file mode 100644
index 000000000..2460a170f
--- /dev/null
+++ b/client/cmdhffido.h
@@ -0,0 +1,27 @@
+//-----------------------------------------------------------------------------
+// Copyright (C) 2018 Merlok
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// High frequency FIDO U2F and FIDO2 contactless authenticators
+//-----------------------------------------------------------------------------
+//
+//  Documentation here:
+//
+// FIDO Alliance specifications
+// https://fidoalliance.org/download/
+// FIDO NFC Protocol Specification v1.0
+// https://fidoalliance.org/specs/fido-u2f-v1.2-ps-20170411/fido-u2f-nfc-protocol-v1.2-ps-20170411.html
+// FIDO U2F Raw Message Formats
+// https://fidoalliance.org/specs/fido-u2f-v1.2-ps-20170411/fido-u2f-raw-message-formats-v1.2-ps-20170411.html
+//-----------------------------------------------------------------------------
+
+#ifndef CMDHFFIDO_H__
+#define CMDHFFIDO_H__
+
+extern int CmdHFFido(const char *Cmd);
+
+
+#endif
\ No newline at end of file
diff --git a/client/emv/emvcore.h b/client/emv/emvcore.h
index 94be4fcf3..1e39f696c 100644
--- a/client/emv/emvcore.h
+++ b/client/emv/emvcore.h
@@ -68,6 +68,9 @@ extern struct tlvdb *GetdCVVRawFromTrack2(const struct tlv *track2);
 
 extern void SetAPDULogging(bool logging);
 
+// exchange
+extern int EMVExchange(bool LeaveFieldON, sAPDU apdu, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv);
+
 // search application
 extern int EMVSearchPSE(bool ActivateField, bool LeaveFieldON, bool decodeTLV, struct tlvdb *tlv);
 extern int EMVSearch(bool ActivateField, bool LeaveFieldON, bool decodeTLV, struct tlvdb *tlv);
diff --git a/client/emv/emvjson.c b/client/emv/emvjson.c
new file mode 100644
index 000000000..e56ecbb71
--- /dev/null
+++ b/client/emv/emvjson.c
@@ -0,0 +1,385 @@
+//-----------------------------------------------------------------------------
+// Copyright (C) 2018 Merlok
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// EMV json logic
+//-----------------------------------------------------------------------------
+
+#include "emvjson.h"
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <inttypes.h>
+#include <string.h>
+#include "util.h"
+#include "ui.h"
+#include "proxmark3.h"
+#include "emv_tags.h"
+
+static const ApplicationDataElm ApplicationData[] = {
+{0x82,    "AIP"},
+{0x94,    "AFL"},
+
+{0x5A,    "PAN"},
+{0x5F34,  "PANSeqNo"},
+{0x5F24,  "ExpirationDate"},
+{0x5F25,  "EffectiveDate"},
+{0x5F28,  "IssuerCountryCode"},
+
+{0x50,    "ApplicationLabel"},
+{0x9F08,  "VersionNumber"},
+{0x9F42,  "CurrencyCode"},
+{0x5F2D,  "LanguagePreference"},
+{0x87,    "PriorityIndicator"},
+{0x9F36,  "ATC"}, //Application Transaction Counter
+
+{0x5F20,  "CardholderName"},
+
+{0x9F38,  "PDOL"},
+{0x8C,    "CDOL1"},
+{0x8D,    "CDOL2"},
+
+{0x9F07,  "AUC"},   // Application Usage Control
+{0x9F6C,  "CTQ"},
+{0x8E,    "CVMList"},
+{0x9F0D,  "IACDefault"},
+{0x9F0E,  "IACDeny"},
+{0x9F0F,  "IACOnline"},
+
+{0x8F,    "CertificationAuthorityPublicKeyIndex"},
+{0x9F32,  "IssuerPublicKeyExponent"},
+{0x92,    "IssuerPublicKeyRemainder"},
+{0x90,    "IssuerPublicKeyCertificate"},
+{0x9F47,  "ICCPublicKeyExponent"},
+{0x9F46,  "ICCPublicKeyCertificate"},
+
+{0x00,    "end..."}
+};
+int ApplicationDataLen = sizeof(ApplicationData) / sizeof(ApplicationDataElm);
+
+char* GetApplicationDataName(tlv_tag_t tag) {
+	for (int i = 0; i < ApplicationDataLen; i++)
+		if (ApplicationData[i].Tag == tag)
+			return ApplicationData[i].Name;
+		
+	return NULL;
+}
+
+int JsonSaveJsonObject(json_t *root, char *path, json_t *value) {
+	json_error_t error;
+
+	if (strlen(path) < 1)
+		return 1;
+	
+	if (path[0] == '$') {
+		if (json_path_set(root, path, value, 0, &error)) {
+			PrintAndLog("ERROR: can't set json path: ", error.text);
+			return 2;
+		} else {
+			return 0;
+		}
+	} else {
+		return json_object_set_new(root, path, value);
+	}
+}
+
+int JsonSaveInt(json_t *root, char *path, int value) {
+	return JsonSaveJsonObject(root, path, json_integer(value));
+}
+
+int JsonSaveStr(json_t *root, char *path, char *value) {
+	return JsonSaveJsonObject(root, path, json_string(value));
+};
+
+int JsonSaveBufAsHexCompact(json_t *elm, char *path, uint8_t *data, size_t datalen) {
+	char * msg = sprint_hex_inrow(data, datalen);
+	if (msg && strlen(msg) && msg[strlen(msg) - 1] == ' ')
+		msg[strlen(msg) - 1] = '\0';
+
+	return JsonSaveStr(elm, path, msg);
+}
+
+int JsonSaveBufAsHex(json_t *elm, char *path, uint8_t *data, size_t datalen) {
+	char * msg = sprint_hex(data, datalen);
+	if (msg && strlen(msg) && msg[strlen(msg) - 1] == ' ')
+		msg[strlen(msg) - 1] = '\0';
+
+	return JsonSaveStr(elm, path, msg);
+}
+
+int JsonSaveHex(json_t *elm, char *path, uint64_t data, int datalen) {
+	uint8_t bdata[8] = {0};
+	int len = 0;
+	if (!datalen) {
+		for (uint64_t u = 0xffffffffffffffff; u; u = u << 8) {
+			if (!(data & u)) {
+				break;
+			}
+			len++;
+		}
+		if (!len)
+			len = 1;
+	} else {
+		len = datalen;
+	}	
+	num_to_bytes(data, len, bdata);
+	
+	return JsonSaveBufAsHex(elm, path, bdata, len);
+}
+
+int JsonSaveTLVValue(json_t *root, char *path, struct tlvdb *tlvdbelm) {
+	const struct tlv *tlvelm = tlvdb_get_tlv(tlvdbelm);
+	if (tlvelm)
+		return JsonSaveBufAsHex(root, path, (uint8_t *)tlvelm->value, tlvelm->len);
+	else
+		return 1;	
+}
+
+int JsonSaveTLVElm(json_t *elm, char *path, struct tlv *tlvelm, bool saveName, bool saveValue, bool saveAppDataLink) {
+	json_error_t error;
+
+	if (strlen(path) < 1 || !tlvelm)
+		return 1;
+	
+	if (path[0] == '$') {
+
+		json_t *obj = json_path_get(elm, path);
+		if (!obj) {
+			obj = json_object();
+		
+			if (json_is_array(elm)) {
+				if (json_array_append_new(elm, obj)) {
+					PrintAndLog("ERROR: can't append array: %s", path);
+					return 2;
+				}
+			} else {
+				if (json_path_set(elm, path, obj, 0, &error)) {
+					PrintAndLog("ERROR: can't set json path: ", error.text);
+					return 2;
+				}
+			}
+		}
+		
+		if (saveAppDataLink) {
+			char * AppDataName = GetApplicationDataName(tlvelm->tag);
+			if (AppDataName)
+				JsonSaveStr(obj, "appdata", AppDataName);
+		} else {		
+			char * name = emv_get_tag_name(tlvelm);
+			if (saveName && name && strlen(name) > 0 && strncmp(name, "Unknown", 7))
+				JsonSaveStr(obj, "name", emv_get_tag_name(tlvelm));
+			JsonSaveHex(obj, "tag", tlvelm->tag, 0);
+			if (saveValue) {
+				JsonSaveHex(obj, "length", tlvelm->len, 0);
+				JsonSaveBufAsHex(obj, "value", (uint8_t *)tlvelm->value, tlvelm->len);
+			};
+		}
+	}
+
+	return 0;
+}
+
+int JsonSaveTLVTreeElm(json_t *elm, char *path, struct tlvdb *tlvdbelm, bool saveName, bool saveValue, bool saveAppDataLink) {
+	return JsonSaveTLVElm(elm, path, (struct tlv *)tlvdb_get_tlv(tlvdbelm), saveName, saveValue, saveAppDataLink);
+}
+
+int JsonSaveTLVTree(json_t *root, json_t *elm, char *path, struct tlvdb *tlvdbelm) {
+	struct tlvdb *tlvp = tlvdbelm;
+	while (tlvp) {
+		const struct tlv * tlvpelm = tlvdb_get_tlv(tlvp);
+		char * AppDataName = NULL;
+		if (tlvpelm)
+			AppDataName = GetApplicationDataName(tlvpelm->tag);
+		
+		if (AppDataName) {
+			char appdatalink[200] = {0};
+			sprintf(appdatalink, "$.ApplicationData.%s", AppDataName);
+			JsonSaveBufAsHex(root, appdatalink, (uint8_t *)tlvpelm->value, tlvpelm->len);
+		}
+		
+		json_t *pelm = json_path_get(elm, path);
+		if (pelm && json_is_array(pelm)) {
+			json_t *appendelm = json_object();
+			json_array_append_new(pelm, appendelm);
+			JsonSaveTLVTreeElm(appendelm, "$", tlvp, !AppDataName, !tlvdb_elm_get_children(tlvp), AppDataName);
+			pelm = appendelm;
+		} else {
+			JsonSaveTLVTreeElm(elm, path, tlvp, !AppDataName, !tlvdb_elm_get_children(tlvp), AppDataName);
+			pelm = json_path_get(elm, path);
+		}
+		
+		if (tlvdb_elm_get_children(tlvp)) {
+			// get path element
+			if(!pelm)
+				return 1;
+			
+			// check childs element and add it if not found
+			json_t *chjson = json_path_get(pelm, "$.Childs");
+			if (!chjson) {
+				json_object_set_new(pelm, "Childs", json_array());
+				
+				chjson = json_path_get(pelm, "$.Childs");
+			}
+			
+			// check
+			if (!json_is_array(chjson)) {
+				PrintAndLog("E->Internal logic error. `$.Childs` is not an array.");
+				break;
+			}
+
+			// Recursion
+			JsonSaveTLVTree(root, chjson, "$", tlvdb_elm_get_children(tlvp));
+		}
+
+		tlvp = tlvdb_elm_get_next(tlvp);
+	}
+	return 0;
+}
+
+bool HexToBuffer(const char *errormsg, const char *hexvalue, uint8_t * buffer, size_t maxbufferlen, size_t *bufferlen) {
+	int buflen = 0;	
+	
+	switch(param_gethex_to_eol(hexvalue, 0, buffer, maxbufferlen, &buflen)) {
+	case 1:
+		PrintAndLog("%s Invalid HEX value.", errormsg);
+		return false;
+	case 2:
+		PrintAndLog("%s Hex value too large.", errormsg);
+		return false;
+	case 3:
+		PrintAndLog("%s Hex value must have even number of digits.", errormsg);
+		return false;
+	}
+	
+	if (buflen > maxbufferlen) {
+		PrintAndLog("%s HEX length (%d) more than %d", errormsg, *bufferlen, maxbufferlen);
+		return false;
+	}
+	
+	*bufferlen = buflen;
+	
+	return true;
+}
+
+int JsonLoadBufAsHex(json_t *elm, char *path, uint8_t *data, size_t maxbufferlen, size_t *datalen) {
+	if (datalen)
+		*datalen = 0;
+	
+	json_t *jelm = json_path_get((const json_t *)elm, path);
+	if (!jelm || !json_is_string(jelm))
+		return 1;
+	
+	if (!HexToBuffer("ERROR load", json_string_value(jelm), data, maxbufferlen, datalen))
+		return 2;
+	
+	return 0;
+};
+
+bool ParamLoadFromJson(struct tlvdb *tlv) {
+	json_t *root;
+	json_error_t error;
+
+	if (!tlv) {
+		PrintAndLog("ERROR load params: tlv tree is NULL.");
+		return false; 
+	}
+
+	// current path + file name
+	const char *relfname = "emv/defparams.json"; 
+	char fname[strlen(get_my_executable_directory()) + strlen(relfname) + 1];
+	strcpy(fname, get_my_executable_directory());
+	strcat(fname, relfname);
+
+	root = json_load_file(fname, 0, &error);
+	if (!root) {
+		PrintAndLog("Load params: json error on line %d: %s", error.line, error.text);
+		return false; 
+	}
+	
+	if (!json_is_array(root)) {
+		PrintAndLog("Load params: Invalid json format. root must be array.");
+		return false; 
+	}
+	
+	PrintAndLog("Load params: json(%d) OK", json_array_size(root));
+	
+	for(int i = 0; i < json_array_size(root); i++) {
+		json_t *data, *jtag, *jlength, *jvalue;
+
+		data = json_array_get(root, i);
+		if(!json_is_object(data))
+		{
+			PrintAndLog("Load params: data [%d] is not an object", i + 1);
+			json_decref(root);
+			return false;
+		}
+		
+		jtag = json_object_get(data, "tag");
+		if(!json_is_string(jtag))
+		{
+			PrintAndLog("Load params: data [%d] tag is not a string", i + 1);
+			json_decref(root);
+			return false;
+		}
+		const char *tlvTag = json_string_value(jtag);
+
+		jvalue = json_object_get(data, "value");
+		if(!json_is_string(jvalue))
+		{
+			PrintAndLog("Load params: data [%d] value is not a string", i + 1);
+			json_decref(root);
+			return false;
+		}
+		const char *tlvValue = json_string_value(jvalue);
+
+		jlength = json_object_get(data, "length");
+		if(!json_is_number(jlength))
+		{
+			PrintAndLog("Load params: data [%d] length is not a number", i + 1);
+			json_decref(root);
+			return false;
+		}
+		
+		int tlvLength = json_integer_value(jlength);
+		if (tlvLength > 250) {
+			PrintAndLog("Load params: data [%d] length more than 250", i + 1);
+			json_decref(root);
+			return false;
+		}
+		
+		PrintAndLog("TLV param: %s[%d]=%s", tlvTag, tlvLength, tlvValue);
+		uint8_t buf[251] = {0};
+		size_t buflen = 0;
+		
+		// here max length must be 4, but now tlv_tag_t is 2-byte var. so let it be 2 by now...  TODO: needs refactoring tlv_tag_t...
+		if (!HexToBuffer("TLV Error type:", tlvTag, buf, 2, &buflen)) { 
+			json_decref(root);
+			return false;
+		}
+		tlv_tag_t tag = 0;
+		for (int i = 0; i < buflen; i++) {
+			tag = (tag << 8) + buf[i];
+		}	
+		
+		if (!HexToBuffer("TLV Error value:", tlvValue, buf, sizeof(buf) - 1, &buflen)) {
+			json_decref(root);
+			return false;
+		}
+		
+		if (buflen != tlvLength) {
+			PrintAndLog("Load params: data [%d] length of HEX must(%d) be identical to length in TLV param(%d)", i + 1, buflen, tlvLength);
+			json_decref(root);
+			return false;
+		}
+		
+		tlvdb_change_or_add_node(tlv, tag, tlvLength, (const unsigned char *)buf);		
+	}
+
+	json_decref(root);
+
+	return true;
+}
+
diff --git a/client/emv/emvjson.h b/client/emv/emvjson.h
new file mode 100644
index 000000000..9c6eda5ea
--- /dev/null
+++ b/client/emv/emvjson.h
@@ -0,0 +1,40 @@
+//-----------------------------------------------------------------------------
+// Copyright (C) 2018 Merlok
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// EMV json logic
+//-----------------------------------------------------------------------------
+#ifndef EMVJSON_H__
+#define EMVJSON_H__
+
+#include <jansson.h>
+#include "tlv.h"
+
+typedef struct {
+	tlv_tag_t Tag;
+	char *Name;
+} ApplicationDataElm;
+
+extern char* GetApplicationDataName(tlv_tag_t tag);
+
+extern int JsonSaveJsonObject(json_t *root, char *path, json_t *value);
+extern int JsonSaveStr(json_t *root, char *path, char *value);
+extern int JsonSaveInt(json_t *root, char *path, int value);
+extern int JsonSaveBufAsHexCompact(json_t *elm, char *path, uint8_t *data, size_t datalen);
+extern int JsonSaveBufAsHex(json_t *elm, char *path, uint8_t *data, size_t datalen);
+extern int JsonSaveHex(json_t *elm, char *path, uint64_t data, int datalen);
+
+extern int JsonSaveTLVValue(json_t *root, char *path, struct tlvdb *tlvdbelm);
+extern int JsonSaveTLVElm(json_t *elm, char *path, struct tlv *tlvelm, bool saveName, bool saveValue, bool saveAppDataLink);
+extern int JsonSaveTLVTreeElm(json_t *elm, char *path, struct tlvdb *tlvdbelm, bool saveName, bool saveValue, bool saveAppDataLink);
+
+extern int JsonSaveTLVTree(json_t *root, json_t *elm, char *path, struct tlvdb *tlvdbelm);
+
+extern int JsonLoadBufAsHex(json_t *elm, char *path, uint8_t *data, size_t maxbufferlen, size_t *datalen);
+
+extern bool ParamLoadFromJson(struct tlvdb *tlv);
+
+#endif
\ No newline at end of file
diff --git a/client/util.c b/client/util.c
index 6ed6201fa..3e6c7cdc6 100644
--- a/client/util.c
+++ b/client/util.c
@@ -9,6 +9,7 @@
 //-----------------------------------------------------------------------------
 #include "util.h"
 
+#define UTIL_BUFFER_SIZE_SPRINT 4097
 // global client debug variable
 uint8_t g_debugMode = 0;
 
@@ -170,13 +171,13 @@ void print_hex_break(const uint8_t *data, const size_t len, uint8_t breaks) {
 }
 
 char *sprint_hex(const uint8_t *data, const size_t len) {
-	static char buf[1025] = {0};
+	static char buf[UTIL_BUFFER_SIZE_SPRINT] = {0};
 	hex_to_buffer((uint8_t *)buf, data, len, sizeof(buf) - 1, 0, 1, true);
 	return buf;
 }
 
 char *sprint_hex_inrow_ex(const uint8_t *data, const size_t len, const size_t min_str_len) {
-	static char buf[1025] = {0};
+	static char buf[UTIL_BUFFER_SIZE_SPRINT] = {0};
 	hex_to_buffer((uint8_t *)buf, data, len, sizeof(buf) - 1, min_str_len, 0, true);
 	return buf;
 }
@@ -185,13 +186,11 @@ char *sprint_hex_inrow(const uint8_t *data, const size_t len) {
 	return sprint_hex_inrow_ex(data, len, 0);
 }
 char *sprint_hex_inrow_spaces(const uint8_t *data, const size_t len, size_t spaces_between) {
-	static char buf[1025] = {0};
+	static char buf[UTIL_BUFFER_SIZE_SPRINT] = {0};
 	hex_to_buffer((uint8_t *)buf, data, len, sizeof(buf) - 1, 0, spaces_between, true);
 	return buf;
 }
 
-
-
 char *sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t breaks) {
 	
 	// make sure we don't go beyond our char array memory
@@ -268,9 +267,9 @@ char *sprint_bin(const uint8_t *data, const size_t len) {
 }
 
 char *sprint_hex_ascii(const uint8_t *data, const size_t len) {
-	static char buf[1024];
+	static char buf[UTIL_BUFFER_SIZE_SPRINT];
 	char *tmp = buf;
-	memset(buf, 0x00, 1024);
+	memset(buf, 0x00, UTIL_BUFFER_SIZE_SPRINT);
 	size_t max_len = (len > 1010) ? 1010 : len;
 
 	sprintf(tmp, "%s| ", sprint_hex(data, max_len) );
@@ -288,9 +287,9 @@ char *sprint_hex_ascii(const uint8_t *data, const size_t len) {
 }
 
 char *sprint_ascii_ex(const uint8_t *data, const size_t len, const size_t min_str_len) {
-	static char buf[1024];
+	static char buf[UTIL_BUFFER_SIZE_SPRINT];
 	char *tmp = buf;
-	memset(buf, 0x00, 1024);
+	memset(buf, 0x00, UTIL_BUFFER_SIZE_SPRINT);
 	size_t max_len = (len > 1010) ? 1010 : len;
 	size_t i = 0;
 	while(i < max_len){

From f03261be9a8401a1b45fd287ddc4450cfcdc1fb3 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Thu, 8 Nov 2018 19:14:30 +0200
Subject: [PATCH 0141/1938] compiled. not linking....

---
 client/Makefile                  |   7 +-
 client/emv/emvjson.h             |   1 +
 client/jansson/hashtable.h       | 176 +++++++++++++++++++++++++++
 client/jansson/jansson_private.h | 112 +++++++++++++++++
 client/jansson/path.c            | 202 +++++++++++++++++++++++++++++++
 client/jansson/path.h            |  17 +++
 client/jansson/strbuffer.h       |  34 ++++++
 client/obj/jansson/.dummy        |   0
 8 files changed, 546 insertions(+), 3 deletions(-)
 create mode 100644 client/jansson/hashtable.h
 create mode 100644 client/jansson/jansson_private.h
 create mode 100644 client/jansson/path.c
 create mode 100644 client/jansson/path.h
 create mode 100644 client/jansson/strbuffer.h
 create mode 100644 client/obj/jansson/.dummy

diff --git a/client/Makefile b/client/Makefile
index 1e6ad4426..5f139bf4e 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -23,10 +23,10 @@ ENV_CFLAGS := $(CFLAGS)
 VPATH = ../common ../zlib ../uart
 OBJDIR = obj
 
-LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm -ljansson
+LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm -L/usr/include
 LUALIB = ../liblua/liblua.a
 LDFLAGS = $(ENV_LDFLAGS)
-INCLUDES_CLIENT = -I. -I../include -I../common -I../common/polarssl -I../zlib -I../uart -I/opt/local/include -I../liblua
+INCLUDES_CLIENT = -I/usr/include -I. -I../include -I../common -I../common/polarssl -I../zlib -I../uart -I/opt/local/include -I../liblua
 CFLAGS = $(ENV_CFLAGS) -std=c99 -D_ISOC99_SOURCE -DPRESETS $(INCLUDES_CLIENT) -Wall -g -O3
 CXXFLAGS = -I../include -Wall -O3
 
@@ -103,6 +103,7 @@ CMDSRCS =	crapto1/crapto1.c \
 			crapto1/crypto1.c \
 			mfkey.c \
 			tea.c \
+			jansson/path.c \
 			polarssl/des.c \
 			polarssl/aes.c \
 			polarssl/aes_cmac128.c \
@@ -134,7 +135,6 @@ CMDSRCS =	crapto1/crapto1.c \
 			lfdemod.c \
 			emv/crypto_polarssl.c\
 			emv/crypto.c\
-			emv/emvjson.c\
 			emv/emv_pk.c\
 			emv/emv_pki.c\
 			emv/emv_pki_priv.c\
@@ -144,6 +144,7 @@ CMDSRCS =	crapto1/crapto1.c \
 			emv/tlv.c \
 			emv/emv_tags.c \
 			emv/dol.c \
+			emv/emvjson.c\
 			emv/emvcore.c \
 			emv/test/crypto_test.c\
 			emv/test/sda_test.c\
diff --git a/client/emv/emvjson.h b/client/emv/emvjson.h
index 9c6eda5ea..32b2484d2 100644
--- a/client/emv/emvjson.h
+++ b/client/emv/emvjson.h
@@ -12,6 +12,7 @@
 
 #include <jansson.h>
 #include "tlv.h"
+#include "jansson/path.h"
 
 typedef struct {
 	tlv_tag_t Tag;
diff --git a/client/jansson/hashtable.h b/client/jansson/hashtable.h
new file mode 100644
index 000000000..d4c32ae0e
--- /dev/null
+++ b/client/jansson/hashtable.h
@@ -0,0 +1,176 @@
+/*
+ * Copyright (c) 2009-2016 Petri Lehtinen <petri@digip.org>
+ *
+ * This library is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#ifndef HASHTABLE_H
+#define HASHTABLE_H
+
+#include <stdlib.h>
+#include "jansson.h"
+
+struct hashtable_list {
+    struct hashtable_list *prev;
+    struct hashtable_list *next;
+};
+
+/* "pair" may be a bit confusing a name, but think of it as a
+   key-value pair. In this case, it just encodes some extra data,
+   too */
+struct hashtable_pair {
+    struct hashtable_list list;
+    struct hashtable_list ordered_list;
+    size_t hash;
+    json_t *value;
+    char key[1];
+};
+
+struct hashtable_bucket {
+    struct hashtable_list *first;
+    struct hashtable_list *last;
+};
+
+typedef struct hashtable {
+    size_t size;
+    struct hashtable_bucket *buckets;
+    size_t order;  /* hashtable has pow(2, order) buckets */
+    struct hashtable_list list;
+    struct hashtable_list ordered_list;
+} hashtable_t;
+
+
+#define hashtable_key_to_iter(key_) \
+    (&(container_of(key_, struct hashtable_pair, key)->ordered_list))
+
+
+/**
+ * hashtable_init - Initialize a hashtable object
+ *
+ * @hashtable: The (statically allocated) hashtable object
+ *
+ * Initializes a statically allocated hashtable object. The object
+ * should be cleared with hashtable_close when it's no longer used.
+ *
+ * Returns 0 on success, -1 on error (out of memory).
+ */
+int hashtable_init(hashtable_t *hashtable);
+
+/**
+ * hashtable_close - Release all resources used by a hashtable object
+ *
+ * @hashtable: The hashtable
+ *
+ * Destroys a statically allocated hashtable object.
+ */
+void hashtable_close(hashtable_t *hashtable);
+
+/**
+ * hashtable_set - Add/modify value in hashtable
+ *
+ * @hashtable: The hashtable object
+ * @key: The key
+ * @serial: For addition order of keys
+ * @value: The value
+ *
+ * If a value with the given key already exists, its value is replaced
+ * with the new value. Value is "stealed" in the sense that hashtable
+ * doesn't increment its refcount but decreases the refcount when the
+ * value is no longer needed.
+ *
+ * Returns 0 on success, -1 on failure (out of memory).
+ */
+int hashtable_set(hashtable_t *hashtable, const char *key, json_t *value);
+
+/**
+ * hashtable_get - Get a value associated with a key
+ *
+ * @hashtable: The hashtable object
+ * @key: The key
+ *
+ * Returns value if it is found, or NULL otherwise.
+ */
+void *hashtable_get(hashtable_t *hashtable, const char *key);
+
+/**
+ * hashtable_del - Remove a value from the hashtable
+ *
+ * @hashtable: The hashtable object
+ * @key: The key
+ *
+ * Returns 0 on success, or -1 if the key was not found.
+ */
+int hashtable_del(hashtable_t *hashtable, const char *key);
+
+/**
+ * hashtable_clear - Clear hashtable
+ *
+ * @hashtable: The hashtable object
+ *
+ * Removes all items from the hashtable.
+ */
+void hashtable_clear(hashtable_t *hashtable);
+
+/**
+ * hashtable_iter - Iterate over hashtable
+ *
+ * @hashtable: The hashtable object
+ *
+ * Returns an opaque iterator to the first element in the hashtable.
+ * The iterator should be passed to hashtable_iter_* functions.
+ * The hashtable items are not iterated over in any particular order.
+ *
+ * There's no need to free the iterator in any way. The iterator is
+ * valid as long as the item that is referenced by the iterator is not
+ * deleted. Other values may be added or deleted. In particular,
+ * hashtable_iter_next() may be called on an iterator, and after that
+ * the key/value pair pointed by the old iterator may be deleted.
+ */
+void *hashtable_iter(hashtable_t *hashtable);
+
+/**
+ * hashtable_iter_at - Return an iterator at a specific key
+ *
+ * @hashtable: The hashtable object
+ * @key: The key that the iterator should point to
+ *
+ * Like hashtable_iter() but returns an iterator pointing to a
+ * specific key.
+ */
+void *hashtable_iter_at(hashtable_t *hashtable, const char *key);
+
+/**
+ * hashtable_iter_next - Advance an iterator
+ *
+ * @hashtable: The hashtable object
+ * @iter: The iterator
+ *
+ * Returns a new iterator pointing to the next element in the
+ * hashtable or NULL if the whole hastable has been iterated over.
+ */
+void *hashtable_iter_next(hashtable_t *hashtable, void *iter);
+
+/**
+ * hashtable_iter_key - Retrieve the key pointed by an iterator
+ *
+ * @iter: The iterator
+ */
+void *hashtable_iter_key(void *iter);
+
+/**
+ * hashtable_iter_value - Retrieve the value pointed by an iterator
+ *
+ * @iter: The iterator
+ */
+void *hashtable_iter_value(void *iter);
+
+/**
+ * hashtable_iter_set - Set the value pointed by an iterator
+ *
+ * @iter: The iterator
+ * @value: The value to set
+ */
+void hashtable_iter_set(void *iter, json_t *value);
+
+#endif
diff --git a/client/jansson/jansson_private.h b/client/jansson/jansson_private.h
new file mode 100644
index 000000000..7b0985aa6
--- /dev/null
+++ b/client/jansson/jansson_private.h
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 2009-2016 Petri Lehtinen <petri@digip.org>
+ *
+ * Jansson is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#ifndef JANSSON_PRIVATE_H
+#define JANSSON_PRIVATE_H
+
+#ifdef HAVE_CONFIG_H
+#include <jansson_private_config.h>
+#endif
+
+#include <stddef.h>
+#include "jansson.h"
+#include "hashtable.h"
+#include "strbuffer.h"
+
+#define container_of(ptr_, type_, member_)  \
+    ((type_ *)((char *)ptr_ - offsetof(type_, member_)))
+
+/* On some platforms, max() may already be defined */
+#ifndef max
+#define max(a, b)  ((a) > (b) ? (a) : (b))
+#endif
+
+/* va_copy is a C99 feature. In C89 implementations, it's sometimes
+   available as __va_copy. If not, memcpy() should do the trick. */
+#ifndef va_copy
+#ifdef __va_copy
+#define va_copy __va_copy
+#else
+#define va_copy(a, b)  memcpy(&(a), &(b), sizeof(va_list))
+#endif
+#endif
+
+typedef struct {
+    json_t json;
+    hashtable_t hashtable;
+} json_object_t;
+
+typedef struct {
+    json_t json;
+    size_t size;
+    size_t entries;
+    json_t **table;
+} json_array_t;
+
+typedef struct {
+    json_t json;
+    char *value;
+    size_t length;
+} json_string_t;
+
+typedef struct {
+    json_t json;
+    double value;
+} json_real_t;
+
+typedef struct {
+    json_t json;
+    json_int_t value;
+} json_integer_t;
+
+#define json_to_object(json_)  container_of(json_, json_object_t, json)
+#define json_to_array(json_)   container_of(json_, json_array_t, json)
+#define json_to_string(json_)  container_of(json_, json_string_t, json)
+#define json_to_real(json_)    container_of(json_, json_real_t, json)
+#define json_to_integer(json_) container_of(json_, json_integer_t, json)
+
+/* Create a string by taking ownership of an existing buffer */
+json_t *jsonp_stringn_nocheck_own(const char *value, size_t len);
+
+/* Error message formatting */
+void jsonp_error_init(json_error_t *error, const char *source);
+void jsonp_error_set_source(json_error_t *error, const char *source);
+void jsonp_error_set(json_error_t *error, int line, int column,
+                     size_t position, enum json_error_code code,
+                     const char *msg, ...);
+void jsonp_error_vset(json_error_t *error, int line, int column,
+                      size_t position, enum json_error_code code,
+                      const char *msg, va_list ap);
+
+/* Locale independent string<->double conversions */
+int jsonp_strtod(strbuffer_t *strbuffer, double *out);
+int jsonp_dtostr(char *buffer, size_t size, double value, int prec);
+
+/* Wrappers for custom memory functions */
+void* jsonp_malloc(size_t size);
+void jsonp_free(void *ptr);
+char *jsonp_strndup(const char *str, size_t length);
+char *jsonp_strdup(const char *str);
+char *jsonp_strndup(const char *str, size_t len);
+
+
+/* Windows compatibility */
+#if defined(_WIN32) || defined(WIN32)
+#  if defined(_MSC_VER)  /* MS compiller */
+#    if (_MSC_VER < 1900) && !defined(snprintf)  /* snprintf not defined yet & not introduced */
+#      define snprintf _snprintf
+#    endif
+#    if (_MSC_VER < 1500) && !defined(vsnprintf)  /* vsnprintf not defined yet & not introduced */
+#      define vsnprintf(b,c,f,a) _vsnprintf(b,c,f,a)
+#    endif
+#  else  /* Other Windows compiller, old definition */
+#    define snprintf _snprintf
+#    define vsnprintf _vsnprintf
+#  endif
+#endif
+
+#endif
diff --git a/client/jansson/path.c b/client/jansson/path.c
new file mode 100644
index 000000000..08f2da9f6
--- /dev/null
+++ b/client/jansson/path.c
@@ -0,0 +1,202 @@
+/*
+ * Copyright (c) 2012 Rogerz Zhang <rogerz.zhang@gmail.com>
+ *
+ * Jansson is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ * 
+ * source here https://github.com/rogerz/jansson/blob/json_path/src/path.c
+ */
+
+#include <string.h>
+#include <assert.h>
+
+#include <jansson.h>
+#include "jansson_private.h"
+
+
+json_t *json_path_get(const json_t *json, const char *path)
+{
+    static const char root_chr = '$', array_open = '[';
+    static const char *path_delims = ".[", *array_close = "]";
+    const json_t *cursor;
+    char *token, *buf, *peek, *endptr, delim = '\0';
+    const char *expect;
+
+    if (!json || !path || path[0] != root_chr)
+        return NULL;
+    else
+        buf = jsonp_strdup(path);
+
+    peek = buf + 1;
+    cursor = json;
+    token = NULL;
+    expect = path_delims;
+
+    while (peek && *peek && cursor)
+    {
+        char *last_peek = peek;
+        peek = strpbrk(peek, expect);
+        if (peek) {
+            if (!token && peek != last_peek)
+                goto fail;
+            delim = *peek;
+            *peek++ = '\0';
+        } else if (expect != path_delims || !token) {
+            goto fail;
+        }
+
+        if (expect == path_delims) {
+            if (token) {
+                cursor = json_object_get(cursor, token);
+            }
+            expect = (delim == array_open ? array_close : path_delims);
+            token = peek;
+        } else if (expect == array_close) {
+            size_t index = strtol(token, &endptr, 0);
+            if (*endptr)
+                goto fail;
+            cursor = json_array_get(cursor, index);
+            token = NULL;
+            expect = path_delims;
+        } else {
+            goto fail;
+        }
+    }
+
+    jsonp_free(buf);
+    return (json_t *)cursor;
+fail:
+    jsonp_free(buf);
+    return NULL;
+}
+
+int json_path_set_new(json_t *json, const char *path, json_t *value, size_t flags, json_error_t *error)
+{
+    static const char root_chr = '$', array_open = '[', object_delim = '.';
+    static const char * const path_delims = ".[", *array_close = "]";
+
+    json_t *cursor, *parent = NULL;
+    char *token, *buf = NULL, *peek, delim = '\0';
+    const char *expect;
+    int index_saved = -1;
+
+    jsonp_error_init(error, "<path>");
+
+    if (!json || !path || flags || !value) {
+        jsonp_error_set(error, -1, -1, 0, json_error_invalid_argument, "invalid argument");
+        goto fail;
+    } else {
+        buf = jsonp_strdup(path);
+    }
+
+    if (buf[0] != root_chr) {
+        jsonp_error_set(error, -1, -1, 0, json_error_invalid_format, "path should start with $");
+        goto fail;
+    }
+
+    peek = buf + 1;
+    cursor = json;
+    token = NULL;
+    expect = path_delims;
+
+    while (peek && *peek && cursor)
+    {
+        char *last_peek = peek;
+        peek = strpbrk(last_peek, expect);
+
+        if (peek) {
+            if (!token && peek != last_peek) {
+                jsonp_error_set(error, -1, -1, last_peek - buf, json_error_invalid_format, "unexpected trailing chars");
+                goto fail;
+            }
+            delim = *peek;
+            *peek++ = '\0';
+        } else { // end of path
+            if (expect == path_delims) {
+                break;
+            } else {
+                jsonp_error_set(error, -1, -1, peek - buf, json_error_invalid_format, "missing ']'?");
+                goto fail;
+            }
+        }
+
+        if (expect == path_delims) {
+            if (token) {
+                if (token[0] == '\0') {
+                    jsonp_error_set(error, -1, -1, peek - buf, json_error_invalid_format, "empty token");
+                    goto fail;
+                }
+
+                parent = cursor;
+                cursor = json_object_get(parent, token);
+
+                if (!cursor) {
+                    if (!json_is_object(parent)) {
+                        jsonp_error_set(error, -1, -1, peek - buf, json_error_item_not_found, "object expected");
+                        goto fail;
+                    }
+                    if (delim == object_delim) {
+                        cursor = json_object();
+                        json_object_set_new(parent, token, cursor);
+                    } else {
+                        jsonp_error_set(error, -1, -1, peek - buf, json_error_item_not_found, "new array is not allowed");
+                        goto fail;
+                    }
+                }
+            }
+            expect = (delim == array_open ? array_close : path_delims);
+            token = peek;
+        } else if (expect == array_close) {
+            char *endptr;
+            size_t index;
+
+            parent = cursor;
+            if (!json_is_array(parent)) {
+                jsonp_error_set(error, -1, -1, peek - buf, json_error_item_not_found, "array expected");
+                goto fail;
+            }
+            index = strtol(token, &endptr, 0);
+            if (*endptr) {
+                jsonp_error_set(error, -1, -1, peek - buf, json_error_item_not_found, "invalid array index");
+                goto fail;
+            }
+            cursor = json_array_get(parent, index);
+            if (!cursor) {
+                jsonp_error_set(error, -1, -1, peek - buf, json_error_item_not_found, "array index out of bound");
+                goto fail;
+            }
+            index_saved = index;
+            token = NULL;
+            expect = path_delims;
+        } else {
+            assert(1);
+            jsonp_error_set(error, -1, -1, peek - buf, json_error_unknown, "unexpected error in path move");
+            goto fail;
+        }
+    }
+
+    if (token) {
+        if (json_is_object(cursor)) {
+            json_object_set(cursor, token, value);
+        } else {
+            jsonp_error_set(error, -1, -1, peek - buf, json_error_item_not_found, "object expected");
+            goto fail;
+        }
+        cursor = json_object_get(cursor, token);
+    } else if (index_saved != -1 && json_is_array(parent)) {
+        json_array_set(parent, index_saved, value);
+        cursor = json_array_get(parent, index_saved);
+    } else {
+        jsonp_error_set(error, -1, -1, peek - buf, json_error_item_not_found, "invalid path");
+        goto fail;
+    }
+
+    json_decref(value);
+    jsonp_free(buf);
+    return 0;
+
+fail:
+    json_decref(value);
+    jsonp_free(buf);
+    return -1;
+}
diff --git a/client/jansson/path.h b/client/jansson/path.h
new file mode 100644
index 000000000..e6cf31a2b
--- /dev/null
+++ b/client/jansson/path.h
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2012 Rogerz Zhang <rogerz.zhang@gmail.com>
+ *
+ * Jansson is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ * 
+ * source here https://github.com/rogerz/jansson/blob/json_path/src/path.c
+ */
+
+json_t *json_path_get(const json_t *json, const char *path);
+int json_path_set_new(json_t *json, const char *path, json_t *value, size_t flags, json_error_t *error);
+
+static JSON_INLINE
+int json_path_set(json_t *json, const char *path, json_t *value, size_t flags, json_error_t *error)
+{
+    return json_path_set_new(json, path, json_incref(value), flags, error);
+}
diff --git a/client/jansson/strbuffer.h b/client/jansson/strbuffer.h
new file mode 100644
index 000000000..615b7f5ff
--- /dev/null
+++ b/client/jansson/strbuffer.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2009-2016 Petri Lehtinen <petri@digip.org>
+ *
+ * Jansson is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#ifndef STRBUFFER_H
+#define STRBUFFER_H
+
+#include <stdlib.h>
+
+typedef struct {
+    char *value;
+    size_t length;   /* bytes used */
+    size_t size;     /* bytes allocated */
+} strbuffer_t;
+
+int strbuffer_init(strbuffer_t *strbuff);
+void strbuffer_close(strbuffer_t *strbuff);
+
+void strbuffer_clear(strbuffer_t *strbuff);
+
+const char *strbuffer_value(const strbuffer_t *strbuff);
+
+/* Steal the value and close the strbuffer */
+char *strbuffer_steal_value(strbuffer_t *strbuff);
+
+int strbuffer_append_byte(strbuffer_t *strbuff, char byte);
+int strbuffer_append_bytes(strbuffer_t *strbuff, const char *data, size_t size);
+
+char strbuffer_pop(strbuffer_t *strbuff);
+
+#endif
diff --git a/client/obj/jansson/.dummy b/client/obj/jansson/.dummy
new file mode 100644
index 000000000..e69de29bb

From 074c138de7297d9b4962e1794f43e055c25eed63 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Thu, 8 Nov 2018 19:55:51 +0200
Subject: [PATCH 0142/1938] all works except of jansson private symbols linking

---
 client/Makefile       |  2 +-
 client/emv/emv_tags.c | 18 ++++++++--
 client/emv/emv_tags.h |  2 +-
 client/emv/tlv.c      | 83 +++++++++++++++++++++++++++++++++++++++++++
 client/emv/tlv.h      |  7 ++++
 5 files changed, 108 insertions(+), 4 deletions(-)

diff --git a/client/Makefile b/client/Makefile
index 5f139bf4e..30a2fa26c 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -23,7 +23,7 @@ ENV_CFLAGS := $(CFLAGS)
 VPATH = ../common ../zlib ../uart
 OBJDIR = obj
 
-LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm -L/usr/include
+LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm -L/usr/lib -ljansson
 LUALIB = ../liblua/liblua.a
 LDFLAGS = $(ENV_LDFLAGS)
 INCLUDES_CLIENT = -I/usr/include -I. -I../include -I../common -I../common/polarssl -I../zlib -I../uart -I/opt/local/include -I../liblua
diff --git a/client/emv/emv_tags.c b/client/emv/emv_tags.c
index a1bf3d25e..cc2897127 100644
--- a/client/emv/emv_tags.c
+++ b/client/emv/emv_tags.c
@@ -272,7 +272,7 @@ static const struct emv_tag emv_tags[] = {
 	{ 0x9f6a, "Unpredictable Number", EMV_TAG_NUMERIC },
 	{ 0x9f6b, "Track 2 Data" },
 	{ 0x9f6c, "Card Transaction Qualifiers (CTQ)", EMV_TAG_BITMASK, &EMV_CTQ },
-	{ 0x9f6e, "Form Factor Indicator" },	
+	{ 0x9f6e, "Form Factor Indicator" },
 	{ 0xa5  , "File Control Information (FCI) Proprietary Template" },
 	{ 0xbf0c, "File Control Information (FCI) Issuer Discretionary Data" },
 	{ 0xdf20, "Issuer Proprietary Bitmap (IPB)" },
@@ -391,7 +391,7 @@ static unsigned long emv_value_numeric(const struct tlv *tlv, unsigned start, un
 
 static void emv_tag_dump_numeric(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level) {
 	PRINT_INDENT(level);
-	fprintf(f, "\tNumeric value %" PRIu32 " \n", emv_value_numeric(tlv, 0, tlv->len * 2));
+	fprintf(f, "\tNumeric value %lu\n", emv_value_numeric(tlv, 0, tlv->len * 2));
 }
 
 static void emv_tag_dump_yymmdd(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level) {
@@ -681,3 +681,17 @@ bool emv_tag_dump(const struct tlv *tlv, FILE *f, int level)
 
 	return true;
 }
+
+char *emv_get_tag_name(const struct tlv *tlv)
+{
+	static char *defstr = "";
+	
+	if (!tlv) 
+		return defstr;
+
+	const struct emv_tag *tag = emv_get_tag(tlv);
+	if (tag)
+		return tag->name;
+	
+	return defstr;
+}
diff --git a/client/emv/emv_tags.h b/client/emv/emv_tags.h
index a9d1eea98..246fc72d7 100644
--- a/client/emv/emv_tags.h
+++ b/client/emv/emv_tags.h
@@ -18,7 +18,6 @@
 
 #include "tlv.h"
 #include <stdio.h>
-#include <inttypes.h>
 
 // AC
 # define EMVAC_AC_MASK   0xC0
@@ -32,5 +31,6 @@
 # define EMVCID_REASON_MASK  0x07
 
 bool emv_tag_dump(const struct tlv *tlv, FILE *f, int level);
+char *emv_get_tag_name(const struct tlv *tlv);
 
 #endif
diff --git a/client/emv/tlv.c b/client/emv/tlv.c
index 1be917776..540c33e4c 100644
--- a/client/emv/tlv.c
+++ b/client/emv/tlv.c
@@ -318,6 +318,24 @@ struct tlvdb *tlvdb_find(struct tlvdb *tlvdb, tlv_tag_t tag) {
 	return NULL;
 }
 
+struct tlvdb *tlvdb_find_full(struct tlvdb *tlvdb, tlv_tag_t tag) {
+	if (!tlvdb)
+		return NULL;
+	
+	for (; tlvdb; tlvdb = tlvdb->next) {
+		if (tlvdb->tag.tag == tag)
+			return tlvdb;
+		
+		if (tlvdb->children) {
+			struct tlvdb * ch = tlvdb_find_full(tlvdb->children, tag);
+			if (ch)
+				return ch;
+		}			
+	}
+
+	return NULL;
+}
+
 struct tlvdb *tlvdb_find_path(struct tlvdb *tlvdb, tlv_tag_t tag[]) {
 	int i = 0;
 	struct tlvdb *tnext = tlvdb;
@@ -342,6 +360,52 @@ void tlvdb_add(struct tlvdb *tlvdb, struct tlvdb *other)
 	tlvdb->next = other;
 }
 
+void tlvdb_change_or_add_node(struct tlvdb *tlvdb, tlv_tag_t tag, size_t len, const unsigned char *value)
+{
+	struct tlvdb *telm = tlvdb_find_full(tlvdb, tag);
+	if (telm == NULL) {
+		// new tlv element
+		tlvdb_add(tlvdb, tlvdb_fixed(tag, len, value));
+	} else {
+		// the same tlv structure
+		if (telm->tag.tag == tag && telm->tag.len == len && !memcmp(telm->tag.value, value, len))
+			return;
+
+		// replace tlv element
+		struct tlvdb *tnewelm = tlvdb_fixed(tag, len, value);
+		tnewelm->next = telm->next;
+		tnewelm->parent = telm->parent;
+		
+		// if telm stayed first in children chain
+		if (telm->parent && telm->parent->children == telm) {
+			telm->parent->children = tnewelm;
+		}
+		
+		// if telm have previous element
+		if (telm != tlvdb) {
+			// elm in root
+			struct tlvdb *celm = tlvdb;
+			// elm in child list of node
+			if (telm->parent && telm->parent->children)
+				celm = telm->parent->children;		
+			
+			// find previous element
+			for (; celm; celm = celm->next) {
+				if (celm->next == telm) {
+					celm->next = tnewelm;
+					break;
+				}
+			}
+		}
+		
+		// free old element with childrens
+		telm->next = NULL;
+		tlvdb_free(telm);
+	}
+	
+	return;
+}
+
 void tlvdb_visit(const struct tlvdb *tlvdb, tlv_cb cb, void *data, int level)
 {
 	struct tlvdb *next = NULL;
@@ -394,6 +458,10 @@ const struct tlv *tlvdb_get_inchild(const struct tlvdb *tlvdb, tlv_tag_t tag, co
 	return tlvdb_get(tlvdb, tag, prev);
 }
 
+const struct tlv *tlvdb_get_tlv(const struct tlvdb *tlvdb) {
+	return &tlvdb->tag;
+}
+
 unsigned char *tlv_encode(const struct tlv *tlv, size_t *len)
 {
 	size_t size = tlv->len;
@@ -452,3 +520,18 @@ bool tlv_equal(const struct tlv *a, const struct tlv *b)
 
 	return a->tag == b->tag && a->len == b->len && !memcmp(a->value, b->value, a->len);
 }
+
+struct tlvdb *tlvdb_elm_get_next(struct tlvdb *tlvdb)
+{
+	return tlvdb->next;
+}
+
+struct tlvdb *tlvdb_elm_get_children(struct tlvdb *tlvdb)
+{
+	return tlvdb->children;
+}
+
+struct tlvdb *tlvdb_elm_get_parent(struct tlvdb *tlvdb)
+{
+	return tlvdb->parent;
+}
diff --git a/client/emv/tlv.h b/client/emv/tlv.h
index 5b8b68250..b25b51de2 100644
--- a/client/emv/tlv.h
+++ b/client/emv/tlv.h
@@ -39,15 +39,22 @@ struct tlvdb *tlvdb_parse(const unsigned char *buf, size_t len);
 struct tlvdb *tlvdb_parse_multi(const unsigned char *buf, size_t len);
 void tlvdb_free(struct tlvdb *tlvdb);
 
+struct tlvdb *tlvdb_elm_get_next(struct tlvdb *tlvdb);
+struct tlvdb *tlvdb_elm_get_children(struct tlvdb *tlvdb);
+struct tlvdb *tlvdb_elm_get_parent(struct tlvdb *tlvdb);
+
+struct tlvdb *tlvdb_find_full(struct tlvdb *tlvdb, tlv_tag_t tag); // search also in childrens
 struct tlvdb *tlvdb_find(struct tlvdb *tlvdb, tlv_tag_t tag);
 struct tlvdb *tlvdb_find_next(struct tlvdb *tlvdb, tlv_tag_t tag);
 struct tlvdb *tlvdb_find_path(struct tlvdb *tlvdb, tlv_tag_t tag[]);
 
 void tlvdb_add(struct tlvdb *tlvdb, struct tlvdb *other);
+void tlvdb_change_or_add_node(struct tlvdb *tlvdb, tlv_tag_t tag, size_t len, const unsigned char *value);
 
 void tlvdb_visit(const struct tlvdb *tlvdb, tlv_cb cb, void *data, int level);
 const struct tlv *tlvdb_get(const struct tlvdb *tlvdb, tlv_tag_t tag, const struct tlv *prev);
 const struct tlv *tlvdb_get_inchild(const struct tlvdb *tlvdb, tlv_tag_t tag, const struct tlv *prev);
+const struct tlv *tlvdb_get_tlv(const struct tlvdb *tlvdb);
 
 bool tlv_parse_tl(const unsigned char **buf, size_t *len, struct tlv *tlv);
 unsigned char *tlv_encode(const struct tlv *tlv, size_t *len);

From 0cfa47e6286854d317dee30e8a45f0a5b166d1c8 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Thu, 8 Nov 2018 20:29:08 +0200
Subject: [PATCH 0143/1938] merged iso14 arm side

---
 armsrc/iso14443a.c | 29 ++++++++++++++++++++---------
 armsrc/iso14443a.h |  2 +-
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index f6be25a50..20225f416 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -2212,15 +2212,21 @@ b8 b7 b6 b5 b4 b3 b2 b1
 b5,b6 = 00 - DESELECT
         11 - WTX 
 */    
-int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, void *data) {
+int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, void *data, uint8_t *res) {
 	uint8_t parity[MAX_PARITY_SIZE] = {0x00};
-	uint8_t real_cmd[cmd_len+4];
+	uint8_t real_cmd[cmd_len + 4];
 	
-	// ISO 14443 APDU frame: PCB [CID] [NAD] APDU CRC PCB=0x02
-	real_cmd[0] = 0x02; // bnr,nad,cid,chn=0; i-block(0x00)	
-	// put block number into the PCB
-	real_cmd[0] |= iso14_pcb_blocknum;
-	memcpy(real_cmd + 1, cmd, cmd_len);
+	if (cmd_len) {
+		// ISO 14443 APDU frame: PCB [CID] [NAD] APDU CRC PCB=0x02
+		real_cmd[0] = 0x02; // bnr,nad,cid,chn=0; i-block(0x00)	
+		// put block number into the PCB
+		real_cmd[0] |= iso14_pcb_blocknum;
+		memcpy(real_cmd + 1, cmd, cmd_len);
+	} else {
+		// R-block. ACK
+		real_cmd[0] = 0xA2; // r-block + ACK	
+		real_cmd[0] |= iso14_pcb_blocknum;
+	}
 	AddCrc14A(real_cmd, cmd_len + 1);
  
 	ReaderTransmit(real_cmd, cmd_len + 3, NULL);
@@ -2259,6 +2265,10 @@ int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, void *data) {
 	{
 		iso14_pcb_blocknum ^= 1;
 	}
+		
+		// if we received I-block with chaining we need to send ACK and receive another block of data
+		if (res)
+			*res = data_bytes[0];
 
 		// crc check
 		if (len >=3 && !check_crc(CRC_14443_A, data_bytes, len)) {
@@ -2320,8 +2330,9 @@ void ReaderIso14443a(UsbCommand *c) {
 		iso14a_set_timeout(timeout);
 
 	if ((param & ISO14A_APDU)) {
-		arg0 = iso14_apdu(cmd, len, buf);
-		cmd_send(CMD_ACK, arg0, 0, 0, buf, sizeof(buf));
+		uint8_t res;
+		arg0 = iso14_apdu(cmd, len, buf, &res);
+		cmd_send(CMD_ACK, arg0, res, 0, buf, sizeof(buf));
 	}
 
 	if ((param & ISO14A_RAW)) {
diff --git a/armsrc/iso14443a.h b/armsrc/iso14443a.h
index ff9116d67..ff34fa577 100644
--- a/armsrc/iso14443a.h
+++ b/armsrc/iso14443a.h
@@ -114,7 +114,7 @@ extern void ReaderTransmitPar(uint8_t *frame, uint16_t len, uint8_t *par, uint32
 extern int ReaderReceive(uint8_t *receivedAnswer, uint8_t *par);
 
 extern void iso14443a_setup(uint8_t fpga_minor_mode);
-extern int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, void *data);
+extern int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, void *data, uint8_t *res);
 extern int iso14443a_select_card(uint8_t *uid_ptr, iso14a_card_select_t *resp_data, uint32_t *cuid_ptr, bool anticollision, uint8_t num_cascades, bool no_rats);
 extern int iso14443a_fast_select_card(uint8_t *uid_ptr, uint8_t num_cascades);
 extern void iso14a_set_trigger(bool enable);

From 1f1d8bfc0bd3078a47b61a5035b2f6de548132ca Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Thu, 8 Nov 2018 20:29:29 +0200
Subject: [PATCH 0144/1938] fixed armside epa.c

---
 armsrc/epa.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/armsrc/epa.c b/armsrc/epa.c
index 5a8fdc8bb..68b2711da 100644
--- a/armsrc/epa.c
+++ b/armsrc/epa.c
@@ -108,7 +108,7 @@ int EPA_APDU(uint8_t *apdu, size_t length, uint8_t *response)
 	switch(iso_type)
 	{
 		case 'a':
-			return iso14_apdu(apdu, (uint16_t) length, response);
+			return iso14_apdu(apdu, (uint16_t) length, response, NULL);
 			break;
 		case 'b':
 			return iso14443b_apdu(apdu, length, response);

From 00fdac0986a5066270803748874432511f719b35 Mon Sep 17 00:00:00 2001
From: David Cumps <david@cumps.be>
Date: Sun, 11 Nov 2018 01:18:14 +0100
Subject: [PATCH 0145/1938] fix legic reading and writing

---
 client/scripts/legic.lua | 96 ++++++++++++++++++++--------------------
 1 file changed, 49 insertions(+), 47 deletions(-)

diff --git a/client/scripts/legic.lua b/client/scripts/legic.lua
index 9c63fdb69..2acf27bc2 100644
--- a/client/scripts/legic.lua
+++ b/client/scripts/legic.lua
@@ -386,7 +386,7 @@ end
 -- put bytes into tag-table
 function bytesToTag(bytes, tag)
 	if istable(tag) == false then return oops("tag is no table in: bytesToTag ("..type(tag)..")") end
-	
+
     tag.MCD =bytes[1];
     tag.MSN0=bytes[2];
     tag.MSN1=bytes[3];
@@ -453,8 +453,8 @@ end
 ---
 -- read Tag-Table in bytes-table
 function tagToBytes(tag)
-	if istable(tag) == false then return oops("tag is no table in tagToBytes ("..type(tag)..")") end 
-	
+	if istable(tag) == false then return oops("tag is no table in tagToBytes ("..type(tag)..")") end
+
     local bytes = {}
     local i, i2
     -- main token-data
@@ -506,8 +506,9 @@ function tagToBytes(tag)
 function readFromPM3()
   local tag, bytes, infile
     infile="legic.temp"
-    core.console("hf legic reader")
-    core.console("hf legic esave "..infile)
+    -- core.console("hf legic reader")
+    -- core.console("hf legic esave "..infile)
+    core.console("hf legic dump o "..infile)
     tag=readFile(infile..".bin")
     return tag
 end
@@ -558,7 +559,7 @@ function writeToTag(tag)
   if (bytes) then
     print("write temp-file '"..filename.."'")
     print(accyan)
-    writeFile(bytes, filename)
+    writeFile(bytes, filename..".bin")
     --writeToTag(bytes, taglen, 'MylegicClone.hex')
     print(acoff)
   end
@@ -568,17 +569,18 @@ function writeToTag(tag)
 		WriteBytes = utils.input(acyellow.."enter number of bytes to write?"..acoff, taglen)
 		-- load file into pm3-buffer
     if (type(filename) ~= "string") then filename=input(acyellow.."filename to load to pm3-buffer?"..acoff,"legic.temp") end
-		cmd = 'hf legic load '..filename
+		cmd = 'hf legic eload '..filename
 		core.console(cmd)
 		-- write pm3-buffer to Tag
 		for i=0, WriteBytes do
 			if ( i<5 or i>6) then
-				cmd = ('hf legic write o 0x%02x d 0x01'):format(i)
+        cmd = ('hf legic write o %02x d 01'):format(i)
+        print(cmd)
 				core.console(cmd)
         --print(cmd)
 			elseif (i == 6) then
 				-- write DCF in reverse order (requires 'mosci-patch')
-				cmd = 'hf legic write o 0x05 d 0x02'
+				cmd = 'hf legic write o 05 d 02'
         print(acgreen..cmd..acoff)
 				core.console(cmd)
         --print(cmd)
@@ -597,10 +599,10 @@ function readFile(filename)
   print(accyan)
   local bytes = {}
   local tag = {}
-	if  file_check(filename) == false then return oops("input file: "..filename.." not found") end 
-	
+	if  file_check(filename) == false then return oops("input file: "..filename.." not found") end
+
 		bytes = getInputBytes(filename)
-	
+
 		if bytes == false then return oops('couldnt get input bytes') end
 
 		-- make plain bytes
@@ -611,7 +613,7 @@ function readFile(filename)
 		-- load plain bytes to tag-table
 		print(acoff)
 		tag=bytesToTag(bytes, tag)
-	
+
   return tag
 end
 
@@ -704,9 +706,9 @@ end
 ---
 -- toggle higligh
 function toggleHighlight(tbl)
-	if (tbl['highlight']) then 
+	if (tbl['highlight']) then
 		tbl['highlight'] = false
-	else 
+	else
 		tbl['highlight'] = true
 	end
   return tbl
@@ -1302,9 +1304,9 @@ function dumpTable(tab, header, tstart, tend)
   for i=tstart, tend do
     res=res..tab[i].." "
   end
-	if (#header == 0) then 
+	if (#header == 0) then
 		return res
-	else 
+	else
 		return (header.." #"..(tend-tstart+1).."\n"..res)
 	end
 end
@@ -1351,9 +1353,9 @@ end
 ---
 -- dump Legic-Cash data
 function dumpLegicCash(tag, x)
-	
+
 	if istable(tag.SEG[x]) == false then return end
-	
+
      io.write("in Segment "..tag.SEG[x].index.." :\n")
      print("--------------------------------\n\tLegic-Cash Values\n--------------------------------")
      local limit, curr, balance, rid, tcv
@@ -1379,7 +1381,7 @@ function dumpLegicCash(tag, x)
 function print3rdPartyCash1(tag, x)
 
 	if istable(tag.SEG[x]) == false then return end
-	
+
     local uid=tag.MCD..tag.MSN0..tag.MSN1..tag.MSN2
      print("\n\t\tStamp  :  "..dumpTable(tag.SEG[x].data, "", 0 , 2))
      print("\t\tBlock 0:  "..dumpTable(tag.SEG[x].data, "", 3 , 18))
@@ -1455,11 +1457,11 @@ function makeToken()
 
   -- if Master-Token -> calc Master-Token-CRC
   if (mtq>1) then bytes[22] = calcMtCrc(bytes) end
-  
+
   local tempTag = createTagTable()
   -- remove segment if MasterToken
   if (mtq>1) then tempTag.SEG[0] = nil end
-  
+
   return bytesToTag(bytes, tempTag)
 end
 
@@ -1704,7 +1706,7 @@ function editSegmentData(data)
     for i=0, #data-1 do
 		data[i]=input(accyan.."Data"..i..acoff..": ", data[i])
     end
-	if (lc) then 
+	if (lc) then
 		data = fixLegicCash(data)
 	end
 	return data
@@ -2276,7 +2278,7 @@ function modifyMode()
     -- load file into mainTAG
     ["lf"] = function(x)
 
-              if (type(x)=='string' and file_check(x)) then 
+              if (type(x)=='string' and file_check(x)) then
 				filename = x
               else
 				filename = input("enter filename: ", "legic.temp")
@@ -2382,9 +2384,9 @@ function modifyMode()
     ---
     -- dump single segment
     ["ds"] = function(x)
-                if (type(x)=="string" and string.len(x)>0) then 
+                if (type(x)=="string" and string.len(x)>0) then
 					sel = tonumber(x,10)
-                else 
+                else
 					sel = selectSegment(inTAG)
 				end
                 if (sel) then print("\n"..(dumpSegment(inTAG, sel) or acred.."no Segments available") ..acoff.."\n") end
@@ -2398,9 +2400,9 @@ function modifyMode()
                 if(istable(inTAG.SEG[0])) then
                   inTAG=editSegment(inTAG, sel)
                   inTAG.SEG[sel]=regenSegmentHeader(inTAG.SEG[sel])
-				else 
+				else
 					print(acyellow.."no Segments in Tag"..acoff)
-				end 
+				end
               end
             end,
     ---
@@ -2455,14 +2457,14 @@ function modifyMode()
     -- toggle kgh-crc-flag on a single segment
     ["tk"] = function(x)
                if (istable(inTAG) and istable(inTAG.SEG[0])) then
-                if (type(x)=="string" and string.len(x)>0) then 
+                if (type(x)=="string" and string.len(x)>0) then
 					sel = tonumber(x,10)
-				else 
-					sel = selectSegment(inTAG) 
+				else
+					sel = selectSegment(inTAG)
 				end
-                if(inTAG.SEG[sel].kgh) then 
+                if(inTAG.SEG[sel].kgh) then
 					inTAG.SEG[sel].kgh = false
-                else 
+                else
 					inTAG.SEG[sel].kgh = true
 				end
                end
@@ -2486,18 +2488,18 @@ function modifyMode()
 					sel = tonumber(x,10)
                  else
 					sel = selectSegment(inTAG)
-				 end 
+				 end
                  print("k "..kghCrcCredentials(inTAG, sel))
                end
               end,
     ---
     -- fix legic-cash checksums
     ["flc"] = function(x)
-                if (type(x)=="string" and string.len(x)>0) then 
+                if (type(x)=="string" and string.len(x)>0) then
 					x = tonumber(x,10)
                 else
 					x = selectSegment(inTAG)
-				end 
+				end
                 inTAG.SEG[x].data=fixLegicCash(inTAG.SEG[x].data)
               end,
     ---
@@ -2531,7 +2533,7 @@ function modifyMode()
                 else
                 -- or try to find match
 					x = autoSelectSegment(inTAG, "3rdparty")
-				end 
+				end
                 if (istable(inTAG) and istable(inTAG.SEG[x]) and inTAG.SEG[x].len == 100) then
                   uid=inTAG.MCD..inTAG.MSN0..inTAG.MSN1..inTAG.MSN2
                   if (check43rdPartyCash1(uid, inTAG.SEG[x].data)) then
@@ -2561,11 +2563,11 @@ function modifyMode()
                 if (type(x)=="string" and string.len(x)>0) then
                   x=tonumber(x,10)
                   print(string.format("User-Selected Index %02d", x))
-                
+
                 else
                 -- or try to find match
 					x = autoSelectSegment(inTAG, "3rdparty")
-				end 
+				end
                 if (istable(inTAG) and istable(inTAG.SEG[x]) and inTAG.SEG[x].len == 100) then
                   inTAG=edit3rdPartyCash1(inTAG, x)
                     dump3rdPartyCash1(inTAG, x)
@@ -2587,7 +2589,7 @@ function modifyMode()
     ---
     -- get stamp from single segment
     ["gs"] = function(x)
-                if(type(x)=="string" and string.len(x)>=2) then 
+                if(type(x)=="string" and string.len(x)>=2) then
 					x = tonumber(x, 10)
                 else
 					x = selectSegment(inTAG)
@@ -2637,7 +2639,7 @@ function modifyMode()
       actions[string.lower(string.sub(ic,0,2))](string.sub(ic,4))
     elseif (type(actions[string.lower(string.sub(ic,0,1))])=='function') then
       actions[string.lower(string.sub(ic,0,1))](string.sub(ic,3))
-    else 
+    else
 	  actions.h('')
 	end
   until (string.sub(ic,0,1)=="q")
@@ -2664,25 +2666,25 @@ function main(args)
     -- dump virtual-Tag
     if o == "d" then dfs=true end
     -- interacive modifying
-    if o == "m" then 
+    if o == "m" then
 		interactive = true
 		modifyMode()
 	end
     -- xor (e.g. for clone or plain file)
-    if o == "c" then 
+    if o == "c" then
 		cfs = true
 		crc = a
 	end
     -- output file
-	if o == "o" then 
+	if o == "o" then
 		outfile = a
 		ofs = true
-	end		
+	end
   end
 
   -- file conversion (output to file)
 	if ofs == false then return end
-  
+
     -- dump infile / tag-read
     if (dfs) then
       print("-----------------------------------------")
@@ -2714,4 +2716,4 @@ end
 
 ---
 -- script start
-main(args)
\ No newline at end of file
+main(args)

From dc693578203a329d2cce322ff2ea0f8132837623 Mon Sep 17 00:00:00 2001
From: David Cumps <david@cumps.be>
Date: Sun, 11 Nov 2018 12:34:59 +0100
Subject: [PATCH 0146/1938] skip first 4 bytes of legic writing

---
 client/scripts/legic.lua | 38 +++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/client/scripts/legic.lua b/client/scripts/legic.lua
index 2acf27bc2..546e5cc1a 100644
--- a/client/scripts/legic.lua
+++ b/client/scripts/legic.lua
@@ -513,6 +513,14 @@ function readFromPM3()
     return tag
 end
 
+function padString(str)
+  if (str:len() == 1) then
+    return '0'..str
+  end
+
+  return str
+end
+
 ---
 -- write virtual Tag to real Tag
 function writeToTag(tag)
@@ -560,32 +568,32 @@ function writeToTag(tag)
     print("write temp-file '"..filename.."'")
     print(accyan)
     writeFile(bytes, filename..".bin")
-    --writeToTag(bytes, taglen, 'MylegicClone.hex')
     print(acoff)
   end
  end
-	-- write data to file
+
+ -- write data to file
 	if (taglen > 0) then
 		WriteBytes = utils.input(acyellow.."enter number of bytes to write?"..acoff, taglen)
 		-- load file into pm3-buffer
     if (type(filename) ~= "string") then filename=input(acyellow.."filename to load to pm3-buffer?"..acoff,"legic.temp") end
-		cmd = 'hf legic eload '..filename
+		cmd = 'hf legic eload 2 '..filename
 		core.console(cmd)
 		-- write pm3-buffer to Tag
 		for i=0, WriteBytes do
-			if ( i<5 or i>6) then
-        cmd = ('hf legic write o %02x d 01'):format(i)
-        print(cmd)
-				core.console(cmd)
-        --print(cmd)
-			elseif (i == 6) then
-				-- write DCF in reverse order (requires 'mosci-patch')
-				cmd = 'hf legic write o 05 d 02'
+			if (i > 6) then
+        cmd = 'hf legic write o '..string.format("%x", i)..' d '..padString(bytes[i])
         print(acgreen..cmd..acoff)
 				core.console(cmd)
-        --print(cmd)
-			else
+			elseif (i == 6) then
+        -- write DCF in reverse order (requires 'mosci-patch')
+				cmd = 'hf legic write o 05 d '..padString(bytes[i-1])..padString(bytes[i])
+        print(acgreen..cmd..acoff)
+				core.console(cmd)
+      elseif (i == 5) then
 				print(acgreen.."skip byte 0x05 - will be written next step"..acoff)
+			else
+				print(acgreen.."skip byte 0x00-0x04 - unwritable area"..acoff)
 			end
 			utils.Sleep(0.2)
 		end
@@ -622,14 +630,14 @@ end
 function writeFile(bytes, filename)
 	if (filename ~= 'MylegicClone.hex') then
 		if (file_check(filename)) then
-			local answer = confirm("\nthe output-file "..filename.." alredy exists!\nthis will delete the previous content!\ncontinue?")
+			local answer = confirm("\nthe output-file "..filename.." already exists!\nthis will delete the previous content!\ncontinue?")
 			if (answer==false) then return print("user abort") end
 		end
 	end
 	local line
 	local bcnt=0
 	local fho,err = io.open(filename, "w")
-	if err then oops("OOps ... faild to open output-file ".. filename) end
+	if err then oops("OOps ... failed to open output-file ".. filename) end
 	bytes=xorBytes(bytes, bytes[5])
 	for i = 1, #bytes do
 		if (bcnt == 0) then

From ab196ad2ee229f8117dcc4d9e93640e72b8651e8 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Mon, 12 Nov 2018 15:00:35 +0200
Subject: [PATCH 0147/1938] added jansson

---
 client/Makefile                    |   18 +-
 client/emv/emvjson.h               |    1 -
 client/jansson/Makefile            |   64 ++
 client/jansson/dump.c              |  504 ++++++++++++
 client/jansson/error.c             |   66 ++
 client/jansson/hashtable.c         |  356 +++++++++
 client/jansson/hashtable_seed.c    |  277 +++++++
 client/jansson/jansson.def         |   75 ++
 client/jansson/jansson.h           |  372 +++++++++
 client/jansson/jansson_config.h    |   51 ++
 client/jansson/jansson_config.h.in |   51 ++
 client/jansson/load.c              | 1155 ++++++++++++++++++++++++++++
 client/jansson/lookup3.h           |  381 +++++++++
 client/jansson/memory.c            |   69 ++
 client/jansson/pack_unpack.c       |  909 ++++++++++++++++++++++
 client/jansson/path.c              |    1 -
 client/jansson/path.h              |   17 -
 client/jansson/strbuffer.c         |  111 +++
 client/jansson/strconv.c           |  145 ++++
 client/jansson/utf.c               |  187 +++++
 client/jansson/utf.h               |   27 +
 client/jansson/value.c             | 1078 ++++++++++++++++++++++++++
 22 files changed, 5890 insertions(+), 25 deletions(-)
 create mode 100644 client/jansson/Makefile
 create mode 100644 client/jansson/dump.c
 create mode 100644 client/jansson/error.c
 create mode 100644 client/jansson/hashtable.c
 create mode 100644 client/jansson/hashtable_seed.c
 create mode 100644 client/jansson/jansson.def
 create mode 100644 client/jansson/jansson.h
 create mode 100644 client/jansson/jansson_config.h
 create mode 100644 client/jansson/jansson_config.h.in
 create mode 100644 client/jansson/load.c
 create mode 100644 client/jansson/lookup3.h
 create mode 100644 client/jansson/memory.c
 create mode 100644 client/jansson/pack_unpack.c
 delete mode 100644 client/jansson/path.h
 create mode 100644 client/jansson/strbuffer.c
 create mode 100644 client/jansson/strconv.c
 create mode 100644 client/jansson/utf.c
 create mode 100644 client/jansson/utf.h
 create mode 100644 client/jansson/value.c

diff --git a/client/Makefile b/client/Makefile
index 30a2fa26c..21b43d7f1 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -23,11 +23,13 @@ ENV_CFLAGS := $(CFLAGS)
 VPATH = ../common ../zlib ../uart
 OBJDIR = obj
 
-LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm -L/usr/lib -ljansson
+LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm
 LUALIB = ../liblua/liblua.a
+JANSSONLIBPATH = ./jansson
+JANSSONLIB = $(JANSSONLIBPATH)/libjansson.a
 LDFLAGS = $(ENV_LDFLAGS)
-INCLUDES_CLIENT = -I/usr/include -I. -I../include -I../common -I../common/polarssl -I../zlib -I../uart -I/opt/local/include -I../liblua
-CFLAGS = $(ENV_CFLAGS) -std=c99 -D_ISOC99_SOURCE -DPRESETS $(INCLUDES_CLIENT) -Wall -g -O3
+INCLUDES_CLIENT = -I. -I../include -I../common -I../common/polarssl -I../zlib -I../uart -I/opt/local/include -I../liblua
+CFLAGS = $(ENV_CFLAGS) -std=c99 -D_ISOC99_SOURCE -DPRESETS $(INCLUDES_CLIENT) -I$(JANSSONLIBPATH) -Wall -g -O3
 CXXFLAGS = -I../include -Wall -O3
 
 LUAPLATFORM = generic
@@ -103,7 +105,6 @@ CMDSRCS =	crapto1/crapto1.c \
 			crapto1/crypto1.c \
 			mfkey.c \
 			tea.c \
-			jansson/path.c \
 			polarssl/des.c \
 			polarssl/aes.c \
 			polarssl/aes_cmac128.c \
@@ -263,12 +264,12 @@ WINBINS = $(patsubst %, %.exe, $(BINS))
 CLEAN = $(BINS) $(WINBINS) $(COREOBJS) $(CMDOBJS) $(OBJCOBJS) $(ZLIBOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(OBJDIR)/*.o *.moc.cpp ui/ui_overlays.h lualibs/usb_cmd.lua lualibs/mf_default_keys.lua
 
 # need to assign dependancies to build these first...
-all: lua_build $(BINS) 
+all: lua_build jansson_build $(BINS) 
 
 all-static: LDLIBS:=-static $(LDLIBS)
 all-static: proxmark3 flasher fpga_compress
 
-proxmark3: LDLIBS+=$(LUALIB) $(QTLDLIBS)
+proxmark3: LDLIBS+=$(LUALIB) $(JANSSONLIB) $(QTLDLIBS)
 proxmark3: $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(OBJCOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(ZLIBOBJS) lualibs/usb_cmd.lua lualibs/mf_default_keys.lua
 	$(LD) $(LDFLAGS) $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(OBJCOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(ZLIBOBJS) $(LDLIBS)  -o $@
 	
@@ -295,6 +296,7 @@ lualibs/mf_default_keys.lua : default_keys.dic
 clean:
 	$(RM) $(CLEAN)
 	cd ../liblua && make clean
+	cd $(JANSSONLIBPATH) && make clean
 
 tarbin: $(BINS)
 	$(TAR) $(TARFLAGS) ../proxmark3-$(platform)-bin.tar $(BINS:%=client/%) $(WINBINS:%=client/%)
@@ -302,6 +304,10 @@ tarbin: $(BINS)
 lua_build:
 	@echo Compiling liblua, using platform $(LUAPLATFORM)
 	cd ../liblua && make $(LUAPLATFORM)
+	
+jansson_build:
+	@echo Compiling jansson
+	cd $(JANSSONLIBPATH) && make all
 
 .PHONY: all clean
 
diff --git a/client/emv/emvjson.h b/client/emv/emvjson.h
index 32b2484d2..9c6eda5ea 100644
--- a/client/emv/emvjson.h
+++ b/client/emv/emvjson.h
@@ -12,7 +12,6 @@
 
 #include <jansson.h>
 #include "tlv.h"
-#include "jansson/path.h"
 
 typedef struct {
 	tlv_tag_t Tag;
diff --git a/client/jansson/Makefile b/client/jansson/Makefile
new file mode 100644
index 000000000..e608d7c04
--- /dev/null
+++ b/client/jansson/Makefile
@@ -0,0 +1,64 @@
+
+include_HEADERS = jansson.h
+nodist_include_HEADERS = jansson_config.h
+
+LIB_A = libjansson.a
+libjansson_la_SOURCES = \
+	dump.c \
+	error.c \
+	hashtable.c \
+	hashtable.h \
+	hashtable_seed.c \
+	jansson_private.h \
+	load.c \
+	lookup3.h \
+	memory.c \
+	pack_unpack.c \
+	strbuffer.c \
+	strbuffer.h \
+	strconv.c \
+	utf.c \
+	utf.h \
+	path.c \
+	value.c
+libjansson_la_LDFLAGS = \
+	-no-undefined \
+	-export-symbols-regex '^json_' \
+	-version-info 15:0:11
+
+	
+CFILES = $(filter %.c, $(libjansson_la_SOURCES))
+CMDOBJS = $(CFILES:%.c=%.o)
+CLEAN = $(CMDOBJS)
+	
+CC= gcc
+CFLAGS= -O2 -Wall -Wno-unused-variable -Wno-unused-function
+LDFLAGS= $(SYSLDFLAGS) $(libjansson_la_LDFLAGS)
+LIBS= -lm $(SYSLIBS) $(MYLIBS)
+DEFAULT_INCLUDES = -I.
+DEFS = -DHAVE_STDINT_H
+
+AR= ar rcs
+RANLIB= ranlib
+RM= rm -f
+TST= echo
+
+SYSLDFLAGS=
+SYSLIBS=
+
+MYLIBS=
+MYOBJS=
+
+all: $(CMDOBJS)
+	$(AR) $(LIB_A) $(CMDOBJS)
+	$(RANLIB) $(LIB_A)
+	
+clean:
+	$(RM) $(CLEAN)
+	$(RM) $(LIB_A)
+	
+%.o: %.c
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(CFLAGS) -c -o $@ $< $(LIBS)
+	
+.PHONY: all clean
+
diff --git a/client/jansson/dump.c b/client/jansson/dump.c
new file mode 100644
index 000000000..8e725c934
--- /dev/null
+++ b/client/jansson/dump.c
@@ -0,0 +1,504 @@
+/*
+ * Copyright (c) 2009-2016 Petri Lehtinen <petri@digip.org>
+ *
+ * Jansson is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
+#include "jansson_private.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include "jansson.h"
+#include "strbuffer.h"
+#include "utf.h"
+
+#define MAX_INTEGER_STR_LENGTH  100
+#define MAX_REAL_STR_LENGTH     100
+
+#define FLAGS_TO_INDENT(f)      ((f) & 0x1F)
+#define FLAGS_TO_PRECISION(f)   (((f) >> 11) & 0x1F)
+
+struct buffer {
+    const size_t size;
+    size_t used;
+    char *data;
+};
+
+static int dump_to_strbuffer(const char *buffer, size_t size, void *data)
+{
+    return strbuffer_append_bytes((strbuffer_t *)data, buffer, size);
+}
+
+static int dump_to_buffer(const char *buffer, size_t size, void *data)
+{
+    struct buffer *buf = (struct buffer *)data;
+
+    if(buf->used + size <= buf->size)
+        memcpy(&buf->data[buf->used], buffer, size);
+
+    buf->used += size;
+    return 0;
+}
+
+static int dump_to_file(const char *buffer, size_t size, void *data)
+{
+    FILE *dest = (FILE *)data;
+    if(fwrite(buffer, size, 1, dest) != 1)
+        return -1;
+    return 0;
+}
+
+static int dump_to_fd(const char *buffer, size_t size, void *data)
+{
+    int *dest = (int *)data;
+#ifdef HAVE_UNISTD_H
+    if(write(*dest, buffer, size) == (ssize_t)size)
+        return 0;
+#endif
+    return -1;
+}
+
+/* 32 spaces (the maximum indentation size) */
+static const char whitespace[] = "                                ";
+
+static int dump_indent(size_t flags, int depth, int space, json_dump_callback_t dump, void *data)
+{
+    if(FLAGS_TO_INDENT(flags) > 0)
+    {
+        unsigned int ws_count = FLAGS_TO_INDENT(flags), n_spaces = depth * ws_count;
+
+        if(dump("\n", 1, data))
+            return -1;
+
+        while(n_spaces > 0)
+        {
+            int cur_n = n_spaces < sizeof whitespace - 1 ? n_spaces : sizeof whitespace - 1;
+
+            if(dump(whitespace, cur_n, data))
+                return -1;
+
+            n_spaces -= cur_n;
+        }
+    }
+    else if(space && !(flags & JSON_COMPACT))
+    {
+        return dump(" ", 1, data);
+    }
+    return 0;
+}
+
+static int dump_string(const char *str, size_t len, json_dump_callback_t dump, void *data, size_t flags)
+{
+    const char *pos, *end, *lim;
+    int32_t codepoint;
+
+    if(dump("\"", 1, data))
+        return -1;
+
+    end = pos = str;
+    lim = str + len;
+    while(1)
+    {
+        const char *text;
+        char seq[13];
+        int length;
+
+        while(end < lim)
+        {
+            end = utf8_iterate(pos, lim - pos, &codepoint);
+            if(!end)
+                return -1;
+
+            /* mandatory escape or control char */
+            if(codepoint == '\\' || codepoint == '"' || codepoint < 0x20)
+                break;
+
+            /* slash */
+            if((flags & JSON_ESCAPE_SLASH) && codepoint == '/')
+                break;
+
+            /* non-ASCII */
+            if((flags & JSON_ENSURE_ASCII) && codepoint > 0x7F)
+                break;
+
+            pos = end;
+        }
+
+        if(pos != str) {
+            if(dump(str, pos - str, data))
+                return -1;
+        }
+
+        if(end == pos)
+            break;
+
+        /* handle \, /, ", and control codes */
+        length = 2;
+        switch(codepoint)
+        {
+            case '\\': text = "\\\\"; break;
+            case '\"': text = "\\\""; break;
+            case '\b': text = "\\b"; break;
+            case '\f': text = "\\f"; break;
+            case '\n': text = "\\n"; break;
+            case '\r': text = "\\r"; break;
+            case '\t': text = "\\t"; break;
+            case '/':  text = "\\/"; break;
+            default:
+            {
+                /* codepoint is in BMP */
+                if(codepoint < 0x10000)
+                {
+                    snprintf(seq, sizeof(seq), "\\u%04X", (unsigned int)codepoint);
+                    length = 6;
+                }
+
+                /* not in BMP -> construct a UTF-16 surrogate pair */
+                else
+                {
+                    int32_t first, last;
+
+                    codepoint -= 0x10000;
+                    first = 0xD800 | ((codepoint & 0xffc00) >> 10);
+                    last = 0xDC00 | (codepoint & 0x003ff);
+
+                    snprintf(seq, sizeof(seq), "\\u%04X\\u%04X", (unsigned int)first, (unsigned int)last);
+                    length = 12;
+                }
+
+                text = seq;
+                break;
+            }
+        }
+
+        if(dump(text, length, data))
+            return -1;
+
+        str = pos = end;
+    }
+
+    return dump("\"", 1, data);
+}
+
+static int compare_keys(const void *key1, const void *key2)
+{
+    return strcmp(*(const char **)key1, *(const char **)key2);
+}
+
+static int loop_check(hashtable_t *parents, const json_t *json, char *key, size_t key_size)
+{
+    snprintf(key, key_size, "%p", json);
+    if (hashtable_get(parents, key))
+        return -1;
+
+    return hashtable_set(parents, key, json_null());
+}
+
+static int do_dump(const json_t *json, size_t flags, int depth,
+                   hashtable_t *parents, json_dump_callback_t dump, void *data)
+{
+    int embed = flags & JSON_EMBED;
+
+    flags &= ~JSON_EMBED;
+
+    if(!json)
+        return -1;
+
+    switch(json_typeof(json)) {
+        case JSON_NULL:
+            return dump("null", 4, data);
+
+        case JSON_TRUE:
+            return dump("true", 4, data);
+
+        case JSON_FALSE:
+            return dump("false", 5, data);
+
+        case JSON_INTEGER:
+        {
+            char buffer[MAX_INTEGER_STR_LENGTH];
+            int size;
+
+            size = snprintf(buffer, MAX_INTEGER_STR_LENGTH,
+                            "%" JSON_INTEGER_FORMAT,
+                            json_integer_value(json));
+            if(size < 0 || size >= MAX_INTEGER_STR_LENGTH)
+                return -1;
+
+            return dump(buffer, size, data);
+        }
+
+        case JSON_REAL:
+        {
+            char buffer[MAX_REAL_STR_LENGTH];
+            int size;
+            double value = json_real_value(json);
+
+            size = jsonp_dtostr(buffer, MAX_REAL_STR_LENGTH, value,
+                                FLAGS_TO_PRECISION(flags));
+            if(size < 0)
+                return -1;
+
+            return dump(buffer, size, data);
+        }
+
+        case JSON_STRING:
+            return dump_string(json_string_value(json), json_string_length(json), dump, data, flags);
+
+        case JSON_ARRAY:
+        {
+            size_t n;
+            size_t i;
+            /* Space for "0x", double the sizeof a pointer for the hex and a terminator. */
+            char key[2 + (sizeof(json) * 2) + 1];
+
+            /* detect circular references */
+            if (loop_check(parents, json, key, sizeof(key)))
+                return -1;
+
+            n = json_array_size(json);
+
+            if(!embed && dump("[", 1, data))
+                return -1;
+            if(n == 0) {
+                hashtable_del(parents, key);
+                return embed ? 0 : dump("]", 1, data);
+            }
+            if(dump_indent(flags, depth + 1, 0, dump, data))
+                return -1;
+
+            for(i = 0; i < n; ++i) {
+                if(do_dump(json_array_get(json, i), flags, depth + 1,
+                           parents, dump, data))
+                    return -1;
+
+                if(i < n - 1)
+                {
+                    if(dump(",", 1, data) ||
+                       dump_indent(flags, depth + 1, 1, dump, data))
+                        return -1;
+                }
+                else
+                {
+                    if(dump_indent(flags, depth, 0, dump, data))
+                        return -1;
+                }
+            }
+
+            hashtable_del(parents, key);
+            return embed ? 0 : dump("]", 1, data);
+        }
+
+        case JSON_OBJECT:
+        {
+            void *iter;
+            const char *separator;
+            int separator_length;
+            /* Space for "0x", double the sizeof a pointer for the hex and a terminator. */
+            char key[2 + (sizeof(json) * 2) + 1];
+
+            if(flags & JSON_COMPACT) {
+                separator = ":";
+                separator_length = 1;
+            }
+            else {
+                separator = ": ";
+                separator_length = 2;
+            }
+
+            /* detect circular references */
+            if (loop_check(parents, json, key, sizeof(key)))
+                return -1;
+
+            iter = json_object_iter((json_t *)json);
+
+            if(!embed && dump("{", 1, data))
+                return -1;
+            if(!iter) {
+                hashtable_del(parents, key);
+                return embed ? 0 : dump("}", 1, data);
+            }
+            if(dump_indent(flags, depth + 1, 0, dump, data))
+                return -1;
+
+            if(flags & JSON_SORT_KEYS)
+            {
+                const char **keys;
+                size_t size, i;
+
+                size = json_object_size(json);
+                keys = jsonp_malloc(size * sizeof(const char *));
+                if(!keys)
+                    return -1;
+
+                i = 0;
+                while(iter)
+                {
+                    keys[i] = json_object_iter_key(iter);
+                    iter = json_object_iter_next((json_t *)json, iter);
+                    i++;
+                }
+                assert(i == size);
+
+                qsort(keys, size, sizeof(const char *), compare_keys);
+
+                for(i = 0; i < size; i++)
+                {
+                    const char *key;
+                    json_t *value;
+
+                    key = keys[i];
+                    value = json_object_get(json, key);
+                    assert(value);
+
+                    dump_string(key, strlen(key), dump, data, flags);
+                    if(dump(separator, separator_length, data) ||
+                       do_dump(value, flags, depth + 1, parents, dump, data))
+                    {
+                        jsonp_free(keys);
+                        return -1;
+                    }
+
+                    if(i < size - 1)
+                    {
+                        if(dump(",", 1, data) ||
+                           dump_indent(flags, depth + 1, 1, dump, data))
+                        {
+                            jsonp_free(keys);
+                            return -1;
+                        }
+                    }
+                    else
+                    {
+                        if(dump_indent(flags, depth, 0, dump, data))
+                        {
+                            jsonp_free(keys);
+                            return -1;
+                        }
+                    }
+                }
+
+                jsonp_free(keys);
+            }
+            else
+            {
+                /* Don't sort keys */
+
+                while(iter)
+                {
+                    void *next = json_object_iter_next((json_t *)json, iter);
+                    const char *key = json_object_iter_key(iter);
+
+                    dump_string(key, strlen(key), dump, data, flags);
+                    if(dump(separator, separator_length, data) ||
+                       do_dump(json_object_iter_value(iter), flags, depth + 1,
+                               parents, dump, data))
+                        return -1;
+
+                    if(next)
+                    {
+                        if(dump(",", 1, data) ||
+                           dump_indent(flags, depth + 1, 1, dump, data))
+                            return -1;
+                    }
+                    else
+                    {
+                        if(dump_indent(flags, depth, 0, dump, data))
+                            return -1;
+                    }
+
+                    iter = next;
+                }
+            }
+
+            hashtable_del(parents, key);
+            return embed ? 0 : dump("}", 1, data);
+        }
+
+        default:
+            /* not reached */
+            return -1;
+    }
+}
+
+char *json_dumps(const json_t *json, size_t flags)
+{
+    strbuffer_t strbuff;
+    char *result;
+
+    if(strbuffer_init(&strbuff))
+        return NULL;
+
+    if(json_dump_callback(json, dump_to_strbuffer, (void *)&strbuff, flags))
+        result = NULL;
+    else
+        result = jsonp_strdup(strbuffer_value(&strbuff));
+
+    strbuffer_close(&strbuff);
+    return result;
+}
+
+size_t json_dumpb(const json_t *json, char *buffer, size_t size, size_t flags)
+{
+    struct buffer buf = { size, 0, buffer };
+
+    if(json_dump_callback(json, dump_to_buffer, (void *)&buf, flags))
+        return 0;
+
+    return buf.used;
+}
+
+int json_dumpf(const json_t *json, FILE *output, size_t flags)
+{
+    return json_dump_callback(json, dump_to_file, (void *)output, flags);
+}
+
+int json_dumpfd(const json_t *json, int output, size_t flags)
+{
+    return json_dump_callback(json, dump_to_fd, (void *)&output, flags);
+}
+
+int json_dump_file(const json_t *json, const char *path, size_t flags)
+{
+    int result;
+
+    FILE *output = fopen(path, "w");
+    if(!output)
+        return -1;
+
+    result = json_dumpf(json, output, flags);
+
+    if(fclose(output) != 0)
+        return -1;
+
+    return result;
+}
+
+int json_dump_callback(const json_t *json, json_dump_callback_t callback, void *data, size_t flags)
+{
+    int res;
+    hashtable_t parents_set;
+
+    if(!(flags & JSON_ENCODE_ANY)) {
+        if(!json_is_array(json) && !json_is_object(json))
+           return -1;
+    }
+
+    if (hashtable_init(&parents_set))
+        return -1;
+    res = do_dump(json, flags, 0, &parents_set, callback, data);
+    hashtable_close(&parents_set);
+
+    return res;
+}
diff --git a/client/jansson/error.c b/client/jansson/error.c
new file mode 100644
index 000000000..b94b3a3a1
--- /dev/null
+++ b/client/jansson/error.c
@@ -0,0 +1,66 @@
+#include <string.h>
+#include "jansson_private.h"
+
+void jsonp_error_init(json_error_t *error, const char *source)
+{
+    if(error)
+    {
+        error->text[0] = '\0';
+        error->line = -1;
+        error->column = -1;
+        error->position = 0;
+        if(source)
+            jsonp_error_set_source(error, source);
+        else
+            error->source[0] = '\0';
+    }
+}
+
+void jsonp_error_set_source(json_error_t *error, const char *source)
+{
+    size_t length;
+
+    if(!error || !source)
+        return;
+
+    length = strlen(source);
+    if(length < JSON_ERROR_SOURCE_LENGTH)
+        strncpy(error->source, source, JSON_ERROR_SOURCE_LENGTH);
+    else {
+        size_t extra = length - JSON_ERROR_SOURCE_LENGTH + 4;
+        memcpy(error->source, "...", 3);
+        strncpy(error->source + 3, source + extra, length - extra + 1);
+    }
+}
+
+void jsonp_error_set(json_error_t *error, int line, int column,
+                     size_t position, enum json_error_code code,
+                     const char *msg, ...)
+{
+    va_list ap;
+
+    va_start(ap, msg);
+    jsonp_error_vset(error, line, column, position, code, msg, ap);
+    va_end(ap);
+}
+
+void jsonp_error_vset(json_error_t *error, int line, int column,
+                      size_t position, enum json_error_code code,
+                      const char *msg, va_list ap)
+{
+    if(!error)
+        return;
+
+    if(error->text[0] != '\0') {
+        /* error already set */
+        return;
+    }
+
+    error->line = line;
+    error->column = column;
+    error->position = (int)position;
+
+    vsnprintf(error->text, JSON_ERROR_TEXT_LENGTH - 1, msg, ap);
+    error->text[JSON_ERROR_TEXT_LENGTH - 2] = '\0';
+    error->text[JSON_ERROR_TEXT_LENGTH - 1] = code;
+}
diff --git a/client/jansson/hashtable.c b/client/jansson/hashtable.c
new file mode 100644
index 000000000..c819319a7
--- /dev/null
+++ b/client/jansson/hashtable.c
@@ -0,0 +1,356 @@
+/*
+ * Copyright (c) 2009-2016 Petri Lehtinen <petri@digip.org>
+ *
+ * This library is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#if HAVE_CONFIG_H
+#include <jansson_private_config.h>
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+
+#if HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
+#include <jansson_config.h>   /* for JSON_INLINE */
+#include "jansson_private.h"  /* for container_of() */
+#include "hashtable.h"
+
+#ifndef INITIAL_HASHTABLE_ORDER
+#define INITIAL_HASHTABLE_ORDER 3
+#endif
+
+typedef struct hashtable_list list_t;
+typedef struct hashtable_pair pair_t;
+typedef struct hashtable_bucket bucket_t;
+
+extern volatile uint32_t hashtable_seed;
+
+/* Implementation of the hash function */
+#include "lookup3.h"
+
+#define list_to_pair(list_)  container_of(list_, pair_t, list)
+#define ordered_list_to_pair(list_)  container_of(list_, pair_t, ordered_list)
+#define hash_str(key)        ((size_t)hashlittle((key), strlen(key), hashtable_seed))
+
+static JSON_INLINE void list_init(list_t *list)
+{
+    list->next = list;
+    list->prev = list;
+}
+
+static JSON_INLINE void list_insert(list_t *list, list_t *node)
+{
+    node->next = list;
+    node->prev = list->prev;
+    list->prev->next = node;
+    list->prev = node;
+}
+
+static JSON_INLINE void list_remove(list_t *list)
+{
+    list->prev->next = list->next;
+    list->next->prev = list->prev;
+}
+
+static JSON_INLINE int bucket_is_empty(hashtable_t *hashtable, bucket_t *bucket)
+{
+    return bucket->first == &hashtable->list && bucket->first == bucket->last;
+}
+
+static void insert_to_bucket(hashtable_t *hashtable, bucket_t *bucket,
+                             list_t *list)
+{
+    if(bucket_is_empty(hashtable, bucket))
+    {
+        list_insert(&hashtable->list, list);
+        bucket->first = bucket->last = list;
+    }
+    else
+    {
+        list_insert(bucket->first, list);
+        bucket->first = list;
+    }
+}
+
+static pair_t *hashtable_find_pair(hashtable_t *hashtable, bucket_t *bucket,
+                                   const char *key, size_t hash)
+{
+    list_t *list;
+    pair_t *pair;
+
+    if(bucket_is_empty(hashtable, bucket))
+        return NULL;
+
+    list = bucket->first;
+    while(1)
+    {
+        pair = list_to_pair(list);
+        if(pair->hash == hash && strcmp(pair->key, key) == 0)
+            return pair;
+
+        if(list == bucket->last)
+            break;
+
+        list = list->next;
+    }
+
+    return NULL;
+}
+
+/* returns 0 on success, -1 if key was not found */
+static int hashtable_do_del(hashtable_t *hashtable,
+                            const char *key, size_t hash)
+{
+    pair_t *pair;
+    bucket_t *bucket;
+    size_t index;
+
+    index = hash & hashmask(hashtable->order);
+    bucket = &hashtable->buckets[index];
+
+    pair = hashtable_find_pair(hashtable, bucket, key, hash);
+    if(!pair)
+        return -1;
+
+    if(&pair->list == bucket->first && &pair->list == bucket->last)
+        bucket->first = bucket->last = &hashtable->list;
+
+    else if(&pair->list == bucket->first)
+        bucket->first = pair->list.next;
+
+    else if(&pair->list == bucket->last)
+        bucket->last = pair->list.prev;
+
+    list_remove(&pair->list);
+    list_remove(&pair->ordered_list);
+    json_decref(pair->value);
+
+    jsonp_free(pair);
+    hashtable->size--;
+
+    return 0;
+}
+
+static void hashtable_do_clear(hashtable_t *hashtable)
+{
+    list_t *list, *next;
+    pair_t *pair;
+
+    for(list = hashtable->list.next; list != &hashtable->list; list = next)
+    {
+        next = list->next;
+        pair = list_to_pair(list);
+        json_decref(pair->value);
+        jsonp_free(pair);
+    }
+}
+
+static int hashtable_do_rehash(hashtable_t *hashtable)
+{
+    list_t *list, *next;
+    pair_t *pair;
+    size_t i, index, new_size, new_order;
+    struct hashtable_bucket *new_buckets;
+
+    new_order = hashtable->order + 1;
+    new_size = hashsize(new_order);
+
+    new_buckets = jsonp_malloc(new_size * sizeof(bucket_t));
+    if(!new_buckets)
+        return -1;
+
+    jsonp_free(hashtable->buckets);
+    hashtable->buckets = new_buckets;
+    hashtable->order = new_order;
+
+    for(i = 0; i < hashsize(hashtable->order); i++)
+    {
+        hashtable->buckets[i].first = hashtable->buckets[i].last =
+            &hashtable->list;
+    }
+
+    list = hashtable->list.next;
+    list_init(&hashtable->list);
+
+    for(; list != &hashtable->list; list = next) {
+        next = list->next;
+        pair = list_to_pair(list);
+        index = pair->hash % new_size;
+        insert_to_bucket(hashtable, &hashtable->buckets[index], &pair->list);
+    }
+
+    return 0;
+}
+
+
+int hashtable_init(hashtable_t *hashtable)
+{
+    size_t i;
+
+    hashtable->size = 0;
+    hashtable->order = INITIAL_HASHTABLE_ORDER;
+    hashtable->buckets = jsonp_malloc(hashsize(hashtable->order) * sizeof(bucket_t));
+    if(!hashtable->buckets)
+        return -1;
+
+    list_init(&hashtable->list);
+    list_init(&hashtable->ordered_list);
+
+    for(i = 0; i < hashsize(hashtable->order); i++)
+    {
+        hashtable->buckets[i].first = hashtable->buckets[i].last =
+            &hashtable->list;
+    }
+
+    return 0;
+}
+
+void hashtable_close(hashtable_t *hashtable)
+{
+    hashtable_do_clear(hashtable);
+    jsonp_free(hashtable->buckets);
+}
+
+int hashtable_set(hashtable_t *hashtable, const char *key, json_t *value)
+{
+    pair_t *pair;
+    bucket_t *bucket;
+    size_t hash, index;
+
+    /* rehash if the load ratio exceeds 1 */
+    if(hashtable->size >= hashsize(hashtable->order))
+        if(hashtable_do_rehash(hashtable))
+            return -1;
+
+    hash = hash_str(key);
+    index = hash & hashmask(hashtable->order);
+    bucket = &hashtable->buckets[index];
+    pair = hashtable_find_pair(hashtable, bucket, key, hash);
+
+    if(pair)
+    {
+        json_decref(pair->value);
+        pair->value = value;
+    }
+    else
+    {
+        /* offsetof(...) returns the size of pair_t without the last,
+           flexible member. This way, the correct amount is
+           allocated. */
+
+        size_t len = strlen(key);
+        if(len >= (size_t)-1 - offsetof(pair_t, key)) {
+            /* Avoid an overflow if the key is very long */
+            return -1;
+        }
+
+        pair = jsonp_malloc(offsetof(pair_t, key) + len + 1);
+        if(!pair)
+            return -1;
+
+        pair->hash = hash;
+        strncpy(pair->key, key, len + 1);
+        pair->value = value;
+        list_init(&pair->list);
+        list_init(&pair->ordered_list);
+
+        insert_to_bucket(hashtable, bucket, &pair->list);
+        list_insert(&hashtable->ordered_list, &pair->ordered_list);
+
+        hashtable->size++;
+    }
+    return 0;
+}
+
+void *hashtable_get(hashtable_t *hashtable, const char *key)
+{
+    pair_t *pair;
+    size_t hash;
+    bucket_t *bucket;
+
+    hash = hash_str(key);
+    bucket = &hashtable->buckets[hash & hashmask(hashtable->order)];
+
+    pair = hashtable_find_pair(hashtable, bucket, key, hash);
+    if(!pair)
+        return NULL;
+
+    return pair->value;
+}
+
+int hashtable_del(hashtable_t *hashtable, const char *key)
+{
+    size_t hash = hash_str(key);
+    return hashtable_do_del(hashtable, key, hash);
+}
+
+void hashtable_clear(hashtable_t *hashtable)
+{
+    size_t i;
+
+    hashtable_do_clear(hashtable);
+
+    for(i = 0; i < hashsize(hashtable->order); i++)
+    {
+        hashtable->buckets[i].first = hashtable->buckets[i].last =
+            &hashtable->list;
+    }
+
+    list_init(&hashtable->list);
+    list_init(&hashtable->ordered_list);
+    hashtable->size = 0;
+}
+
+void *hashtable_iter(hashtable_t *hashtable)
+{
+    return hashtable_iter_next(hashtable, &hashtable->ordered_list);
+}
+
+void *hashtable_iter_at(hashtable_t *hashtable, const char *key)
+{
+    pair_t *pair;
+    size_t hash;
+    bucket_t *bucket;
+
+    hash = hash_str(key);
+    bucket = &hashtable->buckets[hash & hashmask(hashtable->order)];
+
+    pair = hashtable_find_pair(hashtable, bucket, key, hash);
+    if(!pair)
+        return NULL;
+
+    return &pair->ordered_list;
+}
+
+void *hashtable_iter_next(hashtable_t *hashtable, void *iter)
+{
+    list_t *list = (list_t *)iter;
+    if(list->next == &hashtable->ordered_list)
+        return NULL;
+    return list->next;
+}
+
+void *hashtable_iter_key(void *iter)
+{
+    pair_t *pair = ordered_list_to_pair((list_t *)iter);
+    return pair->key;
+}
+
+void *hashtable_iter_value(void *iter)
+{
+    pair_t *pair = ordered_list_to_pair((list_t *)iter);
+    return pair->value;
+}
+
+void hashtable_iter_set(void *iter, json_t *value)
+{
+    pair_t *pair = ordered_list_to_pair((list_t *)iter);
+
+    json_decref(pair->value);
+    pair->value = value;
+}
diff --git a/client/jansson/hashtable_seed.c b/client/jansson/hashtable_seed.c
new file mode 100644
index 000000000..8aed54068
--- /dev/null
+++ b/client/jansson/hashtable_seed.c
@@ -0,0 +1,277 @@
+/* Generate sizeof(uint32_t) bytes of as random data as possible to seed
+   the hash function.
+*/
+
+#ifdef HAVE_CONFIG_H
+#include <jansson_private_config.h>
+#endif
+
+#include <stdio.h>
+#include <time.h>
+
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+
+#ifdef HAVE_SCHED_H
+#include <sched.h>
+#endif
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#if defined(_WIN32)
+/* For GetModuleHandle(), GetProcAddress() and GetCurrentProcessId() */
+#include <windows.h>
+#endif
+
+#include "jansson.h"
+
+
+static uint32_t buf_to_uint32(char *data) {
+    size_t i;
+    uint32_t result = 0;
+
+    for (i = 0; i < sizeof(uint32_t); i++)
+        result = (result << 8) | (unsigned char)data[i];
+
+    return result;
+}
+
+
+
+/* /dev/urandom */
+#if !defined(_WIN32) && defined(USE_URANDOM)
+static int seed_from_urandom(uint32_t *seed) {
+    /* Use unbuffered I/O if we have open(), close() and read(). Otherwise
+       fall back to fopen() */
+
+    char data[sizeof(uint32_t)];
+    int ok;
+
+#if defined(HAVE_OPEN) && defined(HAVE_CLOSE) && defined(HAVE_READ)
+    int urandom;
+    urandom = open("/dev/urandom", O_RDONLY);
+    if (urandom == -1)
+        return 1;
+
+    ok = read(urandom, data, sizeof(uint32_t)) == sizeof(uint32_t);
+    close(urandom);
+#else
+    FILE *urandom;
+
+    urandom = fopen("/dev/urandom", "rb");
+    if (!urandom)
+        return 1;
+
+    ok = fread(data, 1, sizeof(uint32_t), urandom) == sizeof(uint32_t);
+    fclose(urandom);
+#endif
+
+    if (!ok)
+        return 1;
+
+    *seed = buf_to_uint32(data);
+    return 0;
+}
+#endif
+
+/* Windows Crypto API */
+#if defined(_WIN32) && defined(USE_WINDOWS_CRYPTOAPI)
+#include <wincrypt.h>
+
+typedef BOOL (WINAPI *CRYPTACQUIRECONTEXTA)(HCRYPTPROV *phProv, LPCSTR pszContainer, LPCSTR pszProvider, DWORD dwProvType, DWORD dwFlags);
+typedef BOOL (WINAPI *CRYPTGENRANDOM)(HCRYPTPROV hProv, DWORD dwLen, BYTE *pbBuffer);
+typedef BOOL (WINAPI *CRYPTRELEASECONTEXT)(HCRYPTPROV hProv, DWORD dwFlags);
+
+static int seed_from_windows_cryptoapi(uint32_t *seed)
+{
+    HINSTANCE hAdvAPI32 = NULL;
+    CRYPTACQUIRECONTEXTA pCryptAcquireContext = NULL;
+    CRYPTGENRANDOM pCryptGenRandom = NULL;
+    CRYPTRELEASECONTEXT pCryptReleaseContext = NULL;
+    HCRYPTPROV hCryptProv = 0;
+    BYTE data[sizeof(uint32_t)];
+    int ok;
+
+    hAdvAPI32 = GetModuleHandle(TEXT("advapi32.dll"));
+    if(hAdvAPI32 == NULL)
+        return 1;
+
+    pCryptAcquireContext = (CRYPTACQUIRECONTEXTA)GetProcAddress(hAdvAPI32, "CryptAcquireContextA");
+    if (!pCryptAcquireContext)
+        return 1;
+
+    pCryptGenRandom = (CRYPTGENRANDOM)GetProcAddress(hAdvAPI32, "CryptGenRandom");
+    if (!pCryptGenRandom)
+        return 1;
+
+    pCryptReleaseContext = (CRYPTRELEASECONTEXT)GetProcAddress(hAdvAPI32, "CryptReleaseContext");
+    if (!pCryptReleaseContext)
+        return 1;
+
+    if (!pCryptAcquireContext(&hCryptProv, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT))
+        return 1;
+
+    ok = pCryptGenRandom(hCryptProv, sizeof(uint32_t), data);
+    pCryptReleaseContext(hCryptProv, 0);
+
+    if (!ok)
+        return 1;
+
+    *seed = buf_to_uint32((char *)data);
+    return 0;
+}
+#endif
+
+/* gettimeofday() and getpid() */
+static int seed_from_timestamp_and_pid(uint32_t *seed) {
+#ifdef HAVE_GETTIMEOFDAY
+    /* XOR of seconds and microseconds */
+    struct timeval tv;
+    gettimeofday(&tv, NULL);
+    *seed = (uint32_t)tv.tv_sec ^ (uint32_t)tv.tv_usec;
+#else
+    /* Seconds only */
+    *seed = (uint32_t)time(NULL);
+#endif
+
+    /* XOR with PID for more randomness */
+#if defined(_WIN32)
+    *seed ^= (uint32_t)GetCurrentProcessId();
+#elif defined(HAVE_GETPID)
+    *seed ^= (uint32_t)getpid();
+#endif
+
+    return 0;
+}
+
+static uint32_t generate_seed() {
+    uint32_t seed;
+    int done = 0;
+
+#if !defined(_WIN32) && defined(USE_URANDOM)
+    if (seed_from_urandom(&seed) == 0)
+        done = 1;
+#endif
+
+#if defined(_WIN32) && defined(USE_WINDOWS_CRYPTOAPI)
+    if (seed_from_windows_cryptoapi(&seed) == 0)
+        done = 1;
+#endif
+
+    if (!done) {
+        /* Fall back to timestamp and PID if no better randomness is
+           available */
+        seed_from_timestamp_and_pid(&seed);
+    }
+
+    /* Make sure the seed is never zero */
+    if (seed == 0)
+        seed = 1;
+
+    return seed;
+}
+
+
+volatile uint32_t hashtable_seed = 0;
+
+#if defined(HAVE_ATOMIC_BUILTINS) && (defined(HAVE_SCHED_YIELD) || !defined(_WIN32))
+static volatile char seed_initialized = 0;
+
+void json_object_seed(size_t seed) {
+    uint32_t new_seed = (uint32_t)seed;
+
+    if (hashtable_seed == 0) {
+        if (__atomic_test_and_set(&seed_initialized, __ATOMIC_RELAXED) == 0) {
+            /* Do the seeding ourselves */
+            if (new_seed == 0)
+                new_seed = generate_seed();
+
+            __atomic_store_n(&hashtable_seed, new_seed, __ATOMIC_RELEASE);
+        } else {
+            /* Wait for another thread to do the seeding */
+            do {
+#ifdef HAVE_SCHED_YIELD
+                sched_yield();
+#endif
+            } while(__atomic_load_n(&hashtable_seed, __ATOMIC_ACQUIRE) == 0);
+        }
+    }
+}
+#elif defined(HAVE_SYNC_BUILTINS) && (defined(HAVE_SCHED_YIELD) || !defined(_WIN32))
+void json_object_seed(size_t seed) {
+    uint32_t new_seed = (uint32_t)seed;
+
+    if (hashtable_seed == 0) {
+        if (new_seed == 0) {
+            /* Explicit synchronization fences are not supported by the
+               __sync builtins, so every thread getting here has to
+               generate the seed value.
+            */
+            new_seed = generate_seed();
+        }
+
+        do {
+            if (__sync_bool_compare_and_swap(&hashtable_seed, 0, new_seed)) {
+                /* We were the first to seed */
+                break;
+            } else {
+                /* Wait for another thread to do the seeding */
+#ifdef HAVE_SCHED_YIELD
+                sched_yield();
+#endif
+            }
+        } while(hashtable_seed == 0);
+    }
+}
+#elif defined(_WIN32)
+static long seed_initialized = 0;
+void json_object_seed(size_t seed) {
+    uint32_t new_seed = (uint32_t)seed;
+
+    if (hashtable_seed == 0) {
+        if (InterlockedIncrement(&seed_initialized) == 1) {
+            /* Do the seeding ourselves */
+            if (new_seed == 0)
+                new_seed = generate_seed();
+
+            hashtable_seed = new_seed;
+        } else {
+            /* Wait for another thread to do the seeding */
+            do {
+                SwitchToThread();
+            } while (hashtable_seed == 0);
+        }
+    }
+}
+#else
+/* Fall back to a thread-unsafe version */
+void json_object_seed(size_t seed) {
+    uint32_t new_seed = (uint32_t)seed;
+
+    if (hashtable_seed == 0) {
+        if (new_seed == 0)
+            new_seed = generate_seed();
+
+        hashtable_seed = new_seed;
+    }
+}
+#endif
diff --git a/client/jansson/jansson.def b/client/jansson/jansson.def
new file mode 100644
index 000000000..15f35c95e
--- /dev/null
+++ b/client/jansson/jansson.def
@@ -0,0 +1,75 @@
+EXPORTS
+    json_delete
+    json_true
+    json_false
+    json_null
+    json_sprintf
+    json_vsprintf
+    json_string
+    json_stringn
+    json_string_nocheck
+    json_stringn_nocheck
+    json_string_value
+    json_string_length
+    json_string_set
+    json_string_setn
+    json_string_set_nocheck
+    json_string_setn_nocheck
+    json_integer
+    json_integer_value
+    json_integer_set
+    json_real
+    json_real_value
+    json_real_set
+    json_number_value
+    json_array
+    json_array_size
+    json_array_get
+    json_array_set_new
+    json_array_append_new
+    json_array_insert_new
+    json_array_remove
+    json_array_clear
+    json_array_extend
+    json_object
+    json_object_size
+    json_object_get
+    json_object_set_new
+    json_object_set_new_nocheck
+    json_object_del
+    json_object_clear
+    json_object_update
+    json_object_update_existing
+    json_object_update_missing
+    json_object_iter
+    json_object_iter_at
+    json_object_iter_next
+    json_object_iter_key
+    json_object_iter_value
+    json_object_iter_set_new
+    json_object_key_to_iter
+    json_object_seed
+    json_dumps
+    json_dumpb
+    json_dumpf
+    json_dumpfd
+    json_dump_file
+    json_dump_callback
+    json_loads
+    json_loadb
+    json_loadf
+    json_loadfd
+    json_load_file
+    json_load_callback
+    json_equal
+    json_copy
+    json_deep_copy
+    json_pack
+    json_pack_ex
+    json_vpack_ex
+    json_unpack
+    json_unpack_ex
+    json_vunpack_ex
+    json_set_alloc_funcs
+    json_get_alloc_funcs
+
diff --git a/client/jansson/jansson.h b/client/jansson/jansson.h
new file mode 100644
index 000000000..86f23d17e
--- /dev/null
+++ b/client/jansson/jansson.h
@@ -0,0 +1,372 @@
+/*
+ * Copyright (c) 2009-2016 Petri Lehtinen <petri@digip.org>
+ *
+ * Jansson is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#ifndef JANSSON_H
+#define JANSSON_H
+
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>  /* for size_t */
+#include <stdarg.h>
+
+#include "jansson_config.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* version */
+
+#define JANSSON_MAJOR_VERSION  2
+#define JANSSON_MINOR_VERSION  11
+#define JANSSON_MICRO_VERSION  0
+
+/* Micro version is omitted if it's 0 */
+#define JANSSON_VERSION  "2.11"
+
+/* Version as a 3-byte hex number, e.g. 0x010201 == 1.2.1. Use this
+   for numeric comparisons, e.g. #if JANSSON_VERSION_HEX >= ... */
+#define JANSSON_VERSION_HEX  ((JANSSON_MAJOR_VERSION << 16) |   \
+                              (JANSSON_MINOR_VERSION << 8)  |   \
+                              (JANSSON_MICRO_VERSION << 0))
+
+/* If __atomic or __sync builtins are available the library is thread
+ * safe for all read-only functions plus reference counting. */
+#if JSON_HAVE_ATOMIC_BUILTINS || JSON_HAVE_SYNC_BUILTINS
+#define JANSSON_THREAD_SAFE_REFCOUNT 1
+#endif
+
+/* types */
+
+typedef enum {
+    JSON_OBJECT,
+    JSON_ARRAY,
+    JSON_STRING,
+    JSON_INTEGER,
+    JSON_REAL,
+    JSON_TRUE,
+    JSON_FALSE,
+    JSON_NULL
+} json_type;
+
+typedef struct json_t {
+    json_type type;
+    volatile size_t refcount;
+} json_t;
+
+#ifndef JANSSON_USING_CMAKE /* disabled if using cmake */
+#if JSON_INTEGER_IS_LONG_LONG
+#ifdef _WIN32
+#define JSON_INTEGER_FORMAT "I64d"
+#else
+#define JSON_INTEGER_FORMAT "lld"
+#endif
+typedef long long json_int_t;
+#else
+#define JSON_INTEGER_FORMAT "ld"
+typedef long json_int_t;
+#endif /* JSON_INTEGER_IS_LONG_LONG */
+#endif
+
+#define json_typeof(json)      ((json)->type)
+#define json_is_object(json)   ((json) && json_typeof(json) == JSON_OBJECT)
+#define json_is_array(json)    ((json) && json_typeof(json) == JSON_ARRAY)
+#define json_is_string(json)   ((json) && json_typeof(json) == JSON_STRING)
+#define json_is_integer(json)  ((json) && json_typeof(json) == JSON_INTEGER)
+#define json_is_real(json)     ((json) && json_typeof(json) == JSON_REAL)
+#define json_is_number(json)   (json_is_integer(json) || json_is_real(json))
+#define json_is_true(json)     ((json) && json_typeof(json) == JSON_TRUE)
+#define json_is_false(json)    ((json) && json_typeof(json) == JSON_FALSE)
+#define json_boolean_value     json_is_true
+#define json_is_boolean(json)  (json_is_true(json) || json_is_false(json))
+#define json_is_null(json)     ((json) && json_typeof(json) == JSON_NULL)
+
+/* construction, destruction, reference counting */
+
+json_t *json_object(void);
+json_t *json_array(void);
+json_t *json_string(const char *value);
+json_t *json_stringn(const char *value, size_t len);
+json_t *json_string_nocheck(const char *value);
+json_t *json_stringn_nocheck(const char *value, size_t len);
+json_t *json_integer(json_int_t value);
+json_t *json_real(double value);
+json_t *json_true(void);
+json_t *json_false(void);
+#define json_boolean(val)      ((val) ? json_true() : json_false())
+json_t *json_null(void);
+
+/* do not call JSON_INTERNAL_INCREF or JSON_INTERNAL_DECREF directly */
+#if JSON_HAVE_ATOMIC_BUILTINS
+#define JSON_INTERNAL_INCREF(json) __atomic_add_fetch(&json->refcount, 1, __ATOMIC_ACQUIRE)
+#define JSON_INTERNAL_DECREF(json) __atomic_sub_fetch(&json->refcount, 1, __ATOMIC_RELEASE)
+#elif JSON_HAVE_SYNC_BUILTINS
+#define JSON_INTERNAL_INCREF(json) __sync_add_and_fetch(&json->refcount, 1)
+#define JSON_INTERNAL_DECREF(json) __sync_sub_and_fetch(&json->refcount, 1)
+#else
+#define JSON_INTERNAL_INCREF(json) (++json->refcount)
+#define JSON_INTERNAL_DECREF(json) (--json->refcount)
+#endif
+
+static JSON_INLINE
+json_t *json_incref(json_t *json)
+{
+    if(json && json->refcount != (size_t)-1)
+        JSON_INTERNAL_INCREF(json);
+    return json;
+}
+
+/* do not call json_delete directly */
+void json_delete(json_t *json);
+
+static JSON_INLINE
+void json_decref(json_t *json)
+{
+    if(json && json->refcount != (size_t)-1 && JSON_INTERNAL_DECREF(json) == 0)
+        json_delete(json);
+}
+
+#if defined(__GNUC__) || defined(__clang__)
+static JSON_INLINE
+void json_decrefp(json_t **json)
+{
+    if(json) {
+        json_decref(*json);
+	*json = NULL;
+    }
+}
+
+#define json_auto_t json_t __attribute__((cleanup(json_decrefp)))
+#endif
+
+
+/* error reporting */
+
+#define JSON_ERROR_TEXT_LENGTH    160
+#define JSON_ERROR_SOURCE_LENGTH   80
+
+typedef struct json_error_t {
+    int line;
+    int column;
+    int position;
+    char source[JSON_ERROR_SOURCE_LENGTH];
+    char text[JSON_ERROR_TEXT_LENGTH];
+} json_error_t;
+
+enum json_error_code {
+    json_error_unknown,
+    json_error_out_of_memory,
+    json_error_stack_overflow,
+    json_error_cannot_open_file,
+    json_error_invalid_argument,
+    json_error_invalid_utf8,
+    json_error_premature_end_of_input,
+    json_error_end_of_input_expected,
+    json_error_invalid_syntax,
+    json_error_invalid_format,
+    json_error_wrong_type,
+    json_error_null_character,
+    json_error_null_value,
+    json_error_null_byte_in_key,
+    json_error_duplicate_key,
+    json_error_numeric_overflow,
+    json_error_item_not_found,
+    json_error_index_out_of_range
+};
+
+static JSON_INLINE enum json_error_code json_error_code(const json_error_t *e) {
+    return (enum json_error_code)e->text[JSON_ERROR_TEXT_LENGTH - 1];
+}
+
+/* getters, setters, manipulation */
+
+void json_object_seed(size_t seed);
+size_t json_object_size(const json_t *object);
+json_t *json_object_get(const json_t *object, const char *key);
+int json_object_set_new(json_t *object, const char *key, json_t *value);
+int json_object_set_new_nocheck(json_t *object, const char *key, json_t *value);
+int json_object_del(json_t *object, const char *key);
+int json_object_clear(json_t *object);
+int json_object_update(json_t *object, json_t *other);
+int json_object_update_existing(json_t *object, json_t *other);
+int json_object_update_missing(json_t *object, json_t *other);
+void *json_object_iter(json_t *object);
+void *json_object_iter_at(json_t *object, const char *key);
+void *json_object_key_to_iter(const char *key);
+void *json_object_iter_next(json_t *object, void *iter);
+const char *json_object_iter_key(void *iter);
+json_t *json_object_iter_value(void *iter);
+int json_object_iter_set_new(json_t *object, void *iter, json_t *value);
+
+#define json_object_foreach(object, key, value) \
+    for(key = json_object_iter_key(json_object_iter(object)); \
+        key && (value = json_object_iter_value(json_object_key_to_iter(key))); \
+        key = json_object_iter_key(json_object_iter_next(object, json_object_key_to_iter(key))))
+
+#define json_object_foreach_safe(object, n, key, value)     \
+    for(key = json_object_iter_key(json_object_iter(object)), \
+            n = json_object_iter_next(object, json_object_key_to_iter(key)); \
+        key && (value = json_object_iter_value(json_object_key_to_iter(key))); \
+        key = json_object_iter_key(n), \
+            n = json_object_iter_next(object, json_object_key_to_iter(key)))
+
+#define json_array_foreach(array, index, value) \
+	for(index = 0; \
+		index < json_array_size(array) && (value = json_array_get(array, index)); \
+		index++)
+
+static JSON_INLINE
+int json_object_set(json_t *object, const char *key, json_t *value)
+{
+    return json_object_set_new(object, key, json_incref(value));
+}
+
+static JSON_INLINE
+int json_object_set_nocheck(json_t *object, const char *key, json_t *value)
+{
+    return json_object_set_new_nocheck(object, key, json_incref(value));
+}
+
+static JSON_INLINE
+int json_object_iter_set(json_t *object, void *iter, json_t *value)
+{
+    return json_object_iter_set_new(object, iter, json_incref(value));
+}
+
+size_t json_array_size(const json_t *array);
+json_t *json_array_get(const json_t *array, size_t index);
+int json_array_set_new(json_t *array, size_t index, json_t *value);
+int json_array_append_new(json_t *array, json_t *value);
+int json_array_insert_new(json_t *array, size_t index, json_t *value);
+int json_array_remove(json_t *array, size_t index);
+int json_array_clear(json_t *array);
+int json_array_extend(json_t *array, json_t *other);
+
+static JSON_INLINE
+int json_array_set(json_t *array, size_t ind, json_t *value)
+{
+    return json_array_set_new(array, ind, json_incref(value));
+}
+
+static JSON_INLINE
+int json_array_append(json_t *array, json_t *value)
+{
+    return json_array_append_new(array, json_incref(value));
+}
+
+static JSON_INLINE
+int json_array_insert(json_t *array, size_t ind, json_t *value)
+{
+    return json_array_insert_new(array, ind, json_incref(value));
+}
+
+const char *json_string_value(const json_t *string);
+size_t json_string_length(const json_t *string);
+json_int_t json_integer_value(const json_t *integer);
+double json_real_value(const json_t *real);
+double json_number_value(const json_t *json);
+
+int json_string_set(json_t *string, const char *value);
+int json_string_setn(json_t *string, const char *value, size_t len);
+int json_string_set_nocheck(json_t *string, const char *value);
+int json_string_setn_nocheck(json_t *string, const char *value, size_t len);
+int json_integer_set(json_t *integer, json_int_t value);
+int json_real_set(json_t *real, double value);
+
+/* pack, unpack */
+
+json_t *json_pack(const char *fmt, ...);
+json_t *json_pack_ex(json_error_t *error, size_t flags, const char *fmt, ...);
+json_t *json_vpack_ex(json_error_t *error, size_t flags, const char *fmt, va_list ap);
+
+#define JSON_VALIDATE_ONLY  0x1
+#define JSON_STRICT         0x2
+
+int json_unpack(json_t *root, const char *fmt, ...);
+int json_unpack_ex(json_t *root, json_error_t *error, size_t flags, const char *fmt, ...);
+int json_vunpack_ex(json_t *root, json_error_t *error, size_t flags, const char *fmt, va_list ap);
+
+/* sprintf */
+
+json_t *json_sprintf(const char *fmt, ...);
+json_t *json_vsprintf(const char *fmt, va_list ap);
+
+
+/* equality */
+
+int json_equal(const json_t *value1, const json_t *value2);
+
+
+/* copying */
+
+json_t *json_copy(json_t *value);
+json_t *json_deep_copy(const json_t *value);
+
+/* path */
+
+json_t *json_path_get(const json_t *json, const char *path);
+int json_path_set_new(json_t *json, const char *path, json_t *value, size_t flags, json_error_t *error);
+
+static JSON_INLINE
+int json_path_set(json_t *json, const char *path, json_t *value, size_t flags, json_error_t *error)
+{
+    return json_path_set_new(json, path, json_incref(value), flags, error);
+}
+
+/* decoding */
+
+#define JSON_REJECT_DUPLICATES  0x1
+#define JSON_DISABLE_EOF_CHECK  0x2
+#define JSON_DECODE_ANY         0x4
+#define JSON_DECODE_INT_AS_REAL 0x8
+#define JSON_ALLOW_NUL          0x10
+
+typedef size_t (*json_load_callback_t)(void *buffer, size_t buflen, void *data);
+
+json_t *json_loads(const char *input, size_t flags, json_error_t *error);
+json_t *json_loadb(const char *buffer, size_t buflen, size_t flags, json_error_t *error);
+json_t *json_loadf(FILE *input, size_t flags, json_error_t *error);
+json_t *json_loadfd(int input, size_t flags, json_error_t *error);
+json_t *json_load_file(const char *path, size_t flags, json_error_t *error);
+json_t *json_load_callback(json_load_callback_t callback, void *data, size_t flags, json_error_t *error);
+
+
+/* encoding */
+
+#define JSON_MAX_INDENT         0x1F
+#define JSON_INDENT(n)          ((n) & JSON_MAX_INDENT)
+#define JSON_COMPACT            0x20
+#define JSON_ENSURE_ASCII       0x40
+#define JSON_SORT_KEYS          0x80
+#define JSON_PRESERVE_ORDER     0x100
+#define JSON_ENCODE_ANY         0x200
+#define JSON_ESCAPE_SLASH       0x400
+#define JSON_REAL_PRECISION(n)  (((n) & 0x1F) << 11)
+#define JSON_EMBED              0x10000
+
+typedef int (*json_dump_callback_t)(const char *buffer, size_t size, void *data);
+
+char *json_dumps(const json_t *json, size_t flags);
+size_t json_dumpb(const json_t *json, char *buffer, size_t size, size_t flags);
+int json_dumpf(const json_t *json, FILE *output, size_t flags);
+int json_dumpfd(const json_t *json, int output, size_t flags);
+int json_dump_file(const json_t *json, const char *path, size_t flags);
+int json_dump_callback(const json_t *json, json_dump_callback_t callback, void *data, size_t flags);
+
+/* custom memory allocation */
+
+typedef void *(*json_malloc_t)(size_t);
+typedef void (*json_free_t)(void *);
+
+void json_set_alloc_funcs(json_malloc_t malloc_fn, json_free_t free_fn);
+void json_get_alloc_funcs(json_malloc_t *malloc_fn, json_free_t *free_fn);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/client/jansson/jansson_config.h b/client/jansson/jansson_config.h
new file mode 100644
index 000000000..b34baa551
--- /dev/null
+++ b/client/jansson/jansson_config.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2010-2016 Petri Lehtinen <petri@digip.org>
+ *
+ * Jansson is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ *
+ *
+ * This file specifies a part of the site-specific configuration for
+ * Jansson, namely those things that affect the public API in
+ * jansson.h.
+ *
+ * The configure script copies this file to jansson_config.h and
+ * replaces @var@ substitutions by values that fit your system. If you
+ * cannot run the configure script, you can do the value substitution
+ * by hand.
+ */
+
+#ifndef JANSSON_CONFIG_H
+#define JANSSON_CONFIG_H
+
+/* If your compiler supports the inline keyword in C, JSON_INLINE is
+   defined to `inline', otherwise empty. In C++, the inline is always
+   supported. */
+#ifdef __cplusplus
+#define JSON_INLINE inline
+#else
+#define JSON_INLINE inline
+#endif
+
+/* If your compiler supports the `long long` type and the strtoll()
+   library function, JSON_INTEGER_IS_LONG_LONG is defined to 1,
+   otherwise to 0. */
+#define JSON_INTEGER_IS_LONG_LONG 1
+
+/* If locale.h and localeconv() are available, define to 1,
+   otherwise to 0. */
+#define JSON_HAVE_LOCALECONV 1
+
+/* If __atomic builtins are available they will be used to manage
+   reference counts of json_t. */
+#define JSON_HAVE_ATOMIC_BUILTINS 1
+
+/* If __atomic builtins are not available we try using __sync builtins
+   to manage reference counts of json_t. */
+#define JSON_HAVE_SYNC_BUILTINS 1
+
+/* Maximum recursion depth for parsing JSON input.
+   This limits the depth of e.g. array-within-array constructions. */
+#define JSON_PARSER_MAX_DEPTH 2048
+
+#endif
diff --git a/client/jansson/jansson_config.h.in b/client/jansson/jansson_config.h.in
new file mode 100644
index 000000000..fe692ab4f
--- /dev/null
+++ b/client/jansson/jansson_config.h.in
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2010-2016 Petri Lehtinen <petri@digip.org>
+ *
+ * Jansson is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ *
+ *
+ * This file specifies a part of the site-specific configuration for
+ * Jansson, namely those things that affect the public API in
+ * jansson.h.
+ *
+ * The configure script copies this file to jansson_config.h and
+ * replaces @var@ substitutions by values that fit your system. If you
+ * cannot run the configure script, you can do the value substitution
+ * by hand.
+ */
+
+#ifndef JANSSON_CONFIG_H
+#define JANSSON_CONFIG_H
+
+/* If your compiler supports the inline keyword in C, JSON_INLINE is
+   defined to `inline', otherwise empty. In C++, the inline is always
+   supported. */
+#ifdef __cplusplus
+#define JSON_INLINE inline
+#else
+#define JSON_INLINE @json_inline@
+#endif
+
+/* If your compiler supports the `long long` type and the strtoll()
+   library function, JSON_INTEGER_IS_LONG_LONG is defined to 1,
+   otherwise to 0. */
+#define JSON_INTEGER_IS_LONG_LONG @json_have_long_long@
+
+/* If locale.h and localeconv() are available, define to 1,
+   otherwise to 0. */
+#define JSON_HAVE_LOCALECONV @json_have_localeconv@
+
+/* If __atomic builtins are available they will be used to manage
+   reference counts of json_t. */
+#define JSON_HAVE_ATOMIC_BUILTINS @json_have_atomic_builtins@
+
+/* If __atomic builtins are not available we try using __sync builtins
+   to manage reference counts of json_t. */
+#define JSON_HAVE_SYNC_BUILTINS @json_have_sync_builtins@
+
+/* Maximum recursion depth for parsing JSON input.
+   This limits the depth of e.g. array-within-array constructions. */
+#define JSON_PARSER_MAX_DEPTH 2048
+
+#endif
diff --git a/client/jansson/load.c b/client/jansson/load.c
new file mode 100644
index 000000000..4cf3855af
--- /dev/null
+++ b/client/jansson/load.c
@@ -0,0 +1,1155 @@
+/*
+ * Copyright (c) 2009-2016 Petri Lehtinen <petri@digip.org>
+ *
+ * Jansson is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
+#include "jansson_private.h"
+
+#include <errno.h>
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include "jansson.h"
+#include "strbuffer.h"
+#include "utf.h"
+
+#define STREAM_STATE_OK        0
+#define STREAM_STATE_EOF      -1
+#define STREAM_STATE_ERROR    -2
+
+#define TOKEN_INVALID         -1
+#define TOKEN_EOF              0
+#define TOKEN_STRING         256
+#define TOKEN_INTEGER        257
+#define TOKEN_REAL           258
+#define TOKEN_TRUE           259
+#define TOKEN_FALSE          260
+#define TOKEN_NULL           261
+
+/* Locale independent versions of isxxx() functions */
+#define l_isupper(c)  ('A' <= (c) && (c) <= 'Z')
+#define l_islower(c)  ('a' <= (c) && (c) <= 'z')
+#define l_isalpha(c)  (l_isupper(c) || l_islower(c))
+#define l_isdigit(c)  ('0' <= (c) && (c) <= '9')
+#define l_isxdigit(c) \
+    (l_isdigit(c) || ('A' <= (c) && (c) <= 'F') || ('a' <= (c) && (c) <= 'f'))
+
+/* Read one byte from stream, convert to unsigned char, then int, and
+   return. return EOF on end of file. This corresponds to the
+   behaviour of fgetc(). */
+typedef int (*get_func)(void *data);
+
+typedef struct {
+    get_func get;
+    void *data;
+    char buffer[5];
+    size_t buffer_pos;
+    int state;
+    int line;
+    int column, last_column;
+    size_t position;
+} stream_t;
+
+typedef struct {
+    stream_t stream;
+    strbuffer_t saved_text;
+    size_t flags;
+    size_t depth;
+    int token;
+    union {
+        struct {
+            char *val;
+            size_t len;
+        } string;
+        json_int_t integer;
+        double real;
+    } value;
+} lex_t;
+
+#define stream_to_lex(stream) container_of(stream, lex_t, stream)
+
+
+/*** error reporting ***/
+
+static void error_set(json_error_t *error, const lex_t *lex,
+                      enum json_error_code code,
+                      const char *msg, ...)
+{
+    va_list ap;
+    char msg_text[JSON_ERROR_TEXT_LENGTH];
+    char msg_with_context[JSON_ERROR_TEXT_LENGTH + 28];
+
+    int line = -1, col = -1;
+    size_t pos = 0;
+    const char *result = msg_text;
+
+    if(!error)
+        return;
+
+    va_start(ap, msg);
+    vsnprintf(msg_text, JSON_ERROR_TEXT_LENGTH, msg, ap);
+    msg_text[JSON_ERROR_TEXT_LENGTH - 1] = '\0';
+    va_end(ap);
+
+    if(lex)
+    {
+        const char *saved_text = strbuffer_value(&lex->saved_text);
+
+        line = lex->stream.line;
+        col = lex->stream.column;
+        pos = lex->stream.position;
+
+        if(saved_text && saved_text[0])
+        {
+            if(lex->saved_text.length <= 20) {
+                snprintf(msg_with_context, JSON_ERROR_TEXT_LENGTH + 28,
+                         "%s near '%s'", msg_text, saved_text);
+                msg_with_context[JSON_ERROR_TEXT_LENGTH - 1] = '\0';
+                result = msg_with_context;
+            }
+        }
+        else
+        {
+            if(code == json_error_invalid_syntax) {
+                /* More specific error code for premature end of file. */
+                code = json_error_premature_end_of_input;
+            }
+            if(lex->stream.state == STREAM_STATE_ERROR) {
+                /* No context for UTF-8 decoding errors */
+                result = msg_text;
+            }
+            else {
+                snprintf(msg_with_context, JSON_ERROR_TEXT_LENGTH + 17,
+                         "%s near end of file", msg_text);
+                msg_with_context[JSON_ERROR_TEXT_LENGTH - 1] = '\0';
+                result = msg_with_context;
+            }
+        }
+    }
+
+    jsonp_error_set(error, line, col, pos, code, "%s", result);
+}
+
+
+/*** lexical analyzer ***/
+
+static void
+stream_init(stream_t *stream, get_func get, void *data)
+{
+    stream->get = get;
+    stream->data = data;
+    stream->buffer[0] = '\0';
+    stream->buffer_pos = 0;
+
+    stream->state = STREAM_STATE_OK;
+    stream->line = 1;
+    stream->column = 0;
+    stream->position = 0;
+}
+
+static int stream_get(stream_t *stream, json_error_t *error)
+{
+    int c;
+
+    if(stream->state != STREAM_STATE_OK)
+        return stream->state;
+
+    if(!stream->buffer[stream->buffer_pos])
+    {
+        c = stream->get(stream->data);
+        if(c == EOF) {
+            stream->state = STREAM_STATE_EOF;
+            return STREAM_STATE_EOF;
+        }
+
+        stream->buffer[0] = c;
+        stream->buffer_pos = 0;
+
+        if(0x80 <= c && c <= 0xFF)
+        {
+            /* multi-byte UTF-8 sequence */
+            size_t i, count;
+
+            count = utf8_check_first(c);
+            if(!count)
+                goto out;
+
+            assert(count >= 2);
+
+            for(i = 1; i < count; i++)
+                stream->buffer[i] = stream->get(stream->data);
+
+            if(!utf8_check_full(stream->buffer, count, NULL))
+                goto out;
+
+            stream->buffer[count] = '\0';
+        }
+        else
+            stream->buffer[1] = '\0';
+    }
+
+    c = stream->buffer[stream->buffer_pos++];
+
+    stream->position++;
+    if(c == '\n') {
+        stream->line++;
+        stream->last_column = stream->column;
+        stream->column = 0;
+    }
+    else if(utf8_check_first(c)) {
+        /* track the Unicode character column, so increment only if
+           this is the first character of a UTF-8 sequence */
+        stream->column++;
+    }
+
+    return c;
+
+out:
+    stream->state = STREAM_STATE_ERROR;
+    error_set(error, stream_to_lex(stream), json_error_invalid_utf8, "unable to decode byte 0x%x", c);
+    return STREAM_STATE_ERROR;
+}
+
+static void stream_unget(stream_t *stream, int c)
+{
+    if(c == STREAM_STATE_EOF || c == STREAM_STATE_ERROR)
+        return;
+
+    stream->position--;
+    if(c == '\n') {
+        stream->line--;
+        stream->column = stream->last_column;
+    }
+    else if(utf8_check_first(c))
+        stream->column--;
+
+    assert(stream->buffer_pos > 0);
+    stream->buffer_pos--;
+    assert(stream->buffer[stream->buffer_pos] == c);
+}
+
+
+static int lex_get(lex_t *lex, json_error_t *error)
+{
+    return stream_get(&lex->stream, error);
+}
+
+static void lex_save(lex_t *lex, int c)
+{
+    strbuffer_append_byte(&lex->saved_text, c);
+}
+
+static int lex_get_save(lex_t *lex, json_error_t *error)
+{
+    int c = stream_get(&lex->stream, error);
+    if(c != STREAM_STATE_EOF && c != STREAM_STATE_ERROR)
+        lex_save(lex, c);
+    return c;
+}
+
+static void lex_unget(lex_t *lex, int c)
+{
+    stream_unget(&lex->stream, c);
+}
+
+static void lex_unget_unsave(lex_t *lex, int c)
+{
+    if(c != STREAM_STATE_EOF && c != STREAM_STATE_ERROR) {
+        /* Since we treat warnings as errors, when assertions are turned
+         * off the "d" variable would be set but never used. Which is
+         * treated as an error by GCC.
+         */
+        #ifndef NDEBUG
+        char d;
+        #endif
+        stream_unget(&lex->stream, c);
+        #ifndef NDEBUG
+        d =
+        #endif
+            strbuffer_pop(&lex->saved_text);
+        assert(c == d);
+    }
+}
+
+static void lex_save_cached(lex_t *lex)
+{
+    while(lex->stream.buffer[lex->stream.buffer_pos] != '\0')
+    {
+        lex_save(lex, lex->stream.buffer[lex->stream.buffer_pos]);
+        lex->stream.buffer_pos++;
+        lex->stream.position++;
+    }
+}
+
+static void lex_free_string(lex_t *lex)
+{
+    jsonp_free(lex->value.string.val);
+    lex->value.string.val = NULL;
+    lex->value.string.len = 0;
+}
+
+/* assumes that str points to 'u' plus at least 4 valid hex digits */
+static int32_t decode_unicode_escape(const char *str)
+{
+    int i;
+    int32_t value = 0;
+
+    assert(str[0] == 'u');
+
+    for(i = 1; i <= 4; i++) {
+        char c = str[i];
+        value <<= 4;
+        if(l_isdigit(c))
+            value += c - '0';
+        else if(l_islower(c))
+            value += c - 'a' + 10;
+        else if(l_isupper(c))
+            value += c - 'A' + 10;
+        else
+            return -1;
+    }
+
+    return value;
+}
+
+static void lex_scan_string(lex_t *lex, json_error_t *error)
+{
+    int c;
+    const char *p;
+    char *t;
+    int i;
+
+    lex->value.string.val = NULL;
+    lex->token = TOKEN_INVALID;
+
+    c = lex_get_save(lex, error);
+
+    while(c != '"') {
+        if(c == STREAM_STATE_ERROR)
+            goto out;
+
+        else if(c == STREAM_STATE_EOF) {
+            error_set(error, lex, json_error_premature_end_of_input, "premature end of input");
+            goto out;
+        }
+
+        else if(0 <= c && c <= 0x1F) {
+            /* control character */
+            lex_unget_unsave(lex, c);
+            if(c == '\n')
+                error_set(error, lex, json_error_invalid_syntax, "unexpected newline");
+            else
+                error_set(error, lex, json_error_invalid_syntax, "control character 0x%x", c);
+            goto out;
+        }
+
+        else if(c == '\\') {
+            c = lex_get_save(lex, error);
+            if(c == 'u') {
+                c = lex_get_save(lex, error);
+                for(i = 0; i < 4; i++) {
+                    if(!l_isxdigit(c)) {
+                        error_set(error, lex, json_error_invalid_syntax, "invalid escape");
+                        goto out;
+                    }
+                    c = lex_get_save(lex, error);
+                }
+            }
+            else if(c == '"' || c == '\\' || c == '/' || c == 'b' ||
+                    c == 'f' || c == 'n' || c == 'r' || c == 't')
+                c = lex_get_save(lex, error);
+            else {
+                error_set(error, lex, json_error_invalid_syntax, "invalid escape");
+                goto out;
+            }
+        }
+        else
+            c = lex_get_save(lex, error);
+    }
+
+    /* the actual value is at most of the same length as the source
+       string, because:
+         - shortcut escapes (e.g. "\t") (length 2) are converted to 1 byte
+         - a single \uXXXX escape (length 6) is converted to at most 3 bytes
+         - two \uXXXX escapes (length 12) forming an UTF-16 surrogate pair
+           are converted to 4 bytes
+    */
+    t = jsonp_malloc(lex->saved_text.length + 1);
+    if(!t) {
+        /* this is not very nice, since TOKEN_INVALID is returned */
+        goto out;
+    }
+    lex->value.string.val = t;
+
+    /* + 1 to skip the " */
+    p = strbuffer_value(&lex->saved_text) + 1;
+
+    while(*p != '"') {
+        if(*p == '\\') {
+            p++;
+            if(*p == 'u') {
+                size_t length;
+                int32_t value;
+
+                value = decode_unicode_escape(p);
+                if(value < 0) {
+                    error_set(error, lex, json_error_invalid_syntax, "invalid Unicode escape '%.6s'", p - 1);
+                    goto out;
+                }
+                p += 5;
+
+                if(0xD800 <= value && value <= 0xDBFF) {
+                    /* surrogate pair */
+                    if(*p == '\\' && *(p + 1) == 'u') {
+                        int32_t value2 = decode_unicode_escape(++p);
+                        if(value2 < 0) {
+                            error_set(error, lex, json_error_invalid_syntax, "invalid Unicode escape '%.6s'", p - 1);
+                            goto out;
+                        }
+                        p += 5;
+
+                        if(0xDC00 <= value2 && value2 <= 0xDFFF) {
+                            /* valid second surrogate */
+                            value =
+                                ((value - 0xD800) << 10) +
+                                (value2 - 0xDC00) +
+                                0x10000;
+                        }
+                        else {
+                            /* invalid second surrogate */
+                            error_set(error, lex,
+                                      json_error_invalid_syntax,
+                                      "invalid Unicode '\\u%04X\\u%04X'",
+                                      value, value2);
+                            goto out;
+                        }
+                    }
+                    else {
+                        /* no second surrogate */
+                        error_set(error, lex, json_error_invalid_syntax, "invalid Unicode '\\u%04X'",
+                                  value);
+                        goto out;
+                    }
+                }
+                else if(0xDC00 <= value && value <= 0xDFFF) {
+                    error_set(error, lex, json_error_invalid_syntax, "invalid Unicode '\\u%04X'", value);
+                    goto out;
+                }
+
+                if(utf8_encode(value, t, &length))
+                    assert(0);
+                t += length;
+            }
+            else {
+                switch(*p) {
+                    case '"': case '\\': case '/':
+                        *t = *p; break;
+                    case 'b': *t = '\b'; break;
+                    case 'f': *t = '\f'; break;
+                    case 'n': *t = '\n'; break;
+                    case 'r': *t = '\r'; break;
+                    case 't': *t = '\t'; break;
+                    default: assert(0);
+                }
+                t++;
+                p++;
+            }
+        }
+        else
+            *(t++) = *(p++);
+    }
+    *t = '\0';
+    lex->value.string.len = t - lex->value.string.val;
+    lex->token = TOKEN_STRING;
+    return;
+
+out:
+    lex_free_string(lex);
+}
+
+#ifndef JANSSON_USING_CMAKE /* disabled if using cmake */
+#if JSON_INTEGER_IS_LONG_LONG
+#ifdef _MSC_VER  /* Microsoft Visual Studio */
+#define json_strtoint     _strtoi64
+#else
+#define json_strtoint     strtoll
+#endif
+#else
+#define json_strtoint     strtol
+#endif
+#endif
+
+static int lex_scan_number(lex_t *lex, int c, json_error_t *error)
+{
+    const char *saved_text;
+    char *end;
+    double doubleval;
+
+    lex->token = TOKEN_INVALID;
+
+    if(c == '-')
+        c = lex_get_save(lex, error);
+
+    if(c == '0') {
+        c = lex_get_save(lex, error);
+        if(l_isdigit(c)) {
+            lex_unget_unsave(lex, c);
+            goto out;
+        }
+    }
+    else if(l_isdigit(c)) {
+        do
+            c = lex_get_save(lex, error);
+        while(l_isdigit(c));
+    }
+    else {
+        lex_unget_unsave(lex, c);
+        goto out;
+    }
+
+    if(!(lex->flags & JSON_DECODE_INT_AS_REAL) &&
+       c != '.' && c != 'E' && c != 'e')
+    {
+        json_int_t intval;
+
+        lex_unget_unsave(lex, c);
+
+        saved_text = strbuffer_value(&lex->saved_text);
+
+        errno = 0;
+        intval = json_strtoint(saved_text, &end, 10);
+        if(errno == ERANGE) {
+            if(intval < 0)
+                error_set(error, lex, json_error_numeric_overflow, "too big negative integer");
+            else
+                error_set(error, lex, json_error_numeric_overflow, "too big integer");
+            goto out;
+        }
+
+        assert(end == saved_text + lex->saved_text.length);
+
+        lex->token = TOKEN_INTEGER;
+        lex->value.integer = intval;
+        return 0;
+    }
+
+    if(c == '.') {
+        c = lex_get(lex, error);
+        if(!l_isdigit(c)) {
+            lex_unget(lex, c);
+            goto out;
+        }
+        lex_save(lex, c);
+
+        do
+            c = lex_get_save(lex, error);
+        while(l_isdigit(c));
+    }
+
+    if(c == 'E' || c == 'e') {
+        c = lex_get_save(lex, error);
+        if(c == '+' || c == '-')
+            c = lex_get_save(lex, error);
+
+        if(!l_isdigit(c)) {
+            lex_unget_unsave(lex, c);
+            goto out;
+        }
+
+        do
+            c = lex_get_save(lex, error);
+        while(l_isdigit(c));
+    }
+
+    lex_unget_unsave(lex, c);
+
+    if(jsonp_strtod(&lex->saved_text, &doubleval)) {
+        error_set(error, lex, json_error_numeric_overflow, "real number overflow");
+        goto out;
+    }
+
+    lex->token = TOKEN_REAL;
+    lex->value.real = doubleval;
+    return 0;
+
+out:
+    return -1;
+}
+
+static int lex_scan(lex_t *lex, json_error_t *error)
+{
+    int c;
+
+    strbuffer_clear(&lex->saved_text);
+
+    if(lex->token == TOKEN_STRING)
+        lex_free_string(lex);
+
+    do
+        c = lex_get(lex, error);
+    while(c == ' ' || c == '\t' || c == '\n' || c == '\r');
+
+    if(c == STREAM_STATE_EOF) {
+        lex->token = TOKEN_EOF;
+        goto out;
+    }
+
+    if(c == STREAM_STATE_ERROR) {
+        lex->token = TOKEN_INVALID;
+        goto out;
+    }
+
+    lex_save(lex, c);
+
+    if(c == '{' || c == '}' || c == '[' || c == ']' || c == ':' || c == ',')
+        lex->token = c;
+
+    else if(c == '"')
+        lex_scan_string(lex, error);
+
+    else if(l_isdigit(c) || c == '-') {
+        if(lex_scan_number(lex, c, error))
+            goto out;
+    }
+
+    else if(l_isalpha(c)) {
+        /* eat up the whole identifier for clearer error messages */
+        const char *saved_text;
+
+        do
+            c = lex_get_save(lex, error);
+        while(l_isalpha(c));
+        lex_unget_unsave(lex, c);
+
+        saved_text = strbuffer_value(&lex->saved_text);
+
+        if(strcmp(saved_text, "true") == 0)
+            lex->token = TOKEN_TRUE;
+        else if(strcmp(saved_text, "false") == 0)
+            lex->token = TOKEN_FALSE;
+        else if(strcmp(saved_text, "null") == 0)
+            lex->token = TOKEN_NULL;
+        else
+            lex->token = TOKEN_INVALID;
+    }
+
+    else {
+        /* save the rest of the input UTF-8 sequence to get an error
+           message of valid UTF-8 */
+        lex_save_cached(lex);
+        lex->token = TOKEN_INVALID;
+    }
+
+out:
+    return lex->token;
+}
+
+static char *lex_steal_string(lex_t *lex, size_t *out_len)
+{
+    char *result = NULL;
+    if(lex->token == TOKEN_STRING) {
+        result = lex->value.string.val;
+        *out_len = lex->value.string.len;
+        lex->value.string.val = NULL;
+        lex->value.string.len = 0;
+    }
+    return result;
+}
+
+static int lex_init(lex_t *lex, get_func get, size_t flags, void *data)
+{
+    stream_init(&lex->stream, get, data);
+    if(strbuffer_init(&lex->saved_text))
+        return -1;
+
+    lex->flags = flags;
+    lex->token = TOKEN_INVALID;
+    return 0;
+}
+
+static void lex_close(lex_t *lex)
+{
+    if(lex->token == TOKEN_STRING)
+        lex_free_string(lex);
+    strbuffer_close(&lex->saved_text);
+}
+
+
+/*** parser ***/
+
+static json_t *parse_value(lex_t *lex, size_t flags, json_error_t *error);
+
+static json_t *parse_object(lex_t *lex, size_t flags, json_error_t *error)
+{
+    json_t *object = json_object();
+    if(!object)
+        return NULL;
+
+    lex_scan(lex, error);
+    if(lex->token == '}')
+        return object;
+
+    while(1) {
+        char *key;
+        size_t len;
+        json_t *value;
+
+        if(lex->token != TOKEN_STRING) {
+            error_set(error, lex, json_error_invalid_syntax, "string or '}' expected");
+            goto error;
+        }
+
+        key = lex_steal_string(lex, &len);
+        if(!key)
+            return NULL;
+        if (memchr(key, '\0', len)) {
+            jsonp_free(key);
+            error_set(error, lex, json_error_null_byte_in_key, "NUL byte in object key not supported");
+            goto error;
+        }
+
+        if(flags & JSON_REJECT_DUPLICATES) {
+            if(json_object_get(object, key)) {
+                jsonp_free(key);
+                error_set(error, lex, json_error_duplicate_key, "duplicate object key");
+                goto error;
+            }
+        }
+
+        lex_scan(lex, error);
+        if(lex->token != ':') {
+            jsonp_free(key);
+            error_set(error, lex, json_error_invalid_syntax, "':' expected");
+            goto error;
+        }
+
+        lex_scan(lex, error);
+        value = parse_value(lex, flags, error);
+        if(!value) {
+            jsonp_free(key);
+            goto error;
+        }
+
+        if(json_object_set_new_nocheck(object, key, value)) {
+            jsonp_free(key);
+            goto error;
+        }
+
+        jsonp_free(key);
+
+        lex_scan(lex, error);
+        if(lex->token != ',')
+            break;
+
+        lex_scan(lex, error);
+    }
+
+    if(lex->token != '}') {
+        error_set(error, lex, json_error_invalid_syntax, "'}' expected");
+        goto error;
+    }
+
+    return object;
+
+error:
+    json_decref(object);
+    return NULL;
+}
+
+static json_t *parse_array(lex_t *lex, size_t flags, json_error_t *error)
+{
+    json_t *array = json_array();
+    if(!array)
+        return NULL;
+
+    lex_scan(lex, error);
+    if(lex->token == ']')
+        return array;
+
+    while(lex->token) {
+        json_t *elem = parse_value(lex, flags, error);
+        if(!elem)
+            goto error;
+
+        if(json_array_append_new(array, elem)) {
+            goto error;
+        }
+
+        lex_scan(lex, error);
+        if(lex->token != ',')
+            break;
+
+        lex_scan(lex, error);
+    }
+
+    if(lex->token != ']') {
+        error_set(error, lex, json_error_invalid_syntax, "']' expected");
+        goto error;
+    }
+
+    return array;
+
+error:
+    json_decref(array);
+    return NULL;
+}
+
+static json_t *parse_value(lex_t *lex, size_t flags, json_error_t *error)
+{
+    json_t *json;
+
+    lex->depth++;
+    if(lex->depth > JSON_PARSER_MAX_DEPTH) {
+        error_set(error, lex, json_error_stack_overflow, "maximum parsing depth reached");
+        return NULL;
+    }
+
+    switch(lex->token) {
+        case TOKEN_STRING: {
+            const char *value = lex->value.string.val;
+            size_t len = lex->value.string.len;
+
+            if(!(flags & JSON_ALLOW_NUL)) {
+                if(memchr(value, '\0', len)) {
+                    error_set(error, lex, json_error_null_character, "\\u0000 is not allowed without JSON_ALLOW_NUL");
+                    return NULL;
+                }
+            }
+
+            json = jsonp_stringn_nocheck_own(value, len);
+            if(json) {
+                lex->value.string.val = NULL;
+                lex->value.string.len = 0;
+            }
+            break;
+        }
+
+        case TOKEN_INTEGER: {
+            json = json_integer(lex->value.integer);
+            break;
+        }
+
+        case TOKEN_REAL: {
+            json = json_real(lex->value.real);
+            break;
+        }
+
+        case TOKEN_TRUE:
+            json = json_true();
+            break;
+
+        case TOKEN_FALSE:
+            json = json_false();
+            break;
+
+        case TOKEN_NULL:
+            json = json_null();
+            break;
+
+        case '{':
+            json = parse_object(lex, flags, error);
+            break;
+
+        case '[':
+            json = parse_array(lex, flags, error);
+            break;
+
+        case TOKEN_INVALID:
+            error_set(error, lex, json_error_invalid_syntax, "invalid token");
+            return NULL;
+
+        default:
+            error_set(error, lex, json_error_invalid_syntax, "unexpected token");
+            return NULL;
+    }
+
+    if(!json)
+        return NULL;
+
+    lex->depth--;
+    return json;
+}
+
+static json_t *parse_json(lex_t *lex, size_t flags, json_error_t *error)
+{
+    json_t *result;
+
+    lex->depth = 0;
+
+    lex_scan(lex, error);
+    if(!(flags & JSON_DECODE_ANY)) {
+        if(lex->token != '[' && lex->token != '{') {
+            error_set(error, lex, json_error_invalid_syntax, "'[' or '{' expected");
+            return NULL;
+        }
+    }
+
+    result = parse_value(lex, flags, error);
+    if(!result)
+        return NULL;
+
+    if(!(flags & JSON_DISABLE_EOF_CHECK)) {
+        lex_scan(lex, error);
+        if(lex->token != TOKEN_EOF) {
+            error_set(error, lex, json_error_end_of_input_expected, "end of file expected");
+            json_decref(result);
+            return NULL;
+        }
+    }
+
+    if(error) {
+        /* Save the position even though there was no error */
+        error->position = (int)lex->stream.position;
+    }
+
+    return result;
+}
+
+typedef struct
+{
+    const char *data;
+    size_t pos;
+} string_data_t;
+
+static int string_get(void *data)
+{
+    char c;
+    string_data_t *stream = (string_data_t *)data;
+    c = stream->data[stream->pos];
+    if(c == '\0')
+        return EOF;
+    else
+    {
+        stream->pos++;
+        return (unsigned char)c;
+    }
+}
+
+json_t *json_loads(const char *string, size_t flags, json_error_t *error)
+{
+    lex_t lex;
+    json_t *result;
+    string_data_t stream_data;
+
+    jsonp_error_init(error, "<string>");
+
+    if (string == NULL) {
+        error_set(error, NULL, json_error_invalid_argument, "wrong arguments");
+        return NULL;
+    }
+
+    stream_data.data = string;
+    stream_data.pos = 0;
+
+    if(lex_init(&lex, string_get, flags, (void *)&stream_data))
+        return NULL;
+
+    result = parse_json(&lex, flags, error);
+
+    lex_close(&lex);
+    return result;
+}
+
+typedef struct
+{
+    const char *data;
+    size_t len;
+    size_t pos;
+} buffer_data_t;
+
+static int buffer_get(void *data)
+{
+    char c;
+    buffer_data_t *stream = data;
+    if(stream->pos >= stream->len)
+      return EOF;
+
+    c = stream->data[stream->pos];
+    stream->pos++;
+    return (unsigned char)c;
+}
+
+json_t *json_loadb(const char *buffer, size_t buflen, size_t flags, json_error_t *error)
+{
+    lex_t lex;
+    json_t *result;
+    buffer_data_t stream_data;
+
+    jsonp_error_init(error, "<buffer>");
+
+    if (buffer == NULL) {
+        error_set(error, NULL, json_error_invalid_argument, "wrong arguments");
+        return NULL;
+    }
+
+    stream_data.data = buffer;
+    stream_data.pos = 0;
+    stream_data.len = buflen;
+
+    if(lex_init(&lex, buffer_get, flags, (void *)&stream_data))
+        return NULL;
+
+    result = parse_json(&lex, flags, error);
+
+    lex_close(&lex);
+    return result;
+}
+
+json_t *json_loadf(FILE *input, size_t flags, json_error_t *error)
+{
+    lex_t lex;
+    const char *source;
+    json_t *result;
+
+    if(input == stdin)
+        source = "<stdin>";
+    else
+        source = "<stream>";
+
+    jsonp_error_init(error, source);
+
+    if (input == NULL) {
+        error_set(error, NULL, json_error_invalid_argument, "wrong arguments");
+        return NULL;
+    }
+
+    if(lex_init(&lex, (get_func)fgetc, flags, input))
+        return NULL;
+
+    result = parse_json(&lex, flags, error);
+
+    lex_close(&lex);
+    return result;
+}
+
+static int fd_get_func(int *fd)
+{
+    uint8_t c;
+#ifdef HAVE_UNISTD_H
+    if (read(*fd, &c, 1) == 1)
+        return c;
+#endif
+    return EOF;
+}
+
+json_t *json_loadfd(int input, size_t flags, json_error_t *error)
+{
+    lex_t lex;
+    const char *source;
+    json_t *result;
+
+#ifdef HAVE_UNISTD_H
+    if(input == STDIN_FILENO)
+        source = "<stdin>";
+    else
+#endif
+        source = "<stream>";
+
+    jsonp_error_init(error, source);
+
+    if (input < 0) {
+        error_set(error, NULL, json_error_invalid_argument, "wrong arguments");
+        return NULL;
+    }
+
+    if(lex_init(&lex, (get_func)fd_get_func, flags, &input))
+        return NULL;
+
+    result = parse_json(&lex, flags, error);
+
+    lex_close(&lex);
+    return result;
+}
+
+json_t *json_load_file(const char *path, size_t flags, json_error_t *error)
+{
+    json_t *result;
+    FILE *fp;
+
+    jsonp_error_init(error, path);
+
+    if (path == NULL) {
+        error_set(error, NULL, json_error_invalid_argument, "wrong arguments");
+        return NULL;
+    }
+
+    fp = fopen(path, "rb");
+    if(!fp)
+    {
+        error_set(error, NULL, json_error_cannot_open_file, "unable to open %s: %s",
+                  path, strerror(errno));
+        return NULL;
+    }
+
+    result = json_loadf(fp, flags, error);
+
+    fclose(fp);
+    return result;
+}
+
+#define MAX_BUF_LEN 1024
+
+typedef struct
+{
+    char data[MAX_BUF_LEN];
+    size_t len;
+    size_t pos;
+    json_load_callback_t callback;
+    void *arg;
+} callback_data_t;
+
+static int callback_get(void *data)
+{
+    char c;
+    callback_data_t *stream = data;
+
+    if(stream->pos >= stream->len) {
+        stream->pos = 0;
+        stream->len = stream->callback(stream->data, MAX_BUF_LEN, stream->arg);
+        if(stream->len == 0 || stream->len == (size_t)-1)
+            return EOF;
+    }
+
+    c = stream->data[stream->pos];
+    stream->pos++;
+    return (unsigned char)c;
+}
+
+json_t *json_load_callback(json_load_callback_t callback, void *arg, size_t flags, json_error_t *error)
+{
+    lex_t lex;
+    json_t *result;
+
+    callback_data_t stream_data;
+
+    memset(&stream_data, 0, sizeof(stream_data));
+    stream_data.callback = callback;
+    stream_data.arg = arg;
+
+    jsonp_error_init(error, "<callback>");
+
+    if (callback == NULL) {
+        error_set(error, NULL, json_error_invalid_argument, "wrong arguments");
+        return NULL;
+    }
+
+    if(lex_init(&lex, (get_func)callback_get, flags, &stream_data))
+        return NULL;
+
+    result = parse_json(&lex, flags, error);
+
+    lex_close(&lex);
+    return result;
+}
diff --git a/client/jansson/lookup3.h b/client/jansson/lookup3.h
new file mode 100644
index 000000000..2fe4c258f
--- /dev/null
+++ b/client/jansson/lookup3.h
@@ -0,0 +1,381 @@
+/*
+-------------------------------------------------------------------------------
+lookup3.c, by Bob Jenkins, May 2006, Public Domain.
+
+These are functions for producing 32-bit hashes for hash table lookup.
+hashword(), hashlittle(), hashlittle2(), hashbig(), mix(), and final() 
+are externally useful functions.  Routines to test the hash are included 
+if SELF_TEST is defined.  You can use this free for any purpose.  It's in
+the public domain.  It has no warranty.
+
+You probably want to use hashlittle().  hashlittle() and hashbig()
+hash byte arrays.  hashlittle() is is faster than hashbig() on
+little-endian machines.  Intel and AMD are little-endian machines.
+On second thought, you probably want hashlittle2(), which is identical to
+hashlittle() except it returns two 32-bit hashes for the price of one.  
+You could implement hashbig2() if you wanted but I haven't bothered here.
+
+If you want to find a hash of, say, exactly 7 integers, do
+  a = i1;  b = i2;  c = i3;
+  mix(a,b,c);
+  a += i4; b += i5; c += i6;
+  mix(a,b,c);
+  a += i7;
+  final(a,b,c);
+then use c as the hash value.  If you have a variable length array of
+4-byte integers to hash, use hashword().  If you have a byte array (like
+a character string), use hashlittle().  If you have several byte arrays, or
+a mix of things, see the comments above hashlittle().  
+
+Why is this so big?  I read 12 bytes at a time into 3 4-byte integers, 
+then mix those integers.  This is fast (you can do a lot more thorough
+mixing with 12*3 instructions on 3 integers than you can with 3 instructions
+on 1 byte), but shoehorning those bytes into integers efficiently is messy.
+-------------------------------------------------------------------------------
+*/
+
+#include <stdlib.h>
+
+#ifdef HAVE_CONFIG_H
+#include <jansson_private_config.h>
+#endif
+
+#ifdef HAVE_STDINT_H
+#include <stdint.h>     /* defines uint32_t etc */
+#endif
+
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>  /* attempt to define endianness */
+#endif
+
+#ifdef HAVE_ENDIAN_H
+# include <endian.h>    /* attempt to define endianness */
+#endif
+
+/*
+ * My best guess at if you are big-endian or little-endian.  This may
+ * need adjustment.
+ */
+#if (defined(__BYTE_ORDER) && defined(__LITTLE_ENDIAN) && \
+     __BYTE_ORDER == __LITTLE_ENDIAN) || \
+    (defined(i386) || defined(__i386__) || defined(__i486__) || \
+     defined(__i586__) || defined(__i686__) || defined(vax) || defined(MIPSEL))
+# define HASH_LITTLE_ENDIAN 1
+# define HASH_BIG_ENDIAN 0
+#elif (defined(__BYTE_ORDER) && defined(__BIG_ENDIAN) && \
+       __BYTE_ORDER == __BIG_ENDIAN) || \
+      (defined(sparc) || defined(POWERPC) || defined(mc68000) || defined(sel))
+# define HASH_LITTLE_ENDIAN 0
+# define HASH_BIG_ENDIAN 1
+#else
+# define HASH_LITTLE_ENDIAN 0
+# define HASH_BIG_ENDIAN 0
+#endif
+
+#define hashsize(n) ((uint32_t)1<<(n))
+#define hashmask(n) (hashsize(n)-1)
+#define rot(x,k) (((x)<<(k)) | ((x)>>(32-(k))))
+
+/*
+-------------------------------------------------------------------------------
+mix -- mix 3 32-bit values reversibly.
+
+This is reversible, so any information in (a,b,c) before mix() is
+still in (a,b,c) after mix().
+
+If four pairs of (a,b,c) inputs are run through mix(), or through
+mix() in reverse, there are at least 32 bits of the output that
+are sometimes the same for one pair and different for another pair.
+This was tested for:
+* pairs that differed by one bit, by two bits, in any combination
+  of top bits of (a,b,c), or in any combination of bottom bits of
+  (a,b,c).
+* "differ" is defined as +, -, ^, or ~^.  For + and -, I transformed
+  the output delta to a Gray code (a^(a>>1)) so a string of 1's (as
+  is commonly produced by subtraction) look like a single 1-bit
+  difference.
+* the base values were pseudorandom, all zero but one bit set, or 
+  all zero plus a counter that starts at zero.
+
+Some k values for my "a-=c; a^=rot(c,k); c+=b;" arrangement that
+satisfy this are
+    4  6  8 16 19  4
+    9 15  3 18 27 15
+   14  9  3  7 17  3
+Well, "9 15 3 18 27 15" didn't quite get 32 bits diffing
+for "differ" defined as + with a one-bit base and a two-bit delta.  I
+used http://burtleburtle.net/bob/hash/avalanche.html to choose 
+the operations, constants, and arrangements of the variables.
+
+This does not achieve avalanche.  There are input bits of (a,b,c)
+that fail to affect some output bits of (a,b,c), especially of a.  The
+most thoroughly mixed value is c, but it doesn't really even achieve
+avalanche in c.
+
+This allows some parallelism.  Read-after-writes are good at doubling
+the number of bits affected, so the goal of mixing pulls in the opposite
+direction as the goal of parallelism.  I did what I could.  Rotates
+seem to cost as much as shifts on every machine I could lay my hands
+on, and rotates are much kinder to the top and bottom bits, so I used
+rotates.
+-------------------------------------------------------------------------------
+*/
+#define mix(a,b,c) \
+{ \
+  a -= c;  a ^= rot(c, 4);  c += b; \
+  b -= a;  b ^= rot(a, 6);  a += c; \
+  c -= b;  c ^= rot(b, 8);  b += a; \
+  a -= c;  a ^= rot(c,16);  c += b; \
+  b -= a;  b ^= rot(a,19);  a += c; \
+  c -= b;  c ^= rot(b, 4);  b += a; \
+}
+
+/*
+-------------------------------------------------------------------------------
+final -- final mixing of 3 32-bit values (a,b,c) into c
+
+Pairs of (a,b,c) values differing in only a few bits will usually
+produce values of c that look totally different.  This was tested for
+* pairs that differed by one bit, by two bits, in any combination
+  of top bits of (a,b,c), or in any combination of bottom bits of
+  (a,b,c).
+* "differ" is defined as +, -, ^, or ~^.  For + and -, I transformed
+  the output delta to a Gray code (a^(a>>1)) so a string of 1's (as
+  is commonly produced by subtraction) look like a single 1-bit
+  difference.
+* the base values were pseudorandom, all zero but one bit set, or 
+  all zero plus a counter that starts at zero.
+
+These constants passed:
+ 14 11 25 16 4 14 24
+ 12 14 25 16 4 14 24
+and these came close:
+  4  8 15 26 3 22 24
+ 10  8 15 26 3 22 24
+ 11  8 15 26 3 22 24
+-------------------------------------------------------------------------------
+*/
+#define final(a,b,c) \
+{ \
+  c ^= b; c -= rot(b,14); \
+  a ^= c; a -= rot(c,11); \
+  b ^= a; b -= rot(a,25); \
+  c ^= b; c -= rot(b,16); \
+  a ^= c; a -= rot(c,4);  \
+  b ^= a; b -= rot(a,14); \
+  c ^= b; c -= rot(b,24); \
+}
+
+/*
+-------------------------------------------------------------------------------
+hashlittle() -- hash a variable-length key into a 32-bit value
+  k       : the key (the unaligned variable-length array of bytes)
+  length  : the length of the key, counting by bytes
+  initval : can be any 4-byte value
+Returns a 32-bit value.  Every bit of the key affects every bit of
+the return value.  Two keys differing by one or two bits will have
+totally different hash values.
+
+The best hash table sizes are powers of 2.  There is no need to do
+mod a prime (mod is sooo slow!).  If you need less than 32 bits,
+use a bitmask.  For example, if you need only 10 bits, do
+  h = (h & hashmask(10));
+In which case, the hash table should have hashsize(10) elements.
+
+If you are hashing n strings (uint8_t **)k, do it like this:
+  for (i=0, h=0; i<n; ++i) h = hashlittle( k[i], len[i], h);
+
+By Bob Jenkins, 2006.  bob_jenkins@burtleburtle.net.  You may use this
+code any way you wish, private, educational, or commercial.  It's free.
+
+Use for hash table lookup, or anything where one collision in 2^^32 is
+acceptable.  Do NOT use for cryptographic purposes.
+-------------------------------------------------------------------------------
+*/
+
+static uint32_t hashlittle(const void *key, size_t length, uint32_t initval)
+{
+  uint32_t a,b,c;                                          /* internal state */
+  union { const void *ptr; size_t i; } u;     /* needed for Mac Powerbook G4 */
+
+  /* Set up the internal state */
+  a = b = c = 0xdeadbeef + ((uint32_t)length) + initval;
+
+  u.ptr = key;
+  if (HASH_LITTLE_ENDIAN && ((u.i & 0x3) == 0)) {
+    const uint32_t *k = (const uint32_t *)key;         /* read 32-bit chunks */
+
+/* Detect Valgrind or AddressSanitizer */
+#ifdef VALGRIND
+# define NO_MASKING_TRICK 1
+#else
+# if defined(__has_feature)  /* Clang */
+#  if __has_feature(address_sanitizer)  /* is ASAN enabled? */
+#   define NO_MASKING_TRICK 1
+#  endif
+# else
+#  if defined(__SANITIZE_ADDRESS__)  /* GCC 4.8.x, is ASAN enabled? */
+#   define NO_MASKING_TRICK 1
+#  endif
+# endif
+#endif
+
+#ifdef NO_MASKING_TRICK
+    const uint8_t  *k8;
+#endif
+
+    /*------ all but last block: aligned reads and affect 32 bits of (a,b,c) */
+    while (length > 12)
+    {
+      a += k[0];
+      b += k[1];
+      c += k[2];
+      mix(a,b,c);
+      length -= 12;
+      k += 3;
+    }
+
+    /*----------------------------- handle the last (probably partial) block */
+    /* 
+     * "k[2]&0xffffff" actually reads beyond the end of the string, but
+     * then masks off the part it's not allowed to read.  Because the
+     * string is aligned, the masked-off tail is in the same word as the
+     * rest of the string.  Every machine with memory protection I've seen
+     * does it on word boundaries, so is OK with this.  But VALGRIND will
+     * still catch it and complain.  The masking trick does make the hash
+     * noticably faster for short strings (like English words).
+     */
+#ifndef NO_MASKING_TRICK
+
+    switch(length)
+    {
+    case 12: c+=k[2]; b+=k[1]; a+=k[0]; break;
+    case 11: c+=k[2]&0xffffff; b+=k[1]; a+=k[0]; break;
+    case 10: c+=k[2]&0xffff; b+=k[1]; a+=k[0]; break;
+    case 9 : c+=k[2]&0xff; b+=k[1]; a+=k[0]; break;
+    case 8 : b+=k[1]; a+=k[0]; break;
+    case 7 : b+=k[1]&0xffffff; a+=k[0]; break;
+    case 6 : b+=k[1]&0xffff; a+=k[0]; break;
+    case 5 : b+=k[1]&0xff; a+=k[0]; break;
+    case 4 : a+=k[0]; break;
+    case 3 : a+=k[0]&0xffffff; break;
+    case 2 : a+=k[0]&0xffff; break;
+    case 1 : a+=k[0]&0xff; break;
+    case 0 : return c;              /* zero length strings require no mixing */
+    }
+
+#else /* make valgrind happy */
+
+    k8 = (const uint8_t *)k;
+    switch(length)
+    {
+    case 12: c+=k[2]; b+=k[1]; a+=k[0]; break;
+    case 11: c+=((uint32_t)k8[10])<<16;  /* fall through */
+    case 10: c+=((uint32_t)k8[9])<<8;    /* fall through */
+    case 9 : c+=k8[8];                   /* fall through */
+    case 8 : b+=k[1]; a+=k[0]; break;
+    case 7 : b+=((uint32_t)k8[6])<<16;   /* fall through */
+    case 6 : b+=((uint32_t)k8[5])<<8;    /* fall through */
+    case 5 : b+=k8[4];                   /* fall through */
+    case 4 : a+=k[0]; break;
+    case 3 : a+=((uint32_t)k8[2])<<16;   /* fall through */
+    case 2 : a+=((uint32_t)k8[1])<<8;    /* fall through */
+    case 1 : a+=k8[0]; break;
+    case 0 : return c;
+    }
+
+#endif /* !valgrind */
+
+  } else if (HASH_LITTLE_ENDIAN && ((u.i & 0x1) == 0)) {
+    const uint16_t *k = (const uint16_t *)key;         /* read 16-bit chunks */
+    const uint8_t  *k8;
+
+    /*--------------- all but last block: aligned reads and different mixing */
+    while (length > 12)
+    {
+      a += k[0] + (((uint32_t)k[1])<<16);
+      b += k[2] + (((uint32_t)k[3])<<16);
+      c += k[4] + (((uint32_t)k[5])<<16);
+      mix(a,b,c);
+      length -= 12;
+      k += 6;
+    }
+
+    /*----------------------------- handle the last (probably partial) block */
+    k8 = (const uint8_t *)k;
+    switch(length)
+    {
+    case 12: c+=k[4]+(((uint32_t)k[5])<<16);
+             b+=k[2]+(((uint32_t)k[3])<<16);
+             a+=k[0]+(((uint32_t)k[1])<<16);
+             break;
+    case 11: c+=((uint32_t)k8[10])<<16;     /* fall through */
+    case 10: c+=k[4];
+             b+=k[2]+(((uint32_t)k[3])<<16);
+             a+=k[0]+(((uint32_t)k[1])<<16);
+             break;
+    case 9 : c+=k8[8];                      /* fall through */
+    case 8 : b+=k[2]+(((uint32_t)k[3])<<16);
+             a+=k[0]+(((uint32_t)k[1])<<16);
+             break;
+    case 7 : b+=((uint32_t)k8[6])<<16;      /* fall through */
+    case 6 : b+=k[2];
+             a+=k[0]+(((uint32_t)k[1])<<16);
+             break;
+    case 5 : b+=k8[4];                      /* fall through */
+    case 4 : a+=k[0]+(((uint32_t)k[1])<<16);
+             break;
+    case 3 : a+=((uint32_t)k8[2])<<16;      /* fall through */
+    case 2 : a+=k[0];
+             break;
+    case 1 : a+=k8[0];
+             break;
+    case 0 : return c;                     /* zero length requires no mixing */
+    }
+
+  } else {                        /* need to read the key one byte at a time */
+    const uint8_t *k = (const uint8_t *)key;
+
+    /*--------------- all but the last block: affect some 32 bits of (a,b,c) */
+    while (length > 12)
+    {
+      a += k[0];
+      a += ((uint32_t)k[1])<<8;
+      a += ((uint32_t)k[2])<<16;
+      a += ((uint32_t)k[3])<<24;
+      b += k[4];
+      b += ((uint32_t)k[5])<<8;
+      b += ((uint32_t)k[6])<<16;
+      b += ((uint32_t)k[7])<<24;
+      c += k[8];
+      c += ((uint32_t)k[9])<<8;
+      c += ((uint32_t)k[10])<<16;
+      c += ((uint32_t)k[11])<<24;
+      mix(a,b,c);
+      length -= 12;
+      k += 12;
+    }
+
+    /*-------------------------------- last block: affect all 32 bits of (c) */
+    switch(length)                   /* all the case statements fall through */
+    {
+    case 12: c+=((uint32_t)k[11])<<24; /* fall through */
+    case 11: c+=((uint32_t)k[10])<<16; /* fall through */
+    case 10: c+=((uint32_t)k[9])<<8; /* fall through */
+    case 9 : c+=k[8]; /* fall through */
+    case 8 : b+=((uint32_t)k[7])<<24; /* fall through */
+    case 7 : b+=((uint32_t)k[6])<<16; /* fall through */
+    case 6 : b+=((uint32_t)k[5])<<8; /* fall through */
+    case 5 : b+=k[4]; /* fall through */
+    case 4 : a+=((uint32_t)k[3])<<24; /* fall through */
+    case 3 : a+=((uint32_t)k[2])<<16; /* fall through */
+    case 2 : a+=((uint32_t)k[1])<<8; /* fall through */
+    case 1 : a+=k[0];
+             break;
+    case 0 : return c;
+    }
+  }
+
+  final(a,b,c);
+  return c;
+}
diff --git a/client/jansson/memory.c b/client/jansson/memory.c
new file mode 100644
index 000000000..a2be5d23d
--- /dev/null
+++ b/client/jansson/memory.c
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2009-2016 Petri Lehtinen <petri@digip.org>
+ * Copyright (c) 2011-2012 Basile Starynkevitch <basile@starynkevitch.net>
+ *
+ * Jansson is free software; you can redistribute it and/or modify it
+ * under the terms of the MIT license. See LICENSE for details.
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "jansson.h"
+#include "jansson_private.h"
+
+/* C89 allows these to be macros */
+#undef malloc
+#undef free
+
+/* memory function pointers */
+static json_malloc_t do_malloc = malloc;
+static json_free_t do_free = free;
+
+void *jsonp_malloc(size_t size)
+{
+    if(!size)
+        return NULL;
+
+    return (*do_malloc)(size);
+}
+
+void jsonp_free(void *ptr)
+{
+    if(!ptr)
+        return;
+
+    (*do_free)(ptr);
+}
+
+char *jsonp_strdup(const char *str)
+{
+    return jsonp_strndup(str, strlen(str));
+}
+
+char *jsonp_strndup(const char *str, size_t len)
+{
+    char *new_str;
+
+    new_str = jsonp_malloc(len + 1);
+    if(!new_str)
+        return NULL;
+
+    memcpy(new_str, str, len);
+    new_str[len] = '\0';
+    return new_str;
+}
+
+void json_set_alloc_funcs(json_malloc_t malloc_fn, json_free_t free_fn)
+{
+    do_malloc = malloc_fn;
+    do_free = free_fn;
+}
+
+void json_get_alloc_funcs(json_malloc_t *malloc_fn, json_free_t *free_fn)
+{
+    if (malloc_fn)
+        *malloc_fn = do_malloc;
+    if (free_fn)
+        *free_fn = do_free;
+}
diff --git a/client/jansson/pack_unpack.c b/client/jansson/pack_unpack.c
new file mode 100644
index 000000000..153f64d19
--- /dev/null
+++ b/client/jansson/pack_unpack.c
@@ -0,0 +1,909 @@
+/*
+ * Copyright (c) 2009-2016 Petri Lehtinen <petri@digip.org>
+ * Copyright (c) 2011-2012 Graeme Smecher <graeme.smecher@mail.mcgill.ca>
+ *
+ * Jansson is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#include <string.h>
+#include "jansson.h"
+#include "jansson_private.h"
+#include "utf.h"
+
+typedef struct {
+    int line;
+    int column;
+    size_t pos;
+    char token;
+} token_t;
+
+typedef struct {
+    const char *start;
+    const char *fmt;
+    token_t prev_token;
+    token_t token;
+    token_t next_token;
+    json_error_t *error;
+    size_t flags;
+    int line;
+    int column;
+    size_t pos;
+    int has_error;
+} scanner_t;
+
+#define token(scanner) ((scanner)->token.token)
+
+static const char * const type_names[] = {
+    "object",
+    "array",
+    "string",
+    "integer",
+    "real",
+    "true",
+    "false",
+    "null"
+};
+
+#define type_name(x) type_names[json_typeof(x)]
+
+static const char unpack_value_starters[] = "{[siIbfFOon";
+
+static void scanner_init(scanner_t *s, json_error_t *error,
+                         size_t flags, const char *fmt)
+{
+    s->error = error;
+    s->flags = flags;
+    s->fmt = s->start = fmt;
+    memset(&s->prev_token, 0, sizeof(token_t));
+    memset(&s->token, 0, sizeof(token_t));
+    memset(&s->next_token, 0, sizeof(token_t));
+    s->line = 1;
+    s->column = 0;
+    s->pos = 0;
+    s->has_error = 0;
+}
+
+static void next_token(scanner_t *s)
+{
+    const char *t;
+    s->prev_token = s->token;
+
+    if(s->next_token.line) {
+        s->token = s->next_token;
+        s->next_token.line = 0;
+        return;
+    }
+
+    t = s->fmt;
+    s->column++;
+    s->pos++;
+
+    /* skip space and ignored chars */
+    while(*t == ' ' || *t == '\t' || *t == '\n' || *t == ',' || *t == ':') {
+        if(*t == '\n') {
+            s->line++;
+            s->column = 1;
+        }
+        else
+            s->column++;
+
+        s->pos++;
+        t++;
+    }
+
+    s->token.token = *t;
+    s->token.line = s->line;
+    s->token.column = s->column;
+    s->token.pos = s->pos;
+
+    t++;
+    s->fmt = t;
+}
+
+static void prev_token(scanner_t *s)
+{
+    s->next_token = s->token;
+    s->token = s->prev_token;
+}
+
+static void set_error(scanner_t *s, const char *source, enum json_error_code code,
+                      const char *fmt, ...)
+{
+    va_list ap;
+    va_start(ap, fmt);
+
+    jsonp_error_vset(s->error, s->token.line, s->token.column, s->token.pos,
+                     code, fmt, ap);
+
+    jsonp_error_set_source(s->error, source);
+
+    va_end(ap);
+}
+
+static json_t *pack(scanner_t *s, va_list *ap);
+
+
+/* ours will be set to 1 if jsonp_free() must be called for the result
+   afterwards */
+static char *read_string(scanner_t *s, va_list *ap,
+                         const char *purpose, size_t *out_len, int *ours)
+{
+    char t;
+    strbuffer_t strbuff;
+    const char *str;
+    size_t length;
+
+    next_token(s);
+    t = token(s);
+    prev_token(s);
+
+    *ours = 0;
+    if(t != '#' && t != '%' && t != '+') {
+        /* Optimize the simple case */
+        str = va_arg(*ap, const char *);
+
+        if(!str) {
+            set_error(s, "<args>", json_error_null_value, "NULL string argument");
+            return NULL;
+        }
+
+        length = strlen(str);
+
+        if(!utf8_check_string(str, length)) {
+            set_error(s, "<args>", json_error_invalid_utf8, "Invalid UTF-8 %s", purpose);
+            return NULL;
+        }
+
+        *out_len = length;
+        return (char *)str;
+    }
+
+    strbuffer_init(&strbuff);
+
+    while(1) {
+        str = va_arg(*ap, const char *);
+        if(!str) {
+            set_error(s, "<args>", json_error_null_value, "NULL string argument");
+            s->has_error = 1;
+        }
+
+        next_token(s);
+
+        if(token(s) == '#') {
+            length = va_arg(*ap, int);
+        }
+        else if(token(s) == '%') {
+            length = va_arg(*ap, size_t);
+        }
+        else {
+            prev_token(s);
+            length = s->has_error ? 0 : strlen(str);
+        }
+
+        if(!s->has_error && strbuffer_append_bytes(&strbuff, str, length) == -1) {
+            set_error(s, "<internal>", json_error_out_of_memory, "Out of memory");
+            s->has_error = 1;
+        }
+
+        next_token(s);
+        if(token(s) != '+') {
+            prev_token(s);
+            break;
+        }
+    }
+
+    if(s->has_error) {
+        strbuffer_close(&strbuff);
+        return NULL;
+    }
+
+    if(!utf8_check_string(strbuff.value, strbuff.length)) {
+        set_error(s, "<args>", json_error_invalid_utf8, "Invalid UTF-8 %s", purpose);
+        strbuffer_close(&strbuff);
+        s->has_error = 1;
+        return NULL;
+    }
+
+    *out_len = strbuff.length;
+    *ours = 1;
+    return strbuffer_steal_value(&strbuff);
+}
+
+static json_t *pack_object(scanner_t *s, va_list *ap)
+{
+    json_t *object = json_object();
+    next_token(s);
+
+    while(token(s) != '}') {
+        char *key;
+        size_t len;
+        int ours;
+        json_t *value;
+
+        if(!token(s)) {
+            set_error(s, "<format>", json_error_invalid_format, "Unexpected end of format string");
+            goto error;
+        }
+
+        if(token(s) != 's') {
+            set_error(s, "<format>", json_error_invalid_format, "Expected format 's', got '%c'", token(s));
+            goto error;
+        }
+
+        key = read_string(s, ap, "object key", &len, &ours);
+        if (!key)
+            s->has_error = 1;
+
+        next_token(s);
+
+        value = pack(s, ap);
+        if(!value) {
+            if(ours)
+                jsonp_free(key);
+
+            if(strchr("soO", token(s)) && s->next_token.token == '*') {
+                next_token(s);
+            } else {
+                s->has_error = 1;
+            }
+
+            next_token(s);
+            continue;
+        }
+
+        if(s->has_error)
+            json_decref(value);
+
+        if(!s->has_error && json_object_set_new_nocheck(object, key, value)) {
+            set_error(s, "<internal>", json_error_out_of_memory, "Unable to add key \"%s\"", key);
+            s->has_error = 1;
+        }
+
+        if(ours)
+            jsonp_free(key);
+
+        if(strchr("soO", token(s)) && s->next_token.token == '*')
+            next_token(s);
+        next_token(s);
+    }
+
+    if(!s->has_error)
+        return object;
+
+error:
+    json_decref(object);
+    return NULL;
+}
+
+static json_t *pack_array(scanner_t *s, va_list *ap)
+{
+    json_t *array = json_array();
+    next_token(s);
+
+    while(token(s) != ']') {
+        json_t *value;
+
+        if(!token(s)) {
+            set_error(s, "<format>", json_error_invalid_format, "Unexpected end of format string");
+            /* Format string errors are unrecoverable. */
+            goto error;
+        }
+
+        value = pack(s, ap);
+        if(!value) {
+            if(strchr("soO", token(s)) && s->next_token.token == '*') {
+                next_token(s);
+            } else {
+                s->has_error = 1;
+            }
+
+            next_token(s);
+            continue;
+        }
+
+        if(s->has_error)
+            json_decref(value);
+
+        if(!s->has_error && json_array_append_new(array, value)) {
+            set_error(s, "<internal>", json_error_out_of_memory, "Unable to append to array");
+            s->has_error = 1;
+        }
+
+        if(strchr("soO", token(s)) && s->next_token.token == '*')
+            next_token(s);
+        next_token(s);
+    }
+
+    if(!s->has_error)
+        return array;
+
+error:
+    json_decref(array);
+    return NULL;
+}
+
+static json_t *pack_string(scanner_t *s, va_list *ap)
+{
+    char *str;
+    size_t len;
+    int ours;
+    int nullable;
+
+    next_token(s);
+    nullable = token(s) == '?';
+    if (!nullable)
+        prev_token(s);
+
+    str = read_string(s, ap, "string", &len, &ours);
+    if (!str) {
+        return nullable ? json_null() : NULL;
+    } else if (ours) {
+        return jsonp_stringn_nocheck_own(str, len);
+    } else {
+        return json_stringn_nocheck(str, len);
+    }
+}
+
+static json_t *pack(scanner_t *s, va_list *ap)
+{
+    switch(token(s)) {
+        case '{':
+            return pack_object(s, ap);
+
+        case '[':
+            return pack_array(s, ap);
+
+        case 's': /* string */
+            return pack_string(s, ap);
+
+        case 'n': /* null */
+            return json_null();
+
+        case 'b': /* boolean */
+            return va_arg(*ap, int) ? json_true() : json_false();
+
+        case 'i': /* integer from int */
+            return json_integer(va_arg(*ap, int));
+
+        case 'I': /* integer from json_int_t */
+            return json_integer(va_arg(*ap, json_int_t));
+
+        case 'f': /* real */
+            return json_real(va_arg(*ap, double));
+
+        case 'O': /* a json_t object; increments refcount */
+        {
+            int nullable;
+            json_t *json;
+
+            next_token(s);
+            nullable = token(s) == '?';
+            if (!nullable)
+                prev_token(s);
+
+            json = va_arg(*ap, json_t *);
+            if (!json && nullable) {
+                return json_null();
+            } else {
+                return json_incref(json);
+            }
+        }
+
+        case 'o': /* a json_t object; doesn't increment refcount */
+        {
+            int nullable;
+            json_t *json;
+
+            next_token(s);
+            nullable = token(s) == '?';
+            if (!nullable)
+                prev_token(s);
+
+            json = va_arg(*ap, json_t *);
+            if (!json && nullable) {
+                return json_null();
+            } else {
+                return json;
+            }
+        }
+
+        default:
+            set_error(s, "<format>", json_error_invalid_format, "Unexpected format character '%c'",
+                      token(s));
+            s->has_error = 1;
+            return NULL;
+    }
+}
+
+static int unpack(scanner_t *s, json_t *root, va_list *ap);
+
+static int unpack_object(scanner_t *s, json_t *root, va_list *ap)
+{
+    int ret = -1;
+    int strict = 0;
+    int gotopt = 0;
+
+    /* Use a set (emulated by a hashtable) to check that all object
+       keys are accessed. Checking that the correct number of keys
+       were accessed is not enough, as the same key can be unpacked
+       multiple times.
+    */
+    hashtable_t key_set;
+
+    if(hashtable_init(&key_set)) {
+        set_error(s, "<internal>", json_error_out_of_memory, "Out of memory");
+        return -1;
+    }
+
+    if(root && !json_is_object(root)) {
+        set_error(s, "<validation>", json_error_wrong_type, "Expected object, got %s",
+                  type_name(root));
+        goto out;
+    }
+    next_token(s);
+
+    while(token(s) != '}') {
+        const char *key;
+        json_t *value;
+        int opt = 0;
+
+        if(strict != 0) {
+            set_error(s, "<format>", json_error_invalid_format, "Expected '}' after '%c', got '%c'",
+                      (strict == 1 ? '!' : '*'), token(s));
+            goto out;
+        }
+
+        if(!token(s)) {
+            set_error(s, "<format>", json_error_invalid_format, "Unexpected end of format string");
+            goto out;
+        }
+
+        if(token(s) == '!' || token(s) == '*') {
+            strict = (token(s) == '!' ? 1 : -1);
+            next_token(s);
+            continue;
+        }
+
+        if(token(s) != 's') {
+            set_error(s, "<format>", json_error_invalid_format, "Expected format 's', got '%c'", token(s));
+            goto out;
+        }
+
+        key = va_arg(*ap, const char *);
+        if(!key) {
+            set_error(s, "<args>", json_error_null_value, "NULL object key");
+            goto out;
+        }
+
+        next_token(s);
+
+        if(token(s) == '?') {
+            opt = gotopt = 1;
+            next_token(s);
+        }
+
+        if(!root) {
+            /* skipping */
+            value = NULL;
+        }
+        else {
+            value = json_object_get(root, key);
+            if(!value && !opt) {
+                set_error(s, "<validation>", json_error_item_not_found, "Object item not found: %s", key);
+                goto out;
+            }
+        }
+
+        if(unpack(s, value, ap))
+            goto out;
+
+        hashtable_set(&key_set, key, json_null());
+        next_token(s);
+    }
+
+    if(strict == 0 && (s->flags & JSON_STRICT))
+        strict = 1;
+
+    if(root && strict == 1) {
+        /* We need to check that all non optional items have been parsed */
+        const char *key;
+        int have_unrecognized_keys = 0;
+        strbuffer_t unrecognized_keys;
+        json_t *value;
+        long unpacked = 0;
+        if (gotopt) {
+            /* We have optional keys, we need to iter on each key */
+            json_object_foreach(root, key, value) {
+                if(!hashtable_get(&key_set, key)) {
+                    unpacked++;
+
+                    /* Save unrecognized keys for the error message */
+                    if (!have_unrecognized_keys) {
+                        strbuffer_init(&unrecognized_keys);
+                        have_unrecognized_keys = 1;
+                    } else {
+                        strbuffer_append_bytes(&unrecognized_keys, ", ", 2);
+                    }
+                    strbuffer_append_bytes(&unrecognized_keys, key, strlen(key));
+                }
+            }
+        } else {
+            /* No optional keys, we can just compare the number of items */
+            unpacked = (long)json_object_size(root) - (long)key_set.size;
+        }
+        if (unpacked) {
+            if (!gotopt) {
+                /* Save unrecognized keys for the error message */
+                json_object_foreach(root, key, value) {
+                    if(!hashtable_get(&key_set, key)) {
+                        if (!have_unrecognized_keys) {
+                            strbuffer_init(&unrecognized_keys);
+                            have_unrecognized_keys = 1;
+                        } else {
+                            strbuffer_append_bytes(&unrecognized_keys, ", ", 2);
+                        }
+                        strbuffer_append_bytes(&unrecognized_keys, key, strlen(key));
+                    }
+                }
+            }
+            set_error(s, "<validation>", json_error_end_of_input_expected,
+                      "%li object item(s) left unpacked: %s",
+                      unpacked, strbuffer_value(&unrecognized_keys));
+            strbuffer_close(&unrecognized_keys);
+            goto out;
+        }
+    }
+
+    ret = 0;
+
+out:
+    hashtable_close(&key_set);
+    return ret;
+}
+
+static int unpack_array(scanner_t *s, json_t *root, va_list *ap)
+{
+    size_t i = 0;
+    int strict = 0;
+
+    if(root && !json_is_array(root)) {
+        set_error(s, "<validation>", json_error_wrong_type, "Expected array, got %s", type_name(root));
+        return -1;
+    }
+    next_token(s);
+
+    while(token(s) != ']') {
+        json_t *value;
+
+        if(strict != 0) {
+            set_error(s, "<format>", json_error_invalid_format, "Expected ']' after '%c', got '%c'",
+                      (strict == 1 ? '!' : '*'),
+                      token(s));
+            return -1;
+        }
+
+        if(!token(s)) {
+            set_error(s, "<format>", json_error_invalid_format, "Unexpected end of format string");
+            return -1;
+        }
+
+        if(token(s) == '!' || token(s) == '*') {
+            strict = (token(s) == '!' ? 1 : -1);
+            next_token(s);
+            continue;
+        }
+
+        if(!strchr(unpack_value_starters, token(s))) {
+            set_error(s, "<format>", json_error_invalid_format, "Unexpected format character '%c'",
+                      token(s));
+            return -1;
+        }
+
+        if(!root) {
+            /* skipping */
+            value = NULL;
+        }
+        else {
+            value = json_array_get(root, i);
+            if(!value) {
+                set_error(s, "<validation>", json_error_index_out_of_range, "Array index %lu out of range",
+                          (unsigned long)i);
+                return -1;
+            }
+        }
+
+        if(unpack(s, value, ap))
+            return -1;
+
+        next_token(s);
+        i++;
+    }
+
+    if(strict == 0 && (s->flags & JSON_STRICT))
+        strict = 1;
+
+    if(root && strict == 1 && i != json_array_size(root)) {
+        long diff = (long)json_array_size(root) - (long)i;
+        set_error(s, "<validation>", json_error_end_of_input_expected, "%li array item(s) left unpacked", diff);
+        return -1;
+    }
+
+    return 0;
+}
+
+static int unpack(scanner_t *s, json_t *root, va_list *ap)
+{
+    switch(token(s))
+    {
+        case '{':
+            return unpack_object(s, root, ap);
+
+        case '[':
+            return unpack_array(s, root, ap);
+
+        case 's':
+            if(root && !json_is_string(root)) {
+                set_error(s, "<validation>", json_error_wrong_type, "Expected string, got %s",
+                          type_name(root));
+                return -1;
+            }
+
+            if(!(s->flags & JSON_VALIDATE_ONLY)) {
+                const char **str_target;
+                size_t *len_target = NULL;
+
+                str_target = va_arg(*ap, const char **);
+                if(!str_target) {
+                    set_error(s, "<args>", json_error_null_value, "NULL string argument");
+                    return -1;
+                }
+
+                next_token(s);
+
+                if(token(s) == '%') {
+                    len_target = va_arg(*ap, size_t *);
+                    if(!len_target) {
+                        set_error(s, "<args>", json_error_null_value, "NULL string length argument");
+                        return -1;
+                    }
+                }
+                else
+                    prev_token(s);
+
+                if(root) {
+                    *str_target = json_string_value(root);
+                    if(len_target)
+                        *len_target = json_string_length(root);
+                }
+            }
+            return 0;
+
+        case 'i':
+            if(root && !json_is_integer(root)) {
+                set_error(s, "<validation>", json_error_wrong_type, "Expected integer, got %s",
+                          type_name(root));
+                return -1;
+            }
+
+            if(!(s->flags & JSON_VALIDATE_ONLY)) {
+                int *target = va_arg(*ap, int*);
+                if(root)
+                    *target = (int)json_integer_value(root);
+            }
+
+            return 0;
+
+        case 'I':
+            if(root && !json_is_integer(root)) {
+                set_error(s, "<validation>", json_error_wrong_type, "Expected integer, got %s",
+                          type_name(root));
+                return -1;
+            }
+
+            if(!(s->flags & JSON_VALIDATE_ONLY)) {
+                json_int_t *target = va_arg(*ap, json_int_t*);
+                if(root)
+                    *target = json_integer_value(root);
+            }
+
+            return 0;
+
+        case 'b':
+            if(root && !json_is_boolean(root)) {
+                set_error(s, "<validation>", json_error_wrong_type, "Expected true or false, got %s",
+                          type_name(root));
+                return -1;
+            }
+
+            if(!(s->flags & JSON_VALIDATE_ONLY)) {
+                int *target = va_arg(*ap, int*);
+                if(root)
+                    *target = json_is_true(root);
+            }
+
+            return 0;
+
+        case 'f':
+            if(root && !json_is_real(root)) {
+                set_error(s, "<validation>", json_error_wrong_type, "Expected real, got %s",
+                          type_name(root));
+                return -1;
+            }
+
+            if(!(s->flags & JSON_VALIDATE_ONLY)) {
+                double *target = va_arg(*ap, double*);
+                if(root)
+                    *target = json_real_value(root);
+            }
+
+            return 0;
+
+        case 'F':
+            if(root && !json_is_number(root)) {
+                set_error(s, "<validation>", json_error_wrong_type, "Expected real or integer, got %s",
+                          type_name(root));
+                return -1;
+            }
+
+            if(!(s->flags & JSON_VALIDATE_ONLY)) {
+                double *target = va_arg(*ap, double*);
+                if(root)
+                    *target = json_number_value(root);
+            }
+
+            return 0;
+
+        case 'O':
+            if(root && !(s->flags & JSON_VALIDATE_ONLY))
+                json_incref(root);
+            /* Fall through */
+
+        case 'o':
+            if(!(s->flags & JSON_VALIDATE_ONLY)) {
+                json_t **target = va_arg(*ap, json_t**);
+                if(root)
+                    *target = root;
+            }
+
+            return 0;
+
+        case 'n':
+            /* Never assign, just validate */
+            if(root && !json_is_null(root)) {
+                set_error(s, "<validation>", json_error_wrong_type, "Expected null, got %s",
+                          type_name(root));
+                return -1;
+            }
+            return 0;
+
+        default:
+            set_error(s, "<format>", json_error_invalid_format, "Unexpected format character '%c'",
+                      token(s));
+            return -1;
+    }
+}
+
+json_t *json_vpack_ex(json_error_t *error, size_t flags,
+                      const char *fmt, va_list ap)
+{
+    scanner_t s;
+    va_list ap_copy;
+    json_t *value;
+
+    if(!fmt || !*fmt) {
+        jsonp_error_init(error, "<format>");
+        jsonp_error_set(error, -1, -1, 0, json_error_invalid_argument, "NULL or empty format string");
+        return NULL;
+    }
+    jsonp_error_init(error, NULL);
+
+    scanner_init(&s, error, flags, fmt);
+    next_token(&s);
+
+    va_copy(ap_copy, ap);
+    value = pack(&s, &ap_copy);
+    va_end(ap_copy);
+
+    if(!value)
+        return NULL;
+
+    next_token(&s);
+    if(token(&s)) {
+        json_decref(value);
+        set_error(&s, "<format>", json_error_invalid_format, "Garbage after format string");
+        return NULL;
+    }
+    if(s.has_error) {
+        json_decref(value);
+        return NULL;
+    }
+
+    return value;
+}
+
+json_t *json_pack_ex(json_error_t *error, size_t flags, const char *fmt, ...)
+{
+    json_t *value;
+    va_list ap;
+
+    va_start(ap, fmt);
+    value = json_vpack_ex(error, flags, fmt, ap);
+    va_end(ap);
+
+    return value;
+}
+
+json_t *json_pack(const char *fmt, ...)
+{
+    json_t *value;
+    va_list ap;
+
+    va_start(ap, fmt);
+    value = json_vpack_ex(NULL, 0, fmt, ap);
+    va_end(ap);
+
+    return value;
+}
+
+int json_vunpack_ex(json_t *root, json_error_t *error, size_t flags,
+                    const char *fmt, va_list ap)
+{
+    scanner_t s;
+    va_list ap_copy;
+
+    if(!root) {
+        jsonp_error_init(error, "<root>");
+        jsonp_error_set(error, -1, -1, 0, json_error_null_value, "NULL root value");
+        return -1;
+    }
+
+    if(!fmt || !*fmt) {
+        jsonp_error_init(error, "<format>");
+        jsonp_error_set(error, -1, -1, 0, json_error_invalid_argument, "NULL or empty format string");
+        return -1;
+    }
+    jsonp_error_init(error, NULL);
+
+    scanner_init(&s, error, flags, fmt);
+    next_token(&s);
+
+    va_copy(ap_copy, ap);
+    if(unpack(&s, root, &ap_copy)) {
+        va_end(ap_copy);
+        return -1;
+    }
+    va_end(ap_copy);
+
+    next_token(&s);
+    if(token(&s)) {
+        set_error(&s, "<format>", json_error_invalid_format, "Garbage after format string");
+        return -1;
+    }
+
+    return 0;
+}
+
+int json_unpack_ex(json_t *root, json_error_t *error, size_t flags, const char *fmt, ...)
+{
+    int ret;
+    va_list ap;
+
+    va_start(ap, fmt);
+    ret = json_vunpack_ex(root, error, flags, fmt, ap);
+    va_end(ap);
+
+    return ret;
+}
+
+int json_unpack(json_t *root, const char *fmt, ...)
+{
+    int ret;
+    va_list ap;
+
+    va_start(ap, fmt);
+    ret = json_vunpack_ex(root, NULL, 0, fmt, ap);
+    va_end(ap);
+
+    return ret;
+}
diff --git a/client/jansson/path.c b/client/jansson/path.c
index 08f2da9f6..e3098f5f4 100644
--- a/client/jansson/path.c
+++ b/client/jansson/path.c
@@ -13,7 +13,6 @@
 #include <jansson.h>
 #include "jansson_private.h"
 
-
 json_t *json_path_get(const json_t *json, const char *path)
 {
     static const char root_chr = '$', array_open = '[';
diff --git a/client/jansson/path.h b/client/jansson/path.h
deleted file mode 100644
index e6cf31a2b..000000000
--- a/client/jansson/path.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright (c) 2012 Rogerz Zhang <rogerz.zhang@gmail.com>
- *
- * Jansson is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See LICENSE for details.
- * 
- * source here https://github.com/rogerz/jansson/blob/json_path/src/path.c
- */
-
-json_t *json_path_get(const json_t *json, const char *path);
-int json_path_set_new(json_t *json, const char *path, json_t *value, size_t flags, json_error_t *error);
-
-static JSON_INLINE
-int json_path_set(json_t *json, const char *path, json_t *value, size_t flags, json_error_t *error)
-{
-    return json_path_set_new(json, path, json_incref(value), flags, error);
-}
diff --git a/client/jansson/strbuffer.c b/client/jansson/strbuffer.c
new file mode 100644
index 000000000..5e8c00395
--- /dev/null
+++ b/client/jansson/strbuffer.c
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2009-2016 Petri Lehtinen <petri@digip.org>
+ *
+ * Jansson is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+#include "jansson_private.h"
+#include "strbuffer.h"
+
+#define STRBUFFER_MIN_SIZE  16
+#define STRBUFFER_FACTOR    2
+#define STRBUFFER_SIZE_MAX  ((size_t)-1)
+
+int strbuffer_init(strbuffer_t *strbuff)
+{
+    strbuff->size = STRBUFFER_MIN_SIZE;
+    strbuff->length = 0;
+
+    strbuff->value = jsonp_malloc(strbuff->size);
+    if(!strbuff->value)
+        return -1;
+
+    /* initialize to empty */
+    strbuff->value[0] = '\0';
+    return 0;
+}
+
+void strbuffer_close(strbuffer_t *strbuff)
+{
+    if(strbuff->value)
+        jsonp_free(strbuff->value);
+
+    strbuff->size = 0;
+    strbuff->length = 0;
+    strbuff->value = NULL;
+}
+
+void strbuffer_clear(strbuffer_t *strbuff)
+{
+    strbuff->length = 0;
+    strbuff->value[0] = '\0';
+}
+
+const char *strbuffer_value(const strbuffer_t *strbuff)
+{
+    return strbuff->value;
+}
+
+char *strbuffer_steal_value(strbuffer_t *strbuff)
+{
+    char *result = strbuff->value;
+    strbuff->value = NULL;
+    return result;
+}
+
+int strbuffer_append_byte(strbuffer_t *strbuff, char byte)
+{
+    return strbuffer_append_bytes(strbuff, &byte, 1);
+}
+
+int strbuffer_append_bytes(strbuffer_t *strbuff, const char *data, size_t size)
+{
+    if(size >= strbuff->size - strbuff->length)
+    {
+        size_t new_size;
+        char *new_value;
+
+        /* avoid integer overflow */
+        if (strbuff->size > STRBUFFER_SIZE_MAX / STRBUFFER_FACTOR
+            || size > STRBUFFER_SIZE_MAX - 1
+            || strbuff->length > STRBUFFER_SIZE_MAX - 1 - size)
+            return -1;
+
+        new_size = max(strbuff->size * STRBUFFER_FACTOR,
+                       strbuff->length + size + 1);
+
+        new_value = jsonp_malloc(new_size);
+        if(!new_value)
+            return -1;
+
+        memcpy(new_value, strbuff->value, strbuff->length);
+
+        jsonp_free(strbuff->value);
+        strbuff->value = new_value;
+        strbuff->size = new_size;
+    }
+
+    memcpy(strbuff->value + strbuff->length, data, size);
+    strbuff->length += size;
+    strbuff->value[strbuff->length] = '\0';
+
+    return 0;
+}
+
+char strbuffer_pop(strbuffer_t *strbuff)
+{
+    if(strbuff->length > 0) {
+        char c = strbuff->value[--strbuff->length];
+        strbuff->value[strbuff->length] = '\0';
+        return c;
+    }
+    else
+        return '\0';
+}
diff --git a/client/jansson/strconv.c b/client/jansson/strconv.c
new file mode 100644
index 000000000..8075481e3
--- /dev/null
+++ b/client/jansson/strconv.c
@@ -0,0 +1,145 @@
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+#include <math.h>
+#ifdef __MINGW32__
+#undef __NO_ISOCEXT /* ensure stdlib.h will declare prototypes for mingw own 'strtod' replacement, called '__strtod' */
+#endif
+#include "jansson_private.h"
+#include "strbuffer.h"
+
+/* need jansson_private_config.h to get the correct snprintf */
+#ifdef HAVE_CONFIG_H
+#include <jansson_private_config.h>
+#endif
+
+#ifdef __MINGW32__
+#define strtod __strtod
+#endif
+
+#if JSON_HAVE_LOCALECONV
+#include <locale.h>
+
+/*
+  - This code assumes that the decimal separator is exactly one
+    character.
+
+  - If setlocale() is called by another thread between the call to
+    localeconv() and the call to sprintf() or strtod(), the result may
+    be wrong. setlocale() is not thread-safe and should not be used
+    this way. Multi-threaded programs should use uselocale() instead.
+*/
+
+static void to_locale(strbuffer_t *strbuffer)
+{
+    const char *point;
+    char *pos;
+
+    point = localeconv()->decimal_point;
+    if(*point == '.') {
+        /* No conversion needed */
+        return;
+    }
+
+    pos = strchr(strbuffer->value, '.');
+    if(pos)
+        *pos = *point;
+}
+
+static void from_locale(char *buffer)
+{
+    const char *point;
+    char *pos;
+
+    point = localeconv()->decimal_point;
+    if(*point == '.') {
+        /* No conversion needed */
+        return;
+    }
+
+    pos = strchr(buffer, *point);
+    if(pos)
+        *pos = '.';
+}
+#endif
+
+int jsonp_strtod(strbuffer_t *strbuffer, double *out)
+{
+    double value;
+    char *end;
+
+#if JSON_HAVE_LOCALECONV
+    to_locale(strbuffer);
+#endif
+
+    errno = 0;
+    value = strtod(strbuffer->value, &end);
+    assert(end == strbuffer->value + strbuffer->length);
+
+    if((value == HUGE_VAL || value == -HUGE_VAL) && errno == ERANGE) {
+        /* Overflow */
+        return -1;
+    }
+
+    *out = value;
+    return 0;
+}
+
+int jsonp_dtostr(char *buffer, size_t size, double value, int precision)
+{
+    int ret;
+    char *start, *end;
+    size_t length;
+
+    if (precision == 0)
+        precision = 17;
+
+    ret = snprintf(buffer, size, "%.*g", precision, value);
+    if(ret < 0)
+        return -1;
+
+    length = (size_t)ret;
+    if(length >= size)
+        return -1;
+
+#if JSON_HAVE_LOCALECONV
+    from_locale(buffer);
+#endif
+
+    /* Make sure there's a dot or 'e' in the output. Otherwise
+       a real is converted to an integer when decoding */
+    if(strchr(buffer, '.') == NULL &&
+       strchr(buffer, 'e') == NULL)
+    {
+        if(length + 3 >= size) {
+            /* No space to append ".0" */
+            return -1;
+        }
+        buffer[length] = '.';
+        buffer[length + 1] = '0';
+        buffer[length + 2] = '\0';
+        length += 2;
+    }
+
+    /* Remove leading '+' from positive exponent. Also remove leading
+       zeros from exponents (added by some printf() implementations) */
+    start = strchr(buffer, 'e');
+    if(start) {
+        start++;
+        end = start + 1;
+
+        if(*start == '-')
+            start++;
+
+        while(*end == '0')
+            end++;
+
+        if(end != start) {
+            memmove(start, end, length - (size_t)(end - buffer));
+            length -= (size_t)(end - start);
+        }
+    }
+
+    return (int)length;
+}
diff --git a/client/jansson/utf.c b/client/jansson/utf.c
new file mode 100644
index 000000000..be966cbd8
--- /dev/null
+++ b/client/jansson/utf.c
@@ -0,0 +1,187 @@
+/*
+ * Copyright (c) 2009-2016 Petri Lehtinen <petri@digip.org>
+ *
+ * Jansson is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#include <string.h>
+#include "utf.h"
+
+int utf8_encode(int32_t codepoint, char *buffer, size_t *size)
+{
+    if(codepoint < 0)
+        return -1;
+    else if(codepoint < 0x80)
+    {
+        buffer[0] = (char)codepoint;
+        *size = 1;
+    }
+    else if(codepoint < 0x800)
+    {
+        buffer[0] = 0xC0 + ((codepoint & 0x7C0) >> 6);
+        buffer[1] = 0x80 + ((codepoint & 0x03F));
+        *size = 2;
+    }
+    else if(codepoint < 0x10000)
+    {
+        buffer[0] = 0xE0 + ((codepoint & 0xF000) >> 12);
+        buffer[1] = 0x80 + ((codepoint & 0x0FC0) >> 6);
+        buffer[2] = 0x80 + ((codepoint & 0x003F));
+        *size = 3;
+    }
+    else if(codepoint <= 0x10FFFF)
+    {
+        buffer[0] = 0xF0 + ((codepoint & 0x1C0000) >> 18);
+        buffer[1] = 0x80 + ((codepoint & 0x03F000) >> 12);
+        buffer[2] = 0x80 + ((codepoint & 0x000FC0) >> 6);
+        buffer[3] = 0x80 + ((codepoint & 0x00003F));
+        *size = 4;
+    }
+    else
+        return -1;
+
+    return 0;
+}
+
+size_t utf8_check_first(char byte)
+{
+    unsigned char u = (unsigned char)byte;
+
+    if(u < 0x80)
+        return 1;
+
+    if(0x80 <= u && u <= 0xBF) {
+        /* second, third or fourth byte of a multi-byte
+           sequence, i.e. a "continuation byte" */
+        return 0;
+    }
+    else if(u == 0xC0 || u == 0xC1) {
+        /* overlong encoding of an ASCII byte */
+        return 0;
+    }
+    else if(0xC2 <= u && u <= 0xDF) {
+        /* 2-byte sequence */
+        return 2;
+    }
+
+    else if(0xE0 <= u && u <= 0xEF) {
+        /* 3-byte sequence */
+        return 3;
+    }
+    else if(0xF0 <= u && u <= 0xF4) {
+        /* 4-byte sequence */
+        return 4;
+    }
+    else { /* u >= 0xF5 */
+        /* Restricted (start of 4-, 5- or 6-byte sequence) or invalid
+           UTF-8 */
+        return 0;
+    }
+}
+
+size_t utf8_check_full(const char *buffer, size_t size, int32_t *codepoint)
+{
+    size_t i;
+    int32_t value = 0;
+    unsigned char u = (unsigned char)buffer[0];
+
+    if(size == 2)
+    {
+        value = u & 0x1F;
+    }
+    else if(size == 3)
+    {
+        value = u & 0xF;
+    }
+    else if(size == 4)
+    {
+        value = u & 0x7;
+    }
+    else
+        return 0;
+
+    for(i = 1; i < size; i++)
+    {
+        u = (unsigned char)buffer[i];
+
+        if(u < 0x80 || u > 0xBF) {
+            /* not a continuation byte */
+            return 0;
+        }
+
+        value = (value << 6) + (u & 0x3F);
+    }
+
+    if(value > 0x10FFFF) {
+        /* not in Unicode range */
+        return 0;
+    }
+
+    else if(0xD800 <= value && value <= 0xDFFF) {
+        /* invalid code point (UTF-16 surrogate halves) */
+        return 0;
+    }
+
+    else if((size == 2 && value < 0x80) ||
+            (size == 3 && value < 0x800) ||
+            (size == 4 && value < 0x10000)) {
+        /* overlong encoding */
+        return 0;
+    }
+
+    if(codepoint)
+        *codepoint = value;
+
+    return 1;
+}
+
+const char *utf8_iterate(const char *buffer, size_t bufsize, int32_t *codepoint)
+{
+    size_t count;
+    int32_t value;
+
+    if(!bufsize)
+        return buffer;
+
+    count = utf8_check_first(buffer[0]);
+    if(count <= 0)
+        return NULL;
+
+    if(count == 1)
+        value = (unsigned char)buffer[0];
+    else
+    {
+        if(count > bufsize || !utf8_check_full(buffer, count, &value))
+            return NULL;
+    }
+
+    if(codepoint)
+        *codepoint = value;
+
+    return buffer + count;
+}
+
+int utf8_check_string(const char *string, size_t length)
+{
+    size_t i;
+
+    for(i = 0; i < length; i++)
+    {
+        size_t count = utf8_check_first(string[i]);
+        if(count == 0)
+            return 0;
+        else if(count > 1)
+        {
+            if(count > length - i)
+                return 0;
+
+            if(!utf8_check_full(&string[i], count, NULL))
+                return 0;
+
+            i += count - 1;
+        }
+    }
+
+    return 1;
+}
diff --git a/client/jansson/utf.h b/client/jansson/utf.h
new file mode 100644
index 000000000..e182df78f
--- /dev/null
+++ b/client/jansson/utf.h
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2009-2016 Petri Lehtinen <petri@digip.org>
+ *
+ * Jansson is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#ifndef UTF_H
+#define UTF_H
+
+#ifdef HAVE_CONFIG_H
+#include <jansson_private_config.h>
+#endif
+
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
+int utf8_encode(int32_t codepoint, char *buffer, size_t *size);
+
+size_t utf8_check_first(char byte);
+size_t utf8_check_full(const char *buffer, size_t size, int32_t *codepoint);
+const char *utf8_iterate(const char *buffer, size_t size, int32_t *codepoint);
+
+int utf8_check_string(const char *string, size_t length);
+
+#endif
diff --git a/client/jansson/value.c b/client/jansson/value.c
new file mode 100644
index 000000000..b3b31412b
--- /dev/null
+++ b/client/jansson/value.c
@@ -0,0 +1,1078 @@
+/*
+ * Copyright (c) 2009-2016 Petri Lehtinen <petri@digip.org>
+ *
+ * Jansson is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include <jansson_private_config.h>
+#endif
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
+#include "jansson.h"
+#include "hashtable.h"
+#include "jansson_private.h"
+#include "utf.h"
+
+/* Work around nonstandard isnan() and isinf() implementations */
+#ifndef isnan
+#ifndef __sun
+static JSON_INLINE int isnan(double x) { return x != x; }
+#endif
+#endif
+#ifndef isinf
+static JSON_INLINE int isinf(double x) { return !isnan(x) && isnan(x - x); }
+#endif
+
+static JSON_INLINE void json_init(json_t *json, json_type type)
+{
+    json->type = type;
+    json->refcount = 1;
+}
+
+
+/*** object ***/
+
+extern volatile uint32_t hashtable_seed;
+
+json_t *json_object(void)
+{
+    json_object_t *object = jsonp_malloc(sizeof(json_object_t));
+    if(!object)
+        return NULL;
+
+    if (!hashtable_seed) {
+        /* Autoseed */
+        json_object_seed(0);
+    }
+
+    json_init(&object->json, JSON_OBJECT);
+
+    if(hashtable_init(&object->hashtable))
+    {
+        jsonp_free(object);
+        return NULL;
+    }
+
+    return &object->json;
+}
+
+static void json_delete_object(json_object_t *object)
+{
+    hashtable_close(&object->hashtable);
+    jsonp_free(object);
+}
+
+size_t json_object_size(const json_t *json)
+{
+    json_object_t *object;
+
+    if(!json_is_object(json))
+        return 0;
+
+    object = json_to_object(json);
+    return object->hashtable.size;
+}
+
+json_t *json_object_get(const json_t *json, const char *key)
+{
+    json_object_t *object;
+
+    if(!key || !json_is_object(json))
+        return NULL;
+
+    object = json_to_object(json);
+    return hashtable_get(&object->hashtable, key);
+}
+
+int json_object_set_new_nocheck(json_t *json, const char *key, json_t *value)
+{
+    json_object_t *object;
+
+    if(!value)
+        return -1;
+
+    if(!key || !json_is_object(json) || json == value)
+    {
+        json_decref(value);
+        return -1;
+    }
+    object = json_to_object(json);
+
+    if(hashtable_set(&object->hashtable, key, value))
+    {
+        json_decref(value);
+        return -1;
+    }
+
+    return 0;
+}
+
+int json_object_set_new(json_t *json, const char *key, json_t *value)
+{
+    if(!key || !utf8_check_string(key, strlen(key)))
+    {
+        json_decref(value);
+        return -1;
+    }
+
+    return json_object_set_new_nocheck(json, key, value);
+}
+
+int json_object_del(json_t *json, const char *key)
+{
+    json_object_t *object;
+
+    if(!key || !json_is_object(json))
+        return -1;
+
+    object = json_to_object(json);
+    return hashtable_del(&object->hashtable, key);
+}
+
+int json_object_clear(json_t *json)
+{
+    json_object_t *object;
+
+    if(!json_is_object(json))
+        return -1;
+
+    object = json_to_object(json);
+    hashtable_clear(&object->hashtable);
+
+    return 0;
+}
+
+int json_object_update(json_t *object, json_t *other)
+{
+    const char *key;
+    json_t *value;
+
+    if(!json_is_object(object) || !json_is_object(other))
+        return -1;
+
+    json_object_foreach(other, key, value) {
+        if(json_object_set_nocheck(object, key, value))
+            return -1;
+    }
+
+    return 0;
+}
+
+int json_object_update_existing(json_t *object, json_t *other)
+{
+    const char *key;
+    json_t *value;
+
+    if(!json_is_object(object) || !json_is_object(other))
+        return -1;
+
+    json_object_foreach(other, key, value) {
+        if(json_object_get(object, key))
+            json_object_set_nocheck(object, key, value);
+    }
+
+    return 0;
+}
+
+int json_object_update_missing(json_t *object, json_t *other)
+{
+    const char *key;
+    json_t *value;
+
+    if(!json_is_object(object) || !json_is_object(other))
+        return -1;
+
+    json_object_foreach(other, key, value) {
+        if(!json_object_get(object, key))
+            json_object_set_nocheck(object, key, value);
+    }
+
+    return 0;
+}
+
+void *json_object_iter(json_t *json)
+{
+    json_object_t *object;
+
+    if(!json_is_object(json))
+        return NULL;
+
+    object = json_to_object(json);
+    return hashtable_iter(&object->hashtable);
+}
+
+void *json_object_iter_at(json_t *json, const char *key)
+{
+    json_object_t *object;
+
+    if(!key || !json_is_object(json))
+        return NULL;
+
+    object = json_to_object(json);
+    return hashtable_iter_at(&object->hashtable, key);
+}
+
+void *json_object_iter_next(json_t *json, void *iter)
+{
+    json_object_t *object;
+
+    if(!json_is_object(json) || iter == NULL)
+        return NULL;
+
+    object = json_to_object(json);
+    return hashtable_iter_next(&object->hashtable, iter);
+}
+
+const char *json_object_iter_key(void *iter)
+{
+    if(!iter)
+        return NULL;
+
+    return hashtable_iter_key(iter);
+}
+
+json_t *json_object_iter_value(void *iter)
+{
+    if(!iter)
+        return NULL;
+
+    return (json_t *)hashtable_iter_value(iter);
+}
+
+int json_object_iter_set_new(json_t *json, void *iter, json_t *value)
+{
+    if(!json_is_object(json) || !iter || !value)
+    {
+        json_decref(value);
+        return -1;
+    }
+
+    hashtable_iter_set(iter, value);
+    return 0;
+}
+
+void *json_object_key_to_iter(const char *key)
+{
+    if(!key)
+        return NULL;
+
+    return hashtable_key_to_iter(key);
+}
+
+static int json_object_equal(const json_t *object1, const json_t *object2)
+{
+    const char *key;
+    const json_t *value1, *value2;
+
+    if(json_object_size(object1) != json_object_size(object2))
+        return 0;
+
+    json_object_foreach((json_t *)object1, key, value1) {
+        value2 = json_object_get(object2, key);
+
+        if(!json_equal(value1, value2))
+            return 0;
+    }
+
+    return 1;
+}
+
+static json_t *json_object_copy(json_t *object)
+{
+    json_t *result;
+
+    const char *key;
+    json_t *value;
+
+    result = json_object();
+    if(!result)
+        return NULL;
+
+    json_object_foreach(object, key, value)
+        json_object_set_nocheck(result, key, value);
+
+    return result;
+}
+
+static json_t *json_object_deep_copy(const json_t *object)
+{
+    json_t *result;
+    void *iter;
+
+    result = json_object();
+    if(!result)
+        return NULL;
+
+    /* Cannot use json_object_foreach because object has to be cast
+       non-const */
+    iter = json_object_iter((json_t *)object);
+    while(iter) {
+        const char *key;
+        const json_t *value;
+        key = json_object_iter_key(iter);
+        value = json_object_iter_value(iter);
+
+        json_object_set_new_nocheck(result, key, json_deep_copy(value));
+        iter = json_object_iter_next((json_t *)object, iter);
+    }
+
+    return result;
+}
+
+
+/*** array ***/
+
+json_t *json_array(void)
+{
+    json_array_t *array = jsonp_malloc(sizeof(json_array_t));
+    if(!array)
+        return NULL;
+    json_init(&array->json, JSON_ARRAY);
+
+    array->entries = 0;
+    array->size = 8;
+
+    array->table = jsonp_malloc(array->size * sizeof(json_t *));
+    if(!array->table) {
+        jsonp_free(array);
+        return NULL;
+    }
+
+    return &array->json;
+}
+
+static void json_delete_array(json_array_t *array)
+{
+    size_t i;
+
+    for(i = 0; i < array->entries; i++)
+        json_decref(array->table[i]);
+
+    jsonp_free(array->table);
+    jsonp_free(array);
+}
+
+size_t json_array_size(const json_t *json)
+{
+    if(!json_is_array(json))
+        return 0;
+
+    return json_to_array(json)->entries;
+}
+
+json_t *json_array_get(const json_t *json, size_t index)
+{
+    json_array_t *array;
+    if(!json_is_array(json))
+        return NULL;
+    array = json_to_array(json);
+
+    if(index >= array->entries)
+        return NULL;
+
+    return array->table[index];
+}
+
+int json_array_set_new(json_t *json, size_t index, json_t *value)
+{
+    json_array_t *array;
+
+    if(!value)
+        return -1;
+
+    if(!json_is_array(json) || json == value)
+    {
+        json_decref(value);
+        return -1;
+    }
+    array = json_to_array(json);
+
+    if(index >= array->entries)
+    {
+        json_decref(value);
+        return -1;
+    }
+
+    json_decref(array->table[index]);
+    array->table[index] = value;
+
+    return 0;
+}
+
+static void array_move(json_array_t *array, size_t dest,
+                       size_t src, size_t count)
+{
+    memmove(&array->table[dest], &array->table[src], count * sizeof(json_t *));
+}
+
+static void array_copy(json_t **dest, size_t dpos,
+                       json_t **src, size_t spos,
+                       size_t count)
+{
+    memcpy(&dest[dpos], &src[spos], count * sizeof(json_t *));
+}
+
+static json_t **json_array_grow(json_array_t *array,
+                                size_t amount,
+                                int copy)
+{
+    size_t new_size;
+    json_t **old_table, **new_table;
+
+    if(array->entries + amount <= array->size)
+        return array->table;
+
+    old_table = array->table;
+
+    new_size = max(array->size + amount, array->size * 2);
+    new_table = jsonp_malloc(new_size * sizeof(json_t *));
+    if(!new_table)
+        return NULL;
+
+    array->size = new_size;
+    array->table = new_table;
+
+    if(copy) {
+        array_copy(array->table, 0, old_table, 0, array->entries);
+        jsonp_free(old_table);
+        return array->table;
+    }
+
+    return old_table;
+}
+
+int json_array_append_new(json_t *json, json_t *value)
+{
+    json_array_t *array;
+
+    if(!value)
+        return -1;
+
+    if(!json_is_array(json) || json == value)
+    {
+        json_decref(value);
+        return -1;
+    }
+    array = json_to_array(json);
+
+    if(!json_array_grow(array, 1, 1)) {
+        json_decref(value);
+        return -1;
+    }
+
+    array->table[array->entries] = value;
+    array->entries++;
+
+    return 0;
+}
+
+int json_array_insert_new(json_t *json, size_t index, json_t *value)
+{
+    json_array_t *array;
+    json_t **old_table;
+
+    if(!value)
+        return -1;
+
+    if(!json_is_array(json) || json == value) {
+        json_decref(value);
+        return -1;
+    }
+    array = json_to_array(json);
+
+    if(index > array->entries) {
+        json_decref(value);
+        return -1;
+    }
+
+    old_table = json_array_grow(array, 1, 0);
+    if(!old_table) {
+        json_decref(value);
+        return -1;
+    }
+
+    if(old_table != array->table) {
+        array_copy(array->table, 0, old_table, 0, index);
+        array_copy(array->table, index + 1, old_table, index,
+                   array->entries - index);
+        jsonp_free(old_table);
+    }
+    else
+        array_move(array, index + 1, index, array->entries - index);
+
+    array->table[index] = value;
+    array->entries++;
+
+    return 0;
+}
+
+int json_array_remove(json_t *json, size_t index)
+{
+    json_array_t *array;
+
+    if(!json_is_array(json))
+        return -1;
+    array = json_to_array(json);
+
+    if(index >= array->entries)
+        return -1;
+
+    json_decref(array->table[index]);
+
+    /* If we're removing the last element, nothing has to be moved */
+    if(index < array->entries - 1)
+        array_move(array, index, index + 1, array->entries - index - 1);
+
+    array->entries--;
+
+    return 0;
+}
+
+int json_array_clear(json_t *json)
+{
+    json_array_t *array;
+    size_t i;
+
+    if(!json_is_array(json))
+        return -1;
+    array = json_to_array(json);
+
+    for(i = 0; i < array->entries; i++)
+        json_decref(array->table[i]);
+
+    array->entries = 0;
+    return 0;
+}
+
+int json_array_extend(json_t *json, json_t *other_json)
+{
+    json_array_t *array, *other;
+    size_t i;
+
+    if(!json_is_array(json) || !json_is_array(other_json))
+        return -1;
+    array = json_to_array(json);
+    other = json_to_array(other_json);
+
+    if(!json_array_grow(array, other->entries, 1))
+        return -1;
+
+    for(i = 0; i < other->entries; i++)
+        json_incref(other->table[i]);
+
+    array_copy(array->table, array->entries, other->table, 0, other->entries);
+
+    array->entries += other->entries;
+    return 0;
+}
+
+static int json_array_equal(const json_t *array1, const json_t *array2)
+{
+    size_t i, size;
+
+    size = json_array_size(array1);
+    if(size != json_array_size(array2))
+        return 0;
+
+    for(i = 0; i < size; i++)
+    {
+        json_t *value1, *value2;
+
+        value1 = json_array_get(array1, i);
+        value2 = json_array_get(array2, i);
+
+        if(!json_equal(value1, value2))
+            return 0;
+    }
+
+    return 1;
+}
+
+static json_t *json_array_copy(json_t *array)
+{
+    json_t *result;
+    size_t i;
+
+    result = json_array();
+    if(!result)
+        return NULL;
+
+    for(i = 0; i < json_array_size(array); i++)
+        json_array_append(result, json_array_get(array, i));
+
+    return result;
+}
+
+static json_t *json_array_deep_copy(const json_t *array)
+{
+    json_t *result;
+    size_t i;
+
+    result = json_array();
+    if(!result)
+        return NULL;
+
+    for(i = 0; i < json_array_size(array); i++)
+        json_array_append_new(result, json_deep_copy(json_array_get(array, i)));
+
+    return result;
+}
+
+/*** string ***/
+
+static json_t *string_create(const char *value, size_t len, int own)
+{
+    char *v;
+    json_string_t *string;
+
+    if(!value)
+        return NULL;
+
+    if(own)
+        v = (char *)value;
+    else {
+        v = jsonp_strndup(value, len);
+        if(!v)
+            return NULL;
+    }
+
+    string = jsonp_malloc(sizeof(json_string_t));
+    if(!string) {
+        if(!own)
+            jsonp_free(v);
+        return NULL;
+    }
+    json_init(&string->json, JSON_STRING);
+    string->value = v;
+    string->length = len;
+
+    return &string->json;
+}
+
+json_t *json_string_nocheck(const char *value)
+{
+    if(!value)
+        return NULL;
+
+    return string_create(value, strlen(value), 0);
+}
+
+json_t *json_stringn_nocheck(const char *value, size_t len)
+{
+    return string_create(value, len, 0);
+}
+
+/* this is private; "steal" is not a public API concept */
+json_t *jsonp_stringn_nocheck_own(const char *value, size_t len)
+{
+    return string_create(value, len, 1);
+}
+
+json_t *json_string(const char *value)
+{
+    if(!value)
+        return NULL;
+
+    return json_stringn(value, strlen(value));
+}
+
+json_t *json_stringn(const char *value, size_t len)
+{
+    if(!value || !utf8_check_string(value, len))
+        return NULL;
+
+    return json_stringn_nocheck(value, len);
+}
+
+const char *json_string_value(const json_t *json)
+{
+    if(!json_is_string(json))
+        return NULL;
+
+    return json_to_string(json)->value;
+}
+
+size_t json_string_length(const json_t *json)
+{
+    if(!json_is_string(json))
+        return 0;
+
+    return json_to_string(json)->length;
+}
+
+int json_string_set_nocheck(json_t *json, const char *value)
+{
+    if(!value)
+        return -1;
+
+    return json_string_setn_nocheck(json, value, strlen(value));
+}
+
+int json_string_setn_nocheck(json_t *json, const char *value, size_t len)
+{
+    char *dup;
+    json_string_t *string;
+
+    if(!json_is_string(json) || !value)
+        return -1;
+
+    dup = jsonp_strndup(value, len);
+    if(!dup)
+        return -1;
+
+    string = json_to_string(json);
+    jsonp_free(string->value);
+    string->value = dup;
+    string->length = len;
+
+    return 0;
+}
+
+int json_string_set(json_t *json, const char *value)
+{
+    if(!value)
+        return -1;
+
+    return json_string_setn(json, value, strlen(value));
+}
+
+int json_string_setn(json_t *json, const char *value, size_t len)
+{
+    if(!value || !utf8_check_string(value, len))
+        return -1;
+
+    return json_string_setn_nocheck(json, value, len);
+}
+
+static void json_delete_string(json_string_t *string)
+{
+    jsonp_free(string->value);
+    jsonp_free(string);
+}
+
+static int json_string_equal(const json_t *string1, const json_t *string2)
+{
+    json_string_t *s1, *s2;
+
+    if(!json_is_string(string1) || !json_is_string(string2))
+        return 0;
+
+    s1 = json_to_string(string1);
+    s2 = json_to_string(string2);
+    return s1->length == s2->length && !memcmp(s1->value, s2->value, s1->length);
+}
+
+static json_t *json_string_copy(const json_t *string)
+{
+    json_string_t *s;
+
+    if(!json_is_string(string))
+        return NULL;
+
+    s = json_to_string(string);
+    return json_stringn_nocheck(s->value, s->length);
+}
+
+json_t *json_vsprintf(const char *fmt, va_list ap) {
+    int length;
+    char *buf;
+    va_list aq;
+    va_copy(aq, ap);
+
+    length = vsnprintf(NULL, 0, fmt, ap);
+    if (length == 0)
+        return json_string("");
+
+    buf = jsonp_malloc(length + 1);
+    if (!buf)
+        return NULL;
+
+    vsnprintf(buf, length + 1, fmt, aq);
+    if (!utf8_check_string(buf, length)) {
+        jsonp_free(buf);
+        return NULL;
+    }
+
+    return jsonp_stringn_nocheck_own(buf, length);
+}
+
+json_t *json_sprintf(const char *fmt, ...) {
+    json_t *result;
+    va_list ap;
+
+    va_start(ap, fmt);
+    result = json_vsprintf(fmt, ap);
+    va_end(ap);
+
+    return result;
+}
+
+
+/*** integer ***/
+
+json_t *json_integer(json_int_t value)
+{
+    json_integer_t *integer = jsonp_malloc(sizeof(json_integer_t));
+    if(!integer)
+        return NULL;
+    json_init(&integer->json, JSON_INTEGER);
+
+    integer->value = value;
+    return &integer->json;
+}
+
+json_int_t json_integer_value(const json_t *json)
+{
+    if(!json_is_integer(json))
+        return 0;
+
+    return json_to_integer(json)->value;
+}
+
+int json_integer_set(json_t *json, json_int_t value)
+{
+    if(!json_is_integer(json))
+        return -1;
+
+    json_to_integer(json)->value = value;
+
+    return 0;
+}
+
+static void json_delete_integer(json_integer_t *integer)
+{
+    jsonp_free(integer);
+}
+
+static int json_integer_equal(const json_t *integer1, const json_t *integer2)
+{
+    return json_integer_value(integer1) == json_integer_value(integer2);
+}
+
+static json_t *json_integer_copy(const json_t *integer)
+{
+    return json_integer(json_integer_value(integer));
+}
+
+
+/*** real ***/
+
+json_t *json_real(double value)
+{
+    json_real_t *real;
+
+    if(isnan(value) || isinf(value))
+        return NULL;
+
+    real = jsonp_malloc(sizeof(json_real_t));
+    if(!real)
+        return NULL;
+    json_init(&real->json, JSON_REAL);
+
+    real->value = value;
+    return &real->json;
+}
+
+double json_real_value(const json_t *json)
+{
+    if(!json_is_real(json))
+        return 0;
+
+    return json_to_real(json)->value;
+}
+
+int json_real_set(json_t *json, double value)
+{
+    if(!json_is_real(json) || isnan(value) || isinf(value))
+        return -1;
+
+    json_to_real(json)->value = value;
+
+    return 0;
+}
+
+static void json_delete_real(json_real_t *real)
+{
+    jsonp_free(real);
+}
+
+static int json_real_equal(const json_t *real1, const json_t *real2)
+{
+    return json_real_value(real1) == json_real_value(real2);
+}
+
+static json_t *json_real_copy(const json_t *real)
+{
+    return json_real(json_real_value(real));
+}
+
+
+/*** number ***/
+
+double json_number_value(const json_t *json)
+{
+    if(json_is_integer(json))
+        return (double)json_integer_value(json);
+    else if(json_is_real(json))
+        return json_real_value(json);
+    else
+        return 0.0;
+}
+
+
+/*** simple values ***/
+
+json_t *json_true(void)
+{
+    static json_t the_true = {JSON_TRUE, (size_t)-1};
+    return &the_true;
+}
+
+
+json_t *json_false(void)
+{
+    static json_t the_false = {JSON_FALSE, (size_t)-1};
+    return &the_false;
+}
+
+
+json_t *json_null(void)
+{
+    static json_t the_null = {JSON_NULL, (size_t)-1};
+    return &the_null;
+}
+
+
+/*** deletion ***/
+
+void json_delete(json_t *json)
+{
+    if (!json)
+        return;
+
+    switch(json_typeof(json)) {
+        case JSON_OBJECT:
+            json_delete_object(json_to_object(json));
+            break;
+        case JSON_ARRAY:
+            json_delete_array(json_to_array(json));
+            break;
+        case JSON_STRING:
+            json_delete_string(json_to_string(json));
+            break;
+        case JSON_INTEGER:
+            json_delete_integer(json_to_integer(json));
+            break;
+        case JSON_REAL:
+            json_delete_real(json_to_real(json));
+            break;
+        default:
+            return;
+    }
+
+    /* json_delete is not called for true, false or null */
+}
+
+
+/*** equality ***/
+
+int json_equal(const json_t *json1, const json_t *json2)
+{
+    if(!json1 || !json2)
+        return 0;
+
+    if(json_typeof(json1) != json_typeof(json2))
+        return 0;
+
+    /* this covers true, false and null as they are singletons */
+    if(json1 == json2)
+        return 1;
+
+    switch(json_typeof(json1)) {
+        case JSON_OBJECT:
+            return json_object_equal(json1, json2);
+        case JSON_ARRAY:
+            return json_array_equal(json1, json2);
+        case JSON_STRING:
+            return json_string_equal(json1, json2);
+        case JSON_INTEGER:
+            return json_integer_equal(json1, json2);
+        case JSON_REAL:
+            return json_real_equal(json1, json2);
+        default:
+            return 0;
+    }
+}
+
+
+/*** copying ***/
+
+json_t *json_copy(json_t *json)
+{
+    if(!json)
+        return NULL;
+
+    switch(json_typeof(json)) {
+        case JSON_OBJECT:
+            return json_object_copy(json);
+        case JSON_ARRAY:
+            return json_array_copy(json);
+        case JSON_STRING:
+            return json_string_copy(json);
+        case JSON_INTEGER:
+            return json_integer_copy(json);
+        case JSON_REAL:
+            return json_real_copy(json);
+        case JSON_TRUE:
+        case JSON_FALSE:
+        case JSON_NULL:
+            return json;
+        default:
+            return NULL;
+    }
+
+    return NULL;
+}
+
+json_t *json_deep_copy(const json_t *json)
+{
+    if(!json)
+        return NULL;
+
+    switch(json_typeof(json)) {
+        case JSON_OBJECT:
+            return json_object_deep_copy(json);
+        case JSON_ARRAY:
+            return json_array_deep_copy(json);
+            /* for the rest of the types, deep copying doesn't differ from
+               shallow copying */
+        case JSON_STRING:
+            return json_string_copy(json);
+        case JSON_INTEGER:
+            return json_integer_copy(json);
+        case JSON_REAL:
+            return json_real_copy(json);
+        case JSON_TRUE:
+        case JSON_FALSE:
+        case JSON_NULL:
+            return (json_t *)json;
+        default:
+            return NULL;
+    }
+
+    return NULL;
+}

From 7820be1b8a2f1643c35447a97fc0291f9442b7fa Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Mon, 12 Nov 2018 16:17:31 +0200
Subject: [PATCH 0148/1938] exchange apdu14a works with chaining

---
 client/cmdhf14a.c | 77 +++++++++++++++++++++++++++++++++--------------
 1 file changed, 54 insertions(+), 23 deletions(-)

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 7880bf38f..56eadc9cc 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -767,20 +767,20 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
 	return 0;
 }
 
-int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
+int CmdExchangeAPDU(uint8_t *datain, int datainlen, bool activateField, uint8_t *dataout, int maxdataoutlen, int *dataoutlen, bool *chaining) {
 	uint16_t cmdc = 0;
+
+	*chaining = false;
 	
 	if (activateField) {
 		cmdc |= ISO14A_CONNECT;
 	}
-	if (leaveSignalON)
-		cmdc |= ISO14A_NO_DISCONNECT;
 
 	// "Command APDU" length should be 5+255+1, but javacard's APDU buffer might be smaller - 133 bytes
 	// https://stackoverflow.com/questions/32994936/safe-max-java-card-apdu-data-command-and-respond-size
 	// here length USB_CMD_DATA_SIZE=512
 	// timeout must be authomatically set by "get ATS"
-	UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_APDU | cmdc, (datainlen & 0xFFFF), 0}}; 
+	UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_APDU | ISO14A_NO_DISCONNECT | cmdc, (datainlen & 0xFFFF), 0}}; 
 	memcpy(c.d.asBytes, datain, datainlen);
 	SendCommand(&c);
 	
@@ -789,11 +789,12 @@ int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool lea
 
 	if (activateField) {
 		if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-			PrintAndLogEx(NORMAL, "APDU ERROR: Proxmark connection timeout.");
+			PrintAndLogEx(ERR, "APDU: Proxmark connection timeout.");
 			return 1;
 		}
 		if (resp.arg[0] != 1) {
-			PrintAndLogEx(NORMAL, "APDU ERROR: Proxmark error %d.", resp.arg[0]);
+			PrintAndLogEx(ERR, "APDU: Proxmark error %d.", resp.arg[0]);
+			DropField();
 			return 1;
 		}
 	}
@@ -801,45 +802,75 @@ int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool lea
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         recv = resp.d.asBytes;
         int iLen = resp.arg[0];
+		uint8_t res = resp.arg[1];
 		
-		*dataoutlen = iLen - 2;
-		if (*dataoutlen < 0)
-			*dataoutlen = 0;
+		int dlen = iLen - 2;
+		if (dlen < 0)
+			dlen = 0;
+		*dataoutlen += dlen;
 		
 		if (maxdataoutlen && *dataoutlen > maxdataoutlen) {
-			PrintAndLogEx(NORMAL, "APDU ERROR: Buffer too small(%d). Needs %d bytes", *dataoutlen, maxdataoutlen);
+			PrintAndLogEx(ERR, "APDU: Buffer too small(%d). Needs %d bytes", *dataoutlen, maxdataoutlen);
 			return 2;
 		}
 		
-		memcpy(dataout, recv, *dataoutlen);
-		
         if(!iLen) {
-			PrintAndLogEx(NORMAL, "APDU ERROR: No APDU response.");
+			PrintAndLogEx(ERR, "APDU: No APDU response.");
             return 1;
 		}
 
+		// check apdu length
+		if (iLen < 4 && iLen >= 0) {
+			PrintAndLogEx(ERR, "APDU: Small APDU response. Len=%d", iLen);
+			return 2;
+		}
+		
 		// check block TODO
 		if (iLen == -2) {
-			PrintAndLogEx(NORMAL, "APDU ERROR: Block type mismatch.");
+			PrintAndLogEx(ERR, "APDU: Block type mismatch.");
 			return 2;
 		}
+
+		memcpy(dataout, recv, dlen);
+		
+		// chaining
+		if ((res & 0x10) != 0) {
+			*chaining = true;
+		}
 		
 		// CRC Check
 		if (iLen == -1) {
-			PrintAndLogEx(NORMAL, "APDU ERROR: ISO 14443A CRC error.");
+			PrintAndLogEx(ERR, "APDU: ISO 14443A CRC error.");
 			return 3;
 		}
-
-		// check apdu length
-		if (iLen < 4) {
-			PrintAndLogEx(NORMAL, "APDU ERROR: Small APDU response. Len=%d", iLen);
-			return 2;
-		}
-		
     } else {
-        PrintAndLogEx(NORMAL, "APDU ERROR: Reply timeout.");
+        PrintAndLogEx(ERR, "APDU: Reply timeout.");
 		return 4;
     }
+
+	return 0;
+}
+
+int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
+	*dataoutlen = 0;
+	bool chaining = false;
+	
+	int res = CmdExchangeAPDU(datain, datainlen, activateField, dataout, maxdataoutlen, dataoutlen, &chaining);
+
+	while (chaining) {
+		// I-block with chaining
+		res = CmdExchangeAPDU(NULL, 0, false, &dataout[*dataoutlen], maxdataoutlen, dataoutlen, &chaining);
+		
+		if (res) {
+			if (!leaveSignalON)
+				DropField();
+			
+			return 100;
+		}
+	}	
+	
+	if (!leaveSignalON)
+		DropField();
 	
 	return 0;
 }

From efa76c7be40299fe03ca6c1f05b5932f1564ab9d Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Mon, 12 Nov 2018 16:26:51 +0200
Subject: [PATCH 0149/1938] fix some strange behavior

---
 client/emv/emvcore.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/emv/emvcore.c b/client/emv/emvcore.c
index c5ffb0483..b7d7df923 100644
--- a/client/emv/emvcore.c
+++ b/client/emv/emvcore.c
@@ -228,8 +228,10 @@ int EMVExchangeEx(bool ActivateField, bool LeaveFieldON, sAPDU apdu, bool Includ
 	if (sw)	*sw = 0;
 	uint16_t isw = 0;
 	
-	if (ActivateField)
+	if (ActivateField) {
 		DropField();
+		msleep(50);
+	}
 	
 	// COMPUTE APDU
 	memcpy(data, &apdu, 5);

From 5dda51ed1ca020a1a5392d461c8676665ae07ce6 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Mon, 12 Nov 2018 19:03:58 +0200
Subject: [PATCH 0150/1938] added FillBuffer function for fill buffers in hash
 checks

---
 client/util.c | 30 ++++++++++++++++++++++++++++++
 client/util.h |  3 +++
 2 files changed, 33 insertions(+)

diff --git a/client/util.c b/client/util.c
index 3e6c7cdc6..5ae4ab862 100644
--- a/client/util.c
+++ b/client/util.c
@@ -23,6 +23,7 @@ uint8_t g_debugMode = 0;
 #include <termios.h>
 #include <sys/ioctl.h> 
 #include <unistd.h>
+#include <stdarg.h>
 
 int ukbhit(void) {
 	int cnt = 0;
@@ -120,6 +121,35 @@ void FillFileNameByUID(char *filenamePrefix, uint8_t *uid, const char *ext, int
 	strcat(filenamePrefix, ext); 
 }
 
+// fill buffer from structure [{uint8_t data, size_t length},...]
+int FillBuffer(uint8_t *data, size_t maxDataLength, size_t *dataLength, ...) {
+	*dataLength = 0;
+	va_list valist;
+	va_start(valist, dataLength);
+	
+	uint8_t *vdata = NULL;
+	size_t vlength = 0;
+	do{
+		vdata = va_arg(valist, uint8_t *);
+		if (!vdata)
+			break;
+		
+		vlength = va_arg(valist, size_t);
+		if (*dataLength + vlength >  maxDataLength) {
+			va_end(valist);
+			return 1;
+		}
+		
+		memcpy(&data[*dataLength], vdata, vlength);
+		*dataLength += vlength;
+		
+	} while (vdata);
+	
+	va_end(valist);
+
+	return 0;
+}
+
 void hex_to_buffer(const uint8_t *buf, const uint8_t *hex_data, const size_t hex_len, const size_t hex_max_len, 
 	const size_t min_str_len, const size_t spaces_between, bool uppercase) {
 		
diff --git a/client/util.h b/client/util.h
index 637bfb3ca..a069b5012 100644
--- a/client/util.h
+++ b/client/util.h
@@ -187,6 +187,9 @@ extern void AddLogUint64(char *fileName, char *extData, const uint64_t data);
 extern void AddLogCurrentDT(char *fileName);
 extern void FillFileNameByUID(char *filenamePrefix, uint8_t * uid, const char *ext, int uidlen);
 
+// fill buffer from structure [{uint8_t data, size_t length},...]
+extern int FillBuffer(uint8_t *data, size_t maxDataLength, size_t *dataLength, ...);
+
 extern void hex_to_buffer(const uint8_t *buf, const uint8_t *hex_data, const size_t hex_len, 
 						  const size_t hex_max_len, const size_t min_str_len, const size_t spaces_between,
 						  bool uppercase);

From 7043435174c99794778e3bfd5c9175174f4b2ecf Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Mon, 12 Nov 2018 19:05:05 +0200
Subject: [PATCH 0151/1938] added x9.62 signature decode and ecdsa signature
 verify

---
 client/cmdhffido.c | 40 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index fd97ace54..ab9afbdca 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -39,6 +39,8 @@
 #include "emv/emvjson.h"
 #include "emv/dump.h"
 #include "cliparser/cliparser.h"
+#include "crypto/asn1utils.h"
+#include "crypto/libpcrypto.h"
 
 static int CmdHelp(const char *Cmd);
 
@@ -328,11 +330,47 @@ int CmdHFFidoRegister(const char *cmd) {
 		PrintAndLog("DER certificate[%d]: %s...", derLen, sprint_hex(&buf[derp], 20));
 	}
 	
+	// check and print DER certificate
+	uint8_t public_key[65] = {0}; 
 	
+	// get hash
 	int hashp = 1 + 65 + 1 + keyHandleLen + derLen;
 	PrintAndLog("Hash[%d]: %s", len - hashp, sprint_hex(&buf[hashp], len - hashp));
-	
+
 	// check ANSI X9.62 format ECDSA signature (on P-256)
+	uint8_t rval[300] = {0}; 
+	uint8_t sval[300] = {0}; 
+	res = ecdsa_asn1_get_signature(&buf[hashp], len - hashp, rval, sval);
+	if (!res) {
+		if (verbose) {
+			PrintAndLog("  r: %s", sprint_hex(rval, 32));
+			PrintAndLog("  s: %s", sprint_hex(sval, 32));
+		}
+
+		uint8_t xbuf[4096] = {0};
+		size_t xbuflen = 0;
+		res = FillBuffer(xbuf, sizeof(xbuf), &xbuflen,
+			"\x00", 1,
+			adata, 32, 
+			cdata, 32, 
+			&buf[67], keyHandleLen,  // keyHandle
+			&buf[1], 65,             // user public key
+			NULL, 0);
+		//PrintAndLog("--xbuf(%d)[%d]: %s", res, xbuflen, sprint_hex(xbuf, xbuflen));
+		res = ecdsa_signature_verify(public_key, xbuf, xbuflen, &buf[hashp], len - hashp);
+		if (res) {
+			if (res == -0x4e00) {
+				PrintAndLog("Signature is NOT VALID.");
+			} else {
+				PrintAndLog("Other signature check error: %x %s", (res<0)?-res:res, ecdsa_get_error(res));
+			}
+		} else {
+			PrintAndLog("Signature is OK.");
+		}
+		
+	} else {
+		PrintAndLog("Invalid signature. res=%d.", res);
+	}
 	
 	PrintAndLog("\nauth command: ");
 	printf("hf fido auth %s%s", paramsPlain?"-p ":"", sprint_hex_inrow(&buf[67], keyHandleLen));

From 6a21df344376145feb29a62b8436c6b1e6cf48a2 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Mon, 12 Nov 2018 22:17:49 +0100
Subject: [PATCH 0152/1938] FIX: 'hf mf cload' - showing helptext instead of
 loading file.

Added support for easy loading of bin/eml files in this patch aswell.
---
 client/cmdhfmf.c           | 442 +++++++++++++++++--------------------
 client/loclass/fileutils.c | 138 ++++++++++--
 client/loclass/fileutils.h |  66 ++++--
 3 files changed, 377 insertions(+), 269 deletions(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 7cdd44af1..03875401c 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -394,7 +394,6 @@ int GetHFMF14AUID(uint8_t *uid, int *uidlen) {
 	SendCommand(&c);
 	UsbCommand resp;
 	if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
-		//if (!silent) 
 		PrintAndLogEx(WARNING, "iso14443a card select failed");
 		DropField();
 		return 0;
@@ -419,8 +418,7 @@ char * GenerateFilename(const char *prefix, const char *suffix){
 	}
 	
 	strcpy(fptr, prefix);	
-	FillFileNameByUID(fptr,uid,suffix,uidlen);
-	
+	FillFileNameByUID(fptr, uid, suffix, uidlen);
 	return fptr;
 }
 
@@ -428,13 +426,13 @@ int CmdHF14ADarkside(const char *Cmd) {
 	uint8_t blockno = 0, key_type = MIFARE_AUTH_KEYA;
 	uint64_t key = 0;
 	
-	char cmdp = param_getchar(Cmd, 0);	
-	if ( cmdp == 'H' || cmdp == 'h') return usage_hf14_mifare();
+	char cmdp = tolower(param_getchar(Cmd, 0));	
+	if ( cmdp == 'h' ) return usage_hf14_mifare();
 	
 	blockno = param_get8(Cmd, 0);	 
 	
-	cmdp = param_getchar(Cmd, 1);
-	if (cmdp == 'B' || cmdp == 'b')
+	cmdp = tolower(param_getchar(Cmd, 1));
+	if (cmdp == 'b')
 		key_type = MIFARE_AUTH_KEYB;
 
 	int isOK = mfDarkside(blockno, key_type, &key);
@@ -457,10 +455,9 @@ int CmdHF14AMfWrBl(const char *Cmd) {
 	uint8_t keyType = 0;
 	uint8_t key[6] = {0, 0, 0, 0, 0, 0};
 	uint8_t bldata[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-	
 	char cmdp	= 0x00;
 
-	if (strlen(Cmd)<3) {
+	if (strlen(Cmd) < 3) {
 		PrintAndLogEx(NORMAL, "Usage:  hf mf wrbl    <block number> <key A/B> <key (12 hex symbols)> <block data (32 hex symbols)>");
 		PrintAndLogEx(NORMAL, "Examples:");
 		PrintAndLogEx(NORMAL, "        hf mf wrbl 0 A FFFFFFFFFFFF 000102030405060708090A0B0C0D0E0F");
@@ -468,20 +465,25 @@ int CmdHF14AMfWrBl(const char *Cmd) {
 	}	
 
 	blockNo = param_get8(Cmd, 0);
-	cmdp = param_getchar(Cmd, 1);
+	cmdp = tolower(param_getchar(Cmd, 1));
 	if (cmdp == 0x00) {
 		PrintAndLogEx(NORMAL, "Key type must be A or B");
 		return 1;
 	}
-	if (cmdp != 'A' && cmdp != 'a') keyType = 1;
+	
+	if (cmdp != 'a') 
+		keyType = 1;
+	
 	if (param_gethex(Cmd, 2, key, 12)) {
 		PrintAndLogEx(NORMAL, "Key must include 12 HEX symbols");
 		return 1;
 	}
+	
 	if (param_gethex(Cmd, 3, bldata, 32)) {
 		PrintAndLogEx(NORMAL, "Block data must include 32 HEX symbols");
 		return 1;
 	}
+	
 	PrintAndLogEx(NORMAL, "--block no:%d, key type:%c, key:%s", blockNo, keyType?'B':'A', sprint_hex(key, 6));
 	PrintAndLogEx(NORMAL, "--data: %s", sprint_hex(bldata, 16));
 	
@@ -516,12 +518,15 @@ int CmdHF14AMfRdBl(const char *Cmd) {
 	}	
 	
 	blockNo = param_get8(Cmd, 0);
-	cmdp = param_getchar(Cmd, 1);
+	cmdp = tolower(param_getchar(Cmd, 1));
 	if (cmdp == 0x00) {
 		PrintAndLogEx(NORMAL, "Key type must be A or B");
 		return 1;
 	}
-	if (cmdp != 'A' && cmdp != 'a') keyType = 1;
+	
+	if (cmdp != 'a') 
+		keyType = 1;
+	
 	if (param_gethex(Cmd, 2, key, 12)) {
 		PrintAndLogEx(NORMAL, "Key must include 12 HEX symbols");
 		return 1;
@@ -558,7 +563,7 @@ int CmdHF14AMfRdSc(const char *Cmd) {
 	uint8_t *data  = NULL;
 	char cmdp	= 0x00;
 
-	if (strlen(Cmd)<3) {
+	if (strlen(Cmd) < 3) {
 		PrintAndLogEx(NORMAL, "Usage:  hf mf rdsc    <sector number> <key A/B> <key (12 hex symbols)>");
 		PrintAndLogEx(NORMAL, "Examples:");
 		PrintAndLogEx(NORMAL, "        hf mf rdsc 0 A FFFFFFFFFFFF ");
@@ -570,12 +575,16 @@ int CmdHF14AMfRdSc(const char *Cmd) {
 		PrintAndLogEx(NORMAL, "Sector number must be less than 40");
 		return 1;
 	}
-	cmdp = param_getchar(Cmd, 1);
-	if (cmdp != 'a' && cmdp != 'A' && cmdp != 'b' && cmdp != 'B') {
+	
+	cmdp = tolower(param_getchar(Cmd, 1));
+	if (cmdp != 'a' && cmdp != 'b') {
 		PrintAndLogEx(NORMAL, "Key type must be A or B");
 		return 1;
 	}
-	if (cmdp != 'A' && cmdp != 'a') keyType = 1;
+	
+	if (cmdp != 'a') 
+		keyType = 1;
+	
 	if (param_gethex(Cmd, 2, key, 12)) {
 		PrintAndLogEx(NORMAL, "Key must include 12 HEX symbols");
 		return 1;
@@ -682,15 +691,15 @@ int CmdHF14AMfDump(const char *Cmd) {
 		}
 	}
 
-	if (keyFilename[0] == 0x00)
-	{
-		fptr = GenerateFilename("hf-mf-","-key.bin");
+	if ( keyFilename[0] == 0x00 ) {
+		fptr = GenerateFilename("hf-mf-", "-key.bin");
 		if (fptr == NULL) 
 			return 1;
+		
 		strcpy(keyFilename, fptr);
 	}
 
-	if ((fin = fopen(keyFilename,"rb")) == NULL) {
+	if ((fin = fopen(keyFilename, "rb")) == NULL) {
 		PrintAndLogEx(WARNING, "Could not find file %s", keyFilename);
 		return 1;
 	}
@@ -828,9 +837,10 @@ int CmdHF14AMfDump(const char *Cmd) {
 
 	if (isOK) {
 		if (dataFilename[0] == 0x00) {
-			fptr=GenerateFilename("hf-mf-","-data.bin");
+			fptr = GenerateFilename("hf-mf-", "-data.bin");
 			if (fptr == NULL) 
 				return 1;
+			
 			strcpy(dataFilename, fptr);
 		}
 		
@@ -862,12 +872,10 @@ int CmdHF14AMfRestore(const char *Cmd) {
 	FILE *fdump, *fkeys;
 
 	while(param_getchar(Cmd, cmdp) != 0x00) {
-		switch(param_getchar(Cmd, cmdp)) {
+		switch(tolower(param_getchar(Cmd, cmdp))) {
 		case 'h':
-		case 'H':
 			return usage_hf14_restore();
 		case 'u':
-		case 'U':
 			param_getstr(Cmd, cmdp+1, szTemp, FILE_PATH_SIZE); 
 			if(keyFilename[0]==0x00)
 				snprintf(keyFilename, FILE_PATH_SIZE, "hf-mf-%s-key.bin", szTemp);
@@ -876,38 +884,33 @@ int CmdHF14AMfRestore(const char *Cmd) {
 			cmdp+=2;
 			break;
 		case 'k':
-		case 'K':
 			param_getstr(Cmd, cmdp+1, keyFilename, FILE_PATH_SIZE); 
 			cmdp += 2;
 			break;
 		case 'f':
-		case 'F':
 			param_getstr(Cmd, cmdp+1, dataFilename, FILE_PATH_SIZE); 
 			cmdp += 2;
 			break;
 		default:
-			if (cmdp==0)
-			{
+			if ( cmdp == 0 ) {
 				numSectors = NumOfSectors(param_getchar(Cmd, cmdp));
 				cmdp++;
-			}
-			else
-			{
+			} else {
 				PrintAndLogEx(WARNING, "Unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
 				return usage_hf14_restore();
 			}
 		}
 	}
 
-	if(keyFilename[0]==0x00)
-	{
-		fptr=GenerateFilename("hf-mf-","-key.bin");
+	if ( keyFilename[0] == 0x00 ) {
+		fptr = GenerateFilename("hf-mf-", "-key.bin");
 		if (fptr == NULL) 
 			return 1;
-		strcpy(keyFilename,fptr);
+		
+		strcpy(keyFilename, fptr);
 	}
 
-	if ((fkeys = fopen(keyFilename,"rb")) == NULL) {
+	if ((fkeys = fopen(keyFilename, "rb")) == NULL) {
 		PrintAndLogEx(WARNING, "Could not find file %s", keyFilename);
 		return 1;
 	}
@@ -915,7 +918,7 @@ int CmdHF14AMfRestore(const char *Cmd) {
 	size_t bytes_read;
 	for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
 		bytes_read = fread( keyA[sectorNo], 1, 6, fkeys );
-		if ( bytes_read != 6) {
+		if ( bytes_read != 6 ) {
 			PrintAndLogEx(NORMAL, "File reading error (%s).", keyFilename);
 			fclose(fkeys);
 			return 2;
@@ -924,7 +927,7 @@ int CmdHF14AMfRestore(const char *Cmd) {
 
 	for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
 		bytes_read = fread( keyB[sectorNo], 1, 6, fkeys );
-		if ( bytes_read != 6) {
+		if ( bytes_read != 6 ) {
 			PrintAndLogEx(NORMAL, "File reading error (%s).", keyFilename);
 			fclose(fkeys);
 			return 2;
@@ -933,22 +936,22 @@ int CmdHF14AMfRestore(const char *Cmd) {
 
 	fclose(fkeys);
 
-	if( dataFilename[0]==0x00)
-	{
-		fptr=GenerateFilename("hf-mf-","-data.bin");
+	if ( dataFilename[0] == 0x00 ) {
+		fptr = GenerateFilename("hf-mf-", "-data.bin");
 		if (fptr == NULL) 
 			return 1;
+		
 		strcpy(dataFilename,fptr);
 	}
 
-	if ((fdump = fopen(dataFilename,"rb")) == NULL) {
+	if ((fdump = fopen(dataFilename, "rb")) == NULL) {
 		PrintAndLogEx(WARNING, "Could not find file %s", dataFilename);
 		return 1;
 	}	
 	PrintAndLogEx(NORMAL, "Restoring %s to card", dataFilename);
 
 	for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
-		for(blockNo = 0; blockNo < NumBlocksPerSector(sectorNo); blockNo++) {
+		for (blockNo = 0; blockNo < NumBlocksPerSector(sectorNo); blockNo++) {
 			UsbCommand c = {CMD_MIFARE_WRITEBL, {FirstBlockOfSector(sectorNo) + blockNo, keyType, 0}};
 			memcpy(c.d.asBytes, key, 6);			
 			bytes_read = fread(bldata, 1, 16, fdump);
@@ -1011,19 +1014,20 @@ int CmdHF14AMfNested(const char *Cmd) {
 	uint8_t standart[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
 	uint8_t tempkey[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
 	char *fptr;
-	if (strlen(Cmd)<3) return usage_hf14_nested();
+	
+	if (strlen(Cmd) < 3) return usage_hf14_nested();
 	
 	char cmdp, ctmp;
-	cmdp = param_getchar(Cmd, 0);
+	cmdp = tolower(param_getchar(Cmd, 0));
 	blockNo = param_get8(Cmd, 1);
-	ctmp = param_getchar(Cmd, 2);
+	ctmp = tolower(param_getchar(Cmd, 2));
 
-	if (ctmp != 'a' && ctmp != 'A' && ctmp != 'b' && ctmp != 'B') {
+	if (ctmp != 'a' && ctmp != 'b') {
 		PrintAndLogEx(WARNING, "key type must be A or B");
 		return 1;
 	}
 	
-	if (ctmp != 'A' && ctmp != 'a') 
+	if (ctmp != 'a') 
 		keyType = 1;
 		
 	if (param_gethex(Cmd, 3, key, 12)) {
@@ -1031,27 +1035,27 @@ int CmdHF14AMfNested(const char *Cmd) {
 		return 1;
 	}
 	
-	if (cmdp == 'o' || cmdp == 'O') {
-		cmdp = 'o';
+	if (cmdp == 'o') {
 		trgBlockNo = param_get8(Cmd, 4);
-		ctmp = param_getchar(Cmd, 5);
-		if (ctmp != 'a' && ctmp != 'A' && ctmp != 'b' && ctmp != 'B') {
+		ctmp = tolower(param_getchar(Cmd, 5));
+		if (ctmp != 'a' && ctmp != 'b') {
 			PrintAndLogEx(WARNING, "target key type must be A or B");
 			return 1;
 		}
-		if (ctmp != 'A' && ctmp != 'a') 
+		if (ctmp != 'a') { 
 			trgKeyType = 1;
+		}
 	} else {
 		SectorsCnt = NumOfSectors(cmdp);
 	}
 
-	ctmp = param_getchar(Cmd, 4);
-	transferToEml |= (ctmp == 't' || ctmp == 'T');
-	createDumpFile |= (ctmp == 'd' || ctmp == 'D');
+	ctmp = tolower(param_getchar(Cmd, 4));
+	transferToEml |= (ctmp == 't');
+	createDumpFile |= (ctmp == 'd');
 	
-	ctmp = param_getchar(Cmd, 6);
-	transferToEml |= (ctmp == 't' || ctmp == 'T');
-	createDumpFile |= (ctmp == 'd' || ctmp == 'D');
+	ctmp = tolower(param_getchar(Cmd, 6));
+	transferToEml |= (ctmp == 't');
+	createDumpFile |= (ctmp == 'd');
 	
 	// check if we can authenticate to sector
 	res = mfCheckKeys(blockNo, keyType, true, 1, key, &key64);
@@ -1203,7 +1207,7 @@ int CmdHF14AMfNested(const char *Cmd) {
 		
 		// Create dump file
 		if (createDumpFile) {
-			fptr = GenerateFilename("hf-mf-","-key.bin");
+			fptr = GenerateFilename("hf-mf-", "-key.bin");
 			if (fptr == NULL) 
 				return 1;
 			
@@ -1286,12 +1290,13 @@ int CmdHF14AMfNestedHard(const char *Cmd) {
 			
 			}
 			blockNo = param_get8(Cmd, cmdp);
-			ctmp = param_getchar(Cmd, cmdp+1);
-			if (ctmp != 'a' && ctmp != 'A' && ctmp != 'b' && ctmp != 'B') {
+			ctmp = tolower(param_getchar(Cmd, cmdp+1));
+			if (ctmp != 'a' && ctmp != 'b') {
 				PrintAndLogEx(NORMAL, "Key type must be A or B");
 				return 1;
 			}
-			if (ctmp != 'A' && ctmp != 'a') { 
+			
+			if (ctmp != 'a') { 
 				keyType = 1;
 			}
 			
@@ -1300,20 +1305,20 @@ int CmdHF14AMfNestedHard(const char *Cmd) {
 				return 1;
 			}
 			
-			if(param_getchar(Cmd, cmdp+3) == 0x00)
+			if (param_getchar(Cmd, cmdp+3) == 0x00)
 			{
 				PrintAndLogEx(NORMAL, "Target block number is missing");
 				return 1;
-			
 			}
+			
 			trgBlockNo = param_get8(Cmd, cmdp+3);
 
-			ctmp = param_getchar(Cmd, cmdp+4);
-			if (ctmp != 'a' && ctmp != 'A' && ctmp != 'b' && ctmp != 'B') {
+			ctmp = tolower(param_getchar(Cmd, cmdp+4));
+			if (ctmp != 'a' && ctmp != 'b') {
 				PrintAndLogEx(NORMAL, "Target key type must be A or B");
 				return 1;
 			}
-			if (ctmp != 'A' && ctmp != 'a') {
+			if (ctmp != 'a') {
 				trgKeyType = 1;
 			}
 			cmdp += 5;
@@ -1615,11 +1620,11 @@ out:
 	}
 	
 	if (createDumpFile) {
-		fptr = GenerateFilename("hf-mf-","-key.bin");
+		fptr = GenerateFilename("hf-mf-", "-key.bin");
 		if (fptr == NULL) 
 			return 1;
 
-		FILE *fkeys = fopen(fptr,"wb");
+		FILE *fkeys = fopen(fptr, "wb");
 		if (fkeys == NULL) { 
 			PrintAndLogEx(WARNING, "Could not create file %s", fptr);
 			free(keyBlock);
@@ -1902,11 +1907,11 @@ out:
 	}
 	
 	if (createDumpFile) {
-		fptr = GenerateFilename("hf-mf-","-key.bin");
+		fptr = GenerateFilename("hf-mf-", "-key.bin");
 		if (fptr == NULL) 
 			return 1;
 
-		FILE *fkeys = fopen(fptr,"wb");
+		FILE *fkeys = fopen(fptr, "wb");
 		if (fkeys == NULL) { 
 			PrintAndLogEx(WARNING, "Could not create file %s", fptr);
 			free(keyBlock);
@@ -1951,6 +1956,7 @@ static void emptySectorTable(){
 		k_sector[i].foundKey[1] = false;
 	}
 }
+
 void showSectorTable(){
 	if (k_sector != NULL) {
 		printKeyTable(k_sectorsCount, k_sector);
@@ -1958,6 +1964,7 @@ void showSectorTable(){
 		k_sector = NULL;
 	}
 }
+
 void readerAttack(nonces_t data, bool setEmulatorMem, bool verbose) {
 
 	uint64_t key = 0;	
@@ -2002,33 +2009,26 @@ int CmdHF14AMf1kSim(const char *Cmd) {
 	uint8_t flags = (FLAG_UID_IN_EMUL | FLAG_4B_UID_IN_DATA);
 	int uidlen = 0;
 	uint8_t cmdp = 0;
-	bool errors = false;
-	bool verbose = false;
-	bool setEmulatorMem = false;
+	bool errors = false, verbose = false, setEmulatorMem = false;
 	nonces_t data[1];
 		
 	while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch(param_getchar(Cmd, cmdp)) {
+		switch( tolower(param_getchar(Cmd, cmdp))) {
 		case 'e':
-		case 'E':
 			setEmulatorMem = true;
 			cmdp++;
 			break;
 		case 'h':
-		case 'H':
 			return usage_hf14_mf1ksim();
 		case 'i':
-		case 'I':
 			flags |= FLAG_INTERACTIVE;
 			cmdp++;
 			break;
 		case 'n':
-		case 'N':
 			exitAfterNReads = param_get8(Cmd, cmdp+1);
 			cmdp += 2;
 			break;
 		case 'u':
-		case 'U':
 			param_gethex_ex(Cmd, cmdp+1, uid, &uidlen);
 			switch(uidlen) {
 				case 20: flags = FLAG_10B_UID_IN_DATA; break;
@@ -2039,12 +2039,10 @@ int CmdHF14AMf1kSim(const char *Cmd) {
 			cmdp += 2;
 			break;
 		case 'v':
-		case 'V':
 			verbose = true;
 			cmdp++;
 			break;
 		case 'x':
-		case 'X':
 			flags |= FLAG_NR_AR_ATTACK;
 			cmdp++;
 			break;
@@ -2110,11 +2108,11 @@ int CmdHF14AMfSniff(const char *Cmd){
 	if ( ctmp == 'h' || ctmp == 'H' ) return usage_hf14_sniff();
 	
 	for (int i = 0; i < 4; i++) {
-		ctmp = param_getchar(Cmd, i);
-		if (ctmp == 'l' || ctmp == 'L') wantLogToFile = true;
-		if (ctmp == 'd' || ctmp == 'D') wantDecrypt = true;
-		//if (ctmp == 'e' || ctmp == 'E') wantSaveToEml = true; TODO
-		if (ctmp == 'f' || ctmp == 'F') wantSaveToEmlFile = true;
+		ctmp = tolower(param_getchar(Cmd, i));
+		if (ctmp == 'l') wantLogToFile = true;
+		if (ctmp == 'd') wantDecrypt = true;
+		//if (ctmp == 'e') wantSaveToEml = true; TODO
+		if (ctmp == 'f') wantSaveToEmlFile = true;
 	}
 	
 	PrintAndLogEx(NORMAL, "-------------------------------------------------------------------------\n");
@@ -2244,8 +2242,8 @@ int CmdHF14AMfSniff(const char *Cmd){
 
 int CmdHF14AMfDbg(const char *Cmd) {
 
-	char ctmp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) < 1 || ctmp == 'h' || ctmp == 'H') return usage_hf14_dbg();
+	char ctmp = tolower(param_getchar(Cmd, 0));
+	if (strlen(Cmd) < 1 || ctmp == 'h' ) return usage_hf14_dbg();
 	
 	uint8_t dbgMode = param_get8ex(Cmd, 0, 0, 10);
 	if (dbgMode > 4) return usage_hf14_dbg();
@@ -2261,15 +2259,15 @@ int CmdHF14AMfKeyBrute(const char *Cmd) {
 	uint8_t key[6] = {0, 0, 0, 0, 0, 0};
 	uint64_t foundkey = 0;
 	
-	char cmdp = param_getchar(Cmd, 0);	
-	if ( cmdp == 'H' || cmdp == 'h') return usage_hf14_keybrute();
+	char cmdp = tolower(param_getchar(Cmd, 0));	
+	if ( cmdp == 'h' ) return usage_hf14_keybrute();
 	
 	// block number
 	blockNo = param_get8(Cmd, 0);	 
 	
 	// keytype
-	cmdp = param_getchar(Cmd, 1);
-	if (cmdp == 'B' || cmdp == 'b') keytype = 1;
+	cmdp = tolower(param_getchar(Cmd, 1));
+	if ( cmdp == 'b' ) keytype = 1;
 	
 	// key
 	if (param_gethex(Cmd, 2, key, 12)) return usage_hf14_keybrute();
@@ -2317,15 +2315,15 @@ void printKeyTable( uint8_t sectorscnt, sector_t *e_sector ){
 int CmdHF14AMfEGet(const char *Cmd) {
 	uint8_t blockNo = 0;
 	uint8_t data[16] = {0x00};
-	char c = param_getchar(Cmd, 0);
+	char c = tolower(param_getchar(Cmd, 0));
 	
-	if (strlen(Cmd) < 1 || c == 'h' || c == 'H') return usage_hf14_eget();
+	if (strlen(Cmd) < 1 || c == 'h') return usage_hf14_eget();
 	
 	blockNo = param_get8(Cmd, 0);
 
 	PrintAndLogEx(NORMAL, "");
 	if (!mfEmlGetMem(data, blockNo, 1)) {
-		PrintAndLogEx(NORMAL, "data[%3d]:%s", blockNo, sprint_hex(data, 16));
+		PrintAndLogEx(NORMAL, "data[%3d]:%s", blockNo, sprint_hex(data, sizeof(data)));
 	} else {
 		PrintAndLogEx(WARNING, "Command execute timeout");
 	}
@@ -2333,8 +2331,8 @@ int CmdHF14AMfEGet(const char *Cmd) {
 }
 
 int CmdHF14AMfEClear(const char *Cmd) {
-	char c = param_getchar(Cmd, 0);
-	if (c == 'h' || c == 'H') return usage_hf14_eclr();
+	char c = tolower(param_getchar(Cmd, 0));
+	if (c == 'h') return usage_hf14_eclr();
 	
 	UsbCommand cmd = {CMD_MIFARE_EML_MEMCLR, {0, 0, 0}};
 	clearCommandBuffer();
@@ -2343,12 +2341,12 @@ int CmdHF14AMfEClear(const char *Cmd) {
 }
 
 int CmdHF14AMfESet(const char *Cmd) {
-	char c = param_getchar(Cmd, 0);
+	char c = tolower(param_getchar(Cmd, 0));
 	uint8_t memBlock[16];
 	uint8_t blockNo = 0;
 	memset(memBlock, 0x00, sizeof(memBlock));
 
-	if (strlen(Cmd) < 3 || c == 'h' || c == 'H')
+	if (strlen(Cmd) < 3 || c == 'h')
 		return usage_hf14_eset();
 	
 	blockNo = param_get8(Cmd, 0);
@@ -2363,91 +2361,70 @@ int CmdHF14AMfESet(const char *Cmd) {
 }
 
 int CmdHF14AMfELoad(const char *Cmd) {
-	FILE * f;
-	char filename[FILE_PATH_SIZE];
-	char *fnameptr = filename;
-	char buf[64] = {0x00};
-	uint8_t buf8[64] = {0x00};
-	int i, len, blockNum, numBlocks;
-	int nameParamNo = 1;
-	uint8_t blockWidth = 32;
-	uint32_t tmp;
-	char c = param_getchar(Cmd, 0);
-		
-	if ( c == 'h' || c == 'H' || c == 0x00)
-		return usage_hf14_eload();
 
+	size_t counter = 0;
+	char filename[FILE_PATH_SIZE];
+	int blockNum, numBlocks, nameParamNo = 1;
+	uint8_t blockWidth = 16;
+	char c = tolower(param_getchar(Cmd, 0));
+
+	if ( strlen(Cmd) < 2 &&  c == 'h' ) 
+		return usage_hf14_eload();
+	
 	switch (c) {
 		case '0' : numBlocks = 5*4; break;
 		case '1' : 
 		case '\0': numBlocks = 16*4; break;
 		case '2' : numBlocks = 32*4; break;
 		case '4' : numBlocks = 256; break;
-		case 'U' : // fall through
-		case 'u' : numBlocks = 255; blockWidth = 8; break;
+		case 'u' : numBlocks = 255; blockWidth = 4; break;
 		default:  {
 			numBlocks = 16*4;
 			nameParamNo = 0;
 		}
 	}
-	uint32_t numblk2 = param_get32ex(Cmd,2,0,10);
-	if (numblk2 > 0) numBlocks = numblk2;	
+	uint32_t numblk2 = param_get32ex(Cmd, 2, 0, 10);
+	if (numblk2 > 0) 
+		numBlocks = numblk2;
 
-	len = param_getstr(Cmd, nameParamNo, filename, sizeof(filename));
+	param_getstr(Cmd, nameParamNo, filename, sizeof(filename));
 	
-	if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5;
-
-	fnameptr += len;
-
-	sprintf(fnameptr, ".eml"); 
-	
-	// open file
-	f = fopen(filename, "r");
-	if (f == NULL) {
-		PrintAndLogEx(WARNING, "File %s not found or locked", filename);
+	uint8_t *data = calloc(1, 4096);
+	size_t datalen = 0;
+	//int res = loadFile(filename, "bin", data, &datalen);
+	int res = loadFileEML( filename, "eml", data, &datalen);
+	if ( res ) {
+		free(data);
 		return 1;
 	}
 	
+	// 64 or 256 blocks.
+	if ( (datalen % blockWidth) != 0 ) {
+		PrintAndLogEx(FAILED, "File content error. Size doesn't match blockwidth ");
+		free(data);		
+		return 2;
+	}
+	
+	PrintAndLogEx(INFO, "Copying to emulator memory");
+	
 	blockNum = 0;
-	while (!feof(f)){
-		memset(buf, 0, sizeof(buf));
+	while ( datalen ) {
 		
-		if (fgets(buf, sizeof(buf), f) == NULL) {
-			
-			if (blockNum >= numBlocks) break;
-			
-			PrintAndLogEx(WARNING, "File reading error.");
-			fclose(f);
-			return 2;
-		}
-		
-		if (strlen(buf) < blockWidth){
-			if(strlen(buf) && feof(f))
-				break;
-			PrintAndLogEx(WARNING, "File content error. Block data must include %d HEX symbols", blockWidth);
-			fclose(f);
-			return 2;
-		}
-		
-		for (i = 0; i < blockWidth; i += 2) {
-			sscanf(&buf[i], "%02x", &tmp);
-			buf8[i / 2] = tmp & 0xFF;
-		}
-		if (mfEmlSetMem_xt(buf8, blockNum, 1, blockWidth/2)) {
-			PrintAndLogEx(WARNING, "Cant set emul block: %3d", blockNum);
-			fclose(f);
+		if (mfEmlSetMem_xt(data + counter, blockNum, 1, blockWidth)) {
+			PrintAndLogEx(FAILED, "Cant set emul block: %3d", blockNum);
+			free(data);
 			return 3;
 		}
 		printf("."); fflush(stdout);
-		blockNum++;
 		
-		if (blockNum >= numBlocks) break;
+		blockNum++;
+		counter += blockWidth;
+		datalen -= blockWidth;
 	}
-	fclose(f);
 	PrintAndLogEx(NORMAL, "\n");
 
 	// Ultralight /Ntag
-	if ( blockWidth == 8 ) {
+	if ( blockWidth == 4 ) {
 		if ((blockNum != numBlocks)) {		
 			PrintAndLogEx(FAILED, "Warning, Ultralight/Ntag file content, Loaded %d blocks into emulator memory", blockNum);
 			return 0;
@@ -2479,7 +2456,7 @@ int CmdHF14AMfESave(const char *Cmd) {
 	blocks = NumOfBlocks(c);
 	bytes = blocks * MFBLOCK_SIZE;	
 
-	dump = malloc(bytes);
+	dump = calloc(sizeof(uint8_t), bytes);
 	if (!dump) {
 		PrintAndLogEx(WARNING, "Fail, cannot allocate memory");
 		return 1;
@@ -2511,21 +2488,22 @@ int CmdHF14AMfESave(const char *Cmd) {
 int CmdHF14AMfECFill(const char *Cmd) {
 	uint8_t keyType = 0;
 	uint8_t numSectors = 16;
-	char c = param_getchar(Cmd, 0);
+	char c = tolower(param_getchar(Cmd, 0));
 	
-	if (strlen(Cmd) < 1 || c == 'h' || c == 'H')
+	if (strlen(Cmd) < 1 || c == 'h')
 		return usage_hf14_ecfill();
 
-	if (c != 'a' && c != 'A' && c != 'b' && c != 'B') {
+	if (c != 'a' &&  c != 'b') {
 		PrintAndLogEx(WARNING, "Key type must be A or B");
 		return 1;
 	}
-	if (c != 'A' && c != 'a') keyType = 1;
+	if (c != 'a')
+		keyType = 1;
 
-	c = param_getchar(Cmd, 1);
+	c = tolower(param_getchar(Cmd, 1));
 	numSectors = NumOfSectors(c);
 
-	PrintAndLogEx(NORMAL, "--params: numSectors: %d, keyType: %c\n", numSectors, (keyType==0) ? 'A' : 'B');
+	PrintAndLogEx(NORMAL, "--params: numSectors: %d, keyType: %c\n", numSectors, (keyType == 0) ? 'A' : 'B');
 	UsbCommand cmd = {CMD_MIFARE_EML_CARDLOAD, {numSectors, keyType, 0}};
 	clearCommandBuffer();
 	SendCommand(&cmd);
@@ -2538,9 +2516,8 @@ int CmdHF14AMfEKeyPrn(const char *Cmd) {
 	uint8_t data[16];
 	uint64_t keyA, keyB;
 
-	char c = param_getchar(Cmd, 0);
-	
-	if ( c == 'h' || c == 'H' )
+	char c = tolower(param_getchar(Cmd, 0));
+	if ( c == 'h' )
 		return usage_hf14_ekeyprn();
 
 	numSectors = NumOfSectors(c);
@@ -2569,9 +2546,8 @@ int CmdHF14AMfCSetUID(const char *Cmd) {
 	uint8_t atqa[2] = {0x00};
 	uint8_t sak[1] = {0x00};
 	uint8_t atqaPresent = 1;
-	int res;
+	int res, argi = 0;
 	char ctmp;
-	int argi=0;
 
 	if (strlen(Cmd) < 1 || param_getchar(Cmd, argi) == 'h') 
 		return usage_hf14_csetuid();
@@ -2581,8 +2557,8 @@ int CmdHF14AMfCSetUID(const char *Cmd) {
 
 	argi++;
 
-	ctmp = param_getchar(Cmd, argi);
-	if (ctmp == 'w' || ctmp == 'W') {
+	ctmp = tolower(param_getchar(Cmd, argi));
+	if (ctmp == 'w') {
 		wipeCard = 1;
 		atqaPresent = 0;
 	}
@@ -2603,9 +2579,9 @@ int CmdHF14AMfCSetUID(const char *Cmd) {
 			atqaPresent = 0;
 	}
 
-	if(!wipeCard) {
-		ctmp = param_getchar(Cmd, argi);
-		if (ctmp == 'w' || ctmp == 'W') {
+	if (!wipeCard) {
+		ctmp = tolower(param_getchar(Cmd, argi));
+		if (ctmp == 'w') {
 			wipeCard = 1;
 		}
 	}
@@ -2628,16 +2604,16 @@ int CmdHF14AMfCSetBlk(const char *Cmd) {
 	uint8_t blockNo = 0;
 	uint8_t params = MAGIC_SINGLE;
 	int res;
-	char ctmp = param_getchar(Cmd, 0);
+	char ctmp = tolower(param_getchar(Cmd, 0));
 
-	if (strlen(Cmd) < 1 || ctmp == 'h' || ctmp == 'H') return usage_hf14_csetblk();
+	if (strlen(Cmd) < 1 || ctmp == 'h') return usage_hf14_csetblk();
 
 	blockNo = param_get8(Cmd, 0);
 
 	if (param_gethex(Cmd, 1, block, 32)) return usage_hf14_csetblk();
 	
-	ctmp = param_getchar(Cmd, 2);
-	if (ctmp == 'w' || ctmp == 'W')
+	ctmp = tolower(param_getchar(Cmd, 2));
+	if (ctmp == 'w')
 		params |= MAGIC_WIPE;
 	
 	PrintAndLogEx(NORMAL, "--block number:%2d data:%s", blockNo, sprint_hex(block, 16));
@@ -2651,21 +2627,16 @@ int CmdHF14AMfCSetBlk(const char *Cmd) {
 }
 
 int CmdHF14AMfCLoad(const char *Cmd) {
-	FILE * f;
-	char filename[FILE_PATH_SIZE];
-	char * fnameptr = filename;
-	char buf[35] = {0x00};  // 32+newline chars+1 null terminator
+
 	uint8_t buf8[16] = {0x00};
 	uint8_t fillFromEmulator = 0;
-	uint32_t tmp;
-	int i, len, blockNum, flags=0;
-
-	memset(filename, 0, sizeof(filename));
+	int blockNum, flags = 0;
 	
-	char ctmp = param_getchar(Cmd, 0);
-	
-	if (ctmp == 'h' || ctmp == 'H' || ctmp == 0x00)	return usage_hf14_cload();
-	if (ctmp == 'e' || ctmp == 'E') fillFromEmulator = 1;
+	char ctmp = tolower(param_getchar(Cmd, 0));
+	if ( strlen(Cmd) == 1 ) {
+		if (ctmp == 'h' || ctmp == 0x00) return usage_hf14_cload();
+		if (ctmp == 'e' ) fillFromEmulator = 1;
+	}
 	
 	if (fillFromEmulator) {
 		for (blockNum = 0; blockNum < 16 * 4; blockNum += 1) {
@@ -2685,69 +2656,66 @@ int CmdHF14AMfCLoad(const char *Cmd) {
 		}
 		PrintAndLogEx(NORMAL, "\n");
 		return 0;
-	} 
-	
-	len = strlen(Cmd);
-	if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5;
+	}
 
-	memcpy(filename, Cmd, len);
-	fnameptr += len;
-
-	sprintf(fnameptr, ".eml"); 
-
-	// open file
-	f = fopen(filename, "r");
-	if (f == NULL) {
-		PrintAndLogEx(WARNING, "File not found or locked.");
+	uint8_t *data = calloc(1, 4096);
+	size_t datalen = 0;
+	//int res = loadFile(Cmd, "bin", data, &datalen);
+	int res = loadFileEML( Cmd, "eml", data, &datalen);
+	if ( res ) {
+		free(data);
 		return 1;
 	}
-
-	blockNum = 0;
-	while (!feof(f)){
 	
-		memset(buf, 0, sizeof(buf));
-		
-		if (fgets(buf, sizeof(buf), f) == NULL) {
-			fclose(f);
-			PrintAndLogEx(WARNING, "File reading error.");
-			return 2;
-		}
+//	PrintAndLogEx(INFO, "DATA | %s", sprint_hex(data+1000, 24) );
+	
 
-		if (strlen(buf) < 32) {
-			if(strlen(buf) && feof(f))
-				break;
-			PrintAndLogEx(WARNING, "File content error. Block data must include 32 HEX symbols");
-			fclose(f);
-			return 2;
-		}
-		for (i = 0; i < 32; i += 2) {
-			sscanf(&buf[i], "%02x", &tmp);
-			buf8[i / 2] = tmp & 0xFF;
-		}
-		
-		if (blockNum == 0) flags = MAGIC_INIT + MAGIC_WUPC;				// switch on field and send magic sequence
-		if (blockNum == 1) flags = 0;									// just write
-		if (blockNum == 16 * 4 - 1) flags = MAGIC_HALT + MAGIC_OFF;		// Done. Switch off field.
+	// 64 or 256blocks.
+	if (datalen != 1024 && datalen != 4096) {
+		PrintAndLogEx(WARNING, "File content error. ");
+		free(data);		
+		return 2;
+	}
+	
+	PrintAndLogEx(INFO, "Copying to magic card");
+			
+	blockNum = 0;
+	while ( datalen ) {
 
-		if (mfCSetBlock(blockNum, buf8, NULL, flags)) {
+		// switch on field and send magic sequence	
+		if (blockNum == 0) flags = MAGIC_INIT + MAGIC_WUPC;
+
+		// write					
+		if (blockNum == 1) flags = 0;
+		
+		// Switch off field.
+		if (blockNum == 16 * 4 - 1) flags = MAGIC_HALT + MAGIC_OFF;
+
+		if (mfCSetBlock(blockNum, data + (16 * blockNum), NULL, flags)) {
 			PrintAndLogEx(WARNING, "Can't set magic card block: %d", blockNum);
-			fclose(f);
+			free(data);
 			return 3;
 		}
+		
+		datalen -= 16;
+		
 		printf("."); fflush(stdout);
 		blockNum++;
-	
-		if (blockNum >= 16 * 4) break;  // magic card type - mifare 1K
+		
+		// magic card type - mifare 1K
+		if (blockNum >= 16 * 4) break;  
 	}
 	PrintAndLogEx(NORMAL, "\n");
-	fclose(f);
 
 	// 64 or 256blocks.
 	if (blockNum != 16 * 4 && blockNum != 32 * 4 + 8 * 16){
 		PrintAndLogEx(WARNING, "File content error. There must be 64 blocks");
+		free(data);
 		return 4;
 	}
-	PrintAndLogEx(SUCCESS, "Loaded %d blocks from file: %s", blockNum, filename);	
+	
+	PrintAndLogEx(SUCCESS, "Card loaded %d blocks from file", blockNum);	
+	free(data);
 	return 0;
 }
 
diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index 71f4e02aa..3706564fd 100644
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -135,26 +135,126 @@ out:
 	return retval;
 }
 
-/**
- * Utility function to print to console. This is used consistently within the library instead
- * of printf, but it actually only calls printf (and adds a linebreak).
- * The reason to have this method is to
- * make it simple to plug this library into proxmark, which has this function already to
- * write also to a logfile. When doing so, just delete this function.
- * @param fmt
- */
- /*
-void PrintAndLogDevice(logLevel_t level, char *fmt, ...) {
-	char buffer[2048] = {0};
-	va_list args;
-	va_start(args, fmt);
-	vsnprintf(buffer, sizeof(buffer), fmt, args);
-	va_end(args);
-	PrintAndLogEx(level, buffer);
+int saveFileJSON(const char *preferredName, const char *suffix, uint8_t* data, size_t datalen) {
+	//stub - for merlokk ;)
+	return 1;
 }
-*/
+
+int loadFile(const char *preferredName, const char *suffix, void* data, size_t* datalen) {
+
+	if ( preferredName == NULL ) return 1;
+	if ( suffix == NULL ) return 1;
+
+	int retval = 0;
+	int size = sizeof(char) * (strlen(preferredName) + strlen(suffix) + 10);
+	char * fileName = calloc(size, sizeof(char));
+	sprintf(fileName,"%s.%s", preferredName, suffix);
+
+	FILE *f = fopen(fileName, "rb");
+	if ( !f ) {
+		PrintAndLogDevice(FAILED, "file: %s: not found or locked.", fileName);
+		retval = 1;
+		goto out;
+	}
+	
+	// get filesize in order to malloc memory
+	fseek(f, 0, SEEK_END);
+	long fsize = ftell(f);
+	fseek(f, 0, SEEK_SET);
+
+	if ( fsize < 0 ) 	{
+		PrintAndLogDevice(FAILED, "error, when getting filesize");
+		retval = 1;
+		goto out;
+	}
+	
+	uint8_t *dump = calloc(fsize, sizeof(uint8_t));
+	if ( !dump ) {
+		PrintAndLogDevice(FAILED, "error, cannot allocate memory");
+		retval = 2;
+		goto out;
+	}
+	
+	size_t bytes_read = fread(dump, 1, fsize, f);
+
+	if ( bytes_read != fsize ) {
+		PrintAndLogDevice(FAILED, "error, bytes read mismatch file size");
+		free(dump);
+		retval = 3;
+		goto out;		
+	}
+	
+	memcpy(data, dump, bytes_read);
+	free(dump);
+	
+	PrintAndLogDevice(SUCCESS, "loaded %d bytes from binary file %s", bytes_read, fileName);
+	
+	*datalen = bytes_read;
+
+out:	
+	fclose(f);
+	free(fileName);
+	return retval;
+}
+
+int loadFileEML(const char *preferredName, const char *suffix, void* data, size_t* datalen) {
+
+	if ( preferredName == NULL ) return 1;
+	if ( suffix == NULL ) return 1;
+
+    size_t counter = 0;
+	int retval = 0, hexlen = 0;
+	int size = sizeof(char) * (strlen(preferredName) + strlen(suffix) + 10);
+	char * fileName = calloc(size, sizeof(char));
+	sprintf(fileName,"%s.%s", preferredName, suffix);
+
+	FILE *f = fopen(fileName, "r");
+	if ( !f ) {
+		PrintAndLogDevice(FAILED, "file: %s: not found or locked.", fileName);
+		retval = 1;
+		goto out;
+	}
+	
+	// 128 + 2 newline chars + 1 null terminator	
+	char line[131];
+	memset(line, 0, sizeof(line));
+	uint8_t buf[64] = {0x00};
+	
+	while ( !feof(f) ) {
+
+		memset(line, 0, sizeof(line));
+
+		if (fgets(line, sizeof(line), f) == NULL){
+			fclose(f);
+			PrintAndLogEx(FAILED, "File reading error.");
+			retval = 2;
+			goto out;
+		}
+	
+		if ( line[0] == '#' )
+			continue;
+		
+		int res = param_gethex_to_eol(line, 0, buf, sizeof(buf), &hexlen);
+		if (res == 0 || res == 1) {
+			memcpy(data + counter, buf, hexlen);
+			counter += hexlen;
+		}
+	}
+	fclose(f);
+	PrintAndLogDevice(SUCCESS, "loaded %d bytes from text file %s", counter, fileName);
+	*datalen = counter;
+		
+out:	
+	free(fileName);
+	return retval;
+}
+
+int loadFileJSON(const char *preferredName, const char *suffix, void* data, size_t* datalen) {
+	//stub - for merlokk ;)
+	datalen = 0;
+	return 1;
+}
+
 #else //if we're on ARM
 
-//void PrintAndLogDevice(logLevel_t level, char *fmt, ...) { return; }
-
 #endif
diff --git a/client/loclass/fileutils.h b/client/loclass/fileutils.h
index bb4393a25..40bd7cfeb 100644
--- a/client/loclass/fileutils.h
+++ b/client/loclass/fileutils.h
@@ -48,10 +48,13 @@
 #include <stdarg.h>
 #include "../ui.h"
 
+int fileExists(const char *filename);
+
 /**
  * @brief Utility function to save data to a binary file. This method takes a preferred name, but if that
  * file already exists, it tries with another name until it finds something suitable.
  * E.g. dumpdata-15.txt
+ *
  * @param preferredName
  * @param suffix the file suffix. Leave out the ".".
  * @param data The binary data to write to the file
@@ -61,9 +64,10 @@
 extern int saveFile(const char *preferredName, const char *suffix, const void* data, size_t datalen);
 
 /**
- * @brief Utility function to save data to a textfile. This method takes a preferred name, but if that
+ * @brief Utility function to save data to a textfile (EML). This method takes a preferred name, but if that
  * file already exists, it tries with another name until it finds something suitable.
  * E.g. dumpdata-15.txt
+ *
  * @param preferredName
  * @param suffix the file suffix. Leave out the ".".
  * @param data The binary data to write to the file
@@ -72,16 +76,55 @@ extern int saveFile(const char *preferredName, const char *suffix, const void* d
  * @return 0 for ok, 1 for failz
 */
 extern int saveFileEML(const char *preferredName, const char *suffix, uint8_t* data, size_t datalen, size_t blocksize);
-/**
- * @brief Utility function to save load binary data from a a file. This method takes a filename,
- * Should only be used for fixed-size binary files
- * @param fileName the name of the file
- * @param data a buffer to place data in
- * @param datalen the length of the data/data.
- * @return
- */
 
-int fileExists(const char *filename);
+/** STUB
+ * @brief Utility function to save JSON data to a file. This method takes a preferred name, but if that
+ * file already exists, it tries with another name until it finds something suitable.
+ * E.g. dumpdata-15.json
+ *
+ * @param preferredName
+ * @param suffix the file suffix. Leave out the ".".
+ * @param data The binary data to write to the file
+ * @param datalen the length of the data
+ * @return 0 for ok, 1 for failz
+ */
+extern int saveFileJSON(const char *preferredName, const char *suffix, uint8_t* data, size_t datalen);
+
+/** STUB
+ * @brief Utility function to load data from a binary file. This method takes a preferred name.
+ * E.g. dumpdata-15.bin
+ *
+ * @param preferredName
+ * @param suffix the file suffix. Leave out the ".".
+ * @param data The data array to store the loaded bytes from file
+ * @param datalen the number of bytes loaded from file
+ * @return 0 for ok, 1 for failz
+*/
+extern int loadFile(const char *preferredName, const char *suffix, void* data, size_t* datalen);
+
+/**
+ * @brief  Utility function to load data from a textfile (EML). This method takes a preferred name.
+ * E.g. dumpdata-15.txt
+ *
+ * @param preferredName
+ * @param suffix the file suffix. Leave out the ".".
+ * @param data The data array to store the loaded bytes from file
+ * @param datalen the number of bytes loaded from file
+ * @return 0 for ok, 1 for failz
+*/
+extern int loadFileEML(const char *preferredName, const char *suffix, void* data, size_t* datalen);
+
+/** STUB
+ * @brief  Utility function to load data from a JSON textfile. This method takes a preferred name.
+ * E.g. dumpdata-15.json
+ *
+ * @param preferredName
+ * @param suffix the file suffix. Leave out the ".".
+ * @param data The data array to store the loaded bytes from file
+ * @param datalen the number of bytes loaded from file
+ * @return 0 for ok, 1 for failz
+*/
+extern int loadFileJSON(const char *preferredName, const char *suffix, void* data, size_t* datalen);
 
 #define PrintAndLogDevice(level, format, args...)  PrintAndLogEx(level, format , ## args)
 #else 
@@ -98,7 +141,4 @@ int fileExists(const char *filename);
 	
 #endif //ON_DEVICE
 
-
-//void PrintAndLogDevice(logLevel_t level, char *fmt, ...);
-
 #endif // FILEUTILS_H

From eb4310395e6106e486d1fc1c0c8f1616b9e44bc8 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Mon, 12 Nov 2018 22:19:54 +0100
Subject: [PATCH 0153/1938] CHG: 'LF T55XX DETECT' - swapped some demod order. 
 From FSK-PSK-ASK,  to FSK-ASK-PSK since PSK is the leasted used modulation

---
 client/cmdlft55xx.c | 79 +++++++++++++++++++++++----------------------
 1 file changed, 41 insertions(+), 38 deletions(-)

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 743d2db9c..bf73d6ff5 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1507,7 +1507,7 @@ int CmdT55xxBruteForce(const char *Cmd) {
 	
 	// load a default pwd file.
 	char line[9];
-	char filename[FILE_PATH_SIZE]={0};
+	char filename[FILE_PATH_SIZE] = {0};
 	int	keycnt = 0;
 	uint8_t stKeyBlock = 20;
 	uint8_t *keyBlock = NULL, *p = NULL;
@@ -1752,9 +1752,10 @@ int CmdT55xxRecoverPW(const char *Cmd) {
 
 	return 0;
 }
+
 // note length of data returned is different for different chips.  
-//   some return all page 1 (64 bits) and others return just that block (32 bits) 
-//   unfortunately the 64 bits makes this more likely to get a false positive...
+// some return all page 1 (64 bits) and others return just that block (32 bits) 
+// unfortunately the 64 bits makes this more likely to get a false positive...
 bool tryDetectP1(bool getData) {
 	uint8_t preamble[] = {1,1,1,0,0,0,0,0,0,0,0,1,0,1,0,1};
 	size_t startIdx = 0;
@@ -1771,7 +1772,7 @@ bool tryDetectP1(bool getData) {
 	ans = fskClocks(&fc1, &fc2, (uint8_t *)&clk, &firstClockEdge);
 	if (ans && ((fc1==10 && fc2==8) || (fc1==8 && fc2==5))) {
 		if ( FSKrawDemod("0 0", false) && 
-			  preambleSearchEx(DemodBuffer, preamble,sizeof(preamble), &DemodBufferLen, &startIdx, false) && 
+			  preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) && 
 			  (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
 			return true;
 		}
@@ -1783,40 +1784,6 @@ bool tryDetectP1(bool getData) {
 		return false;
 	}
 
-	// try psk clock detect. if successful it cannot be any other type of modulation... (in theory...)
-	clk = GetPskClock("", false);
-	if (clk > 0) {
-		// allow undo
-		// save_restoreGB(1);
-		// skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)
-		//CmdLtrim("160");
-		if ( PSKDemod("0 0 6", false) &&
-			  preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) && 
-			  (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
-			//save_restoreGB(0);
-			return true;
-		}
-		if ( PSKDemod("0 1 6", false) &&
-			  preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) && 
-			  (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
-			//save_restoreGB(0);
-			return true;
-		}
-		// PSK2 - needs a call to psk1TOpsk2.
-		if ( PSKDemod("0 0 6", false)) {
-			psk1TOpsk2(DemodBuffer, DemodBufferLen);
-			if (preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) && 
-				  (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
-				//save_restoreGB(0);
-				return true;
-			}
-		} // inverse waves does not affect PSK2 demod
-		//undo trim samples
-		//save_restoreGB(0); 
-		// no other modulation clocks = 2 or 4 so quit searching
-		if (fc1 != 8) return false;
-	}
-
 	// try ask clock detect.  it could be another type even if successful.
 	clk = GetAskClock("", false);
 	if (clk>0) {
@@ -1857,6 +1824,42 @@ bool tryDetectP1(bool getData) {
 			return true;
 		}
 	}
+	
+	// Fewer card uses PSK
+	// try psk clock detect. if successful it cannot be any other type of modulation... (in theory...)
+	clk = GetPskClock("", false);
+	if (clk > 0) {
+		// allow undo
+		// save_restoreGB(1);
+		// skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)
+		//CmdLtrim("160");
+		if ( PSKDemod("0 0 6", false) &&
+			  preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) && 
+			  (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
+			//save_restoreGB(0);
+			return true;
+		}
+		if ( PSKDemod("0 1 6", false) &&
+			  preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) && 
+			  (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
+			//save_restoreGB(0);
+			return true;
+		}
+		// PSK2 - needs a call to psk1TOpsk2.
+		if ( PSKDemod("0 0 6", false)) {
+			psk1TOpsk2(DemodBuffer, DemodBufferLen);
+			if (preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) && 
+				  (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
+				//save_restoreGB(0);
+				return true;
+			}
+		} // inverse waves does not affect PSK2 demod
+		//undo trim samples
+		//save_restoreGB(0); 
+		// no other modulation clocks = 2 or 4 so quit searching
+		if (fc1 != 8) return false;
+	}
+
 	return false;
 }
 //  does this need to be a callable command?

From 25b07682dc1b258e5eeb05033b8f99b64bac128f Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Mon, 12 Nov 2018 22:55:19 +0100
Subject: [PATCH 0154/1938] CHG: 'mem load' - adapted loading files to use new
 load function. loading binary file can be called with NULL pointer,  don't
 forget to free it.

---
 client/cmdflashmem.c       | 66 +++++++++++++-------------------------
 client/loclass/fileutils.c |  6 +++-
 2 files changed, 27 insertions(+), 45 deletions(-)

diff --git a/client/cmdflashmem.c b/client/cmdflashmem.c
index 62f341a24..1dd3084d9 100644
--- a/client/cmdflashmem.c
+++ b/client/cmdflashmem.c
@@ -151,20 +151,16 @@ int CmdFlashmemSpiBaudrate(const char *Cmd) {
 
 int CmdFlashMemLoad(const char *Cmd){
 
-	FILE *f;
-	char filename[FILE_PATH_SIZE] = {0};	
-	uint8_t cmdp = 0;
-	bool errors = false;
 	uint32_t start_index = 0;
+	char filename[FILE_PATH_SIZE] = {0};	
+	bool errors = false;
+	uint8_t cmdp = 0;
 	
 	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
 		switch (tolower(param_getchar(Cmd, cmdp))) {
-		case 'o':
-			start_index = param_get32ex(Cmd, cmdp+1, 0, 10);
-			cmdp += 2;
-			break;
+		case 'h':
+			return usage_flashmem_load();
 		case 'f':
-			//File handling and reading
 			if ( param_getstr(Cmd, cmdp+1, filename, FILE_PATH_SIZE) >= FILE_PATH_SIZE ) {
 				PrintAndLogEx(FAILED, "Filename too long");
 				errors = true;
@@ -172,8 +168,10 @@ int CmdFlashMemLoad(const char *Cmd){
 			}			
 			cmdp += 2;			
 			break;
-		case 'h':
-			return usage_flashmem_load();
+		case 'o':
+			start_index = param_get32ex(Cmd, cmdp+1, 0, 10);
+			cmdp += 2;
+			break;	
 		default:
 			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
 			errors = true;
@@ -183,52 +181,32 @@ int CmdFlashMemLoad(const char *Cmd){
 	
 	//Validations
 	if (errors || cmdp == 0 ) return usage_flashmem_load();			
-
-	// load file
-	f = fopen(filename, "rb");
-	if ( !f ){
-		PrintAndLogEx(FAILED, "File: %s: not found or locked.", filename);
-		return 1;
-	}	
 	
-	// get filesize in order to malloc memory
-	fseek(f, 0, SEEK_END);
-	long fsize = ftell(f);
-	fseek(f, 0, SEEK_SET);
-
-	if (fsize < 0) 	{
-		PrintAndLogDevice(WARNING, "error, when getting filesize");
-		fclose(f);
+	uint8_t *data = NULL;
+	size_t datalen = 0;
+	int res = loadFile(filename, "bin", &data, &datalen);
+	//int res = loadFileEML( filename, "eml", data, &datalen);
+	if ( res ) {
+		free(data);
 		return 1;
 	}
 	
-	if (fsize > FLASH_MEM_MAX_SIZE) {
+	if (datalen > FLASH_MEM_MAX_SIZE) {
 		PrintAndLogDevice(WARNING, "error, filesize is larger than available memory");
-		fclose(f);
+		free(data);
 		return 1;
 	}
 
-	uint8_t *dump = calloc(fsize, sizeof(uint8_t));
-	if (!dump) {
-		PrintAndLogDevice(WARNING, "error, cannot allocate memory ");
-		fclose(f);
-		return 1;
-	}
-	
-	size_t bytes_read = fread(dump, 1, fsize, f);
-	if (f)
-		fclose(f);
-	
 	//Send to device
 	uint32_t bytes_sent = 0;
-	uint32_t bytes_remaining = bytes_read;
+	uint32_t bytes_remaining = datalen;
 
 	while (bytes_remaining > 0){
 		uint32_t bytes_in_packet = MIN(FLASH_MEM_BLOCK_SIZE, bytes_remaining);
 		
 		UsbCommand c = {CMD_FLASHMEM_WRITE, {start_index + bytes_sent, bytes_in_packet, 0}};
 				
-		memcpy(c.d.asBytes, dump + bytes_sent, bytes_in_packet);
+		memcpy(c.d.asBytes, data + bytes_sent, bytes_in_packet);
 		clearCommandBuffer();
 		SendCommand(&c);
 
@@ -238,7 +216,7 @@ int CmdFlashMemLoad(const char *Cmd){
 		UsbCommand resp;
 		if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
 			PrintAndLogEx(WARNING, "timeout while waiting for reply.");
-			free(dump);
+			free(data);
 			return 1;
 		}
 		
@@ -247,9 +225,9 @@ int CmdFlashMemLoad(const char *Cmd){
 			PrintAndLogEx(FAILED, "Flash write fail [offset %u]", bytes_sent);
 		
 	}
-	free(dump);
+	free(data);
 	
-	PrintAndLogEx(SUCCESS, "Wrote %u bytes to offset %u", bytes_read, start_index);
+	PrintAndLogEx(SUCCESS, "Wrote %u bytes to offset %u", datalen, start_index);
 	return 0;
 }
 int CmdFlashMemSave(const char *Cmd){
diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index 3706564fd..44bab0193 100644
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -184,7 +184,11 @@ int loadFile(const char *preferredName, const char *suffix, void* data, size_t*
 		goto out;		
 	}
 	
-	memcpy(data, dump, bytes_read);
+	if ( (data) == NULL) {
+		(data) = calloc( bytes_read, sizeof(uint8_t));
+	}
+	
+	memcpy( (data), dump, bytes_read);
 	free(dump);
 	
 	PrintAndLogDevice(SUCCESS, "loaded %d bytes from binary file %s", bytes_read, fileName);

From ac12d715f0dade00cd02408fcd7d4d8eb353a29d Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Tue, 13 Nov 2018 12:34:09 +0100
Subject: [PATCH 0155/1938] chg: 'sc raw' - no need to tvl decode twice

---
 client/cmdsmartcard.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index 675b9a9b7..a7b45c51d 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -232,10 +232,6 @@ int CmdSmartRaw(const char *Cmd) {
 			clearCommandBuffer();
 			SendCommand(&c);
 			len = smart_response(buf);
-			
-			// TLV decoder
-			if (len > 4)
-				TLVPrintFromBuffer(buf+1, len-3);
 
 			data[4] = 0;
 		}

From d7d409d9eb94acfce8eaa6b420b8d918ccd9645c Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 13 Nov 2018 14:05:14 +0200
Subject: [PATCH 0156/1938] added check signature in `hf fido auth` command

---
 client/cmdhffido.c | 59 +++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 56 insertions(+), 3 deletions(-)

diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index ab9afbdca..86f6bd98b 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -404,6 +404,8 @@ int CmdHFFidoRegister(const char *cmd) {
 int CmdHFFidoAuthenticate(const char *cmd) {
 	uint8_t data[512] = {0};
 	uint8_t hdata[250] = {0};
+	bool public_key_loaded = false;
+	uint8_t public_key[65] = {0}; 
 	int hdatalen = 0;
 	uint8_t keyHandleLen = 0;
 	json_t *root = NULL;
@@ -423,6 +425,7 @@ int CmdHFFidoAuthenticate(const char *cmd) {
 		arg_lit0("uU",  "user",     "mode: enforce-user-presence-and-sign"),
 		arg_lit0("cC",  "check",    "mode: check-only"),
 		arg_str0("jJ",  "json",		"fido.json", "JSON input / output file name for parameters."),
+		arg_str0("kK",  "key",		"public key to verify signature", NULL),
 		arg_str0(NULL,  NULL,       "<HEX key handle (var 0..255b)>", NULL),
 		arg_str0(NULL,  NULL,       "<HEX/ASCII challenge parameter (32b HEX/1..16 chars)>", NULL),
 		arg_str0(NULL,  NULL,       "<HEX/ASCII application parameter (32b HEX/1..16 chars)>", NULL),
@@ -431,7 +434,7 @@ int CmdHFFidoAuthenticate(const char *cmd) {
 	CLIExecWithReturn(cmd, argtable, true);
 	
 	bool APDULogging = arg_get_lit(1);
-	//bool verbose = arg_get_lit(2);
+	bool verbose = arg_get_lit(2);
 	bool paramsPlain = arg_get_lit(3);
 	uint8_t controlByte = 0x08;
 	if (arg_get_lit(5))
@@ -449,11 +452,25 @@ int CmdHFFidoAuthenticate(const char *cmd) {
 		JsonLoadBufAsHex(root, "$.ChallengeParam", data, 32, &jlen);
 		JsonLoadBufAsHex(root, "$.ApplicationParam", &data[32], 32, &jlen);
 		JsonLoadBufAsHex(root, "$.KeyHandle", &data[65], 512 - 67, &jlen);
+		JsonLoadBufAsHex(root, "$.PublicKey", public_key, 65, &jlen);
+		if (jlen > 0)
+			public_key_loaded = true;
 		keyHandleLen = jlen & 0xff;
 		data[64] = keyHandleLen;
 	} 
 
+	// public key
 	CLIGetHexWithReturn(8, hdata, &hdatalen);
+	if (hdatalen && hdatalen != 130) {
+		PrintAndLog("ERROR: public key length must be 65 bytes only.");
+		return 1;
+	}
+	if (hdatalen) {
+		memmove(public_key, hdata, hdatalen);
+		public_key_loaded = true;
+	}	
+	
+	CLIGetHexWithReturn(9, hdata, &hdatalen);
 	if (hdatalen > 255) {
 		PrintAndLog("ERROR: application parameter length must be less than 255.");
 		return 1;
@@ -472,7 +489,7 @@ int CmdHFFidoAuthenticate(const char *cmd) {
 			return 1;
 		}
 	} else {
-		CLIGetHexWithReturn(9, hdata, &hdatalen);
+		CLIGetHexWithReturn(10, hdata, &hdatalen);
 		if (hdatalen && hdatalen != 32) {
 			PrintAndLog("ERROR: challenge parameter length must be 32 bytes only.");
 			return 1;
@@ -483,7 +500,7 @@ int CmdHFFidoAuthenticate(const char *cmd) {
 
 	if (paramsPlain) {
 		memset(hdata, 0x00, 32);
-		CLIGetStrWithReturn(10, hdata, &hdatalen);
+		CLIGetStrWithReturn(11, hdata, &hdatalen);
 		if (hdatalen && hdatalen > 16) {
 			PrintAndLog("ERROR: application parameter length in ASCII mode must be less than 16 chars instead of: %d", hdatalen);
 			return 1;
@@ -547,6 +564,42 @@ int CmdHFFidoAuthenticate(const char *cmd) {
 	PrintAndLog("Counter: %d", cntr);
 	PrintAndLog("Hash[%d]: %s", len - 5, sprint_hex(&buf[5], len - 5));
 
+	// check ANSI X9.62 format ECDSA signature (on P-256)
+	uint8_t rval[300] = {0}; 
+	uint8_t sval[300] = {0}; 
+	res = ecdsa_asn1_get_signature(&buf[5], len - 5, rval, sval);
+	if (!res) {
+		if (verbose) {
+			PrintAndLog("  r: %s", sprint_hex(rval, 32));
+			PrintAndLog("  s: %s", sprint_hex(sval, 32));
+		}
+		if (public_key_loaded) {
+			uint8_t xbuf[4096] = {0};
+			size_t xbuflen = 0;
+			res = FillBuffer(xbuf, sizeof(xbuf), &xbuflen,
+				&data[32], 32, // application parameter
+				&buf[0], 1,    // user presence
+				&buf[1], 4,    // counter
+				data, 32,      // challenge parameter
+				NULL, 0);
+			PrintAndLog("--xbuf(%d)[%d]: %s", res, xbuflen, sprint_hex(xbuf, xbuflen));
+			res = ecdsa_signature_verify(public_key, xbuf, xbuflen, &buf[5], len - 5);
+			if (res) {
+				if (res == -0x4e00) {
+					PrintAndLog("Signature is NOT VALID.");
+				} else {
+					PrintAndLog("Other signature check error: %x %s", (res<0)?-res:res, ecdsa_get_error(res));
+				}
+			} else {
+				PrintAndLog("Signature is OK.");
+			}
+		} else {		
+			PrintAndLog("No public key provided. can't check signature.");
+		}
+	} else {
+		PrintAndLog("Invalid signature. res=%d.", res);
+	}
+	
 	if (root) {
 		JsonSaveBufAsHex(root, "ChallengeParam", data, 32);
 		JsonSaveBufAsHex(root, "ApplicationParam", &data[32], 32);

From 679b5eec5b28e4b499011528c91382b6d19bb319 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 13 Nov 2018 14:55:02 +0200
Subject: [PATCH 0157/1938] small fix. now works

---
 client/cmdhffido.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index 86f6bd98b..5379d2efc 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -383,6 +383,7 @@ int CmdHFFidoRegister(const char *cmd) {
 	if (root) {
 		JsonSaveBufAsHex(root, "ChallengeParam", data, 32);
 		JsonSaveBufAsHex(root, "ApplicationParam", &data[32], 32);
+		JsonSaveBufAsHexCompact(root, "PublicKey", &buf[1], 65);
 		JsonSaveInt(root, "KeyHandleLen", keyHandleLen);
 		JsonSaveBufAsHexCompact(root, "KeyHandle", &buf[67], keyHandleLen);
 		JsonSaveBufAsHexCompact(root, "DER", &buf[67 + keyHandleLen], derLen);
@@ -452,11 +453,10 @@ int CmdHFFidoAuthenticate(const char *cmd) {
 		JsonLoadBufAsHex(root, "$.ChallengeParam", data, 32, &jlen);
 		JsonLoadBufAsHex(root, "$.ApplicationParam", &data[32], 32, &jlen);
 		JsonLoadBufAsHex(root, "$.KeyHandle", &data[65], 512 - 67, &jlen);
-		JsonLoadBufAsHex(root, "$.PublicKey", public_key, 65, &jlen);
-		if (jlen > 0)
-			public_key_loaded = true;
 		keyHandleLen = jlen & 0xff;
 		data[64] = keyHandleLen;
+		JsonLoadBufAsHex(root, "$.PublicKey", public_key, 65, &jlen);
+		public_key_loaded = (jlen > 0);
 	} 
 
 	// public key
@@ -582,7 +582,7 @@ int CmdHFFidoAuthenticate(const char *cmd) {
 				&buf[1], 4,    // counter
 				data, 32,      // challenge parameter
 				NULL, 0);
-			PrintAndLog("--xbuf(%d)[%d]: %s", res, xbuflen, sprint_hex(xbuf, xbuflen));
+			//PrintAndLog("--xbuf(%d)[%d]: %s", res, xbuflen, sprint_hex(xbuf, xbuflen));
 			res = ecdsa_signature_verify(public_key, xbuf, xbuflen, &buf[5], len - 5);
 			if (res) {
 				if (res == -0x4e00) {

From fd9fe81ba482527dc53a200f01ea2b09dfda6a86 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Tue, 13 Nov 2018 14:08:01 +0100
Subject: [PATCH 0158/1938] fix:  'sc list' -  the iso7816-4 annotation now
 prints.

---
 client/cmdhflist.c | 15 +++++++++++++--
 client/cmdtrace.c  |  5 ++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/client/cmdhflist.c b/client/cmdhflist.c
index ddda15a2c..2deab204c 100644
--- a/client/cmdhflist.c
+++ b/client/cmdhflist.c
@@ -326,8 +326,19 @@ void annotateIso7816(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
 	}
 	// I-block
 	else {
-
-		int pos = (cmd[0] == 2 ||  cmd[0] == 3) ? 2 : 3;
+		int pos = 0;
+		switch ( cmd[0] ) {
+			case 2:
+			case 3:
+				pos = 2;
+				break;
+			case 0:
+				pos = 1;
+				break;
+			default:
+				pos = 3;
+				break;
+		}
 		switch ( cmd[pos] ){
 			case ISO7816_READ_BINARY				:snprintf(exp, size, "READ BIN");break;
 			case ISO7816_WRITE_BINARY				:snprintf(exp, size, "WRITE BIN");break;
diff --git a/client/cmdtrace.c b/client/cmdtrace.c
index 537786bb4..90c08459f 100644
--- a/client/cmdtrace.c
+++ b/client/cmdtrace.c
@@ -174,6 +174,7 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
 			case ISO_15693:
 				crcStatus = iso15693_CRC_check(frame, data_len);
 				break;
+			case ISO_7816_4:
 			default: 
 				break;
 		}
@@ -526,7 +527,9 @@ int CmdTraceList(const char *Cmd) {
 		if ( protocol == ISO_15693 )
 			PrintAndLogEx(NORMAL, "ISO15693 - Timings are not as accurate");
 		if ( protocol == FELICA )
-			PrintAndLogEx(NORMAL, "ISO18092 / FeliCa - Timings are not as accurate");	
+			PrintAndLogEx(NORMAL, "ISO18092 / FeliCa - Timings are not as accurate");
+		if ( protocol == ISO_7816_4 )
+			PrintAndLogEx(NORMAL, "ISO7816-4 / Smartcard - Timings N/A yet");
 		
 		PrintAndLogEx(NORMAL, "");
 		PrintAndLogEx(NORMAL, "      Start |        End | Src | Data (! denotes parity error)                                           | CRC | Annotation");

From 7214c70720ae6f856dc42f74fd07731084f7da9e Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 13 Nov 2018 19:02:02 +0200
Subject: [PATCH 0159/1938] fido commands hash checks works.

---
 client/Makefile             |   1 +
 client/cmdhffido.c          |  67 ++++-
 client/crypto/libpcrypto.c  |  26 ++
 client/crypto/libpcrypto.h  |   2 +
 client/fido/additional_ca.c |  63 +++++
 client/fido/additional_ca.h |  21 ++
 client/obj/fido/.dummy      |   0
 common/mbedtls/Makefile     |   1 +
 common/mbedtls/pkwrite.c    | 517 ++++++++++++++++++++++++++++++++++++
 9 files changed, 691 insertions(+), 7 deletions(-)
 create mode 100644 client/fido/additional_ca.c
 create mode 100644 client/fido/additional_ca.h
 create mode 100644 client/obj/fido/.dummy
 create mode 100644 common/mbedtls/pkwrite.c

diff --git a/client/Makefile b/client/Makefile
index 7aacebc7a..60217101a 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -107,6 +107,7 @@ CMDSRCS =	crapto1/crapto1.c \
 			crapto1/crypto1.c \
 			mfkey.c \
 			tea.c \
+			fido/additional_ca.c \
 			polarssl/des.c \
 			crypto/libpcrypto.c\
 			crypto/asn1utils.c\
diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index 5379d2efc..9a01705fc 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -41,6 +41,10 @@
 #include "cliparser/cliparser.h"
 #include "crypto/asn1utils.h"
 #include "crypto/libpcrypto.h"
+#include "fido/additional_ca.h"
+#include "mbedtls/x509_crt.h"
+#include "mbedtls/x509.h"
+#include "mbedtls/pk.h"
 
 static int CmdHelp(const char *Cmd);
 
@@ -203,7 +207,7 @@ int CmdHFFidoRegister(const char *cmd) {
 	void* argtable[] = {
 		arg_param_begin,
 		arg_lit0("aA",  "apdu",     "show APDU reqests and responses"),
-		arg_lit0("vV",  "verbose",  "show technical data"),
+		arg_lit0("vV",  "verbose",  "show technical data. vv - show full certificates data"),
 		arg_lit0("pP",  "plain",    "send plain ASCII to challenge and application parameters instead of HEX"),
 		arg_str0("jJ",  "json",		"fido.json", "JSON input / output file name for parameters."),
 		arg_str0(NULL,  NULL,       "<HEX/ASCII challenge parameter (32b HEX/1..16 chars)>", NULL),
@@ -214,6 +218,7 @@ int CmdHFFidoRegister(const char *cmd) {
 	
 	bool APDULogging = arg_get_lit(1);
 	bool verbose = arg_get_lit(2);
+	bool verbose2 = arg_get_lit(2) > 1;
 	bool paramsPlain = arg_get_lit(3);
 
 	char fname[250] = {0};
@@ -304,7 +309,7 @@ int CmdHFFidoRegister(const char *cmd) {
 	if (APDULogging)
 		PrintAndLog("---------------------------------------------------------------");
 	PrintAndLog("data len: %d", len);
-	if (verbose) {
+	if (verbose2) {
 		PrintAndLog("--------------data----------------------");
 		dump_buffer((const unsigned char *)buf, len, NULL, 0);
 		PrintAndLog("--------------data----------------------");
@@ -321,8 +326,7 @@ int CmdHFFidoRegister(const char *cmd) {
 	
 	int derp = 67 + keyHandleLen;
 	int derLen = (buf[derp + 2] << 8) + buf[derp + 3] + 4;
-	// needs to decode DER certificate
-	if (verbose) {
+	if (verbose2) {
 		PrintAndLog("DER certificate[%d]:------------------DER-------------------", derLen);
 		dump_buffer_simple((const unsigned char *)&buf[67 + keyHandleLen], derLen, NULL);
 		PrintAndLog("\n----------------DER---------------------");
@@ -331,7 +335,56 @@ int CmdHFFidoRegister(const char *cmd) {
 	}
 	
 	// check and print DER certificate
-	uint8_t public_key[65] = {0}; 
+	uint8_t public_key[65] = {0};
+	
+	// TODO: print DER certificate in DER view
+	
+	// load CA's
+	mbedtls_x509_crt cacert;
+	mbedtls_x509_crt_init(&cacert);
+	res = mbedtls_x509_crt_parse(&cacert, (const unsigned char *) additional_ca_pem, additional_ca_pem_len);
+	if (res < 0) {
+		PrintAndLog("ERROR: CA parse certificate returned -0x%x - %s", -res, ecdsa_get_error(res));
+	}
+	if (verbose) 
+		PrintAndLog("CA load OK. %d skipped", res);
+	
+	// load DER certificate from authenticator's data
+	mbedtls_x509_crt cert;
+	mbedtls_x509_crt_init(&cert);
+	res = mbedtls_x509_crt_parse_der(&cert, &buf[67 + keyHandleLen], derLen);
+	if (res) {
+		PrintAndLog("ERROR: DER parse returned 0x%x - %s", (res<0)?-res:res, ecdsa_get_error(res));
+	}
+	
+	// get certificate info
+	char linfo[300] = {0};
+	mbedtls_x509_crt_info(linfo, sizeof(linfo), "  ", &cert);
+	PrintAndLog("DER certificate info:\n%s", linfo);
+	
+	// verify certificate
+	uint32_t verifyflags = 0;
+	memset(linfo, 0x00, sizeof(linfo));
+
+	res = mbedtls_x509_crt_verify(&cert, &cacert, NULL, NULL, &verifyflags, NULL, NULL);
+	if (res) {
+		PrintAndLog("ERROR: DER verify returned 0x%x - %s", (res<0)?-res:res, ecdsa_get_error(res));
+	}
+	
+	mbedtls_x509_crt_verify_info(linfo, sizeof(linfo), "  ", verifyflags);
+	PrintAndLog("Verification info:\n%s", linfo);
+	
+	// get public key
+	res = ecdsa_public_key_from_pk(&cert.pk, public_key, sizeof(public_key));
+	if (res) {
+		PrintAndLog("ERROR: getting public key from certificate 0x%x - %s", (res<0)?-res:res, ecdsa_get_error(res));
+	} else {
+		if (verbose)
+			PrintAndLog("Got a public key from certificate.");
+	}
+
+	mbedtls_x509_crt_free(&cert);
+	mbedtls_x509_crt_free(&cacert);
 	
 	// get hash
 	int hashp = 1 + 65 + 1 + keyHandleLen + derLen;
@@ -351,8 +404,8 @@ int CmdHFFidoRegister(const char *cmd) {
 		size_t xbuflen = 0;
 		res = FillBuffer(xbuf, sizeof(xbuf), &xbuflen,
 			"\x00", 1,
-			adata, 32, 
-			cdata, 32, 
+			&data[32], 32,           // application parameter  
+			&data[0], 32,            // challenge parameter
 			&buf[67], keyHandleLen,  // keyHandle
 			&buf[1], 65,             // user public key
 			NULL, 0);
diff --git a/client/crypto/libpcrypto.c b/client/crypto/libpcrypto.c
index 030be15a3..896048bf0 100644
--- a/client/crypto/libpcrypto.c
+++ b/client/crypto/libpcrypto.c
@@ -16,6 +16,7 @@
 #include <mbedtls/asn1.h>
 #include <mbedtls/aes.h>
 #include <mbedtls/cmac.h>
+#include <mbedtls/pk.h>
 #include <mbedtls/ecdsa.h>
 #include <mbedtls/sha256.h>
 #include <mbedtls/ctr_drbg.h>
@@ -208,6 +209,31 @@ char *ecdsa_get_error(int ret) {
 	return retstr;
 }
 
+int ecdsa_public_key_from_pk(mbedtls_pk_context *pk, uint8_t *key, size_t keylen) {
+	int res = 0;
+	size_t realkeylen = 0;
+	if (keylen < 65) 
+		return 1;
+	
+	mbedtls_ecdsa_context ctx;
+	mbedtls_ecdsa_init(&ctx);
+	
+	res = mbedtls_ecp_group_load(&ctx.grp, MBEDTLS_ECP_DP_SECP256R1); // secp256r1
+	if (res)
+		goto exit;
+	
+	res = mbedtls_ecdsa_from_keypair(&ctx, mbedtls_pk_ec(*pk) );
+	if (res)
+		goto exit;
+	
+	res = mbedtls_ecp_point_write_binary(&ctx.grp, &ctx.Q, MBEDTLS_ECP_PF_UNCOMPRESSED, &realkeylen, key, keylen);
+	if (realkeylen != 65)
+		res = 2;
+exit:
+	mbedtls_ecdsa_free(&ctx);
+	return res;
+}
+
 int ecdsa_signature_create(uint8_t *key_d, uint8_t *key_xy, uint8_t *input, int length, uint8_t *signature, size_t *signaturelen) {
 	int res;
 	*signaturelen = 0;
diff --git a/client/crypto/libpcrypto.h b/client/crypto/libpcrypto.h
index 8d4b4a0d0..7ac6c3b07 100644
--- a/client/crypto/libpcrypto.h
+++ b/client/crypto/libpcrypto.h
@@ -14,6 +14,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stddef.h>
+#include <mbedtls/pk.h>
 
 extern int aes_encode(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *output, int length);
 extern int aes_decode(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *output, int length);
@@ -23,6 +24,7 @@ extern int aes_cmac8(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *mac, in
 extern int sha256hash(uint8_t *input, int length, uint8_t *hash);
 
 extern int ecdsa_key_create(uint8_t * key_d, uint8_t *key_xy);
+extern int ecdsa_public_key_from_pk(mbedtls_pk_context *pk, uint8_t *key, size_t keylen);
 extern int ecdsa_signature_create(uint8_t *key_d, uint8_t *key_xy, uint8_t *input, int length, uint8_t *signature, size_t *signaturelen);
 extern int ecdsa_signature_verify(uint8_t *key_xy, uint8_t *input, int length, uint8_t *signature, size_t signaturelen);
 extern char *ecdsa_get_error(int ret);
diff --git a/client/fido/additional_ca.c b/client/fido/additional_ca.c
new file mode 100644
index 000000000..aeb90aa40
--- /dev/null
+++ b/client/fido/additional_ca.c
@@ -0,0 +1,63 @@
+//-----------------------------------------------------------------------------
+// Copyright (C) 2018 Merlok
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// CA PEM certificates 
+//-----------------------------------------------------------------------------
+//
+
+#include "additional_ca.h"
+#include "mbedtls/certs.h"
+
+#define GLOBALSIGN_CA				\
+"-----BEGIN CERTIFICATE-----\r\n"	\
+"MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkG\r\n"	\
+"A1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jv\r\n"	\
+"b3QgQ0ExGzAZBgNVBAMTEkdsb2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAw\r\n"	\
+"MDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9i\r\n"	\
+"YWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYDVQQDExJHbG9iYWxT\r\n"	\
+"aWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDaDuaZ\r\n"	\
+"jc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavp\r\n"	\
+"xy0Sy6scTHAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp\r\n"	\
+"1Wrjsok6Vjk4bwY8iGlbKk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdG\r\n"	\
+"snUOhugZitVtbNV4FpWi6cgKOOvyJBNPc1STE4U6G7weNLWLBYy5d4ux2x8gkasJ\r\n"	\
+"U26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrXgzT/LCrBbBlDSgeF59N8\r\n"	\
+"9iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8E\r\n"	\
+"BTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0B\r\n"	\
+"AQUFAAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOz\r\n"	\
+"yj1hTdNGCbM+w6DjY1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE\r\n"	\
+"38NflNUVyRRBnMRddWQVDf9VMOyGj/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymP\r\n"	\
+"AbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhHhm4qxFYxldBniYUr+WymXUad\r\n"	\
+"DKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveCX4XSQRjbgbME\r\n"	\
+"HMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==\r\n"	\
+"-----END CERTIFICATE-----\r\n"
+
+// Name: Yubico U2F Root CA Serial 457200631
+// Issued: 2014-08-01
+#define YUBICO_CA	\
+"-----BEGIN CERTIFICATE-----" \
+"MIIDHjCCAgagAwIBAgIEG0BT9zANBgkqhkiG9w0BAQsFADAuMSwwKgYDVQQDEyNZ" \
+"dWJpY28gVTJGIFJvb3QgQ0EgU2VyaWFsIDQ1NzIwMDYzMTAgFw0xNDA4MDEwMDAw" \
+"MDBaGA8yMDUwMDkwNDAwMDAwMFowLjEsMCoGA1UEAxMjWXViaWNvIFUyRiBSb290" \
+"IENBIFNlcmlhbCA0NTcyMDA2MzEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK" \
+"AoIBAQC/jwYuhBVlqaiYWEMsrWFisgJ+PtM91eSrpI4TK7U53mwCIawSDHy8vUmk" \
+"5N2KAj9abvT9NP5SMS1hQi3usxoYGonXQgfO6ZXyUA9a+KAkqdFnBnlyugSeCOep" \
+"8EdZFfsaRFtMjkwz5Gcz2Py4vIYvCdMHPtwaz0bVuzneueIEz6TnQjE63Rdt2zbw" \
+"nebwTG5ZybeWSwbzy+BJ34ZHcUhPAY89yJQXuE0IzMZFcEBbPNRbWECRKgjq//qT" \
+"9nmDOFVlSRCt2wiqPSzluwn+v+suQEBsUjTGMEd25tKXXTkNW21wIWbxeSyUoTXw" \
+"LvGS6xlwQSgNpk2qXYwf8iXg7VWZAgMBAAGjQjBAMB0GA1UdDgQWBBQgIvz0bNGJ" \
+"hjgpToksyKpP9xv9oDAPBgNVHRMECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAN" \
+"BgkqhkiG9w0BAQsFAAOCAQEAjvjuOMDSa+JXFCLyBKsycXtBVZsJ4Ue3LbaEsPY4" \
+"MYN/hIQ5ZM5p7EjfcnMG4CtYkNsfNHc0AhBLdq45rnT87q/6O3vUEtNMafbhU6kt" \
+"hX7Y+9XFN9NpmYxr+ekVY5xOxi8h9JDIgoMP4VB1uS0aunL1IGqrNooL9mmFnL2k" \
+"LVVee6/VR6C5+KSTCMCWppMuJIZII2v9o4dkoZ8Y7QRjQlLfYzd3qGtKbw7xaF1U" \
+"sG/5xUb/Btwb2X2g4InpiB/yt/3CpQXpiWX/K4mBvUKiGn05ZsqeY1gx4g0xLBqc" \
+"U9psmyPzK+Vsgw2jeRQ5JlKDyqE0hebfC1tvFu0CCrJFcw==" \
+"-----END CERTIFICATE-----"
+
+/* Concatenation of all additional CA certificates in PEM format if available */
+const char   additional_ca_pem[] = YUBICO_CA; ///GLOBALSIGN_CA
+const size_t additional_ca_pem_len = sizeof(additional_ca_pem);
diff --git a/client/fido/additional_ca.h b/client/fido/additional_ca.h
new file mode 100644
index 000000000..856583039
--- /dev/null
+++ b/client/fido/additional_ca.h
@@ -0,0 +1,21 @@
+//-----------------------------------------------------------------------------
+// Copyright (C) 2018 Merlok
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// CA PEM certificates 
+//-----------------------------------------------------------------------------
+//
+
+#ifndef __ADDITIONAL_CA_H__
+#define __ADDITIONAL_CA_H__
+
+#include <stddef.h>
+
+// Concatenation of all CA certificates in PEM format if available 
+extern const char   additional_ca_pem[];
+extern const size_t additional_ca_pem_len;
+
+#endif /* __ADDITIONAL_CA_H__ */
diff --git a/client/obj/fido/.dummy b/client/obj/fido/.dummy
new file mode 100644
index 000000000..e69de29bb
diff --git a/common/mbedtls/Makefile b/common/mbedtls/Makefile
index 3e57fdac2..a9a850989 100644
--- a/common/mbedtls/Makefile
+++ b/common/mbedtls/Makefile
@@ -29,6 +29,7 @@ mbedtls_SOURCES = \
 	arc4.c \
 	pk.c \
 	pk_wrap.c \
+	pkwrite.c \
 	pkcs5.c \
 	pkcs12.c \
 	pkparse.c \
diff --git a/common/mbedtls/pkwrite.c b/common/mbedtls/pkwrite.c
new file mode 100644
index 000000000..8e0bb2e60
--- /dev/null
+++ b/common/mbedtls/pkwrite.c
@@ -0,0 +1,517 @@
+/*
+ *  Public Key layer for writing key files and structures
+ *
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: GPL-2.0
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "mbedtls/config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#if defined(MBEDTLS_PK_WRITE_C)
+
+#include "mbedtls/pk.h"
+#include "mbedtls/asn1write.h"
+#include "mbedtls/oid.h"
+
+#include <string.h>
+
+#if defined(MBEDTLS_RSA_C)
+#include "mbedtls/rsa.h"
+#endif
+#if defined(MBEDTLS_ECP_C)
+#include "mbedtls/ecp.h"
+#endif
+#if defined(MBEDTLS_ECDSA_C)
+#include "mbedtls/ecdsa.h"
+#endif
+#if defined(MBEDTLS_PEM_WRITE_C)
+#include "mbedtls/pem.h"
+#endif
+
+#if defined(MBEDTLS_PLATFORM_C)
+#include "mbedtls/platform.h"
+#else
+#include <stdlib.h>
+#define mbedtls_calloc    calloc
+#define mbedtls_free       free
+#endif
+
+#if defined(MBEDTLS_RSA_C)
+/*
+ *  RSAPublicKey ::= SEQUENCE {
+ *      modulus           INTEGER,  -- n
+ *      publicExponent    INTEGER   -- e
+ *  }
+ */
+static int pk_write_rsa_pubkey( unsigned char **p, unsigned char *start,
+                                mbedtls_rsa_context *rsa )
+{
+    int ret;
+    size_t len = 0;
+    mbedtls_mpi T;
+
+    mbedtls_mpi_init( &T );
+
+    /* Export E */
+    if ( ( ret = mbedtls_rsa_export( rsa, NULL, NULL, NULL, NULL, &T ) ) != 0 ||
+         ( ret = mbedtls_asn1_write_mpi( p, start, &T ) ) < 0 )
+        goto end_of_export;
+    len += ret;
+
+    /* Export N */
+    if ( ( ret = mbedtls_rsa_export( rsa, &T, NULL, NULL, NULL, NULL ) ) != 0 ||
+         ( ret = mbedtls_asn1_write_mpi( p, start, &T ) ) < 0 )
+        goto end_of_export;
+    len += ret;
+
+end_of_export:
+
+    mbedtls_mpi_free( &T );
+    if( ret < 0 )
+        return( ret );
+
+    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( p, start, len ) );
+    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( p, start, MBEDTLS_ASN1_CONSTRUCTED |
+                                                 MBEDTLS_ASN1_SEQUENCE ) );
+
+    return( (int) len );
+}
+#endif /* MBEDTLS_RSA_C */
+
+#if defined(MBEDTLS_ECP_C)
+/*
+ * EC public key is an EC point
+ */
+static int pk_write_ec_pubkey( unsigned char **p, unsigned char *start,
+                               mbedtls_ecp_keypair *ec )
+{
+    int ret;
+    size_t len = 0;
+    unsigned char buf[MBEDTLS_ECP_MAX_PT_LEN];
+
+    if( ( ret = mbedtls_ecp_point_write_binary( &ec->grp, &ec->Q,
+                                        MBEDTLS_ECP_PF_UNCOMPRESSED,
+                                        &len, buf, sizeof( buf ) ) ) != 0 )
+    {
+        return( ret );
+    }
+
+    if( *p < start || (size_t)( *p - start ) < len )
+        return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
+
+    *p -= len;
+    memcpy( *p, buf, len );
+
+    return( (int) len );
+}
+
+/*
+ * ECParameters ::= CHOICE {
+ *   namedCurve         OBJECT IDENTIFIER
+ * }
+ */
+static int pk_write_ec_param( unsigned char **p, unsigned char *start,
+                              mbedtls_ecp_keypair *ec )
+{
+    int ret;
+    size_t len = 0;
+    const char *oid;
+    size_t oid_len;
+
+    if( ( ret = mbedtls_oid_get_oid_by_ec_grp( ec->grp.id, &oid, &oid_len ) ) != 0 )
+        return( ret );
+
+    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_oid( p, start, oid, oid_len ) );
+
+    return( (int) len );
+}
+#endif /* MBEDTLS_ECP_C */
+
+int mbedtls_pk_write_pubkey( unsigned char **p, unsigned char *start,
+                             const mbedtls_pk_context *key )
+{
+    int ret;
+    size_t len = 0;
+
+#if defined(MBEDTLS_RSA_C)
+    if( mbedtls_pk_get_type( key ) == MBEDTLS_PK_RSA )
+        MBEDTLS_ASN1_CHK_ADD( len, pk_write_rsa_pubkey( p, start, mbedtls_pk_rsa( *key ) ) );
+    else
+#endif
+#if defined(MBEDTLS_ECP_C)
+    if( mbedtls_pk_get_type( key ) == MBEDTLS_PK_ECKEY )
+        MBEDTLS_ASN1_CHK_ADD( len, pk_write_ec_pubkey( p, start, mbedtls_pk_ec( *key ) ) );
+    else
+#endif
+        return( MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE );
+
+    return( (int) len );
+}
+
+int mbedtls_pk_write_pubkey_der( mbedtls_pk_context *key, unsigned char *buf, size_t size )
+{
+    int ret;
+    unsigned char *c;
+    size_t len = 0, par_len = 0, oid_len;
+    const char *oid;
+
+    c = buf + size;
+
+    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_pk_write_pubkey( &c, buf, key ) );
+
+    if( c - buf < 1 )
+        return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
+
+    /*
+     *  SubjectPublicKeyInfo  ::=  SEQUENCE  {
+     *       algorithm            AlgorithmIdentifier,
+     *       subjectPublicKey     BIT STRING }
+     */
+    *--c = 0;
+    len += 1;
+
+    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( &c, buf, len ) );
+    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( &c, buf, MBEDTLS_ASN1_BIT_STRING ) );
+
+    if( ( ret = mbedtls_oid_get_oid_by_pk_alg( mbedtls_pk_get_type( key ),
+                                       &oid, &oid_len ) ) != 0 )
+    {
+        return( ret );
+    }
+
+#if defined(MBEDTLS_ECP_C)
+    if( mbedtls_pk_get_type( key ) == MBEDTLS_PK_ECKEY )
+    {
+        MBEDTLS_ASN1_CHK_ADD( par_len, pk_write_ec_param( &c, buf, mbedtls_pk_ec( *key ) ) );
+    }
+#endif
+
+    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_algorithm_identifier( &c, buf, oid, oid_len,
+                                                        par_len ) );
+
+    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( &c, buf, len ) );
+    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( &c, buf, MBEDTLS_ASN1_CONSTRUCTED |
+                                                MBEDTLS_ASN1_SEQUENCE ) );
+
+    return( (int) len );
+}
+
+int mbedtls_pk_write_key_der( mbedtls_pk_context *key, unsigned char *buf, size_t size )
+{
+    int ret;
+    unsigned char *c = buf + size;
+    size_t len = 0;
+
+#if defined(MBEDTLS_RSA_C)
+    if( mbedtls_pk_get_type( key ) == MBEDTLS_PK_RSA )
+    {
+        mbedtls_mpi T; /* Temporary holding the exported parameters */
+        mbedtls_rsa_context *rsa = mbedtls_pk_rsa( *key );
+
+        /*
+         * Export the parameters one after another to avoid simultaneous copies.
+         */
+
+        mbedtls_mpi_init( &T );
+
+        /* Export QP */
+        if( ( ret = mbedtls_rsa_export_crt( rsa, NULL, NULL, &T ) ) != 0 ||
+            ( ret = mbedtls_asn1_write_mpi( &c, buf, &T ) ) < 0 )
+            goto end_of_export;
+        len += ret;
+
+        /* Export DQ */
+        if( ( ret = mbedtls_rsa_export_crt( rsa, NULL, &T, NULL ) ) != 0 ||
+            ( ret = mbedtls_asn1_write_mpi( &c, buf, &T ) ) < 0 )
+            goto end_of_export;
+        len += ret;
+
+        /* Export DP */
+        if( ( ret = mbedtls_rsa_export_crt( rsa, &T, NULL, NULL ) ) != 0 ||
+            ( ret = mbedtls_asn1_write_mpi( &c, buf, &T ) ) < 0 )
+            goto end_of_export;
+        len += ret;
+
+        /* Export Q */
+        if ( ( ret = mbedtls_rsa_export( rsa, NULL, NULL,
+                                         &T, NULL, NULL ) ) != 0 ||
+             ( ret = mbedtls_asn1_write_mpi( &c, buf, &T ) ) < 0 )
+            goto end_of_export;
+        len += ret;
+
+        /* Export P */
+        if ( ( ret = mbedtls_rsa_export( rsa, NULL, &T,
+                                         NULL, NULL, NULL ) ) != 0 ||
+             ( ret = mbedtls_asn1_write_mpi( &c, buf, &T ) ) < 0 )
+            goto end_of_export;
+        len += ret;
+
+        /* Export D */
+        if ( ( ret = mbedtls_rsa_export( rsa, NULL, NULL,
+                                         NULL, &T, NULL ) ) != 0 ||
+             ( ret = mbedtls_asn1_write_mpi( &c, buf, &T ) ) < 0 )
+            goto end_of_export;
+        len += ret;
+
+        /* Export E */
+        if ( ( ret = mbedtls_rsa_export( rsa, NULL, NULL,
+                                         NULL, NULL, &T ) ) != 0 ||
+             ( ret = mbedtls_asn1_write_mpi( &c, buf, &T ) ) < 0 )
+            goto end_of_export;
+        len += ret;
+
+        /* Export N */
+        if ( ( ret = mbedtls_rsa_export( rsa, &T, NULL,
+                                         NULL, NULL, NULL ) ) != 0 ||
+             ( ret = mbedtls_asn1_write_mpi( &c, buf, &T ) ) < 0 )
+            goto end_of_export;
+        len += ret;
+
+    end_of_export:
+
+        mbedtls_mpi_free( &T );
+        if( ret < 0 )
+            return( ret );
+
+        MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_int( &c, buf, 0 ) );
+        MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( &c, buf, len ) );
+        MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( &c,
+                                               buf, MBEDTLS_ASN1_CONSTRUCTED |
+                                               MBEDTLS_ASN1_SEQUENCE ) );
+    }
+    else
+#endif /* MBEDTLS_RSA_C */
+#if defined(MBEDTLS_ECP_C)
+    if( mbedtls_pk_get_type( key ) == MBEDTLS_PK_ECKEY )
+    {
+        mbedtls_ecp_keypair *ec = mbedtls_pk_ec( *key );
+        size_t pub_len = 0, par_len = 0;
+
+        /*
+         * RFC 5915, or SEC1 Appendix C.4
+         *
+         * ECPrivateKey ::= SEQUENCE {
+         *      version        INTEGER { ecPrivkeyVer1(1) } (ecPrivkeyVer1),
+         *      privateKey     OCTET STRING,
+         *      parameters [0] ECParameters {{ NamedCurve }} OPTIONAL,
+         *      publicKey  [1] BIT STRING OPTIONAL
+         *    }
+         */
+
+        /* publicKey */
+        MBEDTLS_ASN1_CHK_ADD( pub_len, pk_write_ec_pubkey( &c, buf, ec ) );
+
+        if( c - buf < 1 )
+            return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
+        *--c = 0;
+        pub_len += 1;
+
+        MBEDTLS_ASN1_CHK_ADD( pub_len, mbedtls_asn1_write_len( &c, buf, pub_len ) );
+        MBEDTLS_ASN1_CHK_ADD( pub_len, mbedtls_asn1_write_tag( &c, buf, MBEDTLS_ASN1_BIT_STRING ) );
+
+        MBEDTLS_ASN1_CHK_ADD( pub_len, mbedtls_asn1_write_len( &c, buf, pub_len ) );
+        MBEDTLS_ASN1_CHK_ADD( pub_len, mbedtls_asn1_write_tag( &c, buf,
+                            MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_CONSTRUCTED | 1 ) );
+        len += pub_len;
+
+        /* parameters */
+        MBEDTLS_ASN1_CHK_ADD( par_len, pk_write_ec_param( &c, buf, ec ) );
+
+        MBEDTLS_ASN1_CHK_ADD( par_len, mbedtls_asn1_write_len( &c, buf, par_len ) );
+        MBEDTLS_ASN1_CHK_ADD( par_len, mbedtls_asn1_write_tag( &c, buf,
+                            MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_CONSTRUCTED | 0 ) );
+        len += par_len;
+
+        /* privateKey: write as MPI then fix tag */
+        MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_mpi( &c, buf, &ec->d ) );
+        *c = MBEDTLS_ASN1_OCTET_STRING;
+
+        /* version */
+        MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_int( &c, buf, 1 ) );
+
+        MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( &c, buf, len ) );
+        MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( &c, buf, MBEDTLS_ASN1_CONSTRUCTED |
+                                                    MBEDTLS_ASN1_SEQUENCE ) );
+    }
+    else
+#endif /* MBEDTLS_ECP_C */
+        return( MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE );
+
+    return( (int) len );
+}
+
+#if defined(MBEDTLS_PEM_WRITE_C)
+
+#define PEM_BEGIN_PUBLIC_KEY    "-----BEGIN PUBLIC KEY-----\n"
+#define PEM_END_PUBLIC_KEY      "-----END PUBLIC KEY-----\n"
+
+#define PEM_BEGIN_PRIVATE_KEY_RSA   "-----BEGIN RSA PRIVATE KEY-----\n"
+#define PEM_END_PRIVATE_KEY_RSA     "-----END RSA PRIVATE KEY-----\n"
+#define PEM_BEGIN_PRIVATE_KEY_EC    "-----BEGIN EC PRIVATE KEY-----\n"
+#define PEM_END_PRIVATE_KEY_EC      "-----END EC PRIVATE KEY-----\n"
+
+/*
+ * Max sizes of key per types. Shown as tag + len (+ content).
+ */
+
+#if defined(MBEDTLS_RSA_C)
+/*
+ * RSA public keys:
+ *  SubjectPublicKeyInfo  ::=  SEQUENCE  {          1 + 3
+ *       algorithm            AlgorithmIdentifier,  1 + 1 (sequence)
+ *                                                + 1 + 1 + 9 (rsa oid)
+ *                                                + 1 + 1 (params null)
+ *       subjectPublicKey     BIT STRING }          1 + 3 + (1 + below)
+ *  RSAPublicKey ::= SEQUENCE {                     1 + 3
+ *      modulus           INTEGER,  -- n            1 + 3 + MPI_MAX + 1
+ *      publicExponent    INTEGER   -- e            1 + 3 + MPI_MAX + 1
+ *  }
+ */
+#define RSA_PUB_DER_MAX_BYTES   38 + 2 * MBEDTLS_MPI_MAX_SIZE
+
+/*
+ * RSA private keys:
+ *  RSAPrivateKey ::= SEQUENCE {                    1 + 3
+ *      version           Version,                  1 + 1 + 1
+ *      modulus           INTEGER,                  1 + 3 + MPI_MAX + 1
+ *      publicExponent    INTEGER,                  1 + 3 + MPI_MAX + 1
+ *      privateExponent   INTEGER,                  1 + 3 + MPI_MAX + 1
+ *      prime1            INTEGER,                  1 + 3 + MPI_MAX / 2 + 1
+ *      prime2            INTEGER,                  1 + 3 + MPI_MAX / 2 + 1
+ *      exponent1         INTEGER,                  1 + 3 + MPI_MAX / 2 + 1
+ *      exponent2         INTEGER,                  1 + 3 + MPI_MAX / 2 + 1
+ *      coefficient       INTEGER,                  1 + 3 + MPI_MAX / 2 + 1
+ *      otherPrimeInfos   OtherPrimeInfos OPTIONAL  0 (not supported)
+ *  }
+ */
+#define MPI_MAX_SIZE_2          MBEDTLS_MPI_MAX_SIZE / 2 + \
+                                MBEDTLS_MPI_MAX_SIZE % 2
+#define RSA_PRV_DER_MAX_BYTES   47 + 3 * MBEDTLS_MPI_MAX_SIZE \
+                                   + 5 * MPI_MAX_SIZE_2
+
+#else /* MBEDTLS_RSA_C */
+
+#define RSA_PUB_DER_MAX_BYTES   0
+#define RSA_PRV_DER_MAX_BYTES   0
+
+#endif /* MBEDTLS_RSA_C */
+
+#if defined(MBEDTLS_ECP_C)
+/*
+ * EC public keys:
+ *  SubjectPublicKeyInfo  ::=  SEQUENCE  {      1 + 2
+ *    algorithm         AlgorithmIdentifier,    1 + 1 (sequence)
+ *                                            + 1 + 1 + 7 (ec oid)
+ *                                            + 1 + 1 + 9 (namedCurve oid)
+ *    subjectPublicKey  BIT STRING              1 + 2 + 1               [1]
+ *                                            + 1 (point format)        [1]
+ *                                            + 2 * ECP_MAX (coords)    [1]
+ *  }
+ */
+#define ECP_PUB_DER_MAX_BYTES   30 + 2 * MBEDTLS_ECP_MAX_BYTES
+
+/*
+ * EC private keys:
+ * ECPrivateKey ::= SEQUENCE {                  1 + 2
+ *      version        INTEGER ,                1 + 1 + 1
+ *      privateKey     OCTET STRING,            1 + 1 + ECP_MAX
+ *      parameters [0] ECParameters OPTIONAL,   1 + 1 + (1 + 1 + 9)
+ *      publicKey  [1] BIT STRING OPTIONAL      1 + 2 + [1] above
+ *    }
+ */
+#define ECP_PRV_DER_MAX_BYTES   29 + 3 * MBEDTLS_ECP_MAX_BYTES
+
+#else /* MBEDTLS_ECP_C */
+
+#define ECP_PUB_DER_MAX_BYTES   0
+#define ECP_PRV_DER_MAX_BYTES   0
+
+#endif /* MBEDTLS_ECP_C */
+
+#define PUB_DER_MAX_BYTES   RSA_PUB_DER_MAX_BYTES > ECP_PUB_DER_MAX_BYTES ? \
+                            RSA_PUB_DER_MAX_BYTES : ECP_PUB_DER_MAX_BYTES
+#define PRV_DER_MAX_BYTES   RSA_PRV_DER_MAX_BYTES > ECP_PRV_DER_MAX_BYTES ? \
+                            RSA_PRV_DER_MAX_BYTES : ECP_PRV_DER_MAX_BYTES
+
+int mbedtls_pk_write_pubkey_pem( mbedtls_pk_context *key, unsigned char *buf, size_t size )
+{
+    int ret;
+    unsigned char output_buf[PUB_DER_MAX_BYTES];
+    size_t olen = 0;
+
+    if( ( ret = mbedtls_pk_write_pubkey_der( key, output_buf,
+                                     sizeof(output_buf) ) ) < 0 )
+    {
+        return( ret );
+    }
+
+    if( ( ret = mbedtls_pem_write_buffer( PEM_BEGIN_PUBLIC_KEY, PEM_END_PUBLIC_KEY,
+                                  output_buf + sizeof(output_buf) - ret,
+                                  ret, buf, size, &olen ) ) != 0 )
+    {
+        return( ret );
+    }
+
+    return( 0 );
+}
+
+int mbedtls_pk_write_key_pem( mbedtls_pk_context *key, unsigned char *buf, size_t size )
+{
+    int ret;
+    unsigned char output_buf[PRV_DER_MAX_BYTES];
+    const char *begin, *end;
+    size_t olen = 0;
+
+    if( ( ret = mbedtls_pk_write_key_der( key, output_buf, sizeof(output_buf) ) ) < 0 )
+        return( ret );
+
+#if defined(MBEDTLS_RSA_C)
+    if( mbedtls_pk_get_type( key ) == MBEDTLS_PK_RSA )
+    {
+        begin = PEM_BEGIN_PRIVATE_KEY_RSA;
+        end = PEM_END_PRIVATE_KEY_RSA;
+    }
+    else
+#endif
+#if defined(MBEDTLS_ECP_C)
+    if( mbedtls_pk_get_type( key ) == MBEDTLS_PK_ECKEY )
+    {
+        begin = PEM_BEGIN_PRIVATE_KEY_EC;
+        end = PEM_END_PRIVATE_KEY_EC;
+    }
+    else
+#endif
+        return( MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE );
+
+    if( ( ret = mbedtls_pem_write_buffer( begin, end,
+                                  output_buf + sizeof(output_buf) - ret,
+                                  ret, buf, size, &olen ) ) != 0 )
+    {
+        return( ret );
+    }
+
+    return( 0 );
+}
+#endif /* MBEDTLS_PEM_WRITE_C */
+
+#endif /* MBEDTLS_PK_WRITE_C */

From 7b64e8d38f08e427c13abcbd05cedc4238f200fc Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 13 Nov 2018 19:06:30 +0200
Subject: [PATCH 0160/1938] small fix

---
 client/cmdhffido.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index 9a01705fc..ab42abc95 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -207,7 +207,7 @@ int CmdHFFidoRegister(const char *cmd) {
 	void* argtable[] = {
 		arg_param_begin,
 		arg_lit0("aA",  "apdu",     "show APDU reqests and responses"),
-		arg_lit0("vV",  "verbose",  "show technical data. vv - show full certificates data"),
+		arg_litn("vV",  "verbose",  0, 2, "show technical data. vv - show full certificates data"),
 		arg_lit0("pP",  "plain",    "send plain ASCII to challenge and application parameters instead of HEX"),
 		arg_str0("jJ",  "json",		"fido.json", "JSON input / output file name for parameters."),
 		arg_str0(NULL,  NULL,       "<HEX/ASCII challenge parameter (32b HEX/1..16 chars)>", NULL),

From 1b4e26fc9c0e85f875d2408834011acceedbcb19 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 13 Nov 2018 19:22:10 +0200
Subject: [PATCH 0161/1938] checking certificate works + some changes in print
 messages

---
 client/cmdhffido.c          | 26 ++++++++++++++++--------
 client/fido/additional_ca.c | 40 ++++++++++++++++++-------------------
 2 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index ab42abc95..ffd277bd2 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -327,10 +327,12 @@ int CmdHFFidoRegister(const char *cmd) {
 	int derp = 67 + keyHandleLen;
 	int derLen = (buf[derp + 2] << 8) + buf[derp + 3] + 4;
 	if (verbose2) {
-		PrintAndLog("DER certificate[%d]:------------------DER-------------------", derLen);
+		PrintAndLog("DER certificate[%d]:\n------------------DER-------------------", derLen);
 		dump_buffer_simple((const unsigned char *)&buf[67 + keyHandleLen], derLen, NULL);
 		PrintAndLog("\n----------------DER---------------------");
 	} else {
+		if (verbose)
+			PrintAndLog("------------------DER-------------------");
 		PrintAndLog("DER certificate[%d]: %s...", derLen, sprint_hex(&buf[derp], 20));
 	}
 	
@@ -359,20 +361,25 @@ int CmdHFFidoRegister(const char *cmd) {
 	
 	// get certificate info
 	char linfo[300] = {0};
-	mbedtls_x509_crt_info(linfo, sizeof(linfo), "  ", &cert);
-	PrintAndLog("DER certificate info:\n%s", linfo);
+	if (verbose) {
+		mbedtls_x509_crt_info(linfo, sizeof(linfo), "  ", &cert);
+		PrintAndLog("DER certificate info:\n%s", linfo);
+	}
 	
 	// verify certificate
 	uint32_t verifyflags = 0;
-	memset(linfo, 0x00, sizeof(linfo));
-
 	res = mbedtls_x509_crt_verify(&cert, &cacert, NULL, NULL, &verifyflags, NULL, NULL);
 	if (res) {
 		PrintAndLog("ERROR: DER verify returned 0x%x - %s", (res<0)?-res:res, ecdsa_get_error(res));
+	} else {
+		PrintAndLog("Certificate OK.");
 	}
 	
-	mbedtls_x509_crt_verify_info(linfo, sizeof(linfo), "  ", verifyflags);
-	PrintAndLog("Verification info:\n%s", linfo);
+	if (verbose) {
+		memset(linfo, 0x00, sizeof(linfo));
+		mbedtls_x509_crt_verify_info(linfo, sizeof(linfo), "  ", verifyflags);
+		PrintAndLog("Verification info:\n%s", linfo);
+	}
 	
 	// get public key
 	res = ecdsa_public_key_from_pk(&cert.pk, public_key, sizeof(public_key));
@@ -380,9 +387,12 @@ int CmdHFFidoRegister(const char *cmd) {
 		PrintAndLog("ERROR: getting public key from certificate 0x%x - %s", (res<0)?-res:res, ecdsa_get_error(res));
 	} else {
 		if (verbose)
-			PrintAndLog("Got a public key from certificate.");
+			PrintAndLog("Got a public key from certificate:\n%s", sprint_hex_inrow(public_key, 65));
 	}
 
+	if (verbose)
+		PrintAndLog("------------------DER-------------------");
+
 	mbedtls_x509_crt_free(&cert);
 	mbedtls_x509_crt_free(&cacert);
 	
diff --git a/client/fido/additional_ca.c b/client/fido/additional_ca.c
index aeb90aa40..f529e99b5 100644
--- a/client/fido/additional_ca.c
+++ b/client/fido/additional_ca.c
@@ -38,26 +38,26 @@
 // Name: Yubico U2F Root CA Serial 457200631
 // Issued: 2014-08-01
 #define YUBICO_CA	\
-"-----BEGIN CERTIFICATE-----" \
-"MIIDHjCCAgagAwIBAgIEG0BT9zANBgkqhkiG9w0BAQsFADAuMSwwKgYDVQQDEyNZ" \
-"dWJpY28gVTJGIFJvb3QgQ0EgU2VyaWFsIDQ1NzIwMDYzMTAgFw0xNDA4MDEwMDAw" \
-"MDBaGA8yMDUwMDkwNDAwMDAwMFowLjEsMCoGA1UEAxMjWXViaWNvIFUyRiBSb290" \
-"IENBIFNlcmlhbCA0NTcyMDA2MzEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK" \
-"AoIBAQC/jwYuhBVlqaiYWEMsrWFisgJ+PtM91eSrpI4TK7U53mwCIawSDHy8vUmk" \
-"5N2KAj9abvT9NP5SMS1hQi3usxoYGonXQgfO6ZXyUA9a+KAkqdFnBnlyugSeCOep" \
-"8EdZFfsaRFtMjkwz5Gcz2Py4vIYvCdMHPtwaz0bVuzneueIEz6TnQjE63Rdt2zbw" \
-"nebwTG5ZybeWSwbzy+BJ34ZHcUhPAY89yJQXuE0IzMZFcEBbPNRbWECRKgjq//qT" \
-"9nmDOFVlSRCt2wiqPSzluwn+v+suQEBsUjTGMEd25tKXXTkNW21wIWbxeSyUoTXw" \
-"LvGS6xlwQSgNpk2qXYwf8iXg7VWZAgMBAAGjQjBAMB0GA1UdDgQWBBQgIvz0bNGJ" \
-"hjgpToksyKpP9xv9oDAPBgNVHRMECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAN" \
-"BgkqhkiG9w0BAQsFAAOCAQEAjvjuOMDSa+JXFCLyBKsycXtBVZsJ4Ue3LbaEsPY4" \
-"MYN/hIQ5ZM5p7EjfcnMG4CtYkNsfNHc0AhBLdq45rnT87q/6O3vUEtNMafbhU6kt" \
-"hX7Y+9XFN9NpmYxr+ekVY5xOxi8h9JDIgoMP4VB1uS0aunL1IGqrNooL9mmFnL2k" \
-"LVVee6/VR6C5+KSTCMCWppMuJIZII2v9o4dkoZ8Y7QRjQlLfYzd3qGtKbw7xaF1U" \
-"sG/5xUb/Btwb2X2g4InpiB/yt/3CpQXpiWX/K4mBvUKiGn05ZsqeY1gx4g0xLBqc" \
-"U9psmyPzK+Vsgw2jeRQ5JlKDyqE0hebfC1tvFu0CCrJFcw==" \
-"-----END CERTIFICATE-----"
+"-----BEGIN CERTIFICATE-----\r\n" \
+"MIIDHjCCAgagAwIBAgIEG0BT9zANBgkqhkiG9w0BAQsFADAuMSwwKgYDVQQDEyNZ\r\n" \
+"dWJpY28gVTJGIFJvb3QgQ0EgU2VyaWFsIDQ1NzIwMDYzMTAgFw0xNDA4MDEwMDAw\r\n" \
+"MDBaGA8yMDUwMDkwNDAwMDAwMFowLjEsMCoGA1UEAxMjWXViaWNvIFUyRiBSb290\r\n" \
+"IENBIFNlcmlhbCA0NTcyMDA2MzEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK\r\n" \
+"AoIBAQC/jwYuhBVlqaiYWEMsrWFisgJ+PtM91eSrpI4TK7U53mwCIawSDHy8vUmk\r\n" \
+"5N2KAj9abvT9NP5SMS1hQi3usxoYGonXQgfO6ZXyUA9a+KAkqdFnBnlyugSeCOep\r\n" \
+"8EdZFfsaRFtMjkwz5Gcz2Py4vIYvCdMHPtwaz0bVuzneueIEz6TnQjE63Rdt2zbw\r\n" \
+"nebwTG5ZybeWSwbzy+BJ34ZHcUhPAY89yJQXuE0IzMZFcEBbPNRbWECRKgjq//qT\r\n" \
+"9nmDOFVlSRCt2wiqPSzluwn+v+suQEBsUjTGMEd25tKXXTkNW21wIWbxeSyUoTXw\r\n" \
+"LvGS6xlwQSgNpk2qXYwf8iXg7VWZAgMBAAGjQjBAMB0GA1UdDgQWBBQgIvz0bNGJ\r\n" \
+"hjgpToksyKpP9xv9oDAPBgNVHRMECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAN\r\n" \
+"BgkqhkiG9w0BAQsFAAOCAQEAjvjuOMDSa+JXFCLyBKsycXtBVZsJ4Ue3LbaEsPY4\r\n" \
+"MYN/hIQ5ZM5p7EjfcnMG4CtYkNsfNHc0AhBLdq45rnT87q/6O3vUEtNMafbhU6kt\r\n" \
+"hX7Y+9XFN9NpmYxr+ekVY5xOxi8h9JDIgoMP4VB1uS0aunL1IGqrNooL9mmFnL2k\r\n" \
+"LVVee6/VR6C5+KSTCMCWppMuJIZII2v9o4dkoZ8Y7QRjQlLfYzd3qGtKbw7xaF1U\r\n" \
+"sG/5xUb/Btwb2X2g4InpiB/yt/3CpQXpiWX/K4mBvUKiGn05ZsqeY1gx4g0xLBqc\r\n" \
+"U9psmyPzK+Vsgw2jeRQ5JlKDyqE0hebfC1tvFu0CCrJFcw==\r\n" \
+"-----END CERTIFICATE-----\r\n"
 
 /* Concatenation of all additional CA certificates in PEM format if available */
-const char   additional_ca_pem[] = YUBICO_CA; ///GLOBALSIGN_CA
+const char   additional_ca_pem[] = GLOBALSIGN_CA YUBICO_CA;
 const size_t additional_ca_pem_len = sizeof(additional_ca_pem);

From 9b2c457b040f6bec579648deda806adf833ed40e Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 13 Nov 2018 19:25:50 +0200
Subject: [PATCH 0162/1938] add changelog

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ac0e7328..a57924d70 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -80,6 +80,9 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
  - Added 'hf emv' commands  (@merlokk)
  - lots of bug fixes (many many)
  - Changed hf mfp security. Now it works in all the modes. (drHatson)
+ - Added `hf fido` commands that work with FIDO U2F authenticators (@merlokk)
+ - Added mbedtls instead of old polarssl (@merlokk)
+ - Added jansson (@merlokk)
 ### Fixed
 - Changed driver file proxmark3.inf to support both old and new Product/Vendor IDs (piwi)
 - Changed start sequence in Qt mode (fix: short commands hangs main Qt thread) (Merlok)

From 73230c8d15ada353f6d0bc8cfcf69fde7af6b057 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Tue, 13 Nov 2018 22:29:33 +0100
Subject: [PATCH 0163/1938] chg: 'trace list 7816' - missing command chg: 'sc
 raw' - inverted select logic

---
 client/cmdhflist.c    | 1 +
 client/cmdsmartcard.c | 4 ++--
 include/mifare.h      | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/client/cmdhflist.c b/client/cmdhflist.c
index 2deab204c..14dcc6039 100644
--- a/client/cmdhflist.c
+++ b/client/cmdhflist.c
@@ -356,6 +356,7 @@ void annotateIso7816(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
 			case ISO7816_EXTERNAL_AUTHENTICATION 	:snprintf(exp, size, "EXTERNAL AUTH");break;
 			case ISO7816_GET_CHALLENGE				:snprintf(exp, size, "GET CHALLENGE");break;
 			case ISO7816_MANAGE_CHANNEL				:snprintf(exp, size, "MANAGE CHANNEL");break;
+			case ISO7816_GETSTATUS					:snprintf(exp, size, "GET RESPONSE");break;
 			default									:snprintf(exp,size,"?"); break;
 		}
 	}
diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index a7b45c51d..c9997f241 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -200,8 +200,8 @@ int CmdSmartRaw(const char *Cmd) {
 	
 	if (active || active_select) {
         c.arg[0] |= SC_CONNECT;
-        if (active)
-            c.arg[0] |= SC_NO_SELECT;
+        if (active_select)
+            c.arg[0] |= SC_SELECT;
     }
 
 	if (hexlen > 0) {
diff --git a/include/mifare.h b/include/mifare.h
index 2ab7e3741..63cdf0fb6 100644
--- a/include/mifare.h
+++ b/include/mifare.h
@@ -109,7 +109,7 @@ typedef enum SMARTCARD_COMMAND {
 	SC_CONNECT = 			(1 << 0),
 	SC_NO_DISCONNECT =		(1 << 1),
 	SC_RAW =				(1 << 2),
-	SC_NO_SELECT =			(1 << 3)
+	SC_SELECT =				(1 << 3)
 } smartcard_command_t;
 
 //-----------------------------------------------------------------------------

From bac3ad077e9afcef280f5949563f1e0eca832565 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Wed, 14 Nov 2018 09:05:08 +0100
Subject: [PATCH 0164/1938] FIX: 'standalone mode colinrun' - buffer overrun
 (thanks @angelsl)

https://github.com/angelsl/proxmark3/commit/1aa974fc705fa98023b5ede677cf6a3e67cdaf4d
---
 armsrc/Standalone/hf_colin.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/armsrc/Standalone/hf_colin.c b/armsrc/Standalone/hf_colin.c
index c91c05766..31519080a 100644
--- a/armsrc/Standalone/hf_colin.c
+++ b/armsrc/Standalone/hf_colin.c
@@ -469,8 +469,8 @@ failtag:
             else
             {
                 /*  BRACE YOURSELF : AS LONG AS WE TRAP A KNOWN KEY, WE STOP CHECKING AND ENFORCE KNOWN SCHEMES */
-                // uint8_t tosendkey[12];
-                char tosendkey[12];
+                // uint8_t tosendkey[13];
+                char tosendkey[13];
                 num_to_bytes(key64, 6, foundKey[type][sec]);
                 cjSetCursRight();
                 DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %012" PRIx64 " ; TYP: %i", sec, key64, type);

From b9974e1224076ef0f22ca0e8472b0cd36703d353 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 14 Nov 2018 11:24:21 +0200
Subject: [PATCH 0165/1938] mfu

---
 client/cmdhfmfu.c | 10 +++++-----
 client/cmdhfmfu.h |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index 7c8ce064a..f1d0d3979 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -2441,10 +2441,10 @@ int CmdHF14AMfuGenDiverseKeys(const char *Cmd){
 	mix[6] = block ^ uid[2];
 	mix[7] = uid[3];
 	
-	des3_context ctx = { 0x00 };
-	des3_set2key_enc(&ctx, masterkey);
+	mbedtls_des3_context ctx = { 0x00 };
+	mbedtls_des3_set2key_enc(&ctx, masterkey);
 
-	des3_crypt_cbc(&ctx  // des3_context
+	mbedtls_des3_crypt_cbc(&ctx  // des3_context
 		, DES_ENCRYPT    // int mode
 		, sizeof(mix)    // length
 		, iv             // iv[8]
@@ -2478,9 +2478,9 @@ int CmdHF14AMfuGenDiverseKeys(const char *Cmd){
 	memcpy(dmkey+16, dkeyA, 8);
 	memset(iv, 0x00, 8);
 	
-	des3_set3key_enc(&ctx, dmkey);
+	mbedtls_des3_set3key_enc(&ctx, dmkey);
 
-	des3_crypt_cbc(&ctx  // des3_context
+	mbedtls_des3_crypt_cbc(&ctx  // des3_context
 		, DES_ENCRYPT    // int mode
 		, sizeof(newpwd) // length
 		, iv             // iv[8]
diff --git a/client/cmdhfmfu.h b/client/cmdhfmfu.h
index 2e07bae80..491218b1b 100644
--- a/client/cmdhfmfu.h
+++ b/client/cmdhfmfu.h
@@ -3,7 +3,7 @@
 
 #include <stdint.h>
 #include <stdio.h>
-#include "des.h"
+#include "mbedtls/des.h"
 #include "cmdhfmf.h"
 #include "cmdhf14a.h"
 #include "mifare.h"

From 586cbd2137e48b764f42483c31c5273d2315fdea Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 14 Nov 2018 11:33:45 +0200
Subject: [PATCH 0166/1938] hiclass

---
 client/cmdhficlass.c | 12 ++++++------
 client/cmdhficlass.h |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index 1f0204ba0..0c9d67d6e 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -766,8 +766,8 @@ int CmdHFiClassDecrypt(const char *Cmd) {
 			 hdr->csn[4],hdr->csn[5],hdr->csn[6],hdr->csn[7]);
 
 	// tripledes
-	des3_context ctx = { DES_DECRYPT ,{ 0 } };
-	des3_set2key_dec( &ctx, key);
+	mbedtls_des3_context ctx = { 0 };
+	mbedtls_des3_set2key_dec( &ctx, key);
 
 	uint8_t enc_dump[8] = {0};
 	uint8_t empty[8] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};
@@ -778,7 +778,7 @@ int CmdHFiClassDecrypt(const char *Cmd) {
 		
 		// block 7 or higher,  and not empty 0xFF
 		if(blocknum > 6 &&  memcmp(enc_dump, empty, 8) != 0 ) {
-			des3_crypt_ecb(&ctx, enc_dump, decrypted + idx );
+			mbedtls_des3_crypt_ecb(&ctx, enc_dump, decrypted + idx );
 		}
 	}
 	
@@ -797,10 +797,10 @@ static int iClassEncryptBlkData(uint8_t *blkData) {
 	PrintAndLogEx(SUCCESS, "decryption file found");
 	uint8_t encryptedData[16];
 	uint8_t *encrypted = encryptedData;
-	des3_context ctx = { DES_DECRYPT ,{ 0 } };
-	des3_set2key_enc( &ctx, key);
+	mbedtls_des3_context ctx = { 0 };
+	mbedtls_des3_set2key_enc( &ctx, key);
 	
-	des3_crypt_ecb(&ctx, blkData,encrypted);
+	mbedtls_des3_crypt_ecb(&ctx, blkData,encrypted);
 	memcpy(blkData,encrypted,8);
 	return 1;
 }
diff --git a/client/cmdhficlass.h b/client/cmdhficlass.h
index c53e88f49..f9353ed1f 100644
--- a/client/cmdhficlass.h
+++ b/client/cmdhficlass.h
@@ -22,7 +22,7 @@
 #include "common.h"
 #include "util.h"
 #include "comms.h"
-#include "des.h"
+#include "mbedtls/des.h"
 #include "loclass/cipherutils.h"
 #include "loclass/cipher.h"
 #include "loclass/ikeys.h"

From 0ef9b609dc82b33b80b044aa77718679d3543124 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 14 Nov 2018 11:33:59 +0200
Subject: [PATCH 0167/1938] mfu

---
 client/cmdhfmfu.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index f1d0d3979..72c4be573 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -2445,7 +2445,7 @@ int CmdHF14AMfuGenDiverseKeys(const char *Cmd){
 	mbedtls_des3_set2key_enc(&ctx, masterkey);
 
 	mbedtls_des3_crypt_cbc(&ctx  // des3_context
-		, DES_ENCRYPT    // int mode
+		, MBEDTLS_DES_ENCRYPT    // int mode
 		, sizeof(mix)    // length
 		, iv             // iv[8]
 		, mix            // input
@@ -2481,7 +2481,7 @@ int CmdHF14AMfuGenDiverseKeys(const char *Cmd){
 	mbedtls_des3_set3key_enc(&ctx, dmkey);
 
 	mbedtls_des3_crypt_cbc(&ctx  // des3_context
-		, DES_ENCRYPT    // int mode
+		, MBEDTLS_DES_ENCRYPT    // int mode
 		, sizeof(newpwd) // length
 		, iv             // iv[8]
 		, zeros         // input

From 82b6a2cd5b34c29be8204c47943d97fec973527f Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 14 Nov 2018 11:34:20 +0200
Subject: [PATCH 0168/1938] ikeys

---
 client/loclass/ikeys.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/client/loclass/ikeys.c b/client/loclass/ikeys.c
index 6436a4e2d..6a68d80b1 100644
--- a/client/loclass/ikeys.c
+++ b/client/loclass/ikeys.c
@@ -65,12 +65,12 @@ From "Dismantling iclass":
 #include <inttypes.h>
 #include "fileutils.h"
 #include "cipherutils.h"
-#include "des.h"
+#include "mbedtls/des.h"
 
 uint8_t pi[35] = {0x0F,0x17,0x1B,0x1D,0x1E,0x27,0x2B,0x2D,0x2E,0x33,0x35,0x39,0x36,0x3A,0x3C,0x47,0x4B,0x4D,0x4E,0x53,0x55,0x56,0x59,0x5A,0x5C,0x63,0x65,0x66,0x69,0x6A,0x6C,0x71,0x72,0x74,0x78};
 
-static des_context ctx_enc = {DES_ENCRYPT,{0}};
-static des_context ctx_dec = {DES_DECRYPT,{0}};
+static mbedtls_des_context ctx_enc = {0};
+static mbedtls_des_context ctx_dec = {0};
 
 static int debug_print = 0;
 
@@ -370,12 +370,12 @@ void hash0(uint64_t c, uint8_t k[8])
 void diversifyKey(uint8_t csn[8], uint8_t key[8], uint8_t div_key[8])
 {
 	// Prepare the DES key
-	des_setkey_enc( &ctx_enc, key);
+	mbedtls_des_setkey_enc( &ctx_enc, key);
 
 	uint8_t crypted_csn[8] = {0};
 
 	// Calculate DES(CSN, KEY)
-	des_crypt_ecb(&ctx_enc,csn, crypted_csn);
+	mbedtls_des_crypt_ecb(&ctx_enc,csn, crypted_csn);
 
 	//Calculate HASH0(DES))
     uint64_t crypt_csn = x_bytes_to_num(crypted_csn, 8);
@@ -437,13 +437,13 @@ typedef struct
 	uint8_t div_key[8];
 } Testcase;
 
-int testDES(Testcase testcase, des_context ctx_enc, des_context ctx_dec)
+int testDES(Testcase testcase, mbedtls_des_context ctx_enc, mbedtls_des_context ctx_dec)
 {
 	uint8_t des_encrypted_csn[8] = {0};
 	uint8_t decrypted[8] = {0};
 	uint8_t div_key[8] = {0};
-	int retval = des_crypt_ecb(&ctx_enc,testcase.uid,des_encrypted_csn);
-	retval |= des_crypt_ecb(&ctx_dec,des_encrypted_csn,decrypted);
+	int retval = mbedtls_des_crypt_ecb(&ctx_enc,testcase.uid,des_encrypted_csn);
+	retval |= mbedtls_des_crypt_ecb(&ctx_dec,des_encrypted_csn,decrypted);
 
 	if(memcmp(testcase.uid,decrypted,8) != 0)
 	{
@@ -629,7 +629,7 @@ int testDES2(uint64_t csn, uint64_t expected) {
 	print64bits("   csn ", csn);
     x_num_to_bytes(csn, 8,input);
 
-	des_crypt_ecb(&ctx_enc,input, result);
+	mbedtls_des_crypt_ecb(&ctx_enc,input, result);
 
     uint64_t crypt_csn = x_bytes_to_num(result, 8);
 	print64bits("   {csn}    ", crypt_csn );
@@ -654,7 +654,7 @@ int doTestsWithKnownInputs() {
 	PrintAndLogDevice(SUCCESS, "Testing DES encryption");
 	uint8_t key[8] = {0x6c,0x8d,0x44,0xf9,0x2a,0x2d,0x01,0xbf};
 
-	des_setkey_enc( &ctx_enc, key);
+	mbedtls_des_setkey_enc( &ctx_enc, key);
 	testDES2(0xbbbbaaaabbbbeeee,0xd6ad3ca619659e6b);
 
 	PrintAndLogDevice(SUCCESS, "Testing hashing algorithm");
@@ -712,8 +712,8 @@ int doKeyTests(uint8_t debuglevel) {
 			PrintAndLogDevice(SUCCESS, "Key present");
 			PrintAndLogDevice(SUCCESS, "Checking key parity...");
 			des_checkParity(key);
-			des_setkey_enc( &ctx_enc, key);
-			des_setkey_dec( &ctx_dec, key);
+			mbedtls_des_setkey_enc( &ctx_enc, key);
+			mbedtls_des_setkey_dec( &ctx_dec, key);
 			// Test hashing functions
 			PrintAndLogDevice(SUCCESS, "The following tests require the correct 8-byte master key");
 			testKeyDiversificationWithMasterkeyTestcases();

From 500645badffff387118ae091818641c46fc922de Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 14 Nov 2018 11:41:03 +0200
Subject: [PATCH 0169/1938] elite_crack

---
 client/loclass/elite_crack.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/client/loclass/elite_crack.c b/client/loclass/elite_crack.c
index e24a9765e..068fdf59f 100644
--- a/client/loclass/elite_crack.c
+++ b/client/loclass/elite_crack.c
@@ -45,7 +45,7 @@
 #include "ikeys.h"
 #include "elite_crack.h"
 #include "fileutils.h"
-#include "des.h"
+#include "mbedtls/des.h"
 #include "util_posix.h"
 
 /**
@@ -172,21 +172,21 @@ void rk(uint8_t *key, uint8_t n, uint8_t *outp_key) {
     return;
 }
 
-static des_context ctx_enc = {DES_ENCRYPT,{0}};
-static des_context ctx_dec = {DES_DECRYPT,{0}};
+static mbedtls_des_context ctx_enc = {0};
+static mbedtls_des_context ctx_dec = {0};
 
 void desdecrypt_iclass(uint8_t *iclass_key, uint8_t *input, uint8_t *output) {
     uint8_t key_std_format[8] = {0};
     permutekey_rev(iclass_key, key_std_format);
-    des_setkey_dec( &ctx_dec, key_std_format);
-    des_crypt_ecb(&ctx_dec,input,output);
+    mbedtls_des_setkey_dec( &ctx_dec, key_std_format);
+    mbedtls_des_crypt_ecb(&ctx_dec,input,output);
 }
 
 void desencrypt_iclass(uint8_t *iclass_key, uint8_t *input, uint8_t *output) {
     uint8_t key_std_format[8] = {0};
     permutekey_rev(iclass_key, key_std_format);
-    des_setkey_enc( &ctx_enc, key_std_format);
-    des_crypt_ecb(&ctx_enc,input,output);
+    mbedtls_des_setkey_enc( &ctx_enc, key_std_format);
+    mbedtls_des_crypt_ecb(&ctx_enc,input,output);
 }
 
 /**
@@ -431,7 +431,7 @@ int bruteforceItem(dumpdata item, uint16_t keytable[]) {
  * @return 0 for ok, 1 for failz
  */
 int calculateMasterKey(uint8_t first16bytes[], uint64_t master_key[] ){
-	des_context ctx_e = {DES_ENCRYPT,{0}};
+	mbedtls_des_context ctx_e = {0};
 
 	uint8_t z_0[8] = {0};
 	uint8_t y_0[8] = {0};
@@ -450,8 +450,8 @@ int calculateMasterKey(uint8_t first16bytes[], uint64_t master_key[] ){
 	permutekey_rev(z_0, z_0_rev);
 
 	// ~K_cus = DESenc(z[0], y[0])
-	des_setkey_enc( &ctx_e, z_0_rev );
-	des_crypt_ecb(&ctx_e, y_0, key64_negated);
+	mbedtls_des_setkey_enc( &ctx_e, z_0_rev );
+	mbedtls_des_crypt_ecb(&ctx_e, y_0, key64_negated);
 
 	int i;
 	for (i = 0; i < 8 ; i++)
@@ -462,8 +462,8 @@ int calculateMasterKey(uint8_t first16bytes[], uint64_t master_key[] ){
 	uint8_t key64_stdformat[8] = {0};
 	permutekey_rev(key64, key64_stdformat);
 
-	des_setkey_enc( &ctx_e, key64_stdformat );
-	des_crypt_ecb(&ctx_e, key64_negated, result);
+	mbedtls_des_setkey_enc( &ctx_e, key64_stdformat );
+	mbedtls_des_crypt_ecb(&ctx_e, key64_negated, result);
 	PrintAndLogDevice(NORMAL, "\n"); PrintAndLogDevice(SUCCESS, "-- High security custom key (Kcus) --");
 	printvar("[+] Standard format   ", key64_stdformat, 8);
 	printvar("[+] iClass format     ", key64, 8);

From 84efb3256be42f5d6a73a03bd420a0a48f397452 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 14 Nov 2018 11:41:18 +0200
Subject: [PATCH 0170/1938] makefile

---
 client/Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/Makefile b/client/Makefile
index 60217101a..85f1648f1 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -108,7 +108,6 @@ CMDSRCS =	crapto1/crapto1.c \
 			mfkey.c \
 			tea.c \
 			fido/additional_ca.c \
-			polarssl/des.c \
 			crypto/libpcrypto.c\
 			crypto/asn1utils.c\
 			cliparser/argtable3.c\

From 65923701f30cdce8e97d0f843b6e270169971583 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 14 Nov 2018 11:44:33 +0200
Subject: [PATCH 0171/1938] delete old files

---
 client/obj/polarssl/.dummy        |    0
 common/polarssl/des.c             | 1014 --------------
 common/polarssl/des.h             |  281 ----
 common/polarssl/polarssl_config.h | 2179 -----------------------------
 4 files changed, 3474 deletions(-)
 delete mode 100644 client/obj/polarssl/.dummy
 delete mode 100644 common/polarssl/des.c
 delete mode 100644 common/polarssl/des.h
 delete mode 100644 common/polarssl/polarssl_config.h

diff --git a/client/obj/polarssl/.dummy b/client/obj/polarssl/.dummy
deleted file mode 100644
index e69de29bb..000000000
diff --git a/common/polarssl/des.c b/common/polarssl/des.c
deleted file mode 100644
index b33deb6c6..000000000
--- a/common/polarssl/des.c
+++ /dev/null
@@ -1,1014 +0,0 @@
-/*
- *  FIPS-46-3 compliant Triple-DES implementation
- *
- *  Copyright (C) 2006-2014, Brainspark B.V.
- *
- *  This file is part of PolarSSL (http://www.polarssl.org)
- *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
- *
- *  All rights reserved.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-/*
- *  DES, on which TDES is based, was originally designed by Horst Feistel
- *  at IBM in 1974, and was adopted as a standard by NIST (formerly NBS).
- *
- *  http://csrc.nist.gov/publications/fips/fips46-3/fips46-3.pdf
- */
-
-#include "polarssl_config.h"
-#define POLARSSL_DES_C
-
-#if defined(POLARSSL_DES_C)
-
-#include "des.h"
-
-#if defined(POLARSSL_PLATFORM_C)
-#include "polarssl/platform.h"
-#else
-#define polarssl_printf printf
-#endif
-
-#if !defined(POLARSSL_DES_ALT)
-
-/*
- * 32-bit integer manipulation macros (big endian)
- */
-#ifndef GET_UINT32_BE
-#define GET_UINT32_BE(n,b,i)                            \
-{                                                       \
-	(n) = ( (uint32_t) (b)[(i)    ] << 24 )             \
-		| ( (uint32_t) (b)[(i) + 1] << 16 )             \
-		| ( (uint32_t) (b)[(i) + 2] <<  8 )             \
-		| ( (uint32_t) (b)[(i) + 3]       );            \
-}
-#endif
-
-#ifndef PUT_UINT32_BE
-#define PUT_UINT32_BE(n,b,i)                            \
-{                                                       \
-	(b)[(i)    ] = (unsigned char) ( (n) >> 24 );       \
-	(b)[(i) + 1] = (unsigned char) ( (n) >> 16 );       \
-	(b)[(i) + 2] = (unsigned char) ( (n) >>  8 );       \
-	(b)[(i) + 3] = (unsigned char) ( (n)       );       \
-}
-#endif
-
-/*
- * Expanded DES S-boxes
- */
-static const uint32_t SB1[64] =
-{
-	0x01010400, 0x00000000, 0x00010000, 0x01010404,
-	0x01010004, 0x00010404, 0x00000004, 0x00010000,
-	0x00000400, 0x01010400, 0x01010404, 0x00000400,
-	0x01000404, 0x01010004, 0x01000000, 0x00000004,
-	0x00000404, 0x01000400, 0x01000400, 0x00010400,
-	0x00010400, 0x01010000, 0x01010000, 0x01000404,
-	0x00010004, 0x01000004, 0x01000004, 0x00010004,
-	0x00000000, 0x00000404, 0x00010404, 0x01000000,
-	0x00010000, 0x01010404, 0x00000004, 0x01010000,
-	0x01010400, 0x01000000, 0x01000000, 0x00000400,
-	0x01010004, 0x00010000, 0x00010400, 0x01000004,
-	0x00000400, 0x00000004, 0x01000404, 0x00010404,
-	0x01010404, 0x00010004, 0x01010000, 0x01000404,
-	0x01000004, 0x00000404, 0x00010404, 0x01010400,
-	0x00000404, 0x01000400, 0x01000400, 0x00000000,
-	0x00010004, 0x00010400, 0x00000000, 0x01010004
-};
-
-static const uint32_t SB2[64] =
-{
-	0x80108020, 0x80008000, 0x00008000, 0x00108020,
-	0x00100000, 0x00000020, 0x80100020, 0x80008020,
-	0x80000020, 0x80108020, 0x80108000, 0x80000000,
-	0x80008000, 0x00100000, 0x00000020, 0x80100020,
-	0x00108000, 0x00100020, 0x80008020, 0x00000000,
-	0x80000000, 0x00008000, 0x00108020, 0x80100000,
-	0x00100020, 0x80000020, 0x00000000, 0x00108000,
-	0x00008020, 0x80108000, 0x80100000, 0x00008020,
-	0x00000000, 0x00108020, 0x80100020, 0x00100000,
-	0x80008020, 0x80100000, 0x80108000, 0x00008000,
-	0x80100000, 0x80008000, 0x00000020, 0x80108020,
-	0x00108020, 0x00000020, 0x00008000, 0x80000000,
-	0x00008020, 0x80108000, 0x00100000, 0x80000020,
-	0x00100020, 0x80008020, 0x80000020, 0x00100020,
-	0x00108000, 0x00000000, 0x80008000, 0x00008020,
-	0x80000000, 0x80100020, 0x80108020, 0x00108000
-};
-
-static const uint32_t SB3[64] =
-{
-	0x00000208, 0x08020200, 0x00000000, 0x08020008,
-	0x08000200, 0x00000000, 0x00020208, 0x08000200,
-	0x00020008, 0x08000008, 0x08000008, 0x00020000,
-	0x08020208, 0x00020008, 0x08020000, 0x00000208,
-	0x08000000, 0x00000008, 0x08020200, 0x00000200,
-	0x00020200, 0x08020000, 0x08020008, 0x00020208,
-	0x08000208, 0x00020200, 0x00020000, 0x08000208,
-	0x00000008, 0x08020208, 0x00000200, 0x08000000,
-	0x08020200, 0x08000000, 0x00020008, 0x00000208,
-	0x00020000, 0x08020200, 0x08000200, 0x00000000,
-	0x00000200, 0x00020008, 0x08020208, 0x08000200,
-	0x08000008, 0x00000200, 0x00000000, 0x08020008,
-	0x08000208, 0x00020000, 0x08000000, 0x08020208,
-	0x00000008, 0x00020208, 0x00020200, 0x08000008,
-	0x08020000, 0x08000208, 0x00000208, 0x08020000,
-	0x00020208, 0x00000008, 0x08020008, 0x00020200
-};
-
-static const uint32_t SB4[64] =
-{
-	0x00802001, 0x00002081, 0x00002081, 0x00000080,
-	0x00802080, 0x00800081, 0x00800001, 0x00002001,
-	0x00000000, 0x00802000, 0x00802000, 0x00802081,
-	0x00000081, 0x00000000, 0x00800080, 0x00800001,
-	0x00000001, 0x00002000, 0x00800000, 0x00802001,
-	0x00000080, 0x00800000, 0x00002001, 0x00002080,
-	0x00800081, 0x00000001, 0x00002080, 0x00800080,
-	0x00002000, 0x00802080, 0x00802081, 0x00000081,
-	0x00800080, 0x00800001, 0x00802000, 0x00802081,
-	0x00000081, 0x00000000, 0x00000000, 0x00802000,
-	0x00002080, 0x00800080, 0x00800081, 0x00000001,
-	0x00802001, 0x00002081, 0x00002081, 0x00000080,
-	0x00802081, 0x00000081, 0x00000001, 0x00002000,
-	0x00800001, 0x00002001, 0x00802080, 0x00800081,
-	0x00002001, 0x00002080, 0x00800000, 0x00802001,
-	0x00000080, 0x00800000, 0x00002000, 0x00802080
-};
-
-static const uint32_t SB5[64] =
-{
-	0x00000100, 0x02080100, 0x02080000, 0x42000100,
-	0x00080000, 0x00000100, 0x40000000, 0x02080000,
-	0x40080100, 0x00080000, 0x02000100, 0x40080100,
-	0x42000100, 0x42080000, 0x00080100, 0x40000000,
-	0x02000000, 0x40080000, 0x40080000, 0x00000000,
-	0x40000100, 0x42080100, 0x42080100, 0x02000100,
-	0x42080000, 0x40000100, 0x00000000, 0x42000000,
-	0x02080100, 0x02000000, 0x42000000, 0x00080100,
-	0x00080000, 0x42000100, 0x00000100, 0x02000000,
-	0x40000000, 0x02080000, 0x42000100, 0x40080100,
-	0x02000100, 0x40000000, 0x42080000, 0x02080100,
-	0x40080100, 0x00000100, 0x02000000, 0x42080000,
-	0x42080100, 0x00080100, 0x42000000, 0x42080100,
-	0x02080000, 0x00000000, 0x40080000, 0x42000000,
-	0x00080100, 0x02000100, 0x40000100, 0x00080000,
-	0x00000000, 0x40080000, 0x02080100, 0x40000100
-};
-
-static const uint32_t SB6[64] =
-{
-	0x20000010, 0x20400000, 0x00004000, 0x20404010,
-	0x20400000, 0x00000010, 0x20404010, 0x00400000,
-	0x20004000, 0x00404010, 0x00400000, 0x20000010,
-	0x00400010, 0x20004000, 0x20000000, 0x00004010,
-	0x00000000, 0x00400010, 0x20004010, 0x00004000,
-	0x00404000, 0x20004010, 0x00000010, 0x20400010,
-	0x20400010, 0x00000000, 0x00404010, 0x20404000,
-	0x00004010, 0x00404000, 0x20404000, 0x20000000,
-	0x20004000, 0x00000010, 0x20400010, 0x00404000,
-	0x20404010, 0x00400000, 0x00004010, 0x20000010,
-	0x00400000, 0x20004000, 0x20000000, 0x00004010,
-	0x20000010, 0x20404010, 0x00404000, 0x20400000,
-	0x00404010, 0x20404000, 0x00000000, 0x20400010,
-	0x00000010, 0x00004000, 0x20400000, 0x00404010,
-	0x00004000, 0x00400010, 0x20004010, 0x00000000,
-	0x20404000, 0x20000000, 0x00400010, 0x20004010
-};
-
-static const uint32_t SB7[64] =
-{
-	0x00200000, 0x04200002, 0x04000802, 0x00000000,
-	0x00000800, 0x04000802, 0x00200802, 0x04200800,
-	0x04200802, 0x00200000, 0x00000000, 0x04000002,
-	0x00000002, 0x04000000, 0x04200002, 0x00000802,
-	0x04000800, 0x00200802, 0x00200002, 0x04000800,
-	0x04000002, 0x04200000, 0x04200800, 0x00200002,
-	0x04200000, 0x00000800, 0x00000802, 0x04200802,
-	0x00200800, 0x00000002, 0x04000000, 0x00200800,
-	0x04000000, 0x00200800, 0x00200000, 0x04000802,
-	0x04000802, 0x04200002, 0x04200002, 0x00000002,
-	0x00200002, 0x04000000, 0x04000800, 0x00200000,
-	0x04200800, 0x00000802, 0x00200802, 0x04200800,
-	0x00000802, 0x04000002, 0x04200802, 0x04200000,
-	0x00200800, 0x00000000, 0x00000002, 0x04200802,
-	0x00000000, 0x00200802, 0x04200000, 0x00000800,
-	0x04000002, 0x04000800, 0x00000800, 0x00200002
-};
-
-static const uint32_t SB8[64] =
-{
-	0x10001040, 0x00001000, 0x00040000, 0x10041040,
-	0x10000000, 0x10001040, 0x00000040, 0x10000000,
-	0x00040040, 0x10040000, 0x10041040, 0x00041000,
-	0x10041000, 0x00041040, 0x00001000, 0x00000040,
-	0x10040000, 0x10000040, 0x10001000, 0x00001040,
-	0x00041000, 0x00040040, 0x10040040, 0x10041000,
-	0x00001040, 0x00000000, 0x00000000, 0x10040040,
-	0x10000040, 0x10001000, 0x00041040, 0x00040000,
-	0x00041040, 0x00040000, 0x10041000, 0x00001000,
-	0x00000040, 0x10040040, 0x00001000, 0x00041040,
-	0x10001000, 0x00000040, 0x10000040, 0x10040000,
-	0x10040040, 0x10000000, 0x00040000, 0x10001040,
-	0x00000000, 0x10041040, 0x00040040, 0x10000040,
-	0x10040000, 0x10001000, 0x10001040, 0x00000000,
-	0x10041040, 0x00041000, 0x00041000, 0x00001040,
-	0x00001040, 0x00040040, 0x10000000, 0x10041000
-};
-
-/*
- * PC1: left and right halves bit-swap
- */
-static const uint32_t LHs[16] =
-{
-	0x00000000, 0x00000001, 0x00000100, 0x00000101,
-	0x00010000, 0x00010001, 0x00010100, 0x00010101,
-	0x01000000, 0x01000001, 0x01000100, 0x01000101,
-	0x01010000, 0x01010001, 0x01010100, 0x01010101
-};
-
-static const uint32_t RHs[16] =
-{
-	0x00000000, 0x01000000, 0x00010000, 0x01010000,
-	0x00000100, 0x01000100, 0x00010100, 0x01010100,
-	0x00000001, 0x01000001, 0x00010001, 0x01010001,
-	0x00000101, 0x01000101, 0x00010101, 0x01010101,
-};
-
-/*
- * Initial Permutation macro
- */
-#define DES_IP(X,Y)                                             \
-{                                                               \
-	T = ((X >>  4) ^ Y) & 0x0F0F0F0F; Y ^= T; X ^= (T <<  4);   \
-	T = ((X >> 16) ^ Y) & 0x0000FFFF; Y ^= T; X ^= (T << 16);   \
-	T = ((Y >>  2) ^ X) & 0x33333333; X ^= T; Y ^= (T <<  2);   \
-	T = ((Y >>  8) ^ X) & 0x00FF00FF; X ^= T; Y ^= (T <<  8);   \
-	Y = ((Y << 1) | (Y >> 31)) & 0xFFFFFFFF;                    \
-	T = (X ^ Y) & 0xAAAAAAAA; Y ^= T; X ^= T;                   \
-	X = ((X << 1) | (X >> 31)) & 0xFFFFFFFF;                    \
-}
-
-/*
- * Final Permutation macro
- */
-#define DES_FP(X,Y)                                             \
-{                                                               \
-	X = ((X << 31) | (X >> 1)) & 0xFFFFFFFF;                    \
-	T = (X ^ Y) & 0xAAAAAAAA; X ^= T; Y ^= T;                   \
-	Y = ((Y << 31) | (Y >> 1)) & 0xFFFFFFFF;                    \
-	T = ((Y >>  8) ^ X) & 0x00FF00FF; X ^= T; Y ^= (T <<  8);   \
-	T = ((Y >>  2) ^ X) & 0x33333333; X ^= T; Y ^= (T <<  2);   \
-	T = ((X >> 16) ^ Y) & 0x0000FFFF; Y ^= T; X ^= (T << 16);   \
-	T = ((X >>  4) ^ Y) & 0x0F0F0F0F; Y ^= T; X ^= (T <<  4);   \
-}
-
-/*
- * DES round macro
- */
-#define DES_ROUND(X,Y)                          \
-{                                               \
-	T = *SK++ ^ X;                              \
-	Y ^= SB8[ (T      ) & 0x3F ] ^              \
-		 SB6[ (T >>  8) & 0x3F ] ^              \
-		 SB4[ (T >> 16) & 0x3F ] ^              \
-		 SB2[ (T >> 24) & 0x3F ];               \
-												\
-	T = *SK++ ^ ((X << 28) | (X >> 4));         \
-	Y ^= SB7[ (T      ) & 0x3F ] ^              \
-		 SB5[ (T >>  8) & 0x3F ] ^              \
-		 SB3[ (T >> 16) & 0x3F ] ^              \
-		 SB1[ (T >> 24) & 0x3F ];               \
-}
-
-#define SWAP(a,b) { uint32_t t = a; a = b; b = t; t = 0; }
-
-static const unsigned char odd_parity_table[128] = { 1,  2,  4,  7,  8,
-		11, 13, 14, 16, 19, 21, 22, 25, 26, 28, 31, 32, 35, 37, 38, 41, 42, 44,
-		47, 49, 50, 52, 55, 56, 59, 61, 62, 64, 67, 69, 70, 73, 74, 76, 79, 81,
-		82, 84, 87, 88, 91, 93, 94, 97, 98, 100, 103, 104, 107, 109, 110, 112,
-		115, 117, 118, 121, 122, 124, 127, 128, 131, 133, 134, 137, 138, 140,
-		143, 145, 146, 148, 151, 152, 155, 157, 158, 161, 162, 164, 167, 168,
-		171, 173, 174, 176, 179, 181, 182, 185, 186, 188, 191, 193, 194, 196,
-		199, 200, 203, 205, 206, 208, 211, 213, 214, 217, 218, 220, 223, 224,
-		227, 229, 230, 233, 234, 236, 239, 241, 242, 244, 247, 248, 251, 253,
-		254 };
-
-void des_key_set_parity( unsigned char key[DES_KEY_SIZE] )
-{
-	int i;
-
-	for( i = 0; i < DES_KEY_SIZE; i++ )
-		key[i] = odd_parity_table[key[i] / 2];
-}
-
-/*
- * Check the given key's parity, returns 1 on failure, 0 on SUCCESS
- */
-int des_key_check_key_parity( const unsigned char key[DES_KEY_SIZE] )
-{
-	int i;
-
-	for( i = 0; i < DES_KEY_SIZE; i++ )
-		if ( key[i] != odd_parity_table[key[i] / 2] )
-			return( 1 );
-
-	return( 0 );
-}
-
-/*
- * Table of weak and semi-weak keys
- *
- * Source: http://en.wikipedia.org/wiki/Weak_key
- *
- * Weak:
- * Alternating ones + zeros (0x0101010101010101)
- * Alternating 'F' + 'E' (0xFEFEFEFEFEFEFEFE)
- * '0xE0E0E0E0F1F1F1F1'
- * '0x1F1F1F1F0E0E0E0E'
- *
- * Semi-weak:
- * 0x011F011F010E010E and 0x1F011F010E010E01
- * 0x01E001E001F101F1 and 0xE001E001F101F101
- * 0x01FE01FE01FE01FE and 0xFE01FE01FE01FE01
- * 0x1FE01FE00EF10EF1 and 0xE01FE01FF10EF10E
- * 0x1FFE1FFE0EFE0EFE and 0xFE1FFE1FFE0EFE0E
- * 0xE0FEE0FEF1FEF1FE and 0xFEE0FEE0FEF1FEF1
- *
- */
-
-#define WEAK_KEY_COUNT 16
-
-static const unsigned char weak_key_table[WEAK_KEY_COUNT][DES_KEY_SIZE] =
-{
-	{ 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 },
-	{ 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE },
-	{ 0x1F, 0x1F, 0x1F, 0x1F, 0x0E, 0x0E, 0x0E, 0x0E },
-	{ 0xE0, 0xE0, 0xE0, 0xE0, 0xF1, 0xF1, 0xF1, 0xF1 },
-
-	{ 0x01, 0x1F, 0x01, 0x1F, 0x01, 0x0E, 0x01, 0x0E },
-	{ 0x1F, 0x01, 0x1F, 0x01, 0x0E, 0x01, 0x0E, 0x01 },
-	{ 0x01, 0xE0, 0x01, 0xE0, 0x01, 0xF1, 0x01, 0xF1 },
-	{ 0xE0, 0x01, 0xE0, 0x01, 0xF1, 0x01, 0xF1, 0x01 },
-	{ 0x01, 0xFE, 0x01, 0xFE, 0x01, 0xFE, 0x01, 0xFE },
-	{ 0xFE, 0x01, 0xFE, 0x01, 0xFE, 0x01, 0xFE, 0x01 },
-	{ 0x1F, 0xE0, 0x1F, 0xE0, 0x0E, 0xF1, 0x0E, 0xF1 },
-	{ 0xE0, 0x1F, 0xE0, 0x1F, 0xF1, 0x0E, 0xF1, 0x0E },
-	{ 0x1F, 0xFE, 0x1F, 0xFE, 0x0E, 0xFE, 0x0E, 0xFE },
-	{ 0xFE, 0x1F, 0xFE, 0x1F, 0xFE, 0x0E, 0xFE, 0x0E },
-	{ 0xE0, 0xFE, 0xE0, 0xFE, 0xF1, 0xFE, 0xF1, 0xFE },
-	{ 0xFE, 0xE0, 0xFE, 0xE0, 0xFE, 0xF1, 0xFE, 0xF1 }
-};
-
-int des_key_check_weak( const unsigned char key[DES_KEY_SIZE] )
-{
-	int i;
-
-	for( i = 0; i < WEAK_KEY_COUNT; i++ )
-		if( memcmp( weak_key_table[i], key, DES_KEY_SIZE) == 0)
-			return( 1 );
-
-	return( 0 );
-}
-
-static void des_setkey( uint32_t SK[32], const unsigned char key[DES_KEY_SIZE] )
-{
-	int i;
-	uint32_t X, Y, T;
-
-	GET_UINT32_BE( X, key, 0 );
-	GET_UINT32_BE( Y, key, 4 );
-
-	/*
-	 * Permuted Choice 1
-	 */
-	T =  ((Y >>  4) ^ X) & 0x0F0F0F0F;  X ^= T; Y ^= (T <<  4);
-	T =  ((Y      ) ^ X) & 0x10101010;  X ^= T; Y ^= (T      );
-
-	X =   (LHs[ (X      ) & 0xF] << 3) | (LHs[ (X >>  8) & 0xF ] << 2)
-		| (LHs[ (X >> 16) & 0xF] << 1) | (LHs[ (X >> 24) & 0xF ]     )
-		| (LHs[ (X >>  5) & 0xF] << 7) | (LHs[ (X >> 13) & 0xF ] << 6)
-		| (LHs[ (X >> 21) & 0xF] << 5) | (LHs[ (X >> 29) & 0xF ] << 4);
-
-	Y =   (RHs[ (Y >>  1) & 0xF] << 3) | (RHs[ (Y >>  9) & 0xF ] << 2)
-		| (RHs[ (Y >> 17) & 0xF] << 1) | (RHs[ (Y >> 25) & 0xF ]     )
-		| (RHs[ (Y >>  4) & 0xF] << 7) | (RHs[ (Y >> 12) & 0xF ] << 6)
-		| (RHs[ (Y >> 20) & 0xF] << 5) | (RHs[ (Y >> 28) & 0xF ] << 4);
-
-	X &= 0x0FFFFFFF;
-	Y &= 0x0FFFFFFF;
-
-	/*
-	 * calculate subkeys
-	 */
-	for( i = 0; i < 16; i++ )
-	{
-		if( i < 2 || i == 8 || i == 15 )
-		{
-			X = ((X <<  1) | (X >> 27)) & 0x0FFFFFFF;
-			Y = ((Y <<  1) | (Y >> 27)) & 0x0FFFFFFF;
-		}
-		else
-		{
-			X = ((X <<  2) | (X >> 26)) & 0x0FFFFFFF;
-			Y = ((Y <<  2) | (Y >> 26)) & 0x0FFFFFFF;
-		}
-
-		*SK++ =   ((X <<  4) & 0x24000000) | ((X << 28) & 0x10000000)
-				| ((X << 14) & 0x08000000) | ((X << 18) & 0x02080000)
-				| ((X <<  6) & 0x01000000) | ((X <<  9) & 0x00200000)
-				| ((X >>  1) & 0x00100000) | ((X << 10) & 0x00040000)
-				| ((X <<  2) & 0x00020000) | ((X >> 10) & 0x00010000)
-				| ((Y >> 13) & 0x00002000) | ((Y >>  4) & 0x00001000)
-				| ((Y <<  6) & 0x00000800) | ((Y >>  1) & 0x00000400)
-				| ((Y >> 14) & 0x00000200) | ((Y      ) & 0x00000100)
-				| ((Y >>  5) & 0x00000020) | ((Y >> 10) & 0x00000010)
-				| ((Y >>  3) & 0x00000008) | ((Y >> 18) & 0x00000004)
-				| ((Y >> 26) & 0x00000002) | ((Y >> 24) & 0x00000001);
-
-		*SK++ =   ((X << 15) & 0x20000000) | ((X << 17) & 0x10000000)
-				| ((X << 10) & 0x08000000) | ((X << 22) & 0x04000000)
-				| ((X >>  2) & 0x02000000) | ((X <<  1) & 0x01000000)
-				| ((X << 16) & 0x00200000) | ((X << 11) & 0x00100000)
-				| ((X <<  3) & 0x00080000) | ((X >>  6) & 0x00040000)
-				| ((X << 15) & 0x00020000) | ((X >>  4) & 0x00010000)
-				| ((Y >>  2) & 0x00002000) | ((Y <<  8) & 0x00001000)
-				| ((Y >> 14) & 0x00000808) | ((Y >>  9) & 0x00000400)
-				| ((Y      ) & 0x00000200) | ((Y <<  7) & 0x00000100)
-				| ((Y >>  7) & 0x00000020) | ((Y >>  3) & 0x00000011)
-				| ((Y <<  2) & 0x00000004) | ((Y >> 21) & 0x00000002);
-	}
-}
-
-/*
- * DES key schedule (56-bit, encryption)
- */
-int des_setkey_enc( des_context *ctx, const unsigned char key[DES_KEY_SIZE] )
-{
-	des_setkey( ctx->sk, key );
-
-	return( 0 );
-}
-
-/*
- * DES key schedule (56-bit, decryption)
- */
-int des_setkey_dec( des_context *ctx, const unsigned char key[DES_KEY_SIZE] )
-{
-	int i;
-
-	des_setkey( ctx->sk, key );
-
-	for( i = 0; i < 16; i += 2 )
-	{
-		SWAP( ctx->sk[i    ], ctx->sk[30 - i] );
-		SWAP( ctx->sk[i + 1], ctx->sk[31 - i] );
-	}
-
-	return( 0 );
-}
-
-static void des3_set2key( uint32_t esk[96],
-						  uint32_t dsk[96],
-						  const unsigned char key[DES_KEY_SIZE*2] )
-{
-	int i;
-
-	des_setkey( esk, key );
-	des_setkey( dsk + 32, key + 8 );
-
-	for( i = 0; i < 32; i += 2 )
-	{
-		dsk[i     ] = esk[30 - i];
-		dsk[i +  1] = esk[31 - i];
-
-		esk[i + 32] = dsk[62 - i];
-		esk[i + 33] = dsk[63 - i];
-
-		esk[i + 64] = esk[i    ];
-		esk[i + 65] = esk[i + 1];
-
-		dsk[i + 64] = dsk[i    ];
-		dsk[i + 65] = dsk[i + 1];
-	}
-}
-
-/*
- * Triple-DES key schedule (112-bit, encryption)
- */
-int des3_set2key_enc( des3_context *ctx, const unsigned char key[DES_KEY_SIZE * 2] )
-{
-	uint32_t sk[96];
-
-	des3_set2key( ctx->sk, sk, key );
-	memset( sk,  0, sizeof( sk ) );
-
-	return( 0 );
-}
-
-/*
- * Triple-DES key schedule (112-bit, decryption)
- */
-int des3_set2key_dec( des3_context *ctx, const unsigned char key[DES_KEY_SIZE * 2] )
-{
-	uint32_t sk[96];
-
-	des3_set2key( sk, ctx->sk, key );
-	memset( sk,  0, sizeof( sk ) );
-
-	return( 0 );
-}
-
-static void des3_set3key( uint32_t esk[96],
-						  uint32_t dsk[96],
-						  const unsigned char key[24] )
-{
-	int i;
-
-	des_setkey( esk, key );
-	des_setkey( dsk + 32, key +  8 );
-	des_setkey( esk + 64, key + 16 );
-
-	for( i = 0; i < 32; i += 2 )
-	{
-		dsk[i     ] = esk[94 - i];
-		dsk[i +  1] = esk[95 - i];
-
-		esk[i + 32] = dsk[62 - i];
-		esk[i + 33] = dsk[63 - i];
-
-		dsk[i + 64] = esk[30 - i];
-		dsk[i + 65] = esk[31 - i];
-	}
-}
-
-/*
- * Triple-DES key schedule (168-bit, encryption)
- */
-int des3_set3key_enc( des3_context *ctx, const unsigned char key[DES_KEY_SIZE * 3] )
-{
-	uint32_t sk[96];
-
-	des3_set3key( ctx->sk, sk, key );
-	memset( sk, 0, sizeof( sk ) );
-
-	return( 0 );
-}
-
-/*
- * Triple-DES key schedule (168-bit, decryption)
- */
-int des3_set3key_dec( des3_context *ctx, const unsigned char key[DES_KEY_SIZE * 3] )
-{
-	uint32_t sk[96];
-
-	des3_set3key( sk, ctx->sk, key );
-	memset( sk, 0, sizeof( sk ) );
-
-	return( 0 );
-}
-
-/*
- * DES-ECB block encryption/decryption
- */
-int des_crypt_ecb( des_context *ctx,
-					const unsigned char input[8],
-					unsigned char output[8] )
-{
-	int i;
-	uint32_t X, Y, T, *SK;
-
-	SK = ctx->sk;
-
-	GET_UINT32_BE( X, input, 0 );
-	GET_UINT32_BE( Y, input, 4 );
-
-	DES_IP( X, Y );
-
-	for( i = 0; i < 8; i++ )
-	{
-		DES_ROUND( Y, X );
-		DES_ROUND( X, Y );
-	}
-
-	DES_FP( Y, X );
-
-	PUT_UINT32_BE( Y, output, 0 );
-	PUT_UINT32_BE( X, output, 4 );
-
-	return( 0 );
-}
-
-#if defined(POLARSSL_CIPHER_MODE_CBC)
-/*
- * DES-CBC buffer encryption/decryption
- */
-int des_crypt_cbc( des_context *ctx,
-					int mode,
-					size_t length,
-					unsigned char iv[8],
-					const unsigned char *input,
-					unsigned char *output )
-{
-	int i;
-	unsigned char temp[8];
-
-	if( length % 8 )
-		return( POLARSSL_ERR_DES_INVALID_INPUT_LENGTH );
-
-	if( mode == DES_ENCRYPT )
-	{
-		while( length > 0 )
-		{
-			for( i = 0; i < 8; i++ )
-				output[i] = (unsigned char)( input[i] ^ iv[i] );
-
-			des_crypt_ecb( ctx, output, output );
-			memcpy( iv, output, 8 );
-
-			input  += 8;
-			output += 8;
-			length -= 8;
-		}
-	}
-	else /* DES_DECRYPT */
-	{
-		while( length > 0 )
-		{
-			memcpy( temp, input, 8 );
-			des_crypt_ecb( ctx, input, output );
-
-			for( i = 0; i < 8; i++ )
-				output[i] = (unsigned char)( output[i] ^ iv[i] );
-
-			memcpy( iv, temp, 8 );
-
-			input  += 8;
-			output += 8;
-			length -= 8;
-		}
-	}
-
-	return( 0 );
-}
-#endif /* POLARSSL_CIPHER_MODE_CBC */
-
-/*
- * 3DES-ECB block encryption/decryption
- */
-int des3_crypt_ecb( des3_context *ctx,
-					 const unsigned char input[8],
-					 unsigned char output[8] )
-{
-	int i;
-	uint32_t X, Y, T, *SK;
-
-	SK = ctx->sk;
-
-	GET_UINT32_BE( X, input, 0 );
-	GET_UINT32_BE( Y, input, 4 );
-
-	DES_IP( X, Y );
-
-	for( i = 0; i < 8; i++ )
-	{
-		DES_ROUND( Y, X );
-		DES_ROUND( X, Y );
-	}
-
-	for( i = 0; i < 8; i++ )
-	{
-		DES_ROUND( X, Y );
-		DES_ROUND( Y, X );
-	}
-
-	for( i = 0; i < 8; i++ )
-	{
-		DES_ROUND( Y, X );
-		DES_ROUND( X, Y );
-	}
-
-	DES_FP( Y, X );
-
-	PUT_UINT32_BE( Y, output, 0 );
-	PUT_UINT32_BE( X, output, 4 );
-
-	return( 0 );
-}
-
-#if defined(POLARSSL_CIPHER_MODE_CBC)
-/*
- * 3DES-CBC buffer encryption/decryption
- */
-int des3_crypt_cbc( des3_context *ctx,
-					 int mode,
-					 size_t length,
-					 unsigned char iv[8],
-					 const unsigned char *input,
-					 unsigned char *output )
-{
-	int i;
-	unsigned char temp[8];
-
-	if( length % 8 )
-		return( POLARSSL_ERR_DES_INVALID_INPUT_LENGTH );
-
-	if( mode == DES_ENCRYPT )
-	{
-		while( length > 0 )
-		{
-			for( i = 0; i < 8; i++ )
-				output[i] = (unsigned char)( input[i] ^ iv[i] );
-
-			des3_crypt_ecb( ctx, output, output );
-			memcpy( iv, output, 8 );
-
-			input  += 8;
-			output += 8;
-			length -= 8;
-		}
-	}
-	else /* DES_DECRYPT */
-	{
-		while( length > 0 )
-		{
-			memcpy( temp, input, 8 );
-			des3_crypt_ecb( ctx, input, output );
-
-			for( i = 0; i < 8; i++ )
-				output[i] = (unsigned char)( output[i] ^ iv[i] );
-
-			memcpy( iv, temp, 8 );
-
-			input  += 8;
-			output += 8;
-			length -= 8;
-		}
-	}
-
-	return( 0 );
-}
-#endif /* POLARSSL_CIPHER_MODE_CBC */
-
-#endif /* !POLARSSL_DES_ALT */
-
-#if defined(POLARSSL_SELF_TEST)
-
-#include <stdio.h>
-
-/*
- * DES and 3DES test vectors from:
- *
- * http://csrc.nist.gov/groups/STM/cavp/documents/des/tripledes-vectors.zip
- */
-static const unsigned char des3_test_keys[24] =
-{
-	0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF,
-	0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF, 0x01,
-	0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF, 0x01, 0x23
-};
-
-static const unsigned char des3_test_buf[8] =
-{
-	0x4E, 0x6F, 0x77, 0x20, 0x69, 0x73, 0x20, 0x74
-};
-
-static const unsigned char des3_test_ecb_dec[3][8] =
-{
-	{ 0xCD, 0xD6, 0x4F, 0x2F, 0x94, 0x27, 0xC1, 0x5D },
-	{ 0x69, 0x96, 0xC8, 0xFA, 0x47, 0xA2, 0xAB, 0xEB },
-	{ 0x83, 0x25, 0x39, 0x76, 0x44, 0x09, 0x1A, 0x0A }
-};
-
-static const unsigned char des3_test_ecb_enc[3][8] =
-{
-	{ 0x6A, 0x2A, 0x19, 0xF4, 0x1E, 0xCA, 0x85, 0x4B },
-	{ 0x03, 0xE6, 0x9F, 0x5B, 0xFA, 0x58, 0xEB, 0x42 },
-	{ 0xDD, 0x17, 0xE8, 0xB8, 0xB4, 0x37, 0xD2, 0x32 }
-};
-
-#if defined(POLARSSL_CIPHER_MODE_CBC)
-static const unsigned char des3_test_iv[8] =
-{
-	0x12, 0x34, 0x56, 0x78, 0x90, 0xAB, 0xCD, 0xEF,
-};
-
-static const unsigned char des3_test_cbc_dec[3][8] =
-{
-	{ 0x12, 0x9F, 0x40, 0xB9, 0xD2, 0x00, 0x56, 0xB3 },
-	{ 0x47, 0x0E, 0xFC, 0x9A, 0x6B, 0x8E, 0xE3, 0x93 },
-	{ 0xC5, 0xCE, 0xCF, 0x63, 0xEC, 0xEC, 0x51, 0x4C }
-};
-
-static const unsigned char des3_test_cbc_enc[3][8] =
-{
-	{ 0x54, 0xF1, 0x5A, 0xF6, 0xEB, 0xE3, 0xA4, 0xB4 },
-	{ 0x35, 0x76, 0x11, 0x56, 0x5F, 0xA1, 0x8E, 0x4D },
-	{ 0xCB, 0x19, 0x1F, 0x85, 0xD1, 0xED, 0x84, 0x39 }
-};
-#endif /* POLARSSL_CIPHER_MODE_CBC */
-
-/*
- * Checkup routine
- */
-int des_self_test( int verbose )
-{
-	int i, j, u, v;
-	des_context ctx;
-	des3_context ctx3;
-	unsigned char key[24];
-	unsigned char buf[8];
-#if defined(POLARSSL_CIPHER_MODE_CBC)
-	unsigned char prv[8];
-	unsigned char iv[8];
-#endif
-
-	memset( key, 0, 24 );
-
-	/*
-	 * ECB mode
-	 */
-	for( i = 0; i < 6; i++ )
-	{
-		u = i >> 1;
-		v = i  & 1;
-
-		if( verbose != 0 )
-			polarssl_printf( "  DES%c-ECB-%3d (%s): ",
-							 ( u == 0 ) ? ' ' : '3', 56 + u * 56,
-							 ( v == DES_DECRYPT ) ? "dec" : "enc" );
-
-		memcpy( buf, des3_test_buf, 8 );
-
-		switch( i )
-		{
-		case 0:
-			des_setkey_dec( &ctx, des3_test_keys );
-			break;
-
-		case 1:
-			des_setkey_enc( &ctx, des3_test_keys );
-			break;
-
-		case 2:
-			des3_set2key_dec( &ctx3, des3_test_keys );
-			break;
-
-		case 3:
-			des3_set2key_enc( &ctx3, des3_test_keys );
-			break;
-
-		case 4:
-			des3_set3key_dec( &ctx3, des3_test_keys );
-			break;
-
-		case 5:
-			des3_set3key_enc( &ctx3, des3_test_keys );
-			break;
-
-		default:
-			return( 1 );
-		}
-
-		for( j = 0; j < 10000; j++ )
-		{
-			if( u == 0 )
-				des_crypt_ecb( &ctx, buf, buf );
-			else
-				des3_crypt_ecb( &ctx3, buf, buf );
-		}
-
-		if( ( v == DES_DECRYPT &&
-				memcmp( buf, des3_test_ecb_dec[u], 8 ) != 0 ) ||
-			( v != DES_DECRYPT &&
-				memcmp( buf, des3_test_ecb_enc[u], 8 ) != 0 ) )
-		{
-			if( verbose != 0 )
-				polarssl_printf( "failed\n" );
-
-			return( 1 );
-		}
-
-		if( verbose != 0 )
-			polarssl_printf( "passed\n" );
-	}
-
-	if( verbose != 0 )
-		polarssl_printf( "\n" );
-
-#if defined(POLARSSL_CIPHER_MODE_CBC)
-	/*
-	 * CBC mode
-	 */
-	for( i = 0; i < 6; i++ )
-	{
-		u = i >> 1;
-		v = i  & 1;
-
-		if( verbose != 0 )
-			polarssl_printf( "  DES%c-CBC-%3d (%s): ",
-							 ( u == 0 ) ? ' ' : '3', 56 + u * 56,
-							 ( v == DES_DECRYPT ) ? "dec" : "enc" );
-
-		memcpy( iv,  des3_test_iv,  8 );
-		memcpy( prv, des3_test_iv,  8 );
-		memcpy( buf, des3_test_buf, 8 );
-
-		switch( i )
-		{
-		case 0:
-			des_setkey_dec( &ctx, des3_test_keys );
-			break;
-
-		case 1:
-			des_setkey_enc( &ctx, des3_test_keys );
-			break;
-
-		case 2:
-			des3_set2key_dec( &ctx3, des3_test_keys );
-			break;
-
-		case 3:
-			des3_set2key_enc( &ctx3, des3_test_keys );
-			break;
-
-		case 4:
-			des3_set3key_dec( &ctx3, des3_test_keys );
-			break;
-
-		case 5:
-			des3_set3key_enc( &ctx3, des3_test_keys );
-			break;
-
-		default:
-			return( 1 );
-		}
-
-		if( v == DES_DECRYPT )
-		{
-			for( j = 0; j < 10000; j++ )
-			{
-				if( u == 0 )
-					des_crypt_cbc( &ctx, v, 8, iv, buf, buf );
-				else
-					des3_crypt_cbc( &ctx3, v, 8, iv, buf, buf );
-			}
-		}
-		else
-		{
-			for( j = 0; j < 10000; j++ )
-			{
-				unsigned char tmp[8];
-
-				if( u == 0 )
-					des_crypt_cbc( &ctx, v, 8, iv, buf, buf );
-				else
-					des3_crypt_cbc( &ctx3, v, 8, iv, buf, buf );
-
-				memcpy( tmp, prv, 8 );
-				memcpy( prv, buf, 8 );
-				memcpy( buf, tmp, 8 );
-			}
-
-			memcpy( buf, prv, 8 );
-		}
-
-		if( ( v == DES_DECRYPT &&
-				memcmp( buf, des3_test_cbc_dec[u], 8 ) != 0 ) ||
-			( v != DES_DECRYPT &&
-				memcmp( buf, des3_test_cbc_enc[u], 8 ) != 0 ) )
-		{
-			if( verbose != 0 )
-				polarssl_printf( "failed\n" );
-
-			return( 1 );
-		}
-
-		if( verbose != 0 )
-			polarssl_printf( "passed\n" );
-	}
-#endif /* POLARSSL_CIPHER_MODE_CBC */
-
-	if( verbose != 0 )
-		polarssl_printf( "\n" );
-
-	return( 0 );
-}
-
-#endif
-
-#endif
diff --git a/common/polarssl/des.h b/common/polarssl/des.h
deleted file mode 100644
index 460beaf0e..000000000
--- a/common/polarssl/des.h
+++ /dev/null
@@ -1,281 +0,0 @@
-/**
- * \file des.h
- *
- * \brief DES block cipher
- *
- *  Copyright (C) 2006-2013, Brainspark B.V.
- *
- *  This file is part of PolarSSL (http://www.polarssl.org)
- *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
- *
- *  All rights reserved.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifndef POLARSSL_DES_H
-#define POLARSSL_DES_H
-
-//#include "config.h"
-/**
- * \def POLARSSL_CIPHER_MODE_CBC
- *
- * Enable Cipher Block Chaining mode (CBC) for symmetric ciphers.
- */
-#define POLARSSL_CIPHER_MODE_CBC
- 
-#include <string.h>
-
-#if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32)
-#include <basetsd.h>
-typedef UINT32 uint32_t;
-#else
-#include <inttypes.h>
-#endif
-
-#define DES_ENCRYPT     1
-#define DES_DECRYPT     0
-
-#define POLARSSL_ERR_DES_INVALID_INPUT_LENGTH              -0x0032  /**< The data input has an invalid length. */
-
-#define DES_KEY_SIZE    8
-
-#if !defined(POLARSSL_DES_ALT)
-// Regular implementation
-//
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * \brief          DES context structure
- */
-typedef struct
-{
-	int mode;                   /*!<  encrypt/decrypt   */
-	uint32_t sk[32];            /*!<  DES subkeys       */
-}
-des_context;
-
-/**
- * \brief          Triple-DES context structure
- */
-typedef struct
-{
-	int mode;                   /*!<  encrypt/decrypt   */
-	uint32_t sk[96];            /*!<  3DES subkeys      */
-}
-des3_context;
-/*
- * Triple-DES key schedule (112-bit, encryption)
- */
-int des3_set2key_enc( des3_context *ctx, const unsigned char key[DES_KEY_SIZE * 2] );
-
-/*
- * Triple-DES key schedule (112-bit, decryption)
- */
-int des3_set2key_dec( des3_context *ctx, const unsigned char key[DES_KEY_SIZE * 2] );
-
-/*
- * Triple-DES key schedule (168-bit, encryption)
- */
-int des3_set3key_enc( des3_context *ctx, const unsigned char key[DES_KEY_SIZE * 3] );
-
-/*
- * Triple-DES key schedule (168-bit, decryption)
- */
-int des3_set3key_dec( des3_context *ctx, const unsigned char key[DES_KEY_SIZE * 3] );
-
-/**
- * \brief          Set key parity on the given key to odd.
- *
- *                 DES keys are 56 bits long, but each byte is padded with
- *                 a parity bit to allow verification.
- *
- * \param key      8-byte secret key
- */
-void des_key_set_parity( unsigned char key[DES_KEY_SIZE] );
-
-/**
- * \brief          Check that key parity on the given key is odd.
- *
- *                 DES keys are 56 bits long, but each byte is padded with
- *                 a parity bit to allow verification.
- *
- * \param key      8-byte secret key
- *
- * \return         0 is parity was ok, 1 if parity was not correct.
- */
-int des_key_check_key_parity( const unsigned char key[DES_KEY_SIZE] );
-
-/**
- * \brief          Check that key is not a weak or semi-weak DES key
- *
- * \param key      8-byte secret key
- *
- * \return         0 if no weak key was found, 1 if a weak key was identified.
- */
-int des_key_check_weak( const unsigned char key[DES_KEY_SIZE] );
-
-/**
- * \brief          DES key schedule (56-bit, encryption)
- *
- * \param ctx      DES context to be initialized
- * \param key      8-byte secret key
- *
- * \return         0
- */
-int des_setkey_enc( des_context *ctx, const unsigned char key[DES_KEY_SIZE] );
-
-/**
- * \brief          DES key schedule (56-bit, decryption)
- *
- * \param ctx      DES context to be initialized
- * \param key      8-byte secret key
- *
- * \return         0
- */
-int des_setkey_dec( des_context *ctx, const unsigned char key[DES_KEY_SIZE] );
-
-/**
- * \brief          Triple-DES key schedule (112-bit, encryption)
- *
- * \param ctx      3DES context to be initialized
- * \param key      16-byte secret key
- *
- * \return         0
- */
-int des3_set2key_enc( des3_context *ctx, const unsigned char key[DES_KEY_SIZE * 2] );
-
-/**
- * \brief          Triple-DES key schedule (112-bit, decryption)
- *
- * \param ctx      3DES context to be initialized
- * \param key      16-byte secret key
- *
- * \return         0
- */
-int des3_set2key_dec( des3_context *ctx, const unsigned char key[DES_KEY_SIZE * 2] );
-
-/**
- * \brief          Triple-DES key schedule (168-bit, encryption)
- *
- * \param ctx      3DES context to be initialized
- * \param key      24-byte secret key
- *
- * \return         0
- */
-int des3_set3key_enc( des3_context *ctx, const unsigned char key[DES_KEY_SIZE * 3] );
-
-/**
- * \brief          Triple-DES key schedule (168-bit, decryption)
- *
- * \param ctx      3DES context to be initialized
- * \param key      24-byte secret key
- *
- * \return         0
- */
-int des3_set3key_dec( des3_context *ctx, const unsigned char key[DES_KEY_SIZE * 3] );
-
-/**
- * \brief          DES-ECB block encryption/decryption
- *
- * \param ctx      DES context
- * \param input    64-bit input block
- * \param output   64-bit output block
- *
- * \return         0 if successful
- */
-int des_crypt_ecb( des_context *ctx,
-					const unsigned char input[8],
-					unsigned char output[8] );
-
-#if defined(POLARSSL_CIPHER_MODE_CBC)
-/**
- * \brief          DES-CBC buffer encryption/decryption
- *
- * \param ctx      DES context
- * \param mode     DES_ENCRYPT or DES_DECRYPT
- * \param length   length of the input data
- * \param iv       initialization vector (updated after use)
- * \param input    buffer holding the input data
- * \param output   buffer holding the output data
- */
-int des_crypt_cbc( des_context *ctx,
-					int mode,
-					size_t length,
-					unsigned char iv[8],
-					const unsigned char *input,
-					unsigned char *output );
-#endif /* POLARSSL_CIPHER_MODE_CBC */
-
-/**
- * \brief          3DES-ECB block encryption/decryption
- *
- * \param ctx      3DES context
- * \param input    64-bit input block
- * \param output   64-bit output block
- *
- * \return         0 if successful
- */
-int des3_crypt_ecb( des3_context *ctx,
-					 const unsigned char input[8],
-					 unsigned char output[8] );
-
-#if defined(POLARSSL_CIPHER_MODE_CBC)
-/**
- * \brief          3DES-CBC buffer encryption/decryption
- *
- * \param ctx      3DES context
- * \param mode     DES_ENCRYPT or DES_DECRYPT
- * \param length   length of the input data
- * \param iv       initialization vector (updated after use)
- * \param input    buffer holding the input data
- * \param output   buffer holding the output data
- *
- * \return         0 if successful, or POLARSSL_ERR_DES_INVALID_INPUT_LENGTH
- */
-int des3_crypt_cbc( des3_context *ctx,
-					 int mode,
-					 size_t length,
-					 unsigned char iv[8],
-					 const unsigned char *input,
-					 unsigned char *output );
-#endif /* POLARSSL_CIPHER_MODE_CBC */
-
-#ifdef __cplusplus
-}
-#endif
-
-#else  /* POLARSSL_DES_ALT */
-#include "des_alt.h"
-#endif /* POLARSSL_DES_ALT */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * \brief          Checkup routine
- *
- * \return         0 if successful, or 1 if the test failed
- */
-int des_self_test( int verbose );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* des.h */
diff --git a/common/polarssl/polarssl_config.h b/common/polarssl/polarssl_config.h
deleted file mode 100644
index 3d9a2f67d..000000000
--- a/common/polarssl/polarssl_config.h
+++ /dev/null
@@ -1,2179 +0,0 @@
-/**
- * \file config.h
- *
- * \brief Configuration options (set of defines)
- *
- *  Copyright (C) 2006-2014, Brainspark B.V.
- *
- *  This file is part of PolarSSL (http://www.polarssl.org)
- *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
- *
- *  All rights reserved.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * This set of compile-time options may be used to enable
- * or disable features selectively, and reduce the global
- * memory footprint.
- */
-#ifndef POLARSSL_CONFIG_H
-#define POLARSSL_CONFIG_H
-
-#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE)
-#define _CRT_SECURE_NO_DEPRECATE 1
-#endif
-
-/**
- * \name SECTION: System support
- *
- * This section sets system specific settings.
- * \{
- */
-
-/**
- * \def POLARSSL_HAVE_INT8
- *
- * The system uses 8-bit wide native integers.
- *
- * Uncomment if native integers are 8-bit wide.
- */
-//#define POLARSSL_HAVE_INT8
-
-/**
- * \def POLARSSL_HAVE_INT16
- *
- * The system uses 16-bit wide native integers.
- *
- * Uncomment if native integers are 16-bit wide.
- */
-//#define POLARSSL_HAVE_INT16
-
-/**
- * \def POLARSSL_HAVE_LONGLONG
- *
- * The compiler supports the 'long long' type.
- * (Only used on 32-bit platforms)
- */
-#define POLARSSL_HAVE_LONGLONG
-
-/**
- * \def POLARSSL_HAVE_ASM
- *
- * The compiler has support for asm().
- *
- * Requires support for asm() in compiler.
- *
- * Used in:
- *      library/timing.c
- *      library/padlock.c
- *      include/polarssl/bn_mul.h
- *
- * Comment to disable the use of assembly code.
- */
-//#define POLARSSL_HAVE_ASM
-
-/**
- * \def POLARSSL_HAVE_SSE2
- *
- * CPU supports SSE2 instruction set.
- *
- * Uncomment if the CPU supports SSE2 (IA-32 specific).
- */
-//#define POLARSSL_HAVE_SSE2
-
-/**
- * \def POLARSSL_HAVE_TIME
- *
- * System has time.h and time() / localtime()  / gettimeofday().
- *
- * Comment if your system does not support time functions
- */
-#define POLARSSL_HAVE_TIME
-
-/**
- * \def POLARSSL_HAVE_IPV6
- *
- * System supports the basic socket interface for IPv6 (RFC 3493),
- * specifically getaddrinfo(), freeaddrinfo() and struct sockaddr_storage.
- *
- * Note: on Windows/MingW, XP or higher is required.
- *
- * Comment if your system does not support the IPv6 socket interface
- */
-#define POLARSSL_HAVE_IPV6
-
-/**
- * \def POLARSSL_PLATFORM_MEMORY
- *
- * Enable the memory allocation layer.
- *
- * By default PolarSSL uses the system-provided malloc() and free().
- * This allows different allocators (self-implemented or provided) to be
- * provided to the platform abstraction layer.
- *
- * Enabling POLARSSL_PLATFORM_MEMORY will provide "platform_set_malloc_free()"
- * to allow you to set an alternative malloc() and free() function pointer.
- *
- * Requires: POLARSSL_PLATFORM_C
- *
- * Enable this layer to allow use of alternative memory allocators.
- */
-//#define POLARSSL_PLATFORM_MEMORY
-
-/**
- * \def POLARSSL_PLATFORM_NO_STD_FUNCTIONS
- *
- * Do not assign standard functions in the platform layer (e.g. malloc() to
- * POLARSSL_PLATFORM_STD_MALLOC and printf() to POLARSSL_PLATFORM_STD_PRINTF)
- *
- * This makes sure there are no linking errors on platforms that do not support
- * these functions. You will HAVE to provide alternatives, either at runtime
- * via the platform_set_xxx() functions or at compile time by setting
- * the POLARSSL_PLATFORM_STD_XXX defines.
- *
- * Requires: POLARSSL_PLATFORM_C
- *
- * Uncomment to prevent default assignment of standard functions in the
- * platform layer.
- */
-//#define POLARSSL_PLATFORM_NO_STD_FUNCTIONS
-
-/**
- * \def POLARSSL_PLATFORM_XXX_ALT
- *
- * Uncomment a macro to let PolarSSL support the function in the platform
- * abstraction layer.
- *
- * Example: In case you uncomment POLARSSL_PLATFORM_PRINTF_ALT, PolarSSL will
- * provide a function "platform_set_printf()" that allows you to set an
- * alternative printf function pointer.
- *
- * All these define require POLARSSL_PLATFORM_C to be defined!
- *
- * Uncomment a macro to enable alternate implementation of specific base
- * platform function
- */
-//#define POLARSSL_PLATFORM_PRINTF_ALT
-//#define POLARSSL_PLATFORM_FPRINTF_ALT
-/* \} name SECTION: System support */
-
-/**
- * \name SECTION: PolarSSL feature support
- *
- * This section sets support for features that are or are not needed
- * within the modules that are enabled.
- * \{
- */
-
-/**
- * \def POLARSSL_TIMING_ALT
- *
- * Uncomment to provide your own alternate implementation for hardclock(),
- * get_timer(), set_alarm() and m_sleep().
- *
- * Only works if you have POLARSSL_TIMING_C enabled.
- *
- * You will need to provide a header "timing_alt.h" and an implementation at
- * compile time.
- */
-//#define POLARSSL_TIMING_ALT
-
-/**
- * \def POLARSSL_XXX_ALT
- *
- * Uncomment a macro to let PolarSSL use your alternate core implementation of
- * a symmetric or hash algorithm (e.g. platform specific assembly optimized
- * implementations). Keep in mind that the function prototypes should remain
- * the same.
- *
- * Example: In case you uncomment POLARSSL_AES_ALT, PolarSSL will no longer
- * provide the "struct aes_context" definition and omit the base function
- * declarations and implementations. "aes_alt.h" will be included from
- * "aes.h" to include the new function definitions.
- *
- * Uncomment a macro to enable alternate implementation for core algorithm
- * functions
- */
-//#define POLARSSL_AES_ALT
-//#define POLARSSL_ARC4_ALT
-//#define POLARSSL_BLOWFISH_ALT
-//#define POLARSSL_CAMELLIA_ALT
-//#define POLARSSL_DES_ALT
-//#define POLARSSL_XTEA_ALT
-//#define POLARSSL_MD2_ALT
-//#define POLARSSL_MD4_ALT
-//#define POLARSSL_MD5_ALT
-//#define POLARSSL_RIPEMD160_ALT
-//#define POLARSSL_SHA1_ALT
-//#define POLARSSL_SHA256_ALT
-//#define POLARSSL_SHA512_ALT
-
-/**
- * \def POLARSSL_AES_ROM_TABLES
- *
- * Store the AES tables in ROM.
- *
- * Uncomment this macro to store the AES tables in ROM.
- *
- */
-//#define POLARSSL_AES_ROM_TABLES
-
-/**
- * \def POLARSSL_CIPHER_MODE_CBC
- *
- * Enable Cipher Block Chaining mode (CBC) for symmetric ciphers.
- */
-#define POLARSSL_CIPHER_MODE_CBC
-
-/**
- * \def POLARSSL_CIPHER_MODE_CFB
- *
- * Enable Cipher Feedback mode (CFB) for symmetric ciphers.
- */
-#define POLARSSL_CIPHER_MODE_CFB
-
-/**
- * \def POLARSSL_CIPHER_MODE_CTR
- *
- * Enable Counter Block Cipher mode (CTR) for symmetric ciphers.
- */
-#define POLARSSL_CIPHER_MODE_CTR
-
-/**
- * \def POLARSSL_CIPHER_NULL_CIPHER
- *
- * Enable NULL cipher.
- * Warning: Only do so when you know what you are doing. This allows for
- * encryption or channels without any security!
- *
- * Requires POLARSSL_ENABLE_WEAK_CIPHERSUITES as well to enable
- * the following ciphersuites:
- *      TLS_ECDH_ECDSA_WITH_NULL_SHA
- *      TLS_ECDH_RSA_WITH_NULL_SHA
- *      TLS_ECDHE_ECDSA_WITH_NULL_SHA
- *      TLS_ECDHE_RSA_WITH_NULL_SHA
- *      TLS_ECDHE_PSK_WITH_NULL_SHA384
- *      TLS_ECDHE_PSK_WITH_NULL_SHA256
- *      TLS_ECDHE_PSK_WITH_NULL_SHA
- *      TLS_DHE_PSK_WITH_NULL_SHA384
- *      TLS_DHE_PSK_WITH_NULL_SHA256
- *      TLS_DHE_PSK_WITH_NULL_SHA
- *      TLS_RSA_WITH_NULL_SHA256
- *      TLS_RSA_WITH_NULL_SHA
- *      TLS_RSA_WITH_NULL_MD5
- *      TLS_RSA_PSK_WITH_NULL_SHA384
- *      TLS_RSA_PSK_WITH_NULL_SHA256
- *      TLS_RSA_PSK_WITH_NULL_SHA
- *      TLS_PSK_WITH_NULL_SHA384
- *      TLS_PSK_WITH_NULL_SHA256
- *      TLS_PSK_WITH_NULL_SHA
- *
- * Uncomment this macro to enable the NULL cipher and ciphersuites
- */
-//#define POLARSSL_CIPHER_NULL_CIPHER
-
-/**
- * \def POLARSSL_CIPHER_PADDING_XXX
- *
- * Uncomment or comment macros to add support for specific padding modes
- * in the cipher layer with cipher modes that support padding (e.g. CBC)
- *
- * If you disable all padding modes, only full blocks can be used with CBC.
- *
- * Enable padding modes in the cipher layer.
- */
-#define POLARSSL_CIPHER_PADDING_PKCS7
-#define POLARSSL_CIPHER_PADDING_ONE_AND_ZEROS
-#define POLARSSL_CIPHER_PADDING_ZEROS_AND_LEN
-#define POLARSSL_CIPHER_PADDING_ZEROS
-
-/**
- * \def POLARSSL_ENABLE_WEAK_CIPHERSUITES
- *
- * Enable weak ciphersuites in SSL / TLS.
- * Warning: Only do so when you know what you are doing. This allows for
- * channels with virtually no security at all!
- *
- * This enables the following ciphersuites:
- *      TLS_RSA_WITH_DES_CBC_SHA
- *      TLS_DHE_RSA_WITH_DES_CBC_SHA
- *
- * Uncomment this macro to enable weak ciphersuites
- */
-//#define POLARSSL_ENABLE_WEAK_CIPHERSUITES
-
-/**
- * \def POLARSSL_REMOVE_ARC4_CIPHERSUITES
- *
- * Remove RC4 ciphersuites by default in SSL / TLS.
- * This flag removes the ciphersuites based on RC4 from the default list as
- * returned by ssl_list_ciphersuites(). However, it is still possible to
- * enable (some of) them with ssl_set_ciphersuites() by including them
- * explicitly.
- *
- * Uncomment this macro to remove RC4 ciphersuites by default.
- */
-//#define POLARSSL_REMOVE_ARC4_CIPHERSUITES
-
-/**
- * \def POLARSSL_ECP_XXXX_ENABLED
- *
- * Enables specific curves within the Elliptic Curve module.
- * By default all supported curves are enabled.
- *
- * Comment macros to disable the curve and functions for it
- */
-#define POLARSSL_ECP_DP_SECP192R1_ENABLED
-#define POLARSSL_ECP_DP_SECP224R1_ENABLED
-#define POLARSSL_ECP_DP_SECP256R1_ENABLED
-#define POLARSSL_ECP_DP_SECP384R1_ENABLED
-#define POLARSSL_ECP_DP_SECP521R1_ENABLED
-#define POLARSSL_ECP_DP_SECP192K1_ENABLED
-#define POLARSSL_ECP_DP_SECP224K1_ENABLED
-#define POLARSSL_ECP_DP_SECP256K1_ENABLED
-#define POLARSSL_ECP_DP_BP256R1_ENABLED
-#define POLARSSL_ECP_DP_BP384R1_ENABLED
-#define POLARSSL_ECP_DP_BP512R1_ENABLED
-//#define POLARSSL_ECP_DP_M221_ENABLED  // Not implemented yet!
-#define POLARSSL_ECP_DP_M255_ENABLED
-//#define POLARSSL_ECP_DP_M383_ENABLED  // Not implemented yet!
-//#define POLARSSL_ECP_DP_M511_ENABLED  // Not implemented yet!
-
-/**
- * \def POLARSSL_ECP_NIST_OPTIM
- *
- * Enable specific 'modulo p' routines for each NIST prime.
- * Depending on the prime and architecture, makes operations 4 to 8 times
- * faster on the corresponding curve.
- *
- * Comment this macro to disable NIST curves optimisation.
- */
-#define POLARSSL_ECP_NIST_OPTIM
-
-/**
- * \def POLARSSL_ECDSA_DETERMINISTIC
- *
- * Enable deterministic ECDSA (RFC 6979).
- * Standard ECDSA is "fragile" in the sense that lack of entropy when signing
- * may result in a compromise of the long-term signing key. This is avoided by
- * the deterministic variant.
- *
- * Requires: POLARSSL_HMAC_DRBG_C
- *
- * Comment this macro to disable deterministic ECDSA.
- */
-#define POLARSSL_ECDSA_DETERMINISTIC
-
-/**
- * \def POLARSSL_KEY_EXCHANGE_PSK_ENABLED
- *
- * Enable the PSK based ciphersuite modes in SSL / TLS.
- *
- * This enables the following ciphersuites (if other requisites are
- * enabled as well):
- *      TLS_PSK_WITH_AES_256_GCM_SHA384
- *      TLS_PSK_WITH_AES_256_CBC_SHA384
- *      TLS_PSK_WITH_AES_256_CBC_SHA
- *      TLS_PSK_WITH_CAMELLIA_256_GCM_SHA384
- *      TLS_PSK_WITH_CAMELLIA_256_CBC_SHA384
- *      TLS_PSK_WITH_AES_128_GCM_SHA256
- *      TLS_PSK_WITH_AES_128_CBC_SHA256
- *      TLS_PSK_WITH_AES_128_CBC_SHA
- *      TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256
- *      TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256
- *      TLS_PSK_WITH_3DES_EDE_CBC_SHA
- *      TLS_PSK_WITH_RC4_128_SHA
- */
-#define POLARSSL_KEY_EXCHANGE_PSK_ENABLED
-
-/**
- * \def POLARSSL_KEY_EXCHANGE_DHE_PSK_ENABLED
- *
- * Enable the DHE-PSK based ciphersuite modes in SSL / TLS.
- *
- * Requires: POLARSSL_DHM_C
- *
- * This enables the following ciphersuites (if other requisites are
- * enabled as well):
- *      TLS_DHE_PSK_WITH_AES_256_GCM_SHA384
- *      TLS_DHE_PSK_WITH_AES_256_CBC_SHA384
- *      TLS_DHE_PSK_WITH_AES_256_CBC_SHA
- *      TLS_DHE_PSK_WITH_CAMELLIA_256_GCM_SHA384
- *      TLS_DHE_PSK_WITH_CAMELLIA_256_CBC_SHA384
- *      TLS_DHE_PSK_WITH_AES_128_GCM_SHA256
- *      TLS_DHE_PSK_WITH_AES_128_CBC_SHA256
- *      TLS_DHE_PSK_WITH_AES_128_CBC_SHA
- *      TLS_DHE_PSK_WITH_CAMELLIA_128_GCM_SHA256
- *      TLS_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256
- *      TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA
- *      TLS_DHE_PSK_WITH_RC4_128_SHA
- */
-#define POLARSSL_KEY_EXCHANGE_DHE_PSK_ENABLED
-
-/**
- * \def POLARSSL_KEY_EXCHANGE_ECDHE_PSK_ENABLED
- *
- * Enable the ECDHE-PSK based ciphersuite modes in SSL / TLS.
- *
- * Requires: POLARSSL_ECDH_C
- *
- * This enables the following ciphersuites (if other requisites are
- * enabled as well):
- *      TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384
- *      TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA
- *      TLS_ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384
- *      TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256
- *      TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA
- *      TLS_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256
- *      TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA
- *      TLS_ECDHE_PSK_WITH_RC4_128_SHA
- */
-#define POLARSSL_KEY_EXCHANGE_ECDHE_PSK_ENABLED
-
-/**
- * \def POLARSSL_KEY_EXCHANGE_RSA_PSK_ENABLED
- *
- * Enable the RSA-PSK based ciphersuite modes in SSL / TLS.
- *
- * Requires: POLARSSL_RSA_C, POLARSSL_PKCS1_V15,
- *           POLARSSL_X509_CRT_PARSE_C
- *
- * This enables the following ciphersuites (if other requisites are
- * enabled as well):
- *      TLS_RSA_PSK_WITH_AES_256_GCM_SHA384
- *      TLS_RSA_PSK_WITH_AES_256_CBC_SHA384
- *      TLS_RSA_PSK_WITH_AES_256_CBC_SHA
- *      TLS_RSA_PSK_WITH_CAMELLIA_256_GCM_SHA384
- *      TLS_RSA_PSK_WITH_CAMELLIA_256_CBC_SHA384
- *      TLS_RSA_PSK_WITH_AES_128_GCM_SHA256
- *      TLS_RSA_PSK_WITH_AES_128_CBC_SHA256
- *      TLS_RSA_PSK_WITH_AES_128_CBC_SHA
- *      TLS_RSA_PSK_WITH_CAMELLIA_128_GCM_SHA256
- *      TLS_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256
- *      TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA
- *      TLS_RSA_PSK_WITH_RC4_128_SHA
- */
-#define POLARSSL_KEY_EXCHANGE_RSA_PSK_ENABLED
-
-/**
- * \def POLARSSL_KEY_EXCHANGE_RSA_ENABLED
- *
- * Enable the RSA-only based ciphersuite modes in SSL / TLS.
- *
- * Requires: POLARSSL_RSA_C, POLARSSL_PKCS1_V15,
- *           POLARSSL_X509_CRT_PARSE_C
- *
- * This enables the following ciphersuites (if other requisites are
- * enabled as well):
- *      TLS_RSA_WITH_AES_256_GCM_SHA384
- *      TLS_RSA_WITH_AES_256_CBC_SHA256
- *      TLS_RSA_WITH_AES_256_CBC_SHA
- *      TLS_RSA_WITH_CAMELLIA_256_GCM_SHA384
- *      TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256
- *      TLS_RSA_WITH_CAMELLIA_256_CBC_SHA
- *      TLS_RSA_WITH_AES_128_GCM_SHA256
- *      TLS_RSA_WITH_AES_128_CBC_SHA256
- *      TLS_RSA_WITH_AES_128_CBC_SHA
- *      TLS_RSA_WITH_CAMELLIA_128_GCM_SHA256
- *      TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256
- *      TLS_RSA_WITH_CAMELLIA_128_CBC_SHA
- *      TLS_RSA_WITH_3DES_EDE_CBC_SHA
- *      TLS_RSA_WITH_RC4_128_SHA
- *      TLS_RSA_WITH_RC4_128_MD5
- */
-#define POLARSSL_KEY_EXCHANGE_RSA_ENABLED
-
-/**
- * \def POLARSSL_KEY_EXCHANGE_DHE_RSA_ENABLED
- *
- * Enable the DHE-RSA based ciphersuite modes in SSL / TLS.
- *
- * Requires: POLARSSL_DHM_C, POLARSSL_RSA_C, POLARSSL_PKCS1_V15,
- *           POLARSSL_X509_CRT_PARSE_C
- *
- * This enables the following ciphersuites (if other requisites are
- * enabled as well):
- *      TLS_DHE_RSA_WITH_AES_256_GCM_SHA384
- *      TLS_DHE_RSA_WITH_AES_256_CBC_SHA256
- *      TLS_DHE_RSA_WITH_AES_256_CBC_SHA
- *      TLS_DHE_RSA_WITH_CAMELLIA_256_GCM_SHA384
- *      TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256
- *      TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA
- *      TLS_DHE_RSA_WITH_AES_128_GCM_SHA256
- *      TLS_DHE_RSA_WITH_AES_128_CBC_SHA256
- *      TLS_DHE_RSA_WITH_AES_128_CBC_SHA
- *      TLS_DHE_RSA_WITH_CAMELLIA_128_GCM_SHA256
- *      TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256
- *      TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA
- *      TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA
- */
-#define POLARSSL_KEY_EXCHANGE_DHE_RSA_ENABLED
-
-/**
- * \def POLARSSL_KEY_EXCHANGE_ECDHE_RSA_ENABLED
- *
- * Enable the ECDHE-RSA based ciphersuite modes in SSL / TLS.
- *
- * Requires: POLARSSL_ECDH_C, POLARSSL_RSA_C, POLARSSL_PKCS1_V15,
- *           POLARSSL_X509_CRT_PARSE_C
- *
- * This enables the following ciphersuites (if other requisites are
- * enabled as well):
- *      TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
- *      TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384
- *      TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA
- *      TLS_ECDHE_RSA_WITH_CAMELLIA_256_GCM_SHA384
- *      TLS_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384
- *      TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
- *      TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256
- *      TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA
- *      TLS_ECDHE_RSA_WITH_CAMELLIA_128_GCM_SHA256
- *      TLS_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256
- *      TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA
- *      TLS_ECDHE_RSA_WITH_RC4_128_SHA
- */
-#define POLARSSL_KEY_EXCHANGE_ECDHE_RSA_ENABLED
-
-/**
- * \def POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
- *
- * Enable the ECDHE-ECDSA based ciphersuite modes in SSL / TLS.
- *
- * Requires: POLARSSL_ECDH_C, POLARSSL_ECDSA_C, POLARSSL_X509_CRT_PARSE_C,
- *
- * This enables the following ciphersuites (if other requisites are
- * enabled as well):
- *      TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
- *      TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384
- *      TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA
- *      TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_GCM_SHA384
- *      TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384
- *      TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
- *      TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256
- *      TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA
- *      TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_GCM_SHA256
- *      TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256
- *      TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA
- *      TLS_ECDHE_ECDSA_WITH_RC4_128_SHA
- */
-#define POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
-
-/**
- * \def POLARSSL_KEY_EXCHANGE_ECDH_ECDSA_ENABLED
- *
- * Enable the ECDH-ECDSA based ciphersuite modes in SSL / TLS.
- *
- * Requires: POLARSSL_ECDH_C, POLARSSL_X509_CRT_PARSE_C
- *
- * This enables the following ciphersuites (if other requisites are
- * enabled as well):
- *      TLS_ECDH_ECDSA_WITH_RC4_128_SHA
- *      TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA
- *      TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA
- *      TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA
- *      TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256
- *      TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384
- *      TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256
- *      TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384
- *      TLS_ECDH_ECDSA_WITH_CAMELLIA_128_CBC_SHA256
- *      TLS_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384
- *      TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256
- *      TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384
- */
-#define POLARSSL_KEY_EXCHANGE_ECDH_ECDSA_ENABLED
-
-/**
- * \def POLARSSL_KEY_EXCHANGE_ECDH_RSA_ENABLED
- *
- * Enable the ECDH-RSA based ciphersuite modes in SSL / TLS.
- *
- * Requires: POLARSSL_ECDH_C, POLARSSL_X509_CRT_PARSE_C
- *
- * This enables the following ciphersuites (if other requisites are
- * enabled as well):
- *      TLS_ECDH_RSA_WITH_RC4_128_SHA
- *      TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA
- *      TLS_ECDH_RSA_WITH_AES_128_CBC_SHA
- *      TLS_ECDH_RSA_WITH_AES_256_CBC_SHA
- *      TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256
- *      TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384
- *      TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256
- *      TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384
- *      TLS_ECDH_RSA_WITH_CAMELLIA_128_CBC_SHA256
- *      TLS_ECDH_RSA_WITH_CAMELLIA_256_CBC_SHA384
- *      TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256
- *      TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384
- */
-#define POLARSSL_KEY_EXCHANGE_ECDH_RSA_ENABLED
-
-/**
- * \def POLARSSL_PK_PARSE_EC_EXTENDED
- *
- * Enhance support for reading EC keys using variants of SEC1 not allowed by
- * RFC 5915 and RFC 5480.
- *
- * Currently this means parsing the SpecifiedECDomain choice of EC
- * parameters (only known groups are supported, not arbitrary domains, to
- * avoid validation issues).
- *
- * Disable if you only need to support RFC 5915 + 5480 key formats.
- */
-#define POLARSSL_PK_PARSE_EC_EXTENDED
-
-/**
- * \def POLARSSL_ERROR_STRERROR_BC
- *
- * Make available the backward compatible error_strerror() next to the
- * current polarssl_strerror().
- *
- * For new code, it is recommended to use polarssl_strerror() instead and
- * disable this.
- *
- * Disable if you run into name conflicts and want to really remove the
- * error_strerror()
- */
-#define POLARSSL_ERROR_STRERROR_BC
-
-/**
- * \def POLARSSL_ERROR_STRERROR_DUMMY
- *
- * Enable a dummy error function to make use of polarssl_strerror() in
- * third party libraries easier when POLARSSL_ERROR_C is disabled
- * (no effect when POLARSSL_ERROR_C is enabled).
- *
- * You can safely disable this if POLARSSL_ERROR_C is enabled, or if you're
- * not using polarssl_strerror() or error_strerror() in your application.
- *
- * Disable if you run into name conflicts and want to really remove the
- * polarssl_strerror()
- */
-#define POLARSSL_ERROR_STRERROR_DUMMY
-
-/**
- * \def POLARSSL_GENPRIME
- *
- * Enable the prime-number generation code.
- *
- * Requires: POLARSSL_BIGNUM_C
- */
-#define POLARSSL_GENPRIME
-
-/**
- * \def POLARSSL_FS_IO
- *
- * Enable functions that use the filesystem.
- */
-#define POLARSSL_FS_IO
-
-/**
- * \def POLARSSL_NO_DEFAULT_ENTROPY_SOURCES
- *
- * Do not add default entropy sources. These are the platform specific,
- * hardclock and HAVEGE based poll functions.
- *
- * This is useful to have more control over the added entropy sources in an
- * application.
- *
- * Uncomment this macro to prevent loading of default entropy functions.
- */
-//#define POLARSSL_NO_DEFAULT_ENTROPY_SOURCES
-
-/**
- * \def POLARSSL_NO_PLATFORM_ENTROPY
- *
- * Do not use built-in platform entropy functions.
- * This is useful if your platform does not support
- * standards like the /dev/urandom or Windows CryptoAPI.
- *
- * Uncomment this macro to disable the built-in platform entropy functions.
- */
-//#define POLARSSL_NO_PLATFORM_ENTROPY
-
-/**
- * \def POLARSSL_ENTROPY_FORCE_SHA256
- *
- * Force the entropy accumulator to use a SHA-256 accumulator instead of the
- * default SHA-512 based one (if both are available).
- *
- * Requires: POLARSSL_SHA256_C
- *
- * On 32-bit systems SHA-256 can be much faster than SHA-512. Use this option
- * if you have performance concerns.
- *
- * This option is only useful if both POLARSSL_SHA256_C and
- * POLARSSL_SHA512_C are defined. Otherwise the available hash module is used.
- */
-//#define POLARSSL_ENTROPY_FORCE_SHA256
-
-/**
- * \def POLARSSL_MEMORY_DEBUG
- *
- * Enable debugging of buffer allocator memory issues. Automatically prints
- * (to stderr) all (fatal) messages on memory allocation issues. Enables
- * function for 'debug output' of allocated memory.
- *
- * Requires: POLARSSL_MEMORY_BUFFER_ALLOC_C
- *
- * Uncomment this macro to let the buffer allocator print out error messages.
- */
-//#define POLARSSL_MEMORY_DEBUG
-
-/**
- * \def POLARSSL_MEMORY_BACKTRACE
- *
- * Include backtrace information with each allocated block.
- *
- * Requires: POLARSSL_MEMORY_BUFFER_ALLOC_C
- *           GLIBC-compatible backtrace() an backtrace_symbols() support
- *
- * Uncomment this macro to include backtrace information
- */
-//#define POLARSSL_MEMORY_BACKTRACE
-
-/**
- * \def POLARSSL_PKCS1_V15
- *
- * Enable support for PKCS#1 v1.5 encoding.
- *
- * Requires: POLARSSL_RSA_C
- *
- * This enables support for PKCS#1 v1.5 operations.
- */
-#define POLARSSL_PKCS1_V15
-
-/**
- * \def POLARSSL_PKCS1_V21
- *
- * Enable support for PKCS#1 v2.1 encoding.
- *
- * Requires: POLARSSL_MD_C, POLARSSL_RSA_C
- *
- * This enables support for RSAES-OAEP and RSASSA-PSS operations.
- */
-//#define POLARSSL_PKCS1_V21
-
-/**
- * \def POLARSSL_RSA_NO_CRT
- *
- * Do not use the Chinese Remainder Theorem for the RSA private operation.
- *
- * Uncomment this macro to disable the use of CRT in RSA.
- *
- */
-//#define POLARSSL_RSA_NO_CRT
-
-/**
- * \def POLARSSL_SELF_TEST
- *
- * Enable the checkup functions (*_self_test).
- */
-#define POLARSSL_SELF_TEST
-
-/**
- * \def POLARSSL_SSL_ALL_ALERT_MESSAGES
- *
- * Enable sending of alert messages in case of encountered errors as per RFC.
- * If you choose not to send the alert messages, PolarSSL can still communicate
- * with other servers, only debugging of failures is harder.
- *
- * The advantage of not sending alert messages, is that no information is given
- * about reasons for failures thus preventing adversaries of gaining intel.
- *
- * Enable sending of all alert messages
- */
-#define POLARSSL_SSL_ALERT_MESSAGES
-
-/**
- * \def POLARSSL_SSL_DEBUG_ALL
- *
- * Enable the debug messages in SSL module for all issues.
- * Debug messages have been disabled in some places to prevent timing
- * attacks due to (unbalanced) debugging function calls.
- *
- * If you need all error reporting you should enable this during debugging,
- * but remove this for production servers that should log as well.
- *
- * Uncomment this macro to report all debug messages on errors introducing
- * a timing side-channel.
- *
- */
-//#define POLARSSL_SSL_DEBUG_ALL
-
-/**
- * \def POLARSSL_SSL_HW_RECORD_ACCEL
- *
- * Enable hooking functions in SSL module for hardware acceleration of
- * individual records.
- *
- * Uncomment this macro to enable hooking functions.
- */
-//#define POLARSSL_SSL_HW_RECORD_ACCEL
-
-/**
- * \def POLARSSL_SSL_SRV_SUPPORT_SSLV2_CLIENT_HELLO
- *
- * Enable support for receiving and parsing SSLv2 Client Hello messages for the
- * SSL Server module (POLARSSL_SSL_SRV_C).
- *
- * Comment this macro to disable support for SSLv2 Client Hello messages.
- */
-#define POLARSSL_SSL_SRV_SUPPORT_SSLV2_CLIENT_HELLO
-
-/**
- * \def POLARSSL_SSL_SRV_RESPECT_CLIENT_PREFERENCE
- *
- * Pick the ciphersuite according to the client's preferences rather than ours
- * in the SSL Server module (POLARSSL_SSL_SRV_C).
- *
- * Uncomment this macro to respect client's ciphersuite order
- */
-//#define POLARSSL_SSL_SRV_RESPECT_CLIENT_PREFERENCE
-
-/**
- * \def POLARSSL_SSL_MAX_FRAGMENT_LENGTH
- *
- * Enable support for RFC 6066 max_fragment_length extension in SSL.
- *
- * Comment this macro to disable support for the max_fragment_length extension
- */
-#define POLARSSL_SSL_MAX_FRAGMENT_LENGTH
-
-/**
- * \def POLARSSL_SSL_PROTO_SSL3
- *
- * Enable support for SSL 3.0.
- *
- * Requires: POLARSSL_MD5_C
- *           POLARSSL_SHA1_C
- *
- * Comment this macro to disable support for SSL 3.0
- */
-#define POLARSSL_SSL_PROTO_SSL3
-
-/**
- * \def POLARSSL_SSL_PROTO_TLS1
- *
- * Enable support for TLS 1.0.
- *
- * Requires: POLARSSL_MD5_C
- *           POLARSSL_SHA1_C
- *
- * Comment this macro to disable support for TLS 1.0
- */
-#define POLARSSL_SSL_PROTO_TLS1
-
-/**
- * \def POLARSSL_SSL_PROTO_TLS1_1
- *
- * Enable support for TLS 1.1.
- *
- * Requires: POLARSSL_MD5_C
- *           POLARSSL_SHA1_C
- *
- * Comment this macro to disable support for TLS 1.1
- */
-#define POLARSSL_SSL_PROTO_TLS1_1
-
-/**
- * \def POLARSSL_SSL_PROTO_TLS1_2
- *
- * Enable support for TLS 1.2.
- *
- * Requires: POLARSSL_SHA1_C or POLARSSL_SHA256_C or POLARSSL_SHA512_C
- *           (Depends on ciphersuites)
- *
- * Comment this macro to disable support for TLS 1.2
- */
-#define POLARSSL_SSL_PROTO_TLS1_2
-
-/**
- * \def POLARSSL_SSL_ALPN
- *
- * Enable support for Application Layer Protocol Negotiation.
- * draft-ietf-tls-applayerprotoneg-05
- *
- * Comment this macro to disable support for ALPN.
- */
-#define POLARSSL_SSL_ALPN
-
-/**
- * \def POLARSSL_SSL_SESSION_TICKETS
- *
- * Enable support for RFC 5077 session tickets in SSL.
- *
- * Requires: POLARSSL_AES_C
- *           POLARSSL_SHA256_C
- *           POLARSSL_CIPHER_MODE_CBC
- *
- * Comment this macro to disable support for SSL session tickets
- */
-#define POLARSSL_SSL_SESSION_TICKETS
-
-/**
- * \def POLARSSL_SSL_SERVER_NAME_INDICATION
- *
- * Enable support for RFC 6066 server name indication (SNI) in SSL.
- *
- * Comment this macro to disable support for server name indication in SSL
- */
-#define POLARSSL_SSL_SERVER_NAME_INDICATION
-
-/**
- * \def POLARSSL_SSL_TRUNCATED_HMAC
- *
- * Enable support for RFC 6066 truncated HMAC in SSL.
- *
- * Comment this macro to disable support for truncated HMAC in SSL
- */
-#define POLARSSL_SSL_TRUNCATED_HMAC
-
-/**
- * \def POLARSSL_SSL_SET_CURVES
- *
- * Enable ssl_set_curves().
- *
- * This is disabled by default since it breaks binary compatibility with the
- * 1.3.x line. If you choose to enable it, you will need to rebuild your
- * application against the new header files, relinking will not be enough.
- * It will be enabled by default, or no longer an option, in the 1.4 branch.
- *
- * Uncomment to make ssl_set_curves() available.
- */
-//#define POLARSSL_SSL_SET_CURVES
-
-/**
- * \def POLARSSL_THREADING_ALT
- *
- * Provide your own alternate threading implementation.
- *
- * Requires: POLARSSL_THREADING_C
- *
- * Uncomment this to allow your own alternate threading implementation.
- */
-//#define POLARSSL_THREADING_ALT
-
-/**
- * \def POLARSSL_THREADING_PTHREAD
- *
- * Enable the pthread wrapper layer for the threading layer.
- *
- * Requires: POLARSSL_THREADING_C
- *
- * Uncomment this to enable pthread mutexes.
- */
-//#define POLARSSL_THREADING_PTHREAD
-
-/**
- * \def POLARSSL_VERSION_FEATURES
- *
- * Allow run-time checking of compile-time enabled features. Thus allowing users
- * to check at run-time if the library is for instance compiled with threading
- * support via version_check_feature().
- *
- * Requires: POLARSSL_VERSION_C
- *
- * Comment this to disable run-time checking and save ROM space
- */
-#define POLARSSL_VERSION_FEATURES
-
-/**
- * \def POLARSSL_X509_ALLOW_EXTENSIONS_NON_V3
- *
- * If set, the X509 parser will not break-off when parsing an X509 certificate
- * and encountering an extension in a v1 or v2 certificate.
- *
- * Uncomment to prevent an error.
- */
-//#define POLARSSL_X509_ALLOW_EXTENSIONS_NON_V3
-
-/**
- * \def POLARSSL_X509_ALLOW_UNSUPPORTED_CRITICAL_EXTENSION
- *
- * If set, the X509 parser will not break-off when parsing an X509 certificate
- * and encountering an unknown critical extension.
- *
- * Uncomment to prevent an error.
- */
-//#define POLARSSL_X509_ALLOW_UNSUPPORTED_CRITICAL_EXTENSION
-
-/**
- * \def POLARSSL_X509_CHECK_KEY_USAGE
- *
- * Enable verification of the keyUsage extension (CA and leaf certificates).
- *
- * Disabling this avoids problems with mis-issued and/or misused
- * (intermediate) CA and leaf certificates.
- *
- * \warning Depending on your PKI use, disabling this can be a security risk!
- *
- * Comment to skip keyUsage checking for both CA and leaf certificates.
- */
-#define POLARSSL_X509_CHECK_KEY_USAGE
-
-/**
- * \def POLARSSL_X509_CHECK_EXTENDED_KEY_USAGE
- *
- * Enable verification of the extendedKeyUsage extension (leaf certificates).
- *
- * Disabling this avoids problems with mis-issued and/or misused certificates.
- *
- * \warning Depending on your PKI use, disabling this can be a security risk!
- *
- * Comment to skip extendedKeyUsage checking for certificates.
- */
-#define POLARSSL_X509_CHECK_EXTENDED_KEY_USAGE
-
-/**
- * \def POLARSSL_X509_RSASSA_PSS_SUPPORT
- *
- * Enable parsing and verification of X.509 certificates, CRLs and CSRS
- * signed with RSASSA-PSS (aka PKCS#1 v2.1).
- *
- * Comment this macro to disallow using RSASSA-PSS in certificates.
- */
-#define POLARSSL_X509_RSASSA_PSS_SUPPORT
-
-/**
- * \def POLARSSL_ZLIB_SUPPORT
- *
- * If set, the SSL/TLS module uses ZLIB to support compression and
- * decompression of packet data.
- *
- * \warning TLS-level compression MAY REDUCE SECURITY! See for example the
- * CRIME attack. Before enabling this option, you should examine with care if
- * CRIME or similar exploits may be a applicable to your use case.
- *
- * Used in: library/ssl_tls.c
- *          library/ssl_cli.c
- *          library/ssl_srv.c
- *
- * This feature requires zlib library and headers to be present.
- *
- * Uncomment to enable use of ZLIB
- */
-//#define POLARSSL_ZLIB_SUPPORT
-/* \} name SECTION: PolarSSL feature support */
-
-/**
- * \name SECTION: PolarSSL modules
- *
- * This section enables or disables entire modules in PolarSSL
- * \{
- */
-
-/**
- * \def POLARSSL_AESNI_C
- *
- * Enable AES-NI support on x86-64.
- *
- * Module:  library/aesni.c
- * Caller:  library/aes.c
- *
- * Requires: POLARSSL_HAVE_ASM
- *
- * This modules adds support for the AES-NI instructions on x86-64
- */
-//#define POLARSSL_AESNI_C
-
-/**
- * \def POLARSSL_AES_C
- *
- * Enable the AES block cipher.
- *
- * Module:  library/aes.c
- * Caller:  library/ssl_tls.c
- *          library/pem.c
- *          library/ctr_drbg.c
- *
- * This module enables the following ciphersuites (if other requisites are
- * enabled as well):
- *      TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA
- *      TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA
- *      TLS_ECDH_RSA_WITH_AES_128_CBC_SHA
- *      TLS_ECDH_RSA_WITH_AES_256_CBC_SHA
- *      TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256
- *      TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384
- *      TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256
- *      TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384
- *      TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256
- *      TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384
- *      TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256
- *      TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384
- *      TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
- *      TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
- *      TLS_DHE_RSA_WITH_AES_256_GCM_SHA384
- *      TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384
- *      TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384
- *      TLS_DHE_RSA_WITH_AES_256_CBC_SHA256
- *      TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA
- *      TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA
- *      TLS_DHE_RSA_WITH_AES_256_CBC_SHA
- *      TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
- *      TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
- *      TLS_DHE_RSA_WITH_AES_128_GCM_SHA256
- *      TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256
- *      TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256
- *      TLS_DHE_RSA_WITH_AES_128_CBC_SHA256
- *      TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA
- *      TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA
- *      TLS_DHE_RSA_WITH_AES_128_CBC_SHA
- *      TLS_DHE_PSK_WITH_AES_256_GCM_SHA384
- *      TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384
- *      TLS_DHE_PSK_WITH_AES_256_CBC_SHA384
- *      TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA
- *      TLS_DHE_PSK_WITH_AES_256_CBC_SHA
- *      TLS_DHE_PSK_WITH_AES_128_GCM_SHA256
- *      TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256
- *      TLS_DHE_PSK_WITH_AES_128_CBC_SHA256
- *      TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA
- *      TLS_DHE_PSK_WITH_AES_128_CBC_SHA
- *      TLS_RSA_WITH_AES_256_GCM_SHA384
- *      TLS_RSA_WITH_AES_256_CBC_SHA256
- *      TLS_RSA_WITH_AES_256_CBC_SHA
- *      TLS_RSA_WITH_AES_128_GCM_SHA256
- *      TLS_RSA_WITH_AES_128_CBC_SHA256
- *      TLS_RSA_WITH_AES_128_CBC_SHA
- *      TLS_RSA_PSK_WITH_AES_256_GCM_SHA384
- *      TLS_RSA_PSK_WITH_AES_256_CBC_SHA384
- *      TLS_RSA_PSK_WITH_AES_256_CBC_SHA
- *      TLS_RSA_PSK_WITH_AES_128_GCM_SHA256
- *      TLS_RSA_PSK_WITH_AES_128_CBC_SHA256
- *      TLS_RSA_PSK_WITH_AES_128_CBC_SHA
- *      TLS_PSK_WITH_AES_256_GCM_SHA384
- *      TLS_PSK_WITH_AES_256_CBC_SHA384
- *      TLS_PSK_WITH_AES_256_CBC_SHA
- *      TLS_PSK_WITH_AES_128_GCM_SHA256
- *      TLS_PSK_WITH_AES_128_CBC_SHA256
- *      TLS_PSK_WITH_AES_128_CBC_SHA
- *
- * PEM_PARSE uses AES for decrypting encrypted keys.
- */
-#define POLARSSL_AES_C
-
-/**
- * \def POLARSSL_ARC4_C
- *
- * Enable the ARCFOUR stream cipher.
- *
- * Module:  library/arc4.c
- * Caller:  library/ssl_tls.c
- *
- * This module enables the following ciphersuites (if other requisites are
- * enabled as well):
- *      TLS_ECDH_ECDSA_WITH_RC4_128_SHA
- *      TLS_ECDH_RSA_WITH_RC4_128_SHA
- *      TLS_ECDHE_ECDSA_WITH_RC4_128_SHA
- *      TLS_ECDHE_RSA_WITH_RC4_128_SHA
- *      TLS_ECDHE_PSK_WITH_RC4_128_SHA
- *      TLS_DHE_PSK_WITH_RC4_128_SHA
- *      TLS_RSA_WITH_RC4_128_SHA
- *      TLS_RSA_WITH_RC4_128_MD5
- *      TLS_RSA_PSK_WITH_RC4_128_SHA
- *      TLS_PSK_WITH_RC4_128_SHA
- */
-#define POLARSSL_ARC4_C
-
-/**
- * \def POLARSSL_ASN1_PARSE_C
- *
- * Enable the generic ASN1 parser.
- *
- * Module:  library/asn1.c
- * Caller:  library/x509.c
- *          library/dhm.c
- *          library/pkcs12.c
- *          library/pkcs5.c
- *          library/pkparse.c
- */
-#define POLARSSL_ASN1_PARSE_C
-
-/**
- * \def POLARSSL_ASN1_WRITE_C
- *
- * Enable the generic ASN1 writer.
- *
- * Module:  library/asn1write.c
- * Caller:  library/ecdsa.c
- *          library/pkwrite.c
- *          library/x509_create.c
- *          library/x509write_crt.c
- *          library/x509write_csr.c
- */
-#define POLARSSL_ASN1_WRITE_C
-
-/**
- * \def POLARSSL_BASE64_C
- *
- * Enable the Base64 module.
- *
- * Module:  library/base64.c
- * Caller:  library/pem.c
- *
- * This module is required for PEM support (required by X.509).
- */
-#define POLARSSL_BASE64_C
-
-/**
- * \def POLARSSL_BIGNUM_C
- *
- * Enable the multi-precision integer library.
- *
- * Module:  library/bignum.c
- * Caller:  library/dhm.c
- *          library/ecp.c
- *          library/ecdsa.c
- *          library/rsa.c
- *          library/ssl_tls.c
- *
- * This module is required for RSA, DHM and ECC (ECDH, ECDSA) support.
- */
-#define POLARSSL_BIGNUM_C
-
-/**
- * \def POLARSSL_BLOWFISH_C
- *
- * Enable the Blowfish block cipher.
- *
- * Module:  library/blowfish.c
- */
-#define POLARSSL_BLOWFISH_C
-
-/**
- * \def POLARSSL_CAMELLIA_C
- *
- * Enable the Camellia block cipher.
- *
- * Module:  library/camellia.c
- * Caller:  library/ssl_tls.c
- *
- * This module enables the following ciphersuites (if other requisites are
- * enabled as well):
- *      TLS_ECDH_ECDSA_WITH_CAMELLIA_128_CBC_SHA256
- *      TLS_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384
- *      TLS_ECDH_RSA_WITH_CAMELLIA_128_CBC_SHA256
- *      TLS_ECDH_RSA_WITH_CAMELLIA_256_CBC_SHA384
- *      TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256
- *      TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384
- *      TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256
- *      TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384
- *      TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_GCM_SHA384
- *      TLS_ECDHE_RSA_WITH_CAMELLIA_256_GCM_SHA384
- *      TLS_DHE_RSA_WITH_CAMELLIA_256_GCM_SHA384
- *      TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384
- *      TLS_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384
- *      TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256
- *      TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA
- *      TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_GCM_SHA256
- *      TLS_ECDHE_RSA_WITH_CAMELLIA_128_GCM_SHA256
- *      TLS_DHE_RSA_WITH_CAMELLIA_128_GCM_SHA256
- *      TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256
- *      TLS_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256
- *      TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256
- *      TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA
- *      TLS_DHE_PSK_WITH_CAMELLIA_256_GCM_SHA384
- *      TLS_ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384
- *      TLS_DHE_PSK_WITH_CAMELLIA_256_CBC_SHA384
- *      TLS_DHE_PSK_WITH_CAMELLIA_128_GCM_SHA256
- *      TLS_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256
- *      TLS_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256
- *      TLS_RSA_WITH_CAMELLIA_256_GCM_SHA384
- *      TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256
- *      TLS_RSA_WITH_CAMELLIA_256_CBC_SHA
- *      TLS_RSA_WITH_CAMELLIA_128_GCM_SHA256
- *      TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256
- *      TLS_RSA_WITH_CAMELLIA_128_CBC_SHA
- *      TLS_RSA_PSK_WITH_CAMELLIA_256_GCM_SHA384
- *      TLS_RSA_PSK_WITH_CAMELLIA_256_CBC_SHA384
- *      TLS_RSA_PSK_WITH_CAMELLIA_128_GCM_SHA256
- *      TLS_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256
- *      TLS_PSK_WITH_CAMELLIA_256_GCM_SHA384
- *      TLS_PSK_WITH_CAMELLIA_256_CBC_SHA384
- *      TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256
- *      TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256
- */
-#define POLARSSL_CAMELLIA_C
-
-/**
- * \def POLARSSL_CCM_C
- *
- * Enable the Counter with CBC-MAC (CCM) mode for 128-bit block cipher.
- *
- * Module:  library/ccm.c
- *
- * Requires: POLARSSL_AES_C or POLARSSL_CAMELLIA_C
- *
- * This module enables the AES-CCM ciphersuites, if other requisites are
- * enabled as well.
- */
-#define POLARSSL_CCM_C
-
-/**
- * \def POLARSSL_CERTS_C
- *
- * Enable the test certificates.
- *
- * Module:  library/certs.c
- * Caller:
- *
- * Requires: POLARSSL_PEM_PARSE_C
- *
- * This module is used for testing (ssl_client/server).
- */
-#define POLARSSL_CERTS_C
-
-/**
- * \def POLARSSL_CIPHER_C
- *
- * Enable the generic cipher layer.
- *
- * Module:  library/cipher.c
- * Caller:  library/ssl_tls.c
- *
- * Uncomment to enable generic cipher wrappers.
- */
-#define POLARSSL_CIPHER_C
-
-/**
- * \def POLARSSL_CTR_DRBG_C
- *
- * Enable the CTR_DRBG AES-256-based random generator.
- *
- * Module:  library/ctr_drbg.c
- * Caller:
- *
- * Requires: POLARSSL_AES_C
- *
- * This module provides the CTR_DRBG AES-256 random number generator.
- */
-#define POLARSSL_CTR_DRBG_C
-
-/**
- * \def POLARSSL_DEBUG_C
- *
- * Enable the debug functions.
- *
- * Module:  library/debug.c
- * Caller:  library/ssl_cli.c
- *          library/ssl_srv.c
- *          library/ssl_tls.c
- *
- * This module provides debugging functions.
- */
-#define POLARSSL_DEBUG_C
-
-/**
- * \def POLARSSL_DES_C
- *
- * Enable the DES block cipher.
- *
- * Module:  library/des.c
- * Caller:  library/pem.c
- *          library/ssl_tls.c
- *
- * This module enables the following ciphersuites (if other requisites are
- * enabled as well):
- *      TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA
- *      TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA
- *      TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA
- *      TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA
- *      TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA
- *      TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA
- *      TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA
- *      TLS_RSA_WITH_3DES_EDE_CBC_SHA
- *      TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA
- *      TLS_PSK_WITH_3DES_EDE_CBC_SHA
- *
- * PEM_PARSE uses DES/3DES for decrypting encrypted keys.
- */
-#define POLARSSL_DES_C
-
-/**
- * \def POLARSSL_DHM_C
- *
- * Enable the Diffie-Hellman-Merkle module.
- *
- * Module:  library/dhm.c
- * Caller:  library/ssl_cli.c
- *          library/ssl_srv.c
- *
- * This module is used by the following key exchanges:
- *      DHE-RSA, DHE-PSK
- */
-#define POLARSSL_DHM_C
-
-/**
- * \def POLARSSL_ECDH_C
- *
- * Enable the elliptic curve Diffie-Hellman library.
- *
- * Module:  library/ecdh.c
- * Caller:  library/ssl_cli.c
- *          library/ssl_srv.c
- *
- * This module is used by the following key exchanges:
- *      ECDHE-ECDSA, ECDHE-RSA, DHE-PSK
- *
- * Requires: POLARSSL_ECP_C
- */
-#define POLARSSL_ECDH_C
-
-/**
- * \def POLARSSL_ECDSA_C
- *
- * Enable the elliptic curve DSA library.
- *
- * Module:  library/ecdsa.c
- * Caller:
- *
- * This module is used by the following key exchanges:
- *      ECDHE-ECDSA
- *
- * Requires: POLARSSL_ECP_C, POLARSSL_ASN1_WRITE_C, POLARSSL_ASN1_PARSE_C
- */
-#define POLARSSL_ECDSA_C
-
-/**
- * \def POLARSSL_ECP_C
- *
- * Enable the elliptic curve over GF(p) library.
- *
- * Module:  library/ecp.c
- * Caller:  library/ecdh.c
- *          library/ecdsa.c
- *
- * Requires: POLARSSL_BIGNUM_C and at least one POLARSSL_ECP_DP_XXX_ENABLED
- */
-#define POLARSSL_ECP_C
-
-/**
- * \def POLARSSL_ENTROPY_C
- *
- * Enable the platform-specific entropy code.
- *
- * Module:  library/entropy.c
- * Caller:
- *
- * Requires: POLARSSL_SHA512_C or POLARSSL_SHA256_C
- *
- * This module provides a generic entropy pool
- */
-#define POLARSSL_ENTROPY_C
-
-/**
- * \def POLARSSL_ERROR_C
- *
- * Enable error code to error string conversion.
- *
- * Module:  library/error.c
- * Caller:
- *
- * This module enables polarssl_strerror().
- */
-#define POLARSSL_ERROR_C
-
-/**
- * \def POLARSSL_GCM_C
- *
- * Enable the Galois/Counter Mode (GCM) for AES.
- *
- * Module:  library/gcm.c
- *
- * Requires: POLARSSL_AES_C or POLARSSL_CAMELLIA_C
- *
- * This module enables the AES-GCM and CAMELLIA-GCM ciphersuites, if other
- * requisites are enabled as well.
- */
-#define POLARSSL_GCM_C
-
-/**
- * \def POLARSSL_HAVEGE_C
- *
- * Enable the HAVEGE random generator.
- *
- * Warning: the HAVEGE random generator is not suitable for virtualized
- *          environments
- *
- * Warning: the HAVEGE random generator is dependent on timing and specific
- *          processor traits. It is therefore not advised to use HAVEGE as
- *          your applications primary random generator or primary entropy pool
- *          input. As a secondary input to your entropy pool, it IS able add
- *          the (limited) extra entropy it provides.
- *
- * Module:  library/havege.c
- * Caller:
- *
- * Requires: POLARSSL_TIMING_C
- *
- * Uncomment to enable the HAVEGE random generator.
- */
-//#define POLARSSL_HAVEGE_C
-
-/**
- * \def POLARSSL_HMAC_DRBG_C
- *
- * Enable the HMAC_DRBG random generator.
- *
- * Module:  library/hmac_drbg.c
- * Caller:
- *
- * Requires: POLARSSL_MD_C
- *
- * Uncomment to enable the HMAC_DRBG random number geerator.
- */
-#define POLARSSL_HMAC_DRBG_C
-
-/**
- * \def POLARSSL_MD_C
- *
- * Enable the generic message digest layer.
- *
- * Module:  library/md.c
- * Caller:
- *
- * Uncomment to enable generic message digest wrappers.
- */
-#define POLARSSL_MD_C
-
-/**
- * \def POLARSSL_MD2_C
- *
- * Enable the MD2 hash algorithm.
- *
- * Module:  library/md2.c
- * Caller:
- *
- * Uncomment to enable support for (rare) MD2-signed X.509 certs.
- */
-//#define POLARSSL_MD2_C
-
-/**
- * \def POLARSSL_MD4_C
- *
- * Enable the MD4 hash algorithm.
- *
- * Module:  library/md4.c
- * Caller:
- *
- * Uncomment to enable support for (rare) MD4-signed X.509 certs.
- */
-//#define POLARSSL_MD4_C
-
-/**
- * \def POLARSSL_MD5_C
- *
- * Enable the MD5 hash algorithm.
- *
- * Module:  library/md5.c
- * Caller:  library/md.c
- *          library/pem.c
- *          library/ssl_tls.c
- *
- * This module is required for SSL/TLS and X.509.
- * PEM_PARSE uses MD5 for decrypting encrypted keys.
- */
-#define POLARSSL_MD5_C
-
-/**
- * \def POLARSSL_MEMORY_C
- * Deprecated since 1.3.5. Please use POLARSSL_PLATFORM_MEMORY instead.
- */
-//#define POLARSSL_MEMORY_C
-
-/**
- * \def POLARSSL_MEMORY_BUFFER_ALLOC_C
- *
- * Enable the buffer allocator implementation that makes use of a (stack)
- * based buffer to 'allocate' dynamic memory. (replaces malloc() and free()
- * calls)
- *
- * Module:  library/memory_buffer_alloc.c
- *
- * Requires: POLARSSL_PLATFORM_C
- *           POLARSSL_PLATFORM_MEMORY (to use it within PolarSSL)
- *
- * Enable this module to enable the buffer memory allocator.
- */
-//#define POLARSSL_MEMORY_BUFFER_ALLOC_C
-
-/**
- * \def POLARSSL_NET_C
- *
- * Enable the TCP/IP networking routines.
- *
- * Module:  library/net.c
- *
- * This module provides TCP/IP networking routines.
- */
-#define POLARSSL_NET_C
-
-/**
- * \def POLARSSL_OID_C
- *
- * Enable the OID database.
- *
- * Module:  library/oid.c
- * Caller:  library/asn1write.c
- *          library/pkcs5.c
- *          library/pkparse.c
- *          library/pkwrite.c
- *          library/rsa.c
- *          library/x509.c
- *          library/x509_create.c
- *          library/x509_crl.c
- *          library/x509_crt.c
- *          library/x509_csr.c
- *          library/x509write_crt.c
- *          library/x509write_csr.c
- *
- * This modules translates between OIDs and internal values.
- */
-#define POLARSSL_OID_C
-
-/**
- * \def POLARSSL_PADLOCK_C
- *
- * Enable VIA Padlock support on x86.
- *
- * Module:  library/padlock.c
- * Caller:  library/aes.c
- *
- * Requires: POLARSSL_HAVE_ASM
- *
- * This modules adds support for the VIA PadLock on x86.
- */
-//#define POLARSSL_PADLOCK_C
-
-/**
- * \def POLARSSL_PBKDF2_C
- *
- * Enable PKCS#5 PBKDF2 key derivation function.
- * DEPRECATED: Use POLARSSL_PKCS5_C instead
- *
- * Module:  library/pbkdf2.c
- *
- * Requires: POLARSSL_PKCS5_C
- *
- * This module adds support for the PKCS#5 PBKDF2 key derivation function.
- */
-#define POLARSSL_PBKDF2_C
-
-/**
- * \def POLARSSL_PEM_PARSE_C
- *
- * Enable PEM decoding / parsing.
- *
- * Module:  library/pem.c
- * Caller:  library/dhm.c
- *          library/pkparse.c
- *          library/x509_crl.c
- *          library/x509_crt.c
- *          library/x509_csr.c
- *
- * Requires: POLARSSL_BASE64_C
- *
- * This modules adds support for decoding / parsing PEM files.
- */
-#define POLARSSL_PEM_PARSE_C
-
-/**
- * \def POLARSSL_PEM_WRITE_C
- *
- * Enable PEM encoding / writing.
- *
- * Module:  library/pem.c
- * Caller:  library/pkwrite.c
- *          library/x509write_crt.c
- *          library/x509write_csr.c
- *
- * Requires: POLARSSL_BASE64_C
- *
- * This modules adds support for encoding / writing PEM files.
- */
-#define POLARSSL_PEM_WRITE_C
-
-/**
- * \def POLARSSL_PK_C
- *
- * Enable the generic public (asymetric) key layer.
- *
- * Module:  library/pk.c
- * Caller:  library/ssl_tls.c
- *          library/ssl_cli.c
- *          library/ssl_srv.c
- *
- * Requires: POLARSSL_RSA_C or POLARSSL_ECP_C
- *
- * Uncomment to enable generic public key wrappers.
- */
-#define POLARSSL_PK_C
-
-/**
- * \def POLARSSL_PK_PARSE_C
- *
- * Enable the generic public (asymetric) key parser.
- *
- * Module:  library/pkparse.c
- * Caller:  library/x509_crt.c
- *          library/x509_csr.c
- *
- * Requires: POLARSSL_PK_C
- *
- * Uncomment to enable generic public key parse functions.
- */
-#define POLARSSL_PK_PARSE_C
-
-/**
- * \def POLARSSL_PK_WRITE_C
- *
- * Enable the generic public (asymetric) key writer.
- *
- * Module:  library/pkwrite.c
- * Caller:  library/x509write.c
- *
- * Requires: POLARSSL_PK_C
- *
- * Uncomment to enable generic public key write functions.
- */
-#define POLARSSL_PK_WRITE_C
-
-/**
- * \def POLARSSL_PKCS5_C
- *
- * Enable PKCS#5 functions.
- *
- * Module:  library/pkcs5.c
- *
- * Requires: POLARSSL_MD_C
- *
- * This module adds support for the PKCS#5 functions.
- */
-#define POLARSSL_PKCS5_C
-
-/**
- * \def POLARSSL_PKCS11_C
- *
- * Enable wrapper for PKCS#11 smartcard support.
- *
- * Module:  library/pkcs11.c
- * Caller:  library/pk.c
- *
- * Requires: POLARSSL_PK_C
- *
- * This module enables SSL/TLS PKCS #11 smartcard support.
- * Requires the presence of the PKCS#11 helper library (libpkcs11-helper)
- */
-//#define POLARSSL_PKCS11_C
-
-/**
- * \def POLARSSL_PKCS12_C
- *
- * Enable PKCS#12 PBE functions.
- * Adds algorithms for parsing PKCS#8 encrypted private keys
- *
- * Module:  library/pkcs12.c
- * Caller:  library/pkparse.c
- *
- * Requires: POLARSSL_ASN1_PARSE_C, POLARSSL_CIPHER_C, POLARSSL_MD_C
- * Can use:  POLARSSL_ARC4_C
- *
- * This module enables PKCS#12 functions.
- */
-#define POLARSSL_PKCS12_C
-
-/**
- * \def POLARSSL_PLATFORM_C
- *
- * Enable the platform abstraction layer that allows you to re-assign
- * functions like malloc(), free(), printf(), fprintf()
- *
- * Module:  library/platform.c
- * Caller:  Most other .c files
- *
- * This module enables abstraction of common (libc) functions.
- */
-//#define POLARSSL_PLATFORM_C
-
-/**
- * \def POLARSSL_RIPEMD160_C
- *
- * Enable the RIPEMD-160 hash algorithm.
- *
- * Module:  library/ripemd160.c
- * Caller:  library/md.c
- *
- */
-#define POLARSSL_RIPEMD160_C
-
-/**
- * \def POLARSSL_RSA_C
- *
- * Enable the RSA public-key cryptosystem.
- *
- * Module:  library/rsa.c
- * Caller:  library/ssl_cli.c
- *          library/ssl_srv.c
- *          library/ssl_tls.c
- *          library/x509.c
- *
- * This module is used by the following key exchanges:
- *      RSA, DHE-RSA, ECDHE-RSA, RSA-PSK
- *
- * Requires: POLARSSL_BIGNUM_C, POLARSSL_OID_C
- */
-#define POLARSSL_RSA_C
-
-/**
- * \def POLARSSL_SHA1_C
- *
- * Enable the SHA1 cryptographic hash algorithm.
- *
- * Module:  library/sha1.c
- * Caller:  library/md.c
- *          library/ssl_cli.c
- *          library/ssl_srv.c
- *          library/ssl_tls.c
- *          library/x509write_crt.c
- *
- * This module is required for SSL/TLS and SHA1-signed certificates.
- */
-#define POLARSSL_SHA1_C
-
-/**
- * \def POLARSSL_SHA256_C
- *
- * Enable the SHA-224 and SHA-256 cryptographic hash algorithms.
- * (Used to be POLARSSL_SHA2_C)
- *
- * Module:  library/sha256.c
- * Caller:  library/entropy.c
- *          library/md.c
- *          library/ssl_cli.c
- *          library/ssl_srv.c
- *          library/ssl_tls.c
- *
- * This module adds support for SHA-224 and SHA-256.
- * This module is required for the SSL/TLS 1.2 PRF function.
- */
-#define POLARSSL_SHA256_C
-
-/**
- * \def POLARSSL_SHA512_C
- *
- * Enable the SHA-384 and SHA-512 cryptographic hash algorithms.
- * (Used to be POLARSSL_SHA4_C)
- *
- * Module:  library/sha512.c
- * Caller:  library/entropy.c
- *          library/md.c
- *          library/ssl_cli.c
- *          library/ssl_srv.c
- *
- * This module adds support for SHA-384 and SHA-512.
- */
-#define POLARSSL_SHA512_C
-
-/**
- * \def POLARSSL_SSL_CACHE_C
- *
- * Enable simple SSL cache implementation.
- *
- * Module:  library/ssl_cache.c
- * Caller:
- *
- * Requires: POLARSSL_SSL_CACHE_C
- */
-#define POLARSSL_SSL_CACHE_C
-
-/**
- * \def POLARSSL_SSL_CLI_C
- *
- * Enable the SSL/TLS client code.
- *
- * Module:  library/ssl_cli.c
- * Caller:
- *
- * Requires: POLARSSL_SSL_TLS_C
- *
- * This module is required for SSL/TLS client support.
- */
-#define POLARSSL_SSL_CLI_C
-
-/**
- * \def POLARSSL_SSL_SRV_C
- *
- * Enable the SSL/TLS server code.
- *
- * Module:  library/ssl_srv.c
- * Caller:
- *
- * Requires: POLARSSL_SSL_TLS_C
- *
- * This module is required for SSL/TLS server support.
- */
-#define POLARSSL_SSL_SRV_C
-
-/**
- * \def POLARSSL_SSL_TLS_C
- *
- * Enable the generic SSL/TLS code.
- *
- * Module:  library/ssl_tls.c
- * Caller:  library/ssl_cli.c
- *          library/ssl_srv.c
- *
- * Requires: POLARSSL_CIPHER_C, POLARSSL_MD_C
- *           and at least one of the POLARSSL_SSL_PROTO_* defines
- *
- * This module is required for SSL/TLS.
- */
-#define POLARSSL_SSL_TLS_C
-
-/**
- * \def POLARSSL_THREADING_C
- *
- * Enable the threading abstraction layer.
- * By default PolarSSL assumes it is used in a non-threaded environment or that
- * contexts are not shared between threads. If you do intend to use contexts
- * between threads, you will need to enable this layer to prevent race
- * conditions.
- *
- * Module:  library/threading.c
- *
- * This allows different threading implementations (self-implemented or
- * provided).
- *
- * You will have to enable either POLARSSL_THREADING_ALT or
- * POLARSSL_THREADING_PTHREAD.
- *
- * Enable this layer to allow use of mutexes within PolarSSL
- */
-//#define POLARSSL_THREADING_C
-
-/**
- * \def POLARSSL_TIMING_C
- *
- * Enable the portable timing interface.
- *
- * Module:  library/timing.c
- * Caller:  library/havege.c
- *
- * This module is used by the HAVEGE random number generator.
- */
-#define POLARSSL_TIMING_C
-
-/**
- * \def POLARSSL_VERSION_C
- *
- * Enable run-time version information.
- *
- * Module:  library/version.c
- *
- * This module provides run-time version information.
- */
-#define POLARSSL_VERSION_C
-
-/**
- * \def POLARSSL_X509_USE_C
- *
- * Enable X.509 core for using certificates.
- *
- * Module:  library/x509.c
- * Caller:  library/x509_crl.c
- *          library/x509_crt.c
- *          library/x509_csr.c
- *
- * Requires: POLARSSL_ASN1_PARSE_C, POLARSSL_BIGNUM_C, POLARSSL_OID_C,
- *           POLARSSL_PK_PARSE_C
- *
- * This module is required for the X.509 parsing modules.
- */
-#define POLARSSL_X509_USE_C
-
-/**
- * \def POLARSSL_X509_CRT_PARSE_C
- *
- * Enable X.509 certificate parsing.
- *
- * Module:  library/x509_crt.c
- * Caller:  library/ssl_cli.c
- *          library/ssl_srv.c
- *          library/ssl_tls.c
- *
- * Requires: POLARSSL_X509_USE_C
- *
- * This module is required for X.509 certificate parsing.
- */
-#define POLARSSL_X509_CRT_PARSE_C
-
-/**
- * \def POLARSSL_X509_CRL_PARSE_C
- *
- * Enable X.509 CRL parsing.
- *
- * Module:  library/x509_crl.c
- * Caller:  library/x509_crt.c
- *
- * Requires: POLARSSL_X509_USE_C
- *
- * This module is required for X.509 CRL parsing.
- */
-#define POLARSSL_X509_CRL_PARSE_C
-
-/**
- * \def POLARSSL_X509_CSR_PARSE_C
- *
- * Enable X.509 Certificate Signing Request (CSR) parsing.
- *
- * Module:  library/x509_csr.c
- * Caller:  library/x509_crt_write.c
- *
- * Requires: POLARSSL_X509_USE_C
- *
- * This module is used for reading X.509 certificate request.
- */
-#define POLARSSL_X509_CSR_PARSE_C
-
-/**
- * \def POLARSSL_X509_CREATE_C
- *
- * Enable X.509 core for creating certificates.
- *
- * Module:  library/x509_create.c
- *
- * Requires: POLARSSL_BIGNUM_C, POLARSSL_OID_C, POLARSSL_PK_WRITE_C
- *
- * This module is the basis for creating X.509 certificates and CSRs.
- */
-#define POLARSSL_X509_CREATE_C
-
-/**
- * \def POLARSSL_X509_CRT_WRITE_C
- *
- * Enable creating X.509 certificates.
- *
- * Module:  library/x509_crt_write.c
- *
- * Requires: POLARSSL_CREATE_C
- *
- * This module is required for X.509 certificate creation.
- */
-#define POLARSSL_X509_CRT_WRITE_C
-
-/**
- * \def POLARSSL_X509_CSR_WRITE_C
- *
- * Enable creating X.509 Certificate Signing Requests (CSR).
- *
- * Module:  library/x509_csr_write.c
- *
- * Requires: POLARSSL_CREATE_C
- *
- * This module is required for X.509 certificate request writing.
- */
-#define POLARSSL_X509_CSR_WRITE_C
-
-/**
- * \def POLARSSL_XTEA_C
- *
- * Enable the XTEA block cipher.
- *
- * Module:  library/xtea.c
- * Caller:
- */
-#define POLARSSL_XTEA_C
-
-/* \} name SECTION: PolarSSL modules */
-
-/**
- * \name SECTION: Module configuration options
- *
- * This section allows for the setting of module specific sizes and
- * configuration options. The default values are already present in the
- * relevant header files and should suffice for the regular use cases.
- *
- * Our advice is to enable options and change their values here
- * only if you have a good reason and know the consequences.
- *
- * Please check the respective header file for documentation on these
- * parameters (to prevent duplicate documentation).
- * \{
- */
-
-/* MPI / BIGNUM options */
-//#define POLARSSL_MPI_WINDOW_SIZE            6 /**< Maximum windows size used. */
-//#define POLARSSL_MPI_MAX_SIZE            1024 /**< Maximum number of bytes for usable MPIs. */
-
-/* CTR_DRBG options */
-//#define CTR_DRBG_ENTROPY_LEN               48 /**< Amount of entropy used per seed by default (48 with SHA-512, 32 with SHA-256) */
-//#define CTR_DRBG_RESEED_INTERVAL        10000 /**< Interval before reseed is performed by default */
-//#define CTR_DRBG_MAX_INPUT                256 /**< Maximum number of additional input bytes */
-//#define CTR_DRBG_MAX_REQUEST             1024 /**< Maximum number of requested bytes per call */
-//#define CTR_DRBG_MAX_SEED_INPUT           384 /**< Maximum size of (re)seed buffer */
-
-/* HMAC_DRBG options */
-//#define POLARSSL_HMAC_DRBG_RESEED_INTERVAL   10000 /**< Interval before reseed is performed by default */
-//#define POLARSSL_HMAC_DRBG_MAX_INPUT           256 /**< Maximum number of additional input bytes */
-//#define POLARSSL_HMAC_DRBG_MAX_REQUEST        1024 /**< Maximum number of requested bytes per call */
-//#define POLARSSL_HMAC_DRBG_MAX_SEED_INPUT      384 /**< Maximum size of (re)seed buffer */
-
-/* ECP options */
-//#define POLARSSL_ECP_MAX_BITS             521 /**< Maximum bit size of groups */
-//#define POLARSSL_ECP_WINDOW_SIZE            6 /**< Maximum window size used */
-//#define POLARSSL_ECP_FIXED_POINT_OPTIM      1 /**< Enable fixed-point speed-up */
-
-/* Entropy options */
-//#define ENTROPY_MAX_SOURCES                20 /**< Maximum number of sources supported */
-//#define ENTROPY_MAX_GATHER                128 /**< Maximum amount requested from entropy sources */
-
-/* Memory buffer allocator options */
-//#define POLARSSL_MEMORY_ALIGN_MULTIPLE      4 /**< Align on multiples of this value */
-
-/* Platform options */
-//#define POLARSSL_PLATFORM_STD_MEM_HDR <stdlib.h> /**< Header to include if POLARSSL_PLATFORM_NO_STD_FUNCTIONS is defined. Don't define if no header is needed. */
-//#define POLARSSL_PLATFORM_STD_MALLOC   malloc /**< Default allocator to use, can be undefined */
-//#define POLARSSL_PLATFORM_STD_FREE       free /**< Default free to use, can be undefined */
-//#define POLARSSL_PLATFORM_STD_PRINTF   printf /**< Default printf to use, can be undefined */
-//#define POLARSSL_PLATFORM_STD_FPRINTF fprintf /**< Default fprintf to use, can be undefined */
-
-/* SSL Cache options */
-//#define SSL_CACHE_DEFAULT_TIMEOUT       86400 /**< 1 day  */
-//#define SSL_CACHE_DEFAULT_MAX_ENTRIES      50 /**< Maximum entries in cache */
-
-/* SSL options */
-//#define SSL_MAX_CONTENT_LEN             16384 /**< Size of the input / output buffer */
-//#define SSL_DEFAULT_TICKET_LIFETIME     86400 /**< Lifetime of session tickets (if enabled) */
-//#define POLARSSL_PSK_MAX_LEN               32 /**< Max size of TLS pre-shared keys, in bytes (default 256 bits) */
-
-/**
- * Complete list of ciphersuites to use, in order of preference.
- *
- * \warning No dependency checking is done on that field! This option can only
- * be used to restrict the set of available ciphersuites. It is your
- * responsibility to make sure the needed modules are active.
- *
- * Use this to save a few hundred bytes of ROM (default ordering of all
- * available ciphersuites) and a few to a few hundred bytes of RAM.
- *
- * The value below is only an example, not the default.
- */
-//#define SSL_CIPHERSUITES TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
-
-/* Debug options */
-//#define POLARSSL_DEBUG_DFL_MODE POLARSSL_DEBUG_LOG_FULL /**< Default log: Full or Raw */
-
-/* \} name SECTION: Module configuration options */
-
-
-#endif /* POLARSSL_CONFIG_H */

From 9bff2ab74f721fb55afc0e9dc4df8517f58a0301 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Wed, 14 Nov 2018 15:06:28 +0100
Subject: [PATCH 0172/1938] CHG: cleaning up

---
 armsrc/Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/armsrc/Makefile b/armsrc/Makefile
index d1895e7fa..a2092ac0b 100644
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -31,7 +31,6 @@ APP_CFLAGS = -DWITH_CRC \
 ### IMPORTANT -  move the commented variable below this line
 #			 -DWITH_LCD \
 #			 -DWITH_EMV \
-#			 -DWITH_FPC \
 #
 # Standalone Mods
 #-------------------------------------------------------

From e4cb74fedb165ea5d24e1b567d88dd3d29d63893 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Wed, 14 Nov 2018 15:07:04 +0100
Subject: [PATCH 0173/1938] chg: i2c comms,  first try to recover i2c hangs.

---
 common/i2c.c | 48 ++++++++++++++++++++++++++++++++++++++++++------
 common/i2c.h |  1 +
 2 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/common/i2c.c b/common/i2c.c
index 794564de3..200c8cf27 100644
--- a/common/i2c.c
+++ b/common/i2c.c
@@ -10,7 +10,6 @@
 //-----------------------------------------------------------------------------
 #include "i2c.h"
 
-//	������������
 #define	GPIO_RST	AT91C_PIO_PA1
 #define GPIO_SCL	AT91C_PIO_PA5
 #define GPIO_SDA	AT91C_PIO_PA7
@@ -41,13 +40,41 @@ void __attribute__((optimize("O0"))) I2CSpinDelayClk(uint16_t delay) {
 
 #define  ISO7618_MAX_FRAME 255
 
+// try i2c bus recovery at 100kHz = 5uS high, 5uS low
+void I2C_recovery(void) {
+	
+	DbpString("Performing i2c bus recovery");	
+			
+	// reset I2C
+	SDA_H; SCL_H;
+	
+	 //9nth cycle acts as NACK
+	for (int i = 0; i < 10; i++)  {
+		SCL_H; WaitUS(5);
+		SCL_L; WaitUS(5);
+	}
+	
+    //a STOP signal (SDA from low to high while CLK is high)	
+	SDA_L; WaitUS(5);
+	SCL_H; WaitUS(2);
+	SDA_H; WaitUS(2);
+	
+	bool isok = (SCL_read && SDA_read); 
+    if (!SDA_read)
+		DbpString("I2C bus recovery  error: SDA still LOW");
+	if (!SCL_read)
+		DbpString("I2C bus recovery  error: SCL still LOW");
+	if (isok)
+		DbpString("I2C bus recovery complete");
+}
+
 void I2C_init(void) {
 	// Configure reset pin, close up pull up, push-pull output, default high
 	AT91C_BASE_PIOA->PIO_PPUDR = GPIO_RST;
 	AT91C_BASE_PIOA->PIO_MDDR = GPIO_RST;
   
 	// Configure I2C pin, open up, open leakage
-	AT91C_BASE_PIOA->PIO_PPUER |= (GPIO_SCL | GPIO_SDA);	// ������  Open up the pull up
+	AT91C_BASE_PIOA->PIO_PPUER |= (GPIO_SCL | GPIO_SDA);
 	AT91C_BASE_PIOA->PIO_MDER |= (GPIO_SCL | GPIO_SDA);
 
 	// default three lines all pull up
@@ -55,6 +82,12 @@ void I2C_init(void) {
 
 	AT91C_BASE_PIOA->PIO_OER |= (GPIO_SCL | GPIO_SDA | GPIO_RST);
 	AT91C_BASE_PIOA->PIO_PER |= (GPIO_SCL | GPIO_SDA | GPIO_RST);
+	
+	
+	bool isok =  (SCL_read && SDA_read); 
+	if ( !isok )
+		I2C_recovery();
+	
 }
 
 // set the reset state
@@ -78,6 +111,8 @@ void I2C_SetResetStatus(uint8_t LineRST, uint8_t LineSCK, uint8_t LineSDA) {
 // Reset the SIM_Adapter, then  enter the main program
 // Note: the SIM_Adapter will not enter the main program after power up. Please run this function before use SIM_Adapter.
 void I2C_Reset_EnterMainProgram(void) {
+	I2C_init();
+	
 	I2C_SetResetStatus(0, 0, 0);
 	SpinDelay(30);
 	I2C_SetResetStatus(1, 0, 0);
@@ -157,7 +192,7 @@ bool I2C_Start(void) {
 }
 
 bool I2C_WaitForSim() {
-	// variable delay here.
+
 	if (!WaitSCL_L_300ms())
 		return false;
 
@@ -631,6 +666,7 @@ void SmartCardAtr(void) {
 	LED_D_ON();
 	clear_trace();
 	set_tracing(true);
+	I2C_init();
 	I2C_Reset_EnterMainProgram();
 	bool isOK = GetATR( &card );
 	cmd_send(CMD_ACK, isOK, sizeof(smart_card_atr_t), 0, &card, sizeof(smart_card_atr_t));
@@ -650,12 +686,12 @@ void SmartCardRaw( uint64_t arg0, uint64_t arg1, uint8_t *data ) {
 		clear_trace();
 
 	set_tracing(true);
-
-	if ((flags & SC_CONNECT)) {	
 	
+	if ((flags & SC_CONNECT)) {	
+
 		I2C_Reset_EnterMainProgram();
 		
-		if ( !(flags & SC_NO_SELECT) ) {
+		if ((flags & SC_SELECT)) {
 			smart_card_atr_t card;
 			bool gotATR = GetATR( &card );
 			//cmd_send(CMD_ACK, gotATR, sizeof(smart_card_atr_t), 0, &card, sizeof(smart_card_atr_t));
diff --git a/common/i2c.h b/common/i2c.h
index e6350ecfd..8350029bd 100644
--- a/common/i2c.h
+++ b/common/i2c.h
@@ -19,6 +19,7 @@
 #define I2C_DEVICE_CMD_GETVERSION	0x06
 
 
+void I2C_recovery(void);
 void I2C_init(void);
 void I2C_Reset(void);
 void I2C_SetResetStatus(uint8_t LineRST, uint8_t LineSCK, uint8_t LineSDA);

From 526f50aa9d42220ced64752d0aa98a0b0c3b1f50 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Wed, 14 Nov 2018 15:11:30 +0100
Subject: [PATCH 0174/1938] fix: 'hf iclass loclass' - remove warning on
 gcc4.9.2 mingw. don't like the declaration.   mbedtls_des_context ctx_dec =
 {0}; chg: 'hf iclass loclass t' - added some path tests for key file.

---
 client/loclass/cipher.c      | 12 +++-----
 client/loclass/cipherutils.c | 35 +++++++++------------
 client/loclass/elite_crack.c | 18 +++++------
 client/loclass/ikeys.c       | 59 ++++++++++++++++++++----------------
 4 files changed, 60 insertions(+), 64 deletions(-)

diff --git a/client/loclass/cipher.c b/client/loclass/cipher.c
index 942abd437..af11ce4cc 100644
--- a/client/loclass/cipher.c
+++ b/client/loclass/cipher.c
@@ -275,18 +275,14 @@ int testMAC()
 	uint8_t calculated_mac[4] = {0};
 	doMAC(cc_nr,div_key, calculated_mac);
 
-	if(memcmp(calculated_mac, correct_MAC,4) == 0)
-	{
+	if (memcmp(calculated_mac, correct_MAC,4) == 0) {
 		PrintAndLogDevice(SUCCESS, "MAC calculation OK!");
-
-	}else
-	{
+	} else {
 		PrintAndLogDevice(FAILED, "FAILED: MAC calculation failed:");
 		printarr("    Calculated_MAC", calculated_mac, 4);
 		printarr("    Correct_MAC   ", correct_MAC, 4);
-	return 1;
-}
-
+		return 1;
+	}
 	return 0;
 }
 #endif
diff --git a/client/loclass/cipherutils.c b/client/loclass/cipherutils.c
index a6f7e92d1..e22c88894 100644
--- a/client/loclass/cipherutils.c
+++ b/client/loclass/cipherutils.c
@@ -205,19 +205,17 @@ int testBitStream()
 	uint8_t input [] = {0xDE,0xAD,0xBE,0xEF,0xDE,0xAD,0xBE,0xEF};
 	uint8_t output [] = {0,0,0,0,0,0,0,0};
 	BitstreamIn in = { input, sizeof(input) * 8,0};
-	BitstreamOut out ={ output, 0,0}
+	BitstreamOut out = { output, 0,0}
 					  ;
-	while(bitsLeft(&in) > 0)
-	{
+	while (bitsLeft(&in) > 0) {
 		pushBit(&out, headBit(&in));
 		//printf("Bits left: %d\n", bitsLeft(&in));
 		//printf("Bits out: %d\n", numBits(&out));
 	}
-	if(memcmp(input, output, sizeof(input)) == 0)
-	{
+	
+	if(memcmp(input, output, sizeof(input)) == 0) {
 		PrintAndLogDevice(SUCCESS, "    Bitstream test 1 ok");
-	}else
-	{
+	} else {
 		PrintAndLogDevice(FAILED, "    Bitstream test 1 failed");
 		uint8_t i;
 		for(i = 0 ; i < sizeof(input) ; i++)
@@ -235,27 +233,24 @@ int testReversedBitstream()
 	uint8_t reverse [] = {0,0,0,0,0,0,0,0};
 	uint8_t output [] = {0,0,0,0,0,0,0,0};
 	BitstreamIn in = { input, sizeof(input) * 8,0};
-	BitstreamOut out ={ output, 0,0};
-	BitstreamIn reversed_in ={ reverse, sizeof(input)*8,0};
-	BitstreamOut reversed_out ={ reverse,0 ,0};
+	BitstreamOut out = { output, 0,0};
+	BitstreamIn reversed_in = { reverse, sizeof(input)*8,0};
+	BitstreamOut reversed_out = { reverse,0 ,0};
 
-	while(bitsLeft(&in) > 0)
-	{
+	while (bitsLeft(&in) > 0) {
 		pushBit(&reversed_out, tailBit(&in));
 	}
-	while(bitsLeft(&reversed_in) > 0)
-	{
+	
+	while (bitsLeft(&reversed_in) > 0) {
 		pushBit(&out, tailBit(&reversed_in));
 	}
-	if(memcmp(input, output, sizeof(input)) == 0)
-	{
+	
+	if (memcmp(input, output, sizeof(input)) == 0) {
 		PrintAndLogDevice(SUCCESS, "    Bitstream test 2 ok");
-	}else
-	{
+	} else {
 		PrintAndLogDevice(FAILED, "    Bitstream test 2 failed");
 		uint8_t i;
-		for(i = 0 ; i < sizeof(input) ; i++)
-		{
+		for (i = 0 ; i < sizeof(input) ; i++) {
 			PrintAndLogDevice(NORMAL, "    IN %02x, MIDDLE: %02x, OUT %02x", input[i],reverse[i], output[i]);
 		}
 		return 1;
diff --git a/client/loclass/elite_crack.c b/client/loclass/elite_crack.c
index 068fdf59f..2002e348f 100644
--- a/client/loclass/elite_crack.c
+++ b/client/loclass/elite_crack.c
@@ -108,7 +108,7 @@ void permutekey_rev(uint8_t key[8], uint8_t dest[8]) {
  * @param val
  * @return
  */
-uint8_t rr(uint8_t val) {
+inline uint8_t rr(uint8_t val) {
 	return val >> 1 | (( val & 1) << 7);
 }
 
@@ -118,7 +118,7 @@ uint8_t rr(uint8_t val) {
  * @param val
  * @return
  */
-uint8_t rl(uint8_t val) {
+inline uint8_t rl(uint8_t val) {
   return val << 1 | (( val & 0x80) >> 7);
 }
 
@@ -128,7 +128,7 @@ uint8_t rl(uint8_t val) {
  * @param val
  * @return
  */
-uint8_t swap(uint8_t val) {
+inline uint8_t swap(uint8_t val) {
 	return ((val >> 4) & 0xFF) | ((val &0xFF) << 4);
 }
 
@@ -172,8 +172,8 @@ void rk(uint8_t *key, uint8_t n, uint8_t *outp_key) {
     return;
 }
 
-static mbedtls_des_context ctx_enc = {0};
-static mbedtls_des_context ctx_dec = {0};
+static mbedtls_des_context ctx_enc;
+static mbedtls_des_context ctx_dec;
 
 void desdecrypt_iclass(uint8_t *iclass_key, uint8_t *input, uint8_t *output) {
     uint8_t key_std_format[8] = {0};
@@ -431,7 +431,7 @@ int bruteforceItem(dumpdata item, uint16_t keytable[]) {
  * @return 0 for ok, 1 for failz
  */
 int calculateMasterKey(uint8_t first16bytes[], uint64_t master_key[] ){
-	mbedtls_des_context ctx_e = {0};
+	mbedtls_des_context ctx_e;
 
 	uint8_t z_0[8] = {0};
 	uint8_t y_0[8] = {0};
@@ -441,8 +441,8 @@ int calculateMasterKey(uint8_t first16bytes[], uint64_t master_key[] ){
 	uint8_t result[8] = {0};
 
 	// y_0 and z_0 are the first 16 bytes of the keytable
-	memcpy(y_0,first16bytes,8);
-	memcpy(z_0,first16bytes+8,8);
+	memcpy(y_0, first16bytes,8);
+	memcpy(z_0, first16bytes+8,8);
 
 	// Our DES-implementation uses the standard NIST
 	// format for keys, thus must translate from iclass
@@ -672,8 +672,6 @@ int testElite() {
 60  3F 88 6F B8 6C 2C 93 0D 69 2C D5 20 3C C1 61 95
 70  43 08 A0 2F FE B3 26 D7 98 0B 34 7B 47 70 A0 AB
 
-
-
 **** The 64-bit HS Custom Key Value = 5B7C62C491C11B39 ****
      */
     uint8_t keytable[128] = {0};
diff --git a/client/loclass/ikeys.c b/client/loclass/ikeys.c
index 6a68d80b1..aefbbaf99 100644
--- a/client/loclass/ikeys.c
+++ b/client/loclass/ikeys.c
@@ -69,8 +69,8 @@ From "Dismantling iclass":
 
 uint8_t pi[35] = {0x0F,0x17,0x1B,0x1D,0x1E,0x27,0x2B,0x2D,0x2E,0x33,0x35,0x39,0x36,0x3A,0x3C,0x47,0x4B,0x4D,0x4E,0x53,0x55,0x56,0x59,0x5A,0x5C,0x63,0x65,0x66,0x69,0x6A,0x6C,0x71,0x72,0x74,0x78};
 
-static mbedtls_des_context ctx_enc = {0};
-static mbedtls_des_context ctx_dec = {0};
+static mbedtls_des_context ctx_enc;
+static mbedtls_des_context ctx_dec;
 
 static int debug_print = 0;
 
@@ -442,11 +442,10 @@ int testDES(Testcase testcase, mbedtls_des_context ctx_enc, mbedtls_des_context
 	uint8_t des_encrypted_csn[8] = {0};
 	uint8_t decrypted[8] = {0};
 	uint8_t div_key[8] = {0};
-	int retval = mbedtls_des_crypt_ecb(&ctx_enc,testcase.uid,des_encrypted_csn);
-	retval |= mbedtls_des_crypt_ecb(&ctx_dec,des_encrypted_csn,decrypted);
+	int retval = mbedtls_des_crypt_ecb(&ctx_enc, testcase.uid, des_encrypted_csn);
+	retval |= mbedtls_des_crypt_ecb(&ctx_dec, des_encrypted_csn, decrypted);
 
-	if(memcmp(testcase.uid,decrypted,8) != 0)
-	{
+	if (memcmp(testcase.uid, decrypted, 8) != 0) {
 		//Decryption fail
 		PrintAndLogDevice(FAILED, "Encryption <-> Decryption FAIL");
 		printarr("Input", testcase.uid, 8);
@@ -454,8 +453,7 @@ int testDES(Testcase testcase, mbedtls_des_context ctx_enc, mbedtls_des_context
 		retval = 1;
 	}
 
-	if(memcmp(des_encrypted_csn,testcase.t_key,8) != 0)
-	{
+	if (memcmp(des_encrypted_csn, testcase.t_key, 8) != 0) {
 		//Encryption fail
 		PrintAndLogDevice(FAILED, "Encryption != Expected result");
 		printarr("Output", des_encrypted_csn, 8);
@@ -465,8 +463,7 @@ int testDES(Testcase testcase, mbedtls_des_context ctx_enc, mbedtls_des_context
     uint64_t crypted_csn = x_bytes_to_num(des_encrypted_csn,8);
 	hash0(crypted_csn, div_key);
 
-	if(memcmp(div_key, testcase.div_key ,8) != 0)
-	{
+	if (memcmp(div_key, testcase.div_key, 8) != 0) {
 		//Key diversification fail
 		PrintAndLogDevice(FAILED, "Div key != expected result");
 		printarr("  csn   ", testcase.uid,8);
@@ -575,13 +572,12 @@ Testcase testcases[] ={
 };
 
 int testKeyDiversificationWithMasterkeyTestcases() {
-	int error = 0;
-	int i;
-	uint8_t empty[8]={0};
+	int i, error = 0;
+	uint8_t empty[8] = {0};
 
 	PrintAndLogDevice(INFO, "Testing encryption/decryption");
 
-	for (i = 0;  memcmp(testcases+i, empty, 8); i++)
+	for (i = 0; memcmp(testcases+i, empty, 8); i++)
 		error += testDES(testcases[i], ctx_enc, ctx_dec);
 
 	if (error)
@@ -592,26 +588,26 @@ int testKeyDiversificationWithMasterkeyTestcases() {
 }
 
 void print64bits(char*name, uint64_t val) {
-	printf("%s%08x%08x\n",name,(uint32_t) (val >> 32) ,(uint32_t) (val & 0xFFFFFFFF));
+	printf("%s%08x%08x\n", name, (uint32_t) (val >> 32) ,(uint32_t) (val & 0xFFFFFFFF));
 }
 
 uint64_t testCryptedCSN(uint64_t crypted_csn, uint64_t expected)
 {
 	int retval = 0;
 	uint8_t result[8] = {0};
-	if(debug_print) PrintAndLogDevice(DEBUG, "debug_print %d", debug_print);
-	if(debug_print) print64bits("    {csn}      ", crypted_csn );
+	if (debug_print) PrintAndLogDevice(DEBUG, "debug_print %d", debug_print);
+	if (debug_print) print64bits("    {csn}      ", crypted_csn );
 
 	uint64_t crypted_csn_swapped = swapZvalues(crypted_csn);
 
-	if(debug_print) print64bits("    {csn-revz} ", crypted_csn_swapped);
+	if (debug_print) print64bits("    {csn-revz} ", crypted_csn_swapped);
 
 	hash0(crypted_csn, result);
     uint64_t resultbyte = x_bytes_to_num(result,8 );
-	if(debug_print) print64bits("    hash0      " , resultbyte );
+	if (debug_print) print64bits("    hash0      " , resultbyte );
 
-	if(resultbyte != expected ) {
-		if(debug_print) {
+	if (resultbyte != expected ) {
+		if (debug_print) {
 			PrintAndLogDevice(NORMAL, "\n"); PrintAndLogDevice(FAILED, "FAIL!");
 			print64bits("    expected       " ,  expected );
 		}
@@ -627,9 +623,9 @@ int testDES2(uint64_t csn, uint64_t expected) {
 	uint8_t input[8] = {0};
 
 	print64bits("   csn ", csn);
-    x_num_to_bytes(csn, 8,input);
+    x_num_to_bytes(csn, 8, input);
 
-	mbedtls_des_crypt_ecb(&ctx_enc,input, result);
+	mbedtls_des_crypt_ecb(&ctx_enc, input, result);
 
     uint64_t crypt_csn = x_bytes_to_num(result, 8);
 	print64bits("   {csn}    ", crypt_csn );
@@ -678,10 +674,21 @@ int doTestsWithKnownInputs() {
 
 static bool readKeyFile(uint8_t key[8]) {
 	bool retval = false;
-	FILE *f = fopen("iclass_key.bin", "rb");
+	
+	//Test a few variants
+	char filename[30];
+	if (fileExists("iclass_key.bin")){
+		sprintf(filename, "%s.bin", "iclass_key");
+	} else if (fileExists("loclass/iclass_key.bin")){
+		sprintf(filename, "%s.bin", "loclass/iclass_key");
+	} else if (fileExists("client/loclass/iclass_key.bin")){
+		sprintf(filename, "%s.bin", "client/loclass/iclass_key");
+	}
+	
+	FILE *f = fopen(filename, "rb");
 	if (!f)
 		return retval;
-	
+		
 	size_t bytes_read = fread(key, sizeof(uint8_t), 8, f);
 	if ( bytes_read == 8)
 		retval = true;	
@@ -696,7 +703,7 @@ int doKeyTests(uint8_t debuglevel) {
 
 	PrintAndLogDevice(INFO, "Checking if the master key is present (iclass_key.bin)...");
 	uint8_t key[8] = {0};
-	if (readKeyFile(key)) {
+	if (!readKeyFile(key)) {
 		PrintAndLogDevice(FAILED, "Master key not present, will not be able to do all testcases");
 	} else {
 

From 25292eab2eb75da5cad581a96739ca77af7e719e Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Wed, 14 Nov 2018 15:13:17 +0100
Subject: [PATCH 0175/1938] fix:  more warnings.

---
 client/cmdhficlass.c |  4 ++--
 client/cmdhfmfu.c    | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index 0c9d67d6e..368aaad2e 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -766,7 +766,7 @@ int CmdHFiClassDecrypt(const char *Cmd) {
 			 hdr->csn[4],hdr->csn[5],hdr->csn[6],hdr->csn[7]);
 
 	// tripledes
-	mbedtls_des3_context ctx = { 0 };
+	mbedtls_des3_context ctx;
 	mbedtls_des3_set2key_dec( &ctx, key);
 
 	uint8_t enc_dump[8] = {0};
@@ -797,7 +797,7 @@ static int iClassEncryptBlkData(uint8_t *blkData) {
 	PrintAndLogEx(SUCCESS, "decryption file found");
 	uint8_t encryptedData[16];
 	uint8_t *encrypted = encryptedData;
-	mbedtls_des3_context ctx = { 0 };
+	mbedtls_des3_context ctx;
 	mbedtls_des3_set2key_enc( &ctx, key);
 	
 	mbedtls_des3_crypt_ecb(&ctx, blkData,encrypted);
diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index 72c4be573..327069971 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -2392,10 +2392,10 @@ int CmdHF14AMfucSetUid(const char *Cmd){
 int CmdHF14AMfuGenDiverseKeys(const char *Cmd){
 
 	uint8_t uid[4];	
-	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) == 0  || cmdp == 'h' || cmdp == 'H') return usage_hf_mfu_gendiverse();
+	char cmdp = tolower(param_getchar(Cmd, 0));
+	if (strlen(Cmd) == 0  || cmdp == 'h') return usage_hf_mfu_gendiverse();
 
-	if ( cmdp == 'r' || cmdp == 'R') {
+	if ( cmdp == 'r' ) {
 			// read uid from tag
 		UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0}};
 		clearCommandBuffer();
@@ -2441,7 +2441,7 @@ int CmdHF14AMfuGenDiverseKeys(const char *Cmd){
 	mix[6] = block ^ uid[2];
 	mix[7] = uid[3];
 	
-	mbedtls_des3_context ctx = { 0x00 };
+	mbedtls_des3_context ctx;
 	mbedtls_des3_set2key_enc(&ctx, masterkey);
 
 	mbedtls_des3_crypt_cbc(&ctx  // des3_context
@@ -2501,11 +2501,11 @@ int CmdHF14AMfuGenDiverseKeys(const char *Cmd){
 int CmdHF14AMfuPwdGen(const char *Cmd){
 	
 	uint8_t uid[7] = {0x00};	
-	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) == 0  || cmdp == 'h' || cmdp == 'H') return usage_hf_mfu_pwdgen();
-	if (cmdp == 't' || cmdp == 'T') return 	ul_ev1_pwdgen_selftest();
+	char cmdp = tolower(param_getchar(Cmd, 0));
+	if (strlen(Cmd) == 0  || cmdp == 'h') return usage_hf_mfu_pwdgen();
+	if (cmdp == 't') return ul_ev1_pwdgen_selftest();
 	
-	if ( cmdp == 'r' || cmdp == 'R') {
+	if ( cmdp == 'r') {
 			// read uid from tag
 		UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0}};
 		clearCommandBuffer();

From 3e53c3a5e7d7e70332843321782e248e491f21ba Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Wed, 14 Nov 2018 15:14:05 +0100
Subject: [PATCH 0176/1938] chg: some more default keys in the general list.

---
 client/mifaredefault.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/client/mifaredefault.h b/client/mifaredefault.h
index 78713262c..400463eaf 100644
--- a/client/mifaredefault.h
+++ b/client/mifaredefault.h
@@ -36,7 +36,10 @@ static const uint64_t g_mifare_default_keys[] =
 	0x587ee5f9350f,
 	0xa0478cc39091,
 	0x533cb6c723f6,
-	0x8fd0a4f256e9
+	0x8fd0a4f256e9,
+	0x0000014b5c31,
+	0xb578f38a5c61,
+	0x96a301bce267
 };
 
 #endif

From 64df44d186a65d03b6f2fa427187356fb7fd2442 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Wed, 14 Nov 2018 15:14:31 +0100
Subject: [PATCH 0177/1938] cleaning

---
 client/cmdlft55xx.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index bf73d6ff5..ed8c0464e 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1517,13 +1517,13 @@ int CmdT55xxBruteForce(const char *Cmd) {
 
 	memset(line, 0, sizeof(line));
 	
-    char cmdp = param_getchar(Cmd, 0);
-	if (cmdp == 'h' || cmdp == 'H') return usage_t55xx_bruteforce();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+	if (cmdp == 'h') return usage_t55xx_bruteforce();
 
 	keyBlock = calloc(stKeyBlock, 4);
 	if (keyBlock == NULL) return 1;
 
-	if (cmdp == 'i' || cmdp == 'I') {
+	if (cmdp == 'i') {
 	
 		int len = strlen(Cmd+2);
 		if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
@@ -1786,7 +1786,7 @@ bool tryDetectP1(bool getData) {
 
 	// try ask clock detect.  it could be another type even if successful.
 	clk = GetAskClock("", false);
-	if (clk>0) {
+	if (clk > 0) {
 		if ( ASKDemod_ext("0 0 1", false, false, 1, &st) &&
 			  preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) && 
 			  (DemodBufferLen == 32 || DemodBufferLen == 64) ) {

From cc6cd93ea746d3c2ea6cb56f1a8d6c5c51539a72 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 14 Nov 2018 18:11:05 +0200
Subject: [PATCH 0178/1938] save raw

---
 client/loclass/fileutils.c | 35 +++++++++++++++++++++++++++++++++--
 client/loclass/fileutils.h |  1 +
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index 44bab0193..ac3660935 100644
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -136,8 +136,39 @@ out:
 }
 
 int saveFileJSON(const char *preferredName, const char *suffix, uint8_t* data, size_t datalen) {
-	//stub - for merlokk ;)
-	return 1;
+	if ( preferredName == NULL ) return 1;
+	if ( suffix == NULL ) return 1;
+	if ( data == NULL ) return 1;
+
+	int retval = 0;
+	int size = sizeof(char) * (strlen(preferredName) + strlen(suffix) + 10);
+	char * fileName = calloc(size, sizeof(char));
+	int num = 1;
+	sprintf(fileName,"%s.%s", preferredName, suffix);
+	while (fileExists(fileName)) {
+		sprintf(fileName,"%s-%d.%s", preferredName, num, suffix);
+		num++;
+	}
+
+	json_t *root = json_object();
+	JsonSaveStr(root, "Created", "proxmark3");
+	JsonSaveBufAsHexCompact(root, "raw", data, datalen);
+
+	int res = json_dump_file(root, fileName, JSON_INDENT(2));
+	if (res) {
+		PrintAndLog("ERROR: can't save the file: %s", fileName);
+		json_decref(root);
+		retval = 200;
+		goto out;
+	}
+	PrintAndLog("File `%s` saved.", fileName);
+	
+	// free json object
+	json_decref(root);
+
+out:	
+	free(fileName);
+	return retval;
 }
 
 int loadFile(const char *preferredName, const char *suffix, void* data, size_t* datalen) {
diff --git a/client/loclass/fileutils.h b/client/loclass/fileutils.h
index 40bd7cfeb..0893e01ea 100644
--- a/client/loclass/fileutils.h
+++ b/client/loclass/fileutils.h
@@ -47,6 +47,7 @@
 #include <sys/stat.h>
 #include <stdarg.h>
 #include "../ui.h"
+#include "../emv/emvjson.h"
 
 int fileExists(const char *filename);
 

From 5e3fa42c2315cdd811220d97c31c2e19392073a0 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 14 Nov 2018 18:44:17 +0200
Subject: [PATCH 0179/1938] add der print sketch

---
 client/cmdhffido.c        | 3 +++
 client/crypto/asn1utils.c | 2 +-
 client/crypto/asn1utils.h | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index ffd277bd2..6440554f0 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -340,6 +340,9 @@ int CmdHFFidoRegister(const char *cmd) {
 	uint8_t public_key[65] = {0};
 	
 	// TODO: print DER certificate in DER view
+	PrintAndLog("----------------DER TLV-----------------");
+	asn1_print(&buf[67 + keyHandleLen], derLen, "  ");
+	PrintAndLog("----------------DER TLV-----------------");
 	
 	// load CA's
 	mbedtls_x509_crt cacert;
diff --git a/client/crypto/asn1utils.c b/client/crypto/asn1utils.c
index 2a3fe698b..78677765d 100644
--- a/client/crypto/asn1utils.c
+++ b/client/crypto/asn1utils.c
@@ -55,7 +55,7 @@ exit:
 	return res;
 }
 
-int asn1_print(uint8_t *asn1buf, int level) {
+int asn1_print(uint8_t *asn1buf, size_t asn1buflen, char *indent) {
 	
 	return 0;
 }
diff --git a/client/crypto/asn1utils.h b/client/crypto/asn1utils.h
index 2b00f4501..19f8ded70 100644
--- a/client/crypto/asn1utils.h
+++ b/client/crypto/asn1utils.h
@@ -15,7 +15,7 @@
 #include <stdbool.h>
 #include <stddef.h>
 
-extern int asn1_print(uint8_t *asn1buf, int level);
+extern int asn1_print(uint8_t *asn1buf, size_t asn1buflen, char *indent);
 extern int ecdsa_asn1_get_signature(uint8_t *signature, size_t signaturelen, uint8_t *rval, uint8_t *sval);
 
 #endif /* asn1utils.h */

From 46769838f258ab715ab0520912d50ca6f44e1539 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 14 Nov 2018 19:26:19 +0200
Subject: [PATCH 0180/1938] fix tlv.c

---
 client/emv/tlv.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/client/emv/tlv.c b/client/emv/tlv.c
index 540c33e4c..35bdb5d4c 100644
--- a/client/emv/tlv.c
+++ b/client/emv/tlv.c
@@ -92,16 +92,15 @@ static size_t tlv_parse_len(const unsigned char **buf, size_t *len)
 		return l;
 
 	size_t ll = l &~ TLV_LEN_LONG;
-	if (*len < ll)
+	if (ll > 5)
 		return TLV_LEN_INVALID;
 
-	/* FIXME */
-	if (ll != 1)
-		return TLV_LEN_INVALID;
-
-	l = **buf;
-	--*len;
-	++*buf;
+	l = 0;
+	for (int i = 1; i <= ll; i++) {
+		l = (l << 8) + **buf;
+		--*len;
+		++*buf;
+	}
 
 	return l;
 }

From 5eb3181263164035cfaf81050742e43e3a115fed Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 14 Nov 2018 20:44:32 +0200
Subject: [PATCH 0181/1938] added ASN.1 decoder

---
 client/cmdhffido.c        |   6 +-
 client/crypto/asn1utils.c | 190 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 193 insertions(+), 3 deletions(-)

diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index 6440554f0..5151709af 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -328,7 +328,7 @@ int CmdHFFidoRegister(const char *cmd) {
 	int derLen = (buf[derp + 2] << 8) + buf[derp + 3] + 4;
 	if (verbose2) {
 		PrintAndLog("DER certificate[%d]:\n------------------DER-------------------", derLen);
-		dump_buffer_simple((const unsigned char *)&buf[67 + keyHandleLen], derLen, NULL);
+		dump_buffer_simple((const unsigned char *)&buf[derp], derLen, NULL);
 		PrintAndLog("\n----------------DER---------------------");
 	} else {
 		if (verbose)
@@ -341,7 +341,7 @@ int CmdHFFidoRegister(const char *cmd) {
 	
 	// TODO: print DER certificate in DER view
 	PrintAndLog("----------------DER TLV-----------------");
-	asn1_print(&buf[67 + keyHandleLen], derLen, "  ");
+	asn1_print(&buf[derp], derLen, "  ");
 	PrintAndLog("----------------DER TLV-----------------");
 	
 	// load CA's
@@ -357,7 +357,7 @@ int CmdHFFidoRegister(const char *cmd) {
 	// load DER certificate from authenticator's data
 	mbedtls_x509_crt cert;
 	mbedtls_x509_crt_init(&cert);
-	res = mbedtls_x509_crt_parse_der(&cert, &buf[67 + keyHandleLen], derLen);
+	res = mbedtls_x509_crt_parse_der(&cert, &buf[derp], derLen);
 	if (res) {
 		PrintAndLog("ERROR: DER parse returned 0x%x - %s", (res<0)?-res:res, ecdsa_get_error(res));
 	}
diff --git a/client/crypto/asn1utils.c b/client/crypto/asn1utils.c
index 78677765d..5f66ed022 100644
--- a/client/crypto/asn1utils.c
+++ b/client/crypto/asn1utils.c
@@ -10,6 +10,11 @@
 
 #include "asn1utils.h"
 #include <mbedtls/asn1.h>
+#include <mbedtls/oid.h>
+#include "util.h"
+#include "emv/tlv.h"
+#include "emv/emv_tags.h"
+#include "emv/dump.h"
 
 int ecdsa_asn1_get_signature(uint8_t *signature, size_t signaturelen, uint8_t *rval, uint8_t *sval) {
 	if (!signature || !signaturelen || !rval || !sval)
@@ -55,8 +60,193 @@ exit:
 	return res;
 }
 
+#define PRINT_INDENT(level) 	{for (int i = 0; i < (level); i++) fprintf(f, "   ");}
+
+enum asn1_tag_t {
+	ASN1_TAG_GENERIC,
+	ASN1_TAG_BOOLEAN,
+	ASN1_TAG_INTEGER,
+	ASN1_TAG_STRING,
+	ASN1_TAG_UTC_TIME,
+	ASN1_TAG_OBJECT_ID,
+};
+
+struct asn1_tag {
+	tlv_tag_t tag;
+	char *name;
+	enum asn1_tag_t type;
+	const void *data;
+};
+
+static const struct asn1_tag asn1_tags[] = {
+	// internal
+	{ 0x00  , "Unknown ???" },
+
+	// ASN.1
+	{ 0x01, "BOOLEAN", ASN1_TAG_BOOLEAN },
+	{ 0x02, "INTEGER", ASN1_TAG_INTEGER },
+	{ 0x03, "BIT STRING" },
+	{ 0x04, "OCTET STRING" },
+	{ 0x05, "NULL" },
+	{ 0x06, "OBJECT IDENTIFIER", ASN1_TAG_OBJECT_ID },
+	{ 0x0C, "UTF8String", ASN1_TAG_STRING },
+	{ 0x10, "SEQUENCE" },
+	{ 0x11, "SET" },
+	{ 0x13, "PrintableString", ASN1_TAG_STRING },
+	{ 0x14, "T61String", ASN1_TAG_STRING },
+	{ 0x16, "IA5String", ASN1_TAG_STRING },
+	{ 0x17, "UTCTime", ASN1_TAG_UTC_TIME },
+	{ 0x18, "GeneralizedTime", ASN1_TAG_UTC_TIME },
+	{ 0x30, "SEQUENCE" },
+	{ 0x31, "SET" },
+	{ 0xa0, "[0]" },
+	{ 0xa1, "[1]" },
+	{ 0xa2, "[2]" },
+	{ 0xa3, "[3]" },
+	{ 0xa4, "[4]" },
+	{ 0xa5, "[5]" },
+};
+
+static int asn1_sort_tag(tlv_tag_t tag) {
+	return (int)(tag >= 0x100 ? tag : tag << 8);
+}
+
+static int asn1_tlv_compare(const void *a, const void *b) {
+	const struct tlv *tlv = a;
+	const struct asn1_tag *tag = b;
+
+	return asn1_sort_tag(tlv->tag) - (asn1_sort_tag(tag->tag));
+}
+
+static const struct asn1_tag *asn1_get_tag(const struct tlv *tlv) {
+	struct asn1_tag *tag = bsearch(tlv, asn1_tags, sizeof(asn1_tags) / sizeof(asn1_tags[0]),
+			sizeof(asn1_tags[0]), asn1_tlv_compare);
+
+	return tag ? tag : &asn1_tags[0];
+}
+
+static void asn1_tag_dump_string(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level){
+	fprintf(f, "\tvalue: '");
+	fwrite(tlv->value, 1, tlv->len, f);
+	fprintf(f, "'\n");
+}
+
+static unsigned long asn1_value_integer(const struct tlv *tlv, unsigned start, unsigned end) {
+	unsigned long ret = 0;
+	int i;
+
+	if (end > tlv->len * 2)
+		return ret;
+	if (start >= end)
+		return ret;
+
+	if (start & 1) {
+		ret += tlv->value[start/2] & 0xf;
+		i = start + 1;
+	} else
+		i = start;
+
+	for (; i < end - 1; i += 2) {
+		ret *= 10;
+		ret += tlv->value[i/2] >> 4;
+		ret *= 10;
+		ret += tlv->value[i/2] & 0xf;
+	}
+
+	if (end & 1) {
+		ret *= 10;
+		ret += tlv->value[end/2] >> 4;
+	}
+
+	return ret;
+}
+
+static void asn1_tag_dump_boolean(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level) {
+	PRINT_INDENT(level);
+	if (tlv->len > 0) {
+		fprintf(f, "\tvalue: %s\n", tlv->value[0]?"true":"false");
+	} else {
+		fprintf(f, "n/a\n");
+	}
+}
+
+static void asn1_tag_dump_integer(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level) {
+	PRINT_INDENT(level);
+	fprintf(f, "\tvalue: %lu\n", asn1_value_integer(tlv, 0, tlv->len * 2));
+}
+
+static void asn1_tag_dump_object_id(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level) {
+	PRINT_INDENT(level);
+	mbedtls_asn1_buf asn1_buf;
+	asn1_buf.len = tlv->len;
+	asn1_buf.p = (uint8_t *)tlv->value;
+	char pstr[300];
+	mbedtls_oid_get_numeric_string(pstr, sizeof(pstr), &asn1_buf); 
+	fprintf(f, " %s\n", pstr);
+}
+
+bool asn1_tag_dump(const struct tlv *tlv, FILE *f, int level, bool *candump) {
+	if (!tlv) {
+		fprintf(f, "NULL\n");
+		return false;
+	}
+
+	const struct asn1_tag *tag = asn1_get_tag(tlv);
+
+	PRINT_INDENT(level);
+	fprintf(f, "--%2hx[%02zx] '%s':", tlv->tag, tlv->len, tag->name);
+
+	switch (tag->type) {
+	case ASN1_TAG_GENERIC:
+		fprintf(f, "\n");
+		break;
+	case ASN1_TAG_STRING:
+		asn1_tag_dump_string(tlv, tag, f, level);
+		*candump = false;
+		break;
+	case ASN1_TAG_BOOLEAN:
+		asn1_tag_dump_boolean(tlv, tag, f, level);
+		*candump = false;
+		break;
+	case ASN1_TAG_INTEGER:
+		asn1_tag_dump_integer(tlv, tag, f, level);
+		*candump = false;
+		break;
+	case ASN1_TAG_UTC_TIME:
+//		asn1_tag_dump_utc_time(tlv, tag, f, level);
+		fprintf(f, "\n");
+		break;
+	case ASN1_TAG_OBJECT_ID:
+		asn1_tag_dump_object_id(tlv, tag, f, level);
+		*candump = false;
+		break;
+	};
+	
+	return true;
+}
+
+static bool print_cb(void *data, const struct tlv *tlv, int level, bool is_leaf) {
+	bool candump = true;
+	asn1_tag_dump(tlv, stdout, level, &candump);
+	if (is_leaf && candump) {
+		dump_buffer(tlv->value, tlv->len, stdout, level);
+	}
+
+	return true;
+}
+
 int asn1_print(uint8_t *asn1buf, size_t asn1buflen, char *indent) {
 	
+	struct tlvdb *t = NULL;
+	t = tlvdb_parse_multi(asn1buf, asn1buflen);
+	if (t) {
+		tlvdb_visit(t, print_cb, NULL, 0);
+		tlvdb_free(t);
+	} else {
+		PrintAndLogEx(ERR, "Can't parse data as TLV tree.");
+		return 1;
+	}
+	
 	return 0;
 }
 

From 9d420489016472d1f530ec5ee8fad73675258742 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Thu, 15 Nov 2018 11:47:09 +0200
Subject: [PATCH 0182/1938] added octet string an dstring datetime

---
 client/crypto/asn1utils.c | 77 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 75 insertions(+), 2 deletions(-)

diff --git a/client/crypto/asn1utils.c b/client/crypto/asn1utils.c
index 5f66ed022..b19e27993 100644
--- a/client/crypto/asn1utils.c
+++ b/client/crypto/asn1utils.c
@@ -9,6 +9,7 @@
 //-----------------------------------------------------------------------------
 
 #include "asn1utils.h"
+#include <ctype.h>
 #include <mbedtls/asn1.h>
 #include <mbedtls/oid.h>
 #include "util.h"
@@ -67,7 +68,9 @@ enum asn1_tag_t {
 	ASN1_TAG_BOOLEAN,
 	ASN1_TAG_INTEGER,
 	ASN1_TAG_STRING,
+	ASN1_TAG_OCTET_STRING,
 	ASN1_TAG_UTC_TIME,
+	ASN1_TAG_STR_TIME,
 	ASN1_TAG_OBJECT_ID,
 };
 
@@ -86,7 +89,7 @@ static const struct asn1_tag asn1_tags[] = {
 	{ 0x01, "BOOLEAN", ASN1_TAG_BOOLEAN },
 	{ 0x02, "INTEGER", ASN1_TAG_INTEGER },
 	{ 0x03, "BIT STRING" },
-	{ 0x04, "OCTET STRING" },
+	{ 0x04, "OCTET STRING", ASN1_TAG_OCTET_STRING},
 	{ 0x05, "NULL" },
 	{ 0x06, "OBJECT IDENTIFIER", ASN1_TAG_OBJECT_ID },
 	{ 0x0C, "UTF8String", ASN1_TAG_STRING },
@@ -96,7 +99,7 @@ static const struct asn1_tag asn1_tags[] = {
 	{ 0x14, "T61String", ASN1_TAG_STRING },
 	{ 0x16, "IA5String", ASN1_TAG_STRING },
 	{ 0x17, "UTCTime", ASN1_TAG_UTC_TIME },
-	{ 0x18, "GeneralizedTime", ASN1_TAG_UTC_TIME },
+	{ 0x18, "GeneralizedTime", ASN1_TAG_STR_TIME },
 	{ 0x30, "SEQUENCE" },
 	{ 0x31, "SET" },
 	{ 0xa0, "[0]" },
@@ -125,12 +128,76 @@ static const struct asn1_tag *asn1_get_tag(const struct tlv *tlv) {
 	return tag ? tag : &asn1_tags[0];
 }
 
+static void asn1_tag_dump_str_time(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level, bool *needdump){
+	int len = tlv->len;
+	*needdump = true;
+
+	if (len > 4) {
+		fprintf(f, "\tvalue: '");
+		while (true) {
+			// year
+			fwrite(tlv->value, 1, 4, f);
+			fprintf(f, "-");
+			if (len < 6) 
+				break;
+			// month
+			fwrite(&tlv->value[4], 1, 2, f);
+			fprintf(f, "-");
+			if (len < 8) 
+				break;
+			// day
+			fwrite(&tlv->value[6], 1, 2, f);
+			fprintf(f, " ");
+			if (len < 10) 
+				break;
+			// hour
+			fwrite(&tlv->value[8], 1, 2, f);
+			fprintf(f, ":");
+			if (len < 12) 
+				break;
+			// min
+			fwrite(&tlv->value[10], 1, 2, f);
+			fprintf(f, ":");
+			if (len < 14) 
+				break;
+			// sec
+			fwrite(&tlv->value[12], 1, 2, f);
+			if (len < 15) 
+				break;
+			// time zone
+			fprintf(f, " zone: %.*s", len - 14, &tlv->value[14]);
+	
+			break;
+		}
+		fprintf(f, "'\n");
+	} else {
+		fprintf(f, "\n");
+		*needdump = true;
+	}	
+}
+
 static void asn1_tag_dump_string(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level){
 	fprintf(f, "\tvalue: '");
 	fwrite(tlv->value, 1, tlv->len, f);
 	fprintf(f, "'\n");
 }
 
+static void asn1_tag_dump_octet_string(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level, bool *needdump){
+	*needdump = false;
+	for (int i = 0; i < tlv->len; i++)
+		if (!isspace(tlv->value[i]) && !isprint(tlv->value[i])){
+			*needdump = true;
+			break;
+		}
+		
+	if (*needdump) {
+		fprintf(f, "'\n");
+	} else {
+		fprintf(f, "\t\t");
+		asn1_tag_dump_string(tlv, tag, f, level);
+	}
+}
+
 static unsigned long asn1_value_integer(const struct tlv *tlv, unsigned start, unsigned end) {
 	unsigned long ret = 0;
 	int i;
@@ -204,6 +271,9 @@ bool asn1_tag_dump(const struct tlv *tlv, FILE *f, int level, bool *candump) {
 		asn1_tag_dump_string(tlv, tag, f, level);
 		*candump = false;
 		break;
+	case ASN1_TAG_OCTET_STRING:
+		asn1_tag_dump_octet_string(tlv, tag, f, level, candump);
+		break;
 	case ASN1_TAG_BOOLEAN:
 		asn1_tag_dump_boolean(tlv, tag, f, level);
 		*candump = false;
@@ -216,6 +286,9 @@ bool asn1_tag_dump(const struct tlv *tlv, FILE *f, int level, bool *candump) {
 //		asn1_tag_dump_utc_time(tlv, tag, f, level);
 		fprintf(f, "\n");
 		break;
+	case ASN1_TAG_STR_TIME:
+		asn1_tag_dump_str_time(tlv, tag, f, level, candump);
+		break;
 	case ASN1_TAG_OBJECT_ID:
 		asn1_tag_dump_object_id(tlv, tag, f, level);
 		*candump = false;

From bd914904612e2739a614c7c1d07a9859668b039b Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Thu, 15 Nov 2018 13:26:33 +0200
Subject: [PATCH 0183/1938] added tags and all data deserializers works

---
 client/crypto/asn1utils.c | 56 +++++++++++++++++++++++++--------------
 1 file changed, 36 insertions(+), 20 deletions(-)

diff --git a/client/crypto/asn1utils.c b/client/crypto/asn1utils.c
index b19e27993..f1e668091 100644
--- a/client/crypto/asn1utils.c
+++ b/client/crypto/asn1utils.c
@@ -10,6 +10,7 @@
 
 #include "asn1utils.h"
 #include <ctype.h>
+#include <stdlib.h>
 #include <mbedtls/asn1.h>
 #include <mbedtls/oid.h>
 #include "util.h"
@@ -92,14 +93,26 @@ static const struct asn1_tag asn1_tags[] = {
 	{ 0x04, "OCTET STRING", ASN1_TAG_OCTET_STRING},
 	{ 0x05, "NULL" },
 	{ 0x06, "OBJECT IDENTIFIER", ASN1_TAG_OBJECT_ID },
+	{ 0x07, "OBJECT DESCRIPTOR" },
+	{ 0x08, "EXTERNAL" },
+	{ 0x09, "REAL" },
+	{ 0x0A, "ENUMERATED" },
+	{ 0x0B, "EMBEDDED_PDV" },
 	{ 0x0C, "UTF8String", ASN1_TAG_STRING },
 	{ 0x10, "SEQUENCE" },
 	{ 0x11, "SET" },
+	{ 0x12, "NumericString", ASN1_TAG_STRING },
 	{ 0x13, "PrintableString", ASN1_TAG_STRING },
-	{ 0x14, "T61String", ASN1_TAG_STRING },
-	{ 0x16, "IA5String", ASN1_TAG_STRING },
+	{ 0x14, "T61String" },
+	{ 0x15, "VideotexString" },
+	{ 0x16, "IA5String" },
 	{ 0x17, "UTCTime", ASN1_TAG_UTC_TIME },
 	{ 0x18, "GeneralizedTime", ASN1_TAG_STR_TIME },
+	{ 0x19, "GraphicString" },
+	{ 0x1A, "VisibleString", ASN1_TAG_STRING },
+	{ 0x1B, "GeneralString", ASN1_TAG_STRING },
+	{ 0x1C, "UniversalString", ASN1_TAG_STRING },
+	{ 0x1E, "BMPString" },
 	{ 0x30, "SEQUENCE" },
 	{ 0x31, "SET" },
 	{ 0xa0, "[0]" },
@@ -128,44 +141,48 @@ static const struct asn1_tag *asn1_get_tag(const struct tlv *tlv) {
 	return tag ? tag : &asn1_tags[0];
 }
 
-static void asn1_tag_dump_str_time(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level, bool *needdump){
+static void asn1_tag_dump_str_time(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level, bool longyear, bool *needdump){
 	int len = tlv->len;
-	*needdump = true;
+	*needdump = false;
 
+	int startindx = longyear ? 4 : 2;
+	
 	if (len > 4) {
 		fprintf(f, "\tvalue: '");
 		while (true) {
 			// year
-			fwrite(tlv->value, 1, 4, f);
+			if (!longyear)
+				fprintf(f, "20");
+			fwrite(tlv->value, 1, longyear ? 4 : 2, f);
 			fprintf(f, "-");
-			if (len < 6) 
+			if (len < startindx + 2) 
 				break;
 			// month
-			fwrite(&tlv->value[4], 1, 2, f);
+			fwrite(&tlv->value[startindx], 1, 2, f);
 			fprintf(f, "-");
-			if (len < 8) 
+			if (len < startindx + 4) 
 				break;
 			// day
-			fwrite(&tlv->value[6], 1, 2, f);
+			fwrite(&tlv->value[startindx + 2], 1, 2, f);
 			fprintf(f, " ");
-			if (len < 10) 
+			if (len < startindx + 6) 
 				break;
 			// hour
-			fwrite(&tlv->value[8], 1, 2, f);
+			fwrite(&tlv->value[startindx + 4], 1, 2, f);
 			fprintf(f, ":");
-			if (len < 12) 
+			if (len < startindx + 8) 
 				break;
 			// min
-			fwrite(&tlv->value[10], 1, 2, f);
+			fwrite(&tlv->value[startindx + 6], 1, 2, f);
 			fprintf(f, ":");
-			if (len < 14) 
+			if (len < startindx + 10) 
 				break;
 			// sec
-			fwrite(&tlv->value[12], 1, 2, f);
-			if (len < 15) 
+			fwrite(&tlv->value[startindx + 8], 1, 2, f);
+			if (len < startindx + 11) 
 				break;
 			// time zone
-			fprintf(f, " zone: %.*s", len - 14, &tlv->value[14]);
+			fprintf(f, " zone: %.*s", len - 10 - (longyear ? 4 : 2), &tlv->value[startindx + 10]);
 	
 			break;
 		}
@@ -283,11 +300,10 @@ bool asn1_tag_dump(const struct tlv *tlv, FILE *f, int level, bool *candump) {
 		*candump = false;
 		break;
 	case ASN1_TAG_UTC_TIME:
-//		asn1_tag_dump_utc_time(tlv, tag, f, level);
-		fprintf(f, "\n");
+		asn1_tag_dump_str_time(tlv, tag, f, level, false, candump);
 		break;
 	case ASN1_TAG_STR_TIME:
-		asn1_tag_dump_str_time(tlv, tag, f, level, candump);
+		asn1_tag_dump_str_time(tlv, tag, f, level, true, candump);
 		break;
 	case ASN1_TAG_OBJECT_ID:
 		asn1_tag_dump_object_id(tlv, tag, f, level);

From 6cd62753612bdf633f3b1eda7dda1fcabbeb2cd4 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Thu, 15 Nov 2018 14:37:38 +0200
Subject: [PATCH 0184/1938] refactoring

---
 client/Makefile           |    1 +
 client/crypto/asn1dump.c  |  288 +++++
 client/crypto/asn1dump.h  |   21 +
 client/crypto/asn1utils.c |  257 +---
 client/crypto/oids.json   | 2319 +++++++++++++++++++++++++++++++++++++
 5 files changed, 2631 insertions(+), 255 deletions(-)
 create mode 100644 client/crypto/asn1dump.c
 create mode 100644 client/crypto/asn1dump.h
 create mode 100644 client/crypto/oids.json

diff --git a/client/Makefile b/client/Makefile
index 85f1648f1..9381cb29a 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -108,6 +108,7 @@ CMDSRCS =	crapto1/crapto1.c \
 			mfkey.c \
 			tea.c \
 			fido/additional_ca.c \
+			crypto/asn1dump.c \
 			crypto/libpcrypto.c\
 			crypto/asn1utils.c\
 			cliparser/argtable3.c\
diff --git a/client/crypto/asn1dump.c b/client/crypto/asn1dump.c
new file mode 100644
index 000000000..4241899f6
--- /dev/null
+++ b/client/crypto/asn1dump.c
@@ -0,0 +1,288 @@
+//-----------------------------------------------------------------------------
+// Copyright (C) 2018 Merlok
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// asn.1 dumping
+//-----------------------------------------------------------------------------
+
+#include "asn1dump.h"
+#include <ctype.h>
+#include <stdlib.h>
+#include <mbedtls/asn1.h>
+#include <mbedtls/oid.h>
+#include "emv/emv_tags.h"
+#include "emv/dump.h"
+#include "util.h"
+
+#define PRINT_INDENT(level) 	{for (int i = 0; i < (level); i++) fprintf(f, "   ");}
+
+enum asn1_tag_t {
+	ASN1_TAG_GENERIC,
+	ASN1_TAG_BOOLEAN,
+	ASN1_TAG_INTEGER,
+	ASN1_TAG_STRING,
+	ASN1_TAG_OCTET_STRING,
+	ASN1_TAG_UTC_TIME,
+	ASN1_TAG_STR_TIME,
+	ASN1_TAG_OBJECT_ID,
+};
+
+struct asn1_tag {
+	tlv_tag_t tag;
+	char *name;
+	enum asn1_tag_t type;
+	const void *data;
+};
+
+static const struct asn1_tag asn1_tags[] = {
+	// internal
+	{ 0x00  , "Unknown ???" },
+
+	// ASN.1
+	{ 0x01, "BOOLEAN", ASN1_TAG_BOOLEAN },
+	{ 0x02, "INTEGER", ASN1_TAG_INTEGER },
+	{ 0x03, "BIT STRING" },
+	{ 0x04, "OCTET STRING", ASN1_TAG_OCTET_STRING},
+	{ 0x05, "NULL" },
+	{ 0x06, "OBJECT IDENTIFIER", ASN1_TAG_OBJECT_ID },
+	{ 0x07, "OBJECT DESCRIPTOR" },
+	{ 0x08, "EXTERNAL" },
+	{ 0x09, "REAL" },
+	{ 0x0A, "ENUMERATED" },
+	{ 0x0B, "EMBEDDED_PDV" },
+	{ 0x0C, "UTF8String", ASN1_TAG_STRING },
+	{ 0x10, "SEQUENCE" },
+	{ 0x11, "SET" },
+	{ 0x12, "NumericString", ASN1_TAG_STRING },
+	{ 0x13, "PrintableString", ASN1_TAG_STRING },
+	{ 0x14, "T61String" },
+	{ 0x15, "VideotexString" },
+	{ 0x16, "IA5String" },
+	{ 0x17, "UTCTime", ASN1_TAG_UTC_TIME },
+	{ 0x18, "GeneralizedTime", ASN1_TAG_STR_TIME },
+	{ 0x19, "GraphicString" },
+	{ 0x1A, "VisibleString", ASN1_TAG_STRING },
+	{ 0x1B, "GeneralString", ASN1_TAG_STRING },
+	{ 0x1C, "UniversalString", ASN1_TAG_STRING },
+	{ 0x1E, "BMPString" },
+	{ 0x30, "SEQUENCE" },
+	{ 0x31, "SET" },
+	{ 0xa0, "[0]" },
+	{ 0xa1, "[1]" },
+	{ 0xa2, "[2]" },
+	{ 0xa3, "[3]" },
+	{ 0xa4, "[4]" },
+	{ 0xa5, "[5]" },
+};
+
+static int asn1_sort_tag(tlv_tag_t tag) {
+	return (int)(tag >= 0x100 ? tag : tag << 8);
+}
+
+static int asn1_tlv_compare(const void *a, const void *b) {
+	const struct tlv *tlv = a;
+	const struct asn1_tag *tag = b;
+
+	return asn1_sort_tag(tlv->tag) - (asn1_sort_tag(tag->tag));
+}
+
+static const struct asn1_tag *asn1_get_tag(const struct tlv *tlv) {
+	struct asn1_tag *tag = bsearch(tlv, asn1_tags, sizeof(asn1_tags) / sizeof(asn1_tags[0]),
+			sizeof(asn1_tags[0]), asn1_tlv_compare);
+
+	return tag ? tag : &asn1_tags[0];
+}
+
+static void asn1_tag_dump_str_time(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level, bool longyear, bool *needdump){
+	int len = tlv->len;
+	*needdump = false;
+
+	int startindx = longyear ? 4 : 2;
+	
+	if (len > 4) {
+		fprintf(f, "\tvalue: '");
+		while (true) {
+			// year
+			if (!longyear)
+				fprintf(f, "20");
+			fwrite(tlv->value, 1, longyear ? 4 : 2, f);
+			fprintf(f, "-");
+			if (len < startindx + 2) 
+				break;
+			// month
+			fwrite(&tlv->value[startindx], 1, 2, f);
+			fprintf(f, "-");
+			if (len < startindx + 4) 
+				break;
+			// day
+			fwrite(&tlv->value[startindx + 2], 1, 2, f);
+			fprintf(f, " ");
+			if (len < startindx + 6) 
+				break;
+			// hour
+			fwrite(&tlv->value[startindx + 4], 1, 2, f);
+			fprintf(f, ":");
+			if (len < startindx + 8) 
+				break;
+			// min
+			fwrite(&tlv->value[startindx + 6], 1, 2, f);
+			fprintf(f, ":");
+			if (len < startindx + 10) 
+				break;
+			// sec
+			fwrite(&tlv->value[startindx + 8], 1, 2, f);
+			if (len < startindx + 11) 
+				break;
+			// time zone
+			fprintf(f, " zone: %.*s", len - 10 - (longyear ? 4 : 2), &tlv->value[startindx + 10]);
+	
+			break;
+		}
+		fprintf(f, "'\n");
+	} else {
+		fprintf(f, "\n");
+		*needdump = true;
+	}	
+}
+
+static void asn1_tag_dump_string(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level){
+	fprintf(f, "\tvalue: '");
+	fwrite(tlv->value, 1, tlv->len, f);
+	fprintf(f, "'\n");
+}
+
+static void asn1_tag_dump_octet_string(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level, bool *needdump){
+	*needdump = false;
+	for (int i = 0; i < tlv->len; i++)
+		if (!isspace(tlv->value[i]) && !isprint(tlv->value[i])){
+			*needdump = true;
+			break;
+		}
+		
+	if (*needdump) {
+		fprintf(f, "'\n");
+	} else {
+		fprintf(f, "\t\t");
+		asn1_tag_dump_string(tlv, tag, f, level);
+	}
+}
+
+static unsigned long asn1_value_integer(const struct tlv *tlv, unsigned start, unsigned end) {
+	unsigned long ret = 0;
+	int i;
+
+	if (end > tlv->len * 2)
+		return ret;
+	if (start >= end)
+		return ret;
+
+	if (start & 1) {
+		ret += tlv->value[start/2] & 0xf;
+		i = start + 1;
+	} else
+		i = start;
+
+	for (; i < end - 1; i += 2) {
+		ret *= 10;
+		ret += tlv->value[i/2] >> 4;
+		ret *= 10;
+		ret += tlv->value[i/2] & 0xf;
+	}
+
+	if (end & 1) {
+		ret *= 10;
+		ret += tlv->value[end/2] >> 4;
+	}
+
+	return ret;
+}
+
+static void asn1_tag_dump_boolean(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level) {
+	PRINT_INDENT(level);
+	if (tlv->len > 0) {
+		fprintf(f, "\tvalue: %s\n", tlv->value[0]?"true":"false");
+	} else {
+		fprintf(f, "n/a\n");
+	}
+}
+
+static void asn1_tag_dump_integer(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level) {
+	PRINT_INDENT(level);
+	fprintf(f, "\tvalue: %lu\n", asn1_value_integer(tlv, 0, tlv->len * 2));
+}
+
+static void asn1_tag_dump_object_id(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level) {
+	PRINT_INDENT(level);
+	mbedtls_asn1_buf asn1_buf;
+	asn1_buf.len = tlv->len;
+	asn1_buf.p = (uint8_t *)tlv->value;
+	char pstr[300];
+	mbedtls_oid_get_numeric_string(pstr, sizeof(pstr), &asn1_buf); 
+	fprintf(f, " %s", pstr);
+	const char *ppstr;
+	mbedtls_oid_get_attr_short_name(&asn1_buf, &ppstr); 
+	if (ppstr && strnlen(ppstr, 1)) {
+		fprintf(f, " (%s)\n", ppstr);
+		return;
+	}
+	mbedtls_oid_get_sig_alg_desc(&asn1_buf, &ppstr);
+	if (ppstr && strnlen(ppstr, 1)) {
+		fprintf(f, " (%s)\n", ppstr);
+		return;
+	}
+	mbedtls_oid_get_extended_key_usage(&asn1_buf, &ppstr);
+	if (ppstr && strnlen(ppstr, 1)) {
+		fprintf(f, " (%s)\n", ppstr);
+		return;
+	}
+	
+	fprintf(f, "\n");
+}
+
+bool asn1_tag_dump(const struct tlv *tlv, FILE *f, int level, bool *candump) {
+	if (!tlv) {
+		fprintf(f, "NULL\n");
+		return false;
+	}
+
+	const struct asn1_tag *tag = asn1_get_tag(tlv);
+
+	PRINT_INDENT(level);
+	fprintf(f, "--%2hx[%02zx] '%s':", tlv->tag, tlv->len, tag->name);
+
+	switch (tag->type) {
+	case ASN1_TAG_GENERIC:
+		fprintf(f, "\n");
+		break;
+	case ASN1_TAG_STRING:
+		asn1_tag_dump_string(tlv, tag, f, level);
+		*candump = false;
+		break;
+	case ASN1_TAG_OCTET_STRING:
+		asn1_tag_dump_octet_string(tlv, tag, f, level, candump);
+		break;
+	case ASN1_TAG_BOOLEAN:
+		asn1_tag_dump_boolean(tlv, tag, f, level);
+		*candump = false;
+		break;
+	case ASN1_TAG_INTEGER:
+		asn1_tag_dump_integer(tlv, tag, f, level);
+		*candump = false;
+		break;
+	case ASN1_TAG_UTC_TIME:
+		asn1_tag_dump_str_time(tlv, tag, f, level, false, candump);
+		break;
+	case ASN1_TAG_STR_TIME:
+		asn1_tag_dump_str_time(tlv, tag, f, level, true, candump);
+		break;
+	case ASN1_TAG_OBJECT_ID:
+		asn1_tag_dump_object_id(tlv, tag, f, level);
+		*candump = false;
+		break;
+	};
+	
+	return true;
+}
diff --git a/client/crypto/asn1dump.h b/client/crypto/asn1dump.h
new file mode 100644
index 000000000..1aadf487c
--- /dev/null
+++ b/client/crypto/asn1dump.h
@@ -0,0 +1,21 @@
+//-----------------------------------------------------------------------------
+// Copyright (C) 2018 Merlok
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// asn.1 dumping
+//-----------------------------------------------------------------------------
+#ifndef ASN1DUMP_H
+#define ASN1DUMP_H
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdio.h>
+#include "emv/tlv.h"
+
+extern bool asn1_tag_dump(const struct tlv *tlv, FILE *f, int level, bool *candump);
+
+#endif /* asn1utils.h */
diff --git a/client/crypto/asn1utils.c b/client/crypto/asn1utils.c
index f1e668091..5be323b45 100644
--- a/client/crypto/asn1utils.c
+++ b/client/crypto/asn1utils.c
@@ -12,11 +12,10 @@
 #include <ctype.h>
 #include <stdlib.h>
 #include <mbedtls/asn1.h>
-#include <mbedtls/oid.h>
-#include "util.h"
 #include "emv/tlv.h"
-#include "emv/emv_tags.h"
 #include "emv/dump.h"
+#include "asn1dump.h"
+#include "util.h"
 
 int ecdsa_asn1_get_signature(uint8_t *signature, size_t signaturelen, uint8_t *rval, uint8_t *sval) {
 	if (!signature || !signaturelen || !rval || !sval)
@@ -62,258 +61,6 @@ exit:
 	return res;
 }
 
-#define PRINT_INDENT(level) 	{for (int i = 0; i < (level); i++) fprintf(f, "   ");}
-
-enum asn1_tag_t {
-	ASN1_TAG_GENERIC,
-	ASN1_TAG_BOOLEAN,
-	ASN1_TAG_INTEGER,
-	ASN1_TAG_STRING,
-	ASN1_TAG_OCTET_STRING,
-	ASN1_TAG_UTC_TIME,
-	ASN1_TAG_STR_TIME,
-	ASN1_TAG_OBJECT_ID,
-};
-
-struct asn1_tag {
-	tlv_tag_t tag;
-	char *name;
-	enum asn1_tag_t type;
-	const void *data;
-};
-
-static const struct asn1_tag asn1_tags[] = {
-	// internal
-	{ 0x00  , "Unknown ???" },
-
-	// ASN.1
-	{ 0x01, "BOOLEAN", ASN1_TAG_BOOLEAN },
-	{ 0x02, "INTEGER", ASN1_TAG_INTEGER },
-	{ 0x03, "BIT STRING" },
-	{ 0x04, "OCTET STRING", ASN1_TAG_OCTET_STRING},
-	{ 0x05, "NULL" },
-	{ 0x06, "OBJECT IDENTIFIER", ASN1_TAG_OBJECT_ID },
-	{ 0x07, "OBJECT DESCRIPTOR" },
-	{ 0x08, "EXTERNAL" },
-	{ 0x09, "REAL" },
-	{ 0x0A, "ENUMERATED" },
-	{ 0x0B, "EMBEDDED_PDV" },
-	{ 0x0C, "UTF8String", ASN1_TAG_STRING },
-	{ 0x10, "SEQUENCE" },
-	{ 0x11, "SET" },
-	{ 0x12, "NumericString", ASN1_TAG_STRING },
-	{ 0x13, "PrintableString", ASN1_TAG_STRING },
-	{ 0x14, "T61String" },
-	{ 0x15, "VideotexString" },
-	{ 0x16, "IA5String" },
-	{ 0x17, "UTCTime", ASN1_TAG_UTC_TIME },
-	{ 0x18, "GeneralizedTime", ASN1_TAG_STR_TIME },
-	{ 0x19, "GraphicString" },
-	{ 0x1A, "VisibleString", ASN1_TAG_STRING },
-	{ 0x1B, "GeneralString", ASN1_TAG_STRING },
-	{ 0x1C, "UniversalString", ASN1_TAG_STRING },
-	{ 0x1E, "BMPString" },
-	{ 0x30, "SEQUENCE" },
-	{ 0x31, "SET" },
-	{ 0xa0, "[0]" },
-	{ 0xa1, "[1]" },
-	{ 0xa2, "[2]" },
-	{ 0xa3, "[3]" },
-	{ 0xa4, "[4]" },
-	{ 0xa5, "[5]" },
-};
-
-static int asn1_sort_tag(tlv_tag_t tag) {
-	return (int)(tag >= 0x100 ? tag : tag << 8);
-}
-
-static int asn1_tlv_compare(const void *a, const void *b) {
-	const struct tlv *tlv = a;
-	const struct asn1_tag *tag = b;
-
-	return asn1_sort_tag(tlv->tag) - (asn1_sort_tag(tag->tag));
-}
-
-static const struct asn1_tag *asn1_get_tag(const struct tlv *tlv) {
-	struct asn1_tag *tag = bsearch(tlv, asn1_tags, sizeof(asn1_tags) / sizeof(asn1_tags[0]),
-			sizeof(asn1_tags[0]), asn1_tlv_compare);
-
-	return tag ? tag : &asn1_tags[0];
-}
-
-static void asn1_tag_dump_str_time(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level, bool longyear, bool *needdump){
-	int len = tlv->len;
-	*needdump = false;
-
-	int startindx = longyear ? 4 : 2;
-	
-	if (len > 4) {
-		fprintf(f, "\tvalue: '");
-		while (true) {
-			// year
-			if (!longyear)
-				fprintf(f, "20");
-			fwrite(tlv->value, 1, longyear ? 4 : 2, f);
-			fprintf(f, "-");
-			if (len < startindx + 2) 
-				break;
-			// month
-			fwrite(&tlv->value[startindx], 1, 2, f);
-			fprintf(f, "-");
-			if (len < startindx + 4) 
-				break;
-			// day
-			fwrite(&tlv->value[startindx + 2], 1, 2, f);
-			fprintf(f, " ");
-			if (len < startindx + 6) 
-				break;
-			// hour
-			fwrite(&tlv->value[startindx + 4], 1, 2, f);
-			fprintf(f, ":");
-			if (len < startindx + 8) 
-				break;
-			// min
-			fwrite(&tlv->value[startindx + 6], 1, 2, f);
-			fprintf(f, ":");
-			if (len < startindx + 10) 
-				break;
-			// sec
-			fwrite(&tlv->value[startindx + 8], 1, 2, f);
-			if (len < startindx + 11) 
-				break;
-			// time zone
-			fprintf(f, " zone: %.*s", len - 10 - (longyear ? 4 : 2), &tlv->value[startindx + 10]);
-	
-			break;
-		}
-		fprintf(f, "'\n");
-	} else {
-		fprintf(f, "\n");
-		*needdump = true;
-	}	
-}
-
-static void asn1_tag_dump_string(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level){
-	fprintf(f, "\tvalue: '");
-	fwrite(tlv->value, 1, tlv->len, f);
-	fprintf(f, "'\n");
-}
-
-static void asn1_tag_dump_octet_string(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level, bool *needdump){
-	*needdump = false;
-	for (int i = 0; i < tlv->len; i++)
-		if (!isspace(tlv->value[i]) && !isprint(tlv->value[i])){
-			*needdump = true;
-			break;
-		}
-		
-	if (*needdump) {
-		fprintf(f, "'\n");
-	} else {
-		fprintf(f, "\t\t");
-		asn1_tag_dump_string(tlv, tag, f, level);
-	}
-}
-
-static unsigned long asn1_value_integer(const struct tlv *tlv, unsigned start, unsigned end) {
-	unsigned long ret = 0;
-	int i;
-
-	if (end > tlv->len * 2)
-		return ret;
-	if (start >= end)
-		return ret;
-
-	if (start & 1) {
-		ret += tlv->value[start/2] & 0xf;
-		i = start + 1;
-	} else
-		i = start;
-
-	for (; i < end - 1; i += 2) {
-		ret *= 10;
-		ret += tlv->value[i/2] >> 4;
-		ret *= 10;
-		ret += tlv->value[i/2] & 0xf;
-	}
-
-	if (end & 1) {
-		ret *= 10;
-		ret += tlv->value[end/2] >> 4;
-	}
-
-	return ret;
-}
-
-static void asn1_tag_dump_boolean(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level) {
-	PRINT_INDENT(level);
-	if (tlv->len > 0) {
-		fprintf(f, "\tvalue: %s\n", tlv->value[0]?"true":"false");
-	} else {
-		fprintf(f, "n/a\n");
-	}
-}
-
-static void asn1_tag_dump_integer(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level) {
-	PRINT_INDENT(level);
-	fprintf(f, "\tvalue: %lu\n", asn1_value_integer(tlv, 0, tlv->len * 2));
-}
-
-static void asn1_tag_dump_object_id(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level) {
-	PRINT_INDENT(level);
-	mbedtls_asn1_buf asn1_buf;
-	asn1_buf.len = tlv->len;
-	asn1_buf.p = (uint8_t *)tlv->value;
-	char pstr[300];
-	mbedtls_oid_get_numeric_string(pstr, sizeof(pstr), &asn1_buf); 
-	fprintf(f, " %s\n", pstr);
-}
-
-bool asn1_tag_dump(const struct tlv *tlv, FILE *f, int level, bool *candump) {
-	if (!tlv) {
-		fprintf(f, "NULL\n");
-		return false;
-	}
-
-	const struct asn1_tag *tag = asn1_get_tag(tlv);
-
-	PRINT_INDENT(level);
-	fprintf(f, "--%2hx[%02zx] '%s':", tlv->tag, tlv->len, tag->name);
-
-	switch (tag->type) {
-	case ASN1_TAG_GENERIC:
-		fprintf(f, "\n");
-		break;
-	case ASN1_TAG_STRING:
-		asn1_tag_dump_string(tlv, tag, f, level);
-		*candump = false;
-		break;
-	case ASN1_TAG_OCTET_STRING:
-		asn1_tag_dump_octet_string(tlv, tag, f, level, candump);
-		break;
-	case ASN1_TAG_BOOLEAN:
-		asn1_tag_dump_boolean(tlv, tag, f, level);
-		*candump = false;
-		break;
-	case ASN1_TAG_INTEGER:
-		asn1_tag_dump_integer(tlv, tag, f, level);
-		*candump = false;
-		break;
-	case ASN1_TAG_UTC_TIME:
-		asn1_tag_dump_str_time(tlv, tag, f, level, false, candump);
-		break;
-	case ASN1_TAG_STR_TIME:
-		asn1_tag_dump_str_time(tlv, tag, f, level, true, candump);
-		break;
-	case ASN1_TAG_OBJECT_ID:
-		asn1_tag_dump_object_id(tlv, tag, f, level);
-		*candump = false;
-		break;
-	};
-	
-	return true;
-}
-
 static bool print_cb(void *data, const struct tlv *tlv, int level, bool is_leaf) {
 	bool candump = true;
 	asn1_tag_dump(tlv, stdout, level, &candump);
diff --git a/client/crypto/oids.json b/client/crypto/oids.json
new file mode 100644
index 000000000..9f65fb34b
--- /dev/null
+++ b/client/crypto/oids.json
@@ -0,0 +1,2319 @@
+{
+"copyright": "https://www.cs.auckland.ac.nz/~pgut001/dumpasn1.cfg",
+
+"0.2.262.1.10": { "d": "Telesec", "c": "Deutsche Telekom" },
+"0.2.262.1.10.0": { "d": "extension", "c": "Telesec" },
+"0.2.262.1.10.1": { "d": "mechanism", "c": "Telesec" },
+"0.2.262.1.10.1.0": { "d": "authentication", "c": "Telesec mechanism" },
+"0.2.262.1.10.1.0.1": { "d": "passwordAuthentication", "c": "Telesec authentication" },
+"0.2.262.1.10.1.0.2": { "d": "protectedPasswordAuthentication", "c": "Telesec authentication" },
+"0.2.262.1.10.1.0.3": { "d": "oneWayX509Authentication", "c": "Telesec authentication" },
+"0.2.262.1.10.1.0.4": { "d": "twoWayX509Authentication", "c": "Telesec authentication" },
+"0.2.262.1.10.1.0.5": { "d": "threeWayX509Authentication", "c": "Telesec authentication" },
+"0.2.262.1.10.1.0.6": { "d": "oneWayISO9798Authentication", "c": "Telesec authentication" },
+"0.2.262.1.10.1.0.7": { "d": "twoWayISO9798Authentication", "c": "Telesec authentication" },
+"0.2.262.1.10.1.0.8": { "d": "telekomAuthentication", "c": "Telesec authentication" },
+"0.2.262.1.10.1.1": { "d": "signature", "c": "Telesec mechanism" },
+"0.2.262.1.10.1.1.1": { "d": "md4WithRSAAndISO9697", "c": "Telesec mechanism" },
+"0.2.262.1.10.1.1.2": { "d": "md4WithRSAAndTelesecSignatureStandard", "c": "Telesec mechanism" },
+"0.2.262.1.10.1.1.3": { "d": "md5WithRSAAndISO9697", "c": "Telesec mechanism" },
+"0.2.262.1.10.1.1.4": { "d": "md5WithRSAAndTelesecSignatureStandard", "c": "Telesec mechanism" },
+"0.2.262.1.10.1.1.5": { "d": "ripemd160WithRSAAndTelekomSignatureStandard", "c": "Telesec mechanism" },
+"0.2.262.1.10.1.1.9": { "d": "hbciRsaSignature", "c": "Telesec signature" },
+"0.2.262.1.10.1.2": { "d": "encryption", "c": "Telesec mechanism" },
+"0.2.262.1.10.1.2.0": { "d": "none", "c": "Telesec encryption" },
+"0.2.262.1.10.1.2.1": { "d": "rsaTelesec", "c": "Telesec encryption" },
+"0.2.262.1.10.1.2.2": { "d": "des", "c": "Telesec encryption" },
+"0.2.262.1.10.1.2.2.1": { "d": "desECB", "c": "Telesec encryption" },
+"0.2.262.1.10.1.2.2.2": { "d": "desCBC", "c": "Telesec encryption" },
+"0.2.262.1.10.1.2.2.3": { "d": "desOFB", "c": "Telesec encryption" },
+"0.2.262.1.10.1.2.2.4": { "d": "desCFB8", "c": "Telesec encryption" },
+"0.2.262.1.10.1.2.2.5": { "d": "desCFB64", "c": "Telesec encryption" },
+"0.2.262.1.10.1.2.3": { "d": "des3", "c": "Telesec encryption" },
+"0.2.262.1.10.1.2.3.1": { "d": "des3ECB", "c": "Telesec encryption" },
+"0.2.262.1.10.1.2.3.2": { "d": "des3CBC", "c": "Telesec encryption" },
+"0.2.262.1.10.1.2.3.3": { "d": "des3OFB", "c": "Telesec encryption" },
+"0.2.262.1.10.1.2.3.4": { "d": "des3CFB8", "c": "Telesec encryption" },
+"0.2.262.1.10.1.2.3.5": { "d": "des3CFB64", "c": "Telesec encryption" },
+"0.2.262.1.10.1.2.4": { "d": "magenta", "c": "Telesec encryption" },
+"0.2.262.1.10.1.2.5": { "d": "idea", "c": "Telesec encryption" },
+"0.2.262.1.10.1.2.5.1": { "d": "ideaECB", "c": "Telesec encryption" },
+"0.2.262.1.10.1.2.5.2": { "d": "ideaCBC", "c": "Telesec encryption" },
+"0.2.262.1.10.1.2.5.3": { "d": "ideaOFB", "c": "Telesec encryption" },
+"0.2.262.1.10.1.2.5.4": { "d": "ideaCFB8", "c": "Telesec encryption" },
+"0.2.262.1.10.1.2.5.5": { "d": "ideaCFB64", "c": "Telesec encryption" },
+"0.2.262.1.10.1.3": { "d": "oneWayFunction", "c": "Telesec mechanism" },
+"0.2.262.1.10.1.3.1": { "d": "md4", "c": "Telesec one-way function" },
+"0.2.262.1.10.1.3.2": { "d": "md5", "c": "Telesec one-way function" },
+"0.2.262.1.10.1.3.3": { "d": "sqModNX509", "c": "Telesec one-way function" },
+"0.2.262.1.10.1.3.4": { "d": "sqModNISO", "c": "Telesec one-way function" },
+"0.2.262.1.10.1.3.5": { "d": "ripemd128", "c": "Telesec one-way function" },
+"0.2.262.1.10.1.3.6": { "d": "hashUsingBlockCipher", "c": "Telesec one-way function" },
+"0.2.262.1.10.1.3.7": { "d": "mac", "c": "Telesec one-way function" },
+"0.2.262.1.10.1.3.8": { "d": "ripemd160", "c": "Telesec one-way function" },
+"0.2.262.1.10.1.4": { "d": "fecFunction", "c": "Telesec mechanism" },
+"0.2.262.1.10.1.4.1": { "d": "reedSolomon", "c": "Telesec mechanism" },
+"0.2.262.1.10.2": { "d": "module", "c": "Telesec" },
+"0.2.262.1.10.2.0": { "d": "algorithms", "c": "Telesec module" },
+"0.2.262.1.10.2.1": { "d": "attributeTypes", "c": "Telesec module" },
+"0.2.262.1.10.2.2": { "d": "certificateTypes", "c": "Telesec module" },
+"0.2.262.1.10.2.3": { "d": "messageTypes", "c": "Telesec module" },
+"0.2.262.1.10.2.4": { "d": "plProtocol", "c": "Telesec module" },
+"0.2.262.1.10.2.5": { "d": "smeAndComponentsOfSme", "c": "Telesec module" },
+"0.2.262.1.10.2.6": { "d": "fec", "c": "Telesec module" },
+"0.2.262.1.10.2.7": { "d": "usefulDefinitions", "c": "Telesec module" },
+"0.2.262.1.10.2.8": { "d": "stefiles", "c": "Telesec module" },
+"0.2.262.1.10.2.9": { "d": "sadmib", "c": "Telesec module" },
+"0.2.262.1.10.2.10": { "d": "electronicOrder", "c": "Telesec module" },
+"0.2.262.1.10.2.11": { "d": "telesecTtpAsymmetricApplication", "c": "Telesec module" },
+"0.2.262.1.10.2.12": { "d": "telesecTtpBasisApplication", "c": "Telesec module" },
+"0.2.262.1.10.2.13": { "d": "telesecTtpMessages", "c": "Telesec module" },
+"0.2.262.1.10.2.14": { "d": "telesecTtpTimeStampApplication", "c": "Telesec module" },
+"0.2.262.1.10.3": { "d": "objectClass", "c": "Telesec" },
+"0.2.262.1.10.3.0": { "d": "telesecOtherName", "c": "Telesec object class" },
+"0.2.262.1.10.3.1": { "d": "directory", "c": "Telesec object class" },
+"0.2.262.1.10.3.2": { "d": "directoryType", "c": "Telesec object class" },
+"0.2.262.1.10.3.3": { "d": "directoryGroup", "c": "Telesec object class" },
+"0.2.262.1.10.3.4": { "d": "directoryUser", "c": "Telesec object class" },
+"0.2.262.1.10.3.5": { "d": "symmetricKeyEntry", "c": "Telesec object class" },
+"0.2.262.1.10.4": { "d": "package", "c": "Telesec" },
+"0.2.262.1.10.5": { "d": "parameter", "c": "Telesec" },
+"0.2.262.1.10.6": { "d": "nameBinding", "c": "Telesec" },
+"0.2.262.1.10.7": { "d": "attribute", "c": "Telesec" },
+"0.2.262.1.10.7.0": { "d": "applicationGroupIdentifier", "c": "Telesec attribute" },
+"0.2.262.1.10.7.1": { "d": "certificateType", "c": "Telesec attribute" },
+"0.2.262.1.10.7.2": { "d": "telesecCertificate", "c": "Telesec attribute" },
+"0.2.262.1.10.7.3": { "d": "certificateNumber", "c": "Telesec attribute" },
+"0.2.262.1.10.7.4": { "d": "certificateRevocationList", "c": "Telesec attribute" },
+"0.2.262.1.10.7.5": { "d": "creationDate", "c": "Telesec attribute" },
+"0.2.262.1.10.7.6": { "d": "issuer", "c": "Telesec attribute" },
+"0.2.262.1.10.7.7": { "d": "namingAuthority", "c": "Telesec attribute" },
+"0.2.262.1.10.7.8": { "d": "publicKeyDirectory", "c": "Telesec attribute" },
+"0.2.262.1.10.7.9": { "d": "securityDomain", "c": "Telesec attribute" },
+"0.2.262.1.10.7.10": { "d": "subject", "c": "Telesec attribute" },
+"0.2.262.1.10.7.11": { "d": "timeOfRevocation", "c": "Telesec attribute" },
+"0.2.262.1.10.7.12": { "d": "userGroupReference", "c": "Telesec attribute" },
+"0.2.262.1.10.7.13": { "d": "validity", "c": "Telesec attribute" },
+"0.2.262.1.10.7.14": { "d": "zert93", "c": "Telesec attribute" },
+"0.2.262.1.10.7.15": { "d": "securityMessEnv", "c": "Telesec attribute" },
+"0.2.262.1.10.7.16": { "d": "anonymizedPublicKeyDirectory", "c": "Telesec attribute" },
+"0.2.262.1.10.7.17": { "d": "telesecGivenName", "c": "Telesec attribute" },
+"0.2.262.1.10.7.18": { "d": "nameAdditions", "c": "Telesec attribute" },
+"0.2.262.1.10.7.19": { "d": "telesecPostalCode", "c": "Telesec attribute" },
+"0.2.262.1.10.7.20": { "d": "nameDistinguisher", "c": "Telesec attribute" },
+"0.2.262.1.10.7.21": { "d": "telesecCertificateList", "c": "Telesec attribute" },
+"0.2.262.1.10.7.22": { "d": "teletrustCertificateList", "c": "Telesec attribute" },
+"0.2.262.1.10.7.23": { "d": "x509CertificateList", "c": "Telesec attribute" },
+"0.2.262.1.10.7.24": { "d": "timeOfIssue", "c": "Telesec attribute" },
+"0.2.262.1.10.7.25": { "d": "physicalCardNumber", "c": "Telesec attribute" },
+"0.2.262.1.10.7.26": { "d": "fileType", "c": "Telesec attribute" },
+"0.2.262.1.10.7.27": { "d": "ctlFileIsArchive", "c": "Telesec attribute" },
+"0.2.262.1.10.7.28": { "d": "emailAddress", "c": "Telesec attribute" },
+"0.2.262.1.10.7.29": { "d": "certificateTemplateList", "c": "Telesec attribute" },
+"0.2.262.1.10.7.30": { "d": "directoryName", "c": "Telesec attribute" },
+"0.2.262.1.10.7.31": { "d": "directoryTypeName", "c": "Telesec attribute" },
+"0.2.262.1.10.7.32": { "d": "directoryGroupName", "c": "Telesec attribute" },
+"0.2.262.1.10.7.33": { "d": "directoryUserName", "c": "Telesec attribute" },
+"0.2.262.1.10.7.34": { "d": "revocationFlag", "c": "Telesec attribute" },
+"0.2.262.1.10.7.35": { "d": "symmetricKeyEntryName", "c": "Telesec attribute" },
+"0.2.262.1.10.7.36": { "d": "glNumber", "c": "Telesec attribute" },
+"0.2.262.1.10.7.37": { "d": "goNumber", "c": "Telesec attribute" },
+"0.2.262.1.10.7.38": { "d": "gKeyData", "c": "Telesec attribute" },
+"0.2.262.1.10.7.39": { "d": "zKeyData", "c": "Telesec attribute" },
+"0.2.262.1.10.7.40": { "d": "ktKeyData", "c": "Telesec attribute" },
+"0.2.262.1.10.7.41": { "d": "ktKeyNumber", "c": "Telesec attribute" },
+"0.2.262.1.10.7.51": { "d": "timeOfRevocationGen", "c": "Telesec attribute" },
+"0.2.262.1.10.7.52": { "d": "liabilityText", "c": "Telesec attribute" },
+"0.2.262.1.10.8": { "d": "attributeGroup", "c": "Telesec" },
+"0.2.262.1.10.9": { "d": "action", "c": "Telesec" },
+"0.2.262.1.10.10": { "d": "notification", "c": "Telesec" },
+"0.2.262.1.10.11": { "d": "snmp-mibs", "c": "Telesec" },
+"0.2.262.1.10.11.1": { "d": "securityApplication", "c": "Telesec SNMP MIBs" },
+"0.2.262.1.10.12": { "d": "certAndCrlExtensionDefinitions", "c": "Telesec" },
+"0.2.262.1.10.12.0": { "d": "liabilityLimitationFlag", "c": "Telesec cert/CRL extension" },
+"0.2.262.1.10.12.1": { "d": "telesecCertIdExt", "c": "Telesec cert/CRL extension" },
+"0.2.262.1.10.12.2": { "d": "Telesec policyIdentifier", "c": "Telesec cert/CRL extension" },
+"0.2.262.1.10.12.3": { "d": "telesecPolicyQualifierID", "c": "Telesec cert/CRL extension" },
+"0.2.262.1.10.12.4": { "d": "telesecCRLFilteredExt", "c": "Telesec cert/CRL extension" },
+"0.2.262.1.10.12.5": { "d": "telesecCRLFilterExt", "c": "Telesec cert/CRL extension" },
+"0.2.262.1.10.12.6": { "d": "telesecNamingAuthorityExt", "c": "Telesec cert/CRL extension" },
+"0.4.0.127.0.7": { "d": "bsi", "c": "BSI TR-03110/TR-03111" },
+"0.4.0.127.0.7.1": { "d": "bsiEcc", "c": "BSI TR-03111" },
+"0.4.0.127.0.7.1.1": { "d": "bsifieldType", "c": "BSI TR-03111" },
+"0.4.0.127.0.7.1.1.1": { "d": "bsiPrimeField", "c": "BSI TR-03111" },
+"0.4.0.127.0.7.1.1.2": { "d": "bsiCharacteristicTwoField", "c": "BSI TR-03111" },
+"0.4.0.127.0.7.1.1.2.2": { "d": "bsiECTLVKeyFormat", "c": "BSI TR-03111" },
+"0.4.0.127.0.7.1.1.2.2.1": { "d": "bsiECTLVPublicKey", "c": "BSI TR-03111" },
+"0.4.0.127.0.7.1.1.2.3": { "d": "bsiCharacteristicTwoBasis", "c": "BSI TR-03111" },
+"0.4.0.127.0.7.1.1.2.3.1": { "d": "bsiGnBasis", "c": "BSI TR-03111" },
+"0.4.0.127.0.7.1.1.2.3.2": { "d": "bsiTpBasis", "c": "BSI TR-03111" },
+"0.4.0.127.0.7.1.1.2.3.3": { "d": "bsiPpBasis", "c": "BSI TR-03111" },
+"0.4.0.127.0.7.1.1.4.1": { "d": "bsiEcdsaSignatures", "c": "BSI TR-03111" },
+"0.4.0.127.0.7.1.1.4.1.1": { "d": "bsiEcdsaWithSHA1", "c": "BSI TR-03111" },
+"0.4.0.127.0.7.1.1.4.1.2": { "d": "bsiEcdsaWithSHA224", "c": "BSI TR-03111" },
+"0.4.0.127.0.7.1.1.4.1.3": { "d": "bsiEcdsaWithSHA256", "c": "BSI TR-03111" },
+"0.4.0.127.0.7.1.1.4.1.4": { "d": "bsiEcdsaWithSHA384", "c": "BSI TR-03111" },
+"0.4.0.127.0.7.1.1.4.1.5": { "d": "bsiEcdsaWithSHA512", "c": "BSI TR-03111" },
+"0.4.0.127.0.7.1.1.4.1.6": { "d": "bsiEcdsaWithRIPEMD160", "c": "BSI TR-03111" },
+"0.4.0.127.0.7.1.1.5.1.1": { "d": "bsiEckaEgX963KDF", "c": "BSI TR-03111" },
+"0.4.0.127.0.7.1.1.5.1.1.1": { "d": "bsiEckaEgX963KDFWithSHA1", "c": "BSI TR-03111" },
+"0.4.0.127.0.7.1.1.5.1.1.2": { "d": "bsiEckaEgX963KDFWithSHA224", "c": "BSI TR-03111" },
+"0.4.0.127.0.7.1.1.5.1.1.3": { "d": "bsiEckaEgX963KDFWithSHA256", "c": "BSI TR-03111" },
+"0.4.0.127.0.7.1.1.5.1.1.4": { "d": "bsiEckaEgX963KDFWithSHA384", "c": "BSI TR-03111" },
+"0.4.0.127.0.7.1.1.5.1.1.5": { "d": "bsiEckaEgX963KDFWithSHA512", "c": "BSI TR-03111" },
+"0.4.0.127.0.7.1.1.5.1.1.6": { "d": "bsiEckaEgX963KDFWithRIPEMD160", "c": "BSI TR-03111" },
+"0.4.0.127.0.7.1.1.5.1.2": { "d": "bsiEckaEgSessionKDF", "c": "BSI TR-03111" },
+"0.4.0.127.0.7.1.1.5.1.2.1": { "d": "bsiEckaEgSessionKDFWith3DES", "c": "BSI TR-03111" },
+"0.4.0.127.0.7.1.1.5.1.2.2": { "d": "bsiEckaEgSessionKDFWithAES128", "c": "BSI TR-03111" },
+"0.4.0.127.0.7.1.1.5.1.2.3": { "d": "bsiEckaEgSessionKDFWithAES192", "c": "BSI TR-03111" },
+"0.4.0.127.0.7.1.1.5.1.2.4": { "d": "bsiEckaEgSessionKDFWithAES256", "c": "BSI TR-03111" },
+"0.4.0.127.0.7.1.1.5.2": { "d": "bsiEckaDH", "c": "BSI TR-03111" },
+"0.4.0.127.0.7.1.1.5.2.1": { "d": "bsiEckaDHX963KDF", "c": "BSI TR-03111" },
+"0.4.0.127.0.7.1.1.5.2.1.1": { "d": "bsiEckaDHX963KDFWithSHA1", "c": "BSI TR-03111" },
+"0.4.0.127.0.7.1.1.5.2.1.2": { "d": "bsiEckaDHX963KDFWithSHA224", "c": "BSI TR-03111" },
+"0.4.0.127.0.7.1.1.5.2.1.3": { "d": "bsiEckaDHX963KDFWithSHA256", "c": "BSI TR-03111" },
+"0.4.0.127.0.7.1.1.5.2.1.4": { "d": "bsiEckaDHX963KDFWithSHA384", "c": "BSI TR-03111" },
+"0.4.0.127.0.7.1.1.5.2.1.5": { "d": "bsiEckaDHX963KDFWithSHA512", "c": "BSI TR-03111" },
+"0.4.0.127.0.7.1.1.5.2.1.6": { "d": "bsiEckaDHX963KDFWithRIPEMD160", "c": "BSI TR-03111" },
+"0.4.0.127.0.7.1.1.5.2.2": { "d": "bsiEckaDHSessionKDF", "c": "BSI TR-03111" },
+"0.4.0.127.0.7.1.1.5.2.2.1": { "d": "bsiEckaDHSessionKDFWith3DES", "c": "BSI TR-03111" },
+"0.4.0.127.0.7.1.1.5.2.2.2": { "d": "bsiEckaDHSessionKDFWithAES128", "c": "BSI TR-03111" },
+"0.4.0.127.0.7.1.1.5.2.2.3": { "d": "bsiEckaDHSessionKDFWithAES192", "c": "BSI TR-03111" },
+"0.4.0.127.0.7.1.1.5.2.2.4": { "d": "bsiEckaDHSessionKDFWithAES256", "c": "BSI TR-03111" },
+"0.4.0.127.0.7.1.2": { "d": "bsiEcKeyType", "c": "BSI TR-03111" },
+"0.4.0.127.0.7.1.2.1": { "d": "bsiEcPublicKey", "c": "BSI TR-03111" },
+"0.4.0.127.0.7.1.5.1": { "d": "bsiKaeg", "c": "BSI TR-03111" },
+"0.4.0.127.0.7.1.5.1.1": { "d": "bsiKaegWithX963KDF", "c": "BSI TR-03111" },
+"0.4.0.127.0.7.1.5.1.2": { "d": "bsiKaegWith3DESKDF", "c": "BSI TR-03111" },
+"0.4.0.127.0.7.2.2.1": { "d": "bsiPK", "c": "BSI TR-03110. Formerly known as bsiCA, now moved to ...2.2.3.x" },
+"0.4.0.127.0.7.2.2.1.1": { "d": "bsiPK_DH", "c": "BSI TR-03110. Formerly known as bsiCA_DH, now moved to ...2.2.3.x" },
+"0.4.0.127.0.7.2.2.1.2": { "d": "bsiPK_ECDH", "c": "BSI TR-03110. Formerly known as bsiCA_ECDH, now moved to ...2.2.3.x" },
+"0.4.0.127.0.7.2.2.2": { "d": "bsiTA", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.2.1": { "d": "bsiTA_RSA", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.2.1.1": { "d": "bsiTA_RSAv1_5_SHA1", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.2.1.2": { "d": "bsiTA_RSAv1_5_SHA256", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.2.1.3": { "d": "bsiTA_RSAPSS_SHA1", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.2.1.4": { "d": "bsiTA_RSAPSS_SHA256", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.2.1.5": { "d": "bsiTA_RSAv1_5_SHA512", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.2.1.6": { "d": "bsiTA_RSAPSS_SHA512", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.2.2": { "d": "bsiTA_ECDSA", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.2.2.1": { "d": "bsiTA_ECDSA_SHA1", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.2.2.2": { "d": "bsiTA_ECDSA_SHA224", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.2.2.3": { "d": "bsiTA_ECDSA_SHA256", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.2.2.4": { "d": "bsiTA_ECDSA_SHA384", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.2.2.5": { "d": "bsiTA_ECDSA_SHA512", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.3": { "d": "bsiCA", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.3.1": { "d": "bsiCA_DH", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.3.1.1": { "d": "bsiCA_DH_3DES_CBC_CBC", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.3.1.2": { "d": "bsiCA_DH_AES_CBC_CMAC_128", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.3.1.3": { "d": "bsiCA_DH_AES_CBC_CMAC_192", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.3.1.4": { "d": "bsiCA_DH_AES_CBC_CMAC_256", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.3.2": { "d": "bsiCA_ECDH", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.3.2.1": { "d": "bsiCA_ECDH_3DES_CBC_CBC", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.3.2.2": { "d": "bsiCA_ECDH_AES_CBC_CMAC_128", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.3.2.3": { "d": "bsiCA_ECDH_AES_CBC_CMAC_192", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.3.2.4": { "d": "bsiCA_ECDH_AES_CBC_CMAC_256", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.4": { "d": "bsiPACE", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.4.1": { "d": "bsiPACE_DH_GM", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.4.1.1": { "d": "bsiPACE_DH_GM_3DES_CBC_CBC", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.4.1.2": { "d": "bsiPACE_DH_GM_AES_CBC_CMAC_128", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.4.1.3": { "d": "bsiPACE_DH_GM_AES_CBC_CMAC_192", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.4.1.4": { "d": "bsiPACE_DH_GM_AES_CBC_CMAC_256", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.4.2": { "d": "bsiPACE_ECDH_GM", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.4.2.1": { "d": "bsiPACE_ECDH_GM_3DES_CBC_CBC", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.4.2.2": { "d": "bsiPACE_ECDH_GM_AES_CBC_CMAC_128", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.4.2.3": { "d": "bsiPACE_ECDH_GM_AES_CBC_CMAC_192", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.4.2.4": { "d": "bsiPACE_ECDH_GM_AES_CBC_CMAC_256", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.4.3": { "d": "bsiPACE_DH_IM", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.4.3.1": { "d": "bsiPACE_DH_IM_3DES_CBC_CBC", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.4.3.2": { "d": "bsiPACE_DH_IM_AES_CBC_CMAC_128", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.4.3.3": { "d": "bsiPACE_DH_IM_AES_CBC_CMAC_192", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.4.3.4": { "d": "bsiPACE_DH_IM_AES_CBC_CMAC_256", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.4.4": { "d": "bsiPACE_ECDH_IM", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.4.4.1": { "d": "bsiPACE_ECDH_IM_3DES_CBC_CBC", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.4.4.2": { "d": "bsiPACE_ECDH_IM_AES_CBC_CMAC_128", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.4.4.3": { "d": "bsiPACE_ECDH_IM_AES_CBC_CMAC_192", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.4.4.4": { "d": "bsiPACE_ECDH_IM_AES_CBC_CMAC_256", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.5": { "d": "bsiRI", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.5.1": { "d": "bsiRI_DH", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.5.1.1": { "d": "bsiRI_DH_SHA1", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.5.1.2": { "d": "bsiRI_DH_SHA224", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.5.1.3": { "d": "bsiRI_DH_SHA256", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.5.1.4": { "d": "bsiRI_DH_SHA384", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.5.1.5": { "d": "bsiRI_DH_SHA512", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.5.2": { "d": "bsiRI_ECDH", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.5.2.1": { "d": "bsiRI_ECDH_SHA1", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.5.2.2": { "d": "bsiRI_ECDH_SHA224", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.5.2.3": { "d": "bsiRI_ECDH_SHA256", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.5.2.4": { "d": "bsiRI_ECDH_SHA384", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.5.2.5": { "d": "bsiRI_ECDH_SHA512", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.6": { "d": "bsiCardInfo", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.7": { "d": "bsiEidSecurity", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.2.2.8": { "d": "bsiPT", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.3.1.2": { "d": "bsiEACRoles", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.3.1.2.1": { "d": "bsiEACRolesIS", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.3.1.2.2": { "d": "bsiEACRolesAT", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.3.1.2.3": { "d": "bsiEACRolesST", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.3.1.3": { "d": "bsiTAv2ce", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.3.1.3.1": { "d": "bsiTAv2ceDescription", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.3.1.3.1.1": { "d": "bsiTAv2ceDescriptionPlainText", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.3.1.3.1.2": { "d": "bsiTAv2ceDescriptionIA5String", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.3.1.3.1.3": { "d": "bsiTAv2ceDescriptionOctetString", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.3.1.3.2": { "d": "bsiTAv2ceTerminalSector", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.3.1.4": { "d": "bsiAuxData", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.3.1.4.1": { "d": "bsiAuxDataBirthday", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.3.1.4.2": { "d": "bsiAuxDataExpireDate", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.3.1.4.3": { "d": "bsiAuxDataCommunityID", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.3.1.5": { "d": "bsiDefectList", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.3.1.5.1": { "d": "bsiDefectAuthDefect", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.3.1.5.1.1": { "d": "bsiDefectCertRevoked", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.3.1.5.1.2": { "d": "bsiDefectCertReplaced", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.3.1.5.1.3": { "d": "bsiDefectChipAuthKeyRevoked", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.3.1.5.1.4": { "d": "bsiDefectActiveAuthKeyRevoked", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.3.1.5.2": { "d": "bsiDefectEPassportDefect", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.3.1.5.2.1": { "d": "bsiDefectEPassportDGMalformed", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.3.1.5.2.2": { "d": "bsiDefectSODInvalid", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.3.1.5.3": { "d": "bsiDefectEIDDefect", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.3.1.5.3.1": { "d": "bsiDefectEIDDGMalformed", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.3.1.5.3.2": { "d": "bsiDefectEIDIntegrity", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.3.1.5.4": { "d": "bsiDefectDocumentDefect", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.3.1.5.4.1": { "d": "bsiDefectCardSecurityMalformed", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.3.1.5.4.2": { "d": "bsiDefectChipSecurityMalformed", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.3.1.5.4.3": { "d": "bsiDefectPowerDownReq", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.3.1.6": { "d": "bsiListContentDescription", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.3.2.1": { "d": "bsiSecurityObject", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.3.2.2": { "d": "bsiBlackList", "c": "BSI TR-03110" },
+"0.4.0.127.0.7.3.4.2.2": { "d": "bsiSignedUpdateDeviceAdmin", "c": "BSI TR-03109" },
+"0.4.0.127.0.7.4.1.1.1": { "d": "bsiCertReqMsgs", "c": "BSI TR-03109" },
+"0.4.0.127.0.7.4.1.1.2": { "d": "bsiCertReqMsgswithOuterSignature", "c": "BSI TR-03109" },
+"0.4.0.127.0.7.4.1.1.3": { "d": "bsiAuthorizedCertReqMsgs", "c": "BSI TR-03109" },
+"0.4.0.127.0.7.4.1.2.2": { "d": "bsiSignedRevReqs", "c": "BSI TR-03109" },
+"0.4.0.1862": { "d": "etsiQcsProfile", "c": "ETSI TS 101 862 qualified certificates" },
+"0.4.0.1862.1": { "d": "etsiQcs", "c": "ETSI TS 101 862 qualified certificates" },
+"0.4.0.1862.1.1": { "d": "etsiQcsCompliance", "c": "ETSI TS 101 862 qualified certificates" },
+"0.4.0.1862.1.2": { "d": "etsiQcsLimitValue", "c": "ETSI TS 101 862 qualified certificates" },
+"0.4.0.1862.1.3": { "d": "etsiQcsRetentionPeriod", "c": "ETSI TS 101 862 qualified certificates" },
+"0.4.0.1862.1.4": { "d": "etsiQcsQcSSCD", "c": "ETSI TS 101 862 qualified certificates" },
+"0.9.2342.19200300.100.1.1": { "d": "userID", "c": "Some oddball X.500 attribute collection" },
+"0.9.2342.19200300.100.1.3": { "d": "rfc822Mailbox", "c": "Some oddball X.500 attribute collection" },
+"0.9.2342.19200300.100.1.25": { "d": "domainComponent", "c": "Men are from Mars, this OID is from Pluto" },
+"1.0.10118.3.0.49": { "d": "ripemd160", "c": "ISO 10118-3 hash function" },
+"1.0.10118.3.0.50": { "d": "ripemd128", "c": "ISO 10118-3 hash function" },
+"1.0.10118.3.0.55": { "d": "whirlpool", "c": "ISO 10118-3 hash function" },
+"1.2.36.1.3.1.1.1": { "d": "qgpki", "c": "Queensland Government PKI" },
+"1.2.36.1.3.1.1.1.1": { "d": "qgpkiPolicies", "c": "QGPKI policies" },
+"1.2.36.1.3.1.1.1.1.1": { "d": "qgpkiMedIntermedCA", "c": "QGPKI policy" },
+"1.2.36.1.3.1.1.1.1.1.1": { "d": "qgpkiMedIntermedIndividual", "c": "QGPKI policy" },
+"1.2.36.1.3.1.1.1.1.1.2": { "d": "qgpkiMedIntermedDeviceControl", "c": "QGPKI policy" },
+"1.2.36.1.3.1.1.1.1.1.3": { "d": "qgpkiMedIntermedDevice", "c": "QGPKI policy" },
+"1.2.36.1.3.1.1.1.1.1.4": { "d": "qgpkiMedIntermedAuthorisedParty", "c": "QGPKI policy" },
+"1.2.36.1.3.1.1.1.1.1.5": { "d": "qgpkiMedIntermedDeviceSystem", "c": "QGPKI policy" },
+"1.2.36.1.3.1.1.1.1.2": { "d": "qgpkiMedIssuingCA", "c": "QGPKI policy" },
+"1.2.36.1.3.1.1.1.1.2.1": { "d": "qgpkiMedIssuingIndividual", "c": "QGPKI policy" },
+"1.2.36.1.3.1.1.1.1.2.2": { "d": "qgpkiMedIssuingDeviceControl", "c": "QGPKI policy" },
+"1.2.36.1.3.1.1.1.1.2.3": { "d": "qgpkiMedIssuingDevice", "c": "QGPKI policy" },
+"1.2.36.1.3.1.1.1.1.2.4": { "d": "qgpkiMedIssuingAuthorisedParty", "c": "QGPKI policy" },
+"1.2.36.1.3.1.1.1.1.2.5": { "d": "qgpkiMedIssuingClientAuth", "c": "QGPKI policy" },
+"1.2.36.1.3.1.1.1.1.2.6": { "d": "qgpkiMedIssuingServerAuth", "c": "QGPKI policy" },
+"1.2.36.1.3.1.1.1.1.2.7": { "d": "qgpkiMedIssuingDataProt", "c": "QGPKI policy" },
+"1.2.36.1.3.1.1.1.1.2.8": { "d": "qgpkiMedIssuingTokenAuth", "c": "QGPKI policy" },
+"1.2.36.1.3.1.1.1.1.3": { "d": "qgpkiBasicIntermedCA", "c": "QGPKI policy" },
+"1.2.36.1.3.1.1.1.1.3.1": { "d": "qgpkiBasicIntermedDeviceSystem", "c": "QGPKI policy" },
+"1.2.36.1.3.1.1.1.1.4": { "d": "qgpkiBasicIssuingCA", "c": "QGPKI policy" },
+"1.2.36.1.3.1.1.1.1.4.1": { "d": "qgpkiBasicIssuingClientAuth", "c": "QGPKI policy" },
+"1.2.36.1.3.1.1.1.1.4.2": { "d": "qgpkiBasicIssuingServerAuth", "c": "QGPKI policy" },
+"1.2.36.1.3.1.1.1.1.4.3": { "d": "qgpkiBasicIssuingDataSigning", "c": "QGPKI policy" },
+"1.2.36.1.3.1.1.1.2": { "d": "qgpkiAssuranceLevel", "c": "QGPKI assurance level" },
+"1.2.36.1.3.1.1.1.2.1": { "d": "qgpkiAssuranceRudimentary", "c": "QGPKI assurance level" },
+"1.2.36.1.3.1.1.1.2.2": { "d": "qgpkiAssuranceBasic", "c": "QGPKI assurance level" },
+"1.2.36.1.3.1.1.1.2.3": { "d": "qgpkiAssuranceMedium", "c": "QGPKI assurance level" },
+"1.2.36.1.3.1.1.1.2.4": { "d": "qgpkiAssuranceHigh", "c": "QGPKI assurance level" },
+"1.2.36.1.3.1.1.1.3": { "d": "qgpkiCertFunction", "c": "QGPKI policies" },
+"1.2.36.1.3.1.1.1.3.1": { "d": "qgpkiFunctionIndividual", "c": "QGPKI policies" },
+"1.2.36.1.3.1.1.1.3.2": { "d": "qgpkiFunctionDevice", "c": "QGPKI policies" },
+"1.2.36.1.3.1.1.1.3.3": { "d": "qgpkiFunctionAuthorisedParty", "c": "QGPKI policies" },
+"1.2.36.1.3.1.1.1.3.4": { "d": "qgpkiFunctionDeviceControl", "c": "QGPKI policies" },
+"1.2.36.1.3.1.2": { "d": "qpspki", "c": "Queensland Police PKI" },
+"1.2.36.1.3.1.2.1": { "d": "qpspkiPolicies", "c": "Queensland Police PKI" },
+"1.2.36.1.3.1.2.1.2": { "d": "qpspkiPolicyBasic", "c": "Queensland Police PKI" },
+"1.2.36.1.3.1.2.1.3": { "d": "qpspkiPolicyMedium", "c": "Queensland Police PKI" },
+"1.2.36.1.3.1.2.1.4": { "d": "qpspkiPolicyHigh", "c": "Queensland Police PKI" },
+"1.2.36.1.3.1.3.2": { "d": "qtmrpki", "c": "Queensland Transport PKI" },
+"1.2.36.1.3.1.3.2.1": { "d": "qtmrpkiPolicies", "c": "Queensland Transport PKI" },
+"1.2.36.1.3.1.3.2.2": { "d": "qtmrpkiPurpose", "c": "Queensland Transport PKI" },
+"1.2.36.1.3.1.3.2.2.1": { "d": "qtmrpkiIndividual", "c": "Queensland Transport PKI purpose" },
+"1.2.36.1.3.1.3.2.2.2": { "d": "qtmrpkiDeviceControl", "c": "Queensland Transport PKI purpose" },
+"1.2.36.1.3.1.3.2.2.3": { "d": "qtmrpkiDevice", "c": "Queensland Transport PKI purpose" },
+"1.2.36.1.3.1.3.2.2.4": { "d": "qtmrpkiAuthorisedParty", "c": "Queensland Transport PKI purpose" },
+"1.2.36.1.3.1.3.2.2.5": { "d": "qtmrpkiDeviceSystem", "c": "Queensland Transport PKI purpose" },
+"1.2.36.1.3.1.3.2.3": { "d": "qtmrpkiDevice", "c": "Queensland Transport PKI" },
+"1.2.36.1.3.1.3.2.3.1": { "d": "qtmrpkiDriverLicense", "c": "Queensland Transport PKI device" },
+"1.2.36.1.3.1.3.2.3.2": { "d": "qtmrpkiIndustryAuthority", "c": "Queensland Transport PKI device" },
+"1.2.36.1.3.1.3.2.3.3": { "d": "qtmrpkiMarineLicense", "c": "Queensland Transport PKI device" },
+"1.2.36.1.3.1.3.2.3.4": { "d": "qtmrpkiAdultProofOfAge", "c": "Queensland Transport PKI device" },
+"1.2.36.1.3.1.3.2.3.5": { "d": "qtmrpkiSam", "c": "Queensland Transport PKI device" },
+"1.2.36.1.3.1.3.2.4": { "d": "qtmrpkiAuthorisedParty", "c": "Queensland Transport PKI" },
+"1.2.36.1.3.1.3.2.4.1": { "d": "qtmrpkiTransportInspector", "c": "Queensland Transport PKI authorised party" },
+"1.2.36.1.3.1.3.2.4.2": { "d": "qtmrpkiPoliceOfficer", "c": "Queensland Transport PKI authorised party" },
+"1.2.36.1.3.1.3.2.4.3": { "d": "qtmrpkiSystem", "c": "Queensland Transport PKI authorised party" },
+"1.2.36.1.3.1.3.2.4.4": { "d": "qtmrpkiLiquorLicensingInspector", "c": "Queensland Transport PKI authorised party" },
+"1.2.36.1.3.1.3.2.4.5": { "d": "qtmrpkiMarineEnforcementOfficer", "c": "Queensland Transport PKI authorised party" },
+"1.2.36.1.333.1": { "d": "australianBusinessNumber", "c": "Australian Government corporate taxpayer ID" },
+"1.2.36.68980861.1.1.2": { "d": "signetPersonal", "c": "Signet CA" },
+"1.2.36.68980861.1.1.3": { "d": "signetBusiness", "c": "Signet CA" },
+"1.2.36.68980861.1.1.4": { "d": "signetLegal", "c": "Signet CA" },
+"1.2.36.68980861.1.1.10": { "d": "signetPilot", "c": "Signet CA" },
+"1.2.36.68980861.1.1.11": { "d": "signetIntraNet", "c": "Signet CA" },
+"1.2.36.68980861.1.1.20": { "d": "signetPolicy", "c": "Signet CA" },
+"1.2.36.75878867.1.100.1.1": { "d": "certificatesAustraliaPolicy", "c": "Certificates Australia CA" },
+"1.2.156.10197.1": { "d": "gmtCryptographicAlgorithm", "c": "China GM Standards Committee" },
+"1.2.156.10197.1.100": { "d": "gmtBlockCipher", "c": "China GM Standards Committee" },
+"1.2.156.10197.1.102": { "d": "sm1Cipher", "c": "China GM Standards Committee" },
+"1.2.156.10197.1.103": { "d": "ssf33Cipher", "c": "China GM Standards Committee" },
+"1.2.156.10197.1.104": { "d": "sm4Cipher", "c": "China GM Standards Committee" },
+"1.2.156.10197.1.200": { "d": "gmtStreamCipher", "c": "China GM Standards Committee" },
+"1.2.156.10197.1.201": { "d": "zucCipher", "c": "China GM Standards Committee" },
+"1.2.156.10197.1.300": { "d": "gmtPublicKeyCryptography", "c": "China GM Standards Committee" },
+"1.2.156.10197.1.301": { "d": "sm2ECC", "c": "China GM Standards Committee" },
+"1.2.156.10197.1.301.1": { "d": "sm2-1DigitalSignature", "c": "China GM Standards Committee" },
+"1.2.156.10197.1.301.2": { "d": "sm2-2KeyExchange", "c": "China GM Standards Committee" },
+"1.2.156.10197.1.301.3": { "d": "sm2-3PublicKeyEncryption", "c": "China GM Standards Committee" },
+"1.2.156.10197.1.302": { "d": "gmtSM9IBE", "c": "China GM Standards Committee" },
+"1.2.156.10197.1.302.1": { "d": "sm9-1DigitalSignature", "c": "China GM Standards Committee" },
+"1.2.156.10197.1.302.2": { "d": "sm9-2KeyExchange", "c": "China GM Standards Committee" },
+"1.2.156.10197.1.302.3": { "d": "sm9-3PublicKeyEncryption", "c": "China GM Standards Committee" },
+"1.2.156.10197.1.400": { "d": "gmtHashAlgorithm", "c": "China GM Standards Committee" },
+"1.2.156.10197.1.401": { "d": "sm3Hash", "c": "China GM Standards Committee" },
+"1.2.156.10197.1.401.1": { "d": "sm3HashWithoutKey", "c": "China GM Standards Committee" },
+"1.2.156.10197.1.401.2": { "d": "sm3HashWithKey", "c": "China GM Standards Committee" },
+"1.2.156.10197.1.500": { "d": "gmtDigestSigning", "c": "China GM Standards Committee" },
+"1.2.156.10197.1.501": { "d": "sm2withSM3", "c": "China GM Standards Committee" },
+"1.2.156.10197.1.504": { "d": "rsaWithSM3", "c": "China GM Standards Committee" },
+"1.2.156.10197.4.3": { "d": "gmtCertificateAuthority", "c": "China GM Standards Committee" },
+"1.2.156.10197.6": { "d": "gmtStandardClass", "c": "China GM Standards Committee" },
+"1.2.156.10197.6.1": { "d": "gmtFoundationClass", "c": "China GM Standards Committee" },
+"1.2.156.10197.6.1.1": { "d": "gmtAlgorithmClass", "c": "China GM Standards Committee" },
+"1.2.156.10197.6.1.1.1": { "d": "zucStandard", "c": "China GM Standards Committee" },
+"1.2.156.10197.6.1.1.2": { "d": "sm4Standard", "c": "China GM Standards Committee" },
+"1.2.156.10197.6.1.1.3": { "d": "sm2Standard", "c": "China GM Standards Committee" },
+"1.2.156.10197.6.1.1.4": { "d": "sm3Standard", "c": "China GM Standards Committee" },
+"1.2.156.10197.6.1.2": { "d": "gmtIDClass", "c": "China GM Standards Committee" },
+"1.2.156.10197.6.1.2.1": { "d": "gmtCryptoID", "c": "China GM Standards Committee" },
+"1.2.156.10197.6.1.3": { "d": "gmtOperationModes", "c": "China GM Standards Committee" },
+"1.2.156.10197.6.1.4": { "d": "gmtSecurityMechanism", "c": "China GM Standards Committee" },
+"1.2.156.10197.6.1.4.1": { "d": "gmtSM2Specification", "c": "China GM Standards Committee" },
+"1.2.156.10197.6.1.4.2": { "d": "gmtSM2CryptographicMessageSyntax", "c": "China GM Standards Committee" },
+"1.2.156.10197.6.2": { "d": "gmtDeviceClass", "c": "China GM Standards Committee" },
+"1.2.156.10197.6.3": { "d": "gmtServiceClass", "c": "China GM Standards Committee" },
+"1.2.156.10197.6.4": { "d": "gmtInfrastructure", "c": "China GM Standards Committee" },
+"1.2.156.10197.6.5": { "d": "gmtTestingClass", "c": "China GM Standards Committee" },
+"1.2.156.10197.6.5.1": { "d": "gmtRandomTestingClass", "c": "China GM Standards Committee" },
+"1.2.156.10197.6.6": { "d": "gmtManagementClass", "c": "China GM Standards Committee" },
+"1.2.392.200011.61.1.1.1": { "d": "mitsubishiSecurityAlgorithm", "c": "Mitsubishi security algorithm" },
+"1.2.392.200011.61.1.1.1.1": { "d": "misty1-cbc", "c": "Mitsubishi security algorithm" },
+"1.2.410.200004.1": { "d": "kisaAlgorithm", "c": "KISA algorithm" },
+"1.2.410.200004.1.1": { "d": "kcdsa", "c": "Korean DSA" },
+"1.2.410.200004.1.2": { "d": "has160", "c": "Korean hash algorithm" },
+"1.2.410.200004.1.3": { "d": "seedECB", "c": "Korean SEED algorithm, ECB mode" },
+"1.2.410.200004.1.4": { "d": "seedCBC", "c": "Korean SEED algorithm, CBC mode" },
+"1.2.410.200004.1.5": { "d": "seedOFB", "c": "Korean SEED algorithm, OFB mode" },
+"1.2.410.200004.1.6": { "d": "seedCFB", "c": "Korean SEED algorithm, CFB mode" },
+"1.2.410.200004.1.7": { "d": "seedMAC", "c": "Korean SEED algorithm, MAC mode" },
+"1.2.410.200004.1.8": { "d": "kcdsaWithHAS160", "c": "Korean signature algorithm" },
+"1.2.410.200004.1.9": { "d": "kcdsaWithSHA1", "c": "Korean signature algorithm" },
+"1.2.410.200004.1.10": { "d": "pbeWithHAS160AndSEED-ECB", "c": "Korean SEED algorithm, PBE key derivation" },
+"1.2.410.200004.1.11": { "d": "pbeWithHAS160AndSEED-CBC", "c": "Korean SEED algorithm, PBE key derivation" },
+"1.2.410.200004.1.12": { "d": "pbeWithHAS160AndSEED-CFB", "c": "Korean SEED algorithm, PBE key derivation" },
+"1.2.410.200004.1.13": { "d": "pbeWithHAS160AndSEED-OFB", "c": "Korean SEED algorithm, PBE key derivation" },
+"1.2.410.200004.1.14": { "d": "pbeWithSHA1AndSEED-ECB", "c": "Korean SEED algorithm, PBE key derivation" },
+"1.2.410.200004.1.15": { "d": "pbeWithSHA1AndSEED-CBC", "c": "Korean SEED algorithm, PBE key derivation" },
+"1.2.410.200004.1.16": { "d": "pbeWithSHA1AndSEED-CFB", "c": "Korean SEED algorithm, PBE key derivation" },
+"1.2.410.200004.1.17": { "d": "pbeWithSHA1AndSEED-OFB", "c": "Korean SEED algorithm, PBE key derivation" },
+"1.2.410.200004.1.20": { "d": "rsaWithHAS160", "c": "Korean signature algorithm" },
+"1.2.410.200004.1.21": { "d": "kcdsa1", "c": "Korean DSA" },
+"1.2.410.200004.2": { "d": "npkiCP", "c": "KISA NPKI certificate policies" },
+"1.2.410.200004.2.1": { "d": "npkiSignaturePolicy", "c": "KISA NPKI certificate policies" },
+"1.2.410.200004.3": { "d": "npkiKP", "c": "KISA NPKI key usage" },
+"1.2.410.200004.4": { "d": "npkiAT", "c": "KISA NPKI attribute" },
+"1.2.410.200004.5": { "d": "npkiLCA", "c": "KISA NPKI licensed CA" },
+"1.2.410.200004.5.1": { "d": "npkiSignKorea", "c": "KISA NPKI licensed CA" },
+"1.2.410.200004.5.2": { "d": "npkiSignGate", "c": "KISA NPKI licensed CA" },
+"1.2.410.200004.5.3": { "d": "npkiNcaSign", "c": "KISA NPKI licensed CA" },
+"1.2.410.200004.6": { "d": "npkiON", "c": "KISA NPKI otherName" },
+"1.2.410.200004.7": { "d": "npkiAPP", "c": "KISA NPKI application" },
+"1.2.410.200004.7.1": { "d": "npkiSMIME", "c": "KISA NPKI application" },
+"1.2.410.200004.7.1.1": { "d": "npkiSMIMEAlgo", "c": "KISA NPKI application" },
+"1.2.410.200004.7.1.1.1": { "d": "npkiCmsSEEDWrap", "c": "KISA NPKI application" },
+"1.2.410.200004.10": { "d": "npki", "c": "KISA NPKI" },
+"1.2.410.200004.10.1": { "d": "npkiAttribute", "c": "KISA NPKI attribute" },
+"1.2.410.200004.10.1.1": { "d": "npkiIdentifyData", "c": "KISA NPKI attribute" },
+"1.2.410.200004.10.1.1.1": { "d": "npkiVID", "c": "KISA NPKI attribute" },
+"1.2.410.200004.10.1.1.2": { "d": "npkiEncryptedVID", "c": "KISA NPKI attribute" },
+"1.2.410.200004.10.1.1.3": { "d": "npkiRandomNum", "c": "KISA NPKI attribute" },
+"1.2.410.200004.10.1.1.4": { "d": "npkiVID", "c": "KISA NPKI attribute" },
+"1.2.410.200046.1.1": { "d": "aria1AlgorithmModes", "c": "ARIA algorithm modes" },
+"1.2.410.200046.1.1.1": { "d": "aria128-ecb", "c": "ARIA algorithm modes" },
+"1.2.410.200046.1.1.2": { "d": "aria128-cbc", "c": "ARIA algorithm modes" },
+"1.2.410.200046.1.1.3": { "d": "aria128-cfb", "c": "ARIA algorithm modes" },
+"1.2.410.200046.1.1.4": { "d": "aria128-ofb", "c": "ARIA algorithm modes" },
+"1.2.410.200046.1.1.5": { "d": "aria128-ctr", "c": "ARIA algorithm modes" },
+"1.2.410.200046.1.1.6": { "d": "aria192-ecb", "c": "ARIA algorithm modes" },
+"1.2.410.200046.1.1.7": { "d": "aria192-cbc", "c": "ARIA algorithm modes" },
+"1.2.410.200046.1.1.8": { "d": "aria192-cfb", "c": "ARIA algorithm modes" },
+"1.2.410.200046.1.1.9": { "d": "aria192-ofb", "c": "ARIA algorithm modes" },
+"1.2.410.200046.1.1.10": { "d": "aria192-ctr", "c": "ARIA algorithm modes" },
+"1.2.410.200046.1.1.11": { "d": "aria256-ecb", "c": "ARIA algorithm modes" },
+"1.2.410.200046.1.1.12": { "d": "aria256-cbc", "c": "ARIA algorithm modes" },
+"1.2.410.200046.1.1.13": { "d": "aria256-cfb", "c": "ARIA algorithm modes" },
+"1.2.410.200046.1.1.14": { "d": "aria256-ofb", "c": "ARIA algorithm modes" },
+"1.2.410.200046.1.1.15": { "d": "aria256-ctr", "c": "ARIA algorithm modes" },
+"1.2.410.200046.1.1.21": { "d": "aria128-cmac", "c": "ARIA algorithm modes" },
+"1.2.410.200046.1.1.22": { "d": "aria192-cmac", "c": "ARIA algorithm modes" },
+"1.2.410.200046.1.1.23": { "d": "aria256-cmac", "c": "ARIA algorithm modes" },
+"1.2.410.200046.1.1.31": { "d": "aria128-ocb2", "c": "ARIA algorithm modes" },
+"1.2.410.200046.1.1.32": { "d": "aria192-ocb2", "c": "ARIA algorithm modes" },
+"1.2.410.200046.1.1.33": { "d": "aria256-ocb2", "c": "ARIA algorithm modes" },
+"1.2.410.200046.1.1.34": { "d": "aria128-gcm", "c": "ARIA algorithm modes" },
+"1.2.410.200046.1.1.35": { "d": "aria192-gcm", "c": "ARIA algorithm modes" },
+"1.2.410.200046.1.1.36": { "d": "aria256-gcm", "c": "ARIA algorithm modes" },
+"1.2.410.200046.1.1.37": { "d": "aria128-ccm", "c": "ARIA algorithm modes" },
+"1.2.410.200046.1.1.38": { "d": "aria192-ccm", "c": "ARIA algorithm modes" },
+"1.2.410.200046.1.1.39": { "d": "aria256-ccm", "c": "ARIA algorithm modes" },
+"1.2.410.200046.1.1.40": { "d": "aria128-keywrap", "c": "ARIA algorithm modes" },
+"1.2.410.200046.1.1.41": { "d": "aria192-keywrap", "c": "ARIA algorithm modes" },
+"1.2.410.200046.1.1.42": { "d": "aria256-keywrap", "c": "ARIA algorithm modes" },
+"1.2.410.200046.1.1.43": { "d": "aria128-keywrapWithPad", "c": "ARIA algorithm modes" },
+"1.2.410.200046.1.1.44": { "d": "aria192-keywrapWithPad", "c": "ARIA algorithm modes" },
+"1.2.410.200046.1.1.45": { "d": "aria256-keywrapWithPad", "c": "ARIA algorithm modes" },
+"1.2.643.2.2.3": { "d": "gostSignature", "c": "GOST R 34.10-2001 + GOST R 34.11-94 signature" },
+"1.2.643.2.2.4": { "d": "gost94Signature", "c": "GOST R 34.10-94 + GOST R 34.11-94 signature. Obsoleted by GOST R 34.10-2001", "w": true },
+"1.2.643.2.2.19": { "d": "gostPublicKey", "c": "GOST R 34.10-2001 (ECC) public key" },
+"1.2.643.2.2.20": { "d": "gost94PublicKey", "c": "GOST R 34.10-94 public key. Obsoleted by GOST R 34.10-2001", "w": true },
+"1.2.643.2.2.21": { "d": "gostCipher", "c": "GOST 28147-89 (symmetric key block cipher)" },
+"1.2.643.2.2.31.0": { "d": "testCipherParams", "c": "Test params for GOST 28147-89" },
+"1.2.643.2.2.31.1": { "d": "cryptoProCipherA", "c": "CryptoPro params A (default, variant 'Verba-O') for GOST 28147-89" },
+"1.2.643.2.2.31.2": { "d": "cryptoProCipherB", "c": "CryptoPro params B (variant 1) for GOST 28147-89" },
+"1.2.643.2.2.31.3": { "d": "cryptoProCipherC", "c": "CryptoPro params C (variant 2) for GOST 28147-89" },
+"1.2.643.2.2.31.4": { "d": "cryptoProCipherD", "c": "CryptoPro params D (variant 3) for GOST 28147-89" },
+"1.2.643.2.2.31.5": { "d": "oscar11Cipher", "c": "Oscar-1.1 params for GOST 28147-89" },
+"1.2.643.2.2.31.6": { "d": "oscar10Cipher", "c": "Oscar-1.0 params for GOST 28147-89" },
+"1.2.643.2.2.31.7": { "d": "ric1Cipher", "c": "RIC-1 params for GOST 28147-89" },
+"1.2.643.2.2.31.12": { "d": "tc26CipherA", "c": "TC26 params 2 for GOST 28147-89" },
+"1.2.643.2.2.31.13": { "d": "tc26CipherB", "c": "TC26 params 1 for GOST 28147-89" },
+"1.2.643.2.2.31.14": { "d": "tc26CipherC", "c": "TC26 params 3 for GOST 28147-89" },
+"1.2.643.2.2.31.15": { "d": "tc26CipherD", "c": "TC26 params 4 for GOST 28147-89" },
+"1.2.643.2.2.31.16": { "d": "tc26CipherE", "c": "TC26 params 5 for GOST 28147-89" },
+"1.2.643.2.2.31.17": { "d": "tc26CipherF", "c": "TC26 params 6 for GOST 28147-89" },
+"1.2.643.7.1.2.5.1.1": { "d": "tc26CipherZ", "c": "TC26 params Z for GOST 28147-89" },
+"1.2.643.2.2.9": { "d": "gostDigest", "c": "GOST R 34.11-94 digest" },
+"1.2.643.2.2.30.0": { "d": "testDigestParams", "c": "Test params for GOST R 34.11-94" },
+"1.2.643.2.2.30.1": { "d": "cryptoProDigestA", "c": "CryptoPro digest params A (default, variant 'Verba-O') for GOST R 34.11-94" },
+"1.2.643.2.2.30.2": { "d": "cryptoProDigestB", "c": "CryptoPro digest params B (variant 1) for GOST R 34.11-94" },
+"1.2.643.2.2.30.3": { "d": "cryptoProDigestC", "c": "CryptoPro digest params C (variant 2) for GOST R 34.11-94" },
+"1.2.643.2.2.30.4": { "d": "cryptoProDigestD", "c": "CryptoPro digest params D (variant 3) for GOST R 34.11-94" },
+"1.2.643.2.2.32.2": { "d": "cryptoPro94SignA", "c": "CryptoPro sign params A (default, variant 'Verba-O') for GOST R 34.10-94" },
+"1.2.643.2.2.32.3": { "d": "cryptoPro94SignB", "c": "CryptoPro sign params B (variant 1) for GOST R 34.10-94" },
+"1.2.643.2.2.32.4": { "d": "cryptoPro94SignC", "c": "CryptoPro sign params C (variant 2) for GOST R 34.10-94" },
+"1.2.643.2.2.32.5": { "d": "cryptoPro94SignD", "c": "CryptoPro sign params D (variant 3) for GOST R 34.10-94" },
+"1.2.643.2.2.33.1": { "d": "cryptoPro94SignXA", "c": "CryptoPro sign params XA (variant 1) for GOST R 34.10-94" },
+"1.2.643.2.2.33.2": { "d": "cryptoPro94SignXB", "c": "CryptoPro sign params XB (variant 2) for GOST R 34.10-94" },
+"1.2.643.2.2.33.3": { "d": "cryptoPro94SignXC", "c": "CryptoPro sign params XC (variant 3) for GOST R 34.10-94" },
+"1.2.643.2.2.35.0": { "d": "testSignParams", "c": "Test elliptic curve for GOST R 34.10-2001" },
+"1.2.643.2.2.35.1": { "d": "cryptoProSignA", "c": "CryptoPro ell.curve A for GOST R 34.10-2001" },
+"1.2.643.2.2.35.2": { "d": "cryptoProSignB", "c": "CryptoPro ell.curve B for GOST R 34.10-2001" },
+"1.2.643.2.2.35.3": { "d": "cryptoProSignC", "c": "CryptoPro ell.curve C for GOST R 34.10-2001" },
+"1.2.643.2.2.36.0": { "d": "cryptoProSignXA", "c": "CryptoPro ell.curve XA for GOST R 34.10-2001" },
+"1.2.643.2.2.36.1": { "d": "cryptoProSignXB", "c": "CryptoPro ell.curve XB for GOST R 34.10-2001" },
+"1.2.643.7.1.2.1.1.1": { "d": "cryptoPro2012Sign256A", "c": "CryptoPro ell.curve A for GOST R 34.10-2012 256 bit" },
+"1.2.643.7.1.2.1.2.1": { "d": "cryptoPro2012Sign512A", "c": "CryptoPro ell.curve A (default) for GOST R 34.10-2012 512 bit" },
+"1.2.643.7.1.2.1.2.2": { "d": "cryptoPro2012Sign512B", "c": "CryptoPro ell.curve B for GOST R 34.10-2012 512 bit" },
+"1.2.643.7.1.2.1.2.3": { "d": "cryptoPro2012Sign512C", "c": "CryptoPro ell.curve C for GOST R 34.10-2012 512 bit" },
+"1.2.643.2.2.14.0": { "d": "nullMeshing", "c": "Do not mesh state of GOST 28147-89 cipher" },
+"1.2.643.2.2.14.1": { "d": "cryptoProMeshing", "c": "CryptoPro meshing of state of GOST 28147-89 cipher" },
+"1.2.643.2.2.10": { "d": "hmacGost", "c": "HMAC with GOST R 34.11-94" },
+"1.2.643.2.2.13.0": { "d": "gostWrap", "c": "Wrap key using GOST 28147-89 key" },
+"1.2.643.2.2.13.1": { "d": "cryptoProWrap", "c": "Wrap key using diversified GOST 28147-89 key" },
+"1.2.643.2.2.96": { "d": "cryptoProECDHWrap", "c": "Wrap key using ECC DH on GOST R 34.10-2001 keys (VKO)" },
+"1.2.643.7.1.1.1.1": { "d": "gost2012PublicKey256", "c": "GOST R 34.10-2012 256 bit public key" },
+"1.2.643.7.1.1.1.2": { "d": "gost2012PublicKey512", "c": "GOST R 34.10-2012 512 bit public key" },
+"1.2.643.7.1.1.2.2": { "d": "gost2012Digest256", "c": "GOST R 34.11-2012 256 bit digest" },
+"1.2.643.7.1.1.2.3": { "d": "gost2012Digest512", "c": "GOST R 34.11-2012 512 bit digest" },
+"1.2.643.7.1.1.3.2": { "d": "gost2012Signature256", "c": "GOST R 34.10-2012 256 bit signature" },
+"1.2.643.7.1.1.3.3": { "d": "gost2012Signature512", "c": "GOST R 34.10-2012 512 bit signature" },
+"1.2.643.7.1.1.6.1": { "d": "cryptoProECDH256", "c": "CryptoPro ECC DH algorithm for GOST R 34.10-2012 256 bit key" },
+"1.2.643.7.1.1.6.2": { "d": "cryptoProECDH512", "c": "CryptoPro ECC DH algorithm for GOST R 34.10-2012 512 bit key" },
+"1.2.752.34.1": { "d": "seis-cp", "c": "SEIS Project" },
+"1.2.752.34.1.1": { "d": "SEIS high-assurance policyIdentifier", "c": "SEIS Project certificate policies" },
+"1.2.752.34.1.2": { "d": "SEIS GAK policyIdentifier", "c": "SEIS Project certificate policies" },
+"1.2.752.34.2": { "d": "SEIS pe", "c": "SEIS Project" },
+"1.2.752.34.3": { "d": "SEIS at", "c": "SEIS Project" },
+"1.2.752.34.3.1": { "d": "SEIS at-personalIdentifier", "c": "SEIS Project attribute" },
+"1.2.840.10040.1": { "d": "module", "c": "ANSI X9.57" },
+"1.2.840.10040.1.1": { "d": "x9f1-cert-mgmt", "c": "ANSI X9.57 module" },
+"1.2.840.10040.2": { "d": "holdinstruction", "c": "ANSI X9.57" },
+"1.2.840.10040.2.1": { "d": "holdinstruction-none", "c": "ANSI X9.57 hold instruction" },
+"1.2.840.10040.2.2": { "d": "callissuer", "c": "ANSI X9.57 hold instruction" },
+"1.2.840.10040.2.3": { "d": "reject", "c": "ANSI X9.57 hold instruction" },
+"1.2.840.10040.2.4": { "d": "pickupToken", "c": "ANSI X9.57 hold instruction" },
+"1.2.840.10040.3": { "d": "attribute", "c": "ANSI X9.57" },
+"1.2.840.10040.3.1": { "d": "countersignature", "c": "ANSI X9.57 attribute" },
+"1.2.840.10040.3.2": { "d": "attribute-cert", "c": "ANSI X9.57 attribute" },
+"1.2.840.10040.4": { "d": "algorithm", "c": "ANSI X9.57" },
+"1.2.840.10040.4.1": { "d": "dsa", "c": "ANSI X9.57 algorithm" },
+"1.2.840.10040.4.2": { "d": "dsa-match", "c": "ANSI X9.57 algorithm" },
+"1.2.840.10040.4.3": { "d": "dsaWithSha1", "c": "ANSI X9.57 algorithm" },
+"1.2.840.10045.1": { "d": "fieldType", "c": "ANSI X9.62. This OID is also assigned as ecdsa-with-SHA1" },
+"1.2.840.10045.1.1": { "d": "prime-field", "c": "ANSI X9.62 field type" },
+"1.2.840.10045.1.2": { "d": "characteristic-two-field", "c": "ANSI X9.62 field type" },
+"1.2.840.10045.1.2.3": { "d": "characteristic-two-basis", "c": "ANSI X9.62 field type" },
+"1.2.840.10045.1.2.3.1": { "d": "onBasis", "c": "ANSI X9.62 field basis" },
+"1.2.840.10045.1.2.3.2": { "d": "tpBasis", "c": "ANSI X9.62 field basis" },
+"1.2.840.10045.1.2.3.3": { "d": "ppBasis", "c": "ANSI X9.62 field basis" },
+"1.2.840.10045.2": { "d": "publicKeyType", "c": "ANSI X9.62" },
+"1.2.840.10045.2.1": { "d": "ecPublicKey", "c": "ANSI X9.62 public key type" },
+"1.2.840.10045.3.0.1": { "d": "c2pnb163v1", "c": "ANSI X9.62 named elliptic curve" },
+"1.2.840.10045.3.0.2": { "d": "c2pnb163v2", "c": "ANSI X9.62 named elliptic curve" },
+"1.2.840.10045.3.0.3": { "d": "c2pnb163v3", "c": "ANSI X9.62 named elliptic curve" },
+"1.2.840.10045.3.0.5": { "d": "c2tnb191v1", "c": "ANSI X9.62 named elliptic curve" },
+"1.2.840.10045.3.0.6": { "d": "c2tnb191v2", "c": "ANSI X9.62 named elliptic curve" },
+"1.2.840.10045.3.0.7": { "d": "c2tnb191v3", "c": "ANSI X9.62 named elliptic curve" },
+"1.2.840.10045.3.0.10": { "d": "c2pnb208w1", "c": "ANSI X9.62 named elliptic curve" },
+"1.2.840.10045.3.0.11": { "d": "c2tnb239v1", "c": "ANSI X9.62 named elliptic curve" },
+"1.2.840.10045.3.0.12": { "d": "c2tnb239v2", "c": "ANSI X9.62 named elliptic curve" },
+"1.2.840.10045.3.0.13": { "d": "c2tnb239v3", "c": "ANSI X9.62 named elliptic curve" },
+"1.2.840.10045.3.0.16": { "d": "c2pnb272w1", "c": "ANSI X9.62 named elliptic curve" },
+"1.2.840.10045.3.0.18": { "d": "c2tnb359v1", "c": "ANSI X9.62 named elliptic curve" },
+"1.2.840.10045.3.0.19": { "d": "c2pnb368w1", "c": "ANSI X9.62 named elliptic curve" },
+"1.2.840.10045.3.0.20": { "d": "c2tnb431r1", "c": "ANSI X9.62 named elliptic curve" },
+"1.2.840.10045.3.1.1": { "d": "prime192v1", "c": "ANSI X9.62 named elliptic curve" },
+"1.2.840.10045.3.1.2": { "d": "prime192v2", "c": "ANSI X9.62 named elliptic curve" },
+"1.2.840.10045.3.1.3": { "d": "prime192v3", "c": "ANSI X9.62 named elliptic curve" },
+"1.2.840.10045.3.1.4": { "d": "prime239v1", "c": "ANSI X9.62 named elliptic curve" },
+"1.2.840.10045.3.1.5": { "d": "prime239v2", "c": "ANSI X9.62 named elliptic curve" },
+"1.2.840.10045.3.1.6": { "d": "prime239v3", "c": "ANSI X9.62 named elliptic curve" },
+"1.2.840.10045.3.1.7": { "d": "prime256v1", "c": "ANSI X9.62 named elliptic curve" },
+"1.2.840.10045.4.1": { "d": "ecdsaWithSHA1", "c": "ANSI X9.62 ECDSA algorithm with SHA1" },
+"1.2.840.10045.4.2": { "d": "ecdsaWithRecommended", "c": "ANSI X9.62 ECDSA algorithm with Recommended" },
+"1.2.840.10045.4.3": { "d": "ecdsaWithSpecified", "c": "ANSI X9.62 ECDSA algorithm with Specified" },
+"1.2.840.10045.4.3.1": { "d": "ecdsaWithSHA224", "c": "ANSI X9.62 ECDSA algorithm with SHA224" },
+"1.2.840.10045.4.3.2": { "d": "ecdsaWithSHA256", "c": "ANSI X9.62 ECDSA algorithm with SHA256" },
+"1.2.840.10045.4.3.3": { "d": "ecdsaWithSHA384", "c": "ANSI X9.62 ECDSA algorithm with SHA384" },
+"1.2.840.10045.4.3.4": { "d": "ecdsaWithSHA512", "c": "ANSI X9.62 ECDSA algorithm with SHA512" },
+"1.2.840.10046.1": { "d": "fieldType", "c": "ANSI X9.42" },
+"1.2.840.10046.1.1": { "d": "gf-prime", "c": "ANSI X9.42 field type" },
+"1.2.840.10046.2": { "d": "numberType", "c": "ANSI X9.42" },
+"1.2.840.10046.2.1": { "d": "dhPublicKey", "c": "ANSI X9.42 number type" },
+"1.2.840.10046.3": { "d": "scheme", "c": "ANSI X9.42" },
+"1.2.840.10046.3.1": { "d": "dhStatic", "c": "ANSI X9.42 scheme" },
+"1.2.840.10046.3.2": { "d": "dhEphem", "c": "ANSI X9.42 scheme" },
+"1.2.840.10046.3.3": { "d": "dhHybrid1", "c": "ANSI X9.42 scheme" },
+"1.2.840.10046.3.4": { "d": "dhHybrid2", "c": "ANSI X9.42 scheme" },
+"1.2.840.10046.3.5": { "d": "mqv2", "c": "ANSI X9.42 scheme" },
+"1.2.840.10046.3.6": { "d": "mqv1", "c": "ANSI X9.42 scheme" },
+"1.2.840.10065.2.2": { "d": "?", "c": "ASTM 31.20" },
+"1.2.840.10065.2.3": { "d": "healthcareLicense", "c": "ASTM 31.20" },
+"1.2.840.10065.2.3.1.1": { "d": "license?", "c": "ASTM 31.20 healthcare license type" },
+"1.2.840.10070": { "d": "iec62351", "c": "IEC 62351" },
+"1.2.840.10070.8": { "d": "iec62351_8", "c": "IEC 62351-8" },
+"1.2.840.10070.8.1": { "d": "iecUserRoles", "c": "IEC 62351-8" },
+"1.2.840.113533.7": { "d": "nsn", "c": "" },
+"1.2.840.113533.7.65": { "d": "nsn-ce", "c": "" },
+"1.2.840.113533.7.65.0": { "d": "entrustVersInfo", "c": "Nortel Secure Networks ce" },
+"1.2.840.113533.7.66": { "d": "nsn-alg", "c": "" },
+"1.2.840.113533.7.66.3": { "d": "cast3CBC", "c": "Nortel Secure Networks alg" },
+"1.2.840.113533.7.66.10": { "d": "cast5CBC", "c": "Nortel Secure Networks alg" },
+"1.2.840.113533.7.66.11": { "d": "cast5MAC", "c": "Nortel Secure Networks alg" },
+"1.2.840.113533.7.66.12": { "d": "pbeWithMD5AndCAST5-CBC", "c": "Nortel Secure Networks alg" },
+"1.2.840.113533.7.66.13": { "d": "passwordBasedMac", "c": "Nortel Secure Networks alg" },
+"1.2.840.113533.7.67": { "d": "nsn-oc", "c": "" },
+"1.2.840.113533.7.67.0": { "d": "entrustUser", "c": "Nortel Secure Networks oc" },
+"1.2.840.113533.7.68": { "d": "nsn-at", "c": "" },
+"1.2.840.113533.7.68.0": { "d": "entrustCAInfo", "c": "Nortel Secure Networks at" },
+"1.2.840.113533.7.68.10": { "d": "attributeCertificate", "c": "Nortel Secure Networks at" },
+"1.2.840.113549.1.1": { "d": "pkcs-1", "c": "" },
+"1.2.840.113549.1.1.1": { "d": "rsaEncryption", "c": "PKCS #1" },
+"1.2.840.113549.1.1.2": { "d": "md2WithRSAEncryption", "c": "PKCS #1" },
+"1.2.840.113549.1.1.3": { "d": "md4WithRSAEncryption", "c": "PKCS #1" },
+"1.2.840.113549.1.1.4": { "d": "md5WithRSAEncryption", "c": "PKCS #1" },
+"1.2.840.113549.1.1.5": { "d": "sha1WithRSAEncryption", "c": "PKCS #1" },
+"1.2.840.113549.1.1.7": { "d": "rsaOAEP", "c": "PKCS #1" },
+"1.2.840.113549.1.1.8": { "d": "pkcs1-MGF", "c": "PKCS #1" },
+"1.2.840.113549.1.1.9": { "d": "rsaOAEP-pSpecified", "c": "PKCS #1" },
+"1.2.840.113549.1.1.10": { "d": "rsaPSS", "c": "PKCS #1" },
+"1.2.840.113549.1.1.11": { "d": "sha256WithRSAEncryption", "c": "PKCS #1" },
+"1.2.840.113549.1.1.12": { "d": "sha384WithRSAEncryption", "c": "PKCS #1" },
+"1.2.840.113549.1.1.13": { "d": "sha512WithRSAEncryption", "c": "PKCS #1" },
+"1.2.840.113549.1.1.14": { "d": "sha224WithRSAEncryption", "c": "PKCS #1" },
+"1.2.840.113549.1.1.6": { "d": "rsaOAEPEncryptionSET", "c": "PKCS #1. This OID may also be assigned as ripemd160WithRSAEncryption" },
+"1.2.840.113549.1.2": { "d": "bsafeRsaEncr", "c": "Obsolete BSAFE OID", "w": true },
+"1.2.840.113549.1.3": { "d": "pkcs-3", "c": "" },
+"1.2.840.113549.1.3.1": { "d": "dhKeyAgreement", "c": "PKCS #3" },
+"1.2.840.113549.1.5": { "d": "pkcs-5", "c": "" },
+"1.2.840.113549.1.5.1": { "d": "pbeWithMD2AndDES-CBC", "c": "PKCS #5" },
+"1.2.840.113549.1.5.3": { "d": "pbeWithMD5AndDES-CBC", "c": "PKCS #5" },
+"1.2.840.113549.1.5.4": { "d": "pbeWithMD2AndRC2-CBC", "c": "PKCS #5" },
+"1.2.840.113549.1.5.6": { "d": "pbeWithMD5AndRC2-CBC", "c": "PKCS #5" },
+"1.2.840.113549.1.5.9": { "d": "pbeWithMD5AndXOR", "c": "PKCS #5, used in BSAFE only", "w": true },
+"1.2.840.113549.1.5.10": { "d": "pbeWithSHAAndDES-CBC", "c": "PKCS #5" },
+"1.2.840.113549.1.5.12": { "d": "pkcs5PBKDF2", "c": "PKCS #5 v2.0" },
+"1.2.840.113549.1.5.13": { "d": "pkcs5PBES2", "c": "PKCS #5 v2.0" },
+"1.2.840.113549.1.5.14": { "d": "pkcs5PBMAC1", "c": "PKCS #5 v2.0" },
+"1.2.840.113549.1.7": { "d": "pkcs-7", "c": "" },
+"1.2.840.113549.1.7.1": { "d": "data", "c": "PKCS #7" },
+"1.2.840.113549.1.7.2": { "d": "signedData", "c": "PKCS #7" },
+"1.2.840.113549.1.7.3": { "d": "envelopedData", "c": "PKCS #7" },
+"1.2.840.113549.1.7.4": { "d": "signedAndEnvelopedData", "c": "PKCS #7" },
+"1.2.840.113549.1.7.5": { "d": "digestedData", "c": "PKCS #7" },
+"1.2.840.113549.1.7.6": { "d": "encryptedData", "c": "PKCS #7" },
+"1.2.840.113549.1.7.7": { "d": "dataWithAttributes", "c": "PKCS #7 experimental", "w": true },
+"1.2.840.113549.1.7.8": { "d": "encryptedPrivateKeyInfo", "c": "PKCS #7 experimental", "w": true },
+"1.2.840.113549.1.9": { "d": "pkcs-9", "c": "" },
+"1.2.840.113549.1.9.1": { "d": "emailAddress", "c": "PKCS #9. Deprecated, use an altName extension instead" },
+"1.2.840.113549.1.9.2": { "d": "unstructuredName", "c": "PKCS #9" },
+"1.2.840.113549.1.9.3": { "d": "contentType", "c": "PKCS #9" },
+"1.2.840.113549.1.9.4": { "d": "messageDigest", "c": "PKCS #9" },
+"1.2.840.113549.1.9.5": { "d": "signingTime", "c": "PKCS #9" },
+"1.2.840.113549.1.9.6": { "d": "countersignature", "c": "PKCS #9" },
+"1.2.840.113549.1.9.7": { "d": "challengePassword", "c": "PKCS #9" },
+"1.2.840.113549.1.9.8": { "d": "unstructuredAddress", "c": "PKCS #9" },
+"1.2.840.113549.1.9.9": { "d": "extendedCertificateAttributes", "c": "PKCS #9" },
+"1.2.840.113549.1.9.10": { "d": "issuerAndSerialNumber", "c": "PKCS #9 experimental", "w": true },
+"1.2.840.113549.1.9.11": { "d": "passwordCheck", "c": "PKCS #9 experimental", "w": true },
+"1.2.840.113549.1.9.12": { "d": "publicKey", "c": "PKCS #9 experimental", "w": true },
+"1.2.840.113549.1.9.13": { "d": "signingDescription", "c": "PKCS #9" },
+"1.2.840.113549.1.9.14": { "d": "extensionRequest", "c": "PKCS #9 via CRMF" },
+"1.2.840.113549.1.9.15": { "d": "sMIMECapabilities", "c": "PKCS #9. This OID was formerly assigned as symmetricCapabilities, then reassigned as SMIMECapabilities, then renamed to the current name" },
+"1.2.840.113549.1.9.15.1": { "d": "preferSignedData", "c": "sMIMECapabilities" },
+"1.2.840.113549.1.9.15.2": { "d": "canNotDecryptAny", "c": "sMIMECapabilities" },
+"1.2.840.113549.1.9.15.3": { "d": "receiptRequest", "c": "sMIMECapabilities. Deprecated, use (1 2 840 113549 1 9 16 2 1) instead", "w": true },
+"1.2.840.113549.1.9.15.4": { "d": "receipt", "c": "sMIMECapabilities. Deprecated, use (1 2 840 113549 1 9 16 1 1) instead", "w": true },
+"1.2.840.113549.1.9.15.5": { "d": "contentHints", "c": "sMIMECapabilities. Deprecated, use (1 2 840 113549 1 9 16 2 4) instead", "w": true },
+"1.2.840.113549.1.9.15.6": { "d": "mlExpansionHistory", "c": "sMIMECapabilities. Deprecated, use (1 2 840 113549 1 9 16 2 3) instead", "w": true },
+"1.2.840.113549.1.9.16": { "d": "id-sMIME", "c": "PKCS #9" },
+"1.2.840.113549.1.9.16.0": { "d": "id-mod", "c": "id-sMIME" },
+"1.2.840.113549.1.9.16.0.1": { "d": "id-mod-cms", "c": "S/MIME Modules" },
+"1.2.840.113549.1.9.16.0.2": { "d": "id-mod-ess", "c": "S/MIME Modules" },
+"1.2.840.113549.1.9.16.0.3": { "d": "id-mod-oid", "c": "S/MIME Modules" },
+"1.2.840.113549.1.9.16.0.4": { "d": "id-mod-msg-v3", "c": "S/MIME Modules" },
+"1.2.840.113549.1.9.16.0.5": { "d": "id-mod-ets-eSignature-88", "c": "S/MIME Modules" },
+"1.2.840.113549.1.9.16.0.6": { "d": "id-mod-ets-eSignature-97", "c": "S/MIME Modules" },
+"1.2.840.113549.1.9.16.0.7": { "d": "id-mod-ets-eSigPolicy-88", "c": "S/MIME Modules" },
+"1.2.840.113549.1.9.16.0.8": { "d": "id-mod-ets-eSigPolicy-88", "c": "S/MIME Modules" },
+"1.2.840.113549.1.9.16.1": { "d": "contentType", "c": "S/MIME" },
+"1.2.840.113549.1.9.16.1.1": { "d": "receipt", "c": "S/MIME Content Types" },
+"1.2.840.113549.1.9.16.1.2": { "d": "authData", "c": "S/MIME Content Types" },
+"1.2.840.113549.1.9.16.1.3": { "d": "publishCert", "c": "S/MIME Content Types" },
+"1.2.840.113549.1.9.16.1.4": { "d": "tSTInfo", "c": "S/MIME Content Types" },
+"1.2.840.113549.1.9.16.1.5": { "d": "tDTInfo", "c": "S/MIME Content Types" },
+"1.2.840.113549.1.9.16.1.6": { "d": "contentInfo", "c": "S/MIME Content Types" },
+"1.2.840.113549.1.9.16.1.7": { "d": "dVCSRequestData", "c": "S/MIME Content Types" },
+"1.2.840.113549.1.9.16.1.8": { "d": "dVCSResponseData", "c": "S/MIME Content Types" },
+"1.2.840.113549.1.9.16.1.9": { "d": "compressedData", "c": "S/MIME Content Types" },
+"1.2.840.113549.1.9.16.1.10": { "d": "scvpCertValRequest", "c": "S/MIME Content Types" },
+"1.2.840.113549.1.9.16.1.11": { "d": "scvpCertValResponse", "c": "S/MIME Content Types" },
+"1.2.840.113549.1.9.16.1.12": { "d": "scvpValPolRequest", "c": "S/MIME Content Types" },
+"1.2.840.113549.1.9.16.1.13": { "d": "scvpValPolResponse", "c": "S/MIME Content Types" },
+"1.2.840.113549.1.9.16.1.14": { "d": "attrCertEncAttrs", "c": "S/MIME Content Types" },
+"1.2.840.113549.1.9.16.1.15": { "d": "tSReq", "c": "S/MIME Content Types" },
+"1.2.840.113549.1.9.16.1.16": { "d": "firmwarePackage", "c": "S/MIME Content Types" },
+"1.2.840.113549.1.9.16.1.17": { "d": "firmwareLoadReceipt", "c": "S/MIME Content Types" },
+"1.2.840.113549.1.9.16.1.18": { "d": "firmwareLoadError", "c": "S/MIME Content Types" },
+"1.2.840.113549.1.9.16.1.19": { "d": "contentCollection", "c": "S/MIME Content Types" },
+"1.2.840.113549.1.9.16.1.20": { "d": "contentWithAttrs", "c": "S/MIME Content Types" },
+"1.2.840.113549.1.9.16.1.21": { "d": "encKeyWithID", "c": "S/MIME Content Types" },
+"1.2.840.113549.1.9.16.1.22": { "d": "encPEPSI", "c": "S/MIME Content Types" },
+"1.2.840.113549.1.9.16.1.23": { "d": "authEnvelopedData", "c": "S/MIME Content Types" },
+"1.2.840.113549.1.9.16.1.24": { "d": "routeOriginAttest", "c": "S/MIME Content Types" },
+"1.2.840.113549.1.9.16.1.25": { "d": "symmetricKeyPackage", "c": "S/MIME Content Types" },
+"1.2.840.113549.1.9.16.1.26": { "d": "rpkiManifest", "c": "S/MIME Content Types" },
+"1.2.840.113549.1.9.16.1.27": { "d": "asciiTextWithCRLF", "c": "S/MIME Content Types" },
+"1.2.840.113549.1.9.16.1.28": { "d": "xml", "c": "S/MIME Content Types" },
+"1.2.840.113549.1.9.16.1.29": { "d": "pdf", "c": "S/MIME Content Types" },
+"1.2.840.113549.1.9.16.1.30": { "d": "postscript", "c": "S/MIME Content Types" },
+"1.2.840.113549.1.9.16.1.31": { "d": "timestampedData", "c": "S/MIME Content Types" },
+"1.2.840.113549.1.9.16.1.32": { "d": "asAdjacencyAttest", "c": "S/MIME Content Types", "w": true },
+"1.2.840.113549.1.9.16.1.33": { "d": "rpkiTrustAnchor", "c": "S/MIME Content Types" },
+"1.2.840.113549.1.9.16.1.34": { "d": "trustAnchorList", "c": "S/MIME Content Types" },
+"1.2.840.113549.1.9.16.2": { "d": "authenticatedAttributes", "c": "S/MIME" },
+"1.2.840.113549.1.9.16.2.1": { "d": "receiptRequest", "c": "S/MIME Authenticated Attributes" },
+"1.2.840.113549.1.9.16.2.2": { "d": "securityLabel", "c": "S/MIME Authenticated Attributes" },
+"1.2.840.113549.1.9.16.2.3": { "d": "mlExpandHistory", "c": "S/MIME Authenticated Attributes" },
+"1.2.840.113549.1.9.16.2.4": { "d": "contentHint", "c": "S/MIME Authenticated Attributes" },
+"1.2.840.113549.1.9.16.2.5": { "d": "msgSigDigest", "c": "S/MIME Authenticated Attributes" },
+"1.2.840.113549.1.9.16.2.6": { "d": "encapContentType", "c": "S/MIME Authenticated Attributes.  Obsolete", "w": true },
+"1.2.840.113549.1.9.16.2.7": { "d": "contentIdentifier", "c": "S/MIME Authenticated Attributes" },
+"1.2.840.113549.1.9.16.2.8": { "d": "macValue", "c": "S/MIME Authenticated Attributes.  Obsolete", "w": true },
+"1.2.840.113549.1.9.16.2.9": { "d": "equivalentLabels", "c": "S/MIME Authenticated Attributes" },
+"1.2.840.113549.1.9.16.2.10": { "d": "contentReference", "c": "S/MIME Authenticated Attributes" },
+"1.2.840.113549.1.9.16.2.11": { "d": "encrypKeyPref", "c": "S/MIME Authenticated Attributes" },
+"1.2.840.113549.1.9.16.2.12": { "d": "signingCertificate", "c": "S/MIME Authenticated Attributes" },
+"1.2.840.113549.1.9.16.2.13": { "d": "smimeEncryptCerts", "c": "S/MIME Authenticated Attributes" },
+"1.2.840.113549.1.9.16.2.14": { "d": "timeStampToken", "c": "S/MIME Authenticated Attributes" },
+"1.2.840.113549.1.9.16.2.15": { "d": "sigPolicyId", "c": "S/MIME Authenticated Attributes" },
+"1.2.840.113549.1.9.16.2.16": { "d": "commitmentType", "c": "S/MIME Authenticated Attributes" },
+"1.2.840.113549.1.9.16.2.17": { "d": "signerLocation", "c": "S/MIME Authenticated Attributes" },
+"1.2.840.113549.1.9.16.2.18": { "d": "signerAttr", "c": "S/MIME Authenticated Attributes" },
+"1.2.840.113549.1.9.16.2.19": { "d": "otherSigCert", "c": "S/MIME Authenticated Attributes" },
+"1.2.840.113549.1.9.16.2.20": { "d": "contentTimestamp", "c": "S/MIME Authenticated Attributes" },
+"1.2.840.113549.1.9.16.2.21": { "d": "certificateRefs", "c": "S/MIME Authenticated Attributes" },
+"1.2.840.113549.1.9.16.2.22": { "d": "revocationRefs", "c": "S/MIME Authenticated Attributes" },
+"1.2.840.113549.1.9.16.2.23": { "d": "certValues", "c": "S/MIME Authenticated Attributes" },
+"1.2.840.113549.1.9.16.2.24": { "d": "revocationValues", "c": "S/MIME Authenticated Attributes" },
+"1.2.840.113549.1.9.16.2.25": { "d": "escTimeStamp", "c": "S/MIME Authenticated Attributes" },
+"1.2.840.113549.1.9.16.2.26": { "d": "certCRLTimestamp", "c": "S/MIME Authenticated Attributes" },
+"1.2.840.113549.1.9.16.2.27": { "d": "archiveTimeStamp", "c": "S/MIME Authenticated Attributes" },
+"1.2.840.113549.1.9.16.2.28": { "d": "signatureType", "c": "S/MIME Authenticated Attributes" },
+"1.2.840.113549.1.9.16.2.29": { "d": "dvcsDvc", "c": "S/MIME Authenticated Attributes" },
+"1.2.840.113549.1.9.16.2.30": { "d": "cekReference", "c": "S/MIME Authenticated Attributes" },
+"1.2.840.113549.1.9.16.2.31": { "d": "maxCEKDecrypts", "c": "S/MIME Authenticated Attributes" },
+"1.2.840.113549.1.9.16.2.32": { "d": "kekDerivationAlg", "c": "S/MIME Authenticated Attributes" },
+"1.2.840.113549.1.9.16.2.33": { "d": "intendedRecipients", "c": "S/MIME Authenticated Attributes.  Obsolete", "w": true },
+"1.2.840.113549.1.9.16.2.34": { "d": "cmcUnsignedData", "c": "S/MIME Authenticated Attributes" },
+"1.2.840.113549.1.9.16.2.35": { "d": "fwPackageID", "c": "S/MIME Authenticated Attributes" },
+"1.2.840.113549.1.9.16.2.36": { "d": "fwTargetHardwareIDs", "c": "S/MIME Authenticated Attributes" },
+"1.2.840.113549.1.9.16.2.37": { "d": "fwDecryptKeyID", "c": "S/MIME Authenticated Attributes" },
+"1.2.840.113549.1.9.16.2.38": { "d": "fwImplCryptAlgs", "c": "S/MIME Authenticated Attributes" },
+"1.2.840.113549.1.9.16.2.39": { "d": "fwWrappedFirmwareKey", "c": "S/MIME Authenticated Attributes" },
+"1.2.840.113549.1.9.16.2.40": { "d": "fwCommunityIdentifiers", "c": "S/MIME Authenticated Attributes" },
+"1.2.840.113549.1.9.16.2.41": { "d": "fwPkgMessageDigest", "c": "S/MIME Authenticated Attributes" },
+"1.2.840.113549.1.9.16.2.42": { "d": "fwPackageInfo", "c": "S/MIME Authenticated Attributes" },
+"1.2.840.113549.1.9.16.2.43": { "d": "fwImplCompressAlgs", "c": "S/MIME Authenticated Attributes" },
+"1.2.840.113549.1.9.16.2.44": { "d": "etsAttrCertificateRefs", "c": "S/MIME Authenticated Attributes" },
+"1.2.840.113549.1.9.16.2.45": { "d": "etsAttrRevocationRefs", "c": "S/MIME Authenticated Attributes" },
+"1.2.840.113549.1.9.16.2.46": { "d": "binarySigningTime", "c": "S/MIME Authenticated Attributes" },
+"1.2.840.113549.1.9.16.2.47": { "d": "signingCertificateV2", "c": "S/MIME Authenticated Attributes" },
+"1.2.840.113549.1.9.16.2.48": { "d": "etsArchiveTimeStampV2", "c": "S/MIME Authenticated Attributes" },
+"1.2.840.113549.1.9.16.2.49": { "d": "erInternal", "c": "S/MIME Authenticated Attributes" },
+"1.2.840.113549.1.9.16.2.50": { "d": "erExternal", "c": "S/MIME Authenticated Attributes" },
+"1.2.840.113549.1.9.16.2.51": { "d": "multipleSignatures", "c": "S/MIME Authenticated Attributes" },
+"1.2.840.113549.1.9.16.3.1": { "d": "esDHwith3DES", "c": "S/MIME Algorithms. Obsolete", "w": true },
+"1.2.840.113549.1.9.16.3.2": { "d": "esDHwithRC2", "c": "S/MIME Algorithms. Obsolete", "w": true },
+"1.2.840.113549.1.9.16.3.3": { "d": "3desWrap", "c": "S/MIME Algorithms. Obsolete", "w": true },
+"1.2.840.113549.1.9.16.3.4": { "d": "rc2Wrap", "c": "S/MIME Algorithms. Obsolete", "w": true },
+"1.2.840.113549.1.9.16.3.5": { "d": "esDH", "c": "S/MIME Algorithms" },
+"1.2.840.113549.1.9.16.3.6": { "d": "cms3DESwrap", "c": "S/MIME Algorithms" },
+"1.2.840.113549.1.9.16.3.7": { "d": "cmsRC2wrap", "c": "S/MIME Algorithms" },
+"1.2.840.113549.1.9.16.3.8": { "d": "zlib", "c": "S/MIME Algorithms" },
+"1.2.840.113549.1.9.16.3.9": { "d": "pwriKEK", "c": "S/MIME Algorithms" },
+"1.2.840.113549.1.9.16.3.10": { "d": "ssDH", "c": "S/MIME Algorithms" },
+"1.2.840.113549.1.9.16.3.11": { "d": "hmacWith3DESwrap", "c": "S/MIME Algorithms" },
+"1.2.840.113549.1.9.16.3.12": { "d": "hmacWithAESwrap", "c": "S/MIME Algorithms" },
+"1.2.840.113549.1.9.16.3.13": { "d": "md5XorExperiment", "c": "S/MIME Algorithms.  Experimental", "w": true },
+"1.2.840.113549.1.9.16.3.14": { "d": "rsaKEM", "c": "S/MIME Algorithms" },
+"1.2.840.113549.1.9.16.3.15": { "d": "authEnc128", "c": "S/MIME Algorithms" },
+"1.2.840.113549.1.9.16.3.16": { "d": "authEnc256", "c": "S/MIME Algorithms" },
+"1.2.840.113549.1.9.16.3.19": { "d": "ecdhHKDF-SHA256", "c": "S/MIME Algorithms" },
+"1.2.840.113549.1.9.16.3.20": { "d": "ecdhHKDF-SHA384", "c": "S/MIME Algorithms" },
+"1.2.840.113549.1.9.16.3.21": { "d": "ecdhHKDF-SHA512", "c": "S/MIME Algorithms" },
+"1.2.840.113549.1.9.16.4.1": { "d": "certDist-ldap", "c": "S/MIME Certificate Distribution" },
+"1.2.840.113549.1.9.16.5.1": { "d": "sigPolicyQualifier-spuri x", "c": "S/MIME Signature Policy Qualifiers" },
+"1.2.840.113549.1.9.16.5.2": { "d": "sigPolicyQualifier-spUserNotice", "c": "S/MIME Signature Policy Qualifiers" },
+"1.2.840.113549.1.9.16.6.1": { "d": "proofOfOrigin", "c": "S/MIME Commitment Type Identifiers" },
+"1.2.840.113549.1.9.16.6.2": { "d": "proofOfReceipt", "c": "S/MIME Commitment Type Identifiers" },
+"1.2.840.113549.1.9.16.6.3": { "d": "proofOfDelivery", "c": "S/MIME Commitment Type Identifiers" },
+"1.2.840.113549.1.9.16.6.4": { "d": "proofOfSender", "c": "S/MIME Commitment Type Identifiers" },
+"1.2.840.113549.1.9.16.6.5": { "d": "proofOfApproval", "c": "S/MIME Commitment Type Identifiers" },
+"1.2.840.113549.1.9.16.6.6": { "d": "proofOfCreation", "c": "S/MIME Commitment Type Identifiers" },
+"1.2.840.113549.1.9.16.8.1": { "d": "glUseKEK", "c": "S/MIME Symmetric Key Distribution Attributes" },
+"1.2.840.113549.1.9.16.8.2": { "d": "glDelete", "c": "S/MIME Symmetric Key Distribution Attributes" },
+"1.2.840.113549.1.9.16.8.3": { "d": "glAddMember", "c": "S/MIME Symmetric Key Distribution Attributes" },
+"1.2.840.113549.1.9.16.8.4": { "d": "glDeleteMember", "c": "S/MIME Symmetric Key Distribution Attributes" },
+"1.2.840.113549.1.9.16.8.5": { "d": "glRekey", "c": "S/MIME Symmetric Key Distribution Attributes" },
+"1.2.840.113549.1.9.16.8.6": { "d": "glAddOwner", "c": "S/MIME Symmetric Key Distribution Attributes" },
+"1.2.840.113549.1.9.16.8.7": { "d": "glRemoveOwner", "c": "S/MIME Symmetric Key Distribution Attributes" },
+"1.2.840.113549.1.9.16.8.8": { "d": "glkCompromise", "c": "S/MIME Symmetric Key Distribution Attributes" },
+"1.2.840.113549.1.9.16.8.9": { "d": "glkRefresh", "c": "S/MIME Symmetric Key Distribution Attributes" },
+"1.2.840.113549.1.9.16.8.10": { "d": "glFailInfo", "c": "S/MIME Symmetric Key Distribution Attributes.  Obsolete", "w": true },
+"1.2.840.113549.1.9.16.8.11": { "d": "glaQueryRequest", "c": "S/MIME Symmetric Key Distribution Attributes" },
+"1.2.840.113549.1.9.16.8.12": { "d": "glaQueryResponse", "c": "S/MIME Symmetric Key Distribution Attributes" },
+"1.2.840.113549.1.9.16.8.13": { "d": "glProvideCert", "c": "S/MIME Symmetric Key Distribution Attributes" },
+"1.2.840.113549.1.9.16.8.14": { "d": "glUpdateCert", "c": "S/MIME Symmetric Key Distribution Attributes" },
+"1.2.840.113549.1.9.16.8.15": { "d": "glKey", "c": "S/MIME Symmetric Key Distribution Attributes" },
+"1.2.840.113549.1.9.16.9": { "d": "signatureTypeIdentifier", "c": "S/MIME" },
+"1.2.840.113549.1.9.16.9.1": { "d": "originatorSig", "c": "S/MIME Signature Type Identifier" },
+"1.2.840.113549.1.9.16.9.2": { "d": "domainSig", "c": "S/MIME Signature Type Identifier" },
+"1.2.840.113549.1.9.16.9.3": { "d": "additionalAttributesSig", "c": "S/MIME Signature Type Identifier" },
+"1.2.840.113549.1.9.16.9.4": { "d": "reviewSig", "c": "S/MIME Signature Type Identifier" },
+"1.2.840.113549.1.9.16.11": { "d": "capabilities", "c": "S/MIME" },
+"1.2.840.113549.1.9.16.11.1": { "d": "preferBinaryInside", "c": "S/MIME Capability" },
+"1.2.840.113549.1.9.20": { "d": "friendlyName (for PKCS #12)", "c": "PKCS #9 via PKCS #12" },
+"1.2.840.113549.1.9.21": { "d": "localKeyID (for PKCS #12)", "c": "PKCS #9 via PKCS #12" },
+"1.2.840.113549.1.9.22": { "d": "certTypes (for PKCS #12)", "c": "PKCS #9 via PKCS #12" },
+"1.2.840.113549.1.9.22.1": { "d": "x509Certificate (for PKCS #12)", "c": "PKCS #9 via PKCS #12" },
+"1.2.840.113549.1.9.22.2": { "d": "sdsiCertificate (for PKCS #12)", "c": "PKCS #9 via PKCS #12" },
+"1.2.840.113549.1.9.23": { "d": "crlTypes (for PKCS #12)", "c": "PKCS #9 via PKCS #12" },
+"1.2.840.113549.1.9.23.1": { "d": "x509Crl (for PKCS #12)", "c": "PKCS #9 via PKCS #12" },
+"1.2.840.113549.1.9.24": { "d": "pkcs9objectClass", "c": "PKCS #9/RFC 2985" },
+"1.2.840.113549.1.9.25": { "d": "pkcs9attributes", "c": "PKCS #9/RFC 2985" },
+"1.2.840.113549.1.9.25.1": { "d": "pkcs15Token", "c": "PKCS #9/RFC 2985 attribute" },
+"1.2.840.113549.1.9.25.2": { "d": "encryptedPrivateKeyInfo", "c": "PKCS #9/RFC 2985 attribute" },
+"1.2.840.113549.1.9.25.3": { "d": "randomNonce", "c": "PKCS #9/RFC 2985 attribute" },
+"1.2.840.113549.1.9.25.4": { "d": "sequenceNumber", "c": "PKCS #9/RFC 2985 attribute" },
+"1.2.840.113549.1.9.25.5": { "d": "pkcs7PDU", "c": "PKCS #9/RFC 2985 attribute" },
+"1.2.840.113549.1.9.26": { "d": "pkcs9syntax", "c": "PKCS #9/RFC 2985" },
+"1.2.840.113549.1.9.27": { "d": "pkcs9matchingRules", "c": "PKCS #9/RFC 2985" },
+"1.2.840.113549.1.9.52": { "d": "cmsAlgorithmProtection", "c": "RFC 6211" },
+"1.2.840.113549.1.12": { "d": "pkcs-12", "c": "" },
+"1.2.840.113549.1.12.1": { "d": "pkcs-12-PbeIds", "c": "This OID was formerly assigned as PKCS #12 modeID" },
+"1.2.840.113549.1.12.1.1": { "d": "pbeWithSHAAnd128BitRC4", "c": "PKCS #12 PbeIds. This OID was formerly assigned as pkcs-12-OfflineTransportMode" },
+"1.2.840.113549.1.12.1.2": { "d": "pbeWithSHAAnd40BitRC4", "c": "PKCS #12 PbeIds. This OID was formerly assigned as pkcs-12-OnlineTransportMode" },
+"1.2.840.113549.1.12.1.3": { "d": "pbeWithSHAAnd3-KeyTripleDES-CBC", "c": "PKCS #12 PbeIds" },
+"1.2.840.113549.1.12.1.4": { "d": "pbeWithSHAAnd2-KeyTripleDES-CBC", "c": "PKCS #12 PbeIds" },
+"1.2.840.113549.1.12.1.5": { "d": "pbeWithSHAAnd128BitRC2-CBC", "c": "PKCS #12 PbeIds" },
+"1.2.840.113549.1.12.1.6": { "d": "pbeWithSHAAnd40BitRC2-CBC", "c": "PKCS #12 PbeIds" },
+"1.2.840.113549.1.12.2": { "d": "pkcs-12-ESPVKID", "c": "Deprecated", "w": true },
+"1.2.840.113549.1.12.2.1": { "d": "pkcs-12-PKCS8KeyShrouding", "c": "PKCS #12 ESPVKID. Deprecated, use (1 2 840 113549 1 12 3 5) instead", "w": true },
+"1.2.840.113549.1.12.3": { "d": "pkcs-12-BagIds", "c": "" },
+"1.2.840.113549.1.12.3.1": { "d": "pkcs-12-keyBagId", "c": "PKCS #12 BagIds" },
+"1.2.840.113549.1.12.3.2": { "d": "pkcs-12-certAndCRLBagId", "c": "PKCS #12 BagIds" },
+"1.2.840.113549.1.12.3.3": { "d": "pkcs-12-secretBagId", "c": "PKCS #12 BagIds" },
+"1.2.840.113549.1.12.3.4": { "d": "pkcs-12-safeContentsId", "c": "PKCS #12 BagIds" },
+"1.2.840.113549.1.12.3.5": { "d": "pkcs-12-pkcs-8ShroudedKeyBagId", "c": "PKCS #12 BagIds" },
+"1.2.840.113549.1.12.4": { "d": "pkcs-12-CertBagID", "c": "Deprecated", "w": true },
+"1.2.840.113549.1.12.4.1": { "d": "pkcs-12-X509CertCRLBagID", "c": "PKCS #12 CertBagID. This OID was formerly assigned as pkcs-12-X509CertCRLBag" },
+"1.2.840.113549.1.12.4.2": { "d": "pkcs-12-SDSICertBagID", "c": "PKCS #12 CertBagID. This OID was formerly assigned as pkcs-12-SDSICertBag" },
+"1.2.840.113549.1.12.5": { "d": "pkcs-12-OID", "c": "", "w": true },
+"1.2.840.113549.1.12.5.1": { "d": "pkcs-12-PBEID", "c": "PKCS #12 OID. Deprecated, use the partially compatible (1 2 840 113549 1 12 1) OIDs instead", "w": true },
+"1.2.840.113549.1.12.5.1.1": { "d": "pkcs-12-PBEWithSha1And128BitRC4", "c": "PKCS #12 OID PBEID. Deprecated, use (1 2 840 113549 1 12 1 1) instead", "w": true },
+"1.2.840.113549.1.12.5.1.2": { "d": "pkcs-12-PBEWithSha1And40BitRC4", "c": "PKCS #12 OID PBEID. Deprecated, use (1 2 840 113549 1 12 1 2) instead", "w": true },
+"1.2.840.113549.1.12.5.1.3": { "d": "pkcs-12-PBEWithSha1AndTripleDESCBC", "c": "PKCS #12 OID PBEID. Deprecated, use the incompatible but similar (1 2 840 113549 1 12 1 3) or (1 2 840 113549 1 12 1 4) instead", "w": true },
+"1.2.840.113549.1.12.5.1.4": { "d": "pkcs-12-PBEWithSha1And128BitRC2CBC", "c": "PKCS #12 OID PBEID. Deprecated, use (1 2 840 113549 1 12 1 5) instead", "w": true },
+"1.2.840.113549.1.12.5.1.5": { "d": "pkcs-12-PBEWithSha1And40BitRC2CBC", "c": "PKCS #12 OID PBEID. Deprecated, use (1 2 840 113549 1 12 1 6) instead", "w": true },
+"1.2.840.113549.1.12.5.1.6": { "d": "pkcs-12-PBEWithSha1AndRC4", "c": "PKCS #12 OID PBEID. Deprecated, use the incompatible but similar (1 2 840 113549 1 12 1 1) or (1 2 840 113549 1 12 1 2) instead", "w": true },
+"1.2.840.113549.1.12.5.1.7": { "d": "pkcs-12-PBEWithSha1AndRC2CBC", "c": "PKCS #12 OID PBEID. Deprecated, use the incompatible but similar (1 2 840 113549 1 12 1 5) or (1 2 840 113549 1 12 1 6) instead", "w": true },
+"1.2.840.113549.1.12.5.2": { "d": "pkcs-12-EnvelopingID", "c": "PKCS #12 OID. Deprecated, use the conventional PKCS #1 OIDs instead" },
+"1.2.840.113549.1.12.5.2.1": { "d": "pkcs-12-RSAEncryptionWith128BitRC4", "c": "PKCS #12 OID EnvelopingID. Deprecated, use the conventional PKCS #1 OIDs instead", "w": true },
+"1.2.840.113549.1.12.5.2.2": { "d": "pkcs-12-RSAEncryptionWith40BitRC4", "c": "PKCS #12 OID EnvelopingID. Deprecated, use the conventional PKCS #1 OIDs instead", "w": true },
+"1.2.840.113549.1.12.5.2.3": { "d": "pkcs-12-RSAEncryptionWithTripleDES", "c": "PKCS #12 OID EnvelopingID. Deprecated, use the conventional PKCS #1 OIDs instead", "w": true },
+"1.2.840.113549.1.12.5.3": { "d": "pkcs-12-SignatureID", "c": "PKCS #12 OID EnvelopingID. Deprecated, use the conventional PKCS #1 OIDs instead", "w": true },
+"1.2.840.113549.1.12.5.3.1": { "d": "pkcs-12-RSASignatureWithSHA1Digest", "c": "PKCS #12 OID SignatureID. Deprecated, use the conventional PKCS #1 OIDs instead", "w": true },
+"1.2.840.113549.1.12.10": { "d": "pkcs-12Version1", "c": "" },
+"1.2.840.113549.1.12.10.1": { "d": "pkcs-12BadIds", "c": "" },
+"1.2.840.113549.1.12.10.1.1": { "d": "pkcs-12-keyBag", "c": "PKCS #12 BagIds" },
+"1.2.840.113549.1.12.10.1.2": { "d": "pkcs-12-pkcs-8ShroudedKeyBag", "c": "PKCS #12 BagIds" },
+"1.2.840.113549.1.12.10.1.3": { "d": "pkcs-12-certBag", "c": "PKCS #12 BagIds" },
+"1.2.840.113549.1.12.10.1.4": { "d": "pkcs-12-crlBag", "c": "PKCS #12 BagIds" },
+"1.2.840.113549.1.12.10.1.5": { "d": "pkcs-12-secretBag", "c": "PKCS #12 BagIds" },
+"1.2.840.113549.1.12.10.1.6": { "d": "pkcs-12-safeContentsBag", "c": "PKCS #12 BagIds" },
+"1.2.840.113549.1.15.1": { "d": "pkcs15modules", "c": "PKCS #15" },
+"1.2.840.113549.1.15.2": { "d": "pkcs15attributes", "c": "PKCS #15" },
+"1.2.840.113549.1.15.3": { "d": "pkcs15contentType", "c": "PKCS #15" },
+"1.2.840.113549.1.15.3.1": { "d": "pkcs15content", "c": "PKCS #15 content type" },
+"1.2.840.113549.2": { "d": "digestAlgorithm", "c": "" },
+"1.2.840.113549.2.2": { "d": "md2", "c": "RSADSI digestAlgorithm" },
+"1.2.840.113549.2.4": { "d": "md4", "c": "RSADSI digestAlgorithm" },
+"1.2.840.113549.2.5": { "d": "md5", "c": "RSADSI digestAlgorithm" },
+"1.2.840.113549.2.7": { "d": "hmacWithSHA1", "c": "RSADSI digestAlgorithm" },
+"1.2.840.113549.2.8": { "d": "hmacWithSHA224", "c": "RSADSI digestAlgorithm" },
+"1.2.840.113549.2.9": { "d": "hmacWithSHA256", "c": "RSADSI digestAlgorithm" },
+"1.2.840.113549.2.10": { "d": "hmacWithSHA384", "c": "RSADSI digestAlgorithm" },
+"1.2.840.113549.2.11": { "d": "hmacWithSHA512", "c": "RSADSI digestAlgorithm" },
+"1.2.840.113549.3": { "d": "encryptionAlgorithm", "c": "" },
+"1.2.840.113549.3.2": { "d": "rc2CBC", "c": "RSADSI encryptionAlgorithm" },
+"1.2.840.113549.3.3": { "d": "rc2ECB", "c": "RSADSI encryptionAlgorithm" },
+"1.2.840.113549.3.4": { "d": "rc4", "c": "RSADSI encryptionAlgorithm" },
+"1.2.840.113549.3.5": { "d": "rc4WithMAC", "c": "RSADSI encryptionAlgorithm" },
+"1.2.840.113549.3.6": { "d": "desx-CBC", "c": "RSADSI encryptionAlgorithm" },
+"1.2.840.113549.3.7": { "d": "des-EDE3-CBC", "c": "RSADSI encryptionAlgorithm" },
+"1.2.840.113549.3.8": { "d": "rc5CBC", "c": "RSADSI encryptionAlgorithm" },
+"1.2.840.113549.3.9": { "d": "rc5-CBCPad", "c": "RSADSI encryptionAlgorithm" },
+"1.2.840.113549.3.10": { "d": "desCDMF", "c": "RSADSI encryptionAlgorithm. Formerly called CDMFCBCPad" },
+"1.2.840.114021.1.6.1": { "d": "Identrus unknown policyIdentifier", "c": "Identrus" },
+"1.2.840.114021.4.1": { "d": "identrusOCSP", "c": "Identrus" },
+"1.2.840.113556.1.2.241": { "d": "deliveryMechanism", "c": "Microsoft Exchange Server - attribute" },
+"1.2.840.113556.1.2.281": { "d": "ntSecurityDescriptor", "c": "Microsoft Cert Template - attribute" },
+"1.2.840.113556.1.3.0": { "d": "site-Addressing", "c": "Microsoft Exchange Server - object class" },
+"1.2.840.113556.1.3.13": { "d": "classSchema", "c": "Microsoft Exchange Server - object class" },
+"1.2.840.113556.1.3.14": { "d": "attributeSchema", "c": "Microsoft Exchange Server - object class" },
+"1.2.840.113556.1.3.17": { "d": "mailbox-Agent", "c": "Microsoft Exchange Server - object class" },
+"1.2.840.113556.1.3.22": { "d": "mailbox", "c": "Microsoft Exchange Server - object class" },
+"1.2.840.113556.1.3.23": { "d": "container", "c": "Microsoft Exchange Server - object class" },
+"1.2.840.113556.1.3.46": { "d": "mailRecipient", "c": "Microsoft Exchange Server - object class" },
+"1.2.840.113556.1.4.145": { "d": "revision", "c": "Microsoft Cert Template - attribute" },
+"1.2.840.113556.1.4.1327": { "d": "pKIDefaultKeySpec", "c": "Microsoft Cert Template - attribute" },
+"1.2.840.113556.1.4.1328": { "d": "pKIKeyUsage", "c": "Microsoft Cert Template - attribute" },
+"1.2.840.113556.1.4.1329": { "d": "pKIMaxIssuingDepth", "c": "Microsoft Cert Template - attribute" },
+"1.2.840.113556.1.4.1330": { "d": "pKICriticalExtensions", "c": "Microsoft Cert Template - attribute" },
+"1.2.840.113556.1.4.1331": { "d": "pKIExpirationPeriod", "c": "Microsoft Cert Template - attribute" },
+"1.2.840.113556.1.4.1332": { "d": "pKIOverlapPeriod", "c": "Microsoft Cert Template - attribute" },
+"1.2.840.113556.1.4.1333": { "d": "pKIExtendedKeyUsage", "c": "Microsoft Cert Template - attribute" },
+"1.2.840.113556.1.4.1334": { "d": "pKIDefaultCSPs", "c": "Microsoft Cert Template - attribute" },
+"1.2.840.113556.1.4.1335": { "d": "pKIEnrollmentAccess", "c": "Microsoft Cert Template - attribute" },
+"1.2.840.113556.1.4.1429": { "d": "msPKI-RA-Signature", "c": "Microsoft Cert Template - attribute" },
+"1.2.840.113556.1.4.1430": { "d": "msPKI-Enrollment-Flag", "c": "Microsoft Cert Template - attribute" },
+"1.2.840.113556.1.4.1431": { "d": "msPKI-Private-Key-Flag", "c": "Microsoft Cert Template - attribute" },
+"1.2.840.113556.1.4.1432": { "d": "msPKI-Certificate-Name-Flag", "c": "Microsoft Cert Template - attribute" },
+"1.2.840.113556.1.4.1433": { "d": "msPKI-Minimal-Key-Size", "c": "Microsoft Cert Template - attribute" },
+"1.2.840.113556.1.4.1434": { "d": "msPKI-Template-Schema-Version", "c": "Microsoft Cert Template - attribute" },
+"1.2.840.113556.1.4.1435": { "d": "msPKI-Template-Minor-Revision", "c": "Microsoft Cert Template - attribute" },
+"1.2.840.113556.1.4.1436": { "d": "msPKI-Cert-Template-OID", "c": "Microsoft Cert Template - attribute" },
+"1.2.840.113556.1.4.1437": { "d": "msPKI-Supersede-Templates", "c": "Microsoft Cert Template - attribute" },
+"1.2.840.113556.1.4.1438": { "d": "msPKI-RA-Policies", "c": "Microsoft Cert Template - attribute" },
+"1.2.840.113556.1.4.1439": { "d": "msPKI-Certificate-Policy", "c": "Microsoft Cert Template - attribute" },
+"1.2.840.113556.1.4.1674": { "d": "msPKI-Certificate-Application-Policy", "c": "Microsoft Cert Template - attribute" },
+"1.2.840.113556.1.4.1675": { "d": "msPKI-RA-Application-Policies", "c": "Microsoft Cert Template - attribute" },
+"1.2.840.113556.4.3": { "d": "microsoftExcel", "c": "Microsoft" },
+"1.2.840.113556.4.4": { "d": "titledWithOID", "c": "Microsoft" },
+"1.2.840.113556.4.5": { "d": "microsoftPowerPoint", "c": "Microsoft" },
+"1.2.840.113583.1": { "d": "adobeAcrobat", "c": "Adobe Acrobat" },
+"1.2.840.113583.1.1": { "d": "acrobatSecurity", "c": "Adobe Acrobat security" },
+"1.2.840.113583.1.1.1": { "d": "pdfPassword", "c": "Adobe Acrobat security" },
+"1.2.840.113583.1.1.2": { "d": "pdfDefaultSigningCredential", "c": "Adobe Acrobat security" },
+"1.2.840.113583.1.1.3": { "d": "pdfDefaultEncryptionCredential", "c": "Adobe Acrobat security" },
+"1.2.840.113583.1.1.4": { "d": "pdfPasswordTimeout", "c": "Adobe Acrobat security" },
+"1.2.840.113583.1.1.5": { "d": "pdfAuthenticDocumentsTrust", "c": "Adobe Acrobat security" },
+"1.2.840.113583.1.1.6": { "d": "pdfDynamicContentTrust", "c": "Adobe Acrobat security", "w": true },
+"1.2.840.113583.1.1.7": { "d": "pdfUbiquityTrust", "c": "Adobe Acrobat security" },
+"1.2.840.113583.1.1.8": { "d": "pdfRevocationInfoArchival", "c": "Adobe Acrobat security" },
+"1.2.840.113583.1.1.9": { "d": "pdfX509Extension", "c": "Adobe Acrobat security" },
+"1.2.840.113583.1.1.9.1": { "d": "pdfTimeStamp", "c": "Adobe Acrobat security" },
+"1.2.840.113583.1.1.9.2": { "d": "pdfArchiveRevInfo", "c": "Adobe Acrobat security" },
+"1.2.840.113583.1.1.10": { "d": "pdfPPLKLiteCredential", "c": "Adobe Acrobat security" },
+"1.2.840.113583.1.2": { "d": "acrobatCPS", "c": "Adobe Acrobat CPS" },
+"1.2.840.113583.1.2.1": { "d": "pdfAuthenticDocumentsCPS", "c": "Adobe Acrobat CPS" },
+"1.2.840.113583.1.2.2": { "d": "pdfTestCPS", "c": "Adobe Acrobat CPS" },
+"1.2.840.113583.1.2.3": { "d": "pdfUbiquityCPS", "c": "Adobe Acrobat CPS" },
+"1.2.840.113583.1.2.4": { "d": "pdfAdhocCPS", "c": "Adobe Acrobat CPS" },
+"1.2.840.113583.1.7": { "d": "acrobatUbiquity", "c": "Adobe Acrobat ubiquity" },
+"1.2.840.113583.1.7.1": { "d": "pdfUbiquitySubRights", "c": "Adobe Acrobat ubiquity" },
+"1.2.840.113583.1.9": { "d": "acrobatExtension", "c": "Adobe Acrobat X.509 extension" },
+"1.2.840.113628.114.1.7": { "d": "adobePKCS7", "c": "Adobe" },
+"1.2.840.113635.100": { "d": "appleDataSecurity", "c": "Apple" },
+"1.2.840.113635.100.1": { "d": "appleTrustPolicy", "c": "Apple" },
+"1.2.840.113635.100.1.1": { "d": "appleISignTP", "c": "Apple trust policy" },
+"1.2.840.113635.100.1.2": { "d": "appleX509Basic", "c": "Apple trust policy" },
+"1.2.840.113635.100.1.3": { "d": "appleSSLPolicy", "c": "Apple trust policy" },
+"1.2.840.113635.100.1.4": { "d": "appleLocalCertGenPolicy", "c": "Apple trust policy" },
+"1.2.840.113635.100.1.5": { "d": "appleCSRGenPolicy", "c": "Apple trust policy" },
+"1.2.840.113635.100.1.6": { "d": "appleCRLPolicy", "c": "Apple trust policy" },
+"1.2.840.113635.100.1.7": { "d": "appleOCSPPolicy", "c": "Apple trust policy" },
+"1.2.840.113635.100.1.8": { "d": "appleSMIMEPolicy", "c": "Apple trust policy" },
+"1.2.840.113635.100.1.9": { "d": "appleEAPPolicy", "c": "Apple trust policy" },
+"1.2.840.113635.100.1.10": { "d": "appleSWUpdateSigningPolicy", "c": "Apple trust policy" },
+"1.2.840.113635.100.1.11": { "d": "appleIPSecPolicy", "c": "Apple trust policy" },
+"1.2.840.113635.100.1.12": { "d": "appleIChatPolicy", "c": "Apple trust policy" },
+"1.2.840.113635.100.1.13": { "d": "appleResourceSignPolicy", "c": "Apple trust policy" },
+"1.2.840.113635.100.1.14": { "d": "applePKINITClientPolicy", "c": "Apple trust policy" },
+"1.2.840.113635.100.1.15": { "d": "applePKINITServerPolicy", "c": "Apple trust policy" },
+"1.2.840.113635.100.1.16": { "d": "appleCodeSigningPolicy", "c": "Apple trust policy" },
+"1.2.840.113635.100.1.17": { "d": "applePackageSigningPolicy", "c": "Apple trust policy" },
+"1.2.840.113635.100.2": { "d": "appleSecurityAlgorithm", "c": "Apple" },
+"1.2.840.113635.100.2.1": { "d": "appleFEE", "c": "Apple security algorithm" },
+"1.2.840.113635.100.2.2": { "d": "appleASC", "c": "Apple security algorithm" },
+"1.2.840.113635.100.2.3": { "d": "appleFEE_MD5", "c": "Apple security algorithm" },
+"1.2.840.113635.100.2.4": { "d": "appleFEE_SHA1", "c": "Apple security algorithm" },
+"1.2.840.113635.100.2.5": { "d": "appleFEED", "c": "Apple security algorithm" },
+"1.2.840.113635.100.2.6": { "d": "appleFEEDEXP", "c": "Apple security algorithm" },
+"1.2.840.113635.100.2.7": { "d": "appleECDSA", "c": "Apple security algorithm" },
+"1.2.840.113635.100.3": { "d": "appleDotMacCertificate", "c": "Apple" },
+"1.2.840.113635.100.3.1": { "d": "appleDotMacCertificateRequest", "c": "Apple dotMac certificate" },
+"1.2.840.113635.100.3.2": { "d": "appleDotMacCertificateExtension", "c": "Apple dotMac certificate" },
+"1.2.840.113635.100.3.3": { "d": "appleDotMacCertificateRequestValues", "c": "Apple dotMac certificate" },
+"1.2.840.113635.100.4": { "d": "appleExtendedKeyUsage", "c": "Apple" },
+"1.2.840.113635.100.4.1": { "d": "appleCodeSigning", "c": "Apple extended key usage" },
+"1.2.840.113635.100.4.1.1": { "d": "appleCodeSigningDevelopment", "c": "Apple extended key usage" },
+"1.2.840.113635.100.4.1.2": { "d": "appleSoftwareUpdateSigning", "c": "Apple extended key usage" },
+"1.2.840.113635.100.4.1.3": { "d": "appleCodeSigningThirdParty", "c": "Apple extended key usage" },
+"1.2.840.113635.100.4.1.4": { "d": "appleResourceSigning", "c": "Apple extended key usage" },
+"1.2.840.113635.100.4.2": { "d": "appleIChatSigning", "c": "Apple extended key usage" },
+"1.2.840.113635.100.4.3": { "d": "appleIChatEncryption", "c": "Apple extended key usage" },
+"1.2.840.113635.100.4.4": { "d": "appleSystemIdentity", "c": "Apple extended key usage" },
+"1.2.840.113635.100.4.5": { "d": "appleCryptoEnv", "c": "Apple extended key usage" },
+"1.2.840.113635.100.4.5.1": { "d": "appleCryptoProductionEnv", "c": "Apple extended key usage" },
+"1.2.840.113635.100.4.5.2": { "d": "appleCryptoMaintenanceEnv", "c": "Apple extended key usage" },
+"1.2.840.113635.100.4.5.3": { "d": "appleCryptoTestEnv", "c": "Apple extended key usage" },
+"1.2.840.113635.100.4.5.4": { "d": "appleCryptoDevelopmentEnv", "c": "Apple extended key usage" },
+"1.2.840.113635.100.4.6": { "d": "appleCryptoQoS", "c": "Apple extended key usage" },
+"1.2.840.113635.100.4.6.1": { "d": "appleCryptoTier0QoS", "c": "Apple extended key usage" },
+"1.2.840.113635.100.4.6.2": { "d": "appleCryptoTier1QoS", "c": "Apple extended key usage" },
+"1.2.840.113635.100.4.6.3": { "d": "appleCryptoTier2QoS", "c": "Apple extended key usage" },
+"1.2.840.113635.100.4.6.4": { "d": "appleCryptoTier3QoS", "c": "Apple extended key usage" },
+"1.2.840.113635.100.5": { "d": "appleCertificatePolicies", "c": "Apple" },
+"1.2.840.113635.100.5.1": { "d": "appleCertificatePolicyID", "c": "Apple" },
+"1.2.840.113635.100.5.2": { "d": "appleDotMacCertificatePolicyID", "c": "Apple" },
+"1.2.840.113635.100.5.3": { "d": "appleADCCertificatePolicyID", "c": "Apple" },
+"1.2.840.113635.100.6": { "d": "appleCertificateExtensions", "c": "Apple" },
+"1.2.840.113635.100.6.1": { "d": "appleCertificateExtensionCodeSigning", "c": "Apple certificate extension" },
+"1.2.840.113635.100.6.1.1": { "d": "appleCertificateExtensionAppleSigning", "c": "Apple certificate extension" },
+"1.2.840.113635.100.6.1.2": { "d": "appleCertificateExtensionADCDeveloperSigning", "c": "Apple certificate extension" },
+"1.2.840.113635.100.6.1.3": { "d": "appleCertificateExtensionADCAppleSigning", "c": "Apple certificate extension" },
+"1.3.6.1.4.1.311.2.1.4": { "d": "spcIndirectDataContext", "c": "Microsoft code signing" },
+"1.3.6.1.4.1.311.2.1.10": { "d": "spcAgencyInfo", "c": "Microsoft code signing. Also known as policyLink" },
+"1.3.6.1.4.1.311.2.1.11": { "d": "spcStatementType", "c": "Microsoft code signing" },
+"1.3.6.1.4.1.311.2.1.12": { "d": "spcSpOpusInfo", "c": "Microsoft code signing" },
+"1.3.6.1.4.1.311.2.1.14": { "d": "certReqExtensions", "c": "Microsoft" },
+"1.3.6.1.4.1.311.2.1.15": { "d": "spcPEImageData", "c": "Microsoft code signing" },
+"1.3.6.1.4.1.311.2.1.18": { "d": "spcRawFileData", "c": "Microsoft code signing" },
+"1.3.6.1.4.1.311.2.1.19": { "d": "spcStructuredStorageData", "c": "Microsoft code signing" },
+"1.3.6.1.4.1.311.2.1.20": { "d": "spcJavaClassData (type 1)", "c": "Microsoft code signing. Formerly \"link extension\" aka \"glue extension\"" },
+"1.3.6.1.4.1.311.2.1.21": { "d": "individualCodeSigning", "c": "Microsoft" },
+"1.3.6.1.4.1.311.2.1.22": { "d": "commercialCodeSigning", "c": "Microsoft" },
+"1.3.6.1.4.1.311.2.1.25": { "d": "spcLink (type 2)", "c": "Microsoft code signing. Also known as \"glue extension\"" },
+"1.3.6.1.4.1.311.2.1.26": { "d": "spcMinimalCriteriaInfo", "c": "Microsoft code signing" },
+"1.3.6.1.4.1.311.2.1.27": { "d": "spcFinancialCriteriaInfo", "c": "Microsoft code signing" },
+"1.3.6.1.4.1.311.2.1.28": { "d": "spcLink (type 3)", "c": "Microsoft code signing.  Also known as \"glue extension\"" },
+"1.3.6.1.4.1.311.2.1.29": { "d": "spcHashInfoObjID", "c": "Microsoft code signing" },
+"1.3.6.1.4.1.311.2.1.30": { "d": "spcSipInfoObjID", "c": "Microsoft code signing" },
+"1.3.6.1.4.1.311.2.2": { "d": "ctl", "c": "Microsoft CTL" },
+"1.3.6.1.4.1.311.2.2.1": { "d": "ctlTrustedCodesigningCAList", "c": "Microsoft CTL" },
+"1.3.6.1.4.1.311.2.2.2": { "d": "ctlTrustedClientAuthCAList", "c": "Microsoft CTL" },
+"1.3.6.1.4.1.311.2.2.3": { "d": "ctlTrustedServerAuthCAList", "c": "Microsoft CTL" },
+"1.3.6.1.4.1.311.3.2.1": { "d": "timestampRequest", "c": "Microsoft code signing" },
+"1.3.6.1.4.1.311.10.1": { "d": "certTrustList", "c": "Microsoft contentType" },
+"1.3.6.1.4.1.311.10.1.1": { "d": "sortedCtl", "c": "Microsoft contentType" },
+"1.3.6.1.4.1.311.10.2": { "d": "nextUpdateLocation", "c": "Microsoft" },
+"1.3.6.1.4.1.311.10.3.1": { "d": "certTrustListSigning", "c": "Microsoft enhanced key usage" },
+"1.3.6.1.4.1.311.10.3.2": { "d": "timeStampSigning", "c": "Microsoft enhanced key usage" },
+"1.3.6.1.4.1.311.10.3.3": { "d": "serverGatedCrypto", "c": "Microsoft enhanced key usage" },
+"1.3.6.1.4.1.311.10.3.3.1": { "d": "serialized", "c": "Microsoft" },
+"1.3.6.1.4.1.311.10.3.4": { "d": "encryptedFileSystem", "c": "Microsoft enhanced key usage" },
+"1.3.6.1.4.1.311.10.3.5": { "d": "whqlCrypto", "c": "Microsoft enhanced key usage" },
+"1.3.6.1.4.1.311.10.3.6": { "d": "nt5Crypto", "c": "Microsoft enhanced key usage" },
+"1.3.6.1.4.1.311.10.3.7": { "d": "oemWHQLCrypto", "c": "Microsoft enhanced key usage" },
+"1.3.6.1.4.1.311.10.3.8": { "d": "embeddedNTCrypto", "c": "Microsoft enhanced key usage" },
+"1.3.6.1.4.1.311.10.3.9": { "d": "rootListSigner", "c": "Microsoft enhanced key usage" },
+"1.3.6.1.4.1.311.10.3.10": { "d": "qualifiedSubordination", "c": "Microsoft enhanced key usage" },
+"1.3.6.1.4.1.311.10.3.11": { "d": "keyRecovery", "c": "Microsoft enhanced key usage" },
+"1.3.6.1.4.1.311.10.3.12": { "d": "documentSigning", "c": "Microsoft enhanced key usage" },
+"1.3.6.1.4.1.311.10.3.13": { "d": "lifetimeSigning", "c": "Microsoft enhanced key usage" },
+"1.3.6.1.4.1.311.10.3.14": { "d": "mobileDeviceSoftware", "c": "Microsoft enhanced key usage" },
+"1.3.6.1.4.1.311.10.3.15": { "d": "smartDisplay", "c": "Microsoft enhanced key usage" },
+"1.3.6.1.4.1.311.10.3.16": { "d": "cspSignature", "c": "Microsoft enhanced key usage" },
+"1.3.6.1.4.1.311.10.3.4.1": { "d": "efsRecovery", "c": "Microsoft enhanced key usage" },
+"1.3.6.1.4.1.311.10.4.1": { "d": "yesnoTrustAttr", "c": "Microsoft attribute" },
+"1.3.6.1.4.1.311.10.5.1": { "d": "drm", "c": "Microsoft enhanced key usage" },
+"1.3.6.1.4.1.311.10.5.2": { "d": "drmIndividualization", "c": "Microsoft enhanced key usage" },
+"1.3.6.1.4.1.311.10.6.1": { "d": "licenses", "c": "Microsoft enhanced key usage" },
+"1.3.6.1.4.1.311.10.6.2": { "d": "licenseServer", "c": "Microsoft enhanced key usage" },
+"1.3.6.1.4.1.311.10.7.1": { "d": "keyidRdn", "c": "Microsoft attribute" },
+"1.3.6.1.4.1.311.10.8.1": { "d": "removeCertificate", "c": "Microsoft attribute" },
+"1.3.6.1.4.1.311.10.9.1": { "d": "crossCertDistPoints", "c": "Microsoft attribute" },
+"1.3.6.1.4.1.311.10.10.1": { "d": "cmcAddAttributes", "c": "Microsoft" },
+"1.3.6.1.4.1.311.10.11": { "d": "certPropIdPrefix", "c": "Microsoft" },
+"1.3.6.1.4.1.311.10.11.4": { "d": "certMd5HashPropId", "c": "Microsoft" },
+"1.3.6.1.4.1.311.10.11.20": { "d": "certKeyIdentifierPropId", "c": "Microsoft" },
+"1.3.6.1.4.1.311.10.11.28": { "d": "certIssuerSerialNumberMd5HashPropId", "c": "Microsoft" },
+"1.3.6.1.4.1.311.10.11.29": { "d": "certSubjectNameMd5HashPropId", "c": "Microsoft" },
+"1.3.6.1.4.1.311.10.12.1": { "d": "anyApplicationPolicy", "c": "Microsoft attribute" },
+"1.3.6.1.4.1.311.12": { "d": "catalog", "c": "Microsoft attribute" },
+"1.3.6.1.4.1.311.12.1.1": { "d": "catalogList", "c": "Microsoft attribute" },
+"1.3.6.1.4.1.311.12.1.2": { "d": "catalogListMember", "c": "Microsoft attribute" },
+"1.3.6.1.4.1.311.12.2.1": { "d": "catalogNameValueObjID", "c": "Microsoft attribute" },
+"1.3.6.1.4.1.311.12.2.2": { "d": "catalogMemberInfoObjID", "c": "Microsoft attribute" },
+"1.3.6.1.4.1.311.13.1": { "d": "renewalCertificate", "c": "Microsoft attribute" },
+"1.3.6.1.4.1.311.13.2.1": { "d": "enrolmentNameValuePair", "c": "Microsoft attribute" },
+"1.3.6.1.4.1.311.13.2.2": { "d": "enrolmentCSP", "c": "Microsoft attribute" },
+"1.3.6.1.4.1.311.13.2.3": { "d": "osVersion", "c": "Microsoft attribute" },
+"1.3.6.1.4.1.311.16.4": { "d": "microsoftRecipientInfo", "c": "Microsoft attribute" },
+"1.3.6.1.4.1.311.17.1": { "d": "pkcs12KeyProviderNameAttr", "c": "Microsoft attribute" },
+"1.3.6.1.4.1.311.17.2": { "d": "localMachineKeyset", "c": "Microsoft attribute" },
+"1.3.6.1.4.1.311.17.3": { "d": "pkcs12ExtendedAttributes", "c": "Microsoft attribute" },
+"1.3.6.1.4.1.311.20.1": { "d": "autoEnrollCtlUsage", "c": "Microsoft" },
+"1.3.6.1.4.1.311.20.2": { "d": "enrollCerttypeExtension", "c": "Microsoft CAPICOM certificate template, V1" },
+"1.3.6.1.4.1.311.20.2.1": { "d": "enrollmentAgent", "c": "Microsoft enhanced key usage" },
+"1.3.6.1.4.1.311.20.2.2": { "d": "smartcardLogon", "c": "Microsoft enhanced key usage" },
+"1.3.6.1.4.1.311.20.2.3": { "d": "universalPrincipalName", "c": "Microsoft UPN" },
+"1.3.6.1.4.1.311.20.3": { "d": "certManifold", "c": "Microsoft" },
+"1.3.6.1.4.1.311.21.1": { "d": "cAKeyCertIndexPair", "c": "Microsoft attribute.  Also known as certsrvCaVersion" },
+"1.3.6.1.4.1.311.21.2": { "d": "certSrvPreviousCertHash", "c": "Microsoft" },
+"1.3.6.1.4.1.311.21.3": { "d": "crlVirtualBase", "c": "Microsoft" },
+"1.3.6.1.4.1.311.21.4": { "d": "crlNextPublish", "c": "Microsoft" },
+"1.3.6.1.4.1.311.21.5": { "d": "caExchange", "c": "Microsoft extended key usage", "w": true },
+"1.3.6.1.4.1.311.21.6": { "d": "keyRecovery", "c": "Microsoft extended key usage", "w": true },
+"1.3.6.1.4.1.311.21.7": { "d": "certificateTemplate", "c": "Microsoft CAPICOM certificate template, V2" },
+"1.3.6.1.4.1.311.21.9": { "d": "rdnDummySigner", "c": "Microsoft" },
+"1.3.6.1.4.1.311.21.10": { "d": "applicationCertPolicies", "c": "Microsoft" },
+"1.3.6.1.4.1.311.21.11": { "d": "applicationPolicyMappings", "c": "Microsoft" },
+"1.3.6.1.4.1.311.21.12": { "d": "applicationPolicyConstraints", "c": "Microsoft" },
+"1.3.6.1.4.1.311.21.13": { "d": "archivedKey", "c": "Microsoft attribute" },
+"1.3.6.1.4.1.311.21.14": { "d": "crlSelfCDP", "c": "Microsoft" },
+"1.3.6.1.4.1.311.21.15": { "d": "requireCertChainPolicy", "c": "Microsoft" },
+"1.3.6.1.4.1.311.21.16": { "d": "archivedKeyCertHash", "c": "Microsoft" },
+"1.3.6.1.4.1.311.21.17": { "d": "issuedCertHash", "c": "Microsoft" },
+"1.3.6.1.4.1.311.21.19": { "d": "dsEmailReplication", "c": "Microsoft" },
+"1.3.6.1.4.1.311.21.20": { "d": "requestClientInfo", "c": "Microsoft attribute" },
+"1.3.6.1.4.1.311.21.21": { "d": "encryptedKeyHash", "c": "Microsoft attribute" },
+"1.3.6.1.4.1.311.21.22": { "d": "certsrvCrossCaVersion", "c": "Microsoft" },
+"1.3.6.1.4.1.311.25.1": { "d": "ntdsReplication", "c": "Microsoft" },
+"1.3.6.1.4.1.311.31.1": { "d": "productUpdate", "c": "Microsoft attribute" },
+"1.3.6.1.4.1.311.47.1.1": { "d": "systemHealth", "c": "Microsoft extended key usage" },
+"1.3.6.1.4.1.311.47.1.3": { "d": "systemHealthLoophole", "c": "Microsoft extended key usage" },
+"1.3.6.1.4.1.311.60.1.1": { "d": "rootProgramFlags", "c": "Microsoft policy attribute" },
+"1.3.6.1.4.1.311.61.1.1": { "d": "kernelModeCodeSigning", "c": "Microsoft enhanced key usage" },
+"1.3.6.1.4.1.311.60.2.1.1": { "d": "jurisdictionOfIncorporationL", "c": "Microsoft (???)" },
+"1.3.6.1.4.1.311.60.2.1.2": { "d": "jurisdictionOfIncorporationSP", "c": "Microsoft (???)" },
+"1.3.6.1.4.1.311.60.2.1.3": { "d": "jurisdictionOfIncorporationC", "c": "Microsoft (???)" },
+"1.3.6.1.4.1.311.88": { "d": "capiCom", "c": "Microsoft attribute" },
+"1.3.6.1.4.1.311.88.1": { "d": "capiComVersion", "c": "Microsoft attribute" },
+"1.3.6.1.4.1.311.88.2": { "d": "capiComAttribute", "c": "Microsoft attribute" },
+"1.3.6.1.4.1.311.88.2.1": { "d": "capiComDocumentName", "c": "Microsoft attribute" },
+"1.3.6.1.4.1.311.88.2.2": { "d": "capiComDocumentDescription", "c": "Microsoft attribute" },
+"1.3.6.1.4.1.311.88.3": { "d": "capiComEncryptedData", "c": "Microsoft attribute" },
+"1.3.6.1.4.1.311.88.3.1": { "d": "capiComEncryptedContent", "c": "Microsoft attribute" },
+"1.3.6.1.4.1.188.7.1.1": { "d": "ascom", "c": "Ascom Systech" },
+"1.3.6.1.4.1.188.7.1.1.1": { "d": "ideaECB", "c": "Ascom Systech" },
+"1.3.6.1.4.1.188.7.1.1.2": { "d": "ideaCBC", "c": "Ascom Systech" },
+"1.3.6.1.4.1.188.7.1.1.3": { "d": "ideaCFB", "c": "Ascom Systech" },
+"1.3.6.1.4.1.188.7.1.1.4": { "d": "ideaOFB", "c": "Ascom Systech" },
+"1.3.6.1.4.1.2428.10.1.1": { "d": "UNINETT policyIdentifier", "c": "UNINETT PCA" },
+"1.3.6.1.4.1.2712.10": { "d": "ICE-TEL policyIdentifier", "c": "ICE-TEL CA" },
+"1.3.6.1.4.1.2786.1.1.1": { "d": "ICE-TEL Italian policyIdentifier", "c": "ICE-TEL CA policy" },
+"1.3.6.1.4.1.3029.1.1.1": { "d": "blowfishECB", "c": "cryptlib encryption algorithm" },
+"1.3.6.1.4.1.3029.1.1.2": { "d": "blowfishCBC", "c": "cryptlib encryption algorithm" },
+"1.3.6.1.4.1.3029.1.1.3": { "d": "blowfishCFB", "c": "cryptlib encryption algorithm" },
+"1.3.6.1.4.1.3029.1.1.4": { "d": "blowfishOFB", "c": "cryptlib encryption algorithm" },
+"1.3.6.1.4.1.3029.1.2.1": { "d": "elgamal", "c": "cryptlib public-key algorithm" },
+"1.3.6.1.4.1.3029.1.2.1.1": { "d": "elgamalWithSHA-1", "c": "cryptlib public-key algorithm" },
+"1.3.6.1.4.1.3029.1.2.1.2": { "d": "elgamalWithRIPEMD-160", "c": "cryptlib public-key algorithm" },
+"1.3.6.1.4.1.3029.3.1.1": { "d": "cryptlibPresenceCheck", "c": "cryptlib attribute type" },
+"1.3.6.1.4.1.3029.3.1.2": { "d": "pkiBoot", "c": "cryptlib attribute type" },
+"1.3.6.1.4.1.3029.3.1.4": { "d": "crlExtReason", "c": "cryptlib attribute type" },
+"1.3.6.1.4.1.3029.3.1.5": { "d": "keyFeatures", "c": "cryptlib attribute type" },
+"1.3.6.1.4.1.3029.4.1": { "d": "cryptlibContent", "c": "cryptlib" },
+"1.3.6.1.4.1.3029.4.1.1": { "d": "cryptlibConfigData", "c": "cryptlib content type" },
+"1.3.6.1.4.1.3029.4.1.2": { "d": "cryptlibUserIndex", "c": "cryptlib content type" },
+"1.3.6.1.4.1.3029.4.1.3": { "d": "cryptlibUserInfo", "c": "cryptlib content type" },
+"1.3.6.1.4.1.3029.4.1.4": { "d": "rtcsRequest", "c": "cryptlib content type" },
+"1.3.6.1.4.1.3029.4.1.5": { "d": "rtcsResponse", "c": "cryptlib content type" },
+"1.3.6.1.4.1.3029.4.1.6": { "d": "rtcsResponseExt", "c": "cryptlib content type" },
+"1.3.6.1.4.1.3029.42.11172.1": { "d": "mpeg-1", "c": "cryptlib special MPEG-of-cat OID" },
+"1.3.6.1.4.1.3029.54.11940.54": { "d": "TSA policy \"Anything that arrives, we sign\"", "c": "cryptlib TSA policy" },
+"1.3.6.1.4.1.3029.88.89.90.90.89": { "d": "xYZZY policyIdentifier", "c": "cryptlib certificate policy" },
+"1.3.6.1.4.1.3401.8.1.1": { "d": "pgpExtension", "c": "PGP key information" },
+"1.3.6.1.4.1.3576.7": { "d": "eciaAscX12Edi", "c": "TMN EDI for Interactive Agents" },
+"1.3.6.1.4.1.3576.7.1": { "d": "plainEDImessage", "c": "TMN EDI for Interactive Agents" },
+"1.3.6.1.4.1.3576.7.2": { "d": "signedEDImessage", "c": "TMN EDI for Interactive Agents" },
+"1.3.6.1.4.1.3576.7.5": { "d": "integrityEDImessage", "c": "TMN EDI for Interactive Agents" },
+"1.3.6.1.4.1.3576.7.65": { "d": "iaReceiptMessage", "c": "TMN EDI for Interactive Agents" },
+"1.3.6.1.4.1.3576.7.97": { "d": "iaStatusMessage", "c": "TMN EDI for Interactive Agents" },
+"1.3.6.1.4.1.3576.8": { "d": "eciaEdifact", "c": "TMN EDI for Interactive Agents" },
+"1.3.6.1.4.1.3576.9": { "d": "eciaNonEdi", "c": "TMN EDI for Interactive Agents" },
+"1.3.6.1.4.1.4146": { "d": "Globalsign", "c": "Globalsign" },
+"1.3.6.1.4.1.4146.1": { "d": "globalsignPolicy", "c": "Globalsign" },
+"1.3.6.1.4.1.4146.1.10": { "d": "globalsignDVPolicy", "c": "Globalsign policy" },
+"1.3.6.1.4.1.4146.1.20": { "d": "globalsignOVPolicy", "c": "Globalsign policy" },
+"1.3.6.1.4.1.4146.1.30": { "d": "globalsignTSAPolicy", "c": "Globalsign policy" },
+"1.3.6.1.4.1.4146.1.40": { "d": "globalsignClientCertPolicy", "c": "Globalsign policy" },
+"1.3.6.1.4.1.4146.1.50": { "d": "globalsignCodeSignPolicy", "c": "Globalsign policy" },
+"1.3.6.1.4.1.4146.1.60": { "d": "globalsignRootSignPolicy", "c": "Globalsign policy" },
+"1.3.6.1.4.1.4146.1.70": { "d": "globalsignTrustedRootPolicy", "c": "Globalsign policy" },
+"1.3.6.1.4.1.4146.1.80": { "d": "globalsignEDIClientPolicy", "c": "Globalsign policy" },
+"1.3.6.1.4.1.4146.1.81": { "d": "globalsignEDIServerPolicy", "c": "Globalsign policy" },
+"1.3.6.1.4.1.4146.1.90": { "d": "globalsignTPMRootPolicy", "c": "Globalsign policy" },
+"1.3.6.1.4.1.4146.1.95": { "d": "globalsignOCSPPolicy", "c": "Globalsign policy" },
+"1.3.6.1.4.1.5309.1": { "d": "edelWebPolicy", "c": "EdelWeb policy" },
+"1.3.6.1.4.1.5309.1.2": { "d": "edelWebCustomerPolicy", "c": "EdelWeb policy" },
+"1.3.6.1.4.1.5309.1.2.1": { "d": "edelWebClepsydrePolicy", "c": "EdelWeb policy" },
+"1.3.6.1.4.1.5309.1.2.2": { "d": "edelWebExperimentalTSAPolicy", "c": "EdelWeb policy" },
+"1.3.6.1.4.1.5309.1.2.3": { "d": "edelWebOpenEvidenceTSAPolicy", "c": "EdelWeb policy" },
+"1.3.6.1.4.1.5472": { "d": "timeproof", "c": "enterprise" },
+"1.3.6.1.4.1.5472.1": { "d": "tss", "c": "timeproof" },
+"1.3.6.1.4.1.5472.1.1": { "d": "tss80", "c": "timeproof TSS" },
+"1.3.6.1.4.1.5472.1.2": { "d": "tss380", "c": "timeproof TSS" },
+"1.3.6.1.4.1.5472.1.3": { "d": "tss400", "c": "timeproof TSS" },
+"1.3.6.1.4.1.5770.0.3": { "d": "secondaryPractices", "c": "MEDePass" },
+"1.3.6.1.4.1.5770.0.4": { "d": "physicianIdentifiers", "c": "MEDePass" },
+"1.3.6.1.4.1.6449.1.2.1.3.1": { "d": "comodoPolicy", "c": "Comodo CA" },
+"1.3.6.1.4.1.6449.1.2.2.15": { "d": "wotrustPolicy", "c": "WoTrust (Comodo) CA" },
+"1.3.6.1.4.1.6449.1.3.5.2": { "d": "comodoCertifiedDeliveryService", "c": "Comodo CA" },
+"1.3.6.1.4.1.6449.2.1.1": { "d": "comodoTimestampingPolicy", "c": "Comodo CA" },
+"1.3.6.1.4.1.8301.3.5.1": { "d": "validityModelChain", "c": "TU Darmstadt ValidityModel" },
+"1.3.6.1.4.1.8301.3.5.2": { "d": "validityModelShell", "c": "ValidityModel" },
+"1.3.6.1.4.1.8231.1": { "d": "rolUnicoNacional", "c": "Chilean Government national unique roll number" },
+"1.3.6.1.4.1.11591": { "d": "gnu", "c": "GNU Project (see http://www.gnupg.org/oids.html)" },
+"1.3.6.1.4.1.11591.1": { "d": "gnuRadius", "c": "GNU Radius" },
+"1.3.6.1.4.1.11591.3": { "d": "gnuRadar", "c": "GNU Radar" },
+"1.3.6.1.4.1.11591.12": { "d": "gnuDigestAlgorithm", "c": "GNU digest algorithm" },
+"1.3.6.1.4.1.11591.12.2": { "d": "tiger", "c": "GNU digest algorithm" },
+"1.3.6.1.4.1.11591.13": { "d": "gnuEncryptionAlgorithm", "c": "GNU encryption algorithm" },
+"1.3.6.1.4.1.11591.13.2": { "d": "serpent", "c": "GNU encryption algorithm" },
+"1.3.6.1.4.1.11591.13.2.1": { "d": "serpent128_ECB", "c": "GNU encryption algorithm" },
+"1.3.6.1.4.1.11591.13.2.2": { "d": "serpent128_CBC", "c": "GNU encryption algorithm" },
+"1.3.6.1.4.1.11591.13.2.3": { "d": "serpent128_OFB", "c": "GNU encryption algorithm" },
+"1.3.6.1.4.1.11591.13.2.4": { "d": "serpent128_CFB", "c": "GNU encryption algorithm" },
+"1.3.6.1.4.1.11591.13.2.21": { "d": "serpent192_ECB", "c": "GNU encryption algorithm" },
+"1.3.6.1.4.1.11591.13.2.22": { "d": "serpent192_CBC", "c": "GNU encryption algorithm" },
+"1.3.6.1.4.1.11591.13.2.23": { "d": "serpent192_OFB", "c": "GNU encryption algorithm" },
+"1.3.6.1.4.1.11591.13.2.24": { "d": "serpent192_CFB", "c": "GNU encryption algorithm" },
+"1.3.6.1.4.1.11591.13.2.41": { "d": "serpent256_ECB", "c": "GNU encryption algorithm" },
+"1.3.6.1.4.1.11591.13.2.42": { "d": "serpent256_CBC", "c": "GNU encryption algorithm" },
+"1.3.6.1.4.1.11591.13.2.43": { "d": "serpent256_OFB", "c": "GNU encryption algorithm" },
+"1.3.6.1.4.1.11591.13.2.44": { "d": "serpent256_CFB", "c": "GNU encryption algorithm" },
+"1.3.6.1.4.1.11591.15.1": { "d": "curve25519", "c": "GNU encryption algorithm" },
+"1.3.6.1.4.1.11591.15.2": { "d": "curve448", "c": "GNU encryption algorithm" },
+"1.3.6.1.4.1.11591.15.3": { "d": "curve25519ph", "c": "GNU encryption algorithm" },
+"1.3.6.1.4.1.11591.15.4": { "d": "curve448ph", "c": "GNU encryption algorithm" },
+"1.3.6.1.4.1.16334.509.1.1": { "d": "Northrop Grumman extKeyUsage?", "c": "Northrop Grumman extended key usage" },
+"1.3.6.1.4.1.16334.509.2.1": { "d": "ngcClass1", "c": "Northrop Grumman policy" },
+"1.3.6.1.4.1.16334.509.2.2": { "d": "ngcClass2", "c": "Northrop Grumman policy" },
+"1.3.6.1.4.1.16334.509.2.3": { "d": "ngcClass3", "c": "Northrop Grumman policy" },
+"1.3.6.1.4.1.23629.1.4.2.1.1": { "d": "safenetUsageLimit", "c": "SafeNet" },
+"1.3.6.1.4.1.23629.1.4.2.1.2": { "d": "safenetEndDate", "c": "SafeNet" },
+"1.3.6.1.4.1.23629.1.4.2.1.3": { "d": "safenetStartDate", "c": "SafeNet" },
+"1.3.6.1.4.1.23629.1.4.2.1.4": { "d": "safenetAdminCert", "c": "SafeNet" },
+"1.3.6.1.4.1.23629.1.4.2.2.1": { "d": "safenetKeyDigest", "c": "SafeNet" },
+"1.3.6.1.5.5.7": { "d": "pkix", "c": "" },
+"1.3.6.1.5.5.7.0.12": { "d": "attributeCert", "c": "PKIX" },
+"1.3.6.1.5.5.7.1": { "d": "privateExtension", "c": "PKIX" },
+"1.3.6.1.5.5.7.1.1": { "d": "authorityInfoAccess", "c": "PKIX private extension" },
+"1.3.6.1.5.5.7.1.2": { "d": "biometricInfo", "c": "PKIX private extension" },
+"1.3.6.1.5.5.7.1.3": { "d": "qcStatements", "c": "PKIX private extension" },
+"1.3.6.1.5.5.7.1.4": { "d": "acAuditIdentity", "c": "PKIX private extension" },
+"1.3.6.1.5.5.7.1.5": { "d": "acTargeting", "c": "PKIX private extension" },
+"1.3.6.1.5.5.7.1.6": { "d": "acAaControls", "c": "PKIX private extension" },
+"1.3.6.1.5.5.7.1.7": { "d": "ipAddrBlocks", "c": "PKIX private extension" },
+"1.3.6.1.5.5.7.1.8": { "d": "autonomousSysIds", "c": "PKIX private extension" },
+"1.3.6.1.5.5.7.1.9": { "d": "routerIdentifier", "c": "PKIX private extension" },
+"1.3.6.1.5.5.7.1.10": { "d": "acProxying", "c": "PKIX private extension" },
+"1.3.6.1.5.5.7.1.11": { "d": "subjectInfoAccess", "c": "PKIX private extension" },
+"1.3.6.1.5.5.7.1.12": { "d": "logoType", "c": "PKIX private extension" },
+"1.3.6.1.5.5.7.1.13": { "d": "wlanSSID", "c": "PKIX private extension" },
+"1.3.6.1.5.5.7.2": { "d": "policyQualifierIds", "c": "PKIX" },
+"1.3.6.1.5.5.7.2.1": { "d": "cps", "c": "PKIX policy qualifier" },
+"1.3.6.1.5.5.7.2.2": { "d": "unotice", "c": "PKIX policy qualifier" },
+"1.3.6.1.5.5.7.2.3": { "d": "textNotice", "c": "PKIX policy qualifier" },
+"1.3.6.1.5.5.7.3": { "d": "keyPurpose", "c": "PKIX" },
+"1.3.6.1.5.5.7.3.1": { "d": "serverAuth", "c": "PKIX key purpose" },
+"1.3.6.1.5.5.7.3.2": { "d": "clientAuth", "c": "PKIX key purpose" },
+"1.3.6.1.5.5.7.3.3": { "d": "codeSigning", "c": "PKIX key purpose" },
+"1.3.6.1.5.5.7.3.4": { "d": "emailProtection", "c": "PKIX key purpose" },
+"1.3.6.1.5.5.7.3.5": { "d": "ipsecEndSystem", "c": "PKIX key purpose" },
+"1.3.6.1.5.5.7.3.6": { "d": "ipsecTunnel", "c": "PKIX key purpose" },
+"1.3.6.1.5.5.7.3.7": { "d": "ipsecUser", "c": "PKIX key purpose" },
+"1.3.6.1.5.5.7.3.8": { "d": "timeStamping", "c": "PKIX key purpose" },
+"1.3.6.1.5.5.7.3.9": { "d": "ocspSigning", "c": "PKIX key purpose" },
+"1.3.6.1.5.5.7.3.10": { "d": "dvcs", "c": "PKIX key purpose" },
+"1.3.6.1.5.5.7.3.11": { "d": "sbgpCertAAServerAuth", "c": "PKIX key purpose" },
+"1.3.6.1.5.5.7.3.13": { "d": "eapOverPPP", "c": "PKIX key purpose" },
+"1.3.6.1.5.5.7.3.14": { "d": "eapOverLAN", "c": "PKIX key purpose" },
+"1.3.6.1.5.5.7.4": { "d": "cmpInformationTypes", "c": "PKIX" },
+"1.3.6.1.5.5.7.4.1": { "d": "caProtEncCert", "c": "PKIX CMP information" },
+"1.3.6.1.5.5.7.4.2": { "d": "signKeyPairTypes", "c": "PKIX CMP information" },
+"1.3.6.1.5.5.7.4.3": { "d": "encKeyPairTypes", "c": "PKIX CMP information" },
+"1.3.6.1.5.5.7.4.4": { "d": "preferredSymmAlg", "c": "PKIX CMP information" },
+"1.3.6.1.5.5.7.4.5": { "d": "caKeyUpdateInfo", "c": "PKIX CMP information" },
+"1.3.6.1.5.5.7.4.6": { "d": "currentCRL", "c": "PKIX CMP information" },
+"1.3.6.1.5.5.7.4.7": { "d": "unsupportedOIDs", "c": "PKIX CMP information" },
+"1.3.6.1.5.5.7.4.10": { "d": "keyPairParamReq", "c": "PKIX CMP information" },
+"1.3.6.1.5.5.7.4.11": { "d": "keyPairParamRep", "c": "PKIX CMP information" },
+"1.3.6.1.5.5.7.4.12": { "d": "revPassphrase", "c": "PKIX CMP information" },
+"1.3.6.1.5.5.7.4.13": { "d": "implicitConfirm", "c": "PKIX CMP information" },
+"1.3.6.1.5.5.7.4.14": { "d": "confirmWaitTime", "c": "PKIX CMP information" },
+"1.3.6.1.5.5.7.4.15": { "d": "origPKIMessage", "c": "PKIX CMP information" },
+"1.3.6.1.5.5.7.4.16": { "d": "suppLangTags", "c": "PKIX CMP information" },
+"1.3.6.1.5.5.7.5": { "d": "crmfRegistration", "c": "PKIX" },
+"1.3.6.1.5.5.7.5.1": { "d": "regCtrl", "c": "PKIX CRMF registration" },
+"1.3.6.1.5.5.7.5.1.1": { "d": "regToken", "c": "PKIX CRMF registration control" },
+"1.3.6.1.5.5.7.5.1.2": { "d": "authenticator", "c": "PKIX CRMF registration control" },
+"1.3.6.1.5.5.7.5.1.3": { "d": "pkiPublicationInfo", "c": "PKIX CRMF registration control" },
+"1.3.6.1.5.5.7.5.1.4": { "d": "pkiArchiveOptions", "c": "PKIX CRMF registration control" },
+"1.3.6.1.5.5.7.5.1.5": { "d": "oldCertID", "c": "PKIX CRMF registration control" },
+"1.3.6.1.5.5.7.5.1.6": { "d": "protocolEncrKey", "c": "PKIX CRMF registration control" },
+"1.3.6.1.5.5.7.5.1.7": { "d": "altCertTemplate", "c": "PKIX CRMF registration control" },
+"1.3.6.1.5.5.7.5.1.8": { "d": "wtlsTemplate", "c": "PKIX CRMF registration control" },
+"1.3.6.1.5.5.7.5.2": { "d": "utf8Pairs", "c": "PKIX CRMF registration" },
+"1.3.6.1.5.5.7.5.2.1": { "d": "utf8Pairs", "c": "PKIX CRMF registration control" },
+"1.3.6.1.5.5.7.5.2.2": { "d": "certReq", "c": "PKIX CRMF registration control" },
+"1.3.6.1.5.5.7.6": { "d": "algorithms", "c": "PKIX" },
+"1.3.6.1.5.5.7.6.1": { "d": "des40", "c": "PKIX algorithm" },
+"1.3.6.1.5.5.7.6.2": { "d": "noSignature", "c": "PKIX algorithm" },
+"1.3.6.1.5.5.7.6.3": { "d": "dh-sig-hmac-sha1", "c": "PKIX algorithm" },
+"1.3.6.1.5.5.7.6.4": { "d": "dh-pop", "c": "PKIX algorithm" },
+"1.3.6.1.5.5.7.7": { "d": "cmcControls", "c": "PKIX" },
+"1.3.6.1.5.5.7.8": { "d": "otherNames", "c": "PKIX" },
+"1.3.6.1.5.5.7.8.1": { "d": "personalData", "c": "PKIX other name" },
+"1.3.6.1.5.5.7.8.2": { "d": "userGroup", "c": "PKIX other name" },
+"1.3.6.1.5.5.7.8.5": { "d": "xmppAddr", "c": "PKIX other name" },
+"1.3.6.1.5.5.7.9": { "d": "personalData", "c": "PKIX qualified certificates" },
+"1.3.6.1.5.5.7.9.1": { "d": "dateOfBirth", "c": "PKIX personal data" },
+"1.3.6.1.5.5.7.9.2": { "d": "placeOfBirth", "c": "PKIX personal data" },
+"1.3.6.1.5.5.7.9.3": { "d": "gender", "c": "PKIX personal data" },
+"1.3.6.1.5.5.7.9.4": { "d": "countryOfCitizenship", "c": "PKIX personal data" },
+"1.3.6.1.5.5.7.9.5": { "d": "countryOfResidence", "c": "PKIX personal data" },
+"1.3.6.1.5.5.7.10": { "d": "attributeCertificate", "c": "PKIX" },
+"1.3.6.1.5.5.7.10.1": { "d": "authenticationInfo", "c": "PKIX attribute certificate extension" },
+"1.3.6.1.5.5.7.10.2": { "d": "accessIdentity", "c": "PKIX attribute certificate extension" },
+"1.3.6.1.5.5.7.10.3": { "d": "chargingIdentity", "c": "PKIX attribute certificate extension" },
+"1.3.6.1.5.5.7.10.4": { "d": "group", "c": "PKIX attribute certificate extension" },
+"1.3.6.1.5.5.7.10.5": { "d": "role", "c": "PKIX attribute certificate extension" },
+"1.3.6.1.5.5.7.10.6": { "d": "wlanSSID", "c": "PKIX attribute-certificate extension" },
+"1.3.6.1.5.5.7.11": { "d": "personalData", "c": "PKIX qualified certificates" },
+"1.3.6.1.5.5.7.11.1": { "d": "pkixQCSyntax-v1", "c": "PKIX qualified certificates" },
+"1.3.6.1.5.5.7.14.2": { "d": "resourceCertificatePolicy", "c": "PKIX policies" },
+"1.3.6.1.5.5.7.20": { "d": "logo", "c": "PKIX qualified certificates" },
+"1.3.6.1.5.5.7.20.1": { "d": "logoLoyalty", "c": "PKIX" },
+"1.3.6.1.5.5.7.20.2": { "d": "logoBackground", "c": "PKIX" },
+"1.3.6.1.5.5.7.48.1": { "d": "ocsp", "c": "PKIX" },
+"1.3.6.1.5.5.7.48.1.1": { "d": "ocspBasic", "c": "OCSP" },
+"1.3.6.1.5.5.7.48.1.2": { "d": "ocspNonce", "c": "OCSP" },
+"1.3.6.1.5.5.7.48.1.3": { "d": "ocspCRL", "c": "OCSP" },
+"1.3.6.1.5.5.7.48.1.4": { "d": "ocspResponse", "c": "OCSP" },
+"1.3.6.1.5.5.7.48.1.5": { "d": "ocspNoCheck", "c": "OCSP" },
+"1.3.6.1.5.5.7.48.1.6": { "d": "ocspArchiveCutoff", "c": "OCSP" },
+"1.3.6.1.5.5.7.48.1.7": { "d": "ocspServiceLocator", "c": "OCSP" },
+"1.3.6.1.5.5.7.48.2": { "d": "caIssuers", "c": "PKIX subject/authority info access descriptor" },
+"1.3.6.1.5.5.7.48.3": { "d": "timeStamping", "c": "PKIX subject/authority info access descriptor" },
+"1.3.6.1.5.5.7.48.4": { "d": "dvcs", "c": "PKIX subject/authority info access descriptor" },
+"1.3.6.1.5.5.7.48.5": { "d": "caRepository", "c": "PKIX subject/authority info access descriptor" },
+"1.3.6.1.5.5.7.48.7": { "d": "signedObjectRepository", "c": "PKIX subject/authority info access descriptor" },
+"1.3.6.1.5.5.7.48.10": { "d": "rpkiManifest", "c": "PKIX subject/authority info access descriptor" },
+"1.3.6.1.5.5.7.48.11": { "d": "signedObject", "c": "PKIX subject/authority info access descriptor" },
+"1.3.6.1.5.5.8.1.1": { "d": "hmacMD5", "c": "ISAKMP HMAC algorithm" },
+"1.3.6.1.5.5.8.1.2": { "d": "hmacSHA", "c": "ISAKMP HMAC algorithm" },
+"1.3.6.1.5.5.8.1.3": { "d": "hmacTiger", "c": "ISAKMP HMAC algorithm" },
+"1.3.6.1.5.5.8.2.2": { "d": "iKEIntermediate", "c": "IKE ???" },
+"1.3.12.2.1011.7.1": { "d": "decEncryptionAlgorithm", "c": "DASS algorithm" },
+"1.3.12.2.1011.7.1.2": { "d": "decDEA", "c": "DASS encryption algorithm" },
+"1.3.12.2.1011.7.2": { "d": "decHashAlgorithm", "c": "DASS algorithm" },
+"1.3.12.2.1011.7.2.1": { "d": "decMD2", "c": "DASS hash algorithm" },
+"1.3.12.2.1011.7.2.2": { "d": "decMD4", "c": "DASS hash algorithm" },
+"1.3.12.2.1011.7.3": { "d": "decSignatureAlgorithm", "c": "DASS algorithm" },
+"1.3.12.2.1011.7.3.1": { "d": "decMD2withRSA", "c": "DASS signature algorithm" },
+"1.3.12.2.1011.7.3.2": { "d": "decMD4withRSA", "c": "DASS signature algorithm" },
+"1.3.12.2.1011.7.3.3": { "d": "decDEAMAC", "c": "DASS signature algorithm" },
+"1.3.14.2.26.5": { "d": "sha", "c": "Unsure about this OID" },
+"1.3.14.3.2.1.1": { "d": "rsa", "c": "X.509. Unsure about this OID" },
+"1.3.14.3.2.2": { "d": "md4WitRSA", "c": "Oddball OIW OID" },
+"1.3.14.3.2.3": { "d": "md5WithRSA", "c": "Oddball OIW OID" },
+"1.3.14.3.2.4": { "d": "md4WithRSAEncryption", "c": "Oddball OIW OID" },
+"1.3.14.3.2.2.1": { "d": "sqmod-N", "c": "X.509. Deprecated", "w": true },
+"1.3.14.3.2.3.1": { "d": "sqmod-NwithRSA", "c": "X.509. Deprecated", "w": true },
+"1.3.14.3.2.6": { "d": "desECB", "c": "" },
+"1.3.14.3.2.7": { "d": "desCBC", "c": "" },
+"1.3.14.3.2.8": { "d": "desOFB", "c": "" },
+"1.3.14.3.2.9": { "d": "desCFB", "c": "" },
+"1.3.14.3.2.10": { "d": "desMAC", "c": "" },
+"1.3.14.3.2.11": { "d": "rsaSignature", "c": "ISO 9796-2, also X9.31 Part 1" },
+"1.3.14.3.2.12": { "d": "dsa", "c": "OIW?, supposedly from an incomplete version of SDN.701 (doesn't match final SDN.701)", "w": true },
+"1.3.14.3.2.13": { "d": "dsaWithSHA", "c": "Oddball OIW OID.  Incorrectly used by JDK 1.1 in place of (1 3 14 3 2 27)", "w": true },
+"1.3.14.3.2.14": { "d": "mdc2WithRSASignature", "c": "Oddball OIW OID using 9796-2 padding rules" },
+"1.3.14.3.2.15": { "d": "shaWithRSASignature", "c": "Oddball OIW OID using 9796-2 padding rules" },
+"1.3.14.3.2.16": { "d": "dhWithCommonModulus", "c": "Oddball OIW OID. Deprecated, use a plain DH OID instead", "w": true },
+"1.3.14.3.2.17": { "d": "desEDE", "c": "Oddball OIW OID. Mode is ECB" },
+"1.3.14.3.2.18": { "d": "sha", "c": "Oddball OIW OID" },
+"1.3.14.3.2.19": { "d": "mdc-2", "c": "Oddball OIW OID, DES-based hash, planned for X9.31 Part 2" },
+"1.3.14.3.2.20": { "d": "dsaCommon", "c": "Oddball OIW OID.  Deprecated, use a plain DSA OID instead", "w": true },
+"1.3.14.3.2.21": { "d": "dsaCommonWithSHA", "c": "Oddball OIW OID.  Deprecated, use a plain dsaWithSHA OID instead", "w": true },
+"1.3.14.3.2.22": { "d": "rsaKeyTransport", "c": "Oddball OIW OID" },
+"1.3.14.3.2.23": { "d": "keyed-hash-seal", "c": "Oddball OIW OID" },
+"1.3.14.3.2.24": { "d": "md2WithRSASignature", "c": "Oddball OIW OID using 9796-2 padding rules" },
+"1.3.14.3.2.25": { "d": "md5WithRSASignature", "c": "Oddball OIW OID using 9796-2 padding rules" },
+"1.3.14.3.2.26": { "d": "sha1", "c": "OIW" },
+"1.3.14.3.2.27": { "d": "dsaWithSHA1", "c": "OIW. This OID may also be assigned as ripemd-160" },
+"1.3.14.3.2.28": { "d": "dsaWithCommonSHA1", "c": "OIW" },
+"1.3.14.3.2.29": { "d": "sha-1WithRSAEncryption", "c": "Oddball OIW OID" },
+"1.3.14.3.3.1": { "d": "simple-strong-auth-mechanism", "c": "Oddball OIW OID" },
+"1.3.14.7.2.1.1": { "d": "ElGamal", "c": "Unsure about this OID" },
+"1.3.14.7.2.3.1": { "d": "md2WithRSA", "c": "Unsure about this OID" },
+"1.3.14.7.2.3.2": { "d": "md2WithElGamal", "c": "Unsure about this OID" },
+"1.3.36.1": { "d": "document", "c": "Teletrust document" },
+"1.3.36.1.1": { "d": "finalVersion", "c": "Teletrust document" },
+"1.3.36.1.2": { "d": "draft", "c": "Teletrust document" },
+"1.3.36.2": { "d": "sio", "c": "Teletrust sio" },
+"1.3.36.2.1": { "d": "sedu", "c": "Teletrust sio" },
+"1.3.36.3": { "d": "algorithm", "c": "Teletrust algorithm" },
+"1.3.36.3.1": { "d": "encryptionAlgorithm", "c": "Teletrust algorithm" },
+"1.3.36.3.1.1": { "d": "des", "c": "Teletrust encryption algorithm" },
+"1.3.36.3.1.1.1": { "d": "desECB_pad", "c": "Teletrust encryption algorithm" },
+"1.3.36.3.1.1.1.1": { "d": "desECB_ISOpad", "c": "Teletrust encryption algorithm" },
+"1.3.36.3.1.1.2.1": { "d": "desCBC_pad", "c": "Teletrust encryption algorithm" },
+"1.3.36.3.1.1.2.1.1": { "d": "desCBC_ISOpad", "c": "Teletrust encryption algorithm" },
+"1.3.36.3.1.3": { "d": "des_3", "c": "Teletrust encryption algorithm" },
+"1.3.36.3.1.3.1.1": { "d": "des_3ECB_pad", "c": "Teletrust encryption algorithm. EDE triple DES" },
+"1.3.36.3.1.3.1.1.1": { "d": "des_3ECB_ISOpad", "c": "Teletrust encryption algorithm. EDE triple DES" },
+"1.3.36.3.1.3.2.1": { "d": "des_3CBC_pad", "c": "Teletrust encryption algorithm. EDE triple DES" },
+"1.3.36.3.1.3.2.1.1": { "d": "des_3CBC_ISOpad", "c": "Teletrust encryption algorithm. EDE triple DES" },
+"1.3.36.3.1.2": { "d": "idea", "c": "Teletrust encryption algorithm" },
+"1.3.36.3.1.2.1": { "d": "ideaECB", "c": "Teletrust encryption algorithm" },
+"1.3.36.3.1.2.1.1": { "d": "ideaECB_pad", "c": "Teletrust encryption algorithm" },
+"1.3.36.3.1.2.1.1.1": { "d": "ideaECB_ISOpad", "c": "Teletrust encryption algorithm" },
+"1.3.36.3.1.2.2": { "d": "ideaCBC", "c": "Teletrust encryption algorithm" },
+"1.3.36.3.1.2.2.1": { "d": "ideaCBC_pad", "c": "Teletrust encryption algorithm" },
+"1.3.36.3.1.2.2.1.1": { "d": "ideaCBC_ISOpad", "c": "Teletrust encryption algorithm" },
+"1.3.36.3.1.2.3": { "d": "ideaOFB", "c": "Teletrust encryption algorithm" },
+"1.3.36.3.1.2.4": { "d": "ideaCFB", "c": "Teletrust encryption algorithm" },
+"1.3.36.3.1.4": { "d": "rsaEncryption", "c": "Teletrust encryption algorithm" },
+"1.3.36.3.1.4.512.17": { "d": "rsaEncryptionWithlmod512expe17", "c": "Teletrust encryption algorithm" },
+"1.3.36.3.1.5": { "d": "bsi-1", "c": "Teletrust encryption algorithm" },
+"1.3.36.3.1.5.1": { "d": "bsi_1ECB_pad", "c": "Teletrust encryption algorithm" },
+"1.3.36.3.1.5.2": { "d": "bsi_1CBC_pad", "c": "Teletrust encryption algorithm" },
+"1.3.36.3.1.5.2.1": { "d": "bsi_1CBC_PEMpad", "c": "Teletrust encryption algorithm" },
+"1.3.36.3.2": { "d": "hashAlgorithm", "c": "Teletrust algorithm" },
+"1.3.36.3.2.1": { "d": "ripemd160", "c": "Teletrust hash algorithm" },
+"1.3.36.3.2.2": { "d": "ripemd128", "c": "Teletrust hash algorithm" },
+"1.3.36.3.2.3": { "d": "ripemd256", "c": "Teletrust hash algorithm" },
+"1.3.36.3.2.4": { "d": "mdc2singleLength", "c": "Teletrust hash algorithm" },
+"1.3.36.3.2.5": { "d": "mdc2doubleLength", "c": "Teletrust hash algorithm" },
+"1.3.36.3.3": { "d": "signatureAlgorithm", "c": "Teletrust algorithm" },
+"1.3.36.3.3.1": { "d": "rsaSignature", "c": "Teletrust signature algorithm" },
+"1.3.36.3.3.1.1": { "d": "rsaSignatureWithsha1", "c": "Teletrust signature algorithm" },
+"1.3.36.3.3.1.1.1024.11": { "d": "rsaSignatureWithsha1_l1024_l11", "c": "Teletrust signature algorithm" },
+"1.3.36.3.3.1.2": { "d": "rsaSignatureWithripemd160", "c": "Teletrust signature algorithm" },
+"1.3.36.3.3.1.2.1024.11": { "d": "rsaSignatureWithripemd160_l1024_l11", "c": "Teletrust signature algorithm" },
+"1.3.36.3.3.1.3": { "d": "rsaSignatureWithrimpemd128", "c": "Teletrust signature algorithm" },
+"1.3.36.3.3.1.4": { "d": "rsaSignatureWithrimpemd256", "c": "Teletrust signature algorithm" },
+"1.3.36.3.3.2": { "d": "ecsieSign", "c": "Teletrust signature algorithm" },
+"1.3.36.3.3.2.1": { "d": "ecsieSignWithsha1", "c": "Teletrust signature algorithm" },
+"1.3.36.3.3.2.2": { "d": "ecsieSignWithripemd160", "c": "Teletrust signature algorithm" },
+"1.3.36.3.3.2.3": { "d": "ecsieSignWithmd2", "c": "Teletrust signature algorithm" },
+"1.3.36.3.3.2.4": { "d": "ecsieSignWithmd5", "c": "Teletrust signature algorithm" },
+"1.3.36.3.3.2.8.1.1.1": { "d": "brainpoolP160r1", "c": "ECC Brainpool Standard Curves and Curve Generation" },
+"1.3.36.3.3.2.8.1.1.2": { "d": "brainpoolP160t1", "c": "ECC Brainpool Standard Curves and Curve Generation" },
+"1.3.36.3.3.2.8.1.1.3": { "d": "brainpoolP192r1", "c": "ECC Brainpool Standard Curves and Curve Generation" },
+"1.3.36.3.3.2.8.1.1.4": { "d": "brainpoolP192t1", "c": "ECC Brainpool Standard Curves and Curve Generation" },
+"1.3.36.3.3.2.8.1.1.5": { "d": "brainpoolP224r1", "c": "ECC Brainpool Standard Curves and Curve Generation" },
+"1.3.36.3.3.2.8.1.1.6": { "d": "brainpoolP224t1", "c": "ECC Brainpool Standard Curves and Curve Generation" },
+"1.3.36.3.3.2.8.1.1.7": { "d": "brainpoolP256r1", "c": "ECC Brainpool Standard Curves and Curve Generation" },
+"1.3.36.3.3.2.8.1.1.8": { "d": "brainpoolP256t1", "c": "ECC Brainpool Standard Curves and Curve Generation" },
+"1.3.36.3.3.2.8.1.1.9": { "d": "brainpoolP320r1", "c": "ECC Brainpool Standard Curves and Curve Generation" },
+"1.3.36.3.3.2.8.1.1.10": { "d": "brainpoolP320t1", "c": "ECC Brainpool Standard Curves and Curve Generation" },
+"1.3.36.3.3.2.8.1.1.11": { "d": "brainpoolP384r1", "c": "ECC Brainpool Standard Curves and Curve Generation" },
+"1.3.36.3.3.2.8.1.1.12": { "d": "brainpoolP384t1", "c": "ECC Brainpool Standard Curves and Curve Generation" },
+"1.3.36.3.3.2.8.1.1.13": { "d": "brainpoolP512r1", "c": "ECC Brainpool Standard Curves and Curve Generation" },
+"1.3.36.3.3.2.8.1.1.14": { "d": "brainpoolP512t1", "c": "ECC Brainpool Standard Curves and Curve Generation" },
+"1.3.36.3.4": { "d": "signatureScheme", "c": "Teletrust algorithm" },
+"1.3.36.3.4.1": { "d": "sigS_ISO9796-1", "c": "Teletrust signature scheme" },
+"1.3.36.3.4.2": { "d": "sigS_ISO9796-2", "c": "Teletrust signature scheme" },
+"1.3.36.3.4.2.1": { "d": "sigS_ISO9796-2Withred", "c": "Teletrust signature scheme. Unsure what this is supposed to be" },
+"1.3.36.3.4.2.2": { "d": "sigS_ISO9796-2Withrsa", "c": "Teletrust signature scheme. Unsure what this is supposed to be" },
+"1.3.36.3.4.2.3": { "d": "sigS_ISO9796-2Withrnd", "c": "Teletrust signature scheme. 9796-2 with random number in padding field" },
+"1.3.36.4": { "d": "attribute", "c": "Teletrust attribute" },
+"1.3.36.5": { "d": "policy", "c": "Teletrust policy" },
+"1.3.36.6": { "d": "api", "c": "Teletrust API" },
+"1.3.36.6.1": { "d": "manufacturer-specific_api", "c": "Teletrust API" },
+"1.3.36.6.1.1": { "d": "utimaco-api", "c": "Teletrust API" },
+"1.3.36.6.2": { "d": "functionality-specific_api", "c": "Teletrust API" },
+"1.3.36.7": { "d": "keymgmnt", "c": "Teletrust key management" },
+"1.3.36.7.1": { "d": "keyagree", "c": "Teletrust key management" },
+"1.3.36.7.1.1": { "d": "bsiPKE", "c": "Teletrust key management" },
+"1.3.36.7.2": { "d": "keytrans", "c": "Teletrust key management" },
+"1.3.36.7.2.1": { "d": "encISO9796-2Withrsa", "c": "Teletrust key management. 9796-2 with key stored in hash field" },
+"1.3.36.8.1.1": { "d": "Teletrust SigGConform policyIdentifier", "c": "Teletrust policy" },
+"1.3.36.8.2.1": { "d": "directoryService", "c": "Teletrust extended key usage" },
+"1.3.36.8.3.1": { "d": "dateOfCertGen", "c": "Teletrust attribute" },
+"1.3.36.8.3.2": { "d": "procuration", "c": "Teletrust attribute" },
+"1.3.36.8.3.3": { "d": "admission", "c": "Teletrust attribute" },
+"1.3.36.8.3.4": { "d": "monetaryLimit", "c": "Teletrust attribute" },
+"1.3.36.8.3.5": { "d": "declarationOfMajority", "c": "Teletrust attribute" },
+"1.3.36.8.3.6": { "d": "integratedCircuitCardSerialNumber", "c": "Teletrust attribute" },
+"1.3.36.8.3.7": { "d": "pKReference", "c": "Teletrust attribute" },
+"1.3.36.8.3.8": { "d": "restriction", "c": "Teletrust attribute" },
+"1.3.36.8.3.9": { "d": "retrieveIfAllowed", "c": "Teletrust attribute" },
+"1.3.36.8.3.10": { "d": "requestedCertificate", "c": "Teletrust attribute" },
+"1.3.36.8.3.11": { "d": "namingAuthorities", "c": "Teletrust attribute" },
+"1.3.36.8.3.11.1": { "d": "rechtWirtschaftSteuern", "c": "Teletrust naming authorities" },
+"1.3.36.8.3.11.1.1": { "d": "rechtsanwaeltin", "c": "Teletrust ProfessionInfo" },
+"1.3.36.8.3.11.1.2": { "d": "rechtsanwalt", "c": "Teletrust ProfessionInfo" },
+"1.3.36.8.3.11.1.3": { "d": "rechtsBeistand", "c": "Teletrust ProfessionInfo" },
+"1.3.36.8.3.11.1.4": { "d": "steuerBeraterin", "c": "Teletrust ProfessionInfo" },
+"1.3.36.8.3.11.1.5": { "d": "steuerBerater", "c": "Teletrust ProfessionInfo" },
+"1.3.36.8.3.11.1.6": { "d": "steuerBevollmaechtigte", "c": "Teletrust ProfessionInfo" },
+"1.3.36.8.3.11.1.7": { "d": "steuerBevollmaechtigter", "c": "Teletrust ProfessionInfo" },
+"1.3.36.8.3.11.1.8": { "d": "notarin", "c": "Teletrust ProfessionInfo" },
+"1.3.36.8.3.11.1.9": { "d": "notar", "c": "Teletrust ProfessionInfo" },
+"1.3.36.8.3.11.1.10": { "d": "notarVertreterin", "c": "Teletrust ProfessionInfo" },
+"1.3.36.8.3.11.1.11": { "d": "notarVertreter", "c": "Teletrust ProfessionInfo" },
+"1.3.36.8.3.11.1.12": { "d": "notariatsVerwalterin", "c": "Teletrust ProfessionInfo" },
+"1.3.36.8.3.11.1.13": { "d": "notariatsVerwalter", "c": "Teletrust ProfessionInfo" },
+"1.3.36.8.3.11.1.14": { "d": "wirtschaftsPrueferin", "c": "Teletrust ProfessionInfo" },
+"1.3.36.8.3.11.1.15": { "d": "wirtschaftsPruefer", "c": "Teletrust ProfessionInfo" },
+"1.3.36.8.3.11.1.16": { "d": "vereidigteBuchprueferin", "c": "Teletrust ProfessionInfo" },
+"1.3.36.8.3.11.1.17": { "d": "vereidigterBuchpruefer", "c": "Teletrust ProfessionInfo" },
+"1.3.36.8.3.11.1.18": { "d": "patentAnwaeltin", "c": "Teletrust ProfessionInfo" },
+"1.3.36.8.3.11.1.19": { "d": "patentAnwalt", "c": "Teletrust ProfessionInfo" },
+"1.3.36.8.3.12": { "d": "certInDirSince", "c": "Teletrust OCSP attribute (obsolete)", "w": true },
+"1.3.36.8.3.13": { "d": "certHash", "c": "Teletrust OCSP attribute" },
+"1.3.36.8.3.14": { "d": "nameAtBirth", "c": "Teletrust attribute" },
+"1.3.36.8.3.15": { "d": "additionalInformation", "c": "Teletrust attribute" },
+"1.3.36.8.4.1": { "d": "personalData", "c": "Teletrust OtherName attribute" },
+"1.3.36.8.4.8": { "d": "restriction", "c": "Teletrust attribute certificate attribute" },
+"1.3.36.8.5.1.1.1": { "d": "rsaIndicateSHA1", "c": "Teletrust signature algorithm" },
+"1.3.36.8.5.1.1.2": { "d": "rsaIndicateRIPEMD160", "c": "Teletrust signature algorithm" },
+"1.3.36.8.5.1.1.3": { "d": "rsaWithSHA1", "c": "Teletrust signature algorithm" },
+"1.3.36.8.5.1.1.4": { "d": "rsaWithRIPEMD160", "c": "Teletrust signature algorithm" },
+"1.3.36.8.5.1.2.1": { "d": "dsaExtended", "c": "Teletrust signature algorithm" },
+"1.3.36.8.5.1.2.2": { "d": "dsaWithRIPEMD160", "c": "Teletrust signature algorithm" },
+"1.3.36.8.6.1": { "d": "cert", "c": "Teletrust signature attributes" },
+"1.3.36.8.6.2": { "d": "certRef", "c": "Teletrust signature attributes" },
+"1.3.36.8.6.3": { "d": "attrCert", "c": "Teletrust signature attributes" },
+"1.3.36.8.6.4": { "d": "attrRef", "c": "Teletrust signature attributes" },
+"1.3.36.8.6.5": { "d": "fileName", "c": "Teletrust signature attributes" },
+"1.3.36.8.6.6": { "d": "storageTime", "c": "Teletrust signature attributes" },
+"1.3.36.8.6.7": { "d": "fileSize", "c": "Teletrust signature attributes" },
+"1.3.36.8.6.8": { "d": "location", "c": "Teletrust signature attributes" },
+"1.3.36.8.6.9": { "d": "sigNumber", "c": "Teletrust signature attributes" },
+"1.3.36.8.6.10": { "d": "autoGen", "c": "Teletrust signature attributes" },
+"1.3.36.8.7.1.1": { "d": "ptAdobeILL", "c": "Teletrust presentation types" },
+"1.3.36.8.7.1.2": { "d": "ptAmiPro", "c": "Teletrust presentation types" },
+"1.3.36.8.7.1.3": { "d": "ptAutoCAD", "c": "Teletrust presentation types" },
+"1.3.36.8.7.1.4": { "d": "ptBinary", "c": "Teletrust presentation types" },
+"1.3.36.8.7.1.5": { "d": "ptBMP", "c": "Teletrust presentation types" },
+"1.3.36.8.7.1.6": { "d": "ptCGM", "c": "Teletrust presentation types" },
+"1.3.36.8.7.1.7": { "d": "ptCorelCRT", "c": "Teletrust presentation types" },
+"1.3.36.8.7.1.8": { "d": "ptCorelDRW", "c": "Teletrust presentation types" },
+"1.3.36.8.7.1.9": { "d": "ptCorelEXC", "c": "Teletrust presentation types" },
+"1.3.36.8.7.1.10": { "d": "ptCorelPHT", "c": "Teletrust presentation types" },
+"1.3.36.8.7.1.11": { "d": "ptDraw", "c": "Teletrust presentation types" },
+"1.3.36.8.7.1.12": { "d": "ptDVI", "c": "Teletrust presentation types" },
+"1.3.36.8.7.1.13": { "d": "ptEPS", "c": "Teletrust presentation types" },
+"1.3.36.8.7.1.14": { "d": "ptExcel", "c": "Teletrust presentation types" },
+"1.3.36.8.7.1.15": { "d": "ptGEM", "c": "Teletrust presentation types" },
+"1.3.36.8.7.1.16": { "d": "ptGIF", "c": "Teletrust presentation types" },
+"1.3.36.8.7.1.17": { "d": "ptHPGL", "c": "Teletrust presentation types" },
+"1.3.36.8.7.1.18": { "d": "ptJPEG", "c": "Teletrust presentation types" },
+"1.3.36.8.7.1.19": { "d": "ptKodak", "c": "Teletrust presentation types" },
+"1.3.36.8.7.1.20": { "d": "ptLaTeX", "c": "Teletrust presentation types" },
+"1.3.36.8.7.1.21": { "d": "ptLotus", "c": "Teletrust presentation types" },
+"1.3.36.8.7.1.22": { "d": "ptLotusPIC", "c": "Teletrust presentation types" },
+"1.3.36.8.7.1.23": { "d": "ptMacPICT", "c": "Teletrust presentation types" },
+"1.3.36.8.7.1.24": { "d": "ptMacWord", "c": "Teletrust presentation types" },
+"1.3.36.8.7.1.25": { "d": "ptMSWfD", "c": "Teletrust presentation types" },
+"1.3.36.8.7.1.26": { "d": "ptMSWord", "c": "Teletrust presentation types" },
+"1.3.36.8.7.1.27": { "d": "ptMSWord2", "c": "Teletrust presentation types" },
+"1.3.36.8.7.1.28": { "d": "ptMSWord6", "c": "Teletrust presentation types" },
+"1.3.36.8.7.1.29": { "d": "ptMSWord8", "c": "Teletrust presentation types" },
+"1.3.36.8.7.1.30": { "d": "ptPDF", "c": "Teletrust presentation types" },
+"1.3.36.8.7.1.31": { "d": "ptPIF", "c": "Teletrust presentation types" },
+"1.3.36.8.7.1.32": { "d": "ptPostscript", "c": "Teletrust presentation types" },
+"1.3.36.8.7.1.33": { "d": "ptRTF", "c": "Teletrust presentation types" },
+"1.3.36.8.7.1.34": { "d": "ptSCITEX", "c": "Teletrust presentation types" },
+"1.3.36.8.7.1.35": { "d": "ptTAR", "c": "Teletrust presentation types" },
+"1.3.36.8.7.1.36": { "d": "ptTarga", "c": "Teletrust presentation types" },
+"1.3.36.8.7.1.37": { "d": "ptTeX", "c": "Teletrust presentation types" },
+"1.3.36.8.7.1.38": { "d": "ptText", "c": "Teletrust presentation types" },
+"1.3.36.8.7.1.39": { "d": "ptTIFF", "c": "Teletrust presentation types" },
+"1.3.36.8.7.1.40": { "d": "ptTIFF-FC", "c": "Teletrust presentation types" },
+"1.3.36.8.7.1.41": { "d": "ptUID", "c": "Teletrust presentation types" },
+"1.3.36.8.7.1.42": { "d": "ptUUEncode", "c": "Teletrust presentation types" },
+"1.3.36.8.7.1.43": { "d": "ptWMF", "c": "Teletrust presentation types" },
+"1.3.36.8.7.1.44": { "d": "ptWordPerfect", "c": "Teletrust presentation types" },
+"1.3.36.8.7.1.45": { "d": "ptWPGrph", "c": "Teletrust presentation types" },
+"1.3.101.1.4": { "d": "thawte-ce", "c": "Thawte" },
+"1.3.101.1.4.1": { "d": "strongExtranet", "c": "Thawte certificate extension" },
+"1.3.101.110": { "d": "curveX25519", "c": "ECDH 25519 key agreement algorithm" },
+"1.3.101.111": { "d": "curveX448", "c": "ECDH 448 key agreement algorithm" },
+"1.3.101.112": { "d": "curveEd25519", "c": "EdDSA 25519 signature algorithm" },
+"1.3.101.113": { "d": "curveEd448", "c": "EdDSA 448 signature algorithm" },
+"1.3.101.114": { "d": "curveEd25519ph", "c": "EdDSA 25519 pre-hash signature algorithm" },
+"1.3.101.115": { "d": "curveEd448ph", "c": "EdDSA 448 pre-hash signature algorithm" },
+"1.3.132.0.1": { "d": "sect163k1", "c": "SECG (Certicom) named elliptic curve" },
+"1.3.132.0.2": { "d": "sect163r1", "c": "SECG (Certicom) named elliptic curve" },
+"1.3.132.0.3": { "d": "sect239k1", "c": "SECG (Certicom) named elliptic curve" },
+"1.3.132.0.4": { "d": "sect113r1", "c": "SECG (Certicom) named elliptic curve" },
+"1.3.132.0.5": { "d": "sect113r2", "c": "SECG (Certicom) named elliptic curve" },
+"1.3.132.0.6": { "d": "secp112r1", "c": "SECG (Certicom) named elliptic curve" },
+"1.3.132.0.7": { "d": "secp112r2", "c": "SECG (Certicom) named elliptic curve" },
+"1.3.132.0.8": { "d": "secp160r1", "c": "SECG (Certicom) named elliptic curve" },
+"1.3.132.0.9": { "d": "secp160k1", "c": "SECG (Certicom) named elliptic curve" },
+"1.3.132.0.10": { "d": "secp256k1", "c": "SECG (Certicom) named elliptic curve" },
+"1.3.132.0.15": { "d": "sect163r2", "c": "SECG (Certicom) named elliptic curve" },
+"1.3.132.0.16": { "d": "sect283k1", "c": "SECG (Certicom) named elliptic curve" },
+"1.3.132.0.17": { "d": "sect283r1", "c": "SECG (Certicom) named elliptic curve" },
+"1.3.132.0.22": { "d": "sect131r1", "c": "SECG (Certicom) named elliptic curve" },
+"1.3.132.0.23": { "d": "sect131r2", "c": "SECG (Certicom) named elliptic curve" },
+"1.3.132.0.24": { "d": "sect193r1", "c": "SECG (Certicom) named elliptic curve" },
+"1.3.132.0.25": { "d": "sect193r2", "c": "SECG (Certicom) named elliptic curve" },
+"1.3.132.0.26": { "d": "sect233k1", "c": "SECG (Certicom) named elliptic curve" },
+"1.3.132.0.27": { "d": "sect233r1", "c": "SECG (Certicom) named elliptic curve" },
+"1.3.132.0.28": { "d": "secp128r1", "c": "SECG (Certicom) named elliptic curve" },
+"1.3.132.0.29": { "d": "secp128r2", "c": "SECG (Certicom) named elliptic curve" },
+"1.3.132.0.30": { "d": "secp160r2", "c": "SECG (Certicom) named elliptic curve" },
+"1.3.132.0.31": { "d": "secp192k1", "c": "SECG (Certicom) named elliptic curve" },
+"1.3.132.0.32": { "d": "secp224k1", "c": "SECG (Certicom) named elliptic curve" },
+"1.3.132.0.33": { "d": "secp224r1", "c": "SECG (Certicom) named elliptic curve" },
+"1.3.132.0.34": { "d": "secp384r1", "c": "SECG (Certicom) named elliptic curve" },
+"1.3.132.0.35": { "d": "secp521r1", "c": "SECG (Certicom) named elliptic curve" },
+"1.3.132.0.36": { "d": "sect409k1", "c": "SECG (Certicom) named elliptic curve" },
+"1.3.132.0.37": { "d": "sect409r1", "c": "SECG (Certicom) named elliptic curve" },
+"1.3.132.0.38": { "d": "sect571k1", "c": "SECG (Certicom) named elliptic curve" },
+"1.3.132.0.39": { "d": "sect571r1", "c": "SECG (Certicom) named elliptic curve" },
+"1.3.132.1.11.1": { "d": "ecdhX963KDF-SHA256", "c": "SECG (Certicom) elliptic curve key agreement" },
+"1.3.132.1.11.2": { "d": "ecdhX963KDF-SHA384", "c": "SECG (Certicom) elliptic curve key agreement" },
+"1.3.132.1.11.3": { "d": "ecdhX963KDF-SHA512", "c": "SECG (Certicom) elliptic curve key agreement" },
+"1.3.133.16.840.9.84": { "d": "x984", "c": "X9.84" },
+"1.3.133.16.840.9.84.0": { "d": "x984Module", "c": "X9.84" },
+"1.3.133.16.840.9.84.0.1": { "d": "x984Biometrics", "c": "X9.84 Module" },
+"1.3.133.16.840.9.84.0.2": { "d": "x984CMS", "c": "X9.84 Module" },
+"1.3.133.16.840.9.84.0.3": { "d": "x984Identifiers", "c": "X9.84 Module" },
+"1.3.133.16.840.9.84.1": { "d": "x984Biometric", "c": "X9.84" },
+"1.3.133.16.840.9.84.1.0": { "d": "biometricUnknownType", "c": "X9.84 Biometric" },
+"1.3.133.16.840.9.84.1.1": { "d": "biometricBodyOdor", "c": "X9.84 Biometric" },
+"1.3.133.16.840.9.84.1.2": { "d": "biometricDNA", "c": "X9.84 Biometric" },
+"1.3.133.16.840.9.84.1.3": { "d": "biometricEarShape", "c": "X9.84 Biometric" },
+"1.3.133.16.840.9.84.1.4": { "d": "biometricFacialFeatures", "c": "X9.84 Biometric" },
+"1.3.133.16.840.9.84.1.5": { "d": "biometricFingerImage", "c": "X9.84 Biometric" },
+"1.3.133.16.840.9.84.1.6": { "d": "biometricFingerGeometry", "c": "X9.84 Biometric" },
+"1.3.133.16.840.9.84.1.7": { "d": "biometricHandGeometry", "c": "X9.84 Biometric" },
+"1.3.133.16.840.9.84.1.8": { "d": "biometricIrisFeatures", "c": "X9.84 Biometric" },
+"1.3.133.16.840.9.84.1.9": { "d": "biometricKeystrokeDynamics", "c": "X9.84 Biometric" },
+"1.3.133.16.840.9.84.1.10": { "d": "biometricPalm", "c": "X9.84 Biometric" },
+"1.3.133.16.840.9.84.1.11": { "d": "biometricRetina", "c": "X9.84 Biometric" },
+"1.3.133.16.840.9.84.1.12": { "d": "biometricSignature", "c": "X9.84 Biometric" },
+"1.3.133.16.840.9.84.1.13": { "d": "biometricSpeechPattern", "c": "X9.84 Biometric" },
+"1.3.133.16.840.9.84.1.14": { "d": "biometricThermalImage", "c": "X9.84 Biometric" },
+"1.3.133.16.840.9.84.1.15": { "d": "biometricVeinPattern", "c": "X9.84 Biometric" },
+"1.3.133.16.840.9.84.1.16": { "d": "biometricThermalFaceImage", "c": "X9.84 Biometric" },
+"1.3.133.16.840.9.84.1.17": { "d": "biometricThermalHandImage", "c": "X9.84 Biometric" },
+"1.3.133.16.840.9.84.1.18": { "d": "biometricLipMovement", "c": "X9.84 Biometric" },
+"1.3.133.16.840.9.84.1.19": { "d": "biometricGait", "c": "X9.84 Biometric" },
+"1.3.133.16.840.9.84.3": { "d": "x984MatchingMethod", "c": "X9.84" },
+"1.3.133.16.840.9.84.4": { "d": "x984FormatOwner", "c": "X9.84" },
+"1.3.133.16.840.9.84.4.0": { "d": "x984CbeffOwner", "c": "X9.84 Format Owner" },
+"1.3.133.16.840.9.84.4.1": { "d": "x984IbiaOwner", "c": "X9.84 Format Owner" },
+"1.3.133.16.840.9.84.4.1.1": { "d": "ibiaOwnerSAFLINK", "c": "X9.84 IBIA Format Owner" },
+"1.3.133.16.840.9.84.4.1.2": { "d": "ibiaOwnerBioscrypt", "c": "X9.84 IBIA Format Owner" },
+"1.3.133.16.840.9.84.4.1.3": { "d": "ibiaOwnerVisionics", "c": "X9.84 IBIA Format Owner" },
+"1.3.133.16.840.9.84.4.1.4": { "d": "ibiaOwnerInfineonTechnologiesAG", "c": "X9.84 IBIA Format Owner" },
+"1.3.133.16.840.9.84.4.1.5": { "d": "ibiaOwnerIridianTechnologies", "c": "X9.84 IBIA Format Owner" },
+"1.3.133.16.840.9.84.4.1.6": { "d": "ibiaOwnerVeridicom", "c": "X9.84 IBIA Format Owner" },
+"1.3.133.16.840.9.84.4.1.7": { "d": "ibiaOwnerCyberSIGN", "c": "X9.84 IBIA Format Owner" },
+"1.3.133.16.840.9.84.4.1.8": { "d": "ibiaOwnereCryp", "c": "X9.84 IBIA Format Owner" },
+"1.3.133.16.840.9.84.4.1.9": { "d": "ibiaOwnerFingerprintCardsAB", "c": "X9.84 IBIA Format Owner" },
+"1.3.133.16.840.9.84.4.1.10": { "d": "ibiaOwnerSecuGen", "c": "X9.84 IBIA Format Owner" },
+"1.3.133.16.840.9.84.4.1.11": { "d": "ibiaOwnerPreciseBiometric", "c": "X9.84 IBIA Format Owner" },
+"1.3.133.16.840.9.84.4.1.12": { "d": "ibiaOwnerIdentix", "c": "X9.84 IBIA Format Owner" },
+"1.3.133.16.840.9.84.4.1.13": { "d": "ibiaOwnerDERMALOG", "c": "X9.84 IBIA Format Owner" },
+"1.3.133.16.840.9.84.4.1.14": { "d": "ibiaOwnerLOGICO", "c": "X9.84 IBIA Format Owner" },
+"1.3.133.16.840.9.84.4.1.15": { "d": "ibiaOwnerNIST", "c": "X9.84 IBIA Format Owner" },
+"1.3.133.16.840.9.84.4.1.16": { "d": "ibiaOwnerA3Vision", "c": "X9.84 IBIA Format Owner" },
+"1.3.133.16.840.9.84.4.1.17": { "d": "ibiaOwnerNEC", "c": "X9.84 IBIA Format Owner" },
+"1.3.133.16.840.9.84.4.1.18": { "d": "ibiaOwnerSTMicroelectronics", "c": "X9.84 IBIA Format Owner" },
+"2.5.4.0": { "d": "objectClass", "c": "X.520 DN component" },
+"2.5.4.1": { "d": "aliasedEntryName", "c": "X.520 DN component" },
+"2.5.4.2": { "d": "knowledgeInformation", "c": "X.520 DN component" },
+"2.5.4.3": { "d": "commonName", "c": "X.520 DN component" },
+"2.5.4.4": { "d": "surname", "c": "X.520 DN component" },
+"2.5.4.5": { "d": "serialNumber", "c": "X.520 DN component" },
+"2.5.4.6": { "d": "countryName", "c": "X.520 DN component" },
+"2.5.4.7": { "d": "localityName", "c": "X.520 DN component" },
+"2.5.4.7.1": { "d": "collectiveLocalityName", "c": "X.520 DN component" },
+"2.5.4.8": { "d": "stateOrProvinceName", "c": "X.520 DN component" },
+"2.5.4.8.1": { "d": "collectiveStateOrProvinceName", "c": "X.520 DN component" },
+"2.5.4.9": { "d": "streetAddress", "c": "X.520 DN component" },
+"2.5.4.9.1": { "d": "collectiveStreetAddress", "c": "X.520 DN component" },
+"2.5.4.10": { "d": "organizationName", "c": "X.520 DN component" },
+"2.5.4.10.1": { "d": "collectiveOrganizationName", "c": "X.520 DN component" },
+"2.5.4.11": { "d": "organizationalUnitName", "c": "X.520 DN component" },
+"2.5.4.11.1": { "d": "collectiveOrganizationalUnitName", "c": "X.520 DN component" },
+"2.5.4.12": { "d": "title", "c": "X.520 DN component" },
+"2.5.4.13": { "d": "description", "c": "X.520 DN component" },
+"2.5.4.14": { "d": "searchGuide", "c": "X.520 DN component" },
+"2.5.4.15": { "d": "businessCategory", "c": "X.520 DN component" },
+"2.5.4.16": { "d": "postalAddress", "c": "X.520 DN component" },
+"2.5.4.16.1": { "d": "collectivePostalAddress", "c": "X.520 DN component" },
+"2.5.4.17": { "d": "postalCode", "c": "X.520 DN component" },
+"2.5.4.17.1": { "d": "collectivePostalCode", "c": "X.520 DN component" },
+"2.5.4.18": { "d": "postOfficeBox", "c": "X.520 DN component" },
+"2.5.4.18.1": { "d": "collectivePostOfficeBox", "c": "X.520 DN component" },
+"2.5.4.19": { "d": "physicalDeliveryOfficeName", "c": "X.520 DN component" },
+"2.5.4.19.1": { "d": "collectivePhysicalDeliveryOfficeName", "c": "X.520 DN component" },
+"2.5.4.20": { "d": "telephoneNumber", "c": "X.520 DN component" },
+"2.5.4.20.1": { "d": "collectiveTelephoneNumber", "c": "X.520 DN component" },
+"2.5.4.21": { "d": "telexNumber", "c": "X.520 DN component" },
+"2.5.4.21.1": { "d": "collectiveTelexNumber", "c": "X.520 DN component" },
+"2.5.4.22": { "d": "teletexTerminalIdentifier", "c": "X.520 DN component" },
+"2.5.4.22.1": { "d": "collectiveTeletexTerminalIdentifier", "c": "X.520 DN component" },
+"2.5.4.23": { "d": "facsimileTelephoneNumber", "c": "X.520 DN component" },
+"2.5.4.23.1": { "d": "collectiveFacsimileTelephoneNumber", "c": "X.520 DN component" },
+"2.5.4.24": { "d": "x121Address", "c": "X.520 DN component" },
+"2.5.4.25": { "d": "internationalISDNNumber", "c": "X.520 DN component" },
+"2.5.4.25.1": { "d": "collectiveInternationalISDNNumber", "c": "X.520 DN component" },
+"2.5.4.26": { "d": "registeredAddress", "c": "X.520 DN component" },
+"2.5.4.27": { "d": "destinationIndicator", "c": "X.520 DN component" },
+"2.5.4.28": { "d": "preferredDeliveryMehtod", "c": "X.520 DN component" },
+"2.5.4.29": { "d": "presentationAddress", "c": "X.520 DN component" },
+"2.5.4.30": { "d": "supportedApplicationContext", "c": "X.520 DN component" },
+"2.5.4.31": { "d": "member", "c": "X.520 DN component" },
+"2.5.4.32": { "d": "owner", "c": "X.520 DN component" },
+"2.5.4.33": { "d": "roleOccupant", "c": "X.520 DN component" },
+"2.5.4.34": { "d": "seeAlso", "c": "X.520 DN component" },
+"2.5.4.35": { "d": "userPassword", "c": "X.520 DN component" },
+"2.5.4.36": { "d": "userCertificate", "c": "X.520 DN component" },
+"2.5.4.37": { "d": "caCertificate", "c": "X.520 DN component" },
+"2.5.4.38": { "d": "authorityRevocationList", "c": "X.520 DN component" },
+"2.5.4.39": { "d": "certificateRevocationList", "c": "X.520 DN component" },
+"2.5.4.40": { "d": "crossCertificatePair", "c": "X.520 DN component" },
+"2.5.4.41": { "d": "name", "c": "X.520 DN component" },
+"2.5.4.42": { "d": "givenName", "c": "X.520 DN component" },
+"2.5.4.43": { "d": "initials", "c": "X.520 DN component" },
+"2.5.4.44": { "d": "generationQualifier", "c": "X.520 DN component" },
+"2.5.4.45": { "d": "uniqueIdentifier", "c": "X.520 DN component" },
+"2.5.4.46": { "d": "dnQualifier", "c": "X.520 DN component" },
+"2.5.4.47": { "d": "enhancedSearchGuide", "c": "X.520 DN component" },
+"2.5.4.48": { "d": "protocolInformation", "c": "X.520 DN component" },
+"2.5.4.49": { "d": "distinguishedName", "c": "X.520 DN component" },
+"2.5.4.50": { "d": "uniqueMember", "c": "X.520 DN component" },
+"2.5.4.51": { "d": "houseIdentifier", "c": "X.520 DN component" },
+"2.5.4.52": { "d": "supportedAlgorithms", "c": "X.520 DN component" },
+"2.5.4.53": { "d": "deltaRevocationList", "c": "X.520 DN component" },
+"2.5.4.54": { "d": "dmdName", "c": "X.520 DN component" },
+"2.5.4.55": { "d": "clearance", "c": "X.520 DN component" },
+"2.5.4.56": { "d": "defaultDirQop", "c": "X.520 DN component" },
+"2.5.4.57": { "d": "attributeIntegrityInfo", "c": "X.520 DN component" },
+"2.5.4.58": { "d": "attributeCertificate", "c": "X.520 DN component" },
+"2.5.4.59": { "d": "attributeCertificateRevocationList", "c": "X.520 DN component" },
+"2.5.4.60": { "d": "confKeyInfo", "c": "X.520 DN component" },
+"2.5.4.61": { "d": "aACertificate", "c": "X.520 DN component" },
+"2.5.4.62": { "d": "attributeDescriptorCertificate", "c": "X.520 DN component" },
+"2.5.4.63": { "d": "attributeAuthorityRevocationList", "c": "X.520 DN component" },
+"2.5.4.64": { "d": "familyInformation", "c": "X.520 DN component" },
+"2.5.4.65": { "d": "pseudonym", "c": "X.520 DN component" },
+"2.5.4.66": { "d": "communicationsService", "c": "X.520 DN component" },
+"2.5.4.67": { "d": "communicationsNetwork", "c": "X.520 DN component" },
+"2.5.4.68": { "d": "certificationPracticeStmt", "c": "X.520 DN component" },
+"2.5.4.69": { "d": "certificatePolicy", "c": "X.520 DN component" },
+"2.5.4.70": { "d": "pkiPath", "c": "X.520 DN component" },
+"2.5.4.71": { "d": "privPolicy", "c": "X.520 DN component" },
+"2.5.4.72": { "d": "role", "c": "X.520 DN component" },
+"2.5.4.73": { "d": "delegationPath", "c": "X.520 DN component" },
+"2.5.4.74": { "d": "protPrivPolicy", "c": "X.520 DN component" },
+"2.5.4.75": { "d": "xMLPrivilegeInfo", "c": "X.520 DN component" },
+"2.5.4.76": { "d": "xmlPrivPolicy", "c": "X.520 DN component" },
+"2.5.4.82": { "d": "permission", "c": "X.520 DN component" },
+"2.5.6.0": { "d": "top", "c": "X.520 objectClass" },
+"2.5.6.1": { "d": "alias", "c": "X.520 objectClass" },
+"2.5.6.2": { "d": "country", "c": "X.520 objectClass" },
+"2.5.6.3": { "d": "locality", "c": "X.520 objectClass" },
+"2.5.6.4": { "d": "organization", "c": "X.520 objectClass" },
+"2.5.6.5": { "d": "organizationalUnit", "c": "X.520 objectClass" },
+"2.5.6.6": { "d": "person", "c": "X.520 objectClass" },
+"2.5.6.7": { "d": "organizationalPerson", "c": "X.520 objectClass" },
+"2.5.6.8": { "d": "organizationalRole", "c": "X.520 objectClass" },
+"2.5.6.9": { "d": "groupOfNames", "c": "X.520 objectClass" },
+"2.5.6.10": { "d": "residentialPerson", "c": "X.520 objectClass" },
+"2.5.6.11": { "d": "applicationProcess", "c": "X.520 objectClass" },
+"2.5.6.12": { "d": "applicationEntity", "c": "X.520 objectClass" },
+"2.5.6.13": { "d": "dSA", "c": "X.520 objectClass" },
+"2.5.6.14": { "d": "device", "c": "X.520 objectClass" },
+"2.5.6.15": { "d": "strongAuthenticationUser", "c": "X.520 objectClass" },
+"2.5.6.16": { "d": "certificateAuthority", "c": "X.520 objectClass" },
+"2.5.6.17": { "d": "groupOfUniqueNames", "c": "X.520 objectClass" },
+"2.5.6.21": { "d": "pkiUser", "c": "X.520 objectClass" },
+"2.5.6.22": { "d": "pkiCA", "c": "X.520 objectClass" },
+"2.5.8.1.1": { "d": "rsa", "c": "X.500 algorithms.  Ambiguous, since no padding rules specified", "w": true },
+"2.5.29.1": { "d": "authorityKeyIdentifier", "c": "X.509 extension.  Deprecated, use 2 5 29 35 instead", "w": true },
+"2.5.29.2": { "d": "keyAttributes", "c": "X.509 extension.  Obsolete, use keyUsage/extKeyUsage instead", "w": true },
+"2.5.29.3": { "d": "certificatePolicies", "c": "X.509 extension.  Deprecated, use 2 5 29 32 instead", "w": true },
+"2.5.29.4": { "d": "keyUsageRestriction", "c": "X.509 extension.  Obsolete, use keyUsage/extKeyUsage instead", "w": true },
+"2.5.29.5": { "d": "policyMapping", "c": "X.509 extension.  Deprecated, use 2 5 29 33 instead", "w": true },
+"2.5.29.6": { "d": "subtreesConstraint", "c": "X.509 extension.  Obsolete, use nameConstraints instead", "w": true },
+"2.5.29.7": { "d": "subjectAltName", "c": "X.509 extension.  Deprecated, use 2 5 29 17 instead", "w": true },
+"2.5.29.8": { "d": "issuerAltName", "c": "X.509 extension.  Deprecated, use 2 5 29 18 instead", "w": true },
+"2.5.29.9": { "d": "subjectDirectoryAttributes", "c": "X.509 extension" },
+"2.5.29.10": { "d": "basicConstraints", "c": "X.509 extension.  Deprecated, use 2 5 29 19 instead", "w": true },
+"2.5.29.11": { "d": "nameConstraints", "c": "X.509 extension.  Deprecated, use 2 5 29 30 instead", "w": true },
+"2.5.29.12": { "d": "policyConstraints", "c": "X.509 extension.  Deprecated, use 2 5 29 36 instead", "w": true },
+"2.5.29.13": { "d": "basicConstraints", "c": "X.509 extension.  Deprecated, use 2 5 29 19 instead", "w": true },
+"2.5.29.14": { "d": "subjectKeyIdentifier", "c": "X.509 extension" },
+"2.5.29.15": { "d": "keyUsage", "c": "X.509 extension" },
+"2.5.29.16": { "d": "privateKeyUsagePeriod", "c": "X.509 extension" },
+"2.5.29.17": { "d": "subjectAltName", "c": "X.509 extension" },
+"2.5.29.18": { "d": "issuerAltName", "c": "X.509 extension" },
+"2.5.29.19": { "d": "basicConstraints", "c": "X.509 extension" },
+"2.5.29.20": { "d": "cRLNumber", "c": "X.509 extension" },
+"2.5.29.21": { "d": "cRLReason", "c": "X.509 extension" },
+"2.5.29.22": { "d": "expirationDate", "c": "X.509 extension.  Deprecated, alternative OID uncertain", "w": true },
+"2.5.29.23": { "d": "instructionCode", "c": "X.509 extension" },
+"2.5.29.24": { "d": "invalidityDate", "c": "X.509 extension" },
+"2.5.29.25": { "d": "cRLDistributionPoints", "c": "X.509 extension.  Deprecated, use 2 5 29 31 instead", "w": true },
+"2.5.29.26": { "d": "issuingDistributionPoint", "c": "X.509 extension.  Deprecated, use 2 5 29 28 instead", "w": true },
+"2.5.29.27": { "d": "deltaCRLIndicator", "c": "X.509 extension" },
+"2.5.29.28": { "d": "issuingDistributionPoint", "c": "X.509 extension" },
+"2.5.29.29": { "d": "certificateIssuer", "c": "X.509 extension" },
+"2.5.29.30": { "d": "nameConstraints", "c": "X.509 extension" },
+"2.5.29.31": { "d": "cRLDistributionPoints", "c": "X.509 extension" },
+"2.5.29.32": { "d": "certificatePolicies", "c": "X.509 extension" },
+"2.5.29.32.0": { "d": "anyPolicy", "c": "X.509 certificate policy" },
+"2.5.29.33": { "d": "policyMappings", "c": "X.509 extension" },
+"2.5.29.34": { "d": "policyConstraints", "c": "X.509 extension.  Deprecated, use 2 5 29 36 instead", "w": true },
+"2.5.29.35": { "d": "authorityKeyIdentifier", "c": "X.509 extension" },
+"2.5.29.36": { "d": "policyConstraints", "c": "X.509 extension" },
+"2.5.29.37": { "d": "extKeyUsage", "c": "X.509 extension" },
+"2.5.29.37.0": { "d": "anyExtendedKeyUsage", "c": "X.509 extended key usage" },
+"2.5.29.38": { "d": "authorityAttributeIdentifier", "c": "X.509 extension" },
+"2.5.29.39": { "d": "roleSpecCertIdentifier", "c": "X.509 extension" },
+"2.5.29.40": { "d": "cRLStreamIdentifier", "c": "X.509 extension" },
+"2.5.29.41": { "d": "basicAttConstraints", "c": "X.509 extension" },
+"2.5.29.42": { "d": "delegatedNameConstraints", "c": "X.509 extension" },
+"2.5.29.43": { "d": "timeSpecification", "c": "X.509 extension" },
+"2.5.29.44": { "d": "cRLScope", "c": "X.509 extension" },
+"2.5.29.45": { "d": "statusReferrals", "c": "X.509 extension" },
+"2.5.29.46": { "d": "freshestCRL", "c": "X.509 extension" },
+"2.5.29.47": { "d": "orderedList", "c": "X.509 extension" },
+"2.5.29.48": { "d": "attributeDescriptor", "c": "X.509 extension" },
+"2.5.29.49": { "d": "userNotice", "c": "X.509 extension" },
+"2.5.29.50": { "d": "sOAIdentifier", "c": "X.509 extension" },
+"2.5.29.51": { "d": "baseUpdateTime", "c": "X.509 extension" },
+"2.5.29.52": { "d": "acceptableCertPolicies", "c": "X.509 extension" },
+"2.5.29.53": { "d": "deltaInfo", "c": "X.509 extension" },
+"2.5.29.54": { "d": "inhibitAnyPolicy", "c": "X.509 extension" },
+"2.5.29.55": { "d": "targetInformation", "c": "X.509 extension" },
+"2.5.29.56": { "d": "noRevAvail", "c": "X.509 extension" },
+"2.5.29.57": { "d": "acceptablePrivilegePolicies", "c": "X.509 extension" },
+"2.5.29.58": { "d": "toBeRevoked", "c": "X.509 extension" },
+"2.5.29.59": { "d": "revokedGroups", "c": "X.509 extension" },
+"2.5.29.60": { "d": "expiredCertsOnCRL", "c": "X.509 extension" },
+"2.5.29.61": { "d": "indirectIssuer", "c": "X.509 extension" },
+"2.5.29.62": { "d": "noAssertion", "c": "X.509 extension" },
+"2.5.29.63": { "d": "aAissuingDistributionPoint", "c": "X.509 extension" },
+"2.5.29.64": { "d": "issuedOnBehalfOf", "c": "X.509 extension" },
+"2.5.29.65": { "d": "singleUse", "c": "X.509 extension" },
+"2.5.29.66": { "d": "groupAC", "c": "X.509 extension" },
+"2.5.29.67": { "d": "allowedAttAss", "c": "X.509 extension" },
+"2.5.29.68": { "d": "attributeMappings", "c": "X.509 extension" },
+"2.5.29.69": { "d": "holderNameConstraints", "c": "X.509 extension" },
+"2.16.724.1.2.2.4.1": { "d": "personalDataInfo", "c": "Spanish Government PKI?" },
+"2.16.840.1.101.2.1.1.1": { "d": "sdnsSignatureAlgorithm", "c": "SDN.700 INFOSEC algorithms" },
+"2.16.840.1.101.2.1.1.2": { "d": "fortezzaSignatureAlgorithm", "c": "SDN.700 INFOSEC algorithms.  Formerly known as mosaicSignatureAlgorithm, this OID is better known as dsaWithSHA-1." },
+"2.16.840.1.101.2.1.1.3": { "d": "sdnsConfidentialityAlgorithm", "c": "SDN.700 INFOSEC algorithms" },
+"2.16.840.1.101.2.1.1.4": { "d": "fortezzaConfidentialityAlgorithm", "c": "SDN.700 INFOSEC algorithms.  Formerly known as mosaicConfidentialityAlgorithm" },
+"2.16.840.1.101.2.1.1.5": { "d": "sdnsIntegrityAlgorithm", "c": "SDN.700 INFOSEC algorithms" },
+"2.16.840.1.101.2.1.1.6": { "d": "fortezzaIntegrityAlgorithm", "c": "SDN.700 INFOSEC algorithms.  Formerly known as mosaicIntegrityAlgorithm" },
+"2.16.840.1.101.2.1.1.7": { "d": "sdnsTokenProtectionAlgorithm", "c": "SDN.700 INFOSEC algorithms" },
+"2.16.840.1.101.2.1.1.8": { "d": "fortezzaTokenProtectionAlgorithm", "c": "SDN.700 INFOSEC algorithms.  Formerly know as mosaicTokenProtectionAlgorithm" },
+"2.16.840.1.101.2.1.1.9": { "d": "sdnsKeyManagementAlgorithm", "c": "SDN.700 INFOSEC algorithms" },
+"2.16.840.1.101.2.1.1.10": { "d": "fortezzaKeyManagementAlgorithm", "c": "SDN.700 INFOSEC algorithms.  Formerly known as mosaicKeyManagementAlgorithm" },
+"2.16.840.1.101.2.1.1.11": { "d": "sdnsKMandSigAlgorithm", "c": "SDN.700 INFOSEC algorithms" },
+"2.16.840.1.101.2.1.1.12": { "d": "fortezzaKMandSigAlgorithm", "c": "SDN.700 INFOSEC algorithms.  Formerly known as mosaicKMandSigAlgorithm" },
+"2.16.840.1.101.2.1.1.13": { "d": "suiteASignatureAlgorithm", "c": "SDN.700 INFOSEC algorithms" },
+"2.16.840.1.101.2.1.1.14": { "d": "suiteAConfidentialityAlgorithm", "c": "SDN.700 INFOSEC algorithms" },
+"2.16.840.1.101.2.1.1.15": { "d": "suiteAIntegrityAlgorithm", "c": "SDN.700 INFOSEC algorithms" },
+"2.16.840.1.101.2.1.1.16": { "d": "suiteATokenProtectionAlgorithm", "c": "SDN.700 INFOSEC algorithms" },
+"2.16.840.1.101.2.1.1.17": { "d": "suiteAKeyManagementAlgorithm", "c": "SDN.700 INFOSEC algorithms" },
+"2.16.840.1.101.2.1.1.18": { "d": "suiteAKMandSigAlgorithm", "c": "SDN.700 INFOSEC algorithms" },
+"2.16.840.1.101.2.1.1.19": { "d": "fortezzaUpdatedSigAlgorithm", "c": "SDN.700 INFOSEC algorithms.  Formerly known as mosaicUpdatedSigAlgorithm" },
+"2.16.840.1.101.2.1.1.20": { "d": "fortezzaKMandUpdSigAlgorithms", "c": "SDN.700 INFOSEC algorithms.  Formerly known as mosaicKMandUpdSigAlgorithms" },
+"2.16.840.1.101.2.1.1.21": { "d": "fortezzaUpdatedIntegAlgorithm", "c": "SDN.700 INFOSEC algorithms.  Formerly known as mosaicUpdatedIntegAlgorithm" },
+"2.16.840.1.101.2.1.1.22": { "d": "keyExchangeAlgorithm", "c": "SDN.700 INFOSEC algorithms.  Formerly known as mosaicKeyEncryptionAlgorithm" },
+"2.16.840.1.101.2.1.1.23": { "d": "fortezzaWrap80Algorithm", "c": "SDN.700 INFOSEC algorithms" },
+"2.16.840.1.101.2.1.1.24": { "d": "kEAKeyEncryptionAlgorithm", "c": "SDN.700 INFOSEC algorithms" },
+"2.16.840.1.101.2.1.2.1": { "d": "rfc822MessageFormat", "c": "SDN.700 INFOSEC format" },
+"2.16.840.1.101.2.1.2.2": { "d": "emptyContent", "c": "SDN.700 INFOSEC format" },
+"2.16.840.1.101.2.1.2.3": { "d": "cspContentType", "c": "SDN.700 INFOSEC format" },
+"2.16.840.1.101.2.1.2.42": { "d": "mspRev3ContentType", "c": "SDN.700 INFOSEC format" },
+"2.16.840.1.101.2.1.2.48": { "d": "mspContentType", "c": "SDN.700 INFOSEC format" },
+"2.16.840.1.101.2.1.2.49": { "d": "mspRekeyAgentProtocol", "c": "SDN.700 INFOSEC format" },
+"2.16.840.1.101.2.1.2.50": { "d": "mspMMP", "c": "SDN.700 INFOSEC format" },
+"2.16.840.1.101.2.1.2.66": { "d": "mspRev3-1ContentType", "c": "SDN.700 INFOSEC format" },
+"2.16.840.1.101.2.1.2.72": { "d": "forwardedMSPMessageBodyPart", "c": "SDN.700 INFOSEC format" },
+"2.16.840.1.101.2.1.2.73": { "d": "mspForwardedMessageParameters", "c": "SDN.700 INFOSEC format" },
+"2.16.840.1.101.2.1.2.74": { "d": "forwardedCSPMsgBodyPart", "c": "SDN.700 INFOSEC format" },
+"2.16.840.1.101.2.1.2.75": { "d": "cspForwardedMessageParameters", "c": "SDN.700 INFOSEC format" },
+"2.16.840.1.101.2.1.2.76": { "d": "mspMMP2", "c": "SDN.700 INFOSEC format" },
+"2.16.840.1.101.2.1.3.1": { "d": "sdnsSecurityPolicy", "c": "SDN.700 INFOSEC policy" },
+"2.16.840.1.101.2.1.3.2": { "d": "sdnsPRBAC", "c": "SDN.700 INFOSEC policy" },
+"2.16.840.1.101.2.1.3.3": { "d": "mosaicPRBAC", "c": "SDN.700 INFOSEC policy" },
+"2.16.840.1.101.2.1.3.10": { "d": "siSecurityPolicy", "c": "SDN.700 INFOSEC policy" },
+"2.16.840.1.101.2.1.3.10.0": { "d": "siNASP", "c": "SDN.700 INFOSEC policy (obsolete)", "w": true },
+"2.16.840.1.101.2.1.3.10.1": { "d": "siELCO", "c": "SDN.700 INFOSEC policy (obsolete)", "w": true },
+"2.16.840.1.101.2.1.3.10.2": { "d": "siTK", "c": "SDN.700 INFOSEC policy (obsolete)", "w": true },
+"2.16.840.1.101.2.1.3.10.3": { "d": "siDSAP", "c": "SDN.700 INFOSEC policy (obsolete)", "w": true },
+"2.16.840.1.101.2.1.3.10.4": { "d": "siSSSS", "c": "SDN.700 INFOSEC policy (obsolete)", "w": true },
+"2.16.840.1.101.2.1.3.10.5": { "d": "siDNASP", "c": "SDN.700 INFOSEC policy (obsolete)", "w": true },
+"2.16.840.1.101.2.1.3.10.6": { "d": "siBYEMAN", "c": "SDN.700 INFOSEC policy (obsolete)", "w": true },
+"2.16.840.1.101.2.1.3.10.7": { "d": "siREL-US", "c": "SDN.700 INFOSEC policy (obsolete)", "w": true },
+"2.16.840.1.101.2.1.3.10.8": { "d": "siREL-AUS", "c": "SDN.700 INFOSEC policy (obsolete)", "w": true },
+"2.16.840.1.101.2.1.3.10.9": { "d": "siREL-CAN", "c": "SDN.700 INFOSEC policy (obsolete)", "w": true },
+"2.16.840.1.101.2.1.3.10.10": { "d": "siREL_UK", "c": "SDN.700 INFOSEC policy (obsolete)", "w": true },
+"2.16.840.1.101.2.1.3.10.11": { "d": "siREL-NZ", "c": "SDN.700 INFOSEC policy (obsolete)", "w": true },
+"2.16.840.1.101.2.1.3.10.12": { "d": "siGeneric", "c": "SDN.700 INFOSEC policy (obsolete)", "w": true },
+"2.16.840.1.101.2.1.3.11": { "d": "genser", "c": "SDN.700 INFOSEC policy" },
+"2.16.840.1.101.2.1.3.11.0": { "d": "genserNations", "c": "SDN.700 INFOSEC policy (obsolete)", "w": true },
+"2.16.840.1.101.2.1.3.11.1": { "d": "genserComsec", "c": "SDN.700 INFOSEC policy (obsolete)", "w": true },
+"2.16.840.1.101.2.1.3.11.2": { "d": "genserAcquisition", "c": "SDN.700 INFOSEC policy (obsolete)", "w": true },
+"2.16.840.1.101.2.1.3.11.3": { "d": "genserSecurityCategories", "c": "SDN.700 INFOSEC policy" },
+"2.16.840.1.101.2.1.3.11.3.0": { "d": "genserTagSetName", "c": "SDN.700 INFOSEC GENSER policy" },
+"2.16.840.1.101.2.1.3.12": { "d": "defaultSecurityPolicy", "c": "SDN.700 INFOSEC policy" },
+"2.16.840.1.101.2.1.3.13": { "d": "capcoMarkings", "c": "SDN.700 INFOSEC policy" },
+"2.16.840.1.101.2.1.3.13.0": { "d": "capcoSecurityCategories", "c": "SDN.700 INFOSEC policy CAPCO markings" },
+"2.16.840.1.101.2.1.3.13.0.1": { "d": "capcoTagSetName1", "c": "SDN.700 INFOSEC policy CAPCO markings" },
+"2.16.840.1.101.2.1.3.13.0.2": { "d": "capcoTagSetName2", "c": "SDN.700 INFOSEC policy CAPCO markings" },
+"2.16.840.1.101.2.1.3.13.0.3": { "d": "capcoTagSetName3", "c": "SDN.700 INFOSEC policy CAPCO markings" },
+"2.16.840.1.101.2.1.3.13.0.4": { "d": "capcoTagSetName4", "c": "SDN.700 INFOSEC policy CAPCO markings" },
+"2.16.840.1.101.2.1.5.1": { "d": "sdnsKeyManagementCertificate", "c": "SDN.700 INFOSEC attributes (superseded)", "w": true },
+"2.16.840.1.101.2.1.5.2": { "d": "sdnsUserSignatureCertificate", "c": "SDN.700 INFOSEC attributes (superseded)", "w": true },
+"2.16.840.1.101.2.1.5.3": { "d": "sdnsKMandSigCertificate", "c": "SDN.700 INFOSEC attributes (superseded)", "w": true },
+"2.16.840.1.101.2.1.5.4": { "d": "fortezzaKeyManagementCertificate", "c": "SDN.700 INFOSEC attributes (superseded)", "w": true },
+"2.16.840.1.101.2.1.5.5": { "d": "fortezzaKMandSigCertificate", "c": "SDN.700 INFOSEC attributes (superseded)", "w": true },
+"2.16.840.1.101.2.1.5.6": { "d": "fortezzaUserSignatureCertificate", "c": "SDN.700 INFOSEC attributes (superseded)", "w": true },
+"2.16.840.1.101.2.1.5.7": { "d": "fortezzaCASignatureCertificate", "c": "SDN.700 INFOSEC attributes (superseded)", "w": true },
+"2.16.840.1.101.2.1.5.8": { "d": "sdnsCASignatureCertificate", "c": "SDN.700 INFOSEC attributes (superseded)", "w": true },
+"2.16.840.1.101.2.1.5.10": { "d": "auxiliaryVector", "c": "SDN.700 INFOSEC attributes (superseded)", "w": true },
+"2.16.840.1.101.2.1.5.11": { "d": "mlReceiptPolicy", "c": "SDN.700 INFOSEC attributes" },
+"2.16.840.1.101.2.1.5.12": { "d": "mlMembership", "c": "SDN.700 INFOSEC attributes" },
+"2.16.840.1.101.2.1.5.13": { "d": "mlAdministrators", "c": "SDN.700 INFOSEC attributes" },
+"2.16.840.1.101.2.1.5.14": { "d": "alid", "c": "SDN.700 INFOSEC attributes" },
+"2.16.840.1.101.2.1.5.20": { "d": "janUKMs", "c": "SDN.700 INFOSEC attributes" },
+"2.16.840.1.101.2.1.5.21": { "d": "febUKMs", "c": "SDN.700 INFOSEC attributes" },
+"2.16.840.1.101.2.1.5.22": { "d": "marUKMs", "c": "SDN.700 INFOSEC attributes" },
+"2.16.840.1.101.2.1.5.23": { "d": "aprUKMs", "c": "SDN.700 INFOSEC attributes" },
+"2.16.840.1.101.2.1.5.24": { "d": "mayUKMs", "c": "SDN.700 INFOSEC attributes" },
+"2.16.840.1.101.2.1.5.25": { "d": "junUKMs", "c": "SDN.700 INFOSEC attributes" },
+"2.16.840.1.101.2.1.5.26": { "d": "julUKMs", "c": "SDN.700 INFOSEC attributes" },
+"2.16.840.1.101.2.1.5.27": { "d": "augUKMs", "c": "SDN.700 INFOSEC attributes" },
+"2.16.840.1.101.2.1.5.28": { "d": "sepUKMs", "c": "SDN.700 INFOSEC attributes" },
+"2.16.840.1.101.2.1.5.29": { "d": "octUKMs", "c": "SDN.700 INFOSEC attributes" },
+"2.16.840.1.101.2.1.5.30": { "d": "novUKMs", "c": "SDN.700 INFOSEC attributes" },
+"2.16.840.1.101.2.1.5.31": { "d": "decUKMs", "c": "SDN.700 INFOSEC attributes" },
+"2.16.840.1.101.2.1.5.40": { "d": "metaSDNSckl", "c": "SDN.700 INFOSEC attributes" },
+"2.16.840.1.101.2.1.5.41": { "d": "sdnsCKL", "c": "SDN.700 INFOSEC attributes" },
+"2.16.840.1.101.2.1.5.42": { "d": "metaSDNSsignatureCKL", "c": "SDN.700 INFOSEC attributes" },
+"2.16.840.1.101.2.1.5.43": { "d": "sdnsSignatureCKL", "c": "SDN.700 INFOSEC attributes" },
+"2.16.840.1.101.2.1.5.44": { "d": "sdnsCertificateRevocationList", "c": "SDN.700 INFOSEC attributes" },
+"2.16.840.1.101.2.1.5.45": { "d": "fortezzaCertificateRevocationList", "c": "SDN.700 INFOSEC attributes (superseded)", "w": true },
+"2.16.840.1.101.2.1.5.46": { "d": "fortezzaCKL", "c": "SDN.700 INFOSEC attributes" },
+"2.16.840.1.101.2.1.5.47": { "d": "alExemptedAddressProcessor", "c": "SDN.700 INFOSEC attributes" },
+"2.16.840.1.101.2.1.5.48": { "d": "guard", "c": "SDN.700 INFOSEC attributes (obsolete)", "w": true },
+"2.16.840.1.101.2.1.5.49": { "d": "algorithmsSupported", "c": "SDN.700 INFOSEC attributes (obsolete)", "w": true },
+"2.16.840.1.101.2.1.5.50": { "d": "suiteAKeyManagementCertificate", "c": "SDN.700 INFOSEC attributes (obsolete)", "w": true },
+"2.16.840.1.101.2.1.5.51": { "d": "suiteAKMandSigCertificate", "c": "SDN.700 INFOSEC attributes (obsolete)", "w": true },
+"2.16.840.1.101.2.1.5.52": { "d": "suiteAUserSignatureCertificate", "c": "SDN.700 INFOSEC attributes (obsolete)", "w": true },
+"2.16.840.1.101.2.1.5.53": { "d": "prbacInfo", "c": "SDN.700 INFOSEC attributes" },
+"2.16.840.1.101.2.1.5.54": { "d": "prbacCAConstraints", "c": "SDN.700 INFOSEC attributes" },
+"2.16.840.1.101.2.1.5.55": { "d": "sigOrKMPrivileges", "c": "SDN.700 INFOSEC attributes" },
+"2.16.840.1.101.2.1.5.56": { "d": "commPrivileges", "c": "SDN.700 INFOSEC attributes" },
+"2.16.840.1.101.2.1.5.57": { "d": "labeledAttribute", "c": "SDN.700 INFOSEC attributes" },
+"2.16.840.1.101.2.1.5.58": { "d": "policyInformationFile", "c": "SDN.700 INFOSEC attributes (obsolete)", "w": true },
+"2.16.840.1.101.2.1.5.59": { "d": "secPolicyInformationFile", "c": "SDN.700 INFOSEC attributes" },
+"2.16.840.1.101.2.1.5.60": { "d": "cAClearanceConstraint", "c": "SDN.700 INFOSEC attributes" },
+"2.16.840.1.101.2.1.7.1": { "d": "cspExtns", "c": "SDN.700 INFOSEC extensions" },
+"2.16.840.1.101.2.1.7.1.0": { "d": "cspCsExtn", "c": "SDN.700 INFOSEC extensions" },
+"2.16.840.1.101.2.1.8.1": { "d": "mISSISecurityCategories", "c": "SDN.700 INFOSEC security category" },
+"2.16.840.1.101.2.1.8.2": { "d": "standardSecurityLabelPrivileges", "c": "SDN.700 INFOSEC security category" },
+"2.16.840.1.101.2.1.10.1": { "d": "sigPrivileges", "c": "SDN.700 INFOSEC privileges" },
+"2.16.840.1.101.2.1.10.2": { "d": "kmPrivileges", "c": "SDN.700 INFOSEC privileges" },
+"2.16.840.1.101.2.1.10.3": { "d": "namedTagSetPrivilege", "c": "SDN.700 INFOSEC privileges" },
+"2.16.840.1.101.2.1.11.1": { "d": "ukDemo", "c": "SDN.700 INFOSEC certificate policy" },
+"2.16.840.1.101.2.1.11.2": { "d": "usDODClass2", "c": "SDN.700 INFOSEC certificate policy" },
+"2.16.840.1.101.2.1.11.3": { "d": "usMediumPilot", "c": "SDN.700 INFOSEC certificate policy" },
+"2.16.840.1.101.2.1.11.4": { "d": "usDODClass4", "c": "SDN.700 INFOSEC certificate policy" },
+"2.16.840.1.101.2.1.11.5": { "d": "usDODClass3", "c": "SDN.700 INFOSEC certificate policy" },
+"2.16.840.1.101.2.1.11.6": { "d": "usDODClass5", "c": "SDN.700 INFOSEC certificate policy" },
+"2.16.840.1.101.2.1.12.0": { "d": "testSecurityPolicy", "c": "SDN.700 INFOSEC test objects" },
+"2.16.840.1.101.2.1.12.0.1": { "d": "tsp1", "c": "SDN.700 INFOSEC test objects" },
+"2.16.840.1.101.2.1.12.0.1.0": { "d": "tsp1SecurityCategories", "c": "SDN.700 INFOSEC test objects" },
+"2.16.840.1.101.2.1.12.0.1.0.0": { "d": "tsp1TagSetZero", "c": "SDN.700 INFOSEC test objects" },
+"2.16.840.1.101.2.1.12.0.1.0.1": { "d": "tsp1TagSetOne", "c": "SDN.700 INFOSEC test objects" },
+"2.16.840.1.101.2.1.12.0.1.0.2": { "d": "tsp1TagSetTwo", "c": "SDN.700 INFOSEC test objects" },
+"2.16.840.1.101.2.1.12.0.2": { "d": "tsp2", "c": "SDN.700 INFOSEC test objects" },
+"2.16.840.1.101.2.1.12.0.2.0": { "d": "tsp2SecurityCategories", "c": "SDN.700 INFOSEC test objects" },
+"2.16.840.1.101.2.1.12.0.2.0.0": { "d": "tsp2TagSetZero", "c": "SDN.700 INFOSEC test objects" },
+"2.16.840.1.101.2.1.12.0.2.0.1": { "d": "tsp2TagSetOne", "c": "SDN.700 INFOSEC test objects" },
+"2.16.840.1.101.2.1.12.0.2.0.2": { "d": "tsp2TagSetTwo", "c": "SDN.700 INFOSEC test objects" },
+"2.16.840.1.101.2.1.12.0.3": { "d": "kafka", "c": "SDN.700 INFOSEC test objects" },
+"2.16.840.1.101.2.1.12.0.3.0": { "d": "kafkaSecurityCategories", "c": "SDN.700 INFOSEC test objects" },
+"2.16.840.1.101.2.1.12.0.3.0.1": { "d": "kafkaTagSetName1", "c": "SDN.700 INFOSEC test objects" },
+"2.16.840.1.101.2.1.12.0.3.0.2": { "d": "kafkaTagSetName2", "c": "SDN.700 INFOSEC test objects" },
+"2.16.840.1.101.2.1.12.0.3.0.3": { "d": "kafkaTagSetName3", "c": "SDN.700 INFOSEC test objects" },
+"2.16.840.1.101.2.1.12.1.1": { "d": "tcp1", "c": "SDN.700 INFOSEC test objects" },
+"2.16.840.1.101.3.1": { "d": "slabel", "c": "CSOR GAK", "w": true },
+"2.16.840.1.101.3.2": { "d": "pki", "c": "NIST", "w": true },
+"2.16.840.1.101.3.2.1": { "d": "NIST policyIdentifier", "c": "NIST policies", "w": true },
+"2.16.840.1.101.3.2.1.3.1": { "d": "fbcaRudimentaryPolicy", "c": "Federal Bridge CA Policy" },
+"2.16.840.1.101.3.2.1.3.2": { "d": "fbcaBasicPolicy", "c": "Federal Bridge CA Policy" },
+"2.16.840.1.101.3.2.1.3.3": { "d": "fbcaMediumPolicy", "c": "Federal Bridge CA Policy" },
+"2.16.840.1.101.3.2.1.3.4": { "d": "fbcaHighPolicy", "c": "Federal Bridge CA Policy" },
+"2.16.840.1.101.3.2.1.48.1": { "d": "nistTestPolicy1", "c": "NIST PKITS policies" },
+"2.16.840.1.101.3.2.1.48.2": { "d": "nistTestPolicy2", "c": "NIST PKITS policies" },
+"2.16.840.1.101.3.2.1.48.3": { "d": "nistTestPolicy3", "c": "NIST PKITS policies" },
+"2.16.840.1.101.3.2.1.48.4": { "d": "nistTestPolicy4", "c": "NIST PKITS policies" },
+"2.16.840.1.101.3.2.1.48.5": { "d": "nistTestPolicy5", "c": "NIST PKITS policies" },
+"2.16.840.1.101.3.2.1.48.6": { "d": "nistTestPolicy6", "c": "NIST PKITS policies" },
+"2.16.840.1.101.3.2.2": { "d": "gak", "c": "CSOR GAK extended key usage", "w": true },
+"2.16.840.1.101.3.2.2.1": { "d": "kRAKey", "c": "CSOR GAK extended key usage", "w": true },
+"2.16.840.1.101.3.2.3": { "d": "extensions", "c": "CSOR GAK extensions", "w": true },
+"2.16.840.1.101.3.2.3.1": { "d": "kRTechnique", "c": "CSOR GAK extensions", "w": true },
+"2.16.840.1.101.3.2.3.2": { "d": "kRecoveryCapable", "c": "CSOR GAK extensions", "w": true },
+"2.16.840.1.101.3.2.3.3": { "d": "kR", "c": "CSOR GAK extensions", "w": true },
+"2.16.840.1.101.3.2.4": { "d": "keyRecoverySchemes", "c": "CSOR GAK", "w": true },
+"2.16.840.1.101.3.2.5": { "d": "krapola", "c": "CSOR GAK", "w": true },
+"2.16.840.1.101.3.3": { "d": "arpa", "c": "CSOR GAK", "w": true },
+"2.16.840.1.101.3.4": { "d": "nistAlgorithm", "c": "NIST Algorithm" },
+"2.16.840.1.101.3.4.1": { "d": "aes", "c": "NIST Algorithm" },
+"2.16.840.1.101.3.4.1.1": { "d": "aes128-ECB", "c": "NIST Algorithm" },
+"2.16.840.1.101.3.4.1.2": { "d": "aes128-CBC", "c": "NIST Algorithm" },
+"2.16.840.1.101.3.4.1.3": { "d": "aes128-OFB", "c": "NIST Algorithm" },
+"2.16.840.1.101.3.4.1.4": { "d": "aes128-CFB", "c": "NIST Algorithm" },
+"2.16.840.1.101.3.4.1.5": { "d": "aes128-wrap", "c": "NIST Algorithm" },
+"2.16.840.1.101.3.4.1.6": { "d": "aes128-GCM", "c": "NIST Algorithm" },
+"2.16.840.1.101.3.4.1.7": { "d": "aes128-CCM", "c": "NIST Algorithm" },
+"2.16.840.1.101.3.4.1.8": { "d": "aes128-wrap-pad", "c": "NIST Algorithm" },
+"2.16.840.1.101.3.4.1.21": { "d": "aes192-ECB", "c": "NIST Algorithm" },
+"2.16.840.1.101.3.4.1.22": { "d": "aes192-CBC", "c": "NIST Algorithm" },
+"2.16.840.1.101.3.4.1.23": { "d": "aes192-OFB", "c": "NIST Algorithm" },
+"2.16.840.1.101.3.4.1.24": { "d": "aes192-CFB", "c": "NIST Algorithm" },
+"2.16.840.1.101.3.4.1.25": { "d": "aes192-wrap", "c": "NIST Algorithm" },
+"2.16.840.1.101.3.4.1.26": { "d": "aes192-GCM", "c": "NIST Algorithm" },
+"2.16.840.1.101.3.4.1.27": { "d": "aes192-CCM", "c": "NIST Algorithm" },
+"2.16.840.1.101.3.4.1.28": { "d": "aes192-wrap-pad", "c": "NIST Algorithm" },
+"2.16.840.1.101.3.4.1.41": { "d": "aes256-ECB", "c": "NIST Algorithm" },
+"2.16.840.1.101.3.4.1.42": { "d": "aes256-CBC", "c": "NIST Algorithm" },
+"2.16.840.1.101.3.4.1.43": { "d": "aes256-OFB", "c": "NIST Algorithm" },
+"2.16.840.1.101.3.4.1.44": { "d": "aes256-CFB", "c": "NIST Algorithm" },
+"2.16.840.1.101.3.4.1.45": { "d": "aes256-wrap", "c": "NIST Algorithm" },
+"2.16.840.1.101.3.4.1.46": { "d": "aes256-GCM", "c": "NIST Algorithm" },
+"2.16.840.1.101.3.4.1.47": { "d": "aes256-CCM", "c": "NIST Algorithm" },
+"2.16.840.1.101.3.4.1.48": { "d": "aes256-wrap-pad", "c": "NIST Algorithm" },
+"2.16.840.1.101.3.4.2": { "d": "hashAlgos", "c": "NIST Algorithm" },
+"2.16.840.1.101.3.4.2.1": { "d": "sha-256", "c": "NIST Algorithm" },
+"2.16.840.1.101.3.4.2.2": { "d": "sha-384", "c": "NIST Algorithm" },
+"2.16.840.1.101.3.4.2.3": { "d": "sha-512", "c": "NIST Algorithm" },
+"2.16.840.1.101.3.4.2.4": { "d": "sha-224", "c": "NIST Algorithm" },
+"2.16.840.1.101.3.4.3.1": { "d": "dsaWithSha224", "c": "NIST Algorithm" },
+"2.16.840.1.101.3.4.3.2": { "d": "dsaWithSha256", "c": "NIST Algorithm" },
+"2.16.840.1.113719.1.2.8": { "d": "novellAlgorithm", "c": "Novell" },
+"2.16.840.1.113719.1.2.8.22": { "d": "desCbcIV8", "c": "Novell encryption algorithm" },
+"2.16.840.1.113719.1.2.8.23": { "d": "desCbcPadIV8", "c": "Novell encryption algorithm" },
+"2.16.840.1.113719.1.2.8.24": { "d": "desEDE2CbcIV8", "c": "Novell encryption algorithm" },
+"2.16.840.1.113719.1.2.8.25": { "d": "desEDE2CbcPadIV8", "c": "Novell encryption algorithm" },
+"2.16.840.1.113719.1.2.8.26": { "d": "desEDE3CbcIV8", "c": "Novell encryption algorithm" },
+"2.16.840.1.113719.1.2.8.27": { "d": "desEDE3CbcPadIV8", "c": "Novell encryption algorithm" },
+"2.16.840.1.113719.1.2.8.28": { "d": "rc5CbcPad", "c": "Novell encryption algorithm" },
+"2.16.840.1.113719.1.2.8.29": { "d": "md2WithRSAEncryptionBSafe1", "c": "Novell signature algorithm" },
+"2.16.840.1.113719.1.2.8.30": { "d": "md5WithRSAEncryptionBSafe1", "c": "Novell signature algorithm" },
+"2.16.840.1.113719.1.2.8.31": { "d": "sha1WithRSAEncryptionBSafe1", "c": "Novell signature algorithm" },
+"2.16.840.1.113719.1.2.8.32": { "d": "lmDigest", "c": "Novell digest algorithm" },
+"2.16.840.1.113719.1.2.8.40": { "d": "md2", "c": "Novell digest algorithm" },
+"2.16.840.1.113719.1.2.8.50": { "d": "md5", "c": "Novell digest algorithm" },
+"2.16.840.1.113719.1.2.8.51": { "d": "ikeHmacWithSHA1-RSA", "c": "Novell signature algorithm" },
+"2.16.840.1.113719.1.2.8.52": { "d": "ikeHmacWithMD5-RSA", "c": "Novell signature algorithm" },
+"2.16.840.1.113719.1.2.8.69": { "d": "rc2CbcPad", "c": "Novell encryption algorithm" },
+"2.16.840.1.113719.1.2.8.82": { "d": "sha-1", "c": "Novell digest algorithm" },
+"2.16.840.1.113719.1.2.8.92": { "d": "rc2BSafe1Cbc", "c": "Novell encryption algorithm" },
+"2.16.840.1.113719.1.2.8.95": { "d": "md4", "c": "Novell digest algorithm" },
+"2.16.840.1.113719.1.2.8.130": { "d": "md4Packet", "c": "Novell keyed hash" },
+"2.16.840.1.113719.1.2.8.131": { "d": "rsaEncryptionBsafe1", "c": "Novell encryption algorithm" },
+"2.16.840.1.113719.1.2.8.132": { "d": "nwPassword", "c": "Novell encryption algorithm" },
+"2.16.840.1.113719.1.2.8.133": { "d": "novellObfuscate-1", "c": "Novell encryption algorithm" },
+"2.16.840.1.113719.1.9": { "d": "pki", "c": "Novell" },
+"2.16.840.1.113719.1.9.4": { "d": "pkiAttributeType", "c": "Novell PKI" },
+"2.16.840.1.113719.1.9.4.1": { "d": "securityAttributes", "c": "Novell PKI attribute type" },
+"2.16.840.1.113719.1.9.4.2": { "d": "relianceLimit", "c": "Novell PKI attribute type" },
+"2.16.840.1.113730.1": { "d": "cert-extension", "c": "Netscape" },
+"2.16.840.1.113730.1.1": { "d": "netscape-cert-type", "c": "Netscape certificate extension" },
+"2.16.840.1.113730.1.2": { "d": "netscape-base-url", "c": "Netscape certificate extension" },
+"2.16.840.1.113730.1.3": { "d": "netscape-revocation-url", "c": "Netscape certificate extension" },
+"2.16.840.1.113730.1.4": { "d": "netscape-ca-revocation-url", "c": "Netscape certificate extension" },
+"2.16.840.1.113730.1.7": { "d": "netscape-cert-renewal-url", "c": "Netscape certificate extension" },
+"2.16.840.1.113730.1.8": { "d": "netscape-ca-policy-url", "c": "Netscape certificate extension" },
+"2.16.840.1.113730.1.9": { "d": "HomePage-url", "c": "Netscape certificate extension" },
+"2.16.840.1.113730.1.10": { "d": "EntityLogo", "c": "Netscape certificate extension" },
+"2.16.840.1.113730.1.11": { "d": "UserPicture", "c": "Netscape certificate extension" },
+"2.16.840.1.113730.1.12": { "d": "netscape-ssl-server-name", "c": "Netscape certificate extension" },
+"2.16.840.1.113730.1.13": { "d": "netscape-comment", "c": "Netscape certificate extension" },
+"2.16.840.1.113730.2": { "d": "data-type", "c": "Netscape" },
+"2.16.840.1.113730.2.1": { "d": "dataGIF", "c": "Netscape data type" },
+"2.16.840.1.113730.2.2": { "d": "dataJPEG", "c": "Netscape data type" },
+"2.16.840.1.113730.2.3": { "d": "dataURL", "c": "Netscape data type" },
+"2.16.840.1.113730.2.4": { "d": "dataHTML", "c": "Netscape data type" },
+"2.16.840.1.113730.2.5": { "d": "certSequence", "c": "Netscape data type" },
+"2.16.840.1.113730.2.6": { "d": "certURL", "c": "Netscape certificate extension" },
+"2.16.840.1.113730.3": { "d": "directory", "c": "Netscape" },
+"2.16.840.1.113730.3.1": { "d": "ldapDefinitions", "c": "Netscape directory" },
+"2.16.840.1.113730.3.1.1": { "d": "carLicense", "c": "Netscape LDAP definitions" },
+"2.16.840.1.113730.3.1.2": { "d": "departmentNumber", "c": "Netscape LDAP definitions" },
+"2.16.840.1.113730.3.1.3": { "d": "employeeNumber", "c": "Netscape LDAP definitions" },
+"2.16.840.1.113730.3.1.4": { "d": "employeeType", "c": "Netscape LDAP definitions" },
+"2.16.840.1.113730.3.2.2": { "d": "inetOrgPerson", "c": "Netscape LDAP definitions" },
+"2.16.840.1.113730.4.1": { "d": "serverGatedCrypto", "c": "Netscape" },
+"2.16.840.1.113733.1.6.3": { "d": "verisignCZAG", "c": "Verisign extension" },
+"2.16.840.1.113733.1.6.6": { "d": "verisignInBox", "c": "Verisign extension" },
+"2.16.840.1.113733.1.6.11": { "d": "verisignOnsiteJurisdictionHash", "c": "Verisign extension" },
+"2.16.840.1.113733.1.6.13": { "d": "Unknown Verisign VPN extension", "c": "Verisign extension" },
+"2.16.840.1.113733.1.6.15": { "d": "verisignServerID", "c": "Verisign extension" },
+"2.16.840.1.113733.1.7.1.1": { "d": "verisignCertPolicies95Qualifier1", "c": "Verisign policy" },
+"2.16.840.1.113733.1.7.1.1.1": { "d": "verisignCPSv1notice", "c": "Verisign policy (obsolete)" },
+"2.16.840.1.113733.1.7.1.1.2": { "d": "verisignCPSv1nsi", "c": "Verisign policy (obsolete)" },
+"2.16.840.1.113733.1.8.1": { "d": "verisignISSStrongCrypto", "c": "Verisign" },
+"2.16.840.1.113733.1": { "d": "pki", "c": "Verisign extension" },
+"2.16.840.1.113733.1.9": { "d": "pkcs7Attribute", "c": "Verisign PKI extension" },
+"2.16.840.1.113733.1.9.2": { "d": "messageType", "c": "Verisign PKCS #7 attribute" },
+"2.16.840.1.113733.1.9.3": { "d": "pkiStatus", "c": "Verisign PKCS #7 attribute" },
+"2.16.840.1.113733.1.9.4": { "d": "failInfo", "c": "Verisign PKCS #7 attribute" },
+"2.16.840.1.113733.1.9.5": { "d": "senderNonce", "c": "Verisign PKCS #7 attribute" },
+"2.16.840.1.113733.1.9.6": { "d": "recipientNonce", "c": "Verisign PKCS #7 attribute" },
+"2.16.840.1.113733.1.9.7": { "d": "transID", "c": "Verisign PKCS #7 attribute" },
+"2.16.840.1.113733.1.9.8": { "d": "extensionReq", "c": "Verisign PKCS #7 attribute.  Use PKCS #9 extensionRequest instead", "w": true },
+"2.16.840.1.113741.2": { "d": "intelCDSA", "c": "Intel CDSA" },
+"2.16.840.1.114412.1": { "d": "digiCertNonEVCerts", "c": "Digicert CA policy" },
+"2.16.840.1.114412.1.1": { "d": "digiCertOVCert", "c": "Digicert CA policy" },
+"2.16.840.1.114412.1.2": { "d": "digiCertDVCert", "c": "Digicert CA policy" },
+"2.16.840.1.114412.1.11": { "d": "digiCertFederatedDeviceCert", "c": "Digicert CA policy" },
+"2.16.840.1.114412.1.3.0.1": { "d": "digiCertGlobalCAPolicy", "c": "Digicert CA policy" },
+"2.16.840.1.114412.1.3.0.2": { "d": "digiCertHighAssuranceEVCAPolicy", "c": "Digicert CA policy" },
+"2.16.840.1.114412.1.3.0.3": { "d": "digiCertGlobalRootCAPolicy", "c": "Digicert CA policy" },
+"2.16.840.1.114412.1.3.0.4": { "d": "digiCertAssuredIDRootCAPolicy", "c": "Digicert CA policy" },
+"2.16.840.1.114412.2.2": { "d": "digiCertEVCert", "c": "Digicert CA policy" },
+"2.16.840.1.114412.2.3": { "d": "digiCertObjectSigningCert", "c": "Digicert CA policy" },
+"2.16.840.1.114412.2.3.1": { "d": "digiCertCodeSigningCert", "c": "Digicert CA policy" },
+"2.16.840.1.114412.2.3.2": { "d": "digiCertEVCodeSigningCert", "c": "Digicert CA policy" },
+"2.16.840.1.114412.2.3.11": { "d": "digiCertKernelCodeSigningCert", "c": "Digicert CA policy" },
+"2.16.840.1.114412.2.3.21": { "d": "digiCertDocumentSigningCert", "c": "Digicert CA policy" },
+"2.16.840.1.114412.2.4": { "d": "digiCertClientCert", "c": "Digicert CA policy" },
+"2.16.840.1.114412.2.4.1.1": { "d": "digiCertLevel1PersonalClientCert", "c": "Digicert CA policy" },
+"2.16.840.1.114412.2.4.1.2": { "d": "digiCertLevel1EnterpriseClientCert", "c": "Digicert CA policy" },
+"2.16.840.1.114412.2.4.2": { "d": "digiCertLevel2ClientCert", "c": "Digicert CA policy" },
+"2.16.840.1.114412.2.4.3.1": { "d": "digiCertLevel3USClientCert", "c": "Digicert CA policy" },
+"2.16.840.1.114412.2.4.3.2": { "d": "digiCertLevel3CBPClientCert", "c": "Digicert CA policy" },
+"2.16.840.1.114412.2.4.4.1": { "d": "digiCertLevel4USClientCert", "c": "Digicert CA policy" },
+"2.16.840.1.114412.2.4.4.2": { "d": "digiCertLevel4CBPClientCert", "c": "Digicert CA policy" },
+"2.16.840.1.114412.2.4.5.1": { "d": "digiCertPIVHardwareCert", "c": "Digicert CA policy" },
+"2.16.840.1.114412.2.4.5.2": { "d": "digiCertPIVCardAuthCert", "c": "Digicert CA policy" },
+"2.16.840.1.114412.2.4.5.3": { "d": "digiCertPIVContentSigningCert", "c": "Digicert CA policy" },
+"2.16.840.1.114412.4.31": { "d": "digiCertGridClassicCert", "c": "Digicert CA policy" },
+"2.16.840.1.114412.4.31.5": { "d": "digiCertGridIntegratedCert", "c": "Digicert CA policy" },
+"2.16.840.1.114412.31.4.31.1": { "d": "digiCertGridHostCert", "c": "Digicert CA policy" },
+"2.23.42.0": { "d": "contentType", "c": "SET" },
+"2.23.42.0.0": { "d": "panData", "c": "SET contentType" },
+"2.23.42.0.1": { "d": "panToken", "c": "SET contentType" },
+"2.23.42.0.2": { "d": "panOnly", "c": "SET contentType" },
+"2.23.42.1": { "d": "msgExt", "c": "SET" },
+"2.23.42.2": { "d": "field", "c": "SET" },
+"2.23.42.2.0": { "d": "fullName", "c": "SET field" },
+"2.23.42.2.1": { "d": "givenName", "c": "SET field" },
+"2.23.42.2.2": { "d": "familyName", "c": "SET field" },
+"2.23.42.2.3": { "d": "birthFamilyName", "c": "SET field" },
+"2.23.42.2.4": { "d": "placeName", "c": "SET field" },
+"2.23.42.2.5": { "d": "identificationNumber", "c": "SET field" },
+"2.23.42.2.6": { "d": "month", "c": "SET field" },
+"2.23.42.2.7": { "d": "date", "c": "SET field" },
+"2.23.42.2.8": { "d": "address", "c": "SET field" },
+"2.23.42.2.9": { "d": "telephone", "c": "SET field" },
+"2.23.42.2.10": { "d": "amount", "c": "SET field" },
+"2.23.42.2.11": { "d": "accountNumber", "c": "SET field" },
+"2.23.42.2.12": { "d": "passPhrase", "c": "SET field" },
+"2.23.42.3": { "d": "attribute", "c": "SET" },
+"2.23.42.3.0": { "d": "cert", "c": "SET attribute" },
+"2.23.42.3.0.0": { "d": "rootKeyThumb", "c": "SET cert attribute" },
+"2.23.42.3.0.1": { "d": "additionalPolicy", "c": "SET cert attribute" },
+"2.23.42.4": { "d": "algorithm", "c": "SET" },
+"2.23.42.5": { "d": "policy", "c": "SET" },
+"2.23.42.5.0": { "d": "root", "c": "SET policy" },
+"2.23.42.6": { "d": "module", "c": "SET" },
+"2.23.42.7": { "d": "certExt", "c": "SET" },
+"2.23.42.7.0": { "d": "hashedRootKey", "c": "SET cert extension" },
+"2.23.42.7.1": { "d": "certificateType", "c": "SET cert extension" },
+"2.23.42.7.2": { "d": "merchantData", "c": "SET cert extension" },
+"2.23.42.7.3": { "d": "cardCertRequired", "c": "SET cert extension" },
+"2.23.42.7.4": { "d": "tunneling", "c": "SET cert extension" },
+"2.23.42.7.5": { "d": "setExtensions", "c": "SET cert extension" },
+"2.23.42.7.6": { "d": "setQualifier", "c": "SET cert extension" },
+"2.23.42.8": { "d": "brand", "c": "SET" },
+"2.23.42.8.1": { "d": "IATA-ATA", "c": "SET brand" },
+"2.23.42.8.4": { "d": "VISA", "c": "SET brand" },
+"2.23.42.8.5": { "d": "MasterCard", "c": "SET brand" },
+"2.23.42.8.30": { "d": "Diners", "c": "SET brand" },
+"2.23.42.8.34": { "d": "AmericanExpress", "c": "SET brand" },
+"2.23.42.8.6011": { "d": "Novus", "c": "SET brand" },
+"2.23.42.9": { "d": "vendor", "c": "SET" },
+"2.23.42.9.0": { "d": "GlobeSet", "c": "SET vendor" },
+"2.23.42.9.1": { "d": "IBM", "c": "SET vendor" },
+"2.23.42.9.2": { "d": "CyberCash", "c": "SET vendor" },
+"2.23.42.9.3": { "d": "Terisa", "c": "SET vendor" },
+"2.23.42.9.4": { "d": "RSADSI", "c": "SET vendor" },
+"2.23.42.9.5": { "d": "VeriFone", "c": "SET vendor" },
+"2.23.42.9.6": { "d": "TrinTech", "c": "SET vendor" },
+"2.23.42.9.7": { "d": "BankGate", "c": "SET vendor" },
+"2.23.42.9.8": { "d": "GTE", "c": "SET vendor" },
+"2.23.42.9.9": { "d": "CompuSource", "c": "SET vendor" },
+"2.23.42.9.10": { "d": "Griffin", "c": "SET vendor" },
+"2.23.42.9.11": { "d": "Certicom", "c": "SET vendor" },
+"2.23.42.9.12": { "d": "OSS", "c": "SET vendor" },
+"2.23.42.9.13": { "d": "TenthMountain", "c": "SET vendor" },
+"2.23.42.9.14": { "d": "Antares", "c": "SET vendor" },
+"2.23.42.9.15": { "d": "ECC", "c": "SET vendor" },
+"2.23.42.9.16": { "d": "Maithean", "c": "SET vendor" },
+"2.23.42.9.17": { "d": "Netscape", "c": "SET vendor" },
+"2.23.42.9.18": { "d": "Verisign", "c": "SET vendor" },
+"2.23.42.9.19": { "d": "BlueMoney", "c": "SET vendor" },
+"2.23.42.9.20": { "d": "Lacerte", "c": "SET vendor" },
+"2.23.42.9.21": { "d": "Fujitsu", "c": "SET vendor" },
+"2.23.42.9.22": { "d": "eLab", "c": "SET vendor" },
+"2.23.42.9.23": { "d": "Entrust", "c": "SET vendor" },
+"2.23.42.9.24": { "d": "VIAnet", "c": "SET vendor" },
+"2.23.42.9.25": { "d": "III", "c": "SET vendor" },
+"2.23.42.9.26": { "d": "OpenMarket", "c": "SET vendor" },
+"2.23.42.9.27": { "d": "Lexem", "c": "SET vendor" },
+"2.23.42.9.28": { "d": "Intertrader", "c": "SET vendor" },
+"2.23.42.9.29": { "d": "Persimmon", "c": "SET vendor" },
+"2.23.42.9.30": { "d": "NABLE", "c": "SET vendor" },
+"2.23.42.9.31": { "d": "espace-net", "c": "SET vendor" },
+"2.23.42.9.32": { "d": "Hitachi", "c": "SET vendor" },
+"2.23.42.9.33": { "d": "Microsoft", "c": "SET vendor" },
+"2.23.42.9.34": { "d": "NEC", "c": "SET vendor" },
+"2.23.42.9.35": { "d": "Mitsubishi", "c": "SET vendor" },
+"2.23.42.9.36": { "d": "NCR", "c": "SET vendor" },
+"2.23.42.9.37": { "d": "e-COMM", "c": "SET vendor" },
+"2.23.42.9.38": { "d": "Gemplus", "c": "SET vendor" },
+"2.23.42.10": { "d": "national", "c": "SET" },
+"2.23.42.10.392": { "d": "Japan", "c": "SET national" },
+"2.23.43.1.4": { "d": "wTLS-ECC", "c": "WAP WTLS" },
+"2.23.43.1.4.1": { "d": "wTLS-ECC-curve1", "c": "WAP WTLS" },
+"2.23.43.1.4.6": { "d": "wTLS-ECC-curve6", "c": "WAP WTLS" },
+"2.23.43.1.4.8": { "d": "wTLS-ECC-curve8", "c": "WAP WTLS" },
+"2.23.43.1.4.9": { "d": "wTLS-ECC-curve9", "c": "WAP WTLS" },
+"2.23.133": { "d": "tCPA", "c": "TCPA" },
+"2.23.133.1": { "d": "tcpaSpecVersion", "c": "TCPA" },
+"2.23.133.2": { "d": "tcpaAttribute", "c": "TCPA" },
+"2.23.133.2.1": { "d": "tcpaTpmManufacturer", "c": "TCPA Attribute" },
+"2.23.133.2.2": { "d": "tcpaTpmModel", "c": "TCPA Attribute" },
+"2.23.133.2.3": { "d": "tcpaTpmVersion", "c": "TCPA Attribute" },
+"2.23.133.2.4": { "d": "tcpaPlatformManufacturer", "c": "TCPA Attribute" },
+"2.23.133.2.5": { "d": "tcpaPlatformModel", "c": "TCPA Attribute" },
+"2.23.133.2.6": { "d": "tcpaPlatformVersion", "c": "TCPA Attribute" },
+"2.23.133.2.7": { "d": "tcpaComponentManufacturer", "c": "TCPA Attribute" },
+"2.23.133.2.8": { "d": "tcpaComponentModel", "c": "TCPA Attribute" },
+"2.23.133.2.9": { "d": "tcpaComponentVersion", "c": "TCPA Attribute" },
+"2.23.133.2.10": { "d": "tcpaSecurityQualities", "c": "TCPA Attribute" },
+"2.23.133.2.11": { "d": "tcpaTpmProtectionProfile", "c": "TCPA Attribute" },
+"2.23.133.2.12": { "d": "tcpaTpmSecurityTarget", "c": "TCPA Attribute" },
+"2.23.133.2.13": { "d": "tcpaFoundationProtectionProfile", "c": "TCPA Attribute" },
+"2.23.133.2.14": { "d": "tcpaFoundationSecurityTarget", "c": "TCPA Attribute" },
+"2.23.133.2.15": { "d": "tcpaTpmIdLabel", "c": "TCPA Attribute" },
+"2.23.133.3": { "d": "tcpaProtocol", "c": "TCPA" },
+"2.23.133.3.1": { "d": "tcpaPrttTpmIdProtocol", "c": "TCPA Protocol" },
+"2.23.134.1.4.2.1": { "d": "postSignumRootQCA", "c": "PostSignum CA" },
+"2.23.134.1.2.2.3": { "d": "postSignumPublicCA", "c": "PostSignum CA" },
+"2.23.134.1.2.1.8.210": { "d": "postSignumCommercialServerPolicy", "c": "PostSignum CA" },
+"2.23.136.1.1.1": { "d": "mRTDSignatureData", "c": "ICAO MRTD" },
+"2.54.1775.2": { "d": "hashedRootKey", "c": "SET.  Deprecated, use (2 23 42 7 0) instead", "w": true },
+"2.54.1775.3": { "d": "certificateType", "c": "SET.  Deprecated, use (2 23 42 7 0) instead", "w": true },
+"2.54.1775.4": { "d": "merchantData", "c": "SET.  Deprecated, use (2 23 42 7 0) instead", "w": true },
+"2.54.1775.5": { "d": "cardCertRequired", "c": "SET.  Deprecated, use (2 23 42 7 0) instead", "w": true },
+"2.54.1775.6": { "d": "tunneling", "c": "SET.  Deprecated, use (2 23 42 7 0) instead", "w": true },
+"2.54.1775.7": { "d": "setQualifier", "c": "SET.  Deprecated, use (2 23 42 7 0) instead", "w": true },
+"2.54.1775.99": { "d": "setData", "c": "SET.  Deprecated, use (2 23 42 7 0) instead", "w": true },
+"1.2.40.0.17.1.22": { "d": "A-Trust EV policy", "c": "A-Trust CA Root" },
+"1.3.6.1.4.1.34697.2.1": { "d": "AffirmTrust EV policy", "c": "AffirmTrust Commercial" },
+"1.3.6.1.4.1.34697.2.2": { "d": "AffirmTrust EV policy", "c": "AffirmTrust Networking" },
+"1.3.6.1.4.1.34697.2.3": { "d": "AffirmTrust EV policy", "c": "AffirmTrust Premium" },
+"1.3.6.1.4.1.34697.2.4": { "d": "AffirmTrust EV policy", "c": "AffirmTrust Premium ECC" },
+"2.16.578.1.26.1.3.3": { "d": "BuyPass EV policy", "c": "BuyPass Class 3 EV" },
+"1.3.6.1.4.1.17326.10.14.2.1.2": { "d": "Camerfirma EV policy", "c": "Camerfirma CA Root" },
+"1.3.6.1.4.1.17326.10.8.12.1.2": { "d": "Camerfirma EV policy", "c": "Camerfirma CA Root" },
+"1.3.6.1.4.1.22234.2.5.2.3.1": { "d": "CertPlus EV policy", "c": "CertPlus Class 2 Primary CA (formerly Keynectis)" },
+"1.3.6.1.4.1.6449.1.2.1.5.1": { "d": "Comodo EV policy", "c": "COMODO Certification Authority" },
+"1.3.6.1.4.1.6334.1.100.1": { "d": "Cybertrust EV policy", "c": "Cybertrust Global Root (now Verizon Business)" },
+"1.3.6.1.4.1.4788.2.202.1": { "d": "D-TRUST EV policy", "c": "D-TRUST Root Class 3 CA 2 EV 2009" },
+"2.16.840.1.114412.2.1": { "d": "DigiCert EV policy", "c": "DigiCert High Assurance EV Root CA" },
+"2.16.528.1.1001.1.1.1.12.6.1.1.1": { "d": "DigiNotar EV policy", "c": "DigiNotar Root CA" },
+"2.16.840.1.114028.10.1.2": { "d": "Entrust EV policy", "c": "Entrust Root Certification Authority" },
+"1.3.6.1.4.1.14370.1.6": { "d": "GeoTrust EV policy", "c": "GeoTrust Primary Certification Authority (formerly Equifax)" },
+"1.3.6.1.4.1.4146.1.1": { "d": "GlobalSign EV policy", "c": "GlobalSign" },
+"2.16.840.1.114413.1.7.23.3": { "d": "GoDaddy EV policy", "c": "GoDaddy Class 2 Certification Authority (formerly ValiCert)" },
+"1.3.6.1.4.1.14777.6.1.1": { "d": "Izenpe EV policy", "c": "Certificado de Servidor Seguro SSL EV" },
+"1.3.6.1.4.1.14777.6.1.2": { "d": "Izenpe EV policy", "c": "Certificado de Sede Electronica EV" },
+"1.3.6.1.4.1.782.1.2.1.8.1": { "d": "Network Solutions EV policy", "c": "Network Solutions Certificate Authority" },
+"1.3.6.1.4.1.8024.0.2.100.1.2": { "d": "QuoVadis EV policy", "c": "QuoVadis Root CA 2" },
+"1.2.392.200091.100.721.1": { "d": "Security Communication (SECOM) EV policy", "c": "Security Communication RootCA1" },
+"2.16.840.1.114414.1.7.23.3": { "d": "Starfield EV policy", "c": "Starfield Class 2 Certification Authority" },
+"1.3.6.1.4.1.23223.1.1.1": { "d": "StartCom EV policy", "c": "StartCom Certification Authority" },
+"2.16.756.1.89.1.2.1.1": { "d": "SwissSign EV policy", "c": "SwissSign Gold CA - G2" },
+"1.3.6.1.4.1.7879.13.24.1": { "d": "T-TeleSec EV policy", "c": "T-TeleSec GlobalRoot Class 3" },
+"2.16.840.1.113733.1.7.48.1": { "d": "Thawte EV policy", "c": "Thawte Premium Server CA" },
+"2.16.840.1.114404.1.1.2.4.1": { "d": "TrustWave EV policy", "c": "TrustWave CA, formerly SecureTrust, before that XRamp" },
+"1.3.6.1.4.1.40869.1.1.22.3": { "d": "TWCA EV policy", "c": "TWCA Root Certification Authority" },
+"2.16.840.1.113733.1.7.23.6": { "d": "VeriSign EV policy", "c": "VeriSign Class 3 Public Primary Certification Authority" },
+"2.16.840.1.114171.500.9": { "d": "Wells Fargo EV policy", "c": "Wells Fargo WellsSecure Public Root Certificate Authority" },
+"END": ""
+}
\ No newline at end of file

From 9f75ce2a7ee5bb0a8a3d306ea69af512857a69cf Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Thu, 15 Nov 2018 16:38:17 +0200
Subject: [PATCH 0185/1938] added sketch for loading OID's descriptions from
 file

---
 client/crypto/asn1dump.c | 90 +++++++++++++++++++++++++++++++++-------
 client/emv/emvjson.c     | 17 ++++++++
 client/emv/emvjson.h     |  1 +
 3 files changed, 92 insertions(+), 16 deletions(-)

diff --git a/client/crypto/asn1dump.c b/client/crypto/asn1dump.c
index 4241899f6..610196563 100644
--- a/client/crypto/asn1dump.c
+++ b/client/crypto/asn1dump.c
@@ -11,10 +11,12 @@
 #include "asn1dump.h"
 #include <ctype.h>
 #include <stdlib.h>
+#include <jansson.h>
 #include <mbedtls/asn1.h>
 #include <mbedtls/oid.h>
 #include "emv/emv_tags.h"
 #include "emv/dump.h"
+#include "emv/emvjson.h"
 #include "util.h"
 
 #define PRINT_INDENT(level) 	{for (int i = 0; i < (level); i++) fprintf(f, "   ");}
@@ -214,6 +216,57 @@ static void asn1_tag_dump_integer(const struct tlv *tlv, const struct asn1_tag *
 	fprintf(f, "\tvalue: %lu\n", asn1_value_integer(tlv, 0, tlv->len * 2));
 }
 
+static char *asn1_oid_description(const char *oid, bool with_group_desc) {
+	static char res[300];
+	memset(res, 0x00, sizeof(res));
+
+/*
+		strcpy(fname, get_my_executable_directory());
+		strcat(fname, cjsonname);
+		if (access(fname, F_OK) != -1) {
+			root = json_load_file(fname, 0, &error);
+			if (!root) {
+				PrintAndLog("ERROR: json error on line %d: %s", error.line, error.text);
+				*err = true;
+				return NULL; 
+			}
+			
+*/
+
+
+	
+	json_error_t error;
+	char fname[] = "crypto/oids.json";
+	json_t *root = json_load_file(fname, 0, &error);
+	
+	if (!root || !json_is_object(root)) {
+		goto error;
+	}
+	
+	json_t *elm = json_object_get(root, oid);
+	if (!elm) {
+		goto error;
+	}
+	
+	if (JsonLoadStr(elm, "$.d", res))
+		goto error;
+
+	char strext[300] = {0};
+	if (!JsonLoadStr(elm, "$.c", strext)) {
+		strcat(res, " (");
+		strcat(res, strext);
+		strcat(res, ")");
+	}
+	
+	json_decref(root);
+	return res;
+	
+error:
+	if (root)
+		json_decref(root);
+	return NULL;
+}
+
 static void asn1_tag_dump_object_id(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level) {
 	PRINT_INDENT(level);
 	mbedtls_asn1_buf asn1_buf;
@@ -222,23 +275,28 @@ static void asn1_tag_dump_object_id(const struct tlv *tlv, const struct asn1_tag
 	char pstr[300];
 	mbedtls_oid_get_numeric_string(pstr, sizeof(pstr), &asn1_buf); 
 	fprintf(f, " %s", pstr);
-	const char *ppstr;
-	mbedtls_oid_get_attr_short_name(&asn1_buf, &ppstr); 
-	if (ppstr && strnlen(ppstr, 1)) {
-		fprintf(f, " (%s)\n", ppstr);
-		return;
-	}
-	mbedtls_oid_get_sig_alg_desc(&asn1_buf, &ppstr);
-	if (ppstr && strnlen(ppstr, 1)) {
-		fprintf(f, " (%s)\n", ppstr);
-		return;
-	}
-	mbedtls_oid_get_extended_key_usage(&asn1_buf, &ppstr);
-	if (ppstr && strnlen(ppstr, 1)) {
-		fprintf(f, " (%s)\n", ppstr);
-		return;
-	}
 	
+	char *jsondesc = asn1_oid_description(pstr, true);
+	if (jsondesc) {
+		fprintf(f, " -  %s", jsondesc);
+	} else {	
+		const char *ppstr;
+		mbedtls_oid_get_attr_short_name(&asn1_buf, &ppstr); 
+		if (ppstr && strnlen(ppstr, 1)) {
+			fprintf(f, " (%s)\n", ppstr);
+			return;
+		}
+		mbedtls_oid_get_sig_alg_desc(&asn1_buf, &ppstr);
+		if (ppstr && strnlen(ppstr, 1)) {
+			fprintf(f, " (%s)\n", ppstr);
+			return;
+		}
+		mbedtls_oid_get_extended_key_usage(&asn1_buf, &ppstr);
+		if (ppstr && strnlen(ppstr, 1)) {
+			fprintf(f, " (%s)\n", ppstr);
+			return;
+		}
+	}
 	fprintf(f, "\n");
 }
 
diff --git a/client/emv/emvjson.c b/client/emv/emvjson.c
index e56ecbb71..116e16da1 100644
--- a/client/emv/emvjson.c
+++ b/client/emv/emvjson.c
@@ -264,6 +264,23 @@ bool HexToBuffer(const char *errormsg, const char *hexvalue, uint8_t * buffer, s
 	return true;
 }
 
+int JsonLoadStr(json_t *root, char *path, char *value) {
+	if (!value)
+		return 1;
+
+	json_t *jelm = json_path_get((const json_t *)root, path);
+	if (!jelm || !json_is_string(jelm))
+		return 2;
+	
+	const char * strval = json_string_value(jelm);
+	if (!strval)
+		return 1;
+	
+	memcpy(value, strval, strlen(strval));
+	
+	return 0;
+}
+
 int JsonLoadBufAsHex(json_t *elm, char *path, uint8_t *data, size_t maxbufferlen, size_t *datalen) {
 	if (datalen)
 		*datalen = 0;
diff --git a/client/emv/emvjson.h b/client/emv/emvjson.h
index 9c6eda5ea..996b611d5 100644
--- a/client/emv/emvjson.h
+++ b/client/emv/emvjson.h
@@ -33,6 +33,7 @@ extern int JsonSaveTLVTreeElm(json_t *elm, char *path, struct tlvdb *tlvdbelm, b
 
 extern int JsonSaveTLVTree(json_t *root, json_t *elm, char *path, struct tlvdb *tlvdbelm);
 
+extern int JsonLoadStr(json_t *root, char *path, char *value);
 extern int JsonLoadBufAsHex(json_t *elm, char *path, uint8_t *data, size_t maxbufferlen, size_t *datalen);
 
 extern bool ParamLoadFromJson(struct tlvdb *tlv);

From 638890cb6a40f6f8a7cb0ed4d556455917ada405 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Thu, 15 Nov 2018 17:15:37 +0200
Subject: [PATCH 0186/1938] asn.1 description from json works

---
 client/crypto/asn1dump.c | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/client/crypto/asn1dump.c b/client/crypto/asn1dump.c
index 610196563..26d2ba737 100644
--- a/client/crypto/asn1dump.c
+++ b/client/crypto/asn1dump.c
@@ -11,6 +11,8 @@
 #include "asn1dump.h"
 #include <ctype.h>
 #include <stdlib.h>
+#include <unistd.h> 
+#include <stdio.h>
 #include <jansson.h>
 #include <mbedtls/asn1.h>
 #include <mbedtls/oid.h>
@@ -18,6 +20,7 @@
 #include "emv/dump.h"
 #include "emv/emvjson.h"
 #include "util.h"
+#include "proxmark3.h"
 
 #define PRINT_INDENT(level) 	{for (int i = 0; i < (level); i++) fprintf(f, "   ");}
 
@@ -217,26 +220,22 @@ static void asn1_tag_dump_integer(const struct tlv *tlv, const struct asn1_tag *
 }
 
 static char *asn1_oid_description(const char *oid, bool with_group_desc) {
+	json_error_t error;
+	char fname[300] = {0};
 	static char res[300];
 	memset(res, 0x00, sizeof(res));
 
-/*
+	strcpy(fname, get_my_executable_directory());
+	strcat(fname, "crypto/oids.json");
+	if (access(fname, F_OK) < 0) {
 		strcpy(fname, get_my_executable_directory());
-		strcat(fname, cjsonname);
-		if (access(fname, F_OK) != -1) {
-			root = json_load_file(fname, 0, &error);
-			if (!root) {
-				PrintAndLog("ERROR: json error on line %d: %s", error.line, error.text);
-				*err = true;
-				return NULL; 
-			}
-			
-*/
-
-
+		strcat(fname, "oids.json");
+		if (access(fname, F_OK) < 0) {
+			goto error; // file not found
+		}
+	}
 	
-	json_error_t error;
-	char fname[] = "crypto/oids.json";
+	// load `oids.json`
 	json_t *root = json_load_file(fname, 0, &error);
 	
 	if (!root || !json_is_object(root)) {

From 164b64a61166728fa08d479c6abf4aa85910a42b Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Thu, 15 Nov 2018 17:42:41 +0200
Subject: [PATCH 0187/1938] add some OIDs from Yubikey

---
 client/crypto/oids.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/client/crypto/oids.json b/client/crypto/oids.json
index 9f65fb34b..75d963d3f 100644
--- a/client/crypto/oids.json
+++ b/client/crypto/oids.json
@@ -1,6 +1,12 @@
 {
 "copyright": "https://www.cs.auckland.ac.nz/~pgut001/dumpasn1.cfg",
 
+"1.3.6.1.4.1.41482": { "d": "Yubico", "c": "FIDO Alliance" },
+"1.3.6.1.4.1.45724": { "d": "FIDO Alliance, Inc.", "c": "FIDO Alliance" },
+"1.3.6.1.4.1.41482.2": { "d": "Device ID", "c": "Yubico" },
+"1.3.6.1.4.1.45724.2.1.1": { "d": "FIDO U2F Transports", "c": "FIDO Alliance" },
+"1.3.6.1.4.1.45724.1.1.4": { "d": "Authenticator Attestation GUID", "c": "FIDO Alliance" },
+
 "0.2.262.1.10": { "d": "Telesec", "c": "Deutsche Telekom" },
 "0.2.262.1.10.0": { "d": "extension", "c": "Telesec" },
 "0.2.262.1.10.1": { "d": "mechanism", "c": "Telesec" },

From 736840cce776f05fb9402dad94ecf805fe1c7f02 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Thu, 15 Nov 2018 18:14:45 +0200
Subject: [PATCH 0188/1938] fix integer representation

---
 client/crypto/asn1dump.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/client/crypto/asn1dump.c b/client/crypto/asn1dump.c
index 26d2ba737..60799fc8c 100644
--- a/client/crypto/asn1dump.c
+++ b/client/crypto/asn1dump.c
@@ -216,11 +216,19 @@ static void asn1_tag_dump_boolean(const struct tlv *tlv, const struct asn1_tag *
 
 static void asn1_tag_dump_integer(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level) {
 	PRINT_INDENT(level);
+	if (tlv->len == 4) {
+		int32_t val = 0;
+		for (int i = 0; i < tlv->len; i++)
+			val = (val << 8) + tlv->value[i];
+		fprintf(f, "\tvalue4b: %d\n", val);
+		return;
+	}
 	fprintf(f, "\tvalue: %lu\n", asn1_value_integer(tlv, 0, tlv->len * 2));
 }
 
 static char *asn1_oid_description(const char *oid, bool with_group_desc) {
 	json_error_t error;
+	json_t *root = NULL;
 	char fname[300] = {0};
 	static char res[300];
 	memset(res, 0x00, sizeof(res));
@@ -236,7 +244,7 @@ static char *asn1_oid_description(const char *oid, bool with_group_desc) {
 	}
 	
 	// load `oids.json`
-	json_t *root = json_load_file(fname, 0, &error);
+	root = json_load_file(fname, 0, &error);
 	
 	if (!root || !json_is_object(root)) {
 		goto error;

From da6e2ea7c1fe08c9cf2738f227b2078d02945852 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Thu, 15 Nov 2018 18:20:37 +0200
Subject: [PATCH 0189/1938] added to `hf fido reg` option `-t` to show DER
 certificate in TLV

---
 client/cmdhffido.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index 5151709af..d0ca4322a 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -209,6 +209,7 @@ int CmdHFFidoRegister(const char *cmd) {
 		arg_lit0("aA",  "apdu",     "show APDU reqests and responses"),
 		arg_litn("vV",  "verbose",  0, 2, "show technical data. vv - show full certificates data"),
 		arg_lit0("pP",  "plain",    "send plain ASCII to challenge and application parameters instead of HEX"),
+		arg_lit0("tT",  "tlv",      "Show DER certificate contents in TLV representation"),
 		arg_str0("jJ",  "json",		"fido.json", "JSON input / output file name for parameters."),
 		arg_str0(NULL,  NULL,       "<HEX/ASCII challenge parameter (32b HEX/1..16 chars)>", NULL),
 		arg_str0(NULL,  NULL,       "<HEX/ASCII application parameter (32b HEX/1..16 chars)>", NULL),
@@ -220,10 +221,11 @@ int CmdHFFidoRegister(const char *cmd) {
 	bool verbose = arg_get_lit(2);
 	bool verbose2 = arg_get_lit(2) > 1;
 	bool paramsPlain = arg_get_lit(3);
+	bool showDERTLV = arg_get_lit(4);
 
 	char fname[250] = {0};
 	bool err;
-	root = OpenJson(4, fname, argtable, &err);
+	root = OpenJson(5, fname, argtable, &err);
 	if(err)
 		return 1;
 	if (root) {	
@@ -234,13 +236,13 @@ int CmdHFFidoRegister(const char *cmd) {
 	
 	if (paramsPlain) {
 		memset(cdata, 0x00, 32);
-		CLIGetStrWithReturn(5, cdata, &chlen);
+		CLIGetStrWithReturn(6, cdata, &chlen);
 		if (chlen && chlen > 16) {
 			PrintAndLog("ERROR: challenge parameter length in ASCII mode must be less than 16 chars instead of: %d", chlen);
 			return 1;
 		}
 	} else {
-		CLIGetHexWithReturn(5, cdata, &chlen);
+		CLIGetHexWithReturn(6, cdata, &chlen);
 		if (chlen && chlen != 32) {
 			PrintAndLog("ERROR: challenge parameter length must be 32 bytes only.");
 			return 1;
@@ -252,13 +254,13 @@ int CmdHFFidoRegister(const char *cmd) {
 	
 	if (paramsPlain) {
 		memset(adata, 0x00, 32);
-		CLIGetStrWithReturn(6, adata, &applen);
+		CLIGetStrWithReturn(7, adata, &applen);
 		if (applen && applen > 16) {
 			PrintAndLog("ERROR: application parameter length in ASCII mode must be less than 16 chars instead of: %d", applen);
 			return 1;
 		}
 	} else {
-		CLIGetHexWithReturn(6, adata, &applen);
+		CLIGetHexWithReturn(7, adata, &applen);
 		if (applen && applen != 32) {
 			PrintAndLog("ERROR: application parameter length must be 32 bytes only.");
 			return 1;
@@ -340,9 +342,11 @@ int CmdHFFidoRegister(const char *cmd) {
 	uint8_t public_key[65] = {0};
 	
 	// TODO: print DER certificate in DER view
-	PrintAndLog("----------------DER TLV-----------------");
-	asn1_print(&buf[derp], derLen, "  ");
-	PrintAndLog("----------------DER TLV-----------------");
+	if (showDERTLV) {
+		PrintAndLog("----------------DER TLV-----------------");
+		asn1_print(&buf[derp], derLen, "  ");
+		PrintAndLog("----------------DER TLV-----------------");
+	}
 	
 	// load CA's
 	mbedtls_x509_crt cacert;

From f4c21da26b10a98b2096ef32d13e22a90986d87e Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Thu, 15 Nov 2018 18:35:13 +0200
Subject: [PATCH 0190/1938] small fix

---
 client/cmdhffido.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index d0ca4322a..039384ba0 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -341,7 +341,7 @@ int CmdHFFidoRegister(const char *cmd) {
 	// check and print DER certificate
 	uint8_t public_key[65] = {0};
 	
-	// TODO: print DER certificate in DER view
+	// print DER certificate in DER view
 	if (showDERTLV) {
 		PrintAndLog("----------------DER TLV-----------------");
 		asn1_print(&buf[derp], derLen, "  ");

From 89e2f391ca20e7e41941e631d95b03e0f71f0a8f Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Thu, 15 Nov 2018 18:42:22 +0200
Subject: [PATCH 0191/1938] small fix

---
 client/cmdhffido.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index 039384ba0..e2d6c0917 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -341,7 +341,7 @@ int CmdHFFidoRegister(const char *cmd) {
 	// check and print DER certificate
 	uint8_t public_key[65] = {0};
 	
-	// print DER certificate in DER view
+	// print DER certificate in TLV view
 	if (showDERTLV) {
 		PrintAndLog("----------------DER TLV-----------------");
 		asn1_print(&buf[derp], derLen, "  ");

From fd1c0cac79c7aa9052ffbe28e23bb170fa2897e5 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Fri, 16 Nov 2018 02:52:42 +0100
Subject: [PATCH 0192/1938] FIX: 'standalone mode MattyRun' - compiles and
 should even work CHG: 'standalone mode' - generic banner for each mode.
 Updated the ledshow to @cjbrigato

---
 armsrc/Makefile                  |   4 +-
 armsrc/Standalone/hf_bog.c       |  10 +-
 armsrc/Standalone/hf_colin.c     |  10 +-
 armsrc/Standalone/hf_mattyrun.c  | 217 ++++++++++++++++++++++++++-----
 armsrc/Standalone/hf_mattyrun.h  |   1 +
 armsrc/Standalone/hf_young.c     |   1 +
 armsrc/Standalone/lf_hidbrute.c  |   1 +
 armsrc/Standalone/lf_proxbrute.c |   1 +
 armsrc/Standalone/lf_samyrun.c   |   1 +
 armsrc/appmain.c                 |  21 ++-
 10 files changed, 210 insertions(+), 57 deletions(-)

diff --git a/armsrc/Makefile b/armsrc/Makefile
index a2092ac0b..b69e724e0 100644
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -23,9 +23,9 @@ APP_CFLAGS = -DWITH_CRC \
 			 -DWITH_FELICA \
 			 -DWITH_FLASH \
 			 -DWITH_SMARTCARD \
+			 -DWITH_FPC \
 			 -DWITH_HFSNOOP \
 			 -DWITH_LF_SAMYRUN \
-			 -DWITH_FPC \
 			 -fno-strict-aliasing -ffunction-sections -fdata-sections
 
 ### IMPORTANT -  move the commented variable below this line
@@ -39,7 +39,7 @@ APP_CFLAGS = -DWITH_CRC \
 #			 -DWITH_LF_PROXBRUTE
 #			 -DWITH_LF_HIDBRUTE
 #			 -DWITH_HF_YOUNG
-#			 -DWITH_HF_MATTYRUN
+#			 -DWITH_HF_MATTYRUN -
 #			 -DWITH_HF_COLIN
 #			 -DWITH_HF_BOG
 
diff --git a/armsrc/Standalone/hf_bog.c b/armsrc/Standalone/hf_bog.c
index 1cf9a7c51..9079d5df3 100644
--- a/armsrc/Standalone/hf_bog.c
+++ b/armsrc/Standalone/hf_bog.c
@@ -280,16 +280,11 @@ void RAMFUNC SniffAndStore(uint8_t param) {
 
 void RunMod() {
 	
+	StandAloneMode();
+	
 	Dbprintf(">>  Bogiton 14a Sniff UL/UL-EV1/NTAG a.k.a BogitoRun Started  <<");
 	Dbprintf("Starting to sniff");
 	
-	SpinDown(50);
-    SpinOff(50);
-    SpinUp(50);
-    SpinOff(50);
-    SpinDown(50);
-	SpinDelay(500);
-	
 	// param:
 	// bit 0 - trigger from first card answer
 	// bit 1 - trigger from first reader 7-bit request	
@@ -297,4 +292,5 @@ void RunMod() {
 	LEDsoff();	
 	SpinDelay(300);
 	Dbprintf("- [ End ] -> You can take shell back ...");
+	Dbprintf("- [  !  ] -> use 'script run read_pwd_mem' to print passwords");	
 }
diff --git a/armsrc/Standalone/hf_colin.c b/armsrc/Standalone/hf_colin.c
index 31519080a..2eabd68d9 100644
--- a/armsrc/Standalone/hf_colin.c
+++ b/armsrc/Standalone/hf_colin.c
@@ -210,12 +210,14 @@ void WriteTagToFlash(uint8_t index, size_t size)
 
 void RunMod()
 {
+	StandAloneMode();
+    FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
+	
     currline = 20;
     curlline = 20;
     currfline = 24;
     memset(cjuid, 0, sizeof(cjuid));
     cjcuid = 0;
-    FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
     uint8_t sectorsCnt = (MF1KSZ / MF1KSZSIZE);
     uint64_t key64;           // Defines current key
     uint8_t *keyBlock = NULL; // Where the keys will be held in memory.
@@ -348,12 +350,6 @@ ACCBITS : 796788[00]+VALUE
     currfline = 24;
     cjSetCursLeft();
 
-    SpinDown(50);
-    SpinOff(50);
-    SpinUp(50);
-    SpinOff(50);
-    SpinDown(50);
-
 failtag:
 
     vtsend_cursor_position_save(NULL);
diff --git a/armsrc/Standalone/hf_mattyrun.c b/armsrc/Standalone/hf_mattyrun.c
index e83d13a1d..78f197383 100644
--- a/armsrc/Standalone/hf_mattyrun.c
+++ b/armsrc/Standalone/hf_mattyrun.c
@@ -35,8 +35,189 @@ on a blank card.
 
 #include "hf_mattyrun.h"
 
+uint8_t uid[10];
+uint32_t cuid;
+
+//-----------------------------------------------------------------------------
+// Matt's StandAlone mod.
+// Work with "magic Chinese" card (email him: ouyangweidaxian@live.cn)
+//-----------------------------------------------------------------------------
+static int saMifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)
+{
+    // params
+    uint8_t needWipe = arg0;
+    // bit 0 - need get UID
+    // bit 1 - need wupC
+    // bit 2 - need HALT after sequence
+    // bit 3 - need init FPGA and field before sequence
+    // bit 4 - need reset FPGA and LED
+    uint8_t workFlags = arg1;
+    uint8_t blockNo = arg2;
+
+    // card commands
+    uint8_t wupC1[] = {0x40};
+    uint8_t wupC2[] = {0x43};
+    uint8_t wipeC[] = {0x41};
+
+    // variables
+    byte_t isOK = 0;
+    uint8_t d_block[18] = {0x00};
+
+    uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];
+    uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];
+
+    // reset FPGA and LED
+    if (workFlags & 0x08)
+    {
+        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+        set_tracing(false);
+    }
+
+    while (true)
+    {
+        // get UID from chip
+        if (workFlags & 0x01)
+        {
+            if (!iso14443a_select_card(uid, NULL, &cuid, true, 0, true))
+            {
+                DbprintfEx(FLAG_NOLOG, "Can't select card");
+                break;
+            };
+
+            if (mifare_classic_halt(NULL, cuid))
+            {
+                DbprintfEx(FLAG_NOLOG, "Halt error");
+                break;
+            };
+        };
+
+        // reset chip
+        if (needWipe)
+        {
+            ReaderTransmitBitsPar(wupC1, 7, 0, NULL);
+            if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a))
+            {
+                DbprintfEx(FLAG_NOLOG, "wupC1 error");
+                break;
+            };
+
+            ReaderTransmit(wipeC, sizeof(wipeC), NULL);
+            if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a))
+            {
+                DbprintfEx(FLAG_NOLOG, "wipeC error");
+                break;
+            };
+
+            if (mifare_classic_halt(NULL, cuid))
+            {
+                DbprintfEx(FLAG_NOLOG, "Halt error");
+                break;
+            };
+        };
+
+        // chaud
+        // write block
+        if (workFlags & 0x02)
+        {
+            ReaderTransmitBitsPar(wupC1, 7, 0, NULL);
+            if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a))
+            {
+                DbprintfEx(FLAG_NOLOG, "wupC1 error");
+                break;
+            };
+
+            ReaderTransmit(wupC2, sizeof(wupC2), NULL);
+            if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a))
+            {
+                DbprintfEx(FLAG_NOLOG, "wupC2 errorv");
+                break;
+            };
+        }
+
+        if ((mifare_sendcmd_short(NULL, 0, 0xA0, blockNo, receivedAnswer, receivedAnswerPar, NULL) != 1) || (receivedAnswer[0] != 0x0a))
+        {
+            DbprintfEx(FLAG_NOLOG, "write block send command error");
+            break;
+        };
+
+        memcpy(d_block, datain, 16);
+        AddCrc14A(d_block, 16);
+        ReaderTransmit(d_block, sizeof(d_block), NULL);
+        if ((ReaderReceive(receivedAnswer, receivedAnswerPar) != 1) || (receivedAnswer[0] != 0x0a))
+        {
+            DbprintfEx(FLAG_NOLOG, "write block send data error");
+            break;
+        };
+
+        if (workFlags & 0x04)
+        {
+            if (mifare_classic_halt(NULL, cuid))
+            {
+                DbprintfEx(FLAG_NOLOG, "Halt error");
+                break;
+            };
+        }
+
+        isOK = 1;
+        break;
+    }
+
+    if ((workFlags & 0x10) || (!isOK))
+    {
+        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    }
+
+    return isOK;
+}
+
+/* the chk function is a piwi’ed(tm) check that will try all keys for
+a particular sector. also no tracing no dbg */
+static int saMifareChkKeys(uint8_t blockNo, uint8_t keyType, bool clearTrace, uint8_t keyCount, uint8_t *datain, uint64_t *key)
+{
+    MF_DBGLEVEL = MF_DBG_NONE;
+    iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+    set_tracing(false);
+
+    struct Crypto1State mpcs = {0, 0};
+    struct Crypto1State *pcs;
+    pcs = &mpcs;
+
+    for (int i = 0; i < keyCount; ++i)
+    {
+
+        /* no need for anticollision. just verify tag is still here */
+        // if (!iso14443a_fast_select_card(cjuid, 0)) {
+        if (!iso14443a_select_card(uid, NULL, &cuid, true, 0, true))
+        {
+            DbprintfEx(FLAG_NOLOG, "FATAL : E_MF_LOSTTAG");
+            return -1;
+        }
+
+        uint64_t ui64Key = bytes_to_num(datain + i * 6, 6);
+        if (mifare_classic_auth(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST))
+        {
+            uint8_t dummy_answer = 0;
+            ReaderTransmit(&dummy_answer, 1, NULL);
+            // wait for the card to become ready again
+            SpinDelayUs(AUTHENTICATION_TIMEOUT);
+            continue;
+        }
+        crypto1_destroy(pcs);
+        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+        *key = ui64Key;
+        return i;
+    }
+    crypto1_destroy(pcs);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+
+    return -1;
+}
+
+
 void RunMod() {
 	StandAloneMode();
+	Dbprintf(">>  Matty mifare chk/dump/sim  a.k.a MattyRun Started  <<");
+    FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
 	
 	/*
 		It will check if the keys from the attacked tag are a subset from
@@ -51,15 +232,13 @@ void RunMod() {
 		If you're using the proxmark connected to a device that has an OS, and you're not using the proxmark3 client to see the debug
 		messages, you MUST uncomment usb_disable().
 	*/
-
-    FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-    // usb_disable(); // Comment this line if you want to see debug messages.
-
+	
+	// Comment this line below if you want to see debug messages.
+    // usb_disable(); 
 
     /*
 		Pseudo-configuration block.
     */
-	char keyTypec = '?'; 			// 'A'/'B' or both keys '?'
 	bool printKeys = false; 		// Prints keys
 	bool transferToEml = true; 		// Transfer keys to emulator memory
 	bool ecfill = true; 			// Fill emulator memory with cards content.
@@ -71,7 +250,7 @@ void RunMod() {
 	uint8_t sectorSize = 64; 		// 1k's sector size is 64 bytes.
 	uint8_t blockNo = 3; 			// Security block is number 3 for each sector.
 	uint8_t sectorsCnt = (mifare_size/sectorSize);
-	uint8_t keyType; 				// Keytype buffer
+	uint8_t keyType = 2; 			// Keytype buffer
 	uint64_t key64; 				// Defines current key
 	uint8_t *keyBlock = NULL; 		// Where the keys will be held in memory.
 	uint8_t stKeyBlock = 20; 		// Set the quantity of keys in the block.
@@ -108,24 +287,6 @@ void RunMod() {
 		num_to_bytes(mfKeys[mfKeyCounter], 6, (uint8_t*)(keyBlock + mfKeyCounter * 6));
 	}
 
-	/*
-		Simple switch just to handle keytpes.
-	*/
-	switch (keyTypec) {
-	case 'a': case 'A':
-		keyType = !0;
-		break;
-	case 'b': case 'B':
-		keyType = !1;
-		break;
-	case '?':
-		keyType = 2;
-		break;
-	default:
-		Dbprintf("[!] Key type must be A , B or ?");
-		keyType = 2;
-	}
-
 	/*
 		Pretty print of the keys to be checked.
 	*/
@@ -191,16 +352,14 @@ void RunMod() {
 	}
 
 	/*
-		TODO: This.
-
-		- If at least one key was found, start a nested attack based on that key, and continue.
-		
+		TODO: 
 		- Get UID from tag and set accordingly in emulator memory and call mifare1ksim with right flags (iceman)
 	*/
 	if (!allKeysFound && keyFound) {
 		Dbprintf("\t✕ There's currently no nested attack in MattyRun, sorry!");
 		LED_C_ON(); //red
 		LED_A_ON(); //yellow
+		// no room to run nested attack on device (iceman)
 		// Do nested attack, set allKeysFound = true;
 		// allKeysFound = true;
 	} else {
@@ -250,7 +409,7 @@ void RunMod() {
 				
 				LED_B_ON(); // green
 				// assuming arg0==0,  use hardcoded uid 0xdeadbeaf
-				Mifare1ksim( 0, 0, 0, NULL);
+				Mifare1ksim( FLAG_4B_UID_IN_DATA | FLAG_UID_IN_EMUL, 0, 0, uid);
 				LED_B_OFF();
 
 				/*
diff --git a/armsrc/Standalone/hf_mattyrun.h b/armsrc/Standalone/hf_mattyrun.h
index 508954998..9bf2166ab 100644
--- a/armsrc/Standalone/hf_mattyrun.h
+++ b/armsrc/Standalone/hf_mattyrun.h
@@ -16,6 +16,7 @@
 #include "standalone.h" // standalone definitions
 #include "apps.h" 		// debugstatements, lfops?
 #include "usb_cmd.h"	// mifare1ksim flags
+#include "mifareutil.h"
 
 #define OPTS 2
 
diff --git a/armsrc/Standalone/hf_young.c b/armsrc/Standalone/hf_young.c
index ef41bc64d..f4bc3db4f 100644
--- a/armsrc/Standalone/hf_young.c
+++ b/armsrc/Standalone/hf_young.c
@@ -20,6 +20,7 @@ typedef struct {
 
 void RunMod() {
 	StandAloneMode();
+	Dbprintf(">>  Craig Young Mifare sniff UID/clone uid 2 magic/sim  a.k.a YoungRun Started  <<");
 	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
 
 	int selected = 0, playing = 0, iGotoRecord = 0, iGotoClone = 0;
diff --git a/armsrc/Standalone/lf_hidbrute.c b/armsrc/Standalone/lf_hidbrute.c
index 7ec3aba28..8c6b85f4f 100644
--- a/armsrc/Standalone/lf_hidbrute.c
+++ b/armsrc/Standalone/lf_hidbrute.c
@@ -29,6 +29,7 @@
 // samy's sniff and repeat routine for LF
 void RunMod() {
 	StandAloneMode();
+	Dbprintf(">>  LF HID corporate bruteforce a.k.a CorporateBrute Started  <<");	
 	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
 
 	uint32_t high[OPTS], low[OPTS];
diff --git a/armsrc/Standalone/lf_proxbrute.c b/armsrc/Standalone/lf_proxbrute.c
index e0c998d31..69b5f5331 100644
--- a/armsrc/Standalone/lf_proxbrute.c
+++ b/armsrc/Standalone/lf_proxbrute.c
@@ -14,6 +14,7 @@
 // samy's sniff and repeat routine for LF
 void RunMod() {
 	StandAloneMode();
+	Dbprintf(">>  LF HID proxII bruteforce a.k.a ProxBrute Started (Brad Antoniewicz) <<");		
 	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
 
 	uint32_t high[OPTS], low[OPTS];
diff --git a/armsrc/Standalone/lf_samyrun.c b/armsrc/Standalone/lf_samyrun.c
index 88b6e9b15..c94d5fc42 100644
--- a/armsrc/Standalone/lf_samyrun.c
+++ b/armsrc/Standalone/lf_samyrun.c
@@ -13,6 +13,7 @@
 // samy's sniff and repeat routine for LF
 void RunMod() {
 	StandAloneMode();
+	Dbprintf(">>  LF HID Read/Clone/Sim a.k.a SamyRun Started  <<");		
 	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
 
 	uint32_t high[OPTS], low[OPTS];
diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 2a3ae823a..a3b330e84 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -415,22 +415,19 @@ void SendStatus(void) {
 void StandAloneMode(void) {
 	
 	DbpString("Stand-alone mode! No PC necessary.");
-	// Oooh pretty -- notify user we're in elite samy mode now
-	LED(LED_RED,	200);
-	LED(LED_ORANGE, 200);
-	LED(LED_GREEN,	200);
-	LED(LED_ORANGE, 200);
-	LED(LED_RED,	200);
-	LED(LED_ORANGE, 200);
-	LED(LED_GREEN,	200);
-	LED(LED_ORANGE, 200);
-	LED(LED_RED,	200);
+	
+	SpinDown(50);
+    SpinOff(50);
+    SpinUp(50);
+    SpinOff(50);
+    SpinDown(50);
+	SpinDelay(500);
 }
 // detection of which Standalone Modes is installed
 // (iceman)
 void printStandAloneModes(void) {
 
-	DbpString("Installed StandAlone Mods");
+	DbpString("Installed StandAlone Mode");
 	
 #if defined(WITH_LF_ICERUN)
 	DbpString("   LF sniff/clone/simulation -  aka IceRun (iceman)");
@@ -445,7 +442,7 @@ void printStandAloneModes(void) {
 	DbpString("   LF HID ProxII bruteforce - aka Proxbrute (Brad Antoniewicz)");
 #endif 
 #if defined(WITH_LF_HIDBRUTE)
-	DbpString("   LF HID corporate 1000 bruteforce - (Federico dotta & Maurizio Agazzini)");
+	DbpString("   LF HID corporate 1000 bruteforce - aka Corporatebrute (Federico dotta & Maurizio Agazzini)");
 #endif 
 #if defined(WITH_HF_MATTYRUN)
 	DbpString("   HF Mifare sniff/clone - aka MattyRun (Matías A. Ré Medina)");

From f8c0ec53bd0a9b8782e6532c7fdc218fbb9d109f Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Fri, 16 Nov 2018 17:05:48 +0200
Subject: [PATCH 0193/1938] added tinycbor

---
 client/tinycbor/Makefile                      |   46 +
 client/tinycbor/cbor.h                        |  606 +++++++
 client/tinycbor/cborencoder.c                 |  645 ++++++++
 .../cborencoder_close_container_checked.c     |   57 +
 client/tinycbor/cborerrorstrings.c            |  182 +++
 client/tinycbor/cborinternal_p.h              |  161 ++
 client/tinycbor/cborjson.h                    |   62 +
 client/tinycbor/cborparser.c                  | 1430 +++++++++++++++++
 client/tinycbor/cborparser_dup_string.c       |  119 ++
 client/tinycbor/cborpretty.c                  |  578 +++++++
 client/tinycbor/cborpretty_stdio.c            |   87 +
 client/tinycbor/cbortojson.c                  |  699 ++++++++
 client/tinycbor/cborvalidation.c              |  666 ++++++++
 client/tinycbor/compilersupport_p.h           |  205 +++
 client/tinycbor/open_memstream.c              |  114 ++
 client/tinycbor/tinycbor-version.h            |    3 +
 client/tinycbor/utf8_p.h                      |  104 ++
 17 files changed, 5764 insertions(+)
 create mode 100644 client/tinycbor/Makefile
 create mode 100644 client/tinycbor/cbor.h
 create mode 100644 client/tinycbor/cborencoder.c
 create mode 100644 client/tinycbor/cborencoder_close_container_checked.c
 create mode 100644 client/tinycbor/cborerrorstrings.c
 create mode 100644 client/tinycbor/cborinternal_p.h
 create mode 100644 client/tinycbor/cborjson.h
 create mode 100644 client/tinycbor/cborparser.c
 create mode 100644 client/tinycbor/cborparser_dup_string.c
 create mode 100644 client/tinycbor/cborpretty.c
 create mode 100644 client/tinycbor/cborpretty_stdio.c
 create mode 100644 client/tinycbor/cbortojson.c
 create mode 100644 client/tinycbor/cborvalidation.c
 create mode 100644 client/tinycbor/compilersupport_p.h
 create mode 100644 client/tinycbor/open_memstream.c
 create mode 100644 client/tinycbor/tinycbor-version.h
 create mode 100644 client/tinycbor/utf8_p.h

diff --git a/client/tinycbor/Makefile b/client/tinycbor/Makefile
new file mode 100644
index 000000000..31fb327cb
--- /dev/null
+++ b/client/tinycbor/Makefile
@@ -0,0 +1,46 @@
+
+LIB_A = tinycbor.a
+tinycbor_SOURCES = \
+    cborencoder.c \
+    cborencoder_close_container_checked.c \
+    cborerrorstrings.c \
+    cborparser.c \
+    cborparser_dup_string.c \
+    cborpretty.c \
+    cbortojson.c \
+    cborvalidation.c \
+	
+CFILES = $(filter %.c, $(tinycbor_SOURCES))
+CMDOBJS = $(CFILES:%.c=%.o)
+CLEAN = $(CMDOBJS)
+	
+CC= gcc
+CFLAGS= -O2 -Wall -Wno-unused-variable -Wno-unused-function
+LIBS= -lm $(SYSLIBS) $(MYLIBS)
+DEFAULT_INCLUDES = -I. -I..
+DEFS = -DHAVE_STDINT_H
+
+AR= ar rcs
+RANLIB= ranlib
+RM= rm -f
+TST= echo
+
+SYSLDFLAGS=
+SYSLIBS=
+
+MYLIBS=
+MYOBJS=
+
+all: $(CMDOBJS)
+	$(AR) $(LIB_A) $(CMDOBJS)
+	$(RANLIB) $(LIB_A)
+	
+clean:
+	$(RM) $(CLEAN)
+	$(RM) $(LIB_A)
+	
+%.o: %.c
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(CFLAGS) -c -o $@ $< $(LIBS)
+	
+.PHONY: all clean
+
diff --git a/client/tinycbor/cbor.h b/client/tinycbor/cbor.h
new file mode 100644
index 000000000..fd145be2e
--- /dev/null
+++ b/client/tinycbor/cbor.h
@@ -0,0 +1,606 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 Intel Corporation
+**
+** Permission is hereby granted, free of charge, to any person obtaining a copy
+** of this software and associated documentation files (the "Software"), to deal
+** in the Software without restriction, including without limitation the rights
+** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+** copies of the Software, and to permit persons to whom the Software is
+** furnished to do so, subject to the following conditions:
+**
+** The above copyright notice and this permission notice shall be included in
+** all copies or substantial portions of the Software.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+** OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+** THE SOFTWARE.
+**
+****************************************************************************/
+
+#ifndef CBOR_H
+#define CBOR_H
+
+#ifndef assert
+#include <assert.h>
+#endif
+#include <limits.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdio.h>
+
+#include "tinycbor-version.h"
+
+#define TINYCBOR_VERSION            ((TINYCBOR_VERSION_MAJOR << 16) | (TINYCBOR_VERSION_MINOR << 8) | TINYCBOR_VERSION_PATCH)
+
+#ifdef __cplusplus
+extern "C" {
+#else
+#include <stdbool.h>
+#endif
+
+#ifndef SIZE_MAX
+/* Some systems fail to define SIZE_MAX in <stdint.h>, even though C99 requires it...
+ * Conversion from signed to unsigned is defined in 6.3.1.3 (Signed and unsigned integers) p2,
+ * which says: "the value is converted by repeatedly adding or subtracting one more than the
+ * maximum value that can be represented in the new type until the value is in the range of the
+ * new type."
+ * So -1 gets converted to size_t by adding SIZE_MAX + 1, which results in SIZE_MAX.
+ */
+#  define SIZE_MAX ((size_t)-1)
+#endif
+
+#ifndef CBOR_API
+#  define CBOR_API
+#endif
+#ifndef CBOR_PRIVATE_API
+#  define CBOR_PRIVATE_API
+#endif
+#ifndef CBOR_INLINE_API
+#  if defined(__cplusplus)
+#    define CBOR_INLINE inline
+#    define CBOR_INLINE_API inline
+#  else
+#    define CBOR_INLINE_API static CBOR_INLINE
+#    if defined(_MSC_VER)
+#      define CBOR_INLINE __inline
+#    elif defined(__GNUC__)
+#      define CBOR_INLINE __inline__
+#    elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+#      define CBOR_INLINE inline
+#    else
+#      define CBOR_INLINE
+#    endif
+#  endif
+#endif
+
+typedef enum CborType {
+    CborIntegerType     = 0x00,
+    CborByteStringType  = 0x40,
+    CborTextStringType  = 0x60,
+    CborArrayType       = 0x80,
+    CborMapType         = 0xa0,
+    CborTagType         = 0xc0,
+    CborSimpleType      = 0xe0,
+    CborBooleanType     = 0xf5,
+    CborNullType        = 0xf6,
+    CborUndefinedType   = 0xf7,
+    CborHalfFloatType   = 0xf9,
+    CborFloatType       = 0xfa,
+    CborDoubleType      = 0xfb,
+
+    CborInvalidType     = 0xff              /* equivalent to the break byte, so it will never be used */
+} CborType;
+
+typedef uint64_t CborTag;
+typedef enum CborKnownTags {
+    CborDateTimeStringTag          = 0,
+    CborUnixTime_tTag              = 1,
+    CborPositiveBignumTag          = 2,
+    CborNegativeBignumTag          = 3,
+    CborDecimalTag                 = 4,
+    CborBigfloatTag                = 5,
+    CborCOSE_Encrypt0Tag           = 16,
+    CborCOSE_Mac0Tag               = 17,
+    CborCOSE_Sign1Tag              = 18,
+    CborExpectedBase64urlTag       = 21,
+    CborExpectedBase64Tag          = 22,
+    CborExpectedBase16Tag          = 23,
+    CborEncodedCborTag             = 24,
+    CborUrlTag                     = 32,
+    CborBase64urlTag               = 33,
+    CborBase64Tag                  = 34,
+    CborRegularExpressionTag       = 35,
+    CborMimeMessageTag             = 36,
+    CborCOSE_EncryptTag            = 96,
+    CborCOSE_MacTag                = 97,
+    CborCOSE_SignTag               = 98,
+    CborSignatureTag               = 55799
+} CborKnownTags;
+
+/* #define the constants so we can check with #ifdef */
+#define CborDateTimeStringTag CborDateTimeStringTag
+#define CborUnixTime_tTag CborUnixTime_tTag
+#define CborPositiveBignumTag CborPositiveBignumTag
+#define CborNegativeBignumTag CborNegativeBignumTag
+#define CborDecimalTag CborDecimalTag
+#define CborBigfloatTag CborBigfloatTag
+#define CborCOSE_Encrypt0Tag CborCOSE_Encrypt0Tag
+#define CborCOSE_Mac0Tag CborCOSE_Mac0Tag
+#define CborCOSE_Sign1Tag CborCOSE_Sign1Tag
+#define CborExpectedBase64urlTag CborExpectedBase64urlTag
+#define CborExpectedBase64Tag CborExpectedBase64Tag
+#define CborExpectedBase16Tag CborExpectedBase16Tag
+#define CborEncodedCborTag CborEncodedCborTag
+#define CborUrlTag CborUrlTag
+#define CborBase64urlTag CborBase64urlTag
+#define CborBase64Tag CborBase64Tag
+#define CborRegularExpressionTag CborRegularExpressionTag
+#define CborMimeMessageTag CborMimeMessageTag
+#define CborCOSE_EncryptTag CborCOSE_EncryptTag
+#define CborCOSE_MacTag CborCOSE_MacTag
+#define CborCOSE_SignTag CborCOSE_SignTag
+#define CborSignatureTag CborSignatureTag
+
+/* Error API */
+
+typedef enum CborError {
+    CborNoError = 0,
+
+    /* errors in all modes */
+    CborUnknownError,
+    CborErrorUnknownLength,         /* request for length in array, map, or string with indeterminate length */
+    CborErrorAdvancePastEOF,
+    CborErrorIO,
+
+    /* parser errors streaming errors */
+    CborErrorGarbageAtEnd = 256,
+    CborErrorUnexpectedEOF,
+    CborErrorUnexpectedBreak,
+    CborErrorUnknownType,           /* can only happen in major type 7 */
+    CborErrorIllegalType,           /* type not allowed here */
+    CborErrorIllegalNumber,
+    CborErrorIllegalSimpleType,     /* types of value less than 32 encoded in two bytes */
+
+    /* parser errors in strict mode parsing only */
+    CborErrorUnknownSimpleType = 512,
+    CborErrorUnknownTag,
+    CborErrorInappropriateTagForType,
+    CborErrorDuplicateObjectKeys,
+    CborErrorInvalidUtf8TextString,
+    CborErrorExcludedType,
+    CborErrorExcludedValue,
+    CborErrorImproperValue,
+    CborErrorOverlongEncoding,
+    CborErrorMapKeyNotString,
+    CborErrorMapNotSorted,
+    CborErrorMapKeysNotUnique,
+
+    /* encoder errors */
+    CborErrorTooManyItems = 768,
+    CborErrorTooFewItems,
+
+    /* internal implementation errors */
+    CborErrorDataTooLarge = 1024,
+    CborErrorNestingTooDeep,
+    CborErrorUnsupportedType,
+
+    /* errors in converting to JSON */
+    CborErrorJsonObjectKeyIsAggregate = 1280,
+    CborErrorJsonObjectKeyNotString,
+    CborErrorJsonNotImplemented,
+
+    CborErrorOutOfMemory = (int) (~0U / 2 + 1),
+    CborErrorInternalError = (int) (~0U / 2)    /* INT_MAX on two's complement machines */
+} CborError;
+
+CBOR_API const char *cbor_error_string(CborError error);
+
+/* Encoder API */
+struct CborEncoder
+{
+    union {
+        uint8_t *ptr;
+        ptrdiff_t bytes_needed;
+    } data;
+    const uint8_t *end;
+    size_t remaining;
+    int flags;
+};
+typedef struct CborEncoder CborEncoder;
+
+static const size_t CborIndefiniteLength = SIZE_MAX;
+
+CBOR_API void cbor_encoder_init(CborEncoder *encoder, uint8_t *buffer, size_t size, int flags);
+CBOR_API CborError cbor_encode_uint(CborEncoder *encoder, uint64_t value);
+CBOR_API CborError cbor_encode_int(CborEncoder *encoder, int64_t value);
+CBOR_API CborError cbor_encode_negative_int(CborEncoder *encoder, uint64_t absolute_value);
+CBOR_API CborError cbor_encode_simple_value(CborEncoder *encoder, uint8_t value);
+CBOR_API CborError cbor_encode_tag(CborEncoder *encoder, CborTag tag);
+CBOR_API CborError cbor_encode_text_string(CborEncoder *encoder, const char *string, size_t length);
+CBOR_INLINE_API CborError cbor_encode_text_stringz(CborEncoder *encoder, const char *string)
+{ return cbor_encode_text_string(encoder, string, strlen(string)); }
+CBOR_API CborError cbor_encode_byte_string(CborEncoder *encoder, const uint8_t *string, size_t length);
+CBOR_API CborError cbor_encode_floating_point(CborEncoder *encoder, CborType fpType, const void *value);
+
+CBOR_INLINE_API CborError cbor_encode_boolean(CborEncoder *encoder, bool value)
+{ return cbor_encode_simple_value(encoder, (int)value - 1 + (CborBooleanType & 0x1f)); }
+CBOR_INLINE_API CborError cbor_encode_null(CborEncoder *encoder)
+{ return cbor_encode_simple_value(encoder, CborNullType & 0x1f); }
+CBOR_INLINE_API CborError cbor_encode_undefined(CborEncoder *encoder)
+{ return cbor_encode_simple_value(encoder, CborUndefinedType & 0x1f); }
+
+CBOR_INLINE_API CborError cbor_encode_half_float(CborEncoder *encoder, const void *value)
+{ return cbor_encode_floating_point(encoder, CborHalfFloatType, value); }
+CBOR_INLINE_API CborError cbor_encode_float(CborEncoder *encoder, float value)
+{ return cbor_encode_floating_point(encoder, CborFloatType, &value); }
+CBOR_INLINE_API CborError cbor_encode_double(CborEncoder *encoder, double value)
+{ return cbor_encode_floating_point(encoder, CborDoubleType, &value); }
+
+CBOR_API CborError cbor_encoder_create_array(CborEncoder *encoder, CborEncoder *arrayEncoder, size_t length);
+CBOR_API CborError cbor_encoder_create_map(CborEncoder *encoder, CborEncoder *mapEncoder, size_t length);
+CBOR_API CborError cbor_encoder_close_container(CborEncoder *encoder, const CborEncoder *containerEncoder);
+CBOR_API CborError cbor_encoder_close_container_checked(CborEncoder *encoder, const CborEncoder *containerEncoder);
+
+CBOR_INLINE_API uint8_t *_cbor_encoder_get_buffer_pointer(const CborEncoder *encoder)
+{
+    return encoder->data.ptr;
+}
+
+CBOR_INLINE_API size_t cbor_encoder_get_buffer_size(const CborEncoder *encoder, const uint8_t *buffer)
+{
+    return (size_t)(encoder->data.ptr - buffer);
+}
+
+CBOR_INLINE_API size_t cbor_encoder_get_extra_bytes_needed(const CborEncoder *encoder)
+{
+    return encoder->end ? 0 : (size_t)encoder->data.bytes_needed;
+}
+
+/* Parser API */
+
+enum CborParserIteratorFlags
+{
+    CborIteratorFlag_IntegerValueTooLarge   = 0x01,
+    CborIteratorFlag_NegativeInteger        = 0x02,
+    CborIteratorFlag_IteratingStringChunks  = 0x02,
+    CborIteratorFlag_UnknownLength          = 0x04,
+    CborIteratorFlag_ContainerIsMap         = 0x20
+};
+
+struct CborParser
+{
+    const uint8_t *end;
+    uint32_t flags;
+};
+typedef struct CborParser CborParser;
+
+struct CborValue
+{
+    const CborParser *parser;
+    const uint8_t *ptr;
+    uint32_t remaining;
+    uint16_t extra;
+    uint8_t type;
+    uint8_t flags;
+};
+typedef struct CborValue CborValue;
+
+CBOR_API CborError cbor_parser_init(const uint8_t *buffer, size_t size, uint32_t flags, CborParser *parser, CborValue *it);
+
+CBOR_API CborError cbor_value_validate_basic(const CborValue *it);
+
+CBOR_INLINE_API bool cbor_value_at_end(const CborValue *it)
+{ return it->remaining == 0; }
+CBOR_INLINE_API const uint8_t *cbor_value_get_next_byte(const CborValue *it)
+{ return it->ptr; }
+CBOR_API CborError cbor_value_advance_fixed(CborValue *it);
+CBOR_API CborError cbor_value_advance(CborValue *it);
+CBOR_INLINE_API bool cbor_value_is_container(const CborValue *it)
+{ return it->type == CborArrayType || it->type == CborMapType; }
+CBOR_API CborError cbor_value_enter_container(const CborValue *it, CborValue *recursed);
+CBOR_API CborError cbor_value_leave_container(CborValue *it, const CborValue *recursed);
+
+CBOR_PRIVATE_API uint64_t _cbor_value_decode_int64_internal(const CborValue *value);
+CBOR_INLINE_API uint64_t _cbor_value_extract_int64_helper(const CborValue *value)
+{
+    return value->flags & CborIteratorFlag_IntegerValueTooLarge ?
+                _cbor_value_decode_int64_internal(value) : value->extra;
+}
+
+CBOR_INLINE_API bool cbor_value_is_valid(const CborValue *value)
+{ return value && value->type != CborInvalidType; }
+CBOR_INLINE_API CborType cbor_value_get_type(const CborValue *value)
+{ return (CborType)value->type; }
+
+/* Null & undefined type */
+CBOR_INLINE_API bool cbor_value_is_null(const CborValue *value)
+{ return value->type == CborNullType; }
+CBOR_INLINE_API bool cbor_value_is_undefined(const CborValue *value)
+{ return value->type == CborUndefinedType; }
+
+/* Booleans */
+CBOR_INLINE_API bool cbor_value_is_boolean(const CborValue *value)
+{ return value->type == CborBooleanType; }
+CBOR_INLINE_API CborError cbor_value_get_boolean(const CborValue *value, bool *result)
+{
+    assert(cbor_value_is_boolean(value));
+    *result = !!value->extra;
+    return CborNoError;
+}
+
+/* Simple types */
+CBOR_INLINE_API bool cbor_value_is_simple_type(const CborValue *value)
+{ return value->type == CborSimpleType; }
+CBOR_INLINE_API CborError cbor_value_get_simple_type(const CborValue *value, uint8_t *result)
+{
+    assert(cbor_value_is_simple_type(value));
+    *result = (uint8_t)value->extra;
+    return CborNoError;
+}
+
+/* Integers */
+CBOR_INLINE_API bool cbor_value_is_integer(const CborValue *value)
+{ return value->type == CborIntegerType; }
+CBOR_INLINE_API bool cbor_value_is_unsigned_integer(const CborValue *value)
+{ return cbor_value_is_integer(value) && (value->flags & CborIteratorFlag_NegativeInteger) == 0; }
+CBOR_INLINE_API bool cbor_value_is_negative_integer(const CborValue *value)
+{ return cbor_value_is_integer(value) && (value->flags & CborIteratorFlag_NegativeInteger); }
+
+CBOR_INLINE_API CborError cbor_value_get_raw_integer(const CborValue *value, uint64_t *result)
+{
+    assert(cbor_value_is_integer(value));
+    *result = _cbor_value_extract_int64_helper(value);
+    return CborNoError;
+}
+
+CBOR_INLINE_API CborError cbor_value_get_uint64(const CborValue *value, uint64_t *result)
+{
+    assert(cbor_value_is_unsigned_integer(value));
+    *result = _cbor_value_extract_int64_helper(value);
+    return CborNoError;
+}
+
+CBOR_INLINE_API CborError cbor_value_get_int64(const CborValue *value, int64_t *result)
+{
+    assert(cbor_value_is_integer(value));
+    *result = (int64_t) _cbor_value_extract_int64_helper(value);
+    if (value->flags & CborIteratorFlag_NegativeInteger)
+        *result = -*result - 1;
+    return CborNoError;
+}
+
+CBOR_INLINE_API CborError cbor_value_get_int(const CborValue *value, int *result)
+{
+    assert(cbor_value_is_integer(value));
+    *result = (int) _cbor_value_extract_int64_helper(value);
+    if (value->flags & CborIteratorFlag_NegativeInteger)
+        *result = -*result - 1;
+    return CborNoError;
+}
+
+CBOR_API CborError cbor_value_get_int64_checked(const CborValue *value, int64_t *result);
+CBOR_API CborError cbor_value_get_int_checked(const CborValue *value, int *result);
+
+CBOR_INLINE_API bool cbor_value_is_length_known(const CborValue *value)
+{ return (value->flags & CborIteratorFlag_UnknownLength) == 0; }
+
+/* Tags */
+CBOR_INLINE_API bool cbor_value_is_tag(const CborValue *value)
+{ return value->type == CborTagType; }
+CBOR_INLINE_API CborError cbor_value_get_tag(const CborValue *value, CborTag *result)
+{
+    assert(cbor_value_is_tag(value));
+    *result = _cbor_value_extract_int64_helper(value);
+    return CborNoError;
+}
+CBOR_API CborError cbor_value_skip_tag(CborValue *it);
+
+/* Strings */
+CBOR_INLINE_API bool cbor_value_is_byte_string(const CborValue *value)
+{ return value->type == CborByteStringType; }
+CBOR_INLINE_API bool cbor_value_is_text_string(const CborValue *value)
+{ return value->type == CborTextStringType; }
+
+CBOR_INLINE_API CborError cbor_value_get_string_length(const CborValue *value, size_t *length)
+{
+    uint64_t v;
+    assert(cbor_value_is_byte_string(value) || cbor_value_is_text_string(value));
+    if (!cbor_value_is_length_known(value))
+        return CborErrorUnknownLength;
+    v = _cbor_value_extract_int64_helper(value);
+    *length = (size_t)v;
+    if (*length != v)
+        return CborErrorDataTooLarge;
+    return CborNoError;
+}
+
+CBOR_PRIVATE_API CborError _cbor_value_copy_string(const CborValue *value, void *buffer,
+                                                   size_t *buflen, CborValue *next);
+CBOR_PRIVATE_API CborError _cbor_value_dup_string(const CborValue *value, void **buffer,
+                                                  size_t *buflen, CborValue *next);
+
+CBOR_API CborError cbor_value_calculate_string_length(const CborValue *value, size_t *length);
+
+CBOR_INLINE_API CborError cbor_value_copy_text_string(const CborValue *value, char *buffer,
+                                                      size_t *buflen, CborValue *next)
+{
+    assert(cbor_value_is_text_string(value));
+    return _cbor_value_copy_string(value, buffer, buflen, next);
+}
+CBOR_INLINE_API CborError cbor_value_copy_byte_string(const CborValue *value, uint8_t *buffer,
+                                                      size_t *buflen, CborValue *next)
+{
+    assert(cbor_value_is_byte_string(value));
+    return _cbor_value_copy_string(value, buffer, buflen, next);
+}
+
+CBOR_INLINE_API CborError cbor_value_dup_text_string(const CborValue *value, char **buffer,
+                                                     size_t *buflen, CborValue *next)
+{
+    assert(cbor_value_is_text_string(value));
+    return _cbor_value_dup_string(value, (void **)buffer, buflen, next);
+}
+CBOR_INLINE_API CborError cbor_value_dup_byte_string(const CborValue *value, uint8_t **buffer,
+                                                     size_t *buflen, CborValue *next)
+{
+    assert(cbor_value_is_byte_string(value));
+    return _cbor_value_dup_string(value, (void **)buffer, buflen, next);
+}
+
+CBOR_API CborError cbor_value_text_string_equals(const CborValue *value, const char *string, bool *result);
+
+/* Maps and arrays */
+CBOR_INLINE_API bool cbor_value_is_array(const CborValue *value)
+{ return value->type == CborArrayType; }
+CBOR_INLINE_API bool cbor_value_is_map(const CborValue *value)
+{ return value->type == CborMapType; }
+
+CBOR_INLINE_API CborError cbor_value_get_array_length(const CborValue *value, size_t *length)
+{
+    uint64_t v;
+    assert(cbor_value_is_array(value));
+    if (!cbor_value_is_length_known(value))
+        return CborErrorUnknownLength;
+    v = _cbor_value_extract_int64_helper(value);
+    *length = (size_t)v;
+    if (*length != v)
+        return CborErrorDataTooLarge;
+    return CborNoError;
+}
+
+CBOR_INLINE_API CborError cbor_value_get_map_length(const CborValue *value, size_t *length)
+{
+    uint64_t v;
+    assert(cbor_value_is_map(value));
+    if (!cbor_value_is_length_known(value))
+        return CborErrorUnknownLength;
+    v = _cbor_value_extract_int64_helper(value);
+    *length = (size_t)v;
+    if (*length != v)
+        return CborErrorDataTooLarge;
+    return CborNoError;
+}
+
+CBOR_API CborError cbor_value_map_find_value(const CborValue *map, const char *string, CborValue *element);
+
+/* Floating point */
+CBOR_INLINE_API bool cbor_value_is_half_float(const CborValue *value)
+{ return value->type == CborHalfFloatType; }
+CBOR_API CborError cbor_value_get_half_float(const CborValue *value, void *result);
+
+CBOR_INLINE_API bool cbor_value_is_float(const CborValue *value)
+{ return value->type == CborFloatType; }
+CBOR_INLINE_API CborError cbor_value_get_float(const CborValue *value, float *result)
+{
+    uint32_t data;
+    assert(cbor_value_is_float(value));
+    assert(value->flags & CborIteratorFlag_IntegerValueTooLarge);
+    data = (uint32_t)_cbor_value_decode_int64_internal(value);
+    memcpy(result, &data, sizeof(*result));
+    return CborNoError;
+}
+
+CBOR_INLINE_API bool cbor_value_is_double(const CborValue *value)
+{ return value->type == CborDoubleType; }
+CBOR_INLINE_API CborError cbor_value_get_double(const CborValue *value, double *result)
+{
+    uint64_t data;
+    assert(cbor_value_is_double(value));
+    assert(value->flags & CborIteratorFlag_IntegerValueTooLarge);
+    data = _cbor_value_decode_int64_internal(value);
+    memcpy(result, &data, sizeof(*result));
+    return CborNoError;
+}
+
+/* Validation API */
+
+enum CborValidationFlags {
+    /* Bit mapping:
+     *  bits 0-7 (8 bits):      canonical format
+     *  bits 8-11 (4 bits):     canonical format & strict mode
+     *  bits 12-20 (8 bits):    strict mode
+     *  bits 21-31 (10 bits):   other
+     */
+
+    CborValidateShortestIntegrals           = 0x0001,
+    CborValidateShortestFloatingPoint       = 0x0002,
+    CborValidateShortestNumbers             = CborValidateShortestIntegrals | CborValidateShortestFloatingPoint,
+    CborValidateNoIndeterminateLength       = 0x0100,
+    CborValidateMapIsSorted                 = 0x0200 | CborValidateNoIndeterminateLength,
+
+    CborValidateCanonicalFormat             = 0x0fff,
+
+    CborValidateMapKeysAreUnique            = 0x1000 | CborValidateMapIsSorted,
+    CborValidateTagUse                      = 0x2000,
+    CborValidateUtf8                        = 0x4000,
+
+    CborValidateStrictMode                  = 0xfff00,
+
+    CborValidateMapKeysAreString            = 0x100000,
+    CborValidateNoUndefined                 = 0x200000,
+    CborValidateNoTags                      = 0x400000,
+    CborValidateFiniteFloatingPoint         = 0x800000,
+    /* unused                               = 0x1000000, */
+    /* unused                               = 0x2000000, */
+
+    CborValidateNoUnknownSimpleTypesSA      = 0x4000000,
+    CborValidateNoUnknownSimpleTypes        = 0x8000000 | CborValidateNoUnknownSimpleTypesSA,
+    CborValidateNoUnknownTagsSA             = 0x10000000,
+    CborValidateNoUnknownTagsSR             = 0x20000000 | CborValidateNoUnknownTagsSA,
+    CborValidateNoUnknownTags               = 0x40000000 | CborValidateNoUnknownTagsSR,
+
+    CborValidateCompleteData                = (int)0x80000000,
+
+    CborValidateStrictest                   = (int)~0U,
+    CborValidateBasic                       = 0
+};
+
+CBOR_API CborError cbor_value_validate(const CborValue *it, uint32_t flags);
+
+/* Human-readable (dump) API */
+
+enum CborPrettyFlags {
+    CborPrettyNumericEncodingIndicators     = 0x01,
+    CborPrettyTextualEncodingIndicators     = 0,
+
+    CborPrettyIndicateIndeterminateLength   = 0x02,
+    CborPrettyIndicateIndetermineLength     = CborPrettyIndicateIndeterminateLength, /* deprecated */
+    CborPrettyIndicateOverlongNumbers       = 0x04,
+
+    CborPrettyShowStringFragments           = 0x100,
+    CborPrettyMergeStringFragments          = 0,
+
+    CborPrettyDefaultFlags          = CborPrettyIndicateIndeterminateLength
+};
+
+typedef CborError (*CborStreamFunction)(void *token, const char *fmt, ...)
+#ifdef __GNUC__
+    __attribute__((__format__(printf, 2, 3)))
+#endif
+;
+
+CBOR_API CborError cbor_value_to_pretty_stream(CborStreamFunction streamFunction, void *token, CborValue *value, int flags);
+
+/* The following API requires a hosted C implementation (uses FILE*) */
+#if !defined(__STDC_HOSTED__) || __STDC_HOSTED__-0 == 1
+CBOR_API CborError cbor_value_to_pretty_advance_flags(FILE *out, CborValue *value, int flags);
+CBOR_API CborError cbor_value_to_pretty_advance(FILE *out, CborValue *value);
+CBOR_INLINE_API CborError cbor_value_to_pretty(FILE *out, const CborValue *value)
+{
+    CborValue copy = *value;
+    return cbor_value_to_pretty_advance_flags(out, &copy, CborPrettyDefaultFlags);
+}
+#endif /* __STDC_HOSTED__ check */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* CBOR_H */
+
diff --git a/client/tinycbor/cborencoder.c b/client/tinycbor/cborencoder.c
new file mode 100644
index 000000000..adb92fd88
--- /dev/null
+++ b/client/tinycbor/cborencoder.c
@@ -0,0 +1,645 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 Intel Corporation
+**
+** Permission is hereby granted, free of charge, to any person obtaining a copy
+** of this software and associated documentation files (the "Software"), to deal
+** in the Software without restriction, including without limitation the rights
+** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+** copies of the Software, and to permit persons to whom the Software is
+** furnished to do so, subject to the following conditions:
+**
+** The above copyright notice and this permission notice shall be included in
+** all copies or substantial portions of the Software.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+** OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+** THE SOFTWARE.
+**
+****************************************************************************/
+
+#ifndef _BSD_SOURCE
+#define _BSD_SOURCE 1
+#endif
+#ifndef _DEFAULT_SOURCE
+#define _DEFAULT_SOURCE 1
+#endif
+#ifndef __STDC_LIMIT_MACROS
+#  define __STDC_LIMIT_MACROS 1
+#endif
+
+#include "cbor.h"
+#include "cborinternal_p.h"
+#include "compilersupport_p.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+/**
+ * \defgroup CborEncoding Encoding to CBOR
+ * \brief Group of functions used to encode data to CBOR.
+ *
+ * CborEncoder is used to encode data into a CBOR stream. The outermost
+ * CborEncoder is initialized by calling cbor_encoder_init(), with the buffer
+ * where the CBOR stream will be stored. The outermost CborEncoder is usually
+ * used to encode exactly one item, most often an array or map. It is possible
+ * to encode more than one item, but care must then be taken on the decoder
+ * side to ensure the state is reset after each item was decoded.
+ *
+ * Nested CborEncoder objects are created using cbor_encoder_create_array() and
+ * cbor_encoder_create_map(), later closed with cbor_encoder_close_container()
+ * or cbor_encoder_close_container_checked(). The pairs of creation and closing
+ * must be exactly matched and their parameters are always the same.
+ *
+ * CborEncoder writes directly to the user-supplied buffer, without extra
+ * buffering. CborEncoder does not allocate memory and CborEncoder objects are
+ * usually created on the stack of the encoding functions.
+ *
+ * The example below initializes a CborEncoder object with a buffer and encodes
+ * a single integer.
+ *
+ * \code
+ *      uint8_t buf[16];
+ *      CborEncoder encoder;
+ *      cbor_encoder_init(&encoder, &buf, sizeof(buf), 0);
+ *      cbor_encode_int(&encoder, some_value);
+ * \endcode
+ *
+ * As explained before, usually the outermost CborEncoder object is used to add
+ * one array or map, which in turn contains multiple elements. The example
+ * below creates a CBOR map with one element: a key "foo" and a boolean value.
+ *
+ * \code
+ *      uint8_t buf[16];
+ *      CborEncoder encoder, mapEncoder;
+ *      cbor_encoder_init(&encoder, &buf, sizeof(buf), 0);
+ *      cbor_encoder_create_map(&encoder, &mapEncoder, 1);
+ *      cbor_encode_text_stringz(&mapEncoder, "foo");
+ *      cbor_encode_boolean(&mapEncoder, some_value);
+ *      cbor_encoder_close_container(&encoder, &mapEncoder);
+ * \endcode
+ *
+ * <h3 class="groupheader">Error checking and buffer size</h3>
+ *
+ * All functions operating on CborEncoder return a condition of type CborError.
+ * If the encoding was successful, they return CborNoError. Some functions do
+ * extra checking on the input provided and may return some other error
+ * conditions (for example, cbor_encode_simple_value() checks that the type is
+ * of the correct type).
+ *
+ * In addition, all functions check whether the buffer has enough bytes to
+ * encode the item being appended. If that is not possible, they return
+ * CborErrorOutOfMemory.
+ *
+ * It is possible to continue with the encoding of data past the first function
+ * that returns CborErrorOutOfMemory. CborEncoder functions will not overrun
+ * the buffer, but will instead count how many more bytes are needed to
+ * complete the encoding. At the end, you can obtain that count by calling
+ * cbor_encoder_get_extra_bytes_needed().
+ *
+ * \section1 Finalizing the encoding
+ *
+ * Once all items have been appended and the containers have all been properly
+ * closed, the user-supplied buffer will contain the CBOR stream and may be
+ * immediately used. To obtain the size of the buffer, call
+ * cbor_encoder_get_buffer_size() with the original buffer pointer.
+ *
+ * The example below illustrates how one can encode an item with error checking
+ * and then pass on the buffer for network sending.
+ *
+ * \code
+ *      uint8_t buf[16];
+ *      CborError err;
+ *      CborEncoder encoder, mapEncoder;
+ *      cbor_encoder_init(&encoder, &buf, sizeof(buf), 0);
+ *      err = cbor_encoder_create_map(&encoder, &mapEncoder, 1);
+ *      if (!err)
+ *          return err;
+ *      err = cbor_encode_text_stringz(&mapEncoder, "foo");
+ *      if (!err)
+ *          return err;
+ *      err = cbor_encode_boolean(&mapEncoder, some_value);
+ *      if (!err)
+ *          return err;
+ *      err = cbor_encoder_close_container_checked(&encoder, &mapEncoder);
+ *      if (!err)
+ *          return err;
+ *
+ *      size_t len = cbor_encoder_get_buffer_size(&encoder, buf);
+ *      send_payload(buf, len);
+ *      return CborNoError;
+ * \endcode
+ *
+ * Finally, the example below expands on the one above and also
+ * deals with dynamically growing the buffer if the initial allocation wasn't
+ * big enough. Note the two places where the error checking was replaced with
+ * an cbor_assertion, showing where the author assumes no error can occur.
+ *
+ * \code
+ * uint8_t *encode_string_array(const char **strings, int n, size_t *bufsize)
+ * {
+ *     CborError err;
+ *     CborEncoder encoder, arrayEncoder;
+ *     size_t size = 256;
+ *     uint8_t *buf = NULL;
+ *
+ *     while (1) {
+ *         int i;
+ *         size_t more_bytes;
+ *         uint8_t *nbuf = realloc(buf, size);
+ *         if (nbuf == NULL)
+ *             goto error;
+ *         buf = nbuf;
+ *
+ *         cbor_encoder_init(&encoder, &buf, size, 0);
+ *         err = cbor_encoder_create_array(&encoder, &arrayEncoder, n);
+ *         cbor_assert(err);         // can't fail, the buffer is always big enough
+ *
+ *         for (i = 0; i < n; ++i) {
+ *             err = cbor_encode_text_stringz(&arrayEncoder, strings[i]);
+ *             if (err && err != CborErrorOutOfMemory)
+ *                 goto error;
+ *         }
+ *
+ *         err = cbor_encoder_close_container_checked(&encoder, &arrayEncoder);
+ *         cbor_assert(err);         // shouldn't fail!
+ *
+ *         more_bytes = cbor_encoder_get_extra_bytes_needed(encoder);
+ *         if (more_size) {
+ *             // buffer wasn't big enough, try again
+ *             size += more_bytes;
+ *             continue;
+ *         }
+ *
+ *         *bufsize = cbor_encoder_get_buffer_size(encoder, buf);
+ *         return buf;
+ *     }
+ *  error:
+ *     free(buf);
+ *     return NULL;
+ *  }
+ * \endcode
+ */
+
+/**
+ * \addtogroup CborEncoding
+ * @{
+ */
+
+/**
+ * \struct CborEncoder
+ * Structure used to encode to CBOR.
+ */
+
+/**
+ * Initializes a CborEncoder structure \a encoder by pointing it to buffer \a
+ * buffer of size \a size. The \a flags field is currently unused and must be
+ * zero.
+ */
+void cbor_encoder_init(CborEncoder *encoder, uint8_t *buffer, size_t size, int flags)
+{
+    encoder->data.ptr = buffer;
+    encoder->end = buffer + size;
+    encoder->remaining = 2;
+    encoder->flags = flags;
+}
+
+static inline void put16(void *where, uint16_t v)
+{
+    v = cbor_htons(v);
+    memcpy(where, &v, sizeof(v));
+}
+
+/* Note: Since this is currently only used in situations where OOM is the only
+ * valid error, we KNOW this to be true.  Thus, this function now returns just 'true',
+ * but if in the future, any function starts returning a non-OOM error, this will need
+ * to be changed to the test.  At the moment, this is done to prevent more branches
+ * being created in the tinycbor output */
+static inline bool isOomError(CborError err)
+{
+    (void) err;
+    return true;
+}
+
+static inline void put32(void *where, uint32_t v)
+{
+    v = cbor_htonl(v);
+    memcpy(where, &v, sizeof(v));
+}
+
+static inline void put64(void *where, uint64_t v)
+{
+    v = cbor_htonll(v);
+    memcpy(where, &v, sizeof(v));
+}
+
+static inline bool would_overflow(CborEncoder *encoder, size_t len)
+{
+    ptrdiff_t remaining = (ptrdiff_t)encoder->end;
+    remaining -= remaining ? (ptrdiff_t)encoder->data.ptr : encoder->data.bytes_needed;
+    remaining -= (ptrdiff_t)len;
+    return unlikely(remaining < 0);
+}
+
+static inline void advance_ptr(CborEncoder *encoder, size_t n)
+{
+    if (encoder->end)
+        encoder->data.ptr += n;
+    else
+        encoder->data.bytes_needed += n;
+}
+
+static inline CborError append_to_buffer(CborEncoder *encoder, const void *data, size_t len)
+{
+    if (would_overflow(encoder, len)) {
+        if (encoder->end != NULL) {
+            len -= encoder->end - encoder->data.ptr;
+            encoder->end = NULL;
+            encoder->data.bytes_needed = 0;
+        }
+
+        advance_ptr(encoder, len);
+        return CborErrorOutOfMemory;
+    }
+
+    memcpy(encoder->data.ptr, data, len);
+    encoder->data.ptr += len;
+    return CborNoError;
+}
+
+static inline CborError append_byte_to_buffer(CborEncoder *encoder, uint8_t byte)
+{
+    return append_to_buffer(encoder, &byte, 1);
+}
+
+static inline CborError encode_number_no_update(CborEncoder *encoder, uint64_t ui, uint8_t shiftedMajorType)
+{
+    /* Little-endian would have been so much more convenient here:
+     * We could just write at the beginning of buf but append_to_buffer
+     * only the necessary bytes.
+     * Since it has to be big endian, do it the other way around:
+     * write from the end. */
+    uint64_t buf[2];
+    uint8_t *const bufend = (uint8_t *)buf + sizeof(buf);
+    uint8_t *bufstart = bufend - 1;
+    put64(buf + 1, ui);     /* we probably have a bunch of zeros in the beginning */
+
+    if (ui < Value8Bit) {
+        *bufstart += shiftedMajorType;
+    } else {
+        uint8_t more = 0;
+        if (ui > 0xffU)
+            ++more;
+        if (ui > 0xffffU)
+            ++more;
+        if (ui > 0xffffffffU)
+            ++more;
+        bufstart -= (size_t)1 << more;
+        *bufstart = shiftedMajorType + Value8Bit + more;
+    }
+
+    return append_to_buffer(encoder, bufstart, bufend - bufstart);
+}
+
+static inline void saturated_decrement(CborEncoder *encoder)
+{
+    if (encoder->remaining)
+        --encoder->remaining;
+}
+
+static inline CborError encode_number(CborEncoder *encoder, uint64_t ui, uint8_t shiftedMajorType)
+{
+    saturated_decrement(encoder);
+    return encode_number_no_update(encoder, ui, shiftedMajorType);
+}
+
+/**
+ * Appends the unsigned 64-bit integer \a value to the CBOR stream provided by
+ * \a encoder.
+ *
+ * \sa cbor_encode_negative_int, cbor_encode_int
+ */
+CborError cbor_encode_uint(CborEncoder *encoder, uint64_t value)
+{
+    return encode_number(encoder, value, UnsignedIntegerType << MajorTypeShift);
+}
+
+/**
+ * Appends the negative 64-bit integer whose absolute value is \a
+ * absolute_value to the CBOR stream provided by \a encoder.
+ *
+ * If the value \a absolute_value is zero, this function encodes -2^64.
+ *
+ * \sa cbor_encode_uint, cbor_encode_int
+ */
+CborError cbor_encode_negative_int(CborEncoder *encoder, uint64_t absolute_value)
+{
+    return encode_number(encoder, absolute_value - 1, NegativeIntegerType << MajorTypeShift);
+}
+
+/**
+ * Appends the signed 64-bit integer \a value to the CBOR stream provided by
+ * \a encoder.
+ *
+ * \sa cbor_encode_negative_int, cbor_encode_uint
+ */
+CborError cbor_encode_int(CborEncoder *encoder, int64_t value)
+{
+    /* adapted from code in RFC 7049 appendix C (pseudocode) */
+    uint64_t ui = value >> 63;              /* extend sign to whole length */
+    uint8_t majorType = ui & 0x20;          /* extract major type */
+    ui ^= value;                            /* complement negatives */
+    return encode_number(encoder, ui, majorType);
+}
+
+/**
+ * Appends the CBOR Simple Type of value \a value to the CBOR stream provided by
+ * \a encoder.
+ *
+ * This function may return error CborErrorIllegalSimpleType if the \a value
+ * variable contains a number that is not a valid simple type.
+ */
+CborError cbor_encode_simple_value(CborEncoder *encoder, uint8_t value)
+{
+#ifndef CBOR_ENCODER_NO_CHECK_USER
+    /* check if this is a valid simple type */
+    if (value >= HalfPrecisionFloat && value <= Break)
+        return CborErrorIllegalSimpleType;
+#endif
+    return encode_number(encoder, value, SimpleTypesType << MajorTypeShift);
+}
+
+/**
+ * Appends the floating-point value of type \a fpType and pointed to by \a
+ * value to the CBOR stream provided by \a encoder. The value of \a fpType must
+ * be one of CborHalfFloatType, CborFloatType or CborDoubleType, otherwise the
+ * behavior of this function is undefined.
+ *
+ * This function is useful for code that needs to pass through floating point
+ * values but does not wish to have the actual floating-point code.
+ *
+ * \sa cbor_encode_half_float, cbor_encode_float, cbor_encode_double
+ */
+CborError cbor_encode_floating_point(CborEncoder *encoder, CborType fpType, const void *value)
+{
+    unsigned size;
+    uint8_t buf[1 + sizeof(uint64_t)];
+    cbor_assert(fpType == CborHalfFloatType || fpType == CborFloatType || fpType == CborDoubleType);
+    buf[0] = fpType;
+
+    size = 2U << (fpType - CborHalfFloatType);
+    if (size == 8)
+        put64(buf + 1, *(const uint64_t*)value);
+    else if (size == 4)
+        put32(buf + 1, *(const uint32_t*)value);
+    else
+        put16(buf + 1, *(const uint16_t*)value);
+    saturated_decrement(encoder);
+    return append_to_buffer(encoder, buf, size + 1);
+}
+
+/**
+ * Appends the CBOR tag \a tag to the CBOR stream provided by \a encoder.
+ *
+ * \sa CborTag
+ */
+CborError cbor_encode_tag(CborEncoder *encoder, CborTag tag)
+{
+    /* tags don't count towards the number of elements in an array or map */
+    return encode_number_no_update(encoder, tag, TagType << MajorTypeShift);
+}
+
+static CborError encode_string(CborEncoder *encoder, size_t length, uint8_t shiftedMajorType, const void *string)
+{
+    CborError err = encode_number(encoder, length, shiftedMajorType);
+    if (err && !isOomError(err))
+        return err;
+    return append_to_buffer(encoder, string, length);
+}
+
+/**
+ * \fn CborError cbor_encode_text_stringz(CborEncoder *encoder, const char *string)
+ *
+ * Appends the null-terminated text string \a string to the CBOR stream
+ * provided by \a encoder. CBOR requires that \a string be valid UTF-8, but
+ * TinyCBOR makes no verification of correctness. The terminating null is not
+ * included in the stream.
+ *
+ * \sa cbor_encode_text_string, cbor_encode_byte_string
+ */
+
+/**
+ * Appends the text string \a string of length \a length to the CBOR stream
+ * provided by \a encoder. CBOR requires that \a string be valid UTF-8, but
+ * TinyCBOR makes no verification of correctness.
+ *
+ * \sa CborError cbor_encode_text_stringz, cbor_encode_byte_string
+ */
+CborError cbor_encode_byte_string(CborEncoder *encoder, const uint8_t *string, size_t length)
+{
+    return encode_string(encoder, length, ByteStringType << MajorTypeShift, string);
+}
+
+/**
+ * Appends the byte string \a string of length \a length to the CBOR stream
+ * provided by \a encoder. CBOR byte strings are arbitrary raw data.
+ *
+ * \sa cbor_encode_text_stringz, cbor_encode_text_string
+ */
+CborError cbor_encode_text_string(CborEncoder *encoder, const char *string, size_t length)
+{
+    return encode_string(encoder, length, TextStringType << MajorTypeShift, string);
+}
+
+#ifdef __GNUC__
+__attribute__((noinline))
+#endif
+static CborError create_container(CborEncoder *encoder, CborEncoder *container, size_t length, uint8_t shiftedMajorType)
+{
+    CborError err;
+    container->data.ptr = encoder->data.ptr;
+    container->end = encoder->end;
+    saturated_decrement(encoder);
+    container->remaining = length + 1;      /* overflow ok on CborIndefiniteLength */
+
+    cbor_static_assert(((MapType << MajorTypeShift) & CborIteratorFlag_ContainerIsMap) == CborIteratorFlag_ContainerIsMap);
+    cbor_static_assert(((ArrayType << MajorTypeShift) & CborIteratorFlag_ContainerIsMap) == 0);
+    container->flags = shiftedMajorType & CborIteratorFlag_ContainerIsMap;
+
+    if (length == CborIndefiniteLength) {
+        container->flags |= CborIteratorFlag_UnknownLength;
+        err = append_byte_to_buffer(container, shiftedMajorType + IndefiniteLength);
+    } else {
+        if (shiftedMajorType & CborIteratorFlag_ContainerIsMap)
+            container->remaining += length;
+        err = encode_number_no_update(container, length, shiftedMajorType);
+    }
+    return err;
+}
+
+/**
+ * Creates a CBOR array in the CBOR stream provided by \a encoder and
+ * initializes \a arrayEncoder so that items can be added to the array using
+ * the CborEncoder functions. The array must be terminated by calling either
+ * cbor_encoder_close_container() or cbor_encoder_close_container_checked()
+ * with the same \a encoder and \a arrayEncoder parameters.
+ *
+ * The number of items inserted into the array must be exactly \a length items,
+ * otherwise the stream is invalid. If the number of items is not known when
+ * creating the array, the constant \ref CborIndefiniteLength may be passed as
+ * length instead.
+ *
+ * \sa cbor_encoder_create_map
+ */
+CborError cbor_encoder_create_array(CborEncoder *encoder, CborEncoder *arrayEncoder, size_t length)
+{
+    return create_container(encoder, arrayEncoder, length, ArrayType << MajorTypeShift);
+}
+
+/**
+ * Creates a CBOR map in the CBOR stream provided by \a encoder and
+ * initializes \a mapEncoder so that items can be added to the map using
+ * the CborEncoder functions. The map must be terminated by calling either
+ * cbor_encoder_close_container() or cbor_encoder_close_container_checked()
+ * with the same \a encoder and \a mapEncoder parameters.
+ *
+ * The number of pair of items inserted into the map must be exactly \a length
+ * items, otherwise the stream is invalid. If the number is not known
+ * when creating the map, the constant \ref CborIndefiniteLength may be passed as
+ * length instead.
+ *
+ * \b{Implementation limitation:} TinyCBOR cannot encode more than SIZE_MAX/2
+ * key-value pairs in the stream. If the length \a length is larger than this
+ * value (and is not \ref CborIndefiniteLength), this function returns error
+ * CborErrorDataTooLarge.
+ *
+ * \sa cbor_encoder_create_array
+ */
+CborError cbor_encoder_create_map(CborEncoder *encoder, CborEncoder *mapEncoder, size_t length)
+{
+    if (length != CborIndefiniteLength && length > SIZE_MAX / 2)
+        return CborErrorDataTooLarge;
+    return create_container(encoder, mapEncoder, length, MapType << MajorTypeShift);
+}
+
+/**
+ * Closes the CBOR container (array or map) provided by \a containerEncoder and
+ * updates the CBOR stream provided by \a encoder. Both parameters must be the
+ * same as were passed to cbor_encoder_create_array() or
+ * cbor_encoder_create_map().
+ *
+ * Since version 0.5, this function verifies that the number of items (or pairs
+ * of items, in the case of a map) was correct. It is no longer necessary to call
+ * cbor_encoder_close_container_checked() instead.
+ *
+ * \sa cbor_encoder_create_array(), cbor_encoder_create_map()
+ */
+CborError cbor_encoder_close_container(CborEncoder *encoder, const CborEncoder *containerEncoder)
+{
+    if (encoder->end)
+        encoder->data.ptr = containerEncoder->data.ptr;
+    else
+        encoder->data.bytes_needed = containerEncoder->data.bytes_needed;
+    encoder->end = containerEncoder->end;
+    if (containerEncoder->flags & CborIteratorFlag_UnknownLength)
+        return append_byte_to_buffer(encoder, BreakByte);
+
+    if (containerEncoder->remaining != 1)
+        return containerEncoder->remaining == 0 ? CborErrorTooManyItems : CborErrorTooFewItems;
+
+    if (!encoder->end)
+        return CborErrorOutOfMemory;    /* keep the state */
+    return CborNoError;
+}
+
+/**
+ * \fn CborError cbor_encode_boolean(CborEncoder *encoder, bool value)
+ *
+ * Appends the boolean value \a value to the CBOR stream provided by \a encoder.
+ */
+
+/**
+ * \fn CborError cbor_encode_null(CborEncoder *encoder)
+ *
+ * Appends the CBOR type representing a null value to the CBOR stream provided
+ * by \a encoder.
+ *
+ * \sa cbor_encode_undefined()
+ */
+
+/**
+ * \fn CborError cbor_encode_undefined(CborEncoder *encoder)
+ *
+ * Appends the CBOR type representing an undefined value to the CBOR stream
+ * provided by \a encoder.
+ *
+ * \sa cbor_encode_null()
+ */
+
+/**
+ * \fn CborError cbor_encode_half_float(CborEncoder *encoder, const void *value)
+ *
+ * Appends the IEEE 754 half-precision (16-bit) floating point value pointed to
+ * by \a value to the CBOR stream provided by \a encoder.
+ *
+ * \sa cbor_encode_floating_point(), cbor_encode_float(), cbor_encode_double()
+ */
+
+/**
+ * \fn CborError cbor_encode_float(CborEncoder *encoder, float value)
+ *
+ * Appends the IEEE 754 single-precision (32-bit) floating point value \a value
+ * to the CBOR stream provided by \a encoder.
+ *
+ * \sa cbor_encode_floating_point(), cbor_encode_half_float(), cbor_encode_double()
+ */
+
+/**
+ * \fn CborError cbor_encode_double(CborEncoder *encoder, double value)
+ *
+ * Appends the IEEE 754 double-precision (64-bit) floating point value \a value
+ * to the CBOR stream provided by \a encoder.
+ *
+ * \sa cbor_encode_floating_point(), cbor_encode_half_float(), cbor_encode_float()
+ */
+
+/**
+ * \fn size_t cbor_encoder_get_buffer_size(const CborEncoder *encoder, const uint8_t *buffer)
+ *
+ * Returns the total size of the buffer starting at \a buffer after the
+ * encoding finished without errors. The \a encoder and \a buffer arguments
+ * must be the same as supplied to cbor_encoder_init().
+ *
+ * If the encoding process had errors, the return value of this function is
+ * meaningless. If the only errors were CborErrorOutOfMemory, instead use
+ * cbor_encoder_get_extra_bytes_needed() to find out by how much to grow the
+ * buffer before encoding again.
+ *
+ * See \ref CborEncoding for an example of using this function.
+ *
+ * \sa cbor_encoder_init(), cbor_encoder_get_extra_bytes_needed(), CborEncoding
+ */
+
+/**
+ * \fn size_t cbor_encoder_get_extra_bytes_needed(const CborEncoder *encoder)
+ *
+ * Returns how many more bytes the original buffer supplied to
+ * cbor_encoder_init() needs to be extended by so that no CborErrorOutOfMemory
+ * condition will happen for the encoding. If the buffer was big enough, this
+ * function returns 0. The \a encoder must be the original argument as passed
+ * to cbor_encoder_init().
+ *
+ * This function is usually called after an encoding sequence ended with one or
+ * more CborErrorOutOfMemory errors, but no other error. If any other error
+ * happened, the return value of this function is meaningless.
+ *
+ * See \ref CborEncoding for an example of using this function.
+ *
+ * \sa cbor_encoder_init(), cbor_encoder_get_buffer_size(), CborEncoding
+ */
+
+/** @} */
diff --git a/client/tinycbor/cborencoder_close_container_checked.c b/client/tinycbor/cborencoder_close_container_checked.c
new file mode 100644
index 000000000..5661e4d53
--- /dev/null
+++ b/client/tinycbor/cborencoder_close_container_checked.c
@@ -0,0 +1,57 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 Intel Corporation
+**
+** Permission is hereby granted, free of charge, to any person obtaining a copy
+** of this software and associated documentation files (the "Software"), to deal
+** in the Software without restriction, including without limitation the rights
+** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+** copies of the Software, and to permit persons to whom the Software is
+** furnished to do so, subject to the following conditions:
+**
+** The above copyright notice and this permission notice shall be included in
+** all copies or substantial portions of the Software.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+** OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+** THE SOFTWARE.
+**
+****************************************************************************/
+
+#define _BSD_SOURCE 1
+#define _DEFAULT_SOURCE 1
+#ifndef __STDC_LIMIT_MACROS
+#  define __STDC_LIMIT_MACROS 1
+#endif
+
+#include "cbor.h"
+
+/**
+ * \addtogroup CborEncoding
+ * @{
+ */
+
+/**
+ * @deprecated
+ *
+ * Closes the CBOR container (array or map) provided by \a containerEncoder and
+ * updates the CBOR stream provided by \a encoder. Both parameters must be the
+ * same as were passed to cbor_encoder_create_array() or
+ * cbor_encoder_create_map().
+ *
+ * Prior to version 0.5, cbor_encoder_close_container() did not check the
+ * number of items added. Since that version, it does and now
+ * cbor_encoder_close_container_checked() is no longer needed.
+ *
+ * \sa cbor_encoder_create_array(), cbor_encoder_create_map()
+ */
+CborError cbor_encoder_close_container_checked(CborEncoder *encoder, const CborEncoder *containerEncoder)
+{
+    return cbor_encoder_close_container(encoder, containerEncoder);
+}
+
+/** @} */
diff --git a/client/tinycbor/cborerrorstrings.c b/client/tinycbor/cborerrorstrings.c
new file mode 100644
index 000000000..3fe3a9823
--- /dev/null
+++ b/client/tinycbor/cborerrorstrings.c
@@ -0,0 +1,182 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 Intel Corporation
+**
+** Permission is hereby granted, free of charge, to any person obtaining a copy
+** of this software and associated documentation files (the "Software"), to deal
+** in the Software without restriction, including without limitation the rights
+** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+** copies of the Software, and to permit persons to whom the Software is
+** furnished to do so, subject to the following conditions:
+**
+** The above copyright notice and this permission notice shall be included in
+** all copies or substantial portions of the Software.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+** OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+** THE SOFTWARE.
+**
+****************************************************************************/
+
+#include "cbor.h"
+
+#ifndef _
+#  define _(msg)    msg
+#endif
+
+/**
+ * \enum CborError
+ * \ingroup CborGlobals
+ * The CborError enum contains the possible error values used by the CBOR encoder and decoder.
+ *
+ * TinyCBOR functions report success by returning CborNoError, or one error
+ * condition by returning one of the values below. One exception is the
+ * out-of-memory condition (CborErrorOutOfMemory), which the functions for \ref
+ * CborEncoding may report in bit-wise OR with other conditions.
+ *
+ * This technique allows code to determine whether the only error condition was
+ * a lack of buffer space, which may not be a fatal condition if the buffer can
+ * be resized. Additionally, the functions for \ref CborEncoding may continue
+ * to be used even after CborErrorOutOfMemory is returned, and instead they
+ * will simply calculate the extra space needed.
+ *
+ * \value CborNoError                   No error occurred
+ * \omitvalue CborUnknownError
+ * \value CborErrorUnknownLength        Request for the length of an array, map or string whose length is not provided in the CBOR stream
+ * \value CborErrorAdvancePastEOF       Not enough data in the stream to decode item (decoding would advance past end of stream)
+ * \value CborErrorIO                   An I/O error occurred, probably due to an out-of-memory situation
+ * \value CborErrorGarbageAtEnd         Bytes exist past the end of the CBOR stream
+ * \value CborErrorUnexpectedEOF        End of stream reached unexpectedly
+ * \value CborErrorUnexpectedBreak      A CBOR break byte was found where not expected
+ * \value CborErrorUnknownType          An unknown type (future extension to CBOR) was found in the stream
+ * \value CborErrorIllegalType          An invalid type was found while parsing a chunked CBOR string
+ * \value CborErrorIllegalNumber        An illegal initial byte (encoding unspecified additional information) was found
+ * \value CborErrorIllegalSimpleType    An illegal encoding of a CBOR Simple Type of value less than 32 was found
+ * \omitvalue CborErrorUnknownSimpleType
+ * \omitvalue CborErrorUnknownTag
+ * \omitvalue CborErrorInappropriateTagForType
+ * \omitvalue CborErrorDuplicateObjectKeys
+ * \value CborErrorInvalidUtf8TextString Illegal UTF-8 encoding found while parsing CBOR Text String
+ * \value CborErrorTooManyItems         Too many items were added to CBOR map or array of pre-determined length
+ * \value CborErrorTooFewItems          Too few items were added to CBOR map or array of pre-determined length
+ * \value CborErrorDataTooLarge         Data item size exceeds TinyCBOR's implementation limits
+ * \value CborErrorNestingTooDeep       Data item nesting exceeds TinyCBOR's implementation limits
+ * \omitvalue CborErrorUnsupportedType
+ * \value CborErrorJsonObjectKeyIsAggregate Conversion to JSON failed because the key in a map is a CBOR map or array
+ * \value CborErrorJsonObjectKeyNotString Conversion to JSON failed because the key in a map is not a text string
+ * \value CborErrorOutOfMemory          During CBOR encoding, the buffer provided is insufficient for encoding the data item;
+ *                                      in other situations, TinyCBOR failed to allocate memory
+ * \value CborErrorInternalError        An internal error occurred in TinyCBOR
+ */
+
+/**
+ * \ingroup CborGlobals
+ * Returns the error string corresponding to the CBOR error condition \a error.
+ */
+const char *cbor_error_string(CborError error)
+{
+    switch (error) {
+    case CborNoError:
+        return "";
+
+    case CborUnknownError:
+        return _("unknown error");
+
+    case CborErrorOutOfMemory:
+        return _("out of memory/need more memory");
+
+    case CborErrorUnknownLength:
+        return _("unknown length (attempted to get the length of a map/array/string of indeterminate length");
+
+    case CborErrorAdvancePastEOF:
+        return _("attempted to advance past EOF");
+
+    case CborErrorIO:
+        return _("I/O error");
+
+    case CborErrorGarbageAtEnd:
+        return _("garbage after the end of the content");
+
+    case CborErrorUnexpectedEOF:
+        return _("unexpected end of data");
+
+    case CborErrorUnexpectedBreak:
+        return _("unexpected 'break' byte");
+
+    case CborErrorUnknownType:
+        return _("illegal byte (encodes future extension type)");
+
+    case CborErrorIllegalType:
+        return _("mismatched string type in chunked string");
+
+    case CborErrorIllegalNumber:
+        return _("illegal initial byte (encodes unspecified additional information)");
+
+    case CborErrorIllegalSimpleType:
+        return _("illegal encoding of simple type smaller than 32");
+
+    case CborErrorUnknownSimpleType:
+        return _("unknown simple type");
+
+    case CborErrorUnknownTag:
+        return _("unknown tag");
+
+    case CborErrorInappropriateTagForType:
+        return _("inappropriate tag for type");
+
+    case CborErrorDuplicateObjectKeys:
+        return _("duplicate keys in object");
+
+    case CborErrorInvalidUtf8TextString:
+        return _("invalid UTF-8 content in string");
+
+    case CborErrorExcludedType:
+        return _("excluded type found");
+
+    case CborErrorExcludedValue:
+        return _("excluded value found");
+
+    case CborErrorImproperValue:
+    case CborErrorOverlongEncoding:
+        return _("value encoded in non-canonical form");
+
+    case CborErrorMapKeyNotString:
+    case CborErrorJsonObjectKeyNotString:
+        return _("key in map is not a string");
+
+    case CborErrorMapNotSorted:
+        return _("map is not sorted");
+
+    case CborErrorMapKeysNotUnique:
+        return _("map keys are not unique");
+
+    case CborErrorTooManyItems:
+        return _("too many items added to encoder");
+
+    case CborErrorTooFewItems:
+        return _("too few items added to encoder");
+
+    case CborErrorDataTooLarge:
+        return _("internal error: data too large");
+
+    case CborErrorNestingTooDeep:
+        return _("internal error: too many nested containers found in recursive function");
+
+    case CborErrorUnsupportedType:
+        return _("unsupported type");
+
+    case CborErrorJsonObjectKeyIsAggregate:
+        return _("conversion to JSON failed: key in object is an array or map");
+
+    case CborErrorJsonNotImplemented:
+        return _("conversion to JSON failed: open_memstream unavailable");
+
+    case CborErrorInternalError:
+        return _("internal error");
+    }
+    return cbor_error_string(CborUnknownError);
+}
diff --git a/client/tinycbor/cborinternal_p.h b/client/tinycbor/cborinternal_p.h
new file mode 100644
index 000000000..a85a92972
--- /dev/null
+++ b/client/tinycbor/cborinternal_p.h
@@ -0,0 +1,161 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 Intel Corporation
+**
+** Permission is hereby granted, free of charge, to any person obtaining a copy
+** of this software and associated documentation files (the "Software"), to deal
+** in the Software without restriction, including without limitation the rights
+** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+** copies of the Software, and to permit persons to whom the Software is
+** furnished to do so, subject to the following conditions:
+**
+** The above copyright notice and this permission notice shall be included in
+** all copies or substantial portions of the Software.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+** OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+** THE SOFTWARE.
+**
+****************************************************************************/
+
+#ifndef CBORINTERNAL_P_H
+#define CBORINTERNAL_P_H
+
+#include "compilersupport_p.h"
+
+#ifndef CBOR_NO_FLOATING_POINT
+#  include <float.h>
+#  include <math.h>
+#else
+#  ifndef CBOR_NO_HALF_FLOAT_TYPE
+#    define CBOR_NO_HALF_FLOAT_TYPE     1
+#  endif
+#endif
+
+#ifndef CBOR_NO_HALF_FLOAT_TYPE
+#  ifdef __F16C__
+#    include <immintrin.h>
+static inline unsigned short encode_half(double val)
+{
+    return _cvtss_sh((float)val, 3);
+}
+static inline double decode_half(unsigned short half)
+{
+    return _cvtsh_ss(half);
+}
+#  else
+/* software implementation of float-to-fp16 conversions */
+static inline unsigned short encode_half(double val)
+{
+    uint64_t v;
+    int sign, exp, mant;
+    memcpy(&v, &val, sizeof(v));
+    sign = v >> 63 << 15;
+    exp = (v >> 52) & 0x7ff;
+    mant = v << 12 >> 12 >> (53-11);    /* keep only the 11 most significant bits of the mantissa */
+    exp -= 1023;
+    if (exp == 1024) {
+        /* infinity or NaN */
+        exp = 16;
+        mant >>= 1;
+    } else if (exp >= 16) {
+        /* overflow, as largest number */
+        exp = 15;
+        mant = 1023;
+    } else if (exp >= -14) {
+        /* regular normal */
+    } else if (exp >= -24) {
+        /* subnormal */
+        mant |= 1024;
+        mant >>= -(exp + 14);
+        exp = -15;
+    } else {
+        /* underflow, make zero */
+        return 0;
+    }
+
+    /* safe cast here as bit operations above guarantee not to overflow */
+    return (unsigned short)(sign | ((exp + 15) << 10) | mant);
+}
+
+/* this function was copied & adapted from RFC 7049 Appendix D */
+static inline double decode_half(unsigned short half)
+{
+    int exp = (half >> 10) & 0x1f;
+    int mant = half & 0x3ff;
+    double val;
+    if (exp == 0) val = ldexp(mant, -24);
+    else if (exp != 31) val = ldexp(mant + 1024, exp - 25);
+    else val = mant == 0 ? INFINITY : NAN;
+    return half & 0x8000 ? -val : val;
+}
+#  endif
+#endif /* CBOR_NO_HALF_FLOAT_TYPE */
+
+#ifndef CBOR_INTERNAL_API
+#  define CBOR_INTERNAL_API
+#endif
+
+#ifndef CBOR_PARSER_MAX_RECURSIONS
+#  define CBOR_PARSER_MAX_RECURSIONS 1024
+#endif
+
+/*
+ * CBOR Major types
+ * Encoded in the high 3 bits of the descriptor byte
+ * See http://tools.ietf.org/html/rfc7049#section-2.1
+ */
+typedef enum CborMajorTypes {
+    UnsignedIntegerType = 0U,
+    NegativeIntegerType = 1U,
+    ByteStringType = 2U,
+    TextStringType = 3U,
+    ArrayType = 4U,
+    MapType = 5U,           /* a.k.a. object */
+    TagType = 6U,
+    SimpleTypesType = 7U
+} CborMajorTypes;
+
+/*
+ * CBOR simple and floating point types
+ * Encoded in the low 8 bits of the descriptor byte when the
+ * Major Type is 7.
+ */
+typedef enum CborSimpleTypes {
+    FalseValue              = 20,
+    TrueValue               = 21,
+    NullValue               = 22,
+    UndefinedValue          = 23,
+    SimpleTypeInNextByte    = 24,   /* not really a simple type */
+    HalfPrecisionFloat      = 25,   /* ditto */
+    SinglePrecisionFloat    = 26,   /* ditto */
+    DoublePrecisionFloat    = 27,   /* ditto */
+    Break                   = 31
+} CborSimpleTypes;
+
+enum {
+    SmallValueBitLength     = 5U,
+    SmallValueMask          = (1U << SmallValueBitLength) - 1,      /* 31 */
+    Value8Bit               = 24U,
+    Value16Bit              = 25U,
+    Value32Bit              = 26U,
+    Value64Bit              = 27U,
+    IndefiniteLength        = 31U,
+
+    MajorTypeShift          = SmallValueBitLength,
+    MajorTypeMask           = (int) (~0U << MajorTypeShift),
+
+    BreakByte               = (unsigned)Break | (SimpleTypesType << MajorTypeShift)
+};
+
+CBOR_INTERNAL_API CborError CBOR_INTERNAL_API_CC _cbor_value_extract_number(const uint8_t **ptr, const uint8_t *end, uint64_t *len);
+CBOR_INTERNAL_API CborError CBOR_INTERNAL_API_CC _cbor_value_prepare_string_iteration(CborValue *it);
+CBOR_INTERNAL_API CborError CBOR_INTERNAL_API_CC _cbor_value_get_string_chunk(const CborValue *value, const void **bufferptr,
+                                                                              size_t *len, CborValue *next);
+
+
+#endif /* CBORINTERNAL_P_H */
diff --git a/client/tinycbor/cborjson.h b/client/tinycbor/cborjson.h
new file mode 100644
index 000000000..8ff27b920
--- /dev/null
+++ b/client/tinycbor/cborjson.h
@@ -0,0 +1,62 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 Intel Corporation
+**
+** Permission is hereby granted, free of charge, to any person obtaining a copy
+** of this software and associated documentation files (the "Software"), to deal
+** in the Software without restriction, including without limitation the rights
+** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+** copies of the Software, and to permit persons to whom the Software is
+** furnished to do so, subject to the following conditions:
+**
+** The above copyright notice and this permission notice shall be included in
+** all copies or substantial portions of the Software.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+** OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+** THE SOFTWARE.
+**
+****************************************************************************/
+
+#ifndef CBORJSON_H
+#define CBORJSON_H
+
+#include "cbor.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Conversion to JSON */
+enum CborToJsonFlags
+{
+    CborConvertAddMetadata = 1,
+    CborConvertTagsToObjects = 2,
+    CborConvertIgnoreTags = 0,
+
+    CborConvertObeyByteStringTags = 0,
+    CborConvertByteStringsToBase64Url = 4,
+
+    CborConvertRequireMapStringKeys = 0,
+    CborConvertStringifyMapKeys = 8,
+
+    CborConvertDefaultFlags = 0
+};
+
+CBOR_API CborError cbor_value_to_json_advance(FILE *out, CborValue *value, int flags);
+CBOR_INLINE_API CborError cbor_value_to_json(FILE *out, const CborValue *value, int flags)
+{
+    CborValue copy = *value;
+    return cbor_value_to_json_advance(out, &copy, flags);
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* CBORJSON_H */
+
diff --git a/client/tinycbor/cborparser.c b/client/tinycbor/cborparser.c
new file mode 100644
index 000000000..45de2226a
--- /dev/null
+++ b/client/tinycbor/cborparser.c
@@ -0,0 +1,1430 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 Intel Corporation
+**
+** Permission is hereby granted, free of charge, to any person obtaining a copy
+** of this software and associated documentation files (the "Software"), to deal
+** in the Software without restriction, including without limitation the rights
+** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+** copies of the Software, and to permit persons to whom the Software is
+** furnished to do so, subject to the following conditions:
+**
+** The above copyright notice and this permission notice shall be included in
+** all copies or substantial portions of the Software.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+** OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+** THE SOFTWARE.
+**
+****************************************************************************/
+
+#ifndef _BSD_SOURCE
+#define _BSD_SOURCE 1
+#endif
+#ifndef _DEFAULT_SOURCE
+#define _DEFAULT_SOURCE 1
+#endif
+#ifndef __STDC_LIMIT_MACROS
+#  define __STDC_LIMIT_MACROS 1
+#endif
+
+#include "cbor.h"
+#include "cborinternal_p.h"
+#include "compilersupport_p.h"
+
+#include <string.h>
+
+/**
+ * \defgroup CborParsing Parsing CBOR streams
+ * \brief Group of functions used to parse CBOR streams.
+ *
+ * TinyCBOR provides functions for pull-based stream parsing of a CBOR-encoded
+ * payload. The main data type for the parsing is a CborValue, which behaves
+ * like an iterator and can be used to extract the encoded data. It is first
+ * initialized with a call to cbor_parser_init() and is usually used to extract
+ * exactly one item, most often an array or map.
+ *
+ * Nested CborValue objects can be parsed using cbor_value_enter_container().
+ * Each call to cbor_value_enter_container() must be matched by a call to
+ * cbor_value_leave_container(), with the exact same parameters.
+ *
+ * The example below initializes a CborParser object, begins the parsing with a
+ * CborValue and decodes a single integer:
+ *
+ * \code
+ * int extract_int(const uint8_t *buffer, size_t len)
+ * {
+ *     CborParser parser;
+ *     CborValue value;
+ *     int result;
+ *     cbor_parser_init(buffer, len, 0, &parser, &value);
+ *     cbor_value_get_int(&value, &result);
+ *     return result;
+ * }
+ * \endcode
+ *
+ * The code above does no error checking, which means it assumes the data comes
+ * from a source trusted to send one properly-encoded integer. The following
+ * example does the exact same operation, but includes error checking and
+ * returns 0 on parsing failure:
+ *
+ * \code
+ * int extract_int(const uint8_t *buffer, size_t len)
+ * {
+ *     CborParser parser;
+ *     CborValue value;
+ *     int result;
+ *     if (cbor_parser_init(buffer, len, 0, &parser, &value) != CborNoError)
+ *         return 0;
+ *     if (!cbor_value_is_integer(&value) ||
+ *             cbor_value_get_int(&value, &result) != CborNoError)
+ *         return 0;
+ *     return result;
+ * }
+ * \endcode
+ *
+ * Note, in the example above, that one can't distinguish a parsing failure
+ * from an encoded value of zero. Reporting a parsing error is left as an
+ * exercise to the reader.
+ *
+ * The code above does not execute a range-check either: it is possible that
+ * the value decoded from the CBOR stream encodes a number larger than what can
+ * be represented in a variable of type \c{int}. If detecting that case is
+ * important, the code should call cbor_value_get_int_checked() instead.
+ *
+ * <h3 class="groupheader">Memory and parsing constraints</h3>
+ *
+ * TinyCBOR is designed to run with little memory and with minimal overhead.
+ * Except where otherwise noted, the parser functions always run on constant
+ * time (O(1)), do not recurse and never allocate memory (thus, stack usage is
+ * bounded and is O(1)).
+ *
+ * <h3 class="groupheader">Error handling and preconditions</h3>
+ *
+ * All functions operating on a CborValue return a CborError condition, with
+ * CborNoError standing for the normal situation in which no parsing error
+ * occurred. All functions may return parsing errors in case the stream cannot
+ * be decoded properly, be it due to corrupted data or due to reaching the end
+ * of the input buffer.
+ *
+ * Error conditions must not be ignored. All decoder functions have undefined
+ * behavior if called after an error has been reported, and may crash.
+ *
+ * Some functions are also documented to have preconditions, like
+ * cbor_value_get_int() requiring that the input be an integral value.
+ * Violation of preconditions also results in undefined behavior and the
+ * program may crash.
+ */
+
+/**
+ * \addtogroup CborParsing
+ * @{
+ */
+
+/**
+ * \struct CborValue
+ *
+ * This type contains one value parsed from the CBOR stream. Each CborValue
+ * behaves as an iterator in a StAX-style parser.
+ *
+ * \if privatedocs
+ * Implementation details: the CborValue contains these fields:
+ * \list
+ *   \li ptr: pointer to the actual data
+ *   \li flags: flags from the decoder
+ *   \li extra: partially decoded integer value (0, 1 or 2 bytes)
+ *   \li remaining: remaining items in this collection after this item or UINT32_MAX if length is unknown
+ * \endlist
+ * \endif
+ */
+
+static inline uint16_t get16(const uint8_t *ptr)
+{
+    uint16_t result;
+    memcpy(&result, ptr, sizeof(result));
+    return cbor_ntohs(result);
+}
+
+static inline uint32_t get32(const uint8_t *ptr)
+{
+    uint32_t result;
+    memcpy(&result, ptr, sizeof(result));
+    return cbor_ntohl(result);
+}
+
+static inline uint64_t get64(const uint8_t *ptr)
+{
+    uint64_t result;
+    memcpy(&result, ptr, sizeof(result));
+    return cbor_ntohll(result);
+}
+
+CborError CBOR_INTERNAL_API_CC _cbor_value_extract_number(const uint8_t **ptr, const uint8_t *end, uint64_t *len)
+{
+    size_t bytesNeeded;
+    uint8_t additional_information = **ptr & SmallValueMask;
+    ++*ptr;
+    if (additional_information < Value8Bit) {
+        *len = additional_information;
+        return CborNoError;
+    }
+    if (unlikely(additional_information > Value64Bit))
+        return CborErrorIllegalNumber;
+
+    bytesNeeded = (size_t)(1 << (additional_information - Value8Bit));
+    if (unlikely(bytesNeeded > (size_t)(end - *ptr))) {
+        return CborErrorUnexpectedEOF;
+    } else if (bytesNeeded == 1) {
+        *len = (uint8_t)(*ptr)[0];
+    } else if (bytesNeeded == 2) {
+        *len = get16(*ptr);
+    } else if (bytesNeeded == 4) {
+        *len = get32(*ptr);
+    } else {
+        *len = get64(*ptr);
+    }
+    *ptr += bytesNeeded;
+    return CborNoError;
+}
+
+static CborError extract_length(const CborParser *parser, const uint8_t **ptr, size_t *len)
+{
+    uint64_t v;
+    CborError err = _cbor_value_extract_number(ptr, parser->end, &v);
+    if (err) {
+        *len = 0;
+        return err;
+    }
+
+    *len = (size_t)v;
+    if (v != *len)
+        return CborErrorDataTooLarge;
+    return CborNoError;
+}
+
+static bool is_fixed_type(uint8_t type)
+{
+    return type != CborTextStringType && type != CborByteStringType && type != CborArrayType &&
+           type != CborMapType;
+}
+
+static CborError preparse_value(CborValue *it)
+{
+    const CborParser *parser = it->parser;
+    it->type = CborInvalidType;
+
+    /* are we at the end? */
+    if (it->ptr == parser->end)
+        return CborErrorUnexpectedEOF;
+
+    uint8_t descriptor = *it->ptr;
+    uint8_t type = descriptor & MajorTypeMask;
+    it->type = type;
+    it->flags = 0;
+    it->extra = (descriptor &= SmallValueMask);
+
+    if (descriptor > Value64Bit) {
+        if (unlikely(descriptor != IndefiniteLength))
+            return type == CborSimpleType ? CborErrorUnknownType : CborErrorIllegalNumber;
+        if (likely(!is_fixed_type(type))) {
+            /* special case */
+            it->flags |= CborIteratorFlag_UnknownLength;
+            it->type = type;
+            return CborNoError;
+        }
+        return type == CborSimpleType ? CborErrorUnexpectedBreak : CborErrorIllegalNumber;
+    }
+
+    size_t bytesNeeded = descriptor < Value8Bit ? 0 : (1 << (descriptor - Value8Bit));
+    if (bytesNeeded + 1 > (size_t)(parser->end - it->ptr))
+        return CborErrorUnexpectedEOF;
+
+    uint8_t majortype = type >> MajorTypeShift;
+    if (majortype == NegativeIntegerType) {
+        it->flags |= CborIteratorFlag_NegativeInteger;
+        it->type = CborIntegerType;
+    } else if (majortype == SimpleTypesType) {
+        switch (descriptor) {
+        case FalseValue:
+            it->extra = false;
+            it->type = CborBooleanType;
+            break;
+
+        case SinglePrecisionFloat:
+        case DoublePrecisionFloat:
+            it->flags |= CborIteratorFlag_IntegerValueTooLarge;
+            /* fall through */
+        case TrueValue:
+        case NullValue:
+        case UndefinedValue:
+        case HalfPrecisionFloat:
+            it->type = *it->ptr;
+            break;
+
+        case SimpleTypeInNextByte:
+            it->extra = (uint8_t)it->ptr[1];
+#ifndef CBOR_PARSER_NO_STRICT_CHECKS
+            if (unlikely(it->extra < 32)) {
+                it->type = CborInvalidType;
+                return CborErrorIllegalSimpleType;
+            }
+#endif
+            break;
+
+        case 28:
+        case 29:
+        case 30:
+        case Break:
+            cbor_assert(false);  /* these conditions can't be reached */
+            return CborErrorUnexpectedBreak;
+        }
+        return CborNoError;
+    }
+
+    /* try to decode up to 16 bits */
+    if (descriptor < Value8Bit)
+        return CborNoError;
+
+    if (descriptor == Value8Bit)
+        it->extra = (uint8_t)it->ptr[1];
+    else if (descriptor == Value16Bit)
+        it->extra = get16(it->ptr + 1);
+    else
+        it->flags |= CborIteratorFlag_IntegerValueTooLarge;     /* Value32Bit or Value64Bit */
+    return CborNoError;
+}
+
+static CborError preparse_next_value_nodecrement(CborValue *it)
+{
+    if (it->remaining == UINT32_MAX && it->ptr != it->parser->end && *it->ptr == (uint8_t)BreakByte) {
+        /* end of map or array */
+        ++it->ptr;
+        it->type = CborInvalidType;
+        it->remaining = 0;
+        return CborNoError;
+    }
+
+    return preparse_value(it);
+}
+
+static CborError preparse_next_value(CborValue *it)
+{
+    if (it->remaining != UINT32_MAX) {
+        /* don't decrement the item count if the current item is tag: they don't count */
+        if (it->type != CborTagType && --it->remaining == 0) {
+            it->type = CborInvalidType;
+            return CborNoError;
+        }
+    }
+    return preparse_next_value_nodecrement(it);
+}
+
+static CborError advance_internal(CborValue *it)
+{
+    uint64_t length;
+    CborError err = _cbor_value_extract_number(&it->ptr, it->parser->end, &length);
+    cbor_assert(err == CborNoError);
+
+    if (it->type == CborByteStringType || it->type == CborTextStringType) {
+        cbor_assert(length == (size_t)length);
+        cbor_assert((it->flags & CborIteratorFlag_UnknownLength) == 0);
+        it->ptr += length;
+    }
+
+    return preparse_next_value(it);
+}
+
+/** \internal
+ *
+ * Decodes the CBOR integer value when it is larger than the 16 bits available
+ * in value->extra. This function requires that value->flags have the
+ * CborIteratorFlag_IntegerValueTooLarge flag set.
+ *
+ * This function is also used to extract single- and double-precision floating
+ * point values (SinglePrecisionFloat == Value32Bit and DoublePrecisionFloat ==
+ * Value64Bit).
+ */
+uint64_t _cbor_value_decode_int64_internal(const CborValue *value)
+{
+    cbor_assert(value->flags & CborIteratorFlag_IntegerValueTooLarge ||
+                value->type == CborFloatType || value->type == CborDoubleType);
+
+    /* since the additional information can only be Value32Bit or Value64Bit,
+     * we just need to test for the one bit those two options differ */
+    cbor_assert((*value->ptr & SmallValueMask) == Value32Bit || (*value->ptr & SmallValueMask) == Value64Bit);
+    if ((*value->ptr & 1) == (Value32Bit & 1))
+        return get32(value->ptr + 1);
+
+    cbor_assert((*value->ptr & SmallValueMask) == Value64Bit);
+    return get64(value->ptr + 1);
+}
+
+/**
+ * Initializes the CBOR parser for parsing \a size bytes beginning at \a
+ * buffer. Parsing will use flags set in \a flags. The iterator to the first
+ * element is returned in \a it.
+ *
+ * The \a parser structure needs to remain valid throughout the decoding
+ * process. It is not thread-safe to share one CborParser among multiple
+ * threads iterating at the same time, but the object can be copied so multiple
+ * threads can iterate.
+ */
+CborError cbor_parser_init(const uint8_t *buffer, size_t size, uint32_t flags, CborParser *parser, CborValue *it)
+{
+    memset(parser, 0, sizeof(*parser));
+    parser->end = buffer + size;
+    parser->flags = flags;
+    it->parser = parser;
+    it->ptr = buffer;
+    it->remaining = 1;      /* there's one type altogether, usually an array or map */
+    return preparse_value(it);
+}
+
+/**
+ * \fn bool cbor_value_at_end(const CborValue *it)
+ *
+ * Returns true if \a it has reached the end of the iteration, usually when
+ * advancing after the last item in an array or map.
+ *
+ * In the case of the outermost CborValue object, this function returns true
+ * after decoding a single element. A pointer to the first byte of the
+ * remaining data (if any) can be obtained with cbor_value_get_next_byte().
+ *
+ * \sa cbor_value_advance(), cbor_value_is_valid(), cbor_value_get_next_byte()
+ */
+
+/**
+ * \fn const uint8_t *cbor_value_get_next_byte(const CborValue *it)
+ *
+ * Returns a pointer to the next byte that would be decoded if this CborValue
+ * object were advanced.
+ *
+ * This function is useful if cbor_value_at_end() returns true for the
+ * outermost CborValue: the pointer returned is the first byte of the data
+ * remaining in the buffer, if any. Code can decide whether to begin decoding a
+ * new CBOR data stream from this point, or parse some other data appended to
+ * the same buffer.
+ *
+ * This function may be used even after a parsing error. If that occurred,
+ * then this function returns a pointer to where the parsing error occurred.
+ * Note that the error recovery is not precise and the pointer may not indicate
+ * the exact byte containing bad data.
+ *
+ * \sa cbor_value_at_end()
+ */
+
+/**
+ * \fn bool cbor_value_is_valid(const CborValue *it)
+ *
+ * Returns true if the iterator \a it contains a valid value. Invalid iterators
+ * happen when iteration reaches the end of a container (see \ref
+ * cbor_value_at_end()) or when a search function resulted in no matches.
+ *
+ * \sa cbor_value_advance(), cbor_value_at_end(), cbor_value_get_type()
+ */
+
+/**
+ * Performs a basic validation of the CBOR stream pointed by \a it and returns
+ * the error it found. If no error was found, it returns CborNoError and the
+ * application can iterate over the items with certainty that no other errors
+ * will appear during parsing.
+ *
+ * A basic validation checks for:
+ * \list
+ *   \li absence of undefined additional information bytes;
+ *   \li well-formedness of all numbers, lengths, and simple values;
+ *   \li string contents match reported sizes;
+ *   \li arrays and maps contain the number of elements they are reported to have;
+ * \endlist
+ *
+ * For further checks, see cbor_value_validate().
+ *
+ * This function has the same timing and memory requirements as
+ * cbor_value_advance().
+ *
+ * \sa cbor_value_validate(), cbor_value_advance()
+ */
+CborError cbor_value_validate_basic(const CborValue *it)
+{
+    CborValue value = *it;
+    return cbor_value_advance(&value);
+}
+
+/**
+ * Advances the CBOR value \a it by one fixed-size position. Fixed-size types
+ * are: integers, tags, simple types (including boolean, null and undefined
+ * values) and floating point types.
+ *
+ * If the type is not of fixed size, this function has undefined behavior. Code
+ * must be sure that the current type is one of the fixed-size types before
+ * calling this function. This function is provided because it can guarantee
+ * that it runs in constant time (O(1)).
+ *
+ * If the caller is not able to determine whether the type is fixed or not, code
+ * can use the cbor_value_advance() function instead.
+ *
+ * \sa cbor_value_at_end(), cbor_value_advance(), cbor_value_enter_container(), cbor_value_leave_container()
+ */
+CborError cbor_value_advance_fixed(CborValue *it)
+{
+    cbor_assert(it->type != CborInvalidType);
+    cbor_assert(is_fixed_type(it->type));
+    if (!it->remaining)
+        return CborErrorAdvancePastEOF;
+    return advance_internal(it);
+}
+
+static CborError advance_recursive(CborValue *it, int nestingLevel)
+{
+    CborError err;
+    CborValue recursed;
+
+    if (is_fixed_type(it->type))
+        return advance_internal(it);
+
+    if (!cbor_value_is_container(it)) {
+        size_t len = SIZE_MAX;
+        return _cbor_value_copy_string(it, NULL, &len, it);
+    }
+
+    /* map or array */
+    if (nestingLevel == 0)
+        return CborErrorNestingTooDeep;
+
+    err = cbor_value_enter_container(it, &recursed);
+    if (err)
+        return err;
+    while (!cbor_value_at_end(&recursed)) {
+        err = advance_recursive(&recursed, nestingLevel - 1);
+        if (err)
+            return err;
+    }
+    return cbor_value_leave_container(it, &recursed);
+}
+
+
+/**
+ * Advances the CBOR value \a it by one element, skipping over containers.
+ * Unlike cbor_value_advance_fixed(), this function can be called on a CBOR
+ * value of any type. However, if the type is a container (map or array) or a
+ * string with a chunked payload, this function will not run in constant time
+ * and will recurse into itself (it will run on O(n) time for the number of
+ * elements or chunks and will use O(n) memory for the number of nested
+ * containers).
+ *
+ * The number of recursions can be limited at compile time to avoid stack
+ * exhaustion in constrained systems.
+ *
+ * \sa cbor_value_at_end(), cbor_value_advance_fixed(), cbor_value_enter_container(), cbor_value_leave_container()
+ */
+CborError cbor_value_advance(CborValue *it)
+{
+    cbor_assert(it->type != CborInvalidType);
+    if (!it->remaining)
+        return CborErrorAdvancePastEOF;
+    return advance_recursive(it, CBOR_PARSER_MAX_RECURSIONS);
+}
+
+/**
+ * \fn bool cbor_value_is_tag(const CborValue *value)
+ *
+ * Returns true if the iterator \a value is valid and points to a CBOR tag.
+ *
+ * \sa cbor_value_get_tag(), cbor_value_skip_tag()
+ */
+
+/**
+ * \fn CborError cbor_value_get_tag(const CborValue *value, CborTag *result)
+ *
+ * Retrieves the CBOR tag value that \a value points to and stores it in \a
+ * result. If the iterator \a value does not point to a CBOR tag value, the
+ * behavior is undefined, so checking with \ref cbor_value_get_type or with
+ * \ref cbor_value_is_tag is recommended.
+ *
+ * \sa cbor_value_get_type(), cbor_value_is_valid(), cbor_value_is_tag()
+ */
+
+/**
+ * Advances the CBOR value \a it until it no longer points to a tag. If \a it is
+ * already not pointing to a tag, then this function returns it unchanged.
+ *
+ * This function does not run in constant time: it will run on O(n) for n being
+ * the number of tags. It does use constant memory (O(1) memory requirements).
+ *
+ * \sa cbor_value_advance_fixed(), cbor_value_advance()
+ */
+CborError cbor_value_skip_tag(CborValue *it)
+{
+    while (cbor_value_is_tag(it)) {
+        CborError err = cbor_value_advance_fixed(it);
+        if (err)
+            return err;
+    }
+    return CborNoError;
+}
+
+/**
+ * \fn bool cbor_value_is_container(const CborValue *it)
+ *
+ * Returns true if the \a it value is a container and requires recursion in
+ * order to decode (maps and arrays), false otherwise.
+ */
+
+/**
+ * Creates a CborValue iterator pointing to the first element of the container
+ * represented by \a it and saves it in \a recursed. The \a it container object
+ * needs to be kept and passed again to cbor_value_leave_container() in order
+ * to continue iterating past this container.
+ *
+ * The \a it CborValue iterator must point to a container.
+ *
+ * \sa cbor_value_is_container(), cbor_value_leave_container(), cbor_value_advance()
+ */
+CborError cbor_value_enter_container(const CborValue *it, CborValue *recursed)
+{
+    cbor_assert(cbor_value_is_container(it));
+    *recursed = *it;
+
+    if (it->flags & CborIteratorFlag_UnknownLength) {
+        recursed->remaining = UINT32_MAX;
+        ++recursed->ptr;
+    } else {
+        uint64_t len;
+        CborError err = _cbor_value_extract_number(&recursed->ptr, recursed->parser->end, &len);
+        cbor_assert(err == CborNoError);
+
+        recursed->remaining = (uint32_t)len;
+        if (recursed->remaining != len || len == UINT32_MAX) {
+            /* back track the pointer to indicate where the error occurred */
+            recursed->ptr = it->ptr;
+            return CborErrorDataTooLarge;
+        }
+        if (recursed->type == CborMapType) {
+            /* maps have keys and values, so we need to multiply by 2 */
+            if (recursed->remaining > UINT32_MAX / 2) {
+                /* back track the pointer to indicate where the error occurred */
+                recursed->ptr = it->ptr;
+                return CborErrorDataTooLarge;
+            }
+            recursed->remaining *= 2;
+        }
+        if (len == 0) {
+            /* the case of the empty container */
+            recursed->type = CborInvalidType;
+            return CborNoError;
+        }
+    }
+    return preparse_next_value_nodecrement(recursed);
+}
+
+/**
+ * Updates \a it to point to the next element after the container. The \a
+ * recursed object needs to point to the element obtained either by advancing
+ * the last element of the container (via cbor_value_advance(),
+ * cbor_value_advance_fixed(), a nested cbor_value_leave_container(), or the \c
+ * next pointer from cbor_value_copy_string() or cbor_value_dup_string()).
+ *
+ * The \a it and \a recursed parameters must be the exact same as passed to
+ * cbor_value_enter_container().
+ *
+ * \sa cbor_value_enter_container(), cbor_value_at_end()
+ */
+CborError cbor_value_leave_container(CborValue *it, const CborValue *recursed)
+{
+    cbor_assert(cbor_value_is_container(it));
+    cbor_assert(recursed->type == CborInvalidType);
+    it->ptr = recursed->ptr;
+    return preparse_next_value(it);
+}
+
+
+/**
+ * \fn CborType cbor_value_get_type(const CborValue *value)
+ *
+ * Returns the type of the CBOR value that the iterator \a value points to. If
+ * \a value does not point to a valid value, this function returns \ref
+ * CborInvalidType.
+ *
+ * TinyCBOR also provides functions to test directly if a given CborValue object
+ * is of a given type, like cbor_value_is_text_string() and cbor_value_is_null().
+ *
+ * \sa cbor_value_is_valid()
+ */
+
+/**
+ * \fn bool cbor_value_is_null(const CborValue *value)
+ *
+ * Returns true if the iterator \a value is valid and points to a CBOR null type.
+ *
+ * \sa cbor_value_is_valid(), cbor_value_is_undefined()
+ */
+
+/**
+ * \fn bool cbor_value_is_undefined(const CborValue *value)
+ *
+ * Returns true if the iterator \a value is valid and points to a CBOR undefined type.
+ *
+ * \sa cbor_value_is_valid(), cbor_value_is_null()
+ */
+
+/**
+ * \fn bool cbor_value_is_boolean(const CborValue *value)
+ *
+ * Returns true if the iterator \a value is valid and points to a CBOR boolean
+ * type (true or false).
+ *
+ * \sa cbor_value_is_valid(), cbor_value_get_boolean()
+ */
+
+/**
+ * \fn CborError cbor_value_get_boolean(const CborValue *value, bool *result)
+ *
+ * Retrieves the boolean value that \a value points to and stores it in \a
+ * result. If the iterator \a value does not point to a boolean value, the
+ * behavior is undefined, so checking with \ref cbor_value_get_type or with
+ * \ref cbor_value_is_boolean is recommended.
+ *
+ * \sa cbor_value_get_type(), cbor_value_is_valid(), cbor_value_is_boolean()
+ */
+
+/**
+ * \fn bool cbor_value_is_simple_type(const CborValue *value)
+ *
+ * Returns true if the iterator \a value is valid and points to a CBOR Simple Type
+ * type (other than true, false, null and undefined).
+ *
+ * \sa cbor_value_is_valid(), cbor_value_get_simple_type()
+ */
+
+/**
+ * \fn CborError cbor_value_get_simple_type(const CborValue *value, uint8_t *result)
+ *
+ * Retrieves the CBOR Simple Type value that \a value points to and stores it
+ * in \a result. If the iterator \a value does not point to a simple_type
+ * value, the behavior is undefined, so checking with \ref cbor_value_get_type
+ * or with \ref cbor_value_is_simple_type is recommended.
+ *
+ * \sa cbor_value_get_type(), cbor_value_is_valid(), cbor_value_is_simple_type()
+ */
+
+/**
+ * \fn bool cbor_value_is_integer(const CborValue *value)
+ *
+ * Returns true if the iterator \a value is valid and points to a CBOR integer
+ * type.
+ *
+ * \sa cbor_value_is_valid(), cbor_value_get_int, cbor_value_get_int64, cbor_value_get_uint64, cbor_value_get_raw_integer
+ */
+
+/**
+ * \fn bool cbor_value_is_unsigned_integer(const CborValue *value)
+ *
+ * Returns true if the iterator \a value is valid and points to a CBOR unsigned
+ * integer type (positive values or zero).
+ *
+ * \sa cbor_value_is_valid(), cbor_value_get_uint64()
+ */
+
+/**
+ * \fn bool cbor_value_is_negative_integer(const CborValue *value)
+ *
+ * Returns true if the iterator \a value is valid and points to a CBOR negative
+ * integer type.
+ *
+ * \sa cbor_value_is_valid(), cbor_value_get_int, cbor_value_get_int64, cbor_value_get_raw_integer
+ */
+
+/**
+ * \fn CborError cbor_value_get_int(const CborValue *value, int *result)
+ *
+ * Retrieves the CBOR integer value that \a value points to and stores it in \a
+ * result. If the iterator \a value does not point to an integer value, the
+ * behavior is undefined, so checking with \ref cbor_value_get_type or with
+ * \ref cbor_value_is_integer is recommended.
+ *
+ * Note that this function does not do range-checking: integral values that do
+ * not fit in a variable of type \c{int} are silently truncated to fit. Use
+ * cbor_value_get_int_checked() if that is not acceptable.
+ *
+ * \sa cbor_value_get_type(), cbor_value_is_valid(), cbor_value_is_integer()
+ */
+
+/**
+ * \fn CborError cbor_value_get_int64(const CborValue *value, int64_t *result)
+ *
+ * Retrieves the CBOR integer value that \a value points to and stores it in \a
+ * result. If the iterator \a value does not point to an integer value, the
+ * behavior is undefined, so checking with \ref cbor_value_get_type or with
+ * \ref cbor_value_is_integer is recommended.
+ *
+ * Note that this function does not do range-checking: integral values that do
+ * not fit in a variable of type \c{int64_t} are silently truncated to fit. Use
+ * cbor_value_get_int64_checked() that is not acceptable.
+ *
+ * \sa cbor_value_get_type(), cbor_value_is_valid(), cbor_value_is_integer()
+ */
+
+/**
+ * \fn CborError cbor_value_get_uint64(const CborValue *value, uint64_t *result)
+ *
+ * Retrieves the CBOR integer value that \a value points to and stores it in \a
+ * result. If the iterator \a value does not point to an unsigned integer
+ * value, the behavior is undefined, so checking with \ref cbor_value_get_type
+ * or with \ref cbor_value_is_unsigned_integer is recommended.
+ *
+ * \sa cbor_value_get_type(), cbor_value_is_valid(), cbor_value_is_unsigned_integer()
+ */
+
+/**
+ * \fn CborError cbor_value_get_raw_integer(const CborValue *value, uint64_t *result)
+ *
+ * Retrieves the CBOR integer value that \a value points to and stores it in \a
+ * result. If the iterator \a value does not point to an integer value, the
+ * behavior is undefined, so checking with \ref cbor_value_get_type or with
+ * \ref cbor_value_is_integer is recommended.
+ *
+ * This function is provided because CBOR negative integers can assume values
+ * that cannot be represented with normal 64-bit integer variables.
+ *
+ * If the integer is unsigned (that is, if cbor_value_is_unsigned_integer()
+ * returns true), then \a result will contain the actual value. If the integer
+ * is negative, then \a result will contain the absolute value of that integer,
+ * minus one. That is, \c {actual = -result - 1}. On architectures using two's
+ * complement for representation of negative integers, it is equivalent to say
+ * that \a result will contain the bitwise negation of the actual value.
+ *
+ * \sa cbor_value_get_type(), cbor_value_is_valid(), cbor_value_is_integer()
+ */
+
+/**
+ * Retrieves the CBOR integer value that \a value points to and stores it in \a
+ * result. If the iterator \a value does not point to an integer value, the
+ * behavior is undefined, so checking with \ref cbor_value_get_type or with
+ * \ref cbor_value_is_integer is recommended.
+ *
+ * Unlike \ref cbor_value_get_int64(), this function performs a check to see if the
+ * stored integer fits in \a result without data loss. If the number is outside
+ * the valid range for the data type, this function returns the recoverable
+ * error CborErrorDataTooLarge. In that case, use either
+ * cbor_value_get_uint64() (if the number is positive) or
+ * cbor_value_get_raw_integer().
+ *
+ * \sa cbor_value_get_type(), cbor_value_is_valid(), cbor_value_is_integer(), cbor_value_get_int64()
+ */
+CborError cbor_value_get_int64_checked(const CborValue *value, int64_t *result)
+{
+    uint64_t v;
+    cbor_assert(cbor_value_is_integer(value));
+    v = _cbor_value_extract_int64_helper(value);
+
+    /* Check before converting, as the standard says (C11 6.3.1.3 paragraph 3):
+     * "[if] the new type is signed and the value cannot be represented in it; either the
+     *  result is implementation-defined or an implementation-defined signal is raised."
+     *
+     * The range for int64_t is -2^63 to 2^63-1 (int64_t is required to be
+     * two's complement, C11 7.20.1.1 paragraph 3), which in CBOR is
+     * represented the same way, differing only on the "sign bit" (the major
+     * type).
+     */
+
+    if (unlikely(v > (uint64_t)INT64_MAX))
+        return CborErrorDataTooLarge;
+
+    *result = v;
+    if (value->flags & CborIteratorFlag_NegativeInteger)
+        *result = -*result - 1;
+    return CborNoError;
+}
+
+/**
+ * Retrieves the CBOR integer value that \a value points to and stores it in \a
+ * result. If the iterator \a value does not point to an integer value, the
+ * behavior is undefined, so checking with \ref cbor_value_get_type or with
+ * \ref cbor_value_is_integer is recommended.
+ *
+ * Unlike \ref cbor_value_get_int(), this function performs a check to see if the
+ * stored integer fits in \a result without data loss. If the number is outside
+ * the valid range for the data type, this function returns the recoverable
+ * error CborErrorDataTooLarge. In that case, use one of the other integer
+ * functions to obtain the value.
+ *
+ * \sa cbor_value_get_type(), cbor_value_is_valid(), cbor_value_is_integer(), cbor_value_get_int64(),
+ *     cbor_value_get_uint64(), cbor_value_get_int64_checked(), cbor_value_get_raw_integer()
+ */
+CborError cbor_value_get_int_checked(const CborValue *value, int *result)
+{
+    uint64_t v;
+    cbor_assert(cbor_value_is_integer(value));
+    v = _cbor_value_extract_int64_helper(value);
+
+    /* Check before converting, as the standard says (C11 6.3.1.3 paragraph 3):
+     * "[if] the new type is signed and the value cannot be represented in it; either the
+     *  result is implementation-defined or an implementation-defined signal is raised."
+     *
+     * But we can convert from signed to unsigned without fault (paragraph 2).
+     *
+     * The range for int is implementation-defined and int is not guaranteed to use
+     * two's complement representation (although int32_t is).
+     */
+
+    if (value->flags & CborIteratorFlag_NegativeInteger) {
+        if (unlikely(v > (unsigned) -(INT_MIN + 1)))
+            return CborErrorDataTooLarge;
+
+        *result = (int)v;
+        *result = -*result - 1;
+    } else {
+        if (unlikely(v > (uint64_t)INT_MAX))
+            return CborErrorDataTooLarge;
+
+        *result = (int)v;
+    }
+    return CborNoError;
+
+}
+
+/**
+ * \fn bool cbor_value_is_length_known(const CborValue *value)
+ *
+ * Returns true if the length of this type is known without calculation. That
+ * is, if the length of this CBOR string, map or array is encoded in the data
+ * stream, this function returns true. If the length is not encoded, it returns
+ * false.
+ *
+ * If the length is known, code can call cbor_value_get_string_length(),
+ * cbor_value_get_array_length() or cbor_value_get_map_length() to obtain the
+ * length. If the length is not known but is necessary, code can use the
+ * cbor_value_calculate_string_length() function (no equivalent function is
+ * provided for maps and arrays).
+ */
+
+/**
+ * \fn bool cbor_value_is_text_string(const CborValue *value)
+ *
+ * Returns true if the iterator \a value is valid and points to a CBOR text
+ * string. CBOR text strings are UTF-8 encoded and usually contain
+ * human-readable text.
+ *
+ * \sa cbor_value_is_valid(), cbor_value_get_string_length(), cbor_value_calculate_string_length(),
+ *     cbor_value_copy_text_string(), cbor_value_dup_text_string()
+ */
+
+/**
+ * \fn bool cbor_value_is_byte_string(const CborValue *value)
+ *
+ * Returns true if the iterator \a value is valid and points to a CBOR text
+ * string. CBOR byte strings are binary data with no specified encoding or
+ * format.
+ *
+ * \sa cbor_value_is_valid(), cbor_value_get_string_length(), cbor_value_calculate_string_length(),
+ *     cbor_value_copy_byte_string(), cbor_value_dup_byte_string()
+ */
+
+/**
+ * \fn CborError cbor_value_get_string_length(const CborValue *value, size_t *length)
+ *
+ * Extracts the length of the byte or text string that \a value points to and
+ * stores it in \a result. If the iterator \a value does not point to a text
+ * string or a byte string, the behaviour is undefined, so checking with \ref
+ * cbor_value_get_type, with \ref cbor_value_is_text_string or \ref
+ * cbor_value_is_byte_string is recommended.
+ *
+ * If the length of this string is not encoded in the CBOR data stream, this
+ * function will return the recoverable error CborErrorUnknownLength. You may
+ * also check whether that is the case by using cbor_value_is_length_known().
+ *
+ * If the length of the string is required but the length was not encoded, use
+ * cbor_value_calculate_string_length(), but note that that function does not
+ * run in constant time.
+ *
+ * \note On 32-bit platforms, this function will return error condition of \ref
+ * CborErrorDataTooLarge if the stream indicates a length that is too big to
+ * fit in 32-bit.
+ *
+ * \sa cbor_value_is_valid(), cbor_value_is_length_known(), cbor_value_calculate_string_length()
+ */
+
+/**
+ * Calculates the length of the byte or text string that \a value points to and
+ * stores it in \a len. If the iterator \a value does not point to a text
+ * string or a byte string, the behaviour is undefined, so checking with \ref
+ * cbor_value_get_type, with \ref cbor_value_is_text_string or \ref
+ * cbor_value_is_byte_string is recommended.
+ *
+ * This function is different from cbor_value_get_string_length() in that it
+ * calculates the length even for strings sent in chunks. For that reason, this
+ * function may not run in constant time (it will run in O(n) time on the
+ * number of chunks). It does use constant memory (O(1)).
+ *
+ * \note On 32-bit platforms, this function will return error condition of \ref
+ * CborErrorDataTooLarge if the stream indicates a length that is too big to
+ * fit in 32-bit.
+ *
+ * \sa cbor_value_get_string_length(), cbor_value_copy_text_string(), cbor_value_copy_byte_string(), cbor_value_is_length_known()
+ */
+CborError cbor_value_calculate_string_length(const CborValue *value, size_t *len)
+{
+    *len = SIZE_MAX;
+    return _cbor_value_copy_string(value, NULL, len, NULL);
+}
+
+static inline void prepare_string_iteration(CborValue *it)
+{
+    if (!cbor_value_is_length_known(it)) {
+        /* chunked string: we're before the first chunk;
+         * advance to the first chunk */
+        ++it->ptr;
+        it->flags |= CborIteratorFlag_IteratingStringChunks;
+    }
+}
+
+CborError CBOR_INTERNAL_API_CC _cbor_value_prepare_string_iteration(CborValue *it)
+{
+    cbor_assert((it->flags & CborIteratorFlag_IteratingStringChunks) == 0);
+    prepare_string_iteration(it);
+
+    /* are we at the end? */
+    if (it->ptr == it->parser->end)
+        return CborErrorUnexpectedEOF;
+    return CborNoError;
+}
+
+static CborError get_string_chunk(CborValue *it, const void **bufferptr, size_t *len)
+{
+    CborError err;
+
+    /* Possible states:
+     * length known | iterating | meaning
+     *     no       |    no     | before the first chunk of a chunked string
+     *     yes      |    no     | at a non-chunked string
+     *     no       |    yes    | second or later chunk
+     *     yes      |    yes    | after a non-chunked string
+     */
+    if (it->flags & CborIteratorFlag_IteratingStringChunks) {
+        /* already iterating */
+        if (cbor_value_is_length_known(it)) {
+            /* if the length was known, it wasn't chunked, so finish iteration */
+            goto last_chunk;
+        }
+    } else {
+        prepare_string_iteration(it);
+    }
+
+    /* are we at the end? */
+    if (it->ptr == it->parser->end)
+        return CborErrorUnexpectedEOF;
+
+    if (*it->ptr == BreakByte) {
+        /* last chunk */
+        ++it->ptr;
+last_chunk:
+        *bufferptr = NULL;
+        *len = 0;
+        return preparse_next_value(it);
+    } else if ((uint8_t)(*it->ptr & MajorTypeMask) == it->type) {
+        err = extract_length(it->parser, &it->ptr, len);
+        if (err)
+            return err;
+        if (*len > (size_t)(it->parser->end - it->ptr))
+            return CborErrorUnexpectedEOF;
+
+        *bufferptr = it->ptr;
+        it->ptr += *len;
+    } else {
+        return CborErrorIllegalType;
+    }
+
+    it->flags |= CborIteratorFlag_IteratingStringChunks;
+    return CborNoError;
+}
+
+CborError CBOR_INTERNAL_API_CC
+_cbor_value_get_string_chunk(const CborValue *value, const void **bufferptr,
+                             size_t *len, CborValue *next)
+{
+    CborValue tmp;
+    if (!next)
+        next = &tmp;
+    *next = *value;
+    return get_string_chunk(next, bufferptr, len);
+}
+
+/* We return uintptr_t so that we can pass memcpy directly as the iteration
+ * function. The choice is to optimize for memcpy, which is used in the base
+ * parser API (cbor_value_copy_string), while memcmp is used in convenience API
+ * only. */
+typedef uintptr_t (*IterateFunction)(char *, const uint8_t *, size_t);
+
+static uintptr_t iterate_noop(char *dest, const uint8_t *src, size_t len)
+{
+    (void)dest;
+    (void)src;
+    (void)len;
+    return true;
+}
+
+static uintptr_t iterate_memcmp(char *s1, const uint8_t *s2, size_t len)
+{
+    return memcmp(s1, (const char *)s2, len) == 0;
+}
+
+static uintptr_t iterate_memcpy(char *dest, const uint8_t *src, size_t len)
+{
+    return (uintptr_t)memcpy(dest, src, len);
+}
+
+static CborError iterate_string_chunks(const CborValue *value, char *buffer, size_t *buflen,
+                                       bool *result, CborValue *next, IterateFunction func)
+{
+    CborError err;
+    CborValue tmp;
+    size_t total = 0;
+    const void *ptr;
+
+    cbor_assert(cbor_value_is_byte_string(value) || cbor_value_is_text_string(value));
+    if (!next)
+        next = &tmp;
+    *next = *value;
+    *result = true;
+
+    while (1) {
+        size_t newTotal;
+        size_t chunkLen;
+        err = get_string_chunk(next, &ptr, &chunkLen);
+        if (err)
+            return err;
+        if (!ptr)
+            break;
+
+        if (unlikely(add_check_overflow(total, chunkLen, &newTotal)))
+            return CborErrorDataTooLarge;
+
+        if (*result && *buflen >= newTotal)
+            *result = !!func(buffer + total, (const uint8_t *)ptr, chunkLen);
+        else
+            *result = false;
+
+        total = newTotal;
+    }
+
+    /* is there enough room for the ending NUL byte? */
+    if (*result && *buflen > total) {
+        uint8_t nul[] = { 0 };
+        *result = !!func(buffer + total, nul, 1);
+    }
+    *buflen = total;
+    return CborNoError;
+}
+
+/**
+ * \fn CborError cbor_value_copy_text_string(const CborValue *value, char *buffer, size_t *buflen, CborValue *next)
+ *
+ * Copies the string pointed to by \a value into the buffer provided at \a buffer
+ * of \a buflen bytes. If \a buffer is a NULL pointer, this function will not
+ * copy anything and will only update the \a next value.
+ *
+ * If the iterator \a value does not point to a text string, the behaviour is
+ * undefined, so checking with \ref cbor_value_get_type or \ref
+ * cbor_value_is_text_string is recommended.
+ *
+ * If the provided buffer length was too small, this function returns an error
+ * condition of \ref CborErrorOutOfMemory. If you need to calculate the length
+ * of the string in order to preallocate a buffer, use
+ * cbor_value_calculate_string_length().
+ *
+ * On success, this function sets the number of bytes copied to \c{*buflen}. If
+ * the buffer is large enough, this function will insert a null byte after the
+ * last copied byte, to facilitate manipulation of text strings. That byte is
+ * not included in the returned value of \c{*buflen}. If there was no space for
+ * the terminating null, no error is returned, so callers must check the value
+ * of *buflen after the call, before relying on the '\0'; if it has not been
+ * changed by the call, there is no '\0'-termination on the buffer's contents.
+ *
+ * The \a next pointer, if not null, will be updated to point to the next item
+ * after this string. If \a value points to the last item, then \a next will be
+ * invalid.
+ *
+ * This function may not run in constant time (it will run in O(n) time on the
+ * number of chunks). It requires constant memory (O(1)).
+ *
+ * \note This function does not perform UTF-8 validation on the incoming text
+ * string.
+ *
+ * \sa cbor_value_get_text_string_chunk() cbor_value_dup_text_string(), cbor_value_copy_byte_string(), cbor_value_get_string_length(), cbor_value_calculate_string_length()
+ */
+
+/**
+ * \fn CborError cbor_value_copy_byte_string(const CborValue *value, uint8_t *buffer, size_t *buflen, CborValue *next)
+ *
+ * Copies the string pointed by \a value into the buffer provided at \a buffer
+ * of \a buflen bytes. If \a buffer is a NULL pointer, this function will not
+ * copy anything and will only update the \a next value.
+ *
+ * If the iterator \a value does not point to a byte string, the behaviour is
+ * undefined, so checking with \ref cbor_value_get_type or \ref
+ * cbor_value_is_byte_string is recommended.
+ *
+ * If the provided buffer length was too small, this function returns an error
+ * condition of \ref CborErrorOutOfMemory. If you need to calculate the length
+ * of the string in order to preallocate a buffer, use
+ * cbor_value_calculate_string_length().
+ *
+ * On success, this function sets the number of bytes copied to \c{*buflen}. If
+ * the buffer is large enough, this function will insert a null byte after the
+ * last copied byte, to facilitate manipulation of null-terminated strings.
+ * That byte is not included in the returned value of \c{*buflen}.
+ *
+ * The \a next pointer, if not null, will be updated to point to the next item
+ * after this string. If \a value points to the last item, then \a next will be
+ * invalid.
+ *
+ * This function may not run in constant time (it will run in O(n) time on the
+ * number of chunks). It requires constant memory (O(1)).
+ *
+ * \sa cbor_value_get_byte_string_chunk(), cbor_value_dup_text_string(), cbor_value_copy_text_string(), cbor_value_get_string_length(), cbor_value_calculate_string_length()
+ */
+
+CborError _cbor_value_copy_string(const CborValue *value, void *buffer,
+                                 size_t *buflen, CborValue *next)
+{
+    bool copied_all;
+    CborError err = iterate_string_chunks(value, (char*)buffer, buflen, &copied_all, next,
+                                          buffer ? iterate_memcpy : iterate_noop);
+    return err ? err :
+                 copied_all ? CborNoError : CborErrorOutOfMemory;
+}
+
+/**
+ * Compares the entry \a value with the string \a string and stores the result
+ * in \a result. If the value is different from \a string \a result will
+ * contain \c false.
+ *
+ * The entry at \a value may be a tagged string. If \a value is not a string or
+ * a tagged string, the comparison result will be false.
+ *
+ * CBOR requires text strings to be encoded in UTF-8, but this function does
+ * not validate either the strings in the stream or the string \a string to be
+ * matched. Moreover, comparison is done on strict codepoint comparison,
+ * without any Unicode normalization.
+ *
+ * This function may not run in constant time (it will run in O(n) time on the
+ * number of chunks). It requires constant memory (O(1)).
+ *
+ * \sa cbor_value_skip_tag(), cbor_value_copy_text_string()
+ */
+CborError cbor_value_text_string_equals(const CborValue *value, const char *string, bool *result)
+{
+    size_t len;
+    CborValue copy = *value;
+    CborError err = cbor_value_skip_tag(&copy);
+    if (err)
+        return err;
+    if (!cbor_value_is_text_string(&copy)) {
+        *result = false;
+        return CborNoError;
+    }
+
+    len = strlen(string);
+    return iterate_string_chunks(&copy, CONST_CAST(char *, string), &len, result, NULL, iterate_memcmp);
+}
+
+/**
+ * \fn bool cbor_value_is_array(const CborValue *value)
+ *
+ * Returns true if the iterator \a value is valid and points to a CBOR array.
+ *
+ * \sa cbor_value_is_valid(), cbor_value_is_map()
+ */
+
+/**
+ * \fn CborError cbor_value_get_array_length(const CborValue *value, size_t *length)
+ *
+ * Extracts the length of the CBOR array that \a value points to and stores it
+ * in \a result. If the iterator \a value does not point to a CBOR array, the
+ * behaviour is undefined, so checking with \ref cbor_value_get_type or \ref
+ * cbor_value_is_array is recommended.
+ *
+ * If the length of this array is not encoded in the CBOR data stream, this
+ * function will return the recoverable error CborErrorUnknownLength. You may
+ * also check whether that is the case by using cbor_value_is_length_known().
+ *
+ * \note On 32-bit platforms, this function will return error condition of \ref
+ * CborErrorDataTooLarge if the stream indicates a length that is too big to
+ * fit in 32-bit.
+ *
+ * \sa cbor_value_is_valid(), cbor_value_is_length_known()
+ */
+
+/**
+ * \fn bool cbor_value_is_map(const CborValue *value)
+ *
+ * Returns true if the iterator \a value is valid and points to a CBOR map.
+ *
+ * \sa cbor_value_is_valid(), cbor_value_is_array()
+ */
+
+/**
+ * \fn CborError cbor_value_get_map_length(const CborValue *value, size_t *length)
+ *
+ * Extracts the length of the CBOR map that \a value points to and stores it in
+ * \a result. If the iterator \a value does not point to a CBOR map, the
+ * behaviour is undefined, so checking with \ref cbor_value_get_type or \ref
+ * cbor_value_is_map is recommended.
+ *
+ * If the length of this map is not encoded in the CBOR data stream, this
+ * function will return the recoverable error CborErrorUnknownLength. You may
+ * also check whether that is the case by using cbor_value_is_length_known().
+ *
+ * \note On 32-bit platforms, this function will return error condition of \ref
+ * CborErrorDataTooLarge if the stream indicates a length that is too big to
+ * fit in 32-bit.
+ *
+ * \sa cbor_value_is_valid(), cbor_value_is_length_known()
+ */
+
+/**
+ * Attempts to find the value in map \a map that corresponds to the text string
+ * entry \a string. If the iterator \a value does not point to a CBOR map, the
+ * behaviour is undefined, so checking with \ref cbor_value_get_type or \ref
+ * cbor_value_is_map is recommended.
+ *
+ * If the item is found, it is stored in \a result. If no item is found
+ * matching the key, then \a result will contain an element of type \ref
+ * CborInvalidType. Matching is performed using
+ * cbor_value_text_string_equals(), so tagged strings will also match.
+ *
+ * This function has a time complexity of O(n) where n is the number of
+ * elements in the map to be searched. In addition, this function is has O(n)
+ * memory requirement based on the number of nested containers (maps or arrays)
+ * found as elements of this map.
+ *
+ * \sa cbor_value_is_valid(), cbor_value_text_string_equals(), cbor_value_advance()
+ */
+CborError cbor_value_map_find_value(const CborValue *map, const char *string, CborValue *element)
+{
+    CborError err;
+    size_t len = strlen(string);
+    cbor_assert(cbor_value_is_map(map));
+    err = cbor_value_enter_container(map, element);
+    if (err)
+        goto error;
+
+    while (!cbor_value_at_end(element)) {
+        /* find the non-tag so we can compare */
+        err = cbor_value_skip_tag(element);
+        if (err)
+            goto error;
+        if (cbor_value_is_text_string(element)) {
+            bool equals;
+            size_t dummyLen = len;
+            err = iterate_string_chunks(element, CONST_CAST(char *, string), &dummyLen,
+                                        &equals, element, iterate_memcmp);
+            if (err)
+                goto error;
+            if (equals)
+                return preparse_value(element);
+        } else {
+            /* skip this key */
+            err = cbor_value_advance(element);
+            if (err)
+                goto error;
+        }
+
+        /* skip this value */
+        err = cbor_value_skip_tag(element);
+        if (err)
+            goto error;
+        err = cbor_value_advance(element);
+        if (err)
+            goto error;
+    }
+
+    /* not found */
+    element->type = CborInvalidType;
+    return CborNoError;
+
+error:
+    element->type = CborInvalidType;
+    return err;
+}
+
+/**
+ * \fn bool cbor_value_is_float(const CborValue *value)
+ *
+ * Returns true if the iterator \a value is valid and points to a CBOR
+ * single-precision floating point (32-bit).
+ *
+ * \sa cbor_value_is_valid(), cbor_value_is_double(), cbor_value_is_half_float()
+ */
+
+/**
+ * \fn CborError cbor_value_get_float(const CborValue *value, float *result)
+ *
+ * Retrieves the CBOR single-precision floating point (32-bit) value that \a
+ * value points to and stores it in \a result. If the iterator \a value does
+ * not point to a single-precision floating point value, the behavior is
+ * undefined, so checking with \ref cbor_value_get_type or with \ref
+ * cbor_value_is_float is recommended.
+ *
+ * \sa cbor_value_get_type(), cbor_value_is_valid(), cbor_value_is_float(), cbor_value_get_double()
+ */
+
+/**
+ * \fn bool cbor_value_is_double(const CborValue *value)
+ *
+ * Returns true if the iterator \a value is valid and points to a CBOR
+ * double-precision floating point (64-bit).
+ *
+ * \sa cbor_value_is_valid(), cbor_value_is_float(), cbor_value_is_half_float()
+ */
+
+/**
+ * \fn CborError cbor_value_get_double(const CborValue *value, float *result)
+ *
+ * Retrieves the CBOR double-precision floating point (64-bit) value that \a
+ * value points to and stores it in \a result. If the iterator \a value does
+ * not point to a double-precision floating point value, the behavior is
+ * undefined, so checking with \ref cbor_value_get_type or with \ref
+ * cbor_value_is_double is recommended.
+ *
+ * \sa cbor_value_get_type(), cbor_value_is_valid(), cbor_value_is_double(), cbor_value_get_float()
+ */
+
+/**
+ * \fn bool cbor_value_is_half_float(const CborValue *value)
+ *
+ * Returns true if the iterator \a value is valid and points to a CBOR
+ * single-precision floating point (16-bit).
+ *
+ * \sa cbor_value_is_valid(), cbor_value_is_double(), cbor_value_is_float()
+ */
+
+/**
+ * Retrieves the CBOR half-precision floating point (16-bit) value that \a
+ * value points to and stores it in \a result. If the iterator \a value does
+ * not point to a half-precision floating point value, the behavior is
+ * undefined, so checking with \ref cbor_value_get_type or with \ref
+ * cbor_value_is_half_float is recommended.
+ *
+ * Note: since the C language does not have a standard type for half-precision
+ * floating point, this function takes a \c{void *} as a parameter for the
+ * storage area, which must be at least 16 bits wide.
+ *
+ * \sa cbor_value_get_type(), cbor_value_is_valid(), cbor_value_is_half_float(), cbor_value_get_float()
+ */
+CborError cbor_value_get_half_float(const CborValue *value, void *result)
+{
+    uint16_t v;
+    cbor_assert(cbor_value_is_half_float(value));
+
+    /* size has been computed already */
+    v = get16(value->ptr + 1);
+    memcpy(result, &v, sizeof(v));
+    return CborNoError;
+}
+
+/** @} */
diff --git a/client/tinycbor/cborparser_dup_string.c b/client/tinycbor/cborparser_dup_string.c
new file mode 100644
index 000000000..061c5ac77
--- /dev/null
+++ b/client/tinycbor/cborparser_dup_string.c
@@ -0,0 +1,119 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 Intel Corporation
+**
+** Permission is hereby granted, free of charge, to any person obtaining a copy
+** of this software and associated documentation files (the "Software"), to deal
+** in the Software without restriction, including without limitation the rights
+** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+** copies of the Software, and to permit persons to whom the Software is
+** furnished to do so, subject to the following conditions:
+**
+** The above copyright notice and this permission notice shall be included in
+** all copies or substantial portions of the Software.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+** OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+** THE SOFTWARE.
+**
+****************************************************************************/
+
+#ifndef _BSD_SOURCE
+#define _BSD_SOURCE 1
+#endif
+#ifndef _DEFAULT_SOURCE
+#define _DEFAULT_SOURCE 1
+#endif
+#ifndef __STDC_LIMIT_MACROS
+#  define __STDC_LIMIT_MACROS 1
+#endif
+
+#include "cbor.h"
+#include "compilersupport_p.h"
+#include <stdlib.h>
+
+/**
+ * \fn CborError cbor_value_dup_text_string(const CborValue *value, char **buffer, size_t *buflen, CborValue *next)
+ *
+ * Allocates memory for the string pointed by \a value and copies it into this
+ * buffer. The pointer to the buffer is stored in \a buffer and the number of
+ * bytes copied is stored in \a buflen (those variables must not be NULL).
+ *
+ * If the iterator \a value does not point to a text string, the behaviour is
+ * undefined, so checking with \ref cbor_value_get_type or \ref
+ * cbor_value_is_text_string is recommended.
+ *
+ * If \c malloc returns a NULL pointer, this function will return error
+ * condition \ref CborErrorOutOfMemory.
+ *
+ * On success, \c{*buffer} will contain a valid pointer that must be freed by
+ * calling \c{free()}. This is the case even for zero-length strings.
+ *
+ * The \a next pointer, if not null, will be updated to point to the next item
+ * after this string. If \a value points to the last item, then \a next will be
+ * invalid.
+ *
+ * This function may not run in constant time (it will run in O(n) time on the
+ * number of chunks). It requires constant memory (O(1)) in addition to the
+ * malloc'ed block.
+ *
+ * \note This function does not perform UTF-8 validation on the incoming text
+ * string.
+ *
+ * \sa cbor_value_get_text_string_chunk(), cbor_value_copy_text_string(), cbor_value_dup_byte_string()
+ */
+
+/**
+ * \fn CborError cbor_value_dup_byte_string(const CborValue *value, uint8_t **buffer, size_t *buflen, CborValue *next)
+ *
+ * Allocates memory for the string pointed by \a value and copies it into this
+ * buffer. The pointer to the buffer is stored in \a buffer and the number of
+ * bytes copied is stored in \a buflen (those variables must not be NULL).
+ *
+ * If the iterator \a value does not point to a byte string, the behaviour is
+ * undefined, so checking with \ref cbor_value_get_type or \ref
+ * cbor_value_is_byte_string is recommended.
+ *
+ * If \c malloc returns a NULL pointer, this function will return error
+ * condition \ref CborErrorOutOfMemory.
+ *
+ * On success, \c{*buffer} will contain a valid pointer that must be freed by
+ * calling \c{free()}. This is the case even for zero-length strings.
+ *
+ * The \a next pointer, if not null, will be updated to point to the next item
+ * after this string. If \a value points to the last item, then \a next will be
+ * invalid.
+ *
+ * This function may not run in constant time (it will run in O(n) time on the
+ * number of chunks). It requires constant memory (O(1)) in addition to the
+ * malloc'ed block.
+ *
+ * \sa cbor_value_get_text_string_chunk(), cbor_value_copy_byte_string(), cbor_value_dup_text_string()
+ */
+CborError _cbor_value_dup_string(const CborValue *value, void **buffer, size_t *buflen, CborValue *next)
+{
+    CborError err;
+    cbor_assert(buffer);
+    cbor_assert(buflen);
+    *buflen = SIZE_MAX;
+    err = _cbor_value_copy_string(value, NULL, buflen, NULL);
+    if (err)
+        return err;
+
+    ++*buflen;
+    *buffer = malloc(*buflen);
+    if (!*buffer) {
+        /* out of memory */
+        return CborErrorOutOfMemory;
+    }
+    err = _cbor_value_copy_string(value, *buffer, buflen, next);
+    if (err) {
+        free(*buffer);
+        return err;
+    }
+    return CborNoError;
+}
diff --git a/client/tinycbor/cborpretty.c b/client/tinycbor/cborpretty.c
new file mode 100644
index 000000000..b8825deee
--- /dev/null
+++ b/client/tinycbor/cborpretty.c
@@ -0,0 +1,578 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 Intel Corporation
+**
+** Permission is hereby granted, free of charge, to any person obtaining a copy
+** of this software and associated documentation files (the "Software"), to deal
+** in the Software without restriction, including without limitation the rights
+** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+** copies of the Software, and to permit persons to whom the Software is
+** furnished to do so, subject to the following conditions:
+**
+** The above copyright notice and this permission notice shall be included in
+** all copies or substantial portions of the Software.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+** OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+** THE SOFTWARE.
+**
+****************************************************************************/
+
+#define _BSD_SOURCE 1
+#define _DEFAULT_SOURCE 1
+#ifndef __STDC_LIMIT_MACROS
+#  define __STDC_LIMIT_MACROS 1
+#endif
+
+#include "cbor.h"
+#include "cborinternal_p.h"
+#include "compilersupport_p.h"
+#include "utf8_p.h"
+
+#include <inttypes.h>
+#include <string.h>
+
+/**
+ * \defgroup CborPretty Converting CBOR to text
+ * \brief Group of functions used to convert CBOR to text form.
+ *
+ * This group contains two functions that can be used to convert a \ref
+ * CborValue object to a text representation. This module attempts to follow
+ * the recommendations from RFC 7049 section 6 "Diagnostic Notation", though it
+ * has a few differences. They are noted below.
+ *
+ * TinyCBOR does not provide a way to convert from the text representation back
+ * to encoded form. To produce a text form meant to be parsed, CborToJson is
+ * recommended instead.
+ *
+ * Either of the functions in this section will attempt to convert exactly one
+ * CborValue object to text. Those functions may return any error documented
+ * for the functions for CborParsing. In addition, if the C standard library
+ * stream functions return with error, the text conversion will return with
+ * error CborErrorIO.
+ *
+ * These functions also perform UTF-8 validation in CBOR text strings. If they
+ * encounter a sequence of bytes that is not permitted in UTF-8, they will return
+ * CborErrorInvalidUtf8TextString. That includes encoding of surrogate points
+ * in UTF-8.
+ *
+ * \warning The output type produced by these functions is not guaranteed to
+ * remain stable. A future update of TinyCBOR may produce different output for
+ * the same input and parsers may be unable to handle it.
+ *
+ * \sa CborParsing, CborToJson, cbor_parser_init()
+ */
+
+/**
+ * \addtogroup CborPretty
+ * @{
+ * <h2 class="groupheader">Text format</h2>
+ *
+ * As described in RFC 7049 section 6 "Diagnostic Notation", the format is
+ * largely borrowed from JSON, but modified to suit CBOR's different data
+ * types. TinyCBOR makes further modifications to distinguish different, but
+ * similar values.
+ *
+ * CBOR values are currently encoded as follows:
+ * \par Integrals (unsigned and negative)
+ *      Base-10 (decimal) text representation of the value
+ * \par Byte strings:
+ *      <tt>"h'"</tt> followed by the Base16 (hex) representation of the binary data, followed by an ending quote (')
+ * \par Text strings:
+ *      C-style escaped string in quotes, with C11/C++11 escaping of Unicode codepoints above U+007F.
+ * \par Tags:
+ *      Tag value, with the tagged value in parentheses. No special encoding of the tagged value is performed.
+ * \par Simple types:
+ *      <tt>"simple(nn)"</tt> where \c nn is the simple value
+ * \par Null:
+ *      \c null
+ * \par Undefined:
+ *      \c undefined
+ * \par Booleans:
+ *      \c true or \c false
+ * \par Floating point:
+ *      If NaN or infinite, the actual words \c NaN or \c infinite.
+ *      Otherwise, the decimal representation with as many digits as necessary to ensure no loss of information.
+ *      By default, float values are suffixed by "f" and half-float values suffixed by "f16" (doubles have no suffix).
+ *      If the CborPrettyNumericEncodingIndicators flag is active, the values instead are encoded following the
+ *      Section 6 recommended encoding indicators: float values are suffixed with "_2" and half-float with "_1".
+ *      A decimal point is always present.
+ * \par Arrays:
+ *      Comma-separated list of elements, enclosed in square brackets ("[" and "]").
+ * \par Maps:
+ *      Comma-separated list of key-value pairs, with the key and value separated
+ *      by a colon (":"), enclosed in curly braces ("{" and "}").
+ *
+ * The CborPrettyFlags enumerator contains flags to control some aspects of the
+ * encoding:
+ * \par String fragmentation
+ *      When the CborPrettyShowStringFragments option is active, text and byte
+ *      strings that are transmitted in fragments are shown instead inside
+ *      parentheses ("(" and ")") with no preceding number and each fragment is
+ *      displayed individually. If a tag precedes the string, then the output
+ *      will contain a double set of parentheses. If the option is not active,
+ *      the fragments are merged together and the display will not show any
+ *      difference from a string transmitted with determinate length.
+ * \par Encoding indicators
+ *      Numbers and lengths in CBOR can be encoded in multiple representations.
+ *      If the CborPrettyIndicateOverlongNumbers option is active, numbers
+ *      and lengths that are transmitted in a longer encoding than necessary
+ *      will be indicated, by appending an underscore ("_") to either the
+ *      number or the opening bracket or brace, followed by a number
+ *      indicating the CBOR additional information: 0 for 1 byte, 1 for 2
+ *      bytes, 2 for 4 bytes and 3 for 8 bytes.
+ *      If the CborPrettyIndicateIndeterminateLength option is active, maps,
+ *      arrays and strings encoded with indeterminate length will be marked by
+ *      an underscore after the opening bracket or brace or the string (if not
+ *      showing fragments), without a number after it.
+ */
+
+/**
+ * \enum CborPrettyFlags
+ * The CborPrettyFlags enum contains flags that control the conversion of CBOR to text format.
+ *
+ * \value CborPrettyNumericEncodingIndicators   Use numeric encoding indicators instead of textual for float and half-float.
+ * \value CborPrettyTextualEncodingIndicators   Use textual encoding indicators for float ("f") and half-float ("f16").
+ * \value CborPrettyIndicateIndeterminateLength (default) Indicate when a map or array has indeterminate length.
+ * \value CborPrettyIndicateOverlongNumbers     Indicate when a number or length was encoded with more bytes than needed.
+ * \value CborPrettyShowStringFragments         If the byte or text string is transmitted in chunks, show each individually.
+ * \value CborPrettyMergeStringFragment         Merge all chunked byte or text strings and display them in a single entry.
+ * \value CborPrettyDefaultFlags                Default conversion flags.
+ */
+
+#ifndef CBOR_NO_FLOATING_POINT
+static inline bool convertToUint64(double v, uint64_t *absolute)
+{
+    double supremum;
+    v = fabs(v);
+
+    /* C11 standard section 6.3.1.4 "Real floating and integer" says:
+     *
+     *  1 When a finite value of real floating type is converted to an integer
+     *    type other than _Bool, the fractional part is discarded (i.e., the
+     *    value is truncated toward zero). If the value of the integral part
+     *    cannot be represented by the integer type, the behavior is undefined.
+     *
+     * So we must perform a range check that v <= UINT64_MAX, but we can't use
+     * UINT64_MAX + 1.0 because the standard continues:
+     *
+     *  2 When a value of integer type is converted to a real floating type, if
+     *    the value being converted can be represented exactly in the new type,
+     *    it is unchanged. If the value being converted is in the range of
+     *    values that can be represented but cannot be represented exactly, the
+     *    result is either the nearest higher or nearest lower representable
+     *    value, chosen in an implementation-defined manner.
+     */
+    supremum = -2.0 * INT64_MIN;     /* -2 * (- 2^63) == 2^64 */
+    if (v >= supremum)
+        return false;
+
+    /* Now we can convert, these two conversions cannot be UB */
+    *absolute = v;
+    return *absolute == v;
+}
+#endif
+
+static void printRecursionLimit(CborStreamFunction stream, void *out)
+{
+    stream(out, "<nesting too deep, recursion stopped>");
+}
+
+static CborError hexDump(CborStreamFunction stream, void *out, const void *ptr, size_t n)
+{
+    const uint8_t *buffer = (const uint8_t *)ptr;
+    CborError err = CborNoError;
+    while (n-- && !err)
+        err = stream(out, "%02" PRIx8, *buffer++);
+
+    return err;
+}
+
+/* This function decodes buffer as UTF-8 and prints as escaped UTF-16.
+ * On UTF-8 decoding error, it returns CborErrorInvalidUtf8TextString */
+static CborError utf8EscapedDump(CborStreamFunction stream, void *out, const void *ptr, size_t n)
+{
+    const uint8_t *buffer = (const uint8_t *)ptr;
+    const uint8_t * const end = buffer + n;
+    CborError err = CborNoError;
+
+    while (buffer < end && !err) {
+        uint32_t uc = get_utf8(&buffer, end);
+        if (uc == ~0U)
+            return CborErrorInvalidUtf8TextString;
+
+        if (uc < 0x80) {
+            /* single-byte UTF-8 */
+            unsigned char escaped = (unsigned char)uc;
+            if (uc < 0x7f && uc >= 0x20 && uc != '\\' && uc != '"') {
+                err = stream(out, "%c", (char)uc);
+                continue;
+            }
+
+            /* print as an escape sequence */
+            switch (uc) {
+            case '"':
+            case '\\':
+                break;
+            case '\b':
+                escaped = 'b';
+                break;
+            case '\f':
+                escaped = 'f';
+                break;
+            case '\n':
+                escaped = 'n';
+                break;
+            case '\r':
+                escaped = 'r';
+                break;
+            case '\t':
+                escaped = 't';
+                break;
+            default:
+                goto print_utf16;
+            }
+            err = stream(out, "\\%c", escaped);
+            continue;
+        }
+
+        /* now print the sequence */
+        if (uc > 0xffffU) {
+            /* needs surrogate pairs */
+            err = stream(out, "\\u%04" PRIX32 "\\u%04" PRIX32,
+                         (uc >> 10) + 0xd7c0,    /* high surrogate */
+                         (uc % 0x0400) + 0xdc00);
+        } else {
+print_utf16:
+            /* no surrogate pair needed */
+            err = stream(out, "\\u%04" PRIX32, uc);
+        }
+    }
+    return err;
+}
+
+static const char *resolve_indicator(const uint8_t *ptr, const uint8_t *end, int flags)
+{
+    static const char indicators[8][3] = {
+        "_0", "_1", "_2", "_3",
+        "", "", "",             /* these are not possible */
+        "_"
+    };
+    const char *no_indicator = indicators[5];   /* empty string */
+    uint8_t additional_information;
+    uint8_t expected_information;
+    uint64_t value;
+    CborError err;
+
+    if (ptr == end)
+        return NULL;    /* CborErrorUnexpectedEOF */
+
+    additional_information = (*ptr & SmallValueMask);
+    if (additional_information < Value8Bit)
+        return no_indicator;
+
+    /* determine whether to show anything */
+    if ((flags & CborPrettyIndicateIndeterminateLength) &&
+            additional_information == IndefiniteLength)
+        return indicators[IndefiniteLength - Value8Bit];
+    if ((flags & CborPrettyIndicateOverlongNumbers) == 0)
+        return no_indicator;
+
+    err = _cbor_value_extract_number(&ptr, end, &value);
+    if (err)
+        return NULL;    /* CborErrorUnexpectedEOF */
+
+    expected_information = Value8Bit - 1;
+    if (value >= Value8Bit)
+        ++expected_information;
+    if (value > 0xffU)
+        ++expected_information;
+    if (value > 0xffffU)
+        ++expected_information;
+    if (value > 0xffffffffU)
+        ++expected_information;
+    return expected_information == additional_information ?
+                no_indicator :
+                indicators[additional_information - Value8Bit];
+}
+
+static const char *get_indicator(const CborValue *it, int flags)
+{
+    return resolve_indicator(it->ptr, it->parser->end, flags);
+}
+
+static CborError value_to_pretty(CborStreamFunction stream, void *out, CborValue *it, int flags, int recursionsLeft);
+static CborError container_to_pretty(CborStreamFunction stream, void *out, CborValue *it, CborType containerType,
+                                     int flags, int recursionsLeft)
+{
+    const char *comma = "";
+    CborError err = CborNoError;
+
+    if (!recursionsLeft) {
+        printRecursionLimit(stream, out);
+        return err;     /* do allow the dumping to continue */
+    }
+
+    while (!cbor_value_at_end(it) && !err) {
+        err = stream(out, "%s", comma);
+        comma = ", ";
+
+        if (!err)
+            err = value_to_pretty(stream, out, it, flags, recursionsLeft);
+
+        if (containerType == CborArrayType)
+            continue;
+
+        /* map: that was the key, so get the value */
+        if (!err)
+            err = stream(out, ": ");
+        if (!err)
+            err = value_to_pretty(stream, out, it, flags, recursionsLeft);
+    }
+    return err;
+}
+
+static CborError value_to_pretty(CborStreamFunction stream, void *out, CborValue *it, int flags, int recursionsLeft)
+{
+    CborError err = CborNoError;
+    CborType type = cbor_value_get_type(it);
+    switch (type) {
+    case CborArrayType:
+    case CborMapType: {
+        /* recursive type */
+        CborValue recursed;
+        const char *indicator = get_indicator(it, flags);
+        const char *space = *indicator ? " " : indicator;
+
+        err = stream(out, "%c%s%s", type == CborArrayType ? '[' : '{', indicator, space);
+        if (err)
+            return err;
+
+        err = cbor_value_enter_container(it, &recursed);
+        if (err) {
+            it->ptr = recursed.ptr;
+            return err;       /* parse error */
+        }
+        err = container_to_pretty(stream, out, &recursed, type, flags, recursionsLeft - 1);
+        if (err) {
+            it->ptr = recursed.ptr;
+            return err;       /* parse error */
+        }
+        err = cbor_value_leave_container(it, &recursed);
+        if (err)
+            return err;       /* parse error */
+
+        return stream(out, type == CborArrayType ? "]" : "}");
+    }
+
+    case CborIntegerType: {
+        uint64_t val;
+        cbor_value_get_raw_integer(it, &val);    /* can't fail */
+
+        if (cbor_value_is_unsigned_integer(it)) {
+            err = stream(out, "%" PRIu64, val);
+        } else {
+            /* CBOR stores the negative number X as -1 - X
+             * (that is, -1 is stored as 0, -2 as 1 and so forth) */
+            if (++val) {                /* unsigned overflow may happen */
+                err = stream(out, "-%" PRIu64, val);
+            } else {
+                /* overflown
+                 *   0xffff`ffff`ffff`ffff + 1 =
+                 * 0x1`0000`0000`0000`0000 = 18446744073709551616 (2^64) */
+                err = stream(out, "-18446744073709551616");
+            }
+        }
+        if (!err)
+            err = stream(out, "%s", get_indicator(it, flags));
+        break;
+    }
+
+    case CborByteStringType:
+    case CborTextStringType: {
+        size_t n = 0;
+        const void *ptr;
+        bool showingFragments = (flags & CborPrettyShowStringFragments) && !cbor_value_is_length_known(it);
+        const char *separator = "";
+        char close = '\'';
+        char open[3] = "h'";
+        const char *indicator = NULL;
+
+        if (type == CborTextStringType) {
+            close = open[0] = '"';
+            open[1] = '\0';
+        }
+
+        if (showingFragments) {
+            err = stream(out, "(_ ");
+            if (!err)
+                err = _cbor_value_prepare_string_iteration(it);
+        } else {
+            err = stream(out, "%s", open);
+        }
+
+        while (!err) {
+            if (showingFragments || indicator == NULL) {
+                /* any iteration, except the second for a non-chunked string */
+                indicator = resolve_indicator(it->ptr, it->parser->end, flags);
+            }
+
+            err = _cbor_value_get_string_chunk(it, &ptr, &n, it);
+            if (!ptr)
+                break;
+
+            if (!err && showingFragments)
+                err = stream(out, "%s%s", separator, open);
+            if (!err)
+                err = (type == CborByteStringType ?
+                           hexDump(stream, out, ptr, n) :
+                           utf8EscapedDump(stream, out, ptr, n));
+            if (!err && showingFragments) {
+                err = stream(out, "%c%s", close, indicator);
+                separator = ", ";
+            }
+        }
+
+        if (!err) {
+            if (showingFragments)
+                err = stream(out, ")");
+            else
+                err = stream(out, "%c%s", close, indicator);
+        }
+        return err;
+    }
+
+    case CborTagType: {
+        CborTag tag;
+        cbor_value_get_tag(it, &tag);       /* can't fail */
+        err = stream(out, "%" PRIu64 "%s(", tag, get_indicator(it, flags));
+        if (!err)
+            err = cbor_value_advance_fixed(it);
+        if (!err && recursionsLeft)
+            err = value_to_pretty(stream, out, it, flags, recursionsLeft - 1);
+        else if (!err)
+            printRecursionLimit(stream, out);
+        if (!err)
+            err = stream(out, ")");
+        return err;
+    }
+
+    case CborSimpleType: {
+        /* simple types can't fail and can't have overlong encoding */
+        uint8_t simple_type;
+        cbor_value_get_simple_type(it, &simple_type);
+        err = stream(out, "simple(%" PRIu8 ")", simple_type);
+        break;
+    }
+
+    case CborNullType:
+        err = stream(out, "null");
+        break;
+
+    case CborUndefinedType:
+        err = stream(out, "undefined");
+        break;
+
+    case CborBooleanType: {
+        bool val;
+        cbor_value_get_boolean(it, &val);       /* can't fail */
+        err = stream(out, val ? "true" : "false");
+        break;
+    }
+
+#ifndef CBOR_NO_FLOATING_POINT
+    case CborDoubleType: {
+        const char *suffix;
+        double val;
+        int r;
+        uint64_t ival;
+
+        if (false) {
+            float f;
+    case CborFloatType:
+            cbor_value_get_float(it, &f);
+            val = f;
+            suffix = flags & CborPrettyNumericEncodingIndicators ? "_2" : "f";
+        } else if (false) {
+            uint16_t f16;
+    case CborHalfFloatType:
+#ifndef CBOR_NO_HALF_FLOAT_TYPE
+            cbor_value_get_half_float(it, &f16);
+            val = decode_half(f16);
+            suffix = flags & CborPrettyNumericEncodingIndicators ? "_1" : "f16";
+#else
+            (void)f16;
+            err = CborErrorUnsupportedType;
+            break;
+#endif
+        } else {
+            cbor_value_get_double(it, &val);
+            suffix = "";
+        }
+
+        if ((flags & CborPrettyNumericEncodingIndicators) == 0) {
+            r = fpclassify(val);
+            if (r == FP_NAN || r == FP_INFINITE)
+                suffix = "";
+        }
+
+        if (convertToUint64(val, &ival)) {
+            /* this double value fits in a 64-bit integer, so show it as such
+             * (followed by a floating point suffix, to disambiguate) */
+            err = stream(out, "%s%" PRIu64 ".%s", val < 0 ? "-" : "", ival, suffix);
+        } else {
+            /* this number is definitely not a 64-bit integer */
+            err = stream(out, "%." DBL_DECIMAL_DIG_STR "g%s", val, suffix);
+        }
+        break;
+    }
+#else
+    case CborDoubleType:
+    case CborFloatType:
+    case CborHalfFloatType:
+        err = CborErrorUnsupportedType;
+        break;
+#endif /* !CBOR_NO_FLOATING_POINT */
+
+    case CborInvalidType:
+        err = stream(out, "invalid");
+        if (err)
+            return err;
+        return CborErrorUnknownType;
+    }
+
+    if (!err)
+        err = cbor_value_advance_fixed(it);
+    return err;
+}
+
+/**
+ * Converts the current CBOR type pointed by \a value to its textual
+ * representation and writes it to the stream by calling the \a streamFunction.
+ * If an error occurs, this function returns an error code similar to
+ * \ref CborParsing.
+ *
+ * The textual representation can be controlled by the \a flags parameter (see
+ * \ref CborPrettyFlags for more information).
+ *
+ * If no error ocurred, this function advances \a value to the next element.
+ * Often, concatenating the text representation of multiple elements can be
+ * done by appending a comma to the output stream in between calls to this
+ * function.
+ *
+ * The \a streamFunction function will be called with the \a token value as the
+ * first parameter and a printf-style format string as the second, with a variable
+ * number of further parameters.
+ *
+ * \sa cbor_value_to_pretty(), cbor_value_to_json_advance()
+ */
+CborError cbor_value_to_pretty_stream(CborStreamFunction streamFunction, void *token, CborValue *value, int flags)
+{
+    return value_to_pretty(streamFunction, token, value, flags, CBOR_PARSER_MAX_RECURSIONS);
+}
+
+/** @} */
diff --git a/client/tinycbor/cborpretty_stdio.c b/client/tinycbor/cborpretty_stdio.c
new file mode 100644
index 000000000..20131850c
--- /dev/null
+++ b/client/tinycbor/cborpretty_stdio.c
@@ -0,0 +1,87 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 Intel Corporation
+**
+** Permission is hereby granted, free of charge, to any person obtaining a copy
+** of this software and associated documentation files (the "Software"), to deal
+** in the Software without restriction, including without limitation the rights
+** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+** copies of the Software, and to permit persons to whom the Software is
+** furnished to do so, subject to the following conditions:
+**
+** The above copyright notice and this permission notice shall be included in
+** all copies or substantial portions of the Software.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+** OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+** THE SOFTWARE.
+**
+****************************************************************************/
+
+#include "cbor.h"
+#include <stdarg.h>
+#include <stdio.h>
+
+static CborError cbor_fprintf(void *out, const char *fmt, ...)
+{
+    int n;
+
+    va_list list;
+    va_start(list, fmt);
+    n = vfprintf((FILE *)out, fmt, list);
+    va_end(list);
+
+    return n < 0 ? CborErrorIO : CborNoError;
+}
+
+/**
+ * \fn CborError cbor_value_to_pretty(FILE *out, const CborValue *value)
+ *
+ * Converts the current CBOR type pointed to by \a value to its textual
+ * representation and writes it to the \a out stream. If an error occurs, this
+ * function returns an error code similar to CborParsing.
+ *
+ * \sa cbor_value_to_pretty_advance(), cbor_value_to_json_advance()
+ */
+
+/**
+ * Converts the current CBOR type pointed to by \a value to its textual
+ * representation and writes it to the \a out stream. If an error occurs, this
+ * function returns an error code similar to CborParsing.
+ *
+ * If no error ocurred, this function advances \a value to the next element.
+ * Often, concatenating the text representation of multiple elements can be
+ * done by appending a comma to the output stream in between calls to this
+ * function.
+ *
+ * \sa cbor_value_to_pretty(), cbor_value_to_pretty_stream(), cbor_value_to_json_advance()
+ */
+CborError cbor_value_to_pretty_advance(FILE *out, CborValue *value)
+{
+    return cbor_value_to_pretty_stream(cbor_fprintf, out, value, CborPrettyDefaultFlags);
+}
+
+/**
+ * Converts the current CBOR type pointed to by \a value to its textual
+ * representation and writes it to the \a out stream. If an error occurs, this
+ * function returns an error code similar to CborParsing.
+ *
+ * The textual representation can be controlled by the \a flags parameter (see
+ * CborPrettyFlags for more information).
+ *
+ * If no error ocurred, this function advances \a value to the next element.
+ * Often, concatenating the text representation of multiple elements can be
+ * done by appending a comma to the output stream in between calls to this
+ * function.
+ *
+ * \sa cbor_value_to_pretty_stream(), cbor_value_to_pretty(), cbor_value_to_json_advance()
+ */
+CborError cbor_value_to_pretty_advance_flags(FILE *out, CborValue *value, int flags)
+{
+    return cbor_value_to_pretty_stream(cbor_fprintf, out, value, flags);
+}
+
diff --git a/client/tinycbor/cbortojson.c b/client/tinycbor/cbortojson.c
new file mode 100644
index 000000000..5a1a2e5dc
--- /dev/null
+++ b/client/tinycbor/cbortojson.c
@@ -0,0 +1,699 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 Intel Corporation
+**
+** Permission is hereby granted, free of charge, to any person obtaining a copy
+** of this software and associated documentation files (the "Software"), to deal
+** in the Software without restriction, including without limitation the rights
+** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+** copies of the Software, and to permit persons to whom the Software is
+** furnished to do so, subject to the following conditions:
+**
+** The above copyright notice and this permission notice shall be included in
+** all copies or substantial portions of the Software.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+** OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+** THE SOFTWARE.
+**
+****************************************************************************/
+
+#define _BSD_SOURCE 1
+#define _DEFAULT_SOURCE 1
+#define _GNU_SOURCE 1
+#define _POSIX_C_SOURCE 200809L
+#ifndef __STDC_LIMIT_MACROS
+#  define __STDC_LIMIT_MACROS 1
+#endif
+
+#include "cbor.h"
+#include "cborjson.h"
+#include "cborinternal_p.h"
+#include "compilersupport_p.h"
+
+#include <inttypes.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+/**
+ * \defgroup CborToJson Converting CBOR to JSON
+ * \brief Group of functions used to convert CBOR to JSON.
+ *
+ * This group contains two functions that can be used to convert a \ref
+ * CborValue object to an equivalent JSON representation. This module attempts
+ * to follow the recommendations from RFC 7049 section 4.1 "Converting from
+ * CBOR to JSON", though it has a few differences. They are noted below.
+ *
+ * These functions produce a "minified" JSON output, with no spacing,
+ * indentation or line breaks. If those are necessary, they need to be applied
+ * in a post-processing phase.
+ *
+ * Note that JSON cannot support all CBOR types with fidelity, so the
+ * conversion is usually lossy. For that reason, TinyCBOR supports adding a set
+ * of metadata JSON values that can be used by a JSON-to-CBOR converter to
+ * restore the original data types.
+ *
+ * The TinyCBOR library does not provide a way to convert from JSON
+ * representation back to encoded form. However, it provides a tool called
+ * \c json2cbor which can be used for that purpose. That tool supports the
+ * metadata format that these functions may produce.
+ *
+ * Either of the functions in this section will attempt to convert exactly one
+ * CborValue object to JSON. Those functions may return any error documented
+ * for the functions for CborParsing. In addition, if the C standard library
+ * stream functions return with error, the text conversion will return with
+ * error CborErrorIO.
+ *
+ * These functions also perform UTF-8 validation in CBOR text strings. If they
+ * encounter a sequence of bytes that is not permitted in UTF-8, they will return
+ * CborErrorInvalidUtf8TextString. That includes encoding of surrogate points
+ * in UTF-8.
+ *
+ * \warning The metadata produced by these functions is not guaranteed to
+ * remain stable. A future update of TinyCBOR may produce different output for
+ * the same input and parsers may be unable to handle it.
+ *
+ * \sa CborParsing, CborPretty, cbor_parser_init()
+ */
+
+/**
+ * \addtogroup CborToJson
+ * @{
+ * <h2 class="groupheader">Conversion limitations</h2>
+ *
+ * When converting from CBOR to JSON, there may be information loss. This
+ * section lists the possible scenarios.
+ *
+ * \par Number precision:
+ * ALL JSON numbers, due to its JavaScript heritage, are IEEE 754
+ * double-precision floating point. This means JSON is not capable of
+ * representing all integers numbers outside the range [-(2<sup>53</sup>)+1,
+ * 2<sup>53</sup>-1] and is not capable of representing NaN or infinite. If the
+ * CBOR data contains a number outside the valid range, the conversion will
+ * lose precision. If the input was NaN or infinite, the result of the
+ * conversion will be the JSON null value. In addition, the distinction between
+ * half-, single- and double-precision is lost.
+ *
+ * \par
+ * If enabled, the original value and original type are stored in the metadata.
+ *
+ * \par Non-native types:
+ * CBOR's type system is richer than JSON's, which means some data values
+ * cannot be represented when converted to JSON. The conversion silently turns
+ * them into strings: CBOR simple types become "simple(nn)" where \c nn is the
+ * simple type's value, with the exception of CBOR undefined, which becomes
+ * "undefined", while CBOR byte strings are converted to an Base16, Base64, or
+ * Base64url encoding
+ *
+ * \par
+ * If enabled, the original type is stored in the metadata.
+ *
+ * \par Presence of tags:
+ * JSON has no support for tagged values, so by default tags are dropped when
+ * converting to JSON. However, if the CborConvertObeyByteStringTags option is
+ * active (default), then certain known tags are honored and are used to format
+ * the conversion of the tagged byte string to JSON.
+ *
+ * \par
+ * If the CborConvertTagsToObjects option is active, then the tag and the
+ * tagged value are converted to a JSON object. Otherwise, if enabled, the
+ * last (innermost) tag is stored in the metadata.
+ *
+ * \par Non-string keys in maps:
+ * JSON requires all Object keys to be strings, while CBOR does not. By
+ * default, if a non-string key is found, the conversion fails with error
+ * CborErrorJsonObjectKeyNotString. If the CborConvertStringifyMapKeys option
+ * is active, then the conversion attempts to create a string representation
+ * using CborPretty. Note that the \c json2cbor tool is not able to parse this
+ * back to the original form.
+ *
+ * \par Duplicate keys in maps:
+ * Neither JSON nor CBOR allow duplicated keys, but current TinyCBOR does not
+ * validate that this is the case. If there are duplicated keys in the input,
+ * they will be repeated in the output, which many JSON tools may flag as
+ * invalid. In addition to that, if the CborConvertStringifyMapKeys option is
+ * active, it is possible that a non-string key in a CBOR map will be converted
+ * to a string form that is identical to another key.
+ *
+ * \par
+ * When metadata support is active, the conversion will add extra key-value
+ * pairs to the JSON output so it can store the metadata. It is possible that
+ * the keys for the metadata clash with existing keys in the JSON map.
+ */
+
+extern FILE *open_memstream(char **bufptr, size_t *sizeptr);
+
+enum ConversionStatusFlags {
+    TypeWasNotNative            = 0x100,    /* anything but strings, boolean, null, arrays and maps */
+    TypeWasTagged               = 0x200,
+    NumberPrecisionWasLost      = 0x400,
+    NumberWasNaN                = 0x800,
+    NumberWasInfinite           = 0x1000,
+    NumberWasNegative           = 0x2000,   /* only used with NumberWasInifite or NumberWasTooBig */
+
+    FinalTypeMask               = 0xff
+};
+
+typedef struct ConversionStatus {
+    CborTag lastTag;
+    uint64_t originalNumber;
+    int flags;
+} ConversionStatus;
+
+static CborError value_to_json(FILE *out, CborValue *it, int flags, CborType type, ConversionStatus *status);
+
+static CborError dump_bytestring_base16(char **result, CborValue *it)
+{
+    static const char characters[] = "0123456789abcdef";
+    size_t i;
+    size_t n = 0;
+    uint8_t *buffer;
+    CborError err = cbor_value_calculate_string_length(it, &n);
+    if (err)
+        return err;
+
+    /* a Base16 (hex) output is twice as big as our buffer */
+    buffer = (uint8_t *)malloc(n * 2 + 1);
+    *result = (char *)buffer;
+
+    /* let cbor_value_copy_byte_string know we have an extra byte for the terminating NUL */
+    ++n;
+    err = cbor_value_copy_byte_string(it, buffer + n - 1, &n, it);
+    cbor_assert(err == CborNoError);
+
+    for (i = 0; i < n; ++i) {
+        uint8_t byte = buffer[n + i];
+        buffer[2*i]     = characters[byte >> 4];
+        buffer[2*i + 1] = characters[byte & 0xf];
+    }
+    return CborNoError;
+}
+
+static CborError generic_dump_base64(char **result, CborValue *it, const char alphabet[65])
+{
+    size_t n = 0, i;
+    uint8_t *buffer, *out, *in;
+    CborError err = cbor_value_calculate_string_length(it, &n);
+    if (err)
+        return err;
+
+    /* a Base64 output (untruncated) has 4 bytes for every 3 in the input */
+    size_t len = (n + 5) / 3 * 4;
+    out = buffer = (uint8_t *)malloc(len + 1);
+    *result = (char *)buffer;
+
+    /* we read our byte string at the tail end of the buffer
+     * so we can do an in-place conversion while iterating forwards */
+    in = buffer + len - n;
+
+    /* let cbor_value_copy_byte_string know we have an extra byte for the terminating NUL */
+    ++n;
+    err = cbor_value_copy_byte_string(it, in, &n, it);
+    cbor_assert(err == CborNoError);
+
+    uint_least32_t val = 0;
+    for (i = 0; n - i >= 3; i += 3) {
+        /* read 3 bytes x 8 bits = 24 bits */
+        if (false) {
+#ifdef __GNUC__
+        } else if (i) {
+            __builtin_memcpy(&val, in + i - 1, sizeof(val));
+            val = cbor_ntohl(val);
+#endif
+        } else {
+            val = (in[i] << 16) | (in[i + 1] << 8) | in[i + 2];
+        }
+
+        /* write 4 chars x 6 bits = 24 bits */
+        *out++ = alphabet[(val >> 18) & 0x3f];
+        *out++ = alphabet[(val >> 12) & 0x3f];
+        *out++ = alphabet[(val >> 6) & 0x3f];
+        *out++ = alphabet[val & 0x3f];
+    }
+
+    /* maybe 1 or 2 bytes left */
+    if (n - i) {
+        /* we can read in[i + 1] even if it's past the end of the string because
+         * we know (by construction) that it's a NUL byte */
+#ifdef __GNUC__
+        uint16_t val16;
+        __builtin_memcpy(&val16, in + i, sizeof(val16));
+        val = cbor_ntohs(val16);
+#else
+        val = (in[i] << 8) | in[i + 1];
+#endif
+        val <<= 8;
+
+        /* the 65th character in the alphabet is our filler: either '=' or '\0' */
+        out[4] = '\0';
+        out[3] = alphabet[64];
+        if (n - i == 2) {
+            /* write the third char in 3 chars x 6 bits = 18 bits */
+            out[2] = alphabet[(val >> 6) & 0x3f];
+        } else {
+            out[2] = alphabet[64];  /* filler */
+        }
+        out[1] = alphabet[(val >> 12) & 0x3f];
+        out[0] = alphabet[(val >> 18) & 0x3f];
+    } else {
+        out[0] = '\0';
+    }
+
+    return CborNoError;
+}
+
+static CborError dump_bytestring_base64(char **result, CborValue *it)
+{
+    static const char alphabet[] = "ABCDEFGH" "IJKLMNOP" "QRSTUVWX" "YZabcdef"
+                                   "ghijklmn" "opqrstuv" "wxyz0123" "456789+/" "=";
+    return generic_dump_base64(result, it, alphabet);
+}
+
+static CborError dump_bytestring_base64url(char **result, CborValue *it)
+{
+    static const char alphabet[] = "ABCDEFGH" "IJKLMNOP" "QRSTUVWX" "YZabcdef"
+                                   "ghijklmn" "opqrstuv" "wxyz0123" "456789-_";
+    return generic_dump_base64(result, it, alphabet);
+}
+
+static CborError add_value_metadata(FILE *out, CborType type, const ConversionStatus *status)
+{
+    int flags = status->flags;
+    if (flags & TypeWasTagged) {
+        /* extract the tagged type, which may be JSON native */
+        type = flags & FinalTypeMask;
+        flags &= ~(FinalTypeMask | TypeWasTagged);
+
+        if (fprintf(out, "\"tag\":\"%" PRIu64 "\"%s", status->lastTag,
+                    flags & ~TypeWasTagged ? "," : "") < 0)
+            return CborErrorIO;
+    }
+
+    if (!flags)
+        return CborNoError;
+
+    /* print at least the type */
+    if (fprintf(out, "\"t\":%d", type) < 0)
+        return CborErrorIO;
+
+    if (flags & NumberWasNaN)
+        if (fprintf(out, ",\"v\":\"nan\"") < 0)
+            return CborErrorIO;
+    if (flags & NumberWasInfinite)
+        if (fprintf(out, ",\"v\":\"%sinf\"", flags & NumberWasNegative ? "-" : "") < 0)
+            return CborErrorIO;
+    if (flags & NumberPrecisionWasLost)
+        if (fprintf(out, ",\"v\":\"%c%" PRIx64 "\"", flags & NumberWasNegative ? '-' : '+',
+                    status->originalNumber) < 0)
+            return CborErrorIO;
+    if (type == CborSimpleType)
+        if (fprintf(out, ",\"v\":%d", (int)status->originalNumber) < 0)
+            return CborErrorIO;
+    return CborNoError;
+}
+
+static CborError find_tagged_type(CborValue *it, CborTag *tag, CborType *type)
+{
+    CborError err = CborNoError;
+    *type = cbor_value_get_type(it);
+    while (*type == CborTagType) {
+        cbor_value_get_tag(it, tag);    /* can't fail */
+        err = cbor_value_advance_fixed(it);
+        if (err)
+            return err;
+
+        *type = cbor_value_get_type(it);
+    }
+    return err;
+}
+
+static CborError tagged_value_to_json(FILE *out, CborValue *it, int flags, ConversionStatus *status)
+{
+    CborTag tag;
+    CborError err;
+
+    if (flags & CborConvertTagsToObjects) {
+        cbor_value_get_tag(it, &tag);       /* can't fail */
+        err = cbor_value_advance_fixed(it);
+        if (err)
+            return err;
+
+        if (fprintf(out, "{\"tag%" PRIu64 "\":", tag) < 0)
+            return CborErrorIO;
+
+        CborType type = cbor_value_get_type(it);
+        err = value_to_json(out, it, flags, type, status);
+        if (err)
+            return err;
+        if (flags & CborConvertAddMetadata && status->flags) {
+            if (fprintf(out, ",\"tag%" PRIu64 "$cbor\":{", tag) < 0 ||
+                    add_value_metadata(out, type, status) != CborNoError ||
+                    fputc('}', out) < 0)
+                return CborErrorIO;
+        }
+        if (fputc('}', out) < 0)
+            return CborErrorIO;
+        status->flags = TypeWasNotNative | CborTagType;
+        return CborNoError;
+    }
+
+    CborType type;
+    err = find_tagged_type(it, &status->lastTag, &type);
+    if (err)
+        return err;
+    tag = status->lastTag;
+
+    /* special handling of byte strings? */
+    if (type == CborByteStringType && (flags & CborConvertByteStringsToBase64Url) == 0 &&
+            (tag == CborNegativeBignumTag || tag == CborExpectedBase16Tag || tag == CborExpectedBase64Tag)) {
+        char *str;
+        char *pre = "";
+
+        if (tag == CborNegativeBignumTag) {
+            pre = "~";
+            err = dump_bytestring_base64url(&str, it);
+        } else if (tag == CborExpectedBase64Tag) {
+            err = dump_bytestring_base64(&str, it);
+        } else { /* tag == CborExpectedBase16Tag */
+            err = dump_bytestring_base16(&str, it);
+        }
+        if (err)
+            return err;
+        err = fprintf(out, "\"%s%s\"", pre, str) < 0 ? CborErrorIO : CborNoError;
+        free(str);
+        status->flags = TypeWasNotNative | TypeWasTagged | CborByteStringType;
+        return err;
+    }
+
+    /* no special handling */
+    err = value_to_json(out, it, flags, type, status);
+    status->flags |= TypeWasTagged | type;
+    return err;
+}
+
+static CborError stringify_map_key(char **key, CborValue *it, int flags, CborType type)
+{
+    (void)flags;    /* unused */
+    (void)type;     /* unused */
+#ifdef WITHOUT_OPEN_MEMSTREAM
+    (void)key;      /* unused */
+    (void)it;       /* unused */
+    return CborErrorJsonNotImplemented;
+#else
+    size_t size;
+
+    FILE *memstream = open_memstream(key, &size);
+    if (memstream == NULL)
+        return CborErrorOutOfMemory;        /* could also be EMFILE, but it's unlikely */
+    CborError err = cbor_value_to_pretty_advance(memstream, it);
+
+    if (unlikely(fclose(memstream) < 0 || *key == NULL))
+        return CborErrorInternalError;
+    return err;
+#endif
+}
+
+static CborError array_to_json(FILE *out, CborValue *it, int flags, ConversionStatus *status)
+{
+    const char *comma = "";
+    while (!cbor_value_at_end(it)) {
+        if (fprintf(out, "%s", comma) < 0)
+            return CborErrorIO;
+        comma = ",";
+
+        CborError err = value_to_json(out, it, flags, cbor_value_get_type(it), status);
+        if (err)
+            return err;
+    }
+    return CborNoError;
+}
+
+static CborError map_to_json(FILE *out, CborValue *it, int flags, ConversionStatus *status)
+{
+    const char *comma = "";
+    CborError err;
+    while (!cbor_value_at_end(it)) {
+        char *key;
+        if (fprintf(out, "%s", comma) < 0)
+            return CborErrorIO;
+        comma = ",";
+
+        CborType keyType = cbor_value_get_type(it);
+        if (likely(keyType == CborTextStringType)) {
+            size_t n = 0;
+            err = cbor_value_dup_text_string(it, &key, &n, it);
+        } else if (flags & CborConvertStringifyMapKeys) {
+            err = stringify_map_key(&key, it, flags, keyType);
+        } else {
+            return CborErrorJsonObjectKeyNotString;
+        }
+        if (err)
+            return err;
+
+        /* first, print the key */
+        if (fprintf(out, "\"%s\":", key) < 0) {
+            free(key);
+            return CborErrorIO;
+        }
+
+        /* then, print the value */
+        CborType valueType = cbor_value_get_type(it);
+        err = value_to_json(out, it, flags, valueType, status);
+
+        /* finally, print any metadata we may have */
+        if (flags & CborConvertAddMetadata) {
+            if (!err && keyType != CborTextStringType) {
+                if (fprintf(out, ",\"%s$keycbordump\":true", key) < 0)
+                    err = CborErrorIO;
+            }
+            if (!err && status->flags) {
+                if (fprintf(out, ",\"%s$cbor\":{", key) < 0 ||
+                        add_value_metadata(out, valueType, status) != CborNoError ||
+                        fputc('}', out) < 0)
+                    err = CborErrorIO;
+            }
+        }
+
+        free(key);
+        if (err)
+            return err;
+    }
+    return CborNoError;
+}
+
+static CborError value_to_json(FILE *out, CborValue *it, int flags, CborType type, ConversionStatus *status)
+{
+    CborError err;
+    status->flags = 0;
+
+    switch (type) {
+    case CborArrayType:
+    case CborMapType: {
+        /* recursive type */
+        CborValue recursed;
+        err = cbor_value_enter_container(it, &recursed);
+        if (err) {
+            it->ptr = recursed.ptr;
+            return err;       /* parse error */
+        }
+        if (fputc(type == CborArrayType ? '[' : '{', out) < 0)
+            return CborErrorIO;
+
+        err = (type == CborArrayType) ?
+                  array_to_json(out, &recursed, flags, status) :
+                  map_to_json(out, &recursed, flags, status);
+        if (err) {
+            it->ptr = recursed.ptr;
+            return err;       /* parse error */
+        }
+
+        if (fputc(type == CborArrayType ? ']' : '}', out) < 0)
+            return CborErrorIO;
+        err = cbor_value_leave_container(it, &recursed);
+        if (err)
+            return err;       /* parse error */
+
+        status->flags = 0;    /* reset, there are never conversion errors for us */
+        return CborNoError;
+    }
+
+    case CborIntegerType: {
+        double num;     /* JS numbers are IEEE double precision */
+        uint64_t val;
+        cbor_value_get_raw_integer(it, &val);    /* can't fail */
+        num = (double)val;
+
+        if (cbor_value_is_negative_integer(it)) {
+            num = -num - 1;                     /* convert to negative */
+            if ((uint64_t)(-num - 1) != val) {
+                status->flags = NumberPrecisionWasLost | NumberWasNegative;
+                status->originalNumber = val;
+            }
+        } else {
+            if ((uint64_t)num != val) {
+                status->flags = NumberPrecisionWasLost;
+                status->originalNumber = val;
+            }
+        }
+        if (fprintf(out, "%.0f", num) < 0)  /* this number has no fraction, so no decimal points please */
+            return CborErrorIO;
+        break;
+    }
+
+    case CborByteStringType:
+    case CborTextStringType: {
+        char *str;
+        if (type == CborByteStringType) {
+            err = dump_bytestring_base64url(&str, it);
+            status->flags = TypeWasNotNative;
+        } else {
+            size_t n = 0;
+            err = cbor_value_dup_text_string(it, &str, &n, it);
+        }
+        if (err)
+            return err;
+        err = (fprintf(out, "\"%s\"", str) < 0) ? CborErrorIO : CborNoError;
+        free(str);
+        return err;
+    }
+
+    case CborTagType:
+        return tagged_value_to_json(out, it, flags, status);
+
+    case CborSimpleType: {
+        uint8_t simple_type;
+        cbor_value_get_simple_type(it, &simple_type);  /* can't fail */
+        status->flags = TypeWasNotNative;
+        status->originalNumber = simple_type;
+        if (fprintf(out, "\"simple(%" PRIu8 ")\"", simple_type) < 0)
+            return CborErrorIO;
+        break;
+    }
+
+    case CborNullType:
+        if (fprintf(out, "null") < 0)
+            return CborErrorIO;
+        break;
+
+    case CborUndefinedType:
+        status->flags = TypeWasNotNative;
+        if (fprintf(out, "\"undefined\"") < 0)
+            return CborErrorIO;
+        break;
+
+    case CborBooleanType: {
+        bool val;
+        cbor_value_get_boolean(it, &val);       /* can't fail */
+        if (fprintf(out, val ? "true" : "false") < 0)
+            return CborErrorIO;
+        break;
+    }
+
+#ifndef CBOR_NO_FLOATING_POINT
+    case CborDoubleType: {
+        double val;
+        if (false) {
+            float f;
+    case CborFloatType:
+            status->flags = TypeWasNotNative;
+            cbor_value_get_float(it, &f);
+            val = f;
+        } else if (false) {
+            uint16_t f16;
+    case CborHalfFloatType:
+#  ifndef CBOR_NO_HALF_FLOAT_TYPE
+            status->flags = TypeWasNotNative;
+            cbor_value_get_half_float(it, &f16);
+            val = decode_half(f16);
+#  else
+            (void)f16;
+            err = CborErrorUnsupportedType;
+            break;
+#  endif
+        } else {
+            cbor_value_get_double(it, &val);
+        }
+
+        int r = fpclassify(val);
+        if (r == FP_NAN || r == FP_INFINITE) {
+            if (fprintf(out, "null") < 0)
+                return CborErrorIO;
+            status->flags |= r == FP_NAN ? NumberWasNaN :
+                                           NumberWasInfinite | (val < 0 ? NumberWasNegative : 0);
+        } else {
+            uint64_t ival = (uint64_t)fabs(val);
+            if ((double)ival == fabs(val)) {
+                /* print as integer so we get the full precision */
+                r = fprintf(out, "%s%" PRIu64, val < 0 ? "-" : "", ival);
+                status->flags |= TypeWasNotNative;   /* mark this integer number as a double */
+            } else {
+                /* this number is definitely not a 64-bit integer */
+                r = fprintf(out, "%." DBL_DECIMAL_DIG_STR "g", val);
+            }
+            if (r < 0)
+                return CborErrorIO;
+        }
+        break;
+    }
+#else
+    case CborDoubleType:
+    case CborFloatType:
+    case CborHalfFloatType:
+        err = CborErrorUnsupportedType;
+        break;
+#endif /* !CBOR_NO_FLOATING_POINT */
+
+    case CborInvalidType:
+        return CborErrorUnknownType;
+    }
+
+    return cbor_value_advance_fixed(it);
+}
+
+/**
+ * \enum CborToJsonFlags
+ * The CborToJsonFlags enum contains flags that control the conversion of CBOR to JSON.
+ *
+ * \value CborConvertAddMetadata        Adds metadata to facilitate restoration of the original CBOR data.
+ * \value CborConvertTagsToObjects      Converts CBOR tags to JSON objects
+ * \value CborConvertIgnoreTags         (default) Ignore CBOR tags, except for byte strings
+ * \value CborConvertObeyByteStringTags (default) Honor formatting of CBOR byte strings if so tagged
+ * \value CborConvertByteStringsToBase64Url Force the conversion of all CBOR byte strings to Base64url encoding, despite any tags
+ * \value CborConvertRequireMapStringKeys (default) Require CBOR map keys to be strings, failing the conversion if they are not
+ * \value CborConvertStringifyMapKeys   Convert non-string keys in CBOR maps to a string form
+ * \value CborConvertDefaultFlags       Default conversion flags.
+ */
+
+/**
+ * \fn CborError cbor_value_to_json(FILE *out, const CborValue *value, int flags)
+ *
+ * Converts the current CBOR type pointed to by \a value to JSON and writes that
+ * to the \a out stream. If an error occurs, this function returns an error
+ * code similar to CborParsing. The \a flags parameter indicates one or more of
+ * the flags from CborToJsonFlags that control the conversion.
+ *
+ * \sa cbor_value_to_json_advance(), cbor_value_to_pretty()
+ */
+
+/**
+ * Converts the current CBOR type pointed to by \a value to JSON and writes that
+ * to the \a out stream. If an error occurs, this function returns an error
+ * code similar to CborParsing. The \a flags parameter indicates one or more of
+ * the flags from CborToJsonFlags that control the conversion.
+ *
+ * If no error ocurred, this function advances \a value to the next element.
+ *
+ * \sa cbor_value_to_json(), cbor_value_to_pretty_advance()
+ */
+CborError cbor_value_to_json_advance(FILE *out, CborValue *value, int flags)
+{
+    ConversionStatus status;
+    return value_to_json(out, value, flags, cbor_value_get_type(value), &status);
+}
+
+/** @} */
diff --git a/client/tinycbor/cborvalidation.c b/client/tinycbor/cborvalidation.c
new file mode 100644
index 000000000..08c35117b
--- /dev/null
+++ b/client/tinycbor/cborvalidation.c
@@ -0,0 +1,666 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 Intel Corporation
+**
+** Permission is hereby granted, free of charge, to any person obtaining a copy
+** of this software and associated documentation files (the "Software"), to deal
+** in the Software without restriction, including without limitation the rights
+** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+** copies of the Software, and to permit persons to whom the Software is
+** furnished to do so, subject to the following conditions:
+**
+** The above copyright notice and this permission notice shall be included in
+** all copies or substantial portions of the Software.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+** OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+** THE SOFTWARE.
+**
+****************************************************************************/
+
+#define _BSD_SOURCE 1
+#define _DEFAULT_SOURCE 1
+#ifndef __STDC_LIMIT_MACROS
+#  define __STDC_LIMIT_MACROS 1
+#endif
+
+#include "cbor.h"
+#include "cborinternal_p.h"
+#include "compilersupport_p.h"
+#include "utf8_p.h"
+
+#include <string.h>
+
+#ifndef CBOR_NO_FLOATING_POINT
+#  include <float.h>
+#  include <math.h>
+#endif
+
+
+#ifndef CBOR_PARSER_MAX_RECURSIONS
+#  define CBOR_PARSER_MAX_RECURSIONS 1024
+#endif
+
+/**
+ * \addtogroup CborParsing
+ * @{
+ */
+
+/**
+ * \enum CborValidationFlags
+ * The CborValidationFlags enum contains flags that control the validation of a
+ * CBOR stream.
+ *
+ * \value CborValidateBasic         Validates only the syntactic correctedness of the stream.
+ * \value CborValidateCanonical     Validates that the stream is in canonical format, according to
+ *                                  RFC 7049 section 3.9.
+ * \value CborValidateStrictMode    Performs strict validation, according to RFC 7049 section 3.10.
+ * \value CborValidateStrictest     Attempt to perform the strictest validation we know of.
+ *
+ * \value CborValidateShortestIntegrals     (Canonical) Validate that integral numbers and lengths are
+ *                                          enconded in their shortest form possible.
+ * \value CborValidateShortestFloatingPoint (Canonical) Validate that floating-point numbers are encoded
+ *                                          in their shortest form possible.
+ * \value CborValidateShortestNumbers       (Canonical) Validate both integral and floating-point numbers
+ *                                          are in their shortest form possible.
+ * \value CborValidateNoIndeterminateLength (Canonical) Validate that no string, array or map uses
+ *                                          indeterminate length encoding.
+ * \value CborValidateMapIsSorted           (Canonical & Strict mode) Validate that map keys appear in
+ *                                          sorted order.
+ * \value CborValidateMapKeysAreUnique      (Strict mode) Validate that map keys are unique.
+ * \value CborValidateTagUse                (Strict mode) Validate that known tags are used with the
+ *                                          correct types. This does not validate that the content of
+ *                                          those types is syntactically correct. For example, this
+ *                                          option validates that tag 1 (DateTimeString) is used with
+ *                                          a Text String, but it does not validate that the string is
+ *                                          a valid date/time representation.
+ * \value CborValidateUtf8                  (Strict mode) Validate that text strings are appropriately
+ *                                          encoded in UTF-8.
+ * \value CborValidateMapKeysAreString      Validate that all map keys are text strings.
+ * \value CborValidateNoUndefined           Validate that no elements of type "undefined" are present.
+ * \value CborValidateNoTags                Validate that no tags are used.
+ * \value CborValidateFiniteFloatingPoint   Validate that all floating point numbers are finite (no NaN or
+ *                                          infinities are allowed).
+ * \value CborValidateCompleteData          Validate that the stream is complete and there is no more data
+ *                                          in the buffer.
+ * \value CborValidateNoUnknownSimpleTypesSA Validate that all Standards Action simple types are registered
+ *                                          with IANA.
+ * \value CborValidateNoUnknownSimpleTypes  Validate that all simple types used are registered with IANA.
+ * \value CborValidateNoUnknownTagsSA       Validate that all Standard Actions tags are registered with IANA.
+ * \value CborValidateNoUnknownTagsSR       Validate that all Standard Actions and Specification Required tags
+ *                                          are registered with IANA (see below for limitations).
+ * \value CborValidateNoUnkonwnTags         Validate that all tags are registered with IANA
+ *                                          (see below for limitations).
+ *
+ * \par Simple type registry
+ * The CBOR specification requires that registration for use of the first 19
+ * simple types must be done by way of Standards Action. The rest of the simple
+ * types only require a specification. The official list can be obtained from
+ *  https://www.iana.org/assignments/cbor-simple-values/cbor-simple-values.xhtml.
+ *
+ * \par
+ * There are no registered simple types recognized by this release of TinyCBOR
+ * (beyond those defined by RFC 7049).
+ *
+ * \par Tag registry
+ * The CBOR specification requires that registration for use of the first 23
+ * tags must be done by way of Standards Action. The next up to tag 255 only
+ * require a specification. Finally, all other tags can be registered on a
+ * first-come-first-serve basis. The official list can be ontained from
+ *  https://www.iana.org/assignments/cbor-tags/cbor-tags.xhtml.
+ *
+ * \par
+ * Given the variability of this list, TinyCBOR cannot recognize all tags
+ * registered with IANA. Instead, the implementation only recognizes tags
+ * that are backed by an RFC.
+ *
+ * \par
+ * These are the tags known to the current TinyCBOR release:
+<table>
+  <tr>
+    <th>Tag</th>
+    <th>Data Item</th>
+    <th>Semantics</th>
+  </tr>
+  <tr>
+    <td>0</td>
+    <td>UTF-8 text string</td>
+    <td>Standard date/time string</td>
+  </td>
+  <tr>
+    <td>1</td>
+    <td>integer</td>
+    <td>Epoch-based date/time</td>
+  </td>
+  <tr>
+    <td>2</td>
+    <td>byte string</td>
+    <td>Positive bignum</td>
+  </td>
+  <tr>
+    <td>3</td>
+    <td>byte string</td>
+    <td>Negative bignum</td>
+  </td>
+  <tr>
+    <td>4</td>
+    <td>array</td>
+    <td>Decimal fraction</td>
+  </td>
+  <tr>
+    <td>5</td>
+    <td>array</td>
+    <td>Bigfloat</td>
+  </td>
+  <tr>
+    <td>16</td>
+    <td>array</td>
+    <td>COSE Single Recipient Encrypted Data Object (RFC 8152)</td>
+  </td>
+  <tr>
+    <td>17</td>
+    <td>array</td>
+    <td>COSE Mac w/o Recipients Object (RFC 8152)</td>
+  </td>
+  <tr>
+    <td>18</td>
+    <td>array</td>
+    <td>COSE Single Signer Data Object (RFC 8162)</td>
+  </td>
+  <tr>
+    <td>21</td>
+    <td>byte string, array, map</td>
+    <td>Expected conversion to base64url encoding</td>
+  </td>
+  <tr>
+    <td>22</td>
+    <td>byte string, array, map</td>
+    <td>Expected conversion to base64 encoding</td>
+  </td>
+  <tr>
+    <td>23</td>
+    <td>byte string, array, map</td>
+    <td>Expected conversion to base16 encoding</td>
+  </td>
+  <tr>
+    <td>24</td>
+    <td>byte string</td>
+    <td>Encoded CBOR data item</td>
+  </td>
+  <tr>
+    <td>32</td>
+    <td>UTF-8 text string</td>
+    <td>URI</td>
+  </td>
+  <tr>
+    <td>33</td>
+    <td>UTF-8 text string</td>
+    <td>base64url</td>
+  </td>
+  <tr>
+    <td>34</td>
+    <td>UTF-8 text string</td>
+    <td>base64</td>
+  </td>
+  <tr>
+    <td>35</td>
+    <td>UTF-8 text string</td>
+    <td>Regular expression</td>
+  </td>
+  <tr>
+    <td>36</td>
+    <td>UTF-8 text string</td>
+    <td>MIME message</td>
+  </td>
+  <tr>
+    <td>96</td>
+    <td>array</td>
+    <td>COSE Encrypted Data Object (RFC 8152)</td>
+  </td>
+  <tr>
+    <td>97</td>
+    <td>array</td>
+    <td>COSE MACed Data Object (RFC 8152)</td>
+  </td>
+  <tr>
+    <td>98</td>
+    <td>array</td>
+    <td>COSE Signed Data Object (RFC 8152)</td>
+  </td>
+  <tr>
+    <td>55799</td>
+    <td>any</td>
+    <td>Self-describe CBOR</td>
+  </td>
+</table>
+ */
+
+struct KnownTagData { uint32_t tag; uint32_t types; };
+static const struct KnownTagData knownTagData[] = {
+    { 0, (uint32_t)CborTextStringType },
+    { 1, (uint32_t)(CborIntegerType+1) },
+    { 2, (uint32_t)CborByteStringType },
+    { 3, (uint32_t)CborByteStringType },
+    { 4, (uint32_t)CborArrayType },
+    { 5, (uint32_t)CborArrayType },
+    { 16, (uint32_t)CborArrayType },
+    { 17, (uint32_t)CborArrayType },
+    { 18, (uint32_t)CborArrayType },
+    { 21, (uint32_t)CborByteStringType | ((uint32_t)CborArrayType << 8) | ((uint32_t)CborMapType << 16) },
+    { 22, (uint32_t)CborByteStringType | ((uint32_t)CborArrayType << 8) | ((uint32_t)CborMapType << 16) },
+    { 23, (uint32_t)CborByteStringType | ((uint32_t)CborArrayType << 8) | ((uint32_t)CborMapType << 16) },
+    { 24, (uint32_t)CborByteStringType },
+    { 32, (uint32_t)CborTextStringType },
+    { 33, (uint32_t)CborTextStringType },
+    { 34, (uint32_t)CborTextStringType },
+    { 35, (uint32_t)CborTextStringType },
+    { 36, (uint32_t)CborTextStringType },
+    { 96, (uint32_t)CborArrayType },
+    { 97, (uint32_t)CborArrayType },
+    { 98, (uint32_t)CborArrayType },
+    { 55799, 0U }
+};
+
+static CborError validate_value(CborValue *it, uint32_t flags, int recursionLeft);
+
+static inline CborError validate_utf8_string(const void *ptr, size_t n)
+{
+    const uint8_t *buffer = (const uint8_t *)ptr;
+    const uint8_t * const end = buffer + n;
+    while (buffer < end) {
+        uint32_t uc = get_utf8(&buffer, end);
+        if (uc == ~0U)
+            return CborErrorInvalidUtf8TextString;
+    }
+    return CborNoError;
+}
+
+static inline CborError validate_simple_type(uint8_t simple_type, uint32_t flags)
+{
+    /* At current time, all known simple types are those from RFC 7049,
+     * which are parsed by the parser into different CBOR types.
+     * That means that if we've got here, the type is unknown */
+    if (simple_type < 32)
+        return (flags & CborValidateNoUnknownSimpleTypesSA) ? CborErrorUnknownSimpleType : CborNoError;
+    return (flags & CborValidateNoUnknownSimpleTypes) == CborValidateNoUnknownSimpleTypes ?
+                CborErrorUnknownSimpleType : CborNoError;
+}
+
+static inline CborError validate_number(const CborValue *it, CborType type, uint32_t flags)
+{
+    CborError err = CborNoError;
+    const uint8_t *ptr = it->ptr;
+    size_t bytesUsed, bytesNeeded;
+    uint64_t value;
+
+    if ((flags & CborValidateShortestIntegrals) == 0)
+        return err;
+    if (type >= CborHalfFloatType && type <= CborDoubleType)
+        return err;     /* checked elsewhere */
+
+    err = _cbor_value_extract_number(&ptr, it->parser->end, &value);
+    if (err)
+        return err;
+
+    bytesUsed = (size_t)(ptr - it->ptr - 1);
+    bytesNeeded = 0;
+    if (value >= Value8Bit)
+        ++bytesNeeded;
+    if (value > 0xffU)
+        ++bytesNeeded;
+    if (value > 0xffffU)
+        bytesNeeded += 2;
+    if (value > 0xffffffffU)
+        bytesNeeded += 4;
+    if (bytesNeeded < bytesUsed)
+        return CborErrorOverlongEncoding;
+    return CborNoError;
+}
+
+static inline CborError validate_tag(CborValue *it, CborTag tag, uint32_t flags, int recursionLeft)
+{
+    CborType type = cbor_value_get_type(it);
+    const size_t knownTagCount = sizeof(knownTagData) / sizeof(knownTagData[0]);
+    const struct KnownTagData *tagData = knownTagData;
+    const struct KnownTagData * const knownTagDataEnd = knownTagData + knownTagCount;
+
+    if (!recursionLeft)
+        return CborErrorNestingTooDeep;
+    if (flags & CborValidateNoTags)
+        return CborErrorExcludedType;
+
+    /* find the tag data, if any */
+    for ( ; tagData != knownTagDataEnd; ++tagData) {
+        if (tagData->tag < tag)
+            continue;
+        if (tagData->tag > tag)
+            tagData = NULL;
+        break;
+    }
+    if (tagData == knownTagDataEnd)
+        tagData = NULL;
+
+    if (flags & CborValidateNoUnknownTags && !tagData) {
+        /* tag not found */
+        if (flags & CborValidateNoUnknownTagsSA && tag < 24)
+            return CborErrorUnknownTag;
+        if ((flags & CborValidateNoUnknownTagsSR) == CborValidateNoUnknownTagsSR && tag < 256)
+            return CborErrorUnknownTag;
+        if ((flags & CborValidateNoUnknownTags) == CborValidateNoUnknownTags)
+            return CborErrorUnknownTag;
+    }
+
+    if (flags & CborValidateTagUse && tagData && tagData->types) {
+        uint32_t allowedTypes = tagData->types;
+
+        /* correct Integer so it's not zero */
+        if (type == CborIntegerType)
+            type = (CborType)(type + 1);
+
+        while (allowedTypes) {
+            if ((uint8_t)(allowedTypes & 0xff) == type)
+                break;
+            allowedTypes >>= 8;
+        }
+        if (!allowedTypes)
+            return CborErrorInappropriateTagForType;
+    }
+
+    return validate_value(it, flags, recursionLeft);
+}
+
+#ifndef CBOR_NO_FLOATING_POINT
+static inline CborError validate_floating_point(CborValue *it, CborType type, uint32_t flags)
+{
+    CborError err;
+    int r;
+    double val;
+    float valf;
+    uint16_t valf16;
+
+    if (type != CborDoubleType) {
+        if (type == CborFloatType) {
+            err = cbor_value_get_float(it, &valf);
+            val = valf;
+        } else {
+#  ifdef CBOR_NO_HALF_FLOAT_TYPE
+            (void)valf16;
+            return CborErrorUnsupportedType;
+#  else
+            err = cbor_value_get_half_float(it, &valf16);
+            val = decode_half(valf16);
+#  endif
+        }
+    } else {
+        err = cbor_value_get_double(it, &val);
+    }
+    cbor_assert(err == CborNoError);     /* can't fail */
+
+    r = fpclassify(val);
+    if (r == FP_NAN || r == FP_INFINITE) {
+        if (flags & CborValidateFiniteFloatingPoint)
+            return CborErrorExcludedValue;
+        if (flags & CborValidateShortestFloatingPoint) {
+            if (type == CborDoubleType)
+                return CborErrorOverlongEncoding;
+#  ifndef CBOR_NO_HALF_FLOAT_TYPE
+            if (type == CborFloatType)
+                return CborErrorOverlongEncoding;
+            if (r == FP_NAN && valf16 != 0x7e00)
+                return CborErrorImproperValue;
+            if (r == FP_INFINITE && valf16 != 0x7c00 && valf16 != 0xfc00)
+                return CborErrorImproperValue;
+#  endif
+        }
+    }
+
+    if (flags & CborValidateShortestFloatingPoint && type > CborHalfFloatType) {
+        if (type == CborDoubleType) {
+            valf = (float)val;
+            if ((double)valf == val)
+                return CborErrorOverlongEncoding;
+        }
+#  ifndef CBOR_NO_HALF_FLOAT_TYPE
+        if (type == CborFloatType) {
+            valf16 = encode_half(valf);
+            if (valf == decode_half(valf16))
+                return CborErrorOverlongEncoding;
+        }
+#  endif
+    }
+
+    return CborNoError;
+}
+#endif
+
+static CborError validate_container(CborValue *it, int containerType, uint32_t flags, int recursionLeft)
+{
+    CborError err;
+    const uint8_t *previous = NULL;
+    const uint8_t *previous_end = NULL;
+
+    if (!recursionLeft)
+        return CborErrorNestingTooDeep;
+
+    while (!cbor_value_at_end(it)) {
+        const uint8_t *current = cbor_value_get_next_byte(it);
+
+        if (containerType == CborMapType) {
+            if (flags & CborValidateMapKeysAreString) {
+                CborType type = cbor_value_get_type(it);
+                if (type == CborTagType) {
+                    /* skip the tags */
+                    CborValue copy = *it;
+                    err = cbor_value_skip_tag(&copy);
+                    if (err)
+                        return err;
+                    type = cbor_value_get_type(&copy);
+                }
+                if (type != CborTextStringType)
+                    return CborErrorMapKeyNotString;
+            }
+        }
+
+        err = validate_value(it, flags, recursionLeft);
+        if (err)
+            return err;
+
+        if (containerType != CborMapType)
+            continue;
+
+        if (flags & CborValidateMapIsSorted) {
+            if (previous) {
+                uint64_t len1, len2;
+                const uint8_t *ptr;
+
+                /* extract the two lengths */
+                ptr = previous;
+                _cbor_value_extract_number(&ptr, it->parser->end, &len1);
+                ptr = current;
+                _cbor_value_extract_number(&ptr, it->parser->end, &len2);
+
+                if (len1 > len2)
+                    return CborErrorMapNotSorted;
+                if (len1 == len2) {
+                    size_t bytelen1 = (size_t)(previous_end - previous);
+                    size_t bytelen2 = (size_t)(it->ptr - current);
+                    int r = memcmp(previous, current, bytelen1 <= bytelen2 ? bytelen1 : bytelen2);
+
+                    if (r == 0 && bytelen1 != bytelen2)
+                        r = bytelen1 < bytelen2 ? -1 : +1;
+                    if (r > 0)
+                        return CborErrorMapNotSorted;
+                    if (r == 0 && (flags & CborValidateMapKeysAreUnique) == CborValidateMapKeysAreUnique)
+                        return CborErrorMapKeysNotUnique;
+                }
+            }
+
+            previous = current;
+            previous_end = it->ptr;
+        }
+
+        /* map: that was the key, so get the value */
+        err = validate_value(it, flags, recursionLeft);
+        if (err)
+            return err;
+    }
+    return CborNoError;
+}
+
+static CborError validate_value(CborValue *it, uint32_t flags, int recursionLeft)
+{
+    CborError err;
+    CborType type = cbor_value_get_type(it);
+
+    if (cbor_value_is_length_known(it)) {
+        err = validate_number(it, type, flags);
+        if (err)
+            return err;
+    } else {
+        if (flags & CborValidateNoIndeterminateLength)
+            return CborErrorUnknownLength;
+    }
+
+    switch (type) {
+    case CborArrayType:
+    case CborMapType: {
+        /* recursive type */
+        CborValue recursed;
+        err = cbor_value_enter_container(it, &recursed);
+        if (!err)
+            err = validate_container(&recursed, type, flags, recursionLeft - 1);
+        if (err) {
+            it->ptr = recursed.ptr;
+            return err;
+        }
+        err = cbor_value_leave_container(it, &recursed);
+        if (err)
+            return err;
+        return CborNoError;
+    }
+
+    case CborIntegerType: {
+        uint64_t val;
+        err = cbor_value_get_raw_integer(it, &val);
+        cbor_assert(err == CborNoError);         /* can't fail */
+
+        break;
+    }
+
+    case CborByteStringType:
+    case CborTextStringType: {
+        size_t n = 0;
+        const void *ptr;
+
+        err = _cbor_value_prepare_string_iteration(it);
+        if (err)
+            return err;
+
+        while (1) {
+            err = validate_number(it, type, flags);
+            if (err)
+                return err;
+
+            err = _cbor_value_get_string_chunk(it, &ptr, &n, it);
+            if (err)
+                return err;
+            if (!ptr)
+                break;
+
+            if (type == CborTextStringType && flags & CborValidateUtf8) {
+                err = validate_utf8_string(ptr, n);
+                if (err)
+                    return err;
+            }
+        }
+
+        return CborNoError;
+    }
+
+    case CborTagType: {
+        CborTag tag;
+        err = cbor_value_get_tag(it, &tag);
+        cbor_assert(err == CborNoError);     /* can't fail */
+
+        err = cbor_value_advance_fixed(it);
+        if (err)
+            return err;
+        err = validate_tag(it, tag, flags, recursionLeft - 1);
+        if (err)
+            return err;
+
+        return CborNoError;
+    }
+
+    case CborSimpleType: {
+        uint8_t simple_type;
+        err = cbor_value_get_simple_type(it, &simple_type);
+        cbor_assert(err == CborNoError);     /* can't fail */
+        err = validate_simple_type(simple_type, flags);
+        if (err)
+            return err;
+        break;
+    }
+
+    case CborNullType:
+    case CborBooleanType:
+        break;
+
+    case CborUndefinedType:
+        if (flags & CborValidateNoUndefined)
+            return CborErrorExcludedType;
+        break;
+
+    case CborHalfFloatType:
+    case CborFloatType:
+    case CborDoubleType: {
+#ifdef CBOR_NO_FLOATING_POINT
+        return CborErrorUnsupportedType;
+#else
+        err = validate_floating_point(it, type, flags);
+        if (err)
+            return err;
+        break;
+#endif /* !CBOR_NO_FLOATING_POINT */
+    }
+
+    case CborInvalidType:
+        return CborErrorUnknownType;
+    }
+
+    err = cbor_value_advance_fixed(it);
+    return err;
+}
+
+/**
+ * Performs a full validation, controlled by the \a flags options, of the CBOR
+ * stream pointed by \a it and returns the error it found. If no error was
+ * found, it returns CborNoError and the application can iterate over the items
+ * with certainty that no errors will appear during parsing.
+ *
+ * If \a flags is CborValidateBasic, the result should be the same as
+ * cbor_value_validate_basic().
+ *
+ * This function has the same timing and memory requirements as
+ * cbor_value_advance() and cbor_value_validate_basic().
+ *
+ * \sa CborValidationFlags, cbor_value_validate_basic(), cbor_value_advance()
+ */
+CborError cbor_value_validate(const CborValue *it, uint32_t flags)
+{
+    CborValue value = *it;
+    CborError err = validate_value(&value, flags, CBOR_PARSER_MAX_RECURSIONS);
+    if (err)
+        return err;
+    if (flags & CborValidateCompleteData && it->ptr != it->parser->end)
+        return CborErrorGarbageAtEnd;
+    return CborNoError;
+}
+
+/**
+ * @}
+ */
diff --git a/client/tinycbor/compilersupport_p.h b/client/tinycbor/compilersupport_p.h
new file mode 100644
index 000000000..bd10efc9c
--- /dev/null
+++ b/client/tinycbor/compilersupport_p.h
@@ -0,0 +1,205 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 Intel Corporation
+**
+** Permission is hereby granted, free of charge, to any person obtaining a copy
+** of this software and associated documentation files (the "Software"), to deal
+** in the Software without restriction, including without limitation the rights
+** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+** copies of the Software, and to permit persons to whom the Software is
+** furnished to do so, subject to the following conditions:
+**
+** The above copyright notice and this permission notice shall be included in
+** all copies or substantial portions of the Software.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+** OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+** THE SOFTWARE.
+**
+****************************************************************************/
+
+#ifndef COMPILERSUPPORT_H
+#define COMPILERSUPPORT_H
+
+#include "cbor.h"
+
+#ifndef _BSD_SOURCE
+#  define _BSD_SOURCE
+#endif
+#ifndef _DEFAULT_SOURCE
+#  define _DEFAULT_SOURCE
+#endif
+#ifndef assert
+#  include <assert.h>
+#endif
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
+
+#ifndef __cplusplus
+#  include <stdbool.h>
+#endif
+
+#if __STDC_VERSION__ >= 201112L || __cplusplus >= 201103L || __cpp_static_assert >= 200410
+#  define cbor_static_assert(x)         static_assert(x, #x)
+#elif !defined(__cplusplus) && defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 406) && (__STDC_VERSION__ > 199901L)
+#  define cbor_static_assert(x)         _Static_assert(x, #x)
+#else
+#  define cbor_static_assert(x)         ((void)sizeof(char[2*!!(x) - 1]))
+#endif
+#if __STDC_VERSION__ >= 199901L || defined(__cplusplus)
+/* inline is a keyword */
+#else
+/* use the definition from cbor.h */
+#  define inline    CBOR_INLINE
+#endif
+
+#ifdef NDEBUG
+#  define cbor_assert(cond)     do { if (!(cond)) unreachable(); } while (0)
+#else
+#  define cbor_assert(cond)     assert(cond)
+#endif
+
+#ifndef STRINGIFY
+#define STRINGIFY(x)            STRINGIFY2(x)
+#endif
+#define STRINGIFY2(x)           #x
+
+#if !defined(UINT32_MAX) || !defined(INT64_MAX)
+/* C89? We can define UINT32_MAX portably, but not INT64_MAX */
+#  error "Your system has stdint.h but that doesn't define UINT32_MAX or INT64_MAX"
+#endif
+
+#ifndef DBL_DECIMAL_DIG
+/* DBL_DECIMAL_DIG is C11 */
+#  define DBL_DECIMAL_DIG       17
+#endif
+#define DBL_DECIMAL_DIG_STR     STRINGIFY(DBL_DECIMAL_DIG)
+
+#if defined(__GNUC__) && defined(__i386__) && !defined(__iamcu__)
+#  define CBOR_INTERNAL_API_CC          __attribute__((regparm(3)))
+#elif defined(_MSC_VER) && defined(_M_IX86)
+#  define CBOR_INTERNAL_API_CC          __fastcall
+#else
+#  define CBOR_INTERNAL_API_CC
+#endif
+
+#ifndef __has_builtin
+#  define __has_builtin(x)  0
+#endif
+
+#if (defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 403)) || \
+    (__has_builtin(__builtin_bswap64) && __has_builtin(__builtin_bswap32))
+#  if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+#    define cbor_ntohll     __builtin_bswap64
+#    define cbor_htonll     __builtin_bswap64
+#    define cbor_ntohl      __builtin_bswap32
+#    define cbor_htonl      __builtin_bswap32
+#    ifdef __INTEL_COMPILER
+#      define cbor_ntohs    _bswap16
+#      define cbor_htons    _bswap16
+#    elif (__GNUC__ * 100 + __GNUC_MINOR__ >= 608) || __has_builtin(__builtin_bswap16)
+#      define cbor_ntohs    __builtin_bswap16
+#      define cbor_htons    __builtin_bswap16
+#    else
+#      define cbor_ntohs(x) (((uint16_t)(x) >> 8) | ((uint16_t)(x) << 8))
+#      define cbor_htons    cbor_ntohs
+#    endif
+#  else
+#    define cbor_ntohll
+#    define cbor_htonll
+#    define cbor_ntohl
+#    define cbor_htonl
+#    define cbor_ntohs
+#    define cbor_htons
+#  endif
+#elif defined(__sun)
+#  include <sys/byteorder.h>
+#elif defined(_MSC_VER)
+/* MSVC, which implies Windows, which implies little-endian and sizeof(long) == 4 */
+#  include <stdlib.h>
+#  define cbor_ntohll       _byteswap_uint64
+#  define cbor_htonll       _byteswap_uint64
+#  define cbor_ntohl        _byteswap_ulong
+#  define cbor_htonl        _byteswap_ulong
+#  define cbor_ntohs        _byteswap_ushort
+#  define cbor_htons        _byteswap_ushort
+#endif
+#ifndef cbor_ntohs
+#  include <arpa/inet.h>
+#  define cbor_ntohs        ntohs
+#  define cbor_htons        htons
+#endif
+#ifndef cbor_ntohl
+#  include <arpa/inet.h>
+#  define cbor_ntohl        ntohl
+#  define cbor_htonl        htonl
+#endif
+#ifndef cbor_ntohll
+#  define cbor_ntohll       ntohll
+#  define cbor_htonll       htonll
+/* ntohll isn't usually defined */
+#  ifndef ntohll
+#    if (defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) || \
+    (defined(__BYTE_ORDER) && defined(__BIG_ENDIAN) && __BYTE_ORDER == __BIG_ENDIAN) || \
+    (defined(BYTE_ORDER) && defined(BIG_ENDIAN) && BYTE_ORDER == BIG_ENDIAN) || \
+    (defined(_BIG_ENDIAN) && !defined(_LITTLE_ENDIAN)) || (defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__)) || \
+    defined(__ARMEB__) || defined(__MIPSEB__) || defined(__s390__) || defined(__sparc__)
+#      define ntohll
+#      define htonll
+#    elif (defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) || \
+    (defined(__BYTE_ORDER) && defined(__LITTLE_ENDIAN) && __BYTE_ORDER == __LITTLE_ENDIAN) || \
+    (defined(BYTE_ORDER) && defined(LITTLE_ENDIAN) && BYTE_ORDER == LITTLE_ENDIAN) || \
+    defined(_LITTLE_ENDIAN) || defined(__LITTLE_ENDIAN__) || defined(__ARMEL__) || defined(__MIPSEL__) || \
+    defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__) || defined(__amd64)
+#      define ntohll(x)       ((ntohl((uint32_t)(x)) * UINT64_C(0x100000000)) + (ntohl((x) >> 32)))
+#      define htonll          ntohll
+#    else
+#      error "Unable to determine byte order!"
+#    endif
+#  endif
+#endif
+
+
+#ifdef __cplusplus
+#  define CONST_CAST(t, v)  const_cast<t>(v)
+#else
+/* C-style const_cast without triggering a warning with -Wcast-qual */
+#  define CONST_CAST(t, v)  (t)(uintptr_t)(v)
+#endif
+
+#ifdef __GNUC__
+#ifndef likely
+#  define likely(x)     __builtin_expect(!!(x), 1)
+#endif
+#ifndef unlikely
+#  define unlikely(x)   __builtin_expect(!!(x), 0)
+#endif
+#  define unreachable() __builtin_unreachable()
+#elif defined(_MSC_VER)
+#  define likely(x)     (x)
+#  define unlikely(x)   (x)
+#  define unreachable() __assume(0)
+#else
+#  define likely(x)     (x)
+#  define unlikely(x)   (x)
+#  define unreachable() do {} while (0)
+#endif
+
+static inline bool add_check_overflow(size_t v1, size_t v2, size_t *r)
+{
+#if ((defined(__GNUC__) && (__GNUC__ >= 5)) && !defined(__INTEL_COMPILER)) || __has_builtin(__builtin_add_overflow)
+    return __builtin_add_overflow(v1, v2, r);
+#else
+    /* unsigned additions are well-defined */
+    *r = v1 + v2;
+    return v1 > v1 + v2;
+#endif
+}
+
+#endif /* COMPILERSUPPORT_H */
+
diff --git a/client/tinycbor/open_memstream.c b/client/tinycbor/open_memstream.c
new file mode 100644
index 000000000..18f3de8b1
--- /dev/null
+++ b/client/tinycbor/open_memstream.c
@@ -0,0 +1,114 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 Intel Corporation
+**
+** Permission is hereby granted, free of charge, to any person obtaining a copy
+** of this software and associated documentation files (the "Software"), to deal
+** in the Software without restriction, including without limitation the rights
+** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+** copies of the Software, and to permit persons to whom the Software is
+** furnished to do so, subject to the following conditions:
+**
+** The above copyright notice and this permission notice shall be included in
+** all copies or substantial portions of the Software.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+** OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+** THE SOFTWARE.
+**
+****************************************************************************/
+
+#define _BSD_SOURCE 1
+#define _DEFAULT_SOURCE 1
+#define _GNU_SOURCE 1
+
+#include <sys/types.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#if defined(__unix__) || defined(__APPLE__)
+#  include <unistd.h>
+#endif
+#ifdef __APPLE__
+typedef int RetType;
+typedef int LenType;
+#elif __GLIBC__
+typedef ssize_t RetType;
+typedef size_t LenType;
+#else
+#  error "Cannot implement open_memstream!"
+#endif
+
+#include "compilersupport_p.h"
+
+struct Buffer
+{
+    char **ptr;
+    size_t *len;
+    size_t alloc;
+};
+
+static RetType write_to_buffer(void *cookie, const char *data, LenType len)
+{
+    struct Buffer *b = (struct Buffer *)cookie;
+    char *ptr = *b->ptr;
+    size_t newsize;
+
+    errno = EFBIG;
+    if (unlikely(add_check_overflow(*b->len, len, &newsize)))
+        return -1;
+
+    if (newsize >= b->alloc) { // NB! one extra byte is needed to avoid buffer overflow at close_buffer
+        // make room
+        size_t newalloc = newsize + newsize / 2 + 1;    // give 50% more room
+        ptr = realloc(ptr, newalloc);
+        if (ptr == NULL)
+            return -1;
+        b->alloc = newalloc;
+        *b->ptr = ptr;
+    }
+
+    memcpy(ptr + *b->len, data, len);
+    *b->len = newsize;
+    return len;
+}
+
+static int close_buffer(void *cookie)
+{
+    struct Buffer *b = (struct Buffer *)cookie;
+    if (*b->ptr)
+        (*b->ptr)[*b->len] = '\0';
+    free(b);
+    return 0;
+}
+
+FILE *open_memstream(char **bufptr, size_t *lenptr)
+{
+    struct Buffer *b = (struct Buffer *)malloc(sizeof(struct Buffer));
+    if (b == NULL)
+        return NULL;
+    b->alloc = 0;
+    b->len = lenptr;
+    b->ptr = bufptr;
+    *bufptr = NULL;
+    *lenptr = 0;
+
+#ifdef __APPLE__
+    return funopen(b, NULL, write_to_buffer, NULL, close_buffer);
+#elif __GLIBC__
+    static const cookie_io_functions_t vtable = {
+        NULL,
+        write_to_buffer,
+        NULL,
+        close_buffer
+    };
+    return fopencookie(b, "w", vtable);
+#endif
+}
+
diff --git a/client/tinycbor/tinycbor-version.h b/client/tinycbor/tinycbor-version.h
new file mode 100644
index 000000000..29967d025
--- /dev/null
+++ b/client/tinycbor/tinycbor-version.h
@@ -0,0 +1,3 @@
+#define TINYCBOR_VERSION_MAJOR      0
+#define TINYCBOR_VERSION_MINOR      5
+#define TINYCBOR_VERSION_PATCH      3
diff --git a/client/tinycbor/utf8_p.h b/client/tinycbor/utf8_p.h
new file mode 100644
index 000000000..ca438350d
--- /dev/null
+++ b/client/tinycbor/utf8_p.h
@@ -0,0 +1,104 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 Intel Corporation
+**
+** Permission is hereby granted, free of charge, to any person obtaining a copy
+** of this software and associated documentation files (the "Software"), to deal
+** in the Software without restriction, including without limitation the rights
+** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+** copies of the Software, and to permit persons to whom the Software is
+** furnished to do so, subject to the following conditions:
+**
+** The above copyright notice and this permission notice shall be included in
+** all copies or substantial portions of the Software.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+** OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+** THE SOFTWARE.
+**
+****************************************************************************/
+
+#ifndef CBOR_UTF8_H
+#define CBOR_UTF8_H
+
+#include "compilersupport_p.h"
+
+#include <stdint.h>
+
+static inline uint32_t get_utf8(const uint8_t **buffer, const uint8_t *end)
+{
+    int charsNeeded;
+    uint32_t uc, min_uc;
+    uint8_t b;
+    ptrdiff_t n = end - *buffer;
+    if (n == 0)
+        return ~0U;
+
+    uc = *(*buffer)++;
+    if (uc < 0x80) {
+        /* single-byte UTF-8 */
+        return uc;
+    }
+
+    /* multi-byte UTF-8, decode it */
+    if (unlikely(uc <= 0xC1))
+        return ~0U;
+    if (uc < 0xE0) {
+        /* two-byte UTF-8 */
+        charsNeeded = 2;
+        min_uc = 0x80;
+        uc &= 0x1f;
+    } else if (uc < 0xF0) {
+        /* three-byte UTF-8 */
+        charsNeeded = 3;
+        min_uc = 0x800;
+        uc &= 0x0f;
+    } else if (uc < 0xF5) {
+        /* four-byte UTF-8 */
+        charsNeeded = 4;
+        min_uc = 0x10000;
+        uc &= 0x07;
+    } else {
+        return ~0U;
+    }
+
+    if (n < charsNeeded)
+        return ~0U;
+
+    /* first continuation character */
+    b = *(*buffer)++;
+    if ((b & 0xc0) != 0x80)
+        return ~0U;
+    uc <<= 6;
+    uc |= b & 0x3f;
+
+    if (charsNeeded > 2) {
+        /* second continuation character */
+        b = *(*buffer)++;
+        if ((b & 0xc0) != 0x80)
+            return ~0U;
+        uc <<= 6;
+        uc |= b & 0x3f;
+
+        if (charsNeeded > 3) {
+            /* third continuation character */
+            b = *(*buffer)++;
+            if ((b & 0xc0) != 0x80)
+                return ~0U;
+            uc <<= 6;
+            uc |= b & 0x3f;
+        }
+    }
+
+    /* overlong sequence? surrogate pair? out or range? */
+    if (uc < min_uc || uc - 0xd800U < 2048U || uc > 0x10ffff)
+        return ~0U;
+
+    return uc;
+}
+
+#endif /* CBOR_UTF8_H */

From cbdb42560cb2775e8ecf9910ff8cf81da53f1f42 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Fri, 16 Nov 2018 17:06:13 +0200
Subject: [PATCH 0194/1938] added make

---
 client/Makefile | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/client/Makefile b/client/Makefile
index 9381cb29a..b478102a3 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -29,8 +29,11 @@ JANSSONLIBPATH = ./jansson
 JANSSONLIB = $(JANSSONLIBPATH)/libjansson.a
 MBEDTLSLIBPATH = ../common/mbedtls
 MBEDTLSLIB = $(MBEDTLSLIBPATH)/libmbedtls.a
+CBORLIBPATH = ./tinycbor
+CBORLIB = $(MBEDTLSLIBPATH)/tinycbor.a
+LIBS = -I$(MBEDTLSLIBPATH) -I$(JANSSONLIBPATH) -I$(CBORLIBPATH)
+INCLUDES_CLIENT = -I. -I../include -I../common -I../common/polarssl -I../zlib -I../uart -I/opt/local/include -I../liblua $(LIBS)
 LDFLAGS = $(ENV_LDFLAGS)
-INCLUDES_CLIENT = -I. -I../include -I../common -I../common/polarssl -I../zlib -I../uart -I/opt/local/include -I../liblua -I$(MBEDTLSLIBPATH) -I$(JANSSONLIBPATH)
 CFLAGS = $(ENV_CFLAGS) -std=c99 -D_ISOC99_SOURCE -DPRESETS $(INCLUDES_CLIENT) -Wall -g -O3
 CXXFLAGS = -I../include -Wall -O3
 
@@ -261,7 +264,7 @@ WINBINS = $(patsubst %, %.exe, $(BINS))
 CLEAN = $(BINS) $(WINBINS) $(COREOBJS) $(CMDOBJS) $(OBJCOBJS) $(ZLIBOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(OBJDIR)/*.o *.moc.cpp ui/ui_overlays.h lualibs/usb_cmd.lua lualibs/mf_default_keys.lua
 
 # need to assign dependancies to build these first...
-all: lua_build jansson_build mbedtls_build $(BINS) 
+all: lua_build jansson_build mbedtls_build cbor_build $(BINS) 
 
 all-static: LDLIBS:=-static $(LDLIBS)
 all-static: proxmark3 flasher fpga_compress
@@ -295,6 +298,7 @@ clean:
 	cd ../liblua && make clean
 	cd $(JANSSONLIBPATH) && make clean
 	cd $(MBEDTLSLIBPATH) && make clean
+	cd $(CBORLIBPATH) && make clean
 
 tarbin: $(BINS)
 	$(TAR) $(TARFLAGS) ../proxmark3-$(platform)-bin.tar $(BINS:%=client/%) $(WINBINS:%=client/%)
@@ -311,6 +315,10 @@ mbedtls_build:
 	@echo Compiling mbedtls
 	cd $(MBEDTLSLIBPATH) && make all
 	
+cbor_build:
+	@echo Compiling tinycbor
+	cd $(CBORLIBPATH) && make all
+	
 .PHONY: all clean
 
 # easy printing of MAKE VARIABLES

From 2d17fb172a35c83afdbfe78fcb75e5f2e8bde1a1 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Fri, 16 Nov 2018 18:33:10 +0200
Subject: [PATCH 0195/1938] added cbor print sketch

---
 client/Makefile         |  9 +++++----
 client/cmdhffido.c      |  8 +++++---
 client/fido/cbortools.c | 41 +++++++++++++++++++++++++++++++++++++++++
 client/fido/cbortools.h | 22 ++++++++++++++++++++++
 4 files changed, 73 insertions(+), 7 deletions(-)
 create mode 100644 client/fido/cbortools.c
 create mode 100644 client/fido/cbortools.h

diff --git a/client/Makefile b/client/Makefile
index b478102a3..f97f395e9 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -30,9 +30,9 @@ JANSSONLIB = $(JANSSONLIBPATH)/libjansson.a
 MBEDTLSLIBPATH = ../common/mbedtls
 MBEDTLSLIB = $(MBEDTLSLIBPATH)/libmbedtls.a
 CBORLIBPATH = ./tinycbor
-CBORLIB = $(MBEDTLSLIBPATH)/tinycbor.a
-LIBS = -I$(MBEDTLSLIBPATH) -I$(JANSSONLIBPATH) -I$(CBORLIBPATH)
-INCLUDES_CLIENT = -I. -I../include -I../common -I../common/polarssl -I../zlib -I../uart -I/opt/local/include -I../liblua $(LIBS)
+CBORLIB = $(CBORLIBPATH)/tinycbor.a
+LIBS = -I../zlib -I../uart -I../liblua -I$(MBEDTLSLIBPATH) -I$(JANSSONLIBPATH) -I$(CBORLIBPATH)
+INCLUDES_CLIENT = -I. -I../include -I../common -I/opt/local/include $(LIBS)
 LDFLAGS = $(ENV_LDFLAGS)
 CFLAGS = $(ENV_CFLAGS) -std=c99 -D_ISOC99_SOURCE -DPRESETS $(INCLUDES_CLIENT) -Wall -g -O3
 CXXFLAGS = -I../include -Wall -O3
@@ -111,6 +111,7 @@ CMDSRCS =	crapto1/crapto1.c \
 			mfkey.c \
 			tea.c \
 			fido/additional_ca.c \
+			fido/cbortools.c \
 			crypto/asn1dump.c \
 			crypto/libpcrypto.c\
 			crypto/asn1utils.c\
@@ -269,7 +270,7 @@ all: lua_build jansson_build mbedtls_build cbor_build $(BINS)
 all-static: LDLIBS:=-static $(LDLIBS)
 all-static: proxmark3 flasher fpga_compress
 
-proxmark3: LDLIBS+=$(LUALIB) $(JANSSONLIB) $(MBEDTLSLIB) $(QTLDLIBS)
+proxmark3: LDLIBS+=$(LUALIB) $(JANSSONLIB) $(MBEDTLSLIB) $(CBORLIB) $(QTLDLIBS)
 proxmark3: $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(OBJCOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(ZLIBOBJS) lualibs/usb_cmd.lua lualibs/mf_default_keys.lua
 	$(LD) $(LDFLAGS) $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(OBJCOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(ZLIBOBJS) $(LDLIBS)  -o $@
 	
diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index e2d6c0917..faff8e82c 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -28,6 +28,9 @@
 #include <ctype.h>
 #include <unistd.h>
 #include <jansson.h>
+#include <mbedtls/x509_crt.h>
+#include <mbedtls/x509.h>
+#include <mbedtls/pk.h>
 #include "comms.h"
 #include "cmdmain.h"
 #include "util.h"
@@ -42,9 +45,7 @@
 #include "crypto/asn1utils.h"
 #include "crypto/libpcrypto.h"
 #include "fido/additional_ca.h"
-#include "mbedtls/x509_crt.h"
-#include "mbedtls/x509.h"
-#include "mbedtls/pk.h"
+#include "fido/cbortools.h"
 
 static int CmdHelp(const char *Cmd);
 
@@ -142,6 +143,7 @@ int CmdHFFidoInfo(const char *cmd) {
 
 	PrintAndLog("FIDO2 version: (%d)", len); 
 	dump_buffer((const unsigned char *)buf, len, NULL, 0);
+	TinyCborPrintFIDOPackage(buf, len);
 	
 	return 0;
 }
diff --git a/client/fido/cbortools.c b/client/fido/cbortools.c
new file mode 100644
index 000000000..4e701b0cd
--- /dev/null
+++ b/client/fido/cbortools.c
@@ -0,0 +1,41 @@
+//-----------------------------------------------------------------------------
+// Copyright (C) 2018 Merlok
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// Tools for work with CBOR format http://cbor.io/spec.html
+// via Intel tinycbor (https://github.com/intel/tinycbor) library
+//-----------------------------------------------------------------------------
+//
+
+#include "cbortools.h"
+#include "cbor.h"
+
+
+int TinyCborParser(uint8_t *data, size_t length, CborValue *cb) {
+	CborParser parser;
+	CborError err = cbor_parser_init(data, length, 0, &parser, cb);
+   // if (!err)
+	 //   err = dumprecursive(cb, 0);
+
+	if (err) {
+		fprintf(stderr, "CBOR parsing failure at offset %d: %s\n",
+				cb->ptr - data, cbor_error_string(err));
+		return 1;
+	}	
+	
+	return 0;
+}
+
+int TinyCborPrintFIDOPackage(uint8_t *data, size_t length) {
+	CborValue cb;
+	int res;
+	res = TinyCborParser(data, length, &cb);
+	if (res)
+		return res;
+	
+	return 0;
+}
+
diff --git a/client/fido/cbortools.h b/client/fido/cbortools.h
new file mode 100644
index 000000000..f49751b56
--- /dev/null
+++ b/client/fido/cbortools.h
@@ -0,0 +1,22 @@
+//-----------------------------------------------------------------------------
+// Copyright (C) 2018 Merlok
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// Tools for work with CBOR format http://cbor.io/spec.html
+// via Intel tinycbor (https://github.com/intel/tinycbor) library
+//-----------------------------------------------------------------------------
+//
+
+
+#ifndef __CBORTOOLS_H__
+#define __CBORTOOLS_H__
+
+#include <stddef.h>
+#include <stdint.h>
+
+extern int TinyCborPrintFIDOPackage(uint8_t *data, size_t length);
+
+#endif /* __CBORTOOLS_H__ */

From 87f3e1facf781ea1f0b7507df840ff962e50f06f Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Fri, 16 Nov 2018 19:47:41 +0200
Subject: [PATCH 0196/1938] simple cbor print

---
 client/fido/cbortools.c | 211 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 200 insertions(+), 11 deletions(-)

diff --git a/client/fido/cbortools.c b/client/fido/cbortools.c
index 4e701b0cd..1744277a5 100644
--- a/client/fido/cbortools.c
+++ b/client/fido/cbortools.c
@@ -11,20 +11,199 @@
 //
 
 #include "cbortools.h"
+#include <stdlib.h>
 #include "cbor.h"
+#include "util.h"
 
+static void indent(int nestingLevel) {
+	while (nestingLevel--)
+		printf("  ");
+}
 
-int TinyCborParser(uint8_t *data, size_t length, CborValue *cb) {
+static CborError dumpelm(CborValue *it, bool *got_next, int nestingLevel) {
+	CborError err;
+	*got_next = false;
+
+	CborType type = cbor_value_get_type(it);
+	indent(nestingLevel);
+	switch (type) {
+	case CborMapType: 
+	case CborArrayType: {
+		printf(type == CborArrayType ? "Array[" : "Map[");
+		break;
+	}
+
+	case CborIntegerType: {
+		int64_t val;
+		cbor_value_get_int64(it, &val);     // can't fail
+		printf("%lld", (long long)val);
+		break;
+	}
+
+	case CborByteStringType: {
+		uint8_t *buf;
+		size_t n;
+		err = cbor_value_dup_byte_string(it, &buf, &n, it);
+		*got_next = true;
+		if (err)
+			return err;     // parse error
+		printf("%s", sprint_hex(buf, n));
+		free(buf);
+		break;
+	}
+
+	case CborTextStringType: {
+		char *buf;
+		size_t n;
+		err = cbor_value_dup_text_string(it, &buf, &n, it);
+		*got_next = true;
+		if (err)
+			return err;     // parse error
+		printf("%s", buf);
+		free(buf);
+		break;
+	}
+
+	case CborTagType: {
+		CborTag tag;
+		cbor_value_get_tag(it, &tag);     
+		printf("Tag(%lld)", (long long)tag);
+		break;
+	}
+
+	case CborSimpleType: {
+		uint8_t type;
+		cbor_value_get_simple_type(it, &type); 
+		printf("simple(%u)", type);
+		break;
+	}
+
+	case CborNullType:
+		printf("null");
+		break;
+
+	case CborUndefinedType:
+		printf("undefined");
+		break;
+
+	case CborBooleanType: {
+		bool val;
+		cbor_value_get_boolean(it, &val);       // can't fail
+		printf("%s", val ? "true" : "false");
+		break;
+	}
+
+	case CborDoubleType: {
+		double val;
+		if (false) {
+			float f;
+	case CborFloatType:
+			cbor_value_get_float(it, &f);
+			val = f;
+		} else {
+			cbor_value_get_double(it, &val);
+		}
+		printf("%g", val);
+		break;
+	}
+	case CborHalfFloatType: {
+		uint16_t val;
+		cbor_value_get_half_float(it, &val);
+		printf("__f16(%04x)", val);
+		break;
+	}
+
+	case CborInvalidType:
+		printf("CborInvalidType!!!");
+		break;
+	}
+	
+	return CborNoError;
+}
+
+static CborError dumprecursive(CborValue *it, int nestingLevel) {
+	while (!cbor_value_at_end(it)) {
+		CborError err;
+		CborType type = cbor_value_get_type(it);
+//printf("^%x^", type);
+		bool got_next;
+
+		switch (type) {
+		case CborMapType: /*{
+			// recursive type
+			CborValue recursed;
+			assert(cbor_value_is_container(it));
+			printf("Map[\n");
+			err = cbor_value_enter_container(it, &recursed);
+			if (err)
+				return err;       // parse error
+
+			// name
+			err = dumpelm(&recursed, next!!!!, nestingLevel + 1);
+			if (err)
+				return err;
+
+			printf(":");
+			err = cbor_value_advance_fixed(it);
+			if (err)
+				return err;
+
+			// value
+printf("*");
+			err = dumprecursive(&recursed, nestingLevel + 1);
+			if (err)
+				return err;       // parse error
+
+			err = cbor_value_leave_container(it, &recursed);
+			if (err)
+				return err;       // parse error
+			indent(nestingLevel);
+			printf("]\n");
+			continue;
+		}*/
+		case CborArrayType: {
+			// recursive type
+			CborValue recursed;
+			assert(cbor_value_is_container(it));
+			indent(nestingLevel);
+			printf(type == CborArrayType ? "Array[\n" : "Map[\n");
+			err = cbor_value_enter_container(it, &recursed);
+			if (err)
+				return err;       // parse error
+			err = dumprecursive(&recursed, nestingLevel + 1);
+			if (err)
+				return err;       // parse error
+			err = cbor_value_leave_container(it, &recursed);
+			if (err)
+				return err;       // parse error
+			indent(nestingLevel);
+			printf("]\n");
+			continue;
+		}
+
+		default: {
+			err = dumpelm(it, &got_next, nestingLevel);
+			printf("\n");
+			if (err)
+				return err;
+			break;
+		}
+		}
+
+		if (!got_next) {
+			err = cbor_value_advance_fixed(it);
+			if (err)
+				return err;
+		}
+	}
+	return CborNoError;
+}
+
+int TinyCborInit(uint8_t *data, size_t length, CborValue *cb) {
 	CborParser parser;
 	CborError err = cbor_parser_init(data, length, 0, &parser, cb);
-   // if (!err)
-	 //   err = dumprecursive(cb, 0);
-
-	if (err) {
-		fprintf(stderr, "CBOR parsing failure at offset %d: %s\n",
-				cb->ptr - data, cbor_error_string(err));
-		return 1;
-	}	
+    if (err)
+		return err;
 	
 	return 0;
 }
@@ -32,10 +211,20 @@ int TinyCborParser(uint8_t *data, size_t length, CborValue *cb) {
 int TinyCborPrintFIDOPackage(uint8_t *data, size_t length) {
 	CborValue cb;
 	int res;
-	res = TinyCborParser(data, length, &cb);
+	res = TinyCborInit(&data[1], length - 1, &cb);
 	if (res)
 		return res;
 	
+	
+	
+    CborError err = dumprecursive(&cb, 0);
+
+	if (err) {
+		fprintf(stderr, "CBOR parsing failure at offset %d: %s\n",
+				cb.ptr - data, cbor_error_string(err));
+		return 1;
+	}	
+	
+	
 	return 0;
 }
-

From faef1a093801d54f423441e0f551c8292fe1fe7d Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Fri, 16 Nov 2018 23:57:55 +0100
Subject: [PATCH 0197/1938] chg: lf simulation - trying the new clock for
 better timings.

---
 armsrc/lfops.c | 109 ++++++++++++++++++++++++++-----------------------
 1 file changed, 57 insertions(+), 52 deletions(-)

diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index 021fc2411..0dac64bd1 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -575,10 +575,13 @@ void WriteTItag(uint32_t idhi, uint32_t idlo, uint16_t crc)
 //  this may destroy the bigbuf so be sure this is called before calling SimulateTagLowFrequencyEx
 void SimulateTagLowFrequencyEx(int period, int gap, int ledcontrol, int numcycles) {
 
+	// start us timer
+	StartTicks();
+
 	//FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_TOGGLE_MODE );
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT);
-	SpinDelay(20);
-
+	WaitMS(20);
+	
 	int i = 0, x = 0;
 	uint8_t *buf = BigBuf_get_addr();
 
@@ -617,7 +620,7 @@ void SimulateTagLowFrequencyEx(int period, int gap, int ledcontrol, int numcycle
 				goto OUT;
 		}
 
-		if(buf[i])
+		if (buf[i])
 			OPEN_COIL();
 		else
 			SHORT_COIL();
@@ -631,17 +634,18 @@ void SimulateTagLowFrequencyEx(int period, int gap, int ledcontrol, int numcycle
 		}
 
 		i++;
-		if(i == period) {
+		if (i == period) {
 			i = 0;
 			if (gap) {
 				SHORT_COIL();
-				SpinDelayUs(gap);
+				WaitUS(gap);
 			}
 		}
 
 		if (ledcontrol) LED_D_OFF();
 	}
 OUT:
+	StopTicks();
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 	LED_D_OFF();
 }
@@ -665,44 +669,44 @@ static void fc(int c, int *n)
 	int idx;
 
 	// for when we want an fc8 pattern every 4 logical bits
-	if(c==0) {
-		dest[((*n)++)]=1;
-		dest[((*n)++)]=1;
-		dest[((*n)++)]=1;
-		dest[((*n)++)]=1;
-		dest[((*n)++)]=0;
-		dest[((*n)++)]=0;
-		dest[((*n)++)]=0;
-		dest[((*n)++)]=0;
+	if (c == 0) {
+		dest[((*n)++)] = 1;
+		dest[((*n)++)] = 1;
+		dest[((*n)++)] = 1;
+		dest[((*n)++)] = 1;
+		dest[((*n)++)] = 0;
+		dest[((*n)++)] = 0;
+		dest[((*n)++)] = 0;
+		dest[((*n)++)] = 0;
 	}
 
 	//	an fc/8  encoded bit is a bit pattern of  11110000  x6 = 48 samples
-	if(c==8) {
-		for (idx=0; idx<6; idx++) {
-			dest[((*n)++)]=1;
-			dest[((*n)++)]=1;
-			dest[((*n)++)]=1;
-			dest[((*n)++)]=1;
-			dest[((*n)++)]=0;
-			dest[((*n)++)]=0;
-			dest[((*n)++)]=0;
-			dest[((*n)++)]=0;
+	if (c == 8) {
+		for (idx=0; idx < 6; idx++) {
+			dest[((*n)++)] = 1;
+			dest[((*n)++)] = 1;
+			dest[((*n)++)] = 1;
+			dest[((*n)++)] = 1;
+			dest[((*n)++)] = 0;
+			dest[((*n)++)] = 0;
+			dest[((*n)++)] = 0;
+			dest[((*n)++)] = 0;
 		}
 	}
 
 	//	an fc/10 encoded bit is a bit pattern of 1111100000 x5 = 50 samples
-	if(c==10) {
-		for (idx=0; idx<5; idx++) {
-			dest[((*n)++)]=1;
-			dest[((*n)++)]=1;
-			dest[((*n)++)]=1;
-			dest[((*n)++)]=1;
-			dest[((*n)++)]=1;
-			dest[((*n)++)]=0;
-			dest[((*n)++)]=0;
-			dest[((*n)++)]=0;
-			dest[((*n)++)]=0;
-			dest[((*n)++)]=0;
+	if (c == 10) {
+		for (idx = 0; idx < 5; idx++) {
+			dest[((*n)++)] = 1;
+			dest[((*n)++)] = 1;
+			dest[((*n)++)] = 1;
+			dest[((*n)++)] = 1;
+			dest[((*n)++)] = 1;
+			dest[((*n)++)] = 0;
+			dest[((*n)++)] = 0;
+			dest[((*n)++)] = 0;
+			dest[((*n)++)] = 0;
+			dest[((*n)++)] = 0;
 		}
 	}
 }
@@ -720,7 +724,7 @@ static void fcSTT(int *n) {
 static void fcAll(uint8_t fc, int *n, uint8_t clock, uint16_t *modCnt)
 {
 	uint8_t *dest = BigBuf_get_addr();
-	uint8_t halfFC = fc/2;
+	uint8_t halfFC = fc >> 1;
 	uint8_t wavesPerClock = clock/fc;
 	uint8_t mod = clock % fc;    //modifier
 	uint8_t modAdj = fc/mod;     //how often to apply modifier
@@ -729,21 +733,22 @@ static void fcAll(uint8_t fc, int *n, uint8_t clock, uint16_t *modCnt)
 	// loop through clock - step field clock
 	for (uint8_t idx=0; idx < wavesPerClock; idx++){
 		// put 1/2 FC length 1's and 1/2 0's per field clock wave (to create the wave)
-		memset(dest+(*n), 0, fc-halfFC);  //in case of odd number use extra here
-		memset(dest+(*n)+(fc-halfFC), 1, halfFC);
+		memset(dest + (*n), 0, fc - halfFC);  //in case of odd number use extra here
+		memset(dest + (*n) + (fc - halfFC), 1, halfFC);
 		*n += fc;
 	}
-	if (mod>0) (*modCnt)++;
-	if ((mod>0) && modAdjOk){  //fsk2
+	if (mod > 0) (*modCnt)++;
+	
+	if ((mod > 0) && modAdjOk){  //fsk2
 		if ((*modCnt % modAdj) == 0){ //if 4th 8 length wave in a rf/50 add extra 8 length wave
-			memset(dest+(*n), 0, fc-halfFC);
-			memset(dest+(*n)+(fc-halfFC), 1, halfFC);
+			memset(dest + (*n), 0, fc - halfFC);
+			memset(dest + (*n) + ( fc - halfFC), 1, halfFC);
 			*n += fc;
 		}
 	}
-	if (mod>0 && !modAdjOk){  //fsk1
-		memset(dest+(*n), 0, mod-(mod/2));
-		memset(dest+(*n)+(mod-(mod/2)), 1, mod/2);
+	if (mod > 0 && !modAdjOk){  //fsk1
+		memset(dest + (*n), 0, mod - (mod >> 1));
+		memset(dest + (*n) + (mod - (mod >> 1)), 1, mod >> 1);
 		*n += mod;
 	}
 }
@@ -781,11 +786,11 @@ void CmdHIDsimTAGEx( uint32_t hi, uint32_t lo, int ledcontrol, int numcycles) {
 	fcSTT(&n);
 
 	// manchester encode bits 43 to 32
-	for (i=11; i>=0; i--) {
+	for (i = 11; i >= 0; i--) {
 
-		if ((i%4)==3) fc(0, &n);
+		if ((i % 4) == 3) fc(0, &n);
 
-		if ((hi>>i) & 1) {
+		if ((hi >> i) & 1) {
 			fc(10, &n); fc(8,  &n);		// low-high transition
 		} else {
 			fc(8,  &n); fc(10, &n);		// high-low transition
@@ -793,11 +798,11 @@ void CmdHIDsimTAGEx( uint32_t hi, uint32_t lo, int ledcontrol, int numcycles) {
 	}
 
 	// manchester encode bits 31 to 0
-	for (i=31; i>=0; i--) {
+	for (i = 31; i >= 0; i--) {
 
-		if ((i%4)==3) fc(0, &n);
+		if ((i % 4) == 3) fc(0, &n);
 
-		if ((lo>>i) & 1) {
+		if (( lo >> i ) & 1) {
 			fc(10, &n); fc(8,  &n);		// low-high transition
 		} else {
 			fc(8,  &n); fc(10, &n);		// high-low transition

From aa3b322d0f86f9b7e1f7ee8ecfefa8b84f805ab5 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Fri, 16 Nov 2018 23:59:14 +0100
Subject: [PATCH 0198/1938] chg: 'analyze a' - some fpc test changes.

---
 armsrc/appmain.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index a3b330e84..60229868d 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1080,26 +1080,28 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 			static const char* welcome = "Proxmark3 Serial interface ready\n";
 			strncat(dest, welcome, sizeof(dest) - strlen(dest) - 1);
 			
-			sprintf(dest + strlen(dest) - 1, "Arg0  | 0x%" PRIx64 " \n", c->arg[0]);
-			sprintf(dest + strlen(dest) - 1, "Arg1  | 0x%" PRIx64 " \n", c->arg[1]);
-			sprintf(dest + strlen(dest) - 1, "Arg2  | 0x%" PRIx64 " \n", c->arg[2]);
-			sprintf(dest + strlen(dest) - 1, "bytes | 0x%02x 0x%02x 0x%02x 0x%02x \n"
+			sprintf(dest + strlen(dest) - 1, "| Arg0 0x%" PRIx64 " \n", c->arg[0]);
+			sprintf(dest + strlen(dest) - 1, "| Arg1 0x%" PRIx64 " \n", c->arg[1]);
+			sprintf(dest + strlen(dest) - 1, "| Arg2 0x%" PRIx64 " \n", c->arg[2]);
+			sprintf(dest + strlen(dest) - 1, "| bytes 0x%02x 0x%02x 0x%02x 0x%02x \n"
 						,c->d.asBytes[0], c->d.asBytes[1], c->d.asBytes[2], c->d.asBytes[3]);
 			
-/*
+
 			UsbCommand txcmd;
 			for (size_t i=0; i < sizeof(UsbCommand); i++)
 				((uint8_t*)&txcmd)[i] = 0x00;
 
 			// Compose the outgoing command frame
 			txcmd.cmd = CMD_DEBUG_PRINT_STRING;
-			txcmd.arg[0] = len;
+			txcmd.arg[0] = strlen(dest);
 			txcmd.arg[1] = 0;	
 			txcmd.arg[2] = 0;
 			memcpy(txcmd.d.asBytes, dest, USB_CMD_DATA_SIZE);		
+
+			usart_init();			
 			usart_writebuffer((uint8_t*)&txcmd, sizeof(UsbCommand));
-*/
-			DbpString("Starting to listen");
+
+			DbpString("Justs send to usart");
 			LED_A_ON();
 			/*
 			uint8_t rx[sizeof(UsbCommand)];
@@ -1110,7 +1112,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 					DbpString("got 544");
 			}
 			*/
-			cmd_send(CMD_DEBUG_PRINT_STRING, strlen(dest), 0, 0, dest, strlen(dest));
+			//cmd_send(CMD_DEBUG_PRINT_STRING, strlen(dest), 0, 0, dest, strlen(dest));
 			//DbpString("finished");
 			LED_A_OFF();
 			cmd_send(CMD_ACK,0,0,0,0,0);
@@ -1196,7 +1198,6 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 			// arg0 = startindex
 			// arg1 = length bytes to transfer
 			// arg2 = RFU
-			//Dbprintf("transfer to client parameters: %" PRIu32 " | %" PRIu32 " | %" PRIu32, startidx, numofbytes, c->arg[2]);
 
 			for (size_t i = 0; i < numofbytes; i += USB_CMD_DATA_SIZE) {
 				len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);
@@ -1231,7 +1232,6 @@ void UsbPacketReceived(uint8_t *packet, int len) {
   			if (!FlashInit()) {
    		       break;
   		    }
-			//Flash_CheckBusy(BUSY_TIMEOUT);
 			
 			for(size_t i = 0; i < len; i += size) {
 				len = MIN((len - i), size);

From 563086c9352004c89887baa3e5d6e85dd53b1567 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Sat, 17 Nov 2018 01:31:08 +0200
Subject: [PATCH 0199/1938] cbor print ok

---
 client/fido/cbortools.c | 59 +++++++++++++----------------------------
 1 file changed, 19 insertions(+), 40 deletions(-)

diff --git a/client/fido/cbortools.c b/client/fido/cbortools.c
index 1744277a5..dbd02a3d1 100644
--- a/client/fido/cbortools.c
+++ b/client/fido/cbortools.c
@@ -121,7 +121,8 @@ static CborError dumpelm(CborValue *it, bool *got_next, int nestingLevel) {
 	return CborNoError;
 }
 
-static CborError dumprecursive(CborValue *it, int nestingLevel) {
+static CborError dumprecursive(CborValue *it, bool isMapType, int nestingLevel) {
+	int elmCount = 0;
 	while (!cbor_value_at_end(it)) {
 		CborError err;
 		CborType type = cbor_value_get_type(it);
@@ -129,63 +130,35 @@ static CborError dumprecursive(CborValue *it, int nestingLevel) {
 		bool got_next;
 
 		switch (type) {
-		case CborMapType: /*{
-			// recursive type
-			CborValue recursed;
-			assert(cbor_value_is_container(it));
-			printf("Map[\n");
-			err = cbor_value_enter_container(it, &recursed);
-			if (err)
-				return err;       // parse error
-
-			// name
-			err = dumpelm(&recursed, next!!!!, nestingLevel + 1);
-			if (err)
-				return err;
-
-			printf(":");
-			err = cbor_value_advance_fixed(it);
-			if (err)
-				return err;
-
-			// value
-printf("*");
-			err = dumprecursive(&recursed, nestingLevel + 1);
-			if (err)
-				return err;       // parse error
-
-			err = cbor_value_leave_container(it, &recursed);
-			if (err)
-				return err;       // parse error
-			indent(nestingLevel);
-			printf("]\n");
-			continue;
-		}*/
+		case CborMapType: 
 		case CborArrayType: {
 			// recursive type
 			CborValue recursed;
 			assert(cbor_value_is_container(it));
-			indent(nestingLevel);
+			if (!(isMapType && (elmCount % 2)))
+				indent(nestingLevel);
 			printf(type == CborArrayType ? "Array[\n" : "Map[\n");
 			err = cbor_value_enter_container(it, &recursed);
 			if (err)
 				return err;       // parse error
-			err = dumprecursive(&recursed, nestingLevel + 1);
+			err = dumprecursive(&recursed, (type == CborMapType), nestingLevel + 1);
 			if (err)
 				return err;       // parse error
 			err = cbor_value_leave_container(it, &recursed);
 			if (err)
 				return err;       // parse error
 			indent(nestingLevel);
-			printf("]\n");
-			continue;
+			printf("]");
+			got_next = true;
+			break;
 		}
 
 		default: {
-			err = dumpelm(it, &got_next, nestingLevel);
-			printf("\n");
+			err = dumpelm(it, &got_next, (isMapType && (elmCount % 2)) ? 0 : nestingLevel);
 			if (err)
 				return err;
+//			if (nestingLevel == 1 && isMapType && !(elmCount % 2))
+//				printf(" ()");
 			break;
 		}
 		}
@@ -195,6 +168,12 @@ printf("*");
 			if (err)
 				return err;
 		}
+		if (isMapType && !(elmCount % 2)) {
+			printf(": ");
+		} else {
+			printf("\n");
+		}
+		elmCount++;
 	}
 	return CborNoError;
 }
@@ -217,7 +196,7 @@ int TinyCborPrintFIDOPackage(uint8_t *data, size_t length) {
 	
 	
 	
-    CborError err = dumprecursive(&cb, 0);
+    CborError err = dumprecursive(&cb, false, 0);
 
 	if (err) {
 		fprintf(stderr, "CBOR parsing failure at offset %d: %s\n",

From 8201526f6eb3f469e4ea57fcc1f8046fbed6fb7d Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Sat, 17 Nov 2018 01:40:27 +0200
Subject: [PATCH 0200/1938] fix fido2 response structure

---
 client/cmdhffido.c      | 7 ++++++-
 client/fido/cbortools.c | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index faff8e82c..bcac719ae 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -140,10 +140,15 @@ int CmdHFFidoInfo(const char *cmd) {
 		
 		return 0;
 	}
+	
+	if(buf[0]) {
+		PrintAndLog("FIDO2 ger version error: %d", buf[0]); 
+		return 0;
+	}
 
 	PrintAndLog("FIDO2 version: (%d)", len); 
 	dump_buffer((const unsigned char *)buf, len, NULL, 0);
-	TinyCborPrintFIDOPackage(buf, len);
+	TinyCborPrintFIDOPackage(&buf[1], len - 1);
 	
 	return 0;
 }
diff --git a/client/fido/cbortools.c b/client/fido/cbortools.c
index dbd02a3d1..19f9abc2f 100644
--- a/client/fido/cbortools.c
+++ b/client/fido/cbortools.c
@@ -190,7 +190,7 @@ int TinyCborInit(uint8_t *data, size_t length, CborValue *cb) {
 int TinyCborPrintFIDOPackage(uint8_t *data, size_t length) {
 	CborValue cb;
 	int res;
-	res = TinyCborInit(&data[1], length - 1, &cb);
+	res = TinyCborInit(data, length, &cb);
 	if (res)
 		return res;
 	

From f4bb63a728b88f01ac542b09934e55a3021e90f9 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Sat, 17 Nov 2018 01:55:29 +0200
Subject: [PATCH 0201/1938] sketch for get cmd code name

---
 client/cmdhffido.c      |  6 ++++--
 client/fido/cbortools.c | 21 +++++++++++++++------
 client/fido/cbortools.h |  2 +-
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index bcac719ae..b3eb47384 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -49,6 +49,8 @@
 
 static int CmdHelp(const char *Cmd);
 
+#define FIDO2_CMD_INFO 0x04
+
 int FIDOSelect(bool ActivateField, bool LeaveFieldON, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
 	uint8_t data[] = {0xA0, 0x00, 0x00, 0x06, 0x47, 0x2F, 0x00, 0x01};
 	
@@ -82,7 +84,7 @@ int FIDOAuthentication(uint8_t *params, uint8_t paramslen, uint8_t controlb, uin
 }
 
 int FIDO2GetInfo(uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
-	uint8_t data[] = {0x04};
+	uint8_t data[] = {FIDO2_CMD_INFO};
 	return FIDOExchange((sAPDU){0x80, 0x10, 0x00, 0x00, sizeof(data), data}, Result, MaxResultLen, ResultLen, sw);
 }
 
@@ -148,7 +150,7 @@ int CmdHFFidoInfo(const char *cmd) {
 
 	PrintAndLog("FIDO2 version: (%d)", len); 
 	dump_buffer((const unsigned char *)buf, len, NULL, 0);
-	TinyCborPrintFIDOPackage(&buf[1], len - 1);
+	TinyCborPrintFIDOPackage(FIDO2_CMD_INFO, &buf[1], len - 1);
 	
 	return 0;
 }
diff --git a/client/fido/cbortools.c b/client/fido/cbortools.c
index 19f9abc2f..edf881925 100644
--- a/client/fido/cbortools.c
+++ b/client/fido/cbortools.c
@@ -121,7 +121,11 @@ static CborError dumpelm(CborValue *it, bool *got_next, int nestingLevel) {
 	return CborNoError;
 }
 
-static CborError dumprecursive(CborValue *it, bool isMapType, int nestingLevel) {
+char *getCmdCodeDescription (uint8_t cmdCode, uint8_t memberNum) {
+	return NULL;
+}
+
+static CborError dumprecursive(uint8_t cmdCode, CborValue *it, bool isMapType, int nestingLevel) {
 	int elmCount = 0;
 	while (!cbor_value_at_end(it)) {
 		CborError err;
@@ -141,7 +145,7 @@ static CborError dumprecursive(CborValue *it, bool isMapType, int nestingLevel)
 			err = cbor_value_enter_container(it, &recursed);
 			if (err)
 				return err;       // parse error
-			err = dumprecursive(&recursed, (type == CborMapType), nestingLevel + 1);
+			err = dumprecursive(cmdCode, &recursed, (type == CborMapType), nestingLevel + 1);
 			if (err)
 				return err;       // parse error
 			err = cbor_value_leave_container(it, &recursed);
@@ -157,8 +161,13 @@ static CborError dumprecursive(CborValue *it, bool isMapType, int nestingLevel)
 			err = dumpelm(it, &got_next, (isMapType && (elmCount % 2)) ? 0 : nestingLevel);
 			if (err)
 				return err;
-//			if (nestingLevel == 1 && isMapType && !(elmCount % 2))
-//				printf(" ()");
+			if (cmdCode > 0 && nestingLevel == 1 && isMapType && !(elmCount % 2)) {
+				int64_t val;
+				cbor_value_get_int64(it, &val);
+				char *desc = getCmdCodeDescription(cmdCode, val);
+				if (desc)
+					printf(" (%s)", desc);
+			}
 			break;
 		}
 		}
@@ -187,7 +196,7 @@ int TinyCborInit(uint8_t *data, size_t length, CborValue *cb) {
 	return 0;
 }
 
-int TinyCborPrintFIDOPackage(uint8_t *data, size_t length) {
+int TinyCborPrintFIDOPackage(uint8_t cmdCode, uint8_t *data, size_t length) {
 	CborValue cb;
 	int res;
 	res = TinyCborInit(data, length, &cb);
@@ -196,7 +205,7 @@ int TinyCborPrintFIDOPackage(uint8_t *data, size_t length) {
 	
 	
 	
-    CborError err = dumprecursive(&cb, false, 0);
+    CborError err = dumprecursive(cmdCode, &cb, false, 0);
 
 	if (err) {
 		fprintf(stderr, "CBOR parsing failure at offset %d: %s\n",
diff --git a/client/fido/cbortools.h b/client/fido/cbortools.h
index f49751b56..93d46209f 100644
--- a/client/fido/cbortools.h
+++ b/client/fido/cbortools.h
@@ -17,6 +17,6 @@
 #include <stddef.h>
 #include <stdint.h>
 
-extern int TinyCborPrintFIDOPackage(uint8_t *data, size_t length);
+extern int TinyCborPrintFIDOPackage(uint8_t cmdCode, uint8_t *data, size_t length);
 
 #endif /* __CBORTOOLS_H__ */

From 8f1c67d5125006d90547dcdc71e536dcb7f1631e Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Sat, 17 Nov 2018 16:19:09 +0200
Subject: [PATCH 0202/1938] added fidocore

---
 client/Makefile         |  1 +
 client/cmdhffido.c      |  7 +++----
 client/fido/cbortools.c |  7 ++-----
 client/fido/cbortools.h |  1 -
 client/fido/fidocore.c  | 22 ++++++++++++++++++++++
 client/fido/fidocore.h  | 32 ++++++++++++++++++++++++++++++++
 6 files changed, 60 insertions(+), 10 deletions(-)
 create mode 100644 client/fido/fidocore.c
 create mode 100644 client/fido/fidocore.h

diff --git a/client/Makefile b/client/Makefile
index f97f395e9..1e88e5dc9 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -112,6 +112,7 @@ CMDSRCS =	crapto1/crapto1.c \
 			tea.c \
 			fido/additional_ca.c \
 			fido/cbortools.c \
+			fido/fidocore.c \
 			crypto/asn1dump.c \
 			crypto/libpcrypto.c\
 			crypto/asn1utils.c\
diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index b3eb47384..2a61a29c7 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -46,11 +46,10 @@
 #include "crypto/libpcrypto.h"
 #include "fido/additional_ca.h"
 #include "fido/cbortools.h"
+#include "fido/fidocore.h"
 
 static int CmdHelp(const char *Cmd);
 
-#define FIDO2_CMD_INFO 0x04
-
 int FIDOSelect(bool ActivateField, bool LeaveFieldON, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
 	uint8_t data[] = {0xA0, 0x00, 0x00, 0x06, 0x47, 0x2F, 0x00, 0x01};
 	
@@ -84,7 +83,7 @@ int FIDOAuthentication(uint8_t *params, uint8_t paramslen, uint8_t controlb, uin
 }
 
 int FIDO2GetInfo(uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
-	uint8_t data[] = {FIDO2_CMD_INFO};
+	uint8_t data[] = {fido2CmdGetInfo};
 	return FIDOExchange((sAPDU){0x80, 0x10, 0x00, 0x00, sizeof(data), data}, Result, MaxResultLen, ResultLen, sw);
 }
 
@@ -150,7 +149,7 @@ int CmdHFFidoInfo(const char *cmd) {
 
 	PrintAndLog("FIDO2 version: (%d)", len); 
 	dump_buffer((const unsigned char *)buf, len, NULL, 0);
-	TinyCborPrintFIDOPackage(FIDO2_CMD_INFO, &buf[1], len - 1);
+	TinyCborPrintFIDOPackage(fido2CmdGetInfo, &buf[1], len - 1);
 	
 	return 0;
 }
diff --git a/client/fido/cbortools.c b/client/fido/cbortools.c
index edf881925..cd8f905bb 100644
--- a/client/fido/cbortools.c
+++ b/client/fido/cbortools.c
@@ -14,6 +14,7 @@
 #include <stdlib.h>
 #include "cbor.h"
 #include "util.h"
+#include "fidocore.h"
 
 static void indent(int nestingLevel) {
 	while (nestingLevel--)
@@ -121,10 +122,6 @@ static CborError dumpelm(CborValue *it, bool *got_next, int nestingLevel) {
 	return CborNoError;
 }
 
-char *getCmdCodeDescription (uint8_t cmdCode, uint8_t memberNum) {
-	return NULL;
-}
-
 static CborError dumprecursive(uint8_t cmdCode, CborValue *it, bool isMapType, int nestingLevel) {
 	int elmCount = 0;
 	while (!cbor_value_at_end(it)) {
@@ -164,7 +161,7 @@ static CborError dumprecursive(uint8_t cmdCode, CborValue *it, bool isMapType, i
 			if (cmdCode > 0 && nestingLevel == 1 && isMapType && !(elmCount % 2)) {
 				int64_t val;
 				cbor_value_get_int64(it, &val);
-				char *desc = getCmdCodeDescription(cmdCode, val);
+				char *desc = fido2GetCmdMemberDescription(cmdCode, val);
 				if (desc)
 					printf(" (%s)", desc);
 			}
diff --git a/client/fido/cbortools.h b/client/fido/cbortools.h
index 93d46209f..bb442f1f8 100644
--- a/client/fido/cbortools.h
+++ b/client/fido/cbortools.h
@@ -10,7 +10,6 @@
 //-----------------------------------------------------------------------------
 //
 
-
 #ifndef __CBORTOOLS_H__
 #define __CBORTOOLS_H__
 
diff --git a/client/fido/fidocore.c b/client/fido/fidocore.c
new file mode 100644
index 000000000..4676aa7d3
--- /dev/null
+++ b/client/fido/fidocore.c
@@ -0,0 +1,22 @@
+//-----------------------------------------------------------------------------
+// Copyright (C) 2018 Merlok
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// FIDO2 authenticators core data and commands
+// https://fidoalliance.org/specs/fido-v2.0-id-20180227/fido-client-to-authenticator-protocol-v2.0-id-20180227.html
+//-----------------------------------------------------------------------------
+//
+
+#include "fidocore.h"
+
+char *fido2GetCmdMemberDescription(uint8_t cmdCode, uint8_t memberNum) {
+	
+	
+	
+	
+	return NULL;
+}
+
diff --git a/client/fido/fidocore.h b/client/fido/fidocore.h
new file mode 100644
index 000000000..10ed65ea0
--- /dev/null
+++ b/client/fido/fidocore.h
@@ -0,0 +1,32 @@
+//-----------------------------------------------------------------------------
+// Copyright (C) 2018 Merlok
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// FIDO2 authenticators core data and commands
+// https://fidoalliance.org/specs/fido-v2.0-id-20180227/fido-client-to-authenticator-protocol-v2.0-id-20180227.html
+//-----------------------------------------------------------------------------
+//
+#ifndef __FIDOCORE_H__
+#define __FIDOCORE_H__
+
+#include <stddef.h>
+#include <stdint.h>
+
+enum fido2Commands {
+	fido2CmdMakeCredential		= 0x01,
+	fido2CmdGetAssertion		= 0x02,
+	fido2CmdCancel				= 0x03,
+	fido2CmdGetInfo				= 0x04,
+	fido2CmdClientPIN			= 0x06,
+	fido2CmdReset				= 0x07,
+	fido2CmdGetNextAssertion	= 0x08,
+};
+
+
+
+extern char *fido2GetCmdMemberDescription(uint8_t cmdCode, uint8_t memberNum);
+
+#endif /* __FIDOCORE_H__ */

From 23ef267100c2c0617b612035f5741f2d8bdb4953 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Sat, 17 Nov 2018 18:11:46 +0200
Subject: [PATCH 0203/1938] added fido2 error codes description

---
 client/cmdhffido.c     |  2 +-
 client/fido/fidocore.c | 91 ++++++++++++++++++++++++++++++++++++++++++
 client/fido/fidocore.h |  2 +
 3 files changed, 94 insertions(+), 1 deletion(-)

diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index 2a61a29c7..e344e4445 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -143,7 +143,7 @@ int CmdHFFidoInfo(const char *cmd) {
 	}
 	
 	if(buf[0]) {
-		PrintAndLog("FIDO2 ger version error: %d", buf[0]); 
+		PrintAndLog("FIDO2 ger version error: %d - %s", buf[0], fido2GetCmdErrorDescription(buf[0])); 
 		return 0;
 	}
 
diff --git a/client/fido/fidocore.c b/client/fido/fidocore.c
index 4676aa7d3..1263baef9 100644
--- a/client/fido/fidocore.c
+++ b/client/fido/fidocore.c
@@ -11,6 +11,97 @@
 //
 
 #include "fidocore.h"
+typedef struct {
+	uint8_t ErrorCode;
+	char *ShortDescription;
+	char *Description;
+} fido2Error_t;
+
+fido2Error_t fido2Errors[] = {
+	{0xFF, "n/a",									"n/a"},
+	{0x00, "CTAP1_ERR_SUCCESS",					"Indicates successful response."},
+	{0x01, "CTAP1_ERR_INVALID_COMMAND",			"The command is not a valid CTAP command."},
+	{0x02, "CTAP1_ERR_INVALID_PARAMETER",		"The command included an invalid parameter."},
+	{0x03, "CTAP1_ERR_INVALID_LENGTH",			"Invalid message or item length."},
+	{0x04, "CTAP1_ERR_INVALID_SEQ",				"Invalid message sequencing."},
+	{0x05, "CTAP1_ERR_TIMEOUT",					"Message timed out."},
+	{0x06, "CTAP1_ERR_CHANNEL_BUSY",			"Channel busy."},
+	{0x0A, "CTAP1_ERR_LOCK_REQUIRED",			"Command requires channel lock."},
+	{0x0B, "CTAP1_ERR_INVALID_CHANNEL",			"Command not allowed on this cid."},
+	{0x10, "CTAP2_ERR_CBOR_PARSING",			"Error while parsing CBOR."},
+	{0x11, "CTAP2_ERR_CBOR_UNEXPECTED_TYPE",	"Invalid/unexpected CBOR error."},
+	{0x12, "CTAP2_ERR_INVALID_CBOR",			"Error when parsing CBOR."},
+	{0x13, "CTAP2_ERR_INVALID_CBOR_TYPE",		"Invalid or unexpected CBOR type."},
+	{0x14, "CTAP2_ERR_MISSING_PARAMETER",		"Missing non-optional parameter."},
+	{0x15, "CTAP2_ERR_LIMIT_EXCEEDED",			"Limit for number of items exceeded."},
+	{0x16, "CTAP2_ERR_UNSUPPORTED_EXTENSION",	"Unsupported extension."},
+	{0x17, "CTAP2_ERR_TOO_MANY_ELEMENTS",		"Limit for number of items exceeded."},
+	{0x18, "CTAP2_ERR_EXTENSION_NOT_SUPPORTED",	"Unsupported extension."},
+	{0x19, "CTAP2_ERR_CREDENTIAL_EXCLUDED",		"Valid credential found in the exludeList."},
+	{0x20, "CTAP2_ERR_CREDENTIAL_NOT_VALID",	"Credential not valid for authenticator."},
+	{0x21, "CTAP2_ERR_PROCESSING",				"Processing (Lengthy operation is in progress)."},
+	{0x22, "CTAP2_ERR_INVALID_CREDENTIAL",		"Credential not valid for the authenticator."},
+	{0x23, "CTAP2_ERR_USER_ACTION_PENDING",		"Authentication is waiting for user interaction."},
+	{0x24, "CTAP2_ERR_OPERATION_PENDING",		"Processing, lengthy operation is in progress."},
+	{0x25, "CTAP2_ERR_NO_OPERATIONS",			"No request is pending."},
+	{0x26, "CTAP2_ERR_UNSUPPORTED_ALGORITHM",	"Authenticator does not support requested algorithm."},
+	{0x27, "CTAP2_ERR_OPERATION_DENIED",		"Not authorized for requested operation."},
+	{0x28, "CTAP2_ERR_KEY_STORE_FULL",			"Internal key storage is full."},
+	{0x29, "CTAP2_ERR_NOT_BUSY",				"Authenticator cannot cancel as it is not busy."},
+	{0x2A, "CTAP2_ERR_NO_OPERATION_PENDING",	"No outstanding operations."},
+	{0x2B, "CTAP2_ERR_UNSUPPORTED_OPTION",		"Unsupported option."},
+	{0x2C, "CTAP2_ERR_INVALID_OPTION",			"Unsupported option."},
+	{0x2D, "CTAP2_ERR_KEEPALIVE_CANCEL",		"Pending keep alive was cancelled."},
+	{0x2E, "CTAP2_ERR_NO_CREDENTIALS",			"No valid credentials provided."},
+	{0x2F, "CTAP2_ERR_USER_ACTION_TIMEOUT",		"Timeout waiting for user interaction."},
+	{0x30, "CTAP2_ERR_NOT_ALLOWED",				"Continuation command, such as, authenticatorGetNextAssertion not allowed."},
+	{0x31, "CTAP2_ERR_PIN_INVALID",				"PIN Blocked."},
+	{0x32, "CTAP2_ERR_PIN_BLOCKED",				"PIN Blocked."},
+	{0x33, "CTAP2_ERR_PIN_AUTH_INVALID",		"PIN authentication,pinAuth, verification failed."},
+	{0x34, "CTAP2_ERR_PIN_AUTH_BLOCKED",		"PIN authentication,pinAuth, blocked. Requires power recycle to reset."},
+	{0x35, "CTAP2_ERR_PIN_NOT_SET",				"No PIN has been set."},
+	{0x36, "CTAP2_ERR_PIN_REQUIRED",			"PIN is required for the selected operation."},
+	{0x37, "CTAP2_ERR_PIN_POLICY_VIOLATION",	"PIN policy violation. Currently only enforces minimum length."},
+	{0x38, "CTAP2_ERR_PIN_TOKEN_EXPIRED",		"pinToken expired on authenticator."},
+	{0x39, "CTAP2_ERR_REQUEST_TOO_LARGE",		"Authenticator cannot handle this request due to memory constraints."},
+	{0x7F, "CTAP1_ERR_OTHER",					"Other unspecified error."},
+	{0xDF, "CTAP2_ERR_SPEC_LAST", 				"CTAP 2 spec last error."},
+};
+
+typedef struct {
+	uint8_t MemberNumber;
+	char *Description;
+} fido2Desc_t;
+
+typedef fido2Desc_t fido2ArrayDesc_t[];
+/*
+typedef struct {
+	fido2Desc_t Query[];
+	fido2Desc_t Resp[];
+} fido2CmdDesc_t;
+
+fido2CmdDesc_t fido2CmdDesc[] = { // fido2CommandsCount
+	{fido2CmdGetInfoRespDesc, fido2CmdGetInfoRespDesc},
+	{fido2CmdGetInfoRespDesc, fido2CmdGetInfoRespDesc},
+};
+*/
+fido2Desc_t fido2CmdGetInfoRespDesc[] = {
+	{0x01, "versions"},
+	{0x02, "extensions"},
+	{0x03, "aaguid"},
+	{0x04, "options"},
+	{0x05, "maxMsgSize"},
+	{0x06, "pinProtocols"},
+	{0xff, ""},
+};
+
+char *fido2GetCmdErrorDescription(uint8_t errorCode) {
+	for (int i = 0; i < sizeof(fido2Errors) / sizeof(fido2Error_t); i++)
+		if (fido2Errors[i].ErrorCode == errorCode)
+			return fido2Errors[i].Description;
+		
+	return fido2Errors[0].Description;
+}
 
 char *fido2GetCmdMemberDescription(uint8_t cmdCode, uint8_t memberNum) {
 	
diff --git a/client/fido/fidocore.h b/client/fido/fidocore.h
index 10ed65ea0..252adec90 100644
--- a/client/fido/fidocore.h
+++ b/client/fido/fidocore.h
@@ -24,9 +24,11 @@ enum fido2Commands {
 	fido2CmdReset				= 0x07,
 	fido2CmdGetNextAssertion	= 0x08,
 };
+#define fido2CommandsCount 9 
 
 
 
 extern char *fido2GetCmdMemberDescription(uint8_t cmdCode, uint8_t memberNum);
+extern char *fido2GetCmdErrorDescription(uint8_t errorCode);
 
 #endif /* __FIDOCORE_H__ */

From 12b12891914fcd4828ce94d2a07a7546aee344b6 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Sat, 17 Nov 2018 18:39:21 +0200
Subject: [PATCH 0204/1938] fido info command completed

---
 client/cmdhffido.c     | 16 +++++++++---
 client/fido/fidocore.c | 57 +++++++++++++++++++++++++-----------------
 client/fido/fidocore.h | 10 +++++---
 3 files changed, 52 insertions(+), 31 deletions(-)

diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index e344e4445..954d96a8a 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -147,10 +147,18 @@ int CmdHFFidoInfo(const char *cmd) {
 		return 0;
 	}
 
-	PrintAndLog("FIDO2 version: (%d)", len); 
-	dump_buffer((const unsigned char *)buf, len, NULL, 0);
-	TinyCborPrintFIDOPackage(fido2CmdGetInfo, &buf[1], len - 1);
-	
+	if (len > 1) {
+//		if (false) {
+//			PrintAndLog("FIDO2 version: (len=%d)", len); 
+//			dump_buffer((const unsigned char *)buf, len, NULL, 0);
+//		}
+
+		PrintAndLog("FIDO2 version CBOR decoded:"); 
+		TinyCborPrintFIDOPackage(fido2CmdGetInfo, &buf[1], len - 1);
+	} else {
+		PrintAndLog("FIDO2 version length error"); 
+	}
+		
 	return 0;
 }
 
diff --git a/client/fido/fidocore.c b/client/fido/fidocore.c
index 1263baef9..1b41d2722 100644
--- a/client/fido/fidocore.c
+++ b/client/fido/fidocore.c
@@ -11,6 +11,7 @@
 //
 
 #include "fidocore.h"
+
 typedef struct {
 	uint8_t ErrorCode;
 	char *ShortDescription;
@@ -69,30 +70,38 @@ fido2Error_t fido2Errors[] = {
 };
 
 typedef struct {
+	fido2Commands Command;
+	fido2PacketType PckType;
 	uint8_t MemberNumber;
 	char *Description;
 } fido2Desc_t;
 
-typedef fido2Desc_t fido2ArrayDesc_t[];
-/*
-typedef struct {
-	fido2Desc_t Query[];
-	fido2Desc_t Resp[];
-} fido2CmdDesc_t;
-
-fido2CmdDesc_t fido2CmdDesc[] = { // fido2CommandsCount
-	{fido2CmdGetInfoRespDesc, fido2CmdGetInfoRespDesc},
-	{fido2CmdGetInfoRespDesc, fido2CmdGetInfoRespDesc},
-};
-*/
 fido2Desc_t fido2CmdGetInfoRespDesc[] = {
-	{0x01, "versions"},
-	{0x02, "extensions"},
-	{0x03, "aaguid"},
-	{0x04, "options"},
-	{0x05, "maxMsgSize"},
-	{0x06, "pinProtocols"},
-	{0xff, ""},
+	{fido2CmdMakeCredential, 	ptResponse, 0x01, "fmt"},
+	{fido2CmdMakeCredential, 	ptResponse, 0x02, "authData"},
+	{fido2CmdMakeCredential, 	ptResponse, 0x03, "attStmt"},
+	
+	{fido2CmdGetAssertion, 		ptResponse, 0x01, "credential"},
+	{fido2CmdGetAssertion, 		ptResponse, 0x02, "authData"},
+	{fido2CmdGetAssertion, 		ptResponse, 0x03, "signature"},
+	{fido2CmdGetAssertion, 		ptResponse, 0x04, "publicKeyCredentialUserEntity"},
+	{fido2CmdGetAssertion, 		ptResponse, 0x05, "numberOfCredentials"},
+	
+	{fido2CmdGetNextAssertion, 	ptResponse, 0x01, "credential"},
+	{fido2CmdGetNextAssertion, 	ptResponse, 0x02, "authData"},
+	{fido2CmdGetNextAssertion, 	ptResponse, 0x03, "signature"},
+	{fido2CmdGetNextAssertion, 	ptResponse, 0x04, "publicKeyCredentialUserEntity"},
+	
+	{fido2CmdGetInfo, 			ptResponse, 0x01, "versions"},
+	{fido2CmdGetInfo, 			ptResponse, 0x02, "extensions"},
+	{fido2CmdGetInfo, 			ptResponse, 0x03, "aaguid"},
+	{fido2CmdGetInfo, 			ptResponse, 0x04, "options"},
+	{fido2CmdGetInfo, 			ptResponse, 0x05, "maxMsgSize"},
+	{fido2CmdGetInfo, 			ptResponse, 0x06, "pinProtocols"},
+
+	{fido2CmdClientPIN, 		ptResponse, 0x06, "keyAgreement"},
+	{fido2CmdClientPIN, 		ptResponse, 0x06, "pinToken"},
+	{fido2CmdClientPIN, 		ptResponse, 0x06, "retries"},
 };
 
 char *fido2GetCmdErrorDescription(uint8_t errorCode) {
@@ -104,10 +113,12 @@ char *fido2GetCmdErrorDescription(uint8_t errorCode) {
 }
 
 char *fido2GetCmdMemberDescription(uint8_t cmdCode, uint8_t memberNum) {
-	
-	
-	
-	
+	for (int i = 0; i < sizeof(fido2CmdGetInfoRespDesc) / sizeof(fido2Desc_t); i++)
+		if (fido2CmdGetInfoRespDesc[i].Command == cmdCode &&
+			fido2CmdGetInfoRespDesc[i].PckType == ptResponse &&
+			fido2CmdGetInfoRespDesc[i].MemberNumber == memberNum )
+			return fido2CmdGetInfoRespDesc[i].Description;
+
 	return NULL;
 }
 
diff --git a/client/fido/fidocore.h b/client/fido/fidocore.h
index 252adec90..1ed5556cf 100644
--- a/client/fido/fidocore.h
+++ b/client/fido/fidocore.h
@@ -15,7 +15,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-enum fido2Commands {
+typedef enum {
 	fido2CmdMakeCredential		= 0x01,
 	fido2CmdGetAssertion		= 0x02,
 	fido2CmdCancel				= 0x03,
@@ -23,10 +23,12 @@ enum fido2Commands {
 	fido2CmdClientPIN			= 0x06,
 	fido2CmdReset				= 0x07,
 	fido2CmdGetNextAssertion	= 0x08,
-};
-#define fido2CommandsCount 9 
-
+} fido2Commands;
 
+typedef enum  {
+	ptQuery,
+	ptResponse,
+} fido2PacketType;
 
 extern char *fido2GetCmdMemberDescription(uint8_t cmdCode, uint8_t memberNum);
 extern char *fido2GetCmdErrorDescription(uint8_t errorCode);

From dc9b3c3a0ee4892bda86044e029e8218d1070f45 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Sat, 17 Nov 2018 23:52:36 +0200
Subject: [PATCH 0205/1938] added fido2 base commands

---
 client/cmdhffido.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index 954d96a8a..79df33ddb 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -87,6 +87,20 @@ int FIDO2GetInfo(uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16
 	return FIDOExchange((sAPDU){0x80, 0x10, 0x00, 0x00, sizeof(data), data}, Result, MaxResultLen, ResultLen, sw);
 }
 
+int FIDO2MakeCredential(uint8_t *params, uint8_t paramslen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
+	uint8_t data[paramslen + 1];
+	data[0] = fido2CmdMakeCredential;
+	memcpy(&data[1], params, paramslen);
+	return FIDOExchange((sAPDU){0x80, 0x10, 0x00, 0x00, sizeof(data), data}, Result, MaxResultLen, ResultLen, sw);
+}
+
+int FIDO2GetAssertion(uint8_t *params, uint8_t paramslen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
+	uint8_t data[paramslen + 1];
+	data[0] = fido2CmdGetAssertion;
+	memcpy(&data[1], params, paramslen);
+	return FIDOExchange((sAPDU){0x80, 0x10, 0x00, 0x00, sizeof(data), data}, Result, MaxResultLen, ResultLen, sw);
+}
+
 int CmdHFFidoInfo(const char *cmd) {
 	
 	if (cmd && strlen(cmd) > 0)

From dcfd75d1d0bc3fe2d42ee90d1d91d4a6a504494e Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Sun, 18 Nov 2018 00:03:28 +0200
Subject: [PATCH 0206/1938] added command sketch

---
 client/cmdhffido.c | 63 ++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 58 insertions(+), 5 deletions(-)

diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index 79df33ddb..11c63d92e 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -720,13 +720,66 @@ int CmdHFFidoAuthenticate(const char *cmd) {
 	return 0;
 };
 
+int CmdHFFido2MakeCredential(const char *cmd) {
+	
+	
+	uint8_t data[2048] = {0};
+	size_t datalen = 0;
+	uint8_t buf[2048] = {0};
+	size_t len = 0;
+	uint16_t sw = 0;
+
+	DropField();
+	int res = FIDOSelect(true, true, buf, sizeof(buf), &len, &sw);
+
+	if (res) {
+		PrintAndLog("Can't select authenticator. res=%x. Exit...", res);
+		DropField();
+		return res;
+	}
+	
+	if (sw != 0x9000) {
+		PrintAndLog("Can't select FIDO application. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
+		DropField();
+		return 2;
+	}
+
+	res = FIDO2MakeCredential(data, datalen, buf,  sizeof(buf), &len, &sw);
+	DropField();
+	if (res) {
+		PrintAndLog("Can't execute register command. res=%x. Exit...", res);
+		return res;
+	}
+	
+	if (sw != 0x9000) {
+		PrintAndLog("ERROR execute register command. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
+		return 3;
+	}
+	
+	if(buf[0]) {
+		PrintAndLog("FIDO2 ger version error: %d - %s", buf[0], fido2GetCmdErrorDescription(buf[0])); 
+		return 0;
+	}
+
+	PrintAndLog("res[%d]: %s", len, sprint_hex(buf, len));
+
+	return 0;
+};
+
+int CmdHFFido2GetAssertion(const char *cmd) {
+
+	return 0;
+};
+
 static command_t CommandTable[] =
 {
-  {"help",             CmdHelp,					1, "This help."},
-  {"info",  	       CmdHFFidoInfo,			0, "Info about FIDO tag."},
-  {"reg",  	  	 	   CmdHFFidoRegister,		0, "FIDO U2F Registration Message."},
-  {"auth",  	       CmdHFFidoAuthenticate,	0, "FIDO U2F Authentication Message."},
-  {NULL,               NULL,					0, NULL}
+  {"help",             CmdHelp,						1, "This help."},
+  {"info",  	       CmdHFFidoInfo,				0, "Info about FIDO tag."},
+  {"reg",  	  	 	   CmdHFFidoRegister,			0, "FIDO U2F Registration Message."},
+  {"auth",  	       CmdHFFidoAuthenticate,		0, "FIDO U2F Authentication Message."},
+  {"make",  	       CmdHFFido2MakeCredential,	0, "FIDO2 MakeCredential command."},
+  {"accert",  	       CmdHFFido2GetAssertion,		0, "FIDO2 GetAssertion command."},
+  {NULL,               NULL,						0, NULL}
 };
 
 int CmdHFFido(const char *Cmd) {

From 6d4552540ba5d00fb5cfb48786b028a517a6a136 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Sun, 18 Nov 2018 19:18:18 +0200
Subject: [PATCH 0207/1938] added fido2 test json

---
 client/fido/fido2.json | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 client/fido/fido2.json

diff --git a/client/fido/fido2.json b/client/fido/fido2.json
new file mode 100644
index 000000000..ceb55bae8
--- /dev/null
+++ b/client/fido/fido2.json
@@ -0,0 +1,35 @@
+{
+  "ClientDataHash": "000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f",
+  "RelyingPartyEntity": {
+    "isMap": true,
+    "id": "acme.com",
+    "name": "Acme"
+  },
+  "UserEntity": {
+    "isMap": true,
+    "id": "00000000000000000000000000000000",
+    "icon": "https://pics.acme.com/00/p/aBjjjpqPb.png",
+    "name": "johnpsmith@acme.com",
+    "displayName": "John P. Smith"
+  },
+  "pubKeyCredParams": [
+    {
+      "isMap": true,
+      "type": "public-key",
+      "alg": -7,
+      "name": "ES256"
+    },
+    {
+      "isMap": true,
+      "type": "public-key",
+      "alg": -257,
+      "name": "RS256"
+    }
+  ],
+  "options": {
+    "isMap": true,
+    "up": false,
+    "uv": false,
+    "keyStorageDevice": true
+  }
+}
\ No newline at end of file

From f8c33af1daa417875f8712dc737c00d289d0d514 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Tue, 20 Nov 2018 10:58:32 +0100
Subject: [PATCH 0208/1938] CHG: FPC connector tests.    Device -> Client
 communications works.

Adjust  armsrc/Makefile   and client/Makefile  to include  the  -DWITH_FPC  flag to compile with FPC enabled.
---
 armsrc/appmain.c  |  81 ++++++++++++++++++++------------
 client/comms.c    |  18 +++++---
 common/cmd.c      |   4 +-
 common/usart.c    | 114 +++++++++++++++-------------------------------
 common/usart.h    |   2 +-
 uart/uart_posix.c |   6 ++-
 uart/uart_win32.c |  17 ++++++-
 7 files changed, 123 insertions(+), 119 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 60229868d..eed443599 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -628,7 +628,7 @@ void ListenReaderField(int limit) {
 void UsbPacketReceived(uint8_t *packet, int len) {
 	UsbCommand *c = (UsbCommand *)packet;
 
-	//Dbprintf("received %d bytes, with command: 0x%04x and args: %d %d %d",len,c->cmd,c->arg[0],c->arg[1],c->arg[2]);
+	//Dbprintf("received %d bytes, with command: 0x%04x and args: %d %d %d", len, c->cmd, c->arg[0], c->arg[1], c->arg[2]);
   
 	switch(c->cmd) {
 #ifdef WITH_LF
@@ -1075,47 +1075,70 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 #ifdef WITH_FPC
 		case CMD_FPC_SEND: {
 
+		
+			StartTicks();
+			DbpString("Mutual USB/FPC sending from device to client");
+	
+			/*
+			char at[11] = {'\0'};
+			static const char* s_at = "AT+BAUD8\0D\0A";
+			strncat(at, s_at, sizeof(at) - strlen(at) - 1);			
+			DbpString("Try AT baud rate setting");
+			usart_init();
+			int16_t res = usart_writebuffer((uint8_t*)&at, sizeof(at));
+			WaitMS(1);
+			Dbprintf("SEND %d | %c%c%c%c%c%c%c%c%c%c%c", res,  at[0], at[1], at[2], at[3], at[4], at[5], at[6], at[7], at[8], at[9], at[10]);
+			
+			uint8_t my_rx[20];
+			memset(my_rx, 0, sizeof(my_rx));
+			res = usart_readbuffer(my_rx, sizeof(my_rx));
+			WaitMS(1);
+			Dbprintf("GOT  %d | %c%c%c%c%c%c%c%c", res,  my_rx[0], my_rx[1], my_rx[2], my_rx[3], my_rx[4], my_rx[5], my_rx[6], my_rx[7]);
+			*/
+			
+			
 			char dest[USB_CMD_DATA_SIZE] = { '\0' };
-
-			static const char* welcome = "Proxmark3 Serial interface ready\n";
+			static const char* welcome = "Proxmark3 Serial interface via FPC ready\n";
 			strncat(dest, welcome, sizeof(dest) - strlen(dest) - 1);
-			
-			sprintf(dest + strlen(dest) - 1, "| Arg0 0x%" PRIx64 " \n", c->arg[0]);
-			sprintf(dest + strlen(dest) - 1, "| Arg1 0x%" PRIx64 " \n", c->arg[1]);
-			sprintf(dest + strlen(dest) - 1, "| Arg2 0x%" PRIx64 " \n", c->arg[2]);
 			sprintf(dest + strlen(dest) - 1, "| bytes 0x%02x 0x%02x 0x%02x 0x%02x \n"
-						,c->d.asBytes[0], c->d.asBytes[1], c->d.asBytes[2], c->d.asBytes[3]);
+						, c->d.asBytes[0]
+						, c->d.asBytes[1]
+						, c->d.asBytes[2]
+						, c->d.asBytes[3]
+						);
 			
+			UsbCommand txcmd = { CMD_DEBUG_PRINT_STRING, { strlen(dest), 0, 0 } };
+			memcpy(txcmd.d.asBytes, dest, sizeof(dest));		
 
-			UsbCommand txcmd;
-			for (size_t i=0; i < sizeof(UsbCommand); i++)
-				((uint8_t*)&txcmd)[i] = 0x00;
-
-			// Compose the outgoing command frame
-			txcmd.cmd = CMD_DEBUG_PRINT_STRING;
-			txcmd.arg[0] = strlen(dest);
-			txcmd.arg[1] = 0;	
-			txcmd.arg[2] = 0;
-			memcpy(txcmd.d.asBytes, dest, USB_CMD_DATA_SIZE);		
-
+			LED_A_ON();
+			
 			usart_init();			
 			usart_writebuffer((uint8_t*)&txcmd, sizeof(UsbCommand));
-
-			DbpString("Justs send to usart");
-			LED_A_ON();
+			
+			//usb
+			cmd_send(CMD_DEBUG_PRINT_STRING, strlen(dest), 0, 0, dest, strlen(dest));
+			LED_A_OFF();
+			
+			
 			/*
-			uint8_t rx[sizeof(UsbCommand)];
-			usart_init();
+			uint8_t my_rx[sizeof(UsbCommand)];
 			while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
-				WaitMS(1);
-				if (usart_readbuffer(rx, sizeof(rx)) )
-					DbpString("got 544");
+				LED_B_INV();
+				if (usart_readbuffer(my_rx, sizeof(UsbCommand)) ) {
+					//UsbPacketReceived(my_rx, sizeof(my_rx));
+					
+					UsbCommand *my = (UsbCommand *)my_rx;
+					if (mc->cmd > 0 ) {
+						Dbprintf("received command: 0x%04x and args: %d %d %d", my->cmd, my->arg[0], my->arg[1], my->arg[2]);
+					}
+				}
 			}
 			*/
+
 			//cmd_send(CMD_DEBUG_PRINT_STRING, strlen(dest), 0, 0, dest, strlen(dest));
-			//DbpString("finished");
-			LED_A_OFF();
+
 			cmd_send(CMD_ACK,0,0,0,0,0);
+			StopTicks();
 			break;
 		}
 #endif
diff --git a/client/comms.c b/client/comms.c
index 7204aa1c4..97af830df 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -146,7 +146,7 @@ static int getCommand(UsbCommand* response) {
 // that we weren't necessarily expecting, for example a debug print.
 //-----------------------------------------------------------------------------
 static void UsbCommandReceived(UsbCommand* c) {
-			
+		
 	switch(c->cmd) {
 		// First check if we are handling a debug message
 		case CMD_DEBUG_PRINT_STRING: {
@@ -237,7 +237,7 @@ __attribute__((force_align_arg_pointer))
 #endif
 *uart_communication(void *targ) {
 	communication_arg_t *conn = (communication_arg_t*)targ;
-	size_t rxlen;	
+	size_t rxlen, totallen = 0;	
 	UsbCommand rx;
 	UsbCommand *prx = &rx;
 	
@@ -247,22 +247,29 @@ __attribute__((force_align_arg_pointer))
 	disableAppNap("Proxmark3 polling UART");
 #endif
 	
-	
 	while (conn->run) {
 		rxlen = 0;
 		bool ACK_received = false;
+		
 		if (uart_receive(sp, (uint8_t *)prx, sizeof(UsbCommand) - (prx - &rx), &rxlen) && rxlen) {
 			prx += rxlen;
+			totallen += rxlen;
 			
-			if (prx - &rx < sizeof(UsbCommand)) {
-				PrintAndLogEx(NORMAL, "Foo %d | %d (will loop)", prx - &rx, rxlen);
+			if ( totallen < sizeof(UsbCommand)) {
+				
+				// iceman: this looping is no working as expected at all. The reassemble of package is nonfunctional.
+				// solved so far with increasing the timeouts of the serial port configuration.
+				PrintAndLogEx(NORMAL, "Foo %d | %d (loop)", prx - &rx, rxlen);
 				continue;
 			}
+		
+			totallen = 0;
 			UsbCommandReceived(&rx);
 			if (rx.cmd == CMD_ACK) {
 				ACK_received = true;
 			}
 		}
+		
 		prx = &rx;
 
 		pthread_mutex_lock(&txBufferMutex);
@@ -297,7 +304,6 @@ __attribute__((force_align_arg_pointer))
 #if defined(__MACH__) && defined(__APPLE__)
 	enableAppNap();
 #endif
-
 	
 	pthread_exit(NULL);
 	return NULL;
diff --git a/common/cmd.c b/common/cmd.c
index 281ff0065..dec095750 100644
--- a/common/cmd.c
+++ b/common/cmd.c
@@ -56,8 +56,8 @@ uint8_t cmd_send(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void
 	sendlen = usb_write( (uint8_t*)&txcmd, sizeof(UsbCommand) );
 
 #ifdef WITH_FPC
-	usart_init();
-	usart_writebuffer( (uint8_t*)&txcmd, sizeof(UsbCommand) );
+//	usart_init();
+//	usart_writebuffer( (uint8_t*)&txcmd, sizeof(UsbCommand) );
 #endif
 	
 	return sendlen;
diff --git a/common/usart.c b/common/usart.c
index b58a7cbaa..32ccb5ca1 100644
--- a/common/usart.c
+++ b/common/usart.c
@@ -1,6 +1,6 @@
 //-----------------------------------------------------------------------------
 // Iceman, July 2018
-// edists by - Anticat, August 2018
+// edits by - Anticat, August 2018
 // 
 // This code is licensed to you under the terms of the GNU GPL, version 2 or,
 // at your option, any later version. See the LICENSE.txt file for the text of
@@ -14,7 +14,7 @@
 #define AT91_BAUD_RATE				115200
 
 volatile AT91PS_USART pUS1	= AT91C_BASE_US1;
-volatile AT91PS_PIO pPIOA	= AT91C_BASE_PIOA;
+volatile AT91PS_PIO pPIO	= AT91C_BASE_PIOA;
 volatile AT91PS_PDC pPDC 	= AT91C_BASE_PDC_US1;
 
 /*
@@ -39,90 +39,53 @@ void usart_close(void) {
 }
 */
 
-static uint8_t outbuf[sizeof(UsbCommand)];
-//static uint8_t inbuf[sizeof(UsbCommand)];
-
+static uint8_t us_outbuf[sizeof(UsbCommand)];
 
 /// Reads data from an USART peripheral
 /// \param data  Pointer to the buffer where the received data will be stored.
 /// \param len  Size of the data buffer (in bytes).
-inline int usart_readbuffer(uint8_t *data, size_t len) {
+inline int16_t usart_readbuffer(uint8_t *data, size_t len) {
 
-	pUS1->US_PTSR = AT91C_PDC_TXTEN;	
-	pUS1->US_PTCR = AT91C_PDC_TXTEN;
-	
 	// Check if the first PDC bank is free
     if (!(pUS1->US_RCR)) {
         pUS1->US_RPR = (uint32_t)data;
         pUS1->US_RCR = len;
+
+		pUS1->US_PTCR = AT91C_PDC_RXTEN | AT91C_PDC_TXTDIS;
         return 2;
     }
     // Check if the second PDC bank is free
     else if (!(pUS1->US_RNCR)) {
         pUS1->US_RNPR = (uint32_t)data;
         pUS1->US_RNCR = len;
+
+		pUS1->US_PTCR = AT91C_PDC_RXTEN | AT91C_PDC_TXTDIS;
         return 1;
     } else {
         return 0;
     }
-	
-	/*
-	pPDC->PDC_PTSR = AT91C_PDC_RXTEN;	
-	pPDC->PDC_PTCR = AT91C_PDC_RXTEN;
-	
-	//check if data is available
-	if (pPDC->PDC_RCR != 0) return -1;
-
-	memcpy(data, inbuf, len);
-
-	//start next transfer
-	pPDC->PDC_RNPR = (uint32_t)inbuf;
-	pPDC->PDC_RNCR = sizeof(inbuf);
-
-	return sizeof(inbuf);
-	*/
 }
-/*
-int16_t usart_writebuffer(uint8_t *data, size_t len) {
 
-//	pUS1->US_PTSR = AT91C_PDC_TXTEN;
-	pUS1->US_PTCR = AT91C_PDC_TXTEN;
-	
-	// if buffer is sent
-	if (pUS1->US_TCR != 0) return -1;
-	
-	memcpy(outbuf, data, len);
 
-	//start next transfer
-	pUS1->US_TNPR = (uint32_t)outbuf;
-	pUS1->US_TNCR = sizeof(outbuf);
-
-	return sizeof(outbuf);
-}
-*/
-
-// works.
-// transfer to client
+// transfer from device to client
 inline int16_t usart_writebuffer(uint8_t *data, size_t len) {
 
-	pUS1->US_PTSR = AT91C_PDC_TXTEN;
-	pUS1->US_PTCR = AT91C_PDC_TXTEN;
-	
     // Check if the first PDC bank is free
     if (!(pUS1->US_TCR)) {
-		
-		memcpy(outbuf, data, len);
-        
-		pUS1->US_TPR = (uint32_t)outbuf;
-        pUS1->US_TCR = sizeof(outbuf);
+		memcpy(us_outbuf, data, len);
+		pUS1->US_TPR = (uint32_t)us_outbuf;
+        pUS1->US_TCR = sizeof(us_outbuf);
+
+		pUS1->US_PTCR = AT91C_PDC_TXTEN | AT91C_PDC_RXTDIS;
 		return 2;
     }
     // Check if the second PDC bank is free
     else if (!(pUS1->US_TNCR)) {
-		memcpy(outbuf, data, len);
-		
-        pUS1->US_TNPR = (uint32_t)outbuf;
-        pUS1->US_TNCR = sizeof(outbuf);
+		memcpy(us_outbuf, data, len);
+        pUS1->US_TNPR = (uint32_t)us_outbuf;
+        pUS1->US_TNCR = sizeof(us_outbuf);
+
+		pUS1->US_PTCR = AT91C_PDC_TXTEN | AT91C_PDC_RXTDIS;
 		return 1;
     } else {
         return 0;
@@ -132,19 +95,20 @@ inline int16_t usart_writebuffer(uint8_t *data, size_t len) {
 void usart_init(void) {
 
 	// disable & reset receiver / transmitter for configuration
-	pUS1->US_CR = (AT91C_US_RSTRX | AT91C_US_RSTTX);
+	pUS1->US_CR = (AT91C_US_RSTRX | AT91C_US_RSTTX | AT91C_US_RXDIS | AT91C_US_TXDIS);
 	
 	//enable the USART1 Peripheral clock
 	AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_US1);
 
 	// disable PIO control of receive / transmit pins
-	pPIOA->PIO_PDR |= (AT91C_PA21_RXD1 | AT91C_PA22_TXD1); 
+	pPIO->PIO_PDR |= (AT91C_PA21_RXD1 | AT91C_PA22_TXD1); 
 	
 	// enable peripheral mode A on receive / transmit pins
-	pPIOA->PIO_ASR |= (AT91C_PA21_RXD1 | AT91C_PA22_TXD1);
+	pPIO->PIO_ASR |= (AT91C_PA21_RXD1 | AT91C_PA22_TXD1);
+	pPIO->PIO_BSR = 0;
 
 	// enable pull-up on receive / transmit pins (see 31.5.1 I/O Lines)
-	pPIOA->PIO_PPUER |= (AT91C_PA21_RXD1 | AT91C_PA22_TXD1);
+	pPIO->PIO_PPUER |= (AT91C_PA21_RXD1 | AT91C_PA22_TXD1);
 	
     // set mode
     pUS1->US_MR = AT91C_US_USMODE_NORMAL |      // normal mode
@@ -154,8 +118,19 @@ void usart_init(void) {
                AT91C_US_NBSTOP_1_BIT |          // 1 stop bit
                AT91C_US_CHMODE_NORMAL;          // channel mode: normal
 
+	// all interrupts disabled
+	pUS1->US_IDR = 0xFFFF;
+
+	// iceman,  setting 115200 doesn't work. Only speed I got to work is 9600.
+	// something fishy with the AT91SAM7S512 USART..  Or I missed something
+	// For a nice detailed sample, interrupt driven but still relevant.
+	// See https://www.sparkfun.com/datasheets/DevTools/SAM7/at91sam7%20serial%20communications.pdf
+
 	// set baudrate to 115200 
-	pUS1->US_BRGR = (48UL*1000*1000) / (115200*16);
+	// 115200 * 16 == 1843200
+	//
+	//pUS1->US_BRGR = (48UL*1000*1000) / (9600*16);
+	pUS1->US_BRGR =  48054841 / (9600 << 4);
 	
 	// Write the Timeguard Register
 	pUS1->US_TTGR = 0;
@@ -163,23 +138,6 @@ void usart_init(void) {
 	pUS1->US_FIDI = 0;
 	pUS1->US_IF = 0;
 	
-	/*
-	//Empty PDC
-	pUS1->US_RNPR = (uint32_t)(char *)0;
-	pUS1->US_RNCR = 0;
-	pUS1->US_RPR = (uint32_t)(char *)0;
-	pUS1->US_RCR = 0;
-
-	pUS1->US_TNPR = (uint32_t)(char *)0;
-	pUS1->US_TNCR = 0;	
-	pUS1->US_TPR = (uint32_t)(char *)0;
-	pUS1->US_TCR = 0;
-	*/
-	
-	//pUS1->US_PTCR = (AT91C_PDC_RXTEN | AT91C_PDC_TXTEN);
-	//pUS1->US_PTSR = (AT91C_PDC_RXTEN | AT91C_PDC_TXTEN);
-	
 	// re-enable receiver / transmitter
 	pUS1->US_CR = (AT91C_US_RXEN | AT91C_US_TXEN);
-	
 }
\ No newline at end of file
diff --git a/common/usart.h b/common/usart.h
index 271a24ba4..7e8d3eb7b 100644
--- a/common/usart.h
+++ b/common/usart.h
@@ -7,6 +7,6 @@
 void usart_init(void);
 void usart_close(void);
 
-int usart_readbuffer(uint8_t *data, size_t len);
+int16_t usart_readbuffer(uint8_t *data, size_t len);
 int16_t usart_writebuffer(uint8_t *data, size_t len);
 #endif
diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index 20a577ded..b587d6546 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -118,8 +118,12 @@ serial_port uart_open(const char* pcPortName)
   tcflush(sp->fd, TCIOFLUSH);
 
 #ifdef WITH_FPC
-  uart_set_speed(sp, 115200);
+	if ( uart_set_speed(sp, 115200) ) {
   printf("[=] UART Setting serial baudrate 115200 [FPC enabled]\n");  
+	} else {
+		uart_set_speed(sp, 9600);
+		printf("[=] UART Setting serial baudrate 9600 [FPC enabled]\n");		
+	}
 #else	
   // set speed, works for UBUNTU 14.04
   bool success = uart_set_speed(sp, 460800);
diff --git a/uart/uart_win32.c b/uart/uart_win32.c
index eef350cda..11c90f15f 100644
--- a/uart/uart_win32.c
+++ b/uart/uart_win32.c
@@ -86,12 +86,20 @@ serial_port uart_open(const char* pcPortName) {
 	}
 	// all zero's configure: no timeout for read/write used.
 	// took settings from libnfc/buses/uart.c
+#ifdef WITH_FPC
+	sp->ct.ReadIntervalTimeout         = 1000;
+	sp->ct.ReadTotalTimeoutMultiplier  = 0;
+	sp->ct.ReadTotalTimeoutConstant    = 1500;
+	sp->ct.WriteTotalTimeoutMultiplier = 1000;
+	sp->ct.WriteTotalTimeoutConstant   = 0;
+#else	
 	sp->ct.ReadIntervalTimeout         = 30;
 	sp->ct.ReadTotalTimeoutMultiplier  = 0;
 	sp->ct.ReadTotalTimeoutConstant    = 30;
 	sp->ct.WriteTotalTimeoutMultiplier = 30;
 	sp->ct.WriteTotalTimeoutConstant   = 0;
-  
+#endif 
+ 
 	if (!SetCommTimeouts(sp->hPort, &sp->ct)) {
 		uart_close(sp);
 		printf("[!] UART error while setting comm time outs\n");
@@ -101,7 +109,12 @@ serial_port uart_open(const char* pcPortName) {
 	PurgeComm(sp->hPort, PURGE_RXABORT | PURGE_RXCLEAR);
 
 #ifdef WITH_FPC
-	uart_set_speed(sp, 115200);
+	if ( uart_set_speed(sp, 115200) ) {
+		printf("[=] UART Setting serial baudrate 115200 [FPC enabled]\n");
+	} else {
+		uart_set_speed(sp, 9600);
+		printf("[=] UART Setting serial baudrate 9600 [FPC enabled]\n");		
+	}
 #else
 	bool success = uart_set_speed(sp, 460800);
 	if (success) {

From e3aebd7985dea1f9337450ccc03c3ea94fc1f08f Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 20 Nov 2018 16:25:19 +0200
Subject: [PATCH 0209/1938] get card data

---
 client/cmdhf14a.c | 40 ++++++++++++++++++++++++++++++++++++++++
 client/cmdhf14a.h |  1 +
 2 files changed, 41 insertions(+)

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 56eadc9cc..77e9473a1 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -190,6 +190,45 @@ int CmdHF14AList(const char *Cmd) {
 	return 0;
 }
 
+int Hf14443_4aGetCardData(iso14a_card_select_t * card) {
+	UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT, 0, 0}};
+	SendCommand(&c);
+
+	UsbCommand resp;
+	WaitForResponse(CMD_ACK,&resp);
+	
+	memcpy(card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
+
+	uint64_t select_status = resp.arg[0];		// 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
+	
+	if(select_status == 0) {
+		PrintAndLog("E->iso14443a card select failed");
+		return 1;
+	}
+
+	if(select_status == 2) {
+		PrintAndLog("E->Card doesn't support iso14443-4 mode");
+		return 1;
+	}
+
+	if(select_status == 3) {
+		PrintAndLog("E->Card doesn't support standard iso14443-3 anticollision");
+		PrintAndLog("\tATQA : %02x %02x", card->atqa[1], card->atqa[0]);
+		return 1;
+	}
+
+	PrintAndLog(" UID: %s", sprint_hex(card->uid, card->uidlen));
+	PrintAndLog("ATQA: %02x %02x", card->atqa[1], card->atqa[0]);
+	PrintAndLog(" SAK: %02x [%" PRIu64 "]", card->sak, resp.arg[0]);
+	if(card->ats_len < 3) {			// a valid ATS consists of at least the length byte (TL) and 2 CRC bytes
+		PrintAndLog("E-> Error ATS length(%d) : %s", card->ats_len, sprint_hex(card->ats, card->ats_len));
+		return 1;
+	}
+	PrintAndLog(" ATS: %s", sprint_hex(card->ats, card->ats_len));
+	
+	return 0;
+}
+
 int CmdHF14AReader(const char *Cmd) {
 
 	uint32_t cm = ISO14A_CONNECT;
@@ -875,6 +914,7 @@ int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool lea
 	return 0;
 }
 
+// ISO14443-4. 7. Half-duplex block transmission protocol
 int CmdHF14AAPDU(const char *cmd) {
 	uint8_t data[USB_CMD_DATA_SIZE];
 	int datalen = 0;
diff --git a/client/cmdhf14a.h b/client/cmdhf14a.h
index 310a2f7d5..723c31100 100644
--- a/client/cmdhf14a.h
+++ b/client/cmdhf14a.h
@@ -50,6 +50,7 @@ extern int CmdHF14ACUIDs(const char *Cmd);
 extern int CmdHF14AAntiFuzz(const char *cmd);
 
 extern char* getTagInfo(uint8_t uid);
+extern int Hf14443_4aGetCardData(iso14a_card_select_t * card);
 extern int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen);									
 extern int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen);
 

From b1091c486b803347ea2ef84879e55c00939311c2 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 20 Nov 2018 16:25:54 +0200
Subject: [PATCH 0210/1938] emv_pki

---
 client/emv/emv_pki.c | 14 +++++++++++---
 client/emv/emv_pki.h |  2 ++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/client/emv/emv_pki.c b/client/emv/emv_pki.c
index 81918ecb9..be4dfa0a7 100644
--- a/client/emv/emv_pki.c
+++ b/client/emv/emv_pki.c
@@ -27,6 +27,11 @@
 #include <string.h>
 #include <stdarg.h>
 
+static bool strictExecution = true;
+void PKISetStrictExecution(bool se) {
+	strictExecution = se;
+}
+
 static const unsigned char empty_tlv_value[] = {};
 static const struct tlv empty_tlv = {.tag = 0x0, .len = 0, .value = empty_tlv_value};
 
@@ -108,9 +113,12 @@ static unsigned char *emv_pki_decode_message(const struct emv_pk *enc_pk,
 		printf("ERROR: Calculated wrong hash\n");
 		printf("decoded:    %s\n",sprint_hex(data + data_len - 1 - hash_len, hash_len));
 		printf("calculated: %s\n",sprint_hex(crypto_hash_read(ch), hash_len));
-		crypto_hash_close(ch);
-		free(data);
-		return NULL;
+		
+		if (strictExecution) {
+			crypto_hash_close(ch);
+			free(data);
+			return NULL;
+		}
 	}
 
 	crypto_hash_close(ch);
diff --git a/client/emv/emv_pki.h b/client/emv/emv_pki.h
index e37e3c7d2..6fa7b12e9 100644
--- a/client/emv/emv_pki.h
+++ b/client/emv/emv_pki.h
@@ -21,6 +21,8 @@
 
 #include <stddef.h>
 
+extern void PKISetStrictExecution(bool se);
+
 struct emv_pk *emv_pki_recover_issuer_cert(const struct emv_pk *pk, struct tlvdb *db);
 struct emv_pk *emv_pki_recover_icc_cert(const struct emv_pk *pk, struct tlvdb *db, const struct tlv *sda_tlv);
 struct emv_pk *emv_pki_recover_icc_pe_cert(const struct emv_pk *pk, struct tlvdb *db);

From fb14d665dd90fbe1c58f909262b712c51c5111e0 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 20 Nov 2018 16:26:35 +0200
Subject: [PATCH 0211/1938] emvcore

---
 client/emv/emvcore.c | 84 +++++++++++++++++++++++++++++++++++++++++---
 client/emv/emvcore.h |  4 +++
 2 files changed, 83 insertions(+), 5 deletions(-)

diff --git a/client/emv/emvcore.c b/client/emv/emvcore.c
index b7d7df923..f2acda25c 100644
--- a/client/emv/emvcore.c
+++ b/client/emv/emvcore.c
@@ -9,6 +9,8 @@
 //-----------------------------------------------------------------------------
 
 #include "emvcore.h"
+#include "emvjson.h"
+#include "util_posix.h"
 
 // Got from here. Thanks)
 // https://eftlab.co.uk/index.php/site-map/knowledge-base/211-emv-aid-rid-pix
@@ -18,6 +20,13 @@ static const char *PSElist [] = {
 };
 //static const size_t PSElistLen = sizeof(PSElist)/sizeof(char*);
 
+char *TransactionTypeStr[] = {
+	"MSD",
+	"VSDC",
+	"qVCDCMCHIP",
+	"CDA"
+};
+
 typedef struct {
 	enum CardPSVendor vendor;
 	const char* aid;
@@ -257,9 +266,14 @@ int EMVExchangeEx(bool ActivateField, bool LeaveFieldON, sAPDU apdu, bool Includ
 		*sw = isw;
 
 	if (isw != 0x9000) {
-		if (APDULogging)
-			PrintAndLogEx(WARNING, "APDU(%02x%02x) ERROR: [%4X] %s", apdu.CLA, apdu.INS, isw, GetAPDUCodeDescription(*sw >> 8, *sw & 0xff));
-		return 5;
+		if (APDULogging) {
+			if (*sw >> 8 == 0x61) {
+				PrintAndLogEx(ERR, "APDU chaining len:%02x -->", *sw & 0xff);
+			} else {
+				PrintAndLogEx(ERR, "APDU(%02x%02x) ERROR: [%4X] %s", apdu.CLA, apdu.INS, isw, GetAPDUCodeDescription(*sw >> 8, *sw & 0xff));
+				return 5;
+			}
+		}
 	}
 
 	// add to tlv tree
@@ -527,7 +541,7 @@ int trSDA(struct tlvdb *tlv) {
 	if (!sda_tlv || sda_tlv->len < 1) {
 		emv_pk_free(issuer_pk);
 		emv_pk_free(pk);
-		PrintAndLogEx(WARNING, "Error: Can't find input list for Offline Data Authentication. Exit.");
+		PrintAndLogEx(WARNING, "Can't find input list for Offline Data Authentication. Exit.");
 		return 3;
 	}
 	
@@ -539,7 +553,7 @@ int trSDA(struct tlvdb *tlv) {
 	} else {
 		emv_pk_free(issuer_pk);
 		emv_pk_free(pk);
-		PrintAndLogEx(WARNING, "Error: SSAD verify error");
+		PrintAndLogEx(WARNING, "SSAD verify error");
 		return 4;
 	}
 	
@@ -851,3 +865,63 @@ int trCDA(struct tlvdb *tlv, struct tlvdb *ac_tlv, struct tlv *pdol_data_tlv, st
 	emv_pk_free(icc_pk);
 	return 0;
 }
+
+int RecoveryCertificates(struct tlvdb *tlvRoot, json_t *root) {
+	
+	struct emv_pk *pk = get_ca_pk(tlvRoot);
+	if (!pk) {
+		PrintAndLog("ERROR: Key not found. Exit.");
+		return 1;
+	}
+
+	struct emv_pk *issuer_pk = emv_pki_recover_issuer_cert(pk, tlvRoot);
+	if (!issuer_pk) {
+		emv_pk_free(pk);
+		PrintAndLog("WARNING: Issuer certificate not found. Exit.");
+		return 2;
+	}
+	PrintAndLog("Issuer PK recovered. RID %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx CSN %02hhx:%02hhx:%02hhx",
+			issuer_pk->rid[0],
+			issuer_pk->rid[1],
+			issuer_pk->rid[2],
+			issuer_pk->rid[3],
+			issuer_pk->rid[4],
+			issuer_pk->index,
+			issuer_pk->serial[0],
+			issuer_pk->serial[1],
+			issuer_pk->serial[2]
+			);
+
+	JsonSaveBufAsHex(root, "$.ApplicationData.RID", issuer_pk->rid, 5);
+
+	char *issuer_pk_c = emv_pk_dump_pk(issuer_pk);
+	JsonSaveStr(root, "$.ApplicationData.IssuerPublicKeyDec", issuer_pk_c);
+	JsonSaveBufAsHex(root, "$.ApplicationData.IssuerPublicKeyModulus", issuer_pk->modulus, issuer_pk->mlen);
+	free(issuer_pk_c);
+
+	struct emv_pk *icc_pk = emv_pki_recover_icc_cert(issuer_pk, tlvRoot, NULL);
+	if (!icc_pk) {
+		emv_pk_free(pk);
+		emv_pk_free(issuer_pk);
+		PrintAndLog("WARNING: ICC certificate not found. Exit.");
+		return 2;
+	}
+	printf("ICC PK recovered. RID %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx CSN %02hhx:%02hhx:%02hhx\n",
+			icc_pk->rid[0],
+			icc_pk->rid[1],
+			icc_pk->rid[2],
+			icc_pk->rid[3],
+			icc_pk->rid[4],
+			icc_pk->index,
+			icc_pk->serial[0],
+			icc_pk->serial[1],
+			icc_pk->serial[2]
+			);
+	
+	char *icc_pk_c = emv_pk_dump_pk(icc_pk);
+	JsonSaveStr(root, "$.ApplicationData.ICCPublicKeyDec", icc_pk_c);
+	JsonSaveBufAsHex(root, "$.ApplicationData.ICCPublicKeyModulus", icc_pk->modulus, icc_pk->mlen);
+	free(issuer_pk_c);
+	
+	return 0;
+}
diff --git a/client/emv/emvcore.h b/client/emv/emvcore.h
index 1e39f696c..5fb6f202c 100644
--- a/client/emv/emvcore.h
+++ b/client/emv/emvcore.h
@@ -16,6 +16,7 @@
 #include <stdlib.h>
 #include <inttypes.h>
 #include <string.h>
+#include <jansson.h>
 #include "util.h"
 #include "common.h"
 #include "ui.h"
@@ -37,6 +38,7 @@ enum TransactionType {
 	TT_QVSDCMCHIP,
 	TT_CDA,
 };
+extern char *TransactionTypeStr[];
 
 typedef struct {
 	uint8_t CLA;
@@ -93,6 +95,8 @@ extern int trSDA(struct tlvdb *tlv);
 extern int trDDA(bool decodeTLV, struct tlvdb *tlv);
 extern int trCDA(struct tlvdb *tlv, struct tlvdb *ac_tlv, struct tlv *pdol_data_tlv, struct tlv *ac_data_tlv);
 
+extern int RecoveryCertificates(struct tlvdb *tlvRoot, json_t *root);
+
 #endif
 
 

From 6d896ca6039d102d2b2dfc4314297327d4580b19 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 20 Nov 2018 16:26:54 +0200
Subject: [PATCH 0212/1938] cmdemv merge

---
 client/emv/cmdemv.c | 1226 ++++++++++++++++++++++++++++++++-----------
 1 file changed, 917 insertions(+), 309 deletions(-)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index 5ff31770d..21691d0b7 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -8,84 +8,65 @@
 // EMV commands
 //-----------------------------------------------------------------------------
 
+#include <ctype.h>
+#include "mifare.h"
 #include "cmdemv.h"
+#include "emvjson.h"
+#include "emv_pki.h"
 #include "test/cryptotest.h"
+#include "cliparser/cliparser.h"
+#include <jansson.h>
 
 static int CmdHelp(const char *Cmd);
 
-int usage_emv_select(void) {
-	PrintAndLogEx(NORMAL, "Executes select applet command:\n");
-	PrintAndLogEx(NORMAL, "Usage:  hf emv select [-s][-k][-a][-t] <HEX applet AID>\n");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "  -s       : select card");
-	PrintAndLogEx(NORMAL, "  -k       : keep field for next command");
-	PrintAndLogEx(NORMAL, "  -a       : show APDU reqests and responses\n");
-	PrintAndLogEx(NORMAL, "  -t       : TLV decode results\n");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, " hf emv select -s a00000000101        -> select card, select applet");
-	PrintAndLogEx(NORMAL, " hf emv select -s -t a00000000101     -> select card, select applet, show result in TLV");
-	return 0;
+#define TLV_ADD(tag, value)( tlvdb_change_or_add_node(tlvRoot, tag, sizeof(value) - 1, (const unsigned char *)value) )
+void ParamLoadDefaults(struct tlvdb *tlvRoot) {
+	//9F02:(Amount, authorized (Numeric)) len:6
+	TLV_ADD(0x9F02, "\x00\x00\x00\x00\x01\x00");
+	//9F1A:(Terminal Country Code) len:2
+	TLV_ADD(0x9F1A, "ru");
+	//5F2A:(Transaction Currency Code) len:2
+	// USD 840, EUR 978, RUR 810, RUB 643, RUR 810(old), UAH 980, AZN 031, n/a 999
+	TLV_ADD(0x5F2A, "\x09\x80");
+	//9A:(Transaction Date) len:3
+	TLV_ADD(0x9A,   "\x00\x00\x00");
+	//9C:(Transaction Type) len:1   |  00 => Goods and service #01 => Cash
+	TLV_ADD(0x9C,   "\x00");
+	// 9F37 Unpredictable Number len:4
+	TLV_ADD(0x9F37, "\x01\x02\x03\x04");
+	// 9F6A Unpredictable Number (MSD for UDOL) len:4
+	TLV_ADD(0x9F6A, "\x01\x02\x03\x04");
+	//9F66:(Terminal Transaction Qualifiers (TTQ)) len:4
+	TLV_ADD(0x9F66, "\x26\x00\x00\x00"); // qVSDC
 }
 
 int CmdHFEMVSelect(const char *cmd) {
 	uint8_t data[APDU_AID_LEN] = {0};
 	int datalen = 0;
-	bool activateField = false;
-	bool leaveSignalON = false;
-	bool decodeTLV = false;
 
-	if (strlen(cmd) < 1)
-		return usage_emv_select();
-	
-	SetAPDULogging(false);
-	
-	int cmdp = 0;
-	while(param_getchar(cmd, cmdp) != 0x00) {
-		char c = param_getchar(cmd, cmdp);
-		if ((c == '-') && (param_getlength(cmd, cmdp) == 2))
-			switch (param_getchar_indx(cmd, 1, cmdp)) {
-				case 'h':
-				case 'H':
-					return usage_emv_select();
-				case 's':
-				case 'S':
-					activateField = true;
-					break;
-				case 'k':
-				case 'K':
-					leaveSignalON = true;
-					break;
-				case 'a':
-				case 'A':
-					SetAPDULogging(true);
-					break;
-				case 't':
-				case 'T':
-					decodeTLV = true;
-					break;
-				default:
-					PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar_indx(cmd, 1, cmdp));
-					return 1;
-		}
+	CLIParserInit("hf emv select", 
+		"Executes select applet command", 
+		"Usage:\n\thf emv select -s a00000000101 -> select card, select applet\n\thf emv select -st a00000000101 -> select card, select applet, show result in TLV\n");
 
-		if (isxdigit(c)) {
-			switch(param_gethex_to_eol(cmd, cmdp, data, sizeof(data), &datalen)) {
-			case 1:
-				PrintAndLogEx(WARNING, "Invalid HEX value.");
-				return 1;
-			case 2:
-				PrintAndLogEx(WARNING, "AID too large.");
-				return 1;
-			case 3:
-				PrintAndLogEx(WARNING, "Hex must have even number of digits.");
-				return 1;
-			}
-			
-			// we get all the hex to end of line with spaces
-			break;
-		}
-		cmdp++;
-	}
+	void* argtable[] = {
+		arg_param_begin,
+		arg_lit0("sS",  "select",  "activate field and select card"),
+		arg_lit0("kK",  "keep",    "keep field for next command"),
+		arg_lit0("aA",  "apdu",    "show APDU reqests and responses"),
+		arg_lit0("tT",  "tlv",     "TLV decode results"),
+		arg_strx0(NULL,  NULL,     "<HEX applet AID>", NULL),
+		arg_param_end
+	};
+	CLIExecWithReturn(cmd, argtable, true);
+	
+	bool activateField = arg_get_lit(1);
+	bool leaveSignalON = arg_get_lit(2);
+	bool APDULogging = arg_get_lit(3);
+	bool decodeTLV = arg_get_lit(4);
+	CLIGetHexWithReturn(5, data, &datalen);
+	CLIParserFree();
+	
+	SetAPDULogging(APDULogging);
 	
 	// exec
 	uint8_t buf[APDU_RES_LEN] = {0};
@@ -94,7 +75,7 @@ int CmdHFEMVSelect(const char *cmd) {
 	int res = EMVSelect(activateField, leaveSignalON, data, datalen, buf, sizeof(buf), &len, &sw, NULL);
 
 	if (sw)
-		PrintAndLogEx(NORMAL, "APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
+		PrintAndLog("APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
 	
 	if (res)
 		return res;
@@ -105,62 +86,30 @@ int CmdHFEMVSelect(const char *cmd) {
 	return 0;
 }
 
-int usage_emv_search(void) {
-	PrintAndLogEx(NORMAL, "Tries to select all applets from applet list:\n");
-	PrintAndLogEx(NORMAL, "Usage:  hf emv search [-s][-k][-a][-t]\n");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "  -s       : select card");
-	PrintAndLogEx(NORMAL, "  -k       : keep field for next command");
-	PrintAndLogEx(NORMAL, "  -a       : show APDU reqests and responses\n");
-	PrintAndLogEx(NORMAL, "  -t       : TLV decode results of selected applets\n");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, " hf emv search -s         -> select card and search");
-	PrintAndLogEx(NORMAL, " hf emv search -s -t      -> select card, search and show result in TLV");
-	return 0;
-}
-
 int CmdHFEMVSearch(const char *cmd) {
 
-	bool activateField = false;
-	bool leaveSignalON = false;
-	bool decodeTLV = false;
+	CLIParserInit("hf emv search", 
+		"Tries to select all applets from applet list:\n", 
+		"Usage:\n\thf emv search -s -> select card and search\n\thf emv search -st -> select card, search and show result in TLV\n");
 
-	if (strlen(cmd) < 1)
-		return usage_emv_search();
+	void* argtable[] = {
+		arg_param_begin,
+		arg_lit0("sS",  "select",  "activate field and select card"),
+		arg_lit0("kK",  "keep",    "keep field ON for next command"),
+		arg_lit0("aA",  "apdu",    "show APDU reqests and responses"),
+		arg_lit0("tT",  "tlv",     "TLV decode results of selected applets"),
+		arg_param_end
+	};
+	CLIExecWithReturn(cmd, argtable, true);
 	
-	SetAPDULogging(false);
+	bool activateField = arg_get_lit(1);
+	bool leaveSignalON = arg_get_lit(2);
+	bool APDULogging = arg_get_lit(3);
+	bool decodeTLV = arg_get_lit(4);
+	CLIParserFree();
+	
+	SetAPDULogging(APDULogging);
 	
-	int cmdp = 0;
-	while(param_getchar(cmd, cmdp) != 0x00) {
-		char c = param_getchar(cmd, cmdp);
-		if ((c == '-') && (param_getlength(cmd, cmdp) == 2))
-			switch (param_getchar_indx(cmd, 1, cmdp)) {
-				case 'h':
-				case 'H':
-					return usage_emv_search();
-				case 's':
-				case 'S':
-					activateField = true;
-					break;
-				case 'k':
-				case 'K':
-					leaveSignalON = true;
-					break;
-				case 'a':
-				case 'A':
-					SetAPDULogging(true);
-					break;
-				case 't':
-				case 'T':
-					decodeTLV = true;
-					break;
-				default:
-					PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar_indx(cmd, 1, cmdp));
-					return 1;
-		}
-		cmdp++;
-	}
-
 	struct tlvdb *t = NULL;
 	const char *al = "Applets list";
 	t = tlvdb_fixed(1, strlen(al), (const unsigned char *)al);
@@ -170,7 +119,7 @@ int CmdHFEMVSearch(const char *cmd) {
 		return 2;
 	}
 	
-	PrintAndLogEx(NORMAL, "Search completed.");
+	PrintAndLog("Search completed.");
 
 	// print list here
 	if (!decodeTLV) {  
@@ -182,66 +131,36 @@ int CmdHFEMVSearch(const char *cmd) {
 	return 0;
 }
 
-int usage_emv_ppse(void) {
-	PrintAndLogEx(NORMAL, "Executes PSE/PPSE select command. It returns list of applet on the card:\n");
-	PrintAndLogEx(NORMAL, "Usage:  hf emv pse [-s][-k][-1][-2][-a][-t]\n");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "  -s       : select card");
-	PrintAndLogEx(NORMAL, "  -k       : keep field for next command");
-	PrintAndLogEx(NORMAL, "  -1       : ppse (1PAY.SYS.DDF01)");
-	PrintAndLogEx(NORMAL, "  -2       : pse (2PAY.SYS.DDF01)");
-	PrintAndLogEx(NORMAL, "  -a       : show APDU reqests and responses\n");
-	PrintAndLogEx(NORMAL, "  -t       : TLV decode results\n");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, " hf emv pse -s -1         -> select, get pse");
-	PrintAndLogEx(NORMAL, " hf emv pse -s -k -2      -> select, get ppse, keep field");
-	PrintAndLogEx(NORMAL, " hf emv pse -s -t -2      -> select, get ppse, show result in TLV");
-	return 0;
-}
-
 int CmdHFEMVPPSE(const char *cmd) {
 	
-	uint8_t PSENum = 2;
-	bool activateField = false;
-	bool leaveSignalON = false;
-	bool decodeTLV = false;
+	CLIParserInit("hf emv pse", 
+		"Executes PSE/PPSE select command. It returns list of applet on the card:\n", 
+		"Usage:\n\thf emv pse -s1 -> select, get pse\n\thf emv pse -st2 -> select, get ppse, show result in TLV\n");
 
-	if (strlen(cmd) < 1)
-		return usage_emv_ppse();
-
-	SetAPDULogging(false);
+	void* argtable[] = {
+		arg_param_begin,
+		arg_lit0("sS",  "select",  "activate field and select card"),
+		arg_lit0("kK",  "keep",    "keep field ON for next command"),
+		arg_lit0("1",   "pse",     "pse (1PAY.SYS.DDF01) mode"),
+		arg_lit0("2",   "ppse",    "ppse (2PAY.SYS.DDF01) mode (default mode)"),
+		arg_lit0("aA",  "apdu",    "show APDU reqests and responses"),
+		arg_lit0("tT",  "tlv",     "TLV decode results of selected applets"),
+		arg_param_end
+	};
+	CLIExecWithReturn(cmd, argtable, true);
 	
-	int cmdp = 0;
-	while(param_getchar(cmd, cmdp) != 0x00) {
-		char c = param_getchar(cmd, cmdp);
-		if ((c == '-') && (param_getlength(cmd, cmdp) == 2))
-			switch (tolower(param_getchar_indx(cmd, 1, cmdp))) {
-				case 'h':
-					return usage_emv_ppse();
-				case 's':
-					activateField = true;
-					break;
-				case 'k':
-					leaveSignalON = true;
-					break;
-				case 'a':
-					SetAPDULogging(true);
-					break;
-				case 't':
-					decodeTLV = true;
-					break;
-				case '1':
-					PSENum = 1;
-					break;
-				case '2':
-					PSENum = 2;
-					break;
-				default:
-					PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar_indx(cmd, 1, cmdp));
-					return 1;
-		}
-		cmdp++;
-	}
+	bool activateField = arg_get_lit(1);
+	bool leaveSignalON = arg_get_lit(2);
+	uint8_t PSENum = 2;
+	if (arg_get_lit(3))
+		PSENum = 1;
+	if (arg_get_lit(4))
+		PSENum = 2;
+	bool APDULogging = arg_get_lit(5);
+	bool decodeTLV = arg_get_lit(6);
+	CLIParserFree();	
+	
+	SetAPDULogging(APDULogging);
 	
 	// exec
 	uint8_t buf[APDU_RES_LEN] = {0};
@@ -250,10 +169,11 @@ int CmdHFEMVPPSE(const char *cmd) {
 	int res = EMVSelectPSE(activateField, leaveSignalON, PSENum, buf, sizeof(buf), &len, &sw);
 	
 	if (sw)
-		PrintAndLogEx(NORMAL, "APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
+		PrintAndLog("APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
 
 	if (res)
-		return res;	
+		return res;
+	
 	
 	if (decodeTLV)
 		TLVPrintFromBuffer(buf, len);
@@ -261,36 +181,457 @@ int CmdHFEMVPPSE(const char *cmd) {
 	return 0;
 }
 
-int usage_emv_exec(void) {
-	PrintAndLogEx(NORMAL, "Executes EMV contactless transaction:\n");
-	PrintAndLogEx(NORMAL, "Usage:  hf emv exec [-s][-a][-t][-f][-v][-c][-x][-g]\n");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "  -s       : select card");
-	PrintAndLogEx(NORMAL, "  -a       : show APDU reqests and responses\n");
-	PrintAndLogEx(NORMAL, "  -t       : TLV decode results\n");
-	PrintAndLogEx(NORMAL, "  -f       : force search AID. Search AID instead of execute PPSE.\n");
-	PrintAndLogEx(NORMAL, "  -v       : transaction type - qVSDC or M/Chip.\n");
-	PrintAndLogEx(NORMAL, "  -c       : transaction type - qVSDC or M/Chip plus CDA (SDAD generation).\n");
-	PrintAndLogEx(NORMAL, "  -x       : transaction type - VSDC. For test only. Not a standart behavior.\n");
-	PrintAndLogEx(NORMAL, "  -g       : VISA. generate AC from GPO\n");
-	PrintAndLogEx(NORMAL, "By default : transaction type - MSD.\n");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, " hf emv exec -s -a -t         -> execute MSD transaction");
-	PrintAndLogEx(NORMAL, " hf emv exec -s -a -t -c      -> execute CDA transaction");
+int CmdHFEMVGPO(const char *cmd) {
+	uint8_t data[APDU_RES_LEN] = {0};
+	int datalen = 0;
+
+	CLIParserInit("hf emv gpo", 
+		"Executes Get Processing Options command. It returns data in TLV format (0x77 - format2) or plain format (0x80 - format1).\nNeeds a EMV applet to be selected.", 
+		"Usage:\n\thf emv gpo -k -> execute GPO\n"
+			"\thf emv gpo -t 01020304 -> execute GPO with 4-byte PDOL data, show result in TLV\n"
+			"\thf emv gpo -pmt 9F 37 04 -> load params from file, make PDOL data from PDOL, execute GPO with PDOL, show result in TLV\n"); 
+
+	void* argtable[] = {
+		arg_param_begin,
+		arg_lit0("kK",  "keep",    "keep field ON for next command"),
+		arg_lit0("pP",  "params",  "load parameters from `emv/defparams.json` file for PDOLdata making from PDOL and parameters"),
+		arg_lit0("mM",  "make",    "make PDOLdata from PDOL (tag 9F38) and parameters (by default uses default parameters)"),
+		arg_lit0("aA",  "apdu",    "show APDU reqests and responses"),
+		arg_lit0("tT",  "tlv",     "TLV decode results of selected applets"),
+		arg_strx0(NULL,  NULL,     "<HEX PDOLdata/PDOL>", NULL),
+		arg_param_end
+	};
+	CLIExecWithReturn(cmd, argtable, true);
+	
+	bool leaveSignalON = arg_get_lit(1);
+	bool paramsLoadFromFile = arg_get_lit(2);
+	bool dataMakeFromPDOL = arg_get_lit(3);
+	bool APDULogging = arg_get_lit(4);
+	bool decodeTLV = arg_get_lit(5);
+	CLIGetHexWithReturn(6, data, &datalen);
+	CLIParserFree();	
+	
+	SetAPDULogging(APDULogging);
+	
+	// Init TLV tree
+	const char *alr = "Root terminal TLV tree";
+	struct tlvdb *tlvRoot = tlvdb_fixed(1, strlen(alr), (const unsigned char *)alr);
+	
+	// calc PDOL
+	struct tlv *pdol_data_tlv = NULL;
+	struct tlv data_tlv = {
+		.tag = 0x83,
+		.len = datalen,
+		.value = (uint8_t *)data,
+	};
+	if (dataMakeFromPDOL) {
+		ParamLoadDefaults(tlvRoot);
+
+		if (paramsLoadFromFile) {
+			PrintAndLog("Params loading from file...");
+			ParamLoadFromJson(tlvRoot);
+		};
+		
+		pdol_data_tlv = dol_process((const struct tlv *)tlvdb_external(0x9f38, datalen, data), tlvRoot, 0x83);
+		if (!pdol_data_tlv){
+			PrintAndLog("ERROR: can't create PDOL TLV.");
+			tlvdb_free(tlvRoot);
+			return 4;
+		}
+	} else {
+		if (paramsLoadFromFile) {
+			PrintAndLog("WARNING: don't need to load parameters. Sending plain PDOL data...");
+		}
+		pdol_data_tlv = &data_tlv;
+	}
+
+	size_t pdol_data_tlv_data_len = 0;
+	unsigned char *pdol_data_tlv_data = tlv_encode(pdol_data_tlv, &pdol_data_tlv_data_len);
+	if (!pdol_data_tlv_data) {
+		PrintAndLog("ERROR: can't create PDOL data.");
+		tlvdb_free(tlvRoot);
+		return 4;
+	}
+	PrintAndLog("PDOL data[%d]: %s", pdol_data_tlv_data_len, sprint_hex(pdol_data_tlv_data, pdol_data_tlv_data_len));
+	
+	// exec
+	uint8_t buf[APDU_RES_LEN] = {0};
+	size_t len = 0;
+	uint16_t sw = 0;
+	int res = EMVGPO(leaveSignalON, pdol_data_tlv_data, pdol_data_tlv_data_len, buf, sizeof(buf), &len, &sw, tlvRoot);
+	
+	if (pdol_data_tlv != &data_tlv)
+		free(pdol_data_tlv);
+	tlvdb_free(tlvRoot);
+	
+	if (sw)
+		PrintAndLog("APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
+
+	if (res)
+		return res;
+	
+	if (decodeTLV)
+		TLVPrintFromBuffer(buf, len);
+
 	return 0;
 }
 
-#define TLV_ADD(tag, value)( tlvdb_add(tlvRoot, tlvdb_fixed(tag, sizeof(value) - 1, (const unsigned char *)value)) )
+int CmdHFEMVReadRecord(const char *cmd) {
+	uint8_t data[APDU_RES_LEN] = {0};
+	int datalen = 0;
+
+	CLIParserInit("hf emv readrec", 
+		"Executes Read Record command. It returns data in TLV format.\nNeeds a bank applet to be selected and sometimes needs GPO to be executed.", 
+		"Usage:\n\thf emv readrec -k 0101 -> read file SFI=01, SFIrec=01\n\thf emv readrec -kt 0201-> read file 0201 and show result in TLV\n");
+
+	void* argtable[] = {
+		arg_param_begin,
+		arg_lit0("kK",  "keep",    "keep field ON for next command"),
+		arg_lit0("aA",  "apdu",    "show APDU reqests and responses"),
+		arg_lit0("tT",  "tlv",     "TLV decode results of selected applets"),
+		arg_strx1(NULL,  NULL,     "<SFI 1byte HEX><SFIrec 1byte HEX>", NULL),
+		arg_param_end
+	};
+	CLIExecWithReturn(cmd, argtable, true);
+	
+	bool leaveSignalON = arg_get_lit(1);
+	bool APDULogging = arg_get_lit(2);
+	bool decodeTLV = arg_get_lit(3);
+	CLIGetHexWithReturn(4, data, &datalen);
+	CLIParserFree();
+	
+	if (datalen != 2) {
+		PrintAndLog("ERROR: Command needs to have 2 bytes of data");
+		return 1;
+	}
+	
+	SetAPDULogging(APDULogging);
+		
+	// exec
+	uint8_t buf[APDU_RES_LEN] = {0};
+	size_t len = 0;
+	uint16_t sw = 0;
+	int res = EMVReadRecord(leaveSignalON, data[0], data[1], buf, sizeof(buf), &len, &sw, NULL);
+	
+	if (sw)
+		PrintAndLog("APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
+
+	if (res)
+		return res;
+	
+	
+	if (decodeTLV)
+		TLVPrintFromBuffer(buf, len);
+
+	return 0;
+}
+
+int CmdHFEMVAC(const char *cmd) {
+	uint8_t data[APDU_RES_LEN] = {0};
+	int datalen = 0;
+
+	CLIParserInit("hf emv genac", 
+		"Generate Application Cryptogram command. It returns data in TLV format .\nNeeds a EMV applet to be selected and GPO to be executed.", 
+		"Usage:\n\thf emv genac -k 0102 -> generate AC with 2-byte CDOLdata and keep field ON after command\n"
+			"\thf emv genac -t 01020304 -> generate AC with 4-byte CDOL data, show result in TLV\n"
+			"\thf emv genac -Daac 01020304 -> generate AC with 4-byte CDOL data and terminal decision 'declined'\n"
+			"\thf emv genac -pmt 9F 37 04 -> load params from file, make CDOL data from CDOL, generate AC with CDOL, show result in TLV"); 
+
+	void* argtable[] = {
+		arg_param_begin,
+		arg_lit0("kK",  "keep",     "keep field ON for next command"),
+		arg_lit0("cC",  "cda",      "executes CDA transaction. Needs to get SDAD in results."),
+		arg_str0("dD",  "decision", "<aac|tc|arqc>", "Terminal decision. aac - declined, tc - approved, arqc - online authorisation requested"),
+		arg_lit0("pP",  "params",   "load parameters from `emv/defparams.json` file for CDOLdata making from CDOL and parameters"),
+		arg_lit0("mM",  "make",     "make CDOLdata from CDOL (tag 8C and 8D) and parameters (by default uses default parameters)"),
+		arg_lit0("aA",  "apdu",     "show APDU reqests and responses"),
+		arg_lit0("tT",  "tlv",      "TLV decode results of selected applets"),
+		arg_strx1(NULL,  NULL,      "<HEX CDOLdata/CDOL>", NULL),
+		arg_param_end
+	};
+	CLIExecWithReturn(cmd, argtable, false);
+	
+	bool leaveSignalON = arg_get_lit(1);
+	bool trTypeCDA = arg_get_lit(2);
+	uint8_t termDecision = 0xff;
+	if (arg_get_str_len(3)) {
+		if (!strncmp(arg_get_str(3)->sval[0], "aac", 4))
+			termDecision = EMVAC_AAC;
+		if (!strncmp(arg_get_str(3)->sval[0], "tc", 4))
+			termDecision = EMVAC_TC;
+		if (!strncmp(arg_get_str(3)->sval[0], "arqc", 4))
+			termDecision = EMVAC_ARQC;
+
+		if (termDecision == 0xff) {
+			PrintAndLog("ERROR: can't find terminal decision '%s'", arg_get_str(3)->sval[0]);
+			return 1;
+		}
+	} else {
+		termDecision = EMVAC_TC;
+	}
+	if (trTypeCDA)
+		termDecision = termDecision | EMVAC_CDAREQ;
+	bool paramsLoadFromFile = arg_get_lit(4);
+	bool dataMakeFromCDOL = arg_get_lit(5);
+	bool APDULogging = arg_get_lit(6);
+	bool decodeTLV = arg_get_lit(7);
+	CLIGetHexWithReturn(8, data, &datalen);
+	CLIParserFree();	
+	
+	SetAPDULogging(APDULogging);
+	
+	// Init TLV tree
+	const char *alr = "Root terminal TLV tree";
+	struct tlvdb *tlvRoot = tlvdb_fixed(1, strlen(alr), (const unsigned char *)alr);
+	
+	// calc CDOL
+	struct tlv *cdol_data_tlv = NULL;
+	struct tlv data_tlv = {
+		.tag = 0x01,
+		.len = datalen,
+		.value = (uint8_t *)data,
+	};
+	
+	if (dataMakeFromCDOL) {
+		ParamLoadDefaults(tlvRoot);
+
+		if (paramsLoadFromFile) {
+			PrintAndLog("Params loading from file...");
+			ParamLoadFromJson(tlvRoot);
+		};
+		
+		cdol_data_tlv = dol_process((const struct tlv *)tlvdb_external(0x8c, datalen, data), tlvRoot, 0x01); // 0x01 - dummy tag
+		if (!cdol_data_tlv){
+			PrintAndLog("ERROR: can't create CDOL TLV.");
+			tlvdb_free(tlvRoot);
+			return 4;
+		}
+	} else {
+		if (paramsLoadFromFile) {
+			PrintAndLog("WARNING: don't need to load parameters. Sending plain CDOL data...");
+		}
+		cdol_data_tlv = &data_tlv;
+	}
+	
+	PrintAndLog("CDOL data[%d]: %s", cdol_data_tlv->len, sprint_hex(cdol_data_tlv->value, cdol_data_tlv->len));
+
+	// exec
+	uint8_t buf[APDU_RES_LEN] = {0};
+	size_t len = 0;
+	uint16_t sw = 0;
+	int res = EMVAC(leaveSignalON, termDecision, (uint8_t *)cdol_data_tlv->value, cdol_data_tlv->len, buf, sizeof(buf), &len, &sw, tlvRoot);
+	
+	if (cdol_data_tlv != &data_tlv)
+		free(cdol_data_tlv);
+	tlvdb_free(tlvRoot);
+	
+	if (sw)
+		PrintAndLog("APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
+
+	if (res)
+		return res;
+	
+	if (decodeTLV)
+		TLVPrintFromBuffer(buf, len);
+
+	return 0;	
+}
+
+int CmdHFEMVGenerateChallenge(const char *cmd) {
+
+	CLIParserInit("hf emv challenge", 
+		"Executes Generate Challenge command. It returns 4 or 8-byte random number from card.\nNeeds a EMV applet to be selected and GPO to be executed.", 
+		"Usage:\n\thf emv challenge -> get challenge\n\thf emv challenge -k -> get challenge, keep fileld ON\n");
+
+	void* argtable[] = {
+		arg_param_begin,
+		arg_lit0("kK",  "keep",    "keep field ON for next command"),
+		arg_lit0("aA",  "apdu",    "show APDU reqests and responses"),
+		arg_param_end
+	};
+	CLIExecWithReturn(cmd, argtable, true);
+	
+	bool leaveSignalON = arg_get_lit(1);
+	bool APDULogging = arg_get_lit(2);
+	CLIParserFree();	
+	
+	SetAPDULogging(APDULogging);
+	
+	// exec
+	uint8_t buf[APDU_RES_LEN] = {0};
+	size_t len = 0;
+	uint16_t sw = 0;
+	int res = EMVGenerateChallenge(leaveSignalON, buf, sizeof(buf), &len, &sw, NULL);
+	
+	if (sw)
+		PrintAndLog("APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
+
+	if (res)
+		return res;
+
+	PrintAndLog("Challenge: %s", sprint_hex(buf, len));
+	
+	if (len != 4 && len != 8)
+		PrintAndLog("WARNING: length of challenge must be 4 or 8, but it %d", len);
+	
+	return 0;
+}
+
+int CmdHFEMVInternalAuthenticate(const char *cmd) {
+	uint8_t data[APDU_RES_LEN] = {0};
+	int datalen = 0;
+
+	CLIParserInit("hf emv intauth", 
+		"Generate Internal Authenticate command. Usually needs 4-byte random number. It returns data in TLV format .\nNeeds a EMV applet to be selected and GPO to be executed.", 
+		"Usage:\n\thf emv intauth -k 01020304 -> execute Internal Authenticate with 4-byte DDOLdata and keep field ON after command\n"
+			"\thf emv intauth -t 01020304 -> execute Internal Authenticate with 4-byte DDOL data, show result in TLV\n"
+			"\thf emv intauth -pmt 9F 37 04 -> load params from file, make DDOL data from DDOL, Internal Authenticate with DDOL, show result in TLV"); 
+
+	void* argtable[] = {
+		arg_param_begin,
+		arg_lit0("kK",  "keep",    "keep field ON for next command"),
+		arg_lit0("pP",  "params",  "load parameters from `emv/defparams.json` file for DDOLdata making from DDOL and parameters"),
+		arg_lit0("mM",  "make",    "make DDOLdata from DDOL (tag 9F49) and parameters (by default uses default parameters)"),
+		arg_lit0("aA",  "apdu",    "show APDU reqests and responses"),
+		arg_lit0("tT",  "tlv",     "TLV decode results of selected applets"),
+		arg_strx1(NULL,  NULL,     "<HEX DDOLdata/DDOL>", NULL),
+		arg_param_end
+	};
+	CLIExecWithReturn(cmd, argtable, false);
+	
+	bool leaveSignalON = arg_get_lit(1);
+	bool paramsLoadFromFile = arg_get_lit(2);
+	bool dataMakeFromDDOL = arg_get_lit(3);
+	bool APDULogging = arg_get_lit(4);
+	bool decodeTLV = arg_get_lit(5);
+	CLIGetHexWithReturn(6, data, &datalen);
+	CLIParserFree();	
+	
+	SetAPDULogging(APDULogging);
+
+	// Init TLV tree
+	const char *alr = "Root terminal TLV tree";
+	struct tlvdb *tlvRoot = tlvdb_fixed(1, strlen(alr), (const unsigned char *)alr);
+	
+	// calc DDOL
+	struct tlv *ddol_data_tlv = NULL;
+	struct tlv data_tlv = {
+		.tag = 0x01,
+		.len = datalen,
+		.value = (uint8_t *)data,
+	};
+	
+	if (dataMakeFromDDOL) {
+		ParamLoadDefaults(tlvRoot);
+
+		if (paramsLoadFromFile) {
+			PrintAndLog("Params loading from file...");
+			ParamLoadFromJson(tlvRoot);
+		};
+		
+		ddol_data_tlv = dol_process((const struct tlv *)tlvdb_external(0x9f49, datalen, data), tlvRoot, 0x01); // 0x01 - dummy tag
+		if (!ddol_data_tlv){
+			PrintAndLog("ERROR: can't create DDOL TLV.");
+			tlvdb_free(tlvRoot);
+			return 4;
+		}
+	} else {
+		if (paramsLoadFromFile) {
+			PrintAndLog("WARNING: don't need to load parameters. Sending plain DDOL data...");
+		}
+		ddol_data_tlv = &data_tlv;
+	}
+	
+	PrintAndLog("DDOL data[%d]: %s", ddol_data_tlv->len, sprint_hex(ddol_data_tlv->value, ddol_data_tlv->len));
+	
+	// exec
+	uint8_t buf[APDU_RES_LEN] = {0};
+	size_t len = 0;
+	uint16_t sw = 0;
+	int res = EMVInternalAuthenticate(leaveSignalON, data, datalen, buf, sizeof(buf), &len, &sw, NULL);
+	
+	if (ddol_data_tlv != &data_tlv)
+		free(ddol_data_tlv);
+	tlvdb_free(tlvRoot);	
+	
+	if (sw)
+		PrintAndLog("APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
+
+	if (res)
+		return res;
+	
+	if (decodeTLV)
+		TLVPrintFromBuffer(buf, len);
+
+	return 0;	
+}
+
 #define dreturn(n) {free(pdol_data_tlv);tlvdb_free(tlvSelect);tlvdb_free(tlvRoot);DropField();return n;}
 
-int CmdHFEMVExec(const char *cmd) {
-	bool activateField = false;
-	bool showAPDU = false;
-	bool decodeTLV = false;
-	bool forceSearch = false;
-	enum TransactionType TrType = TT_MSD;
-	bool GenACGPO = false;
+void InitTransactionParameters(struct tlvdb *tlvRoot, bool paramLoadJSON, enum TransactionType TrType, bool GenACGPO) {
+	
+	ParamLoadDefaults(tlvRoot);
 
+	if (paramLoadJSON) {
+		PrintAndLog("* * Transaction parameters loading from JSON...");
+		ParamLoadFromJson(tlvRoot);
+	}
+	
+	//9F66:(Terminal Transaction Qualifiers (TTQ)) len:4
+	char *qVSDC = "\x26\x00\x00\x00";
+	if (GenACGPO) {
+		qVSDC = "\x26\x80\x00\x00";
+	}
+	switch(TrType) {
+		case TT_MSD:
+			TLV_ADD(0x9F66, "\x86\x00\x00\x00"); // MSD
+			break;
+		// not standard for contactless. just for test.
+		case TT_VSDC:  
+			TLV_ADD(0x9F66, "\x46\x00\x00\x00"); // VSDC
+			break;
+		case TT_QVSDCMCHIP:
+			TLV_ADD(0x9F66, qVSDC); // qVSDC
+			break;
+		case TT_CDA:
+			TLV_ADD(0x9F66, qVSDC); // qVSDC (VISA CDA not enabled)
+			break;
+		default:
+			break;
+	}
+}
+
+void ProcessGPOResponseFormat1(struct tlvdb *tlvRoot, uint8_t *buf, size_t len, bool decodeTLV) {
+	if (buf[0] == 0x80) {
+		if (decodeTLV){
+			PrintAndLog("GPO response format1:");
+			TLVPrintFromBuffer(buf, len);
+		}
+		
+		if (len < 4 || (len - 4) % 4) {
+			PrintAndLog("ERROR: GPO response format1 parsing error. length=%d", len);
+		} else {
+			// AIP
+			struct tlvdb * f1AIP = tlvdb_fixed(0x82, 2, buf + 2);
+			tlvdb_add(tlvRoot, f1AIP);
+			if (decodeTLV){
+				PrintAndLog("\n* * Decode response format 1 (0x80) AIP and AFL:");
+				TLVPrintFromTLV(f1AIP);
+			}
+
+			// AFL
+			struct tlvdb * f1AFL = tlvdb_fixed(0x94, len - 4, buf + 2 + 2);
+			tlvdb_add(tlvRoot, f1AFL);
+			if (decodeTLV)
+				TLVPrintFromTLV(f1AFL);
+		}		
+	} else {
+		if (decodeTLV)
+			TLVPrintFromBuffer(buf, len);
+	}
+}
+
+int CmdHFEMVExec(const char *cmd) {
 	uint8_t buf[APDU_RES_LEN] = {0};
 	size_t len = 0;
 	uint16_t sw = 0;
@@ -304,46 +645,46 @@ int CmdHFEMVExec(const char *cmd) {
 	struct tlvdb *tlvSelect = NULL;
 	struct tlvdb *tlvRoot = NULL;
 	struct tlv *pdol_data_tlv = NULL;
-	if (strlen(cmd) < 1)
-		return usage_emv_exec();
+
+	CLIParserInit("hf emv exec", 
+		"Executes EMV contactless transaction", 
+		"Usage:\n\thf emv exec -sat -> select card, execute MSD transaction, show APDU and TLV\n"
+			"\thf emv exec -satc -> select card, execute CDA transaction, show APDU and TLV\n");
+
+	void* argtable[] = {
+		arg_param_begin,
+		arg_lit0("sS",  "select",   "activate field and select card."),
+		arg_lit0("aA",  "apdu",     "show APDU reqests and responses."),
+		arg_lit0("tT",  "tlv",      "TLV decode results."),
+		arg_lit0("jJ",  "jload",    "Load transaction parameters from `emv/defparams.json` file."),
+		arg_lit0("fF",  "forceaid", "Force search AID. Search AID instead of execute PPSE."),
+		arg_rem("By default:",      "Transaction type - MSD"),
+		arg_lit0("vV",  "qvsdc",    "Transaction type - qVSDC or M/Chip."),
+		arg_lit0("cC",  "qvsdccda", "Transaction type - qVSDC or M/Chip plus CDA (SDAD generation)."),
+		arg_lit0("xX",  "vsdc",     "Transaction type - VSDC. For test only. Not a standart behavior."),
+		arg_lit0("gG",  "acgpo",    "VISA. generate AC from GPO."),
+		arg_param_end
+	};
+	CLIExecWithReturn(cmd, argtable, true);
 	
-	int cmdp = 0;
-	while(param_getchar(cmd, cmdp) != 0x00) {
-		char c = param_getchar(cmd, cmdp);
-		if ((c == '-') && (param_getlength(cmd, cmdp) == 2))
-			switch (tolower(param_getchar_indx(cmd, 1, cmdp))) {
-				case 'h':
-					return usage_emv_exec();
-				case 's':
-					activateField = true;
-					break;
-				case 'a':
-					showAPDU = true;
-					break;
-				case 't':
-					decodeTLV = true;
-					break;
-				case 'f':
-					forceSearch = true;
-					break;
-				case 'x':
-					TrType = TT_VSDC;
-					break;
-				case 'v':
+	bool activateField = arg_get_lit(1);
+	bool showAPDU = arg_get_lit(2);
+	bool decodeTLV = arg_get_lit(3);
+	bool paramLoadJSON = arg_get_lit(4);
+	bool forceSearch = arg_get_lit(5);
+
+	enum TransactionType TrType = TT_MSD;
+	if (arg_get_lit(6))
 					TrType = TT_QVSDCMCHIP;
-					break;
-				case 'c':
+	if (arg_get_lit(7))
 					TrType = TT_CDA;
-					break;
-				case 'g':
-					GenACGPO = true;
-					break;
-				default:
-					PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar_indx(cmd, 1, cmdp));
-					return 1;
-		}
-		cmdp++;
-	}
+	if (arg_get_lit(8))
+		TrType = TT_VSDC;
+
+	bool GenACGPO = arg_get_lit(9);
+	CLIParserFree();
+	
+	SetAPDULogging(showAPDU);
 	
 	// init applets list tree
 	const char *al = "Applets list";
@@ -399,50 +740,10 @@ int CmdHFEMVExec(const char *cmd) {
 	
 	if (decodeTLV)
 		TLVPrintFromBuffer(buf, len);
+	PrintAndLog("* Selected.");
 	
-	PrintAndLogEx(NORMAL, "* Selected.");	
-	PrintAndLogEx(NORMAL, "\n* Init transaction parameters.");
-
-    //9F66:(Terminal Transaction Qualifiers (TTQ)) len:4
-	char *qVSDC = "\x26\x00\x00\x00";
-	if (GenACGPO) {
-		qVSDC = "\x26\x80\x00\x00";
-	}
-	switch(TrType) {
-		case TT_MSD:
-			TLV_ADD(0x9F66, "\x86\x00\x00\x00"); // MSD
-			break;
-		// not standard for contactless. just for test.
-		case TT_VSDC:  
-			TLV_ADD(0x9F66, "\x46\x00\x00\x00"); // VSDC
-			break;
-		case TT_QVSDCMCHIP:
-			TLV_ADD(0x9F66, qVSDC); // qVSDC
-			break;
-		case TT_CDA:
-			TLV_ADD(0x9F66, qVSDC); // qVSDC (VISA CDA not enabled)
-			break;
-		default:
-			TLV_ADD(0x9F66, "\x26\x00\x00\x00"); // qVSDC
-			break;
-	}
-	
-    //9F02:(Amount, authorized (Numeric)) len:6
-	TLV_ADD(0x9F02, "\x00\x00\x00\x00\x01\x00");
-    //9F1A:(Terminal Country Code) len:2
-	TLV_ADD(0x9F1A, "ru");
-    //5F2A:(Transaction Currency Code) len:2
-    // USD 840, EUR 978, RUR 810, RUB 643, RUR 810(old), UAH 980, AZN 031, n/a 999
-	TLV_ADD(0x5F2A, "\x09\x80");
-    //9A:(Transaction Date) len:3
-	TLV_ADD(0x9A,   "\x00\x00\x00");
-    //9C:(Transaction Type) len:1   |  00 => Goods and service #01 => Cash
-	TLV_ADD(0x9C,   "\x00");
-	// 9F37 Unpredictable Number len:4
-	TLV_ADD(0x9F37, "\x01\x02\x03\x04");
-	// 9F6A Unpredictable Number (MSD for UDOL) len:4
-	TLV_ADD(0x9F6A, "\x01\x02\x03\x04");
-
+	PrintAndLog("\n* Init transaction parameters.");
+	InitTransactionParameters(tlvRoot, paramLoadJSON, TrType, GenACGPO);
 	TLVPrintFromTLV(tlvRoot); // TODO delete!!!
 	
 	PrintAndLogEx(NORMAL, "\n* Calc PDOL.");
@@ -472,33 +773,7 @@ int CmdHFEMVExec(const char *cmd) {
 	}
 
 	// process response template format 1 [id:80  2b AIP + x4b AFL] and format 2 [id:77 TLV]
-	if (buf[0] == 0x80) {
-		if (decodeTLV){
-			PrintAndLogEx(NORMAL, "GPO response format1:");
-			TLVPrintFromBuffer(buf, len);
-		}
-		
-		if (len < 4 || (len - 4) % 4) {
-			PrintAndLogEx(WARNING, "Error: GPO response format1 parsing error. length=%d", len);
-		} else {
-			// AIP
-			struct tlvdb * f1AIP = tlvdb_fixed(0x82, 2, buf + 2);
-			tlvdb_add(tlvRoot, f1AIP);
-			if (decodeTLV){
-				PrintAndLogEx(NORMAL, "\n* * Decode response format 1 (0x80) AIP and AFL:");
-				TLVPrintFromTLV(f1AIP);
-			}
-
-			// AFL
-			struct tlvdb * f1AFL = tlvdb_fixed(0x94, len - 4, buf + 2 + 2);
-			tlvdb_add(tlvRoot, f1AFL);
-			if (decodeTLV)
-				TLVPrintFromTLV(f1AFL);
-		}		
-	} else {
-		if (decodeTLV)
-			TLVPrintFromBuffer(buf, len);
-	}
+	ProcessGPOResponseFormat1(tlvRoot, buf, len, decodeTLV);
 	
 	// extract PAN from track2
 	{
@@ -583,7 +858,7 @@ int CmdHFEMVExec(const char *cmd) {
 		struct tlvdb *oda = tlvdb_fixed(0x21, ODAiListLen, ODAiList); // not a standard tag
 		tlvdb_add(tlvRoot, oda); 
 		PrintAndLogEx(NORMAL, "* Input list for Offline Data Authentication added to TLV. len=%d \n", ODAiListLen);
-	}	
+	}
 	
 	// get AIP
 	const struct tlv *AIPtlv = tlvdb_get(tlvRoot, 0x82, NULL);	
@@ -796,6 +1071,332 @@ int CmdHFEMVExec(const char *cmd) {
 	return 0;
 }
 
+int CmdHFEMVScan(const char *cmd) {
+	uint8_t AID[APDU_AID_LEN] = {0};
+	size_t AIDlen = 0;
+	uint8_t buf[APDU_RES_LEN] = {0};
+	size_t len = 0;
+	uint16_t sw = 0;
+	int res;
+	json_t *root;
+	json_error_t error;
+
+	CLIParserInit("hf emv scan", 
+		"Scan EMV card and save it contents to a file.", 
+		"It executes EMV contactless transaction and saves result to a file which can be used for emulation\n"
+			"Usage:\n\thf emv scan -at -> scan MSD transaction mode and show APDU and TLV\n"
+			"\thf emv scan -c -> scan CDA transaction mode\n");
+
+	void* argtable[] = {
+		arg_param_begin,
+		arg_lit0("aA",  "apdu",     "show APDU reqests and responses."),
+		arg_lit0("tT",  "tlv",      "TLV decode results."),
+		arg_lit0("eE",  "extract",  "Extract TLV elements and fill Application Data"),
+		arg_lit0("jJ",  "jload",    "Load transaction parameters from `emv/defparams.json` file."),
+		arg_rem("By default:",      "Transaction type - MSD"),
+		arg_lit0("vV",  "qvsdc",    "Transaction type - qVSDC or M/Chip."),
+		arg_lit0("cC",  "qvsdccda", "Transaction type - qVSDC or M/Chip plus CDA (SDAD generation)."),
+		arg_lit0("xX",  "vsdc",     "Transaction type - VSDC. For test only. Not a standart behavior."),
+		arg_lit0("gG",  "acgpo",    "VISA. generate AC from GPO."),
+		arg_lit0("mM",  "merge",    "Merge output file with card's data. (warning: the file may be corrupted!)"),
+		arg_str1(NULL,  NULL,		"output.json", "JSON output file name"),
+		arg_param_end
+	};
+	CLIExecWithReturn(cmd, argtable, true);
+	
+	bool showAPDU = arg_get_lit(1);
+	bool decodeTLV = arg_get_lit(2);
+	bool extractTLVElements = arg_get_lit(3);
+	bool paramLoadJSON = arg_get_lit(4);
+
+	enum TransactionType TrType = TT_MSD;
+	if (arg_get_lit(6))
+		TrType = TT_QVSDCMCHIP;
+	if (arg_get_lit(7))
+		TrType = TT_CDA;
+	if (arg_get_lit(8))
+		TrType = TT_VSDC;
+
+	bool GenACGPO = arg_get_lit(9);
+	bool MergeJSON = arg_get_lit(10);
+	uint8_t relfname[250] ={0};
+	char *crelfname = (char *)relfname;
+	int relfnamelen = 0;
+	CLIGetStrWithReturn(11, relfname, &relfnamelen);
+	CLIParserFree();
+	
+	SetAPDULogging(showAPDU);
+	
+	// current path + file name
+	if (!strstr(crelfname, ".json"))
+		strcat(crelfname, ".json");
+	char fname[strlen(get_my_executable_directory()) + strlen(crelfname) + 1];
+	strcpy(fname, get_my_executable_directory());
+	strcat(fname, crelfname);
+
+	if (MergeJSON) {
+		root = json_load_file(fname, 0, &error);
+		if (!root) {
+			PrintAndLog("ERROR: json error on line %d: %s", error.line, error.text);
+			return 1; 
+		}
+		
+		if (!json_is_object(root)) {
+			PrintAndLog("ERROR: Invalid json format. root must be an object.");
+			return 1; 
+		}
+	} else {
+		root = json_object();
+	}
+
+	// drop field at start
+	DropField();
+
+	// iso 14443 select
+	PrintAndLog("--> GET UID, ATS.");
+	
+	iso14a_card_select_t card;
+	if (Hf14443_4aGetCardData(&card)) {
+		return 2;
+	}
+
+	JsonSaveStr(root, "$.File.Created", "proxmark3 `hf emv scan`");
+	
+	JsonSaveStr(root, "$.Card.Communication", "iso14443-4a");
+	JsonSaveBufAsHex(root, "$.Card.UID", (uint8_t *)&card.uid, card.uidlen);
+	JsonSaveHex(root, "$.Card.ATQA", card.atqa[0] + (card.atqa[1] << 2), 2);
+	JsonSaveHex(root, "$.Card.SAK", card.sak, 0);
+	JsonSaveBufAsHex(root, "$.Card.ATS", (uint8_t *)card.ats, card.ats_len);
+	
+	// init applets list tree
+	const char *al = "Applets list";
+	struct tlvdb *tlvSelect = tlvdb_fixed(1, strlen(al), (const unsigned char *)al);
+	
+	// EMV PPSE
+	PrintAndLog("--> PPSE.");
+	res = EMVSelectPSE(true, true, 2, buf, sizeof(buf), &len, &sw);
+
+	if (!res && sw == 0x9000){
+		if (decodeTLV)
+			TLVPrintFromBuffer(buf, len);
+		
+		JsonSaveBufAsHex(root, "$.PPSE.AID", (uint8_t *)"2PAY.SYS.DDF01", 14);
+		
+		struct tlvdb *fci = tlvdb_parse_multi(buf, len);
+		if (extractTLVElements)
+			JsonSaveTLVTree(root, root, "$.PPSE.FCITemplate", fci);
+		else
+			JsonSaveTLVTreeElm(root, "$.PPSE.FCITemplate", fci, true, true, false);
+		JsonSaveTLVValue(root, "$.Application.KernelID", tlvdb_find_full(fci, 0x9f2a));
+		tlvdb_free(fci);
+	}
+
+	res = EMVSearchPSE(false, true, decodeTLV, tlvSelect);
+
+	// check PPSE and select application id
+	if (!res) {	
+		TLVPrintAIDlistFromSelectTLV(tlvSelect);		
+	} else {
+		// EMV SEARCH with AID list
+		SetAPDULogging(false);
+		PrintAndLog("--> AID search.");
+		if (EMVSearch(false, true, decodeTLV, tlvSelect)) {
+			PrintAndLog("E->Can't found any of EMV AID. Exit...");
+			tlvdb_free(tlvSelect);
+			DropField();
+			return 3;
+		}
+
+		// check search and select application id
+		TLVPrintAIDlistFromSelectTLV(tlvSelect);
+	}
+
+	// EMV SELECT application
+	SetAPDULogging(showAPDU);
+	EMVSelectApplication(tlvSelect, AID, &AIDlen);
+
+	tlvdb_free(tlvSelect);
+
+	if (!AIDlen) {
+		PrintAndLog("Can't select AID. EMV AID not found. Exit...");
+		DropField();
+		return 4;
+	}
+
+	JsonSaveBufAsHex(root, "$.Application.AID", AID, AIDlen);
+	
+	// Init TLV tree
+	const char *alr = "Root terminal TLV tree";
+	struct tlvdb *tlvRoot = tlvdb_fixed(1, strlen(alr), (const unsigned char *)alr);
+
+	// EMV SELECT applet
+
+	PrintAndLog("\n-->Selecting AID:%s.", sprint_hex_inrow(AID, AIDlen));
+	SetAPDULogging(showAPDU);
+	res = EMVSelect(false, true, AID, AIDlen, buf, sizeof(buf), &len, &sw, tlvRoot);
+	
+	if (res) {	
+		PrintAndLog("E->Can't select AID (%d). Exit...", res);
+		tlvdb_free(tlvRoot);
+		DropField();
+		return 5;
+	}
+	
+	if (decodeTLV)
+		TLVPrintFromBuffer(buf, len);
+
+	// save mode
+	if (tlvdb_get(tlvRoot, 0x9f38, NULL)) {
+		JsonSaveStr(root, "$.Application.Mode", TransactionTypeStr[TrType]);
+	}
+
+	struct tlvdb *fci = tlvdb_parse_multi(buf, len);
+	if (extractTLVElements)
+		JsonSaveTLVTree(root, root, "$.Application.FCITemplate", fci);
+	else
+		JsonSaveTLVTreeElm(root, "$.Application.FCITemplate", fci, true, true, false);
+	tlvdb_free(fci);
+
+	// create transaction parameters
+	PrintAndLog("-->Init transaction parameters.");
+	InitTransactionParameters(tlvRoot, paramLoadJSON, TrType, GenACGPO);
+	
+	PrintAndLog("-->Calc PDOL.");
+	struct tlv *pdol_data_tlv = dol_process(tlvdb_get(tlvRoot, 0x9f38, NULL), tlvRoot, 0x83);
+	if (!pdol_data_tlv){
+		PrintAndLog("E->Can't create PDOL TLV.");
+		tlvdb_free(tlvRoot);
+		DropField();
+		return 6;
+	}
+	
+	size_t pdol_data_tlv_data_len;
+	unsigned char *pdol_data_tlv_data = tlv_encode(pdol_data_tlv, &pdol_data_tlv_data_len);
+	if (!pdol_data_tlv_data) {
+		PrintAndLog("E->Can't create PDOL data.");
+		tlvdb_free(tlvRoot);
+		DropField();
+		return 6;
+	}
+	PrintAndLog("PDOL data[%d]: %s", pdol_data_tlv_data_len, sprint_hex(pdol_data_tlv_data, pdol_data_tlv_data_len));
+
+	PrintAndLog("-->GPO.");
+	res = EMVGPO(true, pdol_data_tlv_data, pdol_data_tlv_data_len, buf, sizeof(buf), &len, &sw, tlvRoot);
+	
+	free(pdol_data_tlv_data);
+	free(pdol_data_tlv);
+	
+	if (res) {	
+		PrintAndLog("GPO error(%d): %4x. Exit...", res, sw);
+		tlvdb_free(tlvRoot);
+		DropField();
+		return 7;
+	}
+	ProcessGPOResponseFormat1(tlvRoot, buf, len, decodeTLV);
+	
+	struct tlvdb *gpofci = tlvdb_parse_multi(buf, len);
+	if (extractTLVElements)
+		JsonSaveTLVTree(root, root, "$.Application.GPO", gpofci);
+	else
+		JsonSaveTLVTreeElm(root, "$.Application.GPO", gpofci, true, true, false);
+
+	JsonSaveTLVValue(root, "$.ApplicationData.AIP", tlvdb_find_full(gpofci, 0x82));
+	JsonSaveTLVValue(root, "$.ApplicationData.AFL", tlvdb_find_full(gpofci, 0x94));
+
+	tlvdb_free(gpofci);
+
+	PrintAndLog("-->Read records from AFL.");
+	const struct tlv *AFL = tlvdb_get(tlvRoot, 0x94, NULL);
+	
+	while(AFL && AFL->len) {
+		if (AFL->len % 4) {
+			PrintAndLog("E->Wrong AFL length: %d", AFL->len);
+			break;
+		}
+
+		json_t *sfijson = json_path_get(root, "$.Application.Records");
+		if (!sfijson) {
+			json_t *app = json_path_get(root, "$.Application");
+			json_object_set_new(app, "Records", json_array());
+			
+			sfijson = json_path_get(root, "$.Application.Records");
+		}
+		if (!json_is_array(sfijson)) {
+			PrintAndLog("E->Internal logic error. `$.Application.Records` is not an array.");
+			break;
+		}
+		for (int i = 0; i < AFL->len / 4; i++) {
+			uint8_t SFI = AFL->value[i * 4 + 0] >> 3;
+			uint8_t SFIstart = AFL->value[i * 4 + 1];
+			uint8_t SFIend = AFL->value[i * 4 + 2];
+			uint8_t SFIoffline = AFL->value[i * 4 + 3];
+			
+			PrintAndLog("--->SFI[%02x] start:%02x end:%02x offline:%02x", SFI, SFIstart, SFIend, SFIoffline);
+			if (SFI == 0 || SFI == 31 || SFIstart == 0 || SFIstart > SFIend) {
+				PrintAndLog("SFI ERROR! Skipped...");
+				continue;
+			}
+			
+			for(int n = SFIstart; n <= SFIend; n++) {
+				PrintAndLog("---->SFI[%02x] %d", SFI, n);
+				
+				res = EMVReadRecord(true, SFI, n, buf, sizeof(buf), &len, &sw, tlvRoot);
+				if (res) {
+					PrintAndLog("E->SFI[%02x]. APDU error %4x", SFI, sw);
+					continue;
+				}
+				
+				if (decodeTLV) {
+					TLVPrintFromBuffer(buf, len);
+					PrintAndLog("");
+				}
+				
+				json_t *jsonelm = json_object();
+				json_array_append_new(sfijson, jsonelm);
+
+				JsonSaveHex(jsonelm, "SFI", SFI, 1);
+				JsonSaveHex(jsonelm, "RecordNum", n, 1);
+				JsonSaveHex(jsonelm, "Offline", SFIoffline, 1);
+				
+				struct tlvdb *rsfi = tlvdb_parse_multi(buf, len);
+				if (extractTLVElements)
+					JsonSaveTLVTree(root, jsonelm, "$.Data", rsfi);
+				else
+					JsonSaveTLVTreeElm(jsonelm, "$.Data", rsfi, true, true, false);
+				tlvdb_free(rsfi);
+			}
+		}
+		
+		break;
+	}
+	
+	// getting certificates
+	if (tlvdb_get(tlvRoot, 0x90, NULL)) {
+		PrintAndLog("-->Recovering certificates.");
+		PKISetStrictExecution(false);
+		RecoveryCertificates(tlvRoot, root);
+		PKISetStrictExecution(true);
+	}
+	
+	// free tlv object
+	tlvdb_free(tlvRoot);
+
+	// DropField
+	DropField();
+	
+	res = json_dump_file(root, fname, JSON_INDENT(2));
+	if (res) {
+		PrintAndLog("ERROR: can't save the file: %s", fname);
+		return 200;
+	}
+	PrintAndLog("File `%s` saved.", fname);
+	
+	// free json object
+	json_decref(root);
+	
+	return 0;
+}
+
 int usage_emv_getrnd(void){
 	PrintAndLogEx(NORMAL, "retrieve the UN number from a terminal");
 	PrintAndLogEx(NORMAL, "Usage:  hf emv getrnd [h]");
@@ -822,12 +1423,19 @@ int CmdHfEMVList(const char *Cmd) {
 int CmdHFEMVTest(const char *cmd) {
 	return ExecuteCryptoTests(true);
 }
+
 static command_t CommandTable[] =  {
 	{"help",	CmdHelp,		1,	"This help"},
 	{"exec",	CmdHFEMVExec,	0,	"Executes EMV contactless transaction."},
 	{"pse",		CmdHFEMVPPSE,	0,	"Execute PPSE. It selects 2PAY.SYS.DDF01 or 1PAY.SYS.DDF01 directory."},
 	{"search",	CmdHFEMVSearch,	0,	"Try to select all applets from applets list and print installed applets."},
 	{"select",	CmdHFEMVSelect,	0,	"Select applet."},
+	{"gpo",			CmdHFEMVGPO,					0,	"Execute GetProcessingOptions."},
+	{"readrec",		CmdHFEMVReadRecord,				0,	"Read files from card."},
+	{"genac",		CmdHFEMVAC,						0,	"Generate ApplicationCryptogram."},
+	{"challenge",	CmdHFEMVGenerateChallenge,		0,	"Generate challenge."},
+	{"intauth",		CmdHFEMVInternalAuthenticate,	0,	"Internal authentication."},
+	{"scan",		CmdHFEMVScan,					0,	"Scan EMV card and save it contents to json file for emulator."},
 	{"test",	CmdHFEMVTest,	0,	"Crypto logic test."},
 	/*
 	{"getrng",		CmdHfEMVGetrng,	  0, "get random number from terminal"}, 

From d7d681ab51c74900282ae88df09f79c5ed372ca1 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 20 Nov 2018 17:28:41 +0200
Subject: [PATCH 0213/1938] cmdhf apdu move  to argtable

---
 client/cmdhf14a.c | 66 +++++++++++++----------------------------------
 1 file changed, 18 insertions(+), 48 deletions(-)

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 77e9473a1..42a941ffa 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -171,13 +171,6 @@ int usage_hf_14a_info(void){
 	PrintAndLogEx(NORMAL, "       n    test for nack bug");
 	return 0;
 }
-int usage_hf_14a_apdu(void) {
-	PrintAndLogEx(NORMAL, "Usage: hf 14a apdu [-s] [-k] [-t] <APDU (hex)>");
-	PrintAndLogEx(NORMAL, "       -s    activate field and select card");
-	PrintAndLogEx(NORMAL, "       -k    leave the signal field ON after receive response");
-	PrintAndLogEx(NORMAL, "       -t    executes TLV decoder if it possible. TODO!!!!");
-	return 0;
-}
 int usage_hf_14a_antifuzz(void) {
 	PrintAndLogEx(NORMAL, "Usage: hf 14a antifuzz [4|7|10]");
 	PrintAndLogEx(NORMAL, "       <len>    determine which anticollision phase the command will target.");
@@ -921,51 +914,28 @@ int CmdHF14AAPDU(const char *cmd) {
 	bool activateField = false;
 	bool leaveSignalON = false;
 	bool decodeTLV = false;
-	
-	if (strlen(cmd) < 2) return usage_hf_14a_apdu();
 
-	int cmdp = 0;
-	while(param_getchar(cmd, cmdp) != 0x00) {
-		char c = param_getchar(cmd, cmdp);
-		if ((c == '-') && (param_getlength(cmd, cmdp) == 2))
-			switch (tolower(param_getchar_indx(cmd, 1, cmdp))) {
-				case 'h':
-					return usage_hf_14a_apdu();
-				case 's':
-					activateField = true;
-					break;
-				case 'k':
-					leaveSignalON = true;
-					break;
-				case 't':
-					decodeTLV = true;
-					break;
-				default:
-					PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar_indx(cmd, 1, cmdp));
-					return 1;
-			}
+	CLIParserInit("hf 14a apdu", 
+		"Sends an ISO 7816-4 APDU via ISO 14443-4 block transmission protocol (T=CL)", 
+		"Sample:\n\thf 14a apdu -st 00A404000E325041592E5359532E444446303100\n");
+
+	void* argtable[] = {
+		arg_param_begin,
+		arg_lit0("sS",  "select",  "activate field and select card"),
+		arg_lit0("kK",  "keep",    "leave the signal field ON after receive response"),
+		arg_lit0("tT",  "tlv",     "executes TLV decoder if it possible"),
+		arg_strx1(NULL, NULL,      "<APDU (hex)>", NULL),
+		arg_param_end
+	};
+	CLIExecWithReturn(cmd, argtable, false);
 			
-		if (isxdigit(c)) {
+	activateField = arg_get_lit(1);
+	leaveSignalON = arg_get_lit(2);
+	decodeTLV = arg_get_lit(3);
 			// len = data + PCB(1b) + CRC(2b)
-			switch(param_gethex_to_eol(cmd, cmdp, data, sizeof(data) - 1 - 2, &datalen)) {
-			case 1:
-				PrintAndLogEx(WARNING, "invalid HEX value.");
-				return 1;
-			case 2:
-				PrintAndLogEx(WARNING, "APDU too large.");
-				return 1;
-			case 3:
-				PrintAndLogEx(WARNING, "hex must have even number of digits.");
-				return 1;
-			}
-			
-			// we get all the hex to end of line with spaces
-			break;
-		}
-		
-		cmdp++;
-	}
+	CLIGetHexBLessWithReturn(4, data, &datalen, 1 + 2);
 
+CLIParserFree();
 	PrintAndLogEx(NORMAL, ">>>>[%s%s%s] %s", activateField ? "sel ": "", leaveSignalON ? "keep ": "", decodeTLV ? "TLV": "", sprint_hex(data, datalen));
 	
 	int res = ExchangeAPDU14a(data, datalen, activateField, leaveSignalON, data, USB_CMD_DATA_SIZE, &datalen);

From 9df1d14ca42dbbd272e86f4d5033632e5ac38ebd Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 20 Nov 2018 17:29:17 +0200
Subject: [PATCH 0214/1938] printandlogex in hf emv commands

---
 client/emv/cmdemv.c | 102 ++++++++++++++++++++++----------------------
 1 file changed, 51 insertions(+), 51 deletions(-)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index 21691d0b7..5a64892c4 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -75,7 +75,7 @@ int CmdHFEMVSelect(const char *cmd) {
 	int res = EMVSelect(activateField, leaveSignalON, data, datalen, buf, sizeof(buf), &len, &sw, NULL);
 
 	if (sw)
-		PrintAndLog("APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
+		PrintAndLogEx(INFO, "APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
 	
 	if (res)
 		return res;
@@ -119,7 +119,7 @@ int CmdHFEMVSearch(const char *cmd) {
 		return 2;
 	}
 	
-	PrintAndLog("Search completed.");
+	PrintAndLogEx(SUCCESS, "Search completed.");
 
 	// print list here
 	if (!decodeTLV) {  
@@ -169,7 +169,7 @@ int CmdHFEMVPPSE(const char *cmd) {
 	int res = EMVSelectPSE(activateField, leaveSignalON, PSENum, buf, sizeof(buf), &len, &sw);
 	
 	if (sw)
-		PrintAndLog("APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
+		PrintAndLogEx(INFO, "APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
 
 	if (res)
 		return res;
@@ -228,19 +228,19 @@ int CmdHFEMVGPO(const char *cmd) {
 		ParamLoadDefaults(tlvRoot);
 
 		if (paramsLoadFromFile) {
-			PrintAndLog("Params loading from file...");
+			PrintAndLogEx(INFO, "Params loading from file...");
 			ParamLoadFromJson(tlvRoot);
 		};
 		
 		pdol_data_tlv = dol_process((const struct tlv *)tlvdb_external(0x9f38, datalen, data), tlvRoot, 0x83);
 		if (!pdol_data_tlv){
-			PrintAndLog("ERROR: can't create PDOL TLV.");
+			PrintAndLogEx(ERR, "Can't create PDOL TLV.");
 			tlvdb_free(tlvRoot);
 			return 4;
 		}
 	} else {
 		if (paramsLoadFromFile) {
-			PrintAndLog("WARNING: don't need to load parameters. Sending plain PDOL data...");
+			PrintAndLogEx(WARNING, "Don't need to load parameters. Sending plain PDOL data...");
 		}
 		pdol_data_tlv = &data_tlv;
 	}
@@ -248,11 +248,11 @@ int CmdHFEMVGPO(const char *cmd) {
 	size_t pdol_data_tlv_data_len = 0;
 	unsigned char *pdol_data_tlv_data = tlv_encode(pdol_data_tlv, &pdol_data_tlv_data_len);
 	if (!pdol_data_tlv_data) {
-		PrintAndLog("ERROR: can't create PDOL data.");
+		PrintAndLogEx(ERR, "Can't create PDOL data.");
 		tlvdb_free(tlvRoot);
 		return 4;
 	}
-	PrintAndLog("PDOL data[%d]: %s", pdol_data_tlv_data_len, sprint_hex(pdol_data_tlv_data, pdol_data_tlv_data_len));
+	PrintAndLogEx(INFO, "PDOL data[%d]: %s", pdol_data_tlv_data_len, sprint_hex(pdol_data_tlv_data, pdol_data_tlv_data_len));
 	
 	// exec
 	uint8_t buf[APDU_RES_LEN] = {0};
@@ -265,7 +265,7 @@ int CmdHFEMVGPO(const char *cmd) {
 	tlvdb_free(tlvRoot);
 	
 	if (sw)
-		PrintAndLog("APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
+		PrintAndLogEx(INFO, "APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
 
 	if (res)
 		return res;
@@ -301,7 +301,7 @@ int CmdHFEMVReadRecord(const char *cmd) {
 	CLIParserFree();
 	
 	if (datalen != 2) {
-		PrintAndLog("ERROR: Command needs to have 2 bytes of data");
+		PrintAndLogEx(ERR, "Command needs to have 2 bytes of data");
 		return 1;
 	}
 	
@@ -314,7 +314,7 @@ int CmdHFEMVReadRecord(const char *cmd) {
 	int res = EMVReadRecord(leaveSignalON, data[0], data[1], buf, sizeof(buf), &len, &sw, NULL);
 	
 	if (sw)
-		PrintAndLog("APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
+		PrintAndLogEx(INFO, "APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
 
 	if (res)
 		return res;
@@ -396,24 +396,24 @@ int CmdHFEMVAC(const char *cmd) {
 		ParamLoadDefaults(tlvRoot);
 
 		if (paramsLoadFromFile) {
-			PrintAndLog("Params loading from file...");
+			PrintAndLogEx(INFO, "Params loading from file...");
 			ParamLoadFromJson(tlvRoot);
 		};
 		
 		cdol_data_tlv = dol_process((const struct tlv *)tlvdb_external(0x8c, datalen, data), tlvRoot, 0x01); // 0x01 - dummy tag
 		if (!cdol_data_tlv){
-			PrintAndLog("ERROR: can't create CDOL TLV.");
+			PrintAndLogEx(ERR, "Can't create CDOL TLV.");
 			tlvdb_free(tlvRoot);
 			return 4;
 		}
 	} else {
 		if (paramsLoadFromFile) {
-			PrintAndLog("WARNING: don't need to load parameters. Sending plain CDOL data...");
+			PrintAndLogEx(WARNING, "Don't need to load parameters. Sending plain CDOL data...");
 		}
 		cdol_data_tlv = &data_tlv;
 	}
 	
-	PrintAndLog("CDOL data[%d]: %s", cdol_data_tlv->len, sprint_hex(cdol_data_tlv->value, cdol_data_tlv->len));
+	PrintAndLogEx(INFO, "CDOL data[%d]: %s", cdol_data_tlv->len, sprint_hex(cdol_data_tlv->value, cdol_data_tlv->len));
 
 	// exec
 	uint8_t buf[APDU_RES_LEN] = {0};
@@ -426,7 +426,7 @@ int CmdHFEMVAC(const char *cmd) {
 	tlvdb_free(tlvRoot);
 	
 	if (sw)
-		PrintAndLog("APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
+		PrintAndLogEx(INFO, "APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
 
 	if (res)
 		return res;
@@ -464,15 +464,15 @@ int CmdHFEMVGenerateChallenge(const char *cmd) {
 	int res = EMVGenerateChallenge(leaveSignalON, buf, sizeof(buf), &len, &sw, NULL);
 	
 	if (sw)
-		PrintAndLog("APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
+		PrintAndLogEx(INFO, "APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
 
 	if (res)
 		return res;
 
-	PrintAndLog("Challenge: %s", sprint_hex(buf, len));
+	PrintAndLogEx(SUCCESS, "Challenge: %s", sprint_hex(buf, len));
 	
 	if (len != 4 && len != 8)
-		PrintAndLog("WARNING: length of challenge must be 4 or 8, but it %d", len);
+		PrintAndLogEx(WARNING, "Length of challenge must be 4 or 8, but it %d", len);
 	
 	return 0;
 }
@@ -525,24 +525,24 @@ int CmdHFEMVInternalAuthenticate(const char *cmd) {
 		ParamLoadDefaults(tlvRoot);
 
 		if (paramsLoadFromFile) {
-			PrintAndLog("Params loading from file...");
+			PrintAndLogEx(INFO, "Params loading from file...");
 			ParamLoadFromJson(tlvRoot);
 		};
 		
 		ddol_data_tlv = dol_process((const struct tlv *)tlvdb_external(0x9f49, datalen, data), tlvRoot, 0x01); // 0x01 - dummy tag
 		if (!ddol_data_tlv){
-			PrintAndLog("ERROR: can't create DDOL TLV.");
+			PrintAndLogEx(ERR, "Can't create DDOL TLV.");
 			tlvdb_free(tlvRoot);
 			return 4;
 		}
 	} else {
 		if (paramsLoadFromFile) {
-			PrintAndLog("WARNING: don't need to load parameters. Sending plain DDOL data...");
+			PrintAndLogEx(WARNING, "Don't need to load parameters. Sending plain DDOL data...");
 		}
 		ddol_data_tlv = &data_tlv;
 	}
 	
-	PrintAndLog("DDOL data[%d]: %s", ddol_data_tlv->len, sprint_hex(ddol_data_tlv->value, ddol_data_tlv->len));
+	PrintAndLogEx(INFO, "DDOL data[%d]: %s", ddol_data_tlv->len, sprint_hex(ddol_data_tlv->value, ddol_data_tlv->len));
 	
 	// exec
 	uint8_t buf[APDU_RES_LEN] = {0};
@@ -555,7 +555,7 @@ int CmdHFEMVInternalAuthenticate(const char *cmd) {
 	tlvdb_free(tlvRoot);	
 	
 	if (sw)
-		PrintAndLog("APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
+		PrintAndLogEx(INFO, "APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
 
 	if (res)
 		return res;
@@ -609,13 +609,13 @@ void ProcessGPOResponseFormat1(struct tlvdb *tlvRoot, uint8_t *buf, size_t len,
 		}
 		
 		if (len < 4 || (len - 4) % 4) {
-			PrintAndLog("ERROR: GPO response format1 parsing error. length=%d", len);
+			PrintAndLogEx(ERR, "GPO response format1 parsing error. length=%d", len);
 		} else {
 			// AIP
 			struct tlvdb * f1AIP = tlvdb_fixed(0x82, 2, buf + 2);
 			tlvdb_add(tlvRoot, f1AIP);
 			if (decodeTLV){
-				PrintAndLog("\n* * Decode response format 1 (0x80) AIP and AFL:");
+				PrintAndLogEx(INFO, "\n* * Decode response format 1 (0x80) AIP and AFL:");
 				TLVPrintFromTLV(f1AIP);
 			}
 
@@ -1137,12 +1137,12 @@ int CmdHFEMVScan(const char *cmd) {
 	if (MergeJSON) {
 		root = json_load_file(fname, 0, &error);
 		if (!root) {
-			PrintAndLog("ERROR: json error on line %d: %s", error.line, error.text);
+			PrintAndLogEx(ERR, "Json error on line %d: %s", error.line, error.text);
 			return 1; 
 		}
 		
 		if (!json_is_object(root)) {
-			PrintAndLog("ERROR: Invalid json format. root must be an object.");
+			PrintAndLogEx(ERR, "Invalid json format. root must be an object.");
 			return 1; 
 		}
 	} else {
@@ -1153,7 +1153,7 @@ int CmdHFEMVScan(const char *cmd) {
 	DropField();
 
 	// iso 14443 select
-	PrintAndLog("--> GET UID, ATS.");
+	PrintAndLogEx(NORMAL, "--> GET UID, ATS.");
 	
 	iso14a_card_select_t card;
 	if (Hf14443_4aGetCardData(&card)) {
@@ -1173,7 +1173,7 @@ int CmdHFEMVScan(const char *cmd) {
 	struct tlvdb *tlvSelect = tlvdb_fixed(1, strlen(al), (const unsigned char *)al);
 	
 	// EMV PPSE
-	PrintAndLog("--> PPSE.");
+	PrintAndLogEx(NORMAL, "--> PPSE.");
 	res = EMVSelectPSE(true, true, 2, buf, sizeof(buf), &len, &sw);
 
 	if (!res && sw == 0x9000){
@@ -1199,9 +1199,9 @@ int CmdHFEMVScan(const char *cmd) {
 	} else {
 		// EMV SEARCH with AID list
 		SetAPDULogging(false);
-		PrintAndLog("--> AID search.");
+		PrintAndLogEx(NORMAL, "--> AID search.");
 		if (EMVSearch(false, true, decodeTLV, tlvSelect)) {
-			PrintAndLog("E->Can't found any of EMV AID. Exit...");
+			PrintAndLogEx(ERR, "Can't found any of EMV AID. Exit...");
 			tlvdb_free(tlvSelect);
 			DropField();
 			return 3;
@@ -1218,7 +1218,7 @@ int CmdHFEMVScan(const char *cmd) {
 	tlvdb_free(tlvSelect);
 
 	if (!AIDlen) {
-		PrintAndLog("Can't select AID. EMV AID not found. Exit...");
+		PrintAndLogEx(INFO, "Can't select AID. EMV AID not found. Exit...");
 		DropField();
 		return 4;
 	}
@@ -1231,12 +1231,12 @@ int CmdHFEMVScan(const char *cmd) {
 
 	// EMV SELECT applet
 
-	PrintAndLog("\n-->Selecting AID:%s.", sprint_hex_inrow(AID, AIDlen));
+	PrintAndLogEx(NORMAL, "\n-->Selecting AID:%s.", sprint_hex_inrow(AID, AIDlen));
 	SetAPDULogging(showAPDU);
 	res = EMVSelect(false, true, AID, AIDlen, buf, sizeof(buf), &len, &sw, tlvRoot);
 	
 	if (res) {	
-		PrintAndLog("E->Can't select AID (%d). Exit...", res);
+		PrintAndLogEx(ERR, "Can't select AID (%d). Exit...", res);
 		tlvdb_free(tlvRoot);
 		DropField();
 		return 5;
@@ -1258,13 +1258,13 @@ int CmdHFEMVScan(const char *cmd) {
 	tlvdb_free(fci);
 
 	// create transaction parameters
-	PrintAndLog("-->Init transaction parameters.");
+	PrintAndLogEx(NORMAL, "-->Init transaction parameters.");
 	InitTransactionParameters(tlvRoot, paramLoadJSON, TrType, GenACGPO);
 	
-	PrintAndLog("-->Calc PDOL.");
+	PrintAndLogEx(NORMAL, "-->Calc PDOL.");
 	struct tlv *pdol_data_tlv = dol_process(tlvdb_get(tlvRoot, 0x9f38, NULL), tlvRoot, 0x83);
 	if (!pdol_data_tlv){
-		PrintAndLog("E->Can't create PDOL TLV.");
+		PrintAndLogEx(ERR, "Can't create PDOL TLV.");
 		tlvdb_free(tlvRoot);
 		DropField();
 		return 6;
@@ -1273,21 +1273,21 @@ int CmdHFEMVScan(const char *cmd) {
 	size_t pdol_data_tlv_data_len;
 	unsigned char *pdol_data_tlv_data = tlv_encode(pdol_data_tlv, &pdol_data_tlv_data_len);
 	if (!pdol_data_tlv_data) {
-		PrintAndLog("E->Can't create PDOL data.");
+		PrintAndLogEx(ERR, "Can't create PDOL data.");
 		tlvdb_free(tlvRoot);
 		DropField();
 		return 6;
 	}
-	PrintAndLog("PDOL data[%d]: %s", pdol_data_tlv_data_len, sprint_hex(pdol_data_tlv_data, pdol_data_tlv_data_len));
+	PrintAndLogEx(INFO, "PDOL data[%d]: %s", pdol_data_tlv_data_len, sprint_hex(pdol_data_tlv_data, pdol_data_tlv_data_len));
 
-	PrintAndLog("-->GPO.");
+	PrintAndLogEx(INFO, "-->GPO.");
 	res = EMVGPO(true, pdol_data_tlv_data, pdol_data_tlv_data_len, buf, sizeof(buf), &len, &sw, tlvRoot);
 	
 	free(pdol_data_tlv_data);
 	free(pdol_data_tlv);
 	
 	if (res) {	
-		PrintAndLog("GPO error(%d): %4x. Exit...", res, sw);
+		PrintAndLogEx(ERR, "GPO error(%d): %4x. Exit...", res, sw);
 		tlvdb_free(tlvRoot);
 		DropField();
 		return 7;
@@ -1305,12 +1305,12 @@ int CmdHFEMVScan(const char *cmd) {
 
 	tlvdb_free(gpofci);
 
-	PrintAndLog("-->Read records from AFL.");
+	PrintAndLogEx(INFO, "-->Read records from AFL.");
 	const struct tlv *AFL = tlvdb_get(tlvRoot, 0x94, NULL);
 	
 	while(AFL && AFL->len) {
 		if (AFL->len % 4) {
-			PrintAndLog("E->Wrong AFL length: %d", AFL->len);
+			PrintAndLogEx(ERR, "Wrong AFL length: %d", AFL->len);
 			break;
 		}
 
@@ -1322,7 +1322,7 @@ int CmdHFEMVScan(const char *cmd) {
 			sfijson = json_path_get(root, "$.Application.Records");
 		}
 		if (!json_is_array(sfijson)) {
-			PrintAndLog("E->Internal logic error. `$.Application.Records` is not an array.");
+			PrintAndLogEx(ERR, "Internal logic error. `$.Application.Records` is not an array.");
 			break;
 		}
 		for (int i = 0; i < AFL->len / 4; i++) {
@@ -1333,16 +1333,16 @@ int CmdHFEMVScan(const char *cmd) {
 			
 			PrintAndLog("--->SFI[%02x] start:%02x end:%02x offline:%02x", SFI, SFIstart, SFIend, SFIoffline);
 			if (SFI == 0 || SFI == 31 || SFIstart == 0 || SFIstart > SFIend) {
-				PrintAndLog("SFI ERROR! Skipped...");
+				PrintAndLogEx(ERR, "SFI ERROR! Skipped...");
 				continue;
 			}
 			
 			for(int n = SFIstart; n <= SFIend; n++) {
-				PrintAndLog("---->SFI[%02x] %d", SFI, n);
+				PrintAndLogEx(INFO, "---->SFI[%02x] %d", SFI, n);
 				
 				res = EMVReadRecord(true, SFI, n, buf, sizeof(buf), &len, &sw, tlvRoot);
 				if (res) {
-					PrintAndLog("E->SFI[%02x]. APDU error %4x", SFI, sw);
+					PrintAndLogEx(ERR, "SFI[%02x]. APDU error %4x", SFI, sw);
 					continue;
 				}
 				
@@ -1372,7 +1372,7 @@ int CmdHFEMVScan(const char *cmd) {
 	
 	// getting certificates
 	if (tlvdb_get(tlvRoot, 0x90, NULL)) {
-		PrintAndLog("-->Recovering certificates.");
+		PrintAndLogEx(INFO, "-->Recovering certificates.");
 		PKISetStrictExecution(false);
 		RecoveryCertificates(tlvRoot, root);
 		PKISetStrictExecution(true);
@@ -1386,10 +1386,10 @@ int CmdHFEMVScan(const char *cmd) {
 	
 	res = json_dump_file(root, fname, JSON_INDENT(2));
 	if (res) {
-		PrintAndLog("ERROR: can't save the file: %s", fname);
+		PrintAndLogEx(ERR, "Can't save the file: %s", fname);
 		return 200;
 	}
-	PrintAndLog("File `%s` saved.", fname);
+	PrintAndLogEx(SUCCESS, "File `%s` saved.", fname);
 	
 	// free json object
 	json_decref(root);

From 291321f01df8de585ebdfff8044bd9e9676b0495 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 20 Nov 2018 17:34:29 +0200
Subject: [PATCH 0215/1938] add changelog

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a57924d70..193d9c2fc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -83,6 +83,9 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
  - Added `hf fido` commands that work with FIDO U2F authenticators (@merlokk)
  - Added mbedtls instead of old polarssl (@merlokk)
  - Added jansson (@merlokk)
+ - Added `hf emv scan` - save card's data to json file (@merlokk)
+ - Added `hf emv` `gpo`, `readrec`, `genac`, `challenge`, `intauth` - separate commands from `hf emc exec` (@merlokk)
+ 
 ### Fixed
 - Changed driver file proxmark3.inf to support both old and new Product/Vendor IDs (piwi)
 - Changed start sequence in Qt mode (fix: short commands hangs main Qt thread) (Merlok)

From 38e0d7de322df8d2f531e3a58dcb292342d256a3 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 20 Nov 2018 19:21:36 +0200
Subject: [PATCH 0216/1938] add load json

---
 client/cmdhffido.c | 50 +++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 45 insertions(+), 5 deletions(-)

diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index 11c63d92e..1d374af00 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -720,8 +720,48 @@ int CmdHFFidoAuthenticate(const char *cmd) {
 	return 0;
 };
 
-int CmdHFFido2MakeCredential(const char *cmd) {
+int GetExistsFileNameJson(char *prefixDir, char *reqestedFileName, char *fileName) {
+	fileName[0] = 0x00;
+	strcpy(fileName, get_my_executable_directory());
+	if (fileName[strlen(fileName) - 1] != '/')
+		strcat(fileName, "/");
 	
+	strcat(fileName, prefixDir);
+	if (fileName[strlen(fileName) - 1] != '/')
+		strcat(fileName, "/");
+	
+	strcat(fileName, reqestedFileName);
+	if (!strstr(fileName, ".json"))
+		strcat(fileName, ".json");
+	
+	if (access(fileName, F_OK) < 0) {
+		strcpy(fileName, get_my_executable_directory());
+		if (fileName[strlen(fileName) - 1] != '/')
+			strcat(fileName, "/");
+		
+		strcat(fileName, reqestedFileName);
+		if (!strstr(fileName, ".json"))
+			strcat(fileName, ".json");
+		
+		if (access(fileName, F_OK) < 0) {
+			return 1; // file not found
+		}
+	}
+	return 0;
+}
+
+int CmdHFFido2MakeCredential(const char *cmd) {
+
+
+	json_error_t error;
+	json_t *root = NULL;
+	char fname[300] = {0};
+
+	int res = GetExistsFileNameJson("fido", "fido2", fname);
+	if(res)
+		return res;
+	
+	root = json_load_file(fname, 0, &error);	
 	
 	uint8_t data[2048] = {0};
 	size_t datalen = 0;
@@ -730,7 +770,7 @@ int CmdHFFido2MakeCredential(const char *cmd) {
 	uint16_t sw = 0;
 
 	DropField();
-	int res = FIDOSelect(true, true, buf, sizeof(buf), &len, &sw);
+	res = FIDOSelect(true, true, buf, sizeof(buf), &len, &sw);
 
 	if (res) {
 		PrintAndLog("Can't select authenticator. res=%x. Exit...", res);
@@ -747,17 +787,17 @@ int CmdHFFido2MakeCredential(const char *cmd) {
 	res = FIDO2MakeCredential(data, datalen, buf,  sizeof(buf), &len, &sw);
 	DropField();
 	if (res) {
-		PrintAndLog("Can't execute register command. res=%x. Exit...", res);
+		PrintAndLog("Can't execute make credential command. res=%x. Exit...", res);
 		return res;
 	}
 	
 	if (sw != 0x9000) {
-		PrintAndLog("ERROR execute register command. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
+		PrintAndLog("ERROR execute make credential command. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
 		return 3;
 	}
 	
 	if(buf[0]) {
-		PrintAndLog("FIDO2 ger version error: %d - %s", buf[0], fido2GetCmdErrorDescription(buf[0])); 
+		PrintAndLog("FIDO2 make credential error: %d - %s", buf[0], fido2GetCmdErrorDescription(buf[0])); 
 		return 0;
 	}
 

From ea3472b0e0e6c590a9a6752ea006350385ec63b3 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 20 Nov 2018 19:31:08 +0200
Subject: [PATCH 0217/1938] load json OK

---
 client/cmdhffido.c | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index 1d374af00..a5ad55536 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -720,15 +720,19 @@ int CmdHFFidoAuthenticate(const char *cmd) {
 	return 0;
 };
 
+void CheckSlash(char *fileName) {
+	if ((fileName[strlen(fileName) - 1] != '/') && 
+		(fileName[strlen(fileName) - 1] != '\\'))
+		strcat(fileName, "/");
+}
+
 int GetExistsFileNameJson(char *prefixDir, char *reqestedFileName, char *fileName) {
 	fileName[0] = 0x00;
 	strcpy(fileName, get_my_executable_directory());
-	if (fileName[strlen(fileName) - 1] != '/')
-		strcat(fileName, "/");
+	CheckSlash(fileName);
 	
 	strcat(fileName, prefixDir);
-	if (fileName[strlen(fileName) - 1] != '/')
-		strcat(fileName, "/");
+	CheckSlash(fileName);
 	
 	strcat(fileName, reqestedFileName);
 	if (!strstr(fileName, ".json"))
@@ -736,8 +740,7 @@ int GetExistsFileNameJson(char *prefixDir, char *reqestedFileName, char *fileNam
 	
 	if (access(fileName, F_OK) < 0) {
 		strcpy(fileName, get_my_executable_directory());
-		if (fileName[strlen(fileName) - 1] != '/')
-			strcat(fileName, "/");
+		CheckSlash(fileName);
 		
 		strcat(fileName, reqestedFileName);
 		if (!strstr(fileName, ".json"))
@@ -758,10 +761,16 @@ int CmdHFFido2MakeCredential(const char *cmd) {
 	char fname[300] = {0};
 
 	int res = GetExistsFileNameJson("fido", "fido2", fname);
-	if(res)
+	if(res) {
+		PrintAndLog("ERROR: Can't found json file.");
 		return res;
-	
+	}
+	PrintAndLog("fname: %s\n", fname);
 	root = json_load_file(fname, 0, &error);	
+	if (!root) {
+		PrintAndLog("ERROR: json error on line %d: %s", error.line, error.text);
+		return 1;
+	}
 	
 	uint8_t data[2048] = {0};
 	size_t datalen = 0;

From 7b943a4a16218a630a5f1060850df7075ced2f50 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 21 Nov 2018 19:44:31 +0200
Subject: [PATCH 0218/1938] add check string - if string is hex

---
 client/util.c | 11 +++++++++++
 client/util.h |  1 +
 2 files changed, 12 insertions(+)

diff --git a/client/util.c b/client/util.c
index 5ae4ab862..22490f62a 100644
--- a/client/util.c
+++ b/client/util.c
@@ -150,6 +150,17 @@ int FillBuffer(uint8_t *data, size_t maxDataLength, size_t *dataLength, ...) {
 	return 0;
 }
 
+bool CheckStringIsHEXValue(const char *value) {
+	for (int i = 0; i < strlen(value); i++)
+		if (!isxdigit(value[i]))
+			return false;
+
+	if (strlen(value) % 2)
+		return false;
+	
+	return true;
+}
+
 void hex_to_buffer(const uint8_t *buf, const uint8_t *hex_data, const size_t hex_len, const size_t hex_max_len, 
 	const size_t min_str_len, const size_t spaces_between, bool uppercase) {
 		
diff --git a/client/util.h b/client/util.h
index a069b5012..c9f13870d 100644
--- a/client/util.h
+++ b/client/util.h
@@ -190,6 +190,7 @@ extern void FillFileNameByUID(char *filenamePrefix, uint8_t * uid, const char *e
 // fill buffer from structure [{uint8_t data, size_t length},...]
 extern int FillBuffer(uint8_t *data, size_t maxDataLength, size_t *dataLength, ...);
 
+extern bool CheckStringIsHEXValue(const char *value);
 extern void hex_to_buffer(const uint8_t *buf, const uint8_t *hex_data, const size_t hex_len, 
 						  const size_t hex_max_len, const size_t min_str_len, const size_t spaces_between,
 						  bool uppercase);

From dae4ecc60fdb1b058cb07b214dce2b20b63cfad6 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 21 Nov 2018 19:45:11 +0200
Subject: [PATCH 0219/1938] removed ismap and added not-writable parameters

---
 client/fido/fido2.json | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/client/fido/fido2.json b/client/fido/fido2.json
index ceb55bae8..5da643558 100644
--- a/client/fido/fido2.json
+++ b/client/fido/fido2.json
@@ -1,12 +1,10 @@
 {
   "ClientDataHash": "000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f",
   "RelyingPartyEntity": {
-    "isMap": true,
     "id": "acme.com",
     "name": "Acme"
   },
   "UserEntity": {
-    "isMap": true,
     "id": "00000000000000000000000000000000",
     "icon": "https://pics.acme.com/00/p/aBjjjpqPb.png",
     "name": "johnpsmith@acme.com",
@@ -14,20 +12,17 @@
   },
   "pubKeyCredParams": [
     {
-      "isMap": true,
       "type": "public-key",
       "alg": -7,
-      "name": "ES256"
+      ".name": "ES256"
     },
     {
-      "isMap": true,
       "type": "public-key",
       "alg": -257,
-      "name": "RS256"
+      ".name": "RS256"
     }
   ],
   "options": {
-    "isMap": true,
     "up": false,
     "uv": false,
     "keyStorageDevice": true

From da45b1db390a76d3d62bf9fcf53fe83c72dd50a4 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 21 Nov 2018 19:46:09 +0200
Subject: [PATCH 0220/1938] added jsontocbor function

---
 client/fido/cbortools.c | 105 ++++++++++++++++++++++++++++++++++++++--
 client/fido/cbortools.h |   6 +++
 2 files changed, 107 insertions(+), 4 deletions(-)

diff --git a/client/fido/cbortools.c b/client/fido/cbortools.c
index cd8f905bb..653659dd3 100644
--- a/client/fido/cbortools.c
+++ b/client/fido/cbortools.c
@@ -12,7 +12,7 @@
 
 #include "cbortools.h"
 #include <stdlib.h>
-#include "cbor.h"
+#include "emv/emvjson.h"
 #include "util.h"
 #include "fidocore.h"
 
@@ -199,9 +199,7 @@ int TinyCborPrintFIDOPackage(uint8_t cmdCode, uint8_t *data, size_t length) {
 	res = TinyCborInit(data, length, &cb);
 	if (res)
 		return res;
-	
-	
-	
+		
     CborError err = dumprecursive(cmdCode, &cb, false, 0);
 
 	if (err) {
@@ -210,6 +208,105 @@ int TinyCborPrintFIDOPackage(uint8_t cmdCode, uint8_t *data, size_t length) {
 		return 1;
 	}	
 	
+	return 0;
+}
+
+int JsonObjElmCount(json_t *elm) {
+	int res = 0;
+	const char *key;
+	json_t *value;
+	
+	if (!json_is_object(elm))
+		return 0;
+	
+	json_object_foreach(elm, key, value) {
+		if (strlen(key) > 0 && key[0] != '.')
+			res++;		
+	}
+	
+	return res;
+}
+
+int JsonToCbor(json_t *elm, CborEncoder *encoder) {
+	if (!elm || !encoder)
+		return 1;
+
+	int res;
+	
+	// CBOR map == JSON object
+	if (json_is_object(elm)) {
+		CborEncoder map;
+		const char *key;
+		json_t *value;
+
+		res = cbor_encoder_create_map(encoder, &map, JsonObjElmCount(elm));
+		cbor_check(res);
+		
+		json_object_foreach(elm, key, value) {
+			if (strlen(key) > 0 && key[0] != '.') {
+				res = cbor_encode_text_stringz(&map, key);		
+				cbor_check(res);
+				
+				// RECURSION!
+				JsonToCbor(value, &map);
+			}
+		}
+		
+		res = cbor_encoder_close_container(encoder, &map);
+		cbor_check(res);
+	}
+
+	// CBOR array == JSON array
+	if (json_is_array(elm)) {
+		size_t index;
+		json_t *value;
+		CborEncoder array;
+		
+		res = cbor_encoder_create_array(encoder, &array, json_array_size(elm));
+		cbor_check(res);
+		
+		json_array_foreach(elm, index, value) {
+			// RECURSION!
+			JsonToCbor(value, &array);
+		}
+		
+		res = cbor_encoder_close_container(encoder, &array);
+		cbor_check(res);
+	}
+
+	if (json_is_boolean(elm)) {
+		res = cbor_encode_boolean(encoder, json_is_true(elm));
+		cbor_check(res);
+	}
+
+	if (json_is_integer(elm)) {
+		res = cbor_encode_int(encoder, json_integer_value(elm));
+		cbor_check(res);
+	}
+
+	if (json_is_real(elm)) {
+		res = cbor_encode_float(encoder, json_real_value(elm));
+		cbor_check(res);
+	}
+
+	if (json_is_string(elm)) {
+		const char * val = json_string_value(elm);
+		if (CheckStringIsHEXValue(val)) {
+			size_t datalen = 0;
+			uint8_t data[4096] = {0};
+			res = JsonLoadBufAsHex(elm, "$", data, sizeof(data), &datalen);
+			if (res)
+				return 100;
+
+			res = cbor_encode_byte_string(encoder, data, datalen);
+			cbor_check(res);			
+		} else {
+			res = cbor_encode_text_stringz(encoder, val);
+			cbor_check(res);
+		}
+	}
+	
+	
 	
 	return 0;
 }
diff --git a/client/fido/cbortools.h b/client/fido/cbortools.h
index bb442f1f8..6de69e2eb 100644
--- a/client/fido/cbortools.h
+++ b/client/fido/cbortools.h
@@ -15,7 +15,13 @@
 
 #include <stddef.h>
 #include <stdint.h>
+#include <jansson.h>
+#include <cbor.h>
+
+#define cbor_check_if(r) if ((r) != CborNoError) {return r;} else
+#define cbor_check(r) if ((r) != CborNoError) return r;
 
 extern int TinyCborPrintFIDOPackage(uint8_t cmdCode, uint8_t *data, size_t length);
+extern int JsonToCbor(json_t *elm, CborEncoder *encoder);
 
 #endif /* __CBORTOOLS_H__ */

From f705402b7af6c4868795b0f5a0274715e124b26d Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 21 Nov 2018 19:46:57 +0200
Subject: [PATCH 0221/1938] make credentional command works. and refactoring

---
 client/cmdhffido.c     |  69 ++++--------------
 client/fido/fidocore.c | 157 +++++++++++++++++++++++++++++++++++++++++
 client/fido/fidocore.h |  12 ++++
 3 files changed, 182 insertions(+), 56 deletions(-)

diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index a5ad55536..13fc0eaf8 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -36,7 +36,6 @@
 #include "util.h"
 #include "ui.h"
 #include "proxmark3.h"
-#include "cmdhf14a.h"
 #include "mifare.h"
 #include "emv/emvcore.h"
 #include "emv/emvjson.h"
@@ -50,57 +49,6 @@
 
 static int CmdHelp(const char *Cmd);
 
-int FIDOSelect(bool ActivateField, bool LeaveFieldON, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
-	uint8_t data[] = {0xA0, 0x00, 0x00, 0x06, 0x47, 0x2F, 0x00, 0x01};
-	
-	return EMVSelect(ActivateField, LeaveFieldON, data, sizeof(data), Result, MaxResultLen, ResultLen, sw, NULL);
-}
-
-int FIDOExchange(sAPDU apdu, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
-	int res = EMVExchange(true, apdu, Result, MaxResultLen, ResultLen, sw, NULL);
-	if (res == 5) // apdu result (sw) not a 0x9000
-		res = 0;
-	// software chaining
-	while (!res && (*sw >> 8) == 0x61) {
-		size_t oldlen = *ResultLen;
-		res = EMVExchange(true, (sAPDU){0x00, 0xC0, 0x00, 0x00, 0x00, NULL}, &Result[oldlen], MaxResultLen - oldlen, ResultLen, sw, NULL);
-		if (res == 5) // apdu result (sw) not a 0x9000
-			res = 0;
-		
-		*ResultLen += oldlen;
-		if (*ResultLen > MaxResultLen) 
-			return 100;
-	}
-	return res;
-}
-
-int FIDORegister(uint8_t *params, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
-	return FIDOExchange((sAPDU){0x00, 0x01, 0x03, 0x00, 64, params}, Result, MaxResultLen, ResultLen, sw);
-}
-
-int FIDOAuthentication(uint8_t *params, uint8_t paramslen, uint8_t controlb, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
-	return FIDOExchange((sAPDU){0x00, 0x02, controlb, 0x00, paramslen, params}, Result, MaxResultLen, ResultLen, sw);
-}
-
-int FIDO2GetInfo(uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
-	uint8_t data[] = {fido2CmdGetInfo};
-	return FIDOExchange((sAPDU){0x80, 0x10, 0x00, 0x00, sizeof(data), data}, Result, MaxResultLen, ResultLen, sw);
-}
-
-int FIDO2MakeCredential(uint8_t *params, uint8_t paramslen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
-	uint8_t data[paramslen + 1];
-	data[0] = fido2CmdMakeCredential;
-	memcpy(&data[1], params, paramslen);
-	return FIDOExchange((sAPDU){0x80, 0x10, 0x00, 0x00, sizeof(data), data}, Result, MaxResultLen, ResultLen, sw);
-}
-
-int FIDO2GetAssertion(uint8_t *params, uint8_t paramslen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
-	uint8_t data[paramslen + 1];
-	data[0] = fido2CmdGetAssertion;
-	memcpy(&data[1], params, paramslen);
-	return FIDOExchange((sAPDU){0x80, 0x10, 0x00, 0x00, sizeof(data), data}, Result, MaxResultLen, ResultLen, sw);
-}
-
 int CmdHFFidoInfo(const char *cmd) {
 	
 	if (cmd && strlen(cmd) > 0)
@@ -754,15 +702,13 @@ int GetExistsFileNameJson(char *prefixDir, char *reqestedFileName, char *fileNam
 }
 
 int CmdHFFido2MakeCredential(const char *cmd) {
-
-
 	json_error_t error;
 	json_t *root = NULL;
 	char fname[300] = {0};
 
 	int res = GetExistsFileNameJson("fido", "fido2", fname);
 	if(res) {
-		PrintAndLog("ERROR: Can't found json file.");
+		PrintAndLog("ERROR: Can't found the json file.");
 		return res;
 	}
 	PrintAndLog("fname: %s\n", fname);
@@ -793,6 +739,13 @@ int CmdHFFido2MakeCredential(const char *cmd) {
 		return 2;
 	}
 
+	res = FIDO2CreateMakeCredentionalReq(root, data, sizeof(data), &datalen);
+	if (res)
+		return res;
+	
+	PrintAndLog("CBOR make credentional request:");
+	TinyCborPrintFIDOPackage(fido2CmdMakeCredential, data, datalen);
+	
 	res = FIDO2MakeCredential(data, datalen, buf,  sizeof(buf), &len, &sw);
 	DropField();
 	if (res) {
@@ -810,7 +763,11 @@ int CmdHFFido2MakeCredential(const char *cmd) {
 		return 0;
 	}
 
-	PrintAndLog("res[%d]: %s", len, sprint_hex(buf, len));
+	PrintAndLog("MakeCredential result (%d) OK.", len);
+	PrintAndLog("CBOR make credentional response:");
+	TinyCborPrintFIDOPackage(fido2CmdMakeCredential, &buf[1], len - 1);
+
+	json_decref(root);
 
 	return 0;
 };
diff --git a/client/fido/fidocore.c b/client/fido/fidocore.c
index 1b41d2722..0e4099a88 100644
--- a/client/fido/fidocore.c
+++ b/client/fido/fidocore.c
@@ -11,6 +11,10 @@
 //
 
 #include "fidocore.h"
+#include "emv/emvcore.h"
+#include "emv/emvjson.h"
+#include <cbor.h>
+#include "cbortools.h"
 
 typedef struct {
 	uint8_t ErrorCode;
@@ -122,3 +126,156 @@ char *fido2GetCmdMemberDescription(uint8_t cmdCode, uint8_t memberNum) {
 	return NULL;
 }
 
+int FIDOSelect(bool ActivateField, bool LeaveFieldON, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
+	uint8_t data[] = {0xA0, 0x00, 0x00, 0x06, 0x47, 0x2F, 0x00, 0x01};
+	
+	return EMVSelect(ActivateField, LeaveFieldON, data, sizeof(data), Result, MaxResultLen, ResultLen, sw, NULL);
+}
+
+int FIDOExchange(sAPDU apdu, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
+	int res = EMVExchange(true, apdu, Result, MaxResultLen, ResultLen, sw, NULL);
+	if (res == 5) // apdu result (sw) not a 0x9000
+		res = 0;
+	// software chaining
+	while (!res && (*sw >> 8) == 0x61) {
+		size_t oldlen = *ResultLen;
+		res = EMVExchange(true, (sAPDU){0x00, 0xC0, 0x00, 0x00, 0x00, NULL}, &Result[oldlen], MaxResultLen - oldlen, ResultLen, sw, NULL);
+		if (res == 5) // apdu result (sw) not a 0x9000
+			res = 0;
+		
+		*ResultLen += oldlen;
+		if (*ResultLen > MaxResultLen) 
+			return 100;
+	}
+	return res;
+}
+
+int FIDORegister(uint8_t *params, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
+	return FIDOExchange((sAPDU){0x00, 0x01, 0x03, 0x00, 64, params}, Result, MaxResultLen, ResultLen, sw);
+}
+
+int FIDOAuthentication(uint8_t *params, uint8_t paramslen, uint8_t controlb, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
+	return FIDOExchange((sAPDU){0x00, 0x02, controlb, 0x00, paramslen, params}, Result, MaxResultLen, ResultLen, sw);
+}
+
+int FIDO2GetInfo(uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
+	uint8_t data[] = {fido2CmdGetInfo};
+	return FIDOExchange((sAPDU){0x80, 0x10, 0x00, 0x00, sizeof(data), data}, Result, MaxResultLen, ResultLen, sw);
+}
+
+int FIDO2MakeCredential(uint8_t *params, uint8_t paramslen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
+	uint8_t data[paramslen + 1];
+	data[0] = fido2CmdMakeCredential;
+	memcpy(&data[1], params, paramslen);
+	return FIDOExchange((sAPDU){0x80, 0x10, 0x00, 0x00, sizeof(data), data}, Result, MaxResultLen, ResultLen, sw);
+}
+
+int FIDO2GetAssertion(uint8_t *params, uint8_t paramslen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
+	uint8_t data[paramslen + 1];
+	data[0] = fido2CmdGetAssertion;
+	memcpy(&data[1], params, paramslen);
+	return FIDOExchange((sAPDU){0x80, 0x10, 0x00, 0x00, sizeof(data), data}, Result, MaxResultLen, ResultLen, sw);
+}
+
+#define fido_check_if(r) if ((r) != CborNoError) {return r;} else
+#define fido_check(r) if ((r) != CborNoError) return r;
+
+int CBOREncodeClientDataHash(json_t *root, CborEncoder *encoder) {
+	uint8_t buf[100] = {0};
+	size_t jlen;
+
+	JsonLoadBufAsHex(root, "$.ClientDataHash", buf, sizeof(buf), &jlen);
+	
+	// fill with 0x00 if not found
+	if (!jlen)
+		jlen = 32;
+	
+	int res = cbor_encode_byte_string(encoder, buf, jlen);
+	fido_check(res);
+
+	return 0;
+}
+
+int CBOREncodeRp(json_t *root, CborEncoder *encoder) {
+	json_t *elm = json_object_get(root, "RelyingPartyEntity");
+	if (!elm)
+		return 1;
+	
+	JsonToCbor(elm, encoder);
+
+	return 0;
+}
+
+int CBOREncodeUser(json_t *root, CborEncoder *encoder) {
+	json_t *elm = json_object_get(root, "UserEntity");
+	if (!elm)
+		return 1;
+
+	JsonToCbor(elm, encoder);
+	
+	return 0;
+}
+
+int CBOREncodePubKeyParams(json_t *root, CborEncoder *encoder) {
+	json_t *elm = json_object_get(root, "pubKeyCredParams");
+	if (!elm)
+		return 1;
+
+	JsonToCbor(elm, encoder);
+	
+	return 0;
+}
+
+int FIDO2CreateMakeCredentionalReq(json_t *root, uint8_t *data, size_t maxdatalen, size_t *datalen) {
+	if (datalen)
+		*datalen = 0;
+	if (!root || !data || !maxdatalen)
+		return 1;
+
+	int res;
+	CborEncoder encoder;
+	CborEncoder map;
+	
+	cbor_encoder_init(&encoder, data, maxdatalen, 0);
+
+	// create main map
+	res = cbor_encoder_create_map(&encoder, &map, 4);
+	fido_check_if(res) {
+		// clientDataHash
+		res = cbor_encode_uint(&map, 1);
+		fido_check_if(res) {
+			res = CBOREncodeClientDataHash(root, &map);
+			fido_check(res);
+		}
+
+		// rp
+		res = cbor_encode_uint(&map, 2);
+		fido_check_if(res) {
+			res = CBOREncodeRp(root, &map);
+			fido_check(res);
+		}
+
+		// user
+		res = cbor_encode_uint(&map, 3);
+		fido_check_if(res) {
+			res = CBOREncodeUser(root, &map);
+			fido_check(res);
+		}
+
+		// pubKeyCredParams
+		res = cbor_encode_uint(&map, 4);
+		fido_check_if(res) {
+			res = CBOREncodePubKeyParams(root, &map);
+			fido_check(res);
+		}
+	
+	}
+	res = cbor_encoder_close_container(&encoder, &map);
+	fido_check(res);
+	
+	size_t len = cbor_encoder_get_buffer_size(&encoder, data);
+	if (datalen)
+		*datalen = len;
+	
+	return 0;
+}
diff --git a/client/fido/fidocore.h b/client/fido/fidocore.h
index 1ed5556cf..d16c42190 100644
--- a/client/fido/fidocore.h
+++ b/client/fido/fidocore.h
@@ -14,6 +14,8 @@
 
 #include <stddef.h>
 #include <stdint.h>
+#include <jansson.h>
+#include "cmdhf14a.h"
 
 typedef enum {
 	fido2CmdMakeCredential		= 0x01,
@@ -30,7 +32,17 @@ typedef enum  {
 	ptResponse,
 } fido2PacketType;
 
+extern int FIDOSelect(bool ActivateField, bool LeaveFieldON, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw);
+extern int FIDOExchange(sAPDU apdu, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw);
+extern int FIDORegister(uint8_t *params, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw);
+extern int FIDOAuthentication(uint8_t *params, uint8_t paramslen, uint8_t controlb, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw);
+extern int FIDO2GetInfo(uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw);
+extern int FIDO2MakeCredential(uint8_t *params, uint8_t paramslen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw);
+extern int FIDO2GetAssertion(uint8_t *params, uint8_t paramslen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw);
+
 extern char *fido2GetCmdMemberDescription(uint8_t cmdCode, uint8_t memberNum);
 extern char *fido2GetCmdErrorDescription(uint8_t errorCode);
 
+extern int FIDO2CreateMakeCredentionalReq(json_t *root, uint8_t *data, size_t maxdatalen, size_t *datalen);
+
 #endif /* __FIDOCORE_H__ */

From 979a14d9785791404a615bd2b414dc71a2e8ec87 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 21 Nov 2018 20:11:41 +0200
Subject: [PATCH 0222/1938] added CBOR description for queries

---
 client/cmdhffido.c      |  8 ++++----
 client/fido/cbortools.c | 10 +++++-----
 client/fido/cbortools.h |  2 +-
 client/fido/fidocore.c  | 37 ++++++++++++++++++++++++++++++++-----
 client/fido/fidocore.h  |  2 +-
 5 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index 13fc0eaf8..f5f10b70a 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -116,7 +116,7 @@ int CmdHFFidoInfo(const char *cmd) {
 //		}
 
 		PrintAndLog("FIDO2 version CBOR decoded:"); 
-		TinyCborPrintFIDOPackage(fido2CmdGetInfo, &buf[1], len - 1);
+		TinyCborPrintFIDOPackage(fido2CmdGetInfo, true, &buf[1], len - 1);
 	} else {
 		PrintAndLog("FIDO2 version length error"); 
 	}
@@ -744,7 +744,7 @@ int CmdHFFido2MakeCredential(const char *cmd) {
 		return res;
 	
 	PrintAndLog("CBOR make credentional request:");
-	TinyCborPrintFIDOPackage(fido2CmdMakeCredential, data, datalen);
+	TinyCborPrintFIDOPackage(fido2CmdMakeCredential, false, data, datalen);
 	
 	res = FIDO2MakeCredential(data, datalen, buf,  sizeof(buf), &len, &sw);
 	DropField();
@@ -763,9 +763,9 @@ int CmdHFFido2MakeCredential(const char *cmd) {
 		return 0;
 	}
 
-	PrintAndLog("MakeCredential result (%d) OK.", len);
+	PrintAndLog("MakeCredential result (%d b) OK.", len);
 	PrintAndLog("CBOR make credentional response:");
-	TinyCborPrintFIDOPackage(fido2CmdMakeCredential, &buf[1], len - 1);
+	TinyCborPrintFIDOPackage(fido2CmdMakeCredential, true, &buf[1], len - 1);
 
 	json_decref(root);
 
diff --git a/client/fido/cbortools.c b/client/fido/cbortools.c
index 653659dd3..51041cefb 100644
--- a/client/fido/cbortools.c
+++ b/client/fido/cbortools.c
@@ -122,7 +122,7 @@ static CborError dumpelm(CborValue *it, bool *got_next, int nestingLevel) {
 	return CborNoError;
 }
 
-static CborError dumprecursive(uint8_t cmdCode, CborValue *it, bool isMapType, int nestingLevel) {
+static CborError dumprecursive(uint8_t cmdCode, bool isResponse, CborValue *it, bool isMapType, int nestingLevel) {
 	int elmCount = 0;
 	while (!cbor_value_at_end(it)) {
 		CborError err;
@@ -142,7 +142,7 @@ static CborError dumprecursive(uint8_t cmdCode, CborValue *it, bool isMapType, i
 			err = cbor_value_enter_container(it, &recursed);
 			if (err)
 				return err;       // parse error
-			err = dumprecursive(cmdCode, &recursed, (type == CborMapType), nestingLevel + 1);
+			err = dumprecursive(cmdCode, isResponse, &recursed, (type == CborMapType), nestingLevel + 1);
 			if (err)
 				return err;       // parse error
 			err = cbor_value_leave_container(it, &recursed);
@@ -161,7 +161,7 @@ static CborError dumprecursive(uint8_t cmdCode, CborValue *it, bool isMapType, i
 			if (cmdCode > 0 && nestingLevel == 1 && isMapType && !(elmCount % 2)) {
 				int64_t val;
 				cbor_value_get_int64(it, &val);
-				char *desc = fido2GetCmdMemberDescription(cmdCode, val);
+				char *desc = fido2GetCmdMemberDescription(cmdCode, isResponse, val);
 				if (desc)
 					printf(" (%s)", desc);
 			}
@@ -193,14 +193,14 @@ int TinyCborInit(uint8_t *data, size_t length, CborValue *cb) {
 	return 0;
 }
 
-int TinyCborPrintFIDOPackage(uint8_t cmdCode, uint8_t *data, size_t length) {
+int TinyCborPrintFIDOPackage(uint8_t cmdCode, bool isResponse, uint8_t *data, size_t length) {
 	CborValue cb;
 	int res;
 	res = TinyCborInit(data, length, &cb);
 	if (res)
 		return res;
 		
-    CborError err = dumprecursive(cmdCode, &cb, false, 0);
+    CborError err = dumprecursive(cmdCode, isResponse, &cb, false, 0);
 
 	if (err) {
 		fprintf(stderr, "CBOR parsing failure at offset %d: %s\n",
diff --git a/client/fido/cbortools.h b/client/fido/cbortools.h
index 6de69e2eb..4019f1f70 100644
--- a/client/fido/cbortools.h
+++ b/client/fido/cbortools.h
@@ -21,7 +21,7 @@
 #define cbor_check_if(r) if ((r) != CborNoError) {return r;} else
 #define cbor_check(r) if ((r) != CborNoError) return r;
 
-extern int TinyCborPrintFIDOPackage(uint8_t cmdCode, uint8_t *data, size_t length);
+extern int TinyCborPrintFIDOPackage(uint8_t cmdCode, bool isResponse, uint8_t *data, size_t length);
 extern int JsonToCbor(json_t *elm, CborEncoder *encoder);
 
 #endif /* __CBORTOOLS_H__ */
diff --git a/client/fido/fidocore.c b/client/fido/fidocore.c
index 0e4099a88..572a00022 100644
--- a/client/fido/fidocore.c
+++ b/client/fido/fidocore.c
@@ -84,12 +84,30 @@ fido2Desc_t fido2CmdGetInfoRespDesc[] = {
 	{fido2CmdMakeCredential, 	ptResponse, 0x01, "fmt"},
 	{fido2CmdMakeCredential, 	ptResponse, 0x02, "authData"},
 	{fido2CmdMakeCredential, 	ptResponse, 0x03, "attStmt"},
+
+	{fido2CmdMakeCredential, 	ptQuery,    0x01, "clientDataHash"},
+	{fido2CmdMakeCredential, 	ptQuery,    0x02, "rp"},
+	{fido2CmdMakeCredential, 	ptQuery,    0x03, "user"},
+	{fido2CmdMakeCredential, 	ptQuery,    0x04, "pubKeyCredParams"},
+	{fido2CmdMakeCredential, 	ptQuery,    0x05, "excludeList"},
+	{fido2CmdMakeCredential, 	ptQuery,    0x06, "extensions"},
+	{fido2CmdMakeCredential, 	ptQuery,    0x07, "options"},
+	{fido2CmdMakeCredential, 	ptQuery,    0x08, "pinAuth"},
+	{fido2CmdMakeCredential, 	ptQuery,    0x09, "pinProtocol"},
 	
 	{fido2CmdGetAssertion, 		ptResponse, 0x01, "credential"},
 	{fido2CmdGetAssertion, 		ptResponse, 0x02, "authData"},
 	{fido2CmdGetAssertion, 		ptResponse, 0x03, "signature"},
 	{fido2CmdGetAssertion, 		ptResponse, 0x04, "publicKeyCredentialUserEntity"},
 	{fido2CmdGetAssertion, 		ptResponse, 0x05, "numberOfCredentials"},
+
+	{fido2CmdGetAssertion, 		ptQuery,    0x01, "rpId"},
+	{fido2CmdGetAssertion, 		ptQuery,    0x02, "clientDataHash"},
+	{fido2CmdGetAssertion, 		ptQuery,    0x03, "allowList"},
+	{fido2CmdGetAssertion, 		ptQuery,    0x04, "extensions"},
+	{fido2CmdGetAssertion, 		ptQuery,    0x05, "options"},
+	{fido2CmdGetAssertion, 		ptQuery,    0x06, "pinAuth"},
+	{fido2CmdGetAssertion, 		ptQuery,    0x07, "pinProtocol"},
 	
 	{fido2CmdGetNextAssertion, 	ptResponse, 0x01, "credential"},
 	{fido2CmdGetNextAssertion, 	ptResponse, 0x02, "authData"},
@@ -103,9 +121,18 @@ fido2Desc_t fido2CmdGetInfoRespDesc[] = {
 	{fido2CmdGetInfo, 			ptResponse, 0x05, "maxMsgSize"},
 	{fido2CmdGetInfo, 			ptResponse, 0x06, "pinProtocols"},
 
-	{fido2CmdClientPIN, 		ptResponse, 0x06, "keyAgreement"},
-	{fido2CmdClientPIN, 		ptResponse, 0x06, "pinToken"},
-	{fido2CmdClientPIN, 		ptResponse, 0x06, "retries"},
+	{fido2CmdClientPIN, 		ptResponse, 0x01, "keyAgreement"},
+	{fido2CmdClientPIN, 		ptResponse, 0x02, "pinToken"},
+	{fido2CmdClientPIN, 		ptResponse, 0x03, "retries"},
+
+	{fido2CmdClientPIN, 		ptQuery,    0x01, "pinProtocol"},
+	{fido2CmdClientPIN, 		ptQuery,    0x02, "subCommand"},
+	{fido2CmdClientPIN, 		ptQuery,    0x03, "keyAgreement"},
+	{fido2CmdClientPIN, 		ptQuery,    0x04, "pinAuth"},
+	{fido2CmdClientPIN, 		ptQuery,    0x05, "newPinEnc"},
+	{fido2CmdClientPIN, 		ptQuery,    0x06, "pinHashEnc"},
+	{fido2CmdClientPIN, 		ptQuery,    0x07, "getKeyAgreement"},
+	{fido2CmdClientPIN, 		ptQuery,    0x08, "getRetries"},
 };
 
 char *fido2GetCmdErrorDescription(uint8_t errorCode) {
@@ -116,10 +143,10 @@ char *fido2GetCmdErrorDescription(uint8_t errorCode) {
 	return fido2Errors[0].Description;
 }
 
-char *fido2GetCmdMemberDescription(uint8_t cmdCode, uint8_t memberNum) {
+char *fido2GetCmdMemberDescription(uint8_t cmdCode, bool isResponse, uint8_t memberNum) {
 	for (int i = 0; i < sizeof(fido2CmdGetInfoRespDesc) / sizeof(fido2Desc_t); i++)
 		if (fido2CmdGetInfoRespDesc[i].Command == cmdCode &&
-			fido2CmdGetInfoRespDesc[i].PckType == ptResponse &&
+			fido2CmdGetInfoRespDesc[i].PckType == (isResponse ? ptResponse : ptQuery) &&
 			fido2CmdGetInfoRespDesc[i].MemberNumber == memberNum )
 			return fido2CmdGetInfoRespDesc[i].Description;
 
diff --git a/client/fido/fidocore.h b/client/fido/fidocore.h
index d16c42190..e87de1922 100644
--- a/client/fido/fidocore.h
+++ b/client/fido/fidocore.h
@@ -40,7 +40,7 @@ extern int FIDO2GetInfo(uint8_t *Result, size_t MaxResultLen, size_t *ResultLen,
 extern int FIDO2MakeCredential(uint8_t *params, uint8_t paramslen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw);
 extern int FIDO2GetAssertion(uint8_t *params, uint8_t paramslen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw);
 
-extern char *fido2GetCmdMemberDescription(uint8_t cmdCode, uint8_t memberNum);
+extern char *fido2GetCmdMemberDescription(uint8_t cmdCode, bool isResponse, uint8_t memberNum);
 extern char *fido2GetCmdErrorDescription(uint8_t errorCode);
 
 extern int FIDO2CreateMakeCredentionalReq(json_t *root, uint8_t *data, size_t maxdatalen, size_t *datalen);

From e33ddad40cff5b2bd1c920873ed2cb4c96d3836b Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 21 Nov 2018 20:35:57 +0200
Subject: [PATCH 0223/1938] added options and some refactoring

---
 client/fido/fido2.json |  4 ++--
 client/fido/fidocore.c | 44 ++++++++++++++----------------------------
 2 files changed, 17 insertions(+), 31 deletions(-)

diff --git a/client/fido/fido2.json b/client/fido/fido2.json
index 5da643558..b847e891b 100644
--- a/client/fido/fido2.json
+++ b/client/fido/fido2.json
@@ -23,8 +23,8 @@
     }
   ],
   "options": {
-    "up": false,
     "uv": false,
-    "keyStorageDevice": true
+    ".up": false,
+    ".keyStorageDevice": true
   }
 }
\ No newline at end of file
diff --git a/client/fido/fidocore.c b/client/fido/fidocore.c
index 572a00022..57a89560a 100644
--- a/client/fido/fidocore.c
+++ b/client/fido/fidocore.c
@@ -223,34 +223,14 @@ int CBOREncodeClientDataHash(json_t *root, CborEncoder *encoder) {
 	return 0;
 }
 
-int CBOREncodeRp(json_t *root, CborEncoder *encoder) {
-	json_t *elm = json_object_get(root, "RelyingPartyEntity");
+int CBOREncodeElm(json_t *root, char *rootElmId, CborEncoder *encoder) {
+	json_t *elm = json_object_get(root, rootElmId);
 	if (!elm)
 		return 1;
 	
-	JsonToCbor(elm, encoder);
+	int res = JsonToCbor(elm, encoder);
 
-	return 0;
-}
-
-int CBOREncodeUser(json_t *root, CborEncoder *encoder) {
-	json_t *elm = json_object_get(root, "UserEntity");
-	if (!elm)
-		return 1;
-
-	JsonToCbor(elm, encoder);
-	
-	return 0;
-}
-
-int CBOREncodePubKeyParams(json_t *root, CborEncoder *encoder) {
-	json_t *elm = json_object_get(root, "pubKeyCredParams");
-	if (!elm)
-		return 1;
-
-	JsonToCbor(elm, encoder);
-	
-	return 0;
+	return res;
 }
 
 int FIDO2CreateMakeCredentionalReq(json_t *root, uint8_t *data, size_t maxdatalen, size_t *datalen) {
@@ -266,7 +246,7 @@ int FIDO2CreateMakeCredentionalReq(json_t *root, uint8_t *data, size_t maxdatale
 	cbor_encoder_init(&encoder, data, maxdatalen, 0);
 
 	// create main map
-	res = cbor_encoder_create_map(&encoder, &map, 4);
+	res = cbor_encoder_create_map(&encoder, &map, 5);
 	fido_check_if(res) {
 		// clientDataHash
 		res = cbor_encode_uint(&map, 1);
@@ -278,24 +258,30 @@ int FIDO2CreateMakeCredentionalReq(json_t *root, uint8_t *data, size_t maxdatale
 		// rp
 		res = cbor_encode_uint(&map, 2);
 		fido_check_if(res) {
-			res = CBOREncodeRp(root, &map);
+			res = CBOREncodeElm(root, "RelyingPartyEntity", &map);
 			fido_check(res);
 		}
 
 		// user
 		res = cbor_encode_uint(&map, 3);
 		fido_check_if(res) {
-			res = CBOREncodeUser(root, &map);
+			res = CBOREncodeElm(root, "UserEntity", &map);
 			fido_check(res);
 		}
 
 		// pubKeyCredParams
 		res = cbor_encode_uint(&map, 4);
 		fido_check_if(res) {
-			res = CBOREncodePubKeyParams(root, &map);
+			res = CBOREncodeElm(root, "pubKeyCredParams", &map);
+			fido_check(res);
+		}
+
+		// options
+		res = cbor_encode_uint(&map, 7);
+		fido_check_if(res) {
+			res = CBOREncodeElm(root, "options", &map);
 			fido_check(res);
 		}
-	
 	}
 	res = cbor_encoder_close_container(&encoder, &map);
 	fido_check(res);

From 7bb24819adb8c53b8a3ab21c10e78928da03de02 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 21 Nov 2018 20:39:26 +0200
Subject: [PATCH 0224/1938] small fix

---
 client/fido/fido2.json | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/client/fido/fido2.json b/client/fido/fido2.json
index b847e891b..88abf48e1 100644
--- a/client/fido/fido2.json
+++ b/client/fido/fido2.json
@@ -5,7 +5,7 @@
     "name": "Acme"
   },
   "UserEntity": {
-    "id": "00000000000000000000000000000000",
+    "id": "00000000000000000000000000000001",
     "icon": "https://pics.acme.com/00/p/aBjjjpqPb.png",
     "name": "johnpsmith@acme.com",
     "displayName": "John P. Smith"
@@ -24,7 +24,6 @@
   ],
   "options": {
     "uv": false,
-    ".up": false,
-    ".keyStorageDevice": true
+    "rk": false,
   }
 }
\ No newline at end of file

From 156f9b677c060670daf9bb0ac9793b297ae53f20 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Thu, 22 Nov 2018 13:41:44 +0200
Subject: [PATCH 0225/1938] refactoring

---
 client/cmdhffido.c     | 56 +---------------------------------
 client/fido/fido2.json |  2 +-
 client/fido/fidocore.c | 69 ++++++++++++++++++++++++++++++++++++++++++
 client/fido/fidocore.h |  2 ++
 4 files changed, 73 insertions(+), 56 deletions(-)

diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index f5f10b70a..19566075f 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -43,7 +43,6 @@
 #include "cliparser/cliparser.h"
 #include "crypto/asn1utils.h"
 #include "crypto/libpcrypto.h"
-#include "fido/additional_ca.h"
 #include "fido/cbortools.h"
 #include "fido/fidocore.h"
 
@@ -326,60 +325,7 @@ int CmdHFFidoRegister(const char *cmd) {
 		PrintAndLog("----------------DER TLV-----------------");
 	}
 	
-	// load CA's
-	mbedtls_x509_crt cacert;
-	mbedtls_x509_crt_init(&cacert);
-	res = mbedtls_x509_crt_parse(&cacert, (const unsigned char *) additional_ca_pem, additional_ca_pem_len);
-	if (res < 0) {
-		PrintAndLog("ERROR: CA parse certificate returned -0x%x - %s", -res, ecdsa_get_error(res));
-	}
-	if (verbose) 
-		PrintAndLog("CA load OK. %d skipped", res);
-	
-	// load DER certificate from authenticator's data
-	mbedtls_x509_crt cert;
-	mbedtls_x509_crt_init(&cert);
-	res = mbedtls_x509_crt_parse_der(&cert, &buf[derp], derLen);
-	if (res) {
-		PrintAndLog("ERROR: DER parse returned 0x%x - %s", (res<0)?-res:res, ecdsa_get_error(res));
-	}
-	
-	// get certificate info
-	char linfo[300] = {0};
-	if (verbose) {
-		mbedtls_x509_crt_info(linfo, sizeof(linfo), "  ", &cert);
-		PrintAndLog("DER certificate info:\n%s", linfo);
-	}
-	
-	// verify certificate
-	uint32_t verifyflags = 0;
-	res = mbedtls_x509_crt_verify(&cert, &cacert, NULL, NULL, &verifyflags, NULL, NULL);
-	if (res) {
-		PrintAndLog("ERROR: DER verify returned 0x%x - %s", (res<0)?-res:res, ecdsa_get_error(res));
-	} else {
-		PrintAndLog("Certificate OK.");
-	}
-	
-	if (verbose) {
-		memset(linfo, 0x00, sizeof(linfo));
-		mbedtls_x509_crt_verify_info(linfo, sizeof(linfo), "  ", verifyflags);
-		PrintAndLog("Verification info:\n%s", linfo);
-	}
-	
-	// get public key
-	res = ecdsa_public_key_from_pk(&cert.pk, public_key, sizeof(public_key));
-	if (res) {
-		PrintAndLog("ERROR: getting public key from certificate 0x%x - %s", (res<0)?-res:res, ecdsa_get_error(res));
-	} else {
-		if (verbose)
-			PrintAndLog("Got a public key from certificate:\n%s", sprint_hex_inrow(public_key, 65));
-	}
-
-	if (verbose)
-		PrintAndLog("------------------DER-------------------");
-
-	mbedtls_x509_crt_free(&cert);
-	mbedtls_x509_crt_free(&cacert);
+    FIDOCheckDERAndGetKey(&buf[derp], derLen, verbose, public_key, sizeof(public_key));
 	
 	// get hash
 	int hashp = 1 + 65 + 1 + keyHandleLen + derLen;
diff --git a/client/fido/fido2.json b/client/fido/fido2.json
index 88abf48e1..c158ef117 100644
--- a/client/fido/fido2.json
+++ b/client/fido/fido2.json
@@ -24,6 +24,6 @@
   ],
   "options": {
     "uv": false,
-    "rk": false,
+    "rk": false
   }
 }
\ No newline at end of file
diff --git a/client/fido/fidocore.c b/client/fido/fidocore.c
index 57a89560a..137b991f3 100644
--- a/client/fido/fidocore.c
+++ b/client/fido/fidocore.c
@@ -15,6 +15,12 @@
 #include "emv/emvjson.h"
 #include <cbor.h>
 #include "cbortools.h"
+#include <mbedtls/x509_crt.h>
+#include <mbedtls/x509.h>
+#include <mbedtls/pk.h>
+#include "crypto/asn1utils.h"
+#include "crypto/libpcrypto.h"
+#include "fido/additional_ca.h"
 
 typedef struct {
 	uint8_t ErrorCode;
@@ -204,6 +210,67 @@ int FIDO2GetAssertion(uint8_t *params, uint8_t paramslen, uint8_t *Result, size_
 	return FIDOExchange((sAPDU){0x80, 0x10, 0x00, 0x00, sizeof(data), data}, Result, MaxResultLen, ResultLen, sw);
 }
 
+int FIDOCheckDERAndGetKey(uint8_t *der, size_t derLen, bool verbose, uint8_t *publicKey, size_t publicKeyMaxLen) {
+	int res;
+	
+	// load CA's
+	mbedtls_x509_crt cacert;
+	mbedtls_x509_crt_init(&cacert);
+	res = mbedtls_x509_crt_parse(&cacert, (const unsigned char *) additional_ca_pem, additional_ca_pem_len);
+	if (res < 0) {
+		PrintAndLog("ERROR: CA parse certificate returned -0x%x - %s", -res, ecdsa_get_error(res));
+	}
+	if (verbose) 
+		PrintAndLog("CA load OK. %d skipped", res);
+	
+	// load DER certificate from authenticator's data
+	mbedtls_x509_crt cert;
+	mbedtls_x509_crt_init(&cert);
+	res = mbedtls_x509_crt_parse_der(&cert, der, derLen);
+	if (res) {
+		PrintAndLog("ERROR: DER parse returned 0x%x - %s", (res<0)?-res:res, ecdsa_get_error(res));
+	}
+	
+	// get certificate info
+	char linfo[300] = {0};
+	if (verbose) {
+		mbedtls_x509_crt_info(linfo, sizeof(linfo), "  ", &cert);
+		PrintAndLog("DER certificate info:\n%s", linfo);
+	}
+	
+	// verify certificate
+	uint32_t verifyflags = 0;
+	res = mbedtls_x509_crt_verify(&cert, &cacert, NULL, NULL, &verifyflags, NULL, NULL);
+	if (res) {
+		PrintAndLog("ERROR: DER verify returned 0x%x - %s", (res<0)?-res:res, ecdsa_get_error(res));
+	} else {
+		PrintAndLog("Certificate OK.");
+	}
+	
+	if (verbose) {
+		memset(linfo, 0x00, sizeof(linfo));
+		mbedtls_x509_crt_verify_info(linfo, sizeof(linfo), "  ", verifyflags);
+		PrintAndLog("Verification info:\n%s", linfo);
+	}
+	
+	// get public key
+	res = ecdsa_public_key_from_pk(&cert.pk, publicKey, publicKeyMaxLen);
+	if (res) {
+		PrintAndLog("ERROR: getting public key from certificate 0x%x - %s", (res<0)?-res:res, ecdsa_get_error(res));
+	} else {
+		if (verbose)
+			PrintAndLog("Got a public key from certificate:\n%s", sprint_hex_inrow(publicKey, 65));
+	}
+
+	if (verbose)
+		PrintAndLog("------------------DER-------------------");
+
+	mbedtls_x509_crt_free(&cert);
+	mbedtls_x509_crt_free(&cacert);
+	
+	return 0;
+}
+
 #define fido_check_if(r) if ((r) != CborNoError) {return r;} else
 #define fido_check(r) if ((r) != CborNoError) return r;
 
@@ -292,3 +359,5 @@ int FIDO2CreateMakeCredentionalReq(json_t *root, uint8_t *data, size_t maxdatale
 	
 	return 0;
 }
+
+
diff --git a/client/fido/fidocore.h b/client/fido/fidocore.h
index e87de1922..97c3f0f06 100644
--- a/client/fido/fidocore.h
+++ b/client/fido/fidocore.h
@@ -40,6 +40,8 @@ extern int FIDO2GetInfo(uint8_t *Result, size_t MaxResultLen, size_t *ResultLen,
 extern int FIDO2MakeCredential(uint8_t *params, uint8_t paramslen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw);
 extern int FIDO2GetAssertion(uint8_t *params, uint8_t paramslen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw);
 
+extern int FIDOCheckDERAndGetKey(uint8_t *der, size_t derLen, bool verbose, uint8_t *publicKey, size_t publicKeyMaxLen);
+
 extern char *fido2GetCmdMemberDescription(uint8_t cmdCode, bool isResponse, uint8_t memberNum);
 extern char *fido2GetCmdErrorDescription(uint8_t errorCode);
 

From 7943ba7d91005147944b8e439da031572df65878 Mon Sep 17 00:00:00 2001
From: Jean-Michel Picod <jmichel.p@gmail.com>
Date: Thu, 22 Nov 2018 23:57:30 +0100
Subject: [PATCH 0226/1938] Fix logic op being used instead of bitwise op

---
 client/cmdsmartcard.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index c9997f241..59172b9c8 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -344,7 +344,7 @@ int CmdSmartUpgrade(const char *Cmd) {
 		PrintAndLogEx(WARNING, "timeout while waiting for reply.");
 		return 1;
 	}
-	if ( (resp.arg[0] && 0xFF ) )
+	if ( (resp.arg[0] & 0xFF ) )
 		PrintAndLogEx(SUCCESS, "Smartcard socket firmware upgraded successful");
 	else
 		PrintAndLogEx(FAILED, "Smartcard socket firmware updating failed");

From a37082a825079238a891be747e23f346e993a045 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Fri, 23 Nov 2018 19:47:30 +0200
Subject: [PATCH 0227/1938] added some cbor tools

---
 client/fido/cbortools.c | 75 +++++++++++++++++++++++++++++++++++++++++
 client/fido/cbortools.h |  5 +++
 2 files changed, 80 insertions(+)

diff --git a/client/fido/cbortools.c b/client/fido/cbortools.c
index 51041cefb..5c35bdae5 100644
--- a/client/fido/cbortools.c
+++ b/client/fido/cbortools.c
@@ -310,3 +310,78 @@ int JsonToCbor(json_t *elm, CborEncoder *encoder) {
 	
 	return 0;
 }
+
+int CborMapGetKeyById(CborParser *parser, CborValue *map, uint8_t *data, size_t dataLen, int key) {
+	CborValue cb;
+
+	CborError err = cbor_parser_init(data, dataLen, 0, parser, &cb);
+	cbor_check(err);
+
+	if (cbor_value_get_type(&cb) != CborMapType)
+		return 1;
+		
+	err = cbor_value_enter_container(&cb, map);
+	cbor_check(err);
+
+	int64_t indx;
+	while (!cbor_value_at_end(map)) {
+		// check number
+		if (cbor_value_get_type(map) != CborIntegerType)
+			return 1;
+
+		cbor_value_get_int64(map, &indx);    
+		printf("--id %lld\n", (long long)indx);
+		
+		err = cbor_value_advance(map);
+		cbor_check(err);
+		
+		if (indx == key)
+			return 0;
+
+		// pass value
+		err = cbor_value_advance(map);
+		cbor_check(err);
+	}
+
+	err = cbor_value_leave_container(&cb, map);
+	cbor_check(err);
+
+	return 2;
+}
+
+CborError CborGetBinStringValue(CborValue *elm, uint8_t *data, size_t maxdatalen, size_t *datalen) {
+	if (datalen)
+		*datalen = 0;
+	
+	size_t slen = 0;
+
+	CborError res = cbor_value_copy_byte_string(elm, data, &slen, elm);
+	cbor_check(res);
+
+	if (datalen)
+		*datalen = slen;
+
+	return CborNoError;	
+};
+
+CborError CborGetStringValue(CborValue *elm, char *data, size_t maxdatalen, size_t *datalen) {
+	if (datalen)
+		*datalen = 0;
+	
+	size_t slen = 0;
+
+	CborError res = cbor_value_copy_text_string(elm, data, &slen, elm);
+	cbor_check(res);
+
+	if (datalen)
+		*datalen = slen;
+
+	return CborNoError;	
+};
+
+CborError CborGetStringValueBuf(CborValue *elm) {
+	static char stringBuf[2048];
+	memset(stringBuf, 0x00, sizeof(stringBuf));
+	
+	return CborGetStringValue(elm, stringBuf, sizeof(stringBuf), NULL);
+};
\ No newline at end of file
diff --git a/client/fido/cbortools.h b/client/fido/cbortools.h
index 4019f1f70..3d41c7db6 100644
--- a/client/fido/cbortools.h
+++ b/client/fido/cbortools.h
@@ -24,4 +24,9 @@
 extern int TinyCborPrintFIDOPackage(uint8_t cmdCode, bool isResponse, uint8_t *data, size_t length);
 extern int JsonToCbor(json_t *elm, CborEncoder *encoder);
 
+extern int CborMapGetKeyById(CborParser *parser, CborValue *map, uint8_t *data, size_t dataLen, int key);
+extern CborError CborGetBinStringValue(CborValue *elm, uint8_t *data, size_t maxdatalen, size_t *datalen);
+extern CborError CborGetStringValue(CborValue *elm, char *data, size_t maxdatalen, size_t *datalen);
+extern CborError CborGetStringValueBuf(CborValue *elm);
+
 #endif /* __CBORTOOLS_H__ */

From c57a2c2c41c923943fa4a2ce9398eb25e49d4ad2 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Fri, 23 Nov 2018 19:48:17 +0200
Subject: [PATCH 0228/1938] added map credential parsing. not completed

---
 client/cmdhffido.c | 137 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 137 insertions(+)

diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index 19566075f..098ae7fa0 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -647,10 +647,144 @@ int GetExistsFileNameJson(char *prefixDir, char *reqestedFileName, char *fileNam
 	return 0;
 }
 
+int MakeCredentionalParseRes(uint8_t *data, size_t dataLen, bool verbose) {
+	CborParser parser;
+	CborValue map, mapsmt, array;
+	int res;
+	char *buf;
+	uint8_t *ubuf;
+	size_t n;
+	
+	// fmt
+	res = CborMapGetKeyById(&parser, &map, data, dataLen, 1);
+	if (res)
+		return res;
+	
+	res = cbor_value_dup_text_string(&map, &buf, &n, &map);
+	cbor_check(res);
+	PrintAndLog("format: %s", buf);
+	free(buf);
+
+	// authData
+	res = CborMapGetKeyById(&parser, &map, data, dataLen, 2);
+	if (res)
+		return res;
+	res = cbor_value_dup_byte_string(&map, &ubuf, &n, &map);
+	cbor_check(res);
+	
+	PrintAndLog("authData: %s", sprint_hex(ubuf, n));
+	
+	PrintAndLog("RP ID Hash: %s", sprint_hex(ubuf, 32));
+	
+	// check RP ID Hash
+
+	PrintAndLog("Flags 0x%02x:", ubuf[32]);
+	if (!ubuf[32])
+		PrintAndLog("none");
+	if (ubuf[32] & 0x01)
+		PrintAndLog("up - user presence");
+	if (ubuf[32] & 0x04)
+		PrintAndLog("uv - user verification (fingerprint scan or a PIN or ...)");
+	if (ubuf[32] & 0x40)
+		PrintAndLog("at - ");
+	if (ubuf[32] & 0x80)
+		PrintAndLog("ed - ");
+
+	uint32_t cntr =  (uint32_t)bytes_to_num(&ubuf[33], 4);
+	PrintAndLog("Counter: %d", cntr);
+	
+	// attestation data
+	PrintAndLog("AAGUID: %s", sprint_hex(&ubuf[37], 16));
+	
+	// Credential ID
+	uint8_t cridlen = (uint16_t)bytes_to_num(&ubuf[53], 2);
+	PrintAndLog("Credential id[%d]: %s", cridlen, sprint_hex(&ubuf[55], cridlen));
+	
+	//Credentional public key (COSE_KEY)
+	uint16_t cplen = n - 55 - cridlen;
+	PrintAndLog("Credentional public key (COSE_KEY)[%d]: %s", cplen, sprint_hex(&ubuf[55 + cridlen], cplen));
+	
+	free(ubuf);
+
+	// attStmt - we are check only as DER certificate
+	int64_t alg = 0;
+	uint8_t sign[128] = {0};
+	size_t signLen = 0;
+	uint8_t der[4097] = {0};
+	size_t derLen = 0;
+	
+	res = CborMapGetKeyById(&parser, &map, data, dataLen, 3);
+	if (res)
+		return res;
+
+	res = cbor_value_enter_container(&map, &mapsmt);
+	cbor_check(res);
+	
+printf("--1\n");
+	while (!cbor_value_at_end(&mapsmt)) {
+		char key[100] = {0};
+		res = CborGetStringValue(&mapsmt, key, sizeof(key), &n);
+		cbor_check(res);
+		printf("--key: %s\n", key);
+		if (!strcmp(key, "alg")) {
+			cbor_value_get_int64(&mapsmt, &alg);    
+			PrintAndLog("Alg [%lld]", (long long)alg);
+			res = cbor_value_advance_fixed(&mapsmt);
+			cbor_check(res);
+		}
+
+		if (!strcmp(key, "sig")) {
+			res = CborGetBinStringValue(&mapsmt, sign, sizeof(sign), &signLen);
+			cbor_check(res);
+			PrintAndLog("signature [%d] %s", signLen, sprint_hex(sign, signLen));
+		}
+
+		if (!strcmp(key, "x5c")) {
+			res = CborGetBinStringValue(&mapsmt, der, sizeof(der), &derLen);
+			cbor_check(res);
+			PrintAndLog("signature [%d] %s", signLen, sprint_hex(der, derLen));
+		}		
+	}
+	res = cbor_value_leave_container(&map, &mapsmt);
+	cbor_check(res);
+	
+	
+/*	res = cbor_value_enter_container(&map, &array);
+	cbor_check(res);
+	CborType type = cbor_value_get_type(&array);
+	printf("--type:%d\n", type);
+	while (!cbor_value_at_end(&array)) {
+	res = cbor_value_dup_text_string(&array, &ubuf, &n, &array);
+	cbor_check(res);
+	PrintAndLog("DER: %s", ubuf);
+	PrintAndLog("DER: %s", sprint_hex(ubuf, n));
+	}
+	res = cbor_value_leave_container(&map, &array);
+	cbor_check(res);
+	
+	PrintAndLog("DER: %s", ubuf);
+	PrintAndLog("DER: %s", sprint_hex(ubuf, n));
+	
+	uint8_t public_key[65] = {0};
+
+	// print DER certificate in TLV view
+	if (true) { // showDERTLV
+		PrintAndLog("----------------DER TLV-----------------");
+		asn1_print(ubuf, n, "  ");
+		PrintAndLog("----------------DER TLV-----------------");
+	}
+    FIDOCheckDERAndGetKey(ubuf, n, verbose, public_key, sizeof(public_key));
+*/
+	free(ubuf);
+	
+	return 0;
+}
+
 int CmdHFFido2MakeCredential(const char *cmd) {
 	json_error_t error;
 	json_t *root = NULL;
 	char fname[300] = {0};
+	bool verbose = true;
 
 	int res = GetExistsFileNameJson("fido", "fido2", fname);
 	if(res) {
@@ -713,6 +847,9 @@ int CmdHFFido2MakeCredential(const char *cmd) {
 	PrintAndLog("CBOR make credentional response:");
 	TinyCborPrintFIDOPackage(fido2CmdMakeCredential, true, &buf[1], len - 1);
 
+	// parse returned cbor
+	MakeCredentionalParseRes(&buf[1], len - 1, verbose);
+	
 	json_decref(root);
 
 	return 0;

From 0bbdc7f1500067febd4358a8d2a1fb9fc7ea177a Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Sat, 24 Nov 2018 14:57:36 +0200
Subject: [PATCH 0229/1938] added CborGetArrayBinStringValue

---
 client/fido/cbortools.c | 39 +++++++++++++++++++++++++++++++++++----
 client/fido/cbortools.h |  1 +
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/client/fido/cbortools.c b/client/fido/cbortools.c
index 5c35bdae5..5bfb76b9a 100644
--- a/client/fido/cbortools.c
+++ b/client/fido/cbortools.c
@@ -329,8 +329,7 @@ int CborMapGetKeyById(CborParser *parser, CborValue *map, uint8_t *data, size_t
 		if (cbor_value_get_type(map) != CborIntegerType)
 			return 1;
 
-		cbor_value_get_int64(map, &indx);    
-		printf("--id %lld\n", (long long)indx);
+		cbor_value_get_int64(map, &indx);
 		
 		err = cbor_value_advance(map);
 		cbor_check(err);
@@ -349,11 +348,43 @@ int CborMapGetKeyById(CborParser *parser, CborValue *map, uint8_t *data, size_t
 	return 2;
 }
 
+CborError CborGetArrayBinStringValue(CborValue *elm, uint8_t *data, size_t maxdatalen, size_t *datalen, uint8_t *delimeter) {
+	CborValue array;
+	if (datalen)
+		*datalen = 0;
+	
+	size_t slen = maxdatalen;
+	size_t totallen = 0;
+
+	CborError res = cbor_value_enter_container(elm, &array);
+	cbor_check(res);
+	
+	while (!cbor_value_at_end(&array)) {
+		res = cbor_value_copy_byte_string(&array, &data[totallen], &slen, &array);
+		cbor_check(res);
+		
+		totallen += slen;
+		if (delimeter) {
+			memcpy(&data[totallen], delimeter, 1); // TODO: multibyte
+			totallen += 1;
+		}
+		slen = maxdatalen - totallen;
+	}
+
+	res = cbor_value_leave_container(elm, &array);
+	cbor_check(res);
+
+	if (datalen)
+		*datalen = totallen;
+
+	return CborNoError;	
+};
+
 CborError CborGetBinStringValue(CborValue *elm, uint8_t *data, size_t maxdatalen, size_t *datalen) {
 	if (datalen)
 		*datalen = 0;
 	
-	size_t slen = 0;
+	size_t slen = maxdatalen;
 
 	CborError res = cbor_value_copy_byte_string(elm, data, &slen, elm);
 	cbor_check(res);
@@ -368,7 +399,7 @@ CborError CborGetStringValue(CborValue *elm, char *data, size_t maxdatalen, size
 	if (datalen)
 		*datalen = 0;
 	
-	size_t slen = 0;
+	size_t slen = maxdatalen;
 
 	CborError res = cbor_value_copy_text_string(elm, data, &slen, elm);
 	cbor_check(res);
diff --git a/client/fido/cbortools.h b/client/fido/cbortools.h
index 3d41c7db6..4d8b023ee 100644
--- a/client/fido/cbortools.h
+++ b/client/fido/cbortools.h
@@ -25,6 +25,7 @@ extern int TinyCborPrintFIDOPackage(uint8_t cmdCode, bool isResponse, uint8_t *d
 extern int JsonToCbor(json_t *elm, CborEncoder *encoder);
 
 extern int CborMapGetKeyById(CborParser *parser, CborValue *map, uint8_t *data, size_t dataLen, int key);
+extern CborError CborGetArrayBinStringValue(CborValue *elm, uint8_t *data, size_t maxdatalen, size_t *datalen, uint8_t *delimeter);
 extern CborError CborGetBinStringValue(CborValue *elm, uint8_t *data, size_t maxdatalen, size_t *datalen);
 extern CborError CborGetStringValue(CborValue *elm, char *data, size_t maxdatalen, size_t *datalen);
 extern CborError CborGetStringValueBuf(CborValue *elm);

From 376abd2d9291534466e90a02d6828e144dcaee01 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Sat, 24 Nov 2018 14:57:55 +0200
Subject: [PATCH 0230/1938] get DER works

---
 client/cmdhffido.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index 098ae7fa0..4ed0a8e1a 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -720,7 +720,6 @@ int MakeCredentionalParseRes(uint8_t *data, size_t dataLen, bool verbose) {
 	res = cbor_value_enter_container(&map, &mapsmt);
 	cbor_check(res);
 	
-printf("--1\n");
 	while (!cbor_value_at_end(&mapsmt)) {
 		char key[100] = {0};
 		res = CborGetStringValue(&mapsmt, key, sizeof(key), &n);
@@ -736,13 +735,13 @@ printf("--1\n");
 		if (!strcmp(key, "sig")) {
 			res = CborGetBinStringValue(&mapsmt, sign, sizeof(sign), &signLen);
 			cbor_check(res);
-			PrintAndLog("signature [%d] %s", signLen, sprint_hex(sign, signLen));
+			PrintAndLog("signature [%d]: %s", signLen, sprint_hex(sign, signLen));
 		}
 
 		if (!strcmp(key, "x5c")) {
-			res = CborGetBinStringValue(&mapsmt, der, sizeof(der), &derLen);
+			res = CborGetArrayBinStringValue(&mapsmt, der, sizeof(der), &derLen, NULL);
 			cbor_check(res);
-			PrintAndLog("signature [%d] %s", signLen, sprint_hex(der, derLen));
+			PrintAndLog("der [%d]: %s", derLen, sprint_hex(der, derLen));
 		}		
 	}
 	res = cbor_value_leave_container(&map, &mapsmt);

From 6c63e74ffb3e47d6594d585035ce4227ef1f6ec6 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Sat, 24 Nov 2018 15:05:08 +0200
Subject: [PATCH 0231/1938] decode DER certificate

---
 client/cmdhffido.c | 34 ++++++++--------------------------
 1 file changed, 8 insertions(+), 26 deletions(-)

diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index 4ed0a8e1a..9ee4e5f1a 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -647,9 +647,9 @@ int GetExistsFileNameJson(char *prefixDir, char *reqestedFileName, char *fileNam
 	return 0;
 }
 
-int MakeCredentionalParseRes(uint8_t *data, size_t dataLen, bool verbose) {
+int MakeCredentionalParseRes(uint8_t *data, size_t dataLen, bool verbose, bool showDERTLV) {
 	CborParser parser;
-	CborValue map, mapsmt, array;
+	CborValue map, mapsmt;
 	int res;
 	char *buf;
 	uint8_t *ubuf;
@@ -741,40 +741,21 @@ int MakeCredentionalParseRes(uint8_t *data, size_t dataLen, bool verbose) {
 		if (!strcmp(key, "x5c")) {
 			res = CborGetArrayBinStringValue(&mapsmt, der, sizeof(der), &derLen, NULL);
 			cbor_check(res);
-			PrintAndLog("der [%d]: %s", derLen, sprint_hex(der, derLen));
+			PrintAndLog("DER [%d]: %s", derLen, sprint_hex(der, derLen));
 		}		
 	}
 	res = cbor_value_leave_container(&map, &mapsmt);
 	cbor_check(res);
 	
-	
-/*	res = cbor_value_enter_container(&map, &array);
-	cbor_check(res);
-	CborType type = cbor_value_get_type(&array);
-	printf("--type:%d\n", type);
-	while (!cbor_value_at_end(&array)) {
-	res = cbor_value_dup_text_string(&array, &ubuf, &n, &array);
-	cbor_check(res);
-	PrintAndLog("DER: %s", ubuf);
-	PrintAndLog("DER: %s", sprint_hex(ubuf, n));
-	}
-	res = cbor_value_leave_container(&map, &array);
-	cbor_check(res);
-	
-	PrintAndLog("DER: %s", ubuf);
-	PrintAndLog("DER: %s", sprint_hex(ubuf, n));
-	
 	uint8_t public_key[65] = {0};
 
 	// print DER certificate in TLV view
-	if (true) { // showDERTLV
+	if (showDERTLV) {
 		PrintAndLog("----------------DER TLV-----------------");
-		asn1_print(ubuf, n, "  ");
+		asn1_print(der, derLen, "  ");
 		PrintAndLog("----------------DER TLV-----------------");
 	}
-    FIDOCheckDERAndGetKey(ubuf, n, verbose, public_key, sizeof(public_key));
-*/
-	free(ubuf);
+    FIDOCheckDERAndGetKey(der, derLen, verbose, public_key, sizeof(public_key));
 	
 	return 0;
 }
@@ -784,6 +765,7 @@ int CmdHFFido2MakeCredential(const char *cmd) {
 	json_t *root = NULL;
 	char fname[300] = {0};
 	bool verbose = true;
+	bool showDERTLV = true;
 
 	int res = GetExistsFileNameJson("fido", "fido2", fname);
 	if(res) {
@@ -847,7 +829,7 @@ int CmdHFFido2MakeCredential(const char *cmd) {
 	TinyCborPrintFIDOPackage(fido2CmdMakeCredential, true, &buf[1], len - 1);
 
 	// parse returned cbor
-	MakeCredentionalParseRes(&buf[1], len - 1, verbose);
+	MakeCredentionalParseRes(&buf[1], len - 1, verbose, showDERTLV);
 	
 	json_decref(root);
 

From 1a0f7e93dec69472042d0af2a7992af559f917f1 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Sat, 24 Nov 2018 23:36:02 +0200
Subject: [PATCH 0232/1938] refactoring and some functions in cbortools

---
 client/cmdhffido.c      |  2 +-
 client/fido/cbortools.c | 43 ++++++++++++++++++++++++++++++++++++++---
 client/fido/cbortools.h |  4 +++-
 3 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index 9ee4e5f1a..0e81aca6e 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -739,7 +739,7 @@ int MakeCredentionalParseRes(uint8_t *data, size_t dataLen, bool verbose, bool s
 		}
 
 		if (!strcmp(key, "x5c")) {
-			res = CborGetArrayBinStringValue(&mapsmt, der, sizeof(der), &derLen, NULL);
+			res = CborGetArrayBinStringValue(&mapsmt, der, sizeof(der), &derLen);
 			cbor_check(res);
 			PrintAndLog("DER [%d]: %s", derLen, sprint_hex(der, derLen));
 		}		
diff --git a/client/fido/cbortools.c b/client/fido/cbortools.c
index 5bfb76b9a..cae5cdc7f 100644
--- a/client/fido/cbortools.c
+++ b/client/fido/cbortools.c
@@ -348,7 +348,11 @@ int CborMapGetKeyById(CborParser *parser, CborValue *map, uint8_t *data, size_t
 	return 2;
 }
 
-CborError CborGetArrayBinStringValue(CborValue *elm, uint8_t *data, size_t maxdatalen, size_t *datalen, uint8_t *delimeter) {
+CborError CborGetArrayBinStringValue(CborValue *elm, uint8_t *data, size_t maxdatalen, size_t *datalen) {
+	return CborGetArrayBinStringValueEx(elm, data, maxdatalen, datalen, NULL, 0);
+}
+
+CborError CborGetArrayBinStringValueEx(CborValue *elm, uint8_t *data, size_t maxdatalen, size_t *datalen, uint8_t *delimeter, size_t delimeterlen) {
 	CborValue array;
 	if (datalen)
 		*datalen = 0;
@@ -365,8 +369,8 @@ CborError CborGetArrayBinStringValue(CborValue *elm, uint8_t *data, size_t maxda
 		
 		totallen += slen;
 		if (delimeter) {
-			memcpy(&data[totallen], delimeter, 1); // TODO: multibyte
-			totallen += 1;
+			memcpy(&data[totallen], delimeter, delimeterlen);
+			totallen += delimeterlen;
 		}
 		slen = maxdatalen - totallen;
 	}
@@ -395,6 +399,39 @@ CborError CborGetBinStringValue(CborValue *elm, uint8_t *data, size_t maxdatalen
 	return CborNoError;	
 };
 
+CborError CborGetArrayStringValue(CborValue *elm, char *data, size_t maxdatalen, size_t *datalen, char *delimeter) {
+	CborValue array;
+	if (datalen)
+		*datalen = 0;
+	
+	size_t slen = maxdatalen;
+	size_t totallen = 0;
+
+	CborError res = cbor_value_enter_container(elm, &array);
+	cbor_check(res);
+	
+	while (!cbor_value_at_end(&array)) {
+		res = cbor_value_copy_text_string(&array, &data[totallen], &slen, &array);
+		cbor_check(res);
+		
+		totallen += slen;
+		if (delimeter) {
+			strcat(data, delimeter);
+			totallen += strlen(delimeter);
+		}
+		slen = maxdatalen - totallen;
+		data[totallen] = 0x00;
+	}
+
+	res = cbor_value_leave_container(elm, &array);
+	cbor_check(res);
+
+	if (datalen)
+		*datalen = totallen;
+
+	return CborNoError;	
+};
+
 CborError CborGetStringValue(CborValue *elm, char *data, size_t maxdatalen, size_t *datalen) {
 	if (datalen)
 		*datalen = 0;
diff --git a/client/fido/cbortools.h b/client/fido/cbortools.h
index 4d8b023ee..a57b4b761 100644
--- a/client/fido/cbortools.h
+++ b/client/fido/cbortools.h
@@ -25,8 +25,10 @@ extern int TinyCborPrintFIDOPackage(uint8_t cmdCode, bool isResponse, uint8_t *d
 extern int JsonToCbor(json_t *elm, CborEncoder *encoder);
 
 extern int CborMapGetKeyById(CborParser *parser, CborValue *map, uint8_t *data, size_t dataLen, int key);
-extern CborError CborGetArrayBinStringValue(CborValue *elm, uint8_t *data, size_t maxdatalen, size_t *datalen, uint8_t *delimeter);
+extern CborError CborGetArrayBinStringValue(CborValue *elm, uint8_t *data, size_t maxdatalen, size_t *datalen);
+extern CborError CborGetArrayBinStringValueEx(CborValue *elm, uint8_t *data, size_t maxdatalen, size_t *datalen, uint8_t *delimeter, size_t delimeterlen);
 extern CborError CborGetBinStringValue(CborValue *elm, uint8_t *data, size_t maxdatalen, size_t *datalen);
+extern CborError CborGetArrayStringValue(CborValue *elm, char *data, size_t maxdatalen, size_t *datalen, char *delimeter);
 extern CborError CborGetStringValue(CborValue *elm, char *data, size_t maxdatalen, size_t *datalen);
 extern CborError CborGetStringValueBuf(CborValue *elm);
 

From 9e89da3c0cbf93964ffaeaf84ef50a5170af4826 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Sun, 25 Nov 2018 00:12:06 +0200
Subject: [PATCH 0233/1938] remove debug

---
 client/cmdhffido.c      | 1 -
 client/fido/cbortools.c | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index 0e81aca6e..7969b7b94 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -724,7 +724,6 @@ int MakeCredentionalParseRes(uint8_t *data, size_t dataLen, bool verbose, bool s
 		char key[100] = {0};
 		res = CborGetStringValue(&mapsmt, key, sizeof(key), &n);
 		cbor_check(res);
-		printf("--key: %s\n", key);
 		if (!strcmp(key, "alg")) {
 			cbor_value_get_int64(&mapsmt, &alg);    
 			PrintAndLog("Alg [%lld]", (long long)alg);
diff --git a/client/fido/cbortools.c b/client/fido/cbortools.c
index cae5cdc7f..1693e6858 100644
--- a/client/fido/cbortools.c
+++ b/client/fido/cbortools.c
@@ -452,4 +452,4 @@ CborError CborGetStringValueBuf(CborValue *elm) {
 	memset(stringBuf, 0x00, sizeof(stringBuf));
 	
 	return CborGetStringValue(elm, stringBuf, sizeof(stringBuf), NULL);
-};
\ No newline at end of file
+};

From 3beb14a25c51e51c1c527173ac72ff79fb31f5db Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sun, 25 Nov 2018 14:35:47 +0100
Subject: [PATCH 0234/1938] chg: 'hf iclass lookup' -  its not an online
 command...

---
 client/cmdhficlass.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index 368aaad2e..6cc2aa191 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -2290,7 +2290,6 @@ int CmdHFiClassLookUp(const char *Cmd) {
 
 	t1 = msclock() - t1;
 	PrintAndLogEx(NORMAL, "\nTime in iclass : %.0f seconds\n", (float)t1/1000.0);
-	DropField();
 	free(prekey);
 	free(keyBlock);
 	PrintAndLogEx(NORMAL, "");		
@@ -2527,7 +2526,7 @@ static command_t CommandTable[] = {
 	{"encryptblk",  CmdHFiClassEncryptBlk,     	1,	"<BlockData> Encrypt given block data"},
 	{"list",        CmdHFiClassList,           	0,	"            (Deprecated) List iClass history"},
 	{"loclass",     CmdHFiClass_loclass,       	1,	"[options..] Use loclass to perform bruteforce of reader attack dump"},
-	{"lookup",		CmdHFiClassLookUp,     		0,	"[options..] Uses authentication trace to check for key in dictionary file"},
+	{"lookup",		CmdHFiClassLookUp,     		1,	"[options..] Uses authentication trace to check for key in dictionary file"},
 	{"managekeys",  CmdHFiClassManageKeys,     	1,	"[options..] Manage the keys to use with iClass"},
 	{"permutekey",  CmdHFiClassPermuteKey,		0,	"            Permute function from 'heart of darkness' paper"},
 	{"readblk",     CmdHFiClass_ReadBlock,      0,	"[options..] Authenticate and Read iClass block"},

From 1099c6923d44ba293f84bf78f3c8b19eb9f665a3 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Mon, 26 Nov 2018 16:12:28 +0200
Subject: [PATCH 0235/1938] added COSE algorithms

---
 client/Makefile        |   1 +
 client/cmdhffido.c     |   3 +-
 client/fido/cose.c     | 130 +++++++++++++++++++++++++++++++++++++++++
 client/fido/cose.h     |  23 ++++++++
 client/fido/fidocore.c |   2 +-
 5 files changed, 157 insertions(+), 2 deletions(-)
 create mode 100644 client/fido/cose.c
 create mode 100644 client/fido/cose.h

diff --git a/client/Makefile b/client/Makefile
index 1e88e5dc9..766163c09 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -111,6 +111,7 @@ CMDSRCS =	crapto1/crapto1.c \
 			mfkey.c \
 			tea.c \
 			fido/additional_ca.c \
+			fido/cose.c \
 			fido/cbortools.c \
 			fido/fidocore.c \
 			crypto/asn1dump.c \
diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index 7969b7b94..8b0ceb2f7 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -45,6 +45,7 @@
 #include "crypto/libpcrypto.h"
 #include "fido/cbortools.h"
 #include "fido/fidocore.h"
+#include "fido/cose.h"
 
 static int CmdHelp(const char *Cmd);
 
@@ -726,7 +727,7 @@ int MakeCredentionalParseRes(uint8_t *data, size_t dataLen, bool verbose, bool s
 		cbor_check(res);
 		if (!strcmp(key, "alg")) {
 			cbor_value_get_int64(&mapsmt, &alg);    
-			PrintAndLog("Alg [%lld]", (long long)alg);
+			PrintAndLog("Alg [%lld] %s", (long long)alg, GetCOSEAlgDescription(alg));
 			res = cbor_value_advance_fixed(&mapsmt);
 			cbor_check(res);
 		}
diff --git a/client/fido/cose.c b/client/fido/cose.c
new file mode 100644
index 000000000..17f1e71b3
--- /dev/null
+++ b/client/fido/cose.c
@@ -0,0 +1,130 @@
+//-----------------------------------------------------------------------------
+// Copyright (C) 2018 Merlok
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// Tools for work with COSE (CBOR Object Signing and Encryption) rfc8152
+// https://tools.ietf.org/html/rfc8152
+//-----------------------------------------------------------------------------
+//
+
+#include "cose.h"
+#include "util.h"
+
+static const char COSEEmptyStr[] = "";
+
+typedef struct {
+	int Value;
+	char *Name;
+	char *Description;
+} COSEValueNameDesc_t;
+ 
+typedef struct {
+	int Value;
+	char *Type;
+	char *Name;
+	char *Description;
+} COSEValueTypeNameDesc_t; 
+
+// kty - Key Type Values
+COSEValueNameDesc_t COSEKeyTypeValueDesc[] = {
+	{0, "Reserved",  "Reserved"},
+	{1, "OKP",       "Octet Key Pair"},
+	{2, "EC2",       "Elliptic Curve Key w/ x- and y-coordinate pair"},
+	{4, "Symmetric", "Symmetric Key"},
+};
+
+// keys
+COSEValueTypeNameDesc_t COSEKeyTypeDesc[] = {
+	{1, "EC2", "P-256",    "NIST P-256 also known as secp256r1"},
+	{2, "EC2", "P-384",    "NIST P-384 also known as secp384r1"},
+	{3, "EC2", "P-521",    "NIST P-521 also known as secp521r1"},
+	{4, "OKP", "X25519",   "X25519 for use w/ ECDH only"},
+	{5, "OKP", "X448",     "X448 for use w/ ECDH only"},
+	{6, "OKP", "Ed25519",  "Ed25519 for use w/ EdDSA only"},
+	{7, "OKP", "Ed448",    "Ed448 for use w/ EdDSA only"},
+};
+
+// RFC8152 https://www.iana.org/assignments/cose/cose.xhtml#algorithms
+COSEValueNameDesc_t COSEAlg[] = {
+	{-65536,	"Unassigned",				"Unassigned"},
+	{-65535,	"RS1", 						"RSASSA-PKCS1-v1_5 w/ SHA-1"},
+	{-259,		"RS512", 					"RSASSA-PKCS1-v1_5 w/ SHA-512"},
+	{-258,		"RS384", 					"RSASSA-PKCS1-v1_5 w/ SHA-384"},
+	{-257,		"RS256", 					"RSASSA-PKCS1-v1_5 w/ SHA-256"},
+	{-42,		"RSAES-OAEP w/ SHA-512",	"RSAES-OAEP w/ SHA-512"},
+	{-41,		"RSAES-OAEP w/ SHA-256",	"RSAES-OAEP w/ SHA-256"},
+	{-40,		"RSAES-OAEP w/ RFC 8017 def param",	"RSAES-OAEP w/ SHA-1"},
+	{-39,		"PS512",					"RSASSA-PSS w/ SHA-512"},
+	{-38,		"PS384",					"RSASSA-PSS w/ SHA-384"},
+	{-37,		"PS256",					"RSASSA-PSS w/ SHA-256"},
+	{-36,		"ES512",					"ECDSA w/ SHA-512"},
+	{-35,		"ES384",					"ECDSA w/ SHA-384"},
+	{-34,		"ECDH-SS + A256KW",			"ECDH SS w/ Concat KDF and AES Key Wrap w/ 256-bit key"},
+	{-33,		"ECDH-SS + A192KW",			"ECDH SS w/ Concat KDF and AES Key Wrap w/ 192-bit key"},
+	{-32,		"ECDH-SS + A128KW",			"ECDH SS w/ Concat KDF and AES Key Wrap w/ 128-bit key"},
+	{-31,		"ECDH-ES + A256KW",			"ECDH ES w/ Concat KDF and AES Key Wrap w/ 256-bit key"},
+	{-30,		"ECDH-ES + A192KW",			"ECDH ES w/ Concat KDF and AES Key Wrap w/ 192-bit key"},
+	{-29,		"ECDH-ES + A128KW",			"ECDH ES w/ Concat KDF and AES Key Wrap w/ 128-bit key"},
+	{-28,		"ECDH-SS + HKDF-512",		"ECDH SS w/ HKDF - generate key directly"},
+	{-27,		"ECDH-SS + HKDF-256",		"ECDH SS w/ HKDF - generate key directly"},
+	{-26,		"ECDH-ES + HKDF-512",		"ECDH ES w/ HKDF - generate key directly"},
+	{-25,		"ECDH-ES + HKDF-256",		"ECDH ES w/ HKDF - generate key directly"},
+	{-13,		"direct+HKDF-AES-256",		"Shared secret w/ AES-MAC 256-bit key"},
+	{-12,		"direct+HKDF-AES-128",		"Shared secret w/ AES-MAC 128-bit key"},
+	{-11,		"direct+HKDF-SHA-512",		"Shared secret w/ HKDF and SHA-512"},
+	{-10,		"direct+HKDF-SHA-256",		"Shared secret w/ HKDF and SHA-256"},
+	{-8,		"EdDSA",					"EdDSA"},
+	{-7,		"ES256",					"ECDSA w/ SHA-256"},
+	{-6,		"direct",					"Direct use of CEK"},
+	{-5,		"A256KW",					"AES Key Wrap w/ 256-bit key"},
+	{-4,		"A192KW",					"AES Key Wrap w/ 192-bit key"},
+	{-3,		"A128KW",					"AES Key Wrap w/ 128-bit key"},
+	{0,			"Reserved",					"Reserved"},
+	{1,			"A128GCM",					"AES-GCM mode w/ 128-bit key, 128-bit tag"},
+	{2,			"A192GCM",					"AES-GCM mode w/ 192-bit key, 128-bit tag"},
+	{3,			"A256GCM",					"AES-GCM mode w/ 256-bit key, 128-bit tag"},
+	{4,			"HMAC 256/64",				"HMAC w/ SHA-256 truncated to 64 bits"},
+	{5,			"HMAC 256/256",				"HMAC w/ SHA-256"},
+	{6,			"HMAC 384/384",				"HMAC w/ SHA-384"},
+	{7,			"HMAC 512/512",				"HMAC w/ SHA-512"},
+	{10,		"AES-CCM-16-64-128",		"AES-CCM mode 128-bit key, 64-bit tag, 13-byte nonce"},
+	{11,		"AES-CCM-16-64-256",		"AES-CCM mode 256-bit key, 64-bit tag, 13-byte nonce"},
+	{12,		"AES-CCM-64-64-128",		"AES-CCM mode 128-bit key, 64-bit tag, 7-byte nonce"},
+	{13,		"AES-CCM-64-64-256",		"AES-CCM mode 256-bit key, 64-bit tag, 7-byte nonce"},
+	{14,		"AES-MAC 128/64",			"AES-MAC 128-bit key, 64-bit tag"},
+	{15,		"AES-MAC 256/64",			"AES-MAC 256-bit key, 64-bit tag"},
+	{24,		"ChaCha20/Poly1305",		"ChaCha20/Poly1305 w/ 256-bit key, 128-bit tag"},
+	{25,		"AES-MAC 128/128",			"AES-MAC 128-bit key, 128-bit tag"},
+	{26,		"AES-MAC 256/128",			"AES-MAC 256-bit key, 128-bit tag"},
+	{30,		"AES-CCM-16-128-128",		"AES-CCM mode 128-bit key, 128-bit tag, 13-byte nonce"},
+	{31,		"AES-CCM-16-128-256",		"AES-CCM mode 256-bit key, 128-bit tag, 13-byte nonce"},
+	{32,		"AES-CCM-64-128-128",		"AES-CCM mode 128-bit key, 128-bit tag, 7-byte nonce"},
+	{33,		"AES-CCM-64-128-256",		"AES-CCM mode 256-bit key, 128-bit tag, 7-byte nonce"}
+};
+
+COSEValueNameDesc_t *GetCOSEAlgElm(int id) {
+	for (int i = 0; i < ARRAYLEN(COSEAlg); i++)
+		if (COSEAlg[i].Value == id)
+			return &COSEAlg[i];
+	return NULL;
+}
+	
+const char *GetCOSEAlgName(int id) {
+	COSEValueNameDesc_t *elm = GetCOSEAlgElm(id);
+	if (elm)
+		return elm->Name;
+	return COSEEmptyStr;
+}
+
+const char *GetCOSEAlgDescription(int id) {
+	COSEValueNameDesc_t *elm = GetCOSEAlgElm(id);
+	if (elm)
+		return elm->Description;
+	return COSEEmptyStr;
+}
+
+
+
diff --git a/client/fido/cose.h b/client/fido/cose.h
new file mode 100644
index 000000000..e8feb6d3f
--- /dev/null
+++ b/client/fido/cose.h
@@ -0,0 +1,23 @@
+//-----------------------------------------------------------------------------
+// Copyright (C) 2018 Merlok
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// Tools for work with COSE (CBOR Object Signing and Encryption) rfc8152
+// https://tools.ietf.org/html/rfc8152
+//-----------------------------------------------------------------------------
+//
+
+#ifndef __COSE_H__
+#define __COSE_H__
+
+#include <stddef.h>
+#include <stdint.h>
+#include <cbor.h>
+
+extern const char *GetCOSEAlgName(int id);
+extern const char *GetCOSEAlgDescription(int id);
+
+#endif /* __COSE_H__ */
diff --git a/client/fido/fidocore.c b/client/fido/fidocore.c
index 137b991f3..2df34b5ef 100644
--- a/client/fido/fidocore.c
+++ b/client/fido/fidocore.c
@@ -29,7 +29,7 @@ typedef struct {
 } fido2Error_t;
 
 fido2Error_t fido2Errors[] = {
-	{0xFF, "n/a",									"n/a"},
+	{0xFF, "n/a",								"n/a"},
 	{0x00, "CTAP1_ERR_SUCCESS",					"Indicates successful response."},
 	{0x01, "CTAP1_ERR_INVALID_COMMAND",			"The command is not a valid CTAP command."},
 	{0x02, "CTAP1_ERR_INVALID_PARAMETER",		"The command included an invalid parameter."},

From b67bcac28e318a2b57d024cff5ad256b3c983efd Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Mon, 26 Nov 2018 17:38:45 +0200
Subject: [PATCH 0236/1938] check rpIdHash and unpack signature ok

---
 client/cmdhffido.c | 58 ++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 54 insertions(+), 4 deletions(-)

diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index 8b0ceb2f7..d8ead11ad 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -648,7 +648,17 @@ int GetExistsFileNameJson(char *prefixDir, char *reqestedFileName, char *fileNam
 	return 0;
 }
 
-int MakeCredentionalParseRes(uint8_t *data, size_t dataLen, bool verbose, bool showDERTLV) {
+bool CheckHash(json_t *json, uint8_t *hash) {
+	char hashval[300] = {0};
+	uint8_t hash2[32] = {0};
+	
+	JsonLoadStr(json, "$.RelyingPartyEntity.id", hashval);
+	sha256hash((uint8_t *)hashval, strlen(hashval), hash2);
+
+	return !memcmp(hash, hash2, 32);
+}
+
+int MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, bool verbose, bool showDERTLV) {
 	CborParser parser;
 	CborValue map, mapsmt;
 	int res;
@@ -667,17 +677,26 @@ int MakeCredentionalParseRes(uint8_t *data, size_t dataLen, bool verbose, bool s
 	free(buf);
 
 	// authData
+	uint8_t authDataStatic[37] = {0};
 	res = CborMapGetKeyById(&parser, &map, data, dataLen, 2);
 	if (res)
 		return res;
 	res = cbor_value_dup_byte_string(&map, &ubuf, &n, &map);
 	cbor_check(res);
 	
+	if (n >= 37)
+		memcpy(authDataStatic, ubuf, 37);
+	
 	PrintAndLog("authData: %s", sprint_hex(ubuf, n));
 	
 	PrintAndLog("RP ID Hash: %s", sprint_hex(ubuf, 32));
 	
 	// check RP ID Hash
+	if (CheckHash(root, ubuf)) {
+		PrintAndLog("rpIdHash OK.");
+	} else {
+		PrintAndLog("rpIdHash ERROR!");
+	}
 
 	PrintAndLog("Flags 0x%02x:", ubuf[32]);
 	if (!ubuf[32])
@@ -704,9 +723,9 @@ int MakeCredentionalParseRes(uint8_t *data, size_t dataLen, bool verbose, bool s
 	//Credentional public key (COSE_KEY)
 	uint16_t cplen = n - 55 - cridlen;
 	PrintAndLog("Credentional public key (COSE_KEY)[%d]: %s", cplen, sprint_hex(&ubuf[55 + cridlen], cplen));
-	
-	free(ubuf);
 
+	free(ubuf);
+	
 	// attStmt - we are check only as DER certificate
 	int64_t alg = 0;
 	uint8_t sign[128] = {0};
@@ -756,6 +775,37 @@ int MakeCredentionalParseRes(uint8_t *data, size_t dataLen, bool verbose, bool s
 		PrintAndLog("----------------DER TLV-----------------");
 	}
     FIDOCheckDERAndGetKey(der, derLen, verbose, public_key, sizeof(public_key));
+
+	// check ANSI X9.62 format ECDSA signature (on P-256)
+	uint8_t rval[300] = {0}; 
+	uint8_t sval[300] = {0}; 
+	res = ecdsa_asn1_get_signature(sign, signLen, rval, sval);
+	if (!res) {
+		if (verbose) {
+			PrintAndLog("  r: %s", sprint_hex(rval, 32));
+			PrintAndLog("  s: %s", sprint_hex(sval, 32));
+		}
+
+		uint8_t xbuf[4096] = {0};
+		size_t xbuflen = 0;
+		res = FillBuffer(xbuf, sizeof(xbuf), &xbuflen,
+			authDataStatic, 37,  // rpIdHash[32] + flags[1] + signCount[4]
+			&data[0], 32,        // Hash of the serialized client data
+			NULL, 0);
+		//PrintAndLog("--xbuf(%d)[%d]: %s", res, xbuflen, sprint_hex(xbuf, xbuflen));
+		res = ecdsa_signature_verify(public_key, xbuf, xbuflen, sign, signLen);
+		if (res) {
+			if (res == -0x4e00) {
+				PrintAndLog("Signature is NOT VALID.");
+			} else {
+				PrintAndLog("Other signature check error: %x %s", (res<0)?-res:res, ecdsa_get_error(res));
+			}
+		} else {
+			PrintAndLog("Signature is OK.");
+		}	
+	} else {
+		PrintAndLog("Invalid signature. res=%d.", res);
+	}
 	
 	return 0;
 }
@@ -829,7 +879,7 @@ int CmdHFFido2MakeCredential(const char *cmd) {
 	TinyCborPrintFIDOPackage(fido2CmdMakeCredential, true, &buf[1], len - 1);
 
 	// parse returned cbor
-	MakeCredentionalParseRes(&buf[1], len - 1, verbose, showDERTLV);
+	MakeCredentionalParseRes(root, &buf[1], len - 1, verbose, showDERTLV);
 	
 	json_decref(root);
 

From 705d0b7a6b2ccd4e3a75f15cea589e8fe4519c8d Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Mon, 26 Nov 2018 17:52:02 +0200
Subject: [PATCH 0237/1938] added signature verify

---
 client/cmdhffido.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index d8ead11ad..4adc4e60d 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -648,7 +648,7 @@ int GetExistsFileNameJson(char *prefixDir, char *reqestedFileName, char *fileNam
 	return 0;
 }
 
-bool CheckHash(json_t *json, uint8_t *hash) {
+bool CheckrpIdHash(json_t *json, uint8_t *hash) {
 	char hashval[300] = {0};
 	uint8_t hash2[32] = {0};
 	
@@ -692,7 +692,7 @@ int MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, bool v
 	PrintAndLog("RP ID Hash: %s", sprint_hex(ubuf, 32));
 	
 	// check RP ID Hash
-	if (CheckHash(root, ubuf)) {
+	if (CheckrpIdHash(root, ubuf)) {
 		PrintAndLog("rpIdHash OK.");
 	} else {
 		PrintAndLog("rpIdHash ERROR!");
@@ -786,13 +786,21 @@ int MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, bool v
 			PrintAndLog("  s: %s", sprint_hex(sval, 32));
 		}
 
+		uint8_t clientDataHash[32] = {0};
+		size_t clientDataHashLen = 0;
+		res = JsonLoadBufAsHex(root, "$.ClientDataHash", clientDataHash, sizeof(clientDataHash), &clientDataHashLen);
+		if (res || clientDataHashLen != 32) {
+			PrintAndLog("ERROR: Can't get clientDataHash from json!");
+			return 2;
+		}			
+		
 		uint8_t xbuf[4096] = {0};
 		size_t xbuflen = 0;
 		res = FillBuffer(xbuf, sizeof(xbuf), &xbuflen,
 			authDataStatic, 37,  // rpIdHash[32] + flags[1] + signCount[4]
-			&data[0], 32,        // Hash of the serialized client data
+			clientDataHash, 32,  // Hash of the serialized client data. "$.ClientDataHash" from json
 			NULL, 0);
-		//PrintAndLog("--xbuf(%d)[%d]: %s", res, xbuflen, sprint_hex(xbuf, xbuflen));
+		PrintAndLog("--xbuf(%d)[%d]: %s", res, xbuflen, sprint_hex(xbuf, xbuflen));
 		res = ecdsa_signature_verify(public_key, xbuf, xbuflen, sign, signLen);
 		if (res) {
 			if (res == -0x4e00) {

From 44ed826840ad9dedba20a1cde55cbbb6bdde87c0 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Mon, 26 Nov 2018 17:54:50 +0200
Subject: [PATCH 0238/1938] added hints

---
 client/cmdhffido.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index 4adc4e60d..1d082f868 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -702,13 +702,13 @@ int MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, bool v
 	if (!ubuf[32])
 		PrintAndLog("none");
 	if (ubuf[32] & 0x01)
-		PrintAndLog("up - user presence");
+		PrintAndLog("up - user presence result");
 	if (ubuf[32] & 0x04)
-		PrintAndLog("uv - user verification (fingerprint scan or a PIN or ...)");
+		PrintAndLog("uv - user verification (fingerprint scan or a PIN or ...) result");
 	if (ubuf[32] & 0x40)
-		PrintAndLog("at - ");
+		PrintAndLog("at - attested credential data included");
 	if (ubuf[32] & 0x80)
-		PrintAndLog("ed - ");
+		PrintAndLog("ed - extension data included");
 
 	uint32_t cntr =  (uint32_t)bytes_to_num(&ubuf[33], 4);
 	PrintAndLog("Counter: %d", cntr);

From b9c4bd1e0cd9430cc2369363c94ef7a8a97ff0f4 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Mon, 26 Nov 2018 18:30:14 +0200
Subject: [PATCH 0239/1938] added showing cose_key in cbor text type

---
 client/cmdhffido.c     |  7 +++++++
 client/fido/cose.c     |  5 +++++
 client/fido/cose.h     |  2 ++
 client/fido/fidocore.c | 11 +++++++++--
 client/fido/fidocore.h |  5 ++++-
 5 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index 1d082f868..97e48b3ec 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -721,8 +721,15 @@ int MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, bool v
 	PrintAndLog("Credential id[%d]: %s", cridlen, sprint_hex(&ubuf[55], cridlen));
 	
 	//Credentional public key (COSE_KEY)
+	uint8_t coseKey[65] = {0};
 	uint16_t cplen = n - 55 - cridlen;
 	PrintAndLog("Credentional public key (COSE_KEY)[%d]: %s", cplen, sprint_hex(&ubuf[55 + cridlen], cplen));
+	if (verbose) {
+		TinyCborPrintFIDOPackage(fido2COSEKey, true, &ubuf[55 + cridlen], cplen);		
+	}
+	res = COSEGetECDSAKey(&ubuf[55 + cridlen], cplen, verbose, coseKey);
+	if (res)
+		PrintAndLog("ERROR: Can't get COSE_KEY.");
 
 	free(ubuf);
 	
diff --git a/client/fido/cose.c b/client/fido/cose.c
index 17f1e71b3..90bb66308 100644
--- a/client/fido/cose.c
+++ b/client/fido/cose.c
@@ -126,5 +126,10 @@ const char *GetCOSEAlgDescription(int id) {
 	return COSEEmptyStr;
 }
 
+int COSEGetECDSAKey(uint8_t *data, size_t datalen, bool verbose, uint8_t *public_key) {
+	
+	
+	return 0;
+}
 
 
diff --git a/client/fido/cose.h b/client/fido/cose.h
index e8feb6d3f..1b685e4a8 100644
--- a/client/fido/cose.h
+++ b/client/fido/cose.h
@@ -20,4 +20,6 @@
 extern const char *GetCOSEAlgName(int id);
 extern const char *GetCOSEAlgDescription(int id);
 
+extern int COSEGetECDSAKey(uint8_t *data, size_t datalen, bool verbose, uint8_t *public_key);
+
 #endif /* __COSE_H__ */
diff --git a/client/fido/fidocore.c b/client/fido/fidocore.c
index 2df34b5ef..c65959eff 100644
--- a/client/fido/fidocore.c
+++ b/client/fido/fidocore.c
@@ -82,7 +82,7 @@ fido2Error_t fido2Errors[] = {
 typedef struct {
 	fido2Commands Command;
 	fido2PacketType PckType;
-	uint8_t MemberNumber;
+	int MemberNumber;
 	char *Description;
 } fido2Desc_t;
 
@@ -139,6 +139,13 @@ fido2Desc_t fido2CmdGetInfoRespDesc[] = {
 	{fido2CmdClientPIN, 		ptQuery,    0x06, "pinHashEnc"},
 	{fido2CmdClientPIN, 		ptQuery,    0x07, "getKeyAgreement"},
 	{fido2CmdClientPIN, 		ptQuery,    0x08, "getRetries"},
+	
+	{fido2COSEKey,		 		ptResponse, 0x01, "kty"},
+	{fido2COSEKey,		 		ptResponse, 0x03, "alg"},
+	{fido2COSEKey,		 		ptResponse,   -1, "crv"},
+	{fido2COSEKey,		 		ptResponse,   -2, "x - coordinate"},
+	{fido2COSEKey,		 		ptResponse,   -3, "y - coordinate"},
+	{fido2COSEKey,		 		ptResponse,   -4, "d - private key"},
 };
 
 char *fido2GetCmdErrorDescription(uint8_t errorCode) {
@@ -149,7 +156,7 @@ char *fido2GetCmdErrorDescription(uint8_t errorCode) {
 	return fido2Errors[0].Description;
 }
 
-char *fido2GetCmdMemberDescription(uint8_t cmdCode, bool isResponse, uint8_t memberNum) {
+char *fido2GetCmdMemberDescription(uint8_t cmdCode, bool isResponse, int memberNum) {
 	for (int i = 0; i < sizeof(fido2CmdGetInfoRespDesc) / sizeof(fido2Desc_t); i++)
 		if (fido2CmdGetInfoRespDesc[i].Command == cmdCode &&
 			fido2CmdGetInfoRespDesc[i].PckType == (isResponse ? ptResponse : ptQuery) &&
diff --git a/client/fido/fidocore.h b/client/fido/fidocore.h
index 97c3f0f06..5d6dc4be1 100644
--- a/client/fido/fidocore.h
+++ b/client/fido/fidocore.h
@@ -25,6 +25,9 @@ typedef enum {
 	fido2CmdClientPIN			= 0x06,
 	fido2CmdReset				= 0x07,
 	fido2CmdGetNextAssertion	= 0x08,
+	
+	// another data
+	fido2COSEKey                = 0xF0
 } fido2Commands;
 
 typedef enum  {
@@ -42,7 +45,7 @@ extern int FIDO2GetAssertion(uint8_t *params, uint8_t paramslen, uint8_t *Result
 
 extern int FIDOCheckDERAndGetKey(uint8_t *der, size_t derLen, bool verbose, uint8_t *publicKey, size_t publicKeyMaxLen);
 
-extern char *fido2GetCmdMemberDescription(uint8_t cmdCode, bool isResponse, uint8_t memberNum);
+extern char *fido2GetCmdMemberDescription(uint8_t cmdCode, bool isResponse, int memberNum);
 extern char *fido2GetCmdErrorDescription(uint8_t errorCode);
 
 extern int FIDO2CreateMakeCredentionalReq(json_t *root, uint8_t *data, size_t maxdatalen, size_t *datalen);

From b0e0ccb05fc894fe175677482a7ed248fd6c7e27 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Mon, 26 Nov 2018 18:37:21 +0200
Subject: [PATCH 0240/1938] added showCBOR

---
 client/cmdhffido.c | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index 97e48b3ec..9ad988135 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -658,7 +658,7 @@ bool CheckrpIdHash(json_t *json, uint8_t *hash) {
 	return !memcmp(hash, hash2, 32);
 }
 
-int MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, bool verbose, bool showDERTLV) {
+int MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, bool verbose, bool showCBOR, bool showDERTLV) {
 	CborParser parser;
 	CborValue map, mapsmt;
 	int res;
@@ -724,7 +724,7 @@ int MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, bool v
 	uint8_t coseKey[65] = {0};
 	uint16_t cplen = n - 55 - cridlen;
 	PrintAndLog("Credentional public key (COSE_KEY)[%d]: %s", cplen, sprint_hex(&ubuf[55 + cridlen], cplen));
-	if (verbose) {
+	if (showCBOR) {
 		TinyCborPrintFIDOPackage(fido2COSEKey, true, &ubuf[55 + cridlen], cplen);		
 	}
 	res = COSEGetECDSAKey(&ubuf[55 + cridlen], cplen, verbose, coseKey);
@@ -831,6 +831,7 @@ int CmdHFFido2MakeCredential(const char *cmd) {
 	char fname[300] = {0};
 	bool verbose = true;
 	bool showDERTLV = true;
+	bool showCBOR = true;
 
 	int res = GetExistsFileNameJson("fido", "fido2", fname);
 	if(res) {
@@ -869,8 +870,10 @@ int CmdHFFido2MakeCredential(const char *cmd) {
 	if (res)
 		return res;
 	
-	PrintAndLog("CBOR make credentional request:");
-	TinyCborPrintFIDOPackage(fido2CmdMakeCredential, false, data, datalen);
+	if (showCBOR) {
+		PrintAndLog("CBOR make credentional request:");
+		TinyCborPrintFIDOPackage(fido2CmdMakeCredential, false, data, datalen);
+	}
 	
 	res = FIDO2MakeCredential(data, datalen, buf,  sizeof(buf), &len, &sw);
 	DropField();
@@ -890,11 +893,13 @@ int CmdHFFido2MakeCredential(const char *cmd) {
 	}
 
 	PrintAndLog("MakeCredential result (%d b) OK.", len);
-	PrintAndLog("CBOR make credentional response:");
-	TinyCborPrintFIDOPackage(fido2CmdMakeCredential, true, &buf[1], len - 1);
+	if (showCBOR) {
+		PrintAndLog("CBOR make credentional response:");
+		TinyCborPrintFIDOPackage(fido2CmdMakeCredential, true, &buf[1], len - 1);
+	}
 
 	// parse returned cbor
-	MakeCredentionalParseRes(root, &buf[1], len - 1, verbose, showDERTLV);
+	MakeCredentionalParseRes(root, &buf[1], len - 1, verbose, showCBOR, showDERTLV);
 	
 	json_decref(root);
 

From 1f3086a028307a8c79ed24f280576cd4ab92adbf Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Mon, 26 Nov 2018 18:39:31 +0200
Subject: [PATCH 0241/1938] added json save

---
 client/cmdhffido.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index 9ad988135..e32d5d9ed 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -901,6 +901,15 @@ int CmdHFFido2MakeCredential(const char *cmd) {
 	// parse returned cbor
 	MakeCredentionalParseRes(root, &buf[1], len - 1, verbose, showCBOR, showDERTLV);
 	
+	if (root) {
+		res = json_dump_file(root, fname, JSON_INDENT(2));
+		if (res) {
+			PrintAndLog("ERROR: can't save the file: %s", fname);
+			return 200;
+		}
+		PrintAndLog("File `%s` saved.", fname);
+	}
+	
 	json_decref(root);
 
 	return 0;

From 56c9270574beefa10b4f568538bb22514b8e0939 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Mon, 26 Nov 2018 18:57:44 +0200
Subject: [PATCH 0242/1938] added json save values

---
 client/cmdhffido.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index e32d5d9ed..378d69227 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -712,24 +712,30 @@ int MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, bool v
 
 	uint32_t cntr =  (uint32_t)bytes_to_num(&ubuf[33], 4);
 	PrintAndLog("Counter: %d", cntr);
+	JsonSaveInt(root, "$.AppData.Counter", cntr);
 	
 	// attestation data
 	PrintAndLog("AAGUID: %s", sprint_hex(&ubuf[37], 16));
+	JsonSaveBufAsHexCompact(root, "$.AppData.AAGUID", &ubuf[37], 16);
 	
 	// Credential ID
 	uint8_t cridlen = (uint16_t)bytes_to_num(&ubuf[53], 2);
 	PrintAndLog("Credential id[%d]: %s", cridlen, sprint_hex(&ubuf[55], cridlen));
+	JsonSaveBufAsHexCompact(root, "$.AppData.CredentialId", &ubuf[55], cridlen);
 	
 	//Credentional public key (COSE_KEY)
 	uint8_t coseKey[65] = {0};
 	uint16_t cplen = n - 55 - cridlen;
 	PrintAndLog("Credentional public key (COSE_KEY)[%d]: %s", cplen, sprint_hex(&ubuf[55 + cridlen], cplen));
+	JsonSaveBufAsHexCompact(root, "$.AppData.COSE_KEY", &ubuf[55 + cridlen], cplen);
 	if (showCBOR) {
 		TinyCborPrintFIDOPackage(fido2COSEKey, true, &ubuf[55 + cridlen], cplen);		
 	}
 	res = COSEGetECDSAKey(&ubuf[55 + cridlen], cplen, verbose, coseKey);
 	if (res)
 		PrintAndLog("ERROR: Can't get COSE_KEY.");
+	else
+		JsonSaveBufAsHexCompact(root, "$.AppData.COSEPublicKey", coseKey, sizeof(coseKey));
 
 	free(ubuf);
 	
@@ -768,6 +774,7 @@ int MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, bool v
 			res = CborGetArrayBinStringValue(&mapsmt, der, sizeof(der), &derLen);
 			cbor_check(res);
 			PrintAndLog("DER [%d]: %s", derLen, sprint_hex(der, derLen));
+			JsonSaveBufAsHexCompact(root, "$.AppData.DER", der, derLen);
 		}		
 	}
 	res = cbor_value_leave_container(&map, &mapsmt);
@@ -782,6 +789,7 @@ int MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, bool v
 		PrintAndLog("----------------DER TLV-----------------");
 	}
     FIDOCheckDERAndGetKey(der, derLen, verbose, public_key, sizeof(public_key));
+	JsonSaveBufAsHexCompact(root, "$.AppData.DERPublicKey", public_key, sizeof(public_key));
 
 	// check ANSI X9.62 format ECDSA signature (on P-256)
 	uint8_t rval[300] = {0}; 

From f7354c705d48ef5f5164fe6ede027238a4770b3c Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Mon, 26 Nov 2018 19:16:47 +0200
Subject: [PATCH 0243/1938] extract some descriptions from cose_key

---
 client/fido/cose.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++
 client/fido/cose.h |  1 +
 2 files changed, 50 insertions(+)

diff --git a/client/fido/cose.c b/client/fido/cose.c
index 90bb66308..bc86fee65 100644
--- a/client/fido/cose.c
+++ b/client/fido/cose.c
@@ -11,6 +11,8 @@
 //
 
 #include "cose.h"
+#include <cbor.h>
+#include "cbortools.h"
 #include "util.h"
 
 static const char COSEEmptyStr[] = "";
@@ -126,8 +128,55 @@ const char *GetCOSEAlgDescription(int id) {
 	return COSEEmptyStr;
 }
 
+COSEValueNameDesc_t *GetCOSEktyElm(int id) {
+	for (int i = 0; i < ARRAYLEN(COSEKeyTypeValueDesc); i++)
+		if (COSEKeyTypeValueDesc[i].Value == id)
+			return &COSEKeyTypeValueDesc[i];
+	return NULL;
+}
+
+const char *GetCOSEktyDescription(int id) {
+	COSEValueNameDesc_t *elm = GetCOSEktyElm(id);
+	if (elm)
+		return elm->Description;
+	return COSEEmptyStr;
+}
+
 int COSEGetECDSAKey(uint8_t *data, size_t datalen, bool verbose, uint8_t *public_key) {
+	CborParser parser;
+	CborValue map;
+	int64_t i64;
+
+	if(verbose)
+		PrintAndLog("----------- CBOR decode ----------------");
 	
+	// kty
+	int res = CborMapGetKeyById(&parser, &map, data, datalen, 1);
+	if(!res) {
+		cbor_value_get_int64(&map, &i64);    
+		if(verbose)
+			PrintAndLog("kty [%lld] %s", (long long)i64, GetCOSEktyDescription(i64));
+	}
+
+	// algorithm
+	res = CborMapGetKeyById(&parser, &map, data, datalen, 3);
+	if(!res) {
+		cbor_value_get_int64(&map, &i64);    
+		if(verbose)
+			PrintAndLog("algorithm [%lld] %s", (long long)i64, GetCOSEAlgDescription(i64));
+	}
+	
+	// curve
+	res = CborMapGetKeyById(&parser, &map, data, datalen, -1);
+	if(!res) {
+		cbor_value_get_int64(&map, &i64);    
+		if(verbose)
+			PrintAndLog("curve [%lld] %s", (long long)i64, GetCOSEAlgDescription(i64));
+	}
+	
+	
+	if(verbose)
+		PrintAndLog("----------- CBOR decode ----------------");
 	
 	return 0;
 }
diff --git a/client/fido/cose.h b/client/fido/cose.h
index 1b685e4a8..209239ec4 100644
--- a/client/fido/cose.h
+++ b/client/fido/cose.h
@@ -19,6 +19,7 @@
 
 extern const char *GetCOSEAlgName(int id);
 extern const char *GetCOSEAlgDescription(int id);
+extern const char *GetCOSEktyDescription(int id);
 
 extern int COSEGetECDSAKey(uint8_t *data, size_t datalen, bool verbose, uint8_t *public_key);
 

From 0a2f874ac3892121f074aad79fff10a8c30fdc49 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Mon, 26 Nov 2018 19:22:44 +0200
Subject: [PATCH 0244/1938] added cose_key descriptions

---
 client/fido/cose.c | 49 +++++++++++++++++++++++++++++++---------------
 client/fido/cose.h |  1 +
 2 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/client/fido/cose.c b/client/fido/cose.c
index bc86fee65..441c8251c 100644
--- a/client/fido/cose.c
+++ b/client/fido/cose.c
@@ -38,8 +38,22 @@ COSEValueNameDesc_t COSEKeyTypeValueDesc[] = {
 	{4, "Symmetric", "Symmetric Key"},
 };
 
+COSEValueNameDesc_t *GetCOSEktyElm(int id) {
+	for (int i = 0; i < ARRAYLEN(COSEKeyTypeValueDesc); i++)
+		if (COSEKeyTypeValueDesc[i].Value == id)
+			return &COSEKeyTypeValueDesc[i];
+	return NULL;
+}
+
+const char *GetCOSEktyDescription(int id) {
+	COSEValueNameDesc_t *elm = GetCOSEktyElm(id);
+	if (elm)
+		return elm->Description;
+	return COSEEmptyStr;
+}
+
 // keys
-COSEValueTypeNameDesc_t COSEKeyTypeDesc[] = {
+COSEValueTypeNameDesc_t COSECurvesDesc[] = {
 	{1, "EC2", "P-256",    "NIST P-256 also known as secp256r1"},
 	{2, "EC2", "P-384",    "NIST P-384 also known as secp384r1"},
 	{3, "EC2", "P-521",    "NIST P-521 also known as secp521r1"},
@@ -49,6 +63,20 @@ COSEValueTypeNameDesc_t COSEKeyTypeDesc[] = {
 	{7, "OKP", "Ed448",    "Ed448 for use w/ EdDSA only"},
 };
 
+COSEValueTypeNameDesc_t *GetCOSECurveElm(int id) {
+	for (int i = 0; i < ARRAYLEN(COSECurvesDesc); i++)
+		if (COSECurvesDesc[i].Value == id)
+			return &COSECurvesDesc[i];
+	return NULL;
+}
+
+const char *GetCOSECurveDescription(int id) {
+	COSEValueNameDesc_t *elm = GetCOSECurveElm(id);
+	if (elm)
+		return elm->Description;
+	return COSEEmptyStr;
+}
+
 // RFC8152 https://www.iana.org/assignments/cose/cose.xhtml#algorithms
 COSEValueNameDesc_t COSEAlg[] = {
 	{-65536,	"Unassigned",				"Unassigned"},
@@ -128,20 +156,6 @@ const char *GetCOSEAlgDescription(int id) {
 	return COSEEmptyStr;
 }
 
-COSEValueNameDesc_t *GetCOSEktyElm(int id) {
-	for (int i = 0; i < ARRAYLEN(COSEKeyTypeValueDesc); i++)
-		if (COSEKeyTypeValueDesc[i].Value == id)
-			return &COSEKeyTypeValueDesc[i];
-	return NULL;
-}
-
-const char *GetCOSEktyDescription(int id) {
-	COSEValueNameDesc_t *elm = GetCOSEktyElm(id);
-	if (elm)
-		return elm->Description;
-	return COSEEmptyStr;
-}
-
 int COSEGetECDSAKey(uint8_t *data, size_t datalen, bool verbose, uint8_t *public_key) {
 	CborParser parser;
 	CborValue map;
@@ -171,9 +185,12 @@ int COSEGetECDSAKey(uint8_t *data, size_t datalen, bool verbose, uint8_t *public
 	if(!res) {
 		cbor_value_get_int64(&map, &i64);    
 		if(verbose)
-			PrintAndLog("curve [%lld] %s", (long long)i64, GetCOSEAlgDescription(i64));
+			PrintAndLog("curve [%lld] %s", (long long)i64, GetCOSECurveDescription(i64));
 	}
 	
+	// plain key
+	public_key[0] = 0x04;
+	
 	
 	if(verbose)
 		PrintAndLog("----------- CBOR decode ----------------");
diff --git a/client/fido/cose.h b/client/fido/cose.h
index 209239ec4..850652fc4 100644
--- a/client/fido/cose.h
+++ b/client/fido/cose.h
@@ -20,6 +20,7 @@
 extern const char *GetCOSEAlgName(int id);
 extern const char *GetCOSEAlgDescription(int id);
 extern const char *GetCOSEktyDescription(int id);
+extern const char *GetCOSECurveDescription(int id);
 
 extern int COSEGetECDSAKey(uint8_t *data, size_t datalen, bool verbose, uint8_t *public_key);
 

From 065773377d52915c47ecda7f50838cc19d9f99ba Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Mon, 26 Nov 2018 19:42:37 +0200
Subject: [PATCH 0245/1938] get cose public key and fix some printing

---
 client/cmdhffido.c | 23 ++++++++++++++++-------
 client/fido/cose.c | 30 +++++++++++++++++++++++++++++-
 2 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index 378d69227..d94f3d967 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -720,22 +720,27 @@ int MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, bool v
 	
 	// Credential ID
 	uint8_t cridlen = (uint16_t)bytes_to_num(&ubuf[53], 2);
-	PrintAndLog("Credential id[%d]: %s", cridlen, sprint_hex(&ubuf[55], cridlen));
+	PrintAndLog("Credential id[%d]: %s", cridlen, sprint_hex_inrow(&ubuf[55], cridlen));
 	JsonSaveBufAsHexCompact(root, "$.AppData.CredentialId", &ubuf[55], cridlen);
 	
 	//Credentional public key (COSE_KEY)
 	uint8_t coseKey[65] = {0};
 	uint16_t cplen = n - 55 - cridlen;
-	PrintAndLog("Credentional public key (COSE_KEY)[%d]: %s", cplen, sprint_hex(&ubuf[55 + cridlen], cplen));
+	PrintAndLog("Credentional public key (COSE_KEY)[%d]: %s", cplen, sprint_hex_inrow(&ubuf[55 + cridlen], cplen));
 	JsonSaveBufAsHexCompact(root, "$.AppData.COSE_KEY", &ubuf[55 + cridlen], cplen);
 	if (showCBOR) {
+		PrintAndLog("COSE structure:");
+		PrintAndLog("---------------- CBOR ------------------");
 		TinyCborPrintFIDOPackage(fido2COSEKey, true, &ubuf[55 + cridlen], cplen);		
+		PrintAndLog("---------------- CBOR ------------------");
 	}
 	res = COSEGetECDSAKey(&ubuf[55 + cridlen], cplen, verbose, coseKey);
-	if (res)
+	if (res) {
 		PrintAndLog("ERROR: Can't get COSE_KEY.");
-	else
+	} else {
+		PrintAndLog("COSE public key: %s", sprint_hex_inrow(coseKey, sizeof(coseKey)));
 		JsonSaveBufAsHexCompact(root, "$.AppData.COSEPublicKey", coseKey, sizeof(coseKey));
+	}
 
 	free(ubuf);
 	
@@ -767,13 +772,13 @@ int MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, bool v
 		if (!strcmp(key, "sig")) {
 			res = CborGetBinStringValue(&mapsmt, sign, sizeof(sign), &signLen);
 			cbor_check(res);
-			PrintAndLog("signature [%d]: %s", signLen, sprint_hex(sign, signLen));
+			PrintAndLog("signature [%d]: %s", signLen, sprint_hex_inrow(sign, signLen));
 		}
 
 		if (!strcmp(key, "x5c")) {
 			res = CborGetArrayBinStringValue(&mapsmt, der, sizeof(der), &derLen);
 			cbor_check(res);
-			PrintAndLog("DER [%d]: %s", derLen, sprint_hex(der, derLen));
+			PrintAndLog("DER [%d]: %s", derLen, sprint_hex_inrow(der, derLen));
 			JsonSaveBufAsHexCompact(root, "$.AppData.DER", der, derLen);
 		}		
 	}
@@ -816,7 +821,7 @@ int MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, bool v
 			clientDataHash, 32,  // Hash of the serialized client data. "$.ClientDataHash" from json
 			NULL, 0);
 		PrintAndLog("--xbuf(%d)[%d]: %s", res, xbuflen, sprint_hex(xbuf, xbuflen));
-		res = ecdsa_signature_verify(public_key, xbuf, xbuflen, sign, signLen);
+		res = ecdsa_signature_verify(coseKey, xbuf, xbuflen, sign, signLen);
 		if (res) {
 			if (res == -0x4e00) {
 				PrintAndLog("Signature is NOT VALID.");
@@ -880,7 +885,9 @@ int CmdHFFido2MakeCredential(const char *cmd) {
 	
 	if (showCBOR) {
 		PrintAndLog("CBOR make credentional request:");
+		PrintAndLog("---------------- CBOR ------------------");
 		TinyCborPrintFIDOPackage(fido2CmdMakeCredential, false, data, datalen);
+		PrintAndLog("---------------- CBOR ------------------");
 	}
 	
 	res = FIDO2MakeCredential(data, datalen, buf,  sizeof(buf), &len, &sw);
@@ -903,7 +910,9 @@ int CmdHFFido2MakeCredential(const char *cmd) {
 	PrintAndLog("MakeCredential result (%d b) OK.", len);
 	if (showCBOR) {
 		PrintAndLog("CBOR make credentional response:");
+		PrintAndLog("---------------- CBOR ------------------");
 		TinyCborPrintFIDOPackage(fido2CmdMakeCredential, true, &buf[1], len - 1);
+		PrintAndLog("---------------- CBOR ------------------");
 	}
 
 	// parse returned cbor
diff --git a/client/fido/cose.c b/client/fido/cose.c
index 441c8251c..d3656acda 100644
--- a/client/fido/cose.c
+++ b/client/fido/cose.c
@@ -71,7 +71,7 @@ COSEValueTypeNameDesc_t *GetCOSECurveElm(int id) {
 }
 
 const char *GetCOSECurveDescription(int id) {
-	COSEValueNameDesc_t *elm = GetCOSECurveElm(id);
+	COSEValueTypeNameDesc_t *elm = GetCOSECurveElm(id);
 	if (elm)
 		return elm->Description;
 	return COSEEmptyStr;
@@ -160,6 +160,7 @@ int COSEGetECDSAKey(uint8_t *data, size_t datalen, bool verbose, uint8_t *public
 	CborParser parser;
 	CborValue map;
 	int64_t i64;
+	size_t len;
 
 	if(verbose)
 		PrintAndLog("----------- CBOR decode ----------------");
@@ -191,6 +192,33 @@ int COSEGetECDSAKey(uint8_t *data, size_t datalen, bool verbose, uint8_t *public
 	// plain key
 	public_key[0] = 0x04;
 	
+	// x - coordinate
+	res = CborMapGetKeyById(&parser, &map, data, datalen, -2);
+	if(!res) {
+		res = CborGetBinStringValue(&map, &public_key[1], 32, &len);
+		cbor_check(res);
+		if(verbose)
+			PrintAndLog("x - coordinate [%d]: %s", len, sprint_hex(&public_key[1], 32));
+	}
+
+	// y - coordinate
+	res = CborMapGetKeyById(&parser, &map, data, datalen, -3);
+	if(!res) {
+		res = CborGetBinStringValue(&map, &public_key[33], 32, &len);
+		cbor_check(res);
+		if(verbose)
+			PrintAndLog("y - coordinate [%d]: %s", len, sprint_hex(&public_key[33], 32));
+	}
+
+	// d - private key
+	uint8_t private_key[128] = {0};
+	res = CborMapGetKeyById(&parser, &map, data, datalen, -4);
+	if(!res) {
+		res = CborGetBinStringValue(&map, private_key, sizeof(private_key), &len);
+		cbor_check(res);
+		if(verbose)
+			PrintAndLog("d - private key [%d]: %s", len, sprint_hex(private_key, len));
+	}
 	
 	if(verbose)
 		PrintAndLog("----------- CBOR decode ----------------");

From d36bfd5829bf6fdf86ffdee929dd383436585a00 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Mon, 26 Nov 2018 19:49:41 +0200
Subject: [PATCH 0246/1938] add some cose key checks

---
 client/fido/cose.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/client/fido/cose.c b/client/fido/cose.c
index d3656acda..e45f46290 100644
--- a/client/fido/cose.c
+++ b/client/fido/cose.c
@@ -171,6 +171,8 @@ int COSEGetECDSAKey(uint8_t *data, size_t datalen, bool verbose, uint8_t *public
 		cbor_value_get_int64(&map, &i64);    
 		if(verbose)
 			PrintAndLog("kty [%lld] %s", (long long)i64, GetCOSEktyDescription(i64));
+		if (i64 != 2)
+			PrintAndLog("ERROR: kty must be 2.");
 	}
 
 	// algorithm
@@ -179,6 +181,8 @@ int COSEGetECDSAKey(uint8_t *data, size_t datalen, bool verbose, uint8_t *public
 		cbor_value_get_int64(&map, &i64);    
 		if(verbose)
 			PrintAndLog("algorithm [%lld] %s", (long long)i64, GetCOSEAlgDescription(i64));
+		if (i64 != -7)
+			PrintAndLog("ERROR: algorithm must be -7.");
 	}
 	
 	// curve
@@ -187,6 +191,8 @@ int COSEGetECDSAKey(uint8_t *data, size_t datalen, bool verbose, uint8_t *public
 		cbor_value_get_int64(&map, &i64);    
 		if(verbose)
 			PrintAndLog("curve [%lld] %s", (long long)i64, GetCOSECurveDescription(i64));
+		if (i64 != 1)
+			PrintAndLog("ERROR: curve must be 1.");
 	}
 	
 	// plain key
@@ -199,6 +205,8 @@ int COSEGetECDSAKey(uint8_t *data, size_t datalen, bool verbose, uint8_t *public
 		cbor_check(res);
 		if(verbose)
 			PrintAndLog("x - coordinate [%d]: %s", len, sprint_hex(&public_key[1], 32));
+		if (len != 32)
+			PrintAndLog("ERROR: x - coordinate length must be 32.");
 	}
 
 	// y - coordinate
@@ -208,6 +216,8 @@ int COSEGetECDSAKey(uint8_t *data, size_t datalen, bool verbose, uint8_t *public
 		cbor_check(res);
 		if(verbose)
 			PrintAndLog("y - coordinate [%d]: %s", len, sprint_hex(&public_key[33], 32));
+		if (len != 32)
+			PrintAndLog("ERROR: y - coordinate length must be 32.");
 	}
 
 	// d - private key

From 66d994920fffb23f84a25a4b1c340222a2912804 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Mon, 26 Nov 2018 20:17:50 +0200
Subject: [PATCH 0247/1938] added command and some parameters

---
 client/cmdhffido.c | 38 +++++++++++++++++++++++++++++++++-----
 1 file changed, 33 insertions(+), 5 deletions(-)

diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index d94f3d967..d4e512bc7 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -687,7 +687,7 @@ int MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, bool v
 	if (n >= 37)
 		memcpy(authDataStatic, ubuf, 37);
 	
-	PrintAndLog("authData: %s", sprint_hex(ubuf, n));
+	PrintAndLog("authData: %s", sprint_hex_inrow(ubuf, n));
 	
 	PrintAndLog("RP ID Hash: %s", sprint_hex(ubuf, 32));
 	
@@ -721,6 +721,7 @@ int MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, bool v
 	// Credential ID
 	uint8_t cridlen = (uint16_t)bytes_to_num(&ubuf[53], 2);
 	PrintAndLog("Credential id[%d]: %s", cridlen, sprint_hex_inrow(&ubuf[55], cridlen));
+	JsonSaveInt(root, "$.AppData.CredentialIdLen", cridlen);
 	JsonSaveBufAsHexCompact(root, "$.AppData.CredentialId", &ubuf[55], cridlen);
 	
 	//Credentional public key (COSE_KEY)
@@ -821,7 +822,7 @@ int MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, bool v
 			clientDataHash, 32,  // Hash of the serialized client data. "$.ClientDataHash" from json
 			NULL, 0);
 		PrintAndLog("--xbuf(%d)[%d]: %s", res, xbuflen, sprint_hex(xbuf, xbuflen));
-		res = ecdsa_signature_verify(coseKey, xbuf, xbuflen, sign, signLen);
+		res = ecdsa_signature_verify(public_key, xbuf, xbuflen, sign, signLen);
 		if (res) {
 			if (res == -0x4e00) {
 				PrintAndLog("Signature is NOT VALID.");
@@ -842,9 +843,36 @@ int CmdHFFido2MakeCredential(const char *cmd) {
 	json_error_t error;
 	json_t *root = NULL;
 	char fname[300] = {0};
-	bool verbose = true;
-	bool showDERTLV = true;
-	bool showCBOR = true;
+	
+	CLIParserInit("hf fido make", 
+		"Execute a FIDO2 Make Credentional command. Needs json file with parameters. Sample file `fido2.json`. File can be placed in proxmark directory or in `proxmark/fido` directory.", 
+		"Usage:\n\thf fido make -> execute command default parameters file `fido2.json`\n"
+			"\thf fido make test.json -> execute command with parameters file `text.json`");
+
+	void* argtable[] = {
+		arg_param_begin,
+		arg_lit0("aA",  "apdu",     "show APDU reqests and responses"),
+		arg_litn("vV",  "verbose",  0, 2, "show technical data. vv - show full certificates data"),
+		arg_lit0("tT",  "tlv",      "Show DER certificate contents in TLV representation"),
+		arg_lit0("cC",  "cbor",     "show CBOR decoded data"),
+		arg_str0(NULL,  NULL,		"fido2.json", "JSON input / output file name for parameters. Default `fido2.json`"),
+		arg_param_end
+	};
+	CLIExecWithReturn(cmd, argtable, true);
+	
+	bool APDULogging = arg_get_lit(1);
+	bool verbose = arg_get_lit(2);
+	bool verbose2 = arg_get_lit(2) > 1;
+	bool showDERTLV = arg_get_lit(3);
+	bool showCBOR = arg_get_lit(4);
+
+
+
+	
+	
+	CLIParserFree();	
+	
+	SetAPDULogging(APDULogging);
 
 	int res = GetExistsFileNameJson("fido", "fido2", fname);
 	if(res) {

From 890173a623d9e1b4756f81a7b14c3a5a99dce72f Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 27 Nov 2018 00:11:53 +0200
Subject: [PATCH 0248/1938] verify signature OK, added some logging options

---
 client/cmdhffido.c | 47 +++++++++++++++++++++++++++++++++-------------
 1 file changed, 34 insertions(+), 13 deletions(-)

diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index d4e512bc7..4af68c8ad 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -658,7 +658,7 @@ bool CheckrpIdHash(json_t *json, uint8_t *hash) {
 	return !memcmp(hash, hash2, 32);
 }
 
-int MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, bool verbose, bool showCBOR, bool showDERTLV) {
+int MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, bool verbose, bool verbose2, bool showCBOR, bool showDERTLV) {
 	CborParser parser;
 	CborValue map, mapsmt;
 	int res;
@@ -677,17 +677,22 @@ int MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, bool v
 	free(buf);
 
 	// authData
-	uint8_t authDataStatic[37] = {0};
+	uint8_t authData[400] = {0}; 
+	size_t authDataLen = 0;
 	res = CborMapGetKeyById(&parser, &map, data, dataLen, 2);
 	if (res)
 		return res;
 	res = cbor_value_dup_byte_string(&map, &ubuf, &n, &map);
 	cbor_check(res);
 	
-	if (n >= 37)
-		memcpy(authDataStatic, ubuf, 37);
+	authDataLen = n;
+	memcpy(authData, ubuf, authDataLen); 
 	
-	PrintAndLog("authData: %s", sprint_hex_inrow(ubuf, n));
+	if (verbose2) {
+		PrintAndLog("authData[%d]: %s", n, sprint_hex_inrow(authData, authDataLen));
+	} else {
+		PrintAndLog("authData[%d]: %s...", n, sprint_hex(authData, MIN(authDataLen, 16)));
+	}
 	
 	PrintAndLog("RP ID Hash: %s", sprint_hex(ubuf, 32));
 	
@@ -727,14 +732,20 @@ int MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, bool v
 	//Credentional public key (COSE_KEY)
 	uint8_t coseKey[65] = {0};
 	uint16_t cplen = n - 55 - cridlen;
-	PrintAndLog("Credentional public key (COSE_KEY)[%d]: %s", cplen, sprint_hex_inrow(&ubuf[55 + cridlen], cplen));
+	if (verbose2) {
+		PrintAndLog("Credentional public key (COSE_KEY)[%d]: %s", cplen, sprint_hex_inrow(&ubuf[55 + cridlen], cplen));
+	} else {
+		PrintAndLog("Credentional public key (COSE_KEY)[%d]: %s...", cplen, sprint_hex(&ubuf[55 + cridlen], MIN(cplen, 16)));
+	}
 	JsonSaveBufAsHexCompact(root, "$.AppData.COSE_KEY", &ubuf[55 + cridlen], cplen);
+	
 	if (showCBOR) {
 		PrintAndLog("COSE structure:");
 		PrintAndLog("---------------- CBOR ------------------");
 		TinyCborPrintFIDOPackage(fido2COSEKey, true, &ubuf[55 + cridlen], cplen);		
 		PrintAndLog("---------------- CBOR ------------------");
 	}
+	
 	res = COSEGetECDSAKey(&ubuf[55 + cridlen], cplen, verbose, coseKey);
 	if (res) {
 		PrintAndLog("ERROR: Can't get COSE_KEY.");
@@ -773,14 +784,24 @@ int MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, bool v
 		if (!strcmp(key, "sig")) {
 			res = CborGetBinStringValue(&mapsmt, sign, sizeof(sign), &signLen);
 			cbor_check(res);
-			PrintAndLog("signature [%d]: %s", signLen, sprint_hex_inrow(sign, signLen));
+			if (verbose2) {
+				PrintAndLog("signature [%d]: %s", signLen, sprint_hex_inrow(sign, signLen));
+			} else {
+				PrintAndLog("signature [%d]: %s...", signLen, sprint_hex(sign, MIN(signLen, 16)));
+			}
 		}
 
 		if (!strcmp(key, "x5c")) {
 			res = CborGetArrayBinStringValue(&mapsmt, der, sizeof(der), &derLen);
 			cbor_check(res);
-			PrintAndLog("DER [%d]: %s", derLen, sprint_hex_inrow(der, derLen));
-			JsonSaveBufAsHexCompact(root, "$.AppData.DER", der, derLen);
+			if (verbose2) {
+				PrintAndLog("DER certificate[%d]:\n------------------DER-------------------", derLen);
+				dump_buffer_simple((const unsigned char *)der, derLen, NULL);
+				PrintAndLog("\n----------------DER---------------------");
+			} else {
+				PrintAndLog("DER [%d]: %s...", derLen, sprint_hex(der, MIN(derLen, 16)));
+			}
+				JsonSaveBufAsHexCompact(root, "$.AppData.DER", der, derLen);
 		}		
 	}
 	res = cbor_value_leave_container(&map, &mapsmt);
@@ -818,10 +839,10 @@ int MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, bool v
 		uint8_t xbuf[4096] = {0};
 		size_t xbuflen = 0;
 		res = FillBuffer(xbuf, sizeof(xbuf), &xbuflen,
-			authDataStatic, 37,  // rpIdHash[32] + flags[1] + signCount[4]
-			clientDataHash, 32,  // Hash of the serialized client data. "$.ClientDataHash" from json
+			authData, authDataLen,  // rpIdHash[32] + flags[1] + signCount[4] + ...
+			clientDataHash, 32,     // Hash of the serialized client data. "$.ClientDataHash" from json
 			NULL, 0);
-		PrintAndLog("--xbuf(%d)[%d]: %s", res, xbuflen, sprint_hex(xbuf, xbuflen));
+		//PrintAndLog("--xbuf(%d)[%d]: %s", res, xbuflen, sprint_hex(xbuf, xbuflen));
 		res = ecdsa_signature_verify(public_key, xbuf, xbuflen, sign, signLen);
 		if (res) {
 			if (res == -0x4e00) {
@@ -944,7 +965,7 @@ int CmdHFFido2MakeCredential(const char *cmd) {
 	}
 
 	// parse returned cbor
-	MakeCredentionalParseRes(root, &buf[1], len - 1, verbose, showCBOR, showDERTLV);
+	MakeCredentionalParseRes(root, &buf[1], len - 1, verbose, verbose2, showCBOR, showDERTLV);
 	
 	if (root) {
 		res = json_dump_file(root, fname, JSON_INDENT(2));

From fc9558b18fd39e47606d94c66ef46ebbc713ca51 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 27 Nov 2018 00:18:44 +0200
Subject: [PATCH 0249/1938] get assertion command sketch

---
 client/cmdhffido.c | 89 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 88 insertions(+), 1 deletion(-)

diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index 4af68c8ad..359fb3660 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -982,7 +982,94 @@ int CmdHFFido2MakeCredential(const char *cmd) {
 };
 
 int CmdHFFido2GetAssertion(const char *cmd) {
+	json_error_t error;
+	json_t *root = NULL;
+	char fname[300] = {0};
+	
+	
+	bool APDULogging = false;
+	bool verbose = true;
+	bool verbose2 = true;
+	bool showCBOR = true;
 
+
+
+	
+	
+	//CLIParserFree();	
+	
+	SetAPDULogging(APDULogging);
+	
+	
+	int res = GetExistsFileNameJson("fido", "fido2", fname);
+	if(res) {
+		PrintAndLog("ERROR: Can't found the json file.");
+		return res;
+	}
+	PrintAndLog("fname: %s\n", fname);
+	root = json_load_file(fname, 0, &error);	
+	if (!root) {
+		PrintAndLog("ERROR: json error on line %d: %s", error.line, error.text);
+		return 1;
+	}
+	
+	uint8_t data[2048] = {0};
+	size_t datalen = 0;
+	uint8_t buf[2048] = {0};
+	size_t len = 0;
+	uint16_t sw = 0;
+
+	DropField();
+	res = FIDOSelect(true, true, buf, sizeof(buf), &len, &sw);
+
+	if (res) {
+		PrintAndLog("Can't select authenticator. res=%x. Exit...", res);
+		DropField();
+		return res;
+	}
+	
+	if (sw != 0x9000) {
+		PrintAndLog("Can't select FIDO application. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
+		DropField();
+		return 2;
+	}
+/*
+	res = FIDO2CreateMakeCredentionalReq(root, data, sizeof(data), &datalen);
+	if (res)
+		return res;
+	
+	if (showCBOR) {
+		PrintAndLog("CBOR get assertion request:");
+		PrintAndLog("---------------- CBOR ------------------");
+		TinyCborPrintFIDOPackage(fido2CmdMakeCredential, false, data, datalen);
+		PrintAndLog("---------------- CBOR ------------------");
+	}
+*/	
+	res = FIDO2GetAssertion(data, datalen, buf,  sizeof(buf), &len, &sw);
+	DropField();
+	if (res) {
+		PrintAndLog("Can't execute get assertion command. res=%x. Exit...", res);
+		return res;
+	}
+	
+	if (sw != 0x9000) {
+		PrintAndLog("ERROR execute get assertion command. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
+		return 3;
+	}
+	
+	if(buf[0]) {
+		PrintAndLog("FIDO2 get assertion error: %d - %s", buf[0], fido2GetCmdErrorDescription(buf[0])); 
+		return 0;
+	}
+
+/*	PrintAndLog("MakeCredential result (%d b) OK.", len);
+	if (showCBOR) {
+		PrintAndLog("CBOR get assertion response:");
+		PrintAndLog("---------------- CBOR ------------------");
+		TinyCborPrintFIDOPackage(fido2CmdMakeCredential, true, &buf[1], len - 1);
+		PrintAndLog("---------------- CBOR ------------------");
+	}
+*/
 	return 0;
 };
 
@@ -993,7 +1080,7 @@ static command_t CommandTable[] =
   {"reg",  	  	 	   CmdHFFidoRegister,			0, "FIDO U2F Registration Message."},
   {"auth",  	       CmdHFFidoAuthenticate,		0, "FIDO U2F Authentication Message."},
   {"make",  	       CmdHFFido2MakeCredential,	0, "FIDO2 MakeCredential command."},
-  {"accert",  	       CmdHFFido2GetAssertion,		0, "FIDO2 GetAssertion command."},
+  {"assert",  	       CmdHFFido2GetAssertion,		0, "FIDO2 GetAssertion command."},
   {NULL,               NULL,						0, NULL}
 };
 

From bad7b80036d5914bef9c81c981677515571ed9b1 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 27 Nov 2018 12:07:33 +0200
Subject: [PATCH 0250/1938] added file name to fido2 command

---
 client/cmdhffido.c | 55 +++++++++++++++++++++++++++++++++-------------
 1 file changed, 40 insertions(+), 15 deletions(-)

diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index 359fb3660..e2d53560d 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -876,7 +876,7 @@ int CmdHFFido2MakeCredential(const char *cmd) {
 		arg_litn("vV",  "verbose",  0, 2, "show technical data. vv - show full certificates data"),
 		arg_lit0("tT",  "tlv",      "Show DER certificate contents in TLV representation"),
 		arg_lit0("cC",  "cbor",     "show CBOR decoded data"),
-		arg_str0(NULL,  NULL,		"fido2.json", "JSON input / output file name for parameters. Default `fido2.json`"),
+		arg_str0(NULL,  NULL,		"<json file name>", "JSON input / output file name for parameters. Default `fido2.json`"),
 		arg_param_end
 	};
 	CLIExecWithReturn(cmd, argtable, true);
@@ -887,15 +887,21 @@ int CmdHFFido2MakeCredential(const char *cmd) {
 	bool showDERTLV = arg_get_lit(3);
 	bool showCBOR = arg_get_lit(4);
 
+	uint8_t jsonname[250] ={0};
+	char *cjsonname = (char *)jsonname;
+	int jsonnamelen = 0;
+	CLIGetStrWithReturn(5, jsonname, &jsonnamelen);
 
+	if (!jsonnamelen) {
+		strcat(cjsonname, "fido2");
+		jsonnamelen = strlen(cjsonname);
+	}
 
-	
-	
 	CLIParserFree();	
 	
 	SetAPDULogging(APDULogging);
 
-	int res = GetExistsFileNameJson("fido", "fido2", fname);
+	int res = GetExistsFileNameJson("fido", cjsonname, fname);
 	if(res) {
 		PrintAndLog("ERROR: Can't found the json file.");
 		return res;
@@ -986,21 +992,40 @@ int CmdHFFido2GetAssertion(const char *cmd) {
 	json_t *root = NULL;
 	char fname[300] = {0};
 	
-	
-	bool APDULogging = false;
-	bool verbose = true;
-	bool verbose2 = true;
-	bool showCBOR = true;
-
-
+	CLIParserInit("hf fido assert", 
+		"Execute a FIDO2 Get Assertion command. Needs json file with parameters. Sample file `fido2.json`. File can be placed in proxmark directory or in `proxmark/fido` directory.", 
+		"Usage:\n\thf fido assert -> execute command default parameters file `fido2.json`\n"
+			"\thf fido assert test.json -> execute command with parameters file `text.json`");
 
+	void* argtable[] = {
+		arg_param_begin,
+		arg_lit0("aA",  "apdu",     "show APDU reqests and responses"),
+		arg_litn("vV",  "verbose",  0, 2, "show technical data. vv - show full certificates data"),
+		arg_lit0("cC",  "cbor",     "show CBOR decoded data"),
+		arg_str0(NULL,  NULL,		"<json file name>", "JSON input / output file name for parameters. Default `fido2.json`"),
+		arg_param_end
+	};
+	CLIExecWithReturn(cmd, argtable, true);
 	
-	
-	//CLIParserFree();	
+	bool APDULogging = arg_get_lit(1);
+	bool verbose = arg_get_lit(2);
+	bool verbose2 = arg_get_lit(2) > 1;
+	bool showCBOR = arg_get_lit(3);
+
+	uint8_t jsonname[250] ={0};
+	char *cjsonname = (char *)jsonname;
+	int jsonnamelen = 0;
+	CLIGetStrWithReturn(4, jsonname, &jsonnamelen);
+
+	if (!jsonnamelen) {
+		strcat(cjsonname, "fido2");
+		jsonnamelen = strlen(cjsonname);
+	}
+
+	CLIParserFree();	
 	
 	SetAPDULogging(APDULogging);
-	
-	
+
 	int res = GetExistsFileNameJson("fido", "fido2", fname);
 	if(res) {
 		PrintAndLog("ERROR: Can't found the json file.");

From ee92b8a0977fc9be80fb273b383032aaa1e708af Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 27 Nov 2018 12:24:55 +0200
Subject: [PATCH 0251/1938] refactoring make credentials and add some sketch to
 get assertion

---
 client/cmdhffido.c     | 220 +---------------------------------
 client/fido/fido2.json |   6 +-
 client/fido/fidocore.c | 260 +++++++++++++++++++++++++++++++++++++++++
 client/fido/fidocore.h |   3 +
 4 files changed, 272 insertions(+), 217 deletions(-)

diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index e2d53560d..db427236c 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -648,218 +648,6 @@ int GetExistsFileNameJson(char *prefixDir, char *reqestedFileName, char *fileNam
 	return 0;
 }
 
-bool CheckrpIdHash(json_t *json, uint8_t *hash) {
-	char hashval[300] = {0};
-	uint8_t hash2[32] = {0};
-	
-	JsonLoadStr(json, "$.RelyingPartyEntity.id", hashval);
-	sha256hash((uint8_t *)hashval, strlen(hashval), hash2);
-
-	return !memcmp(hash, hash2, 32);
-}
-
-int MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, bool verbose, bool verbose2, bool showCBOR, bool showDERTLV) {
-	CborParser parser;
-	CborValue map, mapsmt;
-	int res;
-	char *buf;
-	uint8_t *ubuf;
-	size_t n;
-	
-	// fmt
-	res = CborMapGetKeyById(&parser, &map, data, dataLen, 1);
-	if (res)
-		return res;
-	
-	res = cbor_value_dup_text_string(&map, &buf, &n, &map);
-	cbor_check(res);
-	PrintAndLog("format: %s", buf);
-	free(buf);
-
-	// authData
-	uint8_t authData[400] = {0}; 
-	size_t authDataLen = 0;
-	res = CborMapGetKeyById(&parser, &map, data, dataLen, 2);
-	if (res)
-		return res;
-	res = cbor_value_dup_byte_string(&map, &ubuf, &n, &map);
-	cbor_check(res);
-	
-	authDataLen = n;
-	memcpy(authData, ubuf, authDataLen); 
-	
-	if (verbose2) {
-		PrintAndLog("authData[%d]: %s", n, sprint_hex_inrow(authData, authDataLen));
-	} else {
-		PrintAndLog("authData[%d]: %s...", n, sprint_hex(authData, MIN(authDataLen, 16)));
-	}
-	
-	PrintAndLog("RP ID Hash: %s", sprint_hex(ubuf, 32));
-	
-	// check RP ID Hash
-	if (CheckrpIdHash(root, ubuf)) {
-		PrintAndLog("rpIdHash OK.");
-	} else {
-		PrintAndLog("rpIdHash ERROR!");
-	}
-
-	PrintAndLog("Flags 0x%02x:", ubuf[32]);
-	if (!ubuf[32])
-		PrintAndLog("none");
-	if (ubuf[32] & 0x01)
-		PrintAndLog("up - user presence result");
-	if (ubuf[32] & 0x04)
-		PrintAndLog("uv - user verification (fingerprint scan or a PIN or ...) result");
-	if (ubuf[32] & 0x40)
-		PrintAndLog("at - attested credential data included");
-	if (ubuf[32] & 0x80)
-		PrintAndLog("ed - extension data included");
-
-	uint32_t cntr =  (uint32_t)bytes_to_num(&ubuf[33], 4);
-	PrintAndLog("Counter: %d", cntr);
-	JsonSaveInt(root, "$.AppData.Counter", cntr);
-	
-	// attestation data
-	PrintAndLog("AAGUID: %s", sprint_hex(&ubuf[37], 16));
-	JsonSaveBufAsHexCompact(root, "$.AppData.AAGUID", &ubuf[37], 16);
-	
-	// Credential ID
-	uint8_t cridlen = (uint16_t)bytes_to_num(&ubuf[53], 2);
-	PrintAndLog("Credential id[%d]: %s", cridlen, sprint_hex_inrow(&ubuf[55], cridlen));
-	JsonSaveInt(root, "$.AppData.CredentialIdLen", cridlen);
-	JsonSaveBufAsHexCompact(root, "$.AppData.CredentialId", &ubuf[55], cridlen);
-	
-	//Credentional public key (COSE_KEY)
-	uint8_t coseKey[65] = {0};
-	uint16_t cplen = n - 55 - cridlen;
-	if (verbose2) {
-		PrintAndLog("Credentional public key (COSE_KEY)[%d]: %s", cplen, sprint_hex_inrow(&ubuf[55 + cridlen], cplen));
-	} else {
-		PrintAndLog("Credentional public key (COSE_KEY)[%d]: %s...", cplen, sprint_hex(&ubuf[55 + cridlen], MIN(cplen, 16)));
-	}
-	JsonSaveBufAsHexCompact(root, "$.AppData.COSE_KEY", &ubuf[55 + cridlen], cplen);
-	
-	if (showCBOR) {
-		PrintAndLog("COSE structure:");
-		PrintAndLog("---------------- CBOR ------------------");
-		TinyCborPrintFIDOPackage(fido2COSEKey, true, &ubuf[55 + cridlen], cplen);		
-		PrintAndLog("---------------- CBOR ------------------");
-	}
-	
-	res = COSEGetECDSAKey(&ubuf[55 + cridlen], cplen, verbose, coseKey);
-	if (res) {
-		PrintAndLog("ERROR: Can't get COSE_KEY.");
-	} else {
-		PrintAndLog("COSE public key: %s", sprint_hex_inrow(coseKey, sizeof(coseKey)));
-		JsonSaveBufAsHexCompact(root, "$.AppData.COSEPublicKey", coseKey, sizeof(coseKey));
-	}
-
-	free(ubuf);
-	
-	// attStmt - we are check only as DER certificate
-	int64_t alg = 0;
-	uint8_t sign[128] = {0};
-	size_t signLen = 0;
-	uint8_t der[4097] = {0};
-	size_t derLen = 0;
-	
-	res = CborMapGetKeyById(&parser, &map, data, dataLen, 3);
-	if (res)
-		return res;
-
-	res = cbor_value_enter_container(&map, &mapsmt);
-	cbor_check(res);
-	
-	while (!cbor_value_at_end(&mapsmt)) {
-		char key[100] = {0};
-		res = CborGetStringValue(&mapsmt, key, sizeof(key), &n);
-		cbor_check(res);
-		if (!strcmp(key, "alg")) {
-			cbor_value_get_int64(&mapsmt, &alg);    
-			PrintAndLog("Alg [%lld] %s", (long long)alg, GetCOSEAlgDescription(alg));
-			res = cbor_value_advance_fixed(&mapsmt);
-			cbor_check(res);
-		}
-
-		if (!strcmp(key, "sig")) {
-			res = CborGetBinStringValue(&mapsmt, sign, sizeof(sign), &signLen);
-			cbor_check(res);
-			if (verbose2) {
-				PrintAndLog("signature [%d]: %s", signLen, sprint_hex_inrow(sign, signLen));
-			} else {
-				PrintAndLog("signature [%d]: %s...", signLen, sprint_hex(sign, MIN(signLen, 16)));
-			}
-		}
-
-		if (!strcmp(key, "x5c")) {
-			res = CborGetArrayBinStringValue(&mapsmt, der, sizeof(der), &derLen);
-			cbor_check(res);
-			if (verbose2) {
-				PrintAndLog("DER certificate[%d]:\n------------------DER-------------------", derLen);
-				dump_buffer_simple((const unsigned char *)der, derLen, NULL);
-				PrintAndLog("\n----------------DER---------------------");
-			} else {
-				PrintAndLog("DER [%d]: %s...", derLen, sprint_hex(der, MIN(derLen, 16)));
-			}
-				JsonSaveBufAsHexCompact(root, "$.AppData.DER", der, derLen);
-		}		
-	}
-	res = cbor_value_leave_container(&map, &mapsmt);
-	cbor_check(res);
-	
-	uint8_t public_key[65] = {0};
-
-	// print DER certificate in TLV view
-	if (showDERTLV) {
-		PrintAndLog("----------------DER TLV-----------------");
-		asn1_print(der, derLen, "  ");
-		PrintAndLog("----------------DER TLV-----------------");
-	}
-    FIDOCheckDERAndGetKey(der, derLen, verbose, public_key, sizeof(public_key));
-	JsonSaveBufAsHexCompact(root, "$.AppData.DERPublicKey", public_key, sizeof(public_key));
-
-	// check ANSI X9.62 format ECDSA signature (on P-256)
-	uint8_t rval[300] = {0}; 
-	uint8_t sval[300] = {0}; 
-	res = ecdsa_asn1_get_signature(sign, signLen, rval, sval);
-	if (!res) {
-		if (verbose) {
-			PrintAndLog("  r: %s", sprint_hex(rval, 32));
-			PrintAndLog("  s: %s", sprint_hex(sval, 32));
-		}
-
-		uint8_t clientDataHash[32] = {0};
-		size_t clientDataHashLen = 0;
-		res = JsonLoadBufAsHex(root, "$.ClientDataHash", clientDataHash, sizeof(clientDataHash), &clientDataHashLen);
-		if (res || clientDataHashLen != 32) {
-			PrintAndLog("ERROR: Can't get clientDataHash from json!");
-			return 2;
-		}			
-		
-		uint8_t xbuf[4096] = {0};
-		size_t xbuflen = 0;
-		res = FillBuffer(xbuf, sizeof(xbuf), &xbuflen,
-			authData, authDataLen,  // rpIdHash[32] + flags[1] + signCount[4] + ...
-			clientDataHash, 32,     // Hash of the serialized client data. "$.ClientDataHash" from json
-			NULL, 0);
-		//PrintAndLog("--xbuf(%d)[%d]: %s", res, xbuflen, sprint_hex(xbuf, xbuflen));
-		res = ecdsa_signature_verify(public_key, xbuf, xbuflen, sign, signLen);
-		if (res) {
-			if (res == -0x4e00) {
-				PrintAndLog("Signature is NOT VALID.");
-			} else {
-				PrintAndLog("Other signature check error: %x %s", (res<0)?-res:res, ecdsa_get_error(res));
-			}
-		} else {
-			PrintAndLog("Signature is OK.");
-		}	
-	} else {
-		PrintAndLog("Invalid signature. res=%d.", res);
-	}
-	
-	return 0;
-}
-
 int CmdHFFido2MakeCredential(const char *cmd) {
 	json_error_t error;
 	json_t *root = NULL;
@@ -1058,18 +846,18 @@ int CmdHFFido2GetAssertion(const char *cmd) {
 		DropField();
 		return 2;
 	}
-/*
-	res = FIDO2CreateMakeCredentionalReq(root, data, sizeof(data), &datalen);
+
+	res = FIDO2CreateGetAssertionReq(root, data, sizeof(data), &datalen);
 	if (res)
 		return res;
 	
 	if (showCBOR) {
 		PrintAndLog("CBOR get assertion request:");
 		PrintAndLog("---------------- CBOR ------------------");
-		TinyCborPrintFIDOPackage(fido2CmdMakeCredential, false, data, datalen);
+		TinyCborPrintFIDOPackage(fido2CmdGetAssertion, false, data, datalen);
 		PrintAndLog("---------------- CBOR ------------------");
 	}
-*/	
+	
 	res = FIDO2GetAssertion(data, datalen, buf,  sizeof(buf), &len, &sw);
 	DropField();
 	if (res) {
diff --git a/client/fido/fido2.json b/client/fido/fido2.json
index c158ef117..66449144f 100644
--- a/client/fido/fido2.json
+++ b/client/fido/fido2.json
@@ -25,5 +25,9 @@
   "options": {
     "uv": false,
     "rk": false
+  },
+  "GetAssertionOptions": {
+    "up": true,
+    "uv": false
   }
-}
\ No newline at end of file
+}
diff --git a/client/fido/fidocore.c b/client/fido/fidocore.c
index c65959eff..22aee7c9f 100644
--- a/client/fido/fidocore.c
+++ b/client/fido/fidocore.c
@@ -21,6 +21,7 @@
 #include "crypto/asn1utils.h"
 #include "crypto/libpcrypto.h"
 #include "fido/additional_ca.h"
+#include "fido/cose.h"
 
 typedef struct {
 	uint8_t ErrorCode;
@@ -367,4 +368,263 @@ int FIDO2CreateMakeCredentionalReq(json_t *root, uint8_t *data, size_t maxdatale
 	return 0;
 }
 
+bool CheckrpIdHash(json_t *json, uint8_t *hash) {
+	char hashval[300] = {0};
+	uint8_t hash2[32] = {0};
+	
+	JsonLoadStr(json, "$.RelyingPartyEntity.id", hashval);
+	sha256hash((uint8_t *)hashval, strlen(hashval), hash2);
 
+	return !memcmp(hash, hash2, 32);
+}
+
+int MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, bool verbose, bool verbose2, bool showCBOR, bool showDERTLV) {
+	CborParser parser;
+	CborValue map, mapsmt;
+	int res;
+	char *buf;
+	uint8_t *ubuf;
+	size_t n;
+	
+	// fmt
+	res = CborMapGetKeyById(&parser, &map, data, dataLen, 1);
+	if (res)
+		return res;
+	
+	res = cbor_value_dup_text_string(&map, &buf, &n, &map);
+	cbor_check(res);
+	PrintAndLog("format: %s", buf);
+	free(buf);
+
+	// authData
+	uint8_t authData[400] = {0}; 
+	size_t authDataLen = 0;
+	res = CborMapGetKeyById(&parser, &map, data, dataLen, 2);
+	if (res)
+		return res;
+	res = cbor_value_dup_byte_string(&map, &ubuf, &n, &map);
+	cbor_check(res);
+	
+	authDataLen = n;
+	memcpy(authData, ubuf, authDataLen); 
+	
+	if (verbose2) {
+		PrintAndLog("authData[%d]: %s", n, sprint_hex_inrow(authData, authDataLen));
+	} else {
+		PrintAndLog("authData[%d]: %s...", n, sprint_hex(authData, MIN(authDataLen, 16)));
+	}
+	
+	PrintAndLog("RP ID Hash: %s", sprint_hex(ubuf, 32));
+	
+	// check RP ID Hash
+	if (CheckrpIdHash(root, ubuf)) {
+		PrintAndLog("rpIdHash OK.");
+	} else {
+		PrintAndLog("rpIdHash ERROR!");
+	}
+
+	PrintAndLog("Flags 0x%02x:", ubuf[32]);
+	if (!ubuf[32])
+		PrintAndLog("none");
+	if (ubuf[32] & 0x01)
+		PrintAndLog("up - user presence result");
+	if (ubuf[32] & 0x04)
+		PrintAndLog("uv - user verification (fingerprint scan or a PIN or ...) result");
+	if (ubuf[32] & 0x40)
+		PrintAndLog("at - attested credential data included");
+	if (ubuf[32] & 0x80)
+		PrintAndLog("ed - extension data included");
+
+	uint32_t cntr =  (uint32_t)bytes_to_num(&ubuf[33], 4);
+	PrintAndLog("Counter: %d", cntr);
+	JsonSaveInt(root, "$.AppData.Counter", cntr);
+	
+	// attestation data
+	PrintAndLog("AAGUID: %s", sprint_hex(&ubuf[37], 16));
+	JsonSaveBufAsHexCompact(root, "$.AppData.AAGUID", &ubuf[37], 16);
+	
+	// Credential ID
+	uint8_t cridlen = (uint16_t)bytes_to_num(&ubuf[53], 2);
+	PrintAndLog("Credential id[%d]: %s", cridlen, sprint_hex_inrow(&ubuf[55], cridlen));
+	JsonSaveInt(root, "$.AppData.CredentialIdLen", cridlen);
+	JsonSaveBufAsHexCompact(root, "$.AppData.CredentialId", &ubuf[55], cridlen);
+	
+	//Credentional public key (COSE_KEY)
+	uint8_t coseKey[65] = {0};
+	uint16_t cplen = n - 55 - cridlen;
+	if (verbose2) {
+		PrintAndLog("Credentional public key (COSE_KEY)[%d]: %s", cplen, sprint_hex_inrow(&ubuf[55 + cridlen], cplen));
+	} else {
+		PrintAndLog("Credentional public key (COSE_KEY)[%d]: %s...", cplen, sprint_hex(&ubuf[55 + cridlen], MIN(cplen, 16)));
+	}
+	JsonSaveBufAsHexCompact(root, "$.AppData.COSE_KEY", &ubuf[55 + cridlen], cplen);
+	
+	if (showCBOR) {
+		PrintAndLog("COSE structure:");
+		PrintAndLog("---------------- CBOR ------------------");
+		TinyCborPrintFIDOPackage(fido2COSEKey, true, &ubuf[55 + cridlen], cplen);		
+		PrintAndLog("---------------- CBOR ------------------");
+	}
+	
+	res = COSEGetECDSAKey(&ubuf[55 + cridlen], cplen, verbose, coseKey);
+	if (res) {
+		PrintAndLog("ERROR: Can't get COSE_KEY.");
+	} else {
+		PrintAndLog("COSE public key: %s", sprint_hex_inrow(coseKey, sizeof(coseKey)));
+		JsonSaveBufAsHexCompact(root, "$.AppData.COSEPublicKey", coseKey, sizeof(coseKey));
+	}
+
+	free(ubuf);
+	
+	// attStmt - we are check only as DER certificate
+	int64_t alg = 0;
+	uint8_t sign[128] = {0};
+	size_t signLen = 0;
+	uint8_t der[4097] = {0};
+	size_t derLen = 0;
+	
+	res = CborMapGetKeyById(&parser, &map, data, dataLen, 3);
+	if (res)
+		return res;
+
+	res = cbor_value_enter_container(&map, &mapsmt);
+	cbor_check(res);
+	
+	while (!cbor_value_at_end(&mapsmt)) {
+		char key[100] = {0};
+		res = CborGetStringValue(&mapsmt, key, sizeof(key), &n);
+		cbor_check(res);
+		if (!strcmp(key, "alg")) {
+			cbor_value_get_int64(&mapsmt, &alg);    
+			PrintAndLog("Alg [%lld] %s", (long long)alg, GetCOSEAlgDescription(alg));
+			res = cbor_value_advance_fixed(&mapsmt);
+			cbor_check(res);
+		}
+
+		if (!strcmp(key, "sig")) {
+			res = CborGetBinStringValue(&mapsmt, sign, sizeof(sign), &signLen);
+			cbor_check(res);
+			if (verbose2) {
+				PrintAndLog("signature [%d]: %s", signLen, sprint_hex_inrow(sign, signLen));
+			} else {
+				PrintAndLog("signature [%d]: %s...", signLen, sprint_hex(sign, MIN(signLen, 16)));
+			}
+		}
+
+		if (!strcmp(key, "x5c")) {
+			res = CborGetArrayBinStringValue(&mapsmt, der, sizeof(der), &derLen);
+			cbor_check(res);
+			if (verbose2) {
+				PrintAndLog("DER certificate[%d]:\n------------------DER-------------------", derLen);
+				dump_buffer_simple((const unsigned char *)der, derLen, NULL);
+				PrintAndLog("\n----------------DER---------------------");
+			} else {
+				PrintAndLog("DER [%d]: %s...", derLen, sprint_hex(der, MIN(derLen, 16)));
+			}
+				JsonSaveBufAsHexCompact(root, "$.AppData.DER", der, derLen);
+		}		
+	}
+	res = cbor_value_leave_container(&map, &mapsmt);
+	cbor_check(res);
+	
+	uint8_t public_key[65] = {0};
+
+	// print DER certificate in TLV view
+	if (showDERTLV) {
+		PrintAndLog("----------------DER TLV-----------------");
+		asn1_print(der, derLen, "  ");
+		PrintAndLog("----------------DER TLV-----------------");
+	}
+    FIDOCheckDERAndGetKey(der, derLen, verbose, public_key, sizeof(public_key));
+	JsonSaveBufAsHexCompact(root, "$.AppData.DERPublicKey", public_key, sizeof(public_key));
+
+	// check ANSI X9.62 format ECDSA signature (on P-256)
+	uint8_t rval[300] = {0}; 
+	uint8_t sval[300] = {0}; 
+	res = ecdsa_asn1_get_signature(sign, signLen, rval, sval);
+	if (!res) {
+		if (verbose) {
+			PrintAndLog("  r: %s", sprint_hex(rval, 32));
+			PrintAndLog("  s: %s", sprint_hex(sval, 32));
+		}
+
+		uint8_t clientDataHash[32] = {0};
+		size_t clientDataHashLen = 0;
+		res = JsonLoadBufAsHex(root, "$.ClientDataHash", clientDataHash, sizeof(clientDataHash), &clientDataHashLen);
+		if (res || clientDataHashLen != 32) {
+			PrintAndLog("ERROR: Can't get clientDataHash from json!");
+			return 2;
+		}			
+		
+		uint8_t xbuf[4096] = {0};
+		size_t xbuflen = 0;
+		res = FillBuffer(xbuf, sizeof(xbuf), &xbuflen,
+			authData, authDataLen,  // rpIdHash[32] + flags[1] + signCount[4] + ...
+			clientDataHash, 32,     // Hash of the serialized client data. "$.ClientDataHash" from json
+			NULL, 0);
+		//PrintAndLog("--xbuf(%d)[%d]: %s", res, xbuflen, sprint_hex(xbuf, xbuflen));
+		res = ecdsa_signature_verify(public_key, xbuf, xbuflen, sign, signLen);
+		if (res) {
+			if (res == -0x4e00) {
+				PrintAndLog("Signature is NOT VALID.");
+			} else {
+				PrintAndLog("Other signature check error: %x %s", (res<0)?-res:res, ecdsa_get_error(res));
+			}
+		} else {
+			PrintAndLog("Signature is OK.");
+		}	
+	} else {
+		PrintAndLog("Invalid signature. res=%d.", res);
+	}
+	
+	return 0;
+}
+
+int FIDO2CreateGetAssertionReq(json_t *root, uint8_t *data, size_t maxdatalen, size_t *datalen) {
+	if (datalen)
+		*datalen = 0;
+	if (!root || !data || !maxdatalen)
+		return 1;
+
+	int res;
+	CborEncoder encoder;
+	CborEncoder map;
+	
+	cbor_encoder_init(&encoder, data, maxdatalen, 0);
+
+	// create main map
+	res = cbor_encoder_create_map(&encoder, &map, 5);
+	fido_check_if(res) {
+		// rpId
+		res = cbor_encode_uint(&map, 1);
+		fido_check_if(res) {
+//		char hashval[300] = {0};
+//		JsonLoadStr(json, "$.RelyingPartyEntity.id", hashval);
+
+		res = CBOREncodeElm(root, "RelyingPartyEntity", &map);
+		fido_check(res);
+	}
+
+		// clientDataHash
+		res = cbor_encode_uint(&map, 2);
+		fido_check_if(res) {
+			res = CBOREncodeClientDataHash(root, &map);
+			fido_check(res);
+		}
+
+		// options
+		res = cbor_encode_uint(&map, 5);
+		fido_check_if(res) {
+			res = CBOREncodeElm(root, "GetAssertionOptions", &map);
+			fido_check(res);
+		}
+	}
+	res = cbor_encoder_close_container(&encoder, &map);
+	fido_check(res);
+	
+	size_t len = cbor_encoder_get_buffer_size(&encoder, data);
+	if (datalen)
+		*datalen = len;
+	
+	return 0;
+}
diff --git a/client/fido/fidocore.h b/client/fido/fidocore.h
index 5d6dc4be1..4baf029bb 100644
--- a/client/fido/fidocore.h
+++ b/client/fido/fidocore.h
@@ -48,6 +48,9 @@ extern int FIDOCheckDERAndGetKey(uint8_t *der, size_t derLen, bool verbose, uint
 extern char *fido2GetCmdMemberDescription(uint8_t cmdCode, bool isResponse, int memberNum);
 extern char *fido2GetCmdErrorDescription(uint8_t errorCode);
 
+extern bool CheckrpIdHash(json_t *json, uint8_t *hash);
 extern int FIDO2CreateMakeCredentionalReq(json_t *root, uint8_t *data, size_t maxdatalen, size_t *datalen);
+extern int MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, bool verbose, bool verbose2, bool showCBOR, bool showDERTLV);
+extern int FIDO2CreateGetAssertionReq(json_t *root, uint8_t *data, size_t maxdatalen, size_t *datalen);
 
 #endif /* __FIDOCORE_H__ */

From 5efc2eced680c9d83f7099c06e6f0965c56ee0cf Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 27 Nov 2018 12:28:36 +0200
Subject: [PATCH 0252/1938] refactoring

---
 client/fido/cbortools.c | 10 ++++++++++
 client/fido/cbortools.h |  2 ++
 client/fido/fidocore.c  | 10 ----------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/client/fido/cbortools.c b/client/fido/cbortools.c
index 1693e6858..ad6931030 100644
--- a/client/fido/cbortools.c
+++ b/client/fido/cbortools.c
@@ -453,3 +453,13 @@ CborError CborGetStringValueBuf(CborValue *elm) {
 	
 	return CborGetStringValue(elm, stringBuf, sizeof(stringBuf), NULL);
 };
+
+int CBOREncodeElm(json_t *root, char *rootElmId, CborEncoder *encoder) {
+	json_t *elm = json_object_get(root, rootElmId);
+	if (!elm)
+		return 1;
+	
+	int res = JsonToCbor(elm, encoder);
+
+	return res;
+}
diff --git a/client/fido/cbortools.h b/client/fido/cbortools.h
index a57b4b761..c7ef7658a 100644
--- a/client/fido/cbortools.h
+++ b/client/fido/cbortools.h
@@ -32,4 +32,6 @@ extern CborError CborGetArrayStringValue(CborValue *elm, char *data, size_t maxd
 extern CborError CborGetStringValue(CborValue *elm, char *data, size_t maxdatalen, size_t *datalen);
 extern CborError CborGetStringValueBuf(CborValue *elm);
 
+extern int CBOREncodeElm(json_t *root, char *rootElmId, CborEncoder *encoder);
+
 #endif /* __CBORTOOLS_H__ */
diff --git a/client/fido/fidocore.c b/client/fido/fidocore.c
index 22aee7c9f..651208441 100644
--- a/client/fido/fidocore.c
+++ b/client/fido/fidocore.c
@@ -298,16 +298,6 @@ int CBOREncodeClientDataHash(json_t *root, CborEncoder *encoder) {
 	return 0;
 }
 
-int CBOREncodeElm(json_t *root, char *rootElmId, CborEncoder *encoder) {
-	json_t *elm = json_object_get(root, rootElmId);
-	if (!elm)
-		return 1;
-	
-	int res = JsonToCbor(elm, encoder);
-
-	return res;
-}
-
 int FIDO2CreateMakeCredentionalReq(json_t *root, uint8_t *data, size_t maxdatalen, size_t *datalen) {
 	if (datalen)
 		*datalen = 0;

From a9be05dbf72822d68019a9b26119928c8c687cb7 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 27 Nov 2018 12:31:39 +0200
Subject: [PATCH 0253/1938] refactoring

---
 client/fido/fido2.json | 2 +-
 client/fido/fidocore.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/fido/fido2.json b/client/fido/fido2.json
index 66449144f..8ecd04103 100644
--- a/client/fido/fido2.json
+++ b/client/fido/fido2.json
@@ -22,7 +22,7 @@
       ".name": "RS256"
     }
   ],
-  "options": {
+  "MakeCredentialOptions": {
     "uv": false,
     "rk": false
   },
diff --git a/client/fido/fidocore.c b/client/fido/fidocore.c
index 651208441..21889cfd6 100644
--- a/client/fido/fidocore.c
+++ b/client/fido/fidocore.c
@@ -344,7 +344,7 @@ int FIDO2CreateMakeCredentionalReq(json_t *root, uint8_t *data, size_t maxdatale
 		// options
 		res = cbor_encode_uint(&map, 7);
 		fido_check_if(res) {
-			res = CBOREncodeElm(root, "options", &map);
+			res = CBOREncodeElm(root, "MakeCredentialOptions", &map);
 			fido_check(res);
 		}
 	}

From 26cf350713771e8b3f386cd573a4626cf80932e0 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 27 Nov 2018 12:34:28 +0200
Subject: [PATCH 0254/1938] refactoring

---
 client/fido/cbortools.c | 16 ++++++++++++++++
 client/fido/cbortools.h |  1 +
 client/fido/fidocore.c  | 16 ----------------
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/client/fido/cbortools.c b/client/fido/cbortools.c
index ad6931030..59dbe9b4d 100644
--- a/client/fido/cbortools.c
+++ b/client/fido/cbortools.c
@@ -463,3 +463,19 @@ int CBOREncodeElm(json_t *root, char *rootElmId, CborEncoder *encoder) {
 
 	return res;
 }
+
+CborError CBOREncodeClientDataHash(json_t *root, CborEncoder *encoder) {
+	uint8_t buf[100] = {0};
+	size_t jlen;
+
+	JsonLoadBufAsHex(root, "$.ClientDataHash", buf, sizeof(buf), &jlen);
+	
+	// fill with 0x00 if not found
+	if (!jlen)
+		jlen = 32;
+	
+	int res = cbor_encode_byte_string(encoder, buf, jlen);
+	cbor_check(res);
+
+	return 0;
+}
diff --git a/client/fido/cbortools.h b/client/fido/cbortools.h
index c7ef7658a..1e3fa8c0f 100644
--- a/client/fido/cbortools.h
+++ b/client/fido/cbortools.h
@@ -33,5 +33,6 @@ extern CborError CborGetStringValue(CborValue *elm, char *data, size_t maxdatale
 extern CborError CborGetStringValueBuf(CborValue *elm);
 
 extern int CBOREncodeElm(json_t *root, char *rootElmId, CborEncoder *encoder);
+extern CborError CBOREncodeClientDataHash(json_t *root, CborEncoder *encoder);
 
 #endif /* __CBORTOOLS_H__ */
diff --git a/client/fido/fidocore.c b/client/fido/fidocore.c
index 21889cfd6..88d386f02 100644
--- a/client/fido/fidocore.c
+++ b/client/fido/fidocore.c
@@ -282,22 +282,6 @@ int FIDOCheckDERAndGetKey(uint8_t *der, size_t derLen, bool verbose, uint8_t *pu
 #define fido_check_if(r) if ((r) != CborNoError) {return r;} else
 #define fido_check(r) if ((r) != CborNoError) return r;
 
-int CBOREncodeClientDataHash(json_t *root, CborEncoder *encoder) {
-	uint8_t buf[100] = {0};
-	size_t jlen;
-
-	JsonLoadBufAsHex(root, "$.ClientDataHash", buf, sizeof(buf), &jlen);
-	
-	// fill with 0x00 if not found
-	if (!jlen)
-		jlen = 32;
-	
-	int res = cbor_encode_byte_string(encoder, buf, jlen);
-	fido_check(res);
-
-	return 0;
-}
-
 int FIDO2CreateMakeCredentionalReq(json_t *root, uint8_t *data, size_t maxdatalen, size_t *datalen) {
 	if (datalen)
 		*datalen = 0;

From 317ea305298d8327ecf601815514479ccf04eb59 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 27 Nov 2018 13:45:29 +0200
Subject: [PATCH 0255/1938] refactoring and GetAssertion works

---
 client/cmdhffido.c      | 20 +++++++++++++++++---
 client/fido/cbortools.c |  7 ++++++-
 client/fido/fidocore.c  | 15 +++++++++------
 client/fido/fidocore.h  |  3 ++-
 4 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index db427236c..b63f8582f 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -759,7 +759,7 @@ int CmdHFFido2MakeCredential(const char *cmd) {
 	}
 
 	// parse returned cbor
-	MakeCredentionalParseRes(root, &buf[1], len - 1, verbose, verbose2, showCBOR, showDERTLV);
+	FIDO2MakeCredentionalParseRes(root, &buf[1], len - 1, verbose, verbose2, showCBOR, showDERTLV);
 	
 	if (root) {
 		res = json_dump_file(root, fname, JSON_INDENT(2));
@@ -875,14 +875,28 @@ int CmdHFFido2GetAssertion(const char *cmd) {
 		return 0;
 	}
 
-/*	PrintAndLog("MakeCredential result (%d b) OK.", len);
+	PrintAndLog("GetAssertion result (%d b) OK.", len);
 	if (showCBOR) {
 		PrintAndLog("CBOR get assertion response:");
 		PrintAndLog("---------------- CBOR ------------------");
-		TinyCborPrintFIDOPackage(fido2CmdMakeCredential, true, &buf[1], len - 1);
+		TinyCborPrintFIDOPackage(fido2CmdGetAssertion, true, &buf[1], len - 1);
 		PrintAndLog("---------------- CBOR ------------------");
 	}
+
+	// parse returned cbor
+	FIDO2GetAssertionParseRes(root, &buf[1], len - 1, verbose, verbose2, showCBOR);
+	
+/*	if (root) {
+		res = json_dump_file(root, fname, JSON_INDENT(2));
+		if (res) {
+			PrintAndLog("ERROR: can't save the file: %s", fname);
+			return 200;
+		}
+		PrintAndLog("File `%s` saved.", fname);
+	}
 */
+	json_decref(root);
+	
 	return 0;
 };
 
diff --git a/client/fido/cbortools.c b/client/fido/cbortools.c
index 59dbe9b4d..8ab104a1c 100644
--- a/client/fido/cbortools.c
+++ b/client/fido/cbortools.c
@@ -455,7 +455,12 @@ CborError CborGetStringValueBuf(CborValue *elm) {
 };
 
 int CBOREncodeElm(json_t *root, char *rootElmId, CborEncoder *encoder) {
-	json_t *elm = json_object_get(root, rootElmId);
+	json_t *elm = NULL;
+	if (rootElmId && strlen(rootElmId) && rootElmId[0] == '$')
+		elm = json_path_get(root, rootElmId);
+	else
+		elm = json_object_get(root, rootElmId);
+	
 	if (!elm)
 		return 1;
 	
diff --git a/client/fido/fidocore.c b/client/fido/fidocore.c
index 88d386f02..38b147125 100644
--- a/client/fido/fidocore.c
+++ b/client/fido/fidocore.c
@@ -352,7 +352,7 @@ bool CheckrpIdHash(json_t *json, uint8_t *hash) {
 	return !memcmp(hash, hash2, 32);
 }
 
-int MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, bool verbose, bool verbose2, bool showCBOR, bool showDERTLV) {
+int FIDO2MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, bool verbose, bool verbose2, bool showCBOR, bool showDERTLV) {
 	CborParser parser;
 	CborValue map, mapsmt;
 	int res;
@@ -567,17 +567,15 @@ int FIDO2CreateGetAssertionReq(json_t *root, uint8_t *data, size_t maxdatalen, s
 	cbor_encoder_init(&encoder, data, maxdatalen, 0);
 
 	// create main map
-	res = cbor_encoder_create_map(&encoder, &map, 5);
+	res = cbor_encoder_create_map(&encoder, &map, 3);
 	fido_check_if(res) {
 		// rpId
 		res = cbor_encode_uint(&map, 1);
 		fido_check_if(res) {
-//		char hashval[300] = {0};
-//		JsonLoadStr(json, "$.RelyingPartyEntity.id", hashval);
 
-		res = CBOREncodeElm(root, "RelyingPartyEntity", &map);
+		res = CBOREncodeElm(root, "$.RelyingPartyEntity.id", &map);
 		fido_check(res);
-	}
+		}
 
 		// clientDataHash
 		res = cbor_encode_uint(&map, 2);
@@ -602,3 +600,8 @@ int FIDO2CreateGetAssertionReq(json_t *root, uint8_t *data, size_t maxdatalen, s
 	
 	return 0;
 }
+
+int FIDO2GetAssertionParseRes(json_t *root, uint8_t *data, size_t dataLen, bool verbose, bool verbose2, bool showCBOR) {
+	
+	return 0;
+}
diff --git a/client/fido/fidocore.h b/client/fido/fidocore.h
index 4baf029bb..092261104 100644
--- a/client/fido/fidocore.h
+++ b/client/fido/fidocore.h
@@ -50,7 +50,8 @@ extern char *fido2GetCmdErrorDescription(uint8_t errorCode);
 
 extern bool CheckrpIdHash(json_t *json, uint8_t *hash);
 extern int FIDO2CreateMakeCredentionalReq(json_t *root, uint8_t *data, size_t maxdatalen, size_t *datalen);
-extern int MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, bool verbose, bool verbose2, bool showCBOR, bool showDERTLV);
+extern int FIDO2MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, bool verbose, bool verbose2, bool showCBOR, bool showDERTLV);
 extern int FIDO2CreateGetAssertionReq(json_t *root, uint8_t *data, size_t maxdatalen, size_t *datalen);
+extern int FIDO2GetAssertionParseRes(json_t *root, uint8_t *data, size_t dataLen, bool verbose, bool verbose2, bool showCBOR);
 
 #endif /* __FIDOCORE_H__ */

From f26d3396e822c2d75ca0ea5b6c178596fe53870b Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 27 Nov 2018 14:01:47 +0200
Subject: [PATCH 0256/1938] get credential

---
 client/fido/fidocore.c | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/client/fido/fidocore.c b/client/fido/fidocore.c
index 38b147125..5c26785de 100644
--- a/client/fido/fidocore.c
+++ b/client/fido/fidocore.c
@@ -602,6 +602,46 @@ int FIDO2CreateGetAssertionReq(json_t *root, uint8_t *data, size_t maxdatalen, s
 }
 
 int FIDO2GetAssertionParseRes(json_t *root, uint8_t *data, size_t dataLen, bool verbose, bool verbose2, bool showCBOR) {
+	CborParser parser;
+	CborValue map, mapint;
+	int res;
+//	char *buf;
+//	uint8_t *ubuf;
+	size_t n;
+	
+	// credential
+	res = CborMapGetKeyById(&parser, &map, data, dataLen, 1);
+	if (res)
+		return res;
+
+	res = cbor_value_enter_container(&map, &mapint);
+	cbor_check(res);
+	
+	while (!cbor_value_at_end(&mapint)) {
+		char key[100] = {0};
+		res = CborGetStringValue(&mapint, key, sizeof(key), &n);
+		cbor_check(res);
+
+		if (!strcmp(key, "type")) {
+			char ctype[200] = {0};
+			res = CborGetStringValue(&mapint, ctype, sizeof(ctype), &n);
+			cbor_check(res);
+			PrintAndLog("credential type: %s", ctype);
+		}
+
+		if (!strcmp(key, "id")) {
+			uint8_t cid[200] = {0};
+			res = CborGetBinStringValue(&mapint, cid, sizeof(cid), &n);
+			cbor_check(res);
+			PrintAndLog("credential id [%d]: %s", n, sprint_hex(cid, n));
+		}
+	}
+	res = cbor_value_leave_container(&map, &mapint);
+	cbor_check(res);
+	
+	
+	
+	
 	
 	return 0;
 }

From a0a979abc610bb53b458b3e5b08c727f500e3e71 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 27 Nov 2018 14:34:51 +0200
Subject: [PATCH 0257/1938] added show GetAssertion results

---
 client/cmdhffido.c     |   4 +-
 client/fido/fidocore.c | 108 ++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 108 insertions(+), 4 deletions(-)

diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index b63f8582f..57f8e5f2b 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -886,7 +886,7 @@ int CmdHFFido2GetAssertion(const char *cmd) {
 	// parse returned cbor
 	FIDO2GetAssertionParseRes(root, &buf[1], len - 1, verbose, verbose2, showCBOR);
 	
-/*	if (root) {
+	if (root) {
 		res = json_dump_file(root, fname, JSON_INDENT(2));
 		if (res) {
 			PrintAndLog("ERROR: can't save the file: %s", fname);
@@ -894,7 +894,7 @@ int CmdHFFido2GetAssertion(const char *cmd) {
 		}
 		PrintAndLog("File `%s` saved.", fname);
 	}
-*/
+
 	json_decref(root);
 	
 	return 0;
diff --git a/client/fido/fidocore.c b/client/fido/fidocore.c
index 5c26785de..239c09ea3 100644
--- a/client/fido/fidocore.c
+++ b/client/fido/fidocore.c
@@ -605,8 +605,7 @@ int FIDO2GetAssertionParseRes(json_t *root, uint8_t *data, size_t dataLen, bool
 	CborParser parser;
 	CborValue map, mapint;
 	int res;
-//	char *buf;
-//	uint8_t *ubuf;
+	uint8_t *ubuf;
 	size_t n;
 	
 	// credential
@@ -639,9 +638,114 @@ int FIDO2GetAssertionParseRes(json_t *root, uint8_t *data, size_t dataLen, bool
 	res = cbor_value_leave_container(&map, &mapint);
 	cbor_check(res);
 	
+	// authData
+	uint8_t authData[400] = {0}; 
+	size_t authDataLen = 0;
+	res = CborMapGetKeyById(&parser, &map, data, dataLen, 2);
+	if (res)
+		return res;
+	res = cbor_value_dup_byte_string(&map, &ubuf, &n, &map);
+	cbor_check(res);
 	
+	authDataLen = n;
+	memcpy(authData, ubuf, authDataLen); 
 	
+	if (verbose2) {
+		PrintAndLog("authData[%d]: %s", n, sprint_hex_inrow(authData, authDataLen));
+	} else {
+		PrintAndLog("authData[%d]: %s...", n, sprint_hex(authData, MIN(authDataLen, 16)));
+	}
 	
+	PrintAndLog("RP ID Hash: %s", sprint_hex(ubuf, 32));
+	
+	// check RP ID Hash
+	if (CheckrpIdHash(root, ubuf)) {
+		PrintAndLog("rpIdHash OK.");
+	} else {
+		PrintAndLog("rpIdHash ERROR!");
+	}
+
+	PrintAndLog("Flags 0x%02x:", ubuf[32]);
+	if (!ubuf[32])
+		PrintAndLog("none");
+	if (ubuf[32] & 0x01)
+		PrintAndLog("up - user presence result");
+	if (ubuf[32] & 0x04)
+		PrintAndLog("uv - user verification (fingerprint scan or a PIN or ...) result");
+	if (ubuf[32] & 0x40)
+		PrintAndLog("at - attested credential data included");
+	if (ubuf[32] & 0x80)
+		PrintAndLog("ed - extension data included");
+
+	uint32_t cntr =  (uint32_t)bytes_to_num(&ubuf[33], 4);
+	PrintAndLog("Counter: %d", cntr);
+	JsonSaveInt(root, "$.AppData.Counter", cntr);
+	
+	free(ubuf);
+	
+	// signature
+	res = CborMapGetKeyById(&parser, &map, data, dataLen, 3);
+	if (res)
+		return res;
+	res = cbor_value_dup_byte_string(&map, &ubuf, &n, &map);
+	cbor_check(res);
+	
+	uint8_t *sign = ubuf;
+	size_t signLen = n;
+
+	cbor_check(res);
+	if (verbose2) {
+		PrintAndLog("signature [%d]: %s", signLen, sprint_hex_inrow(sign, signLen));
+	} else {
+		PrintAndLog("signature [%d]: %s...", signLen, sprint_hex(sign, MIN(signLen, 16)));
+	}
+
+	// get public key from json
+	uint8_t PublicKey[65] = {0};
+	size_t PublicKeyLen = 0;
+	JsonLoadBufAsHex(root, "$.AppData.COSEPublicKey", PublicKey, 65, &PublicKeyLen);
+	PrintAndLog("--pkey[%d]: %s", PublicKeyLen, sprint_hex(PublicKey, PublicKeyLen));
+	
+	// check ANSI X9.62 format ECDSA signature (on P-256)
+	uint8_t rval[300] = {0}; 
+	uint8_t sval[300] = {0}; 
+	res = ecdsa_asn1_get_signature(sign, signLen, rval, sval);
+	if (!res) {
+		if (verbose) {
+			PrintAndLog("  r: %s", sprint_hex(rval, 32));
+			PrintAndLog("  s: %s", sprint_hex(sval, 32));
+		}
+
+		uint8_t clientDataHash[32] = {0};
+		size_t clientDataHashLen = 0;
+		res = JsonLoadBufAsHex(root, "$.ClientDataHash", clientDataHash, sizeof(clientDataHash), &clientDataHashLen);
+		if (res || clientDataHashLen != 32) {
+			PrintAndLog("ERROR: Can't get clientDataHash from json!");
+			return 2;
+		}			
+		
+		uint8_t xbuf[4096] = {0};
+		size_t xbuflen = 0;
+		res = FillBuffer(xbuf, sizeof(xbuf), &xbuflen,
+			authData, authDataLen,  // rpIdHash[32] + flags[1] + signCount[4] 
+			clientDataHash, 32,     // Hash of the serialized client data. "$.ClientDataHash" from json
+			NULL, 0);
+		PrintAndLog("--xbuf(%d)[%d]: %s", res, xbuflen, sprint_hex(xbuf, xbuflen));
+		res = ecdsa_signature_verify(PublicKey, xbuf, xbuflen, sign, signLen);
+		if (res) {
+			if (res == -0x4e00) {
+				PrintAndLog("Signature is NOT VALID.");
+			} else {
+				PrintAndLog("Other signature check error: %x %s", (res<0)?-res:res, ecdsa_get_error(res));
+			}
+		} else {
+			PrintAndLog("Signature is OK.");
+		}	
+	} else {
+		PrintAndLog("Invalid signature. res=%d.", res);
+	}
+
+	free(ubuf);
 	
 	return 0;
 }

From ac5448a117f2d4cbd85a36c9c085f5143d22e738 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 27 Nov 2018 14:57:00 +0200
Subject: [PATCH 0258/1938] GetAssertion works

---
 client/fido/fidocore.c | 46 ++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 44 insertions(+), 2 deletions(-)

diff --git a/client/fido/fidocore.c b/client/fido/fidocore.c
index 239c09ea3..a423a6434 100644
--- a/client/fido/fidocore.c
+++ b/client/fido/fidocore.c
@@ -682,6 +682,49 @@ int FIDO2GetAssertionParseRes(json_t *root, uint8_t *data, size_t dataLen, bool
 	JsonSaveInt(root, "$.AppData.Counter", cntr);
 	
 	free(ubuf);
+
+	// publicKeyCredentialUserEntity
+	res = CborMapGetKeyById(&parser, &map, data, dataLen, 4);
+	if (res)
+		return res;
+	
+	res = cbor_value_enter_container(&map, &mapint);
+	cbor_check(res);
+	
+	while (!cbor_value_at_end(&mapint)) {
+		char key[100] = {0};
+		res = CborGetStringValue(&mapint, key, sizeof(key), &n);
+		cbor_check(res);
+
+		if (!strcmp(key, "name") || !strcmp(key, "displayName")) {
+			char cname[200] = {0};
+			res = CborGetStringValue(&mapint, cname, sizeof(cname), &n);
+			cbor_check(res);
+			PrintAndLog("UserEntity %s: %s", key, cname);
+		}
+
+		if (!strcmp(key, "id")) {
+			uint8_t cid[200] = {0};
+			res = CborGetBinStringValue(&mapint, cid, sizeof(cid), &n);
+			cbor_check(res);
+			PrintAndLog("UserEntity id [%d]: %s", n, sprint_hex(cid, n));
+			
+			// check
+			uint8_t idbuf[100] = {0};
+			size_t idbuflen;
+
+			JsonLoadBufAsHex(root, "$.UserEntity.id", idbuf, sizeof(idbuf), &idbuflen);
+
+			if (idbuflen == n && !memcmp(idbuf, cid, idbuflen)) {
+				PrintAndLog("UserEntity id OK.");
+			} else {
+				PrintAndLog("ERROR: Wrong UserEntity id (from json: %s)", sprint_hex(idbuf, idbuflen));
+			}
+		}
+	}
+	res = cbor_value_leave_container(&map, &mapint);
+	cbor_check(res);
+	
 	
 	// signature
 	res = CborMapGetKeyById(&parser, &map, data, dataLen, 3);
@@ -704,7 +747,6 @@ int FIDO2GetAssertionParseRes(json_t *root, uint8_t *data, size_t dataLen, bool
 	uint8_t PublicKey[65] = {0};
 	size_t PublicKeyLen = 0;
 	JsonLoadBufAsHex(root, "$.AppData.COSEPublicKey", PublicKey, 65, &PublicKeyLen);
-	PrintAndLog("--pkey[%d]: %s", PublicKeyLen, sprint_hex(PublicKey, PublicKeyLen));
 	
 	// check ANSI X9.62 format ECDSA signature (on P-256)
 	uint8_t rval[300] = {0}; 
@@ -730,7 +772,7 @@ int FIDO2GetAssertionParseRes(json_t *root, uint8_t *data, size_t dataLen, bool
 			authData, authDataLen,  // rpIdHash[32] + flags[1] + signCount[4] 
 			clientDataHash, 32,     // Hash of the serialized client data. "$.ClientDataHash" from json
 			NULL, 0);
-		PrintAndLog("--xbuf(%d)[%d]: %s", res, xbuflen, sprint_hex(xbuf, xbuflen));
+		//PrintAndLog("--xbuf(%d)[%d]: %s", res, xbuflen, sprint_hex(xbuf, xbuflen));
 		res = ecdsa_signature_verify(PublicKey, xbuf, xbuflen, sign, signLen);
 		if (res) {
 			if (res == -0x4e00) {

From d253364d2c822bea5e06f78a3a46d207f47f6b6d Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 27 Nov 2018 15:47:17 +0200
Subject: [PATCH 0259/1938] added  numberOfCredentials

---
 client/fido/fidocore.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/client/fido/fidocore.c b/client/fido/fidocore.c
index a423a6434..94bc7e929 100644
--- a/client/fido/fidocore.c
+++ b/client/fido/fidocore.c
@@ -788,6 +788,16 @@ int FIDO2GetAssertionParseRes(json_t *root, uint8_t *data, size_t dataLen, bool
 	}
 
 	free(ubuf);
+
+	// numberOfCredentials
+	res = CborMapGetKeyById(&parser, &map, data, dataLen, 5);
+	if (res) {
+		PrintAndLog("numberOfCredentials: 1 by default");
+	} else {
+		int64_t numberOfCredentials = 0;
+		cbor_value_get_int64(&map, &numberOfCredentials);    
+		PrintAndLog("numberOfCredentials: %lld", (long long)numberOfCredentials);
+	}
 	
 	return 0;
 }

From 71215aa4c920c2a2b3200de0cd28af0bbac73b8e Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 27 Nov 2018 15:49:37 +0200
Subject: [PATCH 0260/1938] added changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a57924d70..221570783 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -83,6 +83,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
  - Added `hf fido` commands that work with FIDO U2F authenticators (@merlokk)
  - Added mbedtls instead of old polarssl (@merlokk)
  - Added jansson (@merlokk)
+ - Added  `hf fido` `assert` and `make` commands from fido2 protocol (authenticatorMakeCredential and authenticatorGetAssertion) (@merlokk)
 ### Fixed
 - Changed driver file proxmark3.inf to support both old and new Product/Vendor IDs (piwi)
 - Changed start sequence in Qt mode (fix: short commands hangs main Qt thread) (Merlok)

From 305c0c099b56a7b4cd92ee6b3c0677b740ed825b Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 27 Nov 2018 15:59:28 +0200
Subject: [PATCH 0261/1938] refactoring

---
 client/fido/fidocore.c | 122 ++++++++++++++++-------------------------
 1 file changed, 48 insertions(+), 74 deletions(-)

diff --git a/client/fido/fidocore.c b/client/fido/fidocore.c
index 94bc7e929..1792550a4 100644
--- a/client/fido/fidocore.c
+++ b/client/fido/fidocore.c
@@ -352,6 +352,52 @@ bool CheckrpIdHash(json_t *json, uint8_t *hash) {
 	return !memcmp(hash, hash2, 32);
 }
 
+// check ANSI X9.62 format ECDSA signature (on P-256)
+int FIDO2CheckSignature(json_t *root, uint8_t *publickey, uint8_t *sign, size_t signLen, uint8_t *authData, size_t authDataLen, bool verbose) {
+	int res;
+	uint8_t rval[300] = {0}; 
+	uint8_t sval[300] = {0}; 
+	res = ecdsa_asn1_get_signature(sign, signLen, rval, sval);
+	if (!res) {
+		if (verbose) {
+			PrintAndLog("  r: %s", sprint_hex(rval, 32));
+			PrintAndLog("  s: %s", sprint_hex(sval, 32));
+		}
+
+		uint8_t clientDataHash[32] = {0};
+		size_t clientDataHashLen = 0;
+		res = JsonLoadBufAsHex(root, "$.ClientDataHash", clientDataHash, sizeof(clientDataHash), &clientDataHashLen);
+		if (res || clientDataHashLen != 32) {
+			PrintAndLog("ERROR: Can't get clientDataHash from json!");
+			return 2;
+		}			
+		
+		uint8_t xbuf[4096] = {0};
+		size_t xbuflen = 0;
+		res = FillBuffer(xbuf, sizeof(xbuf), &xbuflen,
+			authData, authDataLen,  // rpIdHash[32] + flags[1] + signCount[4] 
+			clientDataHash, 32,     // Hash of the serialized client data. "$.ClientDataHash" from json
+			NULL, 0);
+		//PrintAndLog("--xbuf(%d)[%d]: %s", res, xbuflen, sprint_hex(xbuf, xbuflen));
+		res = ecdsa_signature_verify(publickey, xbuf, xbuflen, sign, signLen);
+		if (res) {
+			if (res == -0x4e00) {
+				PrintAndLog("Signature is NOT VALID.");
+			} else {
+				PrintAndLog("Other signature check error: %x %s", (res<0)?-res:res, ecdsa_get_error(res));
+			}
+			return res;
+		} else {
+			PrintAndLog("Signature is OK.");
+		}	
+	} else {
+		PrintAndLog("Invalid signature. res=%d.", res);
+		return res;
+	}
+	
+	return 0;
+}
+
 int FIDO2MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, bool verbose, bool verbose2, bool showCBOR, bool showDERTLV) {
 	CborParser parser;
 	CborValue map, mapsmt;
@@ -513,43 +559,7 @@ int FIDO2MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, b
 	JsonSaveBufAsHexCompact(root, "$.AppData.DERPublicKey", public_key, sizeof(public_key));
 
 	// check ANSI X9.62 format ECDSA signature (on P-256)
-	uint8_t rval[300] = {0}; 
-	uint8_t sval[300] = {0}; 
-	res = ecdsa_asn1_get_signature(sign, signLen, rval, sval);
-	if (!res) {
-		if (verbose) {
-			PrintAndLog("  r: %s", sprint_hex(rval, 32));
-			PrintAndLog("  s: %s", sprint_hex(sval, 32));
-		}
-
-		uint8_t clientDataHash[32] = {0};
-		size_t clientDataHashLen = 0;
-		res = JsonLoadBufAsHex(root, "$.ClientDataHash", clientDataHash, sizeof(clientDataHash), &clientDataHashLen);
-		if (res || clientDataHashLen != 32) {
-			PrintAndLog("ERROR: Can't get clientDataHash from json!");
-			return 2;
-		}			
-		
-		uint8_t xbuf[4096] = {0};
-		size_t xbuflen = 0;
-		res = FillBuffer(xbuf, sizeof(xbuf), &xbuflen,
-			authData, authDataLen,  // rpIdHash[32] + flags[1] + signCount[4] + ...
-			clientDataHash, 32,     // Hash of the serialized client data. "$.ClientDataHash" from json
-			NULL, 0);
-		//PrintAndLog("--xbuf(%d)[%d]: %s", res, xbuflen, sprint_hex(xbuf, xbuflen));
-		res = ecdsa_signature_verify(public_key, xbuf, xbuflen, sign, signLen);
-		if (res) {
-			if (res == -0x4e00) {
-				PrintAndLog("Signature is NOT VALID.");
-			} else {
-				PrintAndLog("Other signature check error: %x %s", (res<0)?-res:res, ecdsa_get_error(res));
-			}
-		} else {
-			PrintAndLog("Signature is OK.");
-		}	
-	} else {
-		PrintAndLog("Invalid signature. res=%d.", res);
-	}
+	FIDO2CheckSignature(root, public_key, sign, signLen, authData, authDataLen, verbose);
 	
 	return 0;
 }
@@ -749,43 +759,7 @@ int FIDO2GetAssertionParseRes(json_t *root, uint8_t *data, size_t dataLen, bool
 	JsonLoadBufAsHex(root, "$.AppData.COSEPublicKey", PublicKey, 65, &PublicKeyLen);
 	
 	// check ANSI X9.62 format ECDSA signature (on P-256)
-	uint8_t rval[300] = {0}; 
-	uint8_t sval[300] = {0}; 
-	res = ecdsa_asn1_get_signature(sign, signLen, rval, sval);
-	if (!res) {
-		if (verbose) {
-			PrintAndLog("  r: %s", sprint_hex(rval, 32));
-			PrintAndLog("  s: %s", sprint_hex(sval, 32));
-		}
-
-		uint8_t clientDataHash[32] = {0};
-		size_t clientDataHashLen = 0;
-		res = JsonLoadBufAsHex(root, "$.ClientDataHash", clientDataHash, sizeof(clientDataHash), &clientDataHashLen);
-		if (res || clientDataHashLen != 32) {
-			PrintAndLog("ERROR: Can't get clientDataHash from json!");
-			return 2;
-		}			
-		
-		uint8_t xbuf[4096] = {0};
-		size_t xbuflen = 0;
-		res = FillBuffer(xbuf, sizeof(xbuf), &xbuflen,
-			authData, authDataLen,  // rpIdHash[32] + flags[1] + signCount[4] 
-			clientDataHash, 32,     // Hash of the serialized client data. "$.ClientDataHash" from json
-			NULL, 0);
-		//PrintAndLog("--xbuf(%d)[%d]: %s", res, xbuflen, sprint_hex(xbuf, xbuflen));
-		res = ecdsa_signature_verify(PublicKey, xbuf, xbuflen, sign, signLen);
-		if (res) {
-			if (res == -0x4e00) {
-				PrintAndLog("Signature is NOT VALID.");
-			} else {
-				PrintAndLog("Other signature check error: %x %s", (res<0)?-res:res, ecdsa_get_error(res));
-			}
-		} else {
-			PrintAndLog("Signature is OK.");
-		}	
-	} else {
-		PrintAndLog("Invalid signature. res=%d.", res);
-	}
+	FIDO2CheckSignature(root, PublicKey, sign, signLen, authData, authDataLen, verbose);
 
 	free(ubuf);
 

From c51e0a58f4a100e43c737c9fb070ff24a7e0d187 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 27 Nov 2018 19:33:51 +0200
Subject: [PATCH 0262/1938] added allowList to authenticatorGetAssertion
 command

---
 client/cmdhffido.c     |   8 ++--
 client/fido/fido2.json |   2 +-
 client/fido/fidocore.c | 102 ++++++++++++++++++++++++++---------------
 client/fido/fidocore.h |   2 +-
 4 files changed, 72 insertions(+), 42 deletions(-)

diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index 57f8e5f2b..273982bed 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -783,13 +783,14 @@ int CmdHFFido2GetAssertion(const char *cmd) {
 	CLIParserInit("hf fido assert", 
 		"Execute a FIDO2 Get Assertion command. Needs json file with parameters. Sample file `fido2.json`. File can be placed in proxmark directory or in `proxmark/fido` directory.", 
 		"Usage:\n\thf fido assert -> execute command default parameters file `fido2.json`\n"
-			"\thf fido assert test.json -> execute command with parameters file `text.json`");
+			"\thf fido assert test.json -l -> execute command with parameters file `text.json` and add to request CredentialId");
 
 	void* argtable[] = {
 		arg_param_begin,
 		arg_lit0("aA",  "apdu",     "show APDU reqests and responses"),
 		arg_litn("vV",  "verbose",  0, 2, "show technical data. vv - show full certificates data"),
 		arg_lit0("cC",  "cbor",     "show CBOR decoded data"),
+		arg_lit0("lL",  "list",     "add CredentialId from json to allowList. Needs if `rk` option is `false` (authenticator don't store credential to its memory)"),
 		arg_str0(NULL,  NULL,		"<json file name>", "JSON input / output file name for parameters. Default `fido2.json`"),
 		arg_param_end
 	};
@@ -799,11 +800,12 @@ int CmdHFFido2GetAssertion(const char *cmd) {
 	bool verbose = arg_get_lit(2);
 	bool verbose2 = arg_get_lit(2) > 1;
 	bool showCBOR = arg_get_lit(3);
+	bool createAllowList = arg_get_lit(4);
 
 	uint8_t jsonname[250] ={0};
 	char *cjsonname = (char *)jsonname;
 	int jsonnamelen = 0;
-	CLIGetStrWithReturn(4, jsonname, &jsonnamelen);
+	CLIGetStrWithReturn(5, jsonname, &jsonnamelen);
 
 	if (!jsonnamelen) {
 		strcat(cjsonname, "fido2");
@@ -847,7 +849,7 @@ int CmdHFFido2GetAssertion(const char *cmd) {
 		return 2;
 	}
 
-	res = FIDO2CreateGetAssertionReq(root, data, sizeof(data), &datalen);
+	res = FIDO2CreateGetAssertionReq(root, data, sizeof(data), &datalen, createAllowList);
 	if (res)
 		return res;
 	
diff --git a/client/fido/fido2.json b/client/fido/fido2.json
index 8ecd04103..abbfae5dc 100644
--- a/client/fido/fido2.json
+++ b/client/fido/fido2.json
@@ -24,7 +24,7 @@
   ],
   "MakeCredentialOptions": {
     "uv": false,
-    "rk": false
+    "rk": true
   },
   "GetAssertionOptions": {
     "up": true,
diff --git a/client/fido/fidocore.c b/client/fido/fidocore.c
index 1792550a4..39c2052f9 100644
--- a/client/fido/fidocore.c
+++ b/client/fido/fidocore.c
@@ -564,7 +564,7 @@ int FIDO2MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, b
 	return 0;
 }
 
-int FIDO2CreateGetAssertionReq(json_t *root, uint8_t *data, size_t maxdatalen, size_t *datalen) {
+int FIDO2CreateGetAssertionReq(json_t *root, uint8_t *data, size_t maxdatalen, size_t *datalen, bool createAllowList) {
 	if (datalen)
 		*datalen = 0;
 	if (!root || !data || !maxdatalen)
@@ -572,19 +572,18 @@ int FIDO2CreateGetAssertionReq(json_t *root, uint8_t *data, size_t maxdatalen, s
 
 	int res;
 	CborEncoder encoder;
-	CborEncoder map;
+	CborEncoder map, array, mapint;
 	
 	cbor_encoder_init(&encoder, data, maxdatalen, 0);
 
 	// create main map
-	res = cbor_encoder_create_map(&encoder, &map, 3);
+	res = cbor_encoder_create_map(&encoder, &map, createAllowList ? 4 : 3);
 	fido_check_if(res) {
 		// rpId
 		res = cbor_encode_uint(&map, 1);
 		fido_check_if(res) {
-
-		res = CBOREncodeElm(root, "$.RelyingPartyEntity.id", &map);
-		fido_check(res);
+			res = CBOREncodeElm(root, "$.RelyingPartyEntity.id", &map);
+			fido_check(res);
 		}
 
 		// clientDataHash
@@ -594,6 +593,34 @@ int FIDO2CreateGetAssertionReq(json_t *root, uint8_t *data, size_t maxdatalen, s
 			fido_check(res);
 		}
 
+		// allowList
+		if (createAllowList) {
+			res = cbor_encode_uint(&map, 3);
+			fido_check_if(res) {
+				res = cbor_encoder_create_array(&map, &array, 1);
+				fido_check_if(res) {
+					res = cbor_encoder_create_map(&array, &mapint, 2);
+					fido_check_if(res) {
+						res = cbor_encode_text_stringz(&mapint, "type");
+						fido_check(res);
+						
+						res = cbor_encode_text_stringz(&mapint, "public-key");
+						fido_check(res);					
+						
+						res = cbor_encode_text_stringz(&mapint, "id");
+						fido_check(res);					
+						
+						res = CBOREncodeElm(root, "$.AppData.CredentialId", &mapint);
+						fido_check(res);					
+					}
+					res = cbor_encoder_close_container(&array, &mapint);
+					fido_check(res);
+				}
+				res = cbor_encoder_close_container(&map, &array);
+				fido_check(res);
+			}
+		}
+
 		// options
 		res = cbor_encode_uint(&map, 5);
 		fido_check_if(res) {
@@ -695,45 +722,46 @@ int FIDO2GetAssertionParseRes(json_t *root, uint8_t *data, size_t dataLen, bool
 
 	// publicKeyCredentialUserEntity
 	res = CborMapGetKeyById(&parser, &map, data, dataLen, 4);
-	if (res)
-		return res;
-	
-	res = cbor_value_enter_container(&map, &mapint);
-	cbor_check(res);
-	
-	while (!cbor_value_at_end(&mapint)) {
-		char key[100] = {0};
-		res = CborGetStringValue(&mapint, key, sizeof(key), &n);
+	if (res) {	
+		PrintAndLog("UserEntity n/a");
+	} else {
+		res = cbor_value_enter_container(&map, &mapint);
 		cbor_check(res);
-
-		if (!strcmp(key, "name") || !strcmp(key, "displayName")) {
-			char cname[200] = {0};
-			res = CborGetStringValue(&mapint, cname, sizeof(cname), &n);
+		
+		while (!cbor_value_at_end(&mapint)) {
+			char key[100] = {0};
+			res = CborGetStringValue(&mapint, key, sizeof(key), &n);
 			cbor_check(res);
-			PrintAndLog("UserEntity %s: %s", key, cname);
-		}
 
-		if (!strcmp(key, "id")) {
-			uint8_t cid[200] = {0};
-			res = CborGetBinStringValue(&mapint, cid, sizeof(cid), &n);
-			cbor_check(res);
-			PrintAndLog("UserEntity id [%d]: %s", n, sprint_hex(cid, n));
-			
-			// check
-			uint8_t idbuf[100] = {0};
-			size_t idbuflen;
+			if (!strcmp(key, "name") || !strcmp(key, "displayName")) {
+				char cname[200] = {0};
+				res = CborGetStringValue(&mapint, cname, sizeof(cname), &n);
+				cbor_check(res);
+				PrintAndLog("UserEntity %s: %s", key, cname);
+			}
 
-			JsonLoadBufAsHex(root, "$.UserEntity.id", idbuf, sizeof(idbuf), &idbuflen);
+			if (!strcmp(key, "id")) {
+				uint8_t cid[200] = {0};
+				res = CborGetBinStringValue(&mapint, cid, sizeof(cid), &n);
+				cbor_check(res);
+				PrintAndLog("UserEntity id [%d]: %s", n, sprint_hex(cid, n));
+				
+				// check
+				uint8_t idbuf[100] = {0};
+				size_t idbuflen;
 
-			if (idbuflen == n && !memcmp(idbuf, cid, idbuflen)) {
-				PrintAndLog("UserEntity id OK.");
-			} else {
-				PrintAndLog("ERROR: Wrong UserEntity id (from json: %s)", sprint_hex(idbuf, idbuflen));
+				JsonLoadBufAsHex(root, "$.UserEntity.id", idbuf, sizeof(idbuf), &idbuflen);
+
+				if (idbuflen == n && !memcmp(idbuf, cid, idbuflen)) {
+					PrintAndLog("UserEntity id OK.");
+				} else {
+					PrintAndLog("ERROR: Wrong UserEntity id (from json: %s)", sprint_hex(idbuf, idbuflen));
+				}
 			}
 		}
+		res = cbor_value_leave_container(&map, &mapint);
+		cbor_check(res);
 	}
-	res = cbor_value_leave_container(&map, &mapint);
-	cbor_check(res);
 	
 	
 	// signature
diff --git a/client/fido/fidocore.h b/client/fido/fidocore.h
index 092261104..b0b50e2ac 100644
--- a/client/fido/fidocore.h
+++ b/client/fido/fidocore.h
@@ -51,7 +51,7 @@ extern char *fido2GetCmdErrorDescription(uint8_t errorCode);
 extern bool CheckrpIdHash(json_t *json, uint8_t *hash);
 extern int FIDO2CreateMakeCredentionalReq(json_t *root, uint8_t *data, size_t maxdatalen, size_t *datalen);
 extern int FIDO2MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, bool verbose, bool verbose2, bool showCBOR, bool showDERTLV);
-extern int FIDO2CreateGetAssertionReq(json_t *root, uint8_t *data, size_t maxdatalen, size_t *datalen);
+extern int FIDO2CreateGetAssertionReq(json_t *root, uint8_t *data, size_t maxdatalen, size_t *datalen, bool createAllowList);
 extern int FIDO2GetAssertionParseRes(json_t *root, uint8_t *data, size_t dataLen, bool verbose, bool verbose2, bool showCBOR);
 
 #endif /* __FIDOCORE_H__ */

From 04b436ce5ecf13d1565be3e8e56c217760b6e467 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 27 Nov 2018 19:44:03 +0200
Subject: [PATCH 0263/1938] del annoying comment

---
 client/loclass/fileutils.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index ac3660935..ea595ad26 100644
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -163,7 +163,6 @@ int saveFileJSON(const char *preferredName, const char *suffix, uint8_t* data, s
 	}
 	PrintAndLog("File `%s` saved.", fileName);
 	
-	// free json object
 	json_decref(root);
 
 out:	

From 91809c6d9410a718a24d2d3ae7e84a220ebd20bd Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 28 Nov 2018 23:53:31 +0100
Subject: [PATCH 0264/1938] FIX: part of
 https://github.com/Proxmark/proxmark3/pull/723  (@Fl0-0) CHG: remove some
 warnings when compiling on 32/64 bit systems.  Messy messy

---
 client/crypto/asn1dump.c | 2 ++
 client/fido/cbortools.c  | 9 +++++++--
 client/fpga_compress.c   | 9 ++++++++-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/client/crypto/asn1dump.c b/client/crypto/asn1dump.c
index 60799fc8c..34f4a9fa4 100644
--- a/client/crypto/asn1dump.c
+++ b/client/crypto/asn1dump.c
@@ -7,12 +7,14 @@
 //-----------------------------------------------------------------------------
 // asn.1 dumping
 //-----------------------------------------------------------------------------
+#define _POSIX_C_SOURCE 200809L                 // need for strnlen()
 
 #include "asn1dump.h"
 #include <ctype.h>
 #include <stdlib.h>
 #include <unistd.h> 
 #include <stdio.h>
+#include <string.h>
 #include <jansson.h>
 #include <mbedtls/asn1.h>
 #include <mbedtls/oid.h>
diff --git a/client/fido/cbortools.c b/client/fido/cbortools.c
index 8ab104a1c..01691dad1 100644
--- a/client/fido/cbortools.c
+++ b/client/fido/cbortools.c
@@ -203,8 +203,13 @@ int TinyCborPrintFIDOPackage(uint8_t cmdCode, bool isResponse, uint8_t *data, si
     CborError err = dumprecursive(cmdCode, isResponse, &cb, false, 0);
 
 	if (err) {
-		fprintf(stderr, "CBOR parsing failure at offset %d: %s\n",
-				cb.ptr - data, cbor_error_string(err));
+		fprintf(stderr,
+#if __WORDSIZE == 64		
+		"CBOR parsing failure at offset %" PRId64 " : %s\n",
+#else
+		"CBOR parsing failure at offset %" PRId32 " : %s\n",	
+#endif
+		cb.ptr - data, cbor_error_string(err));
 		return 1;
 	}	
 	
diff --git a/client/fpga_compress.c b/client/fpga_compress.c
index ce0f41982..ceba6ac64 100644
--- a/client/fpga_compress.c
+++ b/client/fpga_compress.c
@@ -99,7 +99,14 @@ int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile, bool hardn
 
 		if (i >= num_infiles * (hardnested_mode ? HARDNESTED_TABLE_SIZE : FPGA_CONFIG_SIZE)) {
 			if (hardnested_mode) {
-				fprintf(stderr, "Input file too big (> %llu bytes). This is probably not a hardnested bitflip state table.\n", HARDNESTED_TABLE_SIZE);
+				fprintf(stderr, 
+#if __WORDSIZE == 64		
+				"Input file too big (> %" PRIu64 " bytes). This is probably not a hardnested bitflip state table.\n"
+#else
+				"Input file too big (> %lu bytes). This is probably not a hardnested bitflip state table.\n"	
+#endif				
+				, HARDNESTED_TABLE_SIZE);
+				
 			} else {
 				fprintf(stderr, "Input files too big (total > %lu bytes). These are probably not PM3 FPGA config files.\n", num_infiles * FPGA_CONFIG_SIZE);
 			}

From 5d5e2739829c255c78dc7d56389adf8a03debeb9 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Thu, 29 Nov 2018 12:00:23 +0200
Subject: [PATCH 0265/1938] jansson update. 2.11 to 2.12 fix warnings

---
 client/jansson/dump.c            |  12 +-
 client/jansson/error.c           |   2 +-
 client/jansson/hashtable.h       |   2 +-
 client/jansson/hashtable_seed.c  |   2 +-
 client/jansson/jansson.h         |  45 +++---
 client/jansson/jansson_private.h |   8 +-
 client/jansson/load.c            |  14 +-
 client/jansson/pack_unpack.c     | 231 ++++++++++++++++++-------------
 client/jansson/strbuffer.h       |   2 +-
 client/jansson/value.c           |  30 ++--
 10 files changed, 194 insertions(+), 154 deletions(-)

diff --git a/client/jansson/dump.c b/client/jansson/dump.c
index 8e725c934..89802c65d 100644
--- a/client/jansson/dump.c
+++ b/client/jansson/dump.c
@@ -61,8 +61,8 @@ static int dump_to_file(const char *buffer, size_t size, void *data)
 
 static int dump_to_fd(const char *buffer, size_t size, void *data)
 {
-    int *dest = (int *)data;
 #ifdef HAVE_UNISTD_H
+    int *dest = (int *)data;
     if(write(*dest, buffer, size) == (ssize_t)size)
         return 0;
 #endif
@@ -101,7 +101,7 @@ static int dump_indent(size_t flags, int depth, int space, json_dump_callback_t
 static int dump_string(const char *str, size_t len, json_dump_callback_t dump, void *data, size_t flags)
 {
     const char *pos, *end, *lim;
-    int32_t codepoint;
+    int32_t codepoint = 0;
 
     if(dump("\"", 1, data))
         return -1;
@@ -306,7 +306,7 @@ static int do_dump(const json_t *json, size_t flags, int depth,
             const char *separator;
             int separator_length;
             /* Space for "0x", double the sizeof a pointer for the hex and a terminator. */
-            char key[2 + (sizeof(json) * 2) + 1];
+            char loop_key[2 + (sizeof(json) * 2) + 1];
 
             if(flags & JSON_COMPACT) {
                 separator = ":";
@@ -318,7 +318,7 @@ static int do_dump(const json_t *json, size_t flags, int depth,
             }
 
             /* detect circular references */
-            if (loop_check(parents, json, key, sizeof(key)))
+            if (loop_check(parents, json, loop_key, sizeof(loop_key)))
                 return -1;
 
             iter = json_object_iter((json_t *)json);
@@ -326,7 +326,7 @@ static int do_dump(const json_t *json, size_t flags, int depth,
             if(!embed && dump("{", 1, data))
                 return -1;
             if(!iter) {
-                hashtable_del(parents, key);
+                hashtable_del(parents, loop_key);
                 return embed ? 0 : dump("}", 1, data);
             }
             if(dump_indent(flags, depth + 1, 0, dump, data))
@@ -422,7 +422,7 @@ static int do_dump(const json_t *json, size_t flags, int depth,
                 }
             }
 
-            hashtable_del(parents, key);
+            hashtable_del(parents, loop_key);
             return embed ? 0 : dump("}", 1, data);
         }
 
diff --git a/client/jansson/error.c b/client/jansson/error.c
index b94b3a3a1..f5da6b9b0 100644
--- a/client/jansson/error.c
+++ b/client/jansson/error.c
@@ -25,7 +25,7 @@ void jsonp_error_set_source(json_error_t *error, const char *source)
 
     length = strlen(source);
     if(length < JSON_ERROR_SOURCE_LENGTH)
-        strncpy(error->source, source, JSON_ERROR_SOURCE_LENGTH);
+        strncpy(error->source, source, length + 1);
     else {
         size_t extra = length - JSON_ERROR_SOURCE_LENGTH + 4;
         memcpy(error->source, "...", 3);
diff --git a/client/jansson/hashtable.h b/client/jansson/hashtable.h
index d4c32ae0e..c11283408 100644
--- a/client/jansson/hashtable.h
+++ b/client/jansson/hashtable.h
@@ -55,7 +55,7 @@ typedef struct hashtable {
  *
  * Returns 0 on success, -1 on error (out of memory).
  */
-int hashtable_init(hashtable_t *hashtable);
+int hashtable_init(hashtable_t *hashtable) JANSSON_ATTRS(warn_unused_result);
 
 /**
  * hashtable_close - Release all resources used by a hashtable object
diff --git a/client/jansson/hashtable_seed.c b/client/jansson/hashtable_seed.c
index 8aed54068..540358ada 100644
--- a/client/jansson/hashtable_seed.c
+++ b/client/jansson/hashtable_seed.c
@@ -164,7 +164,7 @@ static int seed_from_timestamp_and_pid(uint32_t *seed) {
 }
 
 static uint32_t generate_seed() {
-    uint32_t seed;
+    uint32_t seed = 0;
     int done = 0;
 
 #if !defined(_WIN32) && defined(USE_URANDOM)
diff --git a/client/jansson/jansson.h b/client/jansson/jansson.h
index 86f23d17e..12f638bc3 100644
--- a/client/jansson/jansson.h
+++ b/client/jansson/jansson.h
@@ -9,7 +9,6 @@
 #define JANSSON_H
 
 #include <stdio.h>
-#include <stdint.h>
 #include <stdlib.h>  /* for size_t */
 #include <stdarg.h>
 
@@ -22,11 +21,11 @@ extern "C" {
 /* version */
 
 #define JANSSON_MAJOR_VERSION  2
-#define JANSSON_MINOR_VERSION  11
+#define JANSSON_MINOR_VERSION  12
 #define JANSSON_MICRO_VERSION  0
 
 /* Micro version is omitted if it's 0 */
-#define JANSSON_VERSION  "2.11"
+#define JANSSON_VERSION  "2.12"
 
 /* Version as a 3-byte hex number, e.g. 0x010201 == 1.2.1. Use this
    for numeric comparisons, e.g. #if JANSSON_VERSION_HEX >= ... */
@@ -40,6 +39,12 @@ extern "C" {
 #define JANSSON_THREAD_SAFE_REFCOUNT 1
 #endif
 
+#if defined(__GNUC__) || defined(__clang__)
+#define JANSSON_ATTRS(...) __attribute__((__VA_ARGS__))
+#else
+#define JANSSON_ATTRS(...)
+#endif
+
 /* types */
 
 typedef enum {
@@ -186,7 +191,7 @@ static JSON_INLINE enum json_error_code json_error_code(const json_error_t *e) {
 
 void json_object_seed(size_t seed);
 size_t json_object_size(const json_t *object);
-json_t *json_object_get(const json_t *object, const char *key);
+json_t *json_object_get(const json_t *object, const char *key) JANSSON_ATTRS(warn_unused_result);
 int json_object_set_new(json_t *object, const char *key, json_t *value);
 int json_object_set_new_nocheck(json_t *object, const char *key, json_t *value);
 int json_object_del(json_t *object, const char *key);
@@ -238,7 +243,7 @@ int json_object_iter_set(json_t *object, void *iter, json_t *value)
 }
 
 size_t json_array_size(const json_t *array);
-json_t *json_array_get(const json_t *array, size_t index);
+json_t *json_array_get(const json_t *array, size_t index) JANSSON_ATTRS(warn_unused_result);
 int json_array_set_new(json_t *array, size_t index, json_t *value);
 int json_array_append_new(json_t *array, json_t *value);
 int json_array_insert_new(json_t *array, size_t index, json_t *value);
@@ -279,9 +284,9 @@ int json_real_set(json_t *real, double value);
 
 /* pack, unpack */
 
-json_t *json_pack(const char *fmt, ...);
-json_t *json_pack_ex(json_error_t *error, size_t flags, const char *fmt, ...);
-json_t *json_vpack_ex(json_error_t *error, size_t flags, const char *fmt, va_list ap);
+json_t *json_pack(const char *fmt, ...) JANSSON_ATTRS(warn_unused_result);
+json_t *json_pack_ex(json_error_t *error, size_t flags, const char *fmt, ...) JANSSON_ATTRS(warn_unused_result);
+json_t *json_vpack_ex(json_error_t *error, size_t flags, const char *fmt, va_list ap) JANSSON_ATTRS(warn_unused_result);
 
 #define JSON_VALIDATE_ONLY  0x1
 #define JSON_STRICT         0x2
@@ -292,8 +297,8 @@ int json_vunpack_ex(json_t *root, json_error_t *error, size_t flags, const char
 
 /* sprintf */
 
-json_t *json_sprintf(const char *fmt, ...);
-json_t *json_vsprintf(const char *fmt, va_list ap);
+json_t *json_sprintf(const char *fmt, ...) JANSSON_ATTRS(warn_unused_result, format(printf, 1, 2));
+json_t *json_vsprintf(const char *fmt, va_list ap) JANSSON_ATTRS(warn_unused_result, format(printf, 1, 0));
 
 
 /* equality */
@@ -303,10 +308,8 @@ int json_equal(const json_t *value1, const json_t *value2);
 
 /* copying */
 
-json_t *json_copy(json_t *value);
-json_t *json_deep_copy(const json_t *value);
-
-/* path */
+json_t *json_copy(json_t *value) JANSSON_ATTRS(warn_unused_result);
+json_t *json_deep_copy(const json_t *value) JANSSON_ATTRS(warn_unused_result);
 
 json_t *json_path_get(const json_t *json, const char *path);
 int json_path_set_new(json_t *json, const char *path, json_t *value, size_t flags, json_error_t *error);
@@ -327,12 +330,12 @@ int json_path_set(json_t *json, const char *path, json_t *value, size_t flags, j
 
 typedef size_t (*json_load_callback_t)(void *buffer, size_t buflen, void *data);
 
-json_t *json_loads(const char *input, size_t flags, json_error_t *error);
-json_t *json_loadb(const char *buffer, size_t buflen, size_t flags, json_error_t *error);
-json_t *json_loadf(FILE *input, size_t flags, json_error_t *error);
-json_t *json_loadfd(int input, size_t flags, json_error_t *error);
-json_t *json_load_file(const char *path, size_t flags, json_error_t *error);
-json_t *json_load_callback(json_load_callback_t callback, void *data, size_t flags, json_error_t *error);
+json_t *json_loads(const char *input, size_t flags, json_error_t *error) JANSSON_ATTRS(warn_unused_result);
+json_t *json_loadb(const char *buffer, size_t buflen, size_t flags, json_error_t *error) JANSSON_ATTRS(warn_unused_result);
+json_t *json_loadf(FILE *input, size_t flags, json_error_t *error) JANSSON_ATTRS(warn_unused_result);
+json_t *json_loadfd(int input, size_t flags, json_error_t *error) JANSSON_ATTRS(warn_unused_result);
+json_t *json_load_file(const char *path, size_t flags, json_error_t *error) JANSSON_ATTRS(warn_unused_result);
+json_t *json_load_callback(json_load_callback_t callback, void *data, size_t flags, json_error_t *error) JANSSON_ATTRS(warn_unused_result);
 
 
 /* encoding */
@@ -350,7 +353,7 @@ json_t *json_load_callback(json_load_callback_t callback, void *data, size_t fla
 
 typedef int (*json_dump_callback_t)(const char *buffer, size_t size, void *data);
 
-char *json_dumps(const json_t *json, size_t flags);
+char *json_dumps(const json_t *json, size_t flags) JANSSON_ATTRS(warn_unused_result);
 size_t json_dumpb(const json_t *json, char *buffer, size_t size, size_t flags);
 int json_dumpf(const json_t *json, FILE *output, size_t flags);
 int json_dumpfd(const json_t *json, int output, size_t flags);
diff --git a/client/jansson/jansson_private.h b/client/jansson/jansson_private.h
index 7b0985aa6..083604b4d 100644
--- a/client/jansson/jansson_private.h
+++ b/client/jansson/jansson_private.h
@@ -87,11 +87,11 @@ int jsonp_strtod(strbuffer_t *strbuffer, double *out);
 int jsonp_dtostr(char *buffer, size_t size, double value, int prec);
 
 /* Wrappers for custom memory functions */
-void* jsonp_malloc(size_t size);
+void* jsonp_malloc(size_t size) JANSSON_ATTRS(warn_unused_result);
 void jsonp_free(void *ptr);
-char *jsonp_strndup(const char *str, size_t length);
-char *jsonp_strdup(const char *str);
-char *jsonp_strndup(const char *str, size_t len);
+char *jsonp_strndup(const char *str, size_t length) JANSSON_ATTRS(warn_unused_result);
+char *jsonp_strdup(const char *str) JANSSON_ATTRS(warn_unused_result);
+char *jsonp_strndup(const char *str, size_t len) JANSSON_ATTRS(warn_unused_result);
 
 
 /* Windows compatibility */
diff --git a/client/jansson/load.c b/client/jansson/load.c
index 4cf3855af..8700919fd 100644
--- a/client/jansson/load.c
+++ b/client/jansson/load.c
@@ -89,7 +89,7 @@ static void error_set(json_error_t *error, const lex_t *lex,
 {
     va_list ap;
     char msg_text[JSON_ERROR_TEXT_LENGTH];
-    char msg_with_context[JSON_ERROR_TEXT_LENGTH + 28];
+    char msg_with_context[JSON_ERROR_TEXT_LENGTH];
 
     int line = -1, col = -1;
     size_t pos = 0;
@@ -114,7 +114,7 @@ static void error_set(json_error_t *error, const lex_t *lex,
         if(saved_text && saved_text[0])
         {
             if(lex->saved_text.length <= 20) {
-                snprintf(msg_with_context, JSON_ERROR_TEXT_LENGTH + 28,
+                snprintf(msg_with_context, JSON_ERROR_TEXT_LENGTH,
                          "%s near '%s'", msg_text, saved_text);
                 msg_with_context[JSON_ERROR_TEXT_LENGTH - 1] = '\0';
                 result = msg_with_context;
@@ -131,7 +131,7 @@ static void error_set(json_error_t *error, const lex_t *lex,
                 result = msg_text;
             }
             else {
-                snprintf(msg_with_context, JSON_ERROR_TEXT_LENGTH + 17,
+                snprintf(msg_with_context, JSON_ERROR_TEXT_LENGTH,
                          "%s near end of file", msg_text);
                 msg_with_context[JSON_ERROR_TEXT_LENGTH - 1] = '\0';
                 result = msg_with_context;
@@ -829,10 +829,8 @@ static json_t *parse_value(lex_t *lex, size_t flags, json_error_t *error)
             }
 
             json = jsonp_stringn_nocheck_own(value, len);
-            if(json) {
-                lex->value.string.val = NULL;
-                lex->value.string.len = 0;
-            }
+            lex->value.string.val = NULL;
+            lex->value.string.len = 0;
             break;
         }
 
@@ -1036,8 +1034,8 @@ json_t *json_loadf(FILE *input, size_t flags, json_error_t *error)
 
 static int fd_get_func(int *fd)
 {
-    uint8_t c;
 #ifdef HAVE_UNISTD_H
+    uint8_t c;
     if (read(*fd, &c, 1) == 1)
         return c;
 #endif
diff --git a/client/jansson/pack_unpack.c b/client/jansson/pack_unpack.c
index 153f64d19..3b9977667 100644
--- a/client/jansson/pack_unpack.c
+++ b/client/jansson/pack_unpack.c
@@ -75,6 +75,9 @@ static void next_token(scanner_t *s)
         return;
     }
 
+    if (!token(s) && !*s->fmt)
+        return;
+
     t = s->fmt;
     s->column++;
     s->pos++;
@@ -97,7 +100,7 @@ static void next_token(scanner_t *s)
     s->token.column = s->column;
     s->token.pos = s->pos;
 
-    t++;
+    if (*t) t++;
     s->fmt = t;
 }
 
@@ -127,7 +130,7 @@ static json_t *pack(scanner_t *s, va_list *ap);
 /* ours will be set to 1 if jsonp_free() must be called for the result
    afterwards */
 static char *read_string(scanner_t *s, va_list *ap,
-                         const char *purpose, size_t *out_len, int *ours)
+                         const char *purpose, size_t *out_len, int *ours, int optional)
 {
     char t;
     strbuffer_t strbuff;
@@ -144,7 +147,10 @@ static char *read_string(scanner_t *s, va_list *ap,
         str = va_arg(*ap, const char *);
 
         if(!str) {
-            set_error(s, "<args>", json_error_null_value, "NULL string argument");
+            if (!optional) {
+                set_error(s, "<args>", json_error_null_value, "NULL %s", purpose);
+                s->has_error = 1;
+            }
             return NULL;
         }
 
@@ -152,19 +158,28 @@ static char *read_string(scanner_t *s, va_list *ap,
 
         if(!utf8_check_string(str, length)) {
             set_error(s, "<args>", json_error_invalid_utf8, "Invalid UTF-8 %s", purpose);
+            s->has_error = 1;
             return NULL;
         }
 
         *out_len = length;
         return (char *)str;
+    } else if (optional) {
+        set_error(s, "<format>", json_error_invalid_format, "Cannot use '%c' on optional strings", t);
+        s->has_error = 1;
+
+        return NULL;
     }
 
-    strbuffer_init(&strbuff);
+    if(strbuffer_init(&strbuff)) {
+        set_error(s, "<internal>", json_error_out_of_memory, "Out of memory");
+        s->has_error = 1;
+    }
 
     while(1) {
         str = va_arg(*ap, const char *);
         if(!str) {
-            set_error(s, "<args>", json_error_null_value, "NULL string argument");
+            set_error(s, "<args>", json_error_null_value, "NULL %s", purpose);
             s->has_error = 1;
         }
 
@@ -220,6 +235,7 @@ static json_t *pack_object(scanner_t *s, va_list *ap)
         size_t len;
         int ours;
         json_t *value;
+        char valueOptional;
 
         if(!token(s)) {
             set_error(s, "<format>", json_error_invalid_format, "Unexpected end of format string");
@@ -231,20 +247,21 @@ static json_t *pack_object(scanner_t *s, va_list *ap)
             goto error;
         }
 
-        key = read_string(s, ap, "object key", &len, &ours);
-        if (!key)
-            s->has_error = 1;
+        key = read_string(s, ap, "object key", &len, &ours, 0);
 
         next_token(s);
 
+        next_token(s);
+        valueOptional = token(s);
+        prev_token(s);
+
         value = pack(s, ap);
         if(!value) {
             if(ours)
                 jsonp_free(key);
 
-            if(strchr("soO", token(s)) && s->next_token.token == '*') {
-                next_token(s);
-            } else {
+            if(valueOptional != '*') {
+                set_error(s, "<args>", json_error_null_value, "NULL object value");
                 s->has_error = 1;
             }
 
@@ -263,8 +280,6 @@ static json_t *pack_object(scanner_t *s, va_list *ap)
         if(ours)
             jsonp_free(key);
 
-        if(strchr("soO", token(s)) && s->next_token.token == '*')
-            next_token(s);
         next_token(s);
     }
 
@@ -283,6 +298,7 @@ static json_t *pack_array(scanner_t *s, va_list *ap)
 
     while(token(s) != ']') {
         json_t *value;
+        char valueOptional;
 
         if(!token(s)) {
             set_error(s, "<format>", json_error_invalid_format, "Unexpected end of format string");
@@ -290,11 +306,13 @@ static json_t *pack_array(scanner_t *s, va_list *ap)
             goto error;
         }
 
+        next_token(s);
+        valueOptional = token(s);
+        prev_token(s);
+
         value = pack(s, ap);
         if(!value) {
-            if(strchr("soO", token(s)) && s->next_token.token == '*') {
-                next_token(s);
-            } else {
+            if(valueOptional != '*') {
                 s->has_error = 1;
             }
 
@@ -310,8 +328,6 @@ static json_t *pack_array(scanner_t *s, va_list *ap)
             s->has_error = 1;
         }
 
-        if(strchr("soO", token(s)) && s->next_token.token == '*')
-            next_token(s);
         next_token(s);
     }
 
@@ -326,23 +342,97 @@ error:
 static json_t *pack_string(scanner_t *s, va_list *ap)
 {
     char *str;
+    char t;
     size_t len;
     int ours;
-    int nullable;
+    int optional;
 
     next_token(s);
-    nullable = token(s) == '?';
-    if (!nullable)
+    t = token(s);
+    optional = t == '?' || t == '*';
+    if (!optional)
         prev_token(s);
 
-    str = read_string(s, ap, "string", &len, &ours);
-    if (!str) {
-        return nullable ? json_null() : NULL;
-    } else if (ours) {
-        return jsonp_stringn_nocheck_own(str, len);
-    } else {
-        return json_stringn_nocheck(str, len);
+    str = read_string(s, ap, "string", &len, &ours, optional);
+
+    if (!str)
+        return t == '?' && !s->has_error ? json_null() : NULL;
+
+    if (s->has_error) {
+        /* It's impossible to reach this point if ours != 0, do not free str. */
+        return NULL;
     }
+
+    if (ours)
+        return jsonp_stringn_nocheck_own(str, len);
+
+    return json_stringn_nocheck(str, len);
+}
+
+static json_t *pack_object_inter(scanner_t *s, va_list *ap, int need_incref)
+{
+    json_t *json;
+    char ntoken;
+
+    next_token(s);
+    ntoken = token(s);
+
+    if (ntoken != '?' && ntoken != '*')
+        prev_token(s);
+
+    json = va_arg(*ap, json_t *);
+
+    if (json)
+        return need_incref ? json_incref(json) : json;
+
+    switch (ntoken) {
+        case '?':
+            return json_null();
+        case '*':
+            return NULL;
+        default:
+            break;
+    }
+
+    set_error(s, "<args>", json_error_null_value, "NULL object");
+    s->has_error = 1;
+    return NULL;
+}
+
+static json_t *pack_integer(scanner_t *s, json_int_t value)
+{
+    json_t *json = json_integer(value);
+
+    if (!json) {
+        set_error(s, "<internal>", json_error_out_of_memory, "Out of memory");
+        s->has_error = 1;
+    }
+
+    return json;
+}
+
+static json_t *pack_real(scanner_t *s, double value)
+{
+    /* Allocate without setting value so we can identify OOM error. */
+    json_t *json = json_real(0.0);
+
+    if (!json) {
+        set_error(s, "<internal>", json_error_out_of_memory, "Out of memory");
+        s->has_error = 1;
+
+        return NULL;
+    }
+
+    if (json_real_set(json, value)) {
+        json_decref(json);
+
+        set_error(s, "<args>", json_error_numeric_overflow, "Invalid floating point value");
+        s->has_error = 1;
+
+        return NULL;
+    }
+
+    return json;
 }
 
 static json_t *pack(scanner_t *s, va_list *ap)
@@ -364,49 +454,19 @@ static json_t *pack(scanner_t *s, va_list *ap)
             return va_arg(*ap, int) ? json_true() : json_false();
 
         case 'i': /* integer from int */
-            return json_integer(va_arg(*ap, int));
+            return pack_integer(s, va_arg(*ap, int));
 
         case 'I': /* integer from json_int_t */
-            return json_integer(va_arg(*ap, json_int_t));
+            return pack_integer(s, va_arg(*ap, json_int_t));
 
         case 'f': /* real */
-            return json_real(va_arg(*ap, double));
+            return pack_real(s, va_arg(*ap, double));
 
         case 'O': /* a json_t object; increments refcount */
-        {
-            int nullable;
-            json_t *json;
-
-            next_token(s);
-            nullable = token(s) == '?';
-            if (!nullable)
-                prev_token(s);
-
-            json = va_arg(*ap, json_t *);
-            if (!json && nullable) {
-                return json_null();
-            } else {
-                return json_incref(json);
-            }
-        }
+            return pack_object_inter(s, ap, 1);
 
         case 'o': /* a json_t object; doesn't increment refcount */
-        {
-            int nullable;
-            json_t *json;
-
-            next_token(s);
-            nullable = token(s) == '?';
-            if (!nullable)
-                prev_token(s);
-
-            json = va_arg(*ap, json_t *);
-            if (!json && nullable) {
-                return json_null();
-            } else {
-                return json;
-            }
-        }
+            return pack_object_inter(s, ap, 0);
 
         default:
             set_error(s, "<format>", json_error_invalid_format, "Unexpected format character '%c'",
@@ -508,48 +568,34 @@ static int unpack_object(scanner_t *s, json_t *root, va_list *ap)
     if(root && strict == 1) {
         /* We need to check that all non optional items have been parsed */
         const char *key;
-        int have_unrecognized_keys = 0;
+        /* keys_res is 1 for uninitialized, 0 for success, -1 for error. */
+        int keys_res = 1;
         strbuffer_t unrecognized_keys;
         json_t *value;
         long unpacked = 0;
-        if (gotopt) {
-            /* We have optional keys, we need to iter on each key */
+
+        if (gotopt || json_object_size(root) != key_set.size) {
             json_object_foreach(root, key, value) {
                 if(!hashtable_get(&key_set, key)) {
                     unpacked++;
 
                     /* Save unrecognized keys for the error message */
-                    if (!have_unrecognized_keys) {
-                        strbuffer_init(&unrecognized_keys);
-                        have_unrecognized_keys = 1;
-                    } else {
-                        strbuffer_append_bytes(&unrecognized_keys, ", ", 2);
+                    if (keys_res == 1) {
+                        keys_res = strbuffer_init(&unrecognized_keys);
+                    } else if (!keys_res) {
+                        keys_res = strbuffer_append_bytes(&unrecognized_keys, ", ", 2);
                     }
-                    strbuffer_append_bytes(&unrecognized_keys, key, strlen(key));
+
+                    if (!keys_res)
+                        keys_res = strbuffer_append_bytes(&unrecognized_keys, key, strlen(key));
                 }
             }
-        } else {
-            /* No optional keys, we can just compare the number of items */
-            unpacked = (long)json_object_size(root) - (long)key_set.size;
         }
         if (unpacked) {
-            if (!gotopt) {
-                /* Save unrecognized keys for the error message */
-                json_object_foreach(root, key, value) {
-                    if(!hashtable_get(&key_set, key)) {
-                        if (!have_unrecognized_keys) {
-                            strbuffer_init(&unrecognized_keys);
-                            have_unrecognized_keys = 1;
-                        } else {
-                            strbuffer_append_bytes(&unrecognized_keys, ", ", 2);
-                        }
-                        strbuffer_append_bytes(&unrecognized_keys, key, strlen(key));
-                    }
-                }
-            }
             set_error(s, "<validation>", json_error_end_of_input_expected,
                       "%li object item(s) left unpacked: %s",
-                      unpacked, strbuffer_value(&unrecognized_keys));
+                      unpacked,
+                      keys_res ? "<unknown>" : strbuffer_value(&unrecognized_keys));
             strbuffer_close(&unrecognized_keys);
             goto out;
         }
@@ -805,6 +851,7 @@ json_t *json_vpack_ex(json_error_t *error, size_t flags,
     value = pack(&s, &ap_copy);
     va_end(ap_copy);
 
+    /* This will cover all situations where s.has_error is true */
     if(!value)
         return NULL;
 
@@ -814,10 +861,6 @@ json_t *json_vpack_ex(json_error_t *error, size_t flags,
         set_error(&s, "<format>", json_error_invalid_format, "Garbage after format string");
         return NULL;
     }
-    if(s.has_error) {
-        json_decref(value);
-        return NULL;
-    }
 
     return value;
 }
diff --git a/client/jansson/strbuffer.h b/client/jansson/strbuffer.h
index 615b7f5ff..a0276d4b1 100644
--- a/client/jansson/strbuffer.h
+++ b/client/jansson/strbuffer.h
@@ -16,7 +16,7 @@ typedef struct {
     size_t size;     /* bytes allocated */
 } strbuffer_t;
 
-int strbuffer_init(strbuffer_t *strbuff);
+int strbuffer_init(strbuffer_t *strbuff) JANSSON_ATTRS(warn_unused_result);
 void strbuffer_close(strbuffer_t *strbuff);
 
 void strbuffer_clear(strbuffer_t *strbuff);
diff --git a/client/jansson/value.c b/client/jansson/value.c
index b3b31412b..3f964a041 100644
--- a/client/jansson/value.c
+++ b/client/jansson/value.c
@@ -652,8 +652,7 @@ static json_t *string_create(const char *value, size_t len, int own)
 
     string = jsonp_malloc(sizeof(json_string_t));
     if(!string) {
-        if(!own)
-            jsonp_free(v);
+        jsonp_free(v);
         return NULL;
     }
     json_init(&string->json, JSON_STRING);
@@ -768,9 +767,6 @@ static int json_string_equal(const json_t *string1, const json_t *string2)
 {
     json_string_t *s1, *s2;
 
-    if(!json_is_string(string1) || !json_is_string(string2))
-        return 0;
-
     s1 = json_to_string(string1);
     s2 = json_to_string(string2);
     return s1->length == s2->length && !memcmp(s1->value, s2->value, s1->length);
@@ -780,34 +776,38 @@ static json_t *json_string_copy(const json_t *string)
 {
     json_string_t *s;
 
-    if(!json_is_string(string))
-        return NULL;
-
     s = json_to_string(string);
     return json_stringn_nocheck(s->value, s->length);
 }
 
 json_t *json_vsprintf(const char *fmt, va_list ap) {
+    json_t *json = NULL;
     int length;
     char *buf;
     va_list aq;
     va_copy(aq, ap);
 
     length = vsnprintf(NULL, 0, fmt, ap);
-    if (length == 0)
-        return json_string("");
+    if (length == 0) {
+        json = json_string("");
+        goto out;
+    }
 
     buf = jsonp_malloc(length + 1);
     if (!buf)
-        return NULL;
+        goto out;
 
     vsnprintf(buf, length + 1, fmt, aq);
     if (!utf8_check_string(buf, length)) {
         jsonp_free(buf);
-        return NULL;
+        goto out;
     }
 
-    return jsonp_stringn_nocheck_own(buf, length);
+    json = jsonp_stringn_nocheck_own(buf, length);
+
+out:
+    va_end(aq);
+    return json;
 }
 
 json_t *json_sprintf(const char *fmt, ...) {
@@ -1044,8 +1044,6 @@ json_t *json_copy(json_t *json)
         default:
             return NULL;
     }
-
-    return NULL;
 }
 
 json_t *json_deep_copy(const json_t *json)
@@ -1073,6 +1071,4 @@ json_t *json_deep_copy(const json_t *json)
         default:
             return NULL;
     }
-
-    return NULL;
 }

From 0ffddd8470eabef829e9e7250ab52a419c719b8f Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Thu, 29 Nov 2018 13:21:38 +0200
Subject: [PATCH 0266/1938] raw load file

---
 client/loclass/fileutils.c | 34 +++++++++++++++++++++++++++++++---
 client/loclass/fileutils.h |  3 ++-
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index ea595ad26..f1431ee52 100644
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -283,10 +283,38 @@ out:
 	return retval;
 }
 
-int loadFileJSON(const char *preferredName, const char *suffix, void* data, size_t* datalen) {
-	//stub - for merlokk ;)
+int loadFileJSON(const char *preferredName, const char *suffix, void* data, size_t maxdatalen, size_t* datalen) {
 	datalen = 0;
-	return 1;
+	json_t *root;
+	json_error_t error;
+
+	if ( preferredName == NULL ) return 1;
+	if ( suffix == NULL ) return 1;
+
+	int retval = 0;
+	int size = sizeof(char) * (strlen(preferredName) + strlen(suffix) + 10);
+	char * fileName = calloc(size, sizeof(char));
+	sprintf(fileName,"%s.%s", preferredName, suffix);
+
+	root = json_load_file(fileName, 0, &error);
+	if (!root) {
+		PrintAndLog("ERROR: json (%s) error on line %d: %s", fileName, error.line, error.text);
+		retval = 2; 
+		goto out;
+	}
+	
+	if (!json_is_object(root)) {
+		PrintAndLog("ERROR: Invalid json (%s) format. root must be an object.", fileName);
+		retval = 3; 
+		goto out;
+	}
+	
+	JsonLoadBufAsHex(root, "$.raw", data, maxdatalen, datalen);
+	
+out:	
+	json_decref(root);
+	free(fileName);
+	return retval;
 }
 
 #else //if we're on ARM
diff --git a/client/loclass/fileutils.h b/client/loclass/fileutils.h
index 0893e01ea..c699be3de 100644
--- a/client/loclass/fileutils.h
+++ b/client/loclass/fileutils.h
@@ -122,10 +122,11 @@ extern int loadFileEML(const char *preferredName, const char *suffix, void* data
  * @param preferredName
  * @param suffix the file suffix. Leave out the ".".
  * @param data The data array to store the loaded bytes from file
+ * @param maxdatalen maximum size of data array in bytes
  * @param datalen the number of bytes loaded from file
  * @return 0 for ok, 1 for failz
 */
-extern int loadFileJSON(const char *preferredName, const char *suffix, void* data, size_t* datalen);
+extern int loadFileJSON(const char *preferredName, const char *suffix, void* data, size_t maxdatalen, size_t* datalen);
 
 #define PrintAndLogDevice(level, format, args...)  PrintAndLogEx(level, format , ## args)
 #else 

From e6d7a0572192f9b1fdc3370810cef5062a043e2e Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Thu, 29 Nov 2018 13:42:07 +0200
Subject: [PATCH 0267/1938] csave works

---
 client/cmdhfmf.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 03875401c..c90a11968 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -2878,6 +2878,7 @@ int CmdHF14AMfCSave(const char *Cmd) {
 
 	saveFile(filename, "bin", dump, bytes);
 	saveFileEML(filename, "eml", dump, bytes, MFBLOCK_SIZE);
+	saveFileJSON(filename, "json", dump, bytes);
 	free(dump);
 	return 0;
 }

From 955ced6c28a31eb30fb0eab96d5f4fe8ff0d885f Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Thu, 29 Nov 2018 16:05:57 +0200
Subject: [PATCH 0268/1938] hf mf csave works

---
 client/cmdhfmf.c           |  2 +-
 client/loclass/fileutils.c | 55 ++++++++++++++++++++++++++++++++++++--
 client/loclass/fileutils.h |  9 ++++++-
 client/mifare4.c           | 46 +++++++++++++++++++++++++++++++
 client/mifare4.h           |  7 +++++
 5 files changed, 115 insertions(+), 4 deletions(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index c90a11968..b14dde768 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -2878,7 +2878,7 @@ int CmdHF14AMfCSave(const char *Cmd) {
 
 	saveFile(filename, "bin", dump, bytes);
 	saveFileEML(filename, "eml", dump, bytes, MFBLOCK_SIZE);
-	saveFileJSON(filename, "json", dump, bytes);
+	saveFileJSON(filename, "json", jsfCardMemory, dump, bytes);
 	free(dump);
 	return 0;
 }
diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index f1431ee52..f110e02fc 100644
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -135,7 +135,7 @@ out:
 	return retval;
 }
 
-int saveFileJSON(const char *preferredName, const char *suffix, uint8_t* data, size_t datalen) {
+int saveFileJSON(const char *preferredName, const char *suffix, JSONFileType ftype, uint8_t* data, size_t datalen) {
 	if ( preferredName == NULL ) return 1;
 	if ( suffix == NULL ) return 1;
 	if ( data == NULL ) return 1;
@@ -152,7 +152,58 @@ int saveFileJSON(const char *preferredName, const char *suffix, uint8_t* data, s
 
 	json_t *root = json_object();
 	JsonSaveStr(root, "Created", "proxmark3");
-	JsonSaveBufAsHexCompact(root, "raw", data, datalen);
+	switch(ftype) {
+		case jsfRaw:
+			JsonSaveStr(root, "FileType", "raw");
+			JsonSaveBufAsHexCompact(root, "raw", data, datalen);
+			break;
+		case jsfCardMemory:
+			JsonSaveStr(root, "FileType", "mifare card dump");
+			for (int i = 0; i < (datalen / 16); i++) {
+				char path[30] = {0};
+				sprintf(path, "$.blocks.%d", i);
+				JsonSaveBufAsHexCompact(root, path, &data[i * 16], 16);
+				
+				if (i == 0) {
+					JsonSaveBufAsHexCompact(root, "$.Card.UID", &data[0], 4);
+					JsonSaveBufAsHexCompact(root, "$.Card.SAK", &data[5], 1);
+					JsonSaveBufAsHexCompact(root, "$.Card.ATQA", &data[6], 2);
+				}
+				
+				if (mfIsSectorTrailer(i)) {
+					char patha[30] = {0};
+					sprintf(patha, "$.SectorKeys.%d.KeyA", mfSectorNum(i));
+					JsonSaveBufAsHexCompact(root, patha, &data[i * 16], 6);
+
+					char pathb[30] = {0};
+					sprintf(pathb, "$.SectorKeys.%d.KeyB", mfSectorNum(i));
+					JsonSaveBufAsHexCompact(root, pathb, &data[i * 16 + 10], 6);
+
+					char pathc[30] = {0};
+					uint8_t *adata = &data[i * 16 + 6];
+					sprintf(pathc, "$.SectorKeys.%d.AccessConditions", mfSectorNum(i));
+					JsonSaveBufAsHexCompact(root, pathc, &data[i * 16 + 6], 4);
+
+					memset(path, 0x00, sizeof(path));
+					sprintf(path, "$.SectorKeys.%d.AccessConditionsText.block%d", mfSectorNum(i), i - 3);
+					JsonSaveStr(root, path, mfGetAccessConditionsDesc(0, adata));
+
+					memset(path, 0x00, sizeof(path));
+					sprintf(path, "$.SectorKeys.%d.AccessConditionsText.block%d", mfSectorNum(i), i - 2);
+					JsonSaveStr(root, path, mfGetAccessConditionsDesc(1, adata));
+
+					memset(path, 0x00, sizeof(path));
+					sprintf(path, "$.SectorKeys.%d.AccessConditionsText.block%d", mfSectorNum(i), i - 1);
+					JsonSaveStr(root, path, mfGetAccessConditionsDesc(2, adata));
+
+					memset(path, 0x00, sizeof(path));
+					sprintf(path, "$.SectorKeys.%d.AccessConditionsText.block%d", mfSectorNum(i), i);
+					JsonSaveStr(root, path, mfGetAccessConditionsDesc(3, adata));
+
+				}
+			}
+			break;
+	}
 
 	int res = json_dump_file(root, fileName, JSON_INDENT(2));
 	if (res) {
diff --git a/client/loclass/fileutils.h b/client/loclass/fileutils.h
index c699be3de..3852b4bf4 100644
--- a/client/loclass/fileutils.h
+++ b/client/loclass/fileutils.h
@@ -48,6 +48,12 @@
 #include <stdarg.h>
 #include "../ui.h"
 #include "../emv/emvjson.h"
+#include "mifare4.h"
+
+typedef enum {
+	jsfRaw,
+	jsfCardMemory,
+} JSONFileType;
 
 int fileExists(const char *filename);
 
@@ -85,11 +91,12 @@ extern int saveFileEML(const char *preferredName, const char *suffix, uint8_t* d
  *
  * @param preferredName
  * @param suffix the file suffix. Leave out the ".".
+ * @param ftype type of file.
  * @param data The binary data to write to the file
  * @param datalen the length of the data
  * @return 0 for ok, 1 for failz
  */
-extern int saveFileJSON(const char *preferredName, const char *suffix, uint8_t* data, size_t datalen);
+extern int saveFileJSON(const char *preferredName, const char *suffix, JSONFileType ftype, uint8_t* data, size_t datalen);
 
 /** STUB
  * @brief Utility function to load data from a binary file. This method takes a preferred name.
diff --git a/client/mifare4.c b/client/mifare4.c
index 39869ab77..0c53a1f9b 100644
--- a/client/mifare4.c
+++ b/client/mifare4.c
@@ -17,6 +17,52 @@
 #include "ui.h"
 #include "crypto/libpcrypto.h"
 
+AccessConditions_t MFAccessConditions[] = {
+	{0x00, "rdAB wrAB incAB dectrAB"},
+	{0x01, "rdAB dectrAB"},
+	{0x02, "rdAB"},
+	{0x03, "rdB wrB"},
+	{0x04, "rdAB wrB"},
+	{0x05, "rdB"},
+	{0x06, "rdAB wrB incB dectrAB"},
+	{0x07, "none"}
+};
+
+AccessConditions_t MFAccessConditionsTrailer[] = {
+	{0x00, "rdAbyA rdCbyA rdBbyA wrBbyA"},
+	{0x01, "wrAbyA rdCbyA wrCbyA rdBbyA wrBbyA"},
+	{0x02, "rdCbyA rdBbyA"},
+	{0x03, "wrAbyB rdCbyAB wrCbyB wrBbyB"},
+	{0x04, "wrAbyB rdCbyAB wrBbyB"},
+	{0x05, "rdCbyAB wrCbyB"},
+	{0x06, "rdCbyAB"},
+	{0x07, "rdCbyAB"}
+};
+
+char *mfGetAccessConditionsDesc(uint8_t blockn, uint8_t *data) {
+	static char StaticNone[] = "none";
+	
+	uint8_t data1 = ((data[1] >> 4) & 0x0f) >> blockn;
+	uint8_t data2 = ((data[2]) & 0x0f) >> blockn;
+	uint8_t data3 = ((data[2] >> 4) & 0x0f) >> blockn;
+	
+	uint8_t cond = (data1 & 0x01) << 2 | (data2 & 0x01) << 1 | (data3 & 0x01);
+
+	if (blockn == 3) {
+		for (int i = 0; i < ARRAYLEN(MFAccessConditionsTrailer); i++)
+			if (MFAccessConditionsTrailer[i].cond == cond) {
+				return MFAccessConditionsTrailer[i].description;
+			}
+	} else {
+		for (int i = 0; i < ARRAYLEN(MFAccessConditions); i++)
+			if (MFAccessConditions[i].cond == cond) {
+				return MFAccessConditions[i].description;
+			}
+	};
+	
+	return StaticNone;
+};
+
 int CalculateEncIVCommand(mf4Session *session, uint8_t *iv, bool verbose) {
 	memcpy(&iv[0], session->TI, 4);
 	memcpy(&iv[4], &session->R_Ctr, 2);
diff --git a/client/mifare4.h b/client/mifare4.h
index b85d512f1..011567a1e 100644
--- a/client/mifare4.h
+++ b/client/mifare4.h
@@ -38,9 +38,16 @@ typedef enum {
 	mtypWriteResp,
 } MACType_t;
 
+typedef struct {
+	uint8_t cond;
+	char *description;
+} AccessConditions_t;
+
 extern int CalculateMAC(mf4Session *session, MACType_t mtype, uint8_t blockNum, uint8_t blockCount, uint8_t *data, int datalen, uint8_t *mac, bool verbose);
 extern int MifareAuth4(mf4Session *session, uint8_t *keyn, uint8_t *key, bool activateField, bool leaveSignalON, bool verbose);
 
+extern char *mfGetAccessConditionsDesc(uint8_t blockn, uint8_t *data);
+
 extern uint8_t mfNumBlocksPerSector(uint8_t sectorNo);
 extern uint8_t mfFirstBlockOfSector(uint8_t sectorNo);
 extern uint8_t mfSectorTrailer(uint8_t blockNo);

From 6baf579fe082843084641a4f0be99239603047b9 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Thu, 29 Nov 2018 16:56:57 +0200
Subject: [PATCH 0269/1938] hf mf cload works

---
 client/cmdhfmf.c           | 30 +++++++++++++++++++++++++-----
 client/loclass/fileutils.c | 37 ++++++++++++++++++++++++++++++++++---
 2 files changed, 59 insertions(+), 8 deletions(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index b14dde768..1e43ff81e 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -330,7 +330,9 @@ int usage_hf14_cload(void){
 	PrintAndLogEx(NORMAL, "Options:");
 	PrintAndLogEx(NORMAL, "       h            this help");
 	PrintAndLogEx(NORMAL, "       e            load card with data from emulator memory");
-	PrintAndLogEx(NORMAL, "       <filename>   load card with data from file");
+	PrintAndLogEx(NORMAL, "       j <filename> load card with data from json file");
+	PrintAndLogEx(NORMAL, "       b <filename> load card with data from binary file");
+	PrintAndLogEx(NORMAL, "       <filename>   load card with data from eml file");
 	PrintAndLogEx(NORMAL, "Examples:");
 	PrintAndLogEx(NORMAL, "       hf mf cload mydump");
 	PrintAndLogEx(NORMAL, "       hf mf cload e");	
@@ -2631,12 +2633,21 @@ int CmdHF14AMfCLoad(const char *Cmd) {
 	uint8_t buf8[16] = {0x00};
 	uint8_t fillFromEmulator = 0;
 	int blockNum, flags = 0;
+	bool fillFromJson = false;
+	bool fillFromBin = false;
+	char fileName[50] = {0};
 	
 	char ctmp = tolower(param_getchar(Cmd, 0));
-	if ( strlen(Cmd) == 1 ) {
+	if ( param_getlength(Cmd, 0) == 1 ) {
 		if (ctmp == 'h' || ctmp == 0x00) return usage_hf14_cload();
 		if (ctmp == 'e' ) fillFromEmulator = 1;
+		if (ctmp == 'j' ) fillFromJson = true;
+		if (ctmp == 'b' ) fillFromBin = true;
 	}
+
+	if (fillFromJson || fillFromBin)
+		param_getstr(Cmd, 1, fileName, sizeof(fileName));
+
 	
 	if (fillFromEmulator) {
 		for (blockNum = 0; blockNum < 16 * 4; blockNum += 1) {
@@ -2658,10 +2669,19 @@ int CmdHF14AMfCLoad(const char *Cmd) {
 		return 0;
 	}
 
-	uint8_t *data = calloc(1, 4096);
+	size_t maxdatalen = 4096;
+	uint8_t *data = calloc(1, maxdatalen);
 	size_t datalen = 0;
-	//int res = loadFile(Cmd, "bin", data, &datalen);
-	int res = loadFileEML( Cmd, "eml", data, &datalen);
+	int res = 0;
+	if (fillFromBin) {
+		res = loadFile(fileName, "bin", data, &datalen);
+	} else {
+		if (fillFromJson) {
+			res = loadFileJSON(fileName, "json", data, maxdatalen, &datalen);
+		} else {
+			res = loadFileEML( Cmd, "eml", data, &datalen);
+		}
+	}
 	if ( res ) {
 		free(data);
 		return 1;
diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index f110e02fc..c64da6b22 100644
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -158,7 +158,7 @@ int saveFileJSON(const char *preferredName, const char *suffix, JSONFileType fty
 			JsonSaveBufAsHexCompact(root, "raw", data, datalen);
 			break;
 		case jsfCardMemory:
-			JsonSaveStr(root, "FileType", "mifare card dump");
+			JsonSaveStr(root, "FileType", "mfcard");
 			for (int i = 0; i < (datalen / 16); i++) {
 				char path[30] = {0};
 				sprintf(path, "$.blocks.%d", i);
@@ -335,7 +335,7 @@ out:
 }
 
 int loadFileJSON(const char *preferredName, const char *suffix, void* data, size_t maxdatalen, size_t* datalen) {
-	datalen = 0;
+	*datalen = 0;
 	json_t *root;
 	json_error_t error;
 
@@ -360,8 +360,39 @@ int loadFileJSON(const char *preferredName, const char *suffix, void* data, size
 		goto out;
 	}
 	
-	JsonLoadBufAsHex(root, "$.raw", data, maxdatalen, datalen);
+	uint8_t *udata = (uint8_t *)data;
+	char ctype[100] = {0};
+	JsonLoadStr(root, "$.FileType", ctype);
 	
+	if (!strcmp(ctype, "raw")) {
+		JsonLoadBufAsHex(root, "$.raw", udata, maxdatalen, datalen);
+	}
+
+	if (!strcmp(ctype, "mfcard")) {
+		printf("--mfcard--\n");
+		size_t sptr = 0;
+		for (int i = 0; i < 256; i++) {
+			if (sptr + 16 > maxdatalen) {
+				retval = 5;
+				goto out;
+			}
+
+			char path[30] = {0};
+			sprintf(path, "$.blocks.%d", i);
+			
+			size_t len = 0;
+			JsonLoadBufAsHex(root, path, &udata[sptr], 16, &len);
+			if (!len)
+				break;
+			printf("--- (%d) (%d) %s \n", i, len, sprint_hex(&udata[sptr], len));
+			
+			sptr += len;
+		}
+		
+		*datalen = sptr;
+	}
+
+	PrintAndLog("Loaded JSON: (%s) OK.", fileName);
 out:	
 	json_decref(root);
 	free(fileName);

From efabdde2485a5bf2333e03bf48526897e5127653 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Thu, 29 Nov 2018 17:09:37 +0200
Subject: [PATCH 0270/1938] small fixes. done

---
 client/loclass/fileutils.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index c64da6b22..c0b379c78 100644
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -200,6 +200,10 @@ int saveFileJSON(const char *preferredName, const char *suffix, JSONFileType fty
 					sprintf(path, "$.SectorKeys.%d.AccessConditionsText.block%d", mfSectorNum(i), i);
 					JsonSaveStr(root, path, mfGetAccessConditionsDesc(3, adata));
 
+					memset(path, 0x00, sizeof(path));
+					sprintf(path, "$.SectorKeys.%d.AccessConditionsText.UserData", mfSectorNum(i));
+					JsonSaveBufAsHexCompact(root, path, &adata[3], 1);
+
 				}
 			}
 			break;
@@ -369,7 +373,6 @@ int loadFileJSON(const char *preferredName, const char *suffix, void* data, size
 	}
 
 	if (!strcmp(ctype, "mfcard")) {
-		printf("--mfcard--\n");
 		size_t sptr = 0;
 		for (int i = 0; i < 256; i++) {
 			if (sptr + 16 > maxdatalen) {
@@ -384,7 +387,6 @@ int loadFileJSON(const char *preferredName, const char *suffix, void* data, size
 			JsonLoadBufAsHex(root, path, &udata[sptr], 16, &len);
 			if (!len)
 				break;
-			printf("--- (%d) (%d) %s \n", i, len, sprint_hex(&udata[sptr], len));
 			
 			sptr += len;
 		}

From 4dece3e30da03e6e9191a75e192bae03e55cc889 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Thu, 29 Nov 2018 17:13:00 +0200
Subject: [PATCH 0271/1938] del line

---
 client/loclass/fileutils.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index c0b379c78..36e16469c 100644
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -203,7 +203,6 @@ int saveFileJSON(const char *preferredName, const char *suffix, JSONFileType fty
 					memset(path, 0x00, sizeof(path));
 					sprintf(path, "$.SectorKeys.%d.AccessConditionsText.UserData", mfSectorNum(i));
 					JsonSaveBufAsHexCompact(root, path, &adata[3], 1);
-
 				}
 			}
 			break;

From b64fdafc4038fcdca783b2e2262acd2ebf87f0dc Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 29 Nov 2018 17:53:24 +0100
Subject: [PATCH 0272/1938] ADD:  basic iso15693 comms in lua support.   Not
 fully functional

---
 client/lualibs/read15.lua | 93 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 93 insertions(+)
 create mode 100644 client/lualibs/read15.lua

diff --git a/client/lualibs/read15.lua b/client/lualibs/read15.lua
new file mode 100644
index 000000000..b337d22d7
--- /dev/null
+++ b/client/lualibs/read15.lua
@@ -0,0 +1,93 @@
+--[[
+	This is a library to read 15693 tags. It can be used something like this
+
+	local reader = require('read15')
+	result, err = reader.read15693()
+	if not result then
+		print(err)
+		return
+	end
+	print(result.name)
+
+--]]
+-- Loads the commands-library
+local cmds = require('commands')
+local TIMEOUT = 2000 -- Shouldn't take longer than 2 seconds
+
+
+--- Sends a USBpacket to the device
+-- @param command - the usb packet to send
+-- @param ignoreresponse - if set to true, we don't read the device answer packet
+-- 		which is usually recipe for fail. If not sent, the host will wait 2s for a
+-- 		response of type CMD_ACK
+-- @return 	packet,nil if successfull
+--			nil, errormessage if unsuccessfull
+local function sendToDevice(command, ignoreresponse)
+	local err = core.SendCommand(command:getBytes())
+	if err then
+		print(err)
+		return nil, err
+	end
+	if ignoreresponse then return nil,nil end
+
+	local response = core.WaitForResponseTimeout(cmds.CMD_ACK, TIMEOUT)
+	return response,nil
+end
+
+-- This function does a connect and retrieves som einfo
+-- @param dont_disconnect - if true, does not disable the field
+-- @return if successfull: an table containing card info
+-- @return if unsuccessfull : nil, error
+local function read15693(slow, dont_readresponse)
+	local command, result, info, err, data
+
+	command = Command:new{cmd = cmds.CMD_ISO_15693_COMMAND, arg1 = 0, arg2 = 1, arg3 = 1 }
+
+	if slow then
+		command.arg2 = 0
+	end
+	if dont_readresponse then
+		command.arg3 = 0 
+	end
+	
+	local result, err = sendToDevice(command, dont_readresponse)
+	if result then
+		local count,cmd,arg0,arg1,arg2 = bin.unpack('LLLL',result)
+		if arg0 == 0 then
+			return nil, "iso15693 no bytes returned"
+		end	
+		data = string.sub(result, count)
+		info, err = bin.unpack('H', data)
+		print("LEN", arg0, data )
+	else
+		err = "No response from card"
+	end
+
+	if err then
+		print(err)
+		return nil, err
+	end
+	return info
+end
+
+---
+-- Waits for a mifare card to be placed within the vicinity of the reader.
+-- @return if successfull: an table containing card info
+-- @return if unsuccessfull : nil, error
+local function waitFor15693()
+	print("Waiting for card... press any key to quit")
+	while not core.ukbhit() do
+		res, err = read15693()
+		if res then return res end
+		-- err means that there was no response from card
+	end
+	return nil, "Aborted by user"
+end
+local library = {
+	read = read15693,
+	waitFor15693 = waitFor15693,
+--	parse15693 = parse15693,
+	sendToDevice = sendToDevice,
+}
+
+return library

From 0b5ee43392fce4891fb9a5ab6d176c6222514b76 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 29 Nov 2018 17:59:46 +0100
Subject: [PATCH 0273/1938] FIX:  remove linker directive warnings used with
 compiler in CLANG,  OS X.

---
 client/jansson/Makefile  | 2 +-
 client/tinycbor/Makefile | 2 +-
 common/mbedtls/Makefile  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/jansson/Makefile b/client/jansson/Makefile
index e608d7c04..7657e35f3 100644
--- a/client/jansson/Makefile
+++ b/client/jansson/Makefile
@@ -34,7 +34,7 @@ CLEAN = $(CMDOBJS)
 CC= gcc
 CFLAGS= -O2 -Wall -Wno-unused-variable -Wno-unused-function
 LDFLAGS= $(SYSLDFLAGS) $(libjansson_la_LDFLAGS)
-LIBS= -lm $(SYSLIBS) $(MYLIBS)
+LIBS= $(SYSLIBS) $(MYLIBS)
 DEFAULT_INCLUDES = -I.
 DEFS = -DHAVE_STDINT_H
 
diff --git a/client/tinycbor/Makefile b/client/tinycbor/Makefile
index 31fb327cb..78ef64dc0 100644
--- a/client/tinycbor/Makefile
+++ b/client/tinycbor/Makefile
@@ -16,7 +16,7 @@ CLEAN = $(CMDOBJS)
 	
 CC= gcc
 CFLAGS= -O2 -Wall -Wno-unused-variable -Wno-unused-function
-LIBS= -lm $(SYSLIBS) $(MYLIBS)
+LIBS=  $(SYSLIBS) $(MYLIBS)
 DEFAULT_INCLUDES = -I. -I..
 DEFS = -DHAVE_STDINT_H
 
diff --git a/common/mbedtls/Makefile b/common/mbedtls/Makefile
index a9a850989..2a6bca6f4 100644
--- a/common/mbedtls/Makefile
+++ b/common/mbedtls/Makefile
@@ -57,7 +57,7 @@ CLEAN = $(CMDOBJS)
 CC= gcc
 CFLAGS= -O2 -Wall -Wno-unused-variable -Wno-unused-function
 LDFLAGS= $(SYSLDFLAGS) $(mbedtls_LDFLAGS)
-LIBS= -lm $(SYSLIBS) $(MYLIBS)
+LIBS=  $(SYSLIBS) $(MYLIBS)
 DEFAULT_INCLUDES = -I. -I..
 DEFS = -DHAVE_STDINT_H
 

From 9584074c00a22e4e302eb44858e4ad9dec5b6ca1 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Thu, 29 Nov 2018 22:06:49 +0200
Subject: [PATCH 0274/1938] fix memory error

---
 client/loclass/fileutils.c | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index 36e16469c..c18b2fa30 100644
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -36,7 +36,9 @@
  ****************************************************************************/
 #include "fileutils.h"
 
- #ifndef ON_DEVICE
+#ifndef ON_DEVICE
+
+#define PATH_MAX_LENGTH 100
 
 /**
  * @brief checks if a file exists
@@ -160,7 +162,7 @@ int saveFileJSON(const char *preferredName, const char *suffix, JSONFileType fty
 		case jsfCardMemory:
 			JsonSaveStr(root, "FileType", "mfcard");
 			for (int i = 0; i < (datalen / 16); i++) {
-				char path[30] = {0};
+				char path[PATH_MAX_LENGTH] = {0};
 				sprintf(path, "$.blocks.%d", i);
 				JsonSaveBufAsHexCompact(root, path, &data[i * 16], 16);
 				
@@ -171,18 +173,18 @@ int saveFileJSON(const char *preferredName, const char *suffix, JSONFileType fty
 				}
 				
 				if (mfIsSectorTrailer(i)) {
-					char patha[30] = {0};
-					sprintf(patha, "$.SectorKeys.%d.KeyA", mfSectorNum(i));
-					JsonSaveBufAsHexCompact(root, patha, &data[i * 16], 6);
+					memset(path, 0x00, sizeof(path));
+					sprintf(path, "$.SectorKeys.%d.KeyA", mfSectorNum(i));
+					JsonSaveBufAsHexCompact(root, path, &data[i * 16], 6);
 
-					char pathb[30] = {0};
-					sprintf(pathb, "$.SectorKeys.%d.KeyB", mfSectorNum(i));
-					JsonSaveBufAsHexCompact(root, pathb, &data[i * 16 + 10], 6);
+					memset(path, 0x00, sizeof(path));
+					sprintf(path, "$.SectorKeys.%d.KeyB", mfSectorNum(i));
+					JsonSaveBufAsHexCompact(root, path, &data[i * 16 + 10], 6);
 
-					char pathc[30] = {0};
+					memset(path, 0x00, sizeof(path));
 					uint8_t *adata = &data[i * 16 + 6];
-					sprintf(pathc, "$.SectorKeys.%d.AccessConditions", mfSectorNum(i));
-					JsonSaveBufAsHexCompact(root, pathc, &data[i * 16 + 6], 4);
+					sprintf(path, "$.SectorKeys.%d.AccessConditions", mfSectorNum(i));
+					JsonSaveBufAsHexCompact(root, path, &data[i * 16 + 6], 4);
 
 					memset(path, 0x00, sizeof(path));
 					sprintf(path, "$.SectorKeys.%d.AccessConditionsText.block%d", mfSectorNum(i), i - 3);

From 2accb7d3f425b0a833b1e2b143768abb90fee531 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 29 Nov 2018 23:32:59 +0100
Subject: [PATCH 0275/1938] CHG:  remove different clocks calls.

---
 common/i2c.c | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/common/i2c.c b/common/i2c.c
index 200c8cf27..f6ea7e662 100644
--- a/common/i2c.c
+++ b/common/i2c.c
@@ -111,23 +111,23 @@ void I2C_SetResetStatus(uint8_t LineRST, uint8_t LineSCK, uint8_t LineSDA) {
 // Reset the SIM_Adapter, then  enter the main program
 // Note: the SIM_Adapter will not enter the main program after power up. Please run this function before use SIM_Adapter.
 void I2C_Reset_EnterMainProgram(void) {
+	StartTicks();
 	I2C_init();
-	
 	I2C_SetResetStatus(0, 0, 0);
-	SpinDelay(30);
+	WaitMS(30);
 	I2C_SetResetStatus(1, 0, 0);
-	SpinDelay(30);
+	WaitMS(30);
 	I2C_SetResetStatus(1, 1, 1);
-	SpinDelay(10);
+	WaitMS(10);
 }
 
 // Reset the SIM_Adapter, then enter the bootloader program
 // Reserve for firmware update.
 void I2C_Reset_EnterBootloader(void) {
 	I2C_SetResetStatus(0, 1, 1);
-	SpinDelay(100);
+	WaitMS(100);
 	I2C_SetResetStatus(1, 1, 1);
-	SpinDelay(10);
+	WaitMS(10);
 }
 
 // Wait for the clock to go High.	
@@ -170,7 +170,7 @@ bool WaitSCL_L_300ms(void){
 		if (!SCL_read)
 			return true;
 		
-		SpinDelay(1);
+		WaitMS(1);
 	}
 	return (delay == 0);
 }
@@ -401,7 +401,7 @@ int16_t I2C_BufferRead(uint8_t *data, uint8_t len, uint8_t device_cmd, uint8_t d
 
 	// extra wait  500us (514us measured)
 	// 200us  (xx measured)
-	SpinDelayUs(600);
+	WaitUs(600);
 	bool bBreak = true;
 	uint16_t readcount = 0;
 	
@@ -572,7 +572,6 @@ bool I2C_WriteFW(uint8_t *data, uint8_t len, uint8_t msb, uint8_t lsb, uint8_t d
 void I2C_print_status(void) {
 	DbpString("Smart card module (ISO 7816)");
 	uint8_t resp[] = {0,0,0,0};
-	I2C_init();
 	I2C_Reset_EnterMainProgram();
 	uint8_t len = I2C_BufferRead(resp, sizeof(resp), I2C_DEVICE_CMD_GETVERSION, I2C_DEVICE_ADDRESS_MAIN);
 	if ( len > 0 )
@@ -666,7 +665,6 @@ void SmartCardAtr(void) {
 	LED_D_ON();
 	clear_trace();
 	set_tracing(true);
-	I2C_init();
 	I2C_Reset_EnterMainProgram();
 	bool isOK = GetATR( &card );
 	cmd_send(CMD_ACK, isOK, sizeof(smart_card_atr_t), 0, &card, sizeof(smart_card_atr_t));
@@ -707,12 +705,9 @@ void SmartCardRaw( uint64_t arg0, uint64_t arg1, uint8_t *data ) {
 		// Send raw bytes
 		// asBytes = A0 A4 00 00 02
 		// arg1 = len 5
-		I2C_BufferWrite(data, arg1, I2C_DEVICE_CMD_SEND, I2C_DEVICE_ADDRESS_MAIN);
-
-		if ( !I2C_WaitForSim() )
-			goto OUT;
-
-				
+		bool res = I2C_BufferWrite(data, arg1, I2C_DEVICE_CMD_SEND, I2C_DEVICE_ADDRESS_MAIN);
+		if ( !res && MF_DBGLEVEL > 3 ) DbpString(I2C_ERROR);		
+		
 		// read bytes from module
 		len = ISO7618_MAX_FRAME;
 		bool res = sc_rx_bytes(resp, &len);
@@ -724,8 +719,9 @@ void SmartCardRaw( uint64_t arg0, uint64_t arg1, uint8_t *data ) {
 	}
 OUT:	
 	cmd_send(CMD_ACK, len, 0, 0, resp, len);
+	BigBuf_free();
 	set_tracing(false);
-	LEDsoff();
+	LEDsoff();	
 }
 
 void SmartCardUpgrade(uint64_t arg0) {
@@ -763,7 +759,7 @@ void SmartCardUpgrade(uint64_t arg0) {
 		}
 		
 		// writing takes time.
-		SpinDelay(50);
+		WaitMS(50);
 
 		// read
 		res = I2C_ReadFW(verfiydata, size, msb, lsb, I2C_DEVICE_ADDRESS_BOOT);
@@ -785,6 +781,7 @@ void SmartCardUpgrade(uint64_t arg0) {
 	}			
 	cmd_send(CMD_ACK, isOK, pos, 0, 0, 0);
 	LED_C_OFF();
+	BigBuf_free();	
 }
 
 void SmartCardSetBaud(uint64_t arg0) {

From c948911f71389f81554badf2a6bd73487ccaba12 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 29 Nov 2018 23:37:05 +0100
Subject: [PATCH 0276/1938] chg...

---
 common/i2c.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/i2c.c b/common/i2c.c
index f6ea7e662..ecf5a5bd9 100644
--- a/common/i2c.c
+++ b/common/i2c.c
@@ -401,7 +401,7 @@ int16_t I2C_BufferRead(uint8_t *data, uint8_t len, uint8_t device_cmd, uint8_t d
 
 	// extra wait  500us (514us measured)
 	// 200us  (xx measured)
-	WaitUs(600);
+	WaitUS(600);
 	bool bBreak = true;
 	uint16_t readcount = 0;
 	
@@ -710,7 +710,7 @@ void SmartCardRaw( uint64_t arg0, uint64_t arg1, uint8_t *data ) {
 		
 		// read bytes from module
 		len = ISO7618_MAX_FRAME;
-		bool res = sc_rx_bytes(resp, &len);
+		res = sc_rx_bytes(resp, &len);
 		if ( res ) {
 			LogTrace(resp, len, 0, 0, NULL, false);
 		} else {

From bd7ac487cd3a07af455a065f44c954bbb68e016b Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 29 Nov 2018 23:44:50 +0100
Subject: [PATCH 0277/1938] FIX: 'hf mf hardnested' - output misalignment

---
 client/hardnested/hardnested_bruteforce.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/hardnested/hardnested_bruteforce.c b/client/hardnested/hardnested_bruteforce.c
index 602453646..55d6bbfbf 100644
--- a/client/hardnested/hardnested_bruteforce.c
+++ b/client/hardnested/hardnested_bruteforce.c
@@ -178,7 +178,7 @@ crack_states_thread(void* x){
             } else {
 				if (!thread_arg->silent) {
 					char progress_text[80];
-					sprintf(progress_text, "Brute force phase: %6.02f%%", 100.0*(float)num_keys_tested/(float)(thread_arg->maximum_states));
+					sprintf(progress_text, "Brute force phase: %6.02f%%\t", 100.0*(float)num_keys_tested/(float)(thread_arg->maximum_states));
 					float remaining_bruteforce = thread_arg->nonces[thread_arg->best_first_bytes[0]].expected_num_brute_force - (float)num_keys_tested/2;
 					hardnested_print_progress(thread_arg->num_acquired_nonces, progress_text, remaining_bruteforce, 5000);
 				}

From ccb0cd23f56f0b19a73da6817bacc4c22a806ddb Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 30 Nov 2018 01:19:57 +0100
Subject: [PATCH 0278/1938] FIX: 'lua calc of iso15692 crc' - works better now

---
 client/scripting.c | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/client/scripting.c b/client/scripting.c
index f0fa9b2f4..762a9c470 100644
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -280,10 +280,19 @@ static int l_CmdConsole(lua_State *L) {
 }
 
 static int l_iso15693_crc(lua_State *L) {
-    size_t size;
-    const char *v = luaL_checklstring(L, 1, &size);
-	// iceman, should be size / 2 ?!?
-    lua_pushunsigned(L, crc( CRC_15693, (uint8_t *) v, size));
+	uint32_t tmp;
+	unsigned char buf[USB_CMD_DATA_SIZE] = {0x00};
+    size_t size = 0;	
+    const char *data = luaL_checklstring(L, 1, &size);
+	
+	for (int i = 0; i < size; i += 2) {
+		sscanf(&data[i], "%02x", &tmp);
+		buf[i / 2] = tmp & 0xFF;
+	}
+	
+	size /= 2;	
+	compute_crc(CRC_15693, buf, size, &buf[size], &buf[size+1]);	
+    lua_pushlstring(L, (const char *)&buf, size+2);
     return 1;
 }
 

From a5898158c5685b087812ce4545330a486c6104c3 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 30 Nov 2018 01:41:39 +0100
Subject: [PATCH 0279/1938] FIX: basic fixes for lua reader14a, reader14b,
 reader15 ADD: utils got iso15693 crc support

---
 client/lualibs/hf_reader.lua | 155 +----------------------------------
 client/lualibs/read14a.lua   |   1 -
 client/lualibs/read14b.lua   |   8 +-
 client/lualibs/read15.lua    | 132 +++++++++++++++++++++++++----
 client/lualibs/utils.lua     |  14 +++-
 5 files changed, 135 insertions(+), 175 deletions(-)

diff --git a/client/lualibs/hf_reader.lua b/client/lualibs/hf_reader.lua
index da46cebbc..c9970f772 100644
--- a/client/lualibs/hf_reader.lua
+++ b/client/lualibs/hf_reader.lua
@@ -6,160 +6,7 @@ This library utilises other libraries under the hood, but can be used as a gener
 
 local reader14443A = require('read14a')
 local reader14443B = require('read14b')
-local cmds = require('commands')
-local TIMEOUT = 2000
-
-local function sendToDevice(command, ignoreresponse)
-	core.clearCommandBuffer()
-	local err = core.SendCommand(command:getBytes())
-	if err then
-		print(err)
-		return nil, err
-	end
-	if ignoreresponse then return nil,nil end
-	local response = core.WaitForResponseTimeout(cmds.CMD_ACK,TIMEOUT)
-	return response,nil
-end
-
--------------------------------------------------------
--- This will be moved to a separate 14443B library
--------------------------------------------------------
-
-local reader14443B = {
-	read = reader14443B.read14443b()
-}	
--------------------------------------------------------
--- This will be moved to a separate 1593 library
--------------------------------------------------------
-
-local function errorString15693(number)
-	local errors = {}
-	errors[0x01] =  "The command is not supported"
-	errors[0x02] =  "The command is not recognised"
-	errors[0x03] =  "The option is not supported."
-	errors[0x0f] =  "Unknown error."
-	errors[0x10] =  "The specified block is not available (doesn’t exist)."
-	errors[0x11] =  "The specified block is already -locked and thus cannot be locked again"
-	errors[0x12] =  "The specified block is locked and its content cannot be changed."
-	errors[0x13] =  "The specified block was not successfully programmed."
-	errors[0x14] =  "The specified block was not successfully locked."
-	
-	return errors[number] or "Reserved for Future Use or Custom command error." 
-end
--------------------------------------------------------
--- This will be moved to a separate 1593 library
--------------------------------------------------------
-
-local function parse15693(data)
-	-- From common/iso15693tools.h : 
-	--[[ 
-	#define ISO15_CRC_CHECK	 ((uint16_t)(~0xF0B8 & 0xFFFF)) 	// use this for checking of a correct crc
-	--]]
-	-- But that is very strange. Basically what is says is:
-	-- define ISO15_CRC_CHECK 0F47
-	-- So we can just use that directly... 
-	-- The following code is based on cmdhf15.c around line 666 (NoTB!) and onwards
-	if core.iso15693_crc(data, string.len(data)) ~= 0xF47 then
-		return nil, "CRC failed"
-	elseif data[1] % 2 == 1 then
-		-- Above is a poor-mans bit check:
-		-- recv[0] & ISO15_RES_ERROR //(0x01)
-		local err = "Tag returned error %i: %s"
-		err = string.format(err, data[1],errorString15693(data[1]))
-		return nil, err
-	end
-	-- Finally, let the parsing begin... 
-	-- the UID is just the data in reverse... almost:
-	-- 	0FC481FF70000104E001001B0301
-	--	   8877665544332211
-	--  UID = E004010070FF81C4
-	--        1122334455667788
-	-- So, cut out the relevant part and reverse it
-	local uid = data:sub(2,9):reverse()
-	local uidStr = bin.unpack("H8", uid)
-
-	local _,manufacturer_code = bin.unpack("s",uid:sub(2,2))
-	local _,tag_size = bin.unpack(">I",data:sub(12,13))
-	local _,micref_modelcode = bin.unpack("s",data:sub(14,14))
-
-	return {
-		uid = uidStr,
-		manufacturer_code = manufacturer_code,
-		tag_size = tag_size,
-		micref_modelcode = micref_modelcode,
-	}
-end
--------------------------------------------------------
--- This will be moved to a separate 1593 library
--------------------------------------------------------
-
-local function read15693()
-	--[[
-
-	We start by trying this command:
-	 
-		proxmark3> hf 15 cmd sysinfo -2 u
-		0F C4 81 FF 70 00 01 04 E0 01 00 1B 03 01
-		UID = E004010070FF81C4
-		Philips; IC SL2 ICS20
-		DSFID supported, set to 01
-		AFI supported, set to 000
-		Tag provides info on memory layout (vendor dependent)
-		 4 (or 3) bytes/page x 28 pages
-		IC reference given: 01
-	 
-	This command is not always present in ISO15693 tags (it is an optional standard command) but if it is present usually the tags contain all the "colored" info above.
-	 
-	If the above command doesn't give an answer (see example below):
-	 
-		proxmark3> hf 15 cmd sysinfo -2 u
-		timeout: no
-		 
-	we must send the MANDATORY (present in ALL iso15693 tags) command (the example below is sent to a tag different from the above one):
-	 
-		proxmark3> hf 15 cmd inquiry
-		UID=E007C1A257394244         
-		Tag Info: Texas Instrument; Tag-it HF-I Standard; 8x32bit         
-		proxmark3>
-	 
-	From which we obtain less information than the above one.
-	--]]
-
-	local command, result, info, err, data
-	local data = "02"
-	local datalen = string.len(data) / 2
-	local speed = 1
-	local recv = 1
-	command = Command:new{cmd = cmds.CMD_ISO_15693_COMMAND, 
-								arg1 = datalen,arg2 = speed,arg3 =recv, data=data}
-	-- These are defined in common/iso15693tools.h
-
-	-- #define ISO15_REQ_SUBCARRIER_SINGLE	0x00	// Tag should respond using one subcarrier (ASK)
-	-- #define ISO15_REQ_DATARATE_HIGH		0x02	// Tag should respond using high data rate
-	-- #define ISO15_REQ_NONINVENTORY		0x00
-
-	local result,err = sendToDevice(command)
-
-	if not result then
-		print(err)
-		return nil, "15693 sysinfo: no answer"
-	end
-
-	local count,cmd,recvlen,arg1,arg2 = bin.unpack('LLLL',result)
-	data = string.sub(result,recvlen)
-	info, err = parse15693(data)
-	
-	if err then 
-		return nil, err
-	end
-
-	return info
-end
-
-local reader15693 = {
-	read = read15693
-}
-
+local reader15693 = require('read15')
 
 ---
 -- This method library can be set waits or a 13.56 MHz tag, and when one is found, returns info about
diff --git a/client/lualibs/read14a.lua b/client/lualibs/read14a.lua
index 877a16413..9e53cacca 100644
--- a/client/lualibs/read14a.lua
+++ b/client/lualibs/read14a.lua
@@ -141,7 +141,6 @@ local function waitFor14443a()
 end
 local library = {
 	read = read14443a,
-	read 	= read14443a,
 	waitFor14443a = waitFor14443a,
 	parse14443a = parse14443a,
 	sendToDevice = sendToDevice,
diff --git a/client/lualibs/read14b.lua b/client/lualibs/read14b.lua
index 9d287266a..b92fb0b3b 100644
--- a/client/lualibs/read14b.lua
+++ b/client/lualibs/read14b.lua
@@ -41,7 +41,7 @@ local function parse1443b(data)
 	--]]
 	
 	local count, uid, uidlen, atqb, chipid, cid = bin.unpack('H10CH7CC',data)
-	uid = uid:sub(1,2*uidlen)
+	uid = uid:sub(1, 2*uidlen)
 	return { uid = uid, uidlen = uidlen, atqb = atqb, chipid = chipid, cid = cid }
 end
 
@@ -96,7 +96,7 @@ local function read14443b(disconnect)
 	end
 
 	command = Command:new{cmd = cmds.CMD_ISO_14443B_COMMAND, arg1 = flags}
-	local result,err = sendToDevice(command, false) 
+	local result, err = sendToDevice(command, false) 
 	if result then
 		local count,cmd,arg0,arg1,arg2 = bin.unpack('LLLL',result)
 		if arg0 == 0 then 
@@ -147,9 +147,9 @@ local function waitFor14443b()
 end
 
 local library = {
-	parse1443b  = parse1443b,
-	read1443b 	= read14443b,
+	read = read14443b,
 	waitFor14443b = waitFor14443b,
+	parse1443b  = parse1443b,
 	sendToDevice = sendToDevice,
 	showData = showData,
 	ISO14B_COMMAND = ISO14B_COMMAND,
diff --git a/client/lualibs/read15.lua b/client/lualibs/read15.lua
index b337d22d7..e8967729c 100644
--- a/client/lualibs/read15.lua
+++ b/client/lualibs/read15.lua
@@ -12,6 +12,7 @@
 --]]
 -- Loads the commands-library
 local cmds = require('commands')
+local utils = require('utils')
 local TIMEOUT = 2000 -- Shouldn't take longer than 2 seconds
 
 
@@ -34,15 +35,118 @@ local function sendToDevice(command, ignoreresponse)
 	return response,nil
 end
 
+local function errorString15693(number)
+	local errors = {}
+	errors[0x01] =  "The command is not supported"
+	errors[0x02] =  "The command is not recognised"
+	errors[0x03] =  "The option is not supported."
+	errors[0x0f] =  "Unknown error."
+	errors[0x10] =  "The specified block is not available (doesn’t exist)."
+	errors[0x11] =  "The specified block is already -locked and thus cannot be locked again"
+	errors[0x12] =  "The specified block is locked and its content cannot be changed."
+	errors[0x13] =  "The specified block was not successfully programmed."
+	errors[0x14] =  "The specified block was not successfully locked."
+	
+	return errors[number] or "Reserved for Future Use or Custom command error." 
+end
+
+
+local function parse15693(data)
+	-- From common/iso15693tools.h : 
+	--[[ 
+	#define ISO15_CRC_CHECK	 ((uint16_t)(~0xF0B8 & 0xFFFF)) 	// use this for checking of a correct crc
+	--]]
+	-- But that is very strange. Basically what is says is:
+	-- define ISO15_CRC_CHECK 0F47
+	-- So we can just use that directly... 
+	-- The following code is based on cmdhf15.c around line 666 (NoTB!) and onwards
+	if core.iso15693_crc(data, string.len(data)) ~= 0xF47 then
+		return nil, "CRC failed"
+	elseif data[1] % 2 == 1 then
+		-- Above is a poor-mans bit check:
+		-- recv[0] & ISO15_RES_ERROR //(0x01)
+		local err = "Tag returned error %i: %s"
+		err = string.format(err, data[1], errorString15693(data[1]))
+		return nil, err
+	end
+	-- Finally, let the parsing begin... 
+	-- the UID is just the data in reverse... almost:
+	-- 	0FC481FF70000104E001001B0301
+	--	  8877665544332211
+	--  UID = E004010070FF81C4
+	--        1122334455667788
+	-- So, cut out the relevant part and reverse it
+	-- byte wise reverse.. not string reverse..
+	local uid = data:sub(2,9):reverse()
+	local uidStr = bin.unpack("H8", uid)
+
+	local _, manufacturer_code = bin.unpack("s", uid:sub(2,2))
+	local _, tag_size = bin.unpack(">I", data:sub(12,13))
+	local _, micref_modelcode = bin.unpack("s", data:sub(14,14))
+
+	return {
+		uid = uidStr,
+		manufacturer_code = manufacturer_code,
+		tag_size = tag_size,
+		micref_modelcode = micref_modelcode,
+	}
+end
+
 -- This function does a connect and retrieves som einfo
 -- @param dont_disconnect - if true, does not disable the field
 -- @return if successfull: an table containing card info
 -- @return if unsuccessfull : nil, error
 local function read15693(slow, dont_readresponse)
+
+--[[
+
+	We start by trying this command:
+	 
+		proxmark3> hf 15 cmd sysinfo -2 u
+		0F C4 81 FF 70 00 01 04 E0 01 00 1B 03 01
+		UID = E004010070FF81C4
+		Philips; IC SL2 ICS20
+		DSFID supported, set to 01
+		AFI supported, set to 000
+		Tag provides info on memory layout (vendor dependent)
+		 4 (or 3) bytes/page x 28 pages
+		IC reference given: 01
+	 
+	This command is not always present in ISO15693 tags (it is an optional standard command) but if it is present usually the tags contain all the "colored" info above.
+	 
+	If the above command doesn't give an answer (see example below):
+	 
+		proxmark3> hf 15 cmd sysinfo -2 u
+		timeout: no
+		 
+	we must send the MANDATORY (present in ALL iso15693 tags) command (the example below is sent to a tag different from the above one):
+	 
+		proxmark3> hf 15 cmd inquiry
+		UID=E007C1A257394244         
+		Tag Info: Texas Instrument; Tag-it HF-I Standard; 8x32bit         
+		proxmark3>
+	 
+	From which we obtain less information than the above one.
+	--]]
+
 	local command, result, info, err, data
 
-	command = Command:new{cmd = cmds.CMD_ISO_15693_COMMAND, arg1 = 0, arg2 = 1, arg3 = 1 }
+	data = "260100"
+	--add crc
+	local payload = utils.Crc15(data)
+	
+	command = Command:new{cmd = cmds.CMD_ISO_15693_COMMAND, 
+								arg1 = string.len(payload) / 2,
+								arg2 = 1,
+								arg3 = 1,
+								data = payload}
 
+															
+	-- These are defined in common/iso15693tools.h
+	-- #define ISO15_REQ_SUBCARRIER_SINGLE	0x00	// Tag should respond using one subcarrier (ASK)
+	-- #define ISO15_REQ_DATARATE_HIGH		0x02	// Tag should respond using high data rate
+	-- #define ISO15_REQ_NONINVENTORY		0x00
+	
 	if slow then
 		command.arg2 = 0
 	end
@@ -51,23 +155,21 @@ local function read15693(slow, dont_readresponse)
 	end
 	
 	local result, err = sendToDevice(command, dont_readresponse)
-	if result then
-		local count,cmd,arg0,arg1,arg2 = bin.unpack('LLLL',result)
-		if arg0 == 0 then
-			return nil, "iso15693 no bytes returned"
-		end	
-		data = string.sub(result, count)
-		info, err = bin.unpack('H', data)
-		print("LEN", arg0, data )
-	else
-		err = "No response from card"
+	if not result then
+		print(err)
+		return nil, "15693 sysinfo: no answer"
 	end
 
-	if err then
-		print(err)
+	local count, cmd, recvlen, arg1, arg2 = bin.unpack('LLLL',result)
+	data = string.sub(result, recvlen)
+	info, err = parse15693(data)
+	
+	if err then 
+		print(err)	
 		return nil, err
 	end
-	return info
+
+	return info	
 end
 
 ---
@@ -86,7 +188,7 @@ end
 local library = {
 	read = read15693,
 	waitFor15693 = waitFor15693,
---	parse15693 = parse15693,
+	parse15693 = parse15693,
 	sendToDevice = sendToDevice,
 }
 
diff --git a/client/lualibs/utils.lua b/client/lualibs/utils.lua
index ef6060533..aefd68b4d 100644
--- a/client/lualibs/utils.lua
+++ b/client/lualibs/utils.lua
@@ -109,7 +109,19 @@ local Utils =
 		end
 		return nil		
 	end,
-	
+	----ISO15693 CRC
+	Crc15 = function(s)
+		if s == nil then return nil end
+		if #s == 0 then return nil end
+		if  type(s) == 'string' then
+			local utils = require('utils')
+			return utils.ConvertAsciiToHex(
+							core.iso15693_crc(s)
+							)
+		end
+		return nil		
+	end,
+		
 	------------ CRC-8 Legic checksums
 	-- Takes a hex string and calculates a crc8
 	Crc8Legic = function(s)

From 8bef04f94b2b3392dab1b28d797f553e3a488d11 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 30 Nov 2018 09:03:55 +0100
Subject: [PATCH 0280/1938] ADD: Support TCP ports for proxmark  (@phcoder)

On ChromeOS Linux apps can't access serial port but they can connect to TCP,
so I wrote a simple app to forward TCP to serial. I suppose this can have other uses as well.
see: https://github.com/Proxmark/proxmark3/pull/720/commits/538d10d6511d52ec13ace117dcbe49dfeb3287fd
---
 CHANGELOG.md      |  1 +
 uart/uart_posix.c | 64 +++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 63 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e342ace0c..296fd14e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [unreleased][unreleased]
+ - Added TCP ports support (on linux) (@phcoder)
  - Added HF sniff standalone mode with optional storing of ULC/NTAG/ULEV1 authentication attempts (@bogiton)
  - Fix 'Lining up plot and control window' (@anticat)
  - Fix 'annoying focus behaviour' on OSX  (@Anticat)
diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index b587d6546..26e814a3a 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -2,6 +2,7 @@
  * Generic uart / rs232/ serial port library
  *
  * Copyright (c) 2013, Roel Verdult
+ * Copyright (c) 2018 Google
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,6 +37,7 @@
 
 // Test if we are dealing with posix operating systems
 #ifndef _WIN32	 
+#define _DEFAULT_SOURCE
 
 #include <termios.h>
 #include <sys/ioctl.h>
@@ -46,7 +48,12 @@
 #include <limits.h>
 #include <sys/time.h>
 #include <errno.h>
-
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+#include <arpa/inet.h>
+#include <netdb.h>
 
 typedef struct termios term_info;
 typedef struct {
@@ -58,13 +65,66 @@ typedef struct {
 // Set time-out on 30 miliseconds
 const struct timeval timeout = {
   .tv_sec  =     0, // 0 second
-  .tv_usec = 30000  // 30000 micro seconds
+  .tv_usec = 300000  // 300 000 micro seconds
 };
 
 serial_port uart_open(const char* pcPortName)
 {
   serial_port_unix* sp = malloc(sizeof(serial_port_unix));
   if (sp == 0) return INVALID_SERIAL_PORT;
+
+  if (memcmp(pcPortName, "tcp:", 4) == 0) {
+    struct addrinfo *addr, *rp;
+    char *addrstr = strdup(pcPortName + 4);
+
+    if (addrstr == NULL) {
+      printf("Error: strdup\n");
+      return INVALID_SERIAL_PORT;
+    }
+
+    char *colon = strrchr(addrstr, ':');
+    char *portstr;
+    if (colon) {
+      portstr = colon + 1;
+      *colon = '\0';
+    } else {
+      portstr = "7901";
+	}
+	
+	int s = getaddrinfo(addrstr, portstr, NULL, &addr);
+    if (s != 0) {
+      printf("Error: getaddrinfo: %s\n", gai_strerror(s));
+      return INVALID_SERIAL_PORT;
+    }
+
+    int sfd;
+    for (rp = addr; rp != NULL; rp = rp->ai_next) {
+      sfd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
+
+      if (sfd == -1)
+		continue;
+	
+      if (connect(sfd, rp->ai_addr, rp->ai_addrlen) != -1)
+		break;
+	
+      close(sfd);
+    }
+	
+    if (rp == NULL) {               /* No address succeeded */
+      printf("Error: Could not connect\n");
+      return INVALID_SERIAL_PORT;
+    }
+	
+    freeaddrinfo(addr);
+    free(addrstr);
+	
+    sp->fd = sfd;
+
+    int one = 1;
+    setsockopt(sp->fd, SOL_TCP, TCP_NODELAY, &one, sizeof(one));
+    return sp;
+  }
+
   
   sp->fd = open(pcPortName, O_RDWR | O_NOCTTY | O_NDELAY | O_NONBLOCK);
   if(sp->fd == -1) {

From c5c75d494b8691b873a59b3c74fe1158fae8c3f5 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 30 Nov 2018 09:13:09 +0100
Subject: [PATCH 0281/1938] chg.. moved into defined

---
 uart/uart_posix.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index 26e814a3a..0ead61500 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -33,12 +33,12 @@
  * proxmark3 project.
  */
 
-#include "uart.h"
-
 // Test if we are dealing with posix operating systems
 #ifndef _WIN32	 
 #define _DEFAULT_SOURCE
 
+#include "uart.h"
+
 #include <termios.h>
 #include <sys/ioctl.h>
 #include <unistd.h>

From 9f77f2741f4ab88d10558a04963022482cbc7359 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Fri, 30 Nov 2018 14:16:34 +0200
Subject: [PATCH 0282/1938] added trailer decoding

---
 client/cmdhfmf.c | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 1e43ff81e..48a235ffd 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -545,14 +545,25 @@ int CmdHF14AMfRdBl(const char *Cmd) {
 		uint8_t isOK  = resp.arg[0] & 0xff;
 		uint8_t *data = resp.d.asBytes;
 
-		if (isOK)
+		if (isOK) {
 			PrintAndLogEx(NORMAL, "isOk:%02x data:%s", isOK, sprint_hex(data, 16));
-		else
+		} else {
 			PrintAndLogEx(NORMAL, "isOk:%02x", isOK);
+			return 1;
+		}
+
+		if (mfIsSectorTrailer(blockNo) && (data[6] || data[7] || data[8])) {
+			PrintAndLogEx(NORMAL, "Trailer decoded:");
+			for (int i = 0; i < 4; i++) {
+				PrintAndLogEx(NORMAL, "Access block %d: %s", i + mfFirstBlockOfSector(mfSectorNum(blockNo)), mfGetAccessConditionsDesc(i, &data[6]));
+			}
+			PrintAndLogEx(NORMAL, "UserData: %s", sprint_hex_inrow(&data[9], 1));
+		}
 	} else {
 		PrintAndLogEx(WARNING, "Command execute timeout");
+		return 2;
 	}
-
+	
   return 0;
 }
 
@@ -2759,6 +2770,17 @@ int CmdHF14AMfCGetBlk(const char *Cmd) {
 	}
 	
 	PrintAndLogEx(NORMAL, "data: %s", sprint_hex(data, sizeof(data)));
+	
+	if (mfIsSectorTrailer(blockNo)) {
+		PrintAndLogEx(NORMAL, "Trailer decoded:");
+		PrintAndLogEx(NORMAL, "Key A: %s", sprint_hex_inrow(data, 6));
+		PrintAndLogEx(NORMAL, "Key B: %s", sprint_hex_inrow(&data[10], 6));
+		for (int i = 0; i < 4; i++) {
+			PrintAndLogEx(NORMAL, "Access block %d: %s", i + mfFirstBlockOfSector(mfSectorNum(blockNo)), mfGetAccessConditionsDesc(i, &data[6]));
+		}
+		PrintAndLogEx(NORMAL, "UserData: %s", sprint_hex_inrow(&data[9], 1));
+	}
+		
 	return 0;
 }
 

From a10bf3ac05383adea99d6bd59b889a8ad7f7c6f4 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Fri, 30 Nov 2018 14:17:46 +0200
Subject: [PATCH 0283/1938] added changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 296fd14e3..64377c383 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -87,6 +87,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
  - Added `hf emv scan` - save card's data to json file (@merlokk)
  - Added `hf emv` `gpo`, `readrec`, `genac`, `challenge`, `intauth` - separate commands from `hf emc exec` (@merlokk)
  - Added  `hf fido` `assert` and `make` commands from fido2 protocol (authenticatorMakeCredential and authenticatorGetAssertion) (@merlokk)
+ - Added trailer block decoding to `hf mf rdbl` and `hf mf cgetbl` (@merlokk)
  
 ### Fixed
 - Changed driver file proxmark3.inf to support both old and new Product/Vendor IDs (piwi)

From 2d932e49ac62d483a97a868d51f1b160c5708c7b Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Fri, 30 Nov 2018 20:28:34 +0200
Subject: [PATCH 0284/1938] https://github.com/Proxmark/proxmark3/pull/725

---
 client/cmdhffido.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index 273982bed..9ce554ce2 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -456,7 +456,7 @@ int CmdHFFidoAuthenticate(const char *cmd) {
 
 	// public key
 	CLIGetHexWithReturn(8, hdata, &hdatalen);
-	if (hdatalen && hdatalen != 130) {
+	if (hdatalen && hdatalen != 65) {
 		PrintAndLog("ERROR: public key length must be 65 bytes only.");
 		return 1;
 	}

From 7c8377839ebf06f9951eff976930b6ff37ddcf6f Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Fri, 30 Nov 2018 20:33:46 +0200
Subject: [PATCH 0285/1938] 4k fix

---
 client/cmdhfmf.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 48a235ffd..8653a8994 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -554,8 +554,11 @@ int CmdHF14AMfRdBl(const char *Cmd) {
 
 		if (mfIsSectorTrailer(blockNo) && (data[6] || data[7] || data[8])) {
 			PrintAndLogEx(NORMAL, "Trailer decoded:");
+			int bln = mfFirstBlockOfSector(mfSectorNum(blockNo));
+			int blinc = (mfNumBlocksPerSector(mfSectorNum(blockNo)) > 4) ? 5 : 1;
 			for (int i = 0; i < 4; i++) {
-				PrintAndLogEx(NORMAL, "Access block %d: %s", i + mfFirstBlockOfSector(mfSectorNum(blockNo)), mfGetAccessConditionsDesc(i, &data[6]));
+				PrintAndLogEx(NORMAL, "Access block %d%s: %s", bln, ((blinc > 1) && (i < 3) ? "+" : "") , mfGetAccessConditionsDesc(i, &data[6]));
+				bln += blinc;
 			}
 			PrintAndLogEx(NORMAL, "UserData: %s", sprint_hex_inrow(&data[9], 1));
 		}
@@ -2775,8 +2778,11 @@ int CmdHF14AMfCGetBlk(const char *Cmd) {
 		PrintAndLogEx(NORMAL, "Trailer decoded:");
 		PrintAndLogEx(NORMAL, "Key A: %s", sprint_hex_inrow(data, 6));
 		PrintAndLogEx(NORMAL, "Key B: %s", sprint_hex_inrow(&data[10], 6));
+		int bln = mfFirstBlockOfSector(mfSectorNum(blockNo));
+		int blinc = (mfNumBlocksPerSector(mfSectorNum(blockNo)) > 4) ? 5 : 1;
 		for (int i = 0; i < 4; i++) {
-			PrintAndLogEx(NORMAL, "Access block %d: %s", i + mfFirstBlockOfSector(mfSectorNum(blockNo)), mfGetAccessConditionsDesc(i, &data[6]));
+			PrintAndLogEx(NORMAL, "Access block %d%s: %s", bln, ((blinc > 1) && (i < 3) ? "+" : "") , mfGetAccessConditionsDesc(i, &data[6]));
+			bln += blinc;
 		}
 		PrintAndLogEx(NORMAL, "UserData: %s", sprint_hex_inrow(&data[9], 1));
 	}

From 0372cb8a0448fd2713a400c284bba67918055394 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 30 Nov 2018 20:58:47 +0100
Subject: [PATCH 0286/1938] chg:  iso15693 lua lib works.

---
 client/lualibs/read15.lua | 136 +++++++++++++++-----------------------
 client/lualibs/utils.lua  |  16 +++--
 2 files changed, 65 insertions(+), 87 deletions(-)

diff --git a/client/lualibs/read15.lua b/client/lualibs/read15.lua
index e8967729c..5681fe367 100644
--- a/client/lualibs/read15.lua
+++ b/client/lualibs/read15.lua
@@ -2,12 +2,12 @@
 	This is a library to read 15693 tags. It can be used something like this
 
 	local reader = require('read15')
-	result, err = reader.read15693()
-	if not result then
+	local info, err = reader.read()
+	if not info then
 		print(err)
 		return
 	end
-	print(result.name)
+	print(info.UID)
 
 --]]
 -- Loads the commands-library
@@ -29,10 +29,10 @@ local function sendToDevice(command, ignoreresponse)
 		print(err)
 		return nil, err
 	end
-	if ignoreresponse then return nil,nil end
+	if ignoreresponse then return nil, nil end
 
 	local response = core.WaitForResponseTimeout(cmds.CMD_ACK, TIMEOUT)
-	return response,nil
+	return response, nil
 end
 
 local function errorString15693(number)
@@ -52,47 +52,31 @@ end
 
 
 local function parse15693(data)
-	-- From common/iso15693tools.h : 
-	--[[ 
-	#define ISO15_CRC_CHECK	 ((uint16_t)(~0xF0B8 & 0xFFFF)) 	// use this for checking of a correct crc
-	--]]
-	-- But that is very strange. Basically what is says is:
+	local bytes = utils.ConvertAsciiToBytes(data)
+	local tmp = utils.ConvertAsciiToHex(data)
+	
 	-- define ISO15_CRC_CHECK 0F47
-	-- So we can just use that directly... 
-	-- The following code is based on cmdhf15.c around line 666 (NoTB!) and onwards
-	if core.iso15693_crc(data, string.len(data)) ~= 0xF47 then
+	local crcStr = utils.Crc15(tmp, #tmp)
+
+	if string.sub(crcStr, #crcStr - 3) ~= '470F' then
+		print("CRC", crc )
 		return nil, "CRC failed"
-	elseif data[1] % 2 == 1 then
+	end
+
+	if bytes[1] % 2 == 1 then
 		-- Above is a poor-mans bit check:
 		-- recv[0] & ISO15_RES_ERROR //(0x01)
 		local err = "Tag returned error %i: %s"
-		err = string.format(err, data[1], errorString15693(data[1]))
+		err = string.format(err, bytes[1], errorString15693(bytes[1]))
 		return nil, err
 	end
-	-- Finally, let the parsing begin... 
-	-- the UID is just the data in reverse... almost:
-	-- 	0FC481FF70000104E001001B0301
-	--	  8877665544332211
-	--  UID = E004010070FF81C4
-	--        1122334455667788
-	-- So, cut out the relevant part and reverse it
-	-- byte wise reverse.. not string reverse..
-	local uid = data:sub(2,9):reverse()
-	local uidStr = bin.unpack("H8", uid)
-
-	local _, manufacturer_code = bin.unpack("s", uid:sub(2,2))
-	local _, tag_size = bin.unpack(">I", data:sub(12,13))
-	local _, micref_modelcode = bin.unpack("s", data:sub(14,14))
-
-	return {
-		uid = uidStr,
-		manufacturer_code = manufacturer_code,
-		tag_size = tag_size,
-		micref_modelcode = micref_modelcode,
+	local uid = utils.ConvertBytesToHex( bytes, true )
+	uid = uid:sub(5, #uid-4)
+	return { uid = uid, }micref_modelcode = micref_modelcode,
 	}
 end
 
--- This function does a connect and retrieves som einfo
+-- This function does a connect and retrieves som info
 -- @param dont_disconnect - if true, does not disable the field
 -- @return if successfull: an table containing card info
 -- @return if unsuccessfull : nil, error
@@ -100,53 +84,37 @@ local function read15693(slow, dont_readresponse)
 
 --[[
 
-	We start by trying this command:
+	We start by trying this command:		 
+	MANDATORY (present in ALL iso15693 tags) command (the example below is sent to a tag different from the above one):
 	 
-		proxmark3> hf 15 cmd sysinfo -2 u
-		0F C4 81 FF 70 00 01 04 E0 01 00 1B 03 01
-		UID = E004010070FF81C4
-		Philips; IC SL2 ICS20
-		DSFID supported, set to 01
-		AFI supported, set to 000
-		Tag provides info on memory layout (vendor dependent)
-		 4 (or 3) bytes/page x 28 pages
-		IC reference given: 01
-	 
-	This command is not always present in ISO15693 tags (it is an optional standard command) but if it is present usually the tags contain all the "colored" info above.
-	 
-	If the above command doesn't give an answer (see example below):
-	 
-		proxmark3> hf 15 cmd sysinfo -2 u
-		timeout: no
-		 
-	we must send the MANDATORY (present in ALL iso15693 tags) command (the example below is sent to a tag different from the above one):
-	 
-		proxmark3> hf 15 cmd inquiry
+		pm3> hf 15 info u
 		UID=E007C1A257394244         
 		Tag Info: Texas Instrument; Tag-it HF-I Standard; 8x32bit         
-		proxmark3>
+		pm3>
 	 
-	From which we obtain less information than the above one.
+	From which we obtain less information than the above one.	
+	
+	"260100" means  
+	0x26
+	-- #define ISO15_REQ_SUBCARRIER_SINGLE	0x00	// Tag should respond using one subcarrier (ASK)
+	-- #define ISO15_REQ_DATARATE_HIGH		0x02	// Tag should respond using high data rate
+	-- #define ISO15_REQ_NONINVENTORY		0x00
+	0x01  
+		inventory
+	0x00
+	
 	--]]
 
 	local command, result, info, err, data
 
-	data = "260100"
-	--add crc
-	local payload = utils.Crc15(data)
-	
+	data = utils.Crc15("260100")
+
 	command = Command:new{cmd = cmds.CMD_ISO_15693_COMMAND, 
-								arg1 = string.len(payload) / 2,
+								arg1 = #data / 2,
 								arg2 = 1,
 								arg3 = 1,
-								data = payload}
-
-															
-	-- These are defined in common/iso15693tools.h
-	-- #define ISO15_REQ_SUBCARRIER_SINGLE	0x00	// Tag should respond using one subcarrier (ASK)
-	-- #define ISO15_REQ_DATARATE_HIGH		0x02	// Tag should respond using high data rate
-	-- #define ISO15_REQ_NONINVENTORY		0x00
-	
+								data = data}
+														
 	if slow then
 		command.arg2 = 0
 	end
@@ -157,23 +125,25 @@ local function read15693(slow, dont_readresponse)
 	local result, err = sendToDevice(command, dont_readresponse)
 	if not result then
 		print(err)
-		return nil, "15693 sysinfo: no answer"
+		return nil, "15693 identify: no answer"
 	end
-
-	local count, cmd, recvlen, arg1, arg2 = bin.unpack('LLLL',result)
-	data = string.sub(result, recvlen)
-	info, err = parse15693(data)
 	
-	if err then 
-		print(err)	
-		return nil, err
+	local count, cmd, len, arg2, arg3 = bin.unpack('LLLL', result)
+	if  len > 0 then
+		data = string.sub(result, count, count+len-1)
+		info, err = parse15693(data)
+		if err then 
+			print(err)	
+			return nil, err
+		end
+		return info
+	else
+		return nil, "Failed to get response"
 	end
-
-	return info	
 end
 
 ---
--- Waits for a mifare card to be placed within the vicinity of the reader.
+-- Waits for a ISO15693 card to be placed within the vicinity of the reader.
 -- @return if successfull: an table containing card info
 -- @return if unsuccessfull : nil, error
 local function waitFor15693()
diff --git a/client/lualibs/utils.lua b/client/lualibs/utils.lua
index aefd68b4d..ca49c21e9 100644
--- a/client/lualibs/utils.lua
+++ b/client/lualibs/utils.lua
@@ -257,15 +257,23 @@ local Utils =
 	end,
 	---
 	-- Convert Byte array to string of hex
-	ConvertBytesToHex = function(bytes)
+	ConvertBytesToHex = function(bytes, reverse)
 		if bytes == nil then return '' end
 		if #bytes == 0 then return '' end
 		local s={}
-		for i = 1, #bytes do
-			s[i] = string.format("%02X",bytes[i]) 
+		if reverse then
+			local j=1
+			for i = #bytes, 1, -1 do
+				s[i] = string.format("%02X", bytes[j]) 
+				j = j + 1
+			end
+		else
+			for i = 1, #bytes do
+				s[i] = string.format("%02X", bytes[i]) 
+			end
 		end
 		return table.concat(s)
-	end,	
+	end,		
 	-- Convert byte array to string with ascii
     ConvertBytesToAscii = function(bytes)
 		if bytes == nil then return '' end

From 2eee1663df84a6011467864be8bd55a2ddb27467 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 30 Nov 2018 21:04:32 +0100
Subject: [PATCH 0287/1938] chg: iso15693 small fix...

---
 client/lualibs/read15.lua | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/client/lualibs/read15.lua b/client/lualibs/read15.lua
index 5681fe367..b0089b769 100644
--- a/client/lualibs/read15.lua
+++ b/client/lualibs/read15.lua
@@ -72,8 +72,7 @@ local function parse15693(data)
 	end
 	local uid = utils.ConvertBytesToHex( bytes, true )
 	uid = uid:sub(5, #uid-4)
-	return { uid = uid, }micref_modelcode = micref_modelcode,
-	}
+	return { uid = uid, }
 end
 
 -- This function does a connect and retrieves som info

From 259dbadbe904bd1de45932a167509dba33cff6f2 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 2 Dec 2018 10:05:31 +0100
Subject: [PATCH 0288/1938] chg:  output unified

---
 client/loclass/fileutils.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index c18b2fa30..367b19c97 100644
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -212,12 +212,12 @@ int saveFileJSON(const char *preferredName, const char *suffix, JSONFileType fty
 
 	int res = json_dump_file(root, fileName, JSON_INDENT(2));
 	if (res) {
-		PrintAndLog("ERROR: can't save the file: %s", fileName);
+		PrintAndLogDevice(FAILED, "error: can't save the file: %s", fileName);
 		json_decref(root);
 		retval = 200;
 		goto out;
 	}
-	PrintAndLog("File `%s` saved.", fileName);
+	PrintAndLogDevice(SUCCESS, "File `%s` saved.", fileName);
 	
 	json_decref(root);
 

From 47d954c79ff91cb0f9efa5d9f20400640636dd05 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Mon, 3 Dec 2018 18:16:25 +0200
Subject: [PATCH 0289/1938] move emv commands to root

---
 client/cmdhf.c      |  1 -
 client/cmdhf.h      |  1 -
 client/cmdmain.c    |  1 +
 client/cmdmain.h    |  1 +
 client/emv/cmdemv.c | 64 ++++++++++++++++++++++-----------------------
 client/emv/cmdemv.h | 16 ++++++------
 6 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/client/cmdhf.c b/client/cmdhf.c
index 65b6bd33d..cb4e424da 100644
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -112,7 +112,6 @@ static command_t CommandTable[] = {
 	{"14b",         CmdHF14B,         1, "{ ISO14443B RFIDs...               }"},
 	{"15",          CmdHF15,          1, "{ ISO15693 RFIDs...                }"},
 	{"epa",         CmdHFEPA,         1, "{ German Identification Card...    }"},
-	{"emv",         CmdHFEMV,         1, "{ EMV RFIDs...                     }"},
 	{"felica",      CmdHFFelica,      1, "{ ISO18092 / Felica RFIDs...       }"},
 	{"legic",       CmdHFLegic,       1, "{ LEGIC RFIDs...                   }"},
 	{"iclass",      CmdHFiClass,      1, "{ ICLASS RFIDs...                  }"},
diff --git a/client/cmdhf.h b/client/cmdhf.h
index bd191ead5..b2dcc10f1 100644
--- a/client/cmdhf.h
+++ b/client/cmdhf.h
@@ -30,7 +30,6 @@
 #include "cmdhfmfdes.h"		// DESFIRE
 #include "cmdhftopaz.h"		// TOPAZ
 #include "cmdhffelica.h"	// ISO18092 / FeliCa
-#include "emv/cmdemv.h"		// EMV				  
 #include "cmdhffido.h"		// FIDO authenticators
 #include "cmdtrace.h"		// trace list
 
diff --git a/client/cmdmain.c b/client/cmdmain.c
index 85d7f19c3..5b147e76a 100644
--- a/client/cmdmain.c
+++ b/client/cmdmain.c
@@ -22,6 +22,7 @@ static command_t CommandTable[] = {
 	{"hf",		CmdHF,		1, "{ High Frequency commands... }"},
 	{"hw",		CmdHW,		1, "{ Hardware commands... }"},
 	{"lf",		CmdLF,		1, "{ Low Frequency commands... }"},
+	{"emv",     CmdEMV,     1, "{ EMV iso14443 and iso7816... }"},
 	{"rem", 	CmdRem,		1, "{ Add text to row in log file }"},	
 	{"reveng",	CmdRev, 	1, "{ Crc calculations from the software reveng 1.53... }"},
 	{"script",	CmdScript,	1, "{ Scripting commands }"},
diff --git a/client/cmdmain.h b/client/cmdmain.h
index 74804300d..629cd98af 100644
--- a/client/cmdmain.h
+++ b/client/cmdmain.h
@@ -31,6 +31,7 @@
 #include "cmdscript.h"
 #include "cmdcrc.h"
 #include "cmdanalyse.h"
+#include "emv/cmdemv.h"		// EMV				  
 
 #ifdef WITH_FLASH
 #include "cmdflashmem.h"	// rdv40 flashmem commands
diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index 5a64892c4..fef34a863 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -40,7 +40,7 @@ void ParamLoadDefaults(struct tlvdb *tlvRoot) {
 	TLV_ADD(0x9F66, "\x26\x00\x00\x00"); // qVSDC
 }
 
-int CmdHFEMVSelect(const char *cmd) {
+int CmdEMVSelect(const char *cmd) {
 	uint8_t data[APDU_AID_LEN] = {0};
 	int datalen = 0;
 
@@ -86,7 +86,7 @@ int CmdHFEMVSelect(const char *cmd) {
 	return 0;
 }
 
-int CmdHFEMVSearch(const char *cmd) {
+int CmdEMVSearch(const char *cmd) {
 
 	CLIParserInit("hf emv search", 
 		"Tries to select all applets from applet list:\n", 
@@ -131,7 +131,7 @@ int CmdHFEMVSearch(const char *cmd) {
 	return 0;
 }
 
-int CmdHFEMVPPSE(const char *cmd) {
+int CmdEMVPPSE(const char *cmd) {
 	
 	CLIParserInit("hf emv pse", 
 		"Executes PSE/PPSE select command. It returns list of applet on the card:\n", 
@@ -181,7 +181,7 @@ int CmdHFEMVPPSE(const char *cmd) {
 	return 0;
 }
 
-int CmdHFEMVGPO(const char *cmd) {
+int CmdEMVGPO(const char *cmd) {
 	uint8_t data[APDU_RES_LEN] = {0};
 	int datalen = 0;
 
@@ -276,7 +276,7 @@ int CmdHFEMVGPO(const char *cmd) {
 	return 0;
 }
 
-int CmdHFEMVReadRecord(const char *cmd) {
+int CmdEMVReadRecord(const char *cmd) {
 	uint8_t data[APDU_RES_LEN] = {0};
 	int datalen = 0;
 
@@ -326,7 +326,7 @@ int CmdHFEMVReadRecord(const char *cmd) {
 	return 0;
 }
 
-int CmdHFEMVAC(const char *cmd) {
+int CmdEMVAC(const char *cmd) {
 	uint8_t data[APDU_RES_LEN] = {0};
 	int datalen = 0;
 
@@ -437,7 +437,7 @@ int CmdHFEMVAC(const char *cmd) {
 	return 0;	
 }
 
-int CmdHFEMVGenerateChallenge(const char *cmd) {
+int CmdEMVGenerateChallenge(const char *cmd) {
 
 	CLIParserInit("hf emv challenge", 
 		"Executes Generate Challenge command. It returns 4 or 8-byte random number from card.\nNeeds a EMV applet to be selected and GPO to be executed.", 
@@ -477,7 +477,7 @@ int CmdHFEMVGenerateChallenge(const char *cmd) {
 	return 0;
 }
 
-int CmdHFEMVInternalAuthenticate(const char *cmd) {
+int CmdEMVInternalAuthenticate(const char *cmd) {
 	uint8_t data[APDU_RES_LEN] = {0};
 	int datalen = 0;
 
@@ -631,7 +631,7 @@ void ProcessGPOResponseFormat1(struct tlvdb *tlvRoot, uint8_t *buf, size_t len,
 	}
 }
 
-int CmdHFEMVExec(const char *cmd) {
+int CmdEMVExec(const char *cmd) {
 	uint8_t buf[APDU_RES_LEN] = {0};
 	size_t len = 0;
 	uint16_t sw = 0;
@@ -1071,7 +1071,7 @@ int CmdHFEMVExec(const char *cmd) {
 	return 0;
 }
 
-int CmdHFEMVScan(const char *cmd) {
+int CmdEMVScan(const char *cmd) {
 	uint8_t AID[APDU_AID_LEN] = {0};
 	size_t AIDlen = 0;
 	uint8_t buf[APDU_RES_LEN] = {0};
@@ -1409,46 +1409,46 @@ int usage_emv_getrnd(void){
 }
 
 //retrieve the UN number from a terminal
-int CmdHfEMVGetrng(const char *Cmd) {
+int CmdEMVGetrng(const char *Cmd) {
 	char cmdp = param_getchar(Cmd, 0);
 	if ( cmdp == 'h' || cmdp == 'H') return usage_emv_getrnd();
 
 	return 0;
 }
 
-int CmdHfEMVList(const char *Cmd) {
+int CmdEMVList(const char *Cmd) {
 	return CmdTraceList("7816");
 }
 
-int CmdHFEMVTest(const char *cmd) {
+int CmdEMVTest(const char *cmd) {
 	return ExecuteCryptoTests(true);
 }
 
 static command_t CommandTable[] =  {
-	{"help",	CmdHelp,		1,	"This help"},
-	{"exec",	CmdHFEMVExec,	0,	"Executes EMV contactless transaction."},
-	{"pse",		CmdHFEMVPPSE,	0,	"Execute PPSE. It selects 2PAY.SYS.DDF01 or 1PAY.SYS.DDF01 directory."},
-	{"search",	CmdHFEMVSearch,	0,	"Try to select all applets from applets list and print installed applets."},
-	{"select",	CmdHFEMVSelect,	0,	"Select applet."},
-	{"gpo",			CmdHFEMVGPO,					0,	"Execute GetProcessingOptions."},
-	{"readrec",		CmdHFEMVReadRecord,				0,	"Read files from card."},
-	{"genac",		CmdHFEMVAC,						0,	"Generate ApplicationCryptogram."},
-	{"challenge",	CmdHFEMVGenerateChallenge,		0,	"Generate challenge."},
-	{"intauth",		CmdHFEMVInternalAuthenticate,	0,	"Internal authentication."},
-	{"scan",		CmdHFEMVScan,					0,	"Scan EMV card and save it contents to json file for emulator."},
-	{"test",	CmdHFEMVTest,	0,	"Crypto logic test."},
+	{"help",		CmdHelp,						1,	"This help"},
+	{"exec",		CmdEMVExec,						0,	"Executes EMV contactless transaction."},
+	{"pse",			CmdEMVPPSE,						0,	"Execute PPSE. It selects 2PAY.SYS.DDF01 or 1PAY.SYS.DDF01 directory."},
+	{"search",		CmdEMVSearch,					0,	"Try to select all applets from applets list and print installed applets."},
+	{"select",		CmdEMVSelect,					0,	"Select applet."},
+	{"gpo",			CmdEMVGPO,						0,	"Execute GetProcessingOptions."},
+	{"readrec",		CmdEMVReadRecord,				0,	"Read files from card."},
+	{"genac",		CmdEMVAC,						0,	"Generate ApplicationCryptogram."},
+	{"challenge",	CmdEMVGenerateChallenge,		0,	"Generate challenge."},
+	{"intauth",		CmdEMVInternalAuthenticate,		0,	"Internal authentication."},
+	{"scan",		CmdEMVScan,						0,	"Scan EMV card and save it contents to json file for emulator."},
+	{"test",		CmdEMVTest,						0,	"Crypto logic test."},
 	/*
-	{"getrng",		CmdHfEMVGetrng,	  0, "get random number from terminal"}, 
-	{"eload",		CmdHfEmvELoad, 	  0, "load EMV tag into device"},
-	{"dump",		CmdHfEmvDump,	  0, "dump EMV tag values"},
-	{"sim",			CmdHfEmvSim,	  0, "simulate EMV tag"},
-	{"clone",		CmdHfEmvClone,	  0, "clone an EMV tag"}, 
+	{"getrng",		CmdEMVGetrng,	  0, "get random number from terminal"}, 
+	{"eload",		CmdEmvELoad, 	  0, "load EMV tag into device"},
+	{"dump",		CmdEmvDump,	  0, "dump EMV tag values"},
+	{"sim",			CmdEmvSim,	  0, "simulate EMV tag"},
+	{"clone",		CmdEmvClone,	  0, "clone an EMV tag"}, 
 	*/
-	{"list",	CmdHfEMVList,	  0, "[Deprecated] List ISO7816 history"}, 
+	{"list",	CmdEMVList,	  0, "[Deprecated] List ISO7816 history"}, 
 	{NULL, NULL, 0, NULL}
 };
 
-int CmdHFEMV(const char *Cmd) {
+int CmdEMV(const char *Cmd) {
 	clearCommandBuffer();
 	CmdsParse(CommandTable, Cmd);
 	return 0;
diff --git a/client/emv/cmdemv.h b/client/emv/cmdemv.h
index 76fb89c4b..b4397fd15 100644
--- a/client/emv/cmdemv.h
+++ b/client/emv/cmdemv.h
@@ -26,13 +26,13 @@
 #include "emvcore.h"
 #include "apduinfo.h"
 
-int CmdHFEMV(const char *Cmd);
+int CmdEMV(const char *Cmd);
 
-extern int CmdHFEMVSelect(const char *cmd);
-extern int CmdHFEMVSearch(const char *cmd);
-extern int CmdHFEMVPPSE(const char *cmd);
-extern int CmdHFEMVExec(const char *cmd);
-extern int CmdHfEMVGetrng(const char *Cmd);
-extern int CmdHfEMVList(const char *Cmd);
+extern int CmdEMVSelect(const char *cmd);
+extern int CmdEMVSearch(const char *cmd);
+extern int CmdEMVPPSE(const char *cmd);
+extern int CmdEMVExec(const char *cmd);
+extern int CmdEMVGetrng(const char *Cmd);
+extern int CmdEMVList(const char *Cmd);
 
-#endif
\ No newline at end of file
+#endif

From 7fd3536b295cbd220fc478f8028bb85db1bb292a Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Mon, 3 Dec 2018 18:16:39 +0200
Subject: [PATCH 0290/1938] fix appveyor

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index a38ff647b..1ebbfea5c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -304,7 +304,7 @@ test_script:
 
     #proxmark crypto tests
 
-    ExecTest "hf emv test" "hf emv test" {bash -lc "cd ~/client;./proxmark3 comx -c 'hf emv test'"} "Tests ?OK"
+    ExecTest "emv test" "emv test" {bash -lc "cd ~/client;./proxmark3 comx -c 'emv test'"} "Tests ?OK"
 
 
     if ($global:TestsPassed) {

From e8671e6c18f270b9aa5c494827c85a338db0b489 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Mon, 3 Dec 2018 18:21:05 +0200
Subject: [PATCH 0291/1938] fix emv command's help

---
 client/emv/cmdemv.c | 64 ++++++++++++++++++++++-----------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index fef34a863..29f26b7a7 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -44,9 +44,9 @@ int CmdEMVSelect(const char *cmd) {
 	uint8_t data[APDU_AID_LEN] = {0};
 	int datalen = 0;
 
-	CLIParserInit("hf emv select", 
+	CLIParserInit("emv select", 
 		"Executes select applet command", 
-		"Usage:\n\thf emv select -s a00000000101 -> select card, select applet\n\thf emv select -st a00000000101 -> select card, select applet, show result in TLV\n");
+		"Usage:\n\temv select -s a00000000101 -> select card, select applet\n\temv select -st a00000000101 -> select card, select applet, show result in TLV\n");
 
 	void* argtable[] = {
 		arg_param_begin,
@@ -88,9 +88,9 @@ int CmdEMVSelect(const char *cmd) {
 
 int CmdEMVSearch(const char *cmd) {
 
-	CLIParserInit("hf emv search", 
+	CLIParserInit("emv search", 
 		"Tries to select all applets from applet list:\n", 
-		"Usage:\n\thf emv search -s -> select card and search\n\thf emv search -st -> select card, search and show result in TLV\n");
+		"Usage:\n\temv search -s -> select card and search\n\temv search -st -> select card, search and show result in TLV\n");
 
 	void* argtable[] = {
 		arg_param_begin,
@@ -133,9 +133,9 @@ int CmdEMVSearch(const char *cmd) {
 
 int CmdEMVPPSE(const char *cmd) {
 	
-	CLIParserInit("hf emv pse", 
+	CLIParserInit("emv pse", 
 		"Executes PSE/PPSE select command. It returns list of applet on the card:\n", 
-		"Usage:\n\thf emv pse -s1 -> select, get pse\n\thf emv pse -st2 -> select, get ppse, show result in TLV\n");
+		"Usage:\n\temv pse -s1 -> select, get pse\n\temv pse -st2 -> select, get ppse, show result in TLV\n");
 
 	void* argtable[] = {
 		arg_param_begin,
@@ -185,11 +185,11 @@ int CmdEMVGPO(const char *cmd) {
 	uint8_t data[APDU_RES_LEN] = {0};
 	int datalen = 0;
 
-	CLIParserInit("hf emv gpo", 
+	CLIParserInit("emv gpo", 
 		"Executes Get Processing Options command. It returns data in TLV format (0x77 - format2) or plain format (0x80 - format1).\nNeeds a EMV applet to be selected.", 
-		"Usage:\n\thf emv gpo -k -> execute GPO\n"
-			"\thf emv gpo -t 01020304 -> execute GPO with 4-byte PDOL data, show result in TLV\n"
-			"\thf emv gpo -pmt 9F 37 04 -> load params from file, make PDOL data from PDOL, execute GPO with PDOL, show result in TLV\n"); 
+		"Usage:\n\temv gpo -k -> execute GPO\n"
+			"\temv gpo -t 01020304 -> execute GPO with 4-byte PDOL data, show result in TLV\n"
+			"\temv gpo -pmt 9F 37 04 -> load params from file, make PDOL data from PDOL, execute GPO with PDOL, show result in TLV\n"); 
 
 	void* argtable[] = {
 		arg_param_begin,
@@ -280,9 +280,9 @@ int CmdEMVReadRecord(const char *cmd) {
 	uint8_t data[APDU_RES_LEN] = {0};
 	int datalen = 0;
 
-	CLIParserInit("hf emv readrec", 
+	CLIParserInit("emv readrec", 
 		"Executes Read Record command. It returns data in TLV format.\nNeeds a bank applet to be selected and sometimes needs GPO to be executed.", 
-		"Usage:\n\thf emv readrec -k 0101 -> read file SFI=01, SFIrec=01\n\thf emv readrec -kt 0201-> read file 0201 and show result in TLV\n");
+		"Usage:\n\temv readrec -k 0101 -> read file SFI=01, SFIrec=01\n\temv readrec -kt 0201-> read file 0201 and show result in TLV\n");
 
 	void* argtable[] = {
 		arg_param_begin,
@@ -330,12 +330,12 @@ int CmdEMVAC(const char *cmd) {
 	uint8_t data[APDU_RES_LEN] = {0};
 	int datalen = 0;
 
-	CLIParserInit("hf emv genac", 
+	CLIParserInit("emv genac", 
 		"Generate Application Cryptogram command. It returns data in TLV format .\nNeeds a EMV applet to be selected and GPO to be executed.", 
-		"Usage:\n\thf emv genac -k 0102 -> generate AC with 2-byte CDOLdata and keep field ON after command\n"
-			"\thf emv genac -t 01020304 -> generate AC with 4-byte CDOL data, show result in TLV\n"
-			"\thf emv genac -Daac 01020304 -> generate AC with 4-byte CDOL data and terminal decision 'declined'\n"
-			"\thf emv genac -pmt 9F 37 04 -> load params from file, make CDOL data from CDOL, generate AC with CDOL, show result in TLV"); 
+		"Usage:\n\temv genac -k 0102 -> generate AC with 2-byte CDOLdata and keep field ON after command\n"
+			"\temv genac -t 01020304 -> generate AC with 4-byte CDOL data, show result in TLV\n"
+			"\temv genac -Daac 01020304 -> generate AC with 4-byte CDOL data and terminal decision 'declined'\n"
+			"\temv genac -pmt 9F 37 04 -> load params from file, make CDOL data from CDOL, generate AC with CDOL, show result in TLV"); 
 
 	void* argtable[] = {
 		arg_param_begin,
@@ -439,9 +439,9 @@ int CmdEMVAC(const char *cmd) {
 
 int CmdEMVGenerateChallenge(const char *cmd) {
 
-	CLIParserInit("hf emv challenge", 
+	CLIParserInit("emv challenge", 
 		"Executes Generate Challenge command. It returns 4 or 8-byte random number from card.\nNeeds a EMV applet to be selected and GPO to be executed.", 
-		"Usage:\n\thf emv challenge -> get challenge\n\thf emv challenge -k -> get challenge, keep fileld ON\n");
+		"Usage:\n\temv challenge -> get challenge\n\temv challenge -k -> get challenge, keep fileld ON\n");
 
 	void* argtable[] = {
 		arg_param_begin,
@@ -481,11 +481,11 @@ int CmdEMVInternalAuthenticate(const char *cmd) {
 	uint8_t data[APDU_RES_LEN] = {0};
 	int datalen = 0;
 
-	CLIParserInit("hf emv intauth", 
+	CLIParserInit("emv intauth", 
 		"Generate Internal Authenticate command. Usually needs 4-byte random number. It returns data in TLV format .\nNeeds a EMV applet to be selected and GPO to be executed.", 
-		"Usage:\n\thf emv intauth -k 01020304 -> execute Internal Authenticate with 4-byte DDOLdata and keep field ON after command\n"
-			"\thf emv intauth -t 01020304 -> execute Internal Authenticate with 4-byte DDOL data, show result in TLV\n"
-			"\thf emv intauth -pmt 9F 37 04 -> load params from file, make DDOL data from DDOL, Internal Authenticate with DDOL, show result in TLV"); 
+		"Usage:\n\temv intauth -k 01020304 -> execute Internal Authenticate with 4-byte DDOLdata and keep field ON after command\n"
+			"\temv intauth -t 01020304 -> execute Internal Authenticate with 4-byte DDOL data, show result in TLV\n"
+			"\temv intauth -pmt 9F 37 04 -> load params from file, make DDOL data from DDOL, Internal Authenticate with DDOL, show result in TLV"); 
 
 	void* argtable[] = {
 		arg_param_begin,
@@ -646,10 +646,10 @@ int CmdEMVExec(const char *cmd) {
 	struct tlvdb *tlvRoot = NULL;
 	struct tlv *pdol_data_tlv = NULL;
 
-	CLIParserInit("hf emv exec", 
+	CLIParserInit("emv exec", 
 		"Executes EMV contactless transaction", 
-		"Usage:\n\thf emv exec -sat -> select card, execute MSD transaction, show APDU and TLV\n"
-			"\thf emv exec -satc -> select card, execute CDA transaction, show APDU and TLV\n");
+		"Usage:\n\temv exec -sat -> select card, execute MSD transaction, show APDU and TLV\n"
+			"\temv exec -satc -> select card, execute CDA transaction, show APDU and TLV\n");
 
 	void* argtable[] = {
 		arg_param_begin,
@@ -1081,11 +1081,11 @@ int CmdEMVScan(const char *cmd) {
 	json_t *root;
 	json_error_t error;
 
-	CLIParserInit("hf emv scan", 
+	CLIParserInit("emv scan", 
 		"Scan EMV card and save it contents to a file.", 
 		"It executes EMV contactless transaction and saves result to a file which can be used for emulation\n"
-			"Usage:\n\thf emv scan -at -> scan MSD transaction mode and show APDU and TLV\n"
-			"\thf emv scan -c -> scan CDA transaction mode\n");
+			"Usage:\n\temv scan -at -> scan MSD transaction mode and show APDU and TLV\n"
+			"\temv scan -c -> scan CDA transaction mode\n");
 
 	void* argtable[] = {
 		arg_param_begin,
@@ -1160,7 +1160,7 @@ int CmdEMVScan(const char *cmd) {
 		return 2;
 	}
 
-	JsonSaveStr(root, "$.File.Created", "proxmark3 `hf emv scan`");
+	JsonSaveStr(root, "$.File.Created", "proxmark3 `emv scan`");
 	
 	JsonSaveStr(root, "$.Card.Communication", "iso14443-4a");
 	JsonSaveBufAsHex(root, "$.Card.UID", (uint8_t *)&card.uid, card.uidlen);
@@ -1399,12 +1399,12 @@ int CmdEMVScan(const char *cmd) {
 
 int usage_emv_getrnd(void){
 	PrintAndLogEx(NORMAL, "retrieve the UN number from a terminal");
-	PrintAndLogEx(NORMAL, "Usage:  hf emv getrnd [h]");
+	PrintAndLogEx(NORMAL, "Usage:  emv getrnd [h]");
 	PrintAndLogEx(NORMAL, "Options:");
 	PrintAndLogEx(NORMAL, "      h             : this help");
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      hf emv getrnd");
+	PrintAndLogEx(NORMAL, "      emv getrnd");
 	return 0;
 }
 

From 2245673262aea9d9d8935bae2a0ac6985b31d628 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Mon, 3 Dec 2018 18:46:11 +0200
Subject: [PATCH 0292/1938] fix search big loop

---
 client/emv/emvcore.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/client/emv/emvcore.c b/client/emv/emvcore.c
index f2acda25c..b0a474fc7 100644
--- a/client/emv/emvcore.c
+++ b/client/emv/emvcore.c
@@ -260,6 +260,10 @@ int EMVExchangeEx(bool ActivateField, bool LeaveFieldON, sAPDU apdu, bool Includ
 	if (APDULogging)
 		PrintAndLogEx(NORMAL, "<<<< %s", sprint_hex(Result, *ResultLen));
 
+	if (*ResultLen < 2) {
+		return 200;
+	}
+	
 	*ResultLen -= 2;
 	isw = Result[*ResultLen] * 0x0100 + Result[*ResultLen + 1];
 	if (sw)
@@ -400,8 +404,8 @@ int EMVSearch(bool ActivateField, bool LeaveFieldON, bool decodeTLV, struct tlvd
 			if (++retrycnt < 3){
 				i--;
 			} else {
-				// card select error, proxmark error
-				if (res == 1) {
+				// (1) - card select error, proxmark error OR (200) - result length = 0
+				if (res == 1 || res == 200) {
 					PrintAndLogEx(WARNING, "Exit...");
 					return 1;
 				}

From 01a10bade75b75afd0385ef96cb34a1531013bb6 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Mon, 3 Dec 2018 18:49:54 +0200
Subject: [PATCH 0293/1938] Mastercard compute cryptographic checksum result
 will print anyway

---
 client/emv/cmdemv.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index 29f26b7a7..7308b8335 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -1048,10 +1048,10 @@ int CmdEMVExec(const char *cmd) {
 					dreturn(9);
 				}
 				
-				if (decodeTLV) {
-					TLVPrintFromBuffer(buf, len);
-					PrintAndLogEx(NORMAL, "");
-				}
+				// Mastercard compute cryptographic checksum result
+				TLVPrintFromBuffer(buf, len);
+				PrintAndLogEx(NORMAL, "");
+
 				free(udol_data_tlv);
 
 			}

From 4c7e5757f3b3b656be9682bf6d9984ca47655890 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Mon, 3 Dec 2018 19:29:31 +0200
Subject: [PATCH 0294/1938] added channel parameter

---
 client/emv/cmdemv.c    | 98 +++++++++++++++++++++++++++++-------------
 client/emv/emvcore.c   | 72 +++++++++++++++++--------------
 client/emv/emvcore.h   | 29 +++++++------
 client/fido/fidocore.c |  6 +--
 4 files changed, 128 insertions(+), 77 deletions(-)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index 7308b8335..4ab8a8a56 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -54,6 +54,7 @@ int CmdEMVSelect(const char *cmd) {
 		arg_lit0("kK",  "keep",    "keep field for next command"),
 		arg_lit0("aA",  "apdu",    "show APDU reqests and responses"),
 		arg_lit0("tT",  "tlv",     "TLV decode results"),
+		arg_lit0("wW",  "wired",   "Send data via contact (iso7816) interface. Contactless interface set by default."),
 		arg_strx0(NULL,  NULL,     "<HEX applet AID>", NULL),
 		arg_param_end
 	};
@@ -63,7 +64,10 @@ int CmdEMVSelect(const char *cmd) {
 	bool leaveSignalON = arg_get_lit(2);
 	bool APDULogging = arg_get_lit(3);
 	bool decodeTLV = arg_get_lit(4);
-	CLIGetHexWithReturn(5, data, &datalen);
+	EMVCommandChannel channel = ECC_CONTACTLESS;
+	if (arg_get_lit(5))
+		channel = ECC_CONTACT;
+	CLIGetHexWithReturn(6, data, &datalen);
 	CLIParserFree();
 	
 	SetAPDULogging(APDULogging);
@@ -72,7 +76,7 @@ int CmdEMVSelect(const char *cmd) {
 	uint8_t buf[APDU_RES_LEN] = {0};
 	size_t len = 0;
 	uint16_t sw = 0;
-	int res = EMVSelect(activateField, leaveSignalON, data, datalen, buf, sizeof(buf), &len, &sw, NULL);
+	int res = EMVSelect(channel, activateField, leaveSignalON, data, datalen, buf, sizeof(buf), &len, &sw, NULL);
 
 	if (sw)
 		PrintAndLogEx(INFO, "APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
@@ -98,6 +102,7 @@ int CmdEMVSearch(const char *cmd) {
 		arg_lit0("kK",  "keep",    "keep field ON for next command"),
 		arg_lit0("aA",  "apdu",    "show APDU reqests and responses"),
 		arg_lit0("tT",  "tlv",     "TLV decode results of selected applets"),
+		arg_lit0("wW",  "wired",   "Send data via contact (iso7816) interface. Contactless interface set by default."),
 		arg_param_end
 	};
 	CLIExecWithReturn(cmd, argtable, true);
@@ -106,6 +111,9 @@ int CmdEMVSearch(const char *cmd) {
 	bool leaveSignalON = arg_get_lit(2);
 	bool APDULogging = arg_get_lit(3);
 	bool decodeTLV = arg_get_lit(4);
+	EMVCommandChannel channel = ECC_CONTACTLESS;
+	if (arg_get_lit(5))
+		channel = ECC_CONTACT;
 	CLIParserFree();
 	
 	SetAPDULogging(APDULogging);
@@ -114,7 +122,7 @@ int CmdEMVSearch(const char *cmd) {
 	const char *al = "Applets list";
 	t = tlvdb_fixed(1, strlen(al), (const unsigned char *)al);
 
-	if (EMVSearch(activateField, leaveSignalON, decodeTLV, t)) {
+	if (EMVSearch(channel, activateField, leaveSignalON, decodeTLV, t)) {
 		tlvdb_free(t);
 		return 2;
 	}
@@ -145,6 +153,7 @@ int CmdEMVPPSE(const char *cmd) {
 		arg_lit0("2",   "ppse",    "ppse (2PAY.SYS.DDF01) mode (default mode)"),
 		arg_lit0("aA",  "apdu",    "show APDU reqests and responses"),
 		arg_lit0("tT",  "tlv",     "TLV decode results of selected applets"),
+		arg_lit0("wW",  "wired",   "Send data via contact (iso7816) interface. Contactless interface set by default."),
 		arg_param_end
 	};
 	CLIExecWithReturn(cmd, argtable, true);
@@ -158,6 +167,9 @@ int CmdEMVPPSE(const char *cmd) {
 		PSENum = 2;
 	bool APDULogging = arg_get_lit(5);
 	bool decodeTLV = arg_get_lit(6);
+	EMVCommandChannel channel = ECC_CONTACTLESS;
+	if (arg_get_lit(7))
+		channel = ECC_CONTACT;
 	CLIParserFree();	
 	
 	SetAPDULogging(APDULogging);
@@ -166,7 +178,7 @@ int CmdEMVPPSE(const char *cmd) {
 	uint8_t buf[APDU_RES_LEN] = {0};
 	size_t len = 0;
 	uint16_t sw = 0;
-	int res = EMVSelectPSE(activateField, leaveSignalON, PSENum, buf, sizeof(buf), &len, &sw);
+	int res = EMVSelectPSE(channel, activateField, leaveSignalON, PSENum, buf, sizeof(buf), &len, &sw);
 	
 	if (sw)
 		PrintAndLogEx(INFO, "APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
@@ -198,6 +210,7 @@ int CmdEMVGPO(const char *cmd) {
 		arg_lit0("mM",  "make",    "make PDOLdata from PDOL (tag 9F38) and parameters (by default uses default parameters)"),
 		arg_lit0("aA",  "apdu",    "show APDU reqests and responses"),
 		arg_lit0("tT",  "tlv",     "TLV decode results of selected applets"),
+		arg_lit0("wW",  "wired",   "Send data via contact (iso7816) interface. Contactless interface set by default."),
 		arg_strx0(NULL,  NULL,     "<HEX PDOLdata/PDOL>", NULL),
 		arg_param_end
 	};
@@ -208,7 +221,10 @@ int CmdEMVGPO(const char *cmd) {
 	bool dataMakeFromPDOL = arg_get_lit(3);
 	bool APDULogging = arg_get_lit(4);
 	bool decodeTLV = arg_get_lit(5);
-	CLIGetHexWithReturn(6, data, &datalen);
+	EMVCommandChannel channel = ECC_CONTACTLESS;
+	if (arg_get_lit(6))
+		channel = ECC_CONTACT;
+	CLIGetHexWithReturn(7, data, &datalen);
 	CLIParserFree();	
 	
 	SetAPDULogging(APDULogging);
@@ -258,7 +274,7 @@ int CmdEMVGPO(const char *cmd) {
 	uint8_t buf[APDU_RES_LEN] = {0};
 	size_t len = 0;
 	uint16_t sw = 0;
-	int res = EMVGPO(leaveSignalON, pdol_data_tlv_data, pdol_data_tlv_data_len, buf, sizeof(buf), &len, &sw, tlvRoot);
+	int res = EMVGPO(channel, leaveSignalON, pdol_data_tlv_data, pdol_data_tlv_data_len, buf, sizeof(buf), &len, &sw, tlvRoot);
 	
 	if (pdol_data_tlv != &data_tlv)
 		free(pdol_data_tlv);
@@ -289,6 +305,7 @@ int CmdEMVReadRecord(const char *cmd) {
 		arg_lit0("kK",  "keep",    "keep field ON for next command"),
 		arg_lit0("aA",  "apdu",    "show APDU reqests and responses"),
 		arg_lit0("tT",  "tlv",     "TLV decode results of selected applets"),
+		arg_lit0("wW",  "wired",   "Send data via contact (iso7816) interface. Contactless interface set by default."),
 		arg_strx1(NULL,  NULL,     "<SFI 1byte HEX><SFIrec 1byte HEX>", NULL),
 		arg_param_end
 	};
@@ -297,7 +314,10 @@ int CmdEMVReadRecord(const char *cmd) {
 	bool leaveSignalON = arg_get_lit(1);
 	bool APDULogging = arg_get_lit(2);
 	bool decodeTLV = arg_get_lit(3);
-	CLIGetHexWithReturn(4, data, &datalen);
+	EMVCommandChannel channel = ECC_CONTACTLESS;
+	if (arg_get_lit(4))
+		channel = ECC_CONTACT;
+	CLIGetHexWithReturn(5, data, &datalen);
 	CLIParserFree();
 	
 	if (datalen != 2) {
@@ -311,7 +331,7 @@ int CmdEMVReadRecord(const char *cmd) {
 	uint8_t buf[APDU_RES_LEN] = {0};
 	size_t len = 0;
 	uint16_t sw = 0;
-	int res = EMVReadRecord(leaveSignalON, data[0], data[1], buf, sizeof(buf), &len, &sw, NULL);
+	int res = EMVReadRecord(channel, leaveSignalON, data[0], data[1], buf, sizeof(buf), &len, &sw, NULL);
 	
 	if (sw)
 		PrintAndLogEx(INFO, "APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
@@ -346,6 +366,7 @@ int CmdEMVAC(const char *cmd) {
 		arg_lit0("mM",  "make",     "make CDOLdata from CDOL (tag 8C and 8D) and parameters (by default uses default parameters)"),
 		arg_lit0("aA",  "apdu",     "show APDU reqests and responses"),
 		arg_lit0("tT",  "tlv",      "TLV decode results of selected applets"),
+		arg_lit0("wW",  "wired",   "Send data via contact (iso7816) interface. Contactless interface set by default."),
 		arg_strx1(NULL,  NULL,      "<HEX CDOLdata/CDOL>", NULL),
 		arg_param_end
 	};
@@ -375,7 +396,10 @@ int CmdEMVAC(const char *cmd) {
 	bool dataMakeFromCDOL = arg_get_lit(5);
 	bool APDULogging = arg_get_lit(6);
 	bool decodeTLV = arg_get_lit(7);
-	CLIGetHexWithReturn(8, data, &datalen);
+	EMVCommandChannel channel = ECC_CONTACTLESS;
+	if (arg_get_lit(8))
+		channel = ECC_CONTACT;
+	CLIGetHexWithReturn(9, data, &datalen);
 	CLIParserFree();	
 	
 	SetAPDULogging(APDULogging);
@@ -419,7 +443,7 @@ int CmdEMVAC(const char *cmd) {
 	uint8_t buf[APDU_RES_LEN] = {0};
 	size_t len = 0;
 	uint16_t sw = 0;
-	int res = EMVAC(leaveSignalON, termDecision, (uint8_t *)cdol_data_tlv->value, cdol_data_tlv->len, buf, sizeof(buf), &len, &sw, tlvRoot);
+	int res = EMVAC(channel, leaveSignalON, termDecision, (uint8_t *)cdol_data_tlv->value, cdol_data_tlv->len, buf, sizeof(buf), &len, &sw, tlvRoot);
 	
 	if (cdol_data_tlv != &data_tlv)
 		free(cdol_data_tlv);
@@ -447,12 +471,16 @@ int CmdEMVGenerateChallenge(const char *cmd) {
 		arg_param_begin,
 		arg_lit0("kK",  "keep",    "keep field ON for next command"),
 		arg_lit0("aA",  "apdu",    "show APDU reqests and responses"),
+		arg_lit0("wW",  "wired",   "Send data via contact (iso7816) interface. Contactless interface set by default."),
 		arg_param_end
 	};
 	CLIExecWithReturn(cmd, argtable, true);
 	
 	bool leaveSignalON = arg_get_lit(1);
 	bool APDULogging = arg_get_lit(2);
+	EMVCommandChannel channel = ECC_CONTACTLESS;
+	if (arg_get_lit(3))
+		channel = ECC_CONTACT;
 	CLIParserFree();	
 	
 	SetAPDULogging(APDULogging);
@@ -461,7 +489,7 @@ int CmdEMVGenerateChallenge(const char *cmd) {
 	uint8_t buf[APDU_RES_LEN] = {0};
 	size_t len = 0;
 	uint16_t sw = 0;
-	int res = EMVGenerateChallenge(leaveSignalON, buf, sizeof(buf), &len, &sw, NULL);
+	int res = EMVGenerateChallenge(channel, leaveSignalON, buf, sizeof(buf), &len, &sw, NULL);
 	
 	if (sw)
 		PrintAndLogEx(INFO, "APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
@@ -494,6 +522,7 @@ int CmdEMVInternalAuthenticate(const char *cmd) {
 		arg_lit0("mM",  "make",    "make DDOLdata from DDOL (tag 9F49) and parameters (by default uses default parameters)"),
 		arg_lit0("aA",  "apdu",    "show APDU reqests and responses"),
 		arg_lit0("tT",  "tlv",     "TLV decode results of selected applets"),
+		arg_lit0("wW",  "wired",   "Send data via contact (iso7816) interface. Contactless interface set by default."),
 		arg_strx1(NULL,  NULL,     "<HEX DDOLdata/DDOL>", NULL),
 		arg_param_end
 	};
@@ -504,7 +533,10 @@ int CmdEMVInternalAuthenticate(const char *cmd) {
 	bool dataMakeFromDDOL = arg_get_lit(3);
 	bool APDULogging = arg_get_lit(4);
 	bool decodeTLV = arg_get_lit(5);
-	CLIGetHexWithReturn(6, data, &datalen);
+	EMVCommandChannel channel = ECC_CONTACTLESS;
+	if (arg_get_lit(6))
+		channel = ECC_CONTACT;
+	CLIGetHexWithReturn(7, data, &datalen);
 	CLIParserFree();	
 	
 	SetAPDULogging(APDULogging);
@@ -548,7 +580,7 @@ int CmdEMVInternalAuthenticate(const char *cmd) {
 	uint8_t buf[APDU_RES_LEN] = {0};
 	size_t len = 0;
 	uint16_t sw = 0;
-	int res = EMVInternalAuthenticate(leaveSignalON, data, datalen, buf, sizeof(buf), &len, &sw, NULL);
+	int res = EMVInternalAuthenticate(channel, leaveSignalON, data, datalen, buf, sizeof(buf), &len, &sw, NULL);
 	
 	if (ddol_data_tlv != &data_tlv)
 		free(ddol_data_tlv);
@@ -663,6 +695,7 @@ int CmdEMVExec(const char *cmd) {
 		arg_lit0("cC",  "qvsdccda", "Transaction type - qVSDC or M/Chip plus CDA (SDAD generation)."),
 		arg_lit0("xX",  "vsdc",     "Transaction type - VSDC. For test only. Not a standart behavior."),
 		arg_lit0("gG",  "acgpo",    "VISA. generate AC from GPO."),
+		arg_lit0("wW",  "wired",   "Send data via contact (iso7816) interface. Contactless interface set by default."),
 		arg_param_end
 	};
 	CLIExecWithReturn(cmd, argtable, true);
@@ -682,6 +715,9 @@ int CmdEMVExec(const char *cmd) {
 		TrType = TT_VSDC;
 
 	bool GenACGPO = arg_get_lit(9);
+	EMVCommandChannel channel = ECC_CONTACTLESS;
+	if (arg_get_lit(10))
+		channel = ECC_CONTACT;
 	CLIParserFree();
 	
 	SetAPDULogging(showAPDU);
@@ -696,7 +732,7 @@ int CmdEMVExec(const char *cmd) {
 		// PPSE
 		PrintAndLogEx(NORMAL, "\n* PPSE.");
 		SetAPDULogging(showAPDU);
-		res = EMVSearchPSE(activateField, true, decodeTLV, tlvSelect);
+		res = EMVSearchPSE(channel, activateField, true, decodeTLV, tlvSelect);
 
 		// check PPSE and select application id
 		if (!res) {	
@@ -709,7 +745,7 @@ int CmdEMVExec(const char *cmd) {
 	if (!AIDlen) {
 		PrintAndLogEx(NORMAL, "\n* Search AID in list.");
 		SetAPDULogging(false);
-		if (EMVSearch(activateField, true, decodeTLV, tlvSelect)) {
+		if (EMVSearch(channel, activateField, true, decodeTLV, tlvSelect)) {
 			dreturn(2);
 		}
 
@@ -731,7 +767,7 @@ int CmdEMVExec(const char *cmd) {
 	// Select
 	PrintAndLogEx(NORMAL, "\n* Selecting AID:%s", sprint_hex_inrow(AID, AIDlen));
 	SetAPDULogging(showAPDU);
-	res = EMVSelect(false, true, AID, AIDlen, buf, sizeof(buf), &len, &sw, tlvRoot);
+	res = EMVSelect(channel, false, true, AID, AIDlen, buf, sizeof(buf), &len, &sw, tlvRoot);
 	
 	if (res) {	
 		PrintAndLogEx(WARNING, "Can't select AID (%d). Exit...", res);
@@ -762,7 +798,7 @@ int CmdEMVExec(const char *cmd) {
 	PrintAndLogEx(NORMAL, "PDOL data[%d]: %s", pdol_data_tlv_data_len, sprint_hex(pdol_data_tlv_data, pdol_data_tlv_data_len));
 
 	PrintAndLogEx(NORMAL, "\n* GPO.");
-	res = EMVGPO(true, pdol_data_tlv_data, pdol_data_tlv_data_len, buf, sizeof(buf), &len, &sw, tlvRoot);
+	res = EMVGPO(channel, true, pdol_data_tlv_data, pdol_data_tlv_data_len, buf, sizeof(buf), &len, &sw, tlvRoot);
 	
 	free(pdol_data_tlv_data);
 	//free(pdol_data_tlv); --- free on exit.
@@ -818,7 +854,7 @@ int CmdEMVExec(const char *cmd) {
 			for (int n = SFIstart; n <= SFIend; n++) {
 				PrintAndLogEx(NORMAL, "* * * SFI[%02x] %d", SFI, n);
 				
-				res = EMVReadRecord(true, SFI, n, buf, sizeof(buf), &len, &sw, tlvRoot);
+				res = EMVReadRecord(channel, true, SFI, n, buf, sizeof(buf), &len, &sw, tlvRoot);
 				if (res) {
 					PrintAndLogEx(WARNING, "Error SFI[%02x]. APDU error %4x", SFI, sw);
 					continue;
@@ -874,7 +910,7 @@ int CmdEMVExec(const char *cmd) {
 	// DDA
 	if (AIP & 0x0020) {
 		PrintAndLogEx(NORMAL, "\n* DDA");		
-		trDDA(decodeTLV, tlvRoot);
+		trDDA(channel, decodeTLV, tlvRoot);
 	}	
 	
 	// transaction check
@@ -924,7 +960,7 @@ int CmdEMVExec(const char *cmd) {
 			PrintAndLogEx(NORMAL, "\n--> Mastercard M/Chip transaction.");
 
 			PrintAndLogEx(NORMAL, "* * Generate challenge");
-			res = EMVGenerateChallenge(true, buf, sizeof(buf), &len, &sw, tlvRoot);
+			res = EMVGenerateChallenge(channel, true, buf, sizeof(buf), &len, &sw, tlvRoot);
 			if (res) {
 				PrintAndLogEx(WARNING, "Error GetChallenge. APDU error %4x", sw);
 				dreturn(6);
@@ -952,7 +988,7 @@ int CmdEMVExec(const char *cmd) {
 			
 			PrintAndLogEx(NORMAL, "* * AC1");
 			// EMVAC_TC + EMVAC_CDAREQ --- to get SDAD
-			res = EMVAC(true, (TrType == TT_CDA) ? EMVAC_TC + EMVAC_CDAREQ : EMVAC_TC, (uint8_t *)cdol_data_tlv->value, cdol_data_tlv->len, buf, sizeof(buf), &len, &sw, tlvRoot);
+			res = EMVAC(channel, true, (TrType == TT_CDA) ? EMVAC_TC + EMVAC_CDAREQ : EMVAC_TC, (uint8_t *)cdol_data_tlv->value, cdol_data_tlv->len, buf, sizeof(buf), &len, &sw, tlvRoot);
 			
 			if (res) {	
 				PrintAndLogEx(NORMAL, "AC1 error(%d): %4x. Exit...", res, sw);
@@ -1041,7 +1077,7 @@ int CmdEMVExec(const char *cmd) {
 				
 				PrintAndLogEx(NORMAL, "\n* Mastercard compute cryptographic checksum(UDOL)");
 				
-				res = MSCComputeCryptoChecksum(true, (uint8_t *)udol_data_tlv->value, udol_data_tlv->len, buf, sizeof(buf), &len, &sw, tlvRoot);
+				res = MSCComputeCryptoChecksum(channel, true, (uint8_t *)udol_data_tlv->value, udol_data_tlv->len, buf, sizeof(buf), &len, &sw, tlvRoot);
 				if (res) {
 					PrintAndLogEx(WARNING, "Error Compute Crypto Checksum. APDU error %4x", sw);
 					free(udol_data_tlv);
@@ -1099,6 +1135,7 @@ int CmdEMVScan(const char *cmd) {
 		arg_lit0("xX",  "vsdc",     "Transaction type - VSDC. For test only. Not a standart behavior."),
 		arg_lit0("gG",  "acgpo",    "VISA. generate AC from GPO."),
 		arg_lit0("mM",  "merge",    "Merge output file with card's data. (warning: the file may be corrupted!)"),
+		arg_lit0("wW",  "wired",   "Send data via contact (iso7816) interface. Contactless interface set by default."),
 		arg_str1(NULL,  NULL,		"output.json", "JSON output file name"),
 		arg_param_end
 	};
@@ -1119,10 +1156,13 @@ int CmdEMVScan(const char *cmd) {
 
 	bool GenACGPO = arg_get_lit(9);
 	bool MergeJSON = arg_get_lit(10);
+	EMVCommandChannel channel = ECC_CONTACTLESS;
+	if (arg_get_lit(11))
+		channel = ECC_CONTACT;
 	uint8_t relfname[250] ={0};
 	char *crelfname = (char *)relfname;
 	int relfnamelen = 0;
-	CLIGetStrWithReturn(11, relfname, &relfnamelen);
+	CLIGetStrWithReturn(12, relfname, &relfnamelen);
 	CLIParserFree();
 	
 	SetAPDULogging(showAPDU);
@@ -1174,7 +1214,7 @@ int CmdEMVScan(const char *cmd) {
 	
 	// EMV PPSE
 	PrintAndLogEx(NORMAL, "--> PPSE.");
-	res = EMVSelectPSE(true, true, 2, buf, sizeof(buf), &len, &sw);
+	res = EMVSelectPSE(channel, true, true, 2, buf, sizeof(buf), &len, &sw);
 
 	if (!res && sw == 0x9000){
 		if (decodeTLV)
@@ -1191,7 +1231,7 @@ int CmdEMVScan(const char *cmd) {
 		tlvdb_free(fci);
 	}
 
-	res = EMVSearchPSE(false, true, decodeTLV, tlvSelect);
+	res = EMVSearchPSE(channel, false, true, decodeTLV, tlvSelect);
 
 	// check PPSE and select application id
 	if (!res) {	
@@ -1200,7 +1240,7 @@ int CmdEMVScan(const char *cmd) {
 		// EMV SEARCH with AID list
 		SetAPDULogging(false);
 		PrintAndLogEx(NORMAL, "--> AID search.");
-		if (EMVSearch(false, true, decodeTLV, tlvSelect)) {
+		if (EMVSearch(channel, false, true, decodeTLV, tlvSelect)) {
 			PrintAndLogEx(ERR, "Can't found any of EMV AID. Exit...");
 			tlvdb_free(tlvSelect);
 			DropField();
@@ -1233,7 +1273,7 @@ int CmdEMVScan(const char *cmd) {
 
 	PrintAndLogEx(NORMAL, "\n-->Selecting AID:%s.", sprint_hex_inrow(AID, AIDlen));
 	SetAPDULogging(showAPDU);
-	res = EMVSelect(false, true, AID, AIDlen, buf, sizeof(buf), &len, &sw, tlvRoot);
+	res = EMVSelect(channel, false, true, AID, AIDlen, buf, sizeof(buf), &len, &sw, tlvRoot);
 	
 	if (res) {	
 		PrintAndLogEx(ERR, "Can't select AID (%d). Exit...", res);
@@ -1281,7 +1321,7 @@ int CmdEMVScan(const char *cmd) {
 	PrintAndLogEx(INFO, "PDOL data[%d]: %s", pdol_data_tlv_data_len, sprint_hex(pdol_data_tlv_data, pdol_data_tlv_data_len));
 
 	PrintAndLogEx(INFO, "-->GPO.");
-	res = EMVGPO(true, pdol_data_tlv_data, pdol_data_tlv_data_len, buf, sizeof(buf), &len, &sw, tlvRoot);
+	res = EMVGPO(channel, true, pdol_data_tlv_data, pdol_data_tlv_data_len, buf, sizeof(buf), &len, &sw, tlvRoot);
 	
 	free(pdol_data_tlv_data);
 	free(pdol_data_tlv);
@@ -1340,7 +1380,7 @@ int CmdEMVScan(const char *cmd) {
 			for(int n = SFIstart; n <= SFIend; n++) {
 				PrintAndLogEx(INFO, "---->SFI[%02x] %d", SFI, n);
 				
-				res = EMVReadRecord(true, SFI, n, buf, sizeof(buf), &len, &sw, tlvRoot);
+				res = EMVReadRecord(channel, true, SFI, n, buf, sizeof(buf), &len, &sw, tlvRoot);
 				if (res) {
 					PrintAndLogEx(ERR, "SFI[%02x]. APDU error %4x", SFI, sw);
 					continue;
diff --git a/client/emv/emvcore.c b/client/emv/emvcore.c
index b0a474fc7..aa68b6cdf 100644
--- a/client/emv/emvcore.c
+++ b/client/emv/emvcore.c
@@ -230,12 +230,13 @@ struct tlvdb *GetdCVVRawFromTrack2(const struct tlv *track2) {
   return tlvdb_fixed(0x02, dCVVlen, dCVV);
 }
 
-int EMVExchangeEx(bool ActivateField, bool LeaveFieldON, sAPDU apdu, bool IncludeLe, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
+int EMVExchangeEx(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, sAPDU apdu, bool IncludeLe, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
 	uint8_t data[APDU_RES_LEN] = {0};
 
 	*ResultLen = 0;
 	if (sw)	*sw = 0;
 	uint16_t isw = 0;
+	int res = 0;
 	
 	if (ActivateField) {
 		DropField();
@@ -250,11 +251,16 @@ int EMVExchangeEx(bool ActivateField, bool LeaveFieldON, sAPDU apdu, bool Includ
 	if (APDULogging)
 		PrintAndLogEx(NORMAL, ">>>> %s", sprint_hex(data, (IncludeLe?6:5) + apdu.Lc));
 
-	// 6 byes + data = INS + CLA + P1 + P2 + Lc + <data = Nc> + Le(?IncludeLe)
-	int res = ExchangeAPDU14a(data, (IncludeLe?6:5) + apdu.Lc, ActivateField, LeaveFieldON, Result, (int)MaxResultLen, (int *)ResultLen);
-	
-	if (res) {
-		return res;
+	switch(channel) {
+	case ECC_CONTACTLESS:
+		// 6 byes + data = INS + CLA + P1 + P2 + Lc + <data = Nc> + Le(?IncludeLe)
+		res = ExchangeAPDU14a(data, (IncludeLe?6:5) + apdu.Lc, ActivateField, LeaveFieldON, Result, (int)MaxResultLen, (int *)ResultLen);
+		if (res) {
+			return res;
+		}
+		break;
+	case ECC_CONTACT:
+		break;
 	}
 	
 	if (APDULogging)
@@ -289,15 +295,15 @@ int EMVExchangeEx(bool ActivateField, bool LeaveFieldON, sAPDU apdu, bool Includ
 	return 0;
 }
 
-int EMVExchange(bool LeaveFieldON, sAPDU apdu, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
-	return EMVExchangeEx(false, LeaveFieldON, apdu, true, Result, MaxResultLen, ResultLen, sw, tlv);
+int EMVExchange(EMVCommandChannel channel, bool LeaveFieldON, sAPDU apdu, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
+	return EMVExchangeEx(channel, false, LeaveFieldON, apdu, true, Result, MaxResultLen, ResultLen, sw, tlv);
 }
 
-int EMVSelect(bool ActivateField, bool LeaveFieldON, uint8_t *AID, size_t AIDLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
-	return EMVExchangeEx(ActivateField, LeaveFieldON, (sAPDU){0x00, 0xa4, 0x04, 0x00, AIDLen, AID}, true, Result, MaxResultLen, ResultLen, sw, tlv);
+int EMVSelect(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, uint8_t *AID, size_t AIDLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
+	return EMVExchangeEx(channel, ActivateField, LeaveFieldON, (sAPDU){0x00, 0xa4, 0x04, 0x00, AIDLen, AID}, true, Result, MaxResultLen, ResultLen, sw, tlv);
 }
 
-int EMVSelectPSE(bool ActivateField, bool LeaveFieldON, uint8_t PSENum, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
+int EMVSelectPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, uint8_t PSENum, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
 	uint8_t buf[APDU_AID_LEN] = {0};
 	*ResultLen = 0;
 	int len = 0;
@@ -314,19 +320,19 @@ int EMVSelectPSE(bool ActivateField, bool LeaveFieldON, uint8_t PSENum, uint8_t
 	}
 	
 	// select
-	res = EMVSelect(ActivateField, LeaveFieldON, buf, len, Result, MaxResultLen, ResultLen, sw, NULL);
+	res = EMVSelect(channel, ActivateField, LeaveFieldON, buf, len, Result, MaxResultLen, ResultLen, sw, NULL);
 
 	return res;
 }
 
-int EMVSearchPSE(bool ActivateField, bool LeaveFieldON, bool decodeTLV, struct tlvdb *tlv) {
+int EMVSearchPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, bool decodeTLV, struct tlvdb *tlv) {
 	uint8_t data[APDU_RES_LEN] = {0};
 	size_t datalen = 0;
 	uint16_t sw = 0;
 	int res;
 
 	// select PPSE
-	res = EMVSelectPSE(ActivateField, true, 2, data, sizeof(data), &datalen, &sw);
+	res = EMVSelectPSE(channel, ActivateField, true, 2, data, sizeof(data), &datalen, &sw);
 
 	if (!res){
 		struct tlvdb *t = NULL;
@@ -340,7 +346,7 @@ int EMVSearchPSE(bool ActivateField, bool LeaveFieldON, bool decodeTLV, struct t
 			while (ttmp) {
 				const struct tlv *tgAID = tlvdb_get_inchild(ttmp, 0x4f, NULL);
 				if (tgAID) {
-					res = EMVSelect(false, true, (uint8_t *)tgAID->value, tgAID->len, data, sizeof(data), &datalen, &sw, tlv);
+					res = EMVSelect(channel, false, true, (uint8_t *)tgAID->value, tgAID->len, data, sizeof(data), &datalen, &sw, tlv);
 
 					// retry if error and not returned sw error
 					if (res && res != 5) {
@@ -387,7 +393,7 @@ int EMVSearchPSE(bool ActivateField, bool LeaveFieldON, bool decodeTLV, struct t
 	return res;
 }
 
-int EMVSearch(bool ActivateField, bool LeaveFieldON, bool decodeTLV, struct tlvdb *tlv) {
+int EMVSearch(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, bool decodeTLV, struct tlvdb *tlv) {
 	uint8_t aidbuf[APDU_AID_LEN] = {0};
 	int aidlen = 0;
 	uint8_t data[APDU_RES_LEN] = {0};
@@ -398,7 +404,7 @@ int EMVSearch(bool ActivateField, bool LeaveFieldON, bool decodeTLV, struct tlvd
 	int retrycnt = 0;
 	for(int i = 0; i < AIDlistLen; i ++) {
 		param_gethex_to_eol(AIDlist[i].aid, 0, aidbuf, sizeof(aidbuf), &aidlen);
-		res = EMVSelect((i == 0) ? ActivateField : false, (i == AIDlistLen - 1) ? LeaveFieldON : true, aidbuf, aidlen, data, sizeof(data), &datalen, &sw, tlv);
+		res = EMVSelect(channel, (i == 0) ? ActivateField : false, (i == AIDlistLen - 1) ? LeaveFieldON : true, aidbuf, aidlen, data, sizeof(data), &datalen, &sw, tlv);
 		// retry if error and not returned sw error
 		if (res && res != 5) {
 			if (++retrycnt < 3){
@@ -468,38 +474,38 @@ int EMVSelectApplication(struct tlvdb *tlv, uint8_t *AID, size_t *AIDlen) {
 	return 0;
 }
 
-int EMVGPO(bool LeaveFieldON, uint8_t *PDOL, size_t PDOLLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
-	return EMVExchange(LeaveFieldON, (sAPDU){0x80, 0xa8, 0x00, 0x00, PDOLLen, PDOL}, Result, MaxResultLen, ResultLen, sw, tlv);
+int EMVGPO(EMVCommandChannel channel, bool LeaveFieldON, uint8_t *PDOL, size_t PDOLLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
+	return EMVExchange(channel, LeaveFieldON, (sAPDU){0x80, 0xa8, 0x00, 0x00, PDOLLen, PDOL}, Result, MaxResultLen, ResultLen, sw, tlv);
 }
 
-int EMVReadRecord(bool LeaveFieldON, uint8_t SFI, uint8_t SFIrec, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
-	int res = EMVExchange(LeaveFieldON, (sAPDU){0x00, 0xb2, SFIrec, (SFI << 3) | 0x04, 0, NULL}, Result, MaxResultLen, ResultLen, sw, tlv);
+int EMVReadRecord(EMVCommandChannel channel, bool LeaveFieldON, uint8_t SFI, uint8_t SFIrec, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
+	int res = EMVExchange(channel, LeaveFieldON, (sAPDU){0x00, 0xb2, SFIrec, (SFI << 3) | 0x04, 0, NULL}, Result, MaxResultLen, ResultLen, sw, tlv);
 	if (*sw == 0x6700) {
 		PrintAndLogEx(INFO, ">>> trying to reissue command withouth Le...");
-		res = EMVExchangeEx(false, LeaveFieldON, (sAPDU){0x00, 0xb2, SFIrec, (SFI << 3) | 0x04, 0, NULL}, false, Result, MaxResultLen, ResultLen, sw, tlv);
+		res = EMVExchangeEx(channel, false, LeaveFieldON, (sAPDU){0x00, 0xb2, SFIrec, (SFI << 3) | 0x04, 0, NULL}, false, Result, MaxResultLen, ResultLen, sw, tlv);
 	}
 	return res;
 }
 
-int EMVAC(bool LeaveFieldON, uint8_t RefControl, uint8_t *CDOL, size_t CDOLLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
-	return EMVExchange(LeaveFieldON, (sAPDU){0x80, 0xae, RefControl, 0x00, CDOLLen, CDOL}, Result, MaxResultLen, ResultLen, sw, tlv);
+int EMVAC(EMVCommandChannel channel, bool LeaveFieldON, uint8_t RefControl, uint8_t *CDOL, size_t CDOLLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
+	return EMVExchange(channel, LeaveFieldON, (sAPDU){0x80, 0xae, RefControl, 0x00, CDOLLen, CDOL}, Result, MaxResultLen, ResultLen, sw, tlv);
 }
 
-int EMVGenerateChallenge(bool LeaveFieldON, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
-	int res = EMVExchange(LeaveFieldON, (sAPDU){0x00, 0x84, 0x00, 0x00, 0x00, NULL}, Result, MaxResultLen, ResultLen, sw, tlv);
+int EMVGenerateChallenge(EMVCommandChannel channel, bool LeaveFieldON, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
+	int res = EMVExchange(channel, LeaveFieldON, (sAPDU){0x00, 0x84, 0x00, 0x00, 0x00, NULL}, Result, MaxResultLen, ResultLen, sw, tlv);
 	if (*sw == 0x6700) {
 		PrintAndLogEx(INFO, ">>> trying to reissue command withouth Le...");
-		res = EMVExchangeEx(false, LeaveFieldON, (sAPDU){0x00, 0x84, 0x00, 0x00, 0x00, NULL}, false, Result, MaxResultLen, ResultLen, sw, tlv);
+		res = EMVExchangeEx(channel, false, LeaveFieldON, (sAPDU){0x00, 0x84, 0x00, 0x00, 0x00, NULL}, false, Result, MaxResultLen, ResultLen, sw, tlv);
 	}
 	return res;
 }
 
-int EMVInternalAuthenticate(bool LeaveFieldON, uint8_t *DDOL, size_t DDOLLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
-	return EMVExchange(LeaveFieldON, (sAPDU){0x00, 0x88, 0x00, 0x00, DDOLLen, DDOL}, Result, MaxResultLen, ResultLen, sw, tlv);
+int EMVInternalAuthenticate(EMVCommandChannel channel, bool LeaveFieldON, uint8_t *DDOL, size_t DDOLLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
+	return EMVExchange(channel, LeaveFieldON, (sAPDU){0x00, 0x88, 0x00, 0x00, DDOLLen, DDOL}, Result, MaxResultLen, ResultLen, sw, tlv);
 }
 
-int MSCComputeCryptoChecksum(bool LeaveFieldON, uint8_t *UDOL, uint8_t UDOLlen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
-	return EMVExchange(LeaveFieldON, (sAPDU){0x80, 0x2a, 0x8e, 0x80, UDOLlen, UDOL}, Result, MaxResultLen, ResultLen, sw, tlv);
+int MSCComputeCryptoChecksum(EMVCommandChannel channel, bool LeaveFieldON, uint8_t *UDOL, uint8_t UDOLlen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
+	return EMVExchange(channel, LeaveFieldON, (sAPDU){0x80, 0x2a, 0x8e, 0x80, UDOLlen, UDOL}, Result, MaxResultLen, ResultLen, sw, tlv);
 }
 
 // Authentication 
@@ -569,7 +575,7 @@ int trSDA(struct tlvdb *tlv) {
 static const unsigned char default_ddol_value[] = {0x9f, 0x37, 0x04};
 static struct tlv default_ddol_tlv = {.tag = 0x9f49, .len = 3, .value = default_ddol_value };
 
-int trDDA(bool decodeTLV, struct tlvdb *tlv) {
+int trDDA(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlv) {
 	uint8_t buf[APDU_RES_LEN] = {0};
 	size_t len = 0;
 	uint16_t sw = 0;
@@ -709,7 +715,7 @@ int trDDA(bool decodeTLV, struct tlvdb *tlv) {
 		PrintAndLogEx(NORMAL, "DDOL data[%d]: %s", ddol_data_tlv->len, sprint_hex(ddol_data_tlv->value, ddol_data_tlv->len));
 
 		PrintAndLogEx(NORMAL, "\n* Internal Authenticate");
-		int res = EMVInternalAuthenticate(true, (uint8_t *)ddol_data_tlv->value, ddol_data_tlv->len, buf, sizeof(buf), &len, &sw, NULL);
+		int res = EMVInternalAuthenticate(channel, true, (uint8_t *)ddol_data_tlv->value, ddol_data_tlv->len, buf, sizeof(buf), &len, &sw, NULL);
 		if (res) {	
 			PrintAndLogEx(WARNING, "Internal Authenticate error(%d): %4x. Exit...", res, sw);
 			free(ddol_data_tlv);
diff --git a/client/emv/emvcore.h b/client/emv/emvcore.h
index 5fb6f202c..c2b1746e1 100644
--- a/client/emv/emvcore.h
+++ b/client/emv/emvcore.h
@@ -32,6 +32,11 @@
 #define APDU_RES_LEN 260
 #define APDU_AID_LEN 50
 
+typedef enum {
+	ECC_CONTACTLESS,
+	ECC_CONTACT
+} EMVCommandChannel;
+
 enum TransactionType {
 	TT_MSD,
 	TT_VSDC,        // not standart for contactless!!!!
@@ -71,28 +76,28 @@ extern struct tlvdb *GetdCVVRawFromTrack2(const struct tlv *track2);
 extern void SetAPDULogging(bool logging);
 
 // exchange
-extern int EMVExchange(bool LeaveFieldON, sAPDU apdu, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv);
+extern int EMVExchange(EMVCommandChannel channel, bool LeaveFieldON, sAPDU apdu, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv);
 
 // search application
-extern int EMVSearchPSE(bool ActivateField, bool LeaveFieldON, bool decodeTLV, struct tlvdb *tlv);
-extern int EMVSearch(bool ActivateField, bool LeaveFieldON, bool decodeTLV, struct tlvdb *tlv);
-extern int EMVSelectPSE(bool ActivateField, bool LeaveFieldON, uint8_t PSENum, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw);
-extern int EMVSelect(bool ActivateField, bool LeaveFieldON, uint8_t *AID, size_t AIDLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv);
+extern int EMVSearchPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, bool decodeTLV, struct tlvdb *tlv);
+extern int EMVSearch(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, bool decodeTLV, struct tlvdb *tlv);
+extern int EMVSelectPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, uint8_t PSENum, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw);
+extern int EMVSelect(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, uint8_t *AID, size_t AIDLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv);
 // select application
 extern int EMVSelectApplication(struct tlvdb *tlv, uint8_t *AID, size_t *AIDlen);
 // Get Processing Options
-extern int EMVGPO(bool LeaveFieldON, uint8_t *PDOL, size_t PDOLLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv);
-extern int EMVReadRecord(bool LeaveFieldON, uint8_t SFI, uint8_t SFIrec, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv);
+extern int EMVGPO(EMVCommandChannel channel, bool LeaveFieldON, uint8_t *PDOL, size_t PDOLLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv);
+extern int EMVReadRecord(EMVCommandChannel channel, bool LeaveFieldON, uint8_t SFI, uint8_t SFIrec, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv);
 // AC
-extern int EMVGenerateChallenge(bool LeaveFieldON, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv);
-extern int EMVAC(bool LeaveFieldON, uint8_t RefControl, uint8_t *CDOL, size_t CDOLLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv);
+extern int EMVGenerateChallenge(EMVCommandChannel channel, bool LeaveFieldON, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv);
+extern int EMVAC(EMVCommandChannel channel, bool LeaveFieldON, uint8_t RefControl, uint8_t *CDOL, size_t CDOLLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv);
 // DDA
-extern int EMVInternalAuthenticate(bool LeaveFieldON, uint8_t *DDOL, size_t DDOLLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv);
+extern int EMVInternalAuthenticate(EMVCommandChannel channel, bool LeaveFieldON, uint8_t *DDOL, size_t DDOLLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv);
 // Mastercard
-int MSCComputeCryptoChecksum(bool LeaveFieldON, uint8_t *UDOL, uint8_t UDOLlen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv);
+int MSCComputeCryptoChecksum(EMVCommandChannel channel, bool LeaveFieldON, uint8_t *UDOL, uint8_t UDOLlen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv);
 // Auth
 extern int trSDA(struct tlvdb *tlv);
-extern int trDDA(bool decodeTLV, struct tlvdb *tlv);
+extern int trDDA(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlv);
 extern int trCDA(struct tlvdb *tlv, struct tlvdb *ac_tlv, struct tlv *pdol_data_tlv, struct tlv *ac_data_tlv);
 
 extern int RecoveryCertificates(struct tlvdb *tlvRoot, json_t *root);
diff --git a/client/fido/fidocore.c b/client/fido/fidocore.c
index 39c2052f9..ee39fbbe9 100644
--- a/client/fido/fidocore.c
+++ b/client/fido/fidocore.c
@@ -170,17 +170,17 @@ char *fido2GetCmdMemberDescription(uint8_t cmdCode, bool isResponse, int memberN
 int FIDOSelect(bool ActivateField, bool LeaveFieldON, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
 	uint8_t data[] = {0xA0, 0x00, 0x00, 0x06, 0x47, 0x2F, 0x00, 0x01};
 	
-	return EMVSelect(ActivateField, LeaveFieldON, data, sizeof(data), Result, MaxResultLen, ResultLen, sw, NULL);
+	return EMVSelect(ECC_CONTACTLESS, ActivateField, LeaveFieldON, data, sizeof(data), Result, MaxResultLen, ResultLen, sw, NULL);
 }
 
 int FIDOExchange(sAPDU apdu, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
-	int res = EMVExchange(true, apdu, Result, MaxResultLen, ResultLen, sw, NULL);
+	int res = EMVExchange(ECC_CONTACTLESS, true, apdu, Result, MaxResultLen, ResultLen, sw, NULL);
 	if (res == 5) // apdu result (sw) not a 0x9000
 		res = 0;
 	// software chaining
 	while (!res && (*sw >> 8) == 0x61) {
 		size_t oldlen = *ResultLen;
-		res = EMVExchange(true, (sAPDU){0x00, 0xC0, 0x00, 0x00, 0x00, NULL}, &Result[oldlen], MaxResultLen - oldlen, ResultLen, sw, NULL);
+		res = EMVExchange(ECC_CONTACTLESS, true, (sAPDU){0x00, 0xC0, 0x00, 0x00, 0x00, NULL}, &Result[oldlen], MaxResultLen - oldlen, ResultLen, sw, NULL);
 		if (res == 5) // apdu result (sw) not a 0x9000
 			res = 0;
 		

From 898484f642aed5ad696690728431bd4419ccce7d Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 4 Dec 2018 13:51:28 +0100
Subject: [PATCH 0295/1938] FIX:  compilation for OS X,  see
 https://github.com/Proxmark/proxmark3/pull/730/    (@jmichelp)

---
 uart/uart_posix.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index 0ead61500..d857729d6 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -55,6 +55,11 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 
+// Taken from https://github.com/unbit/uwsgi/commit/b608eb1772641d525bfde268fe9d6d8d0d5efde7
+#ifndef SOL_TCP
+# define SOL_TCP IPPROTO_TCP
+#endif
+
 typedef struct termios term_info;
 typedef struct {
   int fd;           // Serial port file descriptor

From 312ec79e481b9e71e90f144730e630576fa44ab6 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 5 Dec 2018 17:27:28 +0200
Subject: [PATCH 0296/1938] added sketch sc apdu

---
 client/cmdsmartcard.c | 6 ++++++
 client/cmdsmartcard.h | 2 ++
 client/emv/emvcore.c  | 5 +++++
 3 files changed, 13 insertions(+)

diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index 59172b9c8..0173e0ca2 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -244,6 +244,12 @@ int CmdSmartRaw(const char *Cmd) {
 	return 0;
 }
 
+int ExchangeAPDUSC(uint8_t *datain, int datainlen, bool activateCard, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
+
+	return 0;
+}	
+
+
 int CmdSmartUpgrade(const char *Cmd) {
 
 	PrintAndLogEx(WARNING, "WARNING - Smartcard socket firmware upgrade.");
diff --git a/client/cmdsmartcard.h b/client/cmdsmartcard.h
index 5ba453e30..8cc0ae851 100644
--- a/client/cmdsmartcard.h
+++ b/client/cmdsmartcard.h
@@ -32,6 +32,8 @@ extern int CmdSmartUpgrade(const char* cmd);
 extern int CmdSmartInfo(const char* cmd);
 extern int CmdSmartReader(const char *Cmd);
 
+extern int ExchangeAPDUSC(uint8_t *datain, int datainlen, bool activateCard, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen);
+
 extern int usage_sm_raw(void);
 extern int usage_sm_reader(void);
 extern int usage_sm_info(void);
diff --git a/client/emv/emvcore.c b/client/emv/emvcore.c
index aa68b6cdf..7df706e8e 100644
--- a/client/emv/emvcore.c
+++ b/client/emv/emvcore.c
@@ -260,6 +260,11 @@ int EMVExchangeEx(EMVCommandChannel channel, bool ActivateField, bool LeaveField
 		}
 		break;
 	case ECC_CONTACT:
+		//int ExchangeAPDUSC(uint8_t *datain, int datainlen, bool activateCard, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen);
+		res = ExchangeAPDU14a(data, (IncludeLe?6:5) + apdu.Lc, ActivateField, LeaveFieldON, Result, (int)MaxResultLen, (int *)ResultLen);
+		if (res) {
+			return res;
+		}
 		break;
 	}
 	

From ec3acc7d8af7b833aab655ce4ae2935a652edc6a Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 5 Dec 2018 19:23:13 +0200
Subject: [PATCH 0297/1938] some of emv commands works in test mode

---
 client/cmdsmartcard.c | 33 +++++++++++++++++++++++++++++++--
 client/emv/emvcore.c  |  2 +-
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index 0173e0ca2..d02e93477 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -87,6 +87,14 @@ static bool smart_select(bool silent) {
 		if (!silent) PrintAndLogEx(WARNING, "smart card select failed");
 		return false;
 	}	
+
+	if (!silent) {
+		smart_card_atr_t card;
+		memcpy(&card, (smart_card_atr_t *)resp.d.asBytes, sizeof(smart_card_atr_t));
+		
+		PrintAndLogEx(INFO, "ISO7816-3 ATR : %s", sprint_hex(card.atr, card.atr_len));	
+	}
+
 	return true;
 }
 
@@ -124,8 +132,8 @@ static int smart_response(uint8_t *data) {
 		goto out;
 	}
 
-	PrintAndLogEx(INFO, "Requesting response");	
-	uint8_t getstatus[] = {0x00, ISO7816_GETSTATUS, 0x00, 0x00, len };
+	PrintAndLogEx(INFO, "Requesting response. len=0x%x", len);	
+	uint8_t getstatus[] = {ISO7816_GETSTATUS, 0x00, 0x00, len};
 	UsbCommand cStatus = {CMD_SMART_RAW, {SC_RAW, sizeof(getstatus), 0}};	
 	memcpy(cStatus.d.asBytes, getstatus, sizeof(getstatus) );
 	clearCommandBuffer();
@@ -245,6 +253,27 @@ int CmdSmartRaw(const char *Cmd) {
 }
 
 int ExchangeAPDUSC(uint8_t *datain, int datainlen, bool activateCard, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
+	*dataoutlen = 0;
+	
+	if (activateCard)
+		smart_select(false);
+	printf("* APDU SC\n");
+
+	UsbCommand c = {CMD_SMART_RAW, {SC_RAW | SC_CONNECT, datainlen, 0}};	
+	if (activateCard) {
+		c.arg[0] |= SC_SELECT;
+	}
+	memcpy(c.d.asBytes, datain, datainlen);
+	clearCommandBuffer();
+	SendCommand(&c);	
+	
+	int len = smart_response(dataout);
+	
+	if ( len < 0 ) {
+		return 2;
+	}
+	
+	*dataoutlen = len;
 
 	return 0;
 }	
diff --git a/client/emv/emvcore.c b/client/emv/emvcore.c
index 7df706e8e..fcf0bf81f 100644
--- a/client/emv/emvcore.c
+++ b/client/emv/emvcore.c
@@ -261,7 +261,7 @@ int EMVExchangeEx(EMVCommandChannel channel, bool ActivateField, bool LeaveField
 		break;
 	case ECC_CONTACT:
 		//int ExchangeAPDUSC(uint8_t *datain, int datainlen, bool activateCard, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen);
-		res = ExchangeAPDU14a(data, (IncludeLe?6:5) + apdu.Lc, ActivateField, LeaveFieldON, Result, (int)MaxResultLen, (int *)ResultLen);
+		res = ExchangeAPDUSC(data, (IncludeLe?6:5) + apdu.Lc, ActivateField, LeaveFieldON, Result, (int)MaxResultLen, (int *)ResultLen);
 		if (res) {
 			return res;
 		}

From 34b53a5b48ff342fe7ed9c6060467c57c145edcd Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Thu, 6 Dec 2018 14:44:55 +0200
Subject: [PATCH 0298/1938] exchange works

---
 client/cmdsmartcard.c | 86 ++++++++++++++++++++++++++++++++-----------
 1 file changed, 65 insertions(+), 21 deletions(-)

diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index d02e93477..db3c69f0e 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -119,29 +119,56 @@ static int smart_wait(uint8_t *data) {
 	return len;
 }
 
-static int smart_response(uint8_t *data) {
+static int smart_response(uint8_t apduINS, uint8_t *data) {
 		
-	int len = -1; 
 	int datalen = smart_wait(data);	
+	bool needGetData = false;
 	
-	if ( data[datalen - 2] == 0x61 || data[datalen - 2] == 0x9F ) {
-		len = data[datalen - 1];
-	}
-
-	if (len == -1 ) {
+	if (datalen < 2 ) {
 		goto out;
 	}
 
-	PrintAndLogEx(INFO, "Requesting response. len=0x%x", len);	
-	uint8_t getstatus[] = {ISO7816_GETSTATUS, 0x00, 0x00, len};
-	UsbCommand cStatus = {CMD_SMART_RAW, {SC_RAW, sizeof(getstatus), 0}};	
-	memcpy(cStatus.d.asBytes, getstatus, sizeof(getstatus) );
-	clearCommandBuffer();
-	SendCommand(&cStatus);
-
-	datalen = smart_wait(data);
-out:
+	if (datalen > 2 && data[0] != apduINS) {
+		PrintAndLogEx(ERR, "Card ACK error. len=0x%x data[0]=%02x", datalen, data[0]);	
+		datalen = 0;
+		goto out;
+	}
 	
+	if ( data[datalen - 2] == 0x61 || data[datalen - 2] == 0x9F ) {
+		needGetData = true;
+	}
+
+	if (needGetData) {
+		int len = data[datalen - 1];
+		PrintAndLogEx(INFO, "Requesting response. len=0x%x", len);	
+		uint8_t getstatus[] = {ISO7816_GETSTATUS, 0x00, 0x00, len};
+		UsbCommand cStatus = {CMD_SMART_RAW, {SC_RAW, sizeof(getstatus), 0}};	
+		memcpy(cStatus.d.asBytes, getstatus, sizeof(getstatus) );
+		clearCommandBuffer();
+		SendCommand(&cStatus);
+
+		datalen = smart_wait(data);
+
+		if (datalen < 2 ) {
+			goto out;
+		}
+
+		if (datalen > 2 && data[0] != ISO7816_GETSTATUS) {
+			PrintAndLogEx(ERR, "GetResponse ACK error. len=0x%x data[0]=%02x", len, data[0]);	
+			datalen = 0;
+			goto out;
+		}
+		
+		if (datalen != len + 2 + 1) { // 2 - response, 1 - ACK
+			PrintAndLogEx(WARNING, "GetResponse wrong length. Must be: 0x%02x but: 0x%02x", len, datalen - 3);	
+		}
+	}
+	
+	if (datalen > 2) {
+		datalen--;
+		memmove(data, &data[1], datalen);
+	}
+out:
 	return datalen;
 }
 
@@ -227,7 +254,7 @@ int CmdSmartRaw(const char *Cmd) {
 		if ( !buf )
 			return 1;		
 		
-		int len = smart_response(buf);
+		int len = smart_response(data[1], buf);
 		if ( len < 0 ) {
 			free(buf);
 			return 2;
@@ -239,7 +266,7 @@ int CmdSmartRaw(const char *Cmd) {
 			memcpy(c.d.asBytes, data, sizeof(data) );
 			clearCommandBuffer();
 			SendCommand(&c);
-			len = smart_response(buf);
+			len = smart_response(data[1], buf);
 
 			data[4] = 0;
 		}
@@ -267,12 +294,29 @@ int ExchangeAPDUSC(uint8_t *datain, int datainlen, bool activateCard, bool leave
 	clearCommandBuffer();
 	SendCommand(&c);	
 	
-	int len = smart_response(dataout);
+	int len = smart_response(datain[1], dataout);
 	
 	if ( len < 0 ) {
 		return 2;
 	}
 	
+	// retry
+	if (len > 1 && dataout[len - 2] == 0x6c && datainlen > 4) {
+		UsbCommand c2 = {CMD_SMART_RAW, {SC_RAW, datainlen, 0}};	
+		memcpy(c2.d.asBytes, datain, datainlen);
+		
+		int vlen = 5 + datain[4];
+		if (datainlen == vlen)
+			datainlen++;
+		
+		c2.d.asBytes[vlen] = dataout[len - 1];
+		
+		clearCommandBuffer();
+		SendCommand(&c2);	
+		
+		len = smart_response(datain[1], dataout);
+	}	
+	
 	*dataoutlen = len;
 
 	return 0;
@@ -569,7 +613,7 @@ int CmdSmartBruteforceSFI(const char *Cmd) {
 			clearCommandBuffer();
 			SendCommand(&c);
 			
-			smart_response(buf);
+			smart_response(data[1], buf);
 			
 			// if 0x6C
 			if ( buf[0] == 0x6C ) {
@@ -578,7 +622,7 @@ int CmdSmartBruteforceSFI(const char *Cmd) {
 				memcpy(c.d.asBytes, data, sizeof(data) );
 				clearCommandBuffer();
 				SendCommand(&c);
-				uint8_t len = smart_response(buf);
+				uint8_t len = smart_response(data[1], buf);
 				
 				// TLV decoder
 				if (len > 4)

From 17d0194aeaea402ca09464e0537db99c384bf4d5 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Thu, 6 Dec 2018 19:47:57 +0200
Subject: [PATCH 0299/1938] small fix and block scan command

---
 client/emv/cmdemv.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index 4ab8a8a56..0ddf4e035 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -707,16 +707,16 @@ int CmdEMVExec(const char *cmd) {
 	bool forceSearch = arg_get_lit(5);
 
 	enum TransactionType TrType = TT_MSD;
-	if (arg_get_lit(6))
-					TrType = TT_QVSDCMCHIP;
 	if (arg_get_lit(7))
-					TrType = TT_CDA;
+					TrType = TT_QVSDCMCHIP;
 	if (arg_get_lit(8))
+					TrType = TT_CDA;
+	if (arg_get_lit(9))
 		TrType = TT_VSDC;
 
-	bool GenACGPO = arg_get_lit(9);
+	bool GenACGPO = arg_get_lit(10);
 	EMVCommandChannel channel = ECC_CONTACTLESS;
-	if (arg_get_lit(10))
+	if (arg_get_lit(11))
 		channel = ECC_CONTACT;
 	CLIParserFree();
 	
@@ -1167,6 +1167,12 @@ int CmdEMVScan(const char *cmd) {
 	
 	SetAPDULogging(showAPDU);
 	
+	// TODO
+	if (channel == ECC_CONTACT) {
+		PrintAndLogEx(ERR, "Do not use contact interface. Exit.");
+		return 1;
+	}
+	
 	// current path + file name
 	if (!strstr(crelfname, ".json"))
 		strcat(crelfname, ".json");

From 80d07bcaac284a936ab50b583d3f594761d53792 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Thu, 6 Dec 2018 20:04:28 +0200
Subject: [PATCH 0300/1938] added code if AIP not found

---
 client/emv/cmdemv.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index 0ddf4e035..647123faf 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -895,11 +895,16 @@ int CmdEMVExec(const char *cmd) {
 		tlvdb_add(tlvRoot, oda); 
 		PrintAndLogEx(NORMAL, "* Input list for Offline Data Authentication added to TLV. len=%d \n", ODAiListLen);
 	}
-	
+
 	// get AIP
+	uint16_t AIP = 0;
 	const struct tlv *AIPtlv = tlvdb_get(tlvRoot, 0x82, NULL);	
-	uint16_t AIP = AIPtlv->value[0] + AIPtlv->value[1] * 0x100;
-	PrintAndLogEx(NORMAL, "* * AIP=%04x", AIP);
+	if (AIPtlv) {
+		AIP = AIPtlv->value[0] + AIPtlv->value[1] * 0x100;
+		PrintAndLogEx(NORMAL, "* * AIP=%04x", AIP);
+	} else {
+		PrintAndLogEx(ERR, "Can't found AIP.");
+	}
 
 	// SDA
 	if (AIP & 0x0040) {

From 04b78600967a0f011827019362d96312012f7a97 Mon Sep 17 00:00:00 2001
From: RFID Research Group <chris@rfidresearchgroup.com>
Date: Fri, 7 Dec 2018 17:36:50 +0100
Subject: [PATCH 0301/1938] Update default_pwd.dic

from https://github.com/Proxmark/proxmark3/pull/735/
---
 client/default_pwd.dic | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/default_pwd.dic b/client/default_pwd.dic
index cdc99b5c4..dd1364385 100644
--- a/client/default_pwd.dic
+++ b/client/default_pwd.dic
@@ -3,6 +3,7 @@
 51243648,
 000D8787,
 19920427,
+65857569,  //chinese "handheld RFID writer" blue cloner from circa 2013 (also sold by xfpga.com)
 # ref. http://kazus.ru/forums/showpost.php?p=1045937&postcount=77
 05D73B9F,
 # ref. http://www.proxmark.org/forum/viewtopic.php?=

From 384a277b43d51100fdc6f510ff4fc18dd9f1e0a9 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Fri, 7 Dec 2018 19:58:22 +0200
Subject: [PATCH 0302/1938] added basic atr decode

---
 client/cmdsmartcard.c | 103 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 103 insertions(+)

diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index db3c69f0e..06846b824 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -72,6 +72,106 @@ int usage_sm_brute(void) {
 	return 0;
 }
 
+static int PrintATR(uint8_t *atr, size_t atrlen) {
+	uint8_t vxor = 0;
+	for (int i = 1; i < atrlen; i++)
+		vxor ^= atr[i];
+	
+	if (vxor)
+		PrintAndLogEx(WARNING, "Check summ error. Must be 0 but: 0x%02x", vxor);
+	else
+		PrintAndLogEx(INFO, "Check summ OK.");
+
+	if (atr[0] != 0x3b)
+		PrintAndLogEx(WARNING, "Not a direct convention: 0x%02x", atr[0]);
+	
+	uint8_t T0 = atr[1];
+	uint8_t K = T0 & 0x0F;
+	uint8_t TD1 = 0;
+	
+	uint8_t T1len = 0;
+	uint8_t TD1len = 0;
+	uint8_t TDilen = 0;
+	
+	if (T0 & 0x10) {
+		PrintAndLog("TA1 (Maximum clock frequency, proposed bit duration): 0x%02x", atr[2 + T1len]);
+		T1len++;
+	}
+	if (T0 & 0x20) {
+		PrintAndLog("TB1 (Deprecated: VPP requirements): 0x%02x", atr[2 + T1len]);
+		T1len++;
+	}
+	if (T0 & 0x40) {
+		PrintAndLog("TC1 (Extra delay between bytes required by card): 0x%02x", atr[2 + T1len]);
+		T1len++;
+	}
+	if (T0 & 0x80) {
+		PrintAndLog("TD1 (First offered transmission protocol, presence of TA2..TD2): 0x%02x", atr[2 + T1len]);
+		TD1 = atr[2 + T1len];
+		T1len++;
+		
+		if (TD1 & 0x10) {
+			PrintAndLog("TA2 (Specific protocol and parameters to be used after the ATR): 0x%02x", atr[2 + T1len + TD1len]);
+			TD1len++;
+		}
+		if (TD1 & 0x20) {
+			PrintAndLog("TB2 (Deprecated: VPP precise voltage requirement): 0x%02x", atr[2 + T1len + TD1len]);
+			TD1len++;
+		}
+		if (TD1 & 0x40) {
+			PrintAndLog("TC2 (Maximum waiting time for protocol T=0): 0x%02x", atr[2 + T1len + TD1len]);
+			TD1len++;
+		}
+		if (TD1 & 0x80) {
+			PrintAndLog("TD2 (A supported protocol or more global parameters, presence of TA3..TD3): 0x%02x", atr[2 + T1len + TD1len]);
+			uint8_t TDi = atr[2 + T1len + TD1len];
+			TD1len++;
+
+			bool nextCycle = true;
+			uint8_t vi = 3;
+			while (nextCycle) {
+				nextCycle = false;
+				if (TDi & 0x10) {
+					PrintAndLog("TA%d: 0x%02x", vi, atr[2 + T1len + TD1len + TDilen]);
+					TDilen++;
+				}
+				if (TDi & 0x20) {
+					PrintAndLog("TB%d: 0x%02x", vi, atr[2 + T1len + TD1len + TDilen]);
+					TDilen++;
+				}
+				if (TDi & 0x40) {
+					PrintAndLog("TC%d: 0x%02x", vi, atr[2 + T1len + TD1len + TDilen]);
+					TDilen++;
+				}
+				if (TDi & 0x80) {
+					PrintAndLog("TD%d: 0x%02x", vi, atr[2 + T1len + TD1len + TDilen]);
+					TDi = atr[2 + T1len + TD1len + TDilen];
+					TDilen++;
+					
+					nextCycle = true;
+					vi++;
+				}
+			}
+		}
+	}
+	
+	uint8_t calen = 2 + T1len + TD1len + TDilen + K;
+	
+	if (atrlen != calen && atrlen != calen + 1)  // may be CRC
+		PrintAndLogEx(ERR, "ATR length error. len: %d, T1len: %d, TD1len: %d, TDilen: %d, K: %d", atrlen, T1len, TD1len, TDilen, K);
+	else
+		PrintAndLogEx(INFO, "ATR length OK.");
+	
+	PrintAndLog("Historical bytes len: 0x%02x", K);
+	if (K > 0)
+		PrintAndLog("The format of historical bytes: %02x", atr[2 + T1len + TD1len + TDilen]);
+	if (K > 1)
+		PrintAndLog("Historical bytes: %s", sprint_hex(&atr[2 + T1len + TD1len + TDilen], K));
+	
+	return 0;
+}
+
+
 static bool smart_select(bool silent) {
 	UsbCommand c = {CMD_SMART_ATR, {0, 0, 0}};
 	clearCommandBuffer();
@@ -475,6 +575,9 @@ int CmdSmartInfo(const char *Cmd){
 	PrintAndLogEx(INFO, "ISO76183 ATR : %s", sprint_hex(card.atr, card.atr_len));
 	PrintAndLogEx(INFO, "look up ATR");
 	PrintAndLogEx(INFO, "http://smartcard-atr.appspot.com/parse?ATR=%s", sprint_hex_inrow(card.atr, card.atr_len) );
+	PrintAndLogEx(INFO, "");
+	PrintAndLogEx(INFO, "ATR:");
+	PrintATR(card.atr, card.atr_len);
 	return 0;
 }
 

From 7ceac11308a1f1f8a957e83a07ec1378f1c21786 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Fri, 7 Dec 2018 20:11:40 +0100
Subject: [PATCH 0303/1938] chg: Added some more Mifare sector trailer decoding
 (@Fl0-0)

---
 client/cmdhfmf.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 8653a8994..d46344451 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -624,6 +624,15 @@ int CmdHF14AMfRdSc(const char *Cmd) {
 				PrintAndLogEx(NORMAL, "data   : %s", sprint_hex(data + i * 16, 16));
 			}
 			PrintAndLogEx(NORMAL, "trailer: %s", sprint_hex(data + (sectorNo<32?3:15) * 16, 16));
+					
+			PrintAndLogEx(NORMAL, "Trailer decoded:");
+            int bln = mfFirstBlockOfSector(sectorNo);
+			int blinc = (mfNumBlocksPerSector(sectorNo) > 4) ? 5 : 1;
+            for (i = 0; i < 4; i++) {
+                PrintAndLogEx(NORMAL, "Access block %d%s: %s", bln, ((blinc > 1) && (i < 3) ? "+" : "") , mfGetAccessConditionsDesc(i, &(data + (sectorNo<32?3:15) * 16)[6]));
+                bln += blinc;
+            }
+            PrintAndLogEx(NORMAL, "UserData: %s", sprint_hex_inrow(&(data + (sectorNo<32?3:15) * 16)[9], 1));
 		}
 	} else {
 		PrintAndLogEx(WARNING, "Command execute timeout");

From 16bfd49b8d4bcfe33c8e9fae7636ef34c52acc36 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 10 Dec 2018 08:48:39 +0100
Subject: [PATCH 0304/1938] CHG: 'hf 14a' - update to vendors list.  (thanks to
 @horrordash for pointing it out)

See also:
http://isotc.iso.org/livelink/livelink?func=ll&objId=10432471&objAction=Open&nexturl=%2Flivelink%2Flivelink%3Ffunc%3Dll%26objId%3D8915579%26objAction%3Dbrowse%26viewType%3D1
---
 client/cmdhf14a.c | 44 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 42a941ffa..b9d7bfcae 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -85,7 +85,49 @@ static const manufactureName manufactureMapping[] = {
 	{ 0x42, "3Alogics Inc Korea" },
 	{ 0x43, "Top TroniQ Asia Limited Hong Kong" },
 	{ 0x44, "Gentag Inc. USA" },
-	{ 0x56, "Sensible Object. UK" },
+	{ 0x45, "Invengo Information Technology Co.Ltd China" },
+	{ 0x46, "Guangzhou Sysur Microelectronics, Inc China" },
+	{ 0x47, "CEITEC S.A. Brazil" },
+	{ 0x48, "Shanghai Quanray Electronics Co. Ltd. China" },
+	{ 0x49, "MediaTek Inc Taiwan" },
+	{ 0x4A, "Angstrem PJSC Russia" },
+	{ 0x4B, "Celisic Semiconductor (Hong Kong) Limited China" },
+	{ 0x4C, "LEGIC Identsystems AG Switzerland" },
+	{ 0x4D, "Balluff GmbH Germany" },
+	{ 0x4E, "Oberthur Technologies France" },
+	{ 0x4F, "Silterra Malaysia Sdn. Bhd. Malaysia" },
+	{ 0x50, "DELTA Danish Electronics, Light & Acoustics Denmark" },
+	{ 0x51, "Giesecke & Devrient GmbH Germany" },
+	{ 0x52, "Shenzhen China Vision Microelectronics Co., Ltd. China" },
+	{ 0x53, "Shanghai Feiju Microelectronics Co. Ltd. China" },
+	{ 0x54, "Intel Corporation USA" },
+	{ 0x55, "Microsensys GmbH Germany" },
+	{ 0x56, "Sonix Technology Co., Ltd. Taiwan" },
+	{ 0x57, "Qualcomm Technologies Inc USA" },
+	{ 0x58, "Realtek Semiconductor Corp Taiwan" },
+	{ 0x59, "Freevision Technologies Co. Ltd China" },
+	{ 0x5A, "Giantec Semiconductor Inc. China" },
+	{ 0x5B, "JSC Angstrem-T Russia" },
+	{ 0x5C, "STARCHIP France" },
+	{ 0x5D, "SPIRTECH France" },
+	{ 0x5E, "GANTNER Electronic GmbH Austria" },
+	{ 0x5F, "Nordic Semiconductor Norway" },
+	{ 0x60, "Verisiti Inc USA" },
+	{ 0x61, "Wearlinks Technology Inc. China" },
+	{ 0x62, "Userstar Information Systems Co., Ltd Taiwan" },
+	{ 0x63, "Pragmatic Printing Ltd. UK" },
+	{ 0x64, "Associacao do Laboratorio de Sistemas Integraveis Tecnologico – LSI-TEC Brazil" },
+	{ 0x65, "Tendyron Corporation China" },
+	{ 0x66, "MUTO Smart Co., Ltd. Korea" },
+	{ 0x67, "ON Semiconductor USA" },
+	{ 0x68, "TUBITAK BILGEM Turkey" },
+	{ 0x69, "Huada Semiconductor Co., Ltd China" },
+	{ 0x6A, "SEVENEY France" },
+	{ 0x6B, "ISSM France" },
+	{ 0x6C, "Wisesec Ltd Israel" },
+	{ 0x7C, "DB HiTek Co Ltd Korea" },
+	{ 0x7D, "SATO Vicinity Australia" },
+	{ 0x7E, "Holtek Taiwan" },	
 	{ 0x00, "no tag-info available" } // must be the last entry
 };
 

From ec17cade36ddd77edfa10b7b3869802843f33ab8 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Mon, 10 Dec 2018 15:01:00 +0200
Subject: [PATCH 0305/1938] added TA1 decoding

---
 client/cmdsmartcard.c | 115 +++++++++++++++++++++++++++++++++++++++---
 client/cmdsmartcard.h |   3 +-
 2 files changed, 110 insertions(+), 8 deletions(-)

diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index 06846b824..e05fe2279 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -72,6 +72,91 @@ int usage_sm_brute(void) {
 	return 0;
 }
 
+uint8_t GetATRTA1(uint8_t *atr, size_t atrlen) {
+	if (atrlen > 2) {		
+		uint8_t T0 = atr[1];
+		if (T0 & 0x10)
+			return atr[2];
+	}
+	
+	return 0x11; // default value is �0x11�, corresponding to fmax=5 MHz, Fi=372, Di=1.
+}
+
+int DiArray[] = {
+	0,  // b0000 RFU
+	1,  // b0001
+	2,
+	4,
+	8,
+	16,
+	32,  // b0110
+	64,  // b0111. This was RFU in ISO/IEC 7816-3:1997 and former. Some card readers or drivers may erroneously reject cards using this value
+	12,
+	20,
+	0,   // b1010 RFU
+	0,
+	0,   // ...
+	0,
+	0,
+	0    // b1111 RFU
+};
+
+int FiArray[] = {
+	372,    // b0000 Historical note: in ISO/IEC 7816-3:1989, this was assigned to cards with internal clock
+	372,    // b0001
+	558,    // b0010
+	744,    // b0011
+	1116,   // b0100
+	1488,   // b0101
+	1860,   // b0110
+	0,      // b0111 RFU
+	0,      // b1000 RFU
+	512,    // b1001
+	768,    // b1010
+	1024,   // b1011
+	1536,   // b1100
+	2048,   // b1101
+	0,      // b1110 RFU
+	0       // b1111 RFU
+};
+
+float FArray[] = {
+	4,    // b0000 Historical note: in ISO/IEC 7816-3:1989, this was assigned to cards with internal clock
+	5,    // b0001
+	6,    // b0010
+	8,    // b0011
+	12,   // b0100
+	16,   // b0101
+	20,   // b0110
+	0,    // b0111 RFU
+	0,    // b1000 RFU
+	5,    // b1001
+	7.5,  // b1010
+	10,   // b1011
+	15,   // b1100
+	20,   // b1101
+	0,    // b1110 RFU
+	0     // b1111 RFU
+};
+
+int GetATRDi(uint8_t *atr, size_t atrlen) {
+	uint8_t TA1 = GetATRTA1(atr, atrlen);
+	
+	return DiArray[TA1 & 0x0f];  // The 4 low-order bits of TA1 (4th MSbit to 1st LSbit) encode Di 
+}
+
+int GetATRFi(uint8_t *atr, size_t atrlen) {
+	uint8_t TA1 = GetATRTA1(atr, atrlen);
+
+	return FiArray[TA1 >> 4];  // The 4 high-order bits of TA1 (8th MSbit to 5th LSbit) encode fmax and Fi
+}
+
+float GetATRF(uint8_t *atr, size_t atrlen) {
+	uint8_t TA1 = GetATRTA1(atr, atrlen);
+
+	return FArray[TA1 >> 4];  // The 4 high-order bits of TA1 (8th MSbit to 5th LSbit) encode fmax and Fi
+}
+
 static int PrintATR(uint8_t *atr, size_t atrlen) {
 	uint8_t vxor = 0;
 	for (int i = 1; i < atrlen; i++)
@@ -106,8 +191,8 @@ static int PrintATR(uint8_t *atr, size_t atrlen) {
 		T1len++;
 	}
 	if (T0 & 0x80) {
-		PrintAndLog("TD1 (First offered transmission protocol, presence of TA2..TD2): 0x%02x", atr[2 + T1len]);
 		TD1 = atr[2 + T1len];
+		PrintAndLog("TD1 (First offered transmission protocol, presence of TA2..TD2): 0x%02x. Protocol T=%d", TD1, TD1 & 0x0f);
 		T1len++;
 		
 		if (TD1 & 0x10) {
@@ -123,8 +208,8 @@ static int PrintATR(uint8_t *atr, size_t atrlen) {
 			TD1len++;
 		}
 		if (TD1 & 0x80) {
-			PrintAndLog("TD2 (A supported protocol or more global parameters, presence of TA3..TD3): 0x%02x", atr[2 + T1len + TD1len]);
 			uint8_t TDi = atr[2 + T1len + TD1len];
+			PrintAndLog("TD2 (A supported protocol or more global parameters, presence of TA3..TD3): 0x%02x. Protocol T=%d", TDi, TDi & 0x0f);
 			TD1len++;
 
 			bool nextCycle = true;
@@ -144,8 +229,8 @@ static int PrintATR(uint8_t *atr, size_t atrlen) {
 					TDilen++;
 				}
 				if (TDi & 0x80) {
-					PrintAndLog("TD%d: 0x%02x", vi, atr[2 + T1len + TD1len + TDilen]);
 					TDi = atr[2 + T1len + TD1len + TDilen];
+					PrintAndLog("TD%d: 0x%02x. Protocol T=%d", vi, TDi, TDi & 0x0f);
 					TDilen++;
 					
 					nextCycle = true;
@@ -165,8 +250,10 @@ static int PrintATR(uint8_t *atr, size_t atrlen) {
 	PrintAndLog("Historical bytes len: 0x%02x", K);
 	if (K > 0)
 		PrintAndLog("The format of historical bytes: %02x", atr[2 + T1len + TD1len + TDilen]);
-	if (K > 1)
-		PrintAndLog("Historical bytes: %s", sprint_hex(&atr[2 + T1len + TD1len + TDilen], K));
+	if (K > 1) {
+		PrintAndLog("Historical bytes:");
+		dump_buffer(&atr[2 + T1len + TD1len + TDilen], K, NULL, 1);
+	}
 	
 	return 0;
 }
@@ -575,9 +662,23 @@ int CmdSmartInfo(const char *Cmd){
 	PrintAndLogEx(INFO, "ISO76183 ATR : %s", sprint_hex(card.atr, card.atr_len));
 	PrintAndLogEx(INFO, "look up ATR");
 	PrintAndLogEx(INFO, "http://smartcard-atr.appspot.com/parse?ATR=%s", sprint_hex_inrow(card.atr, card.atr_len) );
-	PrintAndLogEx(INFO, "");
-	PrintAndLogEx(INFO, "ATR:");
+	PrintAndLogEx(NORMAL, "");
+	PrintAndLogEx(NORMAL, "* ATR:");
 	PrintATR(card.atr, card.atr_len);
+	PrintAndLogEx(NORMAL, "");
+	PrintAndLogEx(NORMAL, "* D/F (TA1):");
+	int Di = GetATRDi(card.atr, card.atr_len);
+	int Fi = GetATRFi(card.atr, card.atr_len);
+	float F = GetATRF(card.atr, card.atr_len);
+	if (GetATRTA1(card.atr, card.atr_len) == 0x11)
+		PrintAndLogEx(INFO, "Using default values...");
+	PrintAndLogEx(NORMAL, "Di=%d", Di);
+	PrintAndLogEx(NORMAL, "Fi=%d", Fi);
+	PrintAndLogEx(NORMAL, "F=%.1f MHz", F);
+	PrintAndLogEx(NORMAL, "Cycles/ETU=%d", Fi/Di);
+	PrintAndLogEx(NORMAL, "%.1f bits/sec at 4MHz", (float)4000000 / (Fi/Di));
+	PrintAndLogEx(NORMAL, "%.1f bits/sec at Fmax=%.1fMHz", (F * 1000000) / (Fi/Di), F);
+	
 	return 0;
 }
 
diff --git a/client/cmdsmartcard.h b/client/cmdsmartcard.h
index 8cc0ae851..cffaeff98 100644
--- a/client/cmdsmartcard.h
+++ b/client/cmdsmartcard.h
@@ -21,9 +21,10 @@
 #include "common.h"
 #include "util.h"
 #include "loclass/fileutils.h"	// saveFile
-#include "comms.h"			// getfromdevice
+#include "comms.h"				// getfromdevice
 #include "emv/emvcore.h"		// decodeTVL
 #include "emv/apduinfo.h"		// APDUcode description
+#include "emv/dump.h"			// dump_buffer
 
 extern int CmdSmartcard(const char *Cmd);
 

From b06054732bce7e64ac7623d8a58eed393468e15c Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Mon, 10 Dec 2018 15:04:03 +0200
Subject: [PATCH 0306/1938] code format

---
 client/cmdsmartcard.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index e05fe2279..d97451e47 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -662,9 +662,13 @@ int CmdSmartInfo(const char *Cmd){
 	PrintAndLogEx(INFO, "ISO76183 ATR : %s", sprint_hex(card.atr, card.atr_len));
 	PrintAndLogEx(INFO, "look up ATR");
 	PrintAndLogEx(INFO, "http://smartcard-atr.appspot.com/parse?ATR=%s", sprint_hex_inrow(card.atr, card.atr_len) );
+
+	// print ATR
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "* ATR:");
 	PrintATR(card.atr, card.atr_len);
+	
+	// print D/F (brom byte TA1 or defaults)
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "* D/F (TA1):");
 	int Di = GetATRDi(card.atr, card.atr_len);
@@ -672,6 +676,7 @@ int CmdSmartInfo(const char *Cmd){
 	float F = GetATRF(card.atr, card.atr_len);
 	if (GetATRTA1(card.atr, card.atr_len) == 0x11)
 		PrintAndLogEx(INFO, "Using default values...");
+	
 	PrintAndLogEx(NORMAL, "Di=%d", Di);
 	PrintAndLogEx(NORMAL, "Fi=%d", Fi);
 	PrintAndLogEx(NORMAL, "F=%.1f MHz", F);

From 1ffddb2578751af93d49cf3e24952689e7526989 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 13 Dec 2018 23:34:30 +0100
Subject: [PATCH 0307/1938] CHG: 'hf mfu dump' - simplify bin saving and added
 JSON dump format

---
 client/cmdhfmfu.c          | 42 ++++++++++++-------------------
 client/cmdhfmfu.h          |  3 +++
 client/loclass/fileutils.c | 51 ++++++++++++++++++++++++++++++++++++++
 client/loclass/fileutils.h |  2 ++
 4 files changed, 72 insertions(+), 26 deletions(-)

diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index 327069971..b5be04593 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -1553,7 +1553,6 @@ int usage_hf_mfu_pwdgen(void){
 	return 0;
 }
 
-#define DUMP_PREFIX_LENGTH 48 
 void printMFUdump(mfu_dump_t* card) {
 	printMFUdumpEx(card, 255, 0);
 }
@@ -1659,9 +1658,9 @@ void printMFUdumpEx(mfu_dump_t* card, uint16_t pages, uint8_t startpage) {
 //  Read and Dump Card Contents,  using auto detection of tag size.
 int CmdHF14AMfUDump(const char *Cmd){
 
-	FILE *fout;
+	uint8_t fileNameLen = 0;
 	char filename[FILE_PATH_SIZE] = {0x00};
-	char *fnameptr = filename;
+	char *fptr = filename;
 
 	uint8_t data[1024] = {0x00};
 	memset(data, 0x00, sizeof(data));
@@ -1674,7 +1673,7 @@ int CmdHF14AMfUDump(const char *Cmd){
 	uint8_t authenticationkey[16] = {0x00};
 	memset(authenticationkey, 0x00, sizeof(authenticationkey));
 	uint8_t	*authKeyPtr = authenticationkey;
-	size_t fileNlen = 0;
+
 	bool errors = false;
 	bool swapEndian = false;
 	bool manualPages = false;
@@ -1703,9 +1702,7 @@ int CmdHF14AMfUDump(const char *Cmd){
 			cmdp++;
 			break;
 		case 'f':
-			fileNlen = param_getstr(Cmd, cmdp+1, filename, sizeof(filename));
-			if (!fileNlen) errors = true; 
-			if (fileNlen > FILE_PATH_SIZE-5) fileNlen = FILE_PATH_SIZE-5;
+			fileNameLen = param_getstr(Cmd, cmdp+1, filename, sizeof(filename));
 			cmdp += 2;
 			break;
 		case 'p': //set start page
@@ -1785,9 +1782,9 @@ int CmdHF14AMfUDump(const char *Cmd){
 		
 	pages = bufferSize/4;
 	
-	uint8_t	get_pack[] = {0,0};
 	iso14a_card_select_t card;
 	mfu_dump_t dump_file_data;
+	uint8_t	get_pack[] = {0,0};
 	uint8_t get_version[] = {0,0,0,0,0,0,0,0};
 	uint8_t	get_tearing[] = {0,0,0};
 	uint8_t	get_counter[] = {0,0,0};
@@ -1801,8 +1798,8 @@ int CmdHF14AMfUDump(const char *Cmd){
 		//attempt to read pack
 		if (!ul_auth_select( &card, tagtype, true, authKeyPtr, get_pack, sizeof(get_pack))) {
 			//reset pack
-			get_pack[0]=0;
-			get_pack[1]=0;
+			get_pack[0] = 0;
+			get_pack[1] = 0;
 		}
 		DropField();
 		
@@ -1864,23 +1861,16 @@ int CmdHF14AMfUDump(const char *Cmd){
 	printMFUdumpEx(&dump_file_data, pages, startPage);
 	
 	// user supplied filename?
-	if (fileNlen < 1) {
-		// UID = data 0-1-2 4-5-6-7  (skips a beat)
-		sprintf(fnameptr,"%02X%02X%02X%02X%02X%02X%02X.bin",
-			data[0],data[1], data[2], data[4],data[5],data[6], data[7]);
-	} else {
-		sprintf(fnameptr + fileNlen,".bin");
-	}
+	if (fileNameLen < 1) {
 
-	if ((fout = fopen(filename,"wb")) == NULL) { 
-		PrintAndLogEx(WARNING, "Could not create file name %s", filename);
-		return 1;
-	}
-	fwrite( &dump_file_data, 1, pages*4 + DUMP_PREFIX_LENGTH, fout );
-	if (fout)
-		fclose(fout);
-		
-	PrintAndLogEx(SUCCESS, "Dumped %d pages, wrote %d bytes to %s", pages + (DUMP_PREFIX_LENGTH/4), pages*4 + DUMP_PREFIX_LENGTH, filename);
+		PrintAndLogEx(INFO, "Using UID as filename");
+	
+		fptr += sprintf(fptr, "hf-mfu-"); 
+		FillFileNameByUID(fptr, card.uid, "-dump", card.uidlen);
+	}	
+	uint16_t datalen = pages*4 + DUMP_PREFIX_LENGTH;
+	saveFile(filename, "bin", (uint8_t*)&dump_file_data, datalen);
+	saveFileJSON(filename, "json", jsfMfuMemory, (uint8_t*)&dump_file_data, datalen);
 	
 	if ( is_partial ) 
 		PrintAndLogEx(WARNING, "Partial dump created. (%d of %d blocks)", pages, card_mem_size);
diff --git a/client/cmdhfmfu.h b/client/cmdhfmfu.h
index 491218b1b..b03444839 100644
--- a/client/cmdhfmfu.h
+++ b/client/cmdhfmfu.h
@@ -10,6 +10,9 @@
 #include "util.h"
 #include "protocols.h"
 #include "comms.h"
+#include "loclass/fileutils.h"
+
+#define DUMP_PREFIX_LENGTH 48 
 
 typedef struct {
 	uint8_t version[8];
diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index 367b19c97..b099d6a35 100644
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -208,6 +208,34 @@ int saveFileJSON(const char *preferredName, const char *suffix, JSONFileType fty
 				}
 			}
 			break;
+		case jsfMfuMemory:
+			JsonSaveStr(root, "FileType", "mfu");
+
+			mfu_dump_t* tmp = (mfu_dump_t*)data;
+
+			uint8_t uid[7] = {0};
+			memcpy(uid, tmp->data, 3);
+			memcpy(uid+3, tmp->data+4, 4);
+			
+			JsonSaveBufAsHexCompact(root, "$.Card.UID", uid, sizeof(uid));
+			JsonSaveBufAsHexCompact(root, "$.Card.Version", tmp->version, sizeof(tmp->version));
+			JsonSaveBufAsHexCompact(root, "$.Card.TBO_0", tmp->tbo, sizeof(tmp->tbo));
+			JsonSaveBufAsHexCompact(root, "$.Card.Tearing", tmp->tearing, sizeof(tmp->tearing));
+			JsonSaveBufAsHexCompact(root, "$.Card.Pack",  tmp->pack, sizeof(tmp->pack));
+			JsonSaveBufAsHexCompact(root, "$.Card.TBO_1", tmp->tbo1, sizeof(tmp->tbo1));
+			JsonSaveBufAsHexCompact(root, "$.Card.Signature", tmp->signature, sizeof(tmp->signature));
+			JsonSaveStr(root, "$.Card.Counter", "N/A");
+
+			// size of header 48b
+			size_t len = (datalen - DUMP_PREFIX_LENGTH) / 4;
+
+			for (int i = 0; i < len; i++) {
+
+				char path[PATH_MAX_LENGTH] = {0};
+				sprintf(path, "$.blocks.%d", i);
+				JsonSaveBufAsHexCompact(root, path, tmp->data + (i * 4), 4);				
+			}
+		break;
 	}
 
 	int res = json_dump_file(root, fileName, JSON_INDENT(2));
@@ -395,6 +423,29 @@ int loadFileJSON(const char *preferredName, const char *suffix, void* data, size
 		*datalen = sptr;
 	}
 
+	if (!strcmp(ctype, "mfu")) {
+		size_t sptr = 0;
+		for (int i = 0; i < 256; i++) {
+			if (sptr + 4 > maxdatalen) {
+				retval = 5;
+				goto out;
+			}
+
+			char path[30] = {0};
+			sprintf(path, "$.blocks.%d", i);
+			
+			size_t len = 0;
+			JsonLoadBufAsHex(root, path, &udata[sptr], 4, &len);
+			if (!len)
+				break;
+			
+			sptr += len;
+		}
+		
+		*datalen = sptr;
+	}
+
+	
 	PrintAndLog("Loaded JSON: (%s) OK.", fileName);
 out:	
 	json_decref(root);
diff --git a/client/loclass/fileutils.h b/client/loclass/fileutils.h
index 3852b4bf4..b73f5fc30 100644
--- a/client/loclass/fileutils.h
+++ b/client/loclass/fileutils.h
@@ -49,10 +49,12 @@
 #include "../ui.h"
 #include "../emv/emvjson.h"
 #include "mifare4.h"
+#include "cmdhfmfu.h"
 
 typedef enum {
 	jsfRaw,
 	jsfCardMemory,
+	jsfMfuMemory,
 } JSONFileType;
 
 int fileExists(const char *filename);

From edcb029af3cdf486faac82653a0abde53dc25d4a Mon Sep 17 00:00:00 2001
From: mazodude <mazodude2000@gmail.com>
Date: Fri, 14 Dec 2018 15:31:50 +1000
Subject: [PATCH 0308/1938] Add script to test for MADs

---
 client/scripts/mifare_ad.lua | 186 +++++++++++++++++++++++++++++++++++
 1 file changed, 186 insertions(+)
 create mode 100644 client/scripts/mifare_ad.lua

diff --git a/client/scripts/mifare_ad.lua b/client/scripts/mifare_ad.lua
new file mode 100644
index 000000000..0f9c8219d
--- /dev/null
+++ b/client/scripts/mifare_ad.lua
@@ -0,0 +1,186 @@
+
+-- Ability to read what card is there
+local getopt = require('getopt')
+local cmds = require('commands')
+local taglib = require('taglib')
+
+local desc = 
+[[This script will automatically check Mifare cards for MADs
+(Mifare Application Directory)
+
+Arguments:
+	-d 				debug logging on
+	-h 				this help
+
+]]
+local example = "script run xxx"
+local author = "Mazodude"
+---
+-- PrintAndLog
+function prlog(...)
+	print(...)
+end
+--- 
+-- This is only meant to be used when errors occur
+function oops(err)
+	prlog("ERROR: ",err)
+	return nil,err
+end
+
+--- 
+-- Usage help
+function help()
+	prlog(desc)
+	prlog("Example usage")
+	prlog(example)
+end
+
+function debug(...)
+	if DEBUG then 
+		prlog("debug:", ...)
+	end
+end
+
+
+local function show(data)
+	if DEBUG then
+	    local formatString = ("H%d"):format(string.len(data))
+	    local _,hexdata = bin.unpack(formatString, data)
+	    debug("Hexdata" , hexdata)
+	end
+end
+--- Fire up a connection with a tag, return uid
+-- @return UID if successfull
+-- @return nil, errormessage if unsuccessfull
+local function open()
+	debug("Opening connection")
+	core.clearCommandBuffer()
+	local x = string.format("hf 14a raw -r -p -s")
+	debug(x)
+	core.console(x)	
+	debug("done")
+	data, err = waitCmd(true)
+	if err then return oops(err) end		
+	show(data)
+	local formatString = ("H%d"):format(string.len(data))
+	local _,uid = bin.unpack(formatString, data)
+	return uid
+end
+--- Shut down tag communication
+-- return no return values
+local function close()
+	debug("Closing connection")
+	core.clearCommandBuffer()
+	local x = string.format("hf 14a raw -r")
+	debug(x)
+	core.console(x)
+	debug("done")
+	--data, err = waitCmd(true)
+	--data, err = waitCmd(false)
+
+end
+
+
+-- waits for answer from pm3 device
+local function checkCommand(command)
+	core.clearCommandBuffer()
+	local usb = command:getBytes()
+	core.SendCommand(usb)
+	local result = core.WaitForResponseTimeout(cmds.CMD_ACK, 1500)
+
+	if result then
+		local count, cmd, arg0 = bin.unpack('LL',result)
+		if(arg0==1) then
+			local count, arg1, arg2, data = bin.unpack('LLH511',result,count)
+			block = data:sub(33,64)
+			return block
+		else
+			return nil
+		end
+	else
+		print("Timeout while waiting for response. Increase TIMEOUT in mifare_ad.lua to wait longer")
+		return nil, "Timeout while waiting for device to respond"
+	end
+end
+
+---_ Gets data from a block
+-- @return block if successfull
+-- @return nil, errormessage if unsuccessfull
+local function getBlock(block)
+	local data, err
+
+	core.clearCommandBuffer()
+
+	-- // params
+	-- uint8_t sectorNo = arg0;
+	-- uint8_t keyType = arg1;
+	-- uint64_t ui64Key = 0;
+	-- ui64Key = bytes_to_num(datain, 6);
+	local sectorNo = 0
+	local keyType = 0
+	local key = "A0A1A2A3A4A5";
+	debug(("Testing to auth with key %s"):format(key))
+	-- prlog(key);
+	local command = Command:new{cmd = cmds.CMD_MIFARE_READSC,
+								arg1 = sectorNo,
+								arg2 = keyType,
+								arg3 = 0,
+								data = key}
+	local data = checkCommand(command)
+	-- debug(command)
+	-- prlog(data)
+	if (data == nil) then return err, ("Could not auth with card - this tag does not have MADs") end
+	if string.len(data) < 32 then
+		return nil, ("Expected at least 32 bytes, got %d - this tag does not have MADs"):format(string.len(data))
+	end
+	-- -- Now, parse out the block data
+	b0 = string.sub(data,3,4)
+	return b0
+end
+
+
+--- This function is a lua-implementation of
+-- cmdhf14a.c:waitCmd(uint8_t iSelect)
+function waitCmd(iSelect)
+	local response = core.WaitForResponseTimeout(cmds.CMD_ACK,1000)
+	if response then
+		local count,cmd,arg0,arg1,arg2 = bin.unpack('LLLL',response)
+		local iLen = arg0
+		if iSelect then	iLen = arg1 end
+	    debug(("Received %i octets (arg0:%d, arg1:%d)"):format(iLen, arg0, arg1))
+	    if iLen == 0 then return nil, "No response from tag" end
+		local recv = string.sub(response,count, iLen+count-1)
+	    return recv
+	end
+	return nil, "No response from device"
+end
+
+
+
+local function main( args)
+	debug("script started")
+	local err, data, data2,k,v,i
+	-- Read the parameters
+	for o, a in getopt.getopt(args, 'hd') do
+		if o == "h" then help() return end
+		if o == "d" then DEBUG = true end
+	end
+
+	local uid = open()
+	if (uid==nil) then oops("No card present") return end
+	print(("UID: %s"):format(uid))
+
+	-- First, get block 1 byte 1
+	local block, err = getBlock(0)
+	if err then return oops(err) end
+	debug(("Checking block 0 sector 1 byte 1"))
+	debug(("Got byte: %s"):format(block))
+	-- prlog(block)
+	if block == "0F" then
+		print('Card has MADs v1')
+	end
+
+	-- Deactivate field
+	close()
+end
+main(args)
\ No newline at end of file

From f77bb94a860e5dfb2a597e3e54e55baf5ed0dce9 Mon Sep 17 00:00:00 2001
From: mazodude <mazodude2000@gmail.com>
Date: Fri, 14 Dec 2018 16:57:51 +1000
Subject: [PATCH 0309/1938] Add changes to script as per iceman's suggestions

---
 client/scripts/mifare_ad.lua | 55 ++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 28 deletions(-)

diff --git a/client/scripts/mifare_ad.lua b/client/scripts/mifare_ad.lua
index 0f9c8219d..7b8321eef 100644
--- a/client/scripts/mifare_ad.lua
+++ b/client/scripts/mifare_ad.lua
@@ -3,6 +3,7 @@
 local getopt = require('getopt')
 local cmds = require('commands')
 local taglib = require('taglib')
+local lib14a = require('read14a')
 
 local desc = 
 [[This script will automatically check Mifare cards for MADs
@@ -15,29 +16,24 @@ Arguments:
 ]]
 local example = "script run xxx"
 local author = "Mazodude"
----
--- PrintAndLog
-function prlog(...)
-	print(...)
-end
 --- 
 -- This is only meant to be used when errors occur
-function oops(err)
-	prlog("ERROR: ",err)
+local function oops(err)
+	print("ERROR: ",err)
 	return nil,err
 end
 
 --- 
 -- Usage help
-function help()
-	prlog(desc)
-	prlog("Example usage")
-	prlog(example)
+local function help()
+	print(desc)
+	print("Example usage")
+	print(example)
 end
 
-function debug(...)
+local function debug(...)
 	if DEBUG then 
-		prlog("debug:", ...)
+		print("debug:", ...)
 	end
 end
 
@@ -53,18 +49,21 @@ end
 -- @return UID if successfull
 -- @return nil, errormessage if unsuccessfull
 local function open()
-	debug("Opening connection")
+	-- debug("Opening connection")
+	-- core.clearCommandBuffer()
+	-- local x = string.format("hf 14a raw -r -p -s")
+	-- debug(x)
+	-- core.console(x)	
+	-- debug("done")
+	-- data, err = waitCmd(true)
+	-- if err then return oops(err) end		
+	-- show(data)
+	-- local formatString = ("H%d"):format(string.len(data))
+	-- local _,uid = bin.unpack(formatString, data)
+	tag, err = lib14a.read(false, true)
+	if not tag then return oops(err) end
 	core.clearCommandBuffer()
-	local x = string.format("hf 14a raw -r -p -s")
-	debug(x)
-	core.console(x)	
-	debug("done")
-	data, err = waitCmd(true)
-	if err then return oops(err) end		
-	show(data)
-	local formatString = ("H%d"):format(string.len(data))
-	local _,uid = bin.unpack(formatString, data)
-	return uid
+	return tag
 end
 --- Shut down tag communication
 -- return no return values
@@ -120,7 +119,7 @@ local function getBlock(block)
 	local keyType = 0
 	local key = "A0A1A2A3A4A5";
 	debug(("Testing to auth with key %s"):format(key))
-	-- prlog(key);
+	-- print(key);
 	local command = Command:new{cmd = cmds.CMD_MIFARE_READSC,
 								arg1 = sectorNo,
 								arg2 = keyType,
@@ -128,7 +127,7 @@ local function getBlock(block)
 								data = key}
 	local data = checkCommand(command)
 	-- debug(command)
-	-- prlog(data)
+	-- print(data)
 	if (data == nil) then return err, ("Could not auth with card - this tag does not have MADs") end
 	if string.len(data) < 32 then
 		return nil, ("Expected at least 32 bytes, got %d - this tag does not have MADs"):format(string.len(data))
@@ -141,7 +140,7 @@ end
 
 --- This function is a lua-implementation of
 -- cmdhf14a.c:waitCmd(uint8_t iSelect)
-function waitCmd(iSelect)
+local function waitCmd(iSelect)
 	local response = core.WaitForResponseTimeout(cmds.CMD_ACK,1000)
 	if response then
 		local count,cmd,arg0,arg1,arg2 = bin.unpack('LLLL',response)
@@ -168,7 +167,7 @@ local function main( args)
 
 	local uid = open()
 	if (uid==nil) then oops("No card present") return end
-	print(("UID: %s"):format(uid))
+	print(("UID: %s"):format(uid.uid))
 
 	-- First, get block 1 byte 1
 	local block, err = getBlock(0)

From d36f3d876b30966a24aab79ab999fd63e1ffe3aa Mon Sep 17 00:00:00 2001
From: mazodude <mazodude2000@gmail.com>
Date: Fri, 14 Dec 2018 20:14:47 +1000
Subject: [PATCH 0310/1938] Remove unneeded function and place code in main

---
 client/scripts/mifare_ad.lua | 28 +++++-----------------------
 1 file changed, 5 insertions(+), 23 deletions(-)

diff --git a/client/scripts/mifare_ad.lua b/client/scripts/mifare_ad.lua
index 7b8321eef..386589068 100644
--- a/client/scripts/mifare_ad.lua
+++ b/client/scripts/mifare_ad.lua
@@ -45,26 +45,6 @@ local function show(data)
 	    debug("Hexdata" , hexdata)
 	end
 end
---- Fire up a connection with a tag, return uid
--- @return UID if successfull
--- @return nil, errormessage if unsuccessfull
-local function open()
-	-- debug("Opening connection")
-	-- core.clearCommandBuffer()
-	-- local x = string.format("hf 14a raw -r -p -s")
-	-- debug(x)
-	-- core.console(x)	
-	-- debug("done")
-	-- data, err = waitCmd(true)
-	-- if err then return oops(err) end		
-	-- show(data)
-	-- local formatString = ("H%d"):format(string.len(data))
-	-- local _,uid = bin.unpack(formatString, data)
-	tag, err = lib14a.read(false, true)
-	if not tag then return oops(err) end
-	core.clearCommandBuffer()
-	return tag
-end
 --- Shut down tag communication
 -- return no return values
 local function close()
@@ -165,9 +145,11 @@ local function main( args)
 		if o == "d" then DEBUG = true end
 	end
 
-	local uid = open()
-	if (uid==nil) then oops("No card present") return end
-	print(("UID: %s"):format(uid.uid))
+	local tag, err = lib14a.read(false, true)
+	if not tag then return oops(err) end
+	core.clearCommandBuffer()
+	if (tag==nil) then oops("No card present") return end
+	print(("UID: %s"):format(tag.uid))
 
 	-- First, get block 1 byte 1
 	local block, err = getBlock(0)

From cecf709fe7aa75a7b69bad8538d1bce322383ffb Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 14 Dec 2018 20:27:11 +0100
Subject: [PATCH 0311/1938] chg: 'script run mifare_ad'  -  minor fix

---
 client/scripts/mifare_ad.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/scripts/mifare_ad.lua b/client/scripts/mifare_ad.lua
index 386589068..385e34338 100644
--- a/client/scripts/mifare_ad.lua
+++ b/client/scripts/mifare_ad.lua
@@ -146,9 +146,8 @@ local function main( args)
 	end
 
 	local tag, err = lib14a.read(false, true)
-	if not tag then return oops(err) end
+	if not tag then return oops("No card present") end
 	core.clearCommandBuffer()
-	if (tag==nil) then oops("No card present") return end
 	print(("UID: %s"):format(tag.uid))
 
 	-- First, get block 1 byte 1
@@ -160,6 +159,7 @@ local function main( args)
 	if block == "0F" then
 		print('Card has MADs v1')
 	end
+	--(iceman) Should be able to detect MAD v2 aswell..
 
 	-- Deactivate field
 	close()

From a963a7834cf9aa6878cad79a3c448c55f03e4965 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 17 Dec 2018 14:01:18 +0100
Subject: [PATCH 0312/1938] FIX: 'mem load' - bad memory allocation CHG: calloc
 fixes

---
 client/cmdflashmem.c | 6 ++++--
 client/cmdhfmf.c     | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/client/cmdflashmem.c b/client/cmdflashmem.c
index 1dd3084d9..2ff68bd3d 100644
--- a/client/cmdflashmem.c
+++ b/client/cmdflashmem.c
@@ -182,9 +182,9 @@ int CmdFlashMemLoad(const char *Cmd){
 	//Validations
 	if (errors || cmdp == 0 ) return usage_flashmem_load();			
 	
-	uint8_t *data = NULL;
+	uint8_t *data = calloc(FLASH_MEM_MAX_SIZE, sizeof(uint8_t));
 	size_t datalen = 0;
-	int res = loadFile(filename, "bin", &data, &datalen);
+	int res = loadFile(filename, "bin", data, &datalen);
 	//int res = loadFileEML( filename, "eml", data, &datalen);
 	if ( res ) {
 		free(data);
@@ -196,6 +196,8 @@ int CmdFlashMemLoad(const char *Cmd){
 		free(data);
 		return 1;
 	}
+	
+	data = realloc(data, datalen);
 
 	//Send to device
 	uint32_t bytes_sent = 0;
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index d46344451..1bfbf10eb 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -2414,7 +2414,7 @@ int CmdHF14AMfELoad(const char *Cmd) {
 
 	param_getstr(Cmd, nameParamNo, filename, sizeof(filename));
 	
-	uint8_t *data = calloc(1, 4096);
+	uint8_t *data = calloc(4096, sizeof(uint8_t));
 	size_t datalen = 0;
 	//int res = loadFile(filename, "bin", data, &datalen);
 	int res = loadFileEML( filename, "eml", data, &datalen);
@@ -2693,7 +2693,7 @@ int CmdHF14AMfCLoad(const char *Cmd) {
 	}
 
 	size_t maxdatalen = 4096;
-	uint8_t *data = calloc(1, maxdatalen);
+	uint8_t *data = calloc(maxdatalen, sizeof(uint8_t));
 	size_t datalen = 0;
 	int res = 0;
 	if (fillFromBin) {

From 1941b9ca8b3d1373ed6283d9b3d6ce8f3e03674f Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Mon, 17 Dec 2018 23:48:05 +0200
Subject: [PATCH 0313/1938] sdd sc raw t0

---
 include/mifare.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/mifare.h b/include/mifare.h
index 63cdf0fb6..6f87a0e6d 100644
--- a/include/mifare.h
+++ b/include/mifare.h
@@ -110,6 +110,7 @@ typedef enum SMARTCARD_COMMAND {
 	SC_NO_DISCONNECT =		(1 << 1),
 	SC_RAW =				(1 << 2),
 	SC_SELECT =				(1 << 3)
+	SC_RAW_T0 =				(1 << 4),
 } smartcard_command_t;
 
 //-----------------------------------------------------------------------------

From 85729d55e7e356ca20504707bca7c479cdec22ab Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Mon, 17 Dec 2018 23:48:30 +0200
Subject: [PATCH 0314/1938] added arm side

---
 common/i2c.c | 4 ++--
 common/i2c.h | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/i2c.c b/common/i2c.c
index ecf5a5bd9..ea830a1bd 100644
--- a/common/i2c.c
+++ b/common/i2c.c
@@ -698,14 +698,14 @@ void SmartCardRaw( uint64_t arg0, uint64_t arg1, uint8_t *data ) {
 		}
 	}
 
-	if ((flags & SC_RAW)) {
+	if ((flags & SC_RAW) || (flags & SC_RAW_T0)) {
 		
 		LogTrace(data, arg1, 0, 0, NULL, true);
 		
 		// Send raw bytes
 		// asBytes = A0 A4 00 00 02
 		// arg1 = len 5
-		bool res = I2C_BufferWrite(data, arg1, I2C_DEVICE_CMD_SEND, I2C_DEVICE_ADDRESS_MAIN);
+		bool res = I2C_BufferWrite(data, arg1, ((flags & SC_RAW_T0) ? I2C_DEVICE_CMD_SEND_T0 : I2C_DEVICE_CMD_SEND), I2C_DEVICE_ADDRESS_MAIN);
 		if ( !res && MF_DBGLEVEL > 3 ) DbpString(I2C_ERROR);		
 		
 		// read bytes from module
diff --git a/common/i2c.h b/common/i2c.h
index 8350029bd..e5ff26e4d 100644
--- a/common/i2c.h
+++ b/common/i2c.h
@@ -17,6 +17,7 @@
 #define I2C_DEVICE_CMD_SETBAUD		0x04
 #define I2C_DEVICE_CMD_SIM_CLC		0x05
 #define I2C_DEVICE_CMD_GETVERSION	0x06
+#define I2C_DEVICE_CMD_SEND_T0		0x07
 
 
 void I2C_recovery(void);

From a759e94af0ca06dd64700c0ae5d19861d26b4896 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Mon, 17 Dec 2018 23:48:56 +0200
Subject: [PATCH 0315/1938] add client side and get rid of reset

---
 client/cmdsmartcard.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index d97451e47..e09ca5b48 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -473,9 +473,9 @@ int ExchangeAPDUSC(uint8_t *datain, int datainlen, bool activateCard, bool leave
 		smart_select(false);
 	printf("* APDU SC\n");
 
-	UsbCommand c = {CMD_SMART_RAW, {SC_RAW | SC_CONNECT, datainlen, 0}};	
+	UsbCommand c = {CMD_SMART_RAW, {SC_RAW_T0, datainlen, 0}};	
 	if (activateCard) {
-		c.arg[0] |= SC_SELECT;
+		c.arg[0] |= SC_SELECT | SC_CONNECT;
 	}
 	memcpy(c.d.asBytes, datain, datainlen);
 	clearCommandBuffer();
@@ -489,7 +489,7 @@ int ExchangeAPDUSC(uint8_t *datain, int datainlen, bool activateCard, bool leave
 	
 	// retry
 	if (len > 1 && dataout[len - 2] == 0x6c && datainlen > 4) {
-		UsbCommand c2 = {CMD_SMART_RAW, {SC_RAW, datainlen, 0}};	
+		UsbCommand c2 = {CMD_SMART_RAW, {SC_RAW_T0, datainlen, 0}};	
 		memcpy(c2.d.asBytes, datain, datainlen);
 		
 		int vlen = 5 + datain[4];

From f32088e25cfa67a4bfe74a6285b84a4bca09e226 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 18 Dec 2018 14:33:28 +0200
Subject: [PATCH 0316/1938] fix states and get rid of INS code in receive (that
 code checks by controller)

---
 client/cmdsmartcard.c | 48 +++++++++++++++++++++----------------------
 include/mifare.h      |  2 +-
 2 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index e09ca5b48..0d4e7a46d 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -306,7 +306,7 @@ static int smart_wait(uint8_t *data) {
 	return len;
 }
 
-static int smart_response(uint8_t apduINS, uint8_t *data) {
+static int smart_response(uint8_t *data) {
 		
 	int datalen = smart_wait(data);	
 	bool needGetData = false;
@@ -315,12 +315,6 @@ static int smart_response(uint8_t apduINS, uint8_t *data) {
 		goto out;
 	}
 
-	if (datalen > 2 && data[0] != apduINS) {
-		PrintAndLogEx(ERR, "Card ACK error. len=0x%x data[0]=%02x", datalen, data[0]);	
-		datalen = 0;
-		goto out;
-	}
-	
 	if ( data[datalen - 2] == 0x61 || data[datalen - 2] == 0x9F ) {
 		needGetData = true;
 	}
@@ -339,22 +333,26 @@ static int smart_response(uint8_t apduINS, uint8_t *data) {
 		if (datalen < 2 ) {
 			goto out;
 		}
-
-		if (datalen > 2 && data[0] != ISO7816_GETSTATUS) {
-			PrintAndLogEx(ERR, "GetResponse ACK error. len=0x%x data[0]=%02x", len, data[0]);	
-			datalen = 0;
-			goto out;
-		}
 		
-		if (datalen != len + 2 + 1) { // 2 - response, 1 - ACK
-			PrintAndLogEx(WARNING, "GetResponse wrong length. Must be: 0x%02x but: 0x%02x", len, datalen - 3);	
+		// data wo ACK
+		if (datalen != len + 2) { 
+			// data with ACK
+			if (datalen == len + 2 + 1) { // 2 - response, 1 - ACK
+				if (data[0] != ISO7816_GETSTATUS) {
+					PrintAndLogEx(ERR, "GetResponse ACK error. len=0x%x data[0]=%02x", len, data[0]);	
+					datalen = 0;
+					goto out;
+				}
+
+				datalen--;
+				memmove(data, &data[1], datalen);
+			} else {
+				// wrong length
+				PrintAndLogEx(WARNING, "GetResponse wrong length. Must be: 0x%02x but: 0x%02x", len, datalen - 3);	
+			}
 		}
 	}
 	
-	if (datalen > 2) {
-		datalen--;
-		memmove(data, &data[1], datalen);
-	}
 out:
 	return datalen;
 }
@@ -441,7 +439,7 @@ int CmdSmartRaw(const char *Cmd) {
 		if ( !buf )
 			return 1;		
 		
-		int len = smart_response(data[1], buf);
+		int len = smart_response(buf);
 		if ( len < 0 ) {
 			free(buf);
 			return 2;
@@ -453,7 +451,7 @@ int CmdSmartRaw(const char *Cmd) {
 			memcpy(c.d.asBytes, data, sizeof(data) );
 			clearCommandBuffer();
 			SendCommand(&c);
-			len = smart_response(data[1], buf);
+			len = smart_response(buf);
 
 			data[4] = 0;
 		}
@@ -481,7 +479,7 @@ int ExchangeAPDUSC(uint8_t *datain, int datainlen, bool activateCard, bool leave
 	clearCommandBuffer();
 	SendCommand(&c);	
 	
-	int len = smart_response(datain[1], dataout);
+	int len = smart_response(dataout);
 	
 	if ( len < 0 ) {
 		return 2;
@@ -501,7 +499,7 @@ int ExchangeAPDUSC(uint8_t *datain, int datainlen, bool activateCard, bool leave
 		clearCommandBuffer();
 		SendCommand(&c2);	
 		
-		len = smart_response(datain[1], dataout);
+		len = smart_response(dataout);
 	}	
 	
 	*dataoutlen = len;
@@ -822,7 +820,7 @@ int CmdSmartBruteforceSFI(const char *Cmd) {
 			clearCommandBuffer();
 			SendCommand(&c);
 			
-			smart_response(data[1], buf);
+			smart_response(buf);
 			
 			// if 0x6C
 			if ( buf[0] == 0x6C ) {
@@ -831,7 +829,7 @@ int CmdSmartBruteforceSFI(const char *Cmd) {
 				memcpy(c.d.asBytes, data, sizeof(data) );
 				clearCommandBuffer();
 				SendCommand(&c);
-				uint8_t len = smart_response(data[1], buf);
+				uint8_t len = smart_response(buf);
 				
 				// TLV decoder
 				if (len > 4)
diff --git a/include/mifare.h b/include/mifare.h
index 6f87a0e6d..cda7cfe9d 100644
--- a/include/mifare.h
+++ b/include/mifare.h
@@ -109,7 +109,7 @@ typedef enum SMARTCARD_COMMAND {
 	SC_CONNECT = 			(1 << 0),
 	SC_NO_DISCONNECT =		(1 << 1),
 	SC_RAW =				(1 << 2),
-	SC_SELECT =				(1 << 3)
+	SC_SELECT =				(1 << 3),
 	SC_RAW_T0 =				(1 << 4),
 } smartcard_command_t;
 

From 8ab9b6d0ea74d7c83463448fc4e9b0c069130cab Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 18 Dec 2018 16:14:52 +0200
Subject: [PATCH 0317/1938] sw 0x6cxx works

---
 client/cmdsmartcard.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index 0d4e7a46d..24803035c 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -488,13 +488,10 @@ int ExchangeAPDUSC(uint8_t *datain, int datainlen, bool activateCard, bool leave
 	// retry
 	if (len > 1 && dataout[len - 2] == 0x6c && datainlen > 4) {
 		UsbCommand c2 = {CMD_SMART_RAW, {SC_RAW_T0, datainlen, 0}};	
-		memcpy(c2.d.asBytes, datain, datainlen);
+		memcpy(c2.d.asBytes, datain, 5);
 		
-		int vlen = 5 + datain[4];
-		if (datainlen == vlen)
-			datainlen++;
-		
-		c2.d.asBytes[vlen] = dataout[len - 1];
+		// transfer length via T=0
+		c2.d.asBytes[4] = dataout[len - 1];
 		
 		clearCommandBuffer();
 		SendCommand(&c2);	

From b42709837fe3659ab3722a9c84bc48b8b5228977 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 18 Dec 2018 18:55:46 +0200
Subject: [PATCH 0318/1938] fix sending Le over 7816 T=0

---
 client/cmdsmartcard.c | 2 +-
 client/emv/emvcore.c  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index 24803035c..8408b03ce 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -322,7 +322,7 @@ static int smart_response(uint8_t *data) {
 	if (needGetData) {
 		int len = data[datalen - 1];
 		PrintAndLogEx(INFO, "Requesting response. len=0x%x", len);	
-		uint8_t getstatus[] = {ISO7816_GETSTATUS, 0x00, 0x00, len};
+		uint8_t getstatus[] = {0x00, ISO7816_GETSTATUS, 0x00, 0x00, len};
 		UsbCommand cStatus = {CMD_SMART_RAW, {SC_RAW, sizeof(getstatus), 0}};	
 		memcpy(cStatus.d.asBytes, getstatus, sizeof(getstatus) );
 		clearCommandBuffer();
diff --git a/client/emv/emvcore.c b/client/emv/emvcore.c
index fcf0bf81f..1b4808410 100644
--- a/client/emv/emvcore.c
+++ b/client/emv/emvcore.c
@@ -301,11 +301,11 @@ int EMVExchangeEx(EMVCommandChannel channel, bool ActivateField, bool LeaveField
 }
 
 int EMVExchange(EMVCommandChannel channel, bool LeaveFieldON, sAPDU apdu, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
-	return EMVExchangeEx(channel, false, LeaveFieldON, apdu, true, Result, MaxResultLen, ResultLen, sw, tlv);
+	return EMVExchangeEx(channel, false, LeaveFieldON, apdu, (channel == ECC_CONTACTLESS), Result, MaxResultLen, ResultLen, sw, tlv);
 }
 
 int EMVSelect(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, uint8_t *AID, size_t AIDLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
-	return EMVExchangeEx(channel, ActivateField, LeaveFieldON, (sAPDU){0x00, 0xa4, 0x04, 0x00, AIDLen, AID}, true, Result, MaxResultLen, ResultLen, sw, tlv);
+	return EMVExchangeEx(channel, ActivateField, LeaveFieldON, (sAPDU){0x00, 0xa4, 0x04, 0x00, AIDLen, AID}, (channel == ECC_CONTACTLESS), Result, MaxResultLen, ResultLen, sw, tlv);
 }
 
 int EMVSelectPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, uint8_t PSENum, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {

From 5489d4e55224fd5b05e840488b79553713002f3f Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 18 Dec 2018 17:57:22 +0100
Subject: [PATCH 0319/1938] add: magic uid 15 helper script chg:  keys

---
 client/default_keys.dic        |   1 +
 client/scripts/iso15_magic.lua | 110 +++++++++++++++++++++++++++++++++
 2 files changed, 111 insertions(+)
 create mode 100644 client/scripts/iso15_magic.lua

diff --git a/client/default_keys.dic b/client/default_keys.dic
index e8f0743d1..f764596ce 100644
--- a/client/default_keys.dic
+++ b/client/default_keys.dic
@@ -708,3 +708,4 @@ E56AC127DD45,
 EA0FD73CB149,
 FC0001877BF7,
 FD8705E721B0,
+00ada2cd516d,
\ No newline at end of file
diff --git a/client/scripts/iso15_magic.lua b/client/scripts/iso15_magic.lua
new file mode 100644
index 000000000..36e8100a8
--- /dev/null
+++ b/client/scripts/iso15_magic.lua
@@ -0,0 +1,110 @@
+local cmds = require('commands')
+local lib15 = require('read15')
+local getopt = require('getopt')
+local utils =  require('utils')
+
+copyright = 'Copyright (c) 2018 IceSQL AB. All rights reserved.'
+author = 'Christian Herrmann'
+version = 'v1.0.3'
+desc = [[
+This script tries to set UID on a IS15693 SLIX magic card 
+Remember the UID  ->MUST<- start with 0xE0
+ ]]
+example = [[
+
+	 -- ISO15693 slix magic tag
+
+	 script run iso15_magic -u E004013344556677
+]]
+usage = [[
+script run iso15_magic -h -u <uid>
+
+Arguments:
+	-h             : this help
+	-u <UID>       : UID (16 hexsymbols)
+]]
+
+local DEBUG = true
+--- 
+-- A debug printout-function
+local function dbg(args)
+    if not DEBUG then return end
+    if type(args) == "table" then
+		local i = 1
+		while args[i] do
+			dbg(args[i])
+			i = i+1
+		end
+	else
+		print("###", args)
+	end	
+end	
+--- 
+-- This is only meant to be used when errors occur
+local function oops(err)
+	print("ERROR: ",err)
+	return nil, err
+end
+--- 
+-- Usage help
+local function help()
+	print(copyright)
+	print(author)	
+	print(version)	
+	print(desc)
+	print('Example usage')
+	print(example)
+end
+--
+--- Set UID on magic command enabled on a ICEMAN based REPO
+local function magicUID_iceman(b0, b1)
+	print('Using backdoor Magic tag function')
+ 	core.console("hf 15 raw -2 -c 02213E00000000")
+	core.console("hf 15 raw -2 -c 02213F69960000")		
+	core.console("hf 15 raw -2 -c 022138"..b1)
+	core.console("hf 15 raw -2 -c 022139"..b0)
+end
+--
+--- Set UID on magic command enabled,  OFFICAL REPO
+local function magicUID_offical(b0, b1)
+	print('Using backdoor Magic tag function OFFICAL REPO')
+ 	core.console("hf 15 cmd raw -c 02213E00000000")
+	core.console("hf 15 cmd raw -c 02213F69960000")		
+	core.console("hf 15 cmd raw -c 022138"..b1)
+	core.console("hf 15 cmd raw -c 022139"..b0)
+end
+--- 
+-- The main entry point
+function main(args)
+
+	print( string.rep('--',20) )
+	print( string.rep('--',20) )	
+	print()
+
+	local uid = 'E004013344556677'
+	
+	-- Read the parameters
+	for o, a in getopt.getopt(args, 'hu:') do
+		if o == "h" then return help() end
+		if o == "u" then uid = a end
+	end	
+	
+	-- uid string checks
+	if uid == nil then return oops('empty uid string') end
+	if #uid == 0 then return oops('empty uid string') end
+	if #uid ~= 16 then return oops('uid wrong length. Should be 8 hex bytes') end
+
+	local bytes = utils.ConvertHexToBytes(uid)
+	
+	local block0 = string.format('%02X%02X%02X%02X', bytes[4], bytes[3], bytes[2], bytes[1])
+	local block1 = string.format('%02X%02X%02X%02X', bytes[8], bytes[7], bytes[6], bytes[5])
+	
+	print('new UID | '..uid)
+	
+	core.clearCommandBuffer()
+	
+	magicUID_iceman(block0, block1)
+	--magicUID_offical(block0, block1)
+end
+
+main(args)

From 4ef59c37717de3ce6671e564e372ce3e7dd48bcc Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 18 Dec 2018 18:43:27 +0100
Subject: [PATCH 0320/1938] CHG:  uniform output.

---
 client/emv/emvcore.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/client/emv/emvcore.c b/client/emv/emvcore.c
index 1b4808410..058aefe50 100644
--- a/client/emv/emvcore.c
+++ b/client/emv/emvcore.c
@@ -249,7 +249,7 @@ int EMVExchangeEx(EMVCommandChannel channel, bool ActivateField, bool LeaveField
 		memcpy(&data[5], apdu.data, apdu.Lc);
 	
 	if (APDULogging)
-		PrintAndLogEx(NORMAL, ">>>> %s", sprint_hex(data, (IncludeLe?6:5) + apdu.Lc));
+		PrintAndLogEx(SUCCESS, ">>>> %s", sprint_hex(data, (IncludeLe?6:5) + apdu.Lc));
 
 	switch(channel) {
 	case ECC_CONTACTLESS:
@@ -269,7 +269,7 @@ int EMVExchangeEx(EMVCommandChannel channel, bool ActivateField, bool LeaveField
 	}
 	
 	if (APDULogging)
-		PrintAndLogEx(NORMAL, "<<<< %s", sprint_hex(Result, *ResultLen));
+		PrintAndLogEx(SUCCESS, "<<<< %s", sprint_hex(Result, *ResultLen));
 
 	if (*ResultLen < 2) {
 		return 200;
@@ -422,7 +422,7 @@ int EMVSearch(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON,
 				}
 				
 				retrycnt = 0;
-				PrintAndLogEx(FAILED, "Retry failed [%s]. Skiped...", AIDlist[i].aid);
+				PrintAndLogEx(FAILED, "Retry failed [%s]. Skipped...", AIDlist[i].aid);
 			}
 			continue;
 		}
@@ -431,8 +431,11 @@ int EMVSearch(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON,
 		if (res)
 			continue;
 		
-		if (decodeTLV){
-			PrintAndLogEx(NORMAL, "%s:", AIDlist[i].aid);
+		if (!datalen)
+			continue;
+		
+		if (decodeTLV) {
+			PrintAndLogEx(SUCCESS, "%s", AIDlist[i].aid);
 			TLVPrintFromBuffer(data, datalen);
 		}
 	}

From 94e0d435029a8d9234d6640a50277a9dae975710 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 18 Dec 2018 18:43:49 +0100
Subject: [PATCH 0321/1938] CHG: coloring of ERR

---
 client/ui.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/client/ui.c b/client/ui.c
index 070f75b7a..3f7e2611f 100644
--- a/client/ui.c
+++ b/client/ui.c
@@ -58,6 +58,9 @@ void PrintAndLogEx(logLevel_t level, char *fmt, ...) {
 	static char *prefixes[7] = { "", "[+] ", "[=] ", "[-] ", "[!] ", "[!!] ", "[#] "};
 	
 	switch( level ) {
+		case ERR:
+			strncpy(prefix,_RED_([!!] ), sizeof(prefix)-1);
+			break;
 		case FAILED:
 			strncpy(prefix,_RED_([-] ), sizeof(prefix)-1);
 			break;

From dab854e0f03fbab752de07171a84158321cb3424 Mon Sep 17 00:00:00 2001
From: mazodude <mazodude2000@gmail.com>
Date: Wed, 19 Dec 2018 16:51:27 +1000
Subject: [PATCH 0322/1938] Fix detection of MADs so that is checks the correct
 byte also set up some code for later

---
 client/scripts/mifare_ad.lua | 90 +++++++++++++++++++++++++++++-------
 1 file changed, 73 insertions(+), 17 deletions(-)

diff --git a/client/scripts/mifare_ad.lua b/client/scripts/mifare_ad.lua
index 385e34338..885c25a81 100644
--- a/client/scripts/mifare_ad.lua
+++ b/client/scripts/mifare_ad.lua
@@ -37,7 +37,6 @@ local function debug(...)
 	end
 end
 
-
 local function show(data)
 	if DEBUG then
 	    local formatString = ("H%d"):format(string.len(data))
@@ -45,6 +44,15 @@ local function show(data)
 	    debug("Hexdata" , hexdata)
 	end
 end
+
+local function bits(num)
+    local t={}
+    while num>0 do
+        rest=num%2
+        table.insert(t,1,rest)
+        num=(num-rest)/2
+    end return table.concat(t)
+end
 --- Shut down tag communication
 -- return no return values
 local function close()
@@ -71,8 +79,8 @@ local function checkCommand(command)
 		local count, cmd, arg0 = bin.unpack('LL',result)
 		if(arg0==1) then
 			local count, arg1, arg2, data = bin.unpack('LLH511',result,count)
-			block = data:sub(33,64)
-			return block
+			sector = data
+			return sector
 		else
 			return nil
 		end
@@ -82,10 +90,10 @@ local function checkCommand(command)
 	end
 end
 
----_ Gets data from a block
--- @return block if successfull
+---_ Gets data from a sector
+-- @return sector if successfull
 -- @return nil, errormessage if unsuccessfull
-local function getBlock(block)
+local function getSector(sector,typ)
 	local data, err
 
 	core.clearCommandBuffer()
@@ -95,9 +103,12 @@ local function getBlock(block)
 	-- uint8_t keyType = arg1;
 	-- uint64_t ui64Key = 0;
 	-- ui64Key = bytes_to_num(datain, 6);
-	local sectorNo = 0
+	local sectorNo = sector
 	local keyType = 0
-	local key = "A0A1A2A3A4A5";
+	local key = ""
+	if typ == 1 then
+		key = "A0A1A2A3A4A5"
+	end
 	debug(("Testing to auth with key %s"):format(key))
 	-- print(key);
 	local command = Command:new{cmd = cmds.CMD_MIFARE_READSC,
@@ -112,9 +123,7 @@ local function getBlock(block)
 	if string.len(data) < 32 then
 		return nil, ("Expected at least 32 bytes, got %d - this tag does not have MADs"):format(string.len(data))
 	end
-	-- -- Now, parse out the block data
-	b0 = string.sub(data,3,4)
-	return b0
+	return data
 end
 
 
@@ -149,17 +158,64 @@ local function main( args)
 	if not tag then return oops("No card present") end
 	core.clearCommandBuffer()
 	print(("UID: %s"):format(tag.uid))
+	print(("SAK: %x"):format(tag.sak))
 
-	-- First, get block 1 byte 1
-	local block, err = getBlock(0)
+	local typ = 1
+	if 0x18 == sak then --NXP MIFARE Classic 4k | Plus 4k | Ev1 4k
+		typ = 4
+	elseif 0x08 == sak then -- NXP MIFARE CLASSIC 1k | Plus 2k | Ev1 1K
+		typ= 1
+	elseif 0x09 == sak then -- NXP MIFARE Mini 0.3k
+		typ = 0
+	elseif  0x10 == sak then-- "NXP MIFARE Plus 2k"
+		typ = 2
+	elseif  0x01 == sak then-- "NXP MIFARE TNP3xxx 1K"
+		typ = 1
+	else
+		debug("Defaulting to CLASSIC")
+	end
+
+	-- # | data    |  Sector | 00/ 0x00
+	-- ----+------------------------------------------------
+	-- 0 | 5C 71 B0 14 89 88 04 00 C0 8E 3C 90 49 50 12 13
+	-- 1 | 80 0F 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+	-- 2 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 12 48
+	-- 3 | A0 A1 A2 A3 A4 A5 78 77 88 E9 B0 B1 B2 B3 B4 B5
+
+	-- E9 = 1 1 1010 01
+	-- C1 = 1 1 0000 01
+	-- 69 = 0 1 1010 01
+	-- 99 = 1 0 0110 01
+
+	-- Need to check the sector trailer GPB
+	-- First, get Sector 0 block 3 byte 10
+	local sector, err = getSector(0,1)
 	if err then return oops(err) end
-	debug(("Checking block 0 sector 1 byte 1"))
-	debug(("Got byte: %s"):format(block))
+	-- -- Now, parse out the block data
+	sector = sector:sub(0,128)
+	debug(sector)
+	local trailer = sector:sub(97,128)
+	debug(trailer)
+	local gpb = string.sub(trailer,19,20)
+	debug(("Checking block 0 sector 3 byte 10"))
+	debug(("Got byte: %s"):format(gpb))
+	local gpbbits = bits(tonumber(gpb,16))
+	debug(gpbbits)
+	local adv = gpbbits:sub(7,8)
+	print(("ADV: %s"):format(adv))
+	local rfu = gpbbits:sub(3,6)
+	print(("RFU: %s"):format(rfu))
+	local ma = gpbbits:sub(2,2)
+	print(("MA: %s"):format(ma))
+	local da = gpbbits:sub(1,1)
+	print(("DA: %s"):format(da))
 	-- prlog(block)
-	if block == "0F" then
+	if adv == "01" then
 		print('Card has MADs v1')
 	end
-	--(iceman) Should be able to detect MAD v2 aswell..
+	if adv == "10" then
+		print('Card has MADs v2')
+	end
 
 	-- Deactivate field
 	close()

From e567b74fa035f23c48a76988cac33975bde1cdae Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 19 Dec 2018 08:57:59 +0100
Subject: [PATCH 0323/1938] chg...

---
 client/default_keys.dic | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/client/default_keys.dic b/client/default_keys.dic
index f764596ce..3fb8f07bf 100644
--- a/client/default_keys.dic
+++ b/client/default_keys.dic
@@ -708,4 +708,7 @@ E56AC127DD45,
 EA0FD73CB149,
 FC0001877BF7,
 FD8705E721B0,
-00ada2cd516d,
\ No newline at end of file
+00ada2cd516d,
+#
+#
+D3F7D3F7D3F7
\ No newline at end of file

From f0c34827991b014c4e42ecad2294abab3efc2483 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 19 Dec 2018 20:31:20 +0200
Subject: [PATCH 0324/1938] add T=0 to `sc raw` command

---
 client/cmdsmartcard.c | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index 8408b03ce..953526284 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -15,14 +15,15 @@ int usage_sm_raw(void) {
 	PrintAndLogEx(NORMAL, "Usage: sc raw [h|r|c] d <0A 0B 0C ... hex>");
 	PrintAndLogEx(NORMAL, "       h          :  this help");
 	PrintAndLogEx(NORMAL, "       r          :  do not read response");
-	PrintAndLogEx(NORMAL, "       a          :  active smartcard without select");
-	PrintAndLogEx(NORMAL, "       s          :  active smartcard with select");
+	PrintAndLogEx(NORMAL, "       a          :  active smartcard without select (reset sc module)");
+	PrintAndLogEx(NORMAL, "       s          :  active smartcard with select (get ATR)");
 	PrintAndLogEx(NORMAL, "       t          :  executes TLV decoder if it possible");
+	PrintAndLogEx(NORMAL, "       0          :  use protocol T=0");
 	PrintAndLogEx(NORMAL, "       d <bytes>  :  bytes to send");
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        sc raw d 00a404000e315041592e5359532e444446303100    - `1PAY.SYS.DDF01` PPSE directory");
-	PrintAndLogEx(NORMAL, "        sc raw d 00a404000e325041592e5359532e444446303100    - `2PAY.SYS.DDF01` PPSE directory");
+	PrintAndLogEx(NORMAL, "        sc raw s 0 d 00a404000e315041592e5359532e444446303100  - `1PAY.SYS.DDF01` PPSE directory with get ATR");
+	PrintAndLogEx(NORMAL, "        sc raw 0 d 00a404000e325041592e5359532e444446303100    - `2PAY.SYS.DDF01` PPSE directory");
 	return 0;
 }
 int usage_sm_reader(void) {
@@ -362,6 +363,7 @@ int CmdSmartRaw(const char *Cmd) {
 	int hexlen = 0;
     bool active = false;
     bool active_select = false;	
+    bool useT0 = false;	
 	uint8_t cmdp = 0;
 	bool errors = false, reply = true, decodeTLV = false, breakloop = false;
 	uint8_t data[USB_CMD_DATA_SIZE] = {0x00};
@@ -385,6 +387,10 @@ int CmdSmartRaw(const char *Cmd) {
 			decodeTLV = true;
 			cmdp++;
 			break;			
+		case '0':
+			useT0 = true;
+			cmdp++;
+			break;			
 		case 'd': {
 			switch (param_gethex_to_eol(Cmd, cmdp+1, data, sizeof(data), &hexlen)) {
 			case 1:
@@ -425,7 +431,10 @@ int CmdSmartRaw(const char *Cmd) {
     }
 
 	if (hexlen > 0) {
-        c.arg[0] |= SC_RAW;
+		if (useT0)
+			c.arg[0] |= SC_RAW_T0;
+		else
+			c.arg[0] |= SC_RAW;
 	}	
 	
 	memcpy(c.d.asBytes, data, hexlen );

From 0143d3f0e0a240005251f985a3beebbbe7063bca Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 19 Dec 2018 22:50:32 +0100
Subject: [PATCH 0325/1938] chg: 'sc raw'  - some more love

---
 client/cmdsmartcard.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index 953526284..11988c98b 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -22,8 +22,8 @@ int usage_sm_raw(void) {
 	PrintAndLogEx(NORMAL, "       d <bytes>  :  bytes to send");
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        sc raw s 0 d 00a404000e315041592e5359532e444446303100  - `1PAY.SYS.DDF01` PPSE directory with get ATR");
-	PrintAndLogEx(NORMAL, "        sc raw 0 d 00a404000e325041592e5359532e444446303100    - `2PAY.SYS.DDF01` PPSE directory");
+	PrintAndLogEx(NORMAL, "        sc raw s 0 d 00a404000e315041592e5359532e4444463031  - `1PAY.SYS.DDF01` PPSE directory with get ATR");
+	PrintAndLogEx(NORMAL, "        sc raw 0 d 00a404000e325041592e5359532e4444463031    - `2PAY.SYS.DDF01` PPSE directory");
 	return 0;
 }
 int usage_sm_reader(void) {
@@ -289,7 +289,7 @@ static bool smart_select(bool silent) {
 static int smart_wait(uint8_t *data) {
 	UsbCommand resp;
 	if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
-		PrintAndLogEx(WARNING, "smart card response failed");
+		PrintAndLogEx(WARNING, "smart card response timeout");
 		return -1;
 	}
 	
@@ -299,11 +299,12 @@ static int smart_wait(uint8_t *data) {
 		return -2;			
 	}
 	memcpy(data, resp.d.asBytes, len);	
-	PrintAndLogEx(SUCCESS, " %d | %s", len, sprint_hex_inrow_ex(data,  len, 32));
-
 	if (len >= 2) {		
 		PrintAndLogEx(SUCCESS, "%02X%02X | %s", data[len - 2], data[len - 1], GetAPDUCodeDescription(data[len - 2], data[len - 1])); 
+	} else {
+		PrintAndLogEx(SUCCESS, " %d | %s", len, sprint_hex_inrow_ex(data,  len, 8));
 	}
+	
 	return len;
 }
 
@@ -466,7 +467,7 @@ int CmdSmartRaw(const char *Cmd) {
 		}
 
 		if (decodeTLV && len > 4)
-			TLVPrintFromBuffer(buf+1, len-3);
+			TLVPrintFromBuffer(buf, len-2);
 
 		free(buf);
 	}
@@ -478,7 +479,8 @@ int ExchangeAPDUSC(uint8_t *datain, int datainlen, bool activateCard, bool leave
 	
 	if (activateCard)
 		smart_select(false);
-	printf("* APDU SC\n");
+
+	PrintAndLogEx(DEBUG, "APDU SC");
 
 	UsbCommand c = {CMD_SMART_RAW, {SC_RAW_T0, datainlen, 0}};	
 	if (activateCard) {
@@ -806,8 +808,8 @@ int CmdSmartBruteforceSFI(const char *Cmd) {
 	}
 	
 	PrintAndLogEx(INFO, "Selecting PPSE aid");
-	CmdSmartRaw("d 00a404000e325041592e5359532e444446303100");
-	CmdSmartRaw("d 00a4040007a000000004101000");
+	CmdSmartRaw("s 0 d 00a404000e325041592e5359532e4444463031");
+	CmdSmartRaw("0 d 00a4040007a000000004101000");
 	
 	PrintAndLogEx(INFO, "starting");
 	

From a9b3fd71382f4eec34aa7f5d83bd930ca8572129 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 19 Dec 2018 23:21:59 +0100
Subject: [PATCH 0326/1938] chg: 'sc brute' - now works :)

---
 client/cmdsmartcard.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index 11988c98b..e21704fb3 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -323,7 +323,7 @@ static int smart_response(uint8_t *data) {
 
 	if (needGetData) {
 		int len = data[datalen - 1];
-		PrintAndLogEx(INFO, "Requesting response. len=0x%x", len);	
+		PrintAndLogEx(INFO, "Requesting 0x%02X bytes response", len);	
 		uint8_t getstatus[] = {0x00, ISO7816_GETSTATUS, 0x00, 0x00, len};
 		UsbCommand cStatus = {CMD_SMART_RAW, {SC_RAW, sizeof(getstatus), 0}};	
 		memcpy(cStatus.d.asBytes, getstatus, sizeof(getstatus) );
@@ -341,7 +341,7 @@ static int smart_response(uint8_t *data) {
 			// data with ACK
 			if (datalen == len + 2 + 1) { // 2 - response, 1 - ACK
 				if (data[0] != ISO7816_GETSTATUS) {
-					PrintAndLogEx(ERR, "GetResponse ACK error. len=0x%x data[0]=%02x", len, data[0]);	
+					PrintAndLogEx(ERR, "GetResponse ACK error. len 0x%x | data[0] %02X", len, data[0]);	
 					datalen = 0;
 					goto out;
 				}
@@ -350,7 +350,7 @@ static int smart_response(uint8_t *data) {
 				memmove(data, &data[1], datalen);
 			} else {
 				// wrong length
-				PrintAndLogEx(WARNING, "GetResponse wrong length. Must be: 0x%02x but: 0x%02x", len, datalen - 3);	
+				PrintAndLogEx(WARNING, "GetResponse wrong length. Must be 0x%02X got 0x%02X", len, datalen - 3);	
 			}
 		}
 	}
@@ -808,8 +808,9 @@ int CmdSmartBruteforceSFI(const char *Cmd) {
 	}
 	
 	PrintAndLogEx(INFO, "Selecting PPSE aid");
-	CmdSmartRaw("s 0 d 00a404000e325041592e5359532e4444463031");
-	CmdSmartRaw("0 d 00a4040007a000000004101000");
+	CmdSmartRaw("s 0 t d 00a404000e325041592e5359532e4444463031");
+	CmdSmartRaw("0 t d 00a4040007a000000004101000");  // mastercard
+//	CmdSmartRaw("0 t d 00a4040007a0000000031010"); // visa
 	
 	PrintAndLogEx(INFO, "starting");
 	
@@ -830,7 +831,6 @@ int CmdSmartBruteforceSFI(const char *Cmd) {
 			
 			smart_response(buf);
 			
-			// if 0x6C
 			if ( buf[0] == 0x6C ) {
 				data[4]	= buf[1];
 				

From d4b32f30509911f06a617c990cf5a029ab851e2b Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 19 Dec 2018 23:28:01 +0100
Subject: [PATCH 0327/1938] ADD: Sim module firmware upgrade file.  v3.10

---
 common/i2c.c               |   2 +-
 tools/simmodule/SIM010.BIN | Bin 0 -> 719 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 tools/simmodule/SIM010.BIN

diff --git a/common/i2c.c b/common/i2c.c
index ea830a1bd..99f8b6e12 100644
--- a/common/i2c.c
+++ b/common/i2c.c
@@ -575,7 +575,7 @@ void I2C_print_status(void) {
 	I2C_Reset_EnterMainProgram();
 	uint8_t len = I2C_BufferRead(resp, sizeof(resp), I2C_DEVICE_CMD_GETVERSION, I2C_DEVICE_ADDRESS_MAIN);
 	if ( len > 0 )
-	  	Dbprintf("  version.................v%x.%02x", resp[0], resp[1]);
+	  	Dbprintf("  version.................v%x.%02d", resp[0], resp[1]);
 	else
 		DbpString("  version.................FAILED");	
 }
diff --git a/tools/simmodule/SIM010.BIN b/tools/simmodule/SIM010.BIN
new file mode 100644
index 0000000000000000000000000000000000000000..dea57a7d8608a34020f7d9e5e40a5b6e915be6fa
GIT binary patch
literal 719
zcmbVJO=uHA6rS1L$-l5DLa~?K$zPi&EQ<%hi&CM-7^G)Cc=O`ri3c%jCH{bwbYmf*
z2XzZliW1uHp@&G~bZdKD268JV2XpY2OEJ|ZaaU8USKl1o_kF{A?|VD}ucL7&IpOTI
zGD})h0x#>wDni)!i+zOG{^kG6Sf3s0az&D>s?L!joojZ8)vXrkJUqrdLW$*eSQ(}+
zl9bMadb87X!JVjmY@jfA*tX&f)Jo%)%uI%v$OsFt5DTkj!?>s59LL?d9h7*~Ahr-=
zQAi?AAc0iV#;3RdDFhTj+~)y7eQisz`&mdM$VlAlVUuG@e5#rXi78=0HQ&`kB(0iU
z^qkg<3C}6&kp!_w(i{9{lABssVqqT9#7j)%(upyRRlyJ&TdEc!PwFABV<5-_#Z+B2
ziB*jID|Zg+Bu*^0!yL|B*IRyD_e^C1kQLy(2p1yUtAj^-uyF;}M_}KC%`NzV;Qa`m
zQ+R=3;Tt@ggWWaQots(2uqpq+Hx`G`yvASgGJI-6#f7H^^sj>xf}QX1c?3%WC<s)<
zXJ=lX&O5M-Vb#pP&0o%|MqiF#+D+S7?q+OBDrOg`O}w;3sUl%2N97Viot6AXD|x7)
z0h4G6;m*$oWGwGb`YM9yt4eM{LqEFJJ9p0%P<!aVR&xLMuUExtOgeG<@!ffi$^xdW
nly@HPwTEAhc!@G(x#sdgRSOPSuyDIQq$P|Bqp!V{_7VLBir4*b

literal 0
HcmV?d00001


From ddb4fc33c9a91bbb8058adb5df0f95b0890edb5e Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 19 Dec 2018 23:46:19 +0100
Subject: [PATCH 0328/1938] CHG: 'sc info' - textual

---
 client/cmdsmartcard.c | 90 +++++++++++++++++++++----------------------
 1 file changed, 43 insertions(+), 47 deletions(-)

diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index e21704fb3..1ed46b993 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -159,58 +159,46 @@ float GetATRF(uint8_t *atr, size_t atrlen) {
 }
 
 static int PrintATR(uint8_t *atr, size_t atrlen) {
-	uint8_t vxor = 0;
-	for (int i = 1; i < atrlen; i++)
-		vxor ^= atr[i];
-	
-	if (vxor)
-		PrintAndLogEx(WARNING, "Check summ error. Must be 0 but: 0x%02x", vxor);
-	else
-		PrintAndLogEx(INFO, "Check summ OK.");
-
-	if (atr[0] != 0x3b)
-		PrintAndLogEx(WARNING, "Not a direct convention: 0x%02x", atr[0]);
 	
 	uint8_t T0 = atr[1];
 	uint8_t K = T0 & 0x0F;
-	uint8_t TD1 = 0;
-	
-	uint8_t T1len = 0;
-	uint8_t TD1len = 0;
-	uint8_t TDilen = 0;
+	uint8_t TD1 = 0, T1len = 0, TD1len = 0, TDilen = 0;
 	
 	if (T0 & 0x10) {
-		PrintAndLog("TA1 (Maximum clock frequency, proposed bit duration): 0x%02x", atr[2 + T1len]);
+		PrintAndLog("\t- TA1 (Maximum clock frequency, proposed bit duration) [ 0x%02x ]", atr[2 + T1len]);
 		T1len++;
 	}
+	
 	if (T0 & 0x20) {
-		PrintAndLog("TB1 (Deprecated: VPP requirements): 0x%02x", atr[2 + T1len]);
+		PrintAndLog("\t- TB1 (Deprecated: VPP requirements) [ 0x%02x ]", atr[2 + T1len]);
 		T1len++;
 	}
+	
 	if (T0 & 0x40) {
-		PrintAndLog("TC1 (Extra delay between bytes required by card): 0x%02x", atr[2 + T1len]);
+		PrintAndLog("\t- TC1 (Extra delay between bytes required by card) [ 0x%02x ]", atr[2 + T1len]);
 		T1len++;
 	}
+	
 	if (T0 & 0x80) {
 		TD1 = atr[2 + T1len];
-		PrintAndLog("TD1 (First offered transmission protocol, presence of TA2..TD2): 0x%02x. Protocol T=%d", TD1, TD1 & 0x0f);
+		PrintAndLog("\t- TD1 (First offered transmission protocol, presence of TA2..TD2) [ 0x%02x ] Protocol T%d", TD1, TD1 & 0x0f);
 		T1len++;
 		
 		if (TD1 & 0x10) {
-			PrintAndLog("TA2 (Specific protocol and parameters to be used after the ATR): 0x%02x", atr[2 + T1len + TD1len]);
+			PrintAndLog("\t- TA2 (Specific protocol and parameters to be used after the ATR) [ 0x%02x ]", atr[2 + T1len + TD1len]);
 			TD1len++;
 		}
 		if (TD1 & 0x20) {
-			PrintAndLog("TB2 (Deprecated: VPP precise voltage requirement): 0x%02x", atr[2 + T1len + TD1len]);
+			PrintAndLog("\t- TB2 (Deprecated: VPP precise voltage requirement) [ 0x%02x ]", atr[2 + T1len + TD1len]);
 			TD1len++;
 		}
 		if (TD1 & 0x40) {
-			PrintAndLog("TC2 (Maximum waiting time for protocol T=0): 0x%02x", atr[2 + T1len + TD1len]);
+			PrintAndLog("\t- TC2 (Maximum waiting time for protocol T=0) [ 0x%02x ]", atr[2 + T1len + TD1len]);
 			TD1len++;
 		}
 		if (TD1 & 0x80) {
 			uint8_t TDi = atr[2 + T1len + TD1len];
-			PrintAndLog("TD2 (A supported protocol or more global parameters, presence of TA3..TD3): 0x%02x. Protocol T=%d", TDi, TDi & 0x0f);
+			PrintAndLog("\t- TD2 (A supported protocol or more global parameters, presence of TA3..TD3) [ 0x%02x ] Protocol T%d", TDi, TDi & 0x0f);
 			TD1len++;
 
 			bool nextCycle = true;
@@ -218,20 +206,20 @@ static int PrintATR(uint8_t *atr, size_t atrlen) {
 			while (nextCycle) {
 				nextCycle = false;
 				if (TDi & 0x10) {
-					PrintAndLog("TA%d: 0x%02x", vi, atr[2 + T1len + TD1len + TDilen]);
+					PrintAndLog("\t- TA%d: 0x%02x", vi, atr[2 + T1len + TD1len + TDilen]);
 					TDilen++;
 				}
 				if (TDi & 0x20) {
-					PrintAndLog("TB%d: 0x%02x", vi, atr[2 + T1len + TD1len + TDilen]);
+					PrintAndLog("\t- TB%d: 0x%02x", vi, atr[2 + T1len + TD1len + TDilen]);
 					TDilen++;
 				}
 				if (TDi & 0x40) {
-					PrintAndLog("TC%d: 0x%02x", vi, atr[2 + T1len + TD1len + TDilen]);
+					PrintAndLog("\t- TC%d: 0x%02x", vi, atr[2 + T1len + TD1len + TDilen]);
 					TDilen++;
 				}
 				if (TDi & 0x80) {
 					TDi = atr[2 + T1len + TD1len + TDilen];
-					PrintAndLog("TD%d: 0x%02x. Protocol T=%d", vi, TDi, TDi & 0x0f);
+					PrintAndLog("\t- TD%d [ 0x%02x ] Protocol T%d", vi, TDi, TDi & 0x0f);
 					TDilen++;
 					
 					nextCycle = true;
@@ -240,26 +228,36 @@ static int PrintATR(uint8_t *atr, size_t atrlen) {
 			}
 		}
 	}
+
+	uint8_t vxor = 0;
+	for (int i = 1; i < atrlen; i++)
+		vxor ^= atr[i];
+	
+	if (vxor)
+		PrintAndLogEx(WARNING, "Check summ error. Must be 0 got 0x%02X", vxor);
+	else
+		PrintAndLogEx(INFO, "Check summ OK.");
+
+	if (atr[0] != 0x3b)
+		PrintAndLogEx(WARNING, "Not a direct convention [ 0x%02x ]", atr[0]);
+
 	
 	uint8_t calen = 2 + T1len + TD1len + TDilen + K;
 	
 	if (atrlen != calen && atrlen != calen + 1)  // may be CRC
 		PrintAndLogEx(ERR, "ATR length error. len: %d, T1len: %d, TD1len: %d, TDilen: %d, K: %d", atrlen, T1len, TD1len, TDilen, K);
-	else
-		PrintAndLogEx(INFO, "ATR length OK.");
 	
-	PrintAndLog("Historical bytes len: 0x%02x", K);
 	if (K > 0)
-		PrintAndLog("The format of historical bytes: %02x", atr[2 + T1len + TD1len + TDilen]);
+		PrintAndLogEx(INFO, "\nHistorical bytes | len 0x%02d | format %02x", K, atr[2 + T1len + TD1len + TDilen]);
+	
 	if (K > 1) {
-		PrintAndLog("Historical bytes:");
+		PrintAndLogEx(INFO, "\tHistorical bytes");
 		dump_buffer(&atr[2 + T1len + TD1len + TDilen], K, NULL, 1);
 	}
 	
 	return 0;
 }
 
-
 static bool smart_select(bool silent) {
 	UsbCommand c = {CMD_SMART_ATR, {0, 0, 0}};
 	clearCommandBuffer();
@@ -515,7 +513,6 @@ int ExchangeAPDUSC(uint8_t *datain, int datainlen, bool activateCard, bool leave
 	return 0;
 }	
 
-
 int CmdSmartUpgrade(const char *Cmd) {
 
 	PrintAndLogEx(WARNING, "WARNING - Smartcard socket firmware upgrade.");
@@ -663,32 +660,31 @@ int CmdSmartInfo(const char *Cmd){
 	memcpy(&card, (smart_card_atr_t *)resp.d.asBytes, sizeof(smart_card_atr_t));
 	
 	// print header
-	PrintAndLogEx(INFO, "\n--- Smartcard Information ---------");
+	PrintAndLogEx(INFO, "--- Smartcard Information ---------");
 	PrintAndLogEx(INFO, "-------------------------------------------------------------");
-	PrintAndLogEx(INFO, "ISO76183 ATR : %s", sprint_hex(card.atr, card.atr_len));
-	PrintAndLogEx(INFO, "look up ATR");
-	PrintAndLogEx(INFO, "http://smartcard-atr.appspot.com/parse?ATR=%s", sprint_hex_inrow(card.atr, card.atr_len) );
+	PrintAndLogEx(INFO, "ISO7618-3 ATR : %s", sprint_hex(card.atr, card.atr_len));
+	PrintAndLogEx(INFO, "\nhttp://smartcard-atr.appspot.com/parse?ATR=%s", sprint_hex_inrow(card.atr, card.atr_len) );
 
 	// print ATR
 	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "* ATR:");
+	PrintAndLogEx(INFO, "ATR");
 	PrintATR(card.atr, card.atr_len);
 	
 	// print D/F (brom byte TA1 or defaults)
 	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "* D/F (TA1):");
+	PrintAndLogEx(INFO, "D/F (TA1)");
 	int Di = GetATRDi(card.atr, card.atr_len);
 	int Fi = GetATRFi(card.atr, card.atr_len);
 	float F = GetATRF(card.atr, card.atr_len);
 	if (GetATRTA1(card.atr, card.atr_len) == 0x11)
 		PrintAndLogEx(INFO, "Using default values...");
 	
-	PrintAndLogEx(NORMAL, "Di=%d", Di);
-	PrintAndLogEx(NORMAL, "Fi=%d", Fi);
-	PrintAndLogEx(NORMAL, "F=%.1f MHz", F);
-	PrintAndLogEx(NORMAL, "Cycles/ETU=%d", Fi/Di);
-	PrintAndLogEx(NORMAL, "%.1f bits/sec at 4MHz", (float)4000000 / (Fi/Di));
-	PrintAndLogEx(NORMAL, "%.1f bits/sec at Fmax=%.1fMHz", (F * 1000000) / (Fi/Di), F);
+	PrintAndLogEx(NORMAL, "\t- Di %d", Di);
+	PrintAndLogEx(NORMAL, "\t- Fi %d", Fi);
+	PrintAndLogEx(NORMAL, "\t- F  %.1f MHz", F);
+	PrintAndLogEx(NORMAL, "\t- Cycles/ETU %d", Fi/Di);
+	PrintAndLogEx(NORMAL, "\t- %.1f bits/sec at 4 MHz", (float)4000000 / (Fi/Di));
+	PrintAndLogEx(NORMAL, "\t- %.1f bits/sec at Fmax (%.1f MHz)", (F * 1000000) / (Fi/Di), F);
 	
 	return 0;
 }

From f7a2af19f8660fe21c02aba86e700f5f02d6cdf0 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 20 Dec 2018 12:24:55 +0100
Subject: [PATCH 0329/1938] ADD:  sha512, md5 hashes for firmware file.

---
 tools/simmodule/SIM010.md5.txt    |  1 +
 tools/simmodule/SIM010.sha512.txt |  1 +
 tools/simmodule/readme.txt        | 36 +++++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+)
 create mode 100644 tools/simmodule/SIM010.md5.txt
 create mode 100644 tools/simmodule/SIM010.sha512.txt
 create mode 100644 tools/simmodule/readme.txt

diff --git a/tools/simmodule/SIM010.md5.txt b/tools/simmodule/SIM010.md5.txt
new file mode 100644
index 000000000..c790101f7
--- /dev/null
+++ b/tools/simmodule/SIM010.md5.txt
@@ -0,0 +1 @@
+136e157364609e5c395540dc8dadbfd6 *SIM010.BIN
diff --git a/tools/simmodule/SIM010.sha512.txt b/tools/simmodule/SIM010.sha512.txt
new file mode 100644
index 000000000..b7bab7246
--- /dev/null
+++ b/tools/simmodule/SIM010.sha512.txt
@@ -0,0 +1 @@
+e6ac5e6f1d7cc86d56f2128f2a495f1395fe044bf6ff3b6ca24ce90d1e361ae835fe273a206f2fc90e4344a13b37b180dd017a2c7f23312f1ed163f10c01ea5a *SIM010.BIN
diff --git a/tools/simmodule/readme.txt b/tools/simmodule/readme.txt
new file mode 100644
index 000000000..7efa40205
--- /dev/null
+++ b/tools/simmodule/readme.txt
@@ -0,0 +1,36 @@
+
+2018-12-20 Iceman
+
+=======================================
+
+The latest firmware for the SIM MODULE is :   SIM010.bin
+
+
+You can use it to upgrade you sim module via the pm3 client.
+
+
+pm3 --> sc upgrade -h
+pm3 --> sc upgrade f ../tools/simmodule/SIM010.bin
+
+
+
+Even its a quite fast command you should be warned.  You may brick it if you interrupt it.
+
+
+
+Run hw status command to verify that the upgrade went well.
+
+pm3 -->  hw status
+
+
+
+If you didn't download this file from the RRG Repo be aware that it might be corrupt or faulty.
+
+You find to hash text files in this folder.   They were generated with the following linux commands.
+
+
+md5sum -b SIM010.bin > SIM010.md5.txt
+sha512sum -b SIM010.bin > SIM010.sha512.txt
+
+
+You should validate the SIM010.bin file against these hash files in order to be sure the file is not corrupt or faulty.
\ No newline at end of file

From d64a48b7fcf218da33f97cba9ec3339e78902e76 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Thu, 20 Dec 2018 23:05:02 +0200
Subject: [PATCH 0330/1938] added check Fi and Di

---
 client/cmdsmartcard.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index 8408b03ce..e4c161153 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -675,10 +675,14 @@ int CmdSmartInfo(const char *Cmd){
 	PrintAndLogEx(NORMAL, "Di=%d", Di);
 	PrintAndLogEx(NORMAL, "Fi=%d", Fi);
 	PrintAndLogEx(NORMAL, "F=%.1f MHz", F);
-	PrintAndLogEx(NORMAL, "Cycles/ETU=%d", Fi/Di);
-	PrintAndLogEx(NORMAL, "%.1f bits/sec at 4MHz", (float)4000000 / (Fi/Di));
-	PrintAndLogEx(NORMAL, "%.1f bits/sec at Fmax=%.1fMHz", (F * 1000000) / (Fi/Di), F);
-	
+	if (Di && Fi) {
+		PrintAndLogEx(NORMAL, "Cycles/ETU=%d", Fi/Di);
+		PrintAndLogEx(NORMAL, "%.1f bits/sec at 4MHz", (float)4000000 / (Fi/Di));
+		PrintAndLogEx(NORMAL, "%.1f bits/sec at Fmax=%.1fMHz", (F * 1000000) / (Fi/Di), F);
+	} else {
+		PrintAndLogEx(WARNING, "Di or Fi is RFU.");
+	};
+
 	return 0;
 }
 

From acb41a7376ef20bf2ba728f3c661ac8bc07eefda Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 23 Dec 2018 09:48:46 +0100
Subject: [PATCH 0331/1938] CHG: 'sc brute' - now is interruptable,  optional
 tlv decode,

---
 client/aidlist.json   |   1 +
 client/cmdhffido.c    |   2 +-
 client/cmdsmartcard.c | 325 +++++++++++++++++++++++++++++++++---------
 client/emv/cmdemv.c   |   1 +
 client/emv/emv_tags.c |  47 +++---
 client/emv/emvcore.c  |   4 +-
 client/emv/emvcore.h  |   2 +-
 7 files changed, 291 insertions(+), 91 deletions(-)
 create mode 100644 client/aidlist.json

diff --git a/client/aidlist.json b/client/aidlist.json
new file mode 100644
index 000000000..7ec139d46
--- /dev/null
+++ b/client/aidlist.json
@@ -0,0 +1 @@
+[{"Vendor": "Visa International", "Description": "", "Country": "United States", "AID": "315041592E5359532E4444463031", "Type": "", "Name": "Visa Payment System Environment - PSE (1PAY.SYS.DDF01)"}, {"Vendor": "Visa International", "Description": "Visa payWave for Mobile", "Country": "United States", "AID": "325041592E5359532E4444463031", "Type": "", "Name": "Visa Proximity Payment System Environment - PPSE (2PAY.SYS.DDF01)"}, {"Vendor": "DeviceFidelity", "Description": "http://www.nfcworld.com/2010/11/24/35207/devicefidelity-adds-nfc-support-for-android-and-mifare/", "Country": "United States", "AID": "44464D46412E44466172653234313031", "Type": "", "Name": "DeviceFidelity In2Pay DFare applet"}, {"Vendor": "PBS Danmnt A/S", "Description": "(Unlicensed use of this RID. Proposal to use A000000323 instead)", "Country": "Denmark", "AID": "A00000000101", "Type": "", "Name": "MUSCLE Card Applet"}, {"Vendor": "Visa International", "Description": "Used by most GP2.1.1 cards / Oberthur OP201 cards. Visa Proprietary Card Manager AID for OpenPlatform cards (visa.openplatform).", "Country": "United States", "AID": "A000000003000000", "Type": "GP", "Name": "(VISA) Card Manager"}, {"Vendor": "Visa International", "Description": "", "Country": "United States", "AID": "A00000000300037561", "Type": "", "Name": "Bonuscard"}, {"Vendor": "Visa International", "Description": "", "Country": "United States", "AID": "A00000000305076010", "Type": "EMV", "Name": "VISA ELO Credit"}, {"Vendor": "Visa International", "Description": "Standard/Gold VISA credit card", "Country": "United States", "AID": "A0000000031010", "Type": "EMV", "Name": "VISA Debit/Credit (Classic)"}, {"Vendor": "Visa International", "Description": "", "Country": "United States", "AID": "A000000003101001", "Type": "EMV", "Name": "VISA Credit"}, {"Vendor": "Visa International", "Description": "", "Country": "United States", "AID": "A000000003101002", "Type": "EMV", "Name": "VISA Debit"}, {"Vendor": "Visa International", "Description": "VISA Electron (Debit)", "Country": "United States", "AID": "A0000000032010", "Type": "EMV", "Name": "VISA Electron"}, {"Vendor": "Visa International", "Description": "V PAY", "Country": "United States", "AID": "A0000000032020", "Type": "EMV", "Name": "VISA"}, {"Vendor": "Visa International", "Description": "VISA Interlink", "Country": "United States", "AID": "A0000000033010", "Type": "EMV", "Name": "VISA Interlink"}, {"Vendor": "Visa International", "Description": "Visa Specific", "Country": "United States", "AID": "A0000000034010", "Type": "EMV", "Name": "VISA Specific"}, {"Vendor": "Visa International", "Description": "Visa Specific", "Country": "United States", "AID": "A0000000035010", "Type": "EMV", "Name": "VISA Specific"}, {"Vendor": "Visa International", "Description": "", "Country": "United States", "AID": "A000000003534441", "Type": "GP", "Name": "Schlumberger Security Domain"}, {"Vendor": "Visa International", "Description": "OCS Oberthur Card System Security Domain Package AID / VGP Card Manager (for ISD and ASD)", "Country": "United States", "AID": "A0000000035350", "Type": "GP", "Name": "Security Domain"}, {"Vendor": "Visa International", "Description": "OCS Oberthur Card System Security Domain Applet AID / VGP Card Manager (for ISD and ASD)", "Country": "United States", "AID": "A000000003535041", "Type": "GP", "Name": "Security Domain"}, {"Vendor": "Visa International", "Description": "", "Country": "United States", "AID": "A0000000036010", "Type": "EMV", "Name": "Domestic Visa Cash Stored Value"}, {"Vendor": "Visa International", "Description": "", "Country": "United States", "AID": "A0000000036020", "Type": "EMV", "Name": "International Visa Cash Stored Value"}, {"Vendor": "Visa International", "Description": "VISA Auth dynamic passcode authentication (DPA). Used by Barclays/HBOS", "Country": "United States", "AID": "A0000000038002", "Type": "EMV", "Name": "VISA Auth, VisaRemAuthen EMV-CAP (DPA)"}, {"Vendor": "Visa International", "Description": "VISA plus", "Country": "United States", "AID": "A0000000038010", "Type": "EMV", "Name": "VISA Plus"}, {"Vendor": "Visa International", "Description": "", "Country": "United States", "AID": "A0000000039010", "Type": "EMV", "Name": "VISA Loyalty"}, {"Vendor": "Visa International", "Description": "", "Country": "United States", "AID": "A000000003999910", "Type": "EMV", "Name": "VISA Proprietary ATM"}, {"Vendor": "Mastercard International", "Description": "Security Domain", "Country": "United States", "AID": "A0000000040000", "Type": "GP", "Name": "MasterCard Card Manager"}, {"Vendor": "Mastercard International", "Description": "AEPM (Association Europenne Payez Mobile)", "Country": "United States", "AID": "A00000000401", "Type": "EMV", "Name": "MasterCard PayPass"}, {"Vendor": "Mastercard International", "Description": "Standard MasterCard", "Country": "United States", "AID": "A0000000041010", "Type": "EMV", "Name": "MasterCard Credit"}, {"Vendor": "Mastercard International", "Description": "Standard MasterCard", "Country": "United States", "AID": "A00000000410101213", "Type": "EMV", "Name": "MasterCard Credit"}, {"Vendor": "Mastercard International", "Description": "Standard MasterCard", "Country": "United States", "AID": "A00000000410101215", "Type": "EMV", "Name": "MasterCard Credit"}, {"Vendor": "Mastercard International", "Description": "Some co-branded card?", "Country": "United States", "AID": "A0000000041010BB5449435301", "Type": "", "Name": "[UNKNOWN]"}, {"Vendor": "Mastercard International", "Description": "MasterCard Specific", "Country": "United States", "AID": "A0000000042010", "Type": "EMV", "Name": "MasterCard Specific"}, {"Vendor": "Mastercard International", "Description": "MasterCard U.S. Maestro", "Country": "United States", "AID": "A0000000042203", "Type": "", "Name": "MasterCard Specific"}, {"Vendor": "Mastercard International", "Description": "MasterCard Specific", "Country": "United States", "AID": "A0000000043010", "Type": "EMV", "Name": "MasterCard Specific"}, {"Vendor": "Mastercard International", "Description": "Maestro (Debit) Card", "Country": "United States", "AID": "A0000000043060", "Type": "EMV", "Name": "Maestro (Debit)"}, {"Vendor": "Mastercard International", "Description": "Maestro (Debit) Card", "Country": "United States", "AID": "A000000004306001", "Type": "EMV", "Name": "Maestro (Debit)"}, {"Vendor": "Mastercard International", "Description": "MasterCard Specific", "Country": "United States", "AID": "A0000000044010", "Type": "EMV", "Name": "MasterCard Specific"}, {"Vendor": "Mastercard International", "Description": "MasterCard Specific", "Country": "United States", "AID": "A0000000045010", "Type": "EMV", "Name": "MasterCard Specific"}, {"Vendor": "Mastercard International", "Description": "AID on Cirrus Test Card", "Country": "United States", "AID": "A0000000045555", "Type": "", "Name": "APDULogger"}, {"Vendor": "Mastercard International", "Description": "Mastercard Cirrus (Interbank Network) ATM card only", "Country": "United States", "AID": "A0000000046000", "Type": "EMV", "Name": "Cirrus"}, {"Vendor": "Mastercard International", "Description": "Chip Authentication Protocol (CAP). Works with NatWest or SecureCode Aut", "Country": "United States", "AID": "A0000000048002", "Type": "EMV", "Name": "SecureCode Auth EMV-CAP"}, {"Vendor": "Mastercard International", "Description": "", "Country": "United States", "AID": "A0000000049999", "Type": "EMV", "Name": "MasterCard PayPass??"}, {"Vendor": "Switch Card Services Ltd.", "Description": "UK Domestic Maestro - Switch (debit card)", "Country": "United Kingdom", "AID": "A0000000050001", "Type": "EMV", "Name": "Maestro UK"}, {"Vendor": "Switch Card Services Ltd.", "Description": "UK Domestic Maestro - Switch (debit card)", "Country": "United Kingdom", "AID": "A0000000050002", "Type": "EMV", "Name": "Solo"}, {"Vendor": "ETSI", "Description": "Orange UK", "Country": "France", "AID": "A0000000090001FF44FF1289", "Type": "", "Name": "Orange"}, {"Vendor": "Europay International", "Description": "", "Country": "Belgium", "AID": "A0000000101030", "Type": "", "Name": "Maestro-CH"}, {"Vendor": "GEMPLUS", "Description": "", "Country": "France", "AID": "A00000001800", "Type": "", "Name": "Gemplus ?"}, {"Vendor": "GEMPLUS", "Description": "", "Country": "France", "AID": "A0000000181001", "Type": "", "Name": "com.gemplus.javacard.util packages"}, {"Vendor": "GEMPLUS", "Description": "434D = CM (ascii). Security domain for some GCX/GXP cards (GemXpresso Pro) (Gemalto)", "Country": "France", "AID": "A000000018434D", "Type": "GP", "Name": "Gemplus card manager"}, {"Vendor": "GEMPLUS", "Description": "(Gemalto)", "Country": "France", "AID": "A000000018434D00", "Type": "GP", "Name": "Gemplus Security Domain"}, {"Vendor": "Midland Bank Plc", "Description": "", "Country": "United Kingdom", "AID": "A00000002401", "Type": "EMV", "Name": "Self Service"}, {"Vendor": "American Express", "Description": "", "Country": "United Kingdom", "AID": "A000000025", "Type": "EMV", "Name": "American Express"}, {"Vendor": "American Express", "Description": "American Express (Credit/Debit)", "Country": "United Kingdom", "AID": "A0000000250000", "Type": "EMV", "Name": "American Express"}, {"Vendor": "American Express", "Description": "AEIPS-compliant (A-E contact EMV) payment application", "Country": "United Kingdom", "AID": "A00000002501", "Type": "EMV", "Name": "American Express"}, {"Vendor": "American Express", "Description": "", "Country": "United Kingdom", "AID": "A000000025010104", "Type": "", "Name": "American Express"}, {"Vendor": "American Express", "Description": "", "Country": "United Kingdom", "AID": "A000000025010402", "Type": "EMV", "Name": "American Express"}, {"Vendor": "American Express", "Description": "", "Country": "United Kingdom", "AID": "A000000025010701", "Type": "EMV", "Name": "ExpressPay"}, {"Vendor": "American Express", "Description": "", "Country": "United Kingdom", "AID": "A000000025010801", "Type": "EMV", "Name": "American Express"}, {"Vendor": "LINK Interchange Network Ltd", "Description": "Link (UK) ATM Network, or AMEX (Portugal?)", "Country": "United Kingdom", "AID": "A0000000291010", "Type": "EMV", "Name": "Link / American Express"}, {"Vendor": "LINK Interchange Network Ltd", "Description": "", "Country": "United Kingdom", "AID": "A00000002945087510100000", "Type": "", "Name": "CO-OP"}, {"Vendor": "LINK Interchange Network Ltd", "Description": "", "Country": "United Kingdom", "AID": "A00000002949034010100001", "Type": "", "Name": "HSBC"}, {"Vendor": "LINK Interchange Network Ltd", "Description": "", "Country": "United Kingdom", "AID": "A00000002949282010100000", "Type": "", "Name": "Barclay"}, {"Vendor": "LINK Interchange Network Ltd", "Description": "", "Country": "United Kingdom", "AID": "A000000029564182", "Type": "", "Name": "HAFX"}, {"Vendor": "Schlumberger Industries Identif d'Encarteur PR050", "Description": "Schlumberger (Gemalto) RID", "Country": "France", "AID": "A00000003029057000AD13100101FF", "Type": "", "Name": "BelPIC (Belgian Personal Identity Card) JavaCard Applet"}, {"Vendor": "Schlumberger Industries Identif d'Encarteur PR050", "Description": "", "Country": "France", "AID": "A0000000308000000000280101", "Type": "", "Name": "Gemalto .NET Card AID"}, {"Vendor": "Groupement des Cartes Bancaires \"CB\"", "Description": "Groupement des Cartes Bancaires (France)", "Country": "France", "AID": "A0000000421010", "Type": "EMV", "Name": "Cartes Bancaire EMV Card"}, {"Vendor": "Groupement des Cartes Bancaires \"CB\"", "Description": "", "Country": "France", "AID": "A0000000422010", "Type": "EMV", "Name": ""}, {"Vendor": "Groupement des Cartes Bancaires \"CB\"", "Description": "", "Country": "France", "AID": "A0000000423010", "Type": "EMV", "Name": ""}, {"Vendor": "Groupement des Cartes Bancaires \"CB\"", "Description": "", "Country": "France", "AID": "A0000000424010", "Type": "EMV", "Name": ""}, {"Vendor": "Groupement des Cartes Bancaires \"CB\"", "Description": "", "Country": "France", "AID": "A0000000425010", "Type": "EMV", "Name": ""}, {"Vendor": "Zentraler Kreditausschuss (ZKA)", "Description": "", "Country": "Germany", "AID": "A00000005945430100", "Type": "", "Name": "Girocard Electronic Cash"}, {"Vendor": "RSA Laboratories", "Description": "RSA PKCS-15 PKI application (Predecessor to ISO7816-15) / ID-card in Finland", "Country": "United States", "AID": "A000000063504B43532D3135", "Type": "", "Name": "PKCS-15"}, {"Vendor": "RSA Laboratories", "Description": "WAP (Wireless Application Protocol) Identity Module / Wireless Identification Module", "Country": "United States", "AID": "A0000000635741502D57494D", "Type": "", "Name": "WAP-WIM"}, {"Vendor": "JCB CO., LTD.", "Description": "Japan Credit Bureau", "Country": "Japan", "AID": "A00000006510", "Type": "EMV", "Name": "JCB"}, {"Vendor": "JCB CO., LTD.", "Description": "Japan Credit Bureau", "Country": "Japan", "AID": "A0000000651010", "Type": "EMV", "Name": "JCB J Smart Credit"}, {"Vendor": "Socit Europenne de Monnaie Electronique SEME", "Description": "", "Country": "France", "AID": "A00000006900", "Type": "EMV", "Name": "Moneo"}, {"Vendor": "Oberthur Technologies", "Description": "", "Country": "France", "AID": "A000000077010000021000000000003B", "Type": "EMV", "Name": "Visa AEPN"}, {"Vendor": "Activcard Europe S.A.", "Description": "Identity Key", "Country": "France", "AID": "A0000000790100", "Type": "", "Name": "CACv2 PKI ID"}, {"Vendor": "Activcard Europe S.A.", "Description": "Digital Signature Key", "Country": "France", "AID": "A0000000790101", "Type": "", "Name": "CACv2 PKI Sign"}, {"Vendor": "Activcard Europe S.A.", "Description": "Key Management Key", "Country": "France", "AID": "A0000000790102", "Type": "", "Name": "CACv2 PKI Enc"}, {"Vendor": "Activcard Europe S.A.", "Description": "Re-directs to CACv2 PKI Identity key", "Country": "France", "AID": "A00000007901F0", "Type": "", "Name": "CACv1 PKI Identity Key"}, {"Vendor": "Activcard Europe S.A.", "Description": "Re-directs to CACv2 Digital Signature key", "Country": "France", "AID": "A00000007901F1", "Type": "", "Name": "CACv1 PKI Digital Signature Key"}, {"Vendor": "Activcard Europe S.A.", "Description": "Re-directs to CACv2 Key Management key", "Country": "France", "AID": "A00000007901F2", "Type": "", "Name": "CACv1 PKI Key Management Key"}, {"Vendor": "Activcard Europe S.A.", "Description": "DoD Demographic", "Country": "France", "AID": "A0000000790200", "Type": "", "Name": "CACv2 DoD Person"}, {"Vendor": "Activcard Europe S.A.", "Description": "DoD Demographic", "Country": "France", "AID": "A0000000790201", "Type": "", "Name": "CACv2 DoD Personnel"}, {"Vendor": "Activcard Europe S.A.", "Description": "General Configuration", "Country": "France", "AID": "A00000007902FB", "Type": "", "Name": "CACv1 BC"}, {"Vendor": "Activcard Europe S.A.", "Description": "PKI Certificate Attributes", "Country": "France", "AID": "A00000007902FD", "Type": "", "Name": "CACv1 BC"}, {"Vendor": "Activcard Europe S.A.", "Description": "PKI Cert", "Country": "France", "AID": "A00000007902FE", "Type": "", "Name": "CACv1 BC"}, {"Vendor": "Activcard Europe S.A.", "Description": "CAC PIN / ID PIN Management Applet", "Country": "France", "AID": "A0000000790300", "Type": "", "Name": "CACv2 Access Control Applet"}, {"Vendor": "Activcard Europe S.A.", "Description": "Joint Data Model. BCAdmin", "Country": "France", "AID": "A0000000791201", "Type": "", "Name": "CAC JDM"}, {"Vendor": "Activcard Europe S.A.", "Description": "Joint Data Model. BCMedical", "Country": "France", "AID": "A0000000791202", "Type": "", "Name": "CAC JDM"}, {"Vendor": "Third Generation Partnership Project (3GPP)", "Description": "", "Country": "France", "AID": "A0000000871002FF49FF0589", "Type": "USIM", "Name": "Telenor USIM"}, {"Vendor": "Buypass AS", "Description": "Used by norwegian public betting company Norsk-Tipping?", "Country": "Norway", "AID": "A00000008810200105C100", "Type": "BuyPass", "Name": "BuyPass BIDA"}, {"Vendor": "Buypass AS", "Description": "", "Country": "Norway", "AID": "A000000088102201034221", "Type": "BuyPass", "Name": "BuyPass BEID (BuyPass Electronic ID?)"}, {"Vendor": "Buypass AS", "Description": "", "Country": "Norway", "AID": "A000000088102201034321", "Type": "BuyPass", "Name": "BuyPass BEID (BuyPass Electronic ID?)"}, {"Vendor": "Sa Proton World International N.V.", "Description": "Proton, which is owned in part by Visa International and American Express Co., is in three other European countries: the original Proton program in Belgium, Chipknip in the Netherlands, and Cash in Switzerland", "Country": "Belgium", "AID": "A0000000960200", "Type": "GP", "Name": "Proton World International Security Domain"}, {"Vendor": "Visa USA", "Description": "Bank of America Debit Card", "Country": "United States", "AID": "A000000098", "Type": "EMV", "Name": "Debit Card"}, {"Vendor": "Visa USA", "Description": "", "Country": "United States", "AID": "A0000000980840", "Type": "", "Name": "Visa Common Debit"}, {"Vendor": "Visa USA", "Description": "Schwab Bank Debit Card", "Country": "United States", "AID": "A0000000980848", "Type": "EMV", "Name": "Debit Card"}, {"Vendor": "Die Post Postfinance", "Description": "", "Country": "Switzerland", "AID": "A0000001110101", "Type": "", "Name": "Postcard"}, {"Vendor": "GSA - TFCS", "Description": "CHUID", "Country": "United States", "AID": "A0000001160300", "Type": "", "Name": "PIV CHUID"}, {"Vendor": "GSA - TFCS", "Description": "Fingerprints", "Country": "United States", "AID": "A0000001166010", "Type": "", "Name": "PIV Fingerprints"}, {"Vendor": "GSA - TFCS", "Description": "Facial Image", "Country": "United States", "AID": "A0000001166030", "Type": "", "Name": "PIV Facial Image"}, {"Vendor": "GSA - TFCS", "Description": "Security Object", "Country": "United States", "AID": "A0000001169000", "Type": "", "Name": "PIV Security Object"}, {"Vendor": "GSA - TFCS", "Description": "PIV Authentication Key", "Country": "United States", "AID": "A000000116A001", "Type": "", "Name": "PIV Authentication Key"}, {"Vendor": "GSA - TFCS", "Description": "Card Capability Container", "Country": "United States", "AID": "A000000116DB00", "Type": "", "Name": "CCC"}, {"Vendor": "Austria Card", "Description": "Domestic Loyalty Program (Version 1.3)", "Country": "Austria", "AID": "A000000118010000", "Type": "", "Name": "DF_Verkehr"}, {"Vendor": "Austria Card", "Description": "Domestic Loyalty Program (Version 1.3)", "Country": "Austria", "AID": "A000000118020000", "Type": "", "Name": "DF_Partner"}, {"Vendor": "Austria Card", "Description": "Domestic Loyalty Program (Version 1.3)", "Country": "Austria", "AID": "A000000118030000", "Type": "", "Name": "DF_Schlerdaten"}, {"Vendor": "Austria Card", "Description": "Domestic Loyalty Program (Version 1.32)", "Country": "Austria", "AID": "A000000118040000", "Type": "", "Name": "DF_KEP_SIG"}, {"Vendor": "Austria Card", "Description": "Digital Signature Application", "Country": "Austria", "AID": "A0000001184543", "Type": "", "Name": "Digital Signature (SSCA)"}, {"Vendor": "Austria Card", "Description": "Encryption Application (Version 1.10)", "Country": "Austria", "AID": "A000000118454E", "Type": "", "Name": "Encryption Application"}, {"Vendor": "PBS Danmark A/S", "Description": "Danish domestic debit card", "Country": "Denmark", "AID": "A0000001211010", "Type": "EMV", "Name": "Dankort (VISA GEM Vision)"}, {"Vendor": "Java Card Forum", "Description": "", "Country": "United States", "AID": "A0000001320001", "Type": "", "Name": "org.javacardforum.javacard.biometry"}, {"Vendor": "TDS TODOS DATA SYSTEM AB", "Description": "", "Country": "Sweden", "AID": "A0000001408001", "Type": "", "Name": "eCode"}, {"Vendor": "Associazione Bancaria Italiana", "Description": "CoGeBan Consorzio BANCOMAT (Italian domestic debit card)", "Country": "Italy", "AID": "A0000001410001", "Type": "EMV", "Name": "PagoBANCOMAT"}, {"Vendor": "GlobalPlatform, Inc.", "Description": "GP Card Manager", "Country": "United States", "AID": "A0000001510000", "Type": "GP", "Name": "Global Platform Security Domain AID"}, {"Vendor": "GlobalPlatform, Inc.", "Description": "SPCASD", "Country": "United States", "AID": "A00000015153504341534400", "Type": "GP", "Name": "CASD_AID"}, {"Vendor": "Diners Club International Ltd.", "Description": "Discover Card", "Country": "United States", "AID": "A0000001523010", "Type": "EMV", "Name": "Discover, Pulse D Pas"}, {"Vendor": "Diners Club International Ltd.", "Description": "Discover Debit Common Card", "Country": "United States", "AID": "A0000001524010", "Type": "EMV", "Name": "Discover"}, {"Vendor": "Banrisul - Banco do Estado do Rio Grande do SUL - S.A.", "Description": "Banrisul (Brazil)", "Country": "Brazil", "AID": "A0000001544442", "Type": "EMV", "Name": "Banricompras Debito"}, {"Vendor": "Zhlke Engineering AG", "Description": "", "Country": "Switzerland", "AID": "A0000001570010", "Type": "", "Name": "AMEX"}, {"Vendor": "Zhlke Engineering AG", "Description": "", "Country": "Switzerland", "AID": "A0000001570020", "Type": "", "Name": "MasterCard"}, {"Vendor": "Zhlke Engineering AG", "Description": "", "Country": "Switzerland", "AID": "A0000001570021", "Type": "", "Name": "Maestro"}, {"Vendor": "Zhlke Engineering AG", "Description": "", "Country": "Switzerland", "AID": "A0000001570022", "Type": "", "Name": "Maestro"}, {"Vendor": "Zhlke Engineering AG", "Description": "", "Country": "Switzerland", "AID": "A0000001570023", "Type": "", "Name": "CASH"}, {"Vendor": "Zhlke Engineering AG", "Description": "", "Country": "Switzerland", "AID": "A0000001570030", "Type": "", "Name": "VISA"}, {"Vendor": "Zhlke Engineering AG", "Description": "", "Country": "Switzerland", "AID": "A0000001570031", "Type": "", "Name": "VISA"}, {"Vendor": "Zhlke Engineering AG", "Description": "", "Country": "Switzerland", "AID": "A0000001570040", "Type": "", "Name": "JCB"}, {"Vendor": "Zhlke Engineering AG", "Description": "", "Country": "Switzerland", "AID": "A0000001570050", "Type": "", "Name": "Postcard"}, {"Vendor": "Zhlke Engineering AG", "Description": "", "Country": "Switzerland", "AID": "A0000001570051", "Type": "", "Name": "Postcard"}, {"Vendor": "Zhlke Engineering AG", "Description": "", "Country": "Switzerland", "AID": "A0000001570100", "Type": "", "Name": "MCard"}, {"Vendor": "Zhlke Engineering AG", "Description": "", "Country": "Switzerland", "AID": "A0000001570104", "Type": "", "Name": "MyOne"}, {"Vendor": "Zhlke Engineering AG", "Description": "", "Country": "Switzerland", "AID": "A0000001570109", "Type": "", "Name": "Mediamarkt Card"}, {"Vendor": "Zhlke Engineering AG", "Description": "", "Country": "Switzerland", "AID": "A000000157010A", "Type": "", "Name": "Gift Card"}, {"Vendor": "Zhlke Engineering AG", "Description": "", "Country": "Switzerland", "AID": "A000000157010B", "Type": "", "Name": "Bonuscard"}, {"Vendor": "Zhlke Engineering AG", "Description": "", "Country": "Switzerland", "AID": "A000000157010C", "Type": "", "Name": "WIRCard"}, {"Vendor": "Zhlke Engineering AG", "Description": "", "Country": "Switzerland", "AID": "A000000157010D", "Type": "", "Name": "Power Card"}, {"Vendor": "Zhlke Engineering AG", "Description": "", "Country": "Switzerland", "AID": "A0000001574443", "Type": "", "Name": "DINERS CLUB"}, {"Vendor": "Zhlke Engineering AG", "Description": "", "Country": "Switzerland", "AID": "A0000001574444", "Type": "", "Name": "Supercard Plus"}, {"Vendor": "IBM", "Description": "identify in JCOP-tools returns eg 27 34 01 2E 00 00 00 00 4E 58 37 35 31 41 00 03 28 62 B3 6A 82", "Country": "Germany", "AID": "A000000167413000FF", "Type": "JCOP", "Name": "JCOP Identify Applet"}, {"Vendor": "IBM", "Description": "?", "Country": "Germany", "AID": "A000000167413001", "Type": "", "Name": "FIPS 140-2"}, {"Vendor": "Financial Information Service Co. Ltd.", "Description": "The Bankers Association of the Republic of China", "Country": "Taiwan", "AID": "A000000172950001", "Type": "EMV", "Name": "BAROC Financial Application Taiwan"}, {"Vendor": "Ministre de L'Intrieur", "Description": "", "Country": "Belgium", "AID": "A000000177504B43532D3135", "Type": "", "Name": "BelPIC (Belgian Personal Identity Card)"}, {"Vendor": "Post Office Limited", "Description": "", "Country": "United Kingdom", "AID": "A0000001850002", "Type": "EMV", "Name": "UK Post Office Account card"}, {"Vendor": "Diners Club Switzerland Ltd", "Description": "", "Country": "Switzerland", "AID": "A0000001884443", "Type": "", "Name": "DINERS CLUB"}, {"Vendor": "Association for Payment Clearing Services", "Description": "", "Country": "United Kingdom", "AID": "A0000002040000", "Type": "", "Name": "?"}, {"Vendor": "Saudi Arabian Monetary Agency (SAMA)", "Description": "SPAN2 (Saudi Payments Network) - Saudi Arabia domestic credit/debit card (Saudi Arabia Monetary Agency)", "Country": "Kingdom of Saudi Arabia", "AID": "A0000002281010", "Type": "EMV", "Name": "SPAN (M/Chip)"}, {"Vendor": "Saudi Arabian Monetary Agency (SAMA)", "Description": "SPAN2 (Saudi Payments Network) - Saudi Arabia domestic credit/debit card (Saudi Arabia Monetary Agency)", "Country": "Kingdom of Saudi Arabia", "AID": "A0000002282010", "Type": "EMV", "Name": "SPAN (VIS)"}, {"Vendor": "Saudi Arabian Monetary Agency (SAMA)", "Description": "SPAN2 (Saudi Payments Network) - Saudi Arabia domestic credit/debit card (Saudi Arabia Monetary Agency)", "Country": "Kingdom of Saudi Arabia", "AID": "A00000022820101010", "Type": "", "Name": "SPAN"}, {"Vendor": "ISO JTC1/SC17/WG3", "Description": "Electronic (Biometric) Passport. Issuer stored data application (The last three digits of the PIX shall be used to denote future version levels.)", "Country": "United Kingdom", "AID": "A0000002471001", "Type": "MRTD", "Name": "Machine Readable Travel Documents (MRTD)"}, {"Vendor": "ISO JTC1/SC17/WG3", "Description": "Electronic (Biometric) Passport. Application for hashes, digital signature, and certificate (The last three digits of the PIX shall be used to denote future version levels.)", "Country": "United Kingdom", "AID": "A0000002472001", "Type": "MRTD", "Name": "Machine Readable Travel Documents (MRTD)"}, {"Vendor": "Interac Association", "Description": "Canadian domestic credit/debit card", "Country": "Canada", "AID": "A0000002771010", "Type": "EMV", "Name": "INTERAC"}, {"Vendor": "PS/SC Workgroup", "Description": "Possibly not an application...", "Country": "United States", "AID": "A00000030600000000000000", "Type": "", "Name": "PC/SC Initial access data AID"}, {"Vendor": "National Institute of Standards and Technology", "Description": "PIV End Point Applet. Last 2 bytes designate version?", "Country": "United States", "AID": "A000000308000010000100", "Type": "", "Name": "Personal Identity Verification (PIV) / ID-ONE PIV BIO"}, {"Vendor": "Currence Holding/PIN BV", "Description": "", "Country": "The Netherlands", "AID": "A00000031510100528", "Type": "EMV", "Name": "Currence PuC"}, {"Vendor": "Currence Holding/PIN BV", "Description": "", "Country": "The Netherlands", "AID": "A0000003156020", "Type": "EMV", "Name": "Chipknip"}, {"Vendor": "Identity Alliance", "Description": "http://osdir.com/ml/lib.muscle/2005-12/msg00066.html", "Country": "United States", "AID": "A00000032301", "Type": "", "Name": "MUSCLE Applet Package"}, {"Vendor": "Identity Alliance", "Description": "http://osdir.com/ml/lib.muscle/2005-12/msg00066.html", "Country": "United States", "AID": "A0000003230101", "Type": "", "Name": "MUSCLE Applet Instance"}, {"Vendor": "Discover Financial Services LLC", "Description": "", "Country": "United States", "AID": "A0000003241010", "Type": "", "Name": "Discover Expresspay (ZIP)"}, {"Vendor": "China Unionpay Co. Ltd", "Description": "", "Country": "China", "AID": "A000000333010101", "Type": "", "Name": "UnionPay Debit"}, {"Vendor": "China Unionpay Co. Ltd", "Description": "", "Country": "China", "AID": "A000000333010102", "Type": "", "Name": "UnionPay Credit"}, {"Vendor": "China Unionpay Co. Ltd", "Description": "", "Country": "China", "AID": "A000000333010103", "Type": "", "Name": "UnionPay Quasi Credit"}, {"Vendor": "China Unionpay Co. Ltd", "Description": "", "Country": "China", "AID": "A000000333010106", "Type": "", "Name": "UnionPay Electronic Cash"}, {"Vendor": "China Unionpay Co. Ltd", "Description": "", "Country": "China", "AID": "A000000333010108", "Type": "", "Name": "U.S. UnionPay Common Debit AID"}, {"Vendor": "Euro Alliance of Payment Schemes s.c.r.l. - EAPS", "Description": "Unknown", "Country": "Belgium", "AID": "A0000003591010", "Type": "", "Name": ""}, {"Vendor": "Euro Alliance of Payment Schemes s.c.r.l. - EAPS", "Description": "ZKA (Germany)", "Country": "Belgium", "AID": "A0000003591010028001", "Type": "EMV", "Name": "Girocard EAPS"}, {"Vendor": "Euro Alliance of Payment Schemes s.c.r.l. - EAPS", "Description": "PagoBANCOMAT", "Country": "Belgium", "AID": "A00000035910100380", "Type": "", "Name": ""}, {"Vendor": "Poste Italiane S.P.A", "Description": "", "Country": "Italy", "AID": "A0000003660001", "Type": "", "Name": "Postamat"}, {"Vendor": "Poste Italiane S.P.A", "Description": "", "Country": "Italy", "AID": "A0000003660002", "Type": "", "Name": "Postamat VISA"}, {"Vendor": "Interswitch Limited", "Description": "Nigerian local switch company", "Country": "Nigeria", "AID": "A0000003710001", "Type": "EMV", "Name": "InterSwitch Verve Card"}, {"Vendor": "NXP Semiconductors Germany GmbH", "Description": "NXP Mf4M", "Country": "Germany", "AID": "A0000003964D66344D0002", "Type": "", "Name": "MIFARE4MOBILE"}, {"Vendor": "Microsoft Corporation", "Description": "Identity Device With Microsoft Generic Profile application. 2 bytes can be added at the end. This byte must be set to the IDMP specification revision number which is currently 0x01. The second byte (yy) is reserved for use by the card application.", "Country": "United States", "AID": "A00000039742544659", "Type": "", "Name": "Microsoft IDMP AID"}, {"Vendor": "Microsoft Corporation", "Description": "MS Plug and Play", "Country": "United States", "AID": "A0000003974349445F0100", "Type": "", "Name": "Microsoft PNP AID"}, {"Vendor": "Unibanco (Hipercard)", "Description": "", "Country": "Brazil", "AID": "A0000004271010", "Type": "", "Name": "Hiperchip"}, {"Vendor": "100", "Description": "", "Country": "Russia", "AID": "A0000004320001", "Type": "", "Name": "Universal Electronic Card"}, {"Vendor": "Edenred", "Description": "", "Country": "Belgium", "AID": "A0000004360100", "Type": "", "Name": "Ticket Restaurant"}, {"Vendor": "ACCEL/Exchange", "Description": "The Exchange Network ATM Network", "Country": "United States", "AID": "A0000004391010", "Type": "", "Name": "Exchange ATM card"}, {"Vendor": "eTranzact", "Description": "Nigerian local switch company", "Country": "Nigeria", "AID": "A0000004540010", "Type": "EMV", "Name": "Etranzact Genesis Card"}, {"Vendor": "eTranzact", "Description": "Nigerian local switch company", "Country": "Nigeria", "AID": "A0000004540011", "Type": "EMV", "Name": "Etranzact Genesis Card 2"}, {"Vendor": "Google", "Description": "GOOGLE_LOCKET_AID", "Country": "United States", "AID": "A0000004762010", "Type": "", "Name": "GOOGLE_CONTROLLER_AID"}, {"Vendor": "Google", "Description": "", "Country": "United States", "AID": "A0000004763030", "Type": "", "Name": "GOOGLE_MIFARE_MANAGER_AID"}, {"Vendor": "Google", "Description": "", "Country": "United States", "AID": "A0000004766C", "Type": "EMV", "Name": "GOOGLE_PAYMENT_AID"}, {"Vendor": "Google", "Description": "", "Country": "United States", "AID": "A000000476A010", "Type": "GP", "Name": "GSD_MANAGER_AID"}, {"Vendor": "Google", "Description": "", "Country": "United States", "AID": "A000000476A110", "Type": "GP", "Name": "GSD_MANAGER_AID"}, {"Vendor": "JVL Ventures, LLC (Softcard)", "Description": "", "Country": "United States", "AID": "A000000485", "Type": "", "Name": "Softcard SmartTap"}, {"Vendor": "RuPay", "Description": "RuPay (India)", "Country": "India", "AID": "A0000005241010", "Type": "EMV", "Name": "RuPay"}, {"Vendor": "Yubico", "Description": "Universal 2-Factor Proof-of-concept/Demo", "Country": "Sweden", "AID": "A0000005271002", "Type": "YKNEO", "Name": "Yubikey NEO U2F Demo applet"}, {"Vendor": "Yubico", "Description": "Javacard Applet AID", "Country": "Sweden", "AID": "A000000527200101", "Type": "YKNEO", "Name": "Yubikey NEO Yubikey2 applet interface"}, {"Vendor": "Yubico", "Description": "Javacard Applet AID", "Country": "Sweden", "AID": "A000000527210101", "Type": "YKNEO", "Name": "Yubikey NEO OATH Applet"}, {"Vendor": "GSMA (GSM Association)", "Description": "", "Country": "United Kingdom", "AID": "A0000005591010FFFFFFFF8900000100", "Type": "", "Name": "ISD-R Application. Used as TAR."}, {"Vendor": "GSMA (GSM Association)", "Description": "", "Country": "United Kingdom", "AID": "A0000005591010FFFFFFFF8900000200", "Type": "", "Name": "ECASD Application. Used as TAR."}, {"Vendor": "GSMA (GSM Association)", "Description": "", "Country": "United Kingdom", "AID": "A0000005591010FFFFFFFF8900000D00", "Type": "", "Name": "ISD-P Executable Load File."}, {"Vendor": "GSMA (GSM Association)", "Description": "", "Country": "United Kingdom", "AID": "A0000005591010FFFFFFFF8900000E00", "Type": "", "Name": "ISD-P Executable Module."}, {"Vendor": "GSMA (GSM Association)", "Description": "", "Country": "United Kingdom", "AID": "A0000005591010FFFFFFFF8900000F00", "Type": "", "Name": "Reserved value for the Profile's ISD-P"}, {"Vendor": "GSMA (GSM Association)", "Description": "", "Country": "United Kingdom", "AID": "A0000005591010FFFFFFFF8900001000", "Type": "", "Name": "ISD-P Application ('1010FFFFFFFF89000010' to '1010FFFFFFFF8900FFFF'. Used as TAR. The value is allocated during the 'Profile Download and Installation procedure'"}, {"Vendor": "Fidesmo", "Description": "", "Country": "Sweden", "AID": "A00000061700", "Type": "", "Name": "Fidesmo javacard"}, {"Vendor": "Debit Network Alliance (DNA)", "Description": "Common U.S. Debit", "Country": "United States", "AID": "A0000006200620", "Type": "", "Name": "Debit Network Alliance (DNA)"}, {"Vendor": "MIR", "Description": "", "Country": "Russia", "AID": "A0000006581010", "Type": "", "Name": "MIR Credit"}, {"Vendor": "MIR", "Description": "", "Country": "Russia", "AID": "A0000006582010", "Type": "", "Name": "MIR Debit"}, {"Vendor": "TROY", "Description": "Turkey's Payment Method", "Country": "Turkey", "AID": "A0000006723010", "Type": "EMV", "Name": "TROY chip credit card"}, {"Vendor": "TROY", "Description": "Turkey's Payment Method", "Country": "Turkey", "AID": "A0000006723020", "Type": "EMV", "Name": "TROY chip debit card"}, {"Vendor": "Indian Oil Corporation Limited", "Description": "Indian Oils Pre Paid Program", "Country": "India", "AID": "A0000007705850", "Type": "EMV", "Name": "XTRAPOWER Fleet Card Program"}, {"Vendor": "MasterCard International", "Description": "Used for development", "Country": "United States", "AID": "B012345678", "Type": "EMV", "Name": "Maestro TEST"}, {"Vendor": "Paylife", "Description": "Domestic Payment System (Version 2.1)", "Country": "Austria", "AID": "D040000001000002", "Type": "", "Name": "Paylife Quick (IEP). Preloaded Electronic Purse"}, {"Vendor": "Austria Card", "Description": "Domestic Payment System (Version 2.1)", "Country": "Austria", "AID": "D040000002000002", "Type": "", "Name": "RFU"}, {"Vendor": "Austria Card", "Description": "Domestic Payment System (Version 2.1)", "Country": "Austria", "AID": "D040000003000002", "Type": "", "Name": "POS"}, {"Vendor": "Austria Card", "Description": "Domestic Payment System (Version 2.1)", "Country": "Austria", "AID": "D040000004000002", "Type": "", "Name": "ATM"}, {"Vendor": "Austria Card", "Description": "Domestic Loyalty Program (Version 2.1)", "Country": "Austria", "AID": "D04000000B000002", "Type": "", "Name": "Retail"}, {"Vendor": "Austria Card", "Description": "Domestic Loyalty Program (Version 2.1)", "Country": "Austria", "AID": "D04000000C000002", "Type": "", "Name": "Bank_Data"}, {"Vendor": "Austria Card", "Description": "Domestic Loyalty Program (Version 2.1)", "Country": "Austria", "AID": "D04000000D000002", "Type": "", "Name": "Shopping"}, {"Vendor": "Austria Card", "Description": "Domestic Loyalty Program (Version 2.0)", "Country": "Austria", "AID": "D040000013000001", "Type": "", "Name": "DF_UNI_Kepler1"}, {"Vendor": "Austria Card", "Description": "Domestic Loyalty Program (Version 1.3)", "Country": "Austria", "AID": "D040000013000001", "Type": "", "Name": "DF_Schler1"}, {"Vendor": "Austria Card", "Description": "Domestic Loyalty Program (Version 2.0)", "Country": "Austria", "AID": "D040000013000002", "Type": "", "Name": "DF_UNI_Kepler2"}, {"Vendor": "Austria Card", "Description": "Domestic Loyalty Program (Version 1.3)", "Country": "Austria", "AID": "D040000013000002", "Type": "", "Name": "DF_Schler2"}, {"Vendor": "Austria Card", "Description": "Domestic Loyalty Program (Version 2.0)", "Country": "Austria", "AID": "D040000014000001", "Type": "", "Name": "DF_Mensa"}, {"Vendor": "Austria Card", "Description": "Domestic Loyalty Program (Version 2.0)", "Country": "Austria", "AID": "D040000015000001", "Type": "", "Name": "DF_UNI_Ausweis"}, {"Vendor": "Austria Card", "Description": "Domestic Loyalty Program (Version 1.3)", "Country": "Austria", "AID": "D040000015000001", "Type": "", "Name": "DF_Ausweis"}, {"Vendor": "Austria Card", "Description": "Domestic EMV Application (Version 2.1)", "Country": "Austria", "AID": "D0400000190001", "Type": "", "Name": "EMV ATM Maestro"}, {"Vendor": "Austria Card", "Description": "Domestic EMV Application (Version 2.1)", "Country": "Austria", "AID": "D0400000190002", "Type": "", "Name": "EMV POS Maestro"}, {"Vendor": "Austria Card", "Description": "Domestic EMV Application (Version 2.1)", "Country": "Austria", "AID": "D0400000190003", "Type": "", "Name": "EMV ATM MasterCard"}, {"Vendor": "Austria Card", "Description": "Domestic EMV Application (Version 2.1)", "Country": "Austria", "AID": "D0400000190004", "Type": "", "Name": "EMV POS MasterCard"}, {"Vendor": "Austria Card", "Description": "Domestic Payment System (Version 2.1)", "Country": "Austria", "AID": "D0400000190010", "Type": "", "Name": "Digital ID"}, {"Vendor": "Ministry of Finance of Georgia", "Description": "Georgia Revenue Service application for fiscal cash registers", "Country": "Georgia", "AID": "D268000001", "Type": "", "Name": "Fiscal module application"}, {"Vendor": "Giesecke&Devrient", "Description": "Giesecke & Devrient", "Country": "Germany", "AID": "D276000005", "Type": "", "Name": ""}, {"Vendor": "Giesecke&Devrient", "Description": "", "Country": "Germany", "AID": "D276000005AA040360010410", "Type": "", "Name": "G D App Nokia 6212"}, {"Vendor": "Giesecke&Devrient", "Description": "", "Country": "Germany", "AID": "D276000005AA0503E00401", "Type": "", "Name": "G D App Nokia 6212"}, {"Vendor": "Giesecke&Devrient", "Description": "", "Country": "Germany", "AID": "D276000005AA0503E00501", "Type": "", "Name": "G D App Nokia 6212"}, {"Vendor": "Giesecke&Devrient", "Description": "", "Country": "Germany", "AID": "D276000005AA0503E0050101", "Type": "", "Name": "G D App Nokia 6212"}, {"Vendor": "Giesecke&Devrient", "Description": "", "Country": "Germany", "AID": "D276000005AB0503E0040101", "Type": "", "Name": "G D App Nokia 6212"}, {"Vendor": "IBM Laboratories", "Description": "IBM Test card from the book 'Smart Card Application Development Using Java'", "Country": "Germany", "AID": "D27600002200000001", "Type": "", "Name": "SCT LOYALTY"}, {"Vendor": "IBM Laboratories", "Description": "IBM Test card from the book 'Smart Card Application Development Using Java'", "Country": "Germany", "AID": "D27600002200000002", "Type": "", "Name": "BUSINESS CARD"}, {"Vendor": "IBM Laboratories", "Description": "IBM Test card from the book 'Smart Card Application Development Using Java'", "Country": "Germany", "AID": "D27600002200000060", "Type": "", "Name": "PKCS#11 Token"}, {"Vendor": "ZKA", "Description": "Girocard (Geldkarte) in Germany", "Country": "Germany", "AID": "D276000025", "Type": "", "Name": "Girocard"}, {"Vendor": "ZKA", "Description": "Unknown", "Country": "Germany", "AID": "D27600002545410100", "Type": "", "Name": ""}, {"Vendor": "ZKA", "Description": "ZKA Girocard (Geldkarte) (Germany)", "Country": "Germany", "AID": "D27600002545500100", "Type": "EMV", "Name": "Girocard"}, {"Vendor": "ZKA", "Description": "", "Country": "Germany", "AID": "D27600002547410100", "Type": "", "Name": "Girocard ATM"}, {"Vendor": "Wolfgang Rankl", "Description": "", "Country": "Germany", "AID": "D276000060", "Type": "", "Name": ""}, {"Vendor": "NXP Semiconductors / NFC Forum", "Description": "NFC Forum Type 4 Tag", "Country": "Germany", "AID": "D2760000850100", "Type": "", "Name": "NDEF Tag Application / Mifare DESFire Tag Application"}, {"Vendor": "NXP Semiconductors / NFC Forum", "Description": "NFC Tag type 4 tag", "Country": "Germany", "AID": "D2760000850101", "Type": "", "Name": "NDEF Tag Application"}, {"Vendor": "Giesecke&Devrient Java Card Telecommunikation", "Description": "", "Country": "Germany", "AID": "D276000118", "Type": "", "Name": ""}, {"Vendor": "Giesecke&Devrient Java Card Telecommunikation", "Description": "Devrient Test Applet?", "Country": "Germany", "AID": "D2760001180101", "Type": "", "Name": "Giesecke &amp"}, {"Vendor": "fsfEurope", "Description": "For selection when not knowing the exact full AID", "Country": "Germany", "AID": "D27600012401", "Type": "OpenPGP", "Name": "OpenPGP Card"}, {"Vendor": "fsfEurope", "Description": "Version 1", "Country": "Germany", "AID": "D276000124010101FFFF000000010000", "Type": "OpenPGP", "Name": "OpenPGP Card"}, {"Vendor": "fsfEurope", "Description": "Version 2", "Country": "Germany", "AID": "D2760001240102000000000000010000", "Type": "OpenPGP", "Name": "OpenPGP Card"}, {"Vendor": "fsfEurope", "Description": "http://smartchess.de/englisch/SmartChess_1.0.pdf", "Country": "Germany", "AID": "D27600012402", "Type": "SmartChess", "Name": "SmartChess"}, {"Vendor": "fsfEurope", "Description": "http://smartchess.de/englisch/SmartChess_1.0.pdf", "Country": "Germany", "AID": "D2760001240200010000000000000000", "Type": "SmartChess", "Name": "SmartChess"}, {"Vendor": "", "Description": "", "Country": "Republic of Korea", "AID": "D4100000011010", "Type": "", "Name": ""}, {"Vendor": "", "Description": "(Netherlands)", "Country": "The Netherlands", "AID": "D5280050218002", "Type": "EMV", "Name": "?"}, {"Vendor": "Bankaxept", "Description": "Norwegian domestic debit card", "Country": "Norway", "AID": "D5780000021010", "Type": "EMV", "Name": "Bankaxept"}, {"Vendor": "Swiss Travel Fund (Reka)", "Description": "prepaid functional debit card", "Country": "Switzerland", "AID": "D7560000010101", "Type": "", "Name": "Reka Card"}, {"Vendor": "Migros (FCM, GE Money Bank and MasterCard)", "Description": "", "Country": "Switzerland", "AID": "D7560000300101", "Type": "", "Name": "M Budget"}, {"Vendor": "", "Description": "German eID", "Country": "", "AID": "E80704007F00070302", "Type": "", "Name": "nPA"}, {"Vendor": "", "Description": "", "Country": "", "AID": "E82881C11702", "Type": "", "Name": "AlphaCard application"}, {"Vendor": "", "Description": "Iso adoption of PKCS-15", "Country": "", "AID": "E828BD080F", "Type": "", "Name": "ISO-7816-15 EF.DIR"}, {"Vendor": "", "Description": "Brazilian Bank Banco Bradesco", "Country": "", "AID": "F0000000030001", "Type": "EMV", "Name": "BRADESCO"}]
\ No newline at end of file
diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index 9ce554ce2..6d7741153 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -914,7 +914,7 @@ static command_t CommandTable[] =
 };
 
 int CmdHFFido(const char *Cmd) {
-	(void)WaitForResponseTimeout(CMD_ACK,NULL,100);
+	(void)WaitForResponseTimeout(CMD_ACK, NULL, 100);
 	CmdsParse(CommandTable, Cmd);
 	return 0;
 }
diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index 1ba59dced..a5a20f5e2 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -8,6 +8,7 @@
 // Proxmark3 RDV40 Smartcard module commands
 //-----------------------------------------------------------------------------
 #include "cmdsmartcard.h"
+#include "../emv/emvjson.h"
 
 static int CmdHelp(const char *Cmd);
 
@@ -24,6 +25,9 @@ int usage_sm_raw(void) {
 	PrintAndLogEx(NORMAL, "Examples:");
 	PrintAndLogEx(NORMAL, "        sc raw s 0 d 00a404000e315041592e5359532e4444463031  - `1PAY.SYS.DDF01` PPSE directory with get ATR");
 	PrintAndLogEx(NORMAL, "        sc raw 0 d 00a404000e325041592e5359532e4444463031    - `2PAY.SYS.DDF01` PPSE directory");
+	PrintAndLogEx(NORMAL, "        sc raw 0 t d 00a4040007a000000004101000              - Mastercard");
+	PrintAndLogEx(NORMAL, "        sc raw 0 t d 00a4040007a0000000031010                - Visa");
+
 	return 0;
 }
 int usage_sm_reader(void) {
@@ -64,15 +68,48 @@ int usage_sm_setclock(void) {
 	return 0;
 }
 int usage_sm_brute(void) {
-	PrintAndLogEx(NORMAL, "Tries to bruteforce SFI, ");
+	PrintAndLogEx(NORMAL, "Tries to bruteforce SFI, using a known list of AID's ");
 	PrintAndLogEx(NORMAL, "Usage: sc brute [h]");
 	PrintAndLogEx(NORMAL, "       h          :  this help");
+	PrintAndLogEx(NORMAL, "       t          :  executes TLV decoder if it possible");
+//	PrintAndLogEx(NORMAL, "       0          :  use protocol T=0");
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        sc brute");
+	PrintAndLogEx(NORMAL, "        sc brute t");
 	return 0;
 }
 
+static int smart_loadjson(const char *preferredName, const char *suffix, json_t **root) {
+
+	json_error_t error;
+
+	if ( preferredName == NULL ) return 1;
+	if ( suffix == NULL ) return 1;
+
+	int retval = 0;
+	int size = sizeof(char) * (strlen(preferredName) + strlen(suffix) + 10);
+	char * fileName = calloc(size, sizeof(char));
+	sprintf(fileName, "%s.%s", preferredName, suffix);
+
+	*root = json_load_file(fileName, 0, &error);
+	if (!*root) {
+		PrintAndLogEx(ERR, "json (%s) error on line %d: %s", fileName, error.line, error.text);
+		retval = 2; 
+		goto out;
+	}
+	
+	if (!json_is_array(*root)) {
+		PrintAndLogEx(ERR, "Invalid json (%s) format. root must be an array.", fileName);
+		retval = 3; 
+		goto out;
+	}
+
+	PrintAndLogEx(SUCCESS, "Loaded file (%s) OK.", fileName);
+out:	
+	free(fileName);
+	return retval;	
+}
+
 uint8_t GetATRTA1(uint8_t *atr, size_t atrlen) {
 	if (atrlen > 2) {		
 		uint8_t T0 = atr[1];
@@ -142,19 +179,16 @@ float FArray[] = {
 
 int GetATRDi(uint8_t *atr, size_t atrlen) {
 	uint8_t TA1 = GetATRTA1(atr, atrlen);
-	
-	return DiArray[TA1 & 0x0f];  // The 4 low-order bits of TA1 (4th MSbit to 1st LSbit) encode Di 
+	return DiArray[TA1 & 0x0F];  // The 4 low-order bits of TA1 (4th MSbit to 1st LSbit) encode Di 
 }
 
 int GetATRFi(uint8_t *atr, size_t atrlen) {
 	uint8_t TA1 = GetATRTA1(atr, atrlen);
-
 	return FiArray[TA1 >> 4];  // The 4 high-order bits of TA1 (8th MSbit to 5th LSbit) encode fmax and Fi
 }
 
 float GetATRF(uint8_t *atr, size_t atrlen) {
 	uint8_t TA1 = GetATRTA1(atr, atrlen);
-
 	return FArray[TA1 >> 4];  // The 4 high-order bits of TA1 (8th MSbit to 5th LSbit) encode fmax and Fi
 }
 
@@ -284,31 +318,31 @@ static bool smart_select(bool silent) {
 	return true;
 }
 
-static int smart_wait(uint8_t *data) {
+static int smart_wait(uint8_t *data, bool silent) {
 	UsbCommand resp;
 	if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
-		PrintAndLogEx(WARNING, "smart card response timeout");
+		if (!silent) PrintAndLogEx(WARNING, "smart card response timeout");
 		return -1;
 	}
 	
 	uint32_t len = resp.arg[0];	
 	if ( !len ) {
-		PrintAndLogEx(WARNING, "smart card response failed");
+		if (!silent) PrintAndLogEx(WARNING, "smart card response failed");
 		return -2;			
 	}
 	memcpy(data, resp.d.asBytes, len);	
 	if (len >= 2) {		
-		PrintAndLogEx(SUCCESS, "%02X%02X | %s", data[len - 2], data[len - 1], GetAPDUCodeDescription(data[len - 2], data[len - 1])); 
+		if (!silent) PrintAndLogEx(SUCCESS, "%02X%02X | %s", data[len - 2], data[len - 1], GetAPDUCodeDescription(data[len - 2], data[len - 1])); 
 	} else {
-		PrintAndLogEx(SUCCESS, " %d | %s", len, sprint_hex_inrow_ex(data,  len, 8));
+		if (!silent) PrintAndLogEx(SUCCESS, " %d | %s", len, sprint_hex_inrow_ex(data,  len, 8));
 	}
 	
 	return len;
 }
 
-static int smart_response(uint8_t *data) {
+static int smart_responseEx(uint8_t *data, bool silent) {
 		
-	int datalen = smart_wait(data);	
+	int datalen = smart_wait(data, silent);	
 	bool needGetData = false;
 	
 	if (datalen < 2 ) {
@@ -321,14 +355,14 @@ static int smart_response(uint8_t *data) {
 
 	if (needGetData) {
 		int len = data[datalen - 1];
-		PrintAndLogEx(INFO, "Requesting 0x%02X bytes response", len);	
+		if (!silent) PrintAndLogEx(INFO, "Requesting 0x%02X bytes response", len);	
 		uint8_t getstatus[] = {0x00, ISO7816_GETSTATUS, 0x00, 0x00, len};
 		UsbCommand cStatus = {CMD_SMART_RAW, {SC_RAW, sizeof(getstatus), 0}};	
 		memcpy(cStatus.d.asBytes, getstatus, sizeof(getstatus) );
 		clearCommandBuffer();
 		SendCommand(&cStatus);
 
-		datalen = smart_wait(data);
+		datalen = smart_wait(data, silent);
 
 		if (datalen < 2 ) {
 			goto out;
@@ -339,7 +373,9 @@ static int smart_response(uint8_t *data) {
 			// data with ACK
 			if (datalen == len + 2 + 1) { // 2 - response, 1 - ACK
 				if (data[0] != ISO7816_GETSTATUS) {
-					PrintAndLogEx(ERR, "GetResponse ACK error. len 0x%x | data[0] %02X", len, data[0]);	
+					if (!silent) {
+						PrintAndLogEx(ERR, "GetResponse ACK error. len 0x%x | data[0] %02X", len, data[0]);	
+					}
 					datalen = 0;
 					goto out;
 				}
@@ -348,7 +384,9 @@ static int smart_response(uint8_t *data) {
 				memmove(data, &data[1], datalen);
 			} else {
 				// wrong length
-				PrintAndLogEx(WARNING, "GetResponse wrong length. Must be 0x%02X got 0x%02X", len, datalen - 3);	
+				if (!silent) {
+					PrintAndLogEx(WARNING, "GetResponse wrong length. Must be 0x%02X got 0x%02X", len, datalen - 3);	
+				}
 			}
 		}
 	}
@@ -357,6 +395,10 @@ out:
 	return datalen;
 }
 
+static int smart_response(uint8_t *data) {
+	return smart_responseEx(data, false);
+}
+
 int CmdSmartRaw(const char *Cmd) {
 
 	int hexlen = 0;
@@ -488,7 +530,7 @@ int ExchangeAPDUSC(uint8_t *datain, int datainlen, bool activateCard, bool leave
 	clearCommandBuffer();
 	SendCommand(&c);	
 	
-	int len = smart_response(dataout);
+	int len = smart_responseEx(dataout, true);
 	
 	if ( len < 0 ) {
 		return 2;
@@ -505,11 +547,10 @@ int ExchangeAPDUSC(uint8_t *datain, int datainlen, bool activateCard, bool leave
 		clearCommandBuffer();
 		SendCommand(&c2);	
 		
-		len = smart_response(dataout);
+		len = smart_responseEx(dataout, true);
 	}	
 	
 	*dataoutlen = len;
-
 	return 0;
 }	
 
@@ -679,14 +720,14 @@ int CmdSmartInfo(const char *Cmd){
 	if (GetATRTA1(card.atr, card.atr_len) == 0x11)
 		PrintAndLogEx(INFO, "Using default values...");
 	
-	PrintAndLogEx(NORMAL, "\t- Di=%d", Di);
-	PrintAndLogEx(NORMAL, "\t- Fi=%d", Fi);
-	PrintAndLogEx(NORMAL, "\t- F=%.1f MHz", F);
+	PrintAndLogEx(NORMAL, "\t- Di %d", Di);
+	PrintAndLogEx(NORMAL, "\t- Fi %d", Fi);
+	PrintAndLogEx(NORMAL, "\t- F  %.1f MHz", F);
   
 	if (Di && Fi) {
-		PrintAndLogEx(NORMAL, "\t- Cycles/ETU=%d", Fi/Di);
+		PrintAndLogEx(NORMAL, "\t- Cycles/ETU %d", Fi/Di);
 		PrintAndLogEx(NORMAL, "\t- %.1f bits/sec at 4MHz", (float)4000000 / (Fi/Di));
-		PrintAndLogEx(NORMAL, "\t- %.1f bits/sec at Fmax=%.1fMHz", (F * 1000000) / (Fi/Di), F);
+		PrintAndLogEx(NORMAL, "\t- %.1f bits/sec at Fmax (%.1fMHz)", (F * 1000000) / (Fi/Di), F);
 	} else {
 		PrintAndLogEx(WARNING, "\t- Di or Fi is RFU.");
 	};
@@ -798,58 +839,210 @@ int CmdSmartList(const char *Cmd) {
 
 int CmdSmartBruteforceSFI(const char *Cmd) {
 
-	char ctmp = tolower(param_getchar(Cmd, 0));
-	if (ctmp == 'h') return usage_sm_brute();
-	
-	uint8_t data[5] = {0x00, 0xB2, 0x00, 0x00, 0x00};
-
-	PrintAndLogEx(INFO, "Selecting card");
-	if ( !smart_select(false) ) {
-		return 1;
+	uint8_t cmdp = 0;
+	bool errors = false, decodeTLV = false; //, useT0 = false;	
+		
+	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+		switch (tolower(param_getchar(Cmd, cmdp))) {
+		case 'h': return usage_sm_brute();		
+		case 't':
+			decodeTLV = true;
+			cmdp++;
+			break;
+/*			
+		case '0':
+			useT0 = true;
+			cmdp++;
+			break;
+*/			
+		default:
+			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+			errors = true;
+			break;
+		}
 	}
 	
-	PrintAndLogEx(INFO, "Selecting PPSE aid");
-	CmdSmartRaw("s 0 t d 00a404000e325041592e5359532e4444463031");
-	CmdSmartRaw("0 t d 00a4040007a000000004101000");  // mastercard
-//	CmdSmartRaw("0 t d 00a4040007a0000000031010"); // visa
+	//Validations
+	if (errors) return usage_sm_brute();			
+
+	const char *SELECT = "00a40400%02x%s";	
 	
-	PrintAndLogEx(INFO, "starting");
+	uint8_t READ_RECORD[] = {0x00, 0xB2, 0x00, 0x00, 0x00};
+	uint8_t GET_PROCESSING_OPTIONS[] = {0x80, 0xA8, 0x00, 0x00, 0x02, 0x83, 0x00, 0x00};
+
+//	uint8_t GENERATE_AC[] = {0x80, 0xAE};
+//	uint8_t GET_CHALLENGE[] = {0x00, 0x84, 0x00};
+//	uint8_t GET_DATA[] = {0x80, 0xCA, 0x00, 0x00, 0x00};
+//	uint8_t SELECT[] = {0x00, 0xA4, 0x04, 0x00};
+//	uint8_t UNBLOCK_PIN[] = {0x84, 0x24, 0x00, 0x00, 0x00};
+//	uint8_t VERIFY[] = {0x00, 0x20, 0x00, 0x80};
 	
-	UsbCommand c = {CMD_SMART_RAW, {SC_RAW, sizeof(data), 0}};	
+	
+	// Select AID command
+	UsbCommand cAid = {CMD_SMART_RAW, {SC_RAW_T0, 0, 0}};
+		
+	// Get processing options command
+	UsbCommand cOpt = {CMD_SMART_RAW, {SC_RAW_T0, sizeof(GET_PROCESSING_OPTIONS), 0}};	
+	memcpy(cOpt.d.asBytes, GET_PROCESSING_OPTIONS, sizeof(GET_PROCESSING_OPTIONS) );
+	
+	// READ RECORD
+	UsbCommand cSFI = {CMD_SMART_RAW, {SC_RAW_T0, sizeof(READ_RECORD), 0}};	
+			
+	
+	PrintAndLogEx(INFO, "Importing AID list");
+	json_t *root = NULL;
+	smart_loadjson("aidlist", "json", &root);
+
 	uint8_t* buf = malloc(USB_CMD_DATA_SIZE);
 	if ( !buf )
 		return 1;		
-		
-	for (uint8_t i=1; i < 4; i++) {
-		for (int p1=1; p1 < 5; p1++) {
-			
-			data[2] = p1;
-			data[3] = (i << 3) + 4;
 
-			memcpy(c.d.asBytes, data, sizeof(data) );
-			clearCommandBuffer();
-			SendCommand(&c);
-			
-			smart_response(buf);
-			
-			if ( buf[0] == 0x6C ) {
-				data[4]	= buf[1];
-				
-				memcpy(c.d.asBytes, data, sizeof(data) );
-				clearCommandBuffer();
-				SendCommand(&c);
-				uint8_t len = smart_response(buf);
-				
-				// TLV decoder
-				if (len > 4)
-					TLVPrintFromBuffer(buf+1, len-3);
+	uint8_t* sfibuf = malloc(USB_CMD_DATA_SIZE);
+	if ( !sfibuf ) 
+		return 1;
+
+	PrintAndLogEx(INFO, "Selecting card");
+	if ( !smart_select(false) )
+		return 1;
+
 	
-				data[4] = 0;
-			}
-			memset(buf, 0x00, USB_CMD_DATA_SIZE);
+	for (int i = 0; i < json_array_size(root); i++) {
+		json_t *data, *jaid;
+
+		data = json_array_get(root, i);
+		if (!json_is_object(data)) {
+			PrintAndLogEx(ERR, "data %d is not an object\n", i + 1);
+			json_decref(root);
+			return 1;
 		}
-	}	
+		
+		jaid = json_object_get(data, "AID");
+		if (!json_is_string(jaid)) {
+			PrintAndLogEx(ERR, "AID data [%d] is not a string", i + 1);
+			json_decref(root);
+			return 1;
+		}
+		
+		const char* aid = json_string_value(jaid);
+		if ( !aid ) continue;
+
+		size_t aidlen = strlen(aid);
+		char* caid = calloc( 8+2+aidlen+1, sizeof(uint8_t));
+		snprintf(caid, 8+2+aidlen+1, SELECT, aidlen >> 1, aid);		
+		
+		int hexlen = 0;
+		int res = param_gethex_to_eol(caid, 0, cAid.d.asBytes, sizeof(cAid.d.asBytes), &hexlen);
+		if ( res ) continue;
+		
+		cAid.arg[1] = hexlen;
+
+		clearCommandBuffer();
+		SendCommand(&cAid);	
+		
+		int len = smart_responseEx(buf, true);		
+		if ( len < 3 ) {
+			free(caid);			
+			continue;
+		}
+		
+		json_t *jvendor, *jname;
+		jvendor = json_object_get(data, "Vendor");
+		if (!json_is_string(jvendor)) {
+			PrintAndLogEx(ERR, "Vendor data [%d] is not a string", i + 1);
+			continue;
+		}
+		
+		const char* vendor = json_string_value(jvendor);
+		if ( !vendor ) continue;
+
+		jname = json_object_get(data, "Name");
+		if (!json_is_string(jname)) {
+			PrintAndLogEx(ERR, "Name data [%d] is not a string", i + 1);
+			continue;
+		}
+		const char* name = json_string_value(jname);
+		if ( !name ) continue;
+
+		PrintAndLogEx(SUCCESS, "AID %s | %s | %s", aid, vendor, name);
+
+		// Get processing options
+		clearCommandBuffer();
+		SendCommand(&cOpt);
+		
+		uint8_t optionslen = smart_responseEx(buf, true);
+		if ( optionslen > 4 ) {
+			PrintAndLogEx(SUCCESS, "Got processing options");			
+			if ( decodeTLV ) {
+				TLVPrintFromBuffer(buf, optionslen-2);
+			}
+		} else {
+			PrintAndLogEx(FAILED, "Getting processing options failed");
+		}
+		
+		PrintAndLogEx(INFO, "Start SFI brute forcing");
+		
+		for (uint8_t sfi=1; sfi <= 31; sfi++) {
+
+			printf("."); fflush(stdout);
+			
+			for (uint16_t rec=1; rec <= 5; rec++) {
+
+				if (ukbhit()) {
+					int gc = getchar();	(void)gc;
+					PrintAndLogEx(NORMAL, "\naborted via keyboard!\n");
+					free(caid);
+					goto out;
+				}			
+			
+				READ_RECORD[2] = rec;
+				READ_RECORD[3] = (sfi << 3) | 4;
+
+				memcpy(cSFI.d.asBytes, READ_RECORD, sizeof(READ_RECORD) );
+				clearCommandBuffer();
+				SendCommand(&cSFI);
+				
+				uint8_t sfilen = smart_responseEx(sfibuf, true);
+				
+				if ( sfibuf[0] == 0x6C ) {
+					READ_RECORD[4]	= sfibuf[1];
+					
+					memcpy(cSFI.d.asBytes, READ_RECORD, sizeof(READ_RECORD) );
+					clearCommandBuffer();
+					SendCommand(&cSFI);
+					sfilen = smart_responseEx(sfibuf, true);
+					
+					READ_RECORD[4] = 0;				
+				}
+				
+				if ( sfilen > 4 ) {
+				
+					PrintAndLogEx(SUCCESS, "\n\t file %02d, record %02d found", sfi, rec);
+					
+					uint8_t modifier = (sfibuf[0] == 0xC0) ? 1 : 0;
+					
+					if ( decodeTLV ) {
+						if (!TLVPrintFromBuffer(sfibuf + modifier, sfilen-2-modifier)) {
+							PrintAndLogEx(SUCCESS, "\tHEX: %s", sprint_hex(sfibuf, sfilen));
+						}
+					}
+										
+				}
+				memset(sfibuf, 0x00, USB_CMD_DATA_SIZE);
+			}
+		}
+		
+		free(sfibuf);	
+		free(caid);		
+		PrintAndLogEx(SUCCESS, "\nSFI brute force done\n");
+	}
+out:
+	if ( sfibuf )
+		free(sfibuf);
+	
 	free(buf);
+	json_decref(root);
+	
+	PrintAndLogEx(SUCCESS, "Search completed.");
 	return 0;
 }
 
diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index 647123faf..13f64a616 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -1464,6 +1464,7 @@ int CmdEMVGetrng(const char *Cmd) {
 	char cmdp = param_getchar(Cmd, 0);
 	if ( cmdp == 'h' || cmdp == 'H') return usage_emv_getrnd();
 
+	PrintAndLogEx(INFO, "Not implemented yet");
 	return 0;
 }
 
diff --git a/client/emv/emv_tags.c b/client/emv/emv_tags.c
index cc2897127..63397f19e 100644
--- a/client/emv/emv_tags.c
+++ b/client/emv/emv_tags.c
@@ -259,6 +259,21 @@ static const struct emv_tag emv_tags[] = {
 	{ 0x9f4c, "ICC Dynamic Number" },
 	{ 0x9f4d, "Log Entry" },
 	{ 0x9f4f, "Log Format", EMV_TAG_DOL },
+	
+	{ 0x9f50, "Offline Accumulator Balance" },
+	{ 0x9f51, "Application Currency Code" },
+	{ 0x9f51, "DRDOL" },
+	{ 0x9f52, "Application Default Action (ADA)" },
+	{ 0x9f52, "Terminal Compatibility Indicator" },
+	{ 0x9f55, "Issuer Authentication Flags" },
+	{ 0x9f56, "Issuer Authentication Indicator" },
+	{ 0x9f57, "Issuer Country Code" },
+	{ 0x9f58, "Consecutive Transaction Counter Limit (CTCL)" },
+	{ 0x9f59, "Consecutive Transaction Counter Upper Limit (CTCUL)" },
+	{ 0x9f5A, "Application Program Identifier" },
+	{ 0x9f5b, "Issuer Script Results" },
+	{ 0x9f5c, "Cumulative Total Transaction Amount Upper Limit (CTTAUL)" },
+	
 	{ 0x9f60, "CVC3 (Track1)" },
 	{ 0x9f61, "CVC3 (Track2)" },
 	{ 0x9f62, "PCVC3(Track1)" },
@@ -278,21 +293,18 @@ static const struct emv_tag emv_tags[] = {
 	{ 0xdf20, "Issuer Proprietary Bitmap (IPB)" },
 };
 
-static int emv_sort_tag(tlv_tag_t tag)
-{
+static int emv_sort_tag(tlv_tag_t tag) {
 	return (int)(tag >= 0x100 ? tag : tag << 8);
 }
 
-static int emv_tlv_compare(const void *a, const void *b)
-{
+static int emv_tlv_compare(const void *a, const void *b) {
 	const struct tlv *tlv = a;
 	const struct emv_tag *tag = b;
 
 	return emv_sort_tag(tlv->tag) - (emv_sort_tag(tag->tag));
 }
 
-static const struct emv_tag *emv_get_tag(const struct tlv *tlv)
-{
+static const struct emv_tag *emv_get_tag(const struct tlv *tlv) {
 	struct emv_tag *tag = bsearch(tlv, emv_tags, sizeof(emv_tags)/sizeof(emv_tags[0]),
 			sizeof(emv_tags[0]), emv_tlv_compare);
 
@@ -310,8 +322,7 @@ static const char *bitstrings[] = {
 	"1.......",
 };
 
-static void emv_tag_dump_bitmask(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level)
-{
+static void emv_tag_dump_bitmask(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level) {
 	const struct emv_tag_bit *bits = tag->data;
 	unsigned bit, byte;
 
@@ -331,8 +342,7 @@ static void emv_tag_dump_bitmask(const struct tlv *tlv, const struct emv_tag *ta
 	}
 }
 
-static void emv_tag_dump_dol(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level)
-{
+static void emv_tag_dump_dol(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level) {
 	const unsigned char *buf = tlv->value;
 	size_t left = tlv->len;
 
@@ -353,7 +363,7 @@ static void emv_tag_dump_dol(const struct tlv *tlv, const struct emv_tag *tag, F
 	}
 }
 
-static void emv_tag_dump_string(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level){
+static void emv_tag_dump_string(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level) {
 	fprintf(f, "\tString value '");
 	fwrite(tlv->value, 1, tlv->len, f);
 	fprintf(f, "'\n");
@@ -468,8 +478,6 @@ static void emv_tag_dump_cvr(const struct tlv *tlv, const struct emv_tag *tag, F
 	
 	if (data[0] || data[1] || data[2] || data[3])
 		emv_tag_dump_bitmask(&bit_tlv, &bit_tag, f, level);
-	
-	return;
 }
 
 // EMV Book 3
@@ -512,12 +520,9 @@ static void emv_tag_dump_cid(const struct tlv *tlv, const struct emv_tag *tag, F
 				break;
 		}
 	}
-
-	return;
 }
 
-static void emv_tag_dump_cvm_list(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level)
-{
+static void emv_tag_dump_cvm_list(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level) {
 	uint32_t X, Y;
 	int i;
 
@@ -615,7 +620,7 @@ static void emv_tag_dump_cvm_list(const struct tlv *tlv, const struct emv_tag *t
 	}
 }
 
-static void emv_tag_dump_afl(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level){
+static void emv_tag_dump_afl(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level) {
 	if (tlv->len < 4 || tlv->len % 4) {
 		PRINT_INDENT(level);
 		fprintf(f, "\tINVALID!\n");
@@ -628,8 +633,7 @@ static void emv_tag_dump_afl(const struct tlv *tlv, const struct emv_tag *tag, F
 	}
 }
 
-bool emv_tag_dump(const struct tlv *tlv, FILE *f, int level)
-{
+bool emv_tag_dump(const struct tlv *tlv, FILE *f, int level) {
 	if (!tlv) {
 		fprintf(f, "NULL\n");
 		return false;
@@ -682,8 +686,7 @@ bool emv_tag_dump(const struct tlv *tlv, FILE *f, int level)
 	return true;
 }
 
-char *emv_get_tag_name(const struct tlv *tlv)
-{
+char *emv_get_tag_name(const struct tlv *tlv) {
 	static char *defstr = "";
 	
 	if (!tlv) 
diff --git a/client/emv/emvcore.c b/client/emv/emvcore.c
index 058aefe50..0c3bb7626 100644
--- a/client/emv/emvcore.c
+++ b/client/emv/emvcore.c
@@ -120,7 +120,7 @@ static bool print_cb(void *data, const struct tlv *tlv, int level, bool is_leaf)
 	return true;
 }
 
-void TLVPrintFromBuffer(uint8_t *data, int datalen) {
+bool TLVPrintFromBuffer(uint8_t *data, int datalen) {
 	struct tlvdb *t = NULL;
 	t = tlvdb_parse_multi(data, datalen);
 	if (t) {
@@ -128,9 +128,11 @@ void TLVPrintFromBuffer(uint8_t *data, int datalen) {
 		
 		tlvdb_visit(t, print_cb, NULL, 0);
 		tlvdb_free(t);
+		return true;
 	} else {
 		PrintAndLogEx(WARNING, "TLV ERROR: Can't parse response as TLV tree.");
 	}
+	return false;
 }
 
 void TLVPrintFromTLVLev(struct tlvdb *tlv, int level) {
diff --git a/client/emv/emvcore.h b/client/emv/emvcore.h
index c2b1746e1..1117c7f78 100644
--- a/client/emv/emvcore.h
+++ b/client/emv/emvcore.h
@@ -65,7 +65,7 @@ enum CardPSVendor {
 };
 extern enum CardPSVendor GetCardPSVendor(uint8_t * AID, size_t AIDlen);
 
-extern void TLVPrintFromBuffer(uint8_t *data, int datalen);
+extern bool TLVPrintFromBuffer(uint8_t *data, int datalen);
 extern void TLVPrintFromTLV(struct tlvdb *tlv);
 extern void TLVPrintFromTLVLev(struct tlvdb *tlv, int level);
 extern void TLVPrintAIDlistFromSelectTLV(struct tlvdb *tlv);

From 5140db2ac63a615b0cbd47486b99561480136ed2 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Tue, 25 Dec 2018 18:13:41 +0100
Subject: [PATCH 0332/1938] CHG: some more descriptions

---
 client/emv/emv_tags.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/client/emv/emv_tags.c b/client/emv/emv_tags.c
index 63397f19e..47cc9e79d 100644
--- a/client/emv/emv_tags.c
+++ b/client/emv/emv_tags.c
@@ -198,6 +198,9 @@ static const struct emv_tag emv_tags[] = {
 	{ 0x61  , "Application Template" },
 	{ 0x6f  , "File Control Information (FCI) Template" },
 	{ 0x70  , "READ RECORD Response Message Template" },
+	{ 0x71  , "Issues Script Template 1" },
+	{ 0x72  , "Issues Script Template 2" },
+	{ 0x73  , "Directory Discretionary Template" },
 	{ 0x77  , "Response Message Template Format 2" },
 	{ 0x80  , "Response Message Template Format 1" },
 	{ 0x82  , "Application Interchange Profile", EMV_TAG_BITMASK, &EMV_AIP },

From ddfe58458255b5e8129170bdab4fabd4e4bb6c8e Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Tue, 25 Dec 2018 18:16:47 +0100
Subject: [PATCH 0333/1938] CHG: 'sc brute' - nicer output,  rearrange code

---
 client/cmdsmartcard.c | 256 ++++++++++++++++++++++++++----------------
 1 file changed, 159 insertions(+), 97 deletions(-)

diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index a5a20f5e2..443833ac2 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -25,7 +25,7 @@ int usage_sm_raw(void) {
 	PrintAndLogEx(NORMAL, "Examples:");
 	PrintAndLogEx(NORMAL, "        sc raw s 0 d 00a404000e315041592e5359532e4444463031  - `1PAY.SYS.DDF01` PPSE directory with get ATR");
 	PrintAndLogEx(NORMAL, "        sc raw 0 d 00a404000e325041592e5359532e4444463031    - `2PAY.SYS.DDF01` PPSE directory");
-	PrintAndLogEx(NORMAL, "        sc raw 0 t d 00a4040007a000000004101000              - Mastercard");
+	PrintAndLogEx(NORMAL, "        sc raw 0 t d 00a4040007a0000000041010              - Mastercard");
 	PrintAndLogEx(NORMAL, "        sc raw 0 t d 00a4040007a0000000031010                - Visa");
 
 	return 0;
@@ -837,6 +837,137 @@ int CmdSmartList(const char *Cmd) {
 	return 0;
 }
 
+static void smart_brute_prim(){
+
+	uint8_t* buf = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
+	if ( !buf ) 
+		return;
+	
+	int len = 0;
+	uint8_t get_card_data[] = { 
+		0x80, 0xCA, 0x9F, 0x13, 0x00,
+		0x80, 0xCA, 0x9F, 0x17, 0x00,
+		0x80, 0xCA,	0x9F, 0x36, 0x00,
+		0x80, 0xCA, 0x9F, 0x4f, 0x00
+	};
+	
+	UsbCommand c = {CMD_SMART_RAW, {SC_RAW_T0, 5, 0}};	
+	
+	PrintAndLogEx(INFO, "Reading primitives");
+
+	for (int i = 0; i < sizeof(get_card_data); i += 5) {
+		
+		memcpy(c.d.asBytes, get_card_data+i, 5 );
+		clearCommandBuffer();
+		SendCommand(&c);
+	
+		len = smart_responseEx(buf, true);
+
+		if ( len > 2 ) {
+			
+			//if ( decodeTLV ) {
+				//if (!TLVPrintFromBuffer(buf, len-2)) {
+					PrintAndLogEx(SUCCESS, "\tHEX  %d |: %s", len, sprint_hex(buf, len));
+				//}
+			//}										
+		}
+		len = 0;
+	}
+	free(buf);
+}
+
+static int smart_brute_sfi(bool decodeTLV){
+
+	uint8_t* buf = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
+	if ( !buf ) 
+		return 1;
+	
+	int len = 0;
+	// READ RECORD
+	uint8_t READ_RECORD[] = {0x00, 0xB2, 0x00, 0x00, 0x00};
+	UsbCommand c = {CMD_SMART_RAW, {SC_RAW_T0, sizeof(READ_RECORD), 0}};	
+
+	PrintAndLogEx(INFO, "Start SFI brute forcing");
+	
+	for (uint8_t sfi=1; sfi <= 3; sfi++) {
+
+		printf("."); fflush(stdout);
+		
+		for (uint16_t rec=1; rec <= 3; rec++) {
+
+			if (ukbhit()) {
+				int gc = getchar();	(void)gc;
+				PrintAndLogEx(NORMAL, "\naborted via keyboard!\n");
+				free(buf);
+				return 1;
+			}			
+		
+			READ_RECORD[2] = rec;
+			READ_RECORD[3] = (sfi << 3) | 4;
+
+			memcpy(c.d.asBytes, READ_RECORD, sizeof(READ_RECORD) );
+			clearCommandBuffer();
+			SendCommand(&c);
+			
+			len = smart_responseEx(buf, true);
+			
+			if ( buf[0] == 0x6C ) {
+				READ_RECORD[4]	= buf[1];
+				
+				memcpy(c.d.asBytes, READ_RECORD, sizeof(READ_RECORD) );
+				clearCommandBuffer();
+				SendCommand(&c);
+				len = smart_responseEx(buf, true);
+				
+				READ_RECORD[4] = 0;				
+			}
+			
+			if ( len > 4 ) {
+			
+				PrintAndLogEx(SUCCESS, "\n\t file %02d, record %02d found", sfi, rec);
+				
+				uint8_t modifier = (buf[0] == 0xC0) ? 1 : 0;
+				
+				if ( decodeTLV ) {
+					if (!TLVPrintFromBuffer(buf + modifier, len-2-modifier)) {
+						PrintAndLogEx(SUCCESS, "\tHEX: %s", sprint_hex(buf, len));
+					}
+				}										
+			}		
+			memset(buf, 0x00, USB_CMD_DATA_SIZE);
+		}
+	}
+	free(buf);
+	return 0;
+}
+
+static void smart_brute_options(bool decodeTLV){
+	
+	uint8_t* buf = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
+	if ( !buf ) 
+		return;
+	
+	uint8_t GET_PROCESSING_OPTIONS[] = {0x80, 0xA8, 0x00, 0x00, 0x02, 0x83, 0x00, 0x00};
+	
+	// Get processing options command
+	UsbCommand c = {CMD_SMART_RAW, {SC_RAW_T0, sizeof(GET_PROCESSING_OPTIONS), 0}};	
+	memcpy(c.d.asBytes, GET_PROCESSING_OPTIONS, sizeof(GET_PROCESSING_OPTIONS) );	
+	clearCommandBuffer();
+	SendCommand(&c);
+	
+	int len = smart_responseEx(buf, true);
+	if ( len > 4 ) {
+		PrintAndLogEx(SUCCESS, "Got processing options");			
+		if ( decodeTLV ) {
+			TLVPrintFromBuffer(buf, len-2);
+		}
+	} else {
+		PrintAndLogEx(FAILED, "Getting processing options failed");
+	}
+	
+	free(buf);
+}
+
 int CmdSmartBruteforceSFI(const char *Cmd) {
 
 	uint8_t cmdp = 0;
@@ -867,27 +998,15 @@ int CmdSmartBruteforceSFI(const char *Cmd) {
 
 	const char *SELECT = "00a40400%02x%s";	
 	
-	uint8_t READ_RECORD[] = {0x00, 0xB2, 0x00, 0x00, 0x00};
-	uint8_t GET_PROCESSING_OPTIONS[] = {0x80, 0xA8, 0x00, 0x00, 0x02, 0x83, 0x00, 0x00};
-
 //	uint8_t GENERATE_AC[] = {0x80, 0xAE};
 //	uint8_t GET_CHALLENGE[] = {0x00, 0x84, 0x00};
 //	uint8_t GET_DATA[] = {0x80, 0xCA, 0x00, 0x00, 0x00};
 //	uint8_t SELECT[] = {0x00, 0xA4, 0x04, 0x00};
 //	uint8_t UNBLOCK_PIN[] = {0x84, 0x24, 0x00, 0x00, 0x00};
 //	uint8_t VERIFY[] = {0x00, 0x20, 0x00, 0x80};
-	
-	
-	// Select AID command
-	UsbCommand cAid = {CMD_SMART_RAW, {SC_RAW_T0, 0, 0}};
 		
-	// Get processing options command
-	UsbCommand cOpt = {CMD_SMART_RAW, {SC_RAW_T0, sizeof(GET_PROCESSING_OPTIONS), 0}};	
-	memcpy(cOpt.d.asBytes, GET_PROCESSING_OPTIONS, sizeof(GET_PROCESSING_OPTIONS) );
-	
-	// READ RECORD
-	UsbCommand cSFI = {CMD_SMART_RAW, {SC_RAW_T0, sizeof(READ_RECORD), 0}};	
-			
+	// Select AID command
+	UsbCommand cAid = {CMD_SMART_RAW, {SC_RAW_T0, 0, 0}};	
 	
 	PrintAndLogEx(INFO, "Importing AID list");
 	json_t *root = NULL;
@@ -897,16 +1016,19 @@ int CmdSmartBruteforceSFI(const char *Cmd) {
 	if ( !buf )
 		return 1;		
 
-	uint8_t* sfibuf = malloc(USB_CMD_DATA_SIZE);
-	if ( !sfibuf ) 
-		return 1;
-
 	PrintAndLogEx(INFO, "Selecting card");
 	if ( !smart_select(false) )
 		return 1;
 
+	char* caid = NULL;
 	
 	for (int i = 0; i < json_array_size(root); i++) {
+		
+		printf("+"); fflush(stdout);
+
+		if (caid)
+			free(caid);
+		
 		json_t *data, *jaid;
 
 		data = json_array_get(root, i);
@@ -924,7 +1046,8 @@ int CmdSmartBruteforceSFI(const char *Cmd) {
 		}
 		
 		const char* aid = json_string_value(jaid);
-		if ( !aid ) continue;
+		if ( !aid ) 
+			continue;
 
 		size_t aidlen = strlen(aid);
 		char* caid = calloc( 8+2+aidlen+1, sizeof(uint8_t));
@@ -932,7 +1055,8 @@ int CmdSmartBruteforceSFI(const char *Cmd) {
 		
 		int hexlen = 0;
 		int res = param_gethex_to_eol(caid, 0, cAid.d.asBytes, sizeof(cAid.d.asBytes), &hexlen);
-		if ( res ) continue;
+		if ( res ) 
+			continue;
 		
 		cAid.arg[1] = hexlen;
 
@@ -940,10 +1064,8 @@ int CmdSmartBruteforceSFI(const char *Cmd) {
 		SendCommand(&cAid);	
 		
 		int len = smart_responseEx(buf, true);		
-		if ( len < 3 ) {
-			free(caid);			
+		if ( len < 3 )
 			continue;
-		}
 		
 		json_t *jvendor, *jname;
 		jvendor = json_object_get(data, "Vendor");
@@ -953,96 +1075,36 @@ int CmdSmartBruteforceSFI(const char *Cmd) {
 		}
 		
 		const char* vendor = json_string_value(jvendor);
-		if ( !vendor ) continue;
-
+		if ( !vendor )
+			continue;
+		
 		jname = json_object_get(data, "Name");
 		if (!json_is_string(jname)) {
 			PrintAndLogEx(ERR, "Name data [%d] is not a string", i + 1);
 			continue;
 		}
 		const char* name = json_string_value(jname);
-		if ( !name ) continue;
+		if ( !name )
+			continue;
 
-		PrintAndLogEx(SUCCESS, "AID %s | %s | %s", aid, vendor, name);
+		PrintAndLogEx(SUCCESS, "\nAID %s | %s | %s", aid, vendor, name);
 
-		// Get processing options
-		clearCommandBuffer();
-		SendCommand(&cOpt);
-		
-		uint8_t optionslen = smart_responseEx(buf, true);
-		if ( optionslen > 4 ) {
-			PrintAndLogEx(SUCCESS, "Got processing options");			
-			if ( decodeTLV ) {
-				TLVPrintFromBuffer(buf, optionslen-2);
-			}
-		} else {
-			PrintAndLogEx(FAILED, "Getting processing options failed");
-		}
-		
-		PrintAndLogEx(INFO, "Start SFI brute forcing");
-		
-		for (uint8_t sfi=1; sfi <= 31; sfi++) {
+		smart_brute_options(decodeTLV);
 
-			printf("."); fflush(stdout);
-			
-			for (uint16_t rec=1; rec <= 5; rec++) {
+		smart_brute_prim();
 
-				if (ukbhit()) {
-					int gc = getchar();	(void)gc;
-					PrintAndLogEx(NORMAL, "\naborted via keyboard!\n");
-					free(caid);
-					goto out;
-				}			
-			
-				READ_RECORD[2] = rec;
-				READ_RECORD[3] = (sfi << 3) | 4;
+		smart_brute_sfi(decodeTLV);
 
-				memcpy(cSFI.d.asBytes, READ_RECORD, sizeof(READ_RECORD) );
-				clearCommandBuffer();
-				SendCommand(&cSFI);
-				
-				uint8_t sfilen = smart_responseEx(sfibuf, true);
-				
-				if ( sfibuf[0] == 0x6C ) {
-					READ_RECORD[4]	= sfibuf[1];
-					
-					memcpy(cSFI.d.asBytes, READ_RECORD, sizeof(READ_RECORD) );
-					clearCommandBuffer();
-					SendCommand(&cSFI);
-					sfilen = smart_responseEx(sfibuf, true);
-					
-					READ_RECORD[4] = 0;				
-				}
-				
-				if ( sfilen > 4 ) {
-				
-					PrintAndLogEx(SUCCESS, "\n\t file %02d, record %02d found", sfi, rec);
-					
-					uint8_t modifier = (sfibuf[0] == 0xC0) ? 1 : 0;
-					
-					if ( decodeTLV ) {
-						if (!TLVPrintFromBuffer(sfibuf + modifier, sfilen-2-modifier)) {
-							PrintAndLogEx(SUCCESS, "\tHEX: %s", sprint_hex(sfibuf, sfilen));
-						}
-					}
-										
-				}
-				memset(sfibuf, 0x00, USB_CMD_DATA_SIZE);
-			}
-		}
-		
-		free(sfibuf);	
-		free(caid);		
 		PrintAndLogEx(SUCCESS, "\nSFI brute force done\n");
 	}
-out:
-	if ( sfibuf )
-		free(sfibuf);
+
+	if (caid) 
+		free(caid);
 	
 	free(buf);
 	json_decref(root);
 	
-	PrintAndLogEx(SUCCESS, "Search completed.");
+	PrintAndLogEx(SUCCESS, "\nSearch completed.");
 	return 0;
 }
 

From ab9048f7c56c0626e470c62ced6548872fce62c8 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Tue, 25 Dec 2018 18:18:48 +0100
Subject: [PATCH 0334/1938] CHG:  'sc brute' loop 31, 255

---
 client/cmdsmartcard.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index 443833ac2..a864e2358 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -889,11 +889,11 @@ static int smart_brute_sfi(bool decodeTLV){
 
 	PrintAndLogEx(INFO, "Start SFI brute forcing");
 	
-	for (uint8_t sfi=1; sfi <= 3; sfi++) {
+	for (uint8_t sfi=1; sfi <= 31; sfi++) {
 
 		printf("."); fflush(stdout);
 		
-		for (uint16_t rec=1; rec <= 3; rec++) {
+		for (uint16_t rec=1; rec <= 255; rec++) {
 
 			if (ukbhit()) {
 				int gc = getchar();	(void)gc;

From 33f6439d38ed43172f782cc465d26aa44f1c21c1 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Wed, 26 Dec 2018 11:02:00 +0100
Subject: [PATCH 0335/1938] add 'emv roca' - new command,  will be able to test
 for ROCA

---
 client/emv/cmdemv.c  | 98 ++++++++++++++++++++++++++++++++++++++++----
 client/emv/cmdemv.h  |  1 +
 client/emv/emvcore.c |  8 ++--
 client/emv/emvcore.h |  1 +
 4 files changed, 97 insertions(+), 11 deletions(-)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index 13f64a616..14616e0f0 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -1382,7 +1382,7 @@ int CmdEMVScan(const char *cmd) {
 			uint8_t SFIend = AFL->value[i * 4 + 2];
 			uint8_t SFIoffline = AFL->value[i * 4 + 3];
 			
-			PrintAndLog("--->SFI[%02x] start:%02x end:%02x offline:%02x", SFI, SFIstart, SFIend, SFIoffline);
+			PrintAndLogEx(INFO, "--->SFI[%02x] start:%02x end:%02x offline:%02x", SFI, SFIstart, SFIend, SFIoffline);
 			if (SFI == 0 || SFI == 31 || SFIstart == 0 || SFIstart > SFIend) {
 				PrintAndLogEx(ERR, "SFI ERROR! Skipped...");
 				continue;
@@ -1476,6 +1476,89 @@ int CmdEMVTest(const char *cmd) {
 	return ExecuteCryptoTests(true);
 }
 
+int CmdEMVRoca(const char *cmd) {
+		
+	CLIParserInit("emv roca", 
+		"Tries to extract public keys and run the ROCA test against them.\n", 
+		"Usage:\n\temv roca -w -> select CONTACT card and run test\n\temv roca -> select CONTACTLESS card and run test\n");
+
+	void* argtable[] = {
+		arg_param_begin,
+		arg_lit0("wW",  "wired",   "Send data via contact (iso7816) interface. Contactless interface set by default."),
+		arg_param_end
+	};
+	CLIExecWithReturn(cmd, argtable, true);
+	
+	EMVCommandChannel channel = ECC_CONTACTLESS;
+	if (arg_get_lit(1))
+		channel = ECC_CONTACT;
+
+	// Init TLV tree
+	const char *alr = "Root terminal TLV tree";
+	struct tlvdb *tlvRoot = tlvdb_fixed(1, strlen(alr), (const unsigned char *)alr);
+
+	
+	
+	int res = EMVSelect(channel, false, true, AID, AIDlen, buf, sizeof(buf), &len, &sw, tlvRoot);
+	
+	// getting certificates
+ 	if (tlvdb_get(tlvRoot, 0x90, NULL)) {
+		PrintAndLogEx(INFO, "-->Recovering certificates.");
+		PKISetStrictExecution(false);
+
+		struct emv_pk *pk = get_ca_pk(tlvRoot);
+		if (!pk) {
+			PrintAndLogEx(ERR, "ERROR: Key not found. Exit.");
+			goto out;
+		}
+
+		struct emv_pk *issuer_pk = emv_pki_recover_issuer_cert(pk, tlvRoot);
+		if (!issuer_pk) {
+			emv_pk_free(pk);
+			PrintAndLogEx(WARNING, "WARNING: Issuer certificate not found. Exit.");
+			goto out;
+		}
+	
+		PrintAndLogEx(SUCCESS, "Issuer PK recovered. RID %s IDX %02hhx CSN %s",
+				sprint_hex(issuer_pk->rid, 5),
+				issuer_pk->index,
+				sprint_hex(issuer_pk->serial, 3)
+				);
+
+
+		struct emv_pk *icc_pk = emv_pki_recover_icc_cert(issuer_pk, tlvRoot, NULL);
+		if (!icc_pk) {
+			emv_pk_free(pk);
+			emv_pk_free(issuer_pk);
+			PrintAndLogEx(WARNING, "WARNING: ICC certificate not found. Exit.");
+			goto out;
+		}
+		PrintAndLogEx(SUCCESS, "ICC PK recovered. RID %s IDX %02hhx CSN %s\n",
+				sprint_hex(icc_pk->rid, 5),
+				icc_pk->index,
+				sprint_hex(icc_pk->serial, 3)
+				);
+		
+//	icc_pk->exp, icc_pk->elen
+//	icc_pk->modulus, icc_pk->mlen
+		
+		
+		PKISetStrictExecution(true);
+	}
+
+out:
+	
+	// free tlv object
+	tlvdb_free(tlvRoot);
+
+	if ( channel == ECC_CONTACTLESS)
+		DropField();
+
+
+	return 0;
+}
+
+
 static command_t CommandTable[] =  {
 	{"help",		CmdHelp,						1,	"This help"},
 	{"exec",		CmdEMVExec,						0,	"Executes EMV contactless transaction."},
@@ -1490,13 +1573,14 @@ static command_t CommandTable[] =  {
 	{"scan",		CmdEMVScan,						0,	"Scan EMV card and save it contents to json file for emulator."},
 	{"test",		CmdEMVTest,						0,	"Crypto logic test."},
 	/*
-	{"getrng",		CmdEMVGetrng,	  0, "get random number from terminal"}, 
-	{"eload",		CmdEmvELoad, 	  0, "load EMV tag into device"},
-	{"dump",		CmdEmvDump,	  0, "dump EMV tag values"},
-	{"sim",			CmdEmvSim,	  0, "simulate EMV tag"},
-	{"clone",		CmdEmvClone,	  0, "clone an EMV tag"}, 
+	{"getrng",		CmdEMVGetrng,	  				0, "get random number from terminal"}, 
+	{"eload",		CmdEmvELoad, 	  				0, "load EMV tag into device"},
+	{"dump",		CmdEmvDump,	  					0, "dump EMV tag values"},
+	{"sim",			CmdEmvSim,	  					0, "simulate EMV tag"},
+	{"clone",		CmdEmvClone,	  				0, "clone an EMV tag"}, 
 	*/
-	{"list",	CmdEMVList,	  0, "[Deprecated] List ISO7816 history"}, 
+	{"list",		CmdEMVList,	  					0, "[Deprecated] List ISO7816 history"}, 
+	{"roca",		CmdEMVRoca,	  					0, "Extract public keys and run ROCA test"}, 
 	{NULL, NULL, 0, NULL}
 };
 
diff --git a/client/emv/cmdemv.h b/client/emv/cmdemv.h
index b4397fd15..0b0419b07 100644
--- a/client/emv/cmdemv.h
+++ b/client/emv/cmdemv.h
@@ -34,5 +34,6 @@ extern int CmdEMVPPSE(const char *cmd);
 extern int CmdEMVExec(const char *cmd);
 extern int CmdEMVGetrng(const char *Cmd);
 extern int CmdEMVList(const char *Cmd);
+extern int CmdEMVRoca(const char *Cmd);
 
 #endif
diff --git a/client/emv/emvcore.c b/client/emv/emvcore.c
index 0c3bb7626..b67e7ac76 100644
--- a/client/emv/emvcore.c
+++ b/client/emv/emvcore.c
@@ -519,7 +519,7 @@ int MSCComputeCryptoChecksum(EMVCommandChannel channel, bool LeaveFieldON, uint8
 }
 
 // Authentication 
-static struct emv_pk *get_ca_pk(struct tlvdb *db) {
+struct emv_pk *get_ca_pk(struct tlvdb *db) {
 	const struct tlv *df_tlv = tlvdb_get(db, 0x84, NULL);
 	const struct tlv *caidx_tlv = tlvdb_get(db, 0x8f, NULL);
 
@@ -900,7 +900,7 @@ int RecoveryCertificates(struct tlvdb *tlvRoot, json_t *root) {
 		PrintAndLog("WARNING: Issuer certificate not found. Exit.");
 		return 2;
 	}
-	PrintAndLog("Issuer PK recovered. RID %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx CSN %02hhx:%02hhx:%02hhx",
+	PrintAndLogEx(SUCCESS, "Issuer PK recovered. RID %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx CSN %02hhx:%02hhx:%02hhx",
 			issuer_pk->rid[0],
 			issuer_pk->rid[1],
 			issuer_pk->rid[2],
@@ -923,10 +923,10 @@ int RecoveryCertificates(struct tlvdb *tlvRoot, json_t *root) {
 	if (!icc_pk) {
 		emv_pk_free(pk);
 		emv_pk_free(issuer_pk);
-		PrintAndLog("WARNING: ICC certificate not found. Exit.");
+		PrintAndLogEx(WARNING, "WARNING: ICC certificate not found. Exit.");
 		return 2;
 	}
-	printf("ICC PK recovered. RID %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx CSN %02hhx:%02hhx:%02hhx\n",
+	PrintAndLogEx(SUCCESS, "ICC PK recovered. RID %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx CSN %02hhx:%02hhx:%02hhx\n",
 			icc_pk->rid[0],
 			icc_pk->rid[1],
 			icc_pk->rid[2],
diff --git a/client/emv/emvcore.h b/client/emv/emvcore.h
index 1117c7f78..829107126 100644
--- a/client/emv/emvcore.h
+++ b/client/emv/emvcore.h
@@ -102,6 +102,7 @@ extern int trCDA(struct tlvdb *tlv, struct tlvdb *ac_tlv, struct tlv *pdol_data_
 
 extern int RecoveryCertificates(struct tlvdb *tlvRoot, json_t *root);
 
+extern struct emv_pk *get_ca_pk(struct tlvdb *db);
 #endif
 
 

From ed6806810749a93b23758b5a330eed8b205e7032 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Wed, 26 Dec 2018 12:50:11 +0100
Subject: [PATCH 0336/1938] chg: 'emv roca'  -now compiles

---
 client/emv/cmdemv.c | 56 +++++++++++++++++++--------------------------
 1 file changed, 23 insertions(+), 33 deletions(-)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index 14616e0f0..1029d5a7e 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -306,7 +306,7 @@ int CmdEMVReadRecord(const char *cmd) {
 		arg_lit0("aA",  "apdu",    "show APDU reqests and responses"),
 		arg_lit0("tT",  "tlv",     "TLV decode results of selected applets"),
 		arg_lit0("wW",  "wired",   "Send data via contact (iso7816) interface. Contactless interface set by default."),
-		arg_strx1(NULL,  NULL,     "<SFI 1byte HEX><SFIrec 1byte HEX>", NULL),
+		arg_strx1(NULL,  NULL,     "<SFI 1byte HEX><SFIrecord 1byte HEX>", NULL),
 		arg_param_end
 	};
 	CLIExecWithReturn(cmd, argtable, true);
@@ -510,8 +510,11 @@ int CmdEMVInternalAuthenticate(const char *cmd) {
 	int datalen = 0;
 
 	CLIParserInit("emv intauth", 
-		"Generate Internal Authenticate command. Usually needs 4-byte random number. It returns data in TLV format .\nNeeds a EMV applet to be selected and GPO to be executed.", 
-		"Usage:\n\temv intauth -k 01020304 -> execute Internal Authenticate with 4-byte DDOLdata and keep field ON after command\n"
+		"Generate Internal Authenticate command. Usually needs 4-byte random number. It returns data in TLV format .\n"
+		"Needs a EMV applet to be selected and GPO to be executed.", 
+		
+		"Usage:\n"
+		"\temv intauth -k 01020304 -> execute Internal Authenticate with 4-byte DDOLdata and keep field ON after command\n"
 			"\temv intauth -t 01020304 -> execute Internal Authenticate with 4-byte DDOL data, show result in TLV\n"
 			"\temv intauth -pmt 9F 37 04 -> load params from file, make DDOL data from DDOL, Internal Authenticate with DDOL, show result in TLV"); 
 
@@ -680,7 +683,8 @@ int CmdEMVExec(const char *cmd) {
 
 	CLIParserInit("emv exec", 
 		"Executes EMV contactless transaction", 
-		"Usage:\n\temv exec -sat -> select card, execute MSD transaction, show APDU and TLV\n"
+		"Usage:\n"
+			"\temv exec -sat -> select card, execute MSD transaction, show APDU and TLV\n"
 			"\temv exec -satc -> select card, execute CDA transaction, show APDU and TLV\n");
 
 	void* argtable[] = {
@@ -921,7 +925,7 @@ int CmdEMVExec(const char *cmd) {
 	// transaction check
 
 	// qVSDC
-	if (TrType == TT_QVSDCMCHIP|| TrType == TT_CDA){
+	if (TrType == TT_QVSDCMCHIP || TrType == TT_CDA){
 		// 9F26: Application Cryptogram
 		const struct tlv *AC = tlvdb_get(tlvRoot, 0x9F26, NULL);
 		if (AC) {
@@ -938,7 +942,7 @@ int CmdEMVExec(const char *cmd) {
 				// print AC data
 				PrintAndLogEx(NORMAL, "ATC: %s", sprint_hex(ATC->value, ATC->len));
 				PrintAndLogEx(NORMAL, "AC: %s", sprint_hex(AC->value, AC->len));
-				if (IAD){
+				if (IAD) {
 					PrintAndLogEx(NORMAL, "IAD: %s", sprint_hex(IAD->value, IAD->len));
 					
 					if (IAD->len >= IAD->value[0] + 1) {
@@ -978,17 +982,18 @@ int CmdEMVExec(const char *cmd) {
 			// ICC Dynamic Number
 			struct tlvdb * ICCDynN = tlvdb_fixed(0x9f4c, len, buf);
 			tlvdb_add(tlvRoot, ICCDynN);
-			if (decodeTLV){
+			if (decodeTLV) {
 				PrintAndLogEx(NORMAL, "\n* * ICC Dynamic Number:");
 				TLVPrintFromTLV(ICCDynN);
 			}
 			
 			PrintAndLogEx(NORMAL, "* * Calc CDOL1");
 			struct tlv *cdol_data_tlv = dol_process(tlvdb_get(tlvRoot, 0x8c, NULL), tlvRoot, 0x01); // 0x01 - dummy tag
-			if (!cdol_data_tlv){
+			if (!cdol_data_tlv) {
 				PrintAndLogEx(WARNING, "Error: can't create CDOL1 TLV.");
 				dreturn(6);
 			}
+			
 			PrintAndLogEx(NORMAL, "CDOL1 data[%d]: %s", cdol_data_tlv->len, sprint_hex(cdol_data_tlv->value, cdol_data_tlv->len));
 			
 			PrintAndLogEx(NORMAL, "* * AC1");
@@ -1010,6 +1015,7 @@ int CmdEMVExec(const char *cmd) {
 			if (res) {	
 				PrintAndLogEx(NORMAL, "CDA error (%d)", res);
 			}
+			
 			free(ac_tlv);
 			free(cdol_data_tlv);
 			
@@ -1073,7 +1079,7 @@ int CmdEMVExec(const char *cmd) {
 					PrintAndLogEx(NORMAL, "Use default UDOL.");
 
 				struct tlv *udol_data_tlv = dol_process(UDOL ? UDOL : &defUDOL, tlvRoot, 0x01); // 0x01 - dummy tag
-				if (!udol_data_tlv){
+				if (!udol_data_tlv) {
 					PrintAndLogEx(WARNING, "Error: can't create UDOL TLV.");
 					dreturn(8);
 				}
@@ -1448,25 +1454,6 @@ int CmdEMVScan(const char *cmd) {
 	return 0;
 }
 
-int usage_emv_getrnd(void){
-	PrintAndLogEx(NORMAL, "retrieve the UN number from a terminal");
-	PrintAndLogEx(NORMAL, "Usage:  emv getrnd [h]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h             : this help");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      emv getrnd");
-	return 0;
-}
-
-//retrieve the UN number from a terminal
-int CmdEMVGetrng(const char *Cmd) {
-	char cmdp = param_getchar(Cmd, 0);
-	if ( cmdp == 'h' || cmdp == 'H') return usage_emv_getrnd();
-
-	PrintAndLogEx(INFO, "Not implemented yet");
-	return 0;
-}
 
 int CmdEMVList(const char *Cmd) {
 	return CmdTraceList("7816");
@@ -1480,7 +1467,8 @@ int CmdEMVRoca(const char *cmd) {
 		
 	CLIParserInit("emv roca", 
 		"Tries to extract public keys and run the ROCA test against them.\n", 
-		"Usage:\n\temv roca -w -> select CONTACT card and run test\n\temv roca -> select CONTACTLESS card and run test\n");
+		"Usage:\n"
+			"\temv roca -w -> select CONTACT card and run test\n\temv roca -> select CONTACTLESS card and run test\n");
 
 	void* argtable[] = {
 		arg_param_begin,
@@ -1497,9 +1485,12 @@ int CmdEMVRoca(const char *cmd) {
 	const char *alr = "Root terminal TLV tree";
 	struct tlvdb *tlvRoot = tlvdb_fixed(1, strlen(alr), (const unsigned char *)alr);
 
-	
-	
-	int res = EMVSelect(channel, false, true, AID, AIDlen, buf, sizeof(buf), &len, &sw, tlvRoot);
+	// select card
+	uint8_t buf[APDU_RES_LEN] = {0};
+	size_t len = 0;
+	uint16_t sw = 0;
+	uint8_t psenum = (channel == ECC_CONTACT) ? 1: 2;
+	int res = EMVSelectPSE(channel, true, true, psenum, buf, sizeof(buf), &len, &sw);
 	
 	// getting certificates
  	if (tlvdb_get(tlvRoot, 0x90, NULL)) {
@@ -1558,7 +1549,6 @@ out:
 	return 0;
 }
 
-
 static command_t CommandTable[] =  {
 	{"help",		CmdHelp,						1,	"This help"},
 	{"exec",		CmdEMVExec,						0,	"Executes EMV contactless transaction."},

From c6089d7fdb8a58e9cea445f9b9e783f4086f4ab6 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Wed, 26 Dec 2018 17:54:29 +0100
Subject: [PATCH 0337/1938] chg: more definitions

---
 client/emv/emv_tags.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/emv/emv_tags.c b/client/emv/emv_tags.c
index 47cc9e79d..81cee89f3 100644
--- a/client/emv/emv_tags.c
+++ b/client/emv/emv_tags.c
@@ -237,6 +237,7 @@ static const struct emv_tag emv_tags[] = {
 	{ 0x9f17, "Personal Identification Number (PIN) Try Counter" },
 	{ 0x9f1a, "Terminal Country Code" },
 	{ 0x9f1f, "Track 1 Discretionary Data", EMV_TAG_STRING },
+	{ 0x9f20, "Track 2 Discretionary Data", EMV_TAG_STRING },
 	{ 0x9f21, "Transaction Time" },
 	{ 0x9f26, "Application Cryptogram" },
 	{ 0x9f27, "Cryptogram Information Data", EMV_TAG_CID },

From 92fadc2a9f442ac31433f47bf7fd2e657aa8cbe6 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 27 Dec 2018 19:45:53 +0100
Subject: [PATCH 0338/1938] ADD: 'amiitool'  -  Added @socram8888 's great tool
 for manipulating amiibo tags.   The idea is to build it in the pm3 client.  
 It compiles as is,  but the hookup in client is not done.   *WORK IN
 PROGRESS*

---
 client/amiitool/LICENSE        |  21 ++++
 client/amiitool/amiibo.c       | 180 +++++++++++++++++++++++++++++++++
 client/amiitool/amiibo.h       |  32 ++++++
 client/amiitool/amiitool.c     | 175 ++++++++++++++++++++++++++++++++
 client/amiitool/drbg.c         |  78 ++++++++++++++
 client/amiitool/drbg.h         |  33 ++++++
 client/amiitool/key_retail.bin | Bin 0 -> 160 bytes
 client/amiitool/keygen.c       |  53 ++++++++++
 client/amiitool/keygen.h       |  34 +++++++
 client/obj/amiitool/.dummy     |   0
 10 files changed, 606 insertions(+)
 create mode 100644 client/amiitool/LICENSE
 create mode 100644 client/amiitool/amiibo.c
 create mode 100644 client/amiitool/amiibo.h
 create mode 100644 client/amiitool/amiitool.c
 create mode 100644 client/amiitool/drbg.c
 create mode 100644 client/amiitool/drbg.h
 create mode 100644 client/amiitool/key_retail.bin
 create mode 100644 client/amiitool/keygen.c
 create mode 100644 client/amiitool/keygen.h
 create mode 100644 client/obj/amiitool/.dummy

diff --git a/client/amiitool/LICENSE b/client/amiitool/LICENSE
new file mode 100644
index 000000000..35627b40f
--- /dev/null
+++ b/client/amiitool/LICENSE
@@ -0,0 +1,21 @@
+(c) 2015-2017 Marcos Del Sol Vives
+(c) 2016      javiMaD
+(c) 2016      Michael Armbruster
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/client/amiitool/amiibo.c b/client/amiitool/amiibo.c
new file mode 100644
index 000000000..6391ae830
--- /dev/null
+++ b/client/amiitool/amiibo.c
@@ -0,0 +1,180 @@
+/*
+ * (c) 2015-2017 Marcos Del Sol Vives
+ * (c) 2016      javiMaD
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#include "amiibo.h"
+#include "mbedtls/md.h"
+#include "mbedtls/aes.h"
+
+#define HMAC_POS_DATA 0x008
+#define HMAC_POS_TAG 0x1B4
+
+void nfc3d_amiibo_calc_seed(const uint8_t * dump, uint8_t * key) {
+	memcpy(key + 0x00, dump + 0x029, 0x02);
+	memset(key + 0x02, 0x00, 0x0E);
+	memcpy(key + 0x10, dump + 0x1D4, 0x08);
+	memcpy(key + 0x18, dump + 0x1D4, 0x08);
+	memcpy(key + 0x20, dump + 0x1E8, 0x20);
+}
+
+void nfc3d_amiibo_keygen(const nfc3d_keygen_masterkeys * masterKeys, const uint8_t * dump, nfc3d_keygen_derivedkeys * derivedKeys) {
+	uint8_t seed[NFC3D_KEYGEN_SEED_SIZE];
+
+	nfc3d_amiibo_calc_seed(dump, seed);
+	nfc3d_keygen(masterKeys, seed, derivedKeys);
+}
+
+void nfc3d_amiibo_cipher(const nfc3d_keygen_derivedkeys * keys, const uint8_t * in, uint8_t * out) {
+	mbedtls_aes_context aes;
+	size_t nc_off = 0;
+	unsigned char nonce_counter[16];
+	unsigned char stream_block[16];
+
+	mbedtls_aes_setkey_enc( &aes, keys->aesKey, 128 );
+	memset(nonce_counter, 0, sizeof(nonce_counter));
+	memset(stream_block, 0, sizeof(stream_block));
+	memcpy(nonce_counter, keys->aesIV, sizeof(nonce_counter));
+	mbedtls_aes_crypt_ctr( &aes, 0x188, &nc_off, nonce_counter, stream_block, in + 0x02C, out + 0x02C );
+
+	memcpy(out + 0x000, in + 0x000, 0x008);
+	// Data signature NOT copied
+	memcpy(out + 0x028, in + 0x028, 0x004);
+	// Tag signature NOT copied
+	memcpy(out + 0x1D4, in + 0x1D4, 0x034);
+}
+
+void nfc3d_amiibo_tag_to_internal(const uint8_t * tag, uint8_t * intl) {
+	memcpy(intl + 0x000, tag + 0x008, 0x008);
+	memcpy(intl + 0x008, tag + 0x080, 0x020);
+	memcpy(intl + 0x028, tag + 0x010, 0x024);
+	memcpy(intl + 0x04C, tag + 0x0A0, 0x168);
+	memcpy(intl + 0x1B4, tag + 0x034, 0x020);
+	memcpy(intl + 0x1D4, tag + 0x000, 0x008);
+	memcpy(intl + 0x1DC, tag + 0x054, 0x02C);
+}
+
+void nfc3d_amiibo_internal_to_tag(const uint8_t * intl, uint8_t * tag) {
+	memcpy(tag + 0x008, intl + 0x000, 0x008);
+	memcpy(tag + 0x080, intl + 0x008, 0x020);
+	memcpy(tag + 0x010, intl + 0x028, 0x024);
+	memcpy(tag + 0x0A0, intl + 0x04C, 0x168);
+	memcpy(tag + 0x034, intl + 0x1B4, 0x020);
+	memcpy(tag + 0x000, intl + 0x1D4, 0x008);
+	memcpy(tag + 0x054, intl + 0x1DC, 0x02C);
+}
+
+bool nfc3d_amiibo_unpack(const nfc3d_amiibo_keys * amiiboKeys, const uint8_t * tag, uint8_t * plain) {
+	uint8_t internal[NFC3D_AMIIBO_SIZE];
+	nfc3d_keygen_derivedkeys dataKeys;
+	nfc3d_keygen_derivedkeys tagKeys;
+
+	// Convert format
+	nfc3d_amiibo_tag_to_internal(tag, internal);
+
+	// Generate keys
+	nfc3d_amiibo_keygen(&amiiboKeys->data, internal, &dataKeys);
+	nfc3d_amiibo_keygen(&amiiboKeys->tag, internal, &tagKeys);
+
+	// Decrypt
+	nfc3d_amiibo_cipher(&dataKeys, internal, plain);
+
+	// Regenerate tag HMAC. Note: order matters, data HMAC depends on tag HMAC!
+	mbedtls_md_hmac( mbedtls_md_info_from_type(MBEDTLS_MD_SHA256), tagKeys.hmacKey, sizeof(tagKeys.hmacKey),	
+			 plain + 0x1D4, 0x34, plain + HMAC_POS_TAG );
+
+	// Regenerate data HMAC
+	mbedtls_md_hmac( mbedtls_md_info_from_type(MBEDTLS_MD_SHA256), dataKeys.hmacKey, sizeof(dataKeys.hmacKey),	
+			 plain + 0x029, 0x1DF, plain + HMAC_POS_DATA );
+
+	return
+			memcmp(plain + HMAC_POS_DATA, internal + HMAC_POS_DATA, 32) == 0 &&
+			memcmp(plain + HMAC_POS_TAG, internal + HMAC_POS_TAG, 32) == 0;
+}
+
+void nfc3d_amiibo_pack(const nfc3d_amiibo_keys * amiiboKeys, const uint8_t * plain, uint8_t * tag) {
+	uint8_t cipher[NFC3D_AMIIBO_SIZE];
+	nfc3d_keygen_derivedkeys tagKeys;
+	nfc3d_keygen_derivedkeys dataKeys;
+
+	// Generate keys
+	nfc3d_amiibo_keygen(&amiiboKeys->tag, plain, &tagKeys);
+	nfc3d_amiibo_keygen(&amiiboKeys->data, plain, &dataKeys);
+
+	// Generate tag HMAC
+	mbedtls_md_hmac( mbedtls_md_info_from_type(MBEDTLS_MD_SHA256), tagKeys.hmacKey, sizeof(tagKeys.hmacKey),	
+			 plain + 0x1D4, 0x34, cipher + HMAC_POS_TAG );
+
+	// Init mbedtls HMAC context
+	mbedtls_md_context_t ctx;
+	mbedtls_md_init( &ctx );
+	mbedtls_md_setup( &ctx, mbedtls_md_info_from_type(MBEDTLS_MD_SHA256), 1 );
+
+	// Generate data HMAC
+	mbedtls_md_hmac_starts( &ctx, dataKeys.hmacKey, sizeof(dataKeys.hmacKey) );
+	mbedtls_md_hmac_update( &ctx, plain + 0x029, 0x18B ); // Data
+	mbedtls_md_hmac_update( &ctx, cipher + HMAC_POS_TAG, 0x20 ); // Tag HMAC
+	mbedtls_md_hmac_update( &ctx, plain + 0x1D4, 0x34 ); // Here be dragons
+
+	mbedtls_md_hmac_finish( &ctx, cipher + HMAC_POS_DATA );
+
+	// HMAC cleanup
+	mbedtls_md_free( &ctx );
+
+	// Encrypt
+	nfc3d_amiibo_cipher(&dataKeys, plain, cipher);
+
+	// Convert back to hardware
+	nfc3d_amiibo_internal_to_tag(cipher, tag);
+}
+
+bool nfc3d_amiibo_load_keys(nfc3d_amiibo_keys * amiiboKeys, const char * path) {
+	FILE * f = fopen(path, "rb");
+	if (!f) {
+		return false;
+	}
+
+	if (!fread(amiiboKeys, sizeof(*amiiboKeys), 1, f)) {
+		fclose(f);
+		return false;
+	}
+	fclose(f);
+
+	if (
+		(amiiboKeys->data.magicBytesSize > 16) ||
+		(amiiboKeys->tag.magicBytesSize > 16)
+	) {
+		return false;
+	}
+
+	return true;
+}
+
+void nfc3d_amiibo_copy_app_data(const uint8_t * src, uint8_t * dst) {
+
+
+	//uint16_t *ami_nb_wr = (uint16_t*)(dst + 0x29);
+	//uint16_t *cfg_nb_wr = (uint16_t*)(dst + 0xB4);
+	
+	/* increment write counters */
+	//*ami_nb_wr = htobe16(be16toh(*ami_nb_wr) + 1);
+	//*cfg_nb_wr = htobe16(be16toh(*cfg_nb_wr) + 1);
+	
+	uint16_t ami_nb_wr =  ((uint16_t)bytes_to_num(dst + 0x29, 2)) + 1;
+	uint16_t cfg_nb_wr =  ((uint16_t)bytes_to_num(dst + 0xB4, 2)) + 1;
+
+	num_to_bytes(ami_nb_wr, 2, dst + 0x29);
+	num_to_bytes(cfg_nb_wr, 2, dst + 0xB4);
+
+	/* copy flags */
+	dst[0x2C] = src[0x2C];
+	/* copy programID */
+	memcpy(dst + 0xAC, src + 0xAC, 8);
+	/* copy AppID */
+	memcpy(dst + 0xB6, src + 0xB6, 4);
+	/* copy AppData */
+	memcpy(dst + 0xDC, src + 0xDC, 216);
+}
+
diff --git a/client/amiitool/amiibo.h b/client/amiitool/amiibo.h
new file mode 100644
index 000000000..3c7dccc70
--- /dev/null
+++ b/client/amiitool/amiibo.h
@@ -0,0 +1,32 @@
+/*
+ * (c) 2015-2017 Marcos Del Sol Vives
+ * (c) 2016      javiMaD
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#ifndef HAVE_NFC3D_AMIIBO_H
+#define HAVE_NFC3D_AMIIBO_H
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <string.h>
+#include <stdio.h>
+#include "keygen.h"
+#include "util.h"
+
+#define NFC3D_AMIIBO_SIZE 520
+
+#pragma pack(1)
+typedef struct {
+	nfc3d_keygen_masterkeys data;
+	nfc3d_keygen_masterkeys tag;
+} nfc3d_amiibo_keys;
+#pragma pack()
+
+bool nfc3d_amiibo_unpack(const nfc3d_amiibo_keys * amiiboKeys, const uint8_t * tag, uint8_t * plain);
+void nfc3d_amiibo_pack(const nfc3d_amiibo_keys * amiiboKeys, const uint8_t * plain, uint8_t * tag);
+bool nfc3d_amiibo_load_keys(nfc3d_amiibo_keys * amiiboKeys, const char * path);
+void nfc3d_amiibo_copy_app_data(const uint8_t * src, uint8_t * dst);
+
+#endif
diff --git a/client/amiitool/amiitool.c b/client/amiitool/amiitool.c
new file mode 100644
index 000000000..40e7b05eb
--- /dev/null
+++ b/client/amiitool/amiitool.c
@@ -0,0 +1,175 @@
+/*
+ * (c) 2015-2017 Marcos Del Sol Vives
+ * (c) 2016      javiMaD
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#include <amiibo.h>
+#include <stdio.h>
+#include <string.h>
+#include "../loclass/fileutil.h"
+
+#define NTAG215_SIZE 540
+
+static char * self;
+
+void amiitool_usage() {
+	fprintf(stderr,
+		"amiitool build %i (commit %s-%08x)\n"
+		"by Marcos Del Sol Vives <marcos@dracon.es>\n"
+		"\n"
+		"Usage: %s (-e|-d|-c) -k keyfile [-i input] [-s input2] [-o output]\n"
+		"   -e encrypt and sign amiibo\n"
+		"   -d decrypt and test amiibo\n"
+		"   -c decrypt, copy AppData and encrypt amiibo\n"
+		"   -k key set file. For retail amiibo, use \"retail unfixed\" key set\n"
+		"   -i input file. If not specified, stdin will be used.\n"
+		"   -s input save file, save from this file will replace input file ones.\n"
+		"   -o output file. If not specified, stdout will be used.\n"
+		"   -l decrypt files with invalid signatures.\n",
+		, self
+	);
+}
+
+static bool LoadAmiikey(nfc3d_amiibo_keys keys, char* keyfile) {
+	
+	if (!nfc3d_amiibo_load_keys(&keys, keyfile)) {
+		PrintAndLogEx(ERR, "Could not load keys from '%s'", keyfile);
+		return false;
+	}
+	return true;
+}
+
+int main(int argc, char ** argv) {
+	self = argv[0];
+
+	char * infile = NULL;
+	char * savefile = NULL;
+	char * outfile = NULL;
+	char * keyfile = NULL;
+	char op = '\0';
+	bool lenient = false;
+
+	char c;
+	while ((c = getopt(argc, argv, "edci:s:o:k:l")) != -1) {
+		switch (c) {
+			case 'e':
+			case 'd':
+			case 'c':
+				op = c;
+				break;
+			case 'i':
+				infile = optarg;
+				break;
+			case 's':
+				savefile = optarg;
+				break;
+			case 'o':
+				outfile = optarg;
+				break;
+			case 'l':
+				lenient = true;
+				break;
+			default:
+				amiitool_usage();
+				return 2;
+		}
+	}
+
+	if (op == '\0' || keyfile == NULL) {
+		amiitool_usage();
+		return 1;
+	}
+
+	nfc3d_amiibo_keys amiiboKeys;
+
+	
+	uint8_t original[NTAG215_SIZE];
+	uint8_t modified[NFC3D_AMIIBO_SIZE];
+
+	FILE * f = stdin;
+	if (infile) {
+		f = fopen(infile, "rb");
+		if (!f) {
+			fprintf(stderr, "Could not open input file\n");
+			return 3;
+		}
+	}
+	size_t readPages = fread(original, 4, NTAG215_SIZE / 4, f);
+	if (readPages < NFC3D_AMIIBO_SIZE / 4) {
+		fprintf(stderr, "Could not read from input\n");
+		fclose(f);
+		return 3;
+	}
+	fclose(f);
+
+
+	if (op == 'e') {
+		nfc3d_amiibo_pack(&amiiboKeys, original, modified);
+	} else if (op == 'd') {
+		if (!nfc3d_amiibo_unpack(&amiiboKeys, original, modified)) {
+			fprintf(stderr, "!!! WARNING !!!: Tag signature was NOT valid\n");
+			if (!lenient) {
+				return 6;
+			}
+		}
+	} else { /* copy */
+		uint8_t plain_base[NFC3D_AMIIBO_SIZE];
+		uint8_t plain_save[NFC3D_AMIIBO_SIZE];
+
+		if (!nfc3d_amiibo_unpack(&amiiboKeys, original, plain_base)) {
+			fprintf(stderr, "!!! WARNING !!!: Tag signature was NOT valid\n");
+			if (!lenient) {
+				return 6;
+			}
+		}
+		if (savefile) {
+			f = fopen(savefile, "rb");
+			if (!f) {
+				fprintf(stderr, "Could not open save file\n");
+				return 3;
+			}
+		}
+		size_t readPages = fread(original, 4, NTAG215_SIZE / 4, f);
+		if (readPages < NFC3D_AMIIBO_SIZE / 4) {
+			fprintf(stderr, "Could not read from save\n");
+			fclose(f);
+			return 3;
+		}
+		fclose(f);
+
+		if (!nfc3d_amiibo_unpack(&amiiboKeys, original, plain_save)) {
+			fprintf(stderr, "!!! WARNING !!!: Tag signature was NOT valid\n");
+			if (!lenient) {
+				return 6;
+			}
+		}
+
+		nfc3d_amiibo_copy_app_data(plain_save, plain_base);
+		nfc3d_amiibo_pack(&amiiboKeys, plain_base, modified);
+	}
+
+	f = stdout;
+	if (outfile) {
+		f = fopen(outfile, "wb");
+		if (!f) {
+			fprintf(stderr, "Could not open output file\n");
+			return 4;
+		}
+	}
+	if (fwrite(modified, NFC3D_AMIIBO_SIZE, 1, f) != 1) {
+		fprintf(stderr, "Could not write to output\n");
+		fclose(f);
+		return 4;
+	}
+	if (readPages > NFC3D_AMIIBO_SIZE / 4) {
+		if (fwrite(original + NFC3D_AMIIBO_SIZE, readPages * 4 - NFC3D_AMIIBO_SIZE, 1, f) != 1) {
+			fprintf(stderr, "Could not write to output:\n");
+			fclose(f);
+			return 4;
+		}
+	}
+	fclose(f);
+	return 0;
+}
diff --git a/client/amiitool/drbg.c b/client/amiitool/drbg.c
new file mode 100644
index 000000000..d56366077
--- /dev/null
+++ b/client/amiitool/drbg.c
@@ -0,0 +1,78 @@
+/*
+ * (c) 2015-2017 Marcos Del Sol Vives
+ * (c) 2016      javiMaD
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#include "drbg.h"
+#include <assert.h>
+#include <string.h>
+#include <mbedtls/md.h>
+
+void nfc3d_drbg_init(nfc3d_drbg_ctx * ctx, const uint8_t * hmacKey, size_t hmacKeySize, const uint8_t * seed, size_t seedSize) {
+	assert(ctx != NULL);
+	assert(hmacKey != NULL);
+	assert(seed != NULL);
+	assert(seedSize <= NFC3D_DRBG_MAX_SEED_SIZE);
+
+	// Initialize primitives
+	ctx->used = false;
+	ctx->iteration = 0;
+	ctx->bufferSize = sizeof(ctx->iteration) + seedSize;
+
+	// The 16-bit counter is prepended to the seed when hashing, so we'll leave 2 bytes at the start
+	memcpy(ctx->buffer + sizeof(uint16_t), seed, seedSize);
+
+	// Initialize underlying HMAC context
+	mbedtls_md_init(&ctx->hmacCtx);
+	mbedtls_md_setup(&ctx->hmacCtx, mbedtls_md_info_from_type(MBEDTLS_MD_SHA256), 1);
+	mbedtls_md_hmac_starts(&ctx->hmacCtx, hmacKey, hmacKeySize);
+}
+
+void nfc3d_drbg_step(nfc3d_drbg_ctx * ctx, uint8_t * output) {
+	assert(ctx != NULL);
+	assert(output != NULL);
+
+	if (ctx->used) {
+		// If used at least once, reinitialize the HMAC
+		mbedtls_md_hmac_reset(&ctx->hmacCtx);
+	} else {
+		ctx->used = true;
+	}
+
+	// Store counter in big endian, and increment it
+	ctx->buffer[0] = ctx->iteration >> 8;
+	ctx->buffer[1] = ctx->iteration >> 0;
+	ctx->iteration++;
+
+	// Do HMAC magic
+	mbedtls_md_hmac_update(&ctx->hmacCtx, ctx->buffer, ctx->bufferSize);
+	mbedtls_md_hmac_finish(&ctx->hmacCtx, output);
+}
+
+void nfc3d_drbg_cleanup(nfc3d_drbg_ctx * ctx) {
+	assert(ctx != NULL);
+	mbedtls_md_free(&ctx->hmacCtx);
+}
+
+void nfc3d_drbg_generate_bytes(const uint8_t * hmacKey, size_t hmacKeySize, const uint8_t * seed, size_t seedSize, uint8_t * output, size_t outputSize) {
+	uint8_t temp[NFC3D_DRBG_OUTPUT_SIZE];
+
+	nfc3d_drbg_ctx rngCtx;
+	nfc3d_drbg_init(&rngCtx, hmacKey, hmacKeySize, seed, seedSize);
+
+	while (outputSize > 0) {
+		if (outputSize < NFC3D_DRBG_OUTPUT_SIZE) {
+			nfc3d_drbg_step(&rngCtx, temp);
+			memcpy(output, temp, outputSize);
+			break;
+		}
+
+		nfc3d_drbg_step(&rngCtx, output);
+		output += NFC3D_DRBG_OUTPUT_SIZE;
+		outputSize -= NFC3D_DRBG_OUTPUT_SIZE;
+	}
+
+	nfc3d_drbg_cleanup(&rngCtx);
+}
diff --git a/client/amiitool/drbg.h b/client/amiitool/drbg.h
new file mode 100644
index 000000000..0e93abfc0
--- /dev/null
+++ b/client/amiitool/drbg.h
@@ -0,0 +1,33 @@
+/*
+ * (c) 2015-2017 Marcos Del Sol Vives
+ * (c) 2016      javiMaD
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#ifndef HAVE_NFC3D_DRBG_H
+#define HAVE_NFC3D_DRBG_H
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "mbedtls/md.h"
+
+#define NFC3D_DRBG_MAX_SEED_SIZE	480	/* Hardcoded max size in 3DS NFC module */
+#define NFC3D_DRBG_OUTPUT_SIZE		32	/* Every iteration generates 32 bytes */
+
+typedef struct {
+	mbedtls_md_context_t hmacCtx;
+	bool used;
+	uint16_t iteration;
+
+	uint8_t buffer[sizeof(uint16_t) + NFC3D_DRBG_MAX_SEED_SIZE];
+	size_t bufferSize;
+} nfc3d_drbg_ctx;
+
+void nfc3d_drbg_init(nfc3d_drbg_ctx * ctx, const uint8_t * hmacKey, size_t hmacKeySize, const uint8_t * seed, size_t seedSize);
+void nfc3d_drbg_step(nfc3d_drbg_ctx * ctx, uint8_t * output);
+void nfc3d_drbg_cleanup(nfc3d_drbg_ctx * ctx);
+void nfc3d_drbg_generate_bytes(const uint8_t * hmacKey, size_t hmacKeySize, const uint8_t * seed, size_t seedSize, uint8_t * output, size_t outputSize);
+
+#endif
+
diff --git a/client/amiitool/key_retail.bin b/client/amiitool/key_retail.bin
new file mode 100644
index 0000000000000000000000000000000000000000..9ecc9e35a39e5c28c46891bb1438bca2beac5462
GIT binary patch
literal 160
zcmb0Y^EQtzS{kmgQ#NJW;zO*Zd1;vysVNGXd1?8@3=Dj?z317xs`p#g{h#f>b20-1
zi>LUVvMtjbuKlpIoW{TI%6m)wRhvXKRw@1tdFsmQo>pI~t5Lj&LHys37}nAW-nlvX
l$=N{Tic^z|QcD;Z1pb~_P&Q@9JRkSVwJ*-alpG{v9ssi<MB@Me

literal 0
HcmV?d00001

diff --git a/client/amiitool/keygen.c b/client/amiitool/keygen.c
new file mode 100644
index 000000000..c82e3abee
--- /dev/null
+++ b/client/amiitool/keygen.c
@@ -0,0 +1,53 @@
+/*
+ * (c) 2015-2017 Marcos Del Sol Vives
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#include "drbg.h"
+#include "keygen.h"
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+
+void nfc3d_keygen_prepare_seed(const nfc3d_keygen_masterkeys * baseKeys, const uint8_t * baseSeed, uint8_t * output, size_t * outputSize) {
+	assert(baseKeys != NULL);
+	assert(baseSeed != NULL);
+	assert(output != NULL);
+	assert(outputSize != NULL);
+
+	uint8_t * start = output;
+
+	// 1: Copy whole type string
+	output = memccpy(output, baseKeys->typeString, '\0', sizeof(baseKeys->typeString));
+
+	// 2: Append (16 - magicBytesSize) from the input seed
+	size_t leadingSeedBytes = 16 - baseKeys->magicBytesSize;
+	memcpy(output, baseSeed, leadingSeedBytes);
+	output += leadingSeedBytes;
+
+	// 3: Append all bytes from magicBytes
+	memcpy(output, baseKeys->magicBytes, baseKeys->magicBytesSize);
+	output += baseKeys->magicBytesSize;
+
+	// 4: Append bytes 0x10-0x1F from input seed
+	memcpy(output, baseSeed + 0x10, 16);
+	output += 16;
+
+	// 5: Xor last bytes 0x20-0x3F of input seed with AES XOR pad and append them
+	unsigned int i;
+	for (i = 0; i < 32; i++) {
+		output[i] = baseSeed[i + 32] ^ baseKeys->xorPad[i];
+	}
+	output += 32;
+
+	*outputSize = output - start;
+}
+
+void nfc3d_keygen(const nfc3d_keygen_masterkeys * baseKeys, const uint8_t * baseSeed, nfc3d_keygen_derivedkeys * derivedKeys) {
+	uint8_t preparedSeed[NFC3D_DRBG_MAX_SEED_SIZE];
+	size_t preparedSeedSize;
+
+	nfc3d_keygen_prepare_seed(baseKeys, baseSeed, preparedSeed, &preparedSeedSize);
+	nfc3d_drbg_generate_bytes(baseKeys->hmacKey, sizeof(baseKeys->hmacKey), preparedSeed, preparedSeedSize, (uint8_t *) derivedKeys, sizeof(*derivedKeys));
+}
diff --git a/client/amiitool/keygen.h b/client/amiitool/keygen.h
new file mode 100644
index 000000000..35595e3ef
--- /dev/null
+++ b/client/amiitool/keygen.h
@@ -0,0 +1,34 @@
+/*
+ * (c) 2015-2017 Marcos Del Sol Vives
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#ifndef HAVE_NFC3D_KEYGEN_H
+#define HAVE_NFC3D_KEYGEN_H
+
+#include <stdint.h>
+#include <stdbool.h>
+
+#define NFC3D_KEYGEN_SEED_SIZE 64
+
+#pragma pack(1)
+typedef struct {
+	uint8_t hmacKey[16];
+	char typeString[14];
+	uint8_t rfu;
+	uint8_t magicBytesSize;
+	uint8_t magicBytes[16];
+	uint8_t xorPad[32];
+} nfc3d_keygen_masterkeys;
+
+typedef struct {
+	const uint8_t aesKey[16];
+	const uint8_t aesIV[16];
+	const uint8_t hmacKey[16];
+} nfc3d_keygen_derivedkeys;
+#pragma pack()
+
+void nfc3d_keygen(const nfc3d_keygen_masterkeys * baseKeys, const uint8_t * baseSeed, nfc3d_keygen_derivedkeys * derivedKeys);
+
+#endif
diff --git a/client/obj/amiitool/.dummy b/client/obj/amiitool/.dummy
new file mode 100644
index 000000000..e69de29bb

From 88d42a1af5d244387a51508520627740a3a4f6e6 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Fri, 28 Dec 2018 13:46:52 +0200
Subject: [PATCH 0339/1938] make

---
 client/Makefile       |   1 +
 client/emv/emv_roca.c | 117 ++++++++++++++++++++++++++++++++++++++++++
 client/emv/emv_roca.h |  41 +++++++++++++++
 3 files changed, 159 insertions(+)
 create mode 100644 client/emv/emv_roca.c
 create mode 100644 client/emv/emv_roca.h

diff --git a/client/Makefile b/client/Makefile
index 766163c09..4f7168fa0 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -155,6 +155,7 @@ CMDSRCS =	crapto1/crapto1.c \
 			emv/test/dda_test.c\
 			emv/test/cda_test.c\
 			emv/cmdemv.c \
+			emv/emv_roca.c \
             mifare4.c \
 			cmdanalyse.c \
 			cmdhf.c \
diff --git a/client/emv/emv_roca.c b/client/emv/emv_roca.c
new file mode 100644
index 000000000..0dfaa1339
--- /dev/null
+++ b/client/emv/emv_roca.c
@@ -0,0 +1,117 @@
+/* roca.c - ROCA (CVE-2017-15361) fingerprint checker.
+ * Written by Rob Stradling (based on https://github.com/crocs-muni/roca/blob/master/roca/detect.py)
+ * Copyright (C) 2017 COMODO CA Limited
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "emv_roca.h"
+
+static uint8_t g_primes[ROCA_PRINTS_LENGTH] = {
+	11, 13, 17, 19, 37, 53, 61, 71, 73, 79, 97, 103, 107, 109, 127, 151, 157
+};
+
+mbedtls_mpi* g_prints[ROCA_PRINTS_LENGTH];
+
+void rocacheck_init(void) {
+	
+	for (uint8_t i = 0; i < ROCA_PRINTS_LENGTH; i++)
+		mbedtls_mpi_init(g_prints[i]);
+	
+	mbedtls_mpi_read_string(g_prints[0], 10, "1026");
+	mbedtls_mpi_read_string(g_prints[1], 10, "5658");
+	mbedtls_mpi_read_string(g_prints[2], 10, "107286");
+	mbedtls_mpi_read_string(g_prints[3], 10, "199410");
+	mbedtls_mpi_read_string(g_prints[4], 10, "67109890");
+	mbedtls_mpi_read_string(g_prints[5], 10, "5310023542746834");
+	mbedtls_mpi_read_string(g_prints[6], 10, "1455791217086302986");
+	mbedtls_mpi_read_string(g_prints[7], 10, "20052041432995567486");
+	mbedtls_mpi_read_string(g_prints[8], 10, "6041388139249378920330");
+	mbedtls_mpi_read_string(g_prints[9], 10, "207530445072488465666");
+	mbedtls_mpi_read_string(g_prints[10], 10, "79228162521181866724264247298");
+	mbedtls_mpi_read_string(g_prints[11], 10, "1760368345969468176824550810518");
+	mbedtls_mpi_read_string(g_prints[12], 10, "50079290986288516948354744811034");
+	mbedtls_mpi_read_string(g_prints[13], 10, "473022961816146413042658758988474");
+	mbedtls_mpi_read_string(g_prints[14], 10, "144390480366845522447407333004847678774");
+	mbedtls_mpi_read_string(g_prints[15], 10, "1800793591454480341970779146165214289059119882");
+	mbedtls_mpi_read_string(g_prints[16], 10, "126304807362733370595828809000324029340048915994");
+}
+
+void rocacheck_cleanup(void) {
+	for (uint8_t i = 0; i < ROCA_PRINTS_LENGTH; i++)
+		mbedtls_mpi_free(g_prints[i]);
+}
+
+int bitand_is_zero(	mbedtls_mpi* a, mbedtls_mpi* b ) {
+
+	for (int i = 0; i < mbedtls_mpi_bitlen(a); i++) {
+	
+		if (mbedtls_mpi_get_bit(a, i) && mbedtls_mpi_get_bit(b, i))
+			return 0;
+	}
+	return 1;
+}
+
+
+bool emv_rocacheck(char *modulus) {
+
+	mbedtls_mpi *t_modulus = NULL;
+	mbedtls_mpi_init(t_modulus);
+
+	bool ret = true;
+
+	rocacheck_init();
+
+	// 
+	MBEDTLS_MPI_CHK( mbedtls_mpi_read_string(t_modulus, 10, modulus) );
+	
+	
+	for (int i = 0; i < ROCA_PRINTS_LENGTH; i++) {
+
+		mbedtls_mpi* t_temp = NULL;
+		mbedtls_mpi* t_prime = NULL;
+		mbedtls_mpi* g_one = NULL;
+		
+		mbedtls_mpi_init(g_one);
+		mbedtls_mpi_init(t_temp);
+		mbedtls_mpi_init(t_prime);
+		
+		MBEDTLS_MPI_CHK( mbedtls_mpi_read_string(g_one, 10, "1") );
+	
+		MBEDTLS_MPI_CHK( mbedtls_mpi_add_int(t_prime, t_prime, g_primes[i]) );
+		
+		MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi(t_temp, t_modulus, t_prime) ); 
+		
+		MBEDTLS_MPI_CHK( mbedtls_mpi_shift_l(g_one, t_temp) );
+		
+		if (bitand_is_zero(t_temp, g_prints[i])) {
+			PrintAndLogEx(FAILED, "No fingerprint found\n");
+			ret = false;
+			goto cleanup;
+		}
+		
+		mbedtls_mpi_free(g_one);		
+		mbedtls_mpi_free(t_temp);
+		mbedtls_mpi_free(t_prime);
+	}
+
+	PrintAndLogEx(SUCCESS, "Fingerprint found!\n");
+
+cleanup:
+	if (t_modulus)
+		mbedtls_mpi_free(t_modulus);
+
+	rocacheck_cleanup();
+	return ret;
+}
diff --git a/client/emv/emv_roca.h b/client/emv/emv_roca.h
new file mode 100644
index 000000000..e2ba0ac51
--- /dev/null
+++ b/client/emv/emv_roca.h
@@ -0,0 +1,41 @@
+
+// ROCA (CVE-2017-15361) fingerprint checker.
+// Written by Rob Stradling (based on https://github.com/crocs-muni/roca/blob/master/roca/detect.py)
+// Copyright (C) 2017 COMODO CA Limited
+// modified 2018 iceman  (dropped openssl bignum,  now use mbedtls lib)
+// 
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+//-----------------------------------------------------------------------------
+// EMV roca commands
+//-----------------------------------------------------------------------------
+
+#ifndef EMV_ROCA_H__
+#define EMV_ROCA_H__
+
+#include <stdbool.h>
+#include <string.h>
+#include "mbedtls/bignum.h"
+#include "util.h"
+
+#define ROCA_PRINTS_LENGTH	17
+
+void rocacheck_init(void);
+void rocacheck_cleanup(void);
+int bitand_is_zero(	mbedtls_mpi* a, mbedtls_mpi* b );
+
+extern bool emv_rocacheck( char *modulus );
+
+#endif
+

From b1145ba57771237d5a7b8223f2f5746863b5f418 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Fri, 28 Dec 2018 14:50:23 +0200
Subject: [PATCH 0340/1938] mpi_get_uint

---
 client/emv/emv_roca.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/client/emv/emv_roca.c b/client/emv/emv_roca.c
index 0dfaa1339..2843cb2c1 100644
--- a/client/emv/emv_roca.c
+++ b/client/emv/emv_roca.c
@@ -64,6 +64,15 @@ int bitand_is_zero(	mbedtls_mpi* a, mbedtls_mpi* b ) {
 }
 
 
+mbedtls_mpi_uint mpi_get_uint(const mbedtls_mpi *X) {
+	
+	if (X->n == 1) {
+		return X->p[0];
+	}
+	
+	return 0;
+}
+
 bool emv_rocacheck(char *modulus) {
 
 	mbedtls_mpi *t_modulus = NULL;
@@ -93,7 +102,7 @@ bool emv_rocacheck(char *modulus) {
 		
 		MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi(t_temp, t_modulus, t_prime) ); 
 		
-		MBEDTLS_MPI_CHK( mbedtls_mpi_shift_l(g_one, t_temp) );
+		MBEDTLS_MPI_CHK( mbedtls_mpi_shift_l(g_one, mpi_get_uint(t_temp)) );
 		
 		if (bitand_is_zero(t_temp, g_prints[i])) {
 			PrintAndLogEx(FAILED, "No fingerprint found\n");

From 9804526dca774c21f617b3b13d431826e3c7a685 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Fri, 28 Dec 2018 14:52:24 +0200
Subject: [PATCH 0341/1938] small fix for unsigned int

---
 client/emv/emv_roca.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/emv/emv_roca.c b/client/emv/emv_roca.c
index 2843cb2c1..48845c99f 100644
--- a/client/emv/emv_roca.c
+++ b/client/emv/emv_roca.c
@@ -66,7 +66,7 @@ int bitand_is_zero(	mbedtls_mpi* a, mbedtls_mpi* b ) {
 
 mbedtls_mpi_uint mpi_get_uint(const mbedtls_mpi *X) {
 	
-	if (X->n == 1) {
+	if (X->n == 1 && X->s > 0) {
 		return X->p[0];
 	}
 	

From ab41b4a991fe4e75c1ebd6c3056ac1667f8d0e2a Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Fri, 28 Dec 2018 16:40:53 +0200
Subject: [PATCH 0342/1938] emv_rocacheck

---
 client/emv/cmdemv.h   | 1 +
 client/emv/emv_roca.c | 5 ++---
 client/emv/emv_roca.h | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/emv/cmdemv.h b/client/emv/cmdemv.h
index 0b0419b07..c91f75606 100644
--- a/client/emv/cmdemv.h
+++ b/client/emv/cmdemv.h
@@ -25,6 +25,7 @@
 #include "cmdmain.h"
 #include "emvcore.h"
 #include "apduinfo.h"
+#include "emv_roca.h"
 
 int CmdEMV(const char *Cmd);
 
diff --git a/client/emv/emv_roca.c b/client/emv/emv_roca.c
index 48845c99f..fe68b83ce 100644
--- a/client/emv/emv_roca.c
+++ b/client/emv/emv_roca.c
@@ -73,7 +73,7 @@ mbedtls_mpi_uint mpi_get_uint(const mbedtls_mpi *X) {
 	return 0;
 }
 
-bool emv_rocacheck(char *modulus) {
+bool emv_rocacheck(const unsigned char *buf, size_t buflen) {
 
 	mbedtls_mpi *t_modulus = NULL;
 	mbedtls_mpi_init(t_modulus);
@@ -82,8 +82,7 @@ bool emv_rocacheck(char *modulus) {
 
 	rocacheck_init();
 
-	// 
-	MBEDTLS_MPI_CHK( mbedtls_mpi_read_string(t_modulus, 10, modulus) );
+	MBEDTLS_MPI_CHK( mbedtls_mpi_read_binary(t_modulus, buf, buflen) );
 	
 	
 	for (int i = 0; i < ROCA_PRINTS_LENGTH; i++) {
diff --git a/client/emv/emv_roca.h b/client/emv/emv_roca.h
index e2ba0ac51..a42d8349e 100644
--- a/client/emv/emv_roca.h
+++ b/client/emv/emv_roca.h
@@ -35,7 +35,7 @@ void rocacheck_init(void);
 void rocacheck_cleanup(void);
 int bitand_is_zero(	mbedtls_mpi* a, mbedtls_mpi* b );
 
-extern bool emv_rocacheck( char *modulus );
+extern bool emv_rocacheck( const unsigned char *buf, size_t buflen );
 
 #endif
 

From 8e5133582d98e3f37cd2e94d5585678f10d456e1 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Fri, 28 Dec 2018 16:43:15 +0200
Subject: [PATCH 0343/1938] `emv roca` select app

---
 client/emv/cmdemv.c | 81 +++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 75 insertions(+), 6 deletions(-)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index 1029d5a7e..d3ec26c53 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -1464,6 +1464,12 @@ int CmdEMVTest(const char *cmd) {
 }
 
 int CmdEMVRoca(const char *cmd) {
+	uint8_t AID[APDU_AID_LEN] = {0};
+	size_t AIDlen = 0;
+	uint8_t buf[APDU_RES_LEN] = {0};
+	size_t len = 0;
+	uint16_t sw = 0;
+	int res;
 		
 	CLIParserInit("emv roca", 
 		"Tries to extract public keys and run the ROCA test against them.\n", 
@@ -1481,16 +1487,71 @@ int CmdEMVRoca(const char *cmd) {
 	if (arg_get_lit(1))
 		channel = ECC_CONTACT;
 
+	// select card
+	uint8_t psenum = (channel == ECC_CONTACT) ? 1 : 2;
+	
+	// init applets list tree
+	const char *al = "Applets list";
+	struct tlvdb *tlvSelect = tlvdb_fixed(1, strlen(al), (const unsigned char *)al);
+
+	// EMV PPSE
+	PrintAndLogEx(NORMAL, "--> PPSE.");
+	res = EMVSelectPSE(channel, true, true, psenum, buf, sizeof(buf), &len, &sw);
+
+	if (!res && sw == 0x9000){
+		struct tlvdb *fci = tlvdb_parse_multi(buf, len);
+		tlvdb_free(fci);
+	}
+
+	SetAPDULogging(false);
+	res = EMVSearchPSE(channel, false, true, false, tlvSelect);
+
+	// check PPSE and select application id
+	if (!res) {	
+		TLVPrintAIDlistFromSelectTLV(tlvSelect);		
+	} else {
+		// EMV SEARCH with AID list
+		PrintAndLogEx(NORMAL, "--> AID search.");
+		if (EMVSearch(channel, false, true, false, tlvSelect)) {
+			PrintAndLogEx(ERR, "Can't found any of EMV AID. Exit...");
+			tlvdb_free(tlvSelect);
+			DropField();
+			return 3;
+		}
+
+		// check search and select application id
+		TLVPrintAIDlistFromSelectTLV(tlvSelect);
+	}
+
+	// EMV SELECT application
+	SetAPDULogging(false);
+	EMVSelectApplication(tlvSelect, AID, &AIDlen);
+
+	tlvdb_free(tlvSelect);
+
+	if (!AIDlen) {
+		PrintAndLogEx(INFO, "Can't select AID. EMV AID not found. Exit...");
+		DropField();
+		return 4;
+	}
+
 	// Init TLV tree
 	const char *alr = "Root terminal TLV tree";
 	struct tlvdb *tlvRoot = tlvdb_fixed(1, strlen(alr), (const unsigned char *)alr);
 
-	// select card
-	uint8_t buf[APDU_RES_LEN] = {0};
-	size_t len = 0;
-	uint16_t sw = 0;
-	uint8_t psenum = (channel == ECC_CONTACT) ? 1: 2;
-	int res = EMVSelectPSE(channel, true, true, psenum, buf, sizeof(buf), &len, &sw);
+	// EMV SELECT applet
+	PrintAndLogEx(NORMAL, "\n-->Selecting AID:%s.", sprint_hex_inrow(AID, AIDlen));
+	res = EMVSelect(channel, false, true, AID, AIDlen, buf, sizeof(buf), &len, &sw, tlvRoot);
+	
+	if (res) {	
+		PrintAndLogEx(ERR, "Can't select AID (%d). Exit...", res);
+		tlvdb_free(tlvRoot);
+		DropField();
+		return 5;
+	}
+
+
+
 	
 	// getting certificates
  	if (tlvdb_get(tlvRoot, 0x90, NULL)) {
@@ -1530,8 +1591,16 @@ int CmdEMVRoca(const char *cmd) {
 				sprint_hex(icc_pk->serial, 3)
 				);
 		
+
 //	icc_pk->exp, icc_pk->elen
 //	icc_pk->modulus, icc_pk->mlen
+		if (icc_pk->elen > 0 && icc_pk->mlen > 0) {
+			if (emv_rocacheck(icc_pk->modulus, icc_pk->mlen)) {
+				PrintAndLogEx(INFO, "ICC pk is vulnerable by roca.");
+			} else {
+				PrintAndLogEx(INFO, "ICC pk is OK(");
+			}
+		}
 		
 		
 		PKISetStrictExecution(true);

From b0c1828c1defffeca88b150abfed924fc5125929 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Fri, 28 Dec 2018 16:58:11 +0200
Subject: [PATCH 0344/1938] load params

---
 client/emv/cmdemv.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index d3ec26c53..c058c9913 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -1550,6 +1550,8 @@ int CmdEMVRoca(const char *cmd) {
 		return 5;
 	}
 
+	PrintAndLog("\n* Init transaction parameters.");
+	InitTransactionParameters(tlvRoot, true, TT_QVSDCMCHIP, false);
 
 
 	

From 67b7edeb44756c332cd90f0caf185d2a942b7190 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Fri, 28 Dec 2018 17:07:58 +0200
Subject: [PATCH 0345/1938] extract keys works

---
 client/emv/cmdemv.c | 75 ++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 71 insertions(+), 4 deletions(-)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index c058c9913..7922bc616 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -1553,8 +1553,74 @@ int CmdEMVRoca(const char *cmd) {
 	PrintAndLog("\n* Init transaction parameters.");
 	InitTransactionParameters(tlvRoot, true, TT_QVSDCMCHIP, false);
 
-
+	PrintAndLogEx(NORMAL, "-->Calc PDOL.");
+	struct tlv *pdol_data_tlv = dol_process(tlvdb_get(tlvRoot, 0x9f38, NULL), tlvRoot, 0x83);
+	if (!pdol_data_tlv){
+		PrintAndLogEx(ERR, "Can't create PDOL TLV.");
+		tlvdb_free(tlvRoot);
+		DropField();
+		return 6;
+	}
 	
+	size_t pdol_data_tlv_data_len;
+	unsigned char *pdol_data_tlv_data = tlv_encode(pdol_data_tlv, &pdol_data_tlv_data_len);
+	if (!pdol_data_tlv_data) {
+		PrintAndLogEx(ERR, "Can't create PDOL data.");
+		tlvdb_free(tlvRoot);
+		DropField();
+		return 6;
+	}
+	PrintAndLogEx(INFO, "PDOL data[%d]: %s", pdol_data_tlv_data_len, sprint_hex(pdol_data_tlv_data, pdol_data_tlv_data_len));
+
+	PrintAndLogEx(INFO, "-->GPO.");
+	res = EMVGPO(channel, true, pdol_data_tlv_data, pdol_data_tlv_data_len, buf, sizeof(buf), &len, &sw, tlvRoot);
+	
+	free(pdol_data_tlv_data);
+	free(pdol_data_tlv);
+	
+	if (res) {	
+		PrintAndLogEx(ERR, "GPO error(%d): %4x. Exit...", res, sw);
+		tlvdb_free(tlvRoot);
+		DropField();
+		return 7;
+	}
+	ProcessGPOResponseFormat1(tlvRoot, buf, len, false);
+	
+	PrintAndLogEx(INFO, "-->Read records from AFL.");
+	const struct tlv *AFL = tlvdb_get(tlvRoot, 0x94, NULL);
+	
+	while(AFL && AFL->len) {
+		if (AFL->len % 4) {
+			PrintAndLogEx(ERR, "Wrong AFL length: %d", AFL->len);
+			break;
+		}
+
+		for (int i = 0; i < AFL->len / 4; i++) {
+			uint8_t SFI = AFL->value[i * 4 + 0] >> 3;
+			uint8_t SFIstart = AFL->value[i * 4 + 1];
+			uint8_t SFIend = AFL->value[i * 4 + 2];
+			uint8_t SFIoffline = AFL->value[i * 4 + 3];
+			
+			PrintAndLogEx(INFO, "--->SFI[%02x] start:%02x end:%02x offline:%02x", SFI, SFIstart, SFIend, SFIoffline);
+			if (SFI == 0 || SFI == 31 || SFIstart == 0 || SFIstart > SFIend) {
+				PrintAndLogEx(ERR, "SFI ERROR! Skipped...");
+				continue;
+			}
+			
+			for(int n = SFIstart; n <= SFIend; n++) {
+				PrintAndLogEx(INFO, "---->SFI[%02x] %d", SFI, n);
+				
+				res = EMVReadRecord(channel, true, SFI, n, buf, sizeof(buf), &len, &sw, tlvRoot);
+				if (res) {
+					PrintAndLogEx(ERR, "SFI[%02x]. APDU error %4x", SFI, sw);
+					continue;
+				}
+			}
+		}
+		
+		break;
+	}
+
 	// getting certificates
  	if (tlvdb_get(tlvRoot, 0x90, NULL)) {
 		PrintAndLogEx(INFO, "-->Recovering certificates.");
@@ -1593,9 +1659,10 @@ int CmdEMVRoca(const char *cmd) {
 				sprint_hex(icc_pk->serial, 3)
 				);
 		
-
-//	icc_pk->exp, icc_pk->elen
-//	icc_pk->modulus, icc_pk->mlen
+		PrintAndLogEx(INFO, "ICC pk modulus: %s", sprint_hex_inrow(icc_pk->modulus, icc_pk->mlen));
+		
+		//	icc_pk->exp, icc_pk->elen
+		//	icc_pk->modulus, icc_pk->mlen
 		if (icc_pk->elen > 0 && icc_pk->mlen > 0) {
 			if (emv_rocacheck(icc_pk->modulus, icc_pk->mlen)) {
 				PrintAndLogEx(INFO, "ICC pk is vulnerable by roca.");

From 625b696291d734c14d420bcd55e88ffe1c40e34c Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Fri, 28 Dec 2018 17:25:11 +0200
Subject: [PATCH 0346/1938] roca works

---
 client/emv/emv_roca.c | 85 +++++++++++++++++++++----------------------
 1 file changed, 42 insertions(+), 43 deletions(-)

diff --git a/client/emv/emv_roca.c b/client/emv/emv_roca.c
index fe68b83ce..2aaa10875 100644
--- a/client/emv/emv_roca.c
+++ b/client/emv/emv_roca.c
@@ -22,35 +22,35 @@ static uint8_t g_primes[ROCA_PRINTS_LENGTH] = {
 	11, 13, 17, 19, 37, 53, 61, 71, 73, 79, 97, 103, 107, 109, 127, 151, 157
 };
 
-mbedtls_mpi* g_prints[ROCA_PRINTS_LENGTH];
+mbedtls_mpi g_prints[ROCA_PRINTS_LENGTH];
 
 void rocacheck_init(void) {
 	
-	for (uint8_t i = 0; i < ROCA_PRINTS_LENGTH; i++)
-		mbedtls_mpi_init(g_prints[i]);
+	for (int i = 0; i < ROCA_PRINTS_LENGTH; i++)
+		mbedtls_mpi_init(&g_prints[i]);
 	
-	mbedtls_mpi_read_string(g_prints[0], 10, "1026");
-	mbedtls_mpi_read_string(g_prints[1], 10, "5658");
-	mbedtls_mpi_read_string(g_prints[2], 10, "107286");
-	mbedtls_mpi_read_string(g_prints[3], 10, "199410");
-	mbedtls_mpi_read_string(g_prints[4], 10, "67109890");
-	mbedtls_mpi_read_string(g_prints[5], 10, "5310023542746834");
-	mbedtls_mpi_read_string(g_prints[6], 10, "1455791217086302986");
-	mbedtls_mpi_read_string(g_prints[7], 10, "20052041432995567486");
-	mbedtls_mpi_read_string(g_prints[8], 10, "6041388139249378920330");
-	mbedtls_mpi_read_string(g_prints[9], 10, "207530445072488465666");
-	mbedtls_mpi_read_string(g_prints[10], 10, "79228162521181866724264247298");
-	mbedtls_mpi_read_string(g_prints[11], 10, "1760368345969468176824550810518");
-	mbedtls_mpi_read_string(g_prints[12], 10, "50079290986288516948354744811034");
-	mbedtls_mpi_read_string(g_prints[13], 10, "473022961816146413042658758988474");
-	mbedtls_mpi_read_string(g_prints[14], 10, "144390480366845522447407333004847678774");
-	mbedtls_mpi_read_string(g_prints[15], 10, "1800793591454480341970779146165214289059119882");
-	mbedtls_mpi_read_string(g_prints[16], 10, "126304807362733370595828809000324029340048915994");
+	mbedtls_mpi_read_string(&g_prints[0], 10, "1026");
+	mbedtls_mpi_read_string(&g_prints[1], 10, "5658");
+	mbedtls_mpi_read_string(&g_prints[2], 10, "107286");
+	mbedtls_mpi_read_string(&g_prints[3], 10, "199410");
+	mbedtls_mpi_read_string(&g_prints[4], 10, "67109890");
+	mbedtls_mpi_read_string(&g_prints[5], 10, "5310023542746834");
+	mbedtls_mpi_read_string(&g_prints[6], 10, "1455791217086302986");
+	mbedtls_mpi_read_string(&g_prints[7], 10, "20052041432995567486");
+	mbedtls_mpi_read_string(&g_prints[8], 10, "6041388139249378920330");
+	mbedtls_mpi_read_string(&g_prints[9], 10, "207530445072488465666");
+	mbedtls_mpi_read_string(&g_prints[10], 10, "79228162521181866724264247298");
+	mbedtls_mpi_read_string(&g_prints[11], 10, "1760368345969468176824550810518");
+	mbedtls_mpi_read_string(&g_prints[12], 10, "50079290986288516948354744811034");
+	mbedtls_mpi_read_string(&g_prints[13], 10, "473022961816146413042658758988474");
+	mbedtls_mpi_read_string(&g_prints[14], 10, "144390480366845522447407333004847678774");
+	mbedtls_mpi_read_string(&g_prints[15], 10, "1800793591454480341970779146165214289059119882");
+	mbedtls_mpi_read_string(&g_prints[16], 10, "126304807362733370595828809000324029340048915994");
 }
 
 void rocacheck_cleanup(void) {
-	for (uint8_t i = 0; i < ROCA_PRINTS_LENGTH; i++)
-		mbedtls_mpi_free(g_prints[i]);
+	for (int i = 0; i < ROCA_PRINTS_LENGTH; i++)
+		mbedtls_mpi_free(&g_prints[i]);
 }
 
 int bitand_is_zero(	mbedtls_mpi* a, mbedtls_mpi* b ) {
@@ -75,50 +75,49 @@ mbedtls_mpi_uint mpi_get_uint(const mbedtls_mpi *X) {
 
 bool emv_rocacheck(const unsigned char *buf, size_t buflen) {
 
-	mbedtls_mpi *t_modulus = NULL;
-	mbedtls_mpi_init(t_modulus);
+	mbedtls_mpi t_modulus;
+	mbedtls_mpi_init(&t_modulus);
 
 	bool ret = true;
 
 	rocacheck_init();
 
-	MBEDTLS_MPI_CHK( mbedtls_mpi_read_binary(t_modulus, buf, buflen) );
+	MBEDTLS_MPI_CHK( mbedtls_mpi_read_binary(&t_modulus, buf, buflen) );
 	
+	mbedtls_mpi_init(&g_one);
+	MBEDTLS_MPI_CHK( mbedtls_mpi_read_string(&g_one, 10, "1") );
 	
 	for (int i = 0; i < ROCA_PRINTS_LENGTH; i++) {
+printf("--p:%d\n", i);
 
-		mbedtls_mpi* t_temp = NULL;
-		mbedtls_mpi* t_prime = NULL;
-		mbedtls_mpi* g_one = NULL;
+		mbedtls_mpi t_temp;
+		mbedtls_mpi t_prime;
+		mbedtls_mpi g_one;
 		
-		mbedtls_mpi_init(g_one);
-		mbedtls_mpi_init(t_temp);
-		mbedtls_mpi_init(t_prime);
+		mbedtls_mpi_init(&t_temp);
+		mbedtls_mpi_init(&t_prime);
+
+		MBEDTLS_MPI_CHK( mbedtls_mpi_add_int(&t_prime, &t_prime, g_primes[i]) );
 		
-		MBEDTLS_MPI_CHK( mbedtls_mpi_read_string(g_one, 10, "1") );
-	
-		MBEDTLS_MPI_CHK( mbedtls_mpi_add_int(t_prime, t_prime, g_primes[i]) );
+		MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi(&t_temp, &t_modulus, &t_prime) ); 
 		
-		MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi(t_temp, t_modulus, t_prime) ); 
+		MBEDTLS_MPI_CHK( mbedtls_mpi_shift_l(&g_one, mpi_get_uint(&t_temp)) );
 		
-		MBEDTLS_MPI_CHK( mbedtls_mpi_shift_l(g_one, mpi_get_uint(t_temp)) );
-		
-		if (bitand_is_zero(t_temp, g_prints[i])) {
+		if (bitand_is_zero(&t_temp, &g_prints[i])) {
 			PrintAndLogEx(FAILED, "No fingerprint found\n");
 			ret = false;
 			goto cleanup;
 		}
 		
-		mbedtls_mpi_free(g_one);		
-		mbedtls_mpi_free(t_temp);
-		mbedtls_mpi_free(t_prime);
+		mbedtls_mpi_free(&g_one);		
+		mbedtls_mpi_free(&t_temp);
+		mbedtls_mpi_free(&t_prime);
 	}
 
 	PrintAndLogEx(SUCCESS, "Fingerprint found!\n");
 
 cleanup:
-	if (t_modulus)
-		mbedtls_mpi_free(t_modulus);
+	mbedtls_mpi_free(&t_modulus);
 
 	rocacheck_cleanup();
 	return ret;

From 6afda099db761b9793a126f3616e33ebad7db315 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Fri, 28 Dec 2018 17:46:57 +0200
Subject: [PATCH 0347/1938] added test/ not works

---
 client/emv/cmdemv.c   | 6 ++++++
 client/emv/emv_roca.c | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index 7922bc616..a42002c60 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -1661,6 +1661,12 @@ int CmdEMVRoca(const char *cmd) {
 		
 		PrintAndLogEx(INFO, "ICC pk modulus: %s", sprint_hex_inrow(icc_pk->modulus, icc_pk->mlen));
 		
+		
+		uint8_t key[] = "944e13208a280c37efc31c3114485e590192adbb8e11c87cad60cdef0037ce99278330d3f471a2538fa667802ed2a3c44a8b7dea826e888d0aa341fd664f7fa7";
+		if (emv_rocacheck(key, 64)) 
+				PrintAndLogEx(INFO, "DEMO ICC pk is vulnerable by roca.");
+		
+		
 		//	icc_pk->exp, icc_pk->elen
 		//	icc_pk->modulus, icc_pk->mlen
 		if (icc_pk->elen > 0 && icc_pk->mlen > 0) {
diff --git a/client/emv/emv_roca.c b/client/emv/emv_roca.c
index 2aaa10875..42bcce6db 100644
--- a/client/emv/emv_roca.c
+++ b/client/emv/emv_roca.c
@@ -84,6 +84,7 @@ bool emv_rocacheck(const unsigned char *buf, size_t buflen) {
 
 	MBEDTLS_MPI_CHK( mbedtls_mpi_read_binary(&t_modulus, buf, buflen) );
 	
+	mbedtls_mpi g_one;
 	mbedtls_mpi_init(&g_one);
 	MBEDTLS_MPI_CHK( mbedtls_mpi_read_string(&g_one, 10, "1") );
 	
@@ -92,7 +93,6 @@ printf("--p:%d\n", i);
 
 		mbedtls_mpi t_temp;
 		mbedtls_mpi t_prime;
-		mbedtls_mpi g_one;
 		
 		mbedtls_mpi_init(&t_temp);
 		mbedtls_mpi_init(&t_prime);

From 18225c7c7f0b466b7d77f500975c3bbb2867926b Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Fri, 28 Dec 2018 17:48:52 +0200
Subject: [PATCH 0348/1938] some fix

---
 client/emv/cmdemv.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index a42002c60..c1ae8b1f3 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -1662,7 +1662,10 @@ int CmdEMVRoca(const char *cmd) {
 		PrintAndLogEx(INFO, "ICC pk modulus: %s", sprint_hex_inrow(icc_pk->modulus, icc_pk->mlen));
 		
 		
-		uint8_t key[] = "944e13208a280c37efc31c3114485e590192adbb8e11c87cad60cdef0037ce99278330d3f471a2538fa667802ed2a3c44a8b7dea826e888d0aa341fd664f7fa7";
+		uint8_t key[] = "\x94\x4e\x13\x20\x8a\x28\x0c\x37\xef\xc3\x1c\x31\x14\x48\x5e\x59"\
+		                "\x01\x92\xad\xbb\x8e\x11\xc8\x7c\xad\x60\xcd\xef\x00\x37\xce\x99"\
+						"\x27\x83\x30\xd3\xf4\x71\xa2\x53\x8f\xa6\x67\x80\x2e\xd2\xa3\xc4"\
+						"\x4a\x8b\x7d\xea\x82\x6e\x88\x8d\x0a\xa3\x41\xfd\x66\x4f\x7f\xa7";
 		if (emv_rocacheck(key, 64)) 
 				PrintAndLogEx(INFO, "DEMO ICC pk is vulnerable by roca.");
 		

From 404f23ddbd6ae3df7f8065999250d29f9af442be Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Fri, 28 Dec 2018 17:50:51 +0200
Subject: [PATCH 0349/1938] small fix

---
 client/emv/cmdemv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index c1ae8b1f3..16e5c4765 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -1674,7 +1674,7 @@ int CmdEMVRoca(const char *cmd) {
 		//	icc_pk->modulus, icc_pk->mlen
 		if (icc_pk->elen > 0 && icc_pk->mlen > 0) {
 			if (emv_rocacheck(icc_pk->modulus, icc_pk->mlen)) {
-				PrintAndLogEx(INFO, "ICC pk is vulnerable by roca.");
+				PrintAndLogEx(INFO, "ICC pk is a subject to ROCA vulnerability, insecure..");
 			} else {
 				PrintAndLogEx(INFO, "ICC pk is OK(");
 			}

From 5eafc491ec91ccdf7b98ff33f2daa3cd6352b330 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Fri, 28 Dec 2018 18:00:37 +0200
Subject: [PATCH 0350/1938] small add

---
 client/emv/cmdemv.c   | 1 +
 client/emv/emv_roca.c | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index 16e5c4765..adb47b136 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -1666,6 +1666,7 @@ int CmdEMVRoca(const char *cmd) {
 		                "\x01\x92\xad\xbb\x8e\x11\xc8\x7c\xad\x60\xcd\xef\x00\x37\xce\x99"\
 						"\x27\x83\x30\xd3\xf4\x71\xa2\x53\x8f\xa6\x67\x80\x2e\xd2\xa3\xc4"\
 						"\x4a\x8b\x7d\xea\x82\x6e\x88\x8d\x0a\xa3\x41\xfd\x66\x4f\x7f\xa7";
+		PrintAndLogEx(INFO, "DEMO ICC pk modulus: %s", sprint_hex_inrow(key, 64));
 		if (emv_rocacheck(key, 64)) 
 				PrintAndLogEx(INFO, "DEMO ICC pk is vulnerable by roca.");
 		
diff --git a/client/emv/emv_roca.c b/client/emv/emv_roca.c
index 42bcce6db..88a7b21ad 100644
--- a/client/emv/emv_roca.c
+++ b/client/emv/emv_roca.c
@@ -69,7 +69,7 @@ mbedtls_mpi_uint mpi_get_uint(const mbedtls_mpi *X) {
 	if (X->n == 1 && X->s > 0) {
 		return X->p[0];
 	}
-	
+	printf("ZERRRRO!!!\n");
 	return 0;
 }
 
@@ -89,7 +89,7 @@ bool emv_rocacheck(const unsigned char *buf, size_t buflen) {
 	MBEDTLS_MPI_CHK( mbedtls_mpi_read_string(&g_one, 10, "1") );
 	
 	for (int i = 0; i < ROCA_PRINTS_LENGTH; i++) {
-printf("--p:%d\n", i);
+printf("--roca:%d\n", i);
 
 		mbedtls_mpi t_temp;
 		mbedtls_mpi t_prime;

From f1cd108b1a432132c922fe62b6c9966f26fdec43 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Fri, 28 Dec 2018 18:09:20 +0200
Subject: [PATCH 0351/1938] move g_one to cycle

---
 client/emv/emv_roca.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/client/emv/emv_roca.c b/client/emv/emv_roca.c
index 88a7b21ad..53fd91c15 100644
--- a/client/emv/emv_roca.c
+++ b/client/emv/emv_roca.c
@@ -84,18 +84,19 @@ bool emv_rocacheck(const unsigned char *buf, size_t buflen) {
 
 	MBEDTLS_MPI_CHK( mbedtls_mpi_read_binary(&t_modulus, buf, buflen) );
 	
-	mbedtls_mpi g_one;
-	mbedtls_mpi_init(&g_one);
-	MBEDTLS_MPI_CHK( mbedtls_mpi_read_string(&g_one, 10, "1") );
 	
 	for (int i = 0; i < ROCA_PRINTS_LENGTH; i++) {
 printf("--roca:%d\n", i);
 
 		mbedtls_mpi t_temp;
 		mbedtls_mpi t_prime;
+		mbedtls_mpi g_one;
 		
 		mbedtls_mpi_init(&t_temp);
 		mbedtls_mpi_init(&t_prime);
+		mbedtls_mpi_init(&g_one);
+
+		MBEDTLS_MPI_CHK( mbedtls_mpi_read_string(&g_one, 10, "1") );
 
 		MBEDTLS_MPI_CHK( mbedtls_mpi_add_int(&t_prime, &t_prime, g_primes[i]) );
 		

From 05814fbe75bd9e77dbf589c3fdf0c8c287e6a0dc Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Fri, 28 Dec 2018 19:06:51 +0200
Subject: [PATCH 0352/1938] added mpi print

---
 client/emv/emv_roca.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/client/emv/emv_roca.c b/client/emv/emv_roca.c
index 53fd91c15..ad39d1043 100644
--- a/client/emv/emv_roca.c
+++ b/client/emv/emv_roca.c
@@ -73,6 +73,15 @@ mbedtls_mpi_uint mpi_get_uint(const mbedtls_mpi *X) {
 	return 0;
 }
 
+void print_mpi(const char *msg, int radix, const mbedtls_mpi *X) {
+	
+	char Xchar[400] = {0};
+	size_t len = 0;
+	
+	mbedtls_mpi_write_string(X, radix, Xchar, sizeof(Xchar), &len);	
+	printf("%s[%d] %s\n", msg, len, Xchar);	
+}
+
 bool emv_rocacheck(const unsigned char *buf, size_t buflen) {
 
 	mbedtls_mpi t_modulus;
@@ -83,6 +92,7 @@ bool emv_rocacheck(const unsigned char *buf, size_t buflen) {
 	rocacheck_init();
 
 	MBEDTLS_MPI_CHK( mbedtls_mpi_read_binary(&t_modulus, buf, buflen) );
+	print_mpi("--t_modulus:", 16, &t_modulus);
 	
 	
 	for (int i = 0; i < ROCA_PRINTS_LENGTH; i++) {

From 44343d806fa74594ac3f4f4c930599a7be787511 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Fri, 28 Dec 2018 19:25:19 +0200
Subject: [PATCH 0353/1938] add some debug

---
 client/emv/emv_roca.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/client/emv/emv_roca.c b/client/emv/emv_roca.c
index ad39d1043..9297ce452 100644
--- a/client/emv/emv_roca.c
+++ b/client/emv/emv_roca.c
@@ -109,11 +109,15 @@ printf("--roca:%d\n", i);
 		MBEDTLS_MPI_CHK( mbedtls_mpi_read_string(&g_one, 10, "1") );
 
 		MBEDTLS_MPI_CHK( mbedtls_mpi_add_int(&t_prime, &t_prime, g_primes[i]) );
+		print_mpi("--t_prime:", 10, &t_prime);
 		
 		MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi(&t_temp, &t_modulus, &t_prime) ); 
+		print_mpi("--t_temp:", 10, &t_temp);
 		
 		MBEDTLS_MPI_CHK( mbedtls_mpi_shift_l(&g_one, mpi_get_uint(&t_temp)) );
+		print_mpi("--g_one:", 10, &g_one);
 		
+		print_mpi("--g_prints:", 10, &g_prints[i]);
 		if (bitand_is_zero(&t_temp, &g_prints[i])) {
 			PrintAndLogEx(FAILED, "No fingerprint found\n");
 			ret = false;

From e315328625d9cc632dc8223d0f46e398730cb9bc Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Fri, 28 Dec 2018 20:06:18 +0200
Subject: [PATCH 0354/1938] works

---
 client/emv/emv_roca.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/client/emv/emv_roca.c b/client/emv/emv_roca.c
index 9297ce452..977584f73 100644
--- a/client/emv/emv_roca.c
+++ b/client/emv/emv_roca.c
@@ -92,11 +92,8 @@ bool emv_rocacheck(const unsigned char *buf, size_t buflen) {
 	rocacheck_init();
 
 	MBEDTLS_MPI_CHK( mbedtls_mpi_read_binary(&t_modulus, buf, buflen) );
-	print_mpi("--t_modulus:", 16, &t_modulus);
-	
 	
 	for (int i = 0; i < ROCA_PRINTS_LENGTH; i++) {
-printf("--roca:%d\n", i);
 
 		mbedtls_mpi t_temp;
 		mbedtls_mpi t_prime;
@@ -109,17 +106,13 @@ printf("--roca:%d\n", i);
 		MBEDTLS_MPI_CHK( mbedtls_mpi_read_string(&g_one, 10, "1") );
 
 		MBEDTLS_MPI_CHK( mbedtls_mpi_add_int(&t_prime, &t_prime, g_primes[i]) );
-		print_mpi("--t_prime:", 10, &t_prime);
 		
 		MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi(&t_temp, &t_modulus, &t_prime) ); 
-		print_mpi("--t_temp:", 10, &t_temp);
 		
 		MBEDTLS_MPI_CHK( mbedtls_mpi_shift_l(&g_one, mpi_get_uint(&t_temp)) );
-		print_mpi("--g_one:", 10, &g_one);
 		
-		print_mpi("--g_prints:", 10, &g_prints[i]);
-		if (bitand_is_zero(&t_temp, &g_prints[i])) {
-			PrintAndLogEx(FAILED, "No fingerprint found\n");
+		if (bitand_is_zero(&g_one, &g_prints[i])) {
+			PrintAndLogEx(FAILED, "No fingerprint found.\n");
 			ret = false;
 			goto cleanup;
 		}

From 7401d51ebf256b723e10e3db875feafaefe01c5c Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Fri, 28 Dec 2018 20:33:24 +0200
Subject: [PATCH 0355/1938] roca works

---
 client/emv/cmdemv.c   | 15 ++---------
 client/emv/emv_roca.c | 58 +++++++++++++++++++++++++++++++++++++++----
 client/emv/emv_roca.h |  7 ++----
 3 files changed, 57 insertions(+), 23 deletions(-)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index adb47b136..4cbbe2e0b 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -1661,26 +1661,15 @@ int CmdEMVRoca(const char *cmd) {
 		
 		PrintAndLogEx(INFO, "ICC pk modulus: %s", sprint_hex_inrow(icc_pk->modulus, icc_pk->mlen));
 		
-		
-		uint8_t key[] = "\x94\x4e\x13\x20\x8a\x28\x0c\x37\xef\xc3\x1c\x31\x14\x48\x5e\x59"\
-		                "\x01\x92\xad\xbb\x8e\x11\xc8\x7c\xad\x60\xcd\xef\x00\x37\xce\x99"\
-						"\x27\x83\x30\xd3\xf4\x71\xa2\x53\x8f\xa6\x67\x80\x2e\xd2\xa3\xc4"\
-						"\x4a\x8b\x7d\xea\x82\x6e\x88\x8d\x0a\xa3\x41\xfd\x66\x4f\x7f\xa7";
-		PrintAndLogEx(INFO, "DEMO ICC pk modulus: %s", sprint_hex_inrow(key, 64));
-		if (emv_rocacheck(key, 64)) 
-				PrintAndLogEx(INFO, "DEMO ICC pk is vulnerable by roca.");
-		
-		
 		//	icc_pk->exp, icc_pk->elen
 		//	icc_pk->modulus, icc_pk->mlen
 		if (icc_pk->elen > 0 && icc_pk->mlen > 0) {
-			if (emv_rocacheck(icc_pk->modulus, icc_pk->mlen)) {
+			if (emv_rocacheck(icc_pk->modulus, icc_pk->mlen, true)) {
 				PrintAndLogEx(INFO, "ICC pk is a subject to ROCA vulnerability, insecure..");
 			} else {
 				PrintAndLogEx(INFO, "ICC pk is OK(");
 			}
-		}
-		
+		}		
 		
 		PKISetStrictExecution(true);
 	}
diff --git a/client/emv/emv_roca.c b/client/emv/emv_roca.c
index 977584f73..5081ed446 100644
--- a/client/emv/emv_roca.c
+++ b/client/emv/emv_roca.c
@@ -82,12 +82,12 @@ void print_mpi(const char *msg, int radix, const mbedtls_mpi *X) {
 	printf("%s[%d] %s\n", msg, len, Xchar);	
 }
 
-bool emv_rocacheck(const unsigned char *buf, size_t buflen) {
+bool emv_rocacheck(const unsigned char *buf, size_t buflen, bool verbose) {
 
 	mbedtls_mpi t_modulus;
 	mbedtls_mpi_init(&t_modulus);
 
-	bool ret = true;
+	bool ret = false;
 
 	rocacheck_init();
 
@@ -112,8 +112,8 @@ bool emv_rocacheck(const unsigned char *buf, size_t buflen) {
 		MBEDTLS_MPI_CHK( mbedtls_mpi_shift_l(&g_one, mpi_get_uint(&t_temp)) );
 		
 		if (bitand_is_zero(&g_one, &g_prints[i])) {
-			PrintAndLogEx(FAILED, "No fingerprint found.\n");
-			ret = false;
+			if (verbose)
+				PrintAndLogEx(FAILED, "No fingerprint found.\n");
 			goto cleanup;
 		}
 		
@@ -122,7 +122,9 @@ bool emv_rocacheck(const unsigned char *buf, size_t buflen) {
 		mbedtls_mpi_free(&t_prime);
 	}
 
-	PrintAndLogEx(SUCCESS, "Fingerprint found!\n");
+	ret = true;
+	if (verbose)
+		PrintAndLogEx(SUCCESS, "Fingerprint found!\n");
 
 cleanup:
 	mbedtls_mpi_free(&t_modulus);
@@ -130,3 +132,49 @@ cleanup:
 	rocacheck_cleanup();
 	return ret;
 }
+
+int roca_self_test( int verbose ) {
+	int ret = 0;
+
+	if( verbose != 0 )
+		printf( "\nROCA check vulnerability tests\n" );
+
+	// positive
+	uint8_t keyp[] = "\x94\x4e\x13\x20\x8a\x28\x0c\x37\xef\xc3\x1c\x31\x14\x48\x5e\x59"\
+	                "\x01\x92\xad\xbb\x8e\x11\xc8\x7c\xad\x60\xcd\xef\x00\x37\xce\x99"\
+					"\x27\x83\x30\xd3\xf4\x71\xa2\x53\x8f\xa6\x67\x80\x2e\xd2\xa3\xc4"\
+					"\x4a\x8b\x7d\xea\x82\x6e\x88\x8d\x0a\xa3\x41\xfd\x66\x4f\x7f\xa7";
+
+	if( verbose != 0 )
+		printf( "  ROCA positive test: " );
+	
+	if (emv_rocacheck(keyp, 64, false)) {
+		if( verbose != 0 )
+			printf( "passed\n" );
+	} else {
+		ret = 1;
+		if( verbose != 0 )
+			printf( "failed\n" );
+	}
+
+	// negative
+	uint8_t keyn[] = "\x84\x4e\x13\x20\x8a\x28\x0c\x37\xef\xc3\x1c\x31\x14\x48\x5e\x59"\
+	                "\x01\x92\xad\xbb\x8e\x11\xc8\x7c\xad\x60\xcd\xef\x00\x37\xce\x99"\
+					"\x27\x83\x30\xd3\xf4\x71\xa2\x53\x8f\xa6\x67\x80\x2e\xd2\xa3\xc4"\
+					"\x4a\x8b\x7d\xea\x82\x6e\x88\x8d\x0a\xa3\x41\xfd\x66\x4f\x7f\xa7";
+
+	if( verbose != 0 )
+		printf( "  ROCA negative test: " );
+
+	if (emv_rocacheck(keyn, 64, false)) {
+		ret = 1;
+		if( verbose != 0 )
+			printf( "failed\n" );
+	} else {
+		if( verbose != 0 )
+			printf( "passed\n" );
+	}
+
+	
+	return ret;
+}
diff --git a/client/emv/emv_roca.h b/client/emv/emv_roca.h
index a42d8349e..a9559ef79 100644
--- a/client/emv/emv_roca.h
+++ b/client/emv/emv_roca.h
@@ -31,11 +31,8 @@
 
 #define ROCA_PRINTS_LENGTH	17
 
-void rocacheck_init(void);
-void rocacheck_cleanup(void);
-int bitand_is_zero(	mbedtls_mpi* a, mbedtls_mpi* b );
-
-extern bool emv_rocacheck( const unsigned char *buf, size_t buflen );
+extern bool emv_rocacheck( const unsigned char *buf, size_t buflen, bool verbose );
+extern int roca_self_test( int verbose );
 
 #endif
 

From 376ead028a07aa4ff4b4818259d762fb7f6438c9 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Fri, 28 Dec 2018 20:33:38 +0200
Subject: [PATCH 0356/1938] added tests

---
 client/emv/test/cryptotest.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/client/emv/test/cryptotest.c b/client/emv/test/cryptotest.c
index 1d5891fe0..b0212a70b 100644
--- a/client/emv/test/cryptotest.c
+++ b/client/emv/test/cryptotest.c
@@ -31,6 +31,7 @@
 #include "dda_test.h"
 #include "cda_test.h"
 #include "crypto/libpcrypto.h"
+#include "emv/emv_roca.h"
 
 int ExecuteCryptoTests(bool verbose) {
 	int res;
@@ -90,6 +91,9 @@ int ExecuteCryptoTests(bool verbose) {
 	res = exec_crypto_test(verbose);
 	if (res) TestFail = true;
 
+	res = roca_self_test(verbose);
+	if (res) TestFail = true;
+
 	PrintAndLog("\n--------------------------");
 	if (TestFail)
 		PrintAndLog("Test(s) [ERROR].");

From 392687499591d30437af625d203d8fa90e0dff20 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Fri, 28 Dec 2018 20:48:45 +0200
Subject: [PATCH 0357/1938] fix pse channels

---
 client/emv/cmdemv.c  | 18 +++++++-----------
 client/emv/emvcore.c |  4 ++--
 client/emv/emvcore.h |  2 +-
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index 4cbbe2e0b..a443f6aad 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -722,6 +722,7 @@ int CmdEMVExec(const char *cmd) {
 	EMVCommandChannel channel = ECC_CONTACTLESS;
 	if (arg_get_lit(11))
 		channel = ECC_CONTACT;
+	uint8_t psenum = (channel == ECC_CONTACT) ? 1 : 2;
 	CLIParserFree();
 	
 	SetAPDULogging(showAPDU);
@@ -736,7 +737,7 @@ int CmdEMVExec(const char *cmd) {
 		// PPSE
 		PrintAndLogEx(NORMAL, "\n* PPSE.");
 		SetAPDULogging(showAPDU);
-		res = EMVSearchPSE(channel, activateField, true, decodeTLV, tlvSelect);
+		res = EMVSearchPSE(channel, activateField, true, psenum, decodeTLV, tlvSelect);
 
 		// check PPSE and select application id
 		if (!res) {	
@@ -1170,6 +1171,7 @@ int CmdEMVScan(const char *cmd) {
 	EMVCommandChannel channel = ECC_CONTACTLESS;
 	if (arg_get_lit(11))
 		channel = ECC_CONTACT;
+	uint8_t psenum = (channel == ECC_CONTACT) ? 1 : 2;
 	uint8_t relfname[250] ={0};
 	char *crelfname = (char *)relfname;
 	int relfnamelen = 0;
@@ -1248,7 +1250,7 @@ int CmdEMVScan(const char *cmd) {
 		tlvdb_free(fci);
 	}
 
-	res = EMVSearchPSE(channel, false, true, decodeTLV, tlvSelect);
+	res = EMVSearchPSE(channel, false, true, psenum, decodeTLV, tlvSelect);
 
 	// check PPSE and select application id
 	if (!res) {	
@@ -1490,21 +1492,15 @@ int CmdEMVRoca(const char *cmd) {
 	// select card
 	uint8_t psenum = (channel == ECC_CONTACT) ? 1 : 2;
 	
+	SetAPDULogging(false);
+	
 	// init applets list tree
 	const char *al = "Applets list";
 	struct tlvdb *tlvSelect = tlvdb_fixed(1, strlen(al), (const unsigned char *)al);
 
 	// EMV PPSE
 	PrintAndLogEx(NORMAL, "--> PPSE.");
-	res = EMVSelectPSE(channel, true, true, psenum, buf, sizeof(buf), &len, &sw);
-
-	if (!res && sw == 0x9000){
-		struct tlvdb *fci = tlvdb_parse_multi(buf, len);
-		tlvdb_free(fci);
-	}
-
-	SetAPDULogging(false);
-	res = EMVSearchPSE(channel, false, true, false, tlvSelect);
+	res = EMVSearchPSE(channel, false, true, psenum, false, tlvSelect);
 
 	// check PPSE and select application id
 	if (!res) {	
diff --git a/client/emv/emvcore.c b/client/emv/emvcore.c
index b67e7ac76..b582792ac 100644
--- a/client/emv/emvcore.c
+++ b/client/emv/emvcore.c
@@ -332,14 +332,14 @@ int EMVSelectPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldO
 	return res;
 }
 
-int EMVSearchPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, bool decodeTLV, struct tlvdb *tlv) {
+int EMVSearchPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, uint8_t PSENum, bool decodeTLV, struct tlvdb *tlv) {
 	uint8_t data[APDU_RES_LEN] = {0};
 	size_t datalen = 0;
 	uint16_t sw = 0;
 	int res;
 
 	// select PPSE
-	res = EMVSelectPSE(channel, ActivateField, true, 2, data, sizeof(data), &datalen, &sw);
+	res = EMVSelectPSE(channel, ActivateField, true, PSENum, data, sizeof(data), &datalen, &sw);
 
 	if (!res){
 		struct tlvdb *t = NULL;
diff --git a/client/emv/emvcore.h b/client/emv/emvcore.h
index 829107126..7d53e83bb 100644
--- a/client/emv/emvcore.h
+++ b/client/emv/emvcore.h
@@ -79,7 +79,7 @@ extern void SetAPDULogging(bool logging);
 extern int EMVExchange(EMVCommandChannel channel, bool LeaveFieldON, sAPDU apdu, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv);
 
 // search application
-extern int EMVSearchPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, bool decodeTLV, struct tlvdb *tlv);
+extern int EMVSearchPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, uint8_t PSENum, bool decodeTLV, struct tlvdb *tlv);
 extern int EMVSearch(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, bool decodeTLV, struct tlvdb *tlv);
 extern int EMVSelectPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, uint8_t PSENum, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw);
 extern int EMVSelect(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, uint8_t *AID, size_t AIDLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv);

From 690a8e604aee614ab6e6ee1b159af9d587f41d38 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Sat, 29 Dec 2018 00:31:10 +0200
Subject: [PATCH 0358/1938] updated licanse according to changes
 https://gist.github.com/robstradling/f525d423c79690b72e650e2ad38a161d#file-roca-c-L138

---
 client/emv/emv_roca.c |  9 +++++++--
 client/emv/emv_roca.h | 38 +++++++++++++++++++-------------------
 2 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/client/emv/emv_roca.c b/client/emv/emv_roca.c
index 5081ed446..a6738ae2f 100644
--- a/client/emv/emv_roca.c
+++ b/client/emv/emv_roca.c
@@ -1,10 +1,12 @@
 /* roca.c - ROCA (CVE-2017-15361) fingerprint checker.
  * Written by Rob Stradling (based on https://github.com/crocs-muni/roca/blob/master/roca/detect.py)
- * Copyright (C) 2017 COMODO CA Limited
+ * Copyright (C) 2017-2018 Sectigo Limited
+ * modified 2018 iceman  (dropped openssl bignum,  now use mbedtls lib)
+ * modified 2018 merlok
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
+ * the Free Software Foundation, either version 2 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -15,6 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+//-----------------------------------------------------------------------------
+// EMV roca commands
+//-----------------------------------------------------------------------------
 
 #include "emv_roca.h"
 
diff --git a/client/emv/emv_roca.h b/client/emv/emv_roca.h
index a9559ef79..26d37d146 100644
--- a/client/emv/emv_roca.h
+++ b/client/emv/emv_roca.h
@@ -1,22 +1,22 @@
-
-// ROCA (CVE-2017-15361) fingerprint checker.
-// Written by Rob Stradling (based on https://github.com/crocs-muni/roca/blob/master/roca/detect.py)
-// Copyright (C) 2017 COMODO CA Limited
-// modified 2018 iceman  (dropped openssl bignum,  now use mbedtls lib)
-// 
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
+/* roca.c - ROCA (CVE-2017-15361) fingerprint checker.
+ * Written by Rob Stradling (based on https://github.com/crocs-muni/roca/blob/master/roca/detect.py)
+ * Copyright (C) 2017-2018 Sectigo Limited
+ * modified 2018 iceman  (dropped openssl bignum,  now use mbedtls lib)
+ * modified 2018 merlok
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 //-----------------------------------------------------------------------------
 // EMV roca commands
 //-----------------------------------------------------------------------------

From 9e07a5c65a9443b9a5db2c403f19f5b864f3c057 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 31 Dec 2018 15:46:32 +0100
Subject: [PATCH 0359/1938] CHG:  updated to RevEng v1.6.0

---
 client/cmdcrc.c        |  17 +-
 client/reveng/model.c  |   2 +-
 client/reveng/preset.c | 933 +++++++++++++++++++++--------------------
 client/reveng/reveng.h |  31 +-
 client/scripting.c     |   2 +-
 5 files changed, 523 insertions(+), 462 deletions(-)

diff --git a/client/cmdcrc.c b/client/cmdcrc.c
index 25653dbab..a34c7d351 100644
--- a/client/cmdcrc.c
+++ b/client/cmdcrc.c
@@ -39,8 +39,7 @@ int split(char *str, char *arr[MAX_ARGS]){
     return wordCnt;
 }
 
-int CmdCrc(const char *Cmd)
-{
+int CmdCrc(const char *Cmd) {
 	char name[] = {"reveng "};
 	char Cmd2[100 + 7];
 	memcpy(Cmd2, name, 7);
@@ -198,6 +197,11 @@ int GetModels(char *Models[], int *count, uint8_t *width){
 				pfree(qptr);
 			}
 		}
+		if(uflags & C_NOBFS && ~rflags & R_HAVEP) {
+			PrintAndLogEx(WARNING, "no models found");
+			return 0;
+		}
+			
 		if (!(model.flags & P_REFIN) != !(model.flags & P_REFOUT)){		
 			PrintAndLogEx(WARNING, "cannot search for crossed-endian models");
 			return 0;
@@ -259,8 +263,9 @@ int RunModel(char *inModel, char *inHexStr, bool reverse, char endian, char *res
 
 	SETBMP();
 	//set model
-	if (!(c = mbynam(&model, inModel))) {
-		PrintAndLogEx(WARNING, "error: preset model '%s' not found.  Use reveng -D to list presets.", inModel);
+	c = mbynam(&model, inModel);
+	if (!c) {
+		PrintAndLogEx(WARNING, "error: preset model '%s' not found.  Use reveng -D to list presets. [%d]", inModel, c);
 		return 0;
 	}
 	if (c < 0){
@@ -396,7 +401,7 @@ char *SwapEndianStr(const char *inStr, const size_t len, const uint8_t blockSize
 // takes hex string in and searches for a matching result (hex string must include checksum)
 int CmdrevengSearch(const char *Cmd){
 
-#define NMODELS 103	
+#define NMODELS 105	
 	
 	char inHexStr[100] = {0x00};
 	int dataLen = param_getstr(Cmd, 0, inHexStr, sizeof(inHexStr));
@@ -432,7 +437,7 @@ int CmdrevengSearch(const char *Cmd){
 		char *outHex = calloc(dataLen-crcChars+1, sizeof(char));
 		memcpy(outHex, inHexStr, dataLen-crcChars);
 
-		// PrintAndLogEx(DEBUG, "DEBUG: dataLen: %d, crcChars: %d, Model: %s, CRC: %s, width: %d, outHex: %s",dataLen, crcChars, Models[i], inCRC, width[i], outHex);
+		PrintAndLogEx(DEBUG, "DEBUG: dataLen: %d, crcChars: %d, Model: %s, CRC: %s, width: %d, outHex: %s",dataLen, crcChars, Models[i], inCRC, width[i], outHex);
 		ans = RunModel(Models[i], outHex, false, 0, result);
 		if (ans) {
 			// test for match
diff --git a/client/reveng/model.c b/client/reveng/model.c
index 60870d80a..f99b1ee02 100644
--- a/client/reveng/model.c
+++ b/client/reveng/model.c
@@ -121,7 +121,7 @@ char * mtostr(const model_t *model) {
 	if ((string = malloc(size))) {
 		sprintf(strbuf, "\"%s\"", model->name);
 		sprintf(string,
-				"width=%lu"
+				"width=%lu  "
 				"poly=0x%s  "
 				"init=0x%s  "
 				"refin=%s  "
diff --git a/client/reveng/preset.c b/client/reveng/preset.c
index 9e7b721ff..6dbedaed9 100644
--- a/client/reveng/preset.c
+++ b/client/reveng/preset.c
@@ -1,5 +1,5 @@
 /* preset.c
- * Greg Cook, 26/Jul/2018
+ * Greg Cook, 21/Nov/2018
  */
 
 /* CRC RevEng: arbitrary-precision CRC calculator and algorithm finder
@@ -22,7 +22,9 @@
  * along with CRC RevEng.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-/* 2018-07-26: added CRC-24/OS-9
+/* 2018-11-21: added CRC-8/NRSC-5, CRC-16/NRSC-5
+ * 2018-11-21: renamed algorithms, new aliases, added classes
+ * 2018-07-26: added CRC-24/OS-9
  * 2018-07-26: struct malias.name declared const char *const
  * 2017-06-19: added CRC-8/BLUETOOTH, CRC-17/CAN-FD, CRC-21/CAN-FD
  * 2017-02-18: added 8 new GSM algorithms
@@ -269,200 +271,203 @@ static const bmp_t b32[] = {
 	BMP_C(0x04c11db7) << (BMP_BIT - 32),	/*   8 -- 32,04c11db7 */
 	BMP_C(0x05890000) << (BMP_BIT - 32),	/*   9 -- 16,    0589 */
 	BMP_C(0x07000000) << (BMP_BIT - 32),	/*  10 --  8,      07 */
-	BMP_C(0x09823b6e) << (BMP_BIT - 32),	/*  11 -- 31,04c11db7 */
-	BMP_C(0x0b3c0000) << (BMP_BIT - 32),	/*  12 -- 15,    059e */
-	BMP_C(0x0c000000) << (BMP_BIT - 32),	/*  13 --  6,      03 */
-	BMP_C(0x0c200000) << (BMP_BIT - 32),	/*  14 -- 11,     061 */
-	BMP_C(0x0c780000) << (BMP_BIT - 32),	/*  15 -- 14,    031e */
-	BMP_C(0x0fb30000) << (BMP_BIT - 32),	/*  16 -- 16,    0fb3 */
-	BMP_C(0x10210000) << (BMP_BIT - 32),	/*  17 -- 16,    1021 */
-	BMP_C(0x12000000) << (BMP_BIT - 32),	/*  18 --  7,      09 */
-	BMP_C(0x130d2afc) << (BMP_BIT - 32),	/*  19 -- 30,04c34abf */
-	BMP_C(0x144e6300) << (BMP_BIT - 32),	/*  20 -- 24,  144e63 */
-	BMP_C(0x15000000) << (BMP_BIT - 32),	/*  21 --  8,      15 */
-	BMP_C(0x1697d06a) << (BMP_BIT - 32),	/*  22 -- 32,1697d06a */
-	BMP_C(0x17800000) << (BMP_BIT - 32),	/*  23 -- 12,     178 */
-	BMP_C(0x18000000) << (BMP_BIT - 32),	/*  24 --  6,      06 */
-	BMP_C(0x19d3c8d8) << (BMP_BIT - 32),	/*  25 -- 31,0ce9e46c */
-	BMP_C(0x1c000000) << (BMP_BIT - 32),	/*  26 --  6,      07 */
-	BMP_C(0x1d000000) << (BMP_BIT - 32),	/*  27 --  8,      1d */
-	BMP_C(0x1d0f0000) << (BMP_BIT - 32),	/*  28 -- 16,    1d0f */
-	BMP_C(0x1dcf0000) << (BMP_BIT - 32),	/*  29 -- 16,    1dcf */
-	BMP_C(0x1edc6f41) << (BMP_BIT - 32),	/*  30 -- 32,1edc6f41 */
-	BMP_C(0x1f23b800) << (BMP_BIT - 32),	/*  31 -- 24,  1f23b8 */
-	BMP_C(0x20000000) << (BMP_BIT - 32),	/*  32 --  4,       2 */
-	BMP_C(0x200fa500) << (BMP_BIT - 32),	/*  33 -- 24,  200fa5 */
-	BMP_C(0x20140000) << (BMP_BIT - 32),	/*  34 -- 14,    0805 */
-	BMP_C(0x20b40000) << (BMP_BIT - 32),	/*  35 -- 14,    082d */
-	BMP_C(0x20fe0000) << (BMP_BIT - 32),	/*  36 -- 16,    20fe */
-	BMP_C(0x21890000) << (BMP_BIT - 32),	/*  37 -- 16,    2189 */
-	BMP_C(0x21cf0200) << (BMP_BIT - 32),	/*  38 -- 24,  21cf02 */
-	BMP_C(0x23ef5200) << (BMP_BIT - 32),	/*  39 -- 24,  23ef52 */
-	BMP_C(0x25000000) << (BMP_BIT - 32),	/*  40 --  8,      25 */
-	BMP_C(0x26000000) << (BMP_BIT - 32),	/*  41 --  8,      26 */
-	BMP_C(0x26b10000) << (BMP_BIT - 32),	/*  42 -- 16,    26b1 */
-	BMP_C(0x27818000) << (BMP_BIT - 32),	/*  43 -- 17,   04f03 */
-	BMP_C(0x27d00000) << (BMP_BIT - 32),	/*  44 -- 13,    04fa */
-	BMP_C(0x28000000) << (BMP_BIT - 32),	/*  45 --  5,      05 */
-	BMP_C(0x29b10000) << (BMP_BIT - 32),	/*  46 -- 16,    29b1 */
-	BMP_C(0x2f000000) << (BMP_BIT - 32),	/*  47 --  8,      2f */
-	BMP_C(0x30000000) << (BMP_BIT - 32),	/*  48 --  4, 3/ 5, 6 */
-	BMP_C(0x3010bf7f) << (BMP_BIT - 32),	/*  49 -- 32,3010bf7f */
-	BMP_C(0x31000000) << (BMP_BIT - 32),	/*  50 --  8,      31 */
-	BMP_C(0x31800000) << (BMP_BIT - 32),	/*  51 -- 10,     0c6 */
-	BMP_C(0x31c30000) << (BMP_BIT - 32),	/*  52 -- 16,    31c3 */
-	BMP_C(0x328b6300) << (BMP_BIT - 32),	/*  53 -- 24,  328b63 */
-	BMP_C(0x34000000) << (BMP_BIT - 32),	/*  54 --  6,      0d */
-	BMP_C(0x340bc6d9) << (BMP_BIT - 32),	/*  55 -- 32,340bc6d9 */
-	BMP_C(0x37000000) << (BMP_BIT - 32),	/*  56 --  8,      37 */
-	BMP_C(0x38000000) << (BMP_BIT - 32),	/*  57 --  5,      07 */
-	BMP_C(0x39000000) << (BMP_BIT - 32),	/*  58 --  8,      39 */
-	BMP_C(0x3d650000) << (BMP_BIT - 32),	/*  59 -- 16,    3d65 */
-	BMP_C(0x3e000000) << (BMP_BIT - 32),	/*  60 --  8,      3e */
-	BMP_C(0x40000000) << (BMP_BIT - 32),	/*  61 --  3,       2 */
-	BMP_C(0x42000000) << (BMP_BIT - 32),	/*  62 --  8,      42 */
-	BMP_C(0x44c20000) << (BMP_BIT - 32),	/*  63 -- 16,    44c2 */
-	BMP_C(0x45270551) << (BMP_BIT - 32),	/*  64 -- 32,45270551 */
-	BMP_C(0x48000000) << (BMP_BIT - 32),	/*  65 --  5,      09 */
-	BMP_C(0x49000000) << (BMP_BIT - 32),	/*  66 --  8,      49 */
-	BMP_C(0x4a800000) << (BMP_BIT - 32),	/*  67 -- 10,     12a */
-	BMP_C(0x4acc0000) << (BMP_BIT - 32),	/*  68 -- 15,    2566 */
-	BMP_C(0x4b000000) << (BMP_BIT - 32),	/*  69 --  8,      4b */
-	BMP_C(0x4b370000) << (BMP_BIT - 32),	/*  70 -- 16,    4b37 */
-	BMP_C(0x4c000000) << (BMP_BIT - 32),	/*  71 --  6,      13 */
-	BMP_C(0x4c060000) << (BMP_BIT - 32),	/*  72 -- 16,    4c06 */
-	BMP_C(0x53000000) << (BMP_BIT - 32),	/*  73 --  8,      53 */
-	BMP_C(0x55000000) << (BMP_BIT - 32),	/*  74 --  8,      55 */
-	BMP_C(0x55555500) << (BMP_BIT - 32),	/*  75 -- 24,  555555 */
-	BMP_C(0x59350000) << (BMP_BIT - 32),	/*  76 -- 16,    5935 */
-	BMP_C(0x5d380000) << (BMP_BIT - 32),	/*  77 -- 16,    5d38 */
-	BMP_C(0x5d400000) << (BMP_BIT - 32),	/*  78 -- 10,     175 */
-	BMP_C(0x5d6dcb00) << (BMP_BIT - 32),	/*  79 -- 24,  5d6dcb */
-	BMP_C(0x60000000) << (BMP_BIT - 32),	/*  80 --  3,       3 */
-	BMP_C(0x60e00000) << (BMP_BIT - 32),	/*  81 -- 11,     307 */
-	BMP_C(0x63d00000) << (BMP_BIT - 32),	/*  82 -- 16,    63d0 */
-	BMP_C(0x64000000) << (BMP_BIT - 32),	/*  83 --  6,      19 */
-	BMP_C(0x66400000) << (BMP_BIT - 32),	/*  84 -- 10,     199 */
-	BMP_C(0x66c50000) << (BMP_BIT - 32),	/*  85 -- 16,    66c5 */
-	BMP_C(0x6f630000) << (BMP_BIT - 32),	/*  86 -- 16,    6f63 */
-	BMP_C(0x6f910000) << (BMP_BIT - 32),	/*  87 -- 16,    6f91 */
-	BMP_C(0x70000000) << (BMP_BIT - 32),	/*  88 --  4,       7 */
-	BMP_C(0x70a00000) << (BMP_BIT - 32),	/*  89 -- 11,     385 */
-	BMP_C(0x755b0000) << (BMP_BIT - 32),	/*  90 -- 16,    755b */
-	BMP_C(0x765e7680) << (BMP_BIT - 32),	/*  91 -- 32,765e7680 */
-	BMP_C(0x76c20800) << (BMP_BIT - 32),	/*  92 -- 32,  0ed841 */
-	BMP_C(0x7979bd00) << (BMP_BIT - 32),	/*  93 -- 24,  7979bd */
-	BMP_C(0x7e000000) << (BMP_BIT - 32),	/*  94 --  8,      7e */
-	BMP_C(0x80000000) << (BMP_BIT - 32),	/*  95 --  3,       4 */
-	BMP_C(0x80006300) << (BMP_BIT - 32),	/*  96 -- 24,  800063 */
-	BMP_C(0x80050000) << (BMP_BIT - 32),	/*  97 -- 16,    8005 */
-	BMP_C(0x800d0000) << (BMP_BIT - 32),	/*  98 -- 16,    800d */
-	BMP_C(0x800fe300) << (BMP_BIT - 32),	/*  99 -- 24,  800fe3 */
-	BMP_C(0x80b40000) << (BMP_BIT - 32),	/* 100 -- 14,    202d */
-	BMP_C(0x80c2e71c) << (BMP_BIT - 32),	/* 101 -- 30,2030b9c7 */
-	BMP_C(0x80f00000) << (BMP_BIT - 32),	/* 102 -- 12,     80f */
-	BMP_C(0x814141ab) << (BMP_BIT - 32),	/* 103 -- 32,814141ab */
-	BMP_C(0x8144c800) << (BMP_BIT - 32),	/* 104 -- 21,  102899 */
-	BMP_C(0x864cfb00) << (BMP_BIT - 32),	/* 105 -- 24,  864cfb */
-	BMP_C(0x87315576) << (BMP_BIT - 32),	/* 106 -- 32,87315576 */
-	BMP_C(0x89ec0000) << (BMP_BIT - 32),	/* 107 -- 16,    89ec */
-	BMP_C(0x8a000000) << (BMP_BIT - 32),	/* 108 --  7,      45 */
-	BMP_C(0x8b320000) << (BMP_BIT - 32),	/* 109 -- 15,    4599 */
-	BMP_C(0x8bb70000) << (BMP_BIT - 32),	/* 110 -- 16,    8bb7 */
-	BMP_C(0x8cc00000) << (BMP_BIT - 32),	/* 111 -- 10,     233 */
-	BMP_C(0x904cddbf) << (BMP_BIT - 32),	/* 112 -- 32,904cddbf */
-	BMP_C(0x906e0000) << (BMP_BIT - 32),	/* 113 -- 16,    906e */
-	BMP_C(0x94000000) << (BMP_BIT - 32),	/* 114 --  8,      94 */
-	BMP_C(0x97000000) << (BMP_BIT - 32),	/* 115 --  8,      97 */
-	BMP_C(0x98000000) << (BMP_BIT - 32),	/* 116 --  6,      26 */
-	BMP_C(0x9b000000) << (BMP_BIT - 32),	/* 117 --  8,      9b */
-	BMP_C(0x9c000000) << (BMP_BIT - 32),	/* 118 --  6,      27 */
-	BMP_C(0x9d5e4de2) << (BMP_BIT - 32),	/* 119 -- 31,4eaf26f1 */
-	BMP_C(0x9e000000) << (BMP_BIT - 32),	/* 120 --  7,      4f */
-	BMP_C(0x9ecf0000) << (BMP_BIT - 32),	/* 121 -- 16,    9ecf */
-	BMP_C(0xa0970000) << (BMP_BIT - 32),	/* 122 -- 16,    a097 */
-	BMP_C(0xa1000000) << (BMP_BIT - 32),	/* 123 --  8,      a1 */
-	BMP_C(0xa3660000) << (BMP_BIT - 32),	/* 124 -- 16,    a366 */
-	BMP_C(0xa6000000) << (BMP_BIT - 32),	/* 125 --  7,      53 */
-	BMP_C(0xa7000000) << (BMP_BIT - 32),	/* 126 --  8,      a7 */
-	BMP_C(0xa8000000) << (BMP_BIT - 32),	/* 127 --  5,      15 */
-	BMP_C(0xa8190000) << (BMP_BIT - 32),	/* 128 -- 16,    a819 */
-	BMP_C(0xa833982b) << (BMP_BIT - 32),	/* 129 -- 32,a833982b */
-	BMP_C(0xabcdef00) << (BMP_BIT - 32),	/* 130 -- 24,  abcdef */
-	BMP_C(0xac000000) << (BMP_BIT - 32),	/* 131 --  8,      ac */
-	BMP_C(0xaee70000) << (BMP_BIT - 32),	/* 132 -- 16,    aee7 */
-	BMP_C(0xb0000000) << (BMP_BIT - 32),	/* 133 --  4,       b */
-	BMP_C(0xb0010000) << (BMP_BIT - 32),	/* 134 -- 16,    b001 */
-	BMP_C(0xb2aa0000) << (BMP_BIT - 32),	/* 135 -- 16,    b2aa */
-	BMP_C(0xb3400000) << (BMP_BIT - 32),	/* 136 -- 12,     b34 */
-	BMP_C(0xb42d8000) << (BMP_BIT - 32),	/* 137 -- 17,   1685b */
-	BMP_C(0xb4600000) << (BMP_BIT - 32),	/* 138 -- 11,     5a3 */
-	BMP_C(0xb4c80000) << (BMP_BIT - 32),	/* 139 -- 16,    b4c8 */
-	BMP_C(0xb4f3e600) << (BMP_BIT - 32),	/* 140 -- 24,  b4f3e6 */
-	BMP_C(0xb704ce00) << (BMP_BIT - 32),	/* 141 -- 24,  b704ce */
-	BMP_C(0xb798b438) << (BMP_BIT - 32),	/* 142 -- 32,b798b438 */
-	BMP_C(0xbb3d0000) << (BMP_BIT - 32),	/* 143 -- 16,    bb3d */
-	BMP_C(0xbc000000) << (BMP_BIT - 32),	/* 144 --  6,2f/ 8,bc */
-	BMP_C(0xbd0be338) << (BMP_BIT - 32),	/* 145 -- 32,bd0be338 */
-	BMP_C(0xbdf40000) << (BMP_BIT - 32),	/* 146 -- 16,    bdf4 */
-	BMP_C(0xbf050000) << (BMP_BIT - 32),	/* 147 -- 16,    bf05 */
-	BMP_C(0xc0000000) << (BMP_BIT - 32),	/* 148 --  3,       6 */
-	BMP_C(0xc2000000) << (BMP_BIT - 32),	/* 149 --  7,      61 */
-	BMP_C(0xc25a5600) << (BMP_BIT - 32),	/* 150 -- 24,  c25a56 */
-	BMP_C(0xc2b70000) << (BMP_BIT - 32),	/* 151 -- 16,    c2b7 */
-	BMP_C(0xc2b80000) << (BMP_BIT - 32),	/* 152 -- 14,    30ae */
-	BMP_C(0xc4000000) << (BMP_BIT - 32),	/* 153 --  8,      c4 */
-	BMP_C(0xc6c60000) << (BMP_BIT - 32),	/* 154 -- 16,    c6c6 */
-	BMP_C(0xc704dd7b) << (BMP_BIT - 32),	/* 155 -- 32,c704dd7b */
-	BMP_C(0xc8000000) << (BMP_BIT - 32),	/* 156 --  5,      19 */
-	BMP_C(0xc8670000) << (BMP_BIT - 32),	/* 157 -- 16,    c867 */
-	BMP_C(0xcbf43926) << (BMP_BIT - 32),	/* 158 -- 32,cbf43926 */
-	BMP_C(0xcde70300) << (BMP_BIT - 32),	/* 159 -- 24,  cde703 */
-	BMP_C(0xce3c0000) << (BMP_BIT - 32),	/* 160 -- 16,    ce3c */
-	BMP_C(0xd0000000) << (BMP_BIT - 32),	/* 161 --  8,      d0 */
-	BMP_C(0xd02a0000) << (BMP_BIT - 32),	/* 162 -- 15,    6815 */
-	BMP_C(0xd0db0000) << (BMP_BIT - 32),	/* 163 -- 16,    d0db */
-	BMP_C(0xd3100000) << (BMP_BIT - 32),	/* 164 -- 12,     d31 */
-	BMP_C(0xd3be9568) << (BMP_BIT - 32),	/* 165 -- 30,34efa55a */
-	BMP_C(0xd4d00000) << (BMP_BIT - 32),	/* 166 -- 12,     d4d */
-	BMP_C(0xd5000000) << (BMP_BIT - 32),	/* 167 --  8,      d5 */
-	BMP_C(0xd64e0000) << (BMP_BIT - 32),	/* 168 -- 16,    d64e */
-	BMP_C(0xda000000) << (BMP_BIT - 32),	/* 169 --  8,      da */
-	BMP_C(0xdaf00000) << (BMP_BIT - 32),	/* 170 -- 12,     daf */
-	BMP_C(0xdebb20e3) << (BMP_BIT - 32),	/* 171 -- 32,debb20e3 */
-	BMP_C(0xdf000000) << (BMP_BIT - 32),	/* 172 --  8,      df */
-	BMP_C(0xe0000000) << (BMP_BIT - 32),	/* 173 --  3,       7 */
-	BMP_C(0xe3069283) << (BMP_BIT - 32),	/* 174 -- 32,e3069283 */
-	BMP_C(0xe3940000) << (BMP_BIT - 32),	/* 175 -- 16,    e394 */
-	BMP_C(0xe5cc0000) << (BMP_BIT - 32),	/* 176 -- 16,    e5cc */
-	BMP_C(0xe7a80000) << (BMP_BIT - 32),	/* 177 -- 13,    1cf5 */
-	BMP_C(0xe8000000) << (BMP_BIT - 32),	/* 178 --  6,      3a */
-	BMP_C(0xea000000) << (BMP_BIT - 32),	/* 179 --  7,      75 */
-	BMP_C(0xea820000) << (BMP_BIT - 32),	/* 180 -- 16,    ea82 */
-	BMP_C(0xec000000) << (BMP_BIT - 32),	/* 181 --  6,      3b */
-	BMP_C(0xf0000000) << (BMP_BIT - 32),	/* 182 --  4,       f */
-	BMP_C(0xf0b80000) << (BMP_BIT - 32),	/* 183 -- 16,    f0b8 */
-	BMP_C(0xf1300000) << (BMP_BIT - 32),	/* 184 -- 12,     f13 */
-	BMP_C(0xf4000000) << (BMP_BIT - 32),	/* 185 --  8,      f4 */
-	BMP_C(0xf4acfb13) << (BMP_BIT - 32),	/* 186 -- 32,f4acfb13 */
-	BMP_C(0xf5b00000) << (BMP_BIT - 32),	/* 187 -- 12,     f5b */
-	BMP_C(0xf6400000) << (BMP_BIT - 32),	/* 188 -- 10,     3d9 */
-	BMP_C(0xf8000000) << (BMP_BIT - 32),	/* 189 --  5,      1f */
-	BMP_C(0xfc000000) << (BMP_BIT - 32),	/* 190 --  6,      3f */
-	BMP_C(0xfc891918) << (BMP_BIT - 32),	/* 191 -- 32,fc891918 */
-	BMP_C(0xfd000000) << (BMP_BIT - 32),	/* 192 --  8,      fd */
-	BMP_C(0xfe000000) << (BMP_BIT - 32),	/* 193 --  7,      7f */
-	BMP_C(0xfedcba00) << (BMP_BIT - 32),	/* 194 -- 24,  fedcba */
-	BMP_C(0xfee80000) << (BMP_BIT - 32),	/* 195 -- 16,    fee8 */
-	BMP_C(0xff000000) << (BMP_BIT - 32),	/* 196 --  8,      ff */
-	BMP_C(0xffc00000) << (BMP_BIT - 32),	/* 197 -- 10,     3ff */
-	BMP_C(0xfff00000) << (BMP_BIT - 32),	/* 198 -- 12,     fff */
-	BMP_C(0xfffc0000) << (BMP_BIT - 32),	/* 199 -- 14,    3fff */
-	BMP_C(0xffff0000) << (BMP_BIT - 32),	/* 200 -- 16,    ffff */
-	BMP_C(0xffffff00) << (BMP_BIT - 32),	/* 201 -- 24,  ffffff */
-	BMP_C(0xfffffffc) << (BMP_BIT - 32),	/* 202 -- 30,3fffffff */
-	BMP_C(0xfffffffe) << (BMP_BIT - 32),	/* 203 -- 31,7fffffff */
-	BMP_C(0xffffffff) << (BMP_BIT - 32),	/* 204 -- 32,ffffffff */
+	BMP_C(0x080b0000) << (BMP_BIT - 32),	/*  11 -- 16,    080b */
+	BMP_C(0x09823b6e) << (BMP_BIT - 32),	/*  12 -- 31,04c11db7 */
+	BMP_C(0x0b3c0000) << (BMP_BIT - 32),	/*  13 -- 15,    059e */
+	BMP_C(0x0c000000) << (BMP_BIT - 32),	/*  14 --  6,      03 */
+	BMP_C(0x0c200000) << (BMP_BIT - 32),	/*  15 -- 11,     061 */
+	BMP_C(0x0c780000) << (BMP_BIT - 32),	/*  16 -- 14,    031e */
+	BMP_C(0x0fb30000) << (BMP_BIT - 32),	/*  17 -- 16,    0fb3 */
+	BMP_C(0x10210000) << (BMP_BIT - 32),	/*  18 -- 16,    1021 */
+	BMP_C(0x12000000) << (BMP_BIT - 32),	/*  19 --  7,      09 */
+	BMP_C(0x130d2afc) << (BMP_BIT - 32),	/*  20 -- 30,04c34abf */
+	BMP_C(0x144e6300) << (BMP_BIT - 32),	/*  21 -- 24,  144e63 */
+	BMP_C(0x15000000) << (BMP_BIT - 32),	/*  22 --  8,      15 */
+	BMP_C(0x1697d06a) << (BMP_BIT - 32),	/*  23 -- 32,1697d06a */
+	BMP_C(0x17800000) << (BMP_BIT - 32),	/*  24 -- 12,     178 */
+	BMP_C(0x18000000) << (BMP_BIT - 32),	/*  25 --  6,      06 */
+	BMP_C(0x19d3c8d8) << (BMP_BIT - 32),	/*  26 -- 31,0ce9e46c */
+	BMP_C(0x1c000000) << (BMP_BIT - 32),	/*  27 --  6,      07 */
+	BMP_C(0x1d000000) << (BMP_BIT - 32),	/*  28 --  8,      1d */
+	BMP_C(0x1d0f0000) << (BMP_BIT - 32),	/*  29 -- 16,    1d0f */
+	BMP_C(0x1dcf0000) << (BMP_BIT - 32),	/*  30 -- 16,    1dcf */
+	BMP_C(0x1edc6f41) << (BMP_BIT - 32),	/*  31 -- 32,1edc6f41 */
+	BMP_C(0x1f23b800) << (BMP_BIT - 32),	/*  32 -- 24,  1f23b8 */
+	BMP_C(0x20000000) << (BMP_BIT - 32),	/*  33 --  4,       2 */
+	BMP_C(0x200fa500) << (BMP_BIT - 32),	/*  34 -- 24,  200fa5 */
+	BMP_C(0x20140000) << (BMP_BIT - 32),	/*  35 -- 14,    0805 */
+	BMP_C(0x20b40000) << (BMP_BIT - 32),	/*  36 -- 14,    082d */
+	BMP_C(0x20fe0000) << (BMP_BIT - 32),	/*  37 -- 16,    20fe */
+	BMP_C(0x21890000) << (BMP_BIT - 32),	/*  38 -- 16,    2189 */
+	BMP_C(0x21cf0200) << (BMP_BIT - 32),	/*  39 -- 24,  21cf02 */
+	BMP_C(0x23ef5200) << (BMP_BIT - 32),	/*  40 -- 24,  23ef52 */
+	BMP_C(0x25000000) << (BMP_BIT - 32),	/*  41 --  8,      25 */
+	BMP_C(0x26000000) << (BMP_BIT - 32),	/*  42 --  8,      26 */
+	BMP_C(0x26b10000) << (BMP_BIT - 32),	/*  43 -- 16,    26b1 */
+	BMP_C(0x27818000) << (BMP_BIT - 32),	/*  44 -- 17,   04f03 */
+	BMP_C(0x27d00000) << (BMP_BIT - 32),	/*  45 -- 13,    04fa */
+	BMP_C(0x28000000) << (BMP_BIT - 32),	/*  46 --  5,      05 */
+	BMP_C(0x29b10000) << (BMP_BIT - 32),	/*  47 -- 16,    29b1 */
+	BMP_C(0x2f000000) << (BMP_BIT - 32),	/*  48 --  8,      2f */
+	BMP_C(0x30000000) << (BMP_BIT - 32),	/*  49 --  4, 3/ 5, 6 */
+	BMP_C(0x3010bf7f) << (BMP_BIT - 32),	/*  50 -- 32,3010bf7f */
+	BMP_C(0x31000000) << (BMP_BIT - 32),	/*  51 --  8,      31 */
+	BMP_C(0x31800000) << (BMP_BIT - 32),	/*  52 -- 10,     0c6 */
+	BMP_C(0x31c30000) << (BMP_BIT - 32),	/*  53 -- 16,    31c3 */
+	BMP_C(0x328b6300) << (BMP_BIT - 32),	/*  54 -- 24,  328b63 */
+	BMP_C(0x34000000) << (BMP_BIT - 32),	/*  55 --  6,      0d */
+	BMP_C(0x340bc6d9) << (BMP_BIT - 32),	/*  56 -- 32,340bc6d9 */
+	BMP_C(0x37000000) << (BMP_BIT - 32),	/*  57 --  8,      37 */
+	BMP_C(0x38000000) << (BMP_BIT - 32),	/*  58 --  5,      07 */
+	BMP_C(0x39000000) << (BMP_BIT - 32),	/*  59 --  8,      39 */
+	BMP_C(0x3d650000) << (BMP_BIT - 32),	/*  60 -- 16,    3d65 */
+	BMP_C(0x3e000000) << (BMP_BIT - 32),	/*  61 --  8,      3e */
+	BMP_C(0x40000000) << (BMP_BIT - 32),	/*  62 --  3,       2 */
+	BMP_C(0x42000000) << (BMP_BIT - 32),	/*  63 --  8,      42 */
+	BMP_C(0x44c20000) << (BMP_BIT - 32),	/*  64 -- 16,    44c2 */
+	BMP_C(0x45270551) << (BMP_BIT - 32),	/*  65 -- 32,45270551 */
+	BMP_C(0x48000000) << (BMP_BIT - 32),	/*  66 --  5,      09 */
+	BMP_C(0x49000000) << (BMP_BIT - 32),	/*  67 --  8,      49 */
+	BMP_C(0x4a800000) << (BMP_BIT - 32),	/*  68 -- 10,     12a */
+	BMP_C(0x4acc0000) << (BMP_BIT - 32),	/*  69 -- 15,    2566 */
+	BMP_C(0x4b000000) << (BMP_BIT - 32),	/*  70 --  8,      4b */
+	BMP_C(0x4b370000) << (BMP_BIT - 32),	/*  71 -- 16,    4b37 */
+	BMP_C(0x4c000000) << (BMP_BIT - 32),	/*  72 --  6,      13 */
+	BMP_C(0x4c060000) << (BMP_BIT - 32),	/*  73 -- 16,    4c06 */
+	BMP_C(0x53000000) << (BMP_BIT - 32),	/*  74 --  8,      53 */
+	BMP_C(0x55000000) << (BMP_BIT - 32),	/*  75 --  8,      55 */
+	BMP_C(0x55555500) << (BMP_BIT - 32),	/*  76 -- 24,  555555 */
+	BMP_C(0x59350000) << (BMP_BIT - 32),	/*  77 -- 16,    5935 */
+	BMP_C(0x5d380000) << (BMP_BIT - 32),	/*  78 -- 16,    5d38 */
+	BMP_C(0x5d400000) << (BMP_BIT - 32),	/*  79 -- 10,     175 */
+	BMP_C(0x5d6dcb00) << (BMP_BIT - 32),	/*  80 -- 24,  5d6dcb */
+	BMP_C(0x60000000) << (BMP_BIT - 32),	/*  81 --  3,       3 */
+	BMP_C(0x60e00000) << (BMP_BIT - 32),	/*  82 -- 11,     307 */
+	BMP_C(0x63d00000) << (BMP_BIT - 32),	/*  83 -- 16,    63d0 */
+	BMP_C(0x64000000) << (BMP_BIT - 32),	/*  84 --  6,      19 */
+	BMP_C(0x66400000) << (BMP_BIT - 32),	/*  85 -- 10,     199 */
+	BMP_C(0x66c50000) << (BMP_BIT - 32),	/*  86 -- 16,    66c5 */
+	BMP_C(0x6f630000) << (BMP_BIT - 32),	/*  87 -- 16,    6f63 */
+	BMP_C(0x6f910000) << (BMP_BIT - 32),	/*  88 -- 16,    6f91 */
+	BMP_C(0x70000000) << (BMP_BIT - 32),	/*  89 --  4,       7 */
+	BMP_C(0x70a00000) << (BMP_BIT - 32),	/*  90 -- 11,     385 */
+	BMP_C(0x755b0000) << (BMP_BIT - 32),	/*  91 -- 16,    755b */
+	BMP_C(0x765e7680) << (BMP_BIT - 32),	/*  92 -- 32,765e7680 */
+	BMP_C(0x76c20800) << (BMP_BIT - 32),	/*  93 -- 32,  0ed841 */
+	BMP_C(0x7979bd00) << (BMP_BIT - 32),	/*  94 -- 24,  7979bd */
+	BMP_C(0x7e000000) << (BMP_BIT - 32),	/*  95 --  8,      7e */
+	BMP_C(0x80000000) << (BMP_BIT - 32),	/*  96 --  3,       4 */
+	BMP_C(0x80006300) << (BMP_BIT - 32),	/*  97 -- 24,  800063 */
+	BMP_C(0x80050000) << (BMP_BIT - 32),	/*  98 -- 16,    8005 */
+	BMP_C(0x800d0000) << (BMP_BIT - 32),	/*  99 -- 16,    800d */
+	BMP_C(0x800fe300) << (BMP_BIT - 32),	/* 100 -- 24,  800fe3 */
+	BMP_C(0x80b40000) << (BMP_BIT - 32),	/* 101 -- 14,    202d */
+	BMP_C(0x80c2e71c) << (BMP_BIT - 32),	/* 102 -- 30,2030b9c7 */
+	BMP_C(0x80f00000) << (BMP_BIT - 32),	/* 103 -- 12,     80f */
+	BMP_C(0x814141ab) << (BMP_BIT - 32),	/* 104 -- 32,814141ab */
+	BMP_C(0x8144c800) << (BMP_BIT - 32),	/* 105 -- 21,  102899 */
+	BMP_C(0x864cfb00) << (BMP_BIT - 32),	/* 106 -- 24,  864cfb */
+	BMP_C(0x87315576) << (BMP_BIT - 32),	/* 107 -- 32,87315576 */
+	BMP_C(0x89ec0000) << (BMP_BIT - 32),	/* 108 -- 16,    89ec */
+	BMP_C(0x8a000000) << (BMP_BIT - 32),	/* 109 --  7,      45 */
+	BMP_C(0x8b320000) << (BMP_BIT - 32),	/* 110 -- 15,    4599 */
+	BMP_C(0x8bb70000) << (BMP_BIT - 32),	/* 111 -- 16,    8bb7 */
+	BMP_C(0x8cc00000) << (BMP_BIT - 32),	/* 112 -- 10,     233 */
+	BMP_C(0x904cddbf) << (BMP_BIT - 32),	/* 113 -- 32,904cddbf */
+	BMP_C(0x906e0000) << (BMP_BIT - 32),	/* 114 -- 16,    906e */
+	BMP_C(0x94000000) << (BMP_BIT - 32),	/* 115 --  8,      94 */
+	BMP_C(0x97000000) << (BMP_BIT - 32),	/* 116 --  8,      97 */
+	BMP_C(0x98000000) << (BMP_BIT - 32),	/* 117 --  6,      26 */
+	BMP_C(0x9b000000) << (BMP_BIT - 32),	/* 118 --  8,      9b */
+	BMP_C(0x9c000000) << (BMP_BIT - 32),	/* 119 --  6,      27 */
+	BMP_C(0x9d5e4de2) << (BMP_BIT - 32),	/* 120 -- 31,4eaf26f1 */
+	BMP_C(0x9e000000) << (BMP_BIT - 32),	/* 121 --  7,      4f */
+	BMP_C(0x9ecf0000) << (BMP_BIT - 32),	/* 122 -- 16,    9ecf */
+	BMP_C(0xa0660000) << (BMP_BIT - 32),	/* 123 -- 16,    a066 */
+	BMP_C(0xa0970000) << (BMP_BIT - 32),	/* 124 -- 16,    a097 */
+	BMP_C(0xa1000000) << (BMP_BIT - 32),	/* 125 --  8,      a1 */
+	BMP_C(0xa3660000) << (BMP_BIT - 32),	/* 126 -- 16,    a366 */
+	BMP_C(0xa6000000) << (BMP_BIT - 32),	/* 127 --  7,      53 */
+	BMP_C(0xa7000000) << (BMP_BIT - 32),	/* 128 --  8,      a7 */
+	BMP_C(0xa8000000) << (BMP_BIT - 32),	/* 129 --  5,      15 */
+	BMP_C(0xa8190000) << (BMP_BIT - 32),	/* 130 -- 16,    a819 */
+	BMP_C(0xa833982b) << (BMP_BIT - 32),	/* 131 -- 32,a833982b */
+	BMP_C(0xabcdef00) << (BMP_BIT - 32),	/* 132 -- 24,  abcdef */
+	BMP_C(0xac000000) << (BMP_BIT - 32),	/* 133 --  8,      ac */
+	BMP_C(0xaee70000) << (BMP_BIT - 32),	/* 134 -- 16,    aee7 */
+	BMP_C(0xb0000000) << (BMP_BIT - 32),	/* 135 --  4,       b */
+	BMP_C(0xb0010000) << (BMP_BIT - 32),	/* 136 -- 16,    b001 */
+	BMP_C(0xb2aa0000) << (BMP_BIT - 32),	/* 137 -- 16,    b2aa */
+	BMP_C(0xb3400000) << (BMP_BIT - 32),	/* 138 -- 12,     b34 */
+	BMP_C(0xb42d8000) << (BMP_BIT - 32),	/* 139 -- 17,   1685b */
+	BMP_C(0xb4600000) << (BMP_BIT - 32),	/* 140 -- 11,     5a3 */
+	BMP_C(0xb4c80000) << (BMP_BIT - 32),	/* 141 -- 16,    b4c8 */
+	BMP_C(0xb4f3e600) << (BMP_BIT - 32),	/* 142 -- 24,  b4f3e6 */
+	BMP_C(0xb704ce00) << (BMP_BIT - 32),	/* 143 -- 24,  b704ce */
+	BMP_C(0xb798b438) << (BMP_BIT - 32),	/* 144 -- 32,b798b438 */
+	BMP_C(0xbb3d0000) << (BMP_BIT - 32),	/* 145 -- 16,    bb3d */
+	BMP_C(0xbc000000) << (BMP_BIT - 32),	/* 146 --  6,2f/ 8,bc */
+	BMP_C(0xbd0be338) << (BMP_BIT - 32),	/* 147 -- 32,bd0be338 */
+	BMP_C(0xbdf40000) << (BMP_BIT - 32),	/* 148 -- 16,    bdf4 */
+	BMP_C(0xbf050000) << (BMP_BIT - 32),	/* 149 -- 16,    bf05 */
+	BMP_C(0xc0000000) << (BMP_BIT - 32),	/* 150 --  3,       6 */
+	BMP_C(0xc2000000) << (BMP_BIT - 32),	/* 151 --  7,      61 */
+	BMP_C(0xc25a5600) << (BMP_BIT - 32),	/* 152 -- 24,  c25a56 */
+	BMP_C(0xc2b70000) << (BMP_BIT - 32),	/* 153 -- 16,    c2b7 */
+	BMP_C(0xc2b80000) << (BMP_BIT - 32),	/* 154 -- 14,    30ae */
+	BMP_C(0xc4000000) << (BMP_BIT - 32),	/* 155 --  8,      c4 */
+	BMP_C(0xc6c60000) << (BMP_BIT - 32),	/* 156 -- 16,    c6c6 */
+	BMP_C(0xc704dd7b) << (BMP_BIT - 32),	/* 157 -- 32,c704dd7b */
+	BMP_C(0xc8000000) << (BMP_BIT - 32),	/* 158 --  5,      19 */
+	BMP_C(0xc8670000) << (BMP_BIT - 32),	/* 159 -- 16,    c867 */
+	BMP_C(0xcbf43926) << (BMP_BIT - 32),	/* 160 -- 32,cbf43926 */
+	BMP_C(0xcde70300) << (BMP_BIT - 32),	/* 161 -- 24,  cde703 */
+	BMP_C(0xce3c0000) << (BMP_BIT - 32),	/* 162 -- 16,    ce3c */
+	BMP_C(0xd0000000) << (BMP_BIT - 32),	/* 163 --  8,      d0 */
+	BMP_C(0xd02a0000) << (BMP_BIT - 32),	/* 164 -- 15,    6815 */
+	BMP_C(0xd0db0000) << (BMP_BIT - 32),	/* 165 -- 16,    d0db */
+	BMP_C(0xd3100000) << (BMP_BIT - 32),	/* 166 -- 12,     d31 */
+	BMP_C(0xd3be9568) << (BMP_BIT - 32),	/* 167 -- 30,34efa55a */
+	BMP_C(0xd4d00000) << (BMP_BIT - 32),	/* 168 -- 12,     d4d */
+	BMP_C(0xd5000000) << (BMP_BIT - 32),	/* 169 --  8,      d5 */
+	BMP_C(0xd64e0000) << (BMP_BIT - 32),	/* 170 -- 16,    d64e */
+	BMP_C(0xda000000) << (BMP_BIT - 32),	/* 171 --  8,      da */
+	BMP_C(0xdaf00000) << (BMP_BIT - 32),	/* 172 -- 12,     daf */
+	BMP_C(0xdebb20e3) << (BMP_BIT - 32),	/* 173 -- 32,debb20e3 */
+	BMP_C(0xdf000000) << (BMP_BIT - 32),	/* 174 --  8,      df */
+	BMP_C(0xe0000000) << (BMP_BIT - 32),	/* 175 --  3,       7 */
+	BMP_C(0xe3069283) << (BMP_BIT - 32),	/* 176 -- 32,e3069283 */
+	BMP_C(0xe3940000) << (BMP_BIT - 32),	/* 177 -- 16,    e394 */
+	BMP_C(0xe5cc0000) << (BMP_BIT - 32),	/* 178 -- 16,    e5cc */
+	BMP_C(0xe7a80000) << (BMP_BIT - 32),	/* 179 -- 13,    1cf5 */
+	BMP_C(0xe8000000) << (BMP_BIT - 32),	/* 180 --  6,      3a */
+	BMP_C(0xea000000) << (BMP_BIT - 32),	/* 181 --  7,      75 */
+	BMP_C(0xea820000) << (BMP_BIT - 32),	/* 182 -- 16,    ea82 */
+	BMP_C(0xec000000) << (BMP_BIT - 32),	/* 183 --  6,      3b */
+	BMP_C(0xf0000000) << (BMP_BIT - 32),	/* 184 --  4,       f */
+	BMP_C(0xf0b80000) << (BMP_BIT - 32),	/* 185 -- 16,    f0b8 */
+	BMP_C(0xf1300000) << (BMP_BIT - 32),	/* 186 -- 12,     f13 */
+	BMP_C(0xf4000000) << (BMP_BIT - 32),	/* 187 --  8,      f4 */
+	BMP_C(0xf4acfb13) << (BMP_BIT - 32),	/* 188 -- 32,f4acfb13 */
+	BMP_C(0xf5b00000) << (BMP_BIT - 32),	/* 189 -- 12,     f5b */
+	BMP_C(0xf6400000) << (BMP_BIT - 32),	/* 190 -- 10,     3d9 */
+	BMP_C(0xf7000000) << (BMP_BIT - 32),	/* 191 --  8,      f7 */
+	BMP_C(0xf8000000) << (BMP_BIT - 32),	/* 192 --  5,      1f */
+	BMP_C(0xfc000000) << (BMP_BIT - 32),	/* 193 --  6,      3f */
+	BMP_C(0xfc891918) << (BMP_BIT - 32),	/* 194 -- 32,fc891918 */
+	BMP_C(0xfd000000) << (BMP_BIT - 32),	/* 195 --  8,      fd */
+	BMP_C(0xfe000000) << (BMP_BIT - 32),	/* 196 --  7,      7f */
+	BMP_C(0xfedcba00) << (BMP_BIT - 32),	/* 197 -- 24,  fedcba */
+	BMP_C(0xfee80000) << (BMP_BIT - 32),	/* 198 -- 16,    fee8 */
+	BMP_C(0xff000000) << (BMP_BIT - 32),	/* 199 --  8,      ff */
+	BMP_C(0xffc00000) << (BMP_BIT - 32),	/* 200 -- 10,     3ff */
+	BMP_C(0xfff00000) << (BMP_BIT - 32),	/* 201 -- 12,     fff */
+	BMP_C(0xfffc0000) << (BMP_BIT - 32),	/* 202 -- 14,    3fff */
+	BMP_C(0xffff0000) << (BMP_BIT - 32),	/* 203 -- 16,    ffff */
+	BMP_C(0xffffff00) << (BMP_BIT - 32),	/* 204 -- 24,  ffffff */
+	BMP_C(0xfffffffc) << (BMP_BIT - 32),	/* 205 -- 30,3fffffff */
+	BMP_C(0xfffffffe) << (BMP_BIT - 32),	/* 206 -- 31,7fffffff */
+	BMP_C(0xffffffff) << (BMP_BIT - 32),	/* 207 -- 32,ffffffff */
 };
 
 static const struct malias aliases[];
@@ -471,265 +476,303 @@ static const struct malias aliases[];
  * Sorted by left-justified polynomial for bsearch().
  */
 static const struct mpreset models[] = {
-	{64UL, b64,     b64a,    P_LE,   b64a,    b64b,    b64c,    aliases+100},	/*   0 */
-	{32UL, b32+  0, 0,       P_BE,   0,       b32+145, 0,       aliases+138},	/*   1 */
-	{40UL, b40,     0,       P_BE,   b40a,    b40b,    b40c,    aliases+ 88},	/*   2 */
-	{24UL, b32+  3, b32+ 75, P_LE,   0,       b32+150, 0,       aliases+ 60},	/*   3 */
-	{32UL, b32+  8, 0,       P_BE,   b32+204, b32+ 91, b32+155, aliases+ 82},	/*   4 */
-	{32UL, b32+  8, b32+204, P_BE,   0,       b32+  7, 0,       aliases+ 81},	/*   5 */
-	{32UL, b32+  8, b32+204, P_BE,   b32+204, b32+191, b32+155, aliases+ 76},	/*   6 */
-	{32UL, b32+  8, b32+204, P_LE,   0,       b32+ 55, 0,       aliases+130},	/*   7 */
-	{32UL, b32+  8, b32+204, P_LE,   b32+204, b32+158, b32+171, aliases+ 72},	/*   8 */
-	{16UL, b32+  9, 0,       P_BE,   0,       b32+  5, 0,       aliases+ 31},	/*   9 */
-	{16UL, b32+  9, 0,       P_BE,   b32+  1, b32+  4, b32+  9, aliases+ 30},	/*  10 */
-	{ 8UL, b32+ 10, 0,       P_BE,   0,       b32+185, 0,       aliases+106},	/*  11 */
-	{ 8UL, b32+ 10, 0,       P_BE,   b32+ 74, b32+123, b32+131, aliases+117},	/*  12 */
-	{ 8UL, b32+ 10, b32+196, P_LE,   0,       b32+161, 0,       aliases+121},	/*  13 */
-	{31UL, b32+ 11, b32+203, P_BE,   b32+203, b32+ 25, b32+119, aliases+ 71},	/*  14 */
-	{ 6UL, b32+ 13, 0,       P_LE,   0,       b32+ 24, 0,       aliases+ 96},	/*  15 */
-	{82UL, b82,     0,       P_LE,   0,       b82a,    0,       aliases+124},	/*  16 */
-	{16UL, b32+ 17, 0,       P_BE,   0,       b32+ 52, 0,       aliases+139},	/*  17 */
-	{16UL, b32+ 17, 0,       P_BE,   b32+200, b32+160, b32+ 28, aliases+ 36},	/*  18 */
-	{16UL, b32+ 17, 0,       P_LE,   0,       b32+ 37, 0,       aliases+131},	/*  19 */
-	{16UL, b32+ 17, b32+ 28, P_BE,   0,       b32+176, 0,       aliases+ 21},	/*  20 */
-	{16UL, b32+ 17, b32+107, P_LE,   0,       b32+ 42, 0,       aliases+ 53},	/*  21 */
-	{16UL, b32+ 17, b32+135, P_LE,   0,       b32+ 82, 0,       aliases+ 49},	/*  22 */
-	{16UL, b32+ 17, b32+154, P_LE,   0,       b32+147, 0,       aliases+125},	/*  23 */
-	{16UL, b32+ 17, b32+200, P_BE,   0,       b32+ 46, 0,       aliases+ 24},	/*  24 */
-	{16UL, b32+ 17, b32+200, P_BE,   b32+200, b32+168, b32+ 28, aliases+ 35},	/*  25 */
-	{16UL, b32+ 17, b32+200, P_LE,   0,       b32+ 87, 0,       aliases+ 45},	/*  26 */
-	{16UL, b32+ 17, b32+200, P_LE,   b32+200, b32+113, b32+183, aliases+135},	/*  27 */
-	{ 7UL, b32+ 18, 0,       P_BE,   0,       b32+179, 0,       aliases+103},	/*  28 */
-	{ 6UL, b32+ 26, b32+190, P_BE,   0,       b32+181, 0,       aliases+ 93},	/*  29 */
-	{ 8UL, b32+ 27, 0,       P_BE,   0,       b32+ 56, 0,       aliases+114},	/*  30 */
-	{ 8UL, b32+ 27, b32+192, P_BE,   0,       b32+ 94, 0,       aliases+116},	/*  31 */
-	{ 8UL, b32+ 27, b32+196, P_BE,   b32+196, b32+ 69, b32+153, aliases+122},	/*  32 */
-	{ 8UL, b32+ 27, b32+196, P_LE,   0,       b32+115, 0,       aliases+113},	/*  33 */
-	{16UL, b32+ 29, b32+200, P_BE,   b32+200, b32+128, b32+175, aliases+ 48},	/*  34 */
-	{32UL, b32+ 30, b32+204, P_LE,   b32+204, b32+174, b32+142, aliases+ 83},	/*  35 */
-	{14UL, b32+ 34, 0,       P_LE,   0,       b32+ 35, 0,       aliases+ 14},	/*  36 */
-	{ 5UL, b32+ 45, b32+189, P_LE,   b32+189, b32+156, b32+ 48, aliases+ 91},	/*  37 */
-	{ 8UL, b32+ 47, 0,       P_BE,   0,       b32+ 60, 0,       aliases+120},	/*  38 */
-	{ 8UL, b32+ 47, b32+196, P_BE,   b32+196, b32+172, b32+ 62, aliases+108},	/*  39 */
-	{ 4UL, b32+ 48, 0,       P_LE,   0,       b32+ 88, 0,       aliases+ 87},	/*  40 */
-	{ 4UL, b32+ 48, b32+182, P_BE,   b32+182, b32+133, b32+ 32, aliases+ 86},	/*  41 */
-	{ 8UL, b32+ 50, 0,       P_LE,   0,       b32+123, 0,       aliases+119},	/*  42 */
-	{24UL, b32+ 53, b32+201, P_BE,   b32+201, b32+140, b32+ 20, aliases+ 63},	/*  43 */
-	{ 8UL, b32+ 58, 0,       P_LE,   0,       b32+ 21, 0,       aliases+111},	/*  44 */
-	{16UL, b32+ 59, 0,       P_BE,   b32+200, b32+151, b32+124, aliases+ 33},	/*  45 */
-	{16UL, b32+ 59, 0,       P_LE,   b32+200, b32+180, b32+ 85, aliases+ 32},	/*  46 */
-	{64UL, b64d,    0,       P_BE,   0,       b64e,    0,       aliases+ 97},	/*  47 */
-	{64UL, b64d,    b64a,    P_BE,   b64a,    b64f,    b64g,    aliases+101},	/*  48 */
-	{64UL, b64d,    b64a,    P_LE,   b64a,    b64h,    b64i,    aliases+102},	/*  49 */
-	{ 5UL, b32+ 65, b32+ 65, P_BE,   0,       0,       0,       aliases+ 89},	/*  50 */
-	{ 8UL, b32+ 66, 0,       P_BE,   b32+196, b32+114, b32+ 73, aliases+115},	/*  51 */
-	{16UL, b32+ 76, 0,       P_BE,   0,       b32+ 77, 0,       aliases+ 46},	/*  52 */
-	{10UL, b32+ 78, 0,       P_BE,   b32+197, b32+ 67, b32+ 51, aliases+  5},	/*  53 */
-	{24UL, b32+ 79, b32+130, P_BE,   0,       b32+ 31, 0,       aliases+ 62},	/*  54 */
-	{24UL, b32+ 79, b32+194, P_BE,   0,       b32+ 93, 0,       aliases+ 61},	/*  55 */
-	{ 3UL, b32+ 80, 0,       P_BE,   b32+173, b32+ 95, b32+ 61, aliases+ 68},	/*  56 */
-	{ 3UL, b32+ 80, b32+173, P_LE,   0,       b32+148, 0,       aliases+ 69},	/*  57 */
-	{11UL, b32+ 81, 0,       P_BE,   0,       b32+ 14, 0,       aliases+  7},	/*  58 */
-	{ 6UL, b32+ 83, 0,       P_LE,   0,       b32+116, 0,       aliases+ 94},	/*  59 */
-	{16UL, b32+ 86, 0,       P_BE,   0,       b32+146, 0,       aliases+ 42},	/*  60 */
-	{11UL, b32+ 89, b32+  6, P_BE,   0,       b32+138, 0,       aliases+  6},	/*  61 */
-	{16UL, b32+ 90, 0,       P_BE,   0,       b32+ 36, 0,       aliases+ 47},	/*  62 */
-	{24UL, b32+ 96, 0,       P_BE,   0,       b32+ 39, 0,       aliases+ 65},	/*  63 */
-	{24UL, b32+ 96, b32+201, P_BE,   b32+201, b32+ 33, b32+ 99, aliases+ 67},	/*  64 */
-	{16UL, b32+ 97, 0,       P_BE,   0,       b32+195, 0,       aliases+ 22},	/*  65 */
-	{16UL, b32+ 97, 0,       P_LE,   0,       b32+143, 0,       aliases+  0},	/*  66 */
-	{16UL, b32+ 97, 0,       P_LE,   b32+200, b32+ 63, b32+134, aliases+ 44},	/*  67 */
-	{16UL, b32+ 97, b32+ 98, P_BE,   0,       b32+121, 0,       aliases+ 29},	/*  68 */
-	{16UL, b32+ 97, b32+200, P_BE,   0,       b32+132, 0,       aliases+ 27},	/*  69 */
-	{16UL, b32+ 97, b32+200, P_LE,   0,       b32+ 70, 0,       aliases+132},	/*  70 */
-	{16UL, b32+ 97, b32+200, P_LE,   b32+200, b32+139, b32+134, aliases+ 55},	/*  71 */
-	{14UL, b32+100, 0,       P_BE,   b32+199, b32+152, b32+ 15, aliases+ 15},	/*  72 */
-	{30UL, b32+101, b32+202, P_BE,   b32+202, b32+ 19, b32+165, aliases+ 70},	/*  73 */
-	{12UL, b32+102, 0,       P_BE,   0,       b32+187, 0,       aliases+ 10},	/*  74 */
-	{12UL, b32+102, 0,       P_BELE, 0,       b32+170, 0,       aliases+ 12},	/*  75 */
-	{32UL, b32+103, 0,       P_BE,   0,       b32+ 49, 0,       aliases+ 85},	/*  76 */
-	{21UL, b32+104, 0,       P_BE,   0,       b32+ 92, 0,       aliases+ 58},	/*  77 */
-	{24UL, b32+105, 0,       P_BE,   0,       b32+159, 0,       aliases+ 64},	/*  78 */
-	{24UL, b32+105, b32+141, P_BE,   0,       b32+ 38, 0,       aliases+ 59},	/*  79 */
-	{ 7UL, b32+108, 0,       P_BE,   0,       b32+149, 0,       aliases+105},	/*  80 */
-	{15UL, b32+109, 0,       P_BE,   0,       b32+ 12, 0,       aliases+ 16},	/*  81 */
-	{16UL, b32+110, 0,       P_BE,   0,       b32+163, 0,       aliases+ 51},	/*  82 */
-	{10UL, b32+111, 0,       P_BE,   0,       b32+ 84, 0,       aliases+  3},	/*  83 */
-	{ 8UL, b32+117, 0,       P_BE,   0,       b32+179, 0,       aliases+118},	/*  84 */
-	{ 8UL, b32+117, 0,       P_LE,   0,       b32+ 40, 0,       aliases+123},	/*  85 */
-	{ 8UL, b32+117, b32+196, P_BE,   0,       b32+169, 0,       aliases+110},	/*  86 */
-	{ 6UL, b32+118, b32+190, P_BE,   0,       b32+ 54, 0,       aliases+ 92},	/*  87 */
-	{ 7UL, b32+120, b32+193, P_LE,   0,       b32+125, 0,       aliases+104},	/*  88 */
-	{16UL, b32+122, 0,       P_BE,   0,       b32+ 16, 0,       aliases+ 52},	/*  89 */
-	{ 8UL, b32+126, 0,       P_LE,   0,       b32+ 41, 0,       aliases+109},	/*  90 */
-	{ 5UL, b32+127, 0,       P_LE,   0,       b32+ 57, 0,       aliases+ 90},	/*  91 */
-	{32UL, b32+129, b32+204, P_LE,   b32+204, b32+106, b32+ 64, aliases+ 84},	/*  92 */
-	{17UL, b32+137, 0,       P_BE,   0,       b32+ 43, 0,       aliases+ 57},	/*  93 */
-	{ 6UL, b32+144, 0,       P_BE,   b32+190, b32+ 71, b32+178, aliases+ 95},	/*  94 */
-	{16UL, b32+157, b32+200, P_BE,   0,       b32+ 72, 0,       aliases+ 26},	/*  95 */
-	{15UL, b32+162, 0,       P_BE,   b32+  2, b32+ 68, b32+162, aliases+ 17},	/*  96 */
-	{12UL, b32+164, 0,       P_BE,   b32+198, b32+136, b32+ 23, aliases+ 11},	/*  97 */
-	{ 8UL, b32+167, 0,       P_BE,   0,       b32+144, 0,       aliases+112},	/*  98 */
-	{13UL, b32+177, 0,       P_BE,   0,       b32+ 44, 0,       aliases+ 13},	/*  99 */
-	{12UL, b32+184, b32+198, P_BE,   0,       b32+166, 0,       aliases+  9},	/* 100 */
-	{32UL, b32+186, b32+204, P_LE,   b32+204, b32+ 22, b32+112, aliases+ 75},	/* 101 */
-	{10UL, b32+188, b32+197, P_BE,   0,       b32+111, 0,       aliases+  4},	/* 102 */
-	{ 0UL, 0,       0,       P_BE,   0,       0,       0,       NULL       },	/* terminating entry */
+	{64UL, b64,     b64a,    P_LE   | P_CONFIR, b64a,    b64b,    b64c,    aliases+130},	/*   0 */
+	{32UL, b32+  0, 0,       P_BE   | P_CONFIR, 0,       b32+147, 0,       aliases+107},	/*   1 */
+	{40UL, b40,     0,       P_BE   | P_ACADEM, b40a,    b40b,    b40c,    aliases+115},	/*   2 */
+	{24UL, b32+  3, b32+ 76, P_LE   | P_ATTEST, 0,       b32+152, 0,       aliases+ 77},	/*   3 */
+	{32UL, b32+  8, 0,       P_BE   | P_ATTEST, b32+207, b32+ 92, b32+157, aliases+ 98},	/*   4 */
+	{32UL, b32+  8, b32+207, P_BE   | P_ATTEST, 0,       b32+  7, 0,       aliases+104},	/*   5 */
+	{32UL, b32+  8, b32+207, P_BE   | P_ATTEST, b32+207, b32+194, b32+157, aliases+ 96},	/*   6 */
+	{32UL, b32+  8, b32+207, P_LE   | P_CONFIR, 0,       b32+ 56, 0,       aliases+103},	/*   7 */
+	{32UL, b32+  8, b32+207, P_LE   | P_ATTEST, b32+207, b32+160, b32+173, aliases+102},	/*   8 */
+	{16UL, b32+  9, 0,       P_BE   | P_ATTEST, 0,       b32+  5, 0,       aliases+ 36},	/*   9 */
+	{16UL, b32+  9, 0,       P_BE   | P_ATTEST, b32+  1, b32+  4, b32+  9, aliases+ 35},	/*  10 */
+	{ 8UL, b32+ 10, 0,       P_BE   | P_ATTEST, 0,       b32+187, 0,       aliases+157},	/*  11 */
+	{ 8UL, b32+ 10, 0,       P_BE   | P_ACADEM, b32+ 75, b32+125, b32+133, aliases+147},	/*  12 */
+	{ 8UL, b32+ 10, b32+199, P_LE   | P_ACADEM, 0,       b32+163, 0,       aliases+155},	/*  13 */
+	{16UL, b32+ 11, b32+203, P_LE   | P_ATTEST, 0,       b32+123, 0,       aliases+ 58},	/*  14 */
+	{31UL, b32+ 12, b32+206, P_BE   | P_CONFIR, b32+206, b32+ 26, b32+120, aliases+ 88},	/*  15 */
+	{ 6UL, b32+ 14, 0,       P_LE   | P_ACADEM, 0,       b32+ 25, 0,       aliases+124},	/*  16 */
+	{82UL, b82,     0,       P_LE   | P_ATTEST, 0,       b82a,    0,       aliases+160},	/*  17 */
+	{16UL, b32+ 18, 0,       P_BE   | P_ATTEST, 0,       b32+ 53, 0,       aliases+ 73},	/*  18 */
+	{16UL, b32+ 18, 0,       P_BE   | P_ACADEM, b32+203, b32+162, b32+ 29, aliases+ 42},	/*  19 */
+	{16UL, b32+ 18, 0,       P_LE   | P_ATTEST, 0,       b32+ 38, 0,       aliases+ 50},	/*  20 */
+	{16UL, b32+ 18, b32+ 29, P_BE   | P_ATTEST, 0,       b32+178, 0,       aliases+ 63},	/*  21 */
+	{16UL, b32+ 18, b32+108, P_LE   | P_ATTEST, 0,       b32+ 43, 0,       aliases+ 66},	/*  22 */
+	{16UL, b32+ 18, b32+137, P_LE   | P_THIRDP, 0,       b32+ 83, 0,       aliases+ 62},	/*  23 */
+	{16UL, b32+ 18, b32+156, P_LE   | P_ATTEST, 0,       b32+149, 0,       aliases+ 48},	/*  24 */
+	{16UL, b32+ 18, b32+203, P_BE   | P_ATTEST, 0,       b32+ 47, 0,       aliases+ 44},	/*  25 */
+	{16UL, b32+ 18, b32+203, P_BE   | P_ATTEST, b32+203, b32+170, b32+ 29, aliases+ 41},	/*  26 */
+	{16UL, b32+ 18, b32+203, P_LE   | P_ATTEST, 0,       b32+ 88, 0,       aliases+ 56},	/*  27 */
+	{16UL, b32+ 18, b32+203, P_LE   | P_ATTEST, b32+203, b32+114, b32+185, aliases+ 45},	/*  28 */
+	{ 7UL, b32+ 19, 0,       P_BE   | P_ACADEM, 0,       b32+181, 0,       aliases+134},	/*  29 */
+	{ 6UL, b32+ 27, b32+193, P_BE   | P_ACADEM, 0,       b32+183, 0,       aliases+122},	/*  30 */
+	{ 8UL, b32+ 28, 0,       P_BE   | P_ACADEM, 0,       b32+ 57, 0,       aliases+145},	/*  31 */
+	{ 8UL, b32+ 28, b32+195, P_BE   | P_ATTEST, 0,       b32+ 95, 0,       aliases+148},	/*  32 */
+	{ 8UL, b32+ 28, b32+199, P_BE   | P_ATTEST, b32+199, b32+ 70, b32+155, aliases+156},	/*  33 */
+	{ 8UL, b32+ 28, b32+199, P_LE   | P_ATTEST, 0,       b32+116, 0,       aliases+158},	/*  34 */
+	{16UL, b32+ 30, b32+203, P_BE   | P_ATTEST, b32+203, b32+130, b32+177, aliases+ 61},	/*  35 */
+	{32UL, b32+ 31, b32+207, P_LE   | P_ATTEST, b32+207, b32+176, b32+144, aliases+101},	/*  36 */
+	{14UL, b32+ 35, 0,       P_LE   | P_ATTEST, 0,       b32+ 36, 0,       aliases+ 17},	/*  37 */
+	{ 5UL, b32+ 46, b32+192, P_LE   | P_THIRDP, b32+192, b32+158, b32+ 49, aliases+120},	/*  38 */
+	{ 8UL, b32+ 48, 0,       P_BE   | P_ATTEST, 0,       b32+ 61, 0,       aliases+154},	/*  39 */
+	{ 8UL, b32+ 48, b32+199, P_BE   | P_ATTEST, b32+199, b32+174, b32+ 63, aliases+139},	/*  40 */
+	{ 4UL, b32+ 49, 0,       P_LE   | P_ACADEM, 0,       b32+ 89, 0,       aliases+112},	/*  41 */
+	{ 4UL, b32+ 49, b32+184, P_BE   | P_ACADEM, b32+184, b32+135, b32+ 33, aliases+113},	/*  42 */
+	{ 8UL, b32+ 51, 0,       P_LE   | P_ATTEST, 0,       b32+125, 0,       aliases+152},	/*  43 */
+	{ 8UL, b32+ 51, b32+199, P_BE   | P_ATTEST, 0,       b32+191, 0,       aliases+153},	/*  44 */
+	{24UL, b32+ 54, b32+204, P_BE   | P_ACADEM, b32+204, b32+142, b32+ 21, aliases+ 80},	/*  45 */
+	{ 8UL, b32+ 59, 0,       P_LE   | P_ATTEST, 0,       b32+ 22, 0,       aliases+142},	/*  46 */
+	{16UL, b32+ 60, 0,       P_BE   | P_CONFIR, b32+203, b32+153, b32+126, aliases+ 38},	/*  47 */
+	{16UL, b32+ 60, 0,       P_LE   | P_CONFIR, b32+203, b32+182, b32+ 86, aliases+ 37},	/*  48 */
+	{64UL, b64d,    0,       P_BE   | P_ACADEM, 0,       b64e,    0,       aliases+128},	/*  49 */
+	{64UL, b64d,    b64a,    P_BE   | P_CONFIR, b64a,    b64f,    b64g,    aliases+131},	/*  50 */
+	{64UL, b64d,    b64a,    P_LE   | P_ATTEST, b64a,    b64h,    b64i,    aliases+132},	/*  51 */
+	{ 5UL, b32+ 66, b32+ 66, P_BE   | P_ATTEST, 0,       0,       0,       aliases+117},	/*  52 */
+	{ 8UL, b32+ 67, 0,       P_BE   | P_ACADEM, b32+199, b32+115, b32+ 74, aliases+146},	/*  53 */
+	{16UL, b32+ 77, 0,       P_BE   | P_ATTEST, 0,       b32+ 78, 0,       aliases+ 59},	/*  54 */
+	{10UL, b32+ 79, 0,       P_BE   | P_ACADEM, b32+200, b32+ 68, b32+ 52, aliases+  6},	/*  55 */
+	{24UL, b32+ 80, b32+132, P_BE   | P_ATTEST, 0,       b32+ 32, 0,       aliases+ 79},	/*  56 */
+	{24UL, b32+ 80, b32+197, P_BE   | P_ATTEST, 0,       b32+ 94, 0,       aliases+ 78},	/*  57 */
+	{ 3UL, b32+ 81, 0,       P_BE   | P_ACADEM, b32+175, b32+ 96, b32+ 62, aliases+ 85},	/*  58 */
+	{ 3UL, b32+ 81, b32+175, P_LE   | P_ACADEM, 0,       b32+150, 0,       aliases+ 86},	/*  59 */
+	{11UL, b32+ 82, 0,       P_BE   | P_ACADEM, 0,       b32+ 15, 0,       aliases+ 10},	/*  60 */
+	{ 6UL, b32+ 84, 0,       P_LE   | P_ATTEST, 0,       b32+117, 0,       aliases+123},	/*  61 */
+	{16UL, b32+ 87, 0,       P_BE   | P_THIRDP, 0,       b32+148, 0,       aliases+ 52},	/*  62 */
+	{11UL, b32+ 90, b32+  6, P_BE   | P_ATTEST, 0,       b32+140, 0,       aliases+  9},	/*  63 */
+	{16UL, b32+ 91, 0,       P_BE   | P_ATTEST, 0,       b32+ 37, 0,       aliases+ 60},	/*  64 */
+	{24UL, b32+ 97, 0,       P_BE   | P_ACADEM, 0,       b32+ 40, 0,       aliases+ 82},	/*  65 */
+	{24UL, b32+ 97, b32+204, P_BE   | P_ATTEST, b32+204, b32+ 34, b32+100, aliases+ 84},	/*  66 */
+	{16UL, b32+ 98, 0,       P_BE   | P_ATTEST, 0,       b32+198, 0,       aliases+ 67},	/*  67 */
+	{16UL, b32+ 98, 0,       P_LE   | P_CONFIR, 0,       b32+145, 0,       aliases+ 24},	/*  68 */
+	{16UL, b32+ 98, 0,       P_LE   | P_ATTEST, b32+203, b32+ 64, b32+136, aliases+ 55},	/*  69 */
+	{16UL, b32+ 98, b32+ 99, P_BE   | P_ATTEST, 0,       b32+122, 0,       aliases+ 34},	/*  70 */
+	{16UL, b32+ 98, b32+203, P_BE   | P_THIRDP, 0,       b32+134, 0,       aliases+ 32},	/*  71 */
+	{16UL, b32+ 98, b32+203, P_LE   | P_ATTEST, 0,       b32+ 71, 0,       aliases+ 57},	/*  72 */
+	{16UL, b32+ 98, b32+203, P_LE   | P_THIRDP, b32+203, b32+141, b32+136, aliases+ 68},	/*  73 */
+	{14UL, b32+101, 0,       P_BE   | P_ACADEM, b32+202, b32+154, b32+ 16, aliases+ 18},	/*  74 */
+	{30UL, b32+102, b32+205, P_BE   | P_ACADEM, b32+205, b32+ 20, b32+167, aliases+ 87},	/*  75 */
+	{12UL, b32+103, 0,       P_BE   | P_ACADEM, 0,       b32+189, 0,       aliases+ 13},	/*  76 */
+	{12UL, b32+103, 0,       P_BELE | P_ACADEM, 0,       b32+172, 0,       aliases+ 15},	/*  77 */
+	{32UL, b32+104, 0,       P_BE   | P_ATTEST, 0,       b32+ 50, 0,       aliases+ 92},	/*  78 */
+	{21UL, b32+105, 0,       P_BE   | P_ACADEM, 0,       b32+ 93, 0,       aliases+ 75},	/*  79 */
+	{24UL, b32+106, 0,       P_BE   | P_ACADEM, 0,       b32+161, 0,       aliases+ 81},	/*  80 */
+	{24UL, b32+106, b32+143, P_BE   | P_ATTEST, 0,       b32+ 39, 0,       aliases+ 83},	/*  81 */
+	{ 7UL, b32+109, 0,       P_BE   | P_ACADEM, 0,       b32+151, 0,       aliases+136},	/*  82 */
+	{15UL, b32+110, 0,       P_BE   | P_ACADEM, 0,       b32+ 13, 0,       aliases+ 20},	/*  83 */
+	{16UL, b32+111, 0,       P_BE   | P_ATTEST, 0,       b32+165, 0,       aliases+ 64},	/*  84 */
+	{10UL, b32+112, 0,       P_BE   | P_ATTEST, 0,       b32+ 85, 0,       aliases+  4},	/*  85 */
+	{ 8UL, b32+118, 0,       P_BE   | P_ACADEM, 0,       b32+181, 0,       aliases+150},	/*  86 */
+	{ 8UL, b32+118, 0,       P_LE   | P_THIRDP, 0,       b32+ 41, 0,       aliases+159},	/*  87 */
+	{ 8UL, b32+118, b32+199, P_BE   | P_ACADEM, 0,       b32+171, 0,       aliases+141},	/*  88 */
+	{ 6UL, b32+119, b32+193, P_BE   | P_ATTEST, 0,       b32+ 55, 0,       aliases+121},	/*  89 */
+	{ 7UL, b32+121, b32+196, P_LE   | P_ACADEM, 0,       b32+127, 0,       aliases+135},	/*  90 */
+	{16UL, b32+124, 0,       P_BE   | P_CONFIR, 0,       b32+ 17, 0,       aliases+ 65},	/*  91 */
+	{ 8UL, b32+128, 0,       P_LE   | P_ATTEST, 0,       b32+ 42, 0,       aliases+140},	/*  92 */
+	{ 5UL, b32+129, 0,       P_LE   | P_ACADEM, 0,       b32+ 58, 0,       aliases+118},	/*  93 */
+	{32UL, b32+131, b32+207, P_LE   | P_CONFIR, b32+207, b32+107, b32+ 65, aliases+ 95},	/*  94 */
+	{17UL, b32+139, 0,       P_BE   | P_ACADEM, 0,       b32+ 44, 0,       aliases+ 74},	/*  95 */
+	{ 6UL, b32+146, 0,       P_BE   | P_ACADEM, b32+193, b32+ 72, b32+180, aliases+125},	/*  96 */
+	{16UL, b32+159, b32+203, P_BE   | P_ACADEM, 0,       b32+ 73, 0,       aliases+ 31},	/*  97 */
+	{15UL, b32+164, 0,       P_BE   | P_ATTEST, b32+  2, b32+ 69, b32+164, aliases+ 21},	/*  98 */
+	{12UL, b32+166, 0,       P_BE   | P_ACADEM, b32+201, b32+138, b32+ 24, aliases+ 14},	/*  99 */
+	{ 8UL, b32+169, 0,       P_BE   | P_ACADEM, 0,       b32+146, 0,       aliases+143},	/* 100 */
+	{13UL, b32+179, 0,       P_BE   | P_ATTEST, 0,       b32+ 45, 0,       aliases+ 16},	/* 101 */
+	{12UL, b32+186, b32+201, P_BE   | P_ACADEM, 0,       b32+168, 0,       aliases+ 12},	/* 102 */
+	{32UL, b32+188, b32+207, P_LE   | P_ATTEST, b32+207, b32+ 23, b32+113, aliases+ 93},	/* 103 */
+	{10UL, b32+190, b32+200, P_BE   | P_ACADEM, 0,       b32+112, 0,       aliases+  5},	/* 104 */
+	{ 0UL, 0,       0,       P_BE   | P_UNDFCL, 0,       0,       0,       NULL       },	/* terminating entry */
 };
-#    define NPRESETS 103
+#    define NPRESETS 105
 
 /* List of names with pointers to models, pre-sorted for use with bsearch() */
 static const struct malias aliases[] = {
-	{"ARC",			models+ 66},	/*   0 */
-	{"B-CRC-32",		models+  6},	/*   1 */
-	{"CKSUM",		models+  4},	/*   2 */
-	{"CRC-10",		models+ 83},	/*   3 */
-	{"CRC-10/CDMA2000",	models+102},	/*   4 */
-	{"CRC-10/GSM",		models+ 53},	/*   5 */
-	{"CRC-11",		models+ 61},	/*   6 */
-	{"CRC-11/UMTS",		models+ 58},	/*   7 */
-	{"CRC-12/3GPP",		models+ 75},	/*   8 */
-	{"CRC-12/CDMA2000",	models+100},	/*   9 */
-	{"CRC-12/DECT",		models+ 74},	/*  10 */
-	{"CRC-12/GSM",		models+ 97},	/*  11 */
-	{"CRC-12/UMTS",		models+ 75},	/*  12 */
-	{"CRC-13/BBC",		models+ 99},	/*  13 */
-	{"CRC-14/DARC",		models+ 36},	/*  14 */
-	{"CRC-14/GSM",		models+ 72},	/*  15 */
-	{"CRC-15",		models+ 81},	/*  16 */
-	{"CRC-15/MPT1327",	models+ 96},	/*  17 */
-	{"CRC-16",		models+ 66},	/*  18 */
-	{"CRC-16/ACORN",	models+ 17},	/*  19 */
-	{"CRC-16/ARC",		models+ 66},	/*  20 */
-	{"CRC-16/AUG-CCITT",	models+ 20},	/*  21 */
-	{"CRC-16/BUYPASS",	models+ 65},	/*  22 */
-	{"CRC-16/CCITT",	models+ 19},	/*  23 */
-	{"CRC-16/CCITT-FALSE",	models+ 24},	/*  24 */
-	{"CRC-16/CCITT-TRUE",	models+ 19},	/*  25 */
-	{"CRC-16/CDMA2000",	models+ 95},	/*  26 */
-	{"CRC-16/CMS",		models+ 69},	/*  27 */
-	{"CRC-16/DARC",		models+ 25},	/*  28 */
-	{"CRC-16/DDS-110",	models+ 68},	/*  29 */
-	{"CRC-16/DECT-R",	models+ 10},	/*  30 */
-	{"CRC-16/DECT-X",	models+  9},	/*  31 */
-	{"CRC-16/DNP",		models+ 46},	/*  32 */
-	{"CRC-16/EN-13757",	models+ 45},	/*  33 */
-	{"CRC-16/EPC",		models+ 25},	/*  34 */
-	{"CRC-16/GENIBUS",	models+ 25},	/*  35 */
-	{"CRC-16/GSM",		models+ 18},	/*  36 */
-	{"CRC-16/I-CODE",	models+ 25},	/*  37 */
-	{"CRC-16/IBM-SDLC",	models+ 27},	/*  38 */
-	{"CRC-16/IEC-61158-2",	models+ 34},	/*  39 */
-	{"CRC-16/ISO-HDLC",	models+ 27},	/*  40 */
-	{"CRC-16/LHA",		models+ 66},	/*  41 */
-	{"CRC-16/LJ1200",	models+ 60},	/*  42 */
-	{"CRC-16/LTE",		models+ 17},	/*  43 */
-	{"CRC-16/MAXIM",	models+ 67},	/*  44 */
-	{"CRC-16/MCRF4XX",	models+ 26},	/*  45 */
-	{"CRC-16/OPENSAFETY-A",	models+ 52},	/*  46 */
-	{"CRC-16/OPENSAFETY-B",	models+ 62},	/*  47 */
-	{"CRC-16/PROFIBUS",	models+ 34},	/*  48 */
-	{"CRC-16/RIELLO",	models+ 22},	/*  49 */
-	{"CRC-16/SPI-FUJITSU",	models+ 20},	/*  50 */
-	{"CRC-16/T10-DIF",	models+ 82},	/*  51 */
-	{"CRC-16/TELEDISK",	models+ 89},	/*  52 */
-	{"CRC-16/TMS37157",	models+ 21},	/*  53 */
-	{"CRC-16/UMTS",		models+ 65},	/*  54 */
-	{"CRC-16/USB",		models+ 71},	/*  55 */
-	{"CRC-16/VERIFONE",	models+ 65},	/*  56 */
-	{"CRC-17/CAN-FD",	models+ 93},	/*  57 */
-	{"CRC-21/CAN-FD",	models+ 77},	/*  58 */
-	{"CRC-24",		models+ 79},	/*  59 */
-	{"CRC-24/BLE",		models+  3},	/*  60 */
-	{"CRC-24/FLEXRAY-A",	models+ 55},	/*  61 */
-	{"CRC-24/FLEXRAY-B",	models+ 54},	/*  62 */
-	{"CRC-24/INTERLAKEN",	models+ 43},	/*  63 */
-	{"CRC-24/LTE-A",	models+ 78},	/*  64 */
-	{"CRC-24/LTE-B",	models+ 63},	/*  65 */
-	{"CRC-24/OPENPGP",	models+ 79},	/*  66 */
-	{"CRC-24/OS-9",		models+ 64},	/*  67 */
-	{"CRC-3/GSM",		models+ 56},	/*  68 */
-	{"CRC-3/ROHC",		models+ 57},	/*  69 */
-	{"CRC-30/CDMA",		models+ 73},	/*  70 */
-	{"CRC-31/PHILIPS",	models+ 14},	/*  71 */
-	{"CRC-32",		models+  8},	/*  72 */
-	{"CRC-32/AAL5",		models+  6},	/*  73 */
-	{"CRC-32/ADCCP",	models+  8},	/*  74 */
-	{"CRC-32/AUTOSAR",	models+101},	/*  75 */
-	{"CRC-32/BZIP2",	models+  6},	/*  76 */
-	{"CRC-32/CASTAGNOLI",	models+ 35},	/*  77 */
-	{"CRC-32/DECT-B",	models+  6},	/*  78 */
-	{"CRC-32/INTERLAKEN",	models+ 35},	/*  79 */
-	{"CRC-32/ISCSI",	models+ 35},	/*  80 */
-	{"CRC-32/MPEG-2",	models+  5},	/*  81 */
-	{"CRC-32/POSIX",	models+  4},	/*  82 */
-	{"CRC-32C",		models+ 35},	/*  83 */
-	{"CRC-32D",		models+ 92},	/*  84 */
-	{"CRC-32Q",		models+ 76},	/*  85 */
-	{"CRC-4/INTERLAKEN",	models+ 41},	/*  86 */
-	{"CRC-4/ITU",		models+ 40},	/*  87 */
-	{"CRC-40/GSM",		models+  2},	/*  88 */
-	{"CRC-5/EPC",		models+ 50},	/*  89 */
-	{"CRC-5/ITU",		models+ 91},	/*  90 */
-	{"CRC-5/USB",		models+ 37},	/*  91 */
-	{"CRC-6/CDMA2000-A",	models+ 87},	/*  92 */
-	{"CRC-6/CDMA2000-B",	models+ 29},	/*  93 */
-	{"CRC-6/DARC",		models+ 59},	/*  94 */
-	{"CRC-6/GSM",		models+ 94},	/*  95 */
-	{"CRC-6/ITU",		models+ 15},	/*  96 */
-	{"CRC-64",		models+ 47},	/*  97 */
-	{"CRC-64/ECMA-182",	models+ 47},	/*  98 */
-	{"CRC-64/GO-ECMA",	models+ 49},	/*  99 */
-	{"CRC-64/GO-ISO",	models+  0},	/* 100 */
-	{"CRC-64/WE",		models+ 48},	/* 101 */
-	{"CRC-64/XZ",		models+ 49},	/* 102 */
-	{"CRC-7",		models+ 28},	/* 103 */
-	{"CRC-7/ROHC",		models+ 88},	/* 104 */
-	{"CRC-7/UMTS",		models+ 80},	/* 105 */
-	{"CRC-8",		models+ 11},	/* 106 */
-	{"CRC-8/AES",		models+ 33},	/* 107 */
-	{"CRC-8/AUTOSAR",	models+ 39},	/* 108 */
-	{"CRC-8/BLUETOOTH",	models+ 90},	/* 109 */
-	{"CRC-8/CDMA2000",	models+ 86},	/* 110 */
-	{"CRC-8/DARC",		models+ 44},	/* 111 */
-	{"CRC-8/DVB-S2",	models+ 98},	/* 112 */
-	{"CRC-8/EBU",		models+ 33},	/* 113 */
-	{"CRC-8/GSM-A",		models+ 30},	/* 114 */
-	{"CRC-8/GSM-B",		models+ 51},	/* 115 */
-	{"CRC-8/I-CODE",	models+ 31},	/* 116 */
-	{"CRC-8/ITU",		models+ 12},	/* 117 */
-	{"CRC-8/LTE",		models+ 84},	/* 118 */
-	{"CRC-8/MAXIM",		models+ 42},	/* 119 */
-	{"CRC-8/OPENSAFETY",	models+ 38},	/* 120 */
-	{"CRC-8/ROHC",		models+ 13},	/* 121 */
-	{"CRC-8/SAE-J1850",	models+ 32},	/* 122 */
-	{"CRC-8/WCDMA",		models+ 85},	/* 123 */
-	{"CRC-82/DARC",		models+ 16},	/* 124 */
-	{"CRC-A",		models+ 23},	/* 125 */
-	{"CRC-B",		models+ 27},	/* 126 */
-	{"CRC-CCITT",		models+ 19},	/* 127 */
-	{"CRC-IBM",		models+ 66},	/* 128 */
-	{"DOW-CRC",		models+ 42},	/* 129 */
-	{"JAMCRC",		models+  7},	/* 130 */
-	{"KERMIT",		models+ 19},	/* 131 */
-	{"MODBUS",		models+ 70},	/* 132 */
-	{"PKZIP",		models+  8},	/* 133 */
-	{"R-CRC-16",		models+ 10},	/* 134 */
-	{"X-25",		models+ 27},	/* 135 */
-	{"X-CRC-12",		models+ 74},	/* 136 */
-	{"X-CRC-16",		models+  9},	/* 137 */
-	{"XFER",		models+  1},	/* 138 */
-	{"XMODEM",		models+ 17},	/* 139 */
-	{"ZMODEM",		models+ 17},	/* 140 */
-	{NULL,			NULL     },	/* terminating entry */
+	{"ARC",					models+ 68},	/*   0 */
+	{"B-CRC-32",			models+  6},	/*   1 */
+	{"CKSUM",				models+  4},	/*   2 */
+	{"CRC-10",				models+ 85},	/*   3 */
+	{"CRC-10/ATM",			models+ 85},	/*   4 */
+	{"CRC-10/CDMA2000",		models+104},	/*   5 */
+	{"CRC-10/GSM",			models+ 55},	/*   6 */
+	{"CRC-10/I-610",		models+ 85},	/*   7 */
+	{"CRC-11",				models+ 63},	/*   8 */
+	{"CRC-11/FLEXRAY",		models+ 63},	/*   9 */
+	{"CRC-11/UMTS",			models+ 60},	/*  10 */
+	{"CRC-12/3GPP",			models+ 77},	/*  11 */
+	{"CRC-12/CDMA2000",		models+102},	/*  12 */
+	{"CRC-12/DECT",			models+ 76},	/*  13 */
+	{"CRC-12/GSM",			models+ 99},	/*  14 */
+	{"CRC-12/UMTS",			models+ 77},	/*  15 */
+	{"CRC-13/BBC",			models+101},	/*  16 */
+	{"CRC-14/DARC",			models+ 37},	/*  17 */
+	{"CRC-14/GSM",			models+ 74},	/*  18 */
+	{"CRC-15",				models+ 83},	/*  19 */
+	{"CRC-15/CAN",			models+ 83},	/*  20 */
+	{"CRC-15/MPT1327",		models+ 98},	/*  21 */
+	{"CRC-16",				models+ 68},	/*  22 */
+	{"CRC-16/ACORN",		models+ 18},	/*  23 */
+	{"CRC-16/ARC",			models+ 68},	/*  24 */
+	{"CRC-16/AUG-CCITT",	models+ 21},	/*  25 */
+	{"CRC-16/AUTOSAR",		models+ 25},	/*  26 */
+	{"CRC-16/BUYPASS",		models+ 67},	/*  27 */
+	{"CRC-16/CCITT",		models+ 20},	/*  28 */
+	{"CRC-16/CCITT-FALSE",	models+ 25},	/*  29 */
+	{"CRC-16/CCITT-TRUE",	models+ 20},	/*  30 */
+	{"CRC-16/CDMA2000",		models+ 97},	/*  31 */
+	{"CRC-16/CMS",			models+ 71},	/*  32 */
+	{"CRC-16/DARC",			models+ 26},	/*  33 */
+	{"CRC-16/DDS-110",		models+ 70},	/*  34 */
+	{"CRC-16/DECT-R",		models+ 10},	/*  35 */
+	{"CRC-16/DECT-X",		models+  9},	/*  36 */
+	{"CRC-16/DNP",			models+ 48},	/*  37 */
+	{"CRC-16/EN-13757",		models+ 47},	/*  38 */
+	{"CRC-16/EPC",			models+ 26},	/*  39 */
+	{"CRC-16/EPC-C1G2",		models+ 26},	/*  40 */
+	{"CRC-16/GENIBUS",		models+ 26},	/*  41 */
+	{"CRC-16/GSM",			models+ 19},	/*  42 */
+	{"CRC-16/I-CODE",		models+ 26},	/*  43 */
+	{"CRC-16/IBM-3740",		models+ 25},	/*  44 */
+	{"CRC-16/IBM-SDLC",		models+ 28},	/*  45 */
+	{"CRC-16/IEC-61158-2",	models+ 35},	/*  46 */
+	{"CRC-16/ISO-HDLC",		models+ 28},	/*  47 */
+	{"CRC-16/ISO-IEC-14443-3-A",	models+ 24},	/*  48 */
+	{"CRC-16/ISO-IEC-14443-3-B",	models+ 28},	/*  49 */
+	{"CRC-16/KERMIT",		models+ 20},	/*  50 */
+	{"CRC-16/LHA",			models+ 68},	/*  51 */
+	{"CRC-16/LJ1200",		models+ 62},	/*  52 */
+	{"CRC-16/LTE",			models+ 18},	/*  53 */
+	{"CRC-16/MAXIM",		models+ 69},	/*  54 */
+	{"CRC-16/MAXIM-DOW",	models+ 69},	/*  55 */
+	{"CRC-16/MCRF4XX",		models+ 27},	/*  56 */
+	{"CRC-16/MODBUS",		models+ 72},	/*  57 */
+	{"CRC-16/NRSC-5",		models+ 14},	/*  58 */
+	{"CRC-16/OPENSAFETY-A",	models+ 54},	/*  59 */
+	{"CRC-16/OPENSAFETY-B",	models+ 64},	/*  60 */
+	{"CRC-16/PROFIBUS",		models+ 35},	/*  61 */
+	{"CRC-16/RIELLO",		models+ 23},	/*  62 */
+	{"CRC-16/SPI-FUJITSU",	models+ 21},	/*  63 */
+	{"CRC-16/T10-DIF",		models+ 84},	/*  64 */
+	{"CRC-16/TELEDISK",		models+ 91},	/*  65 */
+	{"CRC-16/TMS37157",		models+ 22},	/*  66 */
+	{"CRC-16/UMTS",			models+ 67},	/*  67 */
+	{"CRC-16/USB",			models+ 73},	/*  68 */
+	{"CRC-16/V-41-LSB",		models+ 20},	/*  69 */
+	{"CRC-16/V-41-MSB",		models+ 18},	/*  70 */
+	{"CRC-16/VERIFONE",		models+ 67},	/*  71 */
+	{"CRC-16/X-25",			models+ 28},	/*  72 */
+	{"CRC-16/XMODEM",		models+ 18},	/*  73 */
+	{"CRC-17/CAN-FD",		models+ 95},	/*  74 */
+	{"CRC-21/CAN-FD",		models+ 79},	/*  75 */
+	{"CRC-24",				models+ 81},	/*  76 */
+	{"CRC-24/BLE",			models+  3},	/*  77 */
+	{"CRC-24/FLEXRAY-A",	models+ 57},	/*  78 */
+	{"CRC-24/FLEXRAY-B",	models+ 56},	/*  79 */
+	{"CRC-24/INTERLAKEN",	models+ 45},	/*  80 */
+	{"CRC-24/LTE-A",		models+ 80},	/*  81 */
+	{"CRC-24/LTE-B",		models+ 65},	/*  82 */
+	{"CRC-24/OPENPGP",		models+ 81},	/*  83 */
+	{"CRC-24/OS-9",			models+ 66},	/*  84 */
+	{"CRC-3/GSM",			models+ 58},	/*  85 */
+	{"CRC-3/ROHC",			models+ 59},	/*  86 */
+	{"CRC-30/CDMA",			models+ 75},	/*  87 */
+	{"CRC-31/PHILIPS",		models+ 15},	/*  88 */
+	{"CRC-32",				models+  8},	/*  89 */
+	{"CRC-32/AAL5",			models+  6},	/*  90 */
+	{"CRC-32/ADCCP",		models+  8},	/*  91 */
+	{"CRC-32/AIXM",			models+ 78},	/*  92 */
+	{"CRC-32/AUTOSAR",		models+103},	/*  93 */
+	{"CRC-32/BASE91-C",		models+ 36},	/*  94 */
+	{"CRC-32/BASE91-D",		models+ 94},	/*  95 */
+	{"CRC-32/BZIP2",		models+  6},	/*  96 */
+	{"CRC-32/CASTAGNOLI",	models+ 36},	/*  97 */
+	{"CRC-32/CKSUM",		models+  4},	/*  98 */
+	{"CRC-32/DECT-B",		models+  6},	/*  99 */
+	{"CRC-32/INTERLAKEN",	models+ 36},	/* 100 */
+	{"CRC-32/ISCSI",		models+ 36},	/* 101 */
+	{"CRC-32/ISO-HDLC",		models+  8},	/* 102 */
+	{"CRC-32/JAMCRC",		models+  7},	/* 103 */
+	{"CRC-32/MPEG-2",		models+  5},	/* 104 */
+	{"CRC-32/POSIX",		models+  4},	/* 105 */
+	{"CRC-32/V-42",			models+  8},	/* 106 */
+	{"CRC-32/XFER",			models+  1},	/* 107 */
+	{"CRC-32/XZ",			models+  8},	/* 108 */
+	{"CRC-32C",				models+ 36},	/* 109 */
+	{"CRC-32D",				models+ 94},	/* 110 */
+	{"CRC-32Q",				models+ 78},	/* 111 */
+	{"CRC-4/G-704",			models+ 41},	/* 112 */
+	{"CRC-4/INTERLAKEN",	models+ 42},	/* 113 */
+	{"CRC-4/ITU",			models+ 41},	/* 114 */
+	{"CRC-40/GSM",			models+  2},	/* 115 */
+	{"CRC-5/EPC",			models+ 52},	/* 116 */
+	{"CRC-5/EPC-C1G2",		models+ 52},	/* 117 */
+	{"CRC-5/G-704",			models+ 93},	/* 118 */
+	{"CRC-5/ITU",			models+ 93},	/* 119 */
+	{"CRC-5/USB",			models+ 38},	/* 120 */
+	{"CRC-6/CDMA2000-A",	models+ 89},	/* 121 */
+	{"CRC-6/CDMA2000-B",	models+ 30},	/* 122 */
+	{"CRC-6/DARC",			models+ 61},	/* 123 */
+	{"CRC-6/G-704",			models+ 16},	/* 124 */
+	{"CRC-6/GSM",			models+ 96},	/* 125 */
+	{"CRC-6/ITU",			models+ 16},	/* 126 */
+	{"CRC-64",				models+ 49},	/* 127 */
+	{"CRC-64/ECMA-182",		models+ 49},	/* 128 */
+	{"CRC-64/GO-ECMA",		models+ 51},	/* 129 */
+	{"CRC-64/GO-ISO",		models+  0},	/* 130 */
+	{"CRC-64/WE",			models+ 50},	/* 131 */
+	{"CRC-64/XZ",			models+ 51},	/* 132 */
+	{"CRC-7",				models+ 29},	/* 133 */
+	{"CRC-7/MMC",			models+ 29},	/* 134 */
+	{"CRC-7/ROHC",			models+ 90},	/* 135 */
+	{"CRC-7/UMTS",			models+ 82},	/* 136 */
+	{"CRC-8",				models+ 11},	/* 137 */
+	{"CRC-8/AES",			models+ 34},	/* 138 */
+	{"CRC-8/AUTOSAR",		models+ 40},	/* 139 */
+	{"CRC-8/BLUETOOTH",		models+ 92},	/* 140 */
+	{"CRC-8/CDMA2000",		models+ 88},	/* 141 */
+	{"CRC-8/DARC",			models+ 46},	/* 142 */
+	{"CRC-8/DVB-S2",		models+100},	/* 143 */
+	{"CRC-8/EBU",			models+ 34},	/* 144 */
+	{"CRC-8/GSM-A",			models+ 31},	/* 145 */
+	{"CRC-8/GSM-B",			models+ 53},	/* 146 */
+	{"CRC-8/I-432-1",		models+ 12},	/* 147 */
+	{"CRC-8/I-CODE",		models+ 32},	/* 148 */
+	{"CRC-8/ITU",			models+ 12},	/* 149 */
+	{"CRC-8/LTE",			models+ 86},	/* 150 */
+	{"CRC-8/MAXIM",			models+ 43},	/* 151 */
+	{"CRC-8/MAXIM-DOW",		models+ 43},	/* 152 */
+	{"CRC-8/NRSC-5",		models+ 44},	/* 153 */
+	{"CRC-8/OPENSAFETY",	models+ 39},	/* 154 */
+	{"CRC-8/ROHC",			models+ 13},	/* 155 */
+	{"CRC-8/SAE-J1850",		models+ 33},	/* 156 */
+	{"CRC-8/SMBUS",			models+ 11},	/* 157 */
+	{"CRC-8/TECH-3250",		models+ 34},	/* 158 */
+	{"CRC-8/WCDMA",			models+ 87},	/* 159 */
+	{"CRC-82/DARC",			models+ 17},	/* 160 */
+	{"CRC-A",				models+ 24},	/* 161 */
+	{"CRC-B",				models+ 28},	/* 162 */
+	{"CRC-CCITT",			models+ 20},	/* 163 */
+	{"CRC-IBM",				models+ 68},	/* 164 */
+	{"DOW-CRC",				models+ 43},	/* 165 */
+	{"JAMCRC",				models+  7},	/* 166 */
+	{"KERMIT",				models+ 20},	/* 167 */
+	{"MODBUS",				models+ 72},	/* 168 */
+	{"PKZIP",				models+  8},	/* 169 */
+	{"R-CRC-16",			models+ 10},	/* 170 */
+	{"X-25",				models+ 28},	/* 171 */
+	{"X-CRC-12",			models+ 76},	/* 172 */
+	{"X-CRC-16",			models+  9},	/* 173 */
+	{"XFER",				models+  1},	/* 174 */
+	{"XMODEM",				models+ 18},	/* 175 */
+	{"ZMODEM",				models+ 18},	/* 176 */
+	{NULL,					NULL     },	/* terminating entry */
 };
-#    define NALIASES 141
+#    define NALIASES 177
 
 #  endif /* BMP_BIT */
 #else /* PRESETS */
 
 static const struct mpreset models[] = {
-	{ 0UL, 0, 0, P_BE, 0, 0, 0, NULL },	/* terminating entry */
+	{ 0UL, 0,       0,       P_BE   | P_UNDFCL, 0,       0,       0,       NULL       },	/* terminating entry */
 };
 #  define NPRESETS 0
 
diff --git a/client/reveng/reveng.h b/client/reveng/reveng.h
index 08a7a6d1a..70f594072 100644
--- a/client/reveng/reveng.h
+++ b/client/reveng/reveng.h
@@ -1,5 +1,5 @@
 /* reveng.h
- * Greg Cook, 26/Jul/2018
+ * Greg Cook, 21/Nov/2018
  */
 
 /* CRC RevEng: arbitrary-precision CRC calculator and algorithm finder
@@ -93,7 +93,7 @@
 /* Global definitions */
 
 /* CRC RevEng version string */
-#define VERSION "1.5.3"
+#define VERSION "1.6.0"
 
 /* bmpbit.c */
 typedef BMP_T bmp_t;
@@ -111,6 +111,19 @@ extern void setbmp(void);
 #define P_LTLBYT    64
 #define P_DIRECT   128
 
+/* class flags */
+#define P_CLBIT0   256
+#define P_CLBIT1   512
+#define P_SOLID   1024
+#define P_CLMASK (P_SOLID | P_CLBIT1 | P_CLBIT0)
+
+#define P_UNDFCL     0
+#define P_UNCONF (P_CLBIT0)
+#define P_THIRDP (P_CLBIT1)
+#define P_ACADEM (P_CLBIT1 | P_CLBIT0)
+#define P_CONFIR (P_SOLID | P_CLBIT0)
+#define P_ATTEST (P_SOLID | P_CLBIT1)
+
 /* default flags */
 #define P_BE     (P_RTJUST | P_MULXN)
 #define P_LE     (P_REFIN | P_REFOUT | P_MULXN)
@@ -187,7 +200,7 @@ extern void mrev(model_t *model);
 extern void mnovel(model_t *model);
 
 /* preset.c */
-#define M_OVERWR   256
+#define M_OVERWR     1
 
 extern int mbynam(model_t *dest, const char *key);
 extern void mbynum(model_t *dest, int num);
@@ -196,12 +209,12 @@ extern char *mnames(void);
 extern void mmatch(model_t *model, int flags);
 
 /* reveng.c */
-#define R_HAVEP    512
-#define R_HAVEI   1024
-#define R_HAVERI  2048
-#define R_HAVERO  4096
-#define R_HAVEX   8192
-#define R_HAVEQ  16384
+#define R_HAVEP      1
+#define R_HAVEI      2
+#define R_HAVERI     4
+#define R_HAVERO     8
+#define R_HAVEX     16
+#define R_HAVEQ     32
 
 #define R_SPMASK 0x7FFFFFFUL
 
diff --git a/client/scripting.c b/client/scripting.c
index 762a9c470..3d3518ced 100644
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -515,7 +515,7 @@ static int l_sha1(lua_State *L) {
 static int l_reveng_models(lua_State *L){
 
 // This array needs to be adjusted if RevEng adds more crc-models.
-#define NMODELS 103
+#define NMODELS 105
 
 	int count = 0;
 	uint8_t in_width = luaL_checkunsigned(L, 1);

From 0ddda8998e6e50dc617026250c44fa91738f3779 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Tue, 1 Jan 2019 10:15:27 +0100
Subject: [PATCH 0360/1938] chg: added info

---
 client/emv/emv_tags.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/client/emv/emv_tags.c b/client/emv/emv_tags.c
index 81cee89f3..74a37aba6 100644
--- a/client/emv/emv_tags.c
+++ b/client/emv/emv_tags.c
@@ -292,6 +292,9 @@ static const struct emv_tag emv_tags[] = {
 	{ 0x9f6b, "Track 2 Data" },
 	{ 0x9f6c, "Card Transaction Qualifiers (CTQ)", EMV_TAG_BITMASK, &EMV_CTQ },
 	{ 0x9f6e, "Form Factor Indicator" },
+	
+	{ 0x9f7c, "Customer Exclusive Data (CED)"},
+
 	{ 0xa5  , "File Control Information (FCI) Proprietary Template" },
 	{ 0xbf0c, "File Control Information (FCI) Issuer Discretionary Data" },
 	{ 0xdf20, "Issuer Proprietary Bitmap (IPB)" },

From 75d0b0b06f11cb66581fb0c92f79bcca04cff952 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Tue, 1 Jan 2019 10:53:41 +0100
Subject: [PATCH 0361/1938] CHG: 'emv roca' -  added selftest and textual
 layouts' DEL: removed unused old emv files

---
 client/cmdhfemv.c            | 351 -----------------------------------
 client/cmdhfemv.h            |  45 -----
 client/emv/cmdemv.c          |   9 +-
 client/emv/emv_roca.c        |  30 +--
 client/emv/emv_roca.h        |   2 +-
 client/emv/test/cryptotest.c |   7 +-
 6 files changed, 22 insertions(+), 422 deletions(-)
 delete mode 100644 client/cmdhfemv.c
 delete mode 100644 client/cmdhfemv.h

diff --git a/client/cmdhfemv.c b/client/cmdhfemv.c
deleted file mode 100644
index ab9396a14..000000000
--- a/client/cmdhfemv.c
+++ /dev/null
@@ -1,351 +0,0 @@
-//-----------------------------------------------------------------------------
-// Copyright (C) 2014 Peter Fillmore
-// 2017 iceman
-//
-// This code is licensed to you under the terms of the GNU GPL, version 2 or,
-// at your option, any later version. See the LICENSE.txt file for the text of
-// the license.
-//-----------------------------------------------------------------------------
-// High frequency EMV commands
-//-----------------------------------------------------------------------------
-#include "cmdhfemv.h"
-
-static int CmdHelp(const char *Cmd);
-
-int usage_hf_emv_test(void){
-	PrintAndLogEx(NORMAL, "EMV test ");
-	PrintAndLogEx(NORMAL, "Usage:  hf emv test [h]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h             : this help");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      hf emv test");	
-	return 0;
-}
-int usage_hf_emv_readrecord(void){
-	PrintAndLogEx(NORMAL, "Read a EMV record ");
-	PrintAndLogEx(NORMAL, "Usage:  hf emv readrecord [h] <records> <sfi>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h             : this help");
-	PrintAndLogEx(NORMAL, "      <records>     : number of records");
-	PrintAndLogEx(NORMAL, "      <sfi>         : number of SFI records");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      hf emv readrecord 1 1");	
-	return 0;
-}
-int usage_hf_emv_clone(void){
-	PrintAndLogEx(NORMAL, "Usage:  hf emv clone [h] <records> <SFI> ");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h             : this help");
-	PrintAndLogEx(NORMAL, "      <records>     : number of records");
-	PrintAndLogEx(NORMAL, "      <sfi>         : number of SFI records");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      hf emv clone 10 10");	
-	return 0;
-}
-int usage_hf_emv_transaction(void){
-	PrintAndLogEx(NORMAL, "Performs EMV reader transaction");
-	PrintAndLogEx(NORMAL, "Usage:  hf emv trans [h]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h             : this help");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      hf emv trans");
-	return 0;
-}
-int usage_hf_emv_getrnd(void){
-	PrintAndLogEx(NORMAL, "retrieve the UN number from a terminal");
-	PrintAndLogEx(NORMAL, "Usage:  hf emv getrnd [h]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h             : this help");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      hf emv getrnd");
-	return 0;
-}
-int usage_hf_emv_eload(void){
-	PrintAndLogEx(NORMAL, "set EMV tags in the device to use in a transaction");
-	PrintAndLogEx(NORMAL, "Usage:  hf emv eload [h] o <filename w/o .bin>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h             : this help");
-	PrintAndLogEx(NORMAL, "      o <filename>  : filename w/o '.bin'");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      hf emv eload o myfile");
-	return 0;
-}
-int usage_hf_emv_dump(void){
-	PrintAndLogEx(NORMAL, "Gets EMV contactless tag values.");
-	PrintAndLogEx(NORMAL, "and saves binary dump into the file `filename.bin` or `cardUID.bin`");
-	PrintAndLogEx(NORMAL, "Usage:  hf emv dump [h] o <filename w/o .bin>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h             : this help");
-	PrintAndLogEx(NORMAL, "      o <filename>  : filename w/o '.bin' to dump bytes");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      hf emv dump");
-	PrintAndLogEx(NORMAL, "      hf emv dump o myfile");
-	return 0;
-}
-int usage_hf_emv_sim(void){
-	PrintAndLogEx(NORMAL, "Simulates a EMV contactless card");
-	PrintAndLogEx(NORMAL, "Usage:  hf emv sim [h]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h             : this help");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      hf emv sim");
-	return 0;
-}
-
-int CmdHfEmvTest(const char *Cmd) {
-	char cmdp = param_getchar(Cmd, 0);
-	if ( cmdp == 'h' || cmdp == 'H') return usage_hf_emv_test();
-
-	UsbCommand c = {CMD_EMV_TEST, {0, 0, 0}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	UsbCommand resp;
-	if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
-		PrintAndLogEx(WARNING, "Command execute time-out");
-		return 1;
-	}
-	uint8_t isOK  = resp.arg[0] & 0xff;
-	PrintAndLogEx(NORMAL, "isOk: %02x", isOK);	
-	return 0;
-}
-											 
-int CmdHfEmvReadRecord(const char *Cmd) {
-	char cmdp = param_getchar(Cmd, 0);
-	if ((strlen(Cmd)<3) || cmdp == 'h' || cmdp == 'H') return usage_hf_emv_readrecord();
-
-	uint8_t record = param_get8(Cmd, 0);
-	uint8_t sfi = param_getchar(Cmd, 1);
-    if(record > 32){
-        PrintAndLogEx(WARNING, "Record must be less than 32"); 
-		return 1;
-    }
-	PrintAndLogEx(NORMAL, "--record no:%02x SFI:%02x ", record, sfi);
-
-	UsbCommand c = {CMD_EMV_READ_RECORD, {record, sfi, 0}};
-	clearCommandBuffer();  
-	SendCommand(&c);
-	UsbCommand resp;
-	if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
-		PrintAndLogEx(WARNING, "Command execute timeout");
-		return 1;
-	}
-	uint8_t isOK  = resp.arg[0] & 0xff;
-	PrintAndLogEx(NORMAL, "isOk:%02x", isOK);	
-	return 0;
-}												   
-
-int CmdHfEmvClone(const char *Cmd) {
-	char cmdp = param_getchar(Cmd, 0);
-	if ((strlen(Cmd)<3) || cmdp == 'h' || cmdp == 'H') return usage_hf_emv_clone();
-
-	uint8_t record = param_get8(Cmd, 0);
-	uint8_t sfi = param_get8(Cmd, 1);
-    if(record > 32){
-        PrintAndLogEx(WARNING, "Record must be less than 32"); 
-		return 1;
-    }	
-	UsbCommand c = {CMD_EMV_CLONE, {sfi, record, 0}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	UsbCommand resp;
-	if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
-		PrintAndLogEx(WARNING, "Command execute timeout");
-		return 1;
-	}
-	uint8_t isOK  = resp.arg[0] & 0xff;
-	PrintAndLogEx(NORMAL, "isOk:%02x", isOK);
-	return 0;
-}
-
-int CmdHfEmvTrans(const char *Cmd) {
-	char cmdp = param_getchar(Cmd, 0);
-	if ( cmdp == 'h' || cmdp == 'H') return usage_hf_emv_transaction();
-
-	UsbCommand c = {CMD_EMV_TRANSACTION, {0, 0, 0}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	UsbCommand resp;
-	if (!WaitForResponseTimeout(CMD_ACK, &resp, 5000)) {
-		PrintAndLogEx(WARNING, "Command execute time-out");
-		return 1;
-	}
-	uint8_t isOK  = resp.arg[0] & 0xff;
-	PrintAndLogEx(NORMAL, "isOk: %02x", isOK);
-	print_hex_break(resp.d.asBytes, 512, 32);
-	return 0;
-}
-//retrieve the UN number from a terminal
-int CmdHfEmvGetrng(const char *Cmd) {
-	char cmdp = param_getchar(Cmd, 0);
-	if ( cmdp == 'h' || cmdp == 'H') return usage_hf_emv_getrnd();
-    UsbCommand c = {CMD_EMV_GET_RANDOM_NUM, {0, 0, 0}};
-	clearCommandBuffer();
-    SendCommand(&c);
-    return 0;
-}
-//Load a dumped EMV tag on to emulator memory
-int CmdHfEmvELoad(const char *Cmd) {
-	FILE * f;
-	char filename[FILE_PATH_SIZE];
-	char *fnameptr = filename;
-	int len;
-	bool errors = false;
-	uint8_t cmdp = 0;
-
-	while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch(param_getchar(Cmd, cmdp)) {
-			case 'h':
-			case 'H':
-				return usage_hf_emv_eload();
-			case 'o':
-			case 'O':
-				len = param_getstr(Cmd, cmdp+1, filename, FILE_PATH_SIZE);
-				if (!len) 
-					errors = true; 
-				if (len > FILE_PATH_SIZE-5) 
-					len = FILE_PATH_SIZE-5;				
-				sprintf(fnameptr + len,".bin");		
-				cmdp += 2;
-				break;				
-			default:
-				PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-				errors = true;
-				break;
-		}
-	}
-	//Validations
-	if (errors || cmdp == 0) return usage_hf_emv_eload();
-
-	// open file
-	f = fopen(filename,"r");
-	if (!f) { 
-		PrintAndLogEx(WARNING, "File %s not found or locked", filename);
-		return 1;
-	}
-	
-    char line[512];
-    char *token;    
-    uint16_t tag;
-	
-    UsbCommand c = {CMD_EMV_LOAD_VALUE, {0,0,0}};  
-	
-	// transfer to device
-    while (fgets(line, sizeof (line), f)) {
-        PrintAndLogEx(NORMAL, "LINE = %s\n", line);
-		
-        token = strtok(line, ":"); 
-        tag = (uint16_t)strtol(token, NULL, 0);  
-        token = strtok(NULL,""); 
-		
-        c.arg[0] = tag;
-        memcpy(c.d.asBytes, token, strlen(token));
-
-		clearCommandBuffer();
-        SendCommand(&c);
-
-        PrintAndLogEx(NORMAL, "Loaded TAG   = %04x\n", tag);
-        PrintAndLogEx(NORMAL, "Loaded VALUE = %s\n", token); 
-    }
-	
-	fclose(f);
-	PrintAndLogEx(NORMAL, "loaded %s", filename);
-	//PrintAndLogEx(NORMAL, "\nLoaded %d bytes from file: %s  to emulator memory", numofbytes, filename);
-	return 0;
-}
-
-int CmdHfEmvDump(const char *Cmd){
-
-	bool errors = false;
-	uint8_t cmdp = 0;
-	while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch(param_getchar(Cmd, cmdp)) {
-			case 'h':
-			case 'H':
-				return usage_hf_emv_dump();
-			default:
-				PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-				errors = true;
-				break;
-		}
-	}
-	//Validations
-	if (errors) return usage_hf_emv_dump();
-	
-    UsbCommand c = {CMD_EMV_DUMP_CARD, {0, 0, 0}};
-	clearCommandBuffer();
-    SendCommand(&c);
-	UsbCommand resp;
-	if (!WaitForResponseTimeout(CMD_ACK, &resp, 3000)) {
-		PrintAndLogEx(WARNING, "Command execute time-out");
-		return 1;
-	}
-	return 0;
-}	
-
-int CmdHfEmvSim(const char *Cmd) {
-	
-	bool errors = false;	
-	uint8_t cmdp = 0;
-	while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch(param_getchar(Cmd, cmdp)) {
-			case 'h':
-			case 'H':
-				return usage_hf_emv_sim();
-			default:
-				PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-				errors = true;
-				break;
-		}
-	}
-	//Validations
-	if (errors) return usage_hf_emv_sim();	
-	
-	UsbCommand c = {CMD_EMV_SIM, {0,0,0}};
-	clearCommandBuffer();
-	SendCommand(&c);	
-	UsbCommand resp;
-	if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
-		PrintAndLogEx(WARNING, "Command execute time-out");
-		return 1;
-	}	
-	uint8_t isOK  = resp.arg[0] & 0xff;
-	PrintAndLogEx(NORMAL, "isOk:%02x", isOK);
-	return 0;
-}
-
-int CmdHfEmvList(const char *Cmd) {
-	return CmdTraceList("7816");
-}
-
-static command_t CommandTable[] =  {
-	{"help",		CmdHelp,		  1, "This help"},
-	{"readrecord",	CmdHfEmvReadRecord, 0, "EMV Read Record"},
-	{"transaction",	CmdHfEmvTrans, 	  0, "Perform EMV Transaction"}, 
-	{"getrng",		CmdHfEmvGetrng,	  0, "get random number from terminal"}, 
-	{"eload",		CmdHfEmvELoad, 	  0, "load EMV tag into device"},
-	{"dump",		CmdHfEmvDump,	  0, "dump EMV tag values"},
-	{"sim",			CmdHfEmvSim,	  0, "simulate EMV tag"},
-	{"clone",		CmdHfEmvClone,	  0, "clone an EMV tag"}, 
-	{"list",		CmdHfEmvList,	  0, "[Deprecated] List ISO7816 history"}, 
-    {"test",		CmdHfEmvTest,	  0, "Test Function"}, 	
-	{NULL, NULL, 0, NULL}
-};
-
-int CmdHFEmv(const char *Cmd) {
-	clearCommandBuffer();
-	CmdsParse(CommandTable, Cmd);
-	return 0;
-}
-
-int CmdHelp(const char *Cmd) {
-	CmdsHelp(CommandTable);
-	return 0;
-}
\ No newline at end of file
diff --git a/client/cmdhfemv.h b/client/cmdhfemv.h
deleted file mode 100644
index 0b68a455c..000000000
--- a/client/cmdhfemv.h
+++ /dev/null
@@ -1,45 +0,0 @@
-//-----------------------------------------------------------------------------
-// Copyright (C) 2014 Peter Fillmore
-// 2017 iceman
-//
-// This code is licensed to you under the terms of the GNU GPL, version 2 or,
-// at your option, any later version. See the LICENSE.txt file for the text of
-// the license.
-//-----------------------------------------------------------------------------
-// High frequency EMV commands
-//-----------------------------------------------------------------------------
-
-#ifndef CMDHFEMV_H__
-#define CMDHFEMV_H__
-
-#include <stdio.h>
-#include <string.h>
-#include "proxmark3.h"
-#include "ui.h"
-#include "cmdparser.h"
-#include "cmdmain.h"
-#include "util.h"
-#include "cmdhf.h" // "hf list"
-
-int CmdHFEmv(const char *Cmd);
-
-int CmdHfEmvTest(const char *Cmd);
-int CmdHfEmvReadRecord(const char *Cmd);
-int CmdHfEmvClone(const char *Cmd);
-int CmdHfEmvTrans(const char *Cmd);
-int CmdHfEmvGetrng(const char *Cmd);
-int CmdHfEmvELoad(const char *Cmd);
-int CmdHfEmvDump(const char *Cmd);
-int CmdHfEmvSim(const char *Cmd);
-int CmdHfEmvList(const char *Cmd);
-
-int usage_hf_emv_test(void);
-int usage_hf_emv_readrecord(void);
-int usage_hf_emv_clone(void);
-int usage_hf_emv_transaction(void);
-int usage_hf_emv_getrnd(void);
-int usage_hf_emv_eload(void);
-int usage_hf_emv_dump(void);
-int usage_hf_emv_sim(void);
-
-#endif
diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index a443f6aad..396918d7e 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -1456,7 +1456,6 @@ int CmdEMVScan(const char *cmd) {
 	return 0;
 }
 
-
 int CmdEMVList(const char *Cmd) {
 	return CmdTraceList("7816");
 }
@@ -1476,10 +1475,13 @@ int CmdEMVRoca(const char *cmd) {
 	CLIParserInit("emv roca", 
 		"Tries to extract public keys and run the ROCA test against them.\n", 
 		"Usage:\n"
-			"\temv roca -w -> select CONTACT card and run test\n\temv roca -> select CONTACTLESS card and run test\n");
+			"\temv roca -w -> select --CONTACT-- card and run test\n"
+			"\temv roca -> select --CONTACTLESS-- card and run test\n"
+			);
 
 	void* argtable[] = {
 		arg_param_begin,
+		arg_lit0("tT",  "selftest",   "self test"),
 		arg_lit0("wW",  "wired",   "Send data via contact (iso7816) interface. Contactless interface set by default."),
 		arg_param_end
 	};
@@ -1487,6 +1489,9 @@ int CmdEMVRoca(const char *cmd) {
 	
 	EMVCommandChannel channel = ECC_CONTACTLESS;
 	if (arg_get_lit(1))
+		return roca_self_test();
+
+	if (arg_get_lit(2))
 		channel = ECC_CONTACT;
 
 	// select card
diff --git a/client/emv/emv_roca.c b/client/emv/emv_roca.c
index a6738ae2f..6f90f11b5 100644
--- a/client/emv/emv_roca.c
+++ b/client/emv/emv_roca.c
@@ -138,11 +138,10 @@ cleanup:
 	return ret;
 }
 
-int roca_self_test( int verbose ) {
+int roca_self_test(void) {
 	int ret = 0;
 
-	if( verbose != 0 )
-		printf( "\nROCA check vulnerability tests\n" );
+	PrintAndLogEx(INFO, "ROCA check vulnerability tests" );
 
 	// positive
 	uint8_t keyp[] = "\x94\x4e\x13\x20\x8a\x28\x0c\x37\xef\xc3\x1c\x31\x14\x48\x5e\x59"\
@@ -150,16 +149,13 @@ int roca_self_test( int verbose ) {
 					"\x27\x83\x30\xd3\xf4\x71\xa2\x53\x8f\xa6\x67\x80\x2e\xd2\xa3\xc4"\
 					"\x4a\x8b\x7d\xea\x82\x6e\x88\x8d\x0a\xa3\x41\xfd\x66\x4f\x7f\xa7";
 
-	if( verbose != 0 )
-		printf( "  ROCA positive test: " );
 	
 	if (emv_rocacheck(keyp, 64, false)) {
-		if( verbose != 0 )
-			printf( "passed\n" );
-	} else {
-		ret = 1;
-		if( verbose != 0 )
-			printf( "failed\n" );
+		PrintAndLogEx(SUCCESS, "Weak modulus [ %s]", _GREEN_(PASS) );	
+	}
+	else {
+		ret++;
+		PrintAndLogEx(FAILED, "Weak modulus [ %s]", _RED_(FAIL) );
 	}
 
 	// negative
@@ -168,18 +164,12 @@ int roca_self_test( int verbose ) {
 					"\x27\x83\x30\xd3\xf4\x71\xa2\x53\x8f\xa6\x67\x80\x2e\xd2\xa3\xc4"\
 					"\x4a\x8b\x7d\xea\x82\x6e\x88\x8d\x0a\xa3\x41\xfd\x66\x4f\x7f\xa7";
 
-	if( verbose != 0 )
-		printf( "  ROCA negative test: " );
-
 	if (emv_rocacheck(keyn, 64, false)) {
-		ret = 1;
-		if( verbose != 0 )
-			printf( "failed\n" );
+		ret++;
+		PrintAndLogEx(FAILED, "Strong modulus [ %s]", _RED_(FAIL) );
 	} else {
-		if( verbose != 0 )
-			printf( "passed\n" );
+		PrintAndLogEx(SUCCESS, "Strong modulus [ %s]", _GREEN_(PASS) );	
 	}
-
 	
 	return ret;
 }
diff --git a/client/emv/emv_roca.h b/client/emv/emv_roca.h
index 26d37d146..9e12e4256 100644
--- a/client/emv/emv_roca.h
+++ b/client/emv/emv_roca.h
@@ -32,7 +32,7 @@
 #define ROCA_PRINTS_LENGTH	17
 
 extern bool emv_rocacheck( const unsigned char *buf, size_t buflen, bool verbose );
-extern int roca_self_test( int verbose );
+extern int roca_self_test( void );
 
 #endif
 
diff --git a/client/emv/test/cryptotest.c b/client/emv/test/cryptotest.c
index b0212a70b..4e8df1a25 100644
--- a/client/emv/test/cryptotest.c
+++ b/client/emv/test/cryptotest.c
@@ -91,14 +91,15 @@ int ExecuteCryptoTests(bool verbose) {
 	res = exec_crypto_test(verbose);
 	if (res) TestFail = true;
 
-	res = roca_self_test(verbose);
+	res = roca_self_test();
 	if (res) TestFail = true;
 
 	PrintAndLog("\n--------------------------");
+	
 	if (TestFail)
-		PrintAndLog("Test(s) [ERROR].");
+		PrintAndLogEx(FAILED, "\tTest(s) [ %s ]", _RED_(FAIL) );
 	else
-		PrintAndLog("Tests [OK].");
+		PrintAndLogEx(SUCCESS, "\tTest(s) [ %s ]", _GREEN_(OK) );
 	
 	return TestFail;
 }

From 0fb0c35308366326b8897382da631a28f238fe23 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 1 Jan 2019 18:01:40 +0100
Subject: [PATCH 0362/1938] CHG: 'mem load' -  the possibility to upload
 default_iclass_keys.dic,  default_keys.dic, default_pwd.dic to predefined
 flashmemory sections.  These will be used in pwd / key checking algorithms on
 device.

CHG: 'script run read_pwd_mem.lua' - script now can print those uploaded dictionary files.

How to upload
pm3 --> mem load f default_iclass_keys i
pm3 --> mem load f default_keys m
pm3 --> mem load f default_pwd t

How to validate / view
PM3 -->scr run read_pwd_mem -o 237568 -k 8
pm3 -->scr run read_pwd_mem -o 241664 -k 6
pm3 -->scr run read_pwd_mem -o 245760 -k 4
---
 armsrc/appmain.c                |  12 ++-
 armsrc/lfops.c                  |   2 +-
 client/cmdflashmem.c            |  90 +++++++++++++++++++----
 client/cmdflashmem.h            |   7 ++
 client/cmdhficlass.c            |   7 +-
 client/loclass/fileutils.c      |  66 +++++++++++++++++
 client/loclass/fileutils.h      |  17 ++++-
 client/scripts/read_pwd_mem.lua | 126 ++++++++++++++++++++++----------
 include/common.h                |  14 ++--
 9 files changed, 276 insertions(+), 65 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index eed443599..bf4bddef6 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1285,10 +1285,20 @@ void UsbPacketReceived(uint8_t *packet, int len) {
   			if (!FlashInit()) {
    		       break;
   		    }
-    
+
   		    Flash_CheckBusy(BUSY_TIMEOUT);
   		    Flash_WriteEnable();
+			
+			if ( startidx == DEFAULT_T55XX_KEYS_OFFSET  )
+				Flash_Erase4k(3, 0xC);
+			else if (startidx ==  DEFAULT_MF_KEYS_OFFSET )
+				Flash_Erase4k(3, 0xB);
+			else if (startidx == DEFAULT_ICLASS_KEYS_OFFSET)
+				Flash_Erase4k(3, 0xA);
 
+  		    Flash_CheckBusy(BUSY_TIMEOUT);
+  		    Flash_WriteEnable();			
+			
 			// inside 256b page?
 			if ( (tmp & 0xFF) != 0) {				
 				
diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index 0dac64bd1..e690714df 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -103,7 +103,7 @@ void setT55xxConfig(uint8_t arg0, t55xx_config *c) {
 	
 	Flash_CheckBusy(BUSY_TIMEOUT);
     Flash_WriteEnable();
-	Flash_Erase4k(3, 0xD);	
+	Flash_Erase4k(3, 0xD);
 	res = Flash_Write(T55XX_CONFIG_OFFSET, buf, T55XX_CONFIG_LEN);
 
 	if ( res == T55XX_CONFIG_LEN && MF_DBGLEVEL > 1) {
diff --git a/client/cmdflashmem.c b/client/cmdflashmem.c
index 2ff68bd3d..6361d48e3 100644
--- a/client/cmdflashmem.c
+++ b/client/cmdflashmem.c
@@ -50,13 +50,19 @@ int usage_flashmem_read(void){
 }
 int usage_flashmem_load(void){
 	PrintAndLogEx(NORMAL, "Loads binary file into flash memory on device");
-	PrintAndLogEx(NORMAL, "Usage:  mem load o <offset> f <file name>");
+	PrintAndLogEx(NORMAL, "Usage:  mem load o <offset> f <file name> m t i");
 	PrintAndLogEx(NORMAL, "  o <offset>    :      offset in memory");
 	PrintAndLogEx(NORMAL, "  f <filename>  :      file name");
+	PrintAndLogEx(NORMAL, "  m             :      upload 6 bytes keys (mifare key dictionary)");
+	PrintAndLogEx(NORMAL, "  i             :      upload 8 bytes keys (iClass key dictionary)");
+	PrintAndLogEx(NORMAL, "  t             :      upload 4 bytes keys (pwd dictionary)");
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Examples:");
 	PrintAndLogEx(NORMAL, "        mem load f myfile");			// upload file myfile at default offset 0
 	PrintAndLogEx(NORMAL, "        mem load f myfile o 1024");	// upload file myfile at offset 1024
+	PrintAndLogEx(NORMAL, "        mem load f default_keys m");
+	PrintAndLogEx(NORMAL, "        mem load f default_pwd t");
+	PrintAndLogEx(NORMAL, "        mem load f default_iclass_keys i");
 	return 0;
 }
 int usage_flashmem_save(void){
@@ -154,7 +160,8 @@ int CmdFlashMemLoad(const char *Cmd){
 	uint32_t start_index = 0;
 	char filename[FILE_PATH_SIZE] = {0};	
 	bool errors = false;
-	uint8_t cmdp = 0;
+	uint8_t cmdp = 0;	
+	Dictionary_t d = DICTIONARY_NONE;
 	
 	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
 		switch (tolower(param_getchar(Cmd, cmdp))) {
@@ -171,7 +178,19 @@ int CmdFlashMemLoad(const char *Cmd){
 		case 'o':
 			start_index = param_get32ex(Cmd, cmdp+1, 0, 10);
 			cmdp += 2;
-			break;	
+			break;
+		case 'm':
+			d = DICTIONARY_MIFARE;
+			cmdp++;
+			break;
+		case 't':
+			d = DICTIONARY_T55XX;
+			cmdp++;
+			break;
+		case 'i':
+			d = DICTIONARY_ICLASS;
+			cmdp++;
+			break;
 		default:
 			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
 			errors = true;
@@ -181,20 +200,61 @@ int CmdFlashMemLoad(const char *Cmd){
 	
 	//Validations
 	if (errors || cmdp == 0 ) return usage_flashmem_load();			
-	
-	uint8_t *data = calloc(FLASH_MEM_MAX_SIZE, sizeof(uint8_t));
+
 	size_t datalen = 0;
-	int res = loadFile(filename, "bin", data, &datalen);
-	//int res = loadFileEML( filename, "eml", data, &datalen);
-	if ( res ) {
-		free(data);
-		return 1;
-	}
+	uint16_t keycount = 0;
+	int res = 0;
+	uint8_t *data = calloc(FLASH_MEM_MAX_SIZE, sizeof(uint8_t));
 	
-	if (datalen > FLASH_MEM_MAX_SIZE) {
-		PrintAndLogDevice(WARNING, "error, filesize is larger than available memory");
-		free(data);
-		return 1;
+	switch (d) {
+		case DICTIONARY_MIFARE:
+			start_index = DEFAULT_MF_KEYS_OFFSET;
+			res = loadFileDICTIONARY(filename, "dic", data+2, &datalen, 6, &keycount );
+			if ( res || !keycount) {
+				free(data);
+				return 1;
+			}
+			data[0] = (keycount >> 0) & 0xFF;
+			data[1] = (keycount >> 8) & 0xFF;			
+			datalen += 2;	
+			break;
+		case DICTIONARY_T55XX:
+			start_index = DEFAULT_T55XX_KEYS_OFFSET;
+			res = loadFileDICTIONARY(filename, "dic", data+2, &datalen, 4, &keycount );
+			if ( res || !keycount) {
+				free(data);
+				return 1;
+			}
+			data[0] = (keycount >> 0) & 0xFF;
+			data[1] = (keycount >> 8) & 0xFF;			
+			datalen += 2;
+			break;
+		case DICTIONARY_ICLASS:
+			start_index = DEFAULT_ICLASS_KEYS_OFFSET;
+			res = loadFileDICTIONARY(filename, "dic", data+2, &datalen, 8, &keycount );
+			if ( res || !keycount) {
+				free(data);
+				return 1;
+			}
+			data[0] = (keycount >> 0) & 0xFF;
+			data[1] = (keycount >> 8) & 0xFF;			
+			datalen += 2;		
+			break;
+		default:
+			
+			res = loadFile(filename, "bin", data, &datalen);
+			//int res = loadFileEML( filename, "eml", data, &datalen);
+			if ( res ) {
+				free(data);
+				return 1;
+			}
+			
+			if (datalen > FLASH_MEM_MAX_SIZE) {
+				PrintAndLogDevice(WARNING, "error, filesize is larger than available memory");
+				free(data);
+				return 1;
+			}
+			break;		
 	}
 	
 	data = realloc(data, datalen);
diff --git a/client/cmdflashmem.h b/client/cmdflashmem.h
index 843c17d6f..9f71a4ce0 100644
--- a/client/cmdflashmem.h
+++ b/client/cmdflashmem.h
@@ -24,6 +24,13 @@
 #include "loclass/fileutils.h"	//saveFile
 #include "comms.h"			//getfromdevice
 
+typedef enum {
+	DICTIONARY_NONE = 0,
+	DICTIONARY_MIFARE,
+	DICTIONARY_T55XX,
+	DICTIONARY_ICLASS
+} Dictionary_t;
+
 extern int CmdFlashMem(const char *Cmd);
 
 extern int CmdFlashMemRead(const char* cmd);
diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index 6cc2aa191..0e62afaf6 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -2316,7 +2316,8 @@ int LoadDictionaryKeyFile( char* filename, uint8_t **keys, int *keycnt) {
 		while (fgetc(f) != '\n' && !feof(f)) {}; 
 		
 		//The line start with # is comment, skip		
-		if( buf[0]=='#' ) continue;
+		if( buf[0]=='#' ) 
+			continue;
 
 		// doesn't this only test first char only?
 		if (!isxdigit(buf[0])){
@@ -2329,7 +2330,7 @@ int LoadDictionaryKeyFile( char* filename, uint8_t **keys, int *keycnt) {
 
 		p = realloc(*keys, 8 * (keyitems += 64));
 		if (!p) {
-			PrintAndLogEx(NORMAL, _RED_([!])" cannot allocate memory for default keys");
+			PrintAndLogEx(ERR, "cannot allocate memory for default keys");
 			fclose(f);
 			return 2;
 		}
@@ -2341,7 +2342,7 @@ int LoadDictionaryKeyFile( char* filename, uint8_t **keys, int *keycnt) {
 		memset(buf, 0, sizeof(buf));
 	}
 	fclose(f);
-	PrintAndLogEx(NORMAL, _BLUE_([+]) "Loaded " _GREEN_(%2d) " keys from %s", *keycnt, filename);	
+	PrintAndLogEx(SUCCESS, "Loaded " _GREEN_(%2d) " keys from %s", *keycnt, filename);
 	return 0;
 }
 
diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index b099d6a35..5bac3d2cd 100644
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -453,6 +453,72 @@ out:
 	return retval;
 }
 
+int loadFileDICTIONARY(const char *preferredName, const char *suffix, void* data, size_t* datalen, uint8_t keylen, uint16_t* keycnt ) {
+
+	if ( preferredName == NULL ) return 1;
+	if ( suffix == NULL ) return 1;
+
+	// t5577 == 4bytes
+	// mifare == 6 bytes
+	// iclass == 8 bytes
+	// default to 6 bytes.
+	if (keylen != 4 && keylen != 6 && keylen != 8) {
+		keylen = 6;
+	}
+	
+	// double up since its chars
+	keylen <<= 1;	
+	
+	char line[255];
+	
+    size_t counter = 0;
+	int retval = 0;
+	int size = sizeof(char) * (strlen(preferredName) + strlen(suffix) + 10);
+	char * fileName = calloc(size, sizeof(char));
+	sprintf(fileName,"%s.%s", preferredName, suffix);
+
+	FILE *f = fopen(fileName, "r");
+	if ( !f ) {
+		PrintAndLogDevice(FAILED, "file: %s: not found or locked.", fileName);
+		retval = 1;
+		goto out;
+	}
+	
+	// read file
+	while ( fgets(line, sizeof(line), f) ) {
+		
+		// add null terminator
+		line[keylen] = 0;
+
+		// smaller keys than expected is skipped
+		if (strlen(line) < keylen)
+			continue;
+
+	
+		// The line start with # is comment, skip
+		if( line[0] == '#' )
+			continue;
+	
+		if (!isxdigit(line[0])){
+			PrintAndLogEx(FAILED, "file content error. '%s' must include " _BLUE_(%2d) "HEX symbols", line, keylen);
+			continue;
+		}	
+
+		uint64_t key = strtoull(line, NULL, 16);
+		
+		num_to_bytes(key, keylen >> 1, data + counter);
+		(*keycnt)++;
+		memset(line, 0, sizeof(line));
+		counter += (keylen >> 1);
+	}
+	fclose(f);
+	PrintAndLogDevice(SUCCESS, "loaded " _GREEN_(%2d) "keys from dictionary file %s", *keycnt, fileName);	
+	*datalen = counter;	
+out:	
+	free(fileName);
+	return retval;	
+}
+
 #else //if we're on ARM
 
 #endif
diff --git a/client/loclass/fileutils.h b/client/loclass/fileutils.h
index b73f5fc30..3fc781d2e 100644
--- a/client/loclass/fileutils.h
+++ b/client/loclass/fileutils.h
@@ -124,7 +124,7 @@ extern int loadFile(const char *preferredName, const char *suffix, void* data, s
 */
 extern int loadFileEML(const char *preferredName, const char *suffix, void* data, size_t* datalen);
 
-/** STUB
+/**
  * @brief  Utility function to load data from a JSON textfile. This method takes a preferred name.
  * E.g. dumpdata-15.json
  *
@@ -137,6 +137,21 @@ extern int loadFileEML(const char *preferredName, const char *suffix, void* data
 */
 extern int loadFileJSON(const char *preferredName, const char *suffix, void* data, size_t maxdatalen, size_t* datalen);
 
+
+/**
+ * @brief  Utility function to load data from a DICTIONARY textfile. This method takes a preferred name.
+ * E.g. default_keys.dic
+ *
+ * @param preferredName
+ * @param suffix the file suffix. Leave out the ".".
+ * @param data The data array to store the loaded bytes from file
+ * @param maxdatalen maximum size of data array in bytes
+ * @param datalen the number of bytes loaded from file
+ * @param keylen  the number of bytes a key per row is
+ * @return 0 for ok, 1 for failz
+*/
+extern int loadFileDICTIONARY(const char *preferredName, const char *suffix, void* data, size_t* datalen, uint8_t keylen, uint16_t* keycnt );
+
 #define PrintAndLogDevice(level, format, args...)  PrintAndLogEx(level, format , ## args)
 #else 
 
diff --git a/client/scripts/read_pwd_mem.lua b/client/scripts/read_pwd_mem.lua
index fbe4d0459..772927c0c 100644
--- a/client/scripts/read_pwd_mem.lua
+++ b/client/scripts/read_pwd_mem.lua
@@ -1,23 +1,29 @@
 local getopt = require('getopt')
 local bin = require('bin')
 
+copyright = 'Copyright (c) 2018 Bogito. All rights reserved.'
 author = "Bogito"
-version = 'v1.0.0'
-desc =[[
+version = 'v1.0.1'
+desc =
+[[
 This script will read the flash memory of RDV4 and print the stored passwords.
 It was meant to be used as a help tool after using the BogRun standalone mode.
+
+(Iceman) script adapted to read and print keys in the default dictionary flashmemory sections.
 ]]
-usage = [[
+usage = 
+[[
 Usage:
-	script run read_pwd_mem -h -o <offset> -l <length>
+	script run read_pwd_mem -h -o <offset> -l <length> -k <keylength>
 
 Arguments:
-	-h             : this help
-	-o <OFFSET>    : Memory offset. Default is 0.
-	-l <LENGTH>    : Length in bytes. Default is 256.
+	-h              :  this help
+	-o <offset>     :  memory offset, default is 0
+	-l <length>     :  length in bytes, default is 256
+	-k <keylen>     :  key length in bytes <4|6|8> ,  default is 4
 ]]
-example =[[
-Examples:
+example =
+[[
 	-- This will scan the first 256 bytes of flash memory for stored passwords
 	script run read_pwd_mem
 
@@ -26,61 +32,103 @@ Examples:
 
 	-- This will scan 32 bytes of flash memory at offset 64 for stored passwords
 	script run read_pwd_mem -o 64 -l 32
+	
+	-- This will print found
+	script run read_pwd_mem -o 241664 -k 6
 ]]
-
+--- 
+-- This is only meant to be used when errors occur
+local function oops(err)
+	print("ERROR: ", err)
+	return nil, err
+end
+---
 -- Usage help
 local function help()
+	print(copyright)
+	print(version)
 	print(desc)
 	print(usage)
+	print('Example usage:')
 	print(example)
 end
-
+---
+-- The main entry point
 local function main(args)
 
-	local data, err, quadlet, pwdcnt
+	print( string.rep('--',20) )
+	print( string.rep('--',20) )
+	print()
+	
+	local data, err, quadlet
+	local cnt = 0
 	local offset = 0
 	local length = 256
+	local keylength = 4
+	local usedkey = false
 	
-	-- Read the parameters
-	for o, a in getopt.getopt(args, 'ho:l:') do
+	for o, a in getopt.getopt(args, 'ho:l:k:') do
+	
+		-- help
 		if o == "h" then return help() end
+		
+		-- offset
 		if o == "o" then offset = tonumber(a) end
+		
+		-- num of bytes to read
 		if o == "l" then length = tonumber(a) end
+		
+		-- keylength
+		if o == "k" then keylength = tonumber(a); usedkey = true end
 	end
 	
 	if length < 0 or length > 256 then
-		return print('Error: Length is not valid. Must be less than 256')
+		return oops('Error: Length is not valid. Must be less than 256')
 	end
 	
-	if ((offset < 0) or (offset % 4 ~= 0)) then
-		return print('Error: Offset is not valid. Mod-4 values are only allowed.')
+	if (offset < 0) or (offset % 4 ~= 0) then
+		return oops('Error: Offset is not valid. Mod-4 values are only allowed.')
 	end
 	
-	print('Offset: ' .. offset)
-	print('Length: ' .. length)
-	print()
+	print('Memory offset', offset)
+	print('Length       ', length)
+	print('Key length   ', keylength)
+	print( string.rep('--',20) )
 
-    data, err = core.GetFromFlashMem(offset, length)
+	if usedkey then length = 4096 end
+	
+	data, err = core.GetFromFlashMem(offset, length)	
+	if err then return oops(err) end
 
-	if err then 
-		print(err)
-		return
+	if usedkey then
+	
+		_, keys, s = bin.unpack('SH'..length-2, data)
+		if keys == 0xFFFF then return "No keys found in section" end
+		
+		local kl = keylength * 2	
+		for i = 1, keys do
+		
+			key  = string.sub(s, (i - 1) * kl + 1, i * kl )
+			print(string.format("[%02d] %s",i, key))
+		end	
+		print( string.rep('--',20) )
+		print( ('[+] found %d passwords'):format(keys))		
+	else
+	
+		_, s = bin.unpack('H'..length, data)
+		
+		local cnt = 0, i
+		for i = 1, (length/keylength) do
+		
+			key  = string.sub(s, (i-1)*8+1, i*8)
+			if key == "FFFFFFFF" then break end
+			print(string.format("[%02d] %s",i, key))
+			cnt = cnt + 1
+		end
+		print( string.rep('--',20) )
+		print( ('[+] found %d passwords'):format(cnt))
 	end
-	
-    local count, s = bin.unpack('H'..length, data)
-	
-	pwdcnt = 0
-	for i = 1,(length/4),1 
-	do
-		quadlet = string.sub(s, (i-1)*8+1, i*8)
-		if quadlet == "FFFFFFFF" then break end
-		print(string.format("[%02d]",i) .. ' ' .. quadlet)
-		pwdcnt = pwdcnt + 1
-
-	end
-	print()
-	print('Found passwords: ' .. pwdcnt)
-	
+	print( string.rep('--',20) )	
 end
 
 main(args)
diff --git a/include/common.h b/include/common.h
index 90394448c..d3da792aa 100644
--- a/include/common.h
+++ b/include/common.h
@@ -90,13 +90,17 @@ extern uint32_t FLASHMEM_SPIBAUDRATE;
 	#ifndef T55XX_CONFIG_OFFSET
 	# define T55XX_CONFIG_OFFSET	(FLASH_MEM_MAX_4K_SECTOR - 0x2000)
 	#endif
-	
-	#ifndef DEFAULT_MF_KEYS_OFFSET
-	# define DEFAULT_MF_KEYS_OFFSET (FLASH_MEM_MAX_4K_SECTOR - 0x3000)
+
+	#ifndef DEFAULT_T55XX_KEYS_OFFSET
+	# define DEFAULT_T55XX_KEYS_OFFSET (FLASH_MEM_MAX_4K_SECTOR - 0x3000)
 	#endif
 	
-	#ifndef DEFAULT_LF_KEYS_OFFSET
-	# define DEFAULT_LF_KEYS_OFFSET (FLASH_MEM_MAX_4K_SECTOR - 0x4000)
+	#ifndef DEFAULT_MF_KEYS_OFFSET
+	# define DEFAULT_MF_KEYS_OFFSET (FLASH_MEM_MAX_4K_SECTOR - 0x4000)
+	#endif
+	
+	#ifndef DEFAULT_ICLASS_KEYS_OFFSET
+	# define DEFAULT_ICLASS_KEYS_OFFSET (FLASH_MEM_MAX_4K_SECTOR - 0x5000)
 	#endif
 #endif
 

From 6e281a08ed93e664f196aea49f1d922ee2fb5b83 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 2 Jan 2019 11:52:13 +0100
Subject: [PATCH 0363/1938] CHG: 'hf mf fchk' - speed improvments by tweaking
 implementation. CHG: 'hf mf fchk' - can use dictionary from flashmem if one
 is uploaded. (faster)

---
 armsrc/mifarecmd.c  | 128 +++++++++++++++++++++++++++++++++-----------
 client/cmdhfmf.c    |  96 +++++++++++++++++++--------------
 client/mifarehost.c |   4 +-
 client/mifarehost.h |   2 +-
 4 files changed, 156 insertions(+), 74 deletions(-)

diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index 7d39b3f29..3e1967b4e 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -17,7 +17,7 @@
 #include <inttypes.h>
 
 #ifndef HARDNESTED_AUTHENTICATION_TIMEOUT
-# define HARDNESTED_AUTHENTICATION_TIMEOUT  848 //848			// card times out 1ms after wrong authentication (according to NXP documentation)
+# define HARDNESTED_AUTHENTICATION_TIMEOUT  848			// card times out 1ms after wrong authentication (according to NXP documentation)
 #endif
 #ifndef HARDNESTED_PRE_AUTHENTICATION_LEADTIME
 # define HARDNESTED_PRE_AUTHENTICATION_LEADTIME 400		// some (non standard) cards need a pause after select before they are ready for first authentication 
@@ -1122,7 +1122,6 @@ uint8_t chkKey_readb(struct chk_t *c, uint8_t *keyb) {
 }
 
 void chkKey_scanA(struct chk_t *c, struct sector_t *k_sector, uint8_t *found, uint8_t *sectorcnt, uint8_t *foundkeys) { 
-	uint8_t status;
 	for (uint8_t s = 0; s < *sectorcnt; s++) { 
 
 		// skip already found A keys 
@@ -1130,8 +1129,7 @@ void chkKey_scanA(struct chk_t *c, struct sector_t *k_sector, uint8_t *found, ui
 			continue;
 
 		c->block = FirstBlockOfSector( s );
-		status = chkKey( c ); 
-		if ( status == 0 ) { 
+		if ( chkKey( c ) == 0 ) { 
 			num_to_bytes(c->key, 6, k_sector[s].keyA);
 			found[(s*2)] = 1; 
 			++*foundkeys; 
@@ -1142,7 +1140,6 @@ void chkKey_scanA(struct chk_t *c, struct sector_t *k_sector, uint8_t *found, ui
 }
 
 void chkKey_scanB(struct chk_t *c, struct sector_t *k_sector, uint8_t *found, uint8_t *sectorcnt, uint8_t *foundkeys) { 
-	uint8_t status;	
 	for (uint8_t s = 0; s < *sectorcnt; s++) { 
 
 		// skip already found B keys 
@@ -1150,8 +1147,7 @@ void chkKey_scanB(struct chk_t *c, struct sector_t *k_sector, uint8_t *found, ui
 			continue;
 
 		c->block = FirstBlockOfSector( s );
-		status = chkKey( c ); 
-		if ( status == 0 ) { 
+		if ( chkKey( c ) == 0 ) { 
 			num_to_bytes(c->key, 6, k_sector[s].keyB);	
 			found[(s*2)+1] = 1; 
 			++*foundkeys; 
@@ -1167,7 +1163,12 @@ void chkKey_loopBonly(struct chk_t *c, struct sector_t *k_sector, uint8_t *found
 
 	// read Block B, if A is found.
 	for (uint8_t s = 0; s < *sectorcnt; ++s) {
+		
+		if ( found[(s*2)] && found[(s*2)+1] )
+			continue;
+		
 		c->block = (FirstBlockOfSector( s ) + NumBlocksPerSector( s ) - 1);
+
 		// A but not B
 		if ( found[(s*2)]  &&  !found[(s*2)+1] ){	
 			c->key = bytes_to_num(k_sector[s].keyA, 6);
@@ -1187,6 +1188,9 @@ void chkKey_loopBonly(struct chk_t *c, struct sector_t *k_sector, uint8_t *found
 		}
 	}
 }
+
+
+
 // get Chunks of keys, to test authentication against card.
 // arg0 = antal sectorer
 // arg0 = first time
@@ -1200,7 +1204,8 @@ void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *da
 	uint8_t firstchunk = (arg0 >> 8) & 0xF;	
 	uint8_t lastchunk = (arg0 >> 12) & 0xF;	
 	uint8_t strategy = arg1 & 0xFF;
-	uint8_t keyCount = arg2 & 0xFF;
+	uint8_t use_flashmem = (arg1 >> 8) & 0xFF;
+	uint16_t keyCount = arg2 & 0xFF;
 	uint8_t status = 0;
 
 	struct Crypto1State mpcs = {0, 0};
@@ -1217,33 +1222,57 @@ void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *da
 	static uint8_t found[80];
 	static uint8_t *uid;
 
-	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+#ifdef WITH_FLASH	
+	if ( use_flashmem ) {
+		BigBuf_free();
+		uint16_t isok = 0;
+		uint8_t size[2] = {0x00, 0x00};		
+		isok = Flash_ReadData(DEFAULT_MF_KEYS_OFFSET, size, 2);
+		if ( isok != 2 )
+			goto OUT;
+		
+		keyCount = size[1] << 8 | size[0];
+		
+		if ( keyCount == 0 && keyCount == 0xFFFF) 
+			goto OUT;
+			
+		datain = BigBuf_malloc( keyCount * 6);
+		if (datain == NULL )
+			goto OUT;
+
+		isok = Flash_ReadData(DEFAULT_MF_KEYS_OFFSET+2, datain, keyCount * 6);
+		if ( isok != keyCount * 6 )
+			goto OUT;
+		
+	}
+#endif
 		
 	if (uid == NULL || firstchunk) {
 		uid = BigBuf_malloc(10);
-		if (uid == NULL ) {
-			if (MF_DBGLEVEL >= 3) Dbprintf("ChkKeys: uid malloc failed");
+		if (uid == NULL )
 			goto OUT;
-		}
 	}
+
+	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
 	
 	LEDsoff();
 	LED_A_ON();
 		
 	if ( firstchunk ) {
-		
+							
 		clear_trace();
 		set_tracing(false);
 		
 		memset(k_sector, 0x00, 480+10);
 		memset(found, 0x00, sizeof(found));
 		foundkeys = 0;		
-	
+			
 		iso14a_card_select_t card_info;		
 		if ( !iso14443a_select_card(uid, &card_info, &cuid, true, 0, true)) {
-			if (MF_DBGLEVEL >= 1) Dbprintf("ChkKeys: Can't select card (ALL)");
+			if (MF_DBGLEVEL >= 1) Dbprintf("ChkKeys_fast: Can't select card (ALL)");
 			goto OUT;
 		}
+		
 		switch (card_info.uidlen) {
 			case 4 : cascade_levels = 1; break;
 			case 7 : cascade_levels = 2; break;
@@ -1262,19 +1291,23 @@ void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *da
 	chk_data.block = 0;	
 	
 	// keychunk loop - depth first one sector.
-	if ( strategy == 1 ) {
+	if ( strategy == 1 || use_flashmem) {
 
 		uint8_t newfound = foundkeys;
 
+		uint16_t lastpos = 0;
+		uint16_t s_point = 0;
 		// Sector main loop
 		// keep track of how many sectors on card.
 		for (uint8_t s = 0; s < sectorcnt; ++s) {
 
-			if ( found[(s*2)] && found[(s*2)+1] )  
+			if ( found[(s*2)] && found[(s*2)+1] )
 				continue;
 
-			for (uint8_t i = 0; i < keyCount; ++i) {
-
+			for (uint16_t i = s_point; i < keyCount; ++i) {
+						
+				//if ( i % 100 == 0) Dbprintf("ChkKeys_fast: sector %d | checking %d | %d found | s_point %d", s, i, foundkeys, s_point);
+			
 				// Allow button press / usb cmd to interrupt device
 				if (BUTTON_PRESS() && !usb_poll_validate_length()) {
 					goto OUT;
@@ -1292,8 +1325,6 @@ void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *da
 				// new key
 				chk_data.key = bytes_to_num(datain + i * 6, 6);
 
-				// assume: block0,1,2 has more read rights in accessbits than the sectortrailer. authenticating against block0 in each sector
-
 				// skip already found A keys 
 				if( !found[(s*2)] ) {
 					chk_data.keyType = 0;
@@ -1303,12 +1334,26 @@ void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *da
 						found[(s*2)] = 1;
 						++foundkeys;
 						
-						chkKey_scanA(&chk_data, k_sector, found, &sectorcnt, &foundkeys);
+						chkKey_scanA(&chk_data, k_sector, found, &sectorcnt, &foundkeys);				
 						
 						// read Block B, if A is found.
 						chkKey_loopBonly( &chk_data, k_sector, found, &sectorcnt, &foundkeys);
 						
+						chk_data.keyType = 1;
+						chkKey_scanB(&chk_data, k_sector, found, &sectorcnt, &foundkeys);
+						
+						chk_data.keyType = 0;						
 						chk_data.block = FirstBlockOfSector( s );
+						
+						if ( use_flashmem ) {
+							if ( lastpos != i && lastpos != 0) {							
+								if ( i - lastpos < 0xF) {
+									s_point = i & 0xFFF0;
+								}
+							} else {
+								lastpos = i;	
+							}
+						}
 					}
 				}
 				
@@ -1322,25 +1367,46 @@ void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *da
 						++foundkeys;
 						
 						chkKey_scanB(&chk_data, k_sector, found, &sectorcnt, &foundkeys);
+
+						if ( use_flashmem ) {						
+							if ( lastpos != i && lastpos != 0) {
+								
+								if ( i - lastpos < 0xF)
+									s_point = i & 0xFFF0;
+							} else {
+								lastpos = i;	
+							}
+						}
 					}
 				}
-
+				
+				if ( found[(s*2)] && found[(s*2)+1] )
+					break;
+				
 			} // end keys test loop - depth first 
 
 			// assume1. if no keys found in first sector, get next keychunk from client
-			if ( newfound-foundkeys  == 0 )
+			if ( !use_flashmem && (newfound-foundkeys == 0) )
 				goto OUT;
 
 		} // end loop - sector
 	} // end strategy 1
+	
+	if ( foundkeys == allkeys ) 
+		goto OUT;
 
-	if ( strategy == 2 ) {
+	if ( strategy == 2 || use_flashmem ) {
+			
 		// Keychunk loop
-		for (uint8_t i = 0; i < keyCount; i++) {
-
+		for (uint16_t i = 0; i < keyCount; i++) {
+					
 			// Allow button press / usb cmd to interrupt device
 			if (BUTTON_PRESS() && !usb_poll_validate_length()) break;
 
+			// found all keys?
+			if ( foundkeys == allkeys )
+				goto OUT;
+				
 			WDT_HIT();
 		
 			// new key
@@ -1349,7 +1415,9 @@ void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *da
 			// Sector main loop
 			// keep track of how many sectors on card.
 			for (uint8_t s = 0; s < sectorcnt; ++s) {
-
+				
+				if ( found[(s*2)] && found[(s*2)+1] ) continue;
+				
 				// found all keys?
 				if ( foundkeys == allkeys )
 					goto OUT;
@@ -1387,8 +1455,6 @@ void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *da
 						chkKey_scanB(&chk_data, k_sector, found, &sectorcnt, &foundkeys);
 					}
 				}
-
-
 			} // end loop sectors		
 		} // end loop keys	
 	} // end loop strategy 2
@@ -1416,7 +1482,7 @@ OUT:
 
 		set_tracing(false);		
 		FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-		BigBuf_free(); BigBuf_Clear_ext(false);			
+		BigBuf_free(); BigBuf_Clear_ext(false);
 	} else {
 		// partial/none keys found
 		cmd_send(CMD_ACK, foundkeys, 0, 0, 0, 0);
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 1bfbf10eb..33e1c6f66 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -170,7 +170,7 @@ int usage_hf14_chk(void){
 }
 int usage_hf14_chk_fast(void){
 	PrintAndLogEx(NORMAL, "This is a improved checkkeys method speedwise. It checks Mifare Classic tags sector keys against a dictionary file with keys");
-	PrintAndLogEx(NORMAL, "Usage:  hf mf fchk [h] <card memory> [t|d] [<key (12 hex symbols)>] [<dic (*.dic)>]");
+	PrintAndLogEx(NORMAL, "Usage:  hf mf fchk [h] <card memory> [t|d|f] [<key (12 hex symbols)>] [<dic (*.dic)>]");
 	PrintAndLogEx(NORMAL, "Options:");
 	PrintAndLogEx(NORMAL, "      h    this help");	
 	PrintAndLogEx(NORMAL, "      <cardmem> all sectors based on card memory, other values than below defaults to 1k");
@@ -179,12 +179,16 @@ int usage_hf14_chk_fast(void){
 	PrintAndLogEx(NORMAL, "      			 2 - 2K");
 	PrintAndLogEx(NORMAL, "      			 4 - 4K");
 	PrintAndLogEx(NORMAL, "      d    write keys to binary file");
-	PrintAndLogEx(NORMAL, "      t    write keys to emulator memory\n");
+	PrintAndLogEx(NORMAL, "      t    write keys to emulator memory");
+	PrintAndLogEx(NORMAL, "      m    use dictionary from flashmemory\n");
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Examples:");
 	PrintAndLogEx(NORMAL, "      hf mf fchk 1 1234567890ab keys.dic    -- target 1K using key 1234567890ab, using dictionary file");
 	PrintAndLogEx(NORMAL, "      hf mf fchk 1 t                        -- target 1K, write to emulator memory");
 	PrintAndLogEx(NORMAL, "      hf mf fchk 1 d                        -- target 1K, write to file");
+#ifdef WITH_FLASH
+	PrintAndLogEx(NORMAL, "      hf mf fchk 1 m                        -- target 1K, use dictionary from flashmemory");
+#endif
 	return 0;
 }
 int usage_hf14_keybrute(void){
@@ -1136,7 +1140,7 @@ int CmdHF14AMfNested(const char *Cmd) {
 		}
 
 		PrintAndLogEx(SUCCESS, "Testing known keys. Sector count=%d", SectorsCnt);
-		res = mfCheckKeys_fast( SectorsCnt, true, true, 1, MIFARE_DEFAULTKEYS_SIZE + 1, keyBlock, e_sector);
+		res = mfCheckKeys_fast( SectorsCnt, true, true, 1, MIFARE_DEFAULTKEYS_SIZE + 1, keyBlock, e_sector, false);
 				
 		uint64_t t2 = msclock() - t1;
 		PrintAndLogEx(SUCCESS, "Time to check %d known keys: %.0f seconds\n", MIFARE_DEFAULTKEYS_SIZE, (float)t2/1000.0 );
@@ -1167,7 +1171,7 @@ int CmdHF14AMfNested(const char *Cmd) {
 							e_sector[sectorNo].foundKey[trgKeyType] = 1;
 							e_sector[sectorNo].Key[trgKeyType] = bytes_to_num(keyBlock, 6);
 
-							res = mfCheckKeys_fast( SectorsCnt, true, true, 2, 1, keyBlock, e_sector);
+							res = mfCheckKeys_fast( SectorsCnt, true, true, 2, 1, keyBlock, e_sector, false);
 							continue;
 							
 						default : PrintAndLogEx(WARNING, "unknown Error.\n");
@@ -1467,8 +1471,8 @@ void shuffle( uint8_t *array, uint16_t len) {
 int CmdHF14AMfChk_fast(const char *Cmd) {
 
 	char ctmp = 0x00;
-	ctmp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) < 1 || ctmp == 'h' || ctmp == 'H') return usage_hf14_chk_fast();
+	ctmp = tolower(param_getchar(Cmd, 0));
+	if (strlen(Cmd) < 1 || ctmp == 'h') return usage_hf14_chk_fast();
 
 	FILE * f;
 	char filename[FILE_PATH_SIZE]={0};
@@ -1481,6 +1485,7 @@ int CmdHF14AMfChk_fast(const char *Cmd) {
 	int clen = 0;
 	int transferToEml = 0, createDumpFile = 0;
 	uint32_t keyitems = MIFARE_DEFAULTKEYS_SIZE;
+	bool use_flashmemory = false;
 
 	sector_t *e_sector = NULL;
 	
@@ -1501,7 +1506,7 @@ int CmdHF14AMfChk_fast(const char *Cmd) {
 
 	for (i = 1; param_getchar(Cmd, i); i++) {
 		
-		ctmp = param_getchar(Cmd, i);
+		ctmp = tolower(param_getchar(Cmd, i));
 		clen = param_getlength(Cmd, i);
 		
 		if (clen == 12) {
@@ -1523,8 +1528,11 @@ int CmdHF14AMfChk_fast(const char *Cmd) {
 			PrintAndLogEx(NORMAL, "[%2d] key %s", keycnt, sprint_hex( (keyBlock + 6*keycnt), 6 ) );
 			keycnt++;
 		} else if ( clen == 1) {
-			if (ctmp == 't' || ctmp == 'T') { transferToEml = 1; continue; }
-			if (ctmp == 'd' || ctmp == 'D') { createDumpFile = 1; continue; }
+			if (ctmp == 't' ) { transferToEml = 1; continue; }
+			if (ctmp == 'd' ) { createDumpFile = 1; continue; }
+#ifdef WITH_FLASH			
+			if (ctmp == 'm' ) { use_flashmemory = true; continue; }
+#endif			
 		} else {
 			// May be a dic file
 			if ( param_getstr(Cmd, i, filename, FILE_PATH_SIZE) >= FILE_PATH_SIZE ) {
@@ -1574,7 +1582,7 @@ int CmdHF14AMfChk_fast(const char *Cmd) {
 		}
 	}
 		
-	if (keycnt == 0) {
+	if (keycnt == 0 && !use_flashmemory) {
 		PrintAndLogEx(SUCCESS, "No key specified, trying default keys");
 		for (;keycnt < MIFARE_DEFAULTKEYS_SIZE; keycnt++)
 			PrintAndLogEx(NORMAL, "[%2d] %02x%02x%02x%02x%02x%02x", keycnt,
@@ -1594,37 +1602,45 @@ int CmdHF14AMfChk_fast(const char *Cmd) {
 	
 	// time
 	uint64_t t1 = msclock();
-	
-	// strategys. 1= deep first on sector 0 AB,  2= width first on all sectors
-	for (uint8_t strategy = 1; strategy < 3; strategy++) {
-		PrintAndLogEx(SUCCESS, "Running strategy %u", strategy);
-		// main keychunk loop			
-		for (uint32_t i = 0; i < keycnt; i += chunksize) {
-			
-			if (ukbhit()) {
-				int gc = getchar(); (void)gc;
-				PrintAndLogEx(NORMAL, "\naborted via keyboard!\n");
-				goto out;
-			}
-			
-			uint32_t size = ((keycnt - i)  > chunksize) ? chunksize : keycnt - i;
-			
-			// last chunk?
-			if ( size == keycnt - i)
-				lastChunk = true;
-			
-			int res = mfCheckKeys_fast( sectorsCnt, firstChunk, lastChunk, strategy, size, keyBlock + (i * 6), e_sector);
 
-			if ( firstChunk )
-				firstChunk = false;
-						
-			// all keys,  aborted
-			if ( res == 0 || res == 2 )
-				goto out;
-		} // end chunks of keys
-		firstChunk = true;
-		lastChunk = false;
-	} // end strategy
+	if ( use_flashmemory ) {
+		 mfCheckKeys_fast( sectorsCnt, true, true, 1, 0, keyBlock, e_sector, use_flashmemory);
+	} else {
+	
+		// strategys. 1= deep first on sector 0 AB,  2= width first on all sectors
+		for (uint8_t strategy = 1; strategy < 3; strategy++) {
+			PrintAndLogEx(SUCCESS, "Running strategy %u", strategy);
+			
+
+				
+				// main keychunk loop			
+				for (uint32_t i = 0; i < keycnt; i += chunksize) {
+					
+					if (ukbhit()) {
+						int gc = getchar(); (void)gc;
+						PrintAndLogEx(NORMAL, "\naborted via keyboard!\n");
+						goto out;
+					}
+					
+					uint32_t size = ((keycnt - i)  > chunksize) ? chunksize : keycnt - i;
+					
+					// last chunk?
+					if ( size == keycnt - i)
+						lastChunk = true;
+					
+					int res = mfCheckKeys_fast( sectorsCnt, firstChunk, lastChunk, strategy, size, keyBlock + (i * 6), e_sector, false);
+
+					if ( firstChunk )
+						firstChunk = false;
+								
+					// all keys,  aborted
+					if ( res == 0 || res == 2 )
+						goto out;
+				} // end chunks of keys
+			firstChunk = true;
+			lastChunk = false;
+		} // end strategy
+	}
 out: 
 	t1 = msclock() - t1;
 	PrintAndLogEx(SUCCESS, "Time in checkkeys (fast):  %.1fs\n", (float)(t1/1000.0));
diff --git a/client/mifarehost.c b/client/mifarehost.c
index fe2495938..2859fc207 100644
--- a/client/mifarehost.c
+++ b/client/mifarehost.c
@@ -138,13 +138,13 @@ int mfCheckKeys(uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t keyc
 // 1 == 
 // 2 == Time-out, aborting
 int mfCheckKeys_fast( uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk, uint8_t strategy,
-						uint32_t size, uint8_t *keyBlock, sector_t *e_sector) {
+						uint32_t size, uint8_t *keyBlock, sector_t *e_sector, bool use_flashmemory) {
 
 	uint64_t t2 = msclock();
 	uint32_t timeout = 0;
 
 	// send keychunk		
-	UsbCommand c = {CMD_MIFARE_CHKKEYS_FAST, { (sectorsCnt | (firstChunk << 8) | (lastChunk << 12) ), strategy, size}};	
+	UsbCommand c = {CMD_MIFARE_CHKKEYS_FAST, { (sectorsCnt | (firstChunk << 8) | (lastChunk << 12) ), ((use_flashmemory << 8) | strategy), size}};	
 	memcpy(c.d.asBytes, keyBlock, 6 * size);
 	clearCommandBuffer();
 	SendCommand(&c);
diff --git a/client/mifarehost.h b/client/mifarehost.h
index 65500ded8..8f0f3f3bf 100644
--- a/client/mifarehost.h
+++ b/client/mifarehost.h
@@ -73,7 +73,7 @@ extern int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key);
 extern int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t * ResultKeys, bool calibrate);
 extern int mfCheckKeys (uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t keycnt, uint8_t * keyBlock, uint64_t * key);
 extern int mfCheckKeys_fast( uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk,
-						uint8_t strategy, uint32_t size, uint8_t *keyBlock, sector_t *e_sector);
+						uint8_t strategy, uint32_t size, uint8_t *keyBlock, sector_t *e_sector, bool use_flashmemory);
 extern int mfKeyBrute(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint64_t *resultkey);
 
 

From e3f4ef498fcf30d904f46e984cf4f2c077dd6cfe Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 2 Jan 2019 12:11:49 +0100
Subject: [PATCH 0364/1938] CHG: 'hf mf fchk' - textual

---
 client/cmdhfmf.c           | 5 ++---
 client/mifarehost.c        | 2 +-
 client/scripts/calypso.lua | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 33e1c6f66..d92b2a1d4 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -1604,15 +1604,14 @@ int CmdHF14AMfChk_fast(const char *Cmd) {
 	uint64_t t1 = msclock();
 
 	if ( use_flashmemory ) {
-		 mfCheckKeys_fast( sectorsCnt, true, true, 1, 0, keyBlock, e_sector, use_flashmemory);
+		PrintAndLogEx(SUCCESS, "Using dictionary in flash memory");
+		mfCheckKeys_fast( sectorsCnt, true, true, 1, 0, keyBlock, e_sector, use_flashmemory);
 	} else {
 	
 		// strategys. 1= deep first on sector 0 AB,  2= width first on all sectors
 		for (uint8_t strategy = 1; strategy < 3; strategy++) {
 			PrintAndLogEx(SUCCESS, "Running strategy %u", strategy);
-			
 
-				
 				// main keychunk loop			
 				for (uint32_t i = 0; i < keycnt; i += chunksize) {
 					
diff --git a/client/mifarehost.c b/client/mifarehost.c
index 2859fc207..0f37f8a8b 100644
--- a/client/mifarehost.c
+++ b/client/mifarehost.c
@@ -166,7 +166,7 @@ int mfCheckKeys_fast( uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk,
 	// time to convert the returned data.
 	uint8_t curr_keys = resp.arg[0];
 
-	PrintAndLogEx(NORMAL, "\n[-] Chunk: %.1fs | found %u/%u keys (%u)", (float)(t2/1000.0), curr_keys, (sectorsCnt<<1), size);
+	PrintAndLogEx(SUCCESS, "\nChunk: %.1fs | found %u/%u keys (%u)", (float)(t2/1000.0), curr_keys, (sectorsCnt<<1), size);
 		
 	// all keys?		
 	if ( curr_keys == sectorsCnt*2 || lastChunk ) {
diff --git a/client/scripts/calypso.lua b/client/scripts/calypso.lua
index ad74c8183..ce90a25fd 100644
--- a/client/scripts/calypso.lua
+++ b/client/scripts/calypso.lua
@@ -68,9 +68,9 @@ end
 --- 
 -- This is only meant to be used when errors occur
 local function oops(err)
-	print("ERROR: ",err)
+	print("ERROR: ", err)
 	calypso_switch_off_field()
-	return nil,err
+	return nil, err
 end
 --- 
 -- Usage help

From 0da07fe81c2495125a224eddf339a9c522319467 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 2 Jan 2019 19:31:06 +0200
Subject: [PATCH 0365/1938] get SFI records

---
 client/emv/emvcore.c | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/client/emv/emvcore.c b/client/emv/emvcore.c
index b582792ac..8b774eaf0 100644
--- a/client/emv/emvcore.c
+++ b/client/emv/emvcore.c
@@ -335,6 +335,8 @@ int EMVSelectPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldO
 int EMVSearchPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, uint8_t PSENum, bool decodeTLV, struct tlvdb *tlv) {
 	uint8_t data[APDU_RES_LEN] = {0};
 	size_t datalen = 0;
+	uint8_t sfidata[APDU_RES_LEN] = {0};
+	size_t sfidatalen = 0;
 	uint16_t sw = 0;
 	int res;
 
@@ -342,9 +344,47 @@ int EMVSearchPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldO
 	res = EMVSelectPSE(channel, ActivateField, true, PSENum, data, sizeof(data), &datalen, &sw);
 
 	if (!res){
+		if (sw != 0x9000) {
+			PrintAndLogEx(FAILED, "Select PSE error. APDU error: %04x.", sw);
+			return 1;
+		}
+		
 		struct tlvdb *t = NULL;
 		t = tlvdb_parse_multi(data, datalen);
 		if (t) {
+			struct tlvdb *tsfi = tlvdb_find_path(t, (tlv_tag_t[]){0x6f, 0xa5, 0x88, 0x00});
+			if (tsfi) {
+				const struct tlv *tsfi_tlv = tlvdb_get_tlv(tsfi);
+				uint8_t sfin = tsfi_tlv->value[0];
+				PrintAndLogEx(INFO, "* PPSE get SFI: 0x%02x.", sfin);
+				
+				for (uint8_t ui = 0x01; ui <= 0x10; ui++) {
+					PrintAndLogEx(INFO, "* * Get SFI: 0x%02x. num: 0x%02x", sfin, ui);
+					res = EMVReadRecord(channel, true, sfin, ui, sfidata, sizeof(sfidata), &sfidatalen, &sw, NULL);
+					
+					// end of records
+					if (sw == 0x6a83) {
+						PrintAndLogEx(INFO, "* * PPSE get SFI. End of records.");
+						break;
+					}
+					
+					// here must bee an error catch!
+					if (sw != 0x9000) {
+						PrintAndLogEx(FAILED, "PPSE get Error. APDU error: %04x.", sw);
+						break;
+					}
+
+					if (decodeTLV){
+						TLVPrintFromBuffer(sfidata, sfidatalen);
+					}
+					
+				}
+				
+				
+			}
+
+
+
 			int retrycnt = 0;
 			struct tlvdb *ttmp = tlvdb_find_path(t, (tlv_tag_t[]){0x6f, 0xa5, 0xbf0c, 0x61, 0x00});
 			if (!ttmp)

From a5f8454168600d638354ccbe19ff75f599060777 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Thu, 3 Jan 2019 13:41:28 +0200
Subject: [PATCH 0366/1938] added pse sfi files get

---
 client/emv/emvcore.c | 84 +++++++++++++++++++++++++++++++-------------
 1 file changed, 60 insertions(+), 24 deletions(-)

diff --git a/client/emv/emvcore.c b/client/emv/emvcore.c
index 8b774eaf0..bc2fa1a1a 100644
--- a/client/emv/emvcore.c
+++ b/client/emv/emvcore.c
@@ -332,11 +332,38 @@ int EMVSelectPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldO
 	return res;
 }
 
+int EMVSelectWithRetry(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, uint8_t *AID, size_t AIDLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
+	int retrycnt = 0;
+	int res = 0;
+	do {
+		res = EMVSelect(channel, false, true, AID, AIDLen, Result, MaxResultLen, ResultLen, sw, tlv);
+
+		// retry if error and not returned sw error
+		if (res && res != 5) {
+			if (++retrycnt < 3){
+				continue;
+			} else {
+				// card select error, proxmark error
+				if (res == 1) {
+					PrintAndLogEx(WARNING, "Exit...");
+					return 1;
+				}
+				
+				retrycnt = 0;
+				PrintAndLogEx(NORMAL, "Retry failed [%s]. Skiped...", sprint_hex_inrow(AID, AIDLen));
+				return res;
+			}	
+		}
+	} while (res && res != 5);
+
+	return res;
+}
+
 int EMVSearchPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, uint8_t PSENum, bool decodeTLV, struct tlvdb *tlv) {
 	uint8_t data[APDU_RES_LEN] = {0};
 	size_t datalen = 0;
-	uint8_t sfidata[APDU_RES_LEN] = {0};
-	size_t sfidatalen = 0;
+	uint8_t sfidata[0x11][APDU_RES_LEN] = {0};
+	size_t sfidatalen[0x11] = {0};
 	uint16_t sw = 0;
 	int res;
 
@@ -360,24 +387,45 @@ int EMVSearchPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldO
 				
 				for (uint8_t ui = 0x01; ui <= 0x10; ui++) {
 					PrintAndLogEx(INFO, "* * Get SFI: 0x%02x. num: 0x%02x", sfin, ui);
-					res = EMVReadRecord(channel, true, sfin, ui, sfidata, sizeof(sfidata), &sfidatalen, &sw, NULL);
+					res = EMVReadRecord(channel, true, sfin, ui, sfidata[ui], APDU_RES_LEN, &sfidatalen[ui], &sw, NULL);
 					
 					// end of records
 					if (sw == 0x6a83) {
+						sfidatalen[ui] = 0;
 						PrintAndLogEx(INFO, "* * PPSE get SFI. End of records.");
 						break;
 					}
 					
-					// here must bee an error catch!
+					// error catch!
 					if (sw != 0x9000) {
+						sfidatalen[ui] = 0;
 						PrintAndLogEx(FAILED, "PPSE get Error. APDU error: %04x.", sw);
 						break;
 					}
 
 					if (decodeTLV){
-						TLVPrintFromBuffer(sfidata, sfidatalen);
+						TLVPrintFromBuffer(sfidata[ui], sfidatalen[ui]);
+					}
+				}
+
+				for (uint8_t ui = 0x01; ui <= 0x10; ui++) {
+					if (sfidatalen[ui]) {
+						struct tlvdb *tsfi = NULL;
+						tsfi = tlvdb_parse_multi(sfidata[ui], sfidatalen[ui]);
+						if (tsfi) {
+							struct tlvdb *tsfitmp = tlvdb_find_path(tsfi, (tlv_tag_t[]){0x70, 0x61, 0x00});
+							if (!tsfitmp) {
+								PrintAndLogEx(FAILED, "SFI 0x%02d don't have records.", sfidatalen[ui]);
+								continue;
+							}
+							
+							// todo: check
+							PrintAndLogEx(INFO, "OK SFI 0x%02d.", sfidatalen[ui]);
+							
+							
+						}
+						tlvdb_free(tsfi);
 					}
-					
 				}
 				
 				
@@ -385,7 +433,6 @@ int EMVSearchPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldO
 
 
 
-			int retrycnt = 0;
 			struct tlvdb *ttmp = tlvdb_find_path(t, (tlv_tag_t[]){0x6f, 0xa5, 0xbf0c, 0x61, 0x00});
 			if (!ttmp)
 				PrintAndLogEx(FAILED, "PPSE don't have records.");
@@ -393,28 +440,17 @@ int EMVSearchPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldO
 			while (ttmp) {
 				const struct tlv *tgAID = tlvdb_get_inchild(ttmp, 0x4f, NULL);
 				if (tgAID) {
-					res = EMVSelect(channel, false, true, (uint8_t *)tgAID->value, tgAID->len, data, sizeof(data), &datalen, &sw, tlv);
+					res = EMVSelectWithRetry(channel, false, true, (uint8_t *)tgAID->value, tgAID->len, data, sizeof(data), &datalen, &sw, tlv);
 
-					// retry if error and not returned sw error
-					if (res && res != 5) {
-						if (++retrycnt < 3){
-							continue;
-						} else {
-							// card select error, proxmark error
-							if (res == 1) {
-								PrintAndLogEx(WARNING, "Exit...");
-								return 1;
-							}
-							
-							retrycnt = 0;
-							PrintAndLogEx(NORMAL, "Retry failed [%s]. Skiped...", sprint_hex_inrow(tgAID->value, tgAID->len));
-						}
-						
+					// if returned sw error
+					if (res == 5) {
 						// next element
 						ttmp = tlvdb_find_next(ttmp, 0x61);
 						continue;
 					}
-					retrycnt = 0;
+					
+					if (res)
+						break;
 
 					// all is ok
 					if (decodeTLV){

From 723298d00cb2628e3f70375e489c7acb5ba59d12 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Thu, 3 Jan 2019 19:42:40 +0200
Subject: [PATCH 0367/1938] added new tlv function

---
 client/emv/tlv.c | 38 ++++++++++++++++++++++++++++++++++++++
 client/emv/tlv.h |  3 +++
 2 files changed, 41 insertions(+)

diff --git a/client/emv/tlv.c b/client/emv/tlv.c
index 35bdb5d4c..a41d98c95 100644
--- a/client/emv/tlv.c
+++ b/client/emv/tlv.c
@@ -25,6 +25,7 @@
 #include <stdint.h>
 #include <stddef.h>
 #include <stdlib.h>
+#include <math.h>
 
 #define TLV_TAG_CLASS_MASK	0xc0
 #define TLV_TAG_COMPLEX		0x20
@@ -534,3 +535,40 @@ struct tlvdb *tlvdb_elm_get_parent(struct tlvdb *tlvdb)
 {
 	return tlvdb->parent;
 }
+
+bool tlv_get_uint8(const struct tlv *etlv, uint8_t *value) 
+{
+	*value = 0;
+	if (etlv)
+	{
+		if (etlv->len == 0)
+			return true;
+		
+		if (etlv->len == 1)
+		{
+			*value = etlv->value[0];
+			return true;
+		}
+	}
+	return false;
+}
+
+bool tlv_get_int(const struct tlv *etlv, int *value)
+{
+	*value = 0;
+	if (etlv)
+	{
+		if (etlv->len == 0)
+			return true;
+		
+		if (etlv->len <= 4)
+		{
+			for (int i = 0; i < etlv->len; i++)
+			{
+				*value += etlv->value[i] * pow(0x100, i);
+			}
+			return true;
+		}
+	}
+	return false;
+}
diff --git a/client/emv/tlv.h b/client/emv/tlv.h
index b25b51de2..e3c7c97fa 100644
--- a/client/emv/tlv.h
+++ b/client/emv/tlv.h
@@ -61,4 +61,7 @@ unsigned char *tlv_encode(const struct tlv *tlv, size_t *len);
 bool tlv_is_constructed(const struct tlv *tlv);
 bool tlv_equal(const struct tlv *a, const struct tlv *b);
 
+bool tlv_get_uint8(const struct tlv *etlv, uint8_t *value);
+bool tlv_get_int(const struct tlv *etlv, int *value);
+
 #endif

From 00d4393af49a5d9a283ae53eaf40545e124adb7e Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Thu, 3 Jan 2019 19:43:01 +0200
Subject: [PATCH 0368/1938] tlv_get_uint8

---
 client/emv/emvcore.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/emv/emvcore.c b/client/emv/emvcore.c
index bc2fa1a1a..80affb6c1 100644
--- a/client/emv/emvcore.c
+++ b/client/emv/emvcore.c
@@ -381,8 +381,8 @@ int EMVSearchPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldO
 		if (t) {
 			struct tlvdb *tsfi = tlvdb_find_path(t, (tlv_tag_t[]){0x6f, 0xa5, 0x88, 0x00});
 			if (tsfi) {
-				const struct tlv *tsfi_tlv = tlvdb_get_tlv(tsfi);
-				uint8_t sfin = tsfi_tlv->value[0];
+				uint8_t sfin = 0;
+				tlv_get_uint8(tlvdb_get_tlv(tsfi), &sfin);
 				PrintAndLogEx(INFO, "* PPSE get SFI: 0x%02x.", sfin);
 				
 				for (uint8_t ui = 0x01; ui <= 0x10; ui++) {

From b5c2ccb78f62d6eb5a5c87aa8c8a61810d514d75 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Thu, 3 Jan 2019 20:07:08 +0200
Subject: [PATCH 0369/1938] pse/ppse works

---
 client/emv/emvcore.c | 77 +++++++++++++++++++++++++-------------------
 1 file changed, 43 insertions(+), 34 deletions(-)

diff --git a/client/emv/emvcore.c b/client/emv/emvcore.c
index 80affb6c1..47705cc60 100644
--- a/client/emv/emvcore.c
+++ b/client/emv/emvcore.c
@@ -359,6 +359,38 @@ int EMVSelectWithRetry(EMVCommandChannel channel, bool ActivateField, bool Leave
 	return res;
 }
 
+int EMVCheckAID(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlvdbelm, struct tlvdb *tlv){
+	uint8_t data[APDU_RES_LEN] = {0};
+	size_t datalen = 0;
+	int res = 0;
+	uint16_t sw = 0;
+
+	while (tlvdbelm) {
+		const struct tlv *tgAID = tlvdb_get_inchild(tlvdbelm, 0x4f, NULL);
+		if (tgAID) {
+			res = EMVSelectWithRetry(channel, false, true, (uint8_t *)tgAID->value, tgAID->len, data, sizeof(data), &datalen, &sw, tlv);
+
+			// if returned sw error
+			if (res == 5) {
+				// next element
+				tlvdbelm = tlvdb_find_next(tlvdbelm, 0x61);
+				continue;
+			}
+			
+			if (res)
+				break;
+
+			// all is ok
+			if (decodeTLV){
+				PrintAndLogEx(NORMAL, "%s:", sprint_hex_inrow(tgAID->value, tgAID->len));
+				TLVPrintFromBuffer(data, datalen);
+			}
+		}
+		tlvdbelm = tlvdb_find_next(tlvdbelm, 0x61);
+	}
+	return res;
+}
+
 int EMVSearchPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, uint8_t PSENum, bool decodeTLV, struct tlvdb *tlv) {
 	uint8_t data[APDU_RES_LEN] = {0};
 	size_t datalen = 0;
@@ -366,6 +398,7 @@ int EMVSearchPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldO
 	size_t sfidatalen[0x11] = {0};
 	uint16_t sw = 0;
 	int res;
+	bool fileFound = false;
 
 	// select PPSE
 	res = EMVSelectPSE(channel, ActivateField, true, PSENum, data, sizeof(data), &datalen, &sw);
@@ -379,6 +412,7 @@ int EMVSearchPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldO
 		struct tlvdb *t = NULL;
 		t = tlvdb_parse_multi(data, datalen);
 		if (t) {
+			// PSE/PPSE with SFI
 			struct tlvdb *tsfi = tlvdb_find_path(t, (tlv_tag_t[]){0x6f, 0xa5, 0x88, 0x00});
 			if (tsfi) {
 				uint8_t sfin = 0;
@@ -418,49 +452,24 @@ int EMVSearchPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldO
 								PrintAndLogEx(FAILED, "SFI 0x%02d don't have records.", sfidatalen[ui]);
 								continue;
 							}
-							
-							// todo: check
-							PrintAndLogEx(INFO, "OK SFI 0x%02d.", sfidatalen[ui]);
-							
-							
+							res = EMVCheckAID(channel, decodeTLV, tsfitmp, tlv);							
+							fileFound = true;
 						}
 						tlvdb_free(tsfi);
 					}
 				}
-				
-				
 			}
 
 
-
+			// PSE/PPSE plain (wo SFI)
 			struct tlvdb *ttmp = tlvdb_find_path(t, (tlv_tag_t[]){0x6f, 0xa5, 0xbf0c, 0x61, 0x00});
-			if (!ttmp)
-				PrintAndLogEx(FAILED, "PPSE don't have records.");
-			
-			while (ttmp) {
-				const struct tlv *tgAID = tlvdb_get_inchild(ttmp, 0x4f, NULL);
-				if (tgAID) {
-					res = EMVSelectWithRetry(channel, false, true, (uint8_t *)tgAID->value, tgAID->len, data, sizeof(data), &datalen, &sw, tlv);
-
-					// if returned sw error
-					if (res == 5) {
-						// next element
-						ttmp = tlvdb_find_next(ttmp, 0x61);
-						continue;
-					}
-					
-					if (res)
-						break;
-
-					// all is ok
-					if (decodeTLV){
-						PrintAndLogEx(NORMAL, "%s:", sprint_hex_inrow(tgAID->value, tgAID->len));
-						TLVPrintFromBuffer(data, datalen);
-					}
-				}
-				
-				ttmp = tlvdb_find_next(ttmp, 0x61);
+			if (ttmp) {
+				res = EMVCheckAID(channel, decodeTLV, ttmp, tlv);
+				fileFound = true;
 			}
+			
+			if (!fileFound)
+				PrintAndLogEx(FAILED, "PPSE don't have records.");
 
 			tlvdb_free(t);
 		} else {

From a86c6fa1a8cf10dac8b8d4f4849f455e562e38af Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Thu, 3 Jan 2019 21:00:07 +0200
Subject: [PATCH 0370/1938] get rid of math.h )

---
 client/emv/tlv.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/client/emv/tlv.c b/client/emv/tlv.c
index a41d98c95..013e9735a 100644
--- a/client/emv/tlv.c
+++ b/client/emv/tlv.c
@@ -25,7 +25,6 @@
 #include <stdint.h>
 #include <stddef.h>
 #include <stdlib.h>
-#include <math.h>
 
 #define TLV_TAG_CLASS_MASK	0xc0
 #define TLV_TAG_COMPLEX		0x20
@@ -565,7 +564,7 @@ bool tlv_get_int(const struct tlv *etlv, int *value)
 		{
 			for (int i = 0; i < etlv->len; i++)
 			{
-				*value += etlv->value[i] * pow(0x100, i);
+				*value += etlv->value[i] * (1 << (i * 8));
 			}
 			return true;
 		}

From f23219f3b8d4dd16f88b8ffbfec8e8ea2d60c325 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 5 Jan 2019 20:45:02 +0100
Subject: [PATCH 0371/1938] FIX:  printing percentage char is now standard
 compliant (@fabled) see https://github.com/iceman1001/proxmark3/pull/272

---
 client/cmdhw.c | 2 +-
 client/ui.c    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/cmdhw.c b/client/cmdhw.c
index 49cb0025e..a93a940cc 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -74,7 +74,7 @@ static void lookupChipID(uint32_t iChipID, uint32_t mem_used) {
 	if ( mem_avail > 0 ) 
 		mem_left = (mem_avail * 1024) - mem_used;
 	
-	PrintAndLogEx(NORMAL, "  --= Nonvolatile Program Memory Size: %uK bytes, Used: %u bytes (%2.0f\%) Free: %u bytes (%2.0f\%)", 
+	PrintAndLogEx(NORMAL, "  --= Nonvolatile Program Memory Size: %uK bytes, Used: %u bytes (%2.0f%%) Free: %u bytes (%2.0f%%)", 
 				mem_avail, 
 				mem_used, 
 				mem_avail == 0 ? 0.0f : (float)mem_used/(mem_avail*1024)*100,
diff --git a/client/ui.c b/client/ui.c
index 3f7e2611f..868545833 100644
--- a/client/ui.c
+++ b/client/ui.c
@@ -41,7 +41,7 @@ void PrintAndLogOptions(char *str[][2], size_t size, size_t space) {
 		if (i < size-1)
 			strncat(buff, "\n", sizeof(buff)-strlen(buff) -1);
     }
-    PrintAndLogEx(NORMAL, buff);
+    PrintAndLogEx(NORMAL, "%s", buff);
 }
 void PrintAndLogEx(logLevel_t level, char *fmt, ...) {
 
@@ -85,7 +85,7 @@ void PrintAndLogEx(logLevel_t level, char *fmt, ...) {
 
 	// no prefixes for normal
 	if ( level == NORMAL ) {
-		PrintAndLog(buffer);
+		PrintAndLog("%s", buffer);
 		return;
 	}
 	
@@ -110,10 +110,10 @@ void PrintAndLogEx(logLevel_t level, char *fmt, ...) {
 			
 			token = strtok(NULL, delim);
 		}
-		PrintAndLog(buffer2);
+		PrintAndLog("%s", buffer2);
 	} else {
 		snprintf(buffer2, sizeof(buffer2), "%s%s", prefix, buffer);
-		PrintAndLog(buffer2);
+		PrintAndLog("%s", buffer2);
 	}
 }
 

From 411fad13de4717c17aca0af53d6eec39724b01b3 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 5 Jan 2019 20:49:46 +0100
Subject: [PATCH 0372/1938] updates

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 64377c383..622ff0f78 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,9 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [unreleased][unreleased]
+ - Add 'option to use flash memory to upload dictionary files' (RDV40) (@iceman)
+ - Fix 'printing percentage now standard compliant' (@fabled)
+ - Add 'emv roca' - command to test for ROCA vuln in public RSA modulus (@merlokk / @iceman)
  - Added TCP ports support (on linux) (@phcoder)
  - Added HF sniff standalone mode with optional storing of ULC/NTAG/ULEV1 authentication attempts (@bogiton)
  - Fix 'Lining up plot and control window' (@anticat)

From 38853b111f9b61be6f67e1cbd8eeee567cdba4ac Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 5 Jan 2019 20:59:00 +0100
Subject: [PATCH 0373/1938] FIX:  adding directives to reduce size on systems
 like Gentoo Hardned  (see https://github.com/iceman1001/proxmark3/issues/268)

---
 armsrc/Makefile  | 5 +++--
 bootrom/Makefile | 4 ++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/armsrc/Makefile b/armsrc/Makefile
index b69e724e0..76f3a0173 100644
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -122,8 +122,9 @@ APP_CFLAGS += $(ZLIB_CFLAGS)
 # zlib includes:
 APP_CFLAGS += -I../zlib
 
-# stdint.h provided locally until GCC 4.5 becomes C99 compliant
-APP_CFLAGS += -I.
+# stdint.h provided locally until GCC 4.5 becomes C99 compliant,
+# stack-protect , no-pie reduces size on Gentoo Hardened 8.2 gcc
+APP_CFLAGS += -I. -fno-stack-protector -fno-pie
 
 # Compile these in thumb mode (small size)
 THUMBSRC = start.c \
diff --git a/bootrom/Makefile b/bootrom/Makefile
index a579c46d3..c7e879bda 100644
--- a/bootrom/Makefile
+++ b/bootrom/Makefile
@@ -25,6 +25,10 @@ VERSIONSRC = version.c
 # stdint.h provided locally until GCC 4.5 becomes C99 compliant
 APP_CFLAGS = -I. -fno-strict-aliasing -ffunction-sections -fdata-sections
 
+# stack-protect , no-pie reduces size on Gentoo Hardened 8.2 gcc
+APP_CFLAGS += -fno-stack-protector -fno-pie
+
+
 # Do not move this inclusion before the definition of {THUMB,ASM,ARM}SRC
 include ../common/Makefile.common
 

From f99e6a5cae4916166b53109b4b9baea4a119138b Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 6 Jan 2019 19:19:30 +0100
Subject: [PATCH 0374/1938] chg: remove warning

---
 client/emv/emvcore.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/emv/emvcore.c b/client/emv/emvcore.c
index 47705cc60..621287031 100644
--- a/client/emv/emvcore.c
+++ b/client/emv/emvcore.c
@@ -394,7 +394,7 @@ int EMVCheckAID(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlvdbel
 int EMVSearchPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, uint8_t PSENum, bool decodeTLV, struct tlvdb *tlv) {
 	uint8_t data[APDU_RES_LEN] = {0};
 	size_t datalen = 0;
-	uint8_t sfidata[0x11][APDU_RES_LEN] = {0};
+	uint8_t sfidata[0x11][APDU_RES_LEN];
 	size_t sfidatalen[0x11] = {0};
 	uint16_t sw = 0;
 	int res;

From 806e5909a73124e7c2db8ce4895fc80e941a7720 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 6 Jan 2019 19:41:29 +0100
Subject: [PATCH 0375/1938] ADD:  'hf felica list' - updated annotation.

---
 client/cmdhffelica.c |   2 +-
 client/cmdhflist.c   |  41 +++++++++++
 common/protocols.h   | 169 ++++++++++++++++++++++---------------------
 3 files changed, 128 insertions(+), 84 deletions(-)

diff --git a/client/cmdhffelica.c b/client/cmdhffelica.c
index e8eeceb5e..700f7ae8b 100644
--- a/client/cmdhffelica.c
+++ b/client/cmdhffelica.c
@@ -66,7 +66,7 @@ int usage_hf_felica_raw(void){
 
 int CmdHFFelicaList(const char *Cmd) {
 	//PrintAndLogEx(NORMAL, "Deprecated command, use 'hf list felica' instead");
-	CmdTraceList("raw");
+	CmdTraceList("felica");
 	return 0;
 }
 
diff --git a/client/cmdhflist.c b/client/cmdhflist.c
index 14dcc6039..e4a7e27b4 100644
--- a/client/cmdhflist.c
+++ b/client/cmdhflist.c
@@ -535,7 +535,48 @@ void annotateLegic(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
 }
 
 void annotateFelica(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){	
+
 	switch(cmd[0]){
+		case FELICA_POLL_REQ: snprintf(exp,size ,"POLLING");break;
+		case FELICA_POLL_ACK: snprintf(exp,size ,"POLL ACK");break;
+		case FELICA_REQSRV_REQ: snprintf(exp,size ,"REQUEST SERVICE");break;
+		case FELICA_REQSRV_ACK: snprintf(exp,size ,"REQ SERV ACK");break;
+		case FELICA_REQRESP_REQ: snprintf(exp,size ,"REQUEST RESPONSE");break;
+		case FELICA_REQRESP_ACK: snprintf(exp,size ,"REQ RESP ACK");break;
+		case FELICA_RDBLK_REQ: snprintf(exp,size ,"READ BLK");break;
+		case FELICA_RDBLK_ACK: snprintf(exp,size ,"READ BLK ACK");break;
+		case FELICA_WRTBLK_REQ:	snprintf(exp,size ,"WRITE BLK");break;
+		case FELICA_WRTBLK_ACK: snprintf(exp,size ,"WRITE BLK ACK");break;		
+		case FELICA_SRCHSYSCODE_REQ: snprintf(exp,size ,"SEARCH SERVICE CODE");break;
+		case FELICA_SRCHSYSCODE_ACK: snprintf(exp,size ,"SSC ACK");break;
+		case FELICA_REQSYSCODE_REQ: snprintf(exp,size ,"REQUEST SYSTEM CODE");break;
+		case FELICA_REQSYSCODE_ACK: snprintf(exp,size ,"RSC ACK");break;
+		case FELICA_AUTH1_REQ: snprintf(exp,size ,"AUTH 1");break;
+		case FELICA_AUTH1_ACK: snprintf(exp,size ,"AUTH 1 ACK");break;
+		case FELICA_AUTH2_REQ: snprintf(exp,size ,"AUTH 2");break;
+		case FELICA_AUTH2_ACK: snprintf(exp,size ,"AUTH 2 ACK");break;		
+		case FELICA_RDSEC_REQ: snprintf(exp,size ,"READ");break;
+		case FELICA_RDSEC_ACK: snprintf(exp,size ,"READ ACK");break;
+		case FELICA_WRTSEC_REQ: snprintf(exp,size ,"WRITE");break;
+		case FELICA_WRTSEC_ACK: snprintf(exp,size ,"WRITE ACK");break;	
+		case FELICA_REQSRV2_REQ: snprintf(exp,size ,"REQUEST SERVICE v2");break;
+		case FELICA_REQSRV2_ACK: snprintf(exp,size ,"REQ SERV v2 ACK");break;
+		case FELICA_GETSTATUS_REQ: snprintf(exp,size ,"GET STATUS");break;
+		case FELICA_GETSTATUS_ACK: snprintf(exp,size ,"GET STATUS ACK");break;
+		case FELICA_OSVER_REQ: snprintf(exp,size ,"REQUEST SPECIFIC VERSION");break;
+		case FELICA_OSVER_ACK: snprintf(exp,size ,"RSV ACK");break;
+		case FELICA_RESET_MODE_REQ: snprintf(exp,size ,"RESET MODE");break;
+		case FELICA_RESET_MODE_ACK: snprintf(exp,size ,"RESET MODE ACK");break;		
+		case FELICA_AUTH1V2_REQ: snprintf(exp,size ,"AUTH 1 v2");break;
+		case FELICA_AUTH1V2_ACK: snprintf(exp,size ,"AUTH 1 v2 ACK");break;
+		case FELICA_AUTH2V2_REQ: snprintf(exp,size ,"AUTH 2 v2");break;
+		case FELICA_AUTH2V2_ACK: snprintf(exp,size ,"AUTH 2 v2 ACK");break;		
+		case FELICA_RDSECV2_REQ: snprintf(exp,size ,"READ v2");break;
+		case FELICA_RDSECV2_ACK: snprintf(exp,size ,"READ v2 ACK");break;
+		case FELICA_WRTSECV2_REQ: snprintf(exp,size ,"WRITE v2");break;
+		case FELICA_WRTSECV2_ACK: snprintf(exp,size ,"WRITE v2 ACK");break;		
+		case FELICA_UPDATE_RNDID_REQ: snprintf(exp,size ,"UPDATE RANDOM ID");break;
+		case FELICA_UPDATE_RNDID_ACK: snprintf(exp,size ,"URI ACK");break;		
 		default                     : snprintf(exp,size ,"?");break;
 	}
 }
diff --git a/common/protocols.h b/common/protocols.h
index 0f3ef3407..8db1d481e 100644
--- a/common/protocols.h
+++ b/common/protocols.h
@@ -310,51 +310,51 @@ ISO 7816-4 Basic interindustry commands. For command APDU's.
 //	6x xx = ERROR
 	
 // MIFARE DESFire command set:
-#define  MFDES_CREATE_APPLICATION 			 0xca
-#define  MFDES_DELETE_APPLICATION 			 0xda
-#define  MFDES_GET_APPLICATION_IDS 			 0x6a
-#define      MFDES_SELECT_APPLICATION 		 0x5a
-#define      MFDES_FORMAT_PICC 				 0xfc
-#define      MFDES_GET_VERSION 				 0x60
-#define      MFDES_READ_DATA 				 0xbd
-#define      MFDES_WRITE_DATA				 0x3d
-#define      MFDES_GET_VALUE 				 0x6c
-#define      MFDES_CREDIT 					 0x0c
-#define      MFDES_DEBIT 					 0xdc
-#define      MFDES_LIMITED_CREDIT 			 0x1c
-#define      MFDES_WRITE_RECORD 			 0x3b
-#define      MFDES_READ_RECORDS 			 0xbb
-#define     MFDES_CLEAR_RECORD_FILE 		 0xeb
-#define      MFDES_COMMIT_TRANSACTION 		 0xc7
-#define      MFDES_ABORT_TRANSACTION 		 0xa7
-#define      MFDES_GET_FREE_MEMORY           0x6e
-#define  	MFDES_GET_FILE_IDS 				 0x6f
-#define  	MFDES_GET_ISOFILE_IDS 			 0x61
-#define     MFDES_GET_FILE_SETTINGS 		 0xf5
-#define     MFDES_CHANGE_FILE_SETTINGS 		 0x5f
-#define     MFDES_CREATE_STD_DATA_FILE 		 0xcd
-#define     MFDES_CREATE_BACKUP_DATA_FILE 	 0xcb
-#define     MFDES_CREATE_VALUE_FILE 		 0xcc
-#define     MFDES_CREATE_LINEAR_RECORD_FILE	 0xc1
-#define     MFDES_CREATE_CYCLIC_RECORD_FILE	 0xc0
-#define     MFDES_DELETE_FILE 				 0xdf
-#define     MFDES_AUTHENTICATE	 			 0x0a  // AUTHENTICATE_NATIVE
-#define  	MFDES_AUTHENTICATE_ISO 			 0x1a  // AUTHENTICATE_STANDARD
-#define  	MFDES_AUTHENTICATE_AES 			 0xaa
-#define     MFDES_CHANGE_KEY_SETTINGS 		 0x54
-#define     MFDES_GET_KEY_SETTINGS 			 0x45
-#define     MFDES_CHANGE_KEY 				 0xc4
-#define     MFDES_GET_KEY_VERSION 			 0x64
-#define     MFDES_AUTHENTICATION_FRAME 		 0xAF
+#define MFDES_CREATE_APPLICATION 		0xca
+#define MFDES_DELETE_APPLICATION 		0xda
+#define MFDES_GET_APPLICATION_IDS 		0x6a
+#define MFDES_SELECT_APPLICATION 		0x5a
+#define MFDES_FORMAT_PICC 				0xfc
+#define MFDES_GET_VERSION 				0x60
+#define MFDES_READ_DATA 				0xbd
+#define MFDES_WRITE_DATA				0x3d
+#define MFDES_GET_VALUE 				0x6c
+#define MFDES_CREDIT 					0x0c
+#define MFDES_DEBIT 					0xdc
+#define MFDES_LIMITED_CREDIT 			0x1c
+#define MFDES_WRITE_RECORD 				0x3b
+#define MFDES_READ_RECORDS 				0xbb
+#define MFDES_CLEAR_RECORD_FILE 		0xeb
+#define MFDES_COMMIT_TRANSACTION 		0xc7
+#define MFDES_ABORT_TRANSACTION 		0xa7
+#define MFDES_GET_FREE_MEMORY			0x6e
+#define MFDES_GET_FILE_IDS 				0x6f
+#define MFDES_GET_ISOFILE_IDS 			0x61
+#define MFDES_GET_FILE_SETTINGS 		0xf5
+#define MFDES_CHANGE_FILE_SETTINGS 		0x5f
+#define MFDES_CREATE_STD_DATA_FILE 		0xcd
+#define MFDES_CREATE_BACKUP_DATA_FILE 	0xcb
+#define MFDES_CREATE_VALUE_FILE 		0xcc
+#define MFDES_CREATE_LINEAR_RECORD_FILE	0xc1
+#define MFDES_CREATE_CYCLIC_RECORD_FILE	0xc0
+#define MFDES_DELETE_FILE 				0xdf
+#define MFDES_AUTHENTICATE	 			0x0a  // AUTHENTICATE_NATIVE
+#define MFDES_AUTHENTICATE_ISO 			0x1a  // AUTHENTICATE_STANDARD
+#define MFDES_AUTHENTICATE_AES 			0xaa
+#define MFDES_CHANGE_KEY_SETTINGS 		0x54
+#define MFDES_GET_KEY_SETTINGS 			0x45
+#define MFDES_CHANGE_KEY 				0xc4
+#define MFDES_GET_KEY_VERSION 			0x64
+#define MFDES_AUTHENTICATION_FRAME 		0xAF
 
 // LEGIC Commands
-#define		LEGIC_MIM_22	0x0D
-#define		LEGIC_MIM_256	0x1D
-#define		LEGIC_MIM_1024	0x3D
-#define 	LEGIC_ACK_22	0x19
-#define 	LEGIC_ACK_256	0x39
-#define		LEGIC_READ		0x01
-#define 	LEGIC_WRITE		0x00
+#define LEGIC_MIM_22	0x0D
+#define	LEGIC_MIM_256	0x1D
+#define	LEGIC_MIM_1024	0x3D
+#define LEGIC_ACK_22	0x19
+#define LEGIC_ACK_256	0x39
+#define	LEGIC_READ		0x01
+#define LEGIC_WRITE		0x00
 
 void printIclassDumpInfo(uint8_t* iclass_dump);
 void getMemConfig(uint8_t mem_cfg, uint8_t chip_cfg, uint8_t *max_blk, uint8_t *app_areas, uint8_t *kb);
@@ -379,7 +379,7 @@ void getMemConfig(uint8_t mem_cfg, uint8_t chip_cfg, uint8_t *max_blk, uint8_t *
 #define T55x7_MODULATION_MANCHESTER	0x00008000
 #define T55x7_MODULATION_BIPHASE	0x00010000
 #define T55x7_MODULATION_DIPHASE	0x00018000
-#define T55x7_X_MODE                0x00020000
+#define T55x7_X_MODE				0x00020000
 #define T55x7_BITRATE_RF_8			0
 #define T55x7_BITRATE_RF_16			0x00040000
 #define T55x7_BITRATE_RF_32			0x00080000
@@ -406,9 +406,9 @@ void getMemConfig(uint8_t mem_cfg, uint8_t chip_cfg, uint8_t *max_blk, uint8_t *
 #define T5555_PSK_RF_8				0x00000200
 #define T5555_USE_PWD				0x00000400
 #define T5555_USE_AOR				0x00000800
-#define T5555_SET_BITRATE(x)        (((x-2)/2)<<12)
-#define T5555_GET_BITRATE(x)        ((((x >> 12) & 0x3F)*2)+2)
-#define T5555_BITRATE_SHIFT         12 //(RF=2n+2)   ie 64=2*0x1F+2   or n = (RF-2)/2
+#define T5555_SET_BITRATE(x)		(((x-2)/2)<<12)
+#define T5555_GET_BITRATE(x)		((((x >> 12) & 0x3F)*2)+2)
+#define T5555_BITRATE_SHIFT			12 //(RF=2n+2)   ie 64=2*0x1F+2   or n = (RF-2)/2
 #define T5555_FAST_WRITE			0x00004000
 #define T5555_PAGE_SELECT			0x00008000
 
@@ -446,58 +446,61 @@ uint32_t GetT55xxClockBit(uint32_t clock);
 
 
 // FeliCa protocol
-#define FELICA_POLL_REQ 0x00
-#define FELICA_POLL_ACK 0x01
+#define FELICA_POLL_REQ			0x00
+#define FELICA_POLL_ACK			0x01
 
-#define FELICA_REQSRV_REQ 0x02
-#define FELICA_REQSRV_ACK 0x03
+#define FELICA_REQSRV_REQ		0x02
+#define FELICA_REQSRV_ACK		0x03
 
-#define FELICA_RDBLK_REQ 0x06
-#define FELICA_RDBLK_ACK 0x07
+#define FELICA_REQRESP_REQ		0x04
+#define FELICA_REQRESP_ACK		0x05
 
-#define FELICA_WRTBLK_REQ 0x08
-#define FELICA_WRTBLK_ACK 0x09
+#define FELICA_RDBLK_REQ		0x06
+#define FELICA_RDBLK_ACK		0x07
 
-#define FELICA_SRCHSYSCODE_REQ 0x0a
-#define FELICA_SRCHSYSCODE_ACK 0x0b
+#define FELICA_WRTBLK_REQ		0x08
+#define FELICA_WRTBLK_ACK		0x09
 
-#define FELICA_REQSYSCODE_REQ 0x0c
-#define FELICA_REQSYSCODE_ACK 0x0d
+#define FELICA_SRCHSYSCODE_REQ	0x0a
+#define FELICA_SRCHSYSCODE_ACK	0x0b
 
-#define FELICA_AUTH1_REQ 0x10
-#define FELICA_AUTH1_ACK 0x11
+#define FELICA_REQSYSCODE_REQ	0x0c
+#define FELICA_REQSYSCODE_ACK	0x0d
 
-#define FELICA_AUTH2_REQ 0x12
-#define FELICA_AUTH2_ACK 0x13
+#define FELICA_AUTH1_REQ		0x10
+#define FELICA_AUTH1_ACK		0x11
 
-#define FELICA_RDSEC_REQ 0x14
-#define FELICA_RDSEC_ACK 0x15
+#define FELICA_AUTH2_REQ		0x12
+#define FELICA_AUTH2_ACK		0x13
 
-#define FELICA_WRTSEC_REQ 0x16
-#define FELICA_WRTSEC_ACK 0x17
+#define FELICA_RDSEC_REQ		0x14
+#define FELICA_RDSEC_ACK		0x15
 
-#define FELICA_REQSRV2_REQ 0x32
-#define FELICA_REQSRV2_ACK 0x33
+#define FELICA_WRTSEC_REQ		0x16
+#define FELICA_WRTSEC_ACK		0x17
 
-#define FELICA_GETSTATUS_REQ 0x38
-#define FELICA_GETSTATUS_ACK 0x39
+#define FELICA_REQSRV2_REQ		0x32
+#define FELICA_REQSRV2_ACK		0x33
 
-#define FELICA_OSVER_REQ 0x3c
-#define FELICA_OSVER_ACK 0x3d
+#define FELICA_GETSTATUS_REQ	0x38
+#define FELICA_GETSTATUS_ACK	0x39
 
-#define FELICA_RESET_MODE_REQ 0x3e
-#define FELICA_RESET_MODE_ACK 0x3f
+#define FELICA_OSVER_REQ		0x3c
+#define FELICA_OSVER_ACK		0x3d
 
-#define FELICA_AUTH1V2_REQ 0x40
-#define FELICA_AUTH1V2_ACK 0x41
+#define FELICA_RESET_MODE_REQ	0x3e
+#define FELICA_RESET_MODE_ACK	0x3f
 
-#define FELICA_AUTH2V2_REQ 0x42
-#define FELICA_AUTH2V2_ACK 0x43
+#define FELICA_AUTH1V2_REQ		0x40
+#define FELICA_AUTH1V2_ACK		0x41
 
-#define FELICA_RDSECV2_REQ 0x44
-#define FELICA_RDSECV2_ACK 0x45
-#define FELICA_WRTSECV2_REQ 0x46
-#define FELICA_WRTSECV2_ACK 0x47
+#define FELICA_AUTH2V2_REQ		0x42
+#define FELICA_AUTH2V2_ACK		0x43
+
+#define FELICA_RDSECV2_REQ		0x44
+#define FELICA_RDSECV2_ACK		0x45
+#define FELICA_WRTSECV2_REQ		0x46
+#define FELICA_WRTSECV2_ACK		0x47
 
 #define FELICA_UPDATE_RNDID_REQ 0x4C
 #define FELICA_UPDATE_RNDID_ACK 0x4D

From 0dee369a585e9e2b74152798fe18d4de4f385bd5 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 6 Jan 2019 20:28:23 +0100
Subject: [PATCH 0376/1938] FIX: 'hf tune' - now works...

---
 armsrc/appmain.c  |  6 +++---
 client/comms.c    | 47 ++++++++++++++++++-----------------------------
 include/usb_cmd.h | 11 ++++++-----
 3 files changed, 27 insertions(+), 37 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index bf4bddef6..8759f93c4 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -113,7 +113,7 @@ void print_result(char *name, uint8_t *buf, size_t len) {
 void DbpStringEx(char *str, uint32_t cmd) {
 #if DEBUG
 	uint8_t len = strlen(str);
-	cmd_send(CMD_DEBUG_PRINT_STRING, len, cmd, 0, (byte_t*)str, len);
+	cmd_send(CMD_DEBUG_PRINT_STRING, len, cmd, 0, (uint8_t*)str, len);
 #endif	
 }
 
@@ -307,10 +307,10 @@ void MeasureAntennaTuningHf(void) {
 		} else {
 			volt = (MAX_ADC_HF_VOLTAGE_RDV40 * AvgAdc(ADC_CHAN_HF_RDV40)) >> 10;
 		}
-		DbprintfEx(CMD_MEASURE_ANTENNA_TUNING_HF, "%u mV / %5u V", volt, (uint16_t)(volt/1000));
+		DbprintfEx(FLAG_NONEWLINE, "%u mV / %5u V", volt, (uint16_t)(volt/1000));
 	}
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	DbpString("\n[+] cancelled");
+	DbprintfEx(FLAG_NOOPT, "\n[+] cancelled", 1);
 }
 
 void ReadMem(int addr) {
diff --git a/client/comms.c b/client/comms.c
index 97af830df..3c2b353b3 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -154,36 +154,25 @@ static void UsbCommandReceived(UsbCommand* c) {
 			char s[USB_CMD_DATA_SIZE+1];
 			memset(s, 0x00, sizeof(s)); 
 			size_t len = MIN(c->arg[0], USB_CMD_DATA_SIZE);
-			memcpy(s, c->d.asBytes, len);
-			
-					
-			//#define FLAG_RAWPRINT 0x0111
-			//#define FLAG_NOOPT 0x0000
-			//#define FLAG_NOLOG 0x0001
-			//#define FLAG_NONEWLINE 0x0010
-			//#define FLAG_NOPROMPT 0x0100
+			memcpy(s, c->d.asBytes, len);			
 			uint64_t flag = c->arg[1];
-			if (flag > 0) { // FLAG_RAWPRINT) {
-				switch (flag) {
-					case FLAG_RAWPRINT:
-						printf("%s", s);
-						return;
-					case FLAG_NONEWLINE:
-						printf("%s\r", s);
-						return;
-					case FLAG_NOLOG:
-						printf("%s\r\n", s);
-						return; 
-				}
-				fflush(stdout);
-				return;
-			}
-
-			// print debug line on same row. escape seq \r
-			if ( c->arg[1] == CMD_MEASURE_ANTENNA_TUNING_HF) {
-				PrintAndLogEx(NORMAL, "\r#db# %s", s);
-			} else {
-				PrintAndLogEx(NORMAL, "#db# %s", s);
+			
+			switch (flag) {
+				case FLAG_RAWPRINT:
+					printf("%s", s);
+					break;
+				case FLAG_NONEWLINE:
+					printf("\r%s", s);
+					break;
+				case FLAG_NOLOG:
+					printf("%s\r\n", s);
+					break;
+				//case FLAG_NOPROMPT:
+				//	break;
+				case FLAG_NOOPT:
+				default:
+					PrintAndLogEx(NORMAL, "#db# %s", s);
+					break;
 			}
 			fflush(stdout);
 			break;
diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index d6b240fb6..44d031334 100644
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -300,11 +300,12 @@ typedef struct{
 #define FLAG_ICLASS_READER_CEDITKEY     0x40
 
 // Dbprintf flags
-#define FLAG_RAWPRINT 0x0111
-#define FLAG_NOOPT 0x0000
-#define FLAG_NOLOG 0x0001
-#define FLAG_NONEWLINE 0x0010
-#define FLAG_NOPROMPT 0x0100
+#define FLAG_RAWPRINT	0x0111
+#define FLAG_NOOPT		0x0000
+#define FLAG_NOLOG		0x0001
+#define FLAG_NONEWLINE	0x0010
+#define FLAG_NOPROMPT	0x0100
+
 
 // CMD_DEVICE_INFO response packet has flags in arg[0], flag definitions:
 /* Whether a bootloader that understands the common_area is present */

From c37cc81c0067c8f1c08f2cdafaa55d5975ac8799 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 6 Jan 2019 20:42:51 +0100
Subject: [PATCH 0377/1938] CHG: FeliCa more details

---
 armsrc/felica.c | 180 ++++++++++++++++++++++++------------------------
 1 file changed, 90 insertions(+), 90 deletions(-)

diff --git a/armsrc/felica.c b/armsrc/felica.c
index b25653d80..aa6712268 100644
--- a/armsrc/felica.c
+++ b/armsrc/felica.c
@@ -71,114 +71,114 @@ static struct {
 	uint8_t   *framebytes;
  //should be enough. maxlen is 255, 254 for data, 2 for sync, 2 for crc
  // 0,1 -> SYNC, 2 - len,  3-(len+1)->data, then crc
-} NFCFrame;
+} FelicaFrame;
 
 //b2 4d is SYNC, 45645 in 16-bit notation, 10110010 01001101 binary. Frame will not start filling until this is shifted in
 //bit order in byte -reverse, I guess?  [((bt>>0)&1),((bt>>1)&1),((bt>>2)&1),((bt>>3)&1),((bt>>4)&1),((bt>>5)&1),((bt>>6)&1),((bt>>7)&1)] -at least in the mode that I read those in
 #ifndef SYNC_16BIT
-# define SYNC_16BIT 0x4DB2
+# define SYNC_16BIT 0xB24D
 #endif
 
-static void NFCFrameReset() {
-    NFCFrame.state = STATE_UNSYNCD;
-    NFCFrame.posCnt = 0;
-    NFCFrame.crc_ok = false;
-    NFCFrame.byte_offset = 0;
+static void FelicaFrameReset() {
+    FelicaFrame.state = STATE_UNSYNCD;
+    FelicaFrame.posCnt = 0;
+    FelicaFrame.crc_ok = false;
+    FelicaFrame.byte_offset = 0;
 }
 static void NFCInit(uint8_t *data) {
-	NFCFrame.framebytes = data;
-	NFCFrameReset();
+	FelicaFrame.framebytes = data;
+	FelicaFrameReset();
 }
 
 //shift byte into frame, reversing it at the same time
 static void shiftInByte(uint8_t bt) {    
 	uint8_t j;
-    for(j=0; j < NFCFrame.byte_offset; j++) {
-        NFCFrame.framebytes[NFCFrame.posCnt] = ( NFCFrame.framebytes[NFCFrame.posCnt]<<1 ) + (bt & 1); 
+    for(j=0; j < FelicaFrame.byte_offset; j++) {
+        FelicaFrame.framebytes[FelicaFrame.posCnt] = ( FelicaFrame.framebytes[FelicaFrame.posCnt]<<1 ) + (bt & 1); 
         bt >>= 1;
     }
-    NFCFrame.posCnt++;
-    NFCFrame.rem_len--;
-    for(j = NFCFrame.byte_offset; j<8; j++) {
-        NFCFrame.framebytes[NFCFrame.posCnt] = (NFCFrame.framebytes[NFCFrame.posCnt]<<1 ) + (bt & 1);
+    FelicaFrame.posCnt++;
+    FelicaFrame.rem_len--;
+    for(j = FelicaFrame.byte_offset; j<8; j++) {
+        FelicaFrame.framebytes[FelicaFrame.posCnt] = (FelicaFrame.framebytes[FelicaFrame.posCnt]<<1 ) + (bt & 1);
         bt >>= 1;
     }
 }
 
 static void ProcessNFCByte(uint8_t bt) {
-    switch (NFCFrame.state) {
+    switch (FelicaFrame.state) {
 		case STATE_UNSYNCD: {
 			//almost any nonzero byte can be start of SYNC. SYNC should be preceded by zeros, but that is not alsways the case
 			if (bt > 0) {
-				NFCFrame.shiftReg = reflect8(bt);
-				NFCFrame.state = STATE_TRYING_SYNC;
+				FelicaFrame.shiftReg = reflect8(bt);
+				FelicaFrame.state = STATE_TRYING_SYNC;
 			}
 			break;
 		}
 		case STATE_TRYING_SYNC: {
 			if (bt == 0) {
 				//desync
-				NFCFrame.shiftReg = bt;
-				NFCFrame.state = STATE_UNSYNCD;
+				FelicaFrame.shiftReg = bt;
+				FelicaFrame.state = STATE_UNSYNCD;
 			} else {
 				for (uint8_t i=0; i<8; i++) {
 					
-					if (NFCFrame.shiftReg == SYNC_16BIT) {
+					if (FelicaFrame.shiftReg == SYNC_16BIT) {
 						//SYNC done!
-						NFCFrame.state = STATE_GET_LENGTH;
-						NFCFrame.framebytes[0] = 0xb2;
-						NFCFrame.framebytes[1] = 0x4d; //write SYNC
-						NFCFrame.byte_offset = i;
+						FelicaFrame.state = STATE_GET_LENGTH;
+						FelicaFrame.framebytes[0] = 0xb2;
+						FelicaFrame.framebytes[1] = 0x4d; //write SYNC
+						FelicaFrame.byte_offset = i;
 						//shift in remaining byte, slowly...
 						for(uint8_t j=i; j<8; j++) {
-							NFCFrame.framebytes[2] = (NFCFrame.framebytes[2] << 1) + (bt & 1);
+							FelicaFrame.framebytes[2] = (FelicaFrame.framebytes[2] << 1) + (bt & 1);
 							bt >>= 1;
 						}
 						
-						NFCFrame.posCnt = 2;
+						FelicaFrame.posCnt = 2;
 						if (i==0)
 							break;
 					}
-					NFCFrame.shiftReg = (NFCFrame.shiftReg << 1) + (bt & 1);
+					FelicaFrame.shiftReg = (FelicaFrame.shiftReg << 1) + (bt & 1);
 					bt >>= 1;
 				}
 
 				//that byte was last byte of sync
-				if (NFCFrame.shiftReg == SYNC_16BIT) {
+				if (FelicaFrame.shiftReg == SYNC_16BIT) {
 					//Force SYNC on next byte
-					NFCFrame.state = STATE_GET_LENGTH;
-					NFCFrame.framebytes[0] = 0xb2;
-					NFCFrame.framebytes[1] = 0x4d; 
-					NFCFrame.byte_offset = 0;
-					NFCFrame.posCnt = 1;
+					FelicaFrame.state = STATE_GET_LENGTH;
+					FelicaFrame.framebytes[0] = 0xb2;
+					FelicaFrame.framebytes[1] = 0x4d; 
+					FelicaFrame.byte_offset = 0;
+					FelicaFrame.posCnt = 1;
 				}
 			}
 			break;
 		}
 		case STATE_GET_LENGTH: {
 			shiftInByte(bt);
-			NFCFrame.rem_len = NFCFrame.framebytes[2] - 1;
-			NFCFrame.len = NFCFrame.framebytes[2] + 4; //with crc and sync
-			NFCFrame.state = STATE_GET_DATA;
+			FelicaFrame.rem_len = FelicaFrame.framebytes[2] - 1;
+			FelicaFrame.len = FelicaFrame.framebytes[2] + 4; //with crc and sync
+			FelicaFrame.state = STATE_GET_DATA;
 			break;
 		}
 		case STATE_GET_DATA: {
 			shiftInByte(bt);
-			if (NFCFrame.rem_len <= 0) {
-				NFCFrame.state = STATE_GET_CRC;
-				NFCFrame.rem_len = 2;
+			if (FelicaFrame.rem_len <= 0) {
+				FelicaFrame.state = STATE_GET_CRC;
+				FelicaFrame.rem_len = 2;
 			}
 			break;
 		}
 		case STATE_GET_CRC: {
 			shiftInByte(bt);
 
-			if ( NFCFrame.rem_len <= 0 ) {
+			if ( FelicaFrame.rem_len <= 0 ) {
 				// skip sync 2bytes. IF ok, residue should be 0x0000
-				NFCFrame.crc_ok = check_crc(CRC_FELICA, NFCFrame.framebytes+2, NFCFrame.len-2);
-				NFCFrame.state = STATE_FULL;
-				NFCFrame.rem_len = 0;
-				if (MF_DBGLEVEL > 3) Dbprintf("[+] got 2 crc bytes [%s]", (NFCFrame.crc_ok) ? "OK" : "No" );			
+				FelicaFrame.crc_ok = check_crc(CRC_FELICA, FelicaFrame.framebytes+2, FelicaFrame.len-2);
+				FelicaFrame.state = STATE_FULL;
+				FelicaFrame.rem_len = 0;
+				if (MF_DBGLEVEL > 3) Dbprintf("[+] got 2 crc bytes [%s]", (FelicaFrame.crc_ok) ? "OK" : "No" );			
 			}
 			break;
 		}
@@ -207,7 +207,7 @@ static uint8_t felica_select_card(felica_card_select_t *card) {
 	//			b0    = fc/64 (212kbps)	
 	// 0x00 = timeslot
 	// 0x09 0x21 = crc
-	static uint8_t poll[10] = {0xb2,0x4d,0x06,0x00,0xFF,0xFF,0x00,0x00,0x09,0x21};
+	static uint8_t poll[10] = {0xb2,0x4d,0x06,FELICA_POLL_REQ,0xFF,0xFF,0x00,0x00,0x09,0x21};
 	
 	int len = 20;
 	
@@ -219,7 +219,7 @@ static uint8_t felica_select_card(felica_card_select_t *card) {
 		TransmitFor18092_AsReader(poll, sizeof(poll), NULL, 1, 0);
 
 		// polling card, break if success
-		if (WaitForFelicaReply(512) && NFCFrame.framebytes[3] == FELICA_POLL_ACK)
+		if (WaitForFelicaReply(512) && FelicaFrame.framebytes[3] == FELICA_POLL_ACK)
 			break;
 		
 		WDT_HIT();
@@ -231,19 +231,19 @@ static uint8_t felica_select_card(felica_card_select_t *card) {
 		return 1;
 			
 	// wrong answer	
-	if (NFCFrame.framebytes[3] != FELICA_POLL_ACK)
+	if (FelicaFrame.framebytes[3] != FELICA_POLL_ACK)
 		return 2;
 	
 	// VALIDATE CRC   residue is 0, hence if crc is a value it failed.
-	if (!check_crc(CRC_FELICA, NFCFrame.framebytes+2, NFCFrame.len-2))
+	if (!check_crc(CRC_FELICA, FelicaFrame.framebytes+2, FelicaFrame.len-2))
 		return 3;
 	
 	// copy UID
 	// idm 8
 	if (card) {
-		memcpy(card->IDm, NFCFrame.framebytes + 4, 8);
-		memcpy(card->PMm, NFCFrame.framebytes + 4 + 8, 8);
-		//memcpy(card->servicecode, NFCFrame.framebytes + 4 + 8 + 8, 2);
+		memcpy(card->IDm, FelicaFrame.framebytes + 4, 8);
+		memcpy(card->PMm, FelicaFrame.framebytes + 4 + 8, 8);
+		//memcpy(card->servicecode, FelicaFrame.framebytes + 4 + 8 + 8, 2);
 		memcpy(card->code, card->IDm, 2);
 		memcpy(card->uid, card->IDm + 2, 6);
 		memcpy(card->iccode, card->PMm, 2);
@@ -389,7 +389,7 @@ bool WaitForFelicaReply(uint16_t maxbytes) {
 	// power, no modulation
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_ISO18092 | FPGA_HF_ISO18092_FLAG_READER | FPGA_HF_ISO18092_FLAG_NOMOD);
 
-	NFCFrameReset();
+	FelicaFrameReset();
 
 	// clear RXRDY:
 	uint8_t b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
@@ -401,7 +401,7 @@ bool WaitForFelicaReply(uint16_t maxbytes) {
 		if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
 			b = (uint8_t)(AT91C_BASE_SSC->SSC_RHR);			
 			ProcessNFCByte(b);		
-			if (NFCFrame.state == STATE_FULL) {
+			if (FelicaFrame.state == STATE_FULL) {
 				felica_nexttransfertime = 
 					MAX(
 						felica_nexttransfertime,
@@ -410,19 +410,19 @@ bool WaitForFelicaReply(uint16_t maxbytes) {
 				;						
 				
 				LogTrace(
-					NFCFrame.framebytes,
-					NFCFrame.len,
+					FelicaFrame.framebytes,
+					FelicaFrame.len,
 					((GetCountSspClk() & 0xfffffff8)<<4) - DELAY_AIR2ARM_AS_READER - timeout,
 					((GetCountSspClk() & 0xfffffff8)<<4) - DELAY_AIR2ARM_AS_READER,
 					NULL,
 					false
 				);
 				return true;
-			} else if (c++ > timeout && NFCFrame.state == STATE_UNSYNCD) {
+			} else if (c++ > timeout && FelicaFrame.state == STATE_UNSYNCD) {
 				return false; 
-			} else if (NFCFrame.state == STATE_GET_CRC) {
+			} else if (FelicaFrame.state == STATE_GET_CRC) {
 				Dbprintf(" Frame: ");
-				Dbhexdump(16, NFCFrame.framebytes, 0);
+				Dbhexdump(16, FelicaFrame.framebytes, 0);
 				//return false;
 			}
 		} 
@@ -526,7 +526,7 @@ void felica_sendraw(UsbCommand *c) {
 
 		TransmitFor18092_AsReader(buf, buf[2]+4, NULL, 1, 0);
 		arg0 = !WaitForFelicaReply(1024);
-		cmd_send(CMD_ACK, arg0, 0, 0, NFCFrame.framebytes+2, NFCFrame.len-2);
+		cmd_send(CMD_ACK, arg0, 0, 0, FelicaFrame.framebytes+2, FelicaFrame.len-2);
 	}
 
 	if ((param & FELICA_NO_DISCONNECT))
@@ -566,21 +566,21 @@ void felica_sniff(uint32_t samplesToSkip, uint32_t triggersToSkip) {
             ProcessNFCByte(dist);
             
 			//to be sure we are in frame
-            if (NFCFrame.state == STATE_GET_LENGTH) {
+            if (FelicaFrame.state == STATE_GET_LENGTH) {
                 //length is after 48 (PRE)+16 (SYNC) - 64 ticks +maybe offset? not 100% 
-                uint16_t distance = GetCountSspClk() - endframe - 64 + (NFCFrame.byte_offset > 0 ? (8-NFCFrame.byte_offset) : 0);
+                uint16_t distance = GetCountSspClk() - endframe - 64 + (FelicaFrame.byte_offset > 0 ? (8-FelicaFrame.byte_offset) : 0);
                 *dest = distance >> 8;
                 dest++;
                 *dest = (distance & 0xff);
                 dest++;
             }
 			//crc NOT checked
-            if (NFCFrame.state == STATE_FULL) {
+            if (FelicaFrame.state == STATE_FULL) {
                 endframe = GetCountSspClk();
-                //*dest = NFCFrame.crc_ok; //kind of wasteful
+                //*dest = FelicaFrame.crc_ok; //kind of wasteful
                 dest++;
-                for(int i=0; i < NFCFrame.len; i++) {
-                    *dest = NFCFrame.framebytes[i];
+                for(int i=0; i < FelicaFrame.len; i++) {
+                    *dest = FelicaFrame.framebytes[i];
                     dest++;
                     if (dest >= destend ) break;
 
@@ -590,9 +590,9 @@ void felica_sniff(uint32_t samplesToSkip, uint32_t triggersToSkip) {
                 if (remFrames <= 0) break;
                 if (dest >= destend ) break;
 				
-                numbts += NFCFrame.len;
+                numbts += FelicaFrame.len;
                 
-				NFCFrameReset();
+				FelicaFrameReset();
             }
         }
     }
@@ -621,9 +621,9 @@ void felica_sim_lite(uint64_t nfcid) {
 	num_to_bytes(nfcid, 8, ndef);
 
 	//prepare our 3 responses...
-    uint8_t resp_poll0[R_POLL0_LEN] = { 0xb2,0x4d,0x12,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf1,0x00,0x00,0x00,0x01,0x43,0x00,0xb3,0x7f};
-    uint8_t resp_poll1[R_POLL1_LEN] = { 0xb2,0x4d,0x14,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf1,0x00,0x00,0x00,0x01,0x43,0x00, 0x88,0xb4,0xb3,0x7f};
-    uint8_t resp_readblk[R_READBLK_LEN] = { 0xb2,0x4d,0x1d,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x10,0x04,0x01,0x00,0x0d,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x23,0xcb,0x6e};
+    uint8_t resp_poll0[R_POLL0_LEN] = { 0xb2,0x4d,0x12,FELICA_POLL_ACK,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf1,0x00,0x00,0x00,0x01,0x43,0x00,0xb3,0x7f};
+    uint8_t resp_poll1[R_POLL1_LEN] = { 0xb2,0x4d,0x14,FELICA_POLL_ACK,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf1,0x00,0x00,0x00,0x01,0x43,0x00, 0x88,0xb4,0xb3,0x7f};
+    uint8_t resp_readblk[R_READBLK_LEN] = { 0xb2,0x4d,0x1d,FELICA_RDBLK_ACK,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x10,0x04,0x01,0x00,0x0d,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x23,0xcb,0x6e};
 	
 	//NFC tag 3/ ISo technically. Many overlapping standards
     DbpString("Felica Lite-S sim start"); 
@@ -659,26 +659,26 @@ void felica_sim_lite(uint64_t nfcid) {
 				//frtm = GetCountSspClk();
 				ProcessNFCByte(dist);
 				
-                if (NFCFrame.state == STATE_FULL) {
+                if (FelicaFrame.state == STATE_FULL) {
 
-                    if (NFCFrame.crc_ok) {
+                    if (FelicaFrame.crc_ok) {
                        
-                        if (NFCFrame.framebytes[2] == 6 && NFCFrame.framebytes[3] == 0) {
+                        if (FelicaFrame.framebytes[2] == 6 && FelicaFrame.framebytes[3] == 0) {
 
 							//polling... there are two types of polling we answer to
-							if (NFCFrame.framebytes[6] == 0) {
+							if (FelicaFrame.framebytes[6] == 0) {
 								curresp = resp_poll0;
 								curlen = R_POLL0_LEN;
 								listenmode = false;
 							}
-							if (NFCFrame.framebytes[6] == 1) {
+							if (FelicaFrame.framebytes[6] == 1) {
 								curresp = resp_poll1;
 								curlen = R_POLL1_LEN;
 								listenmode = true;
 							}
                         }
 						
-                        if (NFCFrame.framebytes[2] > 5 && NFCFrame.framebytes[3] == 0x06) {
+                        if (FelicaFrame.framebytes[2] > 5 && FelicaFrame.framebytes[3] == 0x06) {
                             //we should rebuild it depending on page size, but...
                             //Let's see first
                             curresp = resp_readblk;
@@ -686,10 +686,10 @@ void felica_sim_lite(uint64_t nfcid) {
                             listenmode = false;
                         }
                         //clear frame
-                        NFCFrameReset();
+                        FelicaFrameReset();
                     } else {
                         //frame invalid, clear it out to allow for the next one
-						NFCFrameReset();
+						FelicaFrameReset();
 					}
 				}
 			}
@@ -703,7 +703,7 @@ void felica_sim_lite(uint64_t nfcid) {
 			//switch back
 			FpgaWriteConfWord(FPGA_MAJOR_MODE_ISO18092 | FPGA_HF_ISO18092_FLAG_NOMOD);
 
-			NFCFrameReset();
+			FelicaFrameReset();
 			listenmode = true;
 			curlen = 0;
 			curresp = NULL;
@@ -721,8 +721,8 @@ void felica_sim_lite(uint64_t nfcid) {
 void felica_dump_lite_s() {
 
 	uint8_t ndef[8];
-	uint8_t poll[10] = { 0xb2,0x4d,0x06,0x00,0xff,0xff,0x00,0x00,0x09,0x21};
-	uint16_t liteblks[28] = {0x00, 0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x90,0x91,0x92,0xa0};
+	uint8_t poll[10] = { 0xb2,0x4d,0x06,FELICA_POLL_REQ,0xff,0xff,0x00,0x00,0x09,0x21};
+	uint16_t liteblks[28] = {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x90,0x91,0x92,0xa0};
 		
 	// setup device.
 	felica_setup(FPGA_HF_ISO18092_FLAG_READER | FPGA_HF_ISO18092_FLAG_NOMOD);
@@ -740,12 +740,12 @@ void felica_dump_lite_s() {
 		//TransmitFor18092_AsReader(poll, 10, GetCountSspClk()+512, 1, 0);
 		TransmitFor18092_AsReader(poll, 10, NULL, 1, 0);
 		
-		if (WaitForFelicaReply(512) && NFCFrame.framebytes[3] == FELICA_POLL_ACK) {
+		if (WaitForFelicaReply(512) && FelicaFrame.framebytes[3] == FELICA_POLL_ACK) {
 			
 			// copy 8bytes to ndef.
-			memcpy(ndef, NFCFrame.framebytes + 4, 8);
+			memcpy(ndef, FelicaFrame.framebytes + 4, 8);
 			// for (c=0; c < 8; c++)
-				// ndef[c] = NFCFrame.framebytes[c+4];
+				// ndef[c] = FelicaFrame.framebytes[c+4];
 	
 			for (blknum=0; blknum < sizeof(liteblks); ) { 
 
@@ -756,15 +756,15 @@ void felica_dump_lite_s() {
 				TransmitFor18092_AsReader(frameSpace, frameSpace[2]+4, NULL, 1, 0);
 				
 				// read block
-				if (WaitForFelicaReply(1024) && NFCFrame.framebytes[3] == FELICA_RDBLK_ACK) {
+				if (WaitForFelicaReply(1024) && FelicaFrame.framebytes[3] == FELICA_RDBLK_ACK) {
 
 					dest[cnt++] = liteblks[blknum];
 
-					uint8_t *fb = NFCFrame.framebytes;
+					uint8_t *fb = FelicaFrame.framebytes;
 					dest[cnt++] = fb[12];
 					dest[cnt++] = fb[13];
 
-					//memcpy(dest+cnt, NFCFrame.framebytes + 15, 16);
+					//memcpy(dest+cnt, FelicaFrame.framebytes + 15, 16);
 					//cnt += 16;
 					for(uint8_t j=0; j < 16; j++)
 						dest[cnt++] = fb[15+j];
@@ -773,8 +773,8 @@ void felica_dump_lite_s() {
 					cntfails = 0;
 					
 					// // print raw log.
-					// Dbprintf("LEN %u | Dump bytes count %u ", NFCFrame.len, cnt);
-					Dbhexdump(NFCFrame.len, NFCFrame.framebytes+15, 0);
+					// Dbprintf("LEN %u | Dump bytes count %u ", FelicaFrame.len, cnt);
+					Dbhexdump(FelicaFrame.len, FelicaFrame.framebytes+15, 0);
 				} else {
 					cntfails++;
 					if (cntfails > 12) {

From 064a163c99e521a2e64dff51ead91da4bd438234 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 6 Jan 2019 20:50:19 +0100
Subject: [PATCH 0378/1938] textual

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 622ff0f78..6562f7bc5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,8 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [unreleased][unreleased]
+ - Change 'hf felica list' - started with some FeliCa annotations (@iceman)
+ - Fix 'hf tune' - now works as expected (@iceman)
  - Add 'option to use flash memory to upload dictionary files' (RDV40) (@iceman)
  - Fix 'printing percentage now standard compliant' (@fabled)
  - Add 'emv roca' - command to test for ROCA vuln in public RSA modulus (@merlokk / @iceman)

From c1237cfa26986558f7ac6a18f380d242331317a4 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 6 Jan 2019 21:05:29 +0100
Subject: [PATCH 0379/1938] FIX: 'lg pcf7931' - improved read code
 (@sguerrini97)

---
 CHANGELOG.md     |   1 +
 armsrc/pcf7931.c | 371 +++++++++++++++++++++++++----------------------
 armsrc/pcf7931.h |   6 +-
 3 files changed, 202 insertions(+), 176 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6562f7bc5..1c7adf3a6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [unreleased][unreleased]
+ - Change 'lf pcf7931' - improved read code (@sguerrini97)
  - Change 'hf felica list' - started with some FeliCa annotations (@iceman)
  - Fix 'hf tune' - now works as expected (@iceman)
  - Add 'option to use flash memory to upload dictionary files' (RDV40) (@iceman)
diff --git a/armsrc/pcf7931.c b/armsrc/pcf7931.c
index 8405c96ce..c9a76bb3b 100644
--- a/armsrc/pcf7931.c
+++ b/armsrc/pcf7931.c
@@ -3,8 +3,7 @@
 #define T0_PCF 8 //period for the pcf7931 in us
 #define ALLOC 16
 
-int DemodPCF7931(uint8_t **outBlocks) {
-
+size_t DemodPCF7931(uint8_t **outBlocks) {
     uint8_t bits[256] = {0x00};
 	uint8_t blocks[8][16];
     uint8_t *dest = BigBuf_get_addr();
@@ -18,7 +17,7 @@ int DemodPCF7931(uint8_t **outBlocks) {
 	int tolerance = clock / 8;
 	int pmc, block_done;
 	int lc, warnings = 0;
-	int num_blocks = 0;
+	size_t num_blocks = 0;
 	int lmin=128, lmax=128;
 	uint8_t dir;
 	//clear read buffer
@@ -40,8 +39,7 @@ int DemodPCF7931(uint8_t **outBlocks) {
 			i++;
 		}
 		dir = 0;
-	}
-	else {
+	} else {
 		while(i < GraphTraceLen) {
             if( !(dest[i] < dest[i-1]) && dest[i] < lmin)
 				break;
@@ -55,10 +53,8 @@ int DemodPCF7931(uint8_t **outBlocks) {
 	pmc = 0;
 	block_done = 0;
 
-	for (bitidx = 0; i < GraphTraceLen; i++)
-	{
-        if ( (dest[i-1] > dest[i] && dir == 1 && dest[i] > lmax) || (dest[i-1] < dest[i] && dir == 0 && dest[i] < lmin))
-		{
+	for (bitidx = 0; i < GraphTraceLen; i++) {
+		if ((dest[i-1] > dest[i] && dir == 1 && dest[i] > lmax) || (dest[i-1] < dest[i] && dir == 0 && dest[i] < lmin)) {
 			lc = i - lastval;
 			lastval = i;
 
@@ -72,8 +68,7 @@ int DemodPCF7931(uint8_t **outBlocks) {
 					lastval = i;
 					pmc = 0;
 					block_done = 1;
-				}
-				else {
+				} else {
 					pmc = i;
 				}
 			} else if (ABS(lc-clock/2) < tolerance) {
@@ -84,8 +79,7 @@ int DemodPCF7931(uint8_t **outBlocks) {
 					lastval = i;
 					pmc = 0;
 					block_done = 1;
-				}
-				else if(half_switch == 1) {
+				} else if(half_switch == 1) {
                     bits[bitidx++] = 0;
 					half_switch = 0;
 				}
@@ -96,26 +90,25 @@ int DemodPCF7931(uint8_t **outBlocks) {
                 bits[bitidx++] = 1;
 			} else {
 				// Error
-				warnings++;
-				if (warnings > 10)
-				{
-					Dbprintf("Error: too many detection errors, aborting...");
+				if (++warnings > 10) {
+					Dbprintf("Error: too many detection errors, aborting.");
 					return 0;
 				}
 			}
 
 			if(block_done == 1) {
 				if(bitidx == 128) {
-					for(j=0; j<16; j++) {
-                        blocks[num_blocks][j] = 128*bits[j*8+7]+
+					for(j = 0; j < 16; ++j) {
+						blocks[num_blocks][j] =
+							128 * bits[j*8 + 7]+
                                 64*bits[j*8+6]+
                                 32*bits[j*8+5]+
                                 16*bits[j*8+4]+
                                 8*bits[j*8+3]+
                                 4*bits[j*8+2]+
                                 2*bits[j*8+1]+
-                                bits[j*8];
-						
+							bits[j*8]
+						;
 					}
 					num_blocks++;
 				}
@@ -135,185 +128,209 @@ int DemodPCF7931(uint8_t **outBlocks) {
 	return num_blocks;
 }
 
-int IsBlock0PCF7931(uint8_t *Block) {
-	// Assume RFU means 0 :)
-	if((memcmp(Block, "\x00\x00\x00\x00\x00\x00\x00\x01", 8) == 0) && memcmp(Block+9, "\x00\x00\x00\x00\x00\x00\x00", 7) == 0) // PAC enabled
-		return 1;
-	if((memcmp(Block+9, "\x00\x00\x00\x00\x00\x00\x00", 7) == 0) && Block[7] == 0) // PAC disabled, can it *really* happen ?
-		return 1;
-	return 0;
+bool IsBlock0PCF7931(uint8_t *block) {
+	// assuming all RFU bits are set to 0
+	// if PAC is enabled password is set to 0
+	if (block[7] == 0x01)
+	{
+		if (!memcmp(block, "\x00\x00\x00\x00\x00\x00\x00", 7) && !memcmp(block+9, "\x00\x00\x00\x00\x00\x00\x00", 7))
+			return true;
+	}
+	else if (block[7] == 0x00)
+	{
+		if (!memcmp(block+9, "\x00\x00\x00\x00\x00\x00\x00", 7))
+			return true;
+	}
+	return false;
 }
 
-int IsBlock1PCF7931(uint8_t *Block) {
-	// Assume RFU means 0 :)
-	if( Block[10] == 0 && 
-	    Block[11] == 0 && 
-		Block[12] == 0 && 
-		Block[13] == 0)
-		 if ( (Block[14] & 0x7f) <= 9 && Block[15] <= 9)
-			return 1;
-	return 0;
+bool IsBlock1PCF7931(uint8_t *block) {
+	// assuming all RFU bits are set to 0
+	if (block[10] == 0 && block[11] == 0 && block[12] == 0 && block[13] == 0)
+		if((block[14] & 0x7f) <= 9 && block[15] <= 9)
+			return true;
+
+	return false;
 }
 
 void ReadPCF7931() {
-	uint8_t Blocks[8][17];
-	uint8_t tmpBlocks[4][16];
-	int i, j, ind, ind2, n;
-	int num_blocks = 0;
-	int max_blocks = 8;
-	int ident = 0;
-	int error = 0;
-	int tries = 0;
+	int found_blocks = 0; // successfully read blocks
+	int max_blocks = 8;	// readable blocks	
+	uint8_t memory_blocks[8][17]; // PCF content
+	
+	uint8_t single_blocks[8][17]; // PFC blocks with unknown position
+	int single_blocks_cnt = 0;
 
-	memset(Blocks, 0, 8*17*sizeof(uint8_t));
+	size_t n = 0; // transmitted blocks	
+	uint8_t tmp_blocks[4][16]; // temporary read buffer
+	
+	uint8_t found_0_1 = 0; // flag: blocks 0 and 1 were found
+	int errors = 0; // error counter
+	int tries = 0; // tries counter
+	
+	memset(memory_blocks, 0, 8*17*sizeof(uint8_t));
+	memset(single_blocks, 0, 8*17*sizeof(uint8_t));
+	
+	int i = 0, j = 0;
 
 	do {
-		memset(tmpBlocks, 0, 4*16*sizeof(uint8_t));
-		n = DemodPCF7931((uint8_t**)tmpBlocks);
+		i = 0;
+		
+		memset(tmp_blocks, 0, 4*16*sizeof(uint8_t));
+		n = DemodPCF7931((uint8_t**)tmp_blocks);
 		if(!n)
-			error++;
-		if(error==10 && num_blocks == 0) {
+			++errors;
+		
+		// exit if no block is received 
+		if (errors >= 10 && found_blocks == 0 && single_blocks_cnt == 0) {
 			Dbprintf("Error, no tag or bad tag");
 			return;
 		}
-		else if (tries==20 || error==10) {
+		// exit if too many errors during reading 
+		if (tries > 50 && (2*errors > tries)) {
 			Dbprintf("Error reading the tag");
 			Dbprintf("Here is the partial content");
 			goto end;
 		}
 
-		for(i=0; i<n; i++)
-			Dbprintf("(dbg) %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x",
-					 tmpBlocks[i][0], tmpBlocks[i][1], tmpBlocks[i][2], tmpBlocks[i][3], tmpBlocks[i][4], tmpBlocks[i][5], tmpBlocks[i][6], tmpBlocks[i][7],
-					tmpBlocks[i][8], tmpBlocks[i][9], tmpBlocks[i][10], tmpBlocks[i][11], tmpBlocks[i][12], tmpBlocks[i][13], tmpBlocks[i][14], tmpBlocks[i][15]);
-		if(!ident) {
-			for(i=0; i<n; i++) {
-				if(IsBlock0PCF7931(tmpBlocks[i])) {
-					// Found block 0 ?
-					if(i < n-1 && IsBlock1PCF7931(tmpBlocks[i+1])) {
-						// Found block 1!
-						// \o/
-						ident = 1;
-						memcpy(Blocks[0], tmpBlocks[i], 16);
-						Blocks[0][ALLOC] = 1;
-						memcpy(Blocks[1], tmpBlocks[i+1], 16);
-						Blocks[1][ALLOC] = 1;
-						max_blocks = MAX((Blocks[1][14] & 0x7f), Blocks[1][15]) + 1;
-						// Debug print
-						Dbprintf("(dbg) Max blocks: %d", max_blocks);
-						num_blocks = 2;
-						// Handle following blocks
-						for(j=i+2, ind2=2; j!=i; j++, ind2++, num_blocks++) {
-							if(j==n) j=0;
-							if(j==i) break;
-							memcpy(Blocks[ind2], tmpBlocks[j], 16);
-							Blocks[ind2][ALLOC] = 1;
-						}
+		// our logic breaks if we don't get at least two blocks
+		if (n < 2) {
+			if (n == 0 || !memcmp(tmp_blocks[0], "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", 16))
+				continue;
+
+			if (single_blocks_cnt < max_blocks) {
+				for (i = 0; i < single_blocks_cnt; ++i) {
+					if (!memcmp(single_blocks[i], tmp_blocks[0], 16)) {
+						j = 1;
 						break;
 					}
 				}
+				if (j != 1) {
+					memcpy(single_blocks[single_blocks_cnt], tmp_blocks[0], 16);
+					single_blocks_cnt++;
+				}
+				j = 0;
 			}
-		}
-		else {
-			for(i=0; i<n; i++) { // Look for identical block in known blocks
-				if(memcmp(tmpBlocks[i], "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", 16)) { // Block is not full of 00
-					for(j=0; j<max_blocks; j++) {
-						if(Blocks[j][ALLOC] == 1 && !memcmp(tmpBlocks[i], Blocks[j], 16)) {
-							// Found an identical block
-							for(ind=i-1,ind2=j-1; ind >= 0; ind--,ind2--) {
-								if(ind2 < 0)
-									ind2 = max_blocks;
-								if(!Blocks[ind2][ALLOC]) { // Block ind2 not already found
-									// Dbprintf("Tmp %d -> Block %d", ind, ind2);
-									memcpy(Blocks[ind2], tmpBlocks[ind], 16);
-									Blocks[ind2][ALLOC] = 1;
-									num_blocks++;
-									if(num_blocks == max_blocks) goto end;
-								}
-							}
-							for(ind=i+1,ind2=j+1; ind < n; ind++,ind2++) {
-								if(ind2 > max_blocks)
-									ind2 = 0;
-								if(!Blocks[ind2][ALLOC]) { // Block ind2 not already found
-									// Dbprintf("Tmp %d -> Block %d", ind, ind2);
-									memcpy(Blocks[ind2], tmpBlocks[ind], 16);
-									Blocks[ind2][ALLOC] = 1;
-									num_blocks++;
-									if(num_blocks == max_blocks) goto end;
-								}
-							}
+			++tries;
+			continue;
+	 	}
+	 	
+	 	Dbprintf("(dbg) got %d blocks (%d/%d found) (%d tries, %d errors)", n, found_blocks, (max_blocks == 0 ? found_blocks : max_blocks), tries, errors);
+
+		i = 0;
+		if(!found_0_1) {			
+			while (i < n - 1) {
+				if (IsBlock0PCF7931(tmp_blocks[i]) && IsBlock1PCF7931(tmp_blocks[i+1])) {
+					found_0_1 = 1;
+					memcpy(memory_blocks[0], tmp_blocks[i], 16);
+					memcpy(memory_blocks[1], tmp_blocks[i+1], 16);
+					memory_blocks[0][ALLOC] = memory_blocks[1][ALLOC] = 1;
+					// block 1 tells how many blocks are going to be sent
+					max_blocks = MAX((memory_blocks[1][14] & 0x7f), memory_blocks[1][15]) + 1;
+					found_blocks = 2;
+					
+					Dbprintf("Found blocks 0 and 1. PCF is transmitting %d blocks.", max_blocks);
+					
+					// handle the following blocks
+					for (j = i + 2; j < n; ++j) {
+						memcpy(memory_blocks[found_blocks], tmp_blocks[j], 16);
+						memory_blocks[found_blocks][ALLOC] = 1;
+						++found_blocks;
+					}
+					break;
+				}
+				++i;
+			}
+		} else {
+			// Trying to re-order blocks
+			// Look for identical block in memory blocks
+			while (i < n-1) {
+				// skip all zeroes blocks
+				if (memcmp(tmp_blocks[i], "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", 16)) {
+					for (j = 1; j < max_blocks - 1; ++j) {
+						if (!memcmp(tmp_blocks[i], memory_blocks[j], 16) && !memory_blocks[j+1][ALLOC]) {
+							memcpy(memory_blocks[j+1], tmp_blocks[i+1], 16);
+							memory_blocks[j+1][ALLOC] = 1;
+							if (++found_blocks >= max_blocks) goto end;
 						}
 					}
 				}
+				if (memcmp(tmp_blocks[i+1], "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", 16)) {
+					for (j = 0; j < max_blocks; ++j) {
+						if (!memcmp(tmp_blocks[i+1], memory_blocks[j], 16) && !memory_blocks[(j == 0 ? max_blocks : j) -1][ALLOC]) {
+							if (j == 0) {
+								memcpy(memory_blocks[max_blocks - 1], tmp_blocks[i], 16);
+								memory_blocks[max_blocks - 1][ALLOC] = 1;
+							} else {
+								memcpy(memory_blocks[j-1], tmp_blocks[i], 16);
+								memory_blocks[j-1][ALLOC] = 1;
+							}
+							if (++found_blocks >= max_blocks) goto end;
+						}
+					}
+				}
+				++i;
 			}
 		}
-		tries++;
-		if (BUTTON_PRESS()) return;
-	} while (num_blocks != max_blocks);
+		++tries;
+		if (BUTTON_PRESS()) {
+			Dbprintf("Button pressed, stopping.");
+			goto end;
+		}
+	}
+	while (found_blocks != max_blocks);
+
  end:
 	Dbprintf("-----------------------------------------");
 	Dbprintf("Memory content:");
 	Dbprintf("-----------------------------------------");
-	for(i=0; i<max_blocks; i++) {
-		if(Blocks[i][ALLOC]==1)
-			Dbprintf("%02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x",
-					 Blocks[i][0], Blocks[i][1], Blocks[i][2], Blocks[i][3], Blocks[i][4], Blocks[i][5], Blocks[i][6], Blocks[i][7],
-					Blocks[i][8], Blocks[i][9], Blocks[i][10], Blocks[i][11], Blocks[i][12], Blocks[i][13], Blocks[i][14], Blocks[i][15]);
+	for (i = 0; i < max_blocks; ++i) {
+		if (memory_blocks[i][ALLOC])
+			print_result("Block", memory_blocks[i], 16);
 		else
 			Dbprintf("<missing block %d>", i);
 	}
 	Dbprintf("-----------------------------------------");
 
+	if (found_blocks < max_blocks) {
+		Dbprintf("-----------------------------------------");
+		Dbprintf("Blocks with unknown position:");
+		Dbprintf("-----------------------------------------");
+		for (i = 0; i < single_blocks_cnt; ++i)
+			print_result("Block", single_blocks[i], 16);
+		
+		Dbprintf("-----------------------------------------");
+	}
 	cmd_send(CMD_ACK,0,0,0,0,0);
 }
 
-
-/* Write on a byte of a PCF7931 tag
- * @param address : address of the block to write
-   @param byte : address of the byte to write
-    @param data : data to write
- */
-void WritePCF7931(uint8_t pass1, uint8_t pass2, uint8_t pass3, uint8_t pass4, uint8_t pass5, uint8_t pass6, uint8_t pass7, uint16_t init_delay, int32_t l, int32_t p, uint8_t address, uint8_t byte, uint8_t data)
-{
+static void RealWritePCF7931(uint8_t *pass, uint16_t init_delay, int32_t l, int32_t p, uint8_t address, uint8_t byte, uint8_t data) {
 	uint32_t tab[1024] = {0}; // data times frame
 	uint32_t u = 0;
 	uint8_t parity = 0;
 	bool comp = 0;
 
 	//BUILD OF THE DATA FRAME
-
 	//alimentation of the tag (time for initializing)
 	AddPatternPCF7931(init_delay, 0, 8192/2*T0_PCF, tab);
-
-	//PMC
-	Dbprintf("Initialization delay : %d us", init_delay);
 	AddPatternPCF7931(8192/2*T0_PCF + 319*T0_PCF+70, 3*T0_PCF, 29*T0_PCF, tab);
-
-	Dbprintf("Offsets : %d us on the low pulses width, %d us on the low pulses positions", l, p);
-
 	//password indication bit
 	AddBitPCF7931(1, tab, l, p);
-
 	//password (on 56 bits)
-	Dbprintf("Password (LSB first on each byte) : %02x %02x %02x %02x %02x %02x %02x", pass1,pass2,pass3,pass4,pass5,pass6,pass7);
-	AddBytePCF7931(pass1, tab, l, p);
-	AddBytePCF7931(pass2, tab, l, p);
-	AddBytePCF7931(pass3, tab, l, p);
-	AddBytePCF7931(pass4, tab, l, p);
-	AddBytePCF7931(pass5, tab, l, p);
-	AddBytePCF7931(pass6, tab, l, p);
-	AddBytePCF7931(pass7, tab, l, p);
-
-
+	AddBytePCF7931(pass[0], tab, l, p);
+	AddBytePCF7931(pass[1], tab, l, p);
+	AddBytePCF7931(pass[2], tab, l, p);
+	AddBytePCF7931(pass[3], tab, l, p);
+	AddBytePCF7931(pass[4], tab, l, p);
+	AddBytePCF7931(pass[5], tab, l, p);
+	AddBytePCF7931(pass[6], tab, l, p);
 	//programming mode (0 or 1)
 	AddBitPCF7931(0, tab, l, p);
 
 	//block adress on 6 bits
-	Dbprintf("Block address : %02x", address);
-	for (u=0; u<6; u++)
-	{
+	for (u = 0; u < 6; ++u) {
 		if (address&(1<<u)) {	// bit 1
-			 parity++;
+			 ++parity;
 			 AddBitPCF7931(1, tab, l, p);
 		} else{					// bit 0
 			 AddBitPCF7931(0, tab, l, p);
@@ -321,59 +338,70 @@ void WritePCF7931(uint8_t pass1, uint8_t pass2, uint8_t pass3, uint8_t pass4, ui
 	}
 
 	//byte address on 4 bits
-	Dbprintf("Byte address : %02x", byte);
-	for (u=0; u<4; u++)
+	for (u = 0; u < 4; ++u)
 	{
 		if (byte&(1<<u)) {	// bit 1
 			 parity++;
 			 AddBitPCF7931(1, tab, l, p);
-		} else{				// bit 0
-			 AddBitPCF7931(0, tab, l, p);
 		}
+		else				// bit 0
+			 AddBitPCF7931(0, tab, l, p);
 	}
 
 	//data on 8 bits
-	Dbprintf("Data : %02x", data);
 	for (u=0; u<8; u++)
 	{
 		if (data&(1<<u)) {	// bit 1
 			 parity++;
 			 AddBitPCF7931(1, tab, l, p);
-		} else{				//bit 0
+		} 
+		else				//bit 0
 			 AddBitPCF7931(0, tab, l, p);
 		}
-	}
-
 
 	//parity bit
-	if((parity%2)==0){
+	if ((parity % 2) == 0)
 	 	AddBitPCF7931(0, tab, l, p); //even parity
-	}else{
+	else
 		AddBitPCF7931(1, tab, l, p);//odd parity
-	}
 
 	//time access memory
 	AddPatternPCF7931(5120+2680, 0, 0, tab);
 
 	//conversion of the scale time
-	for(u=0;u<500;u++){
+	for (u = 0; u < 500; ++u)
 		tab[u]=(tab[u] * 3)/2;
-	}
 
 	//compensation of the counter reload
 	while (!comp){
 		comp = 1;
-		for(u=0;tab[u]!=0;u++){
+		for (u = 0; tab[u] != 0; ++u)
 			if(tab[u] > 0xFFFF){
 			  tab[u] -= 0xFFFF;
 			  comp = 0;
 			}
 		}
-	}
 
 	SendCmdPCF7931(tab);
 }
 
+/* Write on a byte of a PCF7931 tag
+ * @param address : address of the block to write
+   @param byte : address of the byte to write
+    @param data : data to write
+ */
+void WritePCF7931(uint8_t pass1, uint8_t pass2, uint8_t pass3, uint8_t pass4, uint8_t pass5, uint8_t pass6, uint8_t pass7, uint16_t init_delay, int32_t l, int32_t p, uint8_t address, uint8_t byte, uint8_t data) {
+	Dbprintf("Initialization delay : %d us", init_delay);
+	Dbprintf("Offsets : %d us on the low pulses width, %d us on the low pulses positions", l, p);
+	Dbprintf("Password (LSB first on each byte): %02x %02x %02x %02x %02x %02x %02x", pass1, pass2, pass3, pass4, pass5, pass6, pass7);
+	Dbprintf("Block address : %02x", address);
+	Dbprintf("Byte address : %02x", byte);
+	Dbprintf("Data : %02x", data);
+	
+	uint8_t password[7] = {pass1, pass2, pass3, pass4, pass5, pass6, pass7};
+	
+	RealWritePCF7931 (password, init_delay, l, p, address, byte, data);
+}
 
 
 /* Send a trame to a PCF7931 tags
@@ -386,9 +414,7 @@ void SendCmdPCF7931(uint32_t * tab){
 	Dbprintf("Sending data frame...");
 
 	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-
 	FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
-
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_PASSTHRU );
 	
 	LED_A_ON();
@@ -405,21 +431,22 @@ void SendCmdPCF7931(uint32_t * tab){
 	AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN;
 	AT91C_BASE_TCB->TCB_BCR = 1;
 
-
 	tempo = AT91C_BASE_TC0->TC_CV;
 	for( u = 0; tab[u] != 0; u += 3){
-
 		// modulate antenna
 		HIGH(GPIO_SSC_DOUT);
-		while(tempo != tab[u]) tempo = AT91C_BASE_TC0->TC_CV;		
+		while (tempo !=  tab[u])
+			tempo = AT91C_BASE_TC0->TC_CV;
 
 		// stop modulating antenna
 		LOW(GPIO_SSC_DOUT);
-		while(tempo != tab[u+1]) tempo = AT91C_BASE_TC0->TC_CV;
+		while (tempo !=  tab[u+1])
+			tempo = AT91C_BASE_TC0->TC_CV;
 
 		// modulate antenna
 		HIGH(GPIO_SSC_DOUT);
-		while(tempo != tab[u+2]) tempo = AT91C_BASE_TC0->TC_CV;		
+		while (tempo !=  tab[u+2])
+			tempo = AT91C_BASE_TC0->TC_CV;
 	}
 
 	LED_A_OFF();
@@ -437,18 +464,16 @@ void SendCmdPCF7931(uint32_t * tab){
  * @param l : offset on low pulse width
  * @param p : offset on low pulse positioning
  */
-
 bool AddBytePCF7931(uint8_t byte, uint32_t * tab, int32_t l, int32_t p){
-
 	uint32_t u;
-	for ( u=0; u<8; u++)
-	{
-		if (byte&(1<<u)) {	//bit � 1
+	for (u = 0; u < 8; ++u) {
+		if (byte & (1 << u)) {	//bit is 1
 			if( AddBitPCF7931(1, tab, l, p)==1) return 1;
-		} else { //bit � 0
+		} else { //bit is 0
 			if (AddBitPCF7931(0, tab, l, p)==1) return 1;
 		}
 	}
+
 	return 0;
 }
 
diff --git a/armsrc/pcf7931.h b/armsrc/pcf7931.h
index 481670620..d87082b0f 100644
--- a/armsrc/pcf7931.h
+++ b/armsrc/pcf7931.h
@@ -7,9 +7,9 @@
 #include "pcf7931.h"
 #include "string.h"
 
-int DemodPCF7931(uint8_t **outBlocks);
-int IsBlock0PCF7931(uint8_t *Block);
-int IsBlock1PCF7931(uint8_t *Block);
+size_t DemodPCF7931(uint8_t **outBlocks);
+bool IsBlock0PCF7931(uint8_t *Block);
+bool IsBlock1PCF7931(uint8_t *Block);
 void ReadPCF7931();
 void SendCmdPCF7931(uint32_t * tab);
 bool AddBytePCF7931(uint8_t byte, uint32_t * tab, int32_t l, int32_t p);

From 3ae871f534008d231008f6657f4c3734b3cf78c5 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 7 Jan 2019 09:32:16 +0100
Subject: [PATCH 0380/1938] CHG: 'hf 14a antifuzz' - original implementation by
 @asfabw,  reworked a bit - WORK IN PROGRESS -

---
 armsrc/iso14443a.c | 146 ++++++++++++++++++++++-----------------------
 armsrc/iso14443a.h |   2 +
 client/cmdhf14a.c  |  29 ++++++---
 3 files changed, 92 insertions(+), 85 deletions(-)

diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 20225f416..91db762fc 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -14,7 +14,10 @@
 #define MAX_ISO14A_TIMEOUT 524288
 static uint32_t iso14a_timeout;
 
+uint8_t colpos = 0;
 int rsamples = 0;
+//int ReqCount;
+//char CollisionIndicators[10*8];
 
 uint8_t trigger = 0;
 // the block number for the ISO14443-4 PCB
@@ -103,6 +106,8 @@ static uint32_t LastProxToAirDuration;
 // Sequence D: 11110000 modulation with subcarrier during first half
 // Sequence E: 00001111 modulation with subcarrier during second half
 // Sequence F: 00000000 no modulation with subcarrier
+// Sequence COLL: 11111111 load modulation over the full bitlenght. 
+//                         Tricks the reader to think that multiple cards answer (at least one card with 1 and at least one card with 0).
 // READER TO CARD - miller
 // Sequence X: 00001100 drop after half a period
 // Sequence Y: 00000000 no drop
@@ -110,6 +115,7 @@ static uint32_t LastProxToAirDuration;
 #define	SEC_D 0xf0
 #define	SEC_E 0x0f
 #define	SEC_F 0x00
+#define SEC_COLL 0xff
 #define	SEC_X 0x0c
 #define	SEC_Y 0x00
 #define	SEC_Z 0xc0
@@ -643,7 +649,9 @@ void RAMFUNC SniffIso14443a(uint8_t param) {
 //-----------------------------------------------------------------------------
 // Prepare tag messages
 //-----------------------------------------------------------------------------
-static void CodeIso14443aAsTagPar(const uint8_t *cmd, uint16_t len, uint8_t *parity) {
+static void CodeIso14443aAsTagPar(const uint8_t *cmd, uint16_t len, uint8_t *parity, bool collision) {
+	
+	uint8_t localCol = 0;
 	ToSendReset();
 
 	// Correction bit, might be removed when not needed
@@ -651,7 +659,7 @@ static void CodeIso14443aAsTagPar(const uint8_t *cmd, uint16_t len, uint8_t *par
 	ToSendStuffBit(0);
 	ToSendStuffBit(0);
 	ToSendStuffBit(0);
-	ToSendStuffBit(1);  // 1
+	ToSendStuffBit(1);  // <-----
 	ToSendStuffBit(0);
 	ToSendStuffBit(0);
 	ToSendStuffBit(0);
@@ -665,12 +673,15 @@ static void CodeIso14443aAsTagPar(const uint8_t *cmd, uint16_t len, uint8_t *par
 
 		// Data bits
 		for(uint16_t j = 0; j < 8; j++) {
-			if(b & 1) {
+			if (collision && (localCol >= colpos)){
+				ToSend[++ToSendMax] = SEC_COLL;
+            } else if(b & 1) {
 				ToSend[++ToSendMax] = SEC_D;
 			} else {
 				ToSend[++ToSendMax] = SEC_E;
 			}
 			b >>= 1;
+            localCol++;
 		}
 
 		// Get the parity bit
@@ -690,10 +701,13 @@ static void CodeIso14443aAsTagPar(const uint8_t *cmd, uint16_t len, uint8_t *par
 	ToSendMax++;
 }
 
-static void CodeIso14443aAsTag(const uint8_t *cmd, uint16_t len) {
+static void CodeIso14443aAsTagEx(const uint8_t *cmd, uint16_t len, bool collision) {
 	uint8_t par[MAX_PARITY_SIZE] = {0};
 	GetParity(cmd, len, par);
-	CodeIso14443aAsTagPar(cmd, len, par);
+	CodeIso14443aAsTagPar(cmd, len, par, collision);
+}
+static void CodeIso14443aAsTag(const uint8_t *cmd, uint16_t len) {
+	CodeIso14443aAsTagEx(cmd, len, false);
 }
 
 static void Code4bitAnswerAsTag(uint8_t cmd) {
@@ -1680,9 +1694,11 @@ int EmSend4bit(uint8_t resp){
 				par);
 	return res;
 }
-
-int EmSendCmdPar(uint8_t *resp, uint16_t respLen, uint8_t *par){
-	CodeIso14443aAsTagPar(resp, respLen, par);
+int EmSendCmdPar(uint8_t *resp, uint16_t respLen, uint8_t *par) {
+	return EmSendCmdParEx(resp, respLen, par, false);
+}
+int EmSendCmdParEx(uint8_t *resp, uint16_t respLen, uint8_t *par, bool collision){
+	CodeIso14443aAsTagPar(resp, respLen, par, collision);
 	int res = EmSendCmd14443aRaw(ToSend, ToSendMax);
 	// do the tracing for the previous reader request and this tag answer:
 	EmLogTrace(Uart.output, 
@@ -1697,11 +1713,13 @@ int EmSendCmdPar(uint8_t *resp, uint16_t respLen, uint8_t *par){
 				par);
 	return res;
 }
-
 int EmSendCmd(uint8_t *resp, uint16_t respLen){
+	return EmSendCmdEx(resp, respLen, false);
+}
+int EmSendCmdEx(uint8_t *resp, uint16_t respLen, bool collision){
 	uint8_t par[MAX_PARITY_SIZE] = {0x00};
 	GetParity(resp, respLen, par);
-	return EmSendCmdPar(resp, respLen, par);
+	return EmSendCmdParEx(resp, respLen, par, collision);
 }
 
 bool EmLogTrace(uint8_t *reader_data, uint16_t reader_len, uint32_t reader_StartTime, uint32_t reader_EndTime, uint8_t *reader_Parity,
@@ -1805,45 +1823,21 @@ int ReaderReceive(uint8_t *receivedAnswer, uint8_t *parity) {
 // by fooling the reader there is a collision and forceing the reader to 
 // increase the uid bytes.   The might be an overflow, DoS will occure.
 void iso14443a_antifuzz(uint32_t flags){
-	/*
-	uint8_t uidlen = 4+1+1+2;
-	if (( flags & 2 ) == 2 )
-		uidlen = 7+1+1+2;
-	if (( flags & 4 ) == 4 )
-		uidlen = 10+1+1+2;
-		
-	uint8_t *uid = BigBuf_malloc(uidlen);
-	
-	// The first response contains the ATQA (note: bytes are transmitted in reverse order).
-	// Mifare Classic 1K
-	uint8_t atqa[] = {0x04, 0};
-
-	if ( (flags & 2) == 2 ) {
-		uid[0] = 0x88;  // Cascade Tag marker
-		uid[1] = 0x01;
-
-		// Configure the ATQA accordingly
-		atqa[0] |= 0x40;
-	} else {
-		memcpy(response2, data, 4);
-		// Configure the ATQA accordingly
-		atqa[0] &= 0xBF;
-	}	
 	
 	// We need to listen to the high-frequency, peak-detected path.
 	iso14443a_setup(FPGA_HF_ISO14443A_TAGSIM_LISTEN);
 
-	// allocate buffers:
-	uint8_t *received = BigBuf_malloc(MAX_FRAME_SIZE);
-	uint8_t *receivedPar = BigBuf_malloc(MAX_PARITY_SIZE);
-	uint16_t counter = 0;
-		
-	int len = 0;
-		
-	BigBuf_free();
+	BigBuf_free_keep_EM();
 	clear_trace();
 	set_tracing(true);
 	
+	int len = 0;
+		
+	// allocate buffers:
+	uint8_t *received = BigBuf_malloc(MAX_FRAME_SIZE);
+	uint8_t *receivedPar = BigBuf_malloc(MAX_PARITY_SIZE);
+	uint8_t *resp = BigBuf_malloc(8);
+
 	LED_A_ON();
 	for (;;) {	
 		WDT_HIT();
@@ -1853,47 +1847,47 @@ void iso14443a_antifuzz(uint32_t flags){
 			Dbprintf("Anti-fuzz stopped. Tracing: %d  trace length: %d ", tracing, BigBuf_get_traceLen());
 			break;
 		}
-		p_response = NULL;
+		if ( received[0] == ISO14443A_CMD_WUPA || received[0] == ISO14443A_CMD_REQA) {
+				resp[0] = 0x04;
+				resp[1] = 0x00;
+				
+				if ( (flags & FLAG_7B_UID_IN_DATA) == FLAG_7B_UID_IN_DATA ) {
+					resp[0] = 0x44;
+				}
+				
+				EmSendCmd(resp, 2);
+				continue;
+		}
 		
-		// look at the command now.
-		if (received[0] == ISO14443A_CMD_REQA) { // Received a REQUEST
-			p_response = &responses[0];
-		} else if (received[0] == ISO14443A_CMD_WUPA) { // Received a WAKEUP
-			p_response = &responses[0];
-		} else if (received[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT) {	// Received request for UID (cascade 1)
-			p_response = &responses[1];
-		} else if (received[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2) { 	// Received request for UID (cascade 2)
-			p_response = &responses[2];
-		} else if (received[1] == 0x70 && received[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT) {	// Received a SELECT (cascade 1)
-			p_response = &responses[3];
-		} else if (received[1] == 0x70 && received[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2) {	// Received a SELECT (cascade 2)
-			p_response = &responses[4];
-		}
-		if (p_response != NULL) {
+		// Received request for UID (cascade 1)
+		if (received[1] >= 0x20 && received[1] <= 0x57 && received[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT) {
+			resp[0] = 0x04;		
+			resp[1] = 0x1C;
+			resp[2] = 0xE1; 
+			resp[3] = 0xCE;
+			colpos = 0;
 			
-			EmSendCmd14443aRaw(p_response->modulation, p_response->modulation_n);
-			// do the tracing for the previous reader request and this tag answer:
-			uint8_t par[MAX_PARITY_SIZE] = {0x00};
-			GetParity(p_response->response, p_response->response_n, par);
+			if ( (flags & FLAG_7B_UID_IN_DATA) == FLAG_7B_UID_IN_DATA ) {
+				resp[0] = 0x88; 
+				colpos = 8;
+			}
 	
-			EmLogTrace(Uart.output, 
-						Uart.len, 
-						Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, 
-						Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, 
-						Uart.parity,
-						p_response->response, 
-						p_response->response_n,
-						LastTimeProxToAirStart*16 + DELAY_ARM2AIR_AS_TAG,
-						(LastTimeProxToAirStart + p_response->ProxToAirDuration)*16 + DELAY_ARM2AIR_AS_TAG, 
-						par);
+			EmSendCmdEx(resp, 4, true);			
+			if (MF_DBGLEVEL >= 4) Dbprintf("ANTICOLL or SELECT %x", received[1]);
+			
+			continue;
+		} else if (received[1] == 0x20 && received[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2) { 	// Received request for UID (cascade 2)
+			if (MF_DBGLEVEL >= 4) Dbprintf("ANTICOLL or SELECT_2");
+		} else if (received[1] == 0x70 && received[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT) {	// Received a SELECT (cascade 1)			
+		} else if (received[1] == 0x70 && received[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2) {	// Received a SELECT (cascade 2)				
+		} else {
+			Dbprintf("unknown command %x", received[0]); 
 		}
-		counter++;
 	}
 
 	cmd_send(CMD_ACK,1,0,0,0,0);
-	switch_off();	
-	Dbprintf("-[ UID until no response [%d]", counter);
-*/
+	switch_off();
+	BigBuf_free_keep_EM();
 }
 
 static void iso14a_set_ATS_times(uint8_t *ats) {
diff --git a/armsrc/iso14443a.h b/armsrc/iso14443a.h
index ff34fa577..7f979e531 100644
--- a/armsrc/iso14443a.h
+++ b/armsrc/iso14443a.h
@@ -122,8 +122,10 @@ extern void iso14a_set_trigger(bool enable);
 extern int EmSendCmd14443aRaw(uint8_t *resp, uint16_t respLen);
 extern int EmSend4bit(uint8_t resp);
 extern int EmSendCmd(uint8_t *resp, uint16_t respLen);
+extern int EmSendCmdEx(uint8_t *resp, uint16_t respLen, bool collision);
 extern int EmGetCmd(uint8_t *received, uint16_t *len, uint8_t *parity);
 extern int EmSendCmdPar(uint8_t *resp, uint16_t respLen, uint8_t *par);
+extern int EmSendCmdParEx(uint8_t *resp, uint16_t respLen, uint8_t *par, bool collision);
 extern int EmSendPrecompiledCmd(tag_response_info_t *response_info);
 
 bool EmLogTrace(uint8_t *reader_data, uint16_t reader_len, uint32_t reader_StartTime, uint32_t reader_EndTime, uint8_t *reader_Parity,
diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index b9d7bfcae..43832e2cf 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -213,11 +213,6 @@ int usage_hf_14a_info(void){
 	PrintAndLogEx(NORMAL, "       n    test for nack bug");
 	return 0;
 }
-int usage_hf_14a_antifuzz(void) {
-	PrintAndLogEx(NORMAL, "Usage: hf 14a antifuzz [4|7|10]");
-	PrintAndLogEx(NORMAL, "       <len>    determine which anticollision phase the command will target.");
-	return 0;
-}
 
 int CmdHF14AList(const char *Cmd) {
 	//PrintAndLogEx(NORMAL, "Deprecated command, use 'hf list 14a' instead");
@@ -1183,11 +1178,27 @@ static int waitCmd(uint8_t iSelect) {
 
 int CmdHF14AAntiFuzz(const char *cmd) {
 	
-	if (strlen(cmd) < 1) return usage_hf_14a_antifuzz();
+	CLIParserInit("hf 14a antifuzz", 
+		"Tries to fuzz the ISO14443a anticollision phase", 
+		"Usage:\n"
+		"\thf 14a antifuzz -4\n");
 
-	//	read param length
-	uint8_t arg0 = 4;
-	
+	void* argtable[] = {
+		arg_param_begin,
+		arg_lit0("4",   NULL,  "4 byte uid"),
+		arg_lit0("7",   NULL,  "7 byte uid"),
+		arg_lit0(NULL,  "10",  "10 byte uid"),
+		arg_param_end
+	};
+	CLIExecWithReturn(cmd, argtable, false);
+
+	uint8_t arg0 = FLAG_4B_UID_IN_DATA;
+	if (arg_get_lit(2))
+		arg0 = FLAG_7B_UID_IN_DATA;		
+	if (arg_get_lit(3))
+		arg0 = FLAG_10B_UID_IN_DATA;
+
+	CLIParserFree();
 	UsbCommand c = {CMD_ANTIFUZZ_ISO_14443a, {arg0, 0, 0}};	
 	clearCommandBuffer();
     SendCommand(&c);	

From 5a34550ac5b4e490e99f542ec28be6606e1a2f20 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Mon, 7 Jan 2019 17:49:09 +0100
Subject: [PATCH 0381/1938] CHG:  printing

---
 client/comms.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/comms.c b/client/comms.c
index 3c2b353b3..5beaa0adb 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -178,7 +178,7 @@ static void UsbCommandReceived(UsbCommand* c) {
 			break;
 		}
 		case CMD_DEBUG_PRINT_INTEGERS: {
-			PrintAndLogEx(NORMAL, "#db# %08x, %08x, %08x", c->arg[0], c->arg[1], c->arg[2]);
+			PrintAndLogEx(NORMAL, "#db# %" PRIx64 ", %" PRIx64 ", %" PRIx64 "", c->arg[0], c->arg[1], c->arg[2]);
 			break;
 		}
 		// iceman:  hw status - down the path on device, runs printusbspeed which starts sending a lot of

From 04893371bc61c9a4f4c98262ec6cc331d3fb1688 Mon Sep 17 00:00:00 2001
From: Iceman <iceman@iuse.se>
Date: Tue, 8 Jan 2019 00:05:00 +0100
Subject: [PATCH 0382/1938] Update README.md

---
 README.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index fdf02f0a2..4a4503b94 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,8 @@ This fork now compiles just fine on
 
 ## KALI and ARCHLINUX users
 Kali and ArchLinux users usually must kill their modem manager in order for the proxmark3 to enumerate properly.   
-   
+`sudo apt remove modemmanager`
+
 ## Setup and build for UBUNTU
 GC made updates to allow this to build easily on Ubuntu 14.04.2 LTS, 15.10 or 16.04
 See https://github.com/Proxmark/proxmark3/wiki/Ubuntu%20Linux
@@ -88,6 +89,9 @@ https://github.com/RfidResearchGroup/proxmark3/blob/master/install.sh
 `sudo pacman -Sy base-devel p7zip libusb readline ncurses libjansson-dev arm-none-eabi-newlib --needed`
 `yaourt -S termcap`
 
+- Remove modemmanager
+`sudo apt remove modemmanager`
+
 - Clone fork
 `git clone https://github.com/RfidResearchGroup/proxmark3.git`
 

From 7271d5afc90bfb1439c6e5c45066b9df5700bd54 Mon Sep 17 00:00:00 2001
From: Iceman <iceman@iuse.se>
Date: Tue, 8 Jan 2019 00:36:33 +0100
Subject: [PATCH 0383/1938] Update README.md

---
 README.md | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 65 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 4a4503b94..94f7b94d6 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ The new universial GUI will work.
 ## Development
 This fork now compiles just fine on 
    - Windows/mingw environment with Qt5.6.1 & GCC 4.8
-   - Ubuntu 1404, 1510, 1604
+   - Ubuntu 1404, 1510, 1604, 1804
    - Mac OS X / Homebrew
    - Docker container
 
@@ -159,7 +159,7 @@ Links
 - https://github.com/Gator96100/ProxSpace/releases/tag/v2.2   (release v2.2 with gcc v5.3.0 arm-none-eabi-gcc v7.1.0)
 
 
-### 7. Build and run
+### Build and run
 
 - Clone fork
 `git clone https://github.com/RfidResearchGroup/proxmark3.git`
@@ -181,5 +181,66 @@ Assuming you have Proxmark3 Windows drivers installed you can run the Proxmark s
 - Run the client	
 `proxmark3.exe comX`
 
-iceman at host iuse.se
-July 2018, Sweden
+
+## Validating proxmark client functionality
+
+If all went well you should get some information about the firmware and memory usage as well as the prompt,  something like this.
+
+>[=] UART Setting serial baudrate 460800
+>
+>Proxmark3 RFID instrument
+>
+> [ CLIENT ]
+>
+> client: iceman build for RDV40 with flashmem; smartcard;
+>
+> [ ARM ]
+>
+> bootrom: iceman/master/4517531c-dirty-unclean 2018-12-13 15:42:24
+>
+>   os: iceman/master/5a34550a-dirty-unclean 2019-01-07 23:04:07
+>
+> [ FPGA ]
+>
+> LF image built for 2s30vq100 on 2018/ 9/ 8 at 13:57:51
+>
+> HF image built for 2s30vq100 on 2018/ 9/ 3 at 21:40:23
+>
+> [ Hardware ]
+>
+>--= uC: AT91SAM7S512 Rev B
+>
+>--= Embedded Processor: ARM7TDMI
+>
+>--= Nonvolatile Program Memory Size: 512K bytes, Used: 247065 bytes (47%) Free: 277223 bytes (53%)
+>
+>--= Second Nonvolatile Program Memory Size: None
+>
+>--= Internal SRAM Size: 64K bytes
+>
+>--= Architecture Identifier: AT91SAM7Sxx Series
+>
+>--= Nonvolatile Program Memory Type: Embedded Flash Memory
+>
+> pm3 -->
+
+### run the following commands
+    pm3 --> hw status
+    pm3 --> hw version
+    pm3 --> hw tune
+
+You are now ready to use your newly upgraded proxmark3 device.  Many commands uses the **h** parameter to show a help text. The client uses a arcaic command structure which will be hard to grasp at first.  Here are some commands to start off with.
+
+    pm3 --> hf
+    pm3 --> hf 14a info
+    pm3 --> lf
+    pm3 --> lf search
+
+### Quit client
+    pm3 --> quit
+
+
+## the end
+
+`iceman at host iuse.se`
+`July 2018, Sweden`

From 9b7089e71f8ce14353a7239bdedaee3b5cf08967 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 8 Jan 2019 02:16:39 +0100
Subject: [PATCH 0384/1938] FIX: remove warning of overwriting

---
 client/ui.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/ui.c b/client/ui.c
index 868545833..a0151a8db 100644
--- a/client/ui.c
+++ b/client/ui.c
@@ -48,10 +48,10 @@ void PrintAndLogEx(logLevel_t level, char *fmt, ...) {
 	// skip debug messages if client debugging is turned off i.e. 'DATA SETDEBUG 0' 
 	if (g_debugMode	== 0 && level == DEBUG)
 		return;
-	
+
+	char prefix[20] = {0};	
 	char buffer[MAX_PRINT_BUFFER] = {0};
-	char buffer2[MAX_PRINT_BUFFER] = {0};
-	char prefix[20] = {0};
+	char buffer2[MAX_PRINT_BUFFER+20] = {0};
 	char *token = NULL;
 	int size = 0;
 						//   {NORMAL, SUCCESS, INFO, FAILED, WARNING, ERR, DEBUG}

From 2d5d8c130d9d83276ecf48a6e81fae9d081478c1 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 8 Jan 2019 02:22:41 +0100
Subject: [PATCH 0385/1938] chg: 'hf list 14a' - another 7bit command 0x35

---
 client/cmdhflist.c | 1 +
 common/protocols.h | 1 +
 2 files changed, 2 insertions(+)

diff --git a/client/cmdhflist.c b/client/cmdhflist.c
index e4a7e27b4..7791c5e53 100644
--- a/client/cmdhflist.c
+++ b/client/cmdhflist.c
@@ -159,6 +159,7 @@ int applyIso14443a(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize) {
 			MifareAuthState = masNone;
 			break;
 		case ISO14443A_CMD_RATS:		snprintf(exp,size,"RATS"); break;
+		case ISO14443A_CMD_OPTS:        snprintf(exp,size,"OPTIONAL TIMESLOT"); break;		
 		case MIFARE_CMD_INC:			snprintf(exp,size,"INC(%d)",cmd[1]); break;
 		case MIFARE_CMD_DEC:			snprintf(exp,size,"DEC(%d)",cmd[1]); break;
 		case MIFARE_CMD_RESTORE:		snprintf(exp,size,"RESTORE(%d)",cmd[1]); break;
diff --git a/common/protocols.h b/common/protocols.h
index 8db1d481e..9696c73e0 100644
--- a/common/protocols.h
+++ b/common/protocols.h
@@ -144,6 +144,7 @@ ISO 7816-4 Basic interindustry commands. For command APDU's.
 #define ISO14443A_CMD_REQA       0x26
 #define ISO14443A_CMD_READBLOCK  0x30
 #define ISO14443A_CMD_WUPA       0x52
+#define ISO14443A_CMD_OPTS       0x35
 #define ISO14443A_CMD_ANTICOLL_OR_SELECT     0x93
 #define ISO14443A_CMD_ANTICOLL_OR_SELECT_2   0x95
 #define ISO14443A_CMD_ANTICOLL_OR_SELECT_3   0x97

From 699a3b71524027bf712a30abdb7af2ea056294c8 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 8 Jan 2019 02:23:06 +0100
Subject: [PATCH 0386/1938] FIX: remove overwriting warning

---
 client/jansson/load.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/client/jansson/load.c b/client/jansson/load.c
index 8700919fd..9f73ea02c 100644
--- a/client/jansson/load.c
+++ b/client/jansson/load.c
@@ -89,7 +89,7 @@ static void error_set(json_error_t *error, const lex_t *lex,
 {
     va_list ap;
     char msg_text[JSON_ERROR_TEXT_LENGTH];
-    char msg_with_context[JSON_ERROR_TEXT_LENGTH];
+    char msg_with_context[JSON_ERROR_TEXT_LENGTH + 20];
 
     int line = -1, col = -1;
     size_t pos = 0;
@@ -114,9 +114,8 @@ static void error_set(json_error_t *error, const lex_t *lex,
         if(saved_text && saved_text[0])
         {
             if(lex->saved_text.length <= 20) {
-                snprintf(msg_with_context, JSON_ERROR_TEXT_LENGTH,
-                         "%s near '%s'", msg_text, saved_text);
-                msg_with_context[JSON_ERROR_TEXT_LENGTH - 1] = '\0';
+                snprintf(msg_with_context, JSON_ERROR_TEXT_LENGTH, "%s near '%s'", msg_text, saved_text);
+                msg_with_context[JSON_ERROR_TEXT_LENGTH + 20 - 1] = '\0';
                 result = msg_with_context;
             }
         }
@@ -131,9 +130,8 @@ static void error_set(json_error_t *error, const lex_t *lex,
                 result = msg_text;
             }
             else {
-                snprintf(msg_with_context, JSON_ERROR_TEXT_LENGTH,
-                         "%s near end of file", msg_text);
-                msg_with_context[JSON_ERROR_TEXT_LENGTH - 1] = '\0';
+                snprintf(msg_with_context, JSON_ERROR_TEXT_LENGTH, "%s near end of file", msg_text);
+                msg_with_context[JSON_ERROR_TEXT_LENGTH + 20 - 1] = '\0';
                 result = msg_with_context;
             }
         }

From dac30911a3d69a4c6cd02dd4e774493d465f7e42 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 8 Jan 2019 10:56:56 +0100
Subject: [PATCH 0387/1938] FIX: remove gcc8.2 warnings

---
 client/cmdhfmf.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index d92b2a1d4..985965d72 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -894,9 +894,9 @@ int CmdHF14AMfRestore(const char *Cmd) {
 	uint8_t keyB[40][6];
 	uint8_t numSectors = 16;
 	uint8_t cmdp = 0;
-	char keyFilename[FILE_PATH_SIZE]="";	
-	char dataFilename[FILE_PATH_SIZE]="";
-	char szTemp[FILE_PATH_SIZE]="";	
+	char keyFilename[FILE_PATH_SIZE] = "";	
+	char dataFilename[FILE_PATH_SIZE] = "";
+	char szTemp[FILE_PATH_SIZE-20] = "";	
 	char *fptr;
 	FILE *fdump, *fkeys;
 
@@ -905,7 +905,7 @@ int CmdHF14AMfRestore(const char *Cmd) {
 		case 'h':
 			return usage_hf14_restore();
 		case 'u':
-			param_getstr(Cmd, cmdp+1, szTemp, FILE_PATH_SIZE); 
+			param_getstr(Cmd, cmdp+1, szTemp, FILE_PATH_SIZE-20); 
 			if(keyFilename[0]==0x00)
 				snprintf(keyFilename, FILE_PATH_SIZE, "hf-mf-%s-key.bin", szTemp);
 			if(dataFilename[0]==0x00)
@@ -1280,7 +1280,7 @@ int CmdHF14AMfNestedHard(const char *Cmd) {
 	uint8_t trgkey[6] = {0, 0, 0, 0, 0, 0};
 	uint8_t cmdp=0;
 	char filename[FILE_PATH_SIZE], *fptr;
-	char szTemp[FILE_PATH_SIZE];
+	char szTemp[FILE_PATH_SIZE-20];
 	char ctmp;
 	
 	bool know_target_key = false;
@@ -1370,13 +1370,13 @@ int CmdHF14AMfNestedHard(const char *Cmd) {
 			strncpy(filename, fptr, FILE_PATH_SIZE);
 			break;
 		case 'u':
-			param_getstr(Cmd, cmdp+1, szTemp, FILE_PATH_SIZE);
+			param_getstr(Cmd, cmdp+1, szTemp, FILE_PATH_SIZE-20);
 			snprintf(filename, FILE_PATH_SIZE, "hf-mf-%s-nonces.bin", szTemp);
 			cmdp++;
 			break;
 		case 'f':
-			param_getstr(Cmd, cmdp+1, szTemp, FILE_PATH_SIZE);
-			strncpy(filename, szTemp, FILE_PATH_SIZE);
+			param_getstr(Cmd, cmdp+1, szTemp, FILE_PATH_SIZE-20);
+			strncpy(filename, szTemp, FILE_PATH_SIZE-20);
 			cmdp++;
 			break;
 		case 'i': 

From a17bf8e5592c8336a155b5dc4dd016fa0d08b192 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 8 Jan 2019 11:20:42 +0100
Subject: [PATCH 0388/1938] FIX: remove gcc8.2 warning

---
 client/util.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/util.c b/client/util.c
index 22490f62a..5d7ce0370 100644
--- a/client/util.c
+++ b/client/util.c
@@ -313,11 +313,11 @@ char *sprint_hex_ascii(const uint8_t *data, const size_t len) {
 	memset(buf, 0x00, UTIL_BUFFER_SIZE_SPRINT);
 	size_t max_len = (len > 1010) ? 1010 : len;
 
-	sprintf(tmp, "%s| ", sprint_hex(data, max_len) );
+	snprintf(tmp, UTIL_BUFFER_SIZE_SPRINT, "%s| ", sprint_hex(data, max_len) );
 	
 	size_t i = 0;
-	size_t pos = (max_len * 3)+2;
-	while(i < max_len){
+	size_t pos = (max_len * 3) + 2;
+	while (i < max_len){
 		char c = data[i];
 		if ( (c < 32) || (c == 127))
 			c = '.';

From 11e0c09fdd6e2991f96515c3b7f9f9623686a7fa Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 8 Jan 2019 16:48:04 +0100
Subject: [PATCH 0389/1938] CHG: more definitions

---
 client/emv/emv_tags.c | 150 ++++++++++++++++++++++++++++++++++++++----
 1 file changed, 137 insertions(+), 13 deletions(-)

diff --git a/client/emv/emv_tags.c b/client/emv/emv_tags.c
index 74a37aba6..521598b67 100644
--- a/client/emv/emv_tags.c
+++ b/client/emv/emv_tags.c
@@ -175,7 +175,8 @@ static const struct emv_tag emv_tags[] = {
 	// internal
 	{ 0x00  , "Unknown ???" },
 	{ 0x01  , "", EMV_TAG_STRING }, // string for headers
-	{ 0x02  , "Raw data", }, // data
+	{ 0x02  , "Raw data" }, // data
+	{ 0x06  , "Object Identifier (OID)" },
 	{ 0x20  , "Cardholder Verification Results (CVR)", EMV_TAG_CVR }, // not standard!
 	{ 0x21  , "Input list for Offline Data Authentication" }, // not standard! data for "Offline Data Authentication" come from "read records" command. (EMV book3 10.3)
 
@@ -184,6 +185,9 @@ static const struct emv_tag emv_tags[] = {
 	{ 0x42  , "Issuer Identification Number (IIN)" },
 	{ 0x4f  , "Application Dedicated File (ADF) Name" },
 	{ 0x50  , "Application Label", EMV_TAG_STRING },
+	{ 0x51  , "File reference data element" },
+	{ 0x52  , "Command APDU" },
+	{ 0x53  , "Discretionary data (or template)" },
 	{ 0x56  , "Track 1 Data" },
 	{ 0x57  , "Track 2 Equivalent Data" },
 	{ 0x5a  , "Application Primary Account Number (PAN)" },
@@ -195,6 +199,13 @@ static const struct emv_tag emv_tags[] = {
 	{ 0x5f2d, "Language Preference", EMV_TAG_STRING },
 	{ 0x5f30, "Service Code", EMV_TAG_NUMERIC },
 	{ 0x5f34, "Application Primary Account Number (PAN) Sequence Number", EMV_TAG_NUMERIC },
+	{ 0x5f36, "Transaction Currency Exponent",  EMV_TAG_NUMERIC },	
+	{ 0x5f50, "Issuer URL", EMV_TAG_STRING },
+	{ 0x5f53, "International Bank Account Number (IBAN)" },
+	{ 0x5f54, "Bank Identifier Code (BIC)" },
+	{ 0x5f55, "Issuer Country Code (alpha2 format)", EMV_TAG_STRING },
+	{ 0x5f56, "Issuer Country Code (alpha3 format)", EMV_TAG_STRING },
+		
 	{ 0x61  , "Application Template" },
 	{ 0x6f  , "File Control Information (FCI) Template" },
 	{ 0x70  , "READ RECORD Response Message Template" },
@@ -203,11 +214,14 @@ static const struct emv_tag emv_tags[] = {
 	{ 0x73  , "Directory Discretionary Template" },
 	{ 0x77  , "Response Message Template Format 2" },
 	{ 0x80  , "Response Message Template Format 1" },
+	{ 0x81  , "Amount, Authorised (Binary)" },
 	{ 0x82  , "Application Interchange Profile", EMV_TAG_BITMASK, &EMV_AIP },
 	{ 0x83  , "Command Template" },
 	{ 0x84  , "Dedicated File (DF) Name" },
+	{ 0x86	, "Issuer Script Command" },
 	{ 0x87  , "Application Priority Indicator" },
 	{ 0x88  , "Short File Identifier (SFI)" },
+	{ 0x89  , "Authorisation Code" },
 	{ 0x8a  , "Authorisation Response Code" },
 	{ 0x8c  , "Card Risk Management Data Object List 1 (CDOL1)", EMV_TAG_DOL },
 	{ 0x8d  , "Card Risk Management Data Object List 2 (CDOL2)", EMV_TAG_DOL },
@@ -219,14 +233,25 @@ static const struct emv_tag emv_tags[] = {
 	{ 0x93  , "Signed Static Application Data" },
 	{ 0x94  , "Application File Locator (AFL)", EMV_TAG_AFL },
 	{ 0x95  , "Terminal Verification Results" },
+	{ 0x97  , "Transaction Certificate Data Object List (TDOL)" },
+	{ 0x98  , "Transaction Certificate (TC) Hash Value" },
+	{ 0x99  , "Transaction Personal Identification Number (PIN) Data" },
 	{ 0x9a  , "Transaction Date", EMV_TAG_YYMMDD },
-	{ 0x9c  , "Transaction Type" },
+	{ 0x9b  , "Transaction Status Information" },
+	{ 0x9c  , "Transaction Type", EMV_TAG_NUMERIC },
+	{ 0x9d  , "Directory Definition File (DDF) Name" },
+	
+	{ 0x9f01, "Acquirer Identifier", EMV_TAG_NUMERIC },
 	{ 0x9f02, "Amount, Authorised (Numeric)", EMV_TAG_NUMERIC },
-	{ 0x9f03, "Amount, Other (Numeric)", EMV_TAG_NUMERIC, },
+	{ 0x9f03, "Amount, Other (Numeric)", EMV_TAG_NUMERIC },
+	{ 0x9f04, "Amount, Other (Binary)", EMV_TAG_NUMERIC },
+	{ 0x9f05, "Application Discretionary Data" },
 	{ 0x9f06, "Application Identifier (AID), Terminal. ISO 7816-5" },
 	{ 0x9f07, "Application Usage Control", EMV_TAG_BITMASK, &EMV_AUC },
 	{ 0x9f08, "Application Version Number" },
+	{ 0x9f09, "Application Version Number - terminal" },
 	{ 0x9f0a, "Application Selection Registered Proprietary Data" }, // https://blog.ul-ts.com/posts/electronic-card-identifier-one-more-step-for-mif-compliance/
+	{ 0x9f0b, "Cardholder Name Extended", EMV_TAG_STRING },
 	{ 0x9f0d, "Issuer Action Code - Default", EMV_TAG_BITMASK, &EMV_TVR },
 	{ 0x9f0e, "Issuer Action Code - Denial", EMV_TAG_BITMASK, &EMV_TVR },
 	{ 0x9f0f, "Issuer Action Code - Online", EMV_TAG_BITMASK, &EMV_TVR },
@@ -234,11 +259,21 @@ static const struct emv_tag emv_tags[] = {
 	{ 0x9f11, "Issuer Code Table Index", EMV_TAG_NUMERIC },
 	{ 0x9f12, "Application Preferred Name", EMV_TAG_STRING },
 	{ 0x9f13, "Last Online Application Transaction Counter (ATC) Register" },
+	{ 0x9f14, "Lower Consecutive Offline Limit" },
+	{ 0x9f15, "Merchant Category Code", EMV_TAG_NUMERIC },
+	{ 0x9f16, "Merchant Identifier", EMV_TAG_STRING },
 	{ 0x9f17, "Personal Identification Number (PIN) Try Counter" },
+	{ 0x9f18, "Issuer Script Identifier" },
 	{ 0x9f1a, "Terminal Country Code" },
+	{ 0x9f1b, "Terminal Floor Limit" },
+	{ 0x9f1c, "Terminal Identification", EMV_TAG_STRING },
+	{ 0x9f1d, "Terminal Risk Management Data" },
+	{ 0x9f1e, "Interface Device (IFD) Serial Number", EMV_TAG_STRING },	
 	{ 0x9f1f, "Track 1 Discretionary Data", EMV_TAG_STRING },
 	{ 0x9f20, "Track 2 Discretionary Data", EMV_TAG_STRING },
-	{ 0x9f21, "Transaction Time" },
+	{ 0x9f21, "Transaction Time" },	
+	{ 0x9f22, "Certification Authority Public Key Index - Terminal" },
+	{ 0x9f23, "Upper Consecutive Offline Limit" },
 	{ 0x9f26, "Application Cryptogram" },
 	{ 0x9f27, "Cryptogram Information Data", EMV_TAG_CID },
 	{ 0x9f2a, "Kernel Identifier" },
@@ -246,12 +281,21 @@ static const struct emv_tag emv_tags[] = {
 	{ 0x9f2e, "ICC PIN Encipherment Public Key Exponent" },
 	{ 0x9f2f, "ICC PIN Encipherment Public Key Remainder" },
 	{ 0x9f32, "Issuer Public Key Exponent" },
+	{ 0x9f33, "Terminal Capabilities" },
 	{ 0x9f34, "Cardholder Verification Method (CVM) Results" },
 	{ 0x9f35, "Terminal Type" },
 	{ 0x9f36, "Application Transaction Counter (ATC)" },
 	{ 0x9f37, "Unpredictable Number" },
 	{ 0x9f38, "Processing Options Data Object List (PDOL)", EMV_TAG_DOL },
+	{ 0x9f39, "Point-of-Service (POS) Entry Mode", EMV_TAG_NUMERIC },
+	{ 0x9f3a, "Amount, Reference Currency" },
+	{ 0x9f3b, "Application Reference Currency", EMV_TAG_NUMERIC },
+	{ 0x9f3c, "Transaction Reference Currency Code", EMV_TAG_NUMERIC },
+	{ 0x9f3d, "Transaction Reference Currency Exponent", EMV_TAG_NUMERIC },
+	{ 0x9f40, "Additional Terminal Capabilities" },
+	{ 0x9f41, "Transaction Sequence Counter", EMV_TAG_NUMERIC },
 	{ 0x9f42, "Application Currency Code", EMV_TAG_NUMERIC },
+	{ 0x9f43, "Application Reference Currency Exponent", EMV_TAG_NUMERIC },
 	{ 0x9f44, "Application Currency Exponent", EMV_TAG_NUMERIC },
 	{ 0x9f45, "Data Authentication Code" },
 	{ 0x9f46, "ICC Public Key Certificate" },
@@ -262,14 +306,22 @@ static const struct emv_tag emv_tags[] = {
 	{ 0x9f4b, "Signed Dynamic Application Data" },
 	{ 0x9f4c, "ICC Dynamic Number" },
 	{ 0x9f4d, "Log Entry" },
+	{ 0x9f4e, "Merchant Name and Location", EMV_TAG_STRING },
 	{ 0x9f4f, "Log Format", EMV_TAG_DOL },
 	
 	{ 0x9f50, "Offline Accumulator Balance" },
 	{ 0x9f51, "Application Currency Code" },
 	{ 0x9f51, "DRDOL" },
+
 	{ 0x9f52, "Application Default Action (ADA)" },
 	{ 0x9f52, "Terminal Compatibility Indicator" },
+	
+	{ 0x9f53, "Transaction Category Code" },
+	{ 0x9f54, "DS ODS Card" },
+	
+	{ 0x9f55, "Mobile Support Indicator" },	
 	{ 0x9f55, "Issuer Authentication Flags" },
+	
 	{ 0x9f56, "Issuer Authentication Indicator" },
 	{ 0x9f57, "Issuer Country Code" },
 	{ 0x9f58, "Consecutive Transaction Counter Limit (CTCL)" },
@@ -277,27 +329,99 @@ static const struct emv_tag emv_tags[] = {
 	{ 0x9f5A, "Application Program Identifier" },
 	{ 0x9f5b, "Issuer Script Results" },
 	{ 0x9f5c, "Cumulative Total Transaction Amount Upper Limit (CTTAUL)" },
+	{ 0x9f5d, "Application Capabilities Information" },
+	{ 0x9f5e, "Data Storage Identifier" },
+	{ 0x9f5f, "DS Slot Availability" },
 	
 	{ 0x9f60, "CVC3 (Track1)" },
 	{ 0x9f61, "CVC3 (Track2)" },
-	{ 0x9f62, "PCVC3(Track1)" },
-	{ 0x9f63, "PUNATC(Track1)" },
-	{ 0x9f64, "NATC(Track1)" },
-	{ 0x9f65, "PCVC3(Track2)" },
-	{ 0x9f66, "PUNATC(Track2) / Terminal Transaction Qualifiers (TTQ)", EMV_TAG_BITMASK, &EMV_TTQ },
-	{ 0x9f67, "NATC(Track2) / MSD Offset" },
+	{ 0x9f62, "PCVC3 (Track1)" },
+	{ 0x9f63, "PUNATC (Track1)" },
+	{ 0x9f64, "NATC (Track1)" },
+	{ 0x9f65, "PCVC3 (Track2)" },
+	{ 0x9f66, "PUNATC (Track2) / Terminal Transaction Qualifiers (TTQ)", EMV_TAG_BITMASK, &EMV_TTQ },
+	{ 0x9f67, "NATC (Track2) / MSD Offset" },
 	{ 0x9f68, "Cardholder verification method list (PayPass)" },
-	{ 0x9f69, "Card Authentication Related Data" },
+	{ 0x9f69, "Card Authentication Related Data (UDOL)" },
 	{ 0x9f6a, "Unpredictable Number", EMV_TAG_NUMERIC },
 	{ 0x9f6b, "Track 2 Data" },
 	{ 0x9f6c, "Card Transaction Qualifiers (CTQ)", EMV_TAG_BITMASK, &EMV_CTQ },
+	{ 0x9f6d, "Mag-stripe Application Version Number (Reader)" },
 	{ 0x9f6e, "Form Factor Indicator" },
-	
-	{ 0x9f7c, "Customer Exclusive Data (CED)"},
+	{ 0x9f6f, "DS Slot Management Control" },
+
+	{ 0x9f70, "Protected Data Envelope 1" },
+	{ 0x9f71, "Protected Data Envelope 2" },
+	{ 0x9f72, "Protected Data Envelope 3" },
+	{ 0x9f73, "Protected Data Envelope 4" },
+	{ 0x9f74, "Protected Data Envelope 5" },
+	{ 0x9f75, "Unprotected Data Envelope 1" },
+	{ 0x9f76, "Unprotected Data Envelope 2" },
+	{ 0x9f77, "Unprotected Data Envelope 3" },
+	{ 0x9f78, "Unprotected Data Envelope 4" },
+	{ 0x9f79, "Unprotected Data Envelope 5" },
+	{ 0x9f7c, "Merchant Custom Data / Customer Exclusive Data (CED)" },
+	{ 0x9f7d, "DS Summary 1" },
+	{ 0x9f7f, "DS Unpredictable Number" },
 
 	{ 0xa5  , "File Control Information (FCI) Proprietary Template" },
 	{ 0xbf0c, "File Control Information (FCI) Issuer Discretionary Data" },
 	{ 0xdf20, "Issuer Proprietary Bitmap (IPB)" },
+	{ 0xdf4b, "POS Cardholder Interaction Information" },
+	{ 0xdf60, "VISA Log Entry" },
+	{ 0xdf61, "DS Digest H" },
+	{ 0xdf62, "DS ODS Info" },
+	{ 0xdf63, "DS ODS Term" },
+
+	{ 0xdf8104, "Balance Read Before Gen AC" },
+	{ 0xdf8105, "Balance Read After Gen AC" },
+	{ 0xdf8106, "Data Needed" },
+	{ 0xdf8107, "CDOL1 Related Data" },
+	{ 0xdf8108, "DS AC Type" },
+	{ 0xdf8109, "DS Input (Term)" },
+	{ 0xdf810a, "DS ODS Info For Reader" },
+	{ 0xdf810b, "DS Summary Status" },
+	{ 0xdf810c, "Kernel ID" },
+	{ 0xdf810d, "DSVN Term" },
+	{ 0xdf810e, "Post-Gen AC Put Data Status" },
+	{ 0xdf810f, "Pre-Gen AC Put Data Status" },
+	{ 0xdf8110, "Proceed To First Write Flag" },
+	{ 0xdf8111, "PDOL Related Data" },
+	{ 0xdf8112, "Tags To Read" },
+	{ 0xdf8113, "DRDOL Related Data" },
+	{ 0xdf8114, "Reference Control Parameter" },
+	{ 0xdf8115, "Error Indication" },
+	{ 0xdf8116, "User Interface Request Data" },
+	{ 0xdf8117, "Card Data Input Capability" },
+	{ 0xdf8118, "CVM Capability - CVM Required" },
+	{ 0xdf8119, "CVM Capability - No CVM Required" },
+	{ 0xdf811a, "Default UDOL" },
+	{ 0xdf811b, "Kernel Configuration" },
+	{ 0xdf811c, "Max Lifetime of Torn Transaction Log Record" },
+	{ 0xdf811d, "Max Number of Torn Transaction Log Records" },
+	{ 0xdf811e, "Mag-stripe CVM Capability – CVM Required" },
+	{ 0xdf811f, "Security Capability" },
+	{ 0xdf8120, "Terminal Action Code – Default" },
+	{ 0xdf8121, "Terminal Action Code – Denial" },
+	{ 0xdf8122, "Terminal Action Code – Online" },
+	{ 0xdf8123, "Reader Contactless Floor Limit" },
+	{ 0xdf8124, "Reader Contactless Transaction Limit (No On-device CVM)" },
+	{ 0xdf8125, "Reader Contactless Transaction Limit (On-device CVM)" },
+	{ 0xdf8126, "Reader CVM Required Limit" },
+	{ 0xdf8127, "TIME_OUT_VALUE" },
+	{ 0xdf8128, "IDS Status" },
+	{ 0xdf8129, "Outcome Parameter Set" },
+	{ 0xdf812a, "DD Card (Track1)" },
+	{ 0xdf812b, "DD Card (Track2)" },
+	{ 0xdf812c, "Mag-stripe CVM Capability – No CVM Required" },
+	{ 0xdf812d, "Message Hold Time" },
+
+	{ 0xff8101, "Torn Record" },
+	{ 0xff8102, "Tags To Write Before Gen AC" },
+	{ 0xff8103, "Tags To Write After Gen AC" },
+	{ 0xff8104, "Data To Send" },
+	{ 0xff8105, "Data Record" },
+	{ 0xff8106, "Discretionary Data" },	
 };
 
 static int emv_sort_tag(tlv_tag_t tag) {

From ce6320cdc1d130be3e17fbc4fe9f13287869c9f3 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 8 Jan 2019 19:22:27 +0200
Subject: [PATCH 0390/1938] change sc apdu to be compatible with 14a apdu

---
 client/cmdsmartcard.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index a864e2358..fdc825d38 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -533,7 +533,7 @@ int ExchangeAPDUSC(uint8_t *datain, int datainlen, bool activateCard, bool leave
 	int len = smart_responseEx(dataout, true);
 	
 	if ( len < 0 ) {
-		return 2;
+		return 1;
 	}
 	
 	// retry

From 1fb79486232fc245ddbb0bbfeff226e6eafbe73f Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 8 Jan 2019 19:49:31 +0200
Subject: [PATCH 0391/1938] emv commands now prints channel

---
 client/emv/cmdemv.c | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index 396918d7e..206401917 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -40,6 +40,17 @@ void ParamLoadDefaults(struct tlvdb *tlvRoot) {
 	TLV_ADD(0x9F66, "\x26\x00\x00\x00"); // qVSDC
 }
 
+void PrintChannel(EMVCommandChannel channel) {
+	switch(channel) {
+	case ECC_CONTACTLESS:
+		PrintAndLogEx(INFO, "Channel: CONTACTLESS");
+		break;
+	case ECC_CONTACT:
+		PrintAndLogEx(INFO, "Channel: CONTACT");
+		break;
+	}
+}
+
 int CmdEMVSelect(const char *cmd) {
 	uint8_t data[APDU_AID_LEN] = {0};
 	int datalen = 0;
@@ -67,6 +78,7 @@ int CmdEMVSelect(const char *cmd) {
 	EMVCommandChannel channel = ECC_CONTACTLESS;
 	if (arg_get_lit(5))
 		channel = ECC_CONTACT;
+	PrintChannel(channel);
 	CLIGetHexWithReturn(6, data, &datalen);
 	CLIParserFree();
 	
@@ -114,6 +126,7 @@ int CmdEMVSearch(const char *cmd) {
 	EMVCommandChannel channel = ECC_CONTACTLESS;
 	if (arg_get_lit(5))
 		channel = ECC_CONTACT;
+	PrintChannel(channel);
 	CLIParserFree();
 	
 	SetAPDULogging(APDULogging);
@@ -170,6 +183,7 @@ int CmdEMVPPSE(const char *cmd) {
 	EMVCommandChannel channel = ECC_CONTACTLESS;
 	if (arg_get_lit(7))
 		channel = ECC_CONTACT;
+	PrintChannel(channel);
 	CLIParserFree();	
 	
 	SetAPDULogging(APDULogging);
@@ -224,6 +238,7 @@ int CmdEMVGPO(const char *cmd) {
 	EMVCommandChannel channel = ECC_CONTACTLESS;
 	if (arg_get_lit(6))
 		channel = ECC_CONTACT;
+	PrintChannel(channel);
 	CLIGetHexWithReturn(7, data, &datalen);
 	CLIParserFree();	
 	
@@ -317,6 +332,7 @@ int CmdEMVReadRecord(const char *cmd) {
 	EMVCommandChannel channel = ECC_CONTACTLESS;
 	if (arg_get_lit(4))
 		channel = ECC_CONTACT;
+	PrintChannel(channel);
 	CLIGetHexWithReturn(5, data, &datalen);
 	CLIParserFree();
 	
@@ -399,6 +415,7 @@ int CmdEMVAC(const char *cmd) {
 	EMVCommandChannel channel = ECC_CONTACTLESS;
 	if (arg_get_lit(8))
 		channel = ECC_CONTACT;
+	PrintChannel(channel);
 	CLIGetHexWithReturn(9, data, &datalen);
 	CLIParserFree();	
 	
@@ -481,6 +498,7 @@ int CmdEMVGenerateChallenge(const char *cmd) {
 	EMVCommandChannel channel = ECC_CONTACTLESS;
 	if (arg_get_lit(3))
 		channel = ECC_CONTACT;
+	PrintChannel(channel);
 	CLIParserFree();	
 	
 	SetAPDULogging(APDULogging);
@@ -539,6 +557,7 @@ int CmdEMVInternalAuthenticate(const char *cmd) {
 	EMVCommandChannel channel = ECC_CONTACTLESS;
 	if (arg_get_lit(6))
 		channel = ECC_CONTACT;
+	PrintChannel(channel);
 	CLIGetHexWithReturn(7, data, &datalen);
 	CLIParserFree();	
 	
@@ -722,6 +741,7 @@ int CmdEMVExec(const char *cmd) {
 	EMVCommandChannel channel = ECC_CONTACTLESS;
 	if (arg_get_lit(11))
 		channel = ECC_CONTACT;
+	PrintChannel(channel);
 	uint8_t psenum = (channel == ECC_CONTACT) ? 1 : 2;
 	CLIParserFree();
 	
@@ -1171,6 +1191,7 @@ int CmdEMVScan(const char *cmd) {
 	EMVCommandChannel channel = ECC_CONTACTLESS;
 	if (arg_get_lit(11))
 		channel = ECC_CONTACT;
+	PrintChannel(channel);
 	uint8_t psenum = (channel == ECC_CONTACT) ? 1 : 2;
 	uint8_t relfname[250] ={0};
 	char *crelfname = (char *)relfname;
@@ -1493,6 +1514,7 @@ int CmdEMVRoca(const char *cmd) {
 
 	if (arg_get_lit(2))
 		channel = ECC_CONTACT;
+	PrintChannel(channel);
 
 	// select card
 	uint8_t psenum = (channel == ECC_CONTACT) ? 1 : 2;

From 7bb8c629ba67217d13fe19e604732e9c6d145048 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 8 Jan 2019 20:14:46 +0100
Subject: [PATCH 0392/1938] fix: remove warnings

---
 client/cmdhfmf.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 985965d72..00e29105f 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -1294,9 +1294,9 @@ int CmdHF14AMfNestedHard(const char *Cmd) {
 		case 'r':
 			fptr = GenerateFilename("hf-mf-","-nonces.bin");
 			if (fptr == NULL) 
-				strncpy(filename,"nonces.bin", FILE_PATH_SIZE);
+				strncpy(filename, "nonces.bin", FILE_PATH_SIZE);
 			else
-				strncpy(filename,fptr, FILE_PATH_SIZE);
+				strncpy(filename, fptr, FILE_PATH_SIZE-1);
 				
 			nonce_file_read = true;
 			if (!param_gethex(Cmd, cmdp+1, trgkey, 12)) {
@@ -1367,7 +1367,7 @@ int CmdHF14AMfNestedHard(const char *Cmd) {
 			fptr = GenerateFilename("hf-mf-","-nonces.bin");
 			if (fptr == NULL) 
 				return 1;
-			strncpy(filename, fptr, FILE_PATH_SIZE);
+			strncpy(filename, fptr, FILE_PATH_SIZE-1);
 			break;
 		case 'u':
 			param_getstr(Cmd, cmdp+1, szTemp, FILE_PATH_SIZE-20);

From d13541791b1ab4315d7d1aeb1d528bdcc8b6d872 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 8 Jan 2019 20:20:16 +0100
Subject: [PATCH 0393/1938] chg:  tlvtag can be 4bytes..

---
 client/emv/tlv.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/emv/tlv.h b/client/emv/tlv.h
index e3c7c97fa..d2a55525f 100644
--- a/client/emv/tlv.h
+++ b/client/emv/tlv.h
@@ -22,7 +22,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-typedef uint16_t tlv_tag_t;
+typedef uint32_t tlv_tag_t;
 
 struct tlv {
 	tlv_tag_t tag;

From 2612cd006a91538d36ba620aa0a6a1089d8680a2 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 9 Jan 2019 12:00:06 +0100
Subject: [PATCH 0394/1938] CHG: bigbuf adaptations

---
 armsrc/BigBuf.c    | 14 +++++-----
 armsrc/BigBuf.h    |  4 +--
 armsrc/apps.h      |  1 -
 armsrc/iso14443a.c | 69 +++++++++++++++++++++++++++-------------------
 armsrc/iso14443b.c |  2 +-
 5 files changed, 51 insertions(+), 39 deletions(-)

diff --git a/armsrc/BigBuf.c b/armsrc/BigBuf.c
index 8f6bf9ca6..7b49c0619 100644
--- a/armsrc/BigBuf.c
+++ b/armsrc/BigBuf.c
@@ -30,8 +30,8 @@ static uint16_t BigBuf_hi = BIGBUF_SIZE;
 static uint8_t *emulator_memory = NULL;
 
 // trace related variables
-static uint16_t traceLen = 0;
-int tracing = 1; //Last global one.. todo static?
+static uint32_t traceLen = 0;
+static bool tracing = true; //todo static?
 
 // get the address of BigBuf
 uint8_t *BigBuf_get_addr(void) {
@@ -112,7 +112,7 @@ uint16_t BigBuf_max_traceLen(void) {
 void clear_trace(void) {
 	traceLen = 0;
 }
-void set_tracelen(uint16_t value) {
+void set_tracelen(uint32_t value) {
     traceLen = value;
 }
 void set_tracing(bool enable) {
@@ -127,7 +127,7 @@ bool get_tracing(void) {
  * Get the number of bytes traced
  * @return
  */
-uint16_t BigBuf_get_traceLen(void) {
+uint32_t BigBuf_get_traceLen(void) {
 	return traceLen;
 }
 
@@ -142,8 +142,8 @@ bool RAMFUNC LogTrace(const uint8_t *btBytes, uint16_t iLen, uint32_t timestamp_
 
 	uint8_t *trace = BigBuf_get_addr();
 
-	uint16_t num_paritybytes = (iLen-1)/8 + 1;	// number of valid paritybytes in *parity
-	uint16_t duration = timestamp_end - timestamp_start;
+	uint32_t num_paritybytes = (iLen-1)/8 + 1;	// number of valid paritybytes in *parity
+	uint32_t duration = timestamp_end - timestamp_start;
 
 	// Return when trace is full
 	if (traceLen + sizeof(iLen) + sizeof(timestamp_start) + sizeof(duration) + num_paritybytes + iLen >= BigBuf_max_traceLen()) {
@@ -204,7 +204,7 @@ int LogTraceHitag(const uint8_t * btBytes, int iBits, int iSamples, uint32_t dwP
 	if (!tracing) return false;
 
 	uint8_t *trace = BigBuf_get_addr();
-	uint16_t iLen = nbytes(iBits);
+	uint32_t iLen = nbytes(iBits);
 	// Return when trace is full
 	if (traceLen + sizeof(rsamples) + sizeof(dwParity) + sizeof(iBits) + iLen > BigBuf_max_traceLen()) return false;
 
diff --git a/armsrc/BigBuf.h b/armsrc/BigBuf.h
index e8c6f5cd4..679eed676 100644
--- a/armsrc/BigBuf.h
+++ b/armsrc/BigBuf.h
@@ -36,10 +36,10 @@ extern uint8_t *BigBuf_malloc(uint16_t);
 extern void BigBuf_free(void);
 extern void BigBuf_free_keep_EM(void);
 extern void BigBuf_print_status(void);
-extern uint16_t BigBuf_get_traceLen(void);
+extern uint32_t BigBuf_get_traceLen(void);
 extern void clear_trace(void);
 extern void set_tracing(bool enable);
-extern void set_tracelen(uint16_t value);
+extern void set_tracelen(uint32_t value);
 extern bool get_tracing(void);
 extern bool RAMFUNC LogTrace(const uint8_t *btBytes, uint16_t iLen, uint32_t timestamp_start, uint32_t timestamp_end, uint8_t *parity, bool readerToTag);
 extern int LogTraceHitag(const uint8_t * btBytes, int iBits, int iSamples, uint32_t dwParity, int bReader);
diff --git a/armsrc/apps.h b/armsrc/apps.h
index 1e8524d57..7e45d5e50 100644
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -34,7 +34,6 @@ extern "C" {
 
 extern const uint8_t OddByteParity[256];
 extern int rsamples;   // = 0;
-extern int tracing;    // = TRUE;
 extern uint8_t trigger;
 
 // This may be used (sparingly) to declare a function to be copied to
diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 91db762fc..257c39b1f 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -651,7 +651,7 @@ void RAMFUNC SniffIso14443a(uint8_t param) {
 //-----------------------------------------------------------------------------
 static void CodeIso14443aAsTagPar(const uint8_t *cmd, uint16_t len, uint8_t *parity, bool collision) {
 	
-	uint8_t localCol = 0;
+	//uint8_t localCol = 0;
 	ToSendReset();
 
 	// Correction bit, might be removed when not needed
@@ -673,24 +673,32 @@ static void CodeIso14443aAsTagPar(const uint8_t *cmd, uint16_t len, uint8_t *par
 
 		// Data bits
 		for(uint16_t j = 0; j < 8; j++) {
-			if (collision && (localCol >= colpos)){
+			//if (collision && (localCol >= colpos)){
+			if (collision) {
 				ToSend[++ToSendMax] = SEC_COLL;
-            } else if(b & 1) {
-				ToSend[++ToSendMax] = SEC_D;
-			} else {
-				ToSend[++ToSendMax] = SEC_E;
+				//localCol++;				
+            } else {
+				if (b & 1) {
+					ToSend[++ToSendMax] = SEC_D;
+				} else {
+					ToSend[++ToSendMax] = SEC_E;
+				}
+				b >>= 1;
 			}
-			b >>= 1;
-            localCol++;
 		}
 
-		// Get the parity bit
-		if (parity[i>>3] & (0x80>>(i&0x0007))) {
-			ToSend[++ToSendMax] = SEC_D;
-			LastProxToAirDuration = 8 * ToSendMax - 4;
+		if (collision) {
+			ToSend[++ToSendMax] = SEC_COLL;
+			LastProxToAirDuration = 8 * ToSendMax;			
 		} else {
-			ToSend[++ToSendMax] = SEC_E;
-			LastProxToAirDuration = 8 * ToSendMax;
+			// Get the parity bit
+			if (parity[i>>3] & (0x80>>(i&0x0007))) {
+				ToSend[++ToSendMax] = SEC_D;
+				LastProxToAirDuration = 8 * ToSendMax - 4;
+			} else {
+				ToSend[++ToSendMax] = SEC_E;
+				LastProxToAirDuration = 8 * ToSendMax;
+			}
 		}
 	}
 
@@ -795,12 +803,12 @@ bool prepare_tag_modulation(tag_response_info_t* response_info, size_t max_buffe
 	// Make sure we do not exceed the free buffer space
 	if (ToSendMax > max_buffer_size) {
 		Dbprintf("Out of memory, when modulating bits for tag answer:");
-		Dbhexdump(response_info->response_n,response_info->response,false);
+		Dbhexdump(response_info->response_n, response_info->response, false);
 		return false;
 	}
 
 	// Copy the byte array, used for this modulation to the buffer position
-	memcpy(response_info->modulation,ToSend,ToSendMax);
+	memcpy(response_info->modulation, ToSend, ToSendMax);
 
 	// Store the number of bytes that were used for encoding/modulation and the time needed to transfer them
 	response_info->modulation_n = ToSendMax;
@@ -1047,7 +1055,7 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t* data) {
 		
 		// Clean receive command buffer
 		if (!GetIso14443aCommandFromReader(receivedCmd, receivedCmdPar, &len)) {
-			Dbprintf("Emulator stopped. Tracing: %d  trace length: %d ", tracing, BigBuf_get_traceLen());
+			Dbprintf("Emulator stopped.  Trace length: %d ", BigBuf_get_traceLen());
 			break;
 		}	
 		p_response = NULL;
@@ -1836,15 +1844,17 @@ void iso14443a_antifuzz(uint32_t flags){
 	// allocate buffers:
 	uint8_t *received = BigBuf_malloc(MAX_FRAME_SIZE);
 	uint8_t *receivedPar = BigBuf_malloc(MAX_PARITY_SIZE);
-	uint8_t *resp = BigBuf_malloc(8);
+	uint8_t *resp = BigBuf_malloc(20);
 
+	memset(resp, 0xFF , 20);
+	
 	LED_A_ON();
 	for (;;) {	
 		WDT_HIT();
 		
 		// Clean receive command buffer
 		if (!GetIso14443aCommandFromReader(received, receivedPar, &len)) {
-			Dbprintf("Anti-fuzz stopped. Tracing: %d  trace length: %d ", tracing, BigBuf_get_traceLen());
+			Dbprintf("Anti-fuzz stopped. Trace length: %d ", BigBuf_get_traceLen());
 			break;
 		}
 		if ( received[0] == ISO14443A_CMD_WUPA || received[0] == ISO14443A_CMD_REQA) {
@@ -1860,21 +1870,24 @@ void iso14443a_antifuzz(uint32_t flags){
 		}
 		
 		// Received request for UID (cascade 1)
-		if (received[1] >= 0x20 && received[1] <= 0x57 && received[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT) {
-			resp[0] = 0x04;		
-			resp[1] = 0x1C;
-			resp[2] = 0xE1; 
-			resp[3] = 0xCE;
+		//if (received[1] >= 0x20 && received[1] <= 0x57 && received[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT) {
+		if (received[1] >= 0x20 && received[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT) {
+			resp[0] = 0xFF;
+			resp[1] = 0xFF;
+			resp[2] = 0xFF;
+			resp[3] = 0xFF;
+			resp[4] =  resp[0] ^ resp[1] ^ resp[2] ^ resp[3];
 			colpos = 0;
 			
 			if ( (flags & FLAG_7B_UID_IN_DATA) == FLAG_7B_UID_IN_DATA ) {
 				resp[0] = 0x88; 
 				colpos = 8;
 			}
-	
-			EmSendCmdEx(resp, 4, true);			
-			if (MF_DBGLEVEL >= 4) Dbprintf("ANTICOLL or SELECT %x", received[1]);
 			
+			EmSendCmdEx(resp, 5, true);
+			if (MF_DBGLEVEL >= 4) Dbprintf("ANTICOLL or SELECT %x", received[1]);
+			LED_D_INV();
+	
 			continue;
 		} else if (received[1] == 0x20 && received[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2) { 	// Received request for UID (cascade 2)
 			if (MF_DBGLEVEL >= 4) Dbprintf("ANTICOLL or SELECT_2");
@@ -3489,7 +3502,7 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
 	}
 
 	if (MF_DBGLEVEL >= 1) 
-		Dbprintf("Emulator stopped. Tracing: %d  trace length: %d ", tracing, BigBuf_get_traceLen());
+		Dbprintf("Emulator stopped. Trace length: %d ", BigBuf_get_traceLen());
 	
 	cmd_send(CMD_ACK,1,0,0,0,0);	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 	LEDsoff();
diff --git a/armsrc/iso14443b.c b/armsrc/iso14443b.c
index edf114134..6167ca785 100644
--- a/armsrc/iso14443b.c
+++ b/armsrc/iso14443b.c
@@ -710,7 +710,7 @@ void SimulateIso14443bTag(uint32_t pupi) {
 		++cmdsReceived;
 	}
 	if (MF_DBGLEVEL >= 2) 
-		Dbprintf("Emulator stopped. Tracing: %d  trace length: %d ", tracing, BigBuf_get_traceLen());
+		Dbprintf("Emulator stopped. Trace length: %d ", BigBuf_get_traceLen());
 	switch_off(); //simulate
 }
 

From 6743e45386770e4e171bee638761144f6d8c529e Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 9 Jan 2019 12:05:29 +0100
Subject: [PATCH 0395/1938] CHG: name changes

---
 armsrc/felica.c | 48 +++++++++++++++++++++++-------------------------
 1 file changed, 23 insertions(+), 25 deletions(-)

diff --git a/armsrc/felica.c b/armsrc/felica.c
index aa6712268..d1e7bc344 100644
--- a/armsrc/felica.c
+++ b/armsrc/felica.c
@@ -29,27 +29,25 @@ static uint32_t felica_timeout;
 static uint32_t felica_nexttransfertime;
 static uint32_t felica_lasttime_prox2air_start;
 
-static void felica_setup(uint8_t fpga_minor_mode);
+static void iso18092_setup(uint8_t fpga_minor_mode);
 static uint8_t felica_select_card(felica_card_select_t *card);
 static void TransmitFor18092_AsReader(uint8_t * frame, int len, uint32_t *timing, uint8_t power, uint8_t highspeed);
 bool WaitForFelicaReply(uint16_t maxbytes);
 
-void felica_set_timeout(uint32_t timeout) {
+void iso18092_set_timeout(uint32_t timeout) {
 	felica_timeout = timeout + (DELAY_AIR2ARM_AS_READER + DELAY_ARM2AIR_AS_READER)/(16*8) + 2;
 }
 
-uint32_t felica_get_timeout(void) {
+uint32_t iso18092_get_timeout(void) {
 	return felica_timeout - (DELAY_AIR2ARM_AS_READER + DELAY_ARM2AIR_AS_READER)/(16*8) - 2;
 }
 
-//random service RW: 0x0009
-//random service RO: 0x000B
-#ifndef NFC_MAX_FRAME_SIZE
- #define NFC_MAX_FRAME_SIZE 260
+#ifndef FELICA_MAX_FRAME_SIZE
+ #define FELICA_MAX_FRAME_SIZE 260
 #endif
 
 //structure to hold outgoing NFC frame 
-static uint8_t frameSpace[NFC_MAX_FRAME_SIZE+4];
+static uint8_t frameSpace[FELICA_MAX_FRAME_SIZE+4];
 
 //structure to hold incoming NFC frame, used for ISO/IEC 18092-compatible frames
 static struct {
@@ -85,7 +83,7 @@ static void FelicaFrameReset() {
     FelicaFrame.crc_ok = false;
     FelicaFrame.byte_offset = 0;
 }
-static void NFCInit(uint8_t *data) {
+static void FelicaFrameinit(uint8_t *data) {
 	FelicaFrame.framebytes = data;
 	FelicaFrameReset();
 }
@@ -105,7 +103,7 @@ static void shiftInByte(uint8_t bt) {
     }
 }
 
-static void ProcessNFCByte(uint8_t bt) {
+static void Process18092Byte(uint8_t bt) {
     switch (FelicaFrame.state) {
 		case STATE_UNSYNCD: {
 			//almost any nonzero byte can be start of SYNC. SYNC should be preceded by zeros, but that is not alsways the case
@@ -127,7 +125,7 @@ static void ProcessNFCByte(uint8_t bt) {
 						//SYNC done!
 						FelicaFrame.state = STATE_GET_LENGTH;
 						FelicaFrame.framebytes[0] = 0xb2;
-						FelicaFrame.framebytes[1] = 0x4d; //write SYNC
+						FelicaFrame.framebytes[1] = 0x4d;
 						FelicaFrame.byte_offset = i;
 						//shift in remaining byte, slowly...
 						for(uint8_t j=i; j<8; j++) {
@@ -269,7 +267,7 @@ static uint8_t felica_select_card(felica_card_select_t *card) {
 static void BuildFliteRdblk(uint8_t* idm, int blocknum, uint16_t *blocks ) {
 
     if (blocknum > 4 || blocknum <= 0)
-        Dbprintf("Invalid number of blocks, %d. Up to 4 are allowed.", blocknum);
+        Dbprintf("Invalid number of blocks, %d != 4", blocknum);
 	
     uint8_t c = 0, i = 0;
 	
@@ -394,13 +392,13 @@ bool WaitForFelicaReply(uint16_t maxbytes) {
 	// clear RXRDY:
 	uint8_t b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
 	
-	uint32_t timeout = felica_get_timeout();
+	uint32_t timeout = iso18092_get_timeout();
 	for(;;) {
         WDT_HIT();		
 		
 		if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
 			b = (uint8_t)(AT91C_BASE_SSC->SSC_RHR);			
-			ProcessNFCByte(b);		
+			Process18092Byte(b);		
 			if (FelicaFrame.state == STATE_FULL) {
 				felica_nexttransfertime = 
 					MAX(
@@ -432,7 +430,7 @@ bool WaitForFelicaReply(uint16_t maxbytes) {
 
 // Set up FeliCa communication (similar to iso14443a_setup)
 // field is setup for "Sending as Reader"
-static void felica_setup(uint8_t fpga_minor_mode) {
+static void iso18092_setup(uint8_t fpga_minor_mode) {
 
 	LEDsoff();
 	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
@@ -442,11 +440,13 @@ static void felica_setup(uint8_t fpga_minor_mode) {
 	
 	// Initialize Demod and Uart structs
 	//DemodInit(BigBuf_malloc(MAX_FRAME_SIZE));
-	NFCInit(BigBuf_malloc(NFC_MAX_FRAME_SIZE));
+	FelicaFrameinit(BigBuf_malloc(FELICA_MAX_FRAME_SIZE));
 
 	felica_nexttransfertime = 2 * DELAY_ARM2AIR_AS_READER;
-	felica_set_timeout(2120); // 106 * 20ms  maximum start-up time of card
+	iso18092_set_timeout(2120); // 106 * 20ms  maximum start-up time of card
 	
+	init_table(CRC_FELICA);
+		
 	// connect Demodulated Signal to ADC:
 	SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
 
@@ -455,8 +455,6 @@ static void felica_setup(uint8_t fpga_minor_mode) {
 	
 	// LSB transfer.  Remember to set it back to MSB with
 	AT91C_BASE_SSC->SSC_RFMR = SSC_FRAME_MODE_BITS_IN_WORD(8) | SSC_FRAME_MODE_WORDS_PER_TRANSFER(0);
-	
-	init_table(CRC_FELICA);
 		
 	// Signal field is on with the appropriate LED
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_ISO18092 | fpga_minor_mode);
@@ -492,7 +490,7 @@ void felica_sendraw(UsbCommand *c) {
 	set_tracing(true);
 
 	if ((param & FELICA_CONNECT)) {
-		felica_setup(FPGA_HF_ISO18092_FLAG_READER | FPGA_HF_ISO18092_FLAG_NOMOD);
+		iso18092_setup(FPGA_HF_ISO18092_FLAG_READER | FPGA_HF_ISO18092_FLAG_NOMOD);
 
 		// notify client selecting status.
 		// if failed selecting, turn off antenna and quite.
@@ -547,7 +545,7 @@ void felica_sniff(uint32_t samplesToSkip, uint32_t triggersToSkip) {
 
     Dbprintf("Snoop FelicaLiteS: Getting first %d frames, Skipping %d triggers.\n", samplesToSkip, triggersToSkip);
   
-  	felica_setup( FPGA_HF_ISO18092_FLAG_NOMOD);
+  	iso18092_setup( FPGA_HF_ISO18092_FLAG_NOMOD);
 
     //the frame bits are slow enough. 
     int n = BigBuf_max_traceLen() / sizeof(uint8_t); // take all memory
@@ -563,7 +561,7 @@ void felica_sniff(uint32_t samplesToSkip, uint32_t triggersToSkip) {
 				
         if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
             uint8_t dist = (uint8_t)(AT91C_BASE_SSC->SSC_RHR);
-            ProcessNFCByte(dist);
+            Process18092Byte(dist);
             
 			//to be sure we are in frame
             if (FelicaFrame.state == STATE_GET_LENGTH) {
@@ -643,7 +641,7 @@ void felica_sim_lite(uint64_t nfcid) {
     AddCrc(resp_poll1, resp_poll1[2]);
     AddCrc(resp_readblk, resp_readblk[2]);
 
-	felica_setup( FPGA_HF_ISO18092_FLAG_NOMOD);
+	iso18092_setup( FPGA_HF_ISO18092_FLAG_NOMOD);
 
 	bool listenmode = true;
 	//uint32_t frtm = GetCountSspClk();
@@ -657,7 +655,7 @@ void felica_sim_lite(uint64_t nfcid) {
 
 				uint8_t dist = (uint8_t)(AT91C_BASE_SSC->SSC_RHR);
 				//frtm = GetCountSspClk();
-				ProcessNFCByte(dist);
+				Process18092Byte(dist);
 				
                 if (FelicaFrame.state == STATE_FULL) {
 
@@ -725,7 +723,7 @@ void felica_dump_lite_s() {
 	uint16_t liteblks[28] = {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x90,0x91,0x92,0xa0};
 		
 	// setup device.
-	felica_setup(FPGA_HF_ISO18092_FLAG_READER | FPGA_HF_ISO18092_FLAG_NOMOD);
+	iso18092_setup(FPGA_HF_ISO18092_FLAG_READER | FPGA_HF_ISO18092_FLAG_NOMOD);
 	
 	uint8_t blknum;
 	bool isOK = false;

From 8f18a9abf21b69a91abefb7b949c91dc20abf082 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 9 Jan 2019 12:07:07 +0100
Subject: [PATCH 0396/1938] CHG: tvl tag length adapted

---
 client/emv/emvjson.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/emv/emvjson.c b/client/emv/emvjson.c
index 116e16da1..f8cccddf2 100644
--- a/client/emv/emvjson.c
+++ b/client/emv/emvjson.c
@@ -372,13 +372,13 @@ bool ParamLoadFromJson(struct tlvdb *tlv) {
 		size_t buflen = 0;
 		
 		// here max length must be 4, but now tlv_tag_t is 2-byte var. so let it be 2 by now...  TODO: needs refactoring tlv_tag_t...
-		if (!HexToBuffer("TLV Error type:", tlvTag, buf, 2, &buflen)) { 
+		if (!HexToBuffer("TLV Error type:", tlvTag, buf, 4, &buflen)) { 
 			json_decref(root);
 			return false;
 		}
 		tlv_tag_t tag = 0;
 		for (int i = 0; i < buflen; i++) {
-			tag = (tag << 8) + buf[i];
+			tag = (tag << 8) | buf[i];
 		}	
 		
 		if (!HexToBuffer("TLV Error value:", tlvValue, buf, sizeof(buf) - 1, &buflen)) {

From 96361abd973cbccb0576aa200885cb0b176f3dcb Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 9 Jan 2019 12:28:56 +0100
Subject: [PATCH 0397/1938] FIX: supress gcc warnings like libjansson

https://github.com/akheron/jansson/pull/423/files
---
 client/jansson/Makefile | 2 +-
 client/jansson/error.c  | 2 +-
 client/jansson/load.c   | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/jansson/Makefile b/client/jansson/Makefile
index 7657e35f3..596c1778c 100644
--- a/client/jansson/Makefile
+++ b/client/jansson/Makefile
@@ -32,7 +32,7 @@ CMDOBJS = $(CFILES:%.c=%.o)
 CLEAN = $(CMDOBJS)
 	
 CC= gcc
-CFLAGS= -O2 -Wall -Wno-unused-variable -Wno-unused-function
+CFLAGS= -O2 -Wall -Wno-unused-variable -Wno-unused-function -Wno-format-truncation
 LDFLAGS= $(SYSLDFLAGS) $(libjansson_la_LDFLAGS)
 LIBS= $(SYSLIBS) $(MYLIBS)
 DEFAULT_INCLUDES = -I.
diff --git a/client/jansson/error.c b/client/jansson/error.c
index f5da6b9b0..b94b3a3a1 100644
--- a/client/jansson/error.c
+++ b/client/jansson/error.c
@@ -25,7 +25,7 @@ void jsonp_error_set_source(json_error_t *error, const char *source)
 
     length = strlen(source);
     if(length < JSON_ERROR_SOURCE_LENGTH)
-        strncpy(error->source, source, length + 1);
+        strncpy(error->source, source, JSON_ERROR_SOURCE_LENGTH);
     else {
         size_t extra = length - JSON_ERROR_SOURCE_LENGTH + 4;
         memcpy(error->source, "...", 3);
diff --git a/client/jansson/load.c b/client/jansson/load.c
index 9f73ea02c..2f123724e 100644
--- a/client/jansson/load.c
+++ b/client/jansson/load.c
@@ -89,7 +89,7 @@ static void error_set(json_error_t *error, const lex_t *lex,
 {
     va_list ap;
     char msg_text[JSON_ERROR_TEXT_LENGTH];
-    char msg_with_context[JSON_ERROR_TEXT_LENGTH + 20];
+    char msg_with_context[JSON_ERROR_TEXT_LENGTH];
 
     int line = -1, col = -1;
     size_t pos = 0;
@@ -115,7 +115,7 @@ static void error_set(json_error_t *error, const lex_t *lex,
         {
             if(lex->saved_text.length <= 20) {
                 snprintf(msg_with_context, JSON_ERROR_TEXT_LENGTH, "%s near '%s'", msg_text, saved_text);
-                msg_with_context[JSON_ERROR_TEXT_LENGTH + 20 - 1] = '\0';
+                msg_with_context[JSON_ERROR_TEXT_LENGTH - 1] = '\0';
                 result = msg_with_context;
             }
         }
@@ -131,7 +131,7 @@ static void error_set(json_error_t *error, const lex_t *lex,
             }
             else {
                 snprintf(msg_with_context, JSON_ERROR_TEXT_LENGTH, "%s near end of file", msg_text);
-                msg_with_context[JSON_ERROR_TEXT_LENGTH + 20 - 1] = '\0';
+                msg_with_context[JSON_ERROR_TEXT_LENGTH - 1] = '\0';
                 result = msg_with_context;
             }
         }

From 4880316ab932d983bda83ff7600b2071e122f24e Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 9 Jan 2019 15:20:18 +0200
Subject: [PATCH 0398/1938] fix hash

---
 client/emv/emv_pki.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/client/emv/emv_pki.c b/client/emv/emv_pki.c
index be4dfa0a7..602dcacce 100644
--- a/client/emv/emv_pki.c
+++ b/client/emv/emv_pki.c
@@ -109,10 +109,12 @@ static unsigned char *emv_pki_decode_message(const struct emv_pk *enc_pk,
 	}
 	va_end(vl);
 
-	if (memcmp(data + data_len - 1 - hash_len, crypto_hash_read(ch), hash_len)) {
+	uint8_t hash[20] = {0};
+	memcpy(hash, crypto_hash_read(ch), hash_len);
+	if (memcmp(data + data_len - 1 - hash_len, hash, hash_len)) {
 		printf("ERROR: Calculated wrong hash\n");
 		printf("decoded:    %s\n",sprint_hex(data + data_len - 1 - hash_len, hash_len));
-		printf("calculated: %s\n",sprint_hex(crypto_hash_read(ch), hash_len));
+		printf("calculated: %s\n",sprint_hex(hash, hash_len));
 		
 		if (strictExecution) {
 			crypto_hash_close(ch);

From 010492a87e47326c32040cd5495eb4baf3f2f991 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 9 Jan 2019 17:04:21 +0200
Subject: [PATCH 0399/1938] input list build fixed

---
 client/emv/cmdemv.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index 206401917..a21337d03 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -892,7 +892,7 @@ int CmdEMVExec(const char *cmd) {
 				
 				// Build Input list for Offline Data Authentication
 				// EMV 4.3 book3 10.3, page 96
-				if (SFIoffline) {
+				if (SFIoffline > 0) {
 					if (SFI < 11) {
 						const unsigned char *abuf = buf;
 						size_t elmlen = len;
@@ -907,6 +907,8 @@ int CmdEMVExec(const char *cmd) {
 						memcpy(&ODAiList[ODAiListLen], buf, len);
 						ODAiListLen += len;
 					}
+					
+					SFIoffline--;
 				}
 			}
 		}

From 4a38ab7be4a8c20c761ea5abbb12365ef2734b7b Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 9 Jan 2019 17:08:23 +0200
Subject: [PATCH 0400/1938] small fix

---
 client/emv/cmdemv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index a21337d03..0cc6614d9 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -870,7 +870,7 @@ int CmdEMVExec(const char *cmd) {
 			uint8_t SFIend = AFL->value[i * 4 + 2];
 			uint8_t SFIoffline = AFL->value[i * 4 + 3];
 			
-			PrintAndLogEx(NORMAL, "* * SFI[%02x] start:%02x end:%02x offline:%02x", SFI, SFIstart, SFIend, SFIoffline);
+			PrintAndLogEx(NORMAL, "* * SFI[%02x] start:%02x end:%02x offline count:%02x", SFI, SFIstart, SFIend, SFIoffline);
 			if (SFI == 0 || SFI == 31 || SFIstart == 0 || SFIstart > SFIend) {
 				PrintAndLogEx(NORMAL, "SFI ERROR! Skipped...");
 				continue;

From e276bf1ce326f88ef8bbebd27ae1d77e7e3ca12e Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 9 Jan 2019 16:25:49 +0100
Subject: [PATCH 0401/1938] FIX: gcc8.1 warnings

---
 armsrc/tlv.c             | 75 ++++++++++++++++++++++++----------------
 armsrc/tlv.h             | 13 ++++---
 client/crypto/asn1dump.c |  4 ++-
 client/emv/emvjson.c     |  1 -
 client/util.c            |  2 +-
 5 files changed, 59 insertions(+), 36 deletions(-)

diff --git a/armsrc/tlv.c b/armsrc/tlv.c
index 3da03492f..839b34d66 100644
--- a/armsrc/tlv.c
+++ b/armsrc/tlv.c
@@ -2,7 +2,7 @@
 
 int decode_ber_tlv_item(uint8_t* data, tlvtag* returnedtag)
 {
-    uint8_t tag[TAG_LENGTH] = {0x00,0x00};
+    uint8_t tag[TAG_LENGTH] = {0x00, 0x00, 0x00, 0x00};
     uint16_t length = 0;
     //uint8_t value[VALUE_LENGTH];
     uint8_t lenlen = 0;
@@ -10,40 +10,44 @@ int decode_ber_tlv_item(uint8_t* data, tlvtag* returnedtag)
     int z = 0; 
     //decode tag
     tag[0] = data[0];
-    if((tag[0] & TLV_TAG_NUMBER_MASK) == TLV_TAG_NUMBER_MASK) { //see subsequent bytes
+    if ((tag[0] & TLV_TAG_NUMBER_MASK) == TLV_TAG_NUMBER_MASK) { //see subsequent bytes
         i++; 
-        tag[i] = data[i];
-        //assume tag is only two bytes long for now
-        /*
-        while((data[i] & TLV_TAG_MASK) == TLV_TAG_MASK){
-            i++; 
-            tag[i] = data[i];
-        }
-        */ 
+       
+		tag[i] = data[i];
+
+		while((data[i] & TLV_TAG_MASK) == TLV_TAG_MASK){
+			i++; 
+			tag[i] = data[i];
+		}
+
     }
     i++; 
     //decode length
-    if((data[i] & TLV_LENGTH_MASK) == TLV_LENGTH_MASK) {
+    if ((data[i] & TLV_LENGTH_MASK) == TLV_LENGTH_MASK) {
         lenlen = data[i] ^ TLV_LENGTH_MASK;
         i++;
         length = (uint16_t)data[i];
         z = 1;
-        while(z < lenlen){
+        while (z < lenlen) {
             i++;
             z++;
             length <<= 8;
             length += (uint16_t)data[i];
         }
         i++;
-    }
-    else {
+    } else {
         length = (uint16_t)data[i];
         i++;
     }
-    //copy results into the structure and return 
+    // copy results into the structure and return 
     memcpy(returnedtag->tag, tag, TAG_LENGTH);
-    (*returnedtag).valuelength = length; //return length of tag value 
-    (*returnedtag).fieldlength = length + i + 1; //return length of total field
+	
+	// return length of tag value 
+    (*returnedtag).valuelength = length;
+	
+	// return length of total field
+    (*returnedtag).fieldlength = length + i + 1;
+	
     memcpy(returnedtag->value, &(data[i]), length);
     return 0; 
 }
@@ -51,27 +55,40 @@ int decode_ber_tlv_item(uint8_t* data, tlvtag* returnedtag)
 //generate a TLV tag off input data
 int encode_ber_tlv_item(uint8_t* tag, uint8_t taglen, uint8_t* data, uint32_t datalen, uint8_t* outputtag, uint32_t* outputtaglen)
 {
-    if(!tag || !data || !outputtag || !outputtaglen) //null pointer check
+    if (!tag || !data || !outputtag || !outputtaglen)
         return 0;
     
-    uint8_t datafieldlen = (datalen / 128) + 1; //field length of the tag
-    uint8_t tlvtotallen = taglen + datafieldlen + datalen; //total length of the tag
-    uint8_t returnedtag[tlvtotallen]; //buffer for the returned tag
+	// field length of the tag	
+    uint8_t datafieldlen = (datalen / 128) + 1;
+	
+	// total length of the tag
+    uint8_t tlvtotallen = taglen + datafieldlen + datalen;
+	
+	// buffer for the returned tag
+    uint8_t returnedtag[tlvtotallen];
+	
     uint8_t counter = 0; 
-    memcpy(returnedtag, tag, taglen); //copy tag into buffer
+
+	// copy tag into buffer
+    memcpy(returnedtag, tag, taglen);
     counter += taglen; 
-    if(datalen < 128){ // 1 byte length value
+	
+	// 1 byte length value
+    if (datalen < 128){
         returnedtag[counter++] = datalen; 
-    } 
-    else{
-        returnedtag[counter++] = datafieldlen | 0x80; //high bit set and number of length bytes
-        for(uint8_t i=datafieldlen; i !=0; i--){
-            returnedtag[counter++] = (datalen >> (i * 8)) & 0xFF; //get current byte
+    } else {
+		
+		// high bit set and number of length bytes
+        returnedtag[counter++] = datafieldlen | 0x80;
+		
+        for (uint8_t i = datafieldlen; i !=0; i--) {
+			// get current byte
+            returnedtag[counter++] = (datalen >> (i * 8)) & 0xFF;
         } 
     }
     memcpy(&returnedtag[counter], data, datalen);
     *outputtaglen = tlvtotallen;
-    memcpy(outputtag, returnedtag,tlvtotallen);
+    memcpy(outputtag, returnedtag, tlvtotallen);
     return 0;
 }
 
diff --git a/armsrc/tlv.h b/armsrc/tlv.h
index c90756168..de8180cab 100644
--- a/armsrc/tlv.h
+++ b/armsrc/tlv.h
@@ -6,8 +6,13 @@
 #include <stddef.h>
 
 //structure buffer definitions
-#define TAG_LENGTH 2
-#define VALUE_LENGTH 1024
+#ifndef TAG_LENGTH
+# define TAG_LENGTH 4
+#endif
+
+#ifndef VALUE_LENGTH
+# define VALUE_LENGTH 1024
+#endif
 
 //masks
 //if TLV_TAG_NUMBER_MASK bits are set, refer to the next byte for the tag number
@@ -19,13 +24,13 @@
 #define TLV_TAG_MASK 0x80
 #define TLV_LENGTH_MASK 0x80
 
-//tlv tag structure, tag can be max of 2 bytes, length up to 65535 and value 1024 bytes long 
+//tlv tag structure, tag can be max of 4 bytes, length up to 0xFFFFFFFF and value 1024 bytes long 
 typedef struct {
     uint8_t tag[TAG_LENGTH];
     uint16_t fieldlength;
     uint16_t valuelength; 
     uint8_t value[VALUE_LENGTH];
-}tlvtag;
+} tlvtag;
 
 //decode a BER TLV 
 extern int decode_ber_tlv_item(uint8_t* data, tlvtag* returnedtag);
diff --git a/client/crypto/asn1dump.c b/client/crypto/asn1dump.c
index 34f4a9fa4..52814f22b 100644
--- a/client/crypto/asn1dump.c
+++ b/client/crypto/asn1dump.c
@@ -24,7 +24,9 @@
 #include "util.h"
 #include "proxmark3.h"
 
-#define PRINT_INDENT(level) 	{for (int i = 0; i < (level); i++) fprintf(f, "   ");}
+#ifndef PRINT_INDENT
+# define PRINT_INDENT(level) 	{for (int i = 0; i < (level); i++) fprintf(f, "   ");}
+#endif
 
 enum asn1_tag_t {
 	ASN1_TAG_GENERIC,
diff --git a/client/emv/emvjson.c b/client/emv/emvjson.c
index f8cccddf2..45eb1f430 100644
--- a/client/emv/emvjson.c
+++ b/client/emv/emvjson.c
@@ -371,7 +371,6 @@ bool ParamLoadFromJson(struct tlvdb *tlv) {
 		uint8_t buf[251] = {0};
 		size_t buflen = 0;
 		
-		// here max length must be 4, but now tlv_tag_t is 2-byte var. so let it be 2 by now...  TODO: needs refactoring tlv_tag_t...
 		if (!HexToBuffer("TLV Error type:", tlvTag, buf, 4, &buflen)) { 
 			json_decref(root);
 			return false;
diff --git a/client/util.c b/client/util.c
index 5d7ce0370..b22258d44 100644
--- a/client/util.c
+++ b/client/util.c
@@ -212,7 +212,7 @@ void print_hex_break(const uint8_t *data, const size_t len, uint8_t breaks) {
 }
 
 char *sprint_hex(const uint8_t *data, const size_t len) {
-	static char buf[UTIL_BUFFER_SIZE_SPRINT] = {0};
+	static char buf[UTIL_BUFFER_SIZE_SPRINT - 3] = {0};
 	hex_to_buffer((uint8_t *)buf, data, len, sizeof(buf) - 1, 0, 1, true);
 	return buf;
 }

From 8a514ea8f10f91d7b30dd10017480b5bf20a5868 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 9 Jan 2019 16:28:06 +0100
Subject: [PATCH 0402/1938] REM: remove unused files

---
 armsrc/tlv.c | 94 ----------------------------------------------------
 armsrc/tlv.h | 38 ---------------------
 2 files changed, 132 deletions(-)
 delete mode 100644 armsrc/tlv.c
 delete mode 100644 armsrc/tlv.h

diff --git a/armsrc/tlv.c b/armsrc/tlv.c
deleted file mode 100644
index 839b34d66..000000000
--- a/armsrc/tlv.c
+++ /dev/null
@@ -1,94 +0,0 @@
-#include <tlv.h>
-
-int decode_ber_tlv_item(uint8_t* data, tlvtag* returnedtag)
-{
-    uint8_t tag[TAG_LENGTH] = {0x00, 0x00, 0x00, 0x00};
-    uint16_t length = 0;
-    //uint8_t value[VALUE_LENGTH];
-    uint8_t lenlen = 0;
-    int i = 0; 
-    int z = 0; 
-    //decode tag
-    tag[0] = data[0];
-    if ((tag[0] & TLV_TAG_NUMBER_MASK) == TLV_TAG_NUMBER_MASK) { //see subsequent bytes
-        i++; 
-       
-		tag[i] = data[i];
-
-		while((data[i] & TLV_TAG_MASK) == TLV_TAG_MASK){
-			i++; 
-			tag[i] = data[i];
-		}
-
-    }
-    i++; 
-    //decode length
-    if ((data[i] & TLV_LENGTH_MASK) == TLV_LENGTH_MASK) {
-        lenlen = data[i] ^ TLV_LENGTH_MASK;
-        i++;
-        length = (uint16_t)data[i];
-        z = 1;
-        while (z < lenlen) {
-            i++;
-            z++;
-            length <<= 8;
-            length += (uint16_t)data[i];
-        }
-        i++;
-    } else {
-        length = (uint16_t)data[i];
-        i++;
-    }
-    // copy results into the structure and return 
-    memcpy(returnedtag->tag, tag, TAG_LENGTH);
-	
-	// return length of tag value 
-    (*returnedtag).valuelength = length;
-	
-	// return length of total field
-    (*returnedtag).fieldlength = length + i + 1;
-	
-    memcpy(returnedtag->value, &(data[i]), length);
-    return 0; 
-}
-
-//generate a TLV tag off input data
-int encode_ber_tlv_item(uint8_t* tag, uint8_t taglen, uint8_t* data, uint32_t datalen, uint8_t* outputtag, uint32_t* outputtaglen)
-{
-    if (!tag || !data || !outputtag || !outputtaglen)
-        return 0;
-    
-	// field length of the tag	
-    uint8_t datafieldlen = (datalen / 128) + 1;
-	
-	// total length of the tag
-    uint8_t tlvtotallen = taglen + datafieldlen + datalen;
-	
-	// buffer for the returned tag
-    uint8_t returnedtag[tlvtotallen];
-	
-    uint8_t counter = 0; 
-
-	// copy tag into buffer
-    memcpy(returnedtag, tag, taglen);
-    counter += taglen; 
-	
-	// 1 byte length value
-    if (datalen < 128){
-        returnedtag[counter++] = datalen; 
-    } else {
-		
-		// high bit set and number of length bytes
-        returnedtag[counter++] = datafieldlen | 0x80;
-		
-        for (uint8_t i = datafieldlen; i !=0; i--) {
-			// get current byte
-            returnedtag[counter++] = (datalen >> (i * 8)) & 0xFF;
-        } 
-    }
-    memcpy(&returnedtag[counter], data, datalen);
-    *outputtaglen = tlvtotallen;
-    memcpy(outputtag, returnedtag, tlvtotallen);
-    return 0;
-}
-
diff --git a/armsrc/tlv.h b/armsrc/tlv.h
deleted file mode 100644
index de8180cab..000000000
--- a/armsrc/tlv.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef __TLV_H
-#define __TLV_H
-
-#include <stdint.h>
-#include <string.h>
-#include <stddef.h>
-
-//structure buffer definitions
-#ifndef TAG_LENGTH
-# define TAG_LENGTH 4
-#endif
-
-#ifndef VALUE_LENGTH
-# define VALUE_LENGTH 1024
-#endif
-
-//masks
-//if TLV_TAG_NUMBER_MASK bits are set, refer to the next byte for the tag number
-//otherwise its located in bits 1-5
-#define TLV_TAG_NUMBER_MASK 0x1f
-//if TLV_DATA_MASK set then its a 'constructed data object'
-//otherwise a 'primitive data object'
-#define TLV_DATA_MASK 0x20
-#define TLV_TAG_MASK 0x80
-#define TLV_LENGTH_MASK 0x80
-
-//tlv tag structure, tag can be max of 4 bytes, length up to 0xFFFFFFFF and value 1024 bytes long 
-typedef struct {
-    uint8_t tag[TAG_LENGTH];
-    uint16_t fieldlength;
-    uint16_t valuelength; 
-    uint8_t value[VALUE_LENGTH];
-} tlvtag;
-
-//decode a BER TLV 
-extern int decode_ber_tlv_item(uint8_t* data, tlvtag* returnedtag);
-extern int encode_ber_tlv_item(uint8_t* tag, uint8_t taglen, uint8_t*data, uint32_t datalen, uint8_t* outputtag, uint32_t* outputtaglen);
-#endif //__TLV_H

From 88b2cf41de9f3793faf942c35de365e6c561f194 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 9 Jan 2019 18:46:55 +0200
Subject: [PATCH 0403/1938] add description

---
 client/emv/emvcore.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/emv/emvcore.c b/client/emv/emvcore.c
index 621287031..b672004c3 100644
--- a/client/emv/emvcore.c
+++ b/client/emv/emvcore.c
@@ -781,7 +781,7 @@ int trDDA(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlv) {
 		struct tlvdb *dac_db = emv_pki_recover_dac(issuer_pk, tlv, sda_tlv);
 		if (dac_db) {
 			const struct tlv *dac_tlv = tlvdb_get(dac_db, 0x9f45, NULL);
-			PrintAndLogEx(NORMAL, "SDA verified OK. (%02hhx:%02hhx)\n", dac_tlv->value[0], dac_tlv->value[1]);
+			PrintAndLogEx(NORMAL, "SDA verified OK. (Data Authentication Code: %02hhx:%02hhx)\n", dac_tlv->value[0], dac_tlv->value[1]);
 			tlvdb_add(tlv, dac_db);
 		} else {
 			PrintAndLogEx(WARNING, "Error: SSAD verify error");

From 506da60cad7bf9d952deff2bb855add1369123ff Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 9 Jan 2019 18:47:26 +0200
Subject: [PATCH 0404/1938] hash init

---
 client/emv/emv_pki.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/emv/emv_pki.c b/client/emv/emv_pki.c
index 602dcacce..593c8a00c 100644
--- a/client/emv/emv_pki.c
+++ b/client/emv/emv_pki.c
@@ -109,7 +109,8 @@ static unsigned char *emv_pki_decode_message(const struct emv_pk *enc_pk,
 	}
 	va_end(vl);
 
-	uint8_t hash[20] = {0};
+	uint8_t hash[hash_len];
+	memset(hash, 0, hash_len);
 	memcpy(hash, crypto_hash_read(ch), hash_len);
 	if (memcmp(data + data_len - 1 - hash_len, hash, hash_len)) {
 		printf("ERROR: Calculated wrong hash\n");

From 20d29f35e5f9e0889539479b1ac5f1f3aa077f65 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 9 Jan 2019 19:32:08 +0200
Subject: [PATCH 0405/1938] SDA works

---
 client/emv/emv_pki.c | 43 +++++++++++++++++++++++++++++++++++++++++++
 client/emv/emvcore.c |  2 +-
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/client/emv/emv_pki.c b/client/emv/emv_pki.c
index 593c8a00c..40edc79e4 100644
--- a/client/emv/emv_pki.c
+++ b/client/emv/emv_pki.c
@@ -313,14 +313,57 @@ struct emv_pk *emv_pki_recover_icc_pe_cert(const struct emv_pk *pk, struct tlvdb
 			NULL);
 }
 
+unsigned char *emv_pki_sdatl_fill(const struct tlvdb *db, size_t *sdatl_len) {
+	uint8_t buf[2048] = {0};
+	size_t len = 0;
+	
+	*sdatl_len = 0;
+	
+	const struct tlv *sda_tl = tlvdb_get(db, 0x9f4a, NULL);
+	if (!sda_tl || sda_tl->len <= 0)
+		return NULL;
+
+	for (int i = 0; i < sda_tl->len; i++) {
+		uint32_t tag = sda_tl->value[i]; // here may be multibyte, but now not
+		const struct tlv *elm = tlvdb_get(db, tag, NULL);
+		if (elm) {
+			memcpy(&buf[len], elm->value, elm->len);
+			len += elm->len;
+		}		
+	}
+	
+	if (len) {
+		*sdatl_len = len;
+		unsigned char *value = malloc(len);
+		memcpy(value, buf, len);
+		return value;
+	}
+	
+	return NULL;
+}
+
+
 struct tlvdb *emv_pki_recover_dac_ex(const struct emv_pk *enc_pk, const struct tlvdb *db, const struct tlv *sda_tlv, bool showData)
 {
 	size_t data_len;
+	
+	// Static Data Authentication Tag List
+	size_t sdatl_len;
+	unsigned char *sdatl = emv_pki_sdatl_fill(db, &sdatl_len);
+	struct tlv sda_tdata = {
+		.tag = 0x00,        // dummy tag
+		.len = sdatl_len,
+		.value = sdatl
+	};
+
 	unsigned char *data = emv_pki_decode_message(enc_pk, 3, &data_len,
 			tlvdb_get(db, 0x93, NULL),
 			sda_tlv,
+			&sda_tdata,
 			NULL);
 
+	free(sdatl); // malloc here: emv_pki_sdatl_fill
+	
 	if (!data || data_len < 5)
 		return NULL;
 
diff --git a/client/emv/emvcore.c b/client/emv/emvcore.c
index b672004c3..743fa2f9e 100644
--- a/client/emv/emvcore.c
+++ b/client/emv/emvcore.c
@@ -653,7 +653,7 @@ int trSDA(struct tlvdb *tlv) {
 	struct tlvdb *dac_db = emv_pki_recover_dac(issuer_pk, tlv, sda_tlv);
 	if (dac_db) {
 		const struct tlv *dac_tlv = tlvdb_get(dac_db, 0x9f45, NULL);
-		PrintAndLogEx(NORMAL, "SDA verified OK. (%02hhx:%02hhx)\n", dac_tlv->value[0], dac_tlv->value[1]);
+		PrintAndLogEx(NORMAL, "SDA verified OK. (Data Authentication Code: %02hhx:%02hhx)\n", dac_tlv->value[0], dac_tlv->value[1]);
 		tlvdb_add(tlv, dac_db);
 	} else {
 		emv_pk_free(issuer_pk);

From 4921308d8465051346065f94a4033f2463f63dfd Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 9 Jan 2019 21:03:56 +0200
Subject: [PATCH 0406/1938] some changes in DDA

---
 client/emv/emvcore.c | 40 ++++++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/client/emv/emvcore.c b/client/emv/emvcore.c
index 743fa2f9e..c4b815715 100644
--- a/client/emv/emvcore.c
+++ b/client/emv/emvcore.c
@@ -596,7 +596,7 @@ int EMVGenerateChallenge(EMVCommandChannel channel, bool LeaveFieldON, uint8_t *
 }
 
 int EMVInternalAuthenticate(EMVCommandChannel channel, bool LeaveFieldON, uint8_t *DDOL, size_t DDOLLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
-	return EMVExchange(channel, LeaveFieldON, (sAPDU){0x00, 0x88, 0x00, 0x00, DDOLLen, DDOL}, Result, MaxResultLen, ResultLen, sw, tlv);
+	return EMVExchangeEx(channel, false, LeaveFieldON, (sAPDU){0x00, 0x88, 0x00, 0x00, DDOLLen, DDOL}, true, Result, MaxResultLen, ResultLen, sw, tlv);
 }
 
 int MSCComputeCryptoChecksum(EMVCommandChannel channel, bool LeaveFieldON, uint8_t *UDOL, uint8_t UDOLlen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
@@ -682,12 +682,12 @@ int trDDA(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlv) {
 	}
 
 	const struct tlv *sda_tlv = tlvdb_get(tlv, 0x21, NULL);
-	if (!sda_tlv || sda_tlv->len < 1) {
+/*	if (!sda_tlv || sda_tlv->len < 1) { it may be 0!!!!
 		emv_pk_free(pk);
 		PrintAndLogEx(WARNING, "Error: Can't find input list for Offline Data Authentication. Exit.");
 		return 3;
 	}
-
+*/
 	struct emv_pk *issuer_pk = emv_pki_recover_issuer_cert(pk, tlv);
 	if (!issuer_pk) {
 		emv_pk_free(pk);
@@ -710,7 +710,7 @@ int trDDA(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlv) {
 	if (!icc_pk) {
 		emv_pk_free(pk);
 		emv_pk_free(issuer_pk);
-		PrintAndLogEx(WARNING, "Error: ICC setrificate not found. Exit.");
+		PrintAndLogEx(WARNING, "Error: ICC certificate not found. Exit.");
 		return 2;
 	}
 	PrintAndLogEx(SUCCESS, "ICC PK recovered. RID %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx CSN %02hhx:%02hhx:%02hhx\n",
@@ -725,21 +725,25 @@ int trDDA(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlv) {
 			icc_pk->serial[2]
 			);
 
-	struct emv_pk *icc_pe_pk = emv_pki_recover_icc_pe_cert(issuer_pk, tlv);
-	if (!icc_pe_pk) {
-		PrintAndLogEx(WARNING, "WARNING: ICC PE PK recover error. ");
+	if (tlvdb_get(tlv, 0x9f2d, NULL)) {
+		struct emv_pk *icc_pe_pk = emv_pki_recover_icc_pe_cert(issuer_pk, tlv);
+		if (!icc_pe_pk) {
+			PrintAndLogEx(WARNING, "WARNING: ICC PE PK recover error. ");
+		} else {
+			PrintAndLogEx(SUCCESS, "ICC PE PK recovered. RID %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx CSN %02hhx:%02hhx:%02hhx\n",
+					icc_pe_pk->rid[0],
+					icc_pe_pk->rid[1],
+					icc_pe_pk->rid[2],
+					icc_pe_pk->rid[3],
+					icc_pe_pk->rid[4],
+					icc_pe_pk->index,
+					icc_pe_pk->serial[0],
+					icc_pe_pk->serial[1],
+					icc_pe_pk->serial[2]
+					);
+		}
 	} else {
-		PrintAndLogEx(SUCCESS, "ICC PE PK recovered. RID %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx CSN %02hhx:%02hhx:%02hhx\n",
-				icc_pe_pk->rid[0],
-				icc_pe_pk->rid[1],
-				icc_pe_pk->rid[2],
-				icc_pe_pk->rid[3],
-				icc_pe_pk->rid[4],
-				icc_pe_pk->index,
-				icc_pe_pk->serial[0],
-				icc_pe_pk->serial[1],
-				icc_pe_pk->serial[2]
-				);
+		PrintAndLogEx(INFO, "ICC PE PK (PIN Encipherment Public Key Certificate) not found.\n");
 	}
 
 	// 9F4B: Signed Dynamic Application Data

From 56c0dad966fa7d0340333819dfaa1e87fcc13487 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 9 Jan 2019 21:05:52 +0200
Subject: [PATCH 0407/1938] changes in cert decoding logic

---
 client/emv/emv_pki.c | 39 +++++++++++++++++++++++++++++++--------
 client/emv/emv_pki.h |  1 +
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/client/emv/emv_pki.c b/client/emv/emv_pki.c
index 40edc79e4..84224a957 100644
--- a/client/emv/emv_pki.c
+++ b/client/emv/emv_pki.c
@@ -41,7 +41,8 @@ static unsigned char *emv_pki_decode_message(const struct emv_pk *enc_pk,
 		uint8_t msgtype,
 		size_t *len,
 		const struct tlv *cert_tlv,
-		... /* A list of tlv pointers, end with NULL */
+		int tlv_count,
+		... /* A list of tlv pointers */
 		)
 {
 	struct crypto_pk *kcp;
@@ -99,11 +100,11 @@ static unsigned char *emv_pki_decode_message(const struct emv_pk *enc_pk,
 	size_t hash_len = crypto_hash_get_size(ch);
 	crypto_hash_write(ch, data + 1, data_len - 2 - hash_len);
 
-	va_start(vl, cert_tlv);
-	while (true) {
+	va_start(vl, tlv_count);
+	for (int i = 0; i < tlv_count; i++) {
 		const struct tlv *add_tlv = va_arg(vl, const struct tlv *);
 		if (!add_tlv)
-			break;
+			continue;
 
 		crypto_hash_write(ch, add_tlv->value, add_tlv->len);
 	}
@@ -168,6 +169,7 @@ static struct emv_pk *emv_pki_decode_key_ex(const struct emv_pk *enc_pk,
 		const struct tlv *exp_tlv,
 		const struct tlv *rem_tlv,
 		const struct tlv *add_tlv,
+		const struct tlv *sdatl_tlv,
 		bool showData
 		)
 {
@@ -193,9 +195,11 @@ static struct emv_pk *emv_pki_decode_key_ex(const struct emv_pk *enc_pk,
 
 	data = emv_pki_decode_message(enc_pk, msgtype, &data_len,
 			cert_tlv,
+			5,
 			rem_tlv,
 			exp_tlv,
 			add_tlv,
+			sdatl_tlv,
 			NULL);
 	if (!data || data_len < 11 + pan_length) {
 		printf("ERROR: Can't decode message\n");
@@ -278,9 +282,10 @@ static struct emv_pk *emv_pki_decode_key(const struct emv_pk *enc_pk,
 		const struct tlv *cert_tlv,
 		const struct tlv *exp_tlv,
 		const struct tlv *rem_tlv,
-		const struct tlv *add_tlv
+		const struct tlv *add_tlv,
+		const struct tlv *sdatl_tlv
 		) {
-	return emv_pki_decode_key_ex(enc_pk, msgtype, pan_tlv, cert_tlv, exp_tlv, rem_tlv, add_tlv, false);
+	return emv_pki_decode_key_ex(enc_pk, msgtype, pan_tlv, cert_tlv, exp_tlv, rem_tlv, add_tlv, sdatl_tlv, false);
 }
 
 struct emv_pk *emv_pki_recover_issuer_cert(const struct emv_pk *pk, struct tlvdb *db)
@@ -290,17 +295,30 @@ struct emv_pk *emv_pki_recover_issuer_cert(const struct emv_pk *pk, struct tlvdb
 			tlvdb_get(db, 0x90, NULL),
 			tlvdb_get(db, 0x9f32, NULL),
 			tlvdb_get(db, 0x92, NULL),
+			NULL,
 			NULL);
 }
 
 struct emv_pk *emv_pki_recover_icc_cert(const struct emv_pk *pk, struct tlvdb *db, const struct tlv *sda_tlv)
 {
-	return emv_pki_decode_key(pk, 4,
+	size_t sdatl_len;
+	unsigned char *sdatl = emv_pki_sdatl_fill(db, &sdatl_len);
+	struct tlv sda_tdata = {
+		.tag = 0x00,        // dummy tag
+		.len = sdatl_len,
+		.value = sdatl
+	};
+	
+	struct emv_pk *res = emv_pki_decode_key(pk, 4,
 			tlvdb_get(db, 0x5a, NULL),
 			tlvdb_get(db, 0x9f46, NULL),
 			tlvdb_get(db, 0x9f47, NULL),
 			tlvdb_get(db, 0x9f48, NULL),
-			sda_tlv);
+			sda_tlv,
+			&sda_tdata);
+			
+	free(sdatl); // malloc here: emv_pki_sdatl_fill
+	return res;
 }
 
 struct emv_pk *emv_pki_recover_icc_pe_cert(const struct emv_pk *pk, struct tlvdb *db)
@@ -310,6 +328,7 @@ struct emv_pk *emv_pki_recover_icc_pe_cert(const struct emv_pk *pk, struct tlvdb
 			tlvdb_get(db, 0x9f2d, NULL),
 			tlvdb_get(db, 0x9f2e, NULL),
 			tlvdb_get(db, 0x9f2f, NULL),
+			NULL,
 			NULL);
 }
 
@@ -358,6 +377,7 @@ struct tlvdb *emv_pki_recover_dac_ex(const struct emv_pk *enc_pk, const struct t
 
 	unsigned char *data = emv_pki_decode_message(enc_pk, 3, &data_len,
 			tlvdb_get(db, 0x93, NULL),
+			3,
 			sda_tlv,
 			&sda_tdata,
 			NULL);
@@ -391,6 +411,7 @@ struct tlvdb *emv_pki_recover_idn_ex(const struct emv_pk *enc_pk, const struct t
 	size_t data_len;
 	unsigned char *data = emv_pki_decode_message(enc_pk, 5, &data_len,
 			tlvdb_get(db, 0x9f4b, NULL),
+			2,
 			dyn_tlv,
 			NULL);
 
@@ -426,6 +447,7 @@ struct tlvdb *emv_pki_recover_atc_ex(const struct emv_pk *enc_pk, const struct t
 	size_t data_len;
 	unsigned char *data = emv_pki_decode_message(enc_pk, 5, &data_len,
 			tlvdb_get(db, 0x9f4b, NULL),
+			5,
 			tlvdb_get(db, 0x9f37, NULL),
 			tlvdb_get(db, 0x9f02, NULL),
 			tlvdb_get(db, 0x5f2a, NULL),
@@ -502,6 +524,7 @@ struct tlvdb *emv_pki_perform_cda_ex(const struct emv_pk *enc_pk, const struct t
 	size_t data_len = 0;
 	unsigned char *data = emv_pki_decode_message(enc_pk, 5, &data_len,
 			tlvdb_get(this_db, 0x9f4b, NULL),
+			2,
 			un_tlv,
 			NULL);
 	if (!data || data_len < 3) {
diff --git a/client/emv/emv_pki.h b/client/emv/emv_pki.h
index 6fa7b12e9..f5d80bd6d 100644
--- a/client/emv/emv_pki.h
+++ b/client/emv/emv_pki.h
@@ -23,6 +23,7 @@
 
 extern void PKISetStrictExecution(bool se);
 
+unsigned char *emv_pki_sdatl_fill(const struct tlvdb *db, size_t *sdatl_len);
 struct emv_pk *emv_pki_recover_issuer_cert(const struct emv_pk *pk, struct tlvdb *db);
 struct emv_pk *emv_pki_recover_icc_cert(const struct emv_pk *pk, struct tlvdb *db, const struct tlv *sda_tlv);
 struct emv_pk *emv_pki_recover_icc_pe_cert(const struct emv_pk *pk, struct tlvdb *db);

From 0ac728f0d47ee644120c8e44df68663595b5be99 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Thu, 10 Jan 2019 13:06:56 +0200
Subject: [PATCH 0408/1938] VSDC path sketch

---
 client/emv/cmdemv.c  | 11 +++++++++--
 client/emv/emvcore.c |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index 0cc6614d9..708e0d562 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -731,9 +731,9 @@ int CmdEMVExec(const char *cmd) {
 
 	enum TransactionType TrType = TT_MSD;
 	if (arg_get_lit(7))
-					TrType = TT_QVSDCMCHIP;
+		TrType = TT_QVSDCMCHIP;
 	if (arg_get_lit(8))
-					TrType = TT_CDA;
+		TrType = TT_CDA;
 	if (arg_get_lit(9))
 		TrType = TT_VSDC;
 
@@ -1130,6 +1130,13 @@ int CmdEMVExec(const char *cmd) {
 		}
 	}
 
+	// VSDC
+	if (GetCardPSVendor(AID, AIDlen) == CV_VISA && (TrType == TT_VSDC)){
+		PrintAndLogEx(NORMAL, "\n--> VSDC transaction.");
+		
+		
+	}
+	
 	DropField();
 	
 	// Destroy TLV's
diff --git a/client/emv/emvcore.c b/client/emv/emvcore.c
index c4b815715..a7d625af8 100644
--- a/client/emv/emvcore.c
+++ b/client/emv/emvcore.c
@@ -785,7 +785,7 @@ int trDDA(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlv) {
 		struct tlvdb *dac_db = emv_pki_recover_dac(issuer_pk, tlv, sda_tlv);
 		if (dac_db) {
 			const struct tlv *dac_tlv = tlvdb_get(dac_db, 0x9f45, NULL);
-			PrintAndLogEx(NORMAL, "SDA verified OK. (Data Authentication Code: %02hhx:%02hhx)\n", dac_tlv->value[0], dac_tlv->value[1]);
+			PrintAndLogEx(NORMAL, "SDAD verified OK. (Data Authentication Code: %02hhx:%02hhx)\n", dac_tlv->value[0], dac_tlv->value[1]);
 			tlvdb_add(tlv, dac_db);
 		} else {
 			PrintAndLogEx(WARNING, "Error: SSAD verify error");

From 8240639d73bf1114c414fc2a6dcb190bc6dabe61 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Thu, 10 Jan 2019 13:22:27 +0200
Subject: [PATCH 0409/1938] fill VSDC with only AC1

---
 client/emv/cmdemv.c | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index 708e0d562..46ed20165 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -1134,6 +1134,34 @@ int CmdEMVExec(const char *cmd) {
 	if (GetCardPSVendor(AID, AIDlen) == CV_VISA && (TrType == TT_VSDC)){
 		PrintAndLogEx(NORMAL, "\n--> VSDC transaction.");
 		
+		PrintAndLogEx(NORMAL, "* * Calc CDOL1");
+		struct tlv *cdol_data_tlv = dol_process(tlvdb_get(tlvRoot, 0x8c, NULL), tlvRoot, 0x01); // 0x01 - dummy tag
+		if (!cdol_data_tlv) {
+			PrintAndLogEx(WARNING, "Error: can't create CDOL1 TLV.");
+			dreturn(6);
+		}
+		
+		PrintAndLogEx(NORMAL, "CDOL1 data[%d]: %s", cdol_data_tlv->len, sprint_hex(cdol_data_tlv->value, cdol_data_tlv->len));
+		
+		PrintAndLogEx(NORMAL, "* * AC1");
+		// EMVAC_TC + EMVAC_CDAREQ --- to get SDAD
+		res = EMVAC(channel, true, (TrType == TT_CDA) ? EMVAC_TC + EMVAC_CDAREQ : EMVAC_TC, (uint8_t *)cdol_data_tlv->value, cdol_data_tlv->len, buf, sizeof(buf), &len, &sw, tlvRoot);
+		
+		if (res) {	
+			PrintAndLogEx(NORMAL, "AC1 error(%d): %4x. Exit...", res, sw);
+			dreturn(7);
+		}
+		
+		if (decodeTLV)
+			TLVPrintFromBuffer(buf, len);
+		
+		PrintAndLogEx(NORMAL, "\n* * Processing online request\n");
+
+		// authorization response code from acquirer
+		const char HostResponse[] = "0";
+		PrintAndLogEx(NORMAL, "* * Host Response: `%s`", HostResponse);
+		tlvdb_change_or_add_node(tlvRoot, 0x8a, sizeof(HostResponse) - 1, (const unsigned char *)HostResponse);		
+		
 		
 	}
 	

From 70744d2cbbdf412d97d1624b21c86cf52890c429 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Thu, 10 Jan 2019 13:26:15 +0200
Subject: [PATCH 0410/1938] small fix

---
 client/emv/cmdemv.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index 46ed20165..2274f3d69 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -1131,7 +1131,7 @@ int CmdEMVExec(const char *cmd) {
 	}
 
 	// VSDC
-	if (GetCardPSVendor(AID, AIDlen) == CV_VISA && (TrType == TT_VSDC)){
+	if (GetCardPSVendor(AID, AIDlen) == CV_VISA && (TrType == TT_VSDC || TrType == TT_CDA)){
 		PrintAndLogEx(NORMAL, "\n--> VSDC transaction.");
 		
 		PrintAndLogEx(NORMAL, "* * Calc CDOL1");
@@ -1158,7 +1158,7 @@ int CmdEMVExec(const char *cmd) {
 		PrintAndLogEx(NORMAL, "\n* * Processing online request\n");
 
 		// authorization response code from acquirer
-		const char HostResponse[] = "0";
+		const char HostResponse[] = "00"; // 0x3030
 		PrintAndLogEx(NORMAL, "* * Host Response: `%s`", HostResponse);
 		tlvdb_change_or_add_node(tlvRoot, 0x8a, sizeof(HostResponse) - 1, (const unsigned char *)HostResponse);		
 		

From 607bef7ffd2be0403b907f7c720e531c5dbe7161 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Thu, 10 Jan 2019 16:22:32 +0200
Subject: [PATCH 0411/1938] AC Response Format1

---
 client/emv/cmdemv.c | 53 ++++++++++++++++++++++++++++++++++++++++++---
 client/emv/tlv.c    | 15 +++++++++++--
 client/emv/tlv.h    |  1 +
 3 files changed, 64 insertions(+), 5 deletions(-)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index 2274f3d69..a30c22aec 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -38,6 +38,9 @@ void ParamLoadDefaults(struct tlvdb *tlvRoot) {
 	TLV_ADD(0x9F6A, "\x01\x02\x03\x04");
 	//9F66:(Terminal Transaction Qualifiers (TTQ)) len:4
 	TLV_ADD(0x9F66, "\x26\x00\x00\x00"); // qVSDC
+	//95:(Terminal Verification Results) len:5
+	// all OK TVR
+	TLV_ADD(0x95,   "\x00\x00\x00\x00\x00");
 }
 
 void PrintChannel(EMVCommandChannel channel) {
@@ -685,6 +688,50 @@ void ProcessGPOResponseFormat1(struct tlvdb *tlvRoot, uint8_t *buf, size_t len,
 	}
 }
 
+void ProcessACResponseFormat1(struct tlvdb *tlvRoot, uint8_t *buf, size_t len, bool decodeTLV) {
+	if (buf[0] == 0x80) {
+		if (decodeTLV){
+			PrintAndLog("GPO response format1:");
+			TLVPrintFromBuffer(buf, len);
+		}
+		
+		uint8_t elmlen = len - 2; // wo 0x80XX
+		
+		if (len < 4 + 2 || (elmlen - 2) % 4 || elmlen != buf[1]) {
+			PrintAndLogEx(ERR, "GPO response format1 parsing error. length=%d", len);
+		} else {
+			struct tlvdb *tlvElm = NULL;
+			if (decodeTLV)
+				PrintAndLog("\n------------ Format1 decoded ------------");
+			
+			// CID (Cryptogram Information Data)
+			tlvdb_change_or_add_node_ex(tlvRoot, 0x9f27, 1, &buf[2], &tlvElm);
+			if (decodeTLV)
+				TLVPrintFromTLV(tlvElm);
+
+			// ATC (Application Transaction Counter)
+			tlvdb_change_or_add_node_ex(tlvRoot, 0x9f36, 2, &buf[3], &tlvElm);		
+			if (decodeTLV)
+				TLVPrintFromTLV(tlvElm);
+
+			// AC (Application Cryptogram)
+			tlvdb_change_or_add_node_ex(tlvRoot, 0x9f26, min(8, elmlen - 3), &buf[5], &tlvElm);		
+			if (decodeTLV)
+				TLVPrintFromTLV(tlvElm);
+
+			// IAD (Issuer Application Data) - optional
+			if (len > 11 + 2) {
+				tlvdb_change_or_add_node_ex(tlvRoot, 0x9f10, elmlen - 11, &buf[13], &tlvElm);		
+				if (decodeTLV)
+					TLVPrintFromTLV(tlvElm);
+			}			
+		}		
+	} else {
+		if (decodeTLV)
+			TLVPrintFromBuffer(buf, len);
+	}
+}
+
 int CmdEMVExec(const char *cmd) {
 	uint8_t buf[APDU_RES_LEN] = {0};
 	size_t len = 0;
@@ -1151,9 +1198,9 @@ int CmdEMVExec(const char *cmd) {
 			PrintAndLogEx(NORMAL, "AC1 error(%d): %4x. Exit...", res, sw);
 			dreturn(7);
 		}
-		
-		if (decodeTLV)
-			TLVPrintFromBuffer(buf, len);
+
+		// process Format1 (0x80) anf print Format2 (0x77)
+		ProcessACResponseFormat1(tlvRoot, buf, len, decodeTLV);
 		
 		PrintAndLogEx(NORMAL, "\n* * Processing online request\n");
 
diff --git a/client/emv/tlv.c b/client/emv/tlv.c
index 013e9735a..9722c9311 100644
--- a/client/emv/tlv.c
+++ b/client/emv/tlv.c
@@ -359,12 +359,15 @@ void tlvdb_add(struct tlvdb *tlvdb, struct tlvdb *other)
 	tlvdb->next = other;
 }
 
-void tlvdb_change_or_add_node(struct tlvdb *tlvdb, tlv_tag_t tag, size_t len, const unsigned char *value)
+void tlvdb_change_or_add_node_ex(struct tlvdb *tlvdb, tlv_tag_t tag, size_t len, const unsigned char *value, struct tlvdb **tlvdb_elm)
 {
 	struct tlvdb *telm = tlvdb_find_full(tlvdb, tag);
 	if (telm == NULL) {
 		// new tlv element
-		tlvdb_add(tlvdb, tlvdb_fixed(tag, len, value));
+		struct tlvdb *elm = tlvdb_fixed(tag, len, value);
+		tlvdb_add(tlvdb, elm);
+		if (tlvdb_elm)
+			*tlvdb_elm = elm;
 	} else {
 		// the same tlv structure
 		if (telm->tag.tag == tag && telm->tag.len == len && !memcmp(telm->tag.value, value, len))
@@ -400,11 +403,19 @@ void tlvdb_change_or_add_node(struct tlvdb *tlvdb, tlv_tag_t tag, size_t len, co
 		// free old element with childrens
 		telm->next = NULL;
 		tlvdb_free(telm);
+		
+		if (tlvdb_elm)
+			*tlvdb_elm = tnewelm;
 	}
 	
 	return;
 }
 
+void tlvdb_change_or_add_node(struct tlvdb *tlvdb, tlv_tag_t tag, size_t len, const unsigned char *value)
+{
+	tlvdb_change_or_add_node_ex(tlvdb, tag, len, value, NULL);
+}
+
 void tlvdb_visit(const struct tlvdb *tlvdb, tlv_cb cb, void *data, int level)
 {
 	struct tlvdb *next = NULL;
diff --git a/client/emv/tlv.h b/client/emv/tlv.h
index d2a55525f..1f52e440b 100644
--- a/client/emv/tlv.h
+++ b/client/emv/tlv.h
@@ -50,6 +50,7 @@ struct tlvdb *tlvdb_find_path(struct tlvdb *tlvdb, tlv_tag_t tag[]);
 
 void tlvdb_add(struct tlvdb *tlvdb, struct tlvdb *other);
 void tlvdb_change_or_add_node(struct tlvdb *tlvdb, tlv_tag_t tag, size_t len, const unsigned char *value);
+void tlvdb_change_or_add_node_ex(struct tlvdb *tlvdb, tlv_tag_t tag, size_t len, const unsigned char *value, struct tlvdb **tlvdb_elm);
 
 void tlvdb_visit(const struct tlvdb *tlvdb, tlv_cb cb, void *data, int level);
 const struct tlv *tlvdb_get(const struct tlvdb *tlvdb, tlv_tag_t tag, const struct tlv *prev);

From 170cf7c67a49eeb3e976e5621ca6ec778c491d98 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Thu, 10 Jan 2019 17:06:59 +0200
Subject: [PATCH 0412/1938] inc timeout of card's response

---
 common/i2c.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/common/i2c.c b/common/i2c.c
index 99f8b6e12..25b17b6bc 100644
--- a/common/i2c.c
+++ b/common/i2c.c
@@ -161,10 +161,11 @@ bool WaitSCL_L(void) {
 	return WaitSCL_L_delay(15000);
 }
 
-// Wait max 300ms or until SCL goes LOW.
+// Wait max 1800ms or until SCL goes LOW.
+// It timeout reading response from card
 // Which ever comes first
-bool WaitSCL_L_300ms(void){
-	volatile uint16_t delay = 310;
+bool WaitSCL_L_timeout(void){
+	volatile uint16_t delay = 1800;
 	while ( delay-- ) {		
 		// exit on SCL LOW
 		if (!SCL_read)
@@ -193,7 +194,8 @@ bool I2C_Start(void) {
 
 bool I2C_WaitForSim() {
 
-	if (!WaitSCL_L_300ms())
+	// wait for data from card
+	if (!WaitSCL_L_timeout())
 		return false;
 
 	// 8051 speaks with smart card.

From cada4e4877a5c311216416c7425c5623ba39f0ae Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Thu, 10 Jan 2019 17:24:45 +0200
Subject: [PATCH 0413/1938] DDA works

---
 client/emv/emvcore.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/client/emv/emvcore.c b/client/emv/emvcore.c
index a7d625af8..5ea9026c2 100644
--- a/client/emv/emvcore.c
+++ b/client/emv/emvcore.c
@@ -829,9 +829,16 @@ int trDDA(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlv) {
 			if (len < 3 ) {
 				PrintAndLogEx(WARNING, "Error: Internal Authenticate format1 parsing error. length=%d", len);
 			} else {
+				// parse response 0x80
+				struct tlvdb *t80 = tlvdb_parse_multi(buf, len);
+				const struct tlv * t80tlv = tlvdb_get_tlv(t80);
+				
 				// 9f4b Signed Dynamic Application Data
-				dda_db = tlvdb_fixed(0x9f4b, len - 2, buf + 2);
+				dda_db = tlvdb_fixed(0x9f4b, t80tlv->len, t80tlv->value);
 				tlvdb_add(tlv, dda_db);
+				
+				tlvdb_free(t80);
+				
 				if (decodeTLV){
 					PrintAndLogEx(NORMAL, "* * Decode response format 1:");
 					TLVPrintFromTLV(dda_db);

From 628eceb5ed7b56a32cffba38e6c4095a45acba32 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Thu, 10 Jan 2019 17:44:51 +0200
Subject: [PATCH 0414/1938] print fix

---
 client/emv/emvcore.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/emv/emvcore.c b/client/emv/emvcore.c
index 5ea9026c2..023035a7d 100644
--- a/client/emv/emvcore.c
+++ b/client/emv/emvcore.c
@@ -795,7 +795,7 @@ int trDDA(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlv) {
 			return 4;
 		}
 		
-		PrintAndLogEx(NORMAL, "\n* Calc DDOL");
+		PrintAndLogEx(NORMAL, "\n* * Calc DDOL");
 		const struct tlv *ddol_tlv = tlvdb_get(tlv, 0x9f49, NULL);
 		if (!ddol_tlv) {
 			ddol_tlv = &default_ddol_tlv;
@@ -813,7 +813,7 @@ int trDDA(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlv) {
 
 		PrintAndLogEx(NORMAL, "DDOL data[%d]: %s", ddol_data_tlv->len, sprint_hex(ddol_data_tlv->value, ddol_data_tlv->len));
 
-		PrintAndLogEx(NORMAL, "\n* Internal Authenticate");
+		PrintAndLogEx(NORMAL, "\n* * Internal Authenticate");
 		int res = EMVInternalAuthenticate(channel, true, (uint8_t *)ddol_data_tlv->value, ddol_data_tlv->len, buf, sizeof(buf), &len, &sw, NULL);
 		if (res) {	
 			PrintAndLogEx(WARNING, "Internal Authenticate error(%d): %4x. Exit...", res, sw);
@@ -840,7 +840,7 @@ int trDDA(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlv) {
 				tlvdb_free(t80);
 				
 				if (decodeTLV){
-					PrintAndLogEx(NORMAL, "* * Decode response format 1:");
+					PrintAndLogEx(NORMAL, "* * * Decode response format 1:");
 					TLVPrintFromTLV(dda_db);
 				}
 			}
@@ -875,12 +875,12 @@ int trDDA(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlv) {
 		// 9f4c ICC Dynamic Number
 		const struct tlv *idn_tlv = tlvdb_get(idn_db, 0x9f4c, NULL);
 		if(idn_tlv) {
-			PrintAndLogEx(NORMAL, "\nIDN (ICC Dynamic Number) [%zu] %s", idn_tlv->len, sprint_hex_inrow(idn_tlv->value, idn_tlv->len));
-			PrintAndLogEx(NORMAL, "DDA verified OK.");
+			PrintAndLogEx(INFO, "\nIDN (ICC Dynamic Number) [%zu] %s", idn_tlv->len, sprint_hex_inrow(idn_tlv->value, idn_tlv->len));
+			PrintAndLogEx(INFO, "DDA verified OK.");
 			tlvdb_add(tlv, idn_db);
 			tlvdb_free(idn_db);
 		} else {
-			PrintAndLogEx(NORMAL, "\nERROR: DDA verify error");
+			PrintAndLogEx(ERR, "\nDDA verify error");
 			tlvdb_free(idn_db);
 
 			emv_pk_free(pk);

From eaedf7f81101e972887ad749cdb99ef29c3188a2 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Thu, 10 Jan 2019 18:33:21 +0200
Subject: [PATCH 0415/1938] VSDC up to CDOL2 calc

---
 client/emv/cmdemv.c | 17 +++++++++++++++++
 client/emv/tlv.c    | 12 +++++++++++-
 client/emv/tlv.h    |  2 ++
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index a30c22aec..114aca322 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -1209,6 +1209,23 @@ int CmdEMVExec(const char *cmd) {
 		PrintAndLogEx(NORMAL, "* * Host Response: `%s`", HostResponse);
 		tlvdb_change_or_add_node(tlvRoot, 0x8a, sizeof(HostResponse) - 1, (const unsigned char *)HostResponse);		
 		
+		// needs to send AC2 command (res == ARQC)
+		uint8_t CID = 0;
+		tlvdb_get_uint8(tlvRoot, 0x9f27, &CID);
+		if ((CID & 0xc0) == 0x80) {
+			PrintAndLogEx(NORMAL, "* * Calc CDOL2");
+			struct tlv *cdol_data_tlv = dol_process(tlvdb_get(tlvRoot, 0x8d, NULL), tlvRoot, 0x01); // 0x01 - dummy tag
+			if (!cdol_data_tlv) {
+				PrintAndLogEx(WARNING, "Error: can't create CDOL2 TLV.");
+				dreturn(6);
+			}
+			
+			PrintAndLogEx(NORMAL, "CDOL2 data[%d]: %s", cdol_data_tlv->len, sprint_hex(cdol_data_tlv->value, cdol_data_tlv->len));
+			
+			PrintAndLogEx(NORMAL, "* * AC2");
+			
+			
+		}
 		
 	}
 	
diff --git a/client/emv/tlv.c b/client/emv/tlv.c
index 9722c9311..8d1429640 100644
--- a/client/emv/tlv.c
+++ b/client/emv/tlv.c
@@ -469,7 +469,10 @@ const struct tlv *tlvdb_get_inchild(const struct tlvdb *tlvdb, tlv_tag_t tag, co
 }
 
 const struct tlv *tlvdb_get_tlv(const struct tlvdb *tlvdb) {
-	return &tlvdb->tag;
+	if (tlvdb)
+		return &tlvdb->tag;
+	else
+		return NULL;
 }
 
 unsigned char *tlv_encode(const struct tlv *tlv, size_t *len)
@@ -546,6 +549,13 @@ struct tlvdb *tlvdb_elm_get_parent(struct tlvdb *tlvdb)
 	return tlvdb->parent;
 }
 
+bool tlvdb_get_uint8(struct tlvdb *tlvRoot, tlv_tag_t tag, uint8_t *value)
+{
+	const struct tlvdb *tlvdb = tlvdb_get(tlvRoot, tag, NULL);
+	const struct tlv *tlvelm = tlvdb_get_tlv(tlvdb); 	
+	return tlv_get_uint8(tlvelm, value);
+}
+
 bool tlv_get_uint8(const struct tlv *etlv, uint8_t *value) 
 {
 	*value = 0;
diff --git a/client/emv/tlv.h b/client/emv/tlv.h
index 1f52e440b..e75bbf986 100644
--- a/client/emv/tlv.h
+++ b/client/emv/tlv.h
@@ -65,4 +65,6 @@ bool tlv_equal(const struct tlv *a, const struct tlv *b);
 bool tlv_get_uint8(const struct tlv *etlv, uint8_t *value);
 bool tlv_get_int(const struct tlv *etlv, int *value);
 
+bool tlvdb_get_uint8(struct tlvdb *tlvRoot, tlv_tag_t tag, uint8_t *value);
+
 #endif

From e058d87dc11ec2c3117d8848ea68b54a9c779e65 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Thu, 10 Jan 2019 19:28:43 +0200
Subject: [PATCH 0416/1938] fix CDOL generation and add AC1 print result

---
 client/emv/cmdemv.c   | 35 +++++++++++++++++++++++++----------
 client/emv/emv_tags.h |  4 ++++
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index 114aca322..07543241c 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -1182,17 +1182,17 @@ int CmdEMVExec(const char *cmd) {
 		PrintAndLogEx(NORMAL, "\n--> VSDC transaction.");
 		
 		PrintAndLogEx(NORMAL, "* * Calc CDOL1");
-		struct tlv *cdol_data_tlv = dol_process(tlvdb_get(tlvRoot, 0x8c, NULL), tlvRoot, 0x01); // 0x01 - dummy tag
-		if (!cdol_data_tlv) {
+		struct tlv *cdol1_data_tlv = dol_process(tlvdb_get(tlvRoot, 0x8c, NULL), tlvRoot, 0x01); // 0x01 - dummy tag
+		if (!cdol1_data_tlv) {
 			PrintAndLogEx(WARNING, "Error: can't create CDOL1 TLV.");
 			dreturn(6);
 		}
 		
-		PrintAndLogEx(NORMAL, "CDOL1 data[%d]: %s", cdol_data_tlv->len, sprint_hex(cdol_data_tlv->value, cdol_data_tlv->len));
+		PrintAndLogEx(NORMAL, "CDOL1 data[%d]: %s", cdol1_data_tlv->len, sprint_hex(cdol1_data_tlv->value, cdol1_data_tlv->len));
 		
 		PrintAndLogEx(NORMAL, "* * AC1");
 		// EMVAC_TC + EMVAC_CDAREQ --- to get SDAD
-		res = EMVAC(channel, true, (TrType == TT_CDA) ? EMVAC_TC + EMVAC_CDAREQ : EMVAC_TC, (uint8_t *)cdol_data_tlv->value, cdol_data_tlv->len, buf, sizeof(buf), &len, &sw, tlvRoot);
+		res = EMVAC(channel, true, (TrType == TT_CDA) ? EMVAC_TC + EMVAC_CDAREQ : EMVAC_TC, (uint8_t *)cdol1_data_tlv->value, cdol1_data_tlv->len, buf, sizeof(buf), &len, &sw, tlvRoot);
 		
 		if (res) {	
 			PrintAndLogEx(NORMAL, "AC1 error(%d): %4x. Exit...", res, sw);
@@ -1201,7 +1201,17 @@ int CmdEMVExec(const char *cmd) {
 
 		// process Format1 (0x80) anf print Format2 (0x77)
 		ProcessACResponseFormat1(tlvRoot, buf, len, decodeTLV);
-		
+
+		uint8_t CID = 0;
+		tlvdb_get_uint8(tlvRoot, 0x9f27, &CID);
+
+		// AC1 print result
+		PrintAndLog("");
+		if ((CID & EMVAC_AC_MASK) == EMVAC_AAC)		PrintAndLogEx(INFO, "AC1 result: AAC (Transaction declined)");
+		if ((CID & EMVAC_AC_MASK) == EMVAC_TC)		PrintAndLogEx(INFO, "AC1 result: TC (Transaction approved)");
+		if ((CID & EMVAC_AC_MASK) == EMVAC_ARQC)	PrintAndLogEx(INFO, "AC1 result: ARQC (Online authorisation requested)");
+		if ((CID & EMVAC_AC_MASK) == EMVAC_AC_MASK)	PrintAndLogEx(INFO, "AC1 result: RFU");
+
 		PrintAndLogEx(NORMAL, "\n* * Processing online request\n");
 
 		// authorization response code from acquirer
@@ -1210,21 +1220,26 @@ int CmdEMVExec(const char *cmd) {
 		tlvdb_change_or_add_node(tlvRoot, 0x8a, sizeof(HostResponse) - 1, (const unsigned char *)HostResponse);		
 		
 		// needs to send AC2 command (res == ARQC)
-		uint8_t CID = 0;
-		tlvdb_get_uint8(tlvRoot, 0x9f27, &CID);
 		if ((CID & 0xc0) == 0x80) {
 			PrintAndLogEx(NORMAL, "* * Calc CDOL2");
-			struct tlv *cdol_data_tlv = dol_process(tlvdb_get(tlvRoot, 0x8d, NULL), tlvRoot, 0x01); // 0x01 - dummy tag
-			if (!cdol_data_tlv) {
+			struct tlv *cdol2_data_tlv = dol_process(tlvdb_get(tlvRoot, 0x8d, NULL), tlvRoot, 0x01); // 0x01 - dummy tag
+			if (!cdol2_data_tlv) {
 				PrintAndLogEx(WARNING, "Error: can't create CDOL2 TLV.");
 				dreturn(6);
 			}
 			
-			PrintAndLogEx(NORMAL, "CDOL2 data[%d]: %s", cdol_data_tlv->len, sprint_hex(cdol_data_tlv->value, cdol_data_tlv->len));
+			PrintAndLogEx(NORMAL, "CDOL2 data[%d]: %s", cdol2_data_tlv->len, sprint_hex(cdol2_data_tlv->value, cdol2_data_tlv->len));
 			
 			PrintAndLogEx(NORMAL, "* * AC2");
 			
 			
+/*		// AC2
+		PRINT_INDENT(level);
+		if ((CID & EMVAC_AC2_MASK) == EMVAC_AAC2)	fprintf(f, "\tAC2: AAC (Transaction declined)\n");
+		if ((CID & EMVAC_AC2_MASK) == EMVAC_TC2)	fprintf(f, "\tAC2: TC (Transaction approved)\n");
+		if ((CID & EMVAC_AC2_MASK) == EMVAC_ARQC2)	fprintf(f, "\tAC2: not requested (ARQC)\n");
+		if ((CID & EMVAC_AC2_MASK) == EMVAC_AC2_MASK)	fprintf(f, "\tAC2: RFU\n");
+*/
 		}
 		
 	}
diff --git a/client/emv/emv_tags.h b/client/emv/emv_tags.h
index 246fc72d7..f7d9a8476 100644
--- a/client/emv/emv_tags.h
+++ b/client/emv/emv_tags.h
@@ -25,6 +25,10 @@
 # define EMVAC_TC        0x40
 # define EMVAC_ARQC      0x80
 # define EMVAC_CDAREQ    0x10
+# define EMVAC_AC2_MASK  0x30
+# define EMVAC_AAC2      0x00
+# define EMVAC_TC2       0x10
+# define EMVAC_ARQC2     0x20
 
 // CID
 # define EMVCID_ADVICE       0x08

From bd0e33fb58151411f56e10da41e112ec528b587e Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 10 Jan 2019 18:55:56 +0100
Subject: [PATCH 0417/1938] chg: 'script run read_pwd_mem' - m|t|i params to
 simplify printing dictionary items

---
 client/scripts/read_pwd_mem.lua | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/client/scripts/read_pwd_mem.lua b/client/scripts/read_pwd_mem.lua
index 772927c0c..a0688a639 100644
--- a/client/scripts/read_pwd_mem.lua
+++ b/client/scripts/read_pwd_mem.lua
@@ -21,6 +21,9 @@ Arguments:
 	-o <offset>     :  memory offset, default is 0
 	-l <length>     :  length in bytes, default is 256
 	-k <keylen>     :  key length in bytes <4|6|8> ,  default is 4
+	-m              :  print Mifare dictionary keys
+	-t              :  print t55xx dictionary passwords
+	-i              :  print iClass dictionary keys
 ]]
 example =
 [[
@@ -67,7 +70,7 @@ local function main(args)
 	local keylength = 4
 	local usedkey = false
 	
-	for o, a in getopt.getopt(args, 'ho:l:k:') do
+	for o, a in getopt.getopt(args, 'ho:l:k:mti') do
 	
 		-- help
 		if o == "h" then return help() end
@@ -80,6 +83,10 @@ local function main(args)
 		
 		-- keylength
 		if o == "k" then keylength = tonumber(a); usedkey = true end
+		
+		if o == "m" then keylength =6; usedkey = true; offset = 0x3F000-0x4000; end
+		if o == "t" then keylength =4; usedkey = true; offset = 0x3F000-0x3000; end
+		if o == "i" then keylength =8; usedkey = true; offset = 0x3F000-0x5000; end
 	end
 	
 	if length < 0 or length > 256 then

From 43d57855a00232ed2de92212d65031ff3d46443b Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 11 Jan 2019 12:56:59 +0100
Subject: [PATCH 0418/1938] CHG: wrong define

---
 client/emv/cmdemv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index a30c22aec..91a3663f3 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -715,7 +715,7 @@ void ProcessACResponseFormat1(struct tlvdb *tlvRoot, uint8_t *buf, size_t len, b
 				TLVPrintFromTLV(tlvElm);
 
 			// AC (Application Cryptogram)
-			tlvdb_change_or_add_node_ex(tlvRoot, 0x9f26, min(8, elmlen - 3), &buf[5], &tlvElm);		
+			tlvdb_change_or_add_node_ex(tlvRoot, 0x9f26, MIN(8, elmlen - 3), &buf[5], &tlvElm);		
 			if (decodeTLV)
 				TLVPrintFromTLV(tlvElm);
 

From f215ebef80c5875d4d5f1fcbe6c569bf9bb8294d Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 11 Jan 2019 14:46:27 +0100
Subject: [PATCH 0419/1938] Refactored 'lf t55xx brute',  split it up into two
 commands. - lf t55xx brute  (tries bruteforcing a range of pwds - lf t55xx
 chk    (uses dictionary file or RDV4 flashmem)

FIX: adjust lf sim (@marshmellow42)  see https://github.com/marshmellow42/proxmark3/commit/7008cf9c15a135a066227635e64f59285eb73a80
"attempt to speed up the loops waiting for carrier signal to go high or low
by only checking for a halt (button press or usbpol) every 256th loop
iteration. some users were experiencing modulating reactions to be too slow.

ADD: 'lf t55xx chk'
It uses @marshmellows42 idea behind commit  (https://github.com/marshmellow42/proxmark3/commit/6178b085a0374e656cce3849e481fa5800403c2b)
With calculating a baseline (read block0 32times and average the signal-ish) and sampling only 1024 signal data. The algo then proceeds to calc the average and keep track of the candidate which is given the most difference in signal data average value.    I do some squaring and shifting for this.
The candidate is then send back to client to be tested properly with  trymodulation like before.

This seems to work good on t55xx card which has a ASK configuration.

WORK-IN-PROGRESS
---
 armsrc/appmain.c    |   3 +
 armsrc/apps.h       |   2 +
 armsrc/lfops.c      | 153 +++++++++++++++++++++++++++++++++++++++-----
 client/cmdlft55xx.c | 153 ++++++++++++++++++++++++++++++++------------
 client/cmdlft55xx.h |   1 +
 include/usb_cmd.h   |   2 +
 6 files changed, 255 insertions(+), 59 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 8759f93c4..0bf9ccb9d 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -724,6 +724,9 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 		case CMD_T55XX_RESET_READ:
 			T55xxResetRead();
 			break;
+		case CMD_T55XX_CHKPWDS:
+			T55xx_ChkPwds();
+			break;
 		case CMD_PCF7931_READ:
 			ReadPCF7931();
 			break;
diff --git a/armsrc/apps.h b/armsrc/apps.h
index 7e45d5e50..d17d9ef4b 100644
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -103,6 +103,8 @@ void T55xxWriteBlock(uint32_t Data, uint8_t Block, uint32_t Pwd, uint8_t PwdMode
 void T55xxWriteBlockExt(uint32_t Data, uint8_t Block, uint32_t Pwd, uint8_t PwdMode);
 void T55xxReadBlock(uint16_t arg0, uint8_t Block, uint32_t Pwd);
 void T55xxWakeUp(uint32_t Pwd);
+void T55xx_ChkPwds(void);
+
 void TurnReadLFOn(uint32_t delay);
 void EM4xReadWord(uint8_t addr, uint32_t pwd, uint8_t usepwd);
 void EM4xWriteWord(uint32_t flag, uint32_t data, uint32_t pwd);
diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index e690714df..47f0cb324 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -598,9 +598,11 @@ void SimulateTagLowFrequencyEx(int period, int gap, int ledcontrol, int numcycle
 	AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT | GPIO_SSC_CLK;
 	AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
 	AT91C_BASE_PIOA->PIO_ODR = GPIO_SSC_CLK;
+	
+	uint8_t check = 1;
 
 	for(;;) {
-
+	
 		if ( numcycles > -1 ) {
 			if ( x != numcycles ) {
 				++x;
@@ -616,9 +618,11 @@ void SimulateTagLowFrequencyEx(int period, int gap, int ledcontrol, int numcycle
 		// used as a simple detection of a reader field?
 		while (!(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_CLK)) {
 			WDT_HIT();
-			if ( usb_poll_validate_length() || BUTTON_PRESS() )
-				goto OUT;
-		}
+			if ( !check ) {
+				if ( usb_poll_validate_length() || BUTTON_PRESS() )
+					goto OUT;
+			}
+			++check;		}
 
 		if (buf[i])
 			OPEN_COIL();
@@ -628,9 +632,11 @@ void SimulateTagLowFrequencyEx(int period, int gap, int ledcontrol, int numcycle
 		//wait until SSC_CLK goes LOW
 		while (AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_CLK) {
 			WDT_HIT();
-			//if ( usb_poll_validate_length() || BUTTON_PRESS() )
-			if ( BUTTON_PRESS() )
-				goto OUT;
+			if ( !check ) {
+				if ( usb_poll_validate_length() || BUTTON_PRESS() )
+					goto OUT;
+			}
+			++check;
 		}
 
 		i++;
@@ -1489,11 +1495,22 @@ void T55xxWriteBlock(uint32_t Data, uint8_t Block, uint32_t Pwd, uint8_t arg) {
 // Read one card block in page [page]
 void T55xxReadBlock(uint16_t arg0, uint8_t Block, uint32_t Pwd) {
 	LED_A_ON();
-	bool PwdMode = arg0 & 0x1;
-	uint8_t Page = (arg0 & 0x2) >> 1;
-	uint32_t i = 0;
-	bool RegReadMode = (Block == 0xFF);//regular read mode
+	bool PwdMode =    arg0 & 0x1;
+	uint8_t Page =  ( arg0 & 0x2 ) >> 1;
+	bool brute_mem =  arg0 & 0x4;
 
+	uint32_t i = 0;
+	
+	// regular read mode
+	bool RegReadMode = (Block == 0xFF); 
+
+	uint8_t start_wait = 4;
+	size_t samples = 12000;
+	if ( brute_mem ) {
+		start_wait = 0;
+		samples = 1024;
+	}
+	
 	//clear buffer now so it does not interfere with timing later
 	BigBuf_Clear_keep_EM();
 
@@ -1505,7 +1522,8 @@ void T55xxReadBlock(uint16_t arg0, uint8_t Block, uint32_t Pwd) {
 	// Set up FPGA, 125kHz to power up the tag
 	LFSetupFPGAForADC(95, true);
 	// make sure tag is fully powered up...
-	WaitMS(4);
+	WaitMS(start_wait);
+	
 	// Trigger T55x7 Direct Access Mode with start gap
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 	WaitUS(t_config.start_gap);
@@ -1529,17 +1547,118 @@ void T55xxReadBlock(uint16_t arg0, uint8_t Block, uint32_t Pwd) {
 
 	// Turn field on to read the response
 	// 137*8 seems to get to the start of data pretty well...
-	//  but we want to go past the start and let the repeating data settle in...
+	// but we want to go past the start and let the repeating data settle in...
 	TurnReadLFOn(210*8);
 
 	// Acquisition
 	// Now do the acquisition
-	DoPartialAcquisition(0, true, 12000, 0);
+	DoPartialAcquisition(0, true, samples, 0);
 
 	// Turn the field off
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); // field off
-	cmd_send(CMD_ACK,0,0,0,0,0);
-	LED_A_OFF();
+	if ( !brute_mem ) {
+		FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+		cmd_send(CMD_ACK,0,0,0,0,0);
+		LED_A_OFF();
+	}
+}
+
+void T55xx_ChkPwds() {
+
+	DbpString("[+] T55XX Check pwds using flashmemory starting");
+
+	uint8_t ret = 0;
+	// First get baseline and setup LF mode.
+	// tends to mess up BigBuf
+	uint8_t *buf = BigBuf_get_addr();
+	
+	uint32_t b1, baseline = 0;
+	
+	// collect baseline for failed attempt
+	uint8_t x = 32;
+	while (x--) {
+		b1 = 0;
+		T55xxReadBlock(4, 1, 0);
+		for (uint16_t j=0; j < 1024; ++j)
+			b1 += buf[j];
+		
+		b1 *= b1;
+		b1 >>= 8; 		
+		baseline += b1;
+	}
+
+	baseline >>= 5;
+	Dbprintf("[=] Baseline determined [%u]", baseline);	
+
+	
+	uint8_t *pwds = BigBuf_get_EM_addr();
+	bool use_flashmem = true;
+	uint16_t pwdCount = 0;
+	uint32_t candidate = 0;
+
+#ifdef WITH_FLASH	
+	if ( use_flashmem ) {
+		BigBuf_Clear_EM();
+		uint16_t isok = 0;
+		uint8_t counter[2] = {0x00, 0x00};		
+		isok = Flash_ReadData(DEFAULT_T55XX_KEYS_OFFSET, counter, sizeof(counter) );
+		if ( isok != sizeof(counter) )
+			goto OUT;
+		
+		pwdCount = counter[1] << 8 | counter[0];
+		
+		if ( pwdCount == 0 && pwdCount == 0xFFFF) 
+			goto OUT;
+
+		isok = Flash_ReadData(DEFAULT_T55XX_KEYS_OFFSET+2, pwds, pwdCount * 4);
+		if ( isok != pwdCount * 4 )
+			goto OUT;
+		
+		Dbprintf("[=] Password dictionary count %d ", pwdCount);
+	}
+#endif
+
+	uint32_t pwd = 0, curr = 0, prev = 0;
+	for (uint16_t i =0; i< pwdCount; ++i) {
+
+		if (BUTTON_PRESS() && !usb_poll_validate_length()) {
+			goto OUT;
+		}
+		
+		pwd = bytes_to_num(pwds + i * 4, 4);
+	
+
+		T55xxReadBlock(5, 0, pwd);
+		
+		// calc mean of BigBuf 1024 samples.
+		uint32_t sum = 0;
+		for (uint16_t j=0; j<1024; ++j) {
+			sum += buf[j];
+		}
+		
+		sum *= sum;
+		sum >>= 8;
+		
+		int32_t tmp = (sum - baseline);
+		curr = ABS(tmp);
+		
+		Dbprintf("[=] Pwd %08X  | ABS %u", pwd, curr );
+			
+		if ( curr > prev ) {
+			
+					
+			Dbprintf("[=]  --> ABS %u  Candidate %08X <--", curr, pwd );
+			candidate = pwd;
+			prev = curr;
+		}
+	}
+	
+	if ( candidate )
+		ret = 1;
+		
+OUT:
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+	cmd_send(CMD_ACK,ret,candidate,0,0,0);
+	LEDsoff();
 }
 
 void T55xxWakeUp(uint32_t Pwd){
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index ed8c0464e..29487e026 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -141,21 +141,33 @@ int usage_t55xx_wakup(){
     PrintAndLogEx(NORMAL, "      lf t55xx wakeup p 11223344  - send wakeup password");
 	return 0;
 }
-int usage_t55xx_bruteforce(){
-	PrintAndLogEx(NORMAL, "This command uses A) bruteforce to scan a number range");
-	PrintAndLogEx(NORMAL, "                  B) a dictionary attack");
+int usage_t55xx_chk(){
+	PrintAndLogEx(NORMAL, "This command uses a dictionary attack");
 	PrintAndLogEx(NORMAL, "press 'enter' to cancel the command");
-    PrintAndLogEx(NORMAL, "Usage: lf t55xx bruteforce [h] <start password> <end password> [i <*.dic>]");
+    PrintAndLogEx(NORMAL, "Usage: lf t55xx bruteforce [h] <m> [i <*.dic>]");
+	PrintAndLogEx(NORMAL, "Options:");
+	PrintAndLogEx(NORMAL, "     h			- this help");
+	PrintAndLogEx(NORMAL, "     m			- use dictionary from flashmemory\n");	
+    PrintAndLogEx(NORMAL, "     i <*.dic>	- loads a default keys dictionary file <*.dic>");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "       lf t55xx bruteforce m");
+	PrintAndLogEx(NORMAL, "       lf t55xx bruteforce i default_pwd.dic");
+    PrintAndLogEx(NORMAL, "");
+    return 0;
+}
+int usage_t55xx_bruteforce(){
+	PrintAndLogEx(NORMAL, "This command uses bruteforce to scan a number range");
+	PrintAndLogEx(NORMAL, "press 'enter' to cancel the command");
+    PrintAndLogEx(NORMAL, "Usage: lf t55xx bruteforce [h] <start password> <end password>");
     PrintAndLogEx(NORMAL, "       password must be 4 bytes (8 hex symbols)");
 	PrintAndLogEx(NORMAL, "Options:");
 	PrintAndLogEx(NORMAL, "     h			- this help");
 	PrintAndLogEx(NORMAL, "     <start_pwd> - 4 byte hex value to start pwd search at");
 	PrintAndLogEx(NORMAL, "     <end_pwd>   - 4 byte hex value to end pwd search at");
-    PrintAndLogEx(NORMAL, "     i <*.dic>	- loads a default keys dictionary file <*.dic>");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "       lf t55xx bruteforce aaaaaaaa bbbbbbbb");
-	PrintAndLogEx(NORMAL, "       lf t55xx bruteforce i default_pwd.dic");
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
@@ -224,10 +236,9 @@ int CmdT55xxSetConfig(const char *Cmd) {
 	uint8_t cmdp = 0;
 	bool errors = false;
 	while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		tmp = param_getchar(Cmd, cmdp);
+		tmp = tolower(param_getchar(Cmd, cmdp));
 		switch(tmp)	{
 		case 'h':
-		case 'H':
 			return usage_t55xx_config();
 		case 'b':
 			errors |= param_getdec(Cmd, cmdp+1, &bitRate);
@@ -292,12 +303,10 @@ int CmdT55xxSetConfig(const char *Cmd) {
 				config.offset = offset;
 			cmdp+=2;
 			break;
-		case 'Q':
 		case 'q':		
 			config.Q5 = true;
 			cmdp++;
 			break;
-		case 'S':
 		case 's':		
 			config.ST = true;
 			cmdp++;
@@ -343,8 +352,8 @@ int T55xxReadBlock(uint8_t block, bool page1, bool usepwd, bool override, uint32
 	if (!AquireData(page1, block, usepwd, password) ) return 0;
 	if (!DecodeT55xxBlock()) return 0;
 
-	char blk[10]={0};
-	sprintf(blk,"%02d", block);
+	char blk[10] = {0};
+	sprintf(blk, "%02d", block);
 	printT55xxBlock(blk);	
 	return 1;
 }
@@ -358,22 +367,18 @@ int CmdT55xxReadBlock(const char *Cmd) {
 	bool errors = false;
 	uint8_t cmdp = 0;
 	while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch(param_getchar(Cmd, cmdp)) {
+		switch ( tolower(param_getchar(Cmd, cmdp))) {
 		case 'h':
-		case 'H':
 			return usage_t55xx_read();
 		case 'b':
-		case 'B':
 			errors |= param_getdec(Cmd, cmdp+1, &block);
 			cmdp += 2;
 			break;
 		case 'o':
-		case 'O':
 			override = true;
 			cmdp++;
 			break;
 		case 'p':
-		case 'P':
 			password = param_get32ex(Cmd, cmdp+1, 0, 16);
 			usepwd = true;
 			cmdp += 2;
@@ -1503,23 +1508,68 @@ bool IsCancelled(void) {
 	return false;
 }
 
-int CmdT55xxBruteForce(const char *Cmd) {
-	
+int CmdT55xxChkPwds(const char *Cmd) {
 	// load a default pwd file.
 	char line[9];
 	char filename[FILE_PATH_SIZE] = {0};
 	int	keycnt = 0;
 	uint8_t stKeyBlock = 20;
 	uint8_t *keyBlock = NULL, *p = NULL;
-    uint32_t start_password = 0x00000000; //start password
-    uint32_t end_password   = 0xFFFFFFFF; //end   password
     bool found = false;
+	uint8_t timeout = 0;
 
 	memset(line, 0, sizeof(line));
 	
     char cmdp = tolower(param_getchar(Cmd, 0));
-	if (cmdp == 'h') return usage_t55xx_bruteforce();
+	if (cmdp == 'h') return usage_t55xx_chk();
+	
+	/*
+	if ( T55xxReadBlock(7, 0, 0, 0, 0) ) {
+		
+		// now try to validate it..
+		PrintAndLogEx(WARNING, "\n Block 7 was readable");
+		return 1;
+	}
+	*/
+	
+	uint64_t t1 = msclock();
 
+	if ( cmdp == 'm' ) {	
+		UsbCommand c = {CMD_T55XX_CHKPWDS, {0,0,0} };
+		clearCommandBuffer();
+		SendCommand(&c);
+		UsbCommand resp;
+
+		while ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
+			timeout++;
+			printf("."); fflush(stdout);
+			if (timeout > 180) {
+				PrintAndLogEx(WARNING, "\nno response from Proxmark. Aborting...");
+				return 2;
+			}
+		}
+		
+		if ( resp.arg[0] ) {
+			PrintAndLogEx(SUCCESS, "\nFound a candidate [ %08X ]. Trying to validate", resp.arg[1]);
+			
+			if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, resp.arg[1])) {
+				PrintAndLogEx(NORMAL, "Aquireing data from device failed. Quitting");
+				return 2;
+			}
+			
+			found = tryDetectModulation();
+			if (found) {
+				PrintAndLogEx(NORMAL, "Found valid password: [ %08X ]", resp.arg[1]);
+			} else {
+				PrintAndLogEx(NORMAL, "Password NOT found.");
+			}
+		} else {
+			PrintAndLogEx(NORMAL, "Password NOT found.");
+		}
+		
+		goto out;
+	}
+	
 	keyBlock = calloc(stKeyBlock, 4);
 	if (keyBlock == NULL) return 1;
 
@@ -1569,7 +1619,7 @@ int CmdT55xxBruteForce(const char *Cmd) {
 			
 			num_to_bytes( strtoll(line, NULL, 16), 4, keyBlock + 4*keycnt);
 			
-			PrintAndLogEx(NORMAL, "chk custom pwd[%2d] %08X", keycnt, bytes_to_num(keyBlock + 4 * keycnt, 4) );			
+//			PrintAndLogEx(NORMAL, "chk custom pwd[%2d] %08X", keycnt, bytes_to_num(keyBlock + 4 * keycnt, 4) );
 			keycnt++;			
 			memset(line, 0, sizeof(line));
 		}		
@@ -1609,60 +1659,78 @@ int CmdT55xxBruteForce(const char *Cmd) {
 			}
 			
 			found = tryDetectModulation();
-			if ( found ) {
-				PrintAndLogEx(NORMAL, "Found valid password: [%08X]", testpwd);
-				//free(keyBlock);
-				//return 0;
-			} 
+			if ( found )
+				break;
+ 
 		}
-		PrintAndLogEx(NORMAL, "Password NOT found.");
-		free(keyBlock);
-		return 0;
+		if ( found ) 
+			PrintAndLogEx(NORMAL, "Found valid password: [ %08X ]", testpwd);
+		else
+			PrintAndLogEx(NORMAL, "Password NOT found.");		
 	}
 	
+	free(keyBlock);
+	
+out:
+	t1 = msclock() - t1;
+	PrintAndLogEx(SUCCESS, "\nTime in bruteforce: %.0f seconds\n", (float)t1/1000.0);		
+	return 0;
+}
+
+int CmdT55xxBruteForce(const char *Cmd) {
+	
+    uint32_t start_password = 0x00000000; //start password
+    uint32_t end_password   = 0xFFFFFFFF; //end   password
+	uint32_t curr = 0;
+    bool found = false;
+
+
+    char cmdp = tolower(param_getchar(Cmd, 0));
+	if (cmdp == 'h') return usage_t55xx_bruteforce();
+	
+	uint64_t t1 = msclock();
+
 	// Try to read Block 7, first :)
 	
 	// incremental pwd range search
     start_password = param_get32ex(Cmd, 0, 0, 16);
 	end_password = param_get32ex(Cmd, 1, 0, 16);
 	
+	curr = start_password;
+	
 	if ( start_password >= end_password ) {
-		free(keyBlock);
 		return usage_t55xx_bruteforce();
 	}
 	
     PrintAndLogEx(NORMAL, "Search password range [%08X -> %08X]", start_password, end_password);
-	
-    uint32_t i = start_password;
 
-    while ((!found) && (i <= end_password)){
+    while ((!found) || (curr <= end_password)){
 
 		printf("."); fflush(stdout);
 		
 		if (IsCancelled()) {
-			free(keyBlock);
 			return 0;
 		}
 			
-		if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, i)) {
+		if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, curr)) {
 			PrintAndLogEx(NORMAL, "Aquireing data from device failed. Quitting");
-			free(keyBlock);
 			return 0;
 		}
 		found = tryDetectModulation();
         
 		if (found) break;
-		i++;
+		++curr;
     }
     
     PrintAndLogEx(NORMAL, "");
 	
     if (found)
-		PrintAndLogEx(NORMAL, "Found valid password: [%08x]", i);
+		PrintAndLogEx(NORMAL, "Found valid password: [ %08X ]", curr);
     else
-		PrintAndLogEx(NORMAL, "Password NOT found. Last tried: [%08x]", --i);
+		PrintAndLogEx(NORMAL, "Password NOT found. Last tried: [ %08X ]", --curr);
 
-	free(keyBlock);
+	t1 = msclock() - t1;
+	PrintAndLogEx(SUCCESS, "\nTime in bruteforce: %.0f seconds\n", (float)t1/1000.0);	
     return 0;
 }
 
@@ -1959,6 +2027,7 @@ static command_t CommandTable[] = {
 	{"help",		CmdHelp,           1, "This help"},
 	{"bruteforce",	CmdT55xxBruteForce,0, "<start password> <end password> [i <*.dic>] Simple bruteforce attack to find password"},
 	{"config",		CmdT55xxSetConfig, 1, "Set/Get T55XX configuration (modulation, inverted, offset, rate)"},
+	{"chk",			CmdT55xxChkPwds,   1, "Check passwords"},
 	{"detect",		CmdT55xxDetect,    1, "[1] Try detecting the tag modulation from reading the configuration block."},
 	{"deviceconfig", CmdT55xxSetDeviceConfig, 1, "Set/Get T55XX device configuration (startgap, writegap, write0, write1, readgap"},
 	{"p1detect",	CmdT55xxDetectPage1,1, "[1] Try detecting if this is a t55xx tag by reading page 1"},
diff --git a/client/cmdlft55xx.h b/client/cmdlft55xx.h
index 15adab0b6..46de0c359 100644
--- a/client/cmdlft55xx.h
+++ b/client/cmdlft55xx.h
@@ -133,6 +133,7 @@ t55xx_conf_block_t Get_t55xx_Config(void);
 void Set_t55xx_Config(t55xx_conf_block_t conf);
 
 extern int CmdLFT55XX(const char *Cmd);
+extern int CmdT55xxChk(const char *Cmd);
 extern int CmdT55xxBruteForce(const char *Cmd);
 extern int CmdT55xxSetConfig(const char *Cmd);
 extern int CmdT55xxReadBlock(const char *Cmd);
diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index 44d031334..a54b27e0f 100644
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -140,6 +140,8 @@ typedef struct{
 #define CMD_COTAG														  0x0225
 #define CMD_SET_LF_T55XX_CONFIG											  0x0226
 
+#define CMD_T55XX_CHKPWDS                                                 0x0230
+
 /* CMD_SET_ADC_MUX: ext1 is 0 for lopkd, 1 for loraw, 2 for hipkd, 3 for hiraw */
 
 // For the 13.56 MHz tags

From a5833fe39069d2ec50e90ee3637b27ccd76f7d79 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 12 Jan 2019 12:10:31 +0100
Subject: [PATCH 0420/1938] CHG: remove strange thr 0x43 in LF sampling CHG:
 refactor cotag init

---
 armsrc/lfops.c      | 29 ++++++-------------------
 armsrc/lfsampling.c | 53 +++++++++++++++++++--------------------------
 2 files changed, 29 insertions(+), 53 deletions(-)

diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index 47f0cb324..c267db36e 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -1548,7 +1548,7 @@ void T55xxReadBlock(uint16_t arg0, uint8_t Block, uint32_t Pwd) {
 	// Turn field on to read the response
 	// 137*8 seems to get to the start of data pretty well...
 	// but we want to go past the start and let the repeating data settle in...
-	TurnReadLFOn(210*8);
+	TurnReadLFOn(200*8);
 
 	// Acquisition
 	// Now do the acquisition
@@ -2089,7 +2089,6 @@ void EM4xWriteWord(uint32_t flag, uint32_t data, uint32_t pwd) {
 	//Wait 20ms for write to complete?
 	WaitMS(7);
 
-	//Capture response if one exists
 	DoPartialAcquisition(20, true, 6000, 1000);
 
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
@@ -2113,7 +2112,7 @@ This triggers a COTAG tag to response
 */
 void Cotag(uint32_t arg0) {
 #ifndef OFF
-# define OFF 	{ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); WaitUS(2035); }
+# define OFF(x) 	{ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); WaitUS((x)); }
 #endif
 #ifndef ON
 # define ON(x)   { FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | FPGA_LF_ADC_READER_FIELD); WaitUS((x)); }
@@ -2122,29 +2121,15 @@ void Cotag(uint32_t arg0) {
 
 	LED_A_ON();
 
-	// Switching to LF image on FPGA. This might empty BigBuff
-	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-
+	LFSetupFPGAForADC(89, true);
+		
 	//clear buffer now so it does not interfere with timing later
 	BigBuf_Clear_ext(false);
 
-	// Set up FPGA, 132kHz to power up the tag
-	FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 89);
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | FPGA_LF_ADC_READER_FIELD);
-
-	// Connect the A/D to the peak-detected low-frequency path.
-	SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
-
-	// Now set up the SSC to get the ADC samples that are now streaming at us.
-	FpgaSetupSsc();
-
-	// start clock - 1.5ticks is 1us
-	StartTicks();
-
 	//send COTAG start pulse
-	ON(740)  OFF
-	ON(3330) OFF
-	ON(740)  OFF
+	ON(740)  OFF(2035)
+	ON(3330) OFF(2035)
+	ON(740)  OFF(2035)
 	ON(1000)
 
 	switch(rawsignal) {
diff --git a/armsrc/lfsampling.c b/armsrc/lfsampling.c
index 22171e2c3..96963d389 100644
--- a/armsrc/lfsampling.c
+++ b/armsrc/lfsampling.c
@@ -117,21 +117,21 @@ void LFSetupFPGAForADC(int divisor, bool lf_field) {
  * @return the number of bits occupied by the samples.
  */
 uint32_t DoAcquisition(uint8_t decimation, uint32_t bits_per_sample, bool averaging, int trigger_threshold, bool silent, int bufsize, uint32_t cancel_after) {
-	//bigbuf, to hold the aquired raw data signal
+
 	uint8_t *dest = BigBuf_get_addr();
     bufsize = (bufsize > 0 && bufsize < BigBuf_max_traceLen()) ? bufsize : BigBuf_max_traceLen();
 
-
 	if (bits_per_sample < 1) bits_per_sample = 1;
 	if (bits_per_sample > 8) bits_per_sample = 8;
 
 	if (decimation < 1) decimation = 1;
 
-	// Use a bit stream to handle the output
+	// use a bit stream to handle the output
 	BitstreamOut data = { dest , 0, 0};
 	int sample_counter = 0;
 	uint8_t sample = 0;
-	//If we want to do averaging
+
+	// if we want to do averaging
 	uint32_t sample_sum =0 ;
 	uint32_t sample_total_numbers = 0;
 	uint32_t sample_total_saved = 0;
@@ -139,13 +139,13 @@ uint32_t DoAcquisition(uint8_t decimation, uint32_t bits_per_sample, bool averag
 	
 	while (!BUTTON_PRESS() && !usb_poll_validate_length() ) {
 		WDT_HIT();
-		if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_TXRDY) {
-			AT91C_BASE_SSC->SSC_THR = 0x43;
-			LED_D_ON();
-		}
+
 		if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
 			sample = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
+			
+			// Testpoint 8 (TP8) can be used to trigger oscilliscope 
 			LED_D_OFF();
+			
 			// threshold either high or low values 128 = center 0.  if trigger = 178 
 			if ((trigger_threshold > 0) && (sample < (trigger_threshold + 128)) && (sample > (128 - trigger_threshold))) {
 				if (cancel_after > 0) {
@@ -162,24 +162,26 @@ uint32_t DoAcquisition(uint8_t decimation, uint32_t bits_per_sample, bool averag
 			if (averaging)
 				sample_sum += sample;
 
-			//Check decimation
+			// check decimation
 			if (decimation > 1)	{
 				sample_counter++;
 				if (sample_counter < decimation) continue;
 				sample_counter = 0;
 			}
 			
-			//Averaging
+			// averaging
 			if (averaging && decimation > 1) {
 				sample = sample_sum / decimation;
 				sample_sum =0;
 			}
 			
-			//Store the sample
+			// store the sample
 			sample_total_saved ++;
-			if (bits_per_sample == 8){
+			if (bits_per_sample == 8) {
 				dest[sample_total_saved-1] = sample;
-				data.numbits = sample_total_saved << 3;//Get the return value correct
+				
+				// Get the return value correct				
+				data.numbits = sample_total_saved << 3; 
 				if (sample_total_saved >= bufsize) break;
 				
 			} else {
@@ -190,9 +192,8 @@ uint32_t DoAcquisition(uint8_t decimation, uint32_t bits_per_sample, bool averag
 				if (bits_per_sample > 4)	pushBit(&data, sample & 0x08);
 				if (bits_per_sample > 5)	pushBit(&data, sample & 0x04);
 				if (bits_per_sample > 6)	pushBit(&data, sample & 0x02);
-				//Not needed, 8bps is covered above
-				//if (bits_per_sample > 7)	pushBit(&data, sample & 0x01);
-				if ((data.numbits >> 3) +1  >= bufsize) break;
+
+				if ((data.numbits >> 3) + 1 >= bufsize) break;
 			}
 		}
 	}
@@ -285,10 +286,8 @@ void doT55x7Acquisition(size_t sample_size) {
 		
 	while(!BUTTON_PRESS() && !usb_poll_validate_length() && skipCnt < 1000 && (i < bufsize) ) {
 		WDT_HIT();		
-		if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_TXRDY) {
-			AT91C_BASE_SSC->SSC_THR = 0x43; //43
-			LED_D_ON();
-		}
+
+		
 		if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
 			curSample = (uint8_t)AT91C_BASE_SSC->SSC_RHR;	
 			LED_D_OFF();
@@ -352,11 +351,7 @@ void doCotagAcquisition(size_t sample_size) {
 	
 	while (!BUTTON_PRESS() && !usb_poll_validate_length() && (i < bufsize) && (noise_counter < (COTAG_T1 << 1)) ) {
 		WDT_HIT();		
-		if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_TXRDY) {
-			AT91C_BASE_SSC->SSC_THR = 0x43;
-			LED_D_ON();
-		}
-		
+
 		if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
 			sample = (uint8_t)AT91C_BASE_SSC->SSC_RHR;	
 			LED_D_OFF();
@@ -406,12 +401,8 @@ uint32_t doCotagAcquisitionManchester() {
 	uint16_t noise_counter = 0;
 
 	while (!BUTTON_PRESS() && !usb_poll_validate_length() && (sample_counter < bufsize)  && (noise_counter < (COTAG_T1 << 1)) ) {
-		WDT_HIT();		
-		if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_TXRDY) {
-			AT91C_BASE_SSC->SSC_THR = 0x43;
-			LED_D_ON();
-		}
-		
+		WDT_HIT();
+
 		if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
 			sample = (uint8_t)AT91C_BASE_SSC->SSC_RHR;	
 			LED_D_OFF();

From 459ff6149b815e7a7b2e49ff8dc9ec9fa814839a Mon Sep 17 00:00:00 2001
From: Iceman <iceman@iuse.se>
Date: Sat, 12 Jan 2019 18:12:58 +0100
Subject: [PATCH 0421/1938] Update README.md

---
 README.md | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/README.md b/README.md
index 94f7b94d6..05b9a007f 100644
--- a/README.md
+++ b/README.md
@@ -240,6 +240,46 @@ You are now ready to use your newly upgraded proxmark3 device.  Many commands us
     pm3 --> quit
 
 
+### First things on your RDV40
+You will need to run these commands to make sure your rdv4 is prepared
+
+    pm3 --> mem load f default_keys m
+    pm3 --> mem load f default_pwd t
+    pm3 --> mem load f default_iclass_keys i
+    pm3 --> lf t55xx deviceconfig a 29 b 17 c 15 d 47 e 15 p
+
+### Verify sim module firmware version
+To make sure you got the latest sim module firmware.
+_Lastest version is v3.10_
+
+    pm3 --> hw status
+
+Find version in the long output,  look for these two lines
+
+    #db# Smart card module (ISO 7816)
+    #db#   version.................v2.06
+
+This version is obselete. The following command upgrades your device sim module firmware.
+Don't not turn of your device during the execution of this command.
+
+    pm3 --> sc upgrade f ../tools/simmodule/SIM010.BIN 
+    
+You get the following output,  this is a successful execution.    
+    
+    [!] WARNING - Smartcard socket firmware upgrade.          
+    [!] A dangerous command, do wrong and you will brick the smart card socket          
+    [+] Smartcard socket firmware uploading to PM3          
+    ..
+    [+] Smartcard socket firmware updating,  don't turn off your PM3!          
+    #db# FW 0000          
+    #db# FW 0080          
+    #db# FW 0100          
+    #db# FW 0180          
+    #db# FW 0200          
+    #db# FW 0280          
+    [+] Smartcard socket firmware upgraded successful        
+    
+
 ## the end
 
 `iceman at host iuse.se`

From fcfbeb6ac362dfba85d6f7e2ab8df80b403cdadd Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 12 Jan 2019 18:33:40 +0100
Subject: [PATCH 0422/1938] textual

---
 client/cmdlft55xx.c | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 29487e026..f6c0f3ced 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1553,18 +1553,18 @@ int CmdT55xxChkPwds(const char *Cmd) {
 			PrintAndLogEx(SUCCESS, "\nFound a candidate [ %08X ]. Trying to validate", resp.arg[1]);
 			
 			if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, resp.arg[1])) {
-				PrintAndLogEx(NORMAL, "Aquireing data from device failed. Quitting");
+				PrintAndLogEx(INFO, "Aquireing data from device failed. Quitting");
 				return 2;
 			}
 			
 			found = tryDetectModulation();
 			if (found) {
-				PrintAndLogEx(NORMAL, "Found valid password: [ %08X ]", resp.arg[1]);
+				PrintAndLogEx(SUCCESS, "Found valid password: [ %08X ]", resp.arg[1]);
 			} else {
-				PrintAndLogEx(NORMAL, "Password NOT found.");
+				PrintAndLogEx(WARNING, "Password NOT found.");
 			}
 		} else {
-			PrintAndLogEx(NORMAL, "Password NOT found.");
+			PrintAndLogEx(WARNING, "Password NOT found.");
 		}
 		
 		goto out;
@@ -1581,7 +1581,7 @@ int CmdT55xxChkPwds(const char *Cmd) {
 	
 		FILE * f = fopen( filename , "r");		
 		if ( !f ) {
-			PrintAndLogEx(NORMAL, "File: %s: not found or locked.", filename);
+			PrintAndLogEx(WARNING, "File: %s: not found or locked.", filename);
 			free(keyBlock);
 			return 1;
 		}			
@@ -1596,7 +1596,7 @@ int CmdT55xxChkPwds(const char *Cmd) {
 			if( line[0]=='#' ) continue;
 
 			if (!isxdigit(line[0])) {
-				PrintAndLogEx(NORMAL, "File content error. '%s' must include 8 HEX symbols", line);
+				PrintAndLogEx(WARNING, "File content error. '%s' must include 8 HEX symbols", line);
 				continue;
 			}
 			
@@ -1627,11 +1627,11 @@ int CmdT55xxChkPwds(const char *Cmd) {
 			fclose(f);
 		
 		if (keycnt == 0) {
-			PrintAndLogEx(NORMAL, "No keys found in file");
+			PrintAndLogEx(WARNING, "No keys found in file");
 			free(keyBlock);
 			return 1;
 		}
-		PrintAndLogEx(NORMAL, "Loaded %d keys", keycnt);
+		PrintAndLogEx(SUCCESS, "Loaded %d keys", keycnt);
 		
 		// loop
 		uint64_t testpwd = 0x00;
@@ -1650,10 +1650,10 @@ int CmdT55xxChkPwds(const char *Cmd) {
 		
 			testpwd = bytes_to_num(keyBlock + 4*c, 4);
 
-			PrintAndLogEx(NORMAL, "Testing %08X", testpwd);
+			PrintAndLogEx(INFO, "Testing %08X", testpwd);
 						
 			if ( !AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, testpwd)) {
-				PrintAndLogEx(NORMAL, "Aquireing data from device failed. Quitting");
+				PrintAndLogEx(INFO, "Aquireing data from device failed. Quitting");
 				free(keyBlock);
 				return 0;
 			}
@@ -1664,9 +1664,9 @@ int CmdT55xxChkPwds(const char *Cmd) {
  
 		}
 		if ( found ) 
-			PrintAndLogEx(NORMAL, "Found valid password: [ %08X ]", testpwd);
+			PrintAndLogEx(SUCCESS, "Found valid password: [ %08X ]", testpwd);
 		else
-			PrintAndLogEx(NORMAL, "Password NOT found.");		
+			PrintAndLogEx(WARNING, "Password NOT found.");		
 	}
 	
 	free(keyBlock);
@@ -1702,7 +1702,7 @@ int CmdT55xxBruteForce(const char *Cmd) {
 		return usage_t55xx_bruteforce();
 	}
 	
-    PrintAndLogEx(NORMAL, "Search password range [%08X -> %08X]", start_password, end_password);
+    PrintAndLogEx(INFO, "Search password range [%08X -> %08X]", start_password, end_password);
 
     while ((!found) || (curr <= end_password)){
 
@@ -1713,7 +1713,7 @@ int CmdT55xxBruteForce(const char *Cmd) {
 		}
 			
 		if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, curr)) {
-			PrintAndLogEx(NORMAL, "Aquireing data from device failed. Quitting");
+			PrintAndLogEx(WARNING, "Aquireing data from device failed. Quitting");
 			return 0;
 		}
 		found = tryDetectModulation();
@@ -1725,9 +1725,9 @@ int CmdT55xxBruteForce(const char *Cmd) {
     PrintAndLogEx(NORMAL, "");
 	
     if (found)
-		PrintAndLogEx(NORMAL, "Found valid password: [ %08X ]", curr);
+		PrintAndLogEx(SUCCESS, "Found valid password: [ %08X ]", curr);
     else
-		PrintAndLogEx(NORMAL, "Password NOT found. Last tried: [ %08X ]", --curr);
+		PrintAndLogEx(WARNING, "Password NOT found. Last tried: [ %08X ]", --curr);
 
 	t1 = msclock() - t1;
 	PrintAndLogEx(SUCCESS, "\nTime in bruteforce: %.0f seconds\n", (float)t1/1000.0);	

From 46cbbe8d05de1704af23f1dda580fddbf6f8efa5 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 12 Jan 2019 18:53:11 +0100
Subject: [PATCH 0423/1938] textual

---
 client/cmdlft55xx.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index f6c0f3ced..abf8f04ec 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1814,9 +1814,9 @@ int CmdT55xxRecoverPW(const char *Cmd) {
 	PrintAndLogEx(NORMAL, "");
 
 	if (found == 1)
-		PrintAndLogEx(NORMAL, "Found valid password: [%08x]", curr_password);
+		PrintAndLogEx(SUCCESS, "Found valid password: [%08x]", curr_password);
 	else
-		PrintAndLogEx(NORMAL, "Password NOT found.");
+		PrintAndLogEx(WARNING, "Password NOT found.");
 
 	return 0;
 }

From 20c3cd5ce3d823f56eac432c7115057246c9e611 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 14 Jan 2019 12:02:26 +0100
Subject: [PATCH 0424/1938] chg: adjusting license according to earlier commits
 to pm3 offical repo.

---
 armsrc/optimized_cipher.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/armsrc/optimized_cipher.c b/armsrc/optimized_cipher.c
index 36b25f593..223d73fea 100644
--- a/armsrc/optimized_cipher.c
+++ b/armsrc/optimized_cipher.c
@@ -22,7 +22,7 @@
  *
  * This is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
+ * by the Free Software Foundation, or, at your option, any later version. 
  *
  * This file is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of

From adffe298555de6f1c4076fbe7bd7f21e216f3278 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 14 Jan 2019 12:06:05 +0100
Subject: [PATCH 0425/1938] chg: adjusting license accoring match its .c file

---
 common/iso15693tools.h | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/common/iso15693tools.h b/common/iso15693tools.h
index 053ca56ca..70382ce04 100644
--- a/common/iso15693tools.h
+++ b/common/iso15693tools.h
@@ -1,5 +1,11 @@
-// ISO15693 commons
-// Adrian Dabrowski 2010 and others, GPLv2
+//-----------------------------------------------------------------------------
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// ISO15693 other commons
+//-----------------------------------------------------------------------------
+// Adrian Dabrowski 2010 and otherss
 // Christian Herrmann 2018
 
 #ifndef ISO15693_H__

From 6f0cc5fa7a8a752b8b93a0ae89ae6379a294f60b Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Mon, 14 Jan 2019 18:14:15 +0200
Subject: [PATCH 0426/1938] small fix

---
 client/emv/cmdemv.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index 07543241c..71cf542db 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -715,7 +715,7 @@ void ProcessACResponseFormat1(struct tlvdb *tlvRoot, uint8_t *buf, size_t len, b
 				TLVPrintFromTLV(tlvElm);
 
 			// AC (Application Cryptogram)
-			tlvdb_change_or_add_node_ex(tlvRoot, 0x9f26, min(8, elmlen - 3), &buf[5], &tlvElm);		
+			tlvdb_change_or_add_node_ex(tlvRoot, 0x9f26, MIN(8, elmlen - 3), &buf[5], &tlvElm);		
 			if (decodeTLV)
 				TLVPrintFromTLV(tlvElm);
 
@@ -1233,12 +1233,12 @@ int CmdEMVExec(const char *cmd) {
 			PrintAndLogEx(NORMAL, "* * AC2");
 			
 			
-/*		// AC2
-		PRINT_INDENT(level);
-		if ((CID & EMVAC_AC2_MASK) == EMVAC_AAC2)	fprintf(f, "\tAC2: AAC (Transaction declined)\n");
-		if ((CID & EMVAC_AC2_MASK) == EMVAC_TC2)	fprintf(f, "\tAC2: TC (Transaction approved)\n");
-		if ((CID & EMVAC_AC2_MASK) == EMVAC_ARQC2)	fprintf(f, "\tAC2: not requested (ARQC)\n");
-		if ((CID & EMVAC_AC2_MASK) == EMVAC_AC2_MASK)	fprintf(f, "\tAC2: RFU\n");
+/*			// AC2
+			PRINT_INDENT(level);
+			if ((CID & EMVAC_AC2_MASK) == EMVAC_AAC2)	fprintf(f, "\tAC2: AAC (Transaction declined)\n");
+			if ((CID & EMVAC_AC2_MASK) == EMVAC_TC2)	fprintf(f, "\tAC2: TC (Transaction approved)\n");
+			if ((CID & EMVAC_AC2_MASK) == EMVAC_ARQC2)	fprintf(f, "\tAC2: not requested (ARQC)\n");
+			if ((CID & EMVAC_AC2_MASK) == EMVAC_AC2_MASK)	fprintf(f, "\tAC2: RFU\n");
 */
 		}
 		

From 5a35b0de2aaf1ca9f416603765f456a76ba5a99e Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Mon, 14 Jan 2019 18:54:18 +0200
Subject: [PATCH 0427/1938] changed `min` to macro `MIN`

---
 client/emv/cmdemv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index a30c22aec..91a3663f3 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -715,7 +715,7 @@ void ProcessACResponseFormat1(struct tlvdb *tlvRoot, uint8_t *buf, size_t len, b
 				TLVPrintFromTLV(tlvElm);
 
 			// AC (Application Cryptogram)
-			tlvdb_change_or_add_node_ex(tlvRoot, 0x9f26, min(8, elmlen - 3), &buf[5], &tlvElm);		
+			tlvdb_change_or_add_node_ex(tlvRoot, 0x9f26, MIN(8, elmlen - 3), &buf[5], &tlvElm);		
 			if (decodeTLV)
 				TLVPrintFromTLV(tlvElm);
 

From 49fc2a56ab43a9058ef539202c18f9b6e145e8b8 Mon Sep 17 00:00:00 2001
From: Iceman <iceman@iuse.se>
Date: Sun, 20 Jan 2019 23:46:03 +0100
Subject: [PATCH 0428/1938] Update tnp3clone.lua

According to post http://www.proxmark.org/forum/viewtopic.php?pid=34046#p34046
Set that ATQA / SAK,  set Sector 0 accessrights
---
 client/scripts/tnp3clone.lua | 64 +++++++++++++++++++++++-------------
 1 file changed, 42 insertions(+), 22 deletions(-)

diff --git a/client/scripts/tnp3clone.lua b/client/scripts/tnp3clone.lua
index 2e1ee7019..fcccc042e 100644
--- a/client/scripts/tnp3clone.lua
+++ b/client/scripts/tnp3clone.lua
@@ -37,13 +37,12 @@ Arguments:
 	0020 - Swapforce
 ]]
 
-
 -- This is only meant to be used when errors occur
-function oops(err)
+local function oops(err)
 	print("ERROR: ",err)
 end
 -- Usage help
-function help()
+local function help()
 	print(desc)
 	print("Example usage")
 	print(example)
@@ -64,7 +63,7 @@ local function waitCmd()
 end
 
 local function readblock( blocknum, keyA )
-	-- Read block 0
+	-- Read block N
 	cmd = Command:new{cmd = cmds.CMD_MIFARE_READBL, arg1 = blocknum, arg2 = 0, arg3 = 0, data = keyA}
 	err = core.SendCommand(cmd:getBytes())
 	if err then return nil, err end
@@ -72,8 +71,9 @@ local function readblock( blocknum, keyA )
 	if err then return nil, err end
 	return block0
 end
+
 local function readmagicblock( blocknum )
-	-- Read block 0
+	-- Read block N
 	local CSETBLOCK_SINGLE_OPERATION = 0x1F
 	cmd = Command:new{cmd = cmds.CMD_MIFARE_CGETBLOCK, arg1 = CSETBLOCK_SINGLE_OPERATION, arg2 = 0, arg3 = blocknum}
  	err = core.SendCommand(cmd:getBytes())
@@ -89,11 +89,13 @@ local function main(args)
 	print( string.rep('--',20) )
 	
 	local numBlocks = 64
-    local cset = 'hf mf csetbl '
+	local cset = 'hf mf csetbl '
 	local csetuid = 'hf mf csetuid '
 	local cget = 'hf mf cgetbl '
 	local empty = '00000000000000000000000000000000'
-	local AccAndKeyB = '7F078869000000000000'
+	local AccAndKeyB = '7F070869000000000000'
+	local atqa = '0F01'
+	local sak = '81'
 	-- Defaults to Gusto
 	local toytype = 'C201'
 	local subtype = '0030'
@@ -107,42 +109,54 @@ local function main(args)
 		if o == "l" then return toys.List() end
 	end
 
-	if #toytype ~= 4 then return oops('Wrong size - toytype. (4hex symbols)') end	
-	if #subtype ~= 4 then return oops('Wrong size - subtype. (4hex symbols)') end	
+	if #toytype ~= 4 then return oops('[!] Wrong size - toytype. (4hex symbols)') end	
+	if #subtype ~= 4 then return oops('[!] Wrong size - subtype. (4hex symbols)') end	
 
 	-- look up type, find & validate types
 	local item = toys.Find( toytype, subtype)
 	if item then
-		print( (' Looking up input: Found %s - %s (%s)'):format(item[6],item[5], item[4]) )
+		print( ('[+] Looking up input: Found %s - %s (%s)'):format(item[6],item[5], item[4]) )
 	else
-		print('Didn\'t find item type. If you are sure about it, report it in')
+		print('[-] Didn\'t find item type. If you are sure about it, post on forum')
 	end
 	--15,16
-	--13-14 
-
+	--13-14
 	
 	-- find tag
 	result, err = lib14a.read(false, true)
-	if not result then return oops(err)	end
+	if not result then return oops(err) end
 
 	-- load keys
 	local akeys  = pre.GetAll(result.uid)
-	local  keyA = akeys:sub(1, 12 ) 
+	local keyA = akeys:sub(1, 12 ) 
 
-	local b0 = readblock(0,keyA)
+	local b0 = readblock(0, keyA)
 	if not b0 then
-		print('failed reading block with factorydefault key.  Trying chinese magic read.')
+		print('[-] failed reading block with factorydefault key. Trying chinese magic read.')
 	    b0, err = readmagicblock(0)
 		if not b0 then 
-			oops(err) 
-			return oops('failed reading block with chinese magic command.  quitting...')
+			oops('[!] '..err) 
+			return oops('[!] failed reading block with chinese magic command. Quitting...')
 		end
 	end
+	core.clearCommandBuffer()
+	
+	local b3 = readblock(3, keyA)
+	if not b3 then
+		print('[-] failed reading block with factorydefault key. Trying chinese magic read.')
+		b3, err = readmagicblock(0)
+		if not b3 then 
+			oops('[!] '..err) 
+			return oops('[!] failed reading block with chinese magic command. Quitting...')
+		end
+	end
+	core.clearCommandBuffer()
 	
 	-- wipe card.
-	local cmd  = (csetuid..'%s 0004 08 w'):format(result.uid)	
+	local cmd  = (csetuid..'%s %s %s w'):format(result.uid, atqa, sak)	
 	core.console(cmd) 
-
+	core.clearCommandBuffer()
+	
 	local b1 = toytype..string.rep('00',10)..subtype
 	
 	local calc = utils.Crc16(b0..b1)
@@ -150,6 +164,7 @@ local function main(args)
 	
 	local cmd  = (cset..'1 %s%04x'):format( b1, calcEndian)	
 	core.console(cmd) 
+	core.clearCommandBuffer()
 	
 	local pos, key
 	for blockNo = 2, numBlocks-1, 1 do
@@ -161,5 +176,10 @@ local function main(args)
 		end		
 	end 
 	core.clearCommandBuffer()
+	
+	-- Set sector trailer S0, since it has different access rights
+	cmd = ('%s 3 %s%s'):format(cset, keyA, b3:sub(13) )
+	core.console(cmd)
+	core.clearCommandBuffer()
 end
-main(args)
\ No newline at end of file
+main(args)

From 6e99b1e49bf37702eb2fd52ded8847a7fb18b384 Mon Sep 17 00:00:00 2001
From: Iceman <iceman@iuse.se>
Date: Sun, 20 Jan 2019 23:53:54 +0100
Subject: [PATCH 0429/1938] Update tnp3clone.lua

Better to use default template for ST
---
 client/scripts/tnp3clone.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/scripts/tnp3clone.lua b/client/scripts/tnp3clone.lua
index fcccc042e..b0cebaf7f 100644
--- a/client/scripts/tnp3clone.lua
+++ b/client/scripts/tnp3clone.lua
@@ -178,7 +178,7 @@ local function main(args)
 	core.clearCommandBuffer()
 	
 	-- Set sector trailer S0, since it has different access rights
-	cmd = ('%s 3 %s%s'):format(cset, keyA, b3:sub(13) )
+	cmd = ('%s 3 %s0f0f0f69000000000000'):format(cset, keyA)
 	core.console(cmd)
 	core.clearCommandBuffer()
 end

From 6f3940b22141c0ba53dcdbf1aa605e43e943af86 Mon Sep 17 00:00:00 2001
From: Iceman <iceman@iuse.se>
Date: Sun, 20 Jan 2019 23:55:11 +0100
Subject: [PATCH 0430/1938] Update tnp3clone.lua

Cleanup
---
 client/scripts/tnp3clone.lua | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/client/scripts/tnp3clone.lua b/client/scripts/tnp3clone.lua
index b0cebaf7f..514a091b9 100644
--- a/client/scripts/tnp3clone.lua
+++ b/client/scripts/tnp3clone.lua
@@ -140,18 +140,7 @@ local function main(args)
 		end
 	end
 	core.clearCommandBuffer()
-	
-	local b3 = readblock(3, keyA)
-	if not b3 then
-		print('[-] failed reading block with factorydefault key. Trying chinese magic read.')
-		b3, err = readmagicblock(0)
-		if not b3 then 
-			oops('[!] '..err) 
-			return oops('[!] failed reading block with chinese magic command. Quitting...')
-		end
-	end
-	core.clearCommandBuffer()
-	
+
 	-- wipe card.
 	local cmd  = (csetuid..'%s %s %s w'):format(result.uid, atqa, sak)	
 	core.console(cmd) 

From 5f2ecf67cdc5bbe380d353905a55812e5a7b0294 Mon Sep 17 00:00:00 2001
From: Iceman <iceman@iuse.se>
Date: Mon, 21 Jan 2019 00:02:33 +0100
Subject: [PATCH 0431/1938] Update default_pwd.dic

---
 client/default_pwd.dic | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/client/default_pwd.dic b/client/default_pwd.dic
index dd1364385..87423478b 100644
--- a/client/default_pwd.dic
+++ b/client/default_pwd.dic
@@ -96,6 +96,7 @@ FABADA11, //china?
 69696969,
 12121212,
 12344321,
+1234ABCD,
 11112222,
 13131313,
 10041004,
@@ -104,8 +105,8 @@ FABADA11, //china?
 abcd1234,
 20002000,
 19721972,
-aa55aa55, //amiboo
-55aa55aa, //rev amiboo
+aa55aa55, // amiboo
+55aa55aa, // rev amiboo
 4f271149, // seeds ul-ev1
 07d7bb0b, // seeds ul-ev1
 9636ef8f, // seeds ul-ev1
@@ -113,4 +114,4 @@ b5f44686, // seeds ul-ev1
 9E3779B9, // TEA
 C6EF3720, // TEA
 7854794A, // xbox tea constant :)
-F1EA5EED, //burtle
+F1EA5EED, // burtle

From 66c82d16b0671f48b0f2c0b715676099d78b0f35 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 21 Jan 2019 09:02:00 +0100
Subject: [PATCH 0432/1938] chg: calloc calls

---
 client/cmdhficlass.c | 6 +++---
 client/cmdhflegic.c  | 4 ++--
 client/cmdhfmf.c     | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index 0e62afaf6..f0bfa18a0 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -2463,7 +2463,7 @@ static void shave(uint8_t *data, uint8_t len){
 		data[i] &= 0xFE;
 }
 static void generate_rev(uint8_t *data, uint8_t len) {
-	uint8_t *key = calloc(len,1);	
+	uint8_t *key = calloc(len, sizeof(uint8_t));	
 	PrintAndLogEx(SUCCESS, "input permuted key | %s \n", sprint_hex(data, len));
 	permute_rev(data, len, key);
 	PrintAndLogEx(SUCCESS, "    unpermuted key | %s \n", sprint_hex(key, len));
@@ -2472,8 +2472,8 @@ static void generate_rev(uint8_t *data, uint8_t len) {
 	free(key);	
 }
 static void generate(uint8_t *data, uint8_t len) {
-	uint8_t *key = calloc(len,1);
-	uint8_t *pkey = calloc(len,1);	
+	uint8_t *key = calloc(len, sizeof(uint8_t));
+	uint8_t *pkey = calloc(len, sizeof(uint8_t));	
 	PrintAndLogEx(SUCCESS, "   input key | %s \n", sprint_hex(data, len));
 	permute(data, len, pkey);
 	PrintAndLogEx(SUCCESS, "permuted key | %s \n", sprint_hex(pkey, len));
diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index 393d73ed0..a31dbd1b1 100644
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -483,7 +483,7 @@ int CmdLegicRdmem(const char *Cmd) {
 	PrintAndLogEx(NORMAL, "Reading %d bytes, from offset %d", len, offset);
 	
 	// allocate receiver buffer
-	uint8_t *data = malloc(len);
+	uint8_t *data = calloc(len, sizeof(uint8_t));
 	if ( !data ){
 		PrintAndLogEx(WARNING, "Cannot allocate memory");
 		return 2;
@@ -923,7 +923,7 @@ int CmdLegicDump(const char *Cmd){
 	else
 		sprintf(fnameptr + fileNlen,".bin");
 
-	f = fopen(filename,"wb");
+	f = fopen(filename, "wb");
 	if (!f) { 
 		PrintAndLogEx(WARNING, "Could not create file name %s", filename);
 		if (data)
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 00e29105f..a02302b15 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -2496,7 +2496,7 @@ int CmdHF14AMfESave(const char *Cmd) {
 	blocks = NumOfBlocks(c);
 	bytes = blocks * MFBLOCK_SIZE;	
 
-	dump = calloc(sizeof(uint8_t), bytes);
+	dump = calloc(bytes, sizeof(uint8_t));
 	if (!dump) {
 		PrintAndLogEx(WARNING, "Fail, cannot allocate memory");
 		return 1;

From fa889900c0458f94d7f812169fccfc0fea6b7638 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 21 Jan 2019 09:31:37 +0100
Subject: [PATCH 0433/1938] chg: calloc instead of malloc chg: textual chg:
 extra size checks chg: longer wait for reading mem

---
 client/cmdhflegic.c | 112 +++++++++++++++++++++++---------------------
 1 file changed, 59 insertions(+), 53 deletions(-)

diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index a31dbd1b1..0f580da9f 100644
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -183,12 +183,11 @@ int CmdLegicInfo(const char *Cmd) {
 	PrintAndLogEx(NORMAL, "Reading tag memory %d b...", card.cardsize);
 	
 	// allocate receiver buffer
-	uint8_t *data = malloc(card.cardsize);
+	uint8_t *data = calloc(card.cardsize, sizeof(uint8_t));
 	 if (!data) {
 		PrintAndLogEx(WARNING, "Cannot allocate memory");
 		return 2;
 	}
-	memset(data, 0, card.cardsize);
 
 	int status = legic_read_mem(0, card.cardsize, 0x55, data, &datalen);
 	if ( status > 0 ) {
@@ -480,15 +479,20 @@ int CmdLegicRdmem(const char *Cmd) {
 	uint16_t datalen = 0;
 	sscanf(Cmd, "%x %x %x", &offset, &len, &iv);
 	
-	PrintAndLogEx(NORMAL, "Reading %d bytes, from offset %d", len, offset);
+	// sanity checks
+	if ( len + offset >= MAX_LENGTH ) {
+		PrintAndLogEx(WARNING, "Out-of-bounds, Cardsize = %d, [offset+len = %d ]", MAX_LENGTH, len + offset);
+		return -1;
+	}
+
+	PrintAndLogEx(SUCCESS, "Reading %d bytes, from offset %d", len, offset);
 	
 	// allocate receiver buffer
 	uint8_t *data = calloc(len, sizeof(uint8_t));
 	if ( !data ){
 		PrintAndLogEx(WARNING, "Cannot allocate memory");
-		return 2;
+		return -2;
 	}
-	memset(data, 0, len);
 	
 	int status = legic_read_mem(offset, len, iv, data, &datalen);
 	if ( status == 0 ) {
@@ -540,9 +544,9 @@ int CmdLegicRfWrite(const char *Cmd) {
 			}
 			
 			// limit number of bytes to write. This is not a 'restore' command.
-			if ( (len>>1) > 100 ){
-				PrintAndLogEx(NORMAL, "Max bound on 100bytes to write a one time.");
-				PrintAndLogEx(NORMAL, "Use the 'hf legic restore' command if you want to write the whole tag at once");
+			if ( (len >> 1) > 100 ){
+				PrintAndLogEx(WARNING, "Max bound on 100bytes to write a one time.");
+				PrintAndLogEx(WARNING, "Use the 'hf legic restore' command if you want to write the whole tag at once");
 				errors = true;
 			}
 
@@ -551,7 +555,7 @@ int CmdLegicRfWrite(const char *Cmd) {
 			if (data)
 				free(data);
 			
-			data = malloc(len >> 1);
+			data = calloc(len >> 1, sizeof(uint8_t));
 			if ( data == NULL ) {
 				PrintAndLogEx(WARNING, "Can't allocate memory. exiting");
 				errors = true;
@@ -598,12 +602,12 @@ int CmdLegicRfWrite(const char *Cmd) {
 	// OUT-OF-BOUNDS checks
 	// UID 4+1 bytes can't be written to.
 	if ( offset < 5 ) {
-		PrintAndLogEx(NORMAL, "Out-of-bounds, bytes 0-1-2-3-4 can't be written to. Offset = %d", offset);
+		PrintAndLogEx(WARNING, "Out-of-bounds, bytes 0-1-2-3-4 can't be written to. Offset = %d", offset);
 		return -2;
 	}
 	
 	if ( len + offset >= card.cardsize ) {
-		PrintAndLogEx(NORMAL, "Out-of-bounds, Cardsize = %d, [offset+len = %d ]", card.cardsize, len + offset);
+		PrintAndLogEx(WARNING, "Out-of-bounds, Cardsize = %d, [offset+len = %d ]", card.cardsize, len + offset);
 		return -2;
 	}
 
@@ -622,7 +626,7 @@ int CmdLegicRfWrite(const char *Cmd) {
 	
 	legic_chk_iv(&IV);
 	
-	PrintAndLogEx(NORMAL, "Writing to tag");
+	PrintAndLogEx(SUCCESS, "Writing to tag");
 
 	UsbCommand c = {CMD_WRITER_LEGIC_RF, {offset, len, IV}};
 	memcpy(c.d.asBytes, data, len);	
@@ -673,7 +677,7 @@ int CmdLegicCalcCrc(const char *Cmd){
 			// it's possible for user to accidentally enter "b" parameter
 			// more than once - we have to clean previous malloc
 			if (data) free(data);
-			data = malloc(len >> 1);
+			data = calloc(len >> 1,  sizeof(uint8_t) );
 			if ( data == NULL ) {
 				PrintAndLogEx(WARNING, "Can't allocate memory. exiting");
 				errors = true;
@@ -714,10 +718,10 @@ int CmdLegicCalcCrc(const char *Cmd){
 	switch (type){
 		case 16:
 			init_table(CRC_LEGIC);
-			PrintAndLogEx(NORMAL, "Legic crc16: %X", crc16_legic(data, len, uidcrc));
+			PrintAndLogEx(SUCCESS, "Legic crc16: %X", crc16_legic(data, len, uidcrc));
 			break;
 		default:
-			PrintAndLogEx(NORMAL, "Legic crc8: %X",  CRC8Legic(data, len) );
+			PrintAndLogEx(SUCCESS, "Legic crc8: %X",  CRC8Legic(data, len) );
 			break;
 	}
 	
@@ -733,11 +737,18 @@ int legic_read_mem(uint32_t offset, uint32_t len, uint32_t iv, uint8_t *out, uin
 	clearCommandBuffer();
 	SendCommand(&c);
 	UsbCommand resp;
-	if ( !WaitForResponseTimeout(CMD_ACK, &resp, 3000) ) {
-		PrintAndLogEx(WARNING, "command execution time out");
-		return 1;
-	}
-
+	
+	uint8_t timeout = 0;
+	while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
+		++timeout;
+		printf("."); fflush(stdout);
+		if (timeout > 7) {
+			PrintAndLogEx(WARNING, "\ncommand execution time out");
+			return 1;
+		}
+	}	
+	PrintAndLogEx(NORMAL, "\n");
+	
 	uint8_t isOK = resp.arg[0] & 0xFF;
 	*outlen = resp.arg[1];
 	if ( !isOK ) {
@@ -762,13 +773,13 @@ int legic_print_type(uint32_t tagtype, uint8_t spaces){
 	char *spacer = spc + (10-spaces);
 
 	if ( tagtype == 22 )	
-		PrintAndLogEx(NORMAL, "%sTYPE : MIM%d card (outdated)", spacer, tagtype);
+		PrintAndLogEx(SUCCESS, "%sTYPE : MIM%d card (outdated)", spacer, tagtype);
 	else if ( tagtype == 256 )
-		PrintAndLogEx(NORMAL, "%sTYPE : MIM%d card (234 bytes)", spacer, tagtype);
+		PrintAndLogEx(SUCCESS, "%sTYPE : MIM%d card (234 bytes)", spacer, tagtype);
 	else if ( tagtype == 1024 )
-		PrintAndLogEx(NORMAL, "%sTYPE : MIM%d card (1002 bytes)", spacer, tagtype);
+		PrintAndLogEx(SUCCESS, "%sTYPE : MIM%d card (1002 bytes)", spacer, tagtype);
 	else
-		PrintAndLogEx(NORMAL, "%sTYPE : Unknown %06x", spacer, tagtype);
+		PrintAndLogEx(INFO, "%sTYPE : Unknown %06x", spacer, tagtype);
 	return 0;
 }
 int legic_get_type(legic_card_select_t *card){
@@ -792,12 +803,12 @@ int legic_get_type(legic_card_select_t *card){
 void legic_chk_iv(uint32_t *iv){
 	if ( (*iv & 0x7F) != *iv ){
 		*iv &= 0x7F;
-		PrintAndLogEx(NORMAL, "Truncating IV to 7bits, %u", *iv);
+		PrintAndLogEx(INFO, "Truncating IV to 7bits, %u", *iv);
 	}
 	// IV must be odd
 	if ( (*iv & 1) == 0 ){
 		*iv |= 0x01;  
-		PrintAndLogEx(NORMAL, "LSB of IV must be SET %u", *iv);	
+		PrintAndLogEx(INFO, "LSB of IV must be SET %u", *iv);	
 	}
 }
 void legic_seteml(uint8_t *src, uint32_t offset, uint32_t numofbytes) {
@@ -828,11 +839,11 @@ int HFLegicReader(const char *Cmd, bool verbose) {
 			if ( verbose ) PrintAndLogEx(WARNING, "command execution time out"); 
 			return 1;
 		case 3: 
-			if ( verbose ) PrintAndLogEx(NORMAL, "legic card select failed");
+			if ( verbose ) PrintAndLogEx(WARNING, "legic card select failed");
 			return 2;
 		default: break;
 	}
-	PrintAndLogEx(NORMAL, " UID : %s", sprint_hex(card.uid, sizeof(card.uid)));
+	PrintAndLogEx(SUCCESS, " UID : %s", sprint_hex(card.uid, sizeof(card.uid)));
 	legic_print_type(card.cardsize, 0);
 	return 0;
 }
@@ -882,14 +893,14 @@ int CmdLegicDump(const char *Cmd){
 	dumplen = card.cardsize;
 	
 	legic_print_type(dumplen, 0);	
-	PrintAndLogEx(NORMAL, "Reading tag memory %d b...", dumplen);
+	PrintAndLogEx(SUCCESS, "Reading tag memory %d b...", dumplen);
 
 	UsbCommand c = {CMD_READER_LEGIC_RF, {0x00, dumplen, 0x55}};
 	clearCommandBuffer();
 	SendCommand(&c);
 	UsbCommand resp;
 	if (!WaitForResponseTimeout(CMD_ACK, &resp, 3000)) {
-		PrintAndLogEx(NORMAL, "Command execute time-out");
+		PrintAndLogEx(WARNING, "Command execute time-out");
 		return 1;
 	}
 		
@@ -900,12 +911,11 @@ int CmdLegicDump(const char *Cmd){
 	}
 
 	uint16_t readlen = resp.arg[1];
-	uint8_t *data = malloc(readlen);
+	uint8_t *data = calloc(readlen, sizeof(uint8_t));
 	if (!data) {
 		PrintAndLogEx(WARNING, "Fail, cannot allocate memory");
 		return 3;
 	}
-	memset(data, 0, readlen);
 	
 	if ( readlen != dumplen )
 		PrintAndLogEx(WARNING, "Fail, only managed to read 0x%02X bytes of 0x%02X", readlen, dumplen);
@@ -934,7 +944,7 @@ int CmdLegicDump(const char *Cmd){
 	fflush(f);
 	fclose(f);
 	free(data);
-	PrintAndLogEx(NORMAL, "Wrote %d bytes to %s", readlen, filename);
+	PrintAndLogEx(SUCCESS, "Wrote %d bytes to %s", readlen, filename);
 	return 0;
 }	
 
@@ -982,12 +992,11 @@ int CmdLegicRestore(const char *Cmd){
 	numofbytes = card.cardsize;	
 	
 	// set up buffer
-	uint8_t *data = malloc(numofbytes);
+	uint8_t *data = calloc(numofbytes, sizeof(uint8_t) );
 	if (!data) {
 		PrintAndLogEx(WARNING, "Fail, cannot allocate memory");
 		return 2;		
 	}
-	memset(data, 0, numofbytes);
 	
 	legic_print_type(numofbytes, 0);	
 
@@ -997,7 +1006,7 @@ int CmdLegicRestore(const char *Cmd){
 
 	f = fopen(filename,"rb");
 	if (!f) {
-		PrintAndLogEx(NORMAL, "File %s not found or locked", filename);
+		PrintAndLogEx(WARNING, "File %s not found or locked", filename);
 		return 3;
 	}	
 	
@@ -1018,12 +1027,12 @@ int CmdLegicRestore(const char *Cmd){
 	fclose(f);
 	
 	if ( bytes_read == 0){
-		PrintAndLogEx(NORMAL, "File reading error");
+		PrintAndLogEx(WARNING, "File reading error");
 		free(data);
 		return 2;
 	}
 	
-	PrintAndLogEx(NORMAL, "Restoring to card");
+	PrintAndLogEx(SUCCESS, "Restoring to card");
 
 	// transfer to device
 	size_t len = 0;
@@ -1049,11 +1058,11 @@ int CmdLegicRestore(const char *Cmd){
 			free(data);	
 			return 1;
 		}
-		PrintAndLogEx(NORMAL, "Wrote chunk [offset %d | len %d | total %d", i, len, i+len);
+		PrintAndLogEx(SUCCESS, "Wrote chunk [offset %d | len %d | total %d", i, len, i+len);
 	}	
 	
 	free(data);	
-	PrintAndLogEx(NORMAL, "\nWrote %d bytes to card from file %s", numofbytes, filename);
+	PrintAndLogEx(SUCCESS, "\nWrote %d bytes to card from file %s", numofbytes, filename);
 	return 0;
 }
 
@@ -1077,12 +1086,11 @@ int CmdLegicELoad(const char *Cmd) {
 	}
 
 	// set up buffer
-	uint8_t *data = malloc(numofbytes);
+	uint8_t *data = calloc(numofbytes, sizeof(uint8_t));
 	if (!data) {
 		PrintAndLogEx(WARNING, "Fail, cannot allocate memory");
 		return 3;		
 	}
-	memset(data, 0, numofbytes);
 	
 	// set up file
 	len = param_getstr(Cmd, nameParamNo, filename, FILE_PATH_SIZE);
@@ -1094,7 +1102,7 @@ int CmdLegicELoad(const char *Cmd) {
 	// open file
 	f = fopen(filename,"rb");
 	if (!f) { 
-		PrintAndLogEx(NORMAL, "File %s not found or locked", filename);
+		PrintAndLogEx(WARNING, "File %s not found or locked", filename);
 		free(data);
 		return 1;
 	}
@@ -1102,7 +1110,7 @@ int CmdLegicELoad(const char *Cmd) {
 	// load file
 	size_t bytes_read = fread(data, 1, numofbytes, f);
 	if ( bytes_read == 0){
-		PrintAndLogEx(NORMAL, "File reading error");
+		PrintAndLogEx(WARNING, "File reading error");
 		free(data);
 		fclose(f);
 		f = NULL;		
@@ -1115,7 +1123,7 @@ int CmdLegicELoad(const char *Cmd) {
 	legic_seteml(data, 0, numofbytes);
 		
 	free(data);	
-	PrintAndLogEx(NORMAL, "\nLoaded %d bytes from file: %s  to emulator memory", numofbytes, filename);
+	PrintAndLogEx(SUCCESS, "\nLoaded %d bytes from file: %s  to emulator memory", numofbytes, filename);
 	return 0;
 }
 
@@ -1146,15 +1154,14 @@ int CmdLegicESave(const char *Cmd) {
 		fileNlen = FILE_PATH_SIZE - 5;
 
 	// set up buffer
-	uint8_t *data = malloc(numofbytes);
+	uint8_t *data = calloc(numofbytes, sizeof(uint8_t));
 	if (!data) {
 		PrintAndLogEx(WARNING, "Fail, cannot allocate memory");
 		return 3;		
 	}
-	memset(data, 0, numofbytes);
 		
 	// download emulator memory
-	PrintAndLogEx(NORMAL, "Reading emulator memory...");	
+	PrintAndLogEx(SUCCESS, "Reading emulator memory...");	
 	if (!GetFromDevice( BIG_BUF_EML, data, numofbytes, 0, NULL, 2500, false)) {
 		PrintAndLogEx(WARNING, "Fail, transfer from device time-out");
 		free(data);
@@ -1185,16 +1192,15 @@ int CmdLegicWipe(const char *Cmd){
 	}
 	
 	// set up buffer
-	uint8_t *data = malloc(card.cardsize);
+	uint8_t *data = calloc(card.cardsize, sizeof(uint8_t));
 	if (!data) {
 		PrintAndLogEx(WARNING, "Fail, cannot allocate memory");
 		return 2;		
 	}
-	memset(data, 0, card.cardsize);
 	
 	legic_print_type(card.cardsize, 0);
 
-	PrintAndLogEx(NORMAL, "Erasing");
+	PrintAndLogEx(SUCCESS, "Erasing");
 	
 	// transfer to device
 	size_t len = 0;
@@ -1222,7 +1228,7 @@ int CmdLegicWipe(const char *Cmd){
 			return 4;
 		}
 	}
-	PrintAndLogEx(NORMAL, "ok\n");
+	PrintAndLogEx(SUCCESS, "ok\n");
 	return 0;
 }
 
@@ -1236,7 +1242,7 @@ static command_t CommandTable[] =  {
 	{"reader",	CmdLegicReader,		1, "LEGIC Prime Reader UID and tag info"},
 	{"info",	CmdLegicInfo,		0, "Display deobfuscated and decoded LEGIC Prime tag data"},
 	{"dump",	CmdLegicDump,		0, "Dump LEGIC Prime tag to binary file"},
-	{"restore", CmdLegicRestore,	0, "Restore a dump onto a LEGIC Prime tag"},
+	{"restore", CmdLegicRestore,	0, "Restore a dump file onto a LEGIC Prime tag"},
 	{"rdmem",	CmdLegicRdmem,		0, "Read bytes from a LEGIC Prime tag"},
 	{"sim",		CmdLegicRfSim,		0, "Start tag simulator"},
 	{"write",	CmdLegicRfWrite,	0, "Write data to a LEGIC Prime tag"},

From 72942624426a7c57b24bea25f37121dbdcea22d1 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 21 Jan 2019 09:59:47 +0100
Subject: [PATCH 0434/1938] chg: 'script run iso15_magic' - added switch "-a"
 to swap between iceman styled vs offical styled iso15 raw commands.

In order to run this script on official pm3 repo, you will need to copy this script and
/client/lualibs/read15.lua file.

Read help text for examples
script run iso15_magic -h
---
 client/scripts/iso15_magic.lua | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/client/scripts/iso15_magic.lua b/client/scripts/iso15_magic.lua
index 36e8100a8..3923f2b1e 100644
--- a/client/scripts/iso15_magic.lua
+++ b/client/scripts/iso15_magic.lua
@@ -5,7 +5,7 @@ local utils =  require('utils')
 
 copyright = 'Copyright (c) 2018 IceSQL AB. All rights reserved.'
 author = 'Christian Herrmann'
-version = 'v1.0.3'
+version = 'v1.0.4'
 desc = [[
 This script tries to set UID on a IS15693 SLIX magic card 
 Remember the UID  ->MUST<- start with 0xE0
@@ -15,6 +15,8 @@ example = [[
 	 -- ISO15693 slix magic tag
 
 	 script run iso15_magic -u E004013344556677
+	 
+	 script run iso15_magic -u E004013344556677 -a
 ]]
 usage = [[
 script run iso15_magic -h -u <uid>
@@ -22,6 +24,7 @@ script run iso15_magic -h -u <uid>
 Arguments:
 	-h             : this help
 	-u <UID>       : UID (16 hexsymbols)
+	-a             : use offical pm3 repo ISO15 commands instead of iceman fork.
 ]]
 
 local DEBUG = true
@@ -82,11 +85,13 @@ function main(args)
 	print()
 
 	local uid = 'E004013344556677'
+	local use_iceman = true
 	
 	-- Read the parameters
-	for o, a in getopt.getopt(args, 'hu:') do
+	for o, a in getopt.getopt(args, 'hu:a') do
 		if o == "h" then return help() end
 		if o == "u" then uid = a end
+		if o == "a" then use_iceman = false end
 	end	
 	
 	-- uid string checks
@@ -103,8 +108,11 @@ function main(args)
 	
 	core.clearCommandBuffer()
 	
-	magicUID_iceman(block0, block1)
-	--magicUID_offical(block0, block1)
+	if use_iceman then
+		magicUID_iceman(block0, block1)
+	else
+		magicUID_offical(block0, block1)
+	end
 end
 
 main(args)

From 8ee857e4ba6d334ca30beefb4241b385abfefa09 Mon Sep 17 00:00:00 2001
From: Iceman <iceman@iuse.se>
Date: Mon, 21 Jan 2019 17:36:58 +0100
Subject: [PATCH 0435/1938] Update tnp3clone.lua

---
 client/scripts/tnp3clone.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/scripts/tnp3clone.lua b/client/scripts/tnp3clone.lua
index 514a091b9..b17cf2661 100644
--- a/client/scripts/tnp3clone.lua
+++ b/client/scripts/tnp3clone.lua
@@ -93,7 +93,7 @@ local function main(args)
 	local csetuid = 'hf mf csetuid '
 	local cget = 'hf mf cgetbl '
 	local empty = '00000000000000000000000000000000'
-	local AccAndKeyB = '7F070869000000000000'
+	local AccAndKeyB = '7F0F0869000000000000'
 	local atqa = '0F01'
 	local sak = '81'
 	-- Defaults to Gusto

From 601cb0fe0009c02a85b0c98c5649b92ea5e34c1b Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 21 Jan 2019 22:04:44 +0100
Subject: [PATCH 0436/1938] chg: 'hf legic dump' - longer timeout

---
 client/cmdhflegic.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index 0f580da9f..c1677d00a 100644
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -899,10 +899,17 @@ int CmdLegicDump(const char *Cmd){
 	clearCommandBuffer();
 	SendCommand(&c);
 	UsbCommand resp;
-	if (!WaitForResponseTimeout(CMD_ACK, &resp, 3000)) {
-		PrintAndLogEx(WARNING, "Command execute time-out");
-		return 1;
-	}
+
+	uint8_t timeout = 0;
+	while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
+		++timeout;
+		printf("."); fflush(stdout);
+		if (timeout > 7) {
+			PrintAndLogEx(WARNING, "\ncommand execution time out");
+			return 1;
+		}
+	}	
+	PrintAndLogEx(NORMAL, "\n");
 		
 	uint8_t isOK = resp.arg[0] & 0xFF;
 	if ( !isOK ) {

From 063feeae05a5523c6e943efcd3e3b838d915a9e0 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 21 Jan 2019 22:12:43 +0100
Subject: [PATCH 0437/1938] CHG: 'hf legic write' CHG: 'hf legic restore' CHG:
 'hf legic wipe' -  longer timeout for execution

---
 client/cmdhflegic.c | 50 ++++++++++++++++++++++++++++++++-------------
 1 file changed, 36 insertions(+), 14 deletions(-)

diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index c1677d00a..1403060e5 100644
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -634,10 +634,18 @@ int CmdLegicRfWrite(const char *Cmd) {
 	clearCommandBuffer();
 	SendCommand(&c);
 	
-	if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
-		PrintAndLogEx(WARNING, "command execution time out");
-		return 1;
-	}
+
+	uint8_t timeout = 0;
+	while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
+		++timeout;
+		printf("."); fflush(stdout);
+		if (timeout > 7) {
+			PrintAndLogEx(WARNING, "\ncommand execution time out");
+			return 1;
+		}
+	}	
+	PrintAndLogEx(NORMAL, "\n");
+	
 	uint8_t isOK = resp.arg[0] & 0xFF;
 	if ( !isOK ) {
 		PrintAndLogEx(WARNING, "Failed writing tag");
@@ -1054,11 +1062,18 @@ int CmdLegicRestore(const char *Cmd){
 		clearCommandBuffer();
 		SendCommand(&c);
 	
-		if (!WaitForResponseTimeout(CMD_ACK, &resp, 4000)) {
-			PrintAndLogEx(WARNING, "command execution time out");
-			free(data);	
-			return 1;
-		}
+		uint8_t timeout = 0;
+		while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
+			++timeout;
+			printf("."); fflush(stdout);
+			if (timeout > 7) {
+				PrintAndLogEx(WARNING, "\ncommand execution time out");
+				free(data);	
+				return 1;
+			}
+		}	
+		PrintAndLogEx(NORMAL, "\n");
+		
 		uint8_t isOK = resp.arg[0] & 0xFF;
 		if ( !isOK ) {
 			PrintAndLogEx(WARNING, "Failed writing tag [msg = %u]", resp.arg[1] & 0xFF);
@@ -1223,11 +1238,18 @@ int CmdLegicWipe(const char *Cmd){
 		clearCommandBuffer();
 		SendCommand(&c);
 	
-		if (!WaitForResponseTimeout(CMD_ACK, &resp, 4000)) {
-			PrintAndLogEx(WARNING, "command execution time out");
-			free(data);	
-			return 3;
-		}
+		uint8_t timeout = 0;
+		while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
+			++timeout;
+			printf("."); fflush(stdout);
+			if (timeout > 7) {
+				PrintAndLogEx(WARNING, "\ncommand execution time out");
+				free(data);					
+				return 3;
+			}
+		}	
+		PrintAndLogEx(NORMAL, "\n");		
+
 		uint8_t isOK = resp.arg[0] & 0xFF;
 		if ( !isOK ) {
 			PrintAndLogEx(WARNING, "Failed writing tag [msg = %u]", resp.arg[1] & 0xFF);

From be09793fcda1e2fba280d2ca9bbae5c257092e7a Mon Sep 17 00:00:00 2001
From: Iceman <iceman@iuse.se>
Date: Tue, 22 Jan 2019 09:45:10 +0100
Subject: [PATCH 0438/1938] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 05b9a007f..f21a2efdc 100644
--- a/README.md
+++ b/README.md
@@ -61,7 +61,7 @@ I have also added this script to the fork.
 https://github.com/RfidResearchGroup/proxmark3/blob/master/install.sh
 
 - Run
-`sudo apt-get install p7zip git build-essential libreadline5 libreadline-dev libusb-0.1-4 libusb-dev libqt4-dev perl pkg-config wget libncurses5-dev gcc-arm-none-eabi libjansson-dev`
+`sudo apt-get install p7zip git build-essential libreadline5 libreadline-dev libusb-0.1-4 libusb-dev libqt4-dev perl pkg-config wget libncurses5-dev gcc-arm-none-eabi`
 
 - Clone fork
 `git clone https://github.com/RfidResearchGroup/proxmark3.git`
@@ -86,7 +86,7 @@ https://github.com/RfidResearchGroup/proxmark3/blob/master/install.sh
 
 ## Setup and build for ArchLinux
 - Run
-`sudo pacman -Sy base-devel p7zip libusb readline ncurses libjansson-dev arm-none-eabi-newlib --needed`
+`sudo pacman -Sy base-devel p7zip libusb readline ncurses arm-none-eabi-newlib --needed`
 `yaourt -S termcap`
 
 - Remove modemmanager

From cf006a445fff51e7862fb1c440e22bf67d9d1382 Mon Sep 17 00:00:00 2001
From: Iceman <iceman@iuse.se>
Date: Tue, 22 Jan 2019 11:55:04 +0100
Subject: [PATCH 0439/1938] Update default_keys.dic

ADD:  more keys
---
 client/default_keys.dic | 83 ++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 82 insertions(+), 1 deletion(-)

diff --git a/client/default_keys.dic b/client/default_keys.dic
index 3fb8f07bf..c7186a154 100644
--- a/client/default_keys.dic
+++ b/client/default_keys.dic
@@ -711,4 +711,85 @@ FD8705E721B0,
 00ada2cd516d,
 #
 #
-D3F7D3F7D3F7
\ No newline at end of file
+D3F7D3F7D3F7
+##
+237a4d0d9119,
+0ed7846c2bc9,
+FFFFD06F83E3,
+FFFFAE82366C,
+F89C86B2A961,
+F83466888612,
+ED3A7EFBFF56,
+E96246531342,
+E1DD284379D4,
+DFED39FFBB76,
+DB5181C92CBE,
+CFC738403AB0,
+BCFE01BCFE01,
+BA28CFD15EE8,
+B0699AD03D17,
+AABBCC660429,
+A4EF6C3BB692,
+A2B2C9D187FB,
+9B1DD7C030A1,
+9AEDF9931EC1,
+8F9B229047AC,
+872B71F9D15A,
+83BAB5ACAD62,
+833FBD3CFE51,
+64E2283FCF5E,
+64A2EE93B12B,
+5D293AFC8D7E,
+5554AAA96321,
+474249437569,
+46868F6D5677,
+435330666666,
+40E5EA1EFC00,
+37D4DCA92451,
+2012053082AD,
+2011092119F1,
+200306202033,
+1795902DBAF9,
+17505586EF02,
+022FE48B3072,
+013940233313,
+1A2B3C4D5E6F,
+123456ABCDEF,
+FFFFD06F83E3,
+FFFFAE82366C,
+F89C86B2A961,
+F83466888612,
+ED3A7EFBFF56,
+E96246531342,
+E1DD284379D4,
+DFED39FFBB76,
+DB5181C92CBE,
+CFC738403AB0,
+BCFE01BCFE01,
+BA28CFD15EE8,
+B0699AD03D17,
+AABBCC660429,
+A4EF6C3BB692,
+A2B2C9D187FB,
+9B1DD7C030A1,
+9AEDF9931EC1,
+8F9B229047AC,
+872B71F9D15A,
+83BAB5ACAD62,
+833FBD3CFE51,
+64E2283FCF5E,
+64A2EE93B12B,
+5D293AFC8D7E,
+5554AAA96321,
+474249437569,
+46868F6D5677,
+435330666666,
+40E5EA1EFC00,
+37D4DCA92451,
+2012053082AD,
+2011092119F1,
+200306202033,
+1795902DBAF9,
+17505586EF02,
+022FE48B3072,
+013940233313,

From e885ec737df6dea50be909b8fe948e39e1e624e4 Mon Sep 17 00:00:00 2001
From: Iceman <iceman@iuse.se>
Date: Tue, 22 Jan 2019 12:03:53 +0100
Subject: [PATCH 0440/1938] Update default_keys.dic

---
 client/default_keys.dic | 38 --------------------------------------
 1 file changed, 38 deletions(-)

diff --git a/client/default_keys.dic b/client/default_keys.dic
index c7186a154..ffbdb3cbd 100644
--- a/client/default_keys.dic
+++ b/client/default_keys.dic
@@ -735,55 +735,17 @@ A2B2C9D187FB,
 9AEDF9931EC1,
 8F9B229047AC,
 872B71F9D15A,
-83BAB5ACAD62,
 833FBD3CFE51,
-64E2283FCF5E,
-64A2EE93B12B,
 5D293AFC8D7E,
 5554AAA96321,
 474249437569,
-46868F6D5677,
 435330666666,
-40E5EA1EFC00,
-37D4DCA92451,
-2012053082AD,
-2011092119F1,
-200306202033,
-1795902DBAF9,
-17505586EF02,
-022FE48B3072,
-013940233313,
 1A2B3C4D5E6F,
 123456ABCDEF,
-FFFFD06F83E3,
-FFFFAE82366C,
-F89C86B2A961,
-F83466888612,
-ED3A7EFBFF56,
-E96246531342,
-E1DD284379D4,
-DFED39FFBB76,
-DB5181C92CBE,
-CFC738403AB0,
-BCFE01BCFE01,
-BA28CFD15EE8,
-B0699AD03D17,
-AABBCC660429,
-A4EF6C3BB692,
-A2B2C9D187FB,
-9B1DD7C030A1,
-9AEDF9931EC1,
-8F9B229047AC,
-872B71F9D15A,
 83BAB5ACAD62,
-833FBD3CFE51,
 64E2283FCF5E,
 64A2EE93B12B,
-5D293AFC8D7E,
-5554AAA96321,
-474249437569,
 46868F6D5677,
-435330666666,
 40E5EA1EFC00,
 37D4DCA92451,
 2012053082AD,

From 0bec6038b733e1e0221d100c2746c5d4e710612a Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 23 Jan 2019 10:57:49 +0100
Subject: [PATCH 0441/1938] CHG: adjusted compiling for older devices

---
 armsrc/lfops.c       | 4 ++--
 client/cmdflashmem.h | 4 ++++
 client/emv/emvcore.c | 4 ++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index c267db36e..d750fccbe 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -1591,11 +1591,11 @@ void T55xx_ChkPwds() {
 
 	
 	uint8_t *pwds = BigBuf_get_EM_addr();
-	bool use_flashmem = true;
 	uint16_t pwdCount = 0;
 	uint32_t candidate = 0;
 
-#ifdef WITH_FLASH	
+#ifdef WITH_FLASH
+	bool use_flashmem = true;
 	if ( use_flashmem ) {
 		BigBuf_Clear_EM();
 		uint16_t isok = 0;
diff --git a/client/cmdflashmem.h b/client/cmdflashmem.h
index 9f71a4ce0..ee661bf18 100644
--- a/client/cmdflashmem.h
+++ b/client/cmdflashmem.h
@@ -8,6 +8,8 @@
 // Proxmark3 RDV40 Flash memory commands
 //-----------------------------------------------------------------------------
 
+#ifdef WITH_FLASH
+
 #ifndef CMDFLASHMEM_H__
 #define CMDFLASHMEM_H__
 
@@ -38,4 +40,6 @@ extern int CmdFlashMemLoad(const char* cmd);
 extern int CmdFlashMemSave(const char* cmd);
 extern int CmdFlashMemWipe(const char *Cmd);
 extern int CmdFlashMemInfo(const char *Cmd);
+#endif
+
 #endif
\ No newline at end of file
diff --git a/client/emv/emvcore.c b/client/emv/emvcore.c
index 5ea9026c2..77d288eaa 100644
--- a/client/emv/emvcore.c
+++ b/client/emv/emvcore.c
@@ -262,8 +262,12 @@ int EMVExchangeEx(EMVCommandChannel channel, bool ActivateField, bool LeaveField
 		}
 		break;
 	case ECC_CONTACT:
+#ifdef WITH_SMARTCARD		
 		//int ExchangeAPDUSC(uint8_t *datain, int datainlen, bool activateCard, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen);
 		res = ExchangeAPDUSC(data, (IncludeLe?6:5) + apdu.Lc, ActivateField, LeaveFieldON, Result, (int)MaxResultLen, (int *)ResultLen);
+#else
+		res = 1;
+#endif	
 		if (res) {
 			return res;
 		}

From 61ebdbde6b65601f997dae4c5f606c75ce3837e8 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 23 Jan 2019 11:01:11 +0100
Subject: [PATCH 0442/1938] CHG: adjusting compiling for older devices

---
 client/cmdflashmem.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/client/cmdflashmem.c b/client/cmdflashmem.c
index 6361d48e3..d3aaff19e 100644
--- a/client/cmdflashmem.c
+++ b/client/cmdflashmem.c
@@ -7,6 +7,8 @@
 //-----------------------------------------------------------------------------
 // Proxmark3 RDV40 Flash memory commands
 //-----------------------------------------------------------------------------
+#ifdef WITH_FLASH
+
 #include "cmdflashmem.h"
 
 #include "mbedtls/rsa.h"
@@ -604,3 +606,5 @@ int CmdHelp(const char *Cmd) {
 	CmdsHelp(CommandTable);
 	return 0;
 }
+
+#endif
\ No newline at end of file

From 5e13c7e58879d3823f5f182ab27ba7b31508e2bb Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 23 Jan 2019 12:18:07 +0100
Subject: [PATCH 0443/1938] ADD: Found a bunch more dictionary files,  from a
 link on the forum.

---
 client/dictionaries/bmp_sort_keys.dic   | 1000 ++++++++++++++++++++++
 client/dictionaries/icbpm_sort_keys.dic | 1001 +++++++++++++++++++++++
 client/dictionaries/mrzd_sort_keys.dic  |   57 ++
 3 files changed, 2058 insertions(+)
 create mode 100644 client/dictionaries/bmp_sort_keys.dic
 create mode 100644 client/dictionaries/icbpm_sort_keys.dic
 create mode 100644 client/dictionaries/mrzd_sort_keys.dic

diff --git a/client/dictionaries/bmp_sort_keys.dic b/client/dictionaries/bmp_sort_keys.dic
new file mode 100644
index 000000000..0f8acdcf3
--- /dev/null
+++ b/client/dictionaries/bmp_sort_keys.dic
@@ -0,0 +1,1000 @@
+002DE0301481,
+004173272D18,
+0058A4884CA5,
+00BAC32761D8,
+00BB79731B00,
+00E8C85DB172,
+02096124DA70,
+024988BC4D5E,
+0271B7C4B015,
+028137A705DB,
+02827C286AB4,
+02C10DA600D0,
+0340643D5E27,
+037A5DA4682B,
+037AC43CBD9D,
+037B9B8AA219,
+037EE3DE21B7,
+0380A9A3CBDE,
+03D10A75B56A,
+03E8CD22E691,
+04109ED8EA79,
+04361330B35C,
+043D8B66D569,
+045E5588845C,
+048DE5148DE7,
+0490921D0194,
+04B717BD92EB,
+04D49C76623B,
+051518B3301E,
+0529E8827A52,
+052B16064085,
+05DC4016B500,
+06124317A9A6,
+06147D199266,
+0670AEB833CE,
+0686A9E6D6E0,
+06A34E5E6639,
+06B78AD0C4BB,
+0710E7818AB8,
+07121B8C633A,
+07176713C0ED,
+0793533A5087,
+081D1B1C3110,
+0849495E1CCA,
+09429512046E,
+0966C3B28E04,
+098A92C3660A,
+098B48278122,
+099672009EEA,
+0A7632943926,
+0AEE126549DA,
+0B3B8C2833BC,
+0B733C13E2C9,
+0B764247D00E,
+0BE811559D69,
+0C208AD4E4B3,
+0C270BC0BDDC,
+0C5D782CB183,
+0C82C94EB11B,
+0CCDE948878A,
+0CCE39820AAE,
+0CDE3E716B32,
+0CE06C96DB4C,
+0CE87813E389,
+0D3385CEA152,
+0D5C5B8BCC5B,
+0DB0A87AB882,
+0DE247593B93,
+0E0AD1796003,
+0E62E6CAC3D3,
+106E2D6E55E6,
+1096A7830C82,
+11549C141AD9,
+116A92C793D6,
+116C31526819,
+11C68052AAE9,
+1234B5BE8E78,
+1268C7D104E1,
+12A21B5671A8,
+13359D5AE9A5,
+1426EC62BB6C,
+144489B1056E,
+14A22C112090,
+14C9BBB5361B,
+14EB6286AC57,
+14EE72B27223,
+153BB53ACE71,
+157B03405B38,
+15A45083D24E,
+15DACCE8D5EC,
+16124677BBC5,
+16373A44D5D7,
+1663659384DC,
+167828B6105C,
+16B25A453093,
+1706B1BE25C7,
+171B15888483,
+17BC8EED9A0C,
+17C6299D5A37,
+17E9C4C416EB,
+1804087C7166,
+1841CC4E3E79,
+18AB05761CC5,
+18ADAAC2B08B,
+18E566417E5C,
+191390328752,
+1A47959E7DB4,
+1A9A970CC370,
+1B095E78BB33,
+1B1717043D2B,
+1B1A054566D9,
+1B4654AE9454,
+1B9CD1ED3420,
+1B9E00780953,
+1BB6A9CE71E2,
+1C1250A36A13,
+1C2316079532,
+1C2855ED7A10,
+1CD1AE73CA8C,
+1CD3D4E690B7,
+1D0322005969,
+1D09B23EB116,
+1D67A32045ED,
+1D89D900968A,
+1DAE8D2CEA5C,
+1E1873799CD7,
+1E60CE7C5179,
+1E6A67909B8D,
+1E8516585792,
+1EB0864E9134,
+1ECE3D04A020,
+2009828E4A21,
+200A6A3AA65D,
+20188A599582,
+20267CB20256,
+20628CA7D92D,
+2077C980EB2E,
+2089B5D68B27,
+209481EC6256,
+20B6691C64B1,
+20CC5A00C677,
+211473555436,
+2170E9D0D448,
+219529A90EDD,
+21A5B6481B7D,
+224A308017D1,
+227D16EA455A,
+22A1245CA266,
+22A95CB798DC,
+230E26964171,
+231173B68E46,
+2332BB9A2452,
+234323BC2992,
+234E50256146,
+235C9338D5B6,
+23789D9ADD0D,
+23997DD240AB,
+23A5BA53AD4D,
+23BB58853461,
+24CAD4153036,
+24CE79506842,
+25228ED714BC,
+257377227B34,
+2584287A0174,
+2616192EEB22,
+265C03B50877,
+26D641E834DC,
+27073B57132B,
+279060E3DEE9,
+284BA0A0A29C,
+285C6604C5B4,
+28B20331245A,
+28D042242A83,
+28DDD4C3E9C4,
+292C2CCD157E,
+299ABB519354,
+2A41BE015C1D,
+2A4A55052A51,
+2A94CBCD7A6E,
+2AB6536187C7,
+2B2D2DC3D319,
+2BD607CA70B2,
+2C6C7957EB3E,
+2C9E9E4D0895,
+2D2A97DD45E3,
+2D41850A8AA6,
+2DAC030D1AB9,
+2E12426D8847,
+2E25AD1D6D8D,
+2E2E85E0E6C9,
+2E4340CC1C63,
+2E6803BE2E11,
+2EB24B573DCD,
+2EC6450A47C7,
+2ECDA9A5EA96,
+2EDE1C155023,
+302D5D37342B,
+303645E47667,
+303B30A460E8,
+3048EBB8A18E,
+30BD652BED24,
+30CCE5ECB397,
+310241E1CB36,
+312670228372,
+319E8895EAB5,
+31E3A933BC4A,
+3250D2E661DA,
+32560224418D,
+32589E221D10,
+326657A8E9C0,
+329AC7C59311,
+32A091B89995,
+3312C094BD20,
+336C8CBA5AE2,
+34240649314A,
+3493D84E6317,
+349A347186D7,
+349BEAC5210E,
+34A939B49EDC,
+34CC7E36C8C4,
+34D71347877E,
+34DC25B4D0CE,
+35895EB472C4,
+358A6A398211,
+360A08C66042,
+36306A9CA571,
+37284428A250,
+377EC8A78B8D,
+37BD90A68613,
+37E602347133,
+382DE6AB2D1A,
+385D498B5390,
+38B67589E47D,
+393CCCCCDA4A,
+39682B3E10B5,
+397619525709,
+39A83A32909B,
+3A5834C46513,
+3A70C7A4BCE4,
+3A818D01E093,
+3AA5AC1CDC21,
+3AAE07339954,
+3B4497052B42,
+3B784087DB2D,
+3B86A20C16EA,
+3B8E321AB1B4,
+3BC4A3099B0D,
+3BC741376E71,
+3C4C95D0A0C7,
+3C84B55A5E54,
+3C888A88C59D,
+3D5C8240B2D2,
+3DB004172BE7,
+3E23271C1C15,
+3E3188294ED1,
+3E84144A770E,
+3EA227893101,
+3EB914E70076,
+3EE6D4A85643,
+40DABA780B41,
+4119340759A2,
+415210E0C6BB,
+416D21717779,
+41B1839829A9,
+4201A36DE766,
+4261A795D5A7,
+42AA0B29626E,
+430265958BEB,
+4317C5C16EAD,
+431D799E0C89,
+4342794AD7BB,
+4387ADE263DB,
+43982124C310,
+4436CB060568,
+44449507B736,
+44E858C82975,
+459BC12982B1,
+45AE5DDA9830,
+45C414CDC347,
+45CE4E504C06,
+461744C8EABD,
+46D012CA3BEC,
+47170BD112B6,
+47C43D5DD234,
+47CD4AC26271,
+47D410D1C7C4,
+4808C5AD0115,
+485BEEDBC293,
+486001404A80,
+488CCC60B70A,
+49204E3CA169,
+495657C78147,
+4970714D53D9,
+4AA715A0BBB4,
+4B9901AEC16E,
+4BE0B912A5A3,
+4CBC34D10D83,
+4CD3ACABC6A3,
+4CE00134DE1E,
+4CEB27151C49,
+4D02A3D7CE48,
+4D13683C7960,
+4D1A263BA48B,
+4D23919463A3,
+4D9763C083D9,
+4DAC8EE52C68,
+4DCB89C7B2E6,
+4DD9D9B637C4,
+4DE6CB63A920,
+4DEBA10CC85D,
+4E232A8C2E30,
+4E2879A411E7,
+4EA7B0BED74B,
+4EB8761372EA,
+4EC2B23135AB,
+4EC71DB088DE,
+4EC9AB4B5519,
+50179E461EE6,
+50265ED9D468,
+5047DC2975BE,
+508357498162,
+508BE54D326E,
+510A8C52AAC4,
+511335CC92CD,
+518229589A81,
+5184D04315D7,
+51B4AE31B246,
+526EDB918BEE,
+529CE44BEBCC,
+52A843082BB3,
+52AE9A909674,
+5313E9079489,
+532DE5E7E0E9,
+535508AA6C91,
+53691569B669,
+540A5B789761,
+547B86E57596,
+54C649075B57,
+552249203848,
+55430B5318E9,
+5570D22DC66B,
+55710879E113,
+55D2E4AC0446,
+56207539825A,
+564664475726,
+566441C5C28C,
+56A7930913C3,
+56C944B04618,
+56D455A8BBEA,
+5726991C8C28,
+5726AA3BE37B,
+573314090BA5,
+577C31903867,
+577C528E786C,
+57AD9604ED24,
+580C377283C7,
+587329CE3EBE,
+587C34557B36,
+58B11E803B58,
+5902E4DCC95D,
+5A060A64C535,
+5A36898CA7C5,
+5A4740D952EC,
+5A6ED7966868,
+5A99578CAA13,
+5AAD6814E68B,
+5B065568048A,
+5B6CE0B3AD0A,
+5B70E0B11758,
+5B926E3751EB,
+5B9CA63C4267,
+5BDC1391B289,
+5C1D3898D537,
+5C34B8E4A456,
+5C36456EA1E5,
+5C43A75C65A0,
+5C5752328A47,
+5C9D20250D74,
+5CBA3CEE351A,
+5CD5E98A2864,
+5CE0EB9C01B6,
+5D384E6A4145,
+5D9DB8445155,
+5DE8717BB640,
+5E1A4EE98748,
+5E45A227B391,
+5E8E50B3048B,
+5EB0EA0A9412,
+6032C47B7676,
+60E0C84ADDEE,
+612A447A2149,
+612D81821854,
+616B820EAD01,
+616D75A4A022,
+61DE2B085AC9,
+62312EC272A0,
+6232C5262CC6,
+62B7C7C9B0D0,
+62C531C6E29C,
+63E6AAAB4433,
+644ABCC3DD12,
+64AE7BEA1784,
+6515B38077D6,
+65972038CC25,
+65E120DE5E55,
+66141DDE8320,
+66718BD91332,
+668082242328,
+668920AEE063,
+6696C4332D46,
+66C9880D1DC2,
+67150CB11E95,
+671737BA0054,
+673551D0A99E,
+676D682C4336,
+678B98AA2E86,
+6847808E63EE,
+6887A122AA62,
+6888C514DEAD,
+688BD5B7B4E9,
+68A99E258692,
+68C312391560,
+68C9D33E3735,
+6900A069E3D7,
+690155BE8D8E,
+69174742042D,
+69B9CE233517,
+6A0B123D7595,
+6AB8E2B49E25,
+6ABD4C4A72D9,
+6B1CC539A1B2,
+6B30B6B0925D,
+6B638C1C950D,
+6BAAAB1D4589,
+6BAD01EBE736,
+6BB4ED5E1682,
+6CA178E036DA,
+6CE210B529C4,
+6D23D505D2B1,
+6D3CBD12BC6D,
+6D83563EB521,
+6D98AB9CCC71,
+6E3D7366E78C,
+6E5582237608,
+6E6602904925,
+6E77B8EB6444,
+6E978A7B16C6,
+6EEC05EB651C,
+70284824B26C,
+702CDACE0C14,
+704E1B85BED8,
+70BB123776D6,
+70CCC3A2D7C0,
+716A747CB931,
+7173E199A420,
+71BC9C9E31E4,
+71CAEEA3B771,
+71D8BA423D55,
+72253C7DD951,
+7260377CD286,
+7280858E8B20,
+72913BDAB647,
+72B5B87BBC6E,
+72C83B1D098A,
+72DA8050A38E,
+735C2AB60A97,
+736B602A93D9,
+738D7833E7DE,
+73E7B22D6E54,
+74133B1E2DED,
+74A929877793,
+74E3670C045A,
+7531E3E2A41C,
+7542A9B65EB4,
+7564993C91C7,
+760ED0AB626E,
+762E0E021E38,
+763D7E6BB40E,
+764B38E2903D,
+768016001C8D,
+76A616C3D42C,
+76AE99D9A294,
+76BAAA710D25,
+76E3B23696BC,
+77322DD2E184,
+77B40902B6D9,
+77C0AC14972D,
+77C1CE0E7674,
+77D7B7E2C8BA,
+78279397A68E,
+7836593AB838,
+783859EB51A6,
+78CCDB50C193,
+7932684154AE,
+79604362370E,
+796630ED27B3,
+799E4E270953,
+79A00573947A,
+79B798D66B01,
+7A0455D0A7EC,
+7A33D19B7248,
+7B0A8AE18817,
+7B0BA045AB35,
+7B0DE8504D57,
+7B21781EC649,
+7B7224C1AB79,
+7B90C2BA9B23,
+7BB90D382672,
+7BBC9DC92836,
+7C09DC408C47,
+7C418B493454,
+7C491D518242,
+7C7A86CC727C,
+7CE836EBD228,
+7D49042C530D,
+7E5744EC286C,
+7E680A48C383,
+7EC45CCEC35A,
+7EDADA19EB57,
+8005BD088847,
+8022E705B640,
+8031E3565825,
+80499BAA5959,
+807466CCBAB5,
+810518578380,
+810D24CB13CC,
+812B02C34A64,
+8163A5DDE1CD,
+8186CE2B363E,
+81DE6062B9D7,
+822017D8929A,
+8247C78188C5,
+8270D538D5E8,
+82D8E8DDE296,
+831207CA6E8A,
+83378A077357,
+83A05B477535,
+840160379EEE,
+84044BAB78A7,
+84366C6D7781,
+8442CC9AA777,
+8470AAD30447,
+8498740493BB,
+84A35A698E93,
+84ABDE484425,
+84B24DBB9A67,
+84B723B2A237,
+852BEB133D74,
+854501E98239,
+854A0ED2E77D,
+85A066D39785,
+8619557091AA,
+86228C3742A4,
+8637BB3BA795,
+8642D9310B46,
+86538085966D,
+86EE9C410811,
+870A042C1B34,
+873B47C457E6,
+873CE44DDC6B,
+874D123262E7,
+87513C960770,
+877641436923,
+878A091B74B7,
+87927467808B,
+88C2E39B5990,
+88D252AC1A8A,
+891EDA20BDEA,
+89267DEE07ED,
+892CB89ACCC6,
+8A2423E9D100,
+8A6BC2E3811B,
+8A8EB5771EE9,
+8A906B4B3211,
+8AB21B524C5C,
+8AB823BDC2AE,
+8AC3B2ADE77B,
+8AC4317D049B,
+8ACD6B86EC44,
+8AD966CA3B4D,
+8B0A3B3DCDD4,
+8B1B6C705C1A,
+8B1C75E27153,
+8B2A5E0332A1,
+8B6216E412DB,
+8B7CCA9DB004,
+8B9999AE9703,
+8BABAD9A65C6,
+8C32D0AE3DB7,
+8C99807368A5,
+8CC1133D7D5B,
+8CD2C872187A,
+8D0563B86DD4,
+8D43D81E37B4,
+8D96A800B21A,
+8D97B475C957,
+8DA62EC0C524,
+8DACA1BC0636,
+8DE3B131D728,
+8E55316D3B3D,
+8EE497C9A869,
+90210DDAB57D,
+9026977EB8A6,
+903AA4305025,
+9083158A49A1,
+9092D12E7967,
+90D8713352D1,
+911E097A27A9,
+9140EC087241,
+918A67D05479,
+919B1D357E91,
+9210BBA2AB26,
+9224B6555E30,
+9226D4D1236A,
+922E7955CC67,
+929CC86B1B26,
+929E1556110E,
+9302DEB79C5A,
+9384841B4702,
+93B4BD1CB47C,
+93D985D55712,
+940B37939AC6,
+94673AE73823,
+947A8147E0AE,
+94CD6A4B6391,
+94CEEAC5A8D7,
+95ABD3A7C631,
+95E1C233EDE2,
+9607AE17AD09,
+960C98566E52,
+96435BD1D29B,
+965D66E19245,
+965D72659982,
+9695167B4149,
+96D0C3996714,
+97274C21BD6C,
+973186B345BB,
+973A28C983A3,
+979686C51AB6,
+97992CE2DD31,
+97E9D0C89DA8,
+97EB8A44C49D,
+98314DC363C5,
+9860DC044565,
+988D023C15A5,
+9917BDA7B4D7,
+9996A233442A,
+9A2132B5B625,
+9A694755A978,
+9A7911ECC275,
+9AA1E6CE588C,
+9ABCCD2AE7C7,
+9B39A60D3841,
+9C0630361CC5,
+9C4E19AB64B1,
+9CE96BADE4D8,
+9D442B28BD11,
+9D4C35AE1A08,
+9E02910C691A,
+9E46407C9024,
+9E74D104ACEA,
+9EDD416A7912,
+A026642D13AD,
+A12908B38536,
+A16EE9666D5A,
+A199132A4043,
+A1AEC2B58BBA,
+A1BE42A15EDE,
+A1D0844C2C63,
+A1E0103A1879,
+A253602B9445,
+A2B019B46CB9,
+A2BBCC3B546C,
+A2C325A73A9C,
+A2CB60E815A0,
+A314B97C1A6A,
+A3647146C335,
+A3A580799BB4,
+A3D30CC8EB97,
+A402B5137D86,
+A42158CC74B5,
+A435DD64AD17,
+A4693D21013B,
+A479A91EED49,
+A4B30D146A01,
+A5142D626200,
+A54056E87CBB,
+A57DBD287491,
+A588C918E327,
+A593071D4758,
+A5CC0EE7B9E3,
+A6375E98A5B5,
+A666347B3B4B,
+A6A203994202,
+A6BAE1A1520D,
+A6E9885AA49D,
+A705087E89A8,
+A7072D4324C7,
+A745AD7D6789,
+A750456E7C5E,
+A783A8774651,
+A787C822020C,
+A78BB575EAC5,
+A7905680A254,
+A805534D84E9,
+A86C2595A1C3,
+A89903B6ADDB,
+A9182707A219,
+A9391782A846,
+A96B08E3A50B,
+A98DEB0733C9,
+A9C37CE71D23,
+AA2D69C757D9,
+AA4E4558A9EE,
+AA6C835C9124,
+AAC0C35C43EB,
+AB30CB2CB354,
+AB6191DB240A,
+AB8953D3560C,
+ABBB521319E6,
+AC47461358D7,
+AC58C25A1559,
+AC7D4B201D92,
+AD061A23287D,
+AD105D52DB36,
+AD4EA84D7185,
+AD5038D15490,
+AD97523144B2,
+ADB24E78784B,
+ADCBD453B232,
+AE516A187825,
+AE52116C234C,
+AE817239CAB5,
+AEA5A5A0E46B,
+AECC93678543,
+B0452769A83C,
+B04D71906C60,
+B0805C191424,
+B09172DDBE43,
+B13AE369390C,
+B14080E570D1,
+B1419B62772C,
+B14775DEA2E2,
+B188BA649EA1,
+B1BB0DB95C67,
+B1BB19BDD424,
+B1E8B5054DAD,
+B1EBB537CC0D,
+B2174092CDC5,
+B2554CC8AD6E,
+B2C5A2E88304,
+B312E56ED250,
+B37B48D8C1C5,
+B39C699CD208,
+B3B121208E34,
+B3C3C6E4395B,
+B410B958C3B8,
+B4204546A74E,
+B45171C5A67D,
+B4B103E693ED,
+B4DACABCAB07,
+B506567A2B84,
+B51083D5C2BD,
+B54D7674CB90,
+B570E5EA1DA3,
+B598984AD584,
+B5D7E1135821,
+B60D053A36D9,
+B63957593E23,
+B64558CAC0C9,
+B68175BCA864,
+B6CD1A3EC5BC,
+B72468A7710D,
+B75176C82A8B,
+B7AA0CA5D94A,
+B7B9D7E523B8,
+B808D87AB75C,
+B93A6432E51A,
+B941A9D99B6C,
+B9DA40920237,
+BA6C2E10086A,
+BA7384AB949E,
+BA8DEEE045E8,
+BADC2149EC42,
+BB1924266B36,
+BB41640E6340,
+BBB475DB2B03,
+BBD4C4699719,
+BC0B2C897267,
+BC7BEE6B71C4,
+BC8B21AD8802,
+BCA2D8118631,
+BCB7A7006400,
+BCBC6637499B,
+BCBD2B8BE4B3,
+BD213E28C568,
+BD32E4EC7080,
+BD401D63C3E9,
+BD463C3693A4,
+BD749E85586A,
+BD7CA11B9551,
+BD96355CBE36,
+BD9E6EB7B524,
+BDADE6111218,
+BDB576D1E88C,
+BDB5DC09C522,
+BE19C75D6B7E,
+BE5B3ED935AC,
+BEA20C972E70,
+BEEB4A159B37,
+C01E8740DE38,
+C0411C28857D,
+C045544AD1E4,
+C04660B76831,
+C0C4CA21B876,
+C0E0E092C8B4,
+C0EE394D3D95,
+C14601C6B411,
+C16EBAE928B2,
+C189A791A85B,
+C1ACDB8C1890,
+C1C55A7A99EA,
+C1D72A47755A,
+C1D8B91D65AA,
+C1E6149B386D,
+C22D8E2B1E37,
+C23E999B6298,
+C314E31A670D,
+C3D275A9B8C7,
+C3EE19B61C89,
+C427B93DC2ED,
+C443EEC4330D,
+C477B966D328,
+C4C6CAE4784C,
+C55875BCB82C,
+C581CA998910,
+C5ABC0A455C5,
+C5BE33E6B1E2,
+C629E0D34581,
+C65194543D6B,
+C67B8E869D90,
+C6BC3B9CCB41,
+C7034BC581A6,
+C748500B6947,
+C757C15E9E0D,
+C798A8465ACB,
+C7B6702AC17B,
+C849133B7CCC,
+C870C98A4E91,
+C90B7AD266D3,
+C90D996C3A2D,
+C953797CCE61,
+C9639352EEC8,
+C983685AA86B,
+C9CCA6D095A3,
+C9CE81D47EDB,
+C9D449AD9970,
+CA0D9CCC4C38,
+CA277AC09859,
+CA56EB045188,
+CAB92B865BAD,
+CAE8572C2657,
+CB1CE185575C,
+CB2ECC3D9C22,
+CB642A081A89,
+CBBAD2DA0EC5,
+CC1B5BD45315,
+CC2C02300D34,
+CC559969D0CC,
+CC5646BD7AEB,
+CC6A93BD93D1,
+CC726DD08765,
+CCBBAB6504A4,
+CCC1EA3E27B8,
+CD16EAB946E9,
+CDB4EEE02E14,
+CDC21E1E1EC7,
+CE09B3870EA2,
+CE5AA0C8B5A8,
+CE63DE29E069,
+D0368B24CA49,
+D0489010A72C,
+D075379A21A6,
+D09893B4EE04,
+D0A7A2787570,
+D0B8C06C02E4,
+D106E94A4C3B,
+D11E7D1BBEEA,
+D12B25B8DDE2,
+D1972D6CE2C3,
+D1B91D224946,
+D2752E53679D,
+D35B2B75CC52,
+D40E935117A2,
+D4C37528DC05,
+D4C818A5455E,
+D4CD56DB8AEB,
+D5190BD5CED6,
+D55E5AA3406D,
+D576E9D856D9,
+D5E444E9D82D,
+D61A3231790D,
+D669B3AE1E11,
+D6C075899D06,
+D6C3503456C4,
+D7AC70A05A0C,
+D80A37B6D7ED,
+D82E6938C58C,
+D85E51344EB6,
+D8809EB9BA7D,
+D8913C2D48E9,
+D9109460D912,
+D94E36427E20,
+D97E55B1816A,
+D99425130C1A,
+D99C3222A190,
+D9A207103ED7,
+D9C70CC5818A,
+DA3379D12773,
+DA705702248C,
+DA818C56CE43,
+DAE1888DCC0B,
+DBA0A2DCA8E0,
+DBD9799E15B1,
+DC242193D7E3,
+DCB5AC62946C,
+DCB75AEC61A0,
+DD6E0587A821,
+DD7B1A7C6A82,
+DDA22A189095,
+DDDAE53AA711,
+DDE7304E78B6,
+DE1B4DA681B9,
+DEAC67E2D7C1,
+DEB7D7E4C62B,
+E127434AB3B7,
+E1ACC6742AB7,
+E1E59574ADBC,
+E1EA6BAA03D9,
+E222553A59A2,
+E2230B8E84C9,
+E33E807EC3BA,
+E341574B2E32,
+E42868808B70,
+E43562C624B0,
+E43D54DC3511,
+E466090D2123,
+E47069DA0C44,
+E49DD6062901,
+E4ACA0ADBA0D,
+E4B976AD6687,
+E526BB7888DB,
+E53354B71B10,
+E57581CE8617,
+E61A1DA5A60E,
+E6293BDA5EDC,
+E64C2A07CA9B,
+E6600C4D6A44,
+E6655B6425DC,
+E6BADC631036,
+E70143BE0091,
+E75E07A010D1,
+E76962E3B8B4,
+E8028A6DCC90,
+E80C5E3E8227,
+E8779E40450E,
+E8A9E2D87D36,
+E8B5A0BDD993,
+E933DA9735C4,
+E93A2E63189D,
+E9447637E40D,
+E94836269887,
+E94D82A564BA,
+E98DC3B561B5,
+E9EB2DE57AE9,
+EA490920877D,
+EA4C494C9353,
+EA9B1695DD91,
+EAD0E31A6834,
+EB16B6462B66,
+EB276C9AB68D,
+EB3C9732C3BA,
+EB44DDC408CE,
+EB8536C958B2,
+EBC825C186B3,
+EC1A55BB58EB,
+EC2B12107313,
+EC8CB5758097,
+ECD4C42EA3D1,
+ED22B7115435,
+ED2CE17A590C,
+ED65A9B6469C,
+ED6748113E0D,
+ED8CEB8B7102,
+EDCE0890472D,
+EDD4A2EA7493,
+EE17C426D25E,
+EE487A4C806E,
+EE5931913A8D,
+EED56840AEBA,
diff --git a/client/dictionaries/icbpm_sort_keys.dic b/client/dictionaries/icbpm_sort_keys.dic
new file mode 100644
index 000000000..b4a635d44
--- /dev/null
+++ b/client/dictionaries/icbpm_sort_keys.dic
@@ -0,0 +1,1001 @@
+
+00383D96411D,
+005307DB7853,
+009A4C4C6C49,
+00C447B8A2D2,
+01124119AB54,
+0117BAE4D8D9,
+018861488381,
+0267B4922681,
+02974B9786C9,
+02A46AC9233A,
+02BED876BD48,
+02D8A7729ED3,
+02EB32B92D30,
+03C34821DE9A,
+03D87397E9A8,
+042CDEE5D0BA,
+044ED79417E1,
+04524659496E,
+04602A40C037,
+048451A79DA1,
+0490AD0C9283,
+04E16965C142,
+05138E278443,
+052B99EC186E,
+056D4B5D2915,
+0578E317C419,
+05865124E5CA,
+0599E014139E,
+05DB68DB9364,
+066C127C208D,
+06966B31A285,
+06B577E0E480,
+071B57D258CE,
+072B300309C9,
+0759955331EE,
+0769855EEC13,
+079B8DA54DB1,
+082B68A67491,
+0832E4783600,
+08506533E741,
+0853A982D793,
+08629D1DD0D6,
+087C0CDA3B46,
+08AE4ECD7CE3,
+0965220D2ECE,
+09A14A80754E,
+09ACEA48DD0D,
+09DB8EE5458C,
+09E6CB76C080,
+0A44A754B592,
+0A7328887DC2,
+0A906663EE1C,
+0AB08938E3DA,
+0AD8AD0739A6,
+0B00220EAE75,
+0B1960681E79,
+0B31815E6A7C,
+0B3690D4B122,
+0BB8414CB6EA,
+0BEC525E3463,
+0C296648344D,
+0CB6CC83AC45,
+0CCAD03DDBC6,
+0D6C26AB25CD,
+0DC9143735D1,
+0DE8A36CBBCC,
+0E175033BD77,
+0E6478123917,
+0E7D4AC83133,
+0E8420B04083,
+0EA607E1C4E3,
+105743704432,
+107A6AB6B305,
+110BB6D5539D,
+1114A47CC39A,
+116AA873ACC8,
+120616C6208E,
+120C83C06317,
+12343D71106C,
+123A082E2AEA,
+12E50BE60524,
+133DC845505E,
+138153A4351A,
+1395C108B6B6,
+1428C04BAAD1,
+147D93848C70,
+14A353C60820,
+1504C1846399,
+1523A1E39D03,
+1532A2511A8B,
+157308368E8E,
+16065CC411E0,
+1637D8ACA71E,
+1639134699C7,
+167358BB268E,
+168DE72B3B5A,
+16A05D5C31C3,
+16B4442EAE97,
+17197B247A4A,
+1774DB1A8CA1,
+17820DAA47B2,
+1782BEDBD347,
+17B561AA82B4,
+17C548CBC3A6,
+17DA5C873BC5,
+18025130661E,
+184B95B4E3C6,
+18A3196D364B,
+18A97BD26818,
+18BE810A83DD,
+18C3AC2A7E90,
+194D4E1DE89D,
+196E279BE9A9,
+1A2C8D855336,
+1A3A76ED470A,
+1A55D4849951,
+1A9872D00EC9,
+1ACD5433BBDD,
+1ADC527D5BDA,
+1AE29C8CD672,
+1B14CAC3D0C2,
+1B20A6E1D06B,
+1B30A7825B23,
+1B3E45AEE657,
+1B75E7B007DB,
+1B9DABDEBAE0,
+1BAB19D01495,
+1BD3119E0363,
+1BDA0D87A575,
+1CD38D77090B,
+1D12BBB575B1,
+1E1A0DB8729C,
+1E2DE60A477A,
+1E3C71643766,
+1E6ED46CE258,
+1EE60A4A8D22,
+200D45263629,
+2013899194BB,
+206CE78E0C6C,
+20B51C977E54,
+2142B57D369D,
+2172D827D3E2,
+2178ED80D581,
+21B4BE97AE07,
+21B91A26133A,
+21C7650673CD,
+220D815D366A,
+22C2176E1CD6,
+22C3AB41B123,
+233D7B324CEE,
+2340CBD61A71,
+2348251AD23E,
+2381B8214025,
+23BAE8DA1AC5,
+23C317B8D6DA,
+243A41574A39,
+248EA5E91987,
+2491457885A7,
+255A9E590BCC,
+257192699E32,
+25892216C620,
+2595E5B1DE76,
+25AE69DED1B4,
+25BA8775B3C4,
+25D967D4DD35,
+25DB996D56ED,
+25EE21CDE4B9,
+2625E408276B,
+26B744C673DB,
+26C6D38B8257,
+26D787613684,
+27689527E201,
+27743B5A5736,
+27D1635ED1B3,
+27D5B8D2642E,
+28035CA5B300,
+2812EB6A427C,
+28133B46730A,
+281499DD16A0,
+281DD9E6C98E,
+2870E08CEDBA,
+28B8685B1B22,
+28C3D17E4DEC,
+2953C63E9E58,
+295D3C9A8B28,
+297B74853CAA,
+29ACACC2828E,
+29EA97BC4A6B,
+29EB3CA1C0DE,
+2A079CC2AD37,
+2A27E0602400,
+2A45A0D8D6EE,
+2A47CDD3A322,
+2A4C4DB1D71D,
+2AA82B4B6711,
+2ABD68BDC5A3,
+2AE7BDB10CB4,
+2B051C90BE82,
+2B490231E063,
+2BAB94372644,
+2C03252C10E7,
+2C3EE5E98804,
+2CB671E6365D,
+2CC55B46705B,
+2CD09D3C0A1B,
+2CECBC323E31,
+2D302827C9B4,
+2D716C9C467B,
+2D8856109732,
+2E15681A4355,
+2E79209B9519,
+2EEE063290C1,
+301C9AA3DECA,
+30C520D6A2B9,
+30D6324910AB,
+3113AADC9D6B,
+3124ACA5491C,
+315AD0D6E6D2,
+31A16DAC864D,
+31EC44581294,
+32DE3CD81C24,
+32E532232C29,
+33256E443128,
+33293485AD61,
+33305B0365AA,
+3343B72BAA71,
+3372C9C5D4AE,
+33754E0D1687,
+33A444334869,
+33B54345C32E,
+34002AAEE45D,
+343C556CEE59,
+3444DDE6D7E5,
+345B62452538,
+3495A04A9270,
+34EB673C863B,
+35123500C1EA,
+353A7167576B,
+3599856810B2,
+35E7DE9899EE,
+35EDABB506D8,
+36C54912D10E,
+36CA0101B6DC,
+36D268442846,
+373E5827E0B8,
+376D6C446746,
+37E2EAE635B5,
+381B0A70E135,
+3862B259DC71,
+386676C44A13,
+3905679DEEC4,
+39070618BB17,
+394181105544,
+395D38815892,
+39A00E856381,
+39C0E2ED99B5,
+3A1E82E2CDB7,
+3A5D13E05B6A,
+3A6DE2081CDD,
+3A8498924010,
+3A9D49E8BEB2,
+3AD0EE1031A9,
+3B052E65D40A,
+3B4986981212,
+3B4C51ACC53D,
+3B99486097C6,
+3BB36BC22CE4,
+3BB4B3025B79,
+3BBB7BD8D7B7,
+3C09C971D835,
+3C4A12E7A107,
+3C633B3474DD,
+3CB9E31D6022,
+3CD344A7EB21,
+3CD8C6705954,
+3CE887B9D091,
+3D5EA1C71953,
+3D89120EB993,
+3D9C3245AE76,
+3DED9D496478,
+3E0913A96E74,
+3E34909990B5,
+3E7DD7953DDD,
+3EEB33434C1A,
+4015D16B5C1C,
+401C81A72C56,
+40E7B8D60242,
+41016C0CB8DE,
+4124864B0D40,
+415BAA0CAB15,
+418184DBB4A0,
+419513740558,
+4195EE7238CC,
+41B727883B27,
+41BC44A8C3C6,
+41DDC3A48EEA,
+420445087613,
+42068108DE36,
+4245921D73CA,
+42A959953C45,
+430E67734C18,
+4314D9D03B95,
+43166BCA83EB,
+43400A093A7E,
+434CE764DE91,
+43595AC786EE,
+438099331C1E,
+43814087A7B5,
+438C3CD95B58,
+43B3E895B281,
+44074C461042,
+444D37149B20,
+44A04DAA30CB,
+4537282554C5,
+4584EACB6087,
+45DB3799C150,
+45E599AE38EA,
+462305611C4A,
+4636195CDA2D,
+46752993E2E9,
+4684316440D6,
+46C7246C1958,
+4751A5274848,
+4761E34CB054,
+476388408D8E,
+478947735B45,
+47AD81972D5B,
+47C23398EA52,
+47E9D4D4BE35,
+4812AEC4B01A,
+48276645A4EA,
+48644467A214,
+489C783B3514,
+48C860AA4B74,
+495C6639575B,
+49681C20A00D,
+49E8249DD677,
+49E93C110AA1,
+4A24470C19C5,
+4A4755BC4A2A,
+4A4D5E3A9011,
+4A65D627625C,
+4A6B36C5BCCC,
+4AB725ED89B5,
+4B39E3923D0D,
+4B59316C10E0,
+4C275C8BB2DA,
+4C2E9455D296,
+4C44DB1D0C3A,
+4C67059B0006,
+4CA30E1A298A,
+4CA74DAC7C01,
+4CB212D72D57,
+4CD3B228EBB4,
+4CE1972E090C,
+4CEE1794E0EA,
+4D06DBCA167E,
+4D2CC85EB338,
+4D40BC7A44DB,
+4D769DA515D3,
+4D79C95DAD2D,
+4DBAC8ECE167,
+4E3CB839E87D,
+4E3D548E1267,
+4E8250E29617,
+4E94C7962769,
+5038884E4178,
+505B5A8EB20A,
+50642C36DA00,
+5083664D8C09,
+50B77DA96DE2,
+511E269A9BAE,
+51798AEAAE9E,
+51ED5833AB6D,
+525335E4CD34,
+5261CDDA279E,
+526E55542A54,
+529C16A720AB,
+52A230B1C50E,
+52AADA374811,
+52D20D6E3E35,
+534BB4A6984E,
+5352CCC3DCD2,
+540B15E8019D,
+54AA2915E815,
+558DB8891A90,
+55A691710B48,
+55D1E91B1D35,
+55D95774E9A0,
+563C6B96D59D,
+567032E13B54,
+56741B108D22,
+57029D991123,
+5714E9D33034,
+5734CD8A65DA,
+5785EE00049E,
+57B8B111491D,
+57CC9D0AA32B,
+57D7D4D746DA,
+583C936DCB4B,
+586B470A43B3,
+5876E1D34183,
+58B6AE62DB88,
+58C35C8BC9AB,
+597E98000ED4,
+59DB4DBB5D7A,
+5A150653E624,
+5A211CE57C4B,
+5A6272CDBE9C,
+5ACB8043C10C,
+5B41CEBC2213,
+5B59BCC4321E,
+5BA03479BB8C,
+5BC64C42281C,
+5C9B1A8E31CD,
+5C9BD0AC1DB1,
+5D223E990AD8,
+5D8C3A5C5761,
+5DA57EACA38C,
+5E41DD5D1154,
+5E6ABB51EC75,
+5E7CC04C3A58,
+5E810C48C8D8,
+5E8943D9A836,
+5ED616273468,
+60100DD0E023,
+6033A1C0E431,
+6088A566CC60,
+60B20ADA0471,
+60B8411D876E,
+60C742D8D9C0,
+6135433CC5EA,
+6153ADD80A15,
+61718ED2C94D,
+6175241B035A,
+61780BCB0C57,
+61B701698050,
+61C4E56629A3,
+61D59C284952,
+61E57B490A55,
+622E5E0812D7,
+6251CE7E547A,
+62953A89B137,
+62D6EAA06CD6,
+630228659A47,
+632931BE8EC7,
+63539BB89DEE,
+636CB69BB10C,
+63783393E20D,
+639DB16995B7,
+63AA2A5B076C,
+63B636458E94,
+6443E64DCC4B,
+64695084C575,
+6493D06D5710,
+649B302A97C5,
+64B8632B54D4,
+654BACB21C3B,
+65A3D5823819,
+65DEDABD1B34,
+6608944EE186,
+665B8B24C20D,
+6685D0BE19E0,
+66933A9E7982,
+674C7BB59A16,
+675E35EE359E,
+67AA98E362C9,
+67D47C1B6425,
+67DE22850162,
+67E8B986B2A7,
+681EA28BA6CD,
+6828B52B6507,
+6874E54471E8,
+6879B1CA44A3,
+68C00A810D41,
+68C9E8AA5C3E,
+697A8ED07418,
+69B5357A617A,
+6A7B3A7B6735,
+6AA40421D23C,
+6AB676B4DB9D,
+6B00420BE41C,
+6B0B7B967871,
+6B9D041136B4,
+6BB1A14768A8,
+6BCAE24D9700,
+6C0458728774,
+6C57CBD51995,
+6C5E10B86CDE,
+6CA491A8C7B8,
+6CBC25C1DA2E,
+6CD430D99958,
+6CEC27647CC0,
+6D4D29CEB9B5,
+6D6E9A6B725D,
+6D801AC74572,
+6D97408C6D60,
+6DDE6E871C64,
+6DEA848B6195,
+6E05B5C44A54,
+6E751666AE9A,
+6E7DBCDA05B3,
+7004BA1763ED,
+7016ECD01559,
+7076D48D5E49,
+7091621EA016,
+709311997549,
+70984C14D3DB,
+70D73BE22CDD,
+70D9461C5E90,
+712BC18422CB,
+712E6CAA74A4,
+7164042BA89E,
+7175E14A4D62,
+718B39561350,
+718BDA352E28,
+719B1418323E,
+71A8D54D82B3,
+71DC30168C27,
+7221E016597B,
+7234CC6BD65D,
+727A80DD5296,
+72B393D6E8A9,
+732C9BE4DDBA,
+736B4A835B2B,
+73EA81968900,
+740AB5126199,
+741A31054E6B,
+74498C1D4B3D,
+745276053CB6,
+74684B0B4B1D,
+74772915E24C,
+74A24BE33BE2,
+74A778236D5A,
+74AA58008A31,
+74C27A96CB3A,
+754AD5773746,
+756C15E54212,
+759403A563D8,
+759D2130312B,
+75A0E10D8C84,
+75A807E46B96,
+75E454785C6C,
+76078A25C088,
+76140285B768,
+763D835BD5ED,
+767C33468C72,
+76962C07EC9E,
+76984E62CCE4,
+769AE4646931,
+76E5DA67A1EC,
+7708D5CAD58B,
+77383BAA4D90,
+7789E646A556,
+779A248E098C,
+77DB71037644,
+77E0A57DD456,
+7853D464E2A4,
+78EA6EB04463,
+7909427EC8B9,
+7910A31ECD19,
+79271963B6E8,
+793D98517D33,
+79B7A4C58DE0,
+79B9148761B3,
+7A2893B75AD1,
+7A4C61A1B48D,
+7A7469B69C6A,
+7AA84B1A527D,
+7B00211CA416,
+7B118EABC7BB,
+7B1D9A2E22AA,
+7B583D350740,
+7B9D3A6BD061,
+7C2DAC2CC775,
+7C4CBBD2DDE1,
+7CD52B5B8E77,
+7D412100532B,
+7D46C149DAD9,
+7D4CA630E229,
+7DAC0E83D335,
+7DC935E220A0,
+7DCA66BACA13,
+7E30778792D2,
+7E43C3BAB3CB,
+7E475BA186E6,
+7EE2A624851A,
+80CED5362B2C,
+80D2CC78E10B,
+80D62251E20C,
+816875D55ED1,
+81950D0517AC,
+81B519418C3E,
+8211571B9D16,
+823C7CC6E06A,
+826DD63B9032,
+827303C574B5,
+82C5ADED4B81,
+82E344329D34,
+83588E140165,
+835D33B48113,
+8384148AE52D,
+8394B57153D6,
+83A0184757C0,
+83D86835B48B,
+8502EE9A7E85,
+852C2B72659D,
+8534A6CE0911,
+85ABD94CD7A9,
+85DA8099CD7E,
+85E0B6B26945,
+864CA2A6BE93,
+868A33A44447,
+86EDEABCC357,
+87DDD5A188EE,
+8830379B50B7,
+883803A3360C,
+883DA78EC87D,
+88482A12C2C6,
+888EBD3DB945,
+88D026793359,
+88DD4B7C5991,
+8931DC3733D4,
+894D8E2DCDEE,
+897B845C2680,
+89B638BD909E,
+89D2C28BE578,
+8A1869848D1A,
+8A39D09508C9,
+8ACCC7290C8C,
+8AD8B41EC218,
+8B028B7E6D60,
+8B6A95C7D2E2,
+8BA1226EBA21,
+8BD586B21ABC,
+8C0EA504B635,
+8CA939DC6DE4,
+8CAE5D688443,
+8CEC639E64DC,
+8DECE0DD29DE,
+8E0EC762E883,
+8E958D8B8C52,
+8EB64D710C88,
+8ED4A17717D9,
+8EE9D9C03A0D,
+9014E1430AEB,
+90965DEBC8B9,
+90E56E616DDD,
+912CD8E04437,
+912E33563E1B,
+918048032247,
+919402EC39CB,
+91D28E2B126D,
+9216EEE5B677,
+9232215296B2,
+925A070E9096,
+925A5521D48D,
+92CC200886A2,
+932035869655,
+937144459949,
+93B260DBC70A,
+94552B863E37,
+95327A0A3600,
+954275CDD7E0,
+957E6EE3EB55,
+95B920CACC84,
+96382E1C8E12,
+964E8E5338BD,
+96706C8D6ECC,
+96759A0D5566,
+96D5213C5DDB,
+97300764797A,
+973BDDBE7434,
+974838AE17A0,
+9752A6B316D5,
+97926543783B,
+97EB373096CA,
+982D6054B83D,
+989D127BD496,
+98A54AD58A43,
+98A92128364C,
+98CD5AA2A4DB,
+98E8C543688E,
+99207A00AA4A,
+99243E754CB8,
+9925893ABAC7,
+9937553A965E,
+9976E6ADE0C9,
+9982E3E6A4A0,
+9984C1A3229E,
+99C487AB85EC,
+99E2A19C9673,
+9A05EBE41D7D,
+9A138D1A5CB7,
+9A179148B824,
+9A6EC0A9ECB8,
+9A720CBD7BB1,
+9AB22BBDDD87,
+9AC43B5A06D8,
+9AD8150BE648,
+9AD97423190D,
+9B4ADDDEB749,
+9B7603341727,
+9C45237377BE,
+9D090AE1A15E,
+9D59641E40A5,
+9DA4528CEB8C,
+9DA728164176,
+9DAC62A346B7,
+9E0E9D983B9A,
+9E5271763D3D,
+9EE95586D024,
+9EEE39E00CBB,
+A04671256EE2,
+A091485B4B5D,
+A1B5577ED36E,
+A1EB280E3901,
+A2789E1DD888,
+A293A90AE72C,
+A309E3AEBDB9,
+A3196E77B072,
+A31E72DCC826,
+A34DEA01690E,
+A36031D6ECB2,
+A38044A3E18E,
+A421D7A04C4B,
+A424C686CA39,
+A44590A779A5,
+A47AD3895C63,
+A5041E8B8E22,
+A50DC0830AA5,
+A52B8929D665,
+A5BCBA6BE592,
+A61D5137E6B3,
+A6344C0418DC,
+A690A817B9D9,
+A7E3B3459240,
+A81E6D3C8E11,
+A8C0BE436685,
+A8DE205120A8,
+A91E2BE6C308,
+A9258D6B06B5,
+A992B5E070C1,
+AAC6E3205D48,
+AB101546634E,
+AB6EE0761ACA,
+AB9BCA200547,
+AC4BC5B2D3C0,
+AC7A0B47B03E,
+AC88B26AC1D0,
+ACAEB3456AD9,
+ACB906631D8A,
+ACE07B45C0C5,
+AD1992AE37CA,
+AD5586744A60,
+AD674E4ADB79,
+ADA093B06831,
+AE7C3AE5334A,
+AE9EB8CAB2C3,
+AEAE9E5CE65D,
+B002D1BDC29B,
+B0463E703098,
+B063B209BB20,
+B0788BE3BAA4,
+B0C3B3299090,
+B128298D9073,
+B160677E7035,
+B19D3D57176A,
+B1CCDB7999B9,
+B231AA398B90,
+B250E9590215,
+B28BE0D819ED,
+B292C9554CBA,
+B2D8485C2460,
+B31763D9D0DE,
+B328014DDD6A,
+B378C424C9E2,
+B3D8C03C78E0,
+B41D18E3B980,
+B46824B972E9,
+B50383A32302,
+B509D631967C,
+B56CA847A7C3,
+B56EC9A20D28,
+B5B763215C82,
+B6550EAC573A,
+B66060201705,
+B6614EBEAAA2,
+B6A18CBD4DA6,
+B6ABB62E437E,
+B6C6558E58CA,
+B7009204D512,
+B71D5B22B1C2,
+B7392DD1E497,
+B7709ED7CE60,
+B7A26320A491,
+B7A9DA22E9C6,
+B7DEC863369D,
+B7E9A91174CB,
+B8178A34E2DC,
+B83092098A7D,
+B84C50E56DEC,
+B89BD135E935,
+B8E87380D361,
+B9485A9648C6,
+B9ED829C22AE,
+BA227EE91818,
+BA7BBD9683B1,
+BA8224EA7A80,
+BA84C974B356,
+BAD293A45C8A,
+BB850C7E4934,
+BBC1256810A4,
+BC1CD369549E,
+BC5C76E5909C,
+BC66E9270049,
+BC6AB08B03CC,
+BC74CA2C2B06,
+BC7C64828C1D,
+BCCC3A719013,
+BD06E96EB7D7,
+BD196D0A74E0,
+BE02790E84AC,
+BE1266314B9D,
+BE518C742B74,
+BE5695316117,
+BE5D8EBA120D,
+BE8286DA7D12,
+BE9CE00EE4DD,
+C003962B3462,
+C0067E095049,
+C015A21E0146,
+C03BC03AD437,
+C06CE7D57A0D,
+C07EE1E10B56,
+C0885A29251E,
+C198163ABECE,
+C1EB7337A035,
+C225479C7064,
+C2740E1665A8,
+C27924128A00,
+C2A701656B8B,
+C2C30D21C53E,
+C2CBB2ACD38D,
+C38D19A9C8D1,
+C3B1BB7E7492,
+C3BA2438A981,
+C3CD74758DE2,
+C4033B3BB1D7,
+C404D280640E,
+C4467DE80B2D,
+C46A048C88DD,
+C52877867C05,
+C56D005E258E,
+C56D052D5533,
+C5BB2CCCB9C3,
+C5C272694A1E,
+C6121BC4A29C,
+C65EEAE02433,
+C661C4AE1DD1,
+C76C94B495CA,
+C7BD49777A79,
+C7CD131E9B60,
+C7E35D6294BA,
+C8E173DB04CC,
+C95855AE08E8,
+C98147E69033,
+C99A004E6133,
+C9E893C4090B,
+CA119C79A197,
+CA309D2CBC41,
+CA4BAA390BC4,
+CA92DD257E21,
+CA968EBEB9C7,
+CADED0C50AC4,
+CB18774EA550,
+CB1999D19E10,
+CB75C1BAE669,
+CC2517AB2346,
+CC2AC1AD29CA,
+CD11359C7A90,
+CD14C8553CB9,
+CD333295BBE2,
+CD3DB8C27E5C,
+CDA811AD5055,
+CDABDCA23986,
+CDCA8BD7B002,
+CE0456AB0DCE,
+CE58AE1C51E9,
+CE76E8A600DC,
+CE95875316C8,
+CEB105E65289,
+CEB651752D4C,
+CEE02D97E5BD,
+D023DB35ED05,
+D0BE546CC06B,
+D0CE7EB0D379,
+D10329D366C8,
+D15C004DBC8D,
+D16E6B668254,
+D1CEEC977644,
+D1DC0E1CC09E,
+D2550925679B,
+D28B2D42DE1A,
+D2926519AC09,
+D313116A45B4,
+D3DC10453857,
+D431C8C73BDC,
+D4C67846791C,
+D5629384CE7D,
+D5ABE7180600,
+D62A4A0E57C2,
+D660CE9E3080,
+D66AE9282140,
+D6A91C14AC47,
+D6E23B4E75C6,
+D726C4979654,
+D76DE12943B4,
+D7A405AD9E4E,
+D7BD3AE48E93,
+D7D49700BBCC,
+D7E8A5089E7A,
+D84C81EE910D,
+D8545199A949,
+D86243C1380E,
+D88A12EB3622,
+D89B5EA419C1,
+D8A3690B0115,
+D94646A4C65B,
+D982B4846A96,
+DA303BADB013,
+DAD9A48A8C33,
+DAEB5D63920B,
+DB01A99DD94C,
+DB22BB7D6818,
+DB37160CBB4B,
+DB7E3687E450,
+DC7697E37A9B,
+DCC44C4E9269,
+DCCE477E785E,
+DD68DE9CDA5A,
+DE1B08C6D94B,
+DE41BBD7E68D,
+DE6E04AE4475,
+DE8CD4277A9E,
+DEA8098D6E51,
+DEB2BEE8858A,
+DEB550958AD9,
+E045E6309471,
+E0E21213C611,
+E0E457054B62,
+E1097C69DA4A,
+E1EA831EA514,
+E20716902884,
+E2C9CB14C06C,
+E33B66EA2705,
+E34C5B12BABA,
+E38A1C654E82,
+E3905BA54194,
+E3E3919444CA,
+E4450EC1010C,
+E49A03306224,
+E5100AC4C6C3,
+E5124DB665A6,
+E5491B5E3DD6,
+E5BE9C989A29,
+E5C3A9A27D3E,
+E65111EB1E40,
+E65792427D4C,
+E7004C5EA94A,
+E705087DECBB,
+E7CB93E68155,
+E81512343BAD,
+E8428C8B0740,
+E859EBC22318,
+E87267A508DB,
+E886AE7D1BE0,
+E8B008239600,
+E8C4B4A4E482,
+E8D53410B736,
+E902964DA28D,
+E9203D5BD2DA,
+E9526CACA8B2,
+E9C11D763BEC,
+EA3BDAA4E498,
+EA61AC8B4969,
+EA8E8ADC26B9,
+EB5588EAE5E8,
+EBA964C07075,
+EC71B679D3AA,
+ECB4019ADD97,
+ED14D0A14B0C,
+ED296C79266C,
+EDBA3C943EA8,
+EDC7CEBD4000,
+EDE2747DA6C3,
+EE3029556CEB,
+EE49610E6121,
+EEB704D69BCA,
+EED69A391464,
diff --git a/client/dictionaries/mrzd_sort_keys.dic b/client/dictionaries/mrzd_sort_keys.dic
new file mode 100644
index 000000000..025f1b995
--- /dev/null
+++ b/client/dictionaries/mrzd_sort_keys.dic
@@ -0,0 +1,57 @@
+010203040506,
+013940233313,
+022FE48B3072,
+123456789ABC,
+123456ABCDEF,
+17505586EF02,
+1795902DBAF9,
+1A2B3C4D5E6F,
+1A982C7E459A,
+200306202033,
+2011092119F1,
+2012053082AD,
+37D4DCA92451,
+40E5EA1EFC00,
+435330666666,
+46868F6D5677,
+474249437569,
+4D3A99C351DD,
+533CB6C723F6,
+5554AAA96321,
+587EE5F9350F,
+5A1B85FCE20A,
+5D293AFC8D7E,
+64A2EE93B12B,
+64E2283FCF5E,
+714C5C886E97,
+833FBD3CFE51,
+83BAB5ACAD62,
+872B71F9D15A,
+8F9B229047AC,
+8FD0A4F256E9,
+9AEDF9931EC1,
+9B1DD7C030A1,
+A0478CC39091,
+A0A1A2A3A4A5,
+A2B2C9D187FB,
+A4EF6C3BB692,
+AABBCC660429,
+AABBCCDDEEFF,
+ABCDEF123456,
+B0699AD03D17,
+B0B1B2B3B4B5,
+BA28CFD15EE8,
+BCFE01BCFE01,
+C0C1C2C3C4C5,
+CFC738403AB0,
+D0D1D2D3D4D5,
+D3F7D3F7D3F7,
+DB5181C92CBE,
+DFED39FFBB76,
+E1DD284379D4,
+E96246531342,
+ED3A7EFBFF56,
+F83466888612,
+F89C86B2A961,
+FFFFAE82366C,
+FFFFD06F83E3,

From bccdde01236498fa19b4b82e15b5a1a80dc6d6cb Mon Sep 17 00:00:00 2001
From: RFID Research Group <chris@rfidresearchgroup.com>
Date: Thu, 24 Jan 2019 11:49:04 +0100
Subject: [PATCH 0444/1938] Update issue templates

---
 .github/ISSUE_TEMPLATE/bug_report.md      |  3 +++
 .github/ISSUE_TEMPLATE/feature_request.md | 20 ++++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 3b04ea5f8..940722506 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,6 +1,9 @@
 ---
 name: Bug report
 about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
 
 ---
 
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 000000000..ff12e62f1
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: "[idea]"
+labels: Request, enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

From 4fe4d74bfe99dbcb57d98fa93805d7acb0c7f61e Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 25 Jan 2019 11:42:52 +0100
Subject: [PATCH 0445/1938] FIX: 'emv roca' - not executing when client is
 compiled without WITH_SMARTCARD functionality,  like for old devices see 
 https://github.com/RfidResearchGroup/proxmark3/issues/85

---
 client/emv/cmdemv.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index 91a3663f3..453d08a20 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -1599,6 +1599,14 @@ int CmdEMVRoca(const char *cmd) {
 	if (arg_get_lit(2))
 		channel = ECC_CONTACT;
 	PrintChannel(channel);
+	
+#ifndef WITH_SMARTCARD
+	// not compiled with smartcard functionality,  we need to exit
+	if ( channel == ECC_CONTACT ) {
+		PrintAndLogEx(WARNING, "PM3 Client is not compiled with support for SMARTCARD. Exiting.");
+		return 0;
+	}
+#endif	
 
 	// select card
 	uint8_t psenum = (channel == ECC_CONTACT) ? 1 : 2;

From 803aab74311d5c61c00247c2268b2a410d79e218 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 25 Jan 2019 11:58:00 +0100
Subject: [PATCH 0446/1938] FIX:  'hf legic sim' - longer timeout for writes? 
 (@drandreas) see https://github.com/RfidResearchGroup/proxmark3/issues/83

---
 armsrc/legicrf.c    | 62 ++++++++++++++++++++++-----------------------
 armsrc/legicrfsim.c |  2 +-
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/armsrc/legicrf.c b/armsrc/legicrf.c
index 00d284926..958d3421a 100644
--- a/armsrc/legicrf.c
+++ b/armsrc/legicrf.c
@@ -61,7 +61,7 @@ static inline uint8_t rx_byte_from_fpga() {
     WDT_HIT();
 
     // wait for byte be become available in rx holding register
-    if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
+    if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
       return AT91C_BASE_SSC->SSC_RHR;
     }
   }
@@ -81,7 +81,7 @@ static inline uint8_t rx_byte_from_fpga() {
 // To reduce CPU time the amplitude is approximated by using linear functions:
 //   am = MAX(ABS(i),ABS(q)) + 1/2*MIN(ABS(i),ABSq))
 //
-// Note: The SSC receiver is never synchronized the calculation my be performed
+// Note: The SSC receiver is never synchronized the calculation may be performed
 // on a i/q pair from two subsequent correlations, but does not matter.
 static inline int32_t sample_power() {
   int32_t q = (int8_t)rx_byte_from_fpga(); q = ABS(q);
@@ -100,7 +100,7 @@ static inline int32_t sample_power() {
 static inline bool rx_bit() {
   int32_t power;
 
-  for(size_t i = 0; i<5; ++i) {
+  for (size_t i = 0; i<5; ++i) {
     power = sample_power();
   }
 
@@ -120,12 +120,12 @@ static inline void tx_bit(bool bit) {
   // insert pause
   LOW(GPIO_SSC_DOUT);
   last_frame_end += RWD_TIME_PAUSE;
-  while(GET_TICKS < last_frame_end) { };
+  while (GET_TICKS < last_frame_end) { };
   HIGH(GPIO_SSC_DOUT);
 
   // return to high, wait for bit periode to end
   last_frame_end += (bit ? RWD_TIME_1 : RWD_TIME_0) - RWD_TIME_PAUSE;
-  while(GET_TICKS < last_frame_end) { };
+  while (GET_TICKS < last_frame_end) { };
 }
 
 //-----------------------------------------------------------------------------
@@ -143,13 +143,13 @@ static void tx_frame(uint32_t frame, uint8_t len) {
 
   // wait for next tx timeslot
   last_frame_end += RWD_FRAME_WAIT;
-  while(GET_TICKS < last_frame_end) { };
+  while (GET_TICKS < last_frame_end) { };
 
   // backup ts for trace log
   uint32_t last_frame_start = last_frame_end;
 
   // transmit frame, MSB first
-  for(uint8_t i = 0; i < len; ++i) {
+  for (uint8_t i = 0; i < len; ++i) {
     bool bit = (frame >> i) & 0x01;
     tx_bit(bit ^ legic_prng_get_bit());
     legic_prng_forward(1);
@@ -158,7 +158,7 @@ static void tx_frame(uint32_t frame, uint8_t len) {
   // add pause to mark end of the frame
   LOW(GPIO_SSC_DOUT);
   last_frame_end += RWD_TIME_PAUSE;
-  while(GET_TICKS < last_frame_end) { };
+  while (GET_TICKS < last_frame_end) { };
   HIGH(GPIO_SSC_DOUT);
 
   // log
@@ -173,19 +173,19 @@ static uint32_t rx_frame(uint8_t len) {
 
   // hold sampling until card is expected to respond
   last_frame_end += TAG_FRAME_WAIT;
-  while(GET_TICKS < last_frame_end) { };
+  while (GET_TICKS < last_frame_end) { };
 
   // backup ts for trace log
   uint32_t last_frame_start = last_frame_end;
 
   uint32_t frame = 0;
-  for(uint8_t i = 0; i < len; ++i) {
+  for (uint8_t i = 0; i < len; ++i) {
     frame |= (rx_bit() ^ legic_prng_get_bit()) << i;
     legic_prng_forward(1);
 
     // rx_bit runs only 95us, resync to TAG_BIT_PERIOD
     last_frame_end += TAG_BIT_PERIOD;
-    while(GET_TICKS < last_frame_end) { };
+    while (GET_TICKS < last_frame_end) { };
   }
 
   // log
@@ -203,23 +203,23 @@ static bool rx_ack() {
 
   // hold sampling until card is expected to respond
   last_frame_end += TAG_FRAME_WAIT;
-  while(GET_TICKS < last_frame_end) { };
+  while (GET_TICKS < last_frame_end) { };
 
   // backup ts for trace log
   uint32_t last_frame_start = last_frame_end;
 
   uint32_t ack = 0;
-  for(uint8_t i = 0; i < TAG_WRITE_TIMEOUT; ++i) {
+  for (uint8_t i = 0; i < TAG_WRITE_TIMEOUT; ++i) {
     // sample bit
     ack = rx_bit();
     legic_prng_forward(1);
 
     // rx_bit runs only 95us, resync to TAG_BIT_PERIOD
     last_frame_end += TAG_BIT_PERIOD;
-    while(GET_TICKS < last_frame_end) { };
+    while (GET_TICKS < last_frame_end) { };
 
     // check if it was an ACK
-    if(ack) {
+    if (ack) {
       break;
     }
   }
@@ -282,7 +282,7 @@ static void init_reader(bool clear_mem) {
 
   // reserve a cardmem, meaning we can use the tracelog function in bigbuff easier.
   legic_mem = BigBuf_get_EM_addr();
-  if(legic_mem) {
+  if (legic_mem) {
     memset(legic_mem, 0x00, LEGIC_CARD_MEMSIZE);
   }
 
@@ -309,7 +309,7 @@ static uint32_t setup_phase(uint8_t iv) {
 
   // Switch on carrier and let the card charge for 5ms.
   last_frame_end += 7500;
-  while(GET_TICKS < last_frame_end) { };
+  while (GET_TICKS < last_frame_end) { };
 
   legic_prng_init(0);
   tx_frame(iv, 7);
@@ -359,7 +359,7 @@ static int16_t read_byte(uint16_t index, uint8_t cmd_sz) {
 
   // check received against calculated crc
   uint8_t calc_crc = calc_crc4(cmd, cmd_sz, byte);
-  if(calc_crc != crc) {
+  if (calc_crc != crc) {
     Dbprintf("!!! crc mismatch: %x != %x !!!",  calc_crc, crc);
     return -1;
   }
@@ -399,15 +399,15 @@ void LegicRfInfo(void) {
 
   // establish shared secret and detect card type
   uint8_t card_type = setup_phase(0x01);
-  if(init_card(card_type, &card) != 0) {
+  if (init_card(card_type, &card) != 0) {
     cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
     goto OUT;
   }
 
   // read UID
-  for(uint8_t i = 0; i < sizeof(card.uid); ++i) {
+  for (uint8_t i = 0; i < sizeof(card.uid); ++i) {
     int16_t byte = read_byte(i, card.cmdsize);
-    if(byte == -1) {
+    if (byte == -1) {
       cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
       goto OUT;
     }
@@ -417,7 +417,7 @@ void LegicRfInfo(void) {
   // read MCC and check against UID
   int16_t mcc = read_byte(4, card.cmdsize);
   int16_t calc_mcc = CRC8Legic(card.uid, 4);;
-  if(mcc != calc_mcc) {
+  if (mcc != calc_mcc) {
     cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
     goto OUT;
   }
@@ -436,19 +436,19 @@ void LegicRfReader(uint16_t offset, uint16_t len, uint8_t iv) {
 
   // establish shared secret and detect card type
   uint8_t card_type = setup_phase(iv);
-  if(init_card(card_type, &card) != 0) {
+  if (init_card(card_type, &card) != 0) {
     cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
     goto OUT;
   }
 
   // do not read beyond card memory
-  if(len + offset > card.cardsize) {
+  if (len + offset > card.cardsize) {
     len = card.cardsize - offset;
   }
 
-  for(uint16_t i = 0; i < len; ++i) {
+  for (uint16_t i = 0; i < len; ++i) {
     int16_t byte = read_byte(offset + i, card.cmdsize);
-    if(byte == -1) {
+    if (byte == -1) {
       cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
       goto OUT;
     }
@@ -468,26 +468,26 @@ void LegicRfWriter(uint16_t offset, uint16_t len, uint8_t iv, uint8_t *data) {
   init_reader(false);
 
   // uid is not writeable
-  if(offset <= WRITE_LOWERLIMIT) {
+  if (offset <= WRITE_LOWERLIMIT) {
     cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
     goto OUT;
   }
 
   // establish shared secret and detect card type
   uint8_t card_type = setup_phase(iv);
-  if(init_card(card_type, &card) != 0) {
+  if (init_card(card_type, &card) != 0) {
     cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
     goto OUT;
   }
 
   // do not write beyond card memory
-  if(len + offset > card.cardsize) {
+  if (len + offset > card.cardsize) {
     len = card.cardsize - offset;
   }
 
   // write in reverse order, only then is DCF (decremental field) writable
-  while(len-- > 0 && !BUTTON_PRESS()) {
-    if(!write_byte(len + offset, data[len], card.addrsize)) {
+  while (len-- > 0 && !BUTTON_PRESS()) {
+    if (!write_byte(len + offset, data[len], card.addrsize)) {
       Dbprintf("operation failed | %02X | %02X | %02X", len + offset, len, data[len]);
       cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
       goto OUT;
diff --git a/armsrc/legicrfsim.c b/armsrc/legicrfsim.c
index 1816a29ca..d51747555 100644
--- a/armsrc/legicrfsim.c
+++ b/armsrc/legicrfsim.c
@@ -46,7 +46,7 @@ static uint32_t last_frame_end; /* ts of last bit of previews rx or tx frame */
 #define RWD_TIME_PAUSE        4 /* 18.9us */
 #define RWD_TIME_1           21 /* RWD_TIME_PAUSE 18.9us off + 80.2us on = 99.1us */
 #define RWD_TIME_0           13 /* RWD_TIME_PAUSE 18.9us off + 42.4us on = 61.3us */
-#define RWD_CMD_TIMEOUT      40 /* 40 * 99.1us (arbitrary value) */
+#define RWD_CMD_TIMEOUT      80 /* 80 * 99.1us (arbitrary value) */
 #define RWD_MIN_FRAME_LEN     6 /* Shortest frame is 6 bits */
 #define RWD_MAX_FRAME_LEN    23 /* Longest frame is 23 bits */
 

From 730a7e8044bb08c4df93b7b80d429581864130a3 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 25 Jan 2019 13:48:53 +0100
Subject: [PATCH 0447/1938] FIX: 'hf legic sim' - needed even more timeout. see
 https://github.com/RfidResearchGroup/proxmark3/issues/83

---
 armsrc/legicrfsim.c | 61 ++++++++++++++++++++++-----------------------
 1 file changed, 30 insertions(+), 31 deletions(-)

diff --git a/armsrc/legicrfsim.c b/armsrc/legicrfsim.c
index d51747555..86448275f 100644
--- a/armsrc/legicrfsim.c
+++ b/armsrc/legicrfsim.c
@@ -46,7 +46,7 @@ static uint32_t last_frame_end; /* ts of last bit of previews rx or tx frame */
 #define RWD_TIME_PAUSE        4 /* 18.9us */
 #define RWD_TIME_1           21 /* RWD_TIME_PAUSE 18.9us off + 80.2us on = 99.1us */
 #define RWD_TIME_0           13 /* RWD_TIME_PAUSE 18.9us off + 42.4us on = 61.3us */
-#define RWD_CMD_TIMEOUT      80 /* 80 * 99.1us (arbitrary value) */
+#define RWD_CMD_TIMEOUT     120 /* 120 * 99.1us (arbitrary value) */
 #define RWD_MIN_FRAME_LEN     6 /* Shortest frame is 6 bits */
 #define RWD_MAX_FRAME_LEN    23 /* Longest frame is 23 bits */
 
@@ -59,8 +59,8 @@ static uint32_t last_frame_end; /* ts of last bit of previews rx or tx frame */
 
 // Returns true if a pulse/pause is received within timeout
 static inline bool wait_for(bool value, const uint32_t timeout) {
-  while((bool)(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_DIN) != value) {
-    if(GetCountSspClk() > timeout) {
+  while ((bool)(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_DIN) != value) {
+    if (GetCountSspClk() > timeout) {
       return false;
     }
   }
@@ -81,12 +81,12 @@ static inline int8_t rx_bit() {
   uint32_t bit_start = last_frame_end;
 
   // wait for pause to end
-  if(!wait_for(RWD_PULSE, bit_start + RWD_TIME_1*3/2)) {
+  if (!wait_for(RWD_PULSE, bit_start + RWD_TIME_1*3/2)) {
     return -1;
   }
 
   // wait for next pause
-  if(!wait_for(RWD_PAUSE, bit_start + RWD_TIME_1*3/2)) {
+  if (!wait_for(RWD_PAUSE, bit_start + RWD_TIME_1*3/2)) {
     return -1;
   }
 
@@ -94,7 +94,7 @@ static inline int8_t rx_bit() {
   last_frame_end = GetCountSspClk();
 
   // check for code violation (bit to short)
-  if(last_frame_end - bit_start < RWD_TIME_PAUSE) {
+  if (last_frame_end - bit_start < RWD_TIME_PAUSE) {
     return -1;
   }
 
@@ -122,7 +122,7 @@ static inline int8_t rx_bit() {
 static inline void tx_bit(bool bit) {
   LED_C_ON();
 
-  if(bit) {
+  if (bit) {
     // modulate subcarrier
     HIGH(GPIO_SSC_DOUT);
   } else {
@@ -132,7 +132,7 @@ static inline void tx_bit(bool bit) {
 
   // wait for tx timeslot to end
   last_frame_end += TAG_BIT_PERIOD;
-  while(GetCountSspClk() < last_frame_end) { };
+  while (GetCountSspClk() < last_frame_end) { };
   LED_C_OFF();
 }
 
@@ -150,13 +150,13 @@ static void tx_frame(uint32_t frame, uint8_t len) {
   // wait for next tx timeslot
   last_frame_end += TAG_FRAME_WAIT;
   legic_prng_forward(TAG_FRAME_WAIT/TAG_BIT_PERIOD - 1);
-  while(GetCountSspClk() < last_frame_end) { };
+  while (GetCountSspClk() < last_frame_end) { };
 
   // backup ts for trace log
   uint32_t last_frame_start = last_frame_end;
 
   // transmit frame, MSB first
-  for(uint8_t i = 0; i < len; ++i) {
+  for (uint8_t i = 0; i < len; ++i) {
     bool bit = (frame >> i) & 0x01;
     tx_bit(bit ^ legic_prng_get_bit());
     legic_prng_forward(1);
@@ -174,7 +174,7 @@ static void tx_ack() {
   // wait for ack timeslot
   last_frame_end += TAG_ACK_WAIT;
   legic_prng_forward(TAG_ACK_WAIT/TAG_BIT_PERIOD - 1);
-  while(GetCountSspClk() < last_frame_end) { };
+  while (GetCountSspClk() < last_frame_end) { };
 
   // backup ts for trace log
   uint32_t last_frame_start = last_frame_end;
@@ -206,19 +206,19 @@ static int32_t rx_frame(uint8_t *len) {
   last_frame_end -= 2;
 
   // wait for first pause (start of frame)
-  for(uint8_t i = 0; true; ++i) {
+  for (uint8_t i = 0; true; ++i) {
     // increment prng every TAG_BIT_PERIOD
     last_frame_end += TAG_BIT_PERIOD;
     legic_prng_forward(1);
 
     // if start of frame was received exit delay loop
-    if(wait_for(RWD_PAUSE, last_frame_end)) {
+    if (wait_for(RWD_PAUSE, last_frame_end)) {
       last_frame_end = GetCountSspClk();
       break;
     }
 
     // check for code violation
-    if(i > RWD_CMD_TIMEOUT) {
+    if (i > RWD_CMD_TIMEOUT) {
       return -1;
     }
   }
@@ -227,19 +227,19 @@ static int32_t rx_frame(uint8_t *len) {
   uint32_t last_frame_start = last_frame_end;
 
   // receive frame
-  for(*len = 0; true; ++(*len)) {
+  for (*len = 0; true; ++(*len)) {
     // receive next bit
     LED_B_ON();
     int8_t bit = rx_bit();
     LED_B_OFF();
 
     // check for code violation and to short / long frame
-    if((bit < 0) && ((*len < RWD_MIN_FRAME_LEN) || (*len > RWD_MAX_FRAME_LEN))) {
+    if ((bit < 0) && ((*len < RWD_MIN_FRAME_LEN) || (*len > RWD_MAX_FRAME_LEN))) {
       return -1;
     }
 
     // check for code violation caused by end of frame
-    if(bit < 0) {
+    if (bit < 0) {
       break;
     }
 
@@ -256,7 +256,6 @@ static int32_t rx_frame(uint8_t *len) {
   // log
   uint8_t cmdbytes[] = {*len, BYTEx(frame, 0), BYTEx(frame, 1), BYTEx(frame, 2)};
   LogTrace(cmdbytes, sizeof(cmdbytes), last_frame_start, last_frame_end, NULL, true);
-
   return frame;
 }
 
@@ -267,7 +266,7 @@ static int32_t rx_frame(uint8_t *len) {
 static int32_t init_card(uint8_t cardtype, legic_card_select_t *p_card) {
   p_card->tagtype = cardtype;
 
-  switch(p_card->tagtype) {
+  switch (p_card->tagtype) {
     case 0:
       p_card->cmdsize = 6;
       p_card->addrsize = 5;
@@ -338,7 +337,7 @@ static int32_t setup_phase(legic_card_select_t *p_card) {
 
   // wait for iv
   int32_t iv = rx_frame(&len);
-  if((len != 7) || (iv < 0)) {
+  if ((len != 7) || (iv < 0)) {
     return -1;
   }
 
@@ -346,7 +345,7 @@ static int32_t setup_phase(legic_card_select_t *p_card) {
   legic_prng_init(iv);
 
   // reply with card type
-  switch(p_card->tagtype) {
+  switch (p_card->tagtype) {
     case 0:
       tx_frame(0x0D, 6);
       break;
@@ -360,12 +359,12 @@ static int32_t setup_phase(legic_card_select_t *p_card) {
 
   // wait for ack
   int32_t ack = rx_frame(&len);
-  if((len != 6) || (ack < 0)) {
+  if ((len != 6) || (ack < 0)) {
     return -1;
   }
 
   // validate data
-  switch(p_card->tagtype) {
+  switch (p_card->tagtype) {
     case 0:
       if(ack != 0x19) return -1;
       break;
@@ -399,12 +398,12 @@ static int32_t connected_phase(legic_card_select_t *p_card) {
 
   // wait for command
   int32_t cmd = rx_frame(&len);
-  if(cmd < 0) {
+  if (cmd < 0) {
     return -1;
   }
 
   // check if command is LEGIC_READ
-  if(len == p_card->cmdsize) {
+  if (len == p_card->cmdsize) {
     // prepare data
     uint8_t byte = legic_mem[cmd >> 1];
     uint8_t crc = calc_crc4(cmd, p_card->cmdsize, byte);
@@ -416,7 +415,7 @@ static int32_t connected_phase(legic_card_select_t *p_card) {
   }
 
   // check if command is LEGIC_WRITE
-  if(len == p_card->cmdsize + 8 + 4) {
+  if (len == p_card->cmdsize + 8 + 4) {
     // decode data
     uint16_t mask = (1 << p_card->addrsize) - 1;
     uint16_t addr = (cmd >> 1) & mask;
@@ -425,7 +424,7 @@ static int32_t connected_phase(legic_card_select_t *p_card) {
 
     // check received against calculated crc
     uint8_t calc_crc = calc_crc4(addr << 1, p_card->cmdsize, byte);
-    if(calc_crc != crc) {
+    if (calc_crc != crc) {
       Dbprintf("!!! crc mismatch: %x != %x !!!",  calc_crc, crc);
       return -1;
     }
@@ -453,7 +452,7 @@ void LegicRfSimulate(uint8_t cardtype) {
   init_tag();
 
   // verify command line input
-  if(init_card(cardtype, &card) != 0) {
+  if (init_card(cardtype, &card) != 0) {
     DbpString("Unknown tagtype.");
     goto OUT;
   }
@@ -464,17 +463,17 @@ void LegicRfSimulate(uint8_t cardtype) {
     WDT_HIT();
 
     // wait for carrier, restart after timeout
-    if(!wait_for(RWD_PULSE, GetCountSspClk() + TAG_BIT_PERIOD)) {
+    if (!wait_for(RWD_PULSE, GetCountSspClk() + TAG_BIT_PERIOD)) {
       continue;
     }
 
     // wait for connection, restart on error
-    if(setup_phase(&card)) {
+    if (setup_phase(&card)) {
       continue;
     }
 
     // conection is established, process commands until one fails
-    while(!connected_phase(&card)) {
+    while (!connected_phase(&card)) {
       WDT_HIT();
     }
   }

From f760ac99e3ed3d0ed9b257a4ae3418ca357bee8b Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 26 Jan 2019 10:40:37 +0100
Subject: [PATCH 0448/1938] chg: 'script run ndef_dump' - local functions

---
 client/scripts/ndef_dump.lua | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/scripts/ndef_dump.lua b/client/scripts/ndef_dump.lua
index 3b27cac37..a0eda5b7f 100644
--- a/client/scripts/ndef_dump.lua
+++ b/client/scripts/ndef_dump.lua
@@ -24,13 +24,13 @@ local example = "script run xxx"
 local author = "Martin Holst Swende & Asper"
 ---
 -- PrintAndLog
-function prlog(...)
+local function prlog(...)
 	-- TODO; replace this with a call to the proper PrintAndLog
 	print(...)
 end
 --- 
 -- This is only meant to be used when errors occur
-function oops(err)
+local function oops(err)
 	prlog("ERROR: ",err)
 	return nil,err
 end
@@ -70,13 +70,13 @@ local utils = {
 
 --- 
 -- Usage help
-function help()
+local function help()
 	prlog(desc)
 	prlog("Example usage")
 	prlog(example)
 end
 
-function debug(...)
+local function debug(...)
 	if DEBUG then 
 		prlog("debug:", ...)
 	end
@@ -158,7 +158,7 @@ end
 
 --- This function is a lua-implementation of
 -- cmdhf14a.c:waitCmd(uint8_t iSelect)
-function waitCmd(iSelect)
+local function waitCmd(iSelect)
 	local response = core.WaitForResponseTimeout(cmds.CMD_ACK,1000)
 	if response then
 		local count,cmd,arg0,arg1,arg2 = bin.unpack('LLLL',response)

From f0b70d6a4bafa265db137f2e2bb477f40041178b Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 26 Jan 2019 11:09:17 +0100
Subject: [PATCH 0449/1938] CHG: added manufacturers

---
 client/lualibs/taglib.lua | 185 +++++++++++++++++++++++---------------
 1 file changed, 113 insertions(+), 72 deletions(-)

diff --git a/client/lualibs/taglib.lua b/client/lualibs/taglib.lua
index f421ab22f..97194714c 100644
--- a/client/lualibs/taglib.lua
+++ b/client/lualibs/taglib.lua
@@ -1,72 +1,115 @@
-local manufacturer = {}
-manufacturer[0x01]='Motorola [UK]'
-manufacturer[0x02]='STMicroelectronics SA [France]'
-manufacturer[0x03]='Hitachi, Ltd [Japan]'
-manufacturer[0x04]='NXP Semiconductors [Germany]'
-manufacturer[0x05]='Infineon Technologies AG [Germany]'
-manufacturer[0x06]='Cylink [USA]'
-manufacturer[0x07]='Texas Instrument [France]'
-manufacturer[0x08]='Fujitsu Limited [Japan]'
-manufacturer[0x09]='Matsushita Electronics Corporation, Semiconductor Company [Japan]'
-manufacturer[0x0A]='NEC [Japan]'
-manufacturer[0x0B]='Oki Electric Industry Co. Ltd [Japan]'
-manufacturer[0x0C]='Toshiba Corp. [Japan]'
-manufacturer[0x0D]='Mitsubishi Electric Corp. [Japan]'
-manufacturer[0x0E]='Samsung Electronics Co. Ltd [Korea]'
-manufacturer[0x0F]='Hynix [Korea]'
-manufacturer[0x10]='LG-Semiconductors Co. Ltd [Korea]'
-manufacturer[0x11]='Emosyn-EM Microelectronics [USA]'
-manufacturer[0x12]='INSIDE Technology [France]'
-manufacturer[0x13]='ORGA Kartensysteme GmbH [Germany]'
-manufacturer[0x14]='SHARP Corporation [Japan]'
-manufacturer[0x15]='ATMEL [France]'
-manufacturer[0x16]='EM Microelectronic-Marin SA [Switzerland]'
-manufacturer[0x17]='KSW Microtec GmbH [Germany]'
-manufacturer[0x18]='ZMD AG [Germany]'
-manufacturer[0x19]='XICOR, Inc. [USA]'
-manufacturer[0x1A]='Sony Corporation [Japan]'
-manufacturer[0x1B]='Malaysia Microelectronic Solutions Sdn. Bhd [Malaysia]'
-manufacturer[0x1C]='Emosyn [USA]'
-manufacturer[0x1D]='Shanghai Fudan Microelectronics Co. Ltd. P.R. [China]'
-manufacturer[0x1E]='Magellan Technology Pty Limited [Australia]'
-manufacturer[0x1F]='Melexis NV BO [Switzerland]'
-manufacturer[0x20]='Renesas Technology Corp. [Japan]'
-manufacturer[0x21]='TAGSYS [France]'
-manufacturer[0x22]='Transcore [USA]'
-manufacturer[0x23]='Shanghai belling corp., ltd. [China]'
-manufacturer[0x24]='Masktech Germany Gmbh [Germany]'
-manufacturer[0x25]='Innovision Research and Technology Plc [UK]'
-manufacturer[0x26]='Hitachi ULSI Systems Co., Ltd. [Japan]'
-manufacturer[0x27]='Cypak AB [Sweden]'
-manufacturer[0x28]='Ricoh [Japan]'
-manufacturer[0x29]='ASK [France]'
-manufacturer[0x2A]='Unicore Microsystems, LLC [RussianFederation]'
-manufacturer[0x2B]='Dallas Semiconductor/Maxim [USA]'
-manufacturer[0x2C]='Impinj, Inc. [USA]'
-manufacturer[0x2D]='RightPlug Alliance [USA]'
-manufacturer[0x2E]='Broadcom Corporation [USA]'
-manufacturer[0x2F]='MStar Semiconductor, Inc Taiwan, [ROC]'
-manufacturer[0x30]='BeeDar Technology Inc. [USA]'
-manufacturer[0x31]='RFIDsec [Denmark]'
-manufacturer[0x32]='Schweizer Electronic AG [Germany]'
-manufacturer[0x33]='AMIC Technology Corp [Taiwan]'
-manufacturer[0x34]='Mikron JSC [Russia]'
-manufacturer[0x35]='Fraunhofer Institute for Photonic Microsystems [Germany]'
-manufacturer[0x36]='IDS Microchip AG [Switzerland]'
-manufacturer[0x37]='Kovio [USA]'
-manufacturer[0x38]='HMT Microelectronic Ltd [Switzerland]'
-manufacturer[0x39]='Silicon Craft Technology [Thailand]'
-manufacturer[0x3A]='Advanced Film Device Inc. [Japan]'
-manufacturer[0x3B]='Nitecrest Ltd [UK]'
-manufacturer[0x3C]='Verayo Inc. [USA]'
-manufacturer[0x3D]='HID Global [USA]'
-manufacturer[0x3E]='Productivity Engineering Gmbh [Germany]'
-manufacturer[0x3F]='Austriamicrosystems AG (reserved) [Austria]'
-manufacturer[0x40]='Gemalto SA [France]'
-manufacturer[0x41]='Renesas Electronics Corporation [Japan]'
-manufacturer[0x42]='3Alogics Inc [Korea]'
-manufacturer[0x43]='Top TroniQ Asia Limited Hong [Kong]'
-manufacturer[0x44]='Gentag Inc (USA) [USA]'
+local m = {}
+m[0x01]='Motorola UK'
+m[0x02]='ST Microelectronics SA France'
+m[0x03]='Hitachi, Ltd Japan'
+m[0x04]='NXP Semiconductors Germany'
+m[0x05]='Infineon Technologies AG Germany'
+m[0x06]='Cylink USA'
+m[0x07]='Texas Instrument France'
+m[0x08]='Fujitsu Limited Japan'
+m[0x09]='Matsushita Electronics Corporation, Semiconductor Company Japan'
+m[0x0A]='NEC Japan'
+m[0x0B]='Oki Electric Industry Co. Ltd Japan'
+m[0x0C]='Toshiba Corp. Japan'
+m[0x0D]='Mitsubishi Electric Corp. Japan'
+m[0x0E]='Samsung Electronics Co. Ltd Korea'
+m[0x0F]='Hynix / Hyundai, Korea'
+m[0x10]='LG-Semiconductors Co. Ltd Korea'
+m[0x11]='Emosyn-EM Microelectronics USA'
+m[0x12]='INSIDE Technology France'
+m[0x13]='ORGA Kartensysteme GmbH Germany'
+m[0x14]='SHARP Corporation Japan'
+m[0x15]='ATMEL France'
+m[0x16]='EM Microelectronic-Marin SA Switzerland'
+m[0x17]='KSW Microtec GmbH Germany'
+m[0x18]='ZMD AG Germany'
+m[0x19]='XICOR, Inc. USA'
+m[0x1A]='Sony Corporation Japan'
+m[0x1B]='Malaysia Microelectronic Solutions Sdn. Bhd Malaysia'
+m[0x1C]='Emosyn USA'
+m[0x1D]='Shanghai Fudan Microelectronics Co. Ltd. P.R. China'
+m[0x1E]='Magellan Technology Pty Limited Australia'
+m[0x1F]='Melexis NV BO Switzerland'
+m[0x20]='Renesas Technology Corp. Japan'
+m[0x21]='TAGSYS France'
+m[0x22]='Transcore USA'
+m[0x23]='Shanghai belling corp., ltd. China'
+m[0x24]='Masktech Germany Gmbh Germany'
+m[0x25]='Innovision Research and Technology Plc UK'
+m[0x26]='Hitachi ULSI Systems Co., Ltd. Japan'
+m[0x27]='Cypak AB Sweden'
+m[0x28]='Ricoh Japan'
+m[0x29]='ASK France'
+m[0x2A]='Unicore Microsystems, LLC RussianFederation'
+m[0x2B]='Dallas Semiconductor/Maxim USA'
+m[0x2C]='Impinj, Inc. USA'
+m[0x2D]='RightPlug Alliance USA'
+m[0x2E]='Broadcom Corporation USA'
+m[0x2F]='MStar Semiconductor, Inc Taiwan, ROC'
+m[0x30]='BeeDar Technology Inc. USA'
+m[0x31]='RFIDsec Denmark'
+m[0x32]='Schweizer Electronic AG Germany'
+m[0x33]='AMIC Technology Corp Taiwan'
+m[0x34]='Mikron JSC Russia'
+m[0x35]='Fraunhofer Institute for Photonic Microsystems Germany'
+m[0x36]='IDS Microchip AG Switzerland'
+m[0x37]='Kovio USA'
+m[0x38]='HMT Microelectronic Ltd Switzerland'
+m[0x39]='Silicon Craft Technology Thailand'
+m[0x3A]='Advanced Film Device Inc. Japan'
+m[0x3B]='Nitecrest Ltd UK'
+m[0x3C]='Verayo Inc. USA'
+m[0x3D]='HID Global USA'
+m[0x3E]='Productivity Engineering Gmbh Germany'
+m[0x3F]='Austriamicrosystems AG (reserved) Austria'
+m[0x40]='Gemalto SA France'
+m[0x41]='Renesas Electronics Corporation Japan'
+m[0x42]='3Alogics Inc Korea'
+m[0x43]='Top TroniQ Asia Limited Hong Kong'
+m[0x44]='Gentag Inc USA'
+m[0x45]='Invengo Information Technology Co.Ltd China'
+m[0x46]='Guangzhou Sysur Microelectronics, Inc China'
+m[0x47]='CEITEC S.A. Brazil'
+m[0x48]='Shanghai Quanray Electronics Co. Ltd. China'
+m[0x49]='MediaTek Inc Taiwan'
+m[0x4A]='Angstrem PJSC Russia'
+m[0x4B]='Celisic Semiconductor (Hong Kong) Limited China'
+m[0x4C]='LEGIC Identsystems AG Switzerland'
+m[0x4D]='Balluff GmbH Germany'
+m[0x4E]='Oberthur Technologies France'
+m[0x4F]='Silterra Malaysia Sdn. Bhd. Malaysia'
+m[0x50]='DELTA Danish Electronics, Light & Acoustics Denmark'
+m[0x51]='Giesecke & Devrient GmbH Germany'
+m[0x52]='Shenzhen China Vision Microelectronics Co., Ltd. China'
+m[0x53]='Shanghai Feiju Microelectronics Co. Ltd. China'
+m[0x54]='Intel Corporation USA'
+m[0x55]='Microsensys GmbH Germany'
+m[0x56]='Sonix Technology Co., Ltd. Taiwan'
+m[0x57]='Qualcomm Technologies Inc USA'
+m[0x58]='Realtek Semiconductor Corp Taiwan'
+m[0x59]='Freevision Technologies Co. Ltd China'
+m[0x5A]='Giantec Semiconductor Inc. China'
+m[0x5B]='JSC Angstrem-T Russia'
+m[0x5C]='STARCHIP France'
+m[0x5D]='SPIRTECH France'
+m[0x5E]='GANTNER Electronic GmbH Austria'
+m[0x5F]='Nordic Semiconductor Norway'
+m[0x60]='Verisiti Inc USA'
+m[0x61]='Wearlinks Technology Inc. China'
+m[0x62]='Userstar Information Systems Co., Ltd Taiwan'
+m[0x63]='Pragmatic Printing Ltd. UK'
+m[0x64]='Associacao do Laboratorio de Sistemas Integraveis Tecnologico – LSI-TEC Brazil'
+m[0x65]='Tendyron Corporation China'
+m[0x66]='MUTO Smart Co., Ltd. Korea'
+m[0x67]='ON Semiconductor USA'
+m[0x68]='TUBITAK BILGEM Turkey'
+m[0x69]='Huada Semiconductor Co., Ltd China'
+m[0x6A]='SEVENEY France'
+m[0x6B]='ISSM France'
+m[0x6C]='Wisesec Ltd Israel'
+m[0x7C]='DB HiTek Co Ltd Korea'
+m[0x7D]='SATO Vicinity Australia'
+m[0x7E]='Holtek Taiwan'	
 
 return {
 	lookupManufacturer = function (value)
@@ -76,8 +119,6 @@ return {
 			value = v
 		end
 
-		return manufacturer[value] or "no tag-info available"
+		return m[value] or "no tag-info available"
 	end,
-
-
 }
\ No newline at end of file

From 8059f533af019955d9ffc9c2d700cc5ba2f6818b Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 26 Jan 2019 11:09:47 +0100
Subject: [PATCH 0450/1938] syntax

---
 client/loclass/cipherutils.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/loclass/cipherutils.h b/client/loclass/cipherutils.h
index 568671791..21d11aac0 100644
--- a/client/loclass/cipherutils.h
+++ b/client/loclass/cipherutils.h
@@ -52,7 +52,7 @@ typedef struct {
 	uint8_t * buffer;
 	uint8_t numbits;
 	uint8_t position;
-}BitstreamOut;
+} BitstreamOut;
 
 bool headBit( BitstreamIn *stream);
 bool tailBit( BitstreamIn *stream);

From fa3dfa59b97eee7aa1ad2107934162417690bbce Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 26 Jan 2019 19:10:29 +0100
Subject: [PATCH 0451/1938] chg: 'script run legic' - minor adjustments.

---
 client/scripts/legic.lua | 295 ++++++++++++++++++++-------------------
 1 file changed, 155 insertions(+), 140 deletions(-)

diff --git a/client/scripts/legic.lua b/client/scripts/legic.lua
index 546e5cc1a..264d4dfef 100644
--- a/client/scripts/legic.lua
+++ b/client/scripts/legic.lua
@@ -513,8 +513,8 @@ function readFromPM3()
     return tag
 end
 
-function padString(str)
-  if (str:len() == 1) then
+local function padString(str)
+  if (#str == 1) then
     return '0'..str
   end
 
@@ -524,73 +524,84 @@ end
 ---
 -- write virtual Tag to real Tag
 function writeToTag(tag)
-  local bytes
-  local filename='MylegicClone.hex'
-  local taglen=22
+	local bytes
+	local filename = 'MylegicClone.hex'
+	local taglen = 22
 	if(utils.confirm(acred.."\nplace the (empty) Tag onto the PM3\nand confirm writing to this Tag: "..acoff) == false) then
-    return
-  end
-  -- get used bytes / tag-len
-  if(istable(tag.SEG)) then
-      if (istable(tag.Bck)) then
-      for i=0, #tag.SEG do
-        taglen=taglen+tag.SEG[i].len+5
-      end
-  end
-  local uid_old=tag.MCD..tag.MSN0..tag.MSN1..tag.MSN2
-  -- read new tag into memory so we can xor the new data with the new MCC
-  outTAG=readFromPM3()
-  outbytes=tagToBytes(outTAG)
-  -- copy 'inputbuffer' to 'outputbuffer'
-  tag.MCD  = outbytes[1]
-  tag.MSN0 = outbytes[2]
-  tag.MSN1 = outbytes[3]
-  tag.MSN2 = outbytes[4]
-  tag.MCC  = outbytes[5]
-  -- recheck all segments-crc/kghcrc (only on a credential)
-  if(istable(tag.Bck)) then
-    checkAllSegCrc(tag)
-    checkAllKghCrc(tag)
-    local uid_new=tag.MCD..tag.MSN0..tag.MSN1..tag.MSN2
-    for i=0, #tag.SEG do
-      if (check43rdPartyCash1(uid_old, tag.SEG[i].data)) then
-        io.write(accyan.."\nfixing known checksums"..acoff.." ... ")
-        if (fix3rdPartyCash1(uid_new, tag.SEG[i].data)) then
-          io.write(acgreen.." done\n"..acoff)
-        else oops("\nsomething went wrong at the repair of the 3rd-party-cash-segment") end
-      end
-    end
-  end
-  bytes=tagToBytes(tag)
-  -- master-token-crc
-  if (tag.Type ~= "SAM") then bytes[22] = calcMtCrc(bytes) end
-  if (bytes) then
-    print("write temp-file '"..filename.."'")
-    print(accyan)
-    writeFile(bytes, filename..".bin")
-    print(acoff)
-  end
- end
+		return
+	end
+	
+	-- get used bytes / tag-len
+	if (istable(tag.SEG)) then
+		if (istable(tag.Bck)) then
+			for i=0, #tag.SEG do
+				taglen = taglen + tag.SEG[i] . len + 5
+			end
+		end
+		local uid_old = tag.MCD..tag.MSN0..tag.MSN1..tag.MSN2
+		
+		-- read new tag into memory so we can xor the new data with the new MCC
+		outTAG = readFromPM3()
+		outbytes = tagToBytes(outTAG)
+		-- copy 'inputbuffer' to 'outputbuffer'
+		tag.MCD  = outbytes[1]
+		tag.MSN0 = outbytes[2]
+		tag.MSN1 = outbytes[3]
+		tag.MSN2 = outbytes[4]
+		tag.MCC  = outbytes[5]
+		-- recheck all segments-crc/kghcrc (only on a credential)
+		if (istable(tag.Bck)) then
+			checkAllSegCrc(tag)
+			checkAllKghCrc(tag)
+			local uid_new = tag.MCD..tag.MSN0..tag.MSN1..tag.MSN2
+			for i=0, #tag.SEG do
+				if (check43rdPartyCash1(uid_old, tag.SEG[i].data)) then
+					io.write(accyan.."\nfixing known checksums"..acoff.." ... ")
+					if (fix3rdPartyCash1(uid_new, tag.SEG[i].data)) then
+						io.write(acgreen.." done\n"..acoff)
+					else 	
+						oops("\nsomething went wrong at the repair of the 3rd-party-cash-segment") 
+					end
+				end
+			end
+		end
+		bytes = tagToBytes(tag)
+		-- master-token-crc
+		if (tag.Type ~= "SAM") then 
+			bytes[22] = calcMtCrc(bytes) 
+		end
+		if (bytes) then
+			print("write temp-file '"..filename.."'")
+			print(accyan)
+			writeFile(bytes, filename..".bin")
+			print(acoff)
+		end
+	end
 
- -- write data to file
+	-- write data to file
 	if (taglen > 0) then
 		WriteBytes = utils.input(acyellow.."enter number of bytes to write?"..acoff, taglen)
 		-- load file into pm3-buffer
-    if (type(filename) ~= "string") then filename=input(acyellow.."filename to load to pm3-buffer?"..acoff,"legic.temp") end
+		if (type(filename) ~= "string") then 
+			filename = input(acyellow.."filename to load to pm3-buffer?"..acoff, "legic.temp")
+		end
+		
 		cmd = 'hf legic eload 2 '..filename
 		core.console(cmd)
 		-- write pm3-buffer to Tag
 		for i=0, WriteBytes do
 			if (i > 6) then
-        cmd = 'hf legic write o '..string.format("%x", i)..' d '..padString(bytes[i])
-        print(acgreen..cmd..acoff)
+				cmd = ("hf legic write o %x d %s "):format(i, padString(bytes[i]))
+				print(acgreen..cmd..acoff)
 				core.console(cmd)
+				core.clearCommandBuffer()
 			elseif (i == 6) then
-        -- write DCF in reverse order (requires 'mosci-patch')
-				cmd = 'hf legic write o 05 d '..padString(bytes[i-1])..padString(bytes[i])
-        print(acgreen..cmd..acoff)
+				-- write DCF in reverse order (requires 'mosci-patch')
+				cmd = ('hf legic write o 05 d %s%s'):format(padString(bytes[i-1]), padString(bytes[i]))
+				print(acgreen..cmd..acoff)
 				core.console(cmd)
-      elseif (i == 5) then
+				core.clearCommandBuffer()
+			elseif (i == 5) then
 				print(acgreen.."skip byte 0x05 - will be written next step"..acoff)
 			else
 				print(acgreen.."skip byte 0x00-0x04 - unwritable area"..acoff)
@@ -603,26 +614,28 @@ end
 --- File I/O ---
 ---
 -- read file into virtual-tag
-function readFile(filename)
-  print(accyan)
-  local bytes = {}
-  local tag = {}
-	if  file_check(filename) == false then return oops("input file: "..filename.." not found") end
+local function readFile(filename)
+	print(accyan)
+	local bytes = {}
+	local tag = {}
+	if  file_check(filename) == false then 
+		return oops("input file: "..filename.." not found")
+	end
 
-		bytes = getInputBytes(filename)
+	bytes = getInputBytes(filename)
 
-		if bytes == false then return oops('couldnt get input bytes') end
+	if bytes == false then return oops('couldnt get input bytes') end
 
-		-- make plain bytes
-		bytes = xorBytes(bytes,bytes[5])
-		print("create virtual tag from ".. #bytes .. " bytes")
-		-- create Tag for plain bytes
-		tag=createTagTable()
-		-- load plain bytes to tag-table
-		print(acoff)
-		tag=bytesToTag(bytes, tag)
+	-- make plain bytes
+	bytes = xorBytes(bytes,bytes[5])
+	print("create virtual tag from ".. #bytes .. " bytes")
+	-- create Tag for plain bytes
+	tag = createTagTable()
+	-- load plain bytes to tag-table
+	print(acoff)
+	tag = bytesToTag(bytes, tag)
 
-  return tag
+	return tag
 end
 
 ---
@@ -631,14 +644,16 @@ function writeFile(bytes, filename)
 	if (filename ~= 'MylegicClone.hex') then
 		if (file_check(filename)) then
 			local answer = confirm("\nthe output-file "..filename.." already exists!\nthis will delete the previous content!\ncontinue?")
-			if (answer==false) then return print("user abort") end
+			if not answer then return print("user abort") end
 		end
 	end
 	local line
-	local bcnt=0
-	local fho,err = io.open(filename, "w")
-	if err then oops("OOps ... failed to open output-file ".. filename) end
-	bytes=xorBytes(bytes, bytes[5])
+	local bcnt = 0
+	local fho, err = io.open(filename, "w")
+	if err then 
+		return oops("OOps ... failed to open output-file ".. filename)
+	end
+	bytes = xorBytes(bytes, bytes[5])
 	for i = 1, #bytes do
 		if (bcnt == 0) then
 			line = bytes[i]
@@ -662,96 +677,96 @@ end
 --- Map related ---
 ---
 -- make tagMap
-function makeTagMap()
-  local tagMap={}
-  if (#tagMap == 0) then
-    tagMap['name'] = input(accyan.."enter Name for this Map: "..acoff , "newTagMap")
-    tagMap['mappings']={}
-    tagMap['crc8']={}
-    -- insert fixed Tag-CRC
-    table.insert(tagMap.crc8, {name='TAG-CRC', pos=5, seq={1, 4}})
-    tagMap['crc16']={}
-  end
-  print(accyan.."new tagMap created"..acoff)
-  return tagMap
+local function makeTagMap()
+	local tagMap = {}
+	if (#tagMap == 0) then
+		tagMap['name'] = input(accyan.."enter Name for this Map: "..acoff , "newTagMap")
+		tagMap['mappings'] = {}
+		tagMap['crc8'] = {}
+		-- insert fixed Tag-CRC
+		table.insert(tagMap.crc8, {name = 'TAG-CRC', pos = 5, seq = {1, 4}})
+		tagMap['crc16'] = {}
+	end
+	print(accyan.."new tagMap created"..acoff)
+	return tagMap
 end
 
 ---
 -- save mapping to file
-function saveTagMap(map, filename)
-  if (string.len(filename)>0) then
-    if (file_check(filename)) then
-	    local answer = confirm("\nthe output-file "..filename.." alredy exists!\nthis will delete the previous content!\ncontinue?")
-      if (answer==false) then return print("user abort") end
-    end
-  end
+local function saveTagMap(map, filename)
+	if (string.len(filename)>0) then
+		if (file_check(filename)) then
+			local answer = confirm("\nthe output-file "..filename.." alredy exists!\nthis will delete the previous content!\ncontinue?")
+			if not answer then return print("user abort") end
+		end
+	end
 
-  local line
+	local line
 	local fho,err = io.open(filename, "w")
 	if err then oops("OOps ... faild to open output-file ".. filename) end
 
-  -- write line to new file
-  for k, v in pairs(map) do
-    if (istable(v)) then
-      for k2, v2 in pairs(v) do
-        if (k=='mappings') then
-          fho:write(k..","..k2..","..v2['name']..","..v2['start']..","..v2['end']..","..((v2['highlight']) and "1" or "0").."\n")
-        elseif (k=="crc8") then
-            local tmp=""
-            tmp=k..","..k2..","..v2['name']..","..v2['pos']..","
-            tmp=tmp..tbl2seqstr(v2['seq'])
-            fho:write(tmp.."\n")
-        end
-      end
-    else
-      fho:write(k..","..v.."\n")
-    end
-  end
+	-- write line to new file
+	for k, v in pairs(map) do
+		if (istable(v)) then
+			for k2, v2 in pairs(v) do
+				if (k == 'mappings') then
+					fho:write(k..","..k2..","..v2['name']..","..v2['start']..","..v2['end']..","..((v2['highlight']) and "1" or "0").."\n")
+				elseif (k == "crc8") then
+					local tmp = ""
+					tmp = k..","..k2..","..v2['name']..","..v2['pos']..","
+					tmp=tmp..tbl2seqstr(v2['seq'])
+					fho:write(tmp.."\n")
+				end
+			end
+		else
+			fho:write(k..","..v.."\n")
+		end
+	end
 	fho:close()
 	return true
 end
 
 ---
 -- toggle higligh
-function toggleHighlight(tbl)
+local function toggleHighlight(tbl)
 	if (tbl['highlight']) then
 		tbl['highlight'] = false
 	else
 		tbl['highlight'] = true
 	end
-  return tbl
+	return tbl
 end
 
 ---
 -- return table od seqence-string
-function seqstr2tbl(seqstr)
-  local s=split(seqstr)
-  local res={}
-  if (#s>=1) then
-    for sk, sv in pairs(s) do
-      s2=split(sv, '-')
-      if(#s2==2) then
-        table.insert(res, s2[1])
-        table.insert(res, s2[2])
-      end
-    end
-  end
-  return res
+local function seqstr2tbl(seqstr)
+	local s = split(seqstr)
+	local res = {}
+	if (#s >= 1) then
+		for sk, sv in pairs(s) do
+			s2 = split(sv, '-')
+			if(#s2 == 2) then
+				table.insert(res, s2[1])
+				table.insert(res, s2[2])
+			end
+		end
+	end
+	return res
 end
 
 ---
 -- return sequence-string from table
-function tbl2seqstr(seqtbl)
-  local res=""
-  if (istable(seqtbl)) then
-    for sk, sv in pairs(seqtbl) do
-      res=res..sv..((sk%2==0) and "," or "-")
-    end
-    if (string.sub(res, string.len(res))==",") then
-      res=string.sub(res, 1, string.len(res)-1)
-    end
-  end
-  return res
+local function tbl2seqstr(seqtbl)
+	local res = ""
+	if (istable(seqtbl)) then
+		for sk, sv in pairs(seqtbl) do
+			res = res..sv..((sk%2==0) and "," or "-")
+		end
+		if (string.sub(res, string.len(res))== ",") then
+			res = string.sub(res, 1, string.len(res)-1)
+		end
+	end
+	return res
 end
 
 ---

From 0beb730e043b632972318bc3d1e0a5e8e9934d37 Mon Sep 17 00:00:00 2001
From: Iceman <iceman@iuse.se>
Date: Sun, 27 Jan 2019 20:42:50 +0100
Subject: [PATCH 0452/1938] Update README.md

---
 README.md | 35 ++++++++++++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index f21a2efdc..effdc0f6e 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,33 @@ Proxmark3 RDV40 dedicated repo,  based on iceman fork
 ## Notice      
 This repo is based on iceman fork for proxmark3. It is dedicated to bring the most out of the new features for proxmark3 RDV40 device.
 
+# Donations
+Nothing says thank you as much as a donation,  https://www.patreon.com/iceman1001
+
+## ToC
+
+- Coverity Scan Config & Run
+- Whats changed?
+- Why didn't you based it on offical PM3 Master?
+- Why don't you add this or that functionality?	
+- PM3 GUI
+- Development
+- KALI and ARCHLINUX users
+- Setup and build for UBUNTU
+- Setup and build for ArchLinux
+- Homebrew (Mac OS X)
+- Upgrading HomeBrew tap formula
+- Building on Windows
+- Gator96100 distro
+- Build and run
+- Validating proxmark client functionality
+- Run the following commands
+- Quit client
+- First things on your RDV40
+- Verify sim module firmware version
+
+- The end
+
 ## Coverity Scan Config & Run
 Download the Coverity Scan Self-buld and install it.
 You will need to configure  ARM-NON-EABI- Compiler for it to use:
@@ -37,14 +64,16 @@ The separation from offical pm3 repo gives us very much freedom to create a firm
 Give us a hint, and we'll see if we can't merge in the stuff you have. 
 	
 ## PM3 GUI
-The official PM3-GUI from Gaucho will not work. 
-The new universial GUI will work.
+The official PM3-GUI from Gaucho will not work.
+The new universial GUI will work. [Proxmark3 Univerisal GUI](https://github.com/burma69/PM3UniversalGUI) 
 
 ## Development
 This fork now compiles just fine on 
    - Windows/mingw environment with Qt5.6.1 & GCC 4.8
    - Ubuntu 1404, 1510, 1604, 1804
    - Mac OS X / Homebrew
+   - ParrotOS
+   - WSL (Windows subsystem linux) on Windows 10
    - Docker container
 
 ## KALI and ARCHLINUX users
@@ -224,7 +253,7 @@ If all went well you should get some information about the firmware and memory u
 >
 > pm3 -->
 
-### run the following commands
+### Run the following commands
     pm3 --> hw status
     pm3 --> hw version
     pm3 --> hw tune

From 34be8b4d37e5a9cb222370f77efbb113f00d18a6 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 29 Jan 2019 15:23:07 +0100
Subject: [PATCH 0453/1938] CHG: wrong iso7816 (@piwi)

---
 client/cmdhflist.c    | 2 +-
 client/cmdsmartcard.c | 4 ++--
 common/protocols.h    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/cmdhflist.c b/client/cmdhflist.c
index 7791c5e53..b2e0eeecc 100644
--- a/client/cmdhflist.c
+++ b/client/cmdhflist.c
@@ -357,7 +357,7 @@ void annotateIso7816(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
 			case ISO7816_EXTERNAL_AUTHENTICATION 	:snprintf(exp, size, "EXTERNAL AUTH");break;
 			case ISO7816_GET_CHALLENGE				:snprintf(exp, size, "GET CHALLENGE");break;
 			case ISO7816_MANAGE_CHANNEL				:snprintf(exp, size, "MANAGE CHANNEL");break;
-			case ISO7816_GETSTATUS					:snprintf(exp, size, "GET RESPONSE");break;
+			case ISO7816_GET_RESPONSE				:snprintf(exp, size, "GET RESPONSE");break;
 			default									:snprintf(exp,size,"?"); break;
 		}
 	}
diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index fdc825d38..45957d407 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -356,7 +356,7 @@ static int smart_responseEx(uint8_t *data, bool silent) {
 	if (needGetData) {
 		int len = data[datalen - 1];
 		if (!silent) PrintAndLogEx(INFO, "Requesting 0x%02X bytes response", len);	
-		uint8_t getstatus[] = {0x00, ISO7816_GETSTATUS, 0x00, 0x00, len};
+		uint8_t getstatus[] = {0x00, ISO7816_GET_RESPONSE, 0x00, 0x00, len};
 		UsbCommand cStatus = {CMD_SMART_RAW, {SC_RAW, sizeof(getstatus), 0}};	
 		memcpy(cStatus.d.asBytes, getstatus, sizeof(getstatus) );
 		clearCommandBuffer();
@@ -372,7 +372,7 @@ static int smart_responseEx(uint8_t *data, bool silent) {
 		if (datalen != len + 2) { 
 			// data with ACK
 			if (datalen == len + 2 + 1) { // 2 - response, 1 - ACK
-				if (data[0] != ISO7816_GETSTATUS) {
+				if (data[0] != ISO7816_GET_RESPONSE) {
 					if (!silent) {
 						PrintAndLogEx(ERR, "GetResponse ACK error. len 0x%x | data[0] %02X", len, data[0]);	
 					}
diff --git a/common/protocols.h b/common/protocols.h
index 9696c73e0..3c2e79a8d 100644
--- a/common/protocols.h
+++ b/common/protocols.h
@@ -302,10 +302,10 @@ ISO 7816-4 Basic interindustry commands. For command APDU's.
 #define ISO7816_VERIFY 					0x20
 #define ISO7816_INTERNAL_AUTHENTICATION 0x88
 #define ISO7816_EXTERNAL_AUTHENTICATION 0x82
-#define ISO7816_GET_CHALLENGE 			0xB4
+#define ISO7816_GET_CHALLENGE 			0x84
 #define ISO7816_MANAGE_CHANNEL 			0x70
 
-#define ISO7816_GETSTATUS				0xC0
+#define ISO7816_GET_RESPONSE			0xC0
 // ISO7816-4	For response APDU's
 #define ISO7816_OK						0x9000
 //	6x xx = ERROR

From c419f7bf37fcaf637136edb830dea0e33fcb5010 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 29 Jan 2019 15:42:31 +0100
Subject: [PATCH 0454/1938] CHG: dropfield when CL is used.

---
 client/emv/cmdemv.c  | 38 +++++++++++++++++---------------------
 client/emv/emvcore.c |  4 ++--
 client/util.h        |  8 ++++++++
 3 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index 453d08a20..f033ad7ba 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -623,7 +623,7 @@ int CmdEMVInternalAuthenticate(const char *cmd) {
 	return 0;	
 }
 
-#define dreturn(n) {free(pdol_data_tlv);tlvdb_free(tlvSelect);tlvdb_free(tlvRoot);DropField();return n;}
+#define dreturn(n) {free(pdol_data_tlv); tlvdb_free(tlvSelect); tlvdb_free(tlvRoot); DropFieldEx( channel ); return n;}
 
 void InitTransactionParameters(struct tlvdb *tlvRoot, bool paramLoadJSON, enum TransactionType TrType, bool GenACGPO) {
 	
@@ -1212,7 +1212,7 @@ int CmdEMVExec(const char *cmd) {
 		
 	}
 	
-	DropField();
+	DropFieldEx( channel );
 	
 	// Destroy TLV's
 	free(pdol_data_tlv);
@@ -1314,7 +1314,7 @@ int CmdEMVScan(const char *cmd) {
 	}
 
 	// drop field at start
-	DropField();
+	DropFieldEx( channel );
 
 	// iso 14443 select
 	PrintAndLogEx(NORMAL, "--> GET UID, ATS.");
@@ -1367,7 +1367,7 @@ int CmdEMVScan(const char *cmd) {
 		if (EMVSearch(channel, false, true, decodeTLV, tlvSelect)) {
 			PrintAndLogEx(ERR, "Can't found any of EMV AID. Exit...");
 			tlvdb_free(tlvSelect);
-			DropField();
+			DropFieldEx( channel );
 			return 3;
 		}
 
@@ -1383,7 +1383,7 @@ int CmdEMVScan(const char *cmd) {
 
 	if (!AIDlen) {
 		PrintAndLogEx(INFO, "Can't select AID. EMV AID not found. Exit...");
-		DropField();
+		DropFieldEx( channel );
 		return 4;
 	}
 
@@ -1402,7 +1402,7 @@ int CmdEMVScan(const char *cmd) {
 	if (res) {	
 		PrintAndLogEx(ERR, "Can't select AID (%d). Exit...", res);
 		tlvdb_free(tlvRoot);
-		DropField();
+		DropFieldEx( channel );
 		return 5;
 	}
 	
@@ -1430,7 +1430,7 @@ int CmdEMVScan(const char *cmd) {
 	if (!pdol_data_tlv){
 		PrintAndLogEx(ERR, "Can't create PDOL TLV.");
 		tlvdb_free(tlvRoot);
-		DropField();
+		DropFieldEx( channel );
 		return 6;
 	}
 	
@@ -1439,7 +1439,7 @@ int CmdEMVScan(const char *cmd) {
 	if (!pdol_data_tlv_data) {
 		PrintAndLogEx(ERR, "Can't create PDOL data.");
 		tlvdb_free(tlvRoot);
-		DropField();
+		DropFieldEx( channel );
 		return 6;
 	}
 	PrintAndLogEx(INFO, "PDOL data[%d]: %s", pdol_data_tlv_data_len, sprint_hex(pdol_data_tlv_data, pdol_data_tlv_data_len));
@@ -1453,7 +1453,7 @@ int CmdEMVScan(const char *cmd) {
 	if (res) {	
 		PrintAndLogEx(ERR, "GPO error(%d): %4x. Exit...", res, sw);
 		tlvdb_free(tlvRoot);
-		DropField();
+		DropFieldEx( channel );
 		return 7;
 	}
 	ProcessGPOResponseFormat1(tlvRoot, buf, len, decodeTLV);
@@ -1545,8 +1545,7 @@ int CmdEMVScan(const char *cmd) {
 	// free tlv object
 	tlvdb_free(tlvRoot);
 
-	// DropField
-	DropField();
+	DropFieldEx( channel );
 	
 	res = json_dump_file(root, fname, JSON_INDENT(2));
 	if (res) {
@@ -1630,7 +1629,7 @@ int CmdEMVRoca(const char *cmd) {
 		if (EMVSearch(channel, false, true, false, tlvSelect)) {
 			PrintAndLogEx(ERR, "Can't found any of EMV AID. Exit...");
 			tlvdb_free(tlvSelect);
-			DropField();
+			DropFieldEx( channel );
 			return 3;
 		}
 
@@ -1646,7 +1645,7 @@ int CmdEMVRoca(const char *cmd) {
 
 	if (!AIDlen) {
 		PrintAndLogEx(INFO, "Can't select AID. EMV AID not found. Exit...");
-		DropField();
+		DropFieldEx( channel );
 		return 4;
 	}
 
@@ -1661,7 +1660,7 @@ int CmdEMVRoca(const char *cmd) {
 	if (res) {	
 		PrintAndLogEx(ERR, "Can't select AID (%d). Exit...", res);
 		tlvdb_free(tlvRoot);
-		DropField();
+		DropFieldEx( channel );
 		return 5;
 	}
 
@@ -1673,7 +1672,7 @@ int CmdEMVRoca(const char *cmd) {
 	if (!pdol_data_tlv){
 		PrintAndLogEx(ERR, "Can't create PDOL TLV.");
 		tlvdb_free(tlvRoot);
-		DropField();
+		DropFieldEx( channel );
 		return 6;
 	}
 	
@@ -1682,7 +1681,7 @@ int CmdEMVRoca(const char *cmd) {
 	if (!pdol_data_tlv_data) {
 		PrintAndLogEx(ERR, "Can't create PDOL data.");
 		tlvdb_free(tlvRoot);
-		DropField();
+		DropFieldEx( channel );
 		return 6;
 	}
 	PrintAndLogEx(INFO, "PDOL data[%d]: %s", pdol_data_tlv_data_len, sprint_hex(pdol_data_tlv_data, pdol_data_tlv_data_len));
@@ -1696,7 +1695,7 @@ int CmdEMVRoca(const char *cmd) {
 	if (res) {	
 		PrintAndLogEx(ERR, "GPO error(%d): %4x. Exit...", res, sw);
 		tlvdb_free(tlvRoot);
-		DropField();
+		DropFieldEx( channel );
 		return 7;
 	}
 	ProcessGPOResponseFormat1(tlvRoot, buf, len, false);
@@ -1794,10 +1793,7 @@ out:
 	// free tlv object
 	tlvdb_free(tlvRoot);
 
-	if ( channel == ECC_CONTACTLESS)
-		DropField();
-
-
+	DropFieldEx( channel );
 	return 0;
 }
 
diff --git a/client/emv/emvcore.c b/client/emv/emvcore.c
index 77d288eaa..ae3b0574a 100644
--- a/client/emv/emvcore.c
+++ b/client/emv/emvcore.c
@@ -241,7 +241,7 @@ int EMVExchangeEx(EMVCommandChannel channel, bool ActivateField, bool LeaveField
 	int res = 0;
 	
 	if (ActivateField) {
-		DropField();
+		DropFieldEx( channel );
 		msleep(50);
 	}
 	
@@ -484,7 +484,7 @@ int EMVSearchPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldO
 	}
 	
 	if(!LeaveFieldON)
-		DropField();
+		DropFieldEx( channel );
 	
 	return res;
 }
diff --git a/client/util.h b/client/util.h
index c9f13870d..e10f06497 100644
--- a/client/util.h
+++ b/client/util.h
@@ -178,6 +178,14 @@
 }
 #endif
 
+#ifndef DropFieldEx
+#define DropFieldEx(x) { \
+	if ( (x) == ECC_CONTACTLESS) { \
+		DropField(); \
+	} \
+}
+#endif
+
 extern uint8_t g_debugMode;
 
 extern int ukbhit(void);

From 8991fa172dcb974adb538589dd6b663ca42dcdc4 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 29 Jan 2019 15:47:44 +0100
Subject: [PATCH 0455/1938] FIX: wrong define

---
 armsrc/lfops.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index d750fccbe..96abd9b99 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -80,7 +80,7 @@ void setT55xxConfig(uint8_t arg0, t55xx_config *c) {
 
 	printT55xxConfig();
 
-#if WITH_FLASH
+#ifdef WITH_FLASH
 	// shall persist to flashmem
 	if (arg0 == 0) {
 		return;
@@ -119,7 +119,7 @@ t55xx_config* getT55xxConfig(void) {
 }
 
 void loadT55xxConfig(void) {
-#if WITH_FLASH
+#ifdef WITH_FLASH
     if (!FlashInit()) {
         return;
 	}

From 1b3d96ab2dfa32dcd43525b2bf4808414fc26dba Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 29 Jan 2019 19:30:15 +0200
Subject: [PATCH 0456/1938] add apdu chaining to arm side

---
 armsrc/iso14443a.c | 3 +++
 include/mifare.h   | 1 +
 2 files changed, 4 insertions(+)

diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 257c39b1f..daeb6b749 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -2226,6 +2226,9 @@ int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, void *data, uint8_t *res) {
 	if (cmd_len) {
 		// ISO 14443 APDU frame: PCB [CID] [NAD] APDU CRC PCB=0x02
 		real_cmd[0] = 0x02; // bnr,nad,cid,chn=0; i-block(0x00)	
+		if (param & ISO14A_SEND_CHAINING) {
+			real_cmd[0] |= 0x10;
+		}
 		// put block number into the PCB
 		real_cmd[0] |= iso14_pcb_blocknum;
 		memcpy(real_cmd + 1, cmd, cmd_len);
diff --git a/include/mifare.h b/include/mifare.h
index cda7cfe9d..1373317e7 100644
--- a/include/mifare.h
+++ b/include/mifare.h
@@ -36,6 +36,7 @@ typedef enum ISO14A_COMMAND {
 	ISO14A_NO_SELECT =			(1 << 7),
 	ISO14A_TOPAZMODE =			(1 << 8),
 	ISO14A_NO_RATS =            (1 << 9)
+	ISO14A_SEND_CHAINING =      (1 << 9)
 } iso14a_command_t;
 
 typedef struct {

From cf21f046d82d0d85431cec779a668a1b642ca784 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 30 Jan 2019 18:15:47 +0200
Subject: [PATCH 0457/1938] arm side

---
 armsrc/epa.c       | 2 +-
 armsrc/iso14443a.c | 6 +++---
 armsrc/iso14443a.h | 2 +-
 include/mifare.h   | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/armsrc/epa.c b/armsrc/epa.c
index 68b2711da..e97fda7a0 100644
--- a/armsrc/epa.c
+++ b/armsrc/epa.c
@@ -108,7 +108,7 @@ int EPA_APDU(uint8_t *apdu, size_t length, uint8_t *response)
 	switch(iso_type)
 	{
 		case 'a':
-			return iso14_apdu(apdu, (uint16_t) length, response, NULL);
+			return iso14_apdu(apdu, (uint16_t) length, false, response, NULL);
 			break;
 		case 'b':
 			return iso14443b_apdu(apdu, length, response);
diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index daeb6b749..082d378ac 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -2219,14 +2219,14 @@ b8 b7 b6 b5 b4 b3 b2 b1
 b5,b6 = 00 - DESELECT
         11 - WTX 
 */    
-int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, void *data, uint8_t *res) {
+int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, bool send_chaining, void *data, uint8_t *res) {
 	uint8_t parity[MAX_PARITY_SIZE] = {0x00};
 	uint8_t real_cmd[cmd_len + 4];
 	
 	if (cmd_len) {
 		// ISO 14443 APDU frame: PCB [CID] [NAD] APDU CRC PCB=0x02
 		real_cmd[0] = 0x02; // bnr,nad,cid,chn=0; i-block(0x00)	
-		if (param & ISO14A_SEND_CHAINING) {
+		if (send_chaining) {
 			real_cmd[0] |= 0x10;
 		}
 		// put block number into the PCB
@@ -2341,7 +2341,7 @@ void ReaderIso14443a(UsbCommand *c) {
 
 	if ((param & ISO14A_APDU)) {
 		uint8_t res;
-		arg0 = iso14_apdu(cmd, len, buf, &res);
+		arg0 = iso14_apdu(cmd, len, (param & ISO14A_SEND_CHAINING), buf, &res);
 		cmd_send(CMD_ACK, arg0, res, 0, buf, sizeof(buf));
 	}
 
diff --git a/armsrc/iso14443a.h b/armsrc/iso14443a.h
index 7f979e531..a23b5d7c2 100644
--- a/armsrc/iso14443a.h
+++ b/armsrc/iso14443a.h
@@ -114,7 +114,7 @@ extern void ReaderTransmitPar(uint8_t *frame, uint16_t len, uint8_t *par, uint32
 extern int ReaderReceive(uint8_t *receivedAnswer, uint8_t *par);
 
 extern void iso14443a_setup(uint8_t fpga_minor_mode);
-extern int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, void *data, uint8_t *res);
+extern int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, bool send_chaining, void *data, uint8_t *res);
 extern int iso14443a_select_card(uint8_t *uid_ptr, iso14a_card_select_t *resp_data, uint32_t *cuid_ptr, bool anticollision, uint8_t num_cascades, bool no_rats);
 extern int iso14443a_fast_select_card(uint8_t *uid_ptr, uint8_t num_cascades);
 extern void iso14a_set_trigger(bool enable);
diff --git a/include/mifare.h b/include/mifare.h
index 1373317e7..14c0e7e27 100644
--- a/include/mifare.h
+++ b/include/mifare.h
@@ -35,8 +35,8 @@ typedef enum ISO14A_COMMAND {
 	ISO14A_SET_TIMEOUT =		(1 << 6),
 	ISO14A_NO_SELECT =			(1 << 7),
 	ISO14A_TOPAZMODE =			(1 << 8),
-	ISO14A_NO_RATS =            (1 << 9)
-	ISO14A_SEND_CHAINING =      (1 << 9)
+	ISO14A_NO_RATS =            (1 << 9),
+	ISO14A_SEND_CHAINING =      (1 << 10)
 } iso14a_command_t;
 
 typedef struct {

From 30a6ef19b904492dc3cccc4f1f877a75cd4661e9 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 30 Jan 2019 18:16:50 +0200
Subject: [PATCH 0458/1938] added FSC correct calculation in `hf 14a info`

---
 client/cmdhf14a.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 43832e2cf..4a6b7518d 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -147,6 +147,10 @@ char* getTagInfo(uint8_t uid) {
 	return manufactureMapping[len-1].desc; 
 }
 
+// iso14a apdu input frame length
+static uint16_t frameLength = 0;
+uint16_t atsFSC[] = {16, 24, 32, 40, 48, 64, 96, 128, 256};
+
 int usage_hf_14a_sim(void) {
 //	PrintAndLogEx(NORMAL, "\n Emulating ISO/IEC 14443 type A tag with 4,7 or 10 byte UID\n");
 	PrintAndLogEx(NORMAL, "\n Emulating ISO/IEC 14443 type A tag with 4,7 byte UID\n");
@@ -486,10 +490,7 @@ int CmdHF14AInfo(const char *Cmd) {
 				(tb1 ? "" : " NOT"),
 				(tc1 ? "" : " NOT"),
 				fsci,
-				fsci < 5 ? (fsci - 2) * 8 : 
-					fsci < 8 ? (fsci - 3) * 32 :
-					fsci == 8 ? 256 :
-					-1
+				fsci < sizeof(atsFSC) ? atsFSC[fsci] : -1
 				);
 		}
 		pos = 2;

From 18db34ffb048af75c71c69d8408c661fe220fa51 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 30 Jan 2019 20:18:50 +0100
Subject: [PATCH 0459/1938] chg: use calloc

---
 client/cmddata.c     | 2 +-
 client/cmdhfepa.c    | 2 +-
 client/cmdhficlass.c | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/cmddata.c b/client/cmddata.c
index a9f58b962..65fd0d829 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -1786,7 +1786,7 @@ int Cmdbin2hex(const char *Cmd) {
 	//Number of digits supplied as argument
 	size_t length = en - bg + 1;
 	size_t bytelen = (length+7) / 8;
-	uint8_t* arr = (uint8_t *) malloc(bytelen);
+	uint8_t* arr = (uint8_t *) calloc(bytelen, sizeof(uint8_t));
 	memset(arr, 0, bytelen);
 	BitstreamOut bout = { arr, 0, 0 };
 
diff --git a/client/cmdhfepa.c b/client/cmdhfepa.c
index b681810ed..dd110c9c0 100644
--- a/client/cmdhfepa.c
+++ b/client/cmdhfepa.c
@@ -43,7 +43,7 @@ int CmdHFEPACollectPACENonces(const char *Cmd)
 			PrintAndLogEx(FAILED, "Error in step %d, Return code: %d",resp.arg[0],(int)resp.arg[1]);
 		} else {
 			size_t nonce_length = resp.arg[1];
-			char *nonce = (char *) malloc(2 * nonce_length + 1);
+			char *nonce = (char *) calloc(2 * nonce_length + 1, sizeof(uint8_t));
 			for(int j = 0; j < nonce_length; j++) {
 				sprintf(nonce + (2 * j), "%02X", resp.d.asBytes[j]);
 			}
diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index f0bfa18a0..9427acf50 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -404,7 +404,7 @@ int CmdHFiClassSim(const char *Cmd) {
 				break;
 			
 			size_t datalen = NUM_CSNS * 24;
-			void* dump = malloc(datalen);
+			void* dump = calloc(datalen, sizeof(uint8_t));
 			if ( !dump ) {
 				PrintAndLogEx(WARNING, "Failed to allocate memory");
 				return 2;
@@ -456,7 +456,7 @@ int CmdHFiClassSim(const char *Cmd) {
 				break;
 			
 			size_t datalen = NUM_CSNS * 24;
-			void* dump = malloc(datalen);
+			void* dump = calloc(datalen, sizeof(uint8_t));
 			if ( !dump ) {
 				PrintAndLogEx(WARNING, "Failed to allocate memory");
 				return 2;

From ed7122e409907810f65cc0d458a536607fb04590 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 30 Jan 2019 20:21:41 +0100
Subject: [PATCH 0460/1938] chg: use calloc

---
 client/cmdhfmf.c      | 6 +++---
 client/cmdhftopaz.c   | 6 +++---
 client/cmdsmartcard.c | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index a02302b15..a26381930 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -415,7 +415,7 @@ int GetHFMF14AUID(uint8_t *uid, int *uidlen) {
 char * GenerateFilename(const char *prefix, const char *suffix){
 	uint8_t uid[10] = {0,0,0,0,0,0,0,0,0,0};
 	int uidlen=0;
-	char * fptr = malloc (sizeof (char) * (strlen(prefix) + strlen(suffix)) + sizeof(uid)*2 + 1);
+	char * fptr = calloc (sizeof (char) * (strlen(prefix) + strlen(suffix)) + sizeof(uid)*2 + 1,  sizeof(uint8_t));
 	
 	GetHFMF14AUID(uid, &uidlen);
 	if (!uidlen) {
@@ -2195,7 +2195,7 @@ int CmdHF14AMfSniff(const char *Cmd){
 				if (traceLen > bufsize || buf == NULL) {
 					uint8_t *p;
 					if (buf == NULL)				// not yet allocated
-						p = malloc(traceLen);
+						p = calloc(traceLen, sizeof(uint8_t));
 					else							// need more memory
 						p = realloc(buf, traceLen);
 					
@@ -2912,7 +2912,7 @@ int CmdHF14AMfCSave(const char *Cmd) {
 	
 	if (errors || cmdp == 0) return usage_hf14_csave();
 
-	dump = malloc(bytes);
+	dump = calloc(bytes, sizeof(uint8_t));
 	if (!dump) {
 		PrintAndLogEx(WARNING, "Fail, cannot allocate memory");
 		return 1;
diff --git a/client/cmdhftopaz.c b/client/cmdhftopaz.c
index ea4699f1b..a6046cee0 100644
--- a/client/cmdhftopaz.c
+++ b/client/cmdhftopaz.c
@@ -194,7 +194,7 @@ static int topaz_print_CC(uint8_t *data) {
 	PrintAndLogEx(NORMAL, "  %02x: version %d.%d supported by tag", data[1], (data[1] & 0xF0) >> 4, data[1] & 0x0f);
 	uint16_t memsize = (data[2] + 1) * 8;
 	topaz_tag.size = memsize;
-	topaz_tag.dynamic_memory = malloc(memsize - TOPAZ_STATIC_MEMORY);
+	topaz_tag.dynamic_memory = calloc(memsize - TOPAZ_STATIC_MEMORY, sizeof(uint8_t));
 	PrintAndLogEx(NORMAL, "  %02x: Physical Memory Size of this tag: %d bytes", data[2], memsize);
 	PrintAndLogEx(NORMAL, "  %02x: %s / %s", data[3], 
 				(data[3] & 0xF0) ? "(RFU)" : "Read access granted without any security", 
@@ -278,12 +278,12 @@ static void topaz_print_control_TLVs(uint8_t *memory) {
 			dynamic_lock_area_t *old = topaz_tag.dynamic_lock_areas;
 			dynamic_lock_area_t *new = topaz_tag.dynamic_lock_areas;
 			if (old == NULL) {
-				new = topaz_tag.dynamic_lock_areas = (dynamic_lock_area_t *)malloc(sizeof(dynamic_lock_area_t));
+				new = topaz_tag.dynamic_lock_areas = (dynamic_lock_area_t *) calloc(sizeof(dynamic_lock_area_t, sizeof(uint8_t)));
 			} else {
 				while(old->next != NULL) {
 					old = old->next;
 				}
-				new = old->next = (dynamic_lock_area_t *)malloc(sizeof(dynamic_lock_area_t));
+				new = old->next = (dynamic_lock_area_t *) calloc(sizeof(dynamic_lock_area_t), sizeof(uint8_t));
 			}
 			new->next = NULL;
 			if (area_start <= next_lockable_byte) {
diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index 45957d407..23b2b8b3c 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -1012,7 +1012,7 @@ int CmdSmartBruteforceSFI(const char *Cmd) {
 	json_t *root = NULL;
 	smart_loadjson("aidlist", "json", &root);
 
-	uint8_t* buf = malloc(USB_CMD_DATA_SIZE);
+	uint8_t* buf = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
 	if ( !buf )
 		return 1;		
 

From e81b0fa355df3d227a39c717b577a27ad13e40ad Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 30 Jan 2019 20:43:30 +0100
Subject: [PATCH 0461/1938] chg: use calloc

---
 client/cmdhftopaz.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdhftopaz.c b/client/cmdhftopaz.c
index a6046cee0..2f80b054c 100644
--- a/client/cmdhftopaz.c
+++ b/client/cmdhftopaz.c
@@ -278,7 +278,7 @@ static void topaz_print_control_TLVs(uint8_t *memory) {
 			dynamic_lock_area_t *old = topaz_tag.dynamic_lock_areas;
 			dynamic_lock_area_t *new = topaz_tag.dynamic_lock_areas;
 			if (old == NULL) {
-				new = topaz_tag.dynamic_lock_areas = (dynamic_lock_area_t *) calloc(sizeof(dynamic_lock_area_t, sizeof(uint8_t)));
+				new = topaz_tag.dynamic_lock_areas = (dynamic_lock_area_t *) calloc(sizeof(dynamic_lock_area_t) , sizeof(uint8_t));
 			} else {
 				while(old->next != NULL) {
 					old = old->next;

From 99b6087b01506320de9a8db5ad70b2cc0f2a520f Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 30 Jan 2019 21:16:20 +0100
Subject: [PATCH 0462/1938] chg: use calloc

---
 client/tinycbor/open_memstream.c | 2 +-
 client/ui.c                      | 2 +-
 client/util.c                    | 4 ++--
 common/crapto1/crapto1.c         | 4 ++--
 common/radixsort.c               | 2 +-
 uart/uart_posix.c                | 2 +-
 uart/uart_win32.c                | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/client/tinycbor/open_memstream.c b/client/tinycbor/open_memstream.c
index 18f3de8b1..f618db8ae 100644
--- a/client/tinycbor/open_memstream.c
+++ b/client/tinycbor/open_memstream.c
@@ -90,7 +90,7 @@ static int close_buffer(void *cookie)
 
 FILE *open_memstream(char **bufptr, size_t *lenptr)
 {
-    struct Buffer *b = (struct Buffer *)malloc(sizeof(struct Buffer));
+    struct Buffer *b = (struct Buffer *)calloc(sizeof(struct Buffer), sizeof(uint8_t));
     if (b == NULL)
         return NULL;
     b->alloc = 0;
diff --git a/client/ui.c b/client/ui.c
index a0151a8db..71603fed6 100644
--- a/client/ui.c
+++ b/client/ui.c
@@ -196,7 +196,7 @@ void SetFlushAfterWrite(bool value) {
 
 	int i,j;
 	
-	int * output =  (int* ) malloc(sizeof(int) * len);	
+	int * output =  (int* ) calloc(sizeof(int) * len, sizeof(uint8_t));	
 	if ( !output ) return;
 	
 	// clear mem
diff --git a/client/util.c b/client/util.c
index b22258d44..c4d6ae5a4 100644
--- a/client/util.c
+++ b/client/util.c
@@ -884,8 +884,8 @@ extern void strcreplace(char *buf, size_t len, char from, char to) {
 }
 
 extern char *strmcopy(char *buf) {
-	char* str = NULL;
-	if ((str = (char*) malloc(strlen(buf) + 1)) != NULL) {
+	char* str = (char*) calloc(strlen(buf) + 1, sizeof(uint8_t));
+	if (str != NULL) {
 		memset(str, 0, strlen(buf) + 1);
 		strcpy(str, buf);
 	}	
diff --git a/common/crapto1/crapto1.c b/common/crapto1/crapto1.c
index 8dc8f26c8..af1ed8167 100644
--- a/common/crapto1/crapto1.c
+++ b/common/crapto1/crapto1.c
@@ -405,7 +405,7 @@ int nonce_distance(uint32_t from, uint32_t to)
 {
 	uint16_t x, i;
 	if(!dist) {
-		dist = malloc(2 << 16);
+		dist = calloc(2 << 16,  sizeof(uint8_t));
 		if(!dist)
 			return -1;
 		for (x = i = 1; i; ++i) {
@@ -443,7 +443,7 @@ static uint32_t fastfwd[2][8] = {
  */
 uint32_t *lfsr_prefix_ks(uint8_t ks[8], int isodd)
 {
-	uint32_t *candidates = malloc(4 << 10);
+	uint32_t *candidates = calloc(4 << 10, sizeof(uint8_t));
 	if (!candidates) return 0;
 	
 	uint32_t c,  entry;
diff --git a/common/radixsort.c b/common/radixsort.c
index 91495316c..981c19191 100644
--- a/common/radixsort.c
+++ b/common/radixsort.c
@@ -3,7 +3,7 @@
 uint64_t * radixSort(uint64_t * array, uint32_t size) {
     rscounts_t counts;
     memset(&counts, 0, 256 * 8 * sizeof(uint32_t));
-    uint64_t * cpy = (uint64_t *)malloc(size * sizeof(uint64_t));
+    uint64_t * cpy = (uint64_t *)calloc(size * sizeof(uint64_t), sizeof(uint8_t));
     uint32_t o8=0, o7=0, o6=0, o5=0, o4=0, o3=0, o2=0, o1=0;
     uint32_t t8, t7, t6, t5, t4, t3, t2, t1;
     uint32_t x;
diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index d857729d6..cb878a4f0 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -75,7 +75,7 @@ const struct timeval timeout = {
 
 serial_port uart_open(const char* pcPortName)
 {
-  serial_port_unix* sp = malloc(sizeof(serial_port_unix));
+  serial_port_unix* sp = calloc(sizeof(serial_port_unix), sizeof(uint8_t));
   if (sp == 0) return INVALID_SERIAL_PORT;
 
   if (memcmp(pcPortName, "tcp:", 4) == 0) {
diff --git a/uart/uart_win32.c b/uart/uart_win32.c
index 11c90f15f..438f586c8 100644
--- a/uart/uart_win32.c
+++ b/uart/uart_win32.c
@@ -50,7 +50,7 @@ typedef struct {
 
 serial_port uart_open(const char* pcPortName) {
 	char acPortName[255];
-	serial_port_windows* sp = malloc(sizeof(serial_port_windows));
+	serial_port_windows* sp = calloc(sizeof(serial_port_windows), sizeof(uint8_t));
 
 	if (sp == 0) {
 		printf("[!] UART failed to allocate memory\n");

From ad72a424ef12b392490fad34f49d1a2d76adab5e Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 30 Jan 2019 21:40:50 +0100
Subject: [PATCH 0463/1938] chg: use calloc

---
 client/cmdhfmfhard.c                    | 2 +-
 client/fpga_compress.c                  | 6 +++---
 client/hid-flasher/flash.c              | 6 +++---
 client/loclass/cipher.c                 | 4 ++--
 client/loclass/elite_crack.c            | 2 +-
 client/proxmark3.c                      | 8 ++++----
 client/reveng/cli.c                     | 4 +++-
 client/reveng/model.c                   | 2 +-
 client/reveng/poly.c                    | 2 +-
 client/reveng/preset.c                  | 8 ++++++--
 client/reveng/reveng.c                  | 8 +++++---
 client/scandir.c                        | 3 ++-
 client/tinycbor/cborparser_dup_string.c | 2 +-
 client/tinycbor/cbortojson.c            | 4 ++--
 client/util.c                           | 2 +-
 15 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/client/cmdhfmfhard.c b/client/cmdhfmfhard.c
index 07e05a81e..3547761a5 100644
--- a/client/cmdhfmfhard.c
+++ b/client/cmdhfmfhard.c
@@ -209,7 +209,7 @@ static int compare_count_bitflip_bitarrays(const void *b1, const void *b2)
 
 static voidpf inflate_malloc(voidpf opaque, uInt items, uInt size)
 {
-	return malloc(items*size);
+	return calloc(items*size, sizeof(uint8_t));
 }
 
 
diff --git a/client/fpga_compress.c b/client/fpga_compress.c
index ceba6ac64..6e6e67be4 100644
--- a/client/fpga_compress.c
+++ b/client/fpga_compress.c
@@ -59,7 +59,7 @@ static void usage(void)
 
 static voidpf fpga_deflate_malloc(voidpf opaque, uInt items, uInt size)
 {
-	return malloc(items*size);
+	return calloc(items*size, sizeof(uint8_t));
 }
 
 
@@ -89,9 +89,9 @@ int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile, bool hardn
 	z_stream compressed_fpga_stream;
 
 	if (hardnested_mode) {
-		fpga_config = malloc(num_infiles * HARDNESTED_TABLE_SIZE);
+		fpga_config = calloc(num_infiles * HARDNESTED_TABLE_SIZE, sizeof(uint8_t));
 	} else {
-	fpga_config = malloc(num_infiles * FPGA_CONFIG_SIZE);
+		fpga_config = calloc(num_infiles * FPGA_CONFIG_SIZE, sizeof(uint8_t));
 	}		
 	// read the input files. Interleave them into fpga_config[]
 	i = 0;
diff --git a/client/hid-flasher/flash.c b/client/hid-flasher/flash.c
index e74f4ed49..c53e560d5 100644
--- a/client/hid-flasher/flash.c
+++ b/client/hid-flasher/flash.c
@@ -40,7 +40,7 @@ static int build_segs_from_phdrs(flash_file_t *ctx, FILE *fd, Elf32_Phdr *phdrs,
 	flash_seg_t *seg;
 	uint32_t last_end = 0;
 
-	ctx->segments = malloc(sizeof(flash_seg_t) * num_phdrs);
+	ctx->segments = calloc(sizeof(flash_seg_t) * num_phdrs, sizeof(uint8_t));
 	if (!ctx->segments) {
 		fprintf(stderr, "Out of memory\n");
 		return -1;
@@ -90,7 +90,7 @@ static int build_segs_from_phdrs(flash_file_t *ctx, FILE *fd, Elf32_Phdr *phdrs,
 
 		uint8_t *data;
 		// make extra space if we need to move the data forward
-		data = malloc(filesz + BLOCK_SIZE);
+		data = calloc(filesz + BLOCK_SIZE, sizeof(uint8_t));
 		if (!data) {
 			fprintf(stderr, "Out of memory\n");
 			return -1;
@@ -226,7 +226,7 @@ int flash_load(flash_file_t *ctx, const char *name, int can_write_bl)
 	}
 	num_phdrs = le16(ehdr.e_phnum);
 
-	phdrs = malloc(le16(ehdr.e_phnum) * sizeof(Elf32_Phdr));
+	phdrs = calloc(le16(ehdr.e_phnum) * sizeof(Elf32_Phdr), sizeof(uint8_t));
 	if (!phdrs) {
 		fprintf(stderr, "Out of memory\n");
 		goto fail;
diff --git a/client/loclass/cipher.c b/client/loclass/cipher.c
index af11ce4cc..e8553ba6c 100644
--- a/client/loclass/cipher.c
+++ b/client/loclass/cipher.c
@@ -224,7 +224,7 @@ void doMAC(uint8_t *cc_nr_p, uint8_t *div_key_p, uint8_t mac[4])
 {
 	uint8_t cc_nr[13] = { 0 };
     uint8_t div_key[8];
-	//cc_nr=(uint8_t*)malloc(length+1);
+	//cc_nr=(uint8_t*) calloc(length+1, sizeof(uint8_t));
 
 	memcpy(cc_nr, cc_nr_p, 12);
     memcpy(div_key, div_key_p, 8);
@@ -244,7 +244,7 @@ void doMAC_N(uint8_t *address_data_p, uint8_t address_data_size, uint8_t *div_ke
 {
 	uint8_t *address_data;
 	uint8_t div_key[8];
-	address_data = (uint8_t*) malloc(address_data_size);
+	address_data = (uint8_t*) calloc(address_data_size, sizeof(uint8_t));
 
 	memcpy(address_data, address_data_p, address_data_size);
 	memcpy(div_key, div_key_p, 8);
diff --git a/client/loclass/elite_crack.c b/client/loclass/elite_crack.c
index 2002e348f..6619e7aaa 100644
--- a/client/loclass/elite_crack.c
+++ b/client/loclass/elite_crack.c
@@ -493,7 +493,7 @@ int bruteforceDump(uint8_t dump[], size_t dumpsize, uint16_t keytable[]) {
 
 	uint64_t t1 = msclock();
 
-	dumpdata* attack = (dumpdata* ) malloc(itemsize);
+	dumpdata* attack = (dumpdata* ) calloc(itemsize, sizeof(uint8_t));
 
 	for (i = 0 ; i * itemsize < dumpsize ; i++ ) {
 		memcpy(attack, dump + i * itemsize, itemsize);
diff --git a/client/proxmark3.c b/client/proxmark3.c
index ed7fd245d..246da350b 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -215,11 +215,11 @@ const char *get_my_executable_directory(void) {
 static void set_my_executable_path(void) {
 	int path_length = wai_getExecutablePath(NULL, 0, NULL);
 	if (path_length != -1) {
-		my_executable_path = (char*)malloc(path_length + 1);
+		my_executable_path = (char*)calloc(path_length + 1, sizeof(uint8_t));
 		int dirname_length = 0;
 		if (wai_getExecutablePath(my_executable_path, path_length, &dirname_length) != -1) {
 			my_executable_path[path_length] = '\0';
-			my_executable_directory = (char *)malloc(dirname_length + 2);
+			my_executable_directory = (char *)calloc(dirname_length + 2, sizeof(uint8_t));
 			strncpy(my_executable_directory, my_executable_path, dirname_length+1);
 			my_executable_directory[dirname_length+1] = '\0';
 		}
@@ -321,9 +321,9 @@ int main(int argc, char* argv[]) {
 			} else {
 				if (addLuaExec){
 					// add "script run " to command
-					char *ctmp = NULL;
 					int len = strlen(script_cmd) + 11 + 1;
-					if ((ctmp = (char*) malloc(len)) != NULL) {
+					char *ctmp = (char*) calloc(len, sizeof(uint8_t));
+					if (ctmp != NULL) {
 						memset(ctmp, 0, len);
 						strcpy(ctmp, "script run ");
 						strcpy(&ctmp[11], script_cmd);
diff --git a/client/reveng/cli.c b/client/reveng/cli.c
index f4b40856a..6e147ba20 100644
--- a/client/reveng/cli.c
+++ b/client/reveng/cli.c
@@ -377,7 +377,9 @@ ipqx:
 
 			/* allocate argument array */
 			args = argc - optind;
-			if(!(apolys = malloc(args * sizeof(poly_t)))){
+			
+			apolys = calloc(args * sizeof(poly_t), sizeof(char));
+			if ( !apolys ){
 				uerror("cannot allocate memory for argument list");
 				return 0;
 			}
diff --git a/client/reveng/model.c b/client/reveng/model.c
index f99b1ee02..2c58d695a 100644
--- a/client/reveng/model.c
+++ b/client/reveng/model.c
@@ -118,7 +118,7 @@ char * mtostr(const model_t *model) {
 		+ (checkstr && *checkstr ? strlen(checkstr) : 6)
 		+ (magicstr && *magicstr ? strlen(magicstr) : 6)
 		+ (model->name && *model->name ? 2 + strlen(model->name) : 6);
-	if ((string = malloc(size))) {
+	if ((string = calloc(size, sizeof(uint8_t)))) {
 		sprintf(strbuf, "\"%s\"", model->name);
 		sprintf(string,
 				"width=%lu  "
diff --git a/client/reveng/poly.c b/client/reveng/poly.c
index 011a09978..7056c118a 100644
--- a/client/reveng/poly.c
+++ b/client/reveng/poly.c
@@ -349,7 +349,7 @@ pxsubs(const poly_t poly, int flags, int bperhx, unsigned long start, unsigned l
 	size *= cperhx;
 	if(!size || ~flags & P_SPACE) ++size; /* for trailing null */
 
-	if(!(sptr = string = (char *) malloc(size)))
+	if(!(sptr = string = (char *) calloc(size, sizeof(char))))
 		uerror("cannot allocate memory for string");
 
 	size = end - start;
diff --git a/client/reveng/preset.c b/client/reveng/preset.c
index 6dbedaed9..82a18b977 100644
--- a/client/reveng/preset.c
+++ b/client/reveng/preset.c
@@ -811,7 +811,9 @@ int mbynam(model_t *dest, const char *key) {
 
 	if (!aliases->name)
 		return(-1);
-	if (!(ukey = malloc((size_t) 1 + strlen(key) + 1))) {
+	
+	ukey = calloc((size_t) 1 + strlen(key) + 1, sizeof(char));
+	if (!ukey) {
 		uerror("[!] cannot allocate memory for comparison string");
 		return(0);
 	}
@@ -861,7 +863,9 @@ char * mnames(void) {
 		++aptr;
 	}
 	if (!size) return(NULL);
-	if ((string = malloc(size))) {
+	
+	string = calloc(size, sizeof(char));
+	if (string) {
 		aptr = aliases;
 		sptr = string;
 		while (aptr->name) {
diff --git a/client/reveng/reveng.c b/client/reveng/reveng.c
index 004a6fc3c..550dc2da5 100644
--- a/client/reveng/reveng.c
+++ b/client/reveng/reveng.c
@@ -173,8 +173,9 @@ modpol(const poly_t init, int rflags, int args, const poly_t *argpolys) {
 	unsigned long alen, blen;
 
 	if(args < 2) return(NULL);
-
-	if(!(result = malloc(((((args - 1) * args) >> 1) + 1) * sizeof(poly_t))))
+	
+	result = calloc(((((args - 1) * args) >> 1) + 1) * sizeof(poly_t), sizeof(char));
+	if(!result)
 		uerror("cannot allocate memory for codeword table");
 
 	rptr = result;
@@ -240,7 +241,8 @@ engini(int *resc, model_t **result, const poly_t divisor, int flags, int args, c
 	dlen = plen(divisor);
 
 	/* Allocate the CRC matrix */
-	if(!(mat = (poly_t *) malloc((dlen << 1) * sizeof(poly_t))))
+	mat = (poly_t *) calloc((dlen << 1) * sizeof(poly_t), sizeof(char));
+	if(!mat)
 		uerror("cannot allocate memory for CRC matrix");
 
 	/* Find arguments of the two shortest lengths */
diff --git a/client/scandir.c b/client/scandir.c
index 12bbef110..619bd72c6 100644
--- a/client/scandir.c
+++ b/client/scandir.c
@@ -51,7 +51,8 @@ int scandir (const char *dir,
 				nl = ntmp;
 			}
 
-			if (!(etmp = (struct dirent *) malloc (sizeof *ent))) {
+			etmp = (struct dirent *) calloc (sizeof *ent, sizeof(char));
+			if (!etmp) {
 				err_no = 1;
 				break;
 			}
diff --git a/client/tinycbor/cborparser_dup_string.c b/client/tinycbor/cborparser_dup_string.c
index 061c5ac77..202cd2022 100644
--- a/client/tinycbor/cborparser_dup_string.c
+++ b/client/tinycbor/cborparser_dup_string.c
@@ -105,7 +105,7 @@ CborError _cbor_value_dup_string(const CborValue *value, void **buffer, size_t *
         return err;
 
     ++*buflen;
-    *buffer = malloc(*buflen);
+    *buffer = calloc(*buflen, sizeof(uint8_t));
     if (!*buffer) {
         /* out of memory */
         return CborErrorOutOfMemory;
diff --git a/client/tinycbor/cbortojson.c b/client/tinycbor/cbortojson.c
index 5a1a2e5dc..34b900bab 100644
--- a/client/tinycbor/cbortojson.c
+++ b/client/tinycbor/cbortojson.c
@@ -178,7 +178,7 @@ static CborError dump_bytestring_base16(char **result, CborValue *it)
         return err;
 
     /* a Base16 (hex) output is twice as big as our buffer */
-    buffer = (uint8_t *)malloc(n * 2 + 1);
+    buffer = (uint8_t *)calloc(n * 2 + 1, sizeof(uint8_t));
     *result = (char *)buffer;
 
     /* let cbor_value_copy_byte_string know we have an extra byte for the terminating NUL */
@@ -204,7 +204,7 @@ static CborError generic_dump_base64(char **result, CborValue *it, const char al
 
     /* a Base64 output (untruncated) has 4 bytes for every 3 in the input */
     size_t len = (n + 5) / 3 * 4;
-    out = buffer = (uint8_t *)malloc(len + 1);
+    out = buffer = (uint8_t *)calloc(len + 1, sizeof(uint8_t));
     *result = (char *)buffer;
 
     /* we read our byte string at the tail end of the buffer
diff --git a/client/util.c b/client/util.c
index c4d6ae5a4..cea42f338 100644
--- a/client/util.c
+++ b/client/util.c
@@ -280,7 +280,7 @@ void sprint_bin_break_ex(uint8_t *src, size_t srclen, char *dest , uint8_t break
 	printf("(sprint_bin_break) rowlen %d\n", rowlen);
 	
 	// 3072 + end of line characters if broken at 8 bits
-	dest = (char *)malloc(MAX_BIN_BREAK_LENGTH); 
+	dest = (char *)calloc(MAX_BIN_BREAK_LENGTH, sizeof(uint8_t)); 
 	if (dest == NULL) return;
 	
 	//clear memory

From 5c231e772ccb7434c58601d1c1f6968621e7a980 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 30 Jan 2019 21:53:10 +0100
Subject: [PATCH 0464/1938] chg: use calloc

---
 client/flash.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/flash.c b/client/flash.c
index de6fdf7e6..2c06311c3 100644
--- a/client/flash.c
+++ b/client/flash.c
@@ -38,7 +38,7 @@ static int build_segs_from_phdrs(flash_file_t *ctx, FILE *fd, Elf32_Phdr *phdrs,
 	flash_seg_t *seg;
 	uint32_t last_end = 0;
 
-	ctx->segments = malloc(sizeof(flash_seg_t) * num_phdrs);
+	ctx->segments = calloc(sizeof(flash_seg_t) * num_phdrs, sizeof(uint8_t));
 	if (!ctx->segments) {
 		fprintf(stderr, "Out of memory\n");
 		return -1;
@@ -88,7 +88,7 @@ static int build_segs_from_phdrs(flash_file_t *ctx, FILE *fd, Elf32_Phdr *phdrs,
 
 		uint8_t *data;
 		// make extra space if we need to move the data forward
-		data = malloc(filesz + BLOCK_SIZE);
+		data = calloc(filesz + BLOCK_SIZE, sizeof(uint8_t));
 		if (!data) {
 			fprintf(stderr, "Error: Out of memory\n");
 			return -1;
@@ -111,7 +111,7 @@ static int build_segs_from_phdrs(flash_file_t *ctx, FILE *fd, Elf32_Phdr *phdrs,
 					uint32_t new_length = this_end - prev_seg->start;
 					uint32_t this_offset = paddr - prev_seg->start;
 					uint32_t hole = this_offset - prev_seg->length;
-					uint8_t *new_data = malloc(new_length);
+					uint8_t *new_data = calloc(new_length, sizeof(uint8_t));
 					if (!new_data) {
 						fprintf(stderr, "Error: Out of memory\n");
 						free(data);
@@ -223,7 +223,7 @@ int flash_load(flash_file_t *ctx, const char *name, int can_write_bl) {
 	}
 	num_phdrs = le16(ehdr.e_phnum);
 
-	phdrs = malloc(le16(ehdr.e_phnum) * sizeof(Elf32_Phdr));
+	phdrs = calloc(le16(ehdr.e_phnum) * sizeof(Elf32_Phdr), sizeof(uint8_t));
 	if (!phdrs) {
 		fprintf(stderr, "Out of memory\n");
 		goto fail;

From a01aead732c5a11a8f77bf944610ea2a32b2197e Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 31 Jan 2019 16:57:02 +0100
Subject: [PATCH 0465/1938] add: 'make get_xorsearch' - easy download of
 xorsearch by Didier Stevens,

see
https://blog.didierstevens.com/programs/xorsearch/
---
 tools/Makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/Makefile b/tools/Makefile
index 0a6e4430e..c750cce26 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -8,4 +8,7 @@ get_crapto1:
 
 get_nonce_bf:
 #	git clone https://github.com/J-Run/mf_key_brute.git mf_key_brute
-	git clone https://github.com/iceman1001/mf_nonce_brute mf_nonce_brute	
\ No newline at end of file
+	git clone https://github.com/iceman1001/mf_nonce_brute mf_nonce_brute	
+	
+get_xorsearch:
+	wget -N https://didierstevens.com/files/software/XORSearch_V1_11_2.zip
\ No newline at end of file

From 673c080ea53ae037495b5b9ec6e17d4a293d6ac1 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Fri, 1 Feb 2019 18:00:08 +0200
Subject: [PATCH 0466/1938] client part

---
 client/cmdhf14a.c | 164 +++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 141 insertions(+), 23 deletions(-)

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 4a6b7518d..d9b829e68 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -1,6 +1,6 @@
 //-----------------------------------------------------------------------------
 // Copyright (C) 2010 iZsh <izsh at fail0verflow.com>, Hagen Fritsch
-// 2011, 2017 Merlok
+// 2011, 2017 - 2019 Merlok
 // 2014, Peter Fillmore
 // 2015, 2016, 2017 Iceman
 //
@@ -12,6 +12,8 @@
 //-----------------------------------------------------------------------------
 #include "cmdhf14a.h"
 
+bool APDUInFramingEnable = true;
+
 static int CmdHelp(const char *Cmd);
 static int waitCmd(uint8_t iLen);
 
@@ -837,15 +839,90 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
 	return 0;
 }
 
-int CmdExchangeAPDU(uint8_t *datain, int datainlen, bool activateField, uint8_t *dataout, int maxdataoutlen, int *dataoutlen, bool *chaining) {
-	uint16_t cmdc = 0;
+int SelectCard14443_4(bool disconnect, iso14a_card_select_t *card) {
+    UsbCommand resp;
 
-	*chaining = false;
+	frameLength = 0;
+
+	if (card)
+		memset(card, 0, sizeof(iso14a_card_select_t));
 	
-	if (activateField) {
-		cmdc |= ISO14A_CONNECT;
+	DropField();	
+
+	// Anticollision + SELECT card
+	UsbCommand ca = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};
+	SendCommand(&ca);
+	if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
+		PrintAndLogEx(ERR, "Proxmark connection timeout.");
+		return 1;
 	}
 
+	// check result
+	if (resp.arg[0] == 0) {
+		PrintAndLogEx(ERR, "No card in field.");
+		return 1;
+	}
+
+	if (resp.arg[0] != 1 && resp.arg[0] != 2) {
+		PrintAndLogEx(ERR, "Card not in iso14443-4. res=%d.", resp.arg[0]);
+		return 1;
+	}
+
+	if (resp.arg[0] == 2) {		// 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
+		// get ATS 
+		UsbCommand cr = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT, 2, 0}}; 
+		uint8_t rats[] = { 0xE0, 0x80 }; // FSDI=8 (FSD=256), CID=0
+		memcpy(cr.d.asBytes, rats, 2);
+		SendCommand(&cr);
+		if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
+			PrintAndLogEx(ERR, "Proxmark connection timeout.");
+			return 1;
+		}
+		
+		if (resp.arg[0] <= 0) { // ats_len
+			PrintAndLogEx(ERR, "Can't get ATS.");
+			return 1;
+		}
+
+		// get frame length from ATS in data field
+		if (resp.arg[0] > 1) {
+			uint8_t fsci = resp.d.asBytes[1] & 0x0f;
+			if (fsci < sizeof(atsFSC))
+				frameLength = atsFSC[fsci];
+		}
+	} else {
+		// get frame length from ATS in card data structure
+		iso14a_card_select_t *vcard = (iso14a_card_select_t *) resp.d.asBytes;
+		if (vcard->ats_len > 1) {
+			uint8_t fsci = vcard->ats[1] & 0x0f;
+			if (fsci < sizeof(atsFSC))
+				frameLength = atsFSC[fsci];
+		}
+		
+		if (card)
+			memcpy(card, vcard, sizeof(iso14a_card_select_t));
+	}
+	
+	if (disconnect)
+		DropField();	
+
+	return 0;
+}
+
+int CmdExchangeAPDU(bool chainingin, uint8_t *datain, int datainlen, bool activateField, uint8_t *dataout, int maxdataoutlen, int *dataoutlen, bool *chainingout) {
+	*chainingout = false;
+	
+	if (activateField) {
+		// select with no disconnect and set frameLength
+		int selres = SelectCard14443_4(false, NULL);
+		if (selres)
+			return selres;
+	}
+	
+	uint16_t cmdc = 0;
+	if (chainingin)
+		cmdc = ISO14A_SEND_CHAINING;
+	
 	// "Command APDU" length should be 5+255+1, but javacard's APDU buffer might be smaller - 133 bytes
 	// https://stackoverflow.com/questions/32994936/safe-max-java-card-apdu-data-command-and-respond-size
 	// here length USB_CMD_DATA_SIZE=512
@@ -857,18 +934,6 @@ int CmdExchangeAPDU(uint8_t *datain, int datainlen, bool activateField, uint8_t
     uint8_t *recv;
     UsbCommand resp;
 
-	if (activateField) {
-		if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-			PrintAndLogEx(ERR, "APDU: Proxmark connection timeout.");
-			return 1;
-		}
-		if (resp.arg[0] != 1) {
-			PrintAndLogEx(ERR, "APDU: Proxmark error %d.", resp.arg[0]);
-			DropField();
-			return 1;
-		}
-	}
-
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         recv = resp.d.asBytes;
         int iLen = resp.arg[0];
@@ -884,13 +949,20 @@ int CmdExchangeAPDU(uint8_t *datain, int datainlen, bool activateField, uint8_t
 			return 2;
 		}
 		
+		// I-block ACK
+		if ((res & 0xf2) == 0xa2) {
+			*dataoutlen = 0;
+			*chainingout = true;
+			return 0;
+		}
+		
         if(!iLen) {
 			PrintAndLogEx(ERR, "APDU: No APDU response.");
             return 1;
 		}
 
 		// check apdu length
-		if (iLen < 4 && iLen >= 0) {
+		if (iLen < 2 && iLen >= 0) {
 			PrintAndLogEx(ERR, "APDU: Small APDU response. Len=%d", iLen);
 			return 2;
 		}
@@ -905,7 +977,7 @@ int CmdExchangeAPDU(uint8_t *datain, int datainlen, bool activateField, uint8_t
 		
 		// chaining
 		if ((res & 0x10) != 0) {
-			*chaining = true;
+			*chainingout = true;
 		}
 		
 		// CRC Check
@@ -924,12 +996,58 @@ int CmdExchangeAPDU(uint8_t *datain, int datainlen, bool activateField, uint8_t
 int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
 	*dataoutlen = 0;
 	bool chaining = false;
-	
-	int res = CmdExchangeAPDU(datain, datainlen, activateField, dataout, maxdataoutlen, dataoutlen, &chaining);
+	int res;
 
+printf("framelen=%d datainlen=%d\n", frameLength, datainlen);
+	// 3 byte here - 1b framing header, 2b crc16
+	if (APDUInFramingEnable && 
+		( (frameLength && (datainlen > frameLength - 3)) || (datainlen > USB_CMD_DATA_SIZE - 3)) ) {
+		int clen = 0;
+		
+		bool vActivateField = activateField;
+		
+		do {
+			int vlen = MIN(frameLength - 3, datainlen - clen);
+			bool chainBlockNotLast = ((clen + vlen) < datainlen);
+
+			*dataoutlen = 0;
+			res = CmdExchangeAPDU(chainBlockNotLast, &datain[clen], vlen, vActivateField, dataout, maxdataoutlen, dataoutlen, &chaining);
+			if (res) {
+				if (!leaveSignalON)
+					DropField();
+
+				return 200;
+			}
+
+			// check R-block ACK
+			if ((*dataoutlen == 0) && (*dataoutlen != 0 || chaining != chainBlockNotLast)) {
+				if (!leaveSignalON)
+					DropField();
+				
+				return 201;
+			}
+			
+			clen += vlen;
+			vActivateField = false;
+			if (*dataoutlen) {
+				if (clen != datainlen)
+					PrintAndLogEx(WARNING, "APDU: I-block/R-block sequence error. Data len=%d, Sent=%d, Last packet len=%d", datainlen, clen, *dataoutlen);
+				break;
+			}
+		} while (clen < datainlen);		
+	} else {
+		res = CmdExchangeAPDU(false, datain, datainlen, activateField, dataout, maxdataoutlen, dataoutlen, &chaining);
+		if (res) {
+			if (!leaveSignalON)
+				DropField();
+			
+			return res;
+		}
+	}
+	
 	while (chaining) {
 		// I-block with chaining
-		res = CmdExchangeAPDU(NULL, 0, false, &dataout[*dataoutlen], maxdataoutlen, dataoutlen, &chaining);
+		res = CmdExchangeAPDU(false, NULL, 0, false, &dataout[*dataoutlen], maxdataoutlen, dataoutlen, &chaining);
 		
 		if (res) {
 			if (!leaveSignalON)

From 09c5f0ef7638d5d536e72d1276dbb18e7ceb208d Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Fri, 1 Feb 2019 18:12:01 +0200
Subject: [PATCH 0467/1938] remove debug and small output addon. errors was not
 visible

---
 client/cmdhf14a.c      | 1 -
 client/fido/fidocore.c | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index d9b829e68..cff3eb61e 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -998,7 +998,6 @@ int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool lea
 	bool chaining = false;
 	int res;
 
-printf("framelen=%d datainlen=%d\n", frameLength, datainlen);
 	// 3 byte here - 1b framing header, 2b crc16
 	if (APDUInFramingEnable && 
 		( (frameLength && (datainlen > frameLength - 3)) || (datainlen > USB_CMD_DATA_SIZE - 3)) ) {
diff --git a/client/fido/fidocore.c b/client/fido/fidocore.c
index ee39fbbe9..f83e64944 100644
--- a/client/fido/fidocore.c
+++ b/client/fido/fidocore.c
@@ -250,9 +250,9 @@ int FIDOCheckDERAndGetKey(uint8_t *der, size_t derLen, bool verbose, uint8_t *pu
 	uint32_t verifyflags = 0;
 	res = mbedtls_x509_crt_verify(&cert, &cacert, NULL, NULL, &verifyflags, NULL, NULL);
 	if (res) {
-		PrintAndLog("ERROR: DER verify returned 0x%x - %s", (res<0)?-res:res, ecdsa_get_error(res));
+		PrintAndLog("ERROR: DER verify returned 0x%x - %s\n", (res<0)?-res:res, ecdsa_get_error(res));
 	} else {
-		PrintAndLog("Certificate OK.");
+		PrintAndLog("Certificate OK.\n");
 	}
 	
 	if (verbose) {

From 34bae8adcf18d503d36c84c29ad7f27bdb95e877 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Fri, 1 Feb 2019 18:51:53 +0200
Subject: [PATCH 0468/1938] add `hf 14a chaining`

---
 client/cmdhf14a.c | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index cff3eb61e..c38a876e8 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -1323,6 +1323,37 @@ int CmdHF14AAntiFuzz(const char *cmd) {
 	return 0;
 }
 
+int CmdHF14AChaining(const char *cmd) {
+	
+	CLIParserInit("hf 14a chaining", 
+		"Enable/Disable ISO14443a input chaining. Maximum input length goes from ATS.", 
+		"Usage:\n"
+		"\thf 14a chaining disable -> disable chaining\n"
+		"\thf 14a chaining         -> show chaining enable/disable state\n");
+
+	void* argtable[] = {
+		arg_param_begin,
+		arg_str0(NULL, NULL,      "<enable/disable or 0/1>", NULL),
+		arg_param_end
+	};
+	CLIExecWithReturn(cmd, argtable, true);
+
+	struct arg_str *str = arg_get_str(1);
+	int len = arg_get_str_len(1);
+	
+	if (len && (!strcmp(str->sval[0], "enable") || !strcmp(str->sval[0], "1")))
+		APDUInFramingEnable = true;
+	
+	if (len && (!strcmp(str->sval[0], "disable") || !strcmp(str->sval[0], "0")))
+		APDUInFramingEnable = false;
+
+	CLIParserFree();
+
+	PrintAndLogEx(INFO, "\nISO 14443-4 input chaining %s.\n", APDUInFramingEnable ? "enabled" : "disabled");
+	
+	return 0;
+}
+
 static command_t CommandTable[] = {
 	{"help",		CmdHelp,              1, "This help"},
 	{"list",		CmdHF14AList,         0, "[Deprecated] List ISO 14443-a history"},
@@ -1332,6 +1363,7 @@ static command_t CommandTable[] = {
 	{"sim",		CmdHF14ASim,          0, "<UID> -- Simulate ISO 14443-a tag"},
 	{"sniff",		CmdHF14ASniff,        0, "sniff ISO 14443-a traffic"},
 	{"apdu",		CmdHF14AAPDU,         0, "Send ISO 14443-4 APDU to tag"},
+	{"chaining",	CmdHF14AChaining,     0, "Control ISO 14443-4 input chaining"},
 	{"raw",		CmdHF14ACmdRaw,       0, "Send raw hex data to tag"},
 	{"antifuzz",	CmdHF14AAntiFuzz,     0, "Fuzzing the anticollision phase.  Warning! Readers may react strange"},
 	{NULL, NULL, 0, NULL}

From 029e75e866b9bb9abd97e4ab170e3ade7f8ecbc8 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Fri, 1 Feb 2019 18:54:57 +0200
Subject: [PATCH 0469/1938] formatting

---
 client/cmdhf14a.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index c38a876e8..9140a3502 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -1358,13 +1358,13 @@ static command_t CommandTable[] = {
 	{"help",		CmdHelp,              1, "This help"},
 	{"list",		CmdHF14AList,         0, "[Deprecated] List ISO 14443-a history"},
 	{"info",		CmdHF14AInfo,         0, "Tag information"},
-	{"reader",	CmdHF14AReader,       0, "Act like an ISO14443-a reader"},
+	{"reader",		CmdHF14AReader,       0, "Act like an ISO14443-a reader"},
 	{"cuids",		CmdHF14ACUIDs,        0, "<n> Collect n>0 ISO14443-a UIDs in one go"},
-	{"sim",		CmdHF14ASim,          0, "<UID> -- Simulate ISO 14443-a tag"},
+	{"sim",			CmdHF14ASim,          0, "<UID> -- Simulate ISO 14443-a tag"},
 	{"sniff",		CmdHF14ASniff,        0, "sniff ISO 14443-a traffic"},
 	{"apdu",		CmdHF14AAPDU,         0, "Send ISO 14443-4 APDU to tag"},
 	{"chaining",	CmdHF14AChaining,     0, "Control ISO 14443-4 input chaining"},
-	{"raw",		CmdHF14ACmdRaw,       0, "Send raw hex data to tag"},
+	{"raw",			CmdHF14ACmdRaw,       0, "Send raw hex data to tag"},
 	{"antifuzz",	CmdHF14AAntiFuzz,     0, "Fuzzing the anticollision phase.  Warning! Readers may react strange"},
 	{NULL, NULL, 0, NULL}
 };

From 77f4492433f170db1f1bd06eba0d3bb09be4531b Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 2 Feb 2019 19:30:32 +0100
Subject: [PATCH 0470/1938] fix: 'hf 15 write' - faulty string formatter token

---
 client/cmdhf15.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index d8a212130..a1b55d7c6 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -1241,7 +1241,7 @@ int CmdHF15Write(const char *Cmd) {
 	AddCrc(req, reqlen);
 	c.arg[0] = reqlen+2;
 	
-	PrintAndLogEx(NORMAL, "iso15693 writing to page %02d (0x&02X) | data ", pagenum, pagenum);
+	PrintAndLogEx(NORMAL, "iso15693 writing to page %02d (0x%02X) | data ", pagenum, pagenum);
 	
 	clearCommandBuffer();
 	SendCommand(&c);

From 95db68fa30af72786f58cd08d1abdc9084c46669 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 3 Feb 2019 10:18:22 +0100
Subject: [PATCH 0471/1938] FIX: scripts path needed for scripts to call other
 scripts.

---
 client/scripting.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/client/scripting.c b/client/scripting.c
index 3d3518ced..b6bb80f33 100644
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -758,6 +758,15 @@ int set_pm3_libraries(lua_State *L) {
     //-- remove the global environment table from the stack
     lua_pop(L, 1);
 
+	
+	//--add to the LUA_PATH (package.path in lua)
+    // so we can load scripts from the ./scripts/ - directory
+	char scripts_path[strlen(get_my_executable_directory()) + strlen(LUA_SCRIPTS_DIRECTORY) + strlen(LUA_LIBRARIES_WILDCARD) + 1];
+	strcpy(scripts_path, get_my_executable_directory());
+	strcat(scripts_path, LUA_SCRIPTS_DIRECTORY);
+	strcat(scripts_path, LUA_LIBRARIES_WILDCARD);
+	setLuaPath(L, scripts_path);
+	
     //-- Last but not least, add to the LUA_PATH (package.path in lua)
     // so we can load libraries from the ./lualib/ - directory
 	char libraries_path[strlen(get_my_executable_directory()) + strlen(LUA_LIBRARIES_DIRECTORY) + strlen(LUA_LIBRARIES_WILDCARD) + 1];
@@ -765,6 +774,5 @@ int set_pm3_libraries(lua_State *L) {
 	strcat(libraries_path, LUA_LIBRARIES_DIRECTORY);
 	strcat(libraries_path, LUA_LIBRARIES_WILDCARD);
 	setLuaPath(L, libraries_path);
-
     return 1;
 }
\ No newline at end of file

From 7678ab13e0b2bae4d8a58ae1194ffa6379700d73 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Sun, 3 Feb 2019 22:36:15 +0200
Subject: [PATCH 0472/1938] add slolkey CA root

---
 client/fido/additional_ca.c | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/client/fido/additional_ca.c b/client/fido/additional_ca.c
index f529e99b5..564eda2ae 100644
--- a/client/fido/additional_ca.c
+++ b/client/fido/additional_ca.c
@@ -58,6 +58,23 @@
 "U9psmyPzK+Vsgw2jeRQ5JlKDyqE0hebfC1tvFu0CCrJFcw==\r\n" \
 "-----END CERTIFICATE-----\r\n"
 
+// Name: SoloKey U2F Root CA Serial 14143382635911888524 (0xc44763928ff4be8c)
+// Issued: 2018-11-11
+#define SOLOKEY_CA	\
+"-----BEGIN CERTIFICATE-----\r\n" \
+"MIIB9DCCAZoCCQDER2OSj/S+jDAKBggqhkjOPQQDAjCBgDELMAkGA1UEBhMCVVMx\r\n" \
+"ETAPBgNVBAgMCE1hcnlsYW5kMRIwEAYDVQQKDAlTb2xvIEtleXMxEDAOBgNVBAsM\r\n" \
+"B1Jvb3QgQ0ExFTATBgNVBAMMDHNvbG9rZXlzLmNvbTEhMB8GCSqGSIb3DQEJARYS\r\n" \
+"aGVsbG9Ac29sb2tleXMuY29tMCAXDTE4MTExMTEyNTE0MloYDzIwNjgxMDI5MTI1\r\n" \
+"MTQyWjCBgDELMAkGA1UEBhMCVVMxETAPBgNVBAgMCE1hcnlsYW5kMRIwEAYDVQQK\r\n" \
+"DAlTb2xvIEtleXMxEDAOBgNVBAsMB1Jvb3QgQ0ExFTATBgNVBAMMDHNvbG9rZXlz\r\n" \
+"LmNvbTEhMB8GCSqGSIb3DQEJARYSaGVsbG9Ac29sb2tleXMuY29tMFkwEwYHKoZI\r\n" \
+"zj0CAQYIKoZIzj0DAQcDQgAEWHAN0CCJVZdMs0oktZ5m93uxmB1iyq8ELRLtqVFL\r\n" \
+"SOiHQEab56qRTB/QzrpGAY++Y2mw+vRuQMNhBiU0KzwjBjAKBggqhkjOPQQDAgNI\r\n" \
+"ADBFAiEAz9SlrAXIlEu87vra54rICPs+4b0qhp3PdzcTg7rvnP0CIGjxzlteQQx+\r\n" \
+"jQGd7rwSZuE5RWUPVygYhUstQO9zNUOs\r\n" \
+"-----END CERTIFICATE-----\r\n"
+
 /* Concatenation of all additional CA certificates in PEM format if available */
-const char   additional_ca_pem[] = GLOBALSIGN_CA YUBICO_CA;
+const char   additional_ca_pem[] = GLOBALSIGN_CA YUBICO_CA SOLOKEY_CA;
 const size_t additional_ca_pem_len = sizeof(additional_ca_pem);

From 75aeec65072b47694d51796aa7581ced2f0b9fda Mon Sep 17 00:00:00 2001
From: bogiton <34060135+bogiton@users.noreply.github.com>
Date: Mon, 4 Feb 2019 17:44:29 +0000
Subject: [PATCH 0473/1938]  Add led blink on successful flash write

---
 armsrc/Standalone/hf_bog.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/armsrc/Standalone/hf_bog.c b/armsrc/Standalone/hf_bog.c
index 9079d5df3..65254bd5c 100644
--- a/armsrc/Standalone/hf_bog.c
+++ b/armsrc/Standalone/hf_bog.c
@@ -271,6 +271,11 @@ void RAMFUNC SniffAndStore(uint8_t param) {
 		uint16_t writelen = Flash_WriteData(0, total_data, memoffset + 4 * auth_attempts);
 		if (MF_DBGLEVEL > 1) Dbprintf("[!] Wrote %u bytes into flash mem", writelen);
 		
+                // If pwd saved successfully, blink led A three times
+		if (writelen > 0) {
+			SpinErr(0, 200, 5); // blink led A
+		}
+		
 		SpinDelay(100);
 		
 		// Reset the SPI Baudrate to the default value (24MHz)

From cd44ea27b785d693a03689cb709d5cefd13c0537 Mon Sep 17 00:00:00 2001
From: "osboxes.org" <chris@rfidresearch.com>
Date: Mon, 4 Feb 2019 22:16:12 +0100
Subject: [PATCH 0474/1938] FIX: 'script run mifare_autopwn' - now doesn't
 crash

---
 client/scripts/mifare_autopwn.lua | 46 ++++++++++++++++++++++---------
 client/scripts/remagic.lua        |  1 +
 2 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/client/scripts/mifare_autopwn.lua b/client/scripts/mifare_autopwn.lua
index 9bd149a55..738ca6950 100644
--- a/client/scripts/mifare_autopwn.lua
+++ b/client/scripts/mifare_autopwn.lua
@@ -12,8 +12,10 @@ This is a script which automates cracking and dumping mifare classic cards. It s
 place by the device. 
 
 Arguments:
-	-d 				debug logging on
-	-h 				this help
+	-h 			this help
+	-d 			debug logging on
+	-k			known key for Sector 0 ,  keytype A
+
 
 Output files from this operation:
 	<uid>.eml 		- emulator file
@@ -73,12 +75,12 @@ local function nested(key,sak)
 	if 0x18 == sak then --NXP MIFARE Classic 4k | Plus 4k | Ev1 4k
 		typ = 4
 	elseif 0x08 == sak then -- NXP MIFARE CLASSIC 1k | Plus 2k | Ev1 1K
-		typ= 1
+		typ = 1
 	elseif 0x09 == sak then -- NXP MIFARE Mini 0.3k
 		typ = 0
-	elseif  0x10 == sak then-- "NXP MIFARE Plus 2k"
+	elseif 0x10 == sak then-- "NXP MIFARE Plus 2k"
 		typ = 2
-	elseif  0x01 == sak then-- "NXP MIFARE TNP3xxx 1K"
+	elseif 0x01 == sak then-- "NXP MIFARE TNP3xxx 1K"
 		typ = 1
 	else
 		print("I don't know how many sectors there are on this type of card, defaulting to 16")
@@ -87,22 +89,40 @@ local function nested(key,sak)
 	core.console(cmd)
 end
 
-local function dump(uid)
+local function dump(uid, numsectors)
 	dbg('dumping tag memory')
 
+	local typ = 1
+	if 0x18 == sak then --NXP MIFARE Classic 4k | Plus 4k | Ev1 4k
+		typ = 4
+	elseif 0x08 == sak then -- NXP MIFARE CLASSIC 1k | Plus 2k | Ev1 1K
+		typ = 1
+	elseif 0x09 == sak then -- NXP MIFARE Mini 0.3k
+		typ = 0
+	elseif 0x10 == sak then-- "NXP MIFARE Plus 2k"
+		typ = 2
+	elseif 0x01 == sak then-- "NXP MIFARE TNP3xxx 1K"
+		typ = 1
+	end
+
 	if utils.confirm('Do you wish to create a memory dump of tag?') then 
 
-		core.console("hf mf dump")
+		local dumpfile = 'hf-mf-'..uid..'-data.bin'
+
+		local dmp = ('hf mf dump %s f %s'):format(typ, dumpfile)
+		core.console(dmp)
+
 		-- Save the global args, those are *our* arguments
 		local myargs = args
 		-- Set the arguments for htmldump script
-		args =("-o %s.html"):format(uid)
+		args =('-i %s -o %s.html'):format(dumpfile, uid)
 		-- call it 
-		require('../scripts/htmldump')
+		require('htmldump')
 
-		args =""
 		-- dump to emulator
-		require('../scripts/dumptoemul')
+		args =('-i %s -o %s.eml'):format(dumpfile, uid)
+		require('dumptoemul')
+
 		-- Set back args. Not that it's used, just for the karma... 
 		args = myargs
 	end
@@ -177,9 +197,9 @@ local function main(args)
 					print("Found valid key: "..key);
 				end
 				-- Use nested attack
-				nested(key,sak)
+				nested(key, sak)
 				-- Dump info
-				dump(uid)
+				dump(uid, sak)
 
 				if #key == 12 then exit = true end
 			else
diff --git a/client/scripts/remagic.lua b/client/scripts/remagic.lua
index 5062d8cf4..10e25583a 100644
--- a/client/scripts/remagic.lua
+++ b/client/scripts/remagic.lua
@@ -72,6 +72,7 @@ local function sendCmds( cmds )
 		if cmds[i]  then 
 			print ( cmds[i]  )
 			core.console( cmds[i] )
+			core.clearCommandBuffer()
 		end
 	end
 end

From 0e5d8968938199b91c760921ebf1b0428747530a Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 5 Feb 2019 18:27:48 +0200
Subject: [PATCH 0475/1938] fix endless loop

---
 armsrc/iso14443a.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 082d378ac..e63cd5e74 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -2248,7 +2248,7 @@ int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, bool send_chaining, void *data, u
 		return 0; //DATA LINK ERROR
 	} else{
 		// S-Block WTX 
-		while((data_bytes[0] & 0xF2) == 0xF2) {
+		while(len && ((data_bytes[0] & 0xF2) == 0xF2)) {
 			uint32_t save_iso14a_timeout = iso14a_get_timeout();
 			// temporarily increase timeout
 			iso14a_set_timeout( MAX((data_bytes[1] & 0x3f) * save_iso14a_timeout, MAX_ISO14A_TIMEOUT) );

From 69f3e65dd0c8a1f1f95c4bbb0b975205f57c40c1 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 5 Feb 2019 18:39:03 +0200
Subject: [PATCH 0476/1938] fix memmove if len=0

---
 armsrc/iso14443a.c | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index e63cd5e74..4267d28af 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -2266,32 +2266,34 @@ int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, bool send_chaining, void *data, u
 			iso14a_set_timeout(save_iso14a_timeout);
 		}
 
-	// if we received an I- or R(ACK)-Block with a block number equal to the
-	// current block number, toggle the current block number
+		// if we received an I- or R(ACK)-Block with a block number equal to the
+		// current block number, toggle the current block number
 		if (len >= 3 // PCB+CRC = 3 bytes
 	         && ((data_bytes[0] & 0xC0) == 0 // I-Block
 	             || (data_bytes[0] & 0xD0) == 0x80) // R-Block with ACK bit set to 0
 	         && (data_bytes[0] & 0x01) == iso14_pcb_blocknum) // equal block numbers
-	{
-		iso14_pcb_blocknum ^= 1;
-	}
+		{
+			iso14_pcb_blocknum ^= 1;
+		}
 		
 		// if we received I-block with chaining we need to send ACK and receive another block of data
 		if (res)
 			*res = data_bytes[0];
 
 		// crc check
-		if (len >=3 && !check_crc(CRC_14443_A, data_bytes, len)) {
+		if (len >= 3 && !check_crc(CRC_14443_A, data_bytes, len)) {
 			return -1;
 		}
 		
 	}
 	
-	// cut frame byte
-	len -= 1;
-	// memmove(data_bytes, data_bytes + 1, len);
-	for (int i = 0; i < len; i++)
-		data_bytes[i] = data_bytes[i + 1];
+	if (len) {
+		// cut frame byte
+		len -= 1;
+		// memmove(data_bytes, data_bytes + 1, len);
+		for (int i = 0; i < len; i++)
+			data_bytes[i] = data_bytes[i + 1];
+	}
 	
 	return len;
 }

From 7934630d2bfa3768e23b0aed43f72ca830a520cd Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 14 Feb 2019 19:27:39 +0100
Subject: [PATCH 0477/1938] FIX: Makefile bad styled calls

---
 armsrc/Makefile |  4 ++--
 client/Makefile | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/armsrc/Makefile b/armsrc/Makefile
index 76f3a0173..efc443227 100644
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -21,7 +21,7 @@ APP_CFLAGS = -DWITH_CRC \
 			 -DWITH_ISO14443a \
 			 -DWITH_ICLASS \
 			 -DWITH_FELICA \
-			 -DWITH_FLASH \
+ 			 -DWITH_FLASH \
 			 -DWITH_SMARTCARD \
 			 -DWITH_FPC \
 			 -DWITH_HFSNOOP \
@@ -191,7 +191,7 @@ $(OBJDIR)/fpga_all.bit.z: $(FPGA_BITSTREAMS) $(FPGA_COMPRESSOR)
 	$(FPGA_COMPRESSOR) $(filter %.bit,$^) $@  
 
 $(FPGA_COMPRESSOR):
-		make -C ../client $(notdir $(FPGA_COMPRESSOR))
+		$(MAKE) -C ../client $(notdir $(FPGA_COMPRESSOR))
 		
 $(OBJDIR)/fullimage.stage1.elf: $(VERSIONOBJ) $(OBJDIR)/fpga_all.o $(THUMBOBJ) $(ARMOBJ)
 	$(CC) $(LDFLAGS) -Wl,-T,ldscript,-Map,$(patsubst %.elf,%.map,$@) -o $@ $^ $(LIBS)
diff --git a/client/Makefile b/client/Makefile
index 4f7168fa0..0b19d4599 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -299,29 +299,29 @@ lualibs/mf_default_keys.lua : default_keys.dic
 	
 clean:
 	$(RM) $(CLEAN)
-	cd ../liblua && make clean
-	cd $(JANSSONLIBPATH) && make clean
-	cd $(MBEDTLSLIBPATH) && make clean
-	cd $(CBORLIBPATH) && make clean
+	cd ../liblua && $(MAKE) clean
+	cd $(JANSSONLIBPATH) && $(MAKE) clean
+	cd $(MBEDTLSLIBPATH) && $(MAKE) clean
+	cd $(CBORLIBPATH) && $(MAKE) clean
 
 tarbin: $(BINS)
 	$(TAR) $(TARFLAGS) ../proxmark3-$(platform)-bin.tar $(BINS:%=client/%) $(WINBINS:%=client/%)
 
 lua_build:
 	@echo Compiling liblua, using platform $(LUAPLATFORM)
-	cd ../liblua && make $(LUAPLATFORM)
+	cd ../liblua && $(MAKE) $(LUAPLATFORM)
 	
 jansson_build:
 	@echo Compiling jansson
-	cd $(JANSSONLIBPATH) && make all
+	cd $(JANSSONLIBPATH) && $(MAKE) all
 
 mbedtls_build:
 	@echo Compiling mbedtls
-	cd $(MBEDTLSLIBPATH) && make all
+	cd $(MBEDTLSLIBPATH) && $(MAKE) all
 	
 cbor_build:
 	@echo Compiling tinycbor
-	cd $(CBORLIBPATH) && make all
+	cd $(CBORLIBPATH) && $(MAKE) all
 	
 .PHONY: all clean
 

From 35df317a2cae5610c9b94fdcd0718916eb9257ad Mon Sep 17 00:00:00 2001
From: vratiskol <vratiskol@users.noreply.github.com>
Date: Fri, 15 Feb 2019 01:08:30 +0100
Subject: [PATCH 0478/1938] Update MAXBLOCK - MF 4K

- Modify MAXBLOCK size: 4k => 256
- Typo
---
 client/cmdhfmf.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index a26381930..32fd65872 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -11,7 +11,7 @@
 #include "cmdhfmf.h"
 #include "mifare4.h"
 
-#define MIFARE_4K_MAXBLOCK 255
+#define MIFARE_4K_MAXBLOCK 256
 #define MIFARE_2K_MAXBLOCK 128 
 #define MIFARE_1K_MAXBLOCK 64
 #define MIFARE_MINI_MAXBLOCK 20
@@ -2503,7 +2503,7 @@ int CmdHF14AMfESave(const char *Cmd) {
 	}
 	memset(dump, 0, bytes);
 	
-	PrintAndLogEx(INFO, "dowingloading from emulator memory");
+	PrintAndLogEx(INFO, "downloading from emulator memory");
 	if (!GetFromDevice( BIG_BUF_EML, dump, bytes, 0, NULL, 2500, false)) {
 		PrintAndLogEx(WARNING, "Fail, transfer from device time-out");
 		free(dump);

From f8985ed1be1179437b6cf669559585d0b5e0d7f0 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 15 Feb 2019 12:38:38 +0100
Subject: [PATCH 0479/1938] chg: remove warning for overflow

---
 client/cmdhfmf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index a26381930..55f2b03df 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -645,7 +645,7 @@ int CmdHF14AMfRdSc(const char *Cmd) {
   return 0;
 }
 
-uint8_t NumOfBlocks(char card){
+uint16_t NumOfBlocks(char card){
 	switch(card){
 		case '0' : return MIFARE_MINI_MAXBLOCK;
 		case '1' : return MIFARE_1K_MAXBLOCK;

From 8e6b41f513e4aac14845a507a6bf52c6df93c303 Mon Sep 17 00:00:00 2001
From: vratiskol <vincent.ratiskol@github.com>
Date: Fri, 15 Feb 2019 15:17:28 +0100
Subject: [PATCH 0480/1938] Use Variable for MIFARE_MINI_MAXSECTOR Modify type
 uint16_t => 256

---
 client/cmdhfmf.c | 41 +++++++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 32fd65872..8129aceb6 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -16,6 +16,11 @@
 #define MIFARE_1K_MAXBLOCK 64
 #define MIFARE_MINI_MAXBLOCK 20
 
+#define MIFARE_MINI_MAXSECTOR 5
+#define MIFARE_1K_MAXSECTOR 16
+#define MIFARE_2K_MAXSECTOR 32
+#define MIFARE_4K_MAXSECTOR 40
+
 static int CmdHelp(const char *Cmd);
 
 int usage_hf14_ice(void){
@@ -591,7 +596,7 @@ int CmdHF14AMfRdSc(const char *Cmd) {
 	}	
 	
 	sectorNo = param_get8(Cmd, 0);
-	if (sectorNo > 39) {
+	if (sectorNo > MIFARE_4K_MAXSECTOR ) {
 		PrintAndLogEx(NORMAL, "Sector number must be less than 40");
 		return 1;
 	}
@@ -645,7 +650,7 @@ int CmdHF14AMfRdSc(const char *Cmd) {
   return 0;
 }
 
-uint8_t NumOfBlocks(char card){
+uint16_t NumOfBlocks(char card){
 	switch(card){
 		case '0' : return MIFARE_MINI_MAXBLOCK;
 		case '1' : return MIFARE_1K_MAXBLOCK;
@@ -656,11 +661,11 @@ uint8_t NumOfBlocks(char card){
 }
 uint8_t NumOfSectors(char card){
 	switch(card){
-		case '0' : return 5;
-		case '1' : return 16;
-		case '2' : return 32;
-		case '4' : return 40;
-		default  : return 16;
+		case '0' : return MIFARE_MINI_MAXSECTOR; 
+		case '1' : return MIFARE_1K_MAXSECTOR; 
+		case '2' : return MIFARE_2K_MAXSECTOR; 
+		case '4' : return MIFARE_4K_MAXSECTOR; 
+		default  : return MIFARE_1K_MAXSECTOR;
 	}
 }
 
@@ -1497,11 +1502,11 @@ int CmdHF14AMfChk_fast(const char *Cmd) {
 	
 	// sectors
 	switch(ctmp) {
-		case '0': sectorsCnt =  5; break;
-		case '1': sectorsCnt = 16; break;
-		case '2': sectorsCnt = 32; break;
-		case '4': sectorsCnt = 40; break;
-		default:  sectorsCnt = 16;
+		case '0': sectorsCnt =  MIFARE_MINI_MAXSECTOR; break;
+		case '1': sectorsCnt = MIFARE_1K_MAXSECTOR; break;
+		case '2': sectorsCnt = MIFARE_2K_MAXSECTOR; break;
+		case '4': sectorsCnt = MIFARE_4K_MAXSECTOR; break;
+		default:  sectorsCnt = MIFARE_1K_MAXSECTOR;
 	}
 
 	for (i = 1; param_getchar(Cmd, i); i++) {
@@ -2412,14 +2417,14 @@ int CmdHF14AMfELoad(const char *Cmd) {
 		return usage_hf14_eload();
 	
 	switch (c) {
-		case '0' : numBlocks = 5*4; break;
+		case '0' : numBlocks = MIFARE_MINI_MAXBLOCK; break;
 		case '1' : 
-		case '\0': numBlocks = 16*4; break;
-		case '2' : numBlocks = 32*4; break;
-		case '4' : numBlocks = 256; break;
+		case '\0': numBlocks = MIFARE_1K_MAXBLOCK; break;
+		case '2' : numBlocks = MIFARE_2K_MAXBLOCK; break;
+		case '4' : numBlocks = MIFARE_4K_MAXBLOCK; break;
 		case 'u' : numBlocks = 255; blockWidth = 4; break;
 		default:  {
-			numBlocks = 16*4;
+			numBlocks = MIFARE_1K_MAXBLOCK;
 			nameParamNo = 0;
 		}
 	}
@@ -2761,7 +2766,7 @@ int CmdHF14AMfCLoad(const char *Cmd) {
 		blockNum++;
 		
 		// magic card type - mifare 1K
-		if (blockNum >= 16 * 4) break;  
+		if (blockNum >= MIFARE_1K_MAXBLOCK ) break;  
 	}
 	PrintAndLogEx(NORMAL, "\n");
 

From 77eaa360930ca3d9efb7db8adaaf5df2b9444894 Mon Sep 17 00:00:00 2001
From: Iceman <iceman@iuse.se>
Date: Sun, 17 Feb 2019 11:07:48 +0100
Subject: [PATCH 0481/1938] Update README.md

---
 README.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index effdc0f6e..c8c04f852 100644
--- a/README.md
+++ b/README.md
@@ -78,7 +78,14 @@ This fork now compiles just fine on
 
 ## KALI and ARCHLINUX users
 Kali and ArchLinux users usually must kill their modem manager in order for the proxmark3 to enumerate properly.   
-`sudo apt remove modemmanager`
+```sh
+sudo apt remove modemmanager
+```
+or 
+```sh
+systemctl stop ModemManager
+systemctl disable ModemManager
+```
 
 ## Setup and build for UBUNTU
 GC made updates to allow this to build easily on Ubuntu 14.04.2 LTS, 15.10 or 16.04

From 535d4e6ee9e2ab49b130acafe1440aaaab4d1048 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 17 Feb 2019 15:37:20 +0100
Subject: [PATCH 0482/1938] FIX: usb slow for posix systems - 
 https://github.com/Proxmark/proxmark3/pull/787  (@fl0-0)

---
 uart/uart_posix.c | 543 +++++++++++++++++++++++-----------------------
 1 file changed, 273 insertions(+), 270 deletions(-)

diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index cb878a4f0..88397fa5f 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -70,338 +70,341 @@ typedef struct {
 // Set time-out on 30 miliseconds
 const struct timeval timeout = {
   .tv_sec  =     0, // 0 second
-  .tv_usec = 300000  // 300 000 micro seconds
+  .tv_usec = 30000  // 30 000 micro seconds
 };
 
-serial_port uart_open(const char* pcPortName)
-{
-  serial_port_unix* sp = calloc(sizeof(serial_port_unix), sizeof(uint8_t));
-  if (sp == 0) return INVALID_SERIAL_PORT;
+serial_port uart_open(const char* pcPortName) {
+	serial_port_unix* sp = calloc(sizeof(serial_port_unix), sizeof(uint8_t));
+	if (sp == 0) return INVALID_SERIAL_PORT;
 
-  if (memcmp(pcPortName, "tcp:", 4) == 0) {
-    struct addrinfo *addr, *rp;
-    char *addrstr = strdup(pcPortName + 4);
+	if (memcmp(pcPortName, "tcp:", 4) == 0) {
+		struct addrinfo *addr, *rp;
+		char *addrstr = strdup(pcPortName + 4);
 
-    if (addrstr == NULL) {
-      printf("Error: strdup\n");
-      return INVALID_SERIAL_PORT;
-    }
+		if (addrstr == NULL) {
+			printf("Error: strdup\n");
+			return INVALID_SERIAL_PORT;
+		}
 
-    char *colon = strrchr(addrstr, ':');
-    char *portstr;
-    if (colon) {
-      portstr = colon + 1;
-      *colon = '\0';
-    } else {
-      portstr = "7901";
+		timeout.tv_usec = 300000  // 300 000 micro seconds
+		
+		char *colon = strrchr(addrstr, ':');
+		char *portstr;
+		if (colon) {
+			portstr = colon + 1;
+			*colon = '\0';
+		} else {
+			portstr = "7901";
+		}
+
+		int s = getaddrinfo(addrstr, portstr, NULL, &addr);
+		if (s != 0) {
+			printf("Error: getaddrinfo: %s\n", gai_strerror(s));
+			return INVALID_SERIAL_PORT;
+		}
+
+		int sfd;
+		for (rp = addr; rp != NULL; rp = rp->ai_next) {
+			sfd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
+
+			if (sfd == -1)
+				continue;
+
+			if (connect(sfd, rp->ai_addr, rp->ai_addrlen) != -1)
+				break;
+
+			close(sfd);
+		}
+
+		if (rp == NULL) {               /* No address succeeded */
+			printf("Error: Could not connect\n");
+			return INVALID_SERIAL_PORT;
+		}
+
+		freeaddrinfo(addr);
+		free(addrstr);
+
+		sp->fd = sfd;
+
+		int one = 1;
+		setsockopt(sp->fd, SOL_TCP, TCP_NODELAY, &one, sizeof(one));
+		return sp;
 	}
-	
-	int s = getaddrinfo(addrstr, portstr, NULL, &addr);
-    if (s != 0) {
-      printf("Error: getaddrinfo: %s\n", gai_strerror(s));
-      return INVALID_SERIAL_PORT;
-    }
-
-    int sfd;
-    for (rp = addr; rp != NULL; rp = rp->ai_next) {
-      sfd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
-
-      if (sfd == -1)
-		continue;
-	
-      if (connect(sfd, rp->ai_addr, rp->ai_addrlen) != -1)
-		break;
-	
-      close(sfd);
-    }
-	
-    if (rp == NULL) {               /* No address succeeded */
-      printf("Error: Could not connect\n");
-      return INVALID_SERIAL_PORT;
-    }
-	
-    freeaddrinfo(addr);
-    free(addrstr);
-	
-    sp->fd = sfd;
-
-    int one = 1;
-    setsockopt(sp->fd, SOL_TCP, TCP_NODELAY, &one, sizeof(one));
-    return sp;
-  }
 
   
-  sp->fd = open(pcPortName, O_RDWR | O_NOCTTY | O_NDELAY | O_NONBLOCK);
-  if(sp->fd == -1) {
-    uart_close(sp);
-    return INVALID_SERIAL_PORT;
-  }
+	sp->fd = open(pcPortName, O_RDWR | O_NOCTTY | O_NDELAY | O_NONBLOCK);
+	if(sp->fd == -1) {
+		uart_close(sp);
+		return INVALID_SERIAL_PORT;
+	}
 
-  // Finally figured out a way to claim a serial port interface under unix
-  // We just try to set a (advisory) lock on the file descriptor
-  struct flock fl;
-  fl.l_type   = F_WRLCK;
-  fl.l_whence = SEEK_SET;
-  fl.l_start  = 0;
-  fl.l_len    = 0;
-  fl.l_pid    = getpid();
-  
-  // Does the system allows us to place a lock on this file descriptor
-  if (fcntl(sp->fd, F_SETLK, &fl) == -1) {
-    // A conflicting lock is held by another process
-    free(sp);
-    return CLAIMED_SERIAL_PORT;
-  }
+	// Finally figured out a way to claim a serial port interface under unix
+	// We just try to set a (advisory) lock on the file descriptor
+	struct flock fl;
+	fl.l_type   = F_WRLCK;
+	fl.l_whence = SEEK_SET;
+	fl.l_start  = 0;
+	fl.l_len    = 0;
+	fl.l_pid    = getpid();
+
+	// Does the system allows us to place a lock on this file descriptor
+	if (fcntl(sp->fd, F_SETLK, &fl) == -1) {
+		// A conflicting lock is held by another process
+		free(sp);
+		return CLAIMED_SERIAL_PORT;
+	}
+
+	// Try to retrieve the old (current) terminal info struct
+	if(tcgetattr(sp->fd,&sp->tiOld) == -1) {
+		uart_close(sp);
+		return INVALID_SERIAL_PORT;
+	}
+
+	// Duplicate the (old) terminal info struct
+	sp->tiNew = sp->tiOld;
+
+	// Configure the serial port
+	sp->tiNew.c_cflag = CS8 | CLOCAL | CREAD;
+	sp->tiNew.c_iflag = IGNPAR;
+	sp->tiNew.c_oflag = 0;
+	sp->tiNew.c_lflag = 0;
+
+	// Block until n bytes are received
+	sp->tiNew.c_cc[VMIN] = 0;
+	// Block until a timer expires (n * 100 mSec.)
+	sp->tiNew.c_cc[VTIME] = 0;
+
+	// Try to set the new terminal info struct
+	if(tcsetattr(sp->fd, TCSANOW, &sp->tiNew) == -1) {
+		uart_close(sp);
+		return INVALID_SERIAL_PORT;
+	}
 
-  // Try to retrieve the old (current) terminal info struct
-  if(tcgetattr(sp->fd,&sp->tiOld) == -1) {
-    uart_close(sp);
-    return INVALID_SERIAL_PORT;
-  }
-  
-  // Duplicate the (old) terminal info struct
-  sp->tiNew = sp->tiOld;
-  
-  // Configure the serial port
-  sp->tiNew.c_cflag = CS8 | CLOCAL | CREAD;
-  sp->tiNew.c_iflag = IGNPAR;
-  sp->tiNew.c_oflag = 0;
-  sp->tiNew.c_lflag = 0;
-    
-  // Block until n bytes are received
-  sp->tiNew.c_cc[VMIN] = 0;
-  // Block until a timer expires (n * 100 mSec.)
-  sp->tiNew.c_cc[VTIME] = 0;
-  
-  // Try to set the new terminal info struct
-  if(tcsetattr(sp->fd, TCSANOW, &sp->tiNew) == -1) {
-    uart_close(sp);
-    return INVALID_SERIAL_PORT;
-  }
-  
   // Flush all lingering data that may exist
   tcflush(sp->fd, TCIOFLUSH);
 
 #ifdef WITH_FPC
 	if ( uart_set_speed(sp, 115200) ) {
-  printf("[=] UART Setting serial baudrate 115200 [FPC enabled]\n");  
+		printf("[=] UART Setting serial baudrate 115200 [FPC enabled]\n");  
 	} else {
 		uart_set_speed(sp, 9600);
 		printf("[=] UART Setting serial baudrate 9600 [FPC enabled]\n");		
 	}
 #else	
-  // set speed, works for UBUNTU 14.04
-  bool success = uart_set_speed(sp, 460800);
-  if (success) {
-    printf("[=] UART Setting serial baudrate 460800\n");
-  } else {
-    uart_set_speed(sp, 115200);
-    printf("[=] UART Setting serial baudrate 115200\n");
-  }
+	// set speed, works for UBUNTU 14.04
+	bool success = uart_set_speed(sp, 460800);
+	if (success) {
+		printf("[=] UART Setting serial baudrate 460800\n");
+	} else {
+		uart_set_speed(sp, 115200);
+		printf("[=] UART Setting serial baudrate 115200\n");
+	}
 #endif  
-  return sp;
+	return sp;
 }
 
 void uart_close(const serial_port sp) {
-  serial_port_unix* spu = (serial_port_unix*)sp;
-  tcflush(spu->fd, TCIOFLUSH);
-  tcsetattr(spu->fd, TCSANOW, &(spu->tiOld));
-  struct flock fl;
-  fl.l_type   = F_UNLCK;
-  fl.l_whence = SEEK_SET;
-  fl.l_start  = 0;
-  fl.l_len    = 0;
-  fl.l_pid    = getpid();
+	serial_port_unix* spu = (serial_port_unix*)sp;
+	tcflush(spu->fd, TCIOFLUSH);
+	tcsetattr(spu->fd, TCSANOW, &(spu->tiOld));
+	struct flock fl;
+	fl.l_type   = F_UNLCK;
+	fl.l_whence = SEEK_SET;
+	fl.l_start  = 0;
+	fl.l_len    = 0;
+	fl.l_pid    = getpid();
 
-  // Does the system allows us to place a lock on this file descriptor
-  int err = fcntl(spu->fd, F_SETLK, &fl);
-  if ( err == -1) {
-     //perror("fcntl");
-  }  
-  close(spu->fd);
-  free(sp);
+	// Does the system allows us to place a lock on this file descriptor
+	int err = fcntl(spu->fd, F_SETLK, &fl);
+	if ( err == -1) {
+		//perror("fcntl");
+	}  
+	close(spu->fd);
+	free(sp);
 }
 
 bool uart_receive(const serial_port sp, uint8_t* pbtRx, size_t pszMaxRxLen, size_t* pszRxLen) {
-  int res;
-  int byteCount;
-  fd_set rfds;
-  struct timeval tv;
+	int res;
+	int byteCount;
+	fd_set rfds;
+	struct timeval tv;
+
+	// Reset the output count
+	*pszRxLen = 0;
   
-  // Reset the output count
-  *pszRxLen = 0;
-  
-  do {
-    // Reset file descriptor
-    FD_ZERO(&rfds);
-    FD_SET(((serial_port_unix*)sp)->fd, &rfds);
-    tv = timeout;
-    res = select(((serial_port_unix*)sp)->fd + 1, &rfds, NULL, NULL, &tv);
-    
-    // Read error
-    if (res < 0) {
-      return false;
-    }
- 
-    // Read time-out
-    if (res == 0) {
-      if (*pszRxLen == 0) {
-        // Error, we received no data
-        return false;
-      } else {
-        // We received some data, but nothing more is available
-        return true;
-      }
-    }
- 
-    // Retrieve the count of the incoming bytes
-    res = ioctl(((serial_port_unix*)sp)->fd, FIONREAD, &byteCount);
-    if (res < 0) return false;
-    
-    // Cap the number of bytes, so we don't overrun the buffer
-    if (pszMaxRxLen - (*pszRxLen) < byteCount) {
-    	byteCount = pszMaxRxLen - (*pszRxLen);
-    }
+	do {
+		// Reset file descriptor
+		FD_ZERO(&rfds);
+		FD_SET(((serial_port_unix*)sp)->fd, &rfds);
+		tv = timeout;
+		res = select(((serial_port_unix*)sp)->fd + 1, &rfds, NULL, NULL, &tv);
 
-    // There is something available, read the data
-    res = read(((serial_port_unix*)sp)->fd, pbtRx + (*pszRxLen), byteCount);
+		// Read error
+		if (res < 0) {
+			return false;
+		}
 
-    // Stop if the OS has some troubles reading the data
-    if (res <= 0) return false;
- 
-    *pszRxLen += res;
+		// Read time-out
+		if (res == 0) {
+			if (*pszRxLen == 0) {
+				// Error, we received no data
+				return false;
+			} else {
+				// We received some data, but nothing more is available
+				return true;
+			}
+		}
 
-    if (*pszRxLen == pszMaxRxLen) {
-    	// We have all the data we wanted.
-      return true;
-    }
-    
-  } while (byteCount);
+		// Retrieve the count of the incoming bytes
+		res = ioctl(((serial_port_unix*)sp)->fd, FIONREAD, &byteCount);
+		if (res < 0) return false;
 
-  return true;
+		// Cap the number of bytes, so we don't overrun the buffer
+		if (pszMaxRxLen - (*pszRxLen) < byteCount) {
+			byteCount = pszMaxRxLen - (*pszRxLen);
+		}
+
+		// There is something available, read the data
+		res = read(((serial_port_unix*)sp)->fd, pbtRx + (*pszRxLen), byteCount);
+
+		// Stop if the OS has some troubles reading the data
+		if (res <= 0) return false;
+
+		*pszRxLen += res;
+
+		if (*pszRxLen == pszMaxRxLen) {
+			// We have all the data we wanted.
+			return true;
+		}
+
+	} while (byteCount);
+
+	return true;
 }
 
 bool uart_send(const serial_port sp, const uint8_t* pbtTx, const size_t len) {
-  int32_t res;
-  size_t pos = 0;
-  fd_set rfds;
-  struct timeval tv;
+	int32_t res;
+	size_t pos = 0;
+	fd_set rfds;
+	struct timeval tv;
 
-  while (pos < len) {
-    // Reset file descriptor
-    FD_ZERO(&rfds);
-    FD_SET(((serial_port_unix*)sp)->fd, &rfds);
-    tv = timeout;
-    res = select(((serial_port_unix*)sp)->fd+1, NULL, &rfds, NULL, &tv);
-    
-    // Write error
-    if (res < 0) {
-		printf("UART:: write error (%d)\n", res);
-		return false;
-    }
-    
-    // Write time-out
-    if (res == 0) {
-		printf("UART:: write time-out\n");
-		return false;
-    }
-    
-    // Send away the bytes
-    res = write(((serial_port_unix*)sp)->fd, pbtTx + pos, len - pos);
-    
-    // Stop if the OS has some troubles sending the data
-    if (res <= 0) return false;
-    
-    pos += res;
-  }
-  return true;
+	while (pos < len) {
+		// Reset file descriptor
+		FD_ZERO(&rfds);
+		FD_SET(((serial_port_unix*)sp)->fd, &rfds);
+		tv = timeout;
+		res = select(((serial_port_unix*)sp)->fd+1, NULL, &rfds, NULL, &tv);
+
+		// Write error
+		if (res < 0) {
+			printf("UART:: write error (%d)\n", res);
+			return false;
+		}
+
+		// Write time-out
+		if (res == 0) {
+			printf("UART:: write time-out\n");
+			return false;
+		}
+
+		// Send away the bytes
+		res = write(((serial_port_unix*)sp)->fd, pbtTx + pos, len - pos);
+
+		// Stop if the OS has some troubles sending the data
+		if (res <= 0) return false;
+
+		pos += res;
+	}
+	return true;
 }
 
 bool uart_set_speed(serial_port sp, const uint32_t uiPortSpeed) {
-  const serial_port_unix* spu = (serial_port_unix*)sp;
-  speed_t stPortSpeed;
-  switch (uiPortSpeed) {
-    case 0: stPortSpeed = B0; break;
-    case 50: stPortSpeed = B50; break;
-    case 75: stPortSpeed = B75; break;
-    case 110: stPortSpeed = B110; break;
-    case 134: stPortSpeed = B134; break;
-    case 150: stPortSpeed = B150; break;
-    case 300: stPortSpeed = B300; break;
-    case 600: stPortSpeed = B600; break;
-    case 1200: stPortSpeed = B1200; break;
-    case 1800: stPortSpeed = B1800; break;
-    case 2400: stPortSpeed = B2400; break;
-    case 4800: stPortSpeed = B4800; break;
-    case 9600: stPortSpeed = B9600; break;
-    case 19200: stPortSpeed = B19200; break;
-    case 38400: stPortSpeed = B38400; break;
+	const serial_port_unix* spu = (serial_port_unix*)sp;
+	speed_t stPortSpeed;
+	switch (uiPortSpeed) {
+		case 0: stPortSpeed = B0; break;
+		case 50: stPortSpeed = B50; break;
+		case 75: stPortSpeed = B75; break;
+		case 110: stPortSpeed = B110; break;
+		case 134: stPortSpeed = B134; break;
+		case 150: stPortSpeed = B150; break;
+		case 300: stPortSpeed = B300; break;
+		case 600: stPortSpeed = B600; break;
+		case 1200: stPortSpeed = B1200; break;
+		case 1800: stPortSpeed = B1800; break;
+		case 2400: stPortSpeed = B2400; break;
+		case 4800: stPortSpeed = B4800; break;
+		case 9600: stPortSpeed = B9600; break;
+		case 19200: stPortSpeed = B19200; break;
+		case 38400: stPortSpeed = B38400; break;
 #  ifdef B57600
-    case 57600: stPortSpeed = B57600; break;
+		case 57600: stPortSpeed = B57600; break;
 #  endif
 #  ifdef B115200
-    case 115200: stPortSpeed = B115200; break;
+		case 115200: stPortSpeed = B115200; break;
 #  endif
 #  ifdef B230400
-    case 230400: stPortSpeed = B230400; break;
+		case 230400: stPortSpeed = B230400; break;
 #  endif
 #  ifdef B460800
-    case 460800: stPortSpeed = B460800; break;
+		case 460800: stPortSpeed = B460800; break;
 #  endif
 #  ifdef B921600
-    case 921600: stPortSpeed = B921600; break;
+		case 921600: stPortSpeed = B921600; break;
 #  endif
-    default: return false;
-  };
-  struct termios ti;
-  if (tcgetattr(spu->fd,&ti) == -1) return false;
-  // Set port speed (Input and Output)
-  cfsetispeed(&ti, stPortSpeed);
-  cfsetospeed(&ti, stPortSpeed);
-  return (tcsetattr(spu->fd, TCSANOW, &ti) != -1);
+		default: return false;
+	};
+	struct termios ti;
+	if (tcgetattr(spu->fd,&ti) == -1) return false;
+	// Set port speed (Input and Output)
+	cfsetispeed(&ti, stPortSpeed);
+	cfsetospeed(&ti, stPortSpeed);
+	return (tcsetattr(spu->fd, TCSANOW, &ti) != -1);
 }
 
 uint32_t uart_get_speed(const serial_port sp) {
-  struct termios ti;
-  uint32_t uiPortSpeed;
-  const serial_port_unix* spu = (serial_port_unix*)sp;
-  if (tcgetattr(spu->fd, &ti) == -1) return 0;
-  // Set port speed (Input)
-  speed_t stPortSpeed = cfgetispeed(&ti);
-  switch (stPortSpeed) {
-    case B0: uiPortSpeed = 0; break;
-    case B50: uiPortSpeed = 50; break;
-    case B75: uiPortSpeed = 75; break;
-    case B110: uiPortSpeed = 110; break;
-    case B134: uiPortSpeed = 134; break;
-    case B150: uiPortSpeed = 150; break;
-    case B300: uiPortSpeed = 300; break;
-    case B600: uiPortSpeed = 600; break;
-    case B1200: uiPortSpeed = 1200; break;
-    case B1800: uiPortSpeed = 1800; break;
-    case B2400: uiPortSpeed = 2400; break;
-    case B4800: uiPortSpeed = 4800; break;
-    case B9600: uiPortSpeed = 9600; break;
-    case B19200: uiPortSpeed = 19200; break;
-    case B38400: uiPortSpeed = 38400; break;
+	struct termios ti;
+	uint32_t uiPortSpeed;
+	const serial_port_unix* spu = (serial_port_unix*)sp;
+	
+	if (tcgetattr(spu->fd, &ti) == -1) 
+		return 0;
+	
+	// Set port speed (Input)
+	speed_t stPortSpeed = cfgetispeed(&ti);
+	switch (stPortSpeed) {
+		case B0: uiPortSpeed = 0; break;
+		case B50: uiPortSpeed = 50; break;
+		case B75: uiPortSpeed = 75; break;
+		case B110: uiPortSpeed = 110; break;
+		case B134: uiPortSpeed = 134; break;
+		case B150: uiPortSpeed = 150; break;
+		case B300: uiPortSpeed = 300; break;
+		case B600: uiPortSpeed = 600; break;
+		case B1200: uiPortSpeed = 1200; break;
+		case B1800: uiPortSpeed = 1800; break;
+		case B2400: uiPortSpeed = 2400; break;
+		case B4800: uiPortSpeed = 4800; break;
+		case B9600: uiPortSpeed = 9600; break;
+		case B19200: uiPortSpeed = 19200; break;
+		case B38400: uiPortSpeed = 38400; break;
 #  ifdef B57600
-    case B57600: uiPortSpeed = 57600; break;
+		case B57600: uiPortSpeed = 57600; break;
 #  endif
 #  ifdef B115200
-    case B115200: uiPortSpeed = 115200; break;
+		case B115200: uiPortSpeed = 115200; break;
 #  endif
 #  ifdef B230400
-    case B230400: uiPortSpeed = 230400; break;
+		case B230400: uiPortSpeed = 230400; break;
 #  endif
 #  ifdef B460800
-    case B460800: uiPortSpeed = 460800; break;
+		case B460800: uiPortSpeed = 460800; break;
 #  endif
 #  ifdef B921600
-    case B921600: uiPortSpeed = 921600; break;
+		case B921600: uiPortSpeed = 921600; break;
 #  endif
-    default: return 0;
-  };
-  return uiPortSpeed;
+		default: return 0;
+	};
+	return uiPortSpeed;
 }
-
 #endif

From f05ab29c04e8f6f9d4f4be36d0784f9f6dd7c0d4 Mon Sep 17 00:00:00 2001
From: Fl0-0 <Fl0-0@users.noreply.github.com>
Date: Sun, 17 Feb 2019 15:51:37 +0100
Subject: [PATCH 0483/1938] Fix for USB uart slowness

See Proxmark#787
---
 uart/uart_posix.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index cb878a4f0..093aaf363 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -68,9 +68,9 @@ typedef struct {
 } serial_port_unix;
 
 // Set time-out on 30 miliseconds
-const struct timeval timeout = {
+struct timeval timeout = {
   .tv_sec  =     0, // 0 second
-  .tv_usec = 300000  // 300 000 micro seconds
+  .tv_usec = 30000  // 30000 micro seconds
 };
 
 serial_port uart_open(const char* pcPortName)
@@ -89,6 +89,10 @@ serial_port uart_open(const char* pcPortName)
 
     char *colon = strrchr(addrstr, ':');
     char *portstr;
+
+    // Set time-out to 300 miliseconds only for TCP port
+    timeout.tv_usec = 300000;
+
     if (colon) {
       portstr = colon + 1;
       *colon = '\0';

From 4ea05fc026a5bc92f6f92c057b21da24f9323320 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 17 Feb 2019 15:56:45 +0100
Subject: [PATCH 0484/1938] Fix: 'hf mf fchk' - now reports back correct found
 keys.

---
 CHANGELOG.md        |  2 ++
 armsrc/mifarecmd.c  | 20 ++++++++++++--------
 client/mifarehost.c | 21 +++++++++++----------
 3 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1c7adf3a6..69078a1f7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,8 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [unreleased][unreleased]
+ - Fix 'hf mf fchk' (@iceman)
+ - Fix 'usb slow on posix based systems' (@fl0-0)
  - Change 'lf pcf7931' - improved read code (@sguerrini97)
  - Change 'hf felica list' - started with some FeliCa annotations (@iceman)
  - Fix 'hf tune' - now works as expected (@iceman)
diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index 3e1967b4e..6b10ddd0d 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -1259,7 +1259,6 @@ void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *da
 	LED_A_ON();
 		
 	if ( firstchunk ) {
-							
 		clear_trace();
 		set_tracing(false);
 		
@@ -1458,26 +1457,31 @@ void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *da
 			} // end loop sectors		
 		} // end loop keys	
 	} // end loop strategy 2
-OUT:	
+OUT:
 	LEDsoff();
 
 	crypto1_destroy(pcs);
 
 	// All keys found, send to client, or last keychunk from client
 	if (foundkeys == allkeys || lastchunk ) {
-		
+
 		uint64_t foo = 0;
+		for (uint8_t m = 0; m < 64; m++) {
+			foo |= ((uint64_t)(found[m] & 1) << m);
+		}
+
 		uint16_t bar = 0;
-		for (uint8_t m = 0; m < 64; ++m)
-			foo |= (found[m] << m);
-		for (uint8_t m=64; m < sizeof(found); ++m) 
-			bar |= (found[m] << (m-64));
-		
+		uint8_t j = 0;
+		for (uint8_t m=64; m < sizeof(found); m++) {
+			bar |= ((uint16_t)(found[m] & 1) << j++);
+		}
+	
 		uint8_t *tmp =  BigBuf_malloc(480+10);
 		memcpy(tmp, k_sector, sectorcnt * sizeof(sector_t) );
 		num_to_bytes(foo, 8, tmp+480);		
 		tmp[488] = bar & 0xFF;
 		tmp[489] = bar >> 8 & 0xFF;
+		
 		cmd_send(CMD_ACK, foundkeys, 0, 0, tmp, 480+10);
 
 		set_tracing(false);		
diff --git a/client/mifarehost.c b/client/mifarehost.c
index 0f37f8a8b..31ed8e39d 100644
--- a/client/mifarehost.c
+++ b/client/mifarehost.c
@@ -173,18 +173,19 @@ int mfCheckKeys_fast( uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk,
 		
 		// success array. each byte is status of key 
 		uint8_t arr[80];
-		uint64_t foo = bytes_to_num(resp.d.asBytes+480, 8);
-		for (uint8_t i = 0; i < 64;  ++i) {
-			arr[i] = (foo >> i) & 0x1;
-		}
-		foo = bytes_to_num(resp.d.asBytes+488, 2);
-		for (uint8_t i = 0; i < 16;  ++i) {
-			arr[i+64] = (foo >> i) & 0x1;
-		}
+		uint64_t foo = 0;
+		uint16_t bar = 0;
+		foo = bytes_to_num(resp.d.asBytes+480, 8);
+		bar = (resp.d.asBytes[489]  << 8 | resp.d.asBytes[488]);
 
+		for (uint8_t i = 0; i < 64; i++)
+			arr[i] = (foo >> i) & 0x1;
+	
+		for (uint8_t i = 0; i < 16; i++)
+			arr[i+64] = (bar >> i) & 0x1;
+		
 		// initialize storage for found keys
-		icesector_t *tmp = NULL;
-		tmp = calloc(sectorsCnt, sizeof(icesector_t));
+		icesector_t *tmp = calloc(sectorsCnt, sizeof(icesector_t));
 		if (tmp == NULL)
 			return 1;
 		memcpy(tmp, resp.d.asBytes, sectorsCnt * sizeof(icesector_t) );

From d6063d677685725490454b0be39400fec3ae73f6 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 17 Feb 2019 16:07:31 +0100
Subject: [PATCH 0485/1938] textual

---
 README.md      | 9 ++++++++-
 tools/Makefile | 7 ++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index effdc0f6e..c8c04f852 100644
--- a/README.md
+++ b/README.md
@@ -78,7 +78,14 @@ This fork now compiles just fine on
 
 ## KALI and ARCHLINUX users
 Kali and ArchLinux users usually must kill their modem manager in order for the proxmark3 to enumerate properly.   
-`sudo apt remove modemmanager`
+```sh
+sudo apt remove modemmanager
+```
+or 
+```sh
+systemctl stop ModemManager
+systemctl disable ModemManager
+```
 
 ## Setup and build for UBUNTU
 GC made updates to allow this to build easily on Ubuntu 14.04.2 LTS, 15.10 or 16.04
diff --git a/tools/Makefile b/tools/Makefile
index c750cce26..b72503158 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -11,4 +11,9 @@ get_nonce_bf:
 	git clone https://github.com/iceman1001/mf_nonce_brute mf_nonce_brute	
 	
 get_xorsearch:
-	wget -N https://didierstevens.com/files/software/XORSearch_V1_11_2.zip
\ No newline at end of file
+	mkdir xorsearch	
+	wget -N https://didierstevens.com/files/software/XORSearch_V1_11_2.zip
+#  Mingw 
+#	unzzip-big XORSearch_V1_11_2.zip
+#  linux
+#	gunzip  XORSearch_V1_11_2.zip
\ No newline at end of file

From f80aaa13abc45f081459ee43e167989097bba039 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 17 Feb 2019 16:09:02 +0100
Subject: [PATCH 0486/1938] textual

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 69078a1f7..44a6fc2d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [unreleased][unreleased]
+ - Change 'hf 14a antifuzz' - original implementation (@asfabw),  reworked a bit
  - Fix 'hf mf fchk' (@iceman)
  - Fix 'usb slow on posix based systems' (@fl0-0)
  - Change 'lf pcf7931' - improved read code (@sguerrini97)

From e23d53adc13b1626fcbab13e0b8ac6b7dfd1b46f Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 17 Feb 2019 16:48:14 +0100
Subject: [PATCH 0487/1938] chg: 'hf mf hardnested' - speedup for those with
 good cpus, triggering the bruteforce faster.

---
 client/cmdhfmfhard.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/client/cmdhfmfhard.c b/client/cmdhfmfhard.c
index 3547761a5..4818f480f 100644
--- a/client/cmdhfmfhard.c
+++ b/client/cmdhfmfhard.c
@@ -1038,8 +1038,11 @@ static bool shrink_key_space(float *brute_forces)
 	}
 	*brute_forces = MIN(brute_forces1, brute_forces2);
 	float reduction_rate = update_reduction_rate(*brute_forces, false);
-	return ((hardnested_stage & CHECK_2ND_BYTES) 
-		&& reduction_rate >= 0.0 && reduction_rate < brute_force_per_second * sample_period / 1000.0);
+
+//iceman 2018
+	return ((hardnested_stage & CHECK_2ND_BYTES) &&
+				reduction_rate >= 0.0 && 
+			   ( reduction_rate < brute_force_per_second * (float)sample_period / 1000.0  || *brute_forces < 0x1F000000000));			  
 }
 
 	

From f943348a7b5d5a6c1ab05a09bc8e2106a6d9789e Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Feb 2019 10:18:55 +0100
Subject: [PATCH 0488/1938] FIX:  detection of presence of git on system. ie
 downloaded a zip file with everything or precompiled distro may not have git
 installed.  On ubuntu/mingw  'env -S' doesn't exist.

---
 tools/mkversion.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/mkversion.pl b/tools/mkversion.pl
index 1acca6efa..674c44177 100644
--- a/tools/mkversion.pl
+++ b/tools/mkversion.pl
@@ -28,7 +28,7 @@ my $clean = 2;
 # fatal: No names found, cannot describe anything.
 ##
 # anyway forcing any kind of shell is at least useless, at worst fatal.
-my $commandGIT = "env -S which git";
+my $commandGIT = "env which git";
 
 if ( defined($commandGIT) )  {
 

From 7e601e5285ac7a45bfb94804dbfa7a719d06bcab Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Feb 2019 10:27:14 +0100
Subject: [PATCH 0489/1938] chg: textual

---
 client/cmdhfmf.c | 2 +-
 client/cmdhw.c   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 8129aceb6..c5c4ab1d5 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -1834,7 +1834,7 @@ int CmdHF14AMfChk(const char *Cmd) {
 	}
 	
 	if (keycnt == 0) {
-		PrintAndLogEx(NORMAL, "No key specified, trying default keys");
+		PrintAndLogEx(INFO, "No key specified, trying default keys");
 		for (;keycnt < MIFARE_DEFAULTKEYS_SIZE; keycnt++)
 			PrintAndLogEx(NORMAL, "[%2d] %02x%02x%02x%02x%02x%02x", keycnt,
 				(keyBlock + 6*keycnt)[0],(keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2],
diff --git a/client/cmdhw.c b/client/cmdhw.c
index a93a940cc..ec7b42a1a 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -257,9 +257,9 @@ int CmdVersion(const char *Cmd) {
 	SendCommand(&c);
 	if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {
 #ifdef __WIN32
-		PrintAndLogEx(NORMAL, "\nProxmark3 RFID instrument\n");
+		PrintAndLogEx(NORMAL, "\n [ Proxmark3 RFID instrument ]\n");
 #else
-		PrintAndLogEx(NORMAL, "\n\e[34mProxmark3 RFID instrument\e[0m\n");	
+		PrintAndLogEx(NORMAL, "\n\e[34m [ Proxmark3 RFID instrument ]\e[0m\n");	
 #endif	
 		char s[50] = {0};
 #if defined(WITH_FLASH) || defined(WITH_SMARTCARD) || defined(WITH_FPC)
@@ -275,7 +275,7 @@ int CmdVersion(const char *Cmd) {
 		strncat(s, "fpc; ", sizeof(s) - strlen(s) - 1);
 #endif
 		PrintAndLogEx(NORMAL, "\n [ CLIENT ]");
-		PrintAndLogEx(NORMAL, " client: iceman %s \n", s);
+		PrintAndLogEx(NORMAL, "  client: iceman %s \n", s);
 		
 		PrintAndLogEx(NORMAL, (char*)resp.d.asBytes);
 		lookupChipID(resp.arg[0], resp.arg[1]);			

From cacba04959347743d842f531977c448ffd97646f Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Feb 2019 10:38:49 +0100
Subject: [PATCH 0490/1938] chg: 'hf mf fchk' - better handling when no keys
 was found.

---
 client/cmdhfmf.c | 86 ++++++++++++++++++++++++++++--------------------
 1 file changed, 51 insertions(+), 35 deletions(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index c5c4ab1d5..58a190f8c 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -1649,47 +1649,63 @@ out:
 	t1 = msclock() - t1;
 	PrintAndLogEx(SUCCESS, "Time in checkkeys (fast):  %.1fs\n", (float)(t1/1000.0));
 
-	printKeyTable( sectorsCnt, e_sector );
-
-	if (transferToEml) {
-		uint8_t block[16] = {0x00};
-		for (uint8_t i = 0; i < sectorsCnt; ++i ) {
-			mfEmlGetMem(block, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
-			if (e_sector[i].foundKey[0])
-				num_to_bytes(e_sector[i].Key[0], 6, block);
-			if (e_sector[i].foundKey[1])
-				num_to_bytes(e_sector[i].Key[1], 6, block+10);
-			mfEmlSetMem(block, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
-		}
-		PrintAndLogEx(NORMAL, "Found keys have been transferred to the emulator memory");
+	// check..
+	uint8_t found_keys = 0;
+	for (uint8_t i = 0; i < sectorsCnt; ++i) {
+		
+		if ( e_sector[i].foundKey[0] ) 
+			found_keys++;
+		
+		if ( e_sector[i].foundKey[1] )
+			found_keys++;
 	}
 	
-	if (createDumpFile) {
-		fptr = GenerateFilename("hf-mf-", "-key.bin");
-		if (fptr == NULL) 
-			return 1;
-
-		FILE *fkeys = fopen(fptr, "wb");
-		if (fkeys == NULL) { 
-			PrintAndLogEx(WARNING, "Could not create file %s", fptr);
-			free(keyBlock);
-			free(e_sector);
-			return 1;
-		}
-		PrintAndLogEx(NORMAL, "Printing keys to binary file %s...", fptr);
+	if ( found_keys == 0 ) {
+		PrintAndLogEx(WARNING, "No keys found");
+	} else {
 	
-		for (i=0; i<sectorsCnt; i++) {
-			num_to_bytes(e_sector[i].Key[0], 6, tempkey);
-			fwrite (tempkey, 1, 6, fkeys);
-		}
+		printKeyTable( sectorsCnt, e_sector );
 
-		for (i=0; i<sectorsCnt; i++) {
-			num_to_bytes(e_sector[i].Key[1], 6, tempkey);
-			fwrite (tempkey, 1, 6, fkeys );
+		if (transferToEml) {
+			uint8_t block[16] = {0x00};
+			for (uint8_t i = 0; i < sectorsCnt; ++i ) {
+				mfEmlGetMem(block, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
+				if (e_sector[i].foundKey[0])
+					num_to_bytes(e_sector[i].Key[0], 6, block);
+				if (e_sector[i].foundKey[1])
+					num_to_bytes(e_sector[i].Key[1], 6, block+10);
+				mfEmlSetMem(block, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
+			}
+			PrintAndLogEx(NORMAL, "Found keys have been transferred to the emulator memory");
 		}
+		
+		if (createDumpFile) {
+			fptr = GenerateFilename("hf-mf-", "-key.bin");
+			if (fptr == NULL) 
+				return 1;
 
-		fclose(fkeys);
-		PrintAndLogEx(NORMAL, "Found keys have been dumped to %s --> 0xffffffffffff has been inserted for unknown keys.", fptr);			
+			FILE *fkeys = fopen(fptr, "wb");
+			if (fkeys == NULL) { 
+				PrintAndLogEx(WARNING, "Could not create file %s", fptr);
+				free(keyBlock);
+				free(e_sector);
+				return 1;
+			}
+			PrintAndLogEx(NORMAL, "Printing keys to binary file %s...", fptr);
+		
+			for (i=0; i<sectorsCnt; i++) {
+				num_to_bytes(e_sector[i].Key[0], 6, tempkey);
+				fwrite (tempkey, 1, 6, fkeys);
+			}
+
+			for (i=0; i<sectorsCnt; i++) {
+				num_to_bytes(e_sector[i].Key[1], 6, tempkey);
+				fwrite (tempkey, 1, 6, fkeys );
+			}
+
+			fclose(fkeys);
+			PrintAndLogEx(NORMAL, "Found keys have been dumped to %s --> 0xffffffffffff has been inserted for unknown keys.", fptr);			
+		}	
 	}
 	
 	free(keyBlock);

From 06fc95b62d74b89a0df6abf555d714f079dcd167 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Feb 2019 10:41:54 +0100
Subject: [PATCH 0491/1938] chg: 'hf mf fchk' - textual

---
 client/cmdhfmf.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 58a190f8c..03ac49c3d 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -1676,7 +1676,7 @@ out:
 					num_to_bytes(e_sector[i].Key[1], 6, block+10);
 				mfEmlSetMem(block, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
 			}
-			PrintAndLogEx(NORMAL, "Found keys have been transferred to the emulator memory");
+			PrintAndLogEx(SUCCESS, "Found keys have been transferred to the emulator memory");
 		}
 		
 		if (createDumpFile) {
@@ -1691,7 +1691,7 @@ out:
 				free(e_sector);
 				return 1;
 			}
-			PrintAndLogEx(NORMAL, "Printing keys to binary file %s...", fptr);
+			PrintAndLogEx(SUCCESS, "Printing keys to binary file %s...", fptr);
 		
 			for (i=0; i<sectorsCnt; i++) {
 				num_to_bytes(e_sector[i].Key[0], 6, tempkey);
@@ -1704,7 +1704,7 @@ out:
 			}
 
 			fclose(fkeys);
-			PrintAndLogEx(NORMAL, "Found keys have been dumped to %s --> 0xffffffffffff has been inserted for unknown keys.", fptr);			
+			PrintAndLogEx(SUCCESS, "Found keys have been dumped to %s --> 0xffffffffffff has been inserted for unknown keys.", fptr);			
 		}	
 	}
 	

From 20ccfb036c2a6bc3b5ba40cdf9c394e52b0e4f47 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Feb 2019 13:12:25 +0100
Subject: [PATCH 0492/1938] chg: more colors

---
 client/loclass/fileutils.c | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index 5bac3d2cd..0751f838b 100644
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -71,14 +71,14 @@ int saveFile(const char *preferredName, const char *suffix, const void* data, si
 	/*Opening file for writing in binary mode*/
 	FILE *f = fopen(fileName, "wb");
 	if (!f) {
-		PrintAndLogDevice(WARNING, "file not found or locked. '%s'", fileName);
+		PrintAndLogDevice(WARNING, "file not found or locked. '" _YELLOW_(%s)"'", fileName);
 		free(fileName);
 		return 1;
 	}
 	fwrite(data, 1,	datalen, f);
 	fflush(f);
 	fclose(f);
-	PrintAndLogDevice(SUCCESS, "saved %u bytes to binary file %s", datalen, fileName);
+	PrintAndLogDevice(SUCCESS, "saved %u bytes to binary file " _YELLOW_(%s), datalen, fileName);
 	free(fileName);
 	return 0;
 }
@@ -106,8 +106,8 @@ int saveFileEML(const char *preferredName, const char *suffix, uint8_t* data, si
 
 	/*Opening file for writing in text mode*/
 	FILE *f = fopen(fileName, "w+");
-	if (!f) {
-		PrintAndLogDevice(WARNING, "file not found or locked. '%s'", fileName);
+	if (!f) {		
+		PrintAndLogDevice(WARNING, "file not found or locked. '" _YELLOW_(%s)"'", fileName);
 		retval =  1;
 		goto out;
 	}
@@ -130,7 +130,7 @@ int saveFileEML(const char *preferredName, const char *suffix, uint8_t* data, si
 	}
 	fflush(f);
 	fclose(f);
-	PrintAndLogDevice(SUCCESS, "saved %d blocks to text file %s", blocks, fileName);
+	PrintAndLogDevice(SUCCESS, "saved %d blocks to text file " _YELLOW_(%s), blocks, fileName);
 	
 out:	
 	free(fileName);
@@ -240,13 +240,12 @@ int saveFileJSON(const char *preferredName, const char *suffix, JSONFileType fty
 
 	int res = json_dump_file(root, fileName, JSON_INDENT(2));
 	if (res) {
-		PrintAndLogDevice(FAILED, "error: can't save the file: %s", fileName);
+		PrintAndLogDevice(FAILED, "error: can't save the file: " _YELLOW_(%s), fileName);
 		json_decref(root);
 		retval = 200;
 		goto out;
 	}
-	PrintAndLogDevice(SUCCESS, "File `%s` saved.", fileName);
-	
+	PrintAndLogDevice(SUCCESS, "File `" _YELLOW_(%s)"` saved.", fileName);
 	json_decref(root);
 
 out:	
@@ -266,7 +265,7 @@ int loadFile(const char *preferredName, const char *suffix, void* data, size_t*
 
 	FILE *f = fopen(fileName, "rb");
 	if ( !f ) {
-		PrintAndLogDevice(FAILED, "file: %s: not found or locked.", fileName);
+		PrintAndLogDevice(WARNING, "file not found or locked. '" _YELLOW_(%s)"'", fileName);
 		retval = 1;
 		goto out;
 	}
@@ -305,7 +304,7 @@ int loadFile(const char *preferredName, const char *suffix, void* data, size_t*
 	memcpy( (data), dump, bytes_read);
 	free(dump);
 	
-	PrintAndLogDevice(SUCCESS, "loaded %d bytes from binary file %s", bytes_read, fileName);
+	PrintAndLogDevice(SUCCESS, "loaded %d bytes from binary file " _YELLOW_(%s), bytes_read, fileName);
 	
 	*datalen = bytes_read;
 
@@ -328,7 +327,7 @@ int loadFileEML(const char *preferredName, const char *suffix, void* data, size_
 
 	FILE *f = fopen(fileName, "r");
 	if ( !f ) {
-		PrintAndLogDevice(FAILED, "file: %s: not found or locked.", fileName);
+		PrintAndLogDevice(WARNING, "file not found or locked. '" _YELLOW_(%s)"'", fileName);
 		retval = 1;
 		goto out;
 	}
@@ -359,7 +358,7 @@ int loadFileEML(const char *preferredName, const char *suffix, void* data, size_
 		}
 	}
 	fclose(f);
-	PrintAndLogDevice(SUCCESS, "loaded %d bytes from text file %s", counter, fileName);
+	PrintAndLogDevice(SUCCESS, "loaded %d bytes from text file " _YELLOW_(%s), counter, fileName);
 	*datalen = counter;
 		
 out:	
@@ -382,13 +381,13 @@ int loadFileJSON(const char *preferredName, const char *suffix, void* data, size
 
 	root = json_load_file(fileName, 0, &error);
 	if (!root) {
-		PrintAndLog("ERROR: json (%s) error on line %d: %s", fileName, error.line, error.text);
+		PrintAndLog("ERROR: json " _YELLOW_(%s) " error on line %d: %s", fileName, error.line, error.text);
 		retval = 2; 
 		goto out;
 	}
 	
 	if (!json_is_object(root)) {
-		PrintAndLog("ERROR: Invalid json (%s) format. root must be an object.", fileName);
+		PrintAndLog("ERROR: Invalid json " _YELLOW_(%s) " format. root must be an object.", fileName);
 		retval = 3; 
 		goto out;
 	}
@@ -446,7 +445,7 @@ int loadFileJSON(const char *preferredName, const char *suffix, void* data, size
 	}
 
 	
-	PrintAndLog("Loaded JSON: (%s) OK.", fileName);
+	PrintAndLog("Loaded JSON: " _YELLOW_(%s) " OK.", fileName);
 out:	
 	json_decref(root);
 	free(fileName);
@@ -479,7 +478,7 @@ int loadFileDICTIONARY(const char *preferredName, const char *suffix, void* data
 
 	FILE *f = fopen(fileName, "r");
 	if ( !f ) {
-		PrintAndLogDevice(FAILED, "file: %s: not found or locked.", fileName);
+		PrintAndLogDevice(WARNING, "file not found or locked. '" _YELLOW_(%s)"'", fileName);
 		retval = 1;
 		goto out;
 	}
@@ -512,7 +511,7 @@ int loadFileDICTIONARY(const char *preferredName, const char *suffix, void* data
 		counter += (keylen >> 1);
 	}
 	fclose(f);
-	PrintAndLogDevice(SUCCESS, "loaded " _GREEN_(%2d) "keys from dictionary file %s", *keycnt, fileName);	
+	PrintAndLogDevice(SUCCESS, "loaded " _GREEN_(%2d) "keys from dictionary file " _YELLOW_(%s), *keycnt, fileName);	
 	*datalen = counter;	
 out:	
 	free(fileName);

From e6c68645e378a1dc73a7faa3afcaa5a62624ab19 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Feb 2019 13:28:22 +0100
Subject: [PATCH 0493/1938] chg: colors

---
 client/cmdhf15.c    | 30 ++++++++++++------------
 client/cmdhflegic.c |  2 +-
 client/cmdhfmfu.c   | 56 ++++++++++++++++++++++-----------------------
 3 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index a1b55d7c6..41d6ee8cd 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -519,21 +519,21 @@ int CmdHF15Info(const char *Cmd) {
 	SendCommand(&c);
 
 	if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
-		PrintAndLogEx(NORMAL, "iso15693 card select failed");
+		PrintAndLogEx(WARNING, "iso15693 card select failed");
 		return 1;
 	}
 	
 	uint32_t status = resp.arg[0];
 	
 	if ( status < 2 ) {
-		PrintAndLogEx(NORMAL, "iso15693 card doesn't answer to systeminfo command");
+		PrintAndLogEx(WARNING, "iso15693 card doesn't answer to systeminfo command");
 		return 1;		
 	}
 	
 	recv = resp.d.asBytes;	
 	
 	if ( recv[0] & ISO15_RES_ERROR ) {
-		PrintAndLogEx(NORMAL, "iso15693 card returned error %i: %s", recv[0], TagErrorStr(recv[0])); 
+		PrintAndLogEx(WARNING, "iso15693 card returned error %i: %s", recv[0], TagErrorStr(recv[0])); 
 		return 3;
 	}
 	
@@ -575,8 +575,8 @@ int CmdHF15Info(const char *Cmd) {
 // Record Activity without enabeling carrier
 //helptext
 int CmdHF15Record(const char *Cmd) {
-	char cmdp = param_getchar(Cmd, 0);
-	if (cmdp == 'h' || cmdp == 'H') return usage_15_record();
+	char cmdp =  tolower(param_getchar(Cmd, 0));
+	if (cmdp == 'h') return usage_15_record();
 	
 	UsbCommand c = {CMD_RECORD_RAW_ADC_SAMPLES_ISO_15693, {0,0,0}};
 	clearCommandBuffer();
@@ -598,8 +598,8 @@ int HF15Reader(const char *Cmd, bool verbose) {
 }
 
 int CmdHF15Reader(const char *Cmd) {
-	char cmdp = param_getchar(Cmd, 0);
-	if (cmdp == 'h' || cmdp == 'H') return usage_15_reader();
+	char cmdp = tolower(param_getchar(Cmd, 0));
+	if (cmdp == 'h') return usage_15_reader();
 	
 	HF15Reader(Cmd, true);
 	return 0;
@@ -608,16 +608,16 @@ int CmdHF15Reader(const char *Cmd) {
 // Simulation is still not working very good
 // helptext
 int CmdHF15Sim(const char *Cmd) {
-	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) < 1 || cmdp == 'h' || cmdp == 'H') return usage_15_sim();
+	char cmdp =tolower(param_getchar(Cmd, 0));
+	if (strlen(Cmd) < 1 || cmdp == 'h') return usage_15_sim();
 
 	uint8_t uid[8] = {0,0,0,0,0,0,0,0};	
 	if (param_gethex(Cmd, 0, uid, 16)) {
-		PrintAndLogEx(NORMAL, "UID must include 16 HEX symbols");
+		PrintAndLogEx(WARNING, "UID must include 16 HEX symbols");
 		return 0;
 	}
 	
-	PrintAndLogEx(NORMAL, "Starting simulating UID %s", sprint_hex(uid, sizeof(uid)) );
+	PrintAndLogEx(SUCCESS, "Starting simulating UID %s", sprint_hex(uid, sizeof(uid)) );
 
 	UsbCommand c = {CMD_SIMTAG_ISO_15693, {0, 0, 0}};
 	memcpy(c.d.asBytes, uid, 8);
@@ -630,10 +630,10 @@ int CmdHF15Sim(const char *Cmd) {
 // (There is no standard way of reading the AFI, allthough some tags support this)
 // helptext
 int CmdHF15Afi(const char *Cmd) {
-	char cmdp = param_getchar(Cmd, 0);
-	if (cmdp == 'h' || cmdp == 'H') return usage_15_findafi();
+	char cmdp = tolower(param_getchar(Cmd, 0));
+	if (cmdp == 'h') return usage_15_findafi();
 
-	PrintAndLogEx(NORMAL, "press pm3-button to cancel");
+	PrintAndLogEx(SUCCESS, "press pm3-button to cancel");
 	
 	UsbCommand c = {CMD_ISO_15693_FIND_AFI, {strtol(Cmd, NULL, 0), 0, 0}};
 	clearCommandBuffer();
@@ -689,7 +689,7 @@ int CmdHF15Dump(const char*Cmd) {
 	}	
 	// detect blocksize from card :)
 	
-	PrintAndLogEx(NORMAL, "Reading memory from tag UID %s", sprintUID(NULL, uid));
+	PrintAndLogEx(NORMAL, "Reading memory from tag UID " _YELLOW_(%s), sprintUID(NULL, uid));
 
 	int blocknum = 0;
 	uint8_t *recv = NULL;
diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index 1403060e5..8c4ef411c 100644
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -180,7 +180,7 @@ int CmdLegicInfo(const char *Cmd) {
 		return 1;
 	}
 
-	PrintAndLogEx(NORMAL, "Reading tag memory %d b...", card.cardsize);
+	PrintAndLogEx(SUCCESS, "Reading tag memory %d b...", card.cardsize);
 	
 	// allocate receiver buffer
 	uint8_t *data = calloc(card.cardsize, sizeof(uint8_t));
diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index b5be04593..0a7e77b1c 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -518,57 +518,57 @@ int ul_print_type(uint32_t tagtype, uint8_t spaces){
 	char *spacer = spc + (10-spaces);
 
 	if ( tagtype & UL )	
-		PrintAndLogEx(NORMAL, "%sTYPE : MIFARE Ultralight (MF0ICU1) %s", spacer, (tagtype & MAGIC) ? "<magic>" : "" );
+		PrintAndLogEx(SUCCESS, "%sTYPE : MIFARE Ultralight (MF0ICU1) %s", spacer, (tagtype & MAGIC) ? "<magic>" : "" );
 	else if ( tagtype & UL_C)
-		PrintAndLogEx(NORMAL, "%sTYPE : MIFARE Ultralight C (MF0ULC) %s", spacer, (tagtype & MAGIC) ? "<magic>" : "" );
+		PrintAndLogEx(SUCCESS, "%sTYPE : MIFARE Ultralight C (MF0ULC) %s", spacer, (tagtype & MAGIC) ? "<magic>" : "" );
 	else if ( tagtype & UL_NANO_40)
-		PrintAndLogEx(NORMAL, "%sTYPE : MIFARE Ultralight Nano 40bytes (MF0UNH00)", spacer); 		
+		PrintAndLogEx(SUCCESS, "%sTYPE : MIFARE Ultralight Nano 40bytes (MF0UNH00)", spacer); 		
 	else if ( tagtype & UL_EV1_48)
-		PrintAndLogEx(NORMAL, "%sTYPE : MIFARE Ultralight EV1 48bytes (MF0UL1101)", spacer); 
+		PrintAndLogEx(SUCCESS, "%sTYPE : MIFARE Ultralight EV1 48bytes (MF0UL1101)", spacer); 
 	else if ( tagtype & UL_EV1_128)	
-		PrintAndLogEx(NORMAL, "%sTYPE : MIFARE Ultralight EV1 128bytes (MF0UL2101)", spacer);
+		PrintAndLogEx(SUCCESS, "%sTYPE : MIFARE Ultralight EV1 128bytes (MF0UL2101)", spacer);
 	else if ( tagtype & UL_EV1 )
-		PrintAndLogEx(NORMAL, "%sTYPE : MIFARE Ultralight EV1 UNKNOWN", spacer);
+		PrintAndLogEx(SUCCESS, "%sTYPE : MIFARE Ultralight EV1 UNKNOWN", spacer);
 	else if ( tagtype & NTAG )
-		PrintAndLogEx(NORMAL, "%sTYPE : NTAG UNKNOWN", spacer);
+		PrintAndLogEx(SUCCESS, "%sTYPE : NTAG UNKNOWN", spacer);
 	else if ( tagtype & NTAG_203 )
-		PrintAndLogEx(NORMAL, "%sTYPE : NTAG 203 144bytes (NT2H0301F0DT)", spacer);
+		PrintAndLogEx(SUCCESS, "%sTYPE : NTAG 203 144bytes (NT2H0301F0DT)", spacer);
 	else if ( tagtype & NTAG_210 )
-		PrintAndLogEx(NORMAL, "%sTYPE : NTAG 210 48bytes (NT2L1011G0DU)", spacer);
+		PrintAndLogEx(SUCCESS, "%sTYPE : NTAG 210 48bytes (NT2L1011G0DU)", spacer);
 	else if ( tagtype & NTAG_212 )
-		PrintAndLogEx(NORMAL, "%sTYPE : NTAG 212 128bytes (NT2L1211G0DU)", spacer);
+		PrintAndLogEx(SUCCESS, "%sTYPE : NTAG 212 128bytes (NT2L1211G0DU)", spacer);
 	else if ( tagtype & NTAG_213 )
-		PrintAndLogEx(NORMAL, "%sTYPE : NTAG 213 144bytes (NT2H1311G0DU)", spacer);
+		PrintAndLogEx(SUCCESS, "%sTYPE : NTAG 213 144bytes (NT2H1311G0DU)", spacer);
 	else if ( tagtype & NTAG_213_F )
-		PrintAndLogEx(NORMAL, "%sTYPE : NTAG 213F 144bytes (NT2H1311F0DTL)", spacer);
+		PrintAndLogEx(SUCCESS, "%sTYPE : NTAG 213F 144bytes (NT2H1311F0DTL)", spacer);
 	else if ( tagtype & NTAG_215 )
-		PrintAndLogEx(NORMAL, "%sTYPE : NTAG 215 504bytes (NT2H1511G0DU)", spacer);
+		PrintAndLogEx(SUCCESS, "%sTYPE : NTAG 215 504bytes (NT2H1511G0DU)", spacer);
 	else if ( tagtype & NTAG_216 )
-		PrintAndLogEx(NORMAL, "%sTYPE : NTAG 216 888bytes (NT2H1611G0DU)", spacer);
+		PrintAndLogEx(SUCCESS, "%sTYPE : NTAG 216 888bytes (NT2H1611G0DU)", spacer);
 	else if ( tagtype & NTAG_216_F )
-		PrintAndLogEx(NORMAL, "%sTYPE : NTAG 216F 888bytes (NT2H1611F0DTL)", spacer);	
+		PrintAndLogEx(SUCCESS, "%sTYPE : NTAG 216F 888bytes (NT2H1611F0DTL)", spacer);	
 	else if ( tagtype & NTAG_I2C_1K )
-		PrintAndLogEx(NORMAL, "%sTYPE : NTAG I%sC 888bytes (NT3H1101FHK)", spacer, "\xFD");
+		PrintAndLogEx(SUCCESS, "%sTYPE : NTAG I%sC 888bytes (NT3H1101FHK)", spacer, "\xFD");
 	else if ( tagtype & NTAG_I2C_2K )	
-		PrintAndLogEx(NORMAL, "%sTYPE : NTAG I%sC 1904bytes (NT3H1201FHK)", spacer, "\xFD");
+		PrintAndLogEx(SUCCESS, "%sTYPE : NTAG I%sC 1904bytes (NT3H1201FHK)", spacer, "\xFD");
 	else if ( tagtype & NTAG_I2C_1K_PLUS )
-		PrintAndLogEx(NORMAL, "%sTYPE : NTAG I%sC plus 888bytes (NT3H2111FHK)", spacer, "\xFD");
+		PrintAndLogEx(SUCCESS, "%sTYPE : NTAG I%sC plus 888bytes (NT3H2111FHK)", spacer, "\xFD");
 	else if ( tagtype & NTAG_I2C_2K_PLUS )	
-		PrintAndLogEx(NORMAL, "%sTYPE : NTAG I%sC plus 1912bytes (NT3H2211FHK)", spacer, "\xFD");
+		PrintAndLogEx(SUCCESS, "%sTYPE : NTAG I%sC plus 1912bytes (NT3H2211FHK)", spacer, "\xFD");
 	else if ( tagtype & MY_D )
-		PrintAndLogEx(NORMAL, "%sTYPE : INFINEON my-d\x99 (SLE 66RxxS)", spacer);
+		PrintAndLogEx(SUCCESS, "%sTYPE : INFINEON my-d\x99 (SLE 66RxxS)", spacer);
 	else if ( tagtype & MY_D_NFC )
-		PrintAndLogEx(NORMAL, "%sTYPE : INFINEON my-d\x99 NFC (SLE 66RxxP)", spacer);
+		PrintAndLogEx(SUCCESS, "%sTYPE : INFINEON my-d\x99 NFC (SLE 66RxxP)", spacer);
 	else if ( tagtype & MY_D_MOVE )
-		PrintAndLogEx(NORMAL, "%sTYPE : INFINEON my-d\x99 move (SLE 66R01P)", spacer);
+		PrintAndLogEx(SUCCESS, "%sTYPE : INFINEON my-d\x99 move (SLE 66R01P)", spacer);
 	else if ( tagtype & MY_D_MOVE_NFC )
-		PrintAndLogEx(NORMAL, "%sTYPE : INFINEON my-d\x99 move NFC (SLE 66R01P)", spacer);
+		PrintAndLogEx(SUCCESS, "%sTYPE : INFINEON my-d\x99 move NFC (SLE 66R01P)", spacer);
 	else if ( tagtype & MY_D_MOVE_LEAN )
-		PrintAndLogEx(NORMAL, "%sTYPE : INFINEON my-d\x99 move lean (SLE 66R01L)", spacer);
+		PrintAndLogEx(SUCCESS, "%sTYPE : INFINEON my-d\x99 move lean (SLE 66R01L)", spacer);
 	else if ( tagtype & FUDAN_UL )
-		PrintAndLogEx(NORMAL, "%sTYPE : FUDAN Ultralight Compatible (or other compatible) %s", spacer, (tagtype & MAGIC) ? "<magic>" : "" );
+		PrintAndLogEx(SUCCESS, "%sTYPE : FUDAN Ultralight Compatible (or other compatible) %s", spacer, (tagtype & MAGIC) ? "<magic>" : "" );
 	else
-		PrintAndLogEx(NORMAL, "%sTYPE : Unknown %06x", spacer, tagtype);
+		PrintAndLogEx(SUCCESS, "%sTYPE : Unknown %06x", spacer, tagtype);
 	return 0;
 }
 
@@ -606,7 +606,7 @@ static int ulc_print_configuration( uint8_t *data){
 
 static int ulev1_print_configuration(uint32_t tagtype, uint8_t *data, uint8_t startPage){
 
-	PrintAndLogEx(NORMAL, "\n--- Tag Configuration");
+	PrintAndLogEx(SUCCESS, "\n--- Tag Configuration");
 
 	bool strg_mod_en = (data[0] & 2);
 	uint8_t authlim = (data[4] & 0x07);
@@ -1743,7 +1743,7 @@ int CmdHF14AMfUDump(const char *Cmd){
 		}
 	}
 	ul_print_type(tagtype, 0);
-	PrintAndLogEx(NORMAL, "Reading tag memory...");
+	PrintAndLogEx(SUCCESS, "Reading tag memory...");
 	UsbCommand c = {CMD_MIFAREU_READCARD, {startPage, pages}};
 	if ( hasAuthKey ) {
 		if (tagtype & UL_C)

From 23d0b6b1c64c00e9ae4854aa4d619cbf47f8b04b Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Feb 2019 14:59:19 +0100
Subject: [PATCH 0494/1938] chg: colors

---
 client/cmdhfmf.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 03ac49c3d..db2f2b495 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -1691,7 +1691,7 @@ out:
 				free(e_sector);
 				return 1;
 			}
-			PrintAndLogEx(SUCCESS, "Printing keys to binary file %s...", fptr);
+			PrintAndLogEx(SUCCESS, "Printing keys to binary file " _YELLOW_(%s)"...", fptr);
 		
 			for (i=0; i<sectorsCnt; i++) {
 				num_to_bytes(e_sector[i].Key[0], 6, tempkey);
@@ -1704,7 +1704,7 @@ out:
 			}
 
 			fclose(fkeys);
-			PrintAndLogEx(SUCCESS, "Found keys have been dumped to %s --> 0xffffffffffff has been inserted for unknown keys.", fptr);			
+			PrintAndLogEx(SUCCESS, "Found keys have been dumped to " _YELLOW_(%s)" --> 0xffffffffffff has been inserted for unknown keys.", fptr);			
 		}	
 	}
 	
@@ -1964,7 +1964,7 @@ out:
 				num_to_bytes(e_sector[i].Key[1], 6, block+10);
 			mfEmlSetMem(block, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
 		}
-		PrintAndLogEx(NORMAL, "Found keys have been transferred to the emulator memory");
+		PrintAndLogEx(INFO, "Found keys have been transferred to the emulator memory");
 	}
 	
 	if (createDumpFile) {
@@ -1979,7 +1979,7 @@ out:
 			free(e_sector);
 			return 1;
 		}
-		PrintAndLogEx(NORMAL, "Printing keys to binary file %s...", fptr);
+		PrintAndLogEx(INFO, "Printing keys to binary file " _YELLOW_(%s)"...", fptr);
 	
 		for( i=0; i<SectorsCnt; i++) {
 			num_to_bytes(e_sector[i].Key[0], 6, tempkey);
@@ -1990,7 +1990,7 @@ out:
 			fwrite ( tempkey, 1, 6, fkeys );
 		}
 		fclose(fkeys);
-		PrintAndLogEx(NORMAL, "Found keys have been dumped to file %s. 0xffffffffffff has been inserted for unknown keys.", fptr);
+		PrintAndLogEx(SUCCESS, "Found keys have been dumped to file " _YELLOW_(%s)". 0xffffffffffff has been inserted for unknown keys.", fptr);
 	}
 
 	free(keyBlock);

From fc1ed47d575af103ae73f449daeaf51d45de5781 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Feb 2019 15:37:26 +0100
Subject: [PATCH 0495/1938] chg: more colors

---
 client/cmdhfmf.c | 62 ++++++++++++++++++++++++------------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index db2f2b495..691c8678e 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -734,7 +734,7 @@ int CmdHF14AMfDump(const char *Cmd) {
 	}
 
 	if ((fin = fopen(keyFilename, "rb")) == NULL) {
-		PrintAndLogEx(WARNING, "Could not find file %s", keyFilename);
+		PrintAndLogEx(WARNING, "Could not find file " _YELLOW_(%s), keyFilename);
 		return 1;
 	}
 	
@@ -743,7 +743,7 @@ int CmdHF14AMfDump(const char *Cmd) {
 	for (sectorNo=0; sectorNo<numSectors; sectorNo++) {
 		bytes_read = fread( keyA[sectorNo], 1, 6, fin );
 		if ( bytes_read != 6) {
-			PrintAndLogEx(NORMAL, "File reading error.");
+			PrintAndLogEx(WARNING, "File reading error.");
 			fclose(fin);
 			return 2;
 		}
@@ -753,7 +753,7 @@ int CmdHF14AMfDump(const char *Cmd) {
 	for (sectorNo=0; sectorNo<numSectors; sectorNo++) {
 		bytes_read = fread( keyB[sectorNo], 1, 6, fin );
 		if ( bytes_read != 6) {
-			PrintAndLogEx(NORMAL, "File reading error.");
+			PrintAndLogEx(WARNING, "File reading error.");
 			fclose(fin);
 			return 2;
 		}
@@ -879,13 +879,13 @@ int CmdHF14AMfDump(const char *Cmd) {
 		}
 		
 		if ((fout = fopen(dataFilename,"wb")) == NULL) { 
-			PrintAndLogEx(WARNING, "could not create file name %s", dataFilename);
+			PrintAndLogEx(WARNING, "could not create file name " _YELLOW_(%s), dataFilename);
 			return 1;
 		}
 		uint16_t numblocks = FirstBlockOfSector(numSectors - 1) + NumBlocksPerSector(numSectors - 1);
 		fwrite(carddata, 1, 16*numblocks, fout);
 		fclose(fout);
-		PrintAndLogEx(SUCCESS, "dumped %d blocks (%d bytes) to file %s", numblocks, 16*numblocks, dataFilename);
+		PrintAndLogEx(SUCCESS, "dumped %d blocks (%d bytes) to file " _YELLOW_(%s), numblocks, 16*numblocks, dataFilename);
 	}
 	return 0;
 }
@@ -953,7 +953,7 @@ int CmdHF14AMfRestore(const char *Cmd) {
 	for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
 		bytes_read = fread( keyA[sectorNo], 1, 6, fkeys );
 		if ( bytes_read != 6 ) {
-			PrintAndLogEx(NORMAL, "File reading error (%s).", keyFilename);
+			PrintAndLogEx(WARNING, "File reading error  " _YELLOW_(%s), keyFilename);
 			fclose(fkeys);
 			return 2;
 		}
@@ -962,7 +962,7 @@ int CmdHF14AMfRestore(const char *Cmd) {
 	for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
 		bytes_read = fread( keyB[sectorNo], 1, 6, fkeys );
 		if ( bytes_read != 6 ) {
-			PrintAndLogEx(NORMAL, "File reading error (%s).", keyFilename);
+			PrintAndLogEx(WARNING, "File reading error " _YELLOW_(%s), keyFilename);
 			fclose(fkeys);
 			return 2;
 		}
@@ -982,7 +982,7 @@ int CmdHF14AMfRestore(const char *Cmd) {
 		PrintAndLogEx(WARNING, "Could not find file %s", dataFilename);
 		return 1;
 	}	
-	PrintAndLogEx(NORMAL, "Restoring %s to card", dataFilename);
+	PrintAndLogEx(INFO, "Restoring %s to card", dataFilename);
 
 	for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
 		for (blockNo = 0; blockNo < NumBlocksPerSector(sectorNo); blockNo++) {
@@ -990,7 +990,7 @@ int CmdHF14AMfRestore(const char *Cmd) {
 			memcpy(c.d.asBytes, key, 6);			
 			bytes_read = fread(bldata, 1, 16, fdump);
 			if ( bytes_read != 16) {
-				PrintAndLogEx(NORMAL, "File reading error (%s).", dataFilename);
+				PrintAndLogEx(WARNING, "File reading error " _YELLOW_(%s), dataFilename);
 				fclose(fdump);
 				fdump = NULL;				
 				return 2;
@@ -1020,9 +1020,9 @@ int CmdHF14AMfRestore(const char *Cmd) {
 			UsbCommand resp;
 			if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
 				uint8_t isOK  = resp.arg[0] & 0xff;
-				PrintAndLogEx(NORMAL, "isOk:%02x", isOK);
+				PrintAndLogEx(SUCCESS, "isOk:%02x", isOK);
 			} else {
-				PrintAndLogEx(NORMAL, "Command execute timeout");
+				PrintAndLogEx(WARNING, "Command execute timeout");
 			}
 		}
 	}
@@ -1192,7 +1192,7 @@ int CmdHF14AMfNested(const char *Cmd) {
 
 
 		// 20160116 If Sector A is found, but not Sector B,  try just reading it of the tag?
-		PrintAndLogEx(SUCCESS, "trying to read key B...");
+		PrintAndLogEx(INFO, "trying to read key B...");
 		for (i = 0; i < SectorsCnt; i++) {
 			// KEY A  but not KEY B
 			if ( e_sector[i].foundKey[0] && !e_sector[i].foundKey[1] ) {
@@ -1246,12 +1246,12 @@ int CmdHF14AMfNested(const char *Cmd) {
 				return 1;
 			
 			if ((fkeys = fopen(fptr, "wb")) == NULL) { 
-				PrintAndLogEx(WARNING, "could not create file %s", fptr);
+				PrintAndLogEx(WARNING, "could not create file " _YELLOW_(%s), fptr);
 				free(e_sector);
 				return 1;
 			}
 			
-			PrintAndLogEx(SUCCESS, "saving keys to binary file %s...", fptr);
+			PrintAndLogEx(SUCCESS, "saving keys to binary file " _YELLOW_(%s), fptr);
 			for (i=0; i<SectorsCnt; i++) {
 				if (e_sector[i].foundKey[0]){
 					num_to_bytes(e_sector[i].Key[0], 6, tempkey);
@@ -1319,14 +1319,14 @@ int CmdHF14AMfNestedHard(const char *Cmd) {
 		default:
 			if (param_getchar(Cmd, cmdp) == 0x00)
 			{
-				PrintAndLogEx(NORMAL, "Block number is missing");
+				PrintAndLogEx(WARNING, "Block number is missing");
 				return 1;
 			
 			}
 			blockNo = param_get8(Cmd, cmdp);
 			ctmp = tolower(param_getchar(Cmd, cmdp+1));
 			if (ctmp != 'a' && ctmp != 'b') {
-				PrintAndLogEx(NORMAL, "Key type must be A or B");
+				PrintAndLogEx(WARNING, "Key type must be A or B");
 				return 1;
 			}
 			
@@ -1335,13 +1335,13 @@ int CmdHF14AMfNestedHard(const char *Cmd) {
 			}
 			
 			if (param_gethex(Cmd, cmdp+2, key, 12)) {
-				PrintAndLogEx(NORMAL, "Key must include 12 HEX symbols");
+				PrintAndLogEx(WARNING, "Key must include 12 HEX symbols");
 				return 1;
 			}
 			
 			if (param_getchar(Cmd, cmdp+3) == 0x00)
 			{
-				PrintAndLogEx(NORMAL, "Target block number is missing");
+				PrintAndLogEx(WARNING, "Target block number is missing");
 				return 1;
 			}
 			
@@ -1349,7 +1349,7 @@ int CmdHF14AMfNestedHard(const char *Cmd) {
 
 			ctmp = tolower(param_getchar(Cmd, cmdp+4));
 			if (ctmp != 'a' && ctmp != 'b') {
-				PrintAndLogEx(NORMAL, "Target key type must be A or B");
+				PrintAndLogEx(WARNING, "Target key type must be A or B");
 				return 1;
 			}
 			if (ctmp != 'a') {
@@ -1407,7 +1407,7 @@ int CmdHF14AMfNestedHard(const char *Cmd) {
 					SetSIMDInstr(SIMD_NONE);
 					break;
 				default:
-					PrintAndLog("Unknown SIMD type. %c", ctmp);
+					PrintAndLogEx(WARNING, "Unknown SIMD type. %c", ctmp);
 					return 1;
 			}
 			cmdp += 2;
@@ -1425,7 +1425,7 @@ int CmdHF14AMfNestedHard(const char *Cmd) {
 		// check if we can authenticate to sector
 		int res = mfCheckKeys(blockNo, keyType, true, 1, key, &key64);
 		if (res) {
-			PrintAndLogEx(NORMAL, "Key is wrong. Can't authenticate to block:%3d key type:%c", blockNo, keyType ? 'B' : 'A');
+			PrintAndLogEx(WARNING, "Key is wrong. Can't authenticate to block:%3d key type:%c", blockNo, keyType ? 'B' : 'A');
 			return 3;
 		}	
 	}
@@ -1547,7 +1547,7 @@ int CmdHF14AMfChk_fast(const char *Cmd) {
 			
 			f = fopen( filename, "r");
 			if ( !f ){
-				PrintAndLogEx(FAILED, "File: %s: not found or locked.", filename);
+				PrintAndLogEx(FAILED, "File: " _YELLOW_(%s) ": not found or locked.", filename);
 				continue;
 			}
 			
@@ -1561,7 +1561,7 @@ int CmdHF14AMfChk_fast(const char *Cmd) {
 				if( buf[0]=='#' ) continue;	//The line start with # is comment, skip
 
 				if (!isxdigit(buf[0])){
-					PrintAndLogEx(FAILED, "File content error. '%s' must include 12 HEX symbols",buf);
+					PrintAndLogEx(FAILED, "File content error. '%s' must include 12 HEX symbols", buf);
 					continue;
 				}
 				
@@ -1583,7 +1583,7 @@ int CmdHF14AMfChk_fast(const char *Cmd) {
 				memset(buf, 0, sizeof(buf));
 			}
 			fclose(f);
-			PrintAndLogEx(SUCCESS, "Loaded %2d keys from %s", keycnt, filename);
+			PrintAndLogEx(SUCCESS, "Loaded %2d keys from " _YELLOW_(%s), keycnt, filename);
 		}
 	}
 		
@@ -1716,8 +1716,8 @@ out:
 
 int CmdHF14AMfChk(const char *Cmd) {
 
-	char ctmp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) < 3 || ctmp == 'h' || ctmp == 'H') return usage_hf14_chk();
+	char ctmp = tolower(param_getchar(Cmd, 0));
+	if (strlen(Cmd) < 3 || ctmp == 'h') return usage_hf14_chk();
 
 	FILE * f;
 	char filename[FILE_PATH_SIZE]={0};
@@ -1807,7 +1807,7 @@ int CmdHF14AMfChk(const char *Cmd) {
 			
 			f = fopen( filename , "r");
 			if ( !f ) {
-				PrintAndLogEx(FAILED, "File: %s: not found or locked.", filename);
+				PrintAndLogEx(FAILED, "File: " _YELLOW_(%s)": not found or locked.", filename);
 				continue;
 			}
 			
@@ -1845,7 +1845,7 @@ int CmdHF14AMfChk(const char *Cmd) {
 				memset(buf, 0, sizeof(buf));
 			}
 			fclose(f);
-			PrintAndLogEx(SUCCESS, "Loaded %2d keys from %s", keycnt, filename);
+			PrintAndLogEx(SUCCESS, "Loaded %2d keys from " _YELLOW_(%s), keycnt, filename);
 		}
 	}
 	
@@ -1894,7 +1894,7 @@ int CmdHF14AMfChk(const char *Cmd) {
 				printf("."); fflush(stdout);
 				if (ukbhit()) {
 					int gc = getchar();	(void)gc;
-					PrintAndLogEx(NORMAL, "\naborted via keyboard!\n");
+					PrintAndLogEx(INFO, "\naborted via keyboard!\n");
 					goto out;
 				}
 								
@@ -1913,12 +1913,12 @@ int CmdHF14AMfChk(const char *Cmd) {
 		}
 	}
 	t1 = msclock() - t1;
-	PrintAndLogEx(NORMAL, "\nTime in checkkeys: %.0f seconds\n", (float)t1/1000.0);
+	PrintAndLogEx(SUCCESS, "\nTime in checkkeys: %.0f seconds\n", (float)t1/1000.0);
 
 		
 	// 20160116 If Sector A is found, but not Sector B,  try just reading it of the tag?
 	if ( keyType != 1 ) {
-		PrintAndLogEx(NORMAL, "testing to read key B...");
+		PrintAndLogEx(INFO, "testing to read key B...");
 		for (i = 0; i < SectorsCnt; i++) {
 			// KEY A  but not KEY B
 			if ( e_sector[i].foundKey[0] && !e_sector[i].foundKey[1] ) {

From 38437a39165529a085d0f8dbcbd06449f71d7ef2 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Feb 2019 15:47:48 +0100
Subject: [PATCH 0496/1938] chg: colors

---
 client/cmdhfmf.c | 74 +++++++++++++++++++++++-------------------------
 1 file changed, 36 insertions(+), 38 deletions(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 691c8678e..e9b1bed10 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -945,7 +945,7 @@ int CmdHF14AMfRestore(const char *Cmd) {
 	}
 
 	if ((fkeys = fopen(keyFilename, "rb")) == NULL) {
-		PrintAndLogEx(WARNING, "Could not find file %s", keyFilename);
+		PrintAndLogEx(WARNING, "Could not find file " _YELLOW_(%s), keyFilename);
 		return 1;
 	}
 	
@@ -979,10 +979,10 @@ int CmdHF14AMfRestore(const char *Cmd) {
 	}
 
 	if ((fdump = fopen(dataFilename, "rb")) == NULL) {
-		PrintAndLogEx(WARNING, "Could not find file %s", dataFilename);
+		PrintAndLogEx(WARNING, "Could not find file " _YELLOW_(%s), dataFilename);
 		return 1;
 	}	
-	PrintAndLogEx(INFO, "Restoring %s to card", dataFilename);
+	PrintAndLogEx(INFO, "Restoring " _YELLOW_(%s)" to card", dataFilename);
 
 	for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
 		for (blockNo = 0; blockNo < NumBlocksPerSector(sectorNo); blockNo++) {
@@ -1561,7 +1561,7 @@ int CmdHF14AMfChk_fast(const char *Cmd) {
 				if( buf[0]=='#' ) continue;	//The line start with # is comment, skip
 
 				if (!isxdigit(buf[0])){
-					PrintAndLogEx(FAILED, "File content error. '%s' must include 12 HEX symbols", buf);
+					PrintAndLogEx(FAILED, "File content error. '" _YELLOW_(%s)"' must include 12 HEX symbols", buf);
 					continue;
 				}
 				
@@ -1622,7 +1622,7 @@ int CmdHF14AMfChk_fast(const char *Cmd) {
 					
 					if (ukbhit()) {
 						int gc = getchar(); (void)gc;
-						PrintAndLogEx(NORMAL, "\naborted via keyboard!\n");
+						PrintAndLogEx(WARNING, "\naborted via keyboard!\n");
 						goto out;
 					}
 					
@@ -1686,7 +1686,7 @@ out:
 
 			FILE *fkeys = fopen(fptr, "wb");
 			if (fkeys == NULL) { 
-				PrintAndLogEx(WARNING, "Could not create file %s", fptr);
+				PrintAndLogEx(WARNING, "Could not create file " _YELLOW_(%s), fptr);
 				free(keyBlock);
 				free(e_sector);
 				return 1;
@@ -1750,23 +1750,21 @@ int CmdHF14AMfChk(const char *Cmd) {
 		blockNo = param_get8(Cmd, 0);
 	}
 	
-	ctmp = param_getchar(Cmd, 1);
+	ctmp = tolower(param_getchar(Cmd, 1));
 	clen = param_getlength(Cmd, 1);
 	if (clen == 1) {
 		switch (ctmp) {	
 		case 'a':
-		case 'A':
 			keyType = 0;
 			break;
 		case 'b':
-		case 'B':
 			keyType = 1;
 			break;
 		case '?':
 			keyType = 2;
 			break;
 		default:
-			PrintAndLogEx(NORMAL, "Key type must be A , B or ?");
+			PrintAndLogEx(FAILED, "Key type must be A , B or ?");
 			free(keyBlock);
 			return 1;
 		};
@@ -1774,7 +1772,7 @@ int CmdHF14AMfChk(const char *Cmd) {
 
 	for (i = 2; param_getchar(Cmd, i); i++) {
 
-		ctmp = param_getchar(Cmd, i);	
+		ctmp = tolower(param_getchar(Cmd, i));
 		clen = param_getlength(Cmd, i);
 		
 		if (clen == 12) {
@@ -1796,8 +1794,8 @@ int CmdHF14AMfChk(const char *Cmd) {
 			PrintAndLogEx(NORMAL, "[%2d] key %s", keycnt, sprint_hex( (keyBlock + 6*keycnt), 6 ) );;
 			keycnt++;
 		} else if ( clen == 1 ) {
-			if (ctmp == 't' || ctmp == 'T') { transferToEml = 1; continue; }
-			if (ctmp == 'd' || ctmp == 'D') { createDumpFile = 1; continue; }
+			if (ctmp == 't' ) { transferToEml = 1; continue; }
+			if (ctmp == 'd' ) { createDumpFile = 1; continue; }
 		} else {
 			// May be a dic file
 			if ( param_getstr(Cmd, i, filename, sizeof(filename)) >= FILE_PATH_SIZE ) {
@@ -1822,7 +1820,7 @@ int CmdHF14AMfChk(const char *Cmd) {
 
 				// codesmell, only checks first char?
 				if (!isxdigit(buf[0])){
-					PrintAndLogEx(FAILED, "File content error. '%s' must include 12 HEX symbols",buf);
+					PrintAndLogEx(FAILED, "File content error. '" _YELLOW_(%s)"' must include 12 HEX symbols",buf);
 					continue;
 				}
 				
@@ -1964,7 +1962,7 @@ out:
 				num_to_bytes(e_sector[i].Key[1], 6, block+10);
 			mfEmlSetMem(block, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
 		}
-		PrintAndLogEx(INFO, "Found keys have been transferred to the emulator memory");
+		PrintAndLogEx(SUCCESS, "Found keys have been transferred to the emulator memory");
 	}
 	
 	if (createDumpFile) {
@@ -1974,7 +1972,7 @@ out:
 
 		FILE *fkeys = fopen(fptr, "wb");
 		if (fkeys == NULL) { 
-			PrintAndLogEx(WARNING, "Could not create file %s", fptr);
+			PrintAndLogEx(WARNING, "Could not create file " _YELLOW_(%s), fptr);
 			free(keyBlock);
 			free(e_sector);
 			return 1;
@@ -2039,7 +2037,7 @@ void readerAttack(nonces_t data, bool setEmulatorMem, bool verbose) {
 		uint8_t sector = data.sector;
 		uint8_t keytype = data.keytype;
 
-		PrintAndLogEx(NORMAL, "Reader is trying authenticate with: Key %s, sector %02d: [%012" PRIx64 "]"
+		PrintAndLogEx(INFO, "Reader is trying authenticate with: Key %s, sector %02d: [%012" PRIx64 "]"
 			, keytype ? "B" : "A"
 			, sector
 			, key
@@ -2054,7 +2052,7 @@ void readerAttack(nonces_t data, bool setEmulatorMem, bool verbose) {
 			num_to_bytes( k_sector[sector].Key[0], 6, memBlock);
 			num_to_bytes( k_sector[sector].Key[1], 6, memBlock+10);
 			//iceman,  guessing this will not work so well for 4K tags.
-			PrintAndLogEx(NORMAL, "Setting Emulator Memory Block %02d: [%s]"
+			PrintAndLogEx(INFO, "Setting Emulator Memory Block %02d: [%s]"
 				, (sector*4) + 3
 				, sprint_hex( memBlock, sizeof(memBlock))
 				);
@@ -2129,7 +2127,7 @@ int CmdHF14AMf1kSim(const char *Cmd) {
 	UsbCommand resp;		
 
 	if(flags & FLAG_INTERACTIVE) {
-		PrintAndLogEx(NORMAL, "Press pm3-button or send another cmd to abort simulation");
+		PrintAndLogEx(INFO, "Press pm3-button or send another cmd to abort simulation");
 
 		while( !ukbhit() ){	
 			if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500) ) continue;
@@ -2165,8 +2163,8 @@ int CmdHF14AMfSniff(const char *Cmd){
 	
 	memset(uid, 0x00, sizeof(uid));
 	
-	char ctmp = param_getchar(Cmd, 0);
-	if ( ctmp == 'h' || ctmp == 'H' ) return usage_hf14_sniff();
+	char ctmp = tolower(param_getchar(Cmd, 0));
+	if ( ctmp == 'h') return usage_hf14_sniff();
 	
 	for (int i = 0; i < 4; i++) {
 		ctmp = tolower(param_getchar(Cmd, i));
@@ -2193,7 +2191,7 @@ int CmdHF14AMfSniff(const char *Cmd){
 		printf("."); fflush(stdout);
 		if (ukbhit()) {
 			int gc = getchar(); (void)gc;
-			PrintAndLogEx(NORMAL, "\n[!] aborted via keyboard!\n");
+			PrintAndLogEx(INFO, "\naborted via keyboard!\n");
 			break;
 		}
 		
@@ -2496,7 +2494,7 @@ int CmdHF14AMfELoad(const char *Cmd) {
 			return 4;
 		}
 	}
-	PrintAndLogEx(SUCCESS, "Loaded %d blocks from file: %s", blockNum, filename);
+	PrintAndLogEx(SUCCESS, "Loaded %d blocks from file: " _YELLOW_(%s), blockNum, filename);
 	return 0;
 }
 
@@ -2804,8 +2802,8 @@ int CmdHF14AMfCGetBlk(const char *Cmd) {
 	int res;
 	memset(data, 0x00, sizeof(data));
 
-	char ctmp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) < 1 || ctmp == 'h' || ctmp == 'H') return usage_hf14_cgetblk();
+	char ctmp = tolower(param_getchar(Cmd, 0));
+	if (strlen(Cmd) < 1 || ctmp == 'h') return usage_hf14_cgetblk();
 
 	blockNo = param_get8(Cmd, 0);
 
@@ -2840,8 +2838,8 @@ int CmdHF14AMfCGetSc(const char *Cmd) {
 	uint8_t sector = 0;
 	int i, res, flags;
 
-	char ctmp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) < 1 || ctmp == 'h' || ctmp == 'H') return usage_hf14_cgetsc();
+	char ctmp = tolower(param_getchar(Cmd, 0));
+	if (strlen(Cmd) < 1 || ctmp == 'h') return usage_hf14_cgetsc();
 
 	sector = param_get8(Cmd, 0);
 	if (sector > 39) {
@@ -2979,8 +2977,8 @@ int CmdHF14AMfCSave(const char *Cmd) {
 //needs nt, ar, at, Data to decrypt
 int CmdHf14AMfDecryptBytes(const char *Cmd){
 	
-	char ctmp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) < 1 || ctmp == 'h' || ctmp == 'H') return usage_hf14_decryptbytes();
+	char ctmp = tolower(param_getchar(Cmd, 0));
+	if (strlen(Cmd) < 1 || ctmp == 'h') return usage_hf14_decryptbytes();
 	
 	uint32_t nt 	= param_get32ex(Cmd,0,0,16);
 	uint32_t ar_enc = param_get32ex(Cmd,1,0,16);
@@ -3031,7 +3029,7 @@ int CmdHf14AMfSetMod(const char *Cmd) {
 	UsbCommand resp;
 	if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
 		uint8_t ok = resp.arg[0] & 0xff;
-		PrintAndLogEx(NORMAL, "isOk:%02x", ok);
+		PrintAndLogEx(SUCCESS, "isOk:%02x", ok);
 		if (!ok)
 			PrintAndLogEx(FAILED, "Failed.");
 	} else {
@@ -3044,12 +3042,12 @@ int CmdHf14AMfSetMod(const char *Cmd) {
 int CmdHf14AMfNack(const char *Cmd) {
 
 	bool verbose = false;
-	char ctmp = param_getchar(Cmd, 0);	
-	if ( ctmp == 'h' || ctmp == 'H' ) return usage_hf14_nack();
-	if ( ctmp == 'v' || ctmp == 'V' ) verbose = true;
+	char ctmp = tolower(param_getchar(Cmd, 0));
+	if ( ctmp == 'h' ) return usage_hf14_nack();
+	if ( ctmp == 'v' ) verbose = true;
 
 	if ( verbose )
-		PrintAndLogEx(NORMAL, "Started testing card for NACK bug. Press key to abort");
+		PrintAndLogEx(INFO, "Started testing card for NACK bug. Press key to abort");
 	
 	detect_classic_nackbug(verbose);
 	return 0;
@@ -3107,7 +3105,7 @@ int CmdHF14AMfice(const char *Cmd) {
 	PrintAndLogEx(NORMAL, "Collecting %u nonces \n", limit);
 	
 	if ((fnonces = fopen(filename,"wb")) == NULL) { 
-		PrintAndLogEx(WARNING, "Could not create file %s",filename);
+		PrintAndLogEx(WARNING, "Could not create file " _YELLOW_(%s),filename);
 		return 3;
 	}
 
@@ -3118,7 +3116,7 @@ int CmdHF14AMfice(const char *Cmd) {
 	do {
 		if (ukbhit()) {
 			int gc = getchar(); (void)gc;
-			PrintAndLogEx(NORMAL, "\naborted via keyboard!\n");
+			PrintAndLogEx(INFO, "\naborted via keyboard!\n");
 			break;
 		}
 		
@@ -3140,7 +3138,7 @@ int CmdHF14AMfice(const char *Cmd) {
 	
 		total_num_nonces += items;
 		if ( total_num_nonces > part_limit ) {
-			PrintAndLogEx(NORMAL, "Total nonces %u\n", total_num_nonces);
+			PrintAndLogEx(INFO, "Total nonces %u\n", total_num_nonces);
 			part_limit += 3000;
 		}
 		
@@ -3151,7 +3149,7 @@ int CmdHF14AMfice(const char *Cmd) {
 	} while (!acquisition_completed);
 
 out:
-	PrintAndLogEx(NORMAL, "time: %" PRIu64 " seconds\n", (msclock()-t1)/1000);
+	PrintAndLogEx(SUCCESS, "time: %" PRIu64 " seconds\n", (msclock()-t1)/1000);
 	
 	if ( fnonces ) {
 		fflush(fnonces);

From 0997c558004593b255bf0e91393a4cfe7ef8d471 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Feb 2019 16:07:39 +0100
Subject: [PATCH 0497/1938] chg: colors

---
 client/cmdhfmfu.c | 61 +++++++++++++++++++++--------------------------
 1 file changed, 27 insertions(+), 34 deletions(-)

diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index 0a7e77b1c..6f189fabb 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -980,11 +980,11 @@ int CmdHF14AMfUInfo(const char *Cmd){
 			if ( hasAuthKey ) return 1;
 
 			// also try to diversify default keys..  look into CmdHF14AMfuGenDiverseKeys
-			PrintAndLogEx(NORMAL, "Trying some default 3des keys");
+			PrintAndLogEx(INFO, "Trying some default 3des keys");
 			for (uint8_t i = 0; i < KEYS_3DES_COUNT; ++i ) {
 				key = default_3des_keys[i];
 				if (ulc_authentication(key, true)) {
-					PrintAndLogEx(NORMAL, "Found default 3des key: ");
+					PrintAndLogEx(SUCCESS, "Found default 3des key: ");
 					uint8_t keySwap[16];
 					memcpy(keySwap, SwapEndian64(key,16,8), 16);
 					ulc_print_3deskey(keySwap);
@@ -1079,7 +1079,7 @@ int CmdHF14AMfUInfo(const char *Cmd){
 			num_to_bytes( ul_ev1_pwdgenA(card.uid), 4, key);
 			len = ulev1_requestAuthentication(key, pack, sizeof(pack));
 			if (len > -1) {
-				PrintAndLogEx(NORMAL, "Found a default password: %s || Pack: %02X %02X",sprint_hex(key, 4), pack[0], pack[1]);
+				PrintAndLogEx(SUCCESS, "Found a default password: %s || Pack: %02X %02X",sprint_hex(key, 4), pack[0], pack[1]);
 				goto out;
 			}
 
@@ -1089,7 +1089,7 @@ int CmdHF14AMfUInfo(const char *Cmd){
 			num_to_bytes( ul_ev1_pwdgenB(card.uid), 4, key);
 			len = ulev1_requestAuthentication(key, pack, sizeof(pack));
 			if (len > -1) {
-				PrintAndLogEx(NORMAL, "Found a default password: %s || Pack: %02X %02X",sprint_hex(key, 4), pack[0], pack[1]);
+				PrintAndLogEx(SUCCESS, "Found a default password: %s || Pack: %02X %02X",sprint_hex(key, 4), pack[0], pack[1]);
 				goto out;
 			}
 
@@ -1099,7 +1099,7 @@ int CmdHF14AMfUInfo(const char *Cmd){
 			num_to_bytes( ul_ev1_pwdgenC(card.uid), 4, key);
 			len = ulev1_requestAuthentication(key, pack, sizeof(pack));
 			if (len > -1) {
-				PrintAndLogEx(NORMAL, "Found a default password: %s || Pack: %02X %02X",sprint_hex(key, 4), pack[0], pack[1]);
+				PrintAndLogEx(SUCCESS, "Found a default password: %s || Pack: %02X %02X",sprint_hex(key, 4), pack[0], pack[1]);
 				goto out;
 			}
 			
@@ -1109,7 +1109,7 @@ int CmdHF14AMfUInfo(const char *Cmd){
 			num_to_bytes( ul_ev1_pwdgenD(card.uid), 4, key);
 			len = ulev1_requestAuthentication(key, pack, sizeof(pack));
 			if (len > -1) {
-				PrintAndLogEx(NORMAL, "Found a default password: %s || Pack: %02X %02X",sprint_hex(key, 4), pack[0], pack[1]);
+				PrintAndLogEx(SUCCESS, "Found a default password: %s || Pack: %02X %02X",sprint_hex(key, 4), pack[0], pack[1]);
 				goto out;
 			}
 			
@@ -1119,13 +1119,13 @@ int CmdHF14AMfUInfo(const char *Cmd){
 				key = default_pwd_pack[i];
 				len = ulev1_requestAuthentication(key, pack, sizeof(pack));
 				if (len > -1) {
-					PrintAndLogEx(NORMAL, "Found a default password: %s || Pack: %02X %02X",sprint_hex(key, 4), pack[0], pack[1]);
+					PrintAndLogEx(SUCCESS, "Found a default password: %s || Pack: %02X %02X",sprint_hex(key, 4), pack[0], pack[1]);
 					break;
 				} else {
 					if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
 				}
 			}
-			if (len < 1) PrintAndLogEx(NORMAL, "password not known");
+			if (len < 1) PrintAndLogEx(WARNING, "password not known");
 		}
 	}
 out:
@@ -1250,7 +1250,7 @@ int CmdHF14AMfUWrBl(const char *Cmd){
 	UsbCommand resp;
 	if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
 		uint8_t isOK  = resp.arg[0] & 0xff;
-		PrintAndLogEx(NORMAL, "isOk:%02x", isOK);
+		PrintAndLogEx(SUCCESS, "isOk:%02x", isOK);
 	} else {
 		PrintAndLogEx(WARNING, "Command execute timeout");
 	}
@@ -1365,7 +1365,7 @@ int CmdHF14AMfURdBl(const char *Cmd){
 			PrintAndLogEx(WARNING, "Failed reading block: (%02x)", isOK);
 		}
 	} else {
-		PrintAndLogEx(NORMAL, "Command execute time-out");
+		PrintAndLogEx(WARNING, "Command execute time-out");
 	}
 	return 0;
 }
@@ -1912,12 +1912,10 @@ int CmdHF14AMfURestore(const char *Cmd){
 	memset(authkey, 0x00, sizeof(authkey));
 	
 	while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch(param_getchar(Cmd, cmdp)) {
+		switch (tolower(param_getchar(Cmd, cmdp))) {
 		case 'h':
-		case 'H':
 			return usage_hf_mfu_restore();
 		case 'k':
-		case 'K':
 			keylen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
 			if (keylen == 32 || keylen == 8) { //ul-c or ev1/ntag key length
 				errors = param_gethex(tempStr, 0, authkey, keylen);
@@ -1930,12 +1928,10 @@ int CmdHF14AMfURestore(const char *Cmd){
 			hasKey = true;
 			break;
 		case 'l':
-		case 'L':
 			swapEndian = true;
 			cmdp++;
 			break;
 		case 'f':
-		case 'F':
 			filelen = param_getstr(Cmd, cmdp+1, filename, FILE_PATH_SIZE);
 
 			if (filelen > FILE_PATH_SIZE-5)
@@ -1947,17 +1943,14 @@ int CmdHF14AMfURestore(const char *Cmd){
 			cmdp += 2;
 			break;
 		case 's':
-		case 'S':
 			cmdp++;
 			write_special = true;
 			break;
 		case 'e':
-		case 'E':
 			cmdp++;
 			write_extra = true;
 			break;
 		case 'r':
-		case 'R':
 			cmdp++;
 			read_key = true;
 			break;
@@ -1972,7 +1965,7 @@ int CmdHF14AMfURestore(const char *Cmd){
 	if (errors || cmdp == 0) return usage_hf_mfu_restore();
 	
 	if ((f = fopen(filename,"rb")) == NULL) {
-		PrintAndLogEx(WARNING, "Could not find file %s", filename);
+		PrintAndLogEx(WARNING, "Could not find file " _YELLOW_(%s), filename);
 		return 1;
 	}	
 
@@ -2000,7 +1993,7 @@ int CmdHF14AMfURestore(const char *Cmd){
 		return 1;
 	}
 	
-	PrintAndLogEx(NORMAL, "Restoring %s to card", filename);
+	PrintAndLogEx(INFO, "Restoring " _YELLOW_(%s)" to card", filename);
 	
 	mfu_dump_t *mem = (mfu_dump_t*)dump;
 	uint8_t pages = (bytes_read-48)/4;
@@ -2084,7 +2077,7 @@ int CmdHF14AMfURestore(const char *Cmd){
 		}
 	}
 	
-	PrintAndLogEx(NORMAL, "Restoring data blocks.");
+	PrintAndLogEx(INFO, "Restoring data blocks.");
 	// write all other data 
 	// Skip block 0,1,2,3 (only magic tags can write to them)
 	// Skip last 5 blocks usually is configuration
@@ -2103,7 +2096,7 @@ int CmdHF14AMfURestore(const char *Cmd){
 	// write special data last
 	if (write_special) {
 		
-		PrintAndLogEx(NORMAL, "Restoring configuration blocks.\n");
+		PrintAndLogEx(INFO, "Restoring configuration blocks.\n");
 		
 		PrintAndLogEx(NORMAL, "authentication with keytype[%x]  %s\n", (uint8_t)(c.arg[1] & 0xff), sprint_hex(p_authkey,4));
 		
@@ -2128,16 +2121,16 @@ int CmdHF14AMfURestore(const char *Cmd){
 //  Load emulator with dump file
 //
 int CmdHF14AMfUeLoad(const char *Cmd){
-	char c = param_getchar(Cmd, 0);
-	if ( c == 'h' || c == 'H' || c == 0x00) return usage_hf_mfu_eload();
+	char c = tolower(param_getchar(Cmd, 0));
+	if ( c == 'h' || c == 0x00) return usage_hf_mfu_eload();
 	return CmdHF14AMfELoad(Cmd);
 }
 //
 //  Simulate tag
 //
 int CmdHF14AMfUSim(const char *Cmd){
-	char c = param_getchar(Cmd, 0);
-	if ( c == 'h' || c == 'H' || c == 0x00) return usage_hf_mfu_sim();
+	char c = tolower(param_getchar(Cmd, 0));
+	if ( c == 'h' || c == 0x00) return usage_hf_mfu_sim();
 	return CmdHF14ASim(Cmd);
 }
 
@@ -2153,16 +2146,16 @@ int CmdHF14AMfucAuth(const char *Cmd){
 	uint8_t keyNo = 3;
 	bool errors = false;
 
-	char cmdp = param_getchar(Cmd, 0);
+	char cmdp = tolower(param_getchar(Cmd, 0));
 
 	//Change key to user defined one
-	if (cmdp == 'k' || cmdp == 'K'){
+	if (cmdp == 'k'){
 		keyNo = param_get8(Cmd, 1);
 		if(keyNo >= KEYS_3DES_COUNT) 
 			errors = true;
 	}
 
-	if (cmdp == 'h' || cmdp == 'H') errors = true;
+	if (cmdp == 'h') errors = true;
 	
 	if (errors) return usage_hf_mfu_ucauth(); 
 
@@ -2278,9 +2271,9 @@ int CmdTestDES(const char * cmd)
 int CmdHF14AMfucSetPwd(const char *Cmd){
 
 	uint8_t pwd[16] = {0x00};	
-	char cmdp = param_getchar(Cmd, 0);
+	char cmdp = tolower(param_getchar(Cmd, 0));
 
-	if (strlen(Cmd) == 0  || cmdp == 'h' || cmdp == 'H') return usage_hf_mfu_ucsetpwd();
+	if (strlen(Cmd) == 0  || cmdp == 'h') return usage_hf_mfu_ucsetpwd();
 	
 	if (param_gethex(Cmd, 0, pwd, 32)) {
 		PrintAndLogEx(WARNING, "Password must include 32 HEX symbols");
@@ -2295,7 +2288,7 @@ int CmdHF14AMfucSetPwd(const char *Cmd){
 	UsbCommand resp;
 	if (WaitForResponseTimeout(CMD_ACK,&resp,1500) ) {
 		if ( (resp.arg[0] & 0xff) == 1) {
-			PrintAndLogEx(NORMAL, "Ultralight-C new password: %s", sprint_hex(pwd,16));
+			PrintAndLogEx(INFO, "Ultralight-C new password: %s", sprint_hex(pwd,16));
 		} else {
 			PrintAndLogEx(WARNING, "Failed writing at block %d", resp.arg[1] & 0xff);
 			return 1;
@@ -2315,9 +2308,9 @@ int CmdHF14AMfucSetUid(const char *Cmd){
 	UsbCommand c = {CMD_MIFAREU_READBL};
 	UsbCommand resp;
 	uint8_t uid[7] = {0x00};
-	char cmdp = param_getchar(Cmd, 0);
+	char cmdp = tolower(param_getchar(Cmd, 0));
 	
-	if (strlen(Cmd) == 0  || cmdp == 'h' || cmdp == 'H') return usage_hf_mfu_ucsetuid();
+	if (strlen(Cmd) == 0  || cmdp == 'h') return usage_hf_mfu_ucsetuid();
 
 	if (param_gethex(Cmd, 0, uid, 14)) {
 		PrintAndLogEx(WARNING, "UID must include 14 HEX symbols");

From a4f6701c85a4e5f3e0438759c5854246938ff9b8 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Feb 2019 16:16:24 +0100
Subject: [PATCH 0498/1938] chg: cleaning

---
 client/cmdhf15.c | 56 ++++++++++++++++++++++++++----------------------
 1 file changed, 30 insertions(+), 26 deletions(-)

diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index 41d6ee8cd..2800b0c9c 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -764,7 +764,7 @@ int CmdHF15Dump(const char*Cmd) {
 }
 
 int CmdHF15Restore(const char*Cmd) {
-	FILE *file;
+	FILE *f;
 	
 	uint8_t uid[8]={0x00};
 	char filename[FILE_PATH_SIZE] = {0x00};
@@ -774,10 +774,10 @@ int CmdHF15Restore(const char*Cmd) {
 	char newCmdPrefix[255] = {0x00}, tmpCmd[255] = {0x00};
 	char param[FILE_PATH_SIZE]="";
 	char hex[255]="";
-	uint8_t retries = 3, tried = 0;
+	uint8_t retries = 3, tried = 0, i = 0;
 	int retval=0;
 	size_t bytes_read;
-	uint8_t i=0;
+
 		while(param_getchar(Cmd, cmdp) != 0x00) {
 		switch(tolower(param_getchar(Cmd, cmdp))) {
 			case '-':
@@ -785,7 +785,8 @@ int CmdHF15Restore(const char*Cmd) {
 				switch(param[1])
 				{
 					case '2':
-					case 'o': strncpy(newCmdPrefix, " ",sizeof(newCmdPrefix)-1);
+					case 'o':
+						strncpy(newCmdPrefix, " ", sizeof(newCmdPrefix)-1);
 						strncat(newCmdPrefix, param, sizeof(newCmdPrefix)-1);
 								break;
 					default:
@@ -815,18 +816,18 @@ int CmdHF15Restore(const char*Cmd) {
 			default:
 				PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
 				return usage_15_restore();
-				break;
 		}
 		cmdp++;
 	}
+
 	PrintAndLogEx(INFO,"Blocksize: %u",blocksize);
-	if(filename[0]=='\0')
-	{
+	
+	if ( !strlen(filename)) {
 		PrintAndLogEx(WARNING,"Please provide a filename");
-		return 1;
+		return usage_15_restore();
 	}
 
-	if ((file = fopen(filename,"rb")) == NULL) {
+	if ((f = fopen(filename, "rb")) == NULL) {
 		PrintAndLogEx(WARNING, "Could not find file %s", filename);
 		return 2;
 	}
@@ -835,40 +836,43 @@ int CmdHF15Restore(const char*Cmd) {
 		PrintAndLogEx(WARNING, "No tag found");
 		return 3;
 	}
+	
 	while (1) {
-		tried=0;
-		hex[0]=0x00;
-		tmpCmd[0]=0x00;
+		tried = 0;
+		hex[0] = 0x00;
+		tmpCmd[0] = 0x00;
 		
-		bytes_read = fread( buff, 1, blocksize, file );
+		bytes_read = fread( buff, 1, blocksize, f );
 		if ( bytes_read == 0) {
-			PrintAndLogEx(SUCCESS, "File reading done (%s).", filename);
-			fclose(file);
+			PrintAndLogEx(SUCCESS, "File reading done `%s`", filename);
+			fclose(f);
 			return 0;
-		}
-		else if ( bytes_read != blocksize) {
+		} else if ( bytes_read != blocksize) {
 			PrintAndLogEx(WARNING, "File reading error (%s), %u bytes read instead of %u bytes.", filename, bytes_read, blocksize);
-			fclose(file);
+			fclose(f);
 			return 2;
 		}
-		for(int j=0;j<blocksize;j++)
-			snprintf(hex+j*2,3,"%02X", (unsigned char)buff[j]);
-		for(int j=0;j<sizeof(uid)/sizeof(uid[0]);j++)
+		
+		for(int j=0; j < blocksize; j++)
+			snprintf(hex+j*2, 3, "%02X", buff[j]);
+		
+		for(int j=0; j < sizeof(uid)/sizeof(uid[0]); j++)
 			snprintf(buff+j*2,3,"%02X", uid[j]);
 		
 		//TODO: Addressed mode currently not work
 		//snprintf(tmpCmd, sizeof(tmpCmd), "%s %s %d %s", newCmdPrefix, buff, i, hex);
-		snprintf(tmpCmd, sizeof(tmpCmd), "%s u %d %s", newCmdPrefix, i, hex);
-		PrintAndLogEx(DEBUG, "Command to be sent: %s", tmpCmd);
+		snprintf(tmpCmd, sizeof(tmpCmd), "%s u %u %s", newCmdPrefix, i, hex);
+		PrintAndLogEx(DEBUG, "Command to be sent| %s", tmpCmd);
 
-		for(tried=0;tried<retries;tried++)
-			if(!(retval=CmdHF15Write(tmpCmd)))
+		for(tried=0; tried < retries; tried++)
+			if(!(retval = CmdHF15Write(tmpCmd)))
 				break;
 		if(tried >= retries)
 			return retval;
+
 		i++;
 	}
-	fclose(file);
+	fclose(f);
 }
 
 int CmdHF15List(const char *Cmd) {

From 5ec82a0dc4499cc7daf4f975a10757ca0c640015 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Feb 2019 16:27:56 +0100
Subject: [PATCH 0499/1938] chg: adjustments

---
 client/cmdhfmfu.c | 54 +++++++++++++++++++++++------------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index 6f189fabb..e583f7f02 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -518,57 +518,57 @@ int ul_print_type(uint32_t tagtype, uint8_t spaces){
 	char *spacer = spc + (10-spaces);
 
 	if ( tagtype & UL )	
-		PrintAndLogEx(SUCCESS, "%sTYPE : MIFARE Ultralight (MF0ICU1) %s", spacer, (tagtype & MAGIC) ? "<magic>" : "" );
+		PrintAndLogEx(NORMAL, "%sTYPE : MIFARE Ultralight (MF0ICU1) %s", spacer, (tagtype & MAGIC) ? "<magic>" : "" );
 	else if ( tagtype & UL_C)
-		PrintAndLogEx(SUCCESS, "%sTYPE : MIFARE Ultralight C (MF0ULC) %s", spacer, (tagtype & MAGIC) ? "<magic>" : "" );
+		PrintAndLogEx(NORMAL, "%sTYPE : MIFARE Ultralight C (MF0ULC) %s", spacer, (tagtype & MAGIC) ? "<magic>" : "" );
 	else if ( tagtype & UL_NANO_40)
-		PrintAndLogEx(SUCCESS, "%sTYPE : MIFARE Ultralight Nano 40bytes (MF0UNH00)", spacer); 		
+		PrintAndLogEx(NORMAL, "%sTYPE : MIFARE Ultralight Nano 40bytes (MF0UNH00)", spacer); 		
 	else if ( tagtype & UL_EV1_48)
-		PrintAndLogEx(SUCCESS, "%sTYPE : MIFARE Ultralight EV1 48bytes (MF0UL1101)", spacer); 
+		PrintAndLogEx(NORMAL, "%sTYPE : MIFARE Ultralight EV1 48bytes (MF0UL1101)", spacer); 
 	else if ( tagtype & UL_EV1_128)	
-		PrintAndLogEx(SUCCESS, "%sTYPE : MIFARE Ultralight EV1 128bytes (MF0UL2101)", spacer);
+		PrintAndLogEx(NORMAL, "%sTYPE : MIFARE Ultralight EV1 128bytes (MF0UL2101)", spacer);
 	else if ( tagtype & UL_EV1 )
-		PrintAndLogEx(SUCCESS, "%sTYPE : MIFARE Ultralight EV1 UNKNOWN", spacer);
+		PrintAndLogEx(NORMAL, "%sTYPE : MIFARE Ultralight EV1 UNKNOWN", spacer);
 	else if ( tagtype & NTAG )
-		PrintAndLogEx(SUCCESS, "%sTYPE : NTAG UNKNOWN", spacer);
+		PrintAndLogEx(NORMAL, "%sTYPE : NTAG UNKNOWN", spacer);
 	else if ( tagtype & NTAG_203 )
-		PrintAndLogEx(SUCCESS, "%sTYPE : NTAG 203 144bytes (NT2H0301F0DT)", spacer);
+		PrintAndLogEx(NORMAL, "%sTYPE : NTAG 203 144bytes (NT2H0301F0DT)", spacer);
 	else if ( tagtype & NTAG_210 )
-		PrintAndLogEx(SUCCESS, "%sTYPE : NTAG 210 48bytes (NT2L1011G0DU)", spacer);
+		PrintAndLogEx(NORMAL, "%sTYPE : NTAG 210 48bytes (NT2L1011G0DU)", spacer);
 	else if ( tagtype & NTAG_212 )
-		PrintAndLogEx(SUCCESS, "%sTYPE : NTAG 212 128bytes (NT2L1211G0DU)", spacer);
+		PrintAndLogEx(NORMAL, "%sTYPE : NTAG 212 128bytes (NT2L1211G0DU)", spacer);
 	else if ( tagtype & NTAG_213 )
-		PrintAndLogEx(SUCCESS, "%sTYPE : NTAG 213 144bytes (NT2H1311G0DU)", spacer);
+		PrintAndLogEx(NORMAL, "%sTYPE : NTAG 213 144bytes (NT2H1311G0DU)", spacer);
 	else if ( tagtype & NTAG_213_F )
-		PrintAndLogEx(SUCCESS, "%sTYPE : NTAG 213F 144bytes (NT2H1311F0DTL)", spacer);
+		PrintAndLogEx(NORMAL, "%sTYPE : NTAG 213F 144bytes (NT2H1311F0DTL)", spacer);
 	else if ( tagtype & NTAG_215 )
-		PrintAndLogEx(SUCCESS, "%sTYPE : NTAG 215 504bytes (NT2H1511G0DU)", spacer);
+		PrintAndLogEx(NORMAL, "%sTYPE : NTAG 215 504bytes (NT2H1511G0DU)", spacer);
 	else if ( tagtype & NTAG_216 )
-		PrintAndLogEx(SUCCESS, "%sTYPE : NTAG 216 888bytes (NT2H1611G0DU)", spacer);
+		PrintAndLogEx(NORMAL, "%sTYPE : NTAG 216 888bytes (NT2H1611G0DU)", spacer);
 	else if ( tagtype & NTAG_216_F )
-		PrintAndLogEx(SUCCESS, "%sTYPE : NTAG 216F 888bytes (NT2H1611F0DTL)", spacer);	
+		PrintAndLogEx(NORMAL, "%sTYPE : NTAG 216F 888bytes (NT2H1611F0DTL)", spacer);	
 	else if ( tagtype & NTAG_I2C_1K )
-		PrintAndLogEx(SUCCESS, "%sTYPE : NTAG I%sC 888bytes (NT3H1101FHK)", spacer, "\xFD");
+		PrintAndLogEx(NORMAL, "%sTYPE : NTAG I%sC 888bytes (NT3H1101FHK)", spacer, "\xFD");
 	else if ( tagtype & NTAG_I2C_2K )	
-		PrintAndLogEx(SUCCESS, "%sTYPE : NTAG I%sC 1904bytes (NT3H1201FHK)", spacer, "\xFD");
+		PrintAndLogEx(NORMAL, "%sTYPE : NTAG I%sC 1904bytes (NT3H1201FHK)", spacer, "\xFD");
 	else if ( tagtype & NTAG_I2C_1K_PLUS )
-		PrintAndLogEx(SUCCESS, "%sTYPE : NTAG I%sC plus 888bytes (NT3H2111FHK)", spacer, "\xFD");
+		PrintAndLogEx(NORMAL, "%sTYPE : NTAG I%sC plus 888bytes (NT3H2111FHK)", spacer, "\xFD");
 	else if ( tagtype & NTAG_I2C_2K_PLUS )	
-		PrintAndLogEx(SUCCESS, "%sTYPE : NTAG I%sC plus 1912bytes (NT3H2211FHK)", spacer, "\xFD");
+		PrintAndLogEx(NORMAL, "%sTYPE : NTAG I%sC plus 1912bytes (NT3H2211FHK)", spacer, "\xFD");
 	else if ( tagtype & MY_D )
-		PrintAndLogEx(SUCCESS, "%sTYPE : INFINEON my-d\x99 (SLE 66RxxS)", spacer);
+		PrintAndLogEx(NORMAL, "%sTYPE : INFINEON my-d\x99 (SLE 66RxxS)", spacer);
 	else if ( tagtype & MY_D_NFC )
-		PrintAndLogEx(SUCCESS, "%sTYPE : INFINEON my-d\x99 NFC (SLE 66RxxP)", spacer);
+		PrintAndLogEx(NORMAL, "%sTYPE : INFINEON my-d\x99 NFC (SLE 66RxxP)", spacer);
 	else if ( tagtype & MY_D_MOVE )
-		PrintAndLogEx(SUCCESS, "%sTYPE : INFINEON my-d\x99 move (SLE 66R01P)", spacer);
+		PrintAndLogEx(NORMAL, "%sTYPE : INFINEON my-d\x99 move (SLE 66R01P)", spacer);
 	else if ( tagtype & MY_D_MOVE_NFC )
-		PrintAndLogEx(SUCCESS, "%sTYPE : INFINEON my-d\x99 move NFC (SLE 66R01P)", spacer);
+		PrintAndLogEx(NORMAL, "%sTYPE : INFINEON my-d\x99 move NFC (SLE 66R01P)", spacer);
 	else if ( tagtype & MY_D_MOVE_LEAN )
-		PrintAndLogEx(SUCCESS, "%sTYPE : INFINEON my-d\x99 move lean (SLE 66R01L)", spacer);
+		PrintAndLogEx(NORMAL, "%sTYPE : INFINEON my-d\x99 move lean (SLE 66R01L)", spacer);
 	else if ( tagtype & FUDAN_UL )
-		PrintAndLogEx(SUCCESS, "%sTYPE : FUDAN Ultralight Compatible (or other compatible) %s", spacer, (tagtype & MAGIC) ? "<magic>" : "" );
+		PrintAndLogEx(NORMAL, "%sTYPE : FUDAN Ultralight Compatible (or other compatible) %s", spacer, (tagtype & MAGIC) ? "<magic>" : "" );
 	else
-		PrintAndLogEx(SUCCESS, "%sTYPE : Unknown %06x", spacer, tagtype);
+		PrintAndLogEx(NORMAL, "%sTYPE : Unknown %06x", spacer, tagtype);
 	return 0;
 }
 
@@ -606,7 +606,7 @@ static int ulc_print_configuration( uint8_t *data){
 
 static int ulev1_print_configuration(uint32_t tagtype, uint8_t *data, uint8_t startPage){
 
-	PrintAndLogEx(SUCCESS, "\n--- Tag Configuration");
+	PrintAndLogEx(NORMAL, "\n--- Tag Configuration");
 
 	bool strg_mod_en = (data[0] & 2);
 	uint8_t authlim = (data[4] & 0x07);

From 1e98c4621d5ea2ee97dcb2247b6c62fbdb2bdc91 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Feb 2019 16:30:57 +0100
Subject: [PATCH 0500/1938] chg: colors

---
 client/loclass/fileutils.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index 0751f838b..6078ec4f9 100644
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -245,7 +245,7 @@ int saveFileJSON(const char *preferredName, const char *suffix, JSONFileType fty
 		retval = 200;
 		goto out;
 	}
-	PrintAndLogDevice(SUCCESS, "File `" _YELLOW_(%s)"` saved.", fileName);
+	PrintAndLogDevice(SUCCESS, "Save to json file " _YELLOW_(%s), fileName);
 	json_decref(root);
 
 out:	
@@ -445,7 +445,7 @@ int loadFileJSON(const char *preferredName, const char *suffix, void* data, size
 	}
 
 	
-	PrintAndLog("Loaded JSON: " _YELLOW_(%s) " OK.", fileName);
+	PrintAndLog("loaded from JSON file " _YELLOW_(%s), fileName);
 out:	
 	json_decref(root);
 	free(fileName);

From 58f35d50a628cf34977db08b659429db3e4bc10a Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Feb 2019 16:32:13 +0100
Subject: [PATCH 0501/1938] chg: textual

---
 client/loclass/fileutils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index 6078ec4f9..da91b21ec 100644
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -245,7 +245,7 @@ int saveFileJSON(const char *preferredName, const char *suffix, JSONFileType fty
 		retval = 200;
 		goto out;
 	}
-	PrintAndLogDevice(SUCCESS, "Save to json file " _YELLOW_(%s), fileName);
+	PrintAndLogDevice(SUCCESS, "saved to json file " _YELLOW_(%s), fileName);
 	json_decref(root);
 
 out:	

From b320ebca7c03d8add91c3d65860fdcaf824103f9 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Feb 2019 16:39:39 +0100
Subject: [PATCH 0502/1938] chg: textual

---
 client/cmdhfmf.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index e9b1bed10..e2dc16efd 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -1,4 +1,4 @@
-//-----------------------------------------------------------------------------
+1//-----------------------------------------------------------------------------
 // Copyright (C) 2011,2012 Merlok
 //
 // This code is licensed to you under the terms of the GNU GPL, version 2 or,
@@ -1235,8 +1235,8 @@ int CmdHF14AMfNested(const char *Cmd) {
 				if (e_sector[i].foundKey[1])
 					num_to_bytes(e_sector[i].Key[1], 6, &keyBlock[10]);
 				mfEmlSetMem(keyBlock, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
-				PrintAndLogEx(SUCCESS, "key transferred to emulator memory.");
-			}		
+			}
+			PrintAndLogEx(SUCCESS, "key transferred to emulator memory.");
 		}
 		
 		// Create dump file

From 72cf200df7b0d17f1f38117f71788fefea40edfe Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Feb 2019 16:43:27 +0100
Subject: [PATCH 0503/1938] chg....

---
 client/cmdhfmf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index e2dc16efd..47646852e 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -1,4 +1,4 @@
-1//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 // Copyright (C) 2011,2012 Merlok
 //
 // This code is licensed to you under the terms of the GNU GPL, version 2 or,

From 26bca369292dc7cb6ae39762555c4bbf6e250ff1 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 19 Feb 2019 18:39:05 +0200
Subject: [PATCH 0504/1938] delete comment

---
 client/emv/emvcore.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/emv/emvcore.c b/client/emv/emvcore.c
index 6ccee471c..7af08690c 100644
--- a/client/emv/emvcore.c
+++ b/client/emv/emvcore.c
@@ -263,7 +263,6 @@ int EMVExchangeEx(EMVCommandChannel channel, bool ActivateField, bool LeaveField
 		break;
 	case ECC_CONTACT:
 #ifdef WITH_SMARTCARD		
-		//int ExchangeAPDUSC(uint8_t *datain, int datainlen, bool activateCard, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen);
 		res = ExchangeAPDUSC(data, (IncludeLe?6:5) + apdu.Lc, ActivateField, LeaveFieldON, Result, (int)MaxResultLen, (int *)ResultLen);
 #else
 		res = 1;

From 56c9bcc03a6d4c42e3aea902eb5d7d3c7bfb8651 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 19 Feb 2019 21:15:54 +0200
Subject: [PATCH 0505/1938] added IAD decoding and some improvements

---
 client/emv/cmdemv.c | 75 ++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 70 insertions(+), 5 deletions(-)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index d0015ac38..477062d38 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -1212,16 +1212,79 @@ int CmdEMVExec(const char *cmd) {
 		if ((CID & EMVAC_AC_MASK) == EMVAC_ARQC)	PrintAndLogEx(INFO, "AC1 result: ARQC (Online authorisation requested)");
 		if ((CID & EMVAC_AC_MASK) == EMVAC_AC_MASK)	PrintAndLogEx(INFO, "AC1 result: RFU");
 
-		PrintAndLogEx(NORMAL, "\n* * Processing online request\n");
+		// decode Issuer Application Data (IAD)
+		uint8_t CryptoVersion = 0;
+		const struct tlv *IAD = tlvdb_get(tlvRoot, 0x9f10, NULL);
+		if (IAD && (IAD->len > 1)) {
+			PrintAndLogEx(NORMAL, "\n* * Issuer Application Data (IAD):");
+			uint8_t VDDlen = IAD->value[0]; // Visa discretionary data length
+			uint8_t IDDlen = 0;             // Issuer discretionary data length
+			PrintAndLogEx(NORMAL, "IAD length: %d", IAD->len);
+			PrintAndLogEx(NORMAL, "VDDlen: %d", VDDlen);
+			if (VDDlen < IAD->len - 1) 
+				IDDlen = IAD->value[VDDlen + 1];
+			PrintAndLogEx(NORMAL, "IDDlen: %d", IDDlen);
+						
+			uint8_t DerivKeyIndex = IAD->value[1];
+			CryptoVersion = IAD->value[2];
+
+			PrintAndLogEx(NORMAL, "CryptoVersion: %d", CryptoVersion);
+			PrintAndLogEx(NORMAL, "DerivKeyIndex: %d", DerivKeyIndex);
+
+			// Card Verification Results (CVR) decode
+			if ((VDDlen - 2) > 0) {
+				uint8_t CVRlen = IAD->value[3];
+				if (CVRlen == (VDDlen - 2 - 1)) {
+					PrintAndLogEx(NORMAL, "CVR length: %d", CVRlen);
+					PrintAndLogEx(NORMAL, "CVR: %s", sprint_hex(&IAD->value[4], CVRlen));
+				} else {
+					PrintAndLogEx(NORMAL, "Wrong CVR length! CVR: %s", sprint_hex(&IAD->value[3], VDDlen - 2));
+				}
+			}
+			if (IDDlen)
+				PrintAndLogEx(NORMAL, "IDD: %s", sprint_hex(&IAD->value[VDDlen + 1], IDDlen));		
+		} else {
+			PrintAndLogEx(NORMAL, "Issuer Application Data (IAD) not found.");
+		}
+		
+		PrintAndLogEx(NORMAL, "\n* * Processing online request");
 
 		// authorization response code from acquirer
 		const char HostResponse[] = "00"; // 0x3030
-		PrintAndLogEx(NORMAL, "* * Host Response: `%s`", HostResponse);
-		tlvdb_change_or_add_node(tlvRoot, 0x8a, sizeof(HostResponse) - 1, (const unsigned char *)HostResponse);		
+		size_t HostResponseLen = sizeof(HostResponse) - 1;
+		PrintAndLogEx(NORMAL, "Host Response: `%s`", HostResponse);
+		tlvdb_change_or_add_node(tlvRoot, 0x8a, HostResponseLen, (const unsigned char *)HostResponse);		
 		
+		if (CryptoVersion == 10) {
+			PrintAndLogEx(NORMAL, "\n* * Generate ARPC");
+			
+			// Application Cryptogram (AC)
+			const struct tlv *AC = tlvdb_get(tlvRoot, 0x9f26, NULL);
+			if (AC && (AC->len > 0)) {
+				PrintAndLogEx(NORMAL, "AC: %s", sprint_hex(AC->value, AC->len));
+
+				size_t rawARPClen = AC->len;
+				uint8_t rawARPC[rawARPClen];
+				memcpy(rawARPC, AC->value, AC->len);
+				for (int i = 0; (i < HostResponseLen) && (i < rawARPClen); i++)
+					rawARPC[i] ^= HostResponse[i];
+				PrintAndLogEx(NORMAL, "raw ARPC: %s", sprint_hex(rawARPC, rawARPClen));
+				
+				// here must be calculation of ARPC, but we dont know a bank keys.
+				PrintAndLogEx(NORMAL, "ARPC: n/a");
+				
+			} else {
+				PrintAndLogEx(NORMAL, "Application Cryptogram (AC) not found.");
+			}
+
+			// here must be external authenticate, but we dont know ARPC
+			
+		}
+		
+
 		// needs to send AC2 command (res == ARQC)
 		if ((CID & 0xc0) == 0x80) {
-			PrintAndLogEx(NORMAL, "* * Calc CDOL2");
+			PrintAndLogEx(NORMAL, "\n* * Calc CDOL2");
 			struct tlv *cdol2_data_tlv = dol_process(tlvdb_get(tlvRoot, 0x8d, NULL), tlvRoot, 0x01); // 0x01 - dummy tag
 			if (!cdol2_data_tlv) {
 				PrintAndLogEx(WARNING, "Error: can't create CDOL2 TLV.");
@@ -1230,9 +1293,11 @@ int CmdEMVExec(const char *cmd) {
 			
 			PrintAndLogEx(NORMAL, "CDOL2 data[%d]: %s", cdol2_data_tlv->len, sprint_hex(cdol2_data_tlv->value, cdol2_data_tlv->len));
 			
-			PrintAndLogEx(NORMAL, "* * AC2");
+			//PrintAndLogEx(NORMAL, "* * AC2");
 			
 			
+			// here must be AC2, but we dont make external authenticate (
+		
 /*			// AC2
 			PRINT_INDENT(level);
 			if ((CID & EMVAC_AC2_MASK) == EMVAC_AAC2)	fprintf(f, "\tAC2: AAC (Transaction declined)\n");

From 25d6a1274f33d8cb9a34586ebecc8af29af0236c Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 19 Feb 2019 21:19:45 +0200
Subject: [PATCH 0506/1938] small improvement

---
 client/emv/cmdemv.c  | 2 +-
 client/emv/emvcore.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index 477062d38..e2988e1e7 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -1283,7 +1283,7 @@ int CmdEMVExec(const char *cmd) {
 		
 
 		// needs to send AC2 command (res == ARQC)
-		if ((CID & 0xc0) == 0x80) {
+		if ((CID & EMVAC_AC_MASK) == EMVAC_ARQC) {
 			PrintAndLogEx(NORMAL, "\n* * Calc CDOL2");
 			struct tlv *cdol2_data_tlv = dol_process(tlvdb_get(tlvRoot, 0x8d, NULL), tlvRoot, 0x01); // 0x01 - dummy tag
 			if (!cdol2_data_tlv) {
diff --git a/client/emv/emvcore.h b/client/emv/emvcore.h
index 7d53e83bb..9aaaf2e6f 100644
--- a/client/emv/emvcore.h
+++ b/client/emv/emvcore.h
@@ -39,7 +39,7 @@ typedef enum {
 
 enum TransactionType {
 	TT_MSD,
-	TT_VSDC,        // not standart for contactless!!!!
+	TT_VSDC,        // contact only. not standart for contactless
 	TT_QVSDCMCHIP,
 	TT_CDA,
 };

From e793fa8d73d4cf4e9fe6c16e4447beb4c6e9df74 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 19 Feb 2019 21:28:19 +0200
Subject: [PATCH 0507/1938] fix tlvdb_get_uint8

---
 client/emv/tlv.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/client/emv/tlv.c b/client/emv/tlv.c
index 8d1429640..0daedaf47 100644
--- a/client/emv/tlv.c
+++ b/client/emv/tlv.c
@@ -551,8 +551,7 @@ struct tlvdb *tlvdb_elm_get_parent(struct tlvdb *tlvdb)
 
 bool tlvdb_get_uint8(struct tlvdb *tlvRoot, tlv_tag_t tag, uint8_t *value)
 {
-	const struct tlvdb *tlvdb = tlvdb_get(tlvRoot, tag, NULL);
-	const struct tlv *tlvelm = tlvdb_get_tlv(tlvdb); 	
+	const struct tlv *tlvelm = tlvdb_get(tlvRoot, tag, NULL); 	
 	return tlv_get_uint8(tlvelm, value);
 }
 

From 3d7cf1e9b764dacbdcf39e9b582915eb1a0fe23e Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Wed, 20 Feb 2019 11:29:40 +0100
Subject: [PATCH 0508/1938] chg: text

---
 client/cmdmain.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/cmdmain.c b/client/cmdmain.c
index 5b147e76a..9b71df21d 100644
--- a/client/cmdmain.c
+++ b/client/cmdmain.c
@@ -24,14 +24,14 @@ static command_t CommandTable[] = {
 	{"lf",		CmdLF,		1, "{ Low Frequency commands... }"},
 	{"emv",     CmdEMV,     1, "{ EMV iso14443 and iso7816... }"},
 	{"rem", 	CmdRem,		1, "{ Add text to row in log file }"},	
-	{"reveng",	CmdRev, 	1, "{ Crc calculations from the software reveng 1.53... }"},
+	{"reveng",	CmdRev, 	1, "{ Crc calculations from the RevEng software... }"},
 	{"script",	CmdScript,	1, "{ Scripting commands }"},
 	{"trace",	CmdTrace,	1, "{ Trace manipulation... }"},
 #ifdef WITH_FLASH
-	{"mem",		CmdFlashMem,	1, "{ RDV40, Flash Memory manipulation... }"},
+	{"mem",		CmdFlashMem,	1, "{ Flash Memory manipulation... }"},
 #endif
 #ifdef WITH_SMARTCARD
-	{"sc",		CmdSmartcard,	1, "{ RDV40, Smart card ISO7816 commands... }"},
+	{"sc",		CmdSmartcard,	1, "{ Smart card ISO7816 commands... }"},
 #endif
 	{"quit",	CmdQuit,	1, ""},
 	{"exit",	CmdQuit,	1, "Exit program"},

From 915c73bcfc9dcd74997d999529e450216d2633f8 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 20 Feb 2019 14:48:52 +0200
Subject: [PATCH 0509/1938] fix possible error

---
 client/emv/tlv.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/client/emv/tlv.c b/client/emv/tlv.c
index 0daedaf47..31b5ea360 100644
--- a/client/emv/tlv.c
+++ b/client/emv/tlv.c
@@ -353,6 +353,9 @@ struct tlvdb *tlvdb_find_path(struct tlvdb *tlvdb, tlv_tag_t tag[]) {
 void tlvdb_add(struct tlvdb *tlvdb, struct tlvdb *other)
 {
 	while (tlvdb->next) {
+		if (tlvdb->next == other)
+			return;
+		
 		tlvdb = tlvdb->next;
 	}
 

From d81478755e23832505af7aeb64dfbc659c432cd7 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 20 Feb 2019 14:50:17 +0200
Subject: [PATCH 0510/1938] 2nd fix

---
 client/emv/tlv.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/client/emv/tlv.c b/client/emv/tlv.c
index 31b5ea360..a309d0659 100644
--- a/client/emv/tlv.c
+++ b/client/emv/tlv.c
@@ -352,6 +352,9 @@ struct tlvdb *tlvdb_find_path(struct tlvdb *tlvdb, tlv_tag_t tag[]) {
 
 void tlvdb_add(struct tlvdb *tlvdb, struct tlvdb *other)
 {
+	if (tlvdb == other)
+		return;
+	
 	while (tlvdb->next) {
 		if (tlvdb->next == other)
 			return;

From 8e199d4c9e67197fb8576132e8f8c056287d6514 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 20 Feb 2019 15:51:55 +0200
Subject: [PATCH 0511/1938] add get ATR to cmdsmartcard

---
 client/cmdsmartcard.c | 21 +++++++++++++--------
 client/cmdsmartcard.h |  1 +
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index 23b2b8b3c..9496b5445 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -292,7 +292,10 @@ static int PrintATR(uint8_t *atr, size_t atrlen) {
 	return 0;
 }
 
-static bool smart_select(bool silent) {
+bool smart_select(bool silent, smart_card_atr_t *atr) {
+	if (atr)
+		memset(atr, 0, sizeof(smart_card_atr_t));		
+
 	UsbCommand c = {CMD_SMART_ATR, {0, 0, 0}};
 	clearCommandBuffer();
 	SendCommand(&c);
@@ -308,12 +311,14 @@ static bool smart_select(bool silent) {
 		return false;
 	}	
 
-	if (!silent) {
-		smart_card_atr_t card;
-		memcpy(&card, (smart_card_atr_t *)resp.d.asBytes, sizeof(smart_card_atr_t));
-		
+	smart_card_atr_t card;
+	memcpy(&card, (smart_card_atr_t *)resp.d.asBytes, sizeof(smart_card_atr_t));
+
+	if (atr)
+		memcpy(atr, &card, sizeof(smart_card_atr_t));		
+
+	if (!silent)
 		PrintAndLogEx(INFO, "ISO7816-3 ATR : %s", sprint_hex(card.atr, card.atr_len));	
-	}
 
 	return true;
 }
@@ -518,7 +523,7 @@ int ExchangeAPDUSC(uint8_t *datain, int datainlen, bool activateCard, bool leave
 	*dataoutlen = 0;
 	
 	if (activateCard)
-		smart_select(false);
+		smart_select(false, NULL);
 
 	PrintAndLogEx(DEBUG, "APDU SC");
 
@@ -1017,7 +1022,7 @@ int CmdSmartBruteforceSFI(const char *Cmd) {
 		return 1;		
 
 	PrintAndLogEx(INFO, "Selecting card");
-	if ( !smart_select(false) )
+	if ( !smart_select(false, NULL) )
 		return 1;
 
 	char* caid = NULL;
diff --git a/client/cmdsmartcard.h b/client/cmdsmartcard.h
index cffaeff98..00bc41ff4 100644
--- a/client/cmdsmartcard.h
+++ b/client/cmdsmartcard.h
@@ -33,6 +33,7 @@ extern int CmdSmartUpgrade(const char* cmd);
 extern int CmdSmartInfo(const char* cmd);
 extern int CmdSmartReader(const char *Cmd);
 
+extern bool smart_select(bool silent, smart_card_atr_t *atr);
 extern int ExchangeAPDUSC(uint8_t *datain, int datainlen, bool activateCard, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen);
 
 extern int usage_sm_raw(void);

From fe66f0fac4f9b6e61b81ac979e43a953f3c6a46b Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 20 Feb 2019 15:52:26 +0200
Subject: [PATCH 0512/1938] added contact to `emv scan`

---
 client/emv/cmdemv.c | 49 ++++++++++++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 21 deletions(-)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index e2988e1e7..de86d5343 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -1382,12 +1382,6 @@ int CmdEMVScan(const char *cmd) {
 	
 	SetAPDULogging(showAPDU);
 	
-	// TODO
-	if (channel == ECC_CONTACT) {
-		PrintAndLogEx(ERR, "Do not use contact interface. Exit.");
-		return 1;
-	}
-	
 	// current path + file name
 	if (!strstr(crelfname, ".json"))
 		strcat(crelfname, ".json");
@@ -1411,23 +1405,35 @@ int CmdEMVScan(const char *cmd) {
 	}
 
 	// drop field at start
-	DropFieldEx( channel );
-
-	// iso 14443 select
-	PrintAndLogEx(NORMAL, "--> GET UID, ATS.");
-	
-	iso14a_card_select_t card;
-	if (Hf14443_4aGetCardData(&card)) {
-		return 2;
-	}
+	if (channel == ECC_CONTACTLESS)
+		DropFieldEx( channel );
 
 	JsonSaveStr(root, "$.File.Created", "proxmark3 `emv scan`");
 	
-	JsonSaveStr(root, "$.Card.Communication", "iso14443-4a");
-	JsonSaveBufAsHex(root, "$.Card.UID", (uint8_t *)&card.uid, card.uidlen);
-	JsonSaveHex(root, "$.Card.ATQA", card.atqa[0] + (card.atqa[1] << 2), 2);
-	JsonSaveHex(root, "$.Card.SAK", card.sak, 0);
-	JsonSaveBufAsHex(root, "$.Card.ATS", (uint8_t *)card.ats, card.ats_len);
+	if (channel == ECC_CONTACTLESS) {
+		// iso 14443 select
+		PrintAndLogEx(NORMAL, "--> GET UID, ATS.");
+		
+		iso14a_card_select_t card;
+		if (Hf14443_4aGetCardData(&card)) {
+			return 2;
+		}
+
+		
+		JsonSaveStr(root, "$.Card.Contactless.Communication", "iso14443-4a");
+		JsonSaveBufAsHex(root, "$.Card.Contactless.UID", (uint8_t *)&card.uid, card.uidlen);
+		JsonSaveHex(root, "$.Card.Contactless.ATQA", card.atqa[0] + (card.atqa[1] << 2), 2);
+		JsonSaveHex(root, "$.Card.Contactless.SAK", card.sak, 0);
+		JsonSaveBufAsHex(root, "$.Card.Contactless.ATS", (uint8_t *)card.ats, card.ats_len);
+	} else {
+		PrintAndLogEx(NORMAL, "--> GET ATR.");
+		
+		smart_card_atr_t card;
+		smart_select(true, &card);
+		
+		JsonSaveStr(root, "$.Card.Contact.Communication", "iso7816");
+		JsonSaveBufAsHex(root, "$.Card.Contact.ATR", (uint8_t *)card.atr, card.atr_len);
+	}
 	
 	// init applets list tree
 	const char *al = "Applets list";
@@ -1642,7 +1648,8 @@ int CmdEMVScan(const char *cmd) {
 	// free tlv object
 	tlvdb_free(tlvRoot);
 
-	DropFieldEx( channel );
+	if (channel == ECC_CONTACTLESS)
+		DropFieldEx( channel );
 	
 	res = json_dump_file(root, fname, JSON_INDENT(2));
 	if (res) {

From ed991e76b4dd638ced3f32485068f84a2a18f528 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 20 Feb 2019 16:04:08 +0200
Subject: [PATCH 0513/1938] add print error if smart card functionality not
 defined

---
 client/emv/cmdemv.c | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index de86d5343..6f5917b8d 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -792,6 +792,14 @@ int CmdEMVExec(const char *cmd) {
 	uint8_t psenum = (channel == ECC_CONTACT) ? 1 : 2;
 	CLIParserFree();
 	
+#ifndef WITH_SMARTCARD
+	// not compiled with smartcard functionality,  we need to exit
+	if ( channel == ECC_CONTACT ) {
+		PrintAndLogEx(WARNING, "PM3 Client is not compiled with support for SMARTCARD. Exiting.");
+		return 0;
+	}
+#endif	
+
 	SetAPDULogging(showAPDU);
 	
 	// init applets list tree
@@ -1380,6 +1388,14 @@ int CmdEMVScan(const char *cmd) {
 	CLIGetStrWithReturn(12, relfname, &relfnamelen);
 	CLIParserFree();
 	
+#ifndef WITH_SMARTCARD
+	// not compiled with smartcard functionality,  we need to exit
+	if ( channel == ECC_CONTACT ) {
+		PrintAndLogEx(WARNING, "PM3 Client is not compiled with support for SMARTCARD. Exiting.");
+		return 0;
+	}
+#endif	
+
 	SetAPDULogging(showAPDU);
 	
 	// current path + file name
@@ -1418,7 +1434,6 @@ int CmdEMVScan(const char *cmd) {
 		if (Hf14443_4aGetCardData(&card)) {
 			return 2;
 		}
-
 		
 		JsonSaveStr(root, "$.Card.Contactless.Communication", "iso14443-4a");
 		JsonSaveBufAsHex(root, "$.Card.Contactless.UID", (uint8_t *)&card.uid, card.uidlen);
@@ -1702,6 +1717,7 @@ int CmdEMVRoca(const char *cmd) {
 	if (arg_get_lit(2))
 		channel = ECC_CONTACT;
 	PrintChannel(channel);
+	CLIParserFree();
 	
 #ifndef WITH_SMARTCARD
 	// not compiled with smartcard functionality,  we need to exit

From 12582df97657f9fbf7ad8fae431ec5034cd93409 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 20 Feb 2019 16:05:32 +0200
Subject: [PATCH 0514/1938] fix macro

---
 client/emv/cmdemv.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index 6f5917b8d..3e36a4ae6 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -1421,8 +1421,7 @@ int CmdEMVScan(const char *cmd) {
 	}
 
 	// drop field at start
-	if (channel == ECC_CONTACTLESS)
-		DropFieldEx( channel );
+	DropFieldEx( channel );
 
 	JsonSaveStr(root, "$.File.Created", "proxmark3 `emv scan`");
 	
@@ -1663,8 +1662,7 @@ int CmdEMVScan(const char *cmd) {
 	// free tlv object
 	tlvdb_free(tlvRoot);
 
-	if (channel == ECC_CONTACTLESS)
-		DropFieldEx( channel );
+	DropFieldEx( channel );
 	
 	res = json_dump_file(root, fname, JSON_INDENT(2));
 	if (res) {

From 8ddedcb140a73cb04c6106e91b1852d77ef36779 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 20 Feb 2019 17:54:05 +0200
Subject: [PATCH 0515/1938] typo

---
 client/emv/cmdemv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index e2988e1e7..3200d84b0 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -1199,7 +1199,7 @@ int CmdEMVExec(const char *cmd) {
 			dreturn(7);
 		}
 
-		// process Format1 (0x80) anf print Format2 (0x77)
+		// process Format1 (0x80) and print Format2 (0x77)
 		ProcessACResponseFormat1(tlvRoot, buf, len, decodeTLV);
 
 		uint8_t CID = 0;

From 2c4db1ce7c37528fb343d57841a6c3cddcd4a357 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 20 Feb 2019 19:37:30 +0200
Subject: [PATCH 0516/1938] check ATR length

---
 client/emv/cmdemv.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index 9bb71de76..9728a32b7 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -1444,6 +1444,10 @@ int CmdEMVScan(const char *cmd) {
 		
 		smart_card_atr_t card;
 		smart_select(true, &card);
+		if (!card.atr_len) {
+			PrintAndLogEx(ERR, "Can't get ATR from a smart card.");
+			return 1;
+		}
 		
 		JsonSaveStr(root, "$.Card.Contact.Communication", "iso7816");
 		JsonSaveBufAsHex(root, "$.Card.Contact.ATR", (uint8_t *)card.atr, card.atr_len);

From 54ade5df94eb133486bcc688b45989da847fbab5 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 20 Feb 2019 21:12:06 +0200
Subject: [PATCH 0517/1938] add read sector code

---
 client/mifarehost.c | 31 +++++++++++++++++++++++++++++++
 client/mifarehost.h |  2 +-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/client/mifarehost.c b/client/mifarehost.c
index 31ed8e39d..817f99c93 100644
--- a/client/mifarehost.c
+++ b/client/mifarehost.c
@@ -414,6 +414,37 @@ out:
 	return -4;
 }
 
+// MIFARE
+int mfReadSector(uint8_t sectorNo, uint8_t keyType, uint8_t *key, uint8_t *data) {
+	
+	UsbCommand c = {CMD_MIFARE_READSC, {sectorNo, keyType, 0}};
+	memcpy(c.d.asBytes, key, 6);
+	clearCommandBuffer();
+	SendCommand(&c);
+
+	UsbCommand resp;
+	if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
+		uint8_t isOK  = resp.arg[0] & 0xff;
+
+		if (isOK) {
+			memcpy(data, resp.d.asBytes, mfNumBlocksPerSector(sectorNo) * 16);
+			for (int i = 0; i < (sectorNo<32?3:15); i++) {
+				PrintAndLogEx(NORMAL, "data   : %s", sprint_hex(data + i * 16, 16));
+			}
+			PrintAndLogEx(NORMAL, "trailer: %s", sprint_hex(data + (sectorNo<32?3:15) * 16, 16));
+			
+			return 0;
+		} else {
+			return 1;
+		}
+	} else {
+		PrintAndLogEx(ERR, "Command execute timeout");
+		return 2;
+	}
+	
+	return 0;
+}
+
 // EMULATOR
 int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount) {
 	UsbCommand c = {CMD_MIFARE_EML_MEMGET, {blockNum, blocksCount, 0}};
diff --git a/client/mifarehost.h b/client/mifarehost.h
index 8f0f3f3bf..69458fdfa 100644
--- a/client/mifarehost.h
+++ b/client/mifarehost.h
@@ -76,7 +76,7 @@ extern int mfCheckKeys_fast( uint8_t sectorsCnt, uint8_t firstChunk, uint8_t las
 						uint8_t strategy, uint32_t size, uint8_t *keyBlock, sector_t *e_sector, bool use_flashmemory);
 extern int mfKeyBrute(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint64_t *resultkey);
 
-
+extern int mfReadSector(uint8_t sectorNo, uint8_t keyType, uint8_t *key, uint8_t *data);
 
 extern int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount);
 extern int mfEmlSetMem(uint8_t *data, int blockNum, int blocksCount);

From f2b600e6e96f34fa5112ffadeb6816b89191b267 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 20 Feb 2019 21:12:28 +0200
Subject: [PATCH 0518/1938] add keys for mad and ndef

---
 client/mifaredefault.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/client/mifaredefault.h b/client/mifaredefault.h
index 400463eaf..db9c0329d 100644
--- a/client/mifaredefault.h
+++ b/client/mifaredefault.h
@@ -31,7 +31,7 @@ static const uint64_t g_mifare_default_keys[] =
 	0xabcdef123456,
 	0x4d3a99c351dd,
 	0x1a982c7e459a,
-	0xd3f7d3f7d3f7,
+	0xd3f7d3f7d3f7, // NDEF public key
 	0x714c5c886e97,
 	0x587ee5f9350f,
 	0xa0478cc39091,
@@ -42,4 +42,7 @@ static const uint64_t g_mifare_default_keys[] =
 	0x96a301bce267
 };
 
+static const uint8_t g_mifare_mad_key[] = {0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5};
+static const uint8_t g_mifare_ndef_key[] = {0xd3, 0xf7, 0xd3, 0xf7, 0xd3, 0xf7};
+
 #endif

From 583b73226810d2f0aa8a72a5e01aeef352ebe8cd Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 20 Feb 2019 21:12:50 +0200
Subject: [PATCH 0519/1938] add `hf mf mad` command

---
 client/cmdhfmf.c | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 47646852e..811fa2430 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -3198,6 +3198,39 @@ int CmdHF14AMfAuth4(const char *cmd) {
 	return MifareAuth4(NULL, keyn, key, true, false, true);
 }
 
+// https://www.nxp.com/docs/en/application-note/AN10787.pdf
+int CmdHF14AMfMAD(const char *cmd) {
+
+	CLIParserInit("hf mf mad", 
+		"Checks and prints Mifare Application Directory (MAD)", 
+		"Usage:\n\thf mf mad -> shows MAD if exists\n");
+
+	void* argtable[] = {
+		arg_param_begin,
+		arg_lit0("vV",  "verbose",  "show technical data"),
+		arg_param_end
+	};
+	CLIExecWithReturn(cmd, argtable, true);
+	bool verbose = arg_get_lit(1);
+	
+	CLIParserFree();
+
+	uint8_t sector[16 * 4] = {0};
+	if (mfReadSector(0, 0, (uint8_t *)g_mifare_mad_key, sector)) {
+		PrintAndLogEx(ERR, "read sector 0 error. card don't have MAD or don't have MAD on default keys.");
+		return 2;
+	}
+	
+	if (verbose) {
+		for(int i = 0; i < 3; i ++)
+			PrintAndLogEx(NORMAL, "[i] %s", sprint_hex(&sector[i * 16], 16));		
+	}
+	
+//	MADDecodeAndPrint(sector, verbose);
+	
+	return 0;
+}
+
 static command_t CommandTable[] = {
 	{"help",		CmdHelp,				1, "This help"},
 	{"darkside",	CmdHF14ADarkside,		0, "Darkside attack. read parity error messages."},
@@ -3234,6 +3267,9 @@ static command_t CommandTable[] = {
 	{"cgetsc",		CmdHF14AMfCGetSc,		0, "Read sector - Magic Chinese card"},
 	{"cload",		CmdHF14AMfCLoad,		0, "Load dump into magic Chinese card"},
 	{"csave",		CmdHF14AMfCSave,		0, "Save dump from magic Chinese card into file or emulator"},
+	{"-----------",	CmdHelp,				1, ""},
+	{"mad",			CmdHF14AMfMAD,			0, "Checks and prints MAD"},
+//	{"ndef",		CmdHF14AMfHDEF,			0, "Checks and prints NDEF records from card"},
 
 	{"ice",			CmdHF14AMfice,			0, "collect Mifare Classic nonces to file"},
 	{NULL, NULL, 0, NULL}

From 1675b10c009646fddf4b8a384ca3a7bf5f18fb12 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 20 Feb 2019 21:15:44 +0200
Subject: [PATCH 0520/1938] small fix

---
 client/mifarehost.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/mifarehost.c b/client/mifarehost.c
index 817f99c93..ba5081441 100644
--- a/client/mifarehost.c
+++ b/client/mifarehost.c
@@ -435,7 +435,7 @@ int mfReadSector(uint8_t sectorNo, uint8_t keyType, uint8_t *key, uint8_t *data)
 			
 			return 0;
 		} else {
-			return 1;
+			return isOK;
 		}
 	} else {
 		PrintAndLogEx(ERR, "Command execute timeout");

From 06ade9970a4345430e7349ef5b23f61241ba94e1 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 20 Feb 2019 22:29:39 +0100
Subject: [PATCH 0521/1938] FIX: mem leaks FIX: 'hf mf nested' - params

---
 client/cmdhf15.c       |  1 +
 client/cmdhfmf.c       | 25 ++++++++++++++-----------
 client/cmdtrace.c      |  6 +++---
 client/emv/cmdemv.c    |  1 +
 client/loclass/ikeys.c |  3 +++
 client/scripting.c     |  2 +-
 6 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index 2800b0c9c..097a52704 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -834,6 +834,7 @@ int CmdHF15Restore(const char*Cmd) {
 	
 	if (!getUID(uid)) {
 		PrintAndLogEx(WARNING, "No tag found");
+		fclose(f);
 		return 3;
 	}
 	
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 47646852e..9efb79700 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -425,6 +425,7 @@ char * GenerateFilename(const char *prefix, const char *suffix){
 	GetHFMF14AUID(uid, &uidlen);
 	if (!uidlen) {
 		PrintAndLogEx(WARNING, "No tag found.");
+		free(fptr);
 		return NULL;
 	}
 	
@@ -1082,19 +1083,21 @@ int CmdHF14AMfNested(const char *Cmd) {
 	} else {
 		SectorsCnt = NumOfSectors(cmdp);
 	}
-
-	ctmp = tolower(param_getchar(Cmd, 4));
-	transferToEml |= (ctmp == 't');
-	createDumpFile |= (ctmp == 'd');
 	
-	ctmp = tolower(param_getchar(Cmd, 6));
-	transferToEml |= (ctmp == 't');
-	createDumpFile |= (ctmp == 'd');
+	uint8_t j = 4;
+	while ( ctmp != 0x00 ) {
+
+		ctmp = tolower(param_getchar(Cmd, j));
+		transferToEml |= (ctmp == 't');
+		createDumpFile |= (ctmp == 'd');
+		
+		j++;
+	}
 	
 	// check if we can authenticate to sector
 	res = mfCheckKeys(blockNo, keyType, true, 1, key, &key64);
 	if (res) {
-		PrintAndLogEx(WARNING, "key is wrong. Can't authenticate to block:%3d key type:%c", blockNo, keyType ? 'B' : 'A');
+		PrintAndLogEx(WARNING, "Wrong key. Can't authenticate to block:%3d key type:%c", blockNo, keyType ? 'B' : 'A');
 		return 3;
 	}	
 	
@@ -1112,9 +1115,9 @@ int CmdHF14AMfNested(const char *Cmd) {
 				if (transferToEml) {
 					uint8_t sectortrailer;
 					if (trgBlockNo < 32*4) { 	// 4 block sector
-						sectortrailer = (trgBlockNo & ~0x03) + 3;
+					sectortrailer = trgBlockNo | 0x03;
 					} else {					// 16 block sector
-						sectortrailer = (trgBlockNo & ~0x0f) + 15;
+					sectortrailer = trgBlockNo | 0x0f;
 					}
 					mfEmlGetMem(keyBlock, sectortrailer, 1);
 			
@@ -1236,7 +1239,7 @@ int CmdHF14AMfNested(const char *Cmd) {
 					num_to_bytes(e_sector[i].Key[1], 6, &keyBlock[10]);
 				mfEmlSetMem(keyBlock, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
 			}
-			PrintAndLogEx(SUCCESS, "key transferred to emulator memory.");
+			PrintAndLogEx(SUCCESS, "keys transferred to emulator memory.");
 		}
 		
 		// Create dump file
diff --git a/client/cmdtrace.c b/client/cmdtrace.c
index 90c08459f..56f97ca1d 100644
--- a/client/cmdtrace.c
+++ b/client/cmdtrace.c
@@ -14,7 +14,6 @@ static int CmdHelp(const char *Cmd);
 // trace pointer
 static uint8_t *trace;
 long traceLen = 0;
-bool preRDV40 = true;
 	
 int usage_trace_list(){
 	PrintAndLogEx(NORMAL, "List protocol data in trace buffer.");
@@ -297,8 +296,9 @@ void printFelica(uint16_t traceLen, uint8_t *trace) {
 
 		if (tracepos + 3 >= traceLen) break;
 
-		uint16_t gap = (uint16_t)trace[tracepos+1] + ((uint16_t)trace[tracepos] >> 8);
-		uint16_t crc_ok = trace[tracepos+2];
+		
+		uint16_t gap = *((uint16_t *)(trace + tracepos));
+		uint8_t crc_ok = trace[tracepos+2];
 		tracepos += 3;
 
 		if (tracepos + 3 >= traceLen) break;
diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index 9728a32b7..4228a03e3 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -1204,6 +1204,7 @@ int CmdEMVExec(const char *cmd) {
 		
 		if (res) {	
 			PrintAndLogEx(NORMAL, "AC1 error(%d): %4x. Exit...", res, sw);
+			free(cdol1_data_tlv);
 			dreturn(7);
 		}
 
diff --git a/client/loclass/ikeys.c b/client/loclass/ikeys.c
index aefbbaf99..2d14959ca 100644
--- a/client/loclass/ikeys.c
+++ b/client/loclass/ikeys.c
@@ -685,6 +685,9 @@ static bool readKeyFile(uint8_t key[8]) {
 		sprintf(filename, "%s.bin", "client/loclass/iclass_key");
 	}
 	
+	if ( filename == NULL )
+		return retval;
+	
 	FILE *f = fopen(filename, "rb");
 	if (!f)
 		return retval;
diff --git a/client/scripting.c b/client/scripting.c
index b6bb80f33..6f6a30f53 100644
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -608,7 +608,7 @@ static int l_hardnested(lua_State *L){
 	char filename[FILE_PATH_SIZE]="nonces.bin";
 	const char *p_filename = luaL_checklstring(L, 11, &size);
 	if(size != 0)
-		strcpy(filename, p_filename);
+		memcpy(filename, p_filename, FILE_PATH_SIZE-1);
 
 	uint32_t blockNo = 0, keyType = 0;
 	uint32_t trgBlockNo = 0, trgKeyType = 0;

From 91d6836a47778741b3795080e9a6172425b7540f Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 21 Feb 2019 15:34:31 +0100
Subject: [PATCH 0522/1938] fix: mem leaks.

---
 client/cmdhffelica.c                      |  4 ++--
 client/cmdhficlass.c                      |  4 ++--
 client/cmdhflegic.c                       |  1 +
 client/cmdhfmfhard.c                      | 10 ++++++++--
 client/emv/cmdemv.c                       |  2 ++
 client/emv/emv_pk.c                       |  6 ------
 client/hardnested/hardnested_bruteforce.c |  9 +++++++--
 7 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/client/cmdhffelica.c b/client/cmdhffelica.c
index 700f7ae8b..07422f419 100644
--- a/client/cmdhffelica.c
+++ b/client/cmdhffelica.c
@@ -299,10 +299,10 @@ uint16_t PrintFliteBlock(uint16_t tracepos, uint8_t *trace,uint16_t tracelen) {
 			char idm[20];
 			char pmm[20];
 			for (int j = 0; j < 8; j++)
-				snprintf(idm+( j  * 2),20, "%02x", trace[j+3]);
+				snprintf(idm + (j  * 2), 20, "%02x", trace[j+3]);
 			
 			for (int j = 0; j < 8; j++)
-				snprintf(pmm+( j  * 2),20, "%02x", trace[j+11]);
+				snprintf(pmm + (j  * 2), 20, "%02x", trace[j+11]);
 			
 			PrintAndLogEx(NORMAL,  "DeviceId:  IDm: 0x%s PMm: 0x%s ", idm, pmm);
 			}
diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index 9427acf50..746146758 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -2162,10 +2162,10 @@ static int cmp_uint32( const void *a, const void *b) {
 int CmdHFiClassLookUp(const char *Cmd) {
 	
 	uint8_t CSN[8];
-	uint8_t EPURSE[8];
+	uint8_t EPURSE[8] = { 0,0,0,0,0,0,0,0 };
 	uint8_t MACS[8];
 	uint8_t CCNR[12];
-	uint8_t MAC_TAG[4] = {0x00,0x00,0x00,0x00};
+	uint8_t MAC_TAG[4] = { 0,0,0,0 };
 	
 	// elite key,  raw key, standard key
 	bool use_elite = false;
diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index 8c4ef411c..41df287a9 100644
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -1022,6 +1022,7 @@ int CmdLegicRestore(const char *Cmd){
 	f = fopen(filename,"rb");
 	if (!f) {
 		PrintAndLogEx(WARNING, "File %s not found or locked", filename);
+		free(data);
 		return 3;
 	}	
 	
diff --git a/client/cmdhfmfhard.c b/client/cmdhfmfhard.c
index 4818f480f..0c661d410 100644
--- a/client/cmdhfmfhard.c
+++ b/client/cmdhfmfhard.c
@@ -266,14 +266,20 @@ static void init_bitflip_bitarrays(void)
 				continue;
 			} else {
 				fseek(statesfile, 0, SEEK_END);
-				uint32_t filesize = (uint32_t)ftell(statesfile);
+				int fsize = ftell(statesfile);
+				if ( fsize == -1 ){
+					PrintAndLogEx(WARNING, "File read error with %s. Aborting...\n", state_file_name);
+					fclose(statesfile);
+					exit(5);
+				}
+				uint32_t filesize = (uint32_t)fsize;
 				rewind(statesfile);
 				uint8_t input_buffer[filesize];
 				size_t bytesread = fread(input_buffer, 1, filesize, statesfile);
 				if (bytesread != filesize) {
 					PrintAndLogEx(WARNING, "File read error with %s. Aborting...\n", state_file_name);
 					fclose(statesfile);
-					inflateEnd(&compressed_stream);
+					//inflateEnd(&compressed_stream);
 					exit(5);
 				}
 				fclose(statesfile);
diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index 4228a03e3..98bc389f4 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -284,6 +284,7 @@ int CmdEMVGPO(const char *cmd) {
 	if (!pdol_data_tlv_data) {
 		PrintAndLogEx(ERR, "Can't create PDOL data.");
 		tlvdb_free(tlvRoot);
+		free(pdol_data_tlv);
 		return 4;
 	}
 	PrintAndLogEx(INFO, "PDOL data[%d]: %s", pdol_data_tlv_data_len, sprint_hex(pdol_data_tlv_data, pdol_data_tlv_data_len));
@@ -296,6 +297,7 @@ int CmdEMVGPO(const char *cmd) {
 	
 	if (pdol_data_tlv != &data_tlv)
 		free(pdol_data_tlv);
+	
 	tlvdb_free(tlvRoot);
 	
 	if (sw)
diff --git a/client/emv/emv_pk.c b/client/emv/emv_pk.c
index b577855e0..091ab8062 100644
--- a/client/emv/emv_pk.c
+++ b/client/emv/emv_pk.c
@@ -429,9 +429,6 @@ char *emv_pk_get_ca_pk_file(const char *dirname, const unsigned char *rid, unsig
 	if (!dirname)
 		dirname = ".";//openemv_config_get_str("capk.dir", NULL);
 
-	if (!dirname)
-		return NULL;
-
 	char *filename;
 	int ret = asprintf(&filename, "%s/%02hhx%02hhx%02hhx%02hhx%02hhx_%02hhx.0",
 			dirname,
@@ -453,9 +450,6 @@ char *emv_pk_get_ca_pk_rid_file(const char *dirname, const unsigned char *rid)
 	if (!dirname)
 		dirname = "."; //openemv_config_get_str("capk.dir", NULL);
 
-	if (!dirname)
-		return NULL;
-
 	char *filename;
 	int ret = asprintf(&filename, "%s/%02hhx%02hhx%02hhx%02hhx%02hhx.pks",
 			dirname,
diff --git a/client/hardnested/hardnested_bruteforce.c b/client/hardnested/hardnested_bruteforce.c
index 55d6bbfbf..2a7618a1d 100644
--- a/client/hardnested/hardnested_bruteforce.c
+++ b/client/hardnested/hardnested_bruteforce.c
@@ -311,6 +311,11 @@ bool brute_force_bs(float *bf_rate, statelist_t *candidates, uint32_t cuid, uint
 
 	uint64_t start_time = msclock();
 
+#if defined(__linux__) ||  defined(__APPLE__)	
+	if ( NUM_BRUTE_FORCE_THREADS < 0 )
+		return false;
+#endif
+
 	pthread_t threads[NUM_BRUTE_FORCE_THREADS];
 	struct args {
 		bool silent;
@@ -322,7 +327,7 @@ bool brute_force_bs(float *bf_rate, statelist_t *candidates, uint32_t cuid, uint
 		uint8_t *best_first_bytes;
 	} thread_args[NUM_BRUTE_FORCE_THREADS];
 	
-	for(uint32_t i = 0; i < NUM_BRUTE_FORCE_THREADS; i++){
+	for (uint32_t i = 0; i < NUM_BRUTE_FORCE_THREADS; i++){
 		thread_args[i].thread_ID = i;
 		thread_args[i].silent = silent;
 		thread_args[i].cuid = cuid;
@@ -332,7 +337,7 @@ bool brute_force_bs(float *bf_rate, statelist_t *candidates, uint32_t cuid, uint
 		thread_args[i].best_first_bytes = best_first_bytes;
 		pthread_create(&threads[i], NULL, crack_states_thread, (void*)&thread_args[i]);
 	}
-	for(uint32_t i = 0; i < NUM_BRUTE_FORCE_THREADS; i++){
+	for (uint32_t i = 0; i < NUM_BRUTE_FORCE_THREADS; i++){
 		pthread_join(threads[i], 0);
 	}
 

From de317d9f4865c4cbafd6691386a52ff4401f1b87 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 21 Feb 2019 15:39:36 +0100
Subject: [PATCH 0523/1938] fix: mem leaks.

---
 client/cmdhfmf.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 9efb79700..78a9ed138 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -1723,7 +1723,7 @@ int CmdHF14AMfChk(const char *Cmd) {
 	if (strlen(Cmd) < 3 || ctmp == 'h') return usage_hf14_chk();
 
 	FILE * f;
-	char filename[FILE_PATH_SIZE]={0};
+	char filename[FILE_PATH_SIZE] = {0};
 	char buf[13];
 	uint8_t *keyBlock = NULL, *p;
 	sector_t *e_sector = NULL;
@@ -1970,8 +1970,10 @@ out:
 	
 	if (createDumpFile) {
 		fptr = GenerateFilename("hf-mf-", "-key.bin");
-		if (fptr == NULL) 
+		if (fptr == NULL) {
+			free(keyBlock);			
 			return 1;
+		}
 
 		FILE *fkeys = fopen(fptr, "wb");
 		if (fkeys == NULL) { 
@@ -2489,15 +2491,18 @@ int CmdHF14AMfELoad(const char *Cmd) {
 	if ( blockWidth == 4 ) {
 		if ((blockNum != numBlocks)) {		
 			PrintAndLogEx(FAILED, "Warning, Ultralight/Ntag file content, Loaded %d blocks into emulator memory", blockNum);
+			free(data);
 			return 0;
 		}
 	} else {
 		if ((blockNum != numBlocks)) {
 			PrintAndLogEx(FAILED, "Error, file content, Only loaded %d blocks, must be %d blocks into emulator memory", blockNum, numBlocks);
+			free(data);
 			return 4;
 		}
 	}
 	PrintAndLogEx(SUCCESS, "Loaded %d blocks from file: " _YELLOW_(%s), blockNum, filename);
+	free(data);
 	return 0;
 }
 

From 00d1fd9d456fc022c7084bb7cf35c59872979dc1 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 21 Feb 2019 16:07:14 +0100
Subject: [PATCH 0524/1938] fix: mem leaks

---
 uart/uart_posix.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index 093aaf363..49bcb9b8e 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -103,6 +103,8 @@ serial_port uart_open(const char* pcPortName)
 	int s = getaddrinfo(addrstr, portstr, NULL, &addr);
     if (s != 0) {
       printf("Error: getaddrinfo: %s\n", gai_strerror(s));
+      freeaddrinfo(addr);
+      free(addrstr);
       return INVALID_SERIAL_PORT;
     }
 
@@ -121,6 +123,8 @@ serial_port uart_open(const char* pcPortName)
 	
     if (rp == NULL) {               /* No address succeeded */
       printf("Error: Could not connect\n");
+      freeaddrinfo(addr);
+      free(addrstr);
       return INVALID_SERIAL_PORT;
     }
 	

From 44392c6afcb75aa94e75b4d3a19930c4ed2d52cb Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 21 Feb 2019 16:09:27 +0100
Subject: [PATCH 0525/1938] fix: whitespaces

---
 uart/uart_posix.c | 559 +++++++++++++++++++++++-----------------------
 1 file changed, 279 insertions(+), 280 deletions(-)

diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index 49bcb9b8e..aec19c38a 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -62,354 +62,353 @@
 
 typedef struct termios term_info;
 typedef struct {
-  int fd;           // Serial port file descriptor
-  term_info tiOld;  // Terminal info before using the port
-  term_info tiNew;  // Terminal info during the transaction
+	int fd;           // Serial port file descriptor
+	term_info tiOld;  // Terminal info before using the port
+	term_info tiNew;  // Terminal info during the transaction
 } serial_port_unix;
 
 // Set time-out on 30 miliseconds
 struct timeval timeout = {
-  .tv_sec  =     0, // 0 second
-  .tv_usec = 30000  // 30000 micro seconds
+	.tv_sec  =     0, // 0 second
+	.tv_usec = 30000  // 30 000 micro seconds
 };
 
-serial_port uart_open(const char* pcPortName)
-{
-  serial_port_unix* sp = calloc(sizeof(serial_port_unix), sizeof(uint8_t));
-  if (sp == 0) return INVALID_SERIAL_PORT;
+serial_port uart_open(const char* pcPortName) {
+	serial_port_unix* sp = calloc(sizeof(serial_port_unix), sizeof(uint8_t));
+	if (sp == 0) return INVALID_SERIAL_PORT;
 
-  if (memcmp(pcPortName, "tcp:", 4) == 0) {
-    struct addrinfo *addr, *rp;
-    char *addrstr = strdup(pcPortName + 4);
+	if (memcmp(pcPortName, "tcp:", 4) == 0) {
+		struct addrinfo *addr, *rp;
+		char *addrstr = strdup(pcPortName + 4);
 
-    if (addrstr == NULL) {
-      printf("Error: strdup\n");
-      return INVALID_SERIAL_PORT;
-    }
+		if (addrstr == NULL) {
+			printf("Error: strdup\n");
+			return INVALID_SERIAL_PORT;
+		}
 
-    char *colon = strrchr(addrstr, ':');
-    char *portstr;
+		timeout.tv_usec = 300000  // 300 000 micro seconds
+		
+		char *colon = strrchr(addrstr, ':');
+		char *portstr;
+		if (colon) {
+			portstr = colon + 1;
+			*colon = '\0';
+		} else {
+			portstr = "7901";
+		}
 
-    // Set time-out to 300 miliseconds only for TCP port
-    timeout.tv_usec = 300000;
+		int s = getaddrinfo(addrstr, portstr, NULL, &addr);
+		if (s != 0) {
+			printf("Error: getaddrinfo: %s\n", gai_strerror(s));
+			freeaddrinfo(addr);
+			free(addrstr);
+			return INVALID_SERIAL_PORT;
+		}
 
-    if (colon) {
-      portstr = colon + 1;
-      *colon = '\0';
-    } else {
-      portstr = "7901";
+		int sfd;
+		for (rp = addr; rp != NULL; rp = rp->ai_next) {
+			sfd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
+
+			if (sfd == -1)
+				continue;
+
+			if (connect(sfd, rp->ai_addr, rp->ai_addrlen) != -1)
+				break;
+
+			close(sfd);
+		}
+
+		if (rp == NULL) {               /* No address succeeded */
+			printf("Error: Could not connect\n");
+			freeaddrinfo(addr);
+			free(addrstr);
+			return INVALID_SERIAL_PORT;
+		}
+
+		freeaddrinfo(addr);
+		free(addrstr);
+
+		sp->fd = sfd;
+
+		int one = 1;
+		setsockopt(sp->fd, SOL_TCP, TCP_NODELAY, &one, sizeof(one));
+		return sp;
 	}
-	
-	int s = getaddrinfo(addrstr, portstr, NULL, &addr);
-    if (s != 0) {
-      printf("Error: getaddrinfo: %s\n", gai_strerror(s));
-      freeaddrinfo(addr);
-      free(addrstr);
-      return INVALID_SERIAL_PORT;
-    }
-
-    int sfd;
-    for (rp = addr; rp != NULL; rp = rp->ai_next) {
-      sfd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
-
-      if (sfd == -1)
-		continue;
-	
-      if (connect(sfd, rp->ai_addr, rp->ai_addrlen) != -1)
-		break;
-	
-      close(sfd);
-    }
-	
-    if (rp == NULL) {               /* No address succeeded */
-      printf("Error: Could not connect\n");
-      freeaddrinfo(addr);
-      free(addrstr);
-      return INVALID_SERIAL_PORT;
-    }
-	
-    freeaddrinfo(addr);
-    free(addrstr);
-	
-    sp->fd = sfd;
-
-    int one = 1;
-    setsockopt(sp->fd, SOL_TCP, TCP_NODELAY, &one, sizeof(one));
-    return sp;
-  }
 
   
-  sp->fd = open(pcPortName, O_RDWR | O_NOCTTY | O_NDELAY | O_NONBLOCK);
-  if(sp->fd == -1) {
-    uart_close(sp);
-    return INVALID_SERIAL_PORT;
-  }
+	sp->fd = open(pcPortName, O_RDWR | O_NOCTTY | O_NDELAY | O_NONBLOCK);
+	if(sp->fd == -1) {
+		uart_close(sp);
+		return INVALID_SERIAL_PORT;
+	}
 
-  // Finally figured out a way to claim a serial port interface under unix
-  // We just try to set a (advisory) lock on the file descriptor
-  struct flock fl;
-  fl.l_type   = F_WRLCK;
-  fl.l_whence = SEEK_SET;
-  fl.l_start  = 0;
-  fl.l_len    = 0;
-  fl.l_pid    = getpid();
-  
-  // Does the system allows us to place a lock on this file descriptor
-  if (fcntl(sp->fd, F_SETLK, &fl) == -1) {
-    // A conflicting lock is held by another process
-    free(sp);
-    return CLAIMED_SERIAL_PORT;
-  }
+	// Finally figured out a way to claim a serial port interface under unix
+	// We just try to set a (advisory) lock on the file descriptor
+	struct flock fl;
+	fl.l_type   = F_WRLCK;
+	fl.l_whence = SEEK_SET;
+	fl.l_start  = 0;
+	fl.l_len    = 0;
+	fl.l_pid    = getpid();
+
+	// Does the system allows us to place a lock on this file descriptor
+	if (fcntl(sp->fd, F_SETLK, &fl) == -1) {
+		// A conflicting lock is held by another process
+		free(sp);
+		return CLAIMED_SERIAL_PORT;
+	}
+
+	// Try to retrieve the old (current) terminal info struct
+	if(tcgetattr(sp->fd,&sp->tiOld) == -1) {
+		uart_close(sp);
+		return INVALID_SERIAL_PORT;
+	}
+
+	// Duplicate the (old) terminal info struct
+	sp->tiNew = sp->tiOld;
+
+	// Configure the serial port
+	sp->tiNew.c_cflag = CS8 | CLOCAL | CREAD;
+	sp->tiNew.c_iflag = IGNPAR;
+	sp->tiNew.c_oflag = 0;
+	sp->tiNew.c_lflag = 0;
+
+	// Block until n bytes are received
+	sp->tiNew.c_cc[VMIN] = 0;
+	// Block until a timer expires (n * 100 mSec.)
+	sp->tiNew.c_cc[VTIME] = 0;
+
+	// Try to set the new terminal info struct
+	if(tcsetattr(sp->fd, TCSANOW, &sp->tiNew) == -1) {
+		uart_close(sp);
+		return INVALID_SERIAL_PORT;
+	}
 
-  // Try to retrieve the old (current) terminal info struct
-  if(tcgetattr(sp->fd,&sp->tiOld) == -1) {
-    uart_close(sp);
-    return INVALID_SERIAL_PORT;
-  }
-  
-  // Duplicate the (old) terminal info struct
-  sp->tiNew = sp->tiOld;
-  
-  // Configure the serial port
-  sp->tiNew.c_cflag = CS8 | CLOCAL | CREAD;
-  sp->tiNew.c_iflag = IGNPAR;
-  sp->tiNew.c_oflag = 0;
-  sp->tiNew.c_lflag = 0;
-    
-  // Block until n bytes are received
-  sp->tiNew.c_cc[VMIN] = 0;
-  // Block until a timer expires (n * 100 mSec.)
-  sp->tiNew.c_cc[VTIME] = 0;
-  
-  // Try to set the new terminal info struct
-  if(tcsetattr(sp->fd, TCSANOW, &sp->tiNew) == -1) {
-    uart_close(sp);
-    return INVALID_SERIAL_PORT;
-  }
-  
   // Flush all lingering data that may exist
   tcflush(sp->fd, TCIOFLUSH);
 
 #ifdef WITH_FPC
 	if ( uart_set_speed(sp, 115200) ) {
-  printf("[=] UART Setting serial baudrate 115200 [FPC enabled]\n");  
+		printf("[=] UART Setting serial baudrate 115200 [FPC enabled]\n");  
 	} else {
 		uart_set_speed(sp, 9600);
 		printf("[=] UART Setting serial baudrate 9600 [FPC enabled]\n");		
 	}
 #else	
-  // set speed, works for UBUNTU 14.04
-  bool success = uart_set_speed(sp, 460800);
-  if (success) {
-    printf("[=] UART Setting serial baudrate 460800\n");
-  } else {
-    uart_set_speed(sp, 115200);
-    printf("[=] UART Setting serial baudrate 115200\n");
-  }
+	// set speed, works for UBUNTU 14.04
+	bool success = uart_set_speed(sp, 460800);
+	if (success) {
+		printf("[=] UART Setting serial baudrate 460800\n");
+	} else {
+		uart_set_speed(sp, 115200);
+		printf("[=] UART Setting serial baudrate 115200\n");
+	}
 #endif  
-  return sp;
+	return sp;
 }
 
 void uart_close(const serial_port sp) {
-  serial_port_unix* spu = (serial_port_unix*)sp;
-  tcflush(spu->fd, TCIOFLUSH);
-  tcsetattr(spu->fd, TCSANOW, &(spu->tiOld));
-  struct flock fl;
-  fl.l_type   = F_UNLCK;
-  fl.l_whence = SEEK_SET;
-  fl.l_start  = 0;
-  fl.l_len    = 0;
-  fl.l_pid    = getpid();
+	serial_port_unix* spu = (serial_port_unix*)sp;
+	tcflush(spu->fd, TCIOFLUSH);
+	tcsetattr(spu->fd, TCSANOW, &(spu->tiOld));
+	struct flock fl;
+	fl.l_type   = F_UNLCK;
+	fl.l_whence = SEEK_SET;
+	fl.l_start  = 0;
+	fl.l_len    = 0;
+	fl.l_pid    = getpid();
 
-  // Does the system allows us to place a lock on this file descriptor
-  int err = fcntl(spu->fd, F_SETLK, &fl);
-  if ( err == -1) {
-     //perror("fcntl");
-  }  
-  close(spu->fd);
-  free(sp);
+	// Does the system allows us to place a lock on this file descriptor
+	int err = fcntl(spu->fd, F_SETLK, &fl);
+	if ( err == -1) {
+		//perror("fcntl");
+	}  
+	close(spu->fd);
+	free(sp);
 }
 
 bool uart_receive(const serial_port sp, uint8_t* pbtRx, size_t pszMaxRxLen, size_t* pszRxLen) {
-  int res;
-  int byteCount;
-  fd_set rfds;
-  struct timeval tv;
+	int res;
+	int byteCount;
+	fd_set rfds;
+	struct timeval tv;
+
+	// Reset the output count
+	*pszRxLen = 0;
   
-  // Reset the output count
-  *pszRxLen = 0;
-  
-  do {
-    // Reset file descriptor
-    FD_ZERO(&rfds);
-    FD_SET(((serial_port_unix*)sp)->fd, &rfds);
-    tv = timeout;
-    res = select(((serial_port_unix*)sp)->fd + 1, &rfds, NULL, NULL, &tv);
-    
-    // Read error
-    if (res < 0) {
-      return false;
-    }
- 
-    // Read time-out
-    if (res == 0) {
-      if (*pszRxLen == 0) {
-        // Error, we received no data
-        return false;
-      } else {
-        // We received some data, but nothing more is available
-        return true;
-      }
-    }
- 
-    // Retrieve the count of the incoming bytes
-    res = ioctl(((serial_port_unix*)sp)->fd, FIONREAD, &byteCount);
-    if (res < 0) return false;
-    
-    // Cap the number of bytes, so we don't overrun the buffer
-    if (pszMaxRxLen - (*pszRxLen) < byteCount) {
-    	byteCount = pszMaxRxLen - (*pszRxLen);
-    }
+	do {
+		// Reset file descriptor
+		FD_ZERO(&rfds);
+		FD_SET(((serial_port_unix*)sp)->fd, &rfds);
+		tv = timeout;
+		res = select(((serial_port_unix*)sp)->fd + 1, &rfds, NULL, NULL, &tv);
 
-    // There is something available, read the data
-    res = read(((serial_port_unix*)sp)->fd, pbtRx + (*pszRxLen), byteCount);
+		// Read error
+		if (res < 0) {
+			return false;
+		}
 
-    // Stop if the OS has some troubles reading the data
-    if (res <= 0) return false;
- 
-    *pszRxLen += res;
+		// Read time-out
+		if (res == 0) {
+			if (*pszRxLen == 0) {
+				// Error, we received no data
+				return false;
+			} else {
+				// We received some data, but nothing more is available
+				return true;
+			}
+		}
 
-    if (*pszRxLen == pszMaxRxLen) {
-    	// We have all the data we wanted.
-      return true;
-    }
-    
-  } while (byteCount);
+		// Retrieve the count of the incoming bytes
+		res = ioctl(((serial_port_unix*)sp)->fd, FIONREAD, &byteCount);
+		if (res < 0) return false;
 
-  return true;
+		// Cap the number of bytes, so we don't overrun the buffer
+		if (pszMaxRxLen - (*pszRxLen) < byteCount) {
+			byteCount = pszMaxRxLen - (*pszRxLen);
+		}
+
+		// There is something available, read the data
+		res = read(((serial_port_unix*)sp)->fd, pbtRx + (*pszRxLen), byteCount);
+
+		// Stop if the OS has some troubles reading the data
+		if (res <= 0) return false;
+
+		*pszRxLen += res;
+
+		if (*pszRxLen == pszMaxRxLen) {
+			// We have all the data we wanted.
+			return true;
+		}
+
+	} while (byteCount);
+
+	return true;
 }
 
 bool uart_send(const serial_port sp, const uint8_t* pbtTx, const size_t len) {
-  int32_t res;
-  size_t pos = 0;
-  fd_set rfds;
-  struct timeval tv;
+	int32_t res;
+	size_t pos = 0;
+	fd_set rfds;
+	struct timeval tv;
 
-  while (pos < len) {
-    // Reset file descriptor
-    FD_ZERO(&rfds);
-    FD_SET(((serial_port_unix*)sp)->fd, &rfds);
-    tv = timeout;
-    res = select(((serial_port_unix*)sp)->fd+1, NULL, &rfds, NULL, &tv);
-    
-    // Write error
-    if (res < 0) {
-		printf("UART:: write error (%d)\n", res);
-		return false;
-    }
-    
-    // Write time-out
-    if (res == 0) {
-		printf("UART:: write time-out\n");
-		return false;
-    }
-    
-    // Send away the bytes
-    res = write(((serial_port_unix*)sp)->fd, pbtTx + pos, len - pos);
-    
-    // Stop if the OS has some troubles sending the data
-    if (res <= 0) return false;
-    
-    pos += res;
-  }
-  return true;
+	while (pos < len) {
+		// Reset file descriptor
+		FD_ZERO(&rfds);
+		FD_SET(((serial_port_unix*)sp)->fd, &rfds);
+		tv = timeout;
+		res = select(((serial_port_unix*)sp)->fd+1, NULL, &rfds, NULL, &tv);
+
+		// Write error
+		if (res < 0) {
+			printf("UART:: write error (%d)\n", res);
+			return false;
+		}
+
+		// Write time-out
+		if (res == 0) {
+			printf("UART:: write time-out\n");
+			return false;
+		}
+
+		// Send away the bytes
+		res = write(((serial_port_unix*)sp)->fd, pbtTx + pos, len - pos);
+
+		// Stop if the OS has some troubles sending the data
+		if (res <= 0) return false;
+
+		pos += res;
+	}
+	return true;
 }
 
 bool uart_set_speed(serial_port sp, const uint32_t uiPortSpeed) {
-  const serial_port_unix* spu = (serial_port_unix*)sp;
-  speed_t stPortSpeed;
-  switch (uiPortSpeed) {
-    case 0: stPortSpeed = B0; break;
-    case 50: stPortSpeed = B50; break;
-    case 75: stPortSpeed = B75; break;
-    case 110: stPortSpeed = B110; break;
-    case 134: stPortSpeed = B134; break;
-    case 150: stPortSpeed = B150; break;
-    case 300: stPortSpeed = B300; break;
-    case 600: stPortSpeed = B600; break;
-    case 1200: stPortSpeed = B1200; break;
-    case 1800: stPortSpeed = B1800; break;
-    case 2400: stPortSpeed = B2400; break;
-    case 4800: stPortSpeed = B4800; break;
-    case 9600: stPortSpeed = B9600; break;
-    case 19200: stPortSpeed = B19200; break;
-    case 38400: stPortSpeed = B38400; break;
+	const serial_port_unix* spu = (serial_port_unix*)sp;
+	speed_t stPortSpeed;
+	switch (uiPortSpeed) {
+		case 0: stPortSpeed = B0; break;
+		case 50: stPortSpeed = B50; break;
+		case 75: stPortSpeed = B75; break;
+		case 110: stPortSpeed = B110; break;
+		case 134: stPortSpeed = B134; break;
+		case 150: stPortSpeed = B150; break;
+		case 300: stPortSpeed = B300; break;
+		case 600: stPortSpeed = B600; break;
+		case 1200: stPortSpeed = B1200; break;
+		case 1800: stPortSpeed = B1800; break;
+		case 2400: stPortSpeed = B2400; break;
+		case 4800: stPortSpeed = B4800; break;
+		case 9600: stPortSpeed = B9600; break;
+		case 19200: stPortSpeed = B19200; break;
+		case 38400: stPortSpeed = B38400; break;
 #  ifdef B57600
-    case 57600: stPortSpeed = B57600; break;
+		case 57600: stPortSpeed = B57600; break;
 #  endif
 #  ifdef B115200
-    case 115200: stPortSpeed = B115200; break;
+		case 115200: stPortSpeed = B115200; break;
 #  endif
 #  ifdef B230400
-    case 230400: stPortSpeed = B230400; break;
+		case 230400: stPortSpeed = B230400; break;
 #  endif
 #  ifdef B460800
-    case 460800: stPortSpeed = B460800; break;
+		case 460800: stPortSpeed = B460800; break;
 #  endif
 #  ifdef B921600
-    case 921600: stPortSpeed = B921600; break;
+		case 921600: stPortSpeed = B921600; break;
 #  endif
-    default: return false;
-  };
-  struct termios ti;
-  if (tcgetattr(spu->fd,&ti) == -1) return false;
-  // Set port speed (Input and Output)
-  cfsetispeed(&ti, stPortSpeed);
-  cfsetospeed(&ti, stPortSpeed);
-  return (tcsetattr(spu->fd, TCSANOW, &ti) != -1);
+		default: return false;
+	};
+	struct termios ti;
+	if (tcgetattr(spu->fd,&ti) == -1) return false;
+	// Set port speed (Input and Output)
+	cfsetispeed(&ti, stPortSpeed);
+	cfsetospeed(&ti, stPortSpeed);
+	return (tcsetattr(spu->fd, TCSANOW, &ti) != -1);
 }
 
 uint32_t uart_get_speed(const serial_port sp) {
-  struct termios ti;
-  uint32_t uiPortSpeed;
-  const serial_port_unix* spu = (serial_port_unix*)sp;
-  if (tcgetattr(spu->fd, &ti) == -1) return 0;
-  // Set port speed (Input)
-  speed_t stPortSpeed = cfgetispeed(&ti);
-  switch (stPortSpeed) {
-    case B0: uiPortSpeed = 0; break;
-    case B50: uiPortSpeed = 50; break;
-    case B75: uiPortSpeed = 75; break;
-    case B110: uiPortSpeed = 110; break;
-    case B134: uiPortSpeed = 134; break;
-    case B150: uiPortSpeed = 150; break;
-    case B300: uiPortSpeed = 300; break;
-    case B600: uiPortSpeed = 600; break;
-    case B1200: uiPortSpeed = 1200; break;
-    case B1800: uiPortSpeed = 1800; break;
-    case B2400: uiPortSpeed = 2400; break;
-    case B4800: uiPortSpeed = 4800; break;
-    case B9600: uiPortSpeed = 9600; break;
-    case B19200: uiPortSpeed = 19200; break;
-    case B38400: uiPortSpeed = 38400; break;
+	struct termios ti;
+	uint32_t uiPortSpeed;
+	const serial_port_unix* spu = (serial_port_unix*)sp;
+	
+	if (tcgetattr(spu->fd, &ti) == -1) 
+		return 0;
+	
+	// Set port speed (Input)
+	speed_t stPortSpeed = cfgetispeed(&ti);
+	switch (stPortSpeed) {
+		case B0: uiPortSpeed = 0; break;
+		case B50: uiPortSpeed = 50; break;
+		case B75: uiPortSpeed = 75; break;
+		case B110: uiPortSpeed = 110; break;
+		case B134: uiPortSpeed = 134; break;
+		case B150: uiPortSpeed = 150; break;
+		case B300: uiPortSpeed = 300; break;
+		case B600: uiPortSpeed = 600; break;
+		case B1200: uiPortSpeed = 1200; break;
+		case B1800: uiPortSpeed = 1800; break;
+		case B2400: uiPortSpeed = 2400; break;
+		case B4800: uiPortSpeed = 4800; break;
+		case B9600: uiPortSpeed = 9600; break;
+		case B19200: uiPortSpeed = 19200; break;
+		case B38400: uiPortSpeed = 38400; break;
 #  ifdef B57600
-    case B57600: uiPortSpeed = 57600; break;
+		case B57600: uiPortSpeed = 57600; break;
 #  endif
 #  ifdef B115200
-    case B115200: uiPortSpeed = 115200; break;
+		case B115200: uiPortSpeed = 115200; break;
 #  endif
 #  ifdef B230400
-    case B230400: uiPortSpeed = 230400; break;
+		case B230400: uiPortSpeed = 230400; break;
 #  endif
 #  ifdef B460800
-    case B460800: uiPortSpeed = 460800; break;
+		case B460800: uiPortSpeed = 460800; break;
 #  endif
 #  ifdef B921600
-    case B921600: uiPortSpeed = 921600; break;
+		case B921600: uiPortSpeed = 921600; break;
 #  endif
-    default: return 0;
-  };
-  return uiPortSpeed;
+		default: return 0;
+	};
+	return uiPortSpeed;
 }
-
 #endif

From 6d63b3fbed045d851d7741124872da6c82bea029 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 21 Feb 2019 16:17:49 +0100
Subject: [PATCH 0526/1938] fix: mem leaks.

---
 client/cmdhffelica.c         | 6 +++---
 client/cmdhficlass.c         | 2 +-
 client/cmdhfmf.c             | 9 +++++++--
 client/cmdhfmfu.c            | 2 ++
 client/cmdsmartcard.c        | 4 +++-
 client/emv/cmdemv.c          | 1 +
 client/loclass/elite_crack.c | 5 +++--
 client/loclass/fileutils.c   | 9 +++++++--
 client/loclass/ikeys.c       | 2 +-
 9 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/client/cmdhffelica.c b/client/cmdhffelica.c
index 07422f419..acfc68cf2 100644
--- a/client/cmdhffelica.c
+++ b/client/cmdhffelica.c
@@ -242,7 +242,7 @@ static void printSep() {
 	PrintAndLogEx(NORMAL, "------------------------------------------------------------------------------------");
 }
 
-uint16_t PrintFliteBlock(uint16_t tracepos, uint8_t *trace,uint16_t tracelen) {
+uint16_t PrintFliteBlock(uint16_t tracepos, uint8_t *trace, uint16_t tracelen) {
 	if (tracepos+19 >= tracelen) 
 		return tracelen;
 	
@@ -273,8 +273,8 @@ uint16_t PrintFliteBlock(uint16_t tracepos, uint8_t *trace,uint16_t tracelen) {
 		case 0x0c: PrintAndLogEx(NORMAL,  "S_PAD12: %s",line);break;
 		case 0x0d: PrintAndLogEx(NORMAL,  "S_PAD13: %s",line);break;
 		case 0x0E: {
-			uint32_t regA = trace[3] + (trace[4]>>8) + (trace[5]>>16) + (trace[6]>>24);
-			uint32_t regB = trace[7] + (trace[8]>>8) + (trace[9]>>16) + (trace[10]>>24);
+			uint32_t regA = trace[3] | trace[4] << 8 | trace[5] << 16 | trace[ 6] << 24;
+			uint32_t regB = trace[7] | trace[8] << 8 | trace[9] << 16 | trace[10] << 24;
 			line[0] = 0;
 			for (int j = 0; j < 8; j++) 
 				snprintf(line+( j  * 2),110, "%02x", trace[j+11]);
diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index 746146758..ddc6fb2c0 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -2163,7 +2163,7 @@ int CmdHFiClassLookUp(const char *Cmd) {
 	
 	uint8_t CSN[8];
 	uint8_t EPURSE[8] = { 0,0,0,0,0,0,0,0 };
-	uint8_t MACS[8];
+	uint8_t MACS[8]= { 0,0,0,0,0,0,0,0 };
 	uint8_t CCNR[12];
 	uint8_t MAC_TAG[4] = { 0,0,0,0 };
 	
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 78a9ed138..57cf246da 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -1245,8 +1245,10 @@ int CmdHF14AMfNested(const char *Cmd) {
 		// Create dump file
 		if (createDumpFile) {
 			fptr = GenerateFilename("hf-mf-", "-key.bin");
-			if (fptr == NULL) 
+			if (fptr == NULL) {
+				free(e_sector);
 				return 1;
+			}
 			
 			if ((fkeys = fopen(fptr, "wb")) == NULL) { 
 				PrintAndLogEx(WARNING, "could not create file " _YELLOW_(%s), fptr);
@@ -1276,6 +1278,8 @@ int CmdHF14AMfNested(const char *Cmd) {
 		}		
 		free(e_sector);
 	}
+
+	free(e_sector);	
 	return 0;
 }
 
@@ -1971,7 +1975,8 @@ out:
 	if (createDumpFile) {
 		fptr = GenerateFilename("hf-mf-", "-key.bin");
 		if (fptr == NULL) {
-			free(keyBlock);			
+			free(keyBlock);
+			free(e_sector);			
 			return 1;
 		}
 
diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index e583f7f02..d703f980d 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -1982,6 +1982,7 @@ int CmdHF14AMfURestore(const char *Cmd){
 	uint8_t *dump = calloc(fsize, sizeof(uint8_t));
 	if ( !dump ) {
 		PrintAndLogEx(WARNING, "Failed to allocate memory");
+		fclose(f);
 		return 1;
 	}
 
@@ -1990,6 +1991,7 @@ int CmdHF14AMfURestore(const char *Cmd){
 	fclose(f);
 	if ( bytes_read < 48 ) {
 		PrintAndLogEx(WARNING, "Error, dump file is too small");
+		free(dump);
 		return 1;
 	}
 	
diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index 9496b5445..3860496de 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -1022,8 +1022,10 @@ int CmdSmartBruteforceSFI(const char *Cmd) {
 		return 1;		
 
 	PrintAndLogEx(INFO, "Selecting card");
-	if ( !smart_select(false, NULL) )
+	if ( !smart_select(false, NULL) ) {
+		free(buf);
 		return 1;
+	}
 
 	char* caid = NULL;
 	
diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index 98bc389f4..94df507de 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -1807,6 +1807,7 @@ int CmdEMVRoca(const char *cmd) {
 		PrintAndLogEx(ERR, "Can't create PDOL data.");
 		tlvdb_free(tlvRoot);
 		DropFieldEx( channel );
+		free(pdol_data_tlv);
 		return 6;
 	}
 	PrintAndLogEx(INFO, "PDOL data[%d]: %s", pdol_data_tlv_data_len, sprint_hex(pdol_data_tlv_data, pdol_data_tlv_data_len));
diff --git a/client/loclass/elite_crack.c b/client/loclass/elite_crack.c
index 6619e7aaa..630fa72a6 100644
--- a/client/loclass/elite_crack.c
+++ b/client/loclass/elite_crack.c
@@ -538,18 +538,19 @@ int bruteforceFile(const char *filename, uint16_t keytable[]) {
 
 	if (fsize < 0) {
 		PrintAndLogDevice(WARNING, "Error, when getting filesize");
-		if (f) fclose(f);
+		fclose(f);
 		return 1;
 	}
 
 	uint8_t *dump = calloc(fsize, sizeof(uint8_t));
 	if ( !dump ) {
 		PrintAndLogDevice(WARNING, "Failed to allocate memory");
+		fclose(f);
 		return 2;
 	}
 	size_t bytes_read = fread(dump, 1, fsize, f);
 
-	if (f) fclose(f);
+	fclose(f);
 	
     if (bytes_read < fsize) {
         PrintAndLogDevice(WARNING, "Error, could only read %d bytes (should be %d)", bytes_read, fsize );
diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index da91b21ec..6ce7c42ea 100644
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -266,8 +266,8 @@ int loadFile(const char *preferredName, const char *suffix, void* data, size_t*
 	FILE *f = fopen(fileName, "rb");
 	if ( !f ) {
 		PrintAndLogDevice(WARNING, "file not found or locked. '" _YELLOW_(%s)"'", fileName);
-		retval = 1;
-		goto out;
+		free(fileName);
+		return 1;
 	}
 	
 	// get filesize in order to malloc memory
@@ -310,7 +310,12 @@ int loadFile(const char *preferredName, const char *suffix, void* data, size_t*
 
 out:	
 	fclose(f);
+	
+	if (data)
+		free(data);
+	
 	free(fileName);
+	
 	return retval;
 }
 
diff --git a/client/loclass/ikeys.c b/client/loclass/ikeys.c
index 2d14959ca..16b5513b7 100644
--- a/client/loclass/ikeys.c
+++ b/client/loclass/ikeys.c
@@ -685,7 +685,7 @@ static bool readKeyFile(uint8_t key[8]) {
 		sprintf(filename, "%s.bin", "client/loclass/iclass_key");
 	}
 	
-	if ( filename == NULL )
+	if ( strlen(filename) == 0 )
 		return retval;
 	
 	FILE *f = fopen(filename, "rb");

From 265c069edc7b8160fbdc9ac113d97a26030a6480 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 21 Feb 2019 16:19:07 +0100
Subject: [PATCH 0527/1938] chg... missing

---
 uart/uart_posix.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index aec19c38a..b9df932d6 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -86,7 +86,7 @@ serial_port uart_open(const char* pcPortName) {
 			return INVALID_SERIAL_PORT;
 		}
 
-		timeout.tv_usec = 300000  // 300 000 micro seconds
+		timeout.tv_usec = 300000;  // 300 000 micro seconds
 		
 		char *colon = strrchr(addrstr, ':');
 		char *portstr;

From 3b21b175099649f91572953cee1e65100385269e Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Thu, 21 Feb 2019 19:15:46 +0200
Subject: [PATCH 0528/1938] move mifare stuff to its folder

---
 client/Makefile                     |    6 +-
 client/cmdanalyse.h                 |    6 +-
 client/cmdhf14a.h                   |    2 +-
 client/cmdhflist.h                  |    4 +-
 client/cmdhfmf.c                    |   22 +-
 client/cmdhfmf.h                    |   14 +-
 client/cmdhfmfp.c                   |    2 +-
 client/cmdhfmfp.h                   |    2 +-
 client/loclass/fileutils.h          |    2 +-
 client/{ => mifare}/mfkey.c         |    0
 client/{ => mifare}/mfkey.h         |    0
 client/{ => mifare}/mifare4.c       |    0
 client/{ => mifare}/mifare4.h       |    0
 client/{ => mifare}/mifaredefault.h |    0
 client/{ => mifare}/mifarehost.c    | 2033 +++++++++++++--------------
 client/{ => mifare}/mifarehost.h    |  204 +--
 client/obj/mifare/.dummy            |    0
 client/scripting.h                  |    2 +-
 include/mifare.h                    |    6 +
 19 files changed, 1158 insertions(+), 1147 deletions(-)
 rename client/{ => mifare}/mfkey.c (100%)
 rename client/{ => mifare}/mfkey.h (100%)
 rename client/{ => mifare}/mifare4.c (100%)
 rename client/{ => mifare}/mifare4.h (100%)
 rename client/{ => mifare}/mifaredefault.h (100%)
 rename client/{ => mifare}/mifarehost.c (95%)
 rename client/{ => mifare}/mifarehost.h (97%)
 create mode 100644 client/obj/mifare/.dummy

diff --git a/client/Makefile b/client/Makefile
index 0b19d4599..9f8055f8e 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -108,7 +108,7 @@ CORESRCS =  uart_posix.c \
 
 CMDSRCS =	crapto1/crapto1.c \
 			crapto1/crypto1.c \
-			mfkey.c \
+			mifare/mfkey.c \
 			tea.c \
 			fido/additional_ca.c \
 			fido/cose.c \
@@ -126,7 +126,7 @@ CMDSRCS =	crapto1/crapto1.c \
 			loclass/elite_crack.c \
 			loclass/fileutils.c \
 			whereami.c \
-			mifarehost.c \
+			mifare/mifarehost.c \
 			parity.c \
 			crc.c \
 			crc16.c \
@@ -156,7 +156,7 @@ CMDSRCS =	crapto1/crapto1.c \
 			emv/test/cda_test.c\
 			emv/cmdemv.c \
 			emv/emv_roca.c \
-            mifare4.c \
+            mifare/mifare4.c \
 			cmdanalyse.c \
 			cmdhf.c \
 			cmdhflist.c \
diff --git a/client/cmdanalyse.h b/client/cmdanalyse.h
index f834c717d..ab7606f5c 100644
--- a/client/cmdanalyse.h
+++ b/client/cmdanalyse.h
@@ -16,15 +16,15 @@
 #include <unistd.h>
 #include "cmdmain.h"
 #include "proxmark3.h"
-#include "ui.h"		// PrintAndLog
+#include "ui.h"				// PrintAndLog
 #include "util.h"
 #include "crc.h"
 #include "crc16.h"			// crc16 ccitt
 #include "tea.h"
 #include "legic_prng.h"
 #include "loclass/elite_crack.h"
-#include "mfkey.h"  //nonce2key 
-#include "util_posix.h" // msclock
+#include "mifare/mfkey.h"	//nonce2key 
+#include "util_posix.h" 	// msclock
 
 
 int usage_analyse_lcr(void);
diff --git a/client/cmdhf14a.h b/client/cmdhf14a.h
index 723c31100..3fe04d26c 100644
--- a/client/cmdhf14a.h
+++ b/client/cmdhf14a.h
@@ -29,7 +29,7 @@
 #include "cmdhfmf.h"
 #include "cmdhfmfu.h"
 #include "cmdhf.h"		// list cmd
-#include "mifarehost.h"
+#include "mifare/mifarehost.h"
 #include "emv/apduinfo.h"
 #include "emv/emvcore.h"						  
 
diff --git a/client/cmdhflist.h b/client/cmdhflist.h
index 1955119f2..60a0a0dfd 100644
--- a/client/cmdhflist.h
+++ b/client/cmdhflist.h
@@ -31,8 +31,8 @@
 #include "emv/cmdemv.h"		// EMV
 #include "protocols.h"
 #include "crapto1/crapto1.h"
-#include "mifarehost.h"
-#include "mifaredefault.h"
+#include "mifare/mifarehost.h"
+#include "mifare/mifaredefault.h"
 #include "parity.h"			// oddparity
 #include "iso15693tools.h"	// ISO15693 crc
 
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 811fa2430..a12bc34c2 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -9,7 +9,7 @@
 //-----------------------------------------------------------------------------
 
 #include "cmdhfmf.h"
-#include "mifare4.h"
+#include "mifare/mifare4.h"
 
 #define MIFARE_4K_MAXBLOCK 256
 #define MIFARE_2K_MAXBLOCK 128 
@@ -3216,18 +3216,28 @@ int CmdHF14AMfMAD(const char *cmd) {
 	CLIParserFree();
 
 	uint8_t sector[16 * 4] = {0};
-	if (mfReadSector(0, 0, (uint8_t *)g_mifare_mad_key, sector)) {
+	if (mfReadSector(MF_MAD1_SECTOR, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector)) {
 		PrintAndLogEx(ERR, "read sector 0 error. card don't have MAD or don't have MAD on default keys.");
 		return 2;
 	}
 	
 	if (verbose) {
-		for(int i = 0; i < 3; i ++)
-			PrintAndLogEx(NORMAL, "[i] %s", sprint_hex(&sector[i * 16], 16));		
+		for(int i = 0; i < 4; i ++)
+			PrintAndLogEx(NORMAL, "[%d] %s", i, sprint_hex(&sector[i * 16], 16));		
 	}
+	/*
+	bool haveMAD2 = false;
+	MAD1DecodeAndPrint(sector, verbose, &haveMAD2);
 	
-//	MADDecodeAndPrint(sector, verbose);
-	
+	if (haveMAD2) {
+		if (mfReadSector(MF_MAD2_SECTOR, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector)) {
+			PrintAndLogEx(ERR, "read sector 0 error. card don't have MAD or don't have MAD on default keys.");
+			return 2;
+		}
+
+		MAD2DecodeAndPrint(sector, verbose);
+	}
+	*/
 	return 0;
 }
 
diff --git a/client/cmdhfmf.h b/client/cmdhfmf.h
index eeb7a74f6..bdd817e41 100644
--- a/client/cmdhfmf.h
+++ b/client/cmdhfmf.h
@@ -23,14 +23,14 @@
 #include "cmdparser.h"
 #include "common.h"
 #include "util.h"
-#include "mifare.h" 		// nonces_t struct
-#include "mfkey.h"  		// mfkey32_moebious
+#include "mifare.h" 				// nonces_t struct
+#include "mifare/mfkey.h"   		// mfkey32_moebious
 #include "cmdhfmfhard.h"
-#include "mifarehost.h"		// icesector_t,  sector_t
-#include "util_posix.h"		// msclock
-#include "mifaredefault.h"  // mifare default key array
-#include "cmdhf14a.h" 		// dropfield
-#include "cliparser/cliparser.h" // argtable
+#include "mifare/mifarehost.h"		// icesector_t,  sector_t
+#include "util_posix.h"				// msclock
+#include "mifare/mifaredefault.h"  	// mifare default key array
+#include "cmdhf14a.h" 				// dropfield
+#include "cliparser/cliparser.h" 	// argtable
 #include "hardnested/hardnested_bf_core.h"	// SetSIMDInstr
 
 extern int CmdHFMF(const char *Cmd);
diff --git a/client/cmdhfmfp.c b/client/cmdhfmfp.c
index 0d7a623d4..0917728be 100644
--- a/client/cmdhfmfp.c
+++ b/client/cmdhfmfp.c
@@ -22,7 +22,7 @@
 #include "ui.h"
 #include "cmdhf14a.h"
 #include "mifare.h"
-#include "mifare4.h"
+#include "mifare/mifare4.h"
 #include "cliparser/cliparser.h"
 #include "crypto/libpcrypto.h"
 
diff --git a/client/cmdhfmfp.h b/client/cmdhfmfp.h
index b1ac7c349..a5cacb518 100644
--- a/client/cmdhfmfp.h
+++ b/client/cmdhfmfp.h
@@ -10,7 +10,7 @@
 #ifndef CMDHFMFP_H__
 #define CMDHFMFP_H__
 
-#include "mifaredefault.h"
+#include "mifare/mifaredefault.h"
 
 extern int CmdHFMFP(const char *Cmd);
 
diff --git a/client/loclass/fileutils.h b/client/loclass/fileutils.h
index 3fc781d2e..9485707f1 100644
--- a/client/loclass/fileutils.h
+++ b/client/loclass/fileutils.h
@@ -48,7 +48,7 @@
 #include <stdarg.h>
 #include "../ui.h"
 #include "../emv/emvjson.h"
-#include "mifare4.h"
+#include "mifare/mifare4.h"
 #include "cmdhfmfu.h"
 
 typedef enum {
diff --git a/client/mfkey.c b/client/mifare/mfkey.c
similarity index 100%
rename from client/mfkey.c
rename to client/mifare/mfkey.c
diff --git a/client/mfkey.h b/client/mifare/mfkey.h
similarity index 100%
rename from client/mfkey.h
rename to client/mifare/mfkey.h
diff --git a/client/mifare4.c b/client/mifare/mifare4.c
similarity index 100%
rename from client/mifare4.c
rename to client/mifare/mifare4.c
diff --git a/client/mifare4.h b/client/mifare/mifare4.h
similarity index 100%
rename from client/mifare4.h
rename to client/mifare/mifare4.h
diff --git a/client/mifaredefault.h b/client/mifare/mifaredefault.h
similarity index 100%
rename from client/mifaredefault.h
rename to client/mifare/mifaredefault.h
diff --git a/client/mifarehost.c b/client/mifare/mifarehost.c
similarity index 95%
rename from client/mifarehost.c
rename to client/mifare/mifarehost.c
index ba5081441..cd239d585 100644
--- a/client/mifarehost.c
+++ b/client/mifare/mifarehost.c
@@ -1,1020 +1,1015 @@
-// Merlok, 2011, 2012
-// people from mifare@nethemba.com, 2010
-//
-// This code is licensed to you under the terms of the GNU GPL, version 2 or,
-// at your option, any later version. See the LICENSE.txt file for the text of
-// the license.
-//-----------------------------------------------------------------------------
-// mifare commands
-//-----------------------------------------------------------------------------
-#include "mifarehost.h"
-#include "cmdmain.h"
-
-int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
-	uint32_t uid = 0;
-	uint32_t nt = 0, nr = 0, ar = 0;
-	uint64_t par_list = 0, ks_list = 0;
-	uint64_t *keylist = NULL, *last_keylist = NULL;
-	uint32_t keycount = 0;
-	int16_t isOK = 0;
-	
-	UsbCommand c = {CMD_READER_MIFARE, {true, blockno, key_type}};
-
-	// message
-	PrintAndLogEx(NORMAL, "--------------------------------------------------------------------------------\n");
-	PrintAndLogEx(NORMAL, "executing Darkside attack. Expected execution time: 25sec on average");
-	PrintAndLogEx(NORMAL, "press pm3-button on the proxmark3 device to abort both proxmark3 and client.");
-	PrintAndLogEx(NORMAL, "--------------------------------------------------------------------------------\n");
-
-	while (true) {
-		clearCommandBuffer();
-		SendCommand(&c);
-
-		//flush queue
-		while (ukbhit()) { 
-			int gc = getchar(); (void)gc; 
-			return -5;
-		}
-		
-		// wait cycle
-		while (true) {
-			printf("."); fflush(stdout);
-			if (ukbhit()) {
-				int gc = getchar(); (void)gc;
-				return -5;
-			}
-
-			UsbCommand resp;
-			if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
-				isOK  = resp.arg[0];
-				if (isOK < 0) 
-					return isOK;
-				
-				uid = (uint32_t)bytes_to_num(resp.d.asBytes +  0, 4);
-				nt = (uint32_t)bytes_to_num(resp.d.asBytes +  4, 4);
-				par_list = bytes_to_num(resp.d.asBytes +  8, 8);
-				ks_list = bytes_to_num(resp.d.asBytes +  16, 8);
-				nr = (uint32_t)bytes_to_num(resp.d.asBytes + 24, 4);
-				ar = (uint32_t)bytes_to_num(resp.d.asBytes + 28, 4);
-				break;
-			}
-		}
-		PrintAndLogEx(NORMAL, "\n");
-		
-		if (par_list == 0 && c.arg[0] == true) {
-			PrintAndLogEx(SUCCESS, "Parity is all zero. Most likely this card sends NACK on every authentication.");
-		}
-		c.arg[0] = false;
-
-		keycount = nonce2key(uid, nt, nr, ar, par_list, ks_list, &keylist);
-
-		if (keycount == 0) {
-			PrintAndLogEx(FAILED, "key not found (lfsr_common_prefix list is null). Nt=%08x", nt);
-			PrintAndLogEx(FAILED, "this is expected to happen in 25%% of all cases. Trying again with a different reader nonce...");
-			continue;
-		}
-
-		// only parity zero attack
-		if (par_list == 0 ) {
-			qsort(keylist, keycount, sizeof(*keylist), compare_uint64);
-			keycount = intersection(last_keylist, keylist);
-			if (keycount == 0) {
-				free(last_keylist);
-				last_keylist = keylist;
-				PrintAndLogEx(FAILED, "no candidates found, trying again");
-				continue;
-			}
-		}
-
-		PrintAndLogEx(SUCCESS, "found %u candidate key%s\n", keycount, (keycount > 1) ? "s." : ".");
-
-		*key = -1;
-		uint8_t keyBlock[USB_CMD_DATA_SIZE];
-		int max_keys = USB_CMD_DATA_SIZE / 6;
-		for (int i = 0; i < keycount; i += max_keys) {
-			
-			int size = keycount - i > max_keys ? max_keys : keycount - i;
-			for (int j = 0; j < size; j++) {
-				if (par_list == 0) {
-					num_to_bytes(last_keylist[i*max_keys + j], 6, keyBlock+(j*6));
-				} else {
-					num_to_bytes(keylist[i*max_keys + j], 6, keyBlock+(j*6));
-				}
-			}
-			
-			if (!mfCheckKeys(blockno, key_type - 0x60, false, size, keyBlock, key)) {
-				break;
-			}
-		}
-		
-		if (*key != -1) {
-			break;
-		} else {
-			PrintAndLogEx(FAILED, "all candidate keys failed. Restarting darkside attack");
-			free(last_keylist);
-			last_keylist = keylist;
-			c.arg[0] = true;
-		}
-	}
-	free(last_keylist);
-	free(keylist);
-	return 0;
-}
-int mfCheckKeys(uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t keycnt, uint8_t * keyBlock, uint64_t * key){
-	*key = -1;	
-	UsbCommand c = {CMD_MIFARE_CHKKEYS, { (blockNo | (keyType << 8)), clear_trace, keycnt}};
-	memcpy(c.d.asBytes, keyBlock, 6 * keycnt);
-	clearCommandBuffer();
-	SendCommand(&c);
-	UsbCommand resp;
-	if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) return 1;
-	if ((resp.arg[0] & 0xff) != 0x01) return 2;
-	*key = bytes_to_num(resp.d.asBytes, 6);
-	return 0;
-}
-
-// Sends chunks of keys to device. 
-// 0 == ok all keys found
-// 1 == 
-// 2 == Time-out, aborting
-int mfCheckKeys_fast( uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk, uint8_t strategy,
-						uint32_t size, uint8_t *keyBlock, sector_t *e_sector, bool use_flashmemory) {
-
-	uint64_t t2 = msclock();
-	uint32_t timeout = 0;
-
-	// send keychunk		
-	UsbCommand c = {CMD_MIFARE_CHKKEYS_FAST, { (sectorsCnt | (firstChunk << 8) | (lastChunk << 12) ), ((use_flashmemory << 8) | strategy), size}};	
-	memcpy(c.d.asBytes, keyBlock, 6 * size);
-	clearCommandBuffer();
-	SendCommand(&c);
-	UsbCommand resp;
-
-	while ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
-		timeout++;
-		printf("."); fflush(stdout);
-		// max timeout for one chunk of 85keys, 60*3sec = 180seconds
-		// s70 with 40*2 keys to check, 80*85 = 6800 auth.
-		// takes about 97s, still some margin before abort
-		if (timeout > 180) {
-			PrintAndLogEx(WARNING, "\nno response from Proxmark. Aborting...");
-			return 2;
-		}
-	}
-	t2 = msclock() - t2;
-
-	// time to convert the returned data.
-	uint8_t curr_keys = resp.arg[0];
-
-	PrintAndLogEx(SUCCESS, "\nChunk: %.1fs | found %u/%u keys (%u)", (float)(t2/1000.0), curr_keys, (sectorsCnt<<1), size);
-		
-	// all keys?		
-	if ( curr_keys == sectorsCnt*2 || lastChunk ) {
-		
-		// success array. each byte is status of key 
-		uint8_t arr[80];
-		uint64_t foo = 0;
-		uint16_t bar = 0;
-		foo = bytes_to_num(resp.d.asBytes+480, 8);
-		bar = (resp.d.asBytes[489]  << 8 | resp.d.asBytes[488]);
-
-		for (uint8_t i = 0; i < 64; i++)
-			arr[i] = (foo >> i) & 0x1;
-	
-		for (uint8_t i = 0; i < 16; i++)
-			arr[i+64] = (bar >> i) & 0x1;
-		
-		// initialize storage for found keys
-		icesector_t *tmp = calloc(sectorsCnt, sizeof(icesector_t));
-		if (tmp == NULL)
-			return 1;
-		memcpy(tmp, resp.d.asBytes, sectorsCnt * sizeof(icesector_t) );
-
-		for ( int i = 0; i < sectorsCnt; i++) {
-			// key A
-			if ( !e_sector[i].foundKey[0] ) {
-				e_sector[i].Key[0] =  bytes_to_num( tmp[i].keyA, 6);
-				e_sector[i].foundKey[0] = arr[ (i*2) ];
-			}
-			// key B
-			if ( !e_sector[i].foundKey[1] ) {
-				e_sector[i].Key[1] =  bytes_to_num( tmp[i].keyB, 6);
-				e_sector[i].foundKey[1] = arr[ (i*2) + 1 ];
-			}
-		}
-		free(tmp);
-		
-		if ( curr_keys == sectorsCnt*2 )
-			return 0;
-		if ( lastChunk )
-			return 1;
-	}
-	return 1;
-}
-
-// PM3 imp of J-Run mf_key_brute (part 2)
-// ref: https://github.com/J-Run/mf_key_brute
-int mfKeyBrute(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint64_t *resultkey){
-
-	#define KEYS_IN_BLOCK 85
-	#define KEYBLOCK_SIZE 510
-	#define CANDIDATE_SIZE 0xFFFF * 6
-	uint8_t found = false;
-	uint64_t key64 = 0;
-	uint8_t candidates[CANDIDATE_SIZE] = {0x00};
-	uint8_t keyBlock[KEYBLOCK_SIZE] = {0x00};
-
-	memset(candidates, 0, sizeof(candidates));
-	memset(keyBlock, 0, sizeof(keyBlock));
-	
-	// Generate all possible keys for the first two unknown bytes.
-	for (uint16_t i = 0; i < 0xFFFF; ++i) {		
-		uint32_t j = i * 6;		
-		candidates[0 + j] = i >> 8;	
-		candidates[1 + j] = i;
-		candidates[2 + j] = key[2];
-		candidates[3 + j] = key[3];
-		candidates[4 + j] = key[4];
-		candidates[5 + j] = key[5];
-	}
-	uint32_t counter, i;
-	for ( i = 0, counter = 1; i < CANDIDATE_SIZE; i += KEYBLOCK_SIZE, ++counter){
-
-		key64 = 0;
-		
-		// copy candidatekeys to test key block
-		memcpy(keyBlock, candidates + i, KEYBLOCK_SIZE);
-
-		// check a block of generated candidate keys.
-		if (!mfCheckKeys(blockNo, keyType, true, KEYS_IN_BLOCK, keyBlock, &key64)) {
-			*resultkey = key64;
-			found = true;
-			break;
-		}
-		
-		// progress 
-		if ( counter % 20 == 0 )
-			PrintAndLogEx(SUCCESS, "tried : %s.. \t %u keys", sprint_hex(candidates + i, 6),  counter * KEYS_IN_BLOCK  );
-	}
-	return found;
-}
-
-// Compare 16 Bits out of cryptostate
-int Compare16Bits(const void * a, const void * b) {
-	if ((*(uint64_t*)b & 0x00ff000000ff0000) == (*(uint64_t*)a & 0x00ff000000ff0000)) return 0;
-	if ((*(uint64_t*)b & 0x00ff000000ff0000) > (*(uint64_t*)a & 0x00ff000000ff0000)) return 1;
-	return -1;
-}
-
-// wrapper function for multi-threaded lfsr_recovery32
-void
-#ifdef __has_attribute
-#if __has_attribute(force_align_arg_pointer)
-__attribute__((force_align_arg_pointer)) 
-#endif
-#endif
-*nested_worker_thread(void *arg) {
-	struct Crypto1State *p1;
-	StateList_t *statelist = arg;
-	statelist->head.slhead = lfsr_recovery32(statelist->ks1, statelist->nt ^ statelist->uid);	
-	
-	for (p1 = statelist->head.slhead; *(uint64_t *)p1 != 0; p1++) {};
-	
-	statelist->len = p1 - statelist->head.slhead;
-	statelist->tail.sltail = --p1;
-	qsort(statelist->head.slhead, statelist->len, sizeof(uint64_t), Compare16Bits);
-	
-	return statelist->head.slhead;
-}
-
-int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t * resultKey, bool calibrate) {
-	uint16_t i;
-	uint32_t uid;
-	UsbCommand resp;
-	StateList_t statelists[2];
-	struct Crypto1State *p1, *p2, *p3, *p4;
-	
-	UsbCommand c = {CMD_MIFARE_NESTED, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, calibrate}};
-	memcpy(c.d.asBytes, key, 6);
-	clearCommandBuffer();
-	SendCommand(&c);
-	if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return -1;
-
-	// error during nested
-	if (resp.arg[0]) return resp.arg[0];
-	
-	memcpy(&uid, resp.d.asBytes, 4);
-		
-	for (i = 0; i < 2; i++) {
-		statelists[i].blockNo = resp.arg[2] & 0xff;
-		statelists[i].keyType = (resp.arg[2] >> 8) & 0xff;
-		statelists[i].uid = uid;
-		memcpy(&statelists[i].nt,  (void *)(resp.d.asBytes + 4 + i * 8 + 0), 4);
-		memcpy(&statelists[i].ks1, (void *)(resp.d.asBytes + 4 + i * 8 + 4), 4);
-	}
-	
-	// calc keys	
-	pthread_t thread_id[2];
-		
-	// create and run worker threads
-	for (i = 0; i < 2; i++)
-		pthread_create(thread_id + i, NULL, nested_worker_thread, &statelists[i]);
-
-	// wait for threads to terminate:
-	for (i = 0; i < 2; i++)
-		pthread_join(thread_id[i], (void*)&statelists[i].head.slhead);
-
-	// the first 16 Bits of the cryptostate already contain part of our key.
-	// Create the intersection of the two lists based on these 16 Bits and
-	// roll back the cryptostate
-	p1 = p3 = statelists[0].head.slhead; 
-	p2 = p4 = statelists[1].head.slhead;
-
-	while (p1 <= statelists[0].tail.sltail && p2 <= statelists[1].tail.sltail) {
-		if (Compare16Bits(p1, p2) == 0) {
-			
-			struct Crypto1State savestate, *savep = &savestate;
-			savestate = *p1;
-			while(Compare16Bits(p1, savep) == 0 && p1 <= statelists[0].tail.sltail) {
-				*p3 = *p1;
-				lfsr_rollback_word(p3, statelists[0].nt ^ statelists[0].uid, 0);
-				p3++;
-				p1++;
-			}
-			savestate = *p2;
-			while(Compare16Bits(p2, savep) == 0 && p2 <= statelists[1].tail.sltail) {
-				*p4 = *p2;
-				lfsr_rollback_word(p4, statelists[1].nt ^ statelists[1].uid, 0);
-				p4++;
-				p2++;
-			}
-		}
-		else {
-			while (Compare16Bits(p1, p2) == -1) p1++;
-			while (Compare16Bits(p1, p2) == 1) p2++;
-		}
-	}
-
-	*(uint64_t*)p3 = -1;
-	*(uint64_t*)p4 = -1;
-	statelists[0].len = p3 - statelists[0].head.slhead;
-	statelists[1].len = p4 - statelists[1].head.slhead;
-	statelists[0].tail.sltail = --p3;
-	statelists[1].tail.sltail = --p4;
-
-	// the statelists now contain possible keys. The key we are searching for must be in the
-	// intersection of both lists
-	qsort(statelists[0].head.keyhead, statelists[0].len, sizeof(uint64_t), compare_uint64);
-	qsort(statelists[1].head.keyhead, statelists[1].len, sizeof(uint64_t), compare_uint64);
-	// Create the intersection
-	statelists[0].len = intersection(statelists[0].head.keyhead, statelists[1].head.keyhead);
-
-	//statelists[0].tail.keytail = --p7;
-	uint32_t keycnt = statelists[0].len;
-	if ( keycnt == 0 ) goto out;
-
-	memset(resultKey, 0, 6);
-	uint64_t key64 = -1;
-
-	// The list may still contain several key candidates. Test each of them with mfCheckKeys
-	uint32_t max_keys = keycnt > (USB_CMD_DATA_SIZE/6) ? (USB_CMD_DATA_SIZE/6) : keycnt;
-	uint8_t keyBlock[USB_CMD_DATA_SIZE] = {0x00};
-
-	for (int i = 0; i < keycnt; i += max_keys) {
-		
-		int size = keycnt - i > max_keys ? max_keys : keycnt - i;
-	
-		for (int j = 0; j < size; j++) {
-			crypto1_get_lfsr(statelists[0].head.slhead + i, &key64);
-			num_to_bytes(key64, 6, keyBlock + i * 6);
-		}
-		
-		if (!mfCheckKeys(statelists[0].blockNo, statelists[0].keyType, false, size, keyBlock, &key64)) {		
-			free(statelists[0].head.slhead);
-			free(statelists[1].head.slhead);
-			num_to_bytes(key64, 6, resultKey);
-
-			PrintAndLogEx(SUCCESS, "target block:%3u key type: %c  -- found valid key [%012" PRIx64 "]",
-				(uint16_t)resp.arg[2] & 0xff,
-				(resp.arg[2] >> 8) ? 'B' : 'A',
-				key64
-			);
-			return -5;
-		}		
-	}
-	
-out:
-	PrintAndLogEx(SUCCESS, "target block:%3u key type: %c",
-			(uint16_t)resp.arg[2] & 0xff,
-			(resp.arg[2] >> 8) ? 'B' : 'A'
-	);	
-
-	free(statelists[0].head.slhead);
-	free(statelists[1].head.slhead);
-	return -4;
-}
-
-// MIFARE
-int mfReadSector(uint8_t sectorNo, uint8_t keyType, uint8_t *key, uint8_t *data) {
-	
-	UsbCommand c = {CMD_MIFARE_READSC, {sectorNo, keyType, 0}};
-	memcpy(c.d.asBytes, key, 6);
-	clearCommandBuffer();
-	SendCommand(&c);
-
-	UsbCommand resp;
-	if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-		uint8_t isOK  = resp.arg[0] & 0xff;
-
-		if (isOK) {
-			memcpy(data, resp.d.asBytes, mfNumBlocksPerSector(sectorNo) * 16);
-			for (int i = 0; i < (sectorNo<32?3:15); i++) {
-				PrintAndLogEx(NORMAL, "data   : %s", sprint_hex(data + i * 16, 16));
-			}
-			PrintAndLogEx(NORMAL, "trailer: %s", sprint_hex(data + (sectorNo<32?3:15) * 16, 16));
-			
-			return 0;
-		} else {
-			return isOK;
-		}
-	} else {
-		PrintAndLogEx(ERR, "Command execute timeout");
-		return 2;
-	}
-	
-	return 0;
-}
-
-// EMULATOR
-int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount) {
-	UsbCommand c = {CMD_MIFARE_EML_MEMGET, {blockNum, blocksCount, 0}};
-	clearCommandBuffer();
- 	SendCommand(&c);
-	UsbCommand resp;
-	if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return 1;
-	memcpy(data, resp.d.asBytes, blocksCount * 16);
-	return 0;
-}
-
-int mfEmlSetMem(uint8_t *data, int blockNum, int blocksCount) {
-	return mfEmlSetMem_xt(data, blockNum, blocksCount, 16);
-}
-
-int mfEmlSetMem_xt(uint8_t *data, int blockNum, int blocksCount, int blockBtWidth) {
-	UsbCommand c = {CMD_MIFARE_EML_MEMSET, {blockNum, blocksCount, blockBtWidth}};
-	memcpy(c.d.asBytes, data, blocksCount * blockBtWidth); 
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
-}
-
-// "MAGIC" CARD
-int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, uint8_t wipecard) {
-
-	uint8_t params = MAGIC_SINGLE;
-	uint8_t block0[16];
-	memset(block0, 0x00, sizeof(block0));
-
-	int old = mfCGetBlock(0, block0, params);
-	if (old == 0)
-		PrintAndLogEx(SUCCESS, "old block 0:  %s", sprint_hex(block0, sizeof(block0)));
-	else 
-		PrintAndLogEx(FAILED, "couldn't get old data. Will write over the last bytes of Block 0.");	
-
-	// fill in the new values
-	// UID
-	memcpy(block0, uid, 4); 
-	// Mifare UID BCC
-	block0[4] = block0[0] ^ block0[1] ^ block0[2] ^ block0[3];
-	// mifare classic SAK(byte 5) and ATQA(byte 6 and 7, reversed)
-	if ( sak != NULL )
-		block0[5] = sak[0];
-	
-	if ( atqa != NULL ) {
-		block0[6] = atqa[1];
-		block0[7] = atqa[0];
-	}
-	PrintAndLogEx(SUCCESS, "new block 0:  %s", sprint_hex(block0,16));
-	
-	if ( wipecard )		 params |= MAGIC_WIPE;	
-	if ( oldUID == NULL) params |= MAGIC_UID;
-	
-	return mfCSetBlock(0, block0, oldUID, params);
-}
-
-int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, uint8_t params) {
-
-	uint8_t isOK = 0;
-	UsbCommand c = {CMD_MIFARE_CSETBLOCK, {params, blockNo, 0}};
-	memcpy(c.d.asBytes, data, 16); 
-	clearCommandBuffer();
-	SendCommand(&c);
-	UsbCommand resp;
-	if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-		isOK  = resp.arg[0] & 0xff;
-		if (uid != NULL) 
-			memcpy(uid, resp.d.asBytes, 4);
-		if (!isOK) 
-			return 2;
-	} else {
-		PrintAndLogEx(WARNING, "command execute timeout");
-		return 1;
-	}
-	return 0;
-}
-
-int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params) {
-	uint8_t isOK = 0;
-	UsbCommand c = {CMD_MIFARE_CGETBLOCK, {params, blockNo, 0}};	
-	clearCommandBuffer();
-	SendCommand(&c);
-	UsbCommand resp;
-	if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-		isOK  = resp.arg[0] & 0xff;
-		if (!isOK) 
-			return 2;		
-		memcpy(data, resp.d.asBytes, 16);
-	} else {
-		PrintAndLogEx(WARNING, "command execute timeout");
-		return 1;
-	}
-	return 0;
-}
-
-// SNIFFER
-// [iceman] so many global variables....
-
-// constants
-static uint8_t trailerAccessBytes[4] = {0x08, 0x77, 0x8F, 0x00};
-
-// variables
-char logHexFileName[FILE_PATH_SIZE] = {0x00};
-static uint8_t traceCard[4096] = {0x00};
-static char traceFileName[FILE_PATH_SIZE] = {0x00};
-static int traceState = TRACE_IDLE;
-static uint8_t traceCurBlock = 0;
-static uint8_t traceCurKey = 0;
-
-struct Crypto1State *traceCrypto1 = NULL;
-struct Crypto1State *revstate = NULL;
-uint64_t key = 0;
-uint32_t ks2 = 0;
-uint32_t ks3 = 0;
-
-uint32_t cuid = 0;    // uid part used for crypto1.
-uint32_t nt = 0;      // tag challenge
-uint32_t nr_enc = 0;  // encrypted reader challenge
-uint32_t ar_enc = 0;  // encrypted reader response
-uint32_t at_enc = 0;  // encrypted tag response
-
-int isTraceCardEmpty(void) {
-	return ((traceCard[0] == 0) && (traceCard[1] == 0) && (traceCard[2] == 0) && (traceCard[3] == 0));
-}
-
-int isBlockEmpty(int blockN) {
-	for (int i = 0; i < 16; i++) 
-		if (traceCard[blockN * 16 + i] != 0) return 0;
-
-	return 1;
-}
-
-int isBlockTrailer(int blockN) {
-	return ((blockN & 0x03) == 0x03);
-}
-
-int loadTraceCard(uint8_t *tuid, uint8_t uidlen) {
-	FILE * f;
-	char buf[64] = {0x00};
-	uint8_t buf8[64] = {0x00};
-	int i, blockNum;
-	uint32_t tmp;
-	
-	if (!isTraceCardEmpty()) 
-		saveTraceCard();
-		
-	memset(traceCard, 0x00, 4096);
-	memcpy(traceCard, tuid, uidlen);
-
-	FillFileNameByUID(traceFileName, tuid, ".eml", uidlen);
-
-	f = fopen(traceFileName, "r");
-	if (!f) return 1;
-	
-	blockNum = 0;
-		
-	while (!feof(f)){
-	
-		memset(buf, 0, sizeof(buf));
-		if (fgets(buf, sizeof(buf), f) == NULL) {
-			PrintAndLogEx(FAILED, "No trace file found or reading error.");
-			if (f) {
-				fclose(f);
-			}
-			return 2;
-		}
-
-		if (strlen(buf) < 32){
-			if (feof(f)) break;
-			PrintAndLogEx(FAILED, "File content error. Block data must include 32 HEX symbols");
-			if (f) {
-				fclose(f);
-			}
-			return 2;
-		}
-		for (i = 0; i < 32; i += 2) {
-			sscanf(&buf[i], "%02X", &tmp);
-			buf8[i / 2] = tmp & 0xFF;
-		}
-
-		memcpy(traceCard + blockNum * 16, buf8, 16);
-
-		blockNum++;
-	}
-	if (f) {
-		fclose(f);
-	}
-	return 0;
-}
-
-int saveTraceCard(void) {
-	
-	if ((!strlen(traceFileName)) || (isTraceCardEmpty())) return 0;
-	
-	FILE * f;
-	f = fopen(traceFileName, "w+");
-	if ( !f ) return 1;
-
-	// given 4096 tracecard size,  these loop will only match a 1024, 1kb card memory
-	// 4086/16 == 256blocks. 
-	for (uint16_t i = 0; i < 256; i++) {  // blocks
-		for (uint8_t j = 0; j < 16; j++)  // bytes
-			fprintf(f, "%02X", *(traceCard + i * 16 + j)); 
-			
-		// no extra line in the end
-		if ( i < 255 )
-			fprintf(f, "\n");
-	}
-	fflush(f);
-	fclose(f);
-	return 0;
-}
-//
-int mfTraceInit(uint8_t *tuid, uint8_t uidlen, uint8_t *atqa, uint8_t sak, bool wantSaveToEmlFile) {
-
-	if (traceCrypto1) 
-		crypto1_destroy(traceCrypto1);
-
-	traceCrypto1 = NULL;
-
-	if (wantSaveToEmlFile) 
-		loadTraceCard(tuid, uidlen);
-		
-	traceCard[4] = traceCard[0] ^ traceCard[1] ^ traceCard[2] ^ traceCard[3];
-	traceCard[5] = sak;
-	memcpy(&traceCard[6], atqa, 2);
-	traceCurBlock = 0;
-	cuid = bytes_to_num(tuid + (uidlen-4), 4);
-	traceState = TRACE_IDLE;
-	return 0;
-}
-
-void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len, bool isEncrypted){
-	uint8_t	bt = 0;
-	int i;
-	
-	if (len != 1) {
-		for (i = 0; i < len; i++)
-			data[i] = crypto1_byte(pcs, 0x00, isEncrypted) ^ data[i];
-	} else {
-		bt = 0;		
-		bt |= (crypto1_bit(pcs, 0, isEncrypted) ^ BIT(data[0], 0)) << 0;
-		bt |= (crypto1_bit(pcs, 0, isEncrypted) ^ BIT(data[0], 1)) << 1;
-		bt |= (crypto1_bit(pcs, 0, isEncrypted) ^ BIT(data[0], 2)) << 2;
-		bt |= (crypto1_bit(pcs, 0, isEncrypted) ^ BIT(data[0], 3)) << 3;			
-		data[0] = bt;
-	}
-}
-
-int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
-
-	if (traceState == TRACE_ERROR)
-		return 1;
-
-	if (len > 255) {
-		traceState = TRACE_ERROR;
-		return 1;
-	}
-	
-	uint8_t data[255];
-	memset(data, 0x00, sizeof(data));
-	
-	memcpy(data, data_src, len);
-	
-	if ((traceCrypto1) && ((traceState == TRACE_IDLE) || (traceState > TRACE_AUTH_OK))) {
-		mf_crypto1_decrypt(traceCrypto1, data, len, 0);
-		PrintAndLogEx(NORMAL, "DEC| %s", sprint_hex(data, len));
-		AddLogHex(logHexFileName, "DEC| ", data, len); 
-	}
-	
-	switch (traceState) {
-	case TRACE_IDLE: 
-		// check packet crc16!
-		if ((len >= 4) && (!check_crc(CRC_14443_A, data, len))) {
-			PrintAndLogEx(NORMAL, "DEC| CRC ERROR!!!");
-			AddLogLine(logHexFileName, "DEC| ", "CRC ERROR!!!"); 
-			traceState = TRACE_ERROR;  // do not decrypt the next commands
-			return 1;
-		}
-		
-		// AUTHENTICATION
-		if ((len == 4) && ((data[0] == MIFARE_AUTH_KEYA) || (data[0] == MIFARE_AUTH_KEYB))) {
-			traceState = TRACE_AUTH1;
-			traceCurBlock = data[1];
-			traceCurKey = data[0] == 60 ? 1:0;
-			return 0;
-		}
-
-		// READ
-		if ((len == 4) && ((data[0] == ISO14443A_CMD_READBLOCK))) {
-			traceState = TRACE_READ_DATA;
-			traceCurBlock = data[1];
-			return 0;
-		}
-
-		// WRITE
-		if ((len == 4) && ((data[0] == ISO14443A_CMD_WRITEBLOCK))) {
-			traceState = TRACE_WRITE_OK;
-			traceCurBlock = data[1];
-			return 0;
-		}
-
-		// HALT
-		if ((len == 4) && ((data[0] == ISO14443A_CMD_HALT) && (data[1] == 0x00))) {
-			traceState = TRACE_ERROR;  // do not decrypt the next commands
-			return 0;
-		}
-		return 0;
-
-	case TRACE_READ_DATA: 
-		if (len == 18) {
-			traceState = TRACE_IDLE;
-
-			if (isBlockTrailer(traceCurBlock)) {
-				memcpy(traceCard + traceCurBlock * 16 + 6, data + 6, 4);
-			} else {
-				memcpy(traceCard + traceCurBlock * 16, data, 16);
-			}
-			if (wantSaveToEmlFile) saveTraceCard();
-			return 0;
-		} else {
-			traceState = TRACE_ERROR;
-			return 1;
-		}
-		break;
-	case TRACE_WRITE_OK: 
-		if ((len == 1) && (data[0] == 0x0a)) {
-			traceState = TRACE_WRITE_DATA;
-			return 0;
-		} else {
-			traceState = TRACE_ERROR;
-			return 1;
-		}
-		break;
-	case TRACE_WRITE_DATA: 
-		if (len == 18) {
-			traceState = TRACE_IDLE;
-			memcpy(traceCard + traceCurBlock * 16, data, 16);
-			if (wantSaveToEmlFile) saveTraceCard();
-			return 0;
-		} else {
-			traceState = TRACE_ERROR;
-			return 1;
-		}
-		break;
-	case TRACE_AUTH1: 
-		if (len == 4) {
-			traceState = TRACE_AUTH2;
-			nt = bytes_to_num(data, 4);
-			return 0;
-		} else {
-			traceState = TRACE_ERROR;
-			return 1;
-		}
-		break;
-	case TRACE_AUTH2: 
-		if (len == 8) {
-			traceState = TRACE_AUTH_OK;
-			nr_enc = bytes_to_num(data, 4);
-			ar_enc = bytes_to_num(data + 4, 4);
-			return 0;
-		} else {
-			traceState = TRACE_ERROR;
-			return 1;
-		}
-		break;
-	case TRACE_AUTH_OK: 
-		if (len == 4) {
-			traceState = TRACE_IDLE;
-			at_enc = bytes_to_num(data, 4);
-			
-			//  mfkey64 recover key.
-			ks2 = ar_enc ^ prng_successor(nt, 64);
-			ks3 = at_enc ^ prng_successor(nt, 96);
-			revstate = lfsr_recovery64(ks2, ks3);
-			lfsr_rollback_word(revstate, 0, 0);
-			lfsr_rollback_word(revstate, 0, 0);
-			lfsr_rollback_word(revstate, nr_enc, 1);
-			lfsr_rollback_word(revstate, cuid ^ nt, 0);
-			crypto1_get_lfsr(revstate, &key);
-			PrintAndLogEx(SUCCESS, "found Key: [%012" PRIx64 "]", key);
-			
-			//if ( tryMfk64(cuid, nt, nr_enc, ar_enc, at_enc, &key) )
-			AddLogUint64(logHexFileName, "Found Key: ", key); 
-			
-			int blockShift = ((traceCurBlock & 0xFC) + 3) * 16;
-			if (isBlockEmpty((traceCurBlock & 0xFC) + 3)) 
-				memcpy(traceCard + blockShift + 6, trailerAccessBytes, 4);
-			
-			// keytype A/B
-			if (traceCurKey)
-				num_to_bytes(key, 6, traceCard + blockShift + 10);
-			else
-				num_to_bytes(key, 6, traceCard + blockShift);
-			
-			if (wantSaveToEmlFile)
-				saveTraceCard();
-
-			if (traceCrypto1)
-				crypto1_destroy(traceCrypto1);
-			
-			// set cryptosystem state
-			traceCrypto1 = lfsr_recovery64(ks2, ks3);			
-
-		} else {
-			PrintAndLogEx(NORMAL, "[!] nested key recovery not implemented!\n");
-			at_enc = bytes_to_num(data, 4);
-			crypto1_destroy(traceCrypto1);			
-			traceState = TRACE_ERROR;
-		}
-		break;
-	default: 
-		traceState = TRACE_ERROR;
-		return 1;
-	}
-	return 0;
-}
-
-int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t *data, int len){
-	PrintAndLogEx(SUCCESS, "\nencrypted data: [%s]", sprint_hex(data, len) );
-	struct Crypto1State *s;
-	ks2 = ar_enc ^ prng_successor(nt, 64);
-	ks3 = at_enc ^ prng_successor(nt, 96);
-	s = lfsr_recovery64(ks2, ks3);
-	mf_crypto1_decrypt(s, data, len, false);
-	PrintAndLogEx(SUCCESS, "decrypted data: [%s]", sprint_hex(data, len) );
-	crypto1_destroy(s);
-	return 0;
-}
-
-/* Detect Tag Prng, 
-* function performs a partial AUTH,  where it tries to authenticate against block0, key A, but only collects tag nonce.
-* the tag nonce is check to see if it has a predictable PRNG.
-* @returns 
-*	TRUE if tag uses WEAK prng (ie Now the NACK bug also needs to be present for Darkside attack)
-*   FALSE is tag uses HARDEND prng (ie hardnested attack possible, with known key)
-*/
-int detect_classic_prng(void){
-
-	UsbCommand resp, respA;	
-	uint8_t cmd[] = {MIFARE_AUTH_KEYA, 0x00};
-	uint32_t flags = ISO14A_CONNECT | ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_RATS;
-	
-	UsbCommand c = {CMD_READER_ISO_14443a, {flags, sizeof(cmd), 0}};
-	memcpy(c.d.asBytes, cmd, sizeof(cmd));
-
-	clearCommandBuffer();
-	SendCommand(&c);					
-	
-	if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
-        PrintAndLogEx(WARNING, "PRNG UID: Reply timeout.");
-		return -1;
-	}
-		
-	// if select tag failed.
-	if ( resp.arg[0] == 0 ) {
-		PrintAndLogEx(WARNING, "error:  selecting tag failed,  can't detect prng\n");
-		return -2;
-	}
-	if (!WaitForResponseTimeout(CMD_ACK, &respA, 2500)) {
-        PrintAndLogEx(WARNING, "PRNG data: Reply timeout.");
-		return -3;
-	}
-
-	// check respA
-	if (respA.arg[0] != 4) {
-		PrintAndLogEx(WARNING, "PRNG data error: Wrong length: %d", respA.arg[0]);
-		return -4;
-	}			
-
-	uint32_t nonce = bytes_to_num(respA.d.asBytes, respA.arg[0]);
-	return validate_prng_nonce(nonce);
-}
-/* Detect Mifare Classic NACK bug 
-
-returns:
-0 = error during test / aborted
-1 = has nack bug
-2 = has not nack bug
-3 = always leak nacks  (clones)
-*/
-int detect_classic_nackbug(bool verbose){
-	
-	UsbCommand c = {CMD_MIFARE_NACK_DETECT, {0, 0, 0}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	UsbCommand resp;
-	
-	if ( verbose )
-		PrintAndLogEx(SUCCESS, "press pm3-button on the proxmark3 device to abort both proxmark3 and client.\n");
-	
-	// for nice animation	
-	bool term = !isatty(STDIN_FILENO);
-#if defined(__linux__) || (__APPLE__)
-	char star[] = {'-', '\\', '|', '/'};
-	uint8_t staridx = 0;	
-#endif 
-
-	while (true) {
-
-		if (term) {		
-			printf(".");
-		} else {
-			printf(
-			#if defined(__linux__) || (__APPLE__)
-			"\e[32m\e[s%c\e[u\e[0m", star[ (staridx++ % 4) ]
-			#else
-			"."
-			#endif
-			);
-		}
-		fflush(stdout);
-		if (ukbhit()) {
-			int gc = getchar(); (void)gc;
-			return -1;
-			break;
-		}
-	
-		if (WaitForResponseTimeout(CMD_ACK, &resp, 500)) {
-			int32_t ok = resp.arg[0];
-			uint32_t nacks = resp.arg[1];
-			uint32_t auths = resp.arg[2];
-			PrintAndLogEx(NORMAL, "");
-			
-			if ( verbose ) {
-				PrintAndLogEx(SUCCESS, "num of auth requests  : %u", auths);
-				PrintAndLogEx(SUCCESS, "num of received NACK  : %u", nacks);
-			}
-			switch( ok ) {
-				case 99 : PrintAndLogEx(WARNING, "button pressed. Aborted."); return 0;
-				case 96 : 
-				case 98 : { 
-							if (verbose)
-								PrintAndLogEx(FAILED, "card random number generator is not predictable.");
-							PrintAndLogEx(WARNING, "detection failed");
-							return 2;
-						}
-				case 97 : {
-							if (verbose) {
-								PrintAndLogEx(FAILED, "card random number generator seems to be based on the well-known generating polynomial");
-								PrintAndLogEx(NORMAL, "[- ]with 16 effective bits only, but shows unexpected behavior, try again."); 
-								return 0;
-							}
-						}				
-				case  2 : PrintAndLogEx(SUCCESS, "always leak NACK detected"); return 3;
-				case  1 : PrintAndLogEx(SUCCESS, "NACK bug detected"); return 1;
-				case  0 : PrintAndLogEx(SUCCESS, "No NACK bug detected"); return 2;
-				default : PrintAndLogEx(WARNING, "errorcode from device [%i]", ok); return 0;
-			}
-			break;
-		}
-	}	
-	return 0;
-}
-/* try to see if card responses to "chinese magic backdoor" commands. */
-void detect_classic_magic(void) {
-	
-	uint8_t isGeneration = 0;
-	UsbCommand resp;
-	UsbCommand c = {CMD_MIFARE_CIDENT, {0, 0, 0}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	if (WaitForResponseTimeout(CMD_ACK, &resp, 1500))
-		isGeneration = resp.arg[0] & 0xff;
-	
-	switch( isGeneration ){
-		case 1: PrintAndLogEx(SUCCESS, "Answers to magic commands (GEN 1a): YES"); break;
-		case 2: PrintAndLogEx(SUCCESS, "Answers to magic commands (GEN 1b): YES"); break;
-		//case 4: PrintAndLogEx(SUCCESS, "Answers to magic commands (GEN 2): YES"); break;
-		default: PrintAndLogEx(INFO, "Answers to magic commands: NO"); break;
-	}		
+// Merlok, 2011, 2012
+// people from mifare@nethemba.com, 2010
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// mifare commands
+//-----------------------------------------------------------------------------
+#include "mifarehost.h"
+#include "cmdmain.h"
+
+int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
+	uint32_t uid = 0;
+	uint32_t nt = 0, nr = 0, ar = 0;
+	uint64_t par_list = 0, ks_list = 0;
+	uint64_t *keylist = NULL, *last_keylist = NULL;
+	uint32_t keycount = 0;
+	int16_t isOK = 0;
+	
+	UsbCommand c = {CMD_READER_MIFARE, {true, blockno, key_type}};
+
+	// message
+	PrintAndLogEx(NORMAL, "--------------------------------------------------------------------------------\n");
+	PrintAndLogEx(NORMAL, "executing Darkside attack. Expected execution time: 25sec on average");
+	PrintAndLogEx(NORMAL, "press pm3-button on the proxmark3 device to abort both proxmark3 and client.");
+	PrintAndLogEx(NORMAL, "--------------------------------------------------------------------------------\n");
+
+	while (true) {
+		clearCommandBuffer();
+		SendCommand(&c);
+
+		//flush queue
+		while (ukbhit()) { 
+			int gc = getchar(); (void)gc; 
+			return -5;
+		}
+		
+		// wait cycle
+		while (true) {
+			printf("."); fflush(stdout);
+			if (ukbhit()) {
+				int gc = getchar(); (void)gc;
+				return -5;
+			}
+
+			UsbCommand resp;
+			if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
+				isOK  = resp.arg[0];
+				if (isOK < 0) 
+					return isOK;
+				
+				uid = (uint32_t)bytes_to_num(resp.d.asBytes +  0, 4);
+				nt = (uint32_t)bytes_to_num(resp.d.asBytes +  4, 4);
+				par_list = bytes_to_num(resp.d.asBytes +  8, 8);
+				ks_list = bytes_to_num(resp.d.asBytes +  16, 8);
+				nr = (uint32_t)bytes_to_num(resp.d.asBytes + 24, 4);
+				ar = (uint32_t)bytes_to_num(resp.d.asBytes + 28, 4);
+				break;
+			}
+		}
+		PrintAndLogEx(NORMAL, "\n");
+		
+		if (par_list == 0 && c.arg[0] == true) {
+			PrintAndLogEx(SUCCESS, "Parity is all zero. Most likely this card sends NACK on every authentication.");
+		}
+		c.arg[0] = false;
+
+		keycount = nonce2key(uid, nt, nr, ar, par_list, ks_list, &keylist);
+
+		if (keycount == 0) {
+			PrintAndLogEx(FAILED, "key not found (lfsr_common_prefix list is null). Nt=%08x", nt);
+			PrintAndLogEx(FAILED, "this is expected to happen in 25%% of all cases. Trying again with a different reader nonce...");
+			continue;
+		}
+
+		// only parity zero attack
+		if (par_list == 0 ) {
+			qsort(keylist, keycount, sizeof(*keylist), compare_uint64);
+			keycount = intersection(last_keylist, keylist);
+			if (keycount == 0) {
+				free(last_keylist);
+				last_keylist = keylist;
+				PrintAndLogEx(FAILED, "no candidates found, trying again");
+				continue;
+			}
+		}
+
+		PrintAndLogEx(SUCCESS, "found %u candidate key%s\n", keycount, (keycount > 1) ? "s." : ".");
+
+		*key = -1;
+		uint8_t keyBlock[USB_CMD_DATA_SIZE];
+		int max_keys = USB_CMD_DATA_SIZE / 6;
+		for (int i = 0; i < keycount; i += max_keys) {
+			
+			int size = keycount - i > max_keys ? max_keys : keycount - i;
+			for (int j = 0; j < size; j++) {
+				if (par_list == 0) {
+					num_to_bytes(last_keylist[i*max_keys + j], 6, keyBlock+(j*6));
+				} else {
+					num_to_bytes(keylist[i*max_keys + j], 6, keyBlock+(j*6));
+				}
+			}
+			
+			if (!mfCheckKeys(blockno, key_type - 0x60, false, size, keyBlock, key)) {
+				break;
+			}
+		}
+		
+		if (*key != -1) {
+			break;
+		} else {
+			PrintAndLogEx(FAILED, "all candidate keys failed. Restarting darkside attack");
+			free(last_keylist);
+			last_keylist = keylist;
+			c.arg[0] = true;
+		}
+	}
+	free(last_keylist);
+	free(keylist);
+	return 0;
+}
+int mfCheckKeys(uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t keycnt, uint8_t * keyBlock, uint64_t * key){
+	*key = -1;	
+	UsbCommand c = {CMD_MIFARE_CHKKEYS, { (blockNo | (keyType << 8)), clear_trace, keycnt}};
+	memcpy(c.d.asBytes, keyBlock, 6 * keycnt);
+	clearCommandBuffer();
+	SendCommand(&c);
+	UsbCommand resp;
+	if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) return 1;
+	if ((resp.arg[0] & 0xff) != 0x01) return 2;
+	*key = bytes_to_num(resp.d.asBytes, 6);
+	return 0;
+}
+
+// Sends chunks of keys to device. 
+// 0 == ok all keys found
+// 1 == 
+// 2 == Time-out, aborting
+int mfCheckKeys_fast( uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk, uint8_t strategy,
+						uint32_t size, uint8_t *keyBlock, sector_t *e_sector, bool use_flashmemory) {
+
+	uint64_t t2 = msclock();
+	uint32_t timeout = 0;
+
+	// send keychunk		
+	UsbCommand c = {CMD_MIFARE_CHKKEYS_FAST, { (sectorsCnt | (firstChunk << 8) | (lastChunk << 12) ), ((use_flashmemory << 8) | strategy), size}};	
+	memcpy(c.d.asBytes, keyBlock, 6 * size);
+	clearCommandBuffer();
+	SendCommand(&c);
+	UsbCommand resp;
+
+	while ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
+		timeout++;
+		printf("."); fflush(stdout);
+		// max timeout for one chunk of 85keys, 60*3sec = 180seconds
+		// s70 with 40*2 keys to check, 80*85 = 6800 auth.
+		// takes about 97s, still some margin before abort
+		if (timeout > 180) {
+			PrintAndLogEx(WARNING, "\nno response from Proxmark. Aborting...");
+			return 2;
+		}
+	}
+	t2 = msclock() - t2;
+
+	// time to convert the returned data.
+	uint8_t curr_keys = resp.arg[0];
+
+	PrintAndLogEx(SUCCESS, "\nChunk: %.1fs | found %u/%u keys (%u)", (float)(t2/1000.0), curr_keys, (sectorsCnt<<1), size);
+		
+	// all keys?		
+	if ( curr_keys == sectorsCnt*2 || lastChunk ) {
+		
+		// success array. each byte is status of key 
+		uint8_t arr[80];
+		uint64_t foo = 0;
+		uint16_t bar = 0;
+		foo = bytes_to_num(resp.d.asBytes+480, 8);
+		bar = (resp.d.asBytes[489]  << 8 | resp.d.asBytes[488]);
+
+		for (uint8_t i = 0; i < 64; i++)
+			arr[i] = (foo >> i) & 0x1;
+	
+		for (uint8_t i = 0; i < 16; i++)
+			arr[i+64] = (bar >> i) & 0x1;
+		
+		// initialize storage for found keys
+		icesector_t *tmp = calloc(sectorsCnt, sizeof(icesector_t));
+		if (tmp == NULL)
+			return 1;
+		memcpy(tmp, resp.d.asBytes, sectorsCnt * sizeof(icesector_t) );
+
+		for ( int i = 0; i < sectorsCnt; i++) {
+			// key A
+			if ( !e_sector[i].foundKey[0] ) {
+				e_sector[i].Key[0] =  bytes_to_num( tmp[i].keyA, 6);
+				e_sector[i].foundKey[0] = arr[ (i*2) ];
+			}
+			// key B
+			if ( !e_sector[i].foundKey[1] ) {
+				e_sector[i].Key[1] =  bytes_to_num( tmp[i].keyB, 6);
+				e_sector[i].foundKey[1] = arr[ (i*2) + 1 ];
+			}
+		}
+		free(tmp);
+		
+		if ( curr_keys == sectorsCnt*2 )
+			return 0;
+		if ( lastChunk )
+			return 1;
+	}
+	return 1;
+}
+
+// PM3 imp of J-Run mf_key_brute (part 2)
+// ref: https://github.com/J-Run/mf_key_brute
+int mfKeyBrute(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint64_t *resultkey){
+
+	#define KEYS_IN_BLOCK 85
+	#define KEYBLOCK_SIZE 510
+	#define CANDIDATE_SIZE 0xFFFF * 6
+	uint8_t found = false;
+	uint64_t key64 = 0;
+	uint8_t candidates[CANDIDATE_SIZE] = {0x00};
+	uint8_t keyBlock[KEYBLOCK_SIZE] = {0x00};
+
+	memset(candidates, 0, sizeof(candidates));
+	memset(keyBlock, 0, sizeof(keyBlock));
+	
+	// Generate all possible keys for the first two unknown bytes.
+	for (uint16_t i = 0; i < 0xFFFF; ++i) {		
+		uint32_t j = i * 6;		
+		candidates[0 + j] = i >> 8;	
+		candidates[1 + j] = i;
+		candidates[2 + j] = key[2];
+		candidates[3 + j] = key[3];
+		candidates[4 + j] = key[4];
+		candidates[5 + j] = key[5];
+	}
+	uint32_t counter, i;
+	for ( i = 0, counter = 1; i < CANDIDATE_SIZE; i += KEYBLOCK_SIZE, ++counter){
+
+		key64 = 0;
+		
+		// copy candidatekeys to test key block
+		memcpy(keyBlock, candidates + i, KEYBLOCK_SIZE);
+
+		// check a block of generated candidate keys.
+		if (!mfCheckKeys(blockNo, keyType, true, KEYS_IN_BLOCK, keyBlock, &key64)) {
+			*resultkey = key64;
+			found = true;
+			break;
+		}
+		
+		// progress 
+		if ( counter % 20 == 0 )
+			PrintAndLogEx(SUCCESS, "tried : %s.. \t %u keys", sprint_hex(candidates + i, 6),  counter * KEYS_IN_BLOCK  );
+	}
+	return found;
+}
+
+// Compare 16 Bits out of cryptostate
+int Compare16Bits(const void * a, const void * b) {
+	if ((*(uint64_t*)b & 0x00ff000000ff0000) == (*(uint64_t*)a & 0x00ff000000ff0000)) return 0;
+	if ((*(uint64_t*)b & 0x00ff000000ff0000) > (*(uint64_t*)a & 0x00ff000000ff0000)) return 1;
+	return -1;
+}
+
+// wrapper function for multi-threaded lfsr_recovery32
+void
+#ifdef __has_attribute
+#if __has_attribute(force_align_arg_pointer)
+__attribute__((force_align_arg_pointer)) 
+#endif
+#endif
+*nested_worker_thread(void *arg) {
+	struct Crypto1State *p1;
+	StateList_t *statelist = arg;
+	statelist->head.slhead = lfsr_recovery32(statelist->ks1, statelist->nt ^ statelist->uid);	
+	
+	for (p1 = statelist->head.slhead; *(uint64_t *)p1 != 0; p1++) {};
+	
+	statelist->len = p1 - statelist->head.slhead;
+	statelist->tail.sltail = --p1;
+	qsort(statelist->head.slhead, statelist->len, sizeof(uint64_t), Compare16Bits);
+	
+	return statelist->head.slhead;
+}
+
+int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t * resultKey, bool calibrate) {
+	uint16_t i;
+	uint32_t uid;
+	UsbCommand resp;
+	StateList_t statelists[2];
+	struct Crypto1State *p1, *p2, *p3, *p4;
+	
+	UsbCommand c = {CMD_MIFARE_NESTED, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, calibrate}};
+	memcpy(c.d.asBytes, key, 6);
+	clearCommandBuffer();
+	SendCommand(&c);
+	if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return -1;
+
+	// error during nested
+	if (resp.arg[0]) return resp.arg[0];
+	
+	memcpy(&uid, resp.d.asBytes, 4);
+		
+	for (i = 0; i < 2; i++) {
+		statelists[i].blockNo = resp.arg[2] & 0xff;
+		statelists[i].keyType = (resp.arg[2] >> 8) & 0xff;
+		statelists[i].uid = uid;
+		memcpy(&statelists[i].nt,  (void *)(resp.d.asBytes + 4 + i * 8 + 0), 4);
+		memcpy(&statelists[i].ks1, (void *)(resp.d.asBytes + 4 + i * 8 + 4), 4);
+	}
+	
+	// calc keys	
+	pthread_t thread_id[2];
+		
+	// create and run worker threads
+	for (i = 0; i < 2; i++)
+		pthread_create(thread_id + i, NULL, nested_worker_thread, &statelists[i]);
+
+	// wait for threads to terminate:
+	for (i = 0; i < 2; i++)
+		pthread_join(thread_id[i], (void*)&statelists[i].head.slhead);
+
+	// the first 16 Bits of the cryptostate already contain part of our key.
+	// Create the intersection of the two lists based on these 16 Bits and
+	// roll back the cryptostate
+	p1 = p3 = statelists[0].head.slhead; 
+	p2 = p4 = statelists[1].head.slhead;
+
+	while (p1 <= statelists[0].tail.sltail && p2 <= statelists[1].tail.sltail) {
+		if (Compare16Bits(p1, p2) == 0) {
+			
+			struct Crypto1State savestate, *savep = &savestate;
+			savestate = *p1;
+			while(Compare16Bits(p1, savep) == 0 && p1 <= statelists[0].tail.sltail) {
+				*p3 = *p1;
+				lfsr_rollback_word(p3, statelists[0].nt ^ statelists[0].uid, 0);
+				p3++;
+				p1++;
+			}
+			savestate = *p2;
+			while(Compare16Bits(p2, savep) == 0 && p2 <= statelists[1].tail.sltail) {
+				*p4 = *p2;
+				lfsr_rollback_word(p4, statelists[1].nt ^ statelists[1].uid, 0);
+				p4++;
+				p2++;
+			}
+		}
+		else {
+			while (Compare16Bits(p1, p2) == -1) p1++;
+			while (Compare16Bits(p1, p2) == 1) p2++;
+		}
+	}
+
+	*(uint64_t*)p3 = -1;
+	*(uint64_t*)p4 = -1;
+	statelists[0].len = p3 - statelists[0].head.slhead;
+	statelists[1].len = p4 - statelists[1].head.slhead;
+	statelists[0].tail.sltail = --p3;
+	statelists[1].tail.sltail = --p4;
+
+	// the statelists now contain possible keys. The key we are searching for must be in the
+	// intersection of both lists
+	qsort(statelists[0].head.keyhead, statelists[0].len, sizeof(uint64_t), compare_uint64);
+	qsort(statelists[1].head.keyhead, statelists[1].len, sizeof(uint64_t), compare_uint64);
+	// Create the intersection
+	statelists[0].len = intersection(statelists[0].head.keyhead, statelists[1].head.keyhead);
+
+	//statelists[0].tail.keytail = --p7;
+	uint32_t keycnt = statelists[0].len;
+	if ( keycnt == 0 ) goto out;
+
+	memset(resultKey, 0, 6);
+	uint64_t key64 = -1;
+
+	// The list may still contain several key candidates. Test each of them with mfCheckKeys
+	uint32_t max_keys = keycnt > (USB_CMD_DATA_SIZE/6) ? (USB_CMD_DATA_SIZE/6) : keycnt;
+	uint8_t keyBlock[USB_CMD_DATA_SIZE] = {0x00};
+
+	for (int i = 0; i < keycnt; i += max_keys) {
+		
+		int size = keycnt - i > max_keys ? max_keys : keycnt - i;
+	
+		for (int j = 0; j < size; j++) {
+			crypto1_get_lfsr(statelists[0].head.slhead + i, &key64);
+			num_to_bytes(key64, 6, keyBlock + i * 6);
+		}
+		
+		if (!mfCheckKeys(statelists[0].blockNo, statelists[0].keyType, false, size, keyBlock, &key64)) {		
+			free(statelists[0].head.slhead);
+			free(statelists[1].head.slhead);
+			num_to_bytes(key64, 6, resultKey);
+
+			PrintAndLogEx(SUCCESS, "target block:%3u key type: %c  -- found valid key [%012" PRIx64 "]",
+				(uint16_t)resp.arg[2] & 0xff,
+				(resp.arg[2] >> 8) ? 'B' : 'A',
+				key64
+			);
+			return -5;
+		}		
+	}
+	
+out:
+	PrintAndLogEx(SUCCESS, "target block:%3u key type: %c",
+			(uint16_t)resp.arg[2] & 0xff,
+			(resp.arg[2] >> 8) ? 'B' : 'A'
+	);	
+
+	free(statelists[0].head.slhead);
+	free(statelists[1].head.slhead);
+	return -4;
+}
+
+// MIFARE
+int mfReadSector(uint8_t sectorNo, uint8_t keyType, uint8_t *key, uint8_t *data) {
+	
+	UsbCommand c = {CMD_MIFARE_READSC, {sectorNo, keyType, 0}};
+	memcpy(c.d.asBytes, key, 6);
+	clearCommandBuffer();
+	SendCommand(&c);
+
+	UsbCommand resp;
+	if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
+		uint8_t isOK  = resp.arg[0] & 0xff;
+
+		if (isOK) {
+			memcpy(data, resp.d.asBytes, mfNumBlocksPerSector(sectorNo) * 16);
+			return 0;
+		} else {
+			return 1;
+		}
+	} else {
+		PrintAndLogEx(ERR, "Command execute timeout");
+		return 2;
+	}
+	
+	return 0;
+}
+
+// EMULATOR
+int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount) {
+	UsbCommand c = {CMD_MIFARE_EML_MEMGET, {blockNum, blocksCount, 0}};
+	clearCommandBuffer();
+ 	SendCommand(&c);
+	UsbCommand resp;
+	if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return 1;
+	memcpy(data, resp.d.asBytes, blocksCount * 16);
+	return 0;
+}
+
+int mfEmlSetMem(uint8_t *data, int blockNum, int blocksCount) {
+	return mfEmlSetMem_xt(data, blockNum, blocksCount, 16);
+}
+
+int mfEmlSetMem_xt(uint8_t *data, int blockNum, int blocksCount, int blockBtWidth) {
+	UsbCommand c = {CMD_MIFARE_EML_MEMSET, {blockNum, blocksCount, blockBtWidth}};
+	memcpy(c.d.asBytes, data, blocksCount * blockBtWidth); 
+	clearCommandBuffer();
+	SendCommand(&c);
+	return 0;
+}
+
+// "MAGIC" CARD
+int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, uint8_t wipecard) {
+
+	uint8_t params = MAGIC_SINGLE;
+	uint8_t block0[16];
+	memset(block0, 0x00, sizeof(block0));
+
+	int old = mfCGetBlock(0, block0, params);
+	if (old == 0)
+		PrintAndLogEx(SUCCESS, "old block 0:  %s", sprint_hex(block0, sizeof(block0)));
+	else 
+		PrintAndLogEx(FAILED, "couldn't get old data. Will write over the last bytes of Block 0.");	
+
+	// fill in the new values
+	// UID
+	memcpy(block0, uid, 4); 
+	// Mifare UID BCC
+	block0[4] = block0[0] ^ block0[1] ^ block0[2] ^ block0[3];
+	// mifare classic SAK(byte 5) and ATQA(byte 6 and 7, reversed)
+	if ( sak != NULL )
+		block0[5] = sak[0];
+	
+	if ( atqa != NULL ) {
+		block0[6] = atqa[1];
+		block0[7] = atqa[0];
+	}
+	PrintAndLogEx(SUCCESS, "new block 0:  %s", sprint_hex(block0,16));
+	
+	if ( wipecard )		 params |= MAGIC_WIPE;	
+	if ( oldUID == NULL) params |= MAGIC_UID;
+	
+	return mfCSetBlock(0, block0, oldUID, params);
+}
+
+int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, uint8_t params) {
+
+	uint8_t isOK = 0;
+	UsbCommand c = {CMD_MIFARE_CSETBLOCK, {params, blockNo, 0}};
+	memcpy(c.d.asBytes, data, 16); 
+	clearCommandBuffer();
+	SendCommand(&c);
+	UsbCommand resp;
+	if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
+		isOK  = resp.arg[0] & 0xff;
+		if (uid != NULL) 
+			memcpy(uid, resp.d.asBytes, 4);
+		if (!isOK) 
+			return 2;
+	} else {
+		PrintAndLogEx(WARNING, "command execute timeout");
+		return 1;
+	}
+	return 0;
+}
+
+int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params) {
+	uint8_t isOK = 0;
+	UsbCommand c = {CMD_MIFARE_CGETBLOCK, {params, blockNo, 0}};	
+	clearCommandBuffer();
+	SendCommand(&c);
+	UsbCommand resp;
+	if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
+		isOK  = resp.arg[0] & 0xff;
+		if (!isOK) 
+			return 2;		
+		memcpy(data, resp.d.asBytes, 16);
+	} else {
+		PrintAndLogEx(WARNING, "command execute timeout");
+		return 1;
+	}
+	return 0;
+}
+
+// SNIFFER
+// [iceman] so many global variables....
+
+// constants
+static uint8_t trailerAccessBytes[4] = {0x08, 0x77, 0x8F, 0x00};
+
+// variables
+char logHexFileName[FILE_PATH_SIZE] = {0x00};
+static uint8_t traceCard[4096] = {0x00};
+static char traceFileName[FILE_PATH_SIZE] = {0x00};
+static int traceState = TRACE_IDLE;
+static uint8_t traceCurBlock = 0;
+static uint8_t traceCurKey = 0;
+
+struct Crypto1State *traceCrypto1 = NULL;
+struct Crypto1State *revstate = NULL;
+uint64_t key = 0;
+uint32_t ks2 = 0;
+uint32_t ks3 = 0;
+
+uint32_t cuid = 0;    // uid part used for crypto1.
+uint32_t nt = 0;      // tag challenge
+uint32_t nr_enc = 0;  // encrypted reader challenge
+uint32_t ar_enc = 0;  // encrypted reader response
+uint32_t at_enc = 0;  // encrypted tag response
+
+int isTraceCardEmpty(void) {
+	return ((traceCard[0] == 0) && (traceCard[1] == 0) && (traceCard[2] == 0) && (traceCard[3] == 0));
+}
+
+int isBlockEmpty(int blockN) {
+	for (int i = 0; i < 16; i++) 
+		if (traceCard[blockN * 16 + i] != 0) return 0;
+
+	return 1;
+}
+
+int isBlockTrailer(int blockN) {
+	return ((blockN & 0x03) == 0x03);
+}
+
+int loadTraceCard(uint8_t *tuid, uint8_t uidlen) {
+	FILE * f;
+	char buf[64] = {0x00};
+	uint8_t buf8[64] = {0x00};
+	int i, blockNum;
+	uint32_t tmp;
+	
+	if (!isTraceCardEmpty()) 
+		saveTraceCard();
+		
+	memset(traceCard, 0x00, 4096);
+	memcpy(traceCard, tuid, uidlen);
+
+	FillFileNameByUID(traceFileName, tuid, ".eml", uidlen);
+
+	f = fopen(traceFileName, "r");
+	if (!f) return 1;
+	
+	blockNum = 0;
+		
+	while (!feof(f)){
+	
+		memset(buf, 0, sizeof(buf));
+		if (fgets(buf, sizeof(buf), f) == NULL) {
+			PrintAndLogEx(FAILED, "No trace file found or reading error.");
+			if (f) {
+				fclose(f);
+			}
+			return 2;
+		}
+
+		if (strlen(buf) < 32){
+			if (feof(f)) break;
+			PrintAndLogEx(FAILED, "File content error. Block data must include 32 HEX symbols");
+			if (f) {
+				fclose(f);
+			}
+			return 2;
+		}
+		for (i = 0; i < 32; i += 2) {
+			sscanf(&buf[i], "%02X", &tmp);
+			buf8[i / 2] = tmp & 0xFF;
+		}
+
+		memcpy(traceCard + blockNum * 16, buf8, 16);
+
+		blockNum++;
+	}
+	if (f) {
+		fclose(f);
+	}
+	return 0;
+}
+
+int saveTraceCard(void) {
+	
+	if ((!strlen(traceFileName)) || (isTraceCardEmpty())) return 0;
+	
+	FILE * f;
+	f = fopen(traceFileName, "w+");
+	if ( !f ) return 1;
+
+	// given 4096 tracecard size,  these loop will only match a 1024, 1kb card memory
+	// 4086/16 == 256blocks. 
+	for (uint16_t i = 0; i < 256; i++) {  // blocks
+		for (uint8_t j = 0; j < 16; j++)  // bytes
+			fprintf(f, "%02X", *(traceCard + i * 16 + j)); 
+			
+		// no extra line in the end
+		if ( i < 255 )
+			fprintf(f, "\n");
+	}
+	fflush(f);
+	fclose(f);
+	return 0;
+}
+//
+int mfTraceInit(uint8_t *tuid, uint8_t uidlen, uint8_t *atqa, uint8_t sak, bool wantSaveToEmlFile) {
+
+	if (traceCrypto1) 
+		crypto1_destroy(traceCrypto1);
+
+	traceCrypto1 = NULL;
+
+	if (wantSaveToEmlFile) 
+		loadTraceCard(tuid, uidlen);
+		
+	traceCard[4] = traceCard[0] ^ traceCard[1] ^ traceCard[2] ^ traceCard[3];
+	traceCard[5] = sak;
+	memcpy(&traceCard[6], atqa, 2);
+	traceCurBlock = 0;
+	cuid = bytes_to_num(tuid + (uidlen-4), 4);
+	traceState = TRACE_IDLE;
+	return 0;
+}
+
+void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len, bool isEncrypted){
+	uint8_t	bt = 0;
+	int i;
+	
+	if (len != 1) {
+		for (i = 0; i < len; i++)
+			data[i] = crypto1_byte(pcs, 0x00, isEncrypted) ^ data[i];
+	} else {
+		bt = 0;		
+		bt |= (crypto1_bit(pcs, 0, isEncrypted) ^ BIT(data[0], 0)) << 0;
+		bt |= (crypto1_bit(pcs, 0, isEncrypted) ^ BIT(data[0], 1)) << 1;
+		bt |= (crypto1_bit(pcs, 0, isEncrypted) ^ BIT(data[0], 2)) << 2;
+		bt |= (crypto1_bit(pcs, 0, isEncrypted) ^ BIT(data[0], 3)) << 3;			
+		data[0] = bt;
+	}
+}
+
+int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
+
+	if (traceState == TRACE_ERROR)
+		return 1;
+
+	if (len > 255) {
+		traceState = TRACE_ERROR;
+		return 1;
+	}
+	
+	uint8_t data[255];
+	memset(data, 0x00, sizeof(data));
+	
+	memcpy(data, data_src, len);
+	
+	if ((traceCrypto1) && ((traceState == TRACE_IDLE) || (traceState > TRACE_AUTH_OK))) {
+		mf_crypto1_decrypt(traceCrypto1, data, len, 0);
+		PrintAndLogEx(NORMAL, "DEC| %s", sprint_hex(data, len));
+		AddLogHex(logHexFileName, "DEC| ", data, len); 
+	}
+	
+	switch (traceState) {
+	case TRACE_IDLE: 
+		// check packet crc16!
+		if ((len >= 4) && (!check_crc(CRC_14443_A, data, len))) {
+			PrintAndLogEx(NORMAL, "DEC| CRC ERROR!!!");
+			AddLogLine(logHexFileName, "DEC| ", "CRC ERROR!!!"); 
+			traceState = TRACE_ERROR;  // do not decrypt the next commands
+			return 1;
+		}
+		
+		// AUTHENTICATION
+		if ((len == 4) && ((data[0] == MIFARE_AUTH_KEYA) || (data[0] == MIFARE_AUTH_KEYB))) {
+			traceState = TRACE_AUTH1;
+			traceCurBlock = data[1];
+			traceCurKey = data[0] == 60 ? 1:0;
+			return 0;
+		}
+
+		// READ
+		if ((len == 4) && ((data[0] == ISO14443A_CMD_READBLOCK))) {
+			traceState = TRACE_READ_DATA;
+			traceCurBlock = data[1];
+			return 0;
+		}
+
+		// WRITE
+		if ((len == 4) && ((data[0] == ISO14443A_CMD_WRITEBLOCK))) {
+			traceState = TRACE_WRITE_OK;
+			traceCurBlock = data[1];
+			return 0;
+		}
+
+		// HALT
+		if ((len == 4) && ((data[0] == ISO14443A_CMD_HALT) && (data[1] == 0x00))) {
+			traceState = TRACE_ERROR;  // do not decrypt the next commands
+			return 0;
+		}
+		return 0;
+
+	case TRACE_READ_DATA: 
+		if (len == 18) {
+			traceState = TRACE_IDLE;
+
+			if (isBlockTrailer(traceCurBlock)) {
+				memcpy(traceCard + traceCurBlock * 16 + 6, data + 6, 4);
+			} else {
+				memcpy(traceCard + traceCurBlock * 16, data, 16);
+			}
+			if (wantSaveToEmlFile) saveTraceCard();
+			return 0;
+		} else {
+			traceState = TRACE_ERROR;
+			return 1;
+		}
+		break;
+	case TRACE_WRITE_OK: 
+		if ((len == 1) && (data[0] == 0x0a)) {
+			traceState = TRACE_WRITE_DATA;
+			return 0;
+		} else {
+			traceState = TRACE_ERROR;
+			return 1;
+		}
+		break;
+	case TRACE_WRITE_DATA: 
+		if (len == 18) {
+			traceState = TRACE_IDLE;
+			memcpy(traceCard + traceCurBlock * 16, data, 16);
+			if (wantSaveToEmlFile) saveTraceCard();
+			return 0;
+		} else {
+			traceState = TRACE_ERROR;
+			return 1;
+		}
+		break;
+	case TRACE_AUTH1: 
+		if (len == 4) {
+			traceState = TRACE_AUTH2;
+			nt = bytes_to_num(data, 4);
+			return 0;
+		} else {
+			traceState = TRACE_ERROR;
+			return 1;
+		}
+		break;
+	case TRACE_AUTH2: 
+		if (len == 8) {
+			traceState = TRACE_AUTH_OK;
+			nr_enc = bytes_to_num(data, 4);
+			ar_enc = bytes_to_num(data + 4, 4);
+			return 0;
+		} else {
+			traceState = TRACE_ERROR;
+			return 1;
+		}
+		break;
+	case TRACE_AUTH_OK: 
+		if (len == 4) {
+			traceState = TRACE_IDLE;
+			at_enc = bytes_to_num(data, 4);
+			
+			//  mfkey64 recover key.
+			ks2 = ar_enc ^ prng_successor(nt, 64);
+			ks3 = at_enc ^ prng_successor(nt, 96);
+			revstate = lfsr_recovery64(ks2, ks3);
+			lfsr_rollback_word(revstate, 0, 0);
+			lfsr_rollback_word(revstate, 0, 0);
+			lfsr_rollback_word(revstate, nr_enc, 1);
+			lfsr_rollback_word(revstate, cuid ^ nt, 0);
+			crypto1_get_lfsr(revstate, &key);
+			PrintAndLogEx(SUCCESS, "found Key: [%012" PRIx64 "]", key);
+			
+			//if ( tryMfk64(cuid, nt, nr_enc, ar_enc, at_enc, &key) )
+			AddLogUint64(logHexFileName, "Found Key: ", key); 
+			
+			int blockShift = ((traceCurBlock & 0xFC) + 3) * 16;
+			if (isBlockEmpty((traceCurBlock & 0xFC) + 3)) 
+				memcpy(traceCard + blockShift + 6, trailerAccessBytes, 4);
+			
+			// keytype A/B
+			if (traceCurKey)
+				num_to_bytes(key, 6, traceCard + blockShift + 10);
+			else
+				num_to_bytes(key, 6, traceCard + blockShift);
+			
+			if (wantSaveToEmlFile)
+				saveTraceCard();
+
+			if (traceCrypto1)
+				crypto1_destroy(traceCrypto1);
+			
+			// set cryptosystem state
+			traceCrypto1 = lfsr_recovery64(ks2, ks3);			
+
+		} else {
+			PrintAndLogEx(NORMAL, "[!] nested key recovery not implemented!\n");
+			at_enc = bytes_to_num(data, 4);
+			crypto1_destroy(traceCrypto1);			
+			traceState = TRACE_ERROR;
+		}
+		break;
+	default: 
+		traceState = TRACE_ERROR;
+		return 1;
+	}
+	return 0;
+}
+
+int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t *data, int len){
+	PrintAndLogEx(SUCCESS, "\nencrypted data: [%s]", sprint_hex(data, len) );
+	struct Crypto1State *s;
+	ks2 = ar_enc ^ prng_successor(nt, 64);
+	ks3 = at_enc ^ prng_successor(nt, 96);
+	s = lfsr_recovery64(ks2, ks3);
+	mf_crypto1_decrypt(s, data, len, false);
+	PrintAndLogEx(SUCCESS, "decrypted data: [%s]", sprint_hex(data, len) );
+	crypto1_destroy(s);
+	return 0;
+}
+
+/* Detect Tag Prng, 
+* function performs a partial AUTH,  where it tries to authenticate against block0, key A, but only collects tag nonce.
+* the tag nonce is check to see if it has a predictable PRNG.
+* @returns 
+*	TRUE if tag uses WEAK prng (ie Now the NACK bug also needs to be present for Darkside attack)
+*   FALSE is tag uses HARDEND prng (ie hardnested attack possible, with known key)
+*/
+int detect_classic_prng(void){
+
+	UsbCommand resp, respA;	
+	uint8_t cmd[] = {MIFARE_AUTH_KEYA, 0x00};
+	uint32_t flags = ISO14A_CONNECT | ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_RATS;
+	
+	UsbCommand c = {CMD_READER_ISO_14443a, {flags, sizeof(cmd), 0}};
+	memcpy(c.d.asBytes, cmd, sizeof(cmd));
+
+	clearCommandBuffer();
+	SendCommand(&c);					
+	
+	if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
+        PrintAndLogEx(WARNING, "PRNG UID: Reply timeout.");
+		return -1;
+	}
+		
+	// if select tag failed.
+	if ( resp.arg[0] == 0 ) {
+		PrintAndLogEx(WARNING, "error:  selecting tag failed,  can't detect prng\n");
+		return -2;
+	}
+	if (!WaitForResponseTimeout(CMD_ACK, &respA, 2500)) {
+        PrintAndLogEx(WARNING, "PRNG data: Reply timeout.");
+		return -3;
+	}
+
+	// check respA
+	if (respA.arg[0] != 4) {
+		PrintAndLogEx(WARNING, "PRNG data error: Wrong length: %d", respA.arg[0]);
+		return -4;
+	}			
+
+	uint32_t nonce = bytes_to_num(respA.d.asBytes, respA.arg[0]);
+	return validate_prng_nonce(nonce);
+}
+/* Detect Mifare Classic NACK bug 
+
+returns:
+0 = error during test / aborted
+1 = has nack bug
+2 = has not nack bug
+3 = always leak nacks  (clones)
+*/
+int detect_classic_nackbug(bool verbose){
+	
+	UsbCommand c = {CMD_MIFARE_NACK_DETECT, {0, 0, 0}};
+	clearCommandBuffer();
+	SendCommand(&c);
+	UsbCommand resp;
+	
+	if ( verbose )
+		PrintAndLogEx(SUCCESS, "press pm3-button on the proxmark3 device to abort both proxmark3 and client.\n");
+	
+	// for nice animation	
+	bool term = !isatty(STDIN_FILENO);
+#if defined(__linux__) || (__APPLE__)
+	char star[] = {'-', '\\', '|', '/'};
+	uint8_t staridx = 0;	
+#endif 
+
+	while (true) {
+
+		if (term) {		
+			printf(".");
+		} else {
+			printf(
+			#if defined(__linux__) || (__APPLE__)
+			"\e[32m\e[s%c\e[u\e[0m", star[ (staridx++ % 4) ]
+			#else
+			"."
+			#endif
+			);
+		}
+		fflush(stdout);
+		if (ukbhit()) {
+			int gc = getchar(); (void)gc;
+			return -1;
+			break;
+		}
+	
+		if (WaitForResponseTimeout(CMD_ACK, &resp, 500)) {
+			int32_t ok = resp.arg[0];
+			uint32_t nacks = resp.arg[1];
+			uint32_t auths = resp.arg[2];
+			PrintAndLogEx(NORMAL, "");
+			
+			if ( verbose ) {
+				PrintAndLogEx(SUCCESS, "num of auth requests  : %u", auths);
+				PrintAndLogEx(SUCCESS, "num of received NACK  : %u", nacks);
+			}
+			switch( ok ) {
+				case 99 : PrintAndLogEx(WARNING, "button pressed. Aborted."); return 0;
+				case 96 : 
+				case 98 : { 
+							if (verbose)
+								PrintAndLogEx(FAILED, "card random number generator is not predictable.");
+							PrintAndLogEx(WARNING, "detection failed");
+							return 2;
+						}
+				case 97 : {
+							if (verbose) {
+								PrintAndLogEx(FAILED, "card random number generator seems to be based on the well-known generating polynomial");
+								PrintAndLogEx(NORMAL, "[- ]with 16 effective bits only, but shows unexpected behavior, try again."); 
+								return 0;
+							}
+						}				
+				case  2 : PrintAndLogEx(SUCCESS, "always leak NACK detected"); return 3;
+				case  1 : PrintAndLogEx(SUCCESS, "NACK bug detected"); return 1;
+				case  0 : PrintAndLogEx(SUCCESS, "No NACK bug detected"); return 2;
+				default : PrintAndLogEx(WARNING, "errorcode from device [%i]", ok); return 0;
+			}
+			break;
+		}
+	}	
+	return 0;
+}
+/* try to see if card responses to "chinese magic backdoor" commands. */
+void detect_classic_magic(void) {
+	
+	uint8_t isGeneration = 0;
+	UsbCommand resp;
+	UsbCommand c = {CMD_MIFARE_CIDENT, {0, 0, 0}};
+	clearCommandBuffer();
+	SendCommand(&c);
+	if (WaitForResponseTimeout(CMD_ACK, &resp, 1500))
+		isGeneration = resp.arg[0] & 0xff;
+	
+	switch( isGeneration ){
+		case 1: PrintAndLogEx(SUCCESS, "Answers to magic commands (GEN 1a): YES"); break;
+		case 2: PrintAndLogEx(SUCCESS, "Answers to magic commands (GEN 1b): YES"); break;
+		//case 4: PrintAndLogEx(SUCCESS, "Answers to magic commands (GEN 2): YES"); break;
+		default: PrintAndLogEx(INFO, "Answers to magic commands: NO"); break;
+	}		
 }
\ No newline at end of file
diff --git a/client/mifarehost.h b/client/mifare/mifarehost.h
similarity index 97%
rename from client/mifarehost.h
rename to client/mifare/mifarehost.h
index 69458fdfa..c0633bd35 100644
--- a/client/mifarehost.h
+++ b/client/mifare/mifarehost.h
@@ -1,103 +1,103 @@
-// Merlok, 2011
-// people from mifare@nethemba.com, 2010
-//
-// This code is licensed to you under the terms of the GNU GPL, version 2 or,
-// at your option, any later version. See the LICENSE.txt file for the text of
-// the license.
-//-----------------------------------------------------------------------------
-// High frequency ISO14443A commands
-//-----------------------------------------------------------------------------
-#ifndef __MIFARE_HOST_H
-#define __MIFARE_HOST_H
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <pthread.h>
-
-#include "proxmark3.h"	// time_t
-#include "common.h"
-#include "util.h"		// FILE_PATH_SIZE
-#include "ui.h"			// PrintAndLog...
-#include "crapto1/crapto1.h"
-#include "crc16.h"
-#include "protocols.h"
-#include "mifare.h"
-#include "mfkey.h"
-#include "util_posix.h"  // msclock
-
-#define MIFARE_SECTOR_RETRY     10
-
-// mifare tracer flags
-#define TRACE_IDLE		 		0x00
-#define TRACE_AUTH1		 		0x01
-#define TRACE_AUTH2		 		0x02
-#define TRACE_AUTH_OK	 		0x03
-#define TRACE_READ_DATA 		0x04
-#define TRACE_WRITE_OK			0x05
-#define TRACE_WRITE_DATA		0x06
-#define TRACE_ERROR		 		0xFF
-
-typedef struct {
-		union {
-			struct Crypto1State *slhead;
-			uint64_t *keyhead;
-		} head;
-		union {
-			struct Crypto1State *sltail;
-			uint64_t *keytail;
-		} tail;
-		uint32_t len;
-		uint32_t uid;
-		uint32_t blockNo;
-		uint32_t keyType;
-		uint32_t nt;
-		uint32_t ks1;
-} StateList_t;
-	
-typedef struct {
-	uint64_t Key[2];
-	uint8_t foundKey[2];
-} sector_t;
-
-typedef struct {
-	uint8_t keyA[6];
-	uint8_t keyB[6];
-	//uint8_t foundKey[2];
-} icesector_t;
-
-extern char logHexFileName[FILE_PATH_SIZE];
-
-extern int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key);
-extern int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t * ResultKeys, bool calibrate);
-extern int mfCheckKeys (uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t keycnt, uint8_t * keyBlock, uint64_t * key);
-extern int mfCheckKeys_fast( uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk,
-						uint8_t strategy, uint32_t size, uint8_t *keyBlock, sector_t *e_sector, bool use_flashmemory);
-extern int mfKeyBrute(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint64_t *resultkey);
-
-extern int mfReadSector(uint8_t sectorNo, uint8_t keyType, uint8_t *key, uint8_t *data);
-
-extern int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount);
-extern int mfEmlSetMem(uint8_t *data, int blockNum, int blocksCount);
-extern int mfEmlSetMem_xt(uint8_t *data, int blockNum, int blocksCount, int blockBtWidth);
-
-extern int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, uint8_t wipecard);
-extern int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, uint8_t params);
-extern int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params);
-
-extern int mfTraceInit(uint8_t *tuid, uint8_t uidlen, uint8_t *atqa, uint8_t sak, bool wantSaveToEmlFile);
-extern int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile);
-
-extern int isTraceCardEmpty(void);
-extern int isBlockEmpty(int blockN);
-extern int isBlockTrailer(int blockN);
-extern int loadTraceCard(uint8_t *tuid, uint8_t uidlen);
-extern int saveTraceCard(void);
-extern int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t *data, int len);
-
-extern int detect_classic_prng(void);
-extern int detect_classic_nackbug(bool verbose);
-extern void detect_classic_magic(void);
-extern void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len, bool isEncrypted);
+// Merlok, 2011
+// people from mifare@nethemba.com, 2010
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// High frequency ISO14443A commands
+//-----------------------------------------------------------------------------
+#ifndef __MIFARE_HOST_H
+#define __MIFARE_HOST_H
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <pthread.h>
+
+#include "proxmark3.h"	// time_t
+#include "common.h"
+#include "util.h"		// FILE_PATH_SIZE
+#include "ui.h"			// PrintAndLog...
+#include "crapto1/crapto1.h"
+#include "crc16.h"
+#include "protocols.h"
+#include "mifare.h"
+#include "mfkey.h"
+#include "util_posix.h"  // msclock
+
+#define MIFARE_SECTOR_RETRY     10
+
+// mifare tracer flags
+#define TRACE_IDLE		 		0x00
+#define TRACE_AUTH1		 		0x01
+#define TRACE_AUTH2		 		0x02
+#define TRACE_AUTH_OK	 		0x03
+#define TRACE_READ_DATA 		0x04
+#define TRACE_WRITE_OK			0x05
+#define TRACE_WRITE_DATA		0x06
+#define TRACE_ERROR		 		0xFF
+
+typedef struct {
+		union {
+			struct Crypto1State *slhead;
+			uint64_t *keyhead;
+		} head;
+		union {
+			struct Crypto1State *sltail;
+			uint64_t *keytail;
+		} tail;
+		uint32_t len;
+		uint32_t uid;
+		uint32_t blockNo;
+		uint32_t keyType;
+		uint32_t nt;
+		uint32_t ks1;
+} StateList_t;
+	
+typedef struct {
+	uint64_t Key[2];
+	uint8_t foundKey[2];
+} sector_t;
+
+typedef struct {
+	uint8_t keyA[6];
+	uint8_t keyB[6];
+	//uint8_t foundKey[2];
+} icesector_t;
+
+extern char logHexFileName[FILE_PATH_SIZE];
+
+extern int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key);
+extern int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t * ResultKeys, bool calibrate);
+extern int mfCheckKeys (uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t keycnt, uint8_t * keyBlock, uint64_t * key);
+extern int mfCheckKeys_fast( uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk,
+						uint8_t strategy, uint32_t size, uint8_t *keyBlock, sector_t *e_sector, bool use_flashmemory);
+extern int mfKeyBrute(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint64_t *resultkey);
+
+extern int mfReadSector(uint8_t sectorNo, uint8_t keyType, uint8_t *key, uint8_t *data);
+
+extern int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount);
+extern int mfEmlSetMem(uint8_t *data, int blockNum, int blocksCount);
+extern int mfEmlSetMem_xt(uint8_t *data, int blockNum, int blocksCount, int blockBtWidth);
+
+extern int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, uint8_t wipecard);
+extern int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, uint8_t params);
+extern int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params);
+
+extern int mfTraceInit(uint8_t *tuid, uint8_t uidlen, uint8_t *atqa, uint8_t sak, bool wantSaveToEmlFile);
+extern int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile);
+
+extern int isTraceCardEmpty(void);
+extern int isBlockEmpty(int blockN);
+extern int isBlockTrailer(int blockN);
+extern int loadTraceCard(uint8_t *tuid, uint8_t uidlen);
+extern int saveTraceCard(void);
+extern int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t *data, int len);
+
+extern int detect_classic_prng(void);
+extern int detect_classic_nackbug(bool verbose);
+extern void detect_classic_magic(void);
+extern void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len, bool isEncrypted);
 #endif
\ No newline at end of file
diff --git a/client/obj/mifare/.dummy b/client/obj/mifare/.dummy
new file mode 100644
index 000000000..e69de29bb
diff --git a/client/scripting.h b/client/scripting.h
index 4d39a6c6f..81b95cbe0 100644
--- a/client/scripting.h
+++ b/client/scripting.h
@@ -19,7 +19,7 @@
 #include "cmdmain.h"
 #include "comms.h"
 #include "util.h"
-#include "mifarehost.h"
+#include "mifare/mifarehost.h"
 #include "crc.h"
 #include "crc16.h"
 #include "crc64.h"
diff --git a/include/mifare.h b/include/mifare.h
index 14c0e7e27..90077f60d 100644
--- a/include/mifare.h
+++ b/include/mifare.h
@@ -13,6 +13,12 @@
 
 #include "common.h"
 
+#define MF_KEY_A	0
+#define MF_KEY_B	1
+
+#define MF_MAD1_SECTOR	0x00
+#define MF_MAD2_SECTOR	0x10
+
 //-----------------------------------------------------------------------------
 // ISO 14443A
 //-----------------------------------------------------------------------------

From db7580203b648be8cb472dc86718dba59318f38f Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Thu, 21 Feb 2019 19:34:12 +0200
Subject: [PATCH 0529/1938] create mad.c/h

---
 client/Makefile     |  1 +
 client/cmdhfmf.c    |  5 +++--
 client/mifare/mad.c | 31 +++++++++++++++++++++++++++++++
 client/mifare/mad.h | 26 ++++++++++++++++++++++++++
 4 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 client/mifare/mad.c
 create mode 100644 client/mifare/mad.h

diff --git a/client/Makefile b/client/Makefile
index 9f8055f8e..ebbce92dd 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -157,6 +157,7 @@ CMDSRCS =	crapto1/crapto1.c \
 			emv/cmdemv.c \
 			emv/emv_roca.c \
             mifare/mifare4.c \
+            mifare/mad.c \
 			cmdanalyse.c \
 			cmdhf.c \
 			cmdhflist.c \
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index a12bc34c2..edc3a662f 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -10,6 +10,7 @@
 
 #include "cmdhfmf.h"
 #include "mifare/mifare4.h"
+#include "mifare/mad.h"
 
 #define MIFARE_4K_MAXBLOCK 256
 #define MIFARE_2K_MAXBLOCK 128 
@@ -3225,7 +3226,7 @@ int CmdHF14AMfMAD(const char *cmd) {
 		for(int i = 0; i < 4; i ++)
 			PrintAndLogEx(NORMAL, "[%d] %s", i, sprint_hex(&sector[i * 16], 16));		
 	}
-	/*
+
 	bool haveMAD2 = false;
 	MAD1DecodeAndPrint(sector, verbose, &haveMAD2);
 	
@@ -3237,7 +3238,7 @@ int CmdHF14AMfMAD(const char *cmd) {
 
 		MAD2DecodeAndPrint(sector, verbose);
 	}
-	*/
+	
 	return 0;
 }
 
diff --git a/client/mifare/mad.c b/client/mifare/mad.c
new file mode 100644
index 000000000..88fc2c31b
--- /dev/null
+++ b/client/mifare/mad.c
@@ -0,0 +1,31 @@
+//-----------------------------------------------------------------------------
+// Copyright (C) 2019 Merlok
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// MIFARE Application Directory (MAD) functions
+//-----------------------------------------------------------------------------
+
+#include "mad.h"
+#include "ui.h"
+
+madAIDDescr madKnownAIDs[] = {
+	{0x0000, "free"}, 
+	{0x0001, "defect, e.g. access keys are destroyed or unknown"},
+	{0x0002, "reserved"},
+	{0x0003, "contains additional directory info"},
+	{0x0004, "contains card holder information in ASCII format."},
+	{0x0005, "not applicable (above memory size)}"}
+};
+
+int MAD1DecodeAndPrint(uint8_t *sector, bool verbose, bool *haveMAD2) {
+	
+	return 0;
+};
+
+int MAD2DecodeAndPrint(uint8_t *sector, bool verbose) {
+
+	return 0;
+};
diff --git a/client/mifare/mad.h b/client/mifare/mad.h
new file mode 100644
index 000000000..dc2b2e3c0
--- /dev/null
+++ b/client/mifare/mad.h
@@ -0,0 +1,26 @@
+//-----------------------------------------------------------------------------
+// Copyright (C) 2019 Merlok
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// MIFARE Application Directory (MAD) functions
+//-----------------------------------------------------------------------------
+
+#ifndef _MAD_H_
+#define _MAD_H_
+
+#include <stdint.h>
+#include <stdbool.h>
+
+typedef struct {
+	uint16_t AID;
+	const char *Description;
+} madAIDDescr;	
+
+int MAD1DecodeAndPrint(uint8_t *sector, bool verbose, bool *haveMAD2);
+int MAD2DecodeAndPrint(uint8_t *sector, bool verbose);
+
+
+#endif // _MAD_H_

From b9dc841bf923ef131866c8582e93d31b9839940d Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Thu, 21 Feb 2019 19:44:07 +0200
Subject: [PATCH 0530/1938] MAD. print GPB

---
 client/mifare/mad.c | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/client/mifare/mad.c b/client/mifare/mad.c
index 88fc2c31b..03b5b3f77 100644
--- a/client/mifare/mad.c
+++ b/client/mifare/mad.c
@@ -22,6 +22,37 @@ madAIDDescr madKnownAIDs[] = {
 
 int MAD1DecodeAndPrint(uint8_t *sector, bool verbose, bool *haveMAD2) {
 	
+	uint8_t GPB = sector[3 * 16 + 9];
+	PrintAndLogEx(NORMAL, "GPB: 0x%02x", GPB);
+	
+	// DA (MAD available)
+	if (!(GPB & 0x80)) {
+		PrintAndLogEx(ERR, "DA=0! MAD not available.");
+		return 1;
+	}
+	
+	// MA (multi-application card)
+	if (GPB & 0x40)
+		PrintAndLogEx(NORMAL, "Multi application card.");
+	else
+		PrintAndLogEx(NORMAL, "Single application card.");
+	
+	uint8_t MADVer = GPB & 0x03;
+	
+	//  MAD version
+	if ((MADVer != 0x01) && (MADVer != 0x02)) {
+		PrintAndLogEx(ERR, "Wrong MAD version: 0x%02x", MADVer);
+		return 2;
+	};
+	
+	if (haveMAD2)
+		*haveMAD2 = (MADVer == 2);
+	
+	
+	
+	
+	
+	
 	return 0;
 };
 

From 01c9325469e0b0a7c75c8652202be17f25fa2b40 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Thu, 21 Feb 2019 20:06:53 +0200
Subject: [PATCH 0531/1938] check MAD crc

---
 client/mifare/mad.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/client/mifare/mad.c b/client/mifare/mad.c
index 03b5b3f77..2fbc23e38 100644
--- a/client/mifare/mad.c
+++ b/client/mifare/mad.c
@@ -10,6 +10,7 @@
 
 #include "mad.h"
 #include "ui.h"
+#include "crc.h"
 
 madAIDDescr madKnownAIDs[] = {
 	{0x0000, "free"}, 
@@ -48,7 +49,11 @@ int MAD1DecodeAndPrint(uint8_t *sector, bool verbose, bool *haveMAD2) {
 	if (haveMAD2)
 		*haveMAD2 = (MADVer == 2);
 	
-	
+	uint8_t crc = CRC8Mad(&sector[16 + 1], 31);
+	if (crc != sector[16]) {
+		PrintAndLogEx(ERR, "Wrong MAD CRC. Calculated crc: 0x%02x, from sector: 0x%02x", crc, sector[16]);
+		return 3;
+	};
 	
 	
 	

From 0632918a477a90c3985c76843ce5e5d835866167 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Thu, 21 Feb 2019 20:07:17 +0200
Subject: [PATCH 0532/1938] fix MAD crc calculation (was wrong)

---
 common/crc.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/common/crc.c b/common/crc.c
index b710404cc..4d28d120e 100644
--- a/common/crc.c
+++ b/common/crc.c
@@ -99,14 +99,15 @@ uint32_t CRC8Maxim(uint8_t *buff, size_t size) {
 		crc_update2(&crc, buff[i], 8);
 	return crc_finish(&crc);
 }
-// width=8  poly=0x1d, reversed poly=0x??  init=0xe3  refin=true  refout=true  xorout=0x0000  check=0xC6  name="CRC-8/MAD"
+// width=8 poly=0x1d, init=0xc7 (0xe3 - WRONG! but it mentioned in MAD datasheet) refin=true  refout=true  xorout=0x00 name="CRC-8/MAD"
 // the CRC needs to be reversed before returned.
+//  init c7, poly 1d, final 0x00.
 uint32_t CRC8Mad(uint8_t *buff, size_t size) {
 	crc_t crc;
-	crc_init_ref(&crc, 8, 0x1d, 0xe3, 0, true, true);
+	crc_init_ref(&crc, 8, 0x1d, 0xc7, 0, false, false);
 	for ( int i = 0; i < size; ++i)
 		crc_update2(&crc, buff[i], 8);
-	return reflect8(crc_finish(&crc));
+	return crc_finish(&crc);
 }
 // width=4  poly=0xC, reversed poly=0x7  init=0x5   refin=true  refout=true  xorout=0x0000  check=  name="CRC-4/LEGIC"
 uint32_t CRC4Legic(uint8_t *cmd, size_t size) {

From 421604a3954fe50c05e921387f408bfabab79a4c Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 21 Feb 2019 23:20:52 +0100
Subject: [PATCH 0533/1938] fix: sc bruteforce' - wrong assign

---
 client/cmdsmartcard.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index 3860496de..f9b77dad0 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -946,8 +946,8 @@ static int smart_brute_sfi(bool decodeTLV){
 	return 0;
 }
 
-static void smart_brute_options(bool decodeTLV){
-	
+static void smart_brute_options(bool decodeTLV) {
+
 	uint8_t* buf = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
 	if ( !buf ) 
 		return;
@@ -1057,7 +1057,7 @@ int CmdSmartBruteforceSFI(const char *Cmd) {
 			continue;
 
 		size_t aidlen = strlen(aid);
-		char* caid = calloc( 8+2+aidlen+1, sizeof(uint8_t));
+		caid = calloc( 8+2+aidlen+1, sizeof(uint8_t));
 		snprintf(caid, 8+2+aidlen+1, SELECT, aidlen >> 1, aid);		
 		
 		int hexlen = 0;

From 09791638c8eb44f42653ad239f0a4c6de420e97d Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 21 Feb 2019 23:21:13 +0100
Subject: [PATCH 0534/1938] fix: 'lf indala' - wrong number of bits

---
 client/cmdlfindala.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/cmdlfindala.c b/client/cmdlfindala.c
index dd262e0dc..b49455e16 100644
--- a/client/cmdlfindala.c
+++ b/client/cmdlfindala.c
@@ -377,8 +377,8 @@ int CmdIndalaDemodAlt(const char *Cmd) {
 
 int CmdIndalaSim(const char *Cmd) {
 
-	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_indala_sim();
+	char cmdp = tolower(param_getchar(Cmd, 0));
+	if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_indala_sim();
 
 	uint8_t bits[224];
 	size_t size = sizeof(bits);
@@ -392,9 +392,9 @@ int CmdIndalaSim(const char *Cmd) {
 		return usage_lf_indala_sim();
 	
 	// convert to binarray
-	uint8_t counter = 224;
-	for (uint8_t i=0; i< len; i++) {
-		for(uint8_t j=0; j<8; j++) {
+	uint8_t counter = 223;
+	for (uint8_t i = 0; i < len; i++) {
+		for(uint8_t j = 0; j < 8; j++) {
 			bits[counter--] = hexuid[i] & 1;
 			hexuid[i] >>= 1;
 		}

From c980ae109aa409fa56dc5f44b94cfcfd3c8f461a Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 21 Feb 2019 23:21:39 +0100
Subject: [PATCH 0535/1938] fix: 'lf gprox' - wrong check value

---
 client/cmdlfguard.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdlfguard.c b/client/cmdlfguard.c
index ea97d6f77..afad96686 100644
--- a/client/cmdlfguard.c
+++ b/client/cmdlfguard.c
@@ -192,7 +192,7 @@ int CmdGuardDemod(const char *Cmd) {
 			PrintAndLogEx(DEBUG, "DEBUG: Error - gProxII preamble not found");
 		else if (preambleIndex == -3)
 			PrintAndLogEx(DEBUG, "DEBUG: Error - gProxII size not correct: %d", size);
-		else if (preambleIndex == -3)
+		else if (preambleIndex == -5)
 			PrintAndLogEx(DEBUG, "DEBUG: Error - gProxII wrong spacerbits");
 		else				
 			PrintAndLogEx(DEBUG, "DEBUG: Error - gProxII ans: %d", preambleIndex);

From b11f767c5530afaf548c9903a649e50fa23cac3f Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 21 Feb 2019 23:22:13 +0100
Subject: [PATCH 0536/1938] fix: 'lf em brute' - mem leak

---
 client/cmdlfem4x.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 762b4fe0b..3260b8d74 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -474,14 +474,14 @@ int CmdEM410xBrute(const char *Cmd) {
 	/* 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();
+	char cmdp = tolower(param_getchar(Cmd, 0));
+	if (cmdp == 'h') return usage_lf_em410x_brute();
 	
-	cmdp = param_getchar(Cmd, 1);	
-	if (cmdp == 'd' || cmdp == 'D') {
+	cmdp = tolower(param_getchar(Cmd, 1));
+	if (cmdp == 'd') {
 		delay = param_get32ex(Cmd, 2, 1000, 10);
 		param_getdec(Cmd, 4, &clock);
-	} else if (cmdp == 'c' || cmdp == 'C') {
+	} else if (cmdp == 'c') {
 		param_getdec(Cmd, 2, &clock);
 		delay = param_get32ex(Cmd, 4, 1000, 10);
 	}
@@ -498,7 +498,10 @@ int CmdEM410xBrute(const char *Cmd) {
 	}
 
 	uidBlock = calloc(stUidBlock, 5);
-	if (uidBlock == NULL) return 1;
+	if (uidBlock == NULL) {
+		fclose(f);
+		return 1;
+	}
 	
 	while( fgets(buf, sizeof(buf), f) ) {
 		if (strlen(buf) < 10 || buf[9] == '\n') continue;

From 7ea7061ed019782d18b82983e5e83b82c62afa19 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 21 Feb 2019 23:22:39 +0100
Subject: [PATCH 0537/1938] fix: 'hf mf cload' - wrong free

---
 client/cmdhfmf.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 57cf246da..e69fd6ba3 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -2752,10 +2752,9 @@ int CmdHF14AMfCLoad(const char *Cmd) {
 			res = loadFileEML( Cmd, "eml", data, &datalen);
 		}
 	}
-	if ( res ) {
-		free(data);
+	
+	if ( res )
 		return 1;
-	}
 	
 //	PrintAndLogEx(INFO, "DATA | %s", sprint_hex(data+1000, 24) );
 	

From 439f767b4de6e7674a7fc3bcfe2736a4c328567f Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 21 Feb 2019 23:35:03 +0100
Subject: [PATCH 0538/1938] fix: mem leak

---
 uart/uart_posix.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index b9df932d6..c77457d91 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -102,6 +102,7 @@ serial_port uart_open(const char* pcPortName) {
 			printf("Error: getaddrinfo: %s\n", gai_strerror(s));
 			freeaddrinfo(addr);
 			free(addrstr);
+			free(sp);
 			return INVALID_SERIAL_PORT;
 		}
 

From 697af67bf19a425ffe4b5791b070b22edcd959bc Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 21 Feb 2019 23:37:18 +0100
Subject: [PATCH 0539/1938] fix: 'hf 14b info' - missing break

---
 client/cmdhf14b.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c
index 4077e16e6..92052e02c 100644
--- a/client/cmdhf14b.c
+++ b/client/cmdhf14b.c
@@ -461,6 +461,7 @@ bool HF14B_Std_Info(bool verbose){
 			PrintAndLogEx(NORMAL, " CHIPID : %02X", card.chipid);
 			print_atqb_resp(card.atqb, card.cid);
 			isSuccess = true;
+			break;
 		case 2:
 			if (verbose) PrintAndLogEx(FAILED, "ISO 14443-3 ATTRIB fail");
 			break;

From 954e01c363d8edc52a17e5eb030cb8efbc67584f Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 21 Feb 2019 23:38:07 +0100
Subject: [PATCH 0540/1938] fix: bad loop

---
 client/cmdhf14b.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c
index 92052e02c..11b0aabb3 100644
--- a/client/cmdhf14b.c
+++ b/client/cmdhf14b.c
@@ -246,7 +246,7 @@ static bool get_14b_UID(iso14b_card_select_t *card) {
 	if (!card)
 		return false;
 	
-	uint8_t retry = 3;
+	int8_t retry = 3;
 	UsbCommand resp;
 	UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_SR | ISO14B_DISCONNECT, 0, 0}};
 		

From 43bd82b7789d93dd94d04cd83dc852d044d0025f Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 21 Feb 2019 23:44:56 +0100
Subject: [PATCH 0541/1938] update

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 44a6fc2d6..90fbd53bb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [unreleased][unreleased]
+ - Fix - A lot of bugfixes, like memory leaks (@iceman)
  - Change 'hf 14a antifuzz' - original implementation (@asfabw),  reworked a bit
  - Fix 'hf mf fchk' (@iceman)
  - Fix 'usb slow on posix based systems' (@fl0-0)

From 140c327cc2fb533ae72d55885cc23f2361a809e2 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 22 Feb 2019 09:43:03 +0100
Subject: [PATCH 0542/1938] CHG: 'hf mf list' - readded it.  calls trace list
 mf in the back

---
 client/cmdhfmf.c | 14 ++++++++++----
 client/cmdhfmf.h |  3 ++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index e69fd6ba3..2412aecee 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -434,7 +434,7 @@ char * GenerateFilename(const char *prefix, const char *suffix){
 	return fptr;
 }
 
-int CmdHF14ADarkside(const char *Cmd) {
+int CmdHF14AMfDarkside(const char *Cmd) {
 	uint8_t blockno = 0, key_type = MIFARE_AUTH_KEYA;
 	uint64_t key = 0;
 	
@@ -3174,7 +3174,7 @@ out:
 	return 0;
 }
 
-int CmdHF14AMfAuth4(const char *cmd) {
+int CmdHF14AMfAuth4(const char *Cmd) {
 	uint8_t keyn[20] = {0};
 	int keynlen = 0;
 	uint8_t key[16] = {0};
@@ -3191,7 +3191,7 @@ int CmdHF14AMfAuth4(const char *cmd) {
 		arg_str1(NULL,  NULL,     "<Key Value (HEX 16 bytes)>", NULL),
 		arg_param_end
 	};
-	CLIExecWithReturn(cmd, argtable, true);
+	CLIExecWithReturn(Cmd, argtable, true);
 	
 	CLIGetHexWithReturn(1, keyn, &keynlen);
 	CLIGetHexWithReturn(2, key, &keylen);
@@ -3210,9 +3210,15 @@ int CmdHF14AMfAuth4(const char *cmd) {
 	return MifareAuth4(NULL, keyn, key, true, false, true);
 }
 
+int CmdHF14AMfList(const char *Cmd) {
+	CmdTraceList("mf");
+	return 0;
+}
+
 static command_t CommandTable[] = {
 	{"help",		CmdHelp,				1, "This help"},
-	{"darkside",	CmdHF14ADarkside,		0, "Darkside attack. read parity error messages."},
+	{"list",		CmdHF14AMfList,         0, "[Deprecated] List ISO 14443-a / Mifare history"},	
+	{"darkside",	CmdHF14AMfDarkside,		0, "Darkside attack. read parity error messages."},
 	{"nested",		CmdHF14AMfNested,		0, "Nested attack. Test nested authentication"},
 	{"hardnested", 	CmdHF14AMfNestedHard, 	0, "Nested attack for hardened Mifare cards"},
 	{"keybrute",	CmdHF14AMfKeyBrute,		0, "J_Run's 2nd phase of multiple sector nested authentication key recovery"},	
diff --git a/client/cmdhfmf.h b/client/cmdhfmf.h
index eeb7a74f6..a87da449f 100644
--- a/client/cmdhfmf.h
+++ b/client/cmdhfmf.h
@@ -35,6 +35,7 @@
 
 extern int CmdHFMF(const char *Cmd);
 
+extern int CmdHF14AMfList(const char *Cmd);
 extern int CmdHF14AMfDbg(const char* cmd);
 extern int CmdHF14AMfRdBl(const char* cmd);
 extern int CmdHF14AMfURdBl(const char* cmd);
@@ -45,7 +46,7 @@ extern int CmdHF14AMfRestore(const char* cmd);
 extern int CmdHF14AMfWrBl(const char* cmd);
 extern int CmdHF14AMfUWrBl(const char* cmd);
 extern int CmdHF14AMfChk(const char* cmd);
-extern int CmdHF14ADarkside(const char* cmd);
+extern int CmdHF14AMfDarkside(const char* cmd);
 extern int CmdHF14AMfNested(const char* cmd);
 extern int CmdHF14AMfNestedHard(const char *Cmd);
 //extern int CmdHF14AMfSniff(const char* cmd);

From 99101e56fd71b19a8a2f0a5fa18c23a9b71bad29 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 22 Feb 2019 09:43:42 +0100
Subject: [PATCH 0543/1938] text

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 90fbd53bb..ce939d980 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [unreleased][unreleased]
+ - Add 'hf mf list' - readded it again (@iceman)
  - Fix - A lot of bugfixes, like memory leaks (@iceman)
  - Change 'hf 14a antifuzz' - original implementation (@asfabw),  reworked a bit
  - Fix 'hf mf fchk' (@iceman)

From ef9d1fa3786be56c2c46552e9a975d7487abe904 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 22 Feb 2019 15:21:20 +0100
Subject: [PATCH 0544/1938] fix: mem leak,

---
 uart/uart_posix.c | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index c77457d91..e3d7753a9 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -123,6 +123,7 @@ serial_port uart_open(const char* pcPortName) {
 			printf("Error: Could not connect\n");
 			freeaddrinfo(addr);
 			free(addrstr);
+			free(sp);
 			return INVALID_SERIAL_PORT;
 		}
 
@@ -132,13 +133,17 @@ serial_port uart_open(const char* pcPortName) {
 		sp->fd = sfd;
 
 		int one = 1;
-		setsockopt(sp->fd, SOL_TCP, TCP_NODELAY, &one, sizeof(one));
+		int res = setsockopt(sp->fd, SOL_TCP, TCP_NODELAY, &one, sizeof(one));
+		if ( res != 0) {
+			free(sp);
+			return INVALID_SERIAL_PORT;
+		}
 		return sp;
 	}
 
   
 	sp->fd = open(pcPortName, O_RDWR | O_NOCTTY | O_NDELAY | O_NONBLOCK);
-	if(sp->fd == -1) {
+	if (sp->fd == -1) {
 		uart_close(sp);
 		return INVALID_SERIAL_PORT;
 	}
@@ -160,7 +165,7 @@ serial_port uart_open(const char* pcPortName) {
 	}
 
 	// Try to retrieve the old (current) terminal info struct
-	if(tcgetattr(sp->fd,&sp->tiOld) == -1) {
+	if (tcgetattr(sp->fd,&sp->tiOld) == -1) {
 		uart_close(sp);
 		return INVALID_SERIAL_PORT;
 	}
@@ -180,7 +185,7 @@ serial_port uart_open(const char* pcPortName) {
 	sp->tiNew.c_cc[VTIME] = 0;
 
 	// Try to set the new terminal info struct
-	if(tcsetattr(sp->fd, TCSANOW, &sp->tiNew) == -1) {
+	if (tcsetattr(sp->fd, TCSANOW, &sp->tiNew) == -1) {
 		uart_close(sp);
 		return INVALID_SERIAL_PORT;
 	}
@@ -359,8 +364,11 @@ bool uart_set_speed(serial_port sp, const uint32_t uiPortSpeed) {
 #  endif
 		default: return false;
 	};
+	
 	struct termios ti;
-	if (tcgetattr(spu->fd,&ti) == -1) return false;
+	if (tcgetattr(spu->fd,&ti) == -1) 
+		return false;
+	
 	// Set port speed (Input and Output)
 	cfsetispeed(&ti, stPortSpeed);
 	cfsetospeed(&ti, stPortSpeed);

From 1b64c4cb63470803bb6fa0300fd2b89a58ee485b Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 22 Feb 2019 15:23:09 +0100
Subject: [PATCH 0545/1938] fix: overflow was possible since 1000 is type long

---
 client/util_posix.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/util_posix.c b/client/util_posix.c
index 7704e9d4b..a45dc48e9 100644
--- a/client/util_posix.c
+++ b/client/util_posix.c
@@ -130,7 +130,7 @@ uint64_t msclock(void) {
 #else
 	struct timespec t;
 	clock_gettime(CLOCK_MONOTONIC, &t);
-	return (t.tv_sec * 1000 + t.tv_nsec / 1000000);
+	return ( 1000 * (uint64_t)t.tv_sec + t.tv_nsec / 1000000);
 #endif
 }
 

From c5a1b06f25a68d00ef9eb4009e9195f71ac03e83 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Fri, 22 Feb 2019 16:58:49 +0200
Subject: [PATCH 0546/1938] mad comment fix

---
 common/crc.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/common/crc.c b/common/crc.c
index 4d28d120e..77bea0b47 100644
--- a/common/crc.c
+++ b/common/crc.c
@@ -99,9 +99,7 @@ uint32_t CRC8Maxim(uint8_t *buff, size_t size) {
 		crc_update2(&crc, buff[i], 8);
 	return crc_finish(&crc);
 }
-// width=8 poly=0x1d, init=0xc7 (0xe3 - WRONG! but it mentioned in MAD datasheet) refin=true  refout=true  xorout=0x00 name="CRC-8/MAD"
-// the CRC needs to be reversed before returned.
-//  init c7, poly 1d, final 0x00.
+// width=8 poly=0x1d, init=0xc7 (0xe3 - WRONG! but it mentioned in MAD datasheet) refin=false  refout=false  xorout=0x00 name="CRC-8/MIFARE-MAD"
 uint32_t CRC8Mad(uint8_t *buff, size_t size) {
 	crc_t crc;
 	crc_init_ref(&crc, 8, 0x1d, 0xc7, 0, false, false);

From 8010f2dc5e77b3135037ba2645ca2d52de979265 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Fri, 22 Feb 2019 18:05:45 +0200
Subject: [PATCH 0547/1938] MAD1 OK

---
 client/mifare/mad.c | 131 ++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 121 insertions(+), 10 deletions(-)

diff --git a/client/mifare/mad.c b/client/mifare/mad.c
index 2fbc23e38..e7a611384 100644
--- a/client/mifare/mad.c
+++ b/client/mifare/mad.c
@@ -11,16 +11,119 @@
 #include "mad.h"
 #include "ui.h"
 #include "crc.h"
+#include "util.h"
 
-madAIDDescr madKnownAIDs[] = {
+static madAIDDescr madKnownAIDs[] = {
 	{0x0000, "free"}, 
 	{0x0001, "defect, e.g. access keys are destroyed or unknown"},
 	{0x0002, "reserved"},
 	{0x0003, "contains additional directory info"},
 	{0x0004, "contains card holder information in ASCII format."},
-	{0x0005, "not applicable (above memory size)}"}
+	{0x0005, "not applicable (above memory size)"},
+
+	{0x03e1, "NDEF"},
 };
 
+static madAIDDescr madKnownClusterCodes[] = {
+	{0x00, "cluster: card administration"},
+	{0x01, "cluster: miscellaneous applications"},
+	{0x02, "cluster: miscellaneous applications"},
+	{0x03, "cluster: miscellaneous applications"},
+	{0x04, "cluster: miscellaneous applications"},
+	{0x05, "cluster: miscellaneous applications"},
+	{0x06, "cluster: miscellaneous applications"},
+	{0x07, "cluster: miscellaneous applications"},
+	{0x08, "cluster: airlines"},
+	{0x09, "cluster: ferry traffic"},
+	{0x10, "cluster: railway services"},
+	{0x11, "cluster: miscellaneous applications"},
+	{0x12, "cluster: transport"},
+	{0x14, "cluster: security solutions"},
+	{0x18, "cluster: city traffic"},
+	{0x19, "cluster: Czech Railways"},
+	{0x20, "cluster: bus services"},
+	{0x21, "cluster: multi modal transit"},
+	{0x28, "cluster: taxi"},
+	{0x30, "cluster: road toll"},
+	{0x31, "cluster: generic transport"},
+	{0x38, "cluster: company services"},
+	{0x40, "cluster: city card services"},
+	{0x47, "cluster: access control & security"},
+	{0x48, "cluster: access control & security"},
+	{0x49, "cluster: VIGIK"},
+	{0x4A, "cluster: Ministry of Defence, Netherlands"},
+	{0x4B, "cluster: Bosch Telecom, Germany"},
+	{0x4C, "cluster: European Union Institutions"},
+	{0x50, "cluster: ski ticketing"},
+	{0x51, "cluster: access control & security"},
+	{0x52, "cluster: access control & security"},
+	{0x53, "cluster: access control & security"},
+	{0x54, "cluster: access control & security"},
+	{0x55, "cluster: SOAA standard for offline access standard"},
+	{0x56, "cluster: access control & security"},
+	{0x58, "cluster: academic services"},
+	{0x60, "cluster: food"},
+	{0x68, "cluster: non-food trade"},
+	{0x70, "cluster: hotel"},
+	{0x71, "cluster: loyalty"},
+	{0x75, "cluster: airport services"},
+	{0x78, "cluster: car rental"},
+	{0x79, "cluster: Dutch government"},
+	{0x80, "cluster: administration services"},
+	{0x88, "cluster: electronic purse"},
+	{0x90, "cluster: television"},
+	{0x91, "cluster: cruise ship"},
+	{0x95, "cluster: IOPTA"},
+	{0x97, "cluster: metering"},
+	{0x98, "cluster: telephone"},
+	{0xA0, "cluster: health services"},
+	{0xA8, "cluster: warehouse"},
+	{0xB0, "cluster: electronic trade"},
+	{0xB8, "cluster: banking"},
+	{0xC0, "cluster: entertainment & sports"},
+	{0xC8, "cluster: car parking"},
+	{0xC9, "cluster: fleet management"},
+	{0xD0, "cluster: fuel, gasoline"},
+	{0xD8, "cluster: info services"},
+	{0xE0, "cluster: press"},
+	{0xE1, "cluster: NFC Forum"},
+	{0xE8, "cluster: computer"},
+	{0xF0, "cluster: mail"},
+	{0xF8, "cluster: miscellaneous applications"},
+};
+
+static const char unknownAID[] = "";
+
+static const char *GetAIDDescription(uint16_t AID) {
+	for(int i = 0; i < ARRAYLEN(madKnownAIDs); i++)
+		if (madKnownAIDs[i].AID == AID)
+			return madKnownAIDs[i].Description;
+
+	for(int i = 0; i < ARRAYLEN(madKnownClusterCodes); i++)
+		if (madKnownClusterCodes[i].AID == AID)
+			return madKnownClusterCodes[i].Description;
+		
+	return unknownAID;
+}
+
+int madCRCCheck(uint8_t *sector, bool verbose, int MADver) {
+	if (MADver == 1) {
+		uint8_t crc = CRC8Mad(&sector[16 + 1], 31);
+		if (crc != sector[16]) {
+			if (verbose)
+				PrintAndLogEx(ERR, "Wrong MAD%d CRC. Calculated: 0x%02x, from card: 0x%02x", MADver, crc, sector[16]);
+			return 3;
+		};
+	} else {
+	}
+	
+	return 0;
+}
+
+uint16_t madGetAID(uint8_t *sector, int MADver, int sectorNo) {
+	return (sector[16 + 2 + (sectorNo - 1) * 2] << 8) + (sector[16 + 2 + (sectorNo - 1) * 2 + 1]);	
+}
+
 int MAD1DecodeAndPrint(uint8_t *sector, bool verbose, bool *haveMAD2) {
 	
 	uint8_t GPB = sector[3 * 16 + 9];
@@ -39,6 +142,7 @@ int MAD1DecodeAndPrint(uint8_t *sector, bool verbose, bool *haveMAD2) {
 		PrintAndLogEx(NORMAL, "Single application card.");
 	
 	uint8_t MADVer = GPB & 0x03;
+	PrintAndLogEx(NORMAL, "MAD version: %d", MADVer);
 	
 	//  MAD version
 	if ((MADVer != 0x01) && (MADVer != 0x02)) {
@@ -48,20 +152,27 @@ int MAD1DecodeAndPrint(uint8_t *sector, bool verbose, bool *haveMAD2) {
 	
 	if (haveMAD2)
 		*haveMAD2 = (MADVer == 2);
+
+	int res = madCRCCheck(sector, true, 1);
+	if (res)
+		return res;	
 	
-	uint8_t crc = CRC8Mad(&sector[16 + 1], 31);
-	if (crc != sector[16]) {
-		PrintAndLogEx(ERR, "Wrong MAD CRC. Calculated crc: 0x%02x, from sector: 0x%02x", crc, sector[16]);
-		return 3;
+	if (verbose)
+		PrintAndLogEx(NORMAL, "CRC8-MAD OK.");
+	
+	for(int i = 1; i < 16; i++) {
+		uint16_t AID = madGetAID(sector, 1, i);
+		PrintAndLogEx(NORMAL, "%02d [%04X] %s", i, AID, GetAIDDescription(AID));
 	};
-	
-	
-	
-	
+		
 	return 0;
 };
 
 int MAD2DecodeAndPrint(uint8_t *sector, bool verbose) {
+	int res = madCRCCheck(sector, true, 2);
+	if (res)
+		return res;	
 
+	
 	return 0;
 };

From 91ed51c673fffb26375e48e02a98bf95c2adad60 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Fri, 22 Feb 2019 18:06:37 +0200
Subject: [PATCH 0548/1938] add comment

---
 client/mifare/mad.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/mifare/mad.c b/client/mifare/mad.c
index e7a611384..2b6033588 100644
--- a/client/mifare/mad.c
+++ b/client/mifare/mad.c
@@ -13,6 +13,7 @@
 #include "crc.h"
 #include "util.h"
 
+// https://www.nxp.com/docs/en/application-note/AN10787.pdf
 static madAIDDescr madKnownAIDs[] = {
 	{0x0000, "free"}, 
 	{0x0001, "defect, e.g. access keys are destroyed or unknown"},

From 5122e1289d584bb7deb9dc46b3febeabe9c1b6a5 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Fri, 22 Feb 2019 18:24:22 +0200
Subject: [PATCH 0549/1938] info-byte

---
 client/mifare/mad.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/client/mifare/mad.c b/client/mifare/mad.c
index 2b6033588..421b4844f 100644
--- a/client/mifare/mad.c
+++ b/client/mifare/mad.c
@@ -161,6 +161,17 @@ int MAD1DecodeAndPrint(uint8_t *sector, bool verbose, bool *haveMAD2) {
 	if (verbose)
 		PrintAndLogEx(NORMAL, "CRC8-MAD OK.");
 	
+	// info byte
+	uint8_t InfoByte = sector[16 + 1] & 0x3f;
+	if (InfoByte) {
+		PrintAndLogEx(NORMAL, "Card publisher sector: 0x%02x", InfoByte);
+	} else {
+		if (verbose)
+			PrintAndLogEx(NORMAL, "Card publisher sector not present.");
+	}
+	if (InfoByte == 0x10 || InfoByte >= 0x28)
+		PrintAndLogEx(WARNING, "Info byte error");
+	
 	for(int i = 1; i < 16; i++) {
 		uint16_t AID = madGetAID(sector, 1, i);
 		PrintAndLogEx(NORMAL, "%02d [%04X] %s", i, AID, GetAIDDescription(AID));

From 20be5c5d9f030abae2d122edda8a94947d48ea51 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Fri, 22 Feb 2019 19:58:50 +0200
Subject: [PATCH 0550/1938] some of MAD2 code

---
 client/cmdhfmf.c    |  6 +++---
 client/mifare/mad.c | 10 +++++++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index edc3a662f..a7966bee8 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -3230,9 +3230,9 @@ int CmdHF14AMfMAD(const char *cmd) {
 	bool haveMAD2 = false;
 	MAD1DecodeAndPrint(sector, verbose, &haveMAD2);
 	
-	if (haveMAD2) {
-		if (mfReadSector(MF_MAD2_SECTOR, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector)) {
-			PrintAndLogEx(ERR, "read sector 0 error. card don't have MAD or don't have MAD on default keys.");
+	if (haveMAD2) { // MF_MAD2_SECTOR
+		if (mfReadSector(1, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector)) {
+			PrintAndLogEx(ERR, "read sector 0x10 error. card don't have MAD or don't have MAD on default keys.");
 			return 2;
 		}
 
diff --git a/client/mifare/mad.c b/client/mifare/mad.c
index 421b4844f..9f28de394 100644
--- a/client/mifare/mad.c
+++ b/client/mifare/mad.c
@@ -122,7 +122,10 @@ int madCRCCheck(uint8_t *sector, bool verbose, int MADver) {
 }
 
 uint16_t madGetAID(uint8_t *sector, int MADver, int sectorNo) {
-	return (sector[16 + 2 + (sectorNo - 1) * 2] << 8) + (sector[16 + 2 + (sectorNo - 1) * 2 + 1]);	
+	if (MADver == 1)
+		return (sector[16 + 2 + (sectorNo - 1) * 2] << 8) + (sector[16 + 2 + (sectorNo - 1) * 2 + 1]);	
+	else
+		return (sector[2 + (sectorNo - 1) * 2] << 8) + (sector[2 + (sectorNo - 1) * 2 + 1]);	
 }
 
 int MAD1DecodeAndPrint(uint8_t *sector, bool verbose, bool *haveMAD2) {
@@ -185,6 +188,11 @@ int MAD2DecodeAndPrint(uint8_t *sector, bool verbose) {
 	if (res)
 		return res;	
 
+	for(int i = 1; i < 8 + 8 + 7; i++) {
+		uint16_t AID = madGetAID(sector, 2, i);
+		PrintAndLogEx(NORMAL, "%02d [%04X] %s", i + 15, AID, GetAIDDescription(AID));
+	};
+		
 	
 	return 0;
 };

From 22510b6f224289e7bd2c9a19218d62282ec9d4d1 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 23 Feb 2019 14:15:54 +0100
Subject: [PATCH 0551/1938] CHG: cleanups

---
 client/cmdhfmfhard.c                   | 77 ++++++++++----------------
 client/hardnested/hardnested_bf_core.c |  6 +-
 2 files changed, 32 insertions(+), 51 deletions(-)

diff --git a/client/cmdhfmfhard.c b/client/cmdhfmfhard.c
index 0c661d410..9d9406c11 100644
--- a/client/cmdhfmfhard.c
+++ b/client/cmdhfmfhard.c
@@ -1048,7 +1048,7 @@ static bool shrink_key_space(float *brute_forces)
 //iceman 2018
 	return ((hardnested_stage & CHECK_2ND_BYTES) &&
 				reduction_rate >= 0.0 && 
-			   ( reduction_rate < brute_force_per_second * (float)sample_period / 1000.0  || *brute_forces < 0x1F000000000));			  
+			   ( reduction_rate < brute_force_per_second * (float)sample_period / 1000.0  || *brute_forces < 0x1F00000000));
 }
 
 	
@@ -1672,9 +1672,9 @@ static inline bool bitflips_match(uint8_t byte, uint32_t state, odd_even_t odd_e
 		}
 #endif
 		return false;
-	} else {
-		return true;
 	}
+	
+	return true;
 }
 	
 	
@@ -1714,11 +1714,13 @@ static bool all_bitflips_match(uint8_t byte, uint32_t state, odd_even_t odd_even
 #ifdef DEBUG_KEY_ELIMINATION				
 			if (known_target_key != -1 && state == test_state[odd_even]) {
 				PrintAndLogEx(NORMAL, "all_bitflips_match() 1st Byte: %s test state (0x%06x): Eliminated. Bytes = %02x, %02x, Common Bits = %d\n", 
-					odd_even==ODD_STATE?"odd":"even",
+					odd_even == ODD_STATE ? "odd" : "even",
 					test_state[odd_even],
-					byte, byte2, num_common);
+					byte,
+					byte2,
+					num_common);
 				if (failstr[0] == '\0') {
-					sprintf(failstr, "Other 1st Byte %s, all_bitflips_match(), no match", odd_even?"odd":"even");
+					sprintf(failstr, "Other 1st Byte %s, all_bitflips_match(), no match", odd_even ? "odd" : "even");
 				}
 			}
 #endif
@@ -1770,12 +1772,10 @@ static void add_matching_states(statelist_t *candidates, uint8_t part_sum_a0, ui
 	uint32_t *bitarray_a8 = part_sum_a8_bitarrays[odd_even][part_sum_a8/2];
 	uint32_t *bitarray_bitflips = nonces[best_first_bytes[0]].states_bitarray[odd_even];
 
-	// for (uint32_t i = 0; i < (1<<19); i++) {
-		// candidates_bitarray[i] = bitarray_a0[i] & bitarray_a8[i] & bitarray_bitflips[i];
-	// }
 	bitarray_AND4(candidates_bitarray, bitarray_a0, bitarray_a8, bitarray_bitflips);
 	
 	bitarray_to_list(best_first_bytes[0], candidates_bitarray, candidates->states[odd_even], &(candidates->len[odd_even]), odd_even);
+	
 	if (candidates->len[odd_even] == 0) {
 		free(candidates->states[odd_even]);
 		candidates->states[odd_even] = NULL;
@@ -1784,17 +1784,14 @@ static void add_matching_states(statelist_t *candidates, uint8_t part_sum_a0, ui
 	}
 	free_bitarray(candidates_bitarray);
 
-
 	pthread_mutex_lock(&statelist_cache_mutex);
 	sl_cache[part_sum_a0/2][part_sum_a8/2][odd_even].sl = candidates->states[odd_even];
 	sl_cache[part_sum_a0/2][part_sum_a8/2][odd_even].len = candidates->len[odd_even];
 	sl_cache[part_sum_a0/2][part_sum_a8/2][odd_even].cache_status = COMPLETED;
 	pthread_mutex_unlock(&statelist_cache_mutex);
-
 	return;
 }
 
-
 static statelist_t *add_more_candidates(void)
 {
 	statelist_t *new_candidates = candidates;
@@ -1888,7 +1885,6 @@ static bool TestIfKeyExists(uint64_t key)
 
 static work_status_t book_of_work[NUM_PART_SUMS][NUM_PART_SUMS][NUM_PART_SUMS][NUM_PART_SUMS];
 
-
 static void init_book_of_work(void)
 {
 	for (uint8_t p = 0; p < NUM_PART_SUMS; p++) {
@@ -2052,19 +2048,6 @@ __attribute__((force_align_arg_pointer))
 
 static void generate_candidates(uint8_t sum_a0_idx, uint8_t sum_a8_idx)
 {
-	// PrintAndLogEx(NORMAL, "Generating crypto1 state candidates... \n");
-	
-	// estimate maximum candidate states
-	// maximum_states = 0;
-	// for (uint16_t sum_odd = 0; sum_odd <= 16; sum_odd += 2) {
-		// for (uint16_t sum_even = 0; sum_even <= 16; sum_even += 2) {
-			// if (sum_odd*(16-sum_even) + (16-sum_odd)*sum_even == sum_a0) {
-				// maximum_states += (uint64_t)count_states(part_sum_a0_bitarrays[EVEN_STATE][sum_even/2]) 
-								// * count_states(part_sum_a0_bitarrays[ODD_STATE][sum_odd/2]);
-			// }
-		// }
-	// }
-	// PrintAndLogEx(NORMAL, "Number of possible keys with Sum(a0) = %d: %" PRIu64 " (2^%1.1f)\n", sum_a0, maximum_states, log(maximum_states)/log(2.0));
 	
 	init_statelist_cache();
 	init_book_of_work();
@@ -2111,12 +2094,11 @@ static void generate_candidates(uint8_t sum_a0_idx, uint8_t sum_a8_idx)
 
 static void	free_candidates_memory(statelist_t *sl)
 {
-	if (sl == NULL) {
+	if (sl == NULL)
 		return;
-	} else {
-		free_candidates_memory(sl->next);
-		free(sl);
-	}
+
+	free_candidates_memory(sl->next);
+	free(sl);
 }
 
 
@@ -2137,7 +2119,6 @@ static void pre_XOR_nonces(void)
 		}
 	}
 }
-	
 
 static bool brute_force(uint64_t *found_key)
 {
@@ -2147,7 +2128,6 @@ static bool brute_force(uint64_t *found_key)
 	return brute_force_bs(NULL, candidates, cuid, num_acquired_nonces, maximum_states, nonces, best_first_bytes, found_key);
 }
 
-
 static uint16_t SumProperty(struct Crypto1State *s)
 {
 	uint16_t sum_odd = PartialSumProperty(s->odd, ODD_STATE);
@@ -2223,11 +2203,11 @@ static void set_test_state(uint8_t byte)
 
 int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t *trgkey, bool nonce_file_read, bool nonce_file_write, bool slow, int tests, uint64_t *foundkey, char *filename) 
 {
-	char progress_text[80];
-	
+	char progress_text[80];	
 	char instr_set[12] = {0};
+	
 	get_SIMD_instruction_set(instr_set);
-	PrintAndLog("Using %s SIMD core.", instr_set);
+	PrintAndLogEx(SUCCESS,"Using %s SIMD core.", instr_set);
 
 	srand((unsigned) time(NULL));
 	brute_force_per_second = brute_force_benchmark();
@@ -2241,6 +2221,7 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc
 			PrintAndLogEx(WARNING, "Could not create/open file hardnested_stats.txt");
 			return 3;
 		}
+		
 		for (uint32_t i = 0; i < tests; i++) {
 			start_time = msclock();
 			print_progress_header();
@@ -2282,6 +2263,7 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc
 			float expected_brute_force1 = (float)num_odd * num_even / 2.0;
 			float expected_brute_force2 = nonces[best_first_bytes[0]].expected_num_brute_force;
 			fprintf(fstats, "%1.1f;%1.1f;", log(expected_brute_force1)/log(2.0), log(expected_brute_force2)/log(2.0));
+			
 			if (expected_brute_force1 < expected_brute_force2) {
 				hardnested_print_progress(num_acquired_nonces, "(Ignoring Sum(a8) properties)", expected_brute_force1, 0);
 				set_test_state(best_first_byte_smallest_bitarray);
@@ -2291,12 +2273,11 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc
 				for (statelist_t *sl = candidates; sl != NULL; sl = sl->next) {
 					maximum_states += (uint64_t)sl->len[ODD_STATE] * sl->len[EVEN_STATE];
 				}
-				//PrintAndLogEx(NORMAL, "Number of remaining possible keys: %" PRIu64 " (2^%1.1f)\n", maximum_states, log(maximum_states)/log(2.0));
-				// fPrintAndLogEx(NORMAL, "fstats, "%" PRIu64 ";", maximum_states);
+
 				best_first_bytes[0] = best_first_byte_smallest_bitarray;
 				pre_XOR_nonces();
 				prepare_bf_test_nonces(nonces, best_first_bytes[0]);
-				//hardnested_print_progress(num_acquired_nonces, "Starting brute force...", expected_brute_force1, 0);
+
 				key_found = brute_force(foundkey);
 				free(candidates->states[ODD_STATE]);
 				free(candidates->states[EVEN_STATE]);
@@ -2313,10 +2294,8 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc
 						sprintf(progress_text, "(Estimated Sum(a8) is WRONG! Correct Sum(a8) = %" PRIu16 ")", real_sum_a8);
 						hardnested_print_progress(num_acquired_nonces, progress_text, expected_brute_force, 0);
 					}
-					// PrintAndLogEx(NORMAL, "Estimated remaining states: %" PRIu64 " (2^%1.1f)\n", nonces[best_first_bytes[0]].sum_a8_guess[j].num_states, log(nonces[best_first_bytes[0]].sum_a8_guess[j].num_states)/log(2.0));
 					generate_candidates(first_byte_Sum, nonces[best_first_bytes[0]].sum_a8_guess[j].sum_a8_idx);
-					// PrintAndLogEx(NORMAL, "Time for generating key candidates list: %1.0f sec (%1.1f sec CPU)\n", difftime(time(NULL), start_time), (float)(msclock() - start_clock)/1000.0);
-					//hardnested_print_progress(num_acquired_nonces, "Starting brute force...", expected_brute_force, 0);
+
 					key_found = brute_force(foundkey);
 					free_statelist_cache();
 					free_candidates_memory(candidates);
@@ -2399,40 +2378,44 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc
 		uint32_t num_even = nonces[best_first_byte_smallest_bitarray].num_states_bitarray[EVEN_STATE];
 		float expected_brute_force1 = (float)num_odd * num_even / 2.0;
 		float expected_brute_force2 = nonces[best_first_bytes[0]].expected_num_brute_force;
+		
 		if (expected_brute_force1 < expected_brute_force2) {
 			hardnested_print_progress(num_acquired_nonces, "(Ignoring Sum(a8) properties)", expected_brute_force1, 0);
 			set_test_state(best_first_byte_smallest_bitarray);
 			add_bitflip_candidates(best_first_byte_smallest_bitarray);
 			Tests2();
 			maximum_states = 0;
+			
 			for (statelist_t *sl = candidates; sl != NULL; sl = sl->next) {
 				maximum_states += (uint64_t)sl->len[ODD_STATE] * sl->len[EVEN_STATE];
 			}
-			// PrintAndLogEx(NORMAL, "Number of remaining possible keys: %" PRIu64 " (2^%1.1f)\n", maximum_states, log(maximum_states)/log(2.0));
+
 			best_first_bytes[0] = best_first_byte_smallest_bitarray;
 			pre_XOR_nonces();
 			prepare_bf_test_nonces(nonces, best_first_bytes[0]);
-			//hardnested_print_progress(num_acquired_nonces, "Starting brute force...", expected_brute_force1, 0);
+
 			key_found = brute_force(foundkey);
 			free(candidates->states[ODD_STATE]);
 			free(candidates->states[EVEN_STATE]);
+			free_statelist_cache();
 			free_candidates_memory(candidates);
 			candidates = NULL;
 		} else {
+			
 			pre_XOR_nonces();
 			prepare_bf_test_nonces(nonces, best_first_bytes[0]);
+			
 			for (uint8_t j = 0; j < NUM_SUMS && !key_found; j++) {
 				float expected_brute_force = nonces[best_first_bytes[0]].expected_num_brute_force;
 				sprintf(progress_text, "(%d. guess: Sum(a8) = %" PRIu16 ")", j+1, sums[nonces[best_first_bytes[0]].sum_a8_guess[j].sum_a8_idx]);
 				hardnested_print_progress(num_acquired_nonces, progress_text, expected_brute_force, 0); 
+				
 				if (trgkey != NULL && sums[nonces[best_first_bytes[0]].sum_a8_guess[j].sum_a8_idx] != real_sum_a8) {
 					sprintf(progress_text, "(Estimated Sum(a8) is WRONG! Correct Sum(a8) = %" PRIu16 ")", real_sum_a8);
 					hardnested_print_progress(num_acquired_nonces, progress_text, expected_brute_force, 0);
 				}
-				// PrintAndLogEx(NORMAL, "Estimated remaining states: %" PRIu64 " (2^%1.1f)\n", nonces[best_first_bytes[0]].sum_a8_guess[j].num_states, log(nonces[best_first_bytes[0]].sum_a8_guess[j].num_states)/log(2.0));
+				
 				generate_candidates(first_byte_Sum, nonces[best_first_bytes[0]].sum_a8_guess[j].sum_a8_idx);
-				// PrintAndLogEx(NORMAL, "Time for generating key candidates list: %1.0f sec (%1.1f sec CPU)\n", difftime(time(NULL), start_time), (float)(msclock() - start_clock)/1000.0);
-				//hardnested_print_progress(num_acquired_nonces, "Starting brute force...", expected_brute_force, 0);
 				key_found = brute_force(foundkey);
 				free_statelist_cache();
 				free_candidates_memory(candidates);
diff --git a/client/hardnested/hardnested_bf_core.c b/client/hardnested/hardnested_bf_core.c
index c00434a52..6bf29b795 100644
--- a/client/hardnested/hardnested_bf_core.c
+++ b/client/hardnested/hardnested_bf_core.c
@@ -59,6 +59,7 @@ THE SOFTWARE.
 #include <string.h>
 #include "crapto1/crapto1.h"
 #include "parity.h"
+#include "util.h"
 
 // bitslice type
 // while AVX supports 256 bit vector floating point operations, we need integer operations for boolean logic
@@ -99,9 +100,6 @@ typedef union {
 // size of nonce to be decrypted
 #define KEYSTREAM_SIZE 24
 
-// endianness conversion
-#define rev32(word) ((((word) & 0xff) << 24) | ((((word) >> 8) & 0xff) << 16) | ((((word) >> 16) & 0xff) << 8) | ((((word) >> 24) & 0xff)))
-
 // this needs to be compiled several times for each instruction set. 
 // For each instruction set, define a dedicated function name:
 #if defined (__AVX512F__)
@@ -184,7 +182,7 @@ void BITSLICE_TEST_NONCES(uint32_t nonces_to_bruteforce, uint32_t *bf_test_nonce
 	// bitslice nonces' 2nd to 4th byte
 	for (uint32_t i = 0; i < nonces_to_bruteforce; i++) {
 		for(uint32_t bit_idx = 0; bit_idx < KEYSTREAM_SIZE; bit_idx++){
-			bool bit = get_bit(KEYSTREAM_SIZE-1-bit_idx, rev32(bf_test_nonce[i] << 8));
+			bool bit = get_bit(KEYSTREAM_SIZE-1-bit_idx, BSWAP_32(bf_test_nonce[i] << 8));
 			if(bit){
 				bitsliced_encrypted_nonces[i][bit_idx].value = bs_ones.value;
 			} else {

From c58f487cab2fce86967f85cc0295a278dda28ab0 Mon Sep 17 00:00:00 2001
From: sh7d <sh7d@sh7d>
Date: Sun, 17 Feb 2019 12:54:44 +0100
Subject: [PATCH 0552/1938] em41 - spoof fix

---
 client/cmdlfem4x.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 3260b8d74..7b4386fbb 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -404,8 +404,7 @@ int AskEm410xDemod(const char *Cmd, uint32_t *hi, uint64_t *lo, bool verbose) {
 // this read is the "normal" read,  which download lf signal and tries to demod here.
 int CmdEM410xRead(const char *Cmd) {
 	lf_read(true, 8192);
-	CmdEM410xDemod(Cmd);
-	return 0;
+	return CmdEM410xDemod(Cmd);
 }
 
 // this read loops on device side.

From 2dc3bc6af3599f86849d996ae44b7c06713c467f Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 23 Feb 2019 15:44:34 +0100
Subject: [PATCH 0553/1938] ADD: 'lf keri' - basic commands.

---
 client/Makefile    |   1 +
 client/cmdlfkeri.c | 233 +++++++++++++++++++++++++++++++++++++++++++++
 client/cmdlfkeri.h |  36 +++++++
 3 files changed, 270 insertions(+)
 create mode 100644 client/cmdlfkeri.c
 create mode 100644 client/cmdlfkeri.h

diff --git a/client/Makefile b/client/Makefile
index 0b19d4599..324aaef01 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -187,6 +187,7 @@ CMDSRCS =	crapto1/crapto1.c \
 			cmdlfio.c \
 			cmdlfindala.c \
 			cmdlfjablotron.c \
+			cmdlfkeri.c \
 			cmdlfnexwatch.c \
 			cmdlfnedap.c \
 			cmdlfnoralsy.c \
diff --git a/client/cmdlfkeri.c b/client/cmdlfkeri.c
new file mode 100644
index 000000000..b5f6fa793
--- /dev/null
+++ b/client/cmdlfkeri.c
@@ -0,0 +1,233 @@
+//-----------------------------------------------------------------------------
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// Low frequency KERI tag commands
+// PSK1, RF/128, RF/2, 64 bits long 
+//-----------------------------------------------------------------------------
+#include "cmdlfkeri.h"
+
+static int CmdHelp(const char *Cmd);
+
+int usage_lf_keri_clone(void){
+	PrintAndLogEx(NORMAL, "clone a KERI tag to a T55x7 tag.");
+	PrintAndLogEx(NORMAL, "Usage: lf keri clone [h] <id> <Q5>");
+	PrintAndLogEx(NORMAL, "Options:");
+	PrintAndLogEx(NORMAL, "      h          : This help");
+	PrintAndLogEx(NORMAL, "      <id>       : KERI Internal ID");
+	PrintAndLogEx(NORMAL, "      <Q5>       : specify write to Q5 (t5555 instead of t55x7)");
+	PrintAndLogEx(NORMAL, "");
+	PrintAndLogEx(NORMAL, "Examples:");
+	PrintAndLogEx(NORMAL, "       lf keri clone 112233");
+	return 0;
+}
+
+int usage_lf_keri_sim(void) {
+	PrintAndLogEx(NORMAL, "Enables simulation of KERI card with specified card number.");
+	PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
+	PrintAndLogEx(NORMAL, "");
+	PrintAndLogEx(NORMAL, "Usage:  lf keri sim [h] <id>");
+	PrintAndLogEx(NORMAL, "Options:");
+	PrintAndLogEx(NORMAL, "      h          : This help");
+	PrintAndLogEx(NORMAL, "      <id>       : Keri Internal ID");
+	PrintAndLogEx(NORMAL, "");
+	PrintAndLogEx(NORMAL, "Examples:");
+	PrintAndLogEx(NORMAL, "       lf keri sim 112233");
+	return 0;
+}
+
+// find KERI preamble in already demoded data
+int detectKeri(uint8_t *dest, size_t *size, bool *invert) {
+	
+	uint8_t preamble[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1};
+	uint8_t preamble_i[] = {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0};
+
+	// sanity check. 
+	if ( *size < sizeof(preamble) + 100) return -1;
+
+	size_t startIdx = 0;
+	
+	if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx)) {
+		
+		// if didn't find preamble try again inverting
+		if (!preambleSearch(DemodBuffer, preamble_i, sizeof(preamble_i), size, &startIdx)) 
+			return -2;
+		
+		*invert ^= 1;
+	}
+	
+	if (*size != 64) return -3; //wrong demoded size
+
+	return (int)startIdx;
+}
+
+int CmdKeriDemod(const char *Cmd) {
+
+	if (!PSKDemod("", false)) {
+		PrintAndLogEx(DEBUG, "DEBUG: Error - KERI: PSK1 Demod failed");
+		return 0;
+	}
+	bool invert = false;	
+	size_t size = DemodBufferLen;
+	int idx = detectKeri(DemodBuffer, &size, &invert);
+	if (idx < 0) {
+		if (idx == -1)
+			PrintAndLogEx(DEBUG, "DEBUG: Error - KERI: too few bits found");
+		else if (idx == -2)
+			PrintAndLogEx(DEBUG, "DEBUG: Error - KERI: preamble not found");
+		else if (idx == -3)
+			PrintAndLogEx(DEBUG, "DEBUG: Error - KERI: Size not correct: 64 != %d", size);
+		else
+			PrintAndLogEx(DEBUG, "DEBUG: Error - KERI: ans: %d", idx);
+
+		return 0;
+	}
+	setDemodBuf(DemodBuffer, size, idx);
+	setClockGrid(g_DemodClock, g_DemodStartIdx + (idx * g_DemodClock));
+
+	//got a good demod
+	uint32_t raw1 = bytebits_to_byte(DemodBuffer   , 32);
+	uint32_t raw2 = bytebits_to_byte(DemodBuffer+32, 32);
+	
+	//get internal id
+	uint32_t ID = 0;
+	for (uint8_t i = 30; i < 59; i++){
+		ID = (ID << 1) | DemodBuffer[i];
+	}
+	
+	/*
+		000000000000000000000000000001XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX111
+		^^^^^^^^^^^^^^^^^^^^^^^^^^^^^1###############################^^^
+		Preamble block 29 bits of ZEROS
+		32 bit Internal ID  (First bit always 1) 
+		3 bit of 1s in the end
+		
+		How this is decoded to Facility ID, Card number is unknown
+		Facility ID =  0-31  (indicates 5 bits)
+		Card number = up to 10 digits
+		
+		Might be a hash of FC & CN to generate Internal ID
+	*/
+	
+	PrintAndLogEx(NORMAL, "KERI Tag Found -- Raw: %08X%08X", raw1 ,raw2);
+	
+	PrintAndLogEx(NORMAL, "KERI Internal ID: %d", ID);
+	
+	if (invert){
+		PrintAndLogEx(NORMAL, "Had to Invert - probably KERI");
+		for (size_t i = 0; i < size; i++)
+			DemodBuffer[i] ^= 1;
+	} 
+
+	CmdPrintDemodBuff("x");
+	
+	return 1;
+}
+
+int CmdKeriRead(const char *Cmd) {
+	lf_read(true, 10000);
+	return CmdKeriDemod(Cmd);
+}
+
+int CmdKeriClone(const char *Cmd) {
+	
+	PrintAndLogEx(ERR, "TO BE DONE - Cloning KERI is not implemented yet");
+	/*
+	uint32_t internalid = 0;
+	uint32_t blocks[3] = {T55x7_MODULATION_PSK1 | T55x7_PSKCF_RF_2 | 2 << T55x7_MAXBLOCK_SHIFT | T55x7_BITRATE_RF_16, 0, 0};
+	
+	char cmdp = tolower(param_getchar(Cmd, 0));
+	if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_keri_clone();
+
+	internalid = param_get32ex(Cmd, 0, 0, 10);
+	
+	//Q5
+	if (tolower(param_getchar(Cmd, 1)) == 'q')
+		blocks[0] = T5555_MODULATION_PSK1 | T5555_SET_BITRATE(16) | T5555_PSK_RF_2 | 2 << T5555_MAXBLOCK_SHIFT;
+	
+	
+	// MSB is ONE,  and 3 LSB is ONE
+	uint32_t pre = 
+	internalid &= 0x80000003;
+
+	// 
+	blocks[1] = internalid & 0x
+	blocks[2] = bytebits_to_byte(bits + 32, 32);
+
+	PrintAndLogEx(NORMAL, "Preparing to clone KERI to T55x7 with Internal Id: %u", id);
+	print_blocks(blocks, 3);
+	
+	UsbCommand resp;
+	UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
+
+	for (uint8_t i=0; i<3; i++) {
+		c.arg[0] = blocks[i];
+		c.arg[1] = i;
+		clearCommandBuffer();
+		SendCommand(&c);
+		if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)){
+			PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
+			return -1;
+		}
+	}
+	*/
+    return 0;
+}
+
+int CmdKeriSim(const char *Cmd) {
+
+	PrintAndLogEx(ERR, "TO BE DONE - Simulating KERI is not implemented yet");
+/*
+	uint8_t bits[64];
+	uint8_t *bs = bits;
+	memset(bs, 0, sizeof(bits));
+
+	uint32_t internalid = 0;
+
+	char cmdp = tolower(param_getchar(Cmd, 0));
+	if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_keri_sim();
+
+	internalid = param_get32ex(Cmd, 0, 0, 10);
+
+	uint8_t clk = 32, encoding = 1, separator = 1, invert = 0;
+	uint16_t arg1, arg2;
+	size_t size = 64;
+	arg1 = clk << 8 | encoding;
+	arg2 = invert << 8 | separator;
+	
+	 if ( !getkeriBits(internalid, bs)) {
+		PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
+		return 1;
+	}	
+	
+	PrintAndLogEx(NORMAL, "Simulating KERI - Internal Id: %u", id);
+
+	UsbCommand c = {CMD_PSK_SIM_TAG, {arg1, arg2, size}};
+	memcpy(c.d.asBytes, bs, size);
+	clearCommandBuffer();
+	SendCommand(&c);
+*/	
+	return 0;
+}
+
+static command_t CommandTable[] = {
+	{"help",  CmdHelp,		1, "This help"},
+	{"demod", CmdKeriDemod,	1, "Demodulate an KERI tag from the GraphBuffer"},
+	{"read",  CmdKeriRead,	0, "Attempt to read and extract tag data from the antenna"},
+	{"clone", CmdKeriClone,	0, "clone KERI to T55x7"},
+	{"sim",   CmdKeriSim,	0, "simulate KERI tag"},	
+	{NULL, NULL, 0, NULL}
+};
+
+int CmdLFKeri(const char *Cmd) {
+	clearCommandBuffer();
+	CmdsParse(CommandTable, Cmd);
+	return 0;
+}
+
+int CmdHelp(const char *Cmd) {
+	CmdsHelp(CommandTable);
+	return 0;
+}
diff --git a/client/cmdlfkeri.h b/client/cmdlfkeri.h
new file mode 100644
index 000000000..ed0629b37
--- /dev/null
+++ b/client/cmdlfkeri.h
@@ -0,0 +1,36 @@
+//-----------------------------------------------------------------------------
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// Low frequency Stanley/PAC tag commands
+//-----------------------------------------------------------------------------
+#ifndef CMDLFKERI_H__
+#define CMDLFKERI_H__
+
+#include <string.h>
+#include <inttypes.h>
+#include "proxmark3.h"
+#include "ui.h"
+#include "util.h"
+#include "graph.h"
+#include "cmdparser.h"
+#include "cmddata.h"
+#include "cmdmain.h"
+#include "cmdlf.h"
+#include "protocols.h"  // for T55xx config register definitions
+#include "lfdemod.h"    // preamble test
+
+extern int CmdLFKeri(const char *Cmd);
+extern int CmdKeriRead(const char *Cmd);
+extern int CmdKeriDemod(const char *Cmd);
+extern int CmdKeriClone(const char *Cmd);
+extern int CmdKeriSim(const char *Cmd);
+
+extern int detectKeri(uint8_t *dest, size_t *size, bool *invert);
+
+extern int usage_lf_keri_clone(void);
+extern int usage_lf_keri_sim(void);
+#endif
+

From 9851f88139fecd3fc7c5f4dc880de7ddbed63623 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 23 Feb 2019 15:45:22 +0100
Subject: [PATCH 0554/1938] text

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ce939d980..0c7891297 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [unreleased][unreleased]
+ - Add 'lf keri' - basic support for Keri tags (@iceman)
  - Add 'hf mf list' - readded it again (@iceman)
  - Fix - A lot of bugfixes, like memory leaks (@iceman)
  - Change 'hf 14a antifuzz' - original implementation (@asfabw),  reworked a bit

From f5f6f5d9162230a669eba99fda15a220a9efff0c Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 23 Feb 2019 15:47:37 +0100
Subject: [PATCH 0555/1938] chg: linking in keri

---
 client/cmdlf.c | 1 +
 client/cmdlf.h | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/client/cmdlf.c b/client/cmdlf.c
index 50077add2..4fc877061 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -957,6 +957,7 @@ static command_t CommandTable[] = {
 	{"indala",      CmdLFINDALA,        1, "{ Indala RFIDs...            }"},
 	{"io",          CmdLFIO,            1, "{ ioProx RFIDs...            }"},
 	{"jablotron",	CmdLFJablotron,		1, "{ Jablotron RFIDs...         }"},
+	{"keri",		CmdLFKeri,			1, "{ KERI RFIDs...              }"},
 	{"nedap",		CmdLFNedap,			1, "{ Nedap RFIDs...             }"},
 	{"nexwatch",    CmdLFNEXWATCH,      1, "{ NexWatch RFIDs...          }"},
 	{"noralsy",		CmdLFNoralsy,		1, "{ Noralsy RFIDs...           }"},	
diff --git a/client/cmdlf.h b/client/cmdlf.h
index de216435f..04c7317a1 100644
--- a/client/cmdlf.h
+++ b/client/cmdlf.h
@@ -42,13 +42,14 @@
 #include "cmdlfnoralsy.h"	// for NORALSY meny
 #include "cmdlffdx.h"		// for FDX-B meny
 #include "cmdlfcotag.h"		// for COTAG meny
-#include "cmdlfindala.h" // for indala menu
-#include "cmdlfguard.h"// for gproxii menu
-#include "cmdlffdx.h"    // for fdx-b menu
-#include "cmdlfparadox.h"// for paradox menu
+#include "cmdlfindala.h"	// for indala menu
+#include "cmdlfguard.h"		// for gproxii menu
+#include "cmdlffdx.h"		// for fdx-b menu
+#include "cmdlfparadox.h"	// for paradox menu
 #include "cmdlfnexwatch.h"	//for nexwatch menu
 #include "cmdlfsecurakey.h"	//for securakey menu
 #include "cmdlfpac.h"		// for pac menu
+#include "cmdlfkeri.h"		// for keri menu
 
 #define T55XX_WRITE_TIMEOUT	1500
 

From e0bf2e3fbf69b107977caf29908bef5dd767cd65 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 23 Feb 2019 15:56:11 +0100
Subject: [PATCH 0556/1938] chg: 'lf search' - hooked up Keri detection

---
 client/cmdlf.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/cmdlf.c b/client/cmdlf.c
index 4fc877061..fc0aa5f6e 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -891,6 +891,7 @@ int CmdLFfind(const char *Cmd) {
 	if (CmdLFNedapDemod(""))	{ PrintAndLogEx(SUCCESS, "\nValid NEDAP ID Found!"); goto out;}
 	if (CmdNexWatchDemod("")) 	{ PrintAndLogEx(SUCCESS, "\nValid NexWatch ID Found!"); goto out;}
 	if (CmdNoralsyDemod(""))	{ PrintAndLogEx(SUCCESS, "\nValid Noralsy ID Found!"); goto out;}
+	if (CmdKeriDemod(""))		{ PrintAndLogEx(SUCCESS, "\nValid KERI ID Found!"); goto out;}
 	if (CmdPacDemod(""))		{ PrintAndLogEx(SUCCESS, "\nValid PAC/Stanley ID Found!"); goto out;}	
 	if (CmdParadoxDemod(""))	{ PrintAndLogEx(SUCCESS, "\nValid Paradox ID Found!"); goto out;}
 	if (CmdPrescoDemod(""))		{ PrintAndLogEx(SUCCESS, "\nValid Presco ID Found!"); goto out;}				 

From 92b1f417930896e748788ca4511fe36ef28f740a Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 23 Feb 2019 16:02:44 +0100
Subject: [PATCH 0557/1938] revert chg,  double free...

---
 client/cmdhfmfhard.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/cmdhfmfhard.c b/client/cmdhfmfhard.c
index 9d9406c11..1ebf2131d 100644
--- a/client/cmdhfmfhard.c
+++ b/client/cmdhfmfhard.c
@@ -2397,7 +2397,6 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc
 			key_found = brute_force(foundkey);
 			free(candidates->states[ODD_STATE]);
 			free(candidates->states[EVEN_STATE]);
-			free_statelist_cache();
 			free_candidates_memory(candidates);
 			candidates = NULL;
 		} else {

From dc0dc7b00a374aff058b5b3cebe0d28285b90115 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 23 Feb 2019 16:05:24 +0100
Subject: [PATCH 0558/1938] chg: cleanup

---
 client/cmdlfnexwatch.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/cmdlfnexwatch.c b/client/cmdlfnexwatch.c
index c90557665..4057fe452 100644
--- a/client/cmdlfnexwatch.c
+++ b/client/cmdlfnexwatch.c
@@ -34,14 +34,13 @@ int detectNexWatch(uint8_t *dest, size_t *size, bool *invert) {
 int CmdNexWatchDemod(const char *Cmd) {
 
 	if (!PSKDemod("", false)) {
-		if (g_debugMode) PrintAndLogEx(DEBUG, "DEBUG: Error - NexWatch can't demod signal");
+		PrintAndLogEx(DEBUG, "DEBUG: Error - NexWatch can't demod signal");
 		return 0;
 	}
 	bool invert = false;
 	size_t size = DemodBufferLen;
 	int idx = detectNexWatch(DemodBuffer, &size, &invert);
-	if (idx <= 0){
-		if (g_debugMode){
+	if (idx <= 0) {
 			if (idx == -1)
 				PrintAndLogEx(DEBUG, "DEBUG: Error - NexWatch not enough samples");
 			// else if (idx == -2)
@@ -54,7 +53,7 @@ int CmdNexWatchDemod(const char *Cmd) {
 				// PrintAndLogEx(DEBUG, "DEBUG: Error - NexWatch size not correct: %d", size);
 			else
 				PrintAndLogEx(DEBUG, "DEBUG: Error - NexWatch error %d",idx);
-		}
+
 		return 0;
 	}
 	
@@ -101,6 +100,7 @@ static command_t CommandTable[] = {
 };
 
 int CmdLFNEXWATCH(const char *Cmd) {
+	clearCommandBuffer();	
 	CmdsParse(CommandTable, Cmd);
 	return 0;
 }

From d1c22d0800034e65f09682a09645d72b2db4c14a Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 23 Feb 2019 16:29:00 +0100
Subject: [PATCH 0559/1938] fix: 'lf keri demod' - proper demod now

---
 client/cmdlfkeri.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/client/cmdlfkeri.c b/client/cmdlfkeri.c
index b5f6fa793..cfd01fedc 100644
--- a/client/cmdlfkeri.c
+++ b/client/cmdlfkeri.c
@@ -92,10 +92,8 @@ int CmdKeriDemod(const char *Cmd) {
 	uint32_t raw2 = bytebits_to_byte(DemodBuffer+32, 32);
 	
 	//get internal id
-	uint32_t ID = 0;
-	for (uint8_t i = 30; i < 59; i++){
-		ID = (ID << 1) | DemodBuffer[i];
-	}
+	uint32_t ID = bytebits_to_byte(DemodBuffer+29, 32);	
+	ID &= 0x7FFFFFFF;
 	
 	/*
 		000000000000000000000000000001XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX111
@@ -111,18 +109,16 @@ int CmdKeriDemod(const char *Cmd) {
 		Might be a hash of FC & CN to generate Internal ID
 	*/
 	
-	PrintAndLogEx(NORMAL, "KERI Tag Found -- Raw: %08X%08X", raw1 ,raw2);
-	
-	PrintAndLogEx(NORMAL, "KERI Internal ID: %d", ID);
+	PrintAndLogEx(NORMAL, "KERI Tag Found -- Raw: %08X%08X", raw1 ,raw2);	
+	PrintAndLogEx(NORMAL, "KERI Internal ID: %u", ID);
 	
 	if (invert){
 		PrintAndLogEx(NORMAL, "Had to Invert - probably KERI");
 		for (size_t i = 0; i < size; i++)
 			DemodBuffer[i] ^= 1;
+		
+		CmdPrintDemodBuff("x");
 	} 
-
-	CmdPrintDemodBuff("x");
-	
 	return 1;
 }
 

From fe9c65b65fbcbe6cbab97e0d925171a0e19f39f0 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 23 Feb 2019 17:19:34 +0100
Subject: [PATCH 0560/1938] chg: 'lf keri clone' - now works

---
 client/cmdlfkeri.c | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/client/cmdlfkeri.c b/client/cmdlfkeri.c
index cfd01fedc..70cdb4ca9 100644
--- a/client/cmdlfkeri.c
+++ b/client/cmdlfkeri.c
@@ -129,10 +129,15 @@ int CmdKeriRead(const char *Cmd) {
 
 int CmdKeriClone(const char *Cmd) {
 	
-	PrintAndLogEx(ERR, "TO BE DONE - Cloning KERI is not implemented yet");
-	/*
+
 	uint32_t internalid = 0;
-	uint32_t blocks[3] = {T55x7_MODULATION_PSK1 | T55x7_PSKCF_RF_2 | 2 << T55x7_MAXBLOCK_SHIFT | T55x7_BITRATE_RF_16, 0, 0};
+	uint32_t blocks[3] = {
+			T55x7_X_MODE | T55x7_MODULATION_PSK1 | T55x7_PSKCF_RF_2 | 2 << T55x7_MAXBLOCK_SHIFT | T55x7_BITRATE_RF_128,
+			0,
+			0};
+	
+	// safe key
+	blocks[0] |= 6 << 28;
 	
 	char cmdp = tolower(param_getchar(Cmd, 0));
 	if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_keri_clone();
@@ -141,18 +146,20 @@ int CmdKeriClone(const char *Cmd) {
 	
 	//Q5
 	if (tolower(param_getchar(Cmd, 1)) == 'q')
-		blocks[0] = T5555_MODULATION_PSK1 | T5555_SET_BITRATE(16) | T5555_PSK_RF_2 | 2 << T5555_MAXBLOCK_SHIFT;
+		blocks[0] = T5555_MODULATION_PSK1 | T5555_SET_BITRATE(128) | T5555_PSK_RF_2 | 2 << T5555_MAXBLOCK_SHIFT;
 	
 	
-	// MSB is ONE,  and 3 LSB is ONE
-	uint32_t pre = 
-	internalid &= 0x80000003;
+	// MSB is ONE
+	internalid |= 0x80000000;
 
+	// 3 LSB is ONE
+	uint64_t data =  ((uint64_t)internalid << 3 ) + 7;
+	
 	// 
-	blocks[1] = internalid & 0x
-	blocks[2] = bytebits_to_byte(bits + 32, 32);
+	blocks[1] = data >> 32;
+	blocks[2] = data & 0xFFFFFFFF;
 
-	PrintAndLogEx(NORMAL, "Preparing to clone KERI to T55x7 with Internal Id: %u", id);
+	PrintAndLogEx(NORMAL, "Preparing to clone KERI to T55x7 with Internal Id: %u", internalid);
 	print_blocks(blocks, 3);
 	
 	UsbCommand resp;
@@ -168,7 +175,7 @@ int CmdKeriClone(const char *Cmd) {
 			return -1;
 		}
 	}
-	*/
+
     return 0;
 }
 

From a07dcf79240e310f7ced60e4f0b819be5b9abb15 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Feb 2019 10:25:53 +0100
Subject: [PATCH 0561/1938] chg: 'lf keri clone' - correct config block (use
 extended modes bit rates)

---
 client/cmdlfkeri.c | 56 ++++++++++++++++++++++++++++------------------
 common/protocols.h |  1 +
 2 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/client/cmdlfkeri.c b/client/cmdlfkeri.c
index 70cdb4ca9..fb4f26703 100644
--- a/client/cmdlfkeri.c
+++ b/client/cmdlfkeri.c
@@ -130,14 +130,19 @@ int CmdKeriRead(const char *Cmd) {
 int CmdKeriClone(const char *Cmd) {
 	
 
+
 	uint32_t internalid = 0;
 	uint32_t blocks[3] = {
-			T55x7_X_MODE | T55x7_MODULATION_PSK1 | T55x7_PSKCF_RF_2 | 2 << T55x7_MAXBLOCK_SHIFT | T55x7_BITRATE_RF_128,
+			T55x7_TESTMODE_DISABLED |
+			T55x7_X_MODE | 
+			T55x7_MODULATION_PSK1 | 
+			T55x7_PSKCF_RF_2 | 
+			2 << T55x7_MAXBLOCK_SHIFT,
 			0,
 			0};
 	
-	// safe key
-	blocks[0] |= 6 << 28;
+	// dynamic bitrate used
+	blocks[0] |= 0xF << 18;
 	
 	char cmdp = tolower(param_getchar(Cmd, 0));
 	if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_keri_clone();
@@ -145,8 +150,13 @@ int CmdKeriClone(const char *Cmd) {
 	internalid = param_get32ex(Cmd, 0, 0, 10);
 	
 	//Q5
-	if (tolower(param_getchar(Cmd, 1)) == 'q')
-		blocks[0] = T5555_MODULATION_PSK1 | T5555_SET_BITRATE(128) | T5555_PSK_RF_2 | 2 << T5555_MAXBLOCK_SHIFT;
+	if (tolower(param_getchar(Cmd, 1)) == 'q') {
+		blocks[0] = 
+			T5555_MODULATION_PSK1 | 
+			T5555_SET_BITRATE(128) | 
+			T5555_PSK_RF_2 | 
+			2 << T5555_MAXBLOCK_SHIFT;
+	}
 	
 	
 	// MSB is ONE
@@ -161,11 +171,13 @@ int CmdKeriClone(const char *Cmd) {
 
 	PrintAndLogEx(NORMAL, "Preparing to clone KERI to T55x7 with Internal Id: %u", internalid);
 	print_blocks(blocks, 3);
-	
+
+
 	UsbCommand resp;
 	UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
 
-	for (uint8_t i=0; i<3; i++) {
+
+	for (uint8_t i = 0; i < 3; i++) {
 		c.arg[0] = blocks[i];
 		c.arg[1] = i;
 		clearCommandBuffer();
@@ -181,37 +193,37 @@ int CmdKeriClone(const char *Cmd) {
 
 int CmdKeriSim(const char *Cmd) {
 
-	PrintAndLogEx(ERR, "TO BE DONE - Simulating KERI is not implemented yet");
-/*
+	char cmdp = tolower(param_getchar(Cmd, 0));
+	if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_keri_sim();
+
 	uint8_t bits[64];
 	uint8_t *bs = bits;
 	memset(bs, 0, sizeof(bits));
 
-	uint32_t internalid = 0;
+	uint32_t internalid = param_get32ex(Cmd, 0, 0, 10);
 
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_keri_sim();
+	// loop to bits.
+	internalid |= 0x80000000;
 
-	internalid = param_get32ex(Cmd, 0, 0, 10);
+	// 3 LSB is ONE
+	uint64_t data =  ((uint64_t)internalid << 3 ) + 7;
+	
 
-	uint8_t clk = 32, encoding = 1, separator = 1, invert = 0;
+	
+	uint8_t clk = 32, carrier = 2, invert = 0;
 	uint16_t arg1, arg2;
 	size_t size = 64;
-	arg1 = clk << 8 | encoding;
-	arg2 = invert << 8 | separator;
+	arg1 = clk << 8 | carrier;
+	arg2 = invert;
 	
-	 if ( !getkeriBits(internalid, bs)) {
-		PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
-		return 1;
-	}	
 	
-	PrintAndLogEx(NORMAL, "Simulating KERI - Internal Id: %u", id);
+	PrintAndLogEx(NORMAL, "Simulating KERI - Internal Id: %u", internalid);
 
 	UsbCommand c = {CMD_PSK_SIM_TAG, {arg1, arg2, size}};
 	memcpy(c.d.asBytes, bs, size);
 	clearCommandBuffer();
 	SendCommand(&c);
-*/	
+	
 	return 0;
 }
 
diff --git a/common/protocols.h b/common/protocols.h
index 3c2e79a8d..73355c85d 100644
--- a/common/protocols.h
+++ b/common/protocols.h
@@ -389,6 +389,7 @@ void getMemConfig(uint8_t mem_cfg, uint8_t chip_cfg, uint8_t *max_blk, uint8_t *
 #define T55x7_BITRATE_RF_64			0x00140000
 #define T55x7_BITRATE_RF_100		0x00180000
 #define T55x7_BITRATE_RF_128		0x001C0000
+#define T55x7_TESTMODE_DISABLED		0x60000000
 
 /* T5555 (Q5) configuration register definitions */
 #define T5555_ST_TERMINATOR			0x00000001

From 9f10ff6e1794bea5e7dff43624926bf86737be07 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Feb 2019 10:26:55 +0100
Subject: [PATCH 0562/1938] sugar

---
 client/cmdhfmfu.c | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index d703f980d..8b27d9b22 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -2381,7 +2381,7 @@ int CmdHF14AMfuGenDiverseKeys(const char *Cmd){
 	if (strlen(Cmd) == 0  || cmdp == 'h') return usage_hf_mfu_gendiverse();
 
 	if ( cmdp == 'r' ) {
-			// read uid from tag
+		// read uid from tag
 		UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0}};
 		clearCommandBuffer();
 		SendCommand(&c);
@@ -2390,8 +2390,13 @@ int CmdHF14AMfuGenDiverseKeys(const char *Cmd){
 		iso14a_card_select_t card;
 		memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
 		
-		uint64_t select_status = resp.arg[0];		// 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
-		if(select_status == 0) {
+		uint64_t select_status = resp.arg[0];	
+		// 0: couldn't read,
+		// 1: OK, with ATS
+		// 2: OK, no ATS
+		// 3: proprietary Anticollision
+		
+		if ( select_status == 0 ) {
 			PrintAndLogEx(WARNING, "iso14443a card select failed");
 			return 1;
 		}
@@ -2446,12 +2451,12 @@ int CmdHF14AMfuGenDiverseKeys(const char *Cmd){
 	PrintAndLogEx(NORMAL, "Diversified key: %s", sprint_hex(divkey+1, 6));
 	
 	for (int i=0; i < sizeof(mifarekeyA); ++i){
-		dkeyA[i] = (mifarekeyA[i] << 1) & 0xff;
-		dkeyA[6] |=  ((mifarekeyA[i] >> 7) & 1) << (i+1);
+		dkeyA[i]  = (mifarekeyA[i] << 1) & 0xff;
+		dkeyA[6] |= ((mifarekeyA[i] >> 7) & 1) << (i+1);
 	}
 	
 	for (int i=0; i < sizeof(mifarekeyB); ++i){
-		dkeyB[1] |=  ((mifarekeyB[i] >> 7) & 1) << (i+1);
+		dkeyB[1]  |= ((mifarekeyB[i] >> 7) & 1) << (i+1);
 		dkeyB[2+i] = (mifarekeyB[i] << 1) & 0xff;
 	}
 	
@@ -2488,6 +2493,7 @@ int CmdHF14AMfuPwdGen(const char *Cmd){
 	uint8_t uid[7] = {0x00};	
 	char cmdp = tolower(param_getchar(Cmd, 0));
 	if (strlen(Cmd) == 0  || cmdp == 'h') return usage_hf_mfu_pwdgen();
+	
 	if (cmdp == 't') return ul_ev1_pwdgen_selftest();
 	
 	if ( cmdp == 'r') {
@@ -2500,8 +2506,12 @@ int CmdHF14AMfuPwdGen(const char *Cmd){
 		iso14a_card_select_t card;
 		memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
 		
-		uint64_t select_status = resp.arg[0];		// 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
-		if(select_status == 0) {
+		uint64_t select_status = resp.arg[0];
+		// 0: couldn't read
+		// 1: OK with ATS
+		// 2: OK, no ATS
+		// 3: proprietary Anticollision
+		if ( select_status == 0 ) {
 			PrintAndLogEx(WARNING, "iso14443a card select failed");
 			return 1;
 		}
@@ -2514,6 +2524,7 @@ int CmdHF14AMfuPwdGen(const char *Cmd){
 	else {
 		if (param_gethex(Cmd, 0, uid, 14)) return usage_hf_mfu_pwdgen();
 	}
+	
 	PrintAndLogEx(NORMAL, "---------------------------------");
 	PrintAndLogEx(NORMAL, " Using UID : %s", sprint_hex(uid, 7));
 	PrintAndLogEx(NORMAL, "---------------------------------");
@@ -2531,8 +2542,7 @@ int CmdHF14AMfuPwdGen(const char *Cmd){
 //------------------------------------
 // Menu Stuff
 //------------------------------------
-static command_t CommandTable[] =
-{
+static command_t CommandTable[] = {
 	{"help",	CmdHelp,			1, "This help"},
 	{"dbg",		CmdHF14AMfDbg,		0, "Set default debug mode"},
 	{"info",	CmdHF14AMfUInfo,	0, "Tag information"},
@@ -2552,7 +2562,6 @@ static command_t CommandTable[] =
 
 int CmdHFMFUltra(const char *Cmd){
 	clearCommandBuffer();
-	//WaitForResponseTimeout(CMD_ACK,NULL,100);
 	CmdsParse(CommandTable, Cmd);
 	return 0;
 }

From 730b4940f8c19d2cd3631b605bcbc064babcbf31 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Feb 2019 11:14:51 +0100
Subject: [PATCH 0563/1938] chg: 'lf keri sim' - is kind of up, *untested*

---
 client/cmdlfkeri.c | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/client/cmdlfkeri.c b/client/cmdlfkeri.c
index fb4f26703..ec8020aa2 100644
--- a/client/cmdlfkeri.c
+++ b/client/cmdlfkeri.c
@@ -16,7 +16,7 @@ int usage_lf_keri_clone(void){
 	PrintAndLogEx(NORMAL, "Usage: lf keri clone [h] <id> <Q5>");
 	PrintAndLogEx(NORMAL, "Options:");
 	PrintAndLogEx(NORMAL, "      h          : This help");
-	PrintAndLogEx(NORMAL, "      <id>       : KERI Internal ID");
+	PrintAndLogEx(NORMAL, "      <id>       : Keri Internal ID");
 	PrintAndLogEx(NORMAL, "      <Q5>       : specify write to Q5 (t5555 instead of t55x7)");
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Examples:");
@@ -128,8 +128,6 @@ int CmdKeriRead(const char *Cmd) {
 }
 
 int CmdKeriClone(const char *Cmd) {
-	
-
 
 	uint32_t internalid = 0;
 	uint32_t blocks[3] = {
@@ -196,19 +194,17 @@ int CmdKeriSim(const char *Cmd) {
 	char cmdp = tolower(param_getchar(Cmd, 0));
 	if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_keri_sim();
 
-	uint8_t bits[64];
-	uint8_t *bs = bits;
-	memset(bs, 0, sizeof(bits));
-
-	uint32_t internalid = param_get32ex(Cmd, 0, 0, 10);
-
-	// loop to bits.
+	uint64_t internalid = param_get32ex(Cmd, 0, 0, 10);
 	internalid |= 0x80000000;
+	internalid <<= 3;
+	internalid += 7;
 
-	// 3 LSB is ONE
-	uint64_t data =  ((uint64_t)internalid << 3 ) + 7;
-	
-
+	uint8_t bits[64] = {0x00};	
+	// loop to bits
+	uint8_t j = 0;
+	for ( int8_t i = 63; i >= 0; --i) {
+		bits[j++] = ((internalid >> i) & 1 );
+	}
 	
 	uint8_t clk = 32, carrier = 2, invert = 0;
 	uint16_t arg1, arg2;
@@ -216,14 +212,13 @@ int CmdKeriSim(const char *Cmd) {
 	arg1 = clk << 8 | carrier;
 	arg2 = invert;
 	
-	
 	PrintAndLogEx(NORMAL, "Simulating KERI - Internal Id: %u", internalid);
-
+	
 	UsbCommand c = {CMD_PSK_SIM_TAG, {arg1, arg2, size}};
 	memcpy(c.d.asBytes, bs, size);
 	clearCommandBuffer();
 	SendCommand(&c);
-	
+
 	return 0;
 }
 

From 1c2dea29bb56f0757d01f029538eeee9328724e0 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Feb 2019 14:38:33 +0100
Subject: [PATCH 0564/1938] chg

---
 client/cmdlfem4x.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 7b4386fbb..97e0668cc 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -364,9 +364,7 @@ int AskEm410xDecode(bool verbose, uint32_t *hi, uint64_t *lo ) {
 	int ans = Em410xDecode(bits, &size, &idx, hi, lo);
 	if ( ans < 0){
 
-		if (ans == -1)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - Em410x not only 0|1 in decoded bitstream");
-		else if (ans == -2)
+		if (ans == -2)
 			PrintAndLogEx(DEBUG, "DEBUG: Error - Em410x not enough samples after demod");
 		else if (ans == -4)
 			PrintAndLogEx(DEBUG, "DEBUG: Error - Em410x preamble not found");

From 8cc9cc312f72ef0bb599f22fc2642893baa0673a Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Feb 2019 14:39:20 +0100
Subject: [PATCH 0565/1938] chg... names names..sigh

---
 client/cmdlfkeri.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdlfkeri.c b/client/cmdlfkeri.c
index ec8020aa2..884e89933 100644
--- a/client/cmdlfkeri.c
+++ b/client/cmdlfkeri.c
@@ -215,7 +215,7 @@ int CmdKeriSim(const char *Cmd) {
 	PrintAndLogEx(NORMAL, "Simulating KERI - Internal Id: %u", internalid);
 	
 	UsbCommand c = {CMD_PSK_SIM_TAG, {arg1, arg2, size}};
-	memcpy(c.d.asBytes, bs, size);
+	memcpy(c.d.asBytes, bits, size);
 	clearCommandBuffer();
 	SendCommand(&c);
 

From cea5b5214d3ceab5fcf374984f52bd01af3f8758 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Feb 2019 14:51:21 +0100
Subject: [PATCH 0566/1938] chg: colors

---
 client/cmdhficlass.c  |  4 ++--
 client/cmdhfmf.c      |  2 +-
 client/cmdlft55xx.c   | 27 ++++++++++++++-------------
 client/cmdsmartcard.c |  2 +-
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index ddc6fb2c0..82e14d5ea 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -626,7 +626,7 @@ int CmdHFiClassELoad(const char *Cmd) {
 	
 	f = fopen(filename, "rb");
 	if ( !f ){
-		PrintAndLogEx(FAILED, "File: %s: not found or locked.", filename);
+		PrintAndLogEx(FAILED, "File: " _YELLOW_(%s) ": not found or locked.", filename);
 		return 1;
 	}
 	
@@ -2304,7 +2304,7 @@ int LoadDictionaryKeyFile( char* filename, uint8_t **keys, int *keycnt) {
 	int keyitems = 0;
 	
 	if ( !(f = fopen( filename , "r")) ) {
-		PrintAndLogEx(ERR, "file: %s: not found or locked.", filename);
+		PrintAndLogEx(FAILED, "File: " _YELLOW_(%s) ": not found or locked.", filename);
 		return 1;
 	}
 
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 2412aecee..76f0fc2b6 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -1812,7 +1812,7 @@ int CmdHF14AMfChk(const char *Cmd) {
 			
 			f = fopen( filename , "r");
 			if ( !f ) {
-				PrintAndLogEx(FAILED, "File: " _YELLOW_(%s)": not found or locked.", filename);
+				PrintAndLogEx(FAILED, "File: " _YELLOW_(%s) ": not found or locked.", filename);
 				continue;
 			}
 			
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index abf8f04ec..52240f0db 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -691,7 +691,7 @@ bool tryDetectModulation(){
 	
 	bool retval = false;
 	if ( hits > 1) {
-		PrintAndLogEx(NORMAL, "Found [%d] possible matches for modulation.",hits);
+		PrintAndLogEx(SUCCESS, "Found [%d] possible matches for modulation.", hits);
 		for(int i=0; i<hits; ++i){
 			retval = testKnownConfigBlock(tests[i].block0);
 			if ( retval ) {				
@@ -942,9 +942,9 @@ int printConfiguration( t55xx_conf_block_t b){
 	PrintAndLogEx(NORMAL, "Chip Type  : %s", (b.Q5) ? "T5555(Q5)" : "T55x7");
 	PrintAndLogEx(NORMAL, "Modulation : %s", GetSelectedModulationStr(b.modulation) );
 	PrintAndLogEx(NORMAL, "Bit Rate   : %s", GetBitRateStr(b.bitrate, (b.block0 & T55x7_X_MODE && (b.block0>>28==6 || b.block0>>28==9))) );
-	PrintAndLogEx(NORMAL, "Inverted   : %s", (b.inverted) ? "Yes" : "No" );
+	PrintAndLogEx(NORMAL, "Inverted   : %s", (b.inverted) ? _GREEN_(Yes) : "No" );
 	PrintAndLogEx(NORMAL, "Offset     : %d", b.offset);
-	PrintAndLogEx(NORMAL, "Seq. Term. : %s", (b.ST) ? "Yes" : "No" );
+	PrintAndLogEx(NORMAL, "Seq. Term. : %s", (b.ST) ? _GREEN_(Yes) : "No" );
 	PrintAndLogEx(NORMAL, "Block0     : 0x%08X", b.block0);
 	PrintAndLogEx(NORMAL, "");
 	return 0;
@@ -1264,24 +1264,25 @@ int CmdT55xxInfo(const char *Cmd){
 	uint32_t inv      = PackBits(si, 1, DemodBuffer); si += 1;	
 	uint32_t por      = PackBits(si, 1, DemodBuffer); si += 1;
 	
-	if (config.Q5) PrintAndLogEx(NORMAL, "*** Warning *** Config Info read off a Q5 will not display as expected");
+	if (config.Q5) PrintAndLogEx(NORMAL, _RED_(*** Warning ***) " Config Info read off a Q5 will not display as expected");
+	
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "-- T55x7 Configuration & Tag Information --------------------");
 	PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
 	PrintAndLogEx(NORMAL, " Safer key                 : %s", GetSaferStr(safer));
 	PrintAndLogEx(NORMAL, " reserved                  : %d", resv);
 	PrintAndLogEx(NORMAL, " Data bit rate             : %s", GetBitRateStr(dbr, extend));
-	PrintAndLogEx(NORMAL, " eXtended mode             : %s", (extend) ? "Yes - Warning":"No");
+	PrintAndLogEx(NORMAL, " eXtended mode             : %s", (extend) ? _YELLOW_("Yes - Warning") : "No");
 	PrintAndLogEx(NORMAL, " Modulation                : %s", GetModulationStr(datamod));
 	PrintAndLogEx(NORMAL, " PSK clock frequency       : %d", pskcf);
-	PrintAndLogEx(NORMAL, " AOR - Answer on Request   : %s", (aor) ? "Yes":"No");
-	PrintAndLogEx(NORMAL, " OTP - One Time Pad        : %s", (otp) ? "Yes - Warning":"No" );
+	PrintAndLogEx(NORMAL, " AOR - Answer on Request   : %s", (aor) ? _GREEN_(Yes) : "No");
+	PrintAndLogEx(NORMAL, " OTP - One Time Pad        : %s", (otp) ? _YELLOW_(Yes - Warning) : "No" );
 	PrintAndLogEx(NORMAL, " Max block                 : %d", maxblk);
-	PrintAndLogEx(NORMAL, " Password mode             : %s", (pwd) ? "Yes":"No");
-	PrintAndLogEx(NORMAL, " Sequence Start Terminator : %s", (sst) ? "Yes":"No");
-	PrintAndLogEx(NORMAL, " Fast Write                : %s", (fw)  ? "Yes":"No");
-	PrintAndLogEx(NORMAL, " Inverse data              : %s", (inv) ? "Yes":"No");
-	PrintAndLogEx(NORMAL, " POR-Delay                 : %s", (por) ? "Yes":"No");
+	PrintAndLogEx(NORMAL, " Password mode             : %s", (pwd) ? _GREEN_(Yes) : "No");
+	PrintAndLogEx(NORMAL, " Sequence Start Terminator : %s", (sst) ? _GREEN_(Yes) : "No");
+	PrintAndLogEx(NORMAL, " Fast Write                : %s", (fw)  ? _GREEN_(Yes) : "No");
+	PrintAndLogEx(NORMAL, " Inverse data              : %s", (inv) ? _GREEN_(Yes) : "No");
+	PrintAndLogEx(NORMAL, " POR-Delay                 : %s", (por) ? _GREEN_(Yes) : "No");
 	PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
 	PrintAndLogEx(NORMAL, " Raw Data - Page 0");
 	PrintAndLogEx(NORMAL, "     Block 0  : 0x%08X  %s", block0, sprint_bin(DemodBuffer + config.offset, 32) );
@@ -1581,7 +1582,7 @@ int CmdT55xxChkPwds(const char *Cmd) {
 	
 		FILE * f = fopen( filename , "r");		
 		if ( !f ) {
-			PrintAndLogEx(WARNING, "File: %s: not found or locked.", filename);
+			PrintAndLogEx(FAILED, "File: " _YELLOW_(%s) ": not found or locked.", filename);
 			free(keyBlock);
 			return 1;
 		}			
diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index f9b77dad0..8b10dc6fe 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -595,7 +595,7 @@ int CmdSmartUpgrade(const char *Cmd) {
 	// load file
 	f = fopen(filename, "rb");
 	if ( !f ){
-		PrintAndLogEx(FAILED, "File: %s: not found or locked.", filename);
+		PrintAndLogEx(FAILED, "File: " _YELLOW_(%s) ": not found or locked.", filename);
 		return 1;
 	}	
 	

From 38262389fc29dc4ca6bde51ef1f8db60a6098856 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Feb 2019 14:58:22 +0100
Subject: [PATCH 0567/1938] chg: colors

---
 client/cmdlft55xx.c | 51 ++++++++++++++++++++-------------------------
 1 file changed, 23 insertions(+), 28 deletions(-)

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 52240f0db..535b6fa1c 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -954,13 +954,11 @@ int CmdT55xxWakeUp(const char *Cmd) {
 	uint32_t password = 0;
 	uint8_t cmdp = 0;
 	bool errors = false;
-	while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch(param_getchar(Cmd, cmdp)) {
+	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+		switch (tolower(param_getchar(Cmd, cmdp))) {
 		case 'h':
-		case 'H':
 			return usage_t55xx_wakup();
 		case 'p':
-		case 'P':
 			password = param_get32ex(Cmd, cmdp+1, 0, 16);
 			cmdp += 2;
 			errors = false;
@@ -976,7 +974,7 @@ int CmdT55xxWakeUp(const char *Cmd) {
 	UsbCommand c = {CMD_T55XX_WAKEUP, {password, 0, 0}};
 	clearCommandBuffer();
 	SendCommand(&c);
-	PrintAndLogEx(NORMAL, "Wake up command sent. Try read now");
+	PrintAndLogEx(SUCCESS, "Wake up command sent. Try read now");
 	return 0;
 }
 
@@ -990,30 +988,25 @@ int CmdT55xxWriteBlock(const char *Cmd) {
 	bool testMode = false;
 	bool errors = false;
 	uint8_t cmdp = 0;
-	while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch(param_getchar(Cmd, cmdp)) {
+	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+		switch (tolower(param_getchar(Cmd, cmdp))) {
 		case 'h':
-		case 'H':
 			return usage_t55xx_write();
 		case 'b':
-		case 'B':
 			errors |= param_getdec(Cmd, cmdp+1, &block);
 			cmdp += 2;
 			break;
 		case 'd':
-		case 'D':
 			data = param_get32ex(Cmd, cmdp+1, 0, 16);
 			gotdata	= true;
 			cmdp += 2;
 			break;
 		case 'p':
-		case 'P':
 			password = param_get32ex(Cmd, cmdp+1, 0, 16);
 			usepwd = true;
 			cmdp += 2;
 			break;
 		case 't':
-		case 'T':
 			testMode = true;
 			cmdp++;
 			break;
@@ -1030,7 +1023,7 @@ int CmdT55xxWriteBlock(const char *Cmd) {
 	if (errors || !gotdata) return usage_t55xx_write();
 
 	if (block > 7) {
-		PrintAndLogEx(NORMAL, "Block number must be between 0 and 7");
+		PrintAndLogEx(WARNING, "Block number must be between 0 and 7");
 		return 0;
 	}
 	
@@ -1042,7 +1035,7 @@ int CmdT55xxWriteBlock(const char *Cmd) {
 	char pwdStr[16] = {0};
 	snprintf(pwdStr, sizeof(pwdStr), "pwd: 0x%08X", password);
 	
-	PrintAndLogEx(NORMAL, "Writing page %d  block: %02d  data: 0x%08X %s", page1, block, data,  (usepwd) ? pwdStr : "" );
+	PrintAndLogEx(INFO, "Writing page %d  block: %02d  data: 0x%08X %s", page1, block, data,  (usepwd) ? pwdStr : "" );
 
 	//Password mode
 	if (usepwd) {
@@ -1059,12 +1052,13 @@ int CmdT55xxWriteBlock(const char *Cmd) {
 }
 
 int CmdT55xxReadTrace(const char *Cmd) {
-	char cmdp = param_getchar(Cmd, 0);
-	bool pwdmode = false;
-	uint32_t password = 0;	
-	if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') return usage_t55xx_trace();
+	char cmdp = tolower(param_getchar(Cmd, 0));
+	if (strlen(Cmd) > 1 || cmdp == 'h') return usage_t55xx_trace();
 
-	if (strlen(Cmd)==0) {
+	bool pwdmode = false;
+	uint32_t password = 0;
+	
+	if (strlen(Cmd) == 0) {
 		// sanity check.
 		if (!SanityOfflineCheck(false)) return 1;
 
@@ -1091,7 +1085,7 @@ int CmdT55xxReadTrace(const char *Cmd) {
 		uint32_t hdr = PackBits(si, 9,  DemodBuffer); si += 9;
     
 		if (hdr != 0x1FF) {
-		  PrintAndLogEx(NORMAL, "Invalid Q5 Trace data header (expected 0x1FF, found %X)", hdr);
+		  PrintAndLogEx(FAILED, "Invalid Q5 Trace data header (expected 0x1FF, found %X)", hdr);
 		  return 1;
 		}
     
@@ -1130,7 +1124,7 @@ int CmdT55xxReadTrace(const char *Cmd) {
 		
 		data.acl = PackBits(si, 8,  DemodBuffer); si += 8;
 		if ( data.acl != 0xE0 ) {
-			PrintAndLogEx(NORMAL, "The modulation is most likely wrong since the ACL is not 0xE0. ");
+			PrintAndLogEx(FAILED, "The modulation is most likely wrong since the ACL is not 0xE0. ");
 			return 1;
 		}
 
@@ -1227,11 +1221,11 @@ int CmdT55xxInfo(const char *Cmd){
 	*/
 	bool pwdmode = false;
 	uint32_t password = 0;
-	char cmdp = param_getchar(Cmd, 0);
+	char cmdp = tolower(param_getchar(Cmd, 0));
 
-	if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') return usage_t55xx_info();
+	if (strlen(Cmd) > 1 || cmdp == 'h') return usage_t55xx_info();
 	
-	if (strlen(Cmd)==0){
+	if (strlen(Cmd) == 0) {
 		// sanity check.
 		if (!SanityOfflineCheck(false)) return 1;
 		
@@ -1264,7 +1258,8 @@ int CmdT55xxInfo(const char *Cmd){
 	uint32_t inv      = PackBits(si, 1, DemodBuffer); si += 1;	
 	uint32_t por      = PackBits(si, 1, DemodBuffer); si += 1;
 	
-	if (config.Q5) PrintAndLogEx(NORMAL, _RED_(*** Warning ***) " Config Info read off a Q5 will not display as expected");
+	if (config.Q5) 
+		PrintAndLogEx(NORMAL, _RED_(*** Warning ***) " Config Info read off a Q5 will not display as expected");
 	
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "-- T55x7 Configuration & Tag Information --------------------");
@@ -1272,7 +1267,7 @@ int CmdT55xxInfo(const char *Cmd){
 	PrintAndLogEx(NORMAL, " Safer key                 : %s", GetSaferStr(safer));
 	PrintAndLogEx(NORMAL, " reserved                  : %d", resv);
 	PrintAndLogEx(NORMAL, " Data bit rate             : %s", GetBitRateStr(dbr, extend));
-	PrintAndLogEx(NORMAL, " eXtended mode             : %s", (extend) ? _YELLOW_("Yes - Warning") : "No");
+	PrintAndLogEx(NORMAL, " eXtended mode             : %s", (extend) ? _YELLOW_(Yes - Warning) : "No");
 	PrintAndLogEx(NORMAL, " Modulation                : %s", GetModulationStr(datamod));
 	PrintAndLogEx(NORMAL, " PSK clock frequency       : %d", pskcf);
 	PrintAndLogEx(NORMAL, " AOR - Answer on Request   : %s", (aor) ? _GREEN_(Yes) : "No");
@@ -1294,8 +1289,8 @@ int CmdT55xxDump(const char *Cmd){
 
 	uint32_t password = 0;
 	bool override = false;
-	char cmdp = param_getchar(Cmd, 0);	
-	if ( cmdp == 'h' || cmdp == 'H') return usage_t55xx_dump();
+	char cmdp = tolower(param_getchar(Cmd, 0));
+	if ( cmdp == 'h') return usage_t55xx_dump();
 
 	bool usepwd = ( strlen(Cmd) > 0);	
 	if ( usepwd ){

From 7bbb2cdb9d55c04ba8fd84a1f4b736862ed0bb7d Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Feb 2019 15:07:41 +0100
Subject: [PATCH 0568/1938] chg: 'lf t55xx chk' - logic params. chg: colors

---
 client/cmdlft55xx.c | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 535b6fa1c..8d850f5d0 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1475,7 +1475,7 @@ int CmdT55xxWipe(const char *Cmd) {
 
 	// Try with the default password to reset block 0
 	// With a pwd should work even if pwd bit not set
-	PrintAndLogEx(NORMAL, "\nBeginning Wipe of a T55xx tag (assuming the tag is not password protected)\n");
+	PrintAndLogEx(INFO, "\nBeginning Wipe of a T55xx tag (assuming the tag is not password protected)\n");
 		
 	if ( Q5 )
 		snprintf(ptrData,sizeof(writeData),"b 0 d 6001F004 p 0");
@@ -1490,7 +1490,7 @@ int CmdT55xxWipe(const char *Cmd) {
 		
 		if (!CmdT55xxWriteBlock(ptrData)) PrintAndLogEx(WARNING, "Error writing blk %d", blk);
 		
-		memset(writeData,0x00, sizeof(writeData));
+		memset(writeData, 0x00, sizeof(writeData));
 	}
 	return 0;
 }
@@ -1517,7 +1517,7 @@ int CmdT55xxChkPwds(const char *Cmd) {
 	memset(line, 0, sizeof(line));
 	
     char cmdp = tolower(param_getchar(Cmd, 0));
-	if (cmdp == 'h') return usage_t55xx_chk();
+	if (strlen(Cmd) == 0 || cmdp == 'h') return usage_t55xx_chk();
 	
 	/*
 	if ( T55xxReadBlock(7, 0, 0, 0, 0) ) {
@@ -1618,7 +1618,8 @@ int CmdT55xxChkPwds(const char *Cmd) {
 //			PrintAndLogEx(NORMAL, "chk custom pwd[%2d] %08X", keycnt, bytes_to_num(keyBlock + 4 * keycnt, 4) );
 			keycnt++;			
 			memset(line, 0, sizeof(line));
-		}		
+		}
+		
 		if (f)
 			fclose(f);
 		
@@ -1731,7 +1732,7 @@ int CmdT55xxBruteForce(const char *Cmd) {
 }
 
 int tryOnePassword(uint32_t password) {
-	PrintAndLogEx(NORMAL, "Trying password %08x", password);
+	PrintAndLogEx(INFO, "Trying password %08x", password);
 	if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, password)) {
 		PrintAndLogEx(NORMAL, "Acquire data from device failed. Quitting");
 		return -1;
@@ -1750,8 +1751,8 @@ int CmdT55xxRecoverPW(const char *Cmd) {
 	uint32_t prev_password = 0xffffffff;
 	uint32_t mask = 0x0;
 	int found = 0;
-	char cmdp = param_getchar(Cmd, 0);
-	if (cmdp == 'h' || cmdp == 'H') return usage_t55xx_recoverpw();
+	char cmdp = tolower(param_getchar(Cmd, 0));
+	if (cmdp == 'h' ) return usage_t55xx_recoverpw();
 
 	orig_password = param_get32ex(Cmd, 0, 0x51243648, 16); //password used by handheld cloners
 
@@ -1934,13 +1935,11 @@ int CmdT55xxDetectPage1(const char *Cmd){
 	uint32_t password = 0;
 	uint8_t cmdp = 0;
 
-	while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch(param_getchar(Cmd, cmdp)) {
+	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+		switch (tolower(param_getchar(Cmd, cmdp))) {
 		case 'h':
-		case 'H':
 			return usage_t55xx_detectP1();
 		case 'p':
-		case 'P':
 			password = param_get32ex(Cmd, cmdp+1, 0, 16);
 			usepwd = true;
 			cmdp += 2;
@@ -1963,7 +1962,7 @@ int CmdT55xxDetectPage1(const char *Cmd){
 			return false;
 	}
 	bool success = tryDetectP1(false);
-	if (success) PrintAndLogEx(NORMAL, "T55xx chip found!");
+	if (success) PrintAndLogEx(SUCCESS, "T55xx chip found!");
 	return success;
 }
 

From 730304ca926a538effa8e3c65269a371ebe84981 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Feb 2019 15:10:19 +0100
Subject: [PATCH 0569/1938] texts

---
 client/cmdlf.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/client/cmdlf.c b/client/cmdlf.c
index fc0aa5f6e..d51dfe7c7 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -819,14 +819,16 @@ int CheckChipType(bool getDeviceData) {
 	//check for em4x05/em4x69 chips first
 	uint32_t word = 0;
 	if (EM4x05IsBlock0(&word)) {
-		PrintAndLogEx(NORMAL, "\nValid EM4x05/EM4x69 Chip Found\nTry lf em 4x05... commands\n");
+		PrintAndLogEx(SUCCESS, "\nValid EM4x05/EM4x69 Chip Found");
+		PrintAndLogEx(SUCCESS, "Try lf em 4x05... commands");
 		save_restoreGB(GRAPH_RESTORE);
 		return 1;
 	}
 
 	//check for t55xx chip...
 	if (tryDetectP1(true)) {
-		PrintAndLogEx(NORMAL, "\nValid T55xx Chip Found\nTry `lf t55xx` commands\n");
+		PrintAndLogEx(SUCCESS, "\nValid T55xx Chip Found");
+		PrintAndLogEx(SUCCESS, "Try `lf t55xx` commands");
 		save_restoreGB(GRAPH_RESTORE);
 		return 1;		
 	}

From 8551f811ca0f0dfa620f56f9aa6d804b3ccfc100 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Feb 2019 15:13:31 +0100
Subject: [PATCH 0570/1938] colors

---
 client/cmdlf.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/client/cmdlf.c b/client/cmdlf.c
index d51dfe7c7..f882a7ca3 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -858,9 +858,10 @@ int CmdLFfind(const char *Cmd) {
 		return 0;
 	}
 
-	PrintAndLogEx(NORMAL, "NOTE: some demods output possible binary\n  if it finds something that looks like a tag");
-	PrintAndLogEx(NORMAL, "False Positives ARE possible\n");  
-	PrintAndLogEx(NORMAL, "\nChecking for known tags:\n");
+	PrintAndLogEx(INFO, "NOTE: some demods output possible binary");
+	PrintAndLogEx(INFO, "if it finds something that looks like a tag");
+	PrintAndLogEx(INFO, "False Positives " _YELLOW_(ARE) "possible\n");  
+	PrintAndLogEx(INFO, "\nChecking for known tags:\n");
 	
 	// only run these tests if device is online
 	if (isOnline) {

From cc2c440683d4a842745dd77754bfa61841a4014a Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Feb 2019 15:16:57 +0100
Subject: [PATCH 0571/1938] chg: 'lf search' - colors

---
 client/cmdlf.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/cmdlf.c b/client/cmdlf.c
index f882a7ca3..e41f2d6aa 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -820,7 +820,7 @@ int CheckChipType(bool getDeviceData) {
 	uint32_t word = 0;
 	if (EM4x05IsBlock0(&word)) {
 		PrintAndLogEx(SUCCESS, "\nValid EM4x05/EM4x69 Chip Found");
-		PrintAndLogEx(SUCCESS, "Try lf em 4x05... commands");
+		PrintAndLogEx(SUCCESS, "Try " _YELLOW_(`lf em 4x05`) " commands");
 		save_restoreGB(GRAPH_RESTORE);
 		return 1;
 	}
@@ -828,7 +828,7 @@ int CheckChipType(bool getDeviceData) {
 	//check for t55xx chip...
 	if (tryDetectP1(true)) {
 		PrintAndLogEx(SUCCESS, "\nValid T55xx Chip Found");
-		PrintAndLogEx(SUCCESS, "Try `lf t55xx` commands");
+		PrintAndLogEx(SUCCESS, "Try " _YELLOW_(`lf t55xx`)" commands");
 		save_restoreGB(GRAPH_RESTORE);
 		return 1;		
 	}

From 69b691494d5633a5e040656536599574bdc73e91 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Feb 2019 15:26:31 +0100
Subject: [PATCH 0572/1938] text

---
 client/cmdlfcotag.c  |  2 +-
 client/cmdlffdx.c    | 38 +++++++++++++++++++-------------------
 client/cmdlfguard.c  |  8 ++++----
 client/cmdlfviking.c |  4 ++--
 4 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/client/cmdlfcotag.c b/client/cmdlfcotag.c
index dce160192..ff0167938 100644
--- a/client/cmdlfcotag.c
+++ b/client/cmdlfcotag.c
@@ -58,7 +58,7 @@ int CmdCOTAGDemod(const char *Cmd) {
 	  0 1001 1100 1100 0001 1000 0101 0000 0000 100001010000000001111011100000011010000010000000000000000000000000000000000000000000000000000000100111001100000110000101000
         1001 1100 1100 0001                     10000101                                                                                         
 	*/
-	PrintAndLogEx(NORMAL, "COTAG Found: FC %u, CN: %u Raw: %08X%08X%08X%08X", fc, cn, raw1 ,raw2, raw3, raw4);
+	PrintAndLogEx(SUCCESS, "COTAG Found: FC %u, CN: %u Raw: %08X%08X%08X%08X", fc, cn, raw1 ,raw2, raw3, raw4);
 	return 1;
 }
 
diff --git a/client/cmdlffdx.c b/client/cmdlffdx.c
index c2b54b497..8b67358ca 100644
--- a/client/cmdlffdx.c
+++ b/client/cmdlffdx.c
@@ -196,7 +196,7 @@ int CmdFDXBdemodBI(const char *Cmd){
 		PrintAndLogEx(DEBUG, "DEBUG: Error - FDXB error removeParity:: %d", size);
 		return 0;
 	}
-	PrintAndLogEx(NORMAL, "\nFDX-B / ISO 11784/5 Animal Tag ID Found:");
+	PrintAndLogEx(SUCCESS, "\nFDX-B / ISO 11784/5 Animal Tag ID Found:");
 
 	//got a good demod
 	uint64_t NationalCode = ((uint64_t)(bytebits_to_byteLSBF(BitStream+32,6)) << 32) | bytebits_to_byteLSBF(BitStream,32);
@@ -211,17 +211,17 @@ int CmdFDXBdemodBI(const char *Cmd){
 	uint8_t raw[8];
 	num_to_bytes(rawid, 8, raw);
 
-	PrintAndLogEx(NORMAL, "Raw ID Hex: %s", sprint_hex(raw,8));
+	PrintAndLogEx(SUCCESS, "Raw ID Hex: %s", sprint_hex(raw,8));
 
 	uint16_t calcCrc = crc16_kermit(raw, 8);
-	PrintAndLogEx(NORMAL, "Animal ID:     %04u-%012" PRIu64, countryCode, NationalCode);
-	PrintAndLogEx(NORMAL, "National Code: %012" PRIu64, NationalCode);
-	PrintAndLogEx(NORMAL, "CountryCode:   %04u", countryCode);
+	PrintAndLogEx(SUCCESS, "Animal ID:     %04u-%012" PRIu64, countryCode, NationalCode);
+	PrintAndLogEx(SUCCESS, "National Code: %012" PRIu64, NationalCode);
+	PrintAndLogEx(SUCCESS, "CountryCode:   %04u", countryCode);
 
-	PrintAndLogEx(NORMAL, "Reserved/RFU:      %u", reservedCode);
-	PrintAndLogEx(NORMAL, "Animal Tag:        %s", animalBit ? "True" : "False");
-	PrintAndLogEx(NORMAL, "Has extended data: %s [0x%X]", dataBlockBit ? "True" : "False", extended);
-	PrintAndLogEx(NORMAL, "CRC:           0x%04X - [%04X] - %s", crc16, calcCrc, (calcCrc == crc16) ? "Passed" : "Failed");
+	PrintAndLogEx(SUCCESS, "Reserved/RFU:      %u", reservedCode);
+	PrintAndLogEx(SUCCESS, "Animal Tag:        %s", animalBit ? "True" : "False");
+	PrintAndLogEx(SUCCESS, "Has extended data: %s [0x%X]", dataBlockBit ? "True" : "False", extended);
+	PrintAndLogEx(SUCCESS, "CRC:           0x%04X - [%04X] - %s", crc16, calcCrc, (calcCrc == crc16) ? "Passed" : "Failed");
 
 	if (g_debugMode) {
 		PrintAndLogEx(DEBUG, "Start marker %d;   Size %d", preambleIndex, size);
@@ -282,14 +282,14 @@ int CmdFdxDemod(const char *Cmd) {
 
 	uint16_t calcCrc = crc16_kermit(raw, 8);
 	
-	PrintAndLogEx(NORMAL, "\nFDX-B / ISO 11784/5 Animal Tag ID Found:  Raw : %s", sprint_hex(raw, 8));
-	PrintAndLogEx(NORMAL, "Animal ID          %04u-%012" PRIu64, countryCode, NationalCode);
-	PrintAndLogEx(NORMAL, "National Code      %012" PRIu64 " (0x%" PRIx64 ")", NationalCode, NationalCode);
-	PrintAndLogEx(NORMAL, "Country Code       %04u", countryCode);
-	PrintAndLogEx(NORMAL, "Reserved/RFU       %u (0x04%X)", reservedCode,  reservedCode);
-	PrintAndLogEx(NORMAL, "Animal Tag         %s", animalBit ? "True" : "False");	
-	PrintAndLogEx(NORMAL, "Has extended data  %s [0x%X]", dataBlockBit ? "True" : "False", extended);	
-	PrintAndLogEx(NORMAL, "CRC-16             0x%04X - 0x%04X [%s]", crc16, calcCrc, (calcCrc == crc16) ? "Ok" : "Failed");
+	PrintAndLogEx(SUCCESS, "\nFDX-B / ISO 11784/5 Animal Tag ID Found:  Raw : %s", sprint_hex(raw, 8));
+	PrintAndLogEx(SUCCESS, "Animal ID          %04u-%012" PRIu64, countryCode, NationalCode);
+	PrintAndLogEx(SUCCESS, "National Code      %012" PRIu64 " (0x%" PRIx64 ")", NationalCode, NationalCode);
+	PrintAndLogEx(SUCCESS, "Country Code       %04u", countryCode);
+	PrintAndLogEx(SUCCESS, "Reserved/RFU       %u (0x04%X)", reservedCode,  reservedCode);
+	PrintAndLogEx(SUCCESS, "Animal Tag         %s", animalBit ? "True" : "False");	
+	PrintAndLogEx(SUCCESS, "Has extended data  %s [0x%X]", dataBlockBit ? "True" : "False", extended);	
+	PrintAndLogEx(SUCCESS, "CRC-16             0x%04X - 0x%04X [%s]", crc16, calcCrc, (calcCrc == crc16) ? "Ok" : "Failed");
 
 	if (g_debugMode) {
 		PrintAndLogEx(DEBUG, "Start marker %d;   Size %d", preambleIndex, size);	
@@ -341,7 +341,7 @@ int CmdFdxClone(const char *Cmd) {
 	blocks[3] = bytebits_to_byte(bs + 64, 32);
 	blocks[4] = bytebits_to_byte(bs + 96, 32);
 
-	PrintAndLogEx(NORMAL, "Preparing to clone FDX-B to T55x7 with animal ID: %04u-%"PRIu64, countryid, animalid);
+	PrintAndLogEx(INFO, "Preparing to clone FDX-B to T55x7 with animal ID: %04u-%"PRIu64, countryid, animalid);
 	print_blocks(blocks, 5);
 	
 	UsbCommand resp;
@@ -379,7 +379,7 @@ int CmdFdxSim(const char *Cmd) {
 	arg1 = clk << 8 | encoding;
 	arg2 = invert << 8 | separator;
 
-	PrintAndLogEx(NORMAL, "Simulating FDX-B animal ID: %04u-%"PRIu64, countryid, animalid);
+	PrintAndLogEx(SUCCESS, "Simulating FDX-B animal ID: %04u-%"PRIu64, countryid, animalid);
 
 	UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};
 
diff --git a/client/cmdlfguard.c b/client/cmdlfguard.c
index afad96686..593dcf2b8 100644
--- a/client/cmdlfguard.c
+++ b/client/cmdlfguard.c
@@ -246,9 +246,9 @@ int CmdGuardDemod(const char *Cmd) {
 			break;
 	}
 	if ( !unknown)
-		PrintAndLogEx(NORMAL, "G-Prox-II Found: Format Len: %ubit - FC: %u - Card: %u, Raw: %08x%08x%08x", fmtLen, FC, Card, raw1, raw2, raw3);
+		PrintAndLogEx(SUCCESS, "G-Prox-II Found: Format Len: %ubit - FC: %u - Card: %u, Raw: %08x%08x%08x", fmtLen, FC, Card, raw1, raw2, raw3);
 	else
-		PrintAndLogEx(NORMAL, "Unknown G-Prox-II Fmt Found: Format Len: %u, Raw: %08x%08x%08x", fmtLen, raw1, raw2, raw3);
+		PrintAndLogEx(SUCCESS, "Unknown G-Prox-II Fmt Found: Format Len: %u, Raw: %08x%08x%08x", fmtLen, raw1, raw2, raw3);
 
 	return 1;
 }
@@ -290,7 +290,7 @@ int CmdGuardClone(const char *Cmd) {
 	blocks[2] = bytebits_to_byte(bs + 32, 32);
 	blocks[3] = bytebits_to_byte(bs + 64, 32);
 
-	PrintAndLogEx(NORMAL, "Preparing to clone Guardall to T55x7 with Facility Code: %u, Card Number: %u", facilitycode, cardnumber);
+	PrintAndLogEx(INFO, "Preparing to clone Guardall to T55x7 with Facility Code: %u, Card Number: %u", facilitycode, cardnumber);
 	print_blocks(blocks, 4);
 
 	UsbCommand resp;
@@ -333,7 +333,7 @@ int CmdGuardSim(const char *Cmd) {
 		return 1;
 	}	
 
-	PrintAndLogEx(NORMAL, "Simulating Guardall - Facility Code: %u, CardNumber: %u", facilitycode, cardnumber );
+	PrintAndLogEx(SUCCESS, "Simulating Guardall - Facility Code: %u, CardNumber: %u", facilitycode, cardnumber );
 
 	uint64_t arg1, arg2;
 	arg1 = (clock << 8) | encoding;
diff --git a/client/cmdlfviking.c b/client/cmdlfviking.c
index 984e5ec83..5ead8ef03 100644
--- a/client/cmdlfviking.c
+++ b/client/cmdlfviking.c
@@ -118,7 +118,7 @@ int CmdVikingClone(const char *Cmd) {
 
 	rawID = getVikingBits(id);
 	
-	PrintAndLogEx(NORMAL, "Cloning - ID: %08X, Raw: %08X%08X",id,(uint32_t)(rawID >> 32),(uint32_t) (rawID & 0xFFFFFFFF));
+	PrintAndLogEx(INFO, "Cloning - ID: %08X, Raw: %08X%08X",id,(uint32_t)(rawID >> 32),(uint32_t) (rawID & 0xFFFFFFFF));
 	
 	UsbCommand c = {CMD_VIKING_CLONE_TAG, {rawID >> 32, rawID & 0xFFFFFFFF, Q5}};
 	clearCommandBuffer();
@@ -149,7 +149,7 @@ int CmdVikingSim(const char *Cmd) {
 	arg1 = clk << 8 | encoding;
 	arg2 = invert << 8 | separator;
 
-	PrintAndLogEx(NORMAL, "Simulating Viking - ID: %08X, Raw: %08X%08X",id,(uint32_t)(rawID >> 32),(uint32_t) (rawID & 0xFFFFFFFF));
+	PrintAndLogEx(SUCCESS, "Simulating Viking - ID: %08X, Raw: %08X%08X",id,(uint32_t)(rawID >> 32),(uint32_t) (rawID & 0xFFFFFFFF));
 	
 	UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};
 	num_to_bytebits(rawID, size, c.d.asBytes);

From 9f26c0d6b7faa9d733a2e1eb3990b19e95ee01fb Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Feb 2019 15:29:28 +0100
Subject: [PATCH 0573/1938] text

---
 client/cmdlfkeri.c    | 10 +++++-----
 client/cmdlfnoralsy.c | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/client/cmdlfkeri.c b/client/cmdlfkeri.c
index 884e89933..560cd5c96 100644
--- a/client/cmdlfkeri.c
+++ b/client/cmdlfkeri.c
@@ -109,11 +109,11 @@ int CmdKeriDemod(const char *Cmd) {
 		Might be a hash of FC & CN to generate Internal ID
 	*/
 	
-	PrintAndLogEx(NORMAL, "KERI Tag Found -- Raw: %08X%08X", raw1 ,raw2);	
-	PrintAndLogEx(NORMAL, "KERI Internal ID: %u", ID);
+	PrintAndLogEx(SUCCESS, "KERI Tag Found -- Internal ID: %u", ID);
+	PrintAndLogEx(SUCCESS, "Raw: %08X%08X", raw1 ,raw2);
 	
 	if (invert){
-		PrintAndLogEx(NORMAL, "Had to Invert - probably KERI");
+		PrintAndLogEx(INFO, "Had to Invert - probably KERI");
 		for (size_t i = 0; i < size; i++)
 			DemodBuffer[i] ^= 1;
 		
@@ -167,7 +167,7 @@ int CmdKeriClone(const char *Cmd) {
 	blocks[1] = data >> 32;
 	blocks[2] = data & 0xFFFFFFFF;
 
-	PrintAndLogEx(NORMAL, "Preparing to clone KERI to T55x7 with Internal Id: %u", internalid);
+	PrintAndLogEx(INFO, "Preparing to clone KERI to T55x7 with Internal Id: %u", internalid);
 	print_blocks(blocks, 3);
 
 
@@ -212,7 +212,7 @@ int CmdKeriSim(const char *Cmd) {
 	arg1 = clk << 8 | carrier;
 	arg2 = invert;
 	
-	PrintAndLogEx(NORMAL, "Simulating KERI - Internal Id: %u", internalid);
+	PrintAndLogEx(SUCCESS, "Simulating KERI - Internal Id: %u", internalid);
 	
 	UsbCommand c = {CMD_PSK_SIM_TAG, {arg1, arg2, size}};
 	memcpy(c.d.asBytes, bits, size);
diff --git a/client/cmdlfnoralsy.c b/client/cmdlfnoralsy.c
index bb28ad5e5..0f61e26ea 100644
--- a/client/cmdlfnoralsy.c
+++ b/client/cmdlfnoralsy.c
@@ -161,10 +161,10 @@ int CmdNoralsyDemod(const char *Cmd) {
 		return 0;
 	}
 	
-	PrintAndLogEx(NORMAL, "Noralsy Tag Found: Card ID %u, Year: %u Raw: %08X%08X%08X", cardid, year, raw1 ,raw2, raw3);
+	PrintAndLogEx(SUCCESS, "Noralsy Tag Found: Card ID %u, Year: %u Raw: %08X%08X%08X", cardid, year, raw1 ,raw2, raw3);
 	if (raw1 != 0xBB0214FF) {
-		PrintAndLogEx(NORMAL, "Unknown bits set in first block! Expected 0xBB0214FF, Found: 0x%08X", raw1);
-		PrintAndLogEx(NORMAL, "Please post this output in forum to further research on this format");
+		PrintAndLogEx(WARNING, "Unknown bits set in first block! Expected 0xBB0214FF, Found: 0x%08X", raw1);
+		PrintAndLogEx(WARNING, "Please post this output in forum to further research on this format");
 	}
 	return 1;
 }
@@ -202,7 +202,7 @@ int CmdNoralsyClone(const char *Cmd) {
 	blocks[2] = bytebits_to_byte(bits + 32, 32);
 	blocks[3] = bytebits_to_byte(bits + 64, 32);
 
-	PrintAndLogEx(NORMAL, "Preparing to clone Noralsy to T55x7 with CardId: %u", id);
+	PrintAndLogEx(INFO, "Preparing to clone Noralsy to T55x7 with CardId: %u", id);
 	print_blocks(blocks, 4);
 	
 	UsbCommand resp;
@@ -247,7 +247,7 @@ int CmdNoralsySim(const char *Cmd) {
 		return 1;
 	}	
 	
-	PrintAndLogEx(NORMAL, "Simulating Noralsy - CardId: %u", id);
+	PrintAndLogEx(SUCCESS, "Simulating Noralsy - CardId: %u", id);
 
 	UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};
 	memcpy(c.d.asBytes, bs, size);

From 49ba54419002f1914fc549ed4a2df50ba9896a0c Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Feb 2019 15:33:34 +0100
Subject: [PATCH 0574/1938] fix: 'lf search' - indala wrong identified

---
 client/cmdlfindala.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdlfindala.c b/client/cmdlfindala.c
index b49455e16..674931159 100644
--- a/client/cmdlfindala.c
+++ b/client/cmdlfindala.c
@@ -136,7 +136,7 @@ int CmdIndalaDemod(const char *Cmd) {
 		idx = indala224decode(DemodBuffer, &size, &invert);
 		if (idx < 0 || size != 224) {
 			PrintAndLogEx(DEBUG, "DEBUG: Error - Indala wrong size, expected [64|224] got: %d (startindex %i)", size, idx);
-			return -1;
+			return 0;
 		}
 	}
 	

From 8ddf03b302e617636349f5754f23538b7f9d417b Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Feb 2019 16:43:48 +0100
Subject: [PATCH 0575/1938] text

---
 client/cmdlfawid.c | 62 +++++++++++++++++++++-------------------------
 1 file changed, 28 insertions(+), 34 deletions(-)

diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c
index b17864dcf..61f33f636 100644
--- a/client/cmdlfawid.c
+++ b/client/cmdlfawid.c
@@ -101,7 +101,7 @@ static bool sendPing(void){
 static bool sendTry(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint32_t delay, uint8_t *bits, size_t bs_len, bool verbose){
 	
 	if ( verbose )
-		PrintAndLogEx(NORMAL, "Trying FC: %u; CN: %u", fc, cn);		
+		PrintAndLogEx(INFO, "Trying FC: %u; CN: %u", fc, cn);		
 	
 	if ( !getAWIDBits(fmtlen, fc, cn, bits)) {
 		PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
@@ -171,7 +171,7 @@ int getAWIDBits(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint8_t *bits) {
 
 	if (bitLen != 88) return 0;
 	
-	PrintAndLogEx(NORMAL, "awid raw bits:\n %s \n", sprint_bin(bits, bitLen));
+	PrintAndLogEx(SUCCESS, "awid raw bits:\n %s \n", sprint_bin(bits, bitLen));
 	
 	return 1;
 }
@@ -181,27 +181,27 @@ static void verify_values(uint8_t *fmtlen, uint32_t *fc, uint32_t *cn){
 		case 50:
 			if ((*fc & 0xFFFF) != *fc) {
 				*fc &= 0xFFFF;
-				PrintAndLogEx(NORMAL, "Facility-Code Truncated to 16-bits (AWID50): %u", *fc);
+				PrintAndLogEx(INFO, "Facility-Code Truncated to 16-bits (AWID50): %u", *fc);
 			}
 			break;
 		case 37:
 			if ((*fc & 0x1FFF) != *fc) {
 				*fc &= 0x1FFF;
-				PrintAndLogEx(NORMAL, "Facility-Code Truncated to 13-bits (AWID37): %u", *fc);
+				PrintAndLogEx(INFO, "Facility-Code Truncated to 13-bits (AWID37): %u", *fc);
 			}
 			if ((*cn & 0x3FFFF) != *cn) {
 				*cn &= 0x3FFFF;
-				PrintAndLogEx(NORMAL, "Card Number Truncated to 18-bits (AWID37): %u", *cn);
+				PrintAndLogEx(INFO, "Card Number Truncated to 18-bits (AWID37): %u", *cn);
 			}			
 			break;
 		case 34:
 			if ((*fc & 0xFF) != *fc) {
 				*fc &= 0xFF;
-				PrintAndLogEx(NORMAL, "Facility-Code Truncated to 8-bits (AWID34): %u", *fc);
+				PrintAndLogEx(INFO, "Facility-Code Truncated to 8-bits (AWID34): %u", *fc);
 			}
 			if ((*cn & 0xFFFFFF) != *cn) {
 				*cn &= 0xFFFFFF;
-				PrintAndLogEx(NORMAL, "Card Number Truncated to 24-bits (AWID34): %u", *cn);
+				PrintAndLogEx(INFO, "Card Number Truncated to 24-bits (AWID34): %u", *cn);
 			}
 			break;
 		case 26:
@@ -209,11 +209,11 @@ static void verify_values(uint8_t *fmtlen, uint32_t *fc, uint32_t *cn){
 			*fmtlen = 26;
 			if ((*fc & 0xFF) != *fc) {
 				*fc &= 0xFF;
-				PrintAndLogEx(NORMAL, "Facility-Code Truncated to 8-bits (AWID26): %u", *fc);
+				PrintAndLogEx(INFO, "Facility-Code Truncated to 8-bits (AWID26): %u", *fc);
 			}
 			if ((*cn & 0xFFFF) != *cn) {
 				*cn &= 0xFFFF;
-				PrintAndLogEx(NORMAL, "Card Number Truncated to 16-bits (AWID26): %u", *cn);
+				PrintAndLogEx(INFO, "Card Number Truncated to 16-bits (AWID26): %u", *cn);
 			}
 			break;
 	}
@@ -323,21 +323,21 @@ int CmdAWIDDemod(const char *Cmd) {
 			fc = bytebits_to_byte(bits + 9, 8);
 			cardnum = bytebits_to_byte(bits + 17, 16);
 			code1 = bytebits_to_byte(bits + 8,fmtLen);
-			PrintAndLogEx(NORMAL, "AWID Found - BitLength: %d, FC: %d, Card: %u - Wiegand: %x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, rawHi2, rawHi, rawLo);
+			PrintAndLogEx(SUCCESS, "AWID Found - BitLength: %d, FC: %d, Card: %u - Wiegand: %x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, rawHi2, rawHi, rawLo);
 			break;
 		case 34:
 			fc = bytebits_to_byte(bits + 9, 8);
 			cardnum = bytebits_to_byte(bits + 17, 24);
 			code1 = bytebits_to_byte(bits + 8, (fmtLen-32) );
 			code2 = bytebits_to_byte(bits + 8 + (fmtLen-32), 32);			
-			PrintAndLogEx(NORMAL, "AWID Found - BitLength: %d, FC: %d, Card: %u - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, code2, rawHi2, rawHi, rawLo);			
+			PrintAndLogEx(SUCCESS, "AWID Found - BitLength: %d, FC: %d, Card: %u - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, code2, rawHi2, rawHi, rawLo);			
 			break;
 		case 37:
 			fc = bytebits_to_byte(bits + 9, 13);
 			cardnum = bytebits_to_byte(bits + 22, 18);
 			code1 = bytebits_to_byte(bits + 8, (fmtLen-32) );
 			code2 = bytebits_to_byte(bits + 8 + (fmtLen-32), 32);			
-			PrintAndLogEx(NORMAL, "AWID Found - BitLength: %d, FC: %d, Card: %u - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, code2, rawHi2, rawHi, rawLo);
+			PrintAndLogEx(SUCCESS, "AWID Found - BitLength: %d, FC: %d, Card: %u - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, code2, rawHi2, rawHi, rawLo);
 			break;
 		// case 40:
 		// break;		
@@ -346,18 +346,18 @@ int CmdAWIDDemod(const char *Cmd) {
 			cardnum = bytebits_to_byte(bits + 25, 32);
 			code1 = bytebits_to_byte(bits + 8, (fmtLen-32) );
 			code2 = bytebits_to_byte(bits + 8 + (fmtLen-32), 32);
-			PrintAndLogEx(NORMAL, "AWID Found - BitLength: %d, FC: %d, Card: %u - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, code2, rawHi2, rawHi, rawLo);
+			PrintAndLogEx(SUCCESS, "AWID Found - BitLength: %d, FC: %d, Card: %u - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, code2, rawHi2, rawHi, rawLo);
 			break;
 		default:
 			if (fmtLen > 32 ) {
 				cardnum = bytebits_to_byte(bits + 8 + (fmtLen-17), 16);
 				code1 = bytebits_to_byte(bits + 8, fmtLen-32);
 				code2 = bytebits_to_byte(bits + 8 + (fmtLen-32), 32);
-				PrintAndLogEx(NORMAL, "AWID Found - BitLength: %d -unknown BitLength- (%u) - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, cardnum, code1, code2, rawHi2, rawHi, rawLo);
+				PrintAndLogEx(SUCCESS, "AWID Found - BitLength: %d -unknown BitLength- (%u) - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, cardnum, code1, code2, rawHi2, rawHi, rawLo);
 			} else {
 				cardnum = bytebits_to_byte(bits + 8 + (fmtLen-17), 16);
 				code1 = bytebits_to_byte(bits + 8, fmtLen);
-				PrintAndLogEx(NORMAL, "AWID Found - BitLength: %d -unknown BitLength- (%u) - Wiegand: %x, Raw: %08x%08x%08x", fmtLen, cardnum, code1, rawHi2, rawHi, rawLo);
+				PrintAndLogEx(SUCCESS, "AWID Found - BitLength: %d -unknown BitLength- (%u) - Wiegand: %x, Raw: %08x%08x%08x", fmtLen, cardnum, code1, rawHi2, rawHi, rawLo);
 			}
 			break;		
 	}
@@ -386,8 +386,8 @@ int CmdAWIDSim(const char *Cmd) {
 	
 	verify_values(&fmtlen, &fc, &cn);
 	
-	PrintAndLogEx(NORMAL, "Emulating AWID %u -- FC: %u; CN: %u\n", fmtlen, fc, cn);
-	PrintAndLogEx(NORMAL, "Press pm3-button to abort simulation or run another command");
+	PrintAndLogEx(SUCCESS, "Emulating AWID %u -- FC: %u; CN: %u\n", fmtlen, fc, cn);
+	PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation or run another command");
 	
 	if (!getAWIDBits(fmtlen, fc, cn, bits)) {
 		PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
@@ -417,8 +417,8 @@ int CmdAWIDClone(const char *Cmd) {
 	uint8_t *bs=bits;
 	memset(bs,0,sizeof(bits));
 	
-	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_awid_clone();
+	char cmdp = tolower(param_getchar(Cmd, 0));
+	if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_awid_clone();
 
   	fmtlen = param_get8(Cmd, 0);
 	fc = param_get32ex(Cmd, 1, 0, 10);
@@ -426,7 +426,7 @@ int CmdAWIDClone(const char *Cmd) {
 
 	if ( !fc || !cn) return usage_lf_awid_clone();
 	
-	if (param_getchar(Cmd, 3) == 'Q' || param_getchar(Cmd, 3) == 'q')
+	if (tolower(param_getchar(Cmd, 3)) == 'q')
 		//t5555 (Q5) BITRATE = (RF-2)/2 (iceman)
 		blocks[0] = T5555_MODULATION_FSK2 | T5555_INVERT_OUTPUT | T5555_SET_BITRATE(50) | 3<<T5555_MAXBLOCK_SHIFT;
 
@@ -441,7 +441,7 @@ int CmdAWIDClone(const char *Cmd) {
 	blocks[2] = bytebits_to_byte(bs + 32, 32);
 	blocks[3] = bytebits_to_byte(bs + 64, 32);
 
-	PrintAndLogEx(NORMAL, "Preparing to clone AWID %u to T55x7 with FC: %u, CN: %u", fmtlen, fc, cn);
+	PrintAndLogEx(INFO, "Preparing to clone AWID %u to T55x7 with FC: %u, CN: %u", fmtlen, fc, cn);
 	print_blocks(blocks, 4);
 	
 	UsbCommand resp;
@@ -470,38 +470,32 @@ int CmdAWIDBrute(const char *Cmd) {
 	memset(bits, 0x00, size);
 	uint8_t cmdp = 0;
 	
-	while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch(param_getchar(Cmd, cmdp)) {
+	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+		switch ( tolower(param_getchar(Cmd, cmdp))) {
 		case 'h':
-		case 'H':
 			return usage_lf_awid_brute();
 		case 'f':
-		case 'F':
 		  	fc =  param_get32ex(Cmd ,cmdp+1, 0, 10);
 			if ( !fc )
 				errors = true;
 			cmdp += 2;
 			break;
 		case 'd':
-		case 'D':
 			// delay between attemps,  defaults to 1000ms. 
 			delay = param_get32ex(Cmd, cmdp+1, 1000, 10);
 			cmdp += 2;
 			break;
 		case 'c':
-		case 'C':
 			cn = param_get32ex(Cmd, cmdp+1, 0, 10);
 			// truncate cardnumber.
 			cn &= 0xFFFF;
 			cmdp += 2;
 			break;
 		case 'a':
-		case 'A':
 			fmtlen = param_get8(Cmd, cmdp+1);
 			cmdp += 2;
 			break;
 		case 'v':
-		case 'V':
 			verbose = true;
 			cmdp++;
 			break;
@@ -511,7 +505,7 @@ int CmdAWIDBrute(const char *Cmd) {
 			break;
 		}
 	}
-	if ( fc == 0 )errors = true;
+	if ( fc == 0 ) errors = true;
 	if ( errors ) return usage_lf_awid_brute();
 
 	// limit fc according to selected format
@@ -519,19 +513,19 @@ int CmdAWIDBrute(const char *Cmd) {
 		case 50:
 			if ((fc & 0xFFFF) != fc) {
 				fc &= 0xFFFF;
-				PrintAndLogEx(NORMAL, "Facility-code truncated to 16-bits (AWID50): %u", fc);
+				PrintAndLogEx(INFO, "Facility-code truncated to 16-bits (AWID50): %u", fc);
 			}
 			break;
 		default:
 			if ((fc & 0xFF) != fc) {
 				fc &= 0xFF;
-				PrintAndLogEx(NORMAL, "Facility-code truncated to 8-bits (AWID26): %u", fc);
+				PrintAndLogEx(INFO, "Facility-code truncated to 8-bits (AWID26): %u", fc);
 			}
 			break;
 	}
 	
-	PrintAndLogEx(NORMAL, "Bruteforceing AWID %d Reader", fmtlen);
-	PrintAndLogEx(NORMAL, "Press pm3-button to abort simulation or press key");
+	PrintAndLogEx(SUCCESS, "Bruteforceing AWID %d Reader", fmtlen);
+	PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation or press key");
 
 	uint16_t up = cn;
 	uint16_t down = cn;

From 08baef781ebdba63aa5af725c19c79195ea6d6e3 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Feb 2019 16:45:18 +0100
Subject: [PATCH 0576/1938] text

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c7891297..a9ebb49b2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,8 +3,9 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [unreleased][unreleased]
+ - Fix 'lf search' - false positive indala identification fixed (@iceman)
  - Add 'lf keri' - basic support for Keri tags (@iceman)
- - Add 'hf mf list' - readded it again (@iceman)
+ - Add 'hf mf list' - re-added it again (@iceman)
  - Fix - A lot of bugfixes, like memory leaks (@iceman)
  - Change 'hf 14a antifuzz' - original implementation (@asfabw),  reworked a bit
  - Fix 'hf mf fchk' (@iceman)

From c310640b037e254a2b7d6eb53a1a1c3d376291cb Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Feb 2019 16:47:43 +0100
Subject: [PATCH 0577/1938] fix: 'lf jabltron clone' - wrong number of blocks

---
 client/cmdlfjablotron.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/client/cmdlfjablotron.c b/client/cmdlfjablotron.c
index 39cbc0651..541e7b31b 100644
--- a/client/cmdlfjablotron.c
+++ b/client/cmdlfjablotron.c
@@ -130,14 +130,14 @@ int CmdJablotronDemod(const char *Cmd) {
 	PrintAndLogEx(SUCCESS, "Jablotron Tag Found: Card ID: %"PRIx64" :: Raw: %08X%08X", id, raw1, raw2);
 
 	uint8_t chksum = raw2 & 0xFF;
-	PrintAndLogEx(NORMAL, "Checksum: %02X [%s]",
+	PrintAndLogEx(INFO, "Checksum: %02X [%s]",
 		chksum,
-		(chksum == jablontron_chksum(DemodBuffer)) ? "OK":"FAIL"		
+		(chksum == jablontron_chksum(DemodBuffer)) ? _GREEN_(OK) : _RED_(FAIL)
 	);
 
 	id = DEC2BCD(id);
 	// Printed format: 1410-nn-nnnn-nnnn	
-	PrintAndLogEx(NORMAL, "Printed: 1410-%02X-%04X-%04X",
+	PrintAndLogEx(SUCCESS, "Printed: 1410-%02X-%04X-%04X",
 		(uint8_t)(id >> 32) & 0xFF,
 		(uint16_t)(id >> 16) & 0xFFFF,
 		(uint16_t)id & 0xFFFF
@@ -158,8 +158,8 @@ int CmdJablotronClone(const char *Cmd) {
 	uint8_t bits[64];
 	memset(bits, 0, sizeof(bits));
 	
-	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_jablotron_clone();
+	char cmdp = tolower(param_getchar(Cmd, 0));
+	if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_jablotron_clone();
 
 	fullcode = param_get64ex(Cmd, 0, 0, 16);
 	
@@ -170,7 +170,7 @@ int CmdJablotronClone(const char *Cmd) {
 	// clearing the topbit needed for the preambl detection. 
 	if ((fullcode & 0x7FFFFFFFFF) != fullcode) {
 		fullcode &= 0x7FFFFFFFFF;
-		PrintAndLogEx(NORMAL, "Card Number Truncated to 39bits: %"PRIx64, fullcode);
+		PrintAndLogEx(INFO, "Card Number Truncated to 39bits: %"PRIx64, fullcode);
 	}
 	
 	if ( !getJablotronBits(fullcode, bits)) {
@@ -181,13 +181,13 @@ int CmdJablotronClone(const char *Cmd) {
 	blocks[1] = bytebits_to_byte(bits, 32);
 	blocks[2] = bytebits_to_byte(bits + 32, 32);
 
-	PrintAndLogEx(NORMAL, "Preparing to clone Jablotron to T55x7 with FullCode: %"PRIx64, fullcode);
+	PrintAndLogEx(INFO, "Preparing to clone Jablotron to T55x7 with FullCode: %"PRIx64, fullcode);
 	print_blocks(blocks, 3);
 	
 	UsbCommand resp;
 	UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
 
-	for (uint8_t i=0; i<4; i++) {
+	for (uint8_t i=0; i<3; i++) {
 		c.arg[0] = blocks[i];
 		c.arg[1] = i;
 		clearCommandBuffer();
@@ -203,15 +203,15 @@ int CmdJablotronClone(const char *Cmd) {
 int CmdJablotronSim(const char *Cmd) {
 	uint64_t fullcode = 0;
 
-	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_jablotron_sim();
+	char cmdp = tolower(param_getchar(Cmd, 0));
+	if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_jablotron_sim();
 
 	fullcode = param_get64ex(Cmd, 0, 0, 16);
 
 	// clearing the topbit needed for the preambl detection. 
 	if ((fullcode & 0x7FFFFFFFFF) != fullcode) {
 		fullcode &= 0x7FFFFFFFFF;
-		PrintAndLogEx(NORMAL, "Card Number Truncated to 39bits: %"PRIx64, fullcode);
+		PrintAndLogEx(INFO, "Card Number Truncated to 39bits: %"PRIx64, fullcode);
 	}
 	
 	uint8_t clk = 64, encoding = 2, separator = 0, invert = 1;
@@ -220,7 +220,7 @@ int CmdJablotronSim(const char *Cmd) {
 	arg1 = clk << 8 | encoding;
 	arg2 = invert << 8 | separator;
 
-	PrintAndLogEx(NORMAL, "Simulating Jablotron - FullCode: %"PRIx64, fullcode);
+	PrintAndLogEx(SUCCESS, "Simulating Jablotron - FullCode: %"PRIx64, fullcode);
 
 	UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};
 	getJablotronBits(fullcode, c.d.asBytes);

From e0579223f0006547e80d80b3c34aaea2d4cd0234 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Feb 2019 16:48:54 +0100
Subject: [PATCH 0578/1938] text

---
 client/cmdlfpyramid.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c
index 8e7dbd57f..1153fccc3 100644
--- a/client/cmdlfpyramid.c
+++ b/client/cmdlfpyramid.c
@@ -285,7 +285,7 @@ int CmdPyramidClone(const char *Cmd) {
 	blocks[3] = bytebits_to_byte(bs + 64, 32);
 	blocks[4] = bytebits_to_byte(bs + 96, 32);
 
-	PrintAndLogEx(NORMAL, "Preparing to clone Farpointe/Pyramid to T55x7 with Facility Code: %u, Card Number: %u", facilitycode, cardnumber);
+	PrintAndLogEx(INFO, "Preparing to clone Farpointe/Pyramid to T55x7 with Facility Code: %u, Card Number: %u", facilitycode, cardnumber);
 	print_blocks(blocks, 5);
 
 	UsbCommand resp;
@@ -331,7 +331,7 @@ int CmdPyramidSim(const char *Cmd) {
 		return 1;
 	}	
 
-	PrintAndLogEx(NORMAL, "Simulating Farpointe/Pyramid - Facility Code: %u, CardNumber: %u", facilitycode, cardnumber );
+	PrintAndLogEx(SUCCESS, "Simulating Farpointe/Pyramid - Facility Code: %u, CardNumber: %u", facilitycode, cardnumber );
 	
 	UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}};
 	memcpy(c.d.asBytes, bs, size);

From f750ddb2c861a7e52bc499f4c948e9d1547ce76a Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Feb 2019 17:06:46 +0100
Subject: [PATCH 0579/1938] text

---
 client/cmdlfindala.c | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/client/cmdlfindala.c b/client/cmdlfindala.c
index 674931159..3148958ce 100644
--- a/client/cmdlfindala.c
+++ b/client/cmdlfindala.c
@@ -231,8 +231,8 @@ int CmdIndalaDemodAlt(const char *Cmd) {
 	}
 	
 	if (rawbit > 0){
-		PrintAndLogEx(NORMAL, "Recovered %d raw bits, expected: %d", rawbit, GraphTraceLen/32);
-		PrintAndLogEx(NORMAL, "worst metric (0=best..7=worst): %d at pos %d", worst, worstPos);
+		PrintAndLogEx(INFO, "Recovered %d raw bits, expected: %d", rawbit, GraphTraceLen/32);
+		PrintAndLogEx(INFO, "worst metric (0=best..7=worst): %d at pos %d", worst, worstPos);
 	} else {
 		return 0;
 	}
@@ -262,7 +262,7 @@ int CmdIndalaDemodAlt(const char *Cmd) {
 	}
 	
 	if (start == rawbit - uidlen + 1) {
-		PrintAndLogEx(NORMAL, "nothing to wait for");
+		PrintAndLogEx(FAILED, "nothing to wait for");
 		return 0;
 	}
 
@@ -288,7 +288,7 @@ int CmdIndalaDemodAlt(const char *Cmd) {
 			showbits[bit] = '.' + bits[bit];
 		}
 		showbits[bit+1]='\0';
-		PrintAndLogEx(NORMAL, "Partial UID=%s", showbits);
+		PrintAndLogEx(SUCCESS, "Partial UID | %s", showbits);
 		return 0;
 	} else {
 		for (bit = 0; bit < uidlen; bit++) {
@@ -313,7 +313,7 @@ int CmdIndalaDemodAlt(const char *Cmd) {
 					uid2 = (uid2<<1) | 1;
 				} 
 			}
-		PrintAndLogEx(NORMAL, "UID=%s (%x%08x)", showbits, uid1, uid2);
+		PrintAndLogEx(SUCCESS, "UID | %s (%x%08x)", showbits, uid1, uid2);
 	}
 	else {
 		uid3 = uid4 = uid5 = uid6 = uid7 = 0;
@@ -331,7 +331,7 @@ int CmdIndalaDemodAlt(const char *Cmd) {
 			else 
 				uid7 = (uid7<<1) | 1;
 			}
-		PrintAndLogEx(NORMAL, "UID=%s (%x%08x%08x%08x%08x%08x%08x)", showbits, uid1, uid2, uid3, uid4, uid5, uid6, uid7);
+		PrintAndLogEx(SUCCESS, "UID | %s (%x%08x%08x%08x%08x%08x%08x)", showbits, uid1, uid2, uid3, uid4, uid5, uid6, uid7);
 	}
 
 	// Checking UID against next occurrences
@@ -350,7 +350,7 @@ int CmdIndalaDemodAlt(const char *Cmd) {
 		times += 1;
 	}
 
-	PrintAndLogEx(NORMAL, "Occurrences: %d (expected %d)", times, (rawbit - start) / uidlen);
+	PrintAndLogEx(DEBUG, "Occurrences: %d (expected %d)", times, (rawbit - start) / uidlen);
 
 	// Remodulating for tag cloning
 	// HACK: 2015-01-04 this will have an impact on our new way of seening lf commands (demod) 
@@ -409,8 +409,8 @@ int CmdIndalaSim(const char *Cmd) {
 	// It has to send either 64bits (8bytes) or 224bits (28bytes).  Zero padding needed if not.
 	// lf simpsk 1 c 32 r 2 d 0102030405060708
 	
-//	PrintAndLogEx(NORMAL, "Emulating Indala UID: %u \n", cn);
-//	PrintAndLogEx(NORMAL, "Press pm3-button to abort simulation or run another command");
+	PrintAndLogEx(SUCCESS, "Simulating Indala UID: %u \n", cn);
+	PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation or run another command");
 	
 	UsbCommand c = {CMD_PSK_SIM_TAG, {arg1, arg2, size}};  
 	memcpy(c.d.asBytes, bits, size);
@@ -427,6 +427,7 @@ int CmdIndalaClone(const char *Cmd) {
 	uint32_t n = 0, i = 0;
 
 	if (strchr(Cmd,'l') != 0) {
+		
 		while (sscanf(&Cmd[i++], "%1x", &n ) == 1) {
 			uid1 = (uid1 << 4) | (uid2 >> 28);
 			uid2 = (uid2 << 4) | (uid3 >> 28);
@@ -436,7 +437,8 @@ int CmdIndalaClone(const char *Cmd) {
 			uid6 = (uid6 << 4) | (uid7 >> 28);
 			uid7 = (uid7 << 4) | (n & 0xf);
 		}
-		PrintAndLogEx(NORMAL, "Cloning 224bit tag with UID %x%08x%08x%08x%08x%08x%08x", uid1, uid2, uid3, uid4, uid5, uid6, uid7);
+	
+		PrintAndLogEx(INFO, "Preparing to clone Indala 224bit tag with UID %x%08x%08x%08x%08x%08x%08x", uid1, uid2, uid3, uid4, uid5, uid6, uid7);
 		c.cmd = CMD_INDALA_CLONE_TAG_L;
 		c.d.asDwords[0] = uid1;
 		c.d.asDwords[1] = uid2;
@@ -450,7 +452,7 @@ int CmdIndalaClone(const char *Cmd) {
 			uid1 = (uid1 << 4) | (uid2 >> 28);
 			uid2 = (uid2 << 4) | (n & 0xf);
 		}
-		PrintAndLogEx(NORMAL, "Cloning 64bit tag with UID %x%08x", uid1, uid2);
+		PrintAndLogEx(INFO, "Preparing to clone Indala 64bit tag with UID %x%08x", uid1, uid2);
 		c.cmd = CMD_INDALA_CLONE_TAG;
 		c.arg[0] = uid1;
 		c.arg[1] = uid2;

From 8b33d45016598fb7bb7ed803d268c7d615c3c6ca Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Feb 2019 17:08:58 +0100
Subject: [PATCH 0580/1938] fix

---
 client/cmdlfindala.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdlfindala.c b/client/cmdlfindala.c
index 3148958ce..1707895b0 100644
--- a/client/cmdlfindala.c
+++ b/client/cmdlfindala.c
@@ -409,7 +409,7 @@ int CmdIndalaSim(const char *Cmd) {
 	// It has to send either 64bits (8bytes) or 224bits (28bytes).  Zero padding needed if not.
 	// lf simpsk 1 c 32 r 2 d 0102030405060708
 	
-	PrintAndLogEx(SUCCESS, "Simulating Indala UID: %u \n", cn);
+	PrintAndLogEx(SUCCESS, "Simulating Indala UID: %s",  sprint_hex(hexuid, len));
 	PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation or run another command");
 	
 	UsbCommand c = {CMD_PSK_SIM_TAG, {arg1, arg2, size}};  

From 7de440a8a0203d052878882409066e9df8e7db89 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Feb 2019 17:10:30 +0100
Subject: [PATCH 0581/1938] text

---
 client/cmdlfpresco.c | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/client/cmdlfpresco.c b/client/cmdlfpresco.c
index 9c8037457..98df02fe5 100644
--- a/client/cmdlfpresco.c
+++ b/client/cmdlfpresco.c
@@ -12,11 +12,11 @@ static int CmdHelp(const char *Cmd);
 
 int usage_lf_presco_clone(void){
 	PrintAndLogEx(NORMAL, "clone a Presco tag to a T55x7 tag.");
-	PrintAndLogEx(NORMAL, "Usage: lf presco clone [h] d <Card-ID> H <hex-ID> <Q5>");
+	PrintAndLogEx(NORMAL, "Usage: lf presco clone [h] d <Card-ID> c <hex-ID> <Q5>");
 	PrintAndLogEx(NORMAL, "Options:");
 	PrintAndLogEx(NORMAL, "  h             : this help");	
 	PrintAndLogEx(NORMAL, "  d <Card-ID>   : 9 digit presco card ID");
-	PrintAndLogEx(NORMAL, "  H <hex-ID>    : 8 digit hex card number");
+	PrintAndLogEx(NORMAL, "  c <hex-ID>    : 8 digit hex card number");
 	PrintAndLogEx(NORMAL, "  <Q5>          : specify write to Q5 (t5555 instead of t55x7)");
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Examples:");
@@ -29,11 +29,11 @@ int usage_lf_presco_sim(void) {
 	PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
 	PrintAndLogEx(NORMAL, "Per presco format, the card number is 9 digit number and can contain *# chars. Larger values are truncated.");
 	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  lf presco sim [h] d <Card-ID> or H <hex-ID>");
+	PrintAndLogEx(NORMAL, "Usage:  lf presco sim [h] d <Card-ID> or c <hex-ID>");
 	PrintAndLogEx(NORMAL, "Options:");
 	PrintAndLogEx(NORMAL, "  h             : this help");	
 	PrintAndLogEx(NORMAL, "  d <Card-ID>   : 9 digit presco card number");
-	PrintAndLogEx(NORMAL, "  H <hex-ID>    : 8 digit hex card number");
+	PrintAndLogEx(NORMAL, "  c <hex-ID>    : 8 digit hex card number");
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Examples:");
 	PrintAndLogEx(NORMAL, "       lf presco sim d 123456789");
@@ -62,24 +62,22 @@ int GetWiegandFromPresco(const char *Cmd, uint32_t *sitecode, uint32_t *usercode
 	int stringlen = 0;
 	memset(id, 0x00, sizeof(id));
 	
-	while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch(param_getchar(Cmd, cmdp)) {
+	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+		switch (tolower(param_getchar(Cmd, cmdp))) {
 			case 'h':
 				return -1;
-			case 'H':
+			case 'c':
 				hex = true;
 				//get hex
 				*fullcode = param_get32ex(Cmd, cmdp+1, 0, 16);
 				cmdp+=2;
 				break;
-			case 'D':
 			case 'd':
 				//param get string int param_getstr(const char *line, int paramnum, char * str)
 				stringlen = param_getstr(Cmd, cmdp+1, id, sizeof(id));
 				if (stringlen < 2) return -1;
 				cmdp += 2;
 				break;
-			case 'Q':
 			case 'q':
 				*Q5 = true;
 				cmdp++;
@@ -136,7 +134,6 @@ int CmdPrescoDemod(const char *Cmd) {
 	size_t size = DemodBufferLen;
 	int ans = detectPresco(DemodBuffer, &size);
 	if (ans < 0) {
-
 		if (ans == -1)
 			PrintAndLogEx(DEBUG, "DEBUG: Error - Presco: too few bits found");
 		else if (ans == -2)
@@ -163,7 +160,7 @@ int CmdPrescoDemod(const char *Cmd) {
 	char cmd[12] = {0};
 	sprintf(cmd, "H %08X", cardid);
 	GetWiegandFromPresco(cmd, &sitecode, &usercode, &fullcode, &Q5);
-	PrintAndLogEx(NORMAL, "SiteCode %u, UserCode %u, FullCode, %08X", sitecode, usercode, fullcode);
+	PrintAndLogEx(SUCCESS, "SiteCode %u, UserCode %u, FullCode, %08X", sitecode, usercode, fullcode);
 	return 1;
 }
 
@@ -190,12 +187,12 @@ int CmdPrescoClone(const char *Cmd) {
 
 	if ((sitecode & 0xFF) != sitecode) {
 		sitecode &= 0xFF;
-		PrintAndLogEx(NORMAL, "Facility-Code Truncated to 8-bits (Presco): %u", sitecode);
+		PrintAndLogEx(INFO, "Facility-Code Truncated to 8-bits (Presco): %u", sitecode);
 	}
 
 	if ((usercode & 0xFFFF) != usercode) {
 		usercode &= 0xFFFF;
-		PrintAndLogEx(NORMAL, "Card Number Truncated to 16-bits (Presco): %u", usercode);
+		PrintAndLogEx(INFO, "Card Number Truncated to 16-bits (Presco): %u", usercode);
 	}
 	
 	blocks[1] = 0x10D00000; //preamble
@@ -203,7 +200,7 @@ int CmdPrescoClone(const char *Cmd) {
 	blocks[3] = 0x00000000;
 	blocks[4] = fullcode;
 
-	PrintAndLogEx(NORMAL, "Preparing to clone Presco to T55x7 with SiteCode: %u, UserCode: %u, FullCode: %08x", sitecode, usercode, fullcode);
+	PrintAndLogEx(INFO, "Preparing to clone Presco to T55x7 with SiteCode: %u, UserCode: %u, FullCode: %08x", sitecode, usercode, fullcode);
 	print_blocks(blocks, 5);
 	
 	UsbCommand resp;
@@ -236,7 +233,7 @@ int CmdPrescoSim(const char *Cmd) {
 	arg1 = clk << 8 | encoding;
 	arg2 = invert << 8 | separator;
 
-	PrintAndLogEx(NORMAL, "Simulating Presco - SiteCode: %u, UserCode: %u, FullCode: %08X",sitecode, usercode, fullcode);
+	PrintAndLogEx(SUCCESS, "Simulating Presco - SiteCode: %u, UserCode: %u, FullCode: %08X",sitecode, usercode, fullcode);
 
 	UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};
 	GetPrescoBits(fullcode, c.d.asBytes);

From b22189b4159b9715f292a5accea761b2d3800fdc Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Feb 2019 17:11:59 +0100
Subject: [PATCH 0582/1938] text

---
 client/cmdlfnedap.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/client/cmdlfnedap.c b/client/cmdlfnedap.c
index 19e83d3cc..25f9b624b 100644
--- a/client/cmdlfnedap.c
+++ b/client/cmdlfnedap.c
@@ -194,15 +194,15 @@ int CmdLFNedapDemod(const char *Cmd) {
 	chksum2 =  bytebits_to_byte(DemodBuffer+110, 8);
 	chksum2 |= bytebits_to_byte(DemodBuffer+119, 8) << 8;
 
-	PrintAndLogEx(NORMAL, "NEDAP ID Found - Raw: %08x%08x%08x%08x", raw[3], raw[2], raw[1], raw[0]);
-	PrintAndLogEx(NORMAL, " - UID: %06X", uid);
-	PrintAndLogEx(NORMAL, " - i: %04X", two);
-	PrintAndLogEx(NORMAL, " - Checksum2 %04X", chksum2);
+	PrintAndLogEx(SUCCESS, "NEDAP ID Found - Raw: %08x%08x%08x%08x", raw[3], raw[2], raw[1], raw[0]);
+	PrintAndLogEx(SUCCESS, " - UID: %06X", uid);
+	PrintAndLogEx(SUCCESS, " - i: %04X", two);
+	PrintAndLogEx(SUCCESS, " - Checksum2 %04X", chksum2);
 
 	if (g_debugMode){
 		PrintAndLogEx(DEBUG, "DEBUG: idx: %d, Len: %d, Printing Demod Buffer:", idx, 128);
 		printDemodBuff();
-		PrintAndLogEx(NORMAL, "BIN:\n%s", sprint_bin_break( DemodBuffer, 128, 64) );
+		PrintAndLogEx(DEBUG, "BIN:\n%s", sprint_bin_break( DemodBuffer, 128, 64) );
 	}
 
 	return 1;
@@ -268,7 +268,7 @@ int CmdLFNedapClone(const char *Cmd) {
 	blocks[3] = bytebits_to_byte(bits + 64, 32);
 	blocks[4] = bytebits_to_byte(bits + 96, 32);
 
-	PrintAndLogEx(NORMAL, "Preparing to clone NEDAP to T55x7 with card number: %u", cardnumber);
+	PrintAndLogEx(INFO, "Preparing to clone NEDAP to T55x7 with card number: %u", cardnumber);
 	print_blocks(blocks, 5);
 
 	UsbCommand resp;
@@ -314,8 +314,8 @@ int CmdLFNedapSim(const char *Cmd) {
 		return 1;
 	}	
 
-	PrintAndLogEx(NORMAL, "bin  %s", sprint_bin_break(bs, 128, 32));
-	PrintAndLogEx(NORMAL, "Simulating Nedap - CardNumber: %u", cardnumber );
+	PrintAndLogEx(SUCCESS, "bin  %s", sprint_bin_break(bs, 128, 32));
+	PrintAndLogEx(SUCCESS, "Simulating Nedap - CardNumber: %u", cardnumber );
 	
 	UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};
 	memcpy(c.d.asBytes, bs, size);
@@ -332,7 +332,7 @@ int CmdLFNedapChk(const char *Cmd){
 	
 	len = ( len == 0 ) ? 5 : len>>1;
 	
-	PrintAndLogEx(NORMAL, "Input: [%d] %s", len, sprint_hex(data, len));
+	PrintAndLogEx(SUCCESS, "Input: [%d] %s", len, sprint_hex(data, len));
 	
 	//uint8_t last = GetParity(data, EVEN, 62);
 	//PrintAndLogEx(NORMAL, "TEST PARITY::  %d | %d ", DemodBuffer[62], last);
@@ -367,7 +367,7 @@ int CmdLFNedapChk(const char *Cmd){
         }
     }
 	
-	PrintAndLogEx(NORMAL, "Nedap checksum: 0x%X", ((ch << 8) | cl) );
+	PrintAndLogEx(SUCCESS, "Nedap checksum: 0x%X", ((ch << 8) | cl) );
 	return 0;
 }
 

From 63659fd352c063e816e36a918040cc7193e2d32c Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Feb 2019 17:22:03 +0100
Subject: [PATCH 0583/1938] text

---
 client/cmdlfguard.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/cmdlfguard.c b/client/cmdlfguard.c
index 593dcf2b8..5707c78fb 100644
--- a/client/cmdlfguard.c
+++ b/client/cmdlfguard.c
@@ -107,21 +107,21 @@ int GetGuardBits(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint8_t *guardBits) {
 	for (i = 0; i < 4; ++i)
 		rawbytes[i+4] = bytebits_to_byte( pre + (i*8), 8);
 	
-	if (g_debugMode) PrintAndLogEx(NORMAL, " WIE | %s\n", sprint_hex(rawbytes, sizeof(rawbytes)));	
+	PrintAndLogEx(DEBUG, " WIE | %s\n", sprint_hex(rawbytes, sizeof(rawbytes)));	
 	
 	
 	// XOR (only works on wiegand stuff)
 	for (i = 1; i < 12; ++i)
 		rawbytes[i] ^= xorKey ;
 	
-	if (g_debugMode) PrintAndLogEx(NORMAL, " XOR | %s \n", sprint_hex(rawbytes, sizeof(rawbytes)));
+	PrintAndLogEx(DEBUG, " XOR | %s \n", sprint_hex(rawbytes, sizeof(rawbytes)));
 
 	// convert rawbytes to bits in pre
 	for (i = 0; i < 12; ++i)
 		num_to_bytebitsLSBF( rawbytes[i], 8, pre + (i*8));
 
-	if (g_debugMode) PrintAndLogEx(NORMAL, "\n Raw | %s \n", sprint_hex(rawbytes, sizeof(rawbytes)));
-	if (g_debugMode) PrintAndLogEx(NORMAL, " Raw | %s\n", sprint_bin(pre, 64) );
+	PrintAndLogEx(DEBUG, "\n Raw | %s \n", sprint_hex(rawbytes, sizeof(rawbytes)));
+	PrintAndLogEx(DEBUG, " Raw | %s\n", sprint_bin(pre, 64) );
 	
 	// add spacer bit 0 every 4 bits, starting with index 0,
 	// 12 bytes, 24 nibbles.  24+1 extra bites. 3bytes.  ie 9bytes | 1byte xorkey, 8bytes rawdata (64bits, should be enough for a 40bit wiegand)
@@ -135,7 +135,7 @@ int GetGuardBits(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint8_t *guardBits) {
 	guardBits[4] = 1;
 	guardBits[5] = 0;
 	
-	if (g_debugMode) PrintAndLogEx(NORMAL, " FIN | %s\n", sprint_bin(guardBits, 96) );
+	PrintAndLogEx(DEBUG, " FIN | %s\n", sprint_bin(guardBits, 96) );
 	return 1;
 }
 

From 528ffd9e66f829a55a28170b6f64cd406c1bda8d Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Feb 2019 17:23:33 +0100
Subject: [PATCH 0584/1938] text

---
 client/cmdlfawid.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c
index 61f33f636..3cc56f56c 100644
--- a/client/cmdlfawid.c
+++ b/client/cmdlfawid.c
@@ -290,7 +290,7 @@ int CmdAWIDDemod(const char *Cmd) {
 	uint32_t rawHi2 = bytebits_to_byte(bits + idx, 32);
 
 	size = removeParity(bits, idx+8, 4, 1, 88);
-	if (size != 66){
+	if (size != 66) {
 		PrintAndLogEx(DEBUG, "DEBUG: Error - AWID at parity check-tag size does not match AWID format");
 		return 0;
 	}
@@ -386,7 +386,7 @@ int CmdAWIDSim(const char *Cmd) {
 	
 	verify_values(&fmtlen, &fc, &cn);
 	
-	PrintAndLogEx(SUCCESS, "Emulating AWID %u -- FC: %u; CN: %u\n", fmtlen, fc, cn);
+	PrintAndLogEx(SUCCESS, "Simulating AWID %u -- FC: %u; CN: %u\n", fmtlen, fc, cn);
 	PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation or run another command");
 	
 	if (!getAWIDBits(fmtlen, fc, cn, bits)) {

From 4b0f13a2e43bf62c22c500aa8518e2a16a4bb3a7 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Feb 2019 17:25:40 +0100
Subject: [PATCH 0585/1938] text

---
 client/cmdlfio.c | 50 +++++++++++++++++++++++-------------------------
 1 file changed, 24 insertions(+), 26 deletions(-)

diff --git a/client/cmdlfio.c b/client/cmdlfio.c
index d2cecec4b..61fe9d00d 100644
--- a/client/cmdlfio.c
+++ b/client/cmdlfio.c
@@ -86,15 +86,15 @@ int CmdIOProxDemod(const char *Cmd) {
 	uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
 	size_t size = getFromGraphBuf(bits);
 	if (size < 65) {
-		if (g_debugMode) PrintAndLogEx(DEBUG, "DEBUG: Error - IO prox not enough samples in GraphBuffer");
+		PrintAndLogEx(DEBUG, "DEBUG: Error - IO prox not enough samples in GraphBuffer");
 		return 0;
 	}	
 	//get binary from fsk wave	
 	int waveIdx = 0;
 	idx = detectIOProx(bits, &size, &waveIdx);
-	if (idx < 0){
-		if (g_debugMode){
-			if (idx == -1){
+	if (idx < 0) {
+		if (g_debugMode) {
+			if (idx == -1) {
 				PrintAndLogEx(DEBUG, "DEBUG: Error - IO prox not enough samples");				
 			} else if (idx == -2) {
 				PrintAndLogEx(DEBUG, "DEBUG: Error - IO prox just noise detected");
@@ -115,10 +115,10 @@ int CmdIOProxDemod(const char *Cmd) {
 	setDemodBuf(bits, size, idx);
 	setClockGrid(64, waveIdx + (idx*64));
 	
-	if (idx==0){
-		if (g_debugMode){
+	if (idx == 0) {
+		if (g_debugMode) {
 			PrintAndLogEx(DEBUG, "DEBUG: Error - IO prox data not found - FSK Bits: %d", size);
-			if (size > 92) PrintAndLogEx(NORMAL, "%s", sprint_bin_break(bits, 92, 16));
+			if (size > 92) PrintAndLogEx(DEBUG, "%s", sprint_bin_break(bits, 92, 16));
 		} 
 		return retval;
 	}
@@ -132,15 +132,13 @@ int CmdIOProxDemod(const char *Cmd) {
 	//
 	//XSF(version)facility:codeone+codetwo (raw)
 	
-	if (g_debugMode) {
-		PrintAndLogEx(NORMAL, "%d%d%d%d%d%d%d%d %d", bits[idx], bits[idx+1], bits[idx+2], bits[idx+3], bits[idx+4], bits[idx+5], bits[idx+6], bits[idx+7], bits[idx+8]);
-		PrintAndLogEx(NORMAL, "%d%d%d%d%d%d%d%d %d", bits[idx+9], bits[idx+10], bits[idx+11],bits[idx+12],bits[idx+13],bits[idx+14],bits[idx+15],bits[idx+16],bits[idx+17]);
-		PrintAndLogEx(NORMAL, "%d%d%d%d%d%d%d%d %d facility", bits[idx+18], bits[idx+19], bits[idx+20],bits[idx+21],bits[idx+22],bits[idx+23],bits[idx+24],bits[idx+25],bits[idx+26]);
-		PrintAndLogEx(NORMAL, "%d%d%d%d%d%d%d%d %d version", bits[idx+27], bits[idx+28], bits[idx+29],bits[idx+30],bits[idx+31],bits[idx+32],bits[idx+33],bits[idx+34],bits[idx+35]);
-		PrintAndLogEx(NORMAL, "%d%d%d%d%d%d%d%d %d code1", bits[idx+36], bits[idx+37], bits[idx+38],bits[idx+39],bits[idx+40],bits[idx+41],bits[idx+42],bits[idx+43],bits[idx+44]);
-		PrintAndLogEx(NORMAL, "%d%d%d%d%d%d%d%d %d code2", bits[idx+45], bits[idx+46], bits[idx+47],bits[idx+48],bits[idx+49],bits[idx+50],bits[idx+51],bits[idx+52],bits[idx+53]);
-		PrintAndLogEx(NORMAL, "%d%d%d%d%d%d%d%d %d%d checksum", bits[idx+54],bits[idx+55],bits[idx+56],bits[idx+57],bits[idx+58],bits[idx+59],bits[idx+60],bits[idx+61],bits[idx+62],bits[idx+63]);
-	}
+	PrintAndLogEx(DEBUG, "%d%d%d%d%d%d%d%d %d", bits[idx], bits[idx+1], bits[idx+2], bits[idx+3], bits[idx+4], bits[idx+5], bits[idx+6], bits[idx+7], bits[idx+8]);
+	PrintAndLogEx(DEBUG, "%d%d%d%d%d%d%d%d %d", bits[idx+9], bits[idx+10], bits[idx+11],bits[idx+12],bits[idx+13],bits[idx+14],bits[idx+15],bits[idx+16],bits[idx+17]);
+	PrintAndLogEx(DEBUG, "%d%d%d%d%d%d%d%d %d facility", bits[idx+18], bits[idx+19], bits[idx+20],bits[idx+21],bits[idx+22],bits[idx+23],bits[idx+24],bits[idx+25],bits[idx+26]);
+	PrintAndLogEx(DEBUG, "%d%d%d%d%d%d%d%d %d version", bits[idx+27], bits[idx+28], bits[idx+29],bits[idx+30],bits[idx+31],bits[idx+32],bits[idx+33],bits[idx+34],bits[idx+35]);
+	PrintAndLogEx(DEBUG, "%d%d%d%d%d%d%d%d %d code1", bits[idx+36], bits[idx+37], bits[idx+38],bits[idx+39],bits[idx+40],bits[idx+41],bits[idx+42],bits[idx+43],bits[idx+44]);
+	PrintAndLogEx(DEBUG, "%d%d%d%d%d%d%d%d %d code2", bits[idx+45], bits[idx+46], bits[idx+47],bits[idx+48],bits[idx+49],bits[idx+50],bits[idx+51],bits[idx+52],bits[idx+53]);
+	PrintAndLogEx(DEBUG, "%d%d%d%d%d%d%d%d %d%d checksum", bits[idx+54],bits[idx+55],bits[idx+56],bits[idx+57],bits[idx+58],bits[idx+59],bits[idx+60],bits[idx+61],bits[idx+62],bits[idx+63]);
 	
 	uint32_t code = bytebits_to_byte(bits+idx,32);
 	uint32_t code2 = bytebits_to_byte(bits+idx+32,32);
@@ -163,13 +161,13 @@ int CmdIOProxDemod(const char *Cmd) {
 		snprintf(crcStr, 3, "ok");
 		retval = 1;
 	} else {
-		if (g_debugMode) PrintAndLogEx(DEBUG, "DEBUG: Error - IO prox crc failed");
+		PrintAndLogEx(DEBUG, "DEBUG: Error - IO prox crc failed");
 			
 		snprintf(crcStr, sizeof(crcStr), "failed 0x%02X != 0x%02X", crc, calccrc);
 		retval = 0;
 	}
 
-	PrintAndLogEx(NORMAL, "IO Prox XSF(%02d)%02x:%05d (%08x%08x) [crc %s]", version, facilitycode, number, code, code2, crcStr);
+	PrintAndLogEx(SUCCESS, "IO Prox XSF(%02d)%02x:%05d (%08x%08x) [crc %s]", version, facilitycode, number, code, code2, crcStr);
 
 	if (g_debugMode){
 		PrintAndLogEx(DEBUG, "DEBUG: IO prox idx: %d, Len: %d, Printing demod buffer:", idx, size);
@@ -241,7 +239,7 @@ int getIOProxBits(uint8_t version, uint8_t fc, uint16_t cn, uint8_t *bits) {
 
 	memcpy(bits, pre, sizeof(pre));
 	
-	PrintAndLogEx(NORMAL, "IO raw bits:\n %s \n", sprint_bin(bits, 64));
+	PrintAndLogEx(SUCCESS, "IO raw bits:\n %s \n", sprint_bin(bits, 64));
 	return 1;
 }
 
@@ -252,8 +250,8 @@ int CmdIOProxSim(const char *Cmd) {
 	size_t size = sizeof(bits);
 	memset(bits, 0x00, size);
  
-	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_io_sim();
+	char cmdp = tolower(param_getchar(Cmd, 0));
+	if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_io_sim();
 	
   	version = param_get8(Cmd, 0);
 	fc = param_get8(Cmd, 1);
@@ -263,7 +261,7 @@ int CmdIOProxSim(const char *Cmd) {
 	
 	if ((cn & 0xFFFF) != cn) {
 		cn &= 0xFFFF;
-		PrintAndLogEx(NORMAL, "Card Number Truncated to 16-bits (IOProx): %u", cn);
+		PrintAndLogEx(INFO, "Card Number Truncated to 16-bits (IOProx): %u", cn);
 	}
 	
 	// clock 64, FSK2a fcHIGH 10 | fcLOW 8
@@ -272,8 +270,8 @@ int CmdIOProxSim(const char *Cmd) {
 	arg1 = high << 8 | low;
 	arg2 = invert << 8 | clk;
 
-	PrintAndLogEx(NORMAL, "Emulating IOProx Version: %u FC: %u; CN: %u\n", version, fc, cn);
-	PrintAndLogEx(NORMAL, "Press pm3-button to abort simulation or run another command");
+	PrintAndLogEx(SUCCESS, "Simulating IOProx version: %u FC: %u; CN: %u\n", version, fc, cn);
+	PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation or run another command");
 	
 	if ( !getIOProxBits(version, fc, cn, bits)) {
 		PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
@@ -309,7 +307,7 @@ int CmdIOProxClone(const char *Cmd) {
 	
 	if ((cn & 0xFFFF) != cn) {
 		cn &= 0xFFFF;
-		PrintAndLogEx(NORMAL, "Card Number Truncated to 16-bits (IOProx): %u", cn);
+		PrintAndLogEx(INFO, "Card Number Truncated to 16-bits (IOProx): %u", cn);
 	}
 	
 	if ( !getIOProxBits(version, fc, cn, bits)) {
@@ -323,7 +321,7 @@ int CmdIOProxClone(const char *Cmd) {
 	blocks[1] = bytebits_to_byte(bits, 32);
 	blocks[2] = bytebits_to_byte(bits + 32, 32);
 
-	PrintAndLogEx(NORMAL, "Preparing to clone IOProx to T55x7 with Version: %u FC: %u, CN: %u", version, fc, cn);
+	PrintAndLogEx(INFO, "Preparing to clone IOProx to T55x7 with Version: %u FC: %u, CN: %u", version, fc, cn);
 	print_blocks(blocks, 3);
 	
 	//UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};

From 92631bdfb407cbefba23cfe76fbf3a21294a3e66 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Feb 2019 17:25:47 +0100
Subject: [PATCH 0586/1938] text

---
 client/cmdlfem4x.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 97e0668cc..6d90e550f 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -443,14 +443,14 @@ int CmdEM410xSim(const char *Cmd) {
 	uint8_t clock = 64;
 
 	if (param_gethex(Cmd, 0, uid, 10)) {
-		PrintAndLogEx(NORMAL, "UID must include 10 HEX symbols");
+		PrintAndLogEx(FAILED, "UID must include 10 HEX symbols");
 		return 0;
 	}
 	
 	param_getdec(Cmd, 1, &clock);
 	
-	PrintAndLogEx(NORMAL, "Starting simulating UID %02X%02X%02X%02X%02X  clock: %d", uid[0],uid[1],uid[2],uid[3],uid[4],clock);
-	PrintAndLogEx(NORMAL, "Press pm3-button to abort simulation");
+	PrintAndLogEx(SUCCESS, "Starting simulating UID %02X%02X%02X%02X%02X  clock: %d", uid[0],uid[1],uid[2],uid[3],uid[4],clock);
+	PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation");
 
 	ConstructEM410xEmulGraph(Cmd, clock);
  
@@ -508,7 +508,7 @@ int CmdEM410xBrute(const char *Cmd) {
 		if( buf[0]=='#' ) continue;
 		
 		if (param_gethex(buf, 0, uid, 10)) {
-			PrintAndLogEx(NORMAL, "UIDs must include 10 HEX symbols");
+			PrintAndLogEx(FAILED, "UIDs must include 10 HEX symbols");
 			free(uidBlock);
 			fclose(f);
 			return 1;
@@ -535,11 +535,12 @@ int CmdEM410xBrute(const char *Cmd) {
 	fclose(f);
 	
 	if (uidcnt == 0) {
-		PrintAndLogEx(NORMAL, "No UIDs found in file");
+		PrintAndLogEx(FAILED, "No UIDs found in file");
 		free(uidBlock);
 		return 1;
 	}
-	PrintAndLogEx(NORMAL, "Loaded %d UIDs from %s, pause delay: %d ms", uidcnt, filename, delay);
+	
+	PrintAndLogEx(SUCCESS, "Loaded %d UIDs from %s, pause delay: %d ms", uidcnt, filename, delay);
 	
 	// loop
 	for(uint32_t c = 0; c < uidcnt; ++c ) {
@@ -599,7 +600,7 @@ int CmdEM410xWatchnSpoof(const char *Cmd) {
 	
 	// loops if the captured ID was in XL-format.
 	CmdEM410xWatch(Cmd);
-	PrintAndLogEx(NORMAL, "# Replaying captured ID: %010" PRIx64 , g_em410xid);
+	PrintAndLogEx(SUCCESS, "# Replaying captured ID: %010" PRIx64 , g_em410xid);
 	CmdLFaskSim("");
 	return 0;
 }
@@ -645,17 +646,17 @@ int CmdEM410xWrite(const char *Cmd) {
 	}
 
 	if (card == 1) {
-		PrintAndLogEx(NORMAL, "Writing %s tag with UID 0x%010" PRIx64 " (clock rate: %d)", "T55x7", id, clock);
+		PrintAndLogEx(SUCCESS, "Writing %s tag with UID 0x%010" PRIx64 " (clock rate: %d)", "T55x7", id, clock);
 		// NOTE: We really should pass the clock in as a separate argument, but to
 		//   provide for backwards-compatibility for older firmware, and to avoid
 		//   having to add another argument to CMD_EM410X_WRITE_TAG, we just store
 		//   the clock rate in bits 8-15 of the card value
 		card = (card & 0xFF) | ((clock << 8) & 0xFF00);
 	}	else if (card == 0) {
-		PrintAndLogEx(NORMAL, "Writing %s tag with UID 0x%010" PRIx64, "T5555", id, clock);
+		PrintAndLogEx(SUCCESS, "Writing %s tag with UID 0x%010" PRIx64, "T5555", id, clock);
 		card = (card & 0xFF) | ((clock << 8) & 0xFF00);
 	} else {
-		PrintAndLogEx(WARNING, "Error! Bad card type selected.\n");
+		PrintAndLogEx(FAILED, "Error! Bad card type selected.\n");
 		return 0;
 	}
 

From e2d253f641c3607a7a11bbc5e24797230c9551ba Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Feb 2019 17:25:55 +0100
Subject: [PATCH 0587/1938] text

---
 client/cmdlffdx.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/cmdlffdx.c b/client/cmdlffdx.c
index 8b67358ca..194bb7f32 100644
--- a/client/cmdlffdx.c
+++ b/client/cmdlffdx.c
@@ -82,11 +82,11 @@ int detectFDXB(uint8_t *dest, size_t *size) {
 static void verify_values(uint32_t countryid, uint64_t animalid){
 	if ((animalid & 0x3FFFFFFFFF) != animalid) {
 		animalid &= 0x3FFFFFFFFF;
-		PrintAndLogEx(NORMAL, "Animal ID Truncated to 38bits: %"PRIx64, animalid);
+		PrintAndLogEx(INFO, "Animal ID Truncated to 38bits: %"PRIx64, animalid);
 	}	
 	if ( (countryid & 0x3ff) != countryid ) {
 		countryid &= 0x3ff;
-		PrintAndLogEx(NORMAL, "Country ID Truncated to 10bits: %03d", countryid);
+		PrintAndLogEx(INFO, "Country ID Truncated to 10bits: %03d", countryid);
 	}
 }
 

From 95f8a48b560dc3feea9cff08ee05501e1e0b24a0 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Feb 2019 17:28:54 +0100
Subject: [PATCH 0588/1938] text

---
 client/cmdlfhid.c | 34 ++++++++++++++--------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c
index 7bc3bb9e9..7d1bda95c 100644
--- a/client/cmdlfhid.c
+++ b/client/cmdlfhid.c
@@ -106,7 +106,7 @@ static bool sendTry(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint32_t delay, ui
 
 	// this should be optional.
 	if ( verbose )
-		PrintAndLogEx(NORMAL, "Trying FC: %u; CN: %u", fc, cn);
+		PrintAndLogEx(INFO, "Trying FC: %u; CN: %u", fc, cn);
 	
 	calcWiegand( fmtlen, fc, cn, bits);
 
@@ -164,7 +164,7 @@ int CmdHIDDemod(const char *Cmd) {
 	}
 	
 	if (hi2 != 0){ //extra large HID tags
-		PrintAndLogEx(NORMAL, "HID Prox TAG ID: %x%08x%08x (%u)", hi2, hi, lo, (lo>>1) & 0xFFFF);
+		PrintAndLogEx(SUCCESS, "HID Prox TAG ID: %x%08x%08x (%u)", hi2, hi, lo, (lo>>1) & 0xFFFF);
 	} else {  //standard HID tags <38 bits
 		uint8_t fmtLen = 0;
 		uint32_t cc = 0;
@@ -209,9 +209,9 @@ int CmdHIDDemod(const char *Cmd) {
 			}
 		}
 		if(fmtLen==32 && (lo & 0x40000000)){//if 32 bit and Kastle bit set
-			PrintAndLogEx(NORMAL, "HID Prox TAG (Kastle format) ID: %08x (%u) - Format Len: 32bit - CC: %u - FC: %u - Card: %u", lo, (lo >> 1) & 0xFFFF, cc, fc, cardnum);
+			PrintAndLogEx(SUCCESS, "HID Prox TAG (Kastle format) ID: %08x (%u) - Format Len: 32bit - CC: %u - FC: %u - Card: %u", lo, (lo >> 1) & 0xFFFF, cc, fc, cardnum);
 		}else{
-			PrintAndLogEx(NORMAL, "HID Prox TAG ID: %x%08x (%u) - Format Len: %ubit - FC: %u - Card: %u", hi, lo, (lo >> 1) & 0xFFFF, fmtLen, fc, cardnum);
+			PrintAndLogEx(SUCCESS, "HID Prox TAG ID: %x%08x (%u) - Format Len: %ubit - FC: %u - Card: %u", hi, lo, (lo >> 1) & 0xFFFF, fmtLen, fc, cardnum);
 		}
 	}
 
@@ -244,16 +244,16 @@ int CmdHIDSim(const char *Cmd) {
 	uint32_t hi = 0, lo = 0;
 	uint32_t n = 0, i = 0;
 
-	uint8_t ctmp = param_getchar(Cmd, 0);
-	if ( strlen(Cmd) == 0 || ctmp == 'H' || ctmp == 'h' ) return usage_lf_hid_sim();
+	uint8_t ctmp = tolower(param_getchar(Cmd, 0));
+	if ( strlen(Cmd) == 0 || ctmp == 'h' ) return usage_lf_hid_sim();
 	
 	while (sscanf(&Cmd[i++], "%1x", &n ) == 1) {
 		hi = (hi << 4) | (lo >> 28);
 		lo = (lo << 4) | (n & 0xf);
 	}
 
-	PrintAndLogEx(NORMAL, "Emulating tag with ID %x%08x", hi, lo);
-	PrintAndLogEx(NORMAL, "Press pm3-button to abort simulation");
+	PrintAndLogEx(SUCCESS, "Simulating HID tag with ID %x%08x", hi, lo);
+	PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation");
 
 	UsbCommand c = {CMD_HID_SIM_TAG, {hi, lo, 0}};
 	clearCommandBuffer();
@@ -277,7 +277,7 @@ int CmdHIDClone(const char *Cmd) {
 			lo = (lo << 4) | (n & 0xf);
 		}
 
-		PrintAndLogEx(NORMAL, "Cloning tag with long ID %x%08x%08x", hi2, hi, lo);
+		PrintAndLogEx(INFO, "Preparing to clone HID tag with long ID %x%08x%08x", hi2, hi, lo);
 
 		c.d.asBytes[0] = 1;
 	} else {
@@ -285,7 +285,7 @@ int CmdHIDClone(const char *Cmd) {
 			hi = (hi << 4) | (lo >> 28);
 			lo = (lo << 4) | (n & 0xf);
 		}
-		PrintAndLogEx(NORMAL, "Cloning tag with ID %x%08x", hi, lo);
+		PrintAndLogEx(INFO, "Preparing to clone HID tag with ID %x%08x", hi, lo);
 		hi2 = 0;
 		c.d.asBytes[0] = 0;
 	}
@@ -492,33 +492,28 @@ int CmdHIDBrute(const char *Cmd){
 	memset(bits, 0, sizeof(bits));
 	uint8_t cmdp = 0;
 		
-	while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch(param_getchar(Cmd, cmdp)) {
+	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+		switch (tolower(param_getchar(Cmd, cmdp))) {
 		case 'h':
-		case 'H':
 			return usage_lf_hid_brute();
 		case 'f':
-		case 'F':
 		  	fc =  param_get32ex(Cmd ,cmdp+1, 0, 10);
 			if ( !fc )
 				errors = true;
 			cmdp += 2;
 			break;
 		case 'd':
-		case 'D':
 			// delay between attemps,  defaults to 1000ms. 
 			delay = param_get32ex(Cmd, cmdp+1, 1000, 10);
 			cmdp += 2;
 			break;
 		case 'c':
-		case 'C':
 			cn = param_get32ex(Cmd, cmdp+1, 0, 10);
 			// truncate cardnumber.
 			cn &= 0xFFFF;
 			cmdp += 2;
 			break;
 		case 'a':
-		case 'A':
 			fmtlen = param_get8(Cmd, cmdp+1);
 			cmdp += 2;
 			bool is_ftm_ok = false;
@@ -532,7 +527,6 @@ int CmdHIDBrute(const char *Cmd){
 			errors = !is_ftm_ok;
 			break;
 		case 'v':		
-		case 'V':
 			verbose = true;
 			cmdp++;
 			break;
@@ -545,8 +539,8 @@ int CmdHIDBrute(const char *Cmd){
 	if ( fc == 0 ) errors = true;
 	if ( errors ) return usage_lf_hid_brute();
 	
-	PrintAndLogEx(NORMAL, "Brute-forcing HID reader");
-	PrintAndLogEx(NORMAL, "Press pm3-button to abort simulation or run another command");
+	PrintAndLogEx(INFO, "Brute-forcing HID reader");
+	PrintAndLogEx(INFO, "Press pm3-button to abort simulation or run another command");
 	
 	uint16_t up = cn;
 	uint16_t down = cn;

From 4b7f6089ae442c92a45cc600b19fa9ac7e7d74ed Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Feb 2019 17:30:05 +0100
Subject: [PATCH 0589/1938] text

---
 client/cmdlfsecurakey.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/cmdlfsecurakey.c b/client/cmdlfsecurakey.c
index 793c30fce..64e491d7f 100644
--- a/client/cmdlfsecurakey.c
+++ b/client/cmdlfsecurakey.c
@@ -97,12 +97,12 @@ int CmdSecurakeyDemod(const char *Cmd) {
 	// test parities - evenparity32 looks to add an even parity returns 0 if already even...
 	bool parity = !evenparity32(lWiegand) && !oddparity32(rWiegand);
 
-	PrintAndLogEx(NORMAL, "Securakey Tag Found--BitLen: %u, Card ID: %u, FC: 0x%X, Raw: %08X%08X%08X", bitLen, cardid, fc, raw1 ,raw2, raw3);
+	PrintAndLogEx(SUCCESS, "Securakey Tag Found--BitLen: %u, Card ID: %u, FC: 0x%X, Raw: %08X%08X%08X", bitLen, cardid, fc, raw1 ,raw2, raw3);
 	if (bitLen <= 32)
-		PrintAndLogEx(NORMAL, "Wiegand: %08X, Parity: %s", (lWiegand<<(bitLen/2)) | rWiegand, parity ? "Passed" : "Failed");
-	PrintAndLogEx(NORMAL, "\nHow the FC translates to printed FC is unknown");
-	PrintAndLogEx(NORMAL, "How the checksum is calculated is unknown");
-	PrintAndLogEx(NORMAL, "Help the community identify this format further\n by sharing your tag on the pm3 forum or with forum members");
+		PrintAndLogEx(SUCCESS, "Wiegand: %08X, Parity: %s", (lWiegand<<(bitLen/2)) | rWiegand, parity ? "Passed" : "Failed");
+	PrintAndLogEx(INFO, "\nHow the FC translates to printed FC is unknown");
+	PrintAndLogEx(INFO, "How the checksum is calculated is unknown");
+	PrintAndLogEx(INFO, "Help the community identify this format further\n by sharing your tag on the pm3 forum or with forum members");
 	return 1;
 }
 

From a47085a7b4461ff15119596474c69cce48eb5ae1 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Feb 2019 17:30:55 +0100
Subject: [PATCH 0590/1938] text

---
 client/cmdlfviking.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdlfviking.c b/client/cmdlfviking.c
index 5ead8ef03..33a5588d3 100644
--- a/client/cmdlfviking.c
+++ b/client/cmdlfviking.c
@@ -118,7 +118,7 @@ int CmdVikingClone(const char *Cmd) {
 
 	rawID = getVikingBits(id);
 	
-	PrintAndLogEx(INFO, "Cloning - ID: %08X, Raw: %08X%08X",id,(uint32_t)(rawID >> 32),(uint32_t) (rawID & 0xFFFFFFFF));
+	PrintAndLogEx(INFO, "Preparing to clone Viking tag - ID: %08X, Raw: %08X%08X",id,(uint32_t)(rawID >> 32),(uint32_t) (rawID & 0xFFFFFFFF));
 	
 	UsbCommand c = {CMD_VIKING_CLONE_TAG, {rawID >> 32, rawID & 0xFFFFFFFF, Q5}};
 	clearCommandBuffer();

From 7b9a5eb7e34ae992052f00e1f2a674d930cb833f Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Feb 2019 17:32:01 +0100
Subject: [PATCH 0591/1938] text

---
 client/cmdlfvisa2000.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/cmdlfvisa2000.c b/client/cmdlfvisa2000.c
index 2736934af..02cd5392e 100644
--- a/client/cmdlfvisa2000.c
+++ b/client/cmdlfvisa2000.c
@@ -165,8 +165,8 @@ int CmdVisa2kClone(const char *Cmd) {
 	uint64_t id = 0;
 	uint32_t blocks[4] = {T55x7_MODULATION_MANCHESTER | T55x7_BITRATE_RF_64 | T55x7_ST_TERMINATOR | 3 << T55x7_MAXBLOCK_SHIFT, BL0CK1, 0};
 
-	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_visa2k_clone();
+	char cmdp = tolower(param_getchar(Cmd, 0));
+	if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_visa2k_clone();
 
 	id = param_get32ex(Cmd, 0, 0, 10);
 	
@@ -210,7 +210,7 @@ int CmdVisa2kSim(const char *Cmd) {
 	arg1 = clk << 8 | encoding;
 	arg2 = invert << 8 | separator;
 
-	PrintAndLogEx(NORMAL, "Simulating Visa2000 - CardId: %u", id);
+	PrintAndLogEx(SUCCESS, "Simulating Visa2000 - CardId: %u", id);
 
 	UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};
 

From 6b1ae818a50c96be8109cade083dddcd001eb006 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Feb 2019 18:27:56 +0100
Subject: [PATCH 0592/1938] fix: bad break..

---
 client/mifarehost.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/mifarehost.c b/client/mifarehost.c
index 31ed8e39d..60f3eaa01 100644
--- a/client/mifarehost.c
+++ b/client/mifarehost.c
@@ -956,8 +956,8 @@ int detect_classic_nackbug(bool verbose){
 							if (verbose) {
 								PrintAndLogEx(FAILED, "card random number generator seems to be based on the well-known generating polynomial");
 								PrintAndLogEx(NORMAL, "[- ]with 16 effective bits only, but shows unexpected behavior, try again."); 
-								return 0;
-							}
+x							}
+							return 2;
 						}				
 				case  2 : PrintAndLogEx(SUCCESS, "always leak NACK detected"); return 3;
 				case  1 : PrintAndLogEx(SUCCESS, "NACK bug detected"); return 1;

From 8e01c9899f4a12194c99e831cecc31f9c41654a4 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Feb 2019 18:31:59 +0100
Subject: [PATCH 0593/1938] aaaaaa

---
 client/mifarehost.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/mifarehost.c b/client/mifarehost.c
index 60f3eaa01..927fb7bc0 100644
--- a/client/mifarehost.c
+++ b/client/mifarehost.c
@@ -956,7 +956,7 @@ int detect_classic_nackbug(bool verbose){
 							if (verbose) {
 								PrintAndLogEx(FAILED, "card random number generator seems to be based on the well-known generating polynomial");
 								PrintAndLogEx(NORMAL, "[- ]with 16 effective bits only, but shows unexpected behavior, try again."); 
-x							}
+							}
 							return 2;
 						}				
 				case  2 : PrintAndLogEx(SUCCESS, "always leak NACK detected"); return 3;

From 8512c0ea093976e13b62fe27cb4965c51a3fa8fc Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Feb 2019 19:25:44 +0100
Subject: [PATCH 0594/1938] fix: mem leak

---
 uart/uart_posix.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index e3d7753a9..c3ff7dcca 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -83,6 +83,7 @@ serial_port uart_open(const char* pcPortName) {
 
 		if (addrstr == NULL) {
 			printf("Error: strdup\n");
+			free(sp);
 			return INVALID_SERIAL_PORT;
 		}
 

From 01cf818e48296012f408f9c2f076a2a37c049344 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Feb 2019 19:32:14 +0100
Subject: [PATCH 0595/1938] remove a warning

---
 client/jansson/error.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/client/jansson/error.c b/client/jansson/error.c
index b94b3a3a1..96b3b3fac 100644
--- a/client/jansson/error.c
+++ b/client/jansson/error.c
@@ -3,8 +3,7 @@
 
 void jsonp_error_init(json_error_t *error, const char *source)
 {
-    if(error)
-    {
+    if (error) {
         error->text[0] = '\0';
         error->line = -1;
         error->column = -1;
@@ -20,13 +19,13 @@ void jsonp_error_set_source(json_error_t *error, const char *source)
 {
     size_t length;
 
-    if(!error || !source)
+    if (!error || !source)
         return;
 
     length = strlen(source);
-    if(length < JSON_ERROR_SOURCE_LENGTH)
-        strncpy(error->source, source, JSON_ERROR_SOURCE_LENGTH);
-    else {
+    if (length < JSON_ERROR_SOURCE_LENGTH) {
+        strncpy(error->source, source, length);
+	} else {
         size_t extra = length - JSON_ERROR_SOURCE_LENGTH + 4;
         memcpy(error->source, "...", 3);
         strncpy(error->source + 3, source + extra, length - extra + 1);
@@ -38,7 +37,6 @@ void jsonp_error_set(json_error_t *error, int line, int column,
                      const char *msg, ...)
 {
     va_list ap;
-
     va_start(ap, msg);
     jsonp_error_vset(error, line, column, position, code, msg, ap);
     va_end(ap);
@@ -48,10 +46,10 @@ void jsonp_error_vset(json_error_t *error, int line, int column,
                       size_t position, enum json_error_code code,
                       const char *msg, va_list ap)
 {
-    if(!error)
+    if (!error)
         return;
 
-    if(error->text[0] != '\0') {
+    if (error->text[0] != '\0') {
         /* error already set */
         return;
     }

From f58c47a7b83989655222ec70069fe5a0039807d2 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Feb 2019 19:38:16 +0100
Subject: [PATCH 0596/1938] cleanup

---
 client/cmdhfmf.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 76f0fc2b6..f04105c01 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -2239,11 +2239,7 @@ int CmdHF14AMfSniff(const char *Cmd){
 				bufsize = traceLen;
 				memset(buf, 0x00, traceLen);
 			}
-			if (bufPtr == NULL) {
-				PrintAndLogEx(FAILED, "Cannot allocate memory for trace");
-				free(buf);
-				return 2;
-			}
+
 			// what happens if LEN is bigger then TRACELEN --iceman
 			memcpy(bufPtr, resp.d.asBytes, len);
 			bufPtr += len;

From aaac99fdee55a49f79e3b90e99146783fb501b0c Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Feb 2019 19:46:09 +0100
Subject: [PATCH 0597/1938] fix: 'hf mf csave' unused code

---
 client/cmdhfmf.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index f04105c01..c59dad769 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -2749,8 +2749,11 @@ int CmdHF14AMfCLoad(const char *Cmd) {
 		}
 	}
 	
-	if ( res )
+	if ( res ) {
+		if ( data )
+			free(data);
 		return 1;
+	}
 	
 //	PrintAndLogEx(INFO, "DATA | %s", sprint_hex(data+1000, 24) );
 	
@@ -2922,7 +2925,6 @@ int CmdHF14AMfCSave(const char *Cmd) {
 				errors = true;
 				break;
 			}
-			if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5;				
 
 			useuid = false;
 			hasname = true;		

From a49b3763ddace55fee8b21339d1914645cfcddeb Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Feb 2019 19:50:05 +0100
Subject: [PATCH 0598/1938] fix: bad check

---
 client/cmdhf14b.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c
index 11b0aabb3..4109a999a 100644
--- a/client/cmdhf14b.c
+++ b/client/cmdhf14b.c
@@ -283,7 +283,7 @@ static bool get_14b_UID(iso14b_card_select_t *card) {
 		} 
 	} // retry	
 	
-	if ( !retry )
+	if ( retry <= 0 )
 		PrintAndLogEx(WARNING, "timeout while waiting for reply.");
 	
 	return false;

From 47c808fd5cf4f5ce571f8792fbb297521c2a65a9 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Feb 2019 19:50:24 +0100
Subject: [PATCH 0599/1938] fix: check return value

---
 client/fido/fidocore.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/client/fido/fidocore.c b/client/fido/fidocore.c
index f83e64944..49088ec28 100644
--- a/client/fido/fidocore.c
+++ b/client/fido/fidocore.c
@@ -347,8 +347,10 @@ bool CheckrpIdHash(json_t *json, uint8_t *hash) {
 	uint8_t hash2[32] = {0};
 	
 	JsonLoadStr(json, "$.RelyingPartyEntity.id", hashval);
-	sha256hash((uint8_t *)hashval, strlen(hashval), hash2);
-
+	int res = sha256hash((uint8_t *)hashval, strlen(hashval), hash2);
+	if (res)
+		return false;
+	
 	return !memcmp(hash, hash2, 32);
 }
 

From c650c238569d5419d0484faf34ff3647b5dc7b0c Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Feb 2019 19:57:57 +0100
Subject: [PATCH 0600/1938] fix: 'lf flexdemod' - bad types

---
 client/cmdlf.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/client/cmdlf.c b/client/cmdlf.c
index e41f2d6aa..f644fcc84 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -189,12 +189,15 @@ int CmdFlexdemod(const char *Cmd) {
 #define LONG_WAIT 100	
 	int i, j, start, bit, sum, phase = 0;
 
-	uint8_t data[MAX_GRAPH_TRACE_LEN] = {0};
-	size_t size = getFromGraphBuf(data);
-	if (size == 0) 
+	int data[GraphTraceLen];
+	memcpy(data, GraphBuffer, GraphTraceLen);
+	
+	if ( GraphTraceLen < 0 )
 		return 0;
 	
-	for (i = 0; i < size; ++i)
+	size_t size = GraphTraceLen;
+	
+	for (i = 0; i < GraphTraceLen; ++i)
 		data[i] = (data[i] < 0) ? -1 : 1;
 
 	for (start = 0; start < size - LONG_WAIT; start++) {

From 17fcd8c24bbd090760f33dca7c535967d4bf89d6 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Feb 2019 20:00:41 +0100
Subject: [PATCH 0601/1938] fix: possible bad null ref

---
 client/emv/emvjson.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/client/emv/emvjson.c b/client/emv/emvjson.c
index 45eb1f430..fc10f255c 100644
--- a/client/emv/emvjson.c
+++ b/client/emv/emvjson.c
@@ -242,20 +242,20 @@ int JsonSaveTLVTree(json_t *root, json_t *elm, char *path, struct tlvdb *tlvdbel
 bool HexToBuffer(const char *errormsg, const char *hexvalue, uint8_t * buffer, size_t maxbufferlen, size_t *bufferlen) {
 	int buflen = 0;	
 	
-	switch(param_gethex_to_eol(hexvalue, 0, buffer, maxbufferlen, &buflen)) {
-	case 1:
-		PrintAndLog("%s Invalid HEX value.", errormsg);
-		return false;
-	case 2:
-		PrintAndLog("%s Hex value too large.", errormsg);
-		return false;
-	case 3:
-		PrintAndLog("%s Hex value must have even number of digits.", errormsg);
-		return false;
+	switch (param_gethex_to_eol(hexvalue, 0, buffer, maxbufferlen, &buflen)) {
+		case 1:
+			PrintAndLog("%s Invalid HEX value.", errormsg);
+			return false;
+		case 2:
+			PrintAndLog("%s Hex value too large.", errormsg);
+			return false;
+		case 3:
+			PrintAndLog("%s Hex value must have even number of digits.", errormsg);
+			return false;
 	}
 	
 	if (buflen > maxbufferlen) {
-		PrintAndLog("%s HEX length (%d) more than %d", errormsg, *bufferlen, maxbufferlen);
+		PrintAndLog("%s HEX length (%d) more than %d", errormsg, (bufferlen) ? *bufferlen : -1, maxbufferlen);
 		return false;
 	}
 	

From a0e061fcd10bd3a7e2d11da32ab2efc127d44b9b Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Feb 2019 20:11:05 +0100
Subject: [PATCH 0602/1938] fix: rearrange it

---
 client/cmdlf.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/client/cmdlf.c b/client/cmdlf.c
index f644fcc84..240a1d402 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -186,15 +186,18 @@ int CmdLFCommandRead(const char *Cmd) {
 }
 
 int CmdFlexdemod(const char *Cmd) {
-#define LONG_WAIT 100	
+
+	if ( GraphTraceLen < 0 )
+		return 0;
+
+#ifndef LONG_WAIT
+#define LONG_WAIT 100
+#endif
 	int i, j, start, bit, sum, phase = 0;
 
 	int data[GraphTraceLen];
 	memcpy(data, GraphBuffer, GraphTraceLen);
 	
-	if ( GraphTraceLen < 0 )
-		return 0;
-	
 	size_t size = GraphTraceLen;
 	
 	for (i = 0; i < GraphTraceLen; ++i)

From 528e8fe3956b5f9863b2468b3ed9bbda37e7897b Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Feb 2019 21:21:56 +0100
Subject: [PATCH 0603/1938] fix: clock can't be zero or negative

---
 client/graph.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/client/graph.c b/client/graph.c
index 4346a8040..2b2884819 100644
--- a/client/graph.c
+++ b/client/graph.c
@@ -115,10 +115,13 @@ int GetAskClock(const char *str, bool printAns) {
 	if (st == false) {
 		idx = DetectASKClock(bits, size, &clock, 20);
 	}
-	setClockGrid(clock, idx);
+	
+	if ( clock > 0 ) {
+		setClockGrid(clock, idx);
+	}
 	// Only print this message if we're not looping something
 	if (printAns || g_debugMode)
-		PrintAndLogEx(NORMAL, "Auto-detected clock rate: %d, Best Starting Position: %d", clock, idx);
+		PrintAndLogEx(DEBUG, "Auto-detected clock rate: %d, Best Starting Position: %d", clock, idx);
 
 	return clock;
 }

From f59e67c00cc8565b77844463b694728f32ef7e1f Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Feb 2019 21:42:30 +0100
Subject: [PATCH 0604/1938] fix: possible overrun

---
 client/crypto/asn1dump.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/client/crypto/asn1dump.c b/client/crypto/asn1dump.c
index 52814f22b..a0abdf3cf 100644
--- a/client/crypto/asn1dump.c
+++ b/client/crypto/asn1dump.c
@@ -237,10 +237,13 @@ static char *asn1_oid_description(const char *oid, bool with_group_desc) {
 	static char res[300];
 	memset(res, 0x00, sizeof(res));
 
-	strcpy(fname, get_my_executable_directory());
+	size_t len = strlen(get_my_executable_directory());
+	if ( len > 300 ) len = 299;
+	
+	strncpy(fname, get_my_executable_directory(), len);
 	strcat(fname, "crypto/oids.json");
 	if (access(fname, F_OK) < 0) {
-		strcpy(fname, get_my_executable_directory());
+		strncpy(fname, get_my_executable_directory(), len);
 		strcat(fname, "oids.json");
 		if (access(fname, F_OK) < 0) {
 			goto error; // file not found

From 99dc51e005b3349a15dc0982619f1616ac943d28 Mon Sep 17 00:00:00 2001
From: vratiskol <vratiskol@users.noreply.github.com>
Date: Fri, 22 Feb 2019 13:21:58 +0100
Subject: [PATCH 0605/1938] Mem Leak

---
 armsrc/appmain.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 0bf9ccb9d..5002a7138 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1253,11 +1253,11 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 			
 			size_t size = MIN(USB_CMD_DATA_SIZE, len);
 			
-			uint8_t *mem = BigBuf_malloc(size);
-	
-  			if (!FlashInit()) {
+			if (!FlashInit()) {
    		       break;
   		    }
+
+			uint8_t *mem = BigBuf_malloc(size);
 			
 			for(size_t i = 0; i < len; i += size) {
 				len = MIN((len - i), size);
@@ -1271,6 +1271,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 					break;
 				}
 			}
+			BigBuf_free();
 			FlashStop();
 			LED_B_OFF();
 			break;

From 898f2bea5b269c9b9d67f20ed5ff1d9c7da9de8c Mon Sep 17 00:00:00 2001
From: vratiskol <vincent.ratiskol@github.com>
Date: Fri, 22 Feb 2019 20:22:12 +0100
Subject: [PATCH 0606/1938] Crapto Clean Up

Clean up comment code
---
 common/crapto1/crapto1.c | 41 +++++++---------------------------------
 common/crapto1/crypto1.c | 19 ++-----------------
 2 files changed, 9 insertions(+), 51 deletions(-)

diff --git a/common/crapto1/crapto1.c b/common/crapto1/crapto1.c
index af1ed8167..f0b37dbae 100644
--- a/common/crapto1/crapto1.c
+++ b/common/crapto1/crapto1.c
@@ -33,21 +33,6 @@ static void __attribute__((constructor)) fill_lut()
 #define filter(x) (filterlut[(x) & 0xfffff])
 #endif
 
-/** binsearch
- * Binary search for the first occurence of *stop's MSB in sorted [start,stop]
- */
-/* static inline uint32_t* binsearch(uint32_t *start, uint32_t *stop)
-{
-	uint32_t mid, val = *stop & 0xff000000;
-	while(start != stop)
-		if(start[mid = (stop - start) >> 1] > val)
-			stop = &start[mid];
-		else
-			start += mid + 1;
-
-	return start;
-}
- */
 /** update_contribution
  * helper, calculates the partial linear feedback contributions and puts in MSB
  */
@@ -174,7 +159,7 @@ struct Crypto1State* lfsr_recovery32(uint32_t ks2, uint32_t in)
 
 	// allocate memory for out of place bucket_sort
 	bucket_array_t bucket;
-	
+
 	for (uint32_t i = 0; i < 2; i++) {
 		for (uint32_t j = 0; j <= 0xff; j++) {
 			bucket[i][j].head = malloc(sizeof(uint32_t) << 14);
@@ -311,7 +296,7 @@ uint8_t lfsr_rollback_bit(struct Crypto1State *s, uint32_t in, int fb)
 	int out;
 	uint8_t ret;
 	uint32_t t;
-	
+
 	s->odd &= 0xffffff;
 	t = s->odd, s->odd = s->even, s->even = t;
 
@@ -329,12 +314,6 @@ uint8_t lfsr_rollback_bit(struct Crypto1State *s, uint32_t in, int fb)
  */
 uint8_t lfsr_rollback_byte(struct Crypto1State *s, uint32_t in, int fb)
 {
-	/*
-	int i, ret=0;
-	for (i = 7; i >= 0; --i)
-		ret |= lfsr_rollback_bit(s, BIT(in, i), fb) << i;
-*/
-// unfold loop 20160112
 	uint8_t ret = 0;
 	ret |= lfsr_rollback_bit(s, BIT(in, 7), fb) << 7;
 	ret |= lfsr_rollback_bit(s, BIT(in, 6), fb) << 6;
@@ -351,13 +330,7 @@ uint8_t lfsr_rollback_byte(struct Crypto1State *s, uint32_t in, int fb)
  */
 uint32_t lfsr_rollback_word(struct Crypto1State *s, uint32_t in, int fb)
 {
-	/*
-	int i;
-	uint32_t ret = 0;
-	for (i = 31; i >= 0; --i)
-		ret |= lfsr_rollback_bit(s, BEBIT(in, i), fb) << (i ^ 24);
-*/
-// unfold loop 20160112
+
 	uint32_t ret = 0;
 	ret |= lfsr_rollback_bit(s, BEBIT(in, 31), fb) << (31 ^ 24);
 	ret |= lfsr_rollback_bit(s, BEBIT(in, 30), fb) << (30 ^ 24);
@@ -376,7 +349,7 @@ uint32_t lfsr_rollback_word(struct Crypto1State *s, uint32_t in, int fb)
 	ret |= lfsr_rollback_bit(s, BEBIT(in, 18), fb) << (18 ^ 24);
 	ret |= lfsr_rollback_bit(s, BEBIT(in, 17), fb) << (17 ^ 24);
 	ret |= lfsr_rollback_bit(s, BEBIT(in, 16), fb) << (16 ^ 24);
-	
+
 	ret |= lfsr_rollback_bit(s, BEBIT(in, 15), fb) << (15 ^ 24);
 	ret |= lfsr_rollback_bit(s, BEBIT(in, 14), fb) << (14 ^ 24);
 	ret |= lfsr_rollback_bit(s, BEBIT(in, 13), fb) << (13 ^ 24);
@@ -385,7 +358,7 @@ uint32_t lfsr_rollback_word(struct Crypto1State *s, uint32_t in, int fb)
 	ret |= lfsr_rollback_bit(s, BEBIT(in, 10), fb) << (10 ^ 24);
 	ret |= lfsr_rollback_bit(s, BEBIT(in, 9), fb) << (9 ^ 24);
 	ret |= lfsr_rollback_bit(s, BEBIT(in, 8), fb) << (8 ^ 24);
-	
+
 	ret |= lfsr_rollback_bit(s, BEBIT(in, 7), fb) << (7 ^ 24);
 	ret |= lfsr_rollback_bit(s, BEBIT(in, 6), fb) << (6 ^ 24);
 	ret |= lfsr_rollback_bit(s, BEBIT(in, 5), fb) << (5 ^ 24);
@@ -445,7 +418,7 @@ uint32_t *lfsr_prefix_ks(uint8_t ks[8], int isodd)
 {
 	uint32_t *candidates = calloc(4 << 10, sizeof(uint8_t));
 	if (!candidates) return 0;
-	
+
 	uint32_t c,  entry;
 	int size = 0, i, good;
 
@@ -458,7 +431,7 @@ uint32_t *lfsr_prefix_ks(uint8_t ks[8], int isodd)
 		if (good)
 			candidates[size++] = i;
 	}
-	
+
 	candidates[size] = -1;
 
 	return candidates;
diff --git a/common/crapto1/crypto1.c b/common/crapto1/crypto1.c
index bc0e7337a..034d92215 100644
--- a/common/crapto1/crypto1.c
+++ b/common/crapto1/crypto1.c
@@ -48,9 +48,8 @@ struct Crypto1State * crypto1_create(uint64_t key)
 	if ( !s ) return NULL;
 
 	s->odd = s->even = 0;
-	
+
 	int i;
-	//for(i = 47;s && i > 0; i -= 2) {
 	for(i = 47; i > 0; i -= 2) {
 		s->odd  = s->odd  << 1 | BIT(key, (i - 1) ^ 7);
 		s->even = s->even << 1 | BIT(key, i ^ 7);
@@ -89,13 +88,6 @@ uint8_t crypto1_bit(struct Crypto1State *s, uint8_t in, int is_encrypted)
 }
 uint8_t crypto1_byte(struct Crypto1State *s, uint8_t in, int is_encrypted)
 {
-	/*
-	uint8_t i, ret = 0;
-
-	for (i = 0; i < 8; ++i)
-		ret |= crypto1_bit(s, BIT(in, i), is_encrypted) << i;
-	*/
-// unfold loop 20161012
 	uint8_t ret = 0;
 	ret |= crypto1_bit(s, BIT(in, 0), is_encrypted) << 0;
 	ret |= crypto1_bit(s, BIT(in, 1), is_encrypted) << 1;
@@ -109,13 +101,6 @@ uint8_t crypto1_byte(struct Crypto1State *s, uint8_t in, int is_encrypted)
 }
 uint32_t crypto1_word(struct Crypto1State *s, uint32_t in, int is_encrypted)
 {
-	/*
-	uint32_t i, ret = 0;
-
-	for (i = 0; i < 32; ++i)
-		ret |= crypto1_bit(s, BEBIT(in, i), is_encrypted) << (i ^ 24);
-*/
-//unfold loop 2016012
 	uint32_t ret = 0;
 	ret |= crypto1_bit(s, BEBIT(in, 0), is_encrypted) << (0 ^ 24);
 	ret |= crypto1_bit(s, BEBIT(in, 1), is_encrypted) << (1 ^ 24);
@@ -125,7 +110,7 @@ uint32_t crypto1_word(struct Crypto1State *s, uint32_t in, int is_encrypted)
 	ret |= crypto1_bit(s, BEBIT(in, 5), is_encrypted) << (5 ^ 24);
 	ret |= crypto1_bit(s, BEBIT(in, 6), is_encrypted) << (6 ^ 24);
 	ret |= crypto1_bit(s, BEBIT(in, 7), is_encrypted) << (7 ^ 24);
-	
+
 	ret |= crypto1_bit(s, BEBIT(in, 8), is_encrypted) << (8 ^ 24);
 	ret |= crypto1_bit(s, BEBIT(in, 9), is_encrypted) << (9 ^ 24);
 	ret |= crypto1_bit(s, BEBIT(in, 10), is_encrypted) << (10 ^ 24);

From 157e08f51d7980ba208586398ae849aef036a81c Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Feb 2019 22:17:36 +0100
Subject: [PATCH 0607/1938] fix: mem leaks

---
 client/emv/cmdemv.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index 94df507de..52033afb4 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -266,9 +266,11 @@ int CmdEMVGPO(const char *cmd) {
 			ParamLoadFromJson(tlvRoot);
 		};
 		
-		pdol_data_tlv = dol_process((const struct tlv *)tlvdb_external(0x9f38, datalen, data), tlvRoot, 0x83);
+		struct tlvdb *tmp_ext = tlvdb_external(0x9f38, datalen, data);
+		pdol_data_tlv = dol_process((const struct tlv *)tmp_ext, tlvRoot, 0x83);
 		if (!pdol_data_tlv){
 			PrintAndLogEx(ERR, "Can't create PDOL TLV.");
+			tlvdb_free(tmp_ext);
 			tlvdb_free(tlvRoot);
 			return 4;
 		}
@@ -446,9 +448,11 @@ int CmdEMVAC(const char *cmd) {
 			ParamLoadFromJson(tlvRoot);
 		};
 		
-		cdol_data_tlv = dol_process((const struct tlv *)tlvdb_external(0x8c, datalen, data), tlvRoot, 0x01); // 0x01 - dummy tag
+		struct tlvdb *tmp_ext = tlvdb_external(0x8c, datalen, data);
+		cdol_data_tlv = dol_process((const struct tlv *)tmp_ext, tlvRoot, 0x01); // 0x01 - dummy tag
 		if (!cdol_data_tlv){
 			PrintAndLogEx(ERR, "Can't create CDOL TLV.");
+			tlvdb_free(tmp_ext);
 			tlvdb_free(tlvRoot);
 			return 4;
 		}
@@ -588,9 +592,11 @@ int CmdEMVInternalAuthenticate(const char *cmd) {
 			ParamLoadFromJson(tlvRoot);
 		};
 		
-		ddol_data_tlv = dol_process((const struct tlv *)tlvdb_external(0x9f49, datalen, data), tlvRoot, 0x01); // 0x01 - dummy tag
+		struct tlvdb *tmp_ext = tlvdb_external(0x9f49, datalen, data);
+		ddol_data_tlv = dol_process((const struct tlv *)tmp_ext, tlvRoot, 0x01); // 0x01 - dummy tag
 		if (!ddol_data_tlv){
 			PrintAndLogEx(ERR, "Can't create DDOL TLV.");
+			tlvdb_free(tmp_ext);
 			tlvdb_free(tlvRoot);
 			return 4;
 		}

From da9c662b23c1da3bf4c9900ece9e2c641988af34 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Feb 2019 22:31:24 +0100
Subject: [PATCH 0608/1938] text

---
 client/cmdlffdx.c | 50 +++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 26 deletions(-)

diff --git a/client/cmdlffdx.c b/client/cmdlffdx.c
index 194bb7f32..647dfe04e 100644
--- a/client/cmdlffdx.c
+++ b/client/cmdlffdx.c
@@ -159,26 +159,24 @@ int getFDXBits(uint64_t national_id, uint16_t country, uint8_t isanimal, uint8_t
 */
 int CmdFDXBdemodBI(const char *Cmd){
 
-	int invert = 1;
-	int clk = 32;		
-	int errCnt = 0;
-	int offset = 0, maxErr = 0;
-	uint8_t BitStream[MAX_DEMOD_BUF_LEN];	
-	size_t size = getFromGraphBuf(BitStream);	
+	int clk = 32;
+	int invert = 1, errCnt = 0, offset = 0, maxErr = 0;
+	uint8_t bs[MAX_DEMOD_BUF_LEN];	
+	size_t size = getFromGraphBuf(bs);	
 	
-	errCnt = askdemod(BitStream, &size, &clk, &invert, maxErr, 0, 0);
+	errCnt = askdemod(bs, &size, &clk, &invert, maxErr, 0, 0);
 	if ( errCnt < 0 || errCnt > maxErr ) { 
 		PrintAndLogEx(DEBUG, "DEBUG: Error - FDXB no data or error found %d, clock: %d", errCnt, clk);
 		return 0;
 	}
 
-	errCnt = BiphaseRawDecode(BitStream, &size, &offset, 1);
+	errCnt = BiphaseRawDecode(bs, &size, &offset, 1);
 	if (errCnt < 0 || errCnt > maxErr ) {
 		PrintAndLogEx(DEBUG, "DEBUG: Error - FDXB BiphaseRawDecode: %d", errCnt);
 		return 0;
 	} 
 	
-	int preambleIndex = detectFDXB(BitStream, &size);
+	int preambleIndex = detectFDXB(bs, &size);
 	if (preambleIndex < 0){
 		PrintAndLogEx(DEBUG, "DEBUG: Error - FDXB preamble not found :: %d",preambleIndex);
 		return 0;
@@ -188,10 +186,10 @@ int CmdFDXBdemodBI(const char *Cmd){
 		return 0;
 	}
 	
-	setDemodBuf(BitStream, 128, preambleIndex);
+	setDemodBuf(bs, 128, preambleIndex);
 
 	// remove marker bits (1's every 9th digit after preamble) (pType = 2)
-	size = removeParity(BitStream, preambleIndex + 11, 9, 2, 117);
+	size = removeParity(bs, preambleIndex + 11, 9, 2, 117);
 	if ( size != 104 ) {
 		PrintAndLogEx(DEBUG, "DEBUG: Error - FDXB error removeParity:: %d", size);
 		return 0;
@@ -199,15 +197,15 @@ int CmdFDXBdemodBI(const char *Cmd){
 	PrintAndLogEx(SUCCESS, "\nFDX-B / ISO 11784/5 Animal Tag ID Found:");
 
 	//got a good demod
-	uint64_t NationalCode = ((uint64_t)(bytebits_to_byteLSBF(BitStream+32,6)) << 32) | bytebits_to_byteLSBF(BitStream,32);
-	uint32_t countryCode = bytebits_to_byteLSBF(BitStream+38,10);
-	uint8_t dataBlockBit = BitStream[48];
-	uint32_t reservedCode = bytebits_to_byteLSBF(BitStream+49,14);
-	uint8_t animalBit = BitStream[63];
-	uint32_t crc16 = bytebits_to_byteLSBF(BitStream+64,16);
-	uint32_t extended = bytebits_to_byteLSBF(BitStream+80,24);
+	uint64_t NationalCode = ((uint64_t)(bytebits_to_byteLSBF(bs+32, 6)) << 32) | bytebits_to_byteLSBF(bs, 32);
+	uint32_t countryCode = bytebits_to_byteLSBF(bs+38, 10);
+	uint8_t dataBlockBit = bs[48];
+	uint32_t reservedCode = bytebits_to_byteLSBF(bs+49, 14);
+	uint8_t animalBit = bs[63];
+	uint32_t crc16 = bytebits_to_byteLSBF(bs+64, 16);
+	uint32_t extended = bytebits_to_byteLSBF(bs+80, 24);
 
-	uint64_t rawid = ((uint64_t)bytebits_to_byte(BitStream,32)<<32) | bytebits_to_byte(BitStream+32,32);
+	uint64_t rawid = ((uint64_t)bytebits_to_byte(bs, 32) << 32) | bytebits_to_byte(bs+32, 32);
 	uint8_t raw[8];
 	num_to_bytes(rawid, 8, raw);
 
@@ -219,13 +217,13 @@ int CmdFDXBdemodBI(const char *Cmd){
 	PrintAndLogEx(SUCCESS, "CountryCode:   %04u", countryCode);
 
 	PrintAndLogEx(SUCCESS, "Reserved/RFU:      %u", reservedCode);
-	PrintAndLogEx(SUCCESS, "Animal Tag:        %s", animalBit ? "True" : "False");
-	PrintAndLogEx(SUCCESS, "Has extended data: %s [0x%X]", dataBlockBit ? "True" : "False", extended);
-	PrintAndLogEx(SUCCESS, "CRC:           0x%04X - [%04X] - %s", crc16, calcCrc, (calcCrc == crc16) ? "Passed" : "Failed");
+	PrintAndLogEx(SUCCESS, "Animal Tag:        %s", animalBit ? _YELLOW_(True) : "False");
+	PrintAndLogEx(SUCCESS, "Has extended data: %s [0x%X]", dataBlockBit ? _YELLOW_(True) : "False", extended);
+	PrintAndLogEx(SUCCESS, "CRC:           0x%04X - [%04X] - %s", crc16, calcCrc, (calcCrc == crc16) ? _GREEN_(Passed) : "Failed");
 
 	if (g_debugMode) {
 		PrintAndLogEx(DEBUG, "Start marker %d;   Size %d", preambleIndex, size);
-		char *bin = sprint_bin_break(BitStream,size,16);
+		char *bin = sprint_bin_break(bs, size, 16);
 		PrintAndLogEx(DEBUG, "DEBUG BinStream:\n%s",bin);
 	}
 	return 1;
@@ -287,9 +285,9 @@ int CmdFdxDemod(const char *Cmd) {
 	PrintAndLogEx(SUCCESS, "National Code      %012" PRIu64 " (0x%" PRIx64 ")", NationalCode, NationalCode);
 	PrintAndLogEx(SUCCESS, "Country Code       %04u", countryCode);
 	PrintAndLogEx(SUCCESS, "Reserved/RFU       %u (0x04%X)", reservedCode,  reservedCode);
-	PrintAndLogEx(SUCCESS, "Animal Tag         %s", animalBit ? "True" : "False");	
-	PrintAndLogEx(SUCCESS, "Has extended data  %s [0x%X]", dataBlockBit ? "True" : "False", extended);	
-	PrintAndLogEx(SUCCESS, "CRC-16             0x%04X - 0x%04X [%s]", crc16, calcCrc, (calcCrc == crc16) ? "Ok" : "Failed");
+	PrintAndLogEx(SUCCESS, "Animal Tag         %s", animalBit ? _YELLOW_(True) : "False");	
+	PrintAndLogEx(SUCCESS, "Has extended data  %s [0x%X]", dataBlockBit ? _YELLOW_(True) : "False", extended);	
+	PrintAndLogEx(SUCCESS, "CRC-16             0x%04X - 0x%04X [%s]", crc16, calcCrc, (calcCrc == crc16) ? _GREEN_(Ok) : _RED_(Failed);
 
 	if (g_debugMode) {
 		PrintAndLogEx(DEBUG, "Start marker %d;   Size %d", preambleIndex, size);	

From 34a17f842dd90a3726f953ecde95d63c2066f714 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Feb 2019 22:34:14 +0100
Subject: [PATCH 0609/1938] fix

---
 client/cmdlffdx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdlffdx.c b/client/cmdlffdx.c
index 647dfe04e..4f867b038 100644
--- a/client/cmdlffdx.c
+++ b/client/cmdlffdx.c
@@ -287,7 +287,7 @@ int CmdFdxDemod(const char *Cmd) {
 	PrintAndLogEx(SUCCESS, "Reserved/RFU       %u (0x04%X)", reservedCode,  reservedCode);
 	PrintAndLogEx(SUCCESS, "Animal Tag         %s", animalBit ? _YELLOW_(True) : "False");	
 	PrintAndLogEx(SUCCESS, "Has extended data  %s [0x%X]", dataBlockBit ? _YELLOW_(True) : "False", extended);	
-	PrintAndLogEx(SUCCESS, "CRC-16             0x%04X - 0x%04X [%s]", crc16, calcCrc, (calcCrc == crc16) ? _GREEN_(Ok) : _RED_(Failed);
+	PrintAndLogEx(SUCCESS, "CRC-16             0x%04X - 0x%04X [%s]", crc16, calcCrc, (calcCrc == crc16) ? _GREEN_(Ok) : "Failed");
 
 	if (g_debugMode) {
 		PrintAndLogEx(DEBUG, "Start marker %d;   Size %d", preambleIndex, size);	

From 2e3694aa3b44cbc311159730a52b7793b684faf8 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Feb 2019 23:40:11 +0100
Subject: [PATCH 0610/1938] fix: 'trace list' - missing break

---
 client/cmdtrace.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/cmdtrace.c b/client/cmdtrace.c
index 56f97ca1d..cf55970b0 100644
--- a/client/cmdtrace.c
+++ b/client/cmdtrace.c
@@ -165,7 +165,8 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
 				crcStatus = iso14443B_CRC_check(frame, data_len);
 				break;
 			case PROTO_MIFARE:
-				crcStatus = mifare_CRC_check(isResponse, frame, data_len);		
+				crcStatus = mifare_CRC_check(isResponse, frame, data_len);	
+				break;				
 			case ISO_14443A:
 			case MFDES:
 				crcStatus = iso14443A_CRC_check(isResponse, frame, data_len);
@@ -288,6 +289,7 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
 
 void printFelica(uint16_t traceLen, uint8_t *trace) {
 
+	PrintAndLogEx(NORMAL, "ISO18092 / FeliCa - Timings are not as accurate");
 	PrintAndLogEx(NORMAL, "    Gap | Src | Data                            | CRC      | Annotation        |");
 	PrintAndLogEx(NORMAL, "--------|-----|---------------------------------|----------|-------------------|");
     uint16_t tracepos = 0;
@@ -511,8 +513,8 @@ int CmdTraceList(const char *Cmd) {
 		}		
 	}
 
-	PrintAndLogEx(NORMAL, "Recorded Activity (TraceLen = %d bytes)", traceLen);
-	PrintAndLogEx(NORMAL, "");
+	PrintAndLogEx(SUCCESS, "Recorded Activity (TraceLen = %d bytes)", traceLen);
+	PrintAndLogEx(INFO, "");
 	if (protocol == FELICA) {
 		printFelica(traceLen, trace);
 	} else { 
@@ -526,8 +528,6 @@ int CmdTraceList(const char *Cmd) {
 			                      "        Tag Mode: Timings are in sub carrier periods (1/212 kHz == 4.7us)");
 		if ( protocol == ISO_15693 )
 			PrintAndLogEx(NORMAL, "ISO15693 - Timings are not as accurate");
-		if ( protocol == FELICA )
-			PrintAndLogEx(NORMAL, "ISO18092 / FeliCa - Timings are not as accurate");
 		if ( protocol == ISO_7816_4 )
 			PrintAndLogEx(NORMAL, "ISO7816-4 / Smartcard - Timings N/A yet");
 		

From 3d84e4dc03f96e477bed27b996b502e097eaebd2 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Feb 2019 23:43:35 +0100
Subject: [PATCH 0611/1938] fix: dead code

---
 client/cmdlft55xx.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 8d850f5d0..3c7547e34 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1701,7 +1701,7 @@ int CmdT55xxBruteForce(const char *Cmd) {
 	
     PrintAndLogEx(INFO, "Search password range [%08X -> %08X]", start_password, end_password);
 
-    while ((!found) || (curr <= end_password)){
+    while ( !found || (curr <= end_password)){
 
 		printf("."); fflush(stdout);
 		
@@ -1713,9 +1713,9 @@ int CmdT55xxBruteForce(const char *Cmd) {
 			PrintAndLogEx(WARNING, "Aquireing data from device failed. Quitting");
 			return 0;
 		}
+		
 		found = tryDetectModulation();
-        
-		if (found) break;
+
 		++curr;
     }
     

From 0803e532ccdaba7c7b2f89abe62f0072cb1abe7e Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Feb 2019 23:51:23 +0100
Subject: [PATCH 0612/1938] fix: 'hf felica list' - string overflows

---
 client/cmdhffelica.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/cmdhffelica.c b/client/cmdhffelica.c
index acfc68cf2..42c56d900 100644
--- a/client/cmdhffelica.c
+++ b/client/cmdhffelica.c
@@ -253,7 +253,7 @@ uint16_t PrintFliteBlock(uint16_t tracepos, uint8_t *trace, uint16_t tracelen) {
 
 	char line[110] = {0};
 	for (int j = 0; j < 16; j++) {
-		snprintf(line+( j  * 4),110, "%02x  ", trace[j+3]);
+		snprintf(line + (j * 4), sizeof(line) - 1 - (j*4) , "%02x  ", trace[j+3]);
 	}
 
 	PrintAndLogEx(NORMAL, "block number %02x, status: %02x %02x",blocknum,status1, status2);
@@ -277,7 +277,7 @@ uint16_t PrintFliteBlock(uint16_t tracepos, uint8_t *trace, uint16_t tracelen) {
 			uint32_t regB = trace[7] | trace[8] << 8 | trace[9] << 16 | trace[10] << 24;
 			line[0] = 0;
 			for (int j = 0; j < 8; j++) 
-				snprintf(line+( j  * 2),110, "%02x", trace[j+11]);
+				snprintf(line+( j  * 2), sizeof(line)-1-(j*2), "%02x", trace[j+11]);
 			PrintAndLogEx(NORMAL,  "REG: regA: %d regB: %d regC: %s ", regA, regB, line);
 			}
 		break;
@@ -287,10 +287,10 @@ uint16_t PrintFliteBlock(uint16_t tracepos, uint8_t *trace, uint16_t tracelen) {
 			char idd[20];
 			char idm[20];
 			for (int j = 0; j < 8; j++) 
-				snprintf(idd+( j  * 2),20, "%02x", trace[j+3]);
+				snprintf(idd + (j * 2), sizeof(idd) - 1 - (j*2), "%02x", trace[j+3]);
 			
 			for (int j = 0; j < 6; j++) 
-				snprintf(idm+( j  * 2),20, "%02x", trace[j+13]);
+				snprintf(idm + (j * 2), sizeof(idm) - 1 - (j*2), "%02x", trace[j+13]);
 				
 			PrintAndLogEx(NORMAL,  "ID Block, IDd: 0x%s DFC: 0x%02x%02x Arb: %s ", idd, trace[11], trace [12], idm);
 			}

From 142b3d8de52f8c7b38c27d62edfdc22c93c129d5 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Feb 2019 23:54:24 +0100
Subject: [PATCH 0613/1938] fix: assign

---
 client/loclass/ikeys.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/client/loclass/ikeys.c b/client/loclass/ikeys.c
index 16b5513b7..c1265dc4d 100644
--- a/client/loclass/ikeys.c
+++ b/client/loclass/ikeys.c
@@ -428,8 +428,8 @@ void testPermute()
 	printarr("permuted", res, 8);
 }
 
-//These testcases are
-//{ UID , TEMP_KEY, DIV_KEY} using the specific key
+// These testcases are
+// { UID , TEMP_KEY, DIV_KEY} using the specific key
 typedef struct
 {
 	uint8_t uid[8];
@@ -475,7 +475,7 @@ int testDES(Testcase testcase, mbedtls_des_context ctx_enc, mbedtls_des_context
 	return retval;
 }
 bool des_getParityBitFromKey(uint8_t key)
-{//The top 7 bits is used
+{ // The top 7 bits is used
 	bool parity = ((key & 0x80) >> 7)
 			^ ((key & 0x40) >> 6) ^ ((key & 0x20) >> 5)
 			^ ((key & 0x10) >> 4) ^ ((key & 0x08) >> 3)
@@ -676,7 +676,8 @@ static bool readKeyFile(uint8_t key[8]) {
 	bool retval = false;
 	
 	//Test a few variants
-	char filename[30];
+	char filename[30] = {0};
+	
 	if (fileExists("iclass_key.bin")){
 		sprintf(filename, "%s.bin", "iclass_key");
 	} else if (fileExists("loclass/iclass_key.bin")){

From 2b9eb401facee8839344c960f2930160779ec806 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Feb 2019 23:54:36 +0100
Subject: [PATCH 0614/1938] fix: more checks

---
 client/loclass/fileutils.c | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index 6ce7c42ea..6f6f1a5a4 100644
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -323,6 +323,7 @@ int loadFileEML(const char *preferredName, const char *suffix, void* data, size_
 
 	if ( preferredName == NULL ) return 1;
 	if ( suffix == NULL ) return 1;
+	if ( data == NULL ) return 1;
 
     size_t counter = 0;
 	int retval = 0, hexlen = 0;
@@ -364,7 +365,9 @@ int loadFileEML(const char *preferredName, const char *suffix, void* data, size_
 	}
 	fclose(f);
 	PrintAndLogDevice(SUCCESS, "loaded %d bytes from text file " _YELLOW_(%s), counter, fileName);
-	*datalen = counter;
+	
+	if ( datalen )
+		*datalen = counter;
 		
 out:	
 	free(fileName);
@@ -372,12 +375,14 @@ out:
 }
 
 int loadFileJSON(const char *preferredName, const char *suffix, void* data, size_t maxdatalen, size_t* datalen) {
-	*datalen = 0;
-	json_t *root;
-	json_error_t error;
 
 	if ( preferredName == NULL ) return 1;
 	if ( suffix == NULL ) return 1;
+	if ( data == NULL ) return 1;
+	
+	*datalen = 0;
+	json_t *root;
+	json_error_t error;
 
 	int retval = 0;
 	int size = sizeof(char) * (strlen(preferredName) + strlen(suffix) + 10);
@@ -461,6 +466,7 @@ int loadFileDICTIONARY(const char *preferredName, const char *suffix, void* data
 
 	if ( preferredName == NULL ) return 1;
 	if ( suffix == NULL ) return 1;
+	if ( data == NULL ) return 1;
 
 	// t5577 == 4bytes
 	// mifare == 6 bytes
@@ -516,8 +522,10 @@ int loadFileDICTIONARY(const char *preferredName, const char *suffix, void* data
 		counter += (keylen >> 1);
 	}
 	fclose(f);
-	PrintAndLogDevice(SUCCESS, "loaded " _GREEN_(%2d) "keys from dictionary file " _YELLOW_(%s), *keycnt, fileName);	
-	*datalen = counter;	
+	PrintAndLogDevice(SUCCESS, "loaded " _GREEN_(%2d) "keys from dictionary file " _YELLOW_(%s), *keycnt, fileName);
+	
+	if ( datalen ) 
+		*datalen = counter;	
 out:	
 	free(fileName);
 	return retval;	

From bd26794c208e3504a2e7e92959b5751a0fd86081 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Feb 2019 23:57:04 +0100
Subject: [PATCH 0615/1938] revert

---
 client/cmdflashmem.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdflashmem.c b/client/cmdflashmem.c
index d3aaff19e..34bb89cbc 100644
--- a/client/cmdflashmem.c
+++ b/client/cmdflashmem.c
@@ -13,6 +13,7 @@
 
 #include "mbedtls/rsa.h"
 #include "mbedtls/sha1.h"
+#include "mbedtls/base64.h"
 
 #define MCK 48000000
 //#define FLASH_BAUD 24000000
@@ -247,7 +248,6 @@ int CmdFlashMemLoad(const char *Cmd){
 			res = loadFile(filename, "bin", data, &datalen);
 			//int res = loadFileEML( filename, "eml", data, &datalen);
 			if ( res ) {
-				free(data);
 				return 1;
 			}
 			

From ae4e3b72afe9b58c398fd5349d4c04cb7429b774 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 25 Feb 2019 00:10:02 +0100
Subject: [PATCH 0616/1938] chg: colors

---
 client/cmdhf14a.c  | 6 +++---
 client/cmdhflist.c | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 9140a3502..27f670fac 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -579,11 +579,11 @@ int CmdHF14AInfo(const char *Cmd) {
 	if (isMifareClassic) {
 		int res = detect_classic_prng();
 		if ( res == 1 )
-			PrintAndLogEx(SUCCESS, "Prng detection: WEAK");
+			PrintAndLogEx(SUCCESS, "Prng detection: " _GREEN_(WEAK));
 		else if (res == 0 )
-			PrintAndLogEx(SUCCESS, "Prng detection: HARD");
+			PrintAndLogEx(SUCCESS, "Prng detection: " _YELLOW_(HARD));
 		else
-			PrintAndLogEx(FAILED, "prng detection: failed");
+			PrintAndLogEx(FAILED, "prng detection:  " _RED_(failed));
 		
 		if ( do_nack_test )
 			detect_classic_nackbug(silent);
diff --git a/client/cmdhflist.c b/client/cmdhflist.c
index b2e0eeecc..faed275cd 100644
--- a/client/cmdhflist.c
+++ b/client/cmdhflist.c
@@ -686,7 +686,7 @@ bool DecodeMifareData(uint8_t *cmd, uint8_t cmdsize, uint8_t *parity, bool isRes
 			PrintAndLogEx(NORMAL, "            |            |  *  |%49s %012"PRIx64" prng %s |     |", 
 				"key", 
 				mfLastKey,
-				validate_prng_nonce(AuthData.nt) ? "WEAK": "HARD");
+				validate_prng_nonce(AuthData.nt) ? _GREEN_(WEAK): _YELLOW_(HARD));
 			
 			AuthData.first_auth = false;
 

From 7945b5a805bcb5deeb4285046fd631a0d6722b41 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 25 Feb 2019 00:15:39 +0100
Subject: [PATCH 0617/1938] colors

---
 client/mifarehost.c | 12 ++++++------
 common/lfdemod.c    |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/client/mifarehost.c b/client/mifarehost.c
index 927fb7bc0..632ff7c71 100644
--- a/client/mifarehost.c
+++ b/client/mifarehost.c
@@ -959,8 +959,8 @@ int detect_classic_nackbug(bool verbose){
 							}
 							return 2;
 						}				
-				case  2 : PrintAndLogEx(SUCCESS, "always leak NACK detected"); return 3;
-				case  1 : PrintAndLogEx(SUCCESS, "NACK bug detected"); return 1;
+				case  2 : PrintAndLogEx(SUCCESS, _GREEN_(always leak NACK detected)); return 3;
+				case  1 : PrintAndLogEx(SUCCESS, _GREEN_(NACK bug detected)); return 1;
 				case  0 : PrintAndLogEx(SUCCESS, "No NACK bug detected"); return 2;
 				default : PrintAndLogEx(WARNING, "errorcode from device [%i]", ok); return 0;
 			}
@@ -981,9 +981,9 @@ void detect_classic_magic(void) {
 		isGeneration = resp.arg[0] & 0xff;
 	
 	switch( isGeneration ){
-		case 1: PrintAndLogEx(SUCCESS, "Answers to magic commands (GEN 1a): YES"); break;
-		case 2: PrintAndLogEx(SUCCESS, "Answers to magic commands (GEN 1b): YES"); break;
-		//case 4: PrintAndLogEx(SUCCESS, "Answers to magic commands (GEN 2): YES"); break;
-		default: PrintAndLogEx(INFO, "Answers to magic commands: NO"); break;
+		case 1: PrintAndLogEx(SUCCESS, "Answers to magic commands (GEN 1a): " _GREEN_(YES)); break;
+		case 2: PrintAndLogEx(SUCCESS, "Answers to magic commands (GEN 1b): " _GREEN_(YES)); break;
+		//case 4: PrintAndLogEx(SUCCESS, "Answers to magic commands (GEN 2): "  _GREEN_(YES)); break;
+		default: PrintAndLogEx(INFO, "Answers to magic commands: " _YELLOW_(NO)); break;
 	}		
 }
\ No newline at end of file
diff --git a/common/lfdemod.c b/common/lfdemod.c
index 6b755d3dc..1ef5915c9 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -77,7 +77,7 @@ static void resetSignal(void) {
 	signalprop.isnoise = true;
 }
 static void printSignal(void) {
-	prnt("LF Signal properties:");
+	prnt("LF signal properties:");
 	prnt("  high..........%d", signalprop.high);
 	prnt("  low...........%d", signalprop.low);
 	prnt("  mean..........%d", signalprop.mean);
@@ -1922,7 +1922,7 @@ int pskRawDemod_ext(uint8_t *dest, size_t *size, int *clock, int *invert, int *s
 					dest[numBits++] = curPhase;
 				} else if (waveLenCnt < fc - 1) { //wave is smaller than field clock (shouldn't happen often)
 					errCnt2++;
-					if(errCnt2 > 101) return errCnt2;
+					if (errCnt2 > 101) return errCnt2;
 					avgWaveVal += dest[i+1];
 					continue;
 				}

From e3a0594b98f52d5e40c9519d00b119c2b2ec2f93 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 25 Feb 2019 00:31:00 +0100
Subject: [PATCH 0618/1938] colors

---
 client/hardnested/hardnested_bruteforce.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/hardnested/hardnested_bruteforce.c b/client/hardnested/hardnested_bruteforce.c
index 2a7618a1d..98f2785b2 100644
--- a/client/hardnested/hardnested_bruteforce.c
+++ b/client/hardnested/hardnested_bruteforce.c
@@ -170,7 +170,9 @@ crack_states_thread(void* x){
 				__atomic_fetch_add(&found_bs_key, key, __ATOMIC_SEQ_CST);
 
 				char progress_text[80];
-				sprintf(progress_text, "Brute force phase completed. Key found: %012" PRIx64, key);
+				char keystr[18];
+				sprintf(keystr, "%012" PRIx64, key);
+				sprintf(progress_text, "Brute force phase completed. Key found: " _GREEN_(keystr));
 				hardnested_print_progress(thread_arg->num_acquired_nonces, progress_text, 0.0, 0);				
                 break;
             } else if(keys_found){

From a4ecc6d3ce3cb3a1f6be5f90d4fb43903f061e1f Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 25 Feb 2019 00:32:59 +0100
Subject: [PATCH 0619/1938] colors

---
 client/hardnested/hardnested_bruteforce.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/hardnested/hardnested_bruteforce.c b/client/hardnested/hardnested_bruteforce.c
index 98f2785b2..4c820cbc1 100644
--- a/client/hardnested/hardnested_bruteforce.c
+++ b/client/hardnested/hardnested_bruteforce.c
@@ -172,7 +172,7 @@ crack_states_thread(void* x){
 				char progress_text[80];
 				char keystr[18];
 				sprintf(keystr, "%012" PRIx64, key);
-				sprintf(progress_text, "Brute force phase completed. Key found: " _GREEN_(keystr));
+				sprintf(progress_text, "Brute force phase completed. Key found: " _GREEN_(%s), keystr);
 				hardnested_print_progress(thread_arg->num_acquired_nonces, progress_text, 0.0, 0);				
                 break;
             } else if(keys_found){

From a8eb0fd05fa2c31a61720206556579f759dc8d44 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 25 Feb 2019 00:38:48 +0100
Subject: [PATCH 0620/1938] colors

---
 client/hardnested/hardnested_bruteforce.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/hardnested/hardnested_bruteforce.c b/client/hardnested/hardnested_bruteforce.c
index 4c820cbc1..1a09d7a49 100644
--- a/client/hardnested/hardnested_bruteforce.c
+++ b/client/hardnested/hardnested_bruteforce.c
@@ -171,8 +171,8 @@ crack_states_thread(void* x){
 
 				char progress_text[80];
 				char keystr[18];
-				sprintf(keystr, "%012" PRIx64, key);
-				sprintf(progress_text, "Brute force phase completed. Key found: " _GREEN_(%s), keystr);
+				sprintf(keystr, "%012" PRIx64 "  ", key);
+				sprintf(progress_text, "Brute force phase completed. Key found: " _YELLOW_(%s), keystr);
 				hardnested_print_progress(thread_arg->num_acquired_nonces, progress_text, 0.0, 0);				
                 break;
             } else if(keys_found){

From 711d384e7d2f41823467980ad918fcb27507cbde Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Mon, 25 Feb 2019 12:44:21 +0100
Subject: [PATCH 0621/1938] chg: 'data autocorrelate g' - visual with gridclock
 patter and markup of two tops. Also added a "visual" inspection of peaks with
 3% tolerance. This increases usability quite much.

---
 client/cmddata.c | 48 +++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 41 insertions(+), 7 deletions(-)

diff --git a/client/cmddata.c b/client/cmddata.c
index 65fd0d829..62308c39f 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -754,19 +754,53 @@ int AutoCorrelate(const int *in, int *out, size_t len, int window, bool SaveGrph
 			lastmax = i;
 		}
 	}
-
-	if (verbose && ( correlation > 1 ) ) {
-		PrintAndLogEx(SUCCESS, "possible correlation %4d samples", correlation);
-	} else {
-		PrintAndLogEx(FAILED, "no repeating pattern found");
+	
+	// 
+	int hi = 0, idx = 0;
+	int distance = 0, hi_1 = 0, idx_1 = 0;
+	for (int i=0; i<=len; ++i){
+		if ( CorrelBuffer[i] > hi) {
+			hi = CorrelBuffer[i];
+			idx = i;
+		}
 	}
 	
-	if (SaveGrph){
+	for (int i=idx+1; i<=window; ++i){
+		if ( CorrelBuffer[i] > hi_1 ) {
+			hi_1 = CorrelBuffer[i];
+			idx_1 = i;
+		}
+	}
+
+	int foo = ABS(hi-hi_1);
+	int bar = ((int)(((hi+hi_1) / 2) * 0.03));  
+	if ( verbose && foo < bar ) {
+		distance = idx_1 - idx;
+		PrintAndLogEx(SUCCESS, "possible 3% visible correlation %4d samples", distance);
+	} else if (verbose && ( correlation > 1 ) ) {
+		PrintAndLogEx(SUCCESS, "possible correlation %4d samples", correlation);
+	} else {
+		PrintAndLogEx(FAILED, "no repeating pattern found, try increasing window size");
+	}
+	
+	int retval = correlation;
+	if (SaveGrph) {
 		//GraphTraceLen = GraphTraceLen - window;
 		memcpy(out, CorrelBuffer, len * sizeof(int));
+		if ( distance > 0) {
+			setClockGrid(distance, idx);
+			retval = distance;
+		}
+		else
+			setClockGrid(correlation, idx);	
+		
+		CursorCPos = idx_1;
+		CursorDPos = idx_1+retval;
+		DemodBufferLen = 0;
 		RepaintGraphWindow();  
 	}
-	return correlation;
+	
+	return retval;
 }
 
 int CmdAutoCorr(const char *Cmd) {

From 81f8749caf617734782751b1591e9e27e6972650 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Mon, 25 Feb 2019 12:46:06 +0100
Subject: [PATCH 0622/1938] text

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a9ebb49b2..673b25f8b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [unreleased][unreleased]
+ - Chg 'data autocorrelate' - better visual representation and added extra peak detection (@iceman)
  - Fix 'lf search' - false positive indala identification fixed (@iceman)
  - Add 'lf keri' - basic support for Keri tags (@iceman)
  - Add 'hf mf list' - re-added it again (@iceman)

From 64bae8c8be83810f9e9347d8fd2450fdd834caa5 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 25 Feb 2019 15:07:31 +0100
Subject: [PATCH 0623/1938] fix: 'data detectclock' - now prints clock again...

---
 client/graph.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/graph.c b/client/graph.c
index 2b2884819..42bb79c84 100644
--- a/client/graph.c
+++ b/client/graph.c
@@ -121,7 +121,7 @@ int GetAskClock(const char *str, bool printAns) {
 	}
 	// Only print this message if we're not looping something
 	if (printAns || g_debugMode)
-		PrintAndLogEx(DEBUG, "Auto-detected clock rate: %d, Best Starting Position: %d", clock, idx);
+		PrintAndLogEx(SUCCESS, "Auto-detected clock rate: %d, Best Starting Position: %d", clock, idx);
 
 	return clock;
 }
@@ -140,7 +140,7 @@ uint8_t GetPskCarrier(const char *str, bool printAns) {
 	if (( fc >> 8) == 10 && carrier == 8) return 0;
 	// Only print this message if we're not looping something
 	if (printAns)
-		PrintAndLogEx(NORMAL, "Auto-detected PSK carrier rate: %d", carrier);
+		PrintAndLogEx(SUCCESS, "Auto-detected PSK carrier rate: %d", carrier);
 	return carrier;
 }
 
@@ -162,7 +162,7 @@ int GetPskClock(const char* str, bool printAns) {
 	setClockGrid(clock, firstPhaseShiftLoc);
 	// Only print this message if we're not looping something
 	if (printAns)
-		PrintAndLogEx(NORMAL, "Auto-detected clock rate: %d", clock);
+		PrintAndLogEx(SUCCESS, "Auto-detected clock rate: %d", clock);
 	return clock;
 }
 
@@ -184,7 +184,7 @@ int GetNrzClock(const char* str, bool printAns) {
 	setClockGrid(clock, clkStartIdx);
 	// Only print this message if we're not looping something
 	if (printAns)
-		PrintAndLogEx(NORMAL, "Auto-detected clock rate: %d", clock);
+		PrintAndLogEx(SUCCESS, "Auto-detected clock rate: %d", clock);
 	return clock;
 }
 //by marshmellow
@@ -203,7 +203,7 @@ int GetFskClock(const char* str, bool printAns) {
 	
 	if ((fc1==10 && fc2==8) || (fc1==8 && fc2==5)){
 		if (printAns) 
-			PrintAndLogEx(NORMAL, "Detected Field Clocks: FC/%d, FC/%d - Bit Clock: RF/%d", fc1, fc2, rf1);
+			PrintAndLogEx(SUCCESS, "Detected Field Clocks: FC/%d, FC/%d - Bit Clock: RF/%d", fc1, fc2, rf1);
 		setClockGrid(rf1, firstClockEdge);
 		return rf1;
 	}

From d929f31eb37d05899012faf4c4846b2413644386 Mon Sep 17 00:00:00 2001
From: 3ldidi94 <elie.gay@noos.fr>
Date: Mon, 25 Feb 2019 18:52:44 +0100
Subject: [PATCH 0624/1938] Update default_iclass_keys.dic

---
 client/default_iclass_keys.dic | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/default_iclass_keys.dic b/client/default_iclass_keys.dic
index 0f7ec2d2c..829ba521e 100644
--- a/client/default_iclass_keys.dic
+++ b/client/default_iclass_keys.dic
@@ -8,3 +8,4 @@ AEA684A6DAB23278 -- AA1
 5b7c62c491c11b39 -- from loclass demo file.
 F0E1D2C3B4A59687 -- Kd from PicoPass 2k documentation
 5CBCF1DA45D5FB4F -- PicoPass Default Exchange Key
+31ad7ebd2f282168 -- From HID multiclassSE reader

From d6bb8d630a6254ceefa7043e330853295cbfc503 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 25 Feb 2019 19:03:14 +0100
Subject: [PATCH 0625/1938] fix: strings

---
 client/cmdhffelica.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/client/cmdhffelica.c b/client/cmdhffelica.c
index 42c56d900..efb6b68d7 100644
--- a/client/cmdhffelica.c
+++ b/client/cmdhffelica.c
@@ -277,7 +277,8 @@ uint16_t PrintFliteBlock(uint16_t tracepos, uint8_t *trace, uint16_t tracelen) {
 			uint32_t regB = trace[7] | trace[8] << 8 | trace[9] << 16 | trace[10] << 24;
 			line[0] = 0;
 			for (int j = 0; j < 8; j++) 
-				snprintf(line+( j  * 2), sizeof(line)-1-(j*2), "%02x", trace[j+11]);
+				snprintf(line + (j*2), sizeof(line)-1-(j*2), "%02x", trace[j+11]);
+			
 			PrintAndLogEx(NORMAL,  "REG: regA: %d regB: %d regC: %s ", regA, regB, line);
 			}
 		break;
@@ -287,10 +288,10 @@ uint16_t PrintFliteBlock(uint16_t tracepos, uint8_t *trace, uint16_t tracelen) {
 			char idd[20];
 			char idm[20];
 			for (int j = 0; j < 8; j++) 
-				snprintf(idd + (j * 2), sizeof(idd) - 1 - (j*2), "%02x", trace[j+3]);
+				snprintf(idd + (j*2), sizeof(idd)-1-(j*2), "%02x", trace[j+3]);
 			
 			for (int j = 0; j < 6; j++) 
-				snprintf(idm + (j * 2), sizeof(idm) - 1 - (j*2), "%02x", trace[j+13]);
+				snprintf(idm + (j*2), sizeof(idm)-1-(j*2), "%02x", trace[j+13]);
 				
 			PrintAndLogEx(NORMAL,  "ID Block, IDd: 0x%s DFC: 0x%02x%02x Arb: %s ", idd, trace[11], trace [12], idm);
 			}
@@ -299,10 +300,10 @@ uint16_t PrintFliteBlock(uint16_t tracepos, uint8_t *trace, uint16_t tracelen) {
 			char idm[20];
 			char pmm[20];
 			for (int j = 0; j < 8; j++)
-				snprintf(idm + (j  * 2), 20, "%02x", trace[j+3]);
+				snprintf(idm + (j*2), sizeof(idm)-1-(j*2), "%02x", trace[j+3]);
 			
 			for (int j = 0; j < 8; j++)
-				snprintf(pmm + (j  * 2), 20, "%02x", trace[j+11]);
+				snprintf(pmm + (j*2), sizeof(pmm)-1-(j*2), "%02x", trace[j+11]);
 			
 			PrintAndLogEx(NORMAL,  "DeviceId:  IDm: 0x%s PMm: 0x%s ", idm, pmm);
 			}

From 56a75fbf0b47c15a96ff621e8d7c274136f7a6b9 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 25 Feb 2019 19:03:31 +0100
Subject: [PATCH 0626/1938] fix: bad division

---
 client/cmddata.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/cmddata.c b/client/cmddata.c
index 62308c39f..7e037c2e6 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -758,14 +758,14 @@ int AutoCorrelate(const int *in, int *out, size_t len, int window, bool SaveGrph
 	// 
 	int hi = 0, idx = 0;
 	int distance = 0, hi_1 = 0, idx_1 = 0;
-	for (int i=0; i<=len; ++i){
+	for (int i = 0; i <= len; ++i){
 		if ( CorrelBuffer[i] > hi) {
 			hi = CorrelBuffer[i];
 			idx = i;
 		}
 	}
 	
-	for (int i=idx+1; i<=window; ++i){
+	for (int i = idx+1; i <= window; ++i){
 		if ( CorrelBuffer[i] > hi_1 ) {
 			hi_1 = CorrelBuffer[i];
 			idx_1 = i;
@@ -773,7 +773,7 @@ int AutoCorrelate(const int *in, int *out, size_t len, int window, bool SaveGrph
 	}
 
 	int foo = ABS(hi-hi_1);
-	int bar = ((int)(((hi+hi_1) / 2) * 0.03));  
+	int bar = (int)(((hi+hi_1) / 2) * 0.03);  
 	if ( verbose && foo < bar ) {
 		distance = idx_1 - idx;
 		PrintAndLogEx(SUCCESS, "possible 3% visible correlation %4d samples", distance);

From 972f8590e0bfa25a78b3ed19cb623a3c670102f9 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 25 Feb 2019 19:10:00 +0100
Subject: [PATCH 0627/1938] fix dereference

---
 client/emv/emvjson.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/emv/emvjson.c b/client/emv/emvjson.c
index fc10f255c..dc409a2a5 100644
--- a/client/emv/emvjson.c
+++ b/client/emv/emvjson.c
@@ -259,7 +259,8 @@ bool HexToBuffer(const char *errormsg, const char *hexvalue, uint8_t * buffer, s
 		return false;
 	}
 	
-	*bufferlen = buflen;
+	if ( bufferlen )
+		*bufferlen = buflen;
 	
 	return true;
 }

From 8c6312e2097aa804ef4e9ef5dc9ce1ffeba2e603 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 25 Feb 2019 19:10:37 +0100
Subject: [PATCH 0628/1938] fix mem leaks

---
 client/emv/cmdemv.c | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index 52033afb4..f14d23f2d 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -253,6 +253,7 @@ int CmdEMVGPO(const char *cmd) {
 	
 	// calc PDOL
 	struct tlv *pdol_data_tlv = NULL;
+	struct tlvdb *tmp_ext = NULL;
 	struct tlv data_tlv = {
 		.tag = 0x83,
 		.len = datalen,
@@ -266,7 +267,7 @@ int CmdEMVGPO(const char *cmd) {
 			ParamLoadFromJson(tlvRoot);
 		};
 		
-		struct tlvdb *tmp_ext = tlvdb_external(0x9f38, datalen, data);
+		tmp_ext = tlvdb_external(0x9f38, datalen, data);
 		pdol_data_tlv = dol_process((const struct tlv *)tmp_ext, tlvRoot, 0x83);
 		if (!pdol_data_tlv){
 			PrintAndLogEx(ERR, "Can't create PDOL TLV.");
@@ -285,8 +286,8 @@ int CmdEMVGPO(const char *cmd) {
 	unsigned char *pdol_data_tlv_data = tlv_encode(pdol_data_tlv, &pdol_data_tlv_data_len);
 	if (!pdol_data_tlv_data) {
 		PrintAndLogEx(ERR, "Can't create PDOL data.");
+		tlvdb_free(tmp_ext);
 		tlvdb_free(tlvRoot);
-		free(pdol_data_tlv);
 		return 4;
 	}
 	PrintAndLogEx(INFO, "PDOL data[%d]: %s", pdol_data_tlv_data_len, sprint_hex(pdol_data_tlv_data, pdol_data_tlv_data_len));
@@ -299,7 +300,8 @@ int CmdEMVGPO(const char *cmd) {
 	
 	if (pdol_data_tlv != &data_tlv)
 		free(pdol_data_tlv);
-	
+
+	tlvdb_free(tmp_ext);	
 	tlvdb_free(tlvRoot);
 	
 	if (sw)
@@ -434,6 +436,7 @@ int CmdEMVAC(const char *cmd) {
 	
 	// calc CDOL
 	struct tlv *cdol_data_tlv = NULL;
+	struct tlvdb *tmp_ext = NULL;
 	struct tlv data_tlv = {
 		.tag = 0x01,
 		.len = datalen,
@@ -448,7 +451,7 @@ int CmdEMVAC(const char *cmd) {
 			ParamLoadFromJson(tlvRoot);
 		};
 		
-		struct tlvdb *tmp_ext = tlvdb_external(0x8c, datalen, data);
+		tmp_ext = tlvdb_external(0x8c, datalen, data);
 		cdol_data_tlv = dol_process((const struct tlv *)tmp_ext, tlvRoot, 0x01); // 0x01 - dummy tag
 		if (!cdol_data_tlv){
 			PrintAndLogEx(ERR, "Can't create CDOL TLV.");
@@ -473,6 +476,8 @@ int CmdEMVAC(const char *cmd) {
 	
 	if (cdol_data_tlv != &data_tlv)
 		free(cdol_data_tlv);
+
+	tlvdb_free(tmp_ext);
 	tlvdb_free(tlvRoot);
 	
 	if (sw)
@@ -578,6 +583,7 @@ int CmdEMVInternalAuthenticate(const char *cmd) {
 	
 	// calc DDOL
 	struct tlv *ddol_data_tlv = NULL;
+	struct tlvdb *tmp_ext = NULL;
 	struct tlv data_tlv = {
 		.tag = 0x01,
 		.len = datalen,
@@ -592,7 +598,7 @@ int CmdEMVInternalAuthenticate(const char *cmd) {
 			ParamLoadFromJson(tlvRoot);
 		};
 		
-		struct tlvdb *tmp_ext = tlvdb_external(0x9f49, datalen, data);
+		tmp_ext = tlvdb_external(0x9f49, datalen, data);
 		ddol_data_tlv = dol_process((const struct tlv *)tmp_ext, tlvRoot, 0x01); // 0x01 - dummy tag
 		if (!ddol_data_tlv){
 			PrintAndLogEx(ERR, "Can't create DDOL TLV.");
@@ -617,6 +623,8 @@ int CmdEMVInternalAuthenticate(const char *cmd) {
 	
 	if (ddol_data_tlv != &data_tlv)
 		free(ddol_data_tlv);
+
+	tlvdb_free(tmp_ext);	
 	tlvdb_free(tlvRoot);	
 	
 	if (sw)

From c2046f2e65bf293ea6697793dbf9f33723b63830 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Mon, 25 Feb 2019 22:33:49 +0100
Subject: [PATCH 0629/1938] CHG: 'hf mf dump' - now saves in BIN/EML/JSON
 default CHG: 'hf mf esave' - now saves in BIN/EML/JSON default

---
 client/cmdhfmf.c | 69 ++++++++++++++++++++++++++----------------------
 1 file changed, 37 insertions(+), 32 deletions(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index c59dad769..00d5c3176 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -11,6 +11,9 @@
 #include "cmdhfmf.h"
 #include "mifare4.h"
 
+
+#define MFBLOCK_SIZE 16
+
 #define MIFARE_4K_MAXBLOCK 256
 #define MIFARE_2K_MAXBLOCK 128 
 #define MIFARE_1K_MAXBLOCK 64
@@ -697,10 +700,13 @@ int CmdHF14AMfDump(const char *Cmd) {
 	uint8_t cmdp = 0;
 	
 	char keyFilename[FILE_PATH_SIZE] = {0};
-	char dataFilename[FILE_PATH_SIZE] = {0};
+	char dataFilename[FILE_PATH_SIZE];
 	char * fptr;
 	
-	FILE *fin, *fout;	
+	memset(keyFilename, 0, sizeof(keyFilename));
+	memset(dataFilename, 0, sizeof(dataFilename));
+	
+	FILE *f;	
 	UsbCommand resp;
 	
 	while(param_getchar(Cmd, cmdp) != 0x00) {
@@ -734,7 +740,7 @@ int CmdHF14AMfDump(const char *Cmd) {
 		strcpy(keyFilename, fptr);
 	}
 
-	if ((fin = fopen(keyFilename, "rb")) == NULL) {
+	if ((f = fopen(keyFilename, "rb")) == NULL) {
 		PrintAndLogEx(WARNING, "Could not find file " _YELLOW_(%s), keyFilename);
 		return 1;
 	}
@@ -742,29 +748,29 @@ int CmdHF14AMfDump(const char *Cmd) {
 	// Read keys A from file
 	size_t bytes_read;
 	for (sectorNo=0; sectorNo<numSectors; sectorNo++) {
-		bytes_read = fread( keyA[sectorNo], 1, 6, fin );
+		bytes_read = fread( keyA[sectorNo], 1, 6, f );
 		if ( bytes_read != 6) {
 			PrintAndLogEx(WARNING, "File reading error.");
-			fclose(fin);
+			fclose(f);
 			return 2;
 		}
 	}
 	
 	// Read keys B from file
 	for (sectorNo=0; sectorNo<numSectors; sectorNo++) {
-		bytes_read = fread( keyB[sectorNo], 1, 6, fin );
+		bytes_read = fread( keyB[sectorNo], 1, 6, f );
 		if ( bytes_read != 6) {
 			PrintAndLogEx(WARNING, "File reading error.");
-			fclose(fin);
+			fclose(f);
 			return 2;
 		}
 	}
 	
-	fclose(fin);
+	fclose(f);
 			
-	PrintAndLogEx(NORMAL, "|-----------------------------------------|");
-	PrintAndLogEx(NORMAL, "|------ Reading sector access bits...-----|");
-	PrintAndLogEx(NORMAL, "|-----------------------------------------|");
+
+	PrintAndLogEx(INFO, "Reading sector access bits...");
+
 	uint8_t tries = 0;
 	for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
 		for (tries = 0; tries < MIFARE_SECTOR_RETRY; tries++) {
@@ -796,9 +802,8 @@ int CmdHF14AMfDump(const char *Cmd) {
 		}
 	}
 	
-	PrintAndLogEx(NORMAL, "|-----------------------------------------|");
-	PrintAndLogEx(NORMAL, "|----- Dumping all blocks to file... -----|");
-	PrintAndLogEx(NORMAL, "|-----------------------------------------|");
+	PrintAndLogEx(SUCCESS, "Finished reading sector access bits");
+	PrintAndLogEx(INFO, "Dumping all blocks from card...");
 	
 	bool isOK = true;
 	for (sectorNo = 0; isOK && sectorNo < numSectors; sectorNo++) {
@@ -870,24 +875,24 @@ int CmdHF14AMfDump(const char *Cmd) {
 		}
 	}
 
-	if (isOK) {
-		if (dataFilename[0] == 0x00) {
-			fptr = GenerateFilename("hf-mf-", "-data.bin");
-			if (fptr == NULL) 
-				return 1;
-			
-			strcpy(dataFilename, fptr);
-		}
-		
-		if ((fout = fopen(dataFilename,"wb")) == NULL) { 
-			PrintAndLogEx(WARNING, "could not create file name " _YELLOW_(%s), dataFilename);
-			return 1;
-		}
-		uint16_t numblocks = FirstBlockOfSector(numSectors - 1) + NumBlocksPerSector(numSectors - 1);
-		fwrite(carddata, 1, 16*numblocks, fout);
-		fclose(fout);
-		PrintAndLogEx(SUCCESS, "dumped %d blocks (%d bytes) to file " _YELLOW_(%s), numblocks, 16*numblocks, dataFilename);
+	if (isOK == 0) { 
+		PrintAndLogEx(FAILED, "Something went wrong");
+		return 0;
 	}
+
+	PrintAndLogEx(SUCCESS, "\nSuccedded in dumping all blocks");
+	
+	if ( strlen(dataFilename) < 1 ) {
+		fptr = dataFilename;
+		fptr += sprintf(fptr, "hf-mf-");
+		FillFileNameByUID(fptr, (uint8_t *)carddata, "-data", 4);
+	}
+
+	uint16_t bytes = 16*(FirstBlockOfSector(numSectors - 1) + NumBlocksPerSector(numSectors - 1));
+	
+	saveFile(dataFilename, "bin", (uint8_t *)carddata, bytes);
+	saveFileEML(dataFilename, "eml", (uint8_t *)carddata, bytes, MFBLOCK_SIZE);
+	saveFileJSON(dataFilename, "json", jsfCardMemory, (uint8_t *)carddata, bytes);
 	return 0;
 }
 
@@ -2507,7 +2512,6 @@ int CmdHF14AMfELoad(const char *Cmd) {
 	return 0;
 }
 
-#define MFBLOCK_SIZE 16
 int CmdHF14AMfESave(const char *Cmd) {
 
 	char filename[FILE_PATH_SIZE];
@@ -2549,6 +2553,7 @@ int CmdHF14AMfESave(const char *Cmd) {
 	
 	saveFile(filename, "bin", dump, bytes);
 	saveFileEML(filename, "eml", dump, bytes, MFBLOCK_SIZE);
+	saveFileJSON(filename, "json", jsfCardMemory, dump, bytes);
 	free(dump);
 	return 0;
 }

From d73c501ffa92ac7df553a3950725a6c8d340bce7 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 26 Feb 2019 22:27:33 +0100
Subject: [PATCH 0630/1938] another

---
 client/default_keys.dic | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/default_keys.dic b/client/default_keys.dic
index ffbdb3cbd..cd23d9a0d 100644
--- a/client/default_keys.dic
+++ b/client/default_keys.dic
@@ -98,6 +98,7 @@ fc00018778f7,--VästtrafikenKeyA, RKFÖstgötaTrafikenKeyA
 314B49474956,--VIGIK1KeyA
 564c505f4d41,--VIGIK1KeyB
 ba5b895da162,--VIGIK1KeyB
+4143414F5250,
 #
 # Data from: http://irq5.io/2013/04/13/decoding-bcard-conference-badges/
 f4a9ef2afc6d,--BCARD KeyB

From ef2fc5b66c37cbc6661cfdbb1f58d2346be5ace9 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Fri, 1 Mar 2019 12:09:35 +0100
Subject: [PATCH 0631/1938] fix: 'hw tune' - reset demodplot line and grid
 clock

---
 client/cmddata.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/client/cmddata.c b/client/cmddata.c
index 7e037c2e6..ba3d61156 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -1495,6 +1495,13 @@ int CmdTuneSamples(const char *Cmd) {
 #define HF_UNUSABLE_V	3000
 #define HF_MARGINAL_V	5000
 #define ANTENNA_ERROR	1.03	// current algo has 3% error margin.
+
+	// hide demod plot line
+	DemodBufferLen = 0;
+	setClockGrid(0, 0);
+	RepaintGraphWindow();
+	
+	
 	int timeout = 0;
 	PrintAndLogEx(INFO, "\nmeasuring antenna characteristics, please wait...");
 
@@ -1575,6 +1582,7 @@ int CmdTuneSamples(const char *Cmd) {
 
 		PrintAndLogEx(FAILED, "\nNot showing LF tuning graph since all values is zero.\n\n");
 	}
+
 	return 0;
 }
 

From 4d79ced1a9bbeb282664efa622089243be144410 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Fri, 1 Mar 2019 18:49:53 +0200
Subject: [PATCH 0632/1938] =?UTF-8?q?=D0=B0=D1=88=D1=87=D1=83=D1=8B=20?=
 =?UTF-8?q?=D1=88=D1=82=20=D1=8C=D1=84=D0=B2=D1=8E=D1=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/mifare/mad.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/client/mifare/mad.c b/client/mifare/mad.c
index 9f28de394..3973116b4 100644
--- a/client/mifare/mad.c
+++ b/client/mifare/mad.c
@@ -101,7 +101,7 @@ static const char *GetAIDDescription(uint16_t AID) {
 			return madKnownAIDs[i].Description;
 
 	for(int i = 0; i < ARRAYLEN(madKnownClusterCodes); i++)
-		if (madKnownClusterCodes[i].AID == AID)
+		if (madKnownClusterCodes[i].AID == (AID >> 8)) // high byte - cluster code
 			return madKnownClusterCodes[i].Description;
 		
 	return unknownAID;
@@ -175,6 +175,7 @@ int MAD1DecodeAndPrint(uint8_t *sector, bool verbose, bool *haveMAD2) {
 	if (InfoByte == 0x10 || InfoByte >= 0x28)
 		PrintAndLogEx(WARNING, "Info byte error");
 	
+	PrintAndLogEx(NORMAL, "00 MAD1");
 	for(int i = 1; i < 16; i++) {
 		uint16_t AID = madGetAID(sector, 1, i);
 		PrintAndLogEx(NORMAL, "%02d [%04X] %s", i, AID, GetAIDDescription(AID));
@@ -184,15 +185,19 @@ int MAD1DecodeAndPrint(uint8_t *sector, bool verbose, bool *haveMAD2) {
 };
 
 int MAD2DecodeAndPrint(uint8_t *sector, bool verbose) {
+	PrintAndLogEx(NORMAL, "16 MAD2");
+
 	int res = madCRCCheck(sector, true, 2);
 	if (res)
 		return res;	
 
-	for(int i = 1; i < 8 + 8 + 7; i++) {
+	uint8_t InfoByte = sector[1] & 0x3f;
+	PrintAndLogEx(NORMAL, "MAD2 Card publisher sector: 0x%02x", InfoByte);
+
+	for(int i = 1; i < 8 + 8 + 7 + 1; i++) {
 		uint16_t AID = madGetAID(sector, 2, i);
-		PrintAndLogEx(NORMAL, "%02d [%04X] %s", i + 15, AID, GetAIDDescription(AID));
-	};
-		
+		PrintAndLogEx(NORMAL, "%02d [%04X] %s", i + 16, AID, GetAIDDescription(AID));
+	};	
 	
 	return 0;
 };

From 6208a6869cdb21b9b4d7330d4b1e0179a72389b8 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Fri, 1 Mar 2019 18:50:25 +0200
Subject: [PATCH 0633/1938] added mad decode for mfp

---
 client/cmdhfmfp.c             | 108 ++++++++++++++++++++++++++++++++++
 client/mifare/mifaredefault.h |   1 +
 2 files changed, 109 insertions(+)

diff --git a/client/cmdhfmfp.c b/client/cmdhfmfp.c
index 0917728be..bcbe323a9 100644
--- a/client/cmdhfmfp.c
+++ b/client/cmdhfmfp.c
@@ -23,6 +23,7 @@
 #include "cmdhf14a.h"
 #include "mifare.h"
 #include "mifare/mifare4.h"
+#include "mifare/mad.h"
 #include "cliparser/cliparser.h"
 #include "crypto/libpcrypto.h"
 
@@ -733,6 +734,112 @@ int CmdHFMFPWrbl(const char *cmd) {
 	return 0;
 }
 
+int mfpReadSector(uint8_t sectorNo, uint8_t keyType, uint8_t *key, uint8_t *dataout, bool verbose){
+	uint8_t keyn[2] = {0};
+	bool plain = false;
+	
+	uint16_t uKeyNum = 0x4000 + sectorNo * 2 + (keyType ? 1 : 0);
+	keyn[0] = uKeyNum >> 8;
+	keyn[1] = uKeyNum & 0xff;
+	if (verbose)
+		PrintAndLogEx(INFO, "--sector[%d]:%02x key:%04x", mfNumBlocksPerSector(sectorNo), sectorNo, uKeyNum);
+	
+	mf4Session session;
+	int res = MifareAuth4(&session, keyn, key, true, true, verbose);
+	if (res) {
+		PrintAndLogEx(ERR, "Sector %d authentication error: %d", sectorNo, res);
+		return res;
+	}
+	
+	uint8_t data[250] = {0};
+	int datalen = 0;
+	uint8_t mac[8] = {0};
+	uint8_t firstBlockNo = mfFirstBlockOfSector(sectorNo);
+	for(int n = firstBlockNo; n < firstBlockNo + mfNumBlocksPerSector(sectorNo); n++) {
+		res = MFPReadBlock(&session, plain, n & 0xff, 1, false, true, data, sizeof(data), &datalen, mac);
+		if (res) {
+			PrintAndLogEx(ERR, "Sector %d read error: %d", sectorNo, res);
+			DropField();
+			return res;
+		}
+		
+		if (datalen && data[0] != 0x90) {
+			PrintAndLogEx(ERR, "Sector %d card read error: %02x %s", sectorNo, data[0], GetErrorDescription(data[0]));
+			DropField();
+			return 5;
+		}
+		if (datalen != 1 + 16 + 8 + 2) {
+			PrintAndLogEx(ERR, "Sector %d error returned data length:%d", sectorNo, datalen);
+			DropField();
+			return 6;
+		}
+
+		memcpy(&dataout[(n - firstBlockNo) * 16], &data[1], 16);
+		
+		if (verbose)
+			PrintAndLogEx(INFO, "data[%03d]: %s", n, sprint_hex(&data[1], 16));
+			
+		if (memcmp(&data[1 + 16], mac, 8)) {
+			PrintAndLogEx(WARNING, "WARNING: mac on block %d not equal...", n);
+			PrintAndLogEx(WARNING, "MAC   card: %s", sprint_hex(&data[1 + 16], 8));
+			PrintAndLogEx(WARNING, "MAC reader: %s", sprint_hex(mac, 8));
+			
+			if (!verbose)
+				return 7;			
+		} else {	
+			if(verbose)
+				PrintAndLogEx(INFO, "MAC: %s", sprint_hex(&data[1 + 16], 8));
+		}
+	}
+	DropField();
+
+	return 0;	
+}
+
+int CmdHFMFPMAD(const char *cmd) {
+
+	CLIParserInit("hf mfp mad", 
+		"Checks and prints Mifare Application Directory (MAD)", 
+		"Usage:\n\thf mfp mad -> shows MAD if exists\n");
+
+	void* argtable[] = {
+		arg_param_begin,
+		arg_lit0("vV",  "verbose",  "show technical data"),
+		arg_param_end
+	};
+	CLIExecWithReturn(cmd, argtable, true);
+	bool verbose = arg_get_lit(1);
+	
+	CLIParserFree();
+
+	uint8_t sector[16 * 4] = {0};
+	if (mfpReadSector(MF_MAD1_SECTOR, MF_KEY_A, (uint8_t *)g_mifarep_mad_key, sector, verbose)) {
+		PrintAndLogEx(NORMAL, "");
+		PrintAndLogEx(ERR, "read sector 0 error. card don't have MAD or don't have MAD on default keys.");
+		return 2;
+	}
+	
+	if (verbose) {
+		for(int i = 0; i < 4; i ++)
+			PrintAndLogEx(NORMAL, "[%d] %s", i, sprint_hex(&sector[i * 16], 16));		
+	}
+
+	bool haveMAD2 = false;
+	MAD1DecodeAndPrint(sector, verbose, &haveMAD2);
+	
+	if (haveMAD2) {
+		if (mfpReadSector(MF_MAD2_SECTOR, MF_KEY_A, (uint8_t *)g_mifarep_mad_key, sector, verbose)) {
+			PrintAndLogEx(NORMAL, "");
+			PrintAndLogEx(ERR, "read sector 0x10 error. card don't have MAD or don't have MAD on default keys.");
+			return 2;
+		}
+
+		MAD2DecodeAndPrint(sector, verbose);
+	}
+	
+	return 0;
+}
+
 static command_t CommandTable[] =
 {
   {"help",             CmdHelp,					1, "This help"},
@@ -744,6 +851,7 @@ static command_t CommandTable[] =
   {"rdbl",  	       CmdHFMFPRdbl,			0, "Read blocks"},
   {"rdsc",  	       CmdHFMFPRdsc,			0, "Read sectors"},
   {"wrbl",  	       CmdHFMFPWrbl,			0, "Write blocks"},
+  {"mad",  	           CmdHFMFPMAD,				0, "Checks and prints MAD"},
   {NULL,               NULL,					0, NULL}
 };
 
diff --git a/client/mifare/mifaredefault.h b/client/mifare/mifaredefault.h
index db9c0329d..e7218cbe7 100644
--- a/client/mifare/mifaredefault.h
+++ b/client/mifare/mifaredefault.h
@@ -44,5 +44,6 @@ static const uint64_t g_mifare_default_keys[] =
 
 static const uint8_t g_mifare_mad_key[] = {0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5};
 static const uint8_t g_mifare_ndef_key[] = {0xd3, 0xf7, 0xd3, 0xf7, 0xd3, 0xf7};
+static const uint8_t g_mifarep_mad_key[] = {0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7};
 
 #endif

From 5cc4bea4e3f44a322902ab4f3553a8490508804b Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Fri, 1 Mar 2019 19:05:51 +0200
Subject: [PATCH 0634/1938] mfp refactoring

---
 client/cmdhfmfp.c       | 181 +++-------------------------------------
 client/mifare/mifare4.c | 157 ++++++++++++++++++++++++++++++++++
 client/mifare/mifare4.h |   9 ++
 3 files changed, 178 insertions(+), 169 deletions(-)

diff --git a/client/cmdhfmfp.c b/client/cmdhfmfp.c
index bcbe323a9..43c8d645d 100644
--- a/client/cmdhfmfp.c
+++ b/client/cmdhfmfp.c
@@ -29,103 +29,8 @@
 
 static const uint8_t DefaultKey[16] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
 
-typedef struct {
-	uint8_t Code;
-	const char *Description;
-} PlusErrorsElm;
-
-static const PlusErrorsElm PlusErrors[] = {
-	{0xFF, ""},
-	{0x00, "Transfer cannot be granted within the current authentication."},
-	{0x06, "Access Conditions not fulfilled. Block does not exist, block is not a value block."},
-	{0x07, "Too many read or write commands in the session or in the transaction."},
-	{0x08, "Invalid MAC in command or response"},
-	{0x09, "Block Number is not valid"},
-	{0x0a, "Invalid block number, not existing block number"},
-	{0x0b, "The current command code not available at the current card state."},
-	{0x0c, "Length error"},
-	{0x0f, "General Manipulation Error. Failure in the operation of the PICC (cannot write to the data block), etc."},
-	{0x90, "OK"},
-};
-int PlusErrorsLen = sizeof(PlusErrors) / sizeof(PlusErrorsElm);
-
-const char * GetErrorDescription(uint8_t errorCode) {
-	for(int i = 0; i < PlusErrorsLen; i++)
-		if (errorCode == PlusErrors[i].Code)
-			return PlusErrors[i].Description;
-		
-	return PlusErrors[0].Description;
-}
-
 static int CmdHelp(const char *Cmd);
 
-static bool VerboseMode = false;
-void SetVerboseMode(bool verbose) {
-	VerboseMode = verbose;
-}
-
-int intExchangeRAW14aPlus(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
-	if(VerboseMode)
-		PrintAndLogEx(INFO, ">>> %s", sprint_hex(datain, datainlen));
-	
-	int res = ExchangeRAW14a(datain, datainlen, activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
-
-	if(VerboseMode)
-		PrintAndLogEx(INFO, "<<< %s", sprint_hex(dataout, *dataoutlen));
-	
-	return res;
-}
-
-int MFPWritePerso(uint8_t *keyNum, uint8_t *key, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
-	uint8_t rcmd[3 + 16] = {0xa8, keyNum[1], keyNum[0], 0x00};
-	memmove(&rcmd[3], key, 16);
-	
-	return intExchangeRAW14aPlus(rcmd, sizeof(rcmd), activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
-}
-
-int MFPCommitPerso(bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
-	uint8_t rcmd[1] = {0xaa};
-	
-	return intExchangeRAW14aPlus(rcmd, sizeof(rcmd), activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
-}
-
-int MFPReadBlock(mf4Session *session, bool plain, uint8_t blockNum, uint8_t blockCount, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen, uint8_t *mac) {
-	uint8_t rcmd[4 + 8] = {(plain?(0x37):(0x33)), blockNum, 0x00, blockCount}; 
-	if (!plain && session)
-		CalculateMAC(session, mtypReadCmd, blockNum, blockCount, rcmd, 4, &rcmd[4], VerboseMode);
-	
-	int res = intExchangeRAW14aPlus(rcmd, plain?4:sizeof(rcmd), activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
-	if(res)
-		return res;
-
-	if (session) 
-		session->R_Ctr++;
-	
-	if(session && mac && *dataoutlen > 11)
-		CalculateMAC(session, mtypReadResp, blockNum, blockCount, dataout, *dataoutlen - 8 - 2, mac, VerboseMode);
-	
-	return 0;
-}
-
-int MFPWriteBlock(mf4Session *session, uint8_t blockNum, uint8_t *data, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen, uint8_t *mac) {
-	uint8_t rcmd[1 + 2 + 16 + 8] = {0xA3, blockNum, 0x00};
-	memmove(&rcmd[3], data, 16);
-	if (session)
-		CalculateMAC(session, mtypWriteCmd, blockNum, 1, rcmd, 19, &rcmd[19], VerboseMode);
-	
-	int res = intExchangeRAW14aPlus(rcmd, sizeof(rcmd), activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
-	if(res)
-		return res;
-
-	if (session) 
-		session->W_Ctr++;
-	
-	if(session && mac && *dataoutlen > 3)
-		CalculateMAC(session, mtypWriteResp, blockNum, 1, dataout, *dataoutlen, mac, VerboseMode);
-	
-	return 0;
-}
-
 int CmdHFMFPInfo(const char *cmd) {
 	
 	if (cmd && strlen(cmd) > 0)
@@ -230,7 +135,7 @@ int CmdHFMFPWritePerso(const char *cmd) {
 	CLIGetHexWithReturn(3, key, &keyLen);
 	CLIParserFree();
 	
-	SetVerboseMode(verbose);
+	mfpSetVerboseMode(verbose);
 	
 	if (!keyLen) {
 		memmove(key, DefaultKey, 16);
@@ -261,7 +166,7 @@ int CmdHFMFPWritePerso(const char *cmd) {
 	}
 
 	if (data[0] != 0x90) {
-		PrintAndLogEx(ERR, "Command error: %02x %s", data[0], GetErrorDescription(data[0]));
+		PrintAndLogEx(ERR, "Command error: %02x %s", data[0], mfpGetErrorDescription(data[0]));
 		return 1;
 	}
 	PrintAndLogEx(INFO, "Write OK.");
@@ -305,7 +210,7 @@ int CmdHFMFPInitPerso(const char *cmd) {
 	if (!keyLen)
 		memmove(key, DefaultKey, 16);
 
-	SetVerboseMode(verbose2);
+	mfpSetVerboseMode(verbose2);
 	for (uint16_t sn = 0x4000; sn < 0x4050; sn++) {
 		keyNum[0] = sn >> 8;
 		keyNum[1] = sn & 0xff;
@@ -320,7 +225,7 @@ int CmdHFMFPInitPerso(const char *cmd) {
 		}
 	}
 	
-	SetVerboseMode(verbose);
+	mfpSetVerboseMode(verbose);
 	for (int i = 0; i < sizeof(CardAddresses) / 2; i++) {
 		keyNum[0] = CardAddresses[i] >> 8;
 		keyNum[1] = CardAddresses[i] & 0xff;
@@ -361,7 +266,7 @@ int CmdHFMFPCommitPerso(const char *cmd) {
 	bool verbose = arg_get_lit(1);
 	CLIParserFree();
 	
-	SetVerboseMode(verbose);
+	mfpSetVerboseMode(verbose);
 	
 	uint8_t data[250] = {0};
 	int datalen = 0;
@@ -378,7 +283,7 @@ int CmdHFMFPCommitPerso(const char *cmd) {
 	}
 
 	if (data[0] != 0x90) {
-		PrintAndLogEx(ERR, "Command error: %02x %s", data[0], GetErrorDescription(data[0]));
+		PrintAndLogEx(ERR, "Command error: %02x %s", data[0], mfpGetErrorDescription(data[0]));
 		return 1;
 	}
 	PrintAndLogEx(INFO, "Switch level OK.");
@@ -454,7 +359,7 @@ int CmdHFMFPRdbl(const char *cmd) {
 	CLIGetHexWithReturn(6, key, &keylen);
 	CLIParserFree();
 	
-	SetVerboseMode(verbose);
+	mfpSetVerboseMode(verbose);
 
 	if (!keylen) {
 		memmove(key, DefaultKey, 16);
@@ -505,7 +410,7 @@ int CmdHFMFPRdbl(const char *cmd) {
 	}
 	
 	if (datalen && data[0] != 0x90) {
-		PrintAndLogEx(ERR, "Card read error: %02x %s", data[0], GetErrorDescription(data[0]));
+		PrintAndLogEx(ERR, "Card read error: %02x %s", data[0], mfpGetErrorDescription(data[0]));
 		return 6;
 	}
 	
@@ -564,7 +469,7 @@ int CmdHFMFPRdsc(const char *cmd) {
 	CLIGetHexWithReturn(5, key, &keylen);
 	CLIParserFree();
 	
-	SetVerboseMode(verbose);
+	mfpSetVerboseMode(verbose);
 
 	if (!keylen) {
 		memmove(key, DefaultKey, 16);
@@ -606,7 +511,7 @@ int CmdHFMFPRdsc(const char *cmd) {
 		}
 		
 		if (datalen && data[0] != 0x90) {
-			PrintAndLogEx(ERR, "Card read error: %02x %s", data[0], GetErrorDescription(data[0]));
+			PrintAndLogEx(ERR, "Card read error: %02x %s", data[0], mfpGetErrorDescription(data[0]));
 			DropField();
 			return 6;
 		}
@@ -662,7 +567,7 @@ int CmdHFMFPWrbl(const char *cmd) {
 	CLIGetHexWithReturn(5, key, &keylen);
 	CLIParserFree();
 	
-	SetVerboseMode(verbose);
+	mfpSetVerboseMode(verbose);
 
 	if (!keylen) {
 		memmove(key, DefaultKey, 16);
@@ -715,7 +620,7 @@ int CmdHFMFPWrbl(const char *cmd) {
 	}
 	
 	if (datalen && data[0] != 0x90) {
-		PrintAndLogEx(ERR, "Card write error: %02x %s", data[0], GetErrorDescription(data[0]));
+		PrintAndLogEx(ERR, "Card write error: %02x %s", data[0], mfpGetErrorDescription(data[0]));
 		DropField();
 		return 6;
 	}
@@ -734,68 +639,6 @@ int CmdHFMFPWrbl(const char *cmd) {
 	return 0;
 }
 
-int mfpReadSector(uint8_t sectorNo, uint8_t keyType, uint8_t *key, uint8_t *dataout, bool verbose){
-	uint8_t keyn[2] = {0};
-	bool plain = false;
-	
-	uint16_t uKeyNum = 0x4000 + sectorNo * 2 + (keyType ? 1 : 0);
-	keyn[0] = uKeyNum >> 8;
-	keyn[1] = uKeyNum & 0xff;
-	if (verbose)
-		PrintAndLogEx(INFO, "--sector[%d]:%02x key:%04x", mfNumBlocksPerSector(sectorNo), sectorNo, uKeyNum);
-	
-	mf4Session session;
-	int res = MifareAuth4(&session, keyn, key, true, true, verbose);
-	if (res) {
-		PrintAndLogEx(ERR, "Sector %d authentication error: %d", sectorNo, res);
-		return res;
-	}
-	
-	uint8_t data[250] = {0};
-	int datalen = 0;
-	uint8_t mac[8] = {0};
-	uint8_t firstBlockNo = mfFirstBlockOfSector(sectorNo);
-	for(int n = firstBlockNo; n < firstBlockNo + mfNumBlocksPerSector(sectorNo); n++) {
-		res = MFPReadBlock(&session, plain, n & 0xff, 1, false, true, data, sizeof(data), &datalen, mac);
-		if (res) {
-			PrintAndLogEx(ERR, "Sector %d read error: %d", sectorNo, res);
-			DropField();
-			return res;
-		}
-		
-		if (datalen && data[0] != 0x90) {
-			PrintAndLogEx(ERR, "Sector %d card read error: %02x %s", sectorNo, data[0], GetErrorDescription(data[0]));
-			DropField();
-			return 5;
-		}
-		if (datalen != 1 + 16 + 8 + 2) {
-			PrintAndLogEx(ERR, "Sector %d error returned data length:%d", sectorNo, datalen);
-			DropField();
-			return 6;
-		}
-
-		memcpy(&dataout[(n - firstBlockNo) * 16], &data[1], 16);
-		
-		if (verbose)
-			PrintAndLogEx(INFO, "data[%03d]: %s", n, sprint_hex(&data[1], 16));
-			
-		if (memcmp(&data[1 + 16], mac, 8)) {
-			PrintAndLogEx(WARNING, "WARNING: mac on block %d not equal...", n);
-			PrintAndLogEx(WARNING, "MAC   card: %s", sprint_hex(&data[1 + 16], 8));
-			PrintAndLogEx(WARNING, "MAC reader: %s", sprint_hex(mac, 8));
-			
-			if (!verbose)
-				return 7;			
-		} else {	
-			if(verbose)
-				PrintAndLogEx(INFO, "MAC: %s", sprint_hex(&data[1 + 16], 8));
-		}
-	}
-	DropField();
-
-	return 0;	
-}
-
 int CmdHFMFPMAD(const char *cmd) {
 
 	CLIParserInit("hf mfp mad", 
diff --git a/client/mifare/mifare4.c b/client/mifare/mifare4.c
index 0c53a1f9b..3fe67077f 100644
--- a/client/mifare/mifare4.c
+++ b/client/mifare/mifare4.c
@@ -17,6 +17,39 @@
 #include "ui.h"
 #include "crypto/libpcrypto.h"
 
+static bool VerboseMode = false;
+void mfpSetVerboseMode(bool verbose) {
+	VerboseMode = verbose;
+}
+
+typedef struct {
+	uint8_t Code;
+	const char *Description;
+} PlusErrorsElm;
+
+static const PlusErrorsElm PlusErrors[] = {
+	{0xFF, ""},
+	{0x00, "Transfer cannot be granted within the current authentication."},
+	{0x06, "Access Conditions not fulfilled. Block does not exist, block is not a value block."},
+	{0x07, "Too many read or write commands in the session or in the transaction."},
+	{0x08, "Invalid MAC in command or response"},
+	{0x09, "Block Number is not valid"},
+	{0x0a, "Invalid block number, not existing block number"},
+	{0x0b, "The current command code not available at the current card state."},
+	{0x0c, "Length error"},
+	{0x0f, "General Manipulation Error. Failure in the operation of the PICC (cannot write to the data block), etc."},
+	{0x90, "OK"},
+};
+int PlusErrorsLen = sizeof(PlusErrors) / sizeof(PlusErrorsElm);
+
+const char * mfpGetErrorDescription(uint8_t errorCode) {
+	for(int i = 0; i < PlusErrorsLen; i++)
+		if (errorCode == PlusErrors[i].Code)
+			return PlusErrors[i].Description;
+		
+	return PlusErrors[0].Description;
+}
+
 AccessConditions_t MFAccessConditions[] = {
 	{0x00, "rdAB wrAB incAB dectrAB"},
 	{0x01, "rdAB dectrAB"},
@@ -274,6 +307,130 @@ int MifareAuth4(mf4Session *session, uint8_t *keyn, uint8_t *key, bool activateF
 	return 0;
 }
 
+int intExchangeRAW14aPlus(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
+	if(VerboseMode)
+		PrintAndLogEx(INFO, ">>> %s", sprint_hex(datain, datainlen));
+	
+	int res = ExchangeRAW14a(datain, datainlen, activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
+
+	if(VerboseMode)
+		PrintAndLogEx(INFO, "<<< %s", sprint_hex(dataout, *dataoutlen));
+	
+	return res;
+}
+
+int MFPWritePerso(uint8_t *keyNum, uint8_t *key, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
+	uint8_t rcmd[3 + 16] = {0xa8, keyNum[1], keyNum[0], 0x00};
+	memmove(&rcmd[3], key, 16);
+	
+	return intExchangeRAW14aPlus(rcmd, sizeof(rcmd), activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
+}
+
+int MFPCommitPerso(bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
+	uint8_t rcmd[1] = {0xaa};
+	
+	return intExchangeRAW14aPlus(rcmd, sizeof(rcmd), activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
+}
+
+int MFPReadBlock(mf4Session *session, bool plain, uint8_t blockNum, uint8_t blockCount, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen, uint8_t *mac) {
+	uint8_t rcmd[4 + 8] = {(plain?(0x37):(0x33)), blockNum, 0x00, blockCount}; 
+	if (!plain && session)
+		CalculateMAC(session, mtypReadCmd, blockNum, blockCount, rcmd, 4, &rcmd[4], VerboseMode);
+	
+	int res = intExchangeRAW14aPlus(rcmd, plain?4:sizeof(rcmd), activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
+	if(res)
+		return res;
+
+	if (session) 
+		session->R_Ctr++;
+	
+	if(session && mac && *dataoutlen > 11)
+		CalculateMAC(session, mtypReadResp, blockNum, blockCount, dataout, *dataoutlen - 8 - 2, mac, VerboseMode);
+	
+	return 0;
+}
+
+int MFPWriteBlock(mf4Session *session, uint8_t blockNum, uint8_t *data, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen, uint8_t *mac) {
+	uint8_t rcmd[1 + 2 + 16 + 8] = {0xA3, blockNum, 0x00};
+	memmove(&rcmd[3], data, 16);
+	if (session)
+		CalculateMAC(session, mtypWriteCmd, blockNum, 1, rcmd, 19, &rcmd[19], VerboseMode);
+	
+	int res = intExchangeRAW14aPlus(rcmd, sizeof(rcmd), activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
+	if(res)
+		return res;
+
+	if (session) 
+		session->W_Ctr++;
+	
+	if(session && mac && *dataoutlen > 3)
+		CalculateMAC(session, mtypWriteResp, blockNum, 1, dataout, *dataoutlen, mac, VerboseMode);
+	
+	return 0;
+}
+
+int mfpReadSector(uint8_t sectorNo, uint8_t keyType, uint8_t *key, uint8_t *dataout, bool verbose){
+	uint8_t keyn[2] = {0};
+	bool plain = false;
+	
+	uint16_t uKeyNum = 0x4000 + sectorNo * 2 + (keyType ? 1 : 0);
+	keyn[0] = uKeyNum >> 8;
+	keyn[1] = uKeyNum & 0xff;
+	if (verbose)
+		PrintAndLogEx(INFO, "--sector[%d]:%02x key:%04x", mfNumBlocksPerSector(sectorNo), sectorNo, uKeyNum);
+	
+	mf4Session session;
+	int res = MifareAuth4(&session, keyn, key, true, true, verbose);
+	if (res) {
+		PrintAndLogEx(ERR, "Sector %d authentication error: %d", sectorNo, res);
+		return res;
+	}
+	
+	uint8_t data[250] = {0};
+	int datalen = 0;
+	uint8_t mac[8] = {0};
+	uint8_t firstBlockNo = mfFirstBlockOfSector(sectorNo);
+	for(int n = firstBlockNo; n < firstBlockNo + mfNumBlocksPerSector(sectorNo); n++) {
+		res = MFPReadBlock(&session, plain, n & 0xff, 1, false, true, data, sizeof(data), &datalen, mac);
+		if (res) {
+			PrintAndLogEx(ERR, "Sector %d read error: %d", sectorNo, res);
+			DropField();
+			return res;
+		}
+		
+		if (datalen && data[0] != 0x90) {
+			PrintAndLogEx(ERR, "Sector %d card read error: %02x %s", sectorNo, data[0], mfpGetErrorDescription(data[0]));
+			DropField();
+			return 5;
+		}
+		if (datalen != 1 + 16 + 8 + 2) {
+			PrintAndLogEx(ERR, "Sector %d error returned data length:%d", sectorNo, datalen);
+			DropField();
+			return 6;
+		}
+
+		memcpy(&dataout[(n - firstBlockNo) * 16], &data[1], 16);
+		
+		if (verbose)
+			PrintAndLogEx(INFO, "data[%03d]: %s", n, sprint_hex(&data[1], 16));
+			
+		if (memcmp(&data[1 + 16], mac, 8)) {
+			PrintAndLogEx(WARNING, "WARNING: mac on block %d not equal...", n);
+			PrintAndLogEx(WARNING, "MAC   card: %s", sprint_hex(&data[1 + 16], 8));
+			PrintAndLogEx(WARNING, "MAC reader: %s", sprint_hex(mac, 8));
+			
+			if (!verbose)
+				return 7;			
+		} else {	
+			if(verbose)
+				PrintAndLogEx(INFO, "MAC: %s", sprint_hex(&data[1 + 16], 8));
+		}
+	}
+	DropField();
+
+	return 0;	
+}
+
 // Mifare Memory Structure: up to 32 Sectors with 4 blocks each (1k and 2k cards),
 // plus evtl. 8 sectors with 16 blocks each (4k cards)
 uint8_t mfNumBlocksPerSector(uint8_t sectorNo) {
diff --git a/client/mifare/mifare4.h b/client/mifare/mifare4.h
index 011567a1e..e4bf6e386 100644
--- a/client/mifare/mifare4.h
+++ b/client/mifare/mifare4.h
@@ -43,9 +43,18 @@ typedef struct {
 	char *description;
 } AccessConditions_t;
 
+extern void mfpSetVerboseMode(bool verbose);
+extern const char * mfpGetErrorDescription(uint8_t errorCode);
+	
 extern int CalculateMAC(mf4Session *session, MACType_t mtype, uint8_t blockNum, uint8_t blockCount, uint8_t *data, int datalen, uint8_t *mac, bool verbose);
 extern int MifareAuth4(mf4Session *session, uint8_t *keyn, uint8_t *key, bool activateField, bool leaveSignalON, bool verbose);
 
+extern int MFPWritePerso(uint8_t *keyNum, uint8_t *key, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen);
+extern int MFPCommitPerso(bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen);
+extern int MFPReadBlock(mf4Session *session, bool plain, uint8_t blockNum, uint8_t blockCount, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen, uint8_t *mac);
+extern int MFPWriteBlock(mf4Session *session, uint8_t blockNum, uint8_t *data, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen, uint8_t *mac);
+extern int mfpReadSector(uint8_t sectorNo, uint8_t keyType, uint8_t *key, uint8_t *dataout, bool verbose);
+
 extern char *mfGetAccessConditionsDesc(uint8_t blockn, uint8_t *data);
 
 extern uint8_t mfNumBlocksPerSector(uint8_t sectorNo);

From 979aa678ad7c70ea62541bf2019e060f359f23ae Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Fri, 1 Mar 2019 19:07:34 +0200
Subject: [PATCH 0635/1938] small fix

---
 client/cmdhfmf.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index a7966bee8..eea26f170 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -3230,8 +3230,8 @@ int CmdHF14AMfMAD(const char *cmd) {
 	bool haveMAD2 = false;
 	MAD1DecodeAndPrint(sector, verbose, &haveMAD2);
 	
-	if (haveMAD2) { // MF_MAD2_SECTOR
-		if (mfReadSector(1, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector)) {
+	if (haveMAD2) {
+		if (mfReadSector(MF_MAD2_SECTOR, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector)) {
 			PrintAndLogEx(ERR, "read sector 0x10 error. card don't have MAD or don't have MAD on default keys.");
 			return 2;
 		}

From 3a98c9fcd32cf9b4c6c10705d25df46fe7b57061 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Fri, 1 Mar 2019 19:13:59 +0200
Subject: [PATCH 0636/1938] fix mad2 crc8 check

---
 client/mifare/mad.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/client/mifare/mad.c b/client/mifare/mad.c
index 3973116b4..ff6991f22 100644
--- a/client/mifare/mad.c
+++ b/client/mifare/mad.c
@@ -109,13 +109,19 @@ static const char *GetAIDDescription(uint16_t AID) {
 
 int madCRCCheck(uint8_t *sector, bool verbose, int MADver) {
 	if (MADver == 1) {
-		uint8_t crc = CRC8Mad(&sector[16 + 1], 31);
+		uint8_t crc = CRC8Mad(&sector[16 + 1], 15 + 16);
 		if (crc != sector[16]) {
 			if (verbose)
 				PrintAndLogEx(ERR, "Wrong MAD%d CRC. Calculated: 0x%02x, from card: 0x%02x", MADver, crc, sector[16]);
 			return 3;
 		};
 	} else {
+		uint8_t crc = CRC8Mad(&sector[1], 15 + 16 + 16);
+		if (crc != sector[0]) {
+			if (verbose)
+				PrintAndLogEx(ERR, "Wrong MAD%d CRC. Calculated: 0x%02x, from card: 0x%02x", MADver, crc, sector[16]);
+			return 3;
+		};
 	}
 	
 	return 0;
@@ -191,6 +197,9 @@ int MAD2DecodeAndPrint(uint8_t *sector, bool verbose) {
 	if (res)
 		return res;	
 
+	if (verbose)
+		PrintAndLogEx(NORMAL, "CRC8-MAD OK.");
+
 	uint8_t InfoByte = sector[1] & 0x3f;
 	PrintAndLogEx(NORMAL, "MAD2 Card publisher sector: 0x%02x", InfoByte);
 

From e8c0a49d076519b37f05cbe0f0c1d0a3dd91ceb2 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Fri, 1 Mar 2019 19:39:17 +0200
Subject: [PATCH 0637/1938] changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 673b25f8b..a99c8c522 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -102,6 +102,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
  - Added `hf emv` `gpo`, `readrec`, `genac`, `challenge`, `intauth` - separate commands from `hf emc exec` (@merlokk)
  - Added  `hf fido` `assert` and `make` commands from fido2 protocol (authenticatorMakeCredential and authenticatorGetAssertion) (@merlokk)
  - Added trailer block decoding to `hf mf rdbl` and `hf mf cgetbl` (@merlokk)
+ - Added `hf mf mad` and `hf mfp mad` MAD decode, check and print commands (@merlokk)
  
 ### Fixed
 - Changed driver file proxmark3.inf to support both old and new Product/Vendor IDs (piwi)

From dcdb2ee2182325a9f9652acc30a19853d24d53d8 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Fri, 1 Mar 2019 19:24:02 +0100
Subject: [PATCH 0638/1938] fix: 'script run ndef_dump.lua' - move function

---
 client/scripts/ndef_dump.lua | 37 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/client/scripts/ndef_dump.lua b/client/scripts/ndef_dump.lua
index a0eda5b7f..f1bf70ddd 100644
--- a/client/scripts/ndef_dump.lua
+++ b/client/scripts/ndef_dump.lua
@@ -66,8 +66,6 @@ local utils = {
 	end,
 }
 
-
-
 --- 
 -- Usage help
 local function help()
@@ -83,6 +81,24 @@ local function debug(...)
 end
 
 
+--- This function is a lua-implementation of
+-- cmdhf14a.c:waitCmd(uint8_t iSelect)
+local function waitCmd(iSelect)
+	local response = core.WaitForResponseTimeout(cmds.CMD_ACK,1000)
+	if response then
+		local count,cmd,arg0,arg1,arg2 = bin.unpack('LLLL',response)
+		
+		local iLen = arg0
+		if iSelect then	iLen = arg1 end
+	    debug(("Received %i octets (arg0:%d, arg1:%d)"):format(iLen, arg0, arg1))
+	    if iLen == 0 then return nil, "No response from tag" end
+		local recv = string.sub(response,count, iLen+count-1)
+	    return recv
+	end
+	return nil, "No response from device"
+end
+
+
 local function show(data)
 	if DEBUG then
 	    local formatString = ("H%d"):format(string.len(data))
@@ -156,23 +172,6 @@ local function getBlock(block)
 end
 
 
---- This function is a lua-implementation of
--- cmdhf14a.c:waitCmd(uint8_t iSelect)
-local function waitCmd(iSelect)
-	local response = core.WaitForResponseTimeout(cmds.CMD_ACK,1000)
-	if response then
-		local count,cmd,arg0,arg1,arg2 = bin.unpack('LLLL',response)
-		
-		local iLen = arg0
-		if iSelect then	iLen = arg1 end
-	    debug(("Received %i octets (arg0:%d, arg1:%d)"):format(iLen, arg0, arg1))
-	    if iLen == 0 then return nil, "No response from tag" end
-		local recv = string.sub(response,count, iLen+count-1)
-	    return recv
-	end
-	return nil, "No response from device"
-end
-
 
 
 local function main( args)

From 2c07bb790c2469cdc9a9577d21c4194717877e04 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Mon, 4 Mar 2019 19:18:44 +0200
Subject: [PATCH 0639/1938] `hf mfp mad` read contents by aid

---
 client/cmdhfmfp.c             | 64 ++++++++++++++++++++++++++----
 client/mifare/mad.c           | 73 ++++++++++++++++++++++++++++++-----
 client/mifare/mad.h           |  6 ++-
 client/mifare/mifaredefault.h |  5 ++-
 4 files changed, 128 insertions(+), 20 deletions(-)

diff --git a/client/cmdhfmfp.c b/client/cmdhfmfp.c
index 43c8d645d..e6363d64c 100644
--- a/client/cmdhfmfp.c
+++ b/client/cmdhfmfp.c
@@ -643,20 +643,38 @@ int CmdHFMFPMAD(const char *cmd) {
 
 	CLIParserInit("hf mfp mad", 
 		"Checks and prints Mifare Application Directory (MAD)", 
-		"Usage:\n\thf mfp mad -> shows MAD if exists\n");
+		"Usage:\n\thf mfp mad -> shows MAD if exists\n"
+			"\thf mfp mad -a 03e1 -k d3f7d3f7d3f7d3f7d3f7d3f7d3f7d3f7 -> shows NDEF data if exists\n");
 
 	void* argtable[] = {
 		arg_param_begin,
 		arg_lit0("vV",  "verbose",  "show technical data"),
+		arg_str0("aA",  "aid",      "print all sectors with aid", NULL),
+		arg_str0("kK",  "key",      "key for printing sectors", NULL),
+		arg_lit0("bB",  "keyb",     "use key B for access printing sectors (by default: key A)"),
 		arg_param_end
 	};
 	CLIExecWithReturn(cmd, argtable, true);
+	
 	bool verbose = arg_get_lit(1);
+	uint8_t aid[2] = {0};
+	int aidlen;
+	CLIGetHexWithReturn(2, aid, &aidlen);
+	uint8_t key[16] = {0};
+	int keylen;
+	CLIGetHexWithReturn(3, key, &keylen);
+	bool keyB = arg_get_lit(4);
 	
 	CLIParserFree();
+	
+	if (aidlen != 2 && keylen > 0) {
+		PrintAndLogEx(WARNING, "do not need a key without aid.");
+	}
 
-	uint8_t sector[16 * 4] = {0};
-	if (mfpReadSector(MF_MAD1_SECTOR, MF_KEY_A, (uint8_t *)g_mifarep_mad_key, sector, verbose)) {
+	uint8_t sector0[16 * 4] = {0};
+	uint8_t sector10[16 * 4] = {0};
+	
+	if (mfpReadSector(MF_MAD1_SECTOR, MF_KEY_A, (uint8_t *)g_mifarep_mad_key, sector0, verbose)) {
 		PrintAndLogEx(NORMAL, "");
 		PrintAndLogEx(ERR, "read sector 0 error. card don't have MAD or don't have MAD on default keys.");
 		return 2;
@@ -664,20 +682,52 @@ int CmdHFMFPMAD(const char *cmd) {
 	
 	if (verbose) {
 		for(int i = 0; i < 4; i ++)
-			PrintAndLogEx(NORMAL, "[%d] %s", i, sprint_hex(&sector[i * 16], 16));		
+			PrintAndLogEx(NORMAL, "[%d] %s", i, sprint_hex(&sector0[i * 16], 16));		
 	}
 
 	bool haveMAD2 = false;
-	MAD1DecodeAndPrint(sector, verbose, &haveMAD2);
+	MAD1DecodeAndPrint(sector0, verbose, &haveMAD2);
 	
 	if (haveMAD2) {
-		if (mfpReadSector(MF_MAD2_SECTOR, MF_KEY_A, (uint8_t *)g_mifarep_mad_key, sector, verbose)) {
+		if (mfpReadSector(MF_MAD2_SECTOR, MF_KEY_A, (uint8_t *)g_mifarep_mad_key, sector10, verbose)) {
 			PrintAndLogEx(NORMAL, "");
 			PrintAndLogEx(ERR, "read sector 0x10 error. card don't have MAD or don't have MAD on default keys.");
 			return 2;
 		}
 
-		MAD2DecodeAndPrint(sector, verbose);
+		MAD2DecodeAndPrint(sector10, verbose);
+	}
+
+	if (aidlen == 2) {
+		uint16_t aaid = (aid[0] << 8) + aid[1];
+		PrintAndLogEx(NORMAL, "\n-------------- AID 0x%04x ---------------", aaid);
+		
+		uint16_t mad[7 + 8 + 8 + 8 + 8] = {0};
+		size_t madlen = 0;
+		if (MADDecode(sector0, sector10, mad, &madlen)) {
+			PrintAndLogEx(ERR, "can't decode mad.");
+			return 10;
+		}
+
+		uint8_t akey[16] = {0};
+		memcpy(akey, g_mifarep_ndef_key, 16);
+		if (keylen == 16) {
+			memcpy(akey, key, 16);
+		}
+		
+		for (int i = 0; i < madlen; i++) {
+			if (aaid == mad[i]) {
+				uint8_t vsector[16 * 4] = {0};
+				if (mfpReadSector(i + 1, keyB ? MF_KEY_B : MF_KEY_A, akey, vsector, false)) {
+					PrintAndLogEx(NORMAL, "");
+					PrintAndLogEx(ERR, "read sector %d error.", i + 1);
+					return 2;
+				}
+				
+				for(int j = 0; j < (verbose ? 4 : 3); j ++)
+					PrintAndLogEx(NORMAL, "---[%03d] %s", (i + 1) * 4 + j, sprint_hex(&vsector[j * 16], 16));		
+			}
+		}		
 	}
 	
 	return 0;
diff --git a/client/mifare/mad.c b/client/mifare/mad.c
index ff6991f22..34ea50cfc 100644
--- a/client/mifare/mad.c
+++ b/client/mifare/mad.c
@@ -134,10 +134,13 @@ uint16_t madGetAID(uint8_t *sector, int MADver, int sectorNo) {
 		return (sector[2 + (sectorNo - 1) * 2] << 8) + (sector[2 + (sectorNo - 1) * 2 + 1]);	
 }
 
-int MAD1DecodeAndPrint(uint8_t *sector, bool verbose, bool *haveMAD2) {
+int MADCheck(uint8_t *sector0, uint8_t *sector10, bool verbose, bool *haveMAD2) {
+	if (!sector0)
+		return 1;
 	
-	uint8_t GPB = sector[3 * 16 + 9];
-	PrintAndLogEx(NORMAL, "GPB: 0x%02x", GPB);
+	uint8_t GPB = sector0[3 * 16 + 9];
+	if (verbose)
+		PrintAndLogEx(NORMAL, "GPB: 0x%02x", GPB);
 	
 	// DA (MAD available)
 	if (!(GPB & 0x80)) {
@@ -146,13 +149,16 @@ int MAD1DecodeAndPrint(uint8_t *sector, bool verbose, bool *haveMAD2) {
 	}
 	
 	// MA (multi-application card)
-	if (GPB & 0x40)
-		PrintAndLogEx(NORMAL, "Multi application card.");
-	else
-		PrintAndLogEx(NORMAL, "Single application card.");
+	if (verbose) {
+		if (GPB & 0x40)
+			PrintAndLogEx(NORMAL, "Multi application card.");
+		else
+			PrintAndLogEx(NORMAL, "Single application card.");
+	}
 	
 	uint8_t MADVer = GPB & 0x03;
-	PrintAndLogEx(NORMAL, "MAD version: %d", MADVer);
+	if (verbose)
+		PrintAndLogEx(NORMAL, "MAD version: %d", MADVer);
 	
 	//  MAD version
 	if ((MADVer != 0x01) && (MADVer != 0x02)) {
@@ -163,7 +169,56 @@ int MAD1DecodeAndPrint(uint8_t *sector, bool verbose, bool *haveMAD2) {
 	if (haveMAD2)
 		*haveMAD2 = (MADVer == 2);
 
-	int res = madCRCCheck(sector, true, 1);
+	int res = madCRCCheck(sector0, true, 1);
+	if (res)
+		return res;	
+	
+	if (verbose)
+		PrintAndLogEx(NORMAL, "CRC8-MAD1 OK.");
+	
+	if (MADVer == 2 && sector10) {
+		int res = madCRCCheck(sector10, true, 2);
+		if (res)
+			return res;	
+
+		if (verbose)
+			PrintAndLogEx(NORMAL, "CRC8-MAD2 OK.");
+	}
+	
+	return 0;
+}
+
+int MADDecode(uint8_t *sector0, uint8_t *sector10, uint16_t *mad, size_t *madlen) {
+	*madlen = 0;
+	bool haveMAD2 = false;
+	int res = MADCheck(sector0, sector10, false, &haveMAD2);
+	if (res)
+		return res;
+	
+	for (int i = 1; i < 16; i++) {
+		mad[*madlen] = madGetAID(sector0, 1, i);
+		(*madlen)++;
+	}
+	
+	if (haveMAD2) {
+		// mad2 sector (0x10 == 16dec) here
+		mad[*madlen] = 0x0005;
+		(*madlen)++;
+
+		for (int i = 1; i < 24; i++) {
+			mad[*madlen] = madGetAID(sector10, 2, i);
+			(*madlen)++;
+		}
+	}
+	
+	return 0;
+}
+
+
+int MAD1DecodeAndPrint(uint8_t *sector, bool verbose, bool *haveMAD2) {
+
+	// check MAD1 only
+	int res = MADCheck(sector, NULL, verbose, haveMAD2);
 	if (res)
 		return res;	
 	
diff --git a/client/mifare/mad.h b/client/mifare/mad.h
index dc2b2e3c0..ee362adb6 100644
--- a/client/mifare/mad.h
+++ b/client/mifare/mad.h
@@ -19,8 +19,10 @@ typedef struct {
 	const char *Description;
 } madAIDDescr;	
 
-int MAD1DecodeAndPrint(uint8_t *sector, bool verbose, bool *haveMAD2);
-int MAD2DecodeAndPrint(uint8_t *sector, bool verbose);
+extern int MADCheck(uint8_t *sector0, uint8_t *sector10, bool verbose, bool *haveMAD2);
+extern int MADDecode(uint8_t *sector0, uint8_t *sector10, uint16_t *mad, size_t *madlen);
+extern int MAD1DecodeAndPrint(uint8_t *sector, bool verbose, bool *haveMAD2);
+extern int MAD2DecodeAndPrint(uint8_t *sector, bool verbose);
 
 
 #endif // _MAD_H_
diff --git a/client/mifare/mifaredefault.h b/client/mifare/mifaredefault.h
index e7218cbe7..b12a57c03 100644
--- a/client/mifare/mifaredefault.h
+++ b/client/mifare/mifaredefault.h
@@ -42,8 +42,9 @@ static const uint64_t g_mifare_default_keys[] =
 	0x96a301bce267
 };
 
-static const uint8_t g_mifare_mad_key[] = {0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5};
+static const uint8_t g_mifare_mad_key[] =  {0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5};
 static const uint8_t g_mifare_ndef_key[] = {0xd3, 0xf7, 0xd3, 0xf7, 0xd3, 0xf7};
-static const uint8_t g_mifarep_mad_key[] = {0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7};
+static const uint8_t g_mifarep_mad_key[] =  {0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7};
+static const uint8_t g_mifarep_ndef_key[] = {0xd3, 0xf7, 0xd3, 0xf7, 0xd3, 0xf7, 0xd3, 0xf7, 0xd3, 0xf7, 0xd3, 0xf7, 0xd3, 0xf7, 0xd3, 0xf7};
 
 #endif

From f45c330843546a271f3b089368771f7bb54ed47e Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Mon, 4 Mar 2019 19:25:13 +0200
Subject: [PATCH 0640/1938] small visual fixes

---
 client/cmdhfmfp.c       | 2 +-
 client/mifare/mifare4.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/client/cmdhfmfp.c b/client/cmdhfmfp.c
index e6363d64c..725dbca04 100644
--- a/client/cmdhfmfp.c
+++ b/client/cmdhfmfp.c
@@ -725,7 +725,7 @@ int CmdHFMFPMAD(const char *cmd) {
 				}
 				
 				for(int j = 0; j < (verbose ? 4 : 3); j ++)
-					PrintAndLogEx(NORMAL, "---[%03d] %s", (i + 1) * 4 + j, sprint_hex(&vsector[j * 16], 16));		
+					PrintAndLogEx(NORMAL, " [%03d] %s", (i + 1) * 4 + j, sprint_hex(&vsector[j * 16], 16));		
 			}
 		}		
 	}
diff --git a/client/mifare/mifare4.c b/client/mifare/mifare4.c
index 3fe67077f..c95529a84 100644
--- a/client/mifare/mifare4.c
+++ b/client/mifare/mifare4.c
@@ -302,7 +302,8 @@ int MifareAuth4(mf4Session *session, uint8_t *keyn, uint8_t *key, bool activateF
 		memmove(session->Kmac, kmac, 16);
 	}
 	
-	PrintAndLogEx(INFO, "Authentication OK");
+	if (verbose)
+		PrintAndLogEx(INFO, "Authentication OK");
 	
 	return 0;
 }

From 9c8e60cf0338e0a07885b2830fd26052eaff32f2 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Mon, 4 Mar 2019 19:44:19 +0200
Subject: [PATCH 0641/1938] added to `hf mf mad`

---
 client/cmdhfmf.c | 62 ++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 55 insertions(+), 7 deletions(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 6c6bc48e0..8823ea2d9 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -3219,39 +3219,87 @@ int CmdHF14AMfMAD(const char *cmd) {
 
 	CLIParserInit("hf mf mad", 
 		"Checks and prints Mifare Application Directory (MAD)", 
-		"Usage:\n\thf mf mad -> shows MAD if exists\n");
+		"Usage:\n\thf mf mad -> shows MAD if exists\n"
+			"\thf mf mad -a 03e1 -k d3f7d3f7d3f7 -> shows NDEF data if exists\n");
 
 	void* argtable[] = {
 		arg_param_begin,
 		arg_lit0("vV",  "verbose",  "show technical data"),
+		arg_str0("aA",  "aid",      "print all sectors with aid", NULL),
+		arg_str0("kK",  "key",      "key for printing sectors", NULL),
+		arg_lit0("bB",  "keyb",     "use key B for access printing sectors (by default: key A)"),
 		arg_param_end
 	};
 	CLIExecWithReturn(cmd, argtable, true);
 	bool verbose = arg_get_lit(1);
+	uint8_t aid[2] = {0};
+	int aidlen;
+	CLIGetHexWithReturn(2, aid, &aidlen);
+	uint8_t key[6] = {0};
+	int keylen;
+	CLIGetHexWithReturn(3, key, &keylen);
+	bool keyB = arg_get_lit(4);
 	
 	CLIParserFree();
 
-	uint8_t sector[16 * 4] = {0};
-	if (mfReadSector(MF_MAD1_SECTOR, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector)) {
+	if (aidlen != 2 && keylen > 0) {
+		PrintAndLogEx(WARNING, "do not need a key without aid.");
+	}
+
+	uint8_t sector0[16 * 4] = {0};
+	uint8_t sector10[16 * 4] = {0};
+	if (mfReadSector(MF_MAD1_SECTOR, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector0)) {
 		PrintAndLogEx(ERR, "read sector 0 error. card don't have MAD or don't have MAD on default keys.");
 		return 2;
 	}
 	
 	if (verbose) {
 		for(int i = 0; i < 4; i ++)
-			PrintAndLogEx(NORMAL, "[%d] %s", i, sprint_hex(&sector[i * 16], 16));		
+			PrintAndLogEx(NORMAL, "[%d] %s", i, sprint_hex(&sector0[i * 16], 16));		
 	}
 
 	bool haveMAD2 = false;
-	MAD1DecodeAndPrint(sector, verbose, &haveMAD2);
+	MAD1DecodeAndPrint(sector0, verbose, &haveMAD2);
 	
 	if (haveMAD2) {
-		if (mfReadSector(MF_MAD2_SECTOR, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector)) {
+		if (mfReadSector(MF_MAD2_SECTOR, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector10)) {
 			PrintAndLogEx(ERR, "read sector 0x10 error. card don't have MAD or don't have MAD on default keys.");
 			return 2;
 		}
 
-		MAD2DecodeAndPrint(sector, verbose);
+		MAD2DecodeAndPrint(sector10, verbose);
+	}
+
+	if (aidlen == 2) {
+		uint16_t aaid = (aid[0] << 8) + aid[1];
+		PrintAndLogEx(NORMAL, "\n-------------- AID 0x%04x ---------------", aaid);
+		
+		uint16_t mad[7 + 8 + 8 + 8 + 8] = {0};
+		size_t madlen = 0;
+		if (MADDecode(sector0, sector10, mad, &madlen)) {
+			PrintAndLogEx(ERR, "can't decode mad.");
+			return 10;
+		}
+
+		uint8_t akey[6] = {0};
+		memcpy(akey, g_mifare_ndef_key, 6);
+		if (keylen == 6) {
+			memcpy(akey, key, 6);
+		}
+		
+		for (int i = 0; i < madlen; i++) {
+			if (aaid == mad[i]) {
+				uint8_t vsector[16 * 4] = {0};
+				if (mfReadSector(i + 1, keyB ? MF_KEY_B : MF_KEY_A, akey, vsector)) {
+					PrintAndLogEx(NORMAL, "");
+					PrintAndLogEx(ERR, "read sector %d error.", i + 1);
+					return 2;
+				}
+				
+				for(int j = 0; j < (verbose ? 4 : 3); j ++)
+					PrintAndLogEx(NORMAL, " [%03d] %s", (i + 1) * 4 + j, sprint_hex(&vsector[j * 16], 16));		
+			}
+		}		
 	}
 	
 	return 0;

From 54e81967742b688e98148a14b21db306b70b8e0d Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Mon, 4 Mar 2019 20:04:24 +0200
Subject: [PATCH 0642/1938] `hf mfp ndef` sketch

---
 client/cmdhfmfp.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/client/cmdhfmfp.c b/client/cmdhfmfp.c
index 725dbca04..ce31ff03a 100644
--- a/client/cmdhfmfp.c
+++ b/client/cmdhfmfp.c
@@ -733,6 +733,49 @@ int CmdHFMFPMAD(const char *cmd) {
 	return 0;
 }
 
+int CmdHFMFPNDEF(const char *cmd) {
+
+	CLIParserInit("hf mfp ndef", 
+		"Prints NFC Data Exchange Format (NDEF)", 
+		"Usage:\n\thf mfp ndef -> shows NDEF data\n"
+			"\thf mfp ndef -a 03e1 -k d3f7d3f7d3f7d3f7d3f7d3f7d3f7d3f7 -> shows NDEF data with custom AID and key\n");
+
+	void* argtable[] = {
+		arg_param_begin,
+		arg_lit0("vV",  "verbose",  "show technical data"),
+		arg_str0("aA",  "aid",      "replace default aid for NDEF", NULL),
+		arg_str0("kK",  "key",      "replace default key for NDEF", NULL),
+		arg_lit0("bB",  "keyb",     "use key B for access sectors (by default: key A)"),
+		arg_param_end
+	};
+	CLIExecWithReturn(cmd, argtable, true);
+	
+	bool verbose = arg_get_lit(1);
+	uint8_t aid[2] = {0};
+	int aidlen;
+	CLIGetHexWithReturn(2, aid, &aidlen);
+	uint8_t key[16] = {0};
+	int keylen;
+	CLIGetHexWithReturn(3, key, &keylen);
+	bool keyB = arg_get_lit(4);
+	
+	CLIParserFree();
+
+	uint16_t ndefAID = 0x03e1;
+	if (aidlen == 2)
+		ndefAID = (aid[0] << 8) + aid[1];
+	
+	uint8_t ndefkey[16] = {0};
+	memcpy(ndefkey, g_mifarep_ndef_key, 16);
+	if (keylen == 16) {
+		memcpy(ndefkey, key, 16);
+	}
+	
+	uint8_t data[4096] = {0};
+	int datalen = 0;
+	
+	return 0;
+}
 static command_t CommandTable[] =
 {
   {"help",             CmdHelp,					1, "This help"},
@@ -745,6 +788,7 @@ static command_t CommandTable[] =
   {"rdsc",  	       CmdHFMFPRdsc,			0, "Read sectors"},
   {"wrbl",  	       CmdHFMFPWrbl,			0, "Write blocks"},
   {"mad",  	           CmdHFMFPMAD,				0, "Checks and prints MAD"},
+  {"ndef",  	       CmdHFMFPNDEF,			0, "Prints NDEF"},
   {NULL,               NULL,					0, NULL}
 };
 

From e191219d8a8f0cee34159167815c93edfe9fdede Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Mon, 4 Mar 2019 20:22:25 +0200
Subject: [PATCH 0643/1938] reading NDEF data from card

---
 client/cmdhfmfp.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/client/cmdhfmfp.c b/client/cmdhfmfp.c
index ce31ff03a..de47d9865 100644
--- a/client/cmdhfmfp.c
+++ b/client/cmdhfmfp.c
@@ -26,6 +26,7 @@
 #include "mifare/mad.h"
 #include "cliparser/cliparser.h"
 #include "crypto/libpcrypto.h"
+#include "emv/dump.h"
 
 static const uint8_t DefaultKey[16] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
 
@@ -771,9 +772,65 @@ int CmdHFMFPNDEF(const char *cmd) {
 		memcpy(ndefkey, key, 16);
 	}
 	
+	uint8_t sector0[16 * 4] = {0};
+	uint8_t sector10[16 * 4] = {0};
 	uint8_t data[4096] = {0};
 	int datalen = 0;
+
+	PrintAndLogEx(NORMAL, "");
 	
+	if (mfpReadSector(MF_MAD1_SECTOR, MF_KEY_A, (uint8_t *)g_mifarep_mad_key, sector0, verbose)) {
+		PrintAndLogEx(ERR, "read sector 0 error. card don't have MAD or don't have MAD on default keys.");
+		return 2;
+	}
+	
+	bool haveMAD2 = false;
+	int res = MADCheck(sector0, NULL, verbose, &haveMAD2);
+	if (res) {
+		PrintAndLogEx(ERR, "MAD error %d.", res);
+		return res;
+	}
+	
+	if (haveMAD2) {
+		if (mfpReadSector(MF_MAD2_SECTOR, MF_KEY_A, (uint8_t *)g_mifarep_mad_key, sector10, verbose)) {
+			PrintAndLogEx(ERR, "read sector 0x10 error. card don't have MAD or don't have MAD on default keys.");
+			return 2;
+		}
+	}
+
+	uint16_t mad[7 + 8 + 8 + 8 + 8] = {0};
+	size_t madlen = 0;
+	if (MADDecode(sector0, (haveMAD2 ? sector10 : NULL), mad, &madlen)) {
+		PrintAndLogEx(ERR, "can't decode mad.");
+		return 10;
+	}
+
+	printf("data reading:");
+	for (int i = 0; i < madlen; i++) {
+		if (ndefAID == mad[i]) {
+			uint8_t vsector[16 * 4] = {0};
+			if (mfpReadSector(i + 1, keyB ? MF_KEY_B : MF_KEY_A, ndefkey, vsector, false)) {
+				PrintAndLogEx(ERR, "read sector %d error.", i + 1);
+				return 2;
+			}
+			
+			memcpy(&data[datalen], vsector, 16 * 3);
+			datalen += 16 * 3;
+			
+			printf(".");
+		}
+	}
+	printf(" OK\n");
+	
+	if (!datalen) {
+		PrintAndLogEx(ERR, "no NDEF data.");
+		return 11;
+	}
+	
+//	if (verbose)
+		PrintAndLogEx(NORMAL, "NDEF data:");
+		dump_buffer(data, datalen, stdout, 1);
+
 	return 0;
 }
 static command_t CommandTable[] =

From 0944a12744e3e0d30aa5e38b3f4fa4bbe8b03c6e Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Mon, 4 Mar 2019 20:27:52 +0100
Subject: [PATCH 0644/1938] Add missing header

---
 client/mifare/mad.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/mifare/mad.h b/client/mifare/mad.h
index ee362adb6..6289982d9 100644
--- a/client/mifare/mad.h
+++ b/client/mifare/mad.h
@@ -13,6 +13,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
+#include <stddef.h>
 
 typedef struct {
 	uint16_t AID;

From 59bae84531e630837e7165c95b9a7cb723017303 Mon Sep 17 00:00:00 2001
From: sh7d <47714037+sh7d@users.noreply.github.com>
Date: Mon, 4 Mar 2019 22:06:27 +0100
Subject: [PATCH 0645/1938] Mifare mad - do not exit if checksum is shitty

---
 client/mifare/mad.c | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/client/mifare/mad.c b/client/mifare/mad.c
index 34ea50cfc..46a95f89d 100644
--- a/client/mifare/mad.c
+++ b/client/mifare/mad.c
@@ -112,14 +112,14 @@ int madCRCCheck(uint8_t *sector, bool verbose, int MADver) {
 		uint8_t crc = CRC8Mad(&sector[16 + 1], 15 + 16);
 		if (crc != sector[16]) {
 			if (verbose)
-				PrintAndLogEx(ERR, "Wrong MAD%d CRC. Calculated: 0x%02x, from card: 0x%02x", MADver, crc, sector[16]);
+				PrintAndLogEx(WARNING, "Wrong MAD%d CRC. Calculated: 0x%02x, from card: 0x%02x", MADver, crc, sector[16]);
 			return 3;
 		};
 	} else {
 		uint8_t crc = CRC8Mad(&sector[1], 15 + 16 + 16);
 		if (crc != sector[0]) {
 			if (verbose)
-				PrintAndLogEx(ERR, "Wrong MAD%d CRC. Calculated: 0x%02x, from card: 0x%02x", MADver, crc, sector[16]);
+				PrintAndLogEx(WARNING, "Wrong MAD%d CRC. Calculated: 0x%02x, from card: 0x%02x", MADver, crc, sector[16]);
 			return 3;
 		};
 	}
@@ -191,9 +191,7 @@ int MADCheck(uint8_t *sector0, uint8_t *sector10, bool verbose, bool *haveMAD2)
 int MADDecode(uint8_t *sector0, uint8_t *sector10, uint16_t *mad, size_t *madlen) {
 	*madlen = 0;
 	bool haveMAD2 = false;
-	int res = MADCheck(sector0, sector10, false, &haveMAD2);
-	if (res)
-		return res;
+	MADCheck(sector0, sector10, false, &haveMAD2);
 	
 	for (int i = 1; i < 16; i++) {
 		mad[*madlen] = madGetAID(sector0, 1, i);
@@ -219,10 +217,8 @@ int MAD1DecodeAndPrint(uint8_t *sector, bool verbose, bool *haveMAD2) {
 
 	// check MAD1 only
 	int res = MADCheck(sector, NULL, verbose, haveMAD2);
-	if (res)
-		return res;	
 	
-	if (verbose)
+	if (verbose && !res)
 		PrintAndLogEx(NORMAL, "CRC8-MAD OK.");
 	
 	// info byte
@@ -249,10 +245,8 @@ int MAD2DecodeAndPrint(uint8_t *sector, bool verbose) {
 	PrintAndLogEx(NORMAL, "16 MAD2");
 
 	int res = madCRCCheck(sector, true, 2);
-	if (res)
-		return res;	
 
-	if (verbose)
+	if (verbose && !res)
 		PrintAndLogEx(NORMAL, "CRC8-MAD OK.");
 
 	uint8_t InfoByte = sector[1] & 0x3f;

From 760cd7b87cd0168c76321a31ed13730b42076af0 Mon Sep 17 00:00:00 2001
From: mazodude <mazodude2000@gmail.com>
Date: Tue, 5 Mar 2019 08:36:04 +1100
Subject: [PATCH 0646/1938] Delete MAD script as merlokk has implemented it

---
 client/scripts/mifare_ad.lua | 223 -----------------------------------
 1 file changed, 223 deletions(-)
 delete mode 100644 client/scripts/mifare_ad.lua

diff --git a/client/scripts/mifare_ad.lua b/client/scripts/mifare_ad.lua
deleted file mode 100644
index 885c25a81..000000000
--- a/client/scripts/mifare_ad.lua
+++ /dev/null
@@ -1,223 +0,0 @@
-
--- Ability to read what card is there
-local getopt = require('getopt')
-local cmds = require('commands')
-local taglib = require('taglib')
-local lib14a = require('read14a')
-
-local desc = 
-[[This script will automatically check Mifare cards for MADs
-(Mifare Application Directory)
-
-Arguments:
-	-d 				debug logging on
-	-h 				this help
-
-]]
-local example = "script run xxx"
-local author = "Mazodude"
---- 
--- This is only meant to be used when errors occur
-local function oops(err)
-	print("ERROR: ",err)
-	return nil,err
-end
-
---- 
--- Usage help
-local function help()
-	print(desc)
-	print("Example usage")
-	print(example)
-end
-
-local function debug(...)
-	if DEBUG then 
-		print("debug:", ...)
-	end
-end
-
-local function show(data)
-	if DEBUG then
-	    local formatString = ("H%d"):format(string.len(data))
-	    local _,hexdata = bin.unpack(formatString, data)
-	    debug("Hexdata" , hexdata)
-	end
-end
-
-local function bits(num)
-    local t={}
-    while num>0 do
-        rest=num%2
-        table.insert(t,1,rest)
-        num=(num-rest)/2
-    end return table.concat(t)
-end
---- Shut down tag communication
--- return no return values
-local function close()
-	debug("Closing connection")
-	core.clearCommandBuffer()
-	local x = string.format("hf 14a raw -r")
-	debug(x)
-	core.console(x)
-	debug("done")
-	--data, err = waitCmd(true)
-	--data, err = waitCmd(false)
-
-end
-
-
--- waits for answer from pm3 device
-local function checkCommand(command)
-	core.clearCommandBuffer()
-	local usb = command:getBytes()
-	core.SendCommand(usb)
-	local result = core.WaitForResponseTimeout(cmds.CMD_ACK, 1500)
-
-	if result then
-		local count, cmd, arg0 = bin.unpack('LL',result)
-		if(arg0==1) then
-			local count, arg1, arg2, data = bin.unpack('LLH511',result,count)
-			sector = data
-			return sector
-		else
-			return nil
-		end
-	else
-		print("Timeout while waiting for response. Increase TIMEOUT in mifare_ad.lua to wait longer")
-		return nil, "Timeout while waiting for device to respond"
-	end
-end
-
----_ Gets data from a sector
--- @return sector if successfull
--- @return nil, errormessage if unsuccessfull
-local function getSector(sector,typ)
-	local data, err
-
-	core.clearCommandBuffer()
-
-	-- // params
-	-- uint8_t sectorNo = arg0;
-	-- uint8_t keyType = arg1;
-	-- uint64_t ui64Key = 0;
-	-- ui64Key = bytes_to_num(datain, 6);
-	local sectorNo = sector
-	local keyType = 0
-	local key = ""
-	if typ == 1 then
-		key = "A0A1A2A3A4A5"
-	end
-	debug(("Testing to auth with key %s"):format(key))
-	-- print(key);
-	local command = Command:new{cmd = cmds.CMD_MIFARE_READSC,
-								arg1 = sectorNo,
-								arg2 = keyType,
-								arg3 = 0,
-								data = key}
-	local data = checkCommand(command)
-	-- debug(command)
-	-- print(data)
-	if (data == nil) then return err, ("Could not auth with card - this tag does not have MADs") end
-	if string.len(data) < 32 then
-		return nil, ("Expected at least 32 bytes, got %d - this tag does not have MADs"):format(string.len(data))
-	end
-	return data
-end
-
-
---- This function is a lua-implementation of
--- cmdhf14a.c:waitCmd(uint8_t iSelect)
-local function waitCmd(iSelect)
-	local response = core.WaitForResponseTimeout(cmds.CMD_ACK,1000)
-	if response then
-		local count,cmd,arg0,arg1,arg2 = bin.unpack('LLLL',response)
-		local iLen = arg0
-		if iSelect then	iLen = arg1 end
-	    debug(("Received %i octets (arg0:%d, arg1:%d)"):format(iLen, arg0, arg1))
-	    if iLen == 0 then return nil, "No response from tag" end
-		local recv = string.sub(response,count, iLen+count-1)
-	    return recv
-	end
-	return nil, "No response from device"
-end
-
-
-
-local function main( args)
-	debug("script started")
-	local err, data, data2,k,v,i
-	-- Read the parameters
-	for o, a in getopt.getopt(args, 'hd') do
-		if o == "h" then help() return end
-		if o == "d" then DEBUG = true end
-	end
-
-	local tag, err = lib14a.read(false, true)
-	if not tag then return oops("No card present") end
-	core.clearCommandBuffer()
-	print(("UID: %s"):format(tag.uid))
-	print(("SAK: %x"):format(tag.sak))
-
-	local typ = 1
-	if 0x18 == sak then --NXP MIFARE Classic 4k | Plus 4k | Ev1 4k
-		typ = 4
-	elseif 0x08 == sak then -- NXP MIFARE CLASSIC 1k | Plus 2k | Ev1 1K
-		typ= 1
-	elseif 0x09 == sak then -- NXP MIFARE Mini 0.3k
-		typ = 0
-	elseif  0x10 == sak then-- "NXP MIFARE Plus 2k"
-		typ = 2
-	elseif  0x01 == sak then-- "NXP MIFARE TNP3xxx 1K"
-		typ = 1
-	else
-		debug("Defaulting to CLASSIC")
-	end
-
-	-- # | data    |  Sector | 00/ 0x00
-	-- ----+------------------------------------------------
-	-- 0 | 5C 71 B0 14 89 88 04 00 C0 8E 3C 90 49 50 12 13
-	-- 1 | 80 0F 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-	-- 2 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 12 48
-	-- 3 | A0 A1 A2 A3 A4 A5 78 77 88 E9 B0 B1 B2 B3 B4 B5
-
-	-- E9 = 1 1 1010 01
-	-- C1 = 1 1 0000 01
-	-- 69 = 0 1 1010 01
-	-- 99 = 1 0 0110 01
-
-	-- Need to check the sector trailer GPB
-	-- First, get Sector 0 block 3 byte 10
-	local sector, err = getSector(0,1)
-	if err then return oops(err) end
-	-- -- Now, parse out the block data
-	sector = sector:sub(0,128)
-	debug(sector)
-	local trailer = sector:sub(97,128)
-	debug(trailer)
-	local gpb = string.sub(trailer,19,20)
-	debug(("Checking block 0 sector 3 byte 10"))
-	debug(("Got byte: %s"):format(gpb))
-	local gpbbits = bits(tonumber(gpb,16))
-	debug(gpbbits)
-	local adv = gpbbits:sub(7,8)
-	print(("ADV: %s"):format(adv))
-	local rfu = gpbbits:sub(3,6)
-	print(("RFU: %s"):format(rfu))
-	local ma = gpbbits:sub(2,2)
-	print(("MA: %s"):format(ma))
-	local da = gpbbits:sub(1,1)
-	print(("DA: %s"):format(da))
-	-- prlog(block)
-	if adv == "01" then
-		print('Card has MADs v1')
-	end
-	if adv == "10" then
-		print('Card has MADs v2')
-	end
-
-	-- Deactivate field
-	close()
-end
-main(args)
\ No newline at end of file

From cbe25f48328a1dd856db1b739097f3026b005b29 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 5 Mar 2019 00:11:31 +0200
Subject: [PATCH 0647/1938] add ndef.c/h

---
 client/Makefile      |  1 +
 client/cmdhfmfp.c    |  9 +++++++--
 client/mifare/ndef.c | 16 ++++++++++++++++
 client/mifare/ndef.h | 19 +++++++++++++++++++
 4 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 client/mifare/ndef.c
 create mode 100644 client/mifare/ndef.h

diff --git a/client/Makefile b/client/Makefile
index 051468ba9..d83fbff5f 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -158,6 +158,7 @@ CMDSRCS =	crapto1/crapto1.c \
 			emv/emv_roca.c \
             mifare/mifare4.c \
             mifare/mad.c \
+            mifare/ndef.c \
 			cmdanalyse.c \
 			cmdhf.c \
 			cmdhflist.c \
diff --git a/client/cmdhfmfp.c b/client/cmdhfmfp.c
index de47d9865..20b6d0fce 100644
--- a/client/cmdhfmfp.c
+++ b/client/cmdhfmfp.c
@@ -24,6 +24,7 @@
 #include "mifare.h"
 #include "mifare/mifare4.h"
 #include "mifare/mad.h"
+#include "mifare/ndef.h"
 #include "cliparser/cliparser.h"
 #include "crypto/libpcrypto.h"
 #include "emv/dump.h"
@@ -743,7 +744,7 @@ int CmdHFMFPNDEF(const char *cmd) {
 
 	void* argtable[] = {
 		arg_param_begin,
-		arg_lit0("vV",  "verbose",  "show technical data"),
+		arg_litn("vV",  "verbose",  0, 2, "show technical data"),
 		arg_str0("aA",  "aid",      "replace default aid for NDEF", NULL),
 		arg_str0("kK",  "key",      "replace default key for NDEF", NULL),
 		arg_lit0("bB",  "keyb",     "use key B for access sectors (by default: key A)"),
@@ -752,6 +753,7 @@ int CmdHFMFPNDEF(const char *cmd) {
 	CLIExecWithReturn(cmd, argtable, true);
 	
 	bool verbose = arg_get_lit(1);
+	bool verbose2 = arg_get_lit(1) > 1;
 	uint8_t aid[2] = {0};
 	int aidlen;
 	CLIGetHexWithReturn(2, aid, &aidlen);
@@ -827,9 +829,12 @@ int CmdHFMFPNDEF(const char *cmd) {
 		return 11;
 	}
 	
-//	if (verbose)
+	if (verbose2) {
 		PrintAndLogEx(NORMAL, "NDEF data:");
 		dump_buffer(data, datalen, stdout, 1);
+	}
+		
+	NDEFDecodeAndPrint(data, datalen, verbose);
 
 	return 0;
 }
diff --git a/client/mifare/ndef.c b/client/mifare/ndef.c
new file mode 100644
index 000000000..22deb0809
--- /dev/null
+++ b/client/mifare/ndef.c
@@ -0,0 +1,16 @@
+//-----------------------------------------------------------------------------
+// Copyright (C) 2019 Merlok
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// NFC Data Exchange Format (NDEF) functions
+//-----------------------------------------------------------------------------
+
+#include "ndef.h"
+
+int NDEFDecodeAndPrint(uint8_t *ndef, size_t ndefLen, bool verbose) {
+	
+	return 0;
+}
diff --git a/client/mifare/ndef.h b/client/mifare/ndef.h
new file mode 100644
index 000000000..6e79887ee
--- /dev/null
+++ b/client/mifare/ndef.h
@@ -0,0 +1,19 @@
+//-----------------------------------------------------------------------------
+// Copyright (C) 2019 Merlok
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// NFC Data Exchange Format (NDEF) functions
+//-----------------------------------------------------------------------------
+
+#ifndef _NDEF_H_
+#define _NDEF_H_
+
+#include <stdint.h>
+#include <stdbool.h>
+
+extern int NDEFDecodeAndPrint(uint8_t *ndef, size_t ndefLen, bool verbose);
+
+#endif // _NDEF_H_

From 0a30e03aaf2102532db9f37384fd26caae0564f9 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 5 Mar 2019 00:13:01 +0200
Subject: [PATCH 0648/1938] add header

---
 client/mifare/ndef.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/mifare/ndef.h b/client/mifare/ndef.h
index 6e79887ee..0aa4cca27 100644
--- a/client/mifare/ndef.h
+++ b/client/mifare/ndef.h
@@ -13,6 +13,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
+#include <stddef.h>
 
 extern int NDEFDecodeAndPrint(uint8_t *ndef, size_t ndefLen, bool verbose);
 

From a2f8f0628c02c79cae965bbf35f5ab93fa7d83b0 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 5 Mar 2019 00:48:02 +0200
Subject: [PATCH 0649/1938] added ndef tlv parsing

---
 client/mifare/ndef.c | 58 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/client/mifare/ndef.c b/client/mifare/ndef.c
index 22deb0809..e5ce5fe11 100644
--- a/client/mifare/ndef.c
+++ b/client/mifare/ndef.c
@@ -9,8 +9,66 @@
 //-----------------------------------------------------------------------------
 
 #include "ndef.h"
+#include "ui.h"
+
+uint16_t ndefTLVGetLength(uint8_t *data, size_t *indx) {
+	uint16_t len = 0;
+	if (data[0] == 0xff) {
+		len = (data[1] << 8) + data[2];
+		*indx += 3;
+	} else {
+		len = data[0];
+		*indx += 1;
+	}
+	
+	return len;
+}
 
 int NDEFDecodeAndPrint(uint8_t *ndef, size_t ndefLen, bool verbose) {
 	
+	size_t indx = 0;
+	
+	while (indx < ndefLen) {
+		switch (ndef[indx]) {
+			case 0x00: {
+				indx++;
+				uint16_t len = ndefTLVGetLength(&ndef[indx], &indx);
+				PrintAndLogEx(INFO, "NDEF NULL block.");
+				if (len)
+					PrintAndLogEx(WARNING, "NDEF NULL block size must be 0 instead of %d.", len);
+				indx += len;
+				break;
+			}
+			case 0x03: {
+				indx++;
+				uint16_t len = ndefTLVGetLength(&ndef[indx], &indx);
+				PrintAndLogEx(INFO, "NDEF message. len: %d", len);
+				
+				// ndef decode
+				
+				
+				
+				indx += len;
+				break;
+			}
+			case 0xfd: {
+				indx++;
+				uint16_t len = ndefTLVGetLength(&ndef[indx], &indx);
+				PrintAndLogEx(INFO, "NDEF proprietary info. Skipped %d bytes.", len);
+				indx += len;
+				break;
+			}
+			case 0xfe: {
+				PrintAndLogEx(INFO, "NDEF Terminator. Done.");
+				return 0;
+				break;
+			}
+			default: {
+				PrintAndLogEx(ERR, "unknown tag 0x%02x", ndef[indx]);
+				return 1;
+			}
+		}		
+	}
+	
 	return 0;
 }

From 64a5b355b5ae336669814d98c49319db716095fd Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 5 Mar 2019 00:51:32 +0200
Subject: [PATCH 0650/1938] added ndef record parse sketch

---
 client/mifare/ndef.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/client/mifare/ndef.c b/client/mifare/ndef.c
index e5ce5fe11..f827eb5a7 100644
--- a/client/mifare/ndef.c
+++ b/client/mifare/ndef.c
@@ -24,6 +24,14 @@ uint16_t ndefTLVGetLength(uint8_t *data, size_t *indx) {
 	return len;
 }
 
+int ndefRecordDecodeAndPrint(uint8_t *ndefRecord, size_t ndefRecordLen) {
+	
+	
+	
+	
+	return 0;
+}
+
 int NDEFDecodeAndPrint(uint8_t *ndef, size_t ndefLen, bool verbose) {
 	
 	size_t indx = 0;
@@ -44,9 +52,9 @@ int NDEFDecodeAndPrint(uint8_t *ndef, size_t ndefLen, bool verbose) {
 				uint16_t len = ndefTLVGetLength(&ndef[indx], &indx);
 				PrintAndLogEx(INFO, "NDEF message. len: %d", len);
 				
-				// ndef decode
-				
-				
+				int res = ndefRecordDecodeAndPrint(&ndef[indx], len);
+				if (res)
+					return res;
 				
 				indx += len;
 				break;

From 3bf618ca563fc9b64f76673c80a09f35f9257978 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 5 Mar 2019 00:54:45 +0200
Subject: [PATCH 0651/1938] log structure

---
 client/mifare/ndef.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/client/mifare/ndef.c b/client/mifare/ndef.c
index f827eb5a7..a4c5332eb 100644
--- a/client/mifare/ndef.c
+++ b/client/mifare/ndef.c
@@ -36,12 +36,13 @@ int NDEFDecodeAndPrint(uint8_t *ndef, size_t ndefLen, bool verbose) {
 	
 	size_t indx = 0;
 	
+	PrintAndLogEx(INFO, "NDEF decoding:");
 	while (indx < ndefLen) {
 		switch (ndef[indx]) {
 			case 0x00: {
 				indx++;
 				uint16_t len = ndefTLVGetLength(&ndef[indx], &indx);
-				PrintAndLogEx(INFO, "NDEF NULL block.");
+				PrintAndLogEx(INFO, "-- NDEF NULL block.");
 				if (len)
 					PrintAndLogEx(WARNING, "NDEF NULL block size must be 0 instead of %d.", len);
 				indx += len;
@@ -50,7 +51,7 @@ int NDEFDecodeAndPrint(uint8_t *ndef, size_t ndefLen, bool verbose) {
 			case 0x03: {
 				indx++;
 				uint16_t len = ndefTLVGetLength(&ndef[indx], &indx);
-				PrintAndLogEx(INFO, "NDEF message. len: %d", len);
+				PrintAndLogEx(INFO, "-- NDEF message. len: %d", len);
 				
 				int res = ndefRecordDecodeAndPrint(&ndef[indx], len);
 				if (res)
@@ -62,12 +63,12 @@ int NDEFDecodeAndPrint(uint8_t *ndef, size_t ndefLen, bool verbose) {
 			case 0xfd: {
 				indx++;
 				uint16_t len = ndefTLVGetLength(&ndef[indx], &indx);
-				PrintAndLogEx(INFO, "NDEF proprietary info. Skipped %d bytes.", len);
+				PrintAndLogEx(INFO, "-- NDEF proprietary info. Skipped %d bytes.", len);
 				indx += len;
 				break;
 			}
 			case 0xfe: {
-				PrintAndLogEx(INFO, "NDEF Terminator. Done.");
+				PrintAndLogEx(INFO, "-- NDEF Terminator. Done.");
 				return 0;
 				break;
 			}

From 34a133451e011acc91afde4104af4f58becf41e5 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 5 Mar 2019 01:02:54 +0200
Subject: [PATCH 0652/1938] small addon

---
 client/mifare/ndef.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/mifare/ndef.c b/client/mifare/ndef.c
index a4c5332eb..4923b0081 100644
--- a/client/mifare/ndef.c
+++ b/client/mifare/ndef.c
@@ -24,7 +24,7 @@ uint16_t ndefTLVGetLength(uint8_t *data, size_t *indx) {
 	return len;
 }
 
-int ndefRecordDecodeAndPrint(uint8_t *ndefRecord, size_t ndefRecordLen) {
+int ndefRecordsDecodeAndPrint(uint8_t *ndefRecord, size_t ndefRecordLen) {
 	
 	
 	
@@ -53,7 +53,7 @@ int NDEFDecodeAndPrint(uint8_t *ndef, size_t ndefLen, bool verbose) {
 				uint16_t len = ndefTLVGetLength(&ndef[indx], &indx);
 				PrintAndLogEx(INFO, "-- NDEF message. len: %d", len);
 				
-				int res = ndefRecordDecodeAndPrint(&ndef[indx], len);
+				int res = ndefRecordsDecodeAndPrint(&ndef[indx], len);
 				if (res)
 					return res;
 				

From fffa921aa04bf1b73e639fb93ffca4b32b73cd64 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 5 Mar 2019 16:41:20 +0200
Subject: [PATCH 0653/1938] ndef record decode OK

---
 client/mifare/ndef.c | 123 ++++++++++++++++++++++++++++++++++++++++++-
 client/mifare/ndef.h |  24 +++++++++
 2 files changed, 145 insertions(+), 2 deletions(-)

diff --git a/client/mifare/ndef.c b/client/mifare/ndef.c
index 4923b0081..4dd200759 100644
--- a/client/mifare/ndef.c
+++ b/client/mifare/ndef.c
@@ -10,6 +10,20 @@
 
 #include "ndef.h"
 #include "ui.h"
+#include "emv/dump.h"
+
+#define STRBOOL(p) ((p) ? "+" : "-")
+
+static const char *TypeNameFormat_s[] = {
+	"Empty Record",
+	"Well Known Record",
+	"MIME Media Record",
+	"Absolute URI Record",
+	"External Record",
+	"Unknown Record",
+	"Unchanged Record"
+	"n/a"
+};
 
 uint16_t ndefTLVGetLength(uint8_t *data, size_t *indx) {
 	uint16_t len = 0;
@@ -24,10 +38,115 @@ uint16_t ndefTLVGetLength(uint8_t *data, size_t *indx) {
 	return len;
 }
 
+int ndefDecodeHeader(uint8_t *data, size_t datalen, NDEFHeader_t *header) {
+	header->MessageBegin	= data[0] & 0x80;
+	header->MessageEnd		= data[0] & 0x40;
+	header->ChunkFlag		= data[0] & 0x20;
+	header->ShortRecordBit	= data[0] & 0x10;
+	header->IDLenPresent	= data[0] & 0x08;
+	header->TypeNameFormat	= data[0] & 0x07;
+	header->len				= 1 + 1 + (header->ShortRecordBit ? 1 : 4) + (header->IDLenPresent ? 1 : 0); // header + typelen + payloadlen + idlen
+	if (header->len > datalen)
+		return 1;
+	
+	header->TypeLen			= data[1];
+	
+	header->PayloadLen		= (header->ShortRecordBit ? (data[2]) : ((data[2] << 24) + (data[3] << 16) + (data[4] << 8) + data[5]));
+	
+	if (header->IDLenPresent)
+		header->IDLen = (header->ShortRecordBit ? (data[3]) : (data[6]));
+	else
+		header->IDLen = 0;
+	
+	header->RecLen			= header->len + header->TypeLen + header->PayloadLen + header->IDLen;
+	
+	if (header->RecLen > datalen)
+		return 3;
+
+	return 0;
+}
+
+int ndefPrintHeader(NDEFHeader_t *header) {
+	PrintAndLogEx(INFO, "Header:");
+	
+	PrintAndLogEx(NORMAL, "\tMessage Begin:    %s", STRBOOL(header->MessageBegin));
+	PrintAndLogEx(NORMAL, "\tMessage End:      %s", STRBOOL(header->MessageEnd));
+	PrintAndLogEx(NORMAL, "\tChunk Flag:       %s", STRBOOL(header->ChunkFlag));
+	PrintAndLogEx(NORMAL, "\tShort Record Bit: %s", STRBOOL(header->ShortRecordBit));
+	PrintAndLogEx(NORMAL, "\tID Len Present:   %s", STRBOOL(header->IDLenPresent));
+	PrintAndLogEx(NORMAL, "\tType Name Format: [0x%02x] %s", header->TypeNameFormat, TypeNameFormat_s[header->TypeNameFormat]);
+
+	PrintAndLogEx(NORMAL, "\tHeader length    : %d", header->len);
+	PrintAndLogEx(NORMAL, "\tType length      : %d", header->TypeLen);
+	PrintAndLogEx(NORMAL, "\tPayload length   : %d", header->PayloadLen);
+	PrintAndLogEx(NORMAL, "\tID length        : %d", header->IDLen);
+	PrintAndLogEx(NORMAL, "\tRecord length    : %d", header->RecLen);
+
+	return 0;
+}
+
+int ndefRecordDecodeAndPrint(uint8_t *ndefRecord, size_t ndefRecordLen) {
+	
+	NDEFHeader_t NDEFHeader = {0};
+	int res = ndefDecodeHeader(ndefRecord, ndefRecordLen, &NDEFHeader);
+	if (res)
+		return res;
+	
+	ndefPrintHeader(&NDEFHeader);
+	
+	size_t indx = NDEFHeader.len;
+	if (NDEFHeader.TypeLen) {
+		PrintAndLogEx(INFO, "Type data:");
+		dump_buffer(&ndefRecord[indx], NDEFHeader.TypeLen, stdout, 1);
+		
+		indx += NDEFHeader.TypeLen;
+	}
+	if (NDEFHeader.IDLen) {
+		PrintAndLogEx(INFO, "ID data:");
+		dump_buffer(&ndefRecord[indx], NDEFHeader.IDLen, stdout, 1);
+
+		indx += NDEFHeader.IDLen;
+	}
+	if (NDEFHeader.PayloadLen) {
+		PrintAndLogEx(INFO, "Payload data:");
+		dump_buffer(&ndefRecord[indx], NDEFHeader.PayloadLen, stdout, 1);
+
+		indx += NDEFHeader.PayloadLen;
+	}
+
+	return 0;
+}
+
 int ndefRecordsDecodeAndPrint(uint8_t *ndefRecord, size_t ndefRecordLen) {
+	bool firstRec = true;
+	size_t len = 0;
 	
-	
-	
+	while (len < ndefRecordLen) {
+		NDEFHeader_t NDEFHeader = {0};
+		int res = ndefDecodeHeader(&ndefRecord[len], ndefRecordLen - len, &NDEFHeader);
+		if (res)
+			return res;
+		
+		if (firstRec) {
+			if (!NDEFHeader.MessageBegin) {
+				PrintAndLogEx(ERR, "NDEF first record have MessageBegin=false!");
+				return 1;
+			}
+			firstRec = false;
+		}
+		
+		if (NDEFHeader.MessageEnd && len + NDEFHeader.RecLen != ndefRecordLen) {
+			PrintAndLogEx(ERR, "NDEF records have wrong length. Must be %d, calculated %d", ndefRecordLen, len + NDEFHeader.RecLen);
+			return 1;
+		}
+		
+		ndefRecordDecodeAndPrint(&ndefRecord[len], NDEFHeader.RecLen);		
+		
+		len += NDEFHeader.len + NDEFHeader.TypeLen + NDEFHeader.PayloadLen + NDEFHeader.IDLen;
+		
+		if (NDEFHeader.MessageEnd)
+			break;
+	}	
 	
 	return 0;
 }
diff --git a/client/mifare/ndef.h b/client/mifare/ndef.h
index 0aa4cca27..25723158c 100644
--- a/client/mifare/ndef.h
+++ b/client/mifare/ndef.h
@@ -15,6 +15,30 @@
 #include <stdbool.h>
 #include <stddef.h>
 
+typedef enum {
+	tnfEmptyRecord			= 0x00,
+	tnfWellKnownRecord		= 0x01,
+	tnfMIMEMediaRecord		= 0x02,
+	tnfAbsoluteURIRecord	= 0x03,
+	tnfExternalRecord		= 0x04,
+	tnfUnknownRecord		= 0x05,
+	tnfUnchangedRecord		= 0x06
+} TypeNameFormat_t;
+
+typedef struct {
+	bool MessageBegin;
+	bool MessageEnd;
+	bool ChunkFlag;
+	bool ShortRecordBit;
+	bool IDLenPresent;
+	TypeNameFormat_t TypeNameFormat;
+	size_t TypeLen;
+	size_t PayloadLen;
+	size_t IDLen;
+	size_t len;
+	size_t RecLen;
+} NDEFHeader_t;
+
 extern int NDEFDecodeAndPrint(uint8_t *ndef, size_t ndefLen, bool verbose);
 
 #endif // _NDEF_H_

From 7003783c089160015f83f4aa2bf1d893a49a765f Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 5 Mar 2019 16:43:13 +0200
Subject: [PATCH 0654/1938] refactoring

---
 client/mifare/ndef.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/mifare/ndef.c b/client/mifare/ndef.c
index 4dd200759..15a7292c3 100644
--- a/client/mifare/ndef.c
+++ b/client/mifare/ndef.c
@@ -142,7 +142,7 @@ int ndefRecordsDecodeAndPrint(uint8_t *ndefRecord, size_t ndefRecordLen) {
 		
 		ndefRecordDecodeAndPrint(&ndefRecord[len], NDEFHeader.RecLen);		
 		
-		len += NDEFHeader.len + NDEFHeader.TypeLen + NDEFHeader.PayloadLen + NDEFHeader.IDLen;
+		len += NDEFHeader.RecLen;
 		
 		if (NDEFHeader.MessageEnd)
 			break;

From c7c97d35b55b316b52196a1097b8c68dec8fda1c Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 5 Mar 2019 17:25:11 +0200
Subject: [PATCH 0655/1938] some code to decoding payload

---
 client/mifare/ndef.c | 66 +++++++++++++++++++++++++++++++++-----------
 client/mifare/ndef.h |  3 ++
 2 files changed, 53 insertions(+), 16 deletions(-)

diff --git a/client/mifare/ndef.c b/client/mifare/ndef.c
index 15a7292c3..f6d7f5c15 100644
--- a/client/mifare/ndef.c
+++ b/client/mifare/ndef.c
@@ -39,6 +39,10 @@ uint16_t ndefTLVGetLength(uint8_t *data, size_t *indx) {
 }
 
 int ndefDecodeHeader(uint8_t *data, size_t datalen, NDEFHeader_t *header) {
+	header->Type = NULL;
+	header->Payload = NULL;
+	header->ID = NULL;
+
 	header->MessageBegin	= data[0] & 0x80;
 	header->MessageEnd		= data[0] & 0x40;
 	header->ChunkFlag		= data[0] & 0x20;
@@ -49,16 +53,21 @@ int ndefDecodeHeader(uint8_t *data, size_t datalen, NDEFHeader_t *header) {
 	if (header->len > datalen)
 		return 1;
 	
-	header->TypeLen			= data[1];
+	header->TypeLen = data[1];
+	header->Type = data + header->len;
 	
-	header->PayloadLen		= (header->ShortRecordBit ? (data[2]) : ((data[2] << 24) + (data[3] << 16) + (data[4] << 8) + data[5]));
+	header->PayloadLen = (header->ShortRecordBit ? (data[2]) : ((data[2] << 24) + (data[3] << 16) + (data[4] << 8) + data[5]));
 	
-	if (header->IDLenPresent)
+	if (header->IDLenPresent) {
 		header->IDLen = (header->ShortRecordBit ? (data[3]) : (data[6]));
-	else
+		header->Payload = header->Type + header->TypeLen;
+	} else {
 		header->IDLen = 0;
+	}
+
+	header->Payload = header->Type + header->TypeLen + header->IDLen;
 	
-	header->RecLen			= header->len + header->TypeLen + header->PayloadLen + header->IDLen;
+	header->RecLen = header->len + header->TypeLen + header->PayloadLen + header->IDLen;
 	
 	if (header->RecLen > datalen)
 		return 3;
@@ -85,8 +94,38 @@ int ndefPrintHeader(NDEFHeader_t *header) {
 	return 0;
 }
 
-int ndefRecordDecodeAndPrint(uint8_t *ndefRecord, size_t ndefRecordLen) {
+int ndefDecodePayload(NDEFHeader_t *ndef) {
 	
+	switch(ndef->TypeNameFormat) {
+	case tnfWellKnownRecord:
+		PrintAndLogEx(INFO, "Well Known Record");
+		PrintAndLogEx(NORMAL, "\ttype:    %.*s", ndef->TypeLen, ndef->Type);
+		
+		if (!strncmp((char *)ndef->Type, "T", ndef->TypeLen)) {
+			PrintAndLogEx(NORMAL, "\ttext   : %.*s", ndef->PayloadLen, ndef->Payload);
+		}
+		
+		if (!strncmp((char *)ndef->Type, "U", ndef->TypeLen)) {
+			PrintAndLogEx(NORMAL, "\turi    : %.*s", ndef->PayloadLen, ndef->Payload);
+		}
+		
+		if (!strncmp((char *)ndef->Type, "Sig", ndef->TypeLen)) {
+			printf("--sig\n");
+		}
+		
+		break;
+	case tnfAbsoluteURIRecord:
+		PrintAndLogEx(INFO, "Absolute URI Record");
+		PrintAndLogEx(NORMAL, "\ttype:    %.*s", ndef->TypeLen, ndef->Type);
+		PrintAndLogEx(NORMAL, "\tpayload: %.*s", ndef->PayloadLen, ndef->Payload);
+		break;
+	default:
+		break;
+	}	
+	return 0;
+}
+
+int ndefRecordDecodeAndPrint(uint8_t *ndefRecord, size_t ndefRecordLen) {
 	NDEFHeader_t NDEFHeader = {0};
 	int res = ndefDecodeHeader(ndefRecord, ndefRecordLen, &NDEFHeader);
 	if (res)
@@ -94,24 +133,19 @@ int ndefRecordDecodeAndPrint(uint8_t *ndefRecord, size_t ndefRecordLen) {
 	
 	ndefPrintHeader(&NDEFHeader);
 	
-	size_t indx = NDEFHeader.len;
 	if (NDEFHeader.TypeLen) {
 		PrintAndLogEx(INFO, "Type data:");
-		dump_buffer(&ndefRecord[indx], NDEFHeader.TypeLen, stdout, 1);
-		
-		indx += NDEFHeader.TypeLen;
+		dump_buffer(NDEFHeader.Type, NDEFHeader.TypeLen, stdout, 1);
 	}
 	if (NDEFHeader.IDLen) {
 		PrintAndLogEx(INFO, "ID data:");
-		dump_buffer(&ndefRecord[indx], NDEFHeader.IDLen, stdout, 1);
-
-		indx += NDEFHeader.IDLen;
+		dump_buffer(NDEFHeader.ID, NDEFHeader.IDLen, stdout, 1);
 	}
 	if (NDEFHeader.PayloadLen) {
 		PrintAndLogEx(INFO, "Payload data:");
-		dump_buffer(&ndefRecord[indx], NDEFHeader.PayloadLen, stdout, 1);
-
-		indx += NDEFHeader.PayloadLen;
+		dump_buffer(NDEFHeader.Payload, NDEFHeader.PayloadLen, stdout, 1);
+		if (NDEFHeader.TypeLen)
+			ndefDecodePayload(&NDEFHeader);
 	}
 
 	return 0;
diff --git a/client/mifare/ndef.h b/client/mifare/ndef.h
index 25723158c..35a589602 100644
--- a/client/mifare/ndef.h
+++ b/client/mifare/ndef.h
@@ -37,6 +37,9 @@ typedef struct {
 	size_t IDLen;
 	size_t len;
 	size_t RecLen;
+	uint8_t *Type;
+	uint8_t *Payload;
+	uint8_t *ID;
 } NDEFHeader_t;
 
 extern int NDEFDecodeAndPrint(uint8_t *ndef, size_t ndefLen, bool verbose);

From 4ffeebc19310cd2d4eafdab6c2ae3f5cc92e778d Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 5 Mar 2019 16:39:26 +0100
Subject: [PATCH 0656/1938] Fix return code check for iso14443b_select_card in
 hf epa

---
 armsrc/epa.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/armsrc/epa.c b/armsrc/epa.c
index e97fda7a0..71ecc29a3 100644
--- a/armsrc/epa.c
+++ b/armsrc/epa.c
@@ -544,7 +544,7 @@ int EPA_Setup()
 	iso14443b_setup();
 	// select the card
 	return_code = iso14443b_select_card( &card_b_info );
-	if (return_code == 1) {
+	if (return_code == 0) {
 		Dbprintf("ISO 14443 Type B");
 		iso_type = 'b';
 		return 0;

From a2be59db25ab065efb92c000a676168d7c96c167 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 5 Mar 2019 17:50:51 +0200
Subject: [PATCH 0657/1938] URI decode

---
 client/mifare/ndef.c | 54 ++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 52 insertions(+), 2 deletions(-)

diff --git a/client/mifare/ndef.c b/client/mifare/ndef.c
index f6d7f5c15..cacc0c9c4 100644
--- a/client/mifare/ndef.c
+++ b/client/mifare/ndef.c
@@ -25,6 +25,45 @@ static const char *TypeNameFormat_s[] = {
 	"n/a"
 };
 
+static const char *URI_s[] = {
+	"",                           // 0x00
+	"http://www.",                // 0x01
+	"https://www.",               // 0x02
+	"http://",                    // 0x03
+	"https://",                   // 0x04
+	"tel:",                       // 0x05
+	"mailto:",                    // 0x06
+	"ftp://anonymous:anonymous@", // 0x07
+	"ftp://ftp.",                 // 0x08
+	"ftps://",                    // 0x09
+	"sftp://",                    // 0x0A
+	"smb://",                     // 0x0B
+	"nfs://",                     // 0x0C
+	"ftp://",                     // 0x0D
+	"dav://",                     // 0x0E
+	"news:",                      // 0x0F
+	"telnet://",                  // 0x10
+	"imap:",                      // 0x11
+	"rtsp://",                    // 0x12
+	"urn:",                       // 0x13
+	"pop:",                       // 0x14
+	"sip:",                       // 0x15
+	"sips:",                      // 0x16
+	"tftp:",                      // 0x17
+	"btspp://",                   // 0x18
+	"btl2cap://",                 // 0x19
+	"btgoep://",                  // 0x1A
+	"tcpobex://",                 // 0x1B
+	"irdaobex://",                // 0x1C
+	"file://",                    // 0x1D
+	"urn:epc:id:",                // 0x1E
+	"urn:epc:tag:",               // 0x1F
+	"urn:epc:pat:",               // 0x20
+	"urn:epc:raw:",               // 0x21
+	"urn:epc:",                   // 0x22
+	"urn:nfc:"                    // 0x23
+};
+
 uint16_t ndefTLVGetLength(uint8_t *data, size_t *indx) {
 	uint16_t len = 0;
 	if (data[0] == 0xff) {
@@ -94,6 +133,17 @@ int ndefPrintHeader(NDEFHeader_t *header) {
 	return 0;
 }
 
+int ndefDecodeSig(uint8_t *sig, size_t siglen) {
+	PrintAndLogEx(NORMAL, "\tsignature version: 0x%02x", sig[0]);
+	if (sig[0] != 0x01) {
+		PrintAndLogEx(ERR, "signature version unknown.");
+		return 1;
+	}
+	
+	
+	return 0;
+};
+
 int ndefDecodePayload(NDEFHeader_t *ndef) {
 	
 	switch(ndef->TypeNameFormat) {
@@ -106,11 +156,11 @@ int ndefDecodePayload(NDEFHeader_t *ndef) {
 		}
 		
 		if (!strncmp((char *)ndef->Type, "U", ndef->TypeLen)) {
-			PrintAndLogEx(NORMAL, "\turi    : %.*s", ndef->PayloadLen, ndef->Payload);
+			PrintAndLogEx(NORMAL, "\turi    : %s%.*s", (ndef->Payload[0] <= 0x23 ? URI_s[ndef->Payload[0]] : "[err]"), ndef->PayloadLen, &ndef->Payload[1]);
 		}
 		
 		if (!strncmp((char *)ndef->Type, "Sig", ndef->TypeLen)) {
-			printf("--sig\n");
+			ndefDecodeSig(ndef->Payload, ndef->PayloadLen);
 		}
 		
 		break;

From 581fe408ba793af8f3b578b6939203681e6a6b0b Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 5 Mar 2019 18:14:30 +0200
Subject: [PATCH 0658/1938] ndef `sig` decoding

---
 client/mifare/ndef.c | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/client/mifare/ndef.c b/client/mifare/ndef.c
index cacc0c9c4..96911f607 100644
--- a/client/mifare/ndef.c
+++ b/client/mifare/ndef.c
@@ -11,6 +11,7 @@
 #include "ndef.h"
 #include "ui.h"
 #include "emv/dump.h"
+#include "crypto/asn1utils.h"
 
 #define STRBOOL(p) ((p) ? "+" : "-")
 
@@ -134,13 +135,44 @@ int ndefPrintHeader(NDEFHeader_t *header) {
 }
 
 int ndefDecodeSig(uint8_t *sig, size_t siglen) {
+	size_t indx = 0;
 	PrintAndLogEx(NORMAL, "\tsignature version: 0x%02x", sig[0]);
 	if (sig[0] != 0x01) {
 		PrintAndLogEx(ERR, "signature version unknown.");
 		return 1;
 	}
+	indx++;
 	
-	
+	while (indx < siglen) {
+		if (sig[indx] == 0x04) {
+			size_t intsiglen = (sig[indx + 1] << 8) + sig[indx + 2];
+			indx += 3;
+			PrintAndLogEx(NORMAL, "\tsignature [%d]: %s", intsiglen, sprint_hex_inrow(&sig[indx], intsiglen));
+			
+			uint8_t rval[300] = {0}; 
+			uint8_t sval[300] = {0}; 
+			int res = ecdsa_asn1_get_signature(&sig[indx], intsiglen, rval, sval);
+			if (!res) {
+				PrintAndLogEx(NORMAL ,"\t\tr: %s", sprint_hex(rval, 32));
+				PrintAndLogEx(NORMAL ,"\t\ts: %s", sprint_hex(sval, 32));
+			}
+			
+			indx += intsiglen;
+			continue;
+		}
+
+		if (sig[indx] == 0x80) {
+			size_t intchainlen = (sig[indx + 1] << 8) + sig[indx + 2];
+			indx += 3;
+			PrintAndLogEx(NORMAL, "\tchain [%d]: %.*s", intchainlen, intchainlen, &sig[indx]);			
+			indx += intchainlen;
+			continue;
+		}
+		
+		size_t skiplen = (sig[indx + 1] << 8) + sig[indx + 2];
+		indx += skiplen;
+	}
+
 	return 0;
 };
 

From 04a6a634270356d1f654f42763785a0f7d19d237 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 5 Mar 2019 18:43:12 +0200
Subject: [PATCH 0659/1938] rename

---
 client/mifare/ndef.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/mifare/ndef.c b/client/mifare/ndef.c
index 96911f607..dbb4a7bd2 100644
--- a/client/mifare/ndef.c
+++ b/client/mifare/ndef.c
@@ -162,10 +162,10 @@ int ndefDecodeSig(uint8_t *sig, size_t siglen) {
 		}
 
 		if (sig[indx] == 0x80) {
-			size_t intchainlen = (sig[indx + 1] << 8) + sig[indx + 2];
+			size_t inturilen = (sig[indx + 1] << 8) + sig[indx + 2];
 			indx += 3;
-			PrintAndLogEx(NORMAL, "\tchain [%d]: %.*s", intchainlen, intchainlen, &sig[indx]);			
-			indx += intchainlen;
+			PrintAndLogEx(NORMAL, "\tsignature uri [%d]: %.*s", inturilen, inturilen, &sig[indx]);			
+			indx += inturilen;
 			continue;
 		}
 		

From 53e0d030985574e30189288ebf228aea9a052402 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 5 Mar 2019 19:41:50 +0200
Subject: [PATCH 0660/1938] ndef cert right decode.
 https://github.com/skjolber/ndef-tools-for-android/blob/master/ndeftools/src/org/ndeftools/wellknown/SignatureRecord.java
 https://github.com/nfcpy/ndeflib/blob/master/src/ndef/signature.py

---
 client/mifare/ndef.c | 91 +++++++++++++++++++++++++++++++-------------
 client/mifare/ndef.h | 15 ++++++++
 2 files changed, 80 insertions(+), 26 deletions(-)

diff --git a/client/mifare/ndef.c b/client/mifare/ndef.c
index dbb4a7bd2..13a793725 100644
--- a/client/mifare/ndef.c
+++ b/client/mifare/ndef.c
@@ -26,6 +26,21 @@ static const char *TypeNameFormat_s[] = {
 	"n/a"
 };
 
+static const char *ndefSigType_s[] = {
+	"Not present",                   // No signature present
+	"RSASSA_PSS_SHA_1",              // PKCS_1
+	"RSASSA_PKCS1_v1_5_WITH_SHA_1",  // PKCS_1
+	"DSA",
+	"ECDSA",
+	"n/a"
+};
+
+static const char *ndefCertificateFormat_s[] = {
+	"X_509",
+	"X9_68",
+	"n/a"
+};
+
 static const char *URI_s[] = {
 	"",                           // 0x00
 	"http://www.",                // 0x01
@@ -143,36 +158,60 @@ int ndefDecodeSig(uint8_t *sig, size_t siglen) {
 	}
 	indx++;
 	
-	while (indx < siglen) {
-		if (sig[indx] == 0x04) {
-			size_t intsiglen = (sig[indx + 1] << 8) + sig[indx + 2];
-			indx += 3;
-			PrintAndLogEx(NORMAL, "\tsignature [%d]: %s", intsiglen, sprint_hex_inrow(&sig[indx], intsiglen));
-			
-			uint8_t rval[300] = {0}; 
-			uint8_t sval[300] = {0}; 
-			int res = ecdsa_asn1_get_signature(&sig[indx], intsiglen, rval, sval);
-			if (!res) {
-				PrintAndLogEx(NORMAL ,"\t\tr: %s", sprint_hex(rval, 32));
-				PrintAndLogEx(NORMAL ,"\t\ts: %s", sprint_hex(sval, 32));
-			}
-			
-			indx += intsiglen;
-			continue;
-		}
+	uint8_t sigType = sig[indx] & 0x7f;
+	bool sigURI = sig[indx] & 0x80;
 
-		if (sig[indx] == 0x80) {
-			size_t inturilen = (sig[indx + 1] << 8) + sig[indx + 2];
-			indx += 3;
-			PrintAndLogEx(NORMAL, "\tsignature uri [%d]: %.*s", inturilen, inturilen, &sig[indx]);			
-			indx += inturilen;
-			continue;
-		}
+	PrintAndLogEx(NORMAL, "\tsignature type: %s", ((sigType < stNA) ? ndefSigType_s[sigType] : ndefSigType_s[stNA]));
+	PrintAndLogEx(NORMAL, "\tsignature uri: %s", (sigURI ? "present" : "not present"));
+	
+	size_t intsiglen = (sig[indx + 1] << 8) + sig[indx + 2];
+	// ecdsa 0x04
+	if (sigType == stECDSA) {
+		indx += 3;
+		PrintAndLogEx(NORMAL, "\tsignature [%d]: %s", intsiglen, sprint_hex_inrow(&sig[indx], intsiglen));
 		
-		size_t skiplen = (sig[indx + 1] << 8) + sig[indx + 2];
-		indx += skiplen;
+		uint8_t rval[300] = {0}; 
+		uint8_t sval[300] = {0}; 
+		int res = ecdsa_asn1_get_signature(&sig[indx], intsiglen, rval, sval);
+		if (!res) {
+			PrintAndLogEx(NORMAL ,"\t\tr: %s", sprint_hex(rval, 32));
+			PrintAndLogEx(NORMAL ,"\t\ts: %s", sprint_hex(sval, 32));
+		}
+	}
+	indx += intsiglen;
+	
+	if (sigURI) {
+		size_t intsigurilen = (sig[indx] << 8) + sig[indx + 1];
+		indx += 2;
+		PrintAndLogEx(NORMAL, "\tsignature uri [%d]: %.*s", intsigurilen, intsigurilen, &sig[indx]);			
+		indx += intsigurilen;
+	}
+		
+	uint8_t certFormat = (sig[indx] >> 4) & 0x07;
+	uint8_t certCount = sig[indx] & 0x0f;
+	bool certURI = sig[indx] & 0x80;
+	
+	PrintAndLogEx(NORMAL, "\tcertificate format: %s", ((certFormat < sfNA) ? ndefCertificateFormat_s[certFormat] : ndefCertificateFormat_s[sfNA]));
+	PrintAndLogEx(NORMAL, "\tcertificates count: %d", certCount);
+	
+	// print certificates
+	indx++;
+	for (int i = 0; i < certCount; i++) {
+		size_t intcertlen = (sig[indx + 1] << 8) + sig[indx + 2];
+		indx += 2;
+		
+		PrintAndLogEx(NORMAL, "\tcertificate %d [%d]: %s", i + 1, intcertlen, sprint_hex_inrow(&sig[indx], intcertlen));			
+		indx += intcertlen;
 	}
 
+	// have certificate uri
+	if ((indx <= siglen) && certURI) {
+		size_t inturilen = (sig[indx] << 8) + sig[indx + 1];
+		indx += 2;
+		PrintAndLogEx(NORMAL, "\tcertificate uri [%d]: %.*s", inturilen, inturilen, &sig[indx]);			
+		indx += inturilen;
+	}
+	
 	return 0;
 };
 
diff --git a/client/mifare/ndef.h b/client/mifare/ndef.h
index 35a589602..ca16fecd3 100644
--- a/client/mifare/ndef.h
+++ b/client/mifare/ndef.h
@@ -25,6 +25,21 @@ typedef enum {
 	tnfUnchangedRecord		= 0x06
 } TypeNameFormat_t;
 
+typedef enum {
+	stNotPresent			= 0x00,
+	stRSASSA_PSS_SHA_1		= 0x01,
+	stRSASSA_PKCS1_v1_5_WITH_SHA_1 = 0x02,
+	stDSA					= 0x03,
+	stECDSA					= 0x04,
+	stNA					= 0x05
+} ndefSigType_t;
+
+typedef enum {
+	sfX_509 = 0x00,
+	sfX9_68 = 0x01,
+	sfNA    = 0x02
+} ndefCertificateFormat_t;
+
 typedef struct {
 	bool MessageBegin;
 	bool MessageEnd;

From 2e8771d7a33a37aa56cfbf93cc70f15eb49b9777 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 5 Mar 2019 19:57:08 +0200
Subject: [PATCH 0661/1938] added `hf mf ndef`

---
 client/cmdhfmf.c  | 109 +++++++++++++++++++++++++++++++++++++++++++++-
 client/cmdhfmfp.c |   3 +-
 2 files changed, 109 insertions(+), 3 deletions(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 8823ea2d9..fbd128bf4 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -11,6 +11,7 @@
 #include "cmdhfmf.h"
 #include "mifare/mifare4.h"
 #include "mifare/mad.h"
+#include "mifare/ndef.h"
 
 
 #define MFBLOCK_SIZE 16
@@ -3220,7 +3221,7 @@ int CmdHF14AMfMAD(const char *cmd) {
 	CLIParserInit("hf mf mad", 
 		"Checks and prints Mifare Application Directory (MAD)", 
 		"Usage:\n\thf mf mad -> shows MAD if exists\n"
-			"\thf mf mad -a 03e1 -k d3f7d3f7d3f7 -> shows NDEF data if exists\n");
+			"\thf mf mad -a 03e1 -k ffffffffffff -b -> shows NDEF data if exists. read card with custom key and key B\n");
 
 	void* argtable[] = {
 		arg_param_begin,
@@ -3305,6 +3306,110 @@ int CmdHF14AMfMAD(const char *cmd) {
 	return 0;
 }
 
+int CmdHFMFNDEF(const char *cmd) {
+
+	CLIParserInit("hf mf ndef", 
+		"Prints NFC Data Exchange Format (NDEF)", 
+		"Usage:\n\thf mf ndef -> shows NDEF data\n"
+			"\thf mf ndef -a 03e1 -k ffffffffffff -b -> shows NDEF data with custom AID, key and with key B\n");
+
+	void* argtable[] = {
+		arg_param_begin,
+		arg_litn("vV",  "verbose",  0, 2, "show technical data"),
+		arg_str0("aA",  "aid",      "replace default aid for NDEF", NULL),
+		arg_str0("kK",  "key",      "replace default key for NDEF", NULL),
+		arg_lit0("bB",  "keyb",     "use key B for access sectors (by default: key A)"),
+		arg_param_end
+	};
+	CLIExecWithReturn(cmd, argtable, true);
+	
+	bool verbose = arg_get_lit(1);
+	bool verbose2 = arg_get_lit(1) > 1;
+	uint8_t aid[2] = {0};
+	int aidlen;
+	CLIGetHexWithReturn(2, aid, &aidlen);
+	uint8_t key[6] = {0};
+	int keylen;
+	CLIGetHexWithReturn(3, key, &keylen);
+	bool keyB = arg_get_lit(4);
+	
+	CLIParserFree();
+
+	uint16_t ndefAID = 0x03e1;
+	if (aidlen == 2)
+		ndefAID = (aid[0] << 8) + aid[1];
+	
+	uint8_t ndefkey[6] = {0};
+	memcpy(ndefkey, g_mifare_ndef_key, 6);
+	if (keylen == 6) {
+		memcpy(ndefkey, key, 6);
+	}
+	
+	uint8_t sector0[16 * 4] = {0};
+	uint8_t sector10[16 * 4] = {0};
+	uint8_t data[4096] = {0};
+	int datalen = 0;
+
+	PrintAndLogEx(NORMAL, "");
+	
+	if (mfReadSector(MF_MAD1_SECTOR, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector0)) {
+		PrintAndLogEx(ERR, "read sector 0 error. card don't have MAD or don't have MAD on default keys.");
+		return 2;
+	}
+	
+	bool haveMAD2 = false;
+	int res = MADCheck(sector0, NULL, verbose, &haveMAD2);
+	if (res) {
+		PrintAndLogEx(ERR, "MAD error %d.", res);
+		return res;
+	}
+	
+	if (haveMAD2) {
+		if (mfReadSector(MF_MAD2_SECTOR, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector10)) {
+			PrintAndLogEx(ERR, "read sector 0x10 error. card don't have MAD or don't have MAD on default keys.");
+			return 2;
+		}
+	}
+
+	uint16_t mad[7 + 8 + 8 + 8 + 8] = {0};
+	size_t madlen = 0;
+	if (MADDecode(sector0, (haveMAD2 ? sector10 : NULL), mad, &madlen)) {
+		PrintAndLogEx(ERR, "can't decode mad.");
+		return 10;
+	}
+
+	printf("data reading:");
+	for (int i = 0; i < madlen; i++) {
+		if (ndefAID == mad[i]) {
+			uint8_t vsector[16 * 4] = {0};
+			if (mfReadSector(i + 1, keyB ? MF_KEY_B : MF_KEY_A, ndefkey, vsector)) {
+				PrintAndLogEx(ERR, "read sector %d error.", i + 1);
+				return 2;
+			}
+			
+			memcpy(&data[datalen], vsector, 16 * 3);
+			datalen += 16 * 3;
+			
+			printf(".");
+		}
+	}
+	printf(" OK\n");
+	
+	if (!datalen) {
+		PrintAndLogEx(ERR, "no NDEF data.");
+		return 11;
+	}
+	
+	if (verbose2) {
+		PrintAndLogEx(NORMAL, "NDEF data:");
+		dump_buffer(data, datalen, stdout, 1);
+	}
+		
+	NDEFDecodeAndPrint(data, datalen, verbose);
+
+	return 0;
+}
+
 int CmdHF14AMfList(const char *Cmd) {
 	CmdTraceList("mf");
 	return 0;
@@ -3349,7 +3454,7 @@ static command_t CommandTable[] = {
 	{"csave",		CmdHF14AMfCSave,		0, "Save dump from magic Chinese card into file or emulator"},
 	{"-----------",	CmdHelp,				1, ""},
 	{"mad",			CmdHF14AMfMAD,			0, "Checks and prints MAD"},
-//	{"ndef",		CmdHF14AMfHDEF,			0, "Checks and prints NDEF records from card"},
+	{"ndef",		CmdHFMFNDEF,			0, "Prints NDEF records from card"},
 
 	{"ice",			CmdHF14AMfice,			0, "collect Mifare Classic nonces to file"},
 	{NULL, NULL, 0, NULL}
diff --git a/client/cmdhfmfp.c b/client/cmdhfmfp.c
index 20b6d0fce..348a4a9c9 100644
--- a/client/cmdhfmfp.c
+++ b/client/cmdhfmfp.c
@@ -838,6 +838,7 @@ int CmdHFMFPNDEF(const char *cmd) {
 
 	return 0;
 }
+
 static command_t CommandTable[] =
 {
   {"help",             CmdHelp,					1, "This help"},
@@ -850,7 +851,7 @@ static command_t CommandTable[] =
   {"rdsc",  	       CmdHFMFPRdsc,			0, "Read sectors"},
   {"wrbl",  	       CmdHFMFPWrbl,			0, "Write blocks"},
   {"mad",  	           CmdHFMFPMAD,				0, "Checks and prints MAD"},
-  {"ndef",  	       CmdHFMFPNDEF,			0, "Prints NDEF"},
+  {"ndef",  	       CmdHFMFPNDEF,			0, "Prints NDEF records from card"},
   {NULL,               NULL,					0, NULL}
 };
 

From 2e884db1005cc0c674dce890d825776b0d6dddf6 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 5 Mar 2019 19:44:02 +0100
Subject: [PATCH 0662/1938] Add missing i2c init in sc upgrade

---
 common/i2c.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/common/i2c.c b/common/i2c.c
index 25b17b6bc..53627966e 100644
--- a/common/i2c.c
+++ b/common/i2c.c
@@ -124,6 +124,8 @@ void I2C_Reset_EnterMainProgram(void) {
 // Reset the SIM_Adapter, then enter the bootloader program
 // Reserve for firmware update.
 void I2C_Reset_EnterBootloader(void) {
+	StartTicks();
+	I2C_init();
 	I2C_SetResetStatus(0, 1, 1);
 	WaitMS(100);
 	I2C_SetResetStatus(1, 1, 1);
@@ -801,4 +803,4 @@ void SmartCardSetClock(uint64_t arg0) {
 	cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
 	set_tracing(false);
 	LEDsoff();
-}
\ No newline at end of file
+}

From 581043bc900b6082fd86bce1a5d9beaa69de0fad Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 5 Mar 2019 20:33:18 +0100
Subject: [PATCH 0663/1938] Look for aidlist.json in the client dir

---
 client/cmdsmartcard.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index 8b10dc6fe..f371c87ce 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -87,10 +87,9 @@ static int smart_loadjson(const char *preferredName, const char *suffix, json_t
 	if ( suffix == NULL ) return 1;
 
 	int retval = 0;
-	int size = sizeof(char) * (strlen(preferredName) + strlen(suffix) + 10);
+	int size = sizeof(char) * (strlen(get_my_executable_directory()) + strlen(preferredName) + strlen(suffix) + 10);
 	char * fileName = calloc(size, sizeof(char));
-	sprintf(fileName, "%s.%s", preferredName, suffix);
-
+	sprintf(fileName, "%s%s.%s", get_my_executable_directory(), preferredName, suffix);
 	*root = json_load_file(fileName, 0, &error);
 	if (!*root) {
 		PrintAndLogEx(ERR, "json (%s) error on line %d: %s", fileName, error.line, error.text);

From 4dfcb727afefecc42cb708b73b92d3f2f037cb8b Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 5 Mar 2019 21:14:30 +0100
Subject: [PATCH 0664/1938] cmds history: don't push to history if last command
 is replayed

---
 client/proxmark3.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/client/proxmark3.c b/client/proxmark3.c
index 246da350b..072fec427 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -167,7 +167,9 @@ main_loop(char *script_cmds_file, char *script_cmd, bool usb_present) {
 
 			if (cmd[0] != 0x00) {
 				int ret = CommandReceived(cmd);
-				add_history(cmd);
+				HIST_ENTRY * entry = history_get(history_length);
+				if ((!entry) || (strcmp(entry->line, cmd) != 0))
+					add_history(cmd);
 				
 				// exit or quit
 				if (ret == 99) 
@@ -384,4 +386,4 @@ int main(int argc, char* argv[]) {
 	}
 	
 	exit(0);
-}
\ No newline at end of file
+}

From 05f5fb3e47e4c46711afed39638ffb0c49084755 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 6 Mar 2019 00:43:59 +0200
Subject: [PATCH 0665/1938] del verbose on warning

---
 client/mifare/mad.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/client/mifare/mad.c b/client/mifare/mad.c
index 46a95f89d..3f44fdbbf 100644
--- a/client/mifare/mad.c
+++ b/client/mifare/mad.c
@@ -111,15 +111,13 @@ int madCRCCheck(uint8_t *sector, bool verbose, int MADver) {
 	if (MADver == 1) {
 		uint8_t crc = CRC8Mad(&sector[16 + 1], 15 + 16);
 		if (crc != sector[16]) {
-			if (verbose)
-				PrintAndLogEx(WARNING, "Wrong MAD%d CRC. Calculated: 0x%02x, from card: 0x%02x", MADver, crc, sector[16]);
+			PrintAndLogEx(WARNING, "Wrong MAD%d CRC. Calculated: 0x%02x, from card: 0x%02x", MADver, crc, sector[16]);
 			return 3;
 		};
 	} else {
 		uint8_t crc = CRC8Mad(&sector[1], 15 + 16 + 16);
 		if (crc != sector[0]) {
-			if (verbose)
-				PrintAndLogEx(WARNING, "Wrong MAD%d CRC. Calculated: 0x%02x, from card: 0x%02x", MADver, crc, sector[16]);
+			PrintAndLogEx(WARNING, "Wrong MAD%d CRC. Calculated: 0x%02x, from card: 0x%02x", MADver, crc, sector[16]);
 			return 3;
 		};
 	}

From cfcdbcdceeca53ca019e42514284cf066442acd5 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 6 Mar 2019 00:50:12 +0200
Subject: [PATCH 0666/1938] added some checks into `madcheck`

---
 client/mifare/mad.c | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/client/mifare/mad.c b/client/mifare/mad.c
index 3f44fdbbf..96a4bf152 100644
--- a/client/mifare/mad.c
+++ b/client/mifare/mad.c
@@ -133,6 +133,8 @@ uint16_t madGetAID(uint8_t *sector, int MADver, int sectorNo) {
 }
 
 int MADCheck(uint8_t *sector0, uint8_t *sector10, bool verbose, bool *haveMAD2) {
+	int res = 0;
+	
 	if (!sector0)
 		return 1;
 	
@@ -167,23 +169,21 @@ int MADCheck(uint8_t *sector0, uint8_t *sector10, bool verbose, bool *haveMAD2)
 	if (haveMAD2)
 		*haveMAD2 = (MADVer == 2);
 
-	int res = madCRCCheck(sector0, true, 1);
-	if (res)
-		return res;	
+	res = madCRCCheck(sector0, true, 1);
 	
-	if (verbose)
+	if (verbose && !res)
 		PrintAndLogEx(NORMAL, "CRC8-MAD1 OK.");
 	
 	if (MADVer == 2 && sector10) {
-		int res = madCRCCheck(sector10, true, 2);
-		if (res)
-			return res;	
+		int res2 = madCRCCheck(sector10, true, 2);
+		if (!res)
+			res = res2;	
 
-		if (verbose)
+		if (verbose & !res2)
 			PrintAndLogEx(NORMAL, "CRC8-MAD2 OK.");
 	}
 	
-	return 0;
+	return res;
 }
 
 int MADDecode(uint8_t *sector0, uint8_t *sector10, uint16_t *mad, size_t *madlen) {
@@ -214,11 +214,8 @@ int MADDecode(uint8_t *sector0, uint8_t *sector10, uint16_t *mad, size_t *madlen
 int MAD1DecodeAndPrint(uint8_t *sector, bool verbose, bool *haveMAD2) {
 
 	// check MAD1 only
-	int res = MADCheck(sector, NULL, verbose, haveMAD2);
-	
-	if (verbose && !res)
-		PrintAndLogEx(NORMAL, "CRC8-MAD OK.");
-	
+	MADCheck(sector, NULL, verbose, haveMAD2);
+		
 	// info byte
 	uint8_t InfoByte = sector[16 + 1] & 0x3f;
 	if (InfoByte) {
@@ -245,7 +242,7 @@ int MAD2DecodeAndPrint(uint8_t *sector, bool verbose) {
 	int res = madCRCCheck(sector, true, 2);
 
 	if (verbose && !res)
-		PrintAndLogEx(NORMAL, "CRC8-MAD OK.");
+		PrintAndLogEx(NORMAL, "CRC8-MAD2 OK.");
 
 	uint8_t InfoByte = sector[1] & 0x3f;
 	PrintAndLogEx(NORMAL, "MAD2 Card publisher sector: 0x%02x", InfoByte);

From c5e1f9989c7134b74805d4b200701c5d4e29e139 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 6 Mar 2019 20:15:19 +0100
Subject: [PATCH 0667/1938] analyse nuid: fix crc -> selftest ok now

---
 client/cmdanalyse.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/client/cmdanalyse.c b/client/cmdanalyse.c
index f756a44c0..4f7ec5661 100644
--- a/client/cmdanalyse.c
+++ b/client/cmdanalyse.c
@@ -850,15 +850,9 @@ void generate4bNUID(uint8_t *uid, uint8_t *nuid){
 	compute_crc(CRC_14443_A, uid, 3, &b1, &b2);
 	nuid[0] |= (b2 & 0xE0) | 0xF;
 	nuid[1] = b1;
-	
 	crc = b1;
 	crc |= b2 << 8;
-	
-	crc = update_crc16(uid[3], crc);
-	crc = update_crc16(uid[4], crc);
-	crc = update_crc16(uid[5], crc);
-	crc = update_crc16(uid[6], crc);
-		
+	crc = crc16_fast(&uid[3], 4, reflect16(crc), true, true);
 	nuid[2] = (crc >> 8) & 0xFF ;
 	nuid[3] = crc & 0xFF;
 }
@@ -870,6 +864,7 @@ int CmdAnalyseNuid(const char *Cmd){
 	char cmdp = tolower(param_getchar(Cmd, 0));
 	if (strlen(Cmd) == 0|| cmdp == 'h') return usage_analyse_nuid();
 
+	/* src: http://www.gorferay.com/mifare-and-handling-of-uids/ */
 	/* selftest  UID 040D681AB52281  -> NUID 8F430FEF */
 	if (cmdp == 't' || cmdp == 'T') {
 		memcpy(uid, "\x04\x0d\x68\x1a\xb5\x22\x81", 7);

From 259a561a6921ab88485d3321887feb5081ddf734 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 7 Mar 2019 15:55:53 +0100
Subject: [PATCH 0668/1938] analyse nuid: better ref and selftest from ref +
 little fix

---
 client/cmdanalyse.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/client/cmdanalyse.c b/client/cmdanalyse.c
index 4f7ec5661..07b64f34f 100644
--- a/client/cmdanalyse.c
+++ b/client/cmdanalyse.c
@@ -848,7 +848,7 @@ void generate4bNUID(uint8_t *uid, uint8_t *nuid){
 	uint8_t b1, b2;
 		
 	compute_crc(CRC_14443_A, uid, 3, &b1, &b2);
-	nuid[0] |= (b2 & 0xE0) | 0xF;
+	nuid[0] = (b2 & 0xE0) | 0xF;
 	nuid[1] = b1;
 	crc = b1;
 	crc |= b2 << 8;
@@ -864,15 +864,22 @@ int CmdAnalyseNuid(const char *Cmd){
 	char cmdp = tolower(param_getchar(Cmd, 0));
 	if (strlen(Cmd) == 0|| cmdp == 'h') return usage_analyse_nuid();
 
-	/* src: http://www.gorferay.com/mifare-and-handling-of-uids/ */
-	/* selftest  UID 040D681AB52281  -> NUID 8F430FEF */
+	/* src: https://www.nxp.com/docs/en/application-note/AN10927.pdf */
+	/* selftest1  UID 040D681AB52281  -> NUID 8F430FEF */
+	/* selftest2  UID 04183F09321B85  -> NUID 4F505D7D */
 	if (cmdp == 't' || cmdp == 'T') {
 		memcpy(uid, "\x04\x0d\x68\x1a\xb5\x22\x81", 7);
 		generate4bNUID(uid, nuid);
 		if ( 0 == memcmp(nuid, "\x8f\x43\x0f\xef", 4))
-			PrintAndLogEx(SUCCESS, "Selftest OK\n");
+			PrintAndLogEx(SUCCESS, "Selftest1 OK\n");
 		else
-			PrintAndLogEx(FAILED, "Selftest Failed\n");
+			PrintAndLogEx(FAILED, "Selftest1 Failed\n");
+		memcpy(uid, "\x04\x18\x3f\x09\x32\x1b\x85", 7);
+		generate4bNUID(uid, nuid);
+		if ( 0 == memcmp(nuid, "\x4f\x50\x5d\x7d", 4))
+			PrintAndLogEx(SUCCESS, "Selftest2 OK\n");
+		else
+			PrintAndLogEx(FAILED, "Selftest2 Failed\n");
 		return 0;
 	}
 

From 2a761e80db6d38566443f2d6d86cf3779fecacf1 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Thu, 7 Mar 2019 19:48:20 +0100
Subject: [PATCH 0669/1938] chg: analyse nuid' - added colors

---
 client/cmdanalyse.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/client/cmdanalyse.c b/client/cmdanalyse.c
index 07b64f34f..fea907206 100644
--- a/client/cmdanalyse.c
+++ b/client/cmdanalyse.c
@@ -867,19 +867,17 @@ int CmdAnalyseNuid(const char *Cmd){
 	/* src: https://www.nxp.com/docs/en/application-note/AN10927.pdf */
 	/* selftest1  UID 040D681AB52281  -> NUID 8F430FEF */
 	/* selftest2  UID 04183F09321B85  -> NUID 4F505D7D */
-	if (cmdp == 't' || cmdp == 'T') {
+	if (cmdp == 't') {
 		memcpy(uid, "\x04\x0d\x68\x1a\xb5\x22\x81", 7);
 		generate4bNUID(uid, nuid);
-		if ( 0 == memcmp(nuid, "\x8f\x43\x0f\xef", 4))
-			PrintAndLogEx(SUCCESS, "Selftest1 OK\n");
-		else
-			PrintAndLogEx(FAILED, "Selftest1 Failed\n");
+		
+		bool test1 = (0 == memcmp(nuid, "\x8f\x43\x0f\xef", 4));
+		PrintAndLogEx(SUCCESS, "Selftest1 %s\n",  test1 ? _GREEN_(OK): _RED_(Fail));
+		
 		memcpy(uid, "\x04\x18\x3f\x09\x32\x1b\x85", 7);
 		generate4bNUID(uid, nuid);
-		if ( 0 == memcmp(nuid, "\x4f\x50\x5d\x7d", 4))
-			PrintAndLogEx(SUCCESS, "Selftest2 OK\n");
-		else
-			PrintAndLogEx(FAILED, "Selftest2 Failed\n");
+		bool test2 = (0 == memcmp(nuid, "\x4f\x50\x5d\x7d", 4));		
+		PrintAndLogEx(SUCCESS, "Selftest2 %s\n", test2 ? _GREEN_(OK) : _RED_(Fail));
 		return 0;
 	}
 

From 1f0c1dff5e123ddbe8291ec57c55b5fd4e8d3dd5 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 7 Mar 2019 21:13:58 +0100
Subject: [PATCH 0670/1938] Fix issue #118 for better FSK on saturated signals

---
 common/lfdemod.c | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/common/lfdemod.c b/common/lfdemod.c
index 1ef5915c9..1fd69d1b9 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -106,16 +106,23 @@ int32_t compute_mean_int(int *in, size_t N) {
 }
 
 void zeromean(uint8_t* data, size_t size) {
-			
+
 	// zero mean data
 	int i, accum = 0;
 	for (i = 10; i < size; ++i)
-		accum += data[i];
-	
-	accum /= (size - 10);
-	
-	for (i = 0; i < size; ++i)
-		data[i] -= accum;
+		accum += data[i] - 128;
+	accum /= (int)(size - 10);
+
+	for (i = 0; i < size; ++i) {
+		if (accum > 0) {
+			data[i] = (data[i] >= accum)? data[i] - accum : 0;
+		}
+		if (accum < 0) {
+			data[i] = (255 - data[i] >=  -accum)? data[i] - accum : 255;
+		}
+	}
+	// recompute signal characteristics:
+	isNoise(data, size);
 }
 
 //test samples are not just noise
@@ -1668,11 +1675,11 @@ size_t fsk_wave_demod(uint8_t *dest, size_t size, uint8_t fchigh, uint8_t fclow,
 	size_t last_transition = 0;
 	size_t idx = 1;
 	size_t numBits = 0;
-	
+
 	//find start of modulating data in trace 	
 	idx = findModStart(dest, size, fchigh);
 	// Need to threshold first sample
-	dest[0] = (dest[idx] < signalprop.mean) ? 0 : 1;
+	dest[idx] = (dest[idx] < signalprop.mean) ? 0 : 1;
 	
 	last_transition = idx;
 	idx++;
@@ -2119,4 +2126,4 @@ int detectIOProx(uint8_t *dest, size_t *size, int *waveStartIdx) {
 		return (int) start_idx;
 	}
 	return -6;
-}
\ No newline at end of file
+}

From 9764381aa447802752d7598e827683be9b547457 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 8 Mar 2019 17:25:36 +0100
Subject: [PATCH 0671/1938] fix: ndef - missing comma

---
 client/mifare/ndef.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/mifare/ndef.c b/client/mifare/ndef.c
index 13a793725..6c7e12229 100644
--- a/client/mifare/ndef.c
+++ b/client/mifare/ndef.c
@@ -22,7 +22,7 @@ static const char *TypeNameFormat_s[] = {
 	"Absolute URI Record",
 	"External Record",
 	"Unknown Record",
-	"Unchanged Record"
+	"Unchanged Record",
 	"n/a"
 };
 

From 4160e32b0ae050383c56529c3d45a62881b52e86 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 8 Mar 2019 19:06:55 +0100
Subject: [PATCH 0672/1938] Replace isNoise by computeSignalProperties and
 removeSignalOffset

---
 armsrc/lfsampling.c |   7 +--
 client/cmddata.c    |  66 +++++++++++++-------------
 client/cmdlfem4x.c  |  11 +++--
 client/cmdlft55xx.c |   6 ++-
 client/comms.c      |   2 +-
 common/lfdemod.c    | 111 ++++++++++++--------------------------------
 common/lfdemod.h    |  18 ++++---
 7 files changed, 92 insertions(+), 129 deletions(-)

diff --git a/armsrc/lfsampling.c b/armsrc/lfsampling.c
index 96963d389..4b036d088 100644
--- a/armsrc/lfsampling.c
+++ b/armsrc/lfsampling.c
@@ -204,8 +204,9 @@ uint32_t DoAcquisition(uint8_t decimation, uint32_t bits_per_sample, bool averag
 					dest[0], dest[1], dest[2], dest[3], dest[4], dest[5], dest[6], dest[7]);
 	}
 	
-	// Ensure that noise check is performed for any device-side processing
-	isNoise(dest, bufsize);
+	// Ensure that DC offset removal and noise check is performed for any device-side processing
+	removeSignalOffset(dest, bufsize);
+	computeSignalProperties(dest, bufsize);
 	
 	return data.numbits;
 }
@@ -451,4 +452,4 @@ uint32_t doCotagAcquisitionManchester() {
 		}
 	}
 	return sample_counter;
-}
\ No newline at end of file
+}
diff --git a/client/cmddata.c b/client/cmddata.c
index ba3d61156..285b4d189 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -1393,15 +1393,13 @@ int CmdHide(const char *Cmd) {
 
 //zero mean GraphBuffer
 int CmdHpf(const char *Cmd) {
-	int i, accum = 0;
-
-	for (i = 10; i < GraphTraceLen; ++i)
-		accum += GraphBuffer[i];
-	
-	accum /= (GraphTraceLen - 10);
-	
-	for (i = 0; i < GraphTraceLen; ++i)
-		GraphBuffer[i] -= accum;
+	uint8_t bits[GraphTraceLen];
+	size_t size = getFromGraphBuf(bits);
+	removeSignalOffset(bits, size);
+	// push it back to graph
+	setGraphBuf(bits, size);
+	// set signal properties low/high/mean/amplitude and is_noise detection
+	computeSignalProperties(bits, size);
 
 	RepaintGraphWindow();
 	return 0;
@@ -1471,12 +1469,15 @@ int getSamples(int n, bool silent) {
 		GraphTraceLen = n;
 	}
 
-	//ICEMAN todo
 	uint8_t bits[GraphTraceLen];
 	size_t size = getFromGraphBuf(bits);
-	// set signal properties low/high/mean/amplitude and is_noice detection
-	isNoise(bits, size);
-	
+	// TODO now DC removal is done already on device, right ?
+	// removeSignalOffset(bits, size);
+	// push it back to graph
+	// setGraphBuf(bits, size);
+	// set signal properties low/high/mean/amplitude and is_noise detection
+	computeSignalProperties(bits, size);
+
 	setClockGrid(0, 0);
 	DemodBufferLen = 0;
 	RepaintGraphWindow();
@@ -1610,15 +1611,19 @@ int CmdLoad(const char *Cmd) {
 		fclose(f);
 
 	PrintAndLogEx(SUCCESS, "loaded %d samples", GraphTraceLen);
+	
+	uint8_t bits[GraphTraceLen];
+	size_t size = getFromGraphBuf(bits);
+	// set signal properties low/high/mean/amplitude and is_noise detection
+	removeSignalOffset(bits, size);
+	// push it back to graph
+	setGraphBuf(bits, size);
+	// set signal properties low/high/mean/amplitude and is_noise detection
+	computeSignalProperties(bits, size);
+
 	setClockGrid(0,0);
 	DemodBufferLen = 0;
 	RepaintGraphWindow();
-	
-	//ICEMAN todo	
-	// set signal properties low/high/mean/amplitude and isnoice detection
-	uint8_t bits[GraphTraceLen];
-	size_t size = getFromGraphBuf(bits);
-	isNoise(bits, size);
 	return 0;
 }
 
@@ -1683,11 +1688,11 @@ int CmdNorm(const char *Cmd) {
 		}
 	}
 
-	//ICEMAN todo	
-	// set signal properties low/high/mean/amplitude and isnoice detection
 	uint8_t bits[GraphTraceLen];
 	size_t size = getFromGraphBuf(bits);
-	isNoise(bits, size);
+	// set signal properties low/high/mean/amplitude and is_noise detection
+	computeSignalProperties(bits, size);
+
 	RepaintGraphWindow();
 	return 0;
 }
@@ -1773,11 +1778,11 @@ int CmdDirectionalThreshold(const char *Cmd) {
 
 	directionalThreshold(GraphBuffer, GraphBuffer, GraphTraceLen, up, down);
 	
-	//ICEMAN todo	
 	// set signal properties low/high/mean/amplitude and isnoice detection
 	uint8_t bits[GraphTraceLen];
 	size_t size = getFromGraphBuf(bits);
-	isNoise(bits, size);
+	// set signal properties low/high/mean/amplitude and is_noice detection
+	computeSignalProperties(bits, size);
 
 	RepaintGraphWindow();
 	return 0;
@@ -1805,11 +1810,10 @@ int CmdZerocrossings(const char *Cmd) {
 		}
 	}
 
-	//ICEMAN todo	
-	// set signal properties low/high/mean/amplitude and isnoice detection
 	uint8_t bits[GraphTraceLen];
 	size_t size = getFromGraphBuf(bits);
-	isNoise(bits, size);
+	// set signal properties low/high/mean/amplitude and is_noise detection
+	computeSignalProperties(bits, size);
 
 	RepaintGraphWindow();
 	return 0;
@@ -2063,13 +2067,11 @@ int CmdDataIIR(const char *Cmd){
 	//iceIIR_Butterworth(GraphBuffer, GraphTraceLen);
 	iceSimple_Filter(GraphBuffer, GraphTraceLen, k);
 
-	//ICEMAN todo	
-	// set signal properties low/high/mean/amplitude and isnoice detection
 	uint8_t bits[GraphTraceLen];
 	size_t size = getFromGraphBuf(bits);
-	isNoise(bits, size);
-
-	RepaintGraphWindow();	
+	// set signal properties low/high/mean/amplitude and is_noise detection
+	computeSignalProperties(bits, size);
+	RepaintGraphWindow();
 	return 0;
 }
 
diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 6d90e550f..e4909ace9 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -800,7 +800,7 @@ int EM4x50Read(const char *Cmd, bool verbose) {
 	
 	uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
 	size_t size = getFromGraphBuf(bits);
-	isNoise(bits, size);
+	computeSignalProperties(bits, size);
 	
 	signal_t *sp = getSignalProperties();
 	high = sp->high;
@@ -999,9 +999,14 @@ bool downloadSamplesEM(){
 		PrintAndLogEx(WARNING, "command execution time out");
 		return false;
 	}
-	setGraphBuf(got, sizeof(got));
 
-	if (isNoise(got, sizeof(got))) {
+	// TODO now DC removal is done already on device, right ?
+	// removeSignalOffset(got, sizeof(got));
+	setGraphBuf(got, sizeof(got));
+	// set signal properties low/high/mean/amplitude and is_noise detection
+	computeSignalProperties(got, sizeof(got));
+	RepaintGraphWindow();
+	if (getSignalProperties()->isnoise) {
 		PrintAndLogEx(DEBUG, "No tag found");
 		return false;
 	}
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 3c7547e34..446e440ce 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1330,8 +1330,12 @@ bool AquireData( uint8_t page, uint8_t block, bool pwdmode, uint32_t password )
 		PrintAndLogEx(WARNING, "command execution time out");
 		return false;
 	}
+	// set signal properties low/high/mean/amplitude and is_noise detection
+	removeSignalOffset(got, sizeof(got));
+	computeSignalProperties(got, sizeof(got));
 	setGraphBuf(got, sizeof(got));
-	return !isNoise(got, sizeof(got));
+	RepaintGraphWindow();
+	return !getSignalProperties()->isnoise;
 }
 
 char * GetBitRateStr(uint32_t id, bool xmode) {
diff --git a/client/comms.c b/client/comms.c
index 5beaa0adb..f08c5f413 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -463,7 +463,7 @@ bool GetFromDevice(DeviceMemType_t memtype, uint8_t *dest, uint32_t bytes, uint3
 			return dl_it(dest, bytes, start_index, response, ms_timeout, show_warning, CMD_FLASHMEM_DOWNLOADED);
 		}
 		case SIM_MEM: {
-			//UsbCommand c = {CMD_DOWNLOAND_SIM_MEM, {start_index, bytes, 0}};
+			//UsbCommand c = {CMD_DOWNLOAD_SIM_MEM, {start_index, bytes, 0}};
 			//SendCommand(&c);
 			//return dl_it(dest, bytes, start_index, response, ms_timeout, show_warning, CMD_DOWNLOADED_SIMMEM);
 			return false;
diff --git a/common/lfdemod.c b/common/lfdemod.c
index 1fd69d1b9..b9807ff8f 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -47,8 +47,7 @@
 //**********************************************************************************************
 #define LOWEST_DEFAULT_CLOCK 32
 #define FSK_PSK_THRESHOLD   123
-//might not be high enough for noisy environments
-#define NOICE_AMPLITUDE_THRESHOLD 10
+
 //to allow debug print calls when used not on dev
 
 //void dummy(char *fmt, ...){}
@@ -76,6 +75,7 @@ static void resetSignal(void) {
 	signalprop.amplitude = 0;
 	signalprop.isnoise = true;
 }
+
 static void printSignal(void) {
 	prnt("LF signal properties:");
 	prnt("  high..........%d", signalprop.high);
@@ -83,94 +83,47 @@ static void printSignal(void) {
 	prnt("  mean..........%d", signalprop.mean);
 	prnt("  amplitude.....%d", signalprop.amplitude);
 	prnt("  is Noise......%s", (signalprop.isnoise) ? "Yes" : "No");
-	prnt("  THRESHOLD noice amplitude......%d" , NOICE_AMPLITUDE_THRESHOLD);
+	prnt("  THRESHOLD noise amplitude......%d" , NOISE_AMPLITUDE_THRESHOLD);
 }
 
-// Function to compute mean for a series
-// rounded to integer..
-uint32_t compute_mean_uint(uint8_t *in, size_t N) {
-	uint32_t mean = 0;
-	for (size_t i = 0; i < N; i++)
-		mean += in[i];		
-
-	return mean / N;
-}
-// Function to compute mean for a series
-// rounded to integer..
-int32_t compute_mean_int(int *in, size_t N) {
-	int32_t mean = 0;
-	for (size_t i = 0; i < N; i++)
-		mean += in[i];
-	
-	return mean / (int)N;
-}
-
-void zeromean(uint8_t* data, size_t size) {
-
-	// zero mean data
-	int i, accum = 0;
-	for (i = 10; i < size; ++i)
-		accum += data[i] - 128;
-	accum /= (int)(size - 10);
-
-	for (i = 0; i < size; ++i) {
-		if (accum > 0) {
-			data[i] = (data[i] >= accum)? data[i] - accum : 0;
-		}
-		if (accum < 0) {
-			data[i] = (255 - data[i] >=  -accum)? data[i] - accum : 255;
-		}
-	}
-	// recompute signal characteristics:
-	isNoise(data, size);
-}
-
-//test samples are not just noise
-// By measuring mean and look at amplitude of signal from HIGH / LOW,   we can detect noise
-bool isNoise_int(int *bits, uint32_t size) {
+void computeSignalProperties(uint8_t *samples, uint32_t size) {
 	resetSignal();
-	if ( bits == NULL || size < 100 ) return true;
-	
-	int32_t sum = 0;
-	for ( size_t i = 0; i < size; i++) {
-		if ( bits[i] < signalprop.low ) signalprop.low = bits[i];
-		if ( bits[i] > signalprop.high ) signalprop.high = bits[i];
-		sum += bits[i];		
-	}
 
-	// measure amplitude of signal
-	signalprop.mean = sum / (int)size;
-	signalprop.amplitude = ABS(signalprop.high - signalprop.mean);
-	signalprop.isnoise = signalprop.amplitude < NOICE_AMPLITUDE_THRESHOLD;
-	
-	if (g_debugMode) 
-		printSignal();
-	
-	return signalprop.isnoise;
-}
-//test samples are not just noise
-// By measuring mean and look at amplitude of signal from HIGH / LOW, 
-// we can detect noise
-bool isNoise(uint8_t *bits, uint32_t size) {
-	resetSignal();
-	if ( bits == NULL || size < 100 ) return true;
-	
 	uint32_t sum = 0;
 	for ( uint32_t i = 0; i < size; i++) {
-		if ( bits[i] < signalprop.low ) signalprop.low = bits[i];
-		if ( bits[i] > signalprop.high ) signalprop.high = bits[i];
-		sum += bits[i];		
+		if ( samples[i] < signalprop.low ) signalprop.low = samples[i];
+		if ( samples[i] > signalprop.high ) signalprop.high = samples[i];
+		sum += samples[i];
 	}
 
 	// measure amplitude of signal
 	signalprop.mean = sum / size;
 	signalprop.amplitude = signalprop.high - signalprop.mean;
-	signalprop.isnoise =  signalprop.amplitude < NOICE_AMPLITUDE_THRESHOLD;
-	
+	// By measuring mean and look at amplitude of signal from HIGH / LOW, 
+	// we can detect noise
+	signalprop.isnoise =  signalprop.amplitude < NOISE_AMPLITUDE_THRESHOLD;
+
 	if (g_debugMode) 
 		printSignal();
+}
 
-	return signalprop.isnoise;
+void removeSignalOffset(uint8_t *samples, uint32_t size) {
+	if ( samples == NULL || size < SIGNAL_MIN_SAMPLES ) return;
+
+	int acc_off = 0;
+	for (uint32_t i = SIGNAL_IGNORE_FIRST_SAMPLES; i < size; i++)
+		acc_off += samples[i] - 128;
+	acc_off /= (int)(size - SIGNAL_IGNORE_FIRST_SAMPLES);
+
+	// shift and saturate samples to center the mean
+	for ( uint32_t i = 0; i < size; i++) {
+		if (acc_off > 0) {
+			samples[i] = (samples[i] >= acc_off)? samples[i] - acc_off : 0;
+		}
+		if (acc_off < 0) {
+			samples[i] = (255 - samples[i] >=  -acc_off)? samples[i] - acc_off : 255;
+		}
+	}
 }
 
 //by marshmellow
@@ -1962,8 +1915,6 @@ int detectAWID(uint8_t *dest, size_t *size, int *waveStartIdx) {
 
 	if (signalprop.isnoise) return -2;
 
-	zeromean(dest, *size);
-	
 	// FSK2a demodulator  clock 50, invert 1, fcHigh 10, fcLow 8
 	*size = fskdemod(dest, *size, 50, 1, 10, 8, waveStartIdx); //awid fsk2a
 
@@ -2029,8 +1980,6 @@ int HIDdemodFSK(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32
 	
 	if (signalprop.isnoise) return -2;
 
-	zeromean(dest, *size);
-	
 	// FSK demodulator  fsk2a so invert and fc/10/8
 	*size = fskdemod(dest, *size, 50, 1, 10, 8, waveStartIdx); //hid fsk2a
 
@@ -2090,8 +2039,6 @@ int detectIOProx(uint8_t *dest, size_t *size, int *waveStartIdx) {
 	
 	if (signalprop.isnoise) return -2;
 	
-	zeromean(dest, *size);
-		
 	// FSK demodulator  RF/64, fsk2a so invert, and fc/10/8
 	*size = fskdemod(dest, *size, 64, 1, 10, 8, waveStartIdx);  //io fsk2a
 	
diff --git a/common/lfdemod.h b/common/lfdemod.h
index 43537b18b..a6542059e 100644
--- a/common/lfdemod.h
+++ b/common/lfdemod.h
@@ -20,6 +20,14 @@
 #include <stdbool.h> // for bool
 #include "parity.h"  // for parity test
 #include "util.h"	 // for ARRAYLEN
+
+//might not be high enough for noisy environments
+#define NOISE_AMPLITUDE_THRESHOLD 10
+//ignore buffer with less than x samples
+#define SIGNAL_MIN_SAMPLES 100
+//ignore first x samples of the buffer
+#define SIGNAL_IGNORE_FIRST_SAMPLES 10
+
 //generic
 typedef struct {
 	int low;
@@ -28,14 +36,10 @@ typedef struct {
 	int amplitude;
 	bool isnoise;
 } signal_t;
-extern signal_t* getSignalProperties(void);
+signal_t* getSignalProperties(void);
 
-extern uint32_t	compute_mean_uint(uint8_t *in, size_t N);
-extern int32_t	compute_mean_int(int *in, size_t N);
-bool isNoise_int(int *bits, uint32_t size);
-bool isNoise(uint8_t *bits, uint32_t size);
-extern void zeromean(uint8_t* data, size_t size);
-	
+void computeSignalProperties(uint8_t *bits, uint32_t size);
+void removeSignalOffset(uint8_t *samples, uint32_t size);
 void getNextLow(uint8_t *samples, size_t size, int low, size_t *i);
 void getNextHigh(uint8_t *samples, size_t size, int high, size_t *i);
 bool loadWaveCounters(uint8_t *samples, size_t size, int lowToLowWaveLen[], int highToLowWaveLen[], int *waveCnt, int *skip, int *minClk, int *high, int *low);

From abddff513e5ab3d8edc89bb120f2019ae7893223 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 8 Mar 2019 19:49:12 +0100
Subject: [PATCH 0673/1938] loadFile: fix double free

---
 client/cmdflashmem.c       |  3 ++-
 client/cmdhfmf.c           |  2 +-
 client/loclass/fileutils.c | 13 +++----------
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/client/cmdflashmem.c b/client/cmdflashmem.c
index 34bb89cbc..cedb9516d 100644
--- a/client/cmdflashmem.c
+++ b/client/cmdflashmem.c
@@ -248,6 +248,7 @@ int CmdFlashMemLoad(const char *Cmd){
 			res = loadFile(filename, "bin", data, &datalen);
 			//int res = loadFileEML( filename, "eml", data, &datalen);
 			if ( res ) {
+				free(data);
 				return 1;
 			}
 			
@@ -607,4 +608,4 @@ int CmdHelp(const char *Cmd) {
 	return 0;
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index fbd128bf4..4dd3b4b3e 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -2768,7 +2768,7 @@ int CmdHF14AMfCLoad(const char *Cmd) {
 	// 64 or 256blocks.
 	if (datalen != 1024 && datalen != 4096) {
 		PrintAndLogEx(WARNING, "File content error. ");
-		free(data);		
+		free(data);
 		return 2;
 	}
 	
diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index 6f6f1a5a4..f9d4db8d1 100644
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -257,6 +257,7 @@ int loadFile(const char *preferredName, const char *suffix, void* data, size_t*
 
 	if ( preferredName == NULL ) return 1;
 	if ( suffix == NULL ) return 1;
+	if ( data == NULL ) return 1;
 
 	int retval = 0;
 	int size = sizeof(char) * (strlen(preferredName) + strlen(suffix) + 10);
@@ -275,7 +276,7 @@ int loadFile(const char *preferredName, const char *suffix, void* data, size_t*
 	long fsize = ftell(f);
 	fseek(f, 0, SEEK_SET);
 
-	if ( fsize < 0 ) 	{
+	if ( fsize < 0 ) {
 		PrintAndLogDevice(FAILED, "error, when getting filesize");
 		retval = 1;
 		goto out;
@@ -294,11 +295,7 @@ int loadFile(const char *preferredName, const char *suffix, void* data, size_t*
 		PrintAndLogDevice(FAILED, "error, bytes read mismatch file size");
 		free(dump);
 		retval = 3;
-		goto out;		
-	}
-	
-	if ( (data) == NULL) {
-		(data) = calloc( bytes_read, sizeof(uint8_t));
+		goto out;
 	}
 	
 	memcpy( (data), dump, bytes_read);
@@ -310,10 +307,6 @@ int loadFile(const char *preferredName, const char *suffix, void* data, size_t*
 
 out:	
 	fclose(f);
-	
-	if (data)
-		free(data);
-	
 	free(fileName);
 	
 	return retval;

From ae719c3b05c90f6479ba4f67f15c261a52ea55fb Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 8 Mar 2019 20:10:16 +0100
Subject: [PATCH 0674/1938] Fix CmdT55xxBruteForce infinite loop

---
 client/cmdlft55xx.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 3c7547e34..ac92c119b 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1701,7 +1701,7 @@ int CmdT55xxBruteForce(const char *Cmd) {
 	
     PrintAndLogEx(INFO, "Search password range [%08X -> %08X]", start_password, end_password);
 
-    while ( !found || (curr <= end_password)){
+    while ( !found ){
 
 		printf("."); fflush(stdout);
 		
@@ -1710,13 +1710,15 @@ int CmdT55xxBruteForce(const char *Cmd) {
 		}
 			
 		if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, curr)) {
-			PrintAndLogEx(WARNING, "Aquireing data from device failed. Quitting");
+			PrintAndLogEx(WARNING, "Aquiring data from device failed. Quitting");
 			return 0;
 		}
 		
 		found = tryDetectModulation();
 
-		++curr;
+		if (curr == end_password)
+			break;
+		curr++;
     }
     
     PrintAndLogEx(NORMAL, "");

From 1cba26decfc6997b3501f45acec2f85746a2c80a Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 8 Mar 2019 20:30:54 +0100
Subject: [PATCH 0675/1938] remove redundant removeSignalOffset

---
 client/cmddata.c    | 4 ----
 client/cmdlfem4x.c  | 2 --
 client/cmdlft55xx.c | 5 ++---
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/client/cmddata.c b/client/cmddata.c
index 285b4d189..fc34f3e80 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -1471,10 +1471,6 @@ int getSamples(int n, bool silent) {
 
 	uint8_t bits[GraphTraceLen];
 	size_t size = getFromGraphBuf(bits);
-	// TODO now DC removal is done already on device, right ?
-	// removeSignalOffset(bits, size);
-	// push it back to graph
-	// setGraphBuf(bits, size);
 	// set signal properties low/high/mean/amplitude and is_noise detection
 	computeSignalProperties(bits, size);
 
diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index e4909ace9..8b9530957 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -1000,8 +1000,6 @@ bool downloadSamplesEM(){
 		return false;
 	}
 
-	// TODO now DC removal is done already on device, right ?
-	// removeSignalOffset(got, sizeof(got));
 	setGraphBuf(got, sizeof(got));
 	// set signal properties low/high/mean/amplitude and is_noise detection
 	computeSignalProperties(got, sizeof(got));
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 446e440ce..b9256fc29 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1330,10 +1330,9 @@ bool AquireData( uint8_t page, uint8_t block, bool pwdmode, uint32_t password )
 		PrintAndLogEx(WARNING, "command execution time out");
 		return false;
 	}
-	// set signal properties low/high/mean/amplitude and is_noise detection
-	removeSignalOffset(got, sizeof(got));
-	computeSignalProperties(got, sizeof(got));
 	setGraphBuf(got, sizeof(got));
+	// set signal properties low/high/mean/amplitude and is_noise detection
+	computeSignalProperties(got, sizeof(got));
 	RepaintGraphWindow();
 	return !getSignalProperties()->isnoise;
 }

From 1cf3e1b581a35fb3aedcde5e6659b8414a793b4a Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 9 Mar 2019 08:14:42 +0100
Subject: [PATCH 0676/1938] fix: 'lf visa' - use defines instead

---
 client/cmdlfvisa2000.c | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/client/cmdlfvisa2000.c b/client/cmdlfvisa2000.c
index 02cd5392e..7d7cddb4d 100644
--- a/client/cmdlfvisa2000.c
+++ b/client/cmdlfvisa2000.c
@@ -95,9 +95,8 @@ int detectVisa2k(uint8_t *dest, size_t *size) {
 **/
 //see ASKDemod for what args are accepted
 int CmdVisa2kDemod(const char *Cmd) {
-
-	// save GraphBuffer - to restore it later	
-	save_restoreGB(1);
+	
+	save_restoreGB(GRAPH_SAVE);
 	
 	//sCmdAskEdgeDetect("");
 	
@@ -105,7 +104,7 @@ int CmdVisa2kDemod(const char *Cmd) {
 	bool st = true;
 	if (!ASKDemod_ext("64 0 0", false, false, 1, &st)) {
 		PrintAndLogEx(DEBUG, "DEBUG: Error - Visa2k: ASK/Manchester Demod failed");
-		save_restoreGB(0);
+		save_restoreGB(GRAPH_RESTORE);
 		return 0;
 	}
 	size_t size = DemodBufferLen;
@@ -120,7 +119,7 @@ int CmdVisa2kDemod(const char *Cmd) {
 		else
 			PrintAndLogEx(DEBUG, "DEBUG: Error - Visa2k: ans: %d", ans);
 
-		save_restoreGB(0);
+		save_restoreGB(GRAPH_RESTORE);
 		return 0;
 	}
 	setDemodBuf(DemodBuffer, 96, ans);
@@ -138,7 +137,7 @@ int CmdVisa2kDemod(const char *Cmd) {
 	// test checksums
 	if ( chk != calc ) { 
 		PrintAndLogEx(DEBUG, "DEBUG: error: Visa2000 checksum failed %x - %x\n", chk, calc);
-		save_restoreGB(0);
+		save_restoreGB(GRAPH_RESTORE);
 		return 0;
 	}
 	// parity
@@ -146,17 +145,16 @@ int CmdVisa2kDemod(const char *Cmd) {
 	uint8_t chk_par = (raw3 & 0xFF0) >> 4;
 	if ( calc_par != chk_par) {
 		PrintAndLogEx(DEBUG, "DEBUG: error: Visa2000 parity failed %x - %x\n", chk_par, calc_par);
-		save_restoreGB(0);
+		save_restoreGB(GRAPH_RESTORE);
 		return 0;		
 	}
 	PrintAndLogEx(SUCCESS, "Visa2000 Tag Found: Card ID %u,  Raw: %08X%08X%08X", raw2,  raw1 ,raw2, raw3);
-	save_restoreGB(0);
 	return 1;
 }
 
 // 64*96*2=12288 samples just in case we just missed the first preamble we can still catch 2 of them
 int CmdVisa2kRead(const char *Cmd) {
-	lf_read(true, 12500);
+	lf_read(true, 14000);
 	return CmdVisa2kDemod(Cmd);
 }
 
@@ -225,21 +223,21 @@ int CmdVisa2kSim(const char *Cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",	CmdHelp,		1, "This help"},
+	{"help",	CmdHelp,		1, "This help"},
 	{"demod",	CmdVisa2kDemod,	1, "demodulate an VISA2000 tag from the GraphBuffer"},	
 	{"read",	CmdVisa2kRead,	0, "attempt to read and extract tag data from the antenna"},
 	{"clone",	CmdVisa2kClone,	0, "clone Visa2000 to t55x7"},
 	{"sim",		CmdVisa2kSim,	0, "simulate Visa2000 tag"},
-    {NULL, NULL, 0, NULL}
+	{NULL, NULL, 0, NULL}
 };
 
 int CmdLFVisa2k(const char *Cmd) {
 	clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+	CmdsParse(CommandTable, Cmd);
+	return 0;
 }
 
 int CmdHelp(const char *Cmd) {
-    CmdsHelp(CommandTable);
-    return 0;
+	CmdsHelp(CommandTable);
+	return 0;
 }

From 810f92dbab05edbdc4e9a7e04e7e4ed05decf089 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 9 Mar 2019 08:29:37 +0100
Subject: [PATCH 0677/1938] FIX: 'lf visa read' - increase samples solves #123

---
 client/cmdlfvisa2000.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdlfvisa2000.c b/client/cmdlfvisa2000.c
index 7d7cddb4d..031894728 100644
--- a/client/cmdlfvisa2000.c
+++ b/client/cmdlfvisa2000.c
@@ -154,7 +154,7 @@ int CmdVisa2kDemod(const char *Cmd) {
 
 // 64*96*2=12288 samples just in case we just missed the first preamble we can still catch 2 of them
 int CmdVisa2kRead(const char *Cmd) {
-	lf_read(true, 14000);
+	lf_read(true, 20000);
 	return CmdVisa2kDemod(Cmd);
 }
 

From d8788bb3761efa3d6418de1177ca926a65587d01 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 9 Mar 2019 08:43:28 +0100
Subject: [PATCH 0678/1938] appease coverity

---
 client/cmddata.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmddata.c b/client/cmddata.c
index fc34f3e80..0403c4f28 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -773,7 +773,7 @@ int AutoCorrelate(const int *in, int *out, size_t len, int window, bool SaveGrph
 	}
 
 	int foo = ABS(hi-hi_1);
-	int bar = (int)(((hi+hi_1) / 2) * 0.03);  
+	int bar = (int)((int)((hi+hi_1) / 2) * 0.03);  
 	if ( verbose && foo < bar ) {
 		distance = idx_1 - idx;
 		PrintAndLogEx(SUCCESS, "possible 3% visible correlation %4d samples", distance);

From edc19f202a7cec42045203cceb3ccac198de9e5b Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 9 Mar 2019 08:49:41 +0100
Subject: [PATCH 0679/1938] Convert the few files with still Windows carriage
 returns

---
 armsrc/legicrf.h          |    2 +-
 armsrc/legicrfsim.h       |    2 +-
 armsrc/mifarecmd.c        | 4138 +++++++++++-----------
 armsrc/mifarecmd.h        |   54 +-
 armsrc/mifaresniff.c      |  646 ++--
 armsrc/mifaresniff.h      |   82 +-
 armsrc/mifareutil.c       | 1378 ++++----
 armsrc/mifareutil.h       |  186 +-
 client/cmdhfmf.c          | 6944 ++++++++++++++++++-------------------
 client/cmdhfmf.h          |  152 +-
 client/cmdlft55xx.c       | 4112 +++++++++++-----------
 client/cmdlft55xx.h       |  342 +-
 common/cmd.c              |  126 +-
 common/cmd.h              |   90 +-
 common/usb_cdc.c          | 1894 +++++-----
 common/usb_cdc.h          |  126 +-
 tools/mfkey/crapto1.c     | 1148 +++---
 tools/nonce2key/crapto1.c | 1146 +++---
 18 files changed, 11284 insertions(+), 11284 deletions(-)

diff --git a/armsrc/legicrf.h b/armsrc/legicrf.h
index 639687558..1c275a1ed 100644
--- a/armsrc/legicrf.h
+++ b/armsrc/legicrf.h
@@ -1,4 +1,4 @@
-//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 // (c) 2009 Henryk Plötz <henryk@ploetzli.ch>
 //     2018 AntiCat
 //
diff --git a/armsrc/legicrfsim.h b/armsrc/legicrfsim.h
index c1c8a86e2..da70bff0c 100644
--- a/armsrc/legicrfsim.h
+++ b/armsrc/legicrfsim.h
@@ -1,4 +1,4 @@
-//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 // (c) 2009 Henryk Plötz <henryk@ploetzli.ch>
 //     2018 AntiCat
 //
diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index 6b10ddd0d..5e7375d3d 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -1,2070 +1,2070 @@
-//-----------------------------------------------------------------------------
-// Merlok - June 2011, 2012
-// Gerhard de Koning Gans - May 2008
-// Hagen Fritsch - June 2010
-// Midnitesnake - Dec 2013
-// Andy Davies  - Apr 2014
-// Iceman - May 2014,2015,2016
-//
-// This code is licensed to you under the terms of the GNU GPL, version 2 or,
-// at your option, any later version. See the LICENSE.txt file for the text of
-// the license.
-//-----------------------------------------------------------------------------
-// Routines to support ISO 14443 type A.
-//-----------------------------------------------------------------------------
-
-#include "mifarecmd.h"
-#include <inttypes.h>
-
-#ifndef HARDNESTED_AUTHENTICATION_TIMEOUT
-# define HARDNESTED_AUTHENTICATION_TIMEOUT  848			// card times out 1ms after wrong authentication (according to NXP documentation)
-#endif
-#ifndef HARDNESTED_PRE_AUTHENTICATION_LEADTIME
-# define HARDNESTED_PRE_AUTHENTICATION_LEADTIME 400		// some (non standard) cards need a pause after select before they are ready for first authentication 
-#endif 	
-
-// send an incomplete dummy response in order to trigger the card's authentication failure timeout
-#ifndef CHK_TIMEOUT
-# define CHK_TIMEOUT() { \
-	ReaderTransmit(&dummy_answer, 1, NULL); \
-	uint32_t timeout = GetCountSspClk() + HARDNESTED_AUTHENTICATION_TIMEOUT; \
-	while (GetCountSspClk() < timeout) {}; \
- } 
-#endif
-
-static uint8_t dummy_answer = 0;
-
-//-----------------------------------------------------------------------------
-// Select, Authenticate, Read a MIFARE tag. 
-// read block
-//-----------------------------------------------------------------------------
-void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
-{
-  // params
-	uint8_t blockNo = arg0;
-	uint8_t keyType = arg1;
-	uint64_t ui64Key = 0;
-	ui64Key = bytes_to_num(datain, 6);
-	
-	// variables
-	byte_t isOK = 0;
-	byte_t dataoutbuf[16] = {0x00};
-	uint8_t uid[10] = {0x00};
-	uint32_t cuid = 0;
-	struct Crypto1State mpcs = {0, 0};
-	struct Crypto1State *pcs;
-	pcs = &mpcs;
-
-	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
-
-	clear_trace();
-	set_tracing(true);
-
-	LED_A_ON();
-	LED_B_OFF();
-	LED_C_OFF();
-
-	while (true) {
-		if(!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
-			if (MF_DBGLEVEL >= 1)	Dbprintf("Can't select card");
-			break;
-		};
-
-		if(mifare_classic_auth(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST)) {
-			if (MF_DBGLEVEL >= 1)	Dbprintf("Auth error");
-			break;
-		};
-		
-		if(mifare_classic_readblock(pcs, cuid, blockNo, dataoutbuf)) {
-			if (MF_DBGLEVEL >= 1)	Dbprintf("Read block error");
-			break;
-		};
-
-		if(mifare_classic_halt(pcs, cuid)) {
-			if (MF_DBGLEVEL >= 1)	Dbprintf("Halt error");
-			break;
-		};
-		
-		isOK = 1;
-		break;
-	}
-	
-	crypto1_destroy(pcs);
-	
-	if (MF_DBGLEVEL >= 2)	DbpString("READ BLOCK FINISHED");
-
-	LED_B_ON();
-	cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,16);
-	LED_B_OFF();
-
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	LEDsoff();
-}
-
-void MifareUC_Auth(uint8_t arg0, uint8_t *keybytes){
-
-	bool turnOffField = (arg0 == 1);
-
-	LED_A_ON(); LED_B_OFF(); LED_C_OFF();
-
-	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
-
-	clear_trace();
-	set_tracing(true);
-
-	if(!iso14443a_select_card(NULL, NULL, NULL, true, 0, true)) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card");
-		OnError(0);
-		return;
-	};
-	
-	if(!mifare_ultra_auth(keybytes)){
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication failed");
-		OnError(1);
-		return;
-	}
-
-	if (turnOffField) {
-		FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-		LEDsoff();
-	}
-	cmd_send(CMD_ACK,1,0,0,0,0);
-}
-
-// Arg0 = BlockNo,
-// Arg1 = UsePwd bool
-// datain = PWD bytes,
-void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)
-{
-	uint8_t blockNo = arg0;
-	byte_t dataout[16] = {0x00};
-	bool useKey = (arg1 == 1); //UL_C
-	bool usePwd = (arg1 == 2); //UL_EV1/NTAG
-
-	LEDsoff();
-	LED_A_ON();
-	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
-
-	clear_trace();
-	set_tracing(true);
-
-	int len = iso14443a_select_card(NULL, NULL, NULL, true, 0, true);
-	if(!len) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card (RC:%02X)",len);
-		OnError(1);
-		return;
-	}
-
-	// UL-C authentication
-	if ( useKey ) {
-		uint8_t key[16] = {0x00};
-		memcpy(key, datain, sizeof(key) );
-
-		if ( !mifare_ultra_auth(key) ) {
-			OnError(1);
-			return;
-		}
-	}
-
-	// UL-EV1 / NTAG authentication
-	if ( usePwd ) {
-		uint8_t pwd[4] = {0x00};
-		memcpy(pwd, datain, 4);
-		uint8_t pack[4] = {0,0,0,0};
-		if (!mifare_ul_ev1_auth(pwd, pack)) {
-			OnError(1);
-			return;
-		}
-	}	
-
-	if( mifare_ultra_readblock(blockNo, dataout) ) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Read block error");
-		OnError(2);
-		return;
-	}
-
-	if( mifare_ultra_halt() ) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Halt error");
-		OnError(3);
-		return;
-	}
-
-    cmd_send(CMD_ACK,1,0,0,dataout,16);
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	LEDsoff();
-}
-
-//-----------------------------------------------------------------------------
-// Select, Authenticate, Read a MIFARE tag. 
-// read sector (data = 4 x 16 bytes = 64 bytes, or 16 x 16 bytes = 256 bytes)
-//-----------------------------------------------------------------------------
-void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
-{
-  // params
-	uint8_t sectorNo = arg0;
-	uint8_t keyType = arg1;
-	uint64_t ui64Key = 0;
-	ui64Key = bytes_to_num(datain, 6);
-	
-	// variables
-	byte_t isOK = 0;
-	byte_t dataoutbuf[16 * 16];
-	uint8_t uid[10] = {0x00};
-	uint32_t cuid = 0;
-	struct Crypto1State mpcs = {0, 0};
-	struct Crypto1State *pcs;
-	pcs = &mpcs;
-
-	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
-
-	clear_trace();
-	set_tracing(true);
-	
-	LED_A_ON();
-	LED_B_OFF();
-	LED_C_OFF();
-
-	isOK = 1;
-	if(!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
-		isOK = 0;
-		if (MF_DBGLEVEL >= 1)	Dbprintf("Can't select card");
-	}
-	
-	
-	if(isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_FIRST)) {
-		isOK = 0;
-		if (MF_DBGLEVEL >= 1)	Dbprintf("Auth error");
-	}
-	
-	for (uint8_t blockNo = 0; isOK && blockNo < NumBlocksPerSector(sectorNo); blockNo++) {
-		if(mifare_classic_readblock(pcs, cuid, FirstBlockOfSector(sectorNo) + blockNo, dataoutbuf + 16 * blockNo)) {
-			isOK = 0;
-			if (MF_DBGLEVEL >= 1)	Dbprintf("Read sector %2d block %2d error", sectorNo, blockNo);
-			break;
-		}
-	}
-		
-	if(mifare_classic_halt(pcs, cuid)) {
-		if (MF_DBGLEVEL >= 1)	Dbprintf("Halt error");
-	}
-
-	if (MF_DBGLEVEL >= 2) DbpString("READ SECTOR FINISHED");
-
-	crypto1_destroy(pcs);
-
-	LED_B_ON();
-	cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,16*NumBlocksPerSector(sectorNo));
-	LED_B_OFF();
-
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	LEDsoff();
-	set_tracing(false);
-}
-
-// arg0 = blockNo (start)
-// arg1 = Pages (number of blocks)
-// arg2 = useKey
-// datain = KEY bytes
-void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
-{
-	LEDsoff();
-	LED_A_ON();
-	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
-
-	// free eventually allocated BigBuf memory
-	BigBuf_free(); BigBuf_Clear_ext(false);
-	clear_trace();
-	set_tracing(true);
-	
-	// params
-	uint8_t blockNo = arg0;
-	uint16_t blocks = arg1;
-	bool useKey = (arg2 == 1); //UL_C
-	bool usePwd = (arg2 == 2); //UL_EV1/NTAG
-	uint32_t countblocks = 0;
-	uint8_t *dataout = BigBuf_malloc(CARD_MEMORY_SIZE);
-	if (dataout == NULL){
-		Dbprintf("out of memory");
-		OnError(1);
-		return;
-	}
-
-	int len = iso14443a_select_card(NULL, NULL, NULL, true, 0, true);
-	if (!len) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card (RC:%d)",len);
-		OnError(1);
-		return;
-	}
-
-	// UL-C authentication
-	if ( useKey ) {
-		uint8_t key[16] = {0x00};
-		memcpy(key, datain, sizeof(key) );
-
-		if ( !mifare_ultra_auth(key) ) {
-			OnError(1);
-			return;
-		}
-	}
-
-	// UL-EV1 / NTAG authentication
-	if (usePwd) {
-		uint8_t pwd[4] = {0x00};
-		memcpy(pwd, datain, sizeof(pwd));
-		uint8_t pack[4] = {0,0,0,0};
-
-		if (!mifare_ul_ev1_auth(pwd, pack)){
-			OnError(1);
-			return;			
-		}
-	}
-
-	for (int i = 0; i < blocks; i++){
-		if ((i*4) + 4 >= CARD_MEMORY_SIZE) {
-			Dbprintf("Data exceeds buffer!!");
-			break;
-		}
-
-		len = mifare_ultra_readblock(blockNo + i, dataout + 4 * i);
-		
-		if (len) {
-			if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Read block %d error",i);
-			// if no blocks read - error out
-			if (i == 0) {
-				OnError(2);
-				return;
-			} else {
-				//stop at last successful read block and return what we got
-				break;
-			}
-		} else {
-			countblocks++;
-		}
-	}
-
-	len = mifare_ultra_halt();
-	if (len) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Halt error");
-		OnError(3);
-		return;
-	}
-
-	if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Blocks read %d", countblocks);
-
-	countblocks *= 4;
-
-	cmd_send(CMD_ACK, 1, countblocks, BigBuf_max_traceLen(), 0, 0);
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	LEDsoff();
-	BigBuf_free();
-	set_tracing(false);
-}
-
-//-----------------------------------------------------------------------------
-// Select, Authenticate, Write a MIFARE tag. 
-// read block
-//-----------------------------------------------------------------------------
-void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
-{
-	// params
-	uint8_t blockNo = arg0;
-	uint8_t keyType = arg1;
-	uint64_t ui64Key = 0;
-	byte_t blockdata[16] = {0x00};
-
-	ui64Key = bytes_to_num(datain, 6);
-	memcpy(blockdata, datain + 10, 16);
-	
-	// variables
-	byte_t isOK = 0;
-	uint8_t uid[10] = {0x00};
-	uint32_t cuid = 0;
-	struct Crypto1State mpcs = {0, 0};
-	struct Crypto1State *pcs;
-	pcs = &mpcs;
-
-	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
-
-	clear_trace();
-	set_tracing(true);
-	
-	LED_A_ON();
-	LED_B_OFF();
-	LED_C_OFF();
-
-	while (true) {
-		if(!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
-			if (MF_DBGLEVEL >= 1)	Dbprintf("Can't select card");
-			break;
-		};
-
-		if(mifare_classic_auth(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST)) {
-			if (MF_DBGLEVEL >= 1)	Dbprintf("Auth error");
-			break;
-		};
-		
-		if(mifare_classic_writeblock(pcs, cuid, blockNo, blockdata)) {
-			if (MF_DBGLEVEL >= 1)	Dbprintf("Write block error");
-			break;
-		};
-
-		if(mifare_classic_halt(pcs, cuid)) {
-			if (MF_DBGLEVEL >= 1)	Dbprintf("Halt error");
-			break;
-		};
-		
-		isOK = 1;
-		break;
-	}
-	
-	crypto1_destroy(pcs);
-	
-	if (MF_DBGLEVEL >= 2)	DbpString("WRITE BLOCK FINISHED");
-
-	cmd_send(CMD_ACK,isOK,0,0,0,0);
-
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	LEDsoff();
-	set_tracing(false);
-}
-
-/* // Command not needed but left for future testing 
-void MifareUWriteBlockCompat(uint8_t arg0, uint8_t *datain)
-{
-	uint8_t blockNo = arg0;
-	byte_t blockdata[16] = {0x00};
-
-	memcpy(blockdata, datain, 16);
-
-	uint8_t uid[10] = {0x00};
-
-	LED_A_ON(); LED_B_OFF(); LED_C_OFF();
-
-	clear_trace();
-	set_tracing(true);
-	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
-
-	if(!iso14443a_select_card(uid, NULL, NULL, true, 0, true)) {
-		if (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");
-		OnError(0);
-		return;
-	};
-
-	if(mifare_ultra_writeblock_compat(blockNo, blockdata)) {
-		if (MF_DBGLEVEL >= 1)   Dbprintf("Write block error");
-		OnError(0);
-		return;	};
-
-	if(mifare_ultra_halt()) {
-		if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");
-		OnError(0);
-		return;
-	};
-
-	if (MF_DBGLEVEL >= 2)   DbpString("WRITE BLOCK FINISHED");
-
-	cmd_send(CMD_ACK,1,0,0,0,0);
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	LEDsoff();
-}
-*/
-
-// Arg0   : Block to write to.
-// Arg1   : 0 = use no authentication.
-//          1 = use 0x1A authentication.
-//          2 = use 0x1B authentication.
-// datain : 4 first bytes is data to be written.
-//        : 4/16 next bytes is authentication key.
-void MifareUWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)
-{
-	uint8_t blockNo = arg0;
-	bool useKey = (arg1 == 1); //UL_C
-	bool usePwd = (arg1 == 2); //UL_EV1/NTAG
-	byte_t blockdata[4] = {0x00};
-
-	memcpy(blockdata, datain, 4);
-	
-	LEDsoff();
-	LED_A_ON();
-	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
-
-	clear_trace();
-	set_tracing(true);
-	
-	if (!iso14443a_select_card(NULL, NULL, NULL, true, 0, true)) {
-		if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
-		OnError(0);
-		return;
-	};
-
-	// UL-C authentication
-	if ( useKey ) {
-		uint8_t key[16] = {0x00};	
-		memcpy(key, datain+4, sizeof(key) );
-
-		if ( !mifare_ultra_auth(key) ) {
-			OnError(1);
-			return;			
-		}
-	}
-	
-	// UL-EV1 / NTAG authentication
-	if (usePwd) { 
-		uint8_t pwd[4] = {0x00};
-		memcpy(pwd, datain+4, 4);
-		uint8_t pack[4] = {0,0,0,0};
-		if (!mifare_ul_ev1_auth(pwd, pack)) {
-			OnError(1);
-			return;			
-		}
-	}
-	
-	if (mifare_ultra_writeblock(blockNo, blockdata)) {
-		if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
-		OnError(0);
-		return;
-	};
-
-	if (mifare_ultra_halt()) {
-		if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
-		OnError(0);
-		return;
-	};
-
-	if (MF_DBGLEVEL >= 2) DbpString("WRITE BLOCK FINISHED");
-
-	cmd_send(CMD_ACK,1,0,0,0,0);
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	LEDsoff();
-	set_tracing(false);
-}
-
-void MifareUSetPwd(uint8_t arg0, uint8_t *datain){
-	
-	uint8_t pwd[16] = {0x00};
-	byte_t blockdata[4] = {0x00};
-	
-	memcpy(pwd, datain, 16);
-	
-	LED_A_ON(); LED_B_OFF(); LED_C_OFF();
-	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
-
-	clear_trace();
-	set_tracing(true);
-	
-	if (!iso14443a_select_card(NULL, NULL, NULL, true, 0, true)) {
-		if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
-		OnError(0);
-		return;
-	};
-
-	blockdata[0] = pwd[7];
-	blockdata[1] = pwd[6];
-	blockdata[2] = pwd[5];
-	blockdata[3] = pwd[4];
-	if (mifare_ultra_writeblock( 44, blockdata)) {
-		if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
-		OnError(44);
-		return;
-	};
-
-	blockdata[0] = pwd[3];
-	blockdata[1] = pwd[2];
-	blockdata[2] = pwd[1];
-	blockdata[3] = pwd[0];
-	if (mifare_ultra_writeblock( 45, blockdata)) {
-		if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
-		OnError(45);
-		return;
-	};
-
-	blockdata[0] = pwd[15];
-	blockdata[1] = pwd[14];
-	blockdata[2] = pwd[13];
-	blockdata[3] = pwd[12];
-	if (mifare_ultra_writeblock( 46, blockdata)) {
-		if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
-		OnError(46);
-		return;
-	};
-
-	blockdata[0] = pwd[11];
-	blockdata[1] = pwd[10];
-	blockdata[2] = pwd[9];
-	blockdata[3] = pwd[8];
-	if (mifare_ultra_writeblock( 47, blockdata)) {
-		if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
-		OnError(47);
-		return;
-	};	
-
-	if (mifare_ultra_halt()) {
-		if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
-		OnError(0);
-		return;
-	};
-
-	cmd_send(CMD_ACK,1,0,0,0,0);
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	LEDsoff();
-	set_tracing(false);
-}
-
-// Return 1 if the nonce is invalid else return 0
-int valid_nonce(uint32_t Nt, uint32_t NtEnc, uint32_t Ks1, uint8_t *parity) {
-	return ((oddparity8((Nt >> 24) & 0xFF) == ((parity[0]) ^ oddparity8((NtEnc >> 24) & 0xFF) ^ BIT(Ks1,16))) & \
-	(oddparity8((Nt >> 16) & 0xFF) == ((parity[1]) ^ oddparity8((NtEnc >> 16) & 0xFF) ^ BIT(Ks1,8))) & \
-	(oddparity8((Nt >> 8) & 0xFF) == ((parity[2]) ^ oddparity8((NtEnc >> 8) & 0xFF) ^ BIT(Ks1,0)))) ? 1 : 0;
-}
-
-void MifareAcquireNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *datain) {
-
-	uint8_t uid[10] = {0x00};
-	uint8_t answer[MAX_MIFARE_FRAME_SIZE] = {0x00};
-	uint8_t par[1] = {0x00};
-	uint8_t buf[USB_CMD_DATA_SIZE] = {0x00};
-	uint32_t cuid = 0;
-	int16_t isOK = 0;
-	uint16_t num_nonces = 0;
-	uint8_t cascade_levels = 0;	
-	uint8_t blockNo = arg0 & 0xff;
-	uint8_t keyType = (arg0 >> 8) & 0xff;
-	bool initialize = flags & 0x0001;
-	bool field_off = flags & 0x0004;
-	bool have_uid = false;
-	
-	LED_A_ON();
-	LED_C_OFF();
-
-	BigBuf_free(); BigBuf_Clear_ext(false);	
-	clear_trace();
-	set_tracing(true);
-	
-	if (initialize)
-		iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
-	
-	LED_C_ON();
-	
-	for (uint16_t i = 0; i <= USB_CMD_DATA_SIZE-4; i += 4 ) {
-
-		// Test if the action was cancelled
-		if (BUTTON_PRESS()) {
-			isOK = 2;
-			field_off = true;
-			break;
-		}
-
-		if (!have_uid) { // need a full select cycle to get the uid first
-			iso14a_card_select_t card_info;		
-			if (!iso14443a_select_card(uid, &card_info, &cuid, true, 0, true)) {
-				if (MF_DBGLEVEL >= 1)	Dbprintf("AcquireNonces: Can't select card (ALL)");
-				continue;
-			}
-			switch (card_info.uidlen) {
-				case 4 : cascade_levels = 1; break;
-				case 7 : cascade_levels = 2; break;
-				case 10: cascade_levels = 3; break;
-				default: break;
-			}
-			have_uid = true;	
-		} else { // no need for anticollision. We can directly select the card
-			if (!iso14443a_fast_select_card(uid, cascade_levels)) {
-				if (MF_DBGLEVEL >= 1)	Dbprintf("AcquireNonces: Can't select card (UID)");
-				continue;
-			}
-		}
-		
-		// Transmit MIFARE_CLASSIC_AUTH	
-		uint8_t dcmd[4] = {0x60 + (keyType & 0x01), blockNo, 0x00, 0x00};
-		AddCrc14A(dcmd, 2);
-		ReaderTransmit(dcmd, sizeof(dcmd), NULL);
-		int len = ReaderReceive(answer, par);		
-
-		// wait for the card to become ready again
-		CHK_TIMEOUT();
-		
-		if (len != 4) {
-			if (MF_DBGLEVEL >= 2)	Dbprintf("AcquireNonces: Auth1 error");
-			continue;
-		}
-		
-		num_nonces++;
-		
-		// Save the tag nonce (nt)	
-		buf[i]   = answer[0];
-		buf[i+1] = answer[1];
-		buf[i+2] = answer[2];
-		buf[i+3] = answer[3];
-	}
-
-	LED_C_OFF();
-	LED_B_ON();
-	cmd_send(CMD_ACK, isOK, cuid, num_nonces-1, buf, sizeof(buf));
-	LED_B_OFF();
-
-	if (MF_DBGLEVEL >= 3)	DbpString("AcquireNonces finished");
-
-	if (field_off) {
-		FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-		LEDsoff();
-		set_tracing(false);
-	}
-}
-
-//-----------------------------------------------------------------------------
-// acquire encrypted nonces in order to perform the attack described in
-// Carlo Meijer, Roel Verdult, "Ciphertext-only Cryptanalysis on Hardened
-// Mifare Classic Cards" in Proceedings of the 22nd ACM SIGSAC Conference on 
-// Computer and Communications Security, 2015
-//-----------------------------------------------------------------------------
-void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *datain) {
-
-	struct Crypto1State mpcs = {0, 0};
-	struct Crypto1State *pcs;
-	pcs = &mpcs;
-
-	uint8_t uid[10] = {0x00};
-	uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};
-	uint8_t par_enc[1] = {0x00};
-	uint8_t buf[USB_CMD_DATA_SIZE] = {0x00};
-
-	uint64_t ui64Key = bytes_to_num(datain, 6);
-	uint32_t cuid = 0;
-	int16_t isOK = 0;
-	uint16_t num_nonces = 0;
-	uint8_t nt_par_enc = 0;
-	uint8_t cascade_levels = 0;
-	uint8_t blockNo = arg0 & 0xff;
-	uint8_t keyType = (arg0 >> 8) & 0xff;
-	uint8_t targetBlockNo = arg1 & 0xff;
-	uint8_t targetKeyType = (arg1 >> 8) & 0xff;	
-	bool initialize = flags & 0x0001;
-	bool slow = flags & 0x0002;
-	bool field_off = flags & 0x0004;
-	bool have_uid = false;
-
-	LED_A_ON();
-	LED_C_OFF();
-
-	BigBuf_free(); BigBuf_Clear_ext(false);	
-	clear_trace();
-	set_tracing(false);
-	
-	if (initialize)
-		iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
-	
-	LED_C_ON();
-	
-	for (uint16_t i = 0; i <= USB_CMD_DATA_SIZE - 9; ) {
-
-		// Test if the action was cancelled
-		if(BUTTON_PRESS()) {
-			isOK = 2;
-			field_off = true;
-			break;
-		}
-
-		if (!have_uid) { // need a full select cycle to get the uid first
-			iso14a_card_select_t card_info;		
-			if(!iso14443a_select_card(uid, &card_info, &cuid, true, 0, true)) {
-				if (MF_DBGLEVEL >= 1)	Dbprintf("AcquireNonces: Can't select card (ALL)");
-				continue;
-			}
-			switch (card_info.uidlen) {
-				case 4 : cascade_levels = 1; break;
-				case 7 : cascade_levels = 2; break;
-				case 10: cascade_levels = 3; break;
-				default: break;
-			}
-			have_uid = true;	
-		} else { // no need for anticollision. We can directly select the card
-			if (!iso14443a_fast_select_card(uid, cascade_levels)) {
-				if (MF_DBGLEVEL >= 1)	Dbprintf("AcquireNonces: Can't select card (UID)");
-				continue;
-			}
-		}
-		
-		if (slow)
-			SpinDelayUs(HARDNESTED_PRE_AUTHENTICATION_LEADTIME);
-
-		uint32_t nt1;
-		if (mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1, NULL)) {
-			if (MF_DBGLEVEL >= 1)	Dbprintf("AcquireNonces: Auth1 error");
-			continue;
-		}
-
-		// nested authentication
-		uint16_t len = mifare_sendcmd_short(pcs, AUTH_NESTED, 0x60 + (targetKeyType & 0x01), targetBlockNo, receivedAnswer, par_enc, NULL);
-
-		// wait for the card to become ready again
-		CHK_TIMEOUT();
-
-		if (len != 4) {
-			if (MF_DBGLEVEL >= 1)	Dbprintf("AcquireNonces: Auth2 error len=%d", len);
-			continue;
-		}
-	
-		num_nonces++;
-		if (num_nonces % 2) {
-			memcpy(buf+i, receivedAnswer, 4);
-			nt_par_enc = par_enc[0] & 0xf0;
-		} else {
-			nt_par_enc |= par_enc[0]  >> 4;
-			memcpy(buf+i+4, receivedAnswer, 4);
-			memcpy(buf+i+8, &nt_par_enc, 1);
-			i += 9;
-		}
-	}
-
-	LED_C_OFF();
-	crypto1_destroy(pcs);	
-	LED_B_ON();
-	cmd_send(CMD_ACK, isOK, cuid, num_nonces, buf, sizeof(buf));
-	LED_B_OFF();
-
-	if (MF_DBGLEVEL >= 3)	DbpString("AcquireEncryptedNonces finished");
-
-	if (field_off) {
-		FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-		LEDsoff();
-		set_tracing(false);
-	}
-}
-
-
-//-----------------------------------------------------------------------------
-// MIFARE nested authentication. 
-// 
-//-----------------------------------------------------------------------------
-void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *datain)
-{
-	// params
-	uint8_t blockNo = arg0 & 0xff;
-	uint8_t keyType = (arg0 >> 8) & 0xff;
-	uint8_t targetBlockNo = arg1 & 0xff;
-	uint8_t targetKeyType = (arg1 >> 8) & 0xff;
-	uint64_t ui64Key = 0;
-
-	ui64Key = bytes_to_num(datain, 6);
-	
-	// variables
-	uint16_t rtr, i, j, len;
-	uint16_t davg = 0;
-	static uint16_t dmin, dmax;
-	uint8_t uid[10] = {0x00};
-	uint32_t cuid = 0, nt1, nt2, nttmp, nttest, ks1;
-	uint8_t par[1] = {0x00};
-	uint32_t target_nt[2] = {0x00}, target_ks[2] = {0x00};
-	
-	uint8_t par_array[4] = {0x00};
-	uint16_t ncount = 0;
-	struct Crypto1State mpcs = {0, 0};
-	struct Crypto1State *pcs;
-	pcs = &mpcs;
-	uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};
-
-	uint32_t auth1_time, auth2_time;
-	static uint16_t delta_time = 0;
-
-	LED_A_ON();
-	LED_C_OFF();
-	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
-
-	// free eventually allocated BigBuf memory
-	BigBuf_free(); BigBuf_Clear_ext(false);
-	
-	if (calibrate) clear_trace();
-	set_tracing(true);
-
-	// statistics on nonce distance
-	int16_t isOK = 0;
-	#define NESTED_MAX_TRIES 12
-	uint16_t unsuccessfull_tries = 0;
-	if (calibrate) {	// for first call only. Otherwise reuse previous calibration
-		LED_B_ON();
-		WDT_HIT();
-
-		davg = dmax = 0;
-		dmin = 2000;
-		delta_time = 0;
-		
-		for (rtr = 0; rtr < 17; rtr++) {
-
-			// Test if the action was cancelled
-			if(BUTTON_PRESS()) {
-				isOK = -2;
-				break;
-			}
-
-			// prepare next select. No need to power down the card.
-			if(mifare_classic_halt(pcs, cuid)) {
-				if (MF_DBGLEVEL >= 2)	Dbprintf("Nested: Halt error");
-				rtr--;
-				continue;
-			}
-
-			if(!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
-				if (MF_DBGLEVEL >= 2)	Dbprintf("Nested: Can't select card");
-				rtr--;
-				continue;
-			};
-
-			auth1_time = 0;
-			if(mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1, &auth1_time)) {
-				if (MF_DBGLEVEL >= 2)	Dbprintf("Nested: Auth1 error");
-				rtr--;
-				continue;
-			};
-			auth2_time = (delta_time) ? auth1_time + delta_time : 0;
-
-			if(mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_NESTED, &nt2, &auth2_time)) {
-				if (MF_DBGLEVEL >= 2)	Dbprintf("Nested: Auth2 error");
-				rtr--;
-				continue;
-			};
-
-			nttmp = prng_successor(nt1, 100);				//NXP Mifare is typical around 840,but for some unlicensed/compatible mifare card this can be 160
-			for (i = 101; i < 1200; i++) {
-				nttmp = prng_successor(nttmp, 1);
-				if (nttmp == nt2) break;
-			}
-
-			if (i != 1200) {
-				if (rtr != 0) {
-					davg += i;
-					dmin = MIN(dmin, i);
-					dmax = MAX(dmax, i);
-				}
-				else {
-					delta_time = auth2_time - auth1_time + 32;  // allow some slack for proper timing
-				}
-				if (MF_DBGLEVEL >= 3) Dbprintf("Nested: calibrating... ntdist=%d", i);
-			} else {
-				unsuccessfull_tries++;
-				if (unsuccessfull_tries > NESTED_MAX_TRIES) {	// card isn't vulnerable to nested attack (random numbers are not predictable)
-					isOK = -3;
-				}
-			}
-		}
-
-		davg = (davg + (rtr - 1)/2) / (rtr - 1);
-		
-		if (MF_DBGLEVEL >= 3) Dbprintf("rtr=%d isOK=%d min=%d max=%d avg=%d, delta_time=%d", rtr, isOK, dmin, dmax, davg, delta_time);
-
-		dmin = davg - 2;
-		dmax = davg + 2;
-		
-		LED_B_OFF();
-	}
-//  -------------------------------------------------------------------------------------------------	
-	
-	LED_C_ON();
-
-	//  get crypted nonces for target sector
-	for(i=0; i < 2 && !isOK; i++) { // look for exactly two different nonces
-
-		target_nt[i] = 0;
-		while(target_nt[i] == 0) { // continue until we have an unambiguous nonce
-		
-			// prepare next select. No need to power down the card.
-			if(mifare_classic_halt(pcs, cuid)) {
-				if (MF_DBGLEVEL >= 2)	Dbprintf("Nested: Halt error");
-				continue;
-			}
-
-			if(!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
-				if (MF_DBGLEVEL >= 2)	Dbprintf("Nested: Can't select card");
-				continue;
-			};
-		
-			auth1_time = 0;
-			if(mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1, &auth1_time)) {
-				if (MF_DBGLEVEL >= 2)	Dbprintf("Nested: Auth1 error");
-				continue;
-			};
-
-			// nested authentication
-			auth2_time = auth1_time + delta_time;
-
-			len = mifare_sendcmd_short(pcs, AUTH_NESTED, 0x60 + (targetKeyType & 0x01), targetBlockNo, receivedAnswer, par, &auth2_time);
-			if (len != 4) {
-				if (MF_DBGLEVEL >= 2)	Dbprintf("Nested: Auth2 error len=%d", len);
-				continue;
-			};
-		
-			nt2 = bytes_to_num(receivedAnswer, 4);		
-			if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: Testing nt1=%08x nt2enc=%08x nt2par=%02x", i+1, nt1, nt2, par[0]);
-			
-			// Parity validity check
-			for (j = 0; j < 4; j++) {
-				par_array[j] = (oddparity8(receivedAnswer[j]) != ((par[0] >> (7-j)) & 0x01));
-			}
-			
-			ncount = 0;
-			nttest = prng_successor(nt1, dmin - 1);
-			for (j = dmin; j < dmax + 1; j++) {
-				nttest = prng_successor(nttest, 1);
-				ks1 = nt2 ^ nttest;
-
-				if (valid_nonce(nttest, nt2, ks1, par_array)){
-					if (ncount > 0) { 		// we are only interested in disambiguous nonces, try again
-						if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: dismissed (ambigous), ntdist=%d", i+1, j);
-						target_nt[i] = 0;
-						break;
-					}
-					target_nt[i] = nttest;
-					target_ks[i] = ks1;
-					ncount++;
-					if (i == 1 && target_nt[1] == target_nt[0]) { // we need two different nonces
-						target_nt[i] = 0;
-						if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#2: dismissed (= nonce#1), ntdist=%d", j);
-						break;
-					}
-					if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: valid, ntdist=%d", i+1, j);
-				}
-			}
-			if (target_nt[i] == 0 && j == dmax+1 && MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: dismissed (all invalid)", i+1);
-		}
-	}
-
-	LED_C_OFF();
-	
-	crypto1_destroy(pcs);
-	
-	uint8_t buf[4 + 4 * 4] = {0};
-	memcpy(buf, &cuid, 4);
-	memcpy(buf+4, &target_nt[0], 4);
-	memcpy(buf+8, &target_ks[0], 4);
-	memcpy(buf+12, &target_nt[1], 4);
-	memcpy(buf+16, &target_ks[1], 4);
-	
-	LED_B_ON();
-	cmd_send(CMD_ACK, isOK, 0, targetBlockNo + (targetKeyType * 0x100), buf, sizeof(buf));
-	LED_B_OFF();
-
-	if (MF_DBGLEVEL >= 3)	DbpString("NESTED FINISHED");
-
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	LEDsoff();
-	set_tracing(false);
-}
-
-//-----------------------------------------------------------------------------
-// MIFARE check keys. key count up to 85. 
-// 
-//-----------------------------------------------------------------------------	
-typedef struct sector_t {
-	uint8_t keyA[6];
-	uint8_t keyB[6];
-} sector_t;
-
-typedef struct chk_t {
-	uint64_t key;
-	uint32_t cuid;	
-	uint8_t cl;
-	uint8_t block;
-	uint8_t keyType;
-	uint8_t *uid;	
-	struct Crypto1State *pcs;
-} chk_t;
-
-// checks one key.
-// fast select,  tries 5 times to select
-// 
-// return:
-//  2 = failed to select.
-//  1 = wrong key
-//  0 = correct key
-uint8_t chkKey( struct chk_t *c ) {
-	uint8_t i = 0, res = 2;	
-	while( i < 5 ) {
-		// this part is from Piwi's faster nonce collecting part in Hardnested.
-		// assume: fast select
-		if (!iso14443a_fast_select_card(c->uid, c->cl)) {
-			++i;
-			continue;
-		}
-		res = mifare_classic_authex(c->pcs, c->cuid, c->block, c->keyType, c->key, AUTH_FIRST, NULL, NULL);
-
-		CHK_TIMEOUT();
-		
-		// if successfull auth, send HALT
-		// if ( !res ) 
-			// mifare_classic_halt_ex(c->pcs);
-		break;
-	}
-	return res;
-}
-
-uint8_t chkKey_readb(struct chk_t *c, uint8_t *keyb) {	
-	
-	if (!iso14443a_fast_select_card(c->uid, c->cl))
-		return 2;
-	
-	if ( mifare_classic_authex(c->pcs, c->cuid, c->block, 0, c->key, AUTH_FIRST, NULL, NULL) )
-		return 1;
-
-	uint8_t data[16] = {0x00};	
-	uint8_t res = mifare_classic_readblock(c->pcs, c->cuid, c->block, data);
-	
-	// successful read
-	if ( !res ) {
-		// data was something else than zeros.
-		if ( memcmp(data+10, "\x00\x00\x00\x00\x00\x00", 6) != 0) {
-			memcpy(keyb, data+10, 6);
-			res = 0;
-		} else {
-			res = 3;
-		}
-		mifare_classic_halt_ex(c->pcs);
-	}
-	return res;
-}
-
-void chkKey_scanA(struct chk_t *c, struct sector_t *k_sector, uint8_t *found, uint8_t *sectorcnt, uint8_t *foundkeys) { 
-	for (uint8_t s = 0; s < *sectorcnt; s++) { 
-
-		// skip already found A keys 
-		if ( found[(s*2)] ) 
-			continue;
-
-		c->block = FirstBlockOfSector( s );
-		if ( chkKey( c ) == 0 ) { 
-			num_to_bytes(c->key, 6, k_sector[s].keyA);
-			found[(s*2)] = 1; 
-			++*foundkeys; 
-			
-			if (MF_DBGLEVEL >= 3) Dbprintf("ChkKeys_fast: Scan A found (%d)", c->block);
-		}
-	} 
-}
-
-void chkKey_scanB(struct chk_t *c, struct sector_t *k_sector, uint8_t *found, uint8_t *sectorcnt, uint8_t *foundkeys) { 
-	for (uint8_t s = 0; s < *sectorcnt; s++) { 
-
-		// skip already found B keys 
-		if ( found[(s*2)+1] )
-			continue;
-
-		c->block = FirstBlockOfSector( s );
-		if ( chkKey( c ) == 0 ) { 
-			num_to_bytes(c->key, 6, k_sector[s].keyB);	
-			found[(s*2)+1] = 1; 
-			++*foundkeys; 
-			
-			if (MF_DBGLEVEL >= 3) Dbprintf("ChkKeys_fast: Scan B found (%d)", c->block);
-		}
-	} 
-}
-
-// loop all A keys,
-// when A is found but not B,  try to read B.
-void chkKey_loopBonly(struct chk_t *c, struct sector_t *k_sector, uint8_t *found, uint8_t *sectorcnt, uint8_t *foundkeys) {
-
-	// read Block B, if A is found.
-	for (uint8_t s = 0; s < *sectorcnt; ++s) {
-		
-		if ( found[(s*2)] && found[(s*2)+1] )
-			continue;
-		
-		c->block = (FirstBlockOfSector( s ) + NumBlocksPerSector( s ) - 1);
-
-		// A but not B
-		if ( found[(s*2)]  &&  !found[(s*2)+1] ){	
-			c->key = bytes_to_num(k_sector[s].keyA, 6);
-			uint8_t status = chkKey_readb(c, k_sector[s].keyB);
-			if ( status == 0 ){					
-				found[(s*2)+1] = 1;
-				++*foundkeys;
-
-				if (MF_DBGLEVEL >= 3) Dbprintf("ChkKeys_fast: Reading B found (%d)", c->block);		
-
-				// try quick find all B?
-				// assume: keys comes in groups. Find one B, test against all B.
-				c->key = bytes_to_num( k_sector[s].keyB, 6);
-				c->keyType = 1;
-				chkKey_scanB(c, k_sector, found, sectorcnt, foundkeys);
-			}
-		}
-	}
-}
-
-
-
-// get Chunks of keys, to test authentication against card.
-// arg0 = antal sectorer
-// arg0 = first time
-// arg1 = clear trace
-// arg2 = antal nycklar i keychunk
-// datain = keys as array
-void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain) {
-
-	// first call or 
-	uint8_t sectorcnt = arg0 & 0xFF; // 16;
-	uint8_t firstchunk = (arg0 >> 8) & 0xF;	
-	uint8_t lastchunk = (arg0 >> 12) & 0xF;	
-	uint8_t strategy = arg1 & 0xFF;
-	uint8_t use_flashmem = (arg1 >> 8) & 0xFF;
-	uint16_t keyCount = arg2 & 0xFF;
-	uint8_t status = 0;
-
-	struct Crypto1State mpcs = {0, 0};
-	struct Crypto1State *pcs;
-	pcs = &mpcs;
-	struct chk_t chk_data;
-	
-	uint8_t allkeys = sectorcnt << 1;
-
-	static uint32_t cuid = 0;
-	static uint8_t cascade_levels = 0;
-	static uint8_t foundkeys = 0;
-	static sector_t k_sector[80];
-	static uint8_t found[80];
-	static uint8_t *uid;
-
-#ifdef WITH_FLASH	
-	if ( use_flashmem ) {
-		BigBuf_free();
-		uint16_t isok = 0;
-		uint8_t size[2] = {0x00, 0x00};		
-		isok = Flash_ReadData(DEFAULT_MF_KEYS_OFFSET, size, 2);
-		if ( isok != 2 )
-			goto OUT;
-		
-		keyCount = size[1] << 8 | size[0];
-		
-		if ( keyCount == 0 && keyCount == 0xFFFF) 
-			goto OUT;
-			
-		datain = BigBuf_malloc( keyCount * 6);
-		if (datain == NULL )
-			goto OUT;
-
-		isok = Flash_ReadData(DEFAULT_MF_KEYS_OFFSET+2, datain, keyCount * 6);
-		if ( isok != keyCount * 6 )
-			goto OUT;
-		
-	}
-#endif
-		
-	if (uid == NULL || firstchunk) {
-		uid = BigBuf_malloc(10);
-		if (uid == NULL )
-			goto OUT;
-	}
-
-	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
-	
-	LEDsoff();
-	LED_A_ON();
-		
-	if ( firstchunk ) {
-		clear_trace();
-		set_tracing(false);
-		
-		memset(k_sector, 0x00, 480+10);
-		memset(found, 0x00, sizeof(found));
-		foundkeys = 0;		
-			
-		iso14a_card_select_t card_info;		
-		if ( !iso14443a_select_card(uid, &card_info, &cuid, true, 0, true)) {
-			if (MF_DBGLEVEL >= 1) Dbprintf("ChkKeys_fast: Can't select card (ALL)");
-			goto OUT;
-		}
-		
-		switch (card_info.uidlen) {
-			case 4 : cascade_levels = 1; break;
-			case 7 : cascade_levels = 2; break;
-			case 10: cascade_levels = 3; break;
-			default: break;
-		}
-		
-		CHK_TIMEOUT();
-	}
-
-	// set check struct.
-	chk_data.uid = uid;
-	chk_data.cuid = cuid;
-	chk_data.cl = cascade_levels;
-	chk_data.pcs = pcs;
-	chk_data.block = 0;	
-	
-	// keychunk loop - depth first one sector.
-	if ( strategy == 1 || use_flashmem) {
-
-		uint8_t newfound = foundkeys;
-
-		uint16_t lastpos = 0;
-		uint16_t s_point = 0;
-		// Sector main loop
-		// keep track of how many sectors on card.
-		for (uint8_t s = 0; s < sectorcnt; ++s) {
-
-			if ( found[(s*2)] && found[(s*2)+1] )
-				continue;
-
-			for (uint16_t i = s_point; i < keyCount; ++i) {
-						
-				//if ( i % 100 == 0) Dbprintf("ChkKeys_fast: sector %d | checking %d | %d found | s_point %d", s, i, foundkeys, s_point);
-			
-				// Allow button press / usb cmd to interrupt device
-				if (BUTTON_PRESS() && !usb_poll_validate_length()) {
-					goto OUT;
-				}
-
-				// found all keys?
-				if ( foundkeys == allkeys )
-					goto OUT;
-
-				WDT_HIT();
-			
-				// assume: block0,1,2 has more read rights in accessbits than the sectortrailer. authenticating against block0 in each sector
-				chk_data.block = FirstBlockOfSector( s );
-
-				// new key
-				chk_data.key = bytes_to_num(datain + i * 6, 6);
-
-				// skip already found A keys 
-				if( !found[(s*2)] ) {
-					chk_data.keyType = 0;
-					status = chkKey( &chk_data);
-					if ( status == 0 ) {
-						memcpy(k_sector[s].keyA, datain + i * 6, 6);
-						found[(s*2)] = 1;
-						++foundkeys;
-						
-						chkKey_scanA(&chk_data, k_sector, found, &sectorcnt, &foundkeys);				
-						
-						// read Block B, if A is found.
-						chkKey_loopBonly( &chk_data, k_sector, found, &sectorcnt, &foundkeys);
-						
-						chk_data.keyType = 1;
-						chkKey_scanB(&chk_data, k_sector, found, &sectorcnt, &foundkeys);
-						
-						chk_data.keyType = 0;						
-						chk_data.block = FirstBlockOfSector( s );
-						
-						if ( use_flashmem ) {
-							if ( lastpos != i && lastpos != 0) {							
-								if ( i - lastpos < 0xF) {
-									s_point = i & 0xFFF0;
-								}
-							} else {
-								lastpos = i;	
-							}
-						}
-					}
-				}
-				
-				// skip already found B keys 
-				if( !found[(s*2)+1] ) {
-					chk_data.keyType = 1;
-					status = chkKey( &chk_data);
-					if ( status == 0 ) {
-						memcpy(k_sector[s].keyB, datain + i * 6, 6);
-						found[(s*2)+1] = 1;
-						++foundkeys;
-						
-						chkKey_scanB(&chk_data, k_sector, found, &sectorcnt, &foundkeys);
-
-						if ( use_flashmem ) {						
-							if ( lastpos != i && lastpos != 0) {
-								
-								if ( i - lastpos < 0xF)
-									s_point = i & 0xFFF0;
-							} else {
-								lastpos = i;	
-							}
-						}
-					}
-				}
-				
-				if ( found[(s*2)] && found[(s*2)+1] )
-					break;
-				
-			} // end keys test loop - depth first 
-
-			// assume1. if no keys found in first sector, get next keychunk from client
-			if ( !use_flashmem && (newfound-foundkeys == 0) )
-				goto OUT;
-
-		} // end loop - sector
-	} // end strategy 1
-	
-	if ( foundkeys == allkeys ) 
-		goto OUT;
-
-	if ( strategy == 2 || use_flashmem ) {
-			
-		// Keychunk loop
-		for (uint16_t i = 0; i < keyCount; i++) {
-					
-			// Allow button press / usb cmd to interrupt device
-			if (BUTTON_PRESS() && !usb_poll_validate_length()) break;
-
-			// found all keys?
-			if ( foundkeys == allkeys )
-				goto OUT;
-				
-			WDT_HIT();
-		
-			// new key
-			chk_data.key = bytes_to_num(datain + i * 6, 6);
-		
-			// Sector main loop
-			// keep track of how many sectors on card.
-			for (uint8_t s = 0; s < sectorcnt; ++s) {
-				
-				if ( found[(s*2)] && found[(s*2)+1] ) continue;
-				
-				// found all keys?
-				if ( foundkeys == allkeys )
-					goto OUT;
-
-				// assume: block0,1,2 has more read rights in accessbits than the sectortrailer. authenticating against block0 in each sector
-				chk_data.block = FirstBlockOfSector( s );
-			
-				// skip already found A keys 
-				if( !found[(s*2)] ) {
-					chk_data.keyType = 0;
-					status = chkKey( &chk_data);
-					if ( status == 0 ) {
-						memcpy(k_sector[s].keyA, datain + i * 6, 6);
-						found[(s*2)] = 1;
-						++foundkeys;
-						
-						chkKey_scanA( &chk_data, k_sector, found, &sectorcnt, &foundkeys);
-						
-						// read Block B, if A is found.
-						chkKey_loopBonly( &chk_data, k_sector, found, &sectorcnt, &foundkeys);
-
-						chk_data.block = FirstBlockOfSector( s );
-					}
-				}
-				
-				// skip already found B keys 
-				if( !found[(s*2)+1] ) {
-					chk_data.keyType = 1;
-					status = chkKey( &chk_data);
-					if ( status == 0 ) {
-						memcpy(k_sector[s].keyB, datain + i * 6, 6);
-						found[(s*2)+1] = 1;
-						++foundkeys;
-						
-						chkKey_scanB(&chk_data, k_sector, found, &sectorcnt, &foundkeys);
-					}
-				}
-			} // end loop sectors		
-		} // end loop keys	
-	} // end loop strategy 2
-OUT:
-	LEDsoff();
-
-	crypto1_destroy(pcs);
-
-	// All keys found, send to client, or last keychunk from client
-	if (foundkeys == allkeys || lastchunk ) {
-
-		uint64_t foo = 0;
-		for (uint8_t m = 0; m < 64; m++) {
-			foo |= ((uint64_t)(found[m] & 1) << m);
-		}
-
-		uint16_t bar = 0;
-		uint8_t j = 0;
-		for (uint8_t m=64; m < sizeof(found); m++) {
-			bar |= ((uint16_t)(found[m] & 1) << j++);
-		}
-	
-		uint8_t *tmp =  BigBuf_malloc(480+10);
-		memcpy(tmp, k_sector, sectorcnt * sizeof(sector_t) );
-		num_to_bytes(foo, 8, tmp+480);		
-		tmp[488] = bar & 0xFF;
-		tmp[489] = bar >> 8 & 0xFF;
-		
-		cmd_send(CMD_ACK, foundkeys, 0, 0, tmp, 480+10);
-
-		set_tracing(false);		
-		FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-		BigBuf_free(); BigBuf_Clear_ext(false);
-	} else {
-		// partial/none keys found
-		cmd_send(CMD_ACK, foundkeys, 0, 0, 0, 0);
-	}
-}
-
-void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) {
-
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-
-	struct Crypto1State mpcs = {0, 0};
-	struct Crypto1State *pcs;
-	pcs = &mpcs;
-
-	uint8_t uid[10] = {0x00};
-
-	uint64_t key = 0;
-	uint32_t cuid = 0;
-	int i, res;
-	uint8_t blockNo = arg0 & 0xFF;
-	uint8_t keyType = (arg0 >> 8) & 0xFF;
-	uint8_t keyCount = arg2;
-	uint8_t cascade_levels = 0;	
-	uint8_t isOK = 0;
-	bool have_uid = false;
-	bool clearTrace = arg1 & 0xFF;
-	
-	LEDsoff();
-	LED_A_ON();
-	
-	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
-
-	if (clearTrace) 
-		clear_trace();
-	
-	set_tracing(true);
-	
-	for (i = 0; i < keyCount; i++) {
-
-		// Iceman: use piwi's faster nonce collecting part in hardnested.
-		if (!have_uid) { // need a full select cycle to get the uid first
-			iso14a_card_select_t card_info;		
-			if (!iso14443a_select_card(uid, &card_info, &cuid, true, 0, true)) {
-				if (MF_DBGLEVEL >= 1)	Dbprintf("ChkKeys: Can't select card (ALL)");
-				--i; // try same key once again
-				continue;
-			}
-			switch (card_info.uidlen) {
-				case 4 : cascade_levels = 1; break;
-				case 7 : cascade_levels = 2; break;
-				case 10: cascade_levels = 3; break;
-				default: break;
-			}
-			have_uid = true;	
-		} else { // no need for anticollision. We can directly select the card
-			if (!iso14443a_select_card(uid, NULL, NULL, false, cascade_levels, true)) {
-				if (MF_DBGLEVEL >= 1)	Dbprintf("ChkKeys: Can't select card (UID)");
-				--i; // try same key once again
-				continue;
-			}
-		}
-	
-		key = bytes_to_num(datain + i * 6, 6);
-		res = mifare_classic_auth(pcs, cuid, blockNo, keyType, key, AUTH_FIRST);
-
-		CHK_TIMEOUT();
-
-		if (res)
-			continue;
-
-		isOK = 1;
-		break;
-	}
-	
-	LED_B_ON();
-    cmd_send(CMD_ACK, isOK, 0, 0, datain + i * 6, 6);
-
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	LEDsoff();
-	
-	set_tracing(false);
-	crypto1_destroy(pcs);
-}
-
-//-----------------------------------------------------------------------------
-// MIFARE commands set debug level
-// 
-//-----------------------------------------------------------------------------
-void MifareSetDbgLvl(uint16_t arg0){
-	MF_DBGLEVEL = arg0;
-	Dbprintf("Debug level: %d", MF_DBGLEVEL);
-}
-
-//-----------------------------------------------------------------------------
-// Work with emulator memory
-// 
-// Note: we call FpgaDownloadAndGo(FPGA_BITSTREAM_HF) here although FPGA is not
-// involved in dealing with emulator memory. But if it is called later, it might
-// destroy the Emulator Memory.
-//-----------------------------------------------------------------------------
-
-void MifareEMemClr(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){
-	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-	emlClearMem();
-}
-
-void MifareEMemSet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){
-	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-	if (arg2==0) arg2 = 16; // backwards compat... default bytewidth
-	emlSetMem_xt(datain, arg0, arg1, arg2); // data, block num, blocks count, block byte width
-}
-
-void MifareEMemGet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){
-	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-	byte_t buf[USB_CMD_DATA_SIZE] = {0x00};
-	emlGetMem(buf, arg0, arg1); // data, block num, blocks count (max 4)
-
-	LED_B_ON();
-	cmd_send(CMD_ACK,arg0,arg1,0,buf,USB_CMD_DATA_SIZE);
-	LED_B_OFF();
-}
-
-//-----------------------------------------------------------------------------
-// Load a card into the emulator memory
-// 
-//-----------------------------------------------------------------------------
-void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){
-	uint8_t numSectors = arg0;
-	uint8_t keyType = arg1;
-	uint64_t ui64Key = 0;
-	uint32_t cuid = 0;
-	struct Crypto1State mpcs = {0, 0};
-	struct Crypto1State *pcs;
-	pcs = &mpcs;
-
-	// variables
-	byte_t dataoutbuf[16] = {0x00};
-	byte_t dataoutbuf2[16] = {0x00};
-	uint8_t uid[10] = {0x00};
-
-	LED_A_ON();
-	LED_B_OFF();
-	LED_C_OFF();
-	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
-	
-	clear_trace();
-	set_tracing(true);
-	
-	bool isOK = true;
-
-	if(!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
-		isOK = false;
-		if (MF_DBGLEVEL >= 1)	Dbprintf("Can't select card");
-	}
-		
-	for (uint8_t sectorNo = 0; isOK && sectorNo < numSectors; sectorNo++) {
-		ui64Key = emlGetKey(sectorNo, keyType);
-		if (sectorNo == 0){
-			if(isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_FIRST)) {
-				isOK = false;
-				if (MF_DBGLEVEL >= 1)	Dbprintf("Sector[%2d]. Auth error", sectorNo);
-				break;
-			}
-		} else {
-			if(isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_NESTED)) {
-				isOK = false;
-				if (MF_DBGLEVEL >= 1)	Dbprintf("Sector[%2d]. Auth nested error", sectorNo);
-				break;
-			}
-		}
-		
-		for (uint8_t blockNo = 0; isOK && blockNo < NumBlocksPerSector(sectorNo); blockNo++) {
-			if(isOK && mifare_classic_readblock(pcs, cuid, FirstBlockOfSector(sectorNo) + blockNo, dataoutbuf)) {
-				isOK = false;
-				if (MF_DBGLEVEL >= 1)	Dbprintf("Error reading sector %2d block %2d", sectorNo, blockNo);
-				break;
-			}
-			if (isOK) {
-				if (blockNo < NumBlocksPerSector(sectorNo) - 1) {
-					emlSetMem(dataoutbuf, FirstBlockOfSector(sectorNo) + blockNo, 1);
-				} else {	// sector trailer, keep the keys, set only the AC
-					emlGetMem(dataoutbuf2, FirstBlockOfSector(sectorNo) + blockNo, 1);
-					memcpy(&dataoutbuf2[6], &dataoutbuf[6], 4);
-					emlSetMem(dataoutbuf2,  FirstBlockOfSector(sectorNo) + blockNo, 1);
-				}
-			}
-		}
-
-	}
-
-	if(mifare_classic_halt(pcs, cuid))
-		if (MF_DBGLEVEL >= 1)
-			Dbprintf("Halt error");
-
-	//  ----------------------------- crypto1 destroy
-	crypto1_destroy(pcs);
-
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	LEDsoff();
-	
-	if (MF_DBGLEVEL >= 2) DbpString("EMUL FILL SECTORS FINISHED");
-
-	set_tracing(false);
-}
-
-
-//-----------------------------------------------------------------------------
-// Work with "magic Chinese" card (email him: ouyangweidaxian@live.cn)
-// 
-// PARAMS - workFlags
-// bit 0 - need get UID
-// bit 1 - need wupC
-// bit 2 - need HALT after sequence
-// bit 3 - need turn on FPGA before sequence
-// bit 4 - need turn off FPGA
-// bit 5 - need to set datain instead of issuing USB reply (called via ARM for StandAloneMode14a)
-// bit 6 - wipe tag.
-//-----------------------------------------------------------------------------
-// magic uid card generation 1 commands
-uint8_t wupC1[] = { MIFARE_MAGICWUPC1 }; 
-uint8_t wupC2[] = { MIFARE_MAGICWUPC2 }; 
-uint8_t wipeC[] = { MIFARE_MAGICWIPEC }; 
-	
-void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){
-  
-	// params
-	uint8_t workFlags = arg0;
-	uint8_t blockNo = arg1;
-
-	// detect 1a/1b
-	bool is1b = false;
-	
-	// variables
-	bool isOK = false; //assume we will get an error
-	uint8_t errormsg = 0x00;
-	uint8_t uid[10] = {0x00};
-	uint8_t data[18] = {0x00};
-	uint32_t cuid = 0;
-	
-	uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};
-	uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0x00};
-
-	if (workFlags & MAGIC_INIT) {
-		LED_A_ON();
-		LED_B_OFF();
-		iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
-		clear_trace();
-		set_tracing(true);
-	}
-
-	//loop doesn't loop just breaks out if error
-	while (true) {
-		// read UID and return to client with write
-		if (workFlags & MAGIC_UID) {
-			if(!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
-				if (MF_DBGLEVEL >= MF_DBG_ERROR)	Dbprintf("Can't select card");
-				errormsg = MAGIC_UID;
-			}
-			mifare_classic_halt_ex(NULL);
-			break;
-		}
-	
-		// wipe tag, fill it with zeros
-		if (workFlags & MAGIC_WIPE){
-			ReaderTransmitBitsPar(wupC1, 7, NULL, NULL);
-			if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
-				if (MF_DBGLEVEL >= MF_DBG_ERROR)	Dbprintf("wupC1 error");
-				errormsg = MAGIC_WIPE;
-				break;
-			}
-
-			ReaderTransmit(wipeC, sizeof(wipeC), NULL);
-			if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
-				if (MF_DBGLEVEL >= MF_DBG_ERROR)	Dbprintf("wipeC error");
-				errormsg = MAGIC_WIPE;
-				break;
-			}
-
-			mifare_classic_halt_ex(NULL);
-		}	
-
-		// write block
-		if (workFlags & MAGIC_WUPC) {
-			ReaderTransmitBitsPar(wupC1, 7, NULL, NULL);
-			if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
-				if (MF_DBGLEVEL >= MF_DBG_ERROR)	Dbprintf("wupC1 error");
-				errormsg = MAGIC_WUPC;
-				break;
-			}
-
-			if ( !is1b ) {
-				ReaderTransmit(wupC2, sizeof(wupC2), NULL);
-				if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
-					if (MF_DBGLEVEL >= MF_DBG_ALL) Dbprintf("Assuming Magic Gen 1B tag. [wupC2 failed]");
-					is1b = true;
-					continue;
-				}
-			}
-		}
-
-		if ((mifare_sendcmd_short(NULL, 0, ISO14443A_CMD_WRITEBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL) != 1) || (receivedAnswer[0] != 0x0a)) {
-			if (MF_DBGLEVEL >= MF_DBG_ERROR)	Dbprintf("write block send command error");
-			errormsg = 4;
-			break;
-		}
-	
-		memcpy(data, datain, 16);
-		AddCrc14A(data, 16);
-	
-		ReaderTransmit(data, sizeof(data), NULL);
-		if ((ReaderReceive(receivedAnswer, receivedAnswerPar) != 1) || (receivedAnswer[0] != 0x0a)) {
-			if (MF_DBGLEVEL >= MF_DBG_ERROR)	Dbprintf("write block send data error");
-			errormsg = 0;
-			break;
-		}	
-	
-		if (workFlags & MAGIC_HALT) 
-			mifare_classic_halt_ex(NULL);
-		
-		isOK = true;
-		break;
-
-	} // end while	
-
-	if (isOK )
-		cmd_send(CMD_ACK,1,0,0,uid,sizeof(uid));
-	else
-		OnErrorMagic(errormsg);
-
-	if (workFlags & MAGIC_OFF)
-		OnSuccessMagic();
-}
-
-void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){
-    
-	uint8_t workFlags = arg0;
-	uint8_t blockNo = arg1;
-	uint8_t errormsg = 0x00;
-	bool isOK = false; //assume we will get an error
-	
-	// detect 1a/1b
-	bool is1b = false;
-	
-	// variables
-	uint8_t data[MAX_MIFARE_FRAME_SIZE];
-	uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};
-	uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0x00};
-	
-	memset(data, 0x00, sizeof(data));
-	
-	if (workFlags & MAGIC_INIT) {
-		LED_A_ON();
-		LED_B_OFF();
-		iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);	
-		clear_trace();
-		set_tracing(true);
-	}
-
-	//loop doesn't loop just breaks out if error or done
-	while (true) {
-		if (workFlags & MAGIC_WUPC) {
-			ReaderTransmitBitsPar(wupC1, 7, NULL, NULL);
-			if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
-				if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("wupC1 error");
-				errormsg = MAGIC_WUPC;
-				break;
-			}
-
-			if ( !is1b )  {
-				ReaderTransmit(wupC2, sizeof(wupC2), NULL);
-				if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
-					if (MF_DBGLEVEL >= MF_DBG_ALL) Dbprintf("Assuming Magic Gen 1B tag. [wupC2 failed]");
-					is1b = true;
-					continue;
-				}				
-			}
-		}
-
-		// read block		
-		if ((mifare_sendcmd_short(NULL, 0, ISO14443A_CMD_READBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL) != 18)) {
-			if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("read block send command error");
-			errormsg = 0;
-			break;
-		}
-		
-		memcpy(data, receivedAnswer, sizeof(data));
-		
-		// send HALT
-		if (workFlags & MAGIC_HALT)
-			mifare_classic_halt_ex(NULL);
-
-		isOK = true;
-		break;
-	}
-	// if MAGIC_DATAIN, the data stays on device side.
-	if (workFlags & MAGIC_DATAIN) {
-		if (isOK)
-			memcpy(datain, data, sizeof(data));
-	} else {
-		if (isOK) 
-			cmd_send(CMD_ACK,1,0,0,data,sizeof(data));	
-		else 
-			OnErrorMagic(errormsg);	
-	}
-	
-	if (workFlags & MAGIC_OFF)
-		OnSuccessMagic();
-}
-
-void MifareCIdent(){
-	#define GEN_1A 1
-	#define GEN_1B 2
-	#define GEN_2  4
-	// variables
-	uint8_t isGen = 0;
-	uint8_t rec[1] = {0x00};
-	uint8_t recpar[1] = {0x00};
-
-	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
-			
-	// Generation 1 test
-	ReaderTransmitBitsPar(wupC1, 7, NULL, NULL);
-	if(!ReaderReceive(rec, recpar) || (rec[0] != 0x0a)) {
-		goto TEST2;
-	};
-	isGen = GEN_1B;
-	
-	ReaderTransmit(wupC2, sizeof(wupC2), NULL);
-	if(!ReaderReceive(rec, recpar) || (rec[0] != 0x0a)) {
-		goto OUT;
-	};	
-	isGen = GEN_1A;
-	goto OUT;
-
-TEST2:;
-/*
-	// Generation 2 test
-
-	// halt previous.
-	mifare_classic_halt(NULL, 0);
-	
-	//select
-	if (!iso14443a_select_card(NULL, NULL, NULL, true, 0, true)) {
-		goto OUT;
-	};
-	
-	// MIFARE_CLASSIC_WRITEBLOCK 0xA0
-	// ACK 0x0a
-	uint16_t len = mifare_sendcmd_short(null, 1, 0xA0, 0, rec, recpar, NULL);
-	if ((len != 1) || (rec[0] != 0x0A)) {   
-		isGen = GEN_2;	
-	};
-	*/
-OUT:;
-	// removed the if,  since some magic tags misbehavies and send an answer to it.
-	mifare_classic_halt_ex(NULL);
-	cmd_send(CMD_ACK, isGen, 0, 0, 0, 0);
-	// turns off
-	OnSuccessMagic();
-}
-
-void OnSuccessMagic(){
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	LEDsoff();
-	set_tracing(false);	
-}
-void OnErrorMagic(uint8_t reason){
-	//          ACK, ISOK, reason,0,0,0
-	cmd_send(CMD_ACK,0,reason,0,0,0);
-	OnSuccessMagic();
-}
-
-void MifareSetMod(uint8_t mod, uint8_t *key) {
-	uint64_t ui64Key = bytes_to_num(key, 6);
-
-	// variables
-	uint8_t isOK = 0;
-	uint8_t uid[10] = {0};
-	uint32_t cuid = 0;
-	struct Crypto1State mpcs = {0, 0};
-	struct Crypto1State *pcs = &mpcs;
-	int respLen = 0;
-	uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0};
-	uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0};
-
-	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
-
-	clear_trace();
-	set_tracing(true);
-
-	LED_A_ON();
-	LED_B_OFF();
-	LED_C_OFF();
-
-	while (true) {
-		if(!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
-			if (MF_DBGLEVEL >= 1)	Dbprintf("Can't select card");
-			break;
-		}
-
-		if(mifare_classic_auth(pcs, cuid, 0, 0, ui64Key, AUTH_FIRST)) {
-			if (MF_DBGLEVEL >= 1)	Dbprintf("Auth error");
-			break;
-		}
-
-		if (((respLen = mifare_sendcmd_short(pcs, 1, 0x43, mod, receivedAnswer, receivedAnswerPar, NULL)) != 1) || (receivedAnswer[0] != 0x0a)) {
-			if (MF_DBGLEVEL >= 1)	Dbprintf("SetMod error; response[0]: %hhX, len: %d", receivedAnswer[0], respLen);
-			break;
-		}
-
-		if(mifare_classic_halt(pcs, cuid)) {
-			if (MF_DBGLEVEL >= 1)	Dbprintf("Halt error");
-			break;
-		}
-
-		isOK = 1;
-		break;
-	}
-
-	crypto1_destroy(pcs);
-
-	LED_B_ON();
-	cmd_send(CMD_ACK, isOK, 0, 0, 0, 0);
-	LED_B_OFF();
-
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	LEDsoff();
-}
-
-//
-// DESFIRE
-//
-void Mifare_DES_Auth1(uint8_t arg0, uint8_t *datain){
-	byte_t dataout[12] = {0x00};
-	uint8_t uid[10] = {0x00};
-	uint32_t cuid = 0;
-    
-	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
-	clear_trace();
-	set_tracing(true);
-
-	int len = iso14443a_select_card(uid, NULL, &cuid, true, 0, false);
-	if(!len) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card");
-		OnError(1);
-		return;
-	};
-
-	if(mifare_desfire_des_auth1(cuid, dataout)){
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication part1: Fail.");
-		OnError(4);
-		return;
-	}
-
-	if (MF_DBGLEVEL >= MF_DBG_EXTENDED) DbpString("AUTH 1 FINISHED");
-    cmd_send(CMD_ACK, 1, cuid, 0, dataout, sizeof(dataout));
-}
-
-void Mifare_DES_Auth2(uint32_t arg0, uint8_t *datain){
-	uint32_t cuid = arg0;
-	uint8_t key[16] = {0x00};
-	byte_t dataout[12] = {0x00};
-	byte_t isOK = 0;
-    
-	memcpy(key, datain, 16);
-	
-	isOK = mifare_desfire_des_auth2(cuid, key, dataout);
-	
-	if( isOK) {
-	    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Authentication part2: Failed");  
-		OnError(4);
-		return;
-	}
-
-	if (MF_DBGLEVEL >= MF_DBG_EXTENDED) DbpString("AUTH 2 FINISHED");
-
-	cmd_send(CMD_ACK, isOK, 0, 0, dataout, sizeof(dataout));
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	LEDsoff();
-	set_tracing(false);
+//-----------------------------------------------------------------------------
+// Merlok - June 2011, 2012
+// Gerhard de Koning Gans - May 2008
+// Hagen Fritsch - June 2010
+// Midnitesnake - Dec 2013
+// Andy Davies  - Apr 2014
+// Iceman - May 2014,2015,2016
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// Routines to support ISO 14443 type A.
+//-----------------------------------------------------------------------------
+
+#include "mifarecmd.h"
+#include <inttypes.h>
+
+#ifndef HARDNESTED_AUTHENTICATION_TIMEOUT
+# define HARDNESTED_AUTHENTICATION_TIMEOUT  848			// card times out 1ms after wrong authentication (according to NXP documentation)
+#endif
+#ifndef HARDNESTED_PRE_AUTHENTICATION_LEADTIME
+# define HARDNESTED_PRE_AUTHENTICATION_LEADTIME 400		// some (non standard) cards need a pause after select before they are ready for first authentication 
+#endif 	
+
+// send an incomplete dummy response in order to trigger the card's authentication failure timeout
+#ifndef CHK_TIMEOUT
+# define CHK_TIMEOUT() { \
+	ReaderTransmit(&dummy_answer, 1, NULL); \
+	uint32_t timeout = GetCountSspClk() + HARDNESTED_AUTHENTICATION_TIMEOUT; \
+	while (GetCountSspClk() < timeout) {}; \
+ } 
+#endif
+
+static uint8_t dummy_answer = 0;
+
+//-----------------------------------------------------------------------------
+// Select, Authenticate, Read a MIFARE tag. 
+// read block
+//-----------------------------------------------------------------------------
+void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
+{
+  // params
+	uint8_t blockNo = arg0;
+	uint8_t keyType = arg1;
+	uint64_t ui64Key = 0;
+	ui64Key = bytes_to_num(datain, 6);
+	
+	// variables
+	byte_t isOK = 0;
+	byte_t dataoutbuf[16] = {0x00};
+	uint8_t uid[10] = {0x00};
+	uint32_t cuid = 0;
+	struct Crypto1State mpcs = {0, 0};
+	struct Crypto1State *pcs;
+	pcs = &mpcs;
+
+	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+
+	clear_trace();
+	set_tracing(true);
+
+	LED_A_ON();
+	LED_B_OFF();
+	LED_C_OFF();
+
+	while (true) {
+		if(!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
+			if (MF_DBGLEVEL >= 1)	Dbprintf("Can't select card");
+			break;
+		};
+
+		if(mifare_classic_auth(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST)) {
+			if (MF_DBGLEVEL >= 1)	Dbprintf("Auth error");
+			break;
+		};
+		
+		if(mifare_classic_readblock(pcs, cuid, blockNo, dataoutbuf)) {
+			if (MF_DBGLEVEL >= 1)	Dbprintf("Read block error");
+			break;
+		};
+
+		if(mifare_classic_halt(pcs, cuid)) {
+			if (MF_DBGLEVEL >= 1)	Dbprintf("Halt error");
+			break;
+		};
+		
+		isOK = 1;
+		break;
+	}
+	
+	crypto1_destroy(pcs);
+	
+	if (MF_DBGLEVEL >= 2)	DbpString("READ BLOCK FINISHED");
+
+	LED_B_ON();
+	cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,16);
+	LED_B_OFF();
+
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+	LEDsoff();
+}
+
+void MifareUC_Auth(uint8_t arg0, uint8_t *keybytes){
+
+	bool turnOffField = (arg0 == 1);
+
+	LED_A_ON(); LED_B_OFF(); LED_C_OFF();
+
+	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+
+	clear_trace();
+	set_tracing(true);
+
+	if(!iso14443a_select_card(NULL, NULL, NULL, true, 0, true)) {
+		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card");
+		OnError(0);
+		return;
+	};
+	
+	if(!mifare_ultra_auth(keybytes)){
+		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication failed");
+		OnError(1);
+		return;
+	}
+
+	if (turnOffField) {
+		FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+		LEDsoff();
+	}
+	cmd_send(CMD_ACK,1,0,0,0,0);
+}
+
+// Arg0 = BlockNo,
+// Arg1 = UsePwd bool
+// datain = PWD bytes,
+void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)
+{
+	uint8_t blockNo = arg0;
+	byte_t dataout[16] = {0x00};
+	bool useKey = (arg1 == 1); //UL_C
+	bool usePwd = (arg1 == 2); //UL_EV1/NTAG
+
+	LEDsoff();
+	LED_A_ON();
+	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+
+	clear_trace();
+	set_tracing(true);
+
+	int len = iso14443a_select_card(NULL, NULL, NULL, true, 0, true);
+	if(!len) {
+		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card (RC:%02X)",len);
+		OnError(1);
+		return;
+	}
+
+	// UL-C authentication
+	if ( useKey ) {
+		uint8_t key[16] = {0x00};
+		memcpy(key, datain, sizeof(key) );
+
+		if ( !mifare_ultra_auth(key) ) {
+			OnError(1);
+			return;
+		}
+	}
+
+	// UL-EV1 / NTAG authentication
+	if ( usePwd ) {
+		uint8_t pwd[4] = {0x00};
+		memcpy(pwd, datain, 4);
+		uint8_t pack[4] = {0,0,0,0};
+		if (!mifare_ul_ev1_auth(pwd, pack)) {
+			OnError(1);
+			return;
+		}
+	}	
+
+	if( mifare_ultra_readblock(blockNo, dataout) ) {
+		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Read block error");
+		OnError(2);
+		return;
+	}
+
+	if( mifare_ultra_halt() ) {
+		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Halt error");
+		OnError(3);
+		return;
+	}
+
+    cmd_send(CMD_ACK,1,0,0,dataout,16);
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+	LEDsoff();
+}
+
+//-----------------------------------------------------------------------------
+// Select, Authenticate, Read a MIFARE tag. 
+// read sector (data = 4 x 16 bytes = 64 bytes, or 16 x 16 bytes = 256 bytes)
+//-----------------------------------------------------------------------------
+void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
+{
+  // params
+	uint8_t sectorNo = arg0;
+	uint8_t keyType = arg1;
+	uint64_t ui64Key = 0;
+	ui64Key = bytes_to_num(datain, 6);
+	
+	// variables
+	byte_t isOK = 0;
+	byte_t dataoutbuf[16 * 16];
+	uint8_t uid[10] = {0x00};
+	uint32_t cuid = 0;
+	struct Crypto1State mpcs = {0, 0};
+	struct Crypto1State *pcs;
+	pcs = &mpcs;
+
+	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+
+	clear_trace();
+	set_tracing(true);
+	
+	LED_A_ON();
+	LED_B_OFF();
+	LED_C_OFF();
+
+	isOK = 1;
+	if(!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
+		isOK = 0;
+		if (MF_DBGLEVEL >= 1)	Dbprintf("Can't select card");
+	}
+	
+	
+	if(isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_FIRST)) {
+		isOK = 0;
+		if (MF_DBGLEVEL >= 1)	Dbprintf("Auth error");
+	}
+	
+	for (uint8_t blockNo = 0; isOK && blockNo < NumBlocksPerSector(sectorNo); blockNo++) {
+		if(mifare_classic_readblock(pcs, cuid, FirstBlockOfSector(sectorNo) + blockNo, dataoutbuf + 16 * blockNo)) {
+			isOK = 0;
+			if (MF_DBGLEVEL >= 1)	Dbprintf("Read sector %2d block %2d error", sectorNo, blockNo);
+			break;
+		}
+	}
+		
+	if(mifare_classic_halt(pcs, cuid)) {
+		if (MF_DBGLEVEL >= 1)	Dbprintf("Halt error");
+	}
+
+	if (MF_DBGLEVEL >= 2) DbpString("READ SECTOR FINISHED");
+
+	crypto1_destroy(pcs);
+
+	LED_B_ON();
+	cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,16*NumBlocksPerSector(sectorNo));
+	LED_B_OFF();
+
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+	LEDsoff();
+	set_tracing(false);
+}
+
+// arg0 = blockNo (start)
+// arg1 = Pages (number of blocks)
+// arg2 = useKey
+// datain = KEY bytes
+void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
+{
+	LEDsoff();
+	LED_A_ON();
+	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+
+	// free eventually allocated BigBuf memory
+	BigBuf_free(); BigBuf_Clear_ext(false);
+	clear_trace();
+	set_tracing(true);
+	
+	// params
+	uint8_t blockNo = arg0;
+	uint16_t blocks = arg1;
+	bool useKey = (arg2 == 1); //UL_C
+	bool usePwd = (arg2 == 2); //UL_EV1/NTAG
+	uint32_t countblocks = 0;
+	uint8_t *dataout = BigBuf_malloc(CARD_MEMORY_SIZE);
+	if (dataout == NULL){
+		Dbprintf("out of memory");
+		OnError(1);
+		return;
+	}
+
+	int len = iso14443a_select_card(NULL, NULL, NULL, true, 0, true);
+	if (!len) {
+		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card (RC:%d)",len);
+		OnError(1);
+		return;
+	}
+
+	// UL-C authentication
+	if ( useKey ) {
+		uint8_t key[16] = {0x00};
+		memcpy(key, datain, sizeof(key) );
+
+		if ( !mifare_ultra_auth(key) ) {
+			OnError(1);
+			return;
+		}
+	}
+
+	// UL-EV1 / NTAG authentication
+	if (usePwd) {
+		uint8_t pwd[4] = {0x00};
+		memcpy(pwd, datain, sizeof(pwd));
+		uint8_t pack[4] = {0,0,0,0};
+
+		if (!mifare_ul_ev1_auth(pwd, pack)){
+			OnError(1);
+			return;			
+		}
+	}
+
+	for (int i = 0; i < blocks; i++){
+		if ((i*4) + 4 >= CARD_MEMORY_SIZE) {
+			Dbprintf("Data exceeds buffer!!");
+			break;
+		}
+
+		len = mifare_ultra_readblock(blockNo + i, dataout + 4 * i);
+		
+		if (len) {
+			if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Read block %d error",i);
+			// if no blocks read - error out
+			if (i == 0) {
+				OnError(2);
+				return;
+			} else {
+				//stop at last successful read block and return what we got
+				break;
+			}
+		} else {
+			countblocks++;
+		}
+	}
+
+	len = mifare_ultra_halt();
+	if (len) {
+		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Halt error");
+		OnError(3);
+		return;
+	}
+
+	if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Blocks read %d", countblocks);
+
+	countblocks *= 4;
+
+	cmd_send(CMD_ACK, 1, countblocks, BigBuf_max_traceLen(), 0, 0);
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+	LEDsoff();
+	BigBuf_free();
+	set_tracing(false);
+}
+
+//-----------------------------------------------------------------------------
+// Select, Authenticate, Write a MIFARE tag. 
+// read block
+//-----------------------------------------------------------------------------
+void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
+{
+	// params
+	uint8_t blockNo = arg0;
+	uint8_t keyType = arg1;
+	uint64_t ui64Key = 0;
+	byte_t blockdata[16] = {0x00};
+
+	ui64Key = bytes_to_num(datain, 6);
+	memcpy(blockdata, datain + 10, 16);
+	
+	// variables
+	byte_t isOK = 0;
+	uint8_t uid[10] = {0x00};
+	uint32_t cuid = 0;
+	struct Crypto1State mpcs = {0, 0};
+	struct Crypto1State *pcs;
+	pcs = &mpcs;
+
+	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+
+	clear_trace();
+	set_tracing(true);
+	
+	LED_A_ON();
+	LED_B_OFF();
+	LED_C_OFF();
+
+	while (true) {
+		if(!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
+			if (MF_DBGLEVEL >= 1)	Dbprintf("Can't select card");
+			break;
+		};
+
+		if(mifare_classic_auth(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST)) {
+			if (MF_DBGLEVEL >= 1)	Dbprintf("Auth error");
+			break;
+		};
+		
+		if(mifare_classic_writeblock(pcs, cuid, blockNo, blockdata)) {
+			if (MF_DBGLEVEL >= 1)	Dbprintf("Write block error");
+			break;
+		};
+
+		if(mifare_classic_halt(pcs, cuid)) {
+			if (MF_DBGLEVEL >= 1)	Dbprintf("Halt error");
+			break;
+		};
+		
+		isOK = 1;
+		break;
+	}
+	
+	crypto1_destroy(pcs);
+	
+	if (MF_DBGLEVEL >= 2)	DbpString("WRITE BLOCK FINISHED");
+
+	cmd_send(CMD_ACK,isOK,0,0,0,0);
+
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+	LEDsoff();
+	set_tracing(false);
+}
+
+/* // Command not needed but left for future testing 
+void MifareUWriteBlockCompat(uint8_t arg0, uint8_t *datain)
+{
+	uint8_t blockNo = arg0;
+	byte_t blockdata[16] = {0x00};
+
+	memcpy(blockdata, datain, 16);
+
+	uint8_t uid[10] = {0x00};
+
+	LED_A_ON(); LED_B_OFF(); LED_C_OFF();
+
+	clear_trace();
+	set_tracing(true);
+	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+
+	if(!iso14443a_select_card(uid, NULL, NULL, true, 0, true)) {
+		if (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");
+		OnError(0);
+		return;
+	};
+
+	if(mifare_ultra_writeblock_compat(blockNo, blockdata)) {
+		if (MF_DBGLEVEL >= 1)   Dbprintf("Write block error");
+		OnError(0);
+		return;	};
+
+	if(mifare_ultra_halt()) {
+		if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");
+		OnError(0);
+		return;
+	};
+
+	if (MF_DBGLEVEL >= 2)   DbpString("WRITE BLOCK FINISHED");
+
+	cmd_send(CMD_ACK,1,0,0,0,0);
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+	LEDsoff();
+}
+*/
+
+// Arg0   : Block to write to.
+// Arg1   : 0 = use no authentication.
+//          1 = use 0x1A authentication.
+//          2 = use 0x1B authentication.
+// datain : 4 first bytes is data to be written.
+//        : 4/16 next bytes is authentication key.
+void MifareUWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)
+{
+	uint8_t blockNo = arg0;
+	bool useKey = (arg1 == 1); //UL_C
+	bool usePwd = (arg1 == 2); //UL_EV1/NTAG
+	byte_t blockdata[4] = {0x00};
+
+	memcpy(blockdata, datain, 4);
+	
+	LEDsoff();
+	LED_A_ON();
+	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+
+	clear_trace();
+	set_tracing(true);
+	
+	if (!iso14443a_select_card(NULL, NULL, NULL, true, 0, true)) {
+		if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
+		OnError(0);
+		return;
+	};
+
+	// UL-C authentication
+	if ( useKey ) {
+		uint8_t key[16] = {0x00};	
+		memcpy(key, datain+4, sizeof(key) );
+
+		if ( !mifare_ultra_auth(key) ) {
+			OnError(1);
+			return;			
+		}
+	}
+	
+	// UL-EV1 / NTAG authentication
+	if (usePwd) { 
+		uint8_t pwd[4] = {0x00};
+		memcpy(pwd, datain+4, 4);
+		uint8_t pack[4] = {0,0,0,0};
+		if (!mifare_ul_ev1_auth(pwd, pack)) {
+			OnError(1);
+			return;			
+		}
+	}
+	
+	if (mifare_ultra_writeblock(blockNo, blockdata)) {
+		if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
+		OnError(0);
+		return;
+	};
+
+	if (mifare_ultra_halt()) {
+		if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
+		OnError(0);
+		return;
+	};
+
+	if (MF_DBGLEVEL >= 2) DbpString("WRITE BLOCK FINISHED");
+
+	cmd_send(CMD_ACK,1,0,0,0,0);
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+	LEDsoff();
+	set_tracing(false);
+}
+
+void MifareUSetPwd(uint8_t arg0, uint8_t *datain){
+	
+	uint8_t pwd[16] = {0x00};
+	byte_t blockdata[4] = {0x00};
+	
+	memcpy(pwd, datain, 16);
+	
+	LED_A_ON(); LED_B_OFF(); LED_C_OFF();
+	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+
+	clear_trace();
+	set_tracing(true);
+	
+	if (!iso14443a_select_card(NULL, NULL, NULL, true, 0, true)) {
+		if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
+		OnError(0);
+		return;
+	};
+
+	blockdata[0] = pwd[7];
+	blockdata[1] = pwd[6];
+	blockdata[2] = pwd[5];
+	blockdata[3] = pwd[4];
+	if (mifare_ultra_writeblock( 44, blockdata)) {
+		if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
+		OnError(44);
+		return;
+	};
+
+	blockdata[0] = pwd[3];
+	blockdata[1] = pwd[2];
+	blockdata[2] = pwd[1];
+	blockdata[3] = pwd[0];
+	if (mifare_ultra_writeblock( 45, blockdata)) {
+		if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
+		OnError(45);
+		return;
+	};
+
+	blockdata[0] = pwd[15];
+	blockdata[1] = pwd[14];
+	blockdata[2] = pwd[13];
+	blockdata[3] = pwd[12];
+	if (mifare_ultra_writeblock( 46, blockdata)) {
+		if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
+		OnError(46);
+		return;
+	};
+
+	blockdata[0] = pwd[11];
+	blockdata[1] = pwd[10];
+	blockdata[2] = pwd[9];
+	blockdata[3] = pwd[8];
+	if (mifare_ultra_writeblock( 47, blockdata)) {
+		if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
+		OnError(47);
+		return;
+	};	
+
+	if (mifare_ultra_halt()) {
+		if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
+		OnError(0);
+		return;
+	};
+
+	cmd_send(CMD_ACK,1,0,0,0,0);
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+	LEDsoff();
+	set_tracing(false);
+}
+
+// Return 1 if the nonce is invalid else return 0
+int valid_nonce(uint32_t Nt, uint32_t NtEnc, uint32_t Ks1, uint8_t *parity) {
+	return ((oddparity8((Nt >> 24) & 0xFF) == ((parity[0]) ^ oddparity8((NtEnc >> 24) & 0xFF) ^ BIT(Ks1,16))) & \
+	(oddparity8((Nt >> 16) & 0xFF) == ((parity[1]) ^ oddparity8((NtEnc >> 16) & 0xFF) ^ BIT(Ks1,8))) & \
+	(oddparity8((Nt >> 8) & 0xFF) == ((parity[2]) ^ oddparity8((NtEnc >> 8) & 0xFF) ^ BIT(Ks1,0)))) ? 1 : 0;
+}
+
+void MifareAcquireNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *datain) {
+
+	uint8_t uid[10] = {0x00};
+	uint8_t answer[MAX_MIFARE_FRAME_SIZE] = {0x00};
+	uint8_t par[1] = {0x00};
+	uint8_t buf[USB_CMD_DATA_SIZE] = {0x00};
+	uint32_t cuid = 0;
+	int16_t isOK = 0;
+	uint16_t num_nonces = 0;
+	uint8_t cascade_levels = 0;	
+	uint8_t blockNo = arg0 & 0xff;
+	uint8_t keyType = (arg0 >> 8) & 0xff;
+	bool initialize = flags & 0x0001;
+	bool field_off = flags & 0x0004;
+	bool have_uid = false;
+	
+	LED_A_ON();
+	LED_C_OFF();
+
+	BigBuf_free(); BigBuf_Clear_ext(false);	
+	clear_trace();
+	set_tracing(true);
+	
+	if (initialize)
+		iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+	
+	LED_C_ON();
+	
+	for (uint16_t i = 0; i <= USB_CMD_DATA_SIZE-4; i += 4 ) {
+
+		// Test if the action was cancelled
+		if (BUTTON_PRESS()) {
+			isOK = 2;
+			field_off = true;
+			break;
+		}
+
+		if (!have_uid) { // need a full select cycle to get the uid first
+			iso14a_card_select_t card_info;		
+			if (!iso14443a_select_card(uid, &card_info, &cuid, true, 0, true)) {
+				if (MF_DBGLEVEL >= 1)	Dbprintf("AcquireNonces: Can't select card (ALL)");
+				continue;
+			}
+			switch (card_info.uidlen) {
+				case 4 : cascade_levels = 1; break;
+				case 7 : cascade_levels = 2; break;
+				case 10: cascade_levels = 3; break;
+				default: break;
+			}
+			have_uid = true;	
+		} else { // no need for anticollision. We can directly select the card
+			if (!iso14443a_fast_select_card(uid, cascade_levels)) {
+				if (MF_DBGLEVEL >= 1)	Dbprintf("AcquireNonces: Can't select card (UID)");
+				continue;
+			}
+		}
+		
+		// Transmit MIFARE_CLASSIC_AUTH	
+		uint8_t dcmd[4] = {0x60 + (keyType & 0x01), blockNo, 0x00, 0x00};
+		AddCrc14A(dcmd, 2);
+		ReaderTransmit(dcmd, sizeof(dcmd), NULL);
+		int len = ReaderReceive(answer, par);		
+
+		// wait for the card to become ready again
+		CHK_TIMEOUT();
+		
+		if (len != 4) {
+			if (MF_DBGLEVEL >= 2)	Dbprintf("AcquireNonces: Auth1 error");
+			continue;
+		}
+		
+		num_nonces++;
+		
+		// Save the tag nonce (nt)	
+		buf[i]   = answer[0];
+		buf[i+1] = answer[1];
+		buf[i+2] = answer[2];
+		buf[i+3] = answer[3];
+	}
+
+	LED_C_OFF();
+	LED_B_ON();
+	cmd_send(CMD_ACK, isOK, cuid, num_nonces-1, buf, sizeof(buf));
+	LED_B_OFF();
+
+	if (MF_DBGLEVEL >= 3)	DbpString("AcquireNonces finished");
+
+	if (field_off) {
+		FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+		LEDsoff();
+		set_tracing(false);
+	}
+}
+
+//-----------------------------------------------------------------------------
+// acquire encrypted nonces in order to perform the attack described in
+// Carlo Meijer, Roel Verdult, "Ciphertext-only Cryptanalysis on Hardened
+// Mifare Classic Cards" in Proceedings of the 22nd ACM SIGSAC Conference on 
+// Computer and Communications Security, 2015
+//-----------------------------------------------------------------------------
+void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *datain) {
+
+	struct Crypto1State mpcs = {0, 0};
+	struct Crypto1State *pcs;
+	pcs = &mpcs;
+
+	uint8_t uid[10] = {0x00};
+	uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};
+	uint8_t par_enc[1] = {0x00};
+	uint8_t buf[USB_CMD_DATA_SIZE] = {0x00};
+
+	uint64_t ui64Key = bytes_to_num(datain, 6);
+	uint32_t cuid = 0;
+	int16_t isOK = 0;
+	uint16_t num_nonces = 0;
+	uint8_t nt_par_enc = 0;
+	uint8_t cascade_levels = 0;
+	uint8_t blockNo = arg0 & 0xff;
+	uint8_t keyType = (arg0 >> 8) & 0xff;
+	uint8_t targetBlockNo = arg1 & 0xff;
+	uint8_t targetKeyType = (arg1 >> 8) & 0xff;	
+	bool initialize = flags & 0x0001;
+	bool slow = flags & 0x0002;
+	bool field_off = flags & 0x0004;
+	bool have_uid = false;
+
+	LED_A_ON();
+	LED_C_OFF();
+
+	BigBuf_free(); BigBuf_Clear_ext(false);	
+	clear_trace();
+	set_tracing(false);
+	
+	if (initialize)
+		iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+	
+	LED_C_ON();
+	
+	for (uint16_t i = 0; i <= USB_CMD_DATA_SIZE - 9; ) {
+
+		// Test if the action was cancelled
+		if(BUTTON_PRESS()) {
+			isOK = 2;
+			field_off = true;
+			break;
+		}
+
+		if (!have_uid) { // need a full select cycle to get the uid first
+			iso14a_card_select_t card_info;		
+			if(!iso14443a_select_card(uid, &card_info, &cuid, true, 0, true)) {
+				if (MF_DBGLEVEL >= 1)	Dbprintf("AcquireNonces: Can't select card (ALL)");
+				continue;
+			}
+			switch (card_info.uidlen) {
+				case 4 : cascade_levels = 1; break;
+				case 7 : cascade_levels = 2; break;
+				case 10: cascade_levels = 3; break;
+				default: break;
+			}
+			have_uid = true;	
+		} else { // no need for anticollision. We can directly select the card
+			if (!iso14443a_fast_select_card(uid, cascade_levels)) {
+				if (MF_DBGLEVEL >= 1)	Dbprintf("AcquireNonces: Can't select card (UID)");
+				continue;
+			}
+		}
+		
+		if (slow)
+			SpinDelayUs(HARDNESTED_PRE_AUTHENTICATION_LEADTIME);
+
+		uint32_t nt1;
+		if (mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1, NULL)) {
+			if (MF_DBGLEVEL >= 1)	Dbprintf("AcquireNonces: Auth1 error");
+			continue;
+		}
+
+		// nested authentication
+		uint16_t len = mifare_sendcmd_short(pcs, AUTH_NESTED, 0x60 + (targetKeyType & 0x01), targetBlockNo, receivedAnswer, par_enc, NULL);
+
+		// wait for the card to become ready again
+		CHK_TIMEOUT();
+
+		if (len != 4) {
+			if (MF_DBGLEVEL >= 1)	Dbprintf("AcquireNonces: Auth2 error len=%d", len);
+			continue;
+		}
+	
+		num_nonces++;
+		if (num_nonces % 2) {
+			memcpy(buf+i, receivedAnswer, 4);
+			nt_par_enc = par_enc[0] & 0xf0;
+		} else {
+			nt_par_enc |= par_enc[0]  >> 4;
+			memcpy(buf+i+4, receivedAnswer, 4);
+			memcpy(buf+i+8, &nt_par_enc, 1);
+			i += 9;
+		}
+	}
+
+	LED_C_OFF();
+	crypto1_destroy(pcs);	
+	LED_B_ON();
+	cmd_send(CMD_ACK, isOK, cuid, num_nonces, buf, sizeof(buf));
+	LED_B_OFF();
+
+	if (MF_DBGLEVEL >= 3)	DbpString("AcquireEncryptedNonces finished");
+
+	if (field_off) {
+		FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+		LEDsoff();
+		set_tracing(false);
+	}
+}
+
+
+//-----------------------------------------------------------------------------
+// MIFARE nested authentication. 
+// 
+//-----------------------------------------------------------------------------
+void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *datain)
+{
+	// params
+	uint8_t blockNo = arg0 & 0xff;
+	uint8_t keyType = (arg0 >> 8) & 0xff;
+	uint8_t targetBlockNo = arg1 & 0xff;
+	uint8_t targetKeyType = (arg1 >> 8) & 0xff;
+	uint64_t ui64Key = 0;
+
+	ui64Key = bytes_to_num(datain, 6);
+	
+	// variables
+	uint16_t rtr, i, j, len;
+	uint16_t davg = 0;
+	static uint16_t dmin, dmax;
+	uint8_t uid[10] = {0x00};
+	uint32_t cuid = 0, nt1, nt2, nttmp, nttest, ks1;
+	uint8_t par[1] = {0x00};
+	uint32_t target_nt[2] = {0x00}, target_ks[2] = {0x00};
+	
+	uint8_t par_array[4] = {0x00};
+	uint16_t ncount = 0;
+	struct Crypto1State mpcs = {0, 0};
+	struct Crypto1State *pcs;
+	pcs = &mpcs;
+	uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};
+
+	uint32_t auth1_time, auth2_time;
+	static uint16_t delta_time = 0;
+
+	LED_A_ON();
+	LED_C_OFF();
+	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+
+	// free eventually allocated BigBuf memory
+	BigBuf_free(); BigBuf_Clear_ext(false);
+	
+	if (calibrate) clear_trace();
+	set_tracing(true);
+
+	// statistics on nonce distance
+	int16_t isOK = 0;
+	#define NESTED_MAX_TRIES 12
+	uint16_t unsuccessfull_tries = 0;
+	if (calibrate) {	// for first call only. Otherwise reuse previous calibration
+		LED_B_ON();
+		WDT_HIT();
+
+		davg = dmax = 0;
+		dmin = 2000;
+		delta_time = 0;
+		
+		for (rtr = 0; rtr < 17; rtr++) {
+
+			// Test if the action was cancelled
+			if(BUTTON_PRESS()) {
+				isOK = -2;
+				break;
+			}
+
+			// prepare next select. No need to power down the card.
+			if(mifare_classic_halt(pcs, cuid)) {
+				if (MF_DBGLEVEL >= 2)	Dbprintf("Nested: Halt error");
+				rtr--;
+				continue;
+			}
+
+			if(!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
+				if (MF_DBGLEVEL >= 2)	Dbprintf("Nested: Can't select card");
+				rtr--;
+				continue;
+			};
+
+			auth1_time = 0;
+			if(mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1, &auth1_time)) {
+				if (MF_DBGLEVEL >= 2)	Dbprintf("Nested: Auth1 error");
+				rtr--;
+				continue;
+			};
+			auth2_time = (delta_time) ? auth1_time + delta_time : 0;
+
+			if(mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_NESTED, &nt2, &auth2_time)) {
+				if (MF_DBGLEVEL >= 2)	Dbprintf("Nested: Auth2 error");
+				rtr--;
+				continue;
+			};
+
+			nttmp = prng_successor(nt1, 100);				//NXP Mifare is typical around 840,but for some unlicensed/compatible mifare card this can be 160
+			for (i = 101; i < 1200; i++) {
+				nttmp = prng_successor(nttmp, 1);
+				if (nttmp == nt2) break;
+			}
+
+			if (i != 1200) {
+				if (rtr != 0) {
+					davg += i;
+					dmin = MIN(dmin, i);
+					dmax = MAX(dmax, i);
+				}
+				else {
+					delta_time = auth2_time - auth1_time + 32;  // allow some slack for proper timing
+				}
+				if (MF_DBGLEVEL >= 3) Dbprintf("Nested: calibrating... ntdist=%d", i);
+			} else {
+				unsuccessfull_tries++;
+				if (unsuccessfull_tries > NESTED_MAX_TRIES) {	// card isn't vulnerable to nested attack (random numbers are not predictable)
+					isOK = -3;
+				}
+			}
+		}
+
+		davg = (davg + (rtr - 1)/2) / (rtr - 1);
+		
+		if (MF_DBGLEVEL >= 3) Dbprintf("rtr=%d isOK=%d min=%d max=%d avg=%d, delta_time=%d", rtr, isOK, dmin, dmax, davg, delta_time);
+
+		dmin = davg - 2;
+		dmax = davg + 2;
+		
+		LED_B_OFF();
+	}
+//  -------------------------------------------------------------------------------------------------	
+	
+	LED_C_ON();
+
+	//  get crypted nonces for target sector
+	for(i=0; i < 2 && !isOK; i++) { // look for exactly two different nonces
+
+		target_nt[i] = 0;
+		while(target_nt[i] == 0) { // continue until we have an unambiguous nonce
+		
+			// prepare next select. No need to power down the card.
+			if(mifare_classic_halt(pcs, cuid)) {
+				if (MF_DBGLEVEL >= 2)	Dbprintf("Nested: Halt error");
+				continue;
+			}
+
+			if(!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
+				if (MF_DBGLEVEL >= 2)	Dbprintf("Nested: Can't select card");
+				continue;
+			};
+		
+			auth1_time = 0;
+			if(mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1, &auth1_time)) {
+				if (MF_DBGLEVEL >= 2)	Dbprintf("Nested: Auth1 error");
+				continue;
+			};
+
+			// nested authentication
+			auth2_time = auth1_time + delta_time;
+
+			len = mifare_sendcmd_short(pcs, AUTH_NESTED, 0x60 + (targetKeyType & 0x01), targetBlockNo, receivedAnswer, par, &auth2_time);
+			if (len != 4) {
+				if (MF_DBGLEVEL >= 2)	Dbprintf("Nested: Auth2 error len=%d", len);
+				continue;
+			};
+		
+			nt2 = bytes_to_num(receivedAnswer, 4);		
+			if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: Testing nt1=%08x nt2enc=%08x nt2par=%02x", i+1, nt1, nt2, par[0]);
+			
+			// Parity validity check
+			for (j = 0; j < 4; j++) {
+				par_array[j] = (oddparity8(receivedAnswer[j]) != ((par[0] >> (7-j)) & 0x01));
+			}
+			
+			ncount = 0;
+			nttest = prng_successor(nt1, dmin - 1);
+			for (j = dmin; j < dmax + 1; j++) {
+				nttest = prng_successor(nttest, 1);
+				ks1 = nt2 ^ nttest;
+
+				if (valid_nonce(nttest, nt2, ks1, par_array)){
+					if (ncount > 0) { 		// we are only interested in disambiguous nonces, try again
+						if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: dismissed (ambigous), ntdist=%d", i+1, j);
+						target_nt[i] = 0;
+						break;
+					}
+					target_nt[i] = nttest;
+					target_ks[i] = ks1;
+					ncount++;
+					if (i == 1 && target_nt[1] == target_nt[0]) { // we need two different nonces
+						target_nt[i] = 0;
+						if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#2: dismissed (= nonce#1), ntdist=%d", j);
+						break;
+					}
+					if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: valid, ntdist=%d", i+1, j);
+				}
+			}
+			if (target_nt[i] == 0 && j == dmax+1 && MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: dismissed (all invalid)", i+1);
+		}
+	}
+
+	LED_C_OFF();
+	
+	crypto1_destroy(pcs);
+	
+	uint8_t buf[4 + 4 * 4] = {0};
+	memcpy(buf, &cuid, 4);
+	memcpy(buf+4, &target_nt[0], 4);
+	memcpy(buf+8, &target_ks[0], 4);
+	memcpy(buf+12, &target_nt[1], 4);
+	memcpy(buf+16, &target_ks[1], 4);
+	
+	LED_B_ON();
+	cmd_send(CMD_ACK, isOK, 0, targetBlockNo + (targetKeyType * 0x100), buf, sizeof(buf));
+	LED_B_OFF();
+
+	if (MF_DBGLEVEL >= 3)	DbpString("NESTED FINISHED");
+
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+	LEDsoff();
+	set_tracing(false);
+}
+
+//-----------------------------------------------------------------------------
+// MIFARE check keys. key count up to 85. 
+// 
+//-----------------------------------------------------------------------------	
+typedef struct sector_t {
+	uint8_t keyA[6];
+	uint8_t keyB[6];
+} sector_t;
+
+typedef struct chk_t {
+	uint64_t key;
+	uint32_t cuid;	
+	uint8_t cl;
+	uint8_t block;
+	uint8_t keyType;
+	uint8_t *uid;	
+	struct Crypto1State *pcs;
+} chk_t;
+
+// checks one key.
+// fast select,  tries 5 times to select
+// 
+// return:
+//  2 = failed to select.
+//  1 = wrong key
+//  0 = correct key
+uint8_t chkKey( struct chk_t *c ) {
+	uint8_t i = 0, res = 2;	
+	while( i < 5 ) {
+		// this part is from Piwi's faster nonce collecting part in Hardnested.
+		// assume: fast select
+		if (!iso14443a_fast_select_card(c->uid, c->cl)) {
+			++i;
+			continue;
+		}
+		res = mifare_classic_authex(c->pcs, c->cuid, c->block, c->keyType, c->key, AUTH_FIRST, NULL, NULL);
+
+		CHK_TIMEOUT();
+		
+		// if successfull auth, send HALT
+		// if ( !res ) 
+			// mifare_classic_halt_ex(c->pcs);
+		break;
+	}
+	return res;
+}
+
+uint8_t chkKey_readb(struct chk_t *c, uint8_t *keyb) {	
+	
+	if (!iso14443a_fast_select_card(c->uid, c->cl))
+		return 2;
+	
+	if ( mifare_classic_authex(c->pcs, c->cuid, c->block, 0, c->key, AUTH_FIRST, NULL, NULL) )
+		return 1;
+
+	uint8_t data[16] = {0x00};	
+	uint8_t res = mifare_classic_readblock(c->pcs, c->cuid, c->block, data);
+	
+	// successful read
+	if ( !res ) {
+		// data was something else than zeros.
+		if ( memcmp(data+10, "\x00\x00\x00\x00\x00\x00", 6) != 0) {
+			memcpy(keyb, data+10, 6);
+			res = 0;
+		} else {
+			res = 3;
+		}
+		mifare_classic_halt_ex(c->pcs);
+	}
+	return res;
+}
+
+void chkKey_scanA(struct chk_t *c, struct sector_t *k_sector, uint8_t *found, uint8_t *sectorcnt, uint8_t *foundkeys) { 
+	for (uint8_t s = 0; s < *sectorcnt; s++) { 
+
+		// skip already found A keys 
+		if ( found[(s*2)] ) 
+			continue;
+
+		c->block = FirstBlockOfSector( s );
+		if ( chkKey( c ) == 0 ) { 
+			num_to_bytes(c->key, 6, k_sector[s].keyA);
+			found[(s*2)] = 1; 
+			++*foundkeys; 
+			
+			if (MF_DBGLEVEL >= 3) Dbprintf("ChkKeys_fast: Scan A found (%d)", c->block);
+		}
+	} 
+}
+
+void chkKey_scanB(struct chk_t *c, struct sector_t *k_sector, uint8_t *found, uint8_t *sectorcnt, uint8_t *foundkeys) { 
+	for (uint8_t s = 0; s < *sectorcnt; s++) { 
+
+		// skip already found B keys 
+		if ( found[(s*2)+1] )
+			continue;
+
+		c->block = FirstBlockOfSector( s );
+		if ( chkKey( c ) == 0 ) { 
+			num_to_bytes(c->key, 6, k_sector[s].keyB);	
+			found[(s*2)+1] = 1; 
+			++*foundkeys; 
+			
+			if (MF_DBGLEVEL >= 3) Dbprintf("ChkKeys_fast: Scan B found (%d)", c->block);
+		}
+	} 
+}
+
+// loop all A keys,
+// when A is found but not B,  try to read B.
+void chkKey_loopBonly(struct chk_t *c, struct sector_t *k_sector, uint8_t *found, uint8_t *sectorcnt, uint8_t *foundkeys) {
+
+	// read Block B, if A is found.
+	for (uint8_t s = 0; s < *sectorcnt; ++s) {
+		
+		if ( found[(s*2)] && found[(s*2)+1] )
+			continue;
+		
+		c->block = (FirstBlockOfSector( s ) + NumBlocksPerSector( s ) - 1);
+
+		// A but not B
+		if ( found[(s*2)]  &&  !found[(s*2)+1] ){	
+			c->key = bytes_to_num(k_sector[s].keyA, 6);
+			uint8_t status = chkKey_readb(c, k_sector[s].keyB);
+			if ( status == 0 ){					
+				found[(s*2)+1] = 1;
+				++*foundkeys;
+
+				if (MF_DBGLEVEL >= 3) Dbprintf("ChkKeys_fast: Reading B found (%d)", c->block);		
+
+				// try quick find all B?
+				// assume: keys comes in groups. Find one B, test against all B.
+				c->key = bytes_to_num( k_sector[s].keyB, 6);
+				c->keyType = 1;
+				chkKey_scanB(c, k_sector, found, sectorcnt, foundkeys);
+			}
+		}
+	}
+}
+
+
+
+// get Chunks of keys, to test authentication against card.
+// arg0 = antal sectorer
+// arg0 = first time
+// arg1 = clear trace
+// arg2 = antal nycklar i keychunk
+// datain = keys as array
+void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain) {
+
+	// first call or 
+	uint8_t sectorcnt = arg0 & 0xFF; // 16;
+	uint8_t firstchunk = (arg0 >> 8) & 0xF;	
+	uint8_t lastchunk = (arg0 >> 12) & 0xF;	
+	uint8_t strategy = arg1 & 0xFF;
+	uint8_t use_flashmem = (arg1 >> 8) & 0xFF;
+	uint16_t keyCount = arg2 & 0xFF;
+	uint8_t status = 0;
+
+	struct Crypto1State mpcs = {0, 0};
+	struct Crypto1State *pcs;
+	pcs = &mpcs;
+	struct chk_t chk_data;
+	
+	uint8_t allkeys = sectorcnt << 1;
+
+	static uint32_t cuid = 0;
+	static uint8_t cascade_levels = 0;
+	static uint8_t foundkeys = 0;
+	static sector_t k_sector[80];
+	static uint8_t found[80];
+	static uint8_t *uid;
+
+#ifdef WITH_FLASH	
+	if ( use_flashmem ) {
+		BigBuf_free();
+		uint16_t isok = 0;
+		uint8_t size[2] = {0x00, 0x00};		
+		isok = Flash_ReadData(DEFAULT_MF_KEYS_OFFSET, size, 2);
+		if ( isok != 2 )
+			goto OUT;
+		
+		keyCount = size[1] << 8 | size[0];
+		
+		if ( keyCount == 0 && keyCount == 0xFFFF) 
+			goto OUT;
+			
+		datain = BigBuf_malloc( keyCount * 6);
+		if (datain == NULL )
+			goto OUT;
+
+		isok = Flash_ReadData(DEFAULT_MF_KEYS_OFFSET+2, datain, keyCount * 6);
+		if ( isok != keyCount * 6 )
+			goto OUT;
+		
+	}
+#endif
+		
+	if (uid == NULL || firstchunk) {
+		uid = BigBuf_malloc(10);
+		if (uid == NULL )
+			goto OUT;
+	}
+
+	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+	
+	LEDsoff();
+	LED_A_ON();
+		
+	if ( firstchunk ) {
+		clear_trace();
+		set_tracing(false);
+		
+		memset(k_sector, 0x00, 480+10);
+		memset(found, 0x00, sizeof(found));
+		foundkeys = 0;		
+			
+		iso14a_card_select_t card_info;		
+		if ( !iso14443a_select_card(uid, &card_info, &cuid, true, 0, true)) {
+			if (MF_DBGLEVEL >= 1) Dbprintf("ChkKeys_fast: Can't select card (ALL)");
+			goto OUT;
+		}
+		
+		switch (card_info.uidlen) {
+			case 4 : cascade_levels = 1; break;
+			case 7 : cascade_levels = 2; break;
+			case 10: cascade_levels = 3; break;
+			default: break;
+		}
+		
+		CHK_TIMEOUT();
+	}
+
+	// set check struct.
+	chk_data.uid = uid;
+	chk_data.cuid = cuid;
+	chk_data.cl = cascade_levels;
+	chk_data.pcs = pcs;
+	chk_data.block = 0;	
+	
+	// keychunk loop - depth first one sector.
+	if ( strategy == 1 || use_flashmem) {
+
+		uint8_t newfound = foundkeys;
+
+		uint16_t lastpos = 0;
+		uint16_t s_point = 0;
+		// Sector main loop
+		// keep track of how many sectors on card.
+		for (uint8_t s = 0; s < sectorcnt; ++s) {
+
+			if ( found[(s*2)] && found[(s*2)+1] )
+				continue;
+
+			for (uint16_t i = s_point; i < keyCount; ++i) {
+						
+				//if ( i % 100 == 0) Dbprintf("ChkKeys_fast: sector %d | checking %d | %d found | s_point %d", s, i, foundkeys, s_point);
+			
+				// Allow button press / usb cmd to interrupt device
+				if (BUTTON_PRESS() && !usb_poll_validate_length()) {
+					goto OUT;
+				}
+
+				// found all keys?
+				if ( foundkeys == allkeys )
+					goto OUT;
+
+				WDT_HIT();
+			
+				// assume: block0,1,2 has more read rights in accessbits than the sectortrailer. authenticating against block0 in each sector
+				chk_data.block = FirstBlockOfSector( s );
+
+				// new key
+				chk_data.key = bytes_to_num(datain + i * 6, 6);
+
+				// skip already found A keys 
+				if( !found[(s*2)] ) {
+					chk_data.keyType = 0;
+					status = chkKey( &chk_data);
+					if ( status == 0 ) {
+						memcpy(k_sector[s].keyA, datain + i * 6, 6);
+						found[(s*2)] = 1;
+						++foundkeys;
+						
+						chkKey_scanA(&chk_data, k_sector, found, &sectorcnt, &foundkeys);				
+						
+						// read Block B, if A is found.
+						chkKey_loopBonly( &chk_data, k_sector, found, &sectorcnt, &foundkeys);
+						
+						chk_data.keyType = 1;
+						chkKey_scanB(&chk_data, k_sector, found, &sectorcnt, &foundkeys);
+						
+						chk_data.keyType = 0;						
+						chk_data.block = FirstBlockOfSector( s );
+						
+						if ( use_flashmem ) {
+							if ( lastpos != i && lastpos != 0) {							
+								if ( i - lastpos < 0xF) {
+									s_point = i & 0xFFF0;
+								}
+							} else {
+								lastpos = i;	
+							}
+						}
+					}
+				}
+				
+				// skip already found B keys 
+				if( !found[(s*2)+1] ) {
+					chk_data.keyType = 1;
+					status = chkKey( &chk_data);
+					if ( status == 0 ) {
+						memcpy(k_sector[s].keyB, datain + i * 6, 6);
+						found[(s*2)+1] = 1;
+						++foundkeys;
+						
+						chkKey_scanB(&chk_data, k_sector, found, &sectorcnt, &foundkeys);
+
+						if ( use_flashmem ) {						
+							if ( lastpos != i && lastpos != 0) {
+								
+								if ( i - lastpos < 0xF)
+									s_point = i & 0xFFF0;
+							} else {
+								lastpos = i;	
+							}
+						}
+					}
+				}
+				
+				if ( found[(s*2)] && found[(s*2)+1] )
+					break;
+				
+			} // end keys test loop - depth first 
+
+			// assume1. if no keys found in first sector, get next keychunk from client
+			if ( !use_flashmem && (newfound-foundkeys == 0) )
+				goto OUT;
+
+		} // end loop - sector
+	} // end strategy 1
+	
+	if ( foundkeys == allkeys ) 
+		goto OUT;
+
+	if ( strategy == 2 || use_flashmem ) {
+			
+		// Keychunk loop
+		for (uint16_t i = 0; i < keyCount; i++) {
+					
+			// Allow button press / usb cmd to interrupt device
+			if (BUTTON_PRESS() && !usb_poll_validate_length()) break;
+
+			// found all keys?
+			if ( foundkeys == allkeys )
+				goto OUT;
+				
+			WDT_HIT();
+		
+			// new key
+			chk_data.key = bytes_to_num(datain + i * 6, 6);
+		
+			// Sector main loop
+			// keep track of how many sectors on card.
+			for (uint8_t s = 0; s < sectorcnt; ++s) {
+				
+				if ( found[(s*2)] && found[(s*2)+1] ) continue;
+				
+				// found all keys?
+				if ( foundkeys == allkeys )
+					goto OUT;
+
+				// assume: block0,1,2 has more read rights in accessbits than the sectortrailer. authenticating against block0 in each sector
+				chk_data.block = FirstBlockOfSector( s );
+			
+				// skip already found A keys 
+				if( !found[(s*2)] ) {
+					chk_data.keyType = 0;
+					status = chkKey( &chk_data);
+					if ( status == 0 ) {
+						memcpy(k_sector[s].keyA, datain + i * 6, 6);
+						found[(s*2)] = 1;
+						++foundkeys;
+						
+						chkKey_scanA( &chk_data, k_sector, found, &sectorcnt, &foundkeys);
+						
+						// read Block B, if A is found.
+						chkKey_loopBonly( &chk_data, k_sector, found, &sectorcnt, &foundkeys);
+
+						chk_data.block = FirstBlockOfSector( s );
+					}
+				}
+				
+				// skip already found B keys 
+				if( !found[(s*2)+1] ) {
+					chk_data.keyType = 1;
+					status = chkKey( &chk_data);
+					if ( status == 0 ) {
+						memcpy(k_sector[s].keyB, datain + i * 6, 6);
+						found[(s*2)+1] = 1;
+						++foundkeys;
+						
+						chkKey_scanB(&chk_data, k_sector, found, &sectorcnt, &foundkeys);
+					}
+				}
+			} // end loop sectors		
+		} // end loop keys	
+	} // end loop strategy 2
+OUT:
+	LEDsoff();
+
+	crypto1_destroy(pcs);
+
+	// All keys found, send to client, or last keychunk from client
+	if (foundkeys == allkeys || lastchunk ) {
+
+		uint64_t foo = 0;
+		for (uint8_t m = 0; m < 64; m++) {
+			foo |= ((uint64_t)(found[m] & 1) << m);
+		}
+
+		uint16_t bar = 0;
+		uint8_t j = 0;
+		for (uint8_t m=64; m < sizeof(found); m++) {
+			bar |= ((uint16_t)(found[m] & 1) << j++);
+		}
+	
+		uint8_t *tmp =  BigBuf_malloc(480+10);
+		memcpy(tmp, k_sector, sectorcnt * sizeof(sector_t) );
+		num_to_bytes(foo, 8, tmp+480);		
+		tmp[488] = bar & 0xFF;
+		tmp[489] = bar >> 8 & 0xFF;
+		
+		cmd_send(CMD_ACK, foundkeys, 0, 0, tmp, 480+10);
+
+		set_tracing(false);		
+		FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+		BigBuf_free(); BigBuf_Clear_ext(false);
+	} else {
+		// partial/none keys found
+		cmd_send(CMD_ACK, foundkeys, 0, 0, 0, 0);
+	}
+}
+
+void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) {
+
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+
+	struct Crypto1State mpcs = {0, 0};
+	struct Crypto1State *pcs;
+	pcs = &mpcs;
+
+	uint8_t uid[10] = {0x00};
+
+	uint64_t key = 0;
+	uint32_t cuid = 0;
+	int i, res;
+	uint8_t blockNo = arg0 & 0xFF;
+	uint8_t keyType = (arg0 >> 8) & 0xFF;
+	uint8_t keyCount = arg2;
+	uint8_t cascade_levels = 0;	
+	uint8_t isOK = 0;
+	bool have_uid = false;
+	bool clearTrace = arg1 & 0xFF;
+	
+	LEDsoff();
+	LED_A_ON();
+	
+	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+
+	if (clearTrace) 
+		clear_trace();
+	
+	set_tracing(true);
+	
+	for (i = 0; i < keyCount; i++) {
+
+		// Iceman: use piwi's faster nonce collecting part in hardnested.
+		if (!have_uid) { // need a full select cycle to get the uid first
+			iso14a_card_select_t card_info;		
+			if (!iso14443a_select_card(uid, &card_info, &cuid, true, 0, true)) {
+				if (MF_DBGLEVEL >= 1)	Dbprintf("ChkKeys: Can't select card (ALL)");
+				--i; // try same key once again
+				continue;
+			}
+			switch (card_info.uidlen) {
+				case 4 : cascade_levels = 1; break;
+				case 7 : cascade_levels = 2; break;
+				case 10: cascade_levels = 3; break;
+				default: break;
+			}
+			have_uid = true;	
+		} else { // no need for anticollision. We can directly select the card
+			if (!iso14443a_select_card(uid, NULL, NULL, false, cascade_levels, true)) {
+				if (MF_DBGLEVEL >= 1)	Dbprintf("ChkKeys: Can't select card (UID)");
+				--i; // try same key once again
+				continue;
+			}
+		}
+	
+		key = bytes_to_num(datain + i * 6, 6);
+		res = mifare_classic_auth(pcs, cuid, blockNo, keyType, key, AUTH_FIRST);
+
+		CHK_TIMEOUT();
+
+		if (res)
+			continue;
+
+		isOK = 1;
+		break;
+	}
+	
+	LED_B_ON();
+    cmd_send(CMD_ACK, isOK, 0, 0, datain + i * 6, 6);
+
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+	LEDsoff();
+	
+	set_tracing(false);
+	crypto1_destroy(pcs);
+}
+
+//-----------------------------------------------------------------------------
+// MIFARE commands set debug level
+// 
+//-----------------------------------------------------------------------------
+void MifareSetDbgLvl(uint16_t arg0){
+	MF_DBGLEVEL = arg0;
+	Dbprintf("Debug level: %d", MF_DBGLEVEL);
+}
+
+//-----------------------------------------------------------------------------
+// Work with emulator memory
+// 
+// Note: we call FpgaDownloadAndGo(FPGA_BITSTREAM_HF) here although FPGA is not
+// involved in dealing with emulator memory. But if it is called later, it might
+// destroy the Emulator Memory.
+//-----------------------------------------------------------------------------
+
+void MifareEMemClr(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){
+	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
+	emlClearMem();
+}
+
+void MifareEMemSet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){
+	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
+	if (arg2==0) arg2 = 16; // backwards compat... default bytewidth
+	emlSetMem_xt(datain, arg0, arg1, arg2); // data, block num, blocks count, block byte width
+}
+
+void MifareEMemGet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){
+	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
+	byte_t buf[USB_CMD_DATA_SIZE] = {0x00};
+	emlGetMem(buf, arg0, arg1); // data, block num, blocks count (max 4)
+
+	LED_B_ON();
+	cmd_send(CMD_ACK,arg0,arg1,0,buf,USB_CMD_DATA_SIZE);
+	LED_B_OFF();
+}
+
+//-----------------------------------------------------------------------------
+// Load a card into the emulator memory
+// 
+//-----------------------------------------------------------------------------
+void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){
+	uint8_t numSectors = arg0;
+	uint8_t keyType = arg1;
+	uint64_t ui64Key = 0;
+	uint32_t cuid = 0;
+	struct Crypto1State mpcs = {0, 0};
+	struct Crypto1State *pcs;
+	pcs = &mpcs;
+
+	// variables
+	byte_t dataoutbuf[16] = {0x00};
+	byte_t dataoutbuf2[16] = {0x00};
+	uint8_t uid[10] = {0x00};
+
+	LED_A_ON();
+	LED_B_OFF();
+	LED_C_OFF();
+	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+	
+	clear_trace();
+	set_tracing(true);
+	
+	bool isOK = true;
+
+	if(!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
+		isOK = false;
+		if (MF_DBGLEVEL >= 1)	Dbprintf("Can't select card");
+	}
+		
+	for (uint8_t sectorNo = 0; isOK && sectorNo < numSectors; sectorNo++) {
+		ui64Key = emlGetKey(sectorNo, keyType);
+		if (sectorNo == 0){
+			if(isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_FIRST)) {
+				isOK = false;
+				if (MF_DBGLEVEL >= 1)	Dbprintf("Sector[%2d]. Auth error", sectorNo);
+				break;
+			}
+		} else {
+			if(isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_NESTED)) {
+				isOK = false;
+				if (MF_DBGLEVEL >= 1)	Dbprintf("Sector[%2d]. Auth nested error", sectorNo);
+				break;
+			}
+		}
+		
+		for (uint8_t blockNo = 0; isOK && blockNo < NumBlocksPerSector(sectorNo); blockNo++) {
+			if(isOK && mifare_classic_readblock(pcs, cuid, FirstBlockOfSector(sectorNo) + blockNo, dataoutbuf)) {
+				isOK = false;
+				if (MF_DBGLEVEL >= 1)	Dbprintf("Error reading sector %2d block %2d", sectorNo, blockNo);
+				break;
+			}
+			if (isOK) {
+				if (blockNo < NumBlocksPerSector(sectorNo) - 1) {
+					emlSetMem(dataoutbuf, FirstBlockOfSector(sectorNo) + blockNo, 1);
+				} else {	// sector trailer, keep the keys, set only the AC
+					emlGetMem(dataoutbuf2, FirstBlockOfSector(sectorNo) + blockNo, 1);
+					memcpy(&dataoutbuf2[6], &dataoutbuf[6], 4);
+					emlSetMem(dataoutbuf2,  FirstBlockOfSector(sectorNo) + blockNo, 1);
+				}
+			}
+		}
+
+	}
+
+	if(mifare_classic_halt(pcs, cuid))
+		if (MF_DBGLEVEL >= 1)
+			Dbprintf("Halt error");
+
+	//  ----------------------------- crypto1 destroy
+	crypto1_destroy(pcs);
+
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+	LEDsoff();
+	
+	if (MF_DBGLEVEL >= 2) DbpString("EMUL FILL SECTORS FINISHED");
+
+	set_tracing(false);
+}
+
+
+//-----------------------------------------------------------------------------
+// Work with "magic Chinese" card (email him: ouyangweidaxian@live.cn)
+// 
+// PARAMS - workFlags
+// bit 0 - need get UID
+// bit 1 - need wupC
+// bit 2 - need HALT after sequence
+// bit 3 - need turn on FPGA before sequence
+// bit 4 - need turn off FPGA
+// bit 5 - need to set datain instead of issuing USB reply (called via ARM for StandAloneMode14a)
+// bit 6 - wipe tag.
+//-----------------------------------------------------------------------------
+// magic uid card generation 1 commands
+uint8_t wupC1[] = { MIFARE_MAGICWUPC1 }; 
+uint8_t wupC2[] = { MIFARE_MAGICWUPC2 }; 
+uint8_t wipeC[] = { MIFARE_MAGICWIPEC }; 
+	
+void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){
+  
+	// params
+	uint8_t workFlags = arg0;
+	uint8_t blockNo = arg1;
+
+	// detect 1a/1b
+	bool is1b = false;
+	
+	// variables
+	bool isOK = false; //assume we will get an error
+	uint8_t errormsg = 0x00;
+	uint8_t uid[10] = {0x00};
+	uint8_t data[18] = {0x00};
+	uint32_t cuid = 0;
+	
+	uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};
+	uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0x00};
+
+	if (workFlags & MAGIC_INIT) {
+		LED_A_ON();
+		LED_B_OFF();
+		iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+		clear_trace();
+		set_tracing(true);
+	}
+
+	//loop doesn't loop just breaks out if error
+	while (true) {
+		// read UID and return to client with write
+		if (workFlags & MAGIC_UID) {
+			if(!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
+				if (MF_DBGLEVEL >= MF_DBG_ERROR)	Dbprintf("Can't select card");
+				errormsg = MAGIC_UID;
+			}
+			mifare_classic_halt_ex(NULL);
+			break;
+		}
+	
+		// wipe tag, fill it with zeros
+		if (workFlags & MAGIC_WIPE){
+			ReaderTransmitBitsPar(wupC1, 7, NULL, NULL);
+			if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
+				if (MF_DBGLEVEL >= MF_DBG_ERROR)	Dbprintf("wupC1 error");
+				errormsg = MAGIC_WIPE;
+				break;
+			}
+
+			ReaderTransmit(wipeC, sizeof(wipeC), NULL);
+			if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
+				if (MF_DBGLEVEL >= MF_DBG_ERROR)	Dbprintf("wipeC error");
+				errormsg = MAGIC_WIPE;
+				break;
+			}
+
+			mifare_classic_halt_ex(NULL);
+		}	
+
+		// write block
+		if (workFlags & MAGIC_WUPC) {
+			ReaderTransmitBitsPar(wupC1, 7, NULL, NULL);
+			if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
+				if (MF_DBGLEVEL >= MF_DBG_ERROR)	Dbprintf("wupC1 error");
+				errormsg = MAGIC_WUPC;
+				break;
+			}
+
+			if ( !is1b ) {
+				ReaderTransmit(wupC2, sizeof(wupC2), NULL);
+				if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
+					if (MF_DBGLEVEL >= MF_DBG_ALL) Dbprintf("Assuming Magic Gen 1B tag. [wupC2 failed]");
+					is1b = true;
+					continue;
+				}
+			}
+		}
+
+		if ((mifare_sendcmd_short(NULL, 0, ISO14443A_CMD_WRITEBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL) != 1) || (receivedAnswer[0] != 0x0a)) {
+			if (MF_DBGLEVEL >= MF_DBG_ERROR)	Dbprintf("write block send command error");
+			errormsg = 4;
+			break;
+		}
+	
+		memcpy(data, datain, 16);
+		AddCrc14A(data, 16);
+	
+		ReaderTransmit(data, sizeof(data), NULL);
+		if ((ReaderReceive(receivedAnswer, receivedAnswerPar) != 1) || (receivedAnswer[0] != 0x0a)) {
+			if (MF_DBGLEVEL >= MF_DBG_ERROR)	Dbprintf("write block send data error");
+			errormsg = 0;
+			break;
+		}	
+	
+		if (workFlags & MAGIC_HALT) 
+			mifare_classic_halt_ex(NULL);
+		
+		isOK = true;
+		break;
+
+	} // end while	
+
+	if (isOK )
+		cmd_send(CMD_ACK,1,0,0,uid,sizeof(uid));
+	else
+		OnErrorMagic(errormsg);
+
+	if (workFlags & MAGIC_OFF)
+		OnSuccessMagic();
+}
+
+void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){
+    
+	uint8_t workFlags = arg0;
+	uint8_t blockNo = arg1;
+	uint8_t errormsg = 0x00;
+	bool isOK = false; //assume we will get an error
+	
+	// detect 1a/1b
+	bool is1b = false;
+	
+	// variables
+	uint8_t data[MAX_MIFARE_FRAME_SIZE];
+	uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};
+	uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0x00};
+	
+	memset(data, 0x00, sizeof(data));
+	
+	if (workFlags & MAGIC_INIT) {
+		LED_A_ON();
+		LED_B_OFF();
+		iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);	
+		clear_trace();
+		set_tracing(true);
+	}
+
+	//loop doesn't loop just breaks out if error or done
+	while (true) {
+		if (workFlags & MAGIC_WUPC) {
+			ReaderTransmitBitsPar(wupC1, 7, NULL, NULL);
+			if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
+				if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("wupC1 error");
+				errormsg = MAGIC_WUPC;
+				break;
+			}
+
+			if ( !is1b )  {
+				ReaderTransmit(wupC2, sizeof(wupC2), NULL);
+				if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
+					if (MF_DBGLEVEL >= MF_DBG_ALL) Dbprintf("Assuming Magic Gen 1B tag. [wupC2 failed]");
+					is1b = true;
+					continue;
+				}				
+			}
+		}
+
+		// read block		
+		if ((mifare_sendcmd_short(NULL, 0, ISO14443A_CMD_READBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL) != 18)) {
+			if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("read block send command error");
+			errormsg = 0;
+			break;
+		}
+		
+		memcpy(data, receivedAnswer, sizeof(data));
+		
+		// send HALT
+		if (workFlags & MAGIC_HALT)
+			mifare_classic_halt_ex(NULL);
+
+		isOK = true;
+		break;
+	}
+	// if MAGIC_DATAIN, the data stays on device side.
+	if (workFlags & MAGIC_DATAIN) {
+		if (isOK)
+			memcpy(datain, data, sizeof(data));
+	} else {
+		if (isOK) 
+			cmd_send(CMD_ACK,1,0,0,data,sizeof(data));	
+		else 
+			OnErrorMagic(errormsg);	
+	}
+	
+	if (workFlags & MAGIC_OFF)
+		OnSuccessMagic();
+}
+
+void MifareCIdent(){
+	#define GEN_1A 1
+	#define GEN_1B 2
+	#define GEN_2  4
+	// variables
+	uint8_t isGen = 0;
+	uint8_t rec[1] = {0x00};
+	uint8_t recpar[1] = {0x00};
+
+	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+			
+	// Generation 1 test
+	ReaderTransmitBitsPar(wupC1, 7, NULL, NULL);
+	if(!ReaderReceive(rec, recpar) || (rec[0] != 0x0a)) {
+		goto TEST2;
+	};
+	isGen = GEN_1B;
+	
+	ReaderTransmit(wupC2, sizeof(wupC2), NULL);
+	if(!ReaderReceive(rec, recpar) || (rec[0] != 0x0a)) {
+		goto OUT;
+	};	
+	isGen = GEN_1A;
+	goto OUT;
+
+TEST2:;
+/*
+	// Generation 2 test
+
+	// halt previous.
+	mifare_classic_halt(NULL, 0);
+	
+	//select
+	if (!iso14443a_select_card(NULL, NULL, NULL, true, 0, true)) {
+		goto OUT;
+	};
+	
+	// MIFARE_CLASSIC_WRITEBLOCK 0xA0
+	// ACK 0x0a
+	uint16_t len = mifare_sendcmd_short(null, 1, 0xA0, 0, rec, recpar, NULL);
+	if ((len != 1) || (rec[0] != 0x0A)) {   
+		isGen = GEN_2;	
+	};
+	*/
+OUT:;
+	// removed the if,  since some magic tags misbehavies and send an answer to it.
+	mifare_classic_halt_ex(NULL);
+	cmd_send(CMD_ACK, isGen, 0, 0, 0, 0);
+	// turns off
+	OnSuccessMagic();
+}
+
+void OnSuccessMagic(){
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+	LEDsoff();
+	set_tracing(false);	
+}
+void OnErrorMagic(uint8_t reason){
+	//          ACK, ISOK, reason,0,0,0
+	cmd_send(CMD_ACK,0,reason,0,0,0);
+	OnSuccessMagic();
+}
+
+void MifareSetMod(uint8_t mod, uint8_t *key) {
+	uint64_t ui64Key = bytes_to_num(key, 6);
+
+	// variables
+	uint8_t isOK = 0;
+	uint8_t uid[10] = {0};
+	uint32_t cuid = 0;
+	struct Crypto1State mpcs = {0, 0};
+	struct Crypto1State *pcs = &mpcs;
+	int respLen = 0;
+	uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0};
+	uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0};
+
+	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+
+	clear_trace();
+	set_tracing(true);
+
+	LED_A_ON();
+	LED_B_OFF();
+	LED_C_OFF();
+
+	while (true) {
+		if(!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
+			if (MF_DBGLEVEL >= 1)	Dbprintf("Can't select card");
+			break;
+		}
+
+		if(mifare_classic_auth(pcs, cuid, 0, 0, ui64Key, AUTH_FIRST)) {
+			if (MF_DBGLEVEL >= 1)	Dbprintf("Auth error");
+			break;
+		}
+
+		if (((respLen = mifare_sendcmd_short(pcs, 1, 0x43, mod, receivedAnswer, receivedAnswerPar, NULL)) != 1) || (receivedAnswer[0] != 0x0a)) {
+			if (MF_DBGLEVEL >= 1)	Dbprintf("SetMod error; response[0]: %hhX, len: %d", receivedAnswer[0], respLen);
+			break;
+		}
+
+		if(mifare_classic_halt(pcs, cuid)) {
+			if (MF_DBGLEVEL >= 1)	Dbprintf("Halt error");
+			break;
+		}
+
+		isOK = 1;
+		break;
+	}
+
+	crypto1_destroy(pcs);
+
+	LED_B_ON();
+	cmd_send(CMD_ACK, isOK, 0, 0, 0, 0);
+	LED_B_OFF();
+
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+	LEDsoff();
+}
+
+//
+// DESFIRE
+//
+void Mifare_DES_Auth1(uint8_t arg0, uint8_t *datain){
+	byte_t dataout[12] = {0x00};
+	uint8_t uid[10] = {0x00};
+	uint32_t cuid = 0;
+    
+	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+	clear_trace();
+	set_tracing(true);
+
+	int len = iso14443a_select_card(uid, NULL, &cuid, true, 0, false);
+	if(!len) {
+		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card");
+		OnError(1);
+		return;
+	};
+
+	if(mifare_desfire_des_auth1(cuid, dataout)){
+		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication part1: Fail.");
+		OnError(4);
+		return;
+	}
+
+	if (MF_DBGLEVEL >= MF_DBG_EXTENDED) DbpString("AUTH 1 FINISHED");
+    cmd_send(CMD_ACK, 1, cuid, 0, dataout, sizeof(dataout));
+}
+
+void Mifare_DES_Auth2(uint32_t arg0, uint8_t *datain){
+	uint32_t cuid = arg0;
+	uint8_t key[16] = {0x00};
+	byte_t dataout[12] = {0x00};
+	byte_t isOK = 0;
+    
+	memcpy(key, datain, 16);
+	
+	isOK = mifare_desfire_des_auth2(cuid, key, dataout);
+	
+	if( isOK) {
+	    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Authentication part2: Failed");  
+		OnError(4);
+		return;
+	}
+
+	if (MF_DBGLEVEL >= MF_DBG_EXTENDED) DbpString("AUTH 2 FINISHED");
+
+	cmd_send(CMD_ACK, isOK, 0, 0, dataout, sizeof(dataout));
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+	LEDsoff();
+	set_tracing(false);
 }
\ No newline at end of file
diff --git a/armsrc/mifarecmd.h b/armsrc/mifarecmd.h
index d73b124cb..595d46395 100644
--- a/armsrc/mifarecmd.h
+++ b/armsrc/mifarecmd.h
@@ -1,28 +1,28 @@
-//-----------------------------------------------------------------------------
-// Merlok - June 2011
-// Gerhard de Koning Gans - May 2008
-// Hagen Fritsch - June 2010
-//
-// This code is licensed to you under the terms of the GNU GPL, version 2 or,
-// at your option, any later version. See the LICENSE.txt file for the text of
-// the license.
-//-----------------------------------------------------------------------------
-// Routines to support ISO 14443 type A.
-//-----------------------------------------------------------------------------
-
-#ifndef __MIFARECMD_H
-#define __MIFARECMD_H
-
-#include "proxmark3.h"
-#include "apps.h"
-#include "util.h"
-#include "string.h"
-#include "iso14443crc.h"
-#include "iso14443a.h"
-#include "crapto1/crapto1.h"
-#include "mifareutil.h"
-#include "common.h"
-#include "crc.h"
-#include "protocols.h"
-#include "parity.h"
+//-----------------------------------------------------------------------------
+// Merlok - June 2011
+// Gerhard de Koning Gans - May 2008
+// Hagen Fritsch - June 2010
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// Routines to support ISO 14443 type A.
+//-----------------------------------------------------------------------------
+
+#ifndef __MIFARECMD_H
+#define __MIFARECMD_H
+
+#include "proxmark3.h"
+#include "apps.h"
+#include "util.h"
+#include "string.h"
+#include "iso14443crc.h"
+#include "iso14443a.h"
+#include "crapto1/crapto1.h"
+#include "mifareutil.h"
+#include "common.h"
+#include "crc.h"
+#include "protocols.h"
+#include "parity.h"
 #endif
\ No newline at end of file
diff --git a/armsrc/mifaresniff.c b/armsrc/mifaresniff.c
index 3e6255354..e832c76cf 100644
--- a/armsrc/mifaresniff.c
+++ b/armsrc/mifaresniff.c
@@ -1,324 +1,324 @@
-//-----------------------------------------------------------------------------
-// Merlok - 2012
-//
-// This code is licensed to you under the terms of the GNU GPL, version 2 or,
-// at your option, any later version. See the LICENSE.txt file for the text of
-// the license.
-//-----------------------------------------------------------------------------
-// Routines to support mifare classic sniffer.
-//-----------------------------------------------------------------------------
-
-#include "mifaresniff.h"
-
-//static int sniffState = SNF_INIT;
-static uint8_t sniffUIDType = 0;
-static uint8_t sniffUID[10] = {0,0,0,0,0,0,0,0,0,0};
-static uint8_t sniffATQA[2] = {0,0};
-static uint8_t sniffSAK = 0;
-static uint8_t sniffBuf[17];
-static uint32_t timerData = 0;
-
-//-----------------------------------------------------------------------------
-// MIFARE sniffer. 
-// 
-// if no activity for 2sec, it sends the collected data to the client.
-//-----------------------------------------------------------------------------
-// "hf mf sniff"
-void RAMFUNC SniffMifare(uint8_t param) {
-	// param:
-	// bit 0 - trigger from first card answer
-	// bit 1 - trigger from first reader 7-bit request
-
-	// C(red) A(yellow) B(green)
-	LEDsoff();
-	iso14443a_setup(FPGA_HF_ISO14443A_SNIFFER);
-	
-	// Allocate memory from BigBuf for some buffers
-	// free all previous allocations first
-	BigBuf_free(); BigBuf_Clear_ext(false);
-	clear_trace();
-	set_tracing(true);
-
-	// The command (reader -> tag) that we're receiving.
-	uint8_t receivedCmd[MAX_MIFARE_FRAME_SIZE] = {0x00};	
-	uint8_t receivedCmdPar[MAX_MIFARE_PARITY_SIZE] = {0x00};
-
-	// The response (tag -> reader) that we're receiving.
-	uint8_t receivedResp[MAX_MIFARE_FRAME_SIZE] = {0x00};
-	uint8_t receivedRespPar[MAX_MIFARE_PARITY_SIZE] = {0x00};
-
-	// allocate the DMA buffer, used to stream samples from the FPGA
-	uint8_t *dmaBuf = BigBuf_malloc(DMA_BUFFER_SIZE);
-	uint8_t *data = dmaBuf;
-	uint8_t previous_data = 0;
-	int maxDataLen = 0;
-	int dataLen = 0;
-	bool ReaderIsActive = false;
-	bool TagIsActive = false;
-
-	// We won't start recording the frames that we acquire until we trigger;
-	// a good trigger condition to get started is probably when we see a
-	// response from the tag.
-	// triggered == false -- to wait first for card
-	//bool triggered = !(param & 0x03); 
-	
-	
-	// Set up the demodulator for tag -> reader responses.
-	DemodInit(receivedResp, receivedRespPar);
-
-	// Set up the demodulator for the reader -> tag commands
-	UartInit(receivedCmd, receivedCmdPar);
-
-	// Setup and start DMA.
-	// set transfer address and number of bytes. Start transfer.
-	if ( !FpgaSetupSscDma(dmaBuf, DMA_BUFFER_SIZE) ){
-		if (MF_DBGLEVEL > 1) Dbprintf("[!] FpgaSetupSscDma failed. Exiting"); 
-		return;
-	}
-
-	tUart* uart = GetUart();
-	tDemod* demod = GetDemod();
-	
-	MfSniffInit();
-	
-	uint32_t sniffCounter = 0;
-    // loop and listen
-	while (!BUTTON_PRESS()) {
-		WDT_HIT();
-		LED_A_ON();
-/*
- 		if ((sniffCounter & 0x0000FFFF) == 0) {	// from time to time
-			// check if a transaction is completed (timeout after 2000ms).
-			// if yes, stop the DMA transfer and send what we have so far to the client
-			if (BigBuf_get_traceLen()) {
-				MfSniffSend();
-				// Reset everything - we missed some sniffed data anyway while the DMA was stopped
-				sniffCounter = 0;				
-				dmaBuf = BigBuf_malloc(DMA_BUFFER_SIZE);
-				data = dmaBuf;
-				maxDataLen = 0;
-				ReaderIsActive = false;
-				TagIsActive = false;
-				FpgaSetupSscDma((uint8_t *)dmaBuf, DMA_BUFFER_SIZE); // set transfer address and number of bytes. Start transfer.
-			}
-		}
-		*/
-		
-		// number of bytes we have processed so far		
-		int register readBufDataP = data - dmaBuf;	
-		// number of bytes already transferred		
-		int register dmaBufDataP = DMA_BUFFER_SIZE - AT91C_BASE_PDC_SSC->PDC_RCR;
-		if (readBufDataP <= dmaBufDataP)			// we are processing the same block of data which is currently being transferred
-			dataLen = dmaBufDataP - readBufDataP;	// number of bytes still to be processed
-		else
-			dataLen = DMA_BUFFER_SIZE - readBufDataP + dmaBufDataP; // number of bytes still to be processed
-
-		// test for length of buffer
-		if (dataLen > maxDataLen) {					// we are more behind than ever...
-			maxDataLen = dataLen;					
-			if (dataLen > (9 * DMA_BUFFER_SIZE / 10)) {
-				Dbprintf("[!] blew circular buffer! | datalen %u", dataLen);		
-				break;
-			}
-		}
-		if (dataLen < 1) continue;
-
-		// primary buffer was stopped ( <-- we lost data!
-		if (!AT91C_BASE_PDC_SSC->PDC_RCR) {
-			AT91C_BASE_PDC_SSC->PDC_RPR = (uint32_t)dmaBuf;
-			AT91C_BASE_PDC_SSC->PDC_RCR = DMA_BUFFER_SIZE;
-			Dbprintf("[-] RxEmpty ERROR | data length %d", dataLen); // temporary
-		}
-		// secondary buffer sets as primary, secondary buffer was stopped
-		if (!AT91C_BASE_PDC_SSC->PDC_RNCR) {
-			AT91C_BASE_PDC_SSC->PDC_RNPR = (uint32_t)dmaBuf;
-			AT91C_BASE_PDC_SSC->PDC_RNCR = DMA_BUFFER_SIZE;
-		}
-
-		LED_A_OFF();
-
-		// Need two samples to feed Miller and Manchester-Decoder
-		if (sniffCounter & 0x01) {
-
-			// no need to try decoding tag data if the reader is sending
-			if (!TagIsActive) {		
-				uint8_t readerbyte = (previous_data & 0xF0) | (*data >> 4);
-				if (MillerDecoding(readerbyte, (sniffCounter-1)*4)) {
-					LogTrace(receivedCmd, uart->len, 0, 0, NULL, true);
-					DemodReset();
-					UartReset();
-				}
-				ReaderIsActive = (uart->state != STATE_UNSYNCD);
-			}
-			
-			// no need to try decoding tag data if the reader is sending
-			if (!ReaderIsActive) {		
-				uint8_t tagbyte = (previous_data << 4) | (*data & 0x0F);
-				if (ManchesterDecoding(tagbyte, 0, (sniffCounter-1)*4)) {
-					LogTrace(receivedResp,  demod->len, 0, 0, NULL, false);
-					DemodReset();
-					UartReset();
-				}
-				TagIsActive = (demod->state != DEMOD_UNSYNCD);
-			}
-		}
-		previous_data = *data;
-		sniffCounter++;
-		data++;
-
-		if (data == dmaBuf + DMA_BUFFER_SIZE)
-			data = dmaBuf;
-
-	} // main cycle
-	
-	MfSniffEnd();
-	switch_off(); 
-}
-
-void MfSniffInit(void){
-	memset(sniffUID, 0x00, sizeof(sniffUID));
-	memset(sniffATQA, 0x00, sizeof(sniffATQA));
-	memset(sniffBuf, 0x00, sizeof(sniffBuf));
-	sniffSAK = 0;
-	sniffUIDType = SNF_UID_4;
-	timerData = 0;
-}
-
-void MfSniffEnd(void){
-	LED_B_ON();
-	cmd_send(CMD_ACK,0,0,0,0,0);
-	LED_B_OFF();
-}
-
-/*
-bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint8_t *parity, uint16_t bitCnt, bool reader) {
-
-	// reset on 7-Bit commands from reader
-	if (reader && (len == 1) && (bitCnt == 7)) { 		
-		sniffState = SNF_INIT;
-	}
-
-	
-	
-	switch (sniffState) {
-		case SNF_INIT:{
-			// REQA,WUPA or MAGICWUP from reader			
-			if ((len == 1) && (reader) && (bitCnt == 7) ) {
-				MfSniffInit();
-				sniffState = (data[0] == MIFARE_MAGICWUPC1) ? SNF_MAGIC_WUPC2 : SNF_ATQA;
-			}
-			break;
-		}
-		case SNF_MAGIC_WUPC2: {
-			if ((len == 1) && (reader) && (data[0] == MIFARE_MAGICWUPC2) ) {  
-				sniffState = SNF_CARD_IDLE;
-			}
-			break;
-		}
-		case SNF_ATQA:{
-			// ATQA from tag
-			if ((!reader) && (len == 2)) {
-				sniffATQA[0] = data[0];
-				sniffATQA[1] = data[1];
-				sniffState = SNF_UID;
-			}
-			break;
-		}
-		case SNF_UID: {
-			
-			if ( !reader ) break;
-			if ( len != 9 ) break;
-			if ( !CheckCrc14443(CRC_14443_A, data, 9)) break;
-			if ( data[1] != 0x70 ) break;
-			
-			Dbprintf("[!] UID | %x", data[0]);
-			
-			if ((data[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT)) {
-				// UID_4 - select 4 Byte UID from reader
-				memcpy(sniffUID, data+2, 4);
-				sniffUIDType = SNF_UID_4;
-				sniffState = SNF_SAK;
-			} else if ((data[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2)) {
-				// UID_7 - Select 2nd part of 7 Byte UID
-
-				// get rid of 0x88
-				sniffUID[0] = sniffUID[1];
-				sniffUID[1] = sniffUID[2];
-				sniffUID[2] = sniffUID[3];
-				//new uid bytes
-				memcpy(sniffUID+3, data+2, 4);
-				sniffUIDType = SNF_UID_7;
-				sniffState = SNF_SAK;				
-			} else if ((data[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_3)) {
-				// UID_10 - Select 3nd part of 10 Byte UID
-				// 3+3+4 = 10.
-				// get ride of previous 0x88
-				sniffUID[3] = sniffUID[4];
-				sniffUID[4] = sniffUID[5];
-				sniffUID[5] = sniffUID[6];
-				// new uid bytes
-				memcpy(sniffUID+6, data+2, 4);
-				sniffUIDType = SNF_UID_10;
-				sniffState = SNF_SAK;
-			}
-			break;
-		}
-		case SNF_SAK:{
-			// SAK from card?
-			if ((!reader) && (len == 3) && (CheckCrc14443(CRC_14443_A, data, 3))) {
-				sniffSAK = data[0];
-				// CL2 UID part to be expected
-				if (( sniffSAK == 0x04) && (sniffUIDType == SNF_UID_4)) {
-					sniffState = SNF_UID;
-				// CL3 UID part to be expected
-				} else if ((sniffSAK == 0x04) && (sniffUIDType == SNF_UID_7)) {
-					sniffState = SNF_UID;
-				} else {
-					// select completed
-					sniffState = SNF_CARD_IDLE;
-				}
-			}
-			break;
-		}		
-		case SNF_CARD_IDLE:{	// trace the card select sequence
-			sniffBuf[0] = 0xFF;
-			sniffBuf[1] = 0xFF;
-			memcpy(sniffBuf + 2, sniffUID, sizeof(sniffUID));
-			memcpy(sniffBuf + 12, sniffATQA, sizeof(sniffATQA));
-			sniffBuf[14] = sniffSAK;
-			sniffBuf[15] = 0xFF;
-			sniffBuf[16] = 0xFF;
-			LogTrace(sniffBuf, sizeof(sniffBuf), 0, 0, NULL, true);
-			sniffState = SNF_CARD_CMD;
-		}	// intentionally no break;
-		case SNF_CARD_CMD:{	
-			LogTrace(data, len, 0, 0, NULL, reader);	
-			timerData = GetTickCount();
-			break;
-		}	
-		default:
-			sniffState = SNF_INIT;
-		break;
-	}
-	return false;
-}
-*/
-
-void RAMFUNC MfSniffSend() {
-	uint16_t tracelen = BigBuf_get_traceLen();
-	uint16_t chunksize = 0;
-	int packlen = tracelen;	// total number of bytes to send
-	uint8_t *data = BigBuf_get_addr();	
-	
-	while (packlen > 0) {
-		LED_B_ON();
-		chunksize = MIN(USB_CMD_DATA_SIZE, packlen); // chunk size 512
-		cmd_send(CMD_ACK, 1, tracelen, chunksize, data + tracelen - packlen, chunksize);		
-		packlen -= chunksize;
-		LED_B_OFF();
-	}
-
-	LED_B_ON();
-	cmd_send(CMD_ACK, 2, 0, 0, 0, 0);  // 2 == data transfer finished.
-	LED_B_OFF();
+//-----------------------------------------------------------------------------
+// Merlok - 2012
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// Routines to support mifare classic sniffer.
+//-----------------------------------------------------------------------------
+
+#include "mifaresniff.h"
+
+//static int sniffState = SNF_INIT;
+static uint8_t sniffUIDType = 0;
+static uint8_t sniffUID[10] = {0,0,0,0,0,0,0,0,0,0};
+static uint8_t sniffATQA[2] = {0,0};
+static uint8_t sniffSAK = 0;
+static uint8_t sniffBuf[17];
+static uint32_t timerData = 0;
+
+//-----------------------------------------------------------------------------
+// MIFARE sniffer. 
+// 
+// if no activity for 2sec, it sends the collected data to the client.
+//-----------------------------------------------------------------------------
+// "hf mf sniff"
+void RAMFUNC SniffMifare(uint8_t param) {
+	// param:
+	// bit 0 - trigger from first card answer
+	// bit 1 - trigger from first reader 7-bit request
+
+	// C(red) A(yellow) B(green)
+	LEDsoff();
+	iso14443a_setup(FPGA_HF_ISO14443A_SNIFFER);
+	
+	// Allocate memory from BigBuf for some buffers
+	// free all previous allocations first
+	BigBuf_free(); BigBuf_Clear_ext(false);
+	clear_trace();
+	set_tracing(true);
+
+	// The command (reader -> tag) that we're receiving.
+	uint8_t receivedCmd[MAX_MIFARE_FRAME_SIZE] = {0x00};	
+	uint8_t receivedCmdPar[MAX_MIFARE_PARITY_SIZE] = {0x00};
+
+	// The response (tag -> reader) that we're receiving.
+	uint8_t receivedResp[MAX_MIFARE_FRAME_SIZE] = {0x00};
+	uint8_t receivedRespPar[MAX_MIFARE_PARITY_SIZE] = {0x00};
+
+	// allocate the DMA buffer, used to stream samples from the FPGA
+	uint8_t *dmaBuf = BigBuf_malloc(DMA_BUFFER_SIZE);
+	uint8_t *data = dmaBuf;
+	uint8_t previous_data = 0;
+	int maxDataLen = 0;
+	int dataLen = 0;
+	bool ReaderIsActive = false;
+	bool TagIsActive = false;
+
+	// We won't start recording the frames that we acquire until we trigger;
+	// a good trigger condition to get started is probably when we see a
+	// response from the tag.
+	// triggered == false -- to wait first for card
+	//bool triggered = !(param & 0x03); 
+	
+	
+	// Set up the demodulator for tag -> reader responses.
+	DemodInit(receivedResp, receivedRespPar);
+
+	// Set up the demodulator for the reader -> tag commands
+	UartInit(receivedCmd, receivedCmdPar);
+
+	// Setup and start DMA.
+	// set transfer address and number of bytes. Start transfer.
+	if ( !FpgaSetupSscDma(dmaBuf, DMA_BUFFER_SIZE) ){
+		if (MF_DBGLEVEL > 1) Dbprintf("[!] FpgaSetupSscDma failed. Exiting"); 
+		return;
+	}
+
+	tUart* uart = GetUart();
+	tDemod* demod = GetDemod();
+	
+	MfSniffInit();
+	
+	uint32_t sniffCounter = 0;
+    // loop and listen
+	while (!BUTTON_PRESS()) {
+		WDT_HIT();
+		LED_A_ON();
+/*
+ 		if ((sniffCounter & 0x0000FFFF) == 0) {	// from time to time
+			// check if a transaction is completed (timeout after 2000ms).
+			// if yes, stop the DMA transfer and send what we have so far to the client
+			if (BigBuf_get_traceLen()) {
+				MfSniffSend();
+				// Reset everything - we missed some sniffed data anyway while the DMA was stopped
+				sniffCounter = 0;				
+				dmaBuf = BigBuf_malloc(DMA_BUFFER_SIZE);
+				data = dmaBuf;
+				maxDataLen = 0;
+				ReaderIsActive = false;
+				TagIsActive = false;
+				FpgaSetupSscDma((uint8_t *)dmaBuf, DMA_BUFFER_SIZE); // set transfer address and number of bytes. Start transfer.
+			}
+		}
+		*/
+		
+		// number of bytes we have processed so far		
+		int register readBufDataP = data - dmaBuf;	
+		// number of bytes already transferred		
+		int register dmaBufDataP = DMA_BUFFER_SIZE - AT91C_BASE_PDC_SSC->PDC_RCR;
+		if (readBufDataP <= dmaBufDataP)			// we are processing the same block of data which is currently being transferred
+			dataLen = dmaBufDataP - readBufDataP;	// number of bytes still to be processed
+		else
+			dataLen = DMA_BUFFER_SIZE - readBufDataP + dmaBufDataP; // number of bytes still to be processed
+
+		// test for length of buffer
+		if (dataLen > maxDataLen) {					// we are more behind than ever...
+			maxDataLen = dataLen;					
+			if (dataLen > (9 * DMA_BUFFER_SIZE / 10)) {
+				Dbprintf("[!] blew circular buffer! | datalen %u", dataLen);		
+				break;
+			}
+		}
+		if (dataLen < 1) continue;
+
+		// primary buffer was stopped ( <-- we lost data!
+		if (!AT91C_BASE_PDC_SSC->PDC_RCR) {
+			AT91C_BASE_PDC_SSC->PDC_RPR = (uint32_t)dmaBuf;
+			AT91C_BASE_PDC_SSC->PDC_RCR = DMA_BUFFER_SIZE;
+			Dbprintf("[-] RxEmpty ERROR | data length %d", dataLen); // temporary
+		}
+		// secondary buffer sets as primary, secondary buffer was stopped
+		if (!AT91C_BASE_PDC_SSC->PDC_RNCR) {
+			AT91C_BASE_PDC_SSC->PDC_RNPR = (uint32_t)dmaBuf;
+			AT91C_BASE_PDC_SSC->PDC_RNCR = DMA_BUFFER_SIZE;
+		}
+
+		LED_A_OFF();
+
+		// Need two samples to feed Miller and Manchester-Decoder
+		if (sniffCounter & 0x01) {
+
+			// no need to try decoding tag data if the reader is sending
+			if (!TagIsActive) {		
+				uint8_t readerbyte = (previous_data & 0xF0) | (*data >> 4);
+				if (MillerDecoding(readerbyte, (sniffCounter-1)*4)) {
+					LogTrace(receivedCmd, uart->len, 0, 0, NULL, true);
+					DemodReset();
+					UartReset();
+				}
+				ReaderIsActive = (uart->state != STATE_UNSYNCD);
+			}
+			
+			// no need to try decoding tag data if the reader is sending
+			if (!ReaderIsActive) {		
+				uint8_t tagbyte = (previous_data << 4) | (*data & 0x0F);
+				if (ManchesterDecoding(tagbyte, 0, (sniffCounter-1)*4)) {
+					LogTrace(receivedResp,  demod->len, 0, 0, NULL, false);
+					DemodReset();
+					UartReset();
+				}
+				TagIsActive = (demod->state != DEMOD_UNSYNCD);
+			}
+		}
+		previous_data = *data;
+		sniffCounter++;
+		data++;
+
+		if (data == dmaBuf + DMA_BUFFER_SIZE)
+			data = dmaBuf;
+
+	} // main cycle
+	
+	MfSniffEnd();
+	switch_off(); 
+}
+
+void MfSniffInit(void){
+	memset(sniffUID, 0x00, sizeof(sniffUID));
+	memset(sniffATQA, 0x00, sizeof(sniffATQA));
+	memset(sniffBuf, 0x00, sizeof(sniffBuf));
+	sniffSAK = 0;
+	sniffUIDType = SNF_UID_4;
+	timerData = 0;
+}
+
+void MfSniffEnd(void){
+	LED_B_ON();
+	cmd_send(CMD_ACK,0,0,0,0,0);
+	LED_B_OFF();
+}
+
+/*
+bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint8_t *parity, uint16_t bitCnt, bool reader) {
+
+	// reset on 7-Bit commands from reader
+	if (reader && (len == 1) && (bitCnt == 7)) { 		
+		sniffState = SNF_INIT;
+	}
+
+	
+	
+	switch (sniffState) {
+		case SNF_INIT:{
+			// REQA,WUPA or MAGICWUP from reader			
+			if ((len == 1) && (reader) && (bitCnt == 7) ) {
+				MfSniffInit();
+				sniffState = (data[0] == MIFARE_MAGICWUPC1) ? SNF_MAGIC_WUPC2 : SNF_ATQA;
+			}
+			break;
+		}
+		case SNF_MAGIC_WUPC2: {
+			if ((len == 1) && (reader) && (data[0] == MIFARE_MAGICWUPC2) ) {  
+				sniffState = SNF_CARD_IDLE;
+			}
+			break;
+		}
+		case SNF_ATQA:{
+			// ATQA from tag
+			if ((!reader) && (len == 2)) {
+				sniffATQA[0] = data[0];
+				sniffATQA[1] = data[1];
+				sniffState = SNF_UID;
+			}
+			break;
+		}
+		case SNF_UID: {
+			
+			if ( !reader ) break;
+			if ( len != 9 ) break;
+			if ( !CheckCrc14443(CRC_14443_A, data, 9)) break;
+			if ( data[1] != 0x70 ) break;
+			
+			Dbprintf("[!] UID | %x", data[0]);
+			
+			if ((data[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT)) {
+				// UID_4 - select 4 Byte UID from reader
+				memcpy(sniffUID, data+2, 4);
+				sniffUIDType = SNF_UID_4;
+				sniffState = SNF_SAK;
+			} else if ((data[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2)) {
+				// UID_7 - Select 2nd part of 7 Byte UID
+
+				// get rid of 0x88
+				sniffUID[0] = sniffUID[1];
+				sniffUID[1] = sniffUID[2];
+				sniffUID[2] = sniffUID[3];
+				//new uid bytes
+				memcpy(sniffUID+3, data+2, 4);
+				sniffUIDType = SNF_UID_7;
+				sniffState = SNF_SAK;				
+			} else if ((data[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_3)) {
+				// UID_10 - Select 3nd part of 10 Byte UID
+				// 3+3+4 = 10.
+				// get ride of previous 0x88
+				sniffUID[3] = sniffUID[4];
+				sniffUID[4] = sniffUID[5];
+				sniffUID[5] = sniffUID[6];
+				// new uid bytes
+				memcpy(sniffUID+6, data+2, 4);
+				sniffUIDType = SNF_UID_10;
+				sniffState = SNF_SAK;
+			}
+			break;
+		}
+		case SNF_SAK:{
+			// SAK from card?
+			if ((!reader) && (len == 3) && (CheckCrc14443(CRC_14443_A, data, 3))) {
+				sniffSAK = data[0];
+				// CL2 UID part to be expected
+				if (( sniffSAK == 0x04) && (sniffUIDType == SNF_UID_4)) {
+					sniffState = SNF_UID;
+				// CL3 UID part to be expected
+				} else if ((sniffSAK == 0x04) && (sniffUIDType == SNF_UID_7)) {
+					sniffState = SNF_UID;
+				} else {
+					// select completed
+					sniffState = SNF_CARD_IDLE;
+				}
+			}
+			break;
+		}		
+		case SNF_CARD_IDLE:{	// trace the card select sequence
+			sniffBuf[0] = 0xFF;
+			sniffBuf[1] = 0xFF;
+			memcpy(sniffBuf + 2, sniffUID, sizeof(sniffUID));
+			memcpy(sniffBuf + 12, sniffATQA, sizeof(sniffATQA));
+			sniffBuf[14] = sniffSAK;
+			sniffBuf[15] = 0xFF;
+			sniffBuf[16] = 0xFF;
+			LogTrace(sniffBuf, sizeof(sniffBuf), 0, 0, NULL, true);
+			sniffState = SNF_CARD_CMD;
+		}	// intentionally no break;
+		case SNF_CARD_CMD:{	
+			LogTrace(data, len, 0, 0, NULL, reader);	
+			timerData = GetTickCount();
+			break;
+		}	
+		default:
+			sniffState = SNF_INIT;
+		break;
+	}
+	return false;
+}
+*/
+
+void RAMFUNC MfSniffSend() {
+	uint16_t tracelen = BigBuf_get_traceLen();
+	uint16_t chunksize = 0;
+	int packlen = tracelen;	// total number of bytes to send
+	uint8_t *data = BigBuf_get_addr();	
+	
+	while (packlen > 0) {
+		LED_B_ON();
+		chunksize = MIN(USB_CMD_DATA_SIZE, packlen); // chunk size 512
+		cmd_send(CMD_ACK, 1, tracelen, chunksize, data + tracelen - packlen, chunksize);		
+		packlen -= chunksize;
+		LED_B_OFF();
+	}
+
+	LED_B_ON();
+	cmd_send(CMD_ACK, 2, 0, 0, 0, 0);  // 2 == data transfer finished.
+	LED_B_OFF();
 }
\ No newline at end of file
diff --git a/armsrc/mifaresniff.h b/armsrc/mifaresniff.h
index 537fa2941..efd34fdeb 100644
--- a/armsrc/mifaresniff.h
+++ b/armsrc/mifaresniff.h
@@ -1,42 +1,42 @@
-//-----------------------------------------------------------------------------
-// Merlok - June 2012
-//
-// This code is licensed to you under the terms of the GNU GPL, version 2 or,
-// at your option, any later version. See the LICENSE.txt file for the text of
-// the license.
-//-----------------------------------------------------------------------------
-// Routines to support mifare classic sniffer.
-//-----------------------------------------------------------------------------
-
-#ifndef __MIFARESNIFF_H
-#define __MIFARESNIFF_H
-
-#include "proxmark3.h"
-#include "apps.h"
-#include "util.h"
-#include "string.h"
-#include "iso14443crc.h"
-#include "iso14443a.h"
-#include "crapto1/crapto1.h"
-#include "mifareutil.h"
-#include "common.h"
-
-#define SNF_INIT			0
-#define SNF_NO_FIELD		1
-#define SNF_ATQA			2
-#define SNF_UID				3
-#define SNF_SAK				4
-#define SNF_CARD_IDLE		5
-#define SNF_CARD_CMD		6
-#define SNF_MAGIC_WUPC2		7
-
-#define SNF_UID_4			0
-#define SNF_UID_7			0
-#define SNF_UID_10			0
-
-void MfSniffInit(void);
-bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint8_t *parity, uint16_t bitCnt, bool reader);
-void RAMFUNC MfSniffSend(void);
-void MfSniffEnd(void);
-
+//-----------------------------------------------------------------------------
+// Merlok - June 2012
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// Routines to support mifare classic sniffer.
+//-----------------------------------------------------------------------------
+
+#ifndef __MIFARESNIFF_H
+#define __MIFARESNIFF_H
+
+#include "proxmark3.h"
+#include "apps.h"
+#include "util.h"
+#include "string.h"
+#include "iso14443crc.h"
+#include "iso14443a.h"
+#include "crapto1/crapto1.h"
+#include "mifareutil.h"
+#include "common.h"
+
+#define SNF_INIT			0
+#define SNF_NO_FIELD		1
+#define SNF_ATQA			2
+#define SNF_UID				3
+#define SNF_SAK				4
+#define SNF_CARD_IDLE		5
+#define SNF_CARD_CMD		6
+#define SNF_MAGIC_WUPC2		7
+
+#define SNF_UID_4			0
+#define SNF_UID_7			0
+#define SNF_UID_10			0
+
+void MfSniffInit(void);
+bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint8_t *parity, uint16_t bitCnt, bool reader);
+void RAMFUNC MfSniffSend(void);
+void MfSniffEnd(void);
+
 #endif
\ No newline at end of file
diff --git a/armsrc/mifareutil.c b/armsrc/mifareutil.c
index 179b9c51e..df85f6cbd 100644
--- a/armsrc/mifareutil.c
+++ b/armsrc/mifareutil.c
@@ -1,689 +1,689 @@
-//-----------------------------------------------------------------------------
-// Merlok, May 2011, 2012
-// Many authors, whom made it possible
-//
-// This code is licensed to you under the terms of the GNU GPL, version 2 or,
-// at your option, any later version. See the LICENSE.txt file for the text of
-// the license.
-//-----------------------------------------------------------------------------
-// Work with mifare cards.
-//-----------------------------------------------------------------------------
-#include "mifareutil.h"
-
-int MF_DBGLEVEL = MF_DBG_ERROR;
-
-// crypto1 helpers
-void mf_crypto1_decryptEx(struct Crypto1State *pcs, uint8_t *data_in, int len, uint8_t *data_out){
-	uint8_t	bt = 0;
-	int i;
-	
-	if (len != 1) {
-		for (i = 0; i < len; i++)
-			data_out[i] = crypto1_byte(pcs, 0x00, 0) ^ data_in[i];
-	} else {
-		bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data_in[0], 0)) << 0;
-		bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data_in[0], 1)) << 1;
-		bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data_in[0], 2)) << 2;
-		bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data_in[0], 3)) << 3;
-		data_out[0] = bt;
-	}
-	return;
-}
-
-void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len){
-	mf_crypto1_decryptEx(pcs, data, len, data);
-}
-
-void mf_crypto1_encrypt(struct Crypto1State *pcs, uint8_t *data, uint16_t len, uint8_t *par) {
-	uint8_t bt = 0;
-	int i;
-	par[0] = 0;
-	
-	for (i = 0; i < len; i++) {
-		bt = data[i];
-		data[i] = crypto1_byte(pcs, 0x00, 0) ^ data[i];
-		if ( ( i & 0x0007 ) == 0) 
-			par[ i >> 3 ] = 0;
-		par[ i >> 3 ] |= (((filter(pcs->odd) ^ oddparity8(bt)) & 0x01)<<(7-(i&0x0007)));
-	}	
-}
-
-uint8_t mf_crypto1_encrypt4bit(struct Crypto1State *pcs, uint8_t data) {
-	uint8_t bt = 0;
-	bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data, 0)) << 0;
-	bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data, 1)) << 1;
-	bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data, 2)) << 2;
-	bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data, 3)) << 3;
-	return bt;
-}
-
-// send X byte basic commands
-int mifare_sendcmd(uint8_t cmd, uint8_t* data, uint8_t data_size, uint8_t* answer, uint8_t *answer_parity, uint32_t *timing) {
-	uint8_t dcmd[data_size+3];
-    dcmd[0] = cmd;
-	memcpy(dcmd+1, data, data_size);
-	AddCrc14A(dcmd, data_size+1);
-	ReaderTransmit(dcmd, sizeof(dcmd), timing);
-	int len = ReaderReceive(answer, answer_parity);
-	if(!len) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("%02X Cmd failed. Card timeout.", cmd);
-		len = ReaderReceive(answer,answer_parity);
-    }
-	return len;
-}
-
-// send 2 byte commands
-int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t data, uint8_t *answer, uint8_t *answer_parity, uint32_t *timing) {
-	uint16_t pos, res;
-	uint8_t dcmd[4] = {cmd, data, 0x00, 0x00};
-	uint8_t	ecmd[4] = {0x00, 0x00, 0x00, 0x00};
-	uint8_t par[1] = {0x00};			// 1 Byte parity is enough here
-	AddCrc14A(dcmd, 2);
-	memcpy(ecmd, dcmd, sizeof(dcmd));
-	
-	if (crypted) {
-		par[0] = 0;
-		for (pos = 0; pos < 4; pos++) {
-			ecmd[pos] = crypto1_byte(pcs, 0x00, 0) ^ dcmd[pos];
-			par[0] |= (((filter(pcs->odd) ^ oddparity8(dcmd[pos])) & 0x01) << (7-pos));
-		}	
-		ReaderTransmitPar(ecmd, sizeof(ecmd), par, timing);
-	} else {
-		ReaderTransmit(dcmd, sizeof(dcmd), timing);
-	}
-
-	int len = ReaderReceive(answer, par);
-	
-	if (answer_parity) *answer_parity = par[0];
-	
-	if (crypted == CRYPT_ALL) {
-		if (len == 1) {
-			res = 0;
-			res |= (crypto1_bit(pcs, 0, 0) ^ BIT(answer[0], 0)) << 0;
-			res |= (crypto1_bit(pcs, 0, 0) ^ BIT(answer[0], 1)) << 1;
-			res |= (crypto1_bit(pcs, 0, 0) ^ BIT(answer[0], 2)) << 2;
-			res |= (crypto1_bit(pcs, 0, 0) ^ BIT(answer[0], 3)) << 3;
-			answer[0] = res;			
-		} else {
-			for (pos = 0; pos < len; pos++)
-				answer[pos] = crypto1_byte(pcs, 0x00, 0) ^ answer[pos];
-		}
-	}
-	return len;
-}
-
-// mifare classic commands
-int mifare_classic_auth(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint8_t isNested) {
-	return mifare_classic_authex(pcs, uid, blockNo, keyType, ui64Key, isNested, NULL, NULL);
-}
-
-int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint8_t isNested, uint32_t *ntptr, uint32_t *timing) {
-	int len;	
-	uint32_t pos, nt, ntpp; // Supplied tag nonce
-	uint8_t par[1] = {0x00};
-	uint8_t nr[4];
-	uint8_t mf_nr_ar[] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 };
-	uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};
-	uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0x00};
-
-	// "random" reader nonce:
-	num_to_bytes( prng_successor( GetTickCount(), 32), 4, nr);
-	
-	// Transmit MIFARE_CLASSIC_AUTH
-	len = mifare_sendcmd_short(pcs, isNested, 0x60 + (keyType & 0x01), blockNo, receivedAnswer, receivedAnswerPar, timing);
-	if (len != 4) return 1;
-	
-	// Save the tag nonce (nt)
-	nt = bytes_to_num(receivedAnswer, 4);
-
-	//  ----------------------------- crypto1 create
-	if (isNested)
-		crypto1_destroy(pcs);
-
-	// Init cipher with key
-	crypto1_create(pcs, ui64Key);
-
-	if (isNested == AUTH_NESTED) {
-		// decrypt nt with help of new key 
-		nt = crypto1_word(pcs, nt ^ uid, 1) ^ nt;
-	} else {
-		// Load (plain) uid^nt into the cipher
-		crypto1_word(pcs, nt ^ uid, 0);
-	}
-
-	// some statistic
-	if (!ntptr && (MF_DBGLEVEL >= MF_DBG_EXTENDED))
-		Dbprintf("auth uid: %08x | nr: %08x | nt: %08x", uid, nr, nt);
-	
-	// save Nt
-	if (ntptr)
-		*ntptr = nt;
-
-	// Generate (encrypted) nr+parity by loading it into the cipher (Nr)
-	par[0] = 0;
-	for (pos = 0; pos < 4; pos++) {
-		mf_nr_ar[pos] = crypto1_byte(pcs, nr[pos], 0) ^ nr[pos];
-		par[0] |= (((filter(pcs->odd) ^ oddparity8(nr[pos])) & 0x01) << (7-pos));
-	}	
-		
-	// Skip 32 bits in pseudo random generator
-	nt = prng_successor(nt, 32);
-
-	//  ar+parity
-	for (pos = 4; pos < 8; pos++) {
-		nt = prng_successor(nt,8);
-		mf_nr_ar[pos] = crypto1_byte(pcs,0x00,0) ^ (nt & 0xff);
-		par[0] |= (((filter(pcs->odd) ^ oddparity8(nt & 0xff)) & 0x01) << (7-pos));
-	}	
-		
-	// Transmit reader nonce and reader answer
-	ReaderTransmitPar(mf_nr_ar, sizeof(mf_nr_ar), par, NULL);
-
-	// Receive 4 byte tag answer
-	len = ReaderReceive(receivedAnswer, receivedAnswerPar);
-	if (!len) {
-		if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Authentication failed. Card timeout.");
-		return 2;
-	}
-
-	ntpp = prng_successor(nt, 32) ^ crypto1_word(pcs, 0,0);
-
-	if (ntpp != bytes_to_num(receivedAnswer, 4)) {
-		if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("Authentication failed. Error card response.");
-		return 3;
-	}
-	return 0;
-}
-
-int mifare_classic_readblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData) {
-
-	int len;	
-	uint8_t	bt[2] = {0x00, 0x00};	
-	uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};
-	uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0x00};
-	
-	len = mifare_sendcmd_short(pcs, 1, ISO14443A_CMD_READBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL);
-	if (len == 1) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", receivedAnswer[0]);  
-		return 1;
-	}
-	if (len != 18) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: wrong response len: %x  (expected 18)", len);  
-		return 2;
-	}
-
-	memcpy(bt, receivedAnswer + 16, 2);
-	AddCrc14A(receivedAnswer, 16);
-	if (bt[0] != receivedAnswer[16] || bt[1] != receivedAnswer[17]) {
-		if (MF_DBGLEVEL >= MF_DBG_ALL) Dbprintf("Cmd CRC response error.");  
-		return 3;
-	}
-	
-	memcpy(blockData, receivedAnswer, 16);
-	return 0;
-}
-
-// mifare ultralight commands
-int mifare_ul_ev1_auth(uint8_t *keybytes, uint8_t *pack){
-
-	uint16_t len = 0;
-	uint8_t resp[4] = {0x00, 0x00, 0x00, 0x00};
-	uint8_t respPar[1] = {0x00};
-	uint8_t key[4] = {0x00, 0x00, 0x00, 0x00};
-	memcpy(key, keybytes, 4);
-
-	if (MF_DBGLEVEL >= MF_DBG_EXTENDED)
-		Dbprintf("EV1 Auth : %02x%02x%02x%02x",	key[0], key[1], key[2], key[3]);
-	
-	len = mifare_sendcmd(MIFARE_ULEV1_AUTH, key, sizeof(key), resp, respPar, NULL);
-
-	if (len != 4) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x %u", resp[0], len);
-		return 0;
-	}
-
-	if (MF_DBGLEVEL >= MF_DBG_EXTENDED)
-		Dbprintf("Auth Resp: %02x%02x%02x%02x", resp[0],resp[1],resp[2],resp[3]);
-
-	memcpy(pack, resp, 4);
-	return 1;
-}
-
-int mifare_ultra_auth(uint8_t *keybytes){
-
-	/// 3des2k
-	uint8_t random_a[8] = {1,1,1,1,1,1,1,1};
-	uint8_t random_b[8] = {0x00};
-	uint8_t enc_random_b[8] = {0x00};
-	uint8_t rnd_ab[16] = {0x00};
-	uint8_t IV[8] = {0x00};
-	uint8_t key[16] = {0x00};
-	memcpy(key, keybytes, 16);
-
-	uint16_t len = 0;
-	uint8_t resp[19] = {0x00};
-	uint8_t respPar[3] = {0,0,0};
-
-	// REQUEST AUTHENTICATION
-	len = mifare_sendcmd_short(NULL, 1, MIFARE_ULC_AUTH_1, 0x00, resp, respPar ,NULL);
-	if (len != 11) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", resp[0]);
-		return 0;
-	}
-
-	// tag nonce.
-	memcpy(enc_random_b,resp+1,8);
-
-	// decrypt nonce.
-	tdes_2key_dec((void*)random_b, (void*)enc_random_b, sizeof(random_b), (const void*)key, IV );
-	rol(random_b,8);
-	memcpy(rnd_ab  ,random_a,8);
-	memcpy(rnd_ab+8,random_b,8);
-
-	if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
-		Dbprintf("enc_B: %02x %02x %02x %02x %02x %02x %02x %02x",
-			enc_random_b[0],enc_random_b[1],enc_random_b[2],enc_random_b[3],enc_random_b[4],enc_random_b[5],enc_random_b[6],enc_random_b[7]);
-
-		Dbprintf("    B: %02x %02x %02x %02x %02x %02x %02x %02x",
-			random_b[0],random_b[1],random_b[2],random_b[3],random_b[4],random_b[5],random_b[6],random_b[7]);
-
-		Dbprintf("rnd_ab: %02x %02x %02x %02x %02x %02x %02x %02x",
-				rnd_ab[0],rnd_ab[1],rnd_ab[2],rnd_ab[3],rnd_ab[4],rnd_ab[5],rnd_ab[6],rnd_ab[7]);
-
-		Dbprintf("rnd_ab: %02x %02x %02x %02x %02x %02x %02x %02x",
-				rnd_ab[8],rnd_ab[9],rnd_ab[10],rnd_ab[11],rnd_ab[12],rnd_ab[13],rnd_ab[14],rnd_ab[15] );
-	}
-
-	// encrypt    out, in, length, key, iv
-	tdes_2key_enc(rnd_ab, rnd_ab, sizeof(rnd_ab), key, enc_random_b);
-
-	len = mifare_sendcmd(MIFARE_ULC_AUTH_2, rnd_ab, sizeof(rnd_ab), resp, respPar, NULL);
-	if (len != 11) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", resp[0]);
-		return 0;
-	}
-
-	uint8_t enc_resp[8] = { 0,0,0,0,0,0,0,0 };
-	uint8_t resp_random_a[8] = { 0,0,0,0,0,0,0,0 };
-	memcpy(enc_resp, resp+1, 8);
-
-	// decrypt    out, in, length, key, iv 
-	tdes_2key_dec(resp_random_a, enc_resp, 8, key, enc_random_b);
-	if ( memcmp(resp_random_a, random_a, 8) != 0 ) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("failed authentication");
-		return 0;
-	}
-
-	if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
-		Dbprintf("e_AB: %02x %02x %02x %02x %02x %02x %02x %02x", 
-				rnd_ab[0],rnd_ab[1],rnd_ab[2],rnd_ab[3],
-				rnd_ab[4],rnd_ab[5],rnd_ab[6],rnd_ab[7]);
-
-		Dbprintf("e_AB: %02x %02x %02x %02x %02x %02x %02x %02x",
-				rnd_ab[8],rnd_ab[9],rnd_ab[10],rnd_ab[11],
-				rnd_ab[12],rnd_ab[13],rnd_ab[14],rnd_ab[15]);
-
-		Dbprintf("a: %02x %02x %02x %02x %02x %02x %02x %02x",
-				random_a[0],random_a[1],random_a[2],random_a[3],
-				random_a[4],random_a[5],random_a[6],random_a[7]);
-
-		Dbprintf("b: %02x %02x %02x %02x %02x %02x %02x %02x",
-				resp_random_a[0],resp_random_a[1],resp_random_a[2],resp_random_a[3],
-				resp_random_a[4],resp_random_a[5],resp_random_a[6],resp_random_a[7]);
-	}
-	return 1;
-}
-
-int mifare_ultra_readblockEx(uint8_t blockNo, uint8_t *blockData) {
-	uint16_t len = 0;
-	uint8_t	bt[2] = {0x00, 0x00};
-	uint8_t receivedAnswer[MAX_FRAME_SIZE] = {0x00};
-	uint8_t receivedAnswerPar[MAX_PARITY_SIZE] = {0x00};
-	
-	len = mifare_sendcmd_short(NULL, 1, ISO14443A_CMD_READBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL);
-	if (len == 1) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", receivedAnswer[0]);
-		return 1;
-	}
-	if (len != 18) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: card timeout. len: %x", len);
-		return 2;
-	}
-    
-	memcpy(bt, receivedAnswer + 16, 2);
-	AddCrc14A(receivedAnswer, 16);
-	if (bt[0] != receivedAnswer[16] || bt[1] != receivedAnswer[17]) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd CRC response error.");
-		return 3;
-	}
-	
-	memcpy(blockData, receivedAnswer, 14);
-	return 0;
-}
-int mifare_ultra_readblock(uint8_t blockNo, uint8_t *blockData) {
-	#define MFU_MAX_RETRIES 5
-	uint8_t res;
-
-	for (uint8_t retries = 0; retries < MFU_MAX_RETRIES; ++retries) {
-		res = mifare_ultra_readblockEx(blockNo, blockData);
-		
-		// break if OK,  or NACK.
-		switch ( res ) {
-			case 0:
-			case 1:
-				return res;
-			default:
-				continue;
-		}
-	}
-	return res;
-}
-
-int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData) {
-	// variables
-	uint16_t len = 0;	
-	uint32_t pos = 0;
-	uint8_t par[3] = {0x00, 0x00, 0x00}; // enough for 18 Bytes to send
-	byte_t res = 0;
-	
-	uint8_t d_block[18], d_block_enc[18];
-	uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};
-	uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0x00};
-	
-	// command MIFARE_CLASSIC_WRITEBLOCK
-	len = mifare_sendcmd_short(pcs, 1, ISO14443A_CMD_WRITEBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL);
-
-	if ((len != 1) || (receivedAnswer[0] != 0x0A)) {   //  0x0a - ACK
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", receivedAnswer[0]);  
-		return 1;
-	}
-	
-	memcpy(d_block, blockData, 16);
-	AddCrc14A(d_block, 16);
-	
-	// crypto
-	for (pos = 0; pos < 18; pos++) {
-		d_block_enc[pos] = crypto1_byte(pcs, 0x00, 0) ^ d_block[pos];
-		par[pos>>3] |= (((filter(pcs->odd) ^ oddparity8(d_block[pos])) & 0x01) << (7 - (pos&0x0007)));
-	}	
-
-	ReaderTransmitPar(d_block_enc, sizeof(d_block_enc), par, NULL);
-
-	// Receive the response
-	len = ReaderReceive(receivedAnswer, receivedAnswerPar);	
-
-	res = 0;
-	res |= (crypto1_bit(pcs, 0, 0) ^ BIT(receivedAnswer[0], 0)) << 0;
-	res |= (crypto1_bit(pcs, 0, 0) ^ BIT(receivedAnswer[0], 1)) << 1;
-	res |= (crypto1_bit(pcs, 0, 0) ^ BIT(receivedAnswer[0], 2)) << 2;
-	res |= (crypto1_bit(pcs, 0, 0) ^ BIT(receivedAnswer[0], 3)) << 3;
-
-	if ((len != 1) || (res != 0x0A)) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd send data2 Error: %02x", res);  
-		return 2;
-	}
-	return 0;
-}
-
-/* // command not needed, but left for future testing
-int mifare_ultra_writeblock_compat(uint8_t blockNo, uint8_t *blockData) {
-	uint16_t len;
-    uint8_t par[3] = {0};  // enough for 18 parity bits
-	uint8_t d_block[18] = {0x00};
-	uint8_t receivedAnswer[MAX_FRAME_SIZE];
-	uint8_t receivedAnswerPar[MAX_PARITY_SIZE];
-
-    len = mifare_sendcmd_short(NULL, true, ISO14443A_CMD_WRITEBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL);
-
-    if ((len != 1) || (receivedAnswer[0] != 0x0A)) {   //  0x0a - ACK
-		if (MF_DBGLEVEL >= MF_DBG_ERROR)
-			Dbprintf("Cmd Addr Error: %02x", receivedAnswer[0]);
-        return 1;
-    }
-
-	memcpy(d_block, blockData, 16);
-    AddCrc14A(d_block, 16);
-
-	ReaderTransmitPar(d_block, sizeof(d_block), par, NULL);
-
-	len = ReaderReceive(receivedAnswer, receivedAnswerPar);
-
-	if ((len != 1) || (receivedAnswer[0] != 0x0A)) {   //  0x0a - ACK
-		if (MF_DBGLEVEL >= MF_DBG_ERROR)
-			Dbprintf("Cmd Data Error: %02x %d", receivedAnswer[0],len);
-        return 2;
-	}
-    return 0;
-}
-*/
-
-int mifare_ultra_writeblock(uint8_t blockNo, uint8_t *blockData) {
-    uint16_t len = 0;
-	uint8_t block[5] = {blockNo, 0x00, 0x00, 0x00, 0x00 };
-	uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};
-	uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0x00};
-
-    // command MIFARE_CLASSIC_WRITEBLOCK
-	memcpy(block+1, blockData, 4);
-
-	len = mifare_sendcmd( MIFARE_ULC_WRITE, block, sizeof(block), receivedAnswer, receivedAnswerPar, NULL);
-
-    if (receivedAnswer[0] != 0x0A) {   //  0x0a - ACK
-		if (MF_DBGLEVEL >= MF_DBG_ERROR)
-			Dbprintf("Cmd Send Error: %02x %d", receivedAnswer[0],len);
-        return 1;
-    }
-    return 0;
-}
-int mifare_classic_halt_ex(struct Crypto1State *pcs) {
-	uint8_t receivedAnswer[4] = {0x00, 0x00, 0x00, 0x00};
-	uint16_t len = mifare_sendcmd_short(pcs, (pcs == NULL) ? CRYPT_NONE : CRYPT_ALL, ISO14443A_CMD_HALT, 0x00, receivedAnswer, NULL, NULL);
-	if (len != 0) {
-		if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("halt warning. response len: %x", len);
-		return 1;
-	}
-	return 0;
-}
-int mifare_classic_halt(struct Crypto1State *pcs, uint32_t uid) {
-	return mifare_classic_halt_ex(pcs);
-}
-
-int mifare_ultra_halt() {
-	uint16_t len = 0;
-	uint8_t receivedAnswer[4] = {0x00, 0x00, 0x00, 0x00};
- 	len = mifare_sendcmd_short(NULL, CRYPT_NONE, ISO14443A_CMD_HALT, 0x00, receivedAnswer, NULL, NULL);
-	if (len != 0) {
-		if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("halt warning. response len: %x", len);
-		return 1;
-	}
-	return 0;
-}
-
-
-// Mifare Memory Structure: up to 32 Sectors with 4 blocks each (1k and 2k cards),
-// plus evtl. 8 sectors with 16 blocks each (4k cards)
-uint8_t NumBlocksPerSector(uint8_t sectorNo) {
-	return (sectorNo < 32) ? 4 : 16;
-}
-
-uint8_t FirstBlockOfSector(uint8_t sectorNo) {
-	if (sectorNo < 32)
-		return sectorNo * 4;
-	else
-		return 32*4 + (sectorNo - 32) * 16;
-		
-}
-
-// work with emulator memory
-void emlSetMem(uint8_t *data, int blockNum, int blocksCount) {
-	emlSetMem_xt(data, blockNum, blocksCount, 16);
-}
-
-void emlSetMem_xt(uint8_t *data, int blockNum, int blocksCount, int blockBtWidth) {
-	uint8_t* emCARD = BigBuf_get_EM_addr();
-	memcpy(emCARD + blockNum * blockBtWidth, data, blocksCount * blockBtWidth);
-}
-
-void emlGetMem(uint8_t *data, int blockNum, int blocksCount) {
-	uint8_t* emCARD = BigBuf_get_EM_addr();
-	memcpy(data, emCARD + blockNum * 16, blocksCount * 16);
-}
-
-void emlGetMemBt(uint8_t *data, int bytePtr, int byteCount) {
-	uint8_t* emCARD = BigBuf_get_EM_addr();
-	memcpy(data, emCARD + bytePtr, byteCount);
-}
-
-int emlCheckValBl(int blockNum) {
-	uint8_t* emCARD = BigBuf_get_EM_addr();
-	uint8_t* data = emCARD + blockNum * 16;
-
-	if ((data[0] != (data[4] ^ 0xff)) || (data[0] != data[8]) ||
-			(data[1] != (data[5] ^ 0xff)) || (data[1] != data[9]) ||
-			(data[2] != (data[6] ^ 0xff)) || (data[2] != data[10]) ||
-			(data[3] != (data[7] ^ 0xff)) || (data[3] != data[11]) ||
-			(data[12] != (data[13] ^ 0xff)) || (data[12] != data[14]) ||
-			(data[12] != (data[15] ^ 0xff))
-		 ) 
-		return 1;
-	return 0;
-}
-
-int emlGetValBl(uint32_t *blReg, uint8_t *blBlock, int blockNum) {
-	uint8_t* emCARD = BigBuf_get_EM_addr();
-	uint8_t* data = emCARD + blockNum * 16;
-	
-	if (emlCheckValBl(blockNum))
-		return 1;
-	
-	memcpy(blReg, data, 4);
-	*blBlock = data[12];
-	return 0;
-}
-
-int emlSetValBl(uint32_t blReg, uint8_t blBlock, int blockNum) {
-	uint8_t* emCARD = BigBuf_get_EM_addr();
-	uint8_t* data = emCARD + blockNum * 16;
-	
-	memcpy(data + 0, &blReg, 4);
-	memcpy(data + 8, &blReg, 4);
-	blReg = blReg ^ 0xffffffff;
-	memcpy(data + 4, &blReg, 4);
-	
-	data[12] = blBlock;
-	data[13] = blBlock ^ 0xff;
-	data[14] = blBlock;
-	data[15] = blBlock ^ 0xff;
-	
-	return 0;
-}
-
-uint64_t emlGetKey(int sectorNum, int keyType) {
-	uint8_t key[6] = {0x00};
-	uint8_t* emCARD = BigBuf_get_EM_addr();
-	memcpy(key, emCARD + 16 * (FirstBlockOfSector(sectorNum) + NumBlocksPerSector(sectorNum) - 1) + keyType * 10, 6);
-	return bytes_to_num(key, 6);
-}
-
-void emlClearMem(void) {
-	const uint8_t trailer[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0x80, 0x69, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
-	const uint8_t uid[]   =   {0xe6, 0x84, 0x87, 0xf3, 0x16, 0x88, 0x04, 0x00, 0x46, 0x8e, 0x45, 0x55, 0x4d, 0x70, 0x41, 0x04};
-	uint8_t* emCARD = BigBuf_get_EM_addr();
-	memset(emCARD, 0, CARD_MEMORY_SIZE);
-	
-	// fill sectors trailer data
-	for(uint16_t b = 3; b < 256; ((b < 127) ? (b += 4) : (b += 16)))
-		emlSetMem((uint8_t *)trailer, b, 1);
-
-	// uid
-	emlSetMem((uint8_t *)uid, 0, 1);
-	return;
-}
-
-
-// Mifare desfire commands
-int mifare_sendcmd_special(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t* data, uint8_t* answer, uint8_t *answer_parity, uint32_t *timing) {
-    uint8_t dcmd[5] = {cmd, data[0], data[1], 0x00, 0x00};
-	AddCrc14A(dcmd, 3);
-	
-	ReaderTransmit(dcmd, sizeof(dcmd), NULL);
-	int len = ReaderReceive(answer, answer_parity);
-	if(!len) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication failed. Card timeout.");
-		return 1;
-    }
-	return len;
-}
-
-int mifare_sendcmd_special2(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t* data, uint8_t* answer,uint8_t *answer_parity, uint32_t *timing) {
-    uint8_t dcmd[20] = {0x00};
-    dcmd[0] = cmd;
-    memcpy(dcmd+1,data,17);
-	AddCrc14A(dcmd, 18);
-
-	ReaderTransmit(dcmd, sizeof(dcmd), NULL);
-	int len = ReaderReceive(answer, answer_parity);
-	if(!len){
-        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication failed. Card timeout.");
-		return 1;
-    }
-	return len;
-}
-
-int mifare_desfire_des_auth1(uint32_t uid, uint8_t *blockData){
-
-	int len;
-	// load key, keynumber
-	uint8_t data[2]={MFDES_AUTHENTICATE, 0x00};
-	uint8_t receivedAnswer[MAX_FRAME_SIZE] = {0x00};
-	uint8_t receivedAnswerPar[MAX_PARITY_SIZE] = {0x00};
-	
-	len = mifare_sendcmd_special(NULL, 1, 0x02, data, receivedAnswer,receivedAnswerPar,NULL);
-	if (len == 1) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR)
-			Dbprintf("Cmd Error: %02x", receivedAnswer[0]);
-		return 1;
-	}
-	
-	if (len == 12) {
-		if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	{
-			Dbprintf("Auth1 Resp: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
-				receivedAnswer[0],receivedAnswer[1],receivedAnswer[2],receivedAnswer[3],receivedAnswer[4],
-				receivedAnswer[5],receivedAnswer[6],receivedAnswer[7],receivedAnswer[8],receivedAnswer[9],
-				receivedAnswer[10],receivedAnswer[11]);
-			}
-			memcpy(blockData, receivedAnswer, 12);
-	        return 0;
-	}
-	return 1;
-}
-
-int mifare_desfire_des_auth2(uint32_t uid, uint8_t *key, uint8_t *blockData){
-
-	int len;
-	uint8_t data[17] = {MFDES_AUTHENTICATION_FRAME};
-	memcpy(data+1,key,16);
-	
-	uint8_t receivedAnswer[MAX_FRAME_SIZE] = {0x00};
-	uint8_t receivedAnswerPar[MAX_PARITY_SIZE] = {0x00};
-	
-	len = mifare_sendcmd_special2(NULL, 1, 0x03, data, receivedAnswer, receivedAnswerPar ,NULL);
-	
-	if ((receivedAnswer[0] == 0x03) && (receivedAnswer[1] == 0xae)) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR)
-			Dbprintf("Auth Error: %02x %02x", receivedAnswer[0], receivedAnswer[1]);
-		return 1;
-	}
-	
-	if (len == 12){
-		if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
-			Dbprintf("Auth2 Resp: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
-				receivedAnswer[0],receivedAnswer[1],receivedAnswer[2],receivedAnswer[3],receivedAnswer[4],
-				receivedAnswer[5],receivedAnswer[6],receivedAnswer[7],receivedAnswer[8],receivedAnswer[9],
-				receivedAnswer[10],receivedAnswer[11]);
-			}
-		memcpy(blockData, receivedAnswer, 12);
-		return 0;
-	}
-	return 1;
-}
+//-----------------------------------------------------------------------------
+// Merlok, May 2011, 2012
+// Many authors, whom made it possible
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// Work with mifare cards.
+//-----------------------------------------------------------------------------
+#include "mifareutil.h"
+
+int MF_DBGLEVEL = MF_DBG_ERROR;
+
+// crypto1 helpers
+void mf_crypto1_decryptEx(struct Crypto1State *pcs, uint8_t *data_in, int len, uint8_t *data_out){
+	uint8_t	bt = 0;
+	int i;
+	
+	if (len != 1) {
+		for (i = 0; i < len; i++)
+			data_out[i] = crypto1_byte(pcs, 0x00, 0) ^ data_in[i];
+	} else {
+		bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data_in[0], 0)) << 0;
+		bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data_in[0], 1)) << 1;
+		bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data_in[0], 2)) << 2;
+		bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data_in[0], 3)) << 3;
+		data_out[0] = bt;
+	}
+	return;
+}
+
+void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len){
+	mf_crypto1_decryptEx(pcs, data, len, data);
+}
+
+void mf_crypto1_encrypt(struct Crypto1State *pcs, uint8_t *data, uint16_t len, uint8_t *par) {
+	uint8_t bt = 0;
+	int i;
+	par[0] = 0;
+	
+	for (i = 0; i < len; i++) {
+		bt = data[i];
+		data[i] = crypto1_byte(pcs, 0x00, 0) ^ data[i];
+		if ( ( i & 0x0007 ) == 0) 
+			par[ i >> 3 ] = 0;
+		par[ i >> 3 ] |= (((filter(pcs->odd) ^ oddparity8(bt)) & 0x01)<<(7-(i&0x0007)));
+	}	
+}
+
+uint8_t mf_crypto1_encrypt4bit(struct Crypto1State *pcs, uint8_t data) {
+	uint8_t bt = 0;
+	bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data, 0)) << 0;
+	bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data, 1)) << 1;
+	bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data, 2)) << 2;
+	bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data, 3)) << 3;
+	return bt;
+}
+
+// send X byte basic commands
+int mifare_sendcmd(uint8_t cmd, uint8_t* data, uint8_t data_size, uint8_t* answer, uint8_t *answer_parity, uint32_t *timing) {
+	uint8_t dcmd[data_size+3];
+    dcmd[0] = cmd;
+	memcpy(dcmd+1, data, data_size);
+	AddCrc14A(dcmd, data_size+1);
+	ReaderTransmit(dcmd, sizeof(dcmd), timing);
+	int len = ReaderReceive(answer, answer_parity);
+	if(!len) {
+		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("%02X Cmd failed. Card timeout.", cmd);
+		len = ReaderReceive(answer,answer_parity);
+    }
+	return len;
+}
+
+// send 2 byte commands
+int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t data, uint8_t *answer, uint8_t *answer_parity, uint32_t *timing) {
+	uint16_t pos, res;
+	uint8_t dcmd[4] = {cmd, data, 0x00, 0x00};
+	uint8_t	ecmd[4] = {0x00, 0x00, 0x00, 0x00};
+	uint8_t par[1] = {0x00};			// 1 Byte parity is enough here
+	AddCrc14A(dcmd, 2);
+	memcpy(ecmd, dcmd, sizeof(dcmd));
+	
+	if (crypted) {
+		par[0] = 0;
+		for (pos = 0; pos < 4; pos++) {
+			ecmd[pos] = crypto1_byte(pcs, 0x00, 0) ^ dcmd[pos];
+			par[0] |= (((filter(pcs->odd) ^ oddparity8(dcmd[pos])) & 0x01) << (7-pos));
+		}	
+		ReaderTransmitPar(ecmd, sizeof(ecmd), par, timing);
+	} else {
+		ReaderTransmit(dcmd, sizeof(dcmd), timing);
+	}
+
+	int len = ReaderReceive(answer, par);
+	
+	if (answer_parity) *answer_parity = par[0];
+	
+	if (crypted == CRYPT_ALL) {
+		if (len == 1) {
+			res = 0;
+			res |= (crypto1_bit(pcs, 0, 0) ^ BIT(answer[0], 0)) << 0;
+			res |= (crypto1_bit(pcs, 0, 0) ^ BIT(answer[0], 1)) << 1;
+			res |= (crypto1_bit(pcs, 0, 0) ^ BIT(answer[0], 2)) << 2;
+			res |= (crypto1_bit(pcs, 0, 0) ^ BIT(answer[0], 3)) << 3;
+			answer[0] = res;			
+		} else {
+			for (pos = 0; pos < len; pos++)
+				answer[pos] = crypto1_byte(pcs, 0x00, 0) ^ answer[pos];
+		}
+	}
+	return len;
+}
+
+// mifare classic commands
+int mifare_classic_auth(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint8_t isNested) {
+	return mifare_classic_authex(pcs, uid, blockNo, keyType, ui64Key, isNested, NULL, NULL);
+}
+
+int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint8_t isNested, uint32_t *ntptr, uint32_t *timing) {
+	int len;	
+	uint32_t pos, nt, ntpp; // Supplied tag nonce
+	uint8_t par[1] = {0x00};
+	uint8_t nr[4];
+	uint8_t mf_nr_ar[] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 };
+	uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};
+	uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0x00};
+
+	// "random" reader nonce:
+	num_to_bytes( prng_successor( GetTickCount(), 32), 4, nr);
+	
+	// Transmit MIFARE_CLASSIC_AUTH
+	len = mifare_sendcmd_short(pcs, isNested, 0x60 + (keyType & 0x01), blockNo, receivedAnswer, receivedAnswerPar, timing);
+	if (len != 4) return 1;
+	
+	// Save the tag nonce (nt)
+	nt = bytes_to_num(receivedAnswer, 4);
+
+	//  ----------------------------- crypto1 create
+	if (isNested)
+		crypto1_destroy(pcs);
+
+	// Init cipher with key
+	crypto1_create(pcs, ui64Key);
+
+	if (isNested == AUTH_NESTED) {
+		// decrypt nt with help of new key 
+		nt = crypto1_word(pcs, nt ^ uid, 1) ^ nt;
+	} else {
+		// Load (plain) uid^nt into the cipher
+		crypto1_word(pcs, nt ^ uid, 0);
+	}
+
+	// some statistic
+	if (!ntptr && (MF_DBGLEVEL >= MF_DBG_EXTENDED))
+		Dbprintf("auth uid: %08x | nr: %08x | nt: %08x", uid, nr, nt);
+	
+	// save Nt
+	if (ntptr)
+		*ntptr = nt;
+
+	// Generate (encrypted) nr+parity by loading it into the cipher (Nr)
+	par[0] = 0;
+	for (pos = 0; pos < 4; pos++) {
+		mf_nr_ar[pos] = crypto1_byte(pcs, nr[pos], 0) ^ nr[pos];
+		par[0] |= (((filter(pcs->odd) ^ oddparity8(nr[pos])) & 0x01) << (7-pos));
+	}	
+		
+	// Skip 32 bits in pseudo random generator
+	nt = prng_successor(nt, 32);
+
+	//  ar+parity
+	for (pos = 4; pos < 8; pos++) {
+		nt = prng_successor(nt,8);
+		mf_nr_ar[pos] = crypto1_byte(pcs,0x00,0) ^ (nt & 0xff);
+		par[0] |= (((filter(pcs->odd) ^ oddparity8(nt & 0xff)) & 0x01) << (7-pos));
+	}	
+		
+	// Transmit reader nonce and reader answer
+	ReaderTransmitPar(mf_nr_ar, sizeof(mf_nr_ar), par, NULL);
+
+	// Receive 4 byte tag answer
+	len = ReaderReceive(receivedAnswer, receivedAnswerPar);
+	if (!len) {
+		if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Authentication failed. Card timeout.");
+		return 2;
+	}
+
+	ntpp = prng_successor(nt, 32) ^ crypto1_word(pcs, 0,0);
+
+	if (ntpp != bytes_to_num(receivedAnswer, 4)) {
+		if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("Authentication failed. Error card response.");
+		return 3;
+	}
+	return 0;
+}
+
+int mifare_classic_readblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData) {
+
+	int len;	
+	uint8_t	bt[2] = {0x00, 0x00};	
+	uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};
+	uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0x00};
+	
+	len = mifare_sendcmd_short(pcs, 1, ISO14443A_CMD_READBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL);
+	if (len == 1) {
+		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", receivedAnswer[0]);  
+		return 1;
+	}
+	if (len != 18) {
+		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: wrong response len: %x  (expected 18)", len);  
+		return 2;
+	}
+
+	memcpy(bt, receivedAnswer + 16, 2);
+	AddCrc14A(receivedAnswer, 16);
+	if (bt[0] != receivedAnswer[16] || bt[1] != receivedAnswer[17]) {
+		if (MF_DBGLEVEL >= MF_DBG_ALL) Dbprintf("Cmd CRC response error.");  
+		return 3;
+	}
+	
+	memcpy(blockData, receivedAnswer, 16);
+	return 0;
+}
+
+// mifare ultralight commands
+int mifare_ul_ev1_auth(uint8_t *keybytes, uint8_t *pack){
+
+	uint16_t len = 0;
+	uint8_t resp[4] = {0x00, 0x00, 0x00, 0x00};
+	uint8_t respPar[1] = {0x00};
+	uint8_t key[4] = {0x00, 0x00, 0x00, 0x00};
+	memcpy(key, keybytes, 4);
+
+	if (MF_DBGLEVEL >= MF_DBG_EXTENDED)
+		Dbprintf("EV1 Auth : %02x%02x%02x%02x",	key[0], key[1], key[2], key[3]);
+	
+	len = mifare_sendcmd(MIFARE_ULEV1_AUTH, key, sizeof(key), resp, respPar, NULL);
+
+	if (len != 4) {
+		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x %u", resp[0], len);
+		return 0;
+	}
+
+	if (MF_DBGLEVEL >= MF_DBG_EXTENDED)
+		Dbprintf("Auth Resp: %02x%02x%02x%02x", resp[0],resp[1],resp[2],resp[3]);
+
+	memcpy(pack, resp, 4);
+	return 1;
+}
+
+int mifare_ultra_auth(uint8_t *keybytes){
+
+	/// 3des2k
+	uint8_t random_a[8] = {1,1,1,1,1,1,1,1};
+	uint8_t random_b[8] = {0x00};
+	uint8_t enc_random_b[8] = {0x00};
+	uint8_t rnd_ab[16] = {0x00};
+	uint8_t IV[8] = {0x00};
+	uint8_t key[16] = {0x00};
+	memcpy(key, keybytes, 16);
+
+	uint16_t len = 0;
+	uint8_t resp[19] = {0x00};
+	uint8_t respPar[3] = {0,0,0};
+
+	// REQUEST AUTHENTICATION
+	len = mifare_sendcmd_short(NULL, 1, MIFARE_ULC_AUTH_1, 0x00, resp, respPar ,NULL);
+	if (len != 11) {
+		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", resp[0]);
+		return 0;
+	}
+
+	// tag nonce.
+	memcpy(enc_random_b,resp+1,8);
+
+	// decrypt nonce.
+	tdes_2key_dec((void*)random_b, (void*)enc_random_b, sizeof(random_b), (const void*)key, IV );
+	rol(random_b,8);
+	memcpy(rnd_ab  ,random_a,8);
+	memcpy(rnd_ab+8,random_b,8);
+
+	if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
+		Dbprintf("enc_B: %02x %02x %02x %02x %02x %02x %02x %02x",
+			enc_random_b[0],enc_random_b[1],enc_random_b[2],enc_random_b[3],enc_random_b[4],enc_random_b[5],enc_random_b[6],enc_random_b[7]);
+
+		Dbprintf("    B: %02x %02x %02x %02x %02x %02x %02x %02x",
+			random_b[0],random_b[1],random_b[2],random_b[3],random_b[4],random_b[5],random_b[6],random_b[7]);
+
+		Dbprintf("rnd_ab: %02x %02x %02x %02x %02x %02x %02x %02x",
+				rnd_ab[0],rnd_ab[1],rnd_ab[2],rnd_ab[3],rnd_ab[4],rnd_ab[5],rnd_ab[6],rnd_ab[7]);
+
+		Dbprintf("rnd_ab: %02x %02x %02x %02x %02x %02x %02x %02x",
+				rnd_ab[8],rnd_ab[9],rnd_ab[10],rnd_ab[11],rnd_ab[12],rnd_ab[13],rnd_ab[14],rnd_ab[15] );
+	}
+
+	// encrypt    out, in, length, key, iv
+	tdes_2key_enc(rnd_ab, rnd_ab, sizeof(rnd_ab), key, enc_random_b);
+
+	len = mifare_sendcmd(MIFARE_ULC_AUTH_2, rnd_ab, sizeof(rnd_ab), resp, respPar, NULL);
+	if (len != 11) {
+		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", resp[0]);
+		return 0;
+	}
+
+	uint8_t enc_resp[8] = { 0,0,0,0,0,0,0,0 };
+	uint8_t resp_random_a[8] = { 0,0,0,0,0,0,0,0 };
+	memcpy(enc_resp, resp+1, 8);
+
+	// decrypt    out, in, length, key, iv 
+	tdes_2key_dec(resp_random_a, enc_resp, 8, key, enc_random_b);
+	if ( memcmp(resp_random_a, random_a, 8) != 0 ) {
+		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("failed authentication");
+		return 0;
+	}
+
+	if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
+		Dbprintf("e_AB: %02x %02x %02x %02x %02x %02x %02x %02x", 
+				rnd_ab[0],rnd_ab[1],rnd_ab[2],rnd_ab[3],
+				rnd_ab[4],rnd_ab[5],rnd_ab[6],rnd_ab[7]);
+
+		Dbprintf("e_AB: %02x %02x %02x %02x %02x %02x %02x %02x",
+				rnd_ab[8],rnd_ab[9],rnd_ab[10],rnd_ab[11],
+				rnd_ab[12],rnd_ab[13],rnd_ab[14],rnd_ab[15]);
+
+		Dbprintf("a: %02x %02x %02x %02x %02x %02x %02x %02x",
+				random_a[0],random_a[1],random_a[2],random_a[3],
+				random_a[4],random_a[5],random_a[6],random_a[7]);
+
+		Dbprintf("b: %02x %02x %02x %02x %02x %02x %02x %02x",
+				resp_random_a[0],resp_random_a[1],resp_random_a[2],resp_random_a[3],
+				resp_random_a[4],resp_random_a[5],resp_random_a[6],resp_random_a[7]);
+	}
+	return 1;
+}
+
+int mifare_ultra_readblockEx(uint8_t blockNo, uint8_t *blockData) {
+	uint16_t len = 0;
+	uint8_t	bt[2] = {0x00, 0x00};
+	uint8_t receivedAnswer[MAX_FRAME_SIZE] = {0x00};
+	uint8_t receivedAnswerPar[MAX_PARITY_SIZE] = {0x00};
+	
+	len = mifare_sendcmd_short(NULL, 1, ISO14443A_CMD_READBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL);
+	if (len == 1) {
+		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", receivedAnswer[0]);
+		return 1;
+	}
+	if (len != 18) {
+		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: card timeout. len: %x", len);
+		return 2;
+	}
+    
+	memcpy(bt, receivedAnswer + 16, 2);
+	AddCrc14A(receivedAnswer, 16);
+	if (bt[0] != receivedAnswer[16] || bt[1] != receivedAnswer[17]) {
+		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd CRC response error.");
+		return 3;
+	}
+	
+	memcpy(blockData, receivedAnswer, 14);
+	return 0;
+}
+int mifare_ultra_readblock(uint8_t blockNo, uint8_t *blockData) {
+	#define MFU_MAX_RETRIES 5
+	uint8_t res;
+
+	for (uint8_t retries = 0; retries < MFU_MAX_RETRIES; ++retries) {
+		res = mifare_ultra_readblockEx(blockNo, blockData);
+		
+		// break if OK,  or NACK.
+		switch ( res ) {
+			case 0:
+			case 1:
+				return res;
+			default:
+				continue;
+		}
+	}
+	return res;
+}
+
+int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData) {
+	// variables
+	uint16_t len = 0;	
+	uint32_t pos = 0;
+	uint8_t par[3] = {0x00, 0x00, 0x00}; // enough for 18 Bytes to send
+	byte_t res = 0;
+	
+	uint8_t d_block[18], d_block_enc[18];
+	uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};
+	uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0x00};
+	
+	// command MIFARE_CLASSIC_WRITEBLOCK
+	len = mifare_sendcmd_short(pcs, 1, ISO14443A_CMD_WRITEBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL);
+
+	if ((len != 1) || (receivedAnswer[0] != 0x0A)) {   //  0x0a - ACK
+		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", receivedAnswer[0]);  
+		return 1;
+	}
+	
+	memcpy(d_block, blockData, 16);
+	AddCrc14A(d_block, 16);
+	
+	// crypto
+	for (pos = 0; pos < 18; pos++) {
+		d_block_enc[pos] = crypto1_byte(pcs, 0x00, 0) ^ d_block[pos];
+		par[pos>>3] |= (((filter(pcs->odd) ^ oddparity8(d_block[pos])) & 0x01) << (7 - (pos&0x0007)));
+	}	
+
+	ReaderTransmitPar(d_block_enc, sizeof(d_block_enc), par, NULL);
+
+	// Receive the response
+	len = ReaderReceive(receivedAnswer, receivedAnswerPar);	
+
+	res = 0;
+	res |= (crypto1_bit(pcs, 0, 0) ^ BIT(receivedAnswer[0], 0)) << 0;
+	res |= (crypto1_bit(pcs, 0, 0) ^ BIT(receivedAnswer[0], 1)) << 1;
+	res |= (crypto1_bit(pcs, 0, 0) ^ BIT(receivedAnswer[0], 2)) << 2;
+	res |= (crypto1_bit(pcs, 0, 0) ^ BIT(receivedAnswer[0], 3)) << 3;
+
+	if ((len != 1) || (res != 0x0A)) {
+		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd send data2 Error: %02x", res);  
+		return 2;
+	}
+	return 0;
+}
+
+/* // command not needed, but left for future testing
+int mifare_ultra_writeblock_compat(uint8_t blockNo, uint8_t *blockData) {
+	uint16_t len;
+    uint8_t par[3] = {0};  // enough for 18 parity bits
+	uint8_t d_block[18] = {0x00};
+	uint8_t receivedAnswer[MAX_FRAME_SIZE];
+	uint8_t receivedAnswerPar[MAX_PARITY_SIZE];
+
+    len = mifare_sendcmd_short(NULL, true, ISO14443A_CMD_WRITEBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL);
+
+    if ((len != 1) || (receivedAnswer[0] != 0x0A)) {   //  0x0a - ACK
+		if (MF_DBGLEVEL >= MF_DBG_ERROR)
+			Dbprintf("Cmd Addr Error: %02x", receivedAnswer[0]);
+        return 1;
+    }
+
+	memcpy(d_block, blockData, 16);
+    AddCrc14A(d_block, 16);
+
+	ReaderTransmitPar(d_block, sizeof(d_block), par, NULL);
+
+	len = ReaderReceive(receivedAnswer, receivedAnswerPar);
+
+	if ((len != 1) || (receivedAnswer[0] != 0x0A)) {   //  0x0a - ACK
+		if (MF_DBGLEVEL >= MF_DBG_ERROR)
+			Dbprintf("Cmd Data Error: %02x %d", receivedAnswer[0],len);
+        return 2;
+	}
+    return 0;
+}
+*/
+
+int mifare_ultra_writeblock(uint8_t blockNo, uint8_t *blockData) {
+    uint16_t len = 0;
+	uint8_t block[5] = {blockNo, 0x00, 0x00, 0x00, 0x00 };
+	uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};
+	uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0x00};
+
+    // command MIFARE_CLASSIC_WRITEBLOCK
+	memcpy(block+1, blockData, 4);
+
+	len = mifare_sendcmd( MIFARE_ULC_WRITE, block, sizeof(block), receivedAnswer, receivedAnswerPar, NULL);
+
+    if (receivedAnswer[0] != 0x0A) {   //  0x0a - ACK
+		if (MF_DBGLEVEL >= MF_DBG_ERROR)
+			Dbprintf("Cmd Send Error: %02x %d", receivedAnswer[0],len);
+        return 1;
+    }
+    return 0;
+}
+int mifare_classic_halt_ex(struct Crypto1State *pcs) {
+	uint8_t receivedAnswer[4] = {0x00, 0x00, 0x00, 0x00};
+	uint16_t len = mifare_sendcmd_short(pcs, (pcs == NULL) ? CRYPT_NONE : CRYPT_ALL, ISO14443A_CMD_HALT, 0x00, receivedAnswer, NULL, NULL);
+	if (len != 0) {
+		if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("halt warning. response len: %x", len);
+		return 1;
+	}
+	return 0;
+}
+int mifare_classic_halt(struct Crypto1State *pcs, uint32_t uid) {
+	return mifare_classic_halt_ex(pcs);
+}
+
+int mifare_ultra_halt() {
+	uint16_t len = 0;
+	uint8_t receivedAnswer[4] = {0x00, 0x00, 0x00, 0x00};
+ 	len = mifare_sendcmd_short(NULL, CRYPT_NONE, ISO14443A_CMD_HALT, 0x00, receivedAnswer, NULL, NULL);
+	if (len != 0) {
+		if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("halt warning. response len: %x", len);
+		return 1;
+	}
+	return 0;
+}
+
+
+// Mifare Memory Structure: up to 32 Sectors with 4 blocks each (1k and 2k cards),
+// plus evtl. 8 sectors with 16 blocks each (4k cards)
+uint8_t NumBlocksPerSector(uint8_t sectorNo) {
+	return (sectorNo < 32) ? 4 : 16;
+}
+
+uint8_t FirstBlockOfSector(uint8_t sectorNo) {
+	if (sectorNo < 32)
+		return sectorNo * 4;
+	else
+		return 32*4 + (sectorNo - 32) * 16;
+		
+}
+
+// work with emulator memory
+void emlSetMem(uint8_t *data, int blockNum, int blocksCount) {
+	emlSetMem_xt(data, blockNum, blocksCount, 16);
+}
+
+void emlSetMem_xt(uint8_t *data, int blockNum, int blocksCount, int blockBtWidth) {
+	uint8_t* emCARD = BigBuf_get_EM_addr();
+	memcpy(emCARD + blockNum * blockBtWidth, data, blocksCount * blockBtWidth);
+}
+
+void emlGetMem(uint8_t *data, int blockNum, int blocksCount) {
+	uint8_t* emCARD = BigBuf_get_EM_addr();
+	memcpy(data, emCARD + blockNum * 16, blocksCount * 16);
+}
+
+void emlGetMemBt(uint8_t *data, int bytePtr, int byteCount) {
+	uint8_t* emCARD = BigBuf_get_EM_addr();
+	memcpy(data, emCARD + bytePtr, byteCount);
+}
+
+int emlCheckValBl(int blockNum) {
+	uint8_t* emCARD = BigBuf_get_EM_addr();
+	uint8_t* data = emCARD + blockNum * 16;
+
+	if ((data[0] != (data[4] ^ 0xff)) || (data[0] != data[8]) ||
+			(data[1] != (data[5] ^ 0xff)) || (data[1] != data[9]) ||
+			(data[2] != (data[6] ^ 0xff)) || (data[2] != data[10]) ||
+			(data[3] != (data[7] ^ 0xff)) || (data[3] != data[11]) ||
+			(data[12] != (data[13] ^ 0xff)) || (data[12] != data[14]) ||
+			(data[12] != (data[15] ^ 0xff))
+		 ) 
+		return 1;
+	return 0;
+}
+
+int emlGetValBl(uint32_t *blReg, uint8_t *blBlock, int blockNum) {
+	uint8_t* emCARD = BigBuf_get_EM_addr();
+	uint8_t* data = emCARD + blockNum * 16;
+	
+	if (emlCheckValBl(blockNum))
+		return 1;
+	
+	memcpy(blReg, data, 4);
+	*blBlock = data[12];
+	return 0;
+}
+
+int emlSetValBl(uint32_t blReg, uint8_t blBlock, int blockNum) {
+	uint8_t* emCARD = BigBuf_get_EM_addr();
+	uint8_t* data = emCARD + blockNum * 16;
+	
+	memcpy(data + 0, &blReg, 4);
+	memcpy(data + 8, &blReg, 4);
+	blReg = blReg ^ 0xffffffff;
+	memcpy(data + 4, &blReg, 4);
+	
+	data[12] = blBlock;
+	data[13] = blBlock ^ 0xff;
+	data[14] = blBlock;
+	data[15] = blBlock ^ 0xff;
+	
+	return 0;
+}
+
+uint64_t emlGetKey(int sectorNum, int keyType) {
+	uint8_t key[6] = {0x00};
+	uint8_t* emCARD = BigBuf_get_EM_addr();
+	memcpy(key, emCARD + 16 * (FirstBlockOfSector(sectorNum) + NumBlocksPerSector(sectorNum) - 1) + keyType * 10, 6);
+	return bytes_to_num(key, 6);
+}
+
+void emlClearMem(void) {
+	const uint8_t trailer[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0x80, 0x69, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
+	const uint8_t uid[]   =   {0xe6, 0x84, 0x87, 0xf3, 0x16, 0x88, 0x04, 0x00, 0x46, 0x8e, 0x45, 0x55, 0x4d, 0x70, 0x41, 0x04};
+	uint8_t* emCARD = BigBuf_get_EM_addr();
+	memset(emCARD, 0, CARD_MEMORY_SIZE);
+	
+	// fill sectors trailer data
+	for(uint16_t b = 3; b < 256; ((b < 127) ? (b += 4) : (b += 16)))
+		emlSetMem((uint8_t *)trailer, b, 1);
+
+	// uid
+	emlSetMem((uint8_t *)uid, 0, 1);
+	return;
+}
+
+
+// Mifare desfire commands
+int mifare_sendcmd_special(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t* data, uint8_t* answer, uint8_t *answer_parity, uint32_t *timing) {
+    uint8_t dcmd[5] = {cmd, data[0], data[1], 0x00, 0x00};
+	AddCrc14A(dcmd, 3);
+	
+	ReaderTransmit(dcmd, sizeof(dcmd), NULL);
+	int len = ReaderReceive(answer, answer_parity);
+	if(!len) {
+		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication failed. Card timeout.");
+		return 1;
+    }
+	return len;
+}
+
+int mifare_sendcmd_special2(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t* data, uint8_t* answer,uint8_t *answer_parity, uint32_t *timing) {
+    uint8_t dcmd[20] = {0x00};
+    dcmd[0] = cmd;
+    memcpy(dcmd+1,data,17);
+	AddCrc14A(dcmd, 18);
+
+	ReaderTransmit(dcmd, sizeof(dcmd), NULL);
+	int len = ReaderReceive(answer, answer_parity);
+	if(!len){
+        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication failed. Card timeout.");
+		return 1;
+    }
+	return len;
+}
+
+int mifare_desfire_des_auth1(uint32_t uid, uint8_t *blockData){
+
+	int len;
+	// load key, keynumber
+	uint8_t data[2]={MFDES_AUTHENTICATE, 0x00};
+	uint8_t receivedAnswer[MAX_FRAME_SIZE] = {0x00};
+	uint8_t receivedAnswerPar[MAX_PARITY_SIZE] = {0x00};
+	
+	len = mifare_sendcmd_special(NULL, 1, 0x02, data, receivedAnswer,receivedAnswerPar,NULL);
+	if (len == 1) {
+		if (MF_DBGLEVEL >= MF_DBG_ERROR)
+			Dbprintf("Cmd Error: %02x", receivedAnswer[0]);
+		return 1;
+	}
+	
+	if (len == 12) {
+		if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	{
+			Dbprintf("Auth1 Resp: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
+				receivedAnswer[0],receivedAnswer[1],receivedAnswer[2],receivedAnswer[3],receivedAnswer[4],
+				receivedAnswer[5],receivedAnswer[6],receivedAnswer[7],receivedAnswer[8],receivedAnswer[9],
+				receivedAnswer[10],receivedAnswer[11]);
+			}
+			memcpy(blockData, receivedAnswer, 12);
+	        return 0;
+	}
+	return 1;
+}
+
+int mifare_desfire_des_auth2(uint32_t uid, uint8_t *key, uint8_t *blockData){
+
+	int len;
+	uint8_t data[17] = {MFDES_AUTHENTICATION_FRAME};
+	memcpy(data+1,key,16);
+	
+	uint8_t receivedAnswer[MAX_FRAME_SIZE] = {0x00};
+	uint8_t receivedAnswerPar[MAX_PARITY_SIZE] = {0x00};
+	
+	len = mifare_sendcmd_special2(NULL, 1, 0x03, data, receivedAnswer, receivedAnswerPar ,NULL);
+	
+	if ((receivedAnswer[0] == 0x03) && (receivedAnswer[1] == 0xae)) {
+		if (MF_DBGLEVEL >= MF_DBG_ERROR)
+			Dbprintf("Auth Error: %02x %02x", receivedAnswer[0], receivedAnswer[1]);
+		return 1;
+	}
+	
+	if (len == 12){
+		if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
+			Dbprintf("Auth2 Resp: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
+				receivedAnswer[0],receivedAnswer[1],receivedAnswer[2],receivedAnswer[3],receivedAnswer[4],
+				receivedAnswer[5],receivedAnswer[6],receivedAnswer[7],receivedAnswer[8],receivedAnswer[9],
+				receivedAnswer[10],receivedAnswer[11]);
+			}
+		memcpy(blockData, receivedAnswer, 12);
+		return 0;
+	}
+	return 1;
+}
diff --git a/armsrc/mifareutil.h b/armsrc/mifareutil.h
index 268149f60..2406f9068 100644
--- a/armsrc/mifareutil.h
+++ b/armsrc/mifareutil.h
@@ -1,106 +1,106 @@
-//-----------------------------------------------------------------------------
-// Merlok, May 2011
-// Many authors, that makes it possible
-//
-// This code is licensed to you under the terms of the GNU GPL, version 2 or,
-// at your option, any later version. See the LICENSE.txt file for the text of
-// the license.
-//-----------------------------------------------------------------------------
-// code for work with mifare cards.
-//-----------------------------------------------------------------------------
-
-#ifndef __MIFAREUTIL_H
-#define __MIFAREUTIL_H
-
-#include "proxmark3.h"
-#include "apps.h"
-#include "parity.h"
-#include "util.h"
-#include "string.h"
-#include "iso14443crc.h"
-#include "iso14443a.h"
-#include "crapto1/crapto1.h"
-#include "des.h"
-#include "random.h"			// fast_prand, prand
-
-// mifare authentication
-#define CRYPT_NONE    0
-#define CRYPT_ALL     1
-#define CRYPT_REQUEST 2
-#define AUTH_FIRST    0	
-#define AUTH_NESTED   2
-
-#define AUTHENTICATION_TIMEOUT 848			// card times out 1ms after wrong authentication (according to NXP documentation)
-#define PRE_AUTHENTICATION_LEADTIME 400		// some (non standard) cards need a pause after select before they are ready for first authentication
-
-// mifare 4bit card answers
-#define CARD_ACK      0x0A  // 1010 - ACK
-#define CARD_NACK_NA  0x04  // 0100 - NACK, not allowed (command not allowed)
-#define CARD_NACK_TR  0x05  // 0101 - NACK, transmission error
-
-
-
-//mifare emulator states
-#define MFEMUL_NOFIELD      0
-#define MFEMUL_IDLE         1
-#define MFEMUL_SELECT1      2
-#define MFEMUL_SELECT2      3
-#define MFEMUL_SELECT3      4
-#define MFEMUL_AUTH1        5
-#define MFEMUL_AUTH2        6
-#define MFEMUL_WORK	        7
-#define MFEMUL_WRITEBL2     8
-#define MFEMUL_INTREG_INC   9
-#define MFEMUL_INTREG_DEC   10
-#define MFEMUL_INTREG_REST  11
-#define MFEMUL_HALTED       12
-
-#define cardSTATE_TO_IDLE() cardSTATE = MFEMUL_IDLE; LED_B_OFF(); LED_C_OFF();
-
+//-----------------------------------------------------------------------------
+// Merlok, May 2011
+// Many authors, that makes it possible
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// code for work with mifare cards.
+//-----------------------------------------------------------------------------
+
+#ifndef __MIFAREUTIL_H
+#define __MIFAREUTIL_H
+
+#include "proxmark3.h"
+#include "apps.h"
+#include "parity.h"
+#include "util.h"
+#include "string.h"
+#include "iso14443crc.h"
+#include "iso14443a.h"
+#include "crapto1/crapto1.h"
+#include "des.h"
+#include "random.h"			// fast_prand, prand
+
+// mifare authentication
+#define CRYPT_NONE    0
+#define CRYPT_ALL     1
+#define CRYPT_REQUEST 2
+#define AUTH_FIRST    0	
+#define AUTH_NESTED   2
+
+#define AUTHENTICATION_TIMEOUT 848			// card times out 1ms after wrong authentication (according to NXP documentation)
+#define PRE_AUTHENTICATION_LEADTIME 400		// some (non standard) cards need a pause after select before they are ready for first authentication
+
+// mifare 4bit card answers
+#define CARD_ACK      0x0A  // 1010 - ACK
+#define CARD_NACK_NA  0x04  // 0100 - NACK, not allowed (command not allowed)
+#define CARD_NACK_TR  0x05  // 0101 - NACK, transmission error
+
+
+
+//mifare emulator states
+#define MFEMUL_NOFIELD      0
+#define MFEMUL_IDLE         1
+#define MFEMUL_SELECT1      2
+#define MFEMUL_SELECT2      3
+#define MFEMUL_SELECT3      4
+#define MFEMUL_AUTH1        5
+#define MFEMUL_AUTH2        6
+#define MFEMUL_WORK	        7
+#define MFEMUL_WRITEBL2     8
+#define MFEMUL_INTREG_INC   9
+#define MFEMUL_INTREG_DEC   10
+#define MFEMUL_INTREG_REST  11
+#define MFEMUL_HALTED       12
+
+#define cardSTATE_TO_IDLE() cardSTATE = MFEMUL_IDLE; LED_B_OFF(); LED_C_OFF();
+
 //functions
-int mifare_sendcmd(uint8_t cmd, uint8_t *data, uint8_t data_size, uint8_t* answer, uint8_t *answer_parity, uint32_t *timing);
+int mifare_sendcmd(uint8_t cmd, uint8_t *data, uint8_t data_size, uint8_t* answer, uint8_t *answer_parity, uint32_t *timing);
 int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t data, uint8_t* answer, uint8_t *answer_parity, uint32_t *timing);
 
-// mifare classic
-int mifare_classic_auth(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint8_t isNested);
+// mifare classic
+int mifare_classic_auth(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint8_t isNested);
 int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint8_t isNested, uint32_t * ntptr, uint32_t *timing);
-int mifare_classic_readblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData);
-int mifare_classic_halt(struct Crypto1State *pcs, uint32_t uid); 
-int mifare_classic_halt_ex(struct Crypto1State *pcs);
-int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData);
-
-// Ultralight/NTAG...
-int mifare_ul_ev1_auth(uint8_t *key, uint8_t *pack);
-int mifare_ultra_auth(uint8_t *key);
-int mifare_ultra_readblock(uint8_t blockNo, uint8_t *blockData);
+int mifare_classic_readblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData);
+int mifare_classic_halt(struct Crypto1State *pcs, uint32_t uid); 
+int mifare_classic_halt_ex(struct Crypto1State *pcs);
+int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData);
+
+// Ultralight/NTAG...
+int mifare_ul_ev1_auth(uint8_t *key, uint8_t *pack);
+int mifare_ultra_auth(uint8_t *key);
+int mifare_ultra_readblock(uint8_t blockNo, uint8_t *blockData);
 //int mifare_ultra_writeblock_compat(uint8_t blockNo, uint8_t *blockData);
 int mifare_ultra_writeblock(uint8_t blockNo, uint8_t *blockData);
 int mifare_ultra_halt();
-
-// desfire
-int mifare_sendcmd_special(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t* data, uint8_t* answer, uint8_t *answer_parity, uint32_t *timing);
-int mifare_sendcmd_special2(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t* data, uint8_t* answer,uint8_t *answer_parity, uint32_t *timing);
-int mifare_desfire_des_auth1(uint32_t uid, uint8_t *blockData);
-int mifare_desfire_des_auth2(uint32_t uid, uint8_t *key, uint8_t *blockData);
+
+// desfire
+int mifare_sendcmd_special(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t* data, uint8_t* answer, uint8_t *answer_parity, uint32_t *timing);
+int mifare_sendcmd_special2(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t* data, uint8_t* answer,uint8_t *answer_parity, uint32_t *timing);
+int mifare_desfire_des_auth1(uint32_t uid, uint8_t *blockData);
+int mifare_desfire_des_auth2(uint32_t uid, uint8_t *key, uint8_t *blockData);
 
 // crypto functions
 void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *receivedCmd, int len);
-void mf_crypto1_decryptEx(struct Crypto1State *pcs, uint8_t *data_in, int len, uint8_t *data_out);
-void mf_crypto1_encrypt(struct Crypto1State *pcs, uint8_t *data, uint16_t len, uint8_t *par);
-uint8_t mf_crypto1_encrypt4bit(struct Crypto1State *pcs, uint8_t data);
-
-// Mifare memory structure
-uint8_t NumBlocksPerSector(uint8_t sectorNo);
-uint8_t FirstBlockOfSector(uint8_t sectorNo);
-
-// emulator functions
-void emlClearMem(void);
-void emlSetMem(uint8_t *data, int blockNum, int blocksCount);
-void emlSetMem_xt(uint8_t *data, int blockNum, int blocksCount, int blockBtWidth);
-void emlGetMem(uint8_t *data, int blockNum, int blocksCount);
-void emlGetMemBt(uint8_t *data, int bytePtr, int byteCount);
-uint64_t emlGetKey(int sectorNum, int keyType);
-int emlGetValBl(uint32_t *blReg, uint8_t *blBlock, int blockNum);
+void mf_crypto1_decryptEx(struct Crypto1State *pcs, uint8_t *data_in, int len, uint8_t *data_out);
+void mf_crypto1_encrypt(struct Crypto1State *pcs, uint8_t *data, uint16_t len, uint8_t *par);
+uint8_t mf_crypto1_encrypt4bit(struct Crypto1State *pcs, uint8_t data);
+
+// Mifare memory structure
+uint8_t NumBlocksPerSector(uint8_t sectorNo);
+uint8_t FirstBlockOfSector(uint8_t sectorNo);
+
+// emulator functions
+void emlClearMem(void);
+void emlSetMem(uint8_t *data, int blockNum, int blocksCount);
+void emlSetMem_xt(uint8_t *data, int blockNum, int blocksCount, int blockBtWidth);
+void emlGetMem(uint8_t *data, int blockNum, int blocksCount);
+void emlGetMemBt(uint8_t *data, int bytePtr, int byteCount);
+uint64_t emlGetKey(int sectorNum, int keyType);
+int emlGetValBl(uint32_t *blReg, uint8_t *blBlock, int blockNum);
 int emlSetValBl(uint32_t blReg, uint8_t blBlock, int blockNum);
 int emlCheckValBl(int blockNum);
 
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 4dd3b4b3e..da027aad6 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -1,3472 +1,3472 @@
-//-----------------------------------------------------------------------------
-// Copyright (C) 2011,2012 Merlok
-//
-// This code is licensed to you under the terms of the GNU GPL, version 2 or,
-// at your option, any later version. See the LICENSE.txt file for the text of
-// the license.
-//-----------------------------------------------------------------------------
-// High frequency MIFARE commands
-//-----------------------------------------------------------------------------
-
-#include "cmdhfmf.h"
-#include "mifare/mifare4.h"
-#include "mifare/mad.h"
-#include "mifare/ndef.h"
-
-
-#define MFBLOCK_SIZE 16
-
-#define MIFARE_4K_MAXBLOCK 256
-#define MIFARE_2K_MAXBLOCK 128 
-#define MIFARE_1K_MAXBLOCK 64
-#define MIFARE_MINI_MAXBLOCK 20
-
-#define MIFARE_MINI_MAXSECTOR 5
-#define MIFARE_1K_MAXSECTOR 16
-#define MIFARE_2K_MAXSECTOR 32
-#define MIFARE_4K_MAXSECTOR 40
-
-static int CmdHelp(const char *Cmd);
-
-int usage_hf14_ice(void){
-		PrintAndLogEx(NORMAL, "Usage:   hf mf ice [l] <limit> [f] <name>");
-		PrintAndLogEx(NORMAL, "  h            this help");
-		PrintAndLogEx(NORMAL, "  l <limit>    nonces to be collected");
-		PrintAndLogEx(NORMAL, "  f <name>     save nonces to <name> instead of hf-mf-<UID>-nonces.bin");
-		PrintAndLogEx(NORMAL, "");
-		PrintAndLogEx(NORMAL, "Examples:");
-		PrintAndLogEx(NORMAL, "         hf mf ice");
-		PrintAndLogEx(NORMAL, "         hf mf ice f nonces.bin");
-		return 0;
-}
-
-int usage_hf14_dump(void){
-		PrintAndLogEx(NORMAL, "Usage:   hf mf dump [card memory] k <name> f <name>");
-		PrintAndLogEx(NORMAL, "  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");
-		PrintAndLogEx(NORMAL, "  k <name>     : key filename, if no <name> given, UID will be used as filename");
-		PrintAndLogEx(NORMAL, "  f <name>     : data filename, if no <name> given, UID will be used as filename");
-		PrintAndLogEx(NORMAL, "");
-		PrintAndLogEx(NORMAL, "Examples:");
-		PrintAndLogEx(NORMAL, "         hf mf dump");
-		PrintAndLogEx(NORMAL, "         hf mf dump 4");
-		return 0;
-}
-
-int usage_hf14_mifare(void){
-	PrintAndLogEx(NORMAL, "Usage:  hf mf darkside [h] <block number> <A|B>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h               this help");
-	PrintAndLogEx(NORMAL, "      <block number>  (Optional) target other block");
-	PrintAndLogEx(NORMAL, "      <A|B>           (optional) target key type");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "           hf mf darkside");
-	PrintAndLogEx(NORMAL, "           hf mf darkside 16");
-	PrintAndLogEx(NORMAL, "           hf mf darkside 16 B");
-	return 0;
-}
-int usage_hf14_mf1ksim(void){
-	PrintAndLogEx(NORMAL, "Usage:  hf mf sim [h] u <uid> n <numreads> [i] [x] [e] [v]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h    this help");
-	PrintAndLogEx(NORMAL, "      u    (Optional) UID 4,7 or 10bytes. If not specified, the UID 4b from emulator memory will be used");
-	PrintAndLogEx(NORMAL, "      n    (Optional) Automatically exit simulation after <numreads> blocks have been read by reader. 0 = infinite");
-	PrintAndLogEx(NORMAL, "      i    (Optional) Interactive, means that console will not be returned until simulation finishes or is aborted");
-	PrintAndLogEx(NORMAL, "      x    (Optional) Crack, performs the 'reader attack', nr/ar attack against a reader");
-	PrintAndLogEx(NORMAL, "      e    (Optional) Fill simulator keys from found keys");
-	PrintAndLogEx(NORMAL, "      v    (Optional) Verbose");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "           hf mf sim u 0a0a0a0a");
-	PrintAndLogEx(NORMAL, "           hf mf sim u 11223344556677");
-	PrintAndLogEx(NORMAL, "           hf mf sim u 112233445566778899AA");	
-	PrintAndLogEx(NORMAL, "           hf mf sim u 11223344 i x");	
-	return 0;
-}
-int usage_hf14_dbg(void){
-	PrintAndLogEx(NORMAL, "Usage:  hf mf dbg [h] <debug level>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "           h    this help");	
-	PrintAndLogEx(NORMAL, "       <debug level>  (Optional) see list for valid levels");
-	PrintAndLogEx(NORMAL, "           0 - no debug messages");
-	PrintAndLogEx(NORMAL, "           1 - error messages");
-	PrintAndLogEx(NORMAL, "           2 - plus information messages");
-	PrintAndLogEx(NORMAL, "           3 - plus debug messages");
-	PrintAndLogEx(NORMAL, "           4 - print even debug messages in timing critical functions");
-	PrintAndLogEx(NORMAL, "               Note: this option therefore may cause malfunction itself");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "           hf mf dbg 3");
-	return 0;
-}
-int usage_hf14_sniff(void){
-	PrintAndLogEx(NORMAL, "It continuously gets data from the field and saves it to: log, emulator, emulator file.");
-	PrintAndLogEx(NORMAL, "Usage:  hf mf sniff [h] [l] [d] [f]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h    this help");
-	PrintAndLogEx(NORMAL, "      l    save encrypted sequence to logfile `uid.log`");
-	PrintAndLogEx(NORMAL, "      d    decrypt sequence and put it to log file `uid.log`");
-//	PrintAndLogEx(NORMAL, " n/a  e     decrypt sequence, collect read and write commands and save the result of the sequence to emulator memory");
-	PrintAndLogEx(NORMAL, "      f    decrypt sequence, collect read and write commands and save the result of the sequence to emulator dump file `uid.eml`");
-	PrintAndLogEx(NORMAL, "Example:");
-	PrintAndLogEx(NORMAL, "           hf mf sniff l d f");
-	return 0;
-}
-int usage_hf14_nested(void){
-	PrintAndLogEx(NORMAL, "Usage:");
-	PrintAndLogEx(NORMAL, " all sectors:  hf mf nested  <card memory> <block number> <key A/B> <key (12 hex symbols)> [t,d]");
-	PrintAndLogEx(NORMAL, " one sector:   hf mf nested  o <block number> <key A/B> <key (12 hex symbols)>");
-	PrintAndLogEx(NORMAL, "               <target block number> <target key A/B> [t]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h    this help");
-	PrintAndLogEx(NORMAL, "      card memory - 0 - MINI(320 bytes), 1 - 1K, 2 - 2K, 4 - 4K, <other> - 1K");
-	PrintAndLogEx(NORMAL, "      t    transfer keys into emulator memory");
-	PrintAndLogEx(NORMAL, "      d    write keys to binary file `hf-mf-<UID>-key.bin`");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      hf mf nested 1 0 A FFFFFFFFFFFF ");
-	PrintAndLogEx(NORMAL, "      hf mf nested 1 0 A FFFFFFFFFFFF t ");
-	PrintAndLogEx(NORMAL, "      hf mf nested 1 0 A FFFFFFFFFFFF d ");
-	PrintAndLogEx(NORMAL, "      hf mf nested o 0 A FFFFFFFFFFFF 4 A");
-	return 0;
-}
-int usage_hf14_hardnested(void){
-	PrintAndLogEx(NORMAL, "Usage:");
-	PrintAndLogEx(NORMAL, "      hf mf hardnested <block number> <key A|B> <key (12 hex symbols)>");
-	PrintAndLogEx(NORMAL, "                       <target block number> <target key A|B> [known target key (12 hex symbols)] [w] [s]");
-	PrintAndLogEx(NORMAL, "  or  hf mf hardnested r [known target key]");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h         this help");	
-	PrintAndLogEx(NORMAL, "      w         acquire nonces and UID, and write them to binary file with default name hf-mf-<UID>-nonces.bin");
-	PrintAndLogEx(NORMAL, "      s         slower acquisition (required by some non standard cards)");
-	PrintAndLogEx(NORMAL, "      r         read hf-mf-<UID>-nonces.bin if tag present, otherwise read nonces.bin, then start attack");
-	PrintAndLogEx(NORMAL, "      u <UID>   read/write hf-mf-<UID>-nonces.bin instead of default name");
-	PrintAndLogEx(NORMAL, "      f <name>  read/write <name> instead of default name");
-	PrintAndLogEx(NORMAL, "      t         tests?");
-	PrintAndLogEx(NORMAL, "      i <X>     set type of SIMD instructions. Without this flag programs autodetect it.");
-	PrintAndLogEx(NORMAL, "        i 5   = AVX512");
-	PrintAndLogEx(NORMAL, "        i 2   = AVX2");
-	PrintAndLogEx(NORMAL, "        i a   = AVX");
-	PrintAndLogEx(NORMAL, "        i s   = SSE2");
-	PrintAndLogEx(NORMAL, "        i m   = MMX");
-	PrintAndLogEx(NORMAL, "        i n   = none (use CPU regular instruction set)");	
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      hf mf hardnested 0 A FFFFFFFFFFFF 4 A");
-	PrintAndLogEx(NORMAL, "      hf mf hardnested 0 A FFFFFFFFFFFF 4 A w");
-	PrintAndLogEx(NORMAL, "      hf mf hardnested 0 A FFFFFFFFFFFF 4 A f nonces.bin w s");
-	PrintAndLogEx(NORMAL, "      hf mf hardnested r");
-	PrintAndLogEx(NORMAL, "      hf mf hardnested r a0a1a2a3a4a5");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Add the known target key to check if it is present in the remaining key space:");
-	PrintAndLogEx(NORMAL, "      hf mf hardnested 0 A A0A1A2A3A4A5 4 A FFFFFFFFFFFF");
-	return 0;
-}
-int usage_hf14_chk(void){
-	PrintAndLogEx(NORMAL, "Usage:  hf mf chk [h] <block number>|<*card memory> <key type (A/B/?)> [t|d] [<key (12 hex symbols)>] [<dic (*.dic)>]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h    this help");	
-	PrintAndLogEx(NORMAL, "      *    all sectors based on card memory, other values then below defaults to 1k");
-	PrintAndLogEx(NORMAL, "      			0 - MINI(320 bytes)");
-	PrintAndLogEx(NORMAL, "      			1 - 1K");
-	PrintAndLogEx(NORMAL, "      			2 - 2K");
-	PrintAndLogEx(NORMAL, "      			4 - 4K");
-	PrintAndLogEx(NORMAL, "      d    write keys to binary file");
-	PrintAndLogEx(NORMAL, "      t    write keys to emulator memory\n");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      hf mf chk 0 A 1234567890ab keys.dic     -- target block 0, Key A");
-	PrintAndLogEx(NORMAL, "      hf mf chk *1 ? t                        -- target all blocks, all keys, 1K, write to emul");
-	PrintAndLogEx(NORMAL, "      hf mf chk *1 ? d                        -- target all blocks, all keys, 1K, write to file");
-	return 0;
-}
-int usage_hf14_chk_fast(void){
-	PrintAndLogEx(NORMAL, "This is a improved checkkeys method speedwise. It checks Mifare Classic tags sector keys against a dictionary file with keys");
-	PrintAndLogEx(NORMAL, "Usage:  hf mf fchk [h] <card memory> [t|d|f] [<key (12 hex symbols)>] [<dic (*.dic)>]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h    this help");	
-	PrintAndLogEx(NORMAL, "      <cardmem> all sectors based on card memory, other values than below defaults to 1k");
-	PrintAndLogEx(NORMAL, "      			 0 - MINI(320 bytes)");
-	PrintAndLogEx(NORMAL, "      			 1 - 1K   <default>");
-	PrintAndLogEx(NORMAL, "      			 2 - 2K");
-	PrintAndLogEx(NORMAL, "      			 4 - 4K");
-	PrintAndLogEx(NORMAL, "      d    write keys to binary file");
-	PrintAndLogEx(NORMAL, "      t    write keys to emulator memory");
-	PrintAndLogEx(NORMAL, "      m    use dictionary from flashmemory\n");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      hf mf fchk 1 1234567890ab keys.dic    -- target 1K using key 1234567890ab, using dictionary file");
-	PrintAndLogEx(NORMAL, "      hf mf fchk 1 t                        -- target 1K, write to emulator memory");
-	PrintAndLogEx(NORMAL, "      hf mf fchk 1 d                        -- target 1K, write to file");
-#ifdef WITH_FLASH
-	PrintAndLogEx(NORMAL, "      hf mf fchk 1 m                        -- target 1K, use dictionary from flashmemory");
-#endif
-	return 0;
-}
-int usage_hf14_keybrute(void){
-	PrintAndLogEx(NORMAL, "J_Run's 2nd phase of multiple sector nested authentication key recovery");
-	PrintAndLogEx(NORMAL, "You have a known 4 last bytes of a key recovered with mf_nonce_brute tool.");
-	PrintAndLogEx(NORMAL, "First 2 bytes of key will be bruteforced");	
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, " ---[ This attack is obsolete,  try hardnested instead ]---");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  hf mf keybrute [h] <block number> <A|B> <key>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h               this help");
-	PrintAndLogEx(NORMAL, "      <block number>  target block number");
-	PrintAndLogEx(NORMAL, "      <A|B>           target key type");
-	PrintAndLogEx(NORMAL, "      <key>           candidate key from mf_nonce_brute tool");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "           hf mf keybrute 1 A 000011223344");
-	return 0;
-}
-int usage_hf14_restore(void){
-	PrintAndLogEx(NORMAL, "Usage:   hf mf restore [card memory] u <UID> k <name> f <name>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");
-	PrintAndLogEx(NORMAL, "  u <UID>      : uid, try to restore from hf-mf-<UID>-key.bin and hf-mf-<UID>-data.bin");
-	PrintAndLogEx(NORMAL, "  k <name>     : key filename, specific the full filename of key file");
-	PrintAndLogEx(NORMAL, "  f <name>     : data filename, specific the full filename of data file");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "         hf mf restore                            -- read the UID from tag first, then restore from hf-mf-<UID>-key.bin and and hf-mf-<UID>-data.bin");
-	PrintAndLogEx(NORMAL, "         hf mf restore 1 u 12345678               -- restore from hf-mf-12345678-key.bin and hf-mf-12345678-data.bin");
-	PrintAndLogEx(NORMAL, "         hf mf restore 1 u 12345678 k dumpkey.bin -- restore from dumpkey.bin and hf-mf-12345678-data.bin");
-	PrintAndLogEx(NORMAL, "         hf mf restore 4                          -- read the UID from tag with 4K memory first, then restore from hf-mf-<UID>-key.bin and and hf-mf-<UID>-data.bin");
-	return 0;
-}
-int usage_hf14_decryptbytes(void){
-	PrintAndLogEx(NORMAL, "Decrypt Crypto-1 encrypted bytes given some known state of crypto. See tracelog to gather needed values\n");
-	PrintAndLogEx(NORMAL, "Usage:   hf mf decrypt [h] <nt> <ar_enc> <at_enc> <data>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h            this help");
-	PrintAndLogEx(NORMAL, "      <nt>         reader nonce");
-	PrintAndLogEx(NORMAL, "      <ar_enc>     encrypted reader response");
-	PrintAndLogEx(NORMAL, "      <at_enc>     encrypted tag response");
-	PrintAndLogEx(NORMAL, "      <data>       encrypted data, taken directly after at_enc and forward");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "         hf mf decrypt b830049b 9248314a 9280e203 41e586f9\n");
-	PrintAndLogEx(NORMAL, "  this sample decrypts 41e586f9 -> 3003999a  Annotated: 30 03 [99 9a]  auth block 3 [crc]");
-	return 0;
-}
-
-int usage_hf14_eget(void){
-	PrintAndLogEx(NORMAL, "Usage:  hf mf eget <block number>");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        hf mf eget 0 ");
-	return 0;
-}
-int usage_hf14_eclr(void){
-	PrintAndLogEx(NORMAL, "It set card emulator memory to empty data blocks and key A/B FFFFFFFFFFFF \n");
-	PrintAndLogEx(NORMAL, "Usage:  hf mf eclr");
-	return 0;
-}
-int usage_hf14_eset(void){
-	PrintAndLogEx(NORMAL, "Usage:  hf mf eset <block number> <block data (32 hex symbols)>");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        hf mf eset 1 000102030405060708090a0b0c0d0e0f ");	
-	return 0;
-}
-int usage_hf14_eload(void){
-	PrintAndLogEx(NORMAL, "It loads emul dump from the file `filename.eml`");
-	PrintAndLogEx(NORMAL, "Usage:  hf mf eload [card memory] <file name w/o `.eml`> [numblocks]");
-	PrintAndLogEx(NORMAL, "  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K, u = UL");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        hf mf eload filename");
-	PrintAndLogEx(NORMAL, "        hf mf eload 4 filename");	
-	return 0;
-}
-int usage_hf14_esave(void){
-	PrintAndLogEx(NORMAL, "It saves emul dump into the file `filename.eml` or `cardID.eml`");
-	PrintAndLogEx(NORMAL, " Usage:  hf mf esave [card memory] [file name w/o `.eml`]");
-	PrintAndLogEx(NORMAL, "  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        hf mf esave ");
-	PrintAndLogEx(NORMAL, "        hf mf esave 4");
-	PrintAndLogEx(NORMAL, "        hf mf esave 4 filename");	
-	return 0;
-}
-int usage_hf14_ecfill(void){
-	PrintAndLogEx(NORMAL, "Read card and transfer its data to emulator memory.");
-	PrintAndLogEx(NORMAL, "Keys must be laid in the emulator memory. \n");
-	PrintAndLogEx(NORMAL, "Usage:  hf mf ecfill <key A/B> [card memory]");
-	PrintAndLogEx(NORMAL, "  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        hf mf ecfill A");
-	PrintAndLogEx(NORMAL, "        hf mf ecfill A 4");
-	return 0;
-}
-int usage_hf14_ekeyprn(void){
-	PrintAndLogEx(NORMAL, "It prints the keys loaded in the emulator memory");
-	PrintAndLogEx(NORMAL, "Usage:  hf mf ekeyprn [card memory]");
-	PrintAndLogEx(NORMAL, "  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        hf mf ekeyprn 1");	
-	return 0;
-}
-
-int usage_hf14_csetuid(void){
-	PrintAndLogEx(NORMAL, "Set UID, ATQA, and SAK for magic Chinese card. Only works with magic cards");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  hf mf csetuid [h] <UID 8 hex symbols> [ATQA 4 hex symbols] [SAK 2 hex symbols] [w]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h        this help");
-	PrintAndLogEx(NORMAL, "       w        wipe card before writing");
-	PrintAndLogEx(NORMAL, "       <uid>    UID 8 hex symbols");
-	PrintAndLogEx(NORMAL, "       <atqa>   ATQA 4 hex symbols");
-	PrintAndLogEx(NORMAL, "       <sak>    SAK 2 hex symbols");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      hf mf csetuid 01020304");
-	PrintAndLogEx(NORMAL, "      hf mf csetuid 01020304 0004 08 w");
-	return 0;
-}
-int usage_hf14_csetblk(void){
-	PrintAndLogEx(NORMAL, "Set block data for magic Chinese card. Only works with magic cards");
-	PrintAndLogEx(NORMAL, "");		
-	PrintAndLogEx(NORMAL, "Usage:  hf mf csetblk [h] <block number> <block data (32 hex symbols)> [w]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h         this help");
-	PrintAndLogEx(NORMAL, "       w         wipe card before writing");
-	PrintAndLogEx(NORMAL, "       <block>   block number");
-	PrintAndLogEx(NORMAL, "       <data>    block data to write (32 hex symbols)");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "       hf mf csetblk 1 01020304050607080910111213141516");
-	PrintAndLogEx(NORMAL, "       hf mf csetblk 1 01020304050607080910111213141516 w");
-	return 0;
-}
-int usage_hf14_cload(void){
-	PrintAndLogEx(NORMAL, "It loads magic Chinese card from the file `filename.eml`");
-	PrintAndLogEx(NORMAL, "or from emulator memory");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  hf mf cload [h] [e] <file name w/o `.eml`>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h            this help");
-	PrintAndLogEx(NORMAL, "       e            load card with data from emulator memory");
-	PrintAndLogEx(NORMAL, "       j <filename> load card with data from json file");
-	PrintAndLogEx(NORMAL, "       b <filename> load card with data from binary file");
-	PrintAndLogEx(NORMAL, "       <filename>   load card with data from eml file");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "       hf mf cload mydump");
-	PrintAndLogEx(NORMAL, "       hf mf cload e");	
-	return 0;
-}
-int usage_hf14_cgetblk(void){
-	PrintAndLogEx(NORMAL, "Get block data from magic Chinese card. Only works with magic cards\n");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  hf mf cgetblk [h] <block number>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h         this help");
-	PrintAndLogEx(NORMAL, "      <block>   block number");		
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      hf mf cgetblk 1");	
-	return 0;
-}
-int usage_hf14_cgetsc(void){
-	PrintAndLogEx(NORMAL, "Get sector data from magic Chinese card. Only works with magic cards\n");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  hf mf cgetsc [h] <sector number>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h          this help");
-	PrintAndLogEx(NORMAL, "      <sector>   sector number");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      hf mf cgetsc 0");
-	return 0;
-}
-int usage_hf14_csave(void){
-	PrintAndLogEx(NORMAL, "It saves `magic Chinese` card dump into the file `filename.eml` or `cardID.eml`");
-	PrintAndLogEx(NORMAL, "or into emulator memory");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  hf mf csave [h] [e] [u] [card memory] i <file name w/o `.eml`>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h             this help");
-	PrintAndLogEx(NORMAL, "       e             save data to emulator memory");
-	PrintAndLogEx(NORMAL, "       u             save data to file, use carduid as filename");	
-	PrintAndLogEx(NORMAL, "       card memory   0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");
-	PrintAndLogEx(NORMAL, "       o <filename>  save data to file");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "       hf mf csave u 1");
-	PrintAndLogEx(NORMAL, "       hf mf csave e 1");
-	PrintAndLogEx(NORMAL, "       hf mf csave 4 o filename");
-	return 0;
-}
-int usage_hf14_nack(void) {
-	PrintAndLogEx(NORMAL, "Test a mifare classic based card for the NACK bug.");
-	PrintAndLogEx(NORMAL, "");	
-	PrintAndLogEx(NORMAL, "Usage:  hf mf nack [h] [v]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h             this help");
-	PrintAndLogEx(NORMAL, "       v             verbose");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "       hf mf nack");
-	return 0;
-}
-
-int GetHFMF14AUID(uint8_t *uid, int *uidlen) {
-	UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT, 0, 0}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	UsbCommand resp;
-	if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
-		PrintAndLogEx(WARNING, "iso14443a card select failed");
-		DropField();
-		return 0;
-	}
-	
-	iso14a_card_select_t card;
-	memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
-	memcpy(uid, card.uid, card.uidlen * sizeof(uint8_t));
-	*uidlen = card.uidlen;
-	return 1;
-}
-
-char * GenerateFilename(const char *prefix, const char *suffix){
-	uint8_t uid[10] = {0,0,0,0,0,0,0,0,0,0};
-	int uidlen=0;
-	char * fptr = calloc (sizeof (char) * (strlen(prefix) + strlen(suffix)) + sizeof(uid)*2 + 1,  sizeof(uint8_t));
-	
-	GetHFMF14AUID(uid, &uidlen);
-	if (!uidlen) {
-		PrintAndLogEx(WARNING, "No tag found.");
-		free(fptr);
-		return NULL;
-	}
-	
-	strcpy(fptr, prefix);	
-	FillFileNameByUID(fptr, uid, suffix, uidlen);
-	return fptr;
-}
-
-int CmdHF14AMfDarkside(const char *Cmd) {
-	uint8_t blockno = 0, key_type = MIFARE_AUTH_KEYA;
-	uint64_t key = 0;
-	
-	char cmdp = tolower(param_getchar(Cmd, 0));	
-	if ( cmdp == 'h' ) return usage_hf14_mifare();
-	
-	blockno = param_get8(Cmd, 0);	 
-	
-	cmdp = tolower(param_getchar(Cmd, 1));
-	if (cmdp == 'b')
-		key_type = MIFARE_AUTH_KEYB;
-
-	int isOK = mfDarkside(blockno, key_type, &key);
-	PrintAndLogEx(NORMAL, "");
-	switch (isOK) {
-		case -1 : PrintAndLogEx(WARNING, "button pressed. Aborted."); return 1;
-		case -2 : PrintAndLogEx(FAILED, "card is not vulnerable to Darkside attack (doesn't send NACK on authentication requests)."); return 1;
-		case -3 : PrintAndLogEx(FAILED, "card is not vulnerable to Darkside attack (its random number generator is not predictable)."); return 1;
-		case -4 : PrintAndLogEx(FAILED, "card is not vulnerable to Darkside attack (its random number generator seems to be based on the wellknown");
-				  PrintAndLogEx(FAILED, "generating polynomial with 16 effective bits only, but shows unexpected behaviour."); return 1;
-		case -5 : PrintAndLogEx(WARNING, "aborted via keyboard.");  return 1;
-		default : PrintAndLogEx(SUCCESS, "found valid key: %012" PRIx64 "\n", key); break;
-	}
-	PrintAndLogEx(NORMAL, "");
-	return 0;
-}
-
-int CmdHF14AMfWrBl(const char *Cmd) {
-	uint8_t blockNo = 0;
-	uint8_t keyType = 0;
-	uint8_t key[6] = {0, 0, 0, 0, 0, 0};
-	uint8_t bldata[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-	char cmdp	= 0x00;
-
-	if (strlen(Cmd) < 3) {
-		PrintAndLogEx(NORMAL, "Usage:  hf mf wrbl    <block number> <key A/B> <key (12 hex symbols)> <block data (32 hex symbols)>");
-		PrintAndLogEx(NORMAL, "Examples:");
-		PrintAndLogEx(NORMAL, "        hf mf wrbl 0 A FFFFFFFFFFFF 000102030405060708090A0B0C0D0E0F");
-		return 0;
-	}	
-
-	blockNo = param_get8(Cmd, 0);
-	cmdp = tolower(param_getchar(Cmd, 1));
-	if (cmdp == 0x00) {
-		PrintAndLogEx(NORMAL, "Key type must be A or B");
-		return 1;
-	}
-	
-	if (cmdp != 'a') 
-		keyType = 1;
-	
-	if (param_gethex(Cmd, 2, key, 12)) {
-		PrintAndLogEx(NORMAL, "Key must include 12 HEX symbols");
-		return 1;
-	}
-	
-	if (param_gethex(Cmd, 3, bldata, 32)) {
-		PrintAndLogEx(NORMAL, "Block data must include 32 HEX symbols");
-		return 1;
-	}
-	
-	PrintAndLogEx(NORMAL, "--block no:%d, key type:%c, key:%s", blockNo, keyType?'B':'A', sprint_hex(key, 6));
-	PrintAndLogEx(NORMAL, "--data: %s", sprint_hex(bldata, 16));
-	
-	UsbCommand c = {CMD_MIFARE_WRITEBL, {blockNo, keyType, 0}};
-	memcpy(c.d.asBytes, key, 6);
-	memcpy(c.d.asBytes + 10, bldata, 16);
-	clearCommandBuffer();
-	SendCommand(&c);
-
-	UsbCommand resp;
-	if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-		uint8_t isOK  = resp.arg[0] & 0xff;
-		PrintAndLogEx(NORMAL, "isOk:%02x", isOK);
-	} else {
-		PrintAndLogEx(NORMAL, "Command execute timeout");
-	}
-
-	return 0;
-}
-
-int CmdHF14AMfRdBl(const char *Cmd) {
-	uint8_t blockNo = 0;
-	uint8_t keyType = 0;
-	uint8_t key[6] = {0, 0, 0, 0, 0, 0};
-	char cmdp = 0x00;
-
-	if (strlen(Cmd)<3) {
-		PrintAndLogEx(NORMAL, "Usage:  hf mf rdbl    <block number> <key A/B> <key (12 hex symbols)>");
-		PrintAndLogEx(NORMAL, "Examples:");
-		PrintAndLogEx(NORMAL, "        hf mf rdbl 0 A FFFFFFFFFFFF ");
-		return 0;
-	}	
-	
-	blockNo = param_get8(Cmd, 0);
-	cmdp = tolower(param_getchar(Cmd, 1));
-	if (cmdp == 0x00) {
-		PrintAndLogEx(NORMAL, "Key type must be A or B");
-		return 1;
-	}
-	
-	if (cmdp != 'a') 
-		keyType = 1;
-	
-	if (param_gethex(Cmd, 2, key, 12)) {
-		PrintAndLogEx(NORMAL, "Key must include 12 HEX symbols");
-		return 1;
-	}
-	PrintAndLogEx(NORMAL, "--block no:%d, key type:%c, key:%s ", blockNo, keyType?'B':'A', sprint_hex(key, 6));
-	
-	UsbCommand c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}};
-	memcpy(c.d.asBytes, key, 6);
-	clearCommandBuffer();
-	SendCommand(&c);
-
-	UsbCommand resp;
-	if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-		uint8_t isOK  = resp.arg[0] & 0xff;
-		uint8_t *data = resp.d.asBytes;
-
-		if (isOK) {
-			PrintAndLogEx(NORMAL, "isOk:%02x data:%s", isOK, sprint_hex(data, 16));
-		} else {
-			PrintAndLogEx(NORMAL, "isOk:%02x", isOK);
-			return 1;
-		}
-
-		if (mfIsSectorTrailer(blockNo) && (data[6] || data[7] || data[8])) {
-			PrintAndLogEx(NORMAL, "Trailer decoded:");
-			int bln = mfFirstBlockOfSector(mfSectorNum(blockNo));
-			int blinc = (mfNumBlocksPerSector(mfSectorNum(blockNo)) > 4) ? 5 : 1;
-			for (int i = 0; i < 4; i++) {
-				PrintAndLogEx(NORMAL, "Access block %d%s: %s", bln, ((blinc > 1) && (i < 3) ? "+" : "") , mfGetAccessConditionsDesc(i, &data[6]));
-				bln += blinc;
-			}
-			PrintAndLogEx(NORMAL, "UserData: %s", sprint_hex_inrow(&data[9], 1));
-		}
-	} else {
-		PrintAndLogEx(WARNING, "Command execute timeout");
-		return 2;
-	}
-	
-  return 0;
-}
-
-int CmdHF14AMfRdSc(const char *Cmd) {
-	int i;
-	uint8_t sectorNo = 0;
-	uint8_t keyType = 0;
-	uint8_t key[6] = {0, 0, 0, 0, 0, 0};
-	uint8_t isOK  = 0;
-	uint8_t *data  = NULL;
-	char cmdp	= 0x00;
-
-	if (strlen(Cmd) < 3) {
-		PrintAndLogEx(NORMAL, "Usage:  hf mf rdsc    <sector number> <key A/B> <key (12 hex symbols)>");
-		PrintAndLogEx(NORMAL, "Examples:");
-		PrintAndLogEx(NORMAL, "        hf mf rdsc 0 A FFFFFFFFFFFF ");
-		return 0;
-	}	
-	
-	sectorNo = param_get8(Cmd, 0);
-	if (sectorNo > MIFARE_4K_MAXSECTOR ) {
-		PrintAndLogEx(NORMAL, "Sector number must be less than 40");
-		return 1;
-	}
-	
-	cmdp = tolower(param_getchar(Cmd, 1));
-	if (cmdp != 'a' && cmdp != 'b') {
-		PrintAndLogEx(NORMAL, "Key type must be A or B");
-		return 1;
-	}
-	
-	if (cmdp != 'a') 
-		keyType = 1;
-	
-	if (param_gethex(Cmd, 2, key, 12)) {
-		PrintAndLogEx(NORMAL, "Key must include 12 HEX symbols");
-		return 1;
-	}
-	PrintAndLogEx(NORMAL, "--sector no:%d key type:%c key:%s ", sectorNo, keyType?'B':'A', sprint_hex(key, 6));
-	
-	UsbCommand c = {CMD_MIFARE_READSC, {sectorNo, keyType, 0}};
-	memcpy(c.d.asBytes, key, 6);
-	clearCommandBuffer();
-	SendCommand(&c);
-	PrintAndLogEx(NORMAL, "");
-
-	UsbCommand resp;
-	if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-		isOK  = resp.arg[0] & 0xff;
-		data  = resp.d.asBytes;
-
-		PrintAndLogEx(NORMAL, "isOk:%02x", isOK);
-		if (isOK) {
-			for (i = 0; i < (sectorNo<32?3:15); i++) {
-				PrintAndLogEx(NORMAL, "data   : %s", sprint_hex(data + i * 16, 16));
-			}
-			PrintAndLogEx(NORMAL, "trailer: %s", sprint_hex(data + (sectorNo<32?3:15) * 16, 16));
-					
-			PrintAndLogEx(NORMAL, "Trailer decoded:");
-            int bln = mfFirstBlockOfSector(sectorNo);
-			int blinc = (mfNumBlocksPerSector(sectorNo) > 4) ? 5 : 1;
-            for (i = 0; i < 4; i++) {
-                PrintAndLogEx(NORMAL, "Access block %d%s: %s", bln, ((blinc > 1) && (i < 3) ? "+" : "") , mfGetAccessConditionsDesc(i, &(data + (sectorNo<32?3:15) * 16)[6]));
-                bln += blinc;
-            }
-            PrintAndLogEx(NORMAL, "UserData: %s", sprint_hex_inrow(&(data + (sectorNo<32?3:15) * 16)[9], 1));
-		}
-	} else {
-		PrintAndLogEx(WARNING, "Command execute timeout");
-	}
-
-  return 0;
-}
-
-uint16_t NumOfBlocks(char card){
-	switch(card){
-		case '0' : return MIFARE_MINI_MAXBLOCK;
-		case '1' : return MIFARE_1K_MAXBLOCK;
-		case '2' : return MIFARE_2K_MAXBLOCK;
-		case '4' : return MIFARE_4K_MAXBLOCK;
-		default  : return MIFARE_1K_MAXBLOCK;
-	}
-}
-uint8_t NumOfSectors(char card){
-	switch(card){
-		case '0' : return MIFARE_MINI_MAXSECTOR; 
-		case '1' : return MIFARE_1K_MAXSECTOR; 
-		case '2' : return MIFARE_2K_MAXSECTOR; 
-		case '4' : return MIFARE_4K_MAXSECTOR; 
-		default  : return MIFARE_1K_MAXSECTOR;
-	}
-}
-
-uint8_t FirstBlockOfSector(uint8_t sectorNo) {
-	if (sectorNo < 32) {
-		return sectorNo * 4;
-	} else {
-		return 32 * 4 + (sectorNo - 32) * 16;
-	}
-}
-
-uint8_t NumBlocksPerSector(uint8_t sectorNo) {
-	if (sectorNo < 32) {
-		return 4;
-	} else {
-		return 16;
-	}
-}
-
-int CmdHF14AMfDump(const char *Cmd) {
-
-	uint8_t sectorNo, blockNo;
-	uint8_t keyA[40][6];
-	uint8_t keyB[40][6];
-	uint8_t rights[40][4];
-	uint8_t carddata[256][16];
-	uint8_t numSectors = 16;
-	uint8_t cmdp = 0;
-	
-	char keyFilename[FILE_PATH_SIZE] = {0};
-	char dataFilename[FILE_PATH_SIZE];
-	char * fptr;
-	
-	memset(keyFilename, 0, sizeof(keyFilename));
-	memset(dataFilename, 0, sizeof(dataFilename));
-	
-	FILE *f;	
-	UsbCommand resp;
-	
-	while(param_getchar(Cmd, cmdp) != 0x00) {
-		switch (tolower(param_getchar(Cmd, cmdp))) {
-		case 'h':
-			return usage_hf14_dump();
-		case 'k':
-			param_getstr(Cmd, cmdp+1, keyFilename, FILE_PATH_SIZE); 
-			cmdp += 2;
-			break;
-		case 'f':
-			param_getstr(Cmd, cmdp+1, dataFilename, FILE_PATH_SIZE); 
-			cmdp += 2;
-			break;
-		default:
-			if (cmdp == 0) {
-				numSectors = NumOfSectors(param_getchar(Cmd, cmdp));
-				cmdp++;
-			} else {
-				PrintAndLogEx(WARNING, "Unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
-				return usage_hf14_dump();
-			}
-		}
-	}
-
-	if ( keyFilename[0] == 0x00 ) {
-		fptr = GenerateFilename("hf-mf-", "-key.bin");
-		if (fptr == NULL) 
-			return 1;
-		
-		strcpy(keyFilename, fptr);
-	}
-
-	if ((f = fopen(keyFilename, "rb")) == NULL) {
-		PrintAndLogEx(WARNING, "Could not find file " _YELLOW_(%s), keyFilename);
-		return 1;
-	}
-	
-	// Read keys A from file
-	size_t bytes_read;
-	for (sectorNo=0; sectorNo<numSectors; sectorNo++) {
-		bytes_read = fread( keyA[sectorNo], 1, 6, f );
-		if ( bytes_read != 6) {
-			PrintAndLogEx(WARNING, "File reading error.");
-			fclose(f);
-			return 2;
-		}
-	}
-	
-	// Read keys B from file
-	for (sectorNo=0; sectorNo<numSectors; sectorNo++) {
-		bytes_read = fread( keyB[sectorNo], 1, 6, f );
-		if ( bytes_read != 6) {
-			PrintAndLogEx(WARNING, "File reading error.");
-			fclose(f);
-			return 2;
-		}
-	}
-	
-	fclose(f);
-			
-
-	PrintAndLogEx(INFO, "Reading sector access bits...");
-
-	uint8_t tries = 0;
-	for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
-		for (tries = 0; tries < MIFARE_SECTOR_RETRY; tries++) {
-		
-			UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 0, 0}};
-			memcpy(c.d.asBytes, keyA[sectorNo], 6);
-			clearCommandBuffer();
-			SendCommand(&c);
-
-			if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-				uint8_t isOK = resp.arg[0] & 0xff;
-				uint8_t *data = resp.d.asBytes;
-				if (isOK){
-					rights[sectorNo][0] = ((data[7] & 0x10) >> 2) | ((data[8] & 0x1) << 1) | ((data[8] & 0x10) >> 4); // C1C2C3 for data area 0
-					rights[sectorNo][1] = ((data[7] & 0x20) >> 3) | ((data[8] & 0x2) << 0) | ((data[8] & 0x20) >> 5); // C1C2C3 for data area 1
-					rights[sectorNo][2] = ((data[7] & 0x40) >> 4) | ((data[8] & 0x4) >> 1) | ((data[8] & 0x40) >> 6); // C1C2C3 for data area 2
-					rights[sectorNo][3] = ((data[7] & 0x80) >> 5) | ((data[8] & 0x8) >> 2) | ((data[8] & 0x80) >> 7); // C1C2C3 for sector trailer
-					break;
-				} else if (tries == 2) { // on last try set defaults
-					PrintAndLogEx(FAILED, "could not get access rights for sector %2d. Trying with defaults...", sectorNo);
-					rights[sectorNo][0] = rights[sectorNo][1] = rights[sectorNo][2] = 0x00;
-					rights[sectorNo][3] = 0x01;
-				}
-			} else {
-				PrintAndLogEx(FAILED, "command execute timeout when trying to read access rights for sector %2d. Trying with defaults...", sectorNo);
-				rights[sectorNo][0] = rights[sectorNo][1] = rights[sectorNo][2] = 0x00;
-				rights[sectorNo][3] = 0x01;
-			}
-		}
-	}
-	
-	PrintAndLogEx(SUCCESS, "Finished reading sector access bits");
-	PrintAndLogEx(INFO, "Dumping all blocks from card...");
-	
-	bool isOK = true;
-	for (sectorNo = 0; isOK && sectorNo < numSectors; sectorNo++) {
-		for (blockNo = 0; isOK && blockNo < NumBlocksPerSector(sectorNo); blockNo++) {
-			bool received = false;
-			
-			for (tries = 0; tries < MIFARE_SECTOR_RETRY; tries++) {			
-				if (blockNo == NumBlocksPerSector(sectorNo) - 1) {		// sector trailer. At least the Access Conditions can always be read with key A. 
-					UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}};
-					memcpy(c.d.asBytes, keyA[sectorNo], 6);
-					clearCommandBuffer();
-					SendCommand(&c);
-					received = WaitForResponseTimeout(CMD_ACK, &resp, 1500);
-				} else {												// data block. Check if it can be read with key A or key B
-					uint8_t data_area = (sectorNo < 32) ? blockNo : blockNo/5;
-					if ((rights[sectorNo][data_area] == 0x03) || (rights[sectorNo][data_area] == 0x05)) {	// only key B would work
-						UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 1, 0}};
-						memcpy(c.d.asBytes, keyB[sectorNo], 6);
-						SendCommand(&c);
-						received = WaitForResponseTimeout(CMD_ACK, &resp, 1500);
-					} else if (rights[sectorNo][data_area] == 0x07) {										// no key would work
-						isOK = false;
-						PrintAndLogEx(WARNING, "access rights do not allow reading of sector %2d block %3d", sectorNo, blockNo);
-						tries = MIFARE_SECTOR_RETRY;
-					} else {																				// key A would work
-						UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}};
-						memcpy(c.d.asBytes, keyA[sectorNo], 6);
-						clearCommandBuffer();
-						SendCommand(&c);
-						received = WaitForResponseTimeout(CMD_ACK, &resp, 1500);
-					}
-				}
-				if (received) {
-					isOK  = resp.arg[0] & 0xff;
-					if (isOK) break;
-				}
-			}
-
-			if (received) {
-				isOK  = resp.arg[0] & 0xff;
-				uint8_t *data  = resp.d.asBytes;
-				if (blockNo == NumBlocksPerSector(sectorNo) - 1) {		// sector trailer. Fill in the keys.
-					data[0]  = (keyA[sectorNo][0]);
-					data[1]  = (keyA[sectorNo][1]);
-					data[2]  = (keyA[sectorNo][2]);
-					data[3]  = (keyA[sectorNo][3]);
-					data[4]  = (keyA[sectorNo][4]);
-					data[5]  = (keyA[sectorNo][5]);
-					data[10] = (keyB[sectorNo][0]);
-					data[11] = (keyB[sectorNo][1]);
-					data[12] = (keyB[sectorNo][2]);
-					data[13] = (keyB[sectorNo][3]);
-					data[14] = (keyB[sectorNo][4]);
-					data[15] = (keyB[sectorNo][5]);
-				}
-				if (isOK) {
-					memcpy(carddata[FirstBlockOfSector(sectorNo) + blockNo], data, 16);
-                    PrintAndLogEx(SUCCESS, "successfully read block %2d of sector %2d.", blockNo, sectorNo);
-				} else {
-					PrintAndLogEx(FAILED, "could not read block %2d of sector %2d", blockNo, sectorNo);
-					break;
-				}
-			}
-			else {
-				isOK = false;
-				PrintAndLogEx(WARNING, "command execute timeout when trying to read block %2d of sector %2d.", blockNo, sectorNo);
-				break;
-			}
-		}
-	}
-
-	if (isOK == 0) { 
-		PrintAndLogEx(FAILED, "Something went wrong");
-		return 0;
-	}
-
-	PrintAndLogEx(SUCCESS, "\nSuccedded in dumping all blocks");
-	
-	if ( strlen(dataFilename) < 1 ) {
-		fptr = dataFilename;
-		fptr += sprintf(fptr, "hf-mf-");
-		FillFileNameByUID(fptr, (uint8_t *)carddata, "-data", 4);
-	}
-
-	uint16_t bytes = 16*(FirstBlockOfSector(numSectors - 1) + NumBlocksPerSector(numSectors - 1));
-	
-	saveFile(dataFilename, "bin", (uint8_t *)carddata, bytes);
-	saveFileEML(dataFilename, "eml", (uint8_t *)carddata, bytes, MFBLOCK_SIZE);
-	saveFileJSON(dataFilename, "json", jsfCardMemory, (uint8_t *)carddata, bytes);
-	return 0;
-}
-
-int CmdHF14AMfRestore(const char *Cmd) {
-	uint8_t sectorNo,blockNo;
-	uint8_t keyType = 0;
-	uint8_t key[6] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};
-	uint8_t bldata[16] = {0x00};
-	uint8_t keyA[40][6];
-	uint8_t keyB[40][6];
-	uint8_t numSectors = 16;
-	uint8_t cmdp = 0;
-	char keyFilename[FILE_PATH_SIZE] = "";	
-	char dataFilename[FILE_PATH_SIZE] = "";
-	char szTemp[FILE_PATH_SIZE-20] = "";	
-	char *fptr;
-	FILE *fdump, *fkeys;
-
-	while(param_getchar(Cmd, cmdp) != 0x00) {
-		switch(tolower(param_getchar(Cmd, cmdp))) {
-		case 'h':
-			return usage_hf14_restore();
-		case 'u':
-			param_getstr(Cmd, cmdp+1, szTemp, FILE_PATH_SIZE-20); 
-			if(keyFilename[0]==0x00)
-				snprintf(keyFilename, FILE_PATH_SIZE, "hf-mf-%s-key.bin", szTemp);
-			if(dataFilename[0]==0x00)
-				snprintf(dataFilename, FILE_PATH_SIZE, "hf-mf-%s-data.bin", szTemp);
-			cmdp+=2;
-			break;
-		case 'k':
-			param_getstr(Cmd, cmdp+1, keyFilename, FILE_PATH_SIZE); 
-			cmdp += 2;
-			break;
-		case 'f':
-			param_getstr(Cmd, cmdp+1, dataFilename, FILE_PATH_SIZE); 
-			cmdp += 2;
-			break;
-		default:
-			if ( cmdp == 0 ) {
-				numSectors = NumOfSectors(param_getchar(Cmd, cmdp));
-				cmdp++;
-			} else {
-				PrintAndLogEx(WARNING, "Unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
-				return usage_hf14_restore();
-			}
-		}
-	}
-
-	if ( keyFilename[0] == 0x00 ) {
-		fptr = GenerateFilename("hf-mf-", "-key.bin");
-		if (fptr == NULL) 
-			return 1;
-		
-		strcpy(keyFilename, fptr);
-	}
-
-	if ((fkeys = fopen(keyFilename, "rb")) == NULL) {
-		PrintAndLogEx(WARNING, "Could not find file " _YELLOW_(%s), keyFilename);
-		return 1;
-	}
-	
-	size_t bytes_read;
-	for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
-		bytes_read = fread( keyA[sectorNo], 1, 6, fkeys );
-		if ( bytes_read != 6 ) {
-			PrintAndLogEx(WARNING, "File reading error  " _YELLOW_(%s), keyFilename);
-			fclose(fkeys);
-			return 2;
-		}
-	}
-
-	for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
-		bytes_read = fread( keyB[sectorNo], 1, 6, fkeys );
-		if ( bytes_read != 6 ) {
-			PrintAndLogEx(WARNING, "File reading error " _YELLOW_(%s), keyFilename);
-			fclose(fkeys);
-			return 2;
-		}
-	}
-
-	fclose(fkeys);
-
-	if ( dataFilename[0] == 0x00 ) {
-		fptr = GenerateFilename("hf-mf-", "-data.bin");
-		if (fptr == NULL) 
-			return 1;
-		
-		strcpy(dataFilename,fptr);
-	}
-
-	if ((fdump = fopen(dataFilename, "rb")) == NULL) {
-		PrintAndLogEx(WARNING, "Could not find file " _YELLOW_(%s), dataFilename);
-		return 1;
-	}	
-	PrintAndLogEx(INFO, "Restoring " _YELLOW_(%s)" to card", dataFilename);
-
-	for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
-		for (blockNo = 0; blockNo < NumBlocksPerSector(sectorNo); blockNo++) {
-			UsbCommand c = {CMD_MIFARE_WRITEBL, {FirstBlockOfSector(sectorNo) + blockNo, keyType, 0}};
-			memcpy(c.d.asBytes, key, 6);			
-			bytes_read = fread(bldata, 1, 16, fdump);
-			if ( bytes_read != 16) {
-				PrintAndLogEx(WARNING, "File reading error " _YELLOW_(%s), dataFilename);
-				fclose(fdump);
-				fdump = NULL;				
-				return 2;
-			}
-					
-			if (blockNo == NumBlocksPerSector(sectorNo) - 1) {	// sector trailer
-				bldata[0]  = (keyA[sectorNo][0]);
-				bldata[1]  = (keyA[sectorNo][1]);
-				bldata[2]  = (keyA[sectorNo][2]);
-				bldata[3]  = (keyA[sectorNo][3]);
-				bldata[4]  = (keyA[sectorNo][4]);
-				bldata[5]  = (keyA[sectorNo][5]);
-				bldata[10] = (keyB[sectorNo][0]);
-				bldata[11] = (keyB[sectorNo][1]);
-				bldata[12] = (keyB[sectorNo][2]);
-				bldata[13] = (keyB[sectorNo][3]);
-				bldata[14] = (keyB[sectorNo][4]);
-				bldata[15] = (keyB[sectorNo][5]);
-			}		
-			
-			PrintAndLogEx(NORMAL, "Writing to block %3d: %s", FirstBlockOfSector(sectorNo) + blockNo, sprint_hex(bldata, 16));
-			
-			memcpy(c.d.asBytes + 10, bldata, 16);
-			clearCommandBuffer();
-			SendCommand(&c);
-
-			UsbCommand resp;
-			if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
-				uint8_t isOK  = resp.arg[0] & 0xff;
-				PrintAndLogEx(SUCCESS, "isOk:%02x", isOK);
-			} else {
-				PrintAndLogEx(WARNING, "Command execute timeout");
-			}
-		}
-	}
-	
-	fclose(fdump);
-	return 0;
-}
-
-int CmdHF14AMfNested(const char *Cmd) {
-	int i, res, iterations;
-	sector_t *e_sector = NULL;
-	uint8_t blockNo = 0;
-	uint8_t keyType = 0;
-	uint8_t trgBlockNo = 0;
-	uint8_t trgKeyType = 0;
-	uint8_t SectorsCnt = 0;
-	uint8_t key[6] = {0, 0, 0, 0, 0, 0};
-	uint8_t keyBlock[(MIFARE_DEFAULTKEYS_SIZE + 1) *6];
-	uint64_t key64 = 0;
-	bool transferToEml = false;
-	bool createDumpFile = false;
-	FILE *fkeys;
-	uint8_t standart[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
-	uint8_t tempkey[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
-	char *fptr;
-	
-	if (strlen(Cmd) < 3) return usage_hf14_nested();
-	
-	char cmdp, ctmp;
-	cmdp = tolower(param_getchar(Cmd, 0));
-	blockNo = param_get8(Cmd, 1);
-	ctmp = tolower(param_getchar(Cmd, 2));
-
-	if (ctmp != 'a' && ctmp != 'b') {
-		PrintAndLogEx(WARNING, "key type must be A or B");
-		return 1;
-	}
-	
-	if (ctmp != 'a') 
-		keyType = 1;
-		
-	if (param_gethex(Cmd, 3, key, 12)) {
-		PrintAndLogEx(WARNING, "key must include 12 HEX symbols");
-		return 1;
-	}
-	
-	if (cmdp == 'o') {
-		trgBlockNo = param_get8(Cmd, 4);
-		ctmp = tolower(param_getchar(Cmd, 5));
-		if (ctmp != 'a' && ctmp != 'b') {
-			PrintAndLogEx(WARNING, "target key type must be A or B");
-			return 1;
-		}
-		if (ctmp != 'a') { 
-			trgKeyType = 1;
-		}
-	} else {
-		SectorsCnt = NumOfSectors(cmdp);
-	}
-	
-	uint8_t j = 4;
-	while ( ctmp != 0x00 ) {
-
-		ctmp = tolower(param_getchar(Cmd, j));
-		transferToEml |= (ctmp == 't');
-		createDumpFile |= (ctmp == 'd');
-		
-		j++;
-	}
-	
-	// check if we can authenticate to sector
-	res = mfCheckKeys(blockNo, keyType, true, 1, key, &key64);
-	if (res) {
-		PrintAndLogEx(WARNING, "Wrong key. Can't authenticate to block:%3d key type:%c", blockNo, keyType ? 'B' : 'A');
-		return 3;
-	}	
-	
-	if (cmdp == 'o') {
-		int16_t isOK = mfnested(blockNo, keyType, key, trgBlockNo, trgKeyType, keyBlock, true);
-		switch (isOK) {
-			case -1 : PrintAndLogEx(WARNING, "Error: No response from Proxmark.\n"); break;
-			case -2 : PrintAndLogEx(WARNING, "Button pressed. Aborted.\n"); break;
-			case -3 : PrintAndLogEx(FAILED, "Tag isn't vulnerable to Nested Attack (PRNG is not predictable).\n"); break;
-			case -4 : PrintAndLogEx(FAILED, "No valid key found"); break;
-			case -5 : 
-				key64 = bytes_to_num(keyBlock, 6);
-
-				// transfer key to the emulator
-				if (transferToEml) {
-					uint8_t sectortrailer;
-					if (trgBlockNo < 32*4) { 	// 4 block sector
-					sectortrailer = trgBlockNo | 0x03;
-					} else {					// 16 block sector
-					sectortrailer = trgBlockNo | 0x0f;
-					}
-					mfEmlGetMem(keyBlock, sectortrailer, 1);
-			
-					if (!trgKeyType)
-						num_to_bytes(key64, 6, keyBlock);
-					else
-						num_to_bytes(key64, 6, &keyBlock[10]);
-					mfEmlSetMem(keyBlock, sectortrailer, 1);	
-					PrintAndLogEx(SUCCESS, "Key transferred to emulator memory.");
-				}
-				return 0;
-			default : PrintAndLogEx(WARNING, "Unknown Error.\n");
-		}
-		return 2;
-	}
-	else { // ------------------------------------  multiple sectors working
-		uint64_t t1 = msclock();
-		
-		e_sector = calloc(SectorsCnt, sizeof(sector_t));
-		if (e_sector == NULL) return 1;
-		
-		//test current key and additional standard keys first
-		// add parameter key
-		memcpy( keyBlock + (MIFARE_DEFAULTKEYS_SIZE * 6), key, 6 );
-
-		for (int cnt = 0; cnt < MIFARE_DEFAULTKEYS_SIZE; cnt++){
-			num_to_bytes(g_mifare_default_keys[cnt], 6, (uint8_t*)(keyBlock + cnt * 6));
-		}
-
-		PrintAndLogEx(SUCCESS, "Testing known keys. Sector count=%d", SectorsCnt);
-		res = mfCheckKeys_fast( SectorsCnt, true, true, 1, MIFARE_DEFAULTKEYS_SIZE + 1, keyBlock, e_sector, false);
-				
-		uint64_t t2 = msclock() - t1;
-		PrintAndLogEx(SUCCESS, "Time to check %d known keys: %.0f seconds\n", MIFARE_DEFAULTKEYS_SIZE, (float)t2/1000.0 );
-		PrintAndLogEx(SUCCESS, "enter nested attack");
-		
-		// nested sectors
-		iterations = 0;
-		bool calibrate = true;
-
-		for (i = 0; i < MIFARE_SECTOR_RETRY; i++) {
-			for (uint8_t sectorNo = 0; sectorNo < SectorsCnt; ++sectorNo) {
-				for (trgKeyType = 0; trgKeyType < 2; ++trgKeyType) { 
-
-					if (e_sector[sectorNo].foundKey[trgKeyType]) continue;
-					
-					int16_t isOK = mfnested(blockNo, keyType, key, FirstBlockOfSector(sectorNo), trgKeyType, keyBlock, calibrate);
-					switch (isOK) {
-						case -1 : PrintAndLogEx(WARNING, "error: No response from Proxmark.\n"); break;
-						case -2 : PrintAndLogEx(WARNING, "button pressed. Aborted.\n"); break;
-						case -3 : PrintAndLogEx(FAILED, "Tag isn't vulnerable to Nested Attack (PRNG is not predictable).\n"); break;
-						case -4 : //key not found
-							calibrate = false;
-							iterations++;
-							continue; 
-						case -5 :
-							calibrate = false;
-							iterations++;
-							e_sector[sectorNo].foundKey[trgKeyType] = 1;
-							e_sector[sectorNo].Key[trgKeyType] = bytes_to_num(keyBlock, 6);
-
-							res = mfCheckKeys_fast( SectorsCnt, true, true, 2, 1, keyBlock, e_sector, false);
-							continue;
-							
-						default : PrintAndLogEx(WARNING, "unknown Error.\n");
-					}
-					free(e_sector);
-					return 2;
-				}
-			}
-		}
-		
-		t1 = msclock() - t1;
-		PrintAndLogEx(SUCCESS, "time in nested: %.0f seconds\n", (float)t1/1000.0);
-
-
-		// 20160116 If Sector A is found, but not Sector B,  try just reading it of the tag?
-		PrintAndLogEx(INFO, "trying to read key B...");
-		for (i = 0; i < SectorsCnt; i++) {
-			// KEY A  but not KEY B
-			if ( e_sector[i].foundKey[0] && !e_sector[i].foundKey[1] ) {
-				
-				uint8_t sectrail = (FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1);
-				
-				PrintAndLogEx(SUCCESS, "reading block %d", sectrail);
-							
-				UsbCommand c = {CMD_MIFARE_READBL, {sectrail, 0, 0}};
-				num_to_bytes(e_sector[i].Key[0], 6, c.d.asBytes); // KEY A
-				clearCommandBuffer();
-				SendCommand(&c);
-
-				UsbCommand resp;
-				if ( !WaitForResponseTimeout(CMD_ACK,&resp,1500)) continue;
-					
-				uint8_t isOK  = resp.arg[0] & 0xff;
-				if (!isOK) continue;
-
-				uint8_t *data = resp.d.asBytes;
-				key64 = bytes_to_num(data+10, 6);
-				if (key64) {
-					PrintAndLogEx(SUCCESS, "data: %s", sprint_hex(data+10, 6));
-					e_sector[i].foundKey[1] = true;
-					e_sector[i].Key[1] = key64;
-				}
-			}
-		}
-
-		
-		//print them
-		printKeyTable( SectorsCnt, e_sector );
-		
-		// transfer them to the emulator
-		if (transferToEml) {
-			for (i = 0; i < SectorsCnt; i++) {
-				mfEmlGetMem(keyBlock, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
-				if (e_sector[i].foundKey[0])
-					num_to_bytes(e_sector[i].Key[0], 6, keyBlock);
-				if (e_sector[i].foundKey[1])
-					num_to_bytes(e_sector[i].Key[1], 6, &keyBlock[10]);
-				mfEmlSetMem(keyBlock, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
-			}
-			PrintAndLogEx(SUCCESS, "keys transferred to emulator memory.");
-		}
-		
-		// Create dump file
-		if (createDumpFile) {
-			fptr = GenerateFilename("hf-mf-", "-key.bin");
-			if (fptr == NULL) {
-				free(e_sector);
-				return 1;
-			}
-			
-			if ((fkeys = fopen(fptr, "wb")) == NULL) { 
-				PrintAndLogEx(WARNING, "could not create file " _YELLOW_(%s), fptr);
-				free(e_sector);
-				return 1;
-			}
-			
-			PrintAndLogEx(SUCCESS, "saving keys to binary file " _YELLOW_(%s), fptr);
-			for (i=0; i<SectorsCnt; i++) {
-				if (e_sector[i].foundKey[0]){
-					num_to_bytes(e_sector[i].Key[0], 6, tempkey);
-					fwrite ( tempkey, 1, 6, fkeys );
-				} else {
-					fwrite ( &standart, 1, 6, fkeys );
-				}
-			}
-			for( i=0; i<SectorsCnt; i++) {
-				if (e_sector[i].foundKey[1]){
-					num_to_bytes(e_sector[i].Key[1], 6, tempkey);
-					fwrite ( tempkey, 1, 6, fkeys );
-				} else {
-					fwrite ( &standart, 1, 6, fkeys );
-				}
-			}
-			fflush(fkeys);
-			fclose(fkeys);
-		}		
-		free(e_sector);
-	}
-
-	free(e_sector);	
-	return 0;
-}
-
-int CmdHF14AMfNestedHard(const char *Cmd) {
-	uint8_t blockNo = 0;
-	uint8_t keyType = 0;
-	uint8_t trgBlockNo = 0;
-	uint8_t trgKeyType = 0;
-	uint8_t key[6] = {0, 0, 0, 0, 0, 0};
-	uint8_t trgkey[6] = {0, 0, 0, 0, 0, 0};
-	uint8_t cmdp=0;
-	char filename[FILE_PATH_SIZE], *fptr;
-	char szTemp[FILE_PATH_SIZE-20];
-	char ctmp;
-	
-	bool know_target_key = false;
-	bool nonce_file_read = false;
-	bool nonce_file_write = false;
-	bool slow = false;
-	int tests = 0;
-	
-	switch(tolower(param_getchar(Cmd, cmdp))) {
-		case 'h': return usage_hf14_hardnested();
-		case 'r':
-			fptr = GenerateFilename("hf-mf-","-nonces.bin");
-			if (fptr == NULL) 
-				strncpy(filename, "nonces.bin", FILE_PATH_SIZE);
-			else
-				strncpy(filename, fptr, FILE_PATH_SIZE-1);
-				
-			nonce_file_read = true;
-			if (!param_gethex(Cmd, cmdp+1, trgkey, 12)) {
-				know_target_key = true;
-			}
-			cmdp++;
-			break;
-		case 't':
-			tests = param_get32ex(Cmd, cmdp+1, 100, 10);
-			if (!param_gethex(Cmd, cmdp+2, trgkey, 12)) {
-				know_target_key = true;
-			}
-			cmdp += 2;
-			break;
-		default:
-			if (param_getchar(Cmd, cmdp) == 0x00)
-			{
-				PrintAndLogEx(WARNING, "Block number is missing");
-				return 1;
-			
-			}
-			blockNo = param_get8(Cmd, cmdp);
-			ctmp = tolower(param_getchar(Cmd, cmdp+1));
-			if (ctmp != 'a' && ctmp != 'b') {
-				PrintAndLogEx(WARNING, "Key type must be A or B");
-				return 1;
-			}
-			
-			if (ctmp != 'a') { 
-				keyType = 1;
-			}
-			
-			if (param_gethex(Cmd, cmdp+2, key, 12)) {
-				PrintAndLogEx(WARNING, "Key must include 12 HEX symbols");
-				return 1;
-			}
-			
-			if (param_getchar(Cmd, cmdp+3) == 0x00)
-			{
-				PrintAndLogEx(WARNING, "Target block number is missing");
-				return 1;
-			}
-			
-			trgBlockNo = param_get8(Cmd, cmdp+3);
-
-			ctmp = tolower(param_getchar(Cmd, cmdp+4));
-			if (ctmp != 'a' && ctmp != 'b') {
-				PrintAndLogEx(WARNING, "Target key type must be A or B");
-				return 1;
-			}
-			if (ctmp != 'a') {
-				trgKeyType = 1;
-			}
-			cmdp += 5;
-	}
-	if (!param_gethex(Cmd, cmdp, trgkey, 12)) {
-		know_target_key = true;
-		cmdp++;
-	}
-
-	while ((ctmp = param_getchar(Cmd, cmdp))) {
-		switch(tolower(ctmp)) {
-		case 's':
-			slow = true;
-			break;
-		case 'w':
-			nonce_file_write = true;
-			fptr = GenerateFilename("hf-mf-","-nonces.bin");
-			if (fptr == NULL) 
-				return 1;
-			strncpy(filename, fptr, FILE_PATH_SIZE-1);
-			break;
-		case 'u':
-			param_getstr(Cmd, cmdp+1, szTemp, FILE_PATH_SIZE-20);
-			snprintf(filename, FILE_PATH_SIZE, "hf-mf-%s-nonces.bin", szTemp);
-			cmdp++;
-			break;
-		case 'f':
-			param_getstr(Cmd, cmdp+1, szTemp, FILE_PATH_SIZE-20);
-			strncpy(filename, szTemp, FILE_PATH_SIZE-20);
-			cmdp++;
-			break;
-		case 'i': 
-			SetSIMDInstr(SIMD_AUTO);
-			ctmp = tolower(param_getchar(Cmd, cmdp+1));
-			switch (ctmp) {
-				case '5':
-					SetSIMDInstr(SIMD_AVX512);
-					break;
-				case '2':
-					SetSIMDInstr(SIMD_AVX2);
-					break;
-				case 'a':
-					SetSIMDInstr(SIMD_AVX);
-					break;
-				case 's':
-					SetSIMDInstr(SIMD_SSE2);
-					break;
-				case 'm':
-					SetSIMDInstr(SIMD_MMX);
-					break;
-				case 'n':
-					SetSIMDInstr(SIMD_NONE);
-					break;
-				default:
-					PrintAndLogEx(WARNING, "Unknown SIMD type. %c", ctmp);
-					return 1;
-			}
-			cmdp += 2;
-			break;
-		default:
-			PrintAndLogEx(WARNING, "Unknown parameter '%c'\n", ctmp);
-			usage_hf14_hardnested();
-			return 1;
-		}
-		cmdp++;
-	}
-	
-	if ( !know_target_key ) {
-		uint64_t key64 = 0;
-		// check if we can authenticate to sector
-		int res = mfCheckKeys(blockNo, keyType, true, 1, key, &key64);
-		if (res) {
-			PrintAndLogEx(WARNING, "Key is wrong. Can't authenticate to block:%3d key type:%c", blockNo, keyType ? 'B' : 'A');
-			return 3;
-		}	
-	}
-	
-	PrintAndLogEx(NORMAL, "--target block no:%3d, target key type:%c, known target key: 0x%02x%02x%02x%02x%02x%02x%s, file action: %s, Slow: %s, Tests: %d ", 
-			trgBlockNo, 
-			trgKeyType?'B':'A', 
-			trgkey[0], trgkey[1], trgkey[2], trgkey[3], trgkey[4], trgkey[5],
-			know_target_key ? "" : " (not set)",
-			nonce_file_write ? "write": nonce_file_read ? "read" : "none",
-			slow ? "Yes" : "No",
-			tests);
-
-	uint64_t foundkey = 0;
-	int16_t isOK = mfnestedhard(blockNo, keyType, key, trgBlockNo, trgKeyType, know_target_key ? trgkey : NULL, nonce_file_read, nonce_file_write, slow, tests, &foundkey, filename);
-
-	DropField();
-	if (isOK) {
-		switch (isOK) {
-			case 1 : PrintAndLogEx(WARNING, "Error: No response from Proxmark.\n"); break;
-			case 2 : PrintAndLogEx(NORMAL, "Button pressed. Aborted.\n"); break;
-			default : break;
-		}
-		return 2;
-	}
-	return 0;
-}
-
-int randInRange(int min, int max) {
-	return min + (int) (rand() / (double) (RAND_MAX) * (max - min + 1));
-}
-
-//Fisher–Yates shuffle
-void shuffle( uint8_t *array, uint16_t len) {
-	uint8_t tmp[6];
-	uint16_t x;
-	time_t t;
-	srand((unsigned) time(&t));
-	while (len) {		
-		x = randInRange(0, (len -= 6) ) | 0; // 0 = i < n
-		x %= 6;
-		memcpy(tmp, array + x, 6);
-		memcpy(array + x, array + len, 6);	
-		memcpy(array + len, tmp, 6);		
-	}
-}
-
-int CmdHF14AMfChk_fast(const char *Cmd) {
-
-	char ctmp = 0x00;
-	ctmp = tolower(param_getchar(Cmd, 0));
-	if (strlen(Cmd) < 1 || ctmp == 'h') return usage_hf14_chk_fast();
-
-	FILE * f;
-	char filename[FILE_PATH_SIZE]={0};
-	char buf[13];
-	char *fptr;
-	uint8_t tempkey[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
-	uint8_t *keyBlock = NULL, *p;
-	uint8_t sectorsCnt = 1;
-	int i, keycnt = 0;
-	int clen = 0;
-	int transferToEml = 0, createDumpFile = 0;
-	uint32_t keyitems = MIFARE_DEFAULTKEYS_SIZE;
-	bool use_flashmemory = false;
-
-	sector_t *e_sector = NULL;
-	
-	keyBlock = calloc(MIFARE_DEFAULTKEYS_SIZE, 6);
-	if (keyBlock == NULL) return 1;
-
-	for (int cnt = 0; cnt < MIFARE_DEFAULTKEYS_SIZE; cnt++)
-		num_to_bytes(g_mifare_default_keys[cnt], 6, keyBlock + cnt * 6);
-	
-	// sectors
-	switch(ctmp) {
-		case '0': sectorsCnt =  MIFARE_MINI_MAXSECTOR; break;
-		case '1': sectorsCnt = MIFARE_1K_MAXSECTOR; break;
-		case '2': sectorsCnt = MIFARE_2K_MAXSECTOR; break;
-		case '4': sectorsCnt = MIFARE_4K_MAXSECTOR; break;
-		default:  sectorsCnt = MIFARE_1K_MAXSECTOR;
-	}
-
-	for (i = 1; param_getchar(Cmd, i); i++) {
-		
-		ctmp = tolower(param_getchar(Cmd, i));
-		clen = param_getlength(Cmd, i);
-		
-		if (clen == 12) {
-			
-			if ( param_gethex(Cmd, i, keyBlock + 6 * keycnt, 12) ){
-				PrintAndLogEx(FAILED, "not hex, skipping");
-				continue;
-			}
-
-			if ( keyitems - keycnt < 2) {
-				p = realloc(keyBlock, 6 * (keyitems += 64));
-				if (!p) {
-					PrintAndLogEx(FAILED, "Cannot allocate memory for Keys");
-					free(keyBlock);
-					return 2;
-				}
-				keyBlock = p;
-			}
-			PrintAndLogEx(NORMAL, "[%2d] key %s", keycnt, sprint_hex( (keyBlock + 6*keycnt), 6 ) );
-			keycnt++;
-		} else if ( clen == 1) {
-			if (ctmp == 't' ) { transferToEml = 1; continue; }
-			if (ctmp == 'd' ) { createDumpFile = 1; continue; }
-#ifdef WITH_FLASH			
-			if (ctmp == 'm' ) { use_flashmemory = true; continue; }
-#endif			
-		} else {
-			// May be a dic file
-			if ( param_getstr(Cmd, i, filename, FILE_PATH_SIZE) >= FILE_PATH_SIZE ) {
-				PrintAndLogEx(FAILED, "Filename too long");
-				continue;
-			}
-			
-			f = fopen( filename, "r");
-			if ( !f ){
-				PrintAndLogEx(FAILED, "File: " _YELLOW_(%s) ": not found or locked.", filename);
-				continue;
-			}
-			
-			// read file
-			while( fgets(buf, sizeof(buf), f) ){
-				if (strlen(buf) < 12 || buf[11] == '\n')
-					continue;
-			
-				while (fgetc(f) != '\n' && !feof(f)) ;  //goto next line
-				
-				if( buf[0]=='#' ) continue;	//The line start with # is comment, skip
-
-				if (!isxdigit(buf[0])){
-					PrintAndLogEx(FAILED, "File content error. '" _YELLOW_(%s)"' must include 12 HEX symbols", buf);
-					continue;
-				}
-				
-				buf[12] = 0;
-				if ( keyitems - keycnt < 2) {
-					p = realloc(keyBlock, 6 * (keyitems += 64));
-					if (!p) {
-						PrintAndLogEx(FAILED, "Cannot allocate memory for default keys");
-						free(keyBlock);
-						fclose(f);
-						return 2;
-					}
-					keyBlock = p;
-				}
-				int pos = 6 * keycnt;
-				memset(keyBlock + pos, 0, 6);
-				num_to_bytes(strtoll(buf, NULL, 16), 6, keyBlock + pos);
-				keycnt++;
-				memset(buf, 0, sizeof(buf));
-			}
-			fclose(f);
-			PrintAndLogEx(SUCCESS, "Loaded %2d keys from " _YELLOW_(%s), keycnt, filename);
-		}
-	}
-		
-	if (keycnt == 0 && !use_flashmemory) {
-		PrintAndLogEx(SUCCESS, "No key specified, trying default keys");
-		for (;keycnt < MIFARE_DEFAULTKEYS_SIZE; keycnt++)
-			PrintAndLogEx(NORMAL, "[%2d] %02x%02x%02x%02x%02x%02x", keycnt,
-				(keyBlock + 6*keycnt)[0],(keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2],
-				(keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4],	(keyBlock + 6*keycnt)[5]);
-	}
-	
-	// // initialize storage for found keys
-	e_sector = calloc(sectorsCnt, sizeof(sector_t));
-	if (e_sector == NULL) {
-		free(keyBlock);
-		return 1;
-	}
-			
-	uint32_t chunksize = keycnt > (USB_CMD_DATA_SIZE/6) ? (USB_CMD_DATA_SIZE/6) : keycnt;
-	bool firstChunk = true, lastChunk = false;
-	
-	// time
-	uint64_t t1 = msclock();
-
-	if ( use_flashmemory ) {
-		PrintAndLogEx(SUCCESS, "Using dictionary in flash memory");
-		mfCheckKeys_fast( sectorsCnt, true, true, 1, 0, keyBlock, e_sector, use_flashmemory);
-	} else {
-	
-		// strategys. 1= deep first on sector 0 AB,  2= width first on all sectors
-		for (uint8_t strategy = 1; strategy < 3; strategy++) {
-			PrintAndLogEx(SUCCESS, "Running strategy %u", strategy);
-
-				// main keychunk loop			
-				for (uint32_t i = 0; i < keycnt; i += chunksize) {
-					
-					if (ukbhit()) {
-						int gc = getchar(); (void)gc;
-						PrintAndLogEx(WARNING, "\naborted via keyboard!\n");
-						goto out;
-					}
-					
-					uint32_t size = ((keycnt - i)  > chunksize) ? chunksize : keycnt - i;
-					
-					// last chunk?
-					if ( size == keycnt - i)
-						lastChunk = true;
-					
-					int res = mfCheckKeys_fast( sectorsCnt, firstChunk, lastChunk, strategy, size, keyBlock + (i * 6), e_sector, false);
-
-					if ( firstChunk )
-						firstChunk = false;
-								
-					// all keys,  aborted
-					if ( res == 0 || res == 2 )
-						goto out;
-				} // end chunks of keys
-			firstChunk = true;
-			lastChunk = false;
-		} // end strategy
-	}
-out: 
-	t1 = msclock() - t1;
-	PrintAndLogEx(SUCCESS, "Time in checkkeys (fast):  %.1fs\n", (float)(t1/1000.0));
-
-	// check..
-	uint8_t found_keys = 0;
-	for (uint8_t i = 0; i < sectorsCnt; ++i) {
-		
-		if ( e_sector[i].foundKey[0] ) 
-			found_keys++;
-		
-		if ( e_sector[i].foundKey[1] )
-			found_keys++;
-	}
-	
-	if ( found_keys == 0 ) {
-		PrintAndLogEx(WARNING, "No keys found");
-	} else {
-	
-		printKeyTable( sectorsCnt, e_sector );
-
-		if (transferToEml) {
-			uint8_t block[16] = {0x00};
-			for (uint8_t i = 0; i < sectorsCnt; ++i ) {
-				mfEmlGetMem(block, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
-				if (e_sector[i].foundKey[0])
-					num_to_bytes(e_sector[i].Key[0], 6, block);
-				if (e_sector[i].foundKey[1])
-					num_to_bytes(e_sector[i].Key[1], 6, block+10);
-				mfEmlSetMem(block, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
-			}
-			PrintAndLogEx(SUCCESS, "Found keys have been transferred to the emulator memory");
-		}
-		
-		if (createDumpFile) {
-			fptr = GenerateFilename("hf-mf-", "-key.bin");
-			if (fptr == NULL) 
-				return 1;
-
-			FILE *fkeys = fopen(fptr, "wb");
-			if (fkeys == NULL) { 
-				PrintAndLogEx(WARNING, "Could not create file " _YELLOW_(%s), fptr);
-				free(keyBlock);
-				free(e_sector);
-				return 1;
-			}
-			PrintAndLogEx(SUCCESS, "Printing keys to binary file " _YELLOW_(%s)"...", fptr);
-		
-			for (i=0; i<sectorsCnt; i++) {
-				num_to_bytes(e_sector[i].Key[0], 6, tempkey);
-				fwrite (tempkey, 1, 6, fkeys);
-			}
-
-			for (i=0; i<sectorsCnt; i++) {
-				num_to_bytes(e_sector[i].Key[1], 6, tempkey);
-				fwrite (tempkey, 1, 6, fkeys );
-			}
-
-			fclose(fkeys);
-			PrintAndLogEx(SUCCESS, "Found keys have been dumped to " _YELLOW_(%s)" --> 0xffffffffffff has been inserted for unknown keys.", fptr);			
-		}	
-	}
-	
-	free(keyBlock);
-	free(e_sector);
-	PrintAndLogEx(NORMAL, "");
-	return 0;
-}
-
-int CmdHF14AMfChk(const char *Cmd) {
-
-	char ctmp = tolower(param_getchar(Cmd, 0));
-	if (strlen(Cmd) < 3 || ctmp == 'h') return usage_hf14_chk();
-
-	FILE * f;
-	char filename[FILE_PATH_SIZE] = {0};
-	char buf[13];
-	uint8_t *keyBlock = NULL, *p;
-	sector_t *e_sector = NULL;
-
-	uint8_t blockNo = 0;
-	uint8_t SectorsCnt = 1;
-	uint8_t keyType = 0;
-	uint32_t keyitems = MIFARE_DEFAULTKEYS_SIZE;
-	uint64_t key64 = 0;	
-	uint8_t tempkey[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
-	char *fptr;
-	int clen = 0;
-	int transferToEml = 0;
-	int createDumpFile = 0;	
-	int i, res, keycnt = 0;
-
-	keyBlock = calloc(MIFARE_DEFAULTKEYS_SIZE, 6);
-	if (keyBlock == NULL) return 1;
-
-	for (int cnt = 0; cnt < MIFARE_DEFAULTKEYS_SIZE; cnt++)
-		num_to_bytes(g_mifare_default_keys[cnt], 6, (uint8_t*)(keyBlock + cnt * 6));
-	
-	if (param_getchar(Cmd, 0)=='*') {
-		blockNo = 3;
-		SectorsCnt = NumOfSectors( param_getchar(Cmd+1, 0) );
-	} else {
-		blockNo = param_get8(Cmd, 0);
-	}
-	
-	ctmp = tolower(param_getchar(Cmd, 1));
-	clen = param_getlength(Cmd, 1);
-	if (clen == 1) {
-		switch (ctmp) {	
-		case 'a':
-			keyType = 0;
-			break;
-		case 'b':
-			keyType = 1;
-			break;
-		case '?':
-			keyType = 2;
-			break;
-		default:
-			PrintAndLogEx(FAILED, "Key type must be A , B or ?");
-			free(keyBlock);
-			return 1;
-		};
-	}
-
-	for (i = 2; param_getchar(Cmd, i); i++) {
-
-		ctmp = tolower(param_getchar(Cmd, i));
-		clen = param_getlength(Cmd, i);
-		
-		if (clen == 12) {
-			
-			if ( param_gethex(Cmd, i, keyBlock + 6 * keycnt, 12) ){
-				PrintAndLogEx(FAILED, "not hex, skipping");
-				continue;
-			}
-
-			if ( keyitems - keycnt < 2) {
-				p = realloc(keyBlock, 6 * (keyitems += 64));
-				if (!p) {
-					PrintAndLogEx(FAILED, "cannot allocate memory for Keys");
-					free(keyBlock);
-					return 2;
-				}
-				keyBlock = p;
-			}
-			PrintAndLogEx(NORMAL, "[%2d] key %s", keycnt, sprint_hex( (keyBlock + 6*keycnt), 6 ) );;
-			keycnt++;
-		} else if ( clen == 1 ) {
-			if (ctmp == 't' ) { transferToEml = 1; continue; }
-			if (ctmp == 'd' ) { createDumpFile = 1; continue; }
-		} else {
-			// May be a dic file
-			if ( param_getstr(Cmd, i, filename, sizeof(filename)) >= FILE_PATH_SIZE ) {
-				PrintAndLogEx(FAILED, "File name too long");
-				continue;
-			}
-			
-			f = fopen( filename , "r");
-			if ( !f ) {
-				PrintAndLogEx(FAILED, "File: " _YELLOW_(%s) ": not found or locked.", filename);
-				continue;
-			}
-			
-			// load keys from dictionary file
-			while( fgets(buf, sizeof(buf), f) ){
-				if (strlen(buf) < 12 || buf[11] == '\n')
-					continue;
-			
-				while (fgetc(f) != '\n' && !feof(f)) ;  //goto next line
-				
-				if( buf[0]=='#' ) continue;	//The line start with # is comment, skip
-
-				// codesmell, only checks first char?
-				if (!isxdigit(buf[0])){
-					PrintAndLogEx(FAILED, "File content error. '" _YELLOW_(%s)"' must include 12 HEX symbols",buf);
-					continue;
-				}
-				
-				buf[12] = 0;
-
-				if ( keyitems - keycnt < 2) {
-					p = realloc(keyBlock, 6 * (keyitems += 64));
-					if (!p) {
-						PrintAndLogEx(FAILED, "Cannot allocate memory for defKeys");
-						free(keyBlock);
-						fclose(f);
-						return 2;
-					}
-					keyBlock = p;
-				}
-				memset(keyBlock + 6 * keycnt, 0, 6);
-				num_to_bytes(strtoll(buf, NULL, 16), 6, keyBlock + 6*keycnt);
-				//PrintAndLogEx(NORMAL, "check key[%2d] %012" PRIx64, keycnt, bytes_to_num(keyBlock + 6*keycnt, 6));
-				keycnt++;
-				memset(buf, 0, sizeof(buf));
-			}
-			fclose(f);
-			PrintAndLogEx(SUCCESS, "Loaded %2d keys from " _YELLOW_(%s), keycnt, filename);
-		}
-	}
-	
-	if (keycnt == 0) {
-		PrintAndLogEx(INFO, "No key specified, trying default keys");
-		for (;keycnt < MIFARE_DEFAULTKEYS_SIZE; keycnt++)
-			PrintAndLogEx(NORMAL, "[%2d] %02x%02x%02x%02x%02x%02x", keycnt,
-				(keyBlock + 6*keycnt)[0],(keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2],
-				(keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4],	(keyBlock + 6*keycnt)[5], 6);
-	}
-	
-	// initialize storage for found keys
-	e_sector = calloc(SectorsCnt, sizeof(sector_t));
-	if (e_sector == NULL) {
-		free(keyBlock);
-		return 1;
-	}
-
-	// empty e_sector
-	for(int i = 0; i < SectorsCnt; ++i){
-		e_sector[i].Key[0] = 0xffffffffffff;
-		e_sector[i].Key[1] = 0xffffffffffff;
-		e_sector[i].foundKey[0] = false;
-		e_sector[i].foundKey[1] = false;
-	}
-		
-	
-	uint8_t trgKeyType = 0;
-	uint32_t max_keys = keycnt > (USB_CMD_DATA_SIZE/6) ? (USB_CMD_DATA_SIZE/6) : keycnt;
-	
-	// time
-	uint64_t t1 = msclock();
-
-	
-	// check keys.
-	for (trgKeyType = (keyType==2)?0:keyType; trgKeyType < 2; (keyType==2) ? (++trgKeyType) : (trgKeyType=2) ) {
-
-		int b = blockNo;
-		for (int i = 0; i < SectorsCnt; ++i) {
-			
-			// skip already found keys.
-			if (e_sector[i].foundKey[trgKeyType]) continue;
-						
-			for (uint32_t c = 0; c < keycnt; c += max_keys) {
-								
-				printf("."); fflush(stdout);
-				if (ukbhit()) {
-					int gc = getchar();	(void)gc;
-					PrintAndLogEx(INFO, "\naborted via keyboard!\n");
-					goto out;
-				}
-								
-				uint32_t size = keycnt-c > max_keys ? max_keys : keycnt-c;
-				
-				res = mfCheckKeys(b, trgKeyType, true, size, &keyBlock[6*c], &key64);
-				if (!res) {
-					e_sector[i].Key[trgKeyType] = key64;
-					e_sector[i].foundKey[trgKeyType] = true;
-					break;
-				}
-				
-
-			}
-			b < 127 ? ( b +=4 ) : ( b += 16 );	
-		}
-	}
-	t1 = msclock() - t1;
-	PrintAndLogEx(SUCCESS, "\nTime in checkkeys: %.0f seconds\n", (float)t1/1000.0);
-
-		
-	// 20160116 If Sector A is found, but not Sector B,  try just reading it of the tag?
-	if ( keyType != 1 ) {
-		PrintAndLogEx(INFO, "testing to read key B...");
-		for (i = 0; i < SectorsCnt; i++) {
-			// KEY A  but not KEY B
-			if ( e_sector[i].foundKey[0] && !e_sector[i].foundKey[1] ) {
-							
-				uint8_t sectrail = (FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1);
-				
-				PrintAndLogEx(NORMAL, "Reading block %d", sectrail);
-				
-				UsbCommand c = {CMD_MIFARE_READBL, {sectrail, 0, 0}};
-				num_to_bytes(e_sector[i].Key[0], 6, c.d.asBytes); // KEY A
-				clearCommandBuffer();
-				SendCommand(&c);
-
-				UsbCommand resp;
-				if ( !WaitForResponseTimeout(CMD_ACK,&resp,1500)) continue;
-					
-				uint8_t isOK  = resp.arg[0] & 0xff;
-				if (!isOK) continue;
-
-				uint8_t *data = resp.d.asBytes;
-				key64 = bytes_to_num(data+10, 6);
-				if (key64) {
-					PrintAndLogEx(NORMAL, "Data:%s", sprint_hex(data+10, 6));
-					e_sector[i].foundKey[1] = 1;
-					e_sector[i].Key[1] = key64;
-				}
-			}
-		}
-	}
-
-out:
-	
-	//print keys
-	printKeyTable( SectorsCnt, e_sector );
-	
-	if (transferToEml) {
-		uint8_t block[16] = {0x00};
-		for (uint8_t i = 0; i < SectorsCnt; ++i ) {
-			mfEmlGetMem(block, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
-			if (e_sector[i].foundKey[0])
-				num_to_bytes(e_sector[i].Key[0], 6, block);
-			if (e_sector[i].foundKey[1])
-				num_to_bytes(e_sector[i].Key[1], 6, block+10);
-			mfEmlSetMem(block, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
-		}
-		PrintAndLogEx(SUCCESS, "Found keys have been transferred to the emulator memory");
-	}
-	
-	if (createDumpFile) {
-		fptr = GenerateFilename("hf-mf-", "-key.bin");
-		if (fptr == NULL) {
-			free(keyBlock);
-			free(e_sector);			
-			return 1;
-		}
-
-		FILE *fkeys = fopen(fptr, "wb");
-		if (fkeys == NULL) { 
-			PrintAndLogEx(WARNING, "Could not create file " _YELLOW_(%s), fptr);
-			free(keyBlock);
-			free(e_sector);
-			return 1;
-		}
-		PrintAndLogEx(INFO, "Printing keys to binary file " _YELLOW_(%s)"...", fptr);
-	
-		for( i=0; i<SectorsCnt; i++) {
-			num_to_bytes(e_sector[i].Key[0], 6, tempkey);
-			fwrite ( tempkey, 1, 6, fkeys );
-		}
-		for(i=0; i<SectorsCnt; i++) {
-			num_to_bytes(e_sector[i].Key[1], 6, tempkey);
-			fwrite ( tempkey, 1, 6, fkeys );
-		}
-		fclose(fkeys);
-		PrintAndLogEx(SUCCESS, "Found keys have been dumped to file " _YELLOW_(%s)". 0xffffffffffff has been inserted for unknown keys.", fptr);
-	}
-
-	free(keyBlock);
-	free(e_sector);
-	PrintAndLogEx(NORMAL, "");
-	return 0;
-}
-
-sector_t *k_sector = NULL;
-uint8_t k_sectorsCount = 16;
-static void emptySectorTable(){
-
-	// initialize storage for found keys
-	if (k_sector == NULL)
-		k_sector = calloc(k_sectorsCount, sizeof(sector_t));
-	if (k_sector == NULL) 
-		return;
-		
-	// empty e_sector
-	for(int i = 0; i < k_sectorsCount; ++i){
-		k_sector[i].Key[0] = 0xffffffffffff;
-		k_sector[i].Key[1] = 0xffffffffffff;
-		k_sector[i].foundKey[0] = false;
-		k_sector[i].foundKey[1] = false;
-	}
-}
-
-void showSectorTable(){
-	if (k_sector != NULL) {
-		printKeyTable(k_sectorsCount, k_sector);
-		free(k_sector);
-		k_sector = NULL;
-	}
-}
-
-void readerAttack(nonces_t data, bool setEmulatorMem, bool verbose) {
-
-	uint64_t key = 0;	
-	bool success = false;
-	
-	if (k_sector == NULL)
-		emptySectorTable();
-
-	success = mfkey32_moebius(data, &key);
-	if (success) {
-		uint8_t sector = data.sector;
-		uint8_t keytype = data.keytype;
-
-		PrintAndLogEx(INFO, "Reader is trying authenticate with: Key %s, sector %02d: [%012" PRIx64 "]"
-			, keytype ? "B" : "A"
-			, sector
-			, key
-		);
-
-		k_sector[sector].Key[keytype] = key;
-		k_sector[sector].foundKey[keytype] = true;
-
-		//set emulator memory for keys
-		if (setEmulatorMem) {
-			uint8_t	memBlock[16] = {0,0,0,0,0,0, 0xff, 0x0F, 0x80, 0x69, 0,0,0,0,0,0};
-			num_to_bytes( k_sector[sector].Key[0], 6, memBlock);
-			num_to_bytes( k_sector[sector].Key[1], 6, memBlock+10);
-			//iceman,  guessing this will not work so well for 4K tags.
-			PrintAndLogEx(INFO, "Setting Emulator Memory Block %02d: [%s]"
-				, (sector*4) + 3
-				, sprint_hex( memBlock, sizeof(memBlock))
-				);
-			mfEmlSetMem( memBlock, (sector*4) + 3, 1);
-		}
-	}
-}
-
-int CmdHF14AMf1kSim(const char *Cmd) {
-
-	uint8_t uid[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-	uint8_t exitAfterNReads = 0;
-	uint8_t flags = (FLAG_UID_IN_EMUL | FLAG_4B_UID_IN_DATA);
-	int uidlen = 0;
-	uint8_t cmdp = 0;
-	bool errors = false, verbose = false, setEmulatorMem = false;
-	nonces_t data[1];
-		
-	while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch( tolower(param_getchar(Cmd, cmdp))) {
-		case 'e':
-			setEmulatorMem = true;
-			cmdp++;
-			break;
-		case 'h':
-			return usage_hf14_mf1ksim();
-		case 'i':
-			flags |= FLAG_INTERACTIVE;
-			cmdp++;
-			break;
-		case 'n':
-			exitAfterNReads = param_get8(Cmd, cmdp+1);
-			cmdp += 2;
-			break;
-		case 'u':
-			param_gethex_ex(Cmd, cmdp+1, uid, &uidlen);
-			switch(uidlen) {
-				case 20: flags = FLAG_10B_UID_IN_DATA; break;
-				case 14: flags = FLAG_7B_UID_IN_DATA; break;
-				case  8: flags = FLAG_4B_UID_IN_DATA; break;
-				default: return usage_hf14_mf1ksim();
-			}
-			cmdp += 2;
-			break;
-		case 'v':
-			verbose = true;
-			cmdp++;
-			break;
-		case 'x':
-			flags |= FLAG_NR_AR_ATTACK;
-			cmdp++;
-			break;
-		default:
-			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-			errors = true;
-			break;
-		}
-	}
-	//Validations
-	if (errors) return usage_hf14_mf1ksim();
-	
-	PrintAndLogEx(NORMAL, " uid:%s, numreads:%d, flags:%d (0x%02x) "
-				, (uidlen == 0 ) ? "N/A" : sprint_hex(uid, uidlen>>1)
-				, exitAfterNReads
-				, flags
-				, flags);
-
-	UsbCommand c = {CMD_SIMULATE_MIFARE_CARD, {flags, exitAfterNReads, 0}};
-	memcpy(c.d.asBytes, uid, sizeof(uid));
-	clearCommandBuffer();
-	SendCommand(&c);
-	UsbCommand resp;		
-
-	if(flags & FLAG_INTERACTIVE) {
-		PrintAndLogEx(INFO, "Press pm3-button or send another cmd to abort simulation");
-
-		while( !ukbhit() ){	
-			if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500) ) continue;
-			if ( !(flags & FLAG_NR_AR_ATTACK) ) break;
-			if ( (resp.arg[0] & 0xffff) != CMD_SIMULATE_MIFARE_CARD ) break;
-
-			memcpy(data, resp.d.asBytes, sizeof(data));
-			readerAttack(data[0], setEmulatorMem, verbose);
-		}
-		showSectorTable();
-	}
-	return 0;
-}
-
-int CmdHF14AMfSniff(const char *Cmd){
-	bool wantLogToFile = false;
-	bool wantDecrypt = false;
-	//bool wantSaveToEml = false; TODO
-	bool wantSaveToEmlFile = false;
-
-	//var 
-	int res = 0, len = 0, blockLen = 0;
-	int pckNum = 0, num = 0;
-	uint8_t sak = 0;
-	uint8_t uid[10];
-	uint8_t uid_len = 0;
-	uint8_t atqa[2] = {0x00, 0x00};
-	bool isTag = false;
-	uint8_t *buf = NULL;
-	uint16_t bufsize = 0;
-	uint8_t *bufPtr = NULL;
-	uint16_t traceLen = 0;
-	
-	memset(uid, 0x00, sizeof(uid));
-	
-	char ctmp = tolower(param_getchar(Cmd, 0));
-	if ( ctmp == 'h') return usage_hf14_sniff();
-	
-	for (int i = 0; i < 4; i++) {
-		ctmp = tolower(param_getchar(Cmd, i));
-		if (ctmp == 'l') wantLogToFile = true;
-		if (ctmp == 'd') wantDecrypt = true;
-		//if (ctmp == 'e') wantSaveToEml = true; TODO
-		if (ctmp == 'f') wantSaveToEmlFile = true;
-	}
-	
-	PrintAndLogEx(NORMAL, "-------------------------------------------------------------------------\n");
-	PrintAndLogEx(NORMAL, "Executing mifare sniffing command. \n");
-	PrintAndLogEx(NORMAL, "Press the key on the proxmark3 device to abort both proxmark3 and client.\n");
-	PrintAndLogEx(NORMAL, "Press the key on pc keyboard to abort the client.\n");
-	PrintAndLogEx(NORMAL, "-------------------------------------------------------------------------\n");
-
-	UsbCommand c = {CMD_MIFARE_SNIFFER, {0, 0, 0}};
-	clearCommandBuffer();
-	SendCommand(&c);
-
-	UsbCommand resp;
-	
-	// wait cycle
-	while (true) {
-		printf("."); fflush(stdout);
-		if (ukbhit()) {
-			int gc = getchar(); (void)gc;
-			PrintAndLogEx(INFO, "\naborted via keyboard!\n");
-			break;
-		}
-		
-		if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
-			continue;
-		}
-		
-		res = resp.arg[0] & 0xff;
-		traceLen = resp.arg[1];
-		len = resp.arg[2];
-
-		if (res == 0) {
-			PrintAndLogEx(SUCCESS, "hf mifare sniff finished");
-			free(buf);
-			return 0;
-		}
-
-		if (res == 1) {								// there is (more) data to be transferred
-			if (pckNum == 0) {						// first packet, (re)allocate necessary buffer
-				if (traceLen > bufsize || buf == NULL) {
-					uint8_t *p;
-					if (buf == NULL)				// not yet allocated
-						p = calloc(traceLen, sizeof(uint8_t));
-					else							// need more memory
-						p = realloc(buf, traceLen);
-					
-					if (p == NULL) {
-						PrintAndLogEx(FAILED, "Cannot allocate memory for trace");
-						free(buf);
-						return 2;
-					}
-					buf = p;
-				}
-				bufPtr = buf;
-				bufsize = traceLen;
-				memset(buf, 0x00, traceLen);
-			}
-
-			// what happens if LEN is bigger then TRACELEN --iceman
-			memcpy(bufPtr, resp.d.asBytes, len);
-			bufPtr += len;
-			pckNum++;
-		}
-
-		if (res == 2) {								// received all data, start displaying
-			blockLen = bufPtr - buf;
-			bufPtr = buf;
-			PrintAndLogEx(NORMAL, ">\n");
-			PrintAndLogEx(SUCCESS, "received trace len: %d packages: %d", blockLen, pckNum);
-			while (bufPtr - buf < blockLen) {
-				bufPtr += 6;						// skip (void) timing information
-				len = *((uint16_t *)bufPtr);
-				if(len & 0x8000) {
-					isTag = true;
-					len &= 0x7fff;
-				} else {
-					isTag = false;
-				}
-				bufPtr += 2;
-				
-				// the uid identification package 
-				// 0xFF 0xFF xx xx xx xx xx xx xx xx xx xx aa aa cc 0xFF 0xFF
-				// x = uid,  a = atqa, c = sak
-				if ((len == 17) && (bufPtr[0] == 0xff) && (bufPtr[1] == 0xff) && (bufPtr[15] == 0xff) && (bufPtr[16] == 0xff)) {
-					memcpy(uid, bufPtr + 2, 10);
-					memcpy(atqa, bufPtr + 2 + 10, 2);
-					switch (atqa[0] & 0xC0) {
-						case 0x80: uid_len = 10; break;
-						case 0x40: uid_len = 7; break;
-						default:   uid_len = 4; break;
-					}
-					sak = bufPtr[14];
-					PrintAndLogEx(SUCCESS, "UID %s | ATQA %02x %02x | SAK 0x%02x", 
-						sprint_hex(uid, uid_len),
-						atqa[1], 
-						atqa[0], 
-						sak);
-					if (wantLogToFile || wantDecrypt) {
-						FillFileNameByUID(logHexFileName, uid, ".log", uid_len);
-						AddLogCurrentDT(logHexFileName);
-						PrintAndLogEx(SUCCESS, "Trace saved to %s", logHexFileName);
-					}						
-					if (wantDecrypt)
-						mfTraceInit(uid, uid_len, atqa, sak, wantSaveToEmlFile);
-				} else {
-					PrintAndLogEx(NORMAL, "%03d| %s |%s", num, isTag ? "TAG" : "RDR", sprint_hex(bufPtr, len));
-					if (wantLogToFile) 
-						AddLogHex(logHexFileName, isTag ? "TAG| ":"RDR| ", bufPtr, len);
-					if (wantDecrypt) 
-						mfTraceDecode(bufPtr, len, wantSaveToEmlFile);
-					num++;	
-				}
-				bufPtr += len;
-				bufPtr += ((len-1)/8+1);	// ignore parity
-			}
-			pckNum = 0;
-		}
-	} // while (true)
-
-	free(buf);
-	return 0;
-}
-
-int CmdHF14AMfDbg(const char *Cmd) {
-
-	char ctmp = tolower(param_getchar(Cmd, 0));
-	if (strlen(Cmd) < 1 || ctmp == 'h' ) return usage_hf14_dbg();
-	
-	uint8_t dbgMode = param_get8ex(Cmd, 0, 0, 10);
-	if (dbgMode > 4) return usage_hf14_dbg();
-
-	UsbCommand c = {CMD_MIFARE_SET_DBGMODE, {dbgMode, 0, 0}};
-	SendCommand(&c);
-	return 0;
-}
-
-int CmdHF14AMfKeyBrute(const char *Cmd) {
-
-	uint8_t blockNo = 0, keytype = 0;
-	uint8_t key[6] = {0, 0, 0, 0, 0, 0};
-	uint64_t foundkey = 0;
-	
-	char cmdp = tolower(param_getchar(Cmd, 0));	
-	if ( cmdp == 'h' ) return usage_hf14_keybrute();
-	
-	// block number
-	blockNo = param_get8(Cmd, 0);	 
-	
-	// keytype
-	cmdp = tolower(param_getchar(Cmd, 1));
-	if ( cmdp == 'b' ) keytype = 1;
-	
-	// key
-	if (param_gethex(Cmd, 2, key, 12)) return usage_hf14_keybrute();
-	
-	uint64_t t1 = msclock();
-	
-	if (mfKeyBrute( blockNo, keytype, key, &foundkey))
-		PrintAndLogEx(SUCCESS, "found valid key: %012" PRIx64 " \n", foundkey);
-	else
-		PrintAndLogEx(FAILED, "key not found");
-	
-	t1 = msclock() - t1;
-	PrintAndLogEx(SUCCESS, "\ntime in keybrute: %.0f seconds\n", (float)t1/1000.0);
-	return 0;	
-}
-
-void printKeyTable( uint8_t sectorscnt, sector_t *e_sector ){
-	char strA[12+1] = {0};
-	char strB[12+1] = {0};	
-	PrintAndLogEx(NORMAL, "|---|----------------|---|----------------|---|");
-	PrintAndLogEx(NORMAL, "|sec|key A           |res|key B           |res|");
-	PrintAndLogEx(NORMAL, "|---|----------------|---|----------------|---|");
-	for (uint8_t i = 0; i < sectorscnt; ++i) {
-		
-		snprintf(strA, sizeof(strA), "------------");
-		snprintf(strB, sizeof(strB), "------------");
-		
-		if ( e_sector[i].foundKey[0] )
-			snprintf(strA, sizeof(strA), "%012" PRIx64, e_sector[i].Key[0]);
-		
-		if ( e_sector[i].foundKey[1] )
-			snprintf(strB, sizeof(strB), "%012" PRIx64, e_sector[i].Key[1]);
-
-		
-		PrintAndLogEx(NORMAL, "|%03d|  %s  | %d |  %s  | %d |"
-			, i
-			, strA, e_sector[i].foundKey[0]
-			, strB, e_sector[i].foundKey[1]
-		);
-	}
-	PrintAndLogEx(NORMAL, "|---|----------------|---|----------------|---|");
-}
-
-// EMULATOR COMMANDS
-int CmdHF14AMfEGet(const char *Cmd) {
-	uint8_t blockNo = 0;
-	uint8_t data[16] = {0x00};
-	char c = tolower(param_getchar(Cmd, 0));
-	
-	if (strlen(Cmd) < 1 || c == 'h') return usage_hf14_eget();
-	
-	blockNo = param_get8(Cmd, 0);
-
-	PrintAndLogEx(NORMAL, "");
-	if (!mfEmlGetMem(data, blockNo, 1)) {
-		PrintAndLogEx(NORMAL, "data[%3d]:%s", blockNo, sprint_hex(data, sizeof(data)));
-	} else {
-		PrintAndLogEx(WARNING, "Command execute timeout");
-	}
-  return 0;
-}
-
-int CmdHF14AMfEClear(const char *Cmd) {
-	char c = tolower(param_getchar(Cmd, 0));
-	if (c == 'h') return usage_hf14_eclr();
-	
-	UsbCommand cmd = {CMD_MIFARE_EML_MEMCLR, {0, 0, 0}};
-	clearCommandBuffer();
-	SendCommand(&cmd);
-	return 0;
-}
-
-int CmdHF14AMfESet(const char *Cmd) {
-	char c = tolower(param_getchar(Cmd, 0));
-	uint8_t memBlock[16];
-	uint8_t blockNo = 0;
-	memset(memBlock, 0x00, sizeof(memBlock));
-
-	if (strlen(Cmd) < 3 || c == 'h')
-		return usage_hf14_eset();
-	
-	blockNo = param_get8(Cmd, 0);
-	
-	if (param_gethex(Cmd, 1, memBlock, 32)) {
-		PrintAndLogEx(WARNING, "block data must include 32 HEX symbols");
-		return 1;
-	}
-	
-	//  1 - blocks count
-	return mfEmlSetMem(memBlock, blockNo, 1);
-}
-
-int CmdHF14AMfELoad(const char *Cmd) {
-
-	size_t counter = 0;
-	char filename[FILE_PATH_SIZE];
-	int blockNum, numBlocks, nameParamNo = 1;
-	uint8_t blockWidth = 16;
-	char c = tolower(param_getchar(Cmd, 0));
-
-	if ( strlen(Cmd) < 2 &&  c == 'h' ) 
-		return usage_hf14_eload();
-	
-	switch (c) {
-		case '0' : numBlocks = MIFARE_MINI_MAXBLOCK; break;
-		case '1' : 
-		case '\0': numBlocks = MIFARE_1K_MAXBLOCK; break;
-		case '2' : numBlocks = MIFARE_2K_MAXBLOCK; break;
-		case '4' : numBlocks = MIFARE_4K_MAXBLOCK; break;
-		case 'u' : numBlocks = 255; blockWidth = 4; break;
-		default:  {
-			numBlocks = MIFARE_1K_MAXBLOCK;
-			nameParamNo = 0;
-		}
-	}
-	uint32_t numblk2 = param_get32ex(Cmd, 2, 0, 10);
-	if (numblk2 > 0) 
-		numBlocks = numblk2;
-
-	param_getstr(Cmd, nameParamNo, filename, sizeof(filename));
-	
-	uint8_t *data = calloc(4096, sizeof(uint8_t));
-	size_t datalen = 0;
-	//int res = loadFile(filename, "bin", data, &datalen);
-	int res = loadFileEML( filename, "eml", data, &datalen);
-	if ( res ) {
-		free(data);
-		return 1;
-	}
-	
-	// 64 or 256 blocks.
-	if ( (datalen % blockWidth) != 0 ) {
-		PrintAndLogEx(FAILED, "File content error. Size doesn't match blockwidth ");
-		free(data);		
-		return 2;
-	}
-	
-	PrintAndLogEx(INFO, "Copying to emulator memory");
-	
-	blockNum = 0;
-	while ( datalen ) {
-		
-		if (mfEmlSetMem_xt(data + counter, blockNum, 1, blockWidth)) {
-			PrintAndLogEx(FAILED, "Cant set emul block: %3d", blockNum);
-			free(data);
-			return 3;
-		}
-		printf("."); fflush(stdout);
-		
-		blockNum++;
-		counter += blockWidth;
-		datalen -= blockWidth;
-	}
-	PrintAndLogEx(NORMAL, "\n");
-
-	// Ultralight /Ntag
-	if ( blockWidth == 4 ) {
-		if ((blockNum != numBlocks)) {		
-			PrintAndLogEx(FAILED, "Warning, Ultralight/Ntag file content, Loaded %d blocks into emulator memory", blockNum);
-			free(data);
-			return 0;
-		}
-	} else {
-		if ((blockNum != numBlocks)) {
-			PrintAndLogEx(FAILED, "Error, file content, Only loaded %d blocks, must be %d blocks into emulator memory", blockNum, numBlocks);
-			free(data);
-			return 4;
-		}
-	}
-	PrintAndLogEx(SUCCESS, "Loaded %d blocks from file: " _YELLOW_(%s), blockNum, filename);
-	free(data);
-	return 0;
-}
-
-int CmdHF14AMfESave(const char *Cmd) {
-
-	char filename[FILE_PATH_SIZE];
-	char * fnameptr = filename;
-	uint8_t *dump;
-	int len, bytes, nameParamNo = 1;
-	uint16_t blocks;
-
-	memset(filename, 0, sizeof(filename));
-
-	char c = tolower(param_getchar(Cmd, 0));	
-	if (c == 'h') return usage_hf14_esave();
-
-	blocks = NumOfBlocks(c);
-	bytes = blocks * MFBLOCK_SIZE;	
-
-	dump = calloc(bytes, sizeof(uint8_t));
-	if (!dump) {
-		PrintAndLogEx(WARNING, "Fail, cannot allocate memory");
-		return 1;
-	}
-	memset(dump, 0, bytes);
-	
-	PrintAndLogEx(INFO, "downloading from emulator memory");
-	if (!GetFromDevice( BIG_BUF_EML, dump, bytes, 0, NULL, 2500, false)) {
-		PrintAndLogEx(WARNING, "Fail, transfer from device time-out");
-		free(dump);
-		return 2;
-	}	
-
-	len = param_getstr(Cmd, nameParamNo, filename, sizeof(filename));
-	if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5;
-	
-	// user supplied filename?
-	if (len < 1) {
-		fnameptr += sprintf(fnameptr, "hf-mf-");
-		FillFileNameByUID(fnameptr, dump, "-dump", 4);
-	}
-	
-	saveFile(filename, "bin", dump, bytes);
-	saveFileEML(filename, "eml", dump, bytes, MFBLOCK_SIZE);
-	saveFileJSON(filename, "json", jsfCardMemory, dump, bytes);
-	free(dump);
-	return 0;
-}
-
-int CmdHF14AMfECFill(const char *Cmd) {
-	uint8_t keyType = 0;
-	uint8_t numSectors = 16;
-	char c = tolower(param_getchar(Cmd, 0));
-	
-	if (strlen(Cmd) < 1 || c == 'h')
-		return usage_hf14_ecfill();
-
-	if (c != 'a' &&  c != 'b') {
-		PrintAndLogEx(WARNING, "Key type must be A or B");
-		return 1;
-	}
-	if (c != 'a')
-		keyType = 1;
-
-	c = tolower(param_getchar(Cmd, 1));
-	numSectors = NumOfSectors(c);
-
-	PrintAndLogEx(NORMAL, "--params: numSectors: %d, keyType: %c\n", numSectors, (keyType == 0) ? 'A' : 'B');
-	UsbCommand cmd = {CMD_MIFARE_EML_CARDLOAD, {numSectors, keyType, 0}};
-	clearCommandBuffer();
-	SendCommand(&cmd);
-	return 0;
-}
-
-int CmdHF14AMfEKeyPrn(const char *Cmd) {
-	int i;
-	uint8_t numSectors;
-	uint8_t data[16];
-	uint64_t keyA, keyB;
-
-	char c = tolower(param_getchar(Cmd, 0));
-	if ( c == 'h' )
-		return usage_hf14_ekeyprn();
-
-	numSectors = NumOfSectors(c);
-	
-	PrintAndLogEx(NORMAL, "|---|----------------|----------------|");
-	PrintAndLogEx(NORMAL, "|sec|key A           |key B           |");
-	PrintAndLogEx(NORMAL, "|---|----------------|----------------|");
-	for (i = 0; i < numSectors; i++) {
-		if (mfEmlGetMem(data, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1)) {
-			PrintAndLogEx(WARNING, "error get block %d", FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1);
-			break;
-		}
-		keyA = bytes_to_num(data, 6);
-		keyB = bytes_to_num(data + 10, 6);
-		PrintAndLogEx(NORMAL, "|%03d|  %012" PRIx64 "  |  %012" PRIx64 "  |", i, keyA, keyB);
-	}
-	PrintAndLogEx(NORMAL, "|---|----------------|----------------|");
-	return 0;
-}
-
-// CHINESE MAGIC COMMANDS 
-int CmdHF14AMfCSetUID(const char *Cmd) {
-	uint8_t wipeCard = 0;
-	uint8_t uid[8] = {0x00};
-	uint8_t oldUid[8] = {0x00};
-	uint8_t atqa[2] = {0x00};
-	uint8_t sak[1] = {0x00};
-	uint8_t atqaPresent = 1;
-	int res, argi = 0;
-	char ctmp;
-
-	if (strlen(Cmd) < 1 || param_getchar(Cmd, argi) == 'h') 
-		return usage_hf14_csetuid();
-
-	if (param_getchar(Cmd, argi) && param_gethex(Cmd, argi, uid, 8))
-		return usage_hf14_csetuid();
-
-	argi++;
-
-	ctmp = tolower(param_getchar(Cmd, argi));
-	if (ctmp == 'w') {
-		wipeCard = 1;
-		atqaPresent = 0;
-	}
-
-	if (atqaPresent) {
-		if (param_getchar(Cmd, argi)) {
-			if (param_gethex(Cmd, argi, atqa, 4)) {
-				PrintAndLogEx(WARNING, "ATQA must include 4 HEX symbols");
-				return 1;
-			}
-			argi++;
-			if (!param_getchar(Cmd, argi) || param_gethex(Cmd, argi, sak, 2)) {
-				PrintAndLogEx(WARNING, "SAK must include 2 HEX symbols");
-				return 1;
-			}
-			argi++;
-		} else
-			atqaPresent = 0;
-	}
-
-	if (!wipeCard) {
-		ctmp = tolower(param_getchar(Cmd, argi));
-		if (ctmp == 'w') {
-			wipeCard = 1;
-		}
-	}
-
-	PrintAndLogEx(NORMAL, "--wipe card:%s  uid:%s", (wipeCard)?"YES":"NO", sprint_hex(uid, 4));
-
-	res = mfCSetUID(uid, (atqaPresent) ? atqa : NULL, (atqaPresent) ? sak : NULL, oldUid, wipeCard);
-	if (res) {
-		PrintAndLogEx(WARNING, "Can't set UID. error=%d", res);
-		return 1;
-	}
-	
-	PrintAndLogEx(SUCCESS, "old UID:%s", sprint_hex(oldUid, 4));
-	PrintAndLogEx(SUCCESS, "new UID:%s", sprint_hex(uid, 4));
-	return 0;
-}
-
-int CmdHF14AMfCSetBlk(const char *Cmd) {
-	uint8_t block[16] = {0x00};
-	uint8_t blockNo = 0;
-	uint8_t params = MAGIC_SINGLE;
-	int res;
-	char ctmp = tolower(param_getchar(Cmd, 0));
-
-	if (strlen(Cmd) < 1 || ctmp == 'h') return usage_hf14_csetblk();
-
-	blockNo = param_get8(Cmd, 0);
-
-	if (param_gethex(Cmd, 1, block, 32)) return usage_hf14_csetblk();
-	
-	ctmp = tolower(param_getchar(Cmd, 2));
-	if (ctmp == 'w')
-		params |= MAGIC_WIPE;
-	
-	PrintAndLogEx(NORMAL, "--block number:%2d data:%s", blockNo, sprint_hex(block, 16));
-
-	res = mfCSetBlock(blockNo, block, NULL, params);
-	if (res) {
-		PrintAndLogEx(WARNING, "Can't write block. error=%d", res);
-		return 1;
-	}
-	return 0;
-}
-
-int CmdHF14AMfCLoad(const char *Cmd) {
-
-	uint8_t buf8[16] = {0x00};
-	uint8_t fillFromEmulator = 0;
-	int blockNum, flags = 0;
-	bool fillFromJson = false;
-	bool fillFromBin = false;
-	char fileName[50] = {0};
-	
-	char ctmp = tolower(param_getchar(Cmd, 0));
-	if ( param_getlength(Cmd, 0) == 1 ) {
-		if (ctmp == 'h' || ctmp == 0x00) return usage_hf14_cload();
-		if (ctmp == 'e' ) fillFromEmulator = 1;
-		if (ctmp == 'j' ) fillFromJson = true;
-		if (ctmp == 'b' ) fillFromBin = true;
-	}
-
-	if (fillFromJson || fillFromBin)
-		param_getstr(Cmd, 1, fileName, sizeof(fileName));
-
-	
-	if (fillFromEmulator) {
-		for (blockNum = 0; blockNum < 16 * 4; blockNum += 1) {
-			if (mfEmlGetMem(buf8, blockNum, 1)) {
-				PrintAndLogEx(WARNING, "Cant get block: %d", blockNum);
-				return 2;
-			}
-			if (blockNum == 0) flags = MAGIC_INIT + MAGIC_WUPC;				// switch on field and send magic sequence
-			if (blockNum == 1) flags = 0;									// just write
-			if (blockNum == 16 * 4 - 1) flags = MAGIC_HALT + MAGIC_OFF;		// Done. Magic Halt and switch off field.
-
-			if (mfCSetBlock(blockNum, buf8, NULL, flags)) {
-				PrintAndLogEx(WARNING, "Cant set magic card block: %d", blockNum);
-				return 3;
-			}
-			printf("."); fflush(stdout);
-		}
-		PrintAndLogEx(NORMAL, "\n");
-		return 0;
-	}
-
-	size_t maxdatalen = 4096;
-	uint8_t *data = calloc(maxdatalen, sizeof(uint8_t));
-	size_t datalen = 0;
-	int res = 0;
-	if (fillFromBin) {
-		res = loadFile(fileName, "bin", data, &datalen);
-	} else {
-		if (fillFromJson) {
-			res = loadFileJSON(fileName, "json", data, maxdatalen, &datalen);
-		} else {
-			res = loadFileEML( Cmd, "eml", data, &datalen);
-		}
-	}
-	
-	if ( res ) {
-		if ( data )
-			free(data);
-		return 1;
-	}
-	
-//	PrintAndLogEx(INFO, "DATA | %s", sprint_hex(data+1000, 24) );
-	
-
-	// 64 or 256blocks.
-	if (datalen != 1024 && datalen != 4096) {
-		PrintAndLogEx(WARNING, "File content error. ");
-		free(data);
-		return 2;
-	}
-	
-	PrintAndLogEx(INFO, "Copying to magic card");
-			
-	blockNum = 0;
-	while ( datalen ) {
-
-		// switch on field and send magic sequence	
-		if (blockNum == 0) flags = MAGIC_INIT + MAGIC_WUPC;
-
-		// write					
-		if (blockNum == 1) flags = 0;
-		
-		// Switch off field.
-		if (blockNum == 16 * 4 - 1) flags = MAGIC_HALT + MAGIC_OFF;
-
-		if (mfCSetBlock(blockNum, data + (16 * blockNum), NULL, flags)) {
-			PrintAndLogEx(WARNING, "Can't set magic card block: %d", blockNum);
-			free(data);
-			return 3;
-		}
-		
-		datalen -= 16;
-		
-		printf("."); fflush(stdout);
-		blockNum++;
-		
-		// magic card type - mifare 1K
-		if (blockNum >= MIFARE_1K_MAXBLOCK ) break;  
-	}
-	PrintAndLogEx(NORMAL, "\n");
-
-	// 64 or 256blocks.
-	if (blockNum != 16 * 4 && blockNum != 32 * 4 + 8 * 16){
-		PrintAndLogEx(WARNING, "File content error. There must be 64 blocks");
-		free(data);
-		return 4;
-	}
-	
-	PrintAndLogEx(SUCCESS, "Card loaded %d blocks from file", blockNum);	
-	free(data);
-	return 0;
-}
-
-int CmdHF14AMfCGetBlk(const char *Cmd) {
-	uint8_t data[16] = {0};
-	uint8_t blockNo = 0;
-	int res;
-	memset(data, 0x00, sizeof(data));
-
-	char ctmp = tolower(param_getchar(Cmd, 0));
-	if (strlen(Cmd) < 1 || ctmp == 'h') return usage_hf14_cgetblk();
-
-	blockNo = param_get8(Cmd, 0);
-
-	PrintAndLogEx(NORMAL, "--block number:%2d ", blockNo);
-
-	res = mfCGetBlock(blockNo, data, MAGIC_SINGLE);
-	if (res) {
-		PrintAndLogEx(WARNING, "Can't read block. error=%d", res);
-		return 1;
-	}
-	
-	PrintAndLogEx(NORMAL, "data: %s", sprint_hex(data, sizeof(data)));
-	
-	if (mfIsSectorTrailer(blockNo)) {
-		PrintAndLogEx(NORMAL, "Trailer decoded:");
-		PrintAndLogEx(NORMAL, "Key A: %s", sprint_hex_inrow(data, 6));
-		PrintAndLogEx(NORMAL, "Key B: %s", sprint_hex_inrow(&data[10], 6));
-		int bln = mfFirstBlockOfSector(mfSectorNum(blockNo));
-		int blinc = (mfNumBlocksPerSector(mfSectorNum(blockNo)) > 4) ? 5 : 1;
-		for (int i = 0; i < 4; i++) {
-			PrintAndLogEx(NORMAL, "Access block %d%s: %s", bln, ((blinc > 1) && (i < 3) ? "+" : "") , mfGetAccessConditionsDesc(i, &data[6]));
-			bln += blinc;
-		}
-		PrintAndLogEx(NORMAL, "UserData: %s", sprint_hex_inrow(&data[9], 1));
-	}
-		
-	return 0;
-}
-
-int CmdHF14AMfCGetSc(const char *Cmd) {
-	uint8_t data[16] = {0};
-	uint8_t sector = 0;
-	int i, res, flags;
-
-	char ctmp = tolower(param_getchar(Cmd, 0));
-	if (strlen(Cmd) < 1 || ctmp == 'h') return usage_hf14_cgetsc();
-
-	sector = param_get8(Cmd, 0);
-	if (sector > 39) {
-		PrintAndLogEx(WARNING, "Sector number must be less then 40");
-		return 1;
-	}
-
-	PrintAndLogEx(NORMAL, "\n  # | data    |  Sector | %02d/ 0x%02X ", sector, sector);
-	PrintAndLogEx(NORMAL, "----+------------------------------------------------");
-	uint8_t blocks = 4;
-	uint8_t start = sector * 4;
-	if ( sector > 32 ) {
-		blocks = 16;
-		start = 128 + ( sector - 32 ) * 16;
-	}
-	
-	flags = MAGIC_INIT + MAGIC_WUPC;
-	
-	for (i = 0; i < blocks; i++) {
-		if (i == 1) flags = 0;
-		if (i == blocks-1) flags = MAGIC_HALT + MAGIC_OFF;
-
-		res = mfCGetBlock( start + i, data, flags);
-		if (res) {
-			PrintAndLogEx(WARNING, "Can't read block. %d error=%d", start + i, res);
-			return 1;
-		}
-		PrintAndLogEx(NORMAL, "%3d | %s", start + i, sprint_hex(data, 16));
-	}
-	return 0;
-}
-
-int CmdHF14AMfCSave(const char *Cmd) {
-
-	char filename[FILE_PATH_SIZE];
-	char * fnameptr = filename;
-	uint8_t *dump;	
-	bool fillEmulator = false;
-	bool errors = false, hasname = false, useuid = false;
-	int i, len, flags;
-	uint8_t numblocks = 0, cmdp = 0;
-	uint16_t bytes = 0;
-	char ctmp;
-
-	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		ctmp = tolower(param_getchar(Cmd, cmdp));
-		switch (ctmp) {	
-		case 'e':
-			useuid = true;
-			fillEmulator = true;
-			cmdp++;
-			break;
-		case 'h':
-			return usage_hf14_csave();
-		case '0':
-		case '1':
-		case '2':
-		case '4':
-			numblocks = NumOfBlocks(ctmp);
-			bytes =  numblocks * MFBLOCK_SIZE;
-			PrintAndLogEx(SUCCESS, "Saving magic mifare %cK", ctmp);
-			cmdp++;
-			break;
-		case 'u':
-			useuid = true;
-			hasname = true;
-			cmdp++;			
-			break;
-		case 'o':
-			len = param_getstr(Cmd, cmdp+1, filename, FILE_PATH_SIZE);
-			if (len < 1) {
-				errors = true;
-				break;
-			}
-
-			useuid = false;
-			hasname = true;		
-			cmdp += 2;
-			break;			
-		default:
-			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-			errors = true;
-			break;
-		}
-	}
-
-	if (!hasname && !fillEmulator) errors = true;
-	
-	if (errors || cmdp == 0) return usage_hf14_csave();
-
-	dump = calloc(bytes, sizeof(uint8_t));
-	if (!dump) {
-		PrintAndLogEx(WARNING, "Fail, cannot allocate memory");
-		return 1;
-	}
-	memset(dump, 0, bytes);
-	
-	flags = MAGIC_INIT + MAGIC_WUPC;
-	for (i = 0; i < numblocks; i++) {
-		if (i == 1) flags = 0;
-		if (i == numblocks - 1) flags = MAGIC_HALT + MAGIC_OFF;
-	
-		if (mfCGetBlock(i, dump + (i*MFBLOCK_SIZE), flags)) {
-			PrintAndLogEx(WARNING, "Cant get block: %d", i);
-			free(dump);
-			return 2;
-		}
-	}
-	
-	if ( useuid ){
-		fnameptr += sprintf(fnameptr, "hf-mf-");		
-		FillFileNameByUID(fnameptr, dump, "-dump", 4);
-	}
-	
-	if (fillEmulator) {
-		PrintAndLogEx(INFO, "uploading to emulator memory");
-		for (i = 0; i < numblocks; i += 5) {			
-			if (mfEmlSetMem(dump + (i*MFBLOCK_SIZE), i, 5)) {
-				PrintAndLogEx(WARNING, "Cant set emul block: %d", i);
-			}
-			printf("."); fflush(stdout);
-		}
-		PrintAndLogEx(NORMAL, "\n");
-		PrintAndLogEx(SUCCESS, "uploaded %d bytes to emulator memory", bytes);
-	}
-
-	saveFile(filename, "bin", dump, bytes);
-	saveFileEML(filename, "eml", dump, bytes, MFBLOCK_SIZE);
-	saveFileJSON(filename, "json", jsfCardMemory, dump, bytes);
-	free(dump);
-	return 0;
-}
-
-//needs nt, ar, at, Data to decrypt
-int CmdHf14AMfDecryptBytes(const char *Cmd){
-	
-	char ctmp = tolower(param_getchar(Cmd, 0));
-	if (strlen(Cmd) < 1 || ctmp == 'h') return usage_hf14_decryptbytes();
-	
-	uint32_t nt 	= param_get32ex(Cmd,0,0,16);
-	uint32_t ar_enc = param_get32ex(Cmd,1,0,16);
-	uint32_t at_enc = param_get32ex(Cmd,2,0,16);
-
-	int len = param_getlength(Cmd, 3);
-	if (len & 1 ) {
-		PrintAndLogEx(WARNING, "Uneven hex string length. LEN=%d", len);
-		return 1;
-	}
-
-	PrintAndLogEx(NORMAL, "nt\t%08X", nt);
-	PrintAndLogEx(NORMAL, "ar enc\t%08X", ar_enc);
-	PrintAndLogEx(NORMAL, "at enc\t%08X", at_enc);
-		
-	uint8_t *data = calloc(len, sizeof(uint8_t));
-	param_gethex_ex(Cmd, 3, data, &len);
-	len >>= 1;
-	tryDecryptWord( nt, ar_enc, at_enc, data, len);
-	free (data);
-	return 0;
-}
-
-int CmdHf14AMfSetMod(const char *Cmd) {
-	uint8_t key[6] = {0, 0, 0, 0, 0, 0};
-	uint8_t mod = 2;
-
-	char ctmp = param_getchar(Cmd, 0);
-	if (ctmp == '0') {
-		mod = 0;
-	} else if (ctmp == '1') {
-		mod = 1;
-	}
-	int gethexfail = param_gethex(Cmd, 1, key, 12);
-	if (mod == 2 || gethexfail) {
-		PrintAndLogEx(NORMAL, "Sets the load modulation strength of a MIFARE Classic EV1 card.");
-		PrintAndLogEx(NORMAL, "Usage: hf mf setmod <0|1> <block 0 key A>");
-		PrintAndLogEx(NORMAL, "       0 = normal modulation");
-		PrintAndLogEx(NORMAL, "       1 = strong modulation (default)");
-		return 1;
-	}
-
-	UsbCommand c = {CMD_MIFARE_SETMOD, {mod, 0, 0}};
-	memcpy(c.d.asBytes, key, 6);
-	clearCommandBuffer();
-	SendCommand(&c);
-
-	UsbCommand resp;
-	if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-		uint8_t ok = resp.arg[0] & 0xff;
-		PrintAndLogEx(SUCCESS, "isOk:%02x", ok);
-		if (!ok)
-			PrintAndLogEx(FAILED, "Failed.");
-	} else {
-		PrintAndLogEx(WARNING, "Command execute timeout");
-	}
-	return 0;
-}
-
-// Mifare NACK bug detection
-int CmdHf14AMfNack(const char *Cmd) {
-
-	bool verbose = false;
-	char ctmp = tolower(param_getchar(Cmd, 0));
-	if ( ctmp == 'h' ) return usage_hf14_nack();
-	if ( ctmp == 'v' ) verbose = true;
-
-	if ( verbose )
-		PrintAndLogEx(INFO, "Started testing card for NACK bug. Press key to abort");
-	
-	detect_classic_nackbug(verbose);
-	return 0;
-}
-
-int CmdHF14AMfice(const char *Cmd) {
-
-	uint8_t blockNo = 0;
-	uint8_t keyType = 0;
-	uint8_t trgBlockNo = 0;
-	uint8_t trgKeyType = 1;
-	bool slow = false;
-	bool initialize = true;
-	bool acquisition_completed = false;
-	uint8_t cmdp=0;
-	uint32_t flags = 0;
-	uint32_t total_num_nonces = 0;
-	char ctmp;
-	char filename[FILE_PATH_SIZE], *fptr;
-	FILE *fnonces = NULL;
-	UsbCommand resp;
-
-	uint32_t part_limit = 3000;
-	uint32_t limit = 50000;
-
-	while ((ctmp = param_getchar(Cmd, cmdp))) {
-		switch(tolower(ctmp))
-		{
-		case 'h':
-			return usage_hf14_ice();
-		case 'f':
-			param_getstr(Cmd, cmdp+1, filename, FILE_PATH_SIZE);
-			cmdp++;
-			break;
-		case 'l':
-			limit = param_get32ex(Cmd, cmdp+1, 50000, 10);
-			cmdp++;
-			break;
-		default:
-			PrintAndLogEx(WARNING, "Unknown parameter '%c'\n", ctmp);
-			usage_hf14_ice();
-			return 1;
-		}
-		cmdp++;
-	}
-
-	if(filename[0]=='\0')
-	{
-		fptr = GenerateFilename("hf-mf-","-nonces.bin");
-		if (fptr == NULL) 
-			return 1;
-		strcpy(filename, fptr);
-	}
-
-	PrintAndLogEx(NORMAL, "Collecting %u nonces \n", limit);
-	
-	if ((fnonces = fopen(filename,"wb")) == NULL) { 
-		PrintAndLogEx(WARNING, "Could not create file " _YELLOW_(%s),filename);
-		return 3;
-	}
-
-	clearCommandBuffer();
-
-	uint64_t t1 = msclock();
-	
-	do {
-		if (ukbhit()) {
-			int gc = getchar(); (void)gc;
-			PrintAndLogEx(INFO, "\naborted via keyboard!\n");
-			break;
-		}
-		
-		flags = 0;
-		flags |= initialize ? 0x0001 : 0;
-		flags |= slow ? 0x0002 : 0;
-		UsbCommand c = {CMD_MIFARE_ACQUIRE_NONCES, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, flags}};
-		clearCommandBuffer();
-		SendCommand(&c);		
-	
-		if (!WaitForResponseTimeout(CMD_ACK, &resp, 3000)) goto out;
-		if (resp.arg[0])  goto out;
-
-		uint32_t items = resp.arg[2];
-		if (fnonces) {
-			fwrite(resp.d.asBytes, 1, items*4, fnonces);
-			fflush(fnonces);
-		}
-	
-		total_num_nonces += items;
-		if ( total_num_nonces > part_limit ) {
-			PrintAndLogEx(INFO, "Total nonces %u\n", total_num_nonces);
-			part_limit += 3000;
-		}
-		
-		acquisition_completed = ( total_num_nonces > limit); 
-
-		initialize = false;
-		
-	} while (!acquisition_completed);
-
-out:
-	PrintAndLogEx(SUCCESS, "time: %" PRIu64 " seconds\n", (msclock()-t1)/1000);
-	
-	if ( fnonces ) {
-		fflush(fnonces);
-		fclose(fnonces);
-	}
-
-	UsbCommand c = {CMD_MIFARE_ACQUIRE_NONCES, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, 4}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
-}
-
-int CmdHF14AMfAuth4(const char *Cmd) {
-	uint8_t keyn[20] = {0};
-	int keynlen = 0;
-	uint8_t key[16] = {0};
-	int keylen = 0;
-
-	CLIParserInit("hf mf auth4", 
-		"Executes AES authentication command in ISO14443-4", 
-		"Usage:\n\thf mf auth4 4000 000102030405060708090a0b0c0d0e0f -> executes authentication\n"
-			"\thf mf auth4 9003 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -> executes authentication\n");
-
-	void* argtable[] = {
-		arg_param_begin,
-		arg_str1(NULL,  NULL,     "<Key Num (HEX 2 bytes)>", NULL),
-		arg_str1(NULL,  NULL,     "<Key Value (HEX 16 bytes)>", NULL),
-		arg_param_end
-	};
-	CLIExecWithReturn(Cmd, argtable, true);
-	
-	CLIGetHexWithReturn(1, keyn, &keynlen);
-	CLIGetHexWithReturn(2, key, &keylen);
-	CLIParserFree();
-	
-	if (keynlen != 2) {
-		PrintAndLogEx(ERR, "<Key Num> must be 2 bytes long instead of: %d", keynlen);
-		return 1;
-	}
-	
-	if (keylen != 16) {
-		PrintAndLogEx(ERR, "<Key Value> must be 16 bytes long instead of: %d", keylen);
-		return 1;
-	}
-
-	return MifareAuth4(NULL, keyn, key, true, false, true);
-}
-
-// https://www.nxp.com/docs/en/application-note/AN10787.pdf
-int CmdHF14AMfMAD(const char *cmd) {
-
-	CLIParserInit("hf mf mad", 
-		"Checks and prints Mifare Application Directory (MAD)", 
-		"Usage:\n\thf mf mad -> shows MAD if exists\n"
-			"\thf mf mad -a 03e1 -k ffffffffffff -b -> shows NDEF data if exists. read card with custom key and key B\n");
-
-	void* argtable[] = {
-		arg_param_begin,
-		arg_lit0("vV",  "verbose",  "show technical data"),
-		arg_str0("aA",  "aid",      "print all sectors with aid", NULL),
-		arg_str0("kK",  "key",      "key for printing sectors", NULL),
-		arg_lit0("bB",  "keyb",     "use key B for access printing sectors (by default: key A)"),
-		arg_param_end
-	};
-	CLIExecWithReturn(cmd, argtable, true);
-	bool verbose = arg_get_lit(1);
-	uint8_t aid[2] = {0};
-	int aidlen;
-	CLIGetHexWithReturn(2, aid, &aidlen);
-	uint8_t key[6] = {0};
-	int keylen;
-	CLIGetHexWithReturn(3, key, &keylen);
-	bool keyB = arg_get_lit(4);
-	
-	CLIParserFree();
-
-	if (aidlen != 2 && keylen > 0) {
-		PrintAndLogEx(WARNING, "do not need a key without aid.");
-	}
-
-	uint8_t sector0[16 * 4] = {0};
-	uint8_t sector10[16 * 4] = {0};
-	if (mfReadSector(MF_MAD1_SECTOR, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector0)) {
-		PrintAndLogEx(ERR, "read sector 0 error. card don't have MAD or don't have MAD on default keys.");
-		return 2;
-	}
-	
-	if (verbose) {
-		for(int i = 0; i < 4; i ++)
-			PrintAndLogEx(NORMAL, "[%d] %s", i, sprint_hex(&sector0[i * 16], 16));		
-	}
-
-	bool haveMAD2 = false;
-	MAD1DecodeAndPrint(sector0, verbose, &haveMAD2);
-	
-	if (haveMAD2) {
-		if (mfReadSector(MF_MAD2_SECTOR, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector10)) {
-			PrintAndLogEx(ERR, "read sector 0x10 error. card don't have MAD or don't have MAD on default keys.");
-			return 2;
-		}
-
-		MAD2DecodeAndPrint(sector10, verbose);
-	}
-
-	if (aidlen == 2) {
-		uint16_t aaid = (aid[0] << 8) + aid[1];
-		PrintAndLogEx(NORMAL, "\n-------------- AID 0x%04x ---------------", aaid);
-		
-		uint16_t mad[7 + 8 + 8 + 8 + 8] = {0};
-		size_t madlen = 0;
-		if (MADDecode(sector0, sector10, mad, &madlen)) {
-			PrintAndLogEx(ERR, "can't decode mad.");
-			return 10;
-		}
-
-		uint8_t akey[6] = {0};
-		memcpy(akey, g_mifare_ndef_key, 6);
-		if (keylen == 6) {
-			memcpy(akey, key, 6);
-		}
-		
-		for (int i = 0; i < madlen; i++) {
-			if (aaid == mad[i]) {
-				uint8_t vsector[16 * 4] = {0};
-				if (mfReadSector(i + 1, keyB ? MF_KEY_B : MF_KEY_A, akey, vsector)) {
-					PrintAndLogEx(NORMAL, "");
-					PrintAndLogEx(ERR, "read sector %d error.", i + 1);
-					return 2;
-				}
-				
-				for(int j = 0; j < (verbose ? 4 : 3); j ++)
-					PrintAndLogEx(NORMAL, " [%03d] %s", (i + 1) * 4 + j, sprint_hex(&vsector[j * 16], 16));		
-			}
-		}		
-	}
-	
-	return 0;
-}
-
-int CmdHFMFNDEF(const char *cmd) {
-
-	CLIParserInit("hf mf ndef", 
-		"Prints NFC Data Exchange Format (NDEF)", 
-		"Usage:\n\thf mf ndef -> shows NDEF data\n"
-			"\thf mf ndef -a 03e1 -k ffffffffffff -b -> shows NDEF data with custom AID, key and with key B\n");
-
-	void* argtable[] = {
-		arg_param_begin,
-		arg_litn("vV",  "verbose",  0, 2, "show technical data"),
-		arg_str0("aA",  "aid",      "replace default aid for NDEF", NULL),
-		arg_str0("kK",  "key",      "replace default key for NDEF", NULL),
-		arg_lit0("bB",  "keyb",     "use key B for access sectors (by default: key A)"),
-		arg_param_end
-	};
-	CLIExecWithReturn(cmd, argtable, true);
-	
-	bool verbose = arg_get_lit(1);
-	bool verbose2 = arg_get_lit(1) > 1;
-	uint8_t aid[2] = {0};
-	int aidlen;
-	CLIGetHexWithReturn(2, aid, &aidlen);
-	uint8_t key[6] = {0};
-	int keylen;
-	CLIGetHexWithReturn(3, key, &keylen);
-	bool keyB = arg_get_lit(4);
-	
-	CLIParserFree();
-
-	uint16_t ndefAID = 0x03e1;
-	if (aidlen == 2)
-		ndefAID = (aid[0] << 8) + aid[1];
-	
-	uint8_t ndefkey[6] = {0};
-	memcpy(ndefkey, g_mifare_ndef_key, 6);
-	if (keylen == 6) {
-		memcpy(ndefkey, key, 6);
-	}
-	
-	uint8_t sector0[16 * 4] = {0};
-	uint8_t sector10[16 * 4] = {0};
-	uint8_t data[4096] = {0};
-	int datalen = 0;
-
-	PrintAndLogEx(NORMAL, "");
-	
-	if (mfReadSector(MF_MAD1_SECTOR, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector0)) {
-		PrintAndLogEx(ERR, "read sector 0 error. card don't have MAD or don't have MAD on default keys.");
-		return 2;
-	}
-	
-	bool haveMAD2 = false;
-	int res = MADCheck(sector0, NULL, verbose, &haveMAD2);
-	if (res) {
-		PrintAndLogEx(ERR, "MAD error %d.", res);
-		return res;
-	}
-	
-	if (haveMAD2) {
-		if (mfReadSector(MF_MAD2_SECTOR, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector10)) {
-			PrintAndLogEx(ERR, "read sector 0x10 error. card don't have MAD or don't have MAD on default keys.");
-			return 2;
-		}
-	}
-
-	uint16_t mad[7 + 8 + 8 + 8 + 8] = {0};
-	size_t madlen = 0;
-	if (MADDecode(sector0, (haveMAD2 ? sector10 : NULL), mad, &madlen)) {
-		PrintAndLogEx(ERR, "can't decode mad.");
-		return 10;
-	}
-
-	printf("data reading:");
-	for (int i = 0; i < madlen; i++) {
-		if (ndefAID == mad[i]) {
-			uint8_t vsector[16 * 4] = {0};
-			if (mfReadSector(i + 1, keyB ? MF_KEY_B : MF_KEY_A, ndefkey, vsector)) {
-				PrintAndLogEx(ERR, "read sector %d error.", i + 1);
-				return 2;
-			}
-			
-			memcpy(&data[datalen], vsector, 16 * 3);
-			datalen += 16 * 3;
-			
-			printf(".");
-		}
-	}
-	printf(" OK\n");
-	
-	if (!datalen) {
-		PrintAndLogEx(ERR, "no NDEF data.");
-		return 11;
-	}
-	
-	if (verbose2) {
-		PrintAndLogEx(NORMAL, "NDEF data:");
-		dump_buffer(data, datalen, stdout, 1);
-	}
-		
-	NDEFDecodeAndPrint(data, datalen, verbose);
-
-	return 0;
-}
-
-int CmdHF14AMfList(const char *Cmd) {
-	CmdTraceList("mf");
-	return 0;
-}
-
-static command_t CommandTable[] = {
-	{"help",		CmdHelp,				1, "This help"},
-	{"list",		CmdHF14AMfList,         0, "[Deprecated] List ISO 14443-a / Mifare history"},	
-	{"darkside",	CmdHF14AMfDarkside,		0, "Darkside attack. read parity error messages."},
-	{"nested",		CmdHF14AMfNested,		0, "Nested attack. Test nested authentication"},
-	{"hardnested", 	CmdHF14AMfNestedHard, 	0, "Nested attack for hardened Mifare cards"},
-	{"keybrute",	CmdHF14AMfKeyBrute,		0, "J_Run's 2nd phase of multiple sector nested authentication key recovery"},	
-	{"nack",		CmdHf14AMfNack,			0, "Test for Mifare NACK bug"},
-	{"chk",			CmdHF14AMfChk,			0, "Check keys"},
-	{"fchk",		CmdHF14AMfChk_fast,		0, "Check keys fast, targets all keys on card"},
-	{"decrypt",		CmdHf14AMfDecryptBytes, 1, "[nt] [ar_enc] [at_enc] [data] - to decrypt snoop or trace"},
-	{"-----------",	CmdHelp,				1, ""},
-	{"dbg",			CmdHF14AMfDbg,			0, "Set default debug mode"},
-	{"rdbl",		CmdHF14AMfRdBl,			0, "Read MIFARE classic block"},
-	{"rdsc",		CmdHF14AMfRdSc,			0, "Read MIFARE classic sector"},
-	{"dump",		CmdHF14AMfDump,			0, "Dump MIFARE classic tag to binary file"},
-	{"restore",		CmdHF14AMfRestore,		0, "Restore MIFARE classic binary file to BLANK tag"},
-	{"wrbl",		CmdHF14AMfWrBl,			0, "Write MIFARE classic block"},
-	{"setmod",		CmdHf14AMfSetMod, 		0, "Set MIFARE Classic EV1 load modulation strength"},	
-	{"auth4",		CmdHF14AMfAuth4,		0, "ISO14443-4 AES authentication"},
-//	{"sniff",		CmdHF14AMfSniff,		0, "Sniff card-reader communication"},
-	{"-----------",	CmdHelp,				1, ""},
-	{"sim",			CmdHF14AMf1kSim,		0, "Simulate MIFARE card"},
-	{"eclr",		CmdHF14AMfEClear,		0, "Clear simulator memory block"},
-	{"eget",		CmdHF14AMfEGet,			0, "Get simulator memory block"},
-	{"eset",		CmdHF14AMfESet,			0, "Set simulator memory block"},
-	{"eload",		CmdHF14AMfELoad,		0, "Load from file emul dump"},
-	{"esave",		CmdHF14AMfESave,		0, "Save to file emul dump"},
-	{"ecfill",		CmdHF14AMfECFill,		0, "Fill simulator memory with help of keys from simulator"},
-	{"ekeyprn",		CmdHF14AMfEKeyPrn,		0, "Print keys from simulator memory"},
-	{"-----------",	CmdHelp,				1, ""},
-	{"csetuid",		CmdHF14AMfCSetUID,		0, "Set UID for magic Chinese card"},
-	{"csetblk",		CmdHF14AMfCSetBlk,		0, "Write block - Magic Chinese card"},
-	{"cgetblk",		CmdHF14AMfCGetBlk,		0, "Read block - Magic Chinese card"},
-	{"cgetsc",		CmdHF14AMfCGetSc,		0, "Read sector - Magic Chinese card"},
-	{"cload",		CmdHF14AMfCLoad,		0, "Load dump into magic Chinese card"},
-	{"csave",		CmdHF14AMfCSave,		0, "Save dump from magic Chinese card into file or emulator"},
-	{"-----------",	CmdHelp,				1, ""},
-	{"mad",			CmdHF14AMfMAD,			0, "Checks and prints MAD"},
-	{"ndef",		CmdHFMFNDEF,			0, "Prints NDEF records from card"},
-
-	{"ice",			CmdHF14AMfice,			0, "collect Mifare Classic nonces to file"},
-	{NULL, NULL, 0, NULL}
-};
-
-int CmdHFMF(const char *Cmd) {
-	clearCommandBuffer();
-	CmdsParse(CommandTable, Cmd);
-	return 0;
-}
-
-int CmdHelp(const char *Cmd) {
-	CmdsHelp(CommandTable);
-	return 0;
-}
+//-----------------------------------------------------------------------------
+// Copyright (C) 2011,2012 Merlok
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// High frequency MIFARE commands
+//-----------------------------------------------------------------------------
+
+#include "cmdhfmf.h"
+#include "mifare/mifare4.h"
+#include "mifare/mad.h"
+#include "mifare/ndef.h"
+
+
+#define MFBLOCK_SIZE 16
+
+#define MIFARE_4K_MAXBLOCK 256
+#define MIFARE_2K_MAXBLOCK 128 
+#define MIFARE_1K_MAXBLOCK 64
+#define MIFARE_MINI_MAXBLOCK 20
+
+#define MIFARE_MINI_MAXSECTOR 5
+#define MIFARE_1K_MAXSECTOR 16
+#define MIFARE_2K_MAXSECTOR 32
+#define MIFARE_4K_MAXSECTOR 40
+
+static int CmdHelp(const char *Cmd);
+
+int usage_hf14_ice(void){
+		PrintAndLogEx(NORMAL, "Usage:   hf mf ice [l] <limit> [f] <name>");
+		PrintAndLogEx(NORMAL, "  h            this help");
+		PrintAndLogEx(NORMAL, "  l <limit>    nonces to be collected");
+		PrintAndLogEx(NORMAL, "  f <name>     save nonces to <name> instead of hf-mf-<UID>-nonces.bin");
+		PrintAndLogEx(NORMAL, "");
+		PrintAndLogEx(NORMAL, "Examples:");
+		PrintAndLogEx(NORMAL, "         hf mf ice");
+		PrintAndLogEx(NORMAL, "         hf mf ice f nonces.bin");
+		return 0;
+}
+
+int usage_hf14_dump(void){
+		PrintAndLogEx(NORMAL, "Usage:   hf mf dump [card memory] k <name> f <name>");
+		PrintAndLogEx(NORMAL, "  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");
+		PrintAndLogEx(NORMAL, "  k <name>     : key filename, if no <name> given, UID will be used as filename");
+		PrintAndLogEx(NORMAL, "  f <name>     : data filename, if no <name> given, UID will be used as filename");
+		PrintAndLogEx(NORMAL, "");
+		PrintAndLogEx(NORMAL, "Examples:");
+		PrintAndLogEx(NORMAL, "         hf mf dump");
+		PrintAndLogEx(NORMAL, "         hf mf dump 4");
+		return 0;
+}
+
+int usage_hf14_mifare(void){
+	PrintAndLogEx(NORMAL, "Usage:  hf mf darkside [h] <block number> <A|B>");
+	PrintAndLogEx(NORMAL, "Options:");
+	PrintAndLogEx(NORMAL, "      h               this help");
+	PrintAndLogEx(NORMAL, "      <block number>  (Optional) target other block");
+	PrintAndLogEx(NORMAL, "      <A|B>           (optional) target key type");
+	PrintAndLogEx(NORMAL, "Examples:");
+	PrintAndLogEx(NORMAL, "           hf mf darkside");
+	PrintAndLogEx(NORMAL, "           hf mf darkside 16");
+	PrintAndLogEx(NORMAL, "           hf mf darkside 16 B");
+	return 0;
+}
+int usage_hf14_mf1ksim(void){
+	PrintAndLogEx(NORMAL, "Usage:  hf mf sim [h] u <uid> n <numreads> [i] [x] [e] [v]");
+	PrintAndLogEx(NORMAL, "Options:");
+	PrintAndLogEx(NORMAL, "      h    this help");
+	PrintAndLogEx(NORMAL, "      u    (Optional) UID 4,7 or 10bytes. If not specified, the UID 4b from emulator memory will be used");
+	PrintAndLogEx(NORMAL, "      n    (Optional) Automatically exit simulation after <numreads> blocks have been read by reader. 0 = infinite");
+	PrintAndLogEx(NORMAL, "      i    (Optional) Interactive, means that console will not be returned until simulation finishes or is aborted");
+	PrintAndLogEx(NORMAL, "      x    (Optional) Crack, performs the 'reader attack', nr/ar attack against a reader");
+	PrintAndLogEx(NORMAL, "      e    (Optional) Fill simulator keys from found keys");
+	PrintAndLogEx(NORMAL, "      v    (Optional) Verbose");
+	PrintAndLogEx(NORMAL, "Examples:");
+	PrintAndLogEx(NORMAL, "           hf mf sim u 0a0a0a0a");
+	PrintAndLogEx(NORMAL, "           hf mf sim u 11223344556677");
+	PrintAndLogEx(NORMAL, "           hf mf sim u 112233445566778899AA");	
+	PrintAndLogEx(NORMAL, "           hf mf sim u 11223344 i x");	
+	return 0;
+}
+int usage_hf14_dbg(void){
+	PrintAndLogEx(NORMAL, "Usage:  hf mf dbg [h] <debug level>");
+	PrintAndLogEx(NORMAL, "Options:");
+	PrintAndLogEx(NORMAL, "           h    this help");	
+	PrintAndLogEx(NORMAL, "       <debug level>  (Optional) see list for valid levels");
+	PrintAndLogEx(NORMAL, "           0 - no debug messages");
+	PrintAndLogEx(NORMAL, "           1 - error messages");
+	PrintAndLogEx(NORMAL, "           2 - plus information messages");
+	PrintAndLogEx(NORMAL, "           3 - plus debug messages");
+	PrintAndLogEx(NORMAL, "           4 - print even debug messages in timing critical functions");
+	PrintAndLogEx(NORMAL, "               Note: this option therefore may cause malfunction itself");
+	PrintAndLogEx(NORMAL, "Examples:");
+	PrintAndLogEx(NORMAL, "           hf mf dbg 3");
+	return 0;
+}
+int usage_hf14_sniff(void){
+	PrintAndLogEx(NORMAL, "It continuously gets data from the field and saves it to: log, emulator, emulator file.");
+	PrintAndLogEx(NORMAL, "Usage:  hf mf sniff [h] [l] [d] [f]");
+	PrintAndLogEx(NORMAL, "Options:");
+	PrintAndLogEx(NORMAL, "      h    this help");
+	PrintAndLogEx(NORMAL, "      l    save encrypted sequence to logfile `uid.log`");
+	PrintAndLogEx(NORMAL, "      d    decrypt sequence and put it to log file `uid.log`");
+//	PrintAndLogEx(NORMAL, " n/a  e     decrypt sequence, collect read and write commands and save the result of the sequence to emulator memory");
+	PrintAndLogEx(NORMAL, "      f    decrypt sequence, collect read and write commands and save the result of the sequence to emulator dump file `uid.eml`");
+	PrintAndLogEx(NORMAL, "Example:");
+	PrintAndLogEx(NORMAL, "           hf mf sniff l d f");
+	return 0;
+}
+int usage_hf14_nested(void){
+	PrintAndLogEx(NORMAL, "Usage:");
+	PrintAndLogEx(NORMAL, " all sectors:  hf mf nested  <card memory> <block number> <key A/B> <key (12 hex symbols)> [t,d]");
+	PrintAndLogEx(NORMAL, " one sector:   hf mf nested  o <block number> <key A/B> <key (12 hex symbols)>");
+	PrintAndLogEx(NORMAL, "               <target block number> <target key A/B> [t]");
+	PrintAndLogEx(NORMAL, "Options:");
+	PrintAndLogEx(NORMAL, "      h    this help");
+	PrintAndLogEx(NORMAL, "      card memory - 0 - MINI(320 bytes), 1 - 1K, 2 - 2K, 4 - 4K, <other> - 1K");
+	PrintAndLogEx(NORMAL, "      t    transfer keys into emulator memory");
+	PrintAndLogEx(NORMAL, "      d    write keys to binary file `hf-mf-<UID>-key.bin`");
+	PrintAndLogEx(NORMAL, "");
+	PrintAndLogEx(NORMAL, "Examples:");
+	PrintAndLogEx(NORMAL, "      hf mf nested 1 0 A FFFFFFFFFFFF ");
+	PrintAndLogEx(NORMAL, "      hf mf nested 1 0 A FFFFFFFFFFFF t ");
+	PrintAndLogEx(NORMAL, "      hf mf nested 1 0 A FFFFFFFFFFFF d ");
+	PrintAndLogEx(NORMAL, "      hf mf nested o 0 A FFFFFFFFFFFF 4 A");
+	return 0;
+}
+int usage_hf14_hardnested(void){
+	PrintAndLogEx(NORMAL, "Usage:");
+	PrintAndLogEx(NORMAL, "      hf mf hardnested <block number> <key A|B> <key (12 hex symbols)>");
+	PrintAndLogEx(NORMAL, "                       <target block number> <target key A|B> [known target key (12 hex symbols)] [w] [s]");
+	PrintAndLogEx(NORMAL, "  or  hf mf hardnested r [known target key]");
+	PrintAndLogEx(NORMAL, "");
+	PrintAndLogEx(NORMAL, "Options:");
+	PrintAndLogEx(NORMAL, "      h         this help");	
+	PrintAndLogEx(NORMAL, "      w         acquire nonces and UID, and write them to binary file with default name hf-mf-<UID>-nonces.bin");
+	PrintAndLogEx(NORMAL, "      s         slower acquisition (required by some non standard cards)");
+	PrintAndLogEx(NORMAL, "      r         read hf-mf-<UID>-nonces.bin if tag present, otherwise read nonces.bin, then start attack");
+	PrintAndLogEx(NORMAL, "      u <UID>   read/write hf-mf-<UID>-nonces.bin instead of default name");
+	PrintAndLogEx(NORMAL, "      f <name>  read/write <name> instead of default name");
+	PrintAndLogEx(NORMAL, "      t         tests?");
+	PrintAndLogEx(NORMAL, "      i <X>     set type of SIMD instructions. Without this flag programs autodetect it.");
+	PrintAndLogEx(NORMAL, "        i 5   = AVX512");
+	PrintAndLogEx(NORMAL, "        i 2   = AVX2");
+	PrintAndLogEx(NORMAL, "        i a   = AVX");
+	PrintAndLogEx(NORMAL, "        i s   = SSE2");
+	PrintAndLogEx(NORMAL, "        i m   = MMX");
+	PrintAndLogEx(NORMAL, "        i n   = none (use CPU regular instruction set)");	
+	PrintAndLogEx(NORMAL, "");
+	PrintAndLogEx(NORMAL, "Examples:");
+	PrintAndLogEx(NORMAL, "      hf mf hardnested 0 A FFFFFFFFFFFF 4 A");
+	PrintAndLogEx(NORMAL, "      hf mf hardnested 0 A FFFFFFFFFFFF 4 A w");
+	PrintAndLogEx(NORMAL, "      hf mf hardnested 0 A FFFFFFFFFFFF 4 A f nonces.bin w s");
+	PrintAndLogEx(NORMAL, "      hf mf hardnested r");
+	PrintAndLogEx(NORMAL, "      hf mf hardnested r a0a1a2a3a4a5");
+	PrintAndLogEx(NORMAL, "");
+	PrintAndLogEx(NORMAL, "Add the known target key to check if it is present in the remaining key space:");
+	PrintAndLogEx(NORMAL, "      hf mf hardnested 0 A A0A1A2A3A4A5 4 A FFFFFFFFFFFF");
+	return 0;
+}
+int usage_hf14_chk(void){
+	PrintAndLogEx(NORMAL, "Usage:  hf mf chk [h] <block number>|<*card memory> <key type (A/B/?)> [t|d] [<key (12 hex symbols)>] [<dic (*.dic)>]");
+	PrintAndLogEx(NORMAL, "Options:");
+	PrintAndLogEx(NORMAL, "      h    this help");	
+	PrintAndLogEx(NORMAL, "      *    all sectors based on card memory, other values then below defaults to 1k");
+	PrintAndLogEx(NORMAL, "      			0 - MINI(320 bytes)");
+	PrintAndLogEx(NORMAL, "      			1 - 1K");
+	PrintAndLogEx(NORMAL, "      			2 - 2K");
+	PrintAndLogEx(NORMAL, "      			4 - 4K");
+	PrintAndLogEx(NORMAL, "      d    write keys to binary file");
+	PrintAndLogEx(NORMAL, "      t    write keys to emulator memory\n");
+	PrintAndLogEx(NORMAL, "");
+	PrintAndLogEx(NORMAL, "Examples:");
+	PrintAndLogEx(NORMAL, "      hf mf chk 0 A 1234567890ab keys.dic     -- target block 0, Key A");
+	PrintAndLogEx(NORMAL, "      hf mf chk *1 ? t                        -- target all blocks, all keys, 1K, write to emul");
+	PrintAndLogEx(NORMAL, "      hf mf chk *1 ? d                        -- target all blocks, all keys, 1K, write to file");
+	return 0;
+}
+int usage_hf14_chk_fast(void){
+	PrintAndLogEx(NORMAL, "This is a improved checkkeys method speedwise. It checks Mifare Classic tags sector keys against a dictionary file with keys");
+	PrintAndLogEx(NORMAL, "Usage:  hf mf fchk [h] <card memory> [t|d|f] [<key (12 hex symbols)>] [<dic (*.dic)>]");
+	PrintAndLogEx(NORMAL, "Options:");
+	PrintAndLogEx(NORMAL, "      h    this help");	
+	PrintAndLogEx(NORMAL, "      <cardmem> all sectors based on card memory, other values than below defaults to 1k");
+	PrintAndLogEx(NORMAL, "      			 0 - MINI(320 bytes)");
+	PrintAndLogEx(NORMAL, "      			 1 - 1K   <default>");
+	PrintAndLogEx(NORMAL, "      			 2 - 2K");
+	PrintAndLogEx(NORMAL, "      			 4 - 4K");
+	PrintAndLogEx(NORMAL, "      d    write keys to binary file");
+	PrintAndLogEx(NORMAL, "      t    write keys to emulator memory");
+	PrintAndLogEx(NORMAL, "      m    use dictionary from flashmemory\n");
+	PrintAndLogEx(NORMAL, "");
+	PrintAndLogEx(NORMAL, "Examples:");
+	PrintAndLogEx(NORMAL, "      hf mf fchk 1 1234567890ab keys.dic    -- target 1K using key 1234567890ab, using dictionary file");
+	PrintAndLogEx(NORMAL, "      hf mf fchk 1 t                        -- target 1K, write to emulator memory");
+	PrintAndLogEx(NORMAL, "      hf mf fchk 1 d                        -- target 1K, write to file");
+#ifdef WITH_FLASH
+	PrintAndLogEx(NORMAL, "      hf mf fchk 1 m                        -- target 1K, use dictionary from flashmemory");
+#endif
+	return 0;
+}
+int usage_hf14_keybrute(void){
+	PrintAndLogEx(NORMAL, "J_Run's 2nd phase of multiple sector nested authentication key recovery");
+	PrintAndLogEx(NORMAL, "You have a known 4 last bytes of a key recovered with mf_nonce_brute tool.");
+	PrintAndLogEx(NORMAL, "First 2 bytes of key will be bruteforced");	
+	PrintAndLogEx(NORMAL, "");
+	PrintAndLogEx(NORMAL, " ---[ This attack is obsolete,  try hardnested instead ]---");
+	PrintAndLogEx(NORMAL, "");
+	PrintAndLogEx(NORMAL, "Usage:  hf mf keybrute [h] <block number> <A|B> <key>");
+	PrintAndLogEx(NORMAL, "Options:");
+	PrintAndLogEx(NORMAL, "      h               this help");
+	PrintAndLogEx(NORMAL, "      <block number>  target block number");
+	PrintAndLogEx(NORMAL, "      <A|B>           target key type");
+	PrintAndLogEx(NORMAL, "      <key>           candidate key from mf_nonce_brute tool");
+	PrintAndLogEx(NORMAL, "Examples:");
+	PrintAndLogEx(NORMAL, "           hf mf keybrute 1 A 000011223344");
+	return 0;
+}
+int usage_hf14_restore(void){
+	PrintAndLogEx(NORMAL, "Usage:   hf mf restore [card memory] u <UID> k <name> f <name>");
+	PrintAndLogEx(NORMAL, "Options:");
+	PrintAndLogEx(NORMAL, "  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");
+	PrintAndLogEx(NORMAL, "  u <UID>      : uid, try to restore from hf-mf-<UID>-key.bin and hf-mf-<UID>-data.bin");
+	PrintAndLogEx(NORMAL, "  k <name>     : key filename, specific the full filename of key file");
+	PrintAndLogEx(NORMAL, "  f <name>     : data filename, specific the full filename of data file");
+	PrintAndLogEx(NORMAL, "");
+	PrintAndLogEx(NORMAL, "Examples:");
+	PrintAndLogEx(NORMAL, "         hf mf restore                            -- read the UID from tag first, then restore from hf-mf-<UID>-key.bin and and hf-mf-<UID>-data.bin");
+	PrintAndLogEx(NORMAL, "         hf mf restore 1 u 12345678               -- restore from hf-mf-12345678-key.bin and hf-mf-12345678-data.bin");
+	PrintAndLogEx(NORMAL, "         hf mf restore 1 u 12345678 k dumpkey.bin -- restore from dumpkey.bin and hf-mf-12345678-data.bin");
+	PrintAndLogEx(NORMAL, "         hf mf restore 4                          -- read the UID from tag with 4K memory first, then restore from hf-mf-<UID>-key.bin and and hf-mf-<UID>-data.bin");
+	return 0;
+}
+int usage_hf14_decryptbytes(void){
+	PrintAndLogEx(NORMAL, "Decrypt Crypto-1 encrypted bytes given some known state of crypto. See tracelog to gather needed values\n");
+	PrintAndLogEx(NORMAL, "Usage:   hf mf decrypt [h] <nt> <ar_enc> <at_enc> <data>");
+	PrintAndLogEx(NORMAL, "Options:");
+	PrintAndLogEx(NORMAL, "      h            this help");
+	PrintAndLogEx(NORMAL, "      <nt>         reader nonce");
+	PrintAndLogEx(NORMAL, "      <ar_enc>     encrypted reader response");
+	PrintAndLogEx(NORMAL, "      <at_enc>     encrypted tag response");
+	PrintAndLogEx(NORMAL, "      <data>       encrypted data, taken directly after at_enc and forward");
+	PrintAndLogEx(NORMAL, "Examples:");
+	PrintAndLogEx(NORMAL, "         hf mf decrypt b830049b 9248314a 9280e203 41e586f9\n");
+	PrintAndLogEx(NORMAL, "  this sample decrypts 41e586f9 -> 3003999a  Annotated: 30 03 [99 9a]  auth block 3 [crc]");
+	return 0;
+}
+
+int usage_hf14_eget(void){
+	PrintAndLogEx(NORMAL, "Usage:  hf mf eget <block number>");
+	PrintAndLogEx(NORMAL, "Examples:");
+	PrintAndLogEx(NORMAL, "        hf mf eget 0 ");
+	return 0;
+}
+int usage_hf14_eclr(void){
+	PrintAndLogEx(NORMAL, "It set card emulator memory to empty data blocks and key A/B FFFFFFFFFFFF \n");
+	PrintAndLogEx(NORMAL, "Usage:  hf mf eclr");
+	return 0;
+}
+int usage_hf14_eset(void){
+	PrintAndLogEx(NORMAL, "Usage:  hf mf eset <block number> <block data (32 hex symbols)>");
+	PrintAndLogEx(NORMAL, "Examples:");
+	PrintAndLogEx(NORMAL, "        hf mf eset 1 000102030405060708090a0b0c0d0e0f ");	
+	return 0;
+}
+int usage_hf14_eload(void){
+	PrintAndLogEx(NORMAL, "It loads emul dump from the file `filename.eml`");
+	PrintAndLogEx(NORMAL, "Usage:  hf mf eload [card memory] <file name w/o `.eml`> [numblocks]");
+	PrintAndLogEx(NORMAL, "  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K, u = UL");
+	PrintAndLogEx(NORMAL, "");
+	PrintAndLogEx(NORMAL, "Examples:");
+	PrintAndLogEx(NORMAL, "        hf mf eload filename");
+	PrintAndLogEx(NORMAL, "        hf mf eload 4 filename");	
+	return 0;
+}
+int usage_hf14_esave(void){
+	PrintAndLogEx(NORMAL, "It saves emul dump into the file `filename.eml` or `cardID.eml`");
+	PrintAndLogEx(NORMAL, " Usage:  hf mf esave [card memory] [file name w/o `.eml`]");
+	PrintAndLogEx(NORMAL, "  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");
+	PrintAndLogEx(NORMAL, "");
+	PrintAndLogEx(NORMAL, "Examples:");
+	PrintAndLogEx(NORMAL, "        hf mf esave ");
+	PrintAndLogEx(NORMAL, "        hf mf esave 4");
+	PrintAndLogEx(NORMAL, "        hf mf esave 4 filename");	
+	return 0;
+}
+int usage_hf14_ecfill(void){
+	PrintAndLogEx(NORMAL, "Read card and transfer its data to emulator memory.");
+	PrintAndLogEx(NORMAL, "Keys must be laid in the emulator memory. \n");
+	PrintAndLogEx(NORMAL, "Usage:  hf mf ecfill <key A/B> [card memory]");
+	PrintAndLogEx(NORMAL, "  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");
+	PrintAndLogEx(NORMAL, "");
+	PrintAndLogEx(NORMAL, "Examples:");
+	PrintAndLogEx(NORMAL, "        hf mf ecfill A");
+	PrintAndLogEx(NORMAL, "        hf mf ecfill A 4");
+	return 0;
+}
+int usage_hf14_ekeyprn(void){
+	PrintAndLogEx(NORMAL, "It prints the keys loaded in the emulator memory");
+	PrintAndLogEx(NORMAL, "Usage:  hf mf ekeyprn [card memory]");
+	PrintAndLogEx(NORMAL, "  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");
+	PrintAndLogEx(NORMAL, "");
+	PrintAndLogEx(NORMAL, "Examples:");
+	PrintAndLogEx(NORMAL, "        hf mf ekeyprn 1");	
+	return 0;
+}
+
+int usage_hf14_csetuid(void){
+	PrintAndLogEx(NORMAL, "Set UID, ATQA, and SAK for magic Chinese card. Only works with magic cards");
+	PrintAndLogEx(NORMAL, "");
+	PrintAndLogEx(NORMAL, "Usage:  hf mf csetuid [h] <UID 8 hex symbols> [ATQA 4 hex symbols] [SAK 2 hex symbols] [w]");
+	PrintAndLogEx(NORMAL, "Options:");
+	PrintAndLogEx(NORMAL, "       h        this help");
+	PrintAndLogEx(NORMAL, "       w        wipe card before writing");
+	PrintAndLogEx(NORMAL, "       <uid>    UID 8 hex symbols");
+	PrintAndLogEx(NORMAL, "       <atqa>   ATQA 4 hex symbols");
+	PrintAndLogEx(NORMAL, "       <sak>    SAK 2 hex symbols");
+	PrintAndLogEx(NORMAL, "Examples:");
+	PrintAndLogEx(NORMAL, "      hf mf csetuid 01020304");
+	PrintAndLogEx(NORMAL, "      hf mf csetuid 01020304 0004 08 w");
+	return 0;
+}
+int usage_hf14_csetblk(void){
+	PrintAndLogEx(NORMAL, "Set block data for magic Chinese card. Only works with magic cards");
+	PrintAndLogEx(NORMAL, "");		
+	PrintAndLogEx(NORMAL, "Usage:  hf mf csetblk [h] <block number> <block data (32 hex symbols)> [w]");
+	PrintAndLogEx(NORMAL, "Options:");
+	PrintAndLogEx(NORMAL, "       h         this help");
+	PrintAndLogEx(NORMAL, "       w         wipe card before writing");
+	PrintAndLogEx(NORMAL, "       <block>   block number");
+	PrintAndLogEx(NORMAL, "       <data>    block data to write (32 hex symbols)");
+	PrintAndLogEx(NORMAL, "Examples:");
+	PrintAndLogEx(NORMAL, "       hf mf csetblk 1 01020304050607080910111213141516");
+	PrintAndLogEx(NORMAL, "       hf mf csetblk 1 01020304050607080910111213141516 w");
+	return 0;
+}
+int usage_hf14_cload(void){
+	PrintAndLogEx(NORMAL, "It loads magic Chinese card from the file `filename.eml`");
+	PrintAndLogEx(NORMAL, "or from emulator memory");
+	PrintAndLogEx(NORMAL, "");
+	PrintAndLogEx(NORMAL, "Usage:  hf mf cload [h] [e] <file name w/o `.eml`>");
+	PrintAndLogEx(NORMAL, "Options:");
+	PrintAndLogEx(NORMAL, "       h            this help");
+	PrintAndLogEx(NORMAL, "       e            load card with data from emulator memory");
+	PrintAndLogEx(NORMAL, "       j <filename> load card with data from json file");
+	PrintAndLogEx(NORMAL, "       b <filename> load card with data from binary file");
+	PrintAndLogEx(NORMAL, "       <filename>   load card with data from eml file");
+	PrintAndLogEx(NORMAL, "Examples:");
+	PrintAndLogEx(NORMAL, "       hf mf cload mydump");
+	PrintAndLogEx(NORMAL, "       hf mf cload e");	
+	return 0;
+}
+int usage_hf14_cgetblk(void){
+	PrintAndLogEx(NORMAL, "Get block data from magic Chinese card. Only works with magic cards\n");
+	PrintAndLogEx(NORMAL, "");
+	PrintAndLogEx(NORMAL, "Usage:  hf mf cgetblk [h] <block number>");
+	PrintAndLogEx(NORMAL, "Options:");
+	PrintAndLogEx(NORMAL, "      h         this help");
+	PrintAndLogEx(NORMAL, "      <block>   block number");		
+	PrintAndLogEx(NORMAL, "Examples:");
+	PrintAndLogEx(NORMAL, "      hf mf cgetblk 1");	
+	return 0;
+}
+int usage_hf14_cgetsc(void){
+	PrintAndLogEx(NORMAL, "Get sector data from magic Chinese card. Only works with magic cards\n");
+	PrintAndLogEx(NORMAL, "");
+	PrintAndLogEx(NORMAL, "Usage:  hf mf cgetsc [h] <sector number>");
+	PrintAndLogEx(NORMAL, "Options:");
+	PrintAndLogEx(NORMAL, "      h          this help");
+	PrintAndLogEx(NORMAL, "      <sector>   sector number");
+	PrintAndLogEx(NORMAL, "Examples:");
+	PrintAndLogEx(NORMAL, "      hf mf cgetsc 0");
+	return 0;
+}
+int usage_hf14_csave(void){
+	PrintAndLogEx(NORMAL, "It saves `magic Chinese` card dump into the file `filename.eml` or `cardID.eml`");
+	PrintAndLogEx(NORMAL, "or into emulator memory");
+	PrintAndLogEx(NORMAL, "");
+	PrintAndLogEx(NORMAL, "Usage:  hf mf csave [h] [e] [u] [card memory] i <file name w/o `.eml`>");
+	PrintAndLogEx(NORMAL, "Options:");
+	PrintAndLogEx(NORMAL, "       h             this help");
+	PrintAndLogEx(NORMAL, "       e             save data to emulator memory");
+	PrintAndLogEx(NORMAL, "       u             save data to file, use carduid as filename");	
+	PrintAndLogEx(NORMAL, "       card memory   0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");
+	PrintAndLogEx(NORMAL, "       o <filename>  save data to file");
+	PrintAndLogEx(NORMAL, "");
+	PrintAndLogEx(NORMAL, "Examples:");
+	PrintAndLogEx(NORMAL, "       hf mf csave u 1");
+	PrintAndLogEx(NORMAL, "       hf mf csave e 1");
+	PrintAndLogEx(NORMAL, "       hf mf csave 4 o filename");
+	return 0;
+}
+int usage_hf14_nack(void) {
+	PrintAndLogEx(NORMAL, "Test a mifare classic based card for the NACK bug.");
+	PrintAndLogEx(NORMAL, "");	
+	PrintAndLogEx(NORMAL, "Usage:  hf mf nack [h] [v]");
+	PrintAndLogEx(NORMAL, "Options:");
+	PrintAndLogEx(NORMAL, "       h             this help");
+	PrintAndLogEx(NORMAL, "       v             verbose");
+	PrintAndLogEx(NORMAL, "Examples:");
+	PrintAndLogEx(NORMAL, "       hf mf nack");
+	return 0;
+}
+
+int GetHFMF14AUID(uint8_t *uid, int *uidlen) {
+	UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT, 0, 0}};
+	clearCommandBuffer();
+	SendCommand(&c);
+	UsbCommand resp;
+	if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
+		PrintAndLogEx(WARNING, "iso14443a card select failed");
+		DropField();
+		return 0;
+	}
+	
+	iso14a_card_select_t card;
+	memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
+	memcpy(uid, card.uid, card.uidlen * sizeof(uint8_t));
+	*uidlen = card.uidlen;
+	return 1;
+}
+
+char * GenerateFilename(const char *prefix, const char *suffix){
+	uint8_t uid[10] = {0,0,0,0,0,0,0,0,0,0};
+	int uidlen=0;
+	char * fptr = calloc (sizeof (char) * (strlen(prefix) + strlen(suffix)) + sizeof(uid)*2 + 1,  sizeof(uint8_t));
+	
+	GetHFMF14AUID(uid, &uidlen);
+	if (!uidlen) {
+		PrintAndLogEx(WARNING, "No tag found.");
+		free(fptr);
+		return NULL;
+	}
+	
+	strcpy(fptr, prefix);	
+	FillFileNameByUID(fptr, uid, suffix, uidlen);
+	return fptr;
+}
+
+int CmdHF14AMfDarkside(const char *Cmd) {
+	uint8_t blockno = 0, key_type = MIFARE_AUTH_KEYA;
+	uint64_t key = 0;
+	
+	char cmdp = tolower(param_getchar(Cmd, 0));	
+	if ( cmdp == 'h' ) return usage_hf14_mifare();
+	
+	blockno = param_get8(Cmd, 0);	 
+	
+	cmdp = tolower(param_getchar(Cmd, 1));
+	if (cmdp == 'b')
+		key_type = MIFARE_AUTH_KEYB;
+
+	int isOK = mfDarkside(blockno, key_type, &key);
+	PrintAndLogEx(NORMAL, "");
+	switch (isOK) {
+		case -1 : PrintAndLogEx(WARNING, "button pressed. Aborted."); return 1;
+		case -2 : PrintAndLogEx(FAILED, "card is not vulnerable to Darkside attack (doesn't send NACK on authentication requests)."); return 1;
+		case -3 : PrintAndLogEx(FAILED, "card is not vulnerable to Darkside attack (its random number generator is not predictable)."); return 1;
+		case -4 : PrintAndLogEx(FAILED, "card is not vulnerable to Darkside attack (its random number generator seems to be based on the wellknown");
+				  PrintAndLogEx(FAILED, "generating polynomial with 16 effective bits only, but shows unexpected behaviour."); return 1;
+		case -5 : PrintAndLogEx(WARNING, "aborted via keyboard.");  return 1;
+		default : PrintAndLogEx(SUCCESS, "found valid key: %012" PRIx64 "\n", key); break;
+	}
+	PrintAndLogEx(NORMAL, "");
+	return 0;
+}
+
+int CmdHF14AMfWrBl(const char *Cmd) {
+	uint8_t blockNo = 0;
+	uint8_t keyType = 0;
+	uint8_t key[6] = {0, 0, 0, 0, 0, 0};
+	uint8_t bldata[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+	char cmdp	= 0x00;
+
+	if (strlen(Cmd) < 3) {
+		PrintAndLogEx(NORMAL, "Usage:  hf mf wrbl    <block number> <key A/B> <key (12 hex symbols)> <block data (32 hex symbols)>");
+		PrintAndLogEx(NORMAL, "Examples:");
+		PrintAndLogEx(NORMAL, "        hf mf wrbl 0 A FFFFFFFFFFFF 000102030405060708090A0B0C0D0E0F");
+		return 0;
+	}	
+
+	blockNo = param_get8(Cmd, 0);
+	cmdp = tolower(param_getchar(Cmd, 1));
+	if (cmdp == 0x00) {
+		PrintAndLogEx(NORMAL, "Key type must be A or B");
+		return 1;
+	}
+	
+	if (cmdp != 'a') 
+		keyType = 1;
+	
+	if (param_gethex(Cmd, 2, key, 12)) {
+		PrintAndLogEx(NORMAL, "Key must include 12 HEX symbols");
+		return 1;
+	}
+	
+	if (param_gethex(Cmd, 3, bldata, 32)) {
+		PrintAndLogEx(NORMAL, "Block data must include 32 HEX symbols");
+		return 1;
+	}
+	
+	PrintAndLogEx(NORMAL, "--block no:%d, key type:%c, key:%s", blockNo, keyType?'B':'A', sprint_hex(key, 6));
+	PrintAndLogEx(NORMAL, "--data: %s", sprint_hex(bldata, 16));
+	
+	UsbCommand c = {CMD_MIFARE_WRITEBL, {blockNo, keyType, 0}};
+	memcpy(c.d.asBytes, key, 6);
+	memcpy(c.d.asBytes + 10, bldata, 16);
+	clearCommandBuffer();
+	SendCommand(&c);
+
+	UsbCommand resp;
+	if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
+		uint8_t isOK  = resp.arg[0] & 0xff;
+		PrintAndLogEx(NORMAL, "isOk:%02x", isOK);
+	} else {
+		PrintAndLogEx(NORMAL, "Command execute timeout");
+	}
+
+	return 0;
+}
+
+int CmdHF14AMfRdBl(const char *Cmd) {
+	uint8_t blockNo = 0;
+	uint8_t keyType = 0;
+	uint8_t key[6] = {0, 0, 0, 0, 0, 0};
+	char cmdp = 0x00;
+
+	if (strlen(Cmd)<3) {
+		PrintAndLogEx(NORMAL, "Usage:  hf mf rdbl    <block number> <key A/B> <key (12 hex symbols)>");
+		PrintAndLogEx(NORMAL, "Examples:");
+		PrintAndLogEx(NORMAL, "        hf mf rdbl 0 A FFFFFFFFFFFF ");
+		return 0;
+	}	
+	
+	blockNo = param_get8(Cmd, 0);
+	cmdp = tolower(param_getchar(Cmd, 1));
+	if (cmdp == 0x00) {
+		PrintAndLogEx(NORMAL, "Key type must be A or B");
+		return 1;
+	}
+	
+	if (cmdp != 'a') 
+		keyType = 1;
+	
+	if (param_gethex(Cmd, 2, key, 12)) {
+		PrintAndLogEx(NORMAL, "Key must include 12 HEX symbols");
+		return 1;
+	}
+	PrintAndLogEx(NORMAL, "--block no:%d, key type:%c, key:%s ", blockNo, keyType?'B':'A', sprint_hex(key, 6));
+	
+	UsbCommand c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}};
+	memcpy(c.d.asBytes, key, 6);
+	clearCommandBuffer();
+	SendCommand(&c);
+
+	UsbCommand resp;
+	if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
+		uint8_t isOK  = resp.arg[0] & 0xff;
+		uint8_t *data = resp.d.asBytes;
+
+		if (isOK) {
+			PrintAndLogEx(NORMAL, "isOk:%02x data:%s", isOK, sprint_hex(data, 16));
+		} else {
+			PrintAndLogEx(NORMAL, "isOk:%02x", isOK);
+			return 1;
+		}
+
+		if (mfIsSectorTrailer(blockNo) && (data[6] || data[7] || data[8])) {
+			PrintAndLogEx(NORMAL, "Trailer decoded:");
+			int bln = mfFirstBlockOfSector(mfSectorNum(blockNo));
+			int blinc = (mfNumBlocksPerSector(mfSectorNum(blockNo)) > 4) ? 5 : 1;
+			for (int i = 0; i < 4; i++) {
+				PrintAndLogEx(NORMAL, "Access block %d%s: %s", bln, ((blinc > 1) && (i < 3) ? "+" : "") , mfGetAccessConditionsDesc(i, &data[6]));
+				bln += blinc;
+			}
+			PrintAndLogEx(NORMAL, "UserData: %s", sprint_hex_inrow(&data[9], 1));
+		}
+	} else {
+		PrintAndLogEx(WARNING, "Command execute timeout");
+		return 2;
+	}
+	
+  return 0;
+}
+
+int CmdHF14AMfRdSc(const char *Cmd) {
+	int i;
+	uint8_t sectorNo = 0;
+	uint8_t keyType = 0;
+	uint8_t key[6] = {0, 0, 0, 0, 0, 0};
+	uint8_t isOK  = 0;
+	uint8_t *data  = NULL;
+	char cmdp	= 0x00;
+
+	if (strlen(Cmd) < 3) {
+		PrintAndLogEx(NORMAL, "Usage:  hf mf rdsc    <sector number> <key A/B> <key (12 hex symbols)>");
+		PrintAndLogEx(NORMAL, "Examples:");
+		PrintAndLogEx(NORMAL, "        hf mf rdsc 0 A FFFFFFFFFFFF ");
+		return 0;
+	}	
+	
+	sectorNo = param_get8(Cmd, 0);
+	if (sectorNo > MIFARE_4K_MAXSECTOR ) {
+		PrintAndLogEx(NORMAL, "Sector number must be less than 40");
+		return 1;
+	}
+	
+	cmdp = tolower(param_getchar(Cmd, 1));
+	if (cmdp != 'a' && cmdp != 'b') {
+		PrintAndLogEx(NORMAL, "Key type must be A or B");
+		return 1;
+	}
+	
+	if (cmdp != 'a') 
+		keyType = 1;
+	
+	if (param_gethex(Cmd, 2, key, 12)) {
+		PrintAndLogEx(NORMAL, "Key must include 12 HEX symbols");
+		return 1;
+	}
+	PrintAndLogEx(NORMAL, "--sector no:%d key type:%c key:%s ", sectorNo, keyType?'B':'A', sprint_hex(key, 6));
+	
+	UsbCommand c = {CMD_MIFARE_READSC, {sectorNo, keyType, 0}};
+	memcpy(c.d.asBytes, key, 6);
+	clearCommandBuffer();
+	SendCommand(&c);
+	PrintAndLogEx(NORMAL, "");
+
+	UsbCommand resp;
+	if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
+		isOK  = resp.arg[0] & 0xff;
+		data  = resp.d.asBytes;
+
+		PrintAndLogEx(NORMAL, "isOk:%02x", isOK);
+		if (isOK) {
+			for (i = 0; i < (sectorNo<32?3:15); i++) {
+				PrintAndLogEx(NORMAL, "data   : %s", sprint_hex(data + i * 16, 16));
+			}
+			PrintAndLogEx(NORMAL, "trailer: %s", sprint_hex(data + (sectorNo<32?3:15) * 16, 16));
+					
+			PrintAndLogEx(NORMAL, "Trailer decoded:");
+            int bln = mfFirstBlockOfSector(sectorNo);
+			int blinc = (mfNumBlocksPerSector(sectorNo) > 4) ? 5 : 1;
+            for (i = 0; i < 4; i++) {
+                PrintAndLogEx(NORMAL, "Access block %d%s: %s", bln, ((blinc > 1) && (i < 3) ? "+" : "") , mfGetAccessConditionsDesc(i, &(data + (sectorNo<32?3:15) * 16)[6]));
+                bln += blinc;
+            }
+            PrintAndLogEx(NORMAL, "UserData: %s", sprint_hex_inrow(&(data + (sectorNo<32?3:15) * 16)[9], 1));
+		}
+	} else {
+		PrintAndLogEx(WARNING, "Command execute timeout");
+	}
+
+  return 0;
+}
+
+uint16_t NumOfBlocks(char card){
+	switch(card){
+		case '0' : return MIFARE_MINI_MAXBLOCK;
+		case '1' : return MIFARE_1K_MAXBLOCK;
+		case '2' : return MIFARE_2K_MAXBLOCK;
+		case '4' : return MIFARE_4K_MAXBLOCK;
+		default  : return MIFARE_1K_MAXBLOCK;
+	}
+}
+uint8_t NumOfSectors(char card){
+	switch(card){
+		case '0' : return MIFARE_MINI_MAXSECTOR; 
+		case '1' : return MIFARE_1K_MAXSECTOR; 
+		case '2' : return MIFARE_2K_MAXSECTOR; 
+		case '4' : return MIFARE_4K_MAXSECTOR; 
+		default  : return MIFARE_1K_MAXSECTOR;
+	}
+}
+
+uint8_t FirstBlockOfSector(uint8_t sectorNo) {
+	if (sectorNo < 32) {
+		return sectorNo * 4;
+	} else {
+		return 32 * 4 + (sectorNo - 32) * 16;
+	}
+}
+
+uint8_t NumBlocksPerSector(uint8_t sectorNo) {
+	if (sectorNo < 32) {
+		return 4;
+	} else {
+		return 16;
+	}
+}
+
+int CmdHF14AMfDump(const char *Cmd) {
+
+	uint8_t sectorNo, blockNo;
+	uint8_t keyA[40][6];
+	uint8_t keyB[40][6];
+	uint8_t rights[40][4];
+	uint8_t carddata[256][16];
+	uint8_t numSectors = 16;
+	uint8_t cmdp = 0;
+	
+	char keyFilename[FILE_PATH_SIZE] = {0};
+	char dataFilename[FILE_PATH_SIZE];
+	char * fptr;
+	
+	memset(keyFilename, 0, sizeof(keyFilename));
+	memset(dataFilename, 0, sizeof(dataFilename));
+	
+	FILE *f;	
+	UsbCommand resp;
+	
+	while(param_getchar(Cmd, cmdp) != 0x00) {
+		switch (tolower(param_getchar(Cmd, cmdp))) {
+		case 'h':
+			return usage_hf14_dump();
+		case 'k':
+			param_getstr(Cmd, cmdp+1, keyFilename, FILE_PATH_SIZE); 
+			cmdp += 2;
+			break;
+		case 'f':
+			param_getstr(Cmd, cmdp+1, dataFilename, FILE_PATH_SIZE); 
+			cmdp += 2;
+			break;
+		default:
+			if (cmdp == 0) {
+				numSectors = NumOfSectors(param_getchar(Cmd, cmdp));
+				cmdp++;
+			} else {
+				PrintAndLogEx(WARNING, "Unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
+				return usage_hf14_dump();
+			}
+		}
+	}
+
+	if ( keyFilename[0] == 0x00 ) {
+		fptr = GenerateFilename("hf-mf-", "-key.bin");
+		if (fptr == NULL) 
+			return 1;
+		
+		strcpy(keyFilename, fptr);
+	}
+
+	if ((f = fopen(keyFilename, "rb")) == NULL) {
+		PrintAndLogEx(WARNING, "Could not find file " _YELLOW_(%s), keyFilename);
+		return 1;
+	}
+	
+	// Read keys A from file
+	size_t bytes_read;
+	for (sectorNo=0; sectorNo<numSectors; sectorNo++) {
+		bytes_read = fread( keyA[sectorNo], 1, 6, f );
+		if ( bytes_read != 6) {
+			PrintAndLogEx(WARNING, "File reading error.");
+			fclose(f);
+			return 2;
+		}
+	}
+	
+	// Read keys B from file
+	for (sectorNo=0; sectorNo<numSectors; sectorNo++) {
+		bytes_read = fread( keyB[sectorNo], 1, 6, f );
+		if ( bytes_read != 6) {
+			PrintAndLogEx(WARNING, "File reading error.");
+			fclose(f);
+			return 2;
+		}
+	}
+	
+	fclose(f);
+			
+
+	PrintAndLogEx(INFO, "Reading sector access bits...");
+
+	uint8_t tries = 0;
+	for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
+		for (tries = 0; tries < MIFARE_SECTOR_RETRY; tries++) {
+		
+			UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 0, 0}};
+			memcpy(c.d.asBytes, keyA[sectorNo], 6);
+			clearCommandBuffer();
+			SendCommand(&c);
+
+			if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
+				uint8_t isOK = resp.arg[0] & 0xff;
+				uint8_t *data = resp.d.asBytes;
+				if (isOK){
+					rights[sectorNo][0] = ((data[7] & 0x10) >> 2) | ((data[8] & 0x1) << 1) | ((data[8] & 0x10) >> 4); // C1C2C3 for data area 0
+					rights[sectorNo][1] = ((data[7] & 0x20) >> 3) | ((data[8] & 0x2) << 0) | ((data[8] & 0x20) >> 5); // C1C2C3 for data area 1
+					rights[sectorNo][2] = ((data[7] & 0x40) >> 4) | ((data[8] & 0x4) >> 1) | ((data[8] & 0x40) >> 6); // C1C2C3 for data area 2
+					rights[sectorNo][3] = ((data[7] & 0x80) >> 5) | ((data[8] & 0x8) >> 2) | ((data[8] & 0x80) >> 7); // C1C2C3 for sector trailer
+					break;
+				} else if (tries == 2) { // on last try set defaults
+					PrintAndLogEx(FAILED, "could not get access rights for sector %2d. Trying with defaults...", sectorNo);
+					rights[sectorNo][0] = rights[sectorNo][1] = rights[sectorNo][2] = 0x00;
+					rights[sectorNo][3] = 0x01;
+				}
+			} else {
+				PrintAndLogEx(FAILED, "command execute timeout when trying to read access rights for sector %2d. Trying with defaults...", sectorNo);
+				rights[sectorNo][0] = rights[sectorNo][1] = rights[sectorNo][2] = 0x00;
+				rights[sectorNo][3] = 0x01;
+			}
+		}
+	}
+	
+	PrintAndLogEx(SUCCESS, "Finished reading sector access bits");
+	PrintAndLogEx(INFO, "Dumping all blocks from card...");
+	
+	bool isOK = true;
+	for (sectorNo = 0; isOK && sectorNo < numSectors; sectorNo++) {
+		for (blockNo = 0; isOK && blockNo < NumBlocksPerSector(sectorNo); blockNo++) {
+			bool received = false;
+			
+			for (tries = 0; tries < MIFARE_SECTOR_RETRY; tries++) {			
+				if (blockNo == NumBlocksPerSector(sectorNo) - 1) {		// sector trailer. At least the Access Conditions can always be read with key A. 
+					UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}};
+					memcpy(c.d.asBytes, keyA[sectorNo], 6);
+					clearCommandBuffer();
+					SendCommand(&c);
+					received = WaitForResponseTimeout(CMD_ACK, &resp, 1500);
+				} else {												// data block. Check if it can be read with key A or key B
+					uint8_t data_area = (sectorNo < 32) ? blockNo : blockNo/5;
+					if ((rights[sectorNo][data_area] == 0x03) || (rights[sectorNo][data_area] == 0x05)) {	// only key B would work
+						UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 1, 0}};
+						memcpy(c.d.asBytes, keyB[sectorNo], 6);
+						SendCommand(&c);
+						received = WaitForResponseTimeout(CMD_ACK, &resp, 1500);
+					} else if (rights[sectorNo][data_area] == 0x07) {										// no key would work
+						isOK = false;
+						PrintAndLogEx(WARNING, "access rights do not allow reading of sector %2d block %3d", sectorNo, blockNo);
+						tries = MIFARE_SECTOR_RETRY;
+					} else {																				// key A would work
+						UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}};
+						memcpy(c.d.asBytes, keyA[sectorNo], 6);
+						clearCommandBuffer();
+						SendCommand(&c);
+						received = WaitForResponseTimeout(CMD_ACK, &resp, 1500);
+					}
+				}
+				if (received) {
+					isOK  = resp.arg[0] & 0xff;
+					if (isOK) break;
+				}
+			}
+
+			if (received) {
+				isOK  = resp.arg[0] & 0xff;
+				uint8_t *data  = resp.d.asBytes;
+				if (blockNo == NumBlocksPerSector(sectorNo) - 1) {		// sector trailer. Fill in the keys.
+					data[0]  = (keyA[sectorNo][0]);
+					data[1]  = (keyA[sectorNo][1]);
+					data[2]  = (keyA[sectorNo][2]);
+					data[3]  = (keyA[sectorNo][3]);
+					data[4]  = (keyA[sectorNo][4]);
+					data[5]  = (keyA[sectorNo][5]);
+					data[10] = (keyB[sectorNo][0]);
+					data[11] = (keyB[sectorNo][1]);
+					data[12] = (keyB[sectorNo][2]);
+					data[13] = (keyB[sectorNo][3]);
+					data[14] = (keyB[sectorNo][4]);
+					data[15] = (keyB[sectorNo][5]);
+				}
+				if (isOK) {
+					memcpy(carddata[FirstBlockOfSector(sectorNo) + blockNo], data, 16);
+                    PrintAndLogEx(SUCCESS, "successfully read block %2d of sector %2d.", blockNo, sectorNo);
+				} else {
+					PrintAndLogEx(FAILED, "could not read block %2d of sector %2d", blockNo, sectorNo);
+					break;
+				}
+			}
+			else {
+				isOK = false;
+				PrintAndLogEx(WARNING, "command execute timeout when trying to read block %2d of sector %2d.", blockNo, sectorNo);
+				break;
+			}
+		}
+	}
+
+	if (isOK == 0) { 
+		PrintAndLogEx(FAILED, "Something went wrong");
+		return 0;
+	}
+
+	PrintAndLogEx(SUCCESS, "\nSuccedded in dumping all blocks");
+	
+	if ( strlen(dataFilename) < 1 ) {
+		fptr = dataFilename;
+		fptr += sprintf(fptr, "hf-mf-");
+		FillFileNameByUID(fptr, (uint8_t *)carddata, "-data", 4);
+	}
+
+	uint16_t bytes = 16*(FirstBlockOfSector(numSectors - 1) + NumBlocksPerSector(numSectors - 1));
+	
+	saveFile(dataFilename, "bin", (uint8_t *)carddata, bytes);
+	saveFileEML(dataFilename, "eml", (uint8_t *)carddata, bytes, MFBLOCK_SIZE);
+	saveFileJSON(dataFilename, "json", jsfCardMemory, (uint8_t *)carddata, bytes);
+	return 0;
+}
+
+int CmdHF14AMfRestore(const char *Cmd) {
+	uint8_t sectorNo,blockNo;
+	uint8_t keyType = 0;
+	uint8_t key[6] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};
+	uint8_t bldata[16] = {0x00};
+	uint8_t keyA[40][6];
+	uint8_t keyB[40][6];
+	uint8_t numSectors = 16;
+	uint8_t cmdp = 0;
+	char keyFilename[FILE_PATH_SIZE] = "";	
+	char dataFilename[FILE_PATH_SIZE] = "";
+	char szTemp[FILE_PATH_SIZE-20] = "";	
+	char *fptr;
+	FILE *fdump, *fkeys;
+
+	while(param_getchar(Cmd, cmdp) != 0x00) {
+		switch(tolower(param_getchar(Cmd, cmdp))) {
+		case 'h':
+			return usage_hf14_restore();
+		case 'u':
+			param_getstr(Cmd, cmdp+1, szTemp, FILE_PATH_SIZE-20); 
+			if(keyFilename[0]==0x00)
+				snprintf(keyFilename, FILE_PATH_SIZE, "hf-mf-%s-key.bin", szTemp);
+			if(dataFilename[0]==0x00)
+				snprintf(dataFilename, FILE_PATH_SIZE, "hf-mf-%s-data.bin", szTemp);
+			cmdp+=2;
+			break;
+		case 'k':
+			param_getstr(Cmd, cmdp+1, keyFilename, FILE_PATH_SIZE); 
+			cmdp += 2;
+			break;
+		case 'f':
+			param_getstr(Cmd, cmdp+1, dataFilename, FILE_PATH_SIZE); 
+			cmdp += 2;
+			break;
+		default:
+			if ( cmdp == 0 ) {
+				numSectors = NumOfSectors(param_getchar(Cmd, cmdp));
+				cmdp++;
+			} else {
+				PrintAndLogEx(WARNING, "Unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
+				return usage_hf14_restore();
+			}
+		}
+	}
+
+	if ( keyFilename[0] == 0x00 ) {
+		fptr = GenerateFilename("hf-mf-", "-key.bin");
+		if (fptr == NULL) 
+			return 1;
+		
+		strcpy(keyFilename, fptr);
+	}
+
+	if ((fkeys = fopen(keyFilename, "rb")) == NULL) {
+		PrintAndLogEx(WARNING, "Could not find file " _YELLOW_(%s), keyFilename);
+		return 1;
+	}
+	
+	size_t bytes_read;
+	for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
+		bytes_read = fread( keyA[sectorNo], 1, 6, fkeys );
+		if ( bytes_read != 6 ) {
+			PrintAndLogEx(WARNING, "File reading error  " _YELLOW_(%s), keyFilename);
+			fclose(fkeys);
+			return 2;
+		}
+	}
+
+	for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
+		bytes_read = fread( keyB[sectorNo], 1, 6, fkeys );
+		if ( bytes_read != 6 ) {
+			PrintAndLogEx(WARNING, "File reading error " _YELLOW_(%s), keyFilename);
+			fclose(fkeys);
+			return 2;
+		}
+	}
+
+	fclose(fkeys);
+
+	if ( dataFilename[0] == 0x00 ) {
+		fptr = GenerateFilename("hf-mf-", "-data.bin");
+		if (fptr == NULL) 
+			return 1;
+		
+		strcpy(dataFilename,fptr);
+	}
+
+	if ((fdump = fopen(dataFilename, "rb")) == NULL) {
+		PrintAndLogEx(WARNING, "Could not find file " _YELLOW_(%s), dataFilename);
+		return 1;
+	}	
+	PrintAndLogEx(INFO, "Restoring " _YELLOW_(%s)" to card", dataFilename);
+
+	for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
+		for (blockNo = 0; blockNo < NumBlocksPerSector(sectorNo); blockNo++) {
+			UsbCommand c = {CMD_MIFARE_WRITEBL, {FirstBlockOfSector(sectorNo) + blockNo, keyType, 0}};
+			memcpy(c.d.asBytes, key, 6);			
+			bytes_read = fread(bldata, 1, 16, fdump);
+			if ( bytes_read != 16) {
+				PrintAndLogEx(WARNING, "File reading error " _YELLOW_(%s), dataFilename);
+				fclose(fdump);
+				fdump = NULL;				
+				return 2;
+			}
+					
+			if (blockNo == NumBlocksPerSector(sectorNo) - 1) {	// sector trailer
+				bldata[0]  = (keyA[sectorNo][0]);
+				bldata[1]  = (keyA[sectorNo][1]);
+				bldata[2]  = (keyA[sectorNo][2]);
+				bldata[3]  = (keyA[sectorNo][3]);
+				bldata[4]  = (keyA[sectorNo][4]);
+				bldata[5]  = (keyA[sectorNo][5]);
+				bldata[10] = (keyB[sectorNo][0]);
+				bldata[11] = (keyB[sectorNo][1]);
+				bldata[12] = (keyB[sectorNo][2]);
+				bldata[13] = (keyB[sectorNo][3]);
+				bldata[14] = (keyB[sectorNo][4]);
+				bldata[15] = (keyB[sectorNo][5]);
+			}		
+			
+			PrintAndLogEx(NORMAL, "Writing to block %3d: %s", FirstBlockOfSector(sectorNo) + blockNo, sprint_hex(bldata, 16));
+			
+			memcpy(c.d.asBytes + 10, bldata, 16);
+			clearCommandBuffer();
+			SendCommand(&c);
+
+			UsbCommand resp;
+			if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
+				uint8_t isOK  = resp.arg[0] & 0xff;
+				PrintAndLogEx(SUCCESS, "isOk:%02x", isOK);
+			} else {
+				PrintAndLogEx(WARNING, "Command execute timeout");
+			}
+		}
+	}
+	
+	fclose(fdump);
+	return 0;
+}
+
+int CmdHF14AMfNested(const char *Cmd) {
+	int i, res, iterations;
+	sector_t *e_sector = NULL;
+	uint8_t blockNo = 0;
+	uint8_t keyType = 0;
+	uint8_t trgBlockNo = 0;
+	uint8_t trgKeyType = 0;
+	uint8_t SectorsCnt = 0;
+	uint8_t key[6] = {0, 0, 0, 0, 0, 0};
+	uint8_t keyBlock[(MIFARE_DEFAULTKEYS_SIZE + 1) *6];
+	uint64_t key64 = 0;
+	bool transferToEml = false;
+	bool createDumpFile = false;
+	FILE *fkeys;
+	uint8_t standart[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
+	uint8_t tempkey[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
+	char *fptr;
+	
+	if (strlen(Cmd) < 3) return usage_hf14_nested();
+	
+	char cmdp, ctmp;
+	cmdp = tolower(param_getchar(Cmd, 0));
+	blockNo = param_get8(Cmd, 1);
+	ctmp = tolower(param_getchar(Cmd, 2));
+
+	if (ctmp != 'a' && ctmp != 'b') {
+		PrintAndLogEx(WARNING, "key type must be A or B");
+		return 1;
+	}
+	
+	if (ctmp != 'a') 
+		keyType = 1;
+		
+	if (param_gethex(Cmd, 3, key, 12)) {
+		PrintAndLogEx(WARNING, "key must include 12 HEX symbols");
+		return 1;
+	}
+	
+	if (cmdp == 'o') {
+		trgBlockNo = param_get8(Cmd, 4);
+		ctmp = tolower(param_getchar(Cmd, 5));
+		if (ctmp != 'a' && ctmp != 'b') {
+			PrintAndLogEx(WARNING, "target key type must be A or B");
+			return 1;
+		}
+		if (ctmp != 'a') { 
+			trgKeyType = 1;
+		}
+	} else {
+		SectorsCnt = NumOfSectors(cmdp);
+	}
+	
+	uint8_t j = 4;
+	while ( ctmp != 0x00 ) {
+
+		ctmp = tolower(param_getchar(Cmd, j));
+		transferToEml |= (ctmp == 't');
+		createDumpFile |= (ctmp == 'd');
+		
+		j++;
+	}
+	
+	// check if we can authenticate to sector
+	res = mfCheckKeys(blockNo, keyType, true, 1, key, &key64);
+	if (res) {
+		PrintAndLogEx(WARNING, "Wrong key. Can't authenticate to block:%3d key type:%c", blockNo, keyType ? 'B' : 'A');
+		return 3;
+	}	
+	
+	if (cmdp == 'o') {
+		int16_t isOK = mfnested(blockNo, keyType, key, trgBlockNo, trgKeyType, keyBlock, true);
+		switch (isOK) {
+			case -1 : PrintAndLogEx(WARNING, "Error: No response from Proxmark.\n"); break;
+			case -2 : PrintAndLogEx(WARNING, "Button pressed. Aborted.\n"); break;
+			case -3 : PrintAndLogEx(FAILED, "Tag isn't vulnerable to Nested Attack (PRNG is not predictable).\n"); break;
+			case -4 : PrintAndLogEx(FAILED, "No valid key found"); break;
+			case -5 : 
+				key64 = bytes_to_num(keyBlock, 6);
+
+				// transfer key to the emulator
+				if (transferToEml) {
+					uint8_t sectortrailer;
+					if (trgBlockNo < 32*4) { 	// 4 block sector
+					sectortrailer = trgBlockNo | 0x03;
+					} else {					// 16 block sector
+					sectortrailer = trgBlockNo | 0x0f;
+					}
+					mfEmlGetMem(keyBlock, sectortrailer, 1);
+			
+					if (!trgKeyType)
+						num_to_bytes(key64, 6, keyBlock);
+					else
+						num_to_bytes(key64, 6, &keyBlock[10]);
+					mfEmlSetMem(keyBlock, sectortrailer, 1);	
+					PrintAndLogEx(SUCCESS, "Key transferred to emulator memory.");
+				}
+				return 0;
+			default : PrintAndLogEx(WARNING, "Unknown Error.\n");
+		}
+		return 2;
+	}
+	else { // ------------------------------------  multiple sectors working
+		uint64_t t1 = msclock();
+		
+		e_sector = calloc(SectorsCnt, sizeof(sector_t));
+		if (e_sector == NULL) return 1;
+		
+		//test current key and additional standard keys first
+		// add parameter key
+		memcpy( keyBlock + (MIFARE_DEFAULTKEYS_SIZE * 6), key, 6 );
+
+		for (int cnt = 0; cnt < MIFARE_DEFAULTKEYS_SIZE; cnt++){
+			num_to_bytes(g_mifare_default_keys[cnt], 6, (uint8_t*)(keyBlock + cnt * 6));
+		}
+
+		PrintAndLogEx(SUCCESS, "Testing known keys. Sector count=%d", SectorsCnt);
+		res = mfCheckKeys_fast( SectorsCnt, true, true, 1, MIFARE_DEFAULTKEYS_SIZE + 1, keyBlock, e_sector, false);
+				
+		uint64_t t2 = msclock() - t1;
+		PrintAndLogEx(SUCCESS, "Time to check %d known keys: %.0f seconds\n", MIFARE_DEFAULTKEYS_SIZE, (float)t2/1000.0 );
+		PrintAndLogEx(SUCCESS, "enter nested attack");
+		
+		// nested sectors
+		iterations = 0;
+		bool calibrate = true;
+
+		for (i = 0; i < MIFARE_SECTOR_RETRY; i++) {
+			for (uint8_t sectorNo = 0; sectorNo < SectorsCnt; ++sectorNo) {
+				for (trgKeyType = 0; trgKeyType < 2; ++trgKeyType) { 
+
+					if (e_sector[sectorNo].foundKey[trgKeyType]) continue;
+					
+					int16_t isOK = mfnested(blockNo, keyType, key, FirstBlockOfSector(sectorNo), trgKeyType, keyBlock, calibrate);
+					switch (isOK) {
+						case -1 : PrintAndLogEx(WARNING, "error: No response from Proxmark.\n"); break;
+						case -2 : PrintAndLogEx(WARNING, "button pressed. Aborted.\n"); break;
+						case -3 : PrintAndLogEx(FAILED, "Tag isn't vulnerable to Nested Attack (PRNG is not predictable).\n"); break;
+						case -4 : //key not found
+							calibrate = false;
+							iterations++;
+							continue; 
+						case -5 :
+							calibrate = false;
+							iterations++;
+							e_sector[sectorNo].foundKey[trgKeyType] = 1;
+							e_sector[sectorNo].Key[trgKeyType] = bytes_to_num(keyBlock, 6);
+
+							res = mfCheckKeys_fast( SectorsCnt, true, true, 2, 1, keyBlock, e_sector, false);
+							continue;
+							
+						default : PrintAndLogEx(WARNING, "unknown Error.\n");
+					}
+					free(e_sector);
+					return 2;
+				}
+			}
+		}
+		
+		t1 = msclock() - t1;
+		PrintAndLogEx(SUCCESS, "time in nested: %.0f seconds\n", (float)t1/1000.0);
+
+
+		// 20160116 If Sector A is found, but not Sector B,  try just reading it of the tag?
+		PrintAndLogEx(INFO, "trying to read key B...");
+		for (i = 0; i < SectorsCnt; i++) {
+			// KEY A  but not KEY B
+			if ( e_sector[i].foundKey[0] && !e_sector[i].foundKey[1] ) {
+				
+				uint8_t sectrail = (FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1);
+				
+				PrintAndLogEx(SUCCESS, "reading block %d", sectrail);
+							
+				UsbCommand c = {CMD_MIFARE_READBL, {sectrail, 0, 0}};
+				num_to_bytes(e_sector[i].Key[0], 6, c.d.asBytes); // KEY A
+				clearCommandBuffer();
+				SendCommand(&c);
+
+				UsbCommand resp;
+				if ( !WaitForResponseTimeout(CMD_ACK,&resp,1500)) continue;
+					
+				uint8_t isOK  = resp.arg[0] & 0xff;
+				if (!isOK) continue;
+
+				uint8_t *data = resp.d.asBytes;
+				key64 = bytes_to_num(data+10, 6);
+				if (key64) {
+					PrintAndLogEx(SUCCESS, "data: %s", sprint_hex(data+10, 6));
+					e_sector[i].foundKey[1] = true;
+					e_sector[i].Key[1] = key64;
+				}
+			}
+		}
+
+		
+		//print them
+		printKeyTable( SectorsCnt, e_sector );
+		
+		// transfer them to the emulator
+		if (transferToEml) {
+			for (i = 0; i < SectorsCnt; i++) {
+				mfEmlGetMem(keyBlock, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
+				if (e_sector[i].foundKey[0])
+					num_to_bytes(e_sector[i].Key[0], 6, keyBlock);
+				if (e_sector[i].foundKey[1])
+					num_to_bytes(e_sector[i].Key[1], 6, &keyBlock[10]);
+				mfEmlSetMem(keyBlock, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
+			}
+			PrintAndLogEx(SUCCESS, "keys transferred to emulator memory.");
+		}
+		
+		// Create dump file
+		if (createDumpFile) {
+			fptr = GenerateFilename("hf-mf-", "-key.bin");
+			if (fptr == NULL) {
+				free(e_sector);
+				return 1;
+			}
+			
+			if ((fkeys = fopen(fptr, "wb")) == NULL) { 
+				PrintAndLogEx(WARNING, "could not create file " _YELLOW_(%s), fptr);
+				free(e_sector);
+				return 1;
+			}
+			
+			PrintAndLogEx(SUCCESS, "saving keys to binary file " _YELLOW_(%s), fptr);
+			for (i=0; i<SectorsCnt; i++) {
+				if (e_sector[i].foundKey[0]){
+					num_to_bytes(e_sector[i].Key[0], 6, tempkey);
+					fwrite ( tempkey, 1, 6, fkeys );
+				} else {
+					fwrite ( &standart, 1, 6, fkeys );
+				}
+			}
+			for( i=0; i<SectorsCnt; i++) {
+				if (e_sector[i].foundKey[1]){
+					num_to_bytes(e_sector[i].Key[1], 6, tempkey);
+					fwrite ( tempkey, 1, 6, fkeys );
+				} else {
+					fwrite ( &standart, 1, 6, fkeys );
+				}
+			}
+			fflush(fkeys);
+			fclose(fkeys);
+		}		
+		free(e_sector);
+	}
+
+	free(e_sector);	
+	return 0;
+}
+
+int CmdHF14AMfNestedHard(const char *Cmd) {
+	uint8_t blockNo = 0;
+	uint8_t keyType = 0;
+	uint8_t trgBlockNo = 0;
+	uint8_t trgKeyType = 0;
+	uint8_t key[6] = {0, 0, 0, 0, 0, 0};
+	uint8_t trgkey[6] = {0, 0, 0, 0, 0, 0};
+	uint8_t cmdp=0;
+	char filename[FILE_PATH_SIZE], *fptr;
+	char szTemp[FILE_PATH_SIZE-20];
+	char ctmp;
+	
+	bool know_target_key = false;
+	bool nonce_file_read = false;
+	bool nonce_file_write = false;
+	bool slow = false;
+	int tests = 0;
+	
+	switch(tolower(param_getchar(Cmd, cmdp))) {
+		case 'h': return usage_hf14_hardnested();
+		case 'r':
+			fptr = GenerateFilename("hf-mf-","-nonces.bin");
+			if (fptr == NULL) 
+				strncpy(filename, "nonces.bin", FILE_PATH_SIZE);
+			else
+				strncpy(filename, fptr, FILE_PATH_SIZE-1);
+				
+			nonce_file_read = true;
+			if (!param_gethex(Cmd, cmdp+1, trgkey, 12)) {
+				know_target_key = true;
+			}
+			cmdp++;
+			break;
+		case 't':
+			tests = param_get32ex(Cmd, cmdp+1, 100, 10);
+			if (!param_gethex(Cmd, cmdp+2, trgkey, 12)) {
+				know_target_key = true;
+			}
+			cmdp += 2;
+			break;
+		default:
+			if (param_getchar(Cmd, cmdp) == 0x00)
+			{
+				PrintAndLogEx(WARNING, "Block number is missing");
+				return 1;
+			
+			}
+			blockNo = param_get8(Cmd, cmdp);
+			ctmp = tolower(param_getchar(Cmd, cmdp+1));
+			if (ctmp != 'a' && ctmp != 'b') {
+				PrintAndLogEx(WARNING, "Key type must be A or B");
+				return 1;
+			}
+			
+			if (ctmp != 'a') { 
+				keyType = 1;
+			}
+			
+			if (param_gethex(Cmd, cmdp+2, key, 12)) {
+				PrintAndLogEx(WARNING, "Key must include 12 HEX symbols");
+				return 1;
+			}
+			
+			if (param_getchar(Cmd, cmdp+3) == 0x00)
+			{
+				PrintAndLogEx(WARNING, "Target block number is missing");
+				return 1;
+			}
+			
+			trgBlockNo = param_get8(Cmd, cmdp+3);
+
+			ctmp = tolower(param_getchar(Cmd, cmdp+4));
+			if (ctmp != 'a' && ctmp != 'b') {
+				PrintAndLogEx(WARNING, "Target key type must be A or B");
+				return 1;
+			}
+			if (ctmp != 'a') {
+				trgKeyType = 1;
+			}
+			cmdp += 5;
+	}
+	if (!param_gethex(Cmd, cmdp, trgkey, 12)) {
+		know_target_key = true;
+		cmdp++;
+	}
+
+	while ((ctmp = param_getchar(Cmd, cmdp))) {
+		switch(tolower(ctmp)) {
+		case 's':
+			slow = true;
+			break;
+		case 'w':
+			nonce_file_write = true;
+			fptr = GenerateFilename("hf-mf-","-nonces.bin");
+			if (fptr == NULL) 
+				return 1;
+			strncpy(filename, fptr, FILE_PATH_SIZE-1);
+			break;
+		case 'u':
+			param_getstr(Cmd, cmdp+1, szTemp, FILE_PATH_SIZE-20);
+			snprintf(filename, FILE_PATH_SIZE, "hf-mf-%s-nonces.bin", szTemp);
+			cmdp++;
+			break;
+		case 'f':
+			param_getstr(Cmd, cmdp+1, szTemp, FILE_PATH_SIZE-20);
+			strncpy(filename, szTemp, FILE_PATH_SIZE-20);
+			cmdp++;
+			break;
+		case 'i': 
+			SetSIMDInstr(SIMD_AUTO);
+			ctmp = tolower(param_getchar(Cmd, cmdp+1));
+			switch (ctmp) {
+				case '5':
+					SetSIMDInstr(SIMD_AVX512);
+					break;
+				case '2':
+					SetSIMDInstr(SIMD_AVX2);
+					break;
+				case 'a':
+					SetSIMDInstr(SIMD_AVX);
+					break;
+				case 's':
+					SetSIMDInstr(SIMD_SSE2);
+					break;
+				case 'm':
+					SetSIMDInstr(SIMD_MMX);
+					break;
+				case 'n':
+					SetSIMDInstr(SIMD_NONE);
+					break;
+				default:
+					PrintAndLogEx(WARNING, "Unknown SIMD type. %c", ctmp);
+					return 1;
+			}
+			cmdp += 2;
+			break;
+		default:
+			PrintAndLogEx(WARNING, "Unknown parameter '%c'\n", ctmp);
+			usage_hf14_hardnested();
+			return 1;
+		}
+		cmdp++;
+	}
+	
+	if ( !know_target_key ) {
+		uint64_t key64 = 0;
+		// check if we can authenticate to sector
+		int res = mfCheckKeys(blockNo, keyType, true, 1, key, &key64);
+		if (res) {
+			PrintAndLogEx(WARNING, "Key is wrong. Can't authenticate to block:%3d key type:%c", blockNo, keyType ? 'B' : 'A');
+			return 3;
+		}	
+	}
+	
+	PrintAndLogEx(NORMAL, "--target block no:%3d, target key type:%c, known target key: 0x%02x%02x%02x%02x%02x%02x%s, file action: %s, Slow: %s, Tests: %d ", 
+			trgBlockNo, 
+			trgKeyType?'B':'A', 
+			trgkey[0], trgkey[1], trgkey[2], trgkey[3], trgkey[4], trgkey[5],
+			know_target_key ? "" : " (not set)",
+			nonce_file_write ? "write": nonce_file_read ? "read" : "none",
+			slow ? "Yes" : "No",
+			tests);
+
+	uint64_t foundkey = 0;
+	int16_t isOK = mfnestedhard(blockNo, keyType, key, trgBlockNo, trgKeyType, know_target_key ? trgkey : NULL, nonce_file_read, nonce_file_write, slow, tests, &foundkey, filename);
+
+	DropField();
+	if (isOK) {
+		switch (isOK) {
+			case 1 : PrintAndLogEx(WARNING, "Error: No response from Proxmark.\n"); break;
+			case 2 : PrintAndLogEx(NORMAL, "Button pressed. Aborted.\n"); break;
+			default : break;
+		}
+		return 2;
+	}
+	return 0;
+}
+
+int randInRange(int min, int max) {
+	return min + (int) (rand() / (double) (RAND_MAX) * (max - min + 1));
+}
+
+//Fisher–Yates shuffle
+void shuffle( uint8_t *array, uint16_t len) {
+	uint8_t tmp[6];
+	uint16_t x;
+	time_t t;
+	srand((unsigned) time(&t));
+	while (len) {		
+		x = randInRange(0, (len -= 6) ) | 0; // 0 = i < n
+		x %= 6;
+		memcpy(tmp, array + x, 6);
+		memcpy(array + x, array + len, 6);	
+		memcpy(array + len, tmp, 6);		
+	}
+}
+
+int CmdHF14AMfChk_fast(const char *Cmd) {
+
+	char ctmp = 0x00;
+	ctmp = tolower(param_getchar(Cmd, 0));
+	if (strlen(Cmd) < 1 || ctmp == 'h') return usage_hf14_chk_fast();
+
+	FILE * f;
+	char filename[FILE_PATH_SIZE]={0};
+	char buf[13];
+	char *fptr;
+	uint8_t tempkey[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
+	uint8_t *keyBlock = NULL, *p;
+	uint8_t sectorsCnt = 1;
+	int i, keycnt = 0;
+	int clen = 0;
+	int transferToEml = 0, createDumpFile = 0;
+	uint32_t keyitems = MIFARE_DEFAULTKEYS_SIZE;
+	bool use_flashmemory = false;
+
+	sector_t *e_sector = NULL;
+	
+	keyBlock = calloc(MIFARE_DEFAULTKEYS_SIZE, 6);
+	if (keyBlock == NULL) return 1;
+
+	for (int cnt = 0; cnt < MIFARE_DEFAULTKEYS_SIZE; cnt++)
+		num_to_bytes(g_mifare_default_keys[cnt], 6, keyBlock + cnt * 6);
+	
+	// sectors
+	switch(ctmp) {
+		case '0': sectorsCnt =  MIFARE_MINI_MAXSECTOR; break;
+		case '1': sectorsCnt = MIFARE_1K_MAXSECTOR; break;
+		case '2': sectorsCnt = MIFARE_2K_MAXSECTOR; break;
+		case '4': sectorsCnt = MIFARE_4K_MAXSECTOR; break;
+		default:  sectorsCnt = MIFARE_1K_MAXSECTOR;
+	}
+
+	for (i = 1; param_getchar(Cmd, i); i++) {
+		
+		ctmp = tolower(param_getchar(Cmd, i));
+		clen = param_getlength(Cmd, i);
+		
+		if (clen == 12) {
+			
+			if ( param_gethex(Cmd, i, keyBlock + 6 * keycnt, 12) ){
+				PrintAndLogEx(FAILED, "not hex, skipping");
+				continue;
+			}
+
+			if ( keyitems - keycnt < 2) {
+				p = realloc(keyBlock, 6 * (keyitems += 64));
+				if (!p) {
+					PrintAndLogEx(FAILED, "Cannot allocate memory for Keys");
+					free(keyBlock);
+					return 2;
+				}
+				keyBlock = p;
+			}
+			PrintAndLogEx(NORMAL, "[%2d] key %s", keycnt, sprint_hex( (keyBlock + 6*keycnt), 6 ) );
+			keycnt++;
+		} else if ( clen == 1) {
+			if (ctmp == 't' ) { transferToEml = 1; continue; }
+			if (ctmp == 'd' ) { createDumpFile = 1; continue; }
+#ifdef WITH_FLASH			
+			if (ctmp == 'm' ) { use_flashmemory = true; continue; }
+#endif			
+		} else {
+			// May be a dic file
+			if ( param_getstr(Cmd, i, filename, FILE_PATH_SIZE) >= FILE_PATH_SIZE ) {
+				PrintAndLogEx(FAILED, "Filename too long");
+				continue;
+			}
+			
+			f = fopen( filename, "r");
+			if ( !f ){
+				PrintAndLogEx(FAILED, "File: " _YELLOW_(%s) ": not found or locked.", filename);
+				continue;
+			}
+			
+			// read file
+			while( fgets(buf, sizeof(buf), f) ){
+				if (strlen(buf) < 12 || buf[11] == '\n')
+					continue;
+			
+				while (fgetc(f) != '\n' && !feof(f)) ;  //goto next line
+				
+				if( buf[0]=='#' ) continue;	//The line start with # is comment, skip
+
+				if (!isxdigit(buf[0])){
+					PrintAndLogEx(FAILED, "File content error. '" _YELLOW_(%s)"' must include 12 HEX symbols", buf);
+					continue;
+				}
+				
+				buf[12] = 0;
+				if ( keyitems - keycnt < 2) {
+					p = realloc(keyBlock, 6 * (keyitems += 64));
+					if (!p) {
+						PrintAndLogEx(FAILED, "Cannot allocate memory for default keys");
+						free(keyBlock);
+						fclose(f);
+						return 2;
+					}
+					keyBlock = p;
+				}
+				int pos = 6 * keycnt;
+				memset(keyBlock + pos, 0, 6);
+				num_to_bytes(strtoll(buf, NULL, 16), 6, keyBlock + pos);
+				keycnt++;
+				memset(buf, 0, sizeof(buf));
+			}
+			fclose(f);
+			PrintAndLogEx(SUCCESS, "Loaded %2d keys from " _YELLOW_(%s), keycnt, filename);
+		}
+	}
+		
+	if (keycnt == 0 && !use_flashmemory) {
+		PrintAndLogEx(SUCCESS, "No key specified, trying default keys");
+		for (;keycnt < MIFARE_DEFAULTKEYS_SIZE; keycnt++)
+			PrintAndLogEx(NORMAL, "[%2d] %02x%02x%02x%02x%02x%02x", keycnt,
+				(keyBlock + 6*keycnt)[0],(keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2],
+				(keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4],	(keyBlock + 6*keycnt)[5]);
+	}
+	
+	// // initialize storage for found keys
+	e_sector = calloc(sectorsCnt, sizeof(sector_t));
+	if (e_sector == NULL) {
+		free(keyBlock);
+		return 1;
+	}
+			
+	uint32_t chunksize = keycnt > (USB_CMD_DATA_SIZE/6) ? (USB_CMD_DATA_SIZE/6) : keycnt;
+	bool firstChunk = true, lastChunk = false;
+	
+	// time
+	uint64_t t1 = msclock();
+
+	if ( use_flashmemory ) {
+		PrintAndLogEx(SUCCESS, "Using dictionary in flash memory");
+		mfCheckKeys_fast( sectorsCnt, true, true, 1, 0, keyBlock, e_sector, use_flashmemory);
+	} else {
+	
+		// strategys. 1= deep first on sector 0 AB,  2= width first on all sectors
+		for (uint8_t strategy = 1; strategy < 3; strategy++) {
+			PrintAndLogEx(SUCCESS, "Running strategy %u", strategy);
+
+				// main keychunk loop			
+				for (uint32_t i = 0; i < keycnt; i += chunksize) {
+					
+					if (ukbhit()) {
+						int gc = getchar(); (void)gc;
+						PrintAndLogEx(WARNING, "\naborted via keyboard!\n");
+						goto out;
+					}
+					
+					uint32_t size = ((keycnt - i)  > chunksize) ? chunksize : keycnt - i;
+					
+					// last chunk?
+					if ( size == keycnt - i)
+						lastChunk = true;
+					
+					int res = mfCheckKeys_fast( sectorsCnt, firstChunk, lastChunk, strategy, size, keyBlock + (i * 6), e_sector, false);
+
+					if ( firstChunk )
+						firstChunk = false;
+								
+					// all keys,  aborted
+					if ( res == 0 || res == 2 )
+						goto out;
+				} // end chunks of keys
+			firstChunk = true;
+			lastChunk = false;
+		} // end strategy
+	}
+out: 
+	t1 = msclock() - t1;
+	PrintAndLogEx(SUCCESS, "Time in checkkeys (fast):  %.1fs\n", (float)(t1/1000.0));
+
+	// check..
+	uint8_t found_keys = 0;
+	for (uint8_t i = 0; i < sectorsCnt; ++i) {
+		
+		if ( e_sector[i].foundKey[0] ) 
+			found_keys++;
+		
+		if ( e_sector[i].foundKey[1] )
+			found_keys++;
+	}
+	
+	if ( found_keys == 0 ) {
+		PrintAndLogEx(WARNING, "No keys found");
+	} else {
+	
+		printKeyTable( sectorsCnt, e_sector );
+
+		if (transferToEml) {
+			uint8_t block[16] = {0x00};
+			for (uint8_t i = 0; i < sectorsCnt; ++i ) {
+				mfEmlGetMem(block, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
+				if (e_sector[i].foundKey[0])
+					num_to_bytes(e_sector[i].Key[0], 6, block);
+				if (e_sector[i].foundKey[1])
+					num_to_bytes(e_sector[i].Key[1], 6, block+10);
+				mfEmlSetMem(block, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
+			}
+			PrintAndLogEx(SUCCESS, "Found keys have been transferred to the emulator memory");
+		}
+		
+		if (createDumpFile) {
+			fptr = GenerateFilename("hf-mf-", "-key.bin");
+			if (fptr == NULL) 
+				return 1;
+
+			FILE *fkeys = fopen(fptr, "wb");
+			if (fkeys == NULL) { 
+				PrintAndLogEx(WARNING, "Could not create file " _YELLOW_(%s), fptr);
+				free(keyBlock);
+				free(e_sector);
+				return 1;
+			}
+			PrintAndLogEx(SUCCESS, "Printing keys to binary file " _YELLOW_(%s)"...", fptr);
+		
+			for (i=0; i<sectorsCnt; i++) {
+				num_to_bytes(e_sector[i].Key[0], 6, tempkey);
+				fwrite (tempkey, 1, 6, fkeys);
+			}
+
+			for (i=0; i<sectorsCnt; i++) {
+				num_to_bytes(e_sector[i].Key[1], 6, tempkey);
+				fwrite (tempkey, 1, 6, fkeys );
+			}
+
+			fclose(fkeys);
+			PrintAndLogEx(SUCCESS, "Found keys have been dumped to " _YELLOW_(%s)" --> 0xffffffffffff has been inserted for unknown keys.", fptr);			
+		}	
+	}
+	
+	free(keyBlock);
+	free(e_sector);
+	PrintAndLogEx(NORMAL, "");
+	return 0;
+}
+
+int CmdHF14AMfChk(const char *Cmd) {
+
+	char ctmp = tolower(param_getchar(Cmd, 0));
+	if (strlen(Cmd) < 3 || ctmp == 'h') return usage_hf14_chk();
+
+	FILE * f;
+	char filename[FILE_PATH_SIZE] = {0};
+	char buf[13];
+	uint8_t *keyBlock = NULL, *p;
+	sector_t *e_sector = NULL;
+
+	uint8_t blockNo = 0;
+	uint8_t SectorsCnt = 1;
+	uint8_t keyType = 0;
+	uint32_t keyitems = MIFARE_DEFAULTKEYS_SIZE;
+	uint64_t key64 = 0;	
+	uint8_t tempkey[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
+	char *fptr;
+	int clen = 0;
+	int transferToEml = 0;
+	int createDumpFile = 0;	
+	int i, res, keycnt = 0;
+
+	keyBlock = calloc(MIFARE_DEFAULTKEYS_SIZE, 6);
+	if (keyBlock == NULL) return 1;
+
+	for (int cnt = 0; cnt < MIFARE_DEFAULTKEYS_SIZE; cnt++)
+		num_to_bytes(g_mifare_default_keys[cnt], 6, (uint8_t*)(keyBlock + cnt * 6));
+	
+	if (param_getchar(Cmd, 0)=='*') {
+		blockNo = 3;
+		SectorsCnt = NumOfSectors( param_getchar(Cmd+1, 0) );
+	} else {
+		blockNo = param_get8(Cmd, 0);
+	}
+	
+	ctmp = tolower(param_getchar(Cmd, 1));
+	clen = param_getlength(Cmd, 1);
+	if (clen == 1) {
+		switch (ctmp) {	
+		case 'a':
+			keyType = 0;
+			break;
+		case 'b':
+			keyType = 1;
+			break;
+		case '?':
+			keyType = 2;
+			break;
+		default:
+			PrintAndLogEx(FAILED, "Key type must be A , B or ?");
+			free(keyBlock);
+			return 1;
+		};
+	}
+
+	for (i = 2; param_getchar(Cmd, i); i++) {
+
+		ctmp = tolower(param_getchar(Cmd, i));
+		clen = param_getlength(Cmd, i);
+		
+		if (clen == 12) {
+			
+			if ( param_gethex(Cmd, i, keyBlock + 6 * keycnt, 12) ){
+				PrintAndLogEx(FAILED, "not hex, skipping");
+				continue;
+			}
+
+			if ( keyitems - keycnt < 2) {
+				p = realloc(keyBlock, 6 * (keyitems += 64));
+				if (!p) {
+					PrintAndLogEx(FAILED, "cannot allocate memory for Keys");
+					free(keyBlock);
+					return 2;
+				}
+				keyBlock = p;
+			}
+			PrintAndLogEx(NORMAL, "[%2d] key %s", keycnt, sprint_hex( (keyBlock + 6*keycnt), 6 ) );;
+			keycnt++;
+		} else if ( clen == 1 ) {
+			if (ctmp == 't' ) { transferToEml = 1; continue; }
+			if (ctmp == 'd' ) { createDumpFile = 1; continue; }
+		} else {
+			// May be a dic file
+			if ( param_getstr(Cmd, i, filename, sizeof(filename)) >= FILE_PATH_SIZE ) {
+				PrintAndLogEx(FAILED, "File name too long");
+				continue;
+			}
+			
+			f = fopen( filename , "r");
+			if ( !f ) {
+				PrintAndLogEx(FAILED, "File: " _YELLOW_(%s) ": not found or locked.", filename);
+				continue;
+			}
+			
+			// load keys from dictionary file
+			while( fgets(buf, sizeof(buf), f) ){
+				if (strlen(buf) < 12 || buf[11] == '\n')
+					continue;
+			
+				while (fgetc(f) != '\n' && !feof(f)) ;  //goto next line
+				
+				if( buf[0]=='#' ) continue;	//The line start with # is comment, skip
+
+				// codesmell, only checks first char?
+				if (!isxdigit(buf[0])){
+					PrintAndLogEx(FAILED, "File content error. '" _YELLOW_(%s)"' must include 12 HEX symbols",buf);
+					continue;
+				}
+				
+				buf[12] = 0;
+
+				if ( keyitems - keycnt < 2) {
+					p = realloc(keyBlock, 6 * (keyitems += 64));
+					if (!p) {
+						PrintAndLogEx(FAILED, "Cannot allocate memory for defKeys");
+						free(keyBlock);
+						fclose(f);
+						return 2;
+					}
+					keyBlock = p;
+				}
+				memset(keyBlock + 6 * keycnt, 0, 6);
+				num_to_bytes(strtoll(buf, NULL, 16), 6, keyBlock + 6*keycnt);
+				//PrintAndLogEx(NORMAL, "check key[%2d] %012" PRIx64, keycnt, bytes_to_num(keyBlock + 6*keycnt, 6));
+				keycnt++;
+				memset(buf, 0, sizeof(buf));
+			}
+			fclose(f);
+			PrintAndLogEx(SUCCESS, "Loaded %2d keys from " _YELLOW_(%s), keycnt, filename);
+		}
+	}
+	
+	if (keycnt == 0) {
+		PrintAndLogEx(INFO, "No key specified, trying default keys");
+		for (;keycnt < MIFARE_DEFAULTKEYS_SIZE; keycnt++)
+			PrintAndLogEx(NORMAL, "[%2d] %02x%02x%02x%02x%02x%02x", keycnt,
+				(keyBlock + 6*keycnt)[0],(keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2],
+				(keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4],	(keyBlock + 6*keycnt)[5], 6);
+	}
+	
+	// initialize storage for found keys
+	e_sector = calloc(SectorsCnt, sizeof(sector_t));
+	if (e_sector == NULL) {
+		free(keyBlock);
+		return 1;
+	}
+
+	// empty e_sector
+	for(int i = 0; i < SectorsCnt; ++i){
+		e_sector[i].Key[0] = 0xffffffffffff;
+		e_sector[i].Key[1] = 0xffffffffffff;
+		e_sector[i].foundKey[0] = false;
+		e_sector[i].foundKey[1] = false;
+	}
+		
+	
+	uint8_t trgKeyType = 0;
+	uint32_t max_keys = keycnt > (USB_CMD_DATA_SIZE/6) ? (USB_CMD_DATA_SIZE/6) : keycnt;
+	
+	// time
+	uint64_t t1 = msclock();
+
+	
+	// check keys.
+	for (trgKeyType = (keyType==2)?0:keyType; trgKeyType < 2; (keyType==2) ? (++trgKeyType) : (trgKeyType=2) ) {
+
+		int b = blockNo;
+		for (int i = 0; i < SectorsCnt; ++i) {
+			
+			// skip already found keys.
+			if (e_sector[i].foundKey[trgKeyType]) continue;
+						
+			for (uint32_t c = 0; c < keycnt; c += max_keys) {
+								
+				printf("."); fflush(stdout);
+				if (ukbhit()) {
+					int gc = getchar();	(void)gc;
+					PrintAndLogEx(INFO, "\naborted via keyboard!\n");
+					goto out;
+				}
+								
+				uint32_t size = keycnt-c > max_keys ? max_keys : keycnt-c;
+				
+				res = mfCheckKeys(b, trgKeyType, true, size, &keyBlock[6*c], &key64);
+				if (!res) {
+					e_sector[i].Key[trgKeyType] = key64;
+					e_sector[i].foundKey[trgKeyType] = true;
+					break;
+				}
+				
+
+			}
+			b < 127 ? ( b +=4 ) : ( b += 16 );	
+		}
+	}
+	t1 = msclock() - t1;
+	PrintAndLogEx(SUCCESS, "\nTime in checkkeys: %.0f seconds\n", (float)t1/1000.0);
+
+		
+	// 20160116 If Sector A is found, but not Sector B,  try just reading it of the tag?
+	if ( keyType != 1 ) {
+		PrintAndLogEx(INFO, "testing to read key B...");
+		for (i = 0; i < SectorsCnt; i++) {
+			// KEY A  but not KEY B
+			if ( e_sector[i].foundKey[0] && !e_sector[i].foundKey[1] ) {
+							
+				uint8_t sectrail = (FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1);
+				
+				PrintAndLogEx(NORMAL, "Reading block %d", sectrail);
+				
+				UsbCommand c = {CMD_MIFARE_READBL, {sectrail, 0, 0}};
+				num_to_bytes(e_sector[i].Key[0], 6, c.d.asBytes); // KEY A
+				clearCommandBuffer();
+				SendCommand(&c);
+
+				UsbCommand resp;
+				if ( !WaitForResponseTimeout(CMD_ACK,&resp,1500)) continue;
+					
+				uint8_t isOK  = resp.arg[0] & 0xff;
+				if (!isOK) continue;
+
+				uint8_t *data = resp.d.asBytes;
+				key64 = bytes_to_num(data+10, 6);
+				if (key64) {
+					PrintAndLogEx(NORMAL, "Data:%s", sprint_hex(data+10, 6));
+					e_sector[i].foundKey[1] = 1;
+					e_sector[i].Key[1] = key64;
+				}
+			}
+		}
+	}
+
+out:
+	
+	//print keys
+	printKeyTable( SectorsCnt, e_sector );
+	
+	if (transferToEml) {
+		uint8_t block[16] = {0x00};
+		for (uint8_t i = 0; i < SectorsCnt; ++i ) {
+			mfEmlGetMem(block, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
+			if (e_sector[i].foundKey[0])
+				num_to_bytes(e_sector[i].Key[0], 6, block);
+			if (e_sector[i].foundKey[1])
+				num_to_bytes(e_sector[i].Key[1], 6, block+10);
+			mfEmlSetMem(block, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
+		}
+		PrintAndLogEx(SUCCESS, "Found keys have been transferred to the emulator memory");
+	}
+	
+	if (createDumpFile) {
+		fptr = GenerateFilename("hf-mf-", "-key.bin");
+		if (fptr == NULL) {
+			free(keyBlock);
+			free(e_sector);			
+			return 1;
+		}
+
+		FILE *fkeys = fopen(fptr, "wb");
+		if (fkeys == NULL) { 
+			PrintAndLogEx(WARNING, "Could not create file " _YELLOW_(%s), fptr);
+			free(keyBlock);
+			free(e_sector);
+			return 1;
+		}
+		PrintAndLogEx(INFO, "Printing keys to binary file " _YELLOW_(%s)"...", fptr);
+	
+		for( i=0; i<SectorsCnt; i++) {
+			num_to_bytes(e_sector[i].Key[0], 6, tempkey);
+			fwrite ( tempkey, 1, 6, fkeys );
+		}
+		for(i=0; i<SectorsCnt; i++) {
+			num_to_bytes(e_sector[i].Key[1], 6, tempkey);
+			fwrite ( tempkey, 1, 6, fkeys );
+		}
+		fclose(fkeys);
+		PrintAndLogEx(SUCCESS, "Found keys have been dumped to file " _YELLOW_(%s)". 0xffffffffffff has been inserted for unknown keys.", fptr);
+	}
+
+	free(keyBlock);
+	free(e_sector);
+	PrintAndLogEx(NORMAL, "");
+	return 0;
+}
+
+sector_t *k_sector = NULL;
+uint8_t k_sectorsCount = 16;
+static void emptySectorTable(){
+
+	// initialize storage for found keys
+	if (k_sector == NULL)
+		k_sector = calloc(k_sectorsCount, sizeof(sector_t));
+	if (k_sector == NULL) 
+		return;
+		
+	// empty e_sector
+	for(int i = 0; i < k_sectorsCount; ++i){
+		k_sector[i].Key[0] = 0xffffffffffff;
+		k_sector[i].Key[1] = 0xffffffffffff;
+		k_sector[i].foundKey[0] = false;
+		k_sector[i].foundKey[1] = false;
+	}
+}
+
+void showSectorTable(){
+	if (k_sector != NULL) {
+		printKeyTable(k_sectorsCount, k_sector);
+		free(k_sector);
+		k_sector = NULL;
+	}
+}
+
+void readerAttack(nonces_t data, bool setEmulatorMem, bool verbose) {
+
+	uint64_t key = 0;	
+	bool success = false;
+	
+	if (k_sector == NULL)
+		emptySectorTable();
+
+	success = mfkey32_moebius(data, &key);
+	if (success) {
+		uint8_t sector = data.sector;
+		uint8_t keytype = data.keytype;
+
+		PrintAndLogEx(INFO, "Reader is trying authenticate with: Key %s, sector %02d: [%012" PRIx64 "]"
+			, keytype ? "B" : "A"
+			, sector
+			, key
+		);
+
+		k_sector[sector].Key[keytype] = key;
+		k_sector[sector].foundKey[keytype] = true;
+
+		//set emulator memory for keys
+		if (setEmulatorMem) {
+			uint8_t	memBlock[16] = {0,0,0,0,0,0, 0xff, 0x0F, 0x80, 0x69, 0,0,0,0,0,0};
+			num_to_bytes( k_sector[sector].Key[0], 6, memBlock);
+			num_to_bytes( k_sector[sector].Key[1], 6, memBlock+10);
+			//iceman,  guessing this will not work so well for 4K tags.
+			PrintAndLogEx(INFO, "Setting Emulator Memory Block %02d: [%s]"
+				, (sector*4) + 3
+				, sprint_hex( memBlock, sizeof(memBlock))
+				);
+			mfEmlSetMem( memBlock, (sector*4) + 3, 1);
+		}
+	}
+}
+
+int CmdHF14AMf1kSim(const char *Cmd) {
+
+	uint8_t uid[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+	uint8_t exitAfterNReads = 0;
+	uint8_t flags = (FLAG_UID_IN_EMUL | FLAG_4B_UID_IN_DATA);
+	int uidlen = 0;
+	uint8_t cmdp = 0;
+	bool errors = false, verbose = false, setEmulatorMem = false;
+	nonces_t data[1];
+		
+	while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+		switch( tolower(param_getchar(Cmd, cmdp))) {
+		case 'e':
+			setEmulatorMem = true;
+			cmdp++;
+			break;
+		case 'h':
+			return usage_hf14_mf1ksim();
+		case 'i':
+			flags |= FLAG_INTERACTIVE;
+			cmdp++;
+			break;
+		case 'n':
+			exitAfterNReads = param_get8(Cmd, cmdp+1);
+			cmdp += 2;
+			break;
+		case 'u':
+			param_gethex_ex(Cmd, cmdp+1, uid, &uidlen);
+			switch(uidlen) {
+				case 20: flags = FLAG_10B_UID_IN_DATA; break;
+				case 14: flags = FLAG_7B_UID_IN_DATA; break;
+				case  8: flags = FLAG_4B_UID_IN_DATA; break;
+				default: return usage_hf14_mf1ksim();
+			}
+			cmdp += 2;
+			break;
+		case 'v':
+			verbose = true;
+			cmdp++;
+			break;
+		case 'x':
+			flags |= FLAG_NR_AR_ATTACK;
+			cmdp++;
+			break;
+		default:
+			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+			errors = true;
+			break;
+		}
+	}
+	//Validations
+	if (errors) return usage_hf14_mf1ksim();
+	
+	PrintAndLogEx(NORMAL, " uid:%s, numreads:%d, flags:%d (0x%02x) "
+				, (uidlen == 0 ) ? "N/A" : sprint_hex(uid, uidlen>>1)
+				, exitAfterNReads
+				, flags
+				, flags);
+
+	UsbCommand c = {CMD_SIMULATE_MIFARE_CARD, {flags, exitAfterNReads, 0}};
+	memcpy(c.d.asBytes, uid, sizeof(uid));
+	clearCommandBuffer();
+	SendCommand(&c);
+	UsbCommand resp;		
+
+	if(flags & FLAG_INTERACTIVE) {
+		PrintAndLogEx(INFO, "Press pm3-button or send another cmd to abort simulation");
+
+		while( !ukbhit() ){	
+			if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500) ) continue;
+			if ( !(flags & FLAG_NR_AR_ATTACK) ) break;
+			if ( (resp.arg[0] & 0xffff) != CMD_SIMULATE_MIFARE_CARD ) break;
+
+			memcpy(data, resp.d.asBytes, sizeof(data));
+			readerAttack(data[0], setEmulatorMem, verbose);
+		}
+		showSectorTable();
+	}
+	return 0;
+}
+
+int CmdHF14AMfSniff(const char *Cmd){
+	bool wantLogToFile = false;
+	bool wantDecrypt = false;
+	//bool wantSaveToEml = false; TODO
+	bool wantSaveToEmlFile = false;
+
+	//var 
+	int res = 0, len = 0, blockLen = 0;
+	int pckNum = 0, num = 0;
+	uint8_t sak = 0;
+	uint8_t uid[10];
+	uint8_t uid_len = 0;
+	uint8_t atqa[2] = {0x00, 0x00};
+	bool isTag = false;
+	uint8_t *buf = NULL;
+	uint16_t bufsize = 0;
+	uint8_t *bufPtr = NULL;
+	uint16_t traceLen = 0;
+	
+	memset(uid, 0x00, sizeof(uid));
+	
+	char ctmp = tolower(param_getchar(Cmd, 0));
+	if ( ctmp == 'h') return usage_hf14_sniff();
+	
+	for (int i = 0; i < 4; i++) {
+		ctmp = tolower(param_getchar(Cmd, i));
+		if (ctmp == 'l') wantLogToFile = true;
+		if (ctmp == 'd') wantDecrypt = true;
+		//if (ctmp == 'e') wantSaveToEml = true; TODO
+		if (ctmp == 'f') wantSaveToEmlFile = true;
+	}
+	
+	PrintAndLogEx(NORMAL, "-------------------------------------------------------------------------\n");
+	PrintAndLogEx(NORMAL, "Executing mifare sniffing command. \n");
+	PrintAndLogEx(NORMAL, "Press the key on the proxmark3 device to abort both proxmark3 and client.\n");
+	PrintAndLogEx(NORMAL, "Press the key on pc keyboard to abort the client.\n");
+	PrintAndLogEx(NORMAL, "-------------------------------------------------------------------------\n");
+
+	UsbCommand c = {CMD_MIFARE_SNIFFER, {0, 0, 0}};
+	clearCommandBuffer();
+	SendCommand(&c);
+
+	UsbCommand resp;
+	
+	// wait cycle
+	while (true) {
+		printf("."); fflush(stdout);
+		if (ukbhit()) {
+			int gc = getchar(); (void)gc;
+			PrintAndLogEx(INFO, "\naborted via keyboard!\n");
+			break;
+		}
+		
+		if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
+			continue;
+		}
+		
+		res = resp.arg[0] & 0xff;
+		traceLen = resp.arg[1];
+		len = resp.arg[2];
+
+		if (res == 0) {
+			PrintAndLogEx(SUCCESS, "hf mifare sniff finished");
+			free(buf);
+			return 0;
+		}
+
+		if (res == 1) {								// there is (more) data to be transferred
+			if (pckNum == 0) {						// first packet, (re)allocate necessary buffer
+				if (traceLen > bufsize || buf == NULL) {
+					uint8_t *p;
+					if (buf == NULL)				// not yet allocated
+						p = calloc(traceLen, sizeof(uint8_t));
+					else							// need more memory
+						p = realloc(buf, traceLen);
+					
+					if (p == NULL) {
+						PrintAndLogEx(FAILED, "Cannot allocate memory for trace");
+						free(buf);
+						return 2;
+					}
+					buf = p;
+				}
+				bufPtr = buf;
+				bufsize = traceLen;
+				memset(buf, 0x00, traceLen);
+			}
+
+			// what happens if LEN is bigger then TRACELEN --iceman
+			memcpy(bufPtr, resp.d.asBytes, len);
+			bufPtr += len;
+			pckNum++;
+		}
+
+		if (res == 2) {								// received all data, start displaying
+			blockLen = bufPtr - buf;
+			bufPtr = buf;
+			PrintAndLogEx(NORMAL, ">\n");
+			PrintAndLogEx(SUCCESS, "received trace len: %d packages: %d", blockLen, pckNum);
+			while (bufPtr - buf < blockLen) {
+				bufPtr += 6;						// skip (void) timing information
+				len = *((uint16_t *)bufPtr);
+				if(len & 0x8000) {
+					isTag = true;
+					len &= 0x7fff;
+				} else {
+					isTag = false;
+				}
+				bufPtr += 2;
+				
+				// the uid identification package 
+				// 0xFF 0xFF xx xx xx xx xx xx xx xx xx xx aa aa cc 0xFF 0xFF
+				// x = uid,  a = atqa, c = sak
+				if ((len == 17) && (bufPtr[0] == 0xff) && (bufPtr[1] == 0xff) && (bufPtr[15] == 0xff) && (bufPtr[16] == 0xff)) {
+					memcpy(uid, bufPtr + 2, 10);
+					memcpy(atqa, bufPtr + 2 + 10, 2);
+					switch (atqa[0] & 0xC0) {
+						case 0x80: uid_len = 10; break;
+						case 0x40: uid_len = 7; break;
+						default:   uid_len = 4; break;
+					}
+					sak = bufPtr[14];
+					PrintAndLogEx(SUCCESS, "UID %s | ATQA %02x %02x | SAK 0x%02x", 
+						sprint_hex(uid, uid_len),
+						atqa[1], 
+						atqa[0], 
+						sak);
+					if (wantLogToFile || wantDecrypt) {
+						FillFileNameByUID(logHexFileName, uid, ".log", uid_len);
+						AddLogCurrentDT(logHexFileName);
+						PrintAndLogEx(SUCCESS, "Trace saved to %s", logHexFileName);
+					}						
+					if (wantDecrypt)
+						mfTraceInit(uid, uid_len, atqa, sak, wantSaveToEmlFile);
+				} else {
+					PrintAndLogEx(NORMAL, "%03d| %s |%s", num, isTag ? "TAG" : "RDR", sprint_hex(bufPtr, len));
+					if (wantLogToFile) 
+						AddLogHex(logHexFileName, isTag ? "TAG| ":"RDR| ", bufPtr, len);
+					if (wantDecrypt) 
+						mfTraceDecode(bufPtr, len, wantSaveToEmlFile);
+					num++;	
+				}
+				bufPtr += len;
+				bufPtr += ((len-1)/8+1);	// ignore parity
+			}
+			pckNum = 0;
+		}
+	} // while (true)
+
+	free(buf);
+	return 0;
+}
+
+int CmdHF14AMfDbg(const char *Cmd) {
+
+	char ctmp = tolower(param_getchar(Cmd, 0));
+	if (strlen(Cmd) < 1 || ctmp == 'h' ) return usage_hf14_dbg();
+	
+	uint8_t dbgMode = param_get8ex(Cmd, 0, 0, 10);
+	if (dbgMode > 4) return usage_hf14_dbg();
+
+	UsbCommand c = {CMD_MIFARE_SET_DBGMODE, {dbgMode, 0, 0}};
+	SendCommand(&c);
+	return 0;
+}
+
+int CmdHF14AMfKeyBrute(const char *Cmd) {
+
+	uint8_t blockNo = 0, keytype = 0;
+	uint8_t key[6] = {0, 0, 0, 0, 0, 0};
+	uint64_t foundkey = 0;
+	
+	char cmdp = tolower(param_getchar(Cmd, 0));	
+	if ( cmdp == 'h' ) return usage_hf14_keybrute();
+	
+	// block number
+	blockNo = param_get8(Cmd, 0);	 
+	
+	// keytype
+	cmdp = tolower(param_getchar(Cmd, 1));
+	if ( cmdp == 'b' ) keytype = 1;
+	
+	// key
+	if (param_gethex(Cmd, 2, key, 12)) return usage_hf14_keybrute();
+	
+	uint64_t t1 = msclock();
+	
+	if (mfKeyBrute( blockNo, keytype, key, &foundkey))
+		PrintAndLogEx(SUCCESS, "found valid key: %012" PRIx64 " \n", foundkey);
+	else
+		PrintAndLogEx(FAILED, "key not found");
+	
+	t1 = msclock() - t1;
+	PrintAndLogEx(SUCCESS, "\ntime in keybrute: %.0f seconds\n", (float)t1/1000.0);
+	return 0;	
+}
+
+void printKeyTable( uint8_t sectorscnt, sector_t *e_sector ){
+	char strA[12+1] = {0};
+	char strB[12+1] = {0};	
+	PrintAndLogEx(NORMAL, "|---|----------------|---|----------------|---|");
+	PrintAndLogEx(NORMAL, "|sec|key A           |res|key B           |res|");
+	PrintAndLogEx(NORMAL, "|---|----------------|---|----------------|---|");
+	for (uint8_t i = 0; i < sectorscnt; ++i) {
+		
+		snprintf(strA, sizeof(strA), "------------");
+		snprintf(strB, sizeof(strB), "------------");
+		
+		if ( e_sector[i].foundKey[0] )
+			snprintf(strA, sizeof(strA), "%012" PRIx64, e_sector[i].Key[0]);
+		
+		if ( e_sector[i].foundKey[1] )
+			snprintf(strB, sizeof(strB), "%012" PRIx64, e_sector[i].Key[1]);
+
+		
+		PrintAndLogEx(NORMAL, "|%03d|  %s  | %d |  %s  | %d |"
+			, i
+			, strA, e_sector[i].foundKey[0]
+			, strB, e_sector[i].foundKey[1]
+		);
+	}
+	PrintAndLogEx(NORMAL, "|---|----------------|---|----------------|---|");
+}
+
+// EMULATOR COMMANDS
+int CmdHF14AMfEGet(const char *Cmd) {
+	uint8_t blockNo = 0;
+	uint8_t data[16] = {0x00};
+	char c = tolower(param_getchar(Cmd, 0));
+	
+	if (strlen(Cmd) < 1 || c == 'h') return usage_hf14_eget();
+	
+	blockNo = param_get8(Cmd, 0);
+
+	PrintAndLogEx(NORMAL, "");
+	if (!mfEmlGetMem(data, blockNo, 1)) {
+		PrintAndLogEx(NORMAL, "data[%3d]:%s", blockNo, sprint_hex(data, sizeof(data)));
+	} else {
+		PrintAndLogEx(WARNING, "Command execute timeout");
+	}
+  return 0;
+}
+
+int CmdHF14AMfEClear(const char *Cmd) {
+	char c = tolower(param_getchar(Cmd, 0));
+	if (c == 'h') return usage_hf14_eclr();
+	
+	UsbCommand cmd = {CMD_MIFARE_EML_MEMCLR, {0, 0, 0}};
+	clearCommandBuffer();
+	SendCommand(&cmd);
+	return 0;
+}
+
+int CmdHF14AMfESet(const char *Cmd) {
+	char c = tolower(param_getchar(Cmd, 0));
+	uint8_t memBlock[16];
+	uint8_t blockNo = 0;
+	memset(memBlock, 0x00, sizeof(memBlock));
+
+	if (strlen(Cmd) < 3 || c == 'h')
+		return usage_hf14_eset();
+	
+	blockNo = param_get8(Cmd, 0);
+	
+	if (param_gethex(Cmd, 1, memBlock, 32)) {
+		PrintAndLogEx(WARNING, "block data must include 32 HEX symbols");
+		return 1;
+	}
+	
+	//  1 - blocks count
+	return mfEmlSetMem(memBlock, blockNo, 1);
+}
+
+int CmdHF14AMfELoad(const char *Cmd) {
+
+	size_t counter = 0;
+	char filename[FILE_PATH_SIZE];
+	int blockNum, numBlocks, nameParamNo = 1;
+	uint8_t blockWidth = 16;
+	char c = tolower(param_getchar(Cmd, 0));
+
+	if ( strlen(Cmd) < 2 &&  c == 'h' ) 
+		return usage_hf14_eload();
+	
+	switch (c) {
+		case '0' : numBlocks = MIFARE_MINI_MAXBLOCK; break;
+		case '1' : 
+		case '\0': numBlocks = MIFARE_1K_MAXBLOCK; break;
+		case '2' : numBlocks = MIFARE_2K_MAXBLOCK; break;
+		case '4' : numBlocks = MIFARE_4K_MAXBLOCK; break;
+		case 'u' : numBlocks = 255; blockWidth = 4; break;
+		default:  {
+			numBlocks = MIFARE_1K_MAXBLOCK;
+			nameParamNo = 0;
+		}
+	}
+	uint32_t numblk2 = param_get32ex(Cmd, 2, 0, 10);
+	if (numblk2 > 0) 
+		numBlocks = numblk2;
+
+	param_getstr(Cmd, nameParamNo, filename, sizeof(filename));
+	
+	uint8_t *data = calloc(4096, sizeof(uint8_t));
+	size_t datalen = 0;
+	//int res = loadFile(filename, "bin", data, &datalen);
+	int res = loadFileEML( filename, "eml", data, &datalen);
+	if ( res ) {
+		free(data);
+		return 1;
+	}
+	
+	// 64 or 256 blocks.
+	if ( (datalen % blockWidth) != 0 ) {
+		PrintAndLogEx(FAILED, "File content error. Size doesn't match blockwidth ");
+		free(data);		
+		return 2;
+	}
+	
+	PrintAndLogEx(INFO, "Copying to emulator memory");
+	
+	blockNum = 0;
+	while ( datalen ) {
+		
+		if (mfEmlSetMem_xt(data + counter, blockNum, 1, blockWidth)) {
+			PrintAndLogEx(FAILED, "Cant set emul block: %3d", blockNum);
+			free(data);
+			return 3;
+		}
+		printf("."); fflush(stdout);
+		
+		blockNum++;
+		counter += blockWidth;
+		datalen -= blockWidth;
+	}
+	PrintAndLogEx(NORMAL, "\n");
+
+	// Ultralight /Ntag
+	if ( blockWidth == 4 ) {
+		if ((blockNum != numBlocks)) {		
+			PrintAndLogEx(FAILED, "Warning, Ultralight/Ntag file content, Loaded %d blocks into emulator memory", blockNum);
+			free(data);
+			return 0;
+		}
+	} else {
+		if ((blockNum != numBlocks)) {
+			PrintAndLogEx(FAILED, "Error, file content, Only loaded %d blocks, must be %d blocks into emulator memory", blockNum, numBlocks);
+			free(data);
+			return 4;
+		}
+	}
+	PrintAndLogEx(SUCCESS, "Loaded %d blocks from file: " _YELLOW_(%s), blockNum, filename);
+	free(data);
+	return 0;
+}
+
+int CmdHF14AMfESave(const char *Cmd) {
+
+	char filename[FILE_PATH_SIZE];
+	char * fnameptr = filename;
+	uint8_t *dump;
+	int len, bytes, nameParamNo = 1;
+	uint16_t blocks;
+
+	memset(filename, 0, sizeof(filename));
+
+	char c = tolower(param_getchar(Cmd, 0));	
+	if (c == 'h') return usage_hf14_esave();
+
+	blocks = NumOfBlocks(c);
+	bytes = blocks * MFBLOCK_SIZE;	
+
+	dump = calloc(bytes, sizeof(uint8_t));
+	if (!dump) {
+		PrintAndLogEx(WARNING, "Fail, cannot allocate memory");
+		return 1;
+	}
+	memset(dump, 0, bytes);
+	
+	PrintAndLogEx(INFO, "downloading from emulator memory");
+	if (!GetFromDevice( BIG_BUF_EML, dump, bytes, 0, NULL, 2500, false)) {
+		PrintAndLogEx(WARNING, "Fail, transfer from device time-out");
+		free(dump);
+		return 2;
+	}	
+
+	len = param_getstr(Cmd, nameParamNo, filename, sizeof(filename));
+	if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5;
+	
+	// user supplied filename?
+	if (len < 1) {
+		fnameptr += sprintf(fnameptr, "hf-mf-");
+		FillFileNameByUID(fnameptr, dump, "-dump", 4);
+	}
+	
+	saveFile(filename, "bin", dump, bytes);
+	saveFileEML(filename, "eml", dump, bytes, MFBLOCK_SIZE);
+	saveFileJSON(filename, "json", jsfCardMemory, dump, bytes);
+	free(dump);
+	return 0;
+}
+
+int CmdHF14AMfECFill(const char *Cmd) {
+	uint8_t keyType = 0;
+	uint8_t numSectors = 16;
+	char c = tolower(param_getchar(Cmd, 0));
+	
+	if (strlen(Cmd) < 1 || c == 'h')
+		return usage_hf14_ecfill();
+
+	if (c != 'a' &&  c != 'b') {
+		PrintAndLogEx(WARNING, "Key type must be A or B");
+		return 1;
+	}
+	if (c != 'a')
+		keyType = 1;
+
+	c = tolower(param_getchar(Cmd, 1));
+	numSectors = NumOfSectors(c);
+
+	PrintAndLogEx(NORMAL, "--params: numSectors: %d, keyType: %c\n", numSectors, (keyType == 0) ? 'A' : 'B');
+	UsbCommand cmd = {CMD_MIFARE_EML_CARDLOAD, {numSectors, keyType, 0}};
+	clearCommandBuffer();
+	SendCommand(&cmd);
+	return 0;
+}
+
+int CmdHF14AMfEKeyPrn(const char *Cmd) {
+	int i;
+	uint8_t numSectors;
+	uint8_t data[16];
+	uint64_t keyA, keyB;
+
+	char c = tolower(param_getchar(Cmd, 0));
+	if ( c == 'h' )
+		return usage_hf14_ekeyprn();
+
+	numSectors = NumOfSectors(c);
+	
+	PrintAndLogEx(NORMAL, "|---|----------------|----------------|");
+	PrintAndLogEx(NORMAL, "|sec|key A           |key B           |");
+	PrintAndLogEx(NORMAL, "|---|----------------|----------------|");
+	for (i = 0; i < numSectors; i++) {
+		if (mfEmlGetMem(data, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1)) {
+			PrintAndLogEx(WARNING, "error get block %d", FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1);
+			break;
+		}
+		keyA = bytes_to_num(data, 6);
+		keyB = bytes_to_num(data + 10, 6);
+		PrintAndLogEx(NORMAL, "|%03d|  %012" PRIx64 "  |  %012" PRIx64 "  |", i, keyA, keyB);
+	}
+	PrintAndLogEx(NORMAL, "|---|----------------|----------------|");
+	return 0;
+}
+
+// CHINESE MAGIC COMMANDS 
+int CmdHF14AMfCSetUID(const char *Cmd) {
+	uint8_t wipeCard = 0;
+	uint8_t uid[8] = {0x00};
+	uint8_t oldUid[8] = {0x00};
+	uint8_t atqa[2] = {0x00};
+	uint8_t sak[1] = {0x00};
+	uint8_t atqaPresent = 1;
+	int res, argi = 0;
+	char ctmp;
+
+	if (strlen(Cmd) < 1 || param_getchar(Cmd, argi) == 'h') 
+		return usage_hf14_csetuid();
+
+	if (param_getchar(Cmd, argi) && param_gethex(Cmd, argi, uid, 8))
+		return usage_hf14_csetuid();
+
+	argi++;
+
+	ctmp = tolower(param_getchar(Cmd, argi));
+	if (ctmp == 'w') {
+		wipeCard = 1;
+		atqaPresent = 0;
+	}
+
+	if (atqaPresent) {
+		if (param_getchar(Cmd, argi)) {
+			if (param_gethex(Cmd, argi, atqa, 4)) {
+				PrintAndLogEx(WARNING, "ATQA must include 4 HEX symbols");
+				return 1;
+			}
+			argi++;
+			if (!param_getchar(Cmd, argi) || param_gethex(Cmd, argi, sak, 2)) {
+				PrintAndLogEx(WARNING, "SAK must include 2 HEX symbols");
+				return 1;
+			}
+			argi++;
+		} else
+			atqaPresent = 0;
+	}
+
+	if (!wipeCard) {
+		ctmp = tolower(param_getchar(Cmd, argi));
+		if (ctmp == 'w') {
+			wipeCard = 1;
+		}
+	}
+
+	PrintAndLogEx(NORMAL, "--wipe card:%s  uid:%s", (wipeCard)?"YES":"NO", sprint_hex(uid, 4));
+
+	res = mfCSetUID(uid, (atqaPresent) ? atqa : NULL, (atqaPresent) ? sak : NULL, oldUid, wipeCard);
+	if (res) {
+		PrintAndLogEx(WARNING, "Can't set UID. error=%d", res);
+		return 1;
+	}
+	
+	PrintAndLogEx(SUCCESS, "old UID:%s", sprint_hex(oldUid, 4));
+	PrintAndLogEx(SUCCESS, "new UID:%s", sprint_hex(uid, 4));
+	return 0;
+}
+
+int CmdHF14AMfCSetBlk(const char *Cmd) {
+	uint8_t block[16] = {0x00};
+	uint8_t blockNo = 0;
+	uint8_t params = MAGIC_SINGLE;
+	int res;
+	char ctmp = tolower(param_getchar(Cmd, 0));
+
+	if (strlen(Cmd) < 1 || ctmp == 'h') return usage_hf14_csetblk();
+
+	blockNo = param_get8(Cmd, 0);
+
+	if (param_gethex(Cmd, 1, block, 32)) return usage_hf14_csetblk();
+	
+	ctmp = tolower(param_getchar(Cmd, 2));
+	if (ctmp == 'w')
+		params |= MAGIC_WIPE;
+	
+	PrintAndLogEx(NORMAL, "--block number:%2d data:%s", blockNo, sprint_hex(block, 16));
+
+	res = mfCSetBlock(blockNo, block, NULL, params);
+	if (res) {
+		PrintAndLogEx(WARNING, "Can't write block. error=%d", res);
+		return 1;
+	}
+	return 0;
+}
+
+int CmdHF14AMfCLoad(const char *Cmd) {
+
+	uint8_t buf8[16] = {0x00};
+	uint8_t fillFromEmulator = 0;
+	int blockNum, flags = 0;
+	bool fillFromJson = false;
+	bool fillFromBin = false;
+	char fileName[50] = {0};
+	
+	char ctmp = tolower(param_getchar(Cmd, 0));
+	if ( param_getlength(Cmd, 0) == 1 ) {
+		if (ctmp == 'h' || ctmp == 0x00) return usage_hf14_cload();
+		if (ctmp == 'e' ) fillFromEmulator = 1;
+		if (ctmp == 'j' ) fillFromJson = true;
+		if (ctmp == 'b' ) fillFromBin = true;
+	}
+
+	if (fillFromJson || fillFromBin)
+		param_getstr(Cmd, 1, fileName, sizeof(fileName));
+
+	
+	if (fillFromEmulator) {
+		for (blockNum = 0; blockNum < 16 * 4; blockNum += 1) {
+			if (mfEmlGetMem(buf8, blockNum, 1)) {
+				PrintAndLogEx(WARNING, "Cant get block: %d", blockNum);
+				return 2;
+			}
+			if (blockNum == 0) flags = MAGIC_INIT + MAGIC_WUPC;				// switch on field and send magic sequence
+			if (blockNum == 1) flags = 0;									// just write
+			if (blockNum == 16 * 4 - 1) flags = MAGIC_HALT + MAGIC_OFF;		// Done. Magic Halt and switch off field.
+
+			if (mfCSetBlock(blockNum, buf8, NULL, flags)) {
+				PrintAndLogEx(WARNING, "Cant set magic card block: %d", blockNum);
+				return 3;
+			}
+			printf("."); fflush(stdout);
+		}
+		PrintAndLogEx(NORMAL, "\n");
+		return 0;
+	}
+
+	size_t maxdatalen = 4096;
+	uint8_t *data = calloc(maxdatalen, sizeof(uint8_t));
+	size_t datalen = 0;
+	int res = 0;
+	if (fillFromBin) {
+		res = loadFile(fileName, "bin", data, &datalen);
+	} else {
+		if (fillFromJson) {
+			res = loadFileJSON(fileName, "json", data, maxdatalen, &datalen);
+		} else {
+			res = loadFileEML( Cmd, "eml", data, &datalen);
+		}
+	}
+	
+	if ( res ) {
+		if ( data )
+			free(data);
+		return 1;
+	}
+	
+//	PrintAndLogEx(INFO, "DATA | %s", sprint_hex(data+1000, 24) );
+	
+
+	// 64 or 256blocks.
+	if (datalen != 1024 && datalen != 4096) {
+		PrintAndLogEx(WARNING, "File content error. ");
+		free(data);
+		return 2;
+	}
+	
+	PrintAndLogEx(INFO, "Copying to magic card");
+			
+	blockNum = 0;
+	while ( datalen ) {
+
+		// switch on field and send magic sequence	
+		if (blockNum == 0) flags = MAGIC_INIT + MAGIC_WUPC;
+
+		// write					
+		if (blockNum == 1) flags = 0;
+		
+		// Switch off field.
+		if (blockNum == 16 * 4 - 1) flags = MAGIC_HALT + MAGIC_OFF;
+
+		if (mfCSetBlock(blockNum, data + (16 * blockNum), NULL, flags)) {
+			PrintAndLogEx(WARNING, "Can't set magic card block: %d", blockNum);
+			free(data);
+			return 3;
+		}
+		
+		datalen -= 16;
+		
+		printf("."); fflush(stdout);
+		blockNum++;
+		
+		// magic card type - mifare 1K
+		if (blockNum >= MIFARE_1K_MAXBLOCK ) break;  
+	}
+	PrintAndLogEx(NORMAL, "\n");
+
+	// 64 or 256blocks.
+	if (blockNum != 16 * 4 && blockNum != 32 * 4 + 8 * 16){
+		PrintAndLogEx(WARNING, "File content error. There must be 64 blocks");
+		free(data);
+		return 4;
+	}
+	
+	PrintAndLogEx(SUCCESS, "Card loaded %d blocks from file", blockNum);	
+	free(data);
+	return 0;
+}
+
+int CmdHF14AMfCGetBlk(const char *Cmd) {
+	uint8_t data[16] = {0};
+	uint8_t blockNo = 0;
+	int res;
+	memset(data, 0x00, sizeof(data));
+
+	char ctmp = tolower(param_getchar(Cmd, 0));
+	if (strlen(Cmd) < 1 || ctmp == 'h') return usage_hf14_cgetblk();
+
+	blockNo = param_get8(Cmd, 0);
+
+	PrintAndLogEx(NORMAL, "--block number:%2d ", blockNo);
+
+	res = mfCGetBlock(blockNo, data, MAGIC_SINGLE);
+	if (res) {
+		PrintAndLogEx(WARNING, "Can't read block. error=%d", res);
+		return 1;
+	}
+	
+	PrintAndLogEx(NORMAL, "data: %s", sprint_hex(data, sizeof(data)));
+	
+	if (mfIsSectorTrailer(blockNo)) {
+		PrintAndLogEx(NORMAL, "Trailer decoded:");
+		PrintAndLogEx(NORMAL, "Key A: %s", sprint_hex_inrow(data, 6));
+		PrintAndLogEx(NORMAL, "Key B: %s", sprint_hex_inrow(&data[10], 6));
+		int bln = mfFirstBlockOfSector(mfSectorNum(blockNo));
+		int blinc = (mfNumBlocksPerSector(mfSectorNum(blockNo)) > 4) ? 5 : 1;
+		for (int i = 0; i < 4; i++) {
+			PrintAndLogEx(NORMAL, "Access block %d%s: %s", bln, ((blinc > 1) && (i < 3) ? "+" : "") , mfGetAccessConditionsDesc(i, &data[6]));
+			bln += blinc;
+		}
+		PrintAndLogEx(NORMAL, "UserData: %s", sprint_hex_inrow(&data[9], 1));
+	}
+		
+	return 0;
+}
+
+int CmdHF14AMfCGetSc(const char *Cmd) {
+	uint8_t data[16] = {0};
+	uint8_t sector = 0;
+	int i, res, flags;
+
+	char ctmp = tolower(param_getchar(Cmd, 0));
+	if (strlen(Cmd) < 1 || ctmp == 'h') return usage_hf14_cgetsc();
+
+	sector = param_get8(Cmd, 0);
+	if (sector > 39) {
+		PrintAndLogEx(WARNING, "Sector number must be less then 40");
+		return 1;
+	}
+
+	PrintAndLogEx(NORMAL, "\n  # | data    |  Sector | %02d/ 0x%02X ", sector, sector);
+	PrintAndLogEx(NORMAL, "----+------------------------------------------------");
+	uint8_t blocks = 4;
+	uint8_t start = sector * 4;
+	if ( sector > 32 ) {
+		blocks = 16;
+		start = 128 + ( sector - 32 ) * 16;
+	}
+	
+	flags = MAGIC_INIT + MAGIC_WUPC;
+	
+	for (i = 0; i < blocks; i++) {
+		if (i == 1) flags = 0;
+		if (i == blocks-1) flags = MAGIC_HALT + MAGIC_OFF;
+
+		res = mfCGetBlock( start + i, data, flags);
+		if (res) {
+			PrintAndLogEx(WARNING, "Can't read block. %d error=%d", start + i, res);
+			return 1;
+		}
+		PrintAndLogEx(NORMAL, "%3d | %s", start + i, sprint_hex(data, 16));
+	}
+	return 0;
+}
+
+int CmdHF14AMfCSave(const char *Cmd) {
+
+	char filename[FILE_PATH_SIZE];
+	char * fnameptr = filename;
+	uint8_t *dump;	
+	bool fillEmulator = false;
+	bool errors = false, hasname = false, useuid = false;
+	int i, len, flags;
+	uint8_t numblocks = 0, cmdp = 0;
+	uint16_t bytes = 0;
+	char ctmp;
+
+	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+		ctmp = tolower(param_getchar(Cmd, cmdp));
+		switch (ctmp) {	
+		case 'e':
+			useuid = true;
+			fillEmulator = true;
+			cmdp++;
+			break;
+		case 'h':
+			return usage_hf14_csave();
+		case '0':
+		case '1':
+		case '2':
+		case '4':
+			numblocks = NumOfBlocks(ctmp);
+			bytes =  numblocks * MFBLOCK_SIZE;
+			PrintAndLogEx(SUCCESS, "Saving magic mifare %cK", ctmp);
+			cmdp++;
+			break;
+		case 'u':
+			useuid = true;
+			hasname = true;
+			cmdp++;			
+			break;
+		case 'o':
+			len = param_getstr(Cmd, cmdp+1, filename, FILE_PATH_SIZE);
+			if (len < 1) {
+				errors = true;
+				break;
+			}
+
+			useuid = false;
+			hasname = true;		
+			cmdp += 2;
+			break;			
+		default:
+			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+			errors = true;
+			break;
+		}
+	}
+
+	if (!hasname && !fillEmulator) errors = true;
+	
+	if (errors || cmdp == 0) return usage_hf14_csave();
+
+	dump = calloc(bytes, sizeof(uint8_t));
+	if (!dump) {
+		PrintAndLogEx(WARNING, "Fail, cannot allocate memory");
+		return 1;
+	}
+	memset(dump, 0, bytes);
+	
+	flags = MAGIC_INIT + MAGIC_WUPC;
+	for (i = 0; i < numblocks; i++) {
+		if (i == 1) flags = 0;
+		if (i == numblocks - 1) flags = MAGIC_HALT + MAGIC_OFF;
+	
+		if (mfCGetBlock(i, dump + (i*MFBLOCK_SIZE), flags)) {
+			PrintAndLogEx(WARNING, "Cant get block: %d", i);
+			free(dump);
+			return 2;
+		}
+	}
+	
+	if ( useuid ){
+		fnameptr += sprintf(fnameptr, "hf-mf-");		
+		FillFileNameByUID(fnameptr, dump, "-dump", 4);
+	}
+	
+	if (fillEmulator) {
+		PrintAndLogEx(INFO, "uploading to emulator memory");
+		for (i = 0; i < numblocks; i += 5) {			
+			if (mfEmlSetMem(dump + (i*MFBLOCK_SIZE), i, 5)) {
+				PrintAndLogEx(WARNING, "Cant set emul block: %d", i);
+			}
+			printf("."); fflush(stdout);
+		}
+		PrintAndLogEx(NORMAL, "\n");
+		PrintAndLogEx(SUCCESS, "uploaded %d bytes to emulator memory", bytes);
+	}
+
+	saveFile(filename, "bin", dump, bytes);
+	saveFileEML(filename, "eml", dump, bytes, MFBLOCK_SIZE);
+	saveFileJSON(filename, "json", jsfCardMemory, dump, bytes);
+	free(dump);
+	return 0;
+}
+
+//needs nt, ar, at, Data to decrypt
+int CmdHf14AMfDecryptBytes(const char *Cmd){
+	
+	char ctmp = tolower(param_getchar(Cmd, 0));
+	if (strlen(Cmd) < 1 || ctmp == 'h') return usage_hf14_decryptbytes();
+	
+	uint32_t nt 	= param_get32ex(Cmd,0,0,16);
+	uint32_t ar_enc = param_get32ex(Cmd,1,0,16);
+	uint32_t at_enc = param_get32ex(Cmd,2,0,16);
+
+	int len = param_getlength(Cmd, 3);
+	if (len & 1 ) {
+		PrintAndLogEx(WARNING, "Uneven hex string length. LEN=%d", len);
+		return 1;
+	}
+
+	PrintAndLogEx(NORMAL, "nt\t%08X", nt);
+	PrintAndLogEx(NORMAL, "ar enc\t%08X", ar_enc);
+	PrintAndLogEx(NORMAL, "at enc\t%08X", at_enc);
+		
+	uint8_t *data = calloc(len, sizeof(uint8_t));
+	param_gethex_ex(Cmd, 3, data, &len);
+	len >>= 1;
+	tryDecryptWord( nt, ar_enc, at_enc, data, len);
+	free (data);
+	return 0;
+}
+
+int CmdHf14AMfSetMod(const char *Cmd) {
+	uint8_t key[6] = {0, 0, 0, 0, 0, 0};
+	uint8_t mod = 2;
+
+	char ctmp = param_getchar(Cmd, 0);
+	if (ctmp == '0') {
+		mod = 0;
+	} else if (ctmp == '1') {
+		mod = 1;
+	}
+	int gethexfail = param_gethex(Cmd, 1, key, 12);
+	if (mod == 2 || gethexfail) {
+		PrintAndLogEx(NORMAL, "Sets the load modulation strength of a MIFARE Classic EV1 card.");
+		PrintAndLogEx(NORMAL, "Usage: hf mf setmod <0|1> <block 0 key A>");
+		PrintAndLogEx(NORMAL, "       0 = normal modulation");
+		PrintAndLogEx(NORMAL, "       1 = strong modulation (default)");
+		return 1;
+	}
+
+	UsbCommand c = {CMD_MIFARE_SETMOD, {mod, 0, 0}};
+	memcpy(c.d.asBytes, key, 6);
+	clearCommandBuffer();
+	SendCommand(&c);
+
+	UsbCommand resp;
+	if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
+		uint8_t ok = resp.arg[0] & 0xff;
+		PrintAndLogEx(SUCCESS, "isOk:%02x", ok);
+		if (!ok)
+			PrintAndLogEx(FAILED, "Failed.");
+	} else {
+		PrintAndLogEx(WARNING, "Command execute timeout");
+	}
+	return 0;
+}
+
+// Mifare NACK bug detection
+int CmdHf14AMfNack(const char *Cmd) {
+
+	bool verbose = false;
+	char ctmp = tolower(param_getchar(Cmd, 0));
+	if ( ctmp == 'h' ) return usage_hf14_nack();
+	if ( ctmp == 'v' ) verbose = true;
+
+	if ( verbose )
+		PrintAndLogEx(INFO, "Started testing card for NACK bug. Press key to abort");
+	
+	detect_classic_nackbug(verbose);
+	return 0;
+}
+
+int CmdHF14AMfice(const char *Cmd) {
+
+	uint8_t blockNo = 0;
+	uint8_t keyType = 0;
+	uint8_t trgBlockNo = 0;
+	uint8_t trgKeyType = 1;
+	bool slow = false;
+	bool initialize = true;
+	bool acquisition_completed = false;
+	uint8_t cmdp=0;
+	uint32_t flags = 0;
+	uint32_t total_num_nonces = 0;
+	char ctmp;
+	char filename[FILE_PATH_SIZE], *fptr;
+	FILE *fnonces = NULL;
+	UsbCommand resp;
+
+	uint32_t part_limit = 3000;
+	uint32_t limit = 50000;
+
+	while ((ctmp = param_getchar(Cmd, cmdp))) {
+		switch(tolower(ctmp))
+		{
+		case 'h':
+			return usage_hf14_ice();
+		case 'f':
+			param_getstr(Cmd, cmdp+1, filename, FILE_PATH_SIZE);
+			cmdp++;
+			break;
+		case 'l':
+			limit = param_get32ex(Cmd, cmdp+1, 50000, 10);
+			cmdp++;
+			break;
+		default:
+			PrintAndLogEx(WARNING, "Unknown parameter '%c'\n", ctmp);
+			usage_hf14_ice();
+			return 1;
+		}
+		cmdp++;
+	}
+
+	if(filename[0]=='\0')
+	{
+		fptr = GenerateFilename("hf-mf-","-nonces.bin");
+		if (fptr == NULL) 
+			return 1;
+		strcpy(filename, fptr);
+	}
+
+	PrintAndLogEx(NORMAL, "Collecting %u nonces \n", limit);
+	
+	if ((fnonces = fopen(filename,"wb")) == NULL) { 
+		PrintAndLogEx(WARNING, "Could not create file " _YELLOW_(%s),filename);
+		return 3;
+	}
+
+	clearCommandBuffer();
+
+	uint64_t t1 = msclock();
+	
+	do {
+		if (ukbhit()) {
+			int gc = getchar(); (void)gc;
+			PrintAndLogEx(INFO, "\naborted via keyboard!\n");
+			break;
+		}
+		
+		flags = 0;
+		flags |= initialize ? 0x0001 : 0;
+		flags |= slow ? 0x0002 : 0;
+		UsbCommand c = {CMD_MIFARE_ACQUIRE_NONCES, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, flags}};
+		clearCommandBuffer();
+		SendCommand(&c);		
+	
+		if (!WaitForResponseTimeout(CMD_ACK, &resp, 3000)) goto out;
+		if (resp.arg[0])  goto out;
+
+		uint32_t items = resp.arg[2];
+		if (fnonces) {
+			fwrite(resp.d.asBytes, 1, items*4, fnonces);
+			fflush(fnonces);
+		}
+	
+		total_num_nonces += items;
+		if ( total_num_nonces > part_limit ) {
+			PrintAndLogEx(INFO, "Total nonces %u\n", total_num_nonces);
+			part_limit += 3000;
+		}
+		
+		acquisition_completed = ( total_num_nonces > limit); 
+
+		initialize = false;
+		
+	} while (!acquisition_completed);
+
+out:
+	PrintAndLogEx(SUCCESS, "time: %" PRIu64 " seconds\n", (msclock()-t1)/1000);
+	
+	if ( fnonces ) {
+		fflush(fnonces);
+		fclose(fnonces);
+	}
+
+	UsbCommand c = {CMD_MIFARE_ACQUIRE_NONCES, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, 4}};
+	clearCommandBuffer();
+	SendCommand(&c);
+	return 0;
+}
+
+int CmdHF14AMfAuth4(const char *Cmd) {
+	uint8_t keyn[20] = {0};
+	int keynlen = 0;
+	uint8_t key[16] = {0};
+	int keylen = 0;
+
+	CLIParserInit("hf mf auth4", 
+		"Executes AES authentication command in ISO14443-4", 
+		"Usage:\n\thf mf auth4 4000 000102030405060708090a0b0c0d0e0f -> executes authentication\n"
+			"\thf mf auth4 9003 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -> executes authentication\n");
+
+	void* argtable[] = {
+		arg_param_begin,
+		arg_str1(NULL,  NULL,     "<Key Num (HEX 2 bytes)>", NULL),
+		arg_str1(NULL,  NULL,     "<Key Value (HEX 16 bytes)>", NULL),
+		arg_param_end
+	};
+	CLIExecWithReturn(Cmd, argtable, true);
+	
+	CLIGetHexWithReturn(1, keyn, &keynlen);
+	CLIGetHexWithReturn(2, key, &keylen);
+	CLIParserFree();
+	
+	if (keynlen != 2) {
+		PrintAndLogEx(ERR, "<Key Num> must be 2 bytes long instead of: %d", keynlen);
+		return 1;
+	}
+	
+	if (keylen != 16) {
+		PrintAndLogEx(ERR, "<Key Value> must be 16 bytes long instead of: %d", keylen);
+		return 1;
+	}
+
+	return MifareAuth4(NULL, keyn, key, true, false, true);
+}
+
+// https://www.nxp.com/docs/en/application-note/AN10787.pdf
+int CmdHF14AMfMAD(const char *cmd) {
+
+	CLIParserInit("hf mf mad", 
+		"Checks and prints Mifare Application Directory (MAD)", 
+		"Usage:\n\thf mf mad -> shows MAD if exists\n"
+			"\thf mf mad -a 03e1 -k ffffffffffff -b -> shows NDEF data if exists. read card with custom key and key B\n");
+
+	void* argtable[] = {
+		arg_param_begin,
+		arg_lit0("vV",  "verbose",  "show technical data"),
+		arg_str0("aA",  "aid",      "print all sectors with aid", NULL),
+		arg_str0("kK",  "key",      "key for printing sectors", NULL),
+		arg_lit0("bB",  "keyb",     "use key B for access printing sectors (by default: key A)"),
+		arg_param_end
+	};
+	CLIExecWithReturn(cmd, argtable, true);
+	bool verbose = arg_get_lit(1);
+	uint8_t aid[2] = {0};
+	int aidlen;
+	CLIGetHexWithReturn(2, aid, &aidlen);
+	uint8_t key[6] = {0};
+	int keylen;
+	CLIGetHexWithReturn(3, key, &keylen);
+	bool keyB = arg_get_lit(4);
+	
+	CLIParserFree();
+
+	if (aidlen != 2 && keylen > 0) {
+		PrintAndLogEx(WARNING, "do not need a key without aid.");
+	}
+
+	uint8_t sector0[16 * 4] = {0};
+	uint8_t sector10[16 * 4] = {0};
+	if (mfReadSector(MF_MAD1_SECTOR, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector0)) {
+		PrintAndLogEx(ERR, "read sector 0 error. card don't have MAD or don't have MAD on default keys.");
+		return 2;
+	}
+	
+	if (verbose) {
+		for(int i = 0; i < 4; i ++)
+			PrintAndLogEx(NORMAL, "[%d] %s", i, sprint_hex(&sector0[i * 16], 16));		
+	}
+
+	bool haveMAD2 = false;
+	MAD1DecodeAndPrint(sector0, verbose, &haveMAD2);
+	
+	if (haveMAD2) {
+		if (mfReadSector(MF_MAD2_SECTOR, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector10)) {
+			PrintAndLogEx(ERR, "read sector 0x10 error. card don't have MAD or don't have MAD on default keys.");
+			return 2;
+		}
+
+		MAD2DecodeAndPrint(sector10, verbose);
+	}
+
+	if (aidlen == 2) {
+		uint16_t aaid = (aid[0] << 8) + aid[1];
+		PrintAndLogEx(NORMAL, "\n-------------- AID 0x%04x ---------------", aaid);
+		
+		uint16_t mad[7 + 8 + 8 + 8 + 8] = {0};
+		size_t madlen = 0;
+		if (MADDecode(sector0, sector10, mad, &madlen)) {
+			PrintAndLogEx(ERR, "can't decode mad.");
+			return 10;
+		}
+
+		uint8_t akey[6] = {0};
+		memcpy(akey, g_mifare_ndef_key, 6);
+		if (keylen == 6) {
+			memcpy(akey, key, 6);
+		}
+		
+		for (int i = 0; i < madlen; i++) {
+			if (aaid == mad[i]) {
+				uint8_t vsector[16 * 4] = {0};
+				if (mfReadSector(i + 1, keyB ? MF_KEY_B : MF_KEY_A, akey, vsector)) {
+					PrintAndLogEx(NORMAL, "");
+					PrintAndLogEx(ERR, "read sector %d error.", i + 1);
+					return 2;
+				}
+				
+				for(int j = 0; j < (verbose ? 4 : 3); j ++)
+					PrintAndLogEx(NORMAL, " [%03d] %s", (i + 1) * 4 + j, sprint_hex(&vsector[j * 16], 16));		
+			}
+		}		
+	}
+	
+	return 0;
+}
+
+int CmdHFMFNDEF(const char *cmd) {
+
+	CLIParserInit("hf mf ndef", 
+		"Prints NFC Data Exchange Format (NDEF)", 
+		"Usage:\n\thf mf ndef -> shows NDEF data\n"
+			"\thf mf ndef -a 03e1 -k ffffffffffff -b -> shows NDEF data with custom AID, key and with key B\n");
+
+	void* argtable[] = {
+		arg_param_begin,
+		arg_litn("vV",  "verbose",  0, 2, "show technical data"),
+		arg_str0("aA",  "aid",      "replace default aid for NDEF", NULL),
+		arg_str0("kK",  "key",      "replace default key for NDEF", NULL),
+		arg_lit0("bB",  "keyb",     "use key B for access sectors (by default: key A)"),
+		arg_param_end
+	};
+	CLIExecWithReturn(cmd, argtable, true);
+	
+	bool verbose = arg_get_lit(1);
+	bool verbose2 = arg_get_lit(1) > 1;
+	uint8_t aid[2] = {0};
+	int aidlen;
+	CLIGetHexWithReturn(2, aid, &aidlen);
+	uint8_t key[6] = {0};
+	int keylen;
+	CLIGetHexWithReturn(3, key, &keylen);
+	bool keyB = arg_get_lit(4);
+	
+	CLIParserFree();
+
+	uint16_t ndefAID = 0x03e1;
+	if (aidlen == 2)
+		ndefAID = (aid[0] << 8) + aid[1];
+	
+	uint8_t ndefkey[6] = {0};
+	memcpy(ndefkey, g_mifare_ndef_key, 6);
+	if (keylen == 6) {
+		memcpy(ndefkey, key, 6);
+	}
+	
+	uint8_t sector0[16 * 4] = {0};
+	uint8_t sector10[16 * 4] = {0};
+	uint8_t data[4096] = {0};
+	int datalen = 0;
+
+	PrintAndLogEx(NORMAL, "");
+	
+	if (mfReadSector(MF_MAD1_SECTOR, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector0)) {
+		PrintAndLogEx(ERR, "read sector 0 error. card don't have MAD or don't have MAD on default keys.");
+		return 2;
+	}
+	
+	bool haveMAD2 = false;
+	int res = MADCheck(sector0, NULL, verbose, &haveMAD2);
+	if (res) {
+		PrintAndLogEx(ERR, "MAD error %d.", res);
+		return res;
+	}
+	
+	if (haveMAD2) {
+		if (mfReadSector(MF_MAD2_SECTOR, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector10)) {
+			PrintAndLogEx(ERR, "read sector 0x10 error. card don't have MAD or don't have MAD on default keys.");
+			return 2;
+		}
+	}
+
+	uint16_t mad[7 + 8 + 8 + 8 + 8] = {0};
+	size_t madlen = 0;
+	if (MADDecode(sector0, (haveMAD2 ? sector10 : NULL), mad, &madlen)) {
+		PrintAndLogEx(ERR, "can't decode mad.");
+		return 10;
+	}
+
+	printf("data reading:");
+	for (int i = 0; i < madlen; i++) {
+		if (ndefAID == mad[i]) {
+			uint8_t vsector[16 * 4] = {0};
+			if (mfReadSector(i + 1, keyB ? MF_KEY_B : MF_KEY_A, ndefkey, vsector)) {
+				PrintAndLogEx(ERR, "read sector %d error.", i + 1);
+				return 2;
+			}
+			
+			memcpy(&data[datalen], vsector, 16 * 3);
+			datalen += 16 * 3;
+			
+			printf(".");
+		}
+	}
+	printf(" OK\n");
+	
+	if (!datalen) {
+		PrintAndLogEx(ERR, "no NDEF data.");
+		return 11;
+	}
+	
+	if (verbose2) {
+		PrintAndLogEx(NORMAL, "NDEF data:");
+		dump_buffer(data, datalen, stdout, 1);
+	}
+		
+	NDEFDecodeAndPrint(data, datalen, verbose);
+
+	return 0;
+}
+
+int CmdHF14AMfList(const char *Cmd) {
+	CmdTraceList("mf");
+	return 0;
+}
+
+static command_t CommandTable[] = {
+	{"help",		CmdHelp,				1, "This help"},
+	{"list",		CmdHF14AMfList,         0, "[Deprecated] List ISO 14443-a / Mifare history"},	
+	{"darkside",	CmdHF14AMfDarkside,		0, "Darkside attack. read parity error messages."},
+	{"nested",		CmdHF14AMfNested,		0, "Nested attack. Test nested authentication"},
+	{"hardnested", 	CmdHF14AMfNestedHard, 	0, "Nested attack for hardened Mifare cards"},
+	{"keybrute",	CmdHF14AMfKeyBrute,		0, "J_Run's 2nd phase of multiple sector nested authentication key recovery"},	
+	{"nack",		CmdHf14AMfNack,			0, "Test for Mifare NACK bug"},
+	{"chk",			CmdHF14AMfChk,			0, "Check keys"},
+	{"fchk",		CmdHF14AMfChk_fast,		0, "Check keys fast, targets all keys on card"},
+	{"decrypt",		CmdHf14AMfDecryptBytes, 1, "[nt] [ar_enc] [at_enc] [data] - to decrypt snoop or trace"},
+	{"-----------",	CmdHelp,				1, ""},
+	{"dbg",			CmdHF14AMfDbg,			0, "Set default debug mode"},
+	{"rdbl",		CmdHF14AMfRdBl,			0, "Read MIFARE classic block"},
+	{"rdsc",		CmdHF14AMfRdSc,			0, "Read MIFARE classic sector"},
+	{"dump",		CmdHF14AMfDump,			0, "Dump MIFARE classic tag to binary file"},
+	{"restore",		CmdHF14AMfRestore,		0, "Restore MIFARE classic binary file to BLANK tag"},
+	{"wrbl",		CmdHF14AMfWrBl,			0, "Write MIFARE classic block"},
+	{"setmod",		CmdHf14AMfSetMod, 		0, "Set MIFARE Classic EV1 load modulation strength"},	
+	{"auth4",		CmdHF14AMfAuth4,		0, "ISO14443-4 AES authentication"},
+//	{"sniff",		CmdHF14AMfSniff,		0, "Sniff card-reader communication"},
+	{"-----------",	CmdHelp,				1, ""},
+	{"sim",			CmdHF14AMf1kSim,		0, "Simulate MIFARE card"},
+	{"eclr",		CmdHF14AMfEClear,		0, "Clear simulator memory block"},
+	{"eget",		CmdHF14AMfEGet,			0, "Get simulator memory block"},
+	{"eset",		CmdHF14AMfESet,			0, "Set simulator memory block"},
+	{"eload",		CmdHF14AMfELoad,		0, "Load from file emul dump"},
+	{"esave",		CmdHF14AMfESave,		0, "Save to file emul dump"},
+	{"ecfill",		CmdHF14AMfECFill,		0, "Fill simulator memory with help of keys from simulator"},
+	{"ekeyprn",		CmdHF14AMfEKeyPrn,		0, "Print keys from simulator memory"},
+	{"-----------",	CmdHelp,				1, ""},
+	{"csetuid",		CmdHF14AMfCSetUID,		0, "Set UID for magic Chinese card"},
+	{"csetblk",		CmdHF14AMfCSetBlk,		0, "Write block - Magic Chinese card"},
+	{"cgetblk",		CmdHF14AMfCGetBlk,		0, "Read block - Magic Chinese card"},
+	{"cgetsc",		CmdHF14AMfCGetSc,		0, "Read sector - Magic Chinese card"},
+	{"cload",		CmdHF14AMfCLoad,		0, "Load dump into magic Chinese card"},
+	{"csave",		CmdHF14AMfCSave,		0, "Save dump from magic Chinese card into file or emulator"},
+	{"-----------",	CmdHelp,				1, ""},
+	{"mad",			CmdHF14AMfMAD,			0, "Checks and prints MAD"},
+	{"ndef",		CmdHFMFNDEF,			0, "Prints NDEF records from card"},
+
+	{"ice",			CmdHF14AMfice,			0, "collect Mifare Classic nonces to file"},
+	{NULL, NULL, 0, NULL}
+};
+
+int CmdHFMF(const char *Cmd) {
+	clearCommandBuffer();
+	CmdsParse(CommandTable, Cmd);
+	return 0;
+}
+
+int CmdHelp(const char *Cmd) {
+	CmdsHelp(CommandTable);
+	return 0;
+}
diff --git a/client/cmdhfmf.h b/client/cmdhfmf.h
index c819d5bef..a8e622cc7 100644
--- a/client/cmdhfmf.h
+++ b/client/cmdhfmf.h
@@ -1,76 +1,76 @@
-//-----------------------------------------------------------------------------
-// Copyright (C) 2011 Merlok
-//
-// This code is licensed to you under the terms of the GNU GPL, version 2 or,
-// at your option, any later version. See the LICENSE.txt file for the text of
-// the license.
-//-----------------------------------------------------------------------------
-// High frequency MIFARE commands
-//-----------------------------------------------------------------------------
-
-#ifndef CMDHFMF_H__
-#define CMDHFMF_H__
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <time.h>
-#include <mbedtls/aes.h>
-#include "proxmark3.h"
-#include "iso14443crc.h"
-#include "ui.h"
-#include "cmdparser.h"
-#include "common.h"
-#include "util.h"
-#include "mifare.h" 				// nonces_t struct
-#include "mifare/mfkey.h"   		// mfkey32_moebious
-#include "cmdhfmfhard.h"
-#include "mifare/mifarehost.h"		// icesector_t,  sector_t
-#include "util_posix.h"				// msclock
-#include "mifare/mifaredefault.h"  	// mifare default key array
-#include "cmdhf14a.h" 				// dropfield
-#include "cliparser/cliparser.h" 	// argtable
-#include "hardnested/hardnested_bf_core.h"	// SetSIMDInstr
-
-extern int CmdHFMF(const char *Cmd);
-
-extern int CmdHF14AMfList(const char *Cmd);
-extern int CmdHF14AMfDbg(const char* cmd);
-extern int CmdHF14AMfRdBl(const char* cmd);
-extern int CmdHF14AMfURdBl(const char* cmd);
-extern int CmdHF14AMfRdSc(const char* cmd);
-extern int CmdHF14SMfURdCard(const char* cmd);
-extern int CmdHF14AMfDump(const char* cmd);
-extern int CmdHF14AMfRestore(const char* cmd);
-extern int CmdHF14AMfWrBl(const char* cmd);
-extern int CmdHF14AMfUWrBl(const char* cmd);
-extern int CmdHF14AMfChk(const char* cmd);
-extern int CmdHF14AMfDarkside(const char* cmd);
-extern int CmdHF14AMfNested(const char* cmd);
-extern int CmdHF14AMfNestedHard(const char *Cmd);
-//extern int CmdHF14AMfSniff(const char* cmd);
-extern int CmdHF14AMf1kSim(const char* cmd);
-extern int CmdHF14AMfKeyBrute(const char *Cmd);
-extern int CmdHF14AMfEClear(const char* cmd);
-extern int CmdHF14AMfEGet(const char* cmd);
-extern int CmdHF14AMfESet(const char* cmd);
-extern int CmdHF14AMfELoad(const char* cmd);
-extern int CmdHF14AMfESave(const char* cmd);
-extern int CmdHF14AMfECFill(const char* cmd);
-extern int CmdHF14AMfEKeyPrn(const char* cmd);
-extern int CmdHF14AMfCSetUID(const char* cmd);
-extern int CmdHF14AMfCSetBlk(const char* cmd);
-extern int CmdHF14AMfCGetBlk(const char* cmd);
-extern int CmdHF14AMfCGetSc(const char* cmd);
-extern int CmdHF14AMfCLoad(const char* cmd);
-extern int CmdHF14AMfCSave(const char* cmd);
-extern int CmdHf14MfDecryptBytes(const char *Cmd);
-extern int CmdHf14AMfSetMod(const char *Cmd);
-extern int CmdHf14AMfNack(const char *Cmd);
-
-void showSectorTable(void);
-void readerAttack(nonces_t data, bool setEmulatorMem, bool verbose);
-void printKeyTable( uint8_t sectorscnt, sector_t *e_sector );
-void printKeyTable_fast( uint8_t sectorscnt, icesector_t *e_sector, uint64_t bar, uint64_t foo );
-#endif
+//-----------------------------------------------------------------------------
+// Copyright (C) 2011 Merlok
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// High frequency MIFARE commands
+//-----------------------------------------------------------------------------
+
+#ifndef CMDHFMF_H__
+#define CMDHFMF_H__
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <time.h>
+#include <mbedtls/aes.h>
+#include "proxmark3.h"
+#include "iso14443crc.h"
+#include "ui.h"
+#include "cmdparser.h"
+#include "common.h"
+#include "util.h"
+#include "mifare.h" 				// nonces_t struct
+#include "mifare/mfkey.h"   		// mfkey32_moebious
+#include "cmdhfmfhard.h"
+#include "mifare/mifarehost.h"		// icesector_t,  sector_t
+#include "util_posix.h"				// msclock
+#include "mifare/mifaredefault.h"  	// mifare default key array
+#include "cmdhf14a.h" 				// dropfield
+#include "cliparser/cliparser.h" 	// argtable
+#include "hardnested/hardnested_bf_core.h"	// SetSIMDInstr
+
+extern int CmdHFMF(const char *Cmd);
+
+extern int CmdHF14AMfList(const char *Cmd);
+extern int CmdHF14AMfDbg(const char* cmd);
+extern int CmdHF14AMfRdBl(const char* cmd);
+extern int CmdHF14AMfURdBl(const char* cmd);
+extern int CmdHF14AMfRdSc(const char* cmd);
+extern int CmdHF14SMfURdCard(const char* cmd);
+extern int CmdHF14AMfDump(const char* cmd);
+extern int CmdHF14AMfRestore(const char* cmd);
+extern int CmdHF14AMfWrBl(const char* cmd);
+extern int CmdHF14AMfUWrBl(const char* cmd);
+extern int CmdHF14AMfChk(const char* cmd);
+extern int CmdHF14AMfDarkside(const char* cmd);
+extern int CmdHF14AMfNested(const char* cmd);
+extern int CmdHF14AMfNestedHard(const char *Cmd);
+//extern int CmdHF14AMfSniff(const char* cmd);
+extern int CmdHF14AMf1kSim(const char* cmd);
+extern int CmdHF14AMfKeyBrute(const char *Cmd);
+extern int CmdHF14AMfEClear(const char* cmd);
+extern int CmdHF14AMfEGet(const char* cmd);
+extern int CmdHF14AMfESet(const char* cmd);
+extern int CmdHF14AMfELoad(const char* cmd);
+extern int CmdHF14AMfESave(const char* cmd);
+extern int CmdHF14AMfECFill(const char* cmd);
+extern int CmdHF14AMfEKeyPrn(const char* cmd);
+extern int CmdHF14AMfCSetUID(const char* cmd);
+extern int CmdHF14AMfCSetBlk(const char* cmd);
+extern int CmdHF14AMfCGetBlk(const char* cmd);
+extern int CmdHF14AMfCGetSc(const char* cmd);
+extern int CmdHF14AMfCLoad(const char* cmd);
+extern int CmdHF14AMfCSave(const char* cmd);
+extern int CmdHf14MfDecryptBytes(const char *Cmd);
+extern int CmdHf14AMfSetMod(const char *Cmd);
+extern int CmdHf14AMfNack(const char *Cmd);
+
+void showSectorTable(void);
+void readerAttack(nonces_t data, bool setEmulatorMem, bool verbose);
+void printKeyTable( uint8_t sectorscnt, sector_t *e_sector );
+void printKeyTable_fast( uint8_t sectorscnt, icesector_t *e_sector, uint64_t bar, uint64_t foo );
+#endif
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 9a1e6cc71..e94ec84fe 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1,2056 +1,2056 @@
-//-----------------------------------------------------------------------------
-//
-// This code is licensed to you under the terms of the GNU GPL, version 2 or,
-// at your option, any later version. See the LICENSE.txt file for the text of
-// the license.
-//-----------------------------------------------------------------------------
-// Low frequency T55xx commands
-//-----------------------------------------------------------------------------
-#include "cmdlft55xx.h"
-
-// Default configuration
-t55xx_conf_block_t config = { .modulation = DEMOD_ASK, .inverted = false, .offset = 0x00, .block0 = 0x00, .Q5 = false };
-
-t55xx_conf_block_t Get_t55xx_Config(){
-	return config;
-}
-void Set_t55xx_Config(t55xx_conf_block_t conf){
-	config = conf;
-}
-
-int usage_t55xx_config(){
-	PrintAndLogEx(NORMAL, "Usage: lf t55xx config [d <demodulation>] [i 1] [o <offset>] [Q5]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h                                - This help");
-	PrintAndLogEx(NORMAL, "       b <8|16|32|40|50|64|100|128>     - Set bitrate");
-	PrintAndLogEx(NORMAL, "       d <FSK|FSK1|FSK1a|FSK2|FSK2a|ASK|PSK1|PSK2|NRZ|BI|BIa>  - Set demodulation FSK / ASK / PSK / NRZ / Biphase / Biphase A");
-	PrintAndLogEx(NORMAL, "       i [1]                            - Invert data signal, defaults to normal");
-	PrintAndLogEx(NORMAL, "       o [offset]                       - Set offset, where data should start decode in bitstream");
-	PrintAndLogEx(NORMAL, "       Q5                               - Set as Q5(T5555) chip instead of T55x7");
-	PrintAndLogEx(NORMAL, "       ST                               - Set Sequence Terminator on");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      lf t55xx config d FSK          - FSK demodulation");
-	PrintAndLogEx(NORMAL, "      lf t55xx config d FSK i 1      - FSK demodulation, inverse data");
-	PrintAndLogEx(NORMAL, "      lf t55xx config d FSK i 1 o 3  - FSK demodulation, inverse data, offset=3,start from position 3 to decode data");
-	PrintAndLogEx(NORMAL, "");
-	return 0;
-}
-int usage_t55xx_read(){
-	PrintAndLogEx(NORMAL, "Usage:  lf t55xx read [b <block>] [p <password>] <override_safety> <page1>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "     b <block>    - block number to read. Between 0-7");
-	PrintAndLogEx(NORMAL, "     p <password> - OPTIONAL password (8 hex characters)");
-	PrintAndLogEx(NORMAL, "     o            - OPTIONAL override safety check");
-	PrintAndLogEx(NORMAL, "     1            - OPTIONAL read Page 1 instead of Page 0");
-	PrintAndLogEx(NORMAL, "     ****WARNING****");
-	PrintAndLogEx(NORMAL, "     Use of read with password on a tag not configured for a pwd");
-	PrintAndLogEx(NORMAL, "     can damage the tag");
-    PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-    PrintAndLogEx(NORMAL, "      lf t55xx read b 0				- read data from block 0");
-	PrintAndLogEx(NORMAL, "      lf t55xx read b 0 p feedbeef		- read data from block 0 password feedbeef");
-	PrintAndLogEx(NORMAL, "      lf t55xx read b 0 p feedbeef o	- read data from block 0 password feedbeef safety check");
-	PrintAndLogEx(NORMAL, "");
-	return 0;
-}
-int usage_t55xx_write(){
-	PrintAndLogEx(NORMAL, "Usage:  lf t55xx write [b <block>] [d <data>] [p <password>] [1] [t]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "     b <block>    - block number to write. Between 0-7");
-	PrintAndLogEx(NORMAL, "     d <data>     - 4 bytes of data to write (8 hex characters)");
-	PrintAndLogEx(NORMAL, "     p <password> - OPTIONAL password 4bytes (8 hex characters)");
-	PrintAndLogEx(NORMAL, "     1            - OPTIONAL write Page 1 instead of Page 0");
-	PrintAndLogEx(NORMAL, "     t            - OPTIONAL test mode write - ****DANGER****");	
-    PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      lf t55xx write b 3 d 11223344            - write 11223344 to block 3");
-	PrintAndLogEx(NORMAL, "      lf t55xx write b 3 d 11223344 p feedbeef - write 11223344 to block 3 password feedbeef");
-	PrintAndLogEx(NORMAL, "");
-	return 0;
-}
-int usage_t55xx_trace() {
-	PrintAndLogEx(NORMAL, "Usage:  lf t55xx trace [1]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "     1             - if set, use Graphbuffer otherwise read data from tag.");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      lf t55xx trace");
-	PrintAndLogEx(NORMAL, "      lf t55xx trace 1");
-	PrintAndLogEx(NORMAL, "");
-	return 0;
-}
-int usage_t55xx_info() {
-	PrintAndLogEx(NORMAL, "Usage:  lf t55xx info [1]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "     1             - if set, use Graphbuffer otherwise read data from tag.");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      lf t55xx info");
-	PrintAndLogEx(NORMAL, "      lf t55xx info 1");
-	PrintAndLogEx(NORMAL, "");
-	return 0;
-}
-int usage_t55xx_dump(){
-	PrintAndLogEx(NORMAL, "Usage:  lf t55xx dump <password> [o]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "     <password>  - OPTIONAL password 4bytes (8 hex symbols)");
-	PrintAndLogEx(NORMAL, "     o           - OPTIONAL override, force pwd read despite danger to card");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      lf t55xx dump");
-	PrintAndLogEx(NORMAL, "      lf t55xx dump feedbeef o");
-	PrintAndLogEx(NORMAL, "");
-	return 0;
-}
-int usage_t55xx_detect(){
-	PrintAndLogEx(NORMAL, "Usage:  lf t55xx detect [1] [p <password>]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "     1             - if set, use Graphbuffer otherwise read data from tag.");
-	PrintAndLogEx(NORMAL, "     p <password>  - OPTIONAL password (8 hex characters)");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      lf t55xx detect");
-	PrintAndLogEx(NORMAL, "      lf t55xx detect 1");
-	PrintAndLogEx(NORMAL, "      lf t55xx detect p 11223344");
-	PrintAndLogEx(NORMAL, "");
-	return 0;
-}
-int usage_t55xx_detectP1(){
-	PrintAndLogEx(NORMAL, "Command: Detect Page 1 of a t55xx chip");
-	PrintAndLogEx(NORMAL, "Usage:  lf t55xx p1detect [1] [p <password>]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "     1             - if set, use Graphbuffer otherwise read data from tag.");
-	PrintAndLogEx(NORMAL, "     p <password>  - OPTIONAL password (8 hex characters)");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      lf t55xx p1detect");
-	PrintAndLogEx(NORMAL, "      lf t55xx p1detect 1");
-	PrintAndLogEx(NORMAL, "      lf t55xx p1detect p 11223344");
-	PrintAndLogEx(NORMAL, "");
-	return 0;
-}
-int usage_t55xx_wakup(){
-	PrintAndLogEx(NORMAL, "Usage:  lf t55xx wakeup [h] p <password>");
-	PrintAndLogEx(NORMAL, "This commands send the Answer-On-Request command and leaves the readerfield ON afterwards.");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "     h 			- this help");
-    PrintAndLogEx(NORMAL, "     p <password>	- password 4bytes (8 hex symbols)");
-    PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-    PrintAndLogEx(NORMAL, "      lf t55xx wakeup p 11223344  - send wakeup password");
-	return 0;
-}
-int usage_t55xx_chk(){
-	PrintAndLogEx(NORMAL, "This command uses a dictionary attack");
-	PrintAndLogEx(NORMAL, "press 'enter' to cancel the command");
-    PrintAndLogEx(NORMAL, "Usage: lf t55xx bruteforce [h] <m> [i <*.dic>]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "     h			- this help");
-	PrintAndLogEx(NORMAL, "     m			- use dictionary from flashmemory\n");	
-    PrintAndLogEx(NORMAL, "     i <*.dic>	- loads a default keys dictionary file <*.dic>");
-    PrintAndLogEx(NORMAL, "");
-    PrintAndLogEx(NORMAL, "Examples:");
-    PrintAndLogEx(NORMAL, "       lf t55xx bruteforce m");
-	PrintAndLogEx(NORMAL, "       lf t55xx bruteforce i default_pwd.dic");
-    PrintAndLogEx(NORMAL, "");
-    return 0;
-}
-int usage_t55xx_bruteforce(){
-	PrintAndLogEx(NORMAL, "This command uses bruteforce to scan a number range");
-	PrintAndLogEx(NORMAL, "press 'enter' to cancel the command");
-    PrintAndLogEx(NORMAL, "Usage: lf t55xx bruteforce [h] <start password> <end password>");
-    PrintAndLogEx(NORMAL, "       password must be 4 bytes (8 hex symbols)");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "     h			- this help");
-	PrintAndLogEx(NORMAL, "     <start_pwd> - 4 byte hex value to start pwd search at");
-	PrintAndLogEx(NORMAL, "     <end_pwd>   - 4 byte hex value to end pwd search at");
-    PrintAndLogEx(NORMAL, "");
-    PrintAndLogEx(NORMAL, "Examples:");
-    PrintAndLogEx(NORMAL, "       lf t55xx bruteforce aaaaaaaa bbbbbbbb");
-    PrintAndLogEx(NORMAL, "");
-    return 0;
-}
-int usage_t55xx_recoverpw(){
-	PrintAndLogEx(NORMAL, "This command uses a few tricks to try to recover mangled password");
-	PrintAndLogEx(NORMAL, "press 'enter' to cancel the command");
-	PrintAndLogEx(NORMAL, "WARNING: this may brick non-password protected chips!");
-	PrintAndLogEx(NORMAL, "Usage: lf t55xx recoverpw [password]");
-	PrintAndLogEx(NORMAL, "       password must be 4 bytes (8 hex symbols)");
-	PrintAndLogEx(NORMAL, "       default password is 51243648, used by many cloners");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "     h           - this help");
-	PrintAndLogEx(NORMAL, "     [password]  - 4 byte hex value of password written by cloner");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "       lf t55xx recoverpw");
-	PrintAndLogEx(NORMAL, "       lf t55xx recoverpw 51243648");
-	PrintAndLogEx(NORMAL, "");
-	return 0;
-}int usage_t55xx_wipe(){
-	PrintAndLogEx(NORMAL, "Usage:  lf t55xx wipe [h] [Q5]");
-	PrintAndLogEx(NORMAL, "This commands wipes a tag, fills blocks 1-7 with zeros and a default configuration block");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "     h 	- this help");
-	PrintAndLogEx(NORMAL, "     Q5  - indicates to use the T5555 (Q5) default configuration block");
-    PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-    PrintAndLogEx(NORMAL, "      lf t55xx wipe	-  wipes a t55x7 tag,    config block 0x000880E0");
-	PrintAndLogEx(NORMAL, "      lf t55xx wipe Q5 -  wipes a t5555 Q5 tag, config block 0x6001F004");
-	return 0;
-}
-int usage_lf_deviceconfig(){
-	PrintAndLogEx(NORMAL, "Sets t55x7 timings for direkt commands. The timings are set here in Field Clocks (FC), \nwhich is converted to (US) on device");
-	PrintAndLogEx(NORMAL, "Usage: lf t55xx deviceconfig a <gap> b <gap> c <gap> d <gap> e <gap> p");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h              - This help");
-	PrintAndLogEx(NORMAL, "       a <8..255>     - Set start gap");
-	PrintAndLogEx(NORMAL, "       b <8..255>     - Set write gap");
-	PrintAndLogEx(NORMAL, "       c <8..255>     - Set write ZERO gap");
-	PrintAndLogEx(NORMAL, "       d <8..255>     - Set write ONE gap");
-	PrintAndLogEx(NORMAL, "       e <8..255>     - Set read gap");
-	PrintAndLogEx(NORMAL, "       p              - persist to flashmemory");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      lf t55xx deviceconfig a 29 b 17 c 15 d 47 e 15   - default T55XX");
-	PrintAndLogEx(NORMAL, "      lf t55xx deviceconfig a 55 b 14 c 21 d 30        - default EM4305");
-	PrintAndLogEx(NORMAL, "");
-	return 0;
-}
-
-int CmdHelp(const char *Cmd);
-
-void printT5xxHeader(uint8_t page){
-	PrintAndLogEx(NORMAL, "Reading Page %d:", page);	
-	PrintAndLogEx(NORMAL, "blk | hex data | binary                           | ascii");
-	PrintAndLogEx(NORMAL, "----+----------+----------------------------------+-------");	
-}
-
-int CmdT55xxSetConfig(const char *Cmd) {
-
-	uint8_t offset = 0;
-	char modulation[6] = {0x00};
-	char tmp = 0x00;
-	uint8_t bitRate = 0;
-	uint8_t rates[9] = {8,16,32,40,50,64,100,128,0};
-	uint8_t cmdp = 0;
-	bool errors = false;
-	while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		tmp = tolower(param_getchar(Cmd, cmdp));
-		switch(tmp)	{
-		case 'h':
-			return usage_t55xx_config();
-		case 'b':
-			errors |= param_getdec(Cmd, cmdp+1, &bitRate);
-			if ( !errors){
-				uint8_t i = 0;
-				for (; i < 9; i++){
-					if (rates[i]==bitRate) {
-						config.bitrate = i;
-						break;
-					}
-				}
-				if (i==9) errors = true;
-			}
-			cmdp+=2;
-			break;
-		case 'd':
-			param_getstr(Cmd, cmdp+1, modulation, sizeof(modulation));
-			cmdp += 2;
-
-			if ( strcmp(modulation, "FSK" ) == 0) {
-				config.modulation = DEMOD_FSK;
-			} else if ( strcmp(modulation, "FSK1" ) == 0) {
-				config.modulation = DEMOD_FSK1;
-				config.inverted=1;
-			} else if ( strcmp(modulation, "FSK1a" ) == 0) {
-				config.modulation = DEMOD_FSK1a;
-				config.inverted=0;
-			} else if ( strcmp(modulation, "FSK2" ) == 0) {
-				config.modulation = DEMOD_FSK2;
-				config.inverted=0;
-			} else if ( strcmp(modulation, "FSK2a" ) == 0) {
-				config.modulation = DEMOD_FSK2a;
-				config.inverted=1;
-			} else if ( strcmp(modulation, "ASK" ) == 0) {
-				config.modulation = DEMOD_ASK;
-			} else if ( strcmp(modulation, "NRZ" ) == 0) {
-				config.modulation = DEMOD_NRZ;
-			} else if ( strcmp(modulation, "PSK1" ) == 0) {
-				config.modulation = DEMOD_PSK1;
-			} else if ( strcmp(modulation, "PSK2" ) == 0) {
-				config.modulation = DEMOD_PSK2;
-			} else if ( strcmp(modulation, "PSK3" ) == 0) {
-				config.modulation = DEMOD_PSK3;
-			} else if ( strcmp(modulation, "BIa" ) == 0) {
-				config.modulation = DEMOD_BIa;
-				config.inverted=1;
-			} else if ( strcmp(modulation, "BI" ) == 0) {
-				config.modulation = DEMOD_BI;
-				config.inverted=0;
-			} else {
-				PrintAndLogEx(WARNING, "Unknown modulation '%s'", modulation);
-				errors = true;
-			}
-			break;
-		case 'i':
-			config.inverted = param_getchar(Cmd,cmdp+1) == '1';
-			cmdp+=2;
-			break;
-		case 'o':
-			errors |= param_getdec(Cmd, cmdp+1, &offset);
-			if ( !errors )
-				config.offset = offset;
-			cmdp+=2;
-			break;
-		case 'q':		
-			config.Q5 = true;
-			cmdp++;
-			break;
-		case 's':		
-			config.ST = true;
-			cmdp++;
-			break;
-		default:
-			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-			errors = true;
-			break;
-		}
-	}
-
-	// No args
-	if (cmdp == 0) return printConfiguration( config );
-
-	//Validations
-	if (errors) return usage_t55xx_config();
-
- 	config.block0 = 0;
- 	return printConfiguration ( config );
-}
-
-int T55xxReadBlock(uint8_t block, bool page1, bool usepwd, bool override, uint32_t password){
-	//Password mode
-	if ( usepwd ) {
-		// try reading the config block and verify that PWD bit is set before doing this!
-		if ( !override ) {
-			
-			if ( !AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, false, 0 ) ) return 0;
-			
-			if ( !tryDetectModulation() ) {
-				PrintAndLogEx(NORMAL, "Safety Check: Could not detect if PWD bit is set in config block. Exits.");
-				return 0;
-			} else {
-				PrintAndLogEx(NORMAL, "Safety Check: PWD bit is NOT set in config block. Reading without password...");	
-				usepwd = false;
-				page1 = false;
-			}
-		} else {
-			PrintAndLogEx(NORMAL, "Safety Check Overriden - proceeding despite risk");
-		}
-	}
-
-	if (!AquireData(page1, block, usepwd, password) ) return 0;
-	if (!DecodeT55xxBlock()) return 0;
-
-	char blk[10] = {0};
-	sprintf(blk, "%02d", block);
-	printT55xxBlock(blk);	
-	return 1;
-}
-
-int CmdT55xxReadBlock(const char *Cmd) {
-	uint8_t block = REGULAR_READ_MODE_BLOCK;
-	uint32_t password = 0; //default to blank Block 7
-	bool usepwd = false;
-	bool override = false;
-	bool page1 = false;
-	bool errors = false;
-	uint8_t cmdp = 0;
-	while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch ( tolower(param_getchar(Cmd, cmdp))) {
-		case 'h':
-			return usage_t55xx_read();
-		case 'b':
-			errors |= param_getdec(Cmd, cmdp+1, &block);
-			cmdp += 2;
-			break;
-		case 'o':
-			override = true;
-			cmdp++;
-			break;
-		case 'p':
-			password = param_get32ex(Cmd, cmdp+1, 0, 16);
-			usepwd = true;
-			cmdp += 2;
-			break;
-		case '1':
-			page1 = true;
-			cmdp++;
-			break;
-		default:
-			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-			errors = true;
-			break;
-		}
-	}
-	if (errors) return usage_t55xx_read();
-
-	if (block > 7 && block != REGULAR_READ_MODE_BLOCK	) {
-		PrintAndLogEx(NORMAL, "Block must be between 0 and 7");
-		return 0;
-	}
-
-	printT5xxHeader(page1);
-	return T55xxReadBlock(block, page1, usepwd, override, password);
-}
-
-bool DecodeT55xxBlock(){
-	
-	char buf[30] = {0x00};
-	char *cmdStr = buf;
-	int ans = 0;
-	bool ST = config.ST;
-	uint8_t bitRate[8] = {8,16,32,40,50,64,100,128};
-	DemodBufferLen = 0x00;
-
-	switch( config.modulation ){
-		case DEMOD_FSK:
-			snprintf(cmdStr, sizeof(buf),"%d %d", bitRate[config.bitrate], config.inverted );
-			ans = FSKrawDemod(cmdStr, false);
-			break;
-		case DEMOD_FSK1:
-		case DEMOD_FSK1a:
-			snprintf(cmdStr, sizeof(buf),"%d %d 8 5", bitRate[config.bitrate], config.inverted );
-			ans = FSKrawDemod(cmdStr, false);
-			break;
-		case DEMOD_FSK2:
-		case DEMOD_FSK2a:
-			snprintf(cmdStr, sizeof(buf),"%d %d 10 8", bitRate[config.bitrate], config.inverted );
-			ans = FSKrawDemod(cmdStr, false);
-			break;
-		case DEMOD_ASK:
-			snprintf(cmdStr, sizeof(buf),"%d %d 1", bitRate[config.bitrate], config.inverted );
-			ans = ASKDemod_ext(cmdStr, false, false, 1, &ST);
-			break;
-		case DEMOD_PSK1:
-			// skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)
-			save_restoreGB(GRAPH_SAVE);
-			CmdLtrim("160");
-			snprintf(cmdStr, sizeof(buf),"%d %d 6", bitRate[config.bitrate], config.inverted );
-			ans = PSKDemod(cmdStr, false);
-			//undo trim samples
-			save_restoreGB(GRAPH_RESTORE);
-			break;
-		case DEMOD_PSK2: //inverted won't affect this
-		case DEMOD_PSK3: //not fully implemented
-			// skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)
-			save_restoreGB(GRAPH_SAVE);
-			CmdLtrim("160");
-			snprintf(cmdStr, sizeof(buf),"%d 0 6", bitRate[config.bitrate] );
-			ans = PSKDemod(cmdStr, false);
-			psk1TOpsk2(DemodBuffer, DemodBufferLen);
-			//undo trim samples
-			save_restoreGB(GRAPH_RESTORE);
-			break;
-		case DEMOD_NRZ:
-			snprintf(cmdStr, sizeof(buf),"%d %d 1", bitRate[config.bitrate], config.inverted );
-			ans = NRZrawDemod(cmdStr, false);
-			break;
-		case DEMOD_BI:
-		case DEMOD_BIa:
-			snprintf(cmdStr, sizeof(buf),"0 %d %d 1", bitRate[config.bitrate], config.inverted );
-			ans = ASKbiphaseDemod(cmdStr, false);
-			break;
-		default:
-			return false;
-	}
-	return (bool) ans;
-}
-
-bool DecodeT5555TraceBlock() {
-	DemodBufferLen = 0x00;
-	
-	// According to datasheet. Always: RF/64, not inverted, Manchester
-	return (bool) ASKDemod("64 0 1", false, false, 1);
-}
-
-// sanity check. Don't use proxmark if it is offline and you didn't specify useGraphbuf
-static int SanityOfflineCheck( bool useGraphBuffer ){
-	if ( !useGraphBuffer && IsOffline() ) {
-		PrintAndLogEx(NORMAL, "Your proxmark3 device is offline. Specify [1] to use graphbuffer data instead");
-		return 0;
-	}
-	return 1;
-}
-
-int CmdT55xxDetect(const char *Cmd){
-	bool errors = false;
-	bool useGB = false, usepwd = false;
-	uint32_t password = 0;
-	uint8_t cmdp = 0;
-
-	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch ( tolower(param_getchar(Cmd, cmdp))) {
-		case 'h':
-			return usage_t55xx_detect();
-		case 'p':
-			password = param_get32ex(Cmd, cmdp+1, 0, 16);
-			usepwd = true;
-			cmdp += 2;
-			break;
-		case '1':
-			// use Graphbuffer data
-			useGB = true;
-			cmdp++;
-			break;
-		default:
-			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-			errors = true;
-			break;
-		}
-	}
-	if (errors) return usage_t55xx_detect();
-	
-	// sanity check.
-	if (!SanityOfflineCheck(useGB)) return 1;
-	
-	if ( !useGB) {
-		if ( !AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, usepwd, password) )
-			return 1;
-	}
-	
-	if ( !tryDetectModulation() )
-		PrintAndLogEx(WARNING, "Could not detect modulation automatically. Try setting it manually with \'lf t55xx config\'");
-
-	return 0;
-}
-
-// detect configuration?
-bool tryDetectModulation(){
-
-	t55xx_conf_block_t tests[15];
-	int bitRate = 0, clk = 0, firstClockEdge = 0;
-	uint8_t hits = 0, fc1 = 0, fc2 = 0, ans = 0;
-	
-	ans = fskClocks(&fc1, &fc2, (uint8_t *)&clk, &firstClockEdge);
-
-	if (ans && ((fc1==10 && fc2==8) || (fc1==8 && fc2==5))) {
-		if ( FSKrawDemod("0 0", false) && test(DEMOD_FSK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)){
-			tests[hits].modulation = DEMOD_FSK;
-			if (fc1==8 && fc2 == 5)
-				tests[hits].modulation = DEMOD_FSK1a;
-			else if (fc1==10 && fc2 == 8)
-				tests[hits].modulation = DEMOD_FSK2;
-			tests[hits].bitrate = bitRate;
-			tests[hits].inverted = false;
-			tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
-			tests[hits].ST = false;
-			++hits;
-		}
-		if ( FSKrawDemod("0 1", false) && test(DEMOD_FSK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
-			tests[hits].modulation = DEMOD_FSK;
-			if (fc1 == 8 && fc2 == 5)
-				tests[hits].modulation = DEMOD_FSK1;
-			else if (fc1 == 10 && fc2 == 8)
-				tests[hits].modulation = DEMOD_FSK2a;
-			tests[hits].bitrate = bitRate;
-			tests[hits].inverted = true;
-			tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
-			tests[hits].ST = false;
-			++hits;
-		}
-	} else {
-		clk = GetAskClock("", false);
-		if (clk > 0) {
-			tests[hits].ST = true;
-			// "0 0 1 " == clock auto, invert false, maxError 1.
-			// false = no verbose
-			// false = no emSearch
-			// 1 = Ask/Man
-			// st = true
-			if ( ASKDemod_ext("0 0 1", false, false, 1, &tests[hits].ST) && test(DEMOD_ASK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
-				tests[hits].modulation = DEMOD_ASK;
-				tests[hits].bitrate = bitRate;
-				tests[hits].inverted = false;
-				tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
-				++hits;
-			}
-			tests[hits].ST = true;
-			// "0 0 1 " == clock auto, invert true, maxError 1.
-			// false = no verbose
-			// false = no emSearch
-			// 1 = Ask/Man
-			// st = true
-			if ( ASKDemod_ext("0 1 1", false, false, 1, &tests[hits].ST)  && test(DEMOD_ASK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
-				tests[hits].modulation = DEMOD_ASK;
-				tests[hits].bitrate = bitRate;
-				tests[hits].inverted = true;
-				tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
-				++hits;
-			}
-			if ( ASKbiphaseDemod("0 0 0 2", false) && test(DEMOD_BI, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5) ) {
-				tests[hits].modulation = DEMOD_BI;
-				tests[hits].bitrate = bitRate;
-				tests[hits].inverted = false;
-				tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
-				tests[hits].ST = false;
-				++hits;
-			}
-			if ( ASKbiphaseDemod("0 0 1 2", false) && test(DEMOD_BIa, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5) ) {
-				tests[hits].modulation = DEMOD_BIa;
-				tests[hits].bitrate = bitRate;
-				tests[hits].inverted = true;
-				tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
-				tests[hits].ST = false;
-				++hits;
-			}
-		}
-		clk = GetNrzClock("", false);
-		if (clk > 8) { //clock of rf/8 is likely a false positive, so don't use it.
-			if ( NRZrawDemod("0 0 1", false)  && test(DEMOD_NRZ, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
-				tests[hits].modulation = DEMOD_NRZ;
-				tests[hits].bitrate = bitRate;
-				tests[hits].inverted = false;
-				tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
-				tests[hits].ST = false;
-				++hits;
-			}
-
-			if ( NRZrawDemod("0 1 1", false)  && test(DEMOD_NRZ, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
-				tests[hits].modulation = DEMOD_NRZ;
-				tests[hits].bitrate = bitRate;
-				tests[hits].inverted = true;
-				tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
-				tests[hits].ST = false;
-				++hits;
-			}
-		}
-		
-		clk = GetPskClock("", false);
-		if (clk > 0) {
-			// allow undo
-			save_restoreGB(GRAPH_SAVE);
-			// skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)
-			CmdLtrim("160");
-			if ( PSKDemod("0 0 6", false) && test(DEMOD_PSK1, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
-				tests[hits].modulation = DEMOD_PSK1;
-				tests[hits].bitrate = bitRate;
-				tests[hits].inverted = false;
-				tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
-				tests[hits].ST = false;
-				++hits;
-			}
-			if ( PSKDemod("0 1 6", false) && test(DEMOD_PSK1, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
-				tests[hits].modulation = DEMOD_PSK1;
-				tests[hits].bitrate = bitRate;
-				tests[hits].inverted = true;
-				tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
-				tests[hits].ST = false;
-				++hits;
-			}
-			//ICEMAN: are these PSKDemod calls needed?
-			// PSK2 - needs a call to psk1TOpsk2.
-			if ( PSKDemod("0 0 6", false)) {
-				psk1TOpsk2(DemodBuffer, DemodBufferLen);
-				if (test(DEMOD_PSK2, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)){
-					tests[hits].modulation = DEMOD_PSK2;
-					tests[hits].bitrate = bitRate;
-					tests[hits].inverted = false;
-					tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
-					tests[hits].ST = false;
-					++hits;
-				}
-			} // inverse waves does not affect this demod
-			// PSK3 - needs a call to psk1TOpsk2.
-			if ( PSKDemod("0 0 6", false)) {
-				psk1TOpsk2(DemodBuffer, DemodBufferLen);
-				if (test(DEMOD_PSK3, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)){
-					tests[hits].modulation = DEMOD_PSK3;
-					tests[hits].bitrate = bitRate;
-					tests[hits].inverted = false;
-					tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
-					tests[hits].ST = false;
-					++hits;
-				}
-			} // inverse waves does not affect this demod
-		//undo trim samples
-			save_restoreGB(GRAPH_RESTORE);
-		}
-	}		
-	if ( hits == 1) {
-		config.modulation = tests[0].modulation;
-		config.bitrate = tests[0].bitrate;
-		config.inverted = tests[0].inverted;
-		config.offset = tests[0].offset;
-		config.block0 = tests[0].block0;
-		config.Q5 = tests[0].Q5;
-		config.ST = tests[0].ST;
-		printConfiguration( config );
-		return true;
-	}
-	
-	bool retval = false;
-	if ( hits > 1) {
-		PrintAndLogEx(SUCCESS, "Found [%d] possible matches for modulation.", hits);
-		for(int i=0; i<hits; ++i){
-			retval = testKnownConfigBlock(tests[i].block0);
-			if ( retval ) {				
-				PrintAndLogEx(NORMAL, "--[%d]--------------- << selected this", i+1);
-				config.modulation = tests[i].modulation;
-				config.bitrate = tests[i].bitrate;
-				config.inverted = tests[i].inverted;
-				config.offset = tests[i].offset;
-				config.block0 = tests[i].block0;
-				config.Q5 = tests[i].Q5;
-				config.ST = tests[i].ST;
-			} else {
-				PrintAndLogEx(NORMAL, "--[%d]---------------", i+1);
-			}
-			printConfiguration( tests[i] );
-		}
-	}
-	return retval;
-}
-
-bool testKnownConfigBlock(uint32_t block0) {
-	switch(block0){
-		case T55X7_DEFAULT_CONFIG_BLOCK:
-		case T55X7_RAW_CONFIG_BLOCK:
-		case T55X7_EM_UNIQUE_CONFIG_BLOCK:
-		case T55X7_FDXB_CONFIG_BLOCK:
-		case T55X7_HID_26_CONFIG_BLOCK:
-		case T55X7_PYRAMID_CONFIG_BLOCK:
-		case T55X7_INDALA_64_CONFIG_BLOCK:
-		case T55X7_INDALA_224_CONFIG_BLOCK:
-		case T55X7_GUARDPROXII_CONFIG_BLOCK:
-		case T55X7_VIKING_CONFIG_BLOCK:
-		case T55X7_NORALYS_CONFIG_BLOCK:
-		case T55X7_IOPROX_CONFIG_BLOCK:
-		case T55X7_PRESCO_CONFIG_BLOCK:
-			return true;
-	}
-	return false;
-}
-
-bool testModulation(uint8_t mode, uint8_t modread){
-	switch( mode ){
-		case DEMOD_FSK:
-			if (modread >= DEMOD_FSK1 && modread <= DEMOD_FSK2a) return true;
-			break;
-		case DEMOD_ASK:
-			if (modread == DEMOD_ASK) return true;
-			break;
-		case DEMOD_PSK1:
-			if (modread == DEMOD_PSK1) return true;
-			break;
-		case DEMOD_PSK2:
-			if (modread == DEMOD_PSK2) return true;
-			break;
-		case DEMOD_PSK3:
-			if (modread == DEMOD_PSK3) return true;
-			break;
-		case DEMOD_NRZ:
-			if (modread == DEMOD_NRZ) return true;
-			break;
-		case DEMOD_BI:
-			if (modread == DEMOD_BI) return true;
-			break;
-		case DEMOD_BIa:
-			if (modread == DEMOD_BIa) return true;
-			break;		
-		default:
-			return false;
-	}
-	return false;
-}
-
-bool testQ5Modulation(uint8_t	mode, uint8_t	modread){
-	switch( mode ){
-		case DEMOD_FSK:
-			if (modread >= 4 && modread <= 5) return true;
-			break;
-		case DEMOD_ASK:
-			if (modread == 0) return true;
-			break;
-		case DEMOD_PSK1:
-			if (modread == 1) return true;
-			break;
-		case DEMOD_PSK2:
-			if (modread == 2) return true;
-			break;
-		case DEMOD_PSK3:
-			if (modread == 3) return true;
-			break;
-		case DEMOD_NRZ:
-			if (modread == 7) return true;
-			break;
-		case DEMOD_BI:
-			if (modread == 6) return true;
-			break;
-		default:
-			return false;
-	}
-	return false;
-}
-
-int convertQ5bitRate(uint8_t bitRateRead) {
-	uint8_t expected[] = {8, 16, 32, 40, 50, 64, 100, 128};
-	for (int i=0; i<8; i++)
-		if (expected[i] == bitRateRead)
-			return i;
-
-	return -1;
-}
-
-bool testQ5(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t	clk){
-
-	if ( DemodBufferLen < 64 ) return false;
-	uint8_t si = 0;
-	for (uint8_t idx = 28; idx < 64; idx++){
-		si = idx;
-		if ( PackBits(si, 28, DemodBuffer) == 0x00 ) continue;
-
-		uint8_t safer     = PackBits(si, 4, DemodBuffer); si += 4;     //master key
-		uint8_t resv      = PackBits(si, 8, DemodBuffer); si += 8;
-		// 2nibble must be zeroed.
-		if (safer != 0x6 && safer != 0x9) continue;
-		if ( resv > 0x00) continue;
-		//uint8_t	pageSel   = PackBits(si, 1, DemodBuffer); si += 1;
-		//uint8_t fastWrite = PackBits(si, 1, DemodBuffer); si += 1;
-		si += 1+1;
-		int bitRate       = PackBits(si, 6, DemodBuffer)*2 + 2; si += 6;     //bit rate
-		if (bitRate > 128 || bitRate < 8) continue;
-
-		//uint8_t AOR       = PackBits(si, 1, DemodBuffer); si += 1;   
-		//uint8_t PWD       = PackBits(si, 1, DemodBuffer); si += 1; 
-		//uint8_t pskcr     = PackBits(si, 2, DemodBuffer); si += 2;  //could check psk cr
-		//uint8_t inverse   = PackBits(si, 1, DemodBuffer); si += 1;
-		si += 1+1+2+1;
-		uint8_t modread   = PackBits(si, 3, DemodBuffer); si += 3;
-		uint8_t maxBlk    = PackBits(si, 3, DemodBuffer); si += 3;
-		//uint8_t ST        = PackBits(si, 1, DemodBuffer); si += 1;
-		if (maxBlk == 0) continue;
-		//test modulation
-		if (!testQ5Modulation(mode, modread)) continue;
-		if (bitRate != clk) continue;
-		*fndBitRate = convertQ5bitRate(bitRate);
-		if (*fndBitRate < 0) continue;
-		*offset = idx;
-
-		return true;
-	}
-	return false;
-}
-
-bool testBitRate(uint8_t readRate, uint8_t clk){
-	uint8_t expected[] = {8, 16, 32, 40, 50, 64, 100, 128};
-	if (expected[readRate] == clk)
-		return true;
-
-	return false;
-}
-
-bool test(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk, bool *Q5){
-
-	if ( DemodBufferLen < 64 ) return false;
-	uint8_t si = 0;
-	for (uint8_t idx = 28; idx < 64; idx++){
-		si = idx;
-		if ( PackBits(si, 28, DemodBuffer) == 0x00 ) continue;
-
-		uint8_t safer    = PackBits(si, 4, DemodBuffer); si += 4;     //master key
-		uint8_t resv     = PackBits(si, 4, DemodBuffer); si += 4;     //was 7 & +=7+3 //should be only 4 bits if extended mode
-		// 2nibble must be zeroed.
-		// moved test to here, since this gets most faults first.
-		if ( resv > 0x00) continue;
-
-		int bitRate      = PackBits(si, 6, DemodBuffer); si += 6;     //bit rate (includes extended mode part of rate)
-		uint8_t extend   = PackBits(si, 1, DemodBuffer); si += 1;     //bit 15 extended mode
-		uint8_t modread  = PackBits(si, 5, DemodBuffer); si += 5+2+1; 
-		//uint8_t pskcr   = PackBits(si, 2, DemodBuffer); si += 2+1;  //could check psk cr
-		//uint8_t nml01    = PackBits(si, 1, DemodBuffer); si += 1+5;   //bit 24, 30, 31 could be tested for 0 if not extended mode
-		//uint8_t nml02    = PackBits(si, 2, DemodBuffer); si += 2;
-		
-		//if extended mode
-		bool extMode =( (safer == 0x6 || safer == 0x9) && extend) ? true : false;
-
-		if (!extMode){
-			if (bitRate > 7) continue;
-			if (!testBitRate(bitRate, clk)) continue;
-		} else { //extended mode bitrate = same function to calc bitrate as em4x05
-			if (EM4x05_GET_BITRATE(bitRate) != clk) continue;
-
-		}
-		//test modulation
-		if (!testModulation(mode, modread)) continue;
-		*fndBitRate = bitRate;
-		*offset = idx;
-		*Q5 = false;
-		return true;
-	}
-	if (testQ5(mode, offset, fndBitRate, clk)) {
-		*Q5 = true;
-		return true;
-	}
-	return false;
-}
-
-void printT55xxBlock(const char *blockNum){
-	
-	uint8_t i = config.offset;
-	uint8_t endpos = 32 + i;
-	uint32_t blockData = 0;
-	uint8_t bits[64] = {0x00};
-
-	if ( !DemodBufferLen) return;
-
-	if ( endpos > DemodBufferLen){
-		PrintAndLogEx(NORMAL, "The configured offset %d is too big. Possible offset: %d)", i, DemodBufferLen-32);
-		return;
-	}
-
-	for (; i < endpos; ++i)
-		bits[i - config.offset] = DemodBuffer[i];
-
-	blockData = PackBits(0, 32, bits);
-	uint8_t bytes[4] = {0};
-	num_to_bytes(blockData, 4, bytes);
-
-	PrintAndLogEx(NORMAL, " %s | %08X | %s | %s", blockNum, blockData, sprint_bin(bits,32), sprint_ascii(bytes,4));
-}
-
-int special(const char *Cmd) {
-	uint32_t blockData = 0;
-	uint8_t bits[32] = {0x00};
-
-	PrintAndLogEx(NORMAL, "OFFSET | DATA  | BINARY                              | ASCII");
-	PrintAndLogEx(NORMAL, "-------+-------+-------------------------------------+------");
-	int i,j = 0;
-	for (; j < 64; ++j){
-		
-		for (i = 0; i < 32; ++i)
-			bits[i]=DemodBuffer[j+i];
-	
-		blockData = PackBits(0, 32, bits);
-		
-		PrintAndLogEx(NORMAL, "%02d | 0x%08X | %s",j , blockData, sprint_bin(bits,32));	
-	}
-	return 0;
-}
-
-int printConfiguration( t55xx_conf_block_t b){
-	PrintAndLogEx(NORMAL, "Chip Type  : %s", (b.Q5) ? "T5555(Q5)" : "T55x7");
-	PrintAndLogEx(NORMAL, "Modulation : %s", GetSelectedModulationStr(b.modulation) );
-	PrintAndLogEx(NORMAL, "Bit Rate   : %s", GetBitRateStr(b.bitrate, (b.block0 & T55x7_X_MODE && (b.block0>>28==6 || b.block0>>28==9))) );
-	PrintAndLogEx(NORMAL, "Inverted   : %s", (b.inverted) ? _GREEN_(Yes) : "No" );
-	PrintAndLogEx(NORMAL, "Offset     : %d", b.offset);
-	PrintAndLogEx(NORMAL, "Seq. Term. : %s", (b.ST) ? _GREEN_(Yes) : "No" );
-	PrintAndLogEx(NORMAL, "Block0     : 0x%08X", b.block0);
-	PrintAndLogEx(NORMAL, "");
-	return 0;
-}
-
-int CmdT55xxWakeUp(const char *Cmd) {
-	uint32_t password = 0;
-	uint8_t cmdp = 0;
-	bool errors = false;
-	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch (tolower(param_getchar(Cmd, cmdp))) {
-		case 'h':
-			return usage_t55xx_wakup();
-		case 'p':
-			password = param_get32ex(Cmd, cmdp+1, 0, 16);
-			cmdp += 2;
-			errors = false;
-			break;
-		default:
-			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-			errors = true;
-			break;
-		}
-	}
-	if (errors) return usage_t55xx_wakup();
-
-	UsbCommand c = {CMD_T55XX_WAKEUP, {password, 0, 0}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	PrintAndLogEx(SUCCESS, "Wake up command sent. Try read now");
-	return 0;
-}
-
-int CmdT55xxWriteBlock(const char *Cmd) {
-	uint8_t block = 0xFF; //default to invalid block
-	uint32_t data = 0; //default to blank Block 
-	uint32_t password = 0; //default to blank Block 7
-	bool usepwd = false;
-	bool page1 = false;	
-	bool gotdata = false;
-	bool testMode = false;
-	bool errors = false;
-	uint8_t cmdp = 0;
-	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch (tolower(param_getchar(Cmd, cmdp))) {
-		case 'h':
-			return usage_t55xx_write();
-		case 'b':
-			errors |= param_getdec(Cmd, cmdp+1, &block);
-			cmdp += 2;
-			break;
-		case 'd':
-			data = param_get32ex(Cmd, cmdp+1, 0, 16);
-			gotdata	= true;
-			cmdp += 2;
-			break;
-		case 'p':
-			password = param_get32ex(Cmd, cmdp+1, 0, 16);
-			usepwd = true;
-			cmdp += 2;
-			break;
-		case 't':
-			testMode = true;
-			cmdp++;
-			break;
-		case '1':
-			page1 = true;
-			cmdp++;
-			break;
-		default:
-			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-			errors = true;
-			break;
-		}
-	}
-	if (errors || !gotdata) return usage_t55xx_write();
-
-	if (block > 7) {
-		PrintAndLogEx(WARNING, "Block number must be between 0 and 7");
-		return 0;
-	}
-	
-	UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {data, block, 0}};
-	UsbCommand resp;
- 	c.d.asBytes[0] = (page1) ? 0x2 : 0; 
- 	c.d.asBytes[0] |= (testMode) ? 0x4 : 0; 
-
-	char pwdStr[16] = {0};
-	snprintf(pwdStr, sizeof(pwdStr), "pwd: 0x%08X", password);
-	
-	PrintAndLogEx(INFO, "Writing page %d  block: %02d  data: 0x%08X %s", page1, block, data,  (usepwd) ? pwdStr : "" );
-
-	//Password mode
-	if (usepwd) {
-		c.arg[2] = password;
-		c.d.asBytes[0] |= 0x1; 
-	}
-	clearCommandBuffer();
-	SendCommand(&c);
-	if ( !WaitForResponseTimeout(CMD_ACK, &resp, 1500 )){
-		PrintAndLogEx(WARNING, "Error occurred, device did not ACK write operation. (May be due to old firmware)");
-		return 0;
-	}
-	return 1;
-}
-
-int CmdT55xxReadTrace(const char *Cmd) {
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if (strlen(Cmd) > 1 || cmdp == 'h') return usage_t55xx_trace();
-
-	bool pwdmode = false;
-	uint32_t password = 0;
-	
-	if (strlen(Cmd) == 0) {
-		// sanity check.
-		if (!SanityOfflineCheck(false)) return 1;
-
-		if ( !AquireData( T55x7_PAGE1, REGULAR_READ_MODE_BLOCK, pwdmode, password ) )
-			return 1;
-	}
-
-	if ( config.Q5 ){
-		if (!DecodeT5555TraceBlock()) return 1;
-	} else {
-		if (!DecodeT55xxBlock()) return 1;
-	}
-	
-	if ( !DemodBufferLen ) return 1;
-	
-	RepaintGraphWindow();
-	uint8_t repeat = (config.offset > 5) ? 32 : 0;
-	
-	uint8_t si = config.offset + repeat;
-	uint32_t bl1 = PackBits(si, 32, DemodBuffer);
-	uint32_t bl2 = PackBits(si+32, 32, DemodBuffer);	
-	
-	if (config.Q5) {
-		uint32_t hdr = PackBits(si, 9,  DemodBuffer); si += 9;
-    
-		if (hdr != 0x1FF) {
-		  PrintAndLogEx(FAILED, "Invalid Q5 Trace data header (expected 0x1FF, found %X)", hdr);
-		  return 1;
-		}
-    
-		t5555_tracedata_t data = {.bl1 = bl1, .bl2 = bl2, .icr = 0, .lotidc = '?', .lotid = 0, .wafer = 0, .dw =0};
-			
-		data.icr     = PackBits(si, 2,  DemodBuffer); si += 2;
-		data.lotidc  = 'Z' - PackBits(si, 2,  DemodBuffer); si += 3;
-		
-		data.lotid   = PackBits(si, 4,  DemodBuffer); si += 5;
-		data.lotid <<= 4;
-		data.lotid  |= PackBits(si, 4,  DemodBuffer); si += 5;
-		data.lotid <<= 4;
-		data.lotid  |= PackBits(si, 4,  DemodBuffer); si += 5;
-		data.lotid <<= 4;
-		data.lotid  |= PackBits(si, 4,  DemodBuffer); si += 5;
-		data.lotid <<= 1;
-		data.lotid  |= PackBits(si, 1,  DemodBuffer); si += 1;
-		
-		data.wafer   = PackBits(si, 3,  DemodBuffer); si += 4;
-		data.wafer <<= 2;
-		data.wafer  |= PackBits(si, 2,  DemodBuffer); si += 2;
-		
-		data.dw      = PackBits(si, 2,  DemodBuffer); si += 3;
-		data.dw    <<= 4;
-		data.dw     |= PackBits(si, 4,  DemodBuffer); si += 5;
-		data.dw    <<= 4;
-		data.dw     |= PackBits(si, 4,  DemodBuffer); si += 5;
-		data.dw    <<= 4;
-		data.dw     |= PackBits(si, 4,  DemodBuffer); si += 5;
-	
-		printT5555Trace(data, repeat);
-		
-	} else {
-	
-		t55x7_tracedata_t data = {.bl1 = bl1, .bl2 = bl2, .acl = 0, .mfc = 0, .cid = 0, .year = 0, .quarter = 0, .icr = 0,  .lotid = 0, .wafer = 0, .dw = 0};
-		
-		data.acl = PackBits(si, 8,  DemodBuffer); si += 8;
-		if ( data.acl != 0xE0 ) {
-			PrintAndLogEx(FAILED, "The modulation is most likely wrong since the ACL is not 0xE0. ");
-			return 1;
-		}
-
-		data.mfc     = PackBits(si, 8,  DemodBuffer); si += 8;
-		data.cid     = PackBits(si, 5,  DemodBuffer); si += 5;
-		data.icr     = PackBits(si, 3,  DemodBuffer); si += 3;
-		data.year    = PackBits(si, 4,  DemodBuffer); si += 4;
-		data.quarter = PackBits(si, 2,  DemodBuffer); si += 2;
-		data.lotid   = PackBits(si, 14, DemodBuffer); si += 14;
-		data.wafer   = PackBits(si, 5,  DemodBuffer); si += 5;
-		data.dw      = PackBits(si, 15, DemodBuffer); 
-
-		time_t t = time(NULL);
-		struct tm tm = *localtime(&t);
-		if ( data.year > tm.tm_year-110)
-			data.year += 2000;
-		else
-			data.year += 2010;
-
-		printT55x7Trace(data, repeat);
-	}
-	return 0;
-}
-
-void printT55x7Trace( t55x7_tracedata_t data, uint8_t repeat ){
-	PrintAndLogEx(NORMAL, "-- T55x7 Trace Information ----------------------------------");
-	PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
-	PrintAndLogEx(NORMAL, " ACL Allocation class (ISO/IEC 15963-1)  : 0x%02X (%d)", data.acl, data.acl);
-	PrintAndLogEx(NORMAL, " MFC Manufacturer ID (ISO/IEC 7816-6)    : 0x%02X (%d) - %s", data.mfc, data.mfc, getTagInfo(data.mfc));
-	PrintAndLogEx(NORMAL, " CID                                     : 0x%02X (%d) - %s", data.cid, data.cid, GetModelStrFromCID(data.cid));
-	PrintAndLogEx(NORMAL, " ICR IC Revision                         : %d", data.icr );
-	PrintAndLogEx(NORMAL, " Manufactured");
-	PrintAndLogEx(NORMAL, "     Year/Quarter : %d/%d", data.year, data.quarter);
-	PrintAndLogEx(NORMAL, "     Lot ID       : %d", data.lotid );
-	PrintAndLogEx(NORMAL, "     Wafer number : %d", data.wafer);
-	PrintAndLogEx(NORMAL, "     Die Number   : %d", data.dw);
-	PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
-	PrintAndLogEx(NORMAL, " Raw Data - Page 1");
-	PrintAndLogEx(NORMAL, "     Block 1  : 0x%08X  %s", data.bl1, sprint_bin(DemodBuffer+config.offset+repeat,32) );
-	PrintAndLogEx(NORMAL, "     Block 2  : 0x%08X  %s", data.bl2, sprint_bin(DemodBuffer+config.offset+repeat+32,32) );
-	PrintAndLogEx(NORMAL, "-------------------------------------------------------------");	
-
-	/*
-	TRACE - BLOCK O
-		Bits	Definition								HEX
-		1-8		ACL Allocation class (ISO/IEC 15963-1)	0xE0 
-		9-16	MFC Manufacturer ID (ISO/IEC 7816-6)	0x15 Atmel Corporation
-		17-21	CID										0x1 = Atmel ATA5577M1  0x2 = Atmel ATA5577M2 
-		22-24	ICR IC revision
-		25-28	YEAR (BCD encoded) 						9 (= 2009)
-		29-30	QUARTER									1,2,3,4 
-		31-32	LOT ID
-	
-	TRACE - BLOCK 1
-		1-12	LOT ID  
-		13-17	Wafer number
-		18-32	DW,  die number sequential
-	*/
-}
-
-void printT5555Trace( t5555_tracedata_t data, uint8_t repeat ){
-	PrintAndLogEx(NORMAL, "-- T5555 (Q5) Trace Information -----------------------------");
-	PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
-	PrintAndLogEx(NORMAL, " ICR IC Revision  : %d", data.icr );	
-	PrintAndLogEx(NORMAL, "     Lot          : %c%d", data.lotidc, data.lotid);
-	PrintAndLogEx(NORMAL, "     Wafer number : %d", data.wafer);
-	PrintAndLogEx(NORMAL, "     Die Number   : %d", data.dw);
-	PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
-	PrintAndLogEx(NORMAL, " Raw Data - Page 1");
-	PrintAndLogEx(NORMAL, "     Block 1  : 0x%08X  %s", data.bl1, sprint_bin(DemodBuffer+config.offset+repeat,32) );
-	PrintAndLogEx(NORMAL, "     Block 2  : 0x%08X  %s", data.bl2, sprint_bin(DemodBuffer+config.offset+repeat+32,32) );
-	
-	/*
-		** Q5 **
-		TRACE - BLOCK O and BLOCK1
-		Bits	Definition				HEX
-		1-9		Header                  0x1FF
-		10-11 IC Revision
-		12-13 Lot ID char
-		15-35 Lot ID (NB parity)
-		36-41 Wafer number (NB parity)
-		42-58 DW, die number sequential (NB parity)
-		60-63 Parity bits
-		64    Always zero
-	*/
-}
-
-//need to add Q5 info...
-int CmdT55xxInfo(const char *Cmd){
-	/*
-		Page 0 Block 0 Configuration data.
-		Normal mode
-		Extended mode
-	*/
-	bool pwdmode = false;
-	uint32_t password = 0;
-	char cmdp = tolower(param_getchar(Cmd, 0));
-
-	if (strlen(Cmd) > 1 || cmdp == 'h') return usage_t55xx_info();
-	
-	if (strlen(Cmd) == 0) {
-		// sanity check.
-		if (!SanityOfflineCheck(false)) return 1;
-		
-		if ( !AquireData( T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, pwdmode, password ) )
-			return 1;
-	}
-
-	if (!DecodeT55xxBlock()) return 1;
-
-	// too little space to start with
-	if ( DemodBufferLen < 32) return 1;
-
-	// 
-	//PrintAndLogEx(NORMAL, "Offset+32 ==%d\n DemodLen == %d", config.offset + 32, DemodBufferLen);
-
-	uint8_t si = config.offset;
-	uint32_t block0   = PackBits(si, 32, DemodBuffer);	
-	uint32_t safer    = PackBits(si, 4, DemodBuffer); si += 4;	
-	uint32_t resv     = PackBits(si, 7, DemodBuffer); si += 7;
-	uint32_t dbr      = PackBits(si, 3, DemodBuffer); si += 3;
-	uint32_t extend   = PackBits(si, 1, DemodBuffer); si += 1;
-	uint32_t datamod  = PackBits(si, 5, DemodBuffer); si += 5;
-	uint32_t pskcf    = PackBits(si, 2, DemodBuffer); si += 2;
-	uint32_t aor      = PackBits(si, 1, DemodBuffer); si += 1;	
-	uint32_t otp      = PackBits(si, 1, DemodBuffer); si += 1;	
-	uint32_t maxblk   = PackBits(si, 3, DemodBuffer); si += 3;
-	uint32_t pwd      = PackBits(si, 1, DemodBuffer); si += 1;	
-	uint32_t sst      = PackBits(si, 1, DemodBuffer); si += 1;	
-	uint32_t fw       = PackBits(si, 1, DemodBuffer); si += 1;
-	uint32_t inv      = PackBits(si, 1, DemodBuffer); si += 1;	
-	uint32_t por      = PackBits(si, 1, DemodBuffer); si += 1;
-	
-	if (config.Q5) 
-		PrintAndLogEx(NORMAL, _RED_(*** Warning ***) " Config Info read off a Q5 will not display as expected");
-	
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "-- T55x7 Configuration & Tag Information --------------------");
-	PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
-	PrintAndLogEx(NORMAL, " Safer key                 : %s", GetSaferStr(safer));
-	PrintAndLogEx(NORMAL, " reserved                  : %d", resv);
-	PrintAndLogEx(NORMAL, " Data bit rate             : %s", GetBitRateStr(dbr, extend));
-	PrintAndLogEx(NORMAL, " eXtended mode             : %s", (extend) ? _YELLOW_(Yes - Warning) : "No");
-	PrintAndLogEx(NORMAL, " Modulation                : %s", GetModulationStr(datamod));
-	PrintAndLogEx(NORMAL, " PSK clock frequency       : %d", pskcf);
-	PrintAndLogEx(NORMAL, " AOR - Answer on Request   : %s", (aor) ? _GREEN_(Yes) : "No");
-	PrintAndLogEx(NORMAL, " OTP - One Time Pad        : %s", (otp) ? _YELLOW_(Yes - Warning) : "No" );
-	PrintAndLogEx(NORMAL, " Max block                 : %d", maxblk);
-	PrintAndLogEx(NORMAL, " Password mode             : %s", (pwd) ? _GREEN_(Yes) : "No");
-	PrintAndLogEx(NORMAL, " Sequence Start Terminator : %s", (sst) ? _GREEN_(Yes) : "No");
-	PrintAndLogEx(NORMAL, " Fast Write                : %s", (fw)  ? _GREEN_(Yes) : "No");
-	PrintAndLogEx(NORMAL, " Inverse data              : %s", (inv) ? _GREEN_(Yes) : "No");
-	PrintAndLogEx(NORMAL, " POR-Delay                 : %s", (por) ? _GREEN_(Yes) : "No");
-	PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
-	PrintAndLogEx(NORMAL, " Raw Data - Page 0");
-	PrintAndLogEx(NORMAL, "     Block 0  : 0x%08X  %s", block0, sprint_bin(DemodBuffer + config.offset, 32) );
-	PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
-	return 0;
-}
-
-int CmdT55xxDump(const char *Cmd){
-
-	uint32_t password = 0;
-	bool override = false;
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if ( cmdp == 'h') return usage_t55xx_dump();
-
-	bool usepwd = ( strlen(Cmd) > 0);	
-	if ( usepwd ){
-		password = param_get32ex(Cmd, 0, 0, 16);
-		if (param_getchar(Cmd, 1) =='o' )
-			override = true;
-	}
-	
-	printT5xxHeader(0);
-	for ( uint8_t i = 0; i < 8; ++i)
-		T55xxReadBlock(i, 0, usepwd, override, password);
-
-	printT5xxHeader(1);
-	for ( uint8_t	i = 0; i < 4; i++)
-		T55xxReadBlock(i, 1, usepwd, override, password);		
-
-	return 1;
-}
-
-bool AquireData( uint8_t page, uint8_t block, bool pwdmode, uint32_t password ) {
-	// arg0 bitmodes:
-	// 	bit0 = pwdmode
-	// 	bit1 = page to read from
-	// arg1: which block to read
-	// arg2: password
-	uint8_t arg0 = (page<<1) | pwdmode;
-	UsbCommand c = {CMD_T55XX_READ_BLOCK, {arg0, block, password}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	if ( !WaitForResponseTimeout(CMD_ACK, NULL, 2500) ) {
-		PrintAndLogEx(WARNING, "command execution time out");
-		return false;
-	}
-
-	uint8_t got[8000];
-	if ( !GetFromDevice(BIG_BUF, got, sizeof(got), 0, NULL, 4000, true)) {
-		PrintAndLogEx(WARNING, "command execution time out");
-		return false;
-	}
-	setGraphBuf(got, sizeof(got));
-	// set signal properties low/high/mean/amplitude and is_noise detection
-	computeSignalProperties(got, sizeof(got));
-	RepaintGraphWindow();
-	return !getSignalProperties()->isnoise;
-}
-
-char * GetBitRateStr(uint32_t id, bool xmode) {
- 	static char buf[25];
-
-	char *retStr = buf;
-	if (xmode) { //xmode bitrate calc is same as em4x05 calc
-		snprintf(retStr,sizeof(buf),"%d - RF/%d", id, EM4x05_GET_BITRATE(id));
-	} else {
-		switch (id){
-		case 0:   snprintf(retStr,sizeof(buf),"%d - RF/8",id);   break;
-		case 1:   snprintf(retStr,sizeof(buf),"%d - RF/16",id);  break;
-		case 2:   snprintf(retStr,sizeof(buf),"%d - RF/32",id);  break;
-		case 3:   snprintf(retStr,sizeof(buf),"%d - RF/40",id);  break;
-		case 4:   snprintf(retStr,sizeof(buf),"%d - RF/50",id);  break;
-		case 5:   snprintf(retStr,sizeof(buf),"%d - RF/64",id);  break;
-		case 6:   snprintf(retStr,sizeof(buf),"%d - RF/100",id); break;
-		case 7:   snprintf(retStr,sizeof(buf),"%d - RF/128",id); break;
-		default:  snprintf(retStr,sizeof(buf),"%d - (Unknown)",id); break;
-		}
-	}
-	return buf;
-}
-
-char * GetSaferStr(uint32_t id){
-	static char buf[40];
-	char *retStr = buf;
-	
-	snprintf(retStr,sizeof(buf),"%d",id);
-	if (id == 6) {
-		snprintf(retStr,sizeof(buf),"%d - passwd",id);
-	}
-	if (id == 9 ){
-		snprintf(retStr,sizeof(buf),"%d - testmode",id);
-	}
-	
-	return buf;
-}
-
-char * GetModulationStr( uint32_t id){
-	static char buf[60];
-	char *retStr = buf;
-	
-	switch (id){
-		case 0: snprintf(retStr,sizeof(buf),"%d - DIRECT (ASK/NRZ)",id); break;
-		case 1:	snprintf(retStr,sizeof(buf),"%d - PSK 1 phase change when input changes",id); break;
-		case 2:	snprintf(retStr,sizeof(buf),"%d - PSK 2 phase change on bitclk if input high",id); break;
-		case 3:	snprintf(retStr,sizeof(buf),"%d - PSK 3 phase change on rising edge of input",id); break;
-		case 4:	snprintf(retStr,sizeof(buf),"%d - FSK 1 RF/8  RF/5",id); break;
-		case 5:	snprintf(retStr,sizeof(buf),"%d - FSK 2 RF/8  RF/10",id); break;
-		case 6:	snprintf(retStr,sizeof(buf),"%d - FSK 1a RF/5  RF/8",id); break;
-		case 7: snprintf(retStr,sizeof(buf),"%d - FSK 2a RF/10  RF/8",id); break;
-		case 8:	snprintf(retStr,sizeof(buf),"%d - Manchester",id); break;
-		case 16: snprintf(retStr,sizeof(buf),"%d - Biphase",id); break;
-		case 0x18:snprintf(retStr,sizeof(buf),"%d - Biphase a - AKA Conditional Dephase Encoding(CDP)",id); break;
-		case 17: snprintf(retStr,sizeof(buf),"%d - Reserved",id); break;
-		default: snprintf(retStr,sizeof(buf),"0x%02X (Unknown)",id); break;
-		}
-	return buf;
-}
-
-char * GetModelStrFromCID(uint32_t cid){
-		
-	static char buf[10];
-	char *retStr = buf;
-	
-	if (cid == 1) snprintf(retStr, sizeof(buf),"ATA5577M1");
-	if (cid == 2) snprintf(retStr, sizeof(buf),"ATA5577M2");	
-	return buf;
-}
-
-char * GetSelectedModulationStr( uint8_t id){
-
-	static char buf[20];
-	char *retStr = buf;
-
-	switch (id){
-		case DEMOD_FSK:	snprintf(retStr,sizeof(buf),"FSK");	break;
-		case DEMOD_FSK1: snprintf(retStr,sizeof(buf),"FSK1"); break;
-		case DEMOD_FSK1a: snprintf(retStr,sizeof(buf),"FSK1a"); break;
-		case DEMOD_FSK2: snprintf(retStr,sizeof(buf),"FSK2"); break;
-		case DEMOD_FSK2a: snprintf(retStr,sizeof(buf),"FSK2a"); break;
-		case DEMOD_ASK: snprintf(retStr,sizeof(buf),"ASK"); break;
-		case DEMOD_NRZ: snprintf(retStr,sizeof(buf),"DIRECT/NRZ"); break;
-		case DEMOD_PSK1: snprintf(retStr,sizeof(buf),"PSK1"); break;
-		case DEMOD_PSK2: snprintf(retStr,sizeof(buf),"PSK2"); break;
-		case DEMOD_PSK3: snprintf(retStr,sizeof(buf),"PSK3"); break;
-		case DEMOD_BI: snprintf(retStr,sizeof(buf),"BIPHASE"); break;
-		case DEMOD_BIa: snprintf(retStr,sizeof(buf),"BIPHASEa - (CDP)"); break;
-		default: snprintf(retStr,sizeof(buf),"(Unknown)"); break;
-		}
-	return buf;
-}
-
-void t55x7_create_config_block( int tagtype ){
-
-	/*
-     T55X7_DEFAULT_CONFIG_BLOCK, T55X7_RAW_CONFIG_BLOCK
-     T55X7_EM_UNIQUE_CONFIG_BLOCK, T55X7_FDXB_CONFIG_BLOCK,
-	 T55X7_FDXB_CONFIG_BLOCK, T55X7_HID_26_CONFIG_BLOCK, T55X7_INDALA_64_CONFIG_BLOCK, T55X7_INDALA_224_CONFIG_BLOCK 
-	 T55X7_GUARDPROXII_CONFIG_BLOCK, T55X7_VIKING_CONFIG_BLOCK,	T55X7_NORALYS_CONFIG_BLOCK, T55X7_IOPROX_CONFIG_BLOCK	
-	*/
-	static char buf[60];
-	char *retStr = buf;
-	
-	switch (tagtype){
-		case 0: snprintf(retStr, sizeof(buf),"%08X - T55X7 Default", T55X7_DEFAULT_CONFIG_BLOCK); break;
-		case 1: snprintf(retStr, sizeof(buf),"%08X - T55X7 Raw", T55X7_RAW_CONFIG_BLOCK); break;
-		case 2: snprintf(retStr, sizeof(buf),"%08X - T5555 Q5 Default", T5555_DEFAULT_CONFIG_BLOCK); break;
-		default:
-			break;
-	}
-	PrintAndLogEx(NORMAL, buf);
-}
-
-int CmdResetRead(const char *Cmd) {
-	UsbCommand c = {CMD_T55XX_RESET_READ, {0,0,0}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	if ( !WaitForResponseTimeout(CMD_ACK, NULL, 2500) ) {
-		PrintAndLogEx(WARNING, "command execution time out");
-		return 0;
-	}
-
-	uint8_t got[BIGBUF_SIZE-1];
-	if ( !GetFromDevice(BIG_BUF, got, sizeof(got), 0, NULL, 2500, false)) {
-		PrintAndLogEx(WARNING, "command execution time out");
-		return 0;
-	}
-	setGraphBuf(got, sizeof(got));
-	return 1;
-}
-
-int CmdT55xxWipe(const char *Cmd) {
-	char writeData[20] = {0};
-	char *ptrData = writeData;
-	char cmdp = param_getchar(Cmd, 0);	
-	if ( cmdp == 'h' || cmdp == 'H') return usage_t55xx_wipe();
-
-	bool Q5 = (cmdp == 'q' || cmdp == 'Q');
-
-	// Try with the default password to reset block 0
-	// With a pwd should work even if pwd bit not set
-	PrintAndLogEx(INFO, "\nBeginning Wipe of a T55xx tag (assuming the tag is not password protected)\n");
-		
-	if ( Q5 )
-		snprintf(ptrData,sizeof(writeData),"b 0 d 6001F004 p 0");
-	else
-		snprintf(ptrData,sizeof(writeData),"b 0 d 000880E0 p 0");
-	
-	if (!CmdT55xxWriteBlock(ptrData)) PrintAndLogEx(WARNING, "Error writing blk 0");
-	
-	for (uint8_t blk = 1; blk<8; blk++) {
-		
-		snprintf(ptrData,sizeof(writeData),"b %d d 0", blk);
-		
-		if (!CmdT55xxWriteBlock(ptrData)) PrintAndLogEx(WARNING, "Error writing blk %d", blk);
-		
-		memset(writeData, 0x00, sizeof(writeData));
-	}
-	return 0;
-}
-
-bool IsCancelled(void) {
-	if (ukbhit()) {
-		int gc = getchar(); (void)gc;
-		PrintAndLogEx(NORMAL, "\naborted via keyboard!\n");
-		return true;
-	}
-	return false;
-}
-
-int CmdT55xxChkPwds(const char *Cmd) {
-	// load a default pwd file.
-	char line[9];
-	char filename[FILE_PATH_SIZE] = {0};
-	int	keycnt = 0;
-	uint8_t stKeyBlock = 20;
-	uint8_t *keyBlock = NULL, *p = NULL;
-    bool found = false;
-	uint8_t timeout = 0;
-
-	memset(line, 0, sizeof(line));
-	
-    char cmdp = tolower(param_getchar(Cmd, 0));
-	if (strlen(Cmd) == 0 || cmdp == 'h') return usage_t55xx_chk();
-	
-	/*
-	if ( T55xxReadBlock(7, 0, 0, 0, 0) ) {
-		
-		// now try to validate it..
-		PrintAndLogEx(WARNING, "\n Block 7 was readable");
-		return 1;
-	}
-	*/
-	
-	uint64_t t1 = msclock();
-
-	if ( cmdp == 'm' ) {	
-		UsbCommand c = {CMD_T55XX_CHKPWDS, {0,0,0} };
-		clearCommandBuffer();
-		SendCommand(&c);
-		UsbCommand resp;
-
-		while ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
-			timeout++;
-			printf("."); fflush(stdout);
-			if (timeout > 180) {
-				PrintAndLogEx(WARNING, "\nno response from Proxmark. Aborting...");
-				return 2;
-			}
-		}
-		
-		if ( resp.arg[0] ) {
-			PrintAndLogEx(SUCCESS, "\nFound a candidate [ %08X ]. Trying to validate", resp.arg[1]);
-			
-			if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, resp.arg[1])) {
-				PrintAndLogEx(INFO, "Aquireing data from device failed. Quitting");
-				return 2;
-			}
-			
-			found = tryDetectModulation();
-			if (found) {
-				PrintAndLogEx(SUCCESS, "Found valid password: [ %08X ]", resp.arg[1]);
-			} else {
-				PrintAndLogEx(WARNING, "Password NOT found.");
-			}
-		} else {
-			PrintAndLogEx(WARNING, "Password NOT found.");
-		}
-		
-		goto out;
-	}
-	
-	keyBlock = calloc(stKeyBlock, 4);
-	if (keyBlock == NULL) return 1;
-
-	if (cmdp == 'i') {
-	
-		int len = strlen(Cmd+2);
-		if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
-		memcpy(filename, Cmd+2, len);
-	
-		FILE * f = fopen( filename , "r");		
-		if ( !f ) {
-			PrintAndLogEx(FAILED, "File: " _YELLOW_(%s) ": not found or locked.", filename);
-			free(keyBlock);
-			return 1;
-		}			
-		
-		while( fgets(line, sizeof(line), f) ){
-			if (strlen(line) < 8 || line[7] == '\n') continue;
-		
-			//goto next line
-			while (fgetc(f) != '\n' && !feof(f)) ;
-		
-			//The line start with # is comment, skip
-			if( line[0]=='#' ) continue;
-
-			if (!isxdigit(line[0])) {
-				PrintAndLogEx(WARNING, "File content error. '%s' must include 8 HEX symbols", line);
-				continue;
-			}
-			
-			line[8] = 0;		
-			
-			// realloc keyblock array size.
-			if ( stKeyBlock - keycnt < 2) {
-				p = realloc(keyBlock, 4 * (stKeyBlock += 10));
-				if (!p) {
-					PrintAndLogEx(WARNING, "Cannot allocate memory for defaultKeys");
-					free(keyBlock);
-					if (f)
-						fclose(f);
-					return 2;
-				}
-				keyBlock = p;
-			}
-			// clear mem
-			memset(keyBlock + 4 * keycnt, 0, 4);
-			
-			num_to_bytes( strtoll(line, NULL, 16), 4, keyBlock + 4*keycnt);
-			
-//			PrintAndLogEx(NORMAL, "chk custom pwd[%2d] %08X", keycnt, bytes_to_num(keyBlock + 4 * keycnt, 4) );
-			keycnt++;			
-			memset(line, 0, sizeof(line));
-		}
-		
-		if (f)
-			fclose(f);
-		
-		if (keycnt == 0) {
-			PrintAndLogEx(WARNING, "No keys found in file");
-			free(keyBlock);
-			return 1;
-		}
-		PrintAndLogEx(SUCCESS, "Loaded %d keys", keycnt);
-		
-		// loop
-		uint64_t testpwd = 0x00;
-		for (uint16_t c = 0; c < keycnt; ++c ) {
-
-			if ( IsOffline() ) {
-				PrintAndLogEx(WARNING, "Device offline\n");
-				free(keyBlock);
-				return  2;
-			}
-		
-			if (IsCancelled()) {
-				free(keyBlock);
-				return 0;
-			}
-		
-			testpwd = bytes_to_num(keyBlock + 4*c, 4);
-
-			PrintAndLogEx(INFO, "Testing %08X", testpwd);
-						
-			if ( !AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, testpwd)) {
-				PrintAndLogEx(INFO, "Aquireing data from device failed. Quitting");
-				free(keyBlock);
-				return 0;
-			}
-			
-			found = tryDetectModulation();
-			if ( found )
-				break;
- 
-		}
-		if ( found ) 
-			PrintAndLogEx(SUCCESS, "Found valid password: [ %08X ]", testpwd);
-		else
-			PrintAndLogEx(WARNING, "Password NOT found.");		
-	}
-	
-	free(keyBlock);
-	
-out:
-	t1 = msclock() - t1;
-	PrintAndLogEx(SUCCESS, "\nTime in bruteforce: %.0f seconds\n", (float)t1/1000.0);		
-	return 0;
-}
-
-int CmdT55xxBruteForce(const char *Cmd) {
-	
-    uint32_t start_password = 0x00000000; //start password
-    uint32_t end_password   = 0xFFFFFFFF; //end   password
-	uint32_t curr = 0;
-    bool found = false;
-
-
-    char cmdp = tolower(param_getchar(Cmd, 0));
-	if (cmdp == 'h') return usage_t55xx_bruteforce();
-	
-	uint64_t t1 = msclock();
-
-	// Try to read Block 7, first :)
-	
-	// incremental pwd range search
-    start_password = param_get32ex(Cmd, 0, 0, 16);
-	end_password = param_get32ex(Cmd, 1, 0, 16);
-	
-	curr = start_password;
-	
-	if ( start_password >= end_password ) {
-		return usage_t55xx_bruteforce();
-	}
-	
-    PrintAndLogEx(INFO, "Search password range [%08X -> %08X]", start_password, end_password);
-
-    while ( !found ){
-
-		printf("."); fflush(stdout);
-		
-		if (IsCancelled()) {
-			return 0;
-		}
-			
-		if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, curr)) {
-			PrintAndLogEx(WARNING, "Aquiring data from device failed. Quitting");
-			return 0;
-		}
-		
-		found = tryDetectModulation();
-
-		if (curr == end_password)
-			break;
-		curr++;
-    }
-    
-    PrintAndLogEx(NORMAL, "");
-	
-    if (found)
-		PrintAndLogEx(SUCCESS, "Found valid password: [ %08X ]", curr);
-    else
-		PrintAndLogEx(WARNING, "Password NOT found. Last tried: [ %08X ]", --curr);
-
-	t1 = msclock() - t1;
-	PrintAndLogEx(SUCCESS, "\nTime in bruteforce: %.0f seconds\n", (float)t1/1000.0);	
-    return 0;
-}
-
-int tryOnePassword(uint32_t password) {
-	PrintAndLogEx(INFO, "Trying password %08x", password);
-	if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, password)) {
-		PrintAndLogEx(NORMAL, "Acquire data from device failed. Quitting");
-		return -1;
-	}
-
-	if (tryDetectModulation())
-		return 1;
-	else 
-		return 0;
-}
-
-int CmdT55xxRecoverPW(const char *Cmd) {
-	int bit = 0;
-	uint32_t orig_password = 0x0;
-	uint32_t curr_password = 0x0;
-	uint32_t prev_password = 0xffffffff;
-	uint32_t mask = 0x0;
-	int found = 0;
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if (cmdp == 'h' ) return usage_t55xx_recoverpw();
-
-	orig_password = param_get32ex(Cmd, 0, 0x51243648, 16); //password used by handheld cloners
-
-	// first try fliping each bit in the expected password
-	while (bit < 32) {
-		curr_password = orig_password ^ ( 1 << bit );
-		found = tryOnePassword(curr_password);
-		if (found == -1) return 0;
-		bit++;
-		
-		if (IsCancelled()) return 0;
-	}
-
-	// now try to use partial original password, since block 7 should have been completely
-	// erased during the write sequence and it is possible that only partial password has been
-	// written
-	// not sure from which end the bit bits are written, so try from both ends 
-	// from low bit to high bit
-	bit = 0;
-	while (bit < 32) {
-		mask += ( 1 << bit );
-		curr_password = orig_password & mask;
-		// if updated mask didn't change the password, don't try it again
-		if (prev_password == curr_password) {
-			bit++;
-			continue;
-		}
-		found = tryOnePassword(curr_password);
-		if (found == -1) return 0;
-		bit++;
-		prev_password = curr_password;
-		
-		if (IsCancelled()) return 0;
-	}
-
-	// from high bit to low
-	bit = 0;
-	mask = 0xffffffff;
-	while (bit < 32) {
-		mask -= ( 1 << bit );
-		curr_password = orig_password & mask;
-		// if updated mask didn't change the password, don't try it again
-		if (prev_password == curr_password) {
-			bit++;
-			continue;
-		}
-		found = tryOnePassword(curr_password);
-		if (found == -1)
-			return 0;
-		bit++;
-		prev_password = curr_password;
-		
-		if (IsCancelled()) return 0;
-	}
-
-	PrintAndLogEx(NORMAL, "");
-
-	if (found == 1)
-		PrintAndLogEx(SUCCESS, "Found valid password: [%08x]", curr_password);
-	else
-		PrintAndLogEx(WARNING, "Password NOT found.");
-
-	return 0;
-}
-
-// note length of data returned is different for different chips.  
-// some return all page 1 (64 bits) and others return just that block (32 bits) 
-// unfortunately the 64 bits makes this more likely to get a false positive...
-bool tryDetectP1(bool getData) {
-	uint8_t preamble[] = {1,1,1,0,0,0,0,0,0,0,0,1,0,1,0,1};
-	size_t startIdx = 0;
-	uint8_t fc1 = 0, fc2 = 0, ans = 0;
-	int clk = 0, firstClockEdge = 0;
-	bool st = true;
-
-	if ( getData ) {
-		if ( !AquireData(T55x7_PAGE1, 1, false, 0) )
-			return false;
-	}
-
-	// try fsk clock detect. if successful it cannot be any other type of modulation...  (in theory...)
-	ans = fskClocks(&fc1, &fc2, (uint8_t *)&clk, &firstClockEdge);
-	if (ans && ((fc1==10 && fc2==8) || (fc1==8 && fc2==5))) {
-		if ( FSKrawDemod("0 0", false) && 
-			  preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) && 
-			  (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
-			return true;
-		}
-		if ( FSKrawDemod("0 1", false) && 
-			  preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) && 
-			  (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
-			return true;
-		}
-		return false;
-	}
-
-	// try ask clock detect.  it could be another type even if successful.
-	clk = GetAskClock("", false);
-	if (clk > 0) {
-		if ( ASKDemod_ext("0 0 1", false, false, 1, &st) &&
-			  preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) && 
-			  (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
-			return true;
-		}
-		st = true;
-		if ( ASKDemod_ext("0 1 1", false, false, 1, &st)  &&
-				preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) && 
-				(DemodBufferLen == 32 || DemodBufferLen == 64) ) {
-			return true;
-		}
-		if ( ASKbiphaseDemod("0 0 0 2", false) &&
-				preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) && 
-				(DemodBufferLen == 32 || DemodBufferLen == 64) ) {
-			return true;
-		}
-		if ( ASKbiphaseDemod("0 0 1 2", false) &&
-				preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) && 
-				(DemodBufferLen == 32 || DemodBufferLen == 64) ) {
-			return true;
-		}
-	}
-
-	// try NRZ clock detect.  it could be another type even if successful.
-	clk = GetNrzClock("", false); //has the most false positives :(
-	if (clk > 0) {
-		if ( NRZrawDemod("0 0 1", false)  &&
-				preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) && 
-				(DemodBufferLen == 32 || DemodBufferLen == 64) ) {
-			return true;
-		}
-		if ( NRZrawDemod("0 1 1", false)  &&
-				preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) && 
-				(DemodBufferLen == 32 || DemodBufferLen == 64) ) {
-			return true;
-		}
-	}
-	
-	// Fewer card uses PSK
-	// try psk clock detect. if successful it cannot be any other type of modulation... (in theory...)
-	clk = GetPskClock("", false);
-	if (clk > 0) {
-		// allow undo
-		// save_restoreGB(1);
-		// skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)
-		//CmdLtrim("160");
-		if ( PSKDemod("0 0 6", false) &&
-			  preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) && 
-			  (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
-			//save_restoreGB(0);
-			return true;
-		}
-		if ( PSKDemod("0 1 6", false) &&
-			  preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) && 
-			  (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
-			//save_restoreGB(0);
-			return true;
-		}
-		// PSK2 - needs a call to psk1TOpsk2.
-		if ( PSKDemod("0 0 6", false)) {
-			psk1TOpsk2(DemodBuffer, DemodBufferLen);
-			if (preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) && 
-				  (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
-				//save_restoreGB(0);
-				return true;
-			}
-		} // inverse waves does not affect PSK2 demod
-		//undo trim samples
-		//save_restoreGB(0); 
-		// no other modulation clocks = 2 or 4 so quit searching
-		if (fc1 != 8) return false;
-	}
-
-	return false;
-}
-//  does this need to be a callable command?
-int CmdT55xxDetectPage1(const char *Cmd){
-	bool errors = false;
-	bool useGB = false;
-	bool usepwd = false;
-	uint32_t password = 0;
-	uint8_t cmdp = 0;
-
-	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch (tolower(param_getchar(Cmd, cmdp))) {
-		case 'h':
-			return usage_t55xx_detectP1();
-		case 'p':
-			password = param_get32ex(Cmd, cmdp+1, 0, 16);
-			usepwd = true;
-			cmdp += 2;
-			break;
-		case '1':
-			// use Graphbuffer data
-			useGB = true;
-			cmdp++;
-			break;
-		default:
-			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-			errors = true;
-			break;
-		}
-	}
-	if (errors) return usage_t55xx_detectP1();
-
-	if ( !useGB ) {
-		if ( !AquireData(T55x7_PAGE1, 1, usepwd, password) )
-			return false;
-	}
-	bool success = tryDetectP1(false);
-	if (success) PrintAndLogEx(SUCCESS, "T55xx chip found!");
-	return success;
-}
-
-int CmdT55xxSetDeviceConfig(const char *Cmd){
-	uint8_t startgap = 0, writegap = 0;
-	uint8_t write0 = 0, write1 = 0, readgap = 0;
-	bool errors = false, shall_persist = false;
-	uint8_t cmdp = 0;
-	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch (tolower(param_getchar(Cmd, cmdp))) {
-		case 'h':
-			return usage_lf_deviceconfig();
-		case 'a':
-			errors |= param_getdec(Cmd, cmdp+1, &startgap);
-			cmdp += 2;
-			break;
-		case 'b':
-			errors |= param_getdec(Cmd, cmdp+1, &writegap);
-			cmdp += 2;
-			break;
-		case 'c':
-			errors |= param_getdec(Cmd, cmdp+1, &write0);
-			cmdp += 2;
-			break;
-		case 'd':
-			errors |= param_getdec(Cmd, cmdp+1, &write1);
-			cmdp += 2;
-			break;
-		case 'e':
-			errors |= param_getdec(Cmd, cmdp+1, &readgap);
-			cmdp += 2;
-			break;
-		case 'p':
-			shall_persist = true;
-			cmdp++;
-			break;
-		default:
-			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-			errors = 1;
-			break;
-		}
-	}
-
-	//Validations
-	if (errors || cmdp == 0) return usage_lf_deviceconfig();
-	
-	t55xx_config config = { startgap*8, writegap*8, write0*8, write1*8, readgap*8 };
-
-	UsbCommand c = {CMD_SET_LF_T55XX_CONFIG, {shall_persist,0,0} };
-	memcpy(c.d.asBytes, &config, sizeof(t55xx_config));
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
-}
-
-static command_t CommandTable[] = {
-	{"help",		CmdHelp,           1, "This help"},
-	{"bruteforce",	CmdT55xxBruteForce,0, "<start password> <end password> [i <*.dic>] Simple bruteforce attack to find password"},
-	{"config",		CmdT55xxSetConfig, 1, "Set/Get T55XX configuration (modulation, inverted, offset, rate)"},
-	{"chk",			CmdT55xxChkPwds,   1, "Check passwords"},
-	{"detect",		CmdT55xxDetect,    1, "[1] Try detecting the tag modulation from reading the configuration block."},
-	{"deviceconfig", CmdT55xxSetDeviceConfig, 1, "Set/Get T55XX device configuration (startgap, writegap, write0, write1, readgap"},
-	{"p1detect",	CmdT55xxDetectPage1,1, "[1] Try detecting if this is a t55xx tag by reading page 1"},
-	{"dump",		CmdT55xxDump,      0, "[password] [o] Dump T55xx card block 0-7. Optional [password], [override]"},
-	{"info",		CmdT55xxInfo,      1, "[1] Show T55x7 configuration data (page 0/ blk 0)"},
-	{"read",		CmdT55xxReadBlock, 0, "b <block> p [password] [o] [1] -- Read T55xx block data. Optional [p password], [override], [page1]"},
-	{"resetread",	CmdResetRead,      0, "Send Reset Cmd then lf read the stream to attempt to identify the start of it (needs a demod and/or plot after)"},
-	{"recoverpw",	CmdT55xxRecoverPW, 0, "[password] Try to recover from bad password write from a cloner. Only use on PW protected chips!"},
-	{"special",		special,           0, "Show block changes with 64 different offsets"},	
-	{"trace",		CmdT55xxReadTrace, 1, "[1] Show T55x7 traceability data (page 1/ blk 0-1)"},
-	{"wakeup",		CmdT55xxWakeUp,    0, "Send AOR wakeup command"},
-	{"wipe",		CmdT55xxWipe,      0, "[q] Wipe a T55xx tag and set defaults (will destroy any data on tag)"},
-	{"write",		CmdT55xxWriteBlock,0, "b <block> d <data> p [password] [1] -- Write T55xx block data. Optional [p password], [page1]"},
-	{NULL, NULL, 0, NULL}
-};
-
-int CmdLFT55XX(const char *Cmd) {
-	clearCommandBuffer();
-	CmdsParse(CommandTable, Cmd);
-	return 0;
-}
-
-int CmdHelp(const char *Cmd) {
-	CmdsHelp(CommandTable);
-	return 0;
-}
+//-----------------------------------------------------------------------------
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// Low frequency T55xx commands
+//-----------------------------------------------------------------------------
+#include "cmdlft55xx.h"
+
+// Default configuration
+t55xx_conf_block_t config = { .modulation = DEMOD_ASK, .inverted = false, .offset = 0x00, .block0 = 0x00, .Q5 = false };
+
+t55xx_conf_block_t Get_t55xx_Config(){
+	return config;
+}
+void Set_t55xx_Config(t55xx_conf_block_t conf){
+	config = conf;
+}
+
+int usage_t55xx_config(){
+	PrintAndLogEx(NORMAL, "Usage: lf t55xx config [d <demodulation>] [i 1] [o <offset>] [Q5]");
+	PrintAndLogEx(NORMAL, "Options:");
+	PrintAndLogEx(NORMAL, "       h                                - This help");
+	PrintAndLogEx(NORMAL, "       b <8|16|32|40|50|64|100|128>     - Set bitrate");
+	PrintAndLogEx(NORMAL, "       d <FSK|FSK1|FSK1a|FSK2|FSK2a|ASK|PSK1|PSK2|NRZ|BI|BIa>  - Set demodulation FSK / ASK / PSK / NRZ / Biphase / Biphase A");
+	PrintAndLogEx(NORMAL, "       i [1]                            - Invert data signal, defaults to normal");
+	PrintAndLogEx(NORMAL, "       o [offset]                       - Set offset, where data should start decode in bitstream");
+	PrintAndLogEx(NORMAL, "       Q5                               - Set as Q5(T5555) chip instead of T55x7");
+	PrintAndLogEx(NORMAL, "       ST                               - Set Sequence Terminator on");
+	PrintAndLogEx(NORMAL, "");
+	PrintAndLogEx(NORMAL, "Examples:");
+	PrintAndLogEx(NORMAL, "      lf t55xx config d FSK          - FSK demodulation");
+	PrintAndLogEx(NORMAL, "      lf t55xx config d FSK i 1      - FSK demodulation, inverse data");
+	PrintAndLogEx(NORMAL, "      lf t55xx config d FSK i 1 o 3  - FSK demodulation, inverse data, offset=3,start from position 3 to decode data");
+	PrintAndLogEx(NORMAL, "");
+	return 0;
+}
+int usage_t55xx_read(){
+	PrintAndLogEx(NORMAL, "Usage:  lf t55xx read [b <block>] [p <password>] <override_safety> <page1>");
+	PrintAndLogEx(NORMAL, "Options:");
+	PrintAndLogEx(NORMAL, "     b <block>    - block number to read. Between 0-7");
+	PrintAndLogEx(NORMAL, "     p <password> - OPTIONAL password (8 hex characters)");
+	PrintAndLogEx(NORMAL, "     o            - OPTIONAL override safety check");
+	PrintAndLogEx(NORMAL, "     1            - OPTIONAL read Page 1 instead of Page 0");
+	PrintAndLogEx(NORMAL, "     ****WARNING****");
+	PrintAndLogEx(NORMAL, "     Use of read with password on a tag not configured for a pwd");
+	PrintAndLogEx(NORMAL, "     can damage the tag");
+    PrintAndLogEx(NORMAL, "");
+	PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      lf t55xx read b 0				- read data from block 0");
+	PrintAndLogEx(NORMAL, "      lf t55xx read b 0 p feedbeef		- read data from block 0 password feedbeef");
+	PrintAndLogEx(NORMAL, "      lf t55xx read b 0 p feedbeef o	- read data from block 0 password feedbeef safety check");
+	PrintAndLogEx(NORMAL, "");
+	return 0;
+}
+int usage_t55xx_write(){
+	PrintAndLogEx(NORMAL, "Usage:  lf t55xx write [b <block>] [d <data>] [p <password>] [1] [t]");
+	PrintAndLogEx(NORMAL, "Options:");
+	PrintAndLogEx(NORMAL, "     b <block>    - block number to write. Between 0-7");
+	PrintAndLogEx(NORMAL, "     d <data>     - 4 bytes of data to write (8 hex characters)");
+	PrintAndLogEx(NORMAL, "     p <password> - OPTIONAL password 4bytes (8 hex characters)");
+	PrintAndLogEx(NORMAL, "     1            - OPTIONAL write Page 1 instead of Page 0");
+	PrintAndLogEx(NORMAL, "     t            - OPTIONAL test mode write - ****DANGER****");	
+    PrintAndLogEx(NORMAL, "");
+	PrintAndLogEx(NORMAL, "Examples:");
+	PrintAndLogEx(NORMAL, "      lf t55xx write b 3 d 11223344            - write 11223344 to block 3");
+	PrintAndLogEx(NORMAL, "      lf t55xx write b 3 d 11223344 p feedbeef - write 11223344 to block 3 password feedbeef");
+	PrintAndLogEx(NORMAL, "");
+	return 0;
+}
+int usage_t55xx_trace() {
+	PrintAndLogEx(NORMAL, "Usage:  lf t55xx trace [1]");
+	PrintAndLogEx(NORMAL, "Options:");
+	PrintAndLogEx(NORMAL, "     1             - if set, use Graphbuffer otherwise read data from tag.");
+	PrintAndLogEx(NORMAL, "");
+	PrintAndLogEx(NORMAL, "Examples:");
+	PrintAndLogEx(NORMAL, "      lf t55xx trace");
+	PrintAndLogEx(NORMAL, "      lf t55xx trace 1");
+	PrintAndLogEx(NORMAL, "");
+	return 0;
+}
+int usage_t55xx_info() {
+	PrintAndLogEx(NORMAL, "Usage:  lf t55xx info [1]");
+	PrintAndLogEx(NORMAL, "Options:");
+	PrintAndLogEx(NORMAL, "     1             - if set, use Graphbuffer otherwise read data from tag.");
+	PrintAndLogEx(NORMAL, "");
+	PrintAndLogEx(NORMAL, "Examples:");
+	PrintAndLogEx(NORMAL, "      lf t55xx info");
+	PrintAndLogEx(NORMAL, "      lf t55xx info 1");
+	PrintAndLogEx(NORMAL, "");
+	return 0;
+}
+int usage_t55xx_dump(){
+	PrintAndLogEx(NORMAL, "Usage:  lf t55xx dump <password> [o]");
+	PrintAndLogEx(NORMAL, "Options:");
+	PrintAndLogEx(NORMAL, "     <password>  - OPTIONAL password 4bytes (8 hex symbols)");
+	PrintAndLogEx(NORMAL, "     o           - OPTIONAL override, force pwd read despite danger to card");
+	PrintAndLogEx(NORMAL, "");
+	PrintAndLogEx(NORMAL, "Examples:");
+	PrintAndLogEx(NORMAL, "      lf t55xx dump");
+	PrintAndLogEx(NORMAL, "      lf t55xx dump feedbeef o");
+	PrintAndLogEx(NORMAL, "");
+	return 0;
+}
+int usage_t55xx_detect(){
+	PrintAndLogEx(NORMAL, "Usage:  lf t55xx detect [1] [p <password>]");
+	PrintAndLogEx(NORMAL, "Options:");
+	PrintAndLogEx(NORMAL, "     1             - if set, use Graphbuffer otherwise read data from tag.");
+	PrintAndLogEx(NORMAL, "     p <password>  - OPTIONAL password (8 hex characters)");
+	PrintAndLogEx(NORMAL, "");
+	PrintAndLogEx(NORMAL, "Examples:");
+	PrintAndLogEx(NORMAL, "      lf t55xx detect");
+	PrintAndLogEx(NORMAL, "      lf t55xx detect 1");
+	PrintAndLogEx(NORMAL, "      lf t55xx detect p 11223344");
+	PrintAndLogEx(NORMAL, "");
+	return 0;
+}
+int usage_t55xx_detectP1(){
+	PrintAndLogEx(NORMAL, "Command: Detect Page 1 of a t55xx chip");
+	PrintAndLogEx(NORMAL, "Usage:  lf t55xx p1detect [1] [p <password>]");
+	PrintAndLogEx(NORMAL, "Options:");
+	PrintAndLogEx(NORMAL, "     1             - if set, use Graphbuffer otherwise read data from tag.");
+	PrintAndLogEx(NORMAL, "     p <password>  - OPTIONAL password (8 hex characters)");
+	PrintAndLogEx(NORMAL, "");
+	PrintAndLogEx(NORMAL, "Examples:");
+	PrintAndLogEx(NORMAL, "      lf t55xx p1detect");
+	PrintAndLogEx(NORMAL, "      lf t55xx p1detect 1");
+	PrintAndLogEx(NORMAL, "      lf t55xx p1detect p 11223344");
+	PrintAndLogEx(NORMAL, "");
+	return 0;
+}
+int usage_t55xx_wakup(){
+	PrintAndLogEx(NORMAL, "Usage:  lf t55xx wakeup [h] p <password>");
+	PrintAndLogEx(NORMAL, "This commands send the Answer-On-Request command and leaves the readerfield ON afterwards.");
+	PrintAndLogEx(NORMAL, "Options:");
+	PrintAndLogEx(NORMAL, "     h 			- this help");
+    PrintAndLogEx(NORMAL, "     p <password>	- password 4bytes (8 hex symbols)");
+    PrintAndLogEx(NORMAL, "");
+	PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      lf t55xx wakeup p 11223344  - send wakeup password");
+	return 0;
+}
+int usage_t55xx_chk(){
+	PrintAndLogEx(NORMAL, "This command uses a dictionary attack");
+	PrintAndLogEx(NORMAL, "press 'enter' to cancel the command");
+    PrintAndLogEx(NORMAL, "Usage: lf t55xx bruteforce [h] <m> [i <*.dic>]");
+	PrintAndLogEx(NORMAL, "Options:");
+	PrintAndLogEx(NORMAL, "     h			- this help");
+	PrintAndLogEx(NORMAL, "     m			- use dictionary from flashmemory\n");	
+    PrintAndLogEx(NORMAL, "     i <*.dic>	- loads a default keys dictionary file <*.dic>");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "       lf t55xx bruteforce m");
+	PrintAndLogEx(NORMAL, "       lf t55xx bruteforce i default_pwd.dic");
+    PrintAndLogEx(NORMAL, "");
+    return 0;
+}
+int usage_t55xx_bruteforce(){
+	PrintAndLogEx(NORMAL, "This command uses bruteforce to scan a number range");
+	PrintAndLogEx(NORMAL, "press 'enter' to cancel the command");
+    PrintAndLogEx(NORMAL, "Usage: lf t55xx bruteforce [h] <start password> <end password>");
+    PrintAndLogEx(NORMAL, "       password must be 4 bytes (8 hex symbols)");
+	PrintAndLogEx(NORMAL, "Options:");
+	PrintAndLogEx(NORMAL, "     h			- this help");
+	PrintAndLogEx(NORMAL, "     <start_pwd> - 4 byte hex value to start pwd search at");
+	PrintAndLogEx(NORMAL, "     <end_pwd>   - 4 byte hex value to end pwd search at");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "       lf t55xx bruteforce aaaaaaaa bbbbbbbb");
+    PrintAndLogEx(NORMAL, "");
+    return 0;
+}
+int usage_t55xx_recoverpw(){
+	PrintAndLogEx(NORMAL, "This command uses a few tricks to try to recover mangled password");
+	PrintAndLogEx(NORMAL, "press 'enter' to cancel the command");
+	PrintAndLogEx(NORMAL, "WARNING: this may brick non-password protected chips!");
+	PrintAndLogEx(NORMAL, "Usage: lf t55xx recoverpw [password]");
+	PrintAndLogEx(NORMAL, "       password must be 4 bytes (8 hex symbols)");
+	PrintAndLogEx(NORMAL, "       default password is 51243648, used by many cloners");
+	PrintAndLogEx(NORMAL, "Options:");
+	PrintAndLogEx(NORMAL, "     h           - this help");
+	PrintAndLogEx(NORMAL, "     [password]  - 4 byte hex value of password written by cloner");
+	PrintAndLogEx(NORMAL, "");
+	PrintAndLogEx(NORMAL, "Examples:");
+	PrintAndLogEx(NORMAL, "       lf t55xx recoverpw");
+	PrintAndLogEx(NORMAL, "       lf t55xx recoverpw 51243648");
+	PrintAndLogEx(NORMAL, "");
+	return 0;
+}int usage_t55xx_wipe(){
+	PrintAndLogEx(NORMAL, "Usage:  lf t55xx wipe [h] [Q5]");
+	PrintAndLogEx(NORMAL, "This commands wipes a tag, fills blocks 1-7 with zeros and a default configuration block");
+	PrintAndLogEx(NORMAL, "Options:");
+	PrintAndLogEx(NORMAL, "     h 	- this help");
+	PrintAndLogEx(NORMAL, "     Q5  - indicates to use the T5555 (Q5) default configuration block");
+    PrintAndLogEx(NORMAL, "");
+	PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      lf t55xx wipe	-  wipes a t55x7 tag,    config block 0x000880E0");
+	PrintAndLogEx(NORMAL, "      lf t55xx wipe Q5 -  wipes a t5555 Q5 tag, config block 0x6001F004");
+	return 0;
+}
+int usage_lf_deviceconfig(){
+	PrintAndLogEx(NORMAL, "Sets t55x7 timings for direkt commands. The timings are set here in Field Clocks (FC), \nwhich is converted to (US) on device");
+	PrintAndLogEx(NORMAL, "Usage: lf t55xx deviceconfig a <gap> b <gap> c <gap> d <gap> e <gap> p");
+	PrintAndLogEx(NORMAL, "Options:");
+	PrintAndLogEx(NORMAL, "       h              - This help");
+	PrintAndLogEx(NORMAL, "       a <8..255>     - Set start gap");
+	PrintAndLogEx(NORMAL, "       b <8..255>     - Set write gap");
+	PrintAndLogEx(NORMAL, "       c <8..255>     - Set write ZERO gap");
+	PrintAndLogEx(NORMAL, "       d <8..255>     - Set write ONE gap");
+	PrintAndLogEx(NORMAL, "       e <8..255>     - Set read gap");
+	PrintAndLogEx(NORMAL, "       p              - persist to flashmemory");
+	PrintAndLogEx(NORMAL, "");
+	PrintAndLogEx(NORMAL, "Examples:");
+	PrintAndLogEx(NORMAL, "      lf t55xx deviceconfig a 29 b 17 c 15 d 47 e 15   - default T55XX");
+	PrintAndLogEx(NORMAL, "      lf t55xx deviceconfig a 55 b 14 c 21 d 30        - default EM4305");
+	PrintAndLogEx(NORMAL, "");
+	return 0;
+}
+
+int CmdHelp(const char *Cmd);
+
+void printT5xxHeader(uint8_t page){
+	PrintAndLogEx(NORMAL, "Reading Page %d:", page);	
+	PrintAndLogEx(NORMAL, "blk | hex data | binary                           | ascii");
+	PrintAndLogEx(NORMAL, "----+----------+----------------------------------+-------");	
+}
+
+int CmdT55xxSetConfig(const char *Cmd) {
+
+	uint8_t offset = 0;
+	char modulation[6] = {0x00};
+	char tmp = 0x00;
+	uint8_t bitRate = 0;
+	uint8_t rates[9] = {8,16,32,40,50,64,100,128,0};
+	uint8_t cmdp = 0;
+	bool errors = false;
+	while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+		tmp = tolower(param_getchar(Cmd, cmdp));
+		switch(tmp)	{
+		case 'h':
+			return usage_t55xx_config();
+		case 'b':
+			errors |= param_getdec(Cmd, cmdp+1, &bitRate);
+			if ( !errors){
+				uint8_t i = 0;
+				for (; i < 9; i++){
+					if (rates[i]==bitRate) {
+						config.bitrate = i;
+						break;
+					}
+				}
+				if (i==9) errors = true;
+			}
+			cmdp+=2;
+			break;
+		case 'd':
+			param_getstr(Cmd, cmdp+1, modulation, sizeof(modulation));
+			cmdp += 2;
+
+			if ( strcmp(modulation, "FSK" ) == 0) {
+				config.modulation = DEMOD_FSK;
+			} else if ( strcmp(modulation, "FSK1" ) == 0) {
+				config.modulation = DEMOD_FSK1;
+				config.inverted=1;
+			} else if ( strcmp(modulation, "FSK1a" ) == 0) {
+				config.modulation = DEMOD_FSK1a;
+				config.inverted=0;
+			} else if ( strcmp(modulation, "FSK2" ) == 0) {
+				config.modulation = DEMOD_FSK2;
+				config.inverted=0;
+			} else if ( strcmp(modulation, "FSK2a" ) == 0) {
+				config.modulation = DEMOD_FSK2a;
+				config.inverted=1;
+			} else if ( strcmp(modulation, "ASK" ) == 0) {
+				config.modulation = DEMOD_ASK;
+			} else if ( strcmp(modulation, "NRZ" ) == 0) {
+				config.modulation = DEMOD_NRZ;
+			} else if ( strcmp(modulation, "PSK1" ) == 0) {
+				config.modulation = DEMOD_PSK1;
+			} else if ( strcmp(modulation, "PSK2" ) == 0) {
+				config.modulation = DEMOD_PSK2;
+			} else if ( strcmp(modulation, "PSK3" ) == 0) {
+				config.modulation = DEMOD_PSK3;
+			} else if ( strcmp(modulation, "BIa" ) == 0) {
+				config.modulation = DEMOD_BIa;
+				config.inverted=1;
+			} else if ( strcmp(modulation, "BI" ) == 0) {
+				config.modulation = DEMOD_BI;
+				config.inverted=0;
+			} else {
+				PrintAndLogEx(WARNING, "Unknown modulation '%s'", modulation);
+				errors = true;
+			}
+			break;
+		case 'i':
+			config.inverted = param_getchar(Cmd,cmdp+1) == '1';
+			cmdp+=2;
+			break;
+		case 'o':
+			errors |= param_getdec(Cmd, cmdp+1, &offset);
+			if ( !errors )
+				config.offset = offset;
+			cmdp+=2;
+			break;
+		case 'q':		
+			config.Q5 = true;
+			cmdp++;
+			break;
+		case 's':		
+			config.ST = true;
+			cmdp++;
+			break;
+		default:
+			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+			errors = true;
+			break;
+		}
+	}
+
+	// No args
+	if (cmdp == 0) return printConfiguration( config );
+
+	//Validations
+	if (errors) return usage_t55xx_config();
+
+ 	config.block0 = 0;
+ 	return printConfiguration ( config );
+}
+
+int T55xxReadBlock(uint8_t block, bool page1, bool usepwd, bool override, uint32_t password){
+	//Password mode
+	if ( usepwd ) {
+		// try reading the config block and verify that PWD bit is set before doing this!
+		if ( !override ) {
+			
+			if ( !AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, false, 0 ) ) return 0;
+			
+			if ( !tryDetectModulation() ) {
+				PrintAndLogEx(NORMAL, "Safety Check: Could not detect if PWD bit is set in config block. Exits.");
+				return 0;
+			} else {
+				PrintAndLogEx(NORMAL, "Safety Check: PWD bit is NOT set in config block. Reading without password...");	
+				usepwd = false;
+				page1 = false;
+			}
+		} else {
+			PrintAndLogEx(NORMAL, "Safety Check Overriden - proceeding despite risk");
+		}
+	}
+
+	if (!AquireData(page1, block, usepwd, password) ) return 0;
+	if (!DecodeT55xxBlock()) return 0;
+
+	char blk[10] = {0};
+	sprintf(blk, "%02d", block);
+	printT55xxBlock(blk);	
+	return 1;
+}
+
+int CmdT55xxReadBlock(const char *Cmd) {
+	uint8_t block = REGULAR_READ_MODE_BLOCK;
+	uint32_t password = 0; //default to blank Block 7
+	bool usepwd = false;
+	bool override = false;
+	bool page1 = false;
+	bool errors = false;
+	uint8_t cmdp = 0;
+	while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+		switch ( tolower(param_getchar(Cmd, cmdp))) {
+		case 'h':
+			return usage_t55xx_read();
+		case 'b':
+			errors |= param_getdec(Cmd, cmdp+1, &block);
+			cmdp += 2;
+			break;
+		case 'o':
+			override = true;
+			cmdp++;
+			break;
+		case 'p':
+			password = param_get32ex(Cmd, cmdp+1, 0, 16);
+			usepwd = true;
+			cmdp += 2;
+			break;
+		case '1':
+			page1 = true;
+			cmdp++;
+			break;
+		default:
+			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+			errors = true;
+			break;
+		}
+	}
+	if (errors) return usage_t55xx_read();
+
+	if (block > 7 && block != REGULAR_READ_MODE_BLOCK	) {
+		PrintAndLogEx(NORMAL, "Block must be between 0 and 7");
+		return 0;
+	}
+
+	printT5xxHeader(page1);
+	return T55xxReadBlock(block, page1, usepwd, override, password);
+}
+
+bool DecodeT55xxBlock(){
+	
+	char buf[30] = {0x00};
+	char *cmdStr = buf;
+	int ans = 0;
+	bool ST = config.ST;
+	uint8_t bitRate[8] = {8,16,32,40,50,64,100,128};
+	DemodBufferLen = 0x00;
+
+	switch( config.modulation ){
+		case DEMOD_FSK:
+			snprintf(cmdStr, sizeof(buf),"%d %d", bitRate[config.bitrate], config.inverted );
+			ans = FSKrawDemod(cmdStr, false);
+			break;
+		case DEMOD_FSK1:
+		case DEMOD_FSK1a:
+			snprintf(cmdStr, sizeof(buf),"%d %d 8 5", bitRate[config.bitrate], config.inverted );
+			ans = FSKrawDemod(cmdStr, false);
+			break;
+		case DEMOD_FSK2:
+		case DEMOD_FSK2a:
+			snprintf(cmdStr, sizeof(buf),"%d %d 10 8", bitRate[config.bitrate], config.inverted );
+			ans = FSKrawDemod(cmdStr, false);
+			break;
+		case DEMOD_ASK:
+			snprintf(cmdStr, sizeof(buf),"%d %d 1", bitRate[config.bitrate], config.inverted );
+			ans = ASKDemod_ext(cmdStr, false, false, 1, &ST);
+			break;
+		case DEMOD_PSK1:
+			// skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)
+			save_restoreGB(GRAPH_SAVE);
+			CmdLtrim("160");
+			snprintf(cmdStr, sizeof(buf),"%d %d 6", bitRate[config.bitrate], config.inverted );
+			ans = PSKDemod(cmdStr, false);
+			//undo trim samples
+			save_restoreGB(GRAPH_RESTORE);
+			break;
+		case DEMOD_PSK2: //inverted won't affect this
+		case DEMOD_PSK3: //not fully implemented
+			// skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)
+			save_restoreGB(GRAPH_SAVE);
+			CmdLtrim("160");
+			snprintf(cmdStr, sizeof(buf),"%d 0 6", bitRate[config.bitrate] );
+			ans = PSKDemod(cmdStr, false);
+			psk1TOpsk2(DemodBuffer, DemodBufferLen);
+			//undo trim samples
+			save_restoreGB(GRAPH_RESTORE);
+			break;
+		case DEMOD_NRZ:
+			snprintf(cmdStr, sizeof(buf),"%d %d 1", bitRate[config.bitrate], config.inverted );
+			ans = NRZrawDemod(cmdStr, false);
+			break;
+		case DEMOD_BI:
+		case DEMOD_BIa:
+			snprintf(cmdStr, sizeof(buf),"0 %d %d 1", bitRate[config.bitrate], config.inverted );
+			ans = ASKbiphaseDemod(cmdStr, false);
+			break;
+		default:
+			return false;
+	}
+	return (bool) ans;
+}
+
+bool DecodeT5555TraceBlock() {
+	DemodBufferLen = 0x00;
+	
+	// According to datasheet. Always: RF/64, not inverted, Manchester
+	return (bool) ASKDemod("64 0 1", false, false, 1);
+}
+
+// sanity check. Don't use proxmark if it is offline and you didn't specify useGraphbuf
+static int SanityOfflineCheck( bool useGraphBuffer ){
+	if ( !useGraphBuffer && IsOffline() ) {
+		PrintAndLogEx(NORMAL, "Your proxmark3 device is offline. Specify [1] to use graphbuffer data instead");
+		return 0;
+	}
+	return 1;
+}
+
+int CmdT55xxDetect(const char *Cmd){
+	bool errors = false;
+	bool useGB = false, usepwd = false;
+	uint32_t password = 0;
+	uint8_t cmdp = 0;
+
+	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+		switch ( tolower(param_getchar(Cmd, cmdp))) {
+		case 'h':
+			return usage_t55xx_detect();
+		case 'p':
+			password = param_get32ex(Cmd, cmdp+1, 0, 16);
+			usepwd = true;
+			cmdp += 2;
+			break;
+		case '1':
+			// use Graphbuffer data
+			useGB = true;
+			cmdp++;
+			break;
+		default:
+			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+			errors = true;
+			break;
+		}
+	}
+	if (errors) return usage_t55xx_detect();
+	
+	// sanity check.
+	if (!SanityOfflineCheck(useGB)) return 1;
+	
+	if ( !useGB) {
+		if ( !AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, usepwd, password) )
+			return 1;
+	}
+	
+	if ( !tryDetectModulation() )
+		PrintAndLogEx(WARNING, "Could not detect modulation automatically. Try setting it manually with \'lf t55xx config\'");
+
+	return 0;
+}
+
+// detect configuration?
+bool tryDetectModulation(){
+
+	t55xx_conf_block_t tests[15];
+	int bitRate = 0, clk = 0, firstClockEdge = 0;
+	uint8_t hits = 0, fc1 = 0, fc2 = 0, ans = 0;
+	
+	ans = fskClocks(&fc1, &fc2, (uint8_t *)&clk, &firstClockEdge);
+
+	if (ans && ((fc1==10 && fc2==8) || (fc1==8 && fc2==5))) {
+		if ( FSKrawDemod("0 0", false) && test(DEMOD_FSK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)){
+			tests[hits].modulation = DEMOD_FSK;
+			if (fc1==8 && fc2 == 5)
+				tests[hits].modulation = DEMOD_FSK1a;
+			else if (fc1==10 && fc2 == 8)
+				tests[hits].modulation = DEMOD_FSK2;
+			tests[hits].bitrate = bitRate;
+			tests[hits].inverted = false;
+			tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+			tests[hits].ST = false;
+			++hits;
+		}
+		if ( FSKrawDemod("0 1", false) && test(DEMOD_FSK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
+			tests[hits].modulation = DEMOD_FSK;
+			if (fc1 == 8 && fc2 == 5)
+				tests[hits].modulation = DEMOD_FSK1;
+			else if (fc1 == 10 && fc2 == 8)
+				tests[hits].modulation = DEMOD_FSK2a;
+			tests[hits].bitrate = bitRate;
+			tests[hits].inverted = true;
+			tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+			tests[hits].ST = false;
+			++hits;
+		}
+	} else {
+		clk = GetAskClock("", false);
+		if (clk > 0) {
+			tests[hits].ST = true;
+			// "0 0 1 " == clock auto, invert false, maxError 1.
+			// false = no verbose
+			// false = no emSearch
+			// 1 = Ask/Man
+			// st = true
+			if ( ASKDemod_ext("0 0 1", false, false, 1, &tests[hits].ST) && test(DEMOD_ASK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
+				tests[hits].modulation = DEMOD_ASK;
+				tests[hits].bitrate = bitRate;
+				tests[hits].inverted = false;
+				tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+				++hits;
+			}
+			tests[hits].ST = true;
+			// "0 0 1 " == clock auto, invert true, maxError 1.
+			// false = no verbose
+			// false = no emSearch
+			// 1 = Ask/Man
+			// st = true
+			if ( ASKDemod_ext("0 1 1", false, false, 1, &tests[hits].ST)  && test(DEMOD_ASK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
+				tests[hits].modulation = DEMOD_ASK;
+				tests[hits].bitrate = bitRate;
+				tests[hits].inverted = true;
+				tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+				++hits;
+			}
+			if ( ASKbiphaseDemod("0 0 0 2", false) && test(DEMOD_BI, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5) ) {
+				tests[hits].modulation = DEMOD_BI;
+				tests[hits].bitrate = bitRate;
+				tests[hits].inverted = false;
+				tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+				tests[hits].ST = false;
+				++hits;
+			}
+			if ( ASKbiphaseDemod("0 0 1 2", false) && test(DEMOD_BIa, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5) ) {
+				tests[hits].modulation = DEMOD_BIa;
+				tests[hits].bitrate = bitRate;
+				tests[hits].inverted = true;
+				tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+				tests[hits].ST = false;
+				++hits;
+			}
+		}
+		clk = GetNrzClock("", false);
+		if (clk > 8) { //clock of rf/8 is likely a false positive, so don't use it.
+			if ( NRZrawDemod("0 0 1", false)  && test(DEMOD_NRZ, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
+				tests[hits].modulation = DEMOD_NRZ;
+				tests[hits].bitrate = bitRate;
+				tests[hits].inverted = false;
+				tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+				tests[hits].ST = false;
+				++hits;
+			}
+
+			if ( NRZrawDemod("0 1 1", false)  && test(DEMOD_NRZ, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
+				tests[hits].modulation = DEMOD_NRZ;
+				tests[hits].bitrate = bitRate;
+				tests[hits].inverted = true;
+				tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+				tests[hits].ST = false;
+				++hits;
+			}
+		}
+		
+		clk = GetPskClock("", false);
+		if (clk > 0) {
+			// allow undo
+			save_restoreGB(GRAPH_SAVE);
+			// skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)
+			CmdLtrim("160");
+			if ( PSKDemod("0 0 6", false) && test(DEMOD_PSK1, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
+				tests[hits].modulation = DEMOD_PSK1;
+				tests[hits].bitrate = bitRate;
+				tests[hits].inverted = false;
+				tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+				tests[hits].ST = false;
+				++hits;
+			}
+			if ( PSKDemod("0 1 6", false) && test(DEMOD_PSK1, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
+				tests[hits].modulation = DEMOD_PSK1;
+				tests[hits].bitrate = bitRate;
+				tests[hits].inverted = true;
+				tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+				tests[hits].ST = false;
+				++hits;
+			}
+			//ICEMAN: are these PSKDemod calls needed?
+			// PSK2 - needs a call to psk1TOpsk2.
+			if ( PSKDemod("0 0 6", false)) {
+				psk1TOpsk2(DemodBuffer, DemodBufferLen);
+				if (test(DEMOD_PSK2, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)){
+					tests[hits].modulation = DEMOD_PSK2;
+					tests[hits].bitrate = bitRate;
+					tests[hits].inverted = false;
+					tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+					tests[hits].ST = false;
+					++hits;
+				}
+			} // inverse waves does not affect this demod
+			// PSK3 - needs a call to psk1TOpsk2.
+			if ( PSKDemod("0 0 6", false)) {
+				psk1TOpsk2(DemodBuffer, DemodBufferLen);
+				if (test(DEMOD_PSK3, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)){
+					tests[hits].modulation = DEMOD_PSK3;
+					tests[hits].bitrate = bitRate;
+					tests[hits].inverted = false;
+					tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+					tests[hits].ST = false;
+					++hits;
+				}
+			} // inverse waves does not affect this demod
+		//undo trim samples
+			save_restoreGB(GRAPH_RESTORE);
+		}
+	}		
+	if ( hits == 1) {
+		config.modulation = tests[0].modulation;
+		config.bitrate = tests[0].bitrate;
+		config.inverted = tests[0].inverted;
+		config.offset = tests[0].offset;
+		config.block0 = tests[0].block0;
+		config.Q5 = tests[0].Q5;
+		config.ST = tests[0].ST;
+		printConfiguration( config );
+		return true;
+	}
+	
+	bool retval = false;
+	if ( hits > 1) {
+		PrintAndLogEx(SUCCESS, "Found [%d] possible matches for modulation.", hits);
+		for(int i=0; i<hits; ++i){
+			retval = testKnownConfigBlock(tests[i].block0);
+			if ( retval ) {				
+				PrintAndLogEx(NORMAL, "--[%d]--------------- << selected this", i+1);
+				config.modulation = tests[i].modulation;
+				config.bitrate = tests[i].bitrate;
+				config.inverted = tests[i].inverted;
+				config.offset = tests[i].offset;
+				config.block0 = tests[i].block0;
+				config.Q5 = tests[i].Q5;
+				config.ST = tests[i].ST;
+			} else {
+				PrintAndLogEx(NORMAL, "--[%d]---------------", i+1);
+			}
+			printConfiguration( tests[i] );
+		}
+	}
+	return retval;
+}
+
+bool testKnownConfigBlock(uint32_t block0) {
+	switch(block0){
+		case T55X7_DEFAULT_CONFIG_BLOCK:
+		case T55X7_RAW_CONFIG_BLOCK:
+		case T55X7_EM_UNIQUE_CONFIG_BLOCK:
+		case T55X7_FDXB_CONFIG_BLOCK:
+		case T55X7_HID_26_CONFIG_BLOCK:
+		case T55X7_PYRAMID_CONFIG_BLOCK:
+		case T55X7_INDALA_64_CONFIG_BLOCK:
+		case T55X7_INDALA_224_CONFIG_BLOCK:
+		case T55X7_GUARDPROXII_CONFIG_BLOCK:
+		case T55X7_VIKING_CONFIG_BLOCK:
+		case T55X7_NORALYS_CONFIG_BLOCK:
+		case T55X7_IOPROX_CONFIG_BLOCK:
+		case T55X7_PRESCO_CONFIG_BLOCK:
+			return true;
+	}
+	return false;
+}
+
+bool testModulation(uint8_t mode, uint8_t modread){
+	switch( mode ){
+		case DEMOD_FSK:
+			if (modread >= DEMOD_FSK1 && modread <= DEMOD_FSK2a) return true;
+			break;
+		case DEMOD_ASK:
+			if (modread == DEMOD_ASK) return true;
+			break;
+		case DEMOD_PSK1:
+			if (modread == DEMOD_PSK1) return true;
+			break;
+		case DEMOD_PSK2:
+			if (modread == DEMOD_PSK2) return true;
+			break;
+		case DEMOD_PSK3:
+			if (modread == DEMOD_PSK3) return true;
+			break;
+		case DEMOD_NRZ:
+			if (modread == DEMOD_NRZ) return true;
+			break;
+		case DEMOD_BI:
+			if (modread == DEMOD_BI) return true;
+			break;
+		case DEMOD_BIa:
+			if (modread == DEMOD_BIa) return true;
+			break;		
+		default:
+			return false;
+	}
+	return false;
+}
+
+bool testQ5Modulation(uint8_t	mode, uint8_t	modread){
+	switch( mode ){
+		case DEMOD_FSK:
+			if (modread >= 4 && modread <= 5) return true;
+			break;
+		case DEMOD_ASK:
+			if (modread == 0) return true;
+			break;
+		case DEMOD_PSK1:
+			if (modread == 1) return true;
+			break;
+		case DEMOD_PSK2:
+			if (modread == 2) return true;
+			break;
+		case DEMOD_PSK3:
+			if (modread == 3) return true;
+			break;
+		case DEMOD_NRZ:
+			if (modread == 7) return true;
+			break;
+		case DEMOD_BI:
+			if (modread == 6) return true;
+			break;
+		default:
+			return false;
+	}
+	return false;
+}
+
+int convertQ5bitRate(uint8_t bitRateRead) {
+	uint8_t expected[] = {8, 16, 32, 40, 50, 64, 100, 128};
+	for (int i=0; i<8; i++)
+		if (expected[i] == bitRateRead)
+			return i;
+
+	return -1;
+}
+
+bool testQ5(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t	clk){
+
+	if ( DemodBufferLen < 64 ) return false;
+	uint8_t si = 0;
+	for (uint8_t idx = 28; idx < 64; idx++){
+		si = idx;
+		if ( PackBits(si, 28, DemodBuffer) == 0x00 ) continue;
+
+		uint8_t safer     = PackBits(si, 4, DemodBuffer); si += 4;     //master key
+		uint8_t resv      = PackBits(si, 8, DemodBuffer); si += 8;
+		// 2nibble must be zeroed.
+		if (safer != 0x6 && safer != 0x9) continue;
+		if ( resv > 0x00) continue;
+		//uint8_t	pageSel   = PackBits(si, 1, DemodBuffer); si += 1;
+		//uint8_t fastWrite = PackBits(si, 1, DemodBuffer); si += 1;
+		si += 1+1;
+		int bitRate       = PackBits(si, 6, DemodBuffer)*2 + 2; si += 6;     //bit rate
+		if (bitRate > 128 || bitRate < 8) continue;
+
+		//uint8_t AOR       = PackBits(si, 1, DemodBuffer); si += 1;   
+		//uint8_t PWD       = PackBits(si, 1, DemodBuffer); si += 1; 
+		//uint8_t pskcr     = PackBits(si, 2, DemodBuffer); si += 2;  //could check psk cr
+		//uint8_t inverse   = PackBits(si, 1, DemodBuffer); si += 1;
+		si += 1+1+2+1;
+		uint8_t modread   = PackBits(si, 3, DemodBuffer); si += 3;
+		uint8_t maxBlk    = PackBits(si, 3, DemodBuffer); si += 3;
+		//uint8_t ST        = PackBits(si, 1, DemodBuffer); si += 1;
+		if (maxBlk == 0) continue;
+		//test modulation
+		if (!testQ5Modulation(mode, modread)) continue;
+		if (bitRate != clk) continue;
+		*fndBitRate = convertQ5bitRate(bitRate);
+		if (*fndBitRate < 0) continue;
+		*offset = idx;
+
+		return true;
+	}
+	return false;
+}
+
+bool testBitRate(uint8_t readRate, uint8_t clk){
+	uint8_t expected[] = {8, 16, 32, 40, 50, 64, 100, 128};
+	if (expected[readRate] == clk)
+		return true;
+
+	return false;
+}
+
+bool test(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk, bool *Q5){
+
+	if ( DemodBufferLen < 64 ) return false;
+	uint8_t si = 0;
+	for (uint8_t idx = 28; idx < 64; idx++){
+		si = idx;
+		if ( PackBits(si, 28, DemodBuffer) == 0x00 ) continue;
+
+		uint8_t safer    = PackBits(si, 4, DemodBuffer); si += 4;     //master key
+		uint8_t resv     = PackBits(si, 4, DemodBuffer); si += 4;     //was 7 & +=7+3 //should be only 4 bits if extended mode
+		// 2nibble must be zeroed.
+		// moved test to here, since this gets most faults first.
+		if ( resv > 0x00) continue;
+
+		int bitRate      = PackBits(si, 6, DemodBuffer); si += 6;     //bit rate (includes extended mode part of rate)
+		uint8_t extend   = PackBits(si, 1, DemodBuffer); si += 1;     //bit 15 extended mode
+		uint8_t modread  = PackBits(si, 5, DemodBuffer); si += 5+2+1; 
+		//uint8_t pskcr   = PackBits(si, 2, DemodBuffer); si += 2+1;  //could check psk cr
+		//uint8_t nml01    = PackBits(si, 1, DemodBuffer); si += 1+5;   //bit 24, 30, 31 could be tested for 0 if not extended mode
+		//uint8_t nml02    = PackBits(si, 2, DemodBuffer); si += 2;
+		
+		//if extended mode
+		bool extMode =( (safer == 0x6 || safer == 0x9) && extend) ? true : false;
+
+		if (!extMode){
+			if (bitRate > 7) continue;
+			if (!testBitRate(bitRate, clk)) continue;
+		} else { //extended mode bitrate = same function to calc bitrate as em4x05
+			if (EM4x05_GET_BITRATE(bitRate) != clk) continue;
+
+		}
+		//test modulation
+		if (!testModulation(mode, modread)) continue;
+		*fndBitRate = bitRate;
+		*offset = idx;
+		*Q5 = false;
+		return true;
+	}
+	if (testQ5(mode, offset, fndBitRate, clk)) {
+		*Q5 = true;
+		return true;
+	}
+	return false;
+}
+
+void printT55xxBlock(const char *blockNum){
+	
+	uint8_t i = config.offset;
+	uint8_t endpos = 32 + i;
+	uint32_t blockData = 0;
+	uint8_t bits[64] = {0x00};
+
+	if ( !DemodBufferLen) return;
+
+	if ( endpos > DemodBufferLen){
+		PrintAndLogEx(NORMAL, "The configured offset %d is too big. Possible offset: %d)", i, DemodBufferLen-32);
+		return;
+	}
+
+	for (; i < endpos; ++i)
+		bits[i - config.offset] = DemodBuffer[i];
+
+	blockData = PackBits(0, 32, bits);
+	uint8_t bytes[4] = {0};
+	num_to_bytes(blockData, 4, bytes);
+
+	PrintAndLogEx(NORMAL, " %s | %08X | %s | %s", blockNum, blockData, sprint_bin(bits,32), sprint_ascii(bytes,4));
+}
+
+int special(const char *Cmd) {
+	uint32_t blockData = 0;
+	uint8_t bits[32] = {0x00};
+
+	PrintAndLogEx(NORMAL, "OFFSET | DATA  | BINARY                              | ASCII");
+	PrintAndLogEx(NORMAL, "-------+-------+-------------------------------------+------");
+	int i,j = 0;
+	for (; j < 64; ++j){
+		
+		for (i = 0; i < 32; ++i)
+			bits[i]=DemodBuffer[j+i];
+	
+		blockData = PackBits(0, 32, bits);
+		
+		PrintAndLogEx(NORMAL, "%02d | 0x%08X | %s",j , blockData, sprint_bin(bits,32));	
+	}
+	return 0;
+}
+
+int printConfiguration( t55xx_conf_block_t b){
+	PrintAndLogEx(NORMAL, "Chip Type  : %s", (b.Q5) ? "T5555(Q5)" : "T55x7");
+	PrintAndLogEx(NORMAL, "Modulation : %s", GetSelectedModulationStr(b.modulation) );
+	PrintAndLogEx(NORMAL, "Bit Rate   : %s", GetBitRateStr(b.bitrate, (b.block0 & T55x7_X_MODE && (b.block0>>28==6 || b.block0>>28==9))) );
+	PrintAndLogEx(NORMAL, "Inverted   : %s", (b.inverted) ? _GREEN_(Yes) : "No" );
+	PrintAndLogEx(NORMAL, "Offset     : %d", b.offset);
+	PrintAndLogEx(NORMAL, "Seq. Term. : %s", (b.ST) ? _GREEN_(Yes) : "No" );
+	PrintAndLogEx(NORMAL, "Block0     : 0x%08X", b.block0);
+	PrintAndLogEx(NORMAL, "");
+	return 0;
+}
+
+int CmdT55xxWakeUp(const char *Cmd) {
+	uint32_t password = 0;
+	uint8_t cmdp = 0;
+	bool errors = false;
+	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+		switch (tolower(param_getchar(Cmd, cmdp))) {
+		case 'h':
+			return usage_t55xx_wakup();
+		case 'p':
+			password = param_get32ex(Cmd, cmdp+1, 0, 16);
+			cmdp += 2;
+			errors = false;
+			break;
+		default:
+			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+			errors = true;
+			break;
+		}
+	}
+	if (errors) return usage_t55xx_wakup();
+
+	UsbCommand c = {CMD_T55XX_WAKEUP, {password, 0, 0}};
+	clearCommandBuffer();
+	SendCommand(&c);
+	PrintAndLogEx(SUCCESS, "Wake up command sent. Try read now");
+	return 0;
+}
+
+int CmdT55xxWriteBlock(const char *Cmd) {
+	uint8_t block = 0xFF; //default to invalid block
+	uint32_t data = 0; //default to blank Block 
+	uint32_t password = 0; //default to blank Block 7
+	bool usepwd = false;
+	bool page1 = false;	
+	bool gotdata = false;
+	bool testMode = false;
+	bool errors = false;
+	uint8_t cmdp = 0;
+	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+		switch (tolower(param_getchar(Cmd, cmdp))) {
+		case 'h':
+			return usage_t55xx_write();
+		case 'b':
+			errors |= param_getdec(Cmd, cmdp+1, &block);
+			cmdp += 2;
+			break;
+		case 'd':
+			data = param_get32ex(Cmd, cmdp+1, 0, 16);
+			gotdata	= true;
+			cmdp += 2;
+			break;
+		case 'p':
+			password = param_get32ex(Cmd, cmdp+1, 0, 16);
+			usepwd = true;
+			cmdp += 2;
+			break;
+		case 't':
+			testMode = true;
+			cmdp++;
+			break;
+		case '1':
+			page1 = true;
+			cmdp++;
+			break;
+		default:
+			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+			errors = true;
+			break;
+		}
+	}
+	if (errors || !gotdata) return usage_t55xx_write();
+
+	if (block > 7) {
+		PrintAndLogEx(WARNING, "Block number must be between 0 and 7");
+		return 0;
+	}
+	
+	UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {data, block, 0}};
+	UsbCommand resp;
+ 	c.d.asBytes[0] = (page1) ? 0x2 : 0; 
+ 	c.d.asBytes[0] |= (testMode) ? 0x4 : 0; 
+
+	char pwdStr[16] = {0};
+	snprintf(pwdStr, sizeof(pwdStr), "pwd: 0x%08X", password);
+	
+	PrintAndLogEx(INFO, "Writing page %d  block: %02d  data: 0x%08X %s", page1, block, data,  (usepwd) ? pwdStr : "" );
+
+	//Password mode
+	if (usepwd) {
+		c.arg[2] = password;
+		c.d.asBytes[0] |= 0x1; 
+	}
+	clearCommandBuffer();
+	SendCommand(&c);
+	if ( !WaitForResponseTimeout(CMD_ACK, &resp, 1500 )){
+		PrintAndLogEx(WARNING, "Error occurred, device did not ACK write operation. (May be due to old firmware)");
+		return 0;
+	}
+	return 1;
+}
+
+int CmdT55xxReadTrace(const char *Cmd) {
+	char cmdp = tolower(param_getchar(Cmd, 0));
+	if (strlen(Cmd) > 1 || cmdp == 'h') return usage_t55xx_trace();
+
+	bool pwdmode = false;
+	uint32_t password = 0;
+	
+	if (strlen(Cmd) == 0) {
+		// sanity check.
+		if (!SanityOfflineCheck(false)) return 1;
+
+		if ( !AquireData( T55x7_PAGE1, REGULAR_READ_MODE_BLOCK, pwdmode, password ) )
+			return 1;
+	}
+
+	if ( config.Q5 ){
+		if (!DecodeT5555TraceBlock()) return 1;
+	} else {
+		if (!DecodeT55xxBlock()) return 1;
+	}
+	
+	if ( !DemodBufferLen ) return 1;
+	
+	RepaintGraphWindow();
+	uint8_t repeat = (config.offset > 5) ? 32 : 0;
+	
+	uint8_t si = config.offset + repeat;
+	uint32_t bl1 = PackBits(si, 32, DemodBuffer);
+	uint32_t bl2 = PackBits(si+32, 32, DemodBuffer);	
+	
+	if (config.Q5) {
+		uint32_t hdr = PackBits(si, 9,  DemodBuffer); si += 9;
+    
+		if (hdr != 0x1FF) {
+		  PrintAndLogEx(FAILED, "Invalid Q5 Trace data header (expected 0x1FF, found %X)", hdr);
+		  return 1;
+		}
+    
+		t5555_tracedata_t data = {.bl1 = bl1, .bl2 = bl2, .icr = 0, .lotidc = '?', .lotid = 0, .wafer = 0, .dw =0};
+			
+		data.icr     = PackBits(si, 2,  DemodBuffer); si += 2;
+		data.lotidc  = 'Z' - PackBits(si, 2,  DemodBuffer); si += 3;
+		
+		data.lotid   = PackBits(si, 4,  DemodBuffer); si += 5;
+		data.lotid <<= 4;
+		data.lotid  |= PackBits(si, 4,  DemodBuffer); si += 5;
+		data.lotid <<= 4;
+		data.lotid  |= PackBits(si, 4,  DemodBuffer); si += 5;
+		data.lotid <<= 4;
+		data.lotid  |= PackBits(si, 4,  DemodBuffer); si += 5;
+		data.lotid <<= 1;
+		data.lotid  |= PackBits(si, 1,  DemodBuffer); si += 1;
+		
+		data.wafer   = PackBits(si, 3,  DemodBuffer); si += 4;
+		data.wafer <<= 2;
+		data.wafer  |= PackBits(si, 2,  DemodBuffer); si += 2;
+		
+		data.dw      = PackBits(si, 2,  DemodBuffer); si += 3;
+		data.dw    <<= 4;
+		data.dw     |= PackBits(si, 4,  DemodBuffer); si += 5;
+		data.dw    <<= 4;
+		data.dw     |= PackBits(si, 4,  DemodBuffer); si += 5;
+		data.dw    <<= 4;
+		data.dw     |= PackBits(si, 4,  DemodBuffer); si += 5;
+	
+		printT5555Trace(data, repeat);
+		
+	} else {
+	
+		t55x7_tracedata_t data = {.bl1 = bl1, .bl2 = bl2, .acl = 0, .mfc = 0, .cid = 0, .year = 0, .quarter = 0, .icr = 0,  .lotid = 0, .wafer = 0, .dw = 0};
+		
+		data.acl = PackBits(si, 8,  DemodBuffer); si += 8;
+		if ( data.acl != 0xE0 ) {
+			PrintAndLogEx(FAILED, "The modulation is most likely wrong since the ACL is not 0xE0. ");
+			return 1;
+		}
+
+		data.mfc     = PackBits(si, 8,  DemodBuffer); si += 8;
+		data.cid     = PackBits(si, 5,  DemodBuffer); si += 5;
+		data.icr     = PackBits(si, 3,  DemodBuffer); si += 3;
+		data.year    = PackBits(si, 4,  DemodBuffer); si += 4;
+		data.quarter = PackBits(si, 2,  DemodBuffer); si += 2;
+		data.lotid   = PackBits(si, 14, DemodBuffer); si += 14;
+		data.wafer   = PackBits(si, 5,  DemodBuffer); si += 5;
+		data.dw      = PackBits(si, 15, DemodBuffer); 
+
+		time_t t = time(NULL);
+		struct tm tm = *localtime(&t);
+		if ( data.year > tm.tm_year-110)
+			data.year += 2000;
+		else
+			data.year += 2010;
+
+		printT55x7Trace(data, repeat);
+	}
+	return 0;
+}
+
+void printT55x7Trace( t55x7_tracedata_t data, uint8_t repeat ){
+	PrintAndLogEx(NORMAL, "-- T55x7 Trace Information ----------------------------------");
+	PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
+	PrintAndLogEx(NORMAL, " ACL Allocation class (ISO/IEC 15963-1)  : 0x%02X (%d)", data.acl, data.acl);
+	PrintAndLogEx(NORMAL, " MFC Manufacturer ID (ISO/IEC 7816-6)    : 0x%02X (%d) - %s", data.mfc, data.mfc, getTagInfo(data.mfc));
+	PrintAndLogEx(NORMAL, " CID                                     : 0x%02X (%d) - %s", data.cid, data.cid, GetModelStrFromCID(data.cid));
+	PrintAndLogEx(NORMAL, " ICR IC Revision                         : %d", data.icr );
+	PrintAndLogEx(NORMAL, " Manufactured");
+	PrintAndLogEx(NORMAL, "     Year/Quarter : %d/%d", data.year, data.quarter);
+	PrintAndLogEx(NORMAL, "     Lot ID       : %d", data.lotid );
+	PrintAndLogEx(NORMAL, "     Wafer number : %d", data.wafer);
+	PrintAndLogEx(NORMAL, "     Die Number   : %d", data.dw);
+	PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
+	PrintAndLogEx(NORMAL, " Raw Data - Page 1");
+	PrintAndLogEx(NORMAL, "     Block 1  : 0x%08X  %s", data.bl1, sprint_bin(DemodBuffer+config.offset+repeat,32) );
+	PrintAndLogEx(NORMAL, "     Block 2  : 0x%08X  %s", data.bl2, sprint_bin(DemodBuffer+config.offset+repeat+32,32) );
+	PrintAndLogEx(NORMAL, "-------------------------------------------------------------");	
+
+	/*
+	TRACE - BLOCK O
+		Bits	Definition								HEX
+		1-8		ACL Allocation class (ISO/IEC 15963-1)	0xE0 
+		9-16	MFC Manufacturer ID (ISO/IEC 7816-6)	0x15 Atmel Corporation
+		17-21	CID										0x1 = Atmel ATA5577M1  0x2 = Atmel ATA5577M2 
+		22-24	ICR IC revision
+		25-28	YEAR (BCD encoded) 						9 (= 2009)
+		29-30	QUARTER									1,2,3,4 
+		31-32	LOT ID
+	
+	TRACE - BLOCK 1
+		1-12	LOT ID  
+		13-17	Wafer number
+		18-32	DW,  die number sequential
+	*/
+}
+
+void printT5555Trace( t5555_tracedata_t data, uint8_t repeat ){
+	PrintAndLogEx(NORMAL, "-- T5555 (Q5) Trace Information -----------------------------");
+	PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
+	PrintAndLogEx(NORMAL, " ICR IC Revision  : %d", data.icr );	
+	PrintAndLogEx(NORMAL, "     Lot          : %c%d", data.lotidc, data.lotid);
+	PrintAndLogEx(NORMAL, "     Wafer number : %d", data.wafer);
+	PrintAndLogEx(NORMAL, "     Die Number   : %d", data.dw);
+	PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
+	PrintAndLogEx(NORMAL, " Raw Data - Page 1");
+	PrintAndLogEx(NORMAL, "     Block 1  : 0x%08X  %s", data.bl1, sprint_bin(DemodBuffer+config.offset+repeat,32) );
+	PrintAndLogEx(NORMAL, "     Block 2  : 0x%08X  %s", data.bl2, sprint_bin(DemodBuffer+config.offset+repeat+32,32) );
+	
+	/*
+		** Q5 **
+		TRACE - BLOCK O and BLOCK1
+		Bits	Definition				HEX
+		1-9		Header                  0x1FF
+		10-11 IC Revision
+		12-13 Lot ID char
+		15-35 Lot ID (NB parity)
+		36-41 Wafer number (NB parity)
+		42-58 DW, die number sequential (NB parity)
+		60-63 Parity bits
+		64    Always zero
+	*/
+}
+
+//need to add Q5 info...
+int CmdT55xxInfo(const char *Cmd){
+	/*
+		Page 0 Block 0 Configuration data.
+		Normal mode
+		Extended mode
+	*/
+	bool pwdmode = false;
+	uint32_t password = 0;
+	char cmdp = tolower(param_getchar(Cmd, 0));
+
+	if (strlen(Cmd) > 1 || cmdp == 'h') return usage_t55xx_info();
+	
+	if (strlen(Cmd) == 0) {
+		// sanity check.
+		if (!SanityOfflineCheck(false)) return 1;
+		
+		if ( !AquireData( T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, pwdmode, password ) )
+			return 1;
+	}
+
+	if (!DecodeT55xxBlock()) return 1;
+
+	// too little space to start with
+	if ( DemodBufferLen < 32) return 1;
+
+	// 
+	//PrintAndLogEx(NORMAL, "Offset+32 ==%d\n DemodLen == %d", config.offset + 32, DemodBufferLen);
+
+	uint8_t si = config.offset;
+	uint32_t block0   = PackBits(si, 32, DemodBuffer);	
+	uint32_t safer    = PackBits(si, 4, DemodBuffer); si += 4;	
+	uint32_t resv     = PackBits(si, 7, DemodBuffer); si += 7;
+	uint32_t dbr      = PackBits(si, 3, DemodBuffer); si += 3;
+	uint32_t extend   = PackBits(si, 1, DemodBuffer); si += 1;
+	uint32_t datamod  = PackBits(si, 5, DemodBuffer); si += 5;
+	uint32_t pskcf    = PackBits(si, 2, DemodBuffer); si += 2;
+	uint32_t aor      = PackBits(si, 1, DemodBuffer); si += 1;	
+	uint32_t otp      = PackBits(si, 1, DemodBuffer); si += 1;	
+	uint32_t maxblk   = PackBits(si, 3, DemodBuffer); si += 3;
+	uint32_t pwd      = PackBits(si, 1, DemodBuffer); si += 1;	
+	uint32_t sst      = PackBits(si, 1, DemodBuffer); si += 1;	
+	uint32_t fw       = PackBits(si, 1, DemodBuffer); si += 1;
+	uint32_t inv      = PackBits(si, 1, DemodBuffer); si += 1;	
+	uint32_t por      = PackBits(si, 1, DemodBuffer); si += 1;
+	
+	if (config.Q5) 
+		PrintAndLogEx(NORMAL, _RED_(*** Warning ***) " Config Info read off a Q5 will not display as expected");
+	
+	PrintAndLogEx(NORMAL, "");
+	PrintAndLogEx(NORMAL, "-- T55x7 Configuration & Tag Information --------------------");
+	PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
+	PrintAndLogEx(NORMAL, " Safer key                 : %s", GetSaferStr(safer));
+	PrintAndLogEx(NORMAL, " reserved                  : %d", resv);
+	PrintAndLogEx(NORMAL, " Data bit rate             : %s", GetBitRateStr(dbr, extend));
+	PrintAndLogEx(NORMAL, " eXtended mode             : %s", (extend) ? _YELLOW_(Yes - Warning) : "No");
+	PrintAndLogEx(NORMAL, " Modulation                : %s", GetModulationStr(datamod));
+	PrintAndLogEx(NORMAL, " PSK clock frequency       : %d", pskcf);
+	PrintAndLogEx(NORMAL, " AOR - Answer on Request   : %s", (aor) ? _GREEN_(Yes) : "No");
+	PrintAndLogEx(NORMAL, " OTP - One Time Pad        : %s", (otp) ? _YELLOW_(Yes - Warning) : "No" );
+	PrintAndLogEx(NORMAL, " Max block                 : %d", maxblk);
+	PrintAndLogEx(NORMAL, " Password mode             : %s", (pwd) ? _GREEN_(Yes) : "No");
+	PrintAndLogEx(NORMAL, " Sequence Start Terminator : %s", (sst) ? _GREEN_(Yes) : "No");
+	PrintAndLogEx(NORMAL, " Fast Write                : %s", (fw)  ? _GREEN_(Yes) : "No");
+	PrintAndLogEx(NORMAL, " Inverse data              : %s", (inv) ? _GREEN_(Yes) : "No");
+	PrintAndLogEx(NORMAL, " POR-Delay                 : %s", (por) ? _GREEN_(Yes) : "No");
+	PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
+	PrintAndLogEx(NORMAL, " Raw Data - Page 0");
+	PrintAndLogEx(NORMAL, "     Block 0  : 0x%08X  %s", block0, sprint_bin(DemodBuffer + config.offset, 32) );
+	PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
+	return 0;
+}
+
+int CmdT55xxDump(const char *Cmd){
+
+	uint32_t password = 0;
+	bool override = false;
+	char cmdp = tolower(param_getchar(Cmd, 0));
+	if ( cmdp == 'h') return usage_t55xx_dump();
+
+	bool usepwd = ( strlen(Cmd) > 0);	
+	if ( usepwd ){
+		password = param_get32ex(Cmd, 0, 0, 16);
+		if (param_getchar(Cmd, 1) =='o' )
+			override = true;
+	}
+	
+	printT5xxHeader(0);
+	for ( uint8_t i = 0; i < 8; ++i)
+		T55xxReadBlock(i, 0, usepwd, override, password);
+
+	printT5xxHeader(1);
+	for ( uint8_t	i = 0; i < 4; i++)
+		T55xxReadBlock(i, 1, usepwd, override, password);		
+
+	return 1;
+}
+
+bool AquireData( uint8_t page, uint8_t block, bool pwdmode, uint32_t password ) {
+	// arg0 bitmodes:
+	// 	bit0 = pwdmode
+	// 	bit1 = page to read from
+	// arg1: which block to read
+	// arg2: password
+	uint8_t arg0 = (page<<1) | pwdmode;
+	UsbCommand c = {CMD_T55XX_READ_BLOCK, {arg0, block, password}};
+	clearCommandBuffer();
+	SendCommand(&c);
+	if ( !WaitForResponseTimeout(CMD_ACK, NULL, 2500) ) {
+		PrintAndLogEx(WARNING, "command execution time out");
+		return false;
+	}
+
+	uint8_t got[8000];
+	if ( !GetFromDevice(BIG_BUF, got, sizeof(got), 0, NULL, 4000, true)) {
+		PrintAndLogEx(WARNING, "command execution time out");
+		return false;
+	}
+	setGraphBuf(got, sizeof(got));
+	// set signal properties low/high/mean/amplitude and is_noise detection
+	computeSignalProperties(got, sizeof(got));
+	RepaintGraphWindow();
+	return !getSignalProperties()->isnoise;
+}
+
+char * GetBitRateStr(uint32_t id, bool xmode) {
+ 	static char buf[25];
+
+	char *retStr = buf;
+	if (xmode) { //xmode bitrate calc is same as em4x05 calc
+		snprintf(retStr,sizeof(buf),"%d - RF/%d", id, EM4x05_GET_BITRATE(id));
+	} else {
+		switch (id){
+		case 0:   snprintf(retStr,sizeof(buf),"%d - RF/8",id);   break;
+		case 1:   snprintf(retStr,sizeof(buf),"%d - RF/16",id);  break;
+		case 2:   snprintf(retStr,sizeof(buf),"%d - RF/32",id);  break;
+		case 3:   snprintf(retStr,sizeof(buf),"%d - RF/40",id);  break;
+		case 4:   snprintf(retStr,sizeof(buf),"%d - RF/50",id);  break;
+		case 5:   snprintf(retStr,sizeof(buf),"%d - RF/64",id);  break;
+		case 6:   snprintf(retStr,sizeof(buf),"%d - RF/100",id); break;
+		case 7:   snprintf(retStr,sizeof(buf),"%d - RF/128",id); break;
+		default:  snprintf(retStr,sizeof(buf),"%d - (Unknown)",id); break;
+		}
+	}
+	return buf;
+}
+
+char * GetSaferStr(uint32_t id){
+	static char buf[40];
+	char *retStr = buf;
+	
+	snprintf(retStr,sizeof(buf),"%d",id);
+	if (id == 6) {
+		snprintf(retStr,sizeof(buf),"%d - passwd",id);
+	}
+	if (id == 9 ){
+		snprintf(retStr,sizeof(buf),"%d - testmode",id);
+	}
+	
+	return buf;
+}
+
+char * GetModulationStr( uint32_t id){
+	static char buf[60];
+	char *retStr = buf;
+	
+	switch (id){
+		case 0: snprintf(retStr,sizeof(buf),"%d - DIRECT (ASK/NRZ)",id); break;
+		case 1:	snprintf(retStr,sizeof(buf),"%d - PSK 1 phase change when input changes",id); break;
+		case 2:	snprintf(retStr,sizeof(buf),"%d - PSK 2 phase change on bitclk if input high",id); break;
+		case 3:	snprintf(retStr,sizeof(buf),"%d - PSK 3 phase change on rising edge of input",id); break;
+		case 4:	snprintf(retStr,sizeof(buf),"%d - FSK 1 RF/8  RF/5",id); break;
+		case 5:	snprintf(retStr,sizeof(buf),"%d - FSK 2 RF/8  RF/10",id); break;
+		case 6:	snprintf(retStr,sizeof(buf),"%d - FSK 1a RF/5  RF/8",id); break;
+		case 7: snprintf(retStr,sizeof(buf),"%d - FSK 2a RF/10  RF/8",id); break;
+		case 8:	snprintf(retStr,sizeof(buf),"%d - Manchester",id); break;
+		case 16: snprintf(retStr,sizeof(buf),"%d - Biphase",id); break;
+		case 0x18:snprintf(retStr,sizeof(buf),"%d - Biphase a - AKA Conditional Dephase Encoding(CDP)",id); break;
+		case 17: snprintf(retStr,sizeof(buf),"%d - Reserved",id); break;
+		default: snprintf(retStr,sizeof(buf),"0x%02X (Unknown)",id); break;
+		}
+	return buf;
+}
+
+char * GetModelStrFromCID(uint32_t cid){
+		
+	static char buf[10];
+	char *retStr = buf;
+	
+	if (cid == 1) snprintf(retStr, sizeof(buf),"ATA5577M1");
+	if (cid == 2) snprintf(retStr, sizeof(buf),"ATA5577M2");	
+	return buf;
+}
+
+char * GetSelectedModulationStr( uint8_t id){
+
+	static char buf[20];
+	char *retStr = buf;
+
+	switch (id){
+		case DEMOD_FSK:	snprintf(retStr,sizeof(buf),"FSK");	break;
+		case DEMOD_FSK1: snprintf(retStr,sizeof(buf),"FSK1"); break;
+		case DEMOD_FSK1a: snprintf(retStr,sizeof(buf),"FSK1a"); break;
+		case DEMOD_FSK2: snprintf(retStr,sizeof(buf),"FSK2"); break;
+		case DEMOD_FSK2a: snprintf(retStr,sizeof(buf),"FSK2a"); break;
+		case DEMOD_ASK: snprintf(retStr,sizeof(buf),"ASK"); break;
+		case DEMOD_NRZ: snprintf(retStr,sizeof(buf),"DIRECT/NRZ"); break;
+		case DEMOD_PSK1: snprintf(retStr,sizeof(buf),"PSK1"); break;
+		case DEMOD_PSK2: snprintf(retStr,sizeof(buf),"PSK2"); break;
+		case DEMOD_PSK3: snprintf(retStr,sizeof(buf),"PSK3"); break;
+		case DEMOD_BI: snprintf(retStr,sizeof(buf),"BIPHASE"); break;
+		case DEMOD_BIa: snprintf(retStr,sizeof(buf),"BIPHASEa - (CDP)"); break;
+		default: snprintf(retStr,sizeof(buf),"(Unknown)"); break;
+		}
+	return buf;
+}
+
+void t55x7_create_config_block( int tagtype ){
+
+	/*
+     T55X7_DEFAULT_CONFIG_BLOCK, T55X7_RAW_CONFIG_BLOCK
+     T55X7_EM_UNIQUE_CONFIG_BLOCK, T55X7_FDXB_CONFIG_BLOCK,
+	 T55X7_FDXB_CONFIG_BLOCK, T55X7_HID_26_CONFIG_BLOCK, T55X7_INDALA_64_CONFIG_BLOCK, T55X7_INDALA_224_CONFIG_BLOCK 
+	 T55X7_GUARDPROXII_CONFIG_BLOCK, T55X7_VIKING_CONFIG_BLOCK,	T55X7_NORALYS_CONFIG_BLOCK, T55X7_IOPROX_CONFIG_BLOCK	
+	*/
+	static char buf[60];
+	char *retStr = buf;
+	
+	switch (tagtype){
+		case 0: snprintf(retStr, sizeof(buf),"%08X - T55X7 Default", T55X7_DEFAULT_CONFIG_BLOCK); break;
+		case 1: snprintf(retStr, sizeof(buf),"%08X - T55X7 Raw", T55X7_RAW_CONFIG_BLOCK); break;
+		case 2: snprintf(retStr, sizeof(buf),"%08X - T5555 Q5 Default", T5555_DEFAULT_CONFIG_BLOCK); break;
+		default:
+			break;
+	}
+	PrintAndLogEx(NORMAL, buf);
+}
+
+int CmdResetRead(const char *Cmd) {
+	UsbCommand c = {CMD_T55XX_RESET_READ, {0,0,0}};
+	clearCommandBuffer();
+	SendCommand(&c);
+	if ( !WaitForResponseTimeout(CMD_ACK, NULL, 2500) ) {
+		PrintAndLogEx(WARNING, "command execution time out");
+		return 0;
+	}
+
+	uint8_t got[BIGBUF_SIZE-1];
+	if ( !GetFromDevice(BIG_BUF, got, sizeof(got), 0, NULL, 2500, false)) {
+		PrintAndLogEx(WARNING, "command execution time out");
+		return 0;
+	}
+	setGraphBuf(got, sizeof(got));
+	return 1;
+}
+
+int CmdT55xxWipe(const char *Cmd) {
+	char writeData[20] = {0};
+	char *ptrData = writeData;
+	char cmdp = param_getchar(Cmd, 0);	
+	if ( cmdp == 'h' || cmdp == 'H') return usage_t55xx_wipe();
+
+	bool Q5 = (cmdp == 'q' || cmdp == 'Q');
+
+	// Try with the default password to reset block 0
+	// With a pwd should work even if pwd bit not set
+	PrintAndLogEx(INFO, "\nBeginning Wipe of a T55xx tag (assuming the tag is not password protected)\n");
+		
+	if ( Q5 )
+		snprintf(ptrData,sizeof(writeData),"b 0 d 6001F004 p 0");
+	else
+		snprintf(ptrData,sizeof(writeData),"b 0 d 000880E0 p 0");
+	
+	if (!CmdT55xxWriteBlock(ptrData)) PrintAndLogEx(WARNING, "Error writing blk 0");
+	
+	for (uint8_t blk = 1; blk<8; blk++) {
+		
+		snprintf(ptrData,sizeof(writeData),"b %d d 0", blk);
+		
+		if (!CmdT55xxWriteBlock(ptrData)) PrintAndLogEx(WARNING, "Error writing blk %d", blk);
+		
+		memset(writeData, 0x00, sizeof(writeData));
+	}
+	return 0;
+}
+
+bool IsCancelled(void) {
+	if (ukbhit()) {
+		int gc = getchar(); (void)gc;
+		PrintAndLogEx(NORMAL, "\naborted via keyboard!\n");
+		return true;
+	}
+	return false;
+}
+
+int CmdT55xxChkPwds(const char *Cmd) {
+	// load a default pwd file.
+	char line[9];
+	char filename[FILE_PATH_SIZE] = {0};
+	int	keycnt = 0;
+	uint8_t stKeyBlock = 20;
+	uint8_t *keyBlock = NULL, *p = NULL;
+    bool found = false;
+	uint8_t timeout = 0;
+
+	memset(line, 0, sizeof(line));
+	
+    char cmdp = tolower(param_getchar(Cmd, 0));
+	if (strlen(Cmd) == 0 || cmdp == 'h') return usage_t55xx_chk();
+	
+	/*
+	if ( T55xxReadBlock(7, 0, 0, 0, 0) ) {
+		
+		// now try to validate it..
+		PrintAndLogEx(WARNING, "\n Block 7 was readable");
+		return 1;
+	}
+	*/
+	
+	uint64_t t1 = msclock();
+
+	if ( cmdp == 'm' ) {	
+		UsbCommand c = {CMD_T55XX_CHKPWDS, {0,0,0} };
+		clearCommandBuffer();
+		SendCommand(&c);
+		UsbCommand resp;
+
+		while ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
+			timeout++;
+			printf("."); fflush(stdout);
+			if (timeout > 180) {
+				PrintAndLogEx(WARNING, "\nno response from Proxmark. Aborting...");
+				return 2;
+			}
+		}
+		
+		if ( resp.arg[0] ) {
+			PrintAndLogEx(SUCCESS, "\nFound a candidate [ %08X ]. Trying to validate", resp.arg[1]);
+			
+			if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, resp.arg[1])) {
+				PrintAndLogEx(INFO, "Aquireing data from device failed. Quitting");
+				return 2;
+			}
+			
+			found = tryDetectModulation();
+			if (found) {
+				PrintAndLogEx(SUCCESS, "Found valid password: [ %08X ]", resp.arg[1]);
+			} else {
+				PrintAndLogEx(WARNING, "Password NOT found.");
+			}
+		} else {
+			PrintAndLogEx(WARNING, "Password NOT found.");
+		}
+		
+		goto out;
+	}
+	
+	keyBlock = calloc(stKeyBlock, 4);
+	if (keyBlock == NULL) return 1;
+
+	if (cmdp == 'i') {
+	
+		int len = strlen(Cmd+2);
+		if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
+		memcpy(filename, Cmd+2, len);
+	
+		FILE * f = fopen( filename , "r");		
+		if ( !f ) {
+			PrintAndLogEx(FAILED, "File: " _YELLOW_(%s) ": not found or locked.", filename);
+			free(keyBlock);
+			return 1;
+		}			
+		
+		while( fgets(line, sizeof(line), f) ){
+			if (strlen(line) < 8 || line[7] == '\n') continue;
+		
+			//goto next line
+			while (fgetc(f) != '\n' && !feof(f)) ;
+		
+			//The line start with # is comment, skip
+			if( line[0]=='#' ) continue;
+
+			if (!isxdigit(line[0])) {
+				PrintAndLogEx(WARNING, "File content error. '%s' must include 8 HEX symbols", line);
+				continue;
+			}
+			
+			line[8] = 0;		
+			
+			// realloc keyblock array size.
+			if ( stKeyBlock - keycnt < 2) {
+				p = realloc(keyBlock, 4 * (stKeyBlock += 10));
+				if (!p) {
+					PrintAndLogEx(WARNING, "Cannot allocate memory for defaultKeys");
+					free(keyBlock);
+					if (f)
+						fclose(f);
+					return 2;
+				}
+				keyBlock = p;
+			}
+			// clear mem
+			memset(keyBlock + 4 * keycnt, 0, 4);
+			
+			num_to_bytes( strtoll(line, NULL, 16), 4, keyBlock + 4*keycnt);
+			
+//			PrintAndLogEx(NORMAL, "chk custom pwd[%2d] %08X", keycnt, bytes_to_num(keyBlock + 4 * keycnt, 4) );
+			keycnt++;			
+			memset(line, 0, sizeof(line));
+		}
+		
+		if (f)
+			fclose(f);
+		
+		if (keycnt == 0) {
+			PrintAndLogEx(WARNING, "No keys found in file");
+			free(keyBlock);
+			return 1;
+		}
+		PrintAndLogEx(SUCCESS, "Loaded %d keys", keycnt);
+		
+		// loop
+		uint64_t testpwd = 0x00;
+		for (uint16_t c = 0; c < keycnt; ++c ) {
+
+			if ( IsOffline() ) {
+				PrintAndLogEx(WARNING, "Device offline\n");
+				free(keyBlock);
+				return  2;
+			}
+		
+			if (IsCancelled()) {
+				free(keyBlock);
+				return 0;
+			}
+		
+			testpwd = bytes_to_num(keyBlock + 4*c, 4);
+
+			PrintAndLogEx(INFO, "Testing %08X", testpwd);
+						
+			if ( !AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, testpwd)) {
+				PrintAndLogEx(INFO, "Aquireing data from device failed. Quitting");
+				free(keyBlock);
+				return 0;
+			}
+			
+			found = tryDetectModulation();
+			if ( found )
+				break;
+ 
+		}
+		if ( found ) 
+			PrintAndLogEx(SUCCESS, "Found valid password: [ %08X ]", testpwd);
+		else
+			PrintAndLogEx(WARNING, "Password NOT found.");		
+	}
+	
+	free(keyBlock);
+	
+out:
+	t1 = msclock() - t1;
+	PrintAndLogEx(SUCCESS, "\nTime in bruteforce: %.0f seconds\n", (float)t1/1000.0);		
+	return 0;
+}
+
+int CmdT55xxBruteForce(const char *Cmd) {
+	
+    uint32_t start_password = 0x00000000; //start password
+    uint32_t end_password   = 0xFFFFFFFF; //end   password
+	uint32_t curr = 0;
+    bool found = false;
+
+
+    char cmdp = tolower(param_getchar(Cmd, 0));
+	if (cmdp == 'h') return usage_t55xx_bruteforce();
+	
+	uint64_t t1 = msclock();
+
+	// Try to read Block 7, first :)
+	
+	// incremental pwd range search
+    start_password = param_get32ex(Cmd, 0, 0, 16);
+	end_password = param_get32ex(Cmd, 1, 0, 16);
+	
+	curr = start_password;
+	
+	if ( start_password >= end_password ) {
+		return usage_t55xx_bruteforce();
+	}
+	
+    PrintAndLogEx(INFO, "Search password range [%08X -> %08X]", start_password, end_password);
+
+    while ( !found ){
+
+		printf("."); fflush(stdout);
+		
+		if (IsCancelled()) {
+			return 0;
+		}
+			
+		if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, curr)) {
+			PrintAndLogEx(WARNING, "Aquiring data from device failed. Quitting");
+			return 0;
+		}
+		
+		found = tryDetectModulation();
+
+		if (curr == end_password)
+			break;
+		curr++;
+    }
+    
+    PrintAndLogEx(NORMAL, "");
+	
+    if (found)
+		PrintAndLogEx(SUCCESS, "Found valid password: [ %08X ]", curr);
+    else
+		PrintAndLogEx(WARNING, "Password NOT found. Last tried: [ %08X ]", --curr);
+
+	t1 = msclock() - t1;
+	PrintAndLogEx(SUCCESS, "\nTime in bruteforce: %.0f seconds\n", (float)t1/1000.0);	
+    return 0;
+}
+
+int tryOnePassword(uint32_t password) {
+	PrintAndLogEx(INFO, "Trying password %08x", password);
+	if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, password)) {
+		PrintAndLogEx(NORMAL, "Acquire data from device failed. Quitting");
+		return -1;
+	}
+
+	if (tryDetectModulation())
+		return 1;
+	else 
+		return 0;
+}
+
+int CmdT55xxRecoverPW(const char *Cmd) {
+	int bit = 0;
+	uint32_t orig_password = 0x0;
+	uint32_t curr_password = 0x0;
+	uint32_t prev_password = 0xffffffff;
+	uint32_t mask = 0x0;
+	int found = 0;
+	char cmdp = tolower(param_getchar(Cmd, 0));
+	if (cmdp == 'h' ) return usage_t55xx_recoverpw();
+
+	orig_password = param_get32ex(Cmd, 0, 0x51243648, 16); //password used by handheld cloners
+
+	// first try fliping each bit in the expected password
+	while (bit < 32) {
+		curr_password = orig_password ^ ( 1 << bit );
+		found = tryOnePassword(curr_password);
+		if (found == -1) return 0;
+		bit++;
+		
+		if (IsCancelled()) return 0;
+	}
+
+	// now try to use partial original password, since block 7 should have been completely
+	// erased during the write sequence and it is possible that only partial password has been
+	// written
+	// not sure from which end the bit bits are written, so try from both ends 
+	// from low bit to high bit
+	bit = 0;
+	while (bit < 32) {
+		mask += ( 1 << bit );
+		curr_password = orig_password & mask;
+		// if updated mask didn't change the password, don't try it again
+		if (prev_password == curr_password) {
+			bit++;
+			continue;
+		}
+		found = tryOnePassword(curr_password);
+		if (found == -1) return 0;
+		bit++;
+		prev_password = curr_password;
+		
+		if (IsCancelled()) return 0;
+	}
+
+	// from high bit to low
+	bit = 0;
+	mask = 0xffffffff;
+	while (bit < 32) {
+		mask -= ( 1 << bit );
+		curr_password = orig_password & mask;
+		// if updated mask didn't change the password, don't try it again
+		if (prev_password == curr_password) {
+			bit++;
+			continue;
+		}
+		found = tryOnePassword(curr_password);
+		if (found == -1)
+			return 0;
+		bit++;
+		prev_password = curr_password;
+		
+		if (IsCancelled()) return 0;
+	}
+
+	PrintAndLogEx(NORMAL, "");
+
+	if (found == 1)
+		PrintAndLogEx(SUCCESS, "Found valid password: [%08x]", curr_password);
+	else
+		PrintAndLogEx(WARNING, "Password NOT found.");
+
+	return 0;
+}
+
+// note length of data returned is different for different chips.  
+// some return all page 1 (64 bits) and others return just that block (32 bits) 
+// unfortunately the 64 bits makes this more likely to get a false positive...
+bool tryDetectP1(bool getData) {
+	uint8_t preamble[] = {1,1,1,0,0,0,0,0,0,0,0,1,0,1,0,1};
+	size_t startIdx = 0;
+	uint8_t fc1 = 0, fc2 = 0, ans = 0;
+	int clk = 0, firstClockEdge = 0;
+	bool st = true;
+
+	if ( getData ) {
+		if ( !AquireData(T55x7_PAGE1, 1, false, 0) )
+			return false;
+	}
+
+	// try fsk clock detect. if successful it cannot be any other type of modulation...  (in theory...)
+	ans = fskClocks(&fc1, &fc2, (uint8_t *)&clk, &firstClockEdge);
+	if (ans && ((fc1==10 && fc2==8) || (fc1==8 && fc2==5))) {
+		if ( FSKrawDemod("0 0", false) && 
+			  preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) && 
+			  (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
+			return true;
+		}
+		if ( FSKrawDemod("0 1", false) && 
+			  preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) && 
+			  (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
+			return true;
+		}
+		return false;
+	}
+
+	// try ask clock detect.  it could be another type even if successful.
+	clk = GetAskClock("", false);
+	if (clk > 0) {
+		if ( ASKDemod_ext("0 0 1", false, false, 1, &st) &&
+			  preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) && 
+			  (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
+			return true;
+		}
+		st = true;
+		if ( ASKDemod_ext("0 1 1", false, false, 1, &st)  &&
+				preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) && 
+				(DemodBufferLen == 32 || DemodBufferLen == 64) ) {
+			return true;
+		}
+		if ( ASKbiphaseDemod("0 0 0 2", false) &&
+				preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) && 
+				(DemodBufferLen == 32 || DemodBufferLen == 64) ) {
+			return true;
+		}
+		if ( ASKbiphaseDemod("0 0 1 2", false) &&
+				preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) && 
+				(DemodBufferLen == 32 || DemodBufferLen == 64) ) {
+			return true;
+		}
+	}
+
+	// try NRZ clock detect.  it could be another type even if successful.
+	clk = GetNrzClock("", false); //has the most false positives :(
+	if (clk > 0) {
+		if ( NRZrawDemod("0 0 1", false)  &&
+				preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) && 
+				(DemodBufferLen == 32 || DemodBufferLen == 64) ) {
+			return true;
+		}
+		if ( NRZrawDemod("0 1 1", false)  &&
+				preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) && 
+				(DemodBufferLen == 32 || DemodBufferLen == 64) ) {
+			return true;
+		}
+	}
+	
+	// Fewer card uses PSK
+	// try psk clock detect. if successful it cannot be any other type of modulation... (in theory...)
+	clk = GetPskClock("", false);
+	if (clk > 0) {
+		// allow undo
+		// save_restoreGB(1);
+		// skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)
+		//CmdLtrim("160");
+		if ( PSKDemod("0 0 6", false) &&
+			  preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) && 
+			  (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
+			//save_restoreGB(0);
+			return true;
+		}
+		if ( PSKDemod("0 1 6", false) &&
+			  preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) && 
+			  (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
+			//save_restoreGB(0);
+			return true;
+		}
+		// PSK2 - needs a call to psk1TOpsk2.
+		if ( PSKDemod("0 0 6", false)) {
+			psk1TOpsk2(DemodBuffer, DemodBufferLen);
+			if (preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) && 
+				  (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
+				//save_restoreGB(0);
+				return true;
+			}
+		} // inverse waves does not affect PSK2 demod
+		//undo trim samples
+		//save_restoreGB(0); 
+		// no other modulation clocks = 2 or 4 so quit searching
+		if (fc1 != 8) return false;
+	}
+
+	return false;
+}
+//  does this need to be a callable command?
+int CmdT55xxDetectPage1(const char *Cmd){
+	bool errors = false;
+	bool useGB = false;
+	bool usepwd = false;
+	uint32_t password = 0;
+	uint8_t cmdp = 0;
+
+	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+		switch (tolower(param_getchar(Cmd, cmdp))) {
+		case 'h':
+			return usage_t55xx_detectP1();
+		case 'p':
+			password = param_get32ex(Cmd, cmdp+1, 0, 16);
+			usepwd = true;
+			cmdp += 2;
+			break;
+		case '1':
+			// use Graphbuffer data
+			useGB = true;
+			cmdp++;
+			break;
+		default:
+			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+			errors = true;
+			break;
+		}
+	}
+	if (errors) return usage_t55xx_detectP1();
+
+	if ( !useGB ) {
+		if ( !AquireData(T55x7_PAGE1, 1, usepwd, password) )
+			return false;
+	}
+	bool success = tryDetectP1(false);
+	if (success) PrintAndLogEx(SUCCESS, "T55xx chip found!");
+	return success;
+}
+
+int CmdT55xxSetDeviceConfig(const char *Cmd){
+	uint8_t startgap = 0, writegap = 0;
+	uint8_t write0 = 0, write1 = 0, readgap = 0;
+	bool errors = false, shall_persist = false;
+	uint8_t cmdp = 0;
+	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+		switch (tolower(param_getchar(Cmd, cmdp))) {
+		case 'h':
+			return usage_lf_deviceconfig();
+		case 'a':
+			errors |= param_getdec(Cmd, cmdp+1, &startgap);
+			cmdp += 2;
+			break;
+		case 'b':
+			errors |= param_getdec(Cmd, cmdp+1, &writegap);
+			cmdp += 2;
+			break;
+		case 'c':
+			errors |= param_getdec(Cmd, cmdp+1, &write0);
+			cmdp += 2;
+			break;
+		case 'd':
+			errors |= param_getdec(Cmd, cmdp+1, &write1);
+			cmdp += 2;
+			break;
+		case 'e':
+			errors |= param_getdec(Cmd, cmdp+1, &readgap);
+			cmdp += 2;
+			break;
+		case 'p':
+			shall_persist = true;
+			cmdp++;
+			break;
+		default:
+			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+			errors = 1;
+			break;
+		}
+	}
+
+	//Validations
+	if (errors || cmdp == 0) return usage_lf_deviceconfig();
+	
+	t55xx_config config = { startgap*8, writegap*8, write0*8, write1*8, readgap*8 };
+
+	UsbCommand c = {CMD_SET_LF_T55XX_CONFIG, {shall_persist,0,0} };
+	memcpy(c.d.asBytes, &config, sizeof(t55xx_config));
+	clearCommandBuffer();
+	SendCommand(&c);
+	return 0;
+}
+
+static command_t CommandTable[] = {
+	{"help",		CmdHelp,           1, "This help"},
+	{"bruteforce",	CmdT55xxBruteForce,0, "<start password> <end password> [i <*.dic>] Simple bruteforce attack to find password"},
+	{"config",		CmdT55xxSetConfig, 1, "Set/Get T55XX configuration (modulation, inverted, offset, rate)"},
+	{"chk",			CmdT55xxChkPwds,   1, "Check passwords"},
+	{"detect",		CmdT55xxDetect,    1, "[1] Try detecting the tag modulation from reading the configuration block."},
+	{"deviceconfig", CmdT55xxSetDeviceConfig, 1, "Set/Get T55XX device configuration (startgap, writegap, write0, write1, readgap"},
+	{"p1detect",	CmdT55xxDetectPage1,1, "[1] Try detecting if this is a t55xx tag by reading page 1"},
+	{"dump",		CmdT55xxDump,      0, "[password] [o] Dump T55xx card block 0-7. Optional [password], [override]"},
+	{"info",		CmdT55xxInfo,      1, "[1] Show T55x7 configuration data (page 0/ blk 0)"},
+	{"read",		CmdT55xxReadBlock, 0, "b <block> p [password] [o] [1] -- Read T55xx block data. Optional [p password], [override], [page1]"},
+	{"resetread",	CmdResetRead,      0, "Send Reset Cmd then lf read the stream to attempt to identify the start of it (needs a demod and/or plot after)"},
+	{"recoverpw",	CmdT55xxRecoverPW, 0, "[password] Try to recover from bad password write from a cloner. Only use on PW protected chips!"},
+	{"special",		special,           0, "Show block changes with 64 different offsets"},	
+	{"trace",		CmdT55xxReadTrace, 1, "[1] Show T55x7 traceability data (page 1/ blk 0-1)"},
+	{"wakeup",		CmdT55xxWakeUp,    0, "Send AOR wakeup command"},
+	{"wipe",		CmdT55xxWipe,      0, "[q] Wipe a T55xx tag and set defaults (will destroy any data on tag)"},
+	{"write",		CmdT55xxWriteBlock,0, "b <block> d <data> p [password] [1] -- Write T55xx block data. Optional [p password], [page1]"},
+	{NULL, NULL, 0, NULL}
+};
+
+int CmdLFT55XX(const char *Cmd) {
+	clearCommandBuffer();
+	CmdsParse(CommandTable, Cmd);
+	return 0;
+}
+
+int CmdHelp(const char *Cmd) {
+	CmdsHelp(CommandTable);
+	return 0;
+}
diff --git a/client/cmdlft55xx.h b/client/cmdlft55xx.h
index 46de0c359..775f7ccca 100644
--- a/client/cmdlft55xx.h
+++ b/client/cmdlft55xx.h
@@ -1,171 +1,171 @@
-//-----------------------------------------------------------------------------
-//
-// This code is licensed to you under the terms of the GNU GPL, version 2 or,
-// at your option, any later version. See the LICENSE.txt file for the text of
-// the license.
-//-----------------------------------------------------------------------------
-// Low frequency T55xx commands
-//-----------------------------------------------------------------------------
-
-#ifndef CMDLFT55XX_H__
-#define CMDLFT55XX_H__
-
-#include <stdio.h>
-#include <string.h>
-#include <inttypes.h>
-#include <time.h>
-#include <ctype.h>
-#include "proxmark3.h"
-#include "ui.h"
-#include "graph.h"
-#include "comms.h"
-#include "cmdparser.h"
-#include "cmddata.h"
-#include "cmdlf.h"
-#include "util.h"
-#include "lfdemod.h"
-#include "cmdhf14a.h" //for getTagInfo
-
-
-#define T55x7_CONFIGURATION_BLOCK 0x00
-#define T55x7_PAGE0 0x00
-#define T55x7_PAGE1 0x01
-#define T55x7_PWD	0x00000010
-#define REGULAR_READ_MODE_BLOCK 0xFF
-
-// config blocks
-#define T55X7_DEFAULT_CONFIG_BLOCK      0x000880E8      // ASK, compat mode, data rate 32, manchester, STT, 7 data blocks
-#define T55X7_RAW_CONFIG_BLOCK          0x000880E0      // ASK, compat mode, data rate 32, manchester, 7 data blocks
-#define T55X7_EM_UNIQUE_CONFIG_BLOCK    0x00148040      // ASK, emulate em4x02/unique - compat mode, manchester, data rate 64, 2 data blocks
-// FDXB requires data inversion and BiPhase 57 is simply BiPhase 50 inverted, so we can either do it using the modulation scheme or the inversion flag
-// we've done both below to prove that it works either way, and the modulation value for BiPhase 50 in the Atmel data sheet of binary "10001" (17) is a typo,
-// and it should actually be "10000" (16)
-// #define T55X7_FDXB_CONFIG_BLOCK         903F8080  // emulate fdx-b - xtended mode, BiPhase ('57), data rate 32, 4 data blocks
-#define T55X7_FDXB_CONFIG_BLOCK         0x903F0082  // emulate fdx-b - xtended mode, BiPhase ('50), invert data, data rate 32, 4 data blocks
-#define T55X7_HID_26_CONFIG_BLOCK       0x00107060  // hid 26 bit - compat mode, FSK2a, data rate 50, 3 data blocks
-#define T55X7_PYRAMID_CONFIG_BLOCK		0x00107080  // Pyramid 26 bit - compat mode, FSK2a, data rate 50, 4 data blocks
-#define T55X7_INDALA_64_CONFIG_BLOCK    0x00081040  // emulate indala 64 bit - compat mode, PSK1, psk carrier FC * 2, data rate 32, maxblock 2
-#define T55X7_INDALA_224_CONFIG_BLOCK   0x000810E0  // emulate indala 224 bit - compat mode, PSK1, psk carrier FC * 2, data rate 32, maxblock 7
-#define T55X7_GUARDPROXII_CONFIG_BLOCK	0x00150060	// bitrate 64pcb, Direct modulation, Biphase, 3 data blocks
-#define T55X7_VIKING_CONFIG_BLOCK		0x00088040	// ASK, compat mode, data rate 32, Manchester, 2 data blocks
-#define T55X7_NORALYS_CONFIG_BLOCK		0x00088C6A	// ASK, compat mode,   (NORALYS - KCP3000)
-#define T55X7_IOPROX_CONFIG_BLOCK		0x00147040  // ioprox - FSK2a, data rate 64, 2 data blocks
-#define T55X7_PRESCO_CONFIG_BLOCK		0x00088088  // ASK, data rate 32, Manchester, 5 data blocks, STT
-#define T55X7_NEDAP_64_CONFIG_BLOCK		0x907f0042  // BiPhase,  data rate 64, 3 data blocks
-#define T55X7_NEDAP_128_CONFIG_BLOCK	0x907f0082  // BiPhase,  data rate 64, 5 data blocks
-#define T55X7_bin 0b0010
-
-#define T5555_DEFAULT_CONFIG_BLOCK		0x6001F004  // data rate 64 , ask, manchester, 2 data blocks?
-enum {
-	T55x7_RAW = 0x00,
-	T55x7_DEFAULT = 0x00,
-	T5555_DEFAULT = 0x01,
-	EM_UNIQUE  = 0x0,
-	FDBX = 0x02,
-	HID_26 = 0x03,
-	INDALA_64 = 0x04,
-	INDALA_224 = 0x05,
-	GUARDPROXXII = 0x06,
-	VIKING = 0x07,
-	NORALSYS = 0x08,
-	IOPROX = 0x09,
-	NEDAP_64 = 0x0A,
-	NEDAP_128 = 0x0B,
-} t55xx_tag;
-
-typedef struct {
-	uint32_t bl1;
-	uint32_t bl2; 
-	uint32_t acl; 
-	uint32_t mfc; 
-	uint32_t cid; 
-	uint32_t year; 
-	uint32_t quarter; 
-	uint32_t icr;
-	uint32_t lotid; 
-	uint32_t wafer; 
-	uint32_t dw;
-} t55x7_tracedata_t;
-
-typedef struct {
-	uint32_t bl1;
-	uint32_t bl2;
-	uint32_t icr;
-	char lotidc;
-	uint32_t lotid;
-	uint32_t wafer;
-	uint32_t dw;
-} t5555_tracedata_t;
-
-typedef struct {
-	enum {
-		DEMOD_NRZ  = 0x00,    
-		DEMOD_PSK1 = 0x01,
-		DEMOD_PSK2 = 0x02,
-		DEMOD_PSK3 = 0x03,
-		DEMOD_FSK1  = 0x04,     
-		DEMOD_FSK1a = 0x05,     
-		DEMOD_FSK2  = 0x06,     
-		DEMOD_FSK2a = 0x07, 
-		DEMOD_FSK   = 0xF0, //generic FSK (auto detect FCs)    
-		DEMOD_ASK  = 0x08,
-		DEMOD_BI   = 0x10,
-		DEMOD_BIa  = 0x18,		
-	}  modulation;
-	bool inverted;
-	uint8_t offset;
-	uint32_t block0;
-	enum {
-		RF_8 = 0x00,
-		RF_16 = 0x01,
-		RF_32 = 0x02,
-		RF_40 = 0x03,
-		RF_50 = 0x04,
-		RF_64 = 0x05,
-		RF_100 = 0x06,
-		RF_128 = 0x07,
-	} bitrate;
-	bool Q5;
-	bool ST;
-} t55xx_conf_block_t;
-
-t55xx_conf_block_t Get_t55xx_Config(void);
-void Set_t55xx_Config(t55xx_conf_block_t conf);
-
-extern int CmdLFT55XX(const char *Cmd);
-extern int CmdT55xxChk(const char *Cmd);
-extern int CmdT55xxBruteForce(const char *Cmd);
-extern int CmdT55xxSetConfig(const char *Cmd);
-extern int CmdT55xxReadBlock(const char *Cmd);
-extern int CmdT55xxWriteBlock(const char *Cmd);
-extern int CmdT55xxReadTrace(const char *Cmd);
-extern int CmdT55xxInfo(const char *Cmd);
-extern int CmdT55xxDetect(const char *Cmd);
-extern int CmdResetRead(const char *Cmd);
-extern int CmdT55xxWipe(const char *Cmd);
-
-char * GetBitRateStr(uint32_t id, bool xmode);
-char * GetSaferStr(uint32_t id);
-char * GetModulationStr( uint32_t id);
-char * GetModelStrFromCID(uint32_t cid);
-char * GetSelectedModulationStr( uint8_t id);
-uint32_t PackBits(uint8_t start, uint8_t len, uint8_t *bitstream);
-void printT5xxHeader(uint8_t page);
-void printT55xxBlock(const char *demodStr);
-int printConfiguration( t55xx_conf_block_t b);
-
-bool DecodeT55xxBlock(void);
-bool tryDetectModulation(void);
-bool testKnownConfigBlock(uint32_t block0);
-extern bool tryDetectP1(bool getData);
-bool test(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk, bool *Q5);
-int special(const char *Cmd);
-bool AquireData( uint8_t page, uint8_t block, bool pwdmode, uint32_t password );
-bool AquireDataEx( uint8_t page, uint8_t block, bool pwdmode, uint32_t password, uint32_t timing ) ;
-
-bool detectPassword(int password);
-
-void printT55x7Trace( t55x7_tracedata_t data, uint8_t repeat );
-void printT5555Trace( t5555_tracedata_t data, uint8_t repeat );
-
-#endif
+//-----------------------------------------------------------------------------
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// Low frequency T55xx commands
+//-----------------------------------------------------------------------------
+
+#ifndef CMDLFT55XX_H__
+#define CMDLFT55XX_H__
+
+#include <stdio.h>
+#include <string.h>
+#include <inttypes.h>
+#include <time.h>
+#include <ctype.h>
+#include "proxmark3.h"
+#include "ui.h"
+#include "graph.h"
+#include "comms.h"
+#include "cmdparser.h"
+#include "cmddata.h"
+#include "cmdlf.h"
+#include "util.h"
+#include "lfdemod.h"
+#include "cmdhf14a.h" //for getTagInfo
+
+
+#define T55x7_CONFIGURATION_BLOCK 0x00
+#define T55x7_PAGE0 0x00
+#define T55x7_PAGE1 0x01
+#define T55x7_PWD	0x00000010
+#define REGULAR_READ_MODE_BLOCK 0xFF
+
+// config blocks
+#define T55X7_DEFAULT_CONFIG_BLOCK      0x000880E8      // ASK, compat mode, data rate 32, manchester, STT, 7 data blocks
+#define T55X7_RAW_CONFIG_BLOCK          0x000880E0      // ASK, compat mode, data rate 32, manchester, 7 data blocks
+#define T55X7_EM_UNIQUE_CONFIG_BLOCK    0x00148040      // ASK, emulate em4x02/unique - compat mode, manchester, data rate 64, 2 data blocks
+// FDXB requires data inversion and BiPhase 57 is simply BiPhase 50 inverted, so we can either do it using the modulation scheme or the inversion flag
+// we've done both below to prove that it works either way, and the modulation value for BiPhase 50 in the Atmel data sheet of binary "10001" (17) is a typo,
+// and it should actually be "10000" (16)
+// #define T55X7_FDXB_CONFIG_BLOCK         903F8080  // emulate fdx-b - xtended mode, BiPhase ('57), data rate 32, 4 data blocks
+#define T55X7_FDXB_CONFIG_BLOCK         0x903F0082  // emulate fdx-b - xtended mode, BiPhase ('50), invert data, data rate 32, 4 data blocks
+#define T55X7_HID_26_CONFIG_BLOCK       0x00107060  // hid 26 bit - compat mode, FSK2a, data rate 50, 3 data blocks
+#define T55X7_PYRAMID_CONFIG_BLOCK		0x00107080  // Pyramid 26 bit - compat mode, FSK2a, data rate 50, 4 data blocks
+#define T55X7_INDALA_64_CONFIG_BLOCK    0x00081040  // emulate indala 64 bit - compat mode, PSK1, psk carrier FC * 2, data rate 32, maxblock 2
+#define T55X7_INDALA_224_CONFIG_BLOCK   0x000810E0  // emulate indala 224 bit - compat mode, PSK1, psk carrier FC * 2, data rate 32, maxblock 7
+#define T55X7_GUARDPROXII_CONFIG_BLOCK	0x00150060	// bitrate 64pcb, Direct modulation, Biphase, 3 data blocks
+#define T55X7_VIKING_CONFIG_BLOCK		0x00088040	// ASK, compat mode, data rate 32, Manchester, 2 data blocks
+#define T55X7_NORALYS_CONFIG_BLOCK		0x00088C6A	// ASK, compat mode,   (NORALYS - KCP3000)
+#define T55X7_IOPROX_CONFIG_BLOCK		0x00147040  // ioprox - FSK2a, data rate 64, 2 data blocks
+#define T55X7_PRESCO_CONFIG_BLOCK		0x00088088  // ASK, data rate 32, Manchester, 5 data blocks, STT
+#define T55X7_NEDAP_64_CONFIG_BLOCK		0x907f0042  // BiPhase,  data rate 64, 3 data blocks
+#define T55X7_NEDAP_128_CONFIG_BLOCK	0x907f0082  // BiPhase,  data rate 64, 5 data blocks
+#define T55X7_bin 0b0010
+
+#define T5555_DEFAULT_CONFIG_BLOCK		0x6001F004  // data rate 64 , ask, manchester, 2 data blocks?
+enum {
+	T55x7_RAW = 0x00,
+	T55x7_DEFAULT = 0x00,
+	T5555_DEFAULT = 0x01,
+	EM_UNIQUE  = 0x0,
+	FDBX = 0x02,
+	HID_26 = 0x03,
+	INDALA_64 = 0x04,
+	INDALA_224 = 0x05,
+	GUARDPROXXII = 0x06,
+	VIKING = 0x07,
+	NORALSYS = 0x08,
+	IOPROX = 0x09,
+	NEDAP_64 = 0x0A,
+	NEDAP_128 = 0x0B,
+} t55xx_tag;
+
+typedef struct {
+	uint32_t bl1;
+	uint32_t bl2; 
+	uint32_t acl; 
+	uint32_t mfc; 
+	uint32_t cid; 
+	uint32_t year; 
+	uint32_t quarter; 
+	uint32_t icr;
+	uint32_t lotid; 
+	uint32_t wafer; 
+	uint32_t dw;
+} t55x7_tracedata_t;
+
+typedef struct {
+	uint32_t bl1;
+	uint32_t bl2;
+	uint32_t icr;
+	char lotidc;
+	uint32_t lotid;
+	uint32_t wafer;
+	uint32_t dw;
+} t5555_tracedata_t;
+
+typedef struct {
+	enum {
+		DEMOD_NRZ  = 0x00,    
+		DEMOD_PSK1 = 0x01,
+		DEMOD_PSK2 = 0x02,
+		DEMOD_PSK3 = 0x03,
+		DEMOD_FSK1  = 0x04,     
+		DEMOD_FSK1a = 0x05,     
+		DEMOD_FSK2  = 0x06,     
+		DEMOD_FSK2a = 0x07, 
+		DEMOD_FSK   = 0xF0, //generic FSK (auto detect FCs)    
+		DEMOD_ASK  = 0x08,
+		DEMOD_BI   = 0x10,
+		DEMOD_BIa  = 0x18,		
+	}  modulation;
+	bool inverted;
+	uint8_t offset;
+	uint32_t block0;
+	enum {
+		RF_8 = 0x00,
+		RF_16 = 0x01,
+		RF_32 = 0x02,
+		RF_40 = 0x03,
+		RF_50 = 0x04,
+		RF_64 = 0x05,
+		RF_100 = 0x06,
+		RF_128 = 0x07,
+	} bitrate;
+	bool Q5;
+	bool ST;
+} t55xx_conf_block_t;
+
+t55xx_conf_block_t Get_t55xx_Config(void);
+void Set_t55xx_Config(t55xx_conf_block_t conf);
+
+extern int CmdLFT55XX(const char *Cmd);
+extern int CmdT55xxChk(const char *Cmd);
+extern int CmdT55xxBruteForce(const char *Cmd);
+extern int CmdT55xxSetConfig(const char *Cmd);
+extern int CmdT55xxReadBlock(const char *Cmd);
+extern int CmdT55xxWriteBlock(const char *Cmd);
+extern int CmdT55xxReadTrace(const char *Cmd);
+extern int CmdT55xxInfo(const char *Cmd);
+extern int CmdT55xxDetect(const char *Cmd);
+extern int CmdResetRead(const char *Cmd);
+extern int CmdT55xxWipe(const char *Cmd);
+
+char * GetBitRateStr(uint32_t id, bool xmode);
+char * GetSaferStr(uint32_t id);
+char * GetModulationStr( uint32_t id);
+char * GetModelStrFromCID(uint32_t cid);
+char * GetSelectedModulationStr( uint8_t id);
+uint32_t PackBits(uint8_t start, uint8_t len, uint8_t *bitstream);
+void printT5xxHeader(uint8_t page);
+void printT55xxBlock(const char *demodStr);
+int printConfiguration( t55xx_conf_block_t b);
+
+bool DecodeT55xxBlock(void);
+bool tryDetectModulation(void);
+bool testKnownConfigBlock(uint32_t block0);
+extern bool tryDetectP1(bool getData);
+bool test(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk, bool *Q5);
+int special(const char *Cmd);
+bool AquireData( uint8_t page, uint8_t block, bool pwdmode, uint32_t password );
+bool AquireDataEx( uint8_t page, uint8_t block, bool pwdmode, uint32_t password, uint32_t timing ) ;
+
+bool detectPassword(int password);
+
+void printT55x7Trace( t55x7_tracedata_t data, uint8_t repeat );
+void printT5555Trace( t5555_tracedata_t data, uint8_t repeat );
+
+#endif
diff --git a/common/cmd.c b/common/cmd.c
index dec095750..bed968c2c 100644
--- a/common/cmd.c
+++ b/common/cmd.c
@@ -1,64 +1,64 @@
-/*
- * Proxmark send and receive commands
- *
- * Copyright (c) 2012, Roel Verdult
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holders nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ''AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @file cmd.c
- * @brief
- */
-#include "cmd.h"
-
-uint8_t cmd_send(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void* data, size_t len) {
-	UsbCommand txcmd;
-
-	for (size_t i=0; i < sizeof(UsbCommand); i++)
-		((uint8_t*)&txcmd)[i] = 0x00;
-
-	// Compose the outgoing command frame
-	txcmd.cmd = cmd;
-	txcmd.arg[0] = arg0;
-	txcmd.arg[1] = arg1;	
-	txcmd.arg[2] = arg2;
-
-	// Add the (optional) content to the frame, with a maximum size of USB_CMD_DATA_SIZE
-	if (data && len) {
-		len = MIN(len, USB_CMD_DATA_SIZE);
-		for (size_t i=0; i<len; i++) {
-			txcmd.d.asBytes[i] = ((uint8_t*)data)[i];
-		}
-	}
-	
-	uint32_t sendlen = 0;
-	// Send frame and make sure all bytes are transmitted
-	sendlen = usb_write( (uint8_t*)&txcmd, sizeof(UsbCommand) );
-
-#ifdef WITH_FPC
-//	usart_init();
-//	usart_writebuffer( (uint8_t*)&txcmd, sizeof(UsbCommand) );
-#endif
-	
-	return sendlen;
+/*
+ * Proxmark send and receive commands
+ *
+ * Copyright (c) 2012, Roel Verdult
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ''AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @file cmd.c
+ * @brief
+ */
+#include "cmd.h"
+
+uint8_t cmd_send(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void* data, size_t len) {
+	UsbCommand txcmd;
+
+	for (size_t i=0; i < sizeof(UsbCommand); i++)
+		((uint8_t*)&txcmd)[i] = 0x00;
+
+	// Compose the outgoing command frame
+	txcmd.cmd = cmd;
+	txcmd.arg[0] = arg0;
+	txcmd.arg[1] = arg1;	
+	txcmd.arg[2] = arg2;
+
+	// Add the (optional) content to the frame, with a maximum size of USB_CMD_DATA_SIZE
+	if (data && len) {
+		len = MIN(len, USB_CMD_DATA_SIZE);
+		for (size_t i=0; i<len; i++) {
+			txcmd.d.asBytes[i] = ((uint8_t*)data)[i];
+		}
+	}
+	
+	uint32_t sendlen = 0;
+	// Send frame and make sure all bytes are transmitted
+	sendlen = usb_write( (uint8_t*)&txcmd, sizeof(UsbCommand) );
+
+#ifdef WITH_FPC
+//	usart_init();
+//	usart_writebuffer( (uint8_t*)&txcmd, sizeof(UsbCommand) );
+#endif
+	
+	return sendlen;
 }
\ No newline at end of file
diff --git a/common/cmd.h b/common/cmd.h
index 9aa6bec33..753e0a794 100644
--- a/common/cmd.h
+++ b/common/cmd.h
@@ -1,45 +1,45 @@
-/*
- * Proxmark send and receive commands
- *
- * Copyright (c) 2010, Roel Verdult
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holders nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ''AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @file cmd.h
- * @brief
- */
-
-#ifndef _PROXMARK_CMD_H_
-#define _PROXMARK_CMD_H_
-
-#include "common.h"
-#include "usb_cmd.h"
-#include "usb_cdc.h"
-#include "usart.h"
-#include "proxmark3.h"
-
-uint8_t cmd_send(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void* data, size_t len);
-
-#endif // _PROXMARK_CMD_H_
-
+/*
+ * Proxmark send and receive commands
+ *
+ * Copyright (c) 2010, Roel Verdult
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ''AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @file cmd.h
+ * @brief
+ */
+
+#ifndef _PROXMARK_CMD_H_
+#define _PROXMARK_CMD_H_
+
+#include "common.h"
+#include "usb_cmd.h"
+#include "usb_cdc.h"
+#include "usart.h"
+#include "proxmark3.h"
+
+uint8_t cmd_send(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void* data, size_t len);
+
+#endif // _PROXMARK_CMD_H_
+
diff --git a/common/usb_cdc.c b/common/usb_cdc.c
index f1d9c157f..a0005017e 100644
--- a/common/usb_cdc.c
+++ b/common/usb_cdc.c
@@ -1,948 +1,948 @@
-/*
- * at91sam7s USB CDC device implementation
- *
- * Copyright (c) 2012, Roel Verdult
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holders nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ''AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * based on the "Basic USB Example" from ATMEL (doc6123.pdf)
- *
- * @file usb_cdc.c
- * @brief
- */
-
-#include "usb_cdc.h"
-/*
-AT91SAM7S256  USB Device Port
-• Embedded 328-byte dual-port RAM for endpoints
-• Four endpoints 
-– Endpoint 0: 8 bytes
-– Endpoint 1 and 2: 64 bytes ping-pong
-– Endpoint 3: 64 bytes
-– Ping-pong Mode (two memory banks) for bulk endpoints
-*/
-
-// 
-#define AT91C_EP_CONTROL        0
-#define AT91C_EP_OUT            1  // cfg bulk out
-#define AT91C_EP_IN             2  // cfg bulk in
-#define AT91C_EP_NOTIFY         3  // cfg cdc notification interrup
-
-#define AT91C_EP_CONTROL_SIZE   8
-#define AT91C_EP_OUT_SIZE       64
-#define AT91C_EP_IN_SIZE        64
-
-
-// Section: USB Descriptors
-#define USB_DESCRIPTOR_DEVICE           0x01    // DescriptorType for a Device Descriptor.
-#define USB_DESCRIPTOR_CONFIGURATION    0x02    // DescriptorType for a Configuration Descriptor.
-#define USB_DESCRIPTOR_STRING           0x03    // DescriptorType for a String Descriptor.
-#define USB_DESCRIPTOR_INTERFACE        0x04    // DescriptorType for an Interface Descriptor.
-#define USB_DESCRIPTOR_ENDPOINT         0x05    // DescriptorType for an Endpoint Descriptor.
-#define USB_DESCRIPTOR_DEVICE_QUALIFIER 0x06    // DescriptorType for a Device Qualifier.
-#define USB_DESCRIPTOR_OTHER_SPEED      0x07    // DescriptorType for a Other Speed Configuration.
-#define USB_DESCRIPTOR_INTERFACE_POWER  0x08    // DescriptorType for Interface Power.
-#define USB_DESCRIPTOR_OTG              0x09    // DescriptorType for an OTG Descriptor.
-#define USB_DESCRIPTOR_IAD				0x0B	// DescriptorType for a Interface Association Descriptor
-#define USB_DESCRIPTOR_TYPE_BO          0x0F    // DescriptorType for a BOS Descriptor.
-
-/* Configuration Attributes */
-#define _DEFAULT    (0x01<<7)       //Default Value (Bit 7 is set)
-#define _SELF       (0x01<<6)       //Self-powered (Supports if set)
-#define _RWU        (0x01<<5)       //Remote Wakeup (Supports if set)
-#define _HNP	    (0x01 << 1)     //HNP (Supports if set)
-#define _SRP	  	(0x01)		    //SRP (Supports if set)
-
-/* Endpoint Transfer Type */
-#define _CTRL       0x00            //Control Transfer
-#define _ISO        0x01            //Isochronous Transfer
-#define _BULK       0x02 			//Bulk Transfer
-#define _INTERRUPT  0x03			//Interrupt Transfer
-					  
-// (bit7 | 0 = OUT, 1 = IN)
-#define _EP_IN      0x80
-#define _EP_OUT     0x00
-#define _EP01_OUT   0x01
-#define _EP01_IN    0x81
-#define _EP02_OUT   0x02
-#define _EP02_IN    0x82
-#define _EP03_OUT   0x03
-#define _EP03_IN    0x83
-
-
-/* WCID specific Request Code */
-#define MS_OS_DESCRIPTOR_INDEX			0xEE 
-#define MS_VENDOR_CODE					0x1C
-#define MS_EXTENDED_COMPAT_ID           0x04
-#define MS_EXTENDED_PROPERTIES          0x05
-#define MS_WCID_GET_DESCRIPTOR			0xC0
-#define MS_WCID_GET_FEATURE_DESCRIPTOR	0xC1
-
-/* USB standard request code */
-#define STD_GET_STATUS_ZERO           0x0080
-#define STD_GET_STATUS_INTERFACE      0x0081
-#define STD_GET_STATUS_ENDPOINT       0x0082
-
-#define STD_CLEAR_FEATURE_ZERO        0x0100
-#define STD_CLEAR_FEATURE_INTERFACE   0x0101
-#define STD_CLEAR_FEATURE_ENDPOINT    0x0102
-
-#define STD_SET_FEATURE_ZERO          0x0300
-#define STD_SET_FEATURE_INTERFACE     0x0301
-#define STD_SET_FEATURE_ENDPOINT      0x0302
-
-#define STD_SET_ADDRESS               0x0500
-#define STD_GET_DESCRIPTOR            0x0680
-#define STD_SET_DESCRIPTOR            0x0700
-#define STD_GET_CONFIGURATION         0x0880
-#define STD_SET_CONFIGURATION         0x0900
-#define STD_GET_INTERFACE             0x0A81
-#define STD_SET_INTERFACE             0x0B01
-#define STD_SYNCH_FRAME               0x0C82
-
-/* CDC Class Specific Request Code */
-#define GET_LINE_CODING               0x21A1
-#define SET_LINE_CODING               0x2021
-#define SET_CONTROL_LINE_STATE        0x2221
-
-AT91PS_UDP pUdp = AT91C_BASE_UDP;
-uint8_t btConfiguration = 0;
-uint8_t btConnection    = 0;
-uint8_t btReceiveBank   = AT91C_UDP_RX_DATA_BK0;
-
-static const char devDescriptor[] = {
-	/* Device descriptor */
-	0x12,      // Length
-	USB_DESCRIPTOR_DEVICE,      // Descriptor Type (DEVICE)
-	0x00,0x02, // Complies with USB Spec. Release (0200h = release 2.00)  0210 == release 2.10
-	2,      // Device Class:    Communication Device Class
-	0,      // Device Subclass: CDC class sub code ACM [ice 0x02 = win10 virtual comport ]
-	0,      // Device Protocol: CDC Device protocol (unused)
-	AT91C_EP_CONTROL_SIZE,      // MaxPacketSize0
-    0xc4,0x9a, // Vendor ID  [0x9ac4 = J. Westhues]
-    0x8f,0x4b, // Product ID [0x4b8f = Proxmark-3 RFID Instrument]
-	0x00,0x01, // BCD Device release number (1.00)
-	1,      // index Manufacturer  
-	2,      // index Product
-	3,      // index SerialNumber
-	1       // Number of Configs 
-};
-
-static const char cfgDescriptor[] = {
-
-	/* Configuration 1 descriptor */
-	// -----------------------------
-	9,         // Length
-	USB_DESCRIPTOR_CONFIGURATION, // Descriptor Type	        
-	(9+9+5+5+4+5+7+9+7+7), 0,	  // Total Length 2 EP + Control	
-	2,         // Number of Interfaces
-	1,         // Index value of this Configuration (used in SetConfiguration from Host)
-	0,         // Configuration string index
-	_DEFAULT,      // Attributes 0xA0
-	0xFA,      // Max Power consumption
-
-	// IAD to associate the one CDC interface
-    // --------------------------------------
-/*
-	8,		// Length
-    USB_DESCRIPTOR_IAD,	// IAD_DESCRIPTOR (0x0B)
-    0,		// CDC_INT_INTERFACE NUMBER  (
-	2,		// IAD INTERFACE COUNT (two interfaces)
-    2,		// Function Class: CDC_CLASS
-    2,		// Function SubClass: ACM
-    1,      // Function Protocol: v.25term
-	0,      // iInterface
-*/
-	
-	/* Interface 0 Descriptor */
-	/* CDC Communication Class Interface Descriptor Requirement for Notification*/
-	// -----------------------------------------------------------
-	9, 		// Length
-	USB_DESCRIPTOR_INTERFACE, // Descriptor Type
-	0, 		// Interface Number
-	0, 		// Alternate Setting
-	1, 		// Number of Endpoints in this interface
-	2, 		// Interface Class code    (Communication Interface Class)
-	2, 		// Interface Subclass code (Abstract Control Model)
-	1, 		// InterfaceProtocol       (Common AT Commands, V.25term)
-	0, 		// iInterface
-
-	/* Header Functional Descriptor */
-	5,		// Function Length
-	0x24,	// Descriptor type:    CS_INTERFACE
-	0,		// Descriptor subtype: Header Functional Descriptor
-	0x10,0x01, // bcd CDC:1.1	
-
-	/* ACM Functional Descriptor */
-	4,		// Function Length
-	0x24,	// Descriptor Type:    CS_INTERFACE
-	2,		// Descriptor Subtype: Abstract Control Management Functional Descriptor
-	2,		// Capabilities        D1, Device supports the request combination of Set_Line_Coding, Set_Control_Line_State, Get_Line_Coding, and the notification Serial_State
-
-	/* Union Functional Descriptor */
-	5,		// Function Length
-	0x24,	// Descriptor Type:    CS_INTERFACE
-	6,		// Descriptor Subtype: Union Functional Descriptor
-	0,		// MasterInterface:    Communication Class Interface
-	1,		// SlaveInterface0:    Data Class Interface
-	
-	/* Call Management Functional Descriptor */
-	5,		// Function Length
-	0x24,	// Descriptor Type:    CS_INTERFACE
-	1,		// Descriptor Subtype: Call Management Functional Descriptor 
-	0,		// Capabilities:       Device sends/receives call management information only over the Communication Class interface. Device does not handle call management itself
-	1,		// Data Interface:     Data Class Interface
-																			
-	/* Protocol Functional Descriptor */
-	/*
-	6,
-	0x24,	// Descriptor Type: CS_INTERFACE
-	0x0B,	// Descriptor Subtype: Protocol Unit functional Descriptor
-	0xDD, 	// constant uniq ID of unit
-	0xFE, 	// protocol  
-	*/
-	
-	/* CDC Notification Endpoint descriptor */
-	// ---------------------------------------
-	7,	 	                     // Length
-	USB_DESCRIPTOR_ENDPOINT,     // Descriptor Type
-	_EP03_IN,                    // EndpointAddress:   Endpoint 03 - IN
-	_INTERRUPT,                  // Attributes
-	AT91C_EP_CONTROL_SIZE, 0x00, // MaxPacket Size:    EP0 - 8
-	0xFF,		                 // Interval polling
-
-	
-	/* Interface 1 Descriptor */
-	/* CDC Data Class Interface 1 Descriptor Requirement */
-	9, 		                  // Length
-	USB_DESCRIPTOR_INTERFACE, // Descriptor Type
-	1, 		                  // Interface Number
-	0, 		                  // Alternate Setting
-	2, 		                  // Number of Endpoints
-	0x0A, 	                  // Interface Class:     CDC Data interface class
-	0, 		                  // Interface Subclass:  not used
-	0,                        // Interface Protocol:  No class specific protocol required (usb spec)
-	0,                        // Interface
-
-	/* Endpoint descriptor */
-	7,   		              // Length
-	USB_DESCRIPTOR_ENDPOINT,  // Descriptor Type
-	_EP01_OUT, 	              // Endpoint Address:    Endpoint 01 - OUT
-	_BULK,   	              // Attributes:          BULK
-	AT91C_EP_OUT_SIZE, 0x00,  // MaxPacket Size:      64 bytes
-	0,   		              // Interval:            ignored for bulk
-
-	/* Endpoint descriptor */
-	7,   		              // Length
-	USB_DESCRIPTOR_ENDPOINT,  // Descriptor Type
-	_EP02_IN,                 // Endpoint Address:    Endpoint 02 - IN
-	_BULK,   	              // Attribute:           BULK
-	AT91C_EP_IN_SIZE, 0x00,   // MaxPacket Size:      64 bytes
-	0 			              // Interval:            ignored for bulk
-};
-
-// BOS descriptor
-static const char bosDescriptor[] = {
-		0x5,
-		USB_DESCRIPTOR_TYPE_BO,
-		0xC,
-		0x0,
-		0x1,	// 1 device capability
-		0x7,
-		0x10, 	//USB_DEVICE_CAPABITY_TYPE,
-		0x2,
-		0x2,	// LPM capability bit set
-		0x0,
-		0x0,
-		0x0
-};
-
-// Microsoft OS Extended Configuration Compatible ID Descriptor
-/*
-static const char CompatIDFeatureDescriptor[] = {
-		0x28, 0x00, 0x00, 0x00,							// Descriptor Length 40bytes (0x28)
-		0x00, 0x01,										// Version ('1.0')
-		MS_EXTENDED_COMPAT_ID, 0x00,					// Compatibility ID Descriptor Index  0x0004 
-		0x01, 											// Number of sections. 0x1
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,		// Reserved (7bytes)
-		//-----function section 1------		
-		0x00,											// Interface Number #0
-		0x01,											// reserved (0x1)
-		0x57, 0x49, 0x4E, 0x55, 0x53, 0x42, 0x00, 0x00,	// Compatible ID  ('WINUSB\0\0')  (8bytes)
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	// Sub-Compatible ID (8byte)
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00				// Reserved (6bytes)
-};
-*/
-
-// Microsoft Extended Properties Feature Descriptor
-/*
-static const char OSprop[] = {
-		// u32 Descriptor Length (10+132+64+102 == 308
-		0x34, 0x01, 0, 0,
-		// u16 Version ('1.0')
-		0, 1,
-		// u16 wIndex
-		MS_EXTENDED_PROPERTIES, 0,
-		// u16 wCount  -- three section
-		3, 0,
-		
-		//-----property section 1------
-		// u32 size  ( 14+40+78 == 132)
-		132, 0, 0, 0,
-		// u32 type
-		1, 0, 0, 0,  // unicode string
-		// u16 namelen  (20*2 = 40)
-		40, 0,
-		// name  DeviceInterfaceGUID
-		'D',0,'e',0,'v',0,'i',0,'c',0,'e',0,'I',0,'n',0,'t',0,'e',0,'r',0,'f',0,'a',0,'c',0,'e',0,'G',0,'U',0,'I',0,'D',0,0,0,
-		// u32 datalen  (39*2 = 78)
-		78, 0, 0, 0,
-		// data {4D36E978-E325-11CE-BFC1-08002BE10318}
-		'{',0,'4',0,'d',0,'3',0,'6',0,'e',0,'9',0,'7',0,'8',0,'-',0,'e',0,'3',0,'2',0,'5',0,
-		'-',0,'1',0,'1',0,'c',0,'e',0,'-',0,'b',0,'f',0,'c',0,'1',0,'-',0,'0',0,'8',0,'0',0,
-		'0',0,'2',0,'b',0,'e',0,'1',0,'0',0,'3',0,'1',0,'8',0,'}',0,0,0,		
-
-		//-----property section 2------
-		// u32 size  ( 14+12+38 == 64)
-		64, 0, 0, 0,
-		// u32 type
-		1, 0, 0, 0,  // unicode string
-		// u16 namelen (12)
-		12, 0,
-		// name Label
-		'L',0,'a',0,'b',0,'e',0,'l',0,0,0,
-		// u32 datalen ( 19*2 = 38 )
-		38, 0, 0, 0,
-		// data 'Awesome PM3 Device'
-		'A',0,'w',0,'e',0,'s',0,'o',0,'m',0,'e',0,' ',0,'P',0,'M',0,'3',0,' ',0,'D',0,'e',0,'v',0,'i',0,'c',0,'e',0,0,0,
-
-		//-----property section 3------
-		// u32 size ( 14+12+76 == 102)
-		102, 0, 0, 0,
-		// u32 type
-		2, 0, 0, 0,  //Unicode string with environment variables
-		// u16 namelen (12)
-		12, 0,		
-		// name Icons
-		'I',0,'c',0,'o',0,'n',0,'s',0,0,0,
-		// u32 datalen ( 38*2 ==  76)
-		76, 0, 0, 0,
-		// data '%SystemRoot%\\system32\\Shell32.dll,-13'
-		'%',0,'S',0,'y',0,'s',0,'t',0,'e',0,'m',0,'R',0,'o',0,'o',0,'t',0,'%',0,
-		'\\',0,'s',0,'y',0,'s',0,'t',0,'e',0,'m',0,'3',0,'2',0,'\\',0,
-		'S',0,'h',0,'e',0,'l',0,'l',0,'3',0,'2',0,'.',0,'d',0,'l',0,'l',0,',',0,
-		'-',0,'1',0,'3',0,0,0
-};
-
-*/
-
-static const char StrLanguageCodes[] = {
-  4,			// Length
-  0x03,			// Type is string
-  0x09, 0x04	// supported language Code 0 = 0x0409 (English)
-};
-
-// Note: ModemManager (Linux) ignores Proxmark3 devices by matching the
-// manufacturer string "proxmark.org". Don't change this.
-// or use the blacklisting file.
-static const char StrManufacturer[] = {
-  26,			// Length
-  0x03,			// Type is string
-  'p',0,'r',0,'o',0,'x',0,'m',0,'a',0,'r',0,'k',0,'.',0,'o',0,'r',0,'g',0,
-};
-
-static const char StrProduct[] = {
-	20,			// Length
-	0x03,		// Type is string
-	'p',0,'r',0,'o',0,'x',0,'m',0,'a',0,'r',0,'k',0,'3',0
-};
-
-static const char StrSerialNumber[] = {
-	14,			// Length
-	0x03,		// Type is string
-	'i',0,'c',0,'e',0,'m',0,'a',0,'n',0
-};
-
-// size includes their own field.
-static const char StrMS_OSDescriptor[] = {
-    18,			// length 0x12
-	0x03,		// Type is string
-    'M',0,'S',0,'F',0,'T',0,'1',0,'0',0,'0',0,MS_VENDOR_CODE,0
-};
-
-const char* getStringDescriptor(uint8_t idx) {
-	switch(idx) {
-		case 0: return StrLanguageCodes; 
-		case 1: return StrManufacturer;
-		case 2: return StrProduct;
-		case 3: return StrSerialNumber;
-		case MS_OS_DESCRIPTOR_INDEX: return StrMS_OSDescriptor;
-		default: 
-			return(NULL);
-	}
-}
-
-// Bitmap for all status bits in CSR which must be written as 1 to cause no effect
-#define REG_NO_EFFECT_1_ALL      AT91C_UDP_RX_DATA_BK0 | AT91C_UDP_RX_DATA_BK1 \
-                                |AT91C_UDP_STALLSENT   | AT91C_UDP_RXSETUP \
-                                |AT91C_UDP_TXCOMP
-
-// Clear flags in the UDP_CSR register and waits for synchronization
-#define UDP_CLEAR_EP_FLAGS(endpoint, flags) { \
-	volatile unsigned int reg; \
-	reg = pUdp->UDP_CSR[(endpoint)]; \
-	reg |= REG_NO_EFFECT_1_ALL; \
-	reg &= ~(flags); \
-	pUdp->UDP_CSR[(endpoint)] = reg; \
-} \
-
-// reset flags in the UDP_CSR register and waits for synchronization
-#define UDP_SET_EP_FLAGS(endpoint, flags) { \
-	volatile unsigned int reg; \
-	reg = pUdp->UDP_CSR[(endpoint)]; \
-	reg |= REG_NO_EFFECT_1_ALL; \
-	reg |= (flags); \
-	pUdp->UDP_CSR[(endpoint)] = reg; \
-} \
-
-
-typedef struct {
-	uint32_t BitRate;
-	uint8_t Format;
-	uint8_t ParityType;
-	uint8_t DataBits;
-} AT91S_CDC_LINE_CODING, *AT91PS_CDC_LINE_CODING;
-
-AT91S_CDC_LINE_CODING line = {
-	115200, // baudrate
-	0,      // 1 Stop Bit
-	0,      // None Parity
-	8};     // 8 Data bits
-
-static void SpinDelay(int ms) {
-	int us = ms * 1000;
-	int ticks = (48 * us) >> 10;
-
-	// Borrow a PWM unit for my real-time clock
-	AT91C_BASE_PWMC->PWMC_ENA = PWM_CHANNEL(0);
-	
-	// 48 MHz / 1024 gives 46.875 kHz
-	AT91C_BASE_PWMC_CH0->PWMC_CMR = PWM_CH_MODE_PRESCALER(10);
-	AT91C_BASE_PWMC_CH0->PWMC_CDTYR = 0;
-	AT91C_BASE_PWMC_CH0->PWMC_CPRDR = 0xffff;
-
-	uint16_t start = AT91C_BASE_PWMC_CH0->PWMC_CCNTR;
-
-	for(;;) {
-		uint16_t now = AT91C_BASE_PWMC_CH0->PWMC_CCNTR;
-		if (now == (uint16_t)(start + ticks))
-			return;
-
-		WDT_HIT();
-	}
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    usb_disable
-//* \brief This function deactivates the USB device
-//*----------------------------------------------------------------------------
-void usb_disable() {
-	// Disconnect the USB device
-	AT91C_BASE_PIOA->PIO_ODR = GPIO_USB_PU;
-
-	// Clear all lingering interrupts
-	if (pUdp->UDP_ISR & AT91C_UDP_ENDBUSRES) {
-		pUdp->UDP_ICR = AT91C_UDP_ENDBUSRES;
-	}
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    usb_enable
-//* \brief This function Activates the USB device
-//*----------------------------------------------------------------------------
-void usb_enable() {
-	// Set the PLL USB Divider
-	AT91C_BASE_CKGR->CKGR_PLLR |= AT91C_CKGR_USBDIV_1 ;
-
-	// Specific Chip USB Initialisation
-	// Enables the 48MHz USB clock UDPCK and System Peripheral USB Clock
-	AT91C_BASE_PMC->PMC_SCER |= AT91C_PMC_UDP;
-	AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_UDP);
-	
-	AT91C_BASE_UDP->UDP_FADDR = 0;
-	AT91C_BASE_UDP->UDP_GLBSTATE = 0;
-
-	// Enable UDP PullUp (USB_DP_PUP) : enable & Clear of the corresponding PIO
-	// Set in PIO mode and Configure in Output
-	AT91C_BASE_PIOA->PIO_PER = GPIO_USB_PU; // Set in PIO mode
-	AT91C_BASE_PIOA->PIO_OER = GPIO_USB_PU; // Configure as Output
-
-	// Clear for set the Pullup resistor
-	AT91C_BASE_PIOA->PIO_CODR = GPIO_USB_PU;
-
-	// Disconnect and reconnect USB controller for 100ms
-	usb_disable();
-
-	SpinDelay(100);
-	// Wait for a short while
-	//for (volatile size_t i=0; i<0x100000; i++) {};
-	
-	// Reconnect USB reconnect
-	AT91C_BASE_PIOA->PIO_SODR = GPIO_USB_PU;
-	AT91C_BASE_PIOA->PIO_OER = GPIO_USB_PU;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    usb_check
-//* \brief Test if the device is configured and handle enumeration
-//*----------------------------------------------------------------------------
-static int usb_reconnect = 0;
-static int usb_configured = 0;
-void SetUSBreconnect(int value) {
-	usb_reconnect = value;
-}
-int GetUSBreconnect(void) {
-	return usb_reconnect;
-}
-void SetUSBconfigured(int value) {
-	usb_configured = value;
-}
-int GetUSBconfigured(void){
-	return usb_configured;
-}
-
-bool usb_check() {
-	
-	/*
-	// reconnected ONCE and 
-	if ( !USB_ATTACHED() ){
-		usb_reconnect = 1;
-		return false;
-	}
-	
-	// only one time after USB been disengaged and re-engaged	
-	if ( USB_ATTACHED() && usb_reconnect == 1 ) {
-			
-		if ( usb_configured == 0) {			
-			usb_disable();
-			usb_enable();		
-
-			AT91F_CDC_Enumerate();
-			
-			usb_configured = 1;
-			return false;
-		}
-	}
-	*/
-
-	// interrupt status register
-	AT91_REG isr = pUdp->UDP_ISR;
-
-	// end of bus reset
-	if (isr & AT91C_UDP_ENDBUSRES) {
-		pUdp->UDP_ICR = AT91C_UDP_ENDBUSRES;
-		// reset all endpoints
-		pUdp->UDP_RSTEP  = (unsigned int)-1;
-		pUdp->UDP_RSTEP  = 0;
-		// Enable the function
-		pUdp->UDP_FADDR = AT91C_UDP_FEN;
-		// Configure endpoint 0  (enable control endpoint)
-		pUdp->UDP_CSR[AT91C_EP_CONTROL] = (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_CTRL);
-	}
-	else if (isr & AT91C_UDP_EPINT0) {
-		pUdp->UDP_ICR = AT91C_UDP_EPINT0;
-		AT91F_CDC_Enumerate();
-	} 
-	/*
-	else if (isr & AT91C_UDP_EPINT3 ) {
-		pUdp->UDP_ICR = AT91C_UDP_EPINT3;
-		AT91F_CDC_Enumerate();
-		//pUdp->UDP_ICR |= AT91C_UDP_EPINT3;
-	}
-	*/
-	return (btConfiguration) ? true : false;
-}
-
-bool usb_poll() {
-	if (!usb_check()) return false;
-	return (pUdp->UDP_CSR[AT91C_EP_OUT] & btReceiveBank);
-}
-
-/**
-	In github PR #129, some users appears to get a false positive from
-	usb_poll, which returns true, but the usb_read operation
-	still returns 0.
-	This check is basically the same as above, but also checks
-	that the length available to read is non-zero, thus hopefully fixes the
-	bug.
-**/
-bool usb_poll_validate_length() {
-	if (!usb_check()) return false;
-	if (!(pUdp->UDP_CSR[AT91C_EP_OUT] & btReceiveBank)) return false;
-	return ((pUdp->UDP_CSR[AT91C_EP_OUT] & AT91C_UDP_RXBYTECNT) >> 16) >  0;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    usb_read
-//* \brief Read available data from Endpoint 1 OUT (host to device)
-//*----------------------------------------------------------------------------
-uint32_t usb_read(byte_t* data, size_t len) {
-	
-	if ( len == 0 ) return 0;
-	
-	uint8_t bank = btReceiveBank;
-	uint32_t packetSize, nbBytesRcv = 0;
-	uint32_t time_out = 0;
-  
-	while (len)  {
-		if (!usb_check()) break;
-
-		if ( pUdp->UDP_CSR[AT91C_EP_OUT] & bank ) {
-			
-			packetSize = (pUdp->UDP_CSR[AT91C_EP_OUT] & AT91C_UDP_RXBYTECNT) >> 16;
-			packetSize = MIN( packetSize, len); 
-			len -= packetSize;
-			while (packetSize--)
-				data[nbBytesRcv++] = pUdp->UDP_FDR[AT91C_EP_OUT];
-
-			// flip bank
-			UDP_CLEAR_EP_FLAGS(AT91C_EP_OUT, bank)
-
-			if (bank == AT91C_UDP_RX_DATA_BK0)
-				bank = AT91C_UDP_RX_DATA_BK1;
-			else
-				bank = AT91C_UDP_RX_DATA_BK0;		
-		}
-		if (time_out++ == 0x1fff) break;
-	}
-
-	btReceiveBank = bank;
-	return nbBytesRcv;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    usb_write
-//* \brief Send through endpoint 2 (device to host)
-//*----------------------------------------------------------------------------
-uint32_t usb_write(const byte_t* data, const size_t len) {
-
-	if (!len) return 0;
-	if (!usb_check()) return 0;
-
-	// can we write?
-	if ( (pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXPKTRDY) != 0 ) return 0;
-	
-	size_t length = len;
-	uint32_t cpt = 0;
- 
- 
-	// send first chunk
-	cpt = MIN(length, AT91C_EP_IN_SIZE);
-	length -= cpt;
-	while (cpt--) {
-		pUdp->UDP_FDR[AT91C_EP_IN] = *data++;
-	}
-	
-	UDP_SET_EP_FLAGS(AT91C_EP_IN, AT91C_UDP_TXPKTRDY);
-	
-	while (length) {
-		// Send next chunk
-		cpt = MIN(length, AT91C_EP_IN_SIZE);
-		length -= cpt;
-		while (cpt--) {
-			pUdp->UDP_FDR[AT91C_EP_IN] = *data++;
-		}
-		
-		// Wait for previous chunk to be sent
-		// (iceman) when is the bankswapping done?
-		while (!(pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP)) {
-			if (!usb_check()) return length;
-		}
-		
-		UDP_CLEAR_EP_FLAGS(AT91C_EP_IN, AT91C_UDP_TXCOMP);
-		while (pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP);
-		UDP_SET_EP_FLAGS(AT91C_EP_IN, AT91C_UDP_TXPKTRDY);
-		
-	}
-  
-	// Wait for the end of transfer
-	while (!(pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP)) {
-		if (!usb_check()) return length;
-	}
-
-	UDP_CLEAR_EP_FLAGS(AT91C_EP_IN, AT91C_UDP_TXCOMP);
-	while (pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP);
-
-	return length;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_USB_SendData
-//* \brief Send Data through the control endpoint
-//*----------------------------------------------------------------------------
-void AT91F_USB_SendData(AT91PS_UDP pUdp, const char *pData, uint32_t length) {
-	uint32_t cpt = 0;
-	AT91_REG csr;
-	
-	do {
-		cpt = MIN(length, AT91C_EP_CONTROL_SIZE);
-		length -= cpt;
-
-		while (cpt--)
-			pUdp->UDP_FDR[AT91C_EP_CONTROL] = *pData++;
-
-		if (pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_TXCOMP) {
-			UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_TXCOMP);
-			while (pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_TXCOMP);
-		}
-
-		UDP_SET_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_TXPKTRDY);
-
-		do {
-			csr = pUdp->UDP_CSR[AT91C_EP_CONTROL];
-			// Data IN stage has been stopped by a status OUT
-			if ( csr & AT91C_UDP_RX_DATA_BK0) {
-				
-				UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_RX_DATA_BK0)
-				return;
-			}
-		} while ( !(csr & AT91C_UDP_TXCOMP) );
-
-	} while (length);
-
-	if (pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_TXCOMP) {
-		UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_TXCOMP);
-		while (pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_TXCOMP);
-	}
-}
-		
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_USB_SendZlp
-//* \brief Send zero length packet through the control endpoint
-//*----------------------------------------------------------------------------
-void AT91F_USB_SendZlp(AT91PS_UDP pUdp) {
-	UDP_SET_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_TXPKTRDY);	
-	while ( !(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_TXCOMP) );
-	UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_TXCOMP);
-	while (pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_TXCOMP);
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_USB_SendStall
-//* \brief Stall the control endpoint
-//*----------------------------------------------------------------------------
-void AT91F_USB_SendStall(AT91PS_UDP pUdp) {
-	UDP_SET_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_FORCESTALL);
-	while ( !(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_ISOERROR) );
-	UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, (AT91C_UDP_FORCESTALL | AT91C_UDP_ISOERROR) );
-	while (pUdp->UDP_CSR[AT91C_EP_CONTROL] & (AT91C_UDP_FORCESTALL | AT91C_UDP_ISOERROR));
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_CDC_Enumerate
-//* \brief This function is a callback invoked when a SETUP packet is received
-//* problem:  
-//* 1. this is for USB endpoint0.  the control endpoint.
-//* 2. mixed with CDC ACM endpoint3 , interrupt, control endpoint
-//*----------------------------------------------------------------------------
-void AT91F_CDC_Enumerate() {
-	byte_t bmRequestType, bRequest;
-	uint16_t wValue, wIndex, wLength, wStatus;
-
-	if ( !(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_RXSETUP) )
-		return;
-
-	bmRequestType = pUdp->UDP_FDR[AT91C_EP_CONTROL];
-	bRequest      = pUdp->UDP_FDR[AT91C_EP_CONTROL];
-	wValue        = (pUdp->UDP_FDR[AT91C_EP_CONTROL] & 0xFF);
-	wValue       |= (pUdp->UDP_FDR[AT91C_EP_CONTROL] << 8);
-	wIndex        = (pUdp->UDP_FDR[AT91C_EP_CONTROL] & 0xFF);
-	wIndex       |= (pUdp->UDP_FDR[AT91C_EP_CONTROL] << 8);
-	wLength       = (pUdp->UDP_FDR[AT91C_EP_CONTROL] & 0xFF);
-	wLength      |= (pUdp->UDP_FDR[AT91C_EP_CONTROL] << 8);
-
-	if (bmRequestType & 0x80) {        // Data Phase Transfer Direction Device to Host
-		UDP_SET_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_DIR);
-		while ( !(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_DIR) );
-	}
-	UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_RXSETUP);
-	while ( (pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_RXSETUP)  );
-
-	/*
-	if ( bRequest == MS_VENDOR_CODE) {
-		if ( bmRequestType == MS_WCID_GET_DESCRIPTOR ) { // C0
-			if ( wIndex == MS_EXTENDED_COMPAT_ID ) {  // 4
-				//AT91F_USB_SendData(pUdp, CompatIDFeatureDescriptor, MIN(sizeof(CompatIDFeatureDescriptor), wLength));
-				//return;
-			} 
-		}
-
-		if ( bmRequestType == MS_WCID_GET_FEATURE_DESCRIPTOR ) {  //C1
-			// if ( wIndex == MS_EXTENDED_PROPERTIES ) { // 5  - winusb bug with wIndex == interface index,  so I just send it always)
-				//AT91F_USB_SendData(pUdp, OSprop, MIN(sizeof(OSprop), wLength));
-				//return;
-			// } 
-		}
-	}
-	*/
-	
-	// Handle supported standard device request Cf Table 9-3 in USB specification Rev 1.1
-	switch ((bRequest << 8) | bmRequestType) {
-	case STD_GET_DESCRIPTOR: {
-		
-			if ( wValue == 0x100 )       // Return Device Descriptor
-				AT91F_USB_SendData(pUdp, devDescriptor, MIN(sizeof(devDescriptor), wLength));
-			else if ( wValue == 0x200 )  // Return Configuration Descriptor
-				AT91F_USB_SendData(pUdp, cfgDescriptor, MIN(sizeof(cfgDescriptor), wLength));
-			else if ( (wValue & 0xF00) == 0xF00) // Return BOS Descriptor
-				AT91F_USB_SendData(pUdp, bosDescriptor, MIN(sizeof(bosDescriptor), wLength));
-			else if ( (wValue & 0x300) == 0x300) { // Return String Descriptor
-
-				const char *strDescriptor = getStringDescriptor(wValue & 0xff);
-				if (strDescriptor != NULL) {
-					AT91F_USB_SendData(pUdp, strDescriptor, MIN(strDescriptor[0], wLength));
-				} else {
-					AT91F_USB_SendStall(pUdp);
-				}
-			} else {
-				AT91F_USB_SendStall(pUdp);
-			}
-		}
-		break;
-	case STD_SET_ADDRESS:
-		AT91F_USB_SendZlp(pUdp);
-		pUdp->UDP_FADDR = (AT91C_UDP_FEN | (wValue & 0x7F) );
-		pUdp->UDP_GLBSTATE  = (wValue) ? AT91C_UDP_FADDEN : 0;
-		break;
-	case STD_SET_CONFIGURATION:
-	
-		/* 
-		*   Set or clear the device "configured" state. 
-		*   The LSB of wValue is the "Configuration Number". If this value is non-zero, 
-		*   it should be the same number as defined in the Configuration Descriptor; 
-		*   otherwise an error must have occurred. 
-		*   This device has only one configuration and its Config Number is CONF_NB (= 1). 
-		*/  			
-		AT91F_USB_SendZlp(pUdp);
-		btConfiguration = wValue;
-		pUdp->UDP_GLBSTATE  = (wValue) ? AT91C_UDP_CONFG : AT91C_UDP_FADDEN;
-		
-		// make sure we are not stalled
-		/*
-		UDP_CLEAR_EP_FLAGS(AT91C_EP_OUT   , AT91C_UDP_FORCESTALL);
-        UDP_CLEAR_EP_FLAGS(AT91C_EP_IN    , AT91C_UDP_FORCESTALL);
-		UDP_CLEAR_EP_FLAGS(AT91C_EP_NOTIFY, AT91C_UDP_FORCESTALL);
-		*/
-		
-		// enable endpoints
-		pUdp->UDP_CSR[AT91C_EP_OUT]    = (wValue) ? (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_BULK_OUT) : 0;
-		pUdp->UDP_CSR[AT91C_EP_IN]     = (wValue) ? (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_BULK_IN)  : 0;
-		pUdp->UDP_CSR[AT91C_EP_NOTIFY] = (wValue) ? (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_INT_IN)   : 0;
-		break;
-	case STD_GET_CONFIGURATION:
-		AT91F_USB_SendData(pUdp, (char *) &(btConfiguration), sizeof(btConfiguration));
-		break;
-	case STD_GET_STATUS_ZERO:
-		wStatus = 0;   // Device is Bus powered, remote wakeup disabled
-		AT91F_USB_SendData(pUdp, (char *) &wStatus, sizeof(wStatus));
-		break;
-	case STD_GET_STATUS_INTERFACE:
-		wStatus = 0;   // reserved for future use
-		AT91F_USB_SendData(pUdp, (char *) &wStatus, sizeof(wStatus));
-		break;
-	case STD_GET_STATUS_ENDPOINT:
-		wStatus = 0;
-		wIndex &= 0x0F;
-		if ((pUdp->UDP_GLBSTATE & AT91C_UDP_CONFG) && (wIndex <= AT91C_EP_NOTIFY)) {
-			wStatus = (pUdp->UDP_CSR[wIndex] & AT91C_UDP_EPEDS) ? 0 : 1;
-			AT91F_USB_SendData(pUdp, (char *) &wStatus, sizeof(wStatus));
-		}
-		else if ((pUdp->UDP_GLBSTATE & AT91C_UDP_FADDEN) && (wIndex == AT91C_EP_CONTROL)) {
-			wStatus = (pUdp->UDP_CSR[wIndex] & AT91C_UDP_EPEDS) ? 0 : 1;
-			AT91F_USB_SendData(pUdp, (char *) &wStatus, sizeof(wStatus));
-		} else {
-			AT91F_USB_SendStall(pUdp);
-		}
-		break;
-	case STD_SET_FEATURE_ZERO:
-		AT91F_USB_SendStall(pUdp);
-	    break;
-	case STD_SET_FEATURE_INTERFACE:
-		AT91F_USB_SendZlp(pUdp);
-		break;
-	case STD_SET_FEATURE_ENDPOINT:
-		wIndex &= 0x0F;
-		if ((wValue == 0) && (wIndex >= AT91C_EP_OUT) && (wIndex <= AT91C_EP_NOTIFY)) {
-			pUdp->UDP_CSR[wIndex] = 0;
-			AT91F_USB_SendZlp(pUdp);
-		} else {
-			AT91F_USB_SendStall(pUdp);
-		}
-		break;
-	case STD_CLEAR_FEATURE_ZERO:
-		AT91F_USB_SendStall(pUdp);
-	    break;
-	case STD_CLEAR_FEATURE_INTERFACE:
-		AT91F_USB_SendZlp(pUdp);
-		break;
-	case STD_CLEAR_FEATURE_ENDPOINT:
-		wIndex &= 0x0F;
-		if ((wValue == 0) && (wIndex >= AT91C_EP_OUT) && (wIndex <= AT91C_EP_NOTIFY)) {
-
-			if (wIndex == AT91C_EP_OUT)			pUdp->UDP_CSR[AT91C_EP_OUT] = (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_BULK_OUT);
-			else if (wIndex == AT91C_EP_IN)		pUdp->UDP_CSR[AT91C_EP_IN] = (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_BULK_IN);
-			else if (wIndex == AT91C_EP_NOTIFY) pUdp->UDP_CSR[AT91C_EP_NOTIFY] = (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_INT_IN);
-
-			AT91F_USB_SendZlp(pUdp);
-		} else {
-			AT91F_USB_SendStall(pUdp);
-		}
-		break;
-
-	// handle CDC class requests
-	case SET_LINE_CODING: {
-	/*
-	    uint8_t i;  
-		for ( i = 0 ; i < 7 ; i++ )  {  
-			((uint8_t*)&line)[i] =  pUdp->UDP_FDR[AT91C_EP_CONTROL];
-		}  */
-		// ignore SET_LINE_CODING...
-		while ( !(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_RX_DATA_BK0) );
-		UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_RX_DATA_BK0);
-		AT91F_USB_SendZlp(pUdp);
-		break;
-	}
-	case GET_LINE_CODING:
-		AT91F_USB_SendData(pUdp, (char *) &line, MIN(sizeof(line), wLength));
-		break;
-	case SET_CONTROL_LINE_STATE:
-		btConnection = wValue;
-		AT91F_USB_SendZlp(pUdp);
-		break;
-	default:
-		AT91F_USB_SendStall(pUdp);
-	    break;
-	}
+/*
+ * at91sam7s USB CDC device implementation
+ *
+ * Copyright (c) 2012, Roel Verdult
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ''AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * based on the "Basic USB Example" from ATMEL (doc6123.pdf)
+ *
+ * @file usb_cdc.c
+ * @brief
+ */
+
+#include "usb_cdc.h"
+/*
+AT91SAM7S256  USB Device Port
+• Embedded 328-byte dual-port RAM for endpoints
+• Four endpoints 
+– Endpoint 0: 8 bytes
+– Endpoint 1 and 2: 64 bytes ping-pong
+– Endpoint 3: 64 bytes
+– Ping-pong Mode (two memory banks) for bulk endpoints
+*/
+
+// 
+#define AT91C_EP_CONTROL        0
+#define AT91C_EP_OUT            1  // cfg bulk out
+#define AT91C_EP_IN             2  // cfg bulk in
+#define AT91C_EP_NOTIFY         3  // cfg cdc notification interrup
+
+#define AT91C_EP_CONTROL_SIZE   8
+#define AT91C_EP_OUT_SIZE       64
+#define AT91C_EP_IN_SIZE        64
+
+
+// Section: USB Descriptors
+#define USB_DESCRIPTOR_DEVICE           0x01    // DescriptorType for a Device Descriptor.
+#define USB_DESCRIPTOR_CONFIGURATION    0x02    // DescriptorType for a Configuration Descriptor.
+#define USB_DESCRIPTOR_STRING           0x03    // DescriptorType for a String Descriptor.
+#define USB_DESCRIPTOR_INTERFACE        0x04    // DescriptorType for an Interface Descriptor.
+#define USB_DESCRIPTOR_ENDPOINT         0x05    // DescriptorType for an Endpoint Descriptor.
+#define USB_DESCRIPTOR_DEVICE_QUALIFIER 0x06    // DescriptorType for a Device Qualifier.
+#define USB_DESCRIPTOR_OTHER_SPEED      0x07    // DescriptorType for a Other Speed Configuration.
+#define USB_DESCRIPTOR_INTERFACE_POWER  0x08    // DescriptorType for Interface Power.
+#define USB_DESCRIPTOR_OTG              0x09    // DescriptorType for an OTG Descriptor.
+#define USB_DESCRIPTOR_IAD				0x0B	// DescriptorType for a Interface Association Descriptor
+#define USB_DESCRIPTOR_TYPE_BO          0x0F    // DescriptorType for a BOS Descriptor.
+
+/* Configuration Attributes */
+#define _DEFAULT    (0x01<<7)       //Default Value (Bit 7 is set)
+#define _SELF       (0x01<<6)       //Self-powered (Supports if set)
+#define _RWU        (0x01<<5)       //Remote Wakeup (Supports if set)
+#define _HNP	    (0x01 << 1)     //HNP (Supports if set)
+#define _SRP	  	(0x01)		    //SRP (Supports if set)
+
+/* Endpoint Transfer Type */
+#define _CTRL       0x00            //Control Transfer
+#define _ISO        0x01            //Isochronous Transfer
+#define _BULK       0x02 			//Bulk Transfer
+#define _INTERRUPT  0x03			//Interrupt Transfer
+					  
+// (bit7 | 0 = OUT, 1 = IN)
+#define _EP_IN      0x80
+#define _EP_OUT     0x00
+#define _EP01_OUT   0x01
+#define _EP01_IN    0x81
+#define _EP02_OUT   0x02
+#define _EP02_IN    0x82
+#define _EP03_OUT   0x03
+#define _EP03_IN    0x83
+
+
+/* WCID specific Request Code */
+#define MS_OS_DESCRIPTOR_INDEX			0xEE 
+#define MS_VENDOR_CODE					0x1C
+#define MS_EXTENDED_COMPAT_ID           0x04
+#define MS_EXTENDED_PROPERTIES          0x05
+#define MS_WCID_GET_DESCRIPTOR			0xC0
+#define MS_WCID_GET_FEATURE_DESCRIPTOR	0xC1
+
+/* USB standard request code */
+#define STD_GET_STATUS_ZERO           0x0080
+#define STD_GET_STATUS_INTERFACE      0x0081
+#define STD_GET_STATUS_ENDPOINT       0x0082
+
+#define STD_CLEAR_FEATURE_ZERO        0x0100
+#define STD_CLEAR_FEATURE_INTERFACE   0x0101
+#define STD_CLEAR_FEATURE_ENDPOINT    0x0102
+
+#define STD_SET_FEATURE_ZERO          0x0300
+#define STD_SET_FEATURE_INTERFACE     0x0301
+#define STD_SET_FEATURE_ENDPOINT      0x0302
+
+#define STD_SET_ADDRESS               0x0500
+#define STD_GET_DESCRIPTOR            0x0680
+#define STD_SET_DESCRIPTOR            0x0700
+#define STD_GET_CONFIGURATION         0x0880
+#define STD_SET_CONFIGURATION         0x0900
+#define STD_GET_INTERFACE             0x0A81
+#define STD_SET_INTERFACE             0x0B01
+#define STD_SYNCH_FRAME               0x0C82
+
+/* CDC Class Specific Request Code */
+#define GET_LINE_CODING               0x21A1
+#define SET_LINE_CODING               0x2021
+#define SET_CONTROL_LINE_STATE        0x2221
+
+AT91PS_UDP pUdp = AT91C_BASE_UDP;
+uint8_t btConfiguration = 0;
+uint8_t btConnection    = 0;
+uint8_t btReceiveBank   = AT91C_UDP_RX_DATA_BK0;
+
+static const char devDescriptor[] = {
+	/* Device descriptor */
+	0x12,      // Length
+	USB_DESCRIPTOR_DEVICE,      // Descriptor Type (DEVICE)
+	0x00,0x02, // Complies with USB Spec. Release (0200h = release 2.00)  0210 == release 2.10
+	2,      // Device Class:    Communication Device Class
+	0,      // Device Subclass: CDC class sub code ACM [ice 0x02 = win10 virtual comport ]
+	0,      // Device Protocol: CDC Device protocol (unused)
+	AT91C_EP_CONTROL_SIZE,      // MaxPacketSize0
+    0xc4,0x9a, // Vendor ID  [0x9ac4 = J. Westhues]
+    0x8f,0x4b, // Product ID [0x4b8f = Proxmark-3 RFID Instrument]
+	0x00,0x01, // BCD Device release number (1.00)
+	1,      // index Manufacturer  
+	2,      // index Product
+	3,      // index SerialNumber
+	1       // Number of Configs 
+};
+
+static const char cfgDescriptor[] = {
+
+	/* Configuration 1 descriptor */
+	// -----------------------------
+	9,         // Length
+	USB_DESCRIPTOR_CONFIGURATION, // Descriptor Type	        
+	(9+9+5+5+4+5+7+9+7+7), 0,	  // Total Length 2 EP + Control	
+	2,         // Number of Interfaces
+	1,         // Index value of this Configuration (used in SetConfiguration from Host)
+	0,         // Configuration string index
+	_DEFAULT,      // Attributes 0xA0
+	0xFA,      // Max Power consumption
+
+	// IAD to associate the one CDC interface
+    // --------------------------------------
+/*
+	8,		// Length
+    USB_DESCRIPTOR_IAD,	// IAD_DESCRIPTOR (0x0B)
+    0,		// CDC_INT_INTERFACE NUMBER  (
+	2,		// IAD INTERFACE COUNT (two interfaces)
+    2,		// Function Class: CDC_CLASS
+    2,		// Function SubClass: ACM
+    1,      // Function Protocol: v.25term
+	0,      // iInterface
+*/
+	
+	/* Interface 0 Descriptor */
+	/* CDC Communication Class Interface Descriptor Requirement for Notification*/
+	// -----------------------------------------------------------
+	9, 		// Length
+	USB_DESCRIPTOR_INTERFACE, // Descriptor Type
+	0, 		// Interface Number
+	0, 		// Alternate Setting
+	1, 		// Number of Endpoints in this interface
+	2, 		// Interface Class code    (Communication Interface Class)
+	2, 		// Interface Subclass code (Abstract Control Model)
+	1, 		// InterfaceProtocol       (Common AT Commands, V.25term)
+	0, 		// iInterface
+
+	/* Header Functional Descriptor */
+	5,		// Function Length
+	0x24,	// Descriptor type:    CS_INTERFACE
+	0,		// Descriptor subtype: Header Functional Descriptor
+	0x10,0x01, // bcd CDC:1.1	
+
+	/* ACM Functional Descriptor */
+	4,		// Function Length
+	0x24,	// Descriptor Type:    CS_INTERFACE
+	2,		// Descriptor Subtype: Abstract Control Management Functional Descriptor
+	2,		// Capabilities        D1, Device supports the request combination of Set_Line_Coding, Set_Control_Line_State, Get_Line_Coding, and the notification Serial_State
+
+	/* Union Functional Descriptor */
+	5,		// Function Length
+	0x24,	// Descriptor Type:    CS_INTERFACE
+	6,		// Descriptor Subtype: Union Functional Descriptor
+	0,		// MasterInterface:    Communication Class Interface
+	1,		// SlaveInterface0:    Data Class Interface
+	
+	/* Call Management Functional Descriptor */
+	5,		// Function Length
+	0x24,	// Descriptor Type:    CS_INTERFACE
+	1,		// Descriptor Subtype: Call Management Functional Descriptor 
+	0,		// Capabilities:       Device sends/receives call management information only over the Communication Class interface. Device does not handle call management itself
+	1,		// Data Interface:     Data Class Interface
+																			
+	/* Protocol Functional Descriptor */
+	/*
+	6,
+	0x24,	// Descriptor Type: CS_INTERFACE
+	0x0B,	// Descriptor Subtype: Protocol Unit functional Descriptor
+	0xDD, 	// constant uniq ID of unit
+	0xFE, 	// protocol  
+	*/
+	
+	/* CDC Notification Endpoint descriptor */
+	// ---------------------------------------
+	7,	 	                     // Length
+	USB_DESCRIPTOR_ENDPOINT,     // Descriptor Type
+	_EP03_IN,                    // EndpointAddress:   Endpoint 03 - IN
+	_INTERRUPT,                  // Attributes
+	AT91C_EP_CONTROL_SIZE, 0x00, // MaxPacket Size:    EP0 - 8
+	0xFF,		                 // Interval polling
+
+	
+	/* Interface 1 Descriptor */
+	/* CDC Data Class Interface 1 Descriptor Requirement */
+	9, 		                  // Length
+	USB_DESCRIPTOR_INTERFACE, // Descriptor Type
+	1, 		                  // Interface Number
+	0, 		                  // Alternate Setting
+	2, 		                  // Number of Endpoints
+	0x0A, 	                  // Interface Class:     CDC Data interface class
+	0, 		                  // Interface Subclass:  not used
+	0,                        // Interface Protocol:  No class specific protocol required (usb spec)
+	0,                        // Interface
+
+	/* Endpoint descriptor */
+	7,   		              // Length
+	USB_DESCRIPTOR_ENDPOINT,  // Descriptor Type
+	_EP01_OUT, 	              // Endpoint Address:    Endpoint 01 - OUT
+	_BULK,   	              // Attributes:          BULK
+	AT91C_EP_OUT_SIZE, 0x00,  // MaxPacket Size:      64 bytes
+	0,   		              // Interval:            ignored for bulk
+
+	/* Endpoint descriptor */
+	7,   		              // Length
+	USB_DESCRIPTOR_ENDPOINT,  // Descriptor Type
+	_EP02_IN,                 // Endpoint Address:    Endpoint 02 - IN
+	_BULK,   	              // Attribute:           BULK
+	AT91C_EP_IN_SIZE, 0x00,   // MaxPacket Size:      64 bytes
+	0 			              // Interval:            ignored for bulk
+};
+
+// BOS descriptor
+static const char bosDescriptor[] = {
+		0x5,
+		USB_DESCRIPTOR_TYPE_BO,
+		0xC,
+		0x0,
+		0x1,	// 1 device capability
+		0x7,
+		0x10, 	//USB_DEVICE_CAPABITY_TYPE,
+		0x2,
+		0x2,	// LPM capability bit set
+		0x0,
+		0x0,
+		0x0
+};
+
+// Microsoft OS Extended Configuration Compatible ID Descriptor
+/*
+static const char CompatIDFeatureDescriptor[] = {
+		0x28, 0x00, 0x00, 0x00,							// Descriptor Length 40bytes (0x28)
+		0x00, 0x01,										// Version ('1.0')
+		MS_EXTENDED_COMPAT_ID, 0x00,					// Compatibility ID Descriptor Index  0x0004 
+		0x01, 											// Number of sections. 0x1
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,		// Reserved (7bytes)
+		//-----function section 1------		
+		0x00,											// Interface Number #0
+		0x01,											// reserved (0x1)
+		0x57, 0x49, 0x4E, 0x55, 0x53, 0x42, 0x00, 0x00,	// Compatible ID  ('WINUSB\0\0')  (8bytes)
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	// Sub-Compatible ID (8byte)
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00				// Reserved (6bytes)
+};
+*/
+
+// Microsoft Extended Properties Feature Descriptor
+/*
+static const char OSprop[] = {
+		// u32 Descriptor Length (10+132+64+102 == 308
+		0x34, 0x01, 0, 0,
+		// u16 Version ('1.0')
+		0, 1,
+		// u16 wIndex
+		MS_EXTENDED_PROPERTIES, 0,
+		// u16 wCount  -- three section
+		3, 0,
+		
+		//-----property section 1------
+		// u32 size  ( 14+40+78 == 132)
+		132, 0, 0, 0,
+		// u32 type
+		1, 0, 0, 0,  // unicode string
+		// u16 namelen  (20*2 = 40)
+		40, 0,
+		// name  DeviceInterfaceGUID
+		'D',0,'e',0,'v',0,'i',0,'c',0,'e',0,'I',0,'n',0,'t',0,'e',0,'r',0,'f',0,'a',0,'c',0,'e',0,'G',0,'U',0,'I',0,'D',0,0,0,
+		// u32 datalen  (39*2 = 78)
+		78, 0, 0, 0,
+		// data {4D36E978-E325-11CE-BFC1-08002BE10318}
+		'{',0,'4',0,'d',0,'3',0,'6',0,'e',0,'9',0,'7',0,'8',0,'-',0,'e',0,'3',0,'2',0,'5',0,
+		'-',0,'1',0,'1',0,'c',0,'e',0,'-',0,'b',0,'f',0,'c',0,'1',0,'-',0,'0',0,'8',0,'0',0,
+		'0',0,'2',0,'b',0,'e',0,'1',0,'0',0,'3',0,'1',0,'8',0,'}',0,0,0,		
+
+		//-----property section 2------
+		// u32 size  ( 14+12+38 == 64)
+		64, 0, 0, 0,
+		// u32 type
+		1, 0, 0, 0,  // unicode string
+		// u16 namelen (12)
+		12, 0,
+		// name Label
+		'L',0,'a',0,'b',0,'e',0,'l',0,0,0,
+		// u32 datalen ( 19*2 = 38 )
+		38, 0, 0, 0,
+		// data 'Awesome PM3 Device'
+		'A',0,'w',0,'e',0,'s',0,'o',0,'m',0,'e',0,' ',0,'P',0,'M',0,'3',0,' ',0,'D',0,'e',0,'v',0,'i',0,'c',0,'e',0,0,0,
+
+		//-----property section 3------
+		// u32 size ( 14+12+76 == 102)
+		102, 0, 0, 0,
+		// u32 type
+		2, 0, 0, 0,  //Unicode string with environment variables
+		// u16 namelen (12)
+		12, 0,		
+		// name Icons
+		'I',0,'c',0,'o',0,'n',0,'s',0,0,0,
+		// u32 datalen ( 38*2 ==  76)
+		76, 0, 0, 0,
+		// data '%SystemRoot%\\system32\\Shell32.dll,-13'
+		'%',0,'S',0,'y',0,'s',0,'t',0,'e',0,'m',0,'R',0,'o',0,'o',0,'t',0,'%',0,
+		'\\',0,'s',0,'y',0,'s',0,'t',0,'e',0,'m',0,'3',0,'2',0,'\\',0,
+		'S',0,'h',0,'e',0,'l',0,'l',0,'3',0,'2',0,'.',0,'d',0,'l',0,'l',0,',',0,
+		'-',0,'1',0,'3',0,0,0
+};
+
+*/
+
+static const char StrLanguageCodes[] = {
+  4,			// Length
+  0x03,			// Type is string
+  0x09, 0x04	// supported language Code 0 = 0x0409 (English)
+};
+
+// Note: ModemManager (Linux) ignores Proxmark3 devices by matching the
+// manufacturer string "proxmark.org". Don't change this.
+// or use the blacklisting file.
+static const char StrManufacturer[] = {
+  26,			// Length
+  0x03,			// Type is string
+  'p',0,'r',0,'o',0,'x',0,'m',0,'a',0,'r',0,'k',0,'.',0,'o',0,'r',0,'g',0,
+};
+
+static const char StrProduct[] = {
+	20,			// Length
+	0x03,		// Type is string
+	'p',0,'r',0,'o',0,'x',0,'m',0,'a',0,'r',0,'k',0,'3',0
+};
+
+static const char StrSerialNumber[] = {
+	14,			// Length
+	0x03,		// Type is string
+	'i',0,'c',0,'e',0,'m',0,'a',0,'n',0
+};
+
+// size includes their own field.
+static const char StrMS_OSDescriptor[] = {
+    18,			// length 0x12
+	0x03,		// Type is string
+    'M',0,'S',0,'F',0,'T',0,'1',0,'0',0,'0',0,MS_VENDOR_CODE,0
+};
+
+const char* getStringDescriptor(uint8_t idx) {
+	switch(idx) {
+		case 0: return StrLanguageCodes; 
+		case 1: return StrManufacturer;
+		case 2: return StrProduct;
+		case 3: return StrSerialNumber;
+		case MS_OS_DESCRIPTOR_INDEX: return StrMS_OSDescriptor;
+		default: 
+			return(NULL);
+	}
+}
+
+// Bitmap for all status bits in CSR which must be written as 1 to cause no effect
+#define REG_NO_EFFECT_1_ALL      AT91C_UDP_RX_DATA_BK0 | AT91C_UDP_RX_DATA_BK1 \
+                                |AT91C_UDP_STALLSENT   | AT91C_UDP_RXSETUP \
+                                |AT91C_UDP_TXCOMP
+
+// Clear flags in the UDP_CSR register and waits for synchronization
+#define UDP_CLEAR_EP_FLAGS(endpoint, flags) { \
+	volatile unsigned int reg; \
+	reg = pUdp->UDP_CSR[(endpoint)]; \
+	reg |= REG_NO_EFFECT_1_ALL; \
+	reg &= ~(flags); \
+	pUdp->UDP_CSR[(endpoint)] = reg; \
+} \
+
+// reset flags in the UDP_CSR register and waits for synchronization
+#define UDP_SET_EP_FLAGS(endpoint, flags) { \
+	volatile unsigned int reg; \
+	reg = pUdp->UDP_CSR[(endpoint)]; \
+	reg |= REG_NO_EFFECT_1_ALL; \
+	reg |= (flags); \
+	pUdp->UDP_CSR[(endpoint)] = reg; \
+} \
+
+
+typedef struct {
+	uint32_t BitRate;
+	uint8_t Format;
+	uint8_t ParityType;
+	uint8_t DataBits;
+} AT91S_CDC_LINE_CODING, *AT91PS_CDC_LINE_CODING;
+
+AT91S_CDC_LINE_CODING line = {
+	115200, // baudrate
+	0,      // 1 Stop Bit
+	0,      // None Parity
+	8};     // 8 Data bits
+
+static void SpinDelay(int ms) {
+	int us = ms * 1000;
+	int ticks = (48 * us) >> 10;
+
+	// Borrow a PWM unit for my real-time clock
+	AT91C_BASE_PWMC->PWMC_ENA = PWM_CHANNEL(0);
+	
+	// 48 MHz / 1024 gives 46.875 kHz
+	AT91C_BASE_PWMC_CH0->PWMC_CMR = PWM_CH_MODE_PRESCALER(10);
+	AT91C_BASE_PWMC_CH0->PWMC_CDTYR = 0;
+	AT91C_BASE_PWMC_CH0->PWMC_CPRDR = 0xffff;
+
+	uint16_t start = AT91C_BASE_PWMC_CH0->PWMC_CCNTR;
+
+	for(;;) {
+		uint16_t now = AT91C_BASE_PWMC_CH0->PWMC_CCNTR;
+		if (now == (uint16_t)(start + ticks))
+			return;
+
+		WDT_HIT();
+	}
+}
+
+//*----------------------------------------------------------------------------
+//* \fn    usb_disable
+//* \brief This function deactivates the USB device
+//*----------------------------------------------------------------------------
+void usb_disable() {
+	// Disconnect the USB device
+	AT91C_BASE_PIOA->PIO_ODR = GPIO_USB_PU;
+
+	// Clear all lingering interrupts
+	if (pUdp->UDP_ISR & AT91C_UDP_ENDBUSRES) {
+		pUdp->UDP_ICR = AT91C_UDP_ENDBUSRES;
+	}
+}
+
+//*----------------------------------------------------------------------------
+//* \fn    usb_enable
+//* \brief This function Activates the USB device
+//*----------------------------------------------------------------------------
+void usb_enable() {
+	// Set the PLL USB Divider
+	AT91C_BASE_CKGR->CKGR_PLLR |= AT91C_CKGR_USBDIV_1 ;
+
+	// Specific Chip USB Initialisation
+	// Enables the 48MHz USB clock UDPCK and System Peripheral USB Clock
+	AT91C_BASE_PMC->PMC_SCER |= AT91C_PMC_UDP;
+	AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_UDP);
+	
+	AT91C_BASE_UDP->UDP_FADDR = 0;
+	AT91C_BASE_UDP->UDP_GLBSTATE = 0;
+
+	// Enable UDP PullUp (USB_DP_PUP) : enable & Clear of the corresponding PIO
+	// Set in PIO mode and Configure in Output
+	AT91C_BASE_PIOA->PIO_PER = GPIO_USB_PU; // Set in PIO mode
+	AT91C_BASE_PIOA->PIO_OER = GPIO_USB_PU; // Configure as Output
+
+	// Clear for set the Pullup resistor
+	AT91C_BASE_PIOA->PIO_CODR = GPIO_USB_PU;
+
+	// Disconnect and reconnect USB controller for 100ms
+	usb_disable();
+
+	SpinDelay(100);
+	// Wait for a short while
+	//for (volatile size_t i=0; i<0x100000; i++) {};
+	
+	// Reconnect USB reconnect
+	AT91C_BASE_PIOA->PIO_SODR = GPIO_USB_PU;
+	AT91C_BASE_PIOA->PIO_OER = GPIO_USB_PU;
+}
+
+//*----------------------------------------------------------------------------
+//* \fn    usb_check
+//* \brief Test if the device is configured and handle enumeration
+//*----------------------------------------------------------------------------
+static int usb_reconnect = 0;
+static int usb_configured = 0;
+void SetUSBreconnect(int value) {
+	usb_reconnect = value;
+}
+int GetUSBreconnect(void) {
+	return usb_reconnect;
+}
+void SetUSBconfigured(int value) {
+	usb_configured = value;
+}
+int GetUSBconfigured(void){
+	return usb_configured;
+}
+
+bool usb_check() {
+	
+	/*
+	// reconnected ONCE and 
+	if ( !USB_ATTACHED() ){
+		usb_reconnect = 1;
+		return false;
+	}
+	
+	// only one time after USB been disengaged and re-engaged	
+	if ( USB_ATTACHED() && usb_reconnect == 1 ) {
+			
+		if ( usb_configured == 0) {			
+			usb_disable();
+			usb_enable();		
+
+			AT91F_CDC_Enumerate();
+			
+			usb_configured = 1;
+			return false;
+		}
+	}
+	*/
+
+	// interrupt status register
+	AT91_REG isr = pUdp->UDP_ISR;
+
+	// end of bus reset
+	if (isr & AT91C_UDP_ENDBUSRES) {
+		pUdp->UDP_ICR = AT91C_UDP_ENDBUSRES;
+		// reset all endpoints
+		pUdp->UDP_RSTEP  = (unsigned int)-1;
+		pUdp->UDP_RSTEP  = 0;
+		// Enable the function
+		pUdp->UDP_FADDR = AT91C_UDP_FEN;
+		// Configure endpoint 0  (enable control endpoint)
+		pUdp->UDP_CSR[AT91C_EP_CONTROL] = (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_CTRL);
+	}
+	else if (isr & AT91C_UDP_EPINT0) {
+		pUdp->UDP_ICR = AT91C_UDP_EPINT0;
+		AT91F_CDC_Enumerate();
+	} 
+	/*
+	else if (isr & AT91C_UDP_EPINT3 ) {
+		pUdp->UDP_ICR = AT91C_UDP_EPINT3;
+		AT91F_CDC_Enumerate();
+		//pUdp->UDP_ICR |= AT91C_UDP_EPINT3;
+	}
+	*/
+	return (btConfiguration) ? true : false;
+}
+
+bool usb_poll() {
+	if (!usb_check()) return false;
+	return (pUdp->UDP_CSR[AT91C_EP_OUT] & btReceiveBank);
+}
+
+/**
+	In github PR #129, some users appears to get a false positive from
+	usb_poll, which returns true, but the usb_read operation
+	still returns 0.
+	This check is basically the same as above, but also checks
+	that the length available to read is non-zero, thus hopefully fixes the
+	bug.
+**/
+bool usb_poll_validate_length() {
+	if (!usb_check()) return false;
+	if (!(pUdp->UDP_CSR[AT91C_EP_OUT] & btReceiveBank)) return false;
+	return ((pUdp->UDP_CSR[AT91C_EP_OUT] & AT91C_UDP_RXBYTECNT) >> 16) >  0;
+}
+
+//*----------------------------------------------------------------------------
+//* \fn    usb_read
+//* \brief Read available data from Endpoint 1 OUT (host to device)
+//*----------------------------------------------------------------------------
+uint32_t usb_read(byte_t* data, size_t len) {
+	
+	if ( len == 0 ) return 0;
+	
+	uint8_t bank = btReceiveBank;
+	uint32_t packetSize, nbBytesRcv = 0;
+	uint32_t time_out = 0;
+  
+	while (len)  {
+		if (!usb_check()) break;
+
+		if ( pUdp->UDP_CSR[AT91C_EP_OUT] & bank ) {
+			
+			packetSize = (pUdp->UDP_CSR[AT91C_EP_OUT] & AT91C_UDP_RXBYTECNT) >> 16;
+			packetSize = MIN( packetSize, len); 
+			len -= packetSize;
+			while (packetSize--)
+				data[nbBytesRcv++] = pUdp->UDP_FDR[AT91C_EP_OUT];
+
+			// flip bank
+			UDP_CLEAR_EP_FLAGS(AT91C_EP_OUT, bank)
+
+			if (bank == AT91C_UDP_RX_DATA_BK0)
+				bank = AT91C_UDP_RX_DATA_BK1;
+			else
+				bank = AT91C_UDP_RX_DATA_BK0;		
+		}
+		if (time_out++ == 0x1fff) break;
+	}
+
+	btReceiveBank = bank;
+	return nbBytesRcv;
+}
+
+//*----------------------------------------------------------------------------
+//* \fn    usb_write
+//* \brief Send through endpoint 2 (device to host)
+//*----------------------------------------------------------------------------
+uint32_t usb_write(const byte_t* data, const size_t len) {
+
+	if (!len) return 0;
+	if (!usb_check()) return 0;
+
+	// can we write?
+	if ( (pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXPKTRDY) != 0 ) return 0;
+	
+	size_t length = len;
+	uint32_t cpt = 0;
+ 
+ 
+	// send first chunk
+	cpt = MIN(length, AT91C_EP_IN_SIZE);
+	length -= cpt;
+	while (cpt--) {
+		pUdp->UDP_FDR[AT91C_EP_IN] = *data++;
+	}
+	
+	UDP_SET_EP_FLAGS(AT91C_EP_IN, AT91C_UDP_TXPKTRDY);
+	
+	while (length) {
+		// Send next chunk
+		cpt = MIN(length, AT91C_EP_IN_SIZE);
+		length -= cpt;
+		while (cpt--) {
+			pUdp->UDP_FDR[AT91C_EP_IN] = *data++;
+		}
+		
+		// Wait for previous chunk to be sent
+		// (iceman) when is the bankswapping done?
+		while (!(pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP)) {
+			if (!usb_check()) return length;
+		}
+		
+		UDP_CLEAR_EP_FLAGS(AT91C_EP_IN, AT91C_UDP_TXCOMP);
+		while (pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP);
+		UDP_SET_EP_FLAGS(AT91C_EP_IN, AT91C_UDP_TXPKTRDY);
+		
+	}
+  
+	// Wait for the end of transfer
+	while (!(pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP)) {
+		if (!usb_check()) return length;
+	}
+
+	UDP_CLEAR_EP_FLAGS(AT91C_EP_IN, AT91C_UDP_TXCOMP);
+	while (pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP);
+
+	return length;
+}
+
+//*----------------------------------------------------------------------------
+//* \fn    AT91F_USB_SendData
+//* \brief Send Data through the control endpoint
+//*----------------------------------------------------------------------------
+void AT91F_USB_SendData(AT91PS_UDP pUdp, const char *pData, uint32_t length) {
+	uint32_t cpt = 0;
+	AT91_REG csr;
+	
+	do {
+		cpt = MIN(length, AT91C_EP_CONTROL_SIZE);
+		length -= cpt;
+
+		while (cpt--)
+			pUdp->UDP_FDR[AT91C_EP_CONTROL] = *pData++;
+
+		if (pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_TXCOMP) {
+			UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_TXCOMP);
+			while (pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_TXCOMP);
+		}
+
+		UDP_SET_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_TXPKTRDY);
+
+		do {
+			csr = pUdp->UDP_CSR[AT91C_EP_CONTROL];
+			// Data IN stage has been stopped by a status OUT
+			if ( csr & AT91C_UDP_RX_DATA_BK0) {
+				
+				UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_RX_DATA_BK0)
+				return;
+			}
+		} while ( !(csr & AT91C_UDP_TXCOMP) );
+
+	} while (length);
+
+	if (pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_TXCOMP) {
+		UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_TXCOMP);
+		while (pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_TXCOMP);
+	}
+}
+		
+
+//*----------------------------------------------------------------------------
+//* \fn    AT91F_USB_SendZlp
+//* \brief Send zero length packet through the control endpoint
+//*----------------------------------------------------------------------------
+void AT91F_USB_SendZlp(AT91PS_UDP pUdp) {
+	UDP_SET_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_TXPKTRDY);	
+	while ( !(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_TXCOMP) );
+	UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_TXCOMP);
+	while (pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_TXCOMP);
+}
+
+//*----------------------------------------------------------------------------
+//* \fn    AT91F_USB_SendStall
+//* \brief Stall the control endpoint
+//*----------------------------------------------------------------------------
+void AT91F_USB_SendStall(AT91PS_UDP pUdp) {
+	UDP_SET_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_FORCESTALL);
+	while ( !(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_ISOERROR) );
+	UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, (AT91C_UDP_FORCESTALL | AT91C_UDP_ISOERROR) );
+	while (pUdp->UDP_CSR[AT91C_EP_CONTROL] & (AT91C_UDP_FORCESTALL | AT91C_UDP_ISOERROR));
+}
+
+//*----------------------------------------------------------------------------
+//* \fn    AT91F_CDC_Enumerate
+//* \brief This function is a callback invoked when a SETUP packet is received
+//* problem:  
+//* 1. this is for USB endpoint0.  the control endpoint.
+//* 2. mixed with CDC ACM endpoint3 , interrupt, control endpoint
+//*----------------------------------------------------------------------------
+void AT91F_CDC_Enumerate() {
+	byte_t bmRequestType, bRequest;
+	uint16_t wValue, wIndex, wLength, wStatus;
+
+	if ( !(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_RXSETUP) )
+		return;
+
+	bmRequestType = pUdp->UDP_FDR[AT91C_EP_CONTROL];
+	bRequest      = pUdp->UDP_FDR[AT91C_EP_CONTROL];
+	wValue        = (pUdp->UDP_FDR[AT91C_EP_CONTROL] & 0xFF);
+	wValue       |= (pUdp->UDP_FDR[AT91C_EP_CONTROL] << 8);
+	wIndex        = (pUdp->UDP_FDR[AT91C_EP_CONTROL] & 0xFF);
+	wIndex       |= (pUdp->UDP_FDR[AT91C_EP_CONTROL] << 8);
+	wLength       = (pUdp->UDP_FDR[AT91C_EP_CONTROL] & 0xFF);
+	wLength      |= (pUdp->UDP_FDR[AT91C_EP_CONTROL] << 8);
+
+	if (bmRequestType & 0x80) {        // Data Phase Transfer Direction Device to Host
+		UDP_SET_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_DIR);
+		while ( !(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_DIR) );
+	}
+	UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_RXSETUP);
+	while ( (pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_RXSETUP)  );
+
+	/*
+	if ( bRequest == MS_VENDOR_CODE) {
+		if ( bmRequestType == MS_WCID_GET_DESCRIPTOR ) { // C0
+			if ( wIndex == MS_EXTENDED_COMPAT_ID ) {  // 4
+				//AT91F_USB_SendData(pUdp, CompatIDFeatureDescriptor, MIN(sizeof(CompatIDFeatureDescriptor), wLength));
+				//return;
+			} 
+		}
+
+		if ( bmRequestType == MS_WCID_GET_FEATURE_DESCRIPTOR ) {  //C1
+			// if ( wIndex == MS_EXTENDED_PROPERTIES ) { // 5  - winusb bug with wIndex == interface index,  so I just send it always)
+				//AT91F_USB_SendData(pUdp, OSprop, MIN(sizeof(OSprop), wLength));
+				//return;
+			// } 
+		}
+	}
+	*/
+	
+	// Handle supported standard device request Cf Table 9-3 in USB specification Rev 1.1
+	switch ((bRequest << 8) | bmRequestType) {
+	case STD_GET_DESCRIPTOR: {
+		
+			if ( wValue == 0x100 )       // Return Device Descriptor
+				AT91F_USB_SendData(pUdp, devDescriptor, MIN(sizeof(devDescriptor), wLength));
+			else if ( wValue == 0x200 )  // Return Configuration Descriptor
+				AT91F_USB_SendData(pUdp, cfgDescriptor, MIN(sizeof(cfgDescriptor), wLength));
+			else if ( (wValue & 0xF00) == 0xF00) // Return BOS Descriptor
+				AT91F_USB_SendData(pUdp, bosDescriptor, MIN(sizeof(bosDescriptor), wLength));
+			else if ( (wValue & 0x300) == 0x300) { // Return String Descriptor
+
+				const char *strDescriptor = getStringDescriptor(wValue & 0xff);
+				if (strDescriptor != NULL) {
+					AT91F_USB_SendData(pUdp, strDescriptor, MIN(strDescriptor[0], wLength));
+				} else {
+					AT91F_USB_SendStall(pUdp);
+				}
+			} else {
+				AT91F_USB_SendStall(pUdp);
+			}
+		}
+		break;
+	case STD_SET_ADDRESS:
+		AT91F_USB_SendZlp(pUdp);
+		pUdp->UDP_FADDR = (AT91C_UDP_FEN | (wValue & 0x7F) );
+		pUdp->UDP_GLBSTATE  = (wValue) ? AT91C_UDP_FADDEN : 0;
+		break;
+	case STD_SET_CONFIGURATION:
+	
+		/* 
+		*   Set or clear the device "configured" state. 
+		*   The LSB of wValue is the "Configuration Number". If this value is non-zero, 
+		*   it should be the same number as defined in the Configuration Descriptor; 
+		*   otherwise an error must have occurred. 
+		*   This device has only one configuration and its Config Number is CONF_NB (= 1). 
+		*/  			
+		AT91F_USB_SendZlp(pUdp);
+		btConfiguration = wValue;
+		pUdp->UDP_GLBSTATE  = (wValue) ? AT91C_UDP_CONFG : AT91C_UDP_FADDEN;
+		
+		// make sure we are not stalled
+		/*
+		UDP_CLEAR_EP_FLAGS(AT91C_EP_OUT   , AT91C_UDP_FORCESTALL);
+        UDP_CLEAR_EP_FLAGS(AT91C_EP_IN    , AT91C_UDP_FORCESTALL);
+		UDP_CLEAR_EP_FLAGS(AT91C_EP_NOTIFY, AT91C_UDP_FORCESTALL);
+		*/
+		
+		// enable endpoints
+		pUdp->UDP_CSR[AT91C_EP_OUT]    = (wValue) ? (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_BULK_OUT) : 0;
+		pUdp->UDP_CSR[AT91C_EP_IN]     = (wValue) ? (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_BULK_IN)  : 0;
+		pUdp->UDP_CSR[AT91C_EP_NOTIFY] = (wValue) ? (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_INT_IN)   : 0;
+		break;
+	case STD_GET_CONFIGURATION:
+		AT91F_USB_SendData(pUdp, (char *) &(btConfiguration), sizeof(btConfiguration));
+		break;
+	case STD_GET_STATUS_ZERO:
+		wStatus = 0;   // Device is Bus powered, remote wakeup disabled
+		AT91F_USB_SendData(pUdp, (char *) &wStatus, sizeof(wStatus));
+		break;
+	case STD_GET_STATUS_INTERFACE:
+		wStatus = 0;   // reserved for future use
+		AT91F_USB_SendData(pUdp, (char *) &wStatus, sizeof(wStatus));
+		break;
+	case STD_GET_STATUS_ENDPOINT:
+		wStatus = 0;
+		wIndex &= 0x0F;
+		if ((pUdp->UDP_GLBSTATE & AT91C_UDP_CONFG) && (wIndex <= AT91C_EP_NOTIFY)) {
+			wStatus = (pUdp->UDP_CSR[wIndex] & AT91C_UDP_EPEDS) ? 0 : 1;
+			AT91F_USB_SendData(pUdp, (char *) &wStatus, sizeof(wStatus));
+		}
+		else if ((pUdp->UDP_GLBSTATE & AT91C_UDP_FADDEN) && (wIndex == AT91C_EP_CONTROL)) {
+			wStatus = (pUdp->UDP_CSR[wIndex] & AT91C_UDP_EPEDS) ? 0 : 1;
+			AT91F_USB_SendData(pUdp, (char *) &wStatus, sizeof(wStatus));
+		} else {
+			AT91F_USB_SendStall(pUdp);
+		}
+		break;
+	case STD_SET_FEATURE_ZERO:
+		AT91F_USB_SendStall(pUdp);
+	    break;
+	case STD_SET_FEATURE_INTERFACE:
+		AT91F_USB_SendZlp(pUdp);
+		break;
+	case STD_SET_FEATURE_ENDPOINT:
+		wIndex &= 0x0F;
+		if ((wValue == 0) && (wIndex >= AT91C_EP_OUT) && (wIndex <= AT91C_EP_NOTIFY)) {
+			pUdp->UDP_CSR[wIndex] = 0;
+			AT91F_USB_SendZlp(pUdp);
+		} else {
+			AT91F_USB_SendStall(pUdp);
+		}
+		break;
+	case STD_CLEAR_FEATURE_ZERO:
+		AT91F_USB_SendStall(pUdp);
+	    break;
+	case STD_CLEAR_FEATURE_INTERFACE:
+		AT91F_USB_SendZlp(pUdp);
+		break;
+	case STD_CLEAR_FEATURE_ENDPOINT:
+		wIndex &= 0x0F;
+		if ((wValue == 0) && (wIndex >= AT91C_EP_OUT) && (wIndex <= AT91C_EP_NOTIFY)) {
+
+			if (wIndex == AT91C_EP_OUT)			pUdp->UDP_CSR[AT91C_EP_OUT] = (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_BULK_OUT);
+			else if (wIndex == AT91C_EP_IN)		pUdp->UDP_CSR[AT91C_EP_IN] = (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_BULK_IN);
+			else if (wIndex == AT91C_EP_NOTIFY) pUdp->UDP_CSR[AT91C_EP_NOTIFY] = (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_INT_IN);
+
+			AT91F_USB_SendZlp(pUdp);
+		} else {
+			AT91F_USB_SendStall(pUdp);
+		}
+		break;
+
+	// handle CDC class requests
+	case SET_LINE_CODING: {
+	/*
+	    uint8_t i;  
+		for ( i = 0 ; i < 7 ; i++ )  {  
+			((uint8_t*)&line)[i] =  pUdp->UDP_FDR[AT91C_EP_CONTROL];
+		}  */
+		// ignore SET_LINE_CODING...
+		while ( !(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_RX_DATA_BK0) );
+		UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_RX_DATA_BK0);
+		AT91F_USB_SendZlp(pUdp);
+		break;
+	}
+	case GET_LINE_CODING:
+		AT91F_USB_SendData(pUdp, (char *) &line, MIN(sizeof(line), wLength));
+		break;
+	case SET_CONTROL_LINE_STATE:
+		btConnection = wValue;
+		AT91F_USB_SendZlp(pUdp);
+		break;
+	default:
+		AT91F_USB_SendStall(pUdp);
+	    break;
+	}
 }
\ No newline at end of file
diff --git a/common/usb_cdc.h b/common/usb_cdc.h
index 6d471db92..fcac556fd 100644
--- a/common/usb_cdc.h
+++ b/common/usb_cdc.h
@@ -1,63 +1,63 @@
-/*
- * at91sam7s USB CDC device implementation
- *
- * Copyright (c) 2012, Roel Verdult
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holders nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ''AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * based on the "Basic USB Example" from ATMEL (doc6123.pdf)
- *
- * @file usb_cdc.c
- * @brief
- */
-
-#ifndef _USB_CDC_H_
-#define _USB_CDC_H_
-
-#include <wchar.h>
-#include "at91sam7s512.h"
-#include "config_gpio.h" 
-#include "proxmark3.h" // USB_CONNECT()
-#include "common.h"
-
-extern void usb_disable();
-extern void usb_enable();
-extern bool usb_check();
-extern bool usb_poll();
-extern bool usb_poll_validate_length();
-extern uint32_t usb_read(byte_t* data, size_t len);
-extern uint32_t usb_write(const byte_t* data, const size_t len);
-
-extern void SetUSBreconnect(int value);
-extern int GetUSBreconnect(void);
-extern void SetUSBconfigured(int value);
-extern int GetUSBconfigured(void);
-
-extern void AT91F_USB_SendData(AT91PS_UDP pUdp, const char *pData, uint32_t length);
-extern void AT91F_USB_SendZlp(AT91PS_UDP pUdp);
-extern void AT91F_USB_SendStall(AT91PS_UDP pUdp);
-extern void AT91F_CDC_Enumerate();
-
-#endif // _USB_CDC_H_
-
+/*
+ * at91sam7s USB CDC device implementation
+ *
+ * Copyright (c) 2012, Roel Verdult
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ''AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * based on the "Basic USB Example" from ATMEL (doc6123.pdf)
+ *
+ * @file usb_cdc.c
+ * @brief
+ */
+
+#ifndef _USB_CDC_H_
+#define _USB_CDC_H_
+
+#include <wchar.h>
+#include "at91sam7s512.h"
+#include "config_gpio.h" 
+#include "proxmark3.h" // USB_CONNECT()
+#include "common.h"
+
+extern void usb_disable();
+extern void usb_enable();
+extern bool usb_check();
+extern bool usb_poll();
+extern bool usb_poll_validate_length();
+extern uint32_t usb_read(byte_t* data, size_t len);
+extern uint32_t usb_write(const byte_t* data, const size_t len);
+
+extern void SetUSBreconnect(int value);
+extern int GetUSBreconnect(void);
+extern void SetUSBconfigured(int value);
+extern int GetUSBconfigured(void);
+
+extern void AT91F_USB_SendData(AT91PS_UDP pUdp, const char *pData, uint32_t length);
+extern void AT91F_USB_SendZlp(AT91PS_UDP pUdp);
+extern void AT91F_USB_SendStall(AT91PS_UDP pUdp);
+extern void AT91F_CDC_Enumerate();
+
+#endif // _USB_CDC_H_
+
diff --git a/tools/mfkey/crapto1.c b/tools/mfkey/crapto1.c
index ea7f60bba..203efeb4f 100755
--- a/tools/mfkey/crapto1.c
+++ b/tools/mfkey/crapto1.c
@@ -1,574 +1,574 @@
-/*  crapto1.c
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation; either version 2
-    of the License, or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA  02110-1301, US$
-
-    Copyright (C) 2008-2014 bla <blapost@gmail.com>
-*/
-#include "crapto1.h"
-#include <stdlib.h>
-
-#if !defined LOWMEM && defined __GNUC__
-static uint8_t filterlut[1 << 20];
-static void __attribute__((constructor)) fill_lut()
-{
-        uint32_t i;
-        for(i = 0; i < 1 << 20; ++i)
-                filterlut[i] = filter(i);
-}
-#define filter(x) (filterlut[(x) & 0xfffff])
-#endif
-
-
-
-typedef struct bucket {
-	uint32_t *head;
-	uint32_t *bp;
-} bucket_t;
-
-typedef bucket_t bucket_array_t[2][0x100];
-
-typedef struct bucket_info {
-	struct {
-		uint32_t *head, *tail;
-		} bucket_info[2][0x100];
-		uint32_t numbuckets;
-	} bucket_info_t;
-
-
-static void bucket_sort_intersect(uint32_t* const estart, uint32_t* const estop,
-								  uint32_t* const ostart, uint32_t* const ostop,
-								  bucket_info_t *bucket_info, bucket_array_t bucket)
-{
-	uint32_t *p1, *p2;
-	uint32_t *start[2];
-	uint32_t *stop[2];
-
-	start[0] = estart;
-	stop[0] = estop;
-	start[1] = ostart;
-	stop[1] = ostop;
-
-	// init buckets to be empty
-	for (uint32_t i = 0; i < 2; i++) {
-		for (uint32_t j = 0x00; j <= 0xff; j++) {
-			bucket[i][j].bp = bucket[i][j].head;
-		}
-	}
-
-	// sort the lists into the buckets based on the MSB (contribution bits)
-	for (uint32_t i = 0; i < 2; i++) {
-		for (p1 = start[i]; p1 <= stop[i]; p1++) {
-			uint32_t bucket_index = (*p1 & 0xff000000) >> 24;
-			*(bucket[i][bucket_index].bp++) = *p1;
-		}
-	}
-
-
-	// write back intersecting buckets as sorted list.
-	// fill in bucket_info with head and tail of the bucket contents in the list and number of non-empty buckets.
-	uint32_t nonempty_bucket;
-	for (uint32_t i = 0; i < 2; i++) {
-		p1 = start[i];
-		nonempty_bucket = 0;
-		for (uint32_t j = 0x00; j <= 0xff; j++) {
-			if (bucket[0][j].bp != bucket[0][j].head && bucket[1][j].bp != bucket[1][j].head) { // non-empty intersecting buckets only
-				bucket_info->bucket_info[i][nonempty_bucket].head = p1;
-				for (p2 = bucket[i][j].head; p2 < bucket[i][j].bp; *p1++ = *p2++);
-				bucket_info->bucket_info[i][nonempty_bucket].tail = p1 - 1;
-				nonempty_bucket++;
-			}
-		}
-		bucket_info->numbuckets = nonempty_bucket;
-		}
-}
-
-
-/** update_contribution
- * helper, calculates the partial linear feedback contributions and puts in MSB
- */
-static inline void update_contribution(uint32_t *item, const uint32_t mask1, const uint32_t mask2)
-{
-	uint32_t p = *item >> 25;
-
-	p = p << 1 | parity(*item & mask1);
-	p = p << 1 | parity(*item & mask2);
-	*item = p << 24 | (*item & 0xffffff);
-}
-
-/** extend_table
- * using a bit of the keystream extend the table of possible lfsr states
- */
-static inline void extend_table(uint32_t *tbl, uint32_t **end, int bit, int m1, int m2, uint32_t in)
-{
-	in <<= 24;
-	for(*tbl <<= 1; tbl <= *end; *++tbl <<= 1)
-		if(filter(*tbl) ^ filter(*tbl | 1)) {
-			*tbl |= filter(*tbl) ^ bit;
-			update_contribution(tbl, m1, m2);
-			*tbl ^= in;
-		} else if(filter(*tbl) == bit) {
-			*++*end = tbl[1];
-			tbl[1] = tbl[0] | 1;
-			update_contribution(tbl, m1, m2);
-			*tbl++ ^= in;
-			update_contribution(tbl, m1, m2);
-			*tbl ^= in;
-		} else
-			*tbl-- = *(*end)--;
-}
-/** extend_table_simple
- * using a bit of the keystream extend the table of possible lfsr states
- */
-static inline void extend_table_simple(uint32_t *tbl, uint32_t **end, int bit)
-{
-	for(*tbl <<= 1; tbl <= *end; *++tbl <<= 1) {
-		if(filter(*tbl) ^ filter(*tbl | 1)) {	// replace
-			*tbl |= filter(*tbl) ^ bit;
-		} else if(filter(*tbl) == bit) {		// insert
-			*++*end = *++tbl;
-			*tbl = tbl[-1] | 1;
-		} else	{								// drop
-			*tbl-- = *(*end)--;
-		}
-	}
-}
-/** recover
- * recursively narrow down the search space, 4 bits of keystream at a time
- */
-static struct Crypto1State*
-recover(uint32_t *o_head, uint32_t *o_tail, uint32_t oks,
-	uint32_t *e_head, uint32_t *e_tail, uint32_t eks, int rem,
-	struct Crypto1State *sl, uint32_t in, bucket_array_t bucket)
-{
-	uint32_t *o, *e;
-	bucket_info_t bucket_info;
-
-	if(rem == -1) {
-		for(e = e_head; e <= e_tail; ++e) {
-			*e = *e << 1 ^ parity(*e & LF_POLY_EVEN) ^ !!(in & 4);
-			for(o = o_head; o <= o_tail; ++o, ++sl) {
-				sl->even = *o;
-				sl->odd = *e ^ parity(*o & LF_POLY_ODD);
-				sl[1].odd = sl[1].even = 0;
-			}
-		}
-		return sl;
-	}
-
-	for(uint32_t i = 0; i < 4 && rem--; i++) {
-		oks >>= 1;
-		eks >>= 1;
-		in >>= 2;
-		extend_table(o_head, &o_tail, oks & 1, LF_POLY_EVEN << 1 | 1, LF_POLY_ODD << 1, 0);
-		if(o_head > o_tail)
-			return sl;
-
-		extend_table(e_head, &e_tail, eks & 1, LF_POLY_ODD, LF_POLY_EVEN << 1 | 1, in & 3);
-		if(e_head > e_tail)
-			return sl;
-	}
-
-	bucket_sort_intersect(e_head, e_tail, o_head, o_tail, &bucket_info, bucket);
-
-	for (int i = bucket_info.numbuckets - 1; i >= 0; i--) {
-		sl = recover(bucket_info.bucket_info[1][i].head, bucket_info.bucket_info[1][i].tail, oks,
-					 bucket_info.bucket_info[0][i].head, bucket_info.bucket_info[0][i].tail, eks,
-					 rem, sl, in, bucket);
-		}
-
-	return sl;
-}
-/** lfsr_recovery
- * recover the state of the lfsr given 32 bits of the keystream
- * additionally you can use the in parameter to specify the value
- * that was fed into the lfsr at the time the keystream was generated
- */
-struct Crypto1State* lfsr_recovery32(uint32_t ks2, uint32_t in)
-{
-	struct Crypto1State *statelist;
-	uint32_t *odd_head = 0, *odd_tail = 0, oks = 0;
-	uint32_t *even_head = 0, *even_tail = 0, eks = 0;
-	int i;
-
-	// split the keystream into an odd and even part
-	for(i = 31; i >= 0; i -= 2)
-		oks = oks << 1 | BEBIT(ks2, i);
-	for(i = 30; i >= 0; i -= 2)
-		eks = eks << 1 | BEBIT(ks2, i);
-
-	odd_head = odd_tail = malloc(sizeof(uint32_t) << 21);
-	even_head = even_tail = malloc(sizeof(uint32_t) << 21);
-	statelist =  malloc(sizeof(struct Crypto1State) << 18);
-	if(!odd_tail-- || !even_tail-- || !statelist) {
-		free(statelist);
-		statelist = 0;
-		goto out;
-	}
-
-	statelist->odd = statelist->even = 0;
-
-	// allocate memory for out of place bucket_sort
-	bucket_array_t bucket;
-	
-	for (uint32_t i = 0; i < 2; i++) {
-		for (uint32_t j = 0; j <= 0xff; j++) {
-			bucket[i][j].head = malloc(sizeof(uint32_t)<<14);
-			if (!bucket[i][j].head) {
-				goto out;
-			}
-		}
-	}
-
-	// initialize statelists: add all possible states which would result into the rightmost 2 bits of the keystream
-	for(i = 1 << 20; i >= 0; --i) {
-		if(filter(i) == (oks & 1))
-			*++odd_tail = i;
-		if(filter(i) == (eks & 1))
-			*++even_tail = i;
-	}
-
-	// extend the statelists. Look at the next 8 Bits of the keystream (4 Bit each odd and even):
-	for(i = 0; i < 4; i++) {
-		extend_table_simple(odd_head,  &odd_tail, (oks >>= 1) & 1);
-		extend_table_simple(even_head, &even_tail, (eks >>= 1) & 1);
-	}
-
-	// the statelists now contain all states which could have generated the last 10 Bits of the keystream.
-	// 22 bits to go to recover 32 bits in total. From now on, we need to take the "in"
-	// parameter into account.
-	in = (in >> 16 & 0xff) | (in << 16) | (in & 0xff00);		// Byte swapping
-	recover(odd_head, odd_tail, oks, even_head, even_tail, eks, 11, statelist, in << 1, bucket);
-
-out:
-	for (uint32_t i = 0; i < 2; i++)
-		for (uint32_t j = 0; j <= 0xff; j++)
-			free(bucket[i][j].head);
-	free(odd_head);
-	free(even_head);
-	return statelist;
-}
-
-static const uint32_t S1[] = {     0x62141, 0x310A0, 0x18850, 0x0C428, 0x06214,
-	0x0310A, 0x85E30, 0xC69AD, 0x634D6, 0xB5CDE, 0xDE8DA, 0x6F46D, 0xB3C83,
-	0x59E41, 0xA8995, 0xD027F, 0x6813F, 0x3409F, 0x9E6FA};
-static const uint32_t S2[] = {  0x3A557B00, 0x5D2ABD80, 0x2E955EC0, 0x174AAF60,
-	0x0BA557B0, 0x05D2ABD8, 0x0449DE68, 0x048464B0, 0x42423258, 0x278192A8,
-	0x156042D0, 0x0AB02168, 0x43F89B30, 0x61FC4D98, 0x765EAD48, 0x7D8FDD20,
-	0x7EC7EE90, 0x7F63F748, 0x79117020};
-static const uint32_t T1[] = {
-	0x4F37D, 0x279BE, 0x97A6A, 0x4BD35, 0x25E9A, 0x12F4D, 0x097A6, 0x80D66,
-	0xC4006, 0x62003, 0xB56B4, 0x5AB5A, 0xA9318, 0xD0F39, 0x6879C, 0xB057B,
-	0x582BD, 0x2C15E, 0x160AF, 0x8F6E2, 0xC3DC4, 0xE5857, 0x72C2B, 0x39615,
-	0x98DBF, 0xC806A, 0xE0680, 0x70340, 0x381A0, 0x98665, 0x4C332, 0xA272C};
-static const uint32_t T2[] = {  0x3C88B810, 0x5E445C08, 0x2982A580, 0x14C152C0,
-	0x4A60A960, 0x253054B0, 0x52982A58, 0x2FEC9EA8, 0x1156C4D0, 0x08AB6268,
-	0x42F53AB0, 0x217A9D58, 0x161DC528, 0x0DAE6910, 0x46D73488, 0x25CB11C0,
-	0x52E588E0, 0x6972C470, 0x34B96238, 0x5CFC3A98, 0x28DE96C8, 0x12CFC0E0,
-	0x4967E070, 0x64B3F038, 0x74F97398, 0x7CDC3248, 0x38CE92A0, 0x1C674950,
-	0x0E33A4A8, 0x01B959D0, 0x40DCACE8, 0x26CEDDF0};
-static const uint32_t C1[] = { 0x846B5, 0x4235A, 0x211AD};
-static const uint32_t C2[] = { 0x1A822E0, 0x21A822E0, 0x21A822E0};
-/** Reverse 64 bits of keystream into possible cipher states
- * Variation mentioned in the paper. Somewhat optimized version
- */
-struct Crypto1State* lfsr_recovery64(uint32_t ks2, uint32_t ks3)
-{
-	struct Crypto1State *statelist, *sl;
-	uint8_t oks[32], eks[32], hi[32];
-	uint32_t low = 0,  win = 0;
-	uint32_t *tail, table[1 << 16];
-	int i, j;
-
-	sl = statelist = malloc(sizeof(struct Crypto1State) << 4);
-	if(!sl)
-		return 0;
-	sl->odd = sl->even = 0;
-
-	for(i = 30; i >= 0; i -= 2) {
-		oks[i >> 1] = BEBIT(ks2, i);
-		oks[16 + (i >> 1)] = BEBIT(ks3, i);
-	}
-	for(i = 31; i >= 0; i -= 2) {
-		eks[i >> 1] = BEBIT(ks2, i);
-		eks[16 + (i >> 1)] = BEBIT(ks3, i);
-	}
-
-	for(i = 0xfffff; i >= 0; --i) {
-		if (filter(i) != oks[0])
-			continue;
-
-		*(tail = table) = i;
-		for(j = 1; tail >= table && j < 29; ++j)
-			extend_table_simple(table, &tail, oks[j]);
-
-		if(tail < table)
-			continue;
-
-		for(j = 0; j < 19; ++j)
-			low = low << 1 | parity(i & S1[j]);
-		for(j = 0; j < 32; ++j)
-			hi[j] = parity(i & T1[j]);
-
-		for(; tail >= table; --tail) {
-			for(j = 0; j < 3; ++j) {
-				*tail = *tail << 1;
-				*tail |= parity((i & C1[j]) ^ (*tail & C2[j]));
-				if(filter(*tail) != oks[29 + j])
-					goto continue2;
-			}
-
-			for(j = 0; j < 19; ++j)
-				win = win << 1 | parity(*tail & S2[j]);
-
-			win ^= low;
-			for(j = 0; j < 32; ++j) {
-				win = win << 1 ^ hi[j] ^ parity(*tail & T2[j]);
-				if(filter(win) != eks[j])
-					goto continue2;
-			}
-
-			*tail = *tail << 1 | parity(LF_POLY_EVEN & *tail);
-			sl->odd = *tail ^ parity(LF_POLY_ODD & win);
-			sl->even = win;
-			++sl;
-			sl->odd = sl->even = 0;
-			continue2:;
-		}
-	}
-	return statelist;
-}
-
-/** lfsr_rollback_bit
- * Rollback the shift register in order to get previous states
- */
-uint8_t lfsr_rollback_bit(struct Crypto1State *s, uint32_t in, int fb)
-{
-	int out;
-	uint8_t ret;
-	uint32_t t;
-
-	s->odd &= 0xffffff;
-	t = s->odd, s->odd = s->even, s->even = t;
-
-	out = s->even & 1;
-	out ^= LF_POLY_EVEN & (s->even >>= 1);
-	out ^= LF_POLY_ODD & s->odd;
-	out ^= !!in;
-	out ^= (ret = filter(s->odd)) & !!fb;
-
-	s->even |= parity(out) << 23;
-	return ret;
-}
-/** lfsr_rollback_byte
- * Rollback the shift register in order to get previous states
- */
-uint8_t lfsr_rollback_byte(struct Crypto1State *s, uint32_t in, int fb)
-{
-	/*
-	int i, ret = 0;
-	for (i = 7; i >= 0; --i)
-		ret |= lfsr_rollback_bit(s, BIT(in, i), fb) << i;
-*/
-// unfold loop 20160112
-	uint8_t ret = 0;
-	ret |= lfsr_rollback_bit(s, BIT(in, 7), fb) << 7;
-	ret |= lfsr_rollback_bit(s, BIT(in, 6), fb) << 6;
-	ret |= lfsr_rollback_bit(s, BIT(in, 5), fb) << 5;
-	ret |= lfsr_rollback_bit(s, BIT(in, 4), fb) << 4;
-	ret |= lfsr_rollback_bit(s, BIT(in, 3), fb) << 3;
-	ret |= lfsr_rollback_bit(s, BIT(in, 2), fb) << 2;
-	ret |= lfsr_rollback_bit(s, BIT(in, 1), fb) << 1;
-	ret |= lfsr_rollback_bit(s, BIT(in, 0), fb) << 0;
-	return ret;
-}
-/** lfsr_rollback_word
- * Rollback the shift register in order to get previous states
- */
-uint32_t lfsr_rollback_word(struct Crypto1State *s, uint32_t in, int fb)
-{
-	/*
-	int i;
-	uint32_t ret = 0;
-	for (i = 31; i >= 0; --i)
-		ret |= lfsr_rollback_bit(s, BEBIT(in, i), fb) << (i ^ 24);
-*/
-// unfold loop 20160112
-	uint32_t ret = 0;
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 31), fb) << (31 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 30), fb) << (30 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 29), fb) << (29 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 28), fb) << (28 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 27), fb) << (27 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 26), fb) << (26 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 25), fb) << (25 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 24), fb) << (24 ^ 24);
-
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 23), fb) << (23 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 22), fb) << (22 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 21), fb) << (21 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 20), fb) << (20 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 19), fb) << (19 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 18), fb) << (18 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 17), fb) << (17 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 16), fb) << (16 ^ 24);
-	
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 15), fb) << (15 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 14), fb) << (14 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 13), fb) << (13 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 12), fb) << (12 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 11), fb) << (11 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 10), fb) << (10 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 9), fb) << (9 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 8), fb) << (8 ^ 24);
-	
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 7), fb) << (7 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 6), fb) << (6 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 5), fb) << (5 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 4), fb) << (4 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 3), fb) << (3 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 2), fb) << (2 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 1), fb) << (1 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 0), fb) << (0 ^ 24);
-	return ret;
-}
-
-/** nonce_distance
- * x,y valid tag nonces, then prng_successor(x, nonce_distance(x, y)) = y
- */
-static uint16_t *dist = 0;
-int nonce_distance(uint32_t from, uint32_t to)
-{
-	uint16_t x, i;
-	if(!dist) {
-		dist = malloc(2 << 16);
-		if(!dist)
-			return -1;
-		for (x = i = 1; i; ++i) {
-			dist[(x & 0xff) << 8 | x >> 8] = i;
-			x = x >> 1 | (x ^ x >> 2 ^ x >> 3 ^ x >> 5) << 15;
-		}
-	}
-	return (65535 + dist[to >> 16] - dist[from >> 16]) % 65535;
-}
-
-
-static uint32_t fastfwd[2][8] = {
-	{ 0, 0x4BC53, 0xECB1, 0x450E2, 0x25E29, 0x6E27A, 0x2B298, 0x60ECB},
-	{ 0, 0x1D962, 0x4BC53, 0x56531, 0xECB1, 0x135D3, 0x450E2, 0x58980}};
-
-
-/** lfsr_prefix_ks
- *
- * Is an exported helper function from the common prefix attack
- * Described in the "dark side" paper. It returns an -1 terminated array
- * of possible partial(21 bit) secret state.
- * The required keystream(ks) needs to contain the keystream that was used to
- * encrypt the NACK which is observed when varying only the 3 last bits of Nr
- * only correct iff [NR_3] ^ NR_3 does not depend on Nr_3
- */
-uint32_t *lfsr_prefix_ks(uint8_t ks[8], int isodd)
-{
-	uint32_t *candidates = malloc(4 << 10);
-	if(!candidates) return 0;
-	
-	uint32_t c,  entry;
-	int size = 0, i, good;
-
-	for(i = 0; i < 1 << 21; ++i) {
-		for(c = 0, good = 1; good && c < 8; ++c) {
-			entry = i ^ fastfwd[isodd][c];
-			good &= (BIT(ks[c], isodd) == filter(entry >> 1));
-			good &= (BIT(ks[c], isodd + 2) == filter(entry));
-		}
-		if(good)
-			candidates[size++] = i;
-	}
-
-	candidates[size] = -1;
-
-	return candidates;
-}
-
-/** check_pfx_parity
- * helper function which eliminates possible secret states using parity bits
- */
-static struct Crypto1State* check_pfx_parity(uint32_t prefix, uint32_t rresp, uint8_t parities[8][8], uint32_t odd, uint32_t even, struct Crypto1State* sl)
-{
-	uint32_t ks1, nr, ks2, rr, ks3, c, good = 1;
-
-	for(c = 0; good && c < 8; ++c) {
-		sl->odd = odd ^ fastfwd[1][c];
-		sl->even = even ^ fastfwd[0][c];
-
-		lfsr_rollback_bit(sl, 0, 0);
-		lfsr_rollback_bit(sl, 0, 0);
-
-		ks3 = lfsr_rollback_bit(sl, 0, 0);
-		ks2 = lfsr_rollback_word(sl, 0, 0);
-		ks1 = lfsr_rollback_word(sl, prefix | c << 5, 1);
-
-		nr = ks1 ^ (prefix | c << 5);
-		rr = ks2 ^ rresp;
-
-		good &= parity(nr & 0x000000ff) ^ parities[c][3] ^ BIT(ks2, 24);
-		good &= parity(rr & 0xff000000) ^ parities[c][4] ^ BIT(ks2, 16);
-		good &= parity(rr & 0x00ff0000) ^ parities[c][5] ^ BIT(ks2,  8);
-		good &= parity(rr & 0x0000ff00) ^ parities[c][6] ^ BIT(ks2,  0);
-		good &= parity(rr & 0x000000ff) ^ parities[c][7] ^ ks3;
-	}
-
-	return sl + good;
-} 
-
-/** lfsr_common_prefix
- * Implentation of the common prefix attack.
- * Requires the 28 bit constant prefix used as reader nonce (pfx)
- * The reader response used (rr)
- * The keystream used to encrypt the observed NACK's (ks)
- * The parity bits (par)
- * It returns a zero terminated list of possible cipher states after the
- * tag nonce was fed in
- */
-
-struct Crypto1State* lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8])
-{
-	struct Crypto1State *statelist, *s;
-	uint32_t *odd, *even, *o, *e, top;
-
-	odd = lfsr_prefix_ks(ks, 1);
-	even = lfsr_prefix_ks(ks, 0);
-
-	s = statelist = malloc((sizeof *statelist) << 24);
-	if(!s || !odd || !even) {
-		free(statelist);
-		statelist = 0;
-                goto out;
-	}
-
-	for(o = odd; *o + 1; ++o)
-		for(e = even; *e + 1; ++e)
-			for(top = 0; top < 64; ++top) {
-				*o += 1 << 21;
-				*e += (!(top & 7) + 1) << 21;
-				s = check_pfx_parity(pfx, rr, par, *o, *e, s);
-			}
-
-	s->odd = s->even = 0;
-out:
-	free(odd);
-	free(even);
-	return statelist;
-}
+/*  crapto1.c
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License
+    as published by the Free Software Foundation; either version 2
+    of the License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA  02110-1301, US$
+
+    Copyright (C) 2008-2014 bla <blapost@gmail.com>
+*/
+#include "crapto1.h"
+#include <stdlib.h>
+
+#if !defined LOWMEM && defined __GNUC__
+static uint8_t filterlut[1 << 20];
+static void __attribute__((constructor)) fill_lut()
+{
+        uint32_t i;
+        for(i = 0; i < 1 << 20; ++i)
+                filterlut[i] = filter(i);
+}
+#define filter(x) (filterlut[(x) & 0xfffff])
+#endif
+
+
+
+typedef struct bucket {
+	uint32_t *head;
+	uint32_t *bp;
+} bucket_t;
+
+typedef bucket_t bucket_array_t[2][0x100];
+
+typedef struct bucket_info {
+	struct {
+		uint32_t *head, *tail;
+		} bucket_info[2][0x100];
+		uint32_t numbuckets;
+	} bucket_info_t;
+
+
+static void bucket_sort_intersect(uint32_t* const estart, uint32_t* const estop,
+								  uint32_t* const ostart, uint32_t* const ostop,
+								  bucket_info_t *bucket_info, bucket_array_t bucket)
+{
+	uint32_t *p1, *p2;
+	uint32_t *start[2];
+	uint32_t *stop[2];
+
+	start[0] = estart;
+	stop[0] = estop;
+	start[1] = ostart;
+	stop[1] = ostop;
+
+	// init buckets to be empty
+	for (uint32_t i = 0; i < 2; i++) {
+		for (uint32_t j = 0x00; j <= 0xff; j++) {
+			bucket[i][j].bp = bucket[i][j].head;
+		}
+	}
+
+	// sort the lists into the buckets based on the MSB (contribution bits)
+	for (uint32_t i = 0; i < 2; i++) {
+		for (p1 = start[i]; p1 <= stop[i]; p1++) {
+			uint32_t bucket_index = (*p1 & 0xff000000) >> 24;
+			*(bucket[i][bucket_index].bp++) = *p1;
+		}
+	}
+
+
+	// write back intersecting buckets as sorted list.
+	// fill in bucket_info with head and tail of the bucket contents in the list and number of non-empty buckets.
+	uint32_t nonempty_bucket;
+	for (uint32_t i = 0; i < 2; i++) {
+		p1 = start[i];
+		nonempty_bucket = 0;
+		for (uint32_t j = 0x00; j <= 0xff; j++) {
+			if (bucket[0][j].bp != bucket[0][j].head && bucket[1][j].bp != bucket[1][j].head) { // non-empty intersecting buckets only
+				bucket_info->bucket_info[i][nonempty_bucket].head = p1;
+				for (p2 = bucket[i][j].head; p2 < bucket[i][j].bp; *p1++ = *p2++);
+				bucket_info->bucket_info[i][nonempty_bucket].tail = p1 - 1;
+				nonempty_bucket++;
+			}
+		}
+		bucket_info->numbuckets = nonempty_bucket;
+		}
+}
+
+
+/** update_contribution
+ * helper, calculates the partial linear feedback contributions and puts in MSB
+ */
+static inline void update_contribution(uint32_t *item, const uint32_t mask1, const uint32_t mask2)
+{
+	uint32_t p = *item >> 25;
+
+	p = p << 1 | parity(*item & mask1);
+	p = p << 1 | parity(*item & mask2);
+	*item = p << 24 | (*item & 0xffffff);
+}
+
+/** extend_table
+ * using a bit of the keystream extend the table of possible lfsr states
+ */
+static inline void extend_table(uint32_t *tbl, uint32_t **end, int bit, int m1, int m2, uint32_t in)
+{
+	in <<= 24;
+	for(*tbl <<= 1; tbl <= *end; *++tbl <<= 1)
+		if(filter(*tbl) ^ filter(*tbl | 1)) {
+			*tbl |= filter(*tbl) ^ bit;
+			update_contribution(tbl, m1, m2);
+			*tbl ^= in;
+		} else if(filter(*tbl) == bit) {
+			*++*end = tbl[1];
+			tbl[1] = tbl[0] | 1;
+			update_contribution(tbl, m1, m2);
+			*tbl++ ^= in;
+			update_contribution(tbl, m1, m2);
+			*tbl ^= in;
+		} else
+			*tbl-- = *(*end)--;
+}
+/** extend_table_simple
+ * using a bit of the keystream extend the table of possible lfsr states
+ */
+static inline void extend_table_simple(uint32_t *tbl, uint32_t **end, int bit)
+{
+	for(*tbl <<= 1; tbl <= *end; *++tbl <<= 1) {
+		if(filter(*tbl) ^ filter(*tbl | 1)) {	// replace
+			*tbl |= filter(*tbl) ^ bit;
+		} else if(filter(*tbl) == bit) {		// insert
+			*++*end = *++tbl;
+			*tbl = tbl[-1] | 1;
+		} else	{								// drop
+			*tbl-- = *(*end)--;
+		}
+	}
+}
+/** recover
+ * recursively narrow down the search space, 4 bits of keystream at a time
+ */
+static struct Crypto1State*
+recover(uint32_t *o_head, uint32_t *o_tail, uint32_t oks,
+	uint32_t *e_head, uint32_t *e_tail, uint32_t eks, int rem,
+	struct Crypto1State *sl, uint32_t in, bucket_array_t bucket)
+{
+	uint32_t *o, *e;
+	bucket_info_t bucket_info;
+
+	if(rem == -1) {
+		for(e = e_head; e <= e_tail; ++e) {
+			*e = *e << 1 ^ parity(*e & LF_POLY_EVEN) ^ !!(in & 4);
+			for(o = o_head; o <= o_tail; ++o, ++sl) {
+				sl->even = *o;
+				sl->odd = *e ^ parity(*o & LF_POLY_ODD);
+				sl[1].odd = sl[1].even = 0;
+			}
+		}
+		return sl;
+	}
+
+	for(uint32_t i = 0; i < 4 && rem--; i++) {
+		oks >>= 1;
+		eks >>= 1;
+		in >>= 2;
+		extend_table(o_head, &o_tail, oks & 1, LF_POLY_EVEN << 1 | 1, LF_POLY_ODD << 1, 0);
+		if(o_head > o_tail)
+			return sl;
+
+		extend_table(e_head, &e_tail, eks & 1, LF_POLY_ODD, LF_POLY_EVEN << 1 | 1, in & 3);
+		if(e_head > e_tail)
+			return sl;
+	}
+
+	bucket_sort_intersect(e_head, e_tail, o_head, o_tail, &bucket_info, bucket);
+
+	for (int i = bucket_info.numbuckets - 1; i >= 0; i--) {
+		sl = recover(bucket_info.bucket_info[1][i].head, bucket_info.bucket_info[1][i].tail, oks,
+					 bucket_info.bucket_info[0][i].head, bucket_info.bucket_info[0][i].tail, eks,
+					 rem, sl, in, bucket);
+		}
+
+	return sl;
+}
+/** lfsr_recovery
+ * recover the state of the lfsr given 32 bits of the keystream
+ * additionally you can use the in parameter to specify the value
+ * that was fed into the lfsr at the time the keystream was generated
+ */
+struct Crypto1State* lfsr_recovery32(uint32_t ks2, uint32_t in)
+{
+	struct Crypto1State *statelist;
+	uint32_t *odd_head = 0, *odd_tail = 0, oks = 0;
+	uint32_t *even_head = 0, *even_tail = 0, eks = 0;
+	int i;
+
+	// split the keystream into an odd and even part
+	for(i = 31; i >= 0; i -= 2)
+		oks = oks << 1 | BEBIT(ks2, i);
+	for(i = 30; i >= 0; i -= 2)
+		eks = eks << 1 | BEBIT(ks2, i);
+
+	odd_head = odd_tail = malloc(sizeof(uint32_t) << 21);
+	even_head = even_tail = malloc(sizeof(uint32_t) << 21);
+	statelist =  malloc(sizeof(struct Crypto1State) << 18);
+	if(!odd_tail-- || !even_tail-- || !statelist) {
+		free(statelist);
+		statelist = 0;
+		goto out;
+	}
+
+	statelist->odd = statelist->even = 0;
+
+	// allocate memory for out of place bucket_sort
+	bucket_array_t bucket;
+	
+	for (uint32_t i = 0; i < 2; i++) {
+		for (uint32_t j = 0; j <= 0xff; j++) {
+			bucket[i][j].head = malloc(sizeof(uint32_t)<<14);
+			if (!bucket[i][j].head) {
+				goto out;
+			}
+		}
+	}
+
+	// initialize statelists: add all possible states which would result into the rightmost 2 bits of the keystream
+	for(i = 1 << 20; i >= 0; --i) {
+		if(filter(i) == (oks & 1))
+			*++odd_tail = i;
+		if(filter(i) == (eks & 1))
+			*++even_tail = i;
+	}
+
+	// extend the statelists. Look at the next 8 Bits of the keystream (4 Bit each odd and even):
+	for(i = 0; i < 4; i++) {
+		extend_table_simple(odd_head,  &odd_tail, (oks >>= 1) & 1);
+		extend_table_simple(even_head, &even_tail, (eks >>= 1) & 1);
+	}
+
+	// the statelists now contain all states which could have generated the last 10 Bits of the keystream.
+	// 22 bits to go to recover 32 bits in total. From now on, we need to take the "in"
+	// parameter into account.
+	in = (in >> 16 & 0xff) | (in << 16) | (in & 0xff00);		// Byte swapping
+	recover(odd_head, odd_tail, oks, even_head, even_tail, eks, 11, statelist, in << 1, bucket);
+
+out:
+	for (uint32_t i = 0; i < 2; i++)
+		for (uint32_t j = 0; j <= 0xff; j++)
+			free(bucket[i][j].head);
+	free(odd_head);
+	free(even_head);
+	return statelist;
+}
+
+static const uint32_t S1[] = {     0x62141, 0x310A0, 0x18850, 0x0C428, 0x06214,
+	0x0310A, 0x85E30, 0xC69AD, 0x634D6, 0xB5CDE, 0xDE8DA, 0x6F46D, 0xB3C83,
+	0x59E41, 0xA8995, 0xD027F, 0x6813F, 0x3409F, 0x9E6FA};
+static const uint32_t S2[] = {  0x3A557B00, 0x5D2ABD80, 0x2E955EC0, 0x174AAF60,
+	0x0BA557B0, 0x05D2ABD8, 0x0449DE68, 0x048464B0, 0x42423258, 0x278192A8,
+	0x156042D0, 0x0AB02168, 0x43F89B30, 0x61FC4D98, 0x765EAD48, 0x7D8FDD20,
+	0x7EC7EE90, 0x7F63F748, 0x79117020};
+static const uint32_t T1[] = {
+	0x4F37D, 0x279BE, 0x97A6A, 0x4BD35, 0x25E9A, 0x12F4D, 0x097A6, 0x80D66,
+	0xC4006, 0x62003, 0xB56B4, 0x5AB5A, 0xA9318, 0xD0F39, 0x6879C, 0xB057B,
+	0x582BD, 0x2C15E, 0x160AF, 0x8F6E2, 0xC3DC4, 0xE5857, 0x72C2B, 0x39615,
+	0x98DBF, 0xC806A, 0xE0680, 0x70340, 0x381A0, 0x98665, 0x4C332, 0xA272C};
+static const uint32_t T2[] = {  0x3C88B810, 0x5E445C08, 0x2982A580, 0x14C152C0,
+	0x4A60A960, 0x253054B0, 0x52982A58, 0x2FEC9EA8, 0x1156C4D0, 0x08AB6268,
+	0x42F53AB0, 0x217A9D58, 0x161DC528, 0x0DAE6910, 0x46D73488, 0x25CB11C0,
+	0x52E588E0, 0x6972C470, 0x34B96238, 0x5CFC3A98, 0x28DE96C8, 0x12CFC0E0,
+	0x4967E070, 0x64B3F038, 0x74F97398, 0x7CDC3248, 0x38CE92A0, 0x1C674950,
+	0x0E33A4A8, 0x01B959D0, 0x40DCACE8, 0x26CEDDF0};
+static const uint32_t C1[] = { 0x846B5, 0x4235A, 0x211AD};
+static const uint32_t C2[] = { 0x1A822E0, 0x21A822E0, 0x21A822E0};
+/** Reverse 64 bits of keystream into possible cipher states
+ * Variation mentioned in the paper. Somewhat optimized version
+ */
+struct Crypto1State* lfsr_recovery64(uint32_t ks2, uint32_t ks3)
+{
+	struct Crypto1State *statelist, *sl;
+	uint8_t oks[32], eks[32], hi[32];
+	uint32_t low = 0,  win = 0;
+	uint32_t *tail, table[1 << 16];
+	int i, j;
+
+	sl = statelist = malloc(sizeof(struct Crypto1State) << 4);
+	if(!sl)
+		return 0;
+	sl->odd = sl->even = 0;
+
+	for(i = 30; i >= 0; i -= 2) {
+		oks[i >> 1] = BEBIT(ks2, i);
+		oks[16 + (i >> 1)] = BEBIT(ks3, i);
+	}
+	for(i = 31; i >= 0; i -= 2) {
+		eks[i >> 1] = BEBIT(ks2, i);
+		eks[16 + (i >> 1)] = BEBIT(ks3, i);
+	}
+
+	for(i = 0xfffff; i >= 0; --i) {
+		if (filter(i) != oks[0])
+			continue;
+
+		*(tail = table) = i;
+		for(j = 1; tail >= table && j < 29; ++j)
+			extend_table_simple(table, &tail, oks[j]);
+
+		if(tail < table)
+			continue;
+
+		for(j = 0; j < 19; ++j)
+			low = low << 1 | parity(i & S1[j]);
+		for(j = 0; j < 32; ++j)
+			hi[j] = parity(i & T1[j]);
+
+		for(; tail >= table; --tail) {
+			for(j = 0; j < 3; ++j) {
+				*tail = *tail << 1;
+				*tail |= parity((i & C1[j]) ^ (*tail & C2[j]));
+				if(filter(*tail) != oks[29 + j])
+					goto continue2;
+			}
+
+			for(j = 0; j < 19; ++j)
+				win = win << 1 | parity(*tail & S2[j]);
+
+			win ^= low;
+			for(j = 0; j < 32; ++j) {
+				win = win << 1 ^ hi[j] ^ parity(*tail & T2[j]);
+				if(filter(win) != eks[j])
+					goto continue2;
+			}
+
+			*tail = *tail << 1 | parity(LF_POLY_EVEN & *tail);
+			sl->odd = *tail ^ parity(LF_POLY_ODD & win);
+			sl->even = win;
+			++sl;
+			sl->odd = sl->even = 0;
+			continue2:;
+		}
+	}
+	return statelist;
+}
+
+/** lfsr_rollback_bit
+ * Rollback the shift register in order to get previous states
+ */
+uint8_t lfsr_rollback_bit(struct Crypto1State *s, uint32_t in, int fb)
+{
+	int out;
+	uint8_t ret;
+	uint32_t t;
+
+	s->odd &= 0xffffff;
+	t = s->odd, s->odd = s->even, s->even = t;
+
+	out = s->even & 1;
+	out ^= LF_POLY_EVEN & (s->even >>= 1);
+	out ^= LF_POLY_ODD & s->odd;
+	out ^= !!in;
+	out ^= (ret = filter(s->odd)) & !!fb;
+
+	s->even |= parity(out) << 23;
+	return ret;
+}
+/** lfsr_rollback_byte
+ * Rollback the shift register in order to get previous states
+ */
+uint8_t lfsr_rollback_byte(struct Crypto1State *s, uint32_t in, int fb)
+{
+	/*
+	int i, ret = 0;
+	for (i = 7; i >= 0; --i)
+		ret |= lfsr_rollback_bit(s, BIT(in, i), fb) << i;
+*/
+// unfold loop 20160112
+	uint8_t ret = 0;
+	ret |= lfsr_rollback_bit(s, BIT(in, 7), fb) << 7;
+	ret |= lfsr_rollback_bit(s, BIT(in, 6), fb) << 6;
+	ret |= lfsr_rollback_bit(s, BIT(in, 5), fb) << 5;
+	ret |= lfsr_rollback_bit(s, BIT(in, 4), fb) << 4;
+	ret |= lfsr_rollback_bit(s, BIT(in, 3), fb) << 3;
+	ret |= lfsr_rollback_bit(s, BIT(in, 2), fb) << 2;
+	ret |= lfsr_rollback_bit(s, BIT(in, 1), fb) << 1;
+	ret |= lfsr_rollback_bit(s, BIT(in, 0), fb) << 0;
+	return ret;
+}
+/** lfsr_rollback_word
+ * Rollback the shift register in order to get previous states
+ */
+uint32_t lfsr_rollback_word(struct Crypto1State *s, uint32_t in, int fb)
+{
+	/*
+	int i;
+	uint32_t ret = 0;
+	for (i = 31; i >= 0; --i)
+		ret |= lfsr_rollback_bit(s, BEBIT(in, i), fb) << (i ^ 24);
+*/
+// unfold loop 20160112
+	uint32_t ret = 0;
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 31), fb) << (31 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 30), fb) << (30 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 29), fb) << (29 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 28), fb) << (28 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 27), fb) << (27 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 26), fb) << (26 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 25), fb) << (25 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 24), fb) << (24 ^ 24);
+
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 23), fb) << (23 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 22), fb) << (22 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 21), fb) << (21 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 20), fb) << (20 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 19), fb) << (19 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 18), fb) << (18 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 17), fb) << (17 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 16), fb) << (16 ^ 24);
+	
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 15), fb) << (15 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 14), fb) << (14 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 13), fb) << (13 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 12), fb) << (12 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 11), fb) << (11 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 10), fb) << (10 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 9), fb) << (9 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 8), fb) << (8 ^ 24);
+	
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 7), fb) << (7 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 6), fb) << (6 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 5), fb) << (5 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 4), fb) << (4 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 3), fb) << (3 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 2), fb) << (2 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 1), fb) << (1 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 0), fb) << (0 ^ 24);
+	return ret;
+}
+
+/** nonce_distance
+ * x,y valid tag nonces, then prng_successor(x, nonce_distance(x, y)) = y
+ */
+static uint16_t *dist = 0;
+int nonce_distance(uint32_t from, uint32_t to)
+{
+	uint16_t x, i;
+	if(!dist) {
+		dist = malloc(2 << 16);
+		if(!dist)
+			return -1;
+		for (x = i = 1; i; ++i) {
+			dist[(x & 0xff) << 8 | x >> 8] = i;
+			x = x >> 1 | (x ^ x >> 2 ^ x >> 3 ^ x >> 5) << 15;
+		}
+	}
+	return (65535 + dist[to >> 16] - dist[from >> 16]) % 65535;
+}
+
+
+static uint32_t fastfwd[2][8] = {
+	{ 0, 0x4BC53, 0xECB1, 0x450E2, 0x25E29, 0x6E27A, 0x2B298, 0x60ECB},
+	{ 0, 0x1D962, 0x4BC53, 0x56531, 0xECB1, 0x135D3, 0x450E2, 0x58980}};
+
+
+/** lfsr_prefix_ks
+ *
+ * Is an exported helper function from the common prefix attack
+ * Described in the "dark side" paper. It returns an -1 terminated array
+ * of possible partial(21 bit) secret state.
+ * The required keystream(ks) needs to contain the keystream that was used to
+ * encrypt the NACK which is observed when varying only the 3 last bits of Nr
+ * only correct iff [NR_3] ^ NR_3 does not depend on Nr_3
+ */
+uint32_t *lfsr_prefix_ks(uint8_t ks[8], int isodd)
+{
+	uint32_t *candidates = malloc(4 << 10);
+	if(!candidates) return 0;
+	
+	uint32_t c,  entry;
+	int size = 0, i, good;
+
+	for(i = 0; i < 1 << 21; ++i) {
+		for(c = 0, good = 1; good && c < 8; ++c) {
+			entry = i ^ fastfwd[isodd][c];
+			good &= (BIT(ks[c], isodd) == filter(entry >> 1));
+			good &= (BIT(ks[c], isodd + 2) == filter(entry));
+		}
+		if(good)
+			candidates[size++] = i;
+	}
+
+	candidates[size] = -1;
+
+	return candidates;
+}
+
+/** check_pfx_parity
+ * helper function which eliminates possible secret states using parity bits
+ */
+static struct Crypto1State* check_pfx_parity(uint32_t prefix, uint32_t rresp, uint8_t parities[8][8], uint32_t odd, uint32_t even, struct Crypto1State* sl)
+{
+	uint32_t ks1, nr, ks2, rr, ks3, c, good = 1;
+
+	for(c = 0; good && c < 8; ++c) {
+		sl->odd = odd ^ fastfwd[1][c];
+		sl->even = even ^ fastfwd[0][c];
+
+		lfsr_rollback_bit(sl, 0, 0);
+		lfsr_rollback_bit(sl, 0, 0);
+
+		ks3 = lfsr_rollback_bit(sl, 0, 0);
+		ks2 = lfsr_rollback_word(sl, 0, 0);
+		ks1 = lfsr_rollback_word(sl, prefix | c << 5, 1);
+
+		nr = ks1 ^ (prefix | c << 5);
+		rr = ks2 ^ rresp;
+
+		good &= parity(nr & 0x000000ff) ^ parities[c][3] ^ BIT(ks2, 24);
+		good &= parity(rr & 0xff000000) ^ parities[c][4] ^ BIT(ks2, 16);
+		good &= parity(rr & 0x00ff0000) ^ parities[c][5] ^ BIT(ks2,  8);
+		good &= parity(rr & 0x0000ff00) ^ parities[c][6] ^ BIT(ks2,  0);
+		good &= parity(rr & 0x000000ff) ^ parities[c][7] ^ ks3;
+	}
+
+	return sl + good;
+} 
+
+/** lfsr_common_prefix
+ * Implentation of the common prefix attack.
+ * Requires the 28 bit constant prefix used as reader nonce (pfx)
+ * The reader response used (rr)
+ * The keystream used to encrypt the observed NACK's (ks)
+ * The parity bits (par)
+ * It returns a zero terminated list of possible cipher states after the
+ * tag nonce was fed in
+ */
+
+struct Crypto1State* lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8])
+{
+	struct Crypto1State *statelist, *s;
+	uint32_t *odd, *even, *o, *e, top;
+
+	odd = lfsr_prefix_ks(ks, 1);
+	even = lfsr_prefix_ks(ks, 0);
+
+	s = statelist = malloc((sizeof *statelist) << 24);
+	if(!s || !odd || !even) {
+		free(statelist);
+		statelist = 0;
+                goto out;
+	}
+
+	for(o = odd; *o + 1; ++o)
+		for(e = even; *e + 1; ++e)
+			for(top = 0; top < 64; ++top) {
+				*o += 1 << 21;
+				*e += (!(top & 7) + 1) << 21;
+				s = check_pfx_parity(pfx, rr, par, *o, *e, s);
+			}
+
+	s->odd = s->even = 0;
+out:
+	free(odd);
+	free(even);
+	return statelist;
+}
diff --git a/tools/nonce2key/crapto1.c b/tools/nonce2key/crapto1.c
index 1d854d96b..fcfa931c4 100644
--- a/tools/nonce2key/crapto1.c
+++ b/tools/nonce2key/crapto1.c
@@ -1,573 +1,573 @@
-/*  crapto1.c
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation; either version 2
-    of the License, or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA  02110-1301, US$
-
-    Copyright (C) 2008-2014 bla <blapost@gmail.com>
-*/
-#include "crapto1.h"
-#include <stdlib.h>
-
-#if !defined LOWMEM && defined __GNUC__
-static uint8_t filterlut[1 << 20];
-static void __attribute__((constructor)) fill_lut()
-{
-        uint32_t i;
-        for(i = 0; i < 1 << 20; ++i)
-                filterlut[i] = filter(i);
-}
-#define filter(x) (filterlut[(x) & 0xfffff])
-#endif
-
-
-
-typedef struct bucket {
-	uint32_t *head;
-	uint32_t *bp;
-} bucket_t;
-
-typedef bucket_t bucket_array_t[2][0x100];
-
-typedef struct bucket_info {
-	struct {
-		uint32_t *head, *tail;
-		} bucket_info[2][0x100];
-		uint32_t numbuckets;
-	} bucket_info_t;
-
-
-static void bucket_sort_intersect(uint32_t* const estart, uint32_t* const estop,
-								  uint32_t* const ostart, uint32_t* const ostop,
-								  bucket_info_t *bucket_info, bucket_array_t bucket)
-{
-	uint32_t *p1, *p2;
-	uint32_t *start[2];
-	uint32_t *stop[2];
-
-	start[0] = estart;
-	stop[0] = estop;
-	start[1] = ostart;
-	stop[1] = ostop;
-
-	// init buckets to be empty
-	for (uint32_t i = 0; i < 2; i++) {
-		for (uint32_t j = 0x00; j <= 0xff; j++) {
-			bucket[i][j].bp = bucket[i][j].head;
-		}
-	}
-
-	// sort the lists into the buckets based on the MSB (contribution bits)
-	for (uint32_t i = 0; i < 2; i++) {
-		for (p1 = start[i]; p1 <= stop[i]; p1++) {
-			uint32_t bucket_index = (*p1 & 0xff000000) >> 24;
-			*(bucket[i][bucket_index].bp++) = *p1;
-		}
-	}
-
-
-	// write back intersecting buckets as sorted list.
-	// fill in bucket_info with head and tail of the bucket contents in the list and number of non-empty buckets.
-	uint32_t nonempty_bucket;
-	for (uint32_t i = 0; i < 2; i++) {
-		p1 = start[i];
-		nonempty_bucket = 0;
-		for (uint32_t j = 0x00; j <= 0xff; j++) {
-			if (bucket[0][j].bp != bucket[0][j].head && bucket[1][j].bp != bucket[1][j].head) { // non-empty intersecting buckets only
-				bucket_info->bucket_info[i][nonempty_bucket].head = p1;
-				for (p2 = bucket[i][j].head; p2 < bucket[i][j].bp; *p1++ = *p2++);
-				bucket_info->bucket_info[i][nonempty_bucket].tail = p1 - 1;
-				nonempty_bucket++;
-			}
-		}
-		bucket_info->numbuckets = nonempty_bucket;
-		}
-}
-
-/** update_contribution
- * helper, calculates the partial linear feedback contributions and puts in MSB
- */
-static inline void update_contribution(uint32_t *item, const uint32_t mask1, const uint32_t mask2)
-{
-	uint32_t p = *item >> 25;
-
-	p = p << 1 | parity(*item & mask1);
-	p = p << 1 | parity(*item & mask2);
-	*item = p << 24 | (*item & 0xffffff);
-}
-
-/** extend_table
- * using a bit of the keystream extend the table of possible lfsr states
- */
-static inline void extend_table(uint32_t *tbl, uint32_t **end, int bit, int m1, int m2, uint32_t in)
-{
-	in <<= 24;
-	for(*tbl <<= 1; tbl <= *end; *++tbl <<= 1)
-		if(filter(*tbl) ^ filter(*tbl | 1)) {
-			*tbl |= filter(*tbl) ^ bit;
-			update_contribution(tbl, m1, m2);
-			*tbl ^= in;
-		} else if(filter(*tbl) == bit) {
-			*++*end = tbl[1];
-			tbl[1] = tbl[0] | 1;
-			update_contribution(tbl, m1, m2);
-			*tbl++ ^= in;
-			update_contribution(tbl, m1, m2);
-			*tbl ^= in;
-		} else
-			*tbl-- = *(*end)--;
-}
-/** extend_table_simple
- * using a bit of the keystream extend the table of possible lfsr states
- */
-static inline void extend_table_simple(uint32_t *tbl, uint32_t **end, int bit)
-{
-	for(*tbl <<= 1; tbl <= *end; *++tbl <<= 1) {
-		if(filter(*tbl) ^ filter(*tbl | 1)) {	// replace
-			*tbl |= filter(*tbl) ^ bit;
-		} else if(filter(*tbl) == bit) {		// insert
-			*++*end = *++tbl;
-			*tbl = tbl[-1] | 1;
-		} else	{								// drop
-			*tbl-- = *(*end)--;
-		}
-	}
-}
-/** recover
- * recursively narrow down the search space, 4 bits of keystream at a time
- */
-static struct Crypto1State*
-recover(uint32_t *o_head, uint32_t *o_tail, uint32_t oks,
-	uint32_t *e_head, uint32_t *e_tail, uint32_t eks, int rem,
-	struct Crypto1State *sl, uint32_t in, bucket_array_t bucket)
-{
-	uint32_t *o, *e;
-	bucket_info_t bucket_info;
-
-	if(rem == -1) {
-		for(e = e_head; e <= e_tail; ++e) {
-			*e = *e << 1 ^ parity(*e & LF_POLY_EVEN) ^ !!(in & 4);
-			for(o = o_head; o <= o_tail; ++o, ++sl) {
-				sl->even = *o;
-				sl->odd = *e ^ parity(*o & LF_POLY_ODD);
-				sl[1].odd = sl[1].even = 0;
-			}
-		}
-		return sl;
-	}
-
-	for(uint32_t i = 0; i < 4 && rem--; i++) {
-		oks >>= 1;
-		eks >>= 1;
-		in >>= 2;
-		extend_table(o_head, &o_tail, oks & 1, LF_POLY_EVEN << 1 | 1, LF_POLY_ODD << 1, 0);
-		if(o_head > o_tail)
-			return sl;
-
-		extend_table(e_head, &e_tail, eks & 1, LF_POLY_ODD, LF_POLY_EVEN << 1 | 1, in & 3);
-		if(e_head > e_tail)
-			return sl;
-	}
-
-	bucket_sort_intersect(e_head, e_tail, o_head, o_tail, &bucket_info, bucket);
-
-	for (int i = bucket_info.numbuckets - 1; i >= 0; i--) {
-		sl = recover(bucket_info.bucket_info[1][i].head, bucket_info.bucket_info[1][i].tail, oks,
-					 bucket_info.bucket_info[0][i].head, bucket_info.bucket_info[0][i].tail, eks,
-					 rem, sl, in, bucket);
-		}
-
-	return sl;
-}
-/** lfsr_recovery
- * recover the state of the lfsr given 32 bits of the keystream
- * additionally you can use the in parameter to specify the value
- * that was fed into the lfsr at the time the keystream was generated
- */
-struct Crypto1State* lfsr_recovery32(uint32_t ks2, uint32_t in)
-{
-	struct Crypto1State *statelist;
-	uint32_t *odd_head = 0, *odd_tail = 0, oks = 0;
-	uint32_t *even_head = 0, *even_tail = 0, eks = 0;
-	int i;
-
-	// split the keystream into an odd and even part
-	for(i = 31; i >= 0; i -= 2)
-		oks = oks << 1 | BEBIT(ks2, i);
-	for(i = 30; i >= 0; i -= 2)
- 		eks = eks << 1 | BEBIT(ks2, i);
-
-	odd_head = odd_tail = malloc(sizeof(uint32_t) << 21);
-	even_head = even_tail = malloc(sizeof(uint32_t) << 21);
-	statelist =  malloc(sizeof(struct Crypto1State) << 18);
-	if(!odd_tail-- || !even_tail-- || !statelist) {
-		free(statelist);
-		statelist = 0;
-		goto out;
-	}
-
-	statelist->odd = statelist->even = 0;
-
-	// allocate memory for out of place bucket_sort
-	bucket_array_t bucket;
-	
-	for (uint32_t i = 0; i < 2; i++) {
-		for (uint32_t j = 0; j <= 0xff; j++) {
-			bucket[i][j].head = malloc(sizeof(uint32_t)<<14);
-			if (!bucket[i][j].head) {
-				goto out;
-			}
-		}
-	}
-
-	// initialize statelists: add all possible states which would result into the rightmost 2 bits of the keystream
-	for(i = 1 << 20; i >= 0; --i) {
-		if(filter(i) == (oks & 1))
-			*++odd_tail = i;
-		if(filter(i) == (eks & 1))
-			*++even_tail = i;
-	}
-
-	// extend the statelists. Look at the next 8 Bits of the keystream (4 Bit each odd and even):
-	for(i = 0; i < 4; i++) {
-		extend_table_simple(odd_head,  &odd_tail, (oks >>= 1) & 1);
-		extend_table_simple(even_head, &even_tail, (eks >>= 1) & 1);
-	}
-
-	// the statelists now contain all states which could have generated the last 10 Bits of the keystream.
-	// 22 bits to go to recover 32 bits in total. From now on, we need to take the "in"
-	// parameter into account.
-	in = (in >> 16 & 0xff) | (in << 16) | (in & 0xff00);		// Byte swapping
-	recover(odd_head, odd_tail, oks, even_head, even_tail, eks, 11, statelist, in << 1, bucket);
-
-out:
-	for (uint32_t i = 0; i < 2; i++)
-		for (uint32_t j = 0; j <= 0xff; j++)
-			free(bucket[i][j].head);
-	free(odd_head);
-	free(even_head);
-	return statelist;
-}
-
-static const uint32_t S1[] = {     0x62141, 0x310A0, 0x18850, 0x0C428, 0x06214,
-	0x0310A, 0x85E30, 0xC69AD, 0x634D6, 0xB5CDE, 0xDE8DA, 0x6F46D, 0xB3C83,
-	0x59E41, 0xA8995, 0xD027F, 0x6813F, 0x3409F, 0x9E6FA};
-static const uint32_t S2[] = {  0x3A557B00, 0x5D2ABD80, 0x2E955EC0, 0x174AAF60,
-	0x0BA557B0, 0x05D2ABD8, 0x0449DE68, 0x048464B0, 0x42423258, 0x278192A8,
-	0x156042D0, 0x0AB02168, 0x43F89B30, 0x61FC4D98, 0x765EAD48, 0x7D8FDD20,
-	0x7EC7EE90, 0x7F63F748, 0x79117020};
-static const uint32_t T1[] = {
-	0x4F37D, 0x279BE, 0x97A6A, 0x4BD35, 0x25E9A, 0x12F4D, 0x097A6, 0x80D66,
-	0xC4006, 0x62003, 0xB56B4, 0x5AB5A, 0xA9318, 0xD0F39, 0x6879C, 0xB057B,
-	0x582BD, 0x2C15E, 0x160AF, 0x8F6E2, 0xC3DC4, 0xE5857, 0x72C2B, 0x39615,
-	0x98DBF, 0xC806A, 0xE0680, 0x70340, 0x381A0, 0x98665, 0x4C332, 0xA272C};
-static const uint32_t T2[] = {  0x3C88B810, 0x5E445C08, 0x2982A580, 0x14C152C0,
-	0x4A60A960, 0x253054B0, 0x52982A58, 0x2FEC9EA8, 0x1156C4D0, 0x08AB6268,
-	0x42F53AB0, 0x217A9D58, 0x161DC528, 0x0DAE6910, 0x46D73488, 0x25CB11C0,
-	0x52E588E0, 0x6972C470, 0x34B96238, 0x5CFC3A98, 0x28DE96C8, 0x12CFC0E0,
-	0x4967E070, 0x64B3F038, 0x74F97398, 0x7CDC3248, 0x38CE92A0, 0x1C674950,
-	0x0E33A4A8, 0x01B959D0, 0x40DCACE8, 0x26CEDDF0};
-static const uint32_t C1[] = { 0x846B5, 0x4235A, 0x211AD};
-static const uint32_t C2[] = { 0x1A822E0, 0x21A822E0, 0x21A822E0};
-/** Reverse 64 bits of keystream into possible cipher states
- * Variation mentioned in the paper. Somewhat optimized version
- */
-struct Crypto1State* lfsr_recovery64(uint32_t ks2, uint32_t ks3)
-{
-	struct Crypto1State *statelist, *sl;
-	uint8_t oks[32], eks[32], hi[32];
-	uint32_t low = 0,  win = 0;
-	uint32_t *tail, table[1 << 16];
-	int i, j;
-
-	sl = statelist = malloc(sizeof(struct Crypto1State) << 4);
-	if(!sl)
-		return 0;
-	sl->odd = sl->even = 0;
-
-	for(i = 30; i >= 0; i -= 2) {
-		oks[i >> 1] = BEBIT(ks2, i);
-		oks[16 + (i >> 1)] = BEBIT(ks3, i);
-	}
-	for(i = 31; i >= 0; i -= 2) {
-		eks[i >> 1] = BEBIT(ks2, i);
-		eks[16 + (i >> 1)] = BEBIT(ks3, i);
-	}
-
-	for(i = 0xfffff; i >= 0; --i) {
-		if (filter(i) != oks[0])
-			continue;
-
-		*(tail = table) = i;
-		for(j = 1; tail >= table && j < 29; ++j)
-			extend_table_simple(table, &tail, oks[j]);
-
-		if(tail < table)
-			continue;
-
-		for(j = 0; j < 19; ++j)
-			low = low << 1 | parity(i & S1[j]);
-		for(j = 0; j < 32; ++j)
-			hi[j] = parity(i & T1[j]);
-
-		for(; tail >= table; --tail) {
-			for(j = 0; j < 3; ++j) {
-				*tail = *tail << 1;
-				*tail |= parity((i & C1[j]) ^ (*tail & C2[j]));
-				if(filter(*tail) != oks[29 + j])
-					goto continue2;
-			}
-
-			for(j = 0; j < 19; ++j)
-				win = win << 1 | parity(*tail & S2[j]);
-
-			win ^= low;
-			for(j = 0; j < 32; ++j) {
-				win = win << 1 ^ hi[j] ^ parity(*tail & T2[j]);
-				if(filter(win) != eks[j])
-					goto continue2;
-			}
-
-			*tail = *tail << 1 | parity(LF_POLY_EVEN & *tail);
-			sl->odd = *tail ^ parity(LF_POLY_ODD & win);
-			sl->even = win;
-			++sl;
-			sl->odd = sl->even = 0;
-			continue2:;
-		}
-	}
-	return statelist;
-}
-
-/** lfsr_rollback_bit
- * Rollback the shift register in order to get previous states
- */
-uint8_t lfsr_rollback_bit(struct Crypto1State *s, uint32_t in, int fb)
-{
-	int out;
-	uint8_t ret;
-	uint32_t t;
-
-	s->odd &= 0xffffff;
-	t = s->odd, s->odd = s->even, s->even = t;
-
-	out = s->even & 1;
-	out ^= LF_POLY_EVEN & (s->even >>= 1);
-	out ^= LF_POLY_ODD & s->odd;
-	out ^= !!in;
-	out ^= (ret = filter(s->odd)) & !!fb;
-
-	s->even |= parity(out) << 23;
-	return ret;
-}
-/** lfsr_rollback_byte
- * Rollback the shift register in order to get previous states
- */
-uint8_t lfsr_rollback_byte(struct Crypto1State *s, uint32_t in, int fb)
-{
-	/*
-	int i, ret = 0;
-	for (i = 7; i >= 0; --i)
-		ret |= lfsr_rollback_bit(s, BIT(in, i), fb) << i;
-*/
-// unfold loop 20160112
-	uint8_t ret = 0;
-	ret |= lfsr_rollback_bit(s, BIT(in, 7), fb) << 7;
-	ret |= lfsr_rollback_bit(s, BIT(in, 6), fb) << 6;
-	ret |= lfsr_rollback_bit(s, BIT(in, 5), fb) << 5;
-	ret |= lfsr_rollback_bit(s, BIT(in, 4), fb) << 4;
-	ret |= lfsr_rollback_bit(s, BIT(in, 3), fb) << 3;
-	ret |= lfsr_rollback_bit(s, BIT(in, 2), fb) << 2;
-	ret |= lfsr_rollback_bit(s, BIT(in, 1), fb) << 1;
-	ret |= lfsr_rollback_bit(s, BIT(in, 0), fb) << 0;
-	return ret;
-}
-/** lfsr_rollback_word
- * Rollback the shift register in order to get previous states
- */
-uint32_t lfsr_rollback_word(struct Crypto1State *s, uint32_t in, int fb)
-{
-	/*
-	int i;
-	uint32_t ret = 0;
-	for (i = 31; i >= 0; --i)
-		ret |= lfsr_rollback_bit(s, BEBIT(in, i), fb) << (i ^ 24);
-*/
-// unfold loop 20160112
-	uint32_t ret = 0;
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 31), fb) << (31 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 30), fb) << (30 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 29), fb) << (29 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 28), fb) << (28 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 27), fb) << (27 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 26), fb) << (26 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 25), fb) << (25 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 24), fb) << (24 ^ 24);
-
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 23), fb) << (23 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 22), fb) << (22 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 21), fb) << (21 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 20), fb) << (20 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 19), fb) << (19 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 18), fb) << (18 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 17), fb) << (17 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 16), fb) << (16 ^ 24);
-	
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 15), fb) << (15 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 14), fb) << (14 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 13), fb) << (13 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 12), fb) << (12 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 11), fb) << (11 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 10), fb) << (10 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 9), fb) << (9 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 8), fb) << (8 ^ 24);
-	
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 7), fb) << (7 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 6), fb) << (6 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 5), fb) << (5 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 4), fb) << (4 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 3), fb) << (3 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 2), fb) << (2 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 1), fb) << (1 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 0), fb) << (0 ^ 24);
-	return ret;
-}
-
-/** nonce_distance
- * x,y valid tag nonces, then prng_successor(x, nonce_distance(x, y)) = y
- */
-static uint16_t *dist = 0;
-int nonce_distance(uint32_t from, uint32_t to)
-{
-	uint16_t x, i;
-	if(!dist) {
-		dist = malloc(2 << 16);
-		if(!dist)
-			return -1;
-		for (x = i = 1; i; ++i) {
-			dist[(x & 0xff) << 8 | x >> 8] = i;
-			x = x >> 1 | (x ^ x >> 2 ^ x >> 3 ^ x >> 5) << 15;
-		}
-	}
-	return (65535 + dist[to >> 16] - dist[from >> 16]) % 65535;
-}
-
-
-static uint32_t fastfwd[2][8] = {
-	{ 0, 0x4BC53, 0xECB1, 0x450E2, 0x25E29, 0x6E27A, 0x2B298, 0x60ECB},
-	{ 0, 0x1D962, 0x4BC53, 0x56531, 0xECB1, 0x135D3, 0x450E2, 0x58980}};
-
-
-/** lfsr_prefix_ks
- *
- * Is an exported helper function from the common prefix attack
- * Described in the "dark side" paper. It returns an -1 terminated array
- * of possible partial(21 bit) secret state.
- * The required keystream(ks) needs to contain the keystream that was used to
- * encrypt the NACK which is observed when varying only the 3 last bits of Nr
- * only correct iff [NR_3] ^ NR_3 does not depend on Nr_3
- */
-uint32_t *lfsr_prefix_ks(uint8_t ks[8], int isodd)
-{
-	uint32_t *candidates = malloc(4 << 10);
-	if(!candidates) return 0;
-	
-	uint32_t c,  entry;
-	int size = 0, i, good;
-
-	for(i = 0; i < 1 << 21; ++i) {
-		for(c = 0, good = 1; good && c < 8; ++c) {
-			entry = i ^ fastfwd[isodd][c];
-			good &= (BIT(ks[c], isodd) == filter(entry >> 1));
-			good &= (BIT(ks[c], isodd + 2) == filter(entry));
-		}
-		if(good)
-			candidates[size++] = i;
-	}
-
-	candidates[size] = -1;
-
-	return candidates;
-}
-
-/** check_pfx_parity
- * helper function which eliminates possible secret states using parity bits
- */
-static struct Crypto1State* check_pfx_parity(uint32_t prefix, uint32_t rresp, uint8_t parities[8][8], uint32_t odd, uint32_t even, struct Crypto1State* sl)
-{
-	uint32_t ks1, nr, ks2, rr, ks3, c, good = 1;
-
-	for(c = 0; good && c < 8; ++c) {
-		sl->odd = odd ^ fastfwd[1][c];
-		sl->even = even ^ fastfwd[0][c];
-
-		lfsr_rollback_bit(sl, 0, 0);
-		lfsr_rollback_bit(sl, 0, 0);
-
-		ks3 = lfsr_rollback_bit(sl, 0, 0);
-		ks2 = lfsr_rollback_word(sl, 0, 0);
-		ks1 = lfsr_rollback_word(sl, prefix | c << 5, 1);
-
-		nr = ks1 ^ (prefix | c << 5);
-		rr = ks2 ^ rresp;
-
-		good &= parity(nr & 0x000000ff) ^ parities[c][3] ^ BIT(ks2, 24);
-		good &= parity(rr & 0xff000000) ^ parities[c][4] ^ BIT(ks2, 16);
-		good &= parity(rr & 0x00ff0000) ^ parities[c][5] ^ BIT(ks2,  8);
-		good &= parity(rr & 0x0000ff00) ^ parities[c][6] ^ BIT(ks2,  0);
-		good &= parity(rr & 0x000000ff) ^ parities[c][7] ^ ks3;
-	}
-
-	return sl + good;
-} 
-
-/** lfsr_common_prefix
- * Implentation of the common prefix attack.
- * Requires the 28 bit constant prefix used as reader nonce (pfx)
- * The reader response used (rr)
- * The keystream used to encrypt the observed NACK's (ks)
- * The parity bits (par)
- * It returns a zero terminated list of possible cipher states after the
- * tag nonce was fed in
- */
-
-struct Crypto1State* lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8])
-{
-	struct Crypto1State *statelist, *s;
-	uint32_t *odd, *even, *o, *e, top;
-
-	odd = lfsr_prefix_ks(ks, 1);
-	even = lfsr_prefix_ks(ks, 0);
-
-	s = statelist = malloc((sizeof *statelist) << 20);
-	if(!s || !odd || !even) {
-		free(statelist);
-		statelist = 0;
-                goto out;
-	}
-
-	for(o = odd; *o + 1; ++o)
-		for(e = even; *e + 1; ++e)
-			for(top = 0; top < 64; ++top) {
-				*o += 1 << 21;
-				*e += (!(top & 7) + 1) << 21;
-				s = check_pfx_parity(pfx, rr, par, *o, *e, s);
-			}
-
-	s->odd = s->even = 0;
-out:
-	free(odd);
-	free(even);
-	return statelist;
-}
+/*  crapto1.c
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License
+    as published by the Free Software Foundation; either version 2
+    of the License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA  02110-1301, US$
+
+    Copyright (C) 2008-2014 bla <blapost@gmail.com>
+*/
+#include "crapto1.h"
+#include <stdlib.h>
+
+#if !defined LOWMEM && defined __GNUC__
+static uint8_t filterlut[1 << 20];
+static void __attribute__((constructor)) fill_lut()
+{
+        uint32_t i;
+        for(i = 0; i < 1 << 20; ++i)
+                filterlut[i] = filter(i);
+}
+#define filter(x) (filterlut[(x) & 0xfffff])
+#endif
+
+
+
+typedef struct bucket {
+	uint32_t *head;
+	uint32_t *bp;
+} bucket_t;
+
+typedef bucket_t bucket_array_t[2][0x100];
+
+typedef struct bucket_info {
+	struct {
+		uint32_t *head, *tail;
+		} bucket_info[2][0x100];
+		uint32_t numbuckets;
+	} bucket_info_t;
+
+
+static void bucket_sort_intersect(uint32_t* const estart, uint32_t* const estop,
+								  uint32_t* const ostart, uint32_t* const ostop,
+								  bucket_info_t *bucket_info, bucket_array_t bucket)
+{
+	uint32_t *p1, *p2;
+	uint32_t *start[2];
+	uint32_t *stop[2];
+
+	start[0] = estart;
+	stop[0] = estop;
+	start[1] = ostart;
+	stop[1] = ostop;
+
+	// init buckets to be empty
+	for (uint32_t i = 0; i < 2; i++) {
+		for (uint32_t j = 0x00; j <= 0xff; j++) {
+			bucket[i][j].bp = bucket[i][j].head;
+		}
+	}
+
+	// sort the lists into the buckets based on the MSB (contribution bits)
+	for (uint32_t i = 0; i < 2; i++) {
+		for (p1 = start[i]; p1 <= stop[i]; p1++) {
+			uint32_t bucket_index = (*p1 & 0xff000000) >> 24;
+			*(bucket[i][bucket_index].bp++) = *p1;
+		}
+	}
+
+
+	// write back intersecting buckets as sorted list.
+	// fill in bucket_info with head and tail of the bucket contents in the list and number of non-empty buckets.
+	uint32_t nonempty_bucket;
+	for (uint32_t i = 0; i < 2; i++) {
+		p1 = start[i];
+		nonempty_bucket = 0;
+		for (uint32_t j = 0x00; j <= 0xff; j++) {
+			if (bucket[0][j].bp != bucket[0][j].head && bucket[1][j].bp != bucket[1][j].head) { // non-empty intersecting buckets only
+				bucket_info->bucket_info[i][nonempty_bucket].head = p1;
+				for (p2 = bucket[i][j].head; p2 < bucket[i][j].bp; *p1++ = *p2++);
+				bucket_info->bucket_info[i][nonempty_bucket].tail = p1 - 1;
+				nonempty_bucket++;
+			}
+		}
+		bucket_info->numbuckets = nonempty_bucket;
+		}
+}
+
+/** update_contribution
+ * helper, calculates the partial linear feedback contributions and puts in MSB
+ */
+static inline void update_contribution(uint32_t *item, const uint32_t mask1, const uint32_t mask2)
+{
+	uint32_t p = *item >> 25;
+
+	p = p << 1 | parity(*item & mask1);
+	p = p << 1 | parity(*item & mask2);
+	*item = p << 24 | (*item & 0xffffff);
+}
+
+/** extend_table
+ * using a bit of the keystream extend the table of possible lfsr states
+ */
+static inline void extend_table(uint32_t *tbl, uint32_t **end, int bit, int m1, int m2, uint32_t in)
+{
+	in <<= 24;
+	for(*tbl <<= 1; tbl <= *end; *++tbl <<= 1)
+		if(filter(*tbl) ^ filter(*tbl | 1)) {
+			*tbl |= filter(*tbl) ^ bit;
+			update_contribution(tbl, m1, m2);
+			*tbl ^= in;
+		} else if(filter(*tbl) == bit) {
+			*++*end = tbl[1];
+			tbl[1] = tbl[0] | 1;
+			update_contribution(tbl, m1, m2);
+			*tbl++ ^= in;
+			update_contribution(tbl, m1, m2);
+			*tbl ^= in;
+		} else
+			*tbl-- = *(*end)--;
+}
+/** extend_table_simple
+ * using a bit of the keystream extend the table of possible lfsr states
+ */
+static inline void extend_table_simple(uint32_t *tbl, uint32_t **end, int bit)
+{
+	for(*tbl <<= 1; tbl <= *end; *++tbl <<= 1) {
+		if(filter(*tbl) ^ filter(*tbl | 1)) {	// replace
+			*tbl |= filter(*tbl) ^ bit;
+		} else if(filter(*tbl) == bit) {		// insert
+			*++*end = *++tbl;
+			*tbl = tbl[-1] | 1;
+		} else	{								// drop
+			*tbl-- = *(*end)--;
+		}
+	}
+}
+/** recover
+ * recursively narrow down the search space, 4 bits of keystream at a time
+ */
+static struct Crypto1State*
+recover(uint32_t *o_head, uint32_t *o_tail, uint32_t oks,
+	uint32_t *e_head, uint32_t *e_tail, uint32_t eks, int rem,
+	struct Crypto1State *sl, uint32_t in, bucket_array_t bucket)
+{
+	uint32_t *o, *e;
+	bucket_info_t bucket_info;
+
+	if(rem == -1) {
+		for(e = e_head; e <= e_tail; ++e) {
+			*e = *e << 1 ^ parity(*e & LF_POLY_EVEN) ^ !!(in & 4);
+			for(o = o_head; o <= o_tail; ++o, ++sl) {
+				sl->even = *o;
+				sl->odd = *e ^ parity(*o & LF_POLY_ODD);
+				sl[1].odd = sl[1].even = 0;
+			}
+		}
+		return sl;
+	}
+
+	for(uint32_t i = 0; i < 4 && rem--; i++) {
+		oks >>= 1;
+		eks >>= 1;
+		in >>= 2;
+		extend_table(o_head, &o_tail, oks & 1, LF_POLY_EVEN << 1 | 1, LF_POLY_ODD << 1, 0);
+		if(o_head > o_tail)
+			return sl;
+
+		extend_table(e_head, &e_tail, eks & 1, LF_POLY_ODD, LF_POLY_EVEN << 1 | 1, in & 3);
+		if(e_head > e_tail)
+			return sl;
+	}
+
+	bucket_sort_intersect(e_head, e_tail, o_head, o_tail, &bucket_info, bucket);
+
+	for (int i = bucket_info.numbuckets - 1; i >= 0; i--) {
+		sl = recover(bucket_info.bucket_info[1][i].head, bucket_info.bucket_info[1][i].tail, oks,
+					 bucket_info.bucket_info[0][i].head, bucket_info.bucket_info[0][i].tail, eks,
+					 rem, sl, in, bucket);
+		}
+
+	return sl;
+}
+/** lfsr_recovery
+ * recover the state of the lfsr given 32 bits of the keystream
+ * additionally you can use the in parameter to specify the value
+ * that was fed into the lfsr at the time the keystream was generated
+ */
+struct Crypto1State* lfsr_recovery32(uint32_t ks2, uint32_t in)
+{
+	struct Crypto1State *statelist;
+	uint32_t *odd_head = 0, *odd_tail = 0, oks = 0;
+	uint32_t *even_head = 0, *even_tail = 0, eks = 0;
+	int i;
+
+	// split the keystream into an odd and even part
+	for(i = 31; i >= 0; i -= 2)
+		oks = oks << 1 | BEBIT(ks2, i);
+	for(i = 30; i >= 0; i -= 2)
+ 		eks = eks << 1 | BEBIT(ks2, i);
+
+	odd_head = odd_tail = malloc(sizeof(uint32_t) << 21);
+	even_head = even_tail = malloc(sizeof(uint32_t) << 21);
+	statelist =  malloc(sizeof(struct Crypto1State) << 18);
+	if(!odd_tail-- || !even_tail-- || !statelist) {
+		free(statelist);
+		statelist = 0;
+		goto out;
+	}
+
+	statelist->odd = statelist->even = 0;
+
+	// allocate memory for out of place bucket_sort
+	bucket_array_t bucket;
+	
+	for (uint32_t i = 0; i < 2; i++) {
+		for (uint32_t j = 0; j <= 0xff; j++) {
+			bucket[i][j].head = malloc(sizeof(uint32_t)<<14);
+			if (!bucket[i][j].head) {
+				goto out;
+			}
+		}
+	}
+
+	// initialize statelists: add all possible states which would result into the rightmost 2 bits of the keystream
+	for(i = 1 << 20; i >= 0; --i) {
+		if(filter(i) == (oks & 1))
+			*++odd_tail = i;
+		if(filter(i) == (eks & 1))
+			*++even_tail = i;
+	}
+
+	// extend the statelists. Look at the next 8 Bits of the keystream (4 Bit each odd and even):
+	for(i = 0; i < 4; i++) {
+		extend_table_simple(odd_head,  &odd_tail, (oks >>= 1) & 1);
+		extend_table_simple(even_head, &even_tail, (eks >>= 1) & 1);
+	}
+
+	// the statelists now contain all states which could have generated the last 10 Bits of the keystream.
+	// 22 bits to go to recover 32 bits in total. From now on, we need to take the "in"
+	// parameter into account.
+	in = (in >> 16 & 0xff) | (in << 16) | (in & 0xff00);		// Byte swapping
+	recover(odd_head, odd_tail, oks, even_head, even_tail, eks, 11, statelist, in << 1, bucket);
+
+out:
+	for (uint32_t i = 0; i < 2; i++)
+		for (uint32_t j = 0; j <= 0xff; j++)
+			free(bucket[i][j].head);
+	free(odd_head);
+	free(even_head);
+	return statelist;
+}
+
+static const uint32_t S1[] = {     0x62141, 0x310A0, 0x18850, 0x0C428, 0x06214,
+	0x0310A, 0x85E30, 0xC69AD, 0x634D6, 0xB5CDE, 0xDE8DA, 0x6F46D, 0xB3C83,
+	0x59E41, 0xA8995, 0xD027F, 0x6813F, 0x3409F, 0x9E6FA};
+static const uint32_t S2[] = {  0x3A557B00, 0x5D2ABD80, 0x2E955EC0, 0x174AAF60,
+	0x0BA557B0, 0x05D2ABD8, 0x0449DE68, 0x048464B0, 0x42423258, 0x278192A8,
+	0x156042D0, 0x0AB02168, 0x43F89B30, 0x61FC4D98, 0x765EAD48, 0x7D8FDD20,
+	0x7EC7EE90, 0x7F63F748, 0x79117020};
+static const uint32_t T1[] = {
+	0x4F37D, 0x279BE, 0x97A6A, 0x4BD35, 0x25E9A, 0x12F4D, 0x097A6, 0x80D66,
+	0xC4006, 0x62003, 0xB56B4, 0x5AB5A, 0xA9318, 0xD0F39, 0x6879C, 0xB057B,
+	0x582BD, 0x2C15E, 0x160AF, 0x8F6E2, 0xC3DC4, 0xE5857, 0x72C2B, 0x39615,
+	0x98DBF, 0xC806A, 0xE0680, 0x70340, 0x381A0, 0x98665, 0x4C332, 0xA272C};
+static const uint32_t T2[] = {  0x3C88B810, 0x5E445C08, 0x2982A580, 0x14C152C0,
+	0x4A60A960, 0x253054B0, 0x52982A58, 0x2FEC9EA8, 0x1156C4D0, 0x08AB6268,
+	0x42F53AB0, 0x217A9D58, 0x161DC528, 0x0DAE6910, 0x46D73488, 0x25CB11C0,
+	0x52E588E0, 0x6972C470, 0x34B96238, 0x5CFC3A98, 0x28DE96C8, 0x12CFC0E0,
+	0x4967E070, 0x64B3F038, 0x74F97398, 0x7CDC3248, 0x38CE92A0, 0x1C674950,
+	0x0E33A4A8, 0x01B959D0, 0x40DCACE8, 0x26CEDDF0};
+static const uint32_t C1[] = { 0x846B5, 0x4235A, 0x211AD};
+static const uint32_t C2[] = { 0x1A822E0, 0x21A822E0, 0x21A822E0};
+/** Reverse 64 bits of keystream into possible cipher states
+ * Variation mentioned in the paper. Somewhat optimized version
+ */
+struct Crypto1State* lfsr_recovery64(uint32_t ks2, uint32_t ks3)
+{
+	struct Crypto1State *statelist, *sl;
+	uint8_t oks[32], eks[32], hi[32];
+	uint32_t low = 0,  win = 0;
+	uint32_t *tail, table[1 << 16];
+	int i, j;
+
+	sl = statelist = malloc(sizeof(struct Crypto1State) << 4);
+	if(!sl)
+		return 0;
+	sl->odd = sl->even = 0;
+
+	for(i = 30; i >= 0; i -= 2) {
+		oks[i >> 1] = BEBIT(ks2, i);
+		oks[16 + (i >> 1)] = BEBIT(ks3, i);
+	}
+	for(i = 31; i >= 0; i -= 2) {
+		eks[i >> 1] = BEBIT(ks2, i);
+		eks[16 + (i >> 1)] = BEBIT(ks3, i);
+	}
+
+	for(i = 0xfffff; i >= 0; --i) {
+		if (filter(i) != oks[0])
+			continue;
+
+		*(tail = table) = i;
+		for(j = 1; tail >= table && j < 29; ++j)
+			extend_table_simple(table, &tail, oks[j]);
+
+		if(tail < table)
+			continue;
+
+		for(j = 0; j < 19; ++j)
+			low = low << 1 | parity(i & S1[j]);
+		for(j = 0; j < 32; ++j)
+			hi[j] = parity(i & T1[j]);
+
+		for(; tail >= table; --tail) {
+			for(j = 0; j < 3; ++j) {
+				*tail = *tail << 1;
+				*tail |= parity((i & C1[j]) ^ (*tail & C2[j]));
+				if(filter(*tail) != oks[29 + j])
+					goto continue2;
+			}
+
+			for(j = 0; j < 19; ++j)
+				win = win << 1 | parity(*tail & S2[j]);
+
+			win ^= low;
+			for(j = 0; j < 32; ++j) {
+				win = win << 1 ^ hi[j] ^ parity(*tail & T2[j]);
+				if(filter(win) != eks[j])
+					goto continue2;
+			}
+
+			*tail = *tail << 1 | parity(LF_POLY_EVEN & *tail);
+			sl->odd = *tail ^ parity(LF_POLY_ODD & win);
+			sl->even = win;
+			++sl;
+			sl->odd = sl->even = 0;
+			continue2:;
+		}
+	}
+	return statelist;
+}
+
+/** lfsr_rollback_bit
+ * Rollback the shift register in order to get previous states
+ */
+uint8_t lfsr_rollback_bit(struct Crypto1State *s, uint32_t in, int fb)
+{
+	int out;
+	uint8_t ret;
+	uint32_t t;
+
+	s->odd &= 0xffffff;
+	t = s->odd, s->odd = s->even, s->even = t;
+
+	out = s->even & 1;
+	out ^= LF_POLY_EVEN & (s->even >>= 1);
+	out ^= LF_POLY_ODD & s->odd;
+	out ^= !!in;
+	out ^= (ret = filter(s->odd)) & !!fb;
+
+	s->even |= parity(out) << 23;
+	return ret;
+}
+/** lfsr_rollback_byte
+ * Rollback the shift register in order to get previous states
+ */
+uint8_t lfsr_rollback_byte(struct Crypto1State *s, uint32_t in, int fb)
+{
+	/*
+	int i, ret = 0;
+	for (i = 7; i >= 0; --i)
+		ret |= lfsr_rollback_bit(s, BIT(in, i), fb) << i;
+*/
+// unfold loop 20160112
+	uint8_t ret = 0;
+	ret |= lfsr_rollback_bit(s, BIT(in, 7), fb) << 7;
+	ret |= lfsr_rollback_bit(s, BIT(in, 6), fb) << 6;
+	ret |= lfsr_rollback_bit(s, BIT(in, 5), fb) << 5;
+	ret |= lfsr_rollback_bit(s, BIT(in, 4), fb) << 4;
+	ret |= lfsr_rollback_bit(s, BIT(in, 3), fb) << 3;
+	ret |= lfsr_rollback_bit(s, BIT(in, 2), fb) << 2;
+	ret |= lfsr_rollback_bit(s, BIT(in, 1), fb) << 1;
+	ret |= lfsr_rollback_bit(s, BIT(in, 0), fb) << 0;
+	return ret;
+}
+/** lfsr_rollback_word
+ * Rollback the shift register in order to get previous states
+ */
+uint32_t lfsr_rollback_word(struct Crypto1State *s, uint32_t in, int fb)
+{
+	/*
+	int i;
+	uint32_t ret = 0;
+	for (i = 31; i >= 0; --i)
+		ret |= lfsr_rollback_bit(s, BEBIT(in, i), fb) << (i ^ 24);
+*/
+// unfold loop 20160112
+	uint32_t ret = 0;
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 31), fb) << (31 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 30), fb) << (30 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 29), fb) << (29 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 28), fb) << (28 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 27), fb) << (27 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 26), fb) << (26 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 25), fb) << (25 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 24), fb) << (24 ^ 24);
+
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 23), fb) << (23 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 22), fb) << (22 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 21), fb) << (21 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 20), fb) << (20 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 19), fb) << (19 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 18), fb) << (18 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 17), fb) << (17 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 16), fb) << (16 ^ 24);
+	
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 15), fb) << (15 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 14), fb) << (14 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 13), fb) << (13 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 12), fb) << (12 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 11), fb) << (11 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 10), fb) << (10 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 9), fb) << (9 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 8), fb) << (8 ^ 24);
+	
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 7), fb) << (7 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 6), fb) << (6 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 5), fb) << (5 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 4), fb) << (4 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 3), fb) << (3 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 2), fb) << (2 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 1), fb) << (1 ^ 24);
+	ret |= lfsr_rollback_bit(s, BEBIT(in, 0), fb) << (0 ^ 24);
+	return ret;
+}
+
+/** nonce_distance
+ * x,y valid tag nonces, then prng_successor(x, nonce_distance(x, y)) = y
+ */
+static uint16_t *dist = 0;
+int nonce_distance(uint32_t from, uint32_t to)
+{
+	uint16_t x, i;
+	if(!dist) {
+		dist = malloc(2 << 16);
+		if(!dist)
+			return -1;
+		for (x = i = 1; i; ++i) {
+			dist[(x & 0xff) << 8 | x >> 8] = i;
+			x = x >> 1 | (x ^ x >> 2 ^ x >> 3 ^ x >> 5) << 15;
+		}
+	}
+	return (65535 + dist[to >> 16] - dist[from >> 16]) % 65535;
+}
+
+
+static uint32_t fastfwd[2][8] = {
+	{ 0, 0x4BC53, 0xECB1, 0x450E2, 0x25E29, 0x6E27A, 0x2B298, 0x60ECB},
+	{ 0, 0x1D962, 0x4BC53, 0x56531, 0xECB1, 0x135D3, 0x450E2, 0x58980}};
+
+
+/** lfsr_prefix_ks
+ *
+ * Is an exported helper function from the common prefix attack
+ * Described in the "dark side" paper. It returns an -1 terminated array
+ * of possible partial(21 bit) secret state.
+ * The required keystream(ks) needs to contain the keystream that was used to
+ * encrypt the NACK which is observed when varying only the 3 last bits of Nr
+ * only correct iff [NR_3] ^ NR_3 does not depend on Nr_3
+ */
+uint32_t *lfsr_prefix_ks(uint8_t ks[8], int isodd)
+{
+	uint32_t *candidates = malloc(4 << 10);
+	if(!candidates) return 0;
+	
+	uint32_t c,  entry;
+	int size = 0, i, good;
+
+	for(i = 0; i < 1 << 21; ++i) {
+		for(c = 0, good = 1; good && c < 8; ++c) {
+			entry = i ^ fastfwd[isodd][c];
+			good &= (BIT(ks[c], isodd) == filter(entry >> 1));
+			good &= (BIT(ks[c], isodd + 2) == filter(entry));
+		}
+		if(good)
+			candidates[size++] = i;
+	}
+
+	candidates[size] = -1;
+
+	return candidates;
+}
+
+/** check_pfx_parity
+ * helper function which eliminates possible secret states using parity bits
+ */
+static struct Crypto1State* check_pfx_parity(uint32_t prefix, uint32_t rresp, uint8_t parities[8][8], uint32_t odd, uint32_t even, struct Crypto1State* sl)
+{
+	uint32_t ks1, nr, ks2, rr, ks3, c, good = 1;
+
+	for(c = 0; good && c < 8; ++c) {
+		sl->odd = odd ^ fastfwd[1][c];
+		sl->even = even ^ fastfwd[0][c];
+
+		lfsr_rollback_bit(sl, 0, 0);
+		lfsr_rollback_bit(sl, 0, 0);
+
+		ks3 = lfsr_rollback_bit(sl, 0, 0);
+		ks2 = lfsr_rollback_word(sl, 0, 0);
+		ks1 = lfsr_rollback_word(sl, prefix | c << 5, 1);
+
+		nr = ks1 ^ (prefix | c << 5);
+		rr = ks2 ^ rresp;
+
+		good &= parity(nr & 0x000000ff) ^ parities[c][3] ^ BIT(ks2, 24);
+		good &= parity(rr & 0xff000000) ^ parities[c][4] ^ BIT(ks2, 16);
+		good &= parity(rr & 0x00ff0000) ^ parities[c][5] ^ BIT(ks2,  8);
+		good &= parity(rr & 0x0000ff00) ^ parities[c][6] ^ BIT(ks2,  0);
+		good &= parity(rr & 0x000000ff) ^ parities[c][7] ^ ks3;
+	}
+
+	return sl + good;
+} 
+
+/** lfsr_common_prefix
+ * Implentation of the common prefix attack.
+ * Requires the 28 bit constant prefix used as reader nonce (pfx)
+ * The reader response used (rr)
+ * The keystream used to encrypt the observed NACK's (ks)
+ * The parity bits (par)
+ * It returns a zero terminated list of possible cipher states after the
+ * tag nonce was fed in
+ */
+
+struct Crypto1State* lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8])
+{
+	struct Crypto1State *statelist, *s;
+	uint32_t *odd, *even, *o, *e, top;
+
+	odd = lfsr_prefix_ks(ks, 1);
+	even = lfsr_prefix_ks(ks, 0);
+
+	s = statelist = malloc((sizeof *statelist) << 20);
+	if(!s || !odd || !even) {
+		free(statelist);
+		statelist = 0;
+                goto out;
+	}
+
+	for(o = odd; *o + 1; ++o)
+		for(e = even; *e + 1; ++e)
+			for(top = 0; top < 64; ++top) {
+				*o += 1 << 21;
+				*e += (!(top & 7) + 1) << 21;
+				s = check_pfx_parity(pfx, rr, par, *o, *e, s);
+			}
+
+	s->odd = s->even = 0;
+out:
+	free(odd);
+	free(even);
+	return statelist;
+}

From 60f292b18e3862b5dbb6387425bfb1447f03731e Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 9 Mar 2019 08:59:13 +0100
Subject: [PATCH 0680/1938] remove spurious spaces & tabs at end of lines

---
 armsrc/BigBuf.c                              |  12 +-
 armsrc/BigBuf.h                              |   2 +-
 armsrc/LCD.c                                 |   4 +-
 armsrc/Standalone/hf_bog.c                   | 114 +--
 armsrc/Standalone/hf_colin.c                 |   6 +-
 armsrc/Standalone/hf_mattyrun.c              |  34 +-
 armsrc/Standalone/hf_young.c                 |  40 +-
 armsrc/Standalone/hf_young.h                 |   2 +-
 armsrc/Standalone/lf_hidbrute.c              |  74 +-
 armsrc/Standalone/lf_proxbrute.c             |  24 +-
 armsrc/Standalone/lf_samyrun.c               |  30 +-
 armsrc/appmain.c                             | 274 +++----
 armsrc/apps.h                                |   4 +-
 armsrc/buzzer.c                              |  20 +-
 armsrc/des.c                                 |  88 +--
 armsrc/des.h                                 |  22 +-
 armsrc/desfire_crypto.c                      |  24 +-
 armsrc/desfire_key.c                         |   6 +-
 armsrc/epa.c                                 |   2 +-
 armsrc/felica.c                              | 226 +++---
 armsrc/flashmem.c                            |  86 +--
 armsrc/fpgaloader.c                          |  28 +-
 armsrc/fpgaloader.h                          |   6 +-
 armsrc/hfsnoop.c                             |  22 +-
 armsrc/hitag2.c                              | 288 +++----
 armsrc/hitagS.c                              |  84 +-
 armsrc/iclass.c                              | 394 +++++-----
 armsrc/iso14443a.c                           | 756 +++++++++---------
 armsrc/iso14443a.h                           |   4 +-
 armsrc/iso14443b.c                           | 388 +++++-----
 armsrc/iso15693.c                            | 254 +++----
 armsrc/lfops.c                               |  82 +-
 armsrc/lfsampling.c                          | 106 +--
 armsrc/mifarecmd.c                           | 508 ++++++-------
 armsrc/mifaredesfire.c                       | 206 ++---
 armsrc/mifaresniff.c                         |  76 +-
 armsrc/mifareutil.c                          | 112 +--
 armsrc/mifareutil.h                          |   4 +-
 armsrc/optimized_cipher.c                    |  24 +-
 armsrc/pcf7931.c                             |  52 +-
 armsrc/start.c                               |   8 +-
 armsrc/ticks.c                               |  34 +-
 armsrc/util.c                                |   6 +-
 bootrom/bootrom.c                            |  48 +-
 client/amiitool/amiibo.c                     |  10 +-
 client/amiitool/amiitool.c                   |   4 +-
 client/cliparser/argtable3.c                 |  22 +-
 client/cliparser/argtable3.h                 |   4 +-
 client/cliparser/cliparser.c                 |  54 +-
 client/cliparser/getopt.h                    |   2 +-
 client/cmdanalyse.c                          | 232 +++---
 client/cmdanalyse.h                          |   2 +-
 client/cmdcrc.c                              |  50 +-
 client/cmddata.c                             | 292 +++----
 client/cmdflashmem.c                         | 140 ++--
 client/cmdhf.c                               |  18 +-
 client/cmdhf14a.c                            | 288 +++----
 client/cmdhf14a.h                            |  10 +-
 client/cmdhf14b.c                            | 282 +++----
 client/cmdhf14b.h                            |   2 +-
 client/cmdhf15.c                             | 384 +++++-----
 client/cmdhfepa.c                            |   4 +-
 client/cmdhffelica.c                         | 120 +--
 client/cmdhffido.c                           | 252 +++---
 client/cmdhficlass.c                         | 440 +++++------
 client/cmdhflegic.c                          | 314 ++++----
 client/cmdhflist.c                           | 142 ++--
 client/cmdhfmf.c                             | 758 +++++++++----------
 client/cmdhfmfdes.c                          | 200 ++---
 client/cmdhfmfdes.h                          |   4 +-
 client/cmdhfmfdesfire.c                      |  38 +-
 client/cmdhfmfhard.c                         | 312 ++++----
 client/cmdhfmfp.c                            | 222 +++---
 client/cmdhfmfu.c                            | 450 +++++------
 client/cmdhfmfu.h                            |   4 +-
 client/cmdhftopaz.c                          | 104 +--
 client/cmdhw.c                               |  50 +-
 client/cmdlf.c                               | 162 ++--
 client/cmdlf.h                               |   2 +-
 client/cmdlfawid.c                           | 100 +--
 client/cmdlfcotag.c                          |  28 +-
 client/cmdlfcotag.h                          |   2 +-
 client/cmdlfem4x.c                           | 228 +++---
 client/cmdlfem4x.h                           |   2 +-
 client/cmdlffdx.c                            |  72 +-
 client/cmdlffdx.h                            |   2 +-
 client/cmdlfguard.c                          |  78 +-
 client/cmdlfhid.c                            |  92 +--
 client/cmdlfhid.h                            |   2 +-
 client/cmdlfhitag.c                          |  32 +-
 client/cmdlfindala.c                         |  70 +-
 client/cmdlfio.c                             |  76 +-
 client/cmdlfjablotron.c                      |  30 +-
 client/cmdlfkeri.c                           |  76 +-
 client/cmdlfnedap.c                          |  82 +-
 client/cmdlfnexwatch.c                       |  16 +-
 client/cmdlfnexwatch.h                       |   2 +-
 client/cmdlfnoralsy.c                        |  42 +-
 client/cmdlfpac.c                            |   4 +-
 client/cmdlfparadox.c                        |  50 +-
 client/cmdlfpcf7931.c                        |  30 +-
 client/cmdlfpresco.c                         |  24 +-
 client/cmdlfpyramid.c                        |  34 +-
 client/cmdlft55xx.c                          | 332 ++++----
 client/cmdlft55xx.h                          |  30 +-
 client/cmdlfti.c                             |   8 +-
 client/cmdlfviking.c                         |  30 +-
 client/cmdlfvisa2000.c                       |  34 +-
 client/cmdmain.c                             |   2 +-
 client/cmdmain.h                             |   2 +-
 client/cmdparser.c                           |   8 +-
 client/cmdparser.h                           |   2 +-
 client/cmdscript.c                           |   4 +-
 client/cmdsmartcard.c                        | 390 +++++-----
 client/cmdtrace.c                            | 106 +--
 client/cmdtrace.h                            |   4 +-
 client/comms.c                               | 112 +--
 client/comms.h                               |   6 +-
 client/crypto/asn1dump.c                     |  46 +-
 client/crypto/asn1utils.c                    |  12 +-
 client/crypto/libpcrypto.c                   | 128 ++--
 client/emv/apduinfo.c                        |  16 +-
 client/emv/apduinfo.h                        |   2 +-
 client/emv/cmdemv.c                          | 554 +++++++-------
 client/emv/crypto.c                          |   2 +-
 client/emv/crypto_polarssl.c                 |  34 +-
 client/emv/emv_pk.c                          |   2 +-
 client/emv/emv_pki.c                         |  28 +-
 client/emv/emv_roca.c                        |  42 +-
 client/emv/emv_roca.h                        |   2 +-
 client/emv/emv_tags.c                        |  42 +-
 client/emv/emvcore.c                         | 194 ++---
 client/emv/emvjson.c                         |  86 +--
 client/emv/test/cda_test.c                   |   2 +-
 client/emv/test/cda_test.h                   |   4 +-
 client/emv/test/cryptotest.c                 |  20 +-
 client/emv/test/dda_test.h                   |   4 +-
 client/emv/test/sda_test.h                   |   2 +-
 client/emv/tlv.c                             |  46 +-
 client/emv/tlv.h                             |   2 +-
 client/fido/additional_ca.c                  |   2 +-
 client/fido/additional_ca.h                  |   4 +-
 client/fido/cbortools.c                      |  94 +--
 client/fido/cose.c                           |  24 +-
 client/fido/fidocore.c                       | 154 ++--
 client/fido/fidocore.h                       |   2 +-
 client/flasher.c                             |   6 +-
 client/fpga_compress.c                       |  72 +-
 client/graph.c                               |  40 +-
 client/hardnested/hardnested_bf_core.c       |  72 +-
 client/hardnested/hardnested_bf_core.h       |   4 +-
 client/hardnested/hardnested_bitarray_core.c |  42 +-
 client/hardnested/hardnested_bitarray_core.h |   4 +-
 client/hardnested/hardnested_bruteforce.c    |  62 +-
 client/hardnested/hardnested_bruteforce.h    |   4 +-
 client/hardnested/hardnested_tables.c        |  82 +-
 client/hid-flasher/proxusb.c                 |   2 +-
 client/hid-flasher/usb_cmd.h                 |   4 +-
 client/jansson/lookup3.h                     |  18 +-
 client/jansson/path.c                        |   2 +-
 client/loclass/cipher.c                      |  24 +-
 client/loclass/cipher.h                      |  20 +-
 client/loclass/cipherutils.c                 |  26 +-
 client/loclass/cipherutils.h                 |  20 +-
 client/loclass/elite_crack.c                 |  40 +-
 client/loclass/elite_crack.h                 |  20 +-
 client/loclass/fileutils.c                   | 130 ++--
 client/loclass/fileutils.h                   |  24 +-
 client/loclass/hash1_brute.c                 |   6 +-
 client/loclass/ikeys.c                       |  36 +-
 client/loclass/ikeys.h                       |  20 +-
 client/loclass/main.c                        |  20 +-
 client/mifare/mad.c                          |  48 +-
 client/mifare/mad.h                          |   2 +-
 client/mifare/mfkey.c                        |  14 +-
 client/mifare/mifare4.c                      | 104 +--
 client/mifare/mifare4.h                      |   4 +-
 client/mifare/mifarehost.c                   | 268 +++----
 client/mifare/mifarehost.h                   |   2 +-
 client/mifare/ndef.c                         |  88 +--
 client/proxguiqt.h                           |   4 +-
 client/proxmark3.c                           |  92 +--
 client/proxmark3.h                           |   2 +-
 client/reveng/cli.c                          |   2 +-
 client/reveng/getopt.c                       |   6 +-
 client/reveng/preset.c                       |   4 +-
 client/reveng/reveng.c                       |   4 +-
 client/scandir.c                             |   2 +-
 client/scripting.c                           | 102 +--
 client/ui.c                                  |  70 +-
 client/ui.h                                  |   2 +-
 client/util.c                                | 138 ++--
 client/util.h                                |   4 +-
 client/util_posix.c                          |   4 +-
 client/whereami.c                            |   2 +-
 common/cmd.c                                 |   6 +-
 common/crapto1/crapto1.h                     |   2 +-
 common/crc.c                                 |  26 +-
 common/crc.h                                 |   4 +-
 common/crc16.c                               |  66 +-
 common/crc16.h                               |   2 +-
 common/default_version.c                     |   6 +-
 common/desfire.h                             |   2 +-
 common/emvtags.h                             | 230 +++---
 common/i2c.c                                 | 186 ++---
 common/iso14443crc.c                         |   2 +-
 common/iso15693tools.c                       |   2 +-
 common/iso15693tools.h                       |   4 +-
 common/legic_prng.c                          |   8 +-
 common/lfdemod.c                             | 420 +++++-----
 common/lfdemod.h                             |   4 +-
 common/parity.h                              |   6 +-
 common/prng.c                                |   2 +-
 common/prng.h                                |  10 +-
 common/protocols.c                           |  16 +-
 common/protocols.h                           |  12 +-
 common/radixsort.c                           |  14 +-
 common/random.c                              |   6 +-
 common/random.h                              |   2 +-
 common/tea.c                                 |   8 +-
 common/usart.c                               |  18 +-
 common/usb_cdc.c                             | 142 ++--
 common/usb_cdc.h                             |   2 +-
 common/wiegand.c                             |  46 +-
 include/common.h                             |  10 +-
 include/hitag2.h                             |   2 +-
 include/hitagS.h                             |   2 +-
 include/legic.h                              |   2 +-
 include/mifare.h                             |  10 +-
 include/proxmark3.h                          |   8 +-
 include/usb_cmd.h                            |   8 +-
 liblua/lgc.c                                 |   2 +-
 tools/mfkey/crapto1.c                        |  10 +-
 tools/mfkey/crapto1.h                        |   4 +-
 tools/mfkey/crypto1.c                        |   6 +-
 tools/mfkey/mfkey32.c                        |   4 +-
 tools/mfkey/mfkey32v2.c                      |   8 +-
 tools/mfkey/mfkey64.c                        |  12 +-
 tools/nonce2key/crapto1.c                    |  10 +-
 tools/nonce2key/crapto1.h                    |   4 +-
 tools/nonce2key/crypto1.c                    |   6 +-
 tools/nonce2key/nonce2key.c                  |   4 +-
 uart/uart.h                                  |   2 +-
 uart/uart_posix.c                            |  30 +-
 uart/uart_win32.c                            |  22 +-
 zlib/deflate.c                               |   8 +-
 zlib/inflate.c                               |   6 +-
 zlib/trees.c                                 |   6 +-
 zlib/zlib.h                                  |   2 +-
 249 files changed, 8481 insertions(+), 8481 deletions(-)

diff --git a/armsrc/BigBuf.c b/armsrc/BigBuf.c
index 7b49c0619..b6c9e544d 100644
--- a/armsrc/BigBuf.c
+++ b/armsrc/BigBuf.c
@@ -19,7 +19,7 @@ static uint32_t BigBuf[BIGBUF_SIZE/sizeof(uint32_t)];
 Pointer to highest available memory: BigBuf_hi
 
     high BIGBUF_SIZE
-    reserved = BigBuf_malloc()  subtracts amount from BigBuf_hi,   
+    reserved = BigBuf_malloc()  subtracts amount from BigBuf_hi,
 	low  0x00
 */
 
@@ -43,7 +43,7 @@ uint8_t *BigBuf_get_EM_addr(void) {
 	// not yet allocated
 	if (emulator_memory == NULL)
 		emulator_memory = BigBuf_malloc(CARD_MEMORY_SIZE);
-	
+
 	return emulator_memory;
 }
 
@@ -55,7 +55,7 @@ void BigBuf_Clear(void) {
 // clear ALL of BigBuf
 void BigBuf_Clear_ext(bool verbose) {
 	memset(BigBuf, 0, BIGBUF_SIZE);
-	if (verbose) 
+	if (verbose)
 		Dbprintf("Buffer cleared (%i bytes)", BIGBUF_SIZE);
 }
 
@@ -74,7 +74,7 @@ uint8_t *BigBuf_malloc(uint16_t chunksize) {
 		return NULL;							// no memory left
 
 	chunksize = (chunksize + 3) & 0xfffc;	// round to next multiple of 4
-	BigBuf_hi -= chunksize; 		  		// aligned to 4 Byte boundary 
+	BigBuf_hi -= chunksize; 		  		// aligned to 4 Byte boundary
 	return (uint8_t *)BigBuf + BigBuf_hi;
 }
 
@@ -91,7 +91,7 @@ void BigBuf_free_keep_EM(void) {
 		BigBuf_hi = emulator_memory - (uint8_t *)BigBuf;
 	else
 		BigBuf_hi = BIGBUF_SIZE;
-	
+
 	// shouldn't this empty BigBuf also?
 }
 
@@ -242,7 +242,7 @@ uint8_t emlSet(uint8_t *data, uint32_t offset, uint32_t length){
 	if (offset + length < CARD_MEMORY_SIZE) {
 		memcpy(mem+offset, data, length);
 		return 0;
-	} 
+	}
 	Dbprintf("Error, trying to set memory outside of bounds! %d  > %d", (offset + length), CARD_MEMORY_SIZE);
 	return 1;
 }
diff --git a/armsrc/BigBuf.h b/armsrc/BigBuf.h
index 679eed676..9b7b33e47 100644
--- a/armsrc/BigBuf.h
+++ b/armsrc/BigBuf.h
@@ -22,7 +22,7 @@
 #define MAX_PARITY_SIZE			((MAX_FRAME_SIZE + 7) / 8)
 #define MAX_MIFARE_FRAME_SIZE	18		// biggest Mifare frame is answer to a read (one block = 16 Bytes) + 2 Bytes CRC
 #define MAX_MIFARE_PARITY_SIZE	3		// need 18 parity bits for the 18 Byte above. 3 Bytes are enough to store these
-#define CARD_MEMORY_SIZE		4096	
+#define CARD_MEMORY_SIZE		4096
 #define DMA_BUFFER_SIZE    		256 	//128  (how big is the dma?!?
 
 extern uint8_t *BigBuf_get_addr(void);
diff --git a/armsrc/LCD.c b/armsrc/LCD.c
index b40dba0f7..3e74c77fa 100644
--- a/armsrc/LCD.c
+++ b/armsrc/LCD.c
@@ -125,7 +125,7 @@ void LCDInit(void)
 	LCDSend(PRAMWR);			// Write to display
 	i=LCD_XRES*LCD_YRES;
 	while(i--) LCDSend(WHITE);
-  
+
   // test text on different colored backgrounds
 	LCDString(" The quick brown fox  ",	(char *)&FONT6x8,1,1+8*0,WHITE  ,BLACK );
 	LCDString("  jumped over the     ",	(char *)&FONT6x8,1,1+8*1,BLACK  ,WHITE );
@@ -135,7 +135,7 @@ void LCDInit(void)
 	LCDString("UuVvWwXxYyZz0123456789",	(char *)&FONT6x8,1,1+8*5,BLUE   ,YELLOW);
 	LCDString("`-=[]_;',./~!@#$%^&*()",	(char *)&FONT6x8,1,1+8*6,BLACK  ,CYAN  );
 	LCDString("     _+{}|:\\\"<>?     ",(char *)&FONT6x8,1,1+8*7,BLUE  ,MAGENTA);
-  
+
 	// color bands
 	LCDFill(0, 1+8* 8, 132, 8, BLACK);
 	LCDFill(0, 1+8* 9, 132, 8, WHITE);
diff --git a/armsrc/Standalone/hf_bog.c b/armsrc/Standalone/hf_bog.c
index 65254bd5c..1f62e4c0c 100644
--- a/armsrc/Standalone/hf_bog.c
+++ b/armsrc/Standalone/hf_bog.c
@@ -8,20 +8,20 @@
 
 /*
 This can actually be used in two separate ways.
-It can either be used to just HF 14a sniff on the go and/or grab the 
+It can either be used to just HF 14a sniff on the go and/or grab the
 authentication attempts for ULC/NTAG/ULEV1 into the flash mem (RDV4).
 
 The retrieved sniffing session can be acquired by connecting the device
 to a client that supports the reconnect capability and issue 'hf 14a list'.
 
 In order to view the grabbed authentication attempts in the flash mem,
-you can simply run 'script run read_pwd_mem' or just 'mem read l 256' 
+you can simply run 'script run read_pwd_mem' or just 'mem read l 256'
 from the client to view the stored quadlets.
 */
 
 #include "hf_bog.h"
 
-#define DELAY_READER_AIR2ARM_AS_SNIFFER (2 + 3 + 8) 
+#define DELAY_READER_AIR2ARM_AS_SNIFFER (2 + 3 + 8)
 #define DELAY_TAG_AIR2ARM_AS_SNIFFER (3 + 14 + 8)
 
 // Maximum number of auth attempts per standalone session
@@ -31,7 +31,7 @@ uint8_t FindOffsetInFlash() {
 	uint8_t mem[4] = { 0x00, 0x00, 0x00, 0x00 };
 	uint8_t eom[4] = { 0xFF, 0xFF, 0xFF, 0xFF };
 	uint8_t memcnt = 0;
-	
+
 	while (memcnt < 0xFF)
 	{
 		Flash_ReadData(memcnt, mem, 4);
@@ -40,7 +40,7 @@ uint8_t FindOffsetInFlash() {
 		}
 		memcnt += 4;
 	}
-	
+
 	return 0; // wrap-around
 }
 
@@ -48,7 +48,7 @@ void EraseMemory() {
     if (!FlashInit()){
         return;
     }
-    
+
     Flash_CheckBusy(BUSY_TIMEOUT);
     Flash_WriteEnable();
     Flash_Erase4k(0,0);
@@ -60,26 +60,26 @@ void EraseMemory() {
 
 // This is actually copied from SniffIso14443a
 void RAMFUNC SniffAndStore(uint8_t param) {
-	
+
 	iso14443a_setup(FPGA_HF_ISO14443A_SNIFFER);
-	
+
 	// Allocate memory from BigBuf for some buffers
 	// free all previous allocations first
 	BigBuf_free(); BigBuf_Clear_ext(false);
 	clear_trace();
 	set_tracing(true);
-	
+
 	// Array to store the authpwds
 	uint8_t *capturedPwds = BigBuf_malloc(4 * MAX_PWDS_PER_SESSION);
-	
+
 	// The command (reader -> tag) that we're receiving.
 	uint8_t *receivedCmd = BigBuf_malloc(MAX_FRAME_SIZE);
 	uint8_t *receivedCmdPar = BigBuf_malloc(MAX_PARITY_SIZE);
-	
+
 	// The response (tag -> reader) that we're receiving.
 	uint8_t *receivedResp = BigBuf_malloc(MAX_FRAME_SIZE);
 	uint8_t *receivedRespPar = BigBuf_malloc(MAX_PARITY_SIZE);
-	
+
 	// The DMA buffer, used to stream samples from the FPGA
 	uint8_t *dmaBuf = BigBuf_malloc(DMA_BUFFER_SIZE);
 	uint8_t *data = dmaBuf;
@@ -88,47 +88,47 @@ void RAMFUNC SniffAndStore(uint8_t param) {
 	int dataLen = 0;
 	bool TagIsActive = false;
 	bool ReaderIsActive = false;
-	
+
 	// Set up the demodulator for tag -> reader responses.
 	DemodInit(receivedResp, receivedRespPar);
-	
+
 	// Set up the demodulator for the reader -> tag commands
 	UartInit(receivedCmd, receivedCmdPar);
-	
+
 	// Setup and start DMA.
 	if ( !FpgaSetupSscDma((uint8_t*) dmaBuf, DMA_BUFFER_SIZE) ){
-		if (MF_DBGLEVEL > 1) Dbprintf("FpgaSetupSscDma failed. Exiting"); 
+		if (MF_DBGLEVEL > 1) Dbprintf("FpgaSetupSscDma failed. Exiting");
 		return;
 	}
-	
+
 	tUart* uart = GetUart();
 	tDemod* demod = GetDemod();
-	
+
 	// We won't start recording the frames that we acquire until we trigger;
 	// a good trigger condition to get started is probably when we see a
 	// response from the tag.
 	// triggered == false -- to wait first for card
-	bool triggered = !(param & 0x03); 
-	
+	bool triggered = !(param & 0x03);
+
 	uint32_t rsamples = 0;
-	
+
 	// Current captured passwords counter
 	uint8_t auth_attempts = 0;
 
 	SpinDelay(50);
-	
+
 	// loop and listen
 	while (!BUTTON_PRESS()) {
         WDT_HIT();
         LED_A_ON();
-		
+
 		int register readBufDataP = data - dmaBuf;
 		int register dmaBufDataP = DMA_BUFFER_SIZE - AT91C_BASE_PDC_SSC->PDC_RCR;
 		if (readBufDataP <= dmaBufDataP)
 			dataLen = dmaBufDataP - readBufDataP;
 		else
 			dataLen = DMA_BUFFER_SIZE - readBufDataP + dmaBufDataP;
-		
+
 		// test for length of buffer
 		if (dataLen > DMA_BUFFER_SIZE) { // TODO: Check if this works properly
 			Dbprintf("[!] blew circular buffer! | datalen %u", dataLen);
@@ -149,7 +149,7 @@ void RAMFUNC SniffAndStore(uint8_t param) {
 		}
 
 		LED_A_OFF();
-		
+
 		// Need two samples to feed Miller and Manchester-Decoder
 		if (rsamples & 0x01) {
 
@@ -164,17 +164,17 @@ void RAMFUNC SniffAndStore(uint8_t param) {
 					if (triggered) {
 						if ((receivedCmd) && ((receivedCmd[0] == MIFARE_ULEV1_AUTH) || (receivedCmd[0] == MIFARE_ULC_AUTH_1))) {
 							if (MF_DBGLEVEL > 1) Dbprintf("PWD-AUTH KEY: 0x%02x%02x%02x%02x", receivedCmd[1], receivedCmd[2], receivedCmd[3], receivedCmd[4]);
-							
+
 							// temporarily save the captured pwd in our array
 							memcpy(&capturedPwds[4 * auth_attempts], receivedCmd+1, 4);
 							auth_attempts++;
 						}
-						
-						if (!LogTrace(receivedCmd, 
-										uart->len, 
+
+						if (!LogTrace(receivedCmd,
+										uart->len,
 										uart->startTime*16 - DELAY_READER_AIR2ARM_AS_SNIFFER,
 										uart->endTime*16 - DELAY_READER_AIR2ARM_AS_SNIFFER,
-										uart->parity, 
+										uart->parity,
 										true)) break;
 					}
 					/* ready to receive another command. */
@@ -188,14 +188,14 @@ void RAMFUNC SniffAndStore(uint8_t param) {
 			}
 
 			// no need to try decoding tag data if the reader is sending - and we cannot afford the time
-			if (!ReaderIsActive) {		
+			if (!ReaderIsActive) {
 				uint8_t tagdata = (previous_data << 4) | (*data & 0x0F);
 				if (ManchesterDecoding(tagdata, 0, (rsamples-1)*4)) {
 					LED_B_ON();
 
-					if (!LogTrace(receivedResp, 
-									demod->len, 
-									demod->startTime*16 - DELAY_TAG_AIR2ARM_AS_SNIFFER, 
+					if (!LogTrace(receivedResp,
+									demod->len,
+									demod->startTime*16 - DELAY_TAG_AIR2ARM_AS_SNIFFER,
 									demod->endTime*16 - DELAY_TAG_AIR2ARM_AS_SNIFFER,
 									demod->parity,
 									false)) break;
@@ -208,7 +208,7 @@ void RAMFUNC SniffAndStore(uint8_t param) {
 					UartReset();
 					//UartInit(receivedCmd, receivedCmdPar);
 					LED_C_OFF();
-				} 
+				}
 				TagIsActive = (demod->state != DEMOD_UNSYNCD);
 			}
 		}
@@ -223,29 +223,29 @@ void RAMFUNC SniffAndStore(uint8_t param) {
 
 	FpgaDisableSscDma();
 	set_tracing(false);
-	
+
 	Dbprintf("Stopped sniffing");
-	
+
 	SpinDelay(200);
-	
+
 	// Write stuff to flash
 	if (auth_attempts > 0) {
 		if (MF_DBGLEVEL > 1) Dbprintf("[!] Authentication attempts = %u", auth_attempts);
-		
+
 		// Setting the SPI Baudrate to 48MHz to avoid the bit-flip issue (https://github.com/RfidResearchGroup/proxmark3/issues/34)
 		FlashmemSetSpiBaudrate(48000000);
-		
+
 		// Find the offset in flash mem to continue writing the auth attempts
 		uint8_t memoffset = FindOffsetInFlash();
 		if (MF_DBGLEVEL > 1) Dbprintf("[!] Memory offset = %u", memoffset);
-		
+
 		if ((memoffset + 4 * auth_attempts) > 0xFF)
 		{
 			// We opt to keep the new data only
 			memoffset = 0;
 			if (MF_DBGLEVEL > 1) Dbprintf("[!] Size of total data > 256 bytes. Discarding the old data.");
 		}
-		
+
 		// Get previous data from flash mem
 		uint8_t *previousdata = BigBuf_malloc(memoffset);
 		if (memoffset > 0)
@@ -253,49 +253,49 @@ void RAMFUNC SniffAndStore(uint8_t param) {
 			uint16_t readlen = Flash_ReadData(0, previousdata, memoffset);
 			if (MF_DBGLEVEL > 1) Dbprintf("[!] Read %u bytes from flash mem", readlen);
 		}
-				
+
 		// create new bigbuf to hold all data
 		size_t total_size = memoffset + 4 * auth_attempts;
 		uint8_t *total_data = BigBuf_malloc(total_size);
-		
+
 		// Add the previousdata array into total_data array
 		memcpy(total_data, previousdata, memoffset);
-		
+
 		// Copy bytes of capturedPwds immediately following bytes of previousdata
 		memcpy(total_data + memoffset, capturedPwds, 4 * auth_attempts);
-		
+
 		// Erase first page of flash mem
 		EraseMemory();
-				
+
 		// Write total data to flash mem
 		uint16_t writelen = Flash_WriteData(0, total_data, memoffset + 4 * auth_attempts);
 		if (MF_DBGLEVEL > 1) Dbprintf("[!] Wrote %u bytes into flash mem", writelen);
-		
+
                 // If pwd saved successfully, blink led A three times
 		if (writelen > 0) {
 			SpinErr(0, 200, 5); // blink led A
 		}
-		
+
 		SpinDelay(100);
-		
+
 		// Reset the SPI Baudrate to the default value (24MHz)
 		FlashmemSetSpiBaudrate(24000000);
 	}
 }
 
 void RunMod() {
-	
+
 	StandAloneMode();
-	
+
 	Dbprintf(">>  Bogiton 14a Sniff UL/UL-EV1/NTAG a.k.a BogitoRun Started  <<");
 	Dbprintf("Starting to sniff");
-	
+
 	// param:
 	// bit 0 - trigger from first card answer
-	// bit 1 - trigger from first reader 7-bit request	
-	SniffAndStore(0);	
-	LEDsoff();	
+	// bit 1 - trigger from first reader 7-bit request
+	SniffAndStore(0);
+	LEDsoff();
 	SpinDelay(300);
 	Dbprintf("- [ End ] -> You can take shell back ...");
-	Dbprintf("- [  !  ] -> use 'script run read_pwd_mem' to print passwords");	
+	Dbprintf("- [  !  ] -> use 'script run read_pwd_mem' to print passwords");
 }
diff --git a/armsrc/Standalone/hf_colin.c b/armsrc/Standalone/hf_colin.c
index 2eabd68d9..c1b8d65ab 100644
--- a/armsrc/Standalone/hf_colin.c
+++ b/armsrc/Standalone/hf_colin.c
@@ -161,7 +161,7 @@ void WriteTagToFlash(uint8_t index, size_t size)
     if (!FlashInit()){
         return;
     }
-    
+
     Flash_CheckBusy(BUSY_TIMEOUT);
     Flash_WriteEnable();
     Flash_Erase4k(0,0);
@@ -212,7 +212,7 @@ void RunMod()
 {
 	StandAloneMode();
     FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-	
+
     currline = 20;
     curlline = 20;
     currfline = 24;
@@ -328,7 +328,7 @@ ACCBITS : 796788[00]+VALUE
 			foundKey[t][sectorNo][2] = 0xFF;
 			foundKey[t][sectorNo][3] = 0xFF;
 			foundKey[t][sectorNo][4] = 0xFF;
-			foundKey[t][sectorNo][5] = 0xFF;			
+			foundKey[t][sectorNo][5] = 0xFF;
         }
     }
 
diff --git a/armsrc/Standalone/hf_mattyrun.c b/armsrc/Standalone/hf_mattyrun.c
index 78f197383..1f3d4b70c 100644
--- a/armsrc/Standalone/hf_mattyrun.c
+++ b/armsrc/Standalone/hf_mattyrun.c
@@ -13,7 +13,7 @@
 I've personally recoded the image of the ARM in order to automate
 the attack and simulation on Mifare cards. I've moved some of the
 implementation on the client side to the ARM such as *chk*, *ecfill*, *sim*
-and *clone* commands. 
+and *clone* commands.
 
 ### What it does now:
 It will check if the keys from the attacked tag are a subset from
@@ -218,7 +218,7 @@ void RunMod() {
 	StandAloneMode();
 	Dbprintf(">>  Matty mifare chk/dump/sim  a.k.a MattyRun Started  <<");
     FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-	
+
 	/*
 		It will check if the keys from the attacked tag are a subset from
 		the hardcoded set of keys inside of the ARM. If this is the case
@@ -232,9 +232,9 @@ void RunMod() {
 		If you're using the proxmark connected to a device that has an OS, and you're not using the proxmark3 client to see the debug
 		messages, you MUST uncomment usb_disable().
 	*/
-	
+
 	// Comment this line below if you want to see debug messages.
-    // usb_disable(); 
+    // usb_disable();
 
     /*
 		Pseudo-configuration block.
@@ -323,7 +323,7 @@ void RunMod() {
 	bool err = 0;
 	bool allKeysFound = true;
 	uint32_t size = mfKeysCnt;
-	
+
 	for (int type = !keyType; type < 2 && !err; keyType == 2 ? (type++) : (type = 2)) {
 		block = blockNo;
 		for (int sec = 0; sec < sectorsCnt && !err; ++sec) {
@@ -341,18 +341,18 @@ void RunMod() {
 				num_to_bytes(key64, 6, foundKey[type][sec]);
 				validKey[type][sec] = true;
 				keyFound = true;
-				Dbprintf("\t✓ Found valid key: [%02x%02x%02x%02x%02x%02x]\n", 
+				Dbprintf("\t✓ Found valid key: [%02x%02x%02x%02x%02x%02x]\n",
 					(keyBlock + 6*key)[0], (keyBlock + 6*key)[1], (keyBlock + 6*key)[2],
 					(keyBlock + 6*key)[3], (keyBlock + 6*key)[4], (keyBlock + 6*key)[5]
 				);
 			}
-			
+
 			block < 127 ? (block += 4) : (block += 16);
 		}
 	}
 
 	/*
-		TODO: 
+		TODO:
 		- Get UID from tag and set accordingly in emulator memory and call mifare1ksim with right flags (iceman)
 	*/
 	if (!allKeysFound && keyFound) {
@@ -371,9 +371,9 @@ void RunMod() {
 		If enabled, transfers found keys to memory and loads target content in emulator memory. Then it simulates to be the tag it has basically cloned.
 	*/
 	if ((transferToEml) && (allKeysFound)) {
-		
+
 		emlClearMem();
-		
+
 		uint8_t mblock[16];
 		for (uint16_t sectorNo = 0; sectorNo < sectorsCnt; sectorNo++) {
 			if (validKey[0][sectorNo] || validKey[1][sectorNo]) {
@@ -388,25 +388,25 @@ void RunMod() {
 			}
 		Dbprintf("\t✓ Found keys have been transferred to the emulator memory.");
 		if (ecfill) {
-			
+
 			Dbprintf("\tFilling in with key A.");
-			MifareECardLoad(sectorsCnt, 0, 0, &filled);			
+			MifareECardLoad(sectorsCnt, 0, 0, &filled);
 			if (filled != 1) {
 				Dbprintf("\t✕ Failed filling with A.");
 			}
-			
+
 			Dbprintf("\tFilling in with key B.");
 			MifareECardLoad(sectorsCnt, 1, 0, &filled);
 			if (filled != 1) {
 				Dbprintf("\t✕ Failed filling with B.");
 			}
-			
+
 			if ((filled == 1) && simulation) {
 				Dbprintf("\t✓ Filled, simulation started.");
-				
+
 				// This will tell the fpga to emulate using previous keys and current target tag content.
 				Dbprintf("\t Press button to abort simulation at anytime.");
-				
+
 				LED_B_ON(); // green
 				// assuming arg0==0,  use hardcoded uid 0xdeadbeaf
 				Mifare1ksim( FLAG_4B_UID_IN_DATA | FLAG_UID_IN_EMUL, 0, 0, uid);
@@ -454,5 +454,5 @@ void RunMod() {
 				LED_C_ON();
 			}
 		}
-	}	
+	}
 }
\ No newline at end of file
diff --git a/armsrc/Standalone/hf_young.c b/armsrc/Standalone/hf_young.c
index f4bc3db4f..3feb77a94 100644
--- a/armsrc/Standalone/hf_young.c
+++ b/armsrc/Standalone/hf_young.c
@@ -29,7 +29,7 @@ void RunMod() {
 	card_clone_t uids[OPTS];
 	iso14a_card_select_t card[OPTS];
 	uint8_t params = (MAGIC_SINGLE | MAGIC_DATAIN);
-					
+
 	LED(selected + 1, 0);
 
 	for (;;) {
@@ -54,7 +54,7 @@ void RunMod() {
 			for (;;) {
 				// exit from Standalone Mode,   send a usbcommand.
 				if (usb_poll_validate_length()) return;
-				
+
 				if (BUTTON_PRESS()) {
 					if (cardRead[selected]) {
 						Dbprintf("Button press detected -- replaying card in bank[%d]", selected);
@@ -68,21 +68,21 @@ void RunMod() {
 						SpinDelay(300);
 					}
 				}
-				
+
 				if (!iso14443a_select_card(NULL, &card[selected], NULL, true, 0, true)) {
 					continue;
 				} else {
-					Dbprintf("Read UID:"); 
+					Dbprintf("Read UID:");
 					Dbhexdump(card[selected].uidlen, card[selected].uid, 0);
-					
+
 					if (memcmp(uids[(selected+1)%OPTS].uid, card[selected].uid, card[selected].uidlen ) == 0 ) {
 						Dbprintf("Card selected has same UID as what is stored in the other bank. Skipping.");
-					} else {						
+					} else {
 						uids[selected].sak = card[selected].sak;
-						uids[selected].uidlen = card[selected].uidlen;						
-						memcpy(uids[selected].uid , card[selected].uid, uids[selected].uidlen);						
+						uids[selected].uidlen = card[selected].uidlen;
+						memcpy(uids[selected].uid , card[selected].uid, uids[selected].uidlen);
 						memcpy(uids[selected].atqa, card[selected].atqa, 2);
-												
+
 						if (uids[selected].uidlen > 4)
 							Dbprintf("Bank[%d] received a 7-byte UID", selected);
 						else
@@ -91,7 +91,7 @@ void RunMod() {
 					}
 				}
 			}
-			
+
 			Dbprintf("ATQA = %02X%02X", uids[selected].atqa[0], uids[selected].atqa[1]);
 			Dbprintf("SAK = %02X", uids[selected].sak);
 			LEDsoff();
@@ -108,7 +108,7 @@ void RunMod() {
 
 			cardRead[selected] = 1;
 		}
-		
+
 		/* MF Classic UID clone */
 		else if (iGotoClone==1) {
 			iGotoClone=0;
@@ -118,7 +118,7 @@ void RunMod() {
 
 			// magiccards holds 4bytes uid.  *usually*
 			uint32_t tmpuid = bytes_to_num(uids[selected].uid, 4);
-			
+
 			// record
 			Dbprintf("Preparing to Clone card [Bank: %d]; uid: %08x", selected, tmpuid);
 
@@ -175,7 +175,7 @@ void RunMod() {
 				// arg0 = workFlags, arg1 = blockNo, datain
 				MifareCSetBlock(params, 0, newBlock0);
 				MifareCGetBlock(params, 0, testBlock0);
-				
+
 				if (memcmp(testBlock0, newBlock0, 16)==0) {
 					DbpString("Cloned successfull!");
 					cardRead[selected] = 0; // Only if the card was cloned successfully should we clear it
@@ -190,9 +190,9 @@ void RunMod() {
 			LEDsoff();
 			LED(selected + 1, 0);
 		}
-		
+
 		// Change where to record (or begin playing)
-		// button_pressed == BUTTON_SINGLE_CLICK && cardRead[selected])		
+		// button_pressed == BUTTON_SINGLE_CLICK && cardRead[selected])
 		else if (playing==1) {
 			LEDsoff();
 			LED(selected + 1, 0);
@@ -203,7 +203,7 @@ void RunMod() {
 			for ( ; ; ) {
 				// exit from Standalone Mode,   send a usbcommand.
 				if (usb_poll_validate_length()) return;
-				
+
 				int button_action = BUTTON_HELD(1000);
 				if ( button_action == 0) { // No button action, proceed with sim
 
@@ -211,16 +211,16 @@ void RunMod() {
 					uint8_t data[USB_CMD_DATA_SIZE] = {0}; // in case there is a read command received we shouldn't break
 
 					memcpy(data, uids[selected].uid, uids[selected].uidlen);
-					
+
 					uint64_t tmpuid = bytes_to_num(uids[selected].uid, uids[selected].uidlen);
-								
+
 					if (  uids[selected].uidlen == 7 ) {
 						flags = FLAG_7B_UID_IN_DATA;
 						Dbprintf("Simulating ISO14443a tag with uid: %014" PRIx64 " [Bank: %d]", tmpuid, selected);
 					} else {
 						Dbprintf("Simulating ISO14443a tag with uid: %08" PRIx64 " [Bank: %d]", tmpuid, selected);
 					}
-					
+
 					if (uids[selected].sak == 0x08 && uids[selected].atqa[0] == 0x04 && uids[selected].atqa[1] == 0) {
 						DbpString("Mifare Classic 1k");
 						SimulateIso14443aTag(1, flags, data);
@@ -240,7 +240,7 @@ void RunMod() {
 						Dbprintf("Unrecognized tag type -- defaulting to Mifare Classic emulation");
 						SimulateIso14443aTag(1, flags, data);
 					}
-					
+
 				} else if (button_action == BUTTON_SINGLE_CLICK) {
 					selected = (selected + 1) % OPTS;
 					Dbprintf("Done playing. Switching to record mode on bank %d", selected);
diff --git a/armsrc/Standalone/hf_young.h b/armsrc/Standalone/hf_young.h
index 3ccd08b72..46c0d1361 100644
--- a/armsrc/Standalone/hf_young.h
+++ b/armsrc/Standalone/hf_young.h
@@ -16,7 +16,7 @@
 #include "standalone.h" // standalone definitions
 #include "iso14443a.h"
 #include "protocols.h"
- 
+
 #define OPTS 2
 
 #endif /* __HF_YOUNG_H */
\ No newline at end of file
diff --git a/armsrc/Standalone/lf_hidbrute.c b/armsrc/Standalone/lf_hidbrute.c
index 8c6b85f4f..f8b41771c 100644
--- a/armsrc/Standalone/lf_hidbrute.c
+++ b/armsrc/Standalone/lf_hidbrute.c
@@ -9,16 +9,16 @@
 // the license.
 //
 // PROXMARK3 - HID CORPORATE 1000 BRUTEFORCER (STAND-ALONE MODE)
-// 
+//
 // This version of Proxmark3 firmware adds one extra stand-alone mode to proxmark3 firmware.
 // The new stand-alone mode allows to execute a bruteforce on HID Corporate 1000 readers, by
 // reading a specific badge and bruteforcing the Card Number (incrementing and decrementing it),
 // mainteining the same Facility Code of the original badge.
 //
-// Based on an idea of Brad Antoniewicz of McAfee® Foundstone® Professional Services (ProxBrute), 
+// Based on an idea of Brad Antoniewicz of McAfee® Foundstone® Professional Services (ProxBrute),
 // the stand-alone mode has been rewritten in order to overcome some limitations of ProxBrute firmware,
 // that does not consider parity bits.
-//  
+//
 // https://github.com/federicodotta/proxmark3
 //
 //-----------------------------------------------------------------------------------
@@ -29,7 +29,7 @@
 // samy's sniff and repeat routine for LF
 void RunMod() {
 	StandAloneMode();
-	Dbprintf(">>  LF HID corporate bruteforce a.k.a CorporateBrute Started  <<");	
+	Dbprintf(">>  LF HID corporate bruteforce a.k.a CorporateBrute Started  <<");
 	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
 
 	uint32_t high[OPTS], low[OPTS];
@@ -40,9 +40,9 @@ void RunMod() {
 	// Turn on selected LED
 	LED(selected + 1, 0);
 
-	for (;;) {		
+	for (;;) {
 		WDT_HIT();
-		
+
 		// exit from SamyRun,   send a usbcommand.
 		if (usb_poll_validate_length()) break;
 
@@ -74,8 +74,8 @@ void RunMod() {
 			// Finished recording
 			// If we were previously playing, set playing off
 			// so next button push begins playing what we recorded
-			playing = 0;			
-			cardRead = 1;	
+			playing = 0;
+			cardRead = 1;
 		}
 		else if (button_pressed > 0 && cardRead == 1) {
 			LEDsoff();
@@ -101,8 +101,8 @@ void RunMod() {
 
 			// If we were previously playing, set playing off
 			// so next button push begins playing what we recorded
-			playing = 0;			
-			cardRead = 0;			
+			playing = 0;
+			cardRead = 0;
 		}
 
 		// Change where to record (or begin playing)
@@ -110,7 +110,7 @@ void RunMod() {
 			// Next option if we were previously playing
 			if (playing)
 				selected = (selected + 1) % OPTS;
-			
+
 			playing = !playing;
 
 			LEDsoff();
@@ -121,15 +121,15 @@ void RunMod() {
 
 				LED(LED_GREEN, 0);
 				DbpString("[=] playing");
-				
+
 				// wait for button to be released
 				while (BUTTON_PRESS())
 					WDT_HIT();
-				
+
 				Dbprintf("[=] %x %x %08x", selected, high[selected], low[selected]);
-				CmdHIDsimTAG(high[selected], low[selected], 0);		
+				CmdHIDsimTAG(high[selected], low[selected], 0);
 				DbpString("[=] done playing");
-				
+
 				if (BUTTON_HELD(1000) > 0)
 					goto out;
 
@@ -144,9 +144,9 @@ void RunMod() {
 			}
 			else if (playing && selected == 2)
 			{
-				// Now it work only with HID Corporate 1000 (35bit), but is easily extensible to others RFID. 
-				// It is necessary only to calculate the correct parity. 
-				
+				// Now it work only with HID Corporate 1000 (35bit), but is easily extensible to others RFID.
+				// It is necessary only to calculate the correct parity.
+
 				// Brute force code
 				// Check if the badge is an HID Corporate 1000
 				if( (high[selected] & 0xFFFFFFF8) != 0x28 ) {
@@ -159,7 +159,7 @@ void RunMod() {
 				// wait for button to be released
 				while (BUTTON_PRESS())
 					WDT_HIT();
-				
+
 				// Calculate Facility Code and Card Number from high and low
 				uint32_t cardnum = (low[selected] >> 1) & 0xFFFFF;
 				uint32_t fc = ((high[selected] & 1 ) << 11 ) | (low[selected] >> 21);
@@ -168,13 +168,13 @@ void RunMod() {
 				Dbprintf("[=] Proxbrute - starting decrementing card number");
 
 				while (cardnum >= 0) {
-				
+
 					// Needed for exiting from proxbrute when button is pressed
 					if (BUTTON_PRESS()) {
 						if (BUTTON_HELD(1000) > 0) {
-							goto out;							
+							goto out;
 						} else {
-							while (BUTTON_PRESS()) { 
+							while (BUTTON_PRESS()) {
 								WDT_HIT();
 							}
 							break;
@@ -189,7 +189,7 @@ void RunMod() {
 
 					// Print actual code to brute
 					Dbprintf("[=] TAG ID: %x%08x (%d) - FC: %u - Card: %u", high[selected], low[selected], (low[selected] >> 1) & 0xFFFF, fc, cardnum);
-			
+
 					CmdHIDsimTAGEx(high[selected], low[selected], 1, 50000);
 				}
 
@@ -198,12 +198,12 @@ void RunMod() {
 				Dbprintf("[=] Proxbrute - starting incrementing card number");
 
 				while (cardnum <= 0xFFFFF) {
-					
+
 					// Needed for exiting from proxbrute when button is pressed
 					if (BUTTON_PRESS()) {
 						if (BUTTON_HELD(1000) > 0) {
 							goto out;
-						} else {							
+						} else {
 							while (BUTTON_PRESS()) { WDT_HIT(); }
 							break;
 						}
@@ -233,32 +233,32 @@ void RunMod() {
 				playing = !playing;
 				LEDsoff();
 				LED(selected + 1, 0);
-				
+
 			} else {
 				while(BUTTON_PRESS())
 					WDT_HIT();
 			}
 		}
 	}
-	
-out:	
+
+out:
 	DbpString("[=] exiting");
-	LEDsoff();	
+	LEDsoff();
 }
 
 // Function that calculate next value for the brutforce of HID corporate 1000
 void hid_corporate_1000_calculate_checksum_and_set( uint32_t *high, uint32_t *low, uint32_t cardnum, uint32_t fc) {
 
 	uint32_t new_high = 0;
-	uint32_t new_low = 0;	
+	uint32_t new_low = 0;
 
 	// Calculate new high and low base value from card number and facility code, without parity
-	new_low = (fc << 21) | (cardnum << 1); 
+	new_low = (fc << 21) | (cardnum << 1);
 	new_high = 0x28 | ((fc >> 11) & 1); // 0x28 is 101000
 
 	int n_ones;
 	uint32_t i;
-	
+
 	// Calculating and setting parity bit 34
 	// Select only bit used for parity bit 34 in low number (10110110110110110110110110110110)
 	uint32_t parity_bit_34_low = new_low & 0xB6DB6DB6;
@@ -271,7 +271,7 @@ void hid_corporate_1000_calculate_checksum_and_set( uint32_t *high, uint32_t *lo
 	// Calculate number of ones in high number
 	if (new_high & 1)
 		n_ones++;
-	
+
 	// Set parity bit (Even parity)
 	if (n_ones % 2)
 		new_high = new_high | 0x2;
@@ -289,14 +289,14 @@ void hid_corporate_1000_calculate_checksum_and_set( uint32_t *high, uint32_t *lo
 	// Calculate number of ones in high number
 	if ( new_high & 0x1)
 		n_ones++;
-	
+
 	if ( new_high & 0x2)
 		n_ones++;
-	
+
 	// Set parity bit (Odd parity)
 	if (!(n_ones % 2))
 		new_low = new_low | 0x1;
-	
+
 	// Calculating and setting parity bit 35
 	n_ones = 0;
 	// Calculate number of ones in low number (all bit of low, bitmask unnecessary)
@@ -307,7 +307,7 @@ void hid_corporate_1000_calculate_checksum_and_set( uint32_t *high, uint32_t *lo
 	// Calculate number of ones in high number
 	if ( new_high & 0x1)
 		n_ones++;
-	
+
 	if ( new_high & 0x2)
 		n_ones++;
 
diff --git a/armsrc/Standalone/lf_proxbrute.c b/armsrc/Standalone/lf_proxbrute.c
index 69b5f5331..268a96eec 100644
--- a/armsrc/Standalone/lf_proxbrute.c
+++ b/armsrc/Standalone/lf_proxbrute.c
@@ -7,14 +7,14 @@
 // at your option, any later version. See the LICENSE.txt file for the text of
 // the license.
 //-----------------------------------------------------------------------------
-// main code for LF aka Proxbrute by Brad antoniewicz 
+// main code for LF aka Proxbrute by Brad antoniewicz
 //-----------------------------------------------------------------------------
 #include "lf_proxbrute.h"
 
 // samy's sniff and repeat routine for LF
 void RunMod() {
 	StandAloneMode();
-	Dbprintf(">>  LF HID proxII bruteforce a.k.a ProxBrute Started (Brad Antoniewicz) <<");		
+	Dbprintf(">>  LF HID proxII bruteforce a.k.a ProxBrute Started (Brad Antoniewicz) <<");
 	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
 
 	uint32_t high[OPTS], low[OPTS];
@@ -25,9 +25,9 @@ void RunMod() {
 	// Turn on selected LED
 	LED(selected + 1, 0);
 
-	for (;;) {		
+	for (;;) {
 		WDT_HIT();
-		
+
 		// exit from SamyRun,   send a usbcommand.
 		if (usb_poll_validate_length()) break;
 
@@ -59,8 +59,8 @@ void RunMod() {
 			// Finished recording
 			// If we were previously playing, set playing off
 			// so next button push begins playing what we recorded
-			playing = 0;			
-			cardRead = 1;	
+			playing = 0;
+			cardRead = 1;
 		}
 		else if (button_pressed > 0 && cardRead == 1) {
 			LEDsoff();
@@ -86,8 +86,8 @@ void RunMod() {
 
 			// If we were previously playing, set playing off
 			// so next button push begins playing what we recorded
-			playing = 0;			
-			cardRead = 0;			
+			playing = 0;
+			cardRead = 0;
 		}
 
 		// Change where to record (or begin playing)
@@ -107,7 +107,7 @@ void RunMod() {
 				// wait for button to be released
 				while (BUTTON_PRESS())
 					WDT_HIT();
-				
+
 				/* START PROXBRUTE */
 
 				/*
@@ -144,7 +144,7 @@ void RunMod() {
 
 				/*   END PROXBRUTE */
 
-				
+
 				if (BUTTON_HELD(1000) > 0)
 					goto out;
 
@@ -163,7 +163,7 @@ void RunMod() {
 			}
 		}
 	}
-out:	
+out:
 	DbpString("[=] exiting");
-	LEDsoff();	
+	LEDsoff();
 }
\ No newline at end of file
diff --git a/armsrc/Standalone/lf_samyrun.c b/armsrc/Standalone/lf_samyrun.c
index c94d5fc42..c96a2ced6 100644
--- a/armsrc/Standalone/lf_samyrun.c
+++ b/armsrc/Standalone/lf_samyrun.c
@@ -6,14 +6,14 @@
 // at your option, any later version. See the LICENSE.txt file for the text of
 // the license.
 //-----------------------------------------------------------------------------
-// main code for LF aka SamyRun by Samy Kamkar 
+// main code for LF aka SamyRun by Samy Kamkar
 //-----------------------------------------------------------------------------
 #include "lf_samyrun.h"
 
 // samy's sniff and repeat routine for LF
 void RunMod() {
 	StandAloneMode();
-	Dbprintf(">>  LF HID Read/Clone/Sim a.k.a SamyRun Started  <<");		
+	Dbprintf(">>  LF HID Read/Clone/Sim a.k.a SamyRun Started  <<");
 	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
 
 	uint32_t high[OPTS], low[OPTS];
@@ -24,15 +24,15 @@ void RunMod() {
 	// Turn on selected LED
 	LED(selected + 1, 0);
 
-	for (;;) {		
+	for (;;) {
 		WDT_HIT();
-		
+
 		// exit from SamyRun,   send a usbcommand.
 		if (usb_poll_validate_length()) break;
 
 		// Was our button held down or pressed?
 		int button_pressed = BUTTON_HELD(1000);
-		
+
 		Dbprintf("button %d", button_pressed);
 		SpinDelay(300);
 
@@ -60,7 +60,7 @@ void RunMod() {
 			// Finished recording
 			// If we were previously playing, set playing off
 			// so next button push begins playing what we recorded
-			playing = 0;			
+			playing = 0;
 			cardRead = 1;
 
 			gotCard	= true;
@@ -89,8 +89,8 @@ void RunMod() {
 
 			// If we were previously playing, set playing off
 			// so next button push begins playing what we recorded
-			playing = 0;			
-			cardRead = 0;			
+			playing = 0;
+			cardRead = 0;
 		}
 
 		// Change where to record (or begin playing)
@@ -98,7 +98,7 @@ void RunMod() {
 			// Next option if we were previously playing
 			if (playing)
 				selected = (selected + 1) % OPTS;
-			
+
 			playing = !playing;
 
 			LEDsoff();
@@ -106,18 +106,18 @@ void RunMod() {
 
 			// Begin transmitting
 			if (playing) {
-				
+
 				LED(LED_GREEN, 0);
 				DbpString("[=] playing");
-				
+
 				// wait for button to be released
 				while (BUTTON_PRESS())
 					WDT_HIT();
-				
+
 				Dbprintf("[=] %x %x %08x", selected, high[selected], low[selected]);
-				CmdHIDsimTAG(high[selected], low[selected], false);		
+				CmdHIDsimTAG(high[selected], low[selected], false);
 				DbpString("[=] done playing");
-				
+
 				if (BUTTON_HELD(1000) > 0)
 					goto out;
 
@@ -137,7 +137,7 @@ void RunMod() {
 		}
 	}
 
-out:	
+out:
 	DbpString("[=] exiting");
 	LEDsoff();
 }
\ No newline at end of file
diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 5002a7138..68b51913f 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -48,7 +48,7 @@
 // is the order in which they go out on the wire.
 //=============================================================================
 
-#define TOSEND_BUFFER_SIZE (9*MAX_FRAME_SIZE + 1 + 1 + 2)  // 8 data bits and 1 parity bit per payload byte, 1 correction bit, 1 SOC bit, 2 EOC bits 
+#define TOSEND_BUFFER_SIZE (9*MAX_FRAME_SIZE + 1 + 1 + 2)  // 8 data bits and 1 parity bit per payload byte, 1 correction bit, 1 SOC bit, 2 EOC bits
 uint8_t ToSend[TOSEND_BUFFER_SIZE];
 int ToSendMax = -1;
 static int ToSendBit;
@@ -114,13 +114,13 @@ void DbpStringEx(char *str, uint32_t cmd) {
 #if DEBUG
 	uint8_t len = strlen(str);
 	cmd_send(CMD_DEBUG_PRINT_STRING, len, cmd, 0, (uint8_t*)str, len);
-#endif	
+#endif
 }
 
 void DbpString(char *str) {
 #if DEBUG
 	DbpStringEx(str, 0);
-#endif	
+#endif
 }
 
 #if 0
@@ -138,7 +138,7 @@ void DbprintfEx(uint32_t cmd, const char *fmt, ...) {
 	va_end(ap);
 
 	DbpStringEx(output_string, cmd);
-#endif	
+#endif
 }
 
 void Dbprintf(const char *fmt, ...) {
@@ -152,7 +152,7 @@ void Dbprintf(const char *fmt, ...) {
 	va_end(ap);
 
 	DbpString(output_string);
-#endif	
+#endif
 }
 
 // prints HEX & ASCII
@@ -160,30 +160,30 @@ void Dbhexdump(int len, uint8_t *d, bool bAsci) {
 #if DEBUG
 	int l=0, i;
 	char ascii[9];
-    
+
 	while (len > 0) {
 
 		l = (len > 8) ? 8 : len;
-		
+
 		memcpy(ascii, d, l);
 		ascii[l] = 0;
-		
+
 		// filter safe ascii
 		for (i=0; i<l; i++) {
             if (ascii[i] < 32 || ascii[i] > 126) {
                 ascii[i] = '.';
 			}
         }
-		
+
 		if (bAsci)
 			Dbprintf("%-8s %*D", ascii, l, d, " ");
 		else
 			Dbprintf("%*D", l, d, " ");
-        
+
 		len -= 8;
-		d += 8;		
+		d += 8;
 	}
-#endif	
+#endif
 }
 
 //-----------------------------------------------------------------------------
@@ -193,17 +193,17 @@ void Dbhexdump(int len, uint8_t *d, bool bAsci) {
 //-----------------------------------------------------------------------------
 static uint16_t ReadAdc(int ch) {
 
-	// Note: ADC_MODE_PRESCALE and ADC_MODE_SAMPLE_HOLD_TIME are set to the maximum allowed value. 
+	// Note: ADC_MODE_PRESCALE and ADC_MODE_SAMPLE_HOLD_TIME are set to the maximum allowed value.
 	// AMPL_HI is are high impedance (10MOhm || 1MOhm) output, the input capacitance of the ADC is 12pF (typical). This results in a time constant
-	// of RC = (0.91MOhm) * 12pF = 10.9us. Even after the maximum configurable sample&hold time of 40us the input capacitor will not be fully charged. 
-	// 
+	// of RC = (0.91MOhm) * 12pF = 10.9us. Even after the maximum configurable sample&hold time of 40us the input capacitor will not be fully charged.
+	//
 	// The maths are:
 	// If there is a voltage v_in at the input, the voltage v_cap at the capacitor (this is what we are measuring) will be
 	//
 	//       v_cap = v_in * (1 - exp(-SHTIM/RC))  =   v_in * (1 - exp(-40us/10.9us))  =  v_in * 0,97                   (i.e. an error of 3%)
 
 	AT91C_BASE_ADC->ADC_CR = AT91C_ADC_SWRST;
-    AT91C_BASE_ADC->ADC_MR = 
+    AT91C_BASE_ADC->ADC_MR =
 				  ADC_MODE_PRESCALE(63)				// ADC_CLK = MCK / ((63+1) * 2) = 48MHz / 128 = 375kHz
 				| ADC_MODE_STARTUP_TIME(1)			// Startup Time = (1+1) * 8 / ADC_CLK = 16 / 375kHz = 42,7us   Note: must be > 20us
 				| ADC_MODE_SAMPLE_HOLD_TIME(15);	// Sample & Hold Time SHTIM = 15 / ADC_CLK = 15 / 375kHz = 40us
@@ -216,7 +216,7 @@ static uint16_t ReadAdc(int ch) {
 	return (AT91C_BASE_ADC->ADC_CDR[ch] & 0x3FF);
 }
 
-// was static - merlok 
+// was static - merlok
 uint16_t AvgAdc(int ch) {
 	uint16_t a = 0;
 	for(uint8_t i = 0; i < 32; i++)
@@ -243,11 +243,11 @@ void MeasureAntennaTuning(void) {
  * the resonating frequency of your LF antenna
  * ( hopefully around 95 if it is tuned to 125kHz!)
  */
-  
+
   	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | FPGA_LF_ADC_READER_FIELD);
 	SpinDelay(50);
-	
+
 	for  (i = 255; i >= 19; i--) {
 		WDT_HIT();
 		FpgaSendCommand(FPGA_CMD_SET_DIVISOR, i);
@@ -262,10 +262,10 @@ void MeasureAntennaTuning(void) {
 		if(LF_Results[i] > peak) {
 			peakv = adcval;
 			peakf = i;
-			peak = LF_Results[i];			
+			peak = LF_Results[i];
 		}
-	}	
-	
+	}
+
 	LED_A_ON();
 	// Let the FPGA drive the high-frequency antenna around 13.56 MHz.
 	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
@@ -277,15 +277,15 @@ void MeasureAntennaTuning(void) {
 	if ( v_hf > MAX_ADC_HF_VOLTAGE-300 ) {
 		v_hf = (MAX_ADC_HF_VOLTAGE_RDV40 * AvgAdc(ADC_CHAN_HF_RDV40)) >> 10;
 	}
-	
+
 	uint64_t arg0 = v_lf134;
 	arg0 <<= 32;
 	arg0 |= v_lf125;
-	
+
 	uint64_t arg2 = peakv;
 	arg2 <<= 32;
 	arg2 |= peakf;
-	
+
 	cmd_send(CMD_MEASURED_ANTENNA_TUNING, arg0, v_hf, arg2, LF_Results, 256);
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 	LEDsoff();
@@ -299,7 +299,7 @@ void MeasureAntennaTuningHf(void) {
 	SpinDelay(50);
 	volt = (MAX_ADC_HF_VOLTAGE * AvgAdc(ADC_CHAN_HF)) >> 10;
 	bool use_high = ( volt > MAX_ADC_HF_VOLTAGE-300 );
-			
+
 	while( !BUTTON_PRESS() ){
 		SpinDelay(20);
 		if ( !use_high ) {
@@ -334,7 +334,7 @@ void SendVersion(void) {
 	char *bootrom_version = *(char**)&_bootphase1_version_pointer;
 
 	strncat(VersionString, " [ ARM ]\n", sizeof(VersionString) - strlen(VersionString) - 1);
-	
+
 	if( bootrom_version < &_flash_start || bootrom_version >= &_flash_end ) {
 		strcat(VersionString, "bootrom version information appears invalid\n");
 	} else {
@@ -346,7 +346,7 @@ void SendVersion(void) {
 	strncat(VersionString, temp, sizeof(VersionString) - strlen(VersionString) - 1);
 
 	strncat(VersionString, "\n [ FPGA ]\n", sizeof(VersionString) - strlen(VersionString) - 1);
-	
+
 	for (int i = 0; i < fpga_bitstream_num; i++) {
 		strncat(VersionString, fpga_version_information[i], sizeof(VersionString) - strlen(VersionString) - 1);
 		if (i < fpga_bitstream_num - 1) {
@@ -384,23 +384,23 @@ void printUSBSpeed(void) {
 	Dbprintf("  Bytes transferred.......%d", bytes_transferred);
     Dbprintf("  USB Transfer Speed PM3 -> Client = %d Bytes/s", 1000 * bytes_transferred / (end_time - start_time));
 }
-	
+
 /**
   * Prints runtime information about the PM3.
 **/
 void SendStatus(void) {
 	BigBuf_print_status();
 	Fpga_print_status();
-#ifdef WITH_FLASH	
+#ifdef WITH_FLASH
 	Flashmem_print_status();
 #endif
-#ifdef WITH_SMARTCARD	
+#ifdef WITH_SMARTCARD
 	I2C_print_status();
-#endif	
+#endif
 #ifdef WITH_LF
 	printConfig(); 		// LF Sampling config
 	printT55xxConfig();	// LF T55XX Config
-#endif	
+#endif
 	printUSBSpeed();
 	Dbprintf("Various");
 	Dbprintf("  MF_DBGLEVEL.............%d", MF_DBGLEVEL);
@@ -413,9 +413,9 @@ void SendStatus(void) {
 
 // Show some leds in a pattern to identify StandAlone mod is running
 void StandAloneMode(void) {
-	
+
 	DbpString("Stand-alone mode! No PC necessary.");
-	
+
 	SpinDown(50);
     SpinOff(50);
     SpinUp(50);
@@ -428,7 +428,7 @@ void StandAloneMode(void) {
 void printStandAloneModes(void) {
 
 	DbpString("Installed StandAlone Mode");
-	
+
 #if defined(WITH_LF_ICERUN)
 	DbpString("   LF sniff/clone/simulation -  aka IceRun (iceman)");
 #endif
@@ -440,13 +440,13 @@ void printStandAloneModes(void) {
 #endif
 #if defined(WITH_LF_PROXBRUTE)
 	DbpString("   LF HID ProxII bruteforce - aka Proxbrute (Brad Antoniewicz)");
-#endif 
+#endif
 #if defined(WITH_LF_HIDBRUTE)
 	DbpString("   LF HID corporate 1000 bruteforce - aka Corporatebrute (Federico dotta & Maurizio Agazzini)");
-#endif 
+#endif
 #if defined(WITH_HF_MATTYRUN)
 	DbpString("   HF Mifare sniff/clone - aka MattyRun (Matías A. Ré Medina)");
-#endif 
+#endif
 #if defined(WITH_HF_COLIN)
     DbpString("   HF Mifare ultra fast sniff/sim/clone - aka VIGIKPWN (Colin Brigato)");
 #endif
@@ -454,16 +454,16 @@ void printStandAloneModes(void) {
 	DbpString("   HF 14a sniff standalone with ULC/ULEV1/NTAG auth storing in flashmem - aka BogitoRun (Bogito)");
 #endif
 
-	//DbpString("Running ");	
-	//Dbprintf("  Is Device attached to USB| %s", USB_ATTACHED() ? "Yes" : "No"); 
-	//Dbprintf("  Is Device attached to FPC| %s", 0 ? "Yes" : "No"); 
+	//DbpString("Running ");
+	//Dbprintf("  Is Device attached to USB| %s", USB_ATTACHED() ? "Yes" : "No");
+	//Dbprintf("  Is Device attached to FPC| %s", 0 ? "Yes" : "No");
 	//Dbprintf("  Is USB_reconnect value   | %d", GetUSBreconnect() );
 	//Dbprintf("  Is USB_configured value  | %d", GetUSBconfigured() );
-	
+
 	//.. add your own standalone detection based on with compiler directive you are used.
 	// don't "reuse" the already taken ones, this will make things easier when trying to detect the different modes
 	// 2017-08-06  must adapt the makefile and have individual compilation flags for all mods
-	// 
+	//
 }
 
 /*
@@ -529,7 +529,7 @@ void ListenReaderField(int limit) {
 	hf_av = hf_max = AvgAdc(ADC_CHAN_HF);
 
 	// iceman,  useless,  since we are measuring readerfield,  not our field.  My tests shows a max of 20v from a reader.
-	// RDV40 will hit the roof, try other ADC channel used in that hardware revision.	
+	// RDV40 will hit the roof, try other ADC channel used in that hardware revision.
 	bool use_high = ( ((MAX_ADC_HF_VOLTAGE * hf_max) >> 10) > MAX_ADC_HF_VOLTAGE-300 );
 	if ( use_high ) {
 		hf_av = hf_max = AvgAdc(ADC_CHAN_HF_RDV40);
@@ -561,7 +561,7 @@ void ListenReaderField(int limit) {
 
 		if (limit != HF_ONLY) {
 			if(mode == 1) {
-				if (ABS(lf_av - lf_baseline) > REPORT_CHANGE) 
+				if (ABS(lf_av - lf_baseline) > REPORT_CHANGE)
 					LED_D_ON();
 				else
 					LED_D_OFF();
@@ -579,7 +579,7 @@ void ListenReaderField(int limit) {
 
 		if (limit != LF_ONLY) {
 			if (mode == 1){
-				if (ABS(hf_av - hf_baseline) > REPORT_CHANGE) 	
+				if (ABS(hf_av - hf_baseline) > REPORT_CHANGE)
 					LED_B_ON();
 				else
 					LED_B_OFF();
@@ -620,7 +620,7 @@ void ListenReaderField(int limit) {
 					if (LIGHT_SCHEME[i] & 0x8) LED_D_ON(); else LED_D_OFF();
 					break;
 				}
-			}		
+			}
 		}
 	}
 }
@@ -629,12 +629,12 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 	UsbCommand *c = (UsbCommand *)packet;
 
 	//Dbprintf("received %d bytes, with command: 0x%04x and args: %d %d %d", len, c->cmd, c->arg[0], c->arg[1], c->arg[2]);
-  
+
 	switch(c->cmd) {
 #ifdef WITH_LF
 		case CMD_SET_LF_T55XX_CONFIG:
 			setT55xxConfig( c->arg[0], (t55xx_config *) c->d.asBytes);
-			break;			
+			break;
 		case CMD_SET_LF_SAMPLING_CONFIG:
 			setSamplingConfig((sample_config *) c->d.asBytes);
 			break;
@@ -695,7 +695,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 			WriteTItag(c->arg[0],c->arg[1],c->arg[2]);
 			break;
 		case CMD_SIMULATE_TAG_125K:
-			LED_A_ON();		
+			LED_A_ON();
 			SimulateTagLowFrequency(c->arg[0], c->arg[1], 1);
 			LED_A_OFF();
 			break;
@@ -703,7 +703,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 			SimulateTagLowFrequencyBidir(c->arg[0], c->arg[1]);
 			break;
 		case CMD_INDALA_CLONE_TAG:
-			CopyIndala64toT55x7(c->arg[0], c->arg[1]);					
+			CopyIndala64toT55x7(c->arg[0], c->arg[1]);
 			break;
 		case CMD_INDALA_CLONE_TAG_L:
 			CopyIndala224toT55x7(
@@ -711,11 +711,11 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 				c->d.asDwords[4], c->d.asDwords[5], c->d.asDwords[6]
 				);
 			break;
-		case CMD_T55XX_READ_BLOCK: {				
+		case CMD_T55XX_READ_BLOCK: {
 			T55xxReadBlock(c->arg[0], c->arg[1], c->arg[2]);
 			break;
 		}
-		case CMD_T55XX_WRITE_BLOCK:		
+		case CMD_T55XX_WRITE_BLOCK:
 			T55xxWriteBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes[0]);
 			break;
 		case CMD_T55XX_WAKEUP:
@@ -732,11 +732,11 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 			break;
 		case CMD_PCF7931_WRITE:
 			WritePCF7931(
-				c->d.asBytes[0], c->d.asBytes[1], c->d.asBytes[2], c->d.asBytes[3], 
+				c->d.asBytes[0], c->d.asBytes[1], c->d.asBytes[2], c->d.asBytes[3],
 				c->d.asBytes[4], c->d.asBytes[5], c->d.asBytes[6], c->d.asBytes[9],
-                c->d.asBytes[7] - 128, c->d.asBytes[8] - 128, 
-				c->arg[0], 
-				c->arg[1], 
+                c->d.asBytes[7] - 128, c->d.asBytes[8] - 128,
+				c->arg[0],
+				c->arg[1],
 				c->arg[2]
 				);
 			break;
@@ -800,7 +800,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 			break;
 		case CMD_ISO_15693_FIND_AFI:
 			BruteforceIso15693Afi(c->arg[0]);
-			break;	
+			break;
 		case CMD_READER_ISO_15693:
 			ReaderIso15693(c->arg[0]);
 			break;
@@ -818,7 +818,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 			break;
 		case CMD_READER_LEGIC_RF:
 			LegicRfReader(c->arg[0], c->arg[1], c->arg[2]);
-			break;			
+			break;
 		case CMD_LEGIC_INFO:
 			LegicRfInfo();
 			break;
@@ -878,7 +878,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 			break;
 		case CMD_ANTIFUZZ_ISO_14443a:
 			iso14443a_antifuzz(c->arg[0]);
-			break;			
+			break;
 		case CMD_EPA_PACE_COLLECT_NONCE:
 			EPA_PACE_Collect_Nonce(c);
 			break;
@@ -900,7 +900,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 		case CMD_MIFAREU_READCARD:
 			MifareUReadCard(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
 			break;
-		case CMD_MIFAREUC_SETPWD: 
+		case CMD_MIFAREUC_SETPWD:
 			MifareUSetPwd(c->arg[0], c->d.asBytes);
 			break;
 		case CMD_MIFARE_READSC:
@@ -935,7 +935,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 		case CMD_SIMULATE_MIFARE_CARD:
 			Mifare1ksim(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
 			break;
-		
+
 		// emulator
 		case CMD_MIFARE_SET_DBGMODE:
 			MifareSetDbgLvl(c->arg[0]);
@@ -952,7 +952,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 		case CMD_MIFARE_EML_CARDLOAD:
 			MifareECardLoad(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
 			break;
-			
+
 		// Work with "magic Chinese" card
 		case CMD_MIFARE_CSETBLOCK:
 			MifareCSetBlock(c->arg[0], c->arg[1], c->d.asBytes);
@@ -1071,35 +1071,35 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 		}
         case CMD_SMART_UPGRADE: {
 			SmartCardUpgrade(c->arg[0]);
-            break;	
+            break;
 		}
-#endif    
+#endif
 
 #ifdef WITH_FPC
 		case CMD_FPC_SEND: {
 
-		
+
 			StartTicks();
 			DbpString("Mutual USB/FPC sending from device to client");
-	
+
 			/*
 			char at[11] = {'\0'};
 			static const char* s_at = "AT+BAUD8\0D\0A";
-			strncat(at, s_at, sizeof(at) - strlen(at) - 1);			
+			strncat(at, s_at, sizeof(at) - strlen(at) - 1);
 			DbpString("Try AT baud rate setting");
 			usart_init();
 			int16_t res = usart_writebuffer((uint8_t*)&at, sizeof(at));
 			WaitMS(1);
 			Dbprintf("SEND %d | %c%c%c%c%c%c%c%c%c%c%c", res,  at[0], at[1], at[2], at[3], at[4], at[5], at[6], at[7], at[8], at[9], at[10]);
-			
+
 			uint8_t my_rx[20];
 			memset(my_rx, 0, sizeof(my_rx));
 			res = usart_readbuffer(my_rx, sizeof(my_rx));
 			WaitMS(1);
 			Dbprintf("GOT  %d | %c%c%c%c%c%c%c%c", res,  my_rx[0], my_rx[1], my_rx[2], my_rx[3], my_rx[4], my_rx[5], my_rx[6], my_rx[7]);
 			*/
-			
-			
+
+
 			char dest[USB_CMD_DATA_SIZE] = { '\0' };
 			static const char* welcome = "Proxmark3 Serial interface via FPC ready\n";
 			strncat(dest, welcome, sizeof(dest) - strlen(dest) - 1);
@@ -1109,27 +1109,27 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 						, c->d.asBytes[2]
 						, c->d.asBytes[3]
 						);
-			
+
 			UsbCommand txcmd = { CMD_DEBUG_PRINT_STRING, { strlen(dest), 0, 0 } };
-			memcpy(txcmd.d.asBytes, dest, sizeof(dest));		
+			memcpy(txcmd.d.asBytes, dest, sizeof(dest));
 
 			LED_A_ON();
-			
-			usart_init();			
+
+			usart_init();
 			usart_writebuffer((uint8_t*)&txcmd, sizeof(UsbCommand));
-			
+
 			//usb
 			cmd_send(CMD_DEBUG_PRINT_STRING, strlen(dest), 0, 0, dest, strlen(dest));
 			LED_A_OFF();
-			
-			
+
+
 			/*
 			uint8_t my_rx[sizeof(UsbCommand)];
 			while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
 				LED_B_INV();
 				if (usart_readbuffer(my_rx, sizeof(UsbCommand)) ) {
 					//UsbPacketReceived(my_rx, sizeof(my_rx));
-					
+
 					UsbCommand *my = (UsbCommand *)my_rx;
 					if (mc->cmd > 0 ) {
 						Dbprintf("received command: 0x%04x and args: %d %d %d", my->cmd, my->arg[0], my->arg[1], my->arg[2]);
@@ -1179,11 +1179,11 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 			// arg1 = length bytes to transfer
 			// arg2 = BigBuf tracelen
 			//Dbprintf("transfer to client parameters: %" PRIu32 " | %" PRIu32 " | %" PRIu32, startidx, numofbytes, c->arg[2]);
-			
+
 			for(size_t i = 0; i < numofbytes; i += USB_CMD_DATA_SIZE) {
 				len = MIN( (numofbytes - i), USB_CMD_DATA_SIZE);
 				isok = cmd_send(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K, i, len, BigBuf_get_traceLen(), mem + startidx + i, len);
-				if (isok != 0) 
+				if (isok != 0)
 					Dbprintf("transfer to client failed ::  | bytes between %d - %d (%d)", i, i+len, len);
 			}
 			// Trigger a finish downloading signal with an ACK frame
@@ -1196,18 +1196,18 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 			LED_B_OFF();
 			break;
 		}
-#endif		
+#endif
 		case CMD_UPLOAD_SIM_SAMPLES_125K: {
 			// iceman; since changing fpga_bitstreams clears bigbuff, Its better to call it before.
-			// to be able to use this one for uploading data to device 
-			// arg1 = 0 upload for LF usage 
+			// to be able to use this one for uploading data to device
+			// arg1 = 0 upload for LF usage
 			//        1 upload for HF usage
 			#define FPGA_LF 1
 			if ( c->arg[1] == FPGA_LF )
 				FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-			else 
+			else
 				FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-			
+
 			uint8_t *mem = BigBuf_get_addr();
 			memcpy( mem + c->arg[0], c->d.asBytes, USB_CMD_DATA_SIZE);
 			cmd_send(CMD_ACK,1,0,0,0,0);
@@ -1216,7 +1216,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 		case CMD_DOWNLOAD_EML_BIGBUF: {
 			LED_B_ON();
 			uint8_t *mem = BigBuf_get_EM_addr();
-			bool isok = false;			
+			bool isok = false;
 			size_t len = 0;
 			uint32_t startidx = c->arg[0];
 			uint32_t numofbytes = c->arg[1];
@@ -1228,7 +1228,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 			for (size_t i = 0; i < numofbytes; i += USB_CMD_DATA_SIZE) {
 				len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);
 				isok = cmd_send(CMD_DOWNLOADED_EML_BIGBUF, i, len, 0, mem + startidx + i, len);
-				if (isok != 0) 
+				if (isok != 0)
 					Dbprintf("transfer to client failed ::  | bytes between %d - %d (%d)", i, i+len, len);
 			}
 			// Trigger a finish downloading signal with an ACK frame
@@ -1239,7 +1239,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 		case CMD_READ_MEM:
 			ReadMem(c->arg[0]);
 			break;
-#ifdef WITH_FLASH	
+#ifdef WITH_FLASH
 		case CMD_FLASHMEM_SET_SPIBAUDRATE:
 			FlashmemSetSpiBaudrate(c->arg[0]);
 			break;
@@ -1248,20 +1248,20 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 			uint16_t isok = 0;
 			uint32_t startidx = c->arg[0];
 			uint16_t len = c->arg[1];
-			
+
 			Dbprintf("FlashMem read | %d - %d | ", startidx, len);
-			
+
 			size_t size = MIN(USB_CMD_DATA_SIZE, len);
-			
+
 			if (!FlashInit()) {
    		       break;
   		    }
 
 			uint8_t *mem = BigBuf_malloc(size);
-			
+
 			for(size_t i = 0; i < len; i += size) {
 				len = MIN((len - i), size);
-				
+
 				Dbprintf("FlashMem reading  | %d | %d | %d |", startidx + i, i, len);
 				isok = Flash_ReadDataCont(startidx + i, mem, len);
 				if ( isok == len ) {
@@ -1283,16 +1283,16 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 			uint32_t startidx = c->arg[0];
 			uint16_t len = c->arg[1];
 			uint8_t* data = c->d.asBytes;
-			
+
 			uint32_t tmp = startidx + len;
-			
+
   			if (!FlashInit()) {
    		       break;
   		    }
 
   		    Flash_CheckBusy(BUSY_TIMEOUT);
   		    Flash_WriteEnable();
-			
+
 			if ( startidx == DEFAULT_T55XX_KEYS_OFFSET  )
 				Flash_Erase4k(3, 0xC);
 			else if (startidx ==  DEFAULT_MF_KEYS_OFFSET )
@@ -1301,33 +1301,33 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 				Flash_Erase4k(3, 0xA);
 
   		    Flash_CheckBusy(BUSY_TIMEOUT);
-  		    Flash_WriteEnable();			
-			
+  		    Flash_WriteEnable();
+
 			// inside 256b page?
-			if ( (tmp & 0xFF) != 0) {				
-				
+			if ( (tmp & 0xFF) != 0) {
+
 					// is offset+len larger than a page
 					tmp =  (startidx & 0xFF ) + len;
 					if (tmp > 0xFF ) {
-					
+
 						// data spread over two pages.
-						
-						// offset xxxx10,   
+
+						// offset xxxx10,
 						uint8_t first_len =  (~startidx & 0xFF)+1;
-												
-						// first mem page						
+
+						// first mem page
 						res = Flash_WriteDataCont(startidx, data, first_len);
-						
+
 						// second mem page
 						res = Flash_WriteDataCont(startidx + first_len, data + first_len, len - first_len);
-						
+
 						isok = (res == (len - first_len)) ? 1 : 0;
-						
+
 					} else {
 						res = Flash_WriteDataCont(startidx, data, len);
 						isok = (res == len) ? 1 : 0;
-					}					
-			} else {				
+					}
+			} else {
 				res = Flash_WriteDataCont(startidx, data, len);
 				isok = (res == len) ? 1 : 0;
 			}
@@ -1350,7 +1350,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 			}
 			if ( page < 3)
 				isok = Flash_WipeMemoryPage(page);
-			
+
 			cmd_send(CMD_ACK, isok, 0, 0, 0, 0);
 			LED_B_OFF();
 			break;
@@ -1359,14 +1359,14 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 
 			LED_B_ON();
 			uint8_t *mem = BigBuf_malloc(USB_CMD_DATA_SIZE);
-			bool isok = false;			
+			bool isok = false;
 			size_t len = 0;
 			uint32_t startidx = c->arg[0];
 			uint32_t numofbytes = c->arg[1];
 			// arg0 = startindex
 			// arg1 = length bytes to transfer
 			// arg2 = RFU
-			
+
   			if (!FlashInit()) {
    		       break;
   		    }
@@ -1383,7 +1383,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 					Dbprintf("transfer to client failed ::  | bytes between %d - %d", i, len);
 			}
 				FlashStop();
-		
+
 			cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
 			LED_B_OFF();
 			break;
@@ -1392,7 +1392,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 
 			LED_B_ON();
 			rdv40_validation_t *info = (rdv40_validation_t*)BigBuf_malloc( sizeof(rdv40_validation_t) );
-			
+
 			bool isok = Flash_ReadData(FLASH_MEM_SIGNATURE_OFFSET, info->signature, FLASH_MEM_SIGNATURE_LEN);
 
 			if (FlashInit()) {
@@ -1401,8 +1401,8 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 			}
 			cmd_send(CMD_ACK, isok, 0, 0, info, sizeof(rdv40_validation_t));
 			BigBuf_free();
-			
-			LED_B_OFF();			
+
+			LED_B_OFF();
 			break;
 		}
 #endif
@@ -1445,7 +1445,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 			usb_disable();
 
 			// (iceman) why this wait?
-			SpinDelay(1000);  
+			SpinDelay(1000);
 			AT91C_BASE_RSTC->RSTC_RCR = RST_CONTROL_KEY | AT91C_RSTC_PROCRST;
 			// We're going to reset, and the bootrom will take control.
 			for(;;) {}
@@ -1458,7 +1458,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 			usb_disable();
 			AT91C_BASE_RSTC->RSTC_RCR = RST_CONTROL_KEY | AT91C_RSTC_PROCRST;
 			// We're going to flash, and the bootrom will take control.
-			for(;;) {}			
+			for(;;) {}
 			break;
 
 		case CMD_DEVICE_INFO: {
@@ -1466,7 +1466,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 			if (common_area.flags.bootrom_present) {
 				dev_info |= DEVICE_INFO_FLAG_BOOTROM_PRESENT;
 			}
-			cmd_send(CMD_DEVICE_INFO,dev_info,0,0,0,0);	
+			cmd_send(CMD_DEVICE_INFO,dev_info,0,0,0,0);
 			break;
 			}
 		default:
@@ -1479,7 +1479,7 @@ void  __attribute__((noreturn)) AppMain(void) {
 
 	SpinDelay(100);
 	clear_trace();
-		
+
 	if(common_area.magic != COMMON_AREA_MAGIC || common_area.version != 1) {
 		/* Initialize common area */
 		memset(&common_area, 0, sizeof(common_area));
@@ -1489,7 +1489,7 @@ void  __attribute__((noreturn)) AppMain(void) {
 	common_area.flags.osimage_present = 1;
 
 	LEDsoff();
-	
+
 	// The FPGA gets its clock from us from PCK0 output, so set that up.
 	AT91C_BASE_PIOA->PIO_BSR = GPIO_PCK0;
 	AT91C_BASE_PIOA->PIO_PDR = GPIO_PCK0;
@@ -1501,19 +1501,19 @@ void  __attribute__((noreturn)) AppMain(void) {
 	// Reset SPI
 	AT91C_BASE_SPI->SPI_CR = AT91C_SPI_SWRST;
 	AT91C_BASE_SPI->SPI_CR = AT91C_SPI_SWRST; // errata says it needs twice to be correctly set.
-	
+
 	// Reset SSC
 	AT91C_BASE_SSC->SSC_CR = AT91C_SSC_SWRST;
 
 	// Configure MUX
 	SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
-	
+
 	// Load the FPGA image, which we have stored in our flash.
 	// (the HF version by default)
 	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-	
+
 	StartTickCount();
-  	
+
 #ifdef WITH_LCD
 	LCDInit();
 #endif
@@ -1524,22 +1524,22 @@ void  __attribute__((noreturn)) AppMain(void) {
 
 #ifdef WITH_FPC
 	usart_init();
-#endif	
+#endif
 
 #ifdef WITH_FLASH
 	loadT55xxConfig();
 #endif
 
 	// This is made as late as possible to ensure enumeration without timeout
-	// against device such as http://www.hobbytronics.co.uk/usb-host-board-v2 
+	// against device such as http://www.hobbytronics.co.uk/usb-host-board-v2
 	usb_disable();
 	usb_enable();
 
 	uint8_t rx[sizeof(UsbCommand)];
-   
+
 	for(;;) {
 		WDT_HIT();
-		
+
 		// Check if there is a usb packet available
 		if (usb_poll_validate_length()) {
 			if (usb_read(rx, sizeof(rx)) )
@@ -1554,19 +1554,19 @@ void  __attribute__((noreturn)) AppMain(void) {
 		*/
 
 #endif
-		
+
 		// Press button for one second to enter a possible standalone mode
 		if (BUTTON_HELD(1000) > 0) {
-			
+
 /*
 * So this is the trigger to execute a standalone mod.  Generic entrypoint by following the standalone/standalone.h headerfile
 * All standalone mod "main loop" should be the RunMod() function.
-* Since the standalone is either LF or HF, the somewhat bisarr defines below exists. 
-*/			
+* Since the standalone is either LF or HF, the somewhat bisarr defines below exists.
+*/
 #if defined (WITH_LF) && ( defined (WITH_LF_SAMYRUN) || defined (WITH_LF_HIDBRUTE) || defined (WITH_LF_PROXBRUTE) )
 			RunMod();
 #endif
-		
+
 #if defined (WITH_ISO14443a) && ( defined (WITH_HF_YOUNG) || defined(WITH_HF_COLIN) || defined(WITH_HF_MATTYRUN) || defined(WITH_HF_BOG) )
 			RunMod();
 #endif
diff --git a/armsrc/apps.h b/armsrc/apps.h
index d17d9ef4b..276331575 100644
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -174,7 +174,7 @@ void ReaderMifare(bool first_try, uint8_t block, uint8_t keytype );
 
 //desfire
 void Mifare_DES_Auth1(uint8_t arg0,uint8_t *datain);
-void Mifare_DES_Auth2(uint32_t arg0, uint8_t *datain);					   
+void Mifare_DES_Auth2(uint32_t arg0, uint8_t *datain);
 
 // mifaredesfire.h
 bool InitDesfireCard();
@@ -205,7 +205,7 @@ void AcquireRawAdcSamplesIso15693(void);
 void ReaderIso15693(uint32_t parameter);	// Simulate an ISO15693 reader - greg
 void SimTagIso15693(uint32_t parameter, uint8_t *uid);	// simulate an ISO15693 tag - greg
 void BruteforceIso15693Afi(uint32_t speed); // find an AFI of a tag - atrox
-void DirectTag15693Command(uint32_t datalen,uint32_t speed, uint32_t recv, uint8_t *data); // send arbitrary commands from CLI - atrox 
+void DirectTag15693Command(uint32_t datalen,uint32_t speed, uint32_t recv, uint8_t *data); // send arbitrary commands from CLI - atrox
 void Iso15693InitReader(void);
 
 // iclass.h
diff --git a/armsrc/buzzer.c b/armsrc/buzzer.c
index 23e7e05d6..5f29c6472 100644
--- a/armsrc/buzzer.c
+++ b/armsrc/buzzer.c
@@ -1,6 +1,6 @@
 #include "buzzer.h"
 
-void Ring_BEE_ONCE(uint16_t music_note) {   
+void Ring_BEE_ONCE(uint16_t music_note) {
     BEE_ON();
 	SpinDelayUs(music_note);
 	BEE_OFF();
@@ -12,7 +12,7 @@ void ring_2_7khz(uint16_t count) {
 }
 
 void Ring_BEE_TIME(uint16_t music_note,uint16_t count) {
-	for(uint16_t i=0 ; i < count; i++) 
+	for(uint16_t i=0 ; i < count; i++)
 		Ring_BEE_ONCE(music_note);
 	SpinDelay(9);
 }
@@ -28,15 +28,15 @@ void Ring_ALL(uint16_t count) {
    SpinDelay(10);
 }
 
-void Ring_Little_Star(uint16_t count) {   
-	Ring_BEE_TIME(note_1,count);  
-	Ring_BEE_TIME(note_1,count);  
+void Ring_Little_Star(uint16_t count) {
+	Ring_BEE_TIME(note_1,count);
+	Ring_BEE_TIME(note_1,count);
 	Ring_BEE_TIME(note_5,count);
 	Ring_BEE_TIME(note_5,count);
 	Ring_BEE_TIME(note_6,count);
 	Ring_BEE_TIME(note_6,count);
 	Ring_BEE_TIME(note_5,2*count);
-	LED_A_ON(); 
+	LED_A_ON();
 	/*
 	Ring_BEE_TIME(note_4,count);
 	Ring_BEE_TIME(note_4,count);
@@ -45,7 +45,7 @@ void Ring_Little_Star(uint16_t count) {
 	Ring_BEE_TIME(note_2,count);
 	Ring_BEE_TIME(note_2,count);
 	Ring_BEE_TIME(note_1,2*count);
-	LED_A_OFF(); 
+	LED_A_OFF();
 
 	Ring_BEE_TIME(note_5,count);
 	Ring_BEE_TIME(note_5,count);
@@ -54,7 +54,7 @@ void Ring_Little_Star(uint16_t count) {
 	Ring_BEE_TIME(note_3,count);
 	Ring_BEE_TIME(note_3,count);
 	Ring_BEE_TIME(note_2,2*count);
-	LED_A_ON(); 
+	LED_A_ON();
 
 	Ring_BEE_TIME(note_5,count);
 	Ring_BEE_TIME(note_5,count);
@@ -63,7 +63,7 @@ void Ring_Little_Star(uint16_t count) {
 	Ring_BEE_TIME(note_3,count);
 	Ring_BEE_TIME(note_3,count);
 	Ring_BEE_TIME(note_2,2*count);
-	LED_A_OFF(); 
+	LED_A_OFF();
 
 	Ring_BEE_TIME(note_1,count);
 	Ring_BEE_TIME(note_1,count);
@@ -72,7 +72,7 @@ void Ring_Little_Star(uint16_t count) {
 	Ring_BEE_TIME(note_6,count);
 	Ring_BEE_TIME(note_6,count);
 	Ring_BEE_TIME(note_5,2*count);
-	LED_A_ON(); 
+	LED_A_ON();
 
 	Ring_BEE_TIME(note_4,count);
 	Ring_BEE_TIME(note_4,count);
diff --git a/armsrc/des.c b/armsrc/des.c
index 78ae87447..be5670e69 100644
--- a/armsrc/des.c
+++ b/armsrc/des.c
@@ -23,7 +23,7 @@
  * \date     2007-06-16
  * \brief    DES and EDE-DES implementation
  * \license	 GPLv3 or later
- * 
+ *
  */
 
 #include "des.h"
@@ -145,25 +145,25 @@ const uint8_t pc2_permtab[] ={
 
 const uint8_t splitin6bitword_permtab[] = {
 	 8,  8, 					/* 64 bit -> 64 bit */
-	64, 64,  1,  6,  2,  3,  4,  5, 
-	64, 64,  7, 12,  8,  9, 10, 11, 
-	64, 64, 13, 18, 14, 15, 16, 17, 
-	64, 64, 19, 24, 20, 21, 22, 23, 
-	64, 64, 25, 30, 26, 27, 28, 29, 
-	64, 64, 31, 36, 32, 33, 34, 35, 
-	64, 64, 37, 42, 38, 39, 40, 41, 
-	64, 64, 43, 48, 44, 45, 46, 47 
+	64, 64,  1,  6,  2,  3,  4,  5,
+	64, 64,  7, 12,  8,  9, 10, 11,
+	64, 64, 13, 18, 14, 15, 16, 17,
+	64, 64, 19, 24, 20, 21, 22, 23,
+	64, 64, 25, 30, 26, 27, 28, 29,
+	64, 64, 31, 36, 32, 33, 34, 35,
+	64, 64, 37, 42, 38, 39, 40, 41,
+	64, 64, 43, 48, 44, 45, 46, 47
 };
 
 const uint8_t shiftkey_permtab[] = {
 	 7,  7, 					/* 56 bit -> 56 bit */
 	 2,  3,  4,  5,  6,  7,  8,  9,
 	10, 11, 12, 13, 14, 15, 16, 17,
-	18, 19, 20, 21, 22, 23, 24, 25, 
-	26, 27, 28,  1, 
-	30, 31, 32, 33, 34, 35, 36, 37, 
-	38, 39, 40, 41, 42, 43, 44, 45, 
-	46, 47, 48, 49, 50, 51, 52, 53, 
+	18, 19, 20, 21, 22, 23, 24, 25,
+	26, 27, 28,  1,
+	30, 31, 32, 33, 34, 35, 36, 37,
+	38, 39, 40, 41, 42, 43, 44, 45,
+	46, 47, 48, 49, 50, 51, 52, 53,
 	54, 55, 56, 29
 };
 
@@ -173,9 +173,9 @@ const uint8_t shiftkeyinv_permtab[] = {
 	 8,  9, 10, 11, 12, 13, 14, 15,
 	16, 17, 18, 19, 20, 21, 22, 23,
 	24, 25, 26, 27,
-	56, 29, 30, 31, 32, 33, 34, 35, 
-	36, 37, 38, 39, 40, 41, 42, 43, 
-	44, 45, 46, 47, 48, 49, 50, 51, 
+	56, 29, 30, 31, 32, 33, 34, 35,
+	36, 37, 38, 39, 40, 41, 42, 43,
+	44, 45, 46, 47, 48, 49, 50, 51,
 	52, 53, 54, 55
 };
 
@@ -198,7 +198,7 @@ const uint8_t shiftkeyinv_permtab[] = {
 2 1
 1 0
 */
-#define ROTTABLE      0x7EFC 
+#define ROTTABLE      0x7EFC
 #define ROTTABLE_INV  0x3F7E
 /******************************************************************************/
 
@@ -234,7 +234,7 @@ static inline
 void shiftkey(uint8_t *key){
 	uint8_t k[7];
 	memcpy(k, key, 7);
-	permute((uint8_t*)shiftkey_permtab, k, key);	
+	permute((uint8_t*)shiftkey_permtab, k, key);
 }
 
 /******************************************************************************/
@@ -243,7 +243,7 @@ void shiftkey_inv(uint8_t *key){
 	uint8_t k[7];
 	memcpy(k, key, 7);
 	permute((uint8_t*)shiftkeyinv_permtab, k, key);
-	
+
 }
 
 /******************************************************************************/
@@ -251,7 +251,7 @@ static inline
 uint64_t splitin6bitwords(uint64_t a){
 	uint64_t ret=0;
 	a &= 0x0000ffffffffffffLL;
-	permute((uint8_t*)splitin6bitword_permtab, (uint8_t*)&a, (uint8_t*)&ret);	
+	permute((uint8_t*)splitin6bitword_permtab, (uint8_t*)&a, (uint8_t*)&ret);
 	return ret;
 }
 
@@ -259,11 +259,11 @@ uint64_t splitin6bitwords(uint64_t a){
 
 static inline
 uint8_t substitute(uint8_t a, uint8_t * sbp){
-	uint8_t x;	
+	uint8_t x;
 	x = sbp[a>>1];
 	x = (a&1)?x&0x0F:x>>4;
 	return x;
-	
+
 }
 
 /******************************************************************************/
@@ -272,11 +272,11 @@ uint32_t des_f(uint32_t r, uint8_t* kr){
 	uint8_t i;
 	uint32_t t=0,ret;
 	uint64_t data;
-	uint8_t *sbp; /* sboxpointer */ 
+	uint8_t *sbp; /* sboxpointer */
 	permute((uint8_t*)e_permtab, (uint8_t*)&r, (uint8_t*)&data);
 	for(i=0; i<6; ++i)
 		((uint8_t*)&data)[i] ^= kr[i];
-	
+
 	/* Sbox substitution */
 	data = splitin6bitwords(data);
 	sbp=(uint8_t*)sbox;
@@ -288,7 +288,7 @@ uint32_t des_f(uint32_t r, uint8_t* kr){
 		sbp += 32;
 	}
 	changeendian32(&t);
-		
+
 	permute((uint8_t*)p_permtab,(uint8_t*)&t, (uint8_t*)&ret);
 
 	return ret;
@@ -310,7 +310,7 @@ void des_enc(void* out, const void* in, const void* key){
 	uint8_t kr[6], k[7];
 	uint8_t i;
 	data_t data;
-	
+
 	permute((uint8_t*)ip_permtab, (uint8_t*)in, data.d.v8);
 	permute((uint8_t*)pc1_permtab, (const uint8_t*)key, k);
 
@@ -320,7 +320,7 @@ void des_enc(void* out, const void* in, const void* key){
 			shiftkey(k);
 		permute((uint8_t*)pc2_permtab, k, kr);
 		L ^= des_f(R, kr);
-		
+
 		shiftkey(k);
 		if(ROTTABLE&((1<<((i<<1)+1))) )
 			shiftkey(k);
@@ -332,7 +332,7 @@ void des_enc(void* out, const void* in, const void* key){
 	R ^= L;
 	L ^= R;
 	R ^= L;
-	
+
 	permute((uint8_t*)inv_ip_permtab, data.d.v8, (uint8_t*)out);
 }
 
@@ -343,11 +343,11 @@ void des_dec(void* out, const void* in, const uint8_t* key){
 	uint8_t kr[6],k[7];
 	int8_t i;
 	data_t data;
-	
+
 	permute((uint8_t*)ip_permtab, (uint8_t*)in, data.d.v8);
 	permute((uint8_t*)pc1_permtab, (const uint8_t*)key, k);
 	for(i=7; i>=0; --i){
-		
+
 		permute((uint8_t*)pc2_permtab, k, kr);
 		L ^= des_f(R, kr);
 		shiftkey_inv(k);
@@ -367,7 +367,7 @@ void des_dec(void* out, const void* in, const uint8_t* key){
 	R ^= L;
 	L ^= R;
 	R ^= L;
-	
+
 	permute((uint8_t*)inv_ip_permtab, data.d.v8, (uint8_t*)out);
 }
 
@@ -389,51 +389,51 @@ void tdes_dec(void* out, void* in, const uint8_t* key){
 
  void tdes_2key_enc(void* out, const void* in, size_t length, const void* key, unsigned char iv[8]){
 
-	if( length % 8 ) return; 
+	if( length % 8 ) return;
 
 	uint8_t i;
 	uint8_t* tin = (uint8_t*) in;
 	uint8_t* tout = (uint8_t*) out;
-	
+
 	while( length > 0 )
 	{
 		for( i = 0; i < 8; i++ )
 				tout[i] = (unsigned char)( tin[i] ^ iv[i] );
-		
+
 		des_enc(tout,  tin, (uint8_t*)key + 0);
 		des_dec(tout, tout, (uint8_t*)key + 8);
 		des_enc(tout, tout, (uint8_t*)key + 0);
-		
+
 		memcpy( iv, tout, 8 );
-		
+
 		tin  += 8;
 		tout += 8;
 		length -= 8;
 	}
  }
- 
+
  void tdes_2key_dec(void* out, const void* in, size_t length, const void* key, unsigned char iv[8]){
-	
-	if( length % 8 ) return; 
+
+	if( length % 8 ) return;
 
 	uint8_t i;
 	unsigned char temp[8];
 	uint8_t* tin = (uint8_t*) in;
 	uint8_t* tout = (uint8_t*) out;
-	
+
 	while( length > 0 )
 	{
 		memcpy( temp, tin, 8 );
-		
+
 		des_dec(tout,  tin, (uint8_t*)key + 0);
 		des_enc(tout, tout, (uint8_t*)key + 8);
-		des_dec(tout, tout, (uint8_t*)key + 0);	 	 
+		des_dec(tout, tout, (uint8_t*)key + 0);
 
 		for( i = 0; i < 8; i++ )
 			tout[i] = (unsigned char)( tout[i] ^ iv[i] );
 
 		memcpy( iv, temp, 8 );
-		
+
 		tin  += 8;
 		tout += 8;
 		length -= 8;
diff --git a/armsrc/des.h b/armsrc/des.h
index 03b9f6469..22735f2f3 100644
--- a/armsrc/des.h
+++ b/armsrc/des.h
@@ -18,11 +18,11 @@
 */
 /**
  * \file	des.h
- * \author	Daniel Otte 
+ * \author	Daniel Otte
  * \date	2007-06-16
  * \brief 	des and tdes declarations
  * \license	GPLv3 or later
- * 
+ *
  */
 #ifndef __DES_H_
 #define __DES_H_
@@ -46,12 +46,12 @@
 
 /** \fn void des_enc(void* out, const void* in, const void* key)
  * \brief encrypt a block with DES
- * 
+ *
  * This function encrypts a block of 64 bits (8 bytes) with the DES algorithm.
  * Key expansion is done automatically. The key is 64 bits long, but note that
  * only 56 bits are used (the LSB of each byte is dropped). The input and output
  * blocks may overlap.
- * 
+ *
  * \param out pointer to the block (64 bit = 8 byte) where the ciphertext is written to
  * \param in  pointer to the block (64 bit = 8 byte) where the plaintext is read from
  * \param key pointer to the key (64 bit = 8 byte)
@@ -60,12 +60,12 @@ void des_enc(void* out, const void* in, const void* key);
 
 /** \fn void des_dec(void* out, const void* in, const void* key)
  * \brief decrypt a block with DES
- * 
+ *
  * This function decrypts a block of 64 bits (8 bytes) with the DES algorithm.
  * Key expansion is done automatically. The key is 64 bits long, but note that
  * only 56 bits are used (the LSB of each byte is dropped). The input and output
  * blocks may overlap.
- * 
+ *
  * \param out pointer to the block (64 bit = 8 byte) where the plaintext is written to
  * \param in  pointer to the block (64 bit = 8 byte) where the ciphertext is read from
  * \param key pointer to the key (64 bit = 8 byte)
@@ -75,12 +75,12 @@ void des_dec(void* out, const void* in, const uint8_t* key);
 
 /** \fn void tdes_enc(void* out, const void* in, const void* key)
  * \brief encrypt a block with Tripple-DES
- * 
+ *
  * This function encrypts a block of 64 bits (8 bytes) with the Tripple-DES (EDE)
  * algorithm. Key expansion is done automatically. The key is 192 bits long, but
  * note that only 178 bits are used (the LSB of each byte is dropped). The input
  * and output blocks may overlap.
- * 
+ *
  * \param out pointer to the block (64 bit = 8 byte) where the ciphertext is written to
  * \param in  pointer to the block (64 bit = 8 byte) where the plaintext is read from
  * \param key pointer to the key (192 bit = 24 byte)
@@ -90,19 +90,19 @@ void tdes_enc(void* out, void* in, const void* key);
 
 /** \fn void tdes_dec(void* out, const void* in, const void* key)
  * \brief decrypt a block with Tripple-DES
- * 
+ *
  * This function decrypts a block of 64 bits (8 bytes) with the Tripple-DES (EDE)
  * algorithm. Key expansion is done automatically. The key is 192 bits long, but
  * note that only 178 bits are used (the LSB of each byte is dropped). The input
  * and output blocks may overlap.
- * 
+ *
  * \param out pointer to the block (64 bit = 8 byte) where the plaintext is written to
  * \param in  pointer to the block (64 bit = 8 byte) where the ciphertext is read from
  * \param key pointer to the key (192 bit = 24 byte)
  */
  //void tdes_dec(void* out, const void* in, const void* key);
  void tdes_dec(void* out, void* in, const uint8_t* key);
- 
+
  void tdes_2key_enc(void* out, const void* in, size_t length, const void* key, unsigned char iv[8]);
  void tdes_2key_dec(void* out, const void* in, size_t length, const void* key, unsigned char iv[8]);
 
diff --git a/armsrc/desfire_crypto.c b/armsrc/desfire_crypto.c
index 5cb36054c..d79ecc8e3 100644
--- a/armsrc/desfire_crypto.c
+++ b/armsrc/desfire_crypto.c
@@ -1,11 +1,11 @@
 /*-
  * Copyright (C) 2010, Romain Tartiere.
- * 
+ *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published by the
  * Free Software Foundation, either version 3 of the License, or (at your
  * option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
- * 
+ *
  * $Id$
  */
 
@@ -447,10 +447,10 @@ void* mifare_cryto_postprocess_data (desfiretag_t tag, void *data, size_t *nbyte
             switch (DESFIRE (tag)->authentication_scheme) {
             case AS_LEGACY:
                 AddCrc14A( (uint8_t*)res, end_crc_pos);
-                end_crc_pos = crc_pos + 2;				
-				// 
-				
-				
+                end_crc_pos = crc_pos + 2;
+				//
+
+
                 crc = crc16;
                 break;
             case AS_NEW:
@@ -539,7 +539,7 @@ void mifare_cypher_single_block (desfirekey_t key, uint8_t *data, uint8_t *ivect
         break;
     case T_3DES:
         switch (operation) {
-        case MCO_ENCYPHER:			
+        case MCO_ENCYPHER:
             // DES_ecb_encrypt ((DES_cblock *) data,  (DES_cblock *) edata, &(key->ks1), DES_ENCRYPT);
             // DES_ecb_encrypt ((DES_cblock *) edata, (DES_cblock *) data,  &(key->ks2), DES_DECRYPT);
             // DES_ecb_encrypt ((DES_cblock *) data,  (DES_cblock *) edata, &(key->ks1), DES_ENCRYPT);
@@ -562,7 +562,7 @@ void mifare_cypher_single_block (desfirekey_t key, uint8_t *data, uint8_t *ivect
             // DES_ecb_encrypt ((DES_cblock *) data,  (DES_cblock *) edata, &(key->ks3), DES_ENCRYPT);
             break;
         case MCO_DECYPHER:
-			tdes_dec(data, edata, key->data);        
+			tdes_dec(data, edata, key->data);
 			// DES_ecb_encrypt ((DES_cblock *) data,  (DES_cblock *) edata, &(key->ks3), DES_DECRYPT);
             // DES_ecb_encrypt ((DES_cblock *) edata, (DES_cblock *) data,  &(key->ks2), DES_ENCRYPT);
             // DES_ecb_encrypt ((DES_cblock *) data,  (DES_cblock *) edata, &(key->ks1), DES_DECRYPT);
@@ -570,19 +570,19 @@ void mifare_cypher_single_block (desfirekey_t key, uint8_t *data, uint8_t *ivect
         }
         break;
     case T_AES:
-        switch (operation) 
+        switch (operation)
 		{
 			case MCO_ENCYPHER:
 			{
 				AesCtx ctx;
-				AesCtxIni(&ctx, ivect, key->data, KEY128,CBC); 
+				AesCtxIni(&ctx, ivect, key->data, KEY128,CBC);
 				AesEncrypt(&ctx, data, edata, sizeof(edata) );
 				break;
 			}
 			case MCO_DECYPHER:
 			{
 				AesCtx ctx;
-				AesCtxIni(&ctx, ivect, key->data, KEY128,CBC); 
+				AesCtxIni(&ctx, ivect, key->data, KEY128,CBC);
 				AesDecrypt(&ctx, edata, data, sizeof(edata));
 				break;
 			}
diff --git a/armsrc/desfire_key.c b/armsrc/desfire_key.c
index 800ff6da6..a4ed05f68 100644
--- a/armsrc/desfire_key.c
+++ b/armsrc/desfire_key.c
@@ -1,11 +1,11 @@
 /*-
  * Copyright (C) 2010, Romain Tartiere.
- * 
+ *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published by the
  * Free Software Foundation, either version 3 of the License, or (at your
  * option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
- * 
+ *
  * $Id$
  */
 
diff --git a/armsrc/epa.c b/armsrc/epa.c
index 71ecc29a3..80d51e553 100644
--- a/armsrc/epa.c
+++ b/armsrc/epa.c
@@ -289,7 +289,7 @@ void EPA_PACE_Collect_Nonce(UsbCommand *c)
 
 	// set up communication
 	func_return = EPA_Setup();
-	if (func_return != 0) {	
+	if (func_return != 0) {
 		EPA_PACE_Collect_Nonce_Abort(1, func_return);
 		return;
 	}
diff --git a/armsrc/felica.c b/armsrc/felica.c
index d1e7bc344..6b2bb5bfb 100644
--- a/armsrc/felica.c
+++ b/armsrc/felica.c
@@ -16,7 +16,7 @@
 # define FELICA_FRAME_DELAY_TIME  (2672/16 + 1)
 #endif
 #ifndef DELAY_AIR2ARM_AS_READER
-#define DELAY_AIR2ARM_AS_READER (3 + 16 + 8 + 8*16 + 4*16 - 8*16) 
+#define DELAY_AIR2ARM_AS_READER (3 + 16 + 8 + 8*16 + 4*16 - 8*16)
 #endif
 #ifndef DELAY_ARM2AIR_AS_READER
 #define DELAY_ARM2AIR_AS_READER (4*16 + 8*16 + 8 + 8 + 1)
@@ -46,7 +46,7 @@ uint32_t iso18092_get_timeout(void) {
  #define FELICA_MAX_FRAME_SIZE 260
 #endif
 
-//structure to hold outgoing NFC frame 
+//structure to hold outgoing NFC frame
 static uint8_t frameSpace[FELICA_MAX_FRAME_SIZE+4];
 
 //structure to hold incoming NFC frame, used for ISO/IEC 18092-compatible frames
@@ -89,10 +89,10 @@ static void FelicaFrameinit(uint8_t *data) {
 }
 
 //shift byte into frame, reversing it at the same time
-static void shiftInByte(uint8_t bt) {    
+static void shiftInByte(uint8_t bt) {
 	uint8_t j;
     for(j=0; j < FelicaFrame.byte_offset; j++) {
-        FelicaFrame.framebytes[FelicaFrame.posCnt] = ( FelicaFrame.framebytes[FelicaFrame.posCnt]<<1 ) + (bt & 1); 
+        FelicaFrame.framebytes[FelicaFrame.posCnt] = ( FelicaFrame.framebytes[FelicaFrame.posCnt]<<1 ) + (bt & 1);
         bt >>= 1;
     }
     FelicaFrame.posCnt++;
@@ -120,7 +120,7 @@ static void Process18092Byte(uint8_t bt) {
 				FelicaFrame.state = STATE_UNSYNCD;
 			} else {
 				for (uint8_t i=0; i<8; i++) {
-					
+
 					if (FelicaFrame.shiftReg == SYNC_16BIT) {
 						//SYNC done!
 						FelicaFrame.state = STATE_GET_LENGTH;
@@ -132,7 +132,7 @@ static void Process18092Byte(uint8_t bt) {
 							FelicaFrame.framebytes[2] = (FelicaFrame.framebytes[2] << 1) + (bt & 1);
 							bt >>= 1;
 						}
-						
+
 						FelicaFrame.posCnt = 2;
 						if (i==0)
 							break;
@@ -146,7 +146,7 @@ static void Process18092Byte(uint8_t bt) {
 					//Force SYNC on next byte
 					FelicaFrame.state = STATE_GET_LENGTH;
 					FelicaFrame.framebytes[0] = 0xb2;
-					FelicaFrame.framebytes[1] = 0x4d; 
+					FelicaFrame.framebytes[1] = 0x4d;
 					FelicaFrame.byte_offset = 0;
 					FelicaFrame.posCnt = 1;
 				}
@@ -176,12 +176,12 @@ static void Process18092Byte(uint8_t bt) {
 				FelicaFrame.crc_ok = check_crc(CRC_FELICA, FelicaFrame.framebytes+2, FelicaFrame.len-2);
 				FelicaFrame.state = STATE_FULL;
 				FelicaFrame.rem_len = 0;
-				if (MF_DBGLEVEL > 3) Dbprintf("[+] got 2 crc bytes [%s]", (FelicaFrame.crc_ok) ? "OK" : "No" );			
+				if (MF_DBGLEVEL > 3) Dbprintf("[+] got 2 crc bytes [%s]", (FelicaFrame.crc_ok) ? "OK" : "No" );
 			}
 			break;
 		}
-		case STATE_FULL:  //ignore byte. Don't forget to clear frame to receive next one...        
-		default: 
+		case STATE_FULL:  //ignore byte. Don't forget to clear frame to receive next one...
+		default:
 			break;
 	}
 }
@@ -196,19 +196,19 @@ static uint8_t felica_select_card(felica_card_select_t *card) {
 	// 0xB2 0x4B = sync code
 	// 0x06 = len
 	// 0x00 = rfu
-	// 0xff = system service 
+	// 0xff = system service
 	// 0xff = system service
 	// 0x00  =
 	//			b7    = automatic switching of data rate
 	//			b6-b2 = reserved
 	//			b1    = fc/32 (414kbps)
-	//			b0    = fc/64 (212kbps)	
+	//			b0    = fc/64 (212kbps)
 	// 0x00 = timeslot
 	// 0x09 0x21 = crc
 	static uint8_t poll[10] = {0xb2,0x4d,0x06,FELICA_POLL_REQ,0xFF,0xFF,0x00,0x00,0x09,0x21};
-	
+
 	int len = 20;
-	
+
 	// We try 20 times, or if answer was received.
 	do {
 		// end-of-reception response packet data, wait approx. 501μs
@@ -219,23 +219,23 @@ static uint8_t felica_select_card(felica_card_select_t *card) {
 		// polling card, break if success
 		if (WaitForFelicaReply(512) && FelicaFrame.framebytes[3] == FELICA_POLL_ACK)
 			break;
-		
+
 		WDT_HIT();
-		
+
 	} while (--len);
-	
+
 	// timed-out
 	if ( len == 0 )
 		return 1;
-			
-	// wrong answer	
+
+	// wrong answer
 	if (FelicaFrame.framebytes[3] != FELICA_POLL_ACK)
 		return 2;
-	
+
 	// VALIDATE CRC   residue is 0, hence if crc is a value it failed.
 	if (!check_crc(CRC_FELICA, FelicaFrame.framebytes+2, FelicaFrame.len-2))
 		return 3;
-	
+
 	// copy UID
 	// idm 8
 	if (card) {
@@ -246,9 +246,9 @@ static uint8_t felica_select_card(felica_card_select_t *card) {
 		memcpy(card->uid, card->IDm + 2, 6);
 		memcpy(card->iccode, card->PMm, 2);
 		memcpy(card->mrt, card->PMm+2, 6);
-		
+
 	}
-	// more status bytes?	
+	// more status bytes?
 	return 0;
 }
 
@@ -257,42 +257,42 @@ static uint8_t felica_select_card(felica_card_select_t *card) {
 // poll-1 (reply with available system codes - NFC Tag3 specs, IIRC): 0xb2,0x4d,0x06,0x00,0xff,0xff,0x01,0x00,0x3a,0x10
 // resp: 0xb2,0x4d,0x14,0x01,  0xXX,0xXX,0xXX,0xXX,0xXX,0xXX,0xXX,0xXX,  0x00,0xf1,0x00,0x00,0x00,0x01,0x43,0x00,  0x88,0xb4,0x0c,0xe2,
 // page-req:  0xb2,0x4d,0x10,0x06,  0xXX,0xXX,0xXX,0xXX,0xXX,0xXX,0xXX,0xXX,  0x01,  0x0b,0x00,  0x01,  0x80,0x00,  0x2e,0xb3,
-// page-req: 0x06, IDm(8), ServiceNum(1),Slist(2*num) BLocknum (1) BLockids(2-3*num) 
+// page-req: 0x06, IDm(8), ServiceNum(1),Slist(2*num) BLocknum (1) BLockids(2-3*num)
 // page-resp: 0xb2,0x4d,0x1d,0x07,  0xXX,0xXX,0xXX,0xXX,0xXX,0xXX,0xXX,0xXX,  0x00,  0x00,  0x01,  0x10,0x04,0x01,0x00,0x0d,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x23,   0xcb,0x6e,
 
-// builds a readblock frame for felica lite(s).  Using SERVICE:  SERVICE_FELICA_LITE_READONLY 
-// Felica standard has a different file system, AFAIK,  
+// builds a readblock frame for felica lite(s).  Using SERVICE:  SERVICE_FELICA_LITE_READONLY
+// Felica standard has a different file system, AFAIK,
 // 8-byte IDm, number of blocks, blocks numbers
 // number of blocks limited to 4 for FelicaLite(S)
 static void BuildFliteRdblk(uint8_t* idm, int blocknum, uint16_t *blocks ) {
 
     if (blocknum > 4 || blocknum <= 0)
         Dbprintf("Invalid number of blocks, %d != 4", blocknum);
-	
+
     uint8_t c = 0, i = 0;
-	
+
     frameSpace[c++] = 0xb2;
     frameSpace[c++] = 0x4d;
-    
+
 	c++; //set length later
-	
+
     frameSpace[c++] = FELICA_RDBLK_REQ; 		//command number
-    
+
 	//card IDm, from poll
 	frameSpace[c++] = idm[0];
 	frameSpace[c++] = idm[1];
 	frameSpace[c++] = idm[2];
 	frameSpace[c++] = idm[3];
 	frameSpace[c++] = idm[4];
-	frameSpace[c++] = idm[5];	
+	frameSpace[c++] = idm[5];
 	frameSpace[c++] = idm[6];
 	frameSpace[c++] = idm[7];
 
-	//number of services  
-    frameSpace[c++] = 0x01; 					
-    
+	//number of services
+    frameSpace[c++] = 0x01;
+
 	//service code
-	frameSpace[c++] = (SERVICE_FELICA_LITE_READONLY >> 8); 
+	frameSpace[c++] = (SERVICE_FELICA_LITE_READONLY >> 8);
     frameSpace[c++] = SERVICE_FELICA_LITE_READONLY & 0xFF;
 
 	//number of blocks
@@ -304,20 +304,20 @@ static void BuildFliteRdblk(uint8_t* idm, int blocknum, uint16_t *blocks ) {
 		if (blocks[i] >= 256) {
            frameSpace[c++] = 0x00;
            frameSpace[c++] = (blocks[i] >> 8); //block number, little endian....
-           frameSpace[c++] = (blocks[i] & 0xff);            
+           frameSpace[c++] = (blocks[i] & 0xff);
         } else {
             frameSpace[c++] = 0x80;
             frameSpace[c++] = blocks[i];
         }
     }
-	
-	//set length	
-    frameSpace[2] = c-2; 
+
+	//set length
+    frameSpace[2] = c-2;
     AddCrc(frameSpace, c-2);
 }
 
 static void TransmitFor18092_AsReader(uint8_t * frame, int len, uint32_t *timing, uint8_t power, uint8_t highspeed) {
-	
+
 	uint8_t flags = FPGA_MAJOR_MODE_ISO18092;
 
 	if ( power )
@@ -326,19 +326,19 @@ static void TransmitFor18092_AsReader(uint8_t * frame, int len, uint32_t *timing
 		flags |= FPGA_HF_ISO18092_FLAG_424K;
 
 	FpgaWriteConfWord(flags);
-	
+
 	uint32_t curr_transfer_time = ((MAX(felica_nexttransfertime, GetCountSspClk()) & 0xfffffff8) + 8);
 
 	while (GetCountSspClk() < curr_transfer_time) {};
 
 	felica_lasttime_prox2air_start = curr_transfer_time;
-	
+
     // preamble
 	// sending 0x00 0x00 0x00 0x00 0x00 0x00
-	uint16_t c = 0;	
+	uint16_t c = 0;
 	while (c < 6) {
 
-		// keep tx buffer in a defined state anyway.	
+		// keep tx buffer in a defined state anyway.
 		if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
 			AT91C_BASE_SSC->SSC_THR = 0x00;
 			c++;
@@ -350,16 +350,16 @@ static void TransmitFor18092_AsReader(uint8_t * frame, int len, uint32_t *timing
 	c = 0;
 	while (c < len) {
 
-		// Put byte into tx holding register as soon as it is ready		
+		// Put byte into tx holding register as soon as it is ready
 		if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
 			AT91C_BASE_SSC->SSC_THR = frame[c++];
 		}
 	}
 
-/**/	
+/**/
 	while (!(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY))) {};
 	AT91C_BASE_SSC->SSC_THR = 0x00; //minimum delay
-	
+
 	while (!(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY))) {};
 	AT91C_BASE_SSC->SSC_THR = 0x00; //spin
 /**/
@@ -373,7 +373,7 @@ static void TransmitFor18092_AsReader(uint8_t * frame, int len, uint32_t *timing
 		NULL,
 		true
 	);
-	
+
 	felica_nexttransfertime = MAX(felica_nexttransfertime ,felica_lasttime_prox2air_start + FELICA_REQUEST_GUARD_TIME);
 }
 
@@ -383,7 +383,7 @@ static void TransmitFor18092_AsReader(uint8_t * frame, int len, uint32_t *timing
 bool WaitForFelicaReply(uint16_t maxbytes) {
 
 	uint32_t c = 0;
-	
+
 	// power, no modulation
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_ISO18092 | FPGA_HF_ISO18092_FLAG_READER | FPGA_HF_ISO18092_FLAG_NOMOD);
 
@@ -391,22 +391,22 @@ bool WaitForFelicaReply(uint16_t maxbytes) {
 
 	// clear RXRDY:
 	uint8_t b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
-	
+
 	uint32_t timeout = iso18092_get_timeout();
 	for(;;) {
-        WDT_HIT();		
-		
+        WDT_HIT();
+
 		if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
-			b = (uint8_t)(AT91C_BASE_SSC->SSC_RHR);			
-			Process18092Byte(b);		
+			b = (uint8_t)(AT91C_BASE_SSC->SSC_RHR);
+			Process18092Byte(b);
 			if (FelicaFrame.state == STATE_FULL) {
-				felica_nexttransfertime = 
+				felica_nexttransfertime =
 					MAX(
 						felica_nexttransfertime,
 						(GetCountSspClk() & 0xfffffff8) - (DELAY_AIR2ARM_AS_READER + DELAY_ARM2AIR_AS_READER)/16 + FELICA_FRAME_DELAY_TIME
 					)
-				;						
-				
+				;
+
 				LogTrace(
 					FelicaFrame.framebytes,
 					FelicaFrame.len,
@@ -417,13 +417,13 @@ bool WaitForFelicaReply(uint16_t maxbytes) {
 				);
 				return true;
 			} else if (c++ > timeout && FelicaFrame.state == STATE_UNSYNCD) {
-				return false; 
+				return false;
 			} else if (FelicaFrame.state == STATE_GET_CRC) {
 				Dbprintf(" Frame: ");
 				Dbhexdump(16, FelicaFrame.framebytes, 0);
 				//return false;
 			}
-		} 
+		}
 	}
 	return false;
 }
@@ -437,34 +437,34 @@ static void iso18092_setup(uint8_t fpga_minor_mode) {
 
 	// allocate command receive buffer
 	BigBuf_free(); BigBuf_Clear_ext(false);
-	
+
 	// Initialize Demod and Uart structs
 	//DemodInit(BigBuf_malloc(MAX_FRAME_SIZE));
 	FelicaFrameinit(BigBuf_malloc(FELICA_MAX_FRAME_SIZE));
 
 	felica_nexttransfertime = 2 * DELAY_ARM2AIR_AS_READER;
 	iso18092_set_timeout(2120); // 106 * 20ms  maximum start-up time of card
-	
+
 	init_table(CRC_FELICA);
-		
+
 	// connect Demodulated Signal to ADC:
 	SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
 
 	// Set up the synchronous serial port
 	FpgaSetupSsc();
-	
+
 	// LSB transfer.  Remember to set it back to MSB with
 	AT91C_BASE_SSC->SSC_RFMR = SSC_FRAME_MODE_BITS_IN_WORD(8) | SSC_FRAME_MODE_WORDS_PER_TRANSFER(0);
-		
+
 	// Signal field is on with the appropriate LED
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_ISO18092 | fpga_minor_mode);
-	
+
 	//20.4 ms generate field,  start sending polling command afterwars.
 	SpinDelay(100);
 
 	// Start the timer
 	StartCountSspClk();
-		
+
 	LED_D_ON();
 }
 //-----------------------------------------------------------------------------
@@ -472,7 +472,7 @@ static void iso18092_setup(uint8_t fpga_minor_mode) {
 //-----------------------------------------------------------------------------
 // arg0		FeliCa flags
 // arg1		len of commandbytes
-// d.asBytes command bytes to send  
+// d.asBytes command bytes to send
 void felica_sendraw(UsbCommand *c) {
 
 	if (MF_DBGLEVEL > 3) Dbprintf("FeliCa_sendraw Enter");
@@ -481,9 +481,9 @@ void felica_sendraw(UsbCommand *c) {
 	size_t len = c->arg[1] & 0xffff;
 	uint8_t *cmd = c->d.asBytes;
 	uint32_t arg0 = 0;
-	
+
 	felica_card_select_t card;
-  
+
 	if ((param & FELICA_CONNECT))
 		clear_trace();
 
@@ -501,19 +501,19 @@ void felica_sendraw(UsbCommand *c) {
 				goto OUT;
 		}
 	}
-	
+
 	if ((param & FELICA_RAW)) {
-	
+
 		// 2 sync, 1 len, 2crc == 5
 		uint8_t *buf = BigBuf_malloc(len+5);
 		// add sync bits
 	    buf[0] = 0xb2;
 		buf[1] = 0x4d;
 		buf[2] = len;
-		
+
 		// copy command
 		memcpy(buf+2, cmd, len);
-		
+
 		if ((param & FELICA_APPEND_CRC)) {
 			// Don't append crc on empty bytearray...
 			if ( len > 0 ) {
@@ -530,24 +530,24 @@ void felica_sendraw(UsbCommand *c) {
 	if ((param & FELICA_NO_DISCONNECT))
 		return;
 
-OUT:	
+OUT:
 	switch_off();
-	
-	//Resetting Frame mode (First set in fpgaloader.c)	
+
+	//Resetting Frame mode (First set in fpgaloader.c)
     AT91C_BASE_SSC->SSC_RFMR = SSC_FRAME_MODE_BITS_IN_WORD(8) | AT91C_SSC_MSBF | SSC_FRAME_MODE_WORDS_PER_TRANSFER(0);
-	
+
 	if (MF_DBGLEVEL > 3) Dbprintf("FeliCa_sendraw Exit");
 }
 
 void felica_sniff(uint32_t samplesToSkip, uint32_t triggersToSkip) {
-	
+
     int remFrames = (samplesToSkip) ? samplesToSkip : 0;
 
     Dbprintf("Snoop FelicaLiteS: Getting first %d frames, Skipping %d triggers.\n", samplesToSkip, triggersToSkip);
-  
+
   	iso18092_setup( FPGA_HF_ISO18092_FLAG_NOMOD);
 
-    //the frame bits are slow enough. 
+    //the frame bits are slow enough.
     int n = BigBuf_max_traceLen() / sizeof(uint8_t); // take all memory
 	int numbts = 0;
     uint8_t *dest = (uint8_t *)BigBuf_get_addr();
@@ -558,14 +558,14 @@ void felica_sniff(uint32_t samplesToSkip, uint32_t triggersToSkip) {
     while (dest <= destend) {
         WDT_HIT();
 		if( BUTTON_PRESS()) break;
-				
+
         if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
             uint8_t dist = (uint8_t)(AT91C_BASE_SSC->SSC_RHR);
             Process18092Byte(dist);
-            
+
 			//to be sure we are in frame
             if (FelicaFrame.state == STATE_GET_LENGTH) {
-                //length is after 48 (PRE)+16 (SYNC) - 64 ticks +maybe offset? not 100% 
+                //length is after 48 (PRE)+16 (SYNC) - 64 ticks +maybe offset? not 100%
                 uint16_t distance = GetCountSspClk() - endframe - 64 + (FelicaFrame.byte_offset > 0 ? (8-FelicaFrame.byte_offset) : 0);
                 *dest = distance >> 8;
                 dest++;
@@ -587,16 +587,16 @@ void felica_sniff(uint32_t samplesToSkip, uint32_t triggersToSkip) {
                 remFrames--;
                 if (remFrames <= 0) break;
                 if (dest >= destend ) break;
-				
+
                 numbts += FelicaFrame.len;
-                
+
 				FelicaFrameReset();
             }
         }
     }
 
 	switch_off();
-	
+
     //reset framing
     AT91C_BASE_SSC->SSC_RFMR = SSC_FRAME_MODE_BITS_IN_WORD(8) | AT91C_SSC_MSBF | SSC_FRAME_MODE_WORDS_PER_TRANSFER(0);
     set_tracelen(numbts);
@@ -622,13 +622,13 @@ void felica_sim_lite(uint64_t nfcid) {
     uint8_t resp_poll0[R_POLL0_LEN] = { 0xb2,0x4d,0x12,FELICA_POLL_ACK,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf1,0x00,0x00,0x00,0x01,0x43,0x00,0xb3,0x7f};
     uint8_t resp_poll1[R_POLL1_LEN] = { 0xb2,0x4d,0x14,FELICA_POLL_ACK,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf1,0x00,0x00,0x00,0x01,0x43,0x00, 0x88,0xb4,0xb3,0x7f};
     uint8_t resp_readblk[R_READBLK_LEN] = { 0xb2,0x4d,0x1d,FELICA_RDBLK_ACK,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x10,0x04,0x01,0x00,0x0d,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x23,0xcb,0x6e};
-	
+
 	//NFC tag 3/ ISo technically. Many overlapping standards
-    DbpString("Felica Lite-S sim start"); 
+    DbpString("Felica Lite-S sim start");
     Dbprintf("NDEF2 UID: %02x %02x %02x %02x %02x %02x %02x %02x",
 		ndef[0], ndef[1], ndef[2], ndef[3],	ndef[4], ndef[5], ndef[6], ndef[7]
 	);
-    
+
     //fill in blanks
     for( i=0; i<8; i++) {
         resp_poll0[i+4] = ndef[i];
@@ -656,11 +656,11 @@ void felica_sim_lite(uint64_t nfcid) {
 				uint8_t dist = (uint8_t)(AT91C_BASE_SSC->SSC_RHR);
 				//frtm = GetCountSspClk();
 				Process18092Byte(dist);
-				
+
                 if (FelicaFrame.state == STATE_FULL) {
 
                     if (FelicaFrame.crc_ok) {
-                       
+
                         if (FelicaFrame.framebytes[2] == 6 && FelicaFrame.framebytes[3] == 0) {
 
 							//polling... there are two types of polling we answer to
@@ -675,7 +675,7 @@ void felica_sim_lite(uint64_t nfcid) {
 								listenmode = true;
 							}
                         }
-						
+
                         if (FelicaFrame.framebytes[2] > 5 && FelicaFrame.framebytes[3] == 0x06) {
                             //we should rebuild it depending on page size, but...
                             //Let's see first
@@ -707,7 +707,7 @@ void felica_sim_lite(uint64_t nfcid) {
 			curresp = NULL;
         }
     }
-    
+
     switch_off();
 
 	//reset framing
@@ -721,38 +721,38 @@ void felica_dump_lite_s() {
 	uint8_t ndef[8];
 	uint8_t poll[10] = { 0xb2,0x4d,0x06,FELICA_POLL_REQ,0xff,0xff,0x00,0x00,0x09,0x21};
 	uint16_t liteblks[28] = {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x90,0x91,0x92,0xa0};
-		
+
 	// setup device.
 	iso18092_setup(FPGA_HF_ISO18092_FLAG_READER | FPGA_HF_ISO18092_FLAG_NOMOD);
-	
+
 	uint8_t blknum;
 	bool isOK = false;
 	uint16_t cnt = 0, cntfails = 0;
 	uint8_t *dest = BigBuf_get_addr();
 
 	while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
-		
+
 		WDT_HIT();
-		
-		// polling?  
+
+		// polling?
 		//TransmitFor18092_AsReader(poll, 10, GetCountSspClk()+512, 1, 0);
 		TransmitFor18092_AsReader(poll, 10, NULL, 1, 0);
-		
+
 		if (WaitForFelicaReply(512) && FelicaFrame.framebytes[3] == FELICA_POLL_ACK) {
-			
+
 			// copy 8bytes to ndef.
 			memcpy(ndef, FelicaFrame.framebytes + 4, 8);
 			// for (c=0; c < 8; c++)
 				// ndef[c] = FelicaFrame.framebytes[c+4];
-	
-			for (blknum=0; blknum < sizeof(liteblks); ) { 
 
-				// block to read. 
+			for (blknum=0; blknum < sizeof(liteblks); ) {
+
+				// block to read.
 				BuildFliteRdblk(ndef, 1, &liteblks[blknum]);
-				
+
 				//TransmitFor18092_AsReader(frameSpace, frameSpace[2]+4, GetCountSspClk()+512, 1, 0);
 				TransmitFor18092_AsReader(frameSpace, frameSpace[2]+4, NULL, 1, 0);
-				
+
 				// read block
 				if (WaitForFelicaReply(1024) && FelicaFrame.framebytes[3] == FELICA_RDBLK_ACK) {
 
@@ -766,10 +766,10 @@ void felica_dump_lite_s() {
 					//cnt += 16;
 					for(uint8_t j=0; j < 16; j++)
 						dest[cnt++] = fb[15+j];
-					
+
 					blknum++;
 					cntfails = 0;
-					
+
 					// // print raw log.
 					// Dbprintf("LEN %u | Dump bytes count %u ", FelicaFrame.len, cnt);
 					Dbhexdump(FelicaFrame.len, FelicaFrame.framebytes+15, 0);
@@ -782,15 +782,15 @@ void felica_dump_lite_s() {
 				}
 			}
 			isOK = true;
-			break; 
-		}  
+			break;
+		}
 	}
-	
+
 	switch_off();
 
-	//Resetting Frame mode (First set in fpgaloader.c)	
+	//Resetting Frame mode (First set in fpgaloader.c)
     AT91C_BASE_SSC->SSC_RFMR = SSC_FRAME_MODE_BITS_IN_WORD(8) | AT91C_SSC_MSBF | SSC_FRAME_MODE_WORDS_PER_TRANSFER(0);
-    
+
 	//setting tracelen - important!  it was set by buffer overflow before
     set_tracelen(cnt);
 	cmd_send(CMD_ACK, isOK, cnt, 0, 0, 0);
diff --git a/armsrc/flashmem.c b/armsrc/flashmem.c
index 92204baff..c3b7a6e82 100644
--- a/armsrc/flashmem.c
+++ b/armsrc/flashmem.c
@@ -4,9 +4,9 @@
 #define SPI_CSR_NUM      2
 #define SPI_PCS(npcs)       ((~(1 << (npcs)) & 0xF) << 16)
 /// Calculates the value of the CSR SCBR field given the baudrate and MCK.
-#define SPI_SCBR(baudrate, masterClock) ((uint32_t) ((masterClock) / (baudrate)) << 8) 
+#define SPI_SCBR(baudrate, masterClock) ((uint32_t) ((masterClock) / (baudrate)) << 8)
 /// Calculates the value of the CSR DLYBS field given the desired delay (in ns)
-#define SPI_DLYBS(delay, masterClock) ((uint32_t) ((((masterClock) / 1000000) * (delay)) / 1000) << 16) 
+#define SPI_DLYBS(delay, masterClock) ((uint32_t) ((((masterClock) / 1000000) * (delay)) / 1000) << 16)
 /// Calculates the value of the CSR DLYBCT field given the desired delay (in ns)
 #define SPI_DLYBCT(delay, masterClock) ((uint32_t) ((((masterClock) / 1000000) * (delay)) / 32000) << 24)
 
@@ -67,7 +67,7 @@ void FlashSetup(uint32_t baudrate){
 
 	//	NPCS2 Mode 0
 	AT91C_BASE_SPI->SPI_MR =
-		(0 << 24)	|		// Delay between chip selects = DYLBCS/MCK BUT: 
+		(0 << 24)	|		// Delay between chip selects = DYLBCS/MCK BUT:
 		                    // If DLYBCS is less than or equal to six, six MCK periods
 		            	    // will be inserted by default.
 		SPI_PCS(SPI_CSR_NUM) | 		// Peripheral Chip Select (selects SPI_NCS2 or PA10)
@@ -88,10 +88,10 @@ void FlashSetup(uint32_t baudrate){
 
 	AT91C_BASE_SPI->SPI_CSR[2] =
         SPI_DLYBCT(dlybct,MCK)		| // Delay between Consecutive Transfers (32 MCK periods)
-		SPI_DLYBS(0,MCK)		| // Delay Beforce SPCK CLock		
+		SPI_DLYBS(0,MCK)		| // Delay Beforce SPCK CLock
 		SPI_SCBR(baudrate,MCK)	| // SPI Baudrate Selection
 		AT91C_SPI_BITS_8		|	  // Bits per Transfer (8 bits)
-		//AT91C_SPI_CSAAT	|	// Chip Select inactive after transfer 
+		//AT91C_SPI_CSAAT	|	// Chip Select inactive after transfer
 							// 40.4.6.2 SPI: Bad tx_ready Behavior when CSAAT = 1 and SCBR = 1
 							// If the SPI is programmed with CSAAT = 1, SCBR(baudrate) = 1 and two transfers are performed consecutively on
 							// the same slave with an IDLE state between them, the tx_ready signal does not rise after the second data has been
@@ -140,17 +140,17 @@ void FlashStop(void) {
 
     // Disable all interrupts
     AT91C_BASE_SPI->SPI_IDR = 0xFFFFFFFF;
-	
+
 	// SPI disable
 	AT91C_BASE_SPI->SPI_CR = AT91C_SPI_SPIDIS;
 
 	if ( MF_DBGLEVEL > 3 ) Dbprintf("FlashStop");
-	
+
 	StopTicks();
 }
 
 //	send one byte over SPI
-uint16_t FlashSendByte(uint32_t data) {	
+uint16_t FlashSendByte(uint32_t data) {
 
 	// wait until SPI is ready for transfer
 	//if you are checking for incoming data returned then the TXEMPTY flag is redundant
@@ -176,7 +176,7 @@ uint16_t FlashSendLastByte(uint32_t data) {
 //	read state register 1
 uint8_t Flash_ReadStat1(void) {
 	FlashSendByte(READSTAT1);
-	return FlashSendLastByte(0xFF);	
+	return FlashSendLastByte(0xFF);
 }
 
 bool Flash_CheckBusy(uint32_t timeout)
@@ -215,10 +215,10 @@ uint8_t Flash_ReadID(void) {
 	FlashSendByte(0x00);
 
     uint8_t man_id = FlashSendByte(0xFF);
-	uint8_t dev_id = FlashSendLastByte(0xFF);	
+	uint8_t dev_id = FlashSendLastByte(0xFF);
 
 	if ( MF_DBGLEVEL > 3 ) Dbprintf("Flash ReadID  |  Man ID %02x | Device ID %02x", man_id, dev_id);
-	
+
 	if ( (man_id == WINBOND_MANID ) && (dev_id == WINBOND_DEVID) )
 		return dev_id;
 
@@ -248,9 +248,9 @@ void Flash_UniqueID(uint8_t *uid) {
 }
 
 uint16_t Flash_ReadData(uint32_t address, uint8_t *out, uint16_t len) {
-	
+
 	if (!FlashInit()) return 0;
-		
+
 	// length should never be zero
 	if (!len || Flash_CheckBusy(BUSY_TIMEOUT)) return 0;
 
@@ -268,8 +268,8 @@ uint16_t Flash_ReadData(uint32_t address, uint8_t *out, uint16_t len) {
 		out[i] = FlashSendByte(0xFF);
 
 	out[i] = FlashSendLastByte(0xFF);
-	FlashStop();	
-	return len;	
+	FlashStop();
+	return len;
 }
 
 void Flash_TransferAdresse(uint32_t address){
@@ -280,10 +280,10 @@ void Flash_TransferAdresse(uint32_t address){
 
 /* This ensure we can ReadData without having to cycle through initialization everytime */
 uint16_t Flash_ReadDataCont(uint32_t address, uint8_t *out, uint16_t len) {
-	
+
 	// length should never be zero
 	if (!len) return 0;
-	
+
     uint8_t cmd = (FASTFLASH) ? FASTREAD : READDATA;
 
 	FlashSendByte(cmd);
@@ -292,31 +292,31 @@ uint16_t Flash_ReadDataCont(uint32_t address, uint8_t *out, uint16_t len) {
     if (FASTFLASH){
 		FlashSendByte(DUMMYBYTE);
 	}
- 
+
 	uint16_t i = 0;
 	for (; i < (len - 1); i++)
 		out[i] = FlashSendByte(0xFF);
 
 	out[i] = FlashSendLastByte(0xFF);
-	return len;	
+	return len;
 }
 
 
 ////////////////////////////////////////
-// Write data can only program one page. A page has 256 bytes. 
+// Write data can only program one page. A page has 256 bytes.
 // if len > 256, it might wrap around and overwrite pos 0.
 uint16_t Flash_WriteData(uint32_t address, uint8_t *in, uint16_t len) {
 
 	// length should never be zero
 	if (!len)
 		return 0;
-	
+
 	//	Max 256 bytes write
 	if (((address & 0xFF) + len) > 256) {
 		Dbprintf("Flash_WriteData 256 fail [ 0x%02x ] [ %u ]", (address & 0xFF)+len, len );
 		return 0;
 	}
-	
+
 	// out-of-range
 	if ( (( address >> 16 ) & 0xFF ) > MAX_BLOCKS) {
 		Dbprintf("Flash_WriteData,  block out-of-range");
@@ -327,11 +327,11 @@ uint16_t Flash_WriteData(uint32_t address, uint8_t *in, uint16_t len) {
 		if ( MF_DBGLEVEL > 3 ) Dbprintf("Flash_WriteData init fail");
 		return 0;
 	}
-	
+
 	Flash_CheckBusy(BUSY_TIMEOUT);
 
 	Flash_WriteEnable();
-	
+
 	FlashSendByte(PAGEPROG);
 	FlashSendByte((address >> 16) & 0xFF);
 	FlashSendByte((address >> 8) & 0xFF);
@@ -344,7 +344,7 @@ uint16_t Flash_WriteData(uint32_t address, uint8_t *in, uint16_t len) {
 	FlashSendLastByte(in[i]);
 
 	FlashStop();
-	return len;	
+	return len;
 }
 
 
@@ -355,12 +355,12 @@ uint16_t Flash_WriteDataCont(uint32_t address, uint8_t *in, uint16_t len) {
 
 	if (!len)
 		return 0;
-	
+
 	if (((address & 0xFF) + len) > 256) {
 		Dbprintf("Flash_WriteDataCont 256 fail [ 0x%02x ] [ %u ]", (address & 0xFF)+len, len );
 		return 0;
 	}
-	
+
 	if ( (( address >> 16 ) & 0xFF ) > MAX_BLOCKS) {
 		Dbprintf("Flash_WriteDataCont,  block out-of-range");
 		return 0;
@@ -376,7 +376,7 @@ uint16_t Flash_WriteDataCont(uint32_t address, uint8_t *in, uint16_t len) {
 		FlashSendByte(in[i]);
 
 	FlashSendLastByte(in[i]);
-	return len;	
+	return len;
 }
 
 // assumes valid start 256 based 00 address
@@ -418,12 +418,12 @@ bool Flash_WipeMemoryPage(uint8_t page) {
 		return false;
 	}
 	Flash_ReadStat1();
-	
+
 	// Each block is 64Kb. One block erase takes 1s ( 1000ms )
-	Flash_WriteEnable(); Flash_Erase64k(page); Flash_CheckBusy(BUSY_TIMEOUT);	
+	Flash_WriteEnable(); Flash_Erase64k(page); Flash_CheckBusy(BUSY_TIMEOUT);
 
 	FlashStop();
-	return true;	
+	return true;
 }
 // Wipes flash memory completely, fills with 0xFF
 bool Flash_WipeMemory() {
@@ -432,22 +432,22 @@ bool Flash_WipeMemory() {
 		return false;
 	}
 	Flash_ReadStat1();
-	
+
 	// Each block is 64Kb.  Four blocks
 	// one block erase takes 1s ( 1000ms )
-	Flash_WriteEnable(); Flash_Erase64k(0); Flash_CheckBusy(BUSY_TIMEOUT);	
+	Flash_WriteEnable(); Flash_Erase64k(0); Flash_CheckBusy(BUSY_TIMEOUT);
 	Flash_WriteEnable(); Flash_Erase64k(1); Flash_CheckBusy(BUSY_TIMEOUT);
 	Flash_WriteEnable(); Flash_Erase64k(2); Flash_CheckBusy(BUSY_TIMEOUT);
 	Flash_WriteEnable(); Flash_Erase64k(3); Flash_CheckBusy(BUSY_TIMEOUT);
-	
+
 	FlashStop();
 	return true;
 }
 
 //	enable the flash write
 void Flash_WriteEnable() {
-	FlashSendLastByte(WRITEENABLE);	
-	if ( MF_DBGLEVEL > 3 ) Dbprintf("Flash Write enabled");	
+	FlashSendLastByte(WRITEENABLE);
+	if ( MF_DBGLEVEL > 3 ) Dbprintf("Flash Write enabled");
 }
 
 //	erase 4K at one time
@@ -488,9 +488,9 @@ bool Flash_Erase32k(uint32_t address) {
 // 0x02 00 00  -- 0x 02 FF FF  == block 2
 // 0x03 00 00  -- 0x 03 FF FF  == block 3
 bool Flash_Erase64k(uint8_t block) {
-	
+
 	if (block > MAX_BLOCKS) return false;
-	
+
 	FlashSendByte(BLOCK64ERASE);
 	FlashSendByte(block);
 	FlashSendByte(0x00);
@@ -512,7 +512,7 @@ void Flashmem_print_status(void) {
 		return;
 	}
 	DbpString("  Init....................OK");
-	
+
 	uint8_t dev_id = Flash_ReadID();
 	switch (dev_id) {
 		case 0x11 :
@@ -528,13 +528,13 @@ void Flashmem_print_status(void) {
 			DbpString("  Device ID............... -->  Unknown  <--");
 			break;
 	}
-	
+
 	uint8_t uid[8] = {0,0,0,0,0,0,0,0};
-	Flash_UniqueID(uid);	
+	Flash_UniqueID(uid);
 	Dbprintf("  Unique ID...............0x%02x%02x%02x%02x%02x%02x%02x%02x",
-			uid[7], uid[6], uid[5], uid[4], 
+			uid[7], uid[6], uid[5], uid[4],
 			uid[3], uid[2], uid[1], uid[0]
 	);
-	
+
 	FlashStop();
 }
diff --git a/armsrc/fpgaloader.c b/armsrc/fpgaloader.c
index e4ab1ab0b..6f8489026 100644
--- a/armsrc/fpgaloader.c
+++ b/armsrc/fpgaloader.c
@@ -28,7 +28,7 @@ static uint32_t uncompressed_bytes_cnt;
 // Used to write the FPGA config word
 // May also be used to write to other SPI attached devices like an LCD
 //-----------------------------------------------------------------------------
-static void DisableSpi(void) {		
+static void DisableSpi(void) {
 	//* Reset all the Chip Select register
     AT91C_BASE_SPI->SPI_CSR[0] = 0;
     AT91C_BASE_SPI->SPI_CSR[1] = 0;
@@ -40,7 +40,7 @@ static void DisableSpi(void) {
 
     // Disable all interrupts
     AT91C_BASE_SPI->SPI_IDR = 0xFFFFFFFF;
-	
+
 	// SPI disable
 	AT91C_BASE_SPI->SPI_CR = AT91C_SPI_SPIDIS;
 }
@@ -77,7 +77,7 @@ void SetupSpi(int mode) {
 				( 0 << 2)			|	// Chip selects connected directly to peripheral
 				AT91C_SPI_PS_FIXED	|	// Fixed Peripheral Select
 				AT91C_SPI_MSTR;		// Master Mode
-				
+
 			AT91C_BASE_SPI->SPI_CSR[0] =
 				( 1 << 24)	|	// Delay between Consecutive Transfers (32 MCK periods)
 				( 1 << 16)	|	// Delay Before SPCK (1 MCK period)
@@ -97,7 +97,7 @@ void SetupSpi(int mode) {
 				( 0 << 2)	|	// Chip selects connected directly to peripheral
 				( 0 << 1) 	|	// Fixed Peripheral Select
 				( 1 << 0);		// Master Mode
-				
+
 			AT91C_BASE_SPI->SPI_CSR[2] =
 				( 1 << 24)	|	// Delay between Consecutive Transfers (32 MCK periods)
 				( 1 << 16)	|	// Delay Before SPCK (1 MCK period)
@@ -107,9 +107,9 @@ void SetupSpi(int mode) {
 				( 1 << 1)	|	// Clock Phase data captured on leading edge, changes on following edge
 				( 0 << 0);		// Clock Polarity inactive state is logic 0
 			break;
-*/			
+*/
 		default:
-			DisableSpi();		
+			DisableSpi();
 			break;
 	}
 }
@@ -134,7 +134,7 @@ void FpgaSetupSscExt(uint8_t clearPCER) {
 
 	// Now set up the SSC proper, starting from a known state.
 	AT91C_BASE_SSC->SSC_CR = AT91C_SSC_SWRST;
-	
+
 	// RX clock comes from TX clock, RX starts when TX starts, data changes
 	// on RX clock rising edge, sampled on falling edge
 	AT91C_BASE_SSC->SSC_RCMR = SSC_CLOCK_MODE_SELECT(1) | SSC_CLOCK_MODE_START(1);
@@ -396,12 +396,12 @@ void FpgaDownloadAndGo(int bitstream_version) {
 	// check whether or not the bitstream is already loaded
 	if (downloaded_bitstream == bitstream_version)
 		return;
-	
+
 	z_stream compressed_fpga_stream;
 	uint8_t output_buffer[OUTPUT_BUFFER_LEN] = {0x00};
 
 	bool verbose = (MF_DBGLEVEL > 3);
-	
+
 	// make sure that we have enough memory to decompress
 	BigBuf_free(); BigBuf_Clear_ext(verbose);
 
@@ -418,7 +418,7 @@ void FpgaDownloadAndGo(int bitstream_version) {
 
 	// turn off antenna
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	
+
 	// free eventually allocated BigBuf memory
 	BigBuf_free(); BigBuf_Clear_ext(false);
 }
@@ -466,7 +466,7 @@ void SetAdcMuxFor(uint32_t whichGpio) {
 #ifndef WITH_FPC
 	LOW(GPIO_MUXSEL_HIRAW);
 	LOW(GPIO_MUXSEL_LORAW);
-#endif	
+#endif
 
 	HIGH(whichGpio);
 }
@@ -480,15 +480,15 @@ int FpgaGetCurrent(void) {
 	return downloaded_bitstream;
 }
 
-// Turns off the antenna, 
+// Turns off the antenna,
 // log message
 // if HF,  Disable SSC DMA
 // turn off trace and leds off.
-void switch_off(void) {	
+void switch_off(void) {
 	if (MF_DBGLEVEL > 3) Dbprintf("switch_off");
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 	if (downloaded_bitstream == FPGA_BITSTREAM_HF )
 		FpgaDisableSscDma();
 	set_tracing(false);
-	LEDsoff();	
+	LEDsoff();
 }
diff --git a/armsrc/fpgaloader.h b/armsrc/fpgaloader.h
index a1e0d1ee0..852d66dfa 100644
--- a/armsrc/fpgaloader.h
+++ b/armsrc/fpgaloader.h
@@ -83,7 +83,7 @@ extern void switch_off(void);
 #define FPGA_HF_SIMULATOR_MODULATE_212K				0x2 // 0010
 #define FPGA_HF_SIMULATOR_MODULATE_424K				0x4 // 0100
 #define FPGA_HF_SIMULATOR_MODULATE_424K_8BIT		0x5 // 0101
-//  no 848K 
+//  no 848K
 
 // Options for ISO14443A
 #define FPGA_HF_ISO14443A_SNIFFER					(0<<0)
@@ -92,10 +92,10 @@ extern void switch_off(void);
 #define FPGA_HF_ISO14443A_READER_LISTEN				(3<<0)
 #define FPGA_HF_ISO14443A_READER_MOD				(4<<0)
 
-//options for Felica. 
+//options for Felica.
 #define FPGA_MAJOR_MODE_ISO18092          			(5<<5) // 01010 0000
 #define FPGA_HF_ISO18092_FLAG_NOMOD                 (1<<0) // 0001 disable modulation module
 #define FPGA_HF_ISO18092_FLAG_424K                  (2<<0) // 0010 should enable 414k mode (untested). No autodetect
 #define FPGA_HF_ISO18092_FLAG_READER	            (4<<0) // 0100 enables antenna power, to act as a reader instead of tag
- 
+
 #endif
\ No newline at end of file
diff --git a/armsrc/hfsnoop.c b/armsrc/hfsnoop.c
index 06ec03ed6..cc72c7176 100644
--- a/armsrc/hfsnoop.c
+++ b/armsrc/hfsnoop.c
@@ -27,43 +27,43 @@ static void RAMFUNC optimizedSnoop(void)
 void HfSnoop(int samplesToSkip, int triggersToSkip)
 {
 	BigBuf_free(); BigBuf_Clear();
-	
+
 	Dbprintf("Skipping first %d sample pairs, Skipping %d triggers.\n", samplesToSkip, triggersToSkip);
 	int trigger_cnt = 0;
 
 	LED_D_ON();
 
 	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-	
+
 	SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
-	
+
 	// Set up the synchronous serial port
 	FpgaSetupSsc();
 
-	// Setting Frame Mode For better performance on high speed data transfer.	
+	// Setting Frame Mode For better performance on high speed data transfer.
 	AT91C_BASE_SSC->SSC_RFMR = SSC_FRAME_MODE_BITS_IN_WORD(16);
-	
+
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_SNOOP);
     SpinDelay(100);
-	
+
 	uint16_t r = 0;
 	while (!BUTTON_PRESS() && !usb_poll_validate_length() ) {
 		WDT_HIT();
-		
+
 		if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
 			r = (uint16_t)AT91C_BASE_SSC->SSC_RHR;
-			r = MAX(r & 0xff, r >> 8); 
+			r = MAX(r & 0xff, r >> 8);
             if (r >= 180) {  // 0xB4 ??
                 if (++trigger_cnt > triggersToSkip)
 				break;
-			} 
+			}
 		}
 	}
 
 	if (!BUTTON_PRESS()) {
 		int waitcount = samplesToSkip; // lets wait 40000 ticks of pck0
 		while(waitcount != 0) {
-			
+
 			if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY))
 				waitcount--;
 		}
@@ -72,7 +72,7 @@ void HfSnoop(int samplesToSkip, int triggersToSkip)
 	}
 
 	//Resetting Frame mode (First set in fpgaloader.c)
-	AT91C_BASE_SSC->SSC_RFMR = SSC_FRAME_MODE_BITS_IN_WORD(8) | AT91C_SSC_MSBF | SSC_FRAME_MODE_WORDS_PER_TRANSFER(0);	
+	AT91C_BASE_SSC->SSC_RFMR = SSC_FRAME_MODE_BITS_IN_WORD(8) | AT91C_SSC_MSBF | SSC_FRAME_MODE_WORDS_PER_TRANSFER(0);
 
 	DbpString("HF Snoop end");
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
diff --git a/armsrc/hitag2.c b/armsrc/hitag2.c
index 6095d1639..32db10190 100644
--- a/armsrc/hitag2.c
+++ b/armsrc/hitag2.c
@@ -66,9 +66,9 @@ static enum {
 	WRITE_STATE_PAGENUM_WRITTEN,
 	WRITE_STATE_PROG
 } writestate;
-	
 
-// ToDo: define a meaningful maximum size for auth_table. The bigger this is, the lower will be the available memory for traces. 
+
+// ToDo: define a meaningful maximum size for auth_table. The bigger this is, the lower will be the available memory for traces.
 // Historically it used to be FREE_BUFFER_SIZE, which was 2744.
 #define AUTH_TABLE_LENGTH 2744
 static uint8_t* auth_table;
@@ -237,23 +237,23 @@ static int hitag2_cipher_transcrypt(uint64_t* cs, uint8_t *data, unsigned int by
 
 #define HITAG_T_TAG_ONE_HALF_PERIOD		10
 #define HITAG_T_TAG_TWO_HALF_PERIOD		25
-#define HITAG_T_TAG_THREE_HALF_PERIOD	41 
-#define HITAG_T_TAG_FOUR_HALF_PERIOD	57 
+#define HITAG_T_TAG_THREE_HALF_PERIOD	41
+#define HITAG_T_TAG_FOUR_HALF_PERIOD	57
 
 #define HITAG_T_TAG_HALF_PERIOD			16
 #define HITAG_T_TAG_FULL_PERIOD			32
 
 #define HITAG_T_TAG_CAPTURE_ONE_HALF	13
 #define HITAG_T_TAG_CAPTURE_TWO_HALF	25
-#define HITAG_T_TAG_CAPTURE_THREE_HALF	41 
-#define HITAG_T_TAG_CAPTURE_FOUR_HALF   57 
+#define HITAG_T_TAG_CAPTURE_THREE_HALF	41
+#define HITAG_T_TAG_CAPTURE_FOUR_HALF   57
 
 
 static void hitag_send_bit(int bit) {
 	LED_A_ON();
-	// Reset clock for the next bit 
+	// Reset clock for the next bit
 	AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;
-	
+
 	// Fixed modulation, earlier proxmark version used inverted signal
 	if(bit == 0) {
 		// Manchester: Unloaded, then loaded |__--|
@@ -291,20 +291,20 @@ static void hitag_send_frame(const uint8_t* frame, size_t frame_len)
 static void hitag2_handle_reader_command(uint8_t* rx, const size_t rxlen, uint8_t* tx, size_t* txlen)
 {
 	uint8_t rx_air[HITAG_FRAME_LEN];
-	
+
 	// Copy the (original) received frame how it is send over the air
 	memcpy(rx_air,rx,nbytes(rxlen));
 
 	if(tag.crypto_active) {
 		hitag2_cipher_transcrypt(&(tag.cs),rx,rxlen/8,rxlen%8);
 	}
-	
-	// Reset the transmission frame length 
+
+	// Reset the transmission frame length
 	*txlen = 0;
-	
+
 	// Try to find out which command was send by selecting on length (in bits)
 	switch (rxlen) {
-		// Received 11000 from the reader, request for UID, send UID 
+		// Received 11000 from the reader, request for UID, send UID
 		case 05: {
 			// Always send over the air in the clear plaintext mode
 			if(rx_air[0] != 0xC0) {
@@ -317,7 +317,7 @@ static void hitag2_handle_reader_command(uint8_t* rx, const size_t rxlen, uint8_
 		}
 		break;
 
-		// Read/Write command: ..xx x..y  yy with yyy == ~xxx, xxx is sector number 
+		// Read/Write command: ..xx x..y  yy with yyy == ~xxx, xxx is sector number
 		case 10: {
 			unsigned int sector = (~( ((rx[0]<<2)&0x04) | ((rx[1]>>6)&0x03) ) & 0x07);
 			// Verify complement of sector index
@@ -332,7 +332,7 @@ static void hitag2_handle_reader_command(uint8_t* rx, const size_t rxlen, uint8_
 					memcpy(tx,tag.sectors[sector],4);
 					*txlen = 32;
 				break;
-					
+
 				 // Inverted Read command: 01xx x10y
 				case 0x44:
 					for (size_t i=0; i<4; i++) {
@@ -349,7 +349,7 @@ static void hitag2_handle_reader_command(uint8_t* rx, const size_t rxlen, uint8_
 					tag.active_sector = sector;
 					tag.state=TAG_STATE_WRITING;
 				break;
-				
+
 				// Unknown command
 				default:
 					Dbprintf("Unknown command: %02x %02x",rx[0],rx[1]);
@@ -409,7 +409,7 @@ static void hitag2_handle_reader_command(uint8_t* rx, const size_t rxlen, uint8_
 
 //	LogTraceHitag(rx,rxlen,0,0,false);
 //	LogTraceHitag(tx,*txlen,0,0,true);
-	
+
 	if(tag.crypto_active) {
 		hitag2_cipher_transcrypt(&(tag.cs), tx, *txlen/8, *txlen%8);
 	}
@@ -417,22 +417,22 @@ static void hitag2_handle_reader_command(uint8_t* rx, const size_t rxlen, uint8_
 
 static void hitag_reader_send_bit(int bit) {
 	LED_A_ON();
-	// Reset clock for the next bit 
+	// Reset clock for the next bit
 	AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;
-	
+
 	// Binary puls length modulation (BPLM) is used to encode the data stream
 	// This means that a transmission of a one takes longer than that of a zero
-	
+
 	// Enable modulation, which means, drop the field
 	HIGH(GPIO_SSC_DOUT);
-	
+
 	// Wait for 4-10 times the carrier period
 	while(AT91C_BASE_TC0->TC_CV < T0*6);
 	//	SpinDelayUs(8*8);
-	
+
 	// Disable modulation, just activates the field again
 	LOW(GPIO_SSC_DOUT);
-	
+
 	if(bit == 0) {
 		// Zero bit: |_-|
 		while (AT91C_BASE_TC0->TC_CV < T0*22) {};
@@ -451,7 +451,7 @@ static void hitag_reader_send_frame(const uint8_t* frame, size_t frame_len)
 	for(size_t i=0; i<frame_len; i++) {
 		hitag_reader_send_bit((frame[i/8] >> (7-(i%8)))&1);
 	}
-	// Send EOF 
+	// Send EOF
 	AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;
 	// Enable modulation, which means, drop the field
 	HIGH(GPIO_SSC_DOUT);
@@ -466,7 +466,7 @@ size_t blocknr;
 static bool hitag2_password(uint8_t* rx, const size_t rxlen, uint8_t* tx, size_t* txlen) {
 	// Reset the transmission frame length
 	*txlen = 0;
-	
+
 	// Try to find out which command was send by selecting on length (in bits)
 	switch (rxlen) {
 		// No answer, try to resurrect
@@ -479,7 +479,7 @@ static bool hitag2_password(uint8_t* rx, const size_t rxlen, uint8_t* tx, size_t
 			*txlen = 5;
 			memcpy(tx,"\xc0",nbytes(*txlen));
 		} break;
-			
+
 		// Received UID, tag password
 		case 32: {
 			if (!bPwd) {
@@ -489,14 +489,14 @@ static bool hitag2_password(uint8_t* rx, const size_t rxlen, uint8_t* tx, size_t
 				memcpy(tag.sectors[blocknr],rx,4);
 				blocknr++;
 			} else {
-				
+
 				if(blocknr == 1){
 					//store password in block1, the TAG answers with Block3, but we need the password in memory
 					memcpy(tag.sectors[blocknr],tx,4);
 				} else {
 					memcpy(tag.sectors[blocknr],rx,4);
 				}
-				
+
 				blocknr++;
 				if (blocknr > 7) {
 					DbpString("Read succesful!");
@@ -508,7 +508,7 @@ static bool hitag2_password(uint8_t* rx, const size_t rxlen, uint8_t* tx, size_t
 				tx[1] = ((blocknr^7) << 6);
 			}
 		} break;
-			
+
 		// Unexpected response
     default: {
 			Dbprintf("Uknown frame length: %d",rxlen);
@@ -563,7 +563,7 @@ static bool hitag2_write_page(uint8_t* rx, const size_t rxlen, uint8_t* tx, size
 static bool hitag2_crypto(uint8_t* rx, const size_t rxlen, uint8_t* tx, size_t* txlen, bool write) {
 	// Reset the transmission frame length
 	*txlen = 0;
-	
+
   if(bCrypto) {
 		hitag2_cipher_transcrypt(&cipher_state,rx,rxlen/8,rxlen%8);
 	}
@@ -647,7 +647,7 @@ static bool hitag2_crypto(uint8_t* rx, const size_t rxlen, uint8_t* tx, size_t*
 			}
 		}
 		} break;
-			
+
       // Unexpected response
 		default: {
 			Dbprintf("Uknown frame length: %d",rxlen);
@@ -655,7 +655,7 @@ static bool hitag2_crypto(uint8_t* rx, const size_t rxlen, uint8_t* tx, size_t*
 		} break;
 	}
 	}
-  
+
 	if(bCrypto) {
 		// We have to return now to avoid double encryption
 		if (!bAuthenticating) {
@@ -668,9 +668,9 @@ static bool hitag2_crypto(uint8_t* rx, const size_t rxlen, uint8_t* tx, size_t*
 
 
 static bool hitag2_authenticate(uint8_t* rx, const size_t rxlen, uint8_t* tx, size_t* txlen) {
-	// Reset the transmission frame length 
+	// Reset the transmission frame length
 	*txlen = 0;
-	
+
 	// Try to find out which command was send by selecting on length (in bits)
 	switch (rxlen) {
 		// No answer, try to resurrect
@@ -683,7 +683,7 @@ static bool hitag2_authenticate(uint8_t* rx, const size_t rxlen, uint8_t* tx, si
 			*txlen = 5;
 			memcpy(tx,"\xc0", nbytes(*txlen));
 		} break;
-			
+
 		// Received UID, crypto tag answer
 		case 32: {
 			if (!bCrypto) {
@@ -695,23 +695,23 @@ static bool hitag2_authenticate(uint8_t* rx, const size_t rxlen, uint8_t* tx, si
 				return true;
 			}
 		} break;
-			
+
 		// Unexpected response
 		default: {
 			Dbprintf("Uknown frame length: %d", rxlen);
 			return false;
 		} break;
 	}
-	
+
 	return true;
 }
 
 
 static bool hitag2_test_auth_attempts(uint8_t* rx, const size_t rxlen, uint8_t* tx, size_t* txlen) {
 
-	// Reset the transmission frame length 
+	// Reset the transmission frame length
 	*txlen = 0;
-	
+
 	// Try to find out which command was send by selecting on length (in bits)
 	switch (rxlen) {
 			// No answer, try to resurrect
@@ -736,7 +736,7 @@ static bool hitag2_test_auth_attempts(uint8_t* rx, const size_t rxlen, uint8_t*
 			*txlen = 5;
 			memcpy(tx,"\xc0",nbytes(*txlen));
 		}	break;
-			
+
 			// Received UID, crypto tag answer, or read block response
 		case 32: {
 			if (!bCrypto) {
@@ -753,13 +753,13 @@ static bool hitag2_test_auth_attempts(uint8_t* rx, const size_t rxlen, uint8_t*
 				memcpy(NrAr,auth_table+auth_table_pos,8);
 			}
 		} break;
-			
+
 		default: {
 			Dbprintf("Uknown frame length: %d",rxlen);
 			return false;
 		} break;
 	}
-	
+
 	return true;
 }
 
@@ -811,54 +811,54 @@ void SnoopHitag(uint32_t type) {
 	int tag_sof;
 	uint8_t rx[HITAG_FRAME_LEN];
 	size_t rxlen=0;
-	
+
 	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-	
+
 	// free eventually allocated BigBuf memory
 	BigBuf_free(); BigBuf_Clear_ext(false);
-	
+
 	// Clean up trace and prepare it for storing frames
 	clear_trace();
 	set_tracing(true);
-	
+
 	auth_table_len = 0;
 	auth_table_pos = 0;
 
     auth_table = (uint8_t *)BigBuf_malloc(AUTH_TABLE_LENGTH);
 	memset(auth_table, 0x00, AUTH_TABLE_LENGTH);
-	
+
 	DbpString("Starting Hitag2 snoop");
 	LED_D_ON();
-	
+
 	// Set up eavesdropping mode, frequency divisor which will drive the FPGA
 	// and analog mux selection.
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT  | FPGA_LF_EDGE_DETECT_TOGGLE_MODE);
 	FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
 	SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
 	RELAY_OFF();
-	
+
 	// Configure output pin that is connected to the FPGA (for modulating)
 	AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
 	AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
 
 	// Disable modulation, we are going to eavesdrop, not modulate ;)
 	LOW(GPIO_SSC_DOUT);
-	
+
 	// Enable Peripheral Clock for TIMER_CLOCK1, used to capture edges of the reader frames
 	AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC1);
 	AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
-	
-	// Disable timer during configuration	
+
+	// Disable timer during configuration
 	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
-	
+
 	// Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
 	// external trigger rising edge, load RA on rising edge of TIOA.
 	uint32_t t1_channel_mode = AT91C_TC_CLKS_TIMER_DIV1_CLOCK | AT91C_TC_ETRGEDG_BOTH | AT91C_TC_ABETRG | AT91C_TC_LDRA_BOTH;
 	AT91C_BASE_TC1->TC_CMR = t1_channel_mode;
-	
+
 	// Enable and reset counter
 	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
-	
+
 	// Reset the received frame, frame count and timing info
 	memset(rx, 0x00, sizeof(rx));
 	frame_count = 0;
@@ -868,18 +868,18 @@ void SnoopHitag(uint32_t type) {
 	lastbit = 1;
 	bSkip = true;
 	tag_sof = 4;
-	
+
 	while(!BUTTON_PRESS() && !usb_poll_validate_length()) {
 		// Watchdog hit
 		WDT_HIT();
-		
+
 		// Receive frame, watch for at most T0*EOF periods
 		while (AT91C_BASE_TC1->TC_CV < T0*HITAG_T_EOF) {
 			// Check if rising edge in modulation is detected
 			if(AT91C_BASE_TC1->TC_SR & AT91C_TC_LDRAS) {
-				// Retrieve the new timing values 
+				// Retrieve the new timing values
 				int ra = (AT91C_BASE_TC1->TC_RA/T0);
-				
+
 				// Find out if we are dealing with a rising or falling edge
 				rising_edge = (AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_FRAME) > 0;
 
@@ -891,17 +891,17 @@ void SnoopHitag(uint32_t type) {
 					memset(rx,0x00,sizeof(rx));
 					rxlen = 0;
 				}
-				
+
 				// Only handle if reader frame and rising edge, or tag frame and falling edge
 				if (reader_frame != rising_edge) {
 				  overflow += ra;
 					continue;
 				}
-				
+
 				// Add the buffered timing values of earlier captured edges which were skipped
 				ra += overflow;
 				overflow = 0;
-				
+
 				if (reader_frame) {
 					LED_B_ON();
 					// Capture reader frame
@@ -912,11 +912,11 @@ void SnoopHitag(uint32_t type) {
 						// Capture the T0 periods that have passed since last communication or field drop (reset)
 						response = (ra - HITAG_T_LOW);
 					} else if(ra >= HITAG_T_1_MIN ) {
-						// '1' bit 
+						// '1' bit
 						rx[rxlen / 8] |= 1 << (7-(rxlen%8));
 						rxlen++;
 					} else if(ra >= HITAG_T_0_MIN) {
-						// '0' bit 
+						// '0' bit
 						rx[rxlen / 8] |= 0 << (7-(rxlen%8));
 						rxlen++;
 					} else {
@@ -942,7 +942,7 @@ void SnoopHitag(uint32_t type) {
 						// Manchester coding example |_-|...|_-|-_| (0...01)
 						rx[rxlen / 8] |= 0 << (7-(rxlen%8));
 						rxlen++;
-						// We have to skip this half period at start and add the 'one' the second time 
+						// We have to skip this half period at start and add the 'one' the second time
 						if (!bSkip) {
 							rx[rxlen / 8] |= 1 << (7-(rxlen%8));
 							rxlen++;
@@ -965,7 +965,7 @@ void SnoopHitag(uint32_t type) {
 				}
 			}
 		}
-		
+
 		// Check if frame was captured
 		if(rxlen > 0) {
 			frame_count++;
@@ -982,7 +982,7 @@ void SnoopHitag(uint32_t type) {
 					auth_table_len += 8;
 				}
 			}
-			
+
 			// Reset the received frame and response timing info
 			memset(rx,0x00,sizeof(rx));
 			response = 0;
@@ -991,7 +991,7 @@ void SnoopHitag(uint32_t type) {
 			bSkip = true;
 			tag_sof = 4;
 			overflow = 0;
-			
+
 			LED_B_OFF();
 			LED_C_OFF();
 		} else {
@@ -1027,7 +1027,7 @@ void SimulateHitagTag(bool tag_mem_supplied, uint8_t* data) {
 	size_t txlen=0;
 	bool bQuitTraceFull = false;
 	bQuiet = false;
-	
+
 	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
 
 	// free eventually allocated BigBuf memory
@@ -1036,7 +1036,7 @@ void SimulateHitagTag(bool tag_mem_supplied, uint8_t* data) {
 	// Clean up trace and prepare it for storing frames
 	clear_trace();
 	set_tracing(true);
-	
+
 	auth_table_len = 0;
 	auth_table_pos = 0;
     uint8_t* auth_table;
@@ -1047,7 +1047,7 @@ void SimulateHitagTag(bool tag_mem_supplied, uint8_t* data) {
 	DbpString("Starting Hitag2 simulation");
 	LED_D_ON();
 	hitag2_init();
-	
+
 	if (tag_mem_supplied) {
 		DbpString("Loading hitag2 memory...");
 		memcpy((uint8_t*)tag.sectors,data,48);
@@ -1061,7 +1061,7 @@ void SimulateHitagTag(bool tag_mem_supplied, uint8_t* data) {
 		}
 		Dbprintf("| %d | %08x |",i,block);
 	}
-	
+
 	// Set up simulator mode, frequency divisor which will drive the FPGA
 	// and analog mux selection.
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT);
@@ -1076,21 +1076,21 @@ void SimulateHitagTag(bool tag_mem_supplied, uint8_t* data) {
 
 	// Disable modulation at default, which means release resistance
 	LOW(GPIO_SSC_DOUT);
-	
+
 	// Enable Peripheral Clock for TIMER_CLOCK0, used to measure exact timing before answering
 	AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC0);
-	
+
 	// Enable Peripheral Clock for TIMER_CLOCK1, used to capture edges of the reader frames
 	AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC1);
 	AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
-	
-    // Disable timer during configuration	
+
+    // Disable timer during configuration
 	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 
 	// Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
 	// external trigger rising edge, load RA on rising edge of TIOA.
 	AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK | AT91C_TC_ETRGEDG_RISING | AT91C_TC_ABETRG | AT91C_TC_LDRA_RISING;
-	
+
 	// Reset the received frame, frame count and timing info
 	memset(rx,0x00,sizeof(rx));
 	frame_count = 0;
@@ -1099,24 +1099,24 @@ void SimulateHitagTag(bool tag_mem_supplied, uint8_t* data) {
 
 	// Enable and reset counter
 	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
-	
+
 	while(!BUTTON_PRESS() && !usb_poll_validate_length()) {
 		// Watchdog hit
 		WDT_HIT();
-		
+
 		// Receive frame, watch for at most T0*EOF periods
 		while (AT91C_BASE_TC1->TC_CV < T0*HITAG_T_EOF) {
 			// Check if rising edge in modulation is detected
 			if(AT91C_BASE_TC1->TC_SR & AT91C_TC_LDRAS) {
-				// Retrieve the new timing values 
+				// Retrieve the new timing values
 				int ra = (AT91C_BASE_TC1->TC_RA/T0) + overflow;
 				overflow = 0;
 
 				// Reset timer every frame, we have to capture the last edge for timing
 				AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
-				
+
 				LED_B_ON();
-				
+
 				// Capture reader frame
 				if(ra >= HITAG_T_STOP) {
 					if (rxlen != 0) {
@@ -1125,11 +1125,11 @@ void SimulateHitagTag(bool tag_mem_supplied, uint8_t* data) {
 					// Capture the T0 periods that have passed since last communication or field drop (reset)
 					response = (ra - HITAG_T_LOW);
 				} else if(ra >= HITAG_T_1_MIN ) {
-					// '1' bit 
+					// '1' bit
 					rx[rxlen / 8] |= 1 << (7-(rxlen%8));
 					rxlen++;
 				} else if(ra >= HITAG_T_0_MIN) {
-					// '0' bit 
+					// '0' bit
 					rx[rxlen / 8] |= 0 << (7-(rxlen%8));
 					rxlen++;
 				} else {
@@ -1137,7 +1137,7 @@ void SimulateHitagTag(bool tag_mem_supplied, uint8_t* data) {
 				}
 			}
 		}
-		
+
 		// Check if frame was captured
 		if(rxlen > 4) {
 			frame_count++;
@@ -1151,17 +1151,17 @@ void SimulateHitagTag(bool tag_mem_supplied, uint8_t* data) {
 					}
 				}
 			}
-			
+
 			// Disable timer 1 with external trigger to avoid triggers during our own modulation
 			AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 
 			// Process the incoming frame (rx) and prepare the outgoing frame (tx)
 			hitag2_handle_reader_command(rx,rxlen,tx,&txlen);
-			
+
 			// Wait for HITAG_T_WAIT_1 carrier periods after the last reader bit,
 			// not that since the clock counts since the rising edge, but T_Wait1 is
 			// with respect to the falling edge, we need to wait actually (T_Wait1 - T_Low)
-			// periods. The gap time T_Low varies (4..10). All timer values are in 
+			// periods. The gap time T_Low varies (4..10). All timer values are in
 			// terms of T0 units
 			while(AT91C_BASE_TC0->TC_CV < T0*(HITAG_T_WAIT_1-HITAG_T_LOW));
 
@@ -1181,11 +1181,11 @@ void SimulateHitagTag(bool tag_mem_supplied, uint8_t* data) {
 					}
 				}
 			}
-			
+
 			// Reset the received frame and response timing info
 			memset(rx,0x00,sizeof(rx));
 			response = 0;
-			
+
 			// Enable and reset external trigger in timer for capturing future frames
 			AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 			LED_B_OFF();
@@ -1202,7 +1202,7 @@ void SimulateHitagTag(bool tag_mem_supplied, uint8_t* data) {
 	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 	AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	
+
 	DbpString("Sim Stopped");
 	set_tracing(false);
 }
@@ -1217,20 +1217,20 @@ void ReaderHitag(hitag_function htf, hitag_data* htd) {
 	size_t txlen = 0;
 	int lastbit = 1;
 	bool bSkip;
-	int reset_sof; 
+	int reset_sof;
 	int tag_sof;
 	int t_wait = HITAG_T_WAIT_MAX;
 	bool bStop = false;
 	bool bQuitTraceFull = false;
-  
+
 	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
 	// Reset the return status
 	bSuccessful = false;
-  
+
 	// Clean up trace and prepare it for storing frames
 	clear_trace();
 	set_tracing(true);
-	
+
 	//DbpString("Starting Hitag reader family");
 
 	// Check configuration
@@ -1243,7 +1243,7 @@ void ReaderHitag(hitag_function htf, hitag_data* htd) {
 			bQuiet = false;
 			bPwd = false;
 		} break;
-      
+
 		case RHT2F_AUTHENTICATE: {
 			DbpString("Authenticating using nr,ar pair:");
 			memcpy(NrAr,htd->auth.NrAr, 8);
@@ -1253,7 +1253,7 @@ void ReaderHitag(hitag_function htf, hitag_data* htd) {
 			bAuthenticating = false;
 			bQuitTraceFull = true;
 		} break;
-      
+
 		case RHT2F_CRYPTO: {
 			DbpString("Authenticating using key:");
 			memcpy(key,htd->crypto.key, 6);	  //HACK; 4 or 6??  I read both in the code.
@@ -1286,18 +1286,18 @@ void ReaderHitag(hitag_function htf, hitag_data* htd) {
 			return;
 		} break;
 	}
-	
+
 	LED_D_ON();
 	hitag2_init();
-	
+
 	// Configure output and enable pin that is connected to the FPGA (for modulating)
 	AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
 	AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
-	
+
 	// Set fpga in edge detect with reader field, we can modulate as reader now
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_READER_FIELD);
 	SpinDelay(20);
-	
+
 	// Set Frequency divisor which will drive the FPGA and analog mux selection
 	FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
 	SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
@@ -1308,21 +1308,21 @@ void ReaderHitag(hitag_function htf, hitag_data* htd) {
 
 	// Give it a bit of time for the resonant antenna to settle.
 	SpinDelay(30);
-	
+
 	// Enable Peripheral Clock for TIMER_CLOCK0, used to measure exact timing before answering
 	AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC0);
 
 	// Enable Peripheral Clock for TIMER_CLOCK1, used to capture edges of the tag frames
 	AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC1);
 	AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
-	
-    // Disable timer during configuration	
+
+    // Disable timer during configuration
 	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
-	
+
 	// Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
 	// external trigger rising edge, load RA on falling edge of TIOA.
 	AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK | AT91C_TC_ETRGEDG_FALLING | AT91C_TC_ABETRG | AT91C_TC_LDRA_FALLING;
-	
+
 	// Enable and reset counters
 	AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
@@ -1345,7 +1345,7 @@ void ReaderHitag(hitag_function htf, hitag_data* htd) {
     // DbpString("Configured for hitag2 reader");
 	} else {
 		Dbprintf("Error, unknown hitag reader type: %d",htf);
-		set_tracing(false);	
+		set_tracing(false);
 		LED_D_OFF();
 		return;
 	}
@@ -1353,7 +1353,7 @@ void ReaderHitag(hitag_function htf, hitag_data* htd) {
 	while (!bStop && !BUTTON_PRESS()) {
 		// Watchdog hit
 		WDT_HIT();
-		
+
 		// Check if frame was captured and store it
 		if (rxlen > 0) {
 			frame_count++;
@@ -1367,7 +1367,7 @@ void ReaderHitag(hitag_function htf, hitag_data* htd) {
 				}
 			}
 		}
-		
+
 		// By default reset the transmission buffer
 		tx = txbuf;
 		switch (htf) {
@@ -1396,18 +1396,18 @@ void ReaderHitag(hitag_function htf, hitag_data* htd) {
 				return;
 			} break;
 		}
-		
+
 		// Send and store the reader command
 		// Disable timer 1 with external trigger to avoid triggers during our own modulation
 		AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
-			
+
 		// Wait for HITAG_T_WAIT_2 carrier periods after the last tag bit before transmitting,
 		// Since the clock counts since the last falling edge, a 'one' means that the
 		// falling edge occured halfway the period. with respect to this falling edge,
 		// we need to wait (T_Wait2 + half_tag_period) when the last was a 'one'.
 		// All timer values are in terms of T0 units
 		while (AT91C_BASE_TC0->TC_CV < T0 * (t_wait + (HITAG_T_TAG_HALF_PERIOD * lastbit)));
-		
+
 		// Transmit the reader frame
 		hitag_reader_send_frame(tx, txlen);
 
@@ -1428,7 +1428,7 @@ void ReaderHitag(hitag_function htf, hitag_data* htd) {
 				}
 			}
 		}
-				
+
 		// Reset values for receiving frames
 		memset(rx, 0x00, sizeof(rx));
 		rxlen = 0;
@@ -1437,19 +1437,19 @@ void ReaderHitag(hitag_function htf, hitag_data* htd) {
 		tag_sof = reset_sof;
 		response = 0;
 		uint32_t errorCount = 0;
-		
+
 		// Receive frame, watch for at most T0*EOF periods
 		while (AT91C_BASE_TC1->TC_CV < T0 * HITAG_T_WAIT_MAX) {
 			// Check if falling edge in tag modulation is detected
 			if (AT91C_BASE_TC1->TC_SR & AT91C_TC_LDRAS) {
-				// Retrieve the new timing values 
+				// Retrieve the new timing values
 				int ra = (AT91C_BASE_TC1->TC_RA/T0);
-				
+
 				// Reset timer every frame, we have to capture the last edge for timing
 				AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;
-				
+
 				LED_B_ON();
-				
+
 				// Capture tag frame (manchester decoding using only falling edges)
 				if (ra >= HITAG_T_EOF) {
 					// Capture the T0 periods that have passed since last communication or field drop (reset)
@@ -1465,7 +1465,7 @@ void ReaderHitag(hitag_function htf, hitag_data* htd) {
 					// Manchester coding example |_-|...|_-|-_| (0...01)
 					rx[rxlen / 8] |= 0 << (7-(rxlen%8));
 					rxlen++;
-					// We have to skip this half period at start and add the 'one' the second time 
+					// We have to skip this half period at start and add the 'one' the second time
 					if (!bSkip) {
 						rx[rxlen / 8] |= 1 << (7-(rxlen%8));
 						rxlen++;
@@ -1519,16 +1519,16 @@ void WriterHitag(hitag_function htf, hitag_data* htd, int page) {
 	size_t txlen=0;
 	int lastbit;
 	bool bSkip;
-	int reset_sof; 
+	int reset_sof;
 	int tag_sof;
 	int t_wait = HITAG_T_WAIT_MAX;
 	bool bStop;
 	bool bQuitTraceFull = false;
-  
+
 	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
 	// Reset the return status
 	bSuccessful = false;
-  
+
 	// Clean up trace and prepare it for storing frames
 	set_tracing(true);
 	clear_trace();
@@ -1554,14 +1554,14 @@ void WriterHitag(hitag_function htf, hitag_data* htd, int page) {
 		return;
 	} break;
 	}
-	
+
 	LED_D_ON();
 	hitag2_init();
-	
+
 	// Configure output and enable pin that is connected to the FPGA (for modulating)
 	AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
 	AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
-	
+
 	// Set fpga in edge detect with reader field, we can modulate as reader now
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_READER_FIELD);
 
@@ -1575,21 +1575,21 @@ void WriterHitag(hitag_function htf, hitag_data* htd, int page) {
 
 	// Give it a bit of time for the resonant antenna to settle.
 	SpinDelay(30);
-	
+
 	// Enable Peripheral Clock for TIMER_CLOCK0, used to measure exact timing before answering
 	AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC0);
 
 	// Enable Peripheral Clock for TIMER_CLOCK1, used to capture edges of the tag frames
 	AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC1);
 	AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
-	
-	// Disable timer during configuration	
+
+	// Disable timer during configuration
 	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
-	
+
 	// Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
 	// external trigger rising edge, load RA on falling edge of TIOA.
 	AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK | AT91C_TC_ETRGEDG_FALLING | AT91C_TC_ABETRG | AT91C_TC_LDRA_FALLING;
-	
+
 	// Enable and reset counters
 	AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
@@ -1623,7 +1623,7 @@ void WriterHitag(hitag_function htf, hitag_data* htd, int page) {
 	while(!bStop && !BUTTON_PRESS()) {
 		// Watchdog hit
 		WDT_HIT();
-		
+
 		// Check if frame was captured and store it
 		if(rxlen > 0) {
 			frame_count++;
@@ -1638,7 +1638,7 @@ void WriterHitag(hitag_function htf, hitag_data* htd, int page) {
 				}
 			}
 		}
-		
+
 		// By default reset the transmission buffer
 		tx = txbuf;
 		switch(htf) {
@@ -1650,20 +1650,20 @@ void WriterHitag(hitag_function htf, hitag_data* htd, int page) {
 			return;
 		} break;
 		}
-		
+
 		// Send and store the reader command
 		// Disable timer 1 with external trigger to avoid triggers during our own modulation
 		AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
-			
+
 		// Wait for HITAG_T_WAIT_2 carrier periods after the last tag bit before transmitting,
 		// Since the clock counts since the last falling edge, a 'one' means that the
 		// falling edge occured halfway the period. with respect to this falling edge,
 		// we need to wait (T_Wait2 + half_tag_period) when the last was a 'one'.
 		// All timer values are in terms of T0 units
 		while(AT91C_BASE_TC0->TC_CV < T0*(t_wait+(HITAG_T_TAG_HALF_PERIOD*lastbit)));
-			
+
 		// Dbprintf("DEBUG: Sending reader frame");
-		
+
 		// Transmit the reader frame
 		hitag_reader_send_frame(tx,txlen);
 
@@ -1699,14 +1699,14 @@ void WriterHitag(hitag_function htf, hitag_data* htd, int page) {
 		while (AT91C_BASE_TC1->TC_CV < T0*HITAG_T_WAIT_MAX) {
 			// Check if falling edge in tag modulation is detected
 			if(AT91C_BASE_TC1->TC_SR & AT91C_TC_LDRAS) {
-				// Retrieve the new timing values 
+				// Retrieve the new timing values
 				int ra = (AT91C_BASE_TC1->TC_RA/T0);
-				
+
 				// Reset timer every frame, we have to capture the last edge for timing
 				AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;
-				
+
 				LED_B_ON();
-				 
+
 				// Capture tag frame (manchester decoding using only falling edges)
 				if(ra >= HITAG_T_EOF) {
 					if (rxlen != 0) {
@@ -1728,14 +1728,14 @@ void WriterHitag(hitag_function htf, hitag_data* htd, int page) {
 					rxlen++;
 				} else if(ra >= HITAG_T_TAG_CAPTURE_THREE_HALF) {
 					// Manchester coding example |_-|...|_-|-_| (0...01)
-					
+
 					// need to test to verify we don't exceed memory...
 					// if ( ((rxlen+2) / 8) > HITAG_FRAME_LEN) {
 					//	break;
 					// }
 					rx[rxlen / 8] |= 0 << (7-(rxlen%8));
 					rxlen++;
-					// We have to skip this half period at start and add the 'one' the second time 
+					// We have to skip this half period at start and add the 'one' the second time
 					if (!bSkip) {
 						rx[rxlen / 8] |= 1 << (7-(rxlen%8));
 						rxlen++;
@@ -1770,7 +1770,7 @@ void WriterHitag(hitag_function htf, hitag_data* htd, int page) {
 				if (rxlen>0) break;
 			}
 		}
-		
+
 		// Wait some extra time for flash to be programmed
 		if ((rxlen == 0) && (writestate == WRITE_STATE_PROG))
 		{
@@ -1779,7 +1779,7 @@ void WriterHitag(hitag_function htf, hitag_data* htd, int page) {
 		}
 	}
 	// Dbprintf("DEBUG: Done waiting for frame");
-	
+
 	LED_B_OFF();
 	LED_D_OFF();
 	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
diff --git a/armsrc/hitagS.c b/armsrc/hitagS.c
index 59e2694e5..489cf9f7e 100644
--- a/armsrc/hitagS.c
+++ b/armsrc/hitagS.c
@@ -63,7 +63,7 @@ static const u32 ht2_f5c = 0x7907287B;			// 0111 1001 0000 0111 0010 1000 0111 1
 #define ht2bs_4a(a,b,c,d)	(~(((a|b)&c)^(a|d)^b))
 #define ht2bs_4b(a,b,c,d)	(~(((d|c)&(a^b))^(d|a|b)))
 #define ht2bs_5c(a,b,c,d,e)	(~((((((c^e)|d)&a)^b)&(c^b))^(((d^e)|a)&((d^b)|c))))
-#define uf20bs				u32		
+#define uf20bs				u32
 
 static u32 f20(const u64 x) {
 	u32 i5;
@@ -127,12 +127,12 @@ static u32 hitag2_byte(u64 *x) {
 
 #define HITAG_T_TAG_ONE_HALF_PERIOD				10
 #define HITAG_T_TAG_TWO_HALF_PERIOD				25
-#define HITAG_T_TAG_THREE_HALF_PERIOD			41 
+#define HITAG_T_TAG_THREE_HALF_PERIOD			41
 #define HITAG_T_TAG_FOUR_HALF_PERIOD    		57
-	
+
 #define HITAG_T_TAG_HALF_PERIOD					16
 #define HITAG_T_TAG_FULL_PERIOD					32
-	
+
 #define HITAG_T_TAG_CAPTURE_ONE_HALF			13
 #define HITAG_T_TAG_CAPTURE_TWO_HALF			25
 #define HITAG_T_TAG_CAPTURE_THREE_HALF			41
@@ -168,24 +168,24 @@ static void hitag_send_bit(int bit) {
 			// AC Coding --__
 			HIGH(GPIO_SSC_DOUT);
 			while (AT91C_BASE_TC0->TC_CV < T0 * 32) {};
-				
+
 			LOW(GPIO_SSC_DOUT);
 			while (AT91C_BASE_TC0->TC_CV < T0 * 64)	{};
-				
+
 		} else {
 			// AC coding -_-_
 			HIGH(GPIO_SSC_DOUT);
 			while (AT91C_BASE_TC0->TC_CV < T0 * 16) {};
-				
+
 			LOW(GPIO_SSC_DOUT);
 			while (AT91C_BASE_TC0->TC_CV < T0 * 32) {};
-				
+
 			HIGH(GPIO_SSC_DOUT);
 			while (AT91C_BASE_TC0->TC_CV < T0 * 48) {};
-				
+
 			LOW(GPIO_SSC_DOUT);
 			while (AT91C_BASE_TC0->TC_CV < T0 * 64) {};
-				
+
 		}
 		LED_A_OFF();
 		break;
@@ -194,21 +194,21 @@ static void hitag_send_bit(int bit) {
 			// AC Coding --__
 			HIGH(GPIO_SSC_DOUT);
 			while (AT91C_BASE_TC0->TC_CV < T0 * HITAG_T_TAG_HALF_PERIOD) {};
-				
+
 			LOW(GPIO_SSC_DOUT);
 			while (AT91C_BASE_TC0->TC_CV < T0 * HITAG_T_TAG_FULL_PERIOD) {};
-				
+
 		} else {
 			// AC coding -_-_
 			HIGH(GPIO_SSC_DOUT);
 			while (AT91C_BASE_TC0->TC_CV < T0 * 8) {};
-				
+
 			LOW(GPIO_SSC_DOUT);
 			while (AT91C_BASE_TC0->TC_CV < T0 * 16) {};
-				
+
 			HIGH(GPIO_SSC_DOUT);
 			while (AT91C_BASE_TC0->TC_CV < T0 * 24) {};
-				
+
 			LOW(GPIO_SSC_DOUT);
 			while (AT91C_BASE_TC0->TC_CV < T0 * 32) {};
 		}
@@ -219,18 +219,18 @@ static void hitag_send_bit(int bit) {
 			// Manchester: Unloaded, then loaded |__--|
 			LOW(GPIO_SSC_DOUT);
 			while (AT91C_BASE_TC0->TC_CV < T0 * 16) {};
-				
+
 			HIGH(GPIO_SSC_DOUT);
 			while (AT91C_BASE_TC0->TC_CV < T0 * 32) {};
-				
+
 		} else {
 			// Manchester: Loaded, then unloaded |--__|
 			HIGH(GPIO_SSC_DOUT);
 			while (AT91C_BASE_TC0->TC_CV < T0 * 16) {};
-				
+
 			LOW(GPIO_SSC_DOUT);
 			while (AT91C_BASE_TC0->TC_CV < T0 * 32) {};
-				
+
 		}
 		LED_A_OFF();
 		break;
@@ -239,18 +239,18 @@ static void hitag_send_bit(int bit) {
 			// Manchester: Unloaded, then loaded |__--|
 			LOW(GPIO_SSC_DOUT);
 			while (AT91C_BASE_TC0->TC_CV < T0 * 8) {};
-				
+
 			HIGH(GPIO_SSC_DOUT);
 			while (AT91C_BASE_TC0->TC_CV < T0 * 16) {};
-				
+
 		} else {
 			// Manchester: Loaded, then unloaded |--__|
 			HIGH(GPIO_SSC_DOUT);
 			while (AT91C_BASE_TC0->TC_CV < T0 * 8) {};
-				
+
 			LOW(GPIO_SSC_DOUT);
 			while (AT91C_BASE_TC0->TC_CV < T0 * 16) {};
-				
+
 		}
 		LED_A_OFF();
 		break;
@@ -288,7 +288,7 @@ static void hitag_reader_send_bit(int bit) {
 	if (test == 1) {
 		// Wait for 4-10 times the carrier period
 		while (AT91C_BASE_TC0->TC_CV < T0 * 6) {};
-			
+
 		//	SpinDelayUs(8*8);
 
 		// Disable modulation, just activates the field again
@@ -297,18 +297,18 @@ static void hitag_reader_send_bit(int bit) {
 		if (bit == 0) {
 			// Zero bit: |_-|
 			while (AT91C_BASE_TC0->TC_CV < T0 * 11) {};
-				
+
 			//		SpinDelayUs(16*8);
 		} else {
 			// One bit: |_--|
 			while (AT91C_BASE_TC0->TC_CV < T0 * 14) {};
-				
+
 			//		SpinDelayUs(22*8);
 		}
 	} else {
 		// Wait for 4-10 times the carrier period
 		while (AT91C_BASE_TC0->TC_CV < T0 * 6) {};
-			
+
 		//	SpinDelayUs(8*8);
 
 		// Disable modulation, just activates the field again
@@ -317,12 +317,12 @@ static void hitag_reader_send_bit(int bit) {
 		if (bit == 0) {
 			// Zero bit: |_-|
 			while (AT91C_BASE_TC0->TC_CV < T0 * 22) {};
-				
+
 			//		SpinDelayUs(16*8);
 		} else {
 			// One bit: |_--|
 			while (AT91C_BASE_TC0->TC_CV < T0 * 28) {};
-				
+
 			//		SpinDelayUs(22*8);
 		}
 	}
@@ -344,7 +344,7 @@ static void hitag_reader_send_frame(const byte_t* frame, size_t frame_len) {
 	HIGH(GPIO_SSC_DOUT);
 // Wait for 4-10 times the carrier period
 	while (AT91C_BASE_TC0->TC_CV < T0 * 6) {};
-		
+
 // Disable modulation, just activates the field again
 	LOW(GPIO_SSC_DOUT);
 }
@@ -891,7 +891,7 @@ static int hitagS_handle_tag_auth(hitag_function htf,uint64_t key, uint64_t NrAr
 		} else if (tag.auth == 0) {
 			tag.pstate = HT_SELECTED;
 		}
-		
+
 	} else if (tag.pstate == HT_AUTHENTICATE && rxlen == 44) {
 		//encrypted con2,password received.
 		crc = CRC_PRESET;
@@ -924,7 +924,7 @@ static int hitagS_handle_tag_auth(hitag_function htf,uint64_t key, uint64_t NrAr
 
 		if (DEBUG)
 			Dbprintf("pwdh0 %02X pwdl0 %02X pwdl1 %02X", pwdh0, pwdl0, pwdl1);
-		
+
 
 		//Dbprintf("%X %02X", rnd, ((rx[4] & 0x0f) * 16) + ((rx[5] & 0xf0) / 16));
 		//rnd += 1;
@@ -932,7 +932,7 @@ static int hitagS_handle_tag_auth(hitag_function htf,uint64_t key, uint64_t NrAr
 		tag.pstate = HT_SELECTED; //tag is now ready for read/write commands
 	}
 	return 0;
-	
+
 }
 
 /*
@@ -1185,7 +1185,7 @@ void ReadHitagS(hitag_function htf, hitag_data* htd) {
 	unsigned char crc;
 	unsigned char pageData[32];
 	page_to_be_written = 0;
-	
+
 	//read given key/challenge
 	byte_t NrAr_[8];
 	uint64_t key = 0;
@@ -1255,10 +1255,10 @@ void ReadHitagS(hitag_function htf, hitag_data* htd) {
 
 	// Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
 	// external trigger rising edge, load RA on falling edge of TIOA.
-	AT91C_BASE_TC1->TC_CMR = 
+	AT91C_BASE_TC1->TC_CMR =
 		AT91C_TC_CLKS_TIMER_DIV1_CLOCK 	|
-		AT91C_TC_ETRGEDG_FALLING 		| 
-		AT91C_TC_ABETRG 				| 
+		AT91C_TC_ETRGEDG_FALLING 		|
+		AT91C_TC_ABETRG 				|
 		AT91C_TC_LDRA_FALLING;
 
 	// Enable and reset counters
@@ -1497,7 +1497,7 @@ void ReadHitagS(hitag_function htf, hitag_data* htd) {
 	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 	AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	
+
 	cmd_send(CMD_ACK, bSuccessful, 0, 0, 0, 0);
 }
 
@@ -1523,7 +1523,7 @@ void WritePageHitagS(hitag_function htf, hitag_data* htd,int page_) {
 	int page = page_;
 	unsigned char crc;
 	byte_t data[4]= {0,0,0,0};
-	
+
 	//read given key/challenge, the page and the data
 	byte_t NrAr_[8];
 	uint64_t key=0;
@@ -1541,7 +1541,7 @@ void WritePageHitagS(hitag_function htf, hitag_data* htd,int page_) {
 		case 04: { //WHTS_KEY
 			memcpy(data,htd->crypto.data,4);
 			DbpString("Authenticating using key:");
-			memcpy(key_,htd->crypto.key,6);	 
+			memcpy(key_,htd->crypto.key,6);
 			Dbhexdump(6,key_,false);
 			key=key_[5] | ((uint64_t)key_[4]) << 8 | ((uint64_t)key_[3]) << 16 | ((uint64_t)key_[2]) << 24 | ((uint64_t)key_[1]) << 32 | ((uint64_t)key_[0]) << 40;
 		} break;
@@ -1639,7 +1639,7 @@ void WritePageHitagS(hitag_function htf, hitag_data* htd,int page_) {
 		//check for valid input
 		if (page == 0) {
 			Dbprintf(
-					"usage: lf hitag writer [03 | 04] [CHALLENGE | KEY] [page] [byte0] [byte1] [byte2] [byte3]");		
+					"usage: lf hitag writer [03 | 04] [CHALLENGE | KEY] [page] [byte0] [byte1] [byte2] [byte3]");
 			bStop = !false;
 		}
 
@@ -1863,7 +1863,7 @@ void check_challenges(bool file_given, byte_t* data) {
 // Set fpga in edge detect with reader field, we can modulate as reader now
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_READER_FIELD);
 	SpinDelay(50);
-	
+
 // Set Frequency divisor which will drive the FPGA and analog mux selection
 	FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95);					//125Khz
 	SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
diff --git a/armsrc/iclass.c b/armsrc/iclass.c
index 21cb9f299..af85c18fc 100644
--- a/armsrc/iclass.c
+++ b/armsrc/iclass.c
@@ -12,7 +12,7 @@
 //-----------------------------------------------------------------------------
 // Based on ISO14443a implementation. Still in experimental phase.
 // Contribution made during a security research at Radboud University Nijmegen
-// 
+//
 // Please feel free to contribute and extend iClass support!!
 //-----------------------------------------------------------------------------
 //
@@ -21,7 +21,7 @@
 // We still have sometimes a demodulation error when snooping iClass communication.
 // The resulting trace of a read-block-03 command may look something like this:
 //
-//  +  22279:    :     0c  03  e8  01    
+//  +  22279:    :     0c  03  e8  01
 //
 //    ...with an incorrect answer...
 //
@@ -31,8 +31,8 @@
 //
 // A correct trace should look like this:
 //
-// +  21112:    :     0c  03  e8  01    
-// +     85:   0: TAG ff  ff  ff  ff  ff  ff  ff  ff  ea  f5    
+// +  21112:    :     0c  03  e8  01
+// +     85:   0: TAG ff  ff  ff  ff  ff  ff  ff  ff  ea  f5
 //
 //-----------------------------------------------------------------------------
 
@@ -60,7 +60,7 @@ int doIClassSimulation(int simulationMode, uint8_t *reader_mac_buf);
 
 // The length of a received command will in most cases be no more than 18 bytes.
 // 32 should be enough!
-#ifndef ICLASS_BUFFER_SIZE 
+#ifndef ICLASS_BUFFER_SIZE
 	#define ICLASS_BUFFER_SIZE 32
 #endif
 
@@ -172,7 +172,7 @@ static void uart_bit(uint8_t bit) {
             switch (buf) {
                 case 0xbf:    // 0 - 1011 1111
                     break;
-                case 0xef:    // 1 - 1110 1111 
+                case 0xef:    // 1 - 1110 1111
                     msg_byte |= (1<<6);
                     break;
                 case 0xfb:    // 2 - 1111 1011
@@ -289,7 +289,7 @@ static RAMFUNC int OutOfNDecoding(int bit) {
 		Uart.bitBuffer <<= 4;
 		Uart.bitBuffer ^= bit;
 	}
-	
+
 	// if (Uart.swapper) {
 	//	Uart.output[Uart.byteCnt] = Uart.bitBuffer & 0xFF;
 	//	Uart.byteCnt++;
@@ -307,16 +307,16 @@ static RAMFUNC int OutOfNDecoding(int bit) {
 			bit = 0;
 		else
 			bit = 1;
-		
+
 		if (((Uart.bitBuffer << 1) & Uart.syncBit) ^ Uart.syncBit)
 			bitright = 0;
 		else
 			bitright = 1;
-		
-		if(bit != bitright) 
+
+		if(bit != bitright)
 			bit = bitright;
 
-		
+
 		// So, now we only have to deal with *bit*, lets see...
 		if (Uart.posCnt == 1) {
 			// measurement first half bitperiod
@@ -347,7 +347,7 @@ static RAMFUNC int OutOfNDecoding(int bit) {
 			// measurement second half bitperiod
 			// Count the bitslot we are in... (ISO 15693)
 			Uart.nOutOfCnt++;
-			
+
 			if (!bit) {
 				if (Uart.dropPosition) {
 					if (Uart.state == STATE_START_OF_COMMUNICATION) {
@@ -363,10 +363,10 @@ static RAMFUNC int OutOfNDecoding(int bit) {
 				}
 			}
 			Uart.posCnt = 0;
-			
+
 			if (Uart.nOutOfCnt == Uart.OutOfCnt && Uart.OutOfCnt == 4) {
 				Uart.nOutOfCnt = 0;
-				
+
 				if (Uart.state == STATE_START_OF_COMMUNICATION) {
 					if (Uart.dropPosition == 4) {
 						Uart.state = STATE_RECEIVING;
@@ -390,12 +390,12 @@ static RAMFUNC int OutOfNDecoding(int bit) {
 						//error = 9;
 					} else {
 						Uart.shiftReg >>= 2;
-						
+
 						// Swap bit order
 						Uart.dropPosition--;
 						//if(Uart.dropPosition == 1) { Uart.dropPosition = 2; }
 						//else if(Uart.dropPosition == 2) { Uart.dropPosition = 1; }
-						
+
 						Uart.shiftReg ^= ((Uart.dropPosition & 0x03) << 6);
 						Uart.bitCnt += 2;
 						Uart.dropPosition = 0;
@@ -459,13 +459,13 @@ static RAMFUNC int OutOfNDecoding(int bit) {
 				Uart.posCnt = 1;   // apparently we are busy with our first half bit period
 				Uart.syncBit = bit & 8;
 				Uart.samples = 3;
-				
+
 				if (!Uart.syncBit)	{ Uart.syncBit = bit & 4; Uart.samples = 2; }
 				else if (bit & 4)	{ Uart.syncBit = bit & 4; Uart.samples = 2; bit <<= 2; }
-				
+
 				if (!Uart.syncBit)	{ Uart.syncBit = bit & 2; Uart.samples = 1; }
 				else if (bit & 2)	{ Uart.syncBit = bit & 2; Uart.samples = 1; bit <<= 1; }
-				
+
 				if (!Uart.syncBit)	{ Uart.syncBit = bit & 1; Uart.samples = 0;
 					if (Uart.syncBit && (Uart.bitBuffer & 8)) {
 						Uart.syncBit = 8;
@@ -519,7 +519,7 @@ static void DemodInit(uint8_t *data) {
 	DemodReset();
 }
 
-// UART debug 
+// UART debug
 // it adds the debug values which will be put in the tracelog,
 // visible on client when running  'hf list iclass'
 /*
@@ -562,11 +562,11 @@ static void uart_debug(int error, int bit) {
 
 /*
 * CARD TO READER
-* in ISO15693-2 mode -  Manchester 
+* in ISO15693-2 mode -  Manchester
 * in ISO 14443b - BPSK coding
 *
 * Timings:
-*  ISO 15693-2 
+*  ISO 15693-2
 *           Tout = 330 µs, Tprog 1 = 4 to 15 ms, Tslot = 330 µs + (number of slots x 160 µs)
 *  ISO 14443a
 *			Tout = 100 µs, Tprog = 4 to 15 ms, Tslot = 100 µs+ (number of slots x 80 µs)
@@ -645,7 +645,7 @@ static RAMFUNC int ManchesterDecoding_iclass( uint32_t v) {
 					error = 0x88;
 					uart_debug(error, bit);
 					return false;
-				}				
+				}
 			}
 			error = 0;
 		}
@@ -653,7 +653,7 @@ static RAMFUNC int ManchesterDecoding_iclass( uint32_t v) {
 	}
 
 	// state is DEMOD is in SYNC from here on.
-	
+
 	modulation = bit & Demod.syncBit;
 	modulation |= ((bit << 1) ^ ((Demod.buffer & 0x08) >> 3)) & Demod.syncBit;
 	Demod.samples += 4;
@@ -667,13 +667,13 @@ static RAMFUNC int ManchesterDecoding_iclass( uint32_t v) {
 	Demod.posCount = 0;
 
 	if (modulation) {
-		
+
 		if (Demod.sub == SUB_FIRST_HALF)
 			Demod.sub = SUB_BOTH;
 		else
 			Demod.sub = SUB_SECOND_HALF;
 	}
-	
+
 	if (Demod.sub == SUB_NONE) {
 		if (Demod.state == DEMOD_SOF_COMPLETE) {
 			Demod.output[Demod.len] = 0x0f;
@@ -687,7 +687,7 @@ static RAMFUNC int ManchesterDecoding_iclass( uint32_t v) {
 	}
 
 	switch (Demod.state) {
-		
+
 		case DEMOD_START_OF_COMMUNICATION:
 			if (Demod.sub == SUB_BOTH) {
 
@@ -700,7 +700,7 @@ static RAMFUNC int ManchesterDecoding_iclass( uint32_t v) {
 				error = 0xd2;
 			}
 			break;
-			
+
 		case DEMOD_START_OF_COMMUNICATION2:
 			if (Demod.sub == SUB_SECOND_HALF) {
 				Demod.state = DEMOD_START_OF_COMMUNICATION3;
@@ -710,7 +710,7 @@ static RAMFUNC int ManchesterDecoding_iclass( uint32_t v) {
 				error = 0xd3;
 			}
 			break;
-			
+
 		case DEMOD_START_OF_COMMUNICATION3:
 			if (Demod.sub == SUB_SECOND_HALF) {
 				Demod.state = DEMOD_SOF_COMPLETE;
@@ -720,7 +720,7 @@ static RAMFUNC int ManchesterDecoding_iclass( uint32_t v) {
 				error = 0xd4;
 			}
 			break;
-			
+
 		case DEMOD_SOF_COMPLETE:
 		case DEMOD_MANCHESTER_D:
 		case DEMOD_MANCHESTER_E:
@@ -782,7 +782,7 @@ static RAMFUNC int ManchesterDecoding_iclass( uint32_t v) {
 		uart_debug(error, bit);
 		return true;
 	}
-	
+
     return false;
 }
 
@@ -796,7 +796,7 @@ static void iclass_setup_sniff(void){
 	LEDsoff();
 
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	
+
 	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
 
 	// connect Demodulated Signal to ADC:
@@ -805,7 +805,7 @@ static void iclass_setup_sniff(void){
 	// Set up the synchronous serial port
 	FpgaSetupSsc();
 
-	BigBuf_free(); BigBuf_Clear_ext(false); 
+	BigBuf_free(); BigBuf_Clear_ext(false);
 	clear_trace();
 	set_tracing(true);
 
@@ -828,10 +828,10 @@ static void iclass_setup_sniff(void){
     // put the FPGA in the appropriate mode
     FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_SNIFFER);
 	SpinDelay(200);
- 
+
 	// Start the SSP timer
 	StartCountSspClk();
-	
+
 	LED_A_ON();
 	if (MF_DBGLEVEL > 3) Dbprintf("[+] iclass_setup_sniff Exit");
 }
@@ -844,15 +844,15 @@ static void iclass_setup_sniff(void){
 // turn off afterwards
 void RAMFUNC SniffIClass(void) {
 
-	//int datalen = 0; 
-	uint32_t previous_data = 0;	
+	//int datalen = 0;
+	uint32_t previous_data = 0;
 	uint32_t time_0 = 0, time_start = 0, time_stop  = 0;
     uint32_t sniffCounter = 0;
 	bool TagIsActive = false;
 	bool ReaderIsActive = false;
-	
+
 	iclass_setup_sniff();
-	
+
     // The DMA buffer, used to stream samples from the FPGA
 	// *dmaBuf is the start reference.
     uint8_t *dmaBuf = BigBuf_malloc(ICLASS_DMA_BUFFER_SIZE);
@@ -861,7 +861,7 @@ void RAMFUNC SniffIClass(void) {
 
 	// Setup and start DMA.
 	if ( !FpgaSetupSscDma(dmaBuf, ICLASS_DMA_BUFFER_SIZE) ){
-		if (MF_DBGLEVEL > 1) DbpString("[-] FpgaSetupSscDma failed. Exiting"); 
+		if (MF_DBGLEVEL > 1) DbpString("[-] FpgaSetupSscDma failed. Exiting");
 		return;
 	}
 
@@ -881,8 +881,8 @@ void RAMFUNC SniffIClass(void) {
 
 		previous_data <<= 8;
 		previous_data |= *data;
-		
-		sniffCounter++;	
+
+		sniffCounter++;
 		data++;
 
 		if (data == dmaBuf + ICLASS_DMA_BUFFER_SIZE) {
@@ -890,15 +890,15 @@ void RAMFUNC SniffIClass(void) {
 			AT91C_BASE_PDC_SSC->PDC_RNPR = (uint32_t) dmaBuf;
 			AT91C_BASE_PDC_SSC->PDC_RNCR = ICLASS_DMA_BUFFER_SIZE;
 		}
-		
-		if ( *data & 0xF) { 
+
+		if ( *data & 0xF) {
 			//tag_byte <<= 1;
 			tag_byte ^= (1 << 4);
 			foo ^= (1 << (3 - div));
 			Dbprintf(" %d|%x == %d|%x", tag_byte, tag_byte, foo, foo);
 		}
 		div++;
-		
+
 		// every odd sample
 		if (sniffCounter & 0x01) {
 			// no need to try decoding reader data if the tag is sending
@@ -928,23 +928,23 @@ void RAMFUNC SniffIClass(void) {
 				LED_C_INV();
 				// LOW nibble is always tag data.
 				/*
-				
-				
-				uint32_t tag_byte = 
+
+
+				uint32_t tag_byte =
 						((previous_data & 0x0F000000) >> 8 )  |
 						((previous_data & 0x000F0000) >> 4 )  |
 						((previous_data & 0x00000F00)      )  |
 						((previous_data & 0x0000000F) << 4 )  |
 						(*data & 0xF);
 						*/
-				
-						
+
+
 				//uint8_t tag_byte = ((previous_data & 0xF) << 4 ) | (*data & 0xF);
 				if (ManchesterDecoding_iclass(foo)) {
 					time_stop = GetCountSspClk() - time_0;
 					LogTrace(Demod.output, Demod.len, time_start, time_stop, NULL, false);
 					DemodReset();
-					uart_reset();					
+					uart_reset();
 				} else {
 					time_start = GetCountSspClk() - time_0;
 				}
@@ -956,16 +956,16 @@ void RAMFUNC SniffIClass(void) {
 		}
 	} // end main loop
 
-	if (MF_DBGLEVEL >= 1) {	
-		DbpString("[+] Sniff statistics:");	
+	if (MF_DBGLEVEL >= 1) {
+		DbpString("[+] Sniff statistics:");
 		Dbhexdump(ICLASS_DMA_BUFFER_SIZE, data, false);
 		}
-	
-	switch_off(); 
+
+	switch_off();
 }
 
 void rotateCSN(uint8_t* originalCSN, uint8_t* rotatedCSN) {
-	int i; 
+	int i;
 	for(i = 0; i < 8; i++)
 		rotatedCSN[i] = (originalCSN[i] >> 3) | (originalCSN[(i+1)%8] << 5);
 }
@@ -976,13 +976,13 @@ void rotateCSN(uint8_t* originalCSN, uint8_t* rotatedCSN) {
 // Stop when button is pressed
 // Or return TRUE when command is captured
 //-----------------------------------------------------------------------------
-static bool GetIClassCommandFromReader(uint8_t *received, int *len, int maxLen) {	
+static bool GetIClassCommandFromReader(uint8_t *received, int *len, int maxLen) {
     // Set FPGA mode to "simulated ISO 14443 tag", no modulation (listen
     // only, since we are receiving, not transmitting).
     // Signal field is off with the appropriate LED
     LED_D_OFF();
 	uart_init(received);
-	
+
     FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_TAGSIM_LISTEN);
 	// clear RXRDY:
     uint8_t b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
@@ -1069,7 +1069,7 @@ static void CodeIClassTagAnswer(const uint8_t *cmd, int len) {
 	 * - A 1-bit input to the FPGA becomes 8 pulses on 423.5kHz (fc/32) (18.88us).
 	 * - A 0-bit input to the FPGA becomes an unmodulated time of 18.88us
 	 *
-	 * In this mode 
+	 * In this mode
 	 * SOF can be written as 00011101 = 0x1D
 	 * EOF can be written as 10111000 = 0xb8
 	 * logic 1 be written as 01 = 0x1
@@ -1080,7 +1080,7 @@ static void CodeIClassTagAnswer(const uint8_t *cmd, int len) {
 
 	// Send SOF
 	ToSend[++ToSendMax] = 0x1D;
-	
+
 	int i;
 	for(i = 0; i < len; i++) {
 		uint8_t b = cmd[i];
@@ -1095,7 +1095,7 @@ static void CodeIClassTagAnswer(const uint8_t *cmd, int len) {
 	ToSendMax++;
 }
 
-// Only SOF 
+// Only SOF
 static void CodeIClassTagSOF() {
 	//So far a dummy implementation, not used
 	//int lastProxToAirDuration =0;
@@ -1133,7 +1133,7 @@ void SimulateIClass(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain
 	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
 	FpgaSetupSsc();
 	SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
-	
+
 	// Enable and clear the trace
 	clear_trace();
 	set_tracing(true);
@@ -1144,7 +1144,7 @@ void SimulateIClass(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain
 	//Use the emulator memory for SIM
 	uint8_t *emulator = BigBuf_get_EM_addr();
 	uint8_t mac_responses[USB_CMD_DATA_SIZE] = { 0 };
-	
+
 	if (simType == 0) {
 		// Use the CSN from commandline
 		memcpy(emulator, datain, 8);
@@ -1167,7 +1167,7 @@ void SimulateIClass(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain
 			// The usb data is 512 bytes, fitting 65 8-byte CSNs in there.
 
 			memcpy(emulator, datain + (i*8), 8);
-			
+
 			if (doIClassSimulation(MODE_EXIT_AFTER_MAC, mac_responses+i * EPURSE_MAC_SIZE)) {
 				// Button pressed
 				cmd_send(CMD_ACK, CMD_SIMULATE_TAG_ICLASS, i, 0, mac_responses, i * EPURSE_MAC_SIZE);
@@ -1185,12 +1185,12 @@ void SimulateIClass(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain
 		// This is the KEYROLL version of sim 2.
 		// the collected data (mac_response) is doubled out since we are trying to collect both keys in the keyroll process.
 		// Keyroll iceman  9 csns * 8 * 2 = 144
-		// keyroll CARL55  15csns * 8 * 2 = 15 * 8 * 2 = 240		
+		// keyroll CARL55  15csns * 8 * 2 = 15 * 8 * 2 = 240
 		Dbprintf("[+] going into attack keyroll mode, %d CSNS sent", numberOfCSNS);
 		// In this mode, a number of csns are within datain. We'll simulate each one, one at a time
 		// in order to collect MAC's from the reader. This can later be used in an offlne-attack
 		// in order to obtain the keys, as in the "dismantling iclass"-paper.
-		
+
 		// keyroll mode,   reader swaps between old key and new key alternatively when fail a authentication.
 		// attack below is same as SIM 2, but we run the CSN twice to collected the mac for both keys.
 		int i = 0;
@@ -1198,32 +1198,32 @@ void SimulateIClass(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain
 		for (; i < numberOfCSNS && i * EPURSE_MAC_SIZE + 8 < USB_CMD_DATA_SIZE; i++) {
 
 			memcpy(emulator, datain + (i*8), 8);
-			
-			// keyroll 1 			
+
+			// keyroll 1
 			if (doIClassSimulation(MODE_EXIT_AFTER_MAC, mac_responses + i * EPURSE_MAC_SIZE )) {
 				cmd_send(CMD_ACK, CMD_SIMULATE_TAG_ICLASS, i*2, 0, mac_responses, i * EPURSE_MAC_SIZE * 2);
 				// Button pressed
-				goto out; 
+				goto out;
 			}
 
 			// keyroll 2
 			if (doIClassSimulation(MODE_EXIT_AFTER_MAC, mac_responses + (i + numberOfCSNS) * EPURSE_MAC_SIZE )) {
 				cmd_send(CMD_ACK, CMD_SIMULATE_TAG_ICLASS, i*2, 0, mac_responses, i * EPURSE_MAC_SIZE* 2);
 				// Button pressed
-				goto out; 
-			}			
+				goto out;
+			}
 		}
 		// double the amount of collected data.
 		cmd_send(CMD_ACK, CMD_SIMULATE_TAG_ICLASS, i*2, 0, mac_responses, i * EPURSE_MAC_SIZE * 2 );
-	
+
 	} else {
 		// We may want a mode here where we hardcode the csns to use (from proxclone).
 		// That will speed things up a little, but not required just yet.
 		DbpString("[-] the mode is not implemented, reserved for future use");
 	}
 
-out:	
-	switch_off(); 
+out:
+	switch_off();
 	BigBuf_free_keep_EM();
 }
 
@@ -1236,13 +1236,13 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf) {
 
 	// free eventually allocated BigBuf memory
 	BigBuf_free_keep_EM();
-	
+
 	State cipher_state;
 
 	uint8_t *csn = BigBuf_get_EM_addr();
 	uint8_t *emulator = csn;
 	uint8_t sof_data[] = { 0x0F} ;
-	
+
 	// CSN followed by two CRC bytes
 	uint8_t anticoll_data[10] = { 0 };
 	uint8_t csn_data[10] = { 0 };
@@ -1254,7 +1254,7 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf) {
 	// Compute CRC on both CSNs
 	AddCrc(anticoll_data, 8);
 	AddCrc(csn_data, 8);
-	
+
 	uint8_t diversified_key[8] = { 0 };
 	// e-Purse
 	uint8_t card_challenge_data[8] = { 0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff };
@@ -1272,8 +1272,8 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf) {
 	// set epurse of sim2,4 attack
 	if (reader_mac_buf != NULL)	{
 		memcpy(reader_mac_buf, card_challenge_data, 8);
-	}	
-	
+	}
+
 	int exitLoop = 0;
 	// Reader 0a
 	// Tag    0f
@@ -1306,13 +1306,13 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf) {
 	int resp_conf_len;
 	uint8_t conf_data[10] = {0x12,0xFF,0xFF,0xFF,0x7F,0x1F,0xFF,0x3C,0x00,0x00};
 	AddCrc(conf_data, 8);
-	
+
 	// e-Purse
 	// 18: Takes 2 bytes for SOF/EOF and 8 * 2 = 16 bytes (2 bytes/bit)
 	uint8_t *resp_cc = BigBuf_malloc(28);
 	int resp_cc_len;
 
-	// Application Issuer Area 
+	// Application Issuer Area
 	uint8_t *resp_aia = BigBuf_malloc(28);
 	int resp_aia_len;
 	uint8_t aia_data[10] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x00,0x00};
@@ -1328,11 +1328,11 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf) {
 	// First card answer: SOF
 	CodeIClassTagSOF();
 	memcpy(resp_sof, ToSend, ToSendMax); resp_sof_Len = ToSendMax;
-	
+
 	// Anticollision CSN
 	CodeIClassTagAnswer(anticoll_data, sizeof(anticoll_data));
 	memcpy(resp_anticoll, ToSend, ToSendMax); resp_anticoll_len = ToSendMax;
-	
+
 	// CSN
 	CodeIClassTagAnswer(csn_data, sizeof(csn_data));
 	memcpy(resp_csn, ToSend, ToSendMax); resp_csn_len = ToSendMax;
@@ -1340,7 +1340,7 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf) {
 	// Configuration
 	CodeIClassTagAnswer(conf_data, sizeof(conf_data));
 	memcpy(resp_conf, ToSend, ToSendMax); resp_conf_len = ToSendMax;
-	
+
 	// e-Purse
 	CodeIClassTagAnswer(card_challenge_data, sizeof(card_challenge_data));
 	memcpy(resp_cc, ToSend, ToSendMax); resp_cc_len = ToSendMax;
@@ -1374,7 +1374,7 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf) {
 
 		//Signal tracer, can be used to get a trigger for an oscilloscope..
 		LED_B_OFF(); LED_C_OFF();
-		
+
 		r2t_stime = (GetCountSspClk() - time_0) << 4;
 		if (!GetIClassCommandFromReader(receivedCmd, &len, 0)) {
 			buttonPressed = true;
@@ -1382,7 +1382,7 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf) {
 			continue;
 		}
 		r2t_etime = ((GetCountSspClk() - time_0) << 4 ) - r2t_stime;
-		
+
 		// 330us normal wait,  adjusted for our execution
 
 		LED_C_ON();	//Signal tracer
@@ -1392,7 +1392,7 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf) {
 			modulated_response = resp_sof; modulated_response_size = resp_sof_Len; //order = 1;
 			trace_data = sof_data;
 			trace_data_size = sizeof(sof_data);
-			// adjusted for 330 + (160*num of slot) 
+			// adjusted for 330 + (160*num of slot)
 			goto send;
 		} else if (receivedCmd[0] == ICLASS_CMD_READ_OR_IDENTIFY) { // 0x0C
 			if (len == 1) {
@@ -1400,9 +1400,9 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf) {
 				modulated_response = resp_anticoll; modulated_response_size = resp_anticoll_len; //order = 2;
 				trace_data = anticoll_data;
 				trace_data_size = sizeof(anticoll_data);
-				goto send;	
+				goto send;
 			}
-			if (len == 4){ 
+			if (len == 4){
 				// block0,1,2,5 is always readable.
 				switch (receivedCmd[1]){
 					case 0:	// csn (0c 00)
@@ -1415,7 +1415,7 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf) {
 						trace_data = conf_data;
 						trace_data_size = sizeof(conf_data);
 						break;
-					case 2: // e-purse (0c 02)	
+					case 2: // e-purse (0c 02)
 						modulated_response = resp_cc; modulated_response_size = resp_cc_len;
 						trace_data = card_challenge_data;
 						trace_data_size = sizeof(card_challenge_data);
@@ -1431,30 +1431,30 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf) {
 						break;
 					default: break;
 				}
-				goto send;				
+				goto send;
 			}
-			
+
 		} else if (receivedCmd[0] == ICLASS_CMD_SELECT) { // 0x81
 			// Reader selects anticollission CSN.
 			// Tag sends the corresponding real CSN
 			modulated_response = resp_csn; modulated_response_size = resp_csn_len; //order = 3;
 			trace_data = csn_data;
 			trace_data_size = sizeof(csn_data);
-			goto send;			
+			goto send;
 		} else if (receivedCmd[0] == ICLASS_CMD_READCHECK_KD) { // 0x88
 			// Read e-purse (88 02)
 			modulated_response = resp_cc; modulated_response_size = resp_cc_len; //order = 4;
 			trace_data = card_challenge_data;
 			trace_data_size = sizeof(card_challenge_data);
 			LED_B_ON();
-			goto send;			
+			goto send;
 		} else if (receivedCmd[0] == ICLASS_CMD_READCHECK_KC) { // 0x18
 			// Read e-purse (18 02)
 			modulated_response = resp_cc; modulated_response_size = resp_cc_len; //order = 4;
 			trace_data = card_challenge_data;
 			trace_data_size = sizeof(card_challenge_data);
 			LED_B_ON();
-			goto send;			
+			goto send;
 		} else if (receivedCmd[0] == ICLASS_CMD_CHECK) { // 0x05
 			// Reader random and reader MAC!!!
 			if (simulationMode == MODE_FULLSIM) {
@@ -1473,9 +1473,9 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf) {
 				modulated_response = resp_sof; modulated_response_size = 0;
 				trace_data = NULL;
 				trace_data_size = 0;
-				
+
 				if (simulationMode == MODE_EXIT_AFTER_MAC) {
-					
+
 					if ( MF_DBGLEVEL ==  MF_DBG_EXTENDED) {
 						Dbprintf("[+] CSN: %02x %02x %02x %02x %02x %02x %02x %02x", csn[0], csn[1], csn[2], csn[3], csn[4], csn[5], csn[6], csn[7]);
 						Dbprintf("[+] RDR:  (len=%02d): %02x %02x %02x %02x %02x %02x %02x %02x %02x", len,
@@ -1512,7 +1512,7 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf) {
 			modulated_response_size = ToSendMax;
 			goto send;
 		} else if (simulationMode == MODE_FULLSIM && receivedCmd[0] == ICLASS_CMD_UPDATE) {
-			
+
 			//Probably the reader wants to update the nonce. Let's just ignore that for now.
 			// OBS! If this is implemented, don't forget to regenerate the cipher_state
 			//We're expected to respond with the data+crc, exactly what's already in the receivedcmd
@@ -1524,10 +1524,10 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf) {
 			trace_data = data_generic_trace;
 			trace_data_size = 10;
 			CodeIClassTagAnswer(trace_data, trace_data_size);
-			
+
 			memcpy(data_response, ToSend, ToSendMax);
 			modulated_response = data_response;
-			modulated_response_size = ToSendMax;			
+			modulated_response_size = ToSendMax;
 //			response_delay = 4600 * 1.5;  // tPROG 4-15ms
 			goto send;
 //		} else if(receivedCmd[0] == ICLASS_CMD_PAGESEL)	{  // 0x84
@@ -1542,7 +1542,7 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf) {
 			// Never seen this command before
 			if ( MF_DBGLEVEL ==  MF_DBG_EXTENDED)
 				print_result("[-] Unhandled command received ", receivedCmd, len);
-			
+
 			// Do not respond
 			modulated_response = resp_sof;
 			modulated_response_size = 0; //order = 0;
@@ -1550,7 +1550,7 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf) {
 			trace_data_size = 0;
 		}
 
-send:		
+send:
 		/**
 		A legit tag has about 330us delay between reader EOT and tag SOF.
 		**/
@@ -1561,21 +1561,21 @@ send:
 		}
 
 		LogTrace(receivedCmd, len, r2t_stime, r2t_etime, NULL, true);
-		
+
 		if (trace_data != NULL)
 			LogTrace(trace_data, trace_data_size, t2r_stime, t2r_etime, NULL, false);
 	}
 
 	LEDsoff();
-	
+
 	if (buttonPressed)
 		DbpString("[+] button pressed");
-	
+
 	return buttonPressed;
 }
 
 /**
- * @brief sends our simulated tag answer 
+ * @brief sends our simulated tag answer
  * @param resp
  * @param respLen
  * @param delay
@@ -1584,12 +1584,12 @@ static int SendIClassAnswer(uint8_t *resp, int respLen, uint16_t delay) {
 	int i = 0;
 	volatile uint8_t b = 0;
 
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_SIMULATOR | FPGA_HF_SIMULATOR_MODULATE_424K_8BIT);	
-	
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_SIMULATOR | FPGA_HF_SIMULATOR_MODULATE_424K_8BIT);
+
 	AT91C_BASE_SSC->SSC_THR = 0x00;
-	
+
 	while (!BUTTON_PRESS()) {
-		
+
 		// Prevent rx holding register from overflowing
 		if ( (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY)){
 			b = AT91C_BASE_SSC->SSC_RHR; (void) b;
@@ -1626,7 +1626,7 @@ static void TransmitIClassCommand(const uint8_t *cmd, int len, int *samples, int
 
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD);
 	AT91C_BASE_SSC->SSC_THR = 0x00;
-	
+
 	 // make sure we timeout previous comms.
 	if ( *wait )
 		SpinDelayUs(*wait);
@@ -1640,7 +1640,7 @@ static void TransmitIClassCommand(const uint8_t *cmd, int len, int *samples, int
 
 			// DOUBLE THE SAMPLES!
 			if (firstpart) {
-				sendbyte = (cmd[c] & 0xf0) | (cmd[c] >> 4); 
+				sendbyte = (cmd[c] & 0xf0) | (cmd[c] >> 4);
 			} else {
 				sendbyte = (cmd[c] & 0x0f) | (cmd[c] << 4);
 				c++;
@@ -1658,14 +1658,14 @@ static void TransmitIClassCommand(const uint8_t *cmd, int len, int *samples, int
 		// Prevent rx holding register from overflowing
 		if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
 			b = AT91C_BASE_SSC->SSC_RHR; (void)b;
-		}		
+		}
 	}
 
 	if (samples) {
 		if (wait)
 			*samples = (c + *wait) << 3;
 		else
-			*samples = c << 3;	
+			*samples = c << 3;
 	}
 }
 
@@ -1684,7 +1684,7 @@ void CodeIClassCommand(const uint8_t* cmd, int len) {
 	ToSend[++ToSendMax] = 0x0f;
 	ToSend[++ToSendMax] = 0x00;
 
-	// Modulate the bytes 
+	// Modulate the bytes
 	for (i = 0; i < len; i++) {
 		b = cmd[i];
 		for (j = 0; j < 4; j++) {
@@ -1693,7 +1693,7 @@ void CodeIClassCommand(const uint8_t* cmd, int len) {
 				if (k == (b & 3))
 					ToSend[++ToSendMax] = 0xf0;
 				else
-					ToSend[++ToSendMax] = 0x00;			
+					ToSend[++ToSendMax] = 0x00;
 			}
 			b >>= 2;
 		}
@@ -1720,9 +1720,9 @@ void ReaderTransmitIClass_ext(uint8_t* frame, int len, int wait) {
 	TransmitIClassCommand(ToSend, ToSendMax, &samples, &wait);
 	if (trigger)
 		LED_A_ON();
-	
+
 	rsamples += samples;
-	
+
 	LogTrace(frame, len, rsamples, rsamples, NULL, true);
 }
 void ReaderTransmitIClass(uint8_t* frame, int len) {
@@ -1741,7 +1741,7 @@ static int GetIClassAnswer(uint8_t* receivedResponse, int maxLen, int *samples,
 	int c = 0;
 	bool skip = false;
 
-	// Setup UART/DEMOD to receive 
+	// Setup UART/DEMOD to receive
 	DemodInit(receivedResponse);
 
 	if (elapsed) *elapsed = 0;
@@ -1759,7 +1759,7 @@ static int GetIClassAnswer(uint8_t* receivedResponse, int maxLen, int *samples,
 
 		 // keep tx buffer in a defined state anyway.
 		if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
-			AT91C_BASE_SSC->SSC_THR = 0x00;  
+			AT91C_BASE_SSC->SSC_THR = 0x00;
 			// To make use of exact timing of next command from reader!!
 			if (elapsed) (*elapsed)++;
 		}
@@ -1769,14 +1769,14 @@ static int GetIClassAnswer(uint8_t* receivedResponse, int maxLen, int *samples,
 			if (c >= timeout) return false;
 
 			c++;
-			
+
 			b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
-			
-			skip = !skip;			
+
+			skip = !skip;
 			if (skip) continue;
-		
+
 			if (ManchesterDecoding_iclass(b & 0x0f)) {
-				if (samples) 
+				if (samples)
 					*samples = c << 3;
 				return true;
 			}
@@ -1788,16 +1788,16 @@ static int GetIClassAnswer(uint8_t* receivedResponse, int maxLen, int *samples,
 int ReaderReceiveIClass(uint8_t* receivedAnswer) {
 	int samples = 0;
 
-	if (!GetIClassAnswer(receivedAnswer, 0, &samples, NULL)) 
+	if (!GetIClassAnswer(receivedAnswer, 0, &samples, NULL))
 		return false;
 
 	rsamples += samples;
 
 	LogTrace(receivedAnswer, Demod.len, rsamples, rsamples, NULL, false);
 
-	if (samples == 0) 
+	if (samples == 0)
 		return false;
-	
+
 	return Demod.len;
 }
 
@@ -1808,9 +1808,9 @@ void setupIclassReader() {
     // Start from off (no field generated)
     // Signal field is off with the appropriate LED
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	
+
     FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-	
+
     FpgaSetupSsc();
 
     SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
@@ -1822,28 +1822,28 @@ void setupIclassReader() {
     // Signal field is on with the appropriate LED
     FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD);
     SpinDelay(300);
-	
+
 	StartCountSspClk();
-	
+
     LED_A_ON();
 }
 
 bool sendCmdGetResponseWithRetries(uint8_t* command, size_t cmdsize, uint8_t* resp, uint8_t expected_size, uint8_t retries) {
 	uint8_t got_n = 0;
 	while (retries-- > 0) {
-		
+
 		ReaderTransmitIClass(command, cmdsize);
-		
+
 		//iceman - if received size is bigger than expected, we smash the stack here
 		//		since its called with fixed sized arrays
 		got_n = ReaderReceiveIClass(resp);
-		
+
 		// 0xBB is the internal debug separator byte..
 		if ( expected_size != got_n|| (resp[0] == 0xBB || resp[7] == 0xBB || resp[2] == 0xBB)) {
 			//try again
 			continue;
 		}
-	
+
 		if (got_n == expected_size)
 			return true;
 	}
@@ -1865,7 +1865,7 @@ uint8_t handshakeIclassTag_ext(uint8_t *card_data, bool use_credit_key) {
 	static uint8_t select[]       = { ICLASS_CMD_SELECT, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
 	uint8_t readcheck_cc[] = { ICLASS_CMD_READCHECK_KD, 0x02 };
 
-	if (use_credit_key) 
+	if (use_credit_key)
 		readcheck_cc[0] = ICLASS_CMD_READCHECK_KC;
 
 	uint8_t resp[ICLASS_BUFFER_SIZE] = {0};
@@ -1873,7 +1873,7 @@ uint8_t handshakeIclassTag_ext(uint8_t *card_data, bool use_credit_key) {
 
 	// Send act_all
 	ReaderTransmitIClass_ext(act_all, 1, 330+160);
-	// Card present?	
+	// Card present?
 	if (!ReaderReceiveIClass(resp)) return read_status;//Fail
 
 	//Send Identify
@@ -1885,10 +1885,10 @@ uint8_t handshakeIclassTag_ext(uint8_t *card_data, bool use_credit_key) {
 
 	//Copy the Anti-collision CSN to our select-packet
 	memcpy(&select[1], resp, 8);
-	
+
 	//Select the card
 	ReaderTransmitIClass(select, sizeof(select));
-	
+
 	//We expect a 10-byte response here, 8 byte CSN and 2 byte CRC
 	len = ReaderReceiveIClass(resp);
 	if (len != 10) return read_status;//Fail
@@ -1907,10 +1907,10 @@ uint8_t handshakeIclassTag_ext(uint8_t *card_data, bool use_credit_key) {
 		// memcpy(card_data+8, resp, 8);
 		// read_status++;
 	// }
-			
+
 	bool isOK = sendCmdGetResponseWithRetries(readcheck_cc, sizeof(readcheck_cc), resp, 8, 3);
 	if (!isOK) return read_status;
-	
+
 	//Save CC (e-purse) in response data
 	memcpy(card_data+8, resp, 8);
 	read_status++;
@@ -1930,17 +1930,17 @@ void ReaderIClass(uint8_t arg0) {
 
 	memset(card_data, 0xFF, sizeof(card_data));
 	memset(resp, 0xFF, sizeof(resp));
-	
+
 	//Read conf block CRC(0x01) => 0xfa 0x22
 	uint8_t readConf[] = { ICLASS_CMD_READ_OR_IDENTIFY, 0x01, 0xfa, 0x22};
-	
+
 	//Read App Issuer Area block CRC(0x05) => 0xde  0x64
 	uint8_t readAA[] = { ICLASS_CMD_READ_OR_IDENTIFY, 0x05, 0xde, 0x64};
 
     int read_status = 0;
 	uint16_t tryCnt = 0;
 	uint8_t result_status = 0;
-	
+
     bool abort_after_read = arg0 & FLAG_ICLASS_READER_ONLY_ONCE;		// flag to read until one tag is found successfully
 	bool try_once = arg0 & FLAG_ICLASS_READER_ONE_TRY;					// flag to not to loop continuously, looking for tag
 	bool use_credit_key = arg0 & FLAG_ICLASS_READER_CEDITKEY;			// flag to use credit key
@@ -1958,9 +1958,9 @@ void ReaderIClass(uint8_t arg0) {
 		// if only looking for one card try 2 times if we missed it the first time
 		if (try_once && tryCnt > 2) {
 			if (MF_DBGLEVEL > 1) DbpString("Failed to find a tag");
-			break; 
+			break;
 		}
-		
+
 		tryCnt++;
 		result_status = 0;
 
@@ -1998,7 +1998,7 @@ void ReaderIClass(uint8_t arg0) {
 		// 0 : CSN
 		// 1 : Configuration
 		// 2 : e-purse
-		// 3 : kd / debit / aa2 (write-only) 
+		// 3 : kd / debit / aa2 (write-only)
 		// 4 : kc / credit / aa1 (write-only)
 		// 5 : AIA, Application issuer area
 		//
@@ -2006,8 +2006,8 @@ void ReaderIClass(uint8_t arg0) {
 		// with 0xFF:s in block 3 and 4.
 
 		LED_B_ON();
-		//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)			
+		//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)
 		if (memcmp(last_csn, card_data, 8) != 0) {
 			// If caller requires that we get Conf, CC, AA, continue until we got it
 			if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
@@ -2016,7 +2016,7 @@ void ReaderIClass(uint8_t arg0) {
 					(result_status & FLAG_ICLASS_READER_CSN) ? 'Y':'N',
 					(result_status & FLAG_ICLASS_READER_CONF)? 'Y':'N',
 					(result_status & FLAG_ICLASS_READER_CC)  ? 'Y':'N',
-					(result_status & FLAG_ICLASS_READER_AIA) ? 'Y':'N'					
+					(result_status & FLAG_ICLASS_READER_AIA) ? 'Y':'N'
 				);
 				Dbprintf(" aar %c | to %c, | uc %c | frc %c | fra %c | cc %c",
 					abort_after_read  ? 'Y':'N',
@@ -2027,7 +2027,7 @@ void ReaderIClass(uint8_t arg0) {
 					flagReadCC ? 'Y':'N'
 					);
 			}
-			
+
 			bool send = (result_status & FLAG_ICLASS_READER_CSN );
 			if (flagReadCC)
 				send |= (result_status & FLAG_ICLASS_READER_CC );
@@ -2035,9 +2035,9 @@ void ReaderIClass(uint8_t arg0) {
 				send |= (result_status & FLAG_ICLASS_READER_AIA );
 			if (flagReadConfig)
 				send |= (result_status & FLAG_ICLASS_READER_CONF );
-			
+
 			if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("SEND %c",  send?'y':'n');
-				
+
 			if ( send ) {
 				cmd_send(CMD_ACK, result_status, 0, 0, card_data, sizeof(card_data) );
 				if (abort_after_read) {
@@ -2051,7 +2051,7 @@ void ReaderIClass(uint8_t arg0) {
 		LED_B_OFF();
 		userCancelled = BUTTON_PRESS() || usb_poll_validate_length();
 	}
-	
+
 	if (userCancelled) {
 		cmd_send(CMD_ACK, 0xFF, 0, 0, card_data, 0);
 		switch_off();
@@ -2076,14 +2076,14 @@ void ReaderIClass_Replay(uint8_t arg0, uint8_t *MAC) {
 	  int k2;
 	  int lockauth;
 	  int keyaccess;
-	} memory;	
-	
+	} memory;
+
     setupIclassReader();
 
 	while (!BUTTON_PRESS()) {
-	
+
 		WDT_HIT();
-		
+
 		uint8_t read_status = handshakeIclassTag(card_data);
 		if (read_status < 2) continue;
 
@@ -2176,7 +2176,7 @@ void ReaderIClass_Replay(uint8_t arg0, uint8_t *MAC) {
 			 card_data,
 			 0
 	);
-	switch_off(); 
+	switch_off();
 }
 
 // not used. ?!? ( CMD_ICLASS_READCHECK)
@@ -2187,10 +2187,10 @@ void iClass_ReadCheck(uint8_t blockNo, uint8_t keyType) {
 	size_t isOK = 0;
 	isOK = sendCmdGetResponseWithRetries(readcheck, sizeof(readcheck), resp, sizeof(resp), 6);
 	cmd_send(CMD_ACK,isOK,0,0,0,0);
-	switch_off(); 
+	switch_off();
 }
 
-// used with function select_and_auth (cmdhficlass.c) 
+// used with function select_and_auth (cmdhficlass.c)
 // which needs to authenticate before doing more things like read/write
 void iClass_Authentication(uint8_t *mac) {
 	uint8_t check[] = { ICLASS_CMD_CHECK, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
@@ -2202,8 +2202,8 @@ void iClass_Authentication(uint8_t *mac) {
 	check[7] = mac[2];
 	check[8] = mac[3];
 	//memcpy(check+5, mac, 4);
-	
-	// 6 retries 
+
+	// 6 retries
 	bool isOK = sendCmdGetResponseWithRetries(check, sizeof(check), resp, 4, 6);
 	cmd_send(CMD_ACK,isOK,0,0,0,0);
 }
@@ -2213,7 +2213,7 @@ typedef struct iclass_premac {
 } iclass_premac_t;
 
 /* this function works on the following assumptions.
-* - one select first, to get CSN / CC (e-purse) 
+* - one select first, to get CSN / CC (e-purse)
 * - calculate before diversified keys and precalc mac based on CSN/KEY.
 * - data in contains of diversified keys, mac
 * - key loop only test one type of authtication key. Ie two calls needed
@@ -2225,77 +2225,77 @@ void iClass_Authentication_fast(uint64_t arg0, uint64_t arg1, uint8_t *datain) {
 	bool use_credit_key =((arg0 >> 16) & 0xFF);
 	uint8_t keyCount = arg1 & 0xFF;
 	uint8_t check[] = { ICLASS_CMD_CHECK, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
-	uint8_t resp[ICLASS_BUFFER_SIZE];	
+	uint8_t resp[ICLASS_BUFFER_SIZE];
 	uint8_t readcheck_cc[] = { ICLASS_CMD_READCHECK_KD, 0x02 };
 
-	if  (use_credit_key) 
+	if  (use_credit_key)
 		readcheck_cc[0] = ICLASS_CMD_READCHECK_KC;
-	
+
 	// select card / e-purse
 	uint8_t card_data[6 * 8] = {0};
-	
+
 	iclass_premac_t *keys = (iclass_premac_t *)datain;
-		
+
 	LED_A_ON();
-	
+
 	switch_off();
 	SpinDelay(20);
-	
+
 	setupIclassReader();
 
 	int read_status = 0;
 	uint8_t startup_limit = 10;
 	while ( read_status != 2) {
-		
+
 		if (BUTTON_PRESS() && !usb_poll_validate_length()) goto out;
-		
+
 		read_status = handshakeIclassTag_ext(card_data, use_credit_key);
 		if ( startup_limit-- == 0 ) {
 			Dbprintf("[-] Handshake status | %d (fail 10)", read_status);
-			isOK = 99;			
+			isOK = 99;
 			goto out;
 		}
 	};
 	// since handshakeIclassTag_ext call sends s readcheck,  we start with sending first response.
-		
+
 	// Keychunk loop
 	for (i = 0; i < keyCount; i++) {
-		
+
 		// Allow button press / usb cmd to interrupt device
 		if (BUTTON_PRESS() && !usb_poll_validate_length()) break;
 
 		WDT_HIT();
-		LED_B_ON();		
-	
+		LED_B_ON();
+
 		// copy MAC to check command (readersignature)
 		check[5] = keys[i].mac[0];
 		check[6] = keys[i].mac[1];
 		check[7] = keys[i].mac[2];
 		check[8] = keys[i].mac[3];
-		
+
 		// expect 4bytes, 3 retries times..
 		isOK = sendCmdGetResponseWithRetries(check, sizeof(check), resp, 4, 3);
 		if ( isOK )
 			goto out;
-			
+
 		SpinDelayUs(400);  //iClass (iso15693-2) should timeout after 330us.
 
-		// Auth Sequence MUST begin with reading e-purse. (block2)	
-		// Card selected, now read e-purse (cc) (block2) (only 8 bytes no CRC)		
-		ReaderTransmitIClass(readcheck_cc, sizeof(readcheck_cc));		
-		
-		LED_B_OFF();		
+		// Auth Sequence MUST begin with reading e-purse. (block2)
+		// Card selected, now read e-purse (cc) (block2) (only 8 bytes no CRC)
+		ReaderTransmitIClass(readcheck_cc, sizeof(readcheck_cc));
+
+		LED_B_OFF();
 	}
-	
-out:	
+
+out:
 	// send keyindex.
 	cmd_send(CMD_ACK, isOK, i, 0, 0, 0);
-	
+
 	if ( isOK >= 1 || lastChunk ) {
 		switch_off();
 		LED_A_OFF();
 	}
-	
+
 	LED_B_OFF();
 	LED_C_OFF();
 }
@@ -2318,7 +2318,7 @@ void iClass_ReadBlk(uint8_t blockno) {
 	uint8_t data[] = {0,0,0,0,0,0,0,0,0,0};
 	bool isOK = iClass_ReadBlock(blockno, data, sizeof(data));
 	cmd_send(CMD_ACK, isOK, 0, 0, data, sizeof(data));
-	switch_off(); 
+	switch_off();
 }
 
 // turn off afterwards
@@ -2339,7 +2339,7 @@ void iClass_Dump(uint8_t blockno, uint8_t numblks) {
 
 	for (;blkCnt < numblks; blkCnt++) {
 		isOK = iClass_ReadBlock(blockno + blkCnt, blockdata, sizeof(blockdata));
-		
+
 		// 0xBB is the internal debug separator byte..
 		if (!isOK || (blockdata[0] == 0xBB || blockdata[7] == 0xBB || blockdata[2] == 0xBB)) { //try again
 			isOK = iClass_ReadBlock(blockno + blkCnt, blockdata, sizeof(blockdata));
@@ -2352,7 +2352,7 @@ void iClass_Dump(uint8_t blockno, uint8_t numblks) {
 	}
 	//return pointer to dump memory in arg3
 	cmd_send(CMD_ACK, isOK, blkCnt, BigBuf_max_traceLen(), 0, 0);
-	switch_off(); 
+	switch_off();
 	BigBuf_free();
 }
 
@@ -2372,7 +2372,7 @@ bool iClass_WriteBlock_ext(uint8_t blockNo, uint8_t *data) {
 			//if not programming key areas (note key blocks don't get programmed with actual key data it is xor data)
 			if (blockNo != 3 && blockNo != 4) {
 				isOK = sendCmdGetResponseWithRetries(write, sizeof(write), resp, sizeof(resp), 5);
-			} 			
+			}
 		}
 	}
 	return isOK;
@@ -2382,7 +2382,7 @@ bool iClass_WriteBlock_ext(uint8_t blockNo, uint8_t *data) {
 void iClass_WriteBlock(uint8_t blockNo, uint8_t *data) {
 	bool isOK = iClass_WriteBlock_ext(blockNo, data);
 	cmd_send(CMD_ACK,isOK,0,0,0,0);
-	switch_off(); 
+	switch_off();
 }
 
 // turn off afterwards
@@ -2406,8 +2406,8 @@ void iClass_Clone(uint8_t startblock, uint8_t endblock, uint8_t *data) {
 	if (written == total_block)
 		DbpString("Clone complete");
 	else
-		DbpString("Clone incomplete");   
+		DbpString("Clone incomplete");
 
 	cmd_send(CMD_ACK,1,0,0,0,0);
-	switch_off(); 
+	switch_off();
 }
\ No newline at end of file
diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 4267d28af..9e415fcdb 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -29,8 +29,8 @@ static uint8_t* free_buffer_pointer;
 //
 // minimum time between the start bits of consecutive transfers from reader to tag: 7000 carrier (13.56Mhz) cycles
 #define REQUEST_GUARD_TIME (7000/16 + 1)
-// minimum time between last modulation of tag and next start bit from reader to tag: 1172 carrier cycles 
-#define FRAME_DELAY_TIME_PICC_TO_PCD (1172/16 + 1) 
+// minimum time between last modulation of tag and next start bit from reader to tag: 1172 carrier cycles
+#define FRAME_DELAY_TIME_PICC_TO_PCD (1172/16 + 1)
 // bool LastCommandWasRequest = false;
 
 //
@@ -42,8 +42,8 @@ static uint8_t* free_buffer_pointer;
 // 8 ticks until bit_to_arm is assigned from curbit
 // 8*16 ticks for the transfer from FPGA to ARM
 // 4*16 ticks until we measure the time
-// - 8*16 ticks because we measure the time of the previous transfer 
-#define DELAY_AIR2ARM_AS_READER (3 + 16 + 8 + 8*16 + 4*16 - 8*16) 
+// - 8*16 ticks because we measure the time of the previous transfer
+#define DELAY_AIR2ARM_AS_READER (3 + 16 + 8 + 8*16 + 4*16 - 8*16)
 
 // When the PM acts as a reader and is sending, it takes
 // 4*16 ticks until we can write data to the sending hold register
@@ -60,10 +60,10 @@ static uint8_t* free_buffer_pointer;
 // 8 ticks until the SSC samples the first data
 // 7*16 ticks to complete the transfer from FPGA to ARM
 // 8 ticks until the next ssp_clk rising edge
-// 4*16 ticks until we measure the time 
-// - 8*16 ticks because we measure the time of the previous transfer 
+// 4*16 ticks until we measure the time
+// - 8*16 ticks because we measure the time of the previous transfer
 #define DELAY_AIR2ARM_AS_TAG (2 + 3 + 8 + 8 + 7*16 + 8 + 4*16 - 8*16)
- 
+
 // The FPGA will report its internal sending delay in
 uint16_t FpgaSendQueueDelay;
 // the 5 first bits are the number of bits buffered in mod_sig_buf
@@ -85,16 +85,16 @@ uint16_t FpgaSendQueueDelay;
 // 8 ticks (on average) until the result is stored in to_arm
 // + the delays in transferring data - which is the same for
 // sniffing reader and tag data and therefore not relevant
-#define DELAY_TAG_AIR2ARM_AS_SNIFFER (3 + 14 + 8) 
- 
+#define DELAY_TAG_AIR2ARM_AS_SNIFFER (3 + 14 + 8)
+
 // When the PM acts as sniffer and is receiving reader data, it takes
-// 2 ticks delay in analogue RF receiver (for the falling edge of the 
+// 2 ticks delay in analogue RF receiver (for the falling edge of the
 // start bit, which marks the start of the communication)
 // 3 ticks A/D conversion
 // 8 ticks on average until the data is stored in to_arm.
 // + the delays in transferring data - which is the same for
 // sniffing reader and tag data and therefore not relevant
-#define DELAY_READER_AIR2ARM_AS_SNIFFER (2 + 3 + 8) 
+#define DELAY_READER_AIR2ARM_AS_SNIFFER (2 + 3 + 8)
 
 //variables used for timing purposes:
 //these are in ssp_clk cycles:
@@ -106,7 +106,7 @@ static uint32_t LastProxToAirDuration;
 // Sequence D: 11110000 modulation with subcarrier during first half
 // Sequence E: 00001111 modulation with subcarrier during second half
 // Sequence F: 00000000 no modulation with subcarrier
-// Sequence COLL: 11111111 load modulation over the full bitlenght. 
+// Sequence COLL: 11111111 load modulation over the full bitlenght.
 //                         Tricks the reader to think that multiple cards answer (at least one card with 1 and at least one card with 0).
 // READER TO CARD - miller
 // Sequence X: 00001100 drop after half a period
@@ -154,7 +154,7 @@ void GetParity(const uint8_t *pbtCmd, uint16_t iLen, uint8_t *par) {
 	}
 
 	// save remaining parity bits
-	par[paritybyte_cnt] = parityBits;	
+	par[paritybyte_cnt] = parityBits;
 }
 
 
@@ -163,8 +163,8 @@ void GetParity(const uint8_t *pbtCmd, uint16_t iLen, uint8_t *par) {
 //=============================================================================
 // Basics:
 // This decoder is used when the PM3 acts as a tag.
-// The reader will generate "pauses" by temporarily switching of the field. 
-// At the PM3 antenna we will therefore measure a modulated antenna voltage. 
+// The reader will generate "pauses" by temporarily switching of the field.
+// At the PM3 antenna we will therefore measure a modulated antenna voltage.
 // The FPGA does a comparison with a threshold and would deliver e.g.:
 // ........  1 1 1 1 1 1 0 0 1 1 1 1 1 1 1 1 1 1 0 0 1 1 1 1 1 1 1 1 1 1  .......
 // The Miller decoder needs to identify the following sequences:
@@ -216,17 +216,17 @@ void UartInit(uint8_t *data, uint8_t *parity) {
 // use parameter non_real_time to provide a timestamp. Set to 0 if the decoder should measure real time
 RAMFUNC bool MillerDecoding(uint8_t bit, uint32_t non_real_time) {
 	Uart.fourBits = (Uart.fourBits << 8) | bit;
-	
+
 	if (Uart.state == STATE_UNSYNCD) {											// not yet synced
 			Uart.syncBit = 9999; 												// not set
-		
+
 		// 00x11111 2|3 ticks pause followed by 6|5 ticks unmodulated	 	Sequence Z (a "0" or "start of communication")
 		// 11111111 8 ticks unmodulation									Sequence Y (a "0" or "end of communication" or "no information")
 		// 111100x1 4 ticks unmodulated followed by 2|3 ticks pause			Sequence X (a "1")
 
 		// The start bit is one ore more Sequence Y followed by a Sequence Z (... 11111111 00x11111). We need to distinguish from
 		// Sequence X followed by Sequence Y followed by Sequence Z     (111100x1 11111111 00x11111)
-		// we therefore look for a ...xx1111 11111111 00x11111xxxxxx... pattern 
+		// we therefore look for a ...xx1111 11111111 00x11111xxxxxx... pattern
 		// (12 '1's followed by 2 '0's, eventually followed by another '0', followed by 5 '1's)
 		#define ISO14443A_STARTBIT_MASK		0x07FFEF80							// mask is    00000111 11111111 11101111 10000000
 		#define ISO14443A_STARTBIT_PATTERN	0x07FF8F80							// pattern is 00000111 11111111 10001111 10000000
@@ -247,7 +247,7 @@ RAMFUNC bool MillerDecoding(uint8_t bit, uint32_t non_real_time) {
 		}
 	} else {
 
-		if (IsMillerModulationNibble1(Uart.fourBits >> Uart.syncBit)) {			
+		if (IsMillerModulationNibble1(Uart.fourBits >> Uart.syncBit)) {
 			if (IsMillerModulationNibble2(Uart.fourBits >> Uart.syncBit)) {		// Modulation in both halves - error
 				UartReset();
 			} else {															// Modulation in first half = Sequence Z = logic "0"
@@ -329,8 +329,8 @@ RAMFUNC bool MillerDecoding(uint8_t bit, uint32_t non_real_time) {
 					}
 				}
 			}
-		}			
-	} 
+		}
+	}
     return false;	// not finished yet, need more data
 }
 
@@ -369,12 +369,12 @@ void DemodReset(void) {
 	Demod.len = 0;						// number of decoded data bytes
 	Demod.parityLen = 0;
 	Demod.shiftReg = 0;					// shiftreg to hold decoded data bits
-	Demod.parityBits = 0;				// 
+	Demod.parityBits = 0;				//
 	Demod.collisionPos = 0;				// Position of collision bit
 	Demod.twoBits = 0xFFFF;				// buffer for 2 Bits
 	Demod.highCnt = 0;
 	Demod.startTime = 0;
-	Demod.endTime = 0;	
+	Demod.endTime = 0;
 	Demod.bitCount = 0;
 	Demod.syncBit = 0xFFFF;
 	Demod.samples = 0;
@@ -389,7 +389,7 @@ void DemodInit(uint8_t *data, uint8_t *parity) {
 // use parameter non_real_time to provide a timestamp. Set to 0 if the decoder should measure real time
 RAMFUNC int ManchesterDecoding(uint8_t bit, uint16_t offset, uint32_t non_real_time) {
 	Demod.twoBits = (Demod.twoBits << 8) | bit;
-	
+
 	if (Demod.state == DEMOD_UNSYNCD) {
 
 		if (Demod.highCnt < 2) {											// wait for a stable unmodulated signal
@@ -400,7 +400,7 @@ RAMFUNC int ManchesterDecoding(uint8_t bit, uint16_t offset, uint32_t non_real_t
 			}
 		} else {
 			Demod.syncBit = 0xFFFF;			// not set
-			if 		((Demod.twoBits & 0x7700) == 0x7000) Demod.syncBit = 7; 
+			if 		((Demod.twoBits & 0x7700) == 0x7000) Demod.syncBit = 7;
 			else if ((Demod.twoBits & 0x3B80) == 0x3800) Demod.syncBit = 6;
 			else if ((Demod.twoBits & 0x1DC0) == 0x1C00) Demod.syncBit = 5;
 			else if ((Demod.twoBits & 0x0EE0) == 0x0E00) Demod.syncBit = 4;
@@ -493,21 +493,21 @@ void RAMFUNC SniffIso14443a(uint8_t param) {
 	// bit 0 - trigger from first card answer
 	// bit 1 - trigger from first reader 7-bit request
 	iso14443a_setup(FPGA_HF_ISO14443A_SNIFFER);
-	
+
 	// Allocate memory from BigBuf for some buffers
 	// free all previous allocations first
 	BigBuf_free(); BigBuf_Clear_ext(false);
 	clear_trace();
 	set_tracing(true);
-	
+
 	// The command (reader -> tag) that we're receiving.
 	uint8_t *receivedCmd = BigBuf_malloc(MAX_FRAME_SIZE);
 	uint8_t *receivedCmdPar = BigBuf_malloc(MAX_PARITY_SIZE);
-	
+
 	// The response (tag -> reader) that we're receiving.
 	uint8_t *receivedResp = BigBuf_malloc(MAX_FRAME_SIZE);
 	uint8_t *receivedRespPar = BigBuf_malloc(MAX_PARITY_SIZE);
-	
+
 	// The DMA buffer, used to stream samples from the FPGA
 	uint8_t *dmaBuf = BigBuf_malloc(DMA_BUFFER_SIZE);
 	uint8_t *data = dmaBuf;
@@ -517,29 +517,29 @@ void RAMFUNC SniffIso14443a(uint8_t param) {
 	int dataLen = 0;
 	bool TagIsActive = false;
 	bool ReaderIsActive = false;
-	
+
 	// Set up the demodulator for tag -> reader responses.
 	DemodInit(receivedResp, receivedRespPar);
-	
+
 	// Set up the demodulator for the reader -> tag commands
 	UartInit(receivedCmd, receivedCmdPar);
-	
+
 	// Setup and start DMA.
 	if ( !FpgaSetupSscDma((uint8_t*) dmaBuf, DMA_BUFFER_SIZE) ){
-		if (MF_DBGLEVEL > 1) Dbprintf("FpgaSetupSscDma failed. Exiting"); 
+		if (MF_DBGLEVEL > 1) Dbprintf("FpgaSetupSscDma failed. Exiting");
 		return;
 	}
-	
+
 	// We won't start recording the frames that we acquire until we trigger;
 	// a good trigger condition to get started is probably when we see a
 	// response from the tag.
 	// triggered == false -- to wait first for card
-	bool triggered = !(param & 0x03); 
-	
+	bool triggered = !(param & 0x03);
+
 	uint32_t rsamples = 0;
 
 	DbpString("Starting to sniff");
-	
+
 	// loop and listen
 	while (!BUTTON_PRESS()) {
         WDT_HIT();
@@ -551,7 +551,7 @@ void RAMFUNC SniffIso14443a(uint8_t param) {
 			dataLen = dmaBufDataP - readBufDataP;
 		else
 			dataLen = DMA_BUFFER_SIZE - readBufDataP + dmaBufDataP;
-		
+
 		// test for length of buffer
 		if (dataLen > maxDataLen) {
 			maxDataLen = dataLen;
@@ -575,7 +575,7 @@ void RAMFUNC SniffIso14443a(uint8_t param) {
 		}
 
 		LED_A_OFF();
-		
+
 		// Need two samples to feed Miller and Manchester-Decoder
 		if (rsamples & 0x01) {
 
@@ -588,11 +588,11 @@ void RAMFUNC SniffIso14443a(uint8_t param) {
 					if ((!triggered) && (param & 0x02) && (Uart.len == 1) && (Uart.bitCount == 7)) triggered = true;
 
 					if (triggered) {
-						if (!LogTrace(receivedCmd, 
-										Uart.len, 
+						if (!LogTrace(receivedCmd,
+										Uart.len,
 										Uart.startTime*16 - DELAY_READER_AIR2ARM_AS_SNIFFER,
 										Uart.endTime*16 - DELAY_READER_AIR2ARM_AS_SNIFFER,
-										Uart.parity, 
+										Uart.parity,
 										true)) break;
 					}
 					/* ready to receive another command. */
@@ -606,14 +606,14 @@ void RAMFUNC SniffIso14443a(uint8_t param) {
 			}
 
 			// no need to try decoding tag data if the reader is sending - and we cannot afford the time
-			if (!ReaderIsActive) {		
+			if (!ReaderIsActive) {
 				uint8_t tagdata = (previous_data << 4) | (*data & 0x0F);
 				if (ManchesterDecoding(tagdata, 0, (rsamples-1)*4)) {
 					LED_B_ON();
 
-					if (!LogTrace(receivedResp, 
-									Demod.len, 
-									Demod.startTime*16 - DELAY_TAG_AIR2ARM_AS_SNIFFER, 
+					if (!LogTrace(receivedResp,
+									Demod.len,
+									Demod.startTime*16 - DELAY_TAG_AIR2ARM_AS_SNIFFER,
 									Demod.endTime*16 - DELAY_TAG_AIR2ARM_AS_SNIFFER,
 									Demod.parity,
 									false)) break;
@@ -626,7 +626,7 @@ void RAMFUNC SniffIso14443a(uint8_t param) {
 					UartReset();
 					//UartInit(receivedCmd, receivedCmdPar);
 					LED_C_OFF();
-				} 
+				}
 				TagIsActive = (Demod.state != DEMOD_UNSYNCD);
 			}
 		}
@@ -643,14 +643,14 @@ void RAMFUNC SniffIso14443a(uint8_t param) {
 		Dbprintf("maxDataLen=%d, Uart.state=%x, Uart.len=%d", maxDataLen, Uart.state, Uart.len);
 		Dbprintf("traceLen=%d, Uart.output[0]=%08x", BigBuf_get_traceLen(), (uint32_t)Uart.output[0]);
 	}
-	switch_off(); 
+	switch_off();
 }
 
 //-----------------------------------------------------------------------------
 // Prepare tag messages
 //-----------------------------------------------------------------------------
 static void CodeIso14443aAsTagPar(const uint8_t *cmd, uint16_t len, uint8_t *parity, bool collision) {
-	
+
 	//uint8_t localCol = 0;
 	ToSendReset();
 
@@ -663,7 +663,7 @@ static void CodeIso14443aAsTagPar(const uint8_t *cmd, uint16_t len, uint8_t *par
 	ToSendStuffBit(0);
 	ToSendStuffBit(0);
 	ToSendStuffBit(0);
-	
+
 	// Send startbit
 	ToSend[++ToSendMax] = SEC_D;
 	LastProxToAirDuration = 8 * ToSendMax - 4;
@@ -676,7 +676,7 @@ static void CodeIso14443aAsTagPar(const uint8_t *cmd, uint16_t len, uint8_t *par
 			//if (collision && (localCol >= colpos)){
 			if (collision) {
 				ToSend[++ToSendMax] = SEC_COLL;
-				//localCol++;				
+				//localCol++;
             } else {
 				if (b & 1) {
 					ToSend[++ToSendMax] = SEC_D;
@@ -689,7 +689,7 @@ static void CodeIso14443aAsTagPar(const uint8_t *cmd, uint16_t len, uint8_t *par
 
 		if (collision) {
 			ToSend[++ToSendMax] = SEC_COLL;
-			LastProxToAirDuration = 8 * ToSendMax;			
+			LastProxToAirDuration = 8 * ToSendMax;
 		} else {
 			// Get the parity bit
 			if (parity[i>>3] & (0x80>>(i&0x0007))) {
@@ -817,12 +817,12 @@ bool prepare_tag_modulation(tag_response_info_t* response_info, size_t max_buffe
 }
 
 // "precompile" responses. There are 7 predefined responses with a total of 28 bytes data to transmit.
-// Coded responses need one byte per bit to transfer (data, parity, start, stop, correction) 
+// Coded responses need one byte per bit to transfer (data, parity, start, stop, correction)
 // 28 * 8 data bits, 28 * 1 parity bits, 7 start bits, 7 stop bits, 7 correction bits
 // -> need 273 bytes buffer
 // 44 * 8 data bits, 44 * 1 parity bits, 9 start bits, 9 stop bits, 9 correction bits --370
-// 47 * 8 data bits, 47 * 1 parity bits, 10 start bits, 10 stop bits, 10 correction bits 
-#define ALLOCATED_TAG_MODULATION_BUFFER_SIZE 453 
+// 47 * 8 data bits, 47 * 1 parity bits, 10 start bits, 10 stop bits, 10 correction bits
+#define ALLOCATED_TAG_MODULATION_BUFFER_SIZE 453
 
 bool prepare_allocated_tag_modulation(tag_response_info_t* response_info) {
 	// Retrieve and store the current buffer index
@@ -851,14 +851,14 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t* data) {
 	#define ATTACK_KEY_COUNT 8 // keep same as define in cmdhfmf.c -> readerAttack()
 
 	uint8_t sak = 0;
-	uint32_t cuid = 0;			
+	uint32_t cuid = 0;
 	uint32_t nonce = 0;
-	
+
 	// PACK response to PWD AUTH for EV1/NTAG
 	uint8_t response8[4] = {0,0,0,0};
 	// Counter for EV1/NTAG
 	uint32_t counters[] = {0,0,0};
-	
+
 	// The first response contains the ATQA (note: bytes are transmitted in reverse order).
 	uint8_t response1[] = {0,0};
 
@@ -871,9 +871,9 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t* data) {
 	nonces_t ar_nr_nonces[ATTACK_KEY_COUNT]; // for attack types moebius
 	memset(ar_nr_nonces, 0x00, sizeof(ar_nr_nonces));
 	uint8_t	moebius_count = 0;
-	
+
 	switch (tagType) {
-		case 1: { // MIFARE Classic 1k 
+		case 1: { // MIFARE Classic 1k
 			response1[0] = 0x04;
 			sak = 0x08;
 		} break;
@@ -908,14 +908,14 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t* data) {
 			compute_crc(CRC_14443_A, response8, 2, &response8[2], &response8[3]);
 			// uid not supplied then get from emulator memory
 			if (data[0]==0) {
-				uint16_t start = 4 * (0+12);  
+				uint16_t start = 4 * (0+12);
 				uint8_t emdata[8];
 				emlGetMemBt( emdata, start, sizeof(emdata));
 				memcpy(data, emdata, 3); // uid bytes 0-2
 				memcpy(data+3, emdata+4, 4); // uid bytes 3-7
 				flags |= FLAG_7B_UID_IN_DATA;
 			}
-		} break;	
+		} break;
 		case 8: { // MIFARE Classic 4k
 			response1[0] = 0x02;
 			sak = 0x18;
@@ -930,13 +930,13 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t* data) {
 			return;
 		} break;
 	}
-	
+
 	// The second response contains the (mandatory) first 24 bits of the UID
 	uint8_t response2[5] = {0x00};
 
-	// For UID size 7, 
+	// For UID size 7,
 	uint8_t response2a[5] = {0x00};
-	
+
 	if ( (flags & FLAG_7B_UID_IN_DATA) == FLAG_7B_UID_IN_DATA ) {
 		response2[0] = 0x88;  // Cascade Tag marker
 		response2[1] = data[0];
@@ -952,7 +952,7 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t* data) {
 		// Configure the ATQA and SAK accordingly
 		response1[0] |= 0x40;
 		sak |= 0x04;
-		
+
 		cuid = bytes_to_num(data+3, 4);
 	} else {
 		memcpy(response2, data, 4);
@@ -975,22 +975,22 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t* data) {
 	compute_crc(CRC_14443_A, response3a, 1, &response3a[1], &response3a[2]);
 
 	// Tag NONCE.
-	uint8_t response5[4]; 
-	
-	uint8_t response6[] = { 0x04, 0x58, 0x80, 0x02, 0x00, 0x00 }; 	// dummy ATS (pseudo-ATR), answer to RATS: 
-	
-	// Format byte = 0x58: FSCI=0x08 (FSC=256), TA(1) and TC(1) present, 
+	uint8_t response5[4];
+
+	uint8_t response6[] = { 0x04, 0x58, 0x80, 0x02, 0x00, 0x00 }; 	// dummy ATS (pseudo-ATR), answer to RATS:
+
+	// Format byte = 0x58: FSCI=0x08 (FSC=256), TA(1) and TC(1) present,
 	// TA(1) = 0x80: different divisors not supported, DR = 1, DS = 1
 	// TB(1) = not present. Defaults: FWI = 4 (FWT = 256 * 16 * 2^4 * 1/fc = 4833us), SFGI = 0 (SFG = 256 * 16 * 2^0 * 1/fc = 302us)
 	// TC(1) = 0x02: CID supported, NAD not supported
 	compute_crc(CRC_14443_A, response6, 4, &response6[4], &response6[5]);
-	
+
 	// Prepare GET_VERSION (different for UL EV-1 / NTAG)
 	// uint8_t response7_EV1[] = {0x00, 0x04, 0x03, 0x01, 0x01, 0x00, 0x0b, 0x03, 0xfd, 0xf7};  //EV1 48bytes VERSION.
-	// uint8_t response7_NTAG[] = {0x00, 0x04, 0x04, 0x02, 0x01, 0x00, 0x11, 0x03, 0x01, 0x9e}; //NTAG 215	
+	// uint8_t response7_NTAG[] = {0x00, 0x04, 0x04, 0x02, 0x01, 0x00, 0x11, 0x03, 0x01, 0x9e}; //NTAG 215
 	// Prepare CHK_TEARING
 	// uint8_t response9[] =  {0xBD,0x90,0x3f};
-	
+
 	#define TAG_RESPONSE_COUNT 10
 	tag_response_info_t responses[TAG_RESPONSE_COUNT] = {
 		{ .response = response1,  .response_n = sizeof(response1)  },  // Answer to request - respond with card type
@@ -1002,10 +1002,10 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t* data) {
 		{ .response = response6,  .response_n = sizeof(response6)  },  // dummy ATS (pseudo-ATR), answer to RATS
 
 		{ .response = response8,   .response_n = sizeof(response8) }  // EV1/NTAG PACK response
-	};	
+	};
 		// { .response = response7_NTAG, .response_n = sizeof(response7_NTAG)}, // EV1/NTAG GET_VERSION response
 		// { .response = response9,      .response_n = sizeof(response9)     }  // EV1/NTAG CHK_TEAR response
-	
+
 
 	// Allocate 512 bytes for the dynamic modulation, created when the reader queries for it
 	// Such a response is less time critical, so we can prepare them on the fly
@@ -1019,7 +1019,7 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t* data) {
 		.modulation = dynamic_modulation_buffer,
 		.modulation_n = 0
 	};
-  
+
 	// We need to listen to the high-frequency, peak-detected path.
 	iso14443a_setup(FPGA_HF_ISO14443A_TAGSIM_LISTEN);
 
@@ -1050,16 +1050,16 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t* data) {
 	tag_response_info_t* p_response;
 
 	LED_A_ON();
-	for (;;) {	
+	for (;;) {
 		WDT_HIT();
-		
+
 		// Clean receive command buffer
 		if (!GetIso14443aCommandFromReader(receivedCmd, receivedCmdPar, &len)) {
 			Dbprintf("Emulator stopped.  Trace length: %d ", BigBuf_get_traceLen());
 			break;
-		}	
+		}
 		p_response = NULL;
-		
+
 		// Okay, look at the command now.
 		lastorder = order;
 		if (receivedCmd[0] == ISO14443A_CMD_REQA) { // Received a REQUEST
@@ -1073,13 +1073,13 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t* data) {
 		} else if (receivedCmd[1] == 0x70 && receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT) {	// Received a SELECT (cascade 1)
 			p_response = &responses[3]; order = 3;
 		} else if (receivedCmd[1] == 0x70 && receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2) {	// Received a SELECT (cascade 2)
-			p_response = &responses[4]; order = 30;	
+			p_response = &responses[4]; order = 30;
 		} else if (receivedCmd[0] == ISO14443A_CMD_READBLOCK) {	// Received a (plain) READ
 			uint8_t block = receivedCmd[1];
 			// if Ultralight or NTAG (4 byte blocks)
 			if ( tagType == 7 || tagType == 2 ) {
 				// first 12 blocks of emu are [getversion answer - check tearing - pack - 0x00 - signature]
-				uint16_t start = 4 * (block+12);  
+				uint16_t start = 4 * (block+12);
 				uint8_t emdata[MAX_MIFARE_FRAME_SIZE];
 				emlGetMemBt( emdata, start, 16);
 				AddCrc14A(emdata, 16);
@@ -1101,24 +1101,24 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t* data) {
 				// We already responded, do not send anything with the EmSendCmd14443aRaw() that is called below
 				p_response = NULL;
 			}
-		} else if (receivedCmd[0] == MIFARE_ULEV1_FASTREAD) {	// Received a FAST READ (ranged read)				
+		} else if (receivedCmd[0] == MIFARE_ULEV1_FASTREAD) {	// Received a FAST READ (ranged read)
 			uint8_t emdata[MAX_FRAME_SIZE];
 			// first 12 blocks of emu are [getversion answer - check tearing - pack - 0x00 - signature]
-			int start =  (receivedCmd[1]+12) * 4; 
+			int start =  (receivedCmd[1]+12) * 4;
 			int len   = (receivedCmd[2] - receivedCmd[1] + 1) * 4;
 			emlGetMemBt( emdata, start, len);
 			AddCrc14A(emdata, len);
-			EmSendCmd(emdata, len+2);				
-			p_response = NULL;		
-		} else if (receivedCmd[0] == MIFARE_ULEV1_READSIG && tagType == 7) {	// Received a READ SIGNATURE -- 
+			EmSendCmd(emdata, len+2);
+			p_response = NULL;
+		} else if (receivedCmd[0] == MIFARE_ULEV1_READSIG && tagType == 7) {	// Received a READ SIGNATURE --
 			// first 12 blocks of emu are [getversion answer - check tearing - pack - 0x00 - signature]
 			uint16_t start = 4 * 4;
 			uint8_t emdata[34];
 			emlGetMemBt( emdata, start, 32);
 			AddCrc14A(emdata, 32);
 			EmSendCmd(emdata, sizeof(emdata));
-			p_response = NULL;					
-		} else if (receivedCmd[0] == MIFARE_ULEV1_READ_CNT && tagType == 7) {	// Received a READ COUNTER -- 
+			p_response = NULL;
+		} else if (receivedCmd[0] == MIFARE_ULEV1_READ_CNT && tagType == 7) {	// Received a READ COUNTER --
 			uint8_t index = receivedCmd[1];
 			if (index > 2) {
 				// send NACK 0x0 == invalid argument
@@ -1128,10 +1128,10 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t* data) {
 			uint8_t cmd[] =  {0x00,0x00,0x00,0x14,0xa5};
 				num_to_bytes(counters[index], 3, cmd);
 				AddCrc14A(cmd, sizeof(cmd)-2);
-			EmSendCmd(cmd,sizeof(cmd));				
+			EmSendCmd(cmd,sizeof(cmd));
 			}
 			p_response = NULL;
-		} else if (receivedCmd[0] == MIFARE_ULEV1_INCR_CNT && tagType == 7) {	// Received a INC COUNTER -- 
+		} else if (receivedCmd[0] == MIFARE_ULEV1_INCR_CNT && tagType == 7) {	// Received a INC COUNTER --
 			uint8_t index = receivedCmd[1];
 			if ( index > 2) {
 	   			// send NACK 0x0 == invalid argument
@@ -1140,21 +1140,21 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t* data) {
 			} else {
 
 			uint32_t val = bytes_to_num(receivedCmd+2,4);
-		
+
 				// if new value + old value is bigger 24bits,  fail
 				if ( val + counters[index] > 0xFFFFFF ) {
 					// send NACK 0x4 == counter overflow
 					uint8_t nack[] = {0x04};
 					EmSendCmd(nack,sizeof(nack));
-				} else {			
-					counters[index] = val;		
+				} else {
+					counters[index] = val;
 			// send ACK
 			uint8_t ack[] = {0x0a};
 			EmSendCmd(ack,sizeof(ack));
 				}
 			}
-			p_response = NULL;			
-		} else if (receivedCmd[0] == MIFARE_ULEV1_CHECKTEAR && tagType == 7) {	// Received a CHECK_TEARING_EVENT -- 
+			p_response = NULL;
+		} else if (receivedCmd[0] == MIFARE_ULEV1_CHECKTEAR && tagType == 7) {	// Received a CHECK_TEARING_EVENT --
 			// first 12 blocks of emu are [getversion answer - check tearing - pack - 0x00 - signature]
 			uint8_t emdata[3];
 			uint8_t index = receivedCmd[1];
@@ -1162,16 +1162,16 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t* data) {
 	   			// send NACK 0x0 == invalid argument
 				uint8_t nack[] = {0x00};
 				EmSendCmd(nack,sizeof(nack));
-			} else {			
+			} else {
 				emlGetMemBt( emdata, 10+index, 1);
 			AddCrc14A(emdata, sizeof(emdata)-2);
-			EmSendCmd(emdata, sizeof(emdata));	
+			EmSendCmd(emdata, sizeof(emdata));
 			}
-			p_response = NULL;		
+			p_response = NULL;
 		} else if (receivedCmd[0] == ISO14443A_CMD_HALT) {	// Received a HALT
 			LogTrace(receivedCmd, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
 			p_response = NULL;
-		} else if (receivedCmd[0] == MIFARE_AUTH_KEYA || receivedCmd[0] == MIFARE_AUTH_KEYB) {	// Received an authentication request				
+		} else if (receivedCmd[0] == MIFARE_AUTH_KEYA || receivedCmd[0] == MIFARE_AUTH_KEYB) {	// Received an authentication request
 			if ( tagType == 7 ) {   // IF NTAG /EV1  0x60 == GET_VERSION, not a authentication request.
 				uint8_t emdata[10];
 				emlGetMemBt( emdata, 0, 8 );
@@ -1179,20 +1179,20 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t* data) {
 				EmSendCmd(emdata, sizeof(emdata));
 				p_response = NULL;
 			} else {
-								
+
 				cardAUTHKEY = receivedCmd[0] - 0x60;
 				cardAUTHSC = receivedCmd[1] / 4; // received block num
-				
-				// incease nonce at AUTH requests. this is time consuming.				
+
+				// incease nonce at AUTH requests. this is time consuming.
 				nonce = prng_successor( GetTickCount(), 32 );
 				//num_to_bytes(nonce, 4, response5);
-				num_to_bytes(nonce, 4, dynamic_response_info.response);				
+				num_to_bytes(nonce, 4, dynamic_response_info.response);
 				dynamic_response_info.response_n = 4;
 
 				//prepare_tag_modulation(&responses[5], DYNAMIC_MODULATION_BUFFER_SIZE);
 				prepare_tag_modulation(&dynamic_response_info, DYNAMIC_MODULATION_BUFFER_SIZE);
 				p_response = &dynamic_response_info;
-				//p_response = &responses[5]; 
+				//p_response = &responses[5];
 				order = 7;
 			}
 		} else if (receivedCmd[0] == ISO14443A_CMD_RATS) {	// Received a RATS request
@@ -1206,15 +1206,15 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t* data) {
 			LogTrace(receivedCmd, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
 			uint32_t nr = bytes_to_num(receivedCmd,4);
 			uint32_t ar = bytes_to_num(receivedCmd+4,4);
-		 
+
 			// Collect AR/NR per keytype & sector
 			if ( (flags & FLAG_NR_AR_ATTACK) == FLAG_NR_AR_ATTACK ) {
-				
+
 				int8_t index = -1;
 				int8_t empty = -1;
 				for (uint8_t i = 0; i < ATTACK_KEY_COUNT; i++) {
 					// find which index to use
-					if ( (cardAUTHSC == ar_nr_nonces[i].sector) &&  (cardAUTHKEY == ar_nr_nonces[i].keytype)) 
+					if ( (cardAUTHSC == ar_nr_nonces[i].sector) &&  (cardAUTHKEY == ar_nr_nonces[i].keytype))
 						index = i;
 
 					// keep track of empty slots.
@@ -1242,8 +1242,8 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t* data) {
 						ar_nr_nonces[index].ar = ar;
 						ar_nr_nonces[index].state = FIRST;
 						break;
-					} 
-					case FIRST : { 
+					}
+					case FIRST : {
 						// second nonce collect
 						ar_nr_nonces[index].nonce2 = nonce;
 						ar_nr_nonces[index].nr2 = nr;
@@ -1252,11 +1252,11 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t* data) {
 
 						// send to client
 						cmd_send(CMD_ACK, CMD_SIMULATE_MIFARE_CARD, 0, 0, &ar_nr_nonces[index], sizeof(nonces_t));
-						
+
 						ar_nr_nonces[index].state = EMPTY;
 						ar_nr_nonces[index].sector = 0;
 						ar_nr_nonces[index].keytype = 0;
-						
+
 						moebius_count++;
 						break;
 					}
@@ -1264,7 +1264,7 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t* data) {
 				}
 			}
 			p_response = NULL;
-			
+
 		} else if (receivedCmd[0] == MIFARE_ULC_AUTH_1 ) { // ULC authentication, or Desfire Authentication
 		} else if (receivedCmd[0] == MIFARE_ULEV1_AUTH) { // NTAG / EV-1 authentication
 			if ( tagType == 7 ) {
@@ -1275,8 +1275,8 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t* data) {
 				EmSendCmd(emdata, sizeof(emdata));
 				p_response = NULL;
 				uint32_t pwd = bytes_to_num(receivedCmd+1,4);
-				
-				if ( MF_DBGLEVEL >= 3) Dbprintf("Auth attempt: %08x", pwd);	
+
+				if ( MF_DBGLEVEL >= 3) Dbprintf("Auth attempt: %08x", pwd);
 			}
 		} else {
 			// Check for ISO 14443A-4 compliant commands, look at left nibble
@@ -1308,7 +1308,7 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t* data) {
 				  dynamic_response_info.response[0] = receivedCmd[0] ^ 0x11;
 				  dynamic_response_info.response_n = 2;
 				} break;
-				  
+
 				case 0xBA: { // ping / pong
 					dynamic_response_info.response[0] = 0xAB;
 					dynamic_response_info.response[1] = 0x00;
@@ -1331,7 +1331,7 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t* data) {
 					dynamic_response_info.response_n = 0;
 				} break;
 			}
-      
+
 			if (dynamic_response_info.response_n > 0) {
 				// Copy the CID from the reader query
 				dynamic_response_info.response[1] = receivedCmd[1];
@@ -1339,7 +1339,7 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t* data) {
 				// Add CRC bytes, always used in ISO 14443A-4 compliant cards
 				AddCrc14A(dynamic_response_info.response, dynamic_response_info.response_n);
 				dynamic_response_info.response_n += 2;
-        
+
 				if (prepare_tag_modulation(&dynamic_response_info,DYNAMIC_MODULATION_BUFFER_SIZE) == false) {
 					DbpString("Error preparing tag response");
 					LogTrace(receivedCmd, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
@@ -1362,25 +1362,25 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t* data) {
 			// do the tracing for the previous reader request and this tag answer:
 			uint8_t par[MAX_PARITY_SIZE] = {0x00};
 			GetParity(p_response->response, p_response->response_n, par);
-	
-			EmLogTrace(Uart.output, 
-						Uart.len, 
-						Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, 
-						Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, 
+
+			EmLogTrace(Uart.output,
+						Uart.len,
+						Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG,
+						Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG,
 						Uart.parity,
-						p_response->response, 
+						p_response->response,
 						p_response->response_n,
 						LastTimeProxToAirStart*16 + DELAY_ARM2AIR_AS_TAG,
-						(LastTimeProxToAirStart + p_response->ProxToAirDuration)*16 + DELAY_ARM2AIR_AS_TAG, 
+						(LastTimeProxToAirStart + p_response->ProxToAirDuration)*16 + DELAY_ARM2AIR_AS_TAG,
 						par);
 		}
 	}
 
 	cmd_send(CMD_ACK,1,0,0,0,0);
-	switch_off(); 
-	
+	switch_off();
+
 	BigBuf_free_keep_EM();
-	
+
 	if (MF_DBGLEVEL >= 4){
 		Dbprintf("-[ Wake ups after halt  [%d]", happened);
 		Dbprintf("-[ Messages after halt  [%d]", happened2);
@@ -1431,13 +1431,13 @@ static void TransmitFor14443a(const uint8_t *cmd, uint16_t len, uint32_t *timing
 			*timing = (GetCountSspClk() + 8) & 0xfffffff8;
 		else
 			PrepareDelayedTransfer(*timing & 0x00000007);		// Delay transfer (fine tuning - up to 7 MF clock ticks)
-		
+
 		if(MF_DBGLEVEL >= 4 && GetCountSspClk() >= (*timing & 0xfffffff8))
 			Dbprintf("TransmitFor14443a: Missed timing");
 		while (GetCountSspClk() < (*timing & 0xfffffff8)) {};		// Delay transfer (multiple of 8 MF clock ticks)
 		LastTimeProxToAirStart = *timing;
 	} else {
-		
+
 		uint32_t ThisTransferTime = 0;
 		ThisTransferTime = ((MAX(NextTransferTime, GetCountSspClk()) & 0xfffffff8) + 8);
 
@@ -1445,12 +1445,12 @@ static void TransmitFor14443a(const uint8_t *cmd, uint16_t len, uint32_t *timing
 
 		LastTimeProxToAirStart = ThisTransferTime;
 	}
-	
+
 	// clear TXRDY
 	AT91C_BASE_SSC->SSC_THR = SEC_Y;
 
 	volatile uint8_t b;
-	uint16_t c = 0; 
+	uint16_t c = 0;
 	while (c < len) {
 		if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
 			AT91C_BASE_SSC->SSC_THR = cmd[c++];
@@ -1458,9 +1458,9 @@ static void TransmitFor14443a(const uint8_t *cmd, uint16_t len, uint32_t *timing
 		//iceman test
 		if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
 			b = (uint16_t)(AT91C_BASE_SSC->SSC_RHR); (void)b;
-		}		
+		}
 	}
-	
+
 	NextTransferTime = MAX(NextTransferTime, LastTimeProxToAirStart + REQUEST_GUARD_TIME);
 }
 
@@ -1577,13 +1577,13 @@ int EmGetCmd(uint8_t *received, uint16_t *len, uint8_t *parity) {
 	AT91C_BASE_ADC->ADC_CHER = ADC_CHANNEL(ADC_CHAN_HF);
 	// start ADC
 	AT91C_BASE_ADC->ADC_CR = AT91C_ADC_START;
-	
+
 	// Now run a 'software UART' on the stream of incoming samples.
 	UartInit(received, parity);
 
 	// Clear RXRDY:
     uint8_t b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
-	
+
 	for(;;) {
 		WDT_HIT();
 
@@ -1623,7 +1623,7 @@ int EmSendCmd14443aRaw(uint8_t *resp, uint16_t respLen) {
 	uint16_t i = 0;
 	uint32_t ThisTransferTime;
 	bool correctionNeeded;
-	
+
 	// Modulate Manchester
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_TAGSIM_MOD);
 
@@ -1646,7 +1646,7 @@ int EmSendCmd14443aRaw(uint8_t *resp, uint16_t respLen) {
 	b = AT91C_BASE_SSC->SSC_RHR; (void) b;
 	while(!(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY));
 	b = AT91C_BASE_SSC->SSC_RHR; (void) b;
-	
+
 	// wait for the FPGA to signal fdt_indicator == 1 (the FPGA is ready to queue new data in its delay line)
 	for (uint8_t j = 0; j < 5; j++) {	// allow timeout - better late than never
 		while(!(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY));
@@ -1664,15 +1664,15 @@ int EmSendCmd14443aRaw(uint8_t *resp, uint16_t respLen) {
 			AT91C_BASE_SSC->SSC_THR = resp[i++];
 			FpgaSendQueueDelay = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
 		}
-		
+
 		if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
 			b = (uint16_t)(AT91C_BASE_SSC->SSC_RHR); (void)b;
-		}	
+		}
 		if(BUTTON_PRESS()) break;
 	}
 
 	// Ensure that the FPGA Delay Queue is empty before we switch to TAGSIM_LISTEN again:
-	uint8_t fpga_queued_bits = FpgaSendQueueDelay >> 3; 
+	uint8_t fpga_queued_bits = FpgaSendQueueDelay >> 3;
 	for (i = 0; i <= fpga_queued_bits/8 + 1; ) {
 		if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
 			AT91C_BASE_SSC->SSC_THR = SEC_F;
@@ -1690,15 +1690,15 @@ int EmSend4bit(uint8_t resp){
 	// do the tracing for the previous reader request and this tag answer:
 	uint8_t par[1] = {0x00};
 	GetParity(&resp, 1, par);
-	EmLogTrace(Uart.output, 
-				Uart.len, 
-				Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, 
-				Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, 
+	EmLogTrace(Uart.output,
+				Uart.len,
+				Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG,
+				Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG,
 				Uart.parity,
-				&resp, 
-				1, 
+				&resp,
+				1,
 				LastTimeProxToAirStart*16 + DELAY_ARM2AIR_AS_TAG,
-				(LastTimeProxToAirStart + LastProxToAirDuration)*16 + DELAY_ARM2AIR_AS_TAG, 
+				(LastTimeProxToAirStart + LastProxToAirDuration)*16 + DELAY_ARM2AIR_AS_TAG,
 				par);
 	return res;
 }
@@ -1709,15 +1709,15 @@ int EmSendCmdParEx(uint8_t *resp, uint16_t respLen, uint8_t *par, bool collision
 	CodeIso14443aAsTagPar(resp, respLen, par, collision);
 	int res = EmSendCmd14443aRaw(ToSend, ToSendMax);
 	// do the tracing for the previous reader request and this tag answer:
-	EmLogTrace(Uart.output, 
-				Uart.len, 
-				Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, 
-				Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, 
+	EmLogTrace(Uart.output,
+				Uart.len,
+				Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG,
+				Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG,
 				Uart.parity,
-				resp, 
-				respLen, 
+				resp,
+				respLen,
 				LastTimeProxToAirStart*16 + DELAY_ARM2AIR_AS_TAG,
-				(LastTimeProxToAirStart + LastProxToAirDuration)*16 + DELAY_ARM2AIR_AS_TAG, 
+				(LastTimeProxToAirStart + LastProxToAirDuration)*16 + DELAY_ARM2AIR_AS_TAG,
 				par);
 	return res;
 }
@@ -1741,10 +1741,10 @@ bool EmLogTrace(uint8_t *reader_data, uint16_t reader_len, uint32_t reader_Start
 	uint16_t exact_fdt = (approx_fdt - 20 + 32)/64 * 64 + 20;
 	reader_EndTime = tag_StartTime - exact_fdt;
 	reader_StartTime = reader_EndTime - reader_modlen;
-		
+
 	if (!LogTrace(reader_data, reader_len, reader_StartTime, reader_EndTime, reader_Parity, true))
 		return false;
-	else 
+	else
 		return(!LogTrace(tag_data, tag_len, tag_StartTime, tag_EndTime, tag_Parity, false));
 
 }
@@ -1756,13 +1756,13 @@ bool EmLogTrace(uint8_t *reader_data, uint16_t reader_len, uint32_t reader_Start
 //-----------------------------------------------------------------------------
 static int GetIso14443aAnswerFromTag(uint8_t *receivedResponse, uint8_t *receivedResponsePar, uint16_t offset) {
 	uint32_t c = 0;
-	
+
 	// Set FPGA mode to "reader listen mode", no modulation (listen
 	// only, since we are receiving, not transmitting).
 	// Signal field is on with the appropriate LED
 	LED_D_ON();
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_LISTEN);
-	
+
 	// Now get the answer from the card
 	DemodInit(receivedResponse, receivedResponsePar);
 
@@ -1779,7 +1779,7 @@ static int GetIso14443aAnswerFromTag(uint8_t *receivedResponse, uint8_t *receive
 				NextTransferTime = MAX(NextTransferTime, Demod.endTime - (DELAY_AIR2ARM_AS_READER + DELAY_ARM2AIR_AS_READER)/16 + FRAME_DELAY_TIME_PICC_TO_PCD);
 				return true;
 			} else if (c++ > timeout && Demod.state == DEMOD_UNSYNCD) {
-				return false; 
+				return false;
 			}
 		}
 	}
@@ -1791,7 +1791,7 @@ void ReaderTransmitBitsPar(uint8_t* frame, uint16_t bits, uint8_t *par, uint32_t
 	// Send command to tag
 	TransmitFor14443a(ToSend, ToSendMax, timing);
 	if(trigger) LED_A_ON();
-  
+
 	LogTrace(frame, nbytes(bits), (LastTimeProxToAirStart<<4) + DELAY_ARM2AIR_AS_READER, ((LastTimeProxToAirStart + LastProxToAirDuration)<<4) + DELAY_ARM2AIR_AS_READER, par, true);
 }
 
@@ -1802,7 +1802,7 @@ void ReaderTransmitPar(uint8_t* frame, uint16_t len, uint8_t *par, uint32_t *tim
 void ReaderTransmitBits(uint8_t* frame, uint16_t len, uint32_t *timing) {
 	// Generate parity and redirect
 	uint8_t par[MAX_PARITY_SIZE] = {0x00};
-	GetParity(frame, len/8, par);  
+	GetParity(frame, len/8, par);
 	ReaderTransmitBitsPar(frame, len, par, timing);
 }
 
@@ -1828,30 +1828,30 @@ int ReaderReceive(uint8_t *receivedAnswer, uint8_t *parity) {
 }
 
 // This function misstreats the ISO 14443a anticollision procedure.
-// by fooling the reader there is a collision and forceing the reader to 
+// by fooling the reader there is a collision and forceing the reader to
 // increase the uid bytes.   The might be an overflow, DoS will occure.
 void iso14443a_antifuzz(uint32_t flags){
-	
+
 	// We need to listen to the high-frequency, peak-detected path.
 	iso14443a_setup(FPGA_HF_ISO14443A_TAGSIM_LISTEN);
 
 	BigBuf_free_keep_EM();
 	clear_trace();
 	set_tracing(true);
-	
+
 	int len = 0;
-		
+
 	// allocate buffers:
 	uint8_t *received = BigBuf_malloc(MAX_FRAME_SIZE);
 	uint8_t *receivedPar = BigBuf_malloc(MAX_PARITY_SIZE);
 	uint8_t *resp = BigBuf_malloc(20);
 
 	memset(resp, 0xFF , 20);
-	
+
 	LED_A_ON();
-	for (;;) {	
+	for (;;) {
 		WDT_HIT();
-		
+
 		// Clean receive command buffer
 		if (!GetIso14443aCommandFromReader(received, receivedPar, &len)) {
 			Dbprintf("Anti-fuzz stopped. Trace length: %d ", BigBuf_get_traceLen());
@@ -1860,15 +1860,15 @@ void iso14443a_antifuzz(uint32_t flags){
 		if ( received[0] == ISO14443A_CMD_WUPA || received[0] == ISO14443A_CMD_REQA) {
 				resp[0] = 0x04;
 				resp[1] = 0x00;
-				
+
 				if ( (flags & FLAG_7B_UID_IN_DATA) == FLAG_7B_UID_IN_DATA ) {
 					resp[0] = 0x44;
 				}
-				
+
 				EmSendCmd(resp, 2);
 				continue;
 		}
-		
+
 		// Received request for UID (cascade 1)
 		//if (received[1] >= 0x20 && received[1] <= 0x57 && received[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT) {
 		if (received[1] >= 0x20 && received[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT) {
@@ -1878,23 +1878,23 @@ void iso14443a_antifuzz(uint32_t flags){
 			resp[3] = 0xFF;
 			resp[4] =  resp[0] ^ resp[1] ^ resp[2] ^ resp[3];
 			colpos = 0;
-			
+
 			if ( (flags & FLAG_7B_UID_IN_DATA) == FLAG_7B_UID_IN_DATA ) {
-				resp[0] = 0x88; 
+				resp[0] = 0x88;
 				colpos = 8;
 			}
-			
+
 			EmSendCmdEx(resp, 5, true);
 			if (MF_DBGLEVEL >= 4) Dbprintf("ANTICOLL or SELECT %x", received[1]);
 			LED_D_INV();
-	
+
 			continue;
 		} else if (received[1] == 0x20 && received[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2) { 	// Received request for UID (cascade 2)
 			if (MF_DBGLEVEL >= 4) Dbprintf("ANTICOLL or SELECT_2");
-		} else if (received[1] == 0x70 && received[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT) {	// Received a SELECT (cascade 1)			
-		} else if (received[1] == 0x70 && received[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2) {	// Received a SELECT (cascade 2)				
+		} else if (received[1] == 0x70 && received[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT) {	// Received a SELECT (cascade 1)
+		} else if (received[1] == 0x70 && received[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2) {	// Received a SELECT (cascade 2)
 		} else {
-			Dbprintf("unknown command %x", received[0]); 
+			Dbprintf("unknown command %x", received[0]);
 		}
 	}
 
@@ -1906,9 +1906,9 @@ void iso14443a_antifuzz(uint32_t flags){
 static void iso14a_set_ATS_times(uint8_t *ats) {
 
 	uint8_t tb1;
-	uint8_t fwi, sfgi; 
+	uint8_t fwi, sfgi;
 	uint32_t fwt, sfgt;
-	
+
 	if (ats[0] > 1) {							// there is a format byte T0
 		if ((ats[1] & 0x20) == 0x20) {			// there is an interface byte TB(1)
 			if ((ats[1] & 0x10) == 0x10) {		// there is an interface byte TA(1) preceding TB(1)
@@ -1937,10 +1937,10 @@ static int GetATQA(uint8_t *resp, uint8_t *resp_par) {
 
 	uint32_t save_iso14a_timeout = iso14a_get_timeout();
 	iso14a_set_timeout(1236/(16*8)+1);		// response to WUPA is expected at exactly 1236/fc. No need to wait longer.
-	
+
 	uint32_t start_time = GetTickCount();
 	int len;
-	
+
 	// we may need several tries if we did send an unknown command or a wrong authentication before...
 	do {
 		// Broadcast for a card, WUPA (0x52) will force response from all cards in the field
@@ -1948,7 +1948,7 @@ static int GetATQA(uint8_t *resp, uint8_t *resp_par) {
 		// Receive the ATQA
 		len = ReaderReceive(resp, resp_par);
 	} while (len == 0 && GetTickCount() <= start_time + WUPA_RETRY_TIMEOUT);
-			
+
 	iso14a_set_timeout(save_iso14a_timeout);
 	return len;
 }
@@ -1956,11 +1956,11 @@ static int GetATQA(uint8_t *resp, uint8_t *resp_par) {
 // performs iso14443a anticollision (optional) and card select procedure
 // fills the uid and cuid pointer unless NULL
 // fills the card info record unless NULL
-// if anticollision is false, then the UID must be provided in uid_ptr[] 
+// if anticollision is false, then the UID must be provided in uid_ptr[]
 // and num_cascades must be set (1: 4 Byte UID, 2: 7 Byte UID, 3: 10 Byte UID)
 // requests ATS unless no_rats is true
 int iso14443a_select_card(byte_t *uid_ptr, iso14a_card_select_t *p_card, uint32_t *cuid_ptr, bool anticollision, uint8_t num_cascades, bool no_rats) {
-	
+
 	uint8_t sel_all[]    = { ISO14443A_CMD_ANTICOLL_OR_SELECT,0x20 };
 	uint8_t sel_uid[]    = { ISO14443A_CMD_ANTICOLL_OR_SELECT,0x70,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
 	uint8_t rats[]       = { ISO14443A_CMD_RATS,0x80,0x00,0x00 }; // FSD=256, FSDI=8, CID=0
@@ -1978,14 +1978,14 @@ int iso14443a_select_card(byte_t *uid_ptr, iso14a_card_select_t *p_card, uint32_
 		memset(p_card->uid, 0, 10);
 		p_card->ats_len = 0;
 	}
-	
+
 	if (!GetATQA(resp, resp_par)) {
 		return 0;
 	}
 
 	if (p_card) {
 		p_card->atqa[0] = resp[0];
-		p_card->atqa[1] = resp[1];		
+		p_card->atqa[1] = resp[1];
 	}
 
 	if (anticollision) {
@@ -1993,10 +1993,10 @@ int iso14443a_select_card(byte_t *uid_ptr, iso14a_card_select_t *p_card, uint32_
 		if (uid_ptr)
 			memset(uid_ptr, 0, 10);
 	}
-	
+
 	// check for proprietary anticollision:
 	if ((resp[0] & 0x1F) == 0) return 3;
-	
+
 	// OK we will select at least at cascade 1, lets see if first byte of UID was 0x88 in
 	// which case we need to make a cascade 2 request and select - this is a long UID
 	// While the UID is not complete, the 3nd bit (from the right) is set in the SAK.
@@ -2040,7 +2040,7 @@ int iso14443a_select_card(byte_t *uid_ptr, iso14a_card_select_t *p_card, uint32_
 			} else {		// no collision, use the response to SELECT_ALL as current uid
 				memcpy(uid_resp, resp, 4);
 			}
-			
+
 		} else {
 			if (cascade_level < num_cascades - 1) {
 				uid_resp[0] = 0x88;
@@ -2064,7 +2064,7 @@ int iso14443a_select_card(byte_t *uid_ptr, iso14a_card_select_t *p_card, uint32_
 
 		// Receive the SAK
 		if (!ReaderReceive(resp, resp_par)) return 0;
-		
+
 		sak = resp[0];
 
 		// Test if more parts of the uid are coming
@@ -2073,7 +2073,7 @@ int iso14443a_select_card(byte_t *uid_ptr, iso14a_card_select_t *p_card, uint32_
 			// http://www.nxp.com/documents/application_note/AN10927.pdf
 			uid_resp[0] = uid_resp[1];
 			uid_resp[1] = uid_resp[2];
-			uid_resp[2] = uid_resp[3]; 
+			uid_resp[2] = uid_resp[3];
 			uid_resp_len = 3;
 		}
 
@@ -2091,7 +2091,7 @@ int iso14443a_select_card(byte_t *uid_ptr, iso14a_card_select_t *p_card, uint32_
 	}
 
 	// PICC compilant with iso14443a-4 ---> (SAK & 0x20 != 0)
-	if( (sak & 0x20) == 0) return 2; 
+	if( (sak & 0x20) == 0) return 2;
 
 	// RATS, Request for answer to select
 	if ( !no_rats ) {
@@ -2099,7 +2099,7 @@ int iso14443a_select_card(byte_t *uid_ptr, iso14a_card_select_t *p_card, uint32_
 		AddCrc14A(rats, 2);
 		ReaderTransmit(rats, sizeof(rats), NULL);
 		len = ReaderReceive(resp, resp_par);
-		
+
 		if (!len) return 0;
 
 		if (p_card) {
@@ -2113,7 +2113,7 @@ int iso14443a_select_card(byte_t *uid_ptr, iso14a_card_select_t *p_card, uint32_
 		// set default timeout and delay next transfer based on ATS
 		iso14a_set_ATS_times(resp);
 	}
-	return 1;	
+	return 1;
 }
 
 int iso14443a_fast_select_card(uint8_t *uid_ptr, uint8_t num_cascades) {
@@ -2129,14 +2129,14 @@ int iso14443a_fast_select_card(uint8_t *uid_ptr, uint8_t num_cascades) {
 	if (!GetATQA(resp, resp_par)) {
 		return 0;
 	}
-	
+
 	// OK we will select at least at cascade 1, lets see if first byte of UID was 0x88 in
 	// which case we need to make a cascade 2 request and select - this is a long UID
 	// While the UID is not complete, the 3nd bit (from the right) is set in the SAK.
 	for(; sak & 0x04; cascade_level++) {
 		// SELECT_* (L1: 0x93, L2: 0x95, L3: 0x97)
 		sel_uid[0] = sel_all[0] = 0x93 + cascade_level * 2;
-			
+
 		if (cascade_level < num_cascades - 1) {
 			uid_resp[0] = 0x88;
 			memcpy(uid_resp+1, uid_ptr+cascade_level*3, 3);
@@ -2153,7 +2153,7 @@ int iso14443a_fast_select_card(uint8_t *uid_ptr, uint8_t num_cascades) {
 
 		// Receive the SAK
 		if (!ReaderReceive(resp, resp_par)) return 0;
-		
+
 		sak = resp[0];
 
 		// Test if more parts of the uid are coming
@@ -2162,10 +2162,10 @@ int iso14443a_fast_select_card(uint8_t *uid_ptr, uint8_t num_cascades) {
 			// http://www.nxp.com/documents/application_note/AN10927.pdf
 			uid_resp[0] = uid_resp[1];
 			uid_resp[1] = uid_resp[2];
-			uid_resp[2] = uid_resp[3]; 
+			uid_resp[2] = uid_resp[3];
 		}
 	}
-	return 1;	
+	return 1;
 }
 
 void iso14443a_setup(uint8_t fpga_minor_mode) {
@@ -2184,15 +2184,15 @@ void iso14443a_setup(uint8_t fpga_minor_mode) {
 
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | fpga_minor_mode);
 	SpinDelay(100);
- 
+
 	// Start the timer
 	StartCountSspClk();
-	
+
 	// Prepare the demodulation functions
 	DemodReset();
 	UartReset();
 	NextTransferTime = 2 * DELAY_ARM2AIR_AS_READER;
-	iso14a_set_timeout(1060); // 106 * 10ms default	
+	iso14a_set_timeout(1060); // 106 * 10ms default
 }
 
 /* Peter Fillmore 2015
@@ -2215,17 +2215,17 @@ b8 b7 b6 b5 b4 b3 b2 b1
 b5 = ACK/NACK
 Coding of S-block:
 b8 b7 b6 b5 b4 b3 b2 b1
-1  1  x  x  x  0  1  0 
+1  1  x  x  x  0  1  0
 b5,b6 = 00 - DESELECT
-        11 - WTX 
-*/    
+        11 - WTX
+*/
 int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, bool send_chaining, void *data, uint8_t *res) {
 	uint8_t parity[MAX_PARITY_SIZE] = {0x00};
 	uint8_t real_cmd[cmd_len + 4];
-	
+
 	if (cmd_len) {
 		// ISO 14443 APDU frame: PCB [CID] [NAD] APDU CRC PCB=0x02
-		real_cmd[0] = 0x02; // bnr,nad,cid,chn=0; i-block(0x00)	
+		real_cmd[0] = 0x02; // bnr,nad,cid,chn=0; i-block(0x00)
 		if (send_chaining) {
 			real_cmd[0] |= 0x10;
 		}
@@ -2234,11 +2234,11 @@ int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, bool send_chaining, void *data, u
 		memcpy(real_cmd + 1, cmd, cmd_len);
 	} else {
 		// R-block. ACK
-		real_cmd[0] = 0xA2; // r-block + ACK	
+		real_cmd[0] = 0xA2; // r-block + ACK
 		real_cmd[0] |= iso14_pcb_blocknum;
 	}
 	AddCrc14A(real_cmd, cmd_len + 1);
- 
+
 	ReaderTransmit(real_cmd, cmd_len + 3, NULL);
 
 	size_t len = ReaderReceive(data, parity);
@@ -2247,19 +2247,19 @@ int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, bool send_chaining, void *data, u
 	if (!len) {
 		return 0; //DATA LINK ERROR
 	} else{
-		// S-Block WTX 
+		// S-Block WTX
 		while(len && ((data_bytes[0] & 0xF2) == 0xF2)) {
 			uint32_t save_iso14a_timeout = iso14a_get_timeout();
 			// temporarily increase timeout
 			iso14a_set_timeout( MAX((data_bytes[1] & 0x3f) * save_iso14a_timeout, MAX_ISO14A_TIMEOUT) );
-			// Transmit WTX back 
+			// Transmit WTX back
 			// byte1 - WTXM [1..59]. command FWT=FWT*WTXM
 			data_bytes[1] = data_bytes[1] & 0x3f; // 2 high bits mandatory set to 0b
 			// now need to fix CRC.
 			AddCrc14A(data_bytes, len - 2);
 			// transmit S-Block
 			ReaderTransmit(data_bytes, len, NULL);
-			// retrieve the result again (with increased timeout) 
+			// retrieve the result again (with increased timeout)
 			len = ReaderReceive(data, parity);
 			data_bytes = data;
 			// restore timeout
@@ -2275,7 +2275,7 @@ int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, bool send_chaining, void *data, u
 		{
 			iso14_pcb_blocknum ^= 1;
 		}
-		
+
 		// if we received I-block with chaining we need to send ACK and receive another block of data
 		if (res)
 			*res = data_bytes[0];
@@ -2284,9 +2284,9 @@ int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, bool send_chaining, void *data, u
 		if (len >= 3 && !check_crc(CRC_14443_A, data_bytes, len)) {
 			return -1;
 		}
-		
+
 	}
-	
+
 	if (len) {
 		// cut frame byte
 		len -= 1;
@@ -2294,7 +2294,7 @@ int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, bool send_chaining, void *data, u
 		for (int i = 0; i < len; i++)
 			data_bytes[i] = data_bytes[i + 1];
 	}
-	
+
 	return len;
 }
 
@@ -2304,8 +2304,8 @@ int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, bool send_chaining, void *data, u
 // arg0		 iso_14a flags
 // arg1		 high ::  number of bits, if you want to send 7bits etc
 //			 low  ::  len of commandbytes
-// arg2		 timeout 
-// d.asBytes command bytes to send  
+// arg2		 timeout
+// d.asBytes command bytes to send
 void ReaderIso14443a(UsbCommand *c) {
 	iso14a_command_t param = c->arg[0];
 	size_t len = c->arg[1] & 0xffff;
@@ -2315,7 +2315,7 @@ void ReaderIso14443a(UsbCommand *c) {
 	uint32_t arg0 = 0;
 	uint8_t buf[USB_CMD_DATA_SIZE] = {0x00};
 	uint8_t par[MAX_PARITY_SIZE] = {0x00};
-  
+
 	if ((param & ISO14A_CONNECT))
 		clear_trace();
 
@@ -2348,7 +2348,7 @@ void ReaderIso14443a(UsbCommand *c) {
 	}
 
 	if ((param & ISO14A_RAW)) {
-	
+
 		if ((param & ISO14A_APPEND_CRC)) {
 			// Don't append crc on empty bytearray...
 			if ( len > 0 ) {
@@ -2361,7 +2361,7 @@ void ReaderIso14443a(UsbCommand *c) {
 				if (lenbits) lenbits += 16;
 			}
 		}
-		
+
 		if (lenbits > 0) {				// want to send a specific number of bits (e.g. short commands)
 			if ((param & ISO14A_TOPAZMODE)) {
 				int bits_to_send = lenbits;
@@ -2397,7 +2397,7 @@ void ReaderIso14443a(UsbCommand *c) {
 	if ((param & ISO14A_NO_DISCONNECT))
 		return;
 
-OUT:	
+OUT:
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 	set_tracing(false);
 	LEDsoff();
@@ -2409,22 +2409,22 @@ OUT:
 int32_t dist_nt(uint32_t nt1, uint32_t nt2) {
 
 	if (nt1 == nt2) return 0;
-	
+
 	uint32_t nttmp1 = nt1;
 	uint32_t nttmp2 = nt2;
 
 	for (uint16_t i = 1; i < 32768; i++) {
 		nttmp1 = prng_successor(nttmp1, 1);
 		if (nttmp1 == nt2) return i;
-		
+
 		nttmp2 = prng_successor(nttmp2, 1);
 		if (nttmp2 == nt1) return -i;
 	}
-	
+
 	return(-99999); // either nt1 or nt2 are invalid nonces
 }
 
-	
+
 #define PRNG_SEQUENCE_LENGTH	(1 << 16)
 #define MAX_UNEXPECTED_RANDOM	4		// maximum number of unexpected (i.e. real) random numbers when trying to sync. Then give up.
 #define MAX_SYNC_TRIES		32
@@ -2436,13 +2436,13 @@ int32_t dist_nt(uint32_t nt1, uint32_t nt2) {
 // (article by Nicolas T. Courtois, 2009)
 //-----------------------------------------------------------------------------
 void ReaderMifare(bool first_try, uint8_t block, uint8_t keytype ) {
-	
+
 	iso14443a_setup(FPGA_HF_ISO14443A_READER_MOD);
 
-	BigBuf_free(); BigBuf_Clear_ext(false);	
+	BigBuf_free(); BigBuf_Clear_ext(false);
 	clear_trace();
 	set_tracing(true);
-	
+
 	uint8_t mf_auth[] 	= { keytype, block, 0x00, 0x00 };
 	uint8_t mf_nr_ar[]	= {0,0,0,0,0,0,0,0};
 	uint8_t uid[10]		= {0,0,0,0,0,0,0,0,0,0};
@@ -2455,47 +2455,47 @@ void ReaderMifare(bool first_try, uint8_t block, uint8_t keytype ) {
 
 	uint32_t nt = 0, previous_nt = 0, cuid = 0;
 	uint32_t sync_time = GetCountSspClk() & 0xfffffff8;
-	
+
 	int32_t catch_up_cycles = 0;
 	int32_t last_catch_up = 0;
 	int32_t isOK = 0;
-	
+
 	uint16_t elapsed_prng_sequences = 1;
 	uint16_t consecutive_resyncs = 0;
 	uint16_t unexpected_random = 0;
 	uint16_t sync_tries = 0;
 
-	bool have_uid = false;	
+	bool have_uid = false;
 	bool received_nack;
 	uint8_t cascade_levels = 0;
-	
+
 	// static variables here, is re-used in the next call
-	static uint32_t nt_attacked = 0;	
+	static uint32_t nt_attacked = 0;
 	static int32_t sync_cycles = 0;
 	static uint8_t par_low = 0;
 	static uint8_t mf_nr_ar3 = 0;
-	
+
 	AddCrc14A(mf_auth, 2);
-	
+
 	if (first_try) {
 		sync_cycles = PRNG_SEQUENCE_LENGTH; // Mifare Classic's random generator repeats every 2^16 cycles (and so do the nonces).
 		nt_attacked = 0;
 		mf_nr_ar3 = 0;
 		par_low = 0;
 	} else {
-		// we were unsuccessful on a previous call. 
+		// we were unsuccessful on a previous call.
 		// Try another READER nonce (first 3 parity bits remain the same)
 		mf_nr_ar3++;
 		mf_nr_ar[3] = mf_nr_ar3;
 		par[0] = par_low;
 	}
 
-	LED_C_ON(); 
+	LED_C_ON();
 	uint16_t i;
 	for (i = 0; true; ++i) {
 
 		received_nack = false;
-		
+
 		WDT_HIT();
 
 		// Test if the action was cancelled
@@ -2503,10 +2503,10 @@ void ReaderMifare(bool first_try, uint8_t block, uint8_t keytype ) {
 			isOK = -1;
 			break;
 		}
-		
+
 		// this part is from Piwi's faster nonce collecting part in Hardnested.
 		if (!have_uid) { // need a full select cycle to get the uid first
-			iso14a_card_select_t card_info;		
+			iso14a_card_select_t card_info;
 			if (!iso14443a_select_card(uid, &card_info, &cuid, true, 0, true)) {
 				if (MF_DBGLEVEL >= 1)	Dbprintf("Mifare: Can't select card (ALL)");
 				continue;
@@ -2517,7 +2517,7 @@ void ReaderMifare(bool first_try, uint8_t block, uint8_t keytype ) {
 				case 10: cascade_levels = 3; break;
 				default: break;
 			}
-			have_uid = true;	
+			have_uid = true;
 		} else { // no need for anticollision. We can directly select the card
 			if (!iso14443a_fast_select_card(uid, cascade_levels)) {
 				if (MF_DBGLEVEL >= 1)	Dbprintf("Mifare: Can't select card (UID)");
@@ -2526,29 +2526,29 @@ void ReaderMifare(bool first_try, uint8_t block, uint8_t keytype ) {
 		}
 
 		elapsed_prng_sequences = 1;
-		
-		// Sending timeslot of ISO14443a frame		
+
+		// Sending timeslot of ISO14443a frame
 		sync_time = (sync_time & 0xfffffff8 ) + sync_cycles + catch_up_cycles;
 		catch_up_cycles = 0;
 
 		#define SYNC_TIME_BUFFER		16		// if there is only SYNC_TIME_BUFFER left before next planned sync, wait for next PRNG cycle
-		
+
 		// if we missed the sync time already or are about to miss it, advance to the next nonce repeat
 		while ( sync_time < GetCountSspClk() + SYNC_TIME_BUFFER) {
 			++elapsed_prng_sequences;
 			sync_time = (sync_time & 0xfffffff8 ) + sync_cycles;
-		}		
+		}
 
 		// Transmit MIFARE_CLASSIC_AUTH at synctime. Should result in returning the same tag nonce (== nt_attacked)
 		ReaderTransmit(mf_auth, sizeof(mf_auth), &sync_time);
 
-		// Receive the (4 Byte) "random" TAG nonce 
+		// Receive the (4 Byte) "random" TAG nonce
 		if (!ReaderReceive(receivedAnswer, receivedAnswerPar))
 			continue;
 
 		previous_nt = nt;
 		nt = bytes_to_num(receivedAnswer, 4);
-		
+
 		// Transmit reader nonce with fake par
 		ReaderTransmitPar(mf_nr_ar, sizeof(mf_nr_ar), par, NULL);
 
@@ -2558,10 +2558,10 @@ void ReaderMifare(bool first_try, uint8_t block, uint8_t keytype ) {
 
 		// we didn't calibrate our clock yet,
 		// iceman: has to be calibrated every time.
-		if (previous_nt && !nt_attacked) { 
+		if (previous_nt && !nt_attacked) {
 
 			int nt_distance = dist_nt(previous_nt, nt);
-			
+
 			// if no distance between,  then we are in sync.
 			if (nt_distance == 0) {
 				nt_attacked = nt;
@@ -2569,20 +2569,20 @@ void ReaderMifare(bool first_try, uint8_t block, uint8_t keytype ) {
 				if (nt_distance == -99999) { // invalid nonce received
 					unexpected_random++;
 					if (unexpected_random > MAX_UNEXPECTED_RANDOM) {
-						isOK = -3;		// Card has an unpredictable PRNG. Give up	
+						isOK = -3;		// Card has an unpredictable PRNG. Give up
 						break;
-					} else {						
+					} else {
 						continue;		// continue trying...
 					}
 				}
-				
+
 				if (++sync_tries > MAX_SYNC_TRIES) {
 					isOK = -4; 			// Card's PRNG runs at an unexpected frequency or resets unexpectedly
 					break;
 				}
-				
+
 				sync_cycles = (sync_cycles - nt_distance)/elapsed_prng_sequences;
-				
+
 				// no negative sync_cycles
 				if (sync_cycles <= 0) sync_cycles += PRNG_SEQUENCE_LENGTH;
 
@@ -2591,7 +2591,7 @@ void ReaderMifare(bool first_try, uint8_t block, uint8_t keytype ) {
 					sync_cycles = PRNG_SEQUENCE_LENGTH;
 					sync_time = GetCountSspClk() & 0xfffffff8;
 				}
-				
+
 				if (MF_DBGLEVEL >= 4)
 					Dbprintf("calibrating in cycle %d. nt_distance=%d, elapsed_prng_sequences=%d, new sync_cycles: %d\n", i, nt_distance, elapsed_prng_sequences, sync_cycles);
 
@@ -2602,30 +2602,30 @@ void ReaderMifare(bool first_try, uint8_t block, uint8_t keytype ) {
 		LED_B_OFF();
 
 		if ( (nt != nt_attacked) && nt_attacked) { 	// we somehow lost sync. Try to catch up again...
-			
+
 			catch_up_cycles = -dist_nt(nt_attacked, nt);
 			if (catch_up_cycles == 99999) {			// invalid nonce received. Don't resync on that one.
 				catch_up_cycles = 0;
 				continue;
-			}		
-			// average? 
+			}
+			// average?
 			catch_up_cycles /= elapsed_prng_sequences;
-		
+
 			if (catch_up_cycles == last_catch_up) {
 				consecutive_resyncs++;
 			} else {
 				last_catch_up = catch_up_cycles;
 			    consecutive_resyncs = 0;
-			}		
-			
+			}
+
 			if (consecutive_resyncs < 3) {
 				if (MF_DBGLEVEL >= 4) {
 					Dbprintf("Lost sync in cycle %d. nt_distance=%d. Consecutive Resyncs = %d. Trying one time catch up...\n", i, catch_up_cycles, consecutive_resyncs);
 				}
-			} else {	
+			} else {
 				sync_cycles += catch_up_cycles;
-				
-				if (MF_DBGLEVEL >= 4) 
+
+				if (MF_DBGLEVEL >= 4)
 					Dbprintf("Lost sync in cycle %d for the fourth time consecutively (nt_distance = %d). Adjusting sync_cycles to %d.\n", i, catch_up_cycles, sync_cycles);
 
 				last_catch_up = 0;
@@ -2634,11 +2634,11 @@ void ReaderMifare(bool first_try, uint8_t block, uint8_t keytype ) {
 			}
 			continue;
 		}
- 
+
 		// Receive answer. This will be a 4 Bit NACK when the 8 parity bits are OK after decoding
 		if (received_nack) {
 			catch_up_cycles = 8; 	// the PRNG is delayed by 8 cycles due to the NAC (4Bits = 0x05 encrypted) transfer
-	
+
 			if (nt_diff == 0)
 				par_low = par[0] & 0xE0; // there is no need to check all parities for other nt_diff. Parity Bits for mf_nr_ar[0..2] won't change
 
@@ -2654,9 +2654,9 @@ void ReaderMifare(bool first_try, uint8_t block, uint8_t keytype ) {
 			nt_diff = (nt_diff + 1) & 0x07;
 			mf_nr_ar[3] = (mf_nr_ar[3] & 0x1F) | (nt_diff << 5);
 			par[0] = par_low;
-			
+
 		} else {
-			// No NACK.	
+			// No NACK.
 			if (nt_diff == 0 && first_try) {
 				par[0]++;
 				if (par[0] == 0) {	// tried all 256 possible parities without success. Card doesn't send NACK.
@@ -2668,7 +2668,7 @@ void ReaderMifare(bool first_try, uint8_t block, uint8_t keytype ) {
 				par[0] = ((par[0] & 0x1F) + 1) | par_low;
 			}
 		}
-		
+
 		// reset the resyncs since we got a complete transaction on right time.
 		consecutive_resyncs = 0;
 	} // end for loop
@@ -2676,7 +2676,7 @@ void ReaderMifare(bool first_try, uint8_t block, uint8_t keytype ) {
 	mf_nr_ar[3] &= 0x1F;
 
 	if (MF_DBGLEVEL >= 4) Dbprintf("Number of sent auth requestes: %u", i);
-	
+
 	uint8_t buf[32] = {0x00};
 	memset(buf, 0x00, sizeof(buf));
 	num_to_bytes(cuid, 4, buf);
@@ -2684,7 +2684,7 @@ void ReaderMifare(bool first_try, uint8_t block, uint8_t keytype ) {
 	memcpy(buf + 8,  par_list, 8);
 	memcpy(buf + 16, ks_list, 8);
 	memcpy(buf + 24, mf_nr_ar, 8);
-		
+
 	cmd_send(CMD_ACK, isOK, 0, 0, buf, sizeof(buf) );
 
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
@@ -2714,29 +2714,29 @@ void DetectNACKbug() {
 	uint32_t sync_time = 0;
 	bool have_uid = false;
 	bool received_nack;
-	
-	// Mifare Classic's random generator repeats every 2^16 cycles (and so do the nonces).			
+
+	// Mifare Classic's random generator repeats every 2^16 cycles (and so do the nonces).
 	uint32_t sync_cycles = PRNG_SEQUENCE_LENGTH;
 
-	BigBuf_free(); BigBuf_Clear_ext(false);	
+	BigBuf_free(); BigBuf_Clear_ext(false);
 	clear_trace();
-	set_tracing(true);	
+	set_tracing(true);
 	iso14443a_setup(FPGA_HF_ISO14443A_READER_MOD);
 
-	sync_time = GetCountSspClk() & 0xfffffff8;	
-				
-	LED_C_ON(); 
+	sync_time = GetCountSspClk() & 0xfffffff8;
+
+	LED_C_ON();
 	uint16_t i;
 	for (i = 1; true; ++i) {
 
 		received_nack = false;
-		
+
 		// Cards always leaks a NACK, no matter the parity
 		if ((i==10) && (num_nacks == i-1)) {
 			isOK = 2;
 			break;
 		}
-	
+
 		WDT_HIT();
 
 		// Test if the action was cancelled
@@ -2744,10 +2744,10 @@ void DetectNACKbug() {
 			isOK = 99;
 			break;
 		}
-		
+
 		// this part is from Piwi's faster nonce collecting part in Hardnested.
 		if (!have_uid) { // need a full select cycle to get the uid first
-			iso14a_card_select_t card_info;		
+			iso14a_card_select_t card_info;
 			if (!iso14443a_select_card(uid, &card_info, &cuid, true, 0, true)) {
 				if (MF_DBGLEVEL >= 1)	Dbprintf("Mifare: Can't select card (ALL)");
 				continue;
@@ -2758,7 +2758,7 @@ void DetectNACKbug() {
 				case 10: cascade_levels = 3; break;
 				default: break;
 			}
-			have_uid = true;	
+			have_uid = true;
 		} else { // no need for anticollision. We can directly select the card
 			if (!iso14443a_fast_select_card(uid, cascade_levels)) {
 				if (MF_DBGLEVEL >= 1)	Dbprintf("Mifare: Can't select card (UID)");
@@ -2767,16 +2767,16 @@ void DetectNACKbug() {
 		}
 
 		elapsed_prng_sequences = 1;
-		
-		// Sending timeslot of ISO14443a frame		
+
+		// Sending timeslot of ISO14443a frame
 		sync_time = (sync_time & 0xfffffff8 ) + sync_cycles + catch_up_cycles;
 		catch_up_cycles = 0;
-								
+
 		// if we missed the sync time already, advance to the next nonce repeat
 		while ( GetCountSspClk() > sync_time) {
 			++elapsed_prng_sequences;
 			sync_time = (sync_time & 0xfffffff8 ) + sync_cycles;
-		}		
+		}
 
 		// Transmit MIFARE_CLASSIC_AUTH at synctime. Should result in returning the same tag nonce (== nt_attacked)
 		ReaderTransmit(mf_auth, sizeof(mf_auth), &sync_time);
@@ -2784,13 +2784,13 @@ void DetectNACKbug() {
 		// Receive the (4 Byte) "random" TAG nonce
 		if (!ReaderReceive(receivedAnswer, receivedAnswerPar))
 			continue;
-	
+
 		previous_nt = nt;
 		nt = bytes_to_num(receivedAnswer, 4);
-		
+
 		// Transmit reader nonce with fake par
 		ReaderTransmitPar(mf_nr_ar, sizeof(mf_nr_ar), par, NULL);
-	
+
 		if (ReaderReceive(receivedAnswer, receivedAnswerPar)) {
 			received_nack = true;
 			num_nacks++;
@@ -2798,14 +2798,14 @@ void DetectNACKbug() {
 			if ( i == num_nacks ) {
 				continue;
 			}
-		} 
+		}
 
 		// we didn't calibrate our clock yet,
 		// iceman: has to be calibrated every time.
-		if (previous_nt && !nt_attacked) { 
+		if (previous_nt && !nt_attacked) {
 
 			int nt_distance = dist_nt(previous_nt, nt);
-			
+
 			// if no distance between,  then we are in sync.
 			if (nt_distance == 0) {
 				nt_attacked = nt;
@@ -2813,32 +2813,32 @@ void DetectNACKbug() {
 				if (nt_distance == -99999) { // invalid nonce received
 					unexpected_random++;
 					if (unexpected_random > MAX_UNEXPECTED_RANDOM ) {
-						// Card has an unpredictable PRNG. Give up	
+						// Card has an unpredictable PRNG. Give up
 						isOK = 98;
 						break;
-					} else {						
+					} else {
 						if (sync_cycles <= 0) {
 							sync_cycles += PRNG_SEQUENCE_LENGTH;
 						}
 						continue;
 					}
 				}
-				
+
 				if (++sync_tries > MAX_SYNC_TRIES) {
 					isOK = 97; 			// Card's PRNG runs at an unexpected frequency or resets unexpectedly
 					break;
 				}
-				
+
 				sync_cycles = (sync_cycles - nt_distance)/elapsed_prng_sequences;
-				
+
 				if (sync_cycles <= 0)
 					sync_cycles += PRNG_SEQUENCE_LENGTH;
-				
+
 				if (sync_cycles > PRNG_SEQUENCE_LENGTH * 2 ) {
 					isOK = 96; 			// Card's PRNG runs at an unexpected frequency or resets unexpectedly
 					break;
 				}
-				
+
 				if (MF_DBGLEVEL >= 4)
 					Dbprintf("calibrating in cycle %d. nt_distance=%d, elapsed_prng_sequences=%d, new sync_cycles: %d\n", i, nt_distance, elapsed_prng_sequences, sync_cycles);
 
@@ -2846,32 +2846,32 @@ void DetectNACKbug() {
 			}
 		}
 
-		if ( (nt != nt_attacked) && nt_attacked) { 	
-			// we somehow lost sync. Try to catch up again...			
+		if ( (nt != nt_attacked) && nt_attacked) {
+			// we somehow lost sync. Try to catch up again...
 			catch_up_cycles = -dist_nt(nt_attacked, nt);
-			
+
 			if (catch_up_cycles == 99999) {
 				// invalid nonce received. Don't resync on that one.
 				catch_up_cycles = 0;
 				continue;
-			}		
-			// average? 
+			}
+			// average?
 			catch_up_cycles /= elapsed_prng_sequences;
-		
+
 			if (catch_up_cycles == last_catch_up) {
 				consecutive_resyncs++;
 			} else {
 				last_catch_up = catch_up_cycles;
 			    consecutive_resyncs = 0;
-			}		
-			
+			}
+
 			if (consecutive_resyncs < 3) {
 				if (MF_DBGLEVEL >= 4) {
 					Dbprintf("Lost sync in cycle %d. nt_distance=%d. Consecutive Resyncs = %d. Trying one time catch up...\n", i, catch_up_cycles, consecutive_resyncs);
 				}
-			} else {	
+			} else {
 				sync_cycles += catch_up_cycles;
-				
+
 				if (MF_DBGLEVEL >= 4) {
 					Dbprintf("Lost sync in cycle %d for the fourth time consecutively (nt_distance = %d). Adjusting sync_cycles to %d.\n", i, catch_up_cycles, sync_cycles);
 					Dbprintf("nt [%08x] attacted [%08x]", nt, nt_attacked );
@@ -2882,14 +2882,14 @@ void DetectNACKbug() {
 			}
 			continue;
 		}
- 
+
 		// Receive answer. This will be a 4 Bit NACK when the 8 parity bits are OK after decoding
 		if (received_nack)
-			catch_up_cycles = 8; 	// the PRNG is delayed by 8 cycles due to the NAC (4Bits = 0x05 encrypted) transfer	
+			catch_up_cycles = 8; 	// the PRNG is delayed by 8 cycles due to the NAC (4Bits = 0x05 encrypted) transfer
 
-		// we are testing all 256 possibilities. 
+		// we are testing all 256 possibilities.
 		par[0]++;
- 
+
 		// tried all 256 possible parities without success.
 		if (par[0] == 0) {
 			if ( num_nacks == 1 )
@@ -2924,7 +2924,7 @@ void DetectNACKbug() {
 * (unless reader attack mode enabled then it runs util it gets enough nonces to recover all keys attmpted)
   */
 void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *datain) {
-	
+
 	int cardSTATE = MFEMUL_NOFIELD;
 	int _UID_LEN = 0;  // 4, 7, 10
 	int vHf = 0;	// in mV
@@ -2947,25 +2947,25 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
 	uint8_t receivedCmd_par[MAX_MIFARE_PARITY_SIZE] = {0x00};
 	uint8_t response[MAX_MIFARE_FRAME_SIZE] = {0x00};
 	uint8_t response_par[MAX_MIFARE_PARITY_SIZE] = {0x00};
-	
+
 	uint8_t atqa[]   = {0x04, 0x00}; // Mifare classic 1k
 	uint8_t sak_4[]  = {0x0C, 0x00, 0x00}; // CL1 - 4b uid
 	uint8_t sak_7[]  = {0x0C, 0x00, 0x00}; // CL2 - 7b uid
 	uint8_t sak_10[] = {0x0C, 0x00, 0x00}; // CL3 - 10b uid
-	// uint8_t sak[] = {0x09, 0x3f, 0xcc };  // Mifare Mini 
-	
-	uint8_t rUIDBCC1[] = {0xde, 0xad, 0xbe, 0xaf, 0x62}; 
-	uint8_t rUIDBCC2[] = {0xde, 0xad, 0xbe, 0xaf, 0x62}; 
+	// uint8_t sak[] = {0x09, 0x3f, 0xcc };  // Mifare Mini
+
+	uint8_t rUIDBCC1[] = {0xde, 0xad, 0xbe, 0xaf, 0x62};
+	uint8_t rUIDBCC2[] = {0xde, 0xad, 0xbe, 0xaf, 0x62};
 	uint8_t rUIDBCC3[] = {0xde, 0xad, 0xbe, 0xaf, 0x62};
 
 	// TAG Nonce - Authenticate response
 	uint8_t rAUTH_NT[4];
 	uint32_t nonce = prng_successor( GetTickCount(), 32 );
 	num_to_bytes(nonce, 4, rAUTH_NT);
-	
+
 	// uint8_t rAUTH_NT[] = {0x55, 0x41, 0x49, 0x92};// nonce from nested? why this?
 	uint8_t rAUTH_AT[] = {0x00, 0x00, 0x00, 0x00};
-	
+
 	// Here, we collect CUID, NT, NR, AR, CUID2, NT2, NR2, AR2
 	// This can be used in a reader-only attack.
 	nonces_t ar_nr_nonces[ATTACK_KEY_COUNT];
@@ -2976,7 +2976,7 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
 	// Length: 4,7,or 10 bytes
 	if ( (flags & FLAG_UID_IN_EMUL) == FLAG_UID_IN_EMUL)
 		emlGetMemBt(datain, 0, 10);  // load 10bytes from EMUL to the datain pointer. to be used below.
-	
+
 	if ( (flags & FLAG_4B_UID_IN_DATA) == FLAG_4B_UID_IN_DATA) {
 		memcpy(rUIDBCC1, datain, 4);
 		_UID_LEN = 4;
@@ -2993,13 +2993,13 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
 
 	switch (_UID_LEN) {
 		case 4:
-			sak_4[0] &= 0xFB;		
+			sak_4[0] &= 0xFB;
 			// save CUID
 			cuid = bytes_to_num(rUIDBCC1, 4);
 			// BCC
 			rUIDBCC1[4] = rUIDBCC1[0] ^ rUIDBCC1[1] ^ rUIDBCC1[2] ^ rUIDBCC1[3];
 			if (MF_DBGLEVEL >= 2)	{
-				Dbprintf("4B UID: %02x%02x%02x%02x", 
+				Dbprintf("4B UID: %02x%02x%02x%02x",
 					rUIDBCC1[0],
 					rUIDBCC1[1],
 					rUIDBCC1[2],
@@ -3009,14 +3009,14 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
 			break;
 		case 7:
 			atqa[0] |= 0x40;
-			sak_7[0] &= 0xFB;						
+			sak_7[0] &= 0xFB;
 			// save CUID
-			cuid = bytes_to_num(rUIDBCC2, 4);			
+			cuid = bytes_to_num(rUIDBCC2, 4);
 			 // CascadeTag, CT
 			rUIDBCC1[0] = 0x88;
 			// BCC
-			rUIDBCC1[4] = rUIDBCC1[0] ^ rUIDBCC1[1] ^ rUIDBCC1[2] ^ rUIDBCC1[3]; 
-			rUIDBCC2[4] = rUIDBCC2[0] ^ rUIDBCC2[1] ^ rUIDBCC2[2] ^ rUIDBCC2[3]; 
+			rUIDBCC1[4] = rUIDBCC1[0] ^ rUIDBCC1[1] ^ rUIDBCC1[2] ^ rUIDBCC1[3];
+			rUIDBCC2[4] = rUIDBCC2[0] ^ rUIDBCC2[1] ^ rUIDBCC2[2] ^ rUIDBCC2[3];
 			if (MF_DBGLEVEL >= 2)	{
 				Dbprintf("7B UID: %02x %02x %02x %02x %02x %02x %02x",
 					rUIDBCC1[1],
@@ -3031,7 +3031,7 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
 			break;
 		case 10:
 			atqa[0] |= 0x80;
-			sak_10[0] &= 0xFB;					
+			sak_10[0] &= 0xFB;
 			// save CUID
 			cuid = bytes_to_num(rUIDBCC3, 4);
 			 // CascadeTag, CT
@@ -3057,14 +3057,14 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
 				);
 			}
 			break;
-		default: 
+		default:
 			break;
 	}
 	// calc some crcs
 	compute_crc(CRC_14443_A, sak_4, 1, &sak_4[1], &sak_4[2]);
 	compute_crc(CRC_14443_A, sak_7, 1, &sak_7[1], &sak_7[2]);
 	compute_crc(CRC_14443_A, sak_10, 1, &sak_10[1], &sak_10[2]);
-	
+
 	// We need to listen to the high-frequency, peak-detected path.
 	iso14443a_setup(FPGA_HF_ISO14443A_TAGSIM_LISTEN);
 
@@ -3080,13 +3080,13 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
 
 		// find reader field
 		if (cardSTATE == MFEMUL_NOFIELD) {
-			
+
 			vHf = (MAX_ADC_HF_VOLTAGE * AvgAdc(ADC_CHAN_HF)) >> 10;
 			if (vHf > MF_MINFIELDV) {
 				cardSTATE_TO_IDLE();
 				LED_A_ON();
 			}
-		} 
+		}
 		if (cardSTATE == MFEMUL_NOFIELD) continue;
 
 		// Now, get data
@@ -3098,7 +3098,7 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
 		} else if (res == 1) {
 			break; 	// return value 1 means button press
 		}
-			
+
 		// REQ or WUP request in ANY state and WUP in HALTED state
 		// this if-statement doesn't match the specification above. (iceman)
 		if (len == 1 && ((receivedCmd[0] == ISO14443A_CMD_REQA && cardSTATE != MFEMUL_HALTED) || receivedCmd[0] == ISO14443A_CMD_WUPA)) {
@@ -3107,10 +3107,10 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
 			cardSTATE = MFEMUL_SELECT1;
 			crypto1_destroy(pcs);
 			cardAUTHKEY = 0xff;
-			nonce = prng_successor(selTimer, 32); 
+			nonce = prng_successor(selTimer, 32);
 			continue;
 		}
-		
+
 		switch (cardSTATE) {
 			case MFEMUL_NOFIELD:
 			case MFEMUL_HALTED:
@@ -3125,12 +3125,12 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
 					break;
 				}
 				// select card
-				if (len == 9 && 
+				if (len == 9 &&
 						( receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT &&
-						  receivedCmd[1] == 0x70 && 
+						  receivedCmd[1] == 0x70 &&
 						  memcmp(&receivedCmd[2], rUIDBCC1, 4) == 0)) {
-					
-					// SAK 4b 
+
+					// SAK 4b
 					EmSendCmd(sak_4, sizeof(sak_4));
 					switch(_UID_LEN){
 						case 4:
@@ -3150,7 +3150,7 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
 				break;
 			}
 			case MFEMUL_SELECT2:{
-				if (!len) { 
+				if (!len) {
 					LogTrace(Uart.output, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
 					break;
 				}
@@ -3158,11 +3158,11 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
 					EmSendCmd(rUIDBCC2, sizeof(rUIDBCC2));
 					break;
 				}
-				if (len == 9 && 
+				if (len == 9 &&
 						(receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2 &&
-						 receivedCmd[1] == 0x70 && 
+						 receivedCmd[1] == 0x70 &&
 						 memcmp(&receivedCmd[2], rUIDBCC2, 4) == 0) ) {
-							 
+
 					EmSendCmd(sak_7, sizeof(sak_7));
 					switch(_UID_LEN){
 						case 7:
@@ -3175,12 +3175,12 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
 							continue;
 						default:break;
 					}
-				} 
+				}
 				cardSTATE_TO_IDLE();
 				break;
 			}
 			case MFEMUL_SELECT3:{
-				if (!len) { 
+				if (!len) {
 					LogTrace(Uart.output, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
 					break;
 				}
@@ -3188,9 +3188,9 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
 					EmSendCmd(rUIDBCC3, sizeof(rUIDBCC3));
 					break;
 				}
-				if (len == 9 && 
+				if (len == 9 &&
 						(receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_3 &&
-						 receivedCmd[1] == 0x70 && 
+						 receivedCmd[1] == 0x70 &&
 						 memcmp(&receivedCmd[2], rUIDBCC3, 4) == 0) ) {
 
 					EmSendCmd(sak_10, sizeof(sak_10));
@@ -3214,12 +3214,12 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
 
 				// Collect AR/NR per keytype & sector
 				if ( (flags & FLAG_NR_AR_ATTACK) == FLAG_NR_AR_ATTACK ) {
-					
+
 					int8_t index = -1;
 					int8_t empty = -1;
 					for (uint8_t i = 0; i < ATTACK_KEY_COUNT; i++) {
 						// find which index to use
-						if ( (cardAUTHSC == ar_nr_nonces[i].sector) &&  (cardAUTHKEY == ar_nr_nonces[i].keytype)) 
+						if ( (cardAUTHSC == ar_nr_nonces[i].sector) &&  (cardAUTHKEY == ar_nr_nonces[i].keytype))
 							index = i;
 
 						// keep track of empty slots.
@@ -3247,8 +3247,8 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
 							ar_nr_nonces[index].ar = ar;
 							ar_nr_nonces[index].state = FIRST;
 							break;
-						} 
-						case FIRST : { 
+						}
+						case FIRST : {
 							// second nonce collect
 							ar_nr_nonces[index].nonce2 = nonce;
 							ar_nr_nonces[index].nr2 = nr;
@@ -3257,7 +3257,7 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
 
 							// send to client
 							cmd_send(CMD_ACK, CMD_SIMULATE_MIFARE_CARD, 0, 0, &ar_nr_nonces[index], sizeof(nonces_t));
-							
+
 							ar_nr_nonces[index].state = EMPTY;
 							ar_nr_nonces[index].sector = 0;
 							ar_nr_nonces[index].keytype = 0;
@@ -3269,10 +3269,10 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
 
 				crypto1_word(pcs, nr , 1);
 				uint32_t cardRr = ar ^ crypto1_word(pcs, 0, 0);
-				
+
 				//test if auth OK
 				if (cardRr != prng_successor(nonce, 64)){
-					
+
 					if (MF_DBGLEVEL >= 3) {
 						Dbprintf("AUTH FAILED for sector %d with key %c. [nr=%08x  cardRr=%08x] [nt=%08x succ=%08x]"
 							, cardAUTHSC
@@ -3291,15 +3291,15 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
 					LogTrace(Uart.output, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
 					break;
 				}
-				
+
 				ans = prng_successor(nonce, 96) ^ crypto1_word(pcs, 0, 0);
 				num_to_bytes(ans, 4, rAUTH_AT);
 				EmSendCmd(rAUTH_AT, sizeof(rAUTH_AT));
 				LED_C_ON();
-				
+
 				if (MF_DBGLEVEL >= 3) {
-					Dbprintf("AUTH COMPLETED for sector %d with key %c. time=%d", 
-						cardAUTHSC, 
+					Dbprintf("AUTH COMPLETED for sector %d with key %c. time=%d",
+						cardAUTHSC,
 						cardAUTHKEY == 0 ? 'A' : 'B',
 						GetTickCount() - authTimer
 					);
@@ -3311,20 +3311,20 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
 				if (len == 0) {
 					LogTrace(Uart.output, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
 					break;
-				}		
+				}
 				bool encrypted_data = (cardAUTHKEY != 0xFF) ;
 
 				if(encrypted_data)
 					mf_crypto1_decrypt(pcs, receivedCmd, len);
-				
-				if (len == 4 && (receivedCmd[0] == MIFARE_AUTH_KEYA || 
+
+				if (len == 4 && (receivedCmd[0] == MIFARE_AUTH_KEYA ||
 				                 receivedCmd[0] == MIFARE_AUTH_KEYB)  ) {
 
 					authTimer = GetTickCount();
 					cardAUTHSC = receivedCmd[1] / 4;  // received block -> sector
 					cardAUTHKEY = receivedCmd[0] & 0x1;
 					crypto1_destroy(pcs);
-					
+
 					// load key into crypto
 					crypto1_create(pcs, emlGetKey(cardAUTHSC, cardAUTHKEY));
 
@@ -3335,7 +3335,7 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
 						num_to_bytes(nonce, 4, rAUTH_AT);
 					} else {
 						// nested authentication
-						ans = nonce ^ crypto1_word(pcs, cuid ^ nonce, 0); 
+						ans = nonce ^ crypto1_word(pcs, cuid ^ nonce, 0);
 						num_to_bytes(ans, 4, rAUTH_AT);
 
 						if (MF_DBGLEVEL >= 3) Dbprintf("Reader doing nested authentication for block %d (0x%02x) with key %c", receivedCmd[1], receivedCmd[1], 	cardAUTHKEY == 0 ? 'A' : 'B');
@@ -3345,20 +3345,20 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
 					cardSTATE = MFEMUL_AUTH1;
 					break;
 				}
-				
+
 				// rule 13 of 7.5.3. in ISO 14443-4. chaining shall be continued
 				// BUT... ACK --> NACK
 				if (len == 1 && receivedCmd[0] == CARD_ACK) {
 					EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
 					break;
 				}
-				
+
 				// rule 12 of 7.5.3. in ISO 14443-4. R(NAK) --> R(ACK)
 				if (len == 1 && receivedCmd[0] == CARD_NACK_NA) {
 					EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_ACK));
 					break;
 				}
-				
+
 				if(len != 4) {
 					LogTrace(Uart.output, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
 					break;
@@ -3370,7 +3370,7 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
 					 receivedCmd[0] == MIFARE_CMD_DEC ||
 					 receivedCmd[0] == MIFARE_CMD_RESTORE ||
 					 receivedCmd[0] == MIFARE_CMD_TRANSFER ) {
-						
+
 					if (receivedCmd[1] >= 16 * 4) {
 						EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
 						if (MF_DBGLEVEL >= 4) Dbprintf("Reader tried to operate (0x%02) on out of range block: %d (0x%02x), nacking",receivedCmd[0],receivedCmd[1],receivedCmd[1]);
@@ -3407,8 +3407,8 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
 					break;
 				}
 				// increment, decrement, restore
-				if ( receivedCmd[0] == MIFARE_CMD_INC || 
-				     receivedCmd[0] == MIFARE_CMD_DEC || 
+				if ( receivedCmd[0] == MIFARE_CMD_INC ||
+				     receivedCmd[0] == MIFARE_CMD_DEC ||
 					 receivedCmd[0] == MIFARE_CMD_RESTORE) {
 
 					 if (MF_DBGLEVEL >= 4) Dbprintf("RECV 0x%02x inc(0xC1)/dec(0xC0)/restore(0xC2) block %d (%02x)",receivedCmd[0], receivedCmd[1], receivedCmd[1]);
@@ -3472,7 +3472,7 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
 					EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
 					cardSTATE_TO_IDLE();
 					break;
-				} 
+				}
 				LogTrace(Uart.output, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
 				cardINTREG = cardINTREG + ans;
 				cardSTATE = MFEMUL_WORK;
@@ -3506,9 +3506,9 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
 		}
 	}
 
-	if (MF_DBGLEVEL >= 1) 
+	if (MF_DBGLEVEL >= 1)
 		Dbprintf("Emulator stopped. Trace length: %d ", BigBuf_get_traceLen());
-	
+
 	cmd_send(CMD_ACK,1,0,0,0,0);	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 	LEDsoff();
 	set_tracing(false);
diff --git a/armsrc/iso14443a.h b/armsrc/iso14443a.h
index a23b5d7c2..c5e1e62f1 100644
--- a/armsrc/iso14443a.h
+++ b/armsrc/iso14443a.h
@@ -16,7 +16,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-													   
+
 #include "usb_cmd.h"
 #include "cmd.h"
 #include "apps.h"
@@ -138,6 +138,6 @@ void DetectNACKbug();
 
 #ifdef __cplusplus
 }
-#endif				
+#endif
 
 #endif /* __ISO14443A_H */
diff --git a/armsrc/iso14443b.c b/armsrc/iso14443b.c
index 6167ca785..f093fb1a7 100644
--- a/armsrc/iso14443b.c
+++ b/armsrc/iso14443b.c
@@ -38,7 +38,7 @@
 // 4sample
 #define SEND4STUFFBIT(x) ToSendStuffBit(x);ToSendStuffBit(x);ToSendStuffBit(x);ToSendStuffBit(x);
 //#define SEND4STUFFBIT(x) ToSendStuffBit(x);
- // iceman, this threshold value,  what makes 8 a good amplitude for this IQ values? 
+ // iceman, this threshold value,  what makes 8 a good amplitude for this IQ values?
 #ifndef SUBCARRIER_DETECT_THRESHOLD
 # define SUBCARRIER_DETECT_THRESHOLD	8
 #endif
@@ -130,29 +130,29 @@ static void DemodReset() {
 	Demod.sumI = 0;
 	Demod.sumQ = 0;
 	Demod.startTime = 0;
-	Demod.endTime = 0;	
+	Demod.endTime = 0;
 }
 
 static void DemodInit(uint8_t *data) {
 	Demod.output = data;
 	DemodReset();
-	//	memset(Demod.output, 0x00, MAX_FRAME_SIZE); 
+	//	memset(Demod.output, 0x00, MAX_FRAME_SIZE);
 }
 
 
 /*
 * 9.4395 us = 1 ETU  and clock is about 1.5 us
-* 13560000Hz 
+* 13560000Hz
 * 1000ms/s
 * timeout in ETUs (time to transfer 1 bit, 9.4395 us)
 *
 * Formula to calculate FWT (in ETUs) by timeout (in ms):
-* fwt = 13560000 * 1000 / (8*16) * timeout; 
+* fwt = 13560000 * 1000 / (8*16) * timeout;
 * Sample:  3sec == 3000ms
-*  13560000 * 1000 / (8*16) * 3000  == 
+*  13560000 * 1000 / (8*16) * 3000  ==
 *    13560000000 / 384000 = 35312 FWT
 * @param timeout is in frame wait time, fwt, measured in ETUs
-*/ 
+*/
 static void iso14b_set_timeout(uint32_t timeout) {
 	#define MAX_TIMEOUT 40542464 	// 13560000Hz * 1000ms / (2^32-1) * (8*16)
 	if(timeout > MAX_TIMEOUT)
@@ -164,7 +164,7 @@ static void iso14b_set_timeout(uint32_t timeout) {
 static void iso14b_set_maxframesize(uint16_t size) {
 	if (size > 256)
 		size = MAX_FRAME_SIZE;
-	
+
 	Uart.byteCntMax = size;
 	if(MF_DBGLEVEL >= 3) Dbprintf("ISO14443B Max frame size set to %d bytes", Uart.byteCntMax);
 }
@@ -186,7 +186,7 @@ static void CodeIso14443bAsTag(const uint8_t *cmd, int len) {
 	* TR2 - PICC to PCD Frame Delay Time (per 14443-3 Amendment 1)
 	*
 	* Elementary Time Unit (ETU) is
-	* - 128 Carrier Cycles (9.4395 µS) = 8 Subcarrier Units 
+	* - 128 Carrier Cycles (9.4395 µS) = 8 Subcarrier Units
 	* - 1 ETU = 1 bit
 	* - 10 ETU = 1 startbit, 8 databits, 1 stopbit (10bits length)
 	* - startbit is a 0
@@ -194,19 +194,19 @@ static void CodeIso14443bAsTag(const uint8_t *cmd, int len) {
 	*
 	* Start of frame (SOF) is
 	* - [10-11] ETU of ZEROS, unmodulated time
-	* - [2-3] ETU of ONES,  
+	* - [2-3] ETU of ONES,
 	*
 	* End of frame (EOF) is
 	* - [10-11] ETU of ZEROS, unmodulated time
 	*
 	*  -TO VERIFY THIS BELOW-
 	* The mode FPGA_MAJOR_MODE_HF_SIMULATOR | FPGA_HF_SIMULATOR_MODULATE_BPSK which we use to simulate tag
-	* works like this:  
+	* works like this:
 	* - A 1-bit input to the FPGA becomes 8 pulses at 847.5kHz (1.18µS / pulse) == 9.44us
 	* - A 0-bit input to the FPGA becomes an unmodulated time of 1.18µS  or does it become 8 nonpulses for 9.44us
 	*
 	* FPGA doesn't seem to work with ETU.  It seems to work with pulse / duration instead.
-	* 
+	*
 	* Card sends data ub 847.e kHz subcarrier
 	* subcar |duration| FC division
 	* -------+--------+------------
@@ -236,17 +236,17 @@ static void CodeIso14443bAsTag(const uint8_t *cmd, int len) {
 	* things practical for the ARM (fc/32, 423.8 kbits/s, ~50 kbytes/s)
 	*
 	*/
-	
+
 	int i,j;
 	uint8_t b;
-	
+
 	ToSendReset();
 
 	// Transmit a burst of ones, as the initial thing that lets the
-	// reader get phase sync. 
+	// reader get phase sync.
 	// This loop is TR1, per specification
 	// TR1 minimum must be > 80/fs
-	// TR1 maximum 200/fs 
+	// TR1 maximum 200/fs
 	// 80/fs < TR1 < 200/fs
 	// 10 ETU < TR1 < 24 ETU
 
@@ -254,14 +254,14 @@ static void CodeIso14443bAsTag(const uint8_t *cmd, int len) {
 	// 10-11 ETU * 4times samples ZEROS
 	for(i = 0; i < 10; i++) { SEND4STUFFBIT(0); }
 	//for(i = 0; i < 10; i++) { ToSendStuffBit(0); }
-	
+
 	// 2-3 ETU * 4times samples ONES
 	for(i = 0; i < 3; i++)  { SEND4STUFFBIT(1); }
 	//for(i = 0; i < 3; i++)  { ToSendStuffBit(1); }
-	
+
 	// data
 	for(i = 0; i < len; ++i) {
-		
+
 		// Start bit
 		SEND4STUFFBIT(0);
 		//ToSendStuffBit(0);
@@ -269,8 +269,8 @@ static void CodeIso14443bAsTag(const uint8_t *cmd, int len) {
 		// Data bits
 		b = cmd[i];
 		for(j = 0; j < 8; ++j) {
-			// if(b & 1) { 
-				// SEND4STUFFBIT(1); 
+			// if(b & 1) {
+				// SEND4STUFFBIT(1);
 				// //ToSendStuffBit(1);
 			// } else {
 				// SEND4STUFFBIT(0);
@@ -283,7 +283,7 @@ static void CodeIso14443bAsTag(const uint8_t *cmd, int len) {
 		// Stop bit
 		SEND4STUFFBIT(1);
 		//ToSendStuffBit(1);
-		
+
 		// Extra Guard bit
 		// For PICC it ranges 0-18us (1etu = 9us)
 		SEND4STUFFBIT(1);
@@ -294,11 +294,11 @@ static void CodeIso14443bAsTag(const uint8_t *cmd, int len) {
 	// 10-11 ETU * 4 sample rate = ZEROS
 	for(i = 0; i < 10; i++) { SEND4STUFFBIT(0); }
 	//for(i = 0; i < 10; i++) { ToSendStuffBit(0); }
-	
+
 	// why this?
 	for(i = 0; i < 40; i++) { SEND4STUFFBIT(1); }
 	//for(i = 0; i < 40; i++) { ToSendStuffBit(1); }
-	
+
 	// Convert from last byte pos to length
 	++ToSendMax;
 }
@@ -407,7 +407,7 @@ static RAMFUNC int Handle14443bReaderUartBit(uint8_t bit) {
 					Uart.state = STATE_UNSYNCD;
 					if (Uart.byteCnt != 0)
 						return true;
-					
+
 				} else {
 					// this is an error
 					LED_A_OFF();
@@ -439,18 +439,18 @@ static int GetIso14443bCommandFromReader(uint8_t *received, uint16_t *len) {
 	// Signal field is off with the appropriate LED
 	LED_D_OFF();
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_SIMULATOR | FPGA_HF_SIMULATOR_NO_MODULATION);
-		
+
 	StartCountSspClk();
-	
+
 	volatile uint8_t b = 0;
 
 	// clear receiving shift register and holding register
 	// What does this loop do? Is it TR1?
-	// loop is a wait/delay  ? 
+	// loop is a wait/delay  ?
 /*
 	for(uint8_t c = 0; c < 10;) {
 
-		// keep tx buffer in a defined state anyway.	
+		// keep tx buffer in a defined state anyway.
 		if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
 			AT91C_BASE_SSC->SSC_THR = 0xFF;
 			++c;
@@ -471,9 +471,9 @@ static int GetIso14443bCommandFromReader(uint8_t *received, uint16_t *len) {
 
 		// Wait for byte be become available in rx holding register
 		if ( AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY ) {
-			
+
 			b = (uint8_t) AT91C_BASE_SSC->SSC_RHR;
-			
+
 			for ( mask = 0x80; mask != 0; mask >>= 1) {
 				if ( Handle14443bReaderUartBit(b & mask)) {
 					*len = Uart.byteCnt;
@@ -481,7 +481,7 @@ static int GetIso14443bCommandFromReader(uint8_t *received, uint16_t *len) {
 				}
 			}
 		}
-	}	
+	}
 	return false;
 }
 
@@ -497,20 +497,20 @@ void ClearFpgaShiftingRegisters(void){
 	while(!(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY)) {};
 
 	b = AT91C_BASE_SSC->SSC_RHR; (void) b;
-			
+
 	// wait for the FPGA to signal fdt_indicator == 1 (the FPGA is ready to queue new data in its delay line)
 	for (uint8_t j = 0; j < 5; j++) {	// allow timeout - better late than never
 		while (!(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY)) {};
 		if (AT91C_BASE_SSC->SSC_RHR) break;
 	}
-	
+
 	// Clear TXRDY:
 	//AT91C_BASE_SSC->SSC_THR = 0xFF;
 }
 
 void WaitForFpgaDelayQueueIsEmpty( uint16_t delay ){
 	// Ensure that the FPGA Delay Queue is empty before we switch to TAGSIM_LISTEN again:
-	uint8_t fpga_queued_bits = delay >> 3;  // twich /8 ??   >>3, 
+	uint8_t fpga_queued_bits = delay >> 3;  // twich /8 ??   >>3,
 	for (uint8_t i = 0; i <= fpga_queued_bits/8 + 1; ) {
 		if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
 			AT91C_BASE_SSC->SSC_THR = 0xFF;
@@ -522,36 +522,36 @@ void WaitForFpgaDelayQueueIsEmpty( uint16_t delay ){
 static void TransmitFor14443b_AsTag( uint8_t *response, uint16_t len) {
 
 	volatile uint32_t b;
-	
+
 	// Signal field is off with the appropriate LED
 	LED_D_OFF();
 	//uint16_t fpgasendQueueDelay = 0;
-	
+
 	// Modulate BPSK
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_SIMULATOR | FPGA_HF_SIMULATOR_MODULATE_BPSK);
 	SpinDelay(40);
-	
+
 	ClearFpgaShiftingRegisters();
-	
+
 	FpgaSetupSsc();
 
 	// Transmit the response.
 	for(uint16_t i = 0; i < len;) {
-		
+
 		 // Put byte into tx holding register as soon as it is ready
 		if(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_TXRDY) {
 			AT91C_BASE_SSC->SSC_THR = response[++i];
 		}
-		
+
 		// Prevent rx holding register from overflowing
 		if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
 			b = AT91C_BASE_SSC->SSC_RHR;(void)b;
-		}			
+		}
 	}
-	
+
 	//WaitForFpgaDelayQueueIsEmpty(fpgasendQueueDelay);
-	AT91C_BASE_SSC->SSC_THR = 0xFF;		
-}	
+	AT91C_BASE_SSC->SSC_THR = 0xFF;
+}
 //-----------------------------------------------------------------------------
 // Main loop of simulated tag: receive commands from reader, decide what
 // response to send, and send it.
@@ -564,7 +564,7 @@ void SimulateIso14443bTag(uint32_t pupi) {
 	SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
 	// Set up the synchronous serial port
 	FpgaSetupSsc();
-	
+
 	// allocate command receive buffer
 	BigBuf_free(); BigBuf_Clear_ext(false);
 
@@ -577,8 +577,8 @@ void SimulateIso14443bTag(uint32_t pupi) {
 	// uint32_t time_0 = 0;
 	// uint32_t t2r_time = 0;
 	// uint32_t r2t_time = 0;
-	uint8_t *receivedCmd = BigBuf_malloc(MAX_FRAME_SIZE);	
-	
+	uint8_t *receivedCmd = BigBuf_malloc(MAX_FRAME_SIZE);
+
 	// the only commands we understand is WUPB, AFI=0, Select All, N=1:
 //	static const uint8_t cmdWUPB[] = { ISO14443B_REQB, 0x00, 0x08, 0x39, 0x73 }; // WUPB
 	// ... and REQB, AFI=0, Normal Request, N=1:
@@ -589,9 +589,9 @@ void SimulateIso14443bTag(uint32_t pupi) {
 	// ... if not PUPI/UID is supplied we always respond with ATQB, PUPI = 820de174, Application Data = 0x20381922,
 	// supports only 106kBit/s in both directions, max frame size = 32Bytes,
 	// supports ISO14443-4, FWI=8 (77ms), NAD supported, CID not supported:
-	uint8_t respATQB[] = { 	0x50, 0x82, 0x0d, 0xe1, 0x74, 0x20, 0x38, 0x19, 
+	uint8_t respATQB[] = { 	0x50, 0x82, 0x0d, 0xe1, 0x74, 0x20, 0x38, 0x19,
 							0x22, 0x00, 0x21, 0x85, 0x5e, 0xd7 };
-							
+
 	// response to HLTB and ATTRIB
 	static const uint8_t respOK[] = {0x00, 0x78, 0xF0};
 
@@ -605,15 +605,15 @@ void SimulateIso14443bTag(uint32_t pupi) {
 	CodeIso14443bAsTag(respATQB, sizeof(respATQB));
 	uint8_t *encodedATQB = BigBuf_malloc(ToSendMax);
 	uint16_t encodedATQBLen = ToSendMax;
-	memcpy(encodedATQB, ToSend, ToSendMax); 
+	memcpy(encodedATQB, ToSend, ToSendMax);
+
 
-	
 	// prepare "OK" tag answer (encoded):
 	CodeIso14443bAsTag(respOK, sizeof(respOK));
 	uint8_t *encodedOK = BigBuf_malloc(ToSendMax);
-	uint16_t encodedOKLen = ToSendMax;	
-	memcpy(encodedOK, ToSend, ToSendMax); 
-	
+	uint16_t encodedOKLen = ToSendMax;
+	memcpy(encodedOK, ToSend, ToSendMax);
+
 	// Simulation loop
 	while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
 		WDT_HIT();
@@ -622,10 +622,10 @@ void SimulateIso14443bTag(uint32_t pupi) {
 		if (cardSTATE == SIM_NOFIELD) {
 			vHf = (MAX_ADC_HF_VOLTAGE * AvgAdc(ADC_CHAN_HF)) >> 10;
 			if ( vHf > MF_MINFIELDV ) {
-				cardSTATE = SIM_IDLE; 
+				cardSTATE = SIM_IDLE;
 				LED_A_ON();
 			}
-		} 
+		}
 		if (cardSTATE == SIM_NOFIELD) continue;
 
 		// Get reader command
@@ -635,31 +635,31 @@ void SimulateIso14443bTag(uint32_t pupi) {
 		}
 
 		// ISO14443-B protocol states:
-		// REQ or WUP request in ANY state 
+		// REQ or WUP request in ANY state
 		// WUP in HALTED state
 		if (len == 5 ) {
 				if ( (receivedCmd[0] == ISO14443B_REQB && (receivedCmd[2] & 0x8)== 0x8 && cardSTATE == SIM_HALTED) ||
             	      receivedCmd[0] == ISO14443B_REQB ){
-				LogTrace(receivedCmd, len, 0, 0, NULL, true);						  
+				LogTrace(receivedCmd, len, 0, 0, NULL, true);
 				cardSTATE = SIM_SELECTING;
 			}
 		}
-		
+
 		/*
 		* How should this flow go?
 		*  REQB or WUPB
 		*   send response  ( waiting for Attrib)
 		*  ATTRIB
-		*   send response  ( waiting for commands 7816) 
+		*   send response  ( waiting for commands 7816)
 		*  HALT
 		    send halt response ( waiting for wupb )
 		*/
-		
+
 		switch (cardSTATE) {
 			//case SIM_NOFIELD:
 			case SIM_HALTED:
 			case SIM_IDLE: {
-				LogTrace(receivedCmd, len, 0, 0, NULL, true);	
+				LogTrace(receivedCmd, len, 0, 0, NULL, true);
 				break;
 			}
 			case SIM_SELECTING: {
@@ -677,7 +677,7 @@ void SimulateIso14443bTag(uint32_t pupi) {
 			case SIM_ACKNOWLEDGE: {
 				TransmitFor14443b_AsTag( encodedOK, encodedOKLen );
 				LogTrace(respOK, sizeof(respOK), 0, 0, NULL, false);
-				cardSTATE = SIM_IDLE;			
+				cardSTATE = SIM_IDLE;
 				break;
 			}
 			case SIM_WORK: {
@@ -694,22 +694,22 @@ void SimulateIso14443bTag(uint32_t pupi) {
 
 					// CRC Check
 					if (len >= 3){ // if crc exists
-						
+
 						if (!check_crc(CRC_14443_B, receivedCmd, len))
 							DbpString("+++CRC fail");
 						else
 							DbpString("CRC passes");
 					}
-					cardSTATE = SIM_IDLE; 
+					cardSTATE = SIM_IDLE;
 				}
 				break;
 			}
 			default: break;
 		}
-			
+
 		++cmdsReceived;
 	}
-	if (MF_DBGLEVEL >= 2) 
+	if (MF_DBGLEVEL >= 2)
 		Dbprintf("Emulator stopped. Trace length: %d ", BigBuf_get_traceLen());
 	switch_off(); //simulate
 }
@@ -794,9 +794,9 @@ static RAMFUNC int Handle14443bTagSamplesDemod(int ci, int cq) {
 		case DEMOD_UNSYNCD:
 
 			CHECK_FOR_SUBCARRIER();
-		
+
 			// subcarrier detected
-			
+
 			if (v > SUBCARRIER_DETECT_THRESHOLD) {
 				Demod.state = DEMOD_PHASE_REF_TRAINING;
 				Demod.sumI = ci;
@@ -809,14 +809,14 @@ static RAMFUNC int Handle14443bTagSamplesDemod(int ci, int cq) {
 			if (Demod.posCount < 8) {
 
 				CHECK_FOR_SUBCARRIER();
-				
+
 				if (v > SUBCARRIER_DETECT_THRESHOLD) {
 					// set the reference phase (will code a logic '1') by averaging over 32 1/fs.
 					// note: synchronization time > 80 1/fs
 					Demod.sumI += ci;
 					Demod.sumQ += cq;
 					Demod.posCount++;
-				} else {	
+				} else {
 					// subcarrier lost
 					Demod.state = DEMOD_UNSYNCD;
 				}
@@ -826,9 +826,9 @@ static RAMFUNC int Handle14443bTagSamplesDemod(int ci, int cq) {
 			break;
 
 		case DEMOD_AWAITING_FALLING_EDGE_OF_SOF:
-			
+
 			MAKE_SOFT_DECISION();
-			
+
 			if (v < 0) {	// logic '0' detected
 				Demod.state = DEMOD_GOT_FALLING_EDGE_OF_SOF;
 				Demod.posCount = 0;	// start of SOF sequence
@@ -841,12 +841,12 @@ static RAMFUNC int Handle14443bTagSamplesDemod(int ci, int cq) {
 
 		case DEMOD_GOT_FALLING_EDGE_OF_SOF:
 			Demod.posCount++;
-			
+
 			MAKE_SOFT_DECISION();
-			
+
 			if (v > 0) {
 				// low phase of SOF too short (< 9 etu). Note: spec is >= 10, but FPGA tends to "smear" edges
-				if (Demod.posCount < 9*2) { 
+				if (Demod.posCount < 9*2) {
 					Demod.state = DEMOD_UNSYNCD;
 				} else {
 					LED_C_ON(); // Got SOF
@@ -856,7 +856,7 @@ static RAMFUNC int Handle14443bTagSamplesDemod(int ci, int cq) {
 				}
 			} else {
 				// low phase of SOF too long (> 12 etu)
-				if (Demod.posCount > 14*2) { 
+				if (Demod.posCount > 14*2) {
 					Demod.state = DEMOD_UNSYNCD;
 					LED_C_OFF();
 				}
@@ -865,9 +865,9 @@ static RAMFUNC int Handle14443bTagSamplesDemod(int ci, int cq) {
 
 		case DEMOD_AWAITING_START_BIT:
 			Demod.posCount++;
-			
+
 			MAKE_SOFT_DECISION();
-			
+
 			if (v > 0) {
 				if (Demod.posCount > 6*2) { 		// max 19us between characters = 16 1/fs, max 3 etu after low phase of SOF = 24 1/fs
 					Demod.state = DEMOD_UNSYNCD;
@@ -883,10 +883,10 @@ static RAMFUNC int Handle14443bTagSamplesDemod(int ci, int cq) {
 			break;
 
 		case DEMOD_RECEIVING_DATA:
-			
+
 			MAKE_SOFT_DECISION();
 
-			if (Demod.posCount == 0) { 
+			if (Demod.posCount == 0) {
 				// first half of bit
 				Demod.thisBit = v;
 				Demod.posCount = 1;
@@ -896,18 +896,18 @@ static RAMFUNC int Handle14443bTagSamplesDemod(int ci, int cq) {
 				Demod.shiftReg >>= 1;
 
 				// OR in a logic '1'
-				if (Demod.thisBit > 0)  
+				if (Demod.thisBit > 0)
 					Demod.shiftReg |= 0x200;
 
 				Demod.bitCount++;
-				
+
 				// 1 start 8 data 1 stop = 10
 				if (Demod.bitCount == 10) {
-					
+
 					uint16_t s = Demod.shiftReg;
-					
+
 					// stop bit == '1', start bit == '0'
-					if ((s & 0x200) && (s & 0x001) == 0 ) { 
+					if ((s & 0x200) && (s & 0x001) == 0 ) {
 						// left shift to drop the startbit
 						uint8_t b = (s >> 1);
 						Demod.output[Demod.len] = b;
@@ -917,7 +917,7 @@ static RAMFUNC int Handle14443bTagSamplesDemod(int ci, int cq) {
 						// this one is a bit hard,  either its a correc byte or its unsynced.
 						Demod.state = DEMOD_UNSYNCD;
 						LED_C_OFF();
-						
+
 						// This is EOF (start, stop and all data bits == '0'
 						if (s == 0) return true;
 					}
@@ -946,17 +946,17 @@ static void GetTagSamplesFor14443bDemod() {
 	uint32_t time_0 = 0, time_stop = 0;
 
 	BigBuf_free();
-	
+
 	// Set up the demodulator for tag -> reader responses.
 	DemodInit(BigBuf_malloc(MAX_FRAME_SIZE));
-	
+
 	// The DMA buffer, used to stream samples from the FPGA
 	int8_t *dmaBuf = (int8_t*) BigBuf_malloc(ISO14443B_DMA_BUFFER_SIZE);
 	int8_t *upTo = dmaBuf;
-	
+
 	// Setup and start DMA.
 	if ( !FpgaSetupSscDma((uint8_t*) dmaBuf, ISO14443B_DMA_BUFFER_SIZE) ){
-		if (MF_DBGLEVEL > 1) Dbprintf("FpgaSetupSscDma failed. Exiting"); 
+		if (MF_DBGLEVEL > 1) Dbprintf("FpgaSetupSscDma failed. Exiting");
 		return;
 	}
 
@@ -965,7 +965,7 @@ static void GetTagSamplesFor14443bDemod() {
 
 	// get current clock
 	time_0 = GetCountSspClk();
-	
+
 	// rx counter - dma counter? (how much?) & (mod) mask > 2. (since 2bytes at the time is read)
 	while ( !finished ) {
 
@@ -992,12 +992,12 @@ static void GetTagSamplesFor14443bDemod() {
 
 		finished = (time_stop > iso14b_timeout || gotFrame);
 	}
-	
+
 	FpgaDisableSscDma();
-	
-	if ( upTo ) 
+
+	if ( upTo )
 		upTo = NULL;
-	
+
 	if ( Demod.len > 0 )
 		LogTrace(Demod.output, Demod.len, time_0, time_stop, NULL, false);
 }
@@ -1006,28 +1006,28 @@ static void GetTagSamplesFor14443bDemod() {
 // Transmit the command (to the tag) that was placed in ToSend[].
 //-----------------------------------------------------------------------------
 static void TransmitFor14443b_AsReader(void) {
-	int c;	
-	
+	int c;
+
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_TX | FPGA_HF_READER_TX_SHALLOW_MOD);
 	SpinDelay(60);
-									 
+
 	// What does this loop do? Is it TR1?
-	// 0xFF = 8 bits of 1.    1 bit == 1Etu,..  
+	// 0xFF = 8 bits of 1.    1 bit == 1Etu,..
 	// loop 10 * 8 = 80 ETU of delay, with a non modulated signal.  why?
 	// 80*9 = 720us.
 
    	for(c = 0; c < 50;) {
-		
+
 		if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
 			AT91C_BASE_SSC->SSC_THR = 0xFF;
 			c++;
 		}
 	}
-	
+
 	// Send frame loop
 	for(c = 0; c < ToSendMax;) {
-		
-		// Put byte into tx holding register as soon as it is ready		
+
+		// Put byte into tx holding register as soon as it is ready
 		if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
 			AT91C_BASE_SSC->SSC_THR = ToSend[c++];
 		}
@@ -1056,25 +1056,25 @@ static void CodeIso14443bAsReader(const uint8_t *cmd, int len) {
 	*/
 	int i;
 	uint8_t b;
-	
+
 	ToSendReset();
 
 	// Send SOF
-	// 10-11 ETUs of ZERO 
+	// 10-11 ETUs of ZERO
 	for(i = 0; i < 10; ++i) ToSendStuffBit(0);
-	
+
 	// 2-3 ETUs of ONE
 	ToSendStuffBit(1);
 	ToSendStuffBit(1);
 //	ToSendStuffBit(1);
-	
+
 	// Sending cmd, LSB
 	// from here we add BITS
 	for(i = 0; i < len; ++i) {
 	    // Start bit
 		ToSendStuffBit(0);
 		// Data bits
-		b = cmd[i];		
+		b = cmd[i];
 		// if (  b & 1 )    ToSendStuffBit(1); else ToSendStuffBit(0);
 		// if ( (b>>1) & 1) ToSendStuffBit(1); else ToSendStuffBit(0);
 		// if ( (b>>2) & 1) ToSendStuffBit(1); else ToSendStuffBit(0);
@@ -1082,17 +1082,17 @@ static void CodeIso14443bAsReader(const uint8_t *cmd, int len) {
 		// if ( (b>>4) & 1) ToSendStuffBit(1); else ToSendStuffBit(0);
 		// if ( (b>>5) & 1) ToSendStuffBit(1); else ToSendStuffBit(0);
 		// if ( (b>>6) & 1) ToSendStuffBit(1); else ToSendStuffBit(0);
-		// if ( (b>>7) & 1) ToSendStuffBit(1); else ToSendStuffBit(0);	
+		// if ( (b>>7) & 1) ToSendStuffBit(1); else ToSendStuffBit(0);
+
+		ToSendStuffBit(  b & 1);
+		ToSendStuffBit( (b>>1) & 1);
+		ToSendStuffBit( (b>>2) & 1);
+		ToSendStuffBit( (b>>3) & 1);
+		ToSendStuffBit( (b>>4) & 1);
+		ToSendStuffBit( (b>>5) & 1);
+		ToSendStuffBit( (b>>6) & 1);
+		ToSendStuffBit( (b>>7) & 1);
 
-		ToSendStuffBit(  b & 1); 
-		ToSendStuffBit( (b>>1) & 1); 		
-		ToSendStuffBit( (b>>2) & 1); 
-		ToSendStuffBit( (b>>3) & 1); 
-		ToSendStuffBit( (b>>4) & 1); 
-		ToSendStuffBit( (b>>5) & 1); 
-		ToSendStuffBit( (b>>6) & 1); 		
-		ToSendStuffBit( (b>>7) & 1); 
-		
 		// Stop bit
 		ToSendStuffBit(1);
 		// EGT extra guard time
@@ -1101,17 +1101,17 @@ static void CodeIso14443bAsReader(const uint8_t *cmd, int len) {
 		ToSendStuffBit(1);
 		ToSendStuffBit(1);
 	}
-	
+
 	// Send EOF
 	// 10-11 ETUs of ZERO
 	for(i = 0; i < 10; ++i) ToSendStuffBit(0);
 
 	// Transition time. TR0 - guard time
 	// 8ETUS minum?
-	// Per specification, Subcarrier must be stopped no later than 2 ETUs after EOF.	
+	// Per specification, Subcarrier must be stopped no later than 2 ETUs after EOF.
 	// I'm guessing this is for the FPGA to be able to send all bits before we switch to listening mode
 	for(i = 0; i < 24 ; ++i) ToSendStuffBit(1);
-	
+
 	// TR1 - Synchronization time
 	// Convert from last character reference to length
 	ToSendMax++;
@@ -1123,7 +1123,7 @@ static void CodeIso14443bAsReader(const uint8_t *cmd, int len) {
 static void CodeAndTransmit14443bAsReader(const uint8_t *cmd, int len) {
 
 	uint32_t time_start = GetCountSspClk();
-	
+
 	CodeIso14443bAsReader(cmd, len);
 
 	TransmitFor14443b_AsReader();
@@ -1154,7 +1154,7 @@ uint8_t iso14443b_apdu(uint8_t const *message, size_t message_length, uint8_t *r
 	GetTagSamplesFor14443bDemod(); //no
 	if(Demod.len < 3)
 		return 0;
-	
+
 	// VALIDATE CRC
 	if (!check_crc(CRC_14443_B, Demod.output, Demod.len)){
 		if (MF_DBGLEVEL > 3) Dbprintf("crc fail ICE");
@@ -1175,32 +1175,32 @@ uint8_t iso14443b_select_srx_card(iso14b_card_select_t *card ) {
 	static const uint8_t init_srx[] = { ISO14443B_INITIATE, 0x00, 0x97, 0x5b };
 	// SELECT command (with space for CRC)
 	uint8_t select_srx[] = { ISO14443B_SELECT, 0x00, 0x00, 0x00};
-	
+
 	CodeAndTransmit14443bAsReader(init_srx, sizeof(init_srx));
 	GetTagSamplesFor14443bDemod(); //no
 
 	if (Demod.len == 0)
 		return 2;
 
-	// Randomly generated Chip ID	
+	// Randomly generated Chip ID
 	if (card) card->chipid = Demod.output[0];
-	
+
 	select_srx[1] = Demod.output[0];
-	
+
 	AddCrc14B(select_srx, 2);
-	
+
 	CodeAndTransmit14443bAsReader(select_srx, sizeof(select_srx));
 	GetTagSamplesFor14443bDemod(); //no
-	
+
 	if (Demod.len != 3)
 		return 2;
-	
+
 	// Check the CRC of the answer:
 	if (!check_crc(CRC_14443_B, Demod.output, Demod.len))
 		return 3;
-	
+
 	// Check response from the tag: should be the same UID as the command we just sent:
-	if (select_srx[1] != Demod.output[0]) 
+	if (select_srx[1] != Demod.output[0])
 		return 1;
 
 	// First get the tag's UID:
@@ -1212,8 +1212,8 @@ uint8_t iso14443b_select_srx_card(iso14b_card_select_t *card ) {
 
 	if (Demod.len != 10)
 		return 2;
-	
-	// The check the CRC of the answer	
+
+	// The check the CRC of the answer
 	if (!check_crc(CRC_14443_B, Demod.output, Demod.len))
 		return 3;
 
@@ -1236,19 +1236,19 @@ uint8_t iso14443b_select_card(iso14b_card_select_t *card ) {
 	static const uint8_t wupb[] = { ISO14443B_REQB, 0x00, 0x08, 0x39, 0x73 };
 	// ATTRIB command (with space for CRC)
 	uint8_t attrib[] = { ISO14443B_ATTRIB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00};
-	
+
 	// first, wake up the tag
 	CodeAndTransmit14443bAsReader(wupb, sizeof(wupb));
 	GetTagSamplesFor14443bDemod(); //select_card
-	
+
 	// ATQB too short?
 	if (Demod.len < 14)
 		return 2;
-	
+
 	// VALIDATE CRC
 	if (!check_crc(CRC_14443_B, Demod.output, Demod.len))
 		return 3;
-	
+
 	if (card) {
 		card->uidlen = 4;
 		memcpy(card->uid, Demod.output+1, 4);
@@ -1257,7 +1257,7 @@ uint8_t iso14443b_select_card(iso14b_card_select_t *card ) {
 
     // copy the PUPI to ATTRIB  ( PUPI == UID )
     memcpy(attrib + 1, Demod.output + 1, 4);
-	
+
     // copy the protocol info from ATQB (Protocol Info -> Protocol_Type) into ATTRIB (Param 3)
     attrib[7] = Demod.output[10] & 0x0F;
     AddCrc14B(attrib, 9);
@@ -1273,8 +1273,8 @@ uint8_t iso14443b_select_card(iso14b_card_select_t *card ) {
 	if (!check_crc(CRC_14443_B, Demod.output, Demod.len) )
 		return 3;
 
-	if (card) { 
-	
+	if (card) {
+
 		// CID
 		card->cid = Demod.output[0];
 
@@ -1287,8 +1287,8 @@ uint8_t iso14443b_select_card(iso14b_card_select_t *card ) {
 		else if (maxFrame == 8)	maxFrame = 256;
 		else maxFrame = 257;
 		iso14b_set_maxframesize(maxFrame);
-		
-		// FWT 
+
+		// FWT
 		uint8_t fwt = card->atqb[6] >> 4;
 		if ( fwt < 16 ){
 			uint32_t fwt_time = (302 << fwt);
@@ -1305,7 +1305,7 @@ uint8_t iso14443b_select_card(iso14b_card_select_t *card ) {
 void iso14443b_setup() {
 	LEDsoff();
 	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-	
+
 	// Initialize Demod and Uart structs
 	DemodInit(BigBuf_malloc(MAX_FRAME_SIZE));
 	UartInit(BigBuf_malloc(MAX_FRAME_SIZE));
@@ -1315,14 +1315,14 @@ void iso14443b_setup() {
 
 	// Set up the synchronous serial port
 	FpgaSetupSsc();
-	
+
 	// Signal field is on with the appropriate LED
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_TX | FPGA_HF_READER_TX_SHALLOW_MOD);
 	SpinDelay(100);
 
 	// Start the timer
 	StartCountSspClk();
-	
+
 	LED_D_ON();
 }
 
@@ -1342,7 +1342,7 @@ static bool ReadSTBlock(uint8_t block) {
 	GetTagSamplesFor14443bDemod();
 
 	// Check if we got an answer from the tag
-	if (Demod.len != 6) { 
+	if (Demod.len != 6) {
 		DbpString("[!] expected 6 bytes from tag, got less...");
 		return false;
 	}
@@ -1357,22 +1357,22 @@ void ReadSTMemoryIso14443b(uint8_t numofblocks) {
 	// Make sure that we start from off, since the tags are stateful;
 	// confusing things will happen if we don't reset them between reads.
 	//switch_off();
-	
+
 	uint8_t i = 0x00;
 	uint8_t *buf = BigBuf_malloc(sizeof(iso14b_card_select_t));
 
 	iso14443b_setup();
-	
+
 	iso14b_card_select_t *card = (iso14b_card_select_t*)buf;
 	uint8_t res = iso14443b_select_srx_card(card);
 
 	// 0: OK 2: attrib fail, 3:crc fail,
 	if ( res > 0 ) goto out;
-	
+
 	Dbprintf("[+] Tag memory dump, block 0 to %d", numofblocks);
 
 	++numofblocks;
-	
+
 	for (;;) {
 		if (i == numofblocks) {
 			DbpString("System area block (0xFF):");
@@ -1383,11 +1383,11 @@ void ReadSTMemoryIso14443b(uint8_t numofblocks) {
 		do {
 			res = ReadSTBlock(i);
 		} while (!res && --retries);
-		
+
 		if (!res && !retries) {
 			goto out;
 		}
-	
+
 		// Now print out the memory location:
 		Dbprintf("Address=%02x, Contents=%08x, CRC=%04x", i,
 				(Demod.output[3]<<24) + (Demod.output[2]<<16) + (Demod.output[1]<<8) + Demod.output[0],
@@ -1396,10 +1396,10 @@ void ReadSTMemoryIso14443b(uint8_t numofblocks) {
 		if (i == 0xff) break;
 		++i;
 	}
-	
-out:	
+
+out:
 	switch_off(); // disconnect raw
-	SpinDelay(20);		
+	SpinDelay(20);
 }
 
 static void iso1444b_setup_sniff(void){
@@ -1407,7 +1407,7 @@ static void iso1444b_setup_sniff(void){
 	LEDsoff();
 	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
 	BigBuf_free();
-	BigBuf_Clear_ext(false); 
+	BigBuf_Clear_ext(false);
 	clear_trace();//setup snoop
 	set_tracing(true);
 
@@ -1432,7 +1432,7 @@ static void iso1444b_setup_sniff(void){
 
 	// Set FPGA in the appropriate mode
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR | FPGA_HF_READER_RX_XCORR_848_KHZ | FPGA_HF_READER_RX_XCORR_SNOOP);
-	SpinDelay(20);	
+	SpinDelay(20);
 
 	// Start the SSP timer
 	StartCountSspClk();
@@ -1467,40 +1467,40 @@ void RAMFUNC SniffIso14443b(void) {
 	bool ReaderIsActive = false;
 
 	iso1444b_setup_sniff();
-	
+
 	// The DMA buffer, used to stream samples from the FPGA
 	int8_t *dmaBuf = (int8_t*) BigBuf_malloc(ISO14443B_DMA_BUFFER_SIZE);
 	int8_t *data = dmaBuf;
 
 	// Setup and start DMA.
 	if ( !FpgaSetupSscDma((uint8_t*) dmaBuf, ISO14443B_DMA_BUFFER_SIZE) ){
-		if (MF_DBGLEVEL > 1) Dbprintf("[!] FpgaSetupSscDma failed. Exiting"); 
+		if (MF_DBGLEVEL > 1) Dbprintf("[!] FpgaSetupSscDma failed. Exiting");
 		BigBuf_free();
 		return;
 	}
 
-	// time ZERO, the point from which it all is calculated.	
+	// time ZERO, the point from which it all is calculated.
 	time_0 = GetCountSspClk();
-		
+
     // loop and listen
 	while (!BUTTON_PRESS()) {
 		WDT_HIT();
 
 		ci = data[0];
 		cq = data[1];
-		data += 2;		
-		
+		data += 2;
+
 		if (data >= dmaBuf + ISO14443B_DMA_BUFFER_SIZE) {
 			data = dmaBuf;
 			AT91C_BASE_PDC_SSC->PDC_RNPR = (uint32_t) dmaBuf;
-			AT91C_BASE_PDC_SSC->PDC_RNCR = ISO14443B_DMA_BUFFER_SIZE;		
+			AT91C_BASE_PDC_SSC->PDC_RNCR = ISO14443B_DMA_BUFFER_SIZE;
 		}
 
 		// no need to try decoding reader data if the tag is sending
-		if (!TagIsActive) {		
-		
+		if (!TagIsActive) {
+
 			LED_A_INV();
-		
+
 			if (Handle14443bReaderUartBit(ci & 0x01)) {
 				time_stop = GetCountSspClk() - time_0;
 				LogTrace(Uart.output, Uart.byteCnt, time_start, time_stop, NULL, true);
@@ -1509,8 +1509,8 @@ void RAMFUNC SniffIso14443b(void) {
 			} else {
 				time_start = GetCountSspClk() - time_0;
 			}
-			
-			if (Handle14443bReaderUartBit(cq & 0x01)) {				
+
+			if (Handle14443bReaderUartBit(cq & 0x01)) {
 				time_stop = GetCountSspClk() - time_0;
 				LogTrace(Uart.output, Uart.byteCnt, time_start, time_stop, NULL, true);
 				UartReset();
@@ -1520,30 +1520,30 @@ void RAMFUNC SniffIso14443b(void) {
 			}
 			ReaderIsActive = (Uart.state > STATE_GOT_FALLING_EDGE_OF_SOF);
 		}
-		
+
 		// no need to try decoding tag data if the reader is sending - and we cannot afford the time
 		if (!ReaderIsActive) {
 
 			// is this | 0x01 the error?   & 0xfe  in https://github.com/Proxmark/proxmark3/issues/103
 			// LSB is a fpga signal bit.
-			if (Handle14443bTagSamplesDemod(ci, cq)) {				
-				time_stop = GetCountSspClk() - time_0;			
+			if (Handle14443bTagSamplesDemod(ci, cq)) {
+				time_stop = GetCountSspClk() - time_0;
 				LogTrace(Demod.output, Demod.len, time_start, time_stop, NULL, false);
-				UartReset();				
-				DemodReset();				
+				UartReset();
+				DemodReset();
 			} else {
 				time_start = GetCountSspClk() - time_0;
 			}
 			TagIsActive = (Demod.state > DEMOD_GOT_FALLING_EDGE_OF_SOF);
 		}
 	}
-	
+
 	if (MF_DBGLEVEL >= 2) {
 		DbpString("[+] Sniff statistics:");
 		Dbprintf("[+]  uart State: %x  ByteCount: %i  ByteCountMax: %i", Uart.state,  Uart.byteCnt,  Uart.byteCntMax);
 		Dbprintf("[+]  trace length: %i", BigBuf_get_traceLen());
 	}
-	
+
 	switch_off();
 }
 
@@ -1571,54 +1571,54 @@ void SendRawCommand14443B_Ex(UsbCommand *c) {
 	uint8_t buf[USB_CMD_DATA_SIZE] = {0x00};
 
 	if (MF_DBGLEVEL > 3) Dbprintf("14b raw: param, %04x", param );
-	
+
 	// turn on trigger (LED_A)
 	if ((param & ISO14B_REQUEST_TRIGGER) == ISO14B_REQUEST_TRIGGER)
 		iso14b_set_trigger(true);
-	
+
 	if ((param & ISO14B_CONNECT) == ISO14B_CONNECT) {
 		iso14443b_setup();
 		clear_trace();
 	}
-	
+
 	set_tracing(true);
 
 	if ((param & ISO14B_SELECT_STD) == ISO14B_SELECT_STD) {
 		iso14b_card_select_t *card = (iso14b_card_select_t*)buf;
-		status = iso14443b_select_card(card);	
+		status = iso14443b_select_card(card);
 		cmd_send(CMD_ACK, status, sendlen, 0, buf, sendlen);
 		// 0: OK 2: attrib fail, 3:crc fail,
 		if ( status > 0 ) goto out;
-	} 
-	
+	}
+
 	if ((param & ISO14B_SELECT_SR) == ISO14B_SELECT_SR) {
 		iso14b_card_select_t *card = (iso14b_card_select_t*)buf;
 		status = iso14443b_select_srx_card(card);
 		cmd_send(CMD_ACK, status, sendlen, 0, buf, sendlen);
 		// 0: OK 2: demod fail, 3:crc fail,
 		if ( status > 0 ) goto out;
-	} 
-	
+	}
+
 	if ((param & ISO14B_APDU) == ISO14B_APDU) {
 		status = iso14443b_apdu(cmd, len, buf);
 		cmd_send(CMD_ACK, status, status, 0, buf, status);
 	}
-	
+
 	if ((param & ISO14B_RAW) == ISO14B_RAW) {
 		if((param & ISO14B_APPEND_CRC) == ISO14B_APPEND_CRC) {
 			AddCrc14B(cmd, len);
 			len += 2;
 		}
-	
-		CodeAndTransmit14443bAsReader(cmd, len); // raw		
+
+		CodeAndTransmit14443bAsReader(cmd, len); // raw
 		GetTagSamplesFor14443bDemod(); // raw
-		
+
 		sendlen = MIN(Demod.len, USB_CMD_DATA_SIZE);
 		status =  (Demod.len > 0) ? 0 : 1;
 		cmd_send(CMD_ACK, status, sendlen, 0, Demod.output, sendlen);
 	}
-	
-out:	
+
+out:
 	// turn off trigger (LED_A)
 	if ((param & ISO14B_REQUEST_TRIGGER) == ISO14B_REQUEST_TRIGGER)
 		iso14b_set_trigger(false);
@@ -1627,6 +1627,6 @@ out:
 	// we don't send a HALT command.
 	if ((param & ISO14B_DISCONNECT) == ISO14B_DISCONNECT) {
 		switch_off(); // disconnect raw
-		SpinDelay(20);	
+		SpinDelay(20);
 	}
 }
\ No newline at end of file
diff --git a/armsrc/iso15693.c b/armsrc/iso15693.c
index 285ac226d..61e0e1130 100644
--- a/armsrc/iso15693.c
+++ b/armsrc/iso15693.c
@@ -14,22 +14,22 @@
 // Modified to perform modulation onboard in arm rather than on PC
 // Also added additional reader commands (SELECT, READ etc.)
 //-----------------------------------------------------------------------------
-// The ISO 15693 describes two transmission modes from reader to tag, and 4 
-// transmission modes from tag to reader. As of Mar 2010 this code only 
-// supports one of each: "1of4" mode from reader to tag, and the highspeed 
+// The ISO 15693 describes two transmission modes from reader to tag, and 4
+// transmission modes from tag to reader. As of Mar 2010 this code only
+// supports one of each: "1of4" mode from reader to tag, and the highspeed
 // variant with one subcarrier from card to reader.
-// As long, as the card fully support ISO 15693 this is no problem, since the 
-// reader chooses both data rates, but some non-standard tags do not. Further for 
+// As long, as the card fully support ISO 15693 this is no problem, since the
+// reader chooses both data rates, but some non-standard tags do not. Further for
 // the simulation to work, we will need to support all data rates.
 //
 // VCD (reader) -> VICC (tag)
 // 1 out of 256:
-// 	data rate: 1,66 kbit/s (fc/8192) 
+// 	data rate: 1,66 kbit/s (fc/8192)
 // 	used for long range
 // 1 out of 4:
 // 	data rate: 26,48 kbit/s (fc/512)
 //	used for short range, high speed
-// 
+//
 // VICC (tag) -> VCD (reader)
 // Modulation:
 //		ASK / one subcarrier (423,75 khz)
@@ -49,11 +49,11 @@
 // TODO / BUGS / ISSUES:
 // *) writing to tags takes longer: we miss the answer from the tag in most cases
 //    -> tweak the read-timeout times
-// *) signal decoding from the card is still a bit shaky. 
+// *) signal decoding from the card is still a bit shaky.
 // *) signal decoding is unable to detect collissions.
-// *) add anti-collission support for inventory-commands 
+// *) add anti-collission support for inventory-commands
 // *) read security status of a block
-// *) sniffing and simulation do only support one transmission mode. need to support 
+// *) sniffing and simulation do only support one transmission mode. need to support
 //		all 8 transmission combinations
 //	*) remove or refactor code under "depricated"
 // *) document all the functions
@@ -70,7 +70,7 @@
 // This section basicly contains transmission and receiving of bits
 ///////////////////////////////////////////////////////////////////////
 
-// 32 + 2 crc + 1 
+// 32 + 2 crc + 1
 #define ISO15_MAX_FRAME		35
 #define CMD_ID_RESP			5
 #define CMD_READ_RESP		13
@@ -92,7 +92,7 @@ static void BuildIdentifyRequest(uint8_t *cmdout);
 static void BuildInventoryResponse(uint8_t *cmdout, uint8_t *uid);
 
 // ---------------------------
-// Signal Processing 
+// Signal Processing
 // ---------------------------
 
 // prepare data using "1 out of 4" code for later transmission
@@ -176,7 +176,7 @@ static void CodeIso15693AsReader(uint8_t *cmd, int n) {
 }
 
 // encode data using "1 out of 256" sheme
-// data rate is 1,66 kbit/s (fc/8192) 
+// data rate is 1,66 kbit/s (fc/8192)
 // is designed for more robust communication over longer distances
 static void CodeIso15693AsReader256(uint8_t *cmd, int n) {
 	int i, j;
@@ -196,7 +196,7 @@ static void CodeIso15693AsReader256(uint8_t *cmd, int n) {
 	ToSendStuffBit(1);
 	ToSendStuffBit(1);
 	ToSendStuffBit(0);
-	
+
 	for(i = 0; i < n; i++) {
 		for (j = 0; j <= 255; j++) {
 			if (cmd[i] == j) {
@@ -205,8 +205,8 @@ static void CodeIso15693AsReader256(uint8_t *cmd, int n) {
 			} else {
 				ToSendStuffBit(1);
 				ToSendStuffBit(1);
-			}			
-		}	
+			}
+		}
 	}
 	// EOF
 	ToSendStuffBit(1);
@@ -236,19 +236,19 @@ static void TransmitTo15693Tag(const uint8_t *cmd, int len, int *samples, int *w
 	}
 
     c = 0;
-    for(;;) {	
+    for(;;) {
 		if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
             AT91C_BASE_SSC->SSC_THR = cmd[c];
             if( ++c >= len) break;
         }
-        WDT_HIT();		
+        WDT_HIT();
     }
-	
+
 	if (samples) {
 		if (wait)
 			*samples = (c + *wait) << 3;
 		else
-			*samples = c << 3;	
+			*samples = c << 3;
 	}
 }
 
@@ -258,7 +258,7 @@ static void TransmitTo15693Tag(const uint8_t *cmd, int len, int *samples, int *w
 static void TransmitTo15693Reader(const uint8_t *cmd, int len, int *samples, int *wait) {
     int c = 0;
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_SIMULATOR | FPGA_HF_SIMULATOR_MODULATE_424K);
-	
+
 	if (wait) {
 		for (c = 0; c < *wait;) {
 			if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
@@ -269,19 +269,19 @@ static void TransmitTo15693Reader(const uint8_t *cmd, int len, int *samples, int
 		}
 	}
 
-    c = 0;	
+    c = 0;
     for(;;) {
 		if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
             AT91C_BASE_SSC->SSC_THR = cmd[c];
             if( ++c >= len) break;
         }
-        WDT_HIT();		
+        WDT_HIT();
     }
 	if (samples) {
 		if (wait)
 			*samples = (c + *wait) << 3;
 		else
-			*samples = c << 3;	
+			*samples = c << 3;
 	}
 }
 
@@ -289,7 +289,7 @@ static void TransmitTo15693Reader(const uint8_t *cmd, int len, int *samples, int
 // DEMODULATE tag answer
 //-----------------------------------------------------------------------------
 static int DemodAnswer(uint8_t *received, uint8_t *dest, uint16_t samplecount) {
-	
+
 	int i, j;
 	int max = 0, maxPos = 0, skip = 4;
 	int k = 0; // this will be our return value
@@ -308,9 +308,9 @@ static int DemodAnswer(uint8_t *received, uint8_t *dest, uint16_t samplecount) {
 	//	DbpString("SOF at %d, correlation %d", maxPos,max/(ARRAYLEN(FrameSOF)/skip));
 
 	// greg - If correlation is less than 1 then there's little point in continuing
-	if ((max / (ARRAYLEN(FrameSOF)/skip) ) < 1) 
+	if ((max / (ARRAYLEN(FrameSOF)/skip) ) < 1)
 		return k;
-	
+
 	i = maxPos + ARRAYLEN(FrameSOF) / skip;
 
 	uint8_t outBuf[ISO15_MAX_FRAME];
@@ -335,31 +335,31 @@ static int DemodAnswer(uint8_t *received, uint8_t *dest, uint16_t samplecount) {
 
 		if (corrEOF > corr1 && corrEOF > corr0)
 			break;
-		
+
 		if (corr1 > corr0) {
 			i += ARRAYLEN(Logic1) / skip;
 			outBuf[k] |= mask;
 		} else {
 			i += ARRAYLEN(Logic0) / skip;
 		}
-		
+
 		mask <<= 1;
-		
+
 		if (mask == 0) {
 			k++;
 			mask = 0x01;
 		}
-		
+
 		if ( ( i + (int)ARRAYLEN(FrameEOF)) >= samplecount-1) {
 			//Dbprintf("[!] ran off end!  %d | %d",( i + (int)ARRAYLEN(FrameEOF)), samplecount-1);
 			break;
 		}
 	}
-	
+
 	if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("ice: demod bytes %u", k);
-			
+
 	if (mask != 0x01) { // this happens, when we miss the EOF
-		
+
 		// TODO: for some reason this happens quite often
 		if (MF_DBGLEVEL >= MF_DBG_ERROR && k != 0) Dbprintf("[!] error, uneven octet! (extra bits!) mask %02x", mask);
 		//if (mask < 0x08) k--; // discard the last uneven octet;
@@ -378,7 +378,7 @@ static int DemodAnswer(uint8_t *received, uint8_t *dest, uint16_t samplecount) {
 //		received
 //		samples
 //		elapsed
-// returns: 
+// returns:
 //		number of decoded bytes
 // logging enabled
 static int GetIso15693AnswerFromTag(uint8_t *received, int *elapsed) {
@@ -392,7 +392,7 @@ static int GetIso15693AnswerFromTag(uint8_t *received, int *elapsed) {
 	uint8_t *buf = BigBuf_malloc(SIGNAL_BUFF_SIZE);
 
 	if (elapsed) *elapsed = 0;
-	
+
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
 
 	for(;;) {
@@ -414,9 +414,9 @@ static int GetIso15693AnswerFromTag(uint8_t *received, int *elapsed) {
 			// close to what we want.
 			// iceman 2016, amplitude sqrt(abs(i) + abs(q))
 			if (getNext) {
-								
+
 				buf[counter++] = (uint8_t)(MAX(ci,cq) + (MIN(ci, cq) >> 1));
-				
+
 				if (counter >= SIGNAL_BUFF_SIZE)
 					break;
 			} else {
@@ -424,11 +424,11 @@ static int GetIso15693AnswerFromTag(uint8_t *received, int *elapsed) {
 			}
 			getNext = !getNext;
 		}
-	}	
-	time_stop = GetCountSspClk() - time_0 ;	
-	int len = DemodAnswer(received, buf, counter);	
+	}
+	time_stop = GetCountSspClk() - time_0 ;
+	int len = DemodAnswer(received, buf, counter);
 	LogTrace(received, len, time_0 << 4, time_stop << 4, NULL, false);
-	BigBuf_free();	
+	BigBuf_free();
 	return len;
 }
 
@@ -444,9 +444,9 @@ static int GetIso15693AnswerFromSniff(uint8_t *received, int *samples, int *elap
 
 	// get current clock
 	time_0 = GetCountSspClk();
-		
+
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
-	
+
 	for(;;) {
 		WDT_HIT();
 
@@ -454,7 +454,7 @@ static int GetIso15693AnswerFromSniff(uint8_t *received, int *samples, int *elap
 
 			ci = (int8_t)AT91C_BASE_SSC->SSC_RHR;
 			ci = ABS(ci);
-			
+
 			// The samples are correlations against I and Q versions of the
 			// tone that the tag AM-modulates, so every other sample is I,
 			// every other is Q. We just want power, so abs(I) + abs(Q) is
@@ -471,11 +471,11 @@ static int GetIso15693AnswerFromSniff(uint8_t *received, int *samples, int *elap
 			getNext = !getNext;
 		}
 	}
-	
+
 	time_stop = GetCountSspClk() - time_0;
-	int k = DemodAnswer(received, buf, counter);	
-	LogTrace(received, k, time_0 << 4, time_stop << 4, NULL, false);	
-	return k;	
+	int k = DemodAnswer(received, buf, counter);
+	LogTrace(received, k, time_0 << 4, time_stop << 4, NULL, false);
+	return k;
 }
 
 //-----------------------------------------------------------------------------
@@ -486,26 +486,26 @@ static int GetIso15693AnswerFromSniff(uint8_t *received, int *samples, int *elap
 void AcquireRawAdcSamplesIso15693(void) {
 	int c = 0, getNext = false;
 	int ci = 0, cq = 0;
-	
+
 	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
 	SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
 	FpgaSetupSsc();
-	
+
 	// Now send the command
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_TX);
 	SpinDelay(200);
 
 	uint8_t *buf = BigBuf_get_addr();
-	
+
 	uint32_t time_start = GetCountSspClk();
 	uint8_t cmd[CMD_ID_RESP] = {0};
 	BuildIdentifyRequest(cmd);
-	
+
 	// sending command
 	c = 0;
 	for(;;) {
 		WDT_HIT();
-		
+
 		if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
 			AT91C_BASE_SSC->SSC_THR = ToSend[c];
 			c++;
@@ -515,31 +515,31 @@ void AcquireRawAdcSamplesIso15693(void) {
 		}
 	}
 
-	
+
 	LogTrace(cmd, CMD_ID_RESP, time_start << 4, (GetCountSspClk() - time_start) << 4, NULL, true);
-	
+
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
 
 	c = 0;
 	for(;;) {
 		WDT_HIT();
-		
+
 		if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
 
 			ci = (int8_t)AT91C_BASE_SSC->SSC_RHR;
 			ci = ABS(ci);
-			
+
 			// The samples are correlations against I and Q versions of the
 			// tone that the tag AM-modulates, so every other sample is I,
 			// every other is Q. We just want power, so abs(I) + abs(Q) is
 			// close to what we want.
 			// iceman 2016, amplitude sqrt(abs(i) + abs(q))
 			if (getNext) {
-				
+
 				buf[c++] = (uint8_t)(MAX(ci,cq) + (MIN(ci, cq) >> 1));
-				
+
 				if (c >= 7000) break;
-				
+
 			} else {
 				cq = ci;
 			}
@@ -553,24 +553,24 @@ void RecordRawAdcSamplesIso15693(void) {
 
 	int c = 0, getNext = false;
 	int ci = 0, cq = 0;
-	
+
 	Iso15693InitReader();
 
 	uint8_t *buf = BigBuf_get_addr();
 
-	for(;;) { 
+	for(;;) {
 		WDT_HIT();
 
 		if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
 
-			ci = (int8_t)AT91C_BASE_SSC->SSC_RHR;		
+			ci = (int8_t)AT91C_BASE_SSC->SSC_RHR;
 			ci = ABS(ci);
 			// The samples are correlations against I and Q versions of the
 			// tone that the tag AM-modulates, so every other sample is I,
 			// every other is Q. We just want power, so abs(I) + abs(Q) is
 			// close to what we want.
 			if (getNext) {
-				
+
 				buf[c++] = (uint8_t)(MAX(ci,cq) + (MIN(ci, cq) >> 1));
 
 				if(c >= 7000)
@@ -582,18 +582,18 @@ void RecordRawAdcSamplesIso15693(void) {
 			getNext = !getNext;
 		}
 	}
-	
+
 	Dbprintf("done");
 	switch_off();
 }
 
-// Initialize the proxmark as iso15k reader 
+// Initialize the proxmark as iso15k reader
 // (this might produces glitches that confuse some tags
 void Iso15693InitReader(void) {
 	LEDsoff();
 	clear_trace();
 	set_tracing(true);
-	
+
 	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
 
 	// Start from off (no field generated)
@@ -601,13 +601,13 @@ void Iso15693InitReader(void) {
 	SpinDelay(10);
 
 	SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
-	
+
 	FpgaSetupSsc();
 
 	// Give the tags time to energize
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
 	SpinDelay(200);
-	
+
 	// Start the timer
 	StartCountSspClk();
 
@@ -672,7 +672,7 @@ static void BuildInventoryResponse(uint8_t *out, uint8_t *uid) {
 	// one sub-carrier, inventory, 1 slot, fast rate
 	// AFI is at bit 5 (1<<4) when doing an INVENTORY
     //(1 << 2) | (1 << 5) | (1 << 1);
-	cmd[0] = 0; // 
+	cmd[0] = 0; //
 	cmd[1] = 0; // DSFID (data storage format identifier).  0x00 = not supported
 	// 64-bit UID
 	cmd[2] = uid[7]; //0x32;
@@ -691,19 +691,19 @@ static void BuildInventoryResponse(uint8_t *out, uint8_t *uid) {
 
 // Universal Method for sending to and recv bytes from a tag
 // 	init ... should we initialize the reader?
-// 	speed ... 0 low speed, 1 hi speed 
+// 	speed ... 0 low speed, 1 hi speed
 // 	**recv will return you a pointer to the received data
-// 	If you do not need the answer use NULL for *recv[] 
+// 	If you do not need the answer use NULL for *recv[]
 //	return: lenght of received data
 // logging enabled
 int SendDataTag(uint8_t *send, int sendlen, bool init, int speed, uint8_t *outdata) {
 
 	int t_samples = 0, wait = 0, elapsed = 0, answer_len = 0;
-	
+
 	LEDsoff();
-	
+
 	if (init) Iso15693InitReader();
-		
+
 	LED_A_ON();
 
 	if (!speed)
@@ -712,15 +712,15 @@ int SendDataTag(uint8_t *send, int sendlen, bool init, int speed, uint8_t *outda
 		CodeIso15693AsReader(send, sendlen);	// high speed (1 out of 4)
 
 	LED_A_INV();
-	
+
 	uint32_t time_start = GetCountSspClk();
 
 	TransmitTo15693Tag(ToSend, ToSendMax, &t_samples, &wait);
 	LogTrace(send, sendlen, time_start << 4, (GetCountSspClk() - time_start) << 4, NULL, true);
-	
+
 	// Now wait for a response
 	if (outdata != NULL) {
-		LED_B_INV();		
+		LED_B_INV();
 		answer_len = GetIso15693AnswerFromTag(outdata, &elapsed);
 	}
 
@@ -729,7 +729,7 @@ int SendDataTag(uint8_t *send, int sendlen, bool init, int speed, uint8_t *outda
 }
 
 // --------------------------------------------------------------------
-// Debug Functions 
+// Debug Functions
 // --------------------------------------------------------------------
 
 // Decodes a message from a tag and displays its metadata and content
@@ -738,37 +738,37 @@ void DbdecodeIso15693Answer(int len, uint8_t *d) {
 	char status[DBD15STATLEN+1] = {0};
 
 	if (len > 3) {
-		if (d[0] & ( 1 << 3 )) 
+		if (d[0] & ( 1 << 3 ))
 			strncat(status, "ProtExt ", DBD15STATLEN);
-		if (d[0] & 1) { 
+		if (d[0] & 1) {
 			// error
 			strncat(status, "Error ", DBD15STATLEN);
 			switch (d[1]) {
-				case 0x01: 
+				case 0x01:
 					strncat(status, "01: not supported", DBD15STATLEN);
 					break;
-				case 0x02: 
+				case 0x02:
 					strncat(status, "02: not recognized", DBD15STATLEN);
 					break;
-				case 0x03: 
+				case 0x03:
 					strncat(status, "03: opt not supported", DBD15STATLEN);
 					break;
-				case 0x0f: 
+				case 0x0f:
 					strncat(status, "0F: no info", DBD15STATLEN);
 					break;
-				case 0x10: 
+				case 0x10:
 					strncat(status, "10: dont exist", DBD15STATLEN);
 					break;
-				case 0x11: 
+				case 0x11:
 					strncat(status, "11: lock again", DBD15STATLEN);
 					break;
-				case 0x12: 
+				case 0x12:
 					strncat(status, "12: locked", DBD15STATLEN);
 					break;
-				case 0x13: 
+				case 0x13:
 					strncat(status, "13: program error", DBD15STATLEN);
 					break;
-				case 0x14: 
+				case 0x14:
 					strncat(status, "14: lock error", DBD15STATLEN);
 					break;
 				default:
@@ -778,7 +778,7 @@ void DbdecodeIso15693Answer(int len, uint8_t *d) {
 		} else {
 			strncat(status ,"No error ", DBD15STATLEN);
 		}
-			
+
 		if (CheckCrc(d, len))
 			strncat(status, "[+] crc OK", DBD15STATLEN);
 		else
@@ -801,12 +801,12 @@ void DbdecodeIso15693Answer(int len, uint8_t *d) {
 void ReaderIso15693(uint32_t parameter) {
 	int answerLen1 = 0;
 	int tsamples = 0, wait = 0, elapsed = 0;
-	
+
 	uint8_t uid[8] = {0,0,0,0,0,0,0,0};
 
-	// set up device/fpga 
+	// set up device/fpga
 	Iso15693InitReader();
-	
+
 	uint8_t *answer1 = BigBuf_malloc(50);
 	uint8_t *answer2 = BigBuf_malloc(50);
 
@@ -822,7 +822,7 @@ void ReaderIso15693(uint32_t parameter) {
 	BuildIdentifyRequest( cmd );
 	TransmitTo15693Tag(ToSend, ToSendMax, &tsamples, &wait);
 	LogTrace(cmd, CMD_ID_RESP, time_start << 4, (GetCountSspClk() - time_start) << 4, NULL, true);
-		
+
 	// Now wait for a response
 	answerLen1 = GetIso15693AnswerFromTag(answer1, &elapsed) ;
 
@@ -834,10 +834,10 @@ void ReaderIso15693(uint32_t parameter) {
 		uid[3] = answer1[6];
 		uid[4] = answer1[5];
 		uid[5] = answer1[4];
-		uid[6] = answer1[3]; 
+		uid[6] = answer1[3];
 		uid[7] = answer1[2];
-	
-		if ( MF_DBGLEVEL >= MF_DBG_EXTENDED) {	
+
+		if ( MF_DBGLEVEL >= MF_DBG_EXTENDED) {
 			Dbprintf("[+] UID = %02X%02X%02X%02X%02X%02X%02X%02X",
 				uid[0], uid[1], uid[2], uid[3],
 				uid[4], uid[5], uid[5], uid[6]
@@ -863,15 +863,15 @@ void ReaderIso15693(uint32_t parameter) {
 // Simulate an ISO15693 TAG, perform anti-collision and then print any reader commands
 // all demodulation performed in arm rather than host. - greg
 void SimTagIso15693(uint32_t parameter, uint8_t *uid) {
-	
+
 	LEDsoff();
-	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);	
+	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
 	SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
 	FpgaSetupSsc();
 	// Start from off (no field generated)
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 	SpinDelay(200);
-	
+
 	LED_A_ON();
 
 	uint32_t time_start = 0;
@@ -886,23 +886,23 @@ void SimTagIso15693(uint32_t parameter, uint8_t *uid) {
 	LED_C_ON();
 
 	// Build a suitable reponse to the reader INVENTORY cocmmand
-	// not so obsvious, but in the call to BuildInventoryResponse,  the command is copied to the global ToSend buffer used below.			
+	// not so obsvious, but in the call to BuildInventoryResponse,  the command is copied to the global ToSend buffer used below.
 	uint8_t cmd[CMD_INV_RESP] = {0};
 	BuildInventoryResponse(cmd, uid);
-	
+
 	while (!BUTTON_PRESS() && !usb_poll_validate_length() ) {
 		WDT_HIT();
-	
+
 		// Listen to reader
 		ans = GetIso15693AnswerFromSniff(buf, &samples, &elapsed) ;
 
 		// we should do a better check than this
 		if (ans >= 1 ) {
-						
+
 			time_start = GetCountSspClk();
 			TransmitTo15693Reader(ToSend, ToSendMax, &tsamples, &wait);
-			LogTrace(cmd, CMD_INV_RESP, time_start << 4, (GetCountSspClk() - time_start) << 4, NULL, true);						
-					
+			LogTrace(cmd, CMD_INV_RESP, time_start << 4, (GetCountSspClk() - time_start) << 4, NULL, true);
+
 			if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
 				Dbprintf("[+] %d octets read from reader command: %x %x %x %x %x %x %x %x", ans,
 					buf[0], buf[1], buf[2],	buf[3],
@@ -916,38 +916,38 @@ void SimTagIso15693(uint32_t parameter, uint8_t *uid) {
 
 // Since there is no standardized way of reading the AFI out of a tag, we will brute force it
 // (some manufactures offer a way to read the AFI, though)
-void BruteforceIso15693Afi(uint32_t speed) {	
+void BruteforceIso15693Afi(uint32_t speed) {
 
 	uint8_t data[7] = {0,0,0,0,0,0,0};
 	uint8_t buf[ISO15_MAX_FRAME];
 	memset(buf, 0x00, sizeof(buf));
 	int datalen = 0, recvlen = 0;
-	
+
 	Iso15693InitReader();
-	
+
 	// first without AFI
 	// Tags should respond wihtout AFI and with AFI=0 even when AFI is active
-	
+
 	data[0] = ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | ISO15_REQ_INVENTORY | ISO15_REQINV_SLOT1;
 	data[1] = ISO15_CMD_INVENTORY;
 	data[2] = 0; // mask length
 	AddCrc(data, 3);
 	datalen += 2;
-	
+
 	recvlen = SendDataTag(data, datalen, false, speed, buf);
-	
+
 	WDT_HIT();
-	
+
 	if (recvlen >= 12) {
 		Dbprintf("NoAFI UID = %s", sprintUID(NULL, buf + 2) );
 	}
-	
+
 	// now with AFI
 	data[0] |= ISO15_REQINV_AFI;
 	//data[1] = ISO15_CMD_INVENTORY;
 	data[2] = 0; // AFI
 	data[3] = 0; // mask length
-	
+
 	for (uint16_t i = 0; i < 256; i++) {
 		data[2] = i & 0xFF;
 		AddCrc(data, 4);
@@ -957,19 +957,19 @@ void BruteforceIso15693Afi(uint32_t speed) {
 		if (recvlen >= 12) {
 			Dbprintf("AFI = %i  UID = %s", i, sprintUID(NULL, buf + 2) );
 		}
-		
+
 		if (BUTTON_PRESS()) {
 			DbpString("button pressed, aborting..");
 			break;
 		}
-	}	
-	
+	}
+
 	DbpString("AFI Bruteforcing done.");
 	switch_off();
 }
 
 // Allows to directly send commands to the tag via the client
-// Has to increase dialog between device and client. 
+// Has to increase dialog between device and client.
 void DirectTag15693Command(uint32_t datalen, uint32_t speed, uint32_t recv, uint8_t *data) {
 
 	bool init = true;
@@ -981,16 +981,16 @@ void DirectTag15693Command(uint32_t datalen, uint32_t speed, uint32_t recv, uint
 		DbpString("[+] SEND");
 		Dbhexdump(datalen, data, true);
 	}
-	
+
 	buflen = SendDataTag(data, datalen, init, speed, (recv ? buf : NULL));
-	
-	if (recv) { 
+
+	if (recv) {
 		buflen = (buflen > ISO15_MAX_FRAME) ? ISO15_MAX_FRAME : buflen;
-		
+
 		LED_B_ON();
 		cmd_send(CMD_ACK, buflen, 0, 0, buf, buflen);
-		LED_B_OFF();	
-		
+		LED_B_OFF();
+
 		if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
 			DbpString("[+] RECV");
 			DbdecodeIso15693Answer(buflen, buf);
diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index 96abd9b99..3296aff8c 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -85,11 +85,11 @@ void setT55xxConfig(uint8_t arg0, t55xx_config *c) {
 	if (arg0 == 0) {
 		return;
 	}
-	
+
     if (!FlashInit()) {
         return;
 	}
-	
+
 	uint8_t *buf = BigBuf_malloc(T55XX_CONFIG_LEN);
 	Flash_CheckBusy(BUSY_TIMEOUT);
 	uint16_t res = Flash_ReadDataCont(T55XX_CONFIG_OFFSET, buf, T55XX_CONFIG_LEN);
@@ -98,9 +98,9 @@ void setT55xxConfig(uint8_t arg0, t55xx_config *c) {
 		BigBuf_free();
 		return;
 	}
-	
+
 	memcpy(buf, &t_config, T55XX_CONFIG_LEN);
-	
+
 	Flash_CheckBusy(BUSY_TIMEOUT);
     Flash_WriteEnable();
 	Flash_Erase4k(3, 0xD);
@@ -109,8 +109,8 @@ void setT55xxConfig(uint8_t arg0, t55xx_config *c) {
 	if ( res == T55XX_CONFIG_LEN && MF_DBGLEVEL > 1) {
 		DbpString("T55XX Config save success");
 	}
-	
-	BigBuf_free();	
+
+	BigBuf_free();
 #endif
 }
 
@@ -125,11 +125,11 @@ void loadT55xxConfig(void) {
 	}
 
 	uint8_t *buf = BigBuf_malloc(T55XX_CONFIG_LEN);
-	
+
 	Flash_CheckBusy(BUSY_TIMEOUT);
 	uint16_t isok = Flash_ReadDataCont(T55XX_CONFIG_OFFSET, buf, T55XX_CONFIG_LEN);
 	FlashStop();
-	
+
 	// verify read mem is actual data.
 	uint8_t cntA = T55XX_CONFIG_LEN, cntB = T55XX_CONFIG_LEN;
 	for (int i=0; i< T55XX_CONFIG_LEN; i++) {
@@ -140,9 +140,9 @@ void loadT55xxConfig(void) {
 		BigBuf_free();
 		return;
 	}
-	
+
 	memcpy((uint8_t *)&t_config, buf, T55XX_CONFIG_LEN);
-	
+
 	if ( isok == T55XX_CONFIG_LEN) {
 		if (MF_DBGLEVEL > 1) DbpString("T55XX Config load success");
 	}
@@ -581,7 +581,7 @@ void SimulateTagLowFrequencyEx(int period, int gap, int ledcontrol, int numcycle
 	//FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_TOGGLE_MODE );
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT);
 	WaitMS(20);
-	
+
 	int i = 0, x = 0;
 	uint8_t *buf = BigBuf_get_addr();
 
@@ -598,11 +598,11 @@ void SimulateTagLowFrequencyEx(int period, int gap, int ledcontrol, int numcycle
 	AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT | GPIO_SSC_CLK;
 	AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
 	AT91C_BASE_PIOA->PIO_ODR = GPIO_SSC_CLK;
-	
+
 	uint8_t check = 1;
 
 	for(;;) {
-	
+
 		if ( numcycles > -1 ) {
 			if ( x != numcycles ) {
 				++x;
@@ -744,7 +744,7 @@ static void fcAll(uint8_t fc, int *n, uint8_t clock, uint16_t *modCnt)
 		*n += fc;
 	}
 	if (mod > 0) (*modCnt)++;
-	
+
 	if ((mod > 0) && modAdjOk){  //fsk2
 		if ((*modCnt % modAdj) == 0){ //if 4th 8 length wave in a rf/50 add extra 8 length wave
 			memset(dest + (*n), 0, fc - halfFC);
@@ -1500,9 +1500,9 @@ void T55xxReadBlock(uint16_t arg0, uint8_t Block, uint32_t Pwd) {
 	bool brute_mem =  arg0 & 0x4;
 
 	uint32_t i = 0;
-	
+
 	// regular read mode
-	bool RegReadMode = (Block == 0xFF); 
+	bool RegReadMode = (Block == 0xFF);
 
 	uint8_t start_wait = 4;
 	size_t samples = 12000;
@@ -1510,7 +1510,7 @@ void T55xxReadBlock(uint16_t arg0, uint8_t Block, uint32_t Pwd) {
 		start_wait = 0;
 		samples = 1024;
 	}
-	
+
 	//clear buffer now so it does not interfere with timing later
 	BigBuf_Clear_keep_EM();
 
@@ -1523,7 +1523,7 @@ void T55xxReadBlock(uint16_t arg0, uint8_t Block, uint32_t Pwd) {
 	LFSetupFPGAForADC(95, true);
 	// make sure tag is fully powered up...
 	WaitMS(start_wait);
-	
+
 	// Trigger T55x7 Direct Access Mode with start gap
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 	WaitUS(t_config.start_gap);
@@ -1570,9 +1570,9 @@ void T55xx_ChkPwds() {
 	// First get baseline and setup LF mode.
 	// tends to mess up BigBuf
 	uint8_t *buf = BigBuf_get_addr();
-	
+
 	uint32_t b1, baseline = 0;
-	
+
 	// collect baseline for failed attempt
 	uint8_t x = 32;
 	while (x--) {
@@ -1580,16 +1580,16 @@ void T55xx_ChkPwds() {
 		T55xxReadBlock(4, 1, 0);
 		for (uint16_t j=0; j < 1024; ++j)
 			b1 += buf[j];
-		
+
 		b1 *= b1;
-		b1 >>= 8; 		
+		b1 >>= 8;
 		baseline += b1;
 	}
 
 	baseline >>= 5;
-	Dbprintf("[=] Baseline determined [%u]", baseline);	
+	Dbprintf("[=] Baseline determined [%u]", baseline);
+
 
-	
 	uint8_t *pwds = BigBuf_get_EM_addr();
 	uint16_t pwdCount = 0;
 	uint32_t candidate = 0;
@@ -1599,20 +1599,20 @@ void T55xx_ChkPwds() {
 	if ( use_flashmem ) {
 		BigBuf_Clear_EM();
 		uint16_t isok = 0;
-		uint8_t counter[2] = {0x00, 0x00};		
+		uint8_t counter[2] = {0x00, 0x00};
 		isok = Flash_ReadData(DEFAULT_T55XX_KEYS_OFFSET, counter, sizeof(counter) );
 		if ( isok != sizeof(counter) )
 			goto OUT;
-		
+
 		pwdCount = counter[1] << 8 | counter[0];
-		
-		if ( pwdCount == 0 && pwdCount == 0xFFFF) 
+
+		if ( pwdCount == 0 && pwdCount == 0xFFFF)
 			goto OUT;
 
 		isok = Flash_ReadData(DEFAULT_T55XX_KEYS_OFFSET+2, pwds, pwdCount * 4);
 		if ( isok != pwdCount * 4 )
 			goto OUT;
-		
+
 		Dbprintf("[=] Password dictionary count %d ", pwdCount);
 	}
 #endif
@@ -1623,38 +1623,38 @@ void T55xx_ChkPwds() {
 		if (BUTTON_PRESS() && !usb_poll_validate_length()) {
 			goto OUT;
 		}
-		
+
 		pwd = bytes_to_num(pwds + i * 4, 4);
-	
+
 
 		T55xxReadBlock(5, 0, pwd);
-		
+
 		// calc mean of BigBuf 1024 samples.
 		uint32_t sum = 0;
 		for (uint16_t j=0; j<1024; ++j) {
 			sum += buf[j];
 		}
-		
+
 		sum *= sum;
 		sum >>= 8;
-		
+
 		int32_t tmp = (sum - baseline);
 		curr = ABS(tmp);
-		
+
 		Dbprintf("[=] Pwd %08X  | ABS %u", pwd, curr );
-			
+
 		if ( curr > prev ) {
-			
-					
+
+
 			Dbprintf("[=]  --> ABS %u  Candidate %08X <--", curr, pwd );
 			candidate = pwd;
 			prev = curr;
 		}
 	}
-	
+
 	if ( candidate )
 		ret = 1;
-		
+
 OUT:
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 	cmd_send(CMD_ACK,ret,candidate,0,0,0);
@@ -2122,7 +2122,7 @@ void Cotag(uint32_t arg0) {
 	LED_A_ON();
 
 	LFSetupFPGAForADC(89, true);
-		
+
 	//clear buffer now so it does not interfere with timing later
 	BigBuf_Clear_ext(false);
 
diff --git a/armsrc/lfsampling.c b/armsrc/lfsampling.c
index 4b036d088..80d95bb4a 100644
--- a/armsrc/lfsampling.c
+++ b/armsrc/lfsampling.c
@@ -42,7 +42,7 @@ void setSamplingConfig(sample_config *sc) {
 	if(sc->divisor != 0) config.divisor = sc->divisor;
 	if(sc->bits_per_sample != 0) config.bits_per_sample = sc->bits_per_sample;
 	if(sc->trigger_threshold != -1) config.trigger_threshold = sc->trigger_threshold;
-	
+
 	config.decimation = (sc->decimation != 0) ? sc->decimation : 1;
 	config.averaging = sc->averaging;
 	if(config.bits_per_sample > 8)	config.bits_per_sample = 8;
@@ -136,17 +136,17 @@ uint32_t DoAcquisition(uint8_t decimation, uint32_t bits_per_sample, bool averag
 	uint32_t sample_total_numbers = 0;
 	uint32_t sample_total_saved = 0;
 	uint32_t cancel_counter = 0;
-	
+
 	while (!BUTTON_PRESS() && !usb_poll_validate_length() ) {
 		WDT_HIT();
 
 		if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
 			sample = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
-			
-			// Testpoint 8 (TP8) can be used to trigger oscilliscope 
+
+			// Testpoint 8 (TP8) can be used to trigger oscilliscope
 			LED_D_OFF();
-			
-			// threshold either high or low values 128 = center 0.  if trigger = 178 
+
+			// threshold either high or low values 128 = center 0.  if trigger = 178
 			if ((trigger_threshold > 0) && (sample < (trigger_threshold + 128)) && (sample > (128 - trigger_threshold))) {
 				if (cancel_after > 0) {
 					cancel_counter++;
@@ -155,7 +155,7 @@ uint32_t DoAcquisition(uint8_t decimation, uint32_t bits_per_sample, bool averag
 				}
 				continue;
 			}
-			
+
 			trigger_threshold = 0;
 			sample_total_numbers++;
 
@@ -168,22 +168,22 @@ uint32_t DoAcquisition(uint8_t decimation, uint32_t bits_per_sample, bool averag
 				if (sample_counter < decimation) continue;
 				sample_counter = 0;
 			}
-			
+
 			// averaging
 			if (averaging && decimation > 1) {
 				sample = sample_sum / decimation;
 				sample_sum =0;
 			}
-			
+
 			// store the sample
 			sample_total_saved ++;
 			if (bits_per_sample == 8) {
 				dest[sample_total_saved-1] = sample;
-				
-				// Get the return value correct				
-				data.numbits = sample_total_saved << 3; 
+
+				// Get the return value correct
+				data.numbits = sample_total_saved << 3;
 				if (sample_total_saved >= bufsize) break;
-				
+
 			} else {
 				pushBit(&data, sample & 0x80);
 				if (bits_per_sample > 1)	pushBit(&data, sample & 0x40);
@@ -203,11 +203,11 @@ uint32_t DoAcquisition(uint8_t decimation, uint32_t bits_per_sample, bool averag
 		Dbprintf("buffer samples: %02x %02x %02x %02x %02x %02x %02x %02x ...",
 					dest[0], dest[1], dest[2], dest[3], dest[4], dest[5], dest[6], dest[7]);
 	}
-	
+
 	// Ensure that DC offset removal and noise check is performed for any device-side processing
 	removeSignalOffset(dest, bufsize);
 	computeSignalProperties(dest, bufsize);
-	
+
 	return data.numbits;
 }
 /**
@@ -250,7 +250,7 @@ uint32_t SampleLF(bool printCfg, int sample_size) {
 	BigBuf_Clear_ext(false);
 	uint32_t ret = ReadLF(true, printCfg, sample_size);
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	return ret;	
+	return ret;
 }
 /**
 * Initializes the FPGA for snoop-mode (field off), and acquires the samples.
@@ -260,7 +260,7 @@ uint32_t SnoopLF() {
 	BigBuf_Clear_ext(false);
 	uint32_t ret = ReadLF(false, true, 0);
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	return ret;	
+	return ret;
 }
 
 /**
@@ -272,10 +272,10 @@ void doT55x7Acquisition(size_t sample_size) {
 	#define T55xx_READ_UPPER_THRESHOLD 128+60  // 60 grph
 	#define T55xx_READ_LOWER_THRESHOLD 128-60  // -60 grph
 	#define T55xx_READ_TOL   5
-	
+
 	uint8_t *dest = BigBuf_get_addr();
 	uint16_t bufsize = BigBuf_max_traceLen();
-	
+
 	if ( bufsize > sample_size )
 		bufsize = sample_size;
 
@@ -284,18 +284,18 @@ void doT55x7Acquisition(size_t sample_size) {
 	bool startFound = false;
 	bool highFound = false;
 	bool lowFound = false;
-		
-	while(!BUTTON_PRESS() && !usb_poll_validate_length() && skipCnt < 1000 && (i < bufsize) ) {
-		WDT_HIT();		
 
-		
+	while(!BUTTON_PRESS() && !usb_poll_validate_length() && skipCnt < 1000 && (i < bufsize) ) {
+		WDT_HIT();
+
+
 		if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
-			curSample = (uint8_t)AT91C_BASE_SSC->SSC_RHR;	
+			curSample = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
 			LED_D_OFF();
-		
+
 			// skip until the first high sample above threshold
 			if (!startFound && curSample > T55xx_READ_UPPER_THRESHOLD) {
-				//if (curSample > lastSample) 
+				//if (curSample > lastSample)
 				//	lastSample = curSample;
 				highFound = true;
 			} else if (!highFound) {
@@ -304,7 +304,7 @@ void doT55x7Acquisition(size_t sample_size) {
 			}
 			// skip until the first low sample below threshold
 			if (!startFound && curSample < T55xx_READ_LOWER_THRESHOLD) {
-				//if (curSample > lastSample) 
+				//if (curSample > lastSample)
 				lastSample = curSample;
 				lowFound = true;
 			} else if (!lowFound) {
@@ -341,22 +341,22 @@ void doCotagAcquisition(size_t sample_size) {
 
 	uint8_t *dest = BigBuf_get_addr();
 	uint16_t bufsize = BigBuf_max_traceLen();
-	
+
 	if ( bufsize > sample_size )
 		bufsize = sample_size;
 
-	dest[0] = 0;	
-	uint8_t sample = 0, firsthigh = 0, firstlow = 0; 
+	dest[0] = 0;
+	uint8_t sample = 0, firsthigh = 0, firstlow = 0;
 	uint16_t i = 0;
 	uint16_t noise_counter = 0;
-	
+
 	while (!BUTTON_PRESS() && !usb_poll_validate_length() && (i < bufsize) && (noise_counter < (COTAG_T1 << 1)) ) {
-		WDT_HIT();		
+		WDT_HIT();
 
 		if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
-			sample = (uint8_t)AT91C_BASE_SSC->SSC_RHR;	
+			sample = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
 			LED_D_OFF();
-		
+
 			// find first peak
 			if ( !firsthigh ) {
 				if (sample < COTAG_ONE_THRESHOLD) {
@@ -375,14 +375,14 @@ void doCotagAcquisition(size_t sample_size) {
 				firstlow = 1;
 			}
 
-			++i;			
-	
+			++i;
+
 			if ( sample > COTAG_ONE_THRESHOLD)
 				dest[i] = 255;
-			else if ( sample < COTAG_ZERO_THRESHOLD) 
+			else if ( sample < COTAG_ZERO_THRESHOLD)
 				dest[i] = 0;
-			else 
-				dest[i] = dest[i-1];			
+			else
+				dest[i] = dest[i-1];
 		}
 	}
 }
@@ -391,12 +391,12 @@ uint32_t doCotagAcquisitionManchester() {
 
 	uint8_t *dest = BigBuf_get_addr();
 	uint16_t bufsize = BigBuf_max_traceLen();
-	
+
 	if ( bufsize > COTAG_BITS )
 		bufsize = COTAG_BITS;
 
-	dest[0] = 0;	
-	uint8_t sample = 0, firsthigh = 0, firstlow = 0; 
+	dest[0] = 0;
+	uint8_t sample = 0, firsthigh = 0, firstlow = 0;
 	uint16_t sample_counter = 0, period = 0;
 	uint8_t curr = 0, prev = 0;
 	uint16_t noise_counter = 0;
@@ -405,29 +405,29 @@ uint32_t doCotagAcquisitionManchester() {
 		WDT_HIT();
 
 		if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
-			sample = (uint8_t)AT91C_BASE_SSC->SSC_RHR;	
+			sample = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
 			LED_D_OFF();
-		
+
 			// find first peak
 			if ( !firsthigh ) {
 				if (sample < COTAG_ONE_THRESHOLD) {
 					noise_counter++;
 					continue;
-				}				
+				}
 				noise_counter = 0;
 				firsthigh = 1;
 			}
-			
+
 			if ( !firstlow ){
 				if (sample > COTAG_ZERO_THRESHOLD ) {
-					noise_counter++;					
+					noise_counter++;
 					continue;
 				}
-				noise_counter = 0;				
+				noise_counter = 0;
 				firstlow = 1;
 			}
-						
-			// set sample 255, 0,  or previous			
+
+			// set sample 255, 0,  or previous
 			if ( sample > COTAG_ONE_THRESHOLD){
 				prev = curr;
 				curr = 1;
@@ -438,14 +438,14 @@ uint32_t doCotagAcquisitionManchester() {
 			}
 			else {
 				curr = prev;
-			}			
+			}
 
-			// full T1 periods, 
+			// full T1 periods,
 			if ( period > 0 ) {
 				--period;
 				continue;
 			}
-						
+
 			dest[sample_counter] = curr;
 			++sample_counter;
 			period = COTAG_T1;
diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index 5e7375d3d..a10925da7 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -20,8 +20,8 @@
 # define HARDNESTED_AUTHENTICATION_TIMEOUT  848			// card times out 1ms after wrong authentication (according to NXP documentation)
 #endif
 #ifndef HARDNESTED_PRE_AUTHENTICATION_LEADTIME
-# define HARDNESTED_PRE_AUTHENTICATION_LEADTIME 400		// some (non standard) cards need a pause after select before they are ready for first authentication 
-#endif 	
+# define HARDNESTED_PRE_AUTHENTICATION_LEADTIME 400		// some (non standard) cards need a pause after select before they are ready for first authentication
+#endif
 
 // send an incomplete dummy response in order to trigger the card's authentication failure timeout
 #ifndef CHK_TIMEOUT
@@ -29,13 +29,13 @@
 	ReaderTransmit(&dummy_answer, 1, NULL); \
 	uint32_t timeout = GetCountSspClk() + HARDNESTED_AUTHENTICATION_TIMEOUT; \
 	while (GetCountSspClk() < timeout) {}; \
- } 
+ }
 #endif
 
 static uint8_t dummy_answer = 0;
 
 //-----------------------------------------------------------------------------
-// Select, Authenticate, Read a MIFARE tag. 
+// Select, Authenticate, Read a MIFARE tag.
 // read block
 //-----------------------------------------------------------------------------
 void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
@@ -45,7 +45,7 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
 	uint8_t keyType = arg1;
 	uint64_t ui64Key = 0;
 	ui64Key = bytes_to_num(datain, 6);
-	
+
 	// variables
 	byte_t isOK = 0;
 	byte_t dataoutbuf[16] = {0x00};
@@ -74,7 +74,7 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
 			if (MF_DBGLEVEL >= 1)	Dbprintf("Auth error");
 			break;
 		};
-		
+
 		if(mifare_classic_readblock(pcs, cuid, blockNo, dataoutbuf)) {
 			if (MF_DBGLEVEL >= 1)	Dbprintf("Read block error");
 			break;
@@ -84,13 +84,13 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
 			if (MF_DBGLEVEL >= 1)	Dbprintf("Halt error");
 			break;
 		};
-		
+
 		isOK = 1;
 		break;
 	}
-	
+
 	crypto1_destroy(pcs);
-	
+
 	if (MF_DBGLEVEL >= 2)	DbpString("READ BLOCK FINISHED");
 
 	LED_B_ON();
@@ -117,7 +117,7 @@ void MifareUC_Auth(uint8_t arg0, uint8_t *keybytes){
 		OnError(0);
 		return;
 	};
-	
+
 	if(!mifare_ultra_auth(keybytes)){
 		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication failed");
 		OnError(1);
@@ -175,7 +175,7 @@ void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)
 			OnError(1);
 			return;
 		}
-	}	
+	}
 
 	if( mifare_ultra_readblock(blockNo, dataout) ) {
 		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Read block error");
@@ -195,7 +195,7 @@ void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)
 }
 
 //-----------------------------------------------------------------------------
-// Select, Authenticate, Read a MIFARE tag. 
+// Select, Authenticate, Read a MIFARE tag.
 // read sector (data = 4 x 16 bytes = 64 bytes, or 16 x 16 bytes = 256 bytes)
 //-----------------------------------------------------------------------------
 void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
@@ -205,7 +205,7 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
 	uint8_t keyType = arg1;
 	uint64_t ui64Key = 0;
 	ui64Key = bytes_to_num(datain, 6);
-	
+
 	// variables
 	byte_t isOK = 0;
 	byte_t dataoutbuf[16 * 16];
@@ -219,7 +219,7 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
 
 	clear_trace();
 	set_tracing(true);
-	
+
 	LED_A_ON();
 	LED_B_OFF();
 	LED_C_OFF();
@@ -229,13 +229,13 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
 		isOK = 0;
 		if (MF_DBGLEVEL >= 1)	Dbprintf("Can't select card");
 	}
-	
-	
+
+
 	if(isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_FIRST)) {
 		isOK = 0;
 		if (MF_DBGLEVEL >= 1)	Dbprintf("Auth error");
 	}
-	
+
 	for (uint8_t blockNo = 0; isOK && blockNo < NumBlocksPerSector(sectorNo); blockNo++) {
 		if(mifare_classic_readblock(pcs, cuid, FirstBlockOfSector(sectorNo) + blockNo, dataoutbuf + 16 * blockNo)) {
 			isOK = 0;
@@ -243,7 +243,7 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
 			break;
 		}
 	}
-		
+
 	if(mifare_classic_halt(pcs, cuid)) {
 		if (MF_DBGLEVEL >= 1)	Dbprintf("Halt error");
 	}
@@ -275,7 +275,7 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
 	BigBuf_free(); BigBuf_Clear_ext(false);
 	clear_trace();
 	set_tracing(true);
-	
+
 	// params
 	uint8_t blockNo = arg0;
 	uint16_t blocks = arg1;
@@ -315,7 +315,7 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
 
 		if (!mifare_ul_ev1_auth(pwd, pack)){
 			OnError(1);
-			return;			
+			return;
 		}
 	}
 
@@ -326,7 +326,7 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
 		}
 
 		len = mifare_ultra_readblock(blockNo + i, dataout + 4 * i);
-		
+
 		if (len) {
 			if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Read block %d error",i);
 			// if no blocks read - error out
@@ -361,7 +361,7 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
 }
 
 //-----------------------------------------------------------------------------
-// Select, Authenticate, Write a MIFARE tag. 
+// Select, Authenticate, Write a MIFARE tag.
 // read block
 //-----------------------------------------------------------------------------
 void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
@@ -374,7 +374,7 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
 
 	ui64Key = bytes_to_num(datain, 6);
 	memcpy(blockdata, datain + 10, 16);
-	
+
 	// variables
 	byte_t isOK = 0;
 	uint8_t uid[10] = {0x00};
@@ -387,7 +387,7 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
 
 	clear_trace();
 	set_tracing(true);
-	
+
 	LED_A_ON();
 	LED_B_OFF();
 	LED_C_OFF();
@@ -402,7 +402,7 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
 			if (MF_DBGLEVEL >= 1)	Dbprintf("Auth error");
 			break;
 		};
-		
+
 		if(mifare_classic_writeblock(pcs, cuid, blockNo, blockdata)) {
 			if (MF_DBGLEVEL >= 1)	Dbprintf("Write block error");
 			break;
@@ -412,13 +412,13 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
 			if (MF_DBGLEVEL >= 1)	Dbprintf("Halt error");
 			break;
 		};
-		
+
 		isOK = 1;
 		break;
 	}
-	
+
 	crypto1_destroy(pcs);
-	
+
 	if (MF_DBGLEVEL >= 2)	DbpString("WRITE BLOCK FINISHED");
 
 	cmd_send(CMD_ACK,isOK,0,0,0,0);
@@ -428,7 +428,7 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
 	set_tracing(false);
 }
 
-/* // Command not needed but left for future testing 
+/* // Command not needed but left for future testing
 void MifareUWriteBlockCompat(uint8_t arg0, uint8_t *datain)
 {
 	uint8_t blockNo = arg0;
@@ -483,14 +483,14 @@ void MifareUWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)
 	byte_t blockdata[4] = {0x00};
 
 	memcpy(blockdata, datain, 4);
-	
+
 	LEDsoff();
 	LED_A_ON();
 	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
 
 	clear_trace();
 	set_tracing(true);
-	
+
 	if (!iso14443a_select_card(NULL, NULL, NULL, true, 0, true)) {
 		if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
 		OnError(0);
@@ -499,26 +499,26 @@ void MifareUWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)
 
 	// UL-C authentication
 	if ( useKey ) {
-		uint8_t key[16] = {0x00};	
+		uint8_t key[16] = {0x00};
 		memcpy(key, datain+4, sizeof(key) );
 
 		if ( !mifare_ultra_auth(key) ) {
 			OnError(1);
-			return;			
+			return;
 		}
 	}
-	
+
 	// UL-EV1 / NTAG authentication
-	if (usePwd) { 
+	if (usePwd) {
 		uint8_t pwd[4] = {0x00};
 		memcpy(pwd, datain+4, 4);
 		uint8_t pack[4] = {0,0,0,0};
 		if (!mifare_ul_ev1_auth(pwd, pack)) {
 			OnError(1);
-			return;			
+			return;
 		}
 	}
-	
+
 	if (mifare_ultra_writeblock(blockNo, blockdata)) {
 		if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
 		OnError(0);
@@ -540,18 +540,18 @@ void MifareUWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)
 }
 
 void MifareUSetPwd(uint8_t arg0, uint8_t *datain){
-	
+
 	uint8_t pwd[16] = {0x00};
 	byte_t blockdata[4] = {0x00};
-	
+
 	memcpy(pwd, datain, 16);
-	
+
 	LED_A_ON(); LED_B_OFF(); LED_C_OFF();
 	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
 
 	clear_trace();
 	set_tracing(true);
-	
+
 	if (!iso14443a_select_card(NULL, NULL, NULL, true, 0, true)) {
 		if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
 		OnError(0);
@@ -596,7 +596,7 @@ void MifareUSetPwd(uint8_t arg0, uint8_t *datain){
 		if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
 		OnError(47);
 		return;
-	};	
+	};
 
 	if (mifare_ultra_halt()) {
 		if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
@@ -626,25 +626,25 @@ void MifareAcquireNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *
 	uint32_t cuid = 0;
 	int16_t isOK = 0;
 	uint16_t num_nonces = 0;
-	uint8_t cascade_levels = 0;	
+	uint8_t cascade_levels = 0;
 	uint8_t blockNo = arg0 & 0xff;
 	uint8_t keyType = (arg0 >> 8) & 0xff;
 	bool initialize = flags & 0x0001;
 	bool field_off = flags & 0x0004;
 	bool have_uid = false;
-	
+
 	LED_A_ON();
 	LED_C_OFF();
 
-	BigBuf_free(); BigBuf_Clear_ext(false);	
+	BigBuf_free(); BigBuf_Clear_ext(false);
 	clear_trace();
 	set_tracing(true);
-	
+
 	if (initialize)
 		iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
-	
+
 	LED_C_ON();
-	
+
 	for (uint16_t i = 0; i <= USB_CMD_DATA_SIZE-4; i += 4 ) {
 
 		// Test if the action was cancelled
@@ -655,7 +655,7 @@ void MifareAcquireNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *
 		}
 
 		if (!have_uid) { // need a full select cycle to get the uid first
-			iso14a_card_select_t card_info;		
+			iso14a_card_select_t card_info;
 			if (!iso14443a_select_card(uid, &card_info, &cuid, true, 0, true)) {
 				if (MF_DBGLEVEL >= 1)	Dbprintf("AcquireNonces: Can't select card (ALL)");
 				continue;
@@ -666,31 +666,31 @@ void MifareAcquireNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *
 				case 10: cascade_levels = 3; break;
 				default: break;
 			}
-			have_uid = true;	
+			have_uid = true;
 		} else { // no need for anticollision. We can directly select the card
 			if (!iso14443a_fast_select_card(uid, cascade_levels)) {
 				if (MF_DBGLEVEL >= 1)	Dbprintf("AcquireNonces: Can't select card (UID)");
 				continue;
 			}
 		}
-		
-		// Transmit MIFARE_CLASSIC_AUTH	
+
+		// Transmit MIFARE_CLASSIC_AUTH
 		uint8_t dcmd[4] = {0x60 + (keyType & 0x01), blockNo, 0x00, 0x00};
 		AddCrc14A(dcmd, 2);
 		ReaderTransmit(dcmd, sizeof(dcmd), NULL);
-		int len = ReaderReceive(answer, par);		
+		int len = ReaderReceive(answer, par);
 
 		// wait for the card to become ready again
 		CHK_TIMEOUT();
-		
+
 		if (len != 4) {
 			if (MF_DBGLEVEL >= 2)	Dbprintf("AcquireNonces: Auth1 error");
 			continue;
 		}
-		
+
 		num_nonces++;
-		
-		// Save the tag nonce (nt)	
+
+		// Save the tag nonce (nt)
 		buf[i]   = answer[0];
 		buf[i+1] = answer[1];
 		buf[i+2] = answer[2];
@@ -714,7 +714,7 @@ void MifareAcquireNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *
 //-----------------------------------------------------------------------------
 // acquire encrypted nonces in order to perform the attack described in
 // Carlo Meijer, Roel Verdult, "Ciphertext-only Cryptanalysis on Hardened
-// Mifare Classic Cards" in Proceedings of the 22nd ACM SIGSAC Conference on 
+// Mifare Classic Cards" in Proceedings of the 22nd ACM SIGSAC Conference on
 // Computer and Communications Security, 2015
 //-----------------------------------------------------------------------------
 void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *datain) {
@@ -737,7 +737,7 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
 	uint8_t blockNo = arg0 & 0xff;
 	uint8_t keyType = (arg0 >> 8) & 0xff;
 	uint8_t targetBlockNo = arg1 & 0xff;
-	uint8_t targetKeyType = (arg1 >> 8) & 0xff;	
+	uint8_t targetKeyType = (arg1 >> 8) & 0xff;
 	bool initialize = flags & 0x0001;
 	bool slow = flags & 0x0002;
 	bool field_off = flags & 0x0004;
@@ -746,15 +746,15 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
 	LED_A_ON();
 	LED_C_OFF();
 
-	BigBuf_free(); BigBuf_Clear_ext(false);	
+	BigBuf_free(); BigBuf_Clear_ext(false);
 	clear_trace();
 	set_tracing(false);
-	
+
 	if (initialize)
 		iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
-	
+
 	LED_C_ON();
-	
+
 	for (uint16_t i = 0; i <= USB_CMD_DATA_SIZE - 9; ) {
 
 		// Test if the action was cancelled
@@ -765,7 +765,7 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
 		}
 
 		if (!have_uid) { // need a full select cycle to get the uid first
-			iso14a_card_select_t card_info;		
+			iso14a_card_select_t card_info;
 			if(!iso14443a_select_card(uid, &card_info, &cuid, true, 0, true)) {
 				if (MF_DBGLEVEL >= 1)	Dbprintf("AcquireNonces: Can't select card (ALL)");
 				continue;
@@ -776,14 +776,14 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
 				case 10: cascade_levels = 3; break;
 				default: break;
 			}
-			have_uid = true;	
+			have_uid = true;
 		} else { // no need for anticollision. We can directly select the card
 			if (!iso14443a_fast_select_card(uid, cascade_levels)) {
 				if (MF_DBGLEVEL >= 1)	Dbprintf("AcquireNonces: Can't select card (UID)");
 				continue;
 			}
 		}
-		
+
 		if (slow)
 			SpinDelayUs(HARDNESTED_PRE_AUTHENTICATION_LEADTIME);
 
@@ -803,7 +803,7 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
 			if (MF_DBGLEVEL >= 1)	Dbprintf("AcquireNonces: Auth2 error len=%d", len);
 			continue;
 		}
-	
+
 		num_nonces++;
 		if (num_nonces % 2) {
 			memcpy(buf+i, receivedAnswer, 4);
@@ -817,7 +817,7 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
 	}
 
 	LED_C_OFF();
-	crypto1_destroy(pcs);	
+	crypto1_destroy(pcs);
 	LED_B_ON();
 	cmd_send(CMD_ACK, isOK, cuid, num_nonces, buf, sizeof(buf));
 	LED_B_OFF();
@@ -833,8 +833,8 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
 
 
 //-----------------------------------------------------------------------------
-// MIFARE nested authentication. 
-// 
+// MIFARE nested authentication.
+//
 //-----------------------------------------------------------------------------
 void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *datain)
 {
@@ -846,7 +846,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
 	uint64_t ui64Key = 0;
 
 	ui64Key = bytes_to_num(datain, 6);
-	
+
 	// variables
 	uint16_t rtr, i, j, len;
 	uint16_t davg = 0;
@@ -855,7 +855,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
 	uint32_t cuid = 0, nt1, nt2, nttmp, nttest, ks1;
 	uint8_t par[1] = {0x00};
 	uint32_t target_nt[2] = {0x00}, target_ks[2] = {0x00};
-	
+
 	uint8_t par_array[4] = {0x00};
 	uint16_t ncount = 0;
 	struct Crypto1State mpcs = {0, 0};
@@ -872,7 +872,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
 
 	// free eventually allocated BigBuf memory
 	BigBuf_free(); BigBuf_Clear_ext(false);
-	
+
 	if (calibrate) clear_trace();
 	set_tracing(true);
 
@@ -887,7 +887,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
 		davg = dmax = 0;
 		dmin = 2000;
 		delta_time = 0;
-		
+
 		for (rtr = 0; rtr < 17; rtr++) {
 
 			// Test if the action was cancelled
@@ -948,16 +948,16 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
 		}
 
 		davg = (davg + (rtr - 1)/2) / (rtr - 1);
-		
+
 		if (MF_DBGLEVEL >= 3) Dbprintf("rtr=%d isOK=%d min=%d max=%d avg=%d, delta_time=%d", rtr, isOK, dmin, dmax, davg, delta_time);
 
 		dmin = davg - 2;
 		dmax = davg + 2;
-		
+
 		LED_B_OFF();
 	}
-//  -------------------------------------------------------------------------------------------------	
-	
+//  -------------------------------------------------------------------------------------------------
+
 	LED_C_ON();
 
 	//  get crypted nonces for target sector
@@ -965,7 +965,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
 
 		target_nt[i] = 0;
 		while(target_nt[i] == 0) { // continue until we have an unambiguous nonce
-		
+
 			// prepare next select. No need to power down the card.
 			if(mifare_classic_halt(pcs, cuid)) {
 				if (MF_DBGLEVEL >= 2)	Dbprintf("Nested: Halt error");
@@ -976,7 +976,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
 				if (MF_DBGLEVEL >= 2)	Dbprintf("Nested: Can't select card");
 				continue;
 			};
-		
+
 			auth1_time = 0;
 			if(mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1, &auth1_time)) {
 				if (MF_DBGLEVEL >= 2)	Dbprintf("Nested: Auth1 error");
@@ -991,15 +991,15 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
 				if (MF_DBGLEVEL >= 2)	Dbprintf("Nested: Auth2 error len=%d", len);
 				continue;
 			};
-		
-			nt2 = bytes_to_num(receivedAnswer, 4);		
+
+			nt2 = bytes_to_num(receivedAnswer, 4);
 			if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: Testing nt1=%08x nt2enc=%08x nt2par=%02x", i+1, nt1, nt2, par[0]);
-			
+
 			// Parity validity check
 			for (j = 0; j < 4; j++) {
 				par_array[j] = (oddparity8(receivedAnswer[j]) != ((par[0] >> (7-j)) & 0x01));
 			}
-			
+
 			ncount = 0;
 			nttest = prng_successor(nt1, dmin - 1);
 			for (j = dmin; j < dmax + 1; j++) {
@@ -1028,16 +1028,16 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
 	}
 
 	LED_C_OFF();
-	
+
 	crypto1_destroy(pcs);
-	
+
 	uint8_t buf[4 + 4 * 4] = {0};
 	memcpy(buf, &cuid, 4);
 	memcpy(buf+4, &target_nt[0], 4);
 	memcpy(buf+8, &target_ks[0], 4);
 	memcpy(buf+12, &target_nt[1], 4);
 	memcpy(buf+16, &target_ks[1], 4);
-	
+
 	LED_B_ON();
 	cmd_send(CMD_ACK, isOK, 0, targetBlockNo + (targetKeyType * 0x100), buf, sizeof(buf));
 	LED_B_OFF();
@@ -1050,9 +1050,9 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
 }
 
 //-----------------------------------------------------------------------------
-// MIFARE check keys. key count up to 85. 
-// 
-//-----------------------------------------------------------------------------	
+// MIFARE check keys. key count up to 85.
+//
+//-----------------------------------------------------------------------------
 typedef struct sector_t {
 	uint8_t keyA[6];
 	uint8_t keyB[6];
@@ -1060,23 +1060,23 @@ typedef struct sector_t {
 
 typedef struct chk_t {
 	uint64_t key;
-	uint32_t cuid;	
+	uint32_t cuid;
 	uint8_t cl;
 	uint8_t block;
 	uint8_t keyType;
-	uint8_t *uid;	
+	uint8_t *uid;
 	struct Crypto1State *pcs;
 } chk_t;
 
 // checks one key.
 // fast select,  tries 5 times to select
-// 
+//
 // return:
 //  2 = failed to select.
 //  1 = wrong key
 //  0 = correct key
 uint8_t chkKey( struct chk_t *c ) {
-	uint8_t i = 0, res = 2;	
+	uint8_t i = 0, res = 2;
 	while( i < 5 ) {
 		// this part is from Piwi's faster nonce collecting part in Hardnested.
 		// assume: fast select
@@ -1087,26 +1087,26 @@ uint8_t chkKey( struct chk_t *c ) {
 		res = mifare_classic_authex(c->pcs, c->cuid, c->block, c->keyType, c->key, AUTH_FIRST, NULL, NULL);
 
 		CHK_TIMEOUT();
-		
+
 		// if successfull auth, send HALT
-		// if ( !res ) 
+		// if ( !res )
 			// mifare_classic_halt_ex(c->pcs);
 		break;
 	}
 	return res;
 }
 
-uint8_t chkKey_readb(struct chk_t *c, uint8_t *keyb) {	
-	
+uint8_t chkKey_readb(struct chk_t *c, uint8_t *keyb) {
+
 	if (!iso14443a_fast_select_card(c->uid, c->cl))
 		return 2;
-	
+
 	if ( mifare_classic_authex(c->pcs, c->cuid, c->block, 0, c->key, AUTH_FIRST, NULL, NULL) )
 		return 1;
 
-	uint8_t data[16] = {0x00};	
+	uint8_t data[16] = {0x00};
 	uint8_t res = mifare_classic_readblock(c->pcs, c->cuid, c->block, data);
-	
+
 	// successful read
 	if ( !res ) {
 		// data was something else than zeros.
@@ -1121,40 +1121,40 @@ uint8_t chkKey_readb(struct chk_t *c, uint8_t *keyb) {
 	return res;
 }
 
-void chkKey_scanA(struct chk_t *c, struct sector_t *k_sector, uint8_t *found, uint8_t *sectorcnt, uint8_t *foundkeys) { 
-	for (uint8_t s = 0; s < *sectorcnt; s++) { 
+void chkKey_scanA(struct chk_t *c, struct sector_t *k_sector, uint8_t *found, uint8_t *sectorcnt, uint8_t *foundkeys) {
+	for (uint8_t s = 0; s < *sectorcnt; s++) {
 
-		// skip already found A keys 
-		if ( found[(s*2)] ) 
+		// skip already found A keys
+		if ( found[(s*2)] )
 			continue;
 
 		c->block = FirstBlockOfSector( s );
-		if ( chkKey( c ) == 0 ) { 
+		if ( chkKey( c ) == 0 ) {
 			num_to_bytes(c->key, 6, k_sector[s].keyA);
-			found[(s*2)] = 1; 
-			++*foundkeys; 
-			
+			found[(s*2)] = 1;
+			++*foundkeys;
+
 			if (MF_DBGLEVEL >= 3) Dbprintf("ChkKeys_fast: Scan A found (%d)", c->block);
 		}
-	} 
+	}
 }
 
-void chkKey_scanB(struct chk_t *c, struct sector_t *k_sector, uint8_t *found, uint8_t *sectorcnt, uint8_t *foundkeys) { 
-	for (uint8_t s = 0; s < *sectorcnt; s++) { 
+void chkKey_scanB(struct chk_t *c, struct sector_t *k_sector, uint8_t *found, uint8_t *sectorcnt, uint8_t *foundkeys) {
+	for (uint8_t s = 0; s < *sectorcnt; s++) {
 
-		// skip already found B keys 
+		// skip already found B keys
 		if ( found[(s*2)+1] )
 			continue;
 
 		c->block = FirstBlockOfSector( s );
-		if ( chkKey( c ) == 0 ) { 
-			num_to_bytes(c->key, 6, k_sector[s].keyB);	
-			found[(s*2)+1] = 1; 
-			++*foundkeys; 
-			
+		if ( chkKey( c ) == 0 ) {
+			num_to_bytes(c->key, 6, k_sector[s].keyB);
+			found[(s*2)+1] = 1;
+			++*foundkeys;
+
 			if (MF_DBGLEVEL >= 3) Dbprintf("ChkKeys_fast: Scan B found (%d)", c->block);
 		}
-	} 
+	}
 }
 
 // loop all A keys,
@@ -1163,21 +1163,21 @@ void chkKey_loopBonly(struct chk_t *c, struct sector_t *k_sector, uint8_t *found
 
 	// read Block B, if A is found.
 	for (uint8_t s = 0; s < *sectorcnt; ++s) {
-		
+
 		if ( found[(s*2)] && found[(s*2)+1] )
 			continue;
-		
+
 		c->block = (FirstBlockOfSector( s ) + NumBlocksPerSector( s ) - 1);
 
 		// A but not B
-		if ( found[(s*2)]  &&  !found[(s*2)+1] ){	
+		if ( found[(s*2)]  &&  !found[(s*2)+1] ){
 			c->key = bytes_to_num(k_sector[s].keyA, 6);
 			uint8_t status = chkKey_readb(c, k_sector[s].keyB);
-			if ( status == 0 ){					
+			if ( status == 0 ){
 				found[(s*2)+1] = 1;
 				++*foundkeys;
 
-				if (MF_DBGLEVEL >= 3) Dbprintf("ChkKeys_fast: Reading B found (%d)", c->block);		
+				if (MF_DBGLEVEL >= 3) Dbprintf("ChkKeys_fast: Reading B found (%d)", c->block);
 
 				// try quick find all B?
 				// assume: keys comes in groups. Find one B, test against all B.
@@ -1199,10 +1199,10 @@ void chkKey_loopBonly(struct chk_t *c, struct sector_t *k_sector, uint8_t *found
 // datain = keys as array
 void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain) {
 
-	// first call or 
+	// first call or
 	uint8_t sectorcnt = arg0 & 0xFF; // 16;
-	uint8_t firstchunk = (arg0 >> 8) & 0xF;	
-	uint8_t lastchunk = (arg0 >> 12) & 0xF;	
+	uint8_t firstchunk = (arg0 >> 8) & 0xF;
+	uint8_t lastchunk = (arg0 >> 12) & 0xF;
 	uint8_t strategy = arg1 & 0xFF;
 	uint8_t use_flashmem = (arg1 >> 8) & 0xFF;
 	uint16_t keyCount = arg2 & 0xFF;
@@ -1212,7 +1212,7 @@ void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *da
 	struct Crypto1State *pcs;
 	pcs = &mpcs;
 	struct chk_t chk_data;
-	
+
 	uint8_t allkeys = sectorcnt << 1;
 
 	static uint32_t cuid = 0;
@@ -1222,20 +1222,20 @@ void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *da
 	static uint8_t found[80];
 	static uint8_t *uid;
 
-#ifdef WITH_FLASH	
+#ifdef WITH_FLASH
 	if ( use_flashmem ) {
 		BigBuf_free();
 		uint16_t isok = 0;
-		uint8_t size[2] = {0x00, 0x00};		
+		uint8_t size[2] = {0x00, 0x00};
 		isok = Flash_ReadData(DEFAULT_MF_KEYS_OFFSET, size, 2);
 		if ( isok != 2 )
 			goto OUT;
-		
+
 		keyCount = size[1] << 8 | size[0];
-		
-		if ( keyCount == 0 && keyCount == 0xFFFF) 
+
+		if ( keyCount == 0 && keyCount == 0xFFFF)
 			goto OUT;
-			
+
 		datain = BigBuf_malloc( keyCount * 6);
 		if (datain == NULL )
 			goto OUT;
@@ -1243,10 +1243,10 @@ void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *da
 		isok = Flash_ReadData(DEFAULT_MF_KEYS_OFFSET+2, datain, keyCount * 6);
 		if ( isok != keyCount * 6 )
 			goto OUT;
-		
+
 	}
 #endif
-		
+
 	if (uid == NULL || firstchunk) {
 		uid = BigBuf_malloc(10);
 		if (uid == NULL )
@@ -1254,31 +1254,31 @@ void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *da
 	}
 
 	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
-	
+
 	LEDsoff();
 	LED_A_ON();
-		
+
 	if ( firstchunk ) {
 		clear_trace();
 		set_tracing(false);
-		
+
 		memset(k_sector, 0x00, 480+10);
 		memset(found, 0x00, sizeof(found));
-		foundkeys = 0;		
-			
-		iso14a_card_select_t card_info;		
+		foundkeys = 0;
+
+		iso14a_card_select_t card_info;
 		if ( !iso14443a_select_card(uid, &card_info, &cuid, true, 0, true)) {
 			if (MF_DBGLEVEL >= 1) Dbprintf("ChkKeys_fast: Can't select card (ALL)");
 			goto OUT;
 		}
-		
+
 		switch (card_info.uidlen) {
 			case 4 : cascade_levels = 1; break;
 			case 7 : cascade_levels = 2; break;
 			case 10: cascade_levels = 3; break;
 			default: break;
 		}
-		
+
 		CHK_TIMEOUT();
 	}
 
@@ -1287,8 +1287,8 @@ void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *da
 	chk_data.cuid = cuid;
 	chk_data.cl = cascade_levels;
 	chk_data.pcs = pcs;
-	chk_data.block = 0;	
-	
+	chk_data.block = 0;
+
 	// keychunk loop - depth first one sector.
 	if ( strategy == 1 || use_flashmem) {
 
@@ -1304,9 +1304,9 @@ void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *da
 				continue;
 
 			for (uint16_t i = s_point; i < keyCount; ++i) {
-						
+
 				//if ( i % 100 == 0) Dbprintf("ChkKeys_fast: sector %d | checking %d | %d found | s_point %d", s, i, foundkeys, s_point);
-			
+
 				// Allow button press / usb cmd to interrupt device
 				if (BUTTON_PRESS() && !usb_poll_validate_length()) {
 					goto OUT;
@@ -1317,14 +1317,14 @@ void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *da
 					goto OUT;
 
 				WDT_HIT();
-			
+
 				// assume: block0,1,2 has more read rights in accessbits than the sectortrailer. authenticating against block0 in each sector
 				chk_data.block = FirstBlockOfSector( s );
 
 				// new key
 				chk_data.key = bytes_to_num(datain + i * 6, 6);
 
-				// skip already found A keys 
+				// skip already found A keys
 				if( !found[(s*2)] ) {
 					chk_data.keyType = 0;
 					status = chkKey( &chk_data);
@@ -1332,31 +1332,31 @@ void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *da
 						memcpy(k_sector[s].keyA, datain + i * 6, 6);
 						found[(s*2)] = 1;
 						++foundkeys;
-						
-						chkKey_scanA(&chk_data, k_sector, found, &sectorcnt, &foundkeys);				
-						
+
+						chkKey_scanA(&chk_data, k_sector, found, &sectorcnt, &foundkeys);
+
 						// read Block B, if A is found.
 						chkKey_loopBonly( &chk_data, k_sector, found, &sectorcnt, &foundkeys);
-						
+
 						chk_data.keyType = 1;
 						chkKey_scanB(&chk_data, k_sector, found, &sectorcnt, &foundkeys);
-						
-						chk_data.keyType = 0;						
+
+						chk_data.keyType = 0;
 						chk_data.block = FirstBlockOfSector( s );
-						
+
 						if ( use_flashmem ) {
-							if ( lastpos != i && lastpos != 0) {							
+							if ( lastpos != i && lastpos != 0) {
 								if ( i - lastpos < 0xF) {
 									s_point = i & 0xFFF0;
 								}
 							} else {
-								lastpos = i;	
+								lastpos = i;
 							}
 						}
 					}
 				}
-				
-				// skip already found B keys 
+
+				// skip already found B keys
 				if( !found[(s*2)+1] ) {
 					chk_data.keyType = 1;
 					status = chkKey( &chk_data);
@@ -1364,25 +1364,25 @@ void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *da
 						memcpy(k_sector[s].keyB, datain + i * 6, 6);
 						found[(s*2)+1] = 1;
 						++foundkeys;
-						
+
 						chkKey_scanB(&chk_data, k_sector, found, &sectorcnt, &foundkeys);
 
-						if ( use_flashmem ) {						
+						if ( use_flashmem ) {
 							if ( lastpos != i && lastpos != 0) {
-								
+
 								if ( i - lastpos < 0xF)
 									s_point = i & 0xFFF0;
 							} else {
-								lastpos = i;	
+								lastpos = i;
 							}
 						}
 					}
 				}
-				
+
 				if ( found[(s*2)] && found[(s*2)+1] )
 					break;
-				
-			} // end keys test loop - depth first 
+
+			} // end keys test loop - depth first
 
 			// assume1. if no keys found in first sector, get next keychunk from client
 			if ( !use_flashmem && (newfound-foundkeys == 0) )
@@ -1390,41 +1390,41 @@ void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *da
 
 		} // end loop - sector
 	} // end strategy 1
-	
-	if ( foundkeys == allkeys ) 
+
+	if ( foundkeys == allkeys )
 		goto OUT;
 
 	if ( strategy == 2 || use_flashmem ) {
-			
+
 		// Keychunk loop
 		for (uint16_t i = 0; i < keyCount; i++) {
-					
+
 			// Allow button press / usb cmd to interrupt device
 			if (BUTTON_PRESS() && !usb_poll_validate_length()) break;
 
 			// found all keys?
 			if ( foundkeys == allkeys )
 				goto OUT;
-				
+
 			WDT_HIT();
-		
+
 			// new key
 			chk_data.key = bytes_to_num(datain + i * 6, 6);
-		
+
 			// Sector main loop
 			// keep track of how many sectors on card.
 			for (uint8_t s = 0; s < sectorcnt; ++s) {
-				
+
 				if ( found[(s*2)] && found[(s*2)+1] ) continue;
-				
+
 				// found all keys?
 				if ( foundkeys == allkeys )
 					goto OUT;
 
 				// assume: block0,1,2 has more read rights in accessbits than the sectortrailer. authenticating against block0 in each sector
 				chk_data.block = FirstBlockOfSector( s );
-			
-				// skip already found A keys 
+
+				// skip already found A keys
 				if( !found[(s*2)] ) {
 					chk_data.keyType = 0;
 					status = chkKey( &chk_data);
@@ -1432,17 +1432,17 @@ void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *da
 						memcpy(k_sector[s].keyA, datain + i * 6, 6);
 						found[(s*2)] = 1;
 						++foundkeys;
-						
+
 						chkKey_scanA( &chk_data, k_sector, found, &sectorcnt, &foundkeys);
-						
+
 						// read Block B, if A is found.
 						chkKey_loopBonly( &chk_data, k_sector, found, &sectorcnt, &foundkeys);
 
 						chk_data.block = FirstBlockOfSector( s );
 					}
 				}
-				
-				// skip already found B keys 
+
+				// skip already found B keys
 				if( !found[(s*2)+1] ) {
 					chk_data.keyType = 1;
 					status = chkKey( &chk_data);
@@ -1450,12 +1450,12 @@ void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *da
 						memcpy(k_sector[s].keyB, datain + i * 6, 6);
 						found[(s*2)+1] = 1;
 						++foundkeys;
-						
+
 						chkKey_scanB(&chk_data, k_sector, found, &sectorcnt, &foundkeys);
 					}
 				}
-			} // end loop sectors		
-		} // end loop keys	
+			} // end loop sectors
+		} // end loop keys
 	} // end loop strategy 2
 OUT:
 	LEDsoff();
@@ -1475,16 +1475,16 @@ OUT:
 		for (uint8_t m=64; m < sizeof(found); m++) {
 			bar |= ((uint16_t)(found[m] & 1) << j++);
 		}
-	
+
 		uint8_t *tmp =  BigBuf_malloc(480+10);
 		memcpy(tmp, k_sector, sectorcnt * sizeof(sector_t) );
-		num_to_bytes(foo, 8, tmp+480);		
+		num_to_bytes(foo, 8, tmp+480);
 		tmp[488] = bar & 0xFF;
 		tmp[489] = bar >> 8 & 0xFF;
-		
+
 		cmd_send(CMD_ACK, foundkeys, 0, 0, tmp, 480+10);
 
-		set_tracing(false);		
+		set_tracing(false);
 		FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 		BigBuf_free(); BigBuf_Clear_ext(false);
 	} else {
@@ -1509,26 +1509,26 @@ void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) {
 	uint8_t blockNo = arg0 & 0xFF;
 	uint8_t keyType = (arg0 >> 8) & 0xFF;
 	uint8_t keyCount = arg2;
-	uint8_t cascade_levels = 0;	
+	uint8_t cascade_levels = 0;
 	uint8_t isOK = 0;
 	bool have_uid = false;
 	bool clearTrace = arg1 & 0xFF;
-	
+
 	LEDsoff();
 	LED_A_ON();
-	
+
 	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
 
-	if (clearTrace) 
+	if (clearTrace)
 		clear_trace();
-	
+
 	set_tracing(true);
-	
+
 	for (i = 0; i < keyCount; i++) {
 
 		// Iceman: use piwi's faster nonce collecting part in hardnested.
 		if (!have_uid) { // need a full select cycle to get the uid first
-			iso14a_card_select_t card_info;		
+			iso14a_card_select_t card_info;
 			if (!iso14443a_select_card(uid, &card_info, &cuid, true, 0, true)) {
 				if (MF_DBGLEVEL >= 1)	Dbprintf("ChkKeys: Can't select card (ALL)");
 				--i; // try same key once again
@@ -1540,7 +1540,7 @@ void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) {
 				case 10: cascade_levels = 3; break;
 				default: break;
 			}
-			have_uid = true;	
+			have_uid = true;
 		} else { // no need for anticollision. We can directly select the card
 			if (!iso14443a_select_card(uid, NULL, NULL, false, cascade_levels, true)) {
 				if (MF_DBGLEVEL >= 1)	Dbprintf("ChkKeys: Can't select card (UID)");
@@ -1548,7 +1548,7 @@ void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) {
 				continue;
 			}
 		}
-	
+
 		key = bytes_to_num(datain + i * 6, 6);
 		res = mifare_classic_auth(pcs, cuid, blockNo, keyType, key, AUTH_FIRST);
 
@@ -1560,20 +1560,20 @@ void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) {
 		isOK = 1;
 		break;
 	}
-	
+
 	LED_B_ON();
     cmd_send(CMD_ACK, isOK, 0, 0, datain + i * 6, 6);
 
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 	LEDsoff();
-	
+
 	set_tracing(false);
 	crypto1_destroy(pcs);
 }
 
 //-----------------------------------------------------------------------------
 // MIFARE commands set debug level
-// 
+//
 //-----------------------------------------------------------------------------
 void MifareSetDbgLvl(uint16_t arg0){
 	MF_DBGLEVEL = arg0;
@@ -1582,7 +1582,7 @@ void MifareSetDbgLvl(uint16_t arg0){
 
 //-----------------------------------------------------------------------------
 // Work with emulator memory
-// 
+//
 // Note: we call FpgaDownloadAndGo(FPGA_BITSTREAM_HF) here although FPGA is not
 // involved in dealing with emulator memory. But if it is called later, it might
 // destroy the Emulator Memory.
@@ -1611,7 +1611,7 @@ void MifareEMemGet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)
 
 //-----------------------------------------------------------------------------
 // Load a card into the emulator memory
-// 
+//
 //-----------------------------------------------------------------------------
 void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){
 	uint8_t numSectors = arg0;
@@ -1631,17 +1631,17 @@ void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
 	LED_B_OFF();
 	LED_C_OFF();
 	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
-	
+
 	clear_trace();
 	set_tracing(true);
-	
+
 	bool isOK = true;
 
 	if(!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
 		isOK = false;
 		if (MF_DBGLEVEL >= 1)	Dbprintf("Can't select card");
 	}
-		
+
 	for (uint8_t sectorNo = 0; isOK && sectorNo < numSectors; sectorNo++) {
 		ui64Key = emlGetKey(sectorNo, keyType);
 		if (sectorNo == 0){
@@ -1657,7 +1657,7 @@ void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
 				break;
 			}
 		}
-		
+
 		for (uint8_t blockNo = 0; isOK && blockNo < NumBlocksPerSector(sectorNo); blockNo++) {
 			if(isOK && mifare_classic_readblock(pcs, cuid, FirstBlockOfSector(sectorNo) + blockNo, dataoutbuf)) {
 				isOK = false;
@@ -1686,7 +1686,7 @@ void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
 
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 	LEDsoff();
-	
+
 	if (MF_DBGLEVEL >= 2) DbpString("EMUL FILL SECTORS FINISHED");
 
 	set_tracing(false);
@@ -1695,7 +1695,7 @@ void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
 
 //-----------------------------------------------------------------------------
 // Work with "magic Chinese" card (email him: ouyangweidaxian@live.cn)
-// 
+//
 // PARAMS - workFlags
 // bit 0 - need get UID
 // bit 1 - need wupC
@@ -1706,26 +1706,26 @@ void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
 // bit 6 - wipe tag.
 //-----------------------------------------------------------------------------
 // magic uid card generation 1 commands
-uint8_t wupC1[] = { MIFARE_MAGICWUPC1 }; 
-uint8_t wupC2[] = { MIFARE_MAGICWUPC2 }; 
-uint8_t wipeC[] = { MIFARE_MAGICWIPEC }; 
-	
+uint8_t wupC1[] = { MIFARE_MAGICWUPC1 };
+uint8_t wupC2[] = { MIFARE_MAGICWUPC2 };
+uint8_t wipeC[] = { MIFARE_MAGICWIPEC };
+
 void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){
-  
+
 	// params
 	uint8_t workFlags = arg0;
 	uint8_t blockNo = arg1;
 
 	// detect 1a/1b
 	bool is1b = false;
-	
+
 	// variables
 	bool isOK = false; //assume we will get an error
 	uint8_t errormsg = 0x00;
 	uint8_t uid[10] = {0x00};
 	uint8_t data[18] = {0x00};
 	uint32_t cuid = 0;
-	
+
 	uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};
 	uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0x00};
 
@@ -1748,7 +1748,7 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){
 			mifare_classic_halt_ex(NULL);
 			break;
 		}
-	
+
 		// wipe tag, fill it with zeros
 		if (workFlags & MAGIC_WIPE){
 			ReaderTransmitBitsPar(wupC1, 7, NULL, NULL);
@@ -1766,7 +1766,7 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){
 			}
 
 			mifare_classic_halt_ex(NULL);
-		}	
+		}
 
 		// write block
 		if (workFlags & MAGIC_WUPC) {
@@ -1792,24 +1792,24 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){
 			errormsg = 4;
 			break;
 		}
-	
+
 		memcpy(data, datain, 16);
 		AddCrc14A(data, 16);
-	
+
 		ReaderTransmit(data, sizeof(data), NULL);
 		if ((ReaderReceive(receivedAnswer, receivedAnswerPar) != 1) || (receivedAnswer[0] != 0x0a)) {
 			if (MF_DBGLEVEL >= MF_DBG_ERROR)	Dbprintf("write block send data error");
 			errormsg = 0;
 			break;
-		}	
-	
-		if (workFlags & MAGIC_HALT) 
+		}
+
+		if (workFlags & MAGIC_HALT)
 			mifare_classic_halt_ex(NULL);
-		
+
 		isOK = true;
 		break;
 
-	} // end while	
+	} // end while
 
 	if (isOK )
 		cmd_send(CMD_ACK,1,0,0,uid,sizeof(uid));
@@ -1821,26 +1821,26 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){
 }
 
 void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){
-    
+
 	uint8_t workFlags = arg0;
 	uint8_t blockNo = arg1;
 	uint8_t errormsg = 0x00;
 	bool isOK = false; //assume we will get an error
-	
+
 	// detect 1a/1b
 	bool is1b = false;
-	
+
 	// variables
 	uint8_t data[MAX_MIFARE_FRAME_SIZE];
 	uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};
 	uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0x00};
-	
+
 	memset(data, 0x00, sizeof(data));
-	
+
 	if (workFlags & MAGIC_INIT) {
 		LED_A_ON();
 		LED_B_OFF();
-		iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);	
+		iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
 		clear_trace();
 		set_tracing(true);
 	}
@@ -1861,19 +1861,19 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){
 					if (MF_DBGLEVEL >= MF_DBG_ALL) Dbprintf("Assuming Magic Gen 1B tag. [wupC2 failed]");
 					is1b = true;
 					continue;
-				}				
+				}
 			}
 		}
 
-		// read block		
+		// read block
 		if ((mifare_sendcmd_short(NULL, 0, ISO14443A_CMD_READBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL) != 18)) {
 			if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("read block send command error");
 			errormsg = 0;
 			break;
 		}
-		
+
 		memcpy(data, receivedAnswer, sizeof(data));
-		
+
 		// send HALT
 		if (workFlags & MAGIC_HALT)
 			mifare_classic_halt_ex(NULL);
@@ -1886,12 +1886,12 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){
 		if (isOK)
 			memcpy(datain, data, sizeof(data));
 	} else {
-		if (isOK) 
-			cmd_send(CMD_ACK,1,0,0,data,sizeof(data));	
-		else 
-			OnErrorMagic(errormsg);	
+		if (isOK)
+			cmd_send(CMD_ACK,1,0,0,data,sizeof(data));
+		else
+			OnErrorMagic(errormsg);
 	}
-	
+
 	if (workFlags & MAGIC_OFF)
 		OnSuccessMagic();
 }
@@ -1906,18 +1906,18 @@ void MifareCIdent(){
 	uint8_t recpar[1] = {0x00};
 
 	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
-			
+
 	// Generation 1 test
 	ReaderTransmitBitsPar(wupC1, 7, NULL, NULL);
 	if(!ReaderReceive(rec, recpar) || (rec[0] != 0x0a)) {
 		goto TEST2;
 	};
 	isGen = GEN_1B;
-	
+
 	ReaderTransmit(wupC2, sizeof(wupC2), NULL);
 	if(!ReaderReceive(rec, recpar) || (rec[0] != 0x0a)) {
 		goto OUT;
-	};	
+	};
 	isGen = GEN_1A;
 	goto OUT;
 
@@ -1927,17 +1927,17 @@ TEST2:;
 
 	// halt previous.
 	mifare_classic_halt(NULL, 0);
-	
+
 	//select
 	if (!iso14443a_select_card(NULL, NULL, NULL, true, 0, true)) {
 		goto OUT;
 	};
-	
+
 	// MIFARE_CLASSIC_WRITEBLOCK 0xA0
 	// ACK 0x0a
 	uint16_t len = mifare_sendcmd_short(null, 1, 0xA0, 0, rec, recpar, NULL);
-	if ((len != 1) || (rec[0] != 0x0A)) {   
-		isGen = GEN_2;	
+	if ((len != 1) || (rec[0] != 0x0A)) {
+		isGen = GEN_2;
 	};
 	*/
 OUT:;
@@ -1951,7 +1951,7 @@ OUT:;
 void OnSuccessMagic(){
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 	LEDsoff();
-	set_tracing(false);	
+	set_tracing(false);
 }
 void OnErrorMagic(uint8_t reason){
 	//          ACK, ISOK, reason,0,0,0
@@ -2023,7 +2023,7 @@ void Mifare_DES_Auth1(uint8_t arg0, uint8_t *datain){
 	byte_t dataout[12] = {0x00};
 	uint8_t uid[10] = {0x00};
 	uint32_t cuid = 0;
-    
+
 	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
 	clear_trace();
 	set_tracing(true);
@@ -2050,13 +2050,13 @@ void Mifare_DES_Auth2(uint32_t arg0, uint8_t *datain){
 	uint8_t key[16] = {0x00};
 	byte_t dataout[12] = {0x00};
 	byte_t isOK = 0;
-    
+
 	memcpy(key, datain, 16);
-	
+
 	isOK = mifare_desfire_des_auth2(cuid, key, dataout);
-	
+
 	if( isOK) {
-	    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Authentication part2: Failed");  
+	    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Authentication part2: Failed");
 		OnError(4);
 		return;
 	}
diff --git a/armsrc/mifaredesfire.c b/armsrc/mifaredesfire.c
index 81a29578b..4cafca16c 100644
--- a/armsrc/mifaredesfire.c
+++ b/armsrc/mifaredesfire.c
@@ -19,7 +19,7 @@ static  uint8_t deselect_cmd[] = {0xc2,0xe0,0xb4};
 bool InitDesfireCard(){
 
 	iso14a_card_select_t card;
-	
+
 	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
 	set_tracing(true);
 
@@ -41,7 +41,7 @@ enum  {
 } CmdOptions ;
 
 void MifareSendCommand(uint8_t arg0, uint8_t arg1, uint8_t *datain){
-	
+
 	/* ARG0 contains flags.
 		0x01 = init card.
 		0x02 = Disconnect
@@ -51,21 +51,21 @@ void MifareSendCommand(uint8_t arg0, uint8_t arg1, uint8_t *datain){
 	size_t datalen = arg1;
 	uint8_t resp[RECEIVE_SIZE];
 	memset(resp,0,sizeof(resp));
-	
+
 	if (MF_DBGLEVEL >= 4) {
 		Dbprintf(" flags : %02X", flags);
 		Dbprintf(" len   : %02X", datalen);
 		print_result(" RX    : ", datain, datalen);
 	}
-	
+
 	if ( flags & CLEARTRACE )
 		clear_trace();
-	
+
 	if ( flags & INIT ){
 		if ( !InitDesfireCard() )
 			return;
 	}
-	
+
 	int len = DesfireAPDU(datain, datalen, resp);
 	if (MF_DBGLEVEL >= 4)
 		print_result("ERR <--: ", resp, len);
@@ -74,31 +74,31 @@ void MifareSendCommand(uint8_t arg0, uint8_t arg1, uint8_t *datain){
 		OnError(2);
 		return;
 	}
-	
+
 	// reset the pcb_blocknum,
 	pcb_blocknum = 0;
-	
+
 	if ( flags & DISCONNECT )
 		OnSuccess();
-	
+
 	cmd_send(CMD_ACK,1,len,0,resp,len);
 }
 
 void MifareDesfireGetInformation(){
-		
+
 	int len = 0;
 	iso14a_card_select_t card;
 	uint8_t resp[USB_CMD_DATA_SIZE] = {0x00};
 	uint8_t dataout[USB_CMD_DATA_SIZE] = {0x00};
-	
+
 	/*
 		1 = PCB					1
 		2 = cid					2
-		3 = desfire command		3 
+		3 = desfire command		3
 		4-5 = crc				4  key
-								5-6 crc								
+								5-6 crc
 		PCB == 0x0A because sending CID byte.
-		CID == 0x00 first card?		
+		CID == 0x00 first card?
 	*/
 	clear_trace();
 	set_tracing(true);
@@ -110,42 +110,42 @@ void MifareDesfireGetInformation(){
 		OnError(1);
 		return;
 	}
-	
+
 	if ( card.uidlen != 7 ) {
 		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Wrong UID size. Expected 7byte got %d", card.uidlen);
 		OnError(2);
-		return;		
+		return;
 	}
-		
+
 	memcpy(dataout, card.uid, 7);
 
 	LED_A_ON();
 	LED_B_OFF();
 	LED_C_OFF();
-	
-	uint8_t cmd[] = {GET_VERSION};	
+
+	uint8_t cmd[] = {GET_VERSION};
 	size_t cmd_len = sizeof(cmd);
-	
+
 	len =  DesfireAPDU(cmd, cmd_len, resp);
 	if ( !len ) {
-		print_result("ERROR <--: ", resp, len);	
+		print_result("ERROR <--: ", resp, len);
 		OnError(3);
 		return;
 	}
-	
+
 	LED_A_OFF();
 	LED_B_ON();
 	memcpy(dataout+7,resp+3,7);
-	
+
 	// ADDITION_FRAME 1
 	cmd[0] = ADDITIONAL_FRAME;
 	len =  DesfireAPDU(cmd, cmd_len, resp);
 	if ( !len ) {
-		print_result("ERROR <--: ", resp, len);	
+		print_result("ERROR <--: ", resp, len);
 		OnError(3);
 		return;
-	}	
-	
+	}
+
 	LED_B_OFF();
 	LED_C_ON();
 	memcpy(dataout+7+7,resp+3,7);
@@ -153,15 +153,15 @@ void MifareDesfireGetInformation(){
 	// ADDITION_FRAME 2
 	len =  DesfireAPDU(cmd, cmd_len, resp);
 	if ( !len ) {
-		print_result("ERROR <--: ", resp, len);	
+		print_result("ERROR <--: ", resp, len);
 		OnError(3);
 		return;
 	}
-	
+
 	memcpy(dataout+7+7+7,resp+3,14);
-	
+
 	cmd_send(CMD_ACK,1,0,0,dataout,sizeof(dataout));
-		
+
 	// reset the pcb_blocknum,
 	pcb_blocknum = 0;
 	OnSuccess();
@@ -173,7 +173,7 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
 	//uint8_t PICC_MASTER_KEY8[8] = { 0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47};
 	uint8_t PICC_MASTER_KEY16[16] = { 0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4a,0x4b,0x4c,0x4d,0x4e,0x4f };
 	uint8_t null_key_data8[8] = {0x00};
-	//uint8_t null_key_data16[16] = {0x00};	
+	//uint8_t null_key_data16[16] = {0x00};
 	//uint8_t new_key_data8[8]  = { 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77};
 	//uint8_t new_key_data16[16]  = { 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x88,0x99,0xAA,0xBB,0xCC,0xDD,0xEE,0xFF};
 
@@ -181,7 +181,7 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
 	uint8_t IV[16] = {0x00};
 
 	size_t datalen = datain[0];
-	
+
 	uint8_t cmd[40] = {0x00};
 	uint8_t encRndB[16] = {0x00};
 	uint8_t decRndB[16] = {0x00};
@@ -190,22 +190,22 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
 	uint8_t encBoth[32] = {0x00};
 
 	InitDesfireCard();
-	
+
 	LED_A_ON();
 	LED_B_OFF();
 	LED_C_OFF();
-	
+
 	// 3 olika s�tt att authenticera.   AUTH (CRC16) , AUTH_ISO (CRC32) , AUTH_AES (CRC32)
 	// 4 olika crypto algo   DES, 3DES, 3K3DES, AES
 	// 3 olika kommunikations s�tt,   PLAIN,MAC,CRYPTO
-	
-	// des, nyckel 0, 
+
+	// des, nyckel 0,
 	switch (mode){
         case 1:{
             uint8_t keybytes[16];
             uint8_t RndA[8] = {0x00};
             uint8_t RndB[8] = {0x00};
-            
+
             if (algo == 2) {
             if (datain[1] == 0xff){
                     memcpy(keybytes,PICC_MASTER_KEY16,16);
@@ -221,15 +221,15 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
             }
                 }
             }
-            
+
             struct desfire_key defaultkey = {0};
             desfirekey_t key = &defaultkey;
-            
+
             if (algo == 2)
                 Desfire_3des_key_new_with_version(keybytes, key);
             else if (algo ==1)
             Desfire_des_key_new(keybytes, key);
-            
+
             cmd[0] = AUTHENTICATE;
             cmd[1] = keyno;  //keynumber
             len = DesfireAPDU(cmd, 2, resp);
@@ -240,50 +240,50 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
                 OnError(3);
                 return;
             }
-            
+
             if ( resp[2] == 0xaf ){
             } else {
                 DbpString("Authentication failed. Invalid key number.");
                 OnError(3);
                 return;
             }
-            
+
             memcpy( encRndB, resp+3, 8);
             if (algo == 2)
                 tdes_dec(&decRndB, &encRndB, key->data);
             else if (algo == 1)
             des_dec(&decRndB, &encRndB, key->data);
-            
+
             memcpy(RndB, decRndB, 8);
             rol(decRndB,8);
-            
+
             // This should be random
             uint8_t decRndA[8] = {0x00};
             memcpy(RndA, decRndA, 8);
             uint8_t encRndA[8] = {0x00};
-            
+
             if (algo == 2)
                 tdes_dec(&encRndA, &decRndA, key->data);
             else if (algo == 1)
             des_dec(&encRndA, &decRndA, key->data);
-            
+
             memcpy(both, encRndA, 8);
-            
+
             for (int x = 0; x < 8; x++) {
                 decRndB[x] = decRndB[x] ^ encRndA[x];
-                
+
             }
-            
+
             if (algo == 2)
                 tdes_dec(&encRndB, &decRndB, key->data);
             else if (algo == 1)
             des_dec(&encRndB, &decRndB, key->data);
-            
+
             memcpy(both + 8, encRndB, 8);
-            
+
             cmd[0] = ADDITIONAL_FRAME;
             memcpy(cmd+1, both, 16 );
-            
+
             len = DesfireAPDU(cmd, 17, resp);
             if ( !len ) {
                 if (MF_DBGLEVEL >= MF_DBG_ERROR) {
@@ -292,21 +292,21 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
                 OnError(3);
                 return;
             }
-            
+
             if ( resp[2] == 0x00 ){
-                
+
                 struct desfire_key sessionKey = {0};
                 desfirekey_t skey = &sessionKey;
                 Desfire_session_key_new( RndA, RndB , key, skey );
                 //print_result("SESSION : ", skey->data, 8);
-                
+
                 memcpy(encRndA, resp+3, 8);
-                
+
                 if (algo == 2)
                     tdes_dec(&encRndA, &encRndA, key->data);
                 else if (algo == 1)
                 des_dec(&encRndA, &encRndA, key->data);
-                
+
                 rol(decRndA,8);
                 for (int x = 0; x < 8; x++) {
                     if (decRndA[x] != encRndA[x]) {
@@ -315,86 +315,86 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
                         return;
                     }
                 }
-                
+
                 //Change the selected key to a new value.
                 /*
-                 
+
                  // Current key is a 3DES key, change it to a DES key
                  if (algo == 2) {
                 cmd[0] = CHANGE_KEY;
                 cmd[1] = keyno;
-                
+
                 uint8_t newKey[16] = {0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77};
-                
+
                 uint8_t first, second;
                 uint8_t buff1[8] = {0x00};
                 uint8_t buff2[8] = {0x00};
                 uint8_t buff3[8] = {0x00};
-                
+
                 memcpy(buff1,newKey, 8);
                 memcpy(buff2,newKey + 8, 8);
-                
+
                 compute_crc(CRC_14443_A, newKey, 16, &first, &second);
                 memcpy(buff3, &first, 1);
                 memcpy(buff3 + 1, &second, 1);
-                
+
                  tdes_dec(&buff1, &buff1, skey->data);
                  memcpy(cmd+2,buff1,8);
-                 
+
                  for (int x = 0; x < 8; x++) {
                  buff2[x] = buff2[x] ^ buff1[x];
                  }
                  tdes_dec(&buff2, &buff2, skey->data);
                  memcpy(cmd+10,buff2,8);
-                 
+
                  for (int x = 0; x < 8; x++) {
                  buff3[x] = buff3[x] ^ buff2[x];
                  }
                  tdes_dec(&buff3, &buff3, skey->data);
                  memcpy(cmd+18,buff3,8);
-                 
+
                  // The command always times out on the first attempt, this will retry until a response
                  // is recieved.
                  len = 0;
                  while(!len) {
                  len = DesfireAPDU(cmd,26,resp);
                  }
-                 
+
                  } else {
                     // Current key is a DES key, change it to a 3DES key
                     if (algo == 1) {
                         cmd[0] = CHANGE_KEY;
                         cmd[1] = keyno;
-                        
+
                         uint8_t newKey[16] = {0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4a,0x4b,0x4c,0x4d,0x4e,0x4f};
-                        
+
                         uint8_t first, second;
                         uint8_t buff1[8] = {0x00};
                         uint8_t buff2[8] = {0x00};
                         uint8_t buff3[8] = {0x00};
-                        
+
                         memcpy(buff1,newKey, 8);
                         memcpy(buff2,newKey + 8, 8);
-                        
+
                         compute_crc(CRC_14443_A, newKey, 16, &first, &second);
                         memcpy(buff3, &first, 1);
                         memcpy(buff3 + 1, &second, 1);
-                        
+
                 des_dec(&buff1, &buff1, skey->data);
                 memcpy(cmd+2,buff1,8);
-                
+
                 for (int x = 0; x < 8; x++) {
                     buff2[x] = buff2[x] ^ buff1[x];
                 }
                 des_dec(&buff2, &buff2, skey->data);
                 memcpy(cmd+10,buff2,8);
-                
+
                 for (int x = 0; x < 8; x++) {
                     buff3[x] = buff3[x] ^ buff2[x];
                 }
                 des_dec(&buff3, &buff3, skey->data);
                 memcpy(cmd+18,buff3,8);
-                
+
                 // The command always times out on the first attempt, this will retry until a response
                 // is recieved.
                 len = 0;
@@ -404,7 +404,7 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
                     }
                  }
                 */
-                
+
                 OnSuccess();
                 if (algo == 2)
                     cmd_send(CMD_ACK,1,0,0,skey->data,16);
@@ -421,19 +421,19 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
 			//SendDesfireCommand(AUTHENTICATE_ISO, &keyno, resp);
 			break;
 		case 3:{
-		
+
 			//defaultkey
 			uint8_t keybytes[16] = {0x00};
 			if (datain[1] == 0xff){
-				memcpy(keybytes,PICC_MASTER_KEY16,16); 
+				memcpy(keybytes,PICC_MASTER_KEY16,16);
 			} else{
 				memcpy(keybytes, datain+1, datalen);
 			}
-			
+
 			struct desfire_key defaultkey = {0x00};
 			desfirekey_t key = &defaultkey;
 			Desfire_aes_key_new( keybytes, key);
-		
+
 			AesCtx ctx;
 			if ( AesCtxIni(&ctx, IV, key->data, KEY128, CBC) < 0 ){
 				if( MF_DBGLEVEL >= 4) {
@@ -442,7 +442,7 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
 				OnError(7);
 				return;
 			}
-			
+
 			cmd[0] = AUTHENTICATE_AES;
 			cmd[1] = 0x00;  //keynumber
 			len = DesfireAPDU(cmd, 2, resp);
@@ -453,19 +453,19 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
 				OnError(3);
 				return;
 			}
-			
+
 			memcpy( encRndB, resp+3, 16);
-		
+
 			// dekryptera tagnonce.
 			AesDecrypt(&ctx, encRndB, decRndB, 16);
 			rol(decRndB,16);
 			memcpy(both, nonce,16);
 			memcpy(both+16, decRndB ,16 );
 			AesEncrypt(&ctx, both, encBoth, 32 );
-			
+
 			cmd[0] = ADDITIONAL_FRAME;
 			memcpy(cmd+1, encBoth, 32 );
-			
+
 			len = DesfireAPDU(cmd, 33, resp);  // 1 + 32 == 33
 			if ( !len ) {
 				if (MF_DBGLEVEL >= MF_DBG_ERROR) {
@@ -474,9 +474,9 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
                 OnError(3);
 				return;
 			}
-			
+
 			if ( resp[2] == 0x00 ){
-				// Create AES Session key		
+				// Create AES Session key
 				struct desfire_key sessionKey = {0};
 				desfirekey_t skey = &sessionKey;
 				Desfire_session_key_new( nonce, decRndB , key, skey );
@@ -486,11 +486,11 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
 				OnError(7);
 				return;
 			}
-			
+
 			break;
-		}	
+		}
 	}
-	
+
 	OnSuccess();
 	cmd_send(CMD_ACK,1,len,0,resp,len);
 }
@@ -506,11 +506,11 @@ int DesfireAPDU(uint8_t *cmd, size_t cmd_len, uint8_t *dataout){
 	uint8_t wCmd[USB_CMD_DATA_SIZE] = {0x00};
 	uint8_t resp[MAX_FRAME_SIZE];
     uint8_t par[MAX_PARITY_SIZE];
-	
+
 	wrappedLen = CreateAPDU( cmd, cmd_len, wCmd);
-	
+
 	if (MF_DBGLEVEL >= 4)
-		print_result("WCMD <--: ", wCmd, wrappedLen);	
+		print_result("WCMD <--: ", wCmd, wrappedLen);
 
 	ReaderTransmit( wCmd, wrappedLen, NULL);
 
@@ -526,30 +526,30 @@ int DesfireAPDU(uint8_t *cmd, size_t cmd_len, uint8_t *dataout){
 	             || (resp[0] & 0xD0) == 0x80) // R-Block with ACK bit set to 0
 	         && (resp[0] & 0x01) == pcb_blocknum) // equal block numbers
 	{
-		pcb_blocknum ^= 1;  //toggle next block 
+		pcb_blocknum ^= 1;  //toggle next block
 	}
 
 	memcpy(dataout, resp, len);
 	return len;
-}	
+}
 
 // CreateAPDU
 size_t CreateAPDU( uint8_t *datain, size_t len, uint8_t *dataout){
-	
+
 	size_t cmdlen = MIN(len+4, USB_CMD_DATA_SIZE-1);
 
 	uint8_t cmd[cmdlen];
 	memset(cmd, 0, cmdlen);
-	
+
 	cmd[0] = 0x0A;  //  0x0A = skicka cid,  0x02 = ingen cid. S�rskilda bitar //
-	cmd[0] |= pcb_blocknum; // OR the block number into the PCB	
+	cmd[0] |= pcb_blocknum; // OR the block number into the PCB
 	cmd[1] = 0x00;  //  CID: 0x00 //TODO: allow multiple selected cards
-	
+
 	memcpy(cmd+2, datain, len);
 	AddCrc14A(cmd, len+2);
-	
+
 	memcpy(dataout, cmd, cmdlen);
-	
+
 	return cmdlen;
 }
 
@@ -562,7 +562,7 @@ void OnSuccess(){
 	pcb_blocknum = 0;
 	ReaderTransmit(deselect_cmd, 3 , NULL);
 	mifare_ultra_halt();
-	switch_off(); 
+	switch_off();
 }
 
 void OnError(uint8_t reason){
diff --git a/armsrc/mifaresniff.c b/armsrc/mifaresniff.c
index e832c76cf..43e416086 100644
--- a/armsrc/mifaresniff.c
+++ b/armsrc/mifaresniff.c
@@ -19,8 +19,8 @@ static uint8_t sniffBuf[17];
 static uint32_t timerData = 0;
 
 //-----------------------------------------------------------------------------
-// MIFARE sniffer. 
-// 
+// MIFARE sniffer.
+//
 // if no activity for 2sec, it sends the collected data to the client.
 //-----------------------------------------------------------------------------
 // "hf mf sniff"
@@ -32,7 +32,7 @@ void RAMFUNC SniffMifare(uint8_t param) {
 	// C(red) A(yellow) B(green)
 	LEDsoff();
 	iso14443a_setup(FPGA_HF_ISO14443A_SNIFFER);
-	
+
 	// Allocate memory from BigBuf for some buffers
 	// free all previous allocations first
 	BigBuf_free(); BigBuf_Clear_ext(false);
@@ -40,7 +40,7 @@ void RAMFUNC SniffMifare(uint8_t param) {
 	set_tracing(true);
 
 	// The command (reader -> tag) that we're receiving.
-	uint8_t receivedCmd[MAX_MIFARE_FRAME_SIZE] = {0x00};	
+	uint8_t receivedCmd[MAX_MIFARE_FRAME_SIZE] = {0x00};
 	uint8_t receivedCmdPar[MAX_MIFARE_PARITY_SIZE] = {0x00};
 
 	// The response (tag -> reader) that we're receiving.
@@ -60,9 +60,9 @@ void RAMFUNC SniffMifare(uint8_t param) {
 	// a good trigger condition to get started is probably when we see a
 	// response from the tag.
 	// triggered == false -- to wait first for card
-	//bool triggered = !(param & 0x03); 
-	
-	
+	//bool triggered = !(param & 0x03);
+
+
 	// Set up the demodulator for tag -> reader responses.
 	DemodInit(receivedResp, receivedRespPar);
 
@@ -72,15 +72,15 @@ void RAMFUNC SniffMifare(uint8_t param) {
 	// Setup and start DMA.
 	// set transfer address and number of bytes. Start transfer.
 	if ( !FpgaSetupSscDma(dmaBuf, DMA_BUFFER_SIZE) ){
-		if (MF_DBGLEVEL > 1) Dbprintf("[!] FpgaSetupSscDma failed. Exiting"); 
+		if (MF_DBGLEVEL > 1) Dbprintf("[!] FpgaSetupSscDma failed. Exiting");
 		return;
 	}
 
 	tUart* uart = GetUart();
 	tDemod* demod = GetDemod();
-	
+
 	MfSniffInit();
-	
+
 	uint32_t sniffCounter = 0;
     // loop and listen
 	while (!BUTTON_PRESS()) {
@@ -93,7 +93,7 @@ void RAMFUNC SniffMifare(uint8_t param) {
 			if (BigBuf_get_traceLen()) {
 				MfSniffSend();
 				// Reset everything - we missed some sniffed data anyway while the DMA was stopped
-				sniffCounter = 0;				
+				sniffCounter = 0;
 				dmaBuf = BigBuf_malloc(DMA_BUFFER_SIZE);
 				data = dmaBuf;
 				maxDataLen = 0;
@@ -103,10 +103,10 @@ void RAMFUNC SniffMifare(uint8_t param) {
 			}
 		}
 		*/
-		
-		// number of bytes we have processed so far		
-		int register readBufDataP = data - dmaBuf;	
-		// number of bytes already transferred		
+
+		// number of bytes we have processed so far
+		int register readBufDataP = data - dmaBuf;
+		// number of bytes already transferred
 		int register dmaBufDataP = DMA_BUFFER_SIZE - AT91C_BASE_PDC_SSC->PDC_RCR;
 		if (readBufDataP <= dmaBufDataP)			// we are processing the same block of data which is currently being transferred
 			dataLen = dmaBufDataP - readBufDataP;	// number of bytes still to be processed
@@ -115,9 +115,9 @@ void RAMFUNC SniffMifare(uint8_t param) {
 
 		// test for length of buffer
 		if (dataLen > maxDataLen) {					// we are more behind than ever...
-			maxDataLen = dataLen;					
+			maxDataLen = dataLen;
 			if (dataLen > (9 * DMA_BUFFER_SIZE / 10)) {
-				Dbprintf("[!] blew circular buffer! | datalen %u", dataLen);		
+				Dbprintf("[!] blew circular buffer! | datalen %u", dataLen);
 				break;
 			}
 		}
@@ -141,7 +141,7 @@ void RAMFUNC SniffMifare(uint8_t param) {
 		if (sniffCounter & 0x01) {
 
 			// no need to try decoding tag data if the reader is sending
-			if (!TagIsActive) {		
+			if (!TagIsActive) {
 				uint8_t readerbyte = (previous_data & 0xF0) | (*data >> 4);
 				if (MillerDecoding(readerbyte, (sniffCounter-1)*4)) {
 					LogTrace(receivedCmd, uart->len, 0, 0, NULL, true);
@@ -150,9 +150,9 @@ void RAMFUNC SniffMifare(uint8_t param) {
 				}
 				ReaderIsActive = (uart->state != STATE_UNSYNCD);
 			}
-			
+
 			// no need to try decoding tag data if the reader is sending
-			if (!ReaderIsActive) {		
+			if (!ReaderIsActive) {
 				uint8_t tagbyte = (previous_data << 4) | (*data & 0x0F);
 				if (ManchesterDecoding(tagbyte, 0, (sniffCounter-1)*4)) {
 					LogTrace(receivedResp,  demod->len, 0, 0, NULL, false);
@@ -170,9 +170,9 @@ void RAMFUNC SniffMifare(uint8_t param) {
 			data = dmaBuf;
 
 	} // main cycle
-	
+
 	MfSniffEnd();
-	switch_off(); 
+	switch_off();
 }
 
 void MfSniffInit(void){
@@ -194,15 +194,15 @@ void MfSniffEnd(void){
 bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint8_t *parity, uint16_t bitCnt, bool reader) {
 
 	// reset on 7-Bit commands from reader
-	if (reader && (len == 1) && (bitCnt == 7)) { 		
+	if (reader && (len == 1) && (bitCnt == 7)) {
 		sniffState = SNF_INIT;
 	}
 
-	
-	
+
+
 	switch (sniffState) {
 		case SNF_INIT:{
-			// REQA,WUPA or MAGICWUP from reader			
+			// REQA,WUPA or MAGICWUP from reader
 			if ((len == 1) && (reader) && (bitCnt == 7) ) {
 				MfSniffInit();
 				sniffState = (data[0] == MIFARE_MAGICWUPC1) ? SNF_MAGIC_WUPC2 : SNF_ATQA;
@@ -210,7 +210,7 @@ bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint8_t *parity, ui
 			break;
 		}
 		case SNF_MAGIC_WUPC2: {
-			if ((len == 1) && (reader) && (data[0] == MIFARE_MAGICWUPC2) ) {  
+			if ((len == 1) && (reader) && (data[0] == MIFARE_MAGICWUPC2) ) {
 				sniffState = SNF_CARD_IDLE;
 			}
 			break;
@@ -225,14 +225,14 @@ bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint8_t *parity, ui
 			break;
 		}
 		case SNF_UID: {
-			
+
 			if ( !reader ) break;
 			if ( len != 9 ) break;
 			if ( !CheckCrc14443(CRC_14443_A, data, 9)) break;
 			if ( data[1] != 0x70 ) break;
-			
+
 			Dbprintf("[!] UID | %x", data[0]);
-			
+
 			if ((data[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT)) {
 				// UID_4 - select 4 Byte UID from reader
 				memcpy(sniffUID, data+2, 4);
@@ -248,7 +248,7 @@ bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint8_t *parity, ui
 				//new uid bytes
 				memcpy(sniffUID+3, data+2, 4);
 				sniffUIDType = SNF_UID_7;
-				sniffState = SNF_SAK;				
+				sniffState = SNF_SAK;
 			} else if ((data[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_3)) {
 				// UID_10 - Select 3nd part of 10 Byte UID
 				// 3+3+4 = 10.
@@ -279,7 +279,7 @@ bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint8_t *parity, ui
 				}
 			}
 			break;
-		}		
+		}
 		case SNF_CARD_IDLE:{	// trace the card select sequence
 			sniffBuf[0] = 0xFF;
 			sniffBuf[1] = 0xFF;
@@ -291,11 +291,11 @@ bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint8_t *parity, ui
 			LogTrace(sniffBuf, sizeof(sniffBuf), 0, 0, NULL, true);
 			sniffState = SNF_CARD_CMD;
 		}	// intentionally no break;
-		case SNF_CARD_CMD:{	
-			LogTrace(data, len, 0, 0, NULL, reader);	
+		case SNF_CARD_CMD:{
+			LogTrace(data, len, 0, 0, NULL, reader);
 			timerData = GetTickCount();
 			break;
-		}	
+		}
 		default:
 			sniffState = SNF_INIT;
 		break;
@@ -308,12 +308,12 @@ void RAMFUNC MfSniffSend() {
 	uint16_t tracelen = BigBuf_get_traceLen();
 	uint16_t chunksize = 0;
 	int packlen = tracelen;	// total number of bytes to send
-	uint8_t *data = BigBuf_get_addr();	
-	
+	uint8_t *data = BigBuf_get_addr();
+
 	while (packlen > 0) {
 		LED_B_ON();
 		chunksize = MIN(USB_CMD_DATA_SIZE, packlen); // chunk size 512
-		cmd_send(CMD_ACK, 1, tracelen, chunksize, data + tracelen - packlen, chunksize);		
+		cmd_send(CMD_ACK, 1, tracelen, chunksize, data + tracelen - packlen, chunksize);
 		packlen -= chunksize;
 		LED_B_OFF();
 	}
diff --git a/armsrc/mifareutil.c b/armsrc/mifareutil.c
index df85f6cbd..86048ae88 100644
--- a/armsrc/mifareutil.c
+++ b/armsrc/mifareutil.c
@@ -16,7 +16,7 @@ int MF_DBGLEVEL = MF_DBG_ERROR;
 void mf_crypto1_decryptEx(struct Crypto1State *pcs, uint8_t *data_in, int len, uint8_t *data_out){
 	uint8_t	bt = 0;
 	int i;
-	
+
 	if (len != 1) {
 		for (i = 0; i < len; i++)
 			data_out[i] = crypto1_byte(pcs, 0x00, 0) ^ data_in[i];
@@ -38,14 +38,14 @@ void mf_crypto1_encrypt(struct Crypto1State *pcs, uint8_t *data, uint16_t len, u
 	uint8_t bt = 0;
 	int i;
 	par[0] = 0;
-	
+
 	for (i = 0; i < len; i++) {
 		bt = data[i];
 		data[i] = crypto1_byte(pcs, 0x00, 0) ^ data[i];
-		if ( ( i & 0x0007 ) == 0) 
+		if ( ( i & 0x0007 ) == 0)
 			par[ i >> 3 ] = 0;
 		par[ i >> 3 ] |= (((filter(pcs->odd) ^ oddparity8(bt)) & 0x01)<<(7-(i&0x0007)));
-	}	
+	}
 }
 
 uint8_t mf_crypto1_encrypt4bit(struct Crypto1State *pcs, uint8_t data) {
@@ -80,22 +80,22 @@ int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd,
 	uint8_t par[1] = {0x00};			// 1 Byte parity is enough here
 	AddCrc14A(dcmd, 2);
 	memcpy(ecmd, dcmd, sizeof(dcmd));
-	
+
 	if (crypted) {
 		par[0] = 0;
 		for (pos = 0; pos < 4; pos++) {
 			ecmd[pos] = crypto1_byte(pcs, 0x00, 0) ^ dcmd[pos];
 			par[0] |= (((filter(pcs->odd) ^ oddparity8(dcmd[pos])) & 0x01) << (7-pos));
-		}	
+		}
 		ReaderTransmitPar(ecmd, sizeof(ecmd), par, timing);
 	} else {
 		ReaderTransmit(dcmd, sizeof(dcmd), timing);
 	}
 
 	int len = ReaderReceive(answer, par);
-	
+
 	if (answer_parity) *answer_parity = par[0];
-	
+
 	if (crypted == CRYPT_ALL) {
 		if (len == 1) {
 			res = 0;
@@ -103,7 +103,7 @@ int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd,
 			res |= (crypto1_bit(pcs, 0, 0) ^ BIT(answer[0], 1)) << 1;
 			res |= (crypto1_bit(pcs, 0, 0) ^ BIT(answer[0], 2)) << 2;
 			res |= (crypto1_bit(pcs, 0, 0) ^ BIT(answer[0], 3)) << 3;
-			answer[0] = res;			
+			answer[0] = res;
 		} else {
 			for (pos = 0; pos < len; pos++)
 				answer[pos] = crypto1_byte(pcs, 0x00, 0) ^ answer[pos];
@@ -118,7 +118,7 @@ int mifare_classic_auth(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo,
 }
 
 int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint8_t isNested, uint32_t *ntptr, uint32_t *timing) {
-	int len;	
+	int len;
 	uint32_t pos, nt, ntpp; // Supplied tag nonce
 	uint8_t par[1] = {0x00};
 	uint8_t nr[4];
@@ -128,11 +128,11 @@ int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockN
 
 	// "random" reader nonce:
 	num_to_bytes( prng_successor( GetTickCount(), 32), 4, nr);
-	
+
 	// Transmit MIFARE_CLASSIC_AUTH
 	len = mifare_sendcmd_short(pcs, isNested, 0x60 + (keyType & 0x01), blockNo, receivedAnswer, receivedAnswerPar, timing);
 	if (len != 4) return 1;
-	
+
 	// Save the tag nonce (nt)
 	nt = bytes_to_num(receivedAnswer, 4);
 
@@ -144,7 +144,7 @@ int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockN
 	crypto1_create(pcs, ui64Key);
 
 	if (isNested == AUTH_NESTED) {
-		// decrypt nt with help of new key 
+		// decrypt nt with help of new key
 		nt = crypto1_word(pcs, nt ^ uid, 1) ^ nt;
 	} else {
 		// Load (plain) uid^nt into the cipher
@@ -154,7 +154,7 @@ int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockN
 	// some statistic
 	if (!ntptr && (MF_DBGLEVEL >= MF_DBG_EXTENDED))
 		Dbprintf("auth uid: %08x | nr: %08x | nt: %08x", uid, nr, nt);
-	
+
 	// save Nt
 	if (ntptr)
 		*ntptr = nt;
@@ -164,8 +164,8 @@ int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockN
 	for (pos = 0; pos < 4; pos++) {
 		mf_nr_ar[pos] = crypto1_byte(pcs, nr[pos], 0) ^ nr[pos];
 		par[0] |= (((filter(pcs->odd) ^ oddparity8(nr[pos])) & 0x01) << (7-pos));
-	}	
-		
+	}
+
 	// Skip 32 bits in pseudo random generator
 	nt = prng_successor(nt, 32);
 
@@ -174,8 +174,8 @@ int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockN
 		nt = prng_successor(nt,8);
 		mf_nr_ar[pos] = crypto1_byte(pcs,0x00,0) ^ (nt & 0xff);
 		par[0] |= (((filter(pcs->odd) ^ oddparity8(nt & 0xff)) & 0x01) << (7-pos));
-	}	
-		
+	}
+
 	// Transmit reader nonce and reader answer
 	ReaderTransmitPar(mf_nr_ar, sizeof(mf_nr_ar), par, NULL);
 
@@ -197,28 +197,28 @@ int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockN
 
 int mifare_classic_readblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData) {
 
-	int len;	
-	uint8_t	bt[2] = {0x00, 0x00};	
+	int len;
+	uint8_t	bt[2] = {0x00, 0x00};
 	uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};
 	uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0x00};
-	
+
 	len = mifare_sendcmd_short(pcs, 1, ISO14443A_CMD_READBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL);
 	if (len == 1) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", receivedAnswer[0]);  
+		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", receivedAnswer[0]);
 		return 1;
 	}
 	if (len != 18) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: wrong response len: %x  (expected 18)", len);  
+		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: wrong response len: %x  (expected 18)", len);
 		return 2;
 	}
 
 	memcpy(bt, receivedAnswer + 16, 2);
 	AddCrc14A(receivedAnswer, 16);
 	if (bt[0] != receivedAnswer[16] || bt[1] != receivedAnswer[17]) {
-		if (MF_DBGLEVEL >= MF_DBG_ALL) Dbprintf("Cmd CRC response error.");  
+		if (MF_DBGLEVEL >= MF_DBG_ALL) Dbprintf("Cmd CRC response error.");
 		return 3;
 	}
-	
+
 	memcpy(blockData, receivedAnswer, 16);
 	return 0;
 }
@@ -234,7 +234,7 @@ int mifare_ul_ev1_auth(uint8_t *keybytes, uint8_t *pack){
 
 	if (MF_DBGLEVEL >= MF_DBG_EXTENDED)
 		Dbprintf("EV1 Auth : %02x%02x%02x%02x",	key[0], key[1], key[2], key[3]);
-	
+
 	len = mifare_sendcmd(MIFARE_ULEV1_AUTH, key, sizeof(key), resp, respPar, NULL);
 
 	if (len != 4) {
@@ -307,7 +307,7 @@ int mifare_ultra_auth(uint8_t *keybytes){
 	uint8_t resp_random_a[8] = { 0,0,0,0,0,0,0,0 };
 	memcpy(enc_resp, resp+1, 8);
 
-	// decrypt    out, in, length, key, iv 
+	// decrypt    out, in, length, key, iv
 	tdes_2key_dec(resp_random_a, enc_resp, 8, key, enc_random_b);
 	if ( memcmp(resp_random_a, random_a, 8) != 0 ) {
 		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("failed authentication");
@@ -315,7 +315,7 @@ int mifare_ultra_auth(uint8_t *keybytes){
 	}
 
 	if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
-		Dbprintf("e_AB: %02x %02x %02x %02x %02x %02x %02x %02x", 
+		Dbprintf("e_AB: %02x %02x %02x %02x %02x %02x %02x %02x",
 				rnd_ab[0],rnd_ab[1],rnd_ab[2],rnd_ab[3],
 				rnd_ab[4],rnd_ab[5],rnd_ab[6],rnd_ab[7]);
 
@@ -339,7 +339,7 @@ int mifare_ultra_readblockEx(uint8_t blockNo, uint8_t *blockData) {
 	uint8_t	bt[2] = {0x00, 0x00};
 	uint8_t receivedAnswer[MAX_FRAME_SIZE] = {0x00};
 	uint8_t receivedAnswerPar[MAX_PARITY_SIZE] = {0x00};
-	
+
 	len = mifare_sendcmd_short(NULL, 1, ISO14443A_CMD_READBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL);
 	if (len == 1) {
 		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", receivedAnswer[0]);
@@ -349,14 +349,14 @@ int mifare_ultra_readblockEx(uint8_t blockNo, uint8_t *blockData) {
 		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: card timeout. len: %x", len);
 		return 2;
 	}
-    
+
 	memcpy(bt, receivedAnswer + 16, 2);
 	AddCrc14A(receivedAnswer, 16);
 	if (bt[0] != receivedAnswer[16] || bt[1] != receivedAnswer[17]) {
 		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd CRC response error.");
 		return 3;
 	}
-	
+
 	memcpy(blockData, receivedAnswer, 14);
 	return 0;
 }
@@ -366,7 +366,7 @@ int mifare_ultra_readblock(uint8_t blockNo, uint8_t *blockData) {
 
 	for (uint8_t retries = 0; retries < MFU_MAX_RETRIES; ++retries) {
 		res = mifare_ultra_readblockEx(blockNo, blockData);
-		
+
 		// break if OK,  or NACK.
 		switch ( res ) {
 			case 0:
@@ -381,36 +381,36 @@ int mifare_ultra_readblock(uint8_t blockNo, uint8_t *blockData) {
 
 int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData) {
 	// variables
-	uint16_t len = 0;	
+	uint16_t len = 0;
 	uint32_t pos = 0;
 	uint8_t par[3] = {0x00, 0x00, 0x00}; // enough for 18 Bytes to send
 	byte_t res = 0;
-	
+
 	uint8_t d_block[18], d_block_enc[18];
 	uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};
 	uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0x00};
-	
+
 	// command MIFARE_CLASSIC_WRITEBLOCK
 	len = mifare_sendcmd_short(pcs, 1, ISO14443A_CMD_WRITEBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL);
 
 	if ((len != 1) || (receivedAnswer[0] != 0x0A)) {   //  0x0a - ACK
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", receivedAnswer[0]);  
+		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", receivedAnswer[0]);
 		return 1;
 	}
-	
+
 	memcpy(d_block, blockData, 16);
 	AddCrc14A(d_block, 16);
-	
+
 	// crypto
 	for (pos = 0; pos < 18; pos++) {
 		d_block_enc[pos] = crypto1_byte(pcs, 0x00, 0) ^ d_block[pos];
 		par[pos>>3] |= (((filter(pcs->odd) ^ oddparity8(d_block[pos])) & 0x01) << (7 - (pos&0x0007)));
-	}	
+	}
 
 	ReaderTransmitPar(d_block_enc, sizeof(d_block_enc), par, NULL);
 
 	// Receive the response
-	len = ReaderReceive(receivedAnswer, receivedAnswerPar);	
+	len = ReaderReceive(receivedAnswer, receivedAnswerPar);
 
 	res = 0;
 	res |= (crypto1_bit(pcs, 0, 0) ^ BIT(receivedAnswer[0], 0)) << 0;
@@ -419,7 +419,7 @@ int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t bl
 	res |= (crypto1_bit(pcs, 0, 0) ^ BIT(receivedAnswer[0], 3)) << 3;
 
 	if ((len != 1) || (res != 0x0A)) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd send data2 Error: %02x", res);  
+		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd send data2 Error: %02x", res);
 		return 2;
 	}
 	return 0;
@@ -511,7 +511,7 @@ uint8_t FirstBlockOfSector(uint8_t sectorNo) {
 		return sectorNo * 4;
 	else
 		return 32*4 + (sectorNo - 32) * 16;
-		
+
 }
 
 // work with emulator memory
@@ -544,7 +544,7 @@ int emlCheckValBl(int blockNum) {
 			(data[3] != (data[7] ^ 0xff)) || (data[3] != data[11]) ||
 			(data[12] != (data[13] ^ 0xff)) || (data[12] != data[14]) ||
 			(data[12] != (data[15] ^ 0xff))
-		 ) 
+		 )
 		return 1;
 	return 0;
 }
@@ -552,10 +552,10 @@ int emlCheckValBl(int blockNum) {
 int emlGetValBl(uint32_t *blReg, uint8_t *blBlock, int blockNum) {
 	uint8_t* emCARD = BigBuf_get_EM_addr();
 	uint8_t* data = emCARD + blockNum * 16;
-	
+
 	if (emlCheckValBl(blockNum))
 		return 1;
-	
+
 	memcpy(blReg, data, 4);
 	*blBlock = data[12];
 	return 0;
@@ -564,17 +564,17 @@ int emlGetValBl(uint32_t *blReg, uint8_t *blBlock, int blockNum) {
 int emlSetValBl(uint32_t blReg, uint8_t blBlock, int blockNum) {
 	uint8_t* emCARD = BigBuf_get_EM_addr();
 	uint8_t* data = emCARD + blockNum * 16;
-	
+
 	memcpy(data + 0, &blReg, 4);
 	memcpy(data + 8, &blReg, 4);
 	blReg = blReg ^ 0xffffffff;
 	memcpy(data + 4, &blReg, 4);
-	
+
 	data[12] = blBlock;
 	data[13] = blBlock ^ 0xff;
 	data[14] = blBlock;
 	data[15] = blBlock ^ 0xff;
-	
+
 	return 0;
 }
 
@@ -590,7 +590,7 @@ void emlClearMem(void) {
 	const uint8_t uid[]   =   {0xe6, 0x84, 0x87, 0xf3, 0x16, 0x88, 0x04, 0x00, 0x46, 0x8e, 0x45, 0x55, 0x4d, 0x70, 0x41, 0x04};
 	uint8_t* emCARD = BigBuf_get_EM_addr();
 	memset(emCARD, 0, CARD_MEMORY_SIZE);
-	
+
 	// fill sectors trailer data
 	for(uint16_t b = 3; b < 256; ((b < 127) ? (b += 4) : (b += 16)))
 		emlSetMem((uint8_t *)trailer, b, 1);
@@ -605,7 +605,7 @@ void emlClearMem(void) {
 int mifare_sendcmd_special(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t* data, uint8_t* answer, uint8_t *answer_parity, uint32_t *timing) {
     uint8_t dcmd[5] = {cmd, data[0], data[1], 0x00, 0x00};
 	AddCrc14A(dcmd, 3);
-	
+
 	ReaderTransmit(dcmd, sizeof(dcmd), NULL);
 	int len = ReaderReceive(answer, answer_parity);
 	if(!len) {
@@ -637,14 +637,14 @@ int mifare_desfire_des_auth1(uint32_t uid, uint8_t *blockData){
 	uint8_t data[2]={MFDES_AUTHENTICATE, 0x00};
 	uint8_t receivedAnswer[MAX_FRAME_SIZE] = {0x00};
 	uint8_t receivedAnswerPar[MAX_PARITY_SIZE] = {0x00};
-	
+
 	len = mifare_sendcmd_special(NULL, 1, 0x02, data, receivedAnswer,receivedAnswerPar,NULL);
 	if (len == 1) {
 		if (MF_DBGLEVEL >= MF_DBG_ERROR)
 			Dbprintf("Cmd Error: %02x", receivedAnswer[0]);
 		return 1;
 	}
-	
+
 	if (len == 12) {
 		if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	{
 			Dbprintf("Auth1 Resp: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
@@ -663,18 +663,18 @@ int mifare_desfire_des_auth2(uint32_t uid, uint8_t *key, uint8_t *blockData){
 	int len;
 	uint8_t data[17] = {MFDES_AUTHENTICATION_FRAME};
 	memcpy(data+1,key,16);
-	
+
 	uint8_t receivedAnswer[MAX_FRAME_SIZE] = {0x00};
 	uint8_t receivedAnswerPar[MAX_PARITY_SIZE] = {0x00};
-	
+
 	len = mifare_sendcmd_special2(NULL, 1, 0x03, data, receivedAnswer, receivedAnswerPar ,NULL);
-	
+
 	if ((receivedAnswer[0] == 0x03) && (receivedAnswer[1] == 0xae)) {
 		if (MF_DBGLEVEL >= MF_DBG_ERROR)
 			Dbprintf("Auth Error: %02x %02x", receivedAnswer[0], receivedAnswer[1]);
 		return 1;
 	}
-	
+
 	if (len == 12){
 		if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
 			Dbprintf("Auth2 Resp: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
diff --git a/armsrc/mifareutil.h b/armsrc/mifareutil.h
index 2406f9068..594b7ca80 100644
--- a/armsrc/mifareutil.h
+++ b/armsrc/mifareutil.h
@@ -27,7 +27,7 @@
 #define CRYPT_NONE    0
 #define CRYPT_ALL     1
 #define CRYPT_REQUEST 2
-#define AUTH_FIRST    0	
+#define AUTH_FIRST    0
 #define AUTH_NESTED   2
 
 #define AUTHENTICATION_TIMEOUT 848			// card times out 1ms after wrong authentication (according to NXP documentation)
@@ -65,7 +65,7 @@ int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd,
 int mifare_classic_auth(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint8_t isNested);
 int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint8_t isNested, uint32_t * ntptr, uint32_t *timing);
 int mifare_classic_readblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData);
-int mifare_classic_halt(struct Crypto1State *pcs, uint32_t uid); 
+int mifare_classic_halt(struct Crypto1State *pcs, uint32_t uid);
 int mifare_classic_halt_ex(struct Crypto1State *pcs);
 int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData);
 
diff --git a/armsrc/optimized_cipher.c b/armsrc/optimized_cipher.c
index 223d73fea..98ab88041 100644
--- a/armsrc/optimized_cipher.c
+++ b/armsrc/optimized_cipher.c
@@ -1,13 +1,13 @@
 /*****************************************************************************
  * WARNING
  *
- * THIS CODE IS CREATED FOR EXPERIMENTATION AND EDUCATIONAL USE ONLY. 
- * 
- * USAGE OF THIS CODE IN OTHER WAYS MAY INFRINGE UPON THE INTELLECTUAL 
- * PROPERTY OF OTHER PARTIES, SUCH AS INSIDE SECURE AND HID GLOBAL, 
- * AND MAY EXPOSE YOU TO AN INFRINGEMENT ACTION FROM THOSE PARTIES. 
- * 
- * THIS CODE SHOULD NEVER BE USED TO INFRINGE PATENTS OR INTELLECTUAL PROPERTY RIGHTS. 
+ * THIS CODE IS CREATED FOR EXPERIMENTATION AND EDUCATIONAL USE ONLY.
+ *
+ * USAGE OF THIS CODE IN OTHER WAYS MAY INFRINGE UPON THE INTELLECTUAL
+ * PROPERTY OF OTHER PARTIES, SUCH AS INSIDE SECURE AND HID GLOBAL,
+ * AND MAY EXPOSE YOU TO AN INFRINGEMENT ACTION FROM THOSE PARTIES.
+ *
+ * THIS CODE SHOULD NEVER BE USED TO INFRINGE PATENTS OR INTELLECTUAL PROPERTY RIGHTS.
  *
  *****************************************************************************
  *
@@ -22,7 +22,7 @@
  *
  * This is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation, or, at your option, any later version. 
+ * by the Free Software Foundation, or, at your option, any later version.
  *
  * This file is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -31,9 +31,9 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with loclass.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
- * 
+ *
+ *
+ *
  ****************************************************************************/
 
 /**
@@ -138,7 +138,7 @@ void opt_suc(const uint8_t* k,State* s, uint8_t *in, uint8_t length, bool add32Z
 		head = 1 & in[i];
 		opt_successor(k, &x2, head, s);
 	}
-	
+
 	//For tag MAC, an additional 32 zeroes
 	if (add32Zeroes) {
 		for (i = 0; i < 16; i++) {
diff --git a/armsrc/pcf7931.c b/armsrc/pcf7931.c
index c9a76bb3b..4c8259ea5 100644
--- a/armsrc/pcf7931.c
+++ b/armsrc/pcf7931.c
@@ -7,11 +7,11 @@ size_t DemodPCF7931(uint8_t **outBlocks) {
     uint8_t bits[256] = {0x00};
 	uint8_t blocks[8][16];
     uint8_t *dest = BigBuf_get_addr();
-    
+
 	int GraphTraceLen = BigBuf_max_traceLen();
 	if (  GraphTraceLen > 18000 )
 		GraphTraceLen = 18000;
-		
+
 	int i, j, lastval, bitidx, half_switch;
 	int clock = 64;
 	int tolerance = clock / 8;
@@ -155,38 +155,38 @@ bool IsBlock1PCF7931(uint8_t *block) {
 
 void ReadPCF7931() {
 	int found_blocks = 0; // successfully read blocks
-	int max_blocks = 8;	// readable blocks	
+	int max_blocks = 8;	// readable blocks
 	uint8_t memory_blocks[8][17]; // PCF content
-	
+
 	uint8_t single_blocks[8][17]; // PFC blocks with unknown position
 	int single_blocks_cnt = 0;
 
-	size_t n = 0; // transmitted blocks	
+	size_t n = 0; // transmitted blocks
 	uint8_t tmp_blocks[4][16]; // temporary read buffer
-	
+
 	uint8_t found_0_1 = 0; // flag: blocks 0 and 1 were found
 	int errors = 0; // error counter
 	int tries = 0; // tries counter
-	
+
 	memset(memory_blocks, 0, 8*17*sizeof(uint8_t));
 	memset(single_blocks, 0, 8*17*sizeof(uint8_t));
-	
+
 	int i = 0, j = 0;
 
 	do {
 		i = 0;
-		
+
 		memset(tmp_blocks, 0, 4*16*sizeof(uint8_t));
 		n = DemodPCF7931((uint8_t**)tmp_blocks);
 		if(!n)
 			++errors;
-		
-		// exit if no block is received 
+
+		// exit if no block is received
 		if (errors >= 10 && found_blocks == 0 && single_blocks_cnt == 0) {
 			Dbprintf("Error, no tag or bad tag");
 			return;
 		}
-		// exit if too many errors during reading 
+		// exit if too many errors during reading
 		if (tries > 50 && (2*errors > tries)) {
 			Dbprintf("Error reading the tag");
 			Dbprintf("Here is the partial content");
@@ -214,11 +214,11 @@ void ReadPCF7931() {
 			++tries;
 			continue;
 	 	}
-	 	
+
 	 	Dbprintf("(dbg) got %d blocks (%d/%d found) (%d tries, %d errors)", n, found_blocks, (max_blocks == 0 ? found_blocks : max_blocks), tries, errors);
 
 		i = 0;
-		if(!found_0_1) {			
+		if(!found_0_1) {
 			while (i < n - 1) {
 				if (IsBlock0PCF7931(tmp_blocks[i]) && IsBlock1PCF7931(tmp_blocks[i+1])) {
 					found_0_1 = 1;
@@ -228,9 +228,9 @@ void ReadPCF7931() {
 					// block 1 tells how many blocks are going to be sent
 					max_blocks = MAX((memory_blocks[1][14] & 0x7f), memory_blocks[1][15]) + 1;
 					found_blocks = 2;
-					
+
 					Dbprintf("Found blocks 0 and 1. PCF is transmitting %d blocks.", max_blocks);
-					
+
 					// handle the following blocks
 					for (j = i + 2; j < n; ++j) {
 						memcpy(memory_blocks[found_blocks], tmp_blocks[j], 16);
@@ -298,7 +298,7 @@ void ReadPCF7931() {
 		Dbprintf("-----------------------------------------");
 		for (i = 0; i < single_blocks_cnt; ++i)
 			print_result("Block", single_blocks[i], 16);
-		
+
 		Dbprintf("-----------------------------------------");
 	}
 	cmd_send(CMD_ACK,0,0,0,0,0);
@@ -354,7 +354,7 @@ static void RealWritePCF7931(uint8_t *pass, uint16_t init_delay, int32_t l, int3
 		if (data&(1<<u)) {	// bit 1
 			 parity++;
 			 AddBitPCF7931(1, tab, l, p);
-		} 
+		}
 		else				//bit 0
 			 AddBitPCF7931(0, tab, l, p);
 		}
@@ -397,9 +397,9 @@ void WritePCF7931(uint8_t pass1, uint8_t pass2, uint8_t pass3, uint8_t pass4, ui
 	Dbprintf("Block address : %02x", address);
 	Dbprintf("Byte address : %02x", byte);
 	Dbprintf("Data : %02x", data);
-	
+
 	uint8_t password[7] = {pass1, pass2, pass3, pass4, pass5, pass6, pass7};
-	
+
 	RealWritePCF7931 (password, init_delay, l, p, address, byte, data);
 }
 
@@ -416,7 +416,7 @@ void SendCmdPCF7931(uint32_t * tab){
 	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
 	FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_PASSTHRU );
-	
+
 	LED_A_ON();
 
 	// steal this pin from the SSP and use it to control the modulation
@@ -458,7 +458,7 @@ void SendCmdPCF7931(uint32_t * tab){
 }
 
 
-/* Add a byte for building the data frame of PCF7931 tags 
+/* Add a byte for building the data frame of PCF7931 tags
  * @param b : byte to add
  * @param tab : array of the data frame
  * @param l : offset on low pulse width
@@ -477,7 +477,7 @@ bool AddBytePCF7931(uint8_t byte, uint32_t * tab, int32_t l, int32_t p){
 	return 0;
 }
 
-/* Add a bits for building the data frame of PCF7931 tags 
+/* Add a bits for building the data frame of PCF7931 tags
  * @param b : bit to add
  * @param tab : array of the data frame
  * @param l : offset on low pulse width
@@ -487,10 +487,10 @@ bool AddBitPCF7931(bool b, uint32_t * tab, int32_t l, int32_t p){
 	uint8_t u = 0;
 
 	//we put the cursor at the last value of the array
-	for ( u = 0; tab[u] != 0; u += 3 ) { } 
-	
+	for ( u = 0; tab[u] != 0; u += 3 ) { }
+
 	if ( b == 1 ) {	//add a bit 1
-		if ( u == 0 ) 
+		if ( u == 0 )
 			tab[u] = 34 * T0_PCF + p;
 		else
 			tab[u] = 34 * T0_PCF + tab[u-1] + p;
diff --git a/armsrc/start.c b/armsrc/start.c
index d2e4ed4c4..5d55f24e0 100644
--- a/armsrc/start.c
+++ b/armsrc/start.c
@@ -24,7 +24,7 @@ extern char __data_src_start__, __data_start__, __data_end__, __bss_start__, __b
 static voidpf inflate_malloc(voidpf opaque, uInt items, uInt size)
 {
 	uint8_t *allocated_memory;
-	
+
 	allocated_memory = next_free_memory;
 	next_free_memory += items*size;
 	return allocated_memory;
@@ -40,7 +40,7 @@ static void uncompress_data_section(void)
 	z_stream data_section;
 
 	next_free_memory = BigBuf_get_addr();
-	
+
 	// initialize zstream structure
 	data_section.next_in = (uint8_t *) &__data_src_start__;
 	data_section.avail_in = &__data_end__ - &__data_start__;  // uncompressed size. Wrong but doesn't matter.
@@ -55,7 +55,7 @@ static void uncompress_data_section(void)
 
 	// uncompress data segment to RAM
 	inflate(&data_section, Z_FINISH);
-	
+
 	// save the size of the compressed data section
 	common_area.arg1 = data_section.total_in;
 }
@@ -65,7 +65,7 @@ void __attribute__((section(".startos"))) Vector(void)
 	/* Stack should have been set up by the bootloader */
 	// char *src;
 	char *dst, *end;
-	
+
 	uncompress_data_section();
 
 	/* Set up (that is: clear) BSS. */
diff --git a/armsrc/ticks.c b/armsrc/ticks.c
index 0a1796896..cfa36d12f 100644
--- a/armsrc/ticks.c
+++ b/armsrc/ticks.c
@@ -16,7 +16,7 @@ void SpinDelayUs(int us) {
 
 	// Borrow a PWM unit for my real-time clock
 	AT91C_BASE_PWMC->PWMC_ENA = PWM_CHANNEL(0);
-	
+
 	// 48 MHz / 1024 gives 46.875 kHz
 	AT91C_BASE_PWMC_CH0->PWMC_CMR = PWM_CH_MODE_PRESCALER(10);		// Channel Mode Register
 	AT91C_BASE_PWMC_CH0->PWMC_CDTYR = 0;							// Channel Duty Cycle Register
@@ -63,7 +63,7 @@ uint32_t RAMFUNC GetTickCount(void){
 }
 
 //  -------------------------------------------------------------------------
-//  microseconds timer 
+//  microseconds timer
 //  -------------------------------------------------------------------------
 void StartCountUS(void) {
 	AT91C_BASE_PMC->PMC_PCER |= (1 << AT91C_ID_TC0) | (1 << AT91C_ID_TC1);
@@ -72,19 +72,19 @@ void StartCountUS(void) {
 	// fast clock
 	// tick=1.5mks
 	AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS; // timer disable
-	AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV3_CLOCK | // MCK(48MHz) / 32 
+	AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV3_CLOCK | // MCK(48MHz) / 32
 								AT91C_TC_WAVE | AT91C_TC_WAVESEL_UP_AUTO | AT91C_TC_ACPA_CLEAR |
 								AT91C_TC_ACPC_SET | AT91C_TC_ASWTRG_SET;
 	AT91C_BASE_TC0->TC_RA = 1;
 	AT91C_BASE_TC0->TC_RC = 0xBFFF + 1; // 0xC000
-	
-	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS; // timer disable  
+
+	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS; // timer disable
 	AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_XC1; // from timer 0
-	
+
 	AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 	AT91C_BASE_TCB->TCB_BCR = 1;
-	
+
 	while (AT91C_BASE_TC1->TC_CV > 0);
 }
 
@@ -95,7 +95,7 @@ uint32_t RAMFUNC GetCountUS(void){
 }
 
 //  -------------------------------------------------------------------------
-//  Timer for iso14443 commands. Uses ssp_clk from FPGA 
+//  Timer for iso14443 commands. Uses ssp_clk from FPGA
 //  -------------------------------------------------------------------------
 void StartCountSspClk(void) {
 	AT91C_BASE_PMC->PMC_PCER |= (1 << AT91C_ID_TC0) | (1 << AT91C_ID_TC1) | (1 << AT91C_ID_TC2);  // Enable Clock to all timers
@@ -127,7 +127,7 @@ void StartCountSspClk(void) {
 	AT91C_BASE_TC0->TC_RC = 0; 								// RC Compare value = 0; increment TC2 on overflow
 
 	// use TC2 to count TIOA0 pulses (giving us a 32bit counter (TC0/TC2) clocked by ssp_clk)
-	AT91C_BASE_TC2->TC_CCR = AT91C_TC_CLKDIS; 				// disable TC2  
+	AT91C_BASE_TC2->TC_CCR = AT91C_TC_CLKDIS; 				// disable TC2
 	AT91C_BASE_TC2->TC_CMR = AT91C_TC_CLKS_XC2	 			// TC2 clock = XC2 clock = TIOA0
 							| AT91C_TC_WAVE 				// Waveform Mode
 							| AT91C_TC_WAVESEL_UP;	 		// just count
@@ -136,8 +136,8 @@ void StartCountSspClk(void) {
 	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;				// enable and reset TC1
 	AT91C_BASE_TC2->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;				// enable and reset TC2
 
-	// synchronize the counter with the ssp_frame signal. 
-	// Note: FPGA must be in any iso14443 mode, otherwise the frame signal would not be present 
+	// synchronize the counter with the ssp_frame signal.
+	// Note: FPGA must be in any iso14443 mode, otherwise the frame signal would not be present
 	while(!(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_FRAME)); 	// wait for ssp_frame to go high (start of frame)
 	while(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_FRAME); 		// wait for ssp_frame to be low
 	while(!(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_CLK)); 	// wait for ssp_clk to go high
@@ -150,16 +150,16 @@ void StartCountSspClk(void) {
 	// whenever the last three bits of our counter go 0, we can be sure to be in the middle of a frame transfer.
 	// (just started with the transfer of the 4th Bit).
 
-	// The high word of the counter (TC2) will not reset until the low word (TC0) overflows. 
+	// The high word of the counter (TC2) will not reset until the low word (TC0) overflows.
 	// Therefore need to wait quite some time before we can use the counter.
 	while (AT91C_BASE_TC2->TC_CV > 0);
 }
-void ResetSspClk(void) {	
+void ResetSspClk(void) {
 	//enable clock of timer and software trigger
 	AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 	AT91C_BASE_TC2->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
-	while (AT91C_BASE_TC2->TC_CV > 0);	
+	while (AT91C_BASE_TC2->TC_CV > 0);
 }
 uint32_t RAMFUNC GetCountSspClk(void) {
 	uint32_t tmp_count = (AT91C_BASE_TC2->TC_CV << 16) | AT91C_BASE_TC0->TC_CV;
@@ -186,7 +186,7 @@ void StartTicks(void){
 	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG; // re-enable timer and wait for TC0
 
 	// second configure TC0 (lower, 0x0000FFFF) 16 bit counter
-	AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV3_CLOCK | // MCK(48MHz) / 32 
+	AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV3_CLOCK | // MCK(48MHz) / 32
 	                         AT91C_TC_WAVE | AT91C_TC_WAVESEL_UP_AUTO |
 	                         AT91C_TC_ACPA_CLEAR | // RA comperator clears TIOA (carry bit)
 	                         AT91C_TC_ACPC_SET |   // RC comperator sets TIOA (carry bit)
@@ -224,7 +224,7 @@ void WaitTicks(uint32_t ticks){
 	while (GetTicks() < ticks);
 }
 
-// Wait / Spindelay in us (microseconds) 
+// Wait / Spindelay in us (microseconds)
 // 1us = 1.5ticks.
 void WaitUS(uint16_t us){
 	WaitTicks( (uint32_t)us * 3/2 );
@@ -236,5 +236,5 @@ void WaitMS(uint16_t ms){
 // stop clock
 void StopTicks(void){
 	AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
-	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;	
+	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 }
diff --git a/armsrc/util.c b/armsrc/util.c
index 77ef3a494..04cf1fc33 100644
--- a/armsrc/util.c
+++ b/armsrc/util.c
@@ -15,7 +15,7 @@ size_t nbytes(size_t nbits) {
 
 /*
  ref  http://www.csm.ornl.gov/~dunigan/crc.html
- Returns the value v with the bottom b [0,32] bits reflected. 
+ Returns the value v with the bottom b [0,32] bits reflected.
  Example: reflect(0x3e23L,3) == 0x3e26
 */
 uint32_t reflect(uint32_t v, int b) {
@@ -35,7 +35,7 @@ uint8_t reflect8(uint8_t b) {
 }
 uint16_t reflect16(uint16_t b) {
     uint16_t v = 0;
-    v |= (b & 0x8000) >> 15; 
+    v |= (b & 0x8000) >> 15;
     v |= (b & 0x4000) >> 13;
     v |= (b & 0x2000) >> 11;
     v |= (b & 0x1000) >> 9;
@@ -165,7 +165,7 @@ void SpinOff(uint32_t pause) {
 // 0=A, 1=B, 2=C, 3=D
 void SpinErr(uint8_t led, uint32_t speed, uint8_t times) {
     SpinOff(speed);
-    NTIME(times) 
+    NTIME(times)
 	{
         switch (led) {
         case 0:
diff --git a/bootrom/bootrom.c b/bootrom/bootrom.c
index d2a18628a..c037da122 100644
--- a/bootrom/bootrom.c
+++ b/bootrom/bootrom.c
@@ -19,7 +19,7 @@ void DbpString(char *str) {
 	byte_t len = 0;
 	while (str[len] != 0x00)
 		len++;
-	
+
 	cmd_send(CMD_DEBUG_PRINT_STRING, len, 0, 0, (byte_t*)str, len);
 }
 
@@ -90,9 +90,9 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 	volatile uint32_t *p;
 
 	//if ( len != sizeof(UsbCommand)) Fatal();
-  
+
 	uint32_t arg0 = (uint32_t)c->arg[0];
-  
+
 	switch(c->cmd) {
 		case CMD_DEVICE_INFO: {
 			dont_ack = 1;
@@ -100,10 +100,10 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 			DEVICE_INFO_FLAG_UNDERSTANDS_START_FLASH;
 			if(common_area.flags.osimage_present)
 				arg0 |= DEVICE_INFO_FLAG_OSIMAGE_PRESENT;
-		
+
 			cmd_send(CMD_DEVICE_INFO,arg0,1,2,0,0);
 		} break;
-      
+
 		case CMD_SETUP_WRITE: {
 			/* The temporary write buffer of the embedded flash controller is mapped to the
 			* whole memory region, only the last 8 bits are decoded.
@@ -112,16 +112,16 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 			for(i = 0; i < 12; i++)
 				p[i+arg0] = c->d.asDwords[i];
 		} break;
-      
+
 		case CMD_FINISH_WRITE: {
 			uint32_t* flash_mem = (uint32_t*)(&_flash_start);
 			for ( int j=0; j<2; j++) {
 				for(i = 0+(64*j); i < 64+(64*j); i++) {
 					flash_mem[i] = c->d.asDwords[i];
 				}
-        
+
 				uint32_t flash_address = arg0 + (0x100*j);
-        
+
 				/* Check that the address that we are supposed to write to is within our allowed region */
 				if( ((flash_address + AT91C_IFLASH_PAGE_SIZE - 1) >= end_addr) || (flash_address < start_addr) ) {
 					/* Disallow write */
@@ -134,7 +134,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 					MC_FLASH_COMMAND_PAGEN(page_n) |
 					AT91C_MC_FCMD_START_PROG;
 				}
-        
+
 				// Wait until flashing of page finishes
 				uint32_t sr;
 				while(!((sr = AT91C_BASE_EFC0->EFC_FSR) & AT91C_MC_FRDY));
@@ -144,18 +144,18 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 				}
 			}
 		} break;
-      
+
 		case CMD_HARDWARE_RESET: {
 			usb_disable();
 			AT91C_BASE_RSTC->RSTC_RCR = RST_CONTROL_KEY | AT91C_RSTC_PROCRST;
 		} break;
-      
+
 		case CMD_START_FLASH: {
-			if (c->arg[2] == START_FLASH_MAGIC) 
+			if (c->arg[2] == START_FLASH_MAGIC)
 				bootrom_unlocked = 1;
-			else 
+			else
 				bootrom_unlocked = 0;
-		
+
 			int prot_start = (int)&_bootrom_start;
 			int prot_end = (int)&_bootrom_end;
 			int allow_start = (int)&_flash_start;
@@ -167,7 +167,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 			* bootrom area. In any case they must be within the flash area.
 			*/
 			if( (bootrom_unlocked || ((cmd_start >= prot_end) || (cmd_end < prot_start))) &&
-				(cmd_start >= allow_start) && 
+				(cmd_start >= allow_start) &&
 				(cmd_end <= allow_end) ) {
 				start_addr = cmd_start;
 				end_addr = cmd_end;
@@ -177,12 +177,12 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 				cmd_send(CMD_NACK,0,0,0,0,0);
 			}
 		} break;
-      
+
 		default: {
 			Fatal();
 		} break;
 	}
-  
+
 	if (!dont_ack)
 		cmd_send(CMD_ACK,arg0,0,0,0,0);
 }
@@ -194,19 +194,19 @@ static void flash_mode(int externally_entered) {
 	uint8_t rx[sizeof(UsbCommand)];
 
 	usb_enable();
-	
+
 	// wait for reset to be complete?
 	for (volatile size_t i=0; i<0x100000; i++) {};
 
 	for(;;) {
 		WDT_HIT();
-				
+
 		// Check if there is a usb packet available
 		if (usb_poll_validate_length()) {
 			if (usb_read(rx, sizeof(rx)) )
 				UsbPacketReceived(rx, sizeof(rx));
 		}
-		
+
 		if (!externally_entered && !BUTTON_PRESS()) {
 			/* Perform a reset to leave flash mode */
 			usb_disable();
@@ -274,7 +274,7 @@ void BootROM(void) {
 	AT91C_BASE_EFC0->EFC_FMR = AT91C_MC_FWS_1FWS | MC_FLASH_MODE_MASTER_CLK_IN_MHZ(48);
 
 	// 9 = 256, 10+ is 512kb
-	uint8_t id = ( *(AT91C_DBGU_CIDR) & 0xF00) >> 8;	
+	uint8_t id = ( *(AT91C_DBGU_CIDR) & 0xF00) >> 8;
 	if ( id > 9 )
 		AT91C_BASE_EFC1->EFC_FMR = AT91C_MC_FWS_1FWS | MC_FLASH_MODE_MASTER_CLK_IN_MHZ(48);
 
@@ -298,11 +298,11 @@ void BootROM(void) {
 
     if (!common_area_present){
 	    /* Common area not ok, initialize it */
-	    int i; 
+	    int i;
 		/* Makeshift memset, no need to drag util.c into this */
-		for(i=0; i<sizeof(common_area); i++) 
+		for(i=0; i<sizeof(common_area); i++)
 		    ((char*)&common_area)[i] = 0;
-	    
+
 	    common_area.magic = COMMON_AREA_MAGIC;
 	    common_area.version = 1;
 	    common_area.flags.bootrom_present = 1;
diff --git a/client/amiitool/amiibo.c b/client/amiitool/amiibo.c
index 6391ae830..85b7b226a 100644
--- a/client/amiitool/amiibo.c
+++ b/client/amiitool/amiibo.c
@@ -82,11 +82,11 @@ bool nfc3d_amiibo_unpack(const nfc3d_amiibo_keys * amiiboKeys, const uint8_t * t
 	nfc3d_amiibo_cipher(&dataKeys, internal, plain);
 
 	// Regenerate tag HMAC. Note: order matters, data HMAC depends on tag HMAC!
-	mbedtls_md_hmac( mbedtls_md_info_from_type(MBEDTLS_MD_SHA256), tagKeys.hmacKey, sizeof(tagKeys.hmacKey),	
+	mbedtls_md_hmac( mbedtls_md_info_from_type(MBEDTLS_MD_SHA256), tagKeys.hmacKey, sizeof(tagKeys.hmacKey),
 			 plain + 0x1D4, 0x34, plain + HMAC_POS_TAG );
 
 	// Regenerate data HMAC
-	mbedtls_md_hmac( mbedtls_md_info_from_type(MBEDTLS_MD_SHA256), dataKeys.hmacKey, sizeof(dataKeys.hmacKey),	
+	mbedtls_md_hmac( mbedtls_md_info_from_type(MBEDTLS_MD_SHA256), dataKeys.hmacKey, sizeof(dataKeys.hmacKey),
 			 plain + 0x029, 0x1DF, plain + HMAC_POS_DATA );
 
 	return
@@ -104,7 +104,7 @@ void nfc3d_amiibo_pack(const nfc3d_amiibo_keys * amiiboKeys, const uint8_t * pla
 	nfc3d_amiibo_keygen(&amiiboKeys->data, plain, &dataKeys);
 
 	// Generate tag HMAC
-	mbedtls_md_hmac( mbedtls_md_info_from_type(MBEDTLS_MD_SHA256), tagKeys.hmacKey, sizeof(tagKeys.hmacKey),	
+	mbedtls_md_hmac( mbedtls_md_info_from_type(MBEDTLS_MD_SHA256), tagKeys.hmacKey, sizeof(tagKeys.hmacKey),
 			 plain + 0x1D4, 0x34, cipher + HMAC_POS_TAG );
 
 	// Init mbedtls HMAC context
@@ -157,11 +157,11 @@ void nfc3d_amiibo_copy_app_data(const uint8_t * src, uint8_t * dst) {
 
 	//uint16_t *ami_nb_wr = (uint16_t*)(dst + 0x29);
 	//uint16_t *cfg_nb_wr = (uint16_t*)(dst + 0xB4);
-	
+
 	/* increment write counters */
 	//*ami_nb_wr = htobe16(be16toh(*ami_nb_wr) + 1);
 	//*cfg_nb_wr = htobe16(be16toh(*cfg_nb_wr) + 1);
-	
+
 	uint16_t ami_nb_wr =  ((uint16_t)bytes_to_num(dst + 0x29, 2)) + 1;
 	uint16_t cfg_nb_wr =  ((uint16_t)bytes_to_num(dst + 0xB4, 2)) + 1;
 
diff --git a/client/amiitool/amiitool.c b/client/amiitool/amiitool.c
index 40e7b05eb..163e6529c 100644
--- a/client/amiitool/amiitool.c
+++ b/client/amiitool/amiitool.c
@@ -33,7 +33,7 @@ void amiitool_usage() {
 }
 
 static bool LoadAmiikey(nfc3d_amiibo_keys keys, char* keyfile) {
-	
+
 	if (!nfc3d_amiibo_load_keys(&keys, keyfile)) {
 		PrintAndLogEx(ERR, "Could not load keys from '%s'", keyfile);
 		return false;
@@ -84,7 +84,7 @@ int main(int argc, char ** argv) {
 
 	nfc3d_amiibo_keys amiiboKeys;
 
-	
+
 	uint8_t original[NTAG215_SIZE];
 	uint8_t modified[NFC3D_AMIIBO_SIZE];
 
diff --git a/client/cliparser/argtable3.c b/client/cliparser/argtable3.c
index abffa9dc2..7e3461b37 100644
--- a/client/cliparser/argtable3.c
+++ b/client/cliparser/argtable3.c
@@ -114,7 +114,7 @@ enum
 
 #define ARG_LOG(x) \
     do { if (ARG_ENABLE_LOG) dbg_printf x; } while (0)
-#endif 
+#endif
 
 extern void dbg_printf(const char *fmt, ...);
 
@@ -1465,7 +1465,7 @@ static int arg_dbl_scanfn(struct arg_dbl *parent, const char *argval)
 static int arg_dbl_checkfn(struct arg_dbl *parent)
 {
     int errorcode = (parent->count < parent->hdr.mincount) ? EMINCOUNT : 0;
-    
+
     ARG_TRACE(("%s:checkfn(%p) returns %d\n", __FILE__, parent, errorcode));
     return errorcode;
 }
@@ -1575,7 +1575,7 @@ struct arg_dbl * arg_dbln(
 
         result->count = 0;
     }
-    
+
     ARG_TRACE(("arg_dbln() returns %p\n", result));
     return result;
 }
@@ -1655,7 +1655,7 @@ static void arg_end_errorfn(
         fprintf(fp, "invalid option \"-%c\"", error);
         break;
     }
-    
+
     fputc('\n', fp);
 }
 
@@ -1851,7 +1851,7 @@ static int arg_file_scanfn(struct arg_file *parent, const char *argval)
 static int arg_file_checkfn(struct arg_file *parent)
 {
     int errorcode = (parent->count < parent->hdr.mincount) ? EMINCOUNT : 0;
-    
+
     ARG_TRACE(("%s:checkfn(%p) returns %d\n", __FILE__, parent, errorcode));
     return errorcode;
 }
@@ -1962,7 +1962,7 @@ struct arg_file * arg_filen(
             result->extension[i] = "";
         }
     }
-    
+
     ARG_TRACE(("arg_filen() returns %p\n", result));
     return result;
 }
@@ -2325,7 +2325,7 @@ struct arg_int * arg_intn(
         result->ival  = (int *)(result + 1);
         result->count = 0;
     }
-    
+
     ARG_TRACE(("arg_intn() returns %p\n", result));
     return result;
 }
@@ -2473,7 +2473,7 @@ struct arg_lit * arg_litn(
         /* init local variables */
         result->count = 0;
     }
-    
+
     ARG_TRACE(("arg_litn() returns %p\n", result));
     return result;
 }
@@ -3609,7 +3609,7 @@ static int arg_str_scanfn(struct arg_str *parent, const char *argval)
 static int arg_str_checkfn(struct arg_str *parent)
 {
     int errorcode = (parent->count < parent->hdr.mincount) ? EMINCOUNT : 0;
-    
+
     ARG_TRACE(("%s:checkfn(%p) returns %d\n", __FILE__, parent, errorcode));
     return errorcode;
 }
@@ -3711,7 +3711,7 @@ struct arg_str * arg_strn(
         for (i = 0; i < maxcount; i++)
             result->sval[i] = "";
     }
-    
+
     ARG_TRACE(("arg_strn() returns %p\n", result));
     return result;
 }
@@ -4252,7 +4252,7 @@ int arg_parse(int argc, char * *argv, void * *argtable)
             argvcopy[i] = argv[i];
 
         argvcopy[argc] = NULL;
-        
+
         /* parse the command line (local copy) for tagged options */
         arg_parse_tagged(argc, argvcopy, table, endtable);
 
diff --git a/client/cliparser/argtable3.h b/client/cliparser/argtable3.h
index 1107de250..452d0283a 100644
--- a/client/cliparser/argtable3.h
+++ b/client/cliparser/argtable3.h
@@ -39,7 +39,7 @@ extern "C" {
 #endif
 
 #define ARG_REX_ICASE 1
-    
+
 /* bit masks for arg_hdr.flag */
 enum
 {
@@ -218,7 +218,7 @@ struct arg_str* arg_str0(const char* shortopts,
     const char* datatype,
     const char* glossary);
 struct arg_str* arg_str1(const char* shortopts,
-    const char* longopts,                    
+    const char* longopts,
     const char* datatype,
     const char *glossary);
 struct arg_str* arg_strn(const char* shortopts,
diff --git a/client/cliparser/cliparser.c b/client/cliparser/cliparser.c
index 954220398..f1f2e3b1e 100644
--- a/client/cliparser/cliparser.c
+++ b/client/cliparser/cliparser.c
@@ -26,16 +26,16 @@ int CLIParserInit(char *vprogramName, char *vprogramHint, char *vprogramHelp) {
 	programHint = vprogramHint;
 	programHelp = vprogramHelp;
 	memset(buf, 0x00, 500);
-	
+
 	return 0;
 }
 
-int CLIParserParseArg(int argc, char **argv, void* vargtable[], size_t vargtableLen, bool allowEmptyExec) { 
+int CLIParserParseArg(int argc, char **argv, void* vargtable[], size_t vargtableLen, bool allowEmptyExec) {
 	int nerrors;
-	
+
 	argtable = vargtable;
 	argtableLen = vargtableLen;
-	
+
 	/* verify the argtable[] entries were allocated sucessfully */
 	if (arg_nullcheck(argtable) != 0) {
 		/* NULL entries were detected, some allocations must have failed */
@@ -44,9 +44,9 @@ int CLIParserParseArg(int argc, char **argv, void* vargtable[], size_t vargtable
 	}
 	/* Parse the command line as defined by argtable[] */
 	nerrors = arg_parse(argc, argv, argtable);
-	
+
 	/* special case: '--help' takes precedence over error reporting */
-	if ((argc < 2 && !allowEmptyExec) ||((struct arg_lit *)argtable[0])->count > 0) { // help must be the first record  
+	if ((argc < 2 && !allowEmptyExec) ||((struct arg_lit *)argtable[0])->count > 0) { // help must be the first record
 		printf("Usage: %s", programName);
 		arg_print_syntaxv(stdout, argtable, "\n");
 		if (programHint)
@@ -55,7 +55,7 @@ int CLIParserParseArg(int argc, char **argv, void* vargtable[], size_t vargtable
 		printf("\n");
 		if (programHelp)
 			printf("%s \n", programHelp);
-		
+
 		return 1;
 	}
 
@@ -64,10 +64,10 @@ int CLIParserParseArg(int argc, char **argv, void* vargtable[], size_t vargtable
 		/* Display the error details contained in the arg_end struct.*/
 		arg_print_errors(stdout, ((struct arg_end *)argtable[vargtableLen - 1]), programName);
 		printf("Try '%s --help' for more information.\n", programName);
-		
+
 		return 3;
-	}	
-	
+	}
+
 	return 0;
 }
 
@@ -86,19 +86,19 @@ int CLIParserParseString(const char* str, void* vargtable[], size_t vargtableLen
 int CLIParserParseStringEx(const char* str, void* vargtable[], size_t vargtableLen, bool allowEmptyExec, bool clueData) {
 	int argc = 0;
 	char *argv[200] = {NULL};
-	
+
 	int len = strlen(str);
 	char *bufptr = buf;
 	char *spaceptr = NULL;
 	enum ParserState state = PS_FIRST;
-	
-	argv[argc++] = bufptr;	
+
+	argv[argc++] = bufptr;
 	// param0 = program name
 	memcpy(buf, programName, strlen(programName) + 1); // with 0x00
 	bufptr += strlen(programName) + 1;
 	if (len)
-		argv[argc++] = bufptr;	
-	
+		argv[argc++] = bufptr;
+
 	// parse params
 	for (int i = 0; i < len; i++) {
 		switch(state){
@@ -110,7 +110,7 @@ int CLIParserParseStringEx(const char* str, void* vargtable[], size_t vargtableL
 						bufptr = spaceptr;
 						*bufptr = 0x00;
 						bufptr++;
-						argv[argc++] = bufptr;	
+						argv[argc++] = bufptr;
 					}
 				}
 				spaceptr = NULL;
@@ -130,10 +130,10 @@ int CLIParserParseStringEx(const char* str, void* vargtable[], size_t vargtableL
 
 					*bufptr = 0x00;
 					bufptr++;
-					argv[argc++] = bufptr;	
+					argv[argc++] = bufptr;
 					break;
 				}
-				
+
 				*bufptr = str[i];
 				bufptr++;
 				break;
@@ -146,20 +146,20 @@ int CLIParserParseStringEx(const char* str, void* vargtable[], size_t vargtableL
 void CLIParserFree() {
 	arg_freetable(argtable, argtableLen);
 	argtable = NULL;
-	
+
 	return;
 }
 
 // convertors
 int CLIParamHexToBuf(struct arg_str *argstr, uint8_t *data, int maxdatalen, int *datalen) {
 	*datalen = 0;
-	
+
 	int ibuf = 0;
 	uint8_t buf[256] = {0};
 	int res = CLIParamStrToBuf(argstr, buf, maxdatalen * 2, &ibuf); // *2 because here HEX
 	if (res || !ibuf)
 		return res;
-	
+
 	switch(param_gethex_to_eol((char *)buf, 0, data, maxdatalen, datalen)) {
 	case 1:
 		printf("Parameter error: Invalid HEX value.\n");
@@ -171,7 +171,7 @@ int CLIParamHexToBuf(struct arg_str *argstr, uint8_t *data, int maxdatalen, int
 		printf("Parameter error: Hex string must have even number of digits.\n");
 		return 3;
 	}
-	
+
 	return 0;
 }
 
@@ -179,26 +179,26 @@ int CLIParamStrToBuf(struct arg_str *argstr, uint8_t *data, int maxdatalen, int
 	*datalen = 0;
 	if (!argstr->count)
 		return 0;
-	
+
 	uint8_t buf[256] = {0};
 	int ibuf = 0;
-	
+
 	for (int i = 0; i < argstr->count; i++) {
 		int len = strlen(argstr->sval[i]);
 		memcpy(&buf[ibuf], argstr->sval[i], len);
 		ibuf += len;
 	}
 	buf[ibuf] = 0;
-  
+
 	if (!ibuf)
 		return 0;
 
 	if (ibuf > maxdatalen)
 		return 2;
-	
+
 	memcpy(data, buf, ibuf);
 	*datalen = ibuf;
-	
+
 	return 0;
 }
 
diff --git a/client/cliparser/getopt.h b/client/cliparser/getopt.h
index 789b4d1d4..09ff126b4 100644
--- a/client/cliparser/getopt.h
+++ b/client/cliparser/getopt.h
@@ -76,5 +76,5 @@ extern int optind, opterr, optopt;
 extern int optreset;			/* getopt(3) external variable */
 #endif
 __END_DECLS
- 
+
 #endif /* !_GETOPT_H_ */
diff --git a/client/cmdanalyse.c b/client/cmdanalyse.c
index fea907206..94411f8b5 100644
--- a/client/cmdanalyse.c
+++ b/client/cmdanalyse.c
@@ -92,7 +92,7 @@ static uint16_t matrixadd ( uint8_t* bytes, uint8_t len){
  0x72 | 0111 0010
  0x5e | 0101 1110
  -----------------
-        C32F 9d74 
+        C32F 9d74
 
 	return 0;
 }
@@ -110,7 +110,7 @@ static uint16_t calcSumCrumbAdd( uint8_t* bytes, uint8_t len, uint32_t mask) {
 		sum += CRUMB(bytes[i], 4);
 		sum += CRUMB(bytes[i], 6);
 	}
-	sum &= mask;	
+	sum &= mask;
     return sum;
 }
 static uint16_t calcSumCrumbAddOnes( uint8_t* bytes, uint8_t len, uint32_t mask) {
@@ -122,7 +122,7 @@ static uint16_t calcSumNibbleAdd( uint8_t* bytes, uint8_t len, uint32_t mask) {
         sum += NIBBLE_LOW(bytes[i]);
 		sum += NIBBLE_HIGH(bytes[i]);
 	}
-	sum &= mask;	
+	sum &= mask;
     return sum;
 }
 static uint16_t calcSumNibbleAddOnes( uint8_t* bytes, uint8_t len, uint32_t mask){
@@ -135,7 +135,7 @@ static uint16_t calcSumCrumbXor(  uint8_t* bytes, uint8_t len, uint32_t mask) {
 		sum ^= CRUMB(bytes[i], 2);
 		sum ^= CRUMB(bytes[i], 4);
 		sum ^= CRUMB(bytes[i], 6);
-	}	
+	}
 	sum &= mask;
     return sum;
 }
@@ -153,7 +153,7 @@ static uint16_t calcSumByteXor( uint8_t* bytes, uint8_t len, uint32_t mask) {
     for (uint8_t i = 0; i < len; i++) {
 		sum ^= bytes[i];
 	}
-	sum &= mask;	
+	sum &= mask;
     return sum;
 }
 static uint16_t calcSumByteAdd( uint8_t* bytes, uint8_t len, uint32_t mask) {
@@ -161,7 +161,7 @@ static uint16_t calcSumByteAdd( uint8_t* bytes, uint8_t len, uint32_t mask) {
     for (uint8_t i = 0; i < len; i++) {
 		sum += bytes[i];
 	}
-	sum &= mask;	
+	sum &= mask;
     return sum;
 }
 // Ones complement
@@ -174,7 +174,7 @@ static uint16_t calcSumByteSub( uint8_t* bytes, uint8_t len, uint32_t mask) {
     for (uint8_t i = 0; i < len; i++) {
 		sum -= bytes[i];
 	}
-	sum &= mask;	
+	sum &= mask;
     return sum;
 }
 static uint16_t calcSumByteSubOnes( uint8_t* bytes, uint8_t len, uint32_t mask){
@@ -186,7 +186,7 @@ static uint16_t calcSumNibbleSub( uint8_t* bytes, uint8_t len, uint32_t mask) {
         sum -= NIBBLE_LOW(bytes[i]);
 		sum -= NIBBLE_HIGH(bytes[i]);
 	}
-	sum &= mask;	
+	sum &= mask;
     return sum;
 }
 static uint16_t calcSumNibbleSubOnes( uint8_t* bytes, uint8_t len, uint32_t mask) {
@@ -199,7 +199,7 @@ static uint16_t calcBSDchecksum8( uint8_t* bytes, uint8_t len, uint32_t mask){
 	for(uint8_t i = 0; i < len; i++){
 		sum = ((sum & 0xFF) >> 1) | ((sum & 0x1) << 7);   // rotate accumulator
 		sum += bytes[i];  // add next byte
-		sum &= 0xFF;  // 
+		sum &= 0xFF;  //
 	}
 	sum &= mask;
 	return sum;
@@ -210,10 +210,10 @@ static uint16_t calcBSDchecksum4( uint8_t* bytes, uint8_t len, uint32_t mask){
 	for(uint8_t i = 0; i < len; i++){
 		sum = ((sum & 0xF) >> 1) | ((sum & 0x1) << 3);   // rotate accumulator
 		sum += NIBBLE_HIGH(bytes[i]);  // add high nibble
-		sum &= 0xF;  // 
+		sum &= 0xF;  //
 		sum = ((sum & 0xF) >> 1) | ((sum & 0x1) << 3);   // rotate accumulator
 		sum += NIBBLE_LOW(bytes[i]);  // add low nibble
-		sum &= 0xF;  // 
+		sum &= 0xF;  //
 	}
 	sum &= mask;
 	return sum;
@@ -228,10 +228,10 @@ int CmdAnalyseLfsr(const char *Cmd){
 
 	uint8_t iv = param_get8ex(Cmd, 0, 0, 16);
 	uint8_t find = param_get8ex(Cmd, 1, 0, 16);
-	
+
 	PrintAndLogEx(NORMAL, "LEGIC LFSR IV 0x%02X: \n", iv);
 	PrintAndLogEx(NORMAL, " bit# | lfsr | ^0x40 |  0x%02X ^ lfsr \n",find);
-	
+
 	for (uint8_t i = 0x01; i < 0x30; i += 1) {
 		//period = 0;
 		legic_prng_init(iv);
@@ -246,7 +246,7 @@ int CmdAnalyseLCR(const char *Cmd) {
 	uint8_t data[50];
 	char cmdp = tolower(param_getchar(Cmd, 0));
 	if (strlen(Cmd) == 0|| cmdp == 'h') return usage_analyse_lcr();
-	
+
 	int len = 0;
 	switch (param_gethex_to_eol(Cmd, 0, data, sizeof(data), &len)) {
 	case 1:
@@ -267,10 +267,10 @@ int CmdAnalyseCRC(const char *Cmd) {
 
 	char cmdp = tolower(param_getchar(Cmd, 0));
 	if (strlen(Cmd) == 0 || cmdp == 'h') return usage_analyse_crc();
-	
+
 	int len = strlen(Cmd);
 	if ( len & 1 ) return usage_analyse_crc();
-	
+
 	// add 1 for null terminator.
 	uint8_t *data = calloc(len+1,  sizeof(uint8_t));
 	if ( !data ) return 1;
@@ -279,35 +279,35 @@ int CmdAnalyseCRC(const char *Cmd) {
 		free(data);
 		return usage_analyse_crc();
 	}
-	len >>= 1;	
+	len >>= 1;
 
 	PrintAndLogEx(NORMAL, "\nTests with (%d) | %s",len, sprint_hex(data, len));
-	
-	// 51  f5  7a  d6 
+
+	// 51  f5  7a  d6
 	uint8_t uid[] = {0x51, 0xf5, 0x7a, 0xd6}; //12 34 56
 	init_table(CRC_LEGIC);
 	uint8_t legic8 = CRC8Legic(uid, sizeof(uid));
 	PrintAndLogEx(NORMAL, "Legic 16 | %X (EF6F expected) [legic8 = %02x]", crc16_legic(data, len, legic8), legic8);
 	init_table(CRC_FELICA);
 	PrintAndLogEx(NORMAL, "FeliCa | %X ", crc16_xmodem(data, len));
-	
-	PrintAndLogEx(NORMAL, "\nTests of reflection. Current methods in source code");	
+
+	PrintAndLogEx(NORMAL, "\nTests of reflection. Current methods in source code");
 	PrintAndLogEx(NORMAL, "   reflect(0x3e23L,3) is %04X == 0x3e26", reflect(0x3e23L,3) );
 	PrintAndLogEx(NORMAL, "       reflect8(0x80) is %02X == 0x01", reflect8(0x80));
 	PrintAndLogEx(NORMAL, "    reflect16(0x8000) is %04X == 0x0001", reflect16(0xc6c6));
-	
+
 	uint8_t b1, b2;
 	// ISO14443 crc B
-	compute_crc(CRC_14443_B, data, len, &b1, &b2);	
+	compute_crc(CRC_14443_B, data, len, &b1, &b2);
 	uint16_t crcBB_1 = b1 << 8 | b2;
 	uint16_t bbb = crc(CRC_14443_B, data, len);
 	PrintAndLogEx(NORMAL, "ISO14443 crc B  | %04x == %04x \n", crcBB_1, bbb );
-	
-	
+
+
 	// Test of CRC16,  '123456789' string.
 	//
-	
-	PrintAndLogEx(NORMAL, "\n\nStandard test with 31 32 33 34 35 36 37 38 39  '123456789'\n\n");	
+
+	PrintAndLogEx(NORMAL, "\n\nStandard test with 31 32 33 34 35 36 37 38 39  '123456789'\n\n");
 	uint8_t dataStr[] = { 0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39 };
 	legic8 = CRC8Legic(dataStr, sizeof(dataStr));
 
@@ -321,21 +321,21 @@ int CmdAnalyseCRC(const char *Cmd) {
 	PrintAndLogEx(NORMAL, "CRC16 based\n\n");
 
 	// input from commandline
-	PrintAndLogEx(NORMAL, "CCITT  | %X (29B1 expected)", crc(CRC_CCITT, dataStr, sizeof(dataStr)));		
-	
+	PrintAndLogEx(NORMAL, "CCITT  | %X (29B1 expected)", crc(CRC_CCITT, dataStr, sizeof(dataStr)));
+
 	uint8_t poll[] = {0xb2,0x4d,0x12,0x01,0x01,0x2e,0x3d,0x17,0x26,0x47,0x80, 0x95,0x00,0xf1,0x00,0x00,0x00,0x01,0x43,0x00,0xb3,0x7f};
 	PrintAndLogEx(NORMAL, "FeliCa | %04X (B37F expected)", crc(CRC_FELICA, poll+2, sizeof(poll)-4));
 	PrintAndLogEx(NORMAL, "FeliCa | %04X (0000 expected)", crc(CRC_FELICA, poll+2, sizeof(poll)-2));
-	
+
 	uint8_t sel_corr[] = { 0x40, 0xe1, 0xe1, 0xff, 0xfe, 0x5f, 0x02, 0x3c, 0x43, 0x01};
 	PrintAndLogEx(NORMAL, "iCLASS | %04x (0143 expected)", crc(CRC_ICLASS, sel_corr, sizeof(sel_corr)-2));
 	PrintAndLogEx(NORMAL, "---------------------------------------------------------------\n\n\n");
-	
+
 	// ISO14443 crc A
 	compute_crc(CRC_14443_A, dataStr, sizeof(dataStr), &b1, &b2);
 	uint16_t crcAA = b1 << 8 | b2;
 	PrintAndLogEx(NORMAL, "ISO14443 crc A  | %04x or %04x (BF05 expected)\n", crcAA, crc(CRC_14443_A, dataStr, sizeof(dataStr)) );
-	
+
 	// ISO14443 crc B
 	compute_crc(CRC_14443_B, dataStr, sizeof(dataStr), &b1, &b2);
 	uint16_t crcBB = b1 << 8 | b2;
@@ -346,7 +346,7 @@ int CmdAnalyseCRC(const char *Cmd) {
 	uint16_t crcCC = b1 << 8 | b2;
 	PrintAndLogEx(NORMAL, "ISO15693 crc X25| %04x or %04x (906E expected)\n", crcCC, crc(CRC_15693, dataStr, sizeof(dataStr)) );
 
-	// ICLASS	
+	// ICLASS
 	compute_crc(CRC_ICLASS, dataStr, sizeof(dataStr), &b1, &b2);
 	uint16_t crcDD = b1 << 8 | b2;
 	PrintAndLogEx(NORMAL, "ICLASS crc      | %04x or %04x\n", crcDD, crc(CRC_ICLASS, dataStr, sizeof(dataStr)) );
@@ -355,12 +355,12 @@ int CmdAnalyseCRC(const char *Cmd) {
 	compute_crc(CRC_FELICA, dataStr, sizeof(dataStr), &b1, &b2);
 	uint16_t crcEE = b1 << 8 | b2;
 	PrintAndLogEx(NORMAL, "FeliCa          | %04x or %04x (31C3 expected)\n", crcEE, crc(CRC_FELICA, dataStr, sizeof(dataStr)));
-	
+
 	free(data);
 	return 0;
 }
 int CmdAnalyseCHKSUM(const char *Cmd){
-	
+
 	uint8_t data[50];
 	uint8_t cmdp = 0;
 	uint32_t mask = 0xFFFF;
@@ -368,18 +368,18 @@ int CmdAnalyseCHKSUM(const char *Cmd){
 	bool useHeader = false;
 	int len = 0;
 	memset(data, 0x0, sizeof(data));
-	
+
 	while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
 		switch(param_getchar(Cmd, cmdp)) {
 		case 'b':
 		case 'B':
 			param_gethex_ex(Cmd, cmdp+1, data, &len);
 			if ( len%2 ) errors = true;
-			len >>= 1;	
+			len >>= 1;
 			cmdp += 2;
 			break;
 		case 'm':
-		case 'M':		 
+		case 'M':
 			mask = param_get32ex(Cmd, cmdp+1, 0, 16);
 			cmdp += 2;
 			break;
@@ -399,13 +399,13 @@ int CmdAnalyseCHKSUM(const char *Cmd){
 	}
 	//Validations
 	if (errors || cmdp == 0 ) return usage_analyse_checksum();
-	
+
 	if (useHeader) {
 		PrintAndLogEx(NORMAL, "     add          | sub         | add 1's compl    | sub 1's compl   | xor");
 		PrintAndLogEx(NORMAL, "byte nibble crumb | byte nibble | byte nibble cumb | byte nibble     | byte nibble cumb |  BSD       |");
 		PrintAndLogEx(NORMAL, "------------------+-------------+------------------+-----------------+--------------------");
 	}
-	PrintAndLogEx(NORMAL, "0x%X 0x%X   0x%X  | 0x%X 0x%X   | 0x%X 0x%X   0x%X | 0x%X 0x%X       | 0x%X 0x%X   0x%X  | 0x%X  0x%X |\n",	
+	PrintAndLogEx(NORMAL, "0x%X 0x%X   0x%X  | 0x%X 0x%X   | 0x%X 0x%X   0x%X | 0x%X 0x%X       | 0x%X 0x%X   0x%X  | 0x%X  0x%X |\n",
 				  calcSumByteAdd(data, len, mask)
 				, calcSumNibbleAdd(data, len, mask)
 				, calcSumCrumbAdd(data, len, mask)
@@ -421,7 +421,7 @@ int CmdAnalyseCHKSUM(const char *Cmd){
 				, calcSumCrumbXor(data, len, mask)
 				, calcBSDchecksum8(data, len, mask)
 				, calcBSDchecksum4(data, len, mask)
-			);	
+			);
 	return 0;
 }
 
@@ -431,7 +431,7 @@ int CmdAnalyseDates(const char *Cmd){
 	return 0;
 }
 int CmdAnalyseTEASelfTest(const char *Cmd){
-	
+
 	uint8_t v[8], v_le[8];
 	memset(v, 0x00, sizeof(v));
 	memset(v_le, 0x00, sizeof(v_le));
@@ -439,26 +439,26 @@ int CmdAnalyseTEASelfTest(const char *Cmd){
 
 	uint8_t cmdlen = strlen(Cmd);
 	cmdlen = ( sizeof(v)<<2 < cmdlen ) ? sizeof(v)<<2 : cmdlen;
-	
+
 	if ( param_gethex(Cmd, 0, v, cmdlen) > 0 ){
 		PrintAndLogEx(WARNING, "Can't read hex chars, uneven? :: %u", cmdlen);
 		return 1;
 	}
-	
+
 	SwapEndian64ex(v , 8, 4, v_ptr);
-	
-	// ENCRYPTION KEY:	
+
+	// ENCRYPTION KEY:
 	uint8_t key[16] = {0x55,0xFE,0xF6,0x30,0x62,0xBF,0x0B,0xC1,0xC9,0xB3,0x7C,0x34,0x97,0x3E,0x29,0xFB };
 	uint8_t keyle[16];
 	uint8_t* key_ptr = keyle;
 	SwapEndian64ex(key , sizeof(key), 4, key_ptr);
-	
+
 	PrintAndLogEx(NORMAL, "TEST LE enc| %s", sprint_hex(v_ptr, 8));
-	
-	tea_decrypt(v_ptr, key_ptr);	
+
+	tea_decrypt(v_ptr, key_ptr);
 	PrintAndLogEx(NORMAL, "TEST LE dec | %s", sprint_hex_ascii(v_ptr, 8));
-	
-	tea_encrypt(v_ptr, key_ptr);	
+
+	tea_encrypt(v_ptr, key_ptr);
 	tea_encrypt(v_ptr, key_ptr);
 	PrintAndLogEx(NORMAL, "TEST enc2 | %s", sprint_hex_ascii(v_ptr, 8));
 
@@ -469,14 +469,14 @@ char* pb(uint32_t b) {
 	static char buf1[33] = {0};
 	static char buf2[33] = {0};
 	static char *s;
-	
+
 	if (s != buf1)
 		s = buf1;
-	else 
+	else
 		s = buf2;
-	
+
 	memset(s, 0, sizeof(buf1));
-	
+
 	uint32_t mask = 0x80000000;
 	for (uint8_t i=0; i<32;i++) {
 		s[i] = (mask & b)?'1':'0';
@@ -491,7 +491,7 @@ int CmdAnalyseA(const char *Cmd){
 	uint8_t cmdp = 0;
 	bool errors = false;
 	uint8_t data[USB_CMD_DATA_SIZE] = {0x00};
-	
+
 	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
 		switch (tolower(param_getchar(Cmd, cmdp))) {
 		case 'd':
@@ -500,7 +500,7 @@ int CmdAnalyseA(const char *Cmd){
 			if ( hexlen != sizeof(data) ) {
 				PrintAndLogEx(WARNING, "Read %d bytes of %u", hexlen, sizeof(data) );
 			}
-			cmdp += 2;			
+			cmdp += 2;
 			break;
 		case 'h':
 			return usage_analyse_a();
@@ -513,7 +513,7 @@ int CmdAnalyseA(const char *Cmd){
 	//Validations
 	if (errors || cmdp == 0 ) return usage_analyse_a();
 
-		
+
 	UsbCommand c = {CMD_FPC_SEND, {0, 0, 0}};
 	memcpy(c.d.asBytes, data, USB_CMD_DATA_SIZE);
 	clearCommandBuffer();
@@ -525,16 +525,16 @@ int CmdAnalyseA(const char *Cmd){
 	}
 	PrintAndLogEx(NORMAL, "got ack.  Status %d", resp.arg[0]);
 	return 0;
-		
+
 	PrintAndLogEx(NORMAL, "-- " _BLUE_(its my message) "\n");
 	PrintAndLogEx(NORMAL, "-- " _RED_(its my message) "\n");
 	PrintAndLogEx(NORMAL, "-- " _YELLOW_(its my message) "\n");
 	PrintAndLogEx(NORMAL, "-- " _GREEN_(its my message) "\n");
-	
+
 	//uint8_t syncBit = 99;
 	// The start bit is one ore more Sequence Y followed by a Sequence Z (... 11111111 00x11111). We need to distinguish from
 	// Sequence X followed by Sequence Y followed by Sequence Z     (111100x1 11111111 00x11111)
-	// we therefore look for a ...xx1111 11111111 00x11111xxxxxx... pattern 
+	// we therefore look for a ...xx1111 11111111 00x11111xxxxxx... pattern
 	// (12 '1's followed by 2 '0's, eventually followed by another '0', followed by 5 '1's)
 	# define SYNC_16BIT 0xB24D
 	uint32_t shiftReg = param_get32ex(Cmd, 0, 0xb24d, 16);
@@ -554,7 +554,7 @@ int CmdAnalyseA(const char *Cmd){
 	n1 = (n1 << 4) | (rev & (uint8_t)(~(0xFF << 4)));
 
 	PrintAndLogEx(NORMAL, "rev %02X | %02X %s | %02X %s |\n", rev, n0, pb(n0), n1, pb(n1) );
-	
+
 /*
 hex(0xb24d shr 0) 0xB24D 0b1011001001001101
 hex(0xb24d shr 1) 0x5926
@@ -568,29 +568,29 @@ for ( int i =0; i< 16; i++) {
 	if ((( shiftReg >> 7) & 0xFFFF ) == SYNC_16BIT) byte_offset = 7;
 	else if ((( shiftReg >> 6) & 0xFFFF ) == SYNC_16BIT) byte_offset = 6;
 	else if ((( shiftReg >> 5) & 0xFFFF ) == SYNC_16BIT) byte_offset = 5;
-	else if ((( shiftReg >> 4) & 0xFFFF ) == SYNC_16BIT) byte_offset = 4;				
+	else if ((( shiftReg >> 4) & 0xFFFF ) == SYNC_16BIT) byte_offset = 4;
 	else if ((( shiftReg >> 3) & 0xFFFF ) == SYNC_16BIT) byte_offset = 3;
 	else if ((( shiftReg >> 2) & 0xFFFF ) == SYNC_16BIT) byte_offset = 2;
 	else if ((( shiftReg >> 1) & 0xFFFF ) == SYNC_16BIT) byte_offset = 1;
 	else if ((( shiftReg >> 0) & 0xFFFF ) == SYNC_16BIT) byte_offset = 0;
 
 	PrintAndLogEx(NORMAL, "Offset  %u \n", byte_offset);
-	if ( byte_offset != 99 ) 
+	if ( byte_offset != 99 )
 		break;
-	
-	shiftReg >>=1;	
+
+	shiftReg >>=1;
 }
 
 	uint8_t p1 = (rev & (uint8_t)(~(0xFF << byte_offset)));
 	PrintAndLogEx(NORMAL, "Offset  %u  | leftovers  %02x  %s \n", byte_offset, p1, pb(p1) );
 
 
-	
-	/*	
+
+	/*
 pm3 --> da hex2bin 4db2     0100110110110010
 */
 	return 0;
-/*	
+/*
 	// split byte into two parts.
 	uint8_t offset = 3, n0 = 0, n1 = 0;
 	rev = 0xB2;
@@ -605,47 +605,47 @@ pm3 --> da hex2bin 4db2     0100110110110010
 		//PrintAndLogEx(NORMAL, "~(0xFF >> (8-offset)) == %s |\n", pb(  (uint8_t)(~(0xFF >> (8-offset))) ) );
 		//PrintAndLogEx(NORMAL, " rev & xxx == %s\n\n", pb( (rev & (uint8_t)(~(0xFF << offset))) ));
 	}
-return 0;	
+return 0;
 	// from A  -- x bits into B and the rest into C.
-	
-	for ( uint8_t i=0; i<8; i++){	
+
+	for ( uint8_t i=0; i<8; i++){
 		PrintAndLogEx(NORMAL, "%u | %02X %s | %02X %s |\n", i, a, pb(a), b, pb(b) );
 		b = a & (a & (0xFF >> (8-i)));
 		a >>=1;
 	}
-	
+
 	*/
 	return 0;
 
-	// 14443-A	
-	uint8_t u14_c[] = {0x09, 0x78, 0x00, 0x92, 0x02, 0x54, 0x13, 0x02, 0x04, 0x2d, 0xe8 }; // atqs w crc	
+	// 14443-A
+	uint8_t u14_c[] = {0x09, 0x78, 0x00, 0x92, 0x02, 0x54, 0x13, 0x02, 0x04, 0x2d, 0xe8 }; // atqs w crc
 	uint8_t u14_w[] = {0x09, 0x78, 0x00, 0x92, 0x02, 0x54, 0x13, 0x02, 0x04, 0x2d, 0xe7 }; // atqs w crc
-	PrintAndLogEx(FAILED, "14a check wrong crc      | %s\n", (check_crc(CRC_14443_A, u14_w, sizeof(u14_w))) ? "YES": "NO" );	
+	PrintAndLogEx(FAILED, "14a check wrong crc      | %s\n", (check_crc(CRC_14443_A, u14_w, sizeof(u14_w))) ? "YES": "NO" );
 	PrintAndLogEx(SUCCESS, "14a check correct crc    | %s\n", (check_crc(CRC_14443_A, u14_c, sizeof(u14_c))) ? "YES": "NO" );
-	
+
 	// 14443-B
 	uint8_t u14b[] = {0x05,0x00,0x08,0x39,0x73};
-	PrintAndLogEx(NORMAL, "14b check crc            | %s\n", (check_crc(CRC_14443_B, u14b, sizeof(u14b))) ? "YES": "NO");	
+	PrintAndLogEx(NORMAL, "14b check crc            | %s\n", (check_crc(CRC_14443_B, u14b, sizeof(u14b))) ? "YES": "NO");
 
 	// 15693 test
 	uint8_t u15_c[] = {0x05,0x00,0x08,0x39,0x73}; // correct
 	uint8_t u15_w[] = {0x05,0x00,0x08,0x39,0x72};	// wrong
-	PrintAndLogEx(FAILED, "15 check wrong crc       | %s\n", (check_crc(CRC_15693, u15_w, sizeof(u15_w))) ? "YES": "NO");	
-	PrintAndLogEx(SUCCESS, "15 check correct crc     | %s\n", (check_crc(CRC_15693, u15_c, sizeof(u15_c))) ? "YES": "NO");	
+	PrintAndLogEx(FAILED, "15 check wrong crc       | %s\n", (check_crc(CRC_15693, u15_w, sizeof(u15_w))) ? "YES": "NO");
+	PrintAndLogEx(SUCCESS, "15 check correct crc     | %s\n", (check_crc(CRC_15693, u15_c, sizeof(u15_c))) ? "YES": "NO");
 
 	// iCLASS test - wrong crc , swapped bytes.
 	uint8_t iclass_w[] = { 0x40, 0xe1, 0xe1, 0xff, 0xfe, 0x5f, 0x02, 0x3c, 0x01, 0x43};
 	uint8_t iclass_c[] = { 0x40, 0xe1, 0xe1, 0xff, 0xfe, 0x5f, 0x02, 0x3c, 0x43, 0x01};
-	PrintAndLogEx(FAILED, "iCLASS check wrong crc   | %s\n", (check_crc(CRC_ICLASS, iclass_w, sizeof(iclass_w))) ? "YES": "NO");	
-	PrintAndLogEx(SUCCESS, "iCLASS check correct crc | %s\n", (check_crc(CRC_ICLASS, iclass_c, sizeof(iclass_c))) ? "YES": "NO");	
-	
+	PrintAndLogEx(FAILED, "iCLASS check wrong crc   | %s\n", (check_crc(CRC_ICLASS, iclass_w, sizeof(iclass_w))) ? "YES": "NO");
+	PrintAndLogEx(SUCCESS, "iCLASS check correct crc | %s\n", (check_crc(CRC_ICLASS, iclass_c, sizeof(iclass_c))) ? "YES": "NO");
+
 	// FeliCa test
 	uint8_t felica_w[] = {0x12,0x01,0x01,0x2e,0x3d,0x17,0x26,0x47,0x80, 0x95,0x00,0xf1,0x00,0x00,0x00,0x01,0x43,0x00,0xb3,0x7e};
 	uint8_t felica_c[] = {0x12,0x01,0x01,0x2e,0x3d,0x17,0x26,0x47,0x80, 0x95,0x00,0xf1,0x00,0x00,0x00,0x01,0x43,0x00,0xb3,0x7f};
-	PrintAndLogEx(FAILED, "FeliCa check wrong crc   | %s\n", (check_crc(CRC_FELICA, felica_w, sizeof(felica_w))) ? "YES": "NO");	
-	PrintAndLogEx(SUCCESS, "FeliCa check correct crc | %s\n", (check_crc(CRC_FELICA, felica_c, sizeof(felica_c))) ? "YES": "NO");	
-	
-	PrintAndLogEx(NORMAL, "\n\n");	
+	PrintAndLogEx(FAILED, "FeliCa check wrong crc   | %s\n", (check_crc(CRC_FELICA, felica_w, sizeof(felica_w))) ? "YES": "NO");
+	PrintAndLogEx(SUCCESS, "FeliCa check correct crc | %s\n", (check_crc(CRC_FELICA, felica_c, sizeof(felica_c))) ? "YES": "NO");
+
+	PrintAndLogEx(NORMAL, "\n\n");
 
 	return 0;
 	/*
@@ -656,7 +656,7 @@ return 0;
 		star[1] = '\\';
 		star[2] = '|';
 		star[3] = '/';
-		
+
 		for (uint8_t k=0; k<4; k = (k+1) % 4 ) {
 			PrintAndLogEx(NORMAL, "\e[s%c\e[u", star[k]);
 			fflush(stdout);
@@ -667,19 +667,19 @@ return 0;
 		}
 	}
 	*/
-	
+
 //piwi
 // uid(2e086b1a) nt(230736f6) ks(0b0008000804000e) nr(000000000)
 // uid(2e086b1a) nt(230736f6) ks(0e0b0e0b090c0d02) nr(000000001)
 // uid(2e086b1a) nt(230736f6) ks(0e05060e01080b08) nr(000000002)
 //uint64_t d1[] = {0x2e086b1a, 0x230736f6, 0x0000001, 0x0e0b0e0b090c0d02};
 //uint64_t d2[] = {0x2e086b1a, 0x230736f6, 0x0000002, 0x0e05060e01080b08};
-	
+
 // uid(17758822) nt(c0c69e59) ks(080105020705040e) nr(00000001)
 // uid(17758822) nt(c0c69e59) ks(01070a05050c0705) nr(00000002)
 //uint64_t d1[] = {0x17758822, 0xc0c69e59, 0x0000001, 0x080105020705040e};
 //uint64_t d2[] = {0x17758822, 0xc0c69e59, 0x0000002, 0x01070a05050c0705};
-	
+
 // uid(6e442129) nt(8f699195) ks(090d0b0305020f02) nr(00000001)
 // uid(6e442129) nt(8f699195) ks(03030508030b0c0e) nr(00000002)
 // uid(6e442129) nt(8f699195) ks(02010f030c0d050d) nr(00000003)
@@ -687,7 +687,7 @@ return 0;
 //uint64_t d1[] = {0x6e442129, 0x8f699195, 0x0000001, 0x090d0b0305020f02};
 //uint64_t d2[] = {0x6e442129, 0x8f699195, 0x0000004, 0x00040f0f0305030e};
 
-/*	
+/*
 uid(3e172b29) nt(039b7bd2) ks(0c0e0f0505080800) nr(00000001)
 uid(3e172b29) nt(039b7bd2) ks(0e06090d03000b0f) nr(00000002)
 */
@@ -697,7 +697,7 @@ uid(3e172b29) nt(039b7bd2) ks(0e06090d03000b0f) nr(00000002)
 //	uint64_t d2[] = {0x3e172b29, 0x039b7bd2, 0x0000002, 0, 0x0e06090d03000b0f};
 uint64_t d1[] = {0x6e442129, 0x8f699195, 0x0000001, 0, 0x090d0b0305020f02};
 uint64_t d2[] = {0x6e442129, 0x8f699195, 0x0000004, 0, 0x00040f0f0305030e};
-	
+
 	keycountA = nonce2key(d1[0], d1[1], d1[2], 0, d1[3], d1[4] ,&keylistA);
 	keycountB = nonce2key(d2[0], d2[1], d2[2], 0, d2[3], d2[4], &keylistB);
 
@@ -708,11 +708,11 @@ uint64_t d2[] = {0x6e442129, 0x8f699195, 0x0000004, 0, 0x00040f0f0305030e};
 	switch (keycountB) {
 		case 0: PrintAndLogEx(FAILED, "Key test B failed\n"); break;
 		case 1: PrintAndLogEx(SUCCESS, "KEY B | %012" PRIX64 " ", keylistB[0]); break;
-	}	
-	
+	}
+
 	free(keylistA);
 	free(keylistB);
-	
+
 //	qsort(keylist, keycount, sizeof(*keylist), compare_uint64);
 //	keycount = intersection(last_keylist, keylist);
 
@@ -727,7 +727,7 @@ uint64_t d2[] = {0x6e442129, 0x8f699195, 0x0000004, 0, 0x00040f0f0305030e};
 		0x8211b0607367, 0xe2936b320f76, 0xaff501e84378, 0x82b31cedb21b,
 		0xb725d31d4cd3, 0x3b984145b2f1, 0x3b4adb3e82ba, 0x8779075210fe
 	};
-	
+
 	uint64_t keya[] = {
 		0x7b5b8144a32f, 0x76b46ccc461e, 0x03c3c36ea7a2, 0x171414d31961,
 		0xe2bfc7153eea, 0x48023d1d1985, 0xff7e1a410953, 0x49a3110249d3,
@@ -740,9 +740,9 @@ uint64_t d2[] = {0x6e442129, 0x8f699195, 0x0000004, 0, 0x00040f0f0305030e};
 		0x8211b0607367, 0xe2936b320f76, 0xaff501e84378, 0x82b31cedb21b,
 		0xb725d31d4cd3, 0x3b984145b2f1, 0x3b4adb3e82ba, 0x8779075210fe
 	};
-	
+
 	*/
-	
+
 	/*
 	uint64_t xor[] = {
 		0x0DEFED88E531,	0x7577AFA2E1BC,	0x14D7D7BDBEC3,	0xF5ABD3C6278B,
@@ -754,7 +754,7 @@ uint64_t d2[] = {0x6e442129, 0x8f699195, 0x0000004, 0, 0x00040f0f0305030e};
 		0x6082DB527C11, 0x4D666ADA4C0E, 0x2D461D05F163, 0x3596CFF0FEC8,
 		0x8CBD9258FE22, 0x00D29A7B304B, 0xBC33DC6C9244
 	};
-	
+
 
 	uint64_t xorA[] = {
 		0x0DEFED88E531,	0x7577AFA2E1BC,	0x14D7D7BDBEC3,	0xF5ABD3C6278B,
@@ -769,7 +769,7 @@ uint64_t d2[] = {0x6e442129, 0x8f699195, 0x0000004, 0, 0x00040f0f0305030e};
 		0x8CBD9258FE22, 0x00D29A7B304B, 0xBC33DC6C9244
 	};
 	*/
-	/*	
+	/*
 	// xor key A      | xor key B
 	1  | 0DEFED88E531 | 2F87A1BDC230
 	2  | 7577AFA2E1BC | E43F502B984C
@@ -795,12 +795,12 @@ uint64_t d2[] = {0x6e442129, 0x8f699195, 0x0000004, 0, 0x00040f0f0305030e};
 		PrintAndLogEx(NORMAL, "%u | %012" PRIX64 " | \n", i, a);
 	}
 	*/
-	
+
 	/*
-	uint32_t id = param_get32ex(Cmd, 0, 0x93290142, 16);	
+	uint32_t id = param_get32ex(Cmd, 0, 0x93290142, 16);
 	uint8_t uid[6] = {0};
 	num_to_bytes(id,4,uid);
-	
+
 	uint8_t key_s0a[] = {
 		uid[1] ^ uid[2] ^ uid[3] ^ 0x11,
 		uid[1] ^ 0x72,
@@ -812,20 +812,20 @@ uint64_t d2[] = {0x6e442129, 0x8f699195, 0x0000004, 0, 0x00040f0f0305030e};
 
 	PrintAndLogEx(NORMAL, "UID   | %s\n", sprint_hex(uid,4 ));
 	PrintAndLogEx(NORMAL, "KEY A | %s\n", sprint_hex(key_s0a, 6));
-	
+
 	// arrays w all keys
 	uint64_t foo[32] = {0};
-	
+
 	//A
 	foo[0] = bytes_to_num(key_s0a, 6);
 	//B
 	//foo[16] = 0xcafe71411fbf;
 	foo[16] = 0xeafe51411fbf;
-	
-	for (uint8_t i=0; i<15; i++){	
+
+	for (uint8_t i=0; i<15; i++){
 		foo[i+1] = foo[i] ^ xorA[i];
 		foo[i+16+1] = foo[i+16] ^ xorB[i];
-		
+
 	}
 	for (uint8_t i=0; i<15; i++){
 		uint64_t a = foo[i];
@@ -836,7 +836,7 @@ uint64_t d2[] = {0x6e442129, 0x8f699195, 0x0000004, 0, 0x00040f0f0305030e};
 			a,
 			( a == keya[i])?"ok":"err",
 			b,
-			( b == keyb[i])?"ok":"err" 
+			( b == keyb[i])?"ok":"err"
 		);
 	}
 	*/
@@ -846,7 +846,7 @@ uint64_t d2[] = {0x6e442129, 0x8f699195, 0x0000004, 0, 0x00040f0f0305030e};
 void generate4bNUID(uint8_t *uid, uint8_t *nuid){
 	uint16_t crc;
 	uint8_t b1, b2;
-		
+
 	compute_crc(CRC_14443_A, uid, 3, &b1, &b2);
 	nuid[0] = (b2 & 0xE0) | 0xF;
 	nuid[1] = b1;
@@ -858,7 +858,7 @@ void generate4bNUID(uint8_t *uid, uint8_t *nuid){
 }
 
 int CmdAnalyseNuid(const char *Cmd){
-	uint8_t nuid[4] = {0};	
+	uint8_t nuid[4] = {0};
 	uint8_t uid[7] = {0};
 	int len = 0;
 	char cmdp = tolower(param_getchar(Cmd, 0));
@@ -870,13 +870,13 @@ int CmdAnalyseNuid(const char *Cmd){
 	if (cmdp == 't') {
 		memcpy(uid, "\x04\x0d\x68\x1a\xb5\x22\x81", 7);
 		generate4bNUID(uid, nuid);
-		
+
 		bool test1 = (0 == memcmp(nuid, "\x8f\x43\x0f\xef", 4));
 		PrintAndLogEx(SUCCESS, "Selftest1 %s\n",  test1 ? _GREEN_(OK): _RED_(Fail));
-		
+
 		memcpy(uid, "\x04\x18\x3f\x09\x32\x1b\x85", 7);
 		generate4bNUID(uid, nuid);
-		bool test2 = (0 == memcmp(nuid, "\x4f\x50\x5d\x7d", 4));		
+		bool test2 = (0 == memcmp(nuid, "\x4f\x50\x5d\x7d", 4));
 		PrintAndLogEx(SUCCESS, "Selftest2 %s\n", test2 ? _GREEN_(OK) : _RED_(Fail));
 		return 0;
 	}
@@ -885,7 +885,7 @@ int CmdAnalyseNuid(const char *Cmd){
 	if ( len%2  || len != 14) return usage_analyse_nuid();
 
 	generate4bNUID(uid, nuid);
-	
+
 	PrintAndLogEx(NORMAL, "UID  | %s \n", sprint_hex(uid, 7));
 	PrintAndLogEx(NORMAL, "NUID | %s \n", sprint_hex(nuid, 4));
 	return 0;
diff --git a/client/cmdanalyse.h b/client/cmdanalyse.h
index ab7606f5c..c362744c0 100644
--- a/client/cmdanalyse.h
+++ b/client/cmdanalyse.h
@@ -23,7 +23,7 @@
 #include "tea.h"
 #include "legic_prng.h"
 #include "loclass/elite_crack.h"
-#include "mifare/mfkey.h"	//nonce2key 
+#include "mifare/mfkey.h"	//nonce2key
 #include "util_posix.h" 	// msclock
 
 
diff --git a/client/cmdcrc.c b/client/cmdcrc.c
index a34c7d351..a54653d3e 100644
--- a/client/cmdcrc.c
+++ b/client/cmdcrc.c
@@ -55,7 +55,7 @@ int CmdCrc(const char *Cmd) {
 	for(int i = 0; i < argc; ++i) {
 		free(argv[i]);
 	}
-	return 0; 
+	return 0;
 }
 
 //returns array of model names and the count of models returning
@@ -75,7 +75,7 @@ int GetModels(char *Models[], int *count, uint8_t *width){
 	#endif /* _WIN32 */
 
 	SETBMP();
-	
+
 	int args = 0, psets, pass;
 	int Cnt = 0;
 	if (width[0] == 0) { //reveng -D
@@ -100,7 +100,7 @@ int GetModels(char *Models[], int *count, uint8_t *width){
 		mfree(&model);
 	} else { //reveng -s
 
-		if (~model.flags & P_MULXN){	
+		if (~model.flags & P_MULXN){
 			 PrintAndLogEx(WARNING, "cannot search for non-Williams compliant models");
 			 return 0;
 		}
@@ -131,7 +131,7 @@ int GetModels(char *Models[], int *count, uint8_t *width){
 
 				while (psets) {
 					mbynum(&pset, --psets);
-					
+
 					/* skip if different width, or refin or refout don't match */
 					if( plen(pset.spoly) != width[0] || (model.flags ^ pset.flags) & (P_REFIN | P_REFOUT))
 						continue;
@@ -142,14 +142,14 @@ int GetModels(char *Models[], int *count, uint8_t *width){
 						continue;
 					if (rflags & R_HAVEX && psncmp(&model.xorout, &pset.xorout))
 						continue;
-			
+
 					//for additional args (not used yet, maybe future?)
 					apoly = pclone(pset.xorout);
-					
+
 					if (pset.flags & P_REFOUT)
 						prev(&apoly);
-					
-					
+
+
 					for (qptr = apolys; qptr < pptr; ++qptr) {
 						crc = pcrc(*qptr, pset.spoly, pset.init, apoly, 0);
 						if (ptst(crc)) {
@@ -159,12 +159,12 @@ int GetModels(char *Models[], int *count, uint8_t *width){
 						pfree(&crc);
 					}
 					pfree(&apoly);
-					
+
 					if (qptr == pptr) {
 
 						/* the selected model solved all arguments */
 						mcanon(&pset);
-						
+
 						size_t size = (pset.name && *pset.name) ? strlen(pset.name) : 7;
 						//PrintAndLogEx(NORMAL, "Size: %d, %s, count: %d",size,pset.name, Cnt);
 						char *tmp = calloc(size+1, sizeof(char));
@@ -201,8 +201,8 @@ int GetModels(char *Models[], int *count, uint8_t *width){
 			PrintAndLogEx(WARNING, "no models found");
 			return 0;
 		}
-			
-		if (!(model.flags & P_REFIN) != !(model.flags & P_REFOUT)){		
+
+		if (!(model.flags & P_REFIN) != !(model.flags & P_REFOUT)){
 			PrintAndLogEx(WARNING, "cannot search for crossed-endian models");
 			return 0;
 		}
@@ -223,13 +223,13 @@ int GetModels(char *Models[], int *count, uint8_t *width){
 				}
 			}
 		} while (~rflags & R_HAVERI && ++pass < 2);
-		
+
 		for (qptr = apolys; qptr < pptr; ++qptr) {
 			pfree(qptr);
 		}
 		free(apolys);
 		mfree(&model);
-		
+
 		if (~uflags & C_RESULT){
 			PrintAndLogEx(WARNING, "no models found");
 			return 0;
@@ -248,9 +248,9 @@ int GetModels(char *Models[], int *count, uint8_t *width){
 int RunModel(char *inModel, char *inHexStr, bool reverse, char endian, char *result){
 	/* default values */
 	static model_t model = MZERO;
-	
+
 	int ibperhx = 8, obperhx = 8;
-	int rflags = 0; // search flags 
+	int rflags = 0; // search flags
 	int c;
 	poly_t apoly, crc;
 
@@ -273,7 +273,7 @@ int RunModel(char *inModel, char *inHexStr, bool reverse, char endian, char *res
 		return 0;
 	}
 	rflags |= R_HAVEP | R_HAVEI | R_HAVERI | R_HAVERO | R_HAVEX;
-	
+
 	//set flags
 	switch (endian) {
 		case 'b': /* b  big-endian (RefIn = false, RefOut = false ) */
@@ -376,12 +376,12 @@ int CmdrevengTestC(const char *Cmd){
 	dataLen = param_getstr(Cmd, cmdp++, inHexStr, sizeof(inHexStr));
 	if (dataLen < 4) return 0;
 	bool reverse = (param_get8(Cmd, cmdp++)) ? true : false;
-	endian = param_getchar(Cmd, cmdp++); 
+	endian = param_getchar(Cmd, cmdp++);
 
 	//PrintAndLogEx(NORMAL, "mod: %s, hex: %s, rev %d", inModel, inHexStr, reverse);
 	int ans = RunModel(inModel, inHexStr, reverse, endian, result);
 	if (!ans) return 0;
-	
+
 	PrintAndLogEx(SUCCESS, "result: %s",result);
 	return 1;
 }
@@ -401,8 +401,8 @@ char *SwapEndianStr(const char *inStr, const size_t len, const uint8_t blockSize
 // takes hex string in and searches for a matching result (hex string must include checksum)
 int CmdrevengSearch(const char *Cmd){
 
-#define NMODELS 105	
-	
+#define NMODELS 105
+
 	char inHexStr[100] = {0x00};
 	int dataLen = param_getstr(Cmd, 0, inHexStr, sizeof(inHexStr));
 	if (dataLen < 4) return 0;
@@ -418,7 +418,7 @@ int CmdrevengSearch(const char *Cmd){
 	int ans = GetModels(Models, &count, width);
 	bool found = false;
 	if (!ans) return 0;
-	
+
 	// try each model and get result
 	for (int i = 0; i < count; i++){
 		/*if (found) {
@@ -426,9 +426,9 @@ int CmdrevengSearch(const char *Cmd){
 			continue;
 		}*/
 		// round up to # of characters in this model's crc
-		crcChars = ((width[i]+7)/8)*2; 
+		crcChars = ((width[i]+7)/8)*2;
 		// can't test a model that has more crc digits than our data
-		if (crcChars >= dataLen) 
+		if (crcChars >= dataLen)
 			continue;
 		memset(result, 0, 30);
 		char *inCRC = calloc(crcChars+1, sizeof(char));
@@ -480,7 +480,7 @@ int CmdrevengSearch(const char *Cmd){
 		free(outHex);
 		free(Models[i]);
 	}
-	
+
 	if (!found) PrintAndLogEx(FAILED, "\nno matches found\n");
 	return 1;
 }
\ No newline at end of file
diff --git a/client/cmddata.c b/client/cmddata.c
index 0403c4f28..998ce3779 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -24,14 +24,14 @@ int usage_data_printdemodbuf(void){
 	PrintAndLogEx(NORMAL, "       x          output in hex (omit for binary output)");
 	PrintAndLogEx(NORMAL, "       o <offset> enter offset in # of bits");
 	PrintAndLogEx(NORMAL, "       l <length> enter length to print in # of bits or hex characters respectively");
-	return 0;	
+	return 0;
 }
 int usage_data_manrawdecode(void){
 	PrintAndLogEx(NORMAL, "Usage:  data manrawdecode [invert] [maxErr]");
 	PrintAndLogEx(NORMAL, "     Takes 10 and 01 and converts to 0 and 1 respectively");
 	PrintAndLogEx(NORMAL, "     --must have binary sequence in demodbuffer (run data askrawdemod first)");
-	PrintAndLogEx(NORMAL, "  [invert]  invert output");		
-	PrintAndLogEx(NORMAL, "  [maxErr]  set number of errors allowed (default = 20)");		
+	PrintAndLogEx(NORMAL, "  [invert]  invert output");
+	PrintAndLogEx(NORMAL, "  [maxErr]  set number of errors allowed (default = 20)");
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "   Example: data manrawdecode   = decode manchester bitstream from the demodbuffer");
 	return 0;
@@ -52,10 +52,10 @@ int usage_data_biphaserawdecode(void){
 }
 int usage_data_rawdemod(void){
 	PrintAndLogEx(NORMAL, "Usage:  data rawdemod [modulation] <help>|<options>");
-	PrintAndLogEx(NORMAL, "   [modulation] as 2 char, 'ab' for ask/biphase, 'am' for ask/manchester, 'ar' for ask/raw, 'fs' for fsk, ...");		
+	PrintAndLogEx(NORMAL, "   [modulation] as 2 char, 'ab' for ask/biphase, 'am' for ask/manchester, 'ar' for ask/raw, 'fs' for fsk, ...");
 	PrintAndLogEx(NORMAL, "         'nr' for nrz/direct, 'p1' for psk1, 'p2' for psk2");
-	PrintAndLogEx(NORMAL, "   <help> as 'h', prints the help for the specific modulation");	
-	PrintAndLogEx(NORMAL, "   <options> see specific modulation help for optional parameters");				
+	PrintAndLogEx(NORMAL, "   <help> as 'h', prints the help for the specific modulation");
+	PrintAndLogEx(NORMAL, "   <options> see specific modulation help for optional parameters");
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "   Example: data rawdemod fs h         = print help specific to fsk demod");
 	PrintAndLogEx(NORMAL, "          : data rawdemod fs           = demod GraphBuffer using: fsk - autodetect");
@@ -132,7 +132,7 @@ int usage_data_rawdemod_fs(void){
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "   Example: data rawdemod fs           = demod an fsk tag from GraphBuffer using autodetect");
 	PrintAndLogEx(NORMAL, "          : data rawdemod fs 32        = demod an fsk tag from GraphBuffer using a clock of RF/32, autodetect fc");
-	PrintAndLogEx(NORMAL, "          : data rawdemod fs 1         = demod an fsk tag from GraphBuffer using autodetect, invert output");   
+	PrintAndLogEx(NORMAL, "          : data rawdemod fs 1         = demod an fsk tag from GraphBuffer using autodetect, invert output");
 	PrintAndLogEx(NORMAL, "          : data rawdemod fs 32 1      = demod an fsk tag from GraphBuffer using a clock of RF/32, invert output, autodetect fc");
 	PrintAndLogEx(NORMAL, "          : data rawdemod fs 64 0 8 5  = demod an fsk1 RF/64 tag from GraphBuffer");
 	PrintAndLogEx(NORMAL, "          : data rawdemod fs 50 0 10 8 = demod an fsk2 RF/50 tag from GraphBuffer");
@@ -232,7 +232,7 @@ int usage_data_fsktonrz() {
 		PrintAndLogEx(NORMAL, "       c <clock>    enter the a clock (omit to autodetect)");
 		PrintAndLogEx(NORMAL, "       l <fc_low>   enter a field clock (omit to autodetect)");
 		PrintAndLogEx(NORMAL, "       f <fc_high>  enter a field clock (omit to autodetect)");
-		return 0;	
+		return 0;
 }
 
 //set the demod buffer with given array of binary (one bit per byte)
@@ -242,10 +242,10 @@ void setDemodBuf(uint8_t *buf, size_t size, size_t start_idx) {
 
 	if ( size > MAX_DEMOD_BUF_LEN - start_idx)
 		size = MAX_DEMOD_BUF_LEN - start_idx;
-	
+
 	for (size_t i = 0; i < size; i++)
 		DemodBuffer[i] = buf[start_idx++];
-	
+
 	DemodBufferLen = size;
 }
 
@@ -271,13 +271,13 @@ double rms(double *v, size_t n) {
 int cmp_int( const void *a, const void *b) {
     if (*(const int *)a < *(const int *)b)
 		return -1;
-    else 
+    else
 		return *(const int *)a > *(const int *)b;
 }
 int cmp_uint8( const void *a, const void *b) {
     if (*(const uint8_t *)a < *(const uint8_t *)b)
 		return -1;
-    else 
+    else
 		return *(const uint8_t *)a > *(const uint8_t *)b;
 }
 // Median of a array of values
@@ -306,7 +306,7 @@ static double compute_variance(const int *data, size_t n) {
 	for (size_t i=0; i < n; i++)
 		variance += pow(( data[i] - mean), 2.0);
 
-	variance /= n;	
+	variance /= n;
 	return variance;
 }
 
@@ -319,10 +319,10 @@ static double compute_autoc(const int *data, size_t n, int lag) {
 	double ac_value;		// Computed autocorrelation value to be returned
 	double variance; 		// Computed variance
 	double mean;
-	
+
 	mean = compute_mean(data, n);
 	variance = compute_variance(data, n);
-	
+
 	for (size_t i=0; i < (n - lag); i++)
 		autocv += (data[i] - mean) * (data[i+lag] - mean);
 
@@ -350,13 +350,13 @@ void save_restoreDB(uint8_t saveOpt) {
 		savedDemodStartIdx = g_DemodStartIdx;
 		savedDemodClock = g_DemodClock;
 	} else if (DB_Saved) { //restore
-	
+
 		memcpy(DemodBuffer, SavedDB, sizeof(DemodBuffer));
 		DemodBufferLen = SavedDBlen;
 		g_DemodClock = savedDemodClock;
 		g_DemodStartIdx = savedDemodStartIdx;
 	}
-}								  
+}
 
 int CmdSetDebugMode(const char *Cmd) {
 	int demod = 0;
@@ -373,7 +373,7 @@ void printDemodBuff(void) {
 		PrintAndLogEx(NORMAL, "(printDemodBuff) no bits found in demod buffer");
 		return;
 	}
-	if (len > 512) len = 512; 
+	if (len > 512) len = 512;
 
 	PrintAndLogEx(NORMAL, "%s", sprint_bin_break(DemodBuffer, len, 16) );
 }
@@ -411,12 +411,12 @@ int CmdPrintDemodBuff(const char *Cmd) {
 	}
 	//Validations
 	if (errors) return usage_data_printdemodbuf();
-	
+
 	if (DemodBufferLen == 0) {
 		PrintAndLogEx(NORMAL, "Demodbuffer is empty");
 		return 0;
 	}
-	length = (length > (DemodBufferLen-offset)) ? DemodBufferLen-offset : length; 
+	length = (length > (DemodBufferLen-offset)) ? DemodBufferLen-offset : length;
 	int numBits = (length) & 0x00FFC; //make sure we don't exceed our string
 
 	if (hexMode){
@@ -426,7 +426,7 @@ int CmdPrintDemodBuff(const char *Cmd) {
 		if (numBits == 0) {
 			return 0;
 		}
-		PrintAndLogEx(NORMAL, "DemodBuffer: %s", hex);		
+		PrintAndLogEx(NORMAL, "DemodBuffer: %s", hex);
 	} else {
 		PrintAndLogEx(NORMAL, "DemodBuffer:\n%s", sprint_bin_break(DemodBuffer+offset, numBits, 16));
 	}
@@ -439,7 +439,7 @@ int CmdGetBitStream(const char *Cmd) {
 	CmdHpf(Cmd);
 	for (uint32_t i = 0; i < GraphTraceLen; i++)
 		GraphBuffer[i] = (GraphBuffer[i] >= 1) ? 1 : 0;
-	
+
 	RepaintGraphWindow();
 	return 0;
 }
@@ -449,7 +449,7 @@ int CmdGetBitStream(const char *Cmd) {
 //   (amp may not be needed anymore)
 //verbose will print results and demoding messages
 //emSearch will auto search for EM410x format in bitstream
-//askType switches decode: ask/raw = 0, ask/manchester = 1 
+//askType switches decode: ask/raw = 0, ask/manchester = 1
 int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType, bool *stCheck) {
 	int invert = 0;
 	int clk = 0;
@@ -484,11 +484,11 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
 	int foundclk = 0;
 	//amp before ST check
 	if (amp == 'a')
-		askAmp(bits, BitLen); 
+		askAmp(bits, BitLen);
 
 	bool st = false;
 	size_t ststart = 0, stend = 0;
-	if (*stCheck) 
+	if (*stCheck)
 		st = DetectST(bits, &BitLen, &foundclk, &ststart, &stend);
 
 	if (st) {
@@ -496,7 +496,7 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
 		clk = (clk == 0) ? foundclk : clk;
 		CursorCPos = ststart;
 		CursorDPos = stend;
-		if (verbose || g_debugMode) 
+		if (verbose || g_debugMode)
 			PrintAndLogEx(NORMAL, "Found Sequence Terminator - First one is shown by orange and blue graph markers");
 	}
 
@@ -512,7 +512,7 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
 		PrintAndLogEx(DEBUG, "DEBUG: (ASKDemod_ext) Too many errors found, errors:%d, bits:%d, clock:%d", errCnt, BitLen, clk);
 		return 0;
 	}
-	
+
 	if (verbose || g_debugMode) PrintAndLogEx(DEBUG, "DEBUG: (ASKDemod_ext) Using clock:%d, invert:%d, bits found:%d", clk, invert, BitLen);
 
 	//output
@@ -520,14 +520,14 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
 	setClockGrid(clk, startIdx);
 
 	if (verbose || g_debugMode){
-		if (errCnt > 0) 
+		if (errCnt > 0)
 			PrintAndLogEx(NORMAL, "# Errors during Demoding (shown as 7 in bit stream): %d",errCnt);
-		if (askType) 
+		if (askType)
 			PrintAndLogEx(NORMAL, "ASK/Manchester - Clock: %d - Decoded bitstream:",clk);
-		else 
+		else
 			PrintAndLogEx(NORMAL, "ASK/Raw - Clock: %d - Decoded bitstream:",clk);
 		// Now output the bitstream to the scrollback by line of 16 bits
-		printDemodBuff();		
+		printDemodBuff();
 	}
 	uint64_t lo = 0;
 	uint32_t hi = 0;
@@ -570,17 +570,17 @@ int Cmdmandecoderaw(const char *Cmd) {
 	if (strlen(Cmd) > 5 || cmdp == 'h') return usage_data_manrawdecode();
 
 	if (DemodBufferLen == 0) return 0;
-	
+
 	uint8_t bits[MAX_DEMOD_BUF_LEN] = {0};
-	
+
 	for (; i < DemodBufferLen; ++i){
-		if (DemodBuffer[i] > high) 
+		if (DemodBuffer[i] > high)
 			high = DemodBuffer[i];
-		else if(DemodBuffer[i] < low) 
+		else if(DemodBuffer[i] < low)
 			low = DemodBuffer[i];
 		bits[i] = DemodBuffer[i];
 	}
-	
+
 	if (high > 7 || low < 0 ){
 		PrintAndLogEx(WARNING, "Error: please raw demod the wave first then manchester raw decode");
 		return 0;
@@ -594,10 +594,10 @@ int Cmdmandecoderaw(const char *Cmd) {
 		PrintAndLogEx(WARNING, "Too many errors: %d",errCnt);
 		return 0;
 	}
-	
+
 	PrintAndLogEx(NORMAL, "Manchester Decoded - # errors:%d - data:",errCnt);
 	PrintAndLogEx(NORMAL, "%s", sprint_bin_break(bits, size, 16));
-	
+
 	if (errCnt == 0){
 		uint64_t id = 0;
 		uint32_t hi = 0;
@@ -628,11 +628,11 @@ int CmdBiphaseDecodeRaw(const char *Cmd) {
 		PrintAndLogEx(NORMAL, "DemodBuffer Empty - run 'data rawdemod ar' first");
 		return 0;
 	}
-	
+
 	uint8_t bits[MAX_DEMOD_BUF_LEN] = {0};
 	size = sizeof(bits);
 	if ( !getDemodBuf(bits, &size) ) return 0;
-	
+
 	errCnt = BiphaseRawDecode(bits, &size, &offset, invert);
 	if (errCnt < 0){
 		PrintAndLogEx(WARNING, "Error during decode:%d", errCnt);
@@ -648,11 +648,11 @@ int CmdBiphaseDecodeRaw(const char *Cmd) {
 
 	PrintAndLogEx(NORMAL, "Biphase Decoded using offset: %d - # invert:%d - data:",offset,invert);
 	PrintAndLogEx(NORMAL, "%s", sprint_bin_break(bits, size, 16));
-	
+
 	//remove first bit from raw demod
-	if (offset) 
+	if (offset)
 		setDemodBuf(DemodBuffer,DemodBufferLen-offset, offset);
-	
+
 	setClockGrid(g_DemodClock, g_DemodStartIdx + g_DemodClock*offset/2);
 	return 1;
 }
@@ -664,27 +664,27 @@ int ASKbiphaseDemod(const char *Cmd, bool verbose)
 	//ask raw demod GraphBuffer first
 	int offset=0, clk=0, invert=0, maxErr=0;
 	sscanf(Cmd, "%i %i %i %i", &offset, &clk, &invert, &maxErr);
-	
+
 	uint8_t BitStream[MAX_DEMOD_BUF_LEN];
-	size_t size = getFromGraphBuf(BitStream);	
+	size_t size = getFromGraphBuf(BitStream);
 	if (size == 0 ) {
-		PrintAndLogEx(DEBUG, "DEBUG: no data in graphbuf");  
-		return 0;  
+		PrintAndLogEx(DEBUG, "DEBUG: no data in graphbuf");
+		return 0;
 	}
-	int startIdx = 0;	
+	int startIdx = 0;
 	//invert here inverts the ask raw demoded bits which has no effect on the demod, but we need the pointer
-	int errCnt = askdemod_ext(BitStream, &size, &clk, &invert, maxErr, 0, 0, &startIdx);  
-	if ( errCnt < 0 || errCnt > maxErr ) {   
-		PrintAndLogEx(DEBUG, "DEBUG: no data or error found %d, clock: %d", errCnt, clk);  
-		return 0;  
-	} 
+	int errCnt = askdemod_ext(BitStream, &size, &clk, &invert, maxErr, 0, 0, &startIdx);
+	if ( errCnt < 0 || errCnt > maxErr ) {
+		PrintAndLogEx(DEBUG, "DEBUG: no data or error found %d, clock: %d", errCnt, clk);
+		return 0;
+	}
 
 	//attempt to Biphase decode BitStream
 	errCnt = BiphaseRawDecode(BitStream, &size, &offset, invert);
 	if (errCnt < 0){
 		if (g_debugMode || verbose) PrintAndLogEx(DEBUG, "DEBUG: Error BiphaseRawDecode: %d", errCnt);
 		return 0;
-	} 
+	}
 	if (errCnt > maxErr) {
 		if (g_debugMode || verbose) PrintAndLogEx(DEBUG, "DEBUG: Error BiphaseRawDecode too many errors: %d", errCnt);
 		return 0;
@@ -712,16 +712,16 @@ int Cmdaskrawdemod(const char *Cmd)
 {
 	char cmdp = tolower(param_getchar(Cmd, 0));
 	if (strlen(Cmd) > 25 || cmdp == 'h') return usage_data_rawdemod_ar();
-	
+
 	return ASKDemod(Cmd, true, false, 0);
 }
 
 int AutoCorrelate(const int *in, int *out, size_t len, int window, bool SaveGrph, bool verbose) {
 	// sanity check
 	if ( window > len ) window = len;
-	
+
 	if (verbose) PrintAndLogEx(INFO, "performing %d correlations", GraphTraceLen - window);
-	
+
 	//test
 	double autocv = 0.0;	// Autocovariance value
 	double ac_value;		// Computed autocorrelation value to be returned
@@ -729,13 +729,13 @@ int AutoCorrelate(const int *in, int *out, size_t len, int window, bool SaveGrph
 	double mean;
 	size_t correlation = 0;
 	int lastmax = 0;
-	
+
 	// in, len, 4000
 	mean = compute_mean(in, len);
 	variance = compute_variance(in, len);
-		
+
 	static int CorrelBuffer[MAX_GRAPH_TRACE_LEN];
-	
+
 	for (int i = 0; i < len - window; ++i) {
 
 		for (size_t j=0; j < (len - i); j++) {
@@ -744,7 +744,7 @@ int AutoCorrelate(const int *in, int *out, size_t len, int window, bool SaveGrph
 		autocv = (1.0 / (len - i)) * autocv;
 
 		CorrelBuffer[i] = autocv;
-		
+
 		// Autocorrelation is autocovariance divided by variance
 		ac_value = autocv / variance;
 
@@ -754,8 +754,8 @@ int AutoCorrelate(const int *in, int *out, size_t len, int window, bool SaveGrph
 			lastmax = i;
 		}
 	}
-	
-	// 
+
+	//
 	int hi = 0, idx = 0;
 	int distance = 0, hi_1 = 0, idx_1 = 0;
 	for (int i = 0; i <= len; ++i){
@@ -764,7 +764,7 @@ int AutoCorrelate(const int *in, int *out, size_t len, int window, bool SaveGrph
 			idx = i;
 		}
 	}
-	
+
 	for (int i = idx+1; i <= window; ++i){
 		if ( CorrelBuffer[i] > hi_1 ) {
 			hi_1 = CorrelBuffer[i];
@@ -773,7 +773,7 @@ int AutoCorrelate(const int *in, int *out, size_t len, int window, bool SaveGrph
 	}
 
 	int foo = ABS(hi-hi_1);
-	int bar = (int)((int)((hi+hi_1) / 2) * 0.03);  
+	int bar = (int)((int)((hi+hi_1) / 2) * 0.03);
 	if ( verbose && foo < bar ) {
 		distance = idx_1 - idx;
 		PrintAndLogEx(SUCCESS, "possible 3% visible correlation %4d samples", distance);
@@ -782,7 +782,7 @@ int AutoCorrelate(const int *in, int *out, size_t len, int window, bool SaveGrph
 	} else {
 		PrintAndLogEx(FAILED, "no repeating pattern found, try increasing window size");
 	}
-	
+
 	int retval = correlation;
 	if (SaveGrph) {
 		//GraphTraceLen = GraphTraceLen - window;
@@ -792,14 +792,14 @@ int AutoCorrelate(const int *in, int *out, size_t len, int window, bool SaveGrph
 			retval = distance;
 		}
 		else
-			setClockGrid(correlation, idx);	
-		
+			setClockGrid(correlation, idx);
+
 		CursorCPos = idx_1;
 		CursorDPos = idx_1+retval;
 		DemodBufferLen = 0;
-		RepaintGraphWindow();  
+		RepaintGraphWindow();
 	}
-	
+
 	return retval;
 }
 
@@ -809,7 +809,7 @@ int CmdAutoCorr(const char *Cmd) {
 	uint8_t cmdp = 0;
 	bool updateGrph = false;
 	bool errors = false;
-	
+
 	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
 		switch (tolower(param_getchar(Cmd, cmdp))) {
 			case 'h':
@@ -818,7 +818,7 @@ int CmdAutoCorr(const char *Cmd) {
 				updateGrph = true;
 				cmdp++;
 				break;
-			case 'w': 
+			case 'w':
 				window = param_get32ex(Cmd, cmdp+1, 4000, 10);
 				if (window >= GraphTraceLen) {
 					PrintAndLogEx(WARNING, "window must be smaller than trace (%d samples)", GraphTraceLen);
@@ -834,7 +834,7 @@ int CmdAutoCorr(const char *Cmd) {
 	}
 	//Validations
 	if (errors || cmdp == 0 ) return usage_data_autocorr();
-	
+
 	return AutoCorrelate(GraphBuffer, GraphBuffer, GraphTraceLen, window, updateGrph, true);
 }
 
@@ -847,7 +847,7 @@ int CmdBitsamples(const char *Cmd)
 		PrintAndLogEx(WARNING, "command execution time out");
 		return false;
 	}
-	
+
 	for (int j = 0; j < sizeof(got); j++) {
 		for (int k = 0; k < 8; k++) {
 			if(got[j] & (1 << (7 - k)))
@@ -865,7 +865,7 @@ int CmdBuffClear(const char *Cmd)
 {
 	char cmdp = param_getchar(Cmd, 0);
 	if (cmdp == 'h' || cmdp == 'H') return usage_data_buffclear();
-	
+
 	UsbCommand c = {CMD_BUFF_CLEAR, {0,0,0}};
 	clearCommandBuffer();
 	SendCommand(&c);
@@ -924,12 +924,12 @@ int CmdGraphShiftZero(const char *Cmd) {
 	for(int i = 0; i < GraphTraceLen; i++){
 		if ( i+shift >= GraphTraceLen)
 			shiftedVal = GraphBuffer[i];
-		else 
+		else
 			shiftedVal = GraphBuffer[i] + shift;
-		
-		if (shiftedVal > 127) 
+
+		if (shiftedVal > 127)
 			shiftedVal = 127;
-		else if (shiftedVal < -127) 
+		else if (shiftedVal < -127)
 			shiftedVal = -127;
 		GraphBuffer[i] = shiftedVal;
 	}
@@ -951,12 +951,12 @@ int AskEdgeDetect(const int *in, int *out, int len, int threshold) {
 
 //by marshmellow
 //use large jumps in read samples to identify edges of waves and then amplify that wave to max
-//similar to dirtheshold, threshold commands 
+//similar to dirtheshold, threshold commands
 //takes a threshold length which is the measured length between two samples then determines an edge
 int CmdAskEdgeDetect(const char *Cmd) {
 	int thresLen = 25;
 	int ans = 0;
-	sscanf(Cmd, "%i", &thresLen); 
+	sscanf(Cmd, "%i", &thresLen);
 
 	ans = AskEdgeDetect(GraphBuffer, GraphBuffer, GraphTraceLen, thresLen);
 	RepaintGraphWindow();
@@ -996,23 +996,23 @@ int CmdDetectClockRate(const char *Cmd) {
 char *GetFSKType(uint8_t fchigh, uint8_t fclow, uint8_t invert)
 {
 	static char fType[8];
-	memset(fType, 0x00, 8);	
+	memset(fType, 0x00, 8);
 	char *fskType = fType;
-	
+
 	if (fchigh == 10 && fclow == 8){
-		
+
 		if (invert)
 			memcpy(fskType, "FSK2a", 5);
 		else
 			memcpy(fskType, "FSK2", 4);
-		
+
 	} else if (fchigh == 8 && fclow == 5) {
-		
+
 		if (invert)
 			memcpy(fskType, "FSK1", 4);
 		else
 			memcpy(fskType, "FSK1a", 5);
-		
+
 	} else {
 		memcpy(fskType, "FSK??", 5);
 	}
@@ -1033,7 +1033,7 @@ int FSKrawDemod(const char *Cmd, bool verbose) {
 	invert = param_get8(Cmd, 1);
 	fchigh = param_get8(Cmd, 2);
 	fclow = param_get8(Cmd, 3);
-	
+
 	if (strlen(Cmd) > 0 && strlen(Cmd) <= 2) {
 		if (rfLen == 1) {
 			invert = 1;   //if invert option only is used
@@ -1044,7 +1044,7 @@ int FSKrawDemod(const char *Cmd, bool verbose) {
 	uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
 	size_t BitLen = getFromGraphBuf(bits);
 	if (BitLen == 0) return 0;
-	
+
 	//get field clock lengths
 	uint16_t fcs = 0;
 	if (!fchigh || !fclow) {
@@ -1115,7 +1115,7 @@ int PSKDemod(const char *Cmd, bool verbose) {
 	if (errCnt > maxErr){
 		if (g_debugMode || verbose) PrintAndLogEx(DEBUG, "DEBUG: (PSKdemod) Too many errors found, clk: %d, invert: %d, numbits: %d, errCnt: %d", clk, invert, BitLen, errCnt);
 		return 0;
-	} 
+	}
 	if (errCnt < 0|| BitLen < 16){  //throw away static - allow 1 and -1 (in case of threshold command first)
 		if (g_debugMode || verbose) PrintAndLogEx(DEBUG, "DEBUG: (PSKdemod) no data found, clk: %d, invert: %d, numbits: %d, errCnt: %d", clk, invert, BitLen, errCnt);
 		return 0;
@@ -1154,7 +1154,7 @@ int CmdPSKIdteck(const char *Cmd) {
 			PrintAndLogEx(DEBUG, "DEBUG: Error - Idteck: size not correct: %d", size);
 		else
 			PrintAndLogEx(DEBUG, "DEBUG: Error - Idteck: idx: %d",idx);
-	
+
 		// if didn't find preamble try again inverting
 		if (!PSKDemod("1", false)) {
 			PrintAndLogEx(DEBUG, "DEBUG: Error - Idteck PSKDemod failed");
@@ -1162,11 +1162,11 @@ int CmdPSKIdteck(const char *Cmd) {
 		}
 		idx = detectIdteck(DemodBuffer, &size);
 		if (idx < 0){
-			
+
 			if (idx == -1)
 				PrintAndLogEx(DEBUG, "DEBUG: Error - Idteck: not enough samples");
 			else if (idx == -2)
-				PrintAndLogEx(DEBUG, "DEBUG: Error - Idteck: just noise");			
+				PrintAndLogEx(DEBUG, "DEBUG: Error - Idteck: just noise");
 			else if (idx == -3)
 				PrintAndLogEx(DEBUG, "DEBUG: Error - Idteck: preamble not found");
 			else if (idx == -4)
@@ -1175,15 +1175,15 @@ int CmdPSKIdteck(const char *Cmd) {
 				PrintAndLogEx(DEBUG, "DEBUG: Error - Idteck: idx: %d",idx);
 
 			return 0;
-		}		
+		}
 	}
 	setDemodBuf(DemodBuffer, 64, idx);
-	
+
 	//got a good demod
 	uint32_t id = 0;
 	uint32_t raw1 = bytebits_to_byte(DemodBuffer, 32);
 	uint32_t raw2 = bytebits_to_byte(DemodBuffer+32, 32);
-	
+
 	//parity check (TBD)
 	//checksum check (TBD)
 
@@ -1205,22 +1205,22 @@ int NRZrawDemod(const char *Cmd, bool verbose) {
 		invert = 1;
 		clk = 0;
 	}
-	
+
 	if (invert != 0 && invert != 1) {
 		PrintAndLogEx(WARNING, "(NRZrawDemod) Invalid argument: %s", Cmd);
 		return 0;
 	}
-	
+
 	uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
 	size_t BitLen = getFromGraphBuf(bits);
-	
+
 	if (BitLen == 0) return 0;
-	
+
 	errCnt = nrzRawDemod(bits, &BitLen, &clk, &invert, &clkStartIdx);
 	if (errCnt > maxErr){
 		PrintAndLogEx(DEBUG, "DEBUG: (NRZrawDemod) Too many errors found, clk: %d, invert: %d, numbits: %d, errCnt: %d",clk,invert,BitLen,errCnt);
 		return 0;
-	} 
+	}
 	if (errCnt < 0 || BitLen < 16){  //throw away static - allow 1 and -1 (in case of threshold command first)
 		PrintAndLogEx(DEBUG, "DEBUG: (NRZrawDemod) no data found, clk: %d, invert: %d, numbits: %d, errCnt: %d", clk, invert, BitLen, errCnt);
 		return 0;
@@ -1237,7 +1237,7 @@ int NRZrawDemod(const char *Cmd, bool verbose) {
 		// Now output the bitstream to the scrollback by line of 16 bits
 		printDemodBuff();
 	}
-	return 1; 
+	return 1;
 }
 
 int CmdNRZrawDemod(const char *Cmd) {
@@ -1258,7 +1258,7 @@ int CmdPSK1rawDemod(const char *Cmd) {
 	int ans = PSKDemod(Cmd, true);
 	//output
 	if (!ans){
-		if (g_debugMode) PrintAndLogEx(WARNING, "Error demoding: %d",ans); 
+		if (g_debugMode) PrintAndLogEx(WARNING, "Error demoding: %d",ans);
 		return 0;
 	}
 	PrintAndLogEx(NORMAL, "PSK1 demoded bitstream:");
@@ -1275,13 +1275,13 @@ int CmdPSK2rawDemod(const char *Cmd) {
 
 	int ans = PSKDemod(Cmd, true);
 	if (!ans){
-		if (g_debugMode) PrintAndLogEx(WARNING, "Error demoding: %d",ans);  
+		if (g_debugMode) PrintAndLogEx(WARNING, "Error demoding: %d",ans);
 		return 0;
-	} 
+	}
 	psk1TOpsk2(DemodBuffer, DemodBufferLen);
 	PrintAndLogEx(NORMAL, "PSK2 demoded bitstream:");
 	// Now output the bitstream to the scrollback by line of 16 bits
-	printDemodBuff();  
+	printDemodBuff();
 	return 1;
 }
 
@@ -1291,7 +1291,7 @@ int CmdRawDemod(const char *Cmd) {
 
 	if (strlen(Cmd) > 35 || strlen(Cmd) < 2)
 		return usage_data_rawdemod();
-	
+
 	str_lower( (char *)Cmd);
 
 	if (str_startswith(Cmd, "fs")) 	   ans = CmdFSKrawdemod(Cmd+2);
@@ -1355,7 +1355,7 @@ int CmdHexsamples(const char *Cmd) {
 	/* if no args send something */
 	if (requested == 0)
 		requested = 8;
-	
+
 	if (offset + requested > sizeof(got)) {
 		PrintAndLogEx(NORMAL, "Tried to read past end of buffer, <bytes> + <offset> > %d", BIGBUF_SIZE);
 		return 0;
@@ -1365,7 +1365,7 @@ int CmdHexsamples(const char *Cmd) {
 		PrintAndLogEx(WARNING, "command execution time out");
 		return false;
 	}
-	
+
 	i = 0;
 	for (j = 0; j < requested; j++) {
 		i++;
@@ -1438,7 +1438,7 @@ int getSamples(int n, bool silent) {
     }
 
 	if (!silent) PrintAndLogEx(NORMAL, "Data fetched");
-	
+
 	uint8_t bits_per_sample = 8;
 
 	//Old devices without this feature would send 0 at arg[0]
@@ -1447,11 +1447,11 @@ int getSamples(int n, bool silent) {
 		if (!silent) PrintAndLogEx(NORMAL, "Samples @ %d bits/smpl, decimation 1:%d ", sc->bits_per_sample, sc->decimation);
 		bits_per_sample = sc->bits_per_sample;
 	}
-	
+
 	if (bits_per_sample < 8) {
-		
+
 		if (!silent) PrintAndLogEx(NORMAL, "Unpacking...");
-		
+
 		BitstreamOut bout = { got, bits_per_sample * n,  0};
 		int j =0;
 		for (j = 0; j * bits_per_sample < n * 8 && j < n; j++) {
@@ -1459,9 +1459,9 @@ int getSamples(int n, bool silent) {
 			GraphBuffer[j] = ((int) sample )- 128;
 		}
 		GraphTraceLen = j;
-		
+
 		if (!silent) PrintAndLogEx(NORMAL, "Unpacked %d samples" , j );
-		
+
 	} else {
 		for (int j = 0; j < n; j++) {
 			GraphBuffer[j] = ((int)got[j]) - 128;
@@ -1497,8 +1497,8 @@ int CmdTuneSamples(const char *Cmd) {
 	DemodBufferLen = 0;
 	setClockGrid(0, 0);
 	RepaintGraphWindow();
-	
-	
+
+
 	int timeout = 0;
 	PrintAndLogEx(INFO, "\nmeasuring antenna characteristics, please wait...");
 
@@ -1515,14 +1515,14 @@ int CmdTuneSamples(const char *Cmd) {
 		}
 	}
 	PrintAndLogEx(NORMAL, "\n");
-	
+
 	uint32_t v_lf125 = resp.arg[0];
 	uint32_t v_lf134 = resp.arg[0] >> 32;
-	
+
 	uint32_t v_hf = resp.arg[1];
 	uint32_t peakf = resp.arg[2];
 	uint32_t peakv = resp.arg[2] >> 32;
-	
+
 	if ( v_lf125 > NON_VOLTAGE )
 		PrintAndLogEx(SUCCESS, "LF antenna: %5.2f V - 125.00 kHz", (v_lf125 * ANTENNA_ERROR)/1000.0);
 	if ( v_lf134 > NON_VOLTAGE )
@@ -1531,7 +1531,7 @@ int CmdTuneSamples(const char *Cmd) {
 		PrintAndLogEx(SUCCESS, "LF optimal: %5.2f V - %6.2f kHz", (peakv * ANTENNA_ERROR)/1000.0, 12000.0/(peakf+1));
 
 	char judgement[20];
-	memset(judgement, 0, sizeof(judgement));		
+	memset(judgement, 0, sizeof(judgement));
 	// LF evaluation
 	if (peakv < LF_UNUSABLE_V)
 		sprintf(judgement, _RED_(UNUSABLE) );
@@ -1539,25 +1539,25 @@ int CmdTuneSamples(const char *Cmd) {
 		sprintf(judgement, _YELLOW_(MARGINAL) );
 	else
 		sprintf(judgement, _GREEN_(OK) );
-	
+
 	PrintAndLogEx(NORMAL, "%sLF antenna is %s \n"
 			, (peakv < LF_UNUSABLE_V) ? _CYAN_([!]) : _GREEN_([+])
 			, judgement
 			);
-	
+
 	// HF evaluation
 	if ( v_hf > NON_VOLTAGE )
 		PrintAndLogEx(SUCCESS, "HF antenna: %5.2f V - 13.56 MHz", (v_hf * ANTENNA_ERROR)/1000.0);
 
 	memset(judgement, 0, sizeof(judgement));
-	
-	if (v_hf < HF_UNUSABLE_V)  
+
+	if (v_hf < HF_UNUSABLE_V)
 		sprintf(judgement, _RED_(UNUSABLE) );
 	else if (v_hf < HF_MARGINAL_V)
 		sprintf(judgement, _YELLOW_(MARGINAL) );
 	else
 		sprintf(judgement, _GREEN_(OK) );
-	
+
 	PrintAndLogEx(NORMAL, "%sHF antenna is %s"
 			, (v_hf < HF_UNUSABLE_V) ? _CYAN_([!]) : _GREEN_([+])
 			, judgement
@@ -1590,7 +1590,7 @@ int CmdLoad(const char *Cmd) {
 	len = strlen(Cmd);
 	if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
 	memcpy(filename, Cmd, len);
-	
+
 	FILE *f = fopen(filename, "r");
 	if (!f) {
 		PrintAndLogEx(WARNING, "couldn't open '%s'", filename);
@@ -1607,7 +1607,7 @@ int CmdLoad(const char *Cmd) {
 		fclose(f);
 
 	PrintAndLogEx(SUCCESS, "loaded %d samples", GraphTraceLen);
-	
+
 	uint8_t bits[GraphTraceLen];
 	size_t size = getFromGraphBuf(bits);
 	// set signal properties low/high/mean/amplitude and is_noise detection
@@ -1639,7 +1639,7 @@ int CmdLtrim(const char *Cmd) {
 
 // trim graph from the beginning
 int CmdRtrim(const char *Cmd) {
-	
+
 	int ds = atoi(Cmd);
 
 	// sanitycheck
@@ -1656,7 +1656,7 @@ int CmdMtrim(const char *Cmd) {
 	sscanf(Cmd, "%i %i", &start, &stop);
 
 	if (start > GraphTraceLen || stop > GraphTraceLen || start > stop) return 1;
-	
+
 	// leave start position sample
 	start++;
 
@@ -1706,7 +1706,7 @@ int CmdSave(const char *Cmd) {
 	len = strlen(Cmd);
 	if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
 	memcpy(filename, Cmd, len);
-	 
+
 	FILE *f = fopen(filename, "w");
 	if(!f) {
 		PrintAndLogEx(WARNING, "couldn't open '%s'", filename);
@@ -1736,10 +1736,10 @@ int CmdScale(const char *Cmd) {
 int directionalThreshold(const int* in, int *out, size_t len, int8_t up, int8_t down) {
 
 	int lastValue = in[0];
-	
+
 	// Will be changed at the end, but init 0 as we adjust to last samples
 	// value if no threshold kicks in.
-	out[0] = 0; 
+	out[0] = 0;
 
 	for (size_t i = 1; i < len; ++i) {
 		// Apply first threshold to samples heading up
@@ -1760,9 +1760,9 @@ int directionalThreshold(const int* in, int *out, size_t len, int8_t up, int8_t
 			out[i] = out[i-1];
 		}
 	}
-	
+
 	// Align with first edited sample.
-	out[0] = out[1]; 
+	out[0] = out[1];
 	return 0;
 }
 
@@ -1773,7 +1773,7 @@ int CmdDirectionalThreshold(const char *Cmd) {
 	PrintAndLogEx(INFO, "Applying Up Threshold: %d, Down Threshold: %d\n", up, down);
 
 	directionalThreshold(GraphBuffer, GraphBuffer, GraphTraceLen, up, down);
-	
+
 	// set signal properties low/high/mean/amplitude and isnoice detection
 	uint8_t bits[GraphTraceLen];
 	size_t size = getFromGraphBuf(bits);
@@ -1836,9 +1836,9 @@ int Cmdbin2hex(const char *Cmd) {
 		char c = Cmd[bg];
 		if( c == '1')
 			pushBit(&bout, 1);
-		else if( c == '0')	
+		else if( c == '0')
 			pushBit(&bout, 0);
-		else 
+		else
 			PrintAndLogEx(NORMAL, "Ignoring '%c'", c);
 	}
 
@@ -1901,7 +1901,7 @@ void GetHiLoTone(int *LowTone, int *HighTone, int clk, int LowToneFC, int HighTo
 	//int HighToneMod = clk mod HighToneFC;
 	int LeftHalfFCCnt = (LowToneFC % 2) + (LowToneFC/2); //truncate
 	int FCs_per_clk = clk / LowToneFC;
-	
+
 	// need to correctly split up the clock to field clocks.
 	// First attempt uses modifiers on each end to make up for when FCs don't evenly divide into Clk
 
@@ -1955,7 +1955,7 @@ void GetHiLoTone(int *LowTone, int *HighTone, int clk, int LowToneFC, int HighTo
 	}
 }
 
-//old CmdFSKdemod adapted by marshmellow 
+//old CmdFSKdemod adapted by marshmellow
 //converts FSK to clear NRZ style wave.  (or demodulates)
 int FSKToNRZ(int *data, int *dataLen, int clk, int LowToneFC, int HighToneFC) {
 	uint8_t ans = 0;
@@ -1973,7 +1973,7 @@ int FSKToNRZ(int *data, int *dataLen, int clk, int LowToneFC, int HighToneFC) {
 		}
 		return 0;
 	}
-	
+
 	int i, j;
 	int LowTone[clk];
 	int HighTone[clk];
@@ -1996,7 +1996,7 @@ int FSKToNRZ(int *data, int *dataLen, int clk, int LowToneFC, int HighToneFC) {
 	}
 
 	// now we have the abs( [average sample value per clk] * 100 ) for each tone
-	//   loop through again [all samples] - clk - 16  
+	//   loop through again [all samples] - clk - 16
 	//                  note why 16???  is 16 the largest FC? changed to LowToneFC as that should be the > fc
 	for(i = 0; i < *dataLen - clk - LowToneFC; ++i) {
 		int lowTot = 0, highTot = 0;
@@ -2009,8 +2009,8 @@ int FSKToNRZ(int *data, int *dataLen, int clk, int LowToneFC, int HighToneFC) {
 		  highTot += (data[i + j] >> 16);
 		}
 
-		// subtract the sum of lowTone averages by the sum of highTone averages as it 
-		//   and write back the new graph value 
+		// subtract the sum of lowTone averages by the sum of highTone averages as it
+		//   and write back the new graph value
 		data[i] = lowTot - highTot;
 	}
 	// update dataLen to what we put back to the data sample buffer
@@ -2019,7 +2019,7 @@ int FSKToNRZ(int *data, int *dataLen, int clk, int LowToneFC, int HighToneFC) {
 }
 
 int CmdFSKToNRZ(const char *Cmd) {
-	// take clk, fc_low, fc_high 
+	// take clk, fc_low, fc_high
 	//   blank = auto;
 	bool errors = false;
 	char cmdp = 0;
@@ -2097,7 +2097,7 @@ static command_t CommandTable[] = {
 	{"norm",            CmdNorm,            1, "Normalize max/min to +/-128"},
 	{"plot",            CmdPlot,            1, "Show graph window (hit 'h' in window for keystroke help)"},
 	{"printdemodbuffer",CmdPrintDemodBuff,  1, "[x] [o] <offset> [l] <length> -- print the data in the DemodBuffer - 'x' for hex output"},
-	{"rawdemod",        CmdRawDemod,        1, "[modulation] ... <options> -see help (h option) -- Demodulate the data in the GraphBuffer and output binary"},  
+	{"rawdemod",        CmdRawDemod,        1, "[modulation] ... <options> -see help (h option) -- Demodulate the data in the GraphBuffer and output binary"},
 	{"samples",         CmdSamples,         0, "[512 - 40000] -- Get raw samples for graph window (GraphBuffer)"},
 	{"save",            CmdSave,            1, "<filename> -- Save trace (from graph window)"},
 	{"setgraphmarkers", CmdSetGraphMarkers, 1, "[orange_marker] [blue_marker] (in graph window)"},
diff --git a/client/cmdflashmem.c b/client/cmdflashmem.c
index cedb9516d..b576f43f7 100644
--- a/client/cmdflashmem.c
+++ b/client/cmdflashmem.c
@@ -29,7 +29,7 @@ static int CmdHelp(const char *Cmd);
 int usage_flashmem_spibaud(void){
 	PrintAndLogEx(NORMAL, "Usage:  mem spibaud [h] <baudrate>");
 	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "           h    this help");	
+	PrintAndLogEx(NORMAL, "           h    this help");
 	PrintAndLogEx(NORMAL, "      <baudrate>    SPI baudrate in MHz [24|48]");
 	PrintAndLogEx(NORMAL, "           ");
 	PrintAndLogEx(NORMAL, "           If >= 24Mhz, FASTREADS instead of READS instruction will be used.");
@@ -48,7 +48,7 @@ int usage_flashmem_read(void){
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Examples:");
 	PrintAndLogEx(NORMAL, "        mem read o 0 l 32");		// read 32 bytes starting at offset 0
-	PrintAndLogEx(NORMAL, "        mem read o 1024 l 10");	// read 10 bytes starting at offset 1024	
+	PrintAndLogEx(NORMAL, "        mem read o 1024 l 10");	// read 10 bytes starting at offset 1024
 	return 0;
 }
 int usage_flashmem_load(void){
@@ -82,7 +82,7 @@ int usage_flashmem_save(void){
 	return 0;
 }
 int usage_flashmem_wipe(void){
-	
+
 	PrintAndLogEx(WARNING, "[OBS] use with caution.");
 	PrintAndLogEx(NORMAL, "Wipe flash memory on device, which fills memory with 0xFF\n");
 
@@ -104,7 +104,7 @@ int usage_flashmem_info(void){
 	PrintAndLogEx(NORMAL, "Examples:");
 	PrintAndLogEx(NORMAL, "        mem info");
 	PrintAndLogEx(NORMAL, "        mem info s");
-	return 0;	
+	return 0;
 }
 
 int CmdFlashMemRead(const char *Cmd) {
@@ -112,7 +112,7 @@ int CmdFlashMemRead(const char *Cmd) {
 	uint8_t cmdp = 0;
 	bool errors = false;
 	uint32_t start_index = 0, len  = 0;
-	
+
 	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
 		switch (tolower(param_getchar(Cmd, cmdp))) {
 		case 'o':
@@ -121,7 +121,7 @@ int CmdFlashMemRead(const char *Cmd) {
 			break;
 		case 'l':
 			len = param_get32ex(Cmd, cmdp+1, 0, 10);
-			cmdp += 2;			
+			cmdp += 2;
 			break;
 		case 'h':
 			return usage_flashmem_read();
@@ -131,16 +131,16 @@ int CmdFlashMemRead(const char *Cmd) {
 			break;
 		}
 	}
-	
+
 	//Validations
-	if (errors || cmdp == 0 ) return usage_flashmem_read();			
-	
+	if (errors || cmdp == 0 ) return usage_flashmem_read();
+
 	if (start_index + len > FLASH_MEM_MAX_SIZE) {
 		PrintAndLogDevice(WARNING, "error, start_index + length is larger than available memory");
 		return 1;
 	}
 
-	UsbCommand c = {CMD_FLASHMEM_READ, {start_index, len, 0}};		
+	UsbCommand c = {CMD_FLASHMEM_READ, {start_index, len, 0}};
 	clearCommandBuffer();
 	SendCommand(&c);
 	return 0;
@@ -161,11 +161,11 @@ int CmdFlashmemSpiBaudrate(const char *Cmd) {
 int CmdFlashMemLoad(const char *Cmd){
 
 	uint32_t start_index = 0;
-	char filename[FILE_PATH_SIZE] = {0};	
+	char filename[FILE_PATH_SIZE] = {0};
 	bool errors = false;
-	uint8_t cmdp = 0;	
+	uint8_t cmdp = 0;
 	Dictionary_t d = DICTIONARY_NONE;
-	
+
 	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
 		switch (tolower(param_getchar(Cmd, cmdp))) {
 		case 'h':
@@ -175,8 +175,8 @@ int CmdFlashMemLoad(const char *Cmd){
 				PrintAndLogEx(FAILED, "Filename too long");
 				errors = true;
 				break;
-			}			
-			cmdp += 2;			
+			}
+			cmdp += 2;
 			break;
 		case 'o':
 			start_index = param_get32ex(Cmd, cmdp+1, 0, 10);
@@ -200,15 +200,15 @@ int CmdFlashMemLoad(const char *Cmd){
 			break;
 		}
 	}
-	
+
 	//Validations
-	if (errors || cmdp == 0 ) return usage_flashmem_load();			
+	if (errors || cmdp == 0 ) return usage_flashmem_load();
 
 	size_t datalen = 0;
 	uint16_t keycount = 0;
 	int res = 0;
 	uint8_t *data = calloc(FLASH_MEM_MAX_SIZE, sizeof(uint8_t));
-	
+
 	switch (d) {
 		case DICTIONARY_MIFARE:
 			start_index = DEFAULT_MF_KEYS_OFFSET;
@@ -218,8 +218,8 @@ int CmdFlashMemLoad(const char *Cmd){
 				return 1;
 			}
 			data[0] = (keycount >> 0) & 0xFF;
-			data[1] = (keycount >> 8) & 0xFF;			
-			datalen += 2;	
+			data[1] = (keycount >> 8) & 0xFF;
+			datalen += 2;
 			break;
 		case DICTIONARY_T55XX:
 			start_index = DEFAULT_T55XX_KEYS_OFFSET;
@@ -229,7 +229,7 @@ int CmdFlashMemLoad(const char *Cmd){
 				return 1;
 			}
 			data[0] = (keycount >> 0) & 0xFF;
-			data[1] = (keycount >> 8) & 0xFF;			
+			data[1] = (keycount >> 8) & 0xFF;
 			datalen += 2;
 			break;
 		case DICTIONARY_ICLASS:
@@ -240,26 +240,26 @@ int CmdFlashMemLoad(const char *Cmd){
 				return 1;
 			}
 			data[0] = (keycount >> 0) & 0xFF;
-			data[1] = (keycount >> 8) & 0xFF;			
-			datalen += 2;		
+			data[1] = (keycount >> 8) & 0xFF;
+			datalen += 2;
 			break;
 		default:
-			
+
 			res = loadFile(filename, "bin", data, &datalen);
 			//int res = loadFileEML( filename, "eml", data, &datalen);
 			if ( res ) {
 				free(data);
 				return 1;
 			}
-			
+
 			if (datalen > FLASH_MEM_MAX_SIZE) {
 				PrintAndLogDevice(WARNING, "error, filesize is larger than available memory");
 				free(data);
 				return 1;
 			}
-			break;		
+			break;
 	}
-	
+
 	data = realloc(data, datalen);
 
 	//Send to device
@@ -268,40 +268,40 @@ int CmdFlashMemLoad(const char *Cmd){
 
 	while (bytes_remaining > 0){
 		uint32_t bytes_in_packet = MIN(FLASH_MEM_BLOCK_SIZE, bytes_remaining);
-		
+
 		UsbCommand c = {CMD_FLASHMEM_WRITE, {start_index + bytes_sent, bytes_in_packet, 0}};
-				
+
 		memcpy(c.d.asBytes, data + bytes_sent, bytes_in_packet);
 		clearCommandBuffer();
 		SendCommand(&c);
 
 		bytes_remaining -= bytes_in_packet;
 		bytes_sent += bytes_in_packet;
-		
+
 		UsbCommand resp;
 		if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
 			PrintAndLogEx(WARNING, "timeout while waiting for reply.");
 			free(data);
 			return 1;
 		}
-		
+
 		uint8_t isok  = resp.arg[0] & 0xFF;
 		if (!isok)
 			PrintAndLogEx(FAILED, "Flash write fail [offset %u]", bytes_sent);
-		
+
 	}
 	free(data);
-	
+
 	PrintAndLogEx(SUCCESS, "Wrote %u bytes to offset %u", datalen, start_index);
 	return 0;
 }
 int CmdFlashMemSave(const char *Cmd){
 
-	char filename[FILE_PATH_SIZE] = {0};	
+	char filename[FILE_PATH_SIZE] = {0};
 	uint8_t cmdp = 0;
 	bool errors = false;
 	uint32_t start_index = 0, len = FLASH_MEM_MAX_SIZE;
-	
+
 	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
 		switch (tolower(param_getchar(Cmd, cmdp))) {
 		case 'h': return usage_flashmem_save();
@@ -319,8 +319,8 @@ int CmdFlashMemSave(const char *Cmd){
 				PrintAndLogEx(FAILED, "Filename too long");
 				errors = true;
 				break;
-			}				
-			cmdp += 2;			
+			}
+			cmdp += 2;
 			break;
 		default:
 			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
@@ -328,7 +328,7 @@ int CmdFlashMemSave(const char *Cmd){
 			break;
 		}
 	}
-	
+
 	//Validations
 	if (errors || cmdp == 0 ) return usage_flashmem_save();
 
@@ -337,7 +337,7 @@ int CmdFlashMemSave(const char *Cmd){
 		PrintAndLogDevice(WARNING, "error, cannot allocate memory ");
 		return 1;
 	}
-	
+
 	PrintAndLogEx(NORMAL, "downloading %u bytes from flashmem", len);
 	if ( !GetFromDevice(FLASH_MEM, dump, len, start_index, NULL, -1, true) ) {
 		PrintAndLogEx(FAILED, "ERROR; downloading flashmem");
@@ -355,10 +355,10 @@ int CmdFlashMemWipe(const char *Cmd){
 	uint8_t cmdp = 0;
 	bool errors = false;
 	bool initalwipe = false;
-	uint8_t page = 0;	
+	uint8_t page = 0;
 	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
 		switch (tolower(param_getchar(Cmd, cmdp))) {
-		case 'h': return usage_flashmem_wipe();			
+		case 'h': return usage_flashmem_wipe();
 		case 'p':
 			page = param_get8ex(Cmd, cmdp+1, 0, 10);
 			if ( page > 2 ) {
@@ -378,10 +378,10 @@ int CmdFlashMemWipe(const char *Cmd){
 			break;
 		}
 	}
-		
+
 	//Validations
-	if (errors || cmdp == 0 ) return usage_flashmem_wipe();			
-			
+	if (errors || cmdp == 0 ) return usage_flashmem_wipe();
+
 	UsbCommand c = {CMD_FLASHMEM_WIPE, {page, initalwipe, 0}};
 	clearCommandBuffer();
 	SendCommand(&c);
@@ -393,7 +393,7 @@ int CmdFlashMemWipe(const char *Cmd){
 	uint8_t isok  = resp.arg[0] & 0xFF;
 	if (isok)
 		PrintAndLogEx(SUCCESS, "Flash WIPE ok");
-	else 
+	else
 		PrintAndLogEx(FAILED, "Flash WIPE failed");
 
 	return 0;
@@ -402,18 +402,18 @@ int CmdFlashMemInfo(const char *Cmd){
 
 	uint8_t sha_hash[20] = {0};
 	mbedtls_rsa_context rsa;
-	
+
 	uint8_t cmdp = 0;
 	bool errors = false,  shall_write = false, shall_sign = false;
 	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
 		switch (tolower(param_getchar(Cmd, cmdp))) {
-		case 'h': return usage_flashmem_info();	
+		case 'h': return usage_flashmem_info();
 		case 's': {
 			shall_sign = true;
 			cmdp++;
 			break;
 		}
-		case 'w': 
+		case 'w':
 			shall_write = true;
 			cmdp++;
 			break;
@@ -423,10 +423,10 @@ int CmdFlashMemInfo(const char *Cmd){
 			break;
 		}
 	}
-		
+
 	//Validations
 	if (errors ) return usage_flashmem_info();
-			
+
 	UsbCommand c = {CMD_FLASHMEM_INFO, {0, 0, 0}};
 	clearCommandBuffer();
 	SendCommand(&c);
@@ -435,12 +435,12 @@ int CmdFlashMemInfo(const char *Cmd){
 		PrintAndLogEx(WARNING, "timeout while waiting for reply.");
 		return 1;
 	}
-	
+
 	uint8_t isok = resp.arg[0] & 0xFF;
 	if (!isok) {
 		PrintAndLogEx(FAILED, "failed");
 		return 1;
-	}		
+	}
 
 	// validate signature here
 	rdv40_validation_t mem;
@@ -448,18 +448,18 @@ int CmdFlashMemInfo(const char *Cmd){
 
 	// Flash ID hash (sha1)
 	mbedtls_sha1( mem.flashid, sizeof(mem.flashid), sha_hash );
-	
+
 	// print header
 	PrintAndLogEx(INFO, "\n--- Flash memory Information ---------");
-	PrintAndLogEx(INFO, "-------------------------------------------------------------");		
+	PrintAndLogEx(INFO, "-------------------------------------------------------------");
 	PrintAndLogEx(INFO, "ID            | %s", sprint_hex(mem.flashid, sizeof(mem.flashid) ));
 	PrintAndLogEx(INFO, "SHA1          | %s", sprint_hex(sha_hash, sizeof(sha_hash)));
 	PrintAndLogEx(INFO, "RSA SIGNATURE |");
 	print_hex_break( mem.signature, sizeof(mem.signature), 32);
 
-//-------------------------------------------------------------------------------	
+//-------------------------------------------------------------------------------
 // Example RSA-1024 keypair, for test purposes  (from common/polarssl/rsa.c)
-//  
+//
 
 // public key modulus N
 #define RSA_N   "9292758453063D803DD603D5E777D788" \
@@ -484,7 +484,7 @@ int CmdFlashMemInfo(const char *Cmd){
                 "AF1FEDFDDE2BEB674CA15F3E81A1521E" \
                 "071513A1E85B5DFA031F21ECAE91A34D"
 
-// prime P				
+// prime P
 #define RSA_P   "C36D0EB7FCD285223CFB5AABA5BDA3D8" \
                 "2C01CAD19EA484A87EA4377637E75500" \
                 "FCB2005C5C7DD6EC4AC023CDA285D796" \
@@ -511,7 +511,7 @@ int CmdFlashMemInfo(const char *Cmd){
                 "F5A3B2A5D33605AEBBCCBA7FEB9F2D2F" \
                 "A74206CEC169D74BF5A8C50D6F48EA08"
 
-				
+
 #define KEY_LEN 128
 
 	mbedtls_rsa_init(&rsa, MBEDTLS_RSA_PKCS_V15, 0);
@@ -528,53 +528,53 @@ int CmdFlashMemInfo(const char *Cmd){
 	mbedtls_mpi_read_string( &rsa.QP, 16, RSA_QP );
 
 	PrintAndLogEx(INFO, "KEY length   | %d", KEY_LEN);
-		
+
 	bool is_keyok = ( mbedtls_rsa_check_pubkey(  &rsa ) == 0 || mbedtls_rsa_check_privkey( &rsa ) == 0 );
 	if (is_keyok)
 		PrintAndLogEx(SUCCESS, "RSA key validation ok");
 	else
 		PrintAndLogEx(FAILED, "RSA key validation failed");
-	
-	// 
+
+	//
 	uint8_t from_device[KEY_LEN];
 	uint8_t sign[KEY_LEN];
 
 	// to be verified
 	memcpy(from_device, mem.signature, KEY_LEN);
-	
+
 	// to be signed (all zeros
 	memset(sign, 0, KEY_LEN);
-	
+
 	// Signing (private key)
 	if (shall_sign) {
-			
+
 		int is_signed = mbedtls_rsa_pkcs1_sign( &rsa, NULL, NULL, MBEDTLS_RSA_PRIVATE, MBEDTLS_MD_SHA1, 20, sha_hash, sign );
-		if (is_signed == 0) 
+		if (is_signed == 0)
 			PrintAndLogEx(SUCCESS, "RSA Signing ok");
 		else
 			PrintAndLogEx(FAILED, "RSA Signing failed");
 
 		if (shall_write) {
 			// save to mem
-			c = (UsbCommand){CMD_FLASHMEM_WRITE, {FLASH_MEM_SIGNATURE_OFFSET, FLASH_MEM_SIGNATURE_LEN, 0}};				
-			memcpy(c.d.asBytes, sign, sizeof(sign));	
+			c = (UsbCommand){CMD_FLASHMEM_WRITE, {FLASH_MEM_SIGNATURE_OFFSET, FLASH_MEM_SIGNATURE_LEN, 0}};
+			memcpy(c.d.asBytes, sign, sizeof(sign));
 			clearCommandBuffer();
 			SendCommand(&c);
 			if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
 				PrintAndLogEx(WARNING, "timeout while waiting for reply.");
 			} else {
-								
+
 				if (!resp.arg[0])
 					PrintAndLogEx(FAILED, "Writing signature failed");
 				else
 					PrintAndLogEx(SUCCESS, "Writing signature ok [offset: %u]", FLASH_MEM_SIGNATURE_OFFSET);
-				
+
 			}
 		}
 		PrintAndLogEx(INFO, "Signed   | ");
 		print_hex_break( sign, sizeof(sign), 32);
 	}
-	
+
 	// Verify (public key)
 	int is_verified = mbedtls_rsa_pkcs1_verify( &rsa, NULL, NULL, MBEDTLS_RSA_PUBLIC, MBEDTLS_MD_SHA1, 20, sha_hash, from_device );
 	if (is_verified == 0)
diff --git a/client/cmdhf.c b/client/cmdhf.c
index cb4e424da..af5aa4c2b 100644
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -38,14 +38,14 @@ int usage_hf_snoop(){
 
 int CmdHFSearch(const char *Cmd){
 
-	char cmdp = param_getchar(Cmd, 0);	
+	char cmdp = param_getchar(Cmd, 0);
 	if (cmdp == 'h' || cmdp == 'H') return usage_hf_search();
-	
+
 	int ans = CmdHF14AInfo("s");
 	if (ans > 0) {
 		PrintAndLogEx(SUCCESS, "\nValid ISO14443-A Tag Found\n");
 		return ans;
-	} 
+	}
 	ans = HF15Reader("", false);
 	if (ans) {
 		PrintAndLogEx(SUCCESS, "\nValid ISO15693 Tag Found\n");
@@ -80,7 +80,7 @@ int CmdHFSearch(const char *Cmd){
 		return ans;
 	}
 	*/
-	
+
 	PrintAndLogEx(FAILED, "\nno known/supported 13.56 MHz tags found\n");
 	return 0;
 }
@@ -94,12 +94,12 @@ int CmdHFTune(const char *Cmd) {
 }
 
 int CmdHFSnoop(const char *Cmd) {
-	char cmdp = param_getchar(Cmd, 0);	
+	char cmdp = param_getchar(Cmd, 0);
 	if (cmdp == 'h' || cmdp == 'H') return usage_hf_snoop();
-	
+
 	int skippairs =  param_get32ex(Cmd, 0, 0, 10);
 	int skiptriggers =  param_get32ex(Cmd, 1, 0, 10);
-	
+
 	UsbCommand c = {CMD_HF_SNIFFER, {skippairs, skiptriggers, 0}};
 	clearCommandBuffer();
 	SendCommand(&c);
@@ -121,7 +121,7 @@ static command_t CommandTable[] = {
 	{"mfdes",		CmdHFMFDes,		  1, "{ MIFARE Desfire RFIDs...          }"},
 	{"topaz",		CmdHFTopaz,		  1, "{ TOPAZ (NFC Type 1) RFIDs...      }"},
 	{"fido",		CmdHFFido,		  1, "{ FIDO and FIDO2 authenticators... }"},
-	{"list", 		CmdTraceList,	  0, "List protocol data in trace buffer"},	
+	{"list", 		CmdTraceList,	  0, "List protocol data in trace buffer"},
 	{"tune",		CmdHFTune,	      0, "Continuously measure HF antenna tuning"},
 	{"search",      CmdHFSearch,      1, "Search for known HF tags [preliminary]"},
 	{"snoop",       CmdHFSnoop,       0, "<samples to skip (10000)> <triggers to skip (1)> Generic HF Snoop"},
@@ -131,7 +131,7 @@ static command_t CommandTable[] = {
 int CmdHF(const char *Cmd) {
 	clearCommandBuffer();
 	CmdsParse(CommandTable, Cmd);
-	return 0; 
+	return 0;
 }
 
 int CmdHelp(const char *Cmd) {
diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 27f670fac..90753fef8 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -21,14 +21,14 @@ static const manufactureName manufactureMapping[] = {
 	// ID,  "Vendor Country"
 	{ 0x01, "Motorola UK" },
 	{ 0x02, "ST Microelectronics SA France" },
-	{ 0x03, "Hitachi, Ltd Japan" }, 
-	{ 0x04, "NXP Semiconductors Germany" }, 
-	{ 0x05, "Infineon Technologies AG Germany" }, 
-	{ 0x06, "Cylink USA" }, 
+	{ 0x03, "Hitachi, Ltd Japan" },
+	{ 0x04, "NXP Semiconductors Germany" },
+	{ 0x05, "Infineon Technologies AG Germany" },
+	{ 0x06, "Cylink USA" },
 	{ 0x07, "Texas Instrument France" },
-	{ 0x08, "Fujitsu Limited Japan" }, 
-	{ 0x09, "Matsushita Electronics Corporation, Semiconductor Company Japan" }, 
-	{ 0x0A, "NEC Japan" }, 
+	{ 0x08, "Fujitsu Limited Japan" },
+	{ 0x09, "Matsushita Electronics Corporation, Semiconductor Company Japan" },
+	{ 0x0A, "NEC Japan" },
 	{ 0x0B, "Oki Electric Industry Co. Ltd Japan" },
 	{ 0x0C, "Toshiba Corp. Japan" },
 	{ 0x0D, "Mitsubishi Electric Corp. Japan" },
@@ -69,7 +69,7 @@ static const manufactureName manufactureMapping[] = {
 	{ 0x30, "BeeDar Technology Inc. USA" },
 	{ 0x31, "RFIDsec Denmark" },
 	{ 0x32, "Schweizer Electronic AG Germany" },
-	{ 0x33, "AMIC Technology Corp Taiwan" }, 
+	{ 0x33, "AMIC Technology Corp Taiwan" },
 	{ 0x34, "Mikron JSC Russia" },
 	{ 0x35, "Fraunhofer Institute for Photonic Microsystems Germany" },
 	{ 0x36, "IDS Microchip AG Switzerland" },
@@ -81,7 +81,7 @@ static const manufactureName manufactureMapping[] = {
 	{ 0x3C, "Verayo Inc. USA" },
 	{ 0x3D, "HID Global USA" },
 	{ 0x3E, "Productivity Engineering Gmbh Germany" },
-	{ 0x3F, "Austriamicrosystems AG (reserved) Austria" }, 
+	{ 0x3F, "Austriamicrosystems AG (reserved) Austria" },
 	{ 0x40, "Gemalto SA France" },
 	{ 0x41, "Renesas Electronics Corporation Japan" },
 	{ 0x42, "3Alogics Inc Korea" },
@@ -129,24 +129,24 @@ static const manufactureName manufactureMapping[] = {
 	{ 0x6C, "Wisesec Ltd Israel" },
 	{ 0x7C, "DB HiTek Co Ltd Korea" },
 	{ 0x7D, "SATO Vicinity Australia" },
-	{ 0x7E, "Holtek Taiwan" },	
+	{ 0x7E, "Holtek Taiwan" },
 	{ 0x00, "no tag-info available" } // must be the last entry
 };
 
 // get a product description based on the UID
 //		uid[8] 	tag uid
-// returns description of the best match	
+// returns description of the best match
 char* getTagInfo(uint8_t uid) {
 
 	int i;
 	int len = sizeof(manufactureMapping) / sizeof(manufactureName);
-	
-	for ( i = 0; i < len; ++i ) 
-		if ( uid == manufactureMapping[i].uid) 
+
+	for ( i = 0; i < len; ++i )
+		if ( uid == manufactureMapping[i].uid)
 			return manufactureMapping[i].desc;
 
 	//No match, return default
-	return manufactureMapping[len-1].desc; 
+	return manufactureMapping[len-1].desc;
 }
 
 // iso14a apdu input frame length
@@ -171,7 +171,7 @@ int usage_hf_14a_sim(void) {
 //	PrintAndLogEx(NORMAL, "    u     : 4, 7 or 10 byte UID");
 	PrintAndLogEx(NORMAL, "    u     : 4, 7 byte UID");
 	PrintAndLogEx(NORMAL, "    x     : (Optional) Performs the 'reader attack', nr/ar attack against a reader");
-	PrintAndLogEx(NORMAL, "    e     : (Optional) Fill simulator keys from found keys");	
+	PrintAndLogEx(NORMAL, "    e     : (Optional) Fill simulator keys from found keys");
 	PrintAndLogEx(NORMAL, "    v     : (Optional) Verbose");
 	PrintAndLogEx(NORMAL, "Examples:");
 	PrintAndLogEx(NORMAL, "          hf 14a sim t 1 u 11223344 x");
@@ -232,11 +232,11 @@ int Hf14443_4aGetCardData(iso14a_card_select_t * card) {
 
 	UsbCommand resp;
 	WaitForResponse(CMD_ACK,&resp);
-	
+
 	memcpy(card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
 
 	uint64_t select_status = resp.arg[0];		// 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
-	
+
 	if(select_status == 0) {
 		PrintAndLog("E->iso14443a card select failed");
 		return 1;
@@ -261,22 +261,22 @@ int Hf14443_4aGetCardData(iso14a_card_select_t * card) {
 		return 1;
 	}
 	PrintAndLog(" ATS: %s", sprint_hex(card->ats, card->ats_len));
-	
+
 	return 0;
 }
 
 int CmdHF14AReader(const char *Cmd) {
 
 	uint32_t cm = ISO14A_CONNECT;
-	bool disconnectAfter = true, silent = false;	
+	bool disconnectAfter = true, silent = false;
 	int cmdp = 0;
-	
+
 	while (param_getchar(Cmd, cmdp) != 0x00) {
 		switch (tolower(param_getchar(Cmd, cmdp))) {
 		case 'h':
 			return usage_hf_14a_reader();
 		case '3':
-			cm |= ISO14A_NO_RATS; 
+			cm |= ISO14A_NO_RATS;
 			break;
 		case 'k':
 			disconnectAfter = false;
@@ -290,13 +290,13 @@ int CmdHF14AReader(const char *Cmd) {
 		default:
 			PrintAndLogEx(WARNING, "Unknown command.");
 			return 1;
-		}			
+		}
 		cmdp++;
 	}
 
 	if (!disconnectAfter)
-		cm |= ISO14A_NO_DISCONNECT; 
-	
+		cm |= ISO14A_NO_DISCONNECT;
+
 	UsbCommand c = {CMD_READER_ISO_14443a, {cm, 0, 0}};
 	clearCommandBuffer();
 	SendCommand(&c);
@@ -308,18 +308,18 @@ int CmdHF14AReader(const char *Cmd) {
 			DropField();
 			return 1;
 		}
-	
+
 		iso14a_card_select_t card;
 		memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
 
-		/* 
+		/*
 			0: couldn't read
 			1: OK, with ATS
 			2: OK, no ATS
-			3: proprietary Anticollision	
+			3: proprietary Anticollision
 		*/
 		uint64_t select_status = resp.arg[0];
-		
+
 		if (select_status == 0) {
 			if (!silent) PrintAndLogEx(WARNING, "iso14443a card select failed");
 			DropField();
@@ -340,7 +340,7 @@ int CmdHF14AReader(const char *Cmd) {
 		if(card.ats_len >= 3) {			// a valid ATS consists of at least the length byte (TL) and 2 CRC bytes
 			PrintAndLogEx(NORMAL, " ATS : %s", sprint_hex(card.ats, card.ats_len));
 		}
-		
+
 		if (!disconnectAfter) {
 			if (!silent) PrintAndLogEx(SUCCESS, "Card is selected. You can now start sending commands");
 		}
@@ -354,12 +354,12 @@ int CmdHF14AReader(const char *Cmd) {
 }
 
 int CmdHF14AInfo(const char *Cmd) {
-	
+
 	if (Cmd[0] == 'h' || Cmd[0] ==  'H') return usage_hf_14a_info();
-	
+
 	bool silent = (Cmd[0] == 's' || Cmd[0] ==  'S');
 	bool do_nack_test = (Cmd[0] == 'n' || Cmd[0] ==  'N');
-	
+
 	UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};
 	clearCommandBuffer();
 	SendCommand(&c);
@@ -369,18 +369,18 @@ int CmdHF14AInfo(const char *Cmd) {
 		DropField();
 		return 0;
 	}
-	
+
 	iso14a_card_select_t card;
 	memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
 
-	/* 
+	/*
 		0: couldn't read
 		1: OK, with ATS
 		2: OK, no ATS
-		3: proprietary Anticollision	
+		3: proprietary Anticollision
 	*/
 	uint64_t select_status = resp.arg[0];
-	
+
 	if (select_status == 0) {
 		if (!silent) PrintAndLogEx(WARNING, "iso14443a card select failed");
 		DropField();
@@ -400,16 +400,16 @@ int CmdHF14AInfo(const char *Cmd) {
 
 	bool isMifareClassic = true;
 	switch (card.sak) {
-		case 0x00: 
+		case 0x00:
 			isMifareClassic = false;
-			
+
 			// ******** is card of the MFU type (UL/ULC/NTAG/ etc etc)
 			DropField();
-			
+
 			uint32_t tagT = GetHF14AMfU_Type();
 			if (tagT != UL_ERROR)
 				ul_print_type(tagT, 0);
-			else 
+			else
 				PrintAndLogEx(NORMAL, "TYPE: Possible AZTEK (iso14443a compliant)");
 
 			// reconnect for further tests
@@ -420,11 +420,11 @@ int CmdHF14AInfo(const char *Cmd) {
 			SendCommand(&c);
 			UsbCommand resp;
 			WaitForResponse(CMD_ACK, &resp);
-			
+
 			memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
 
 			select_status = resp.arg[0];		// 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS
-			
+
 			if(select_status == 0) {
 				DropField();
 				return 0;
@@ -451,7 +451,7 @@ int CmdHF14AInfo(const char *Cmd) {
 	if ( card.uidlen > 4 ) {
 		PrintAndLogEx(NORMAL, "MANUFACTURER : %s", getTagInfo(card.uid[0]));
 	}
-	
+
 	// try to request ATS even if tag claims not to support it
 	if (select_status == 2) {
 		uint8_t rats[] = { 0xE0, 0x80 }; // FSDI=8 (FSD=256), CID=0
@@ -462,10 +462,10 @@ int CmdHF14AInfo(const char *Cmd) {
 		clearCommandBuffer();
 		SendCommand(&c);
 		WaitForResponse(CMD_ACK,&resp);
-		
+
 	    memcpy(card.ats, resp.d.asBytes, resp.arg[0]);
 		card.ats_len = resp.arg[0];				// note: ats_len includes CRC Bytes
-	} 
+	}
 
 	if(card.ats_len >= 3) {			// a valid ATS consists of at least the length byte (TL) and 2 CRC bytes
 		bool ta1 = 0, tb1 = 0, tc1 = 0;
@@ -479,13 +479,13 @@ int CmdHF14AInfo(const char *Cmd) {
 		if (card.ats[0] != card.ats_len - 2) {
 			PrintAndLogEx(NORMAL, "ATS may be corrupted. Length of ATS (%d bytes incl. 2 Bytes CRC) doesn't match TL", card.ats_len);
 		}
-		
+
 		if (card.ats[0] > 1) {		// there is a format byte (T0)
 			ta1 = (card.ats[1] & 0x10) == 0x10;
 			tb1 = (card.ats[1] & 0x20) == 0x20;
 			tc1 = (card.ats[1] & 0x40) == 0x40;
 			int16_t fsci = card.ats[1] & 0x0f;
-			
+
 			PrintAndLogEx(NORMAL, "       -  T0 : TA1 is%s present, TB1 is%s present, "
 					"TC1 is%s present, FSCI is %d (FSC = %ld)",
 				(ta1 ? "" : " NOT"),
@@ -538,7 +538,7 @@ int CmdHF14AInfo(const char *Cmd) {
 				} else if (memcmp(card.ats + pos, "\xC1\x05\x2F\x2F\x00\x35\xC7", 7) == 0) {
 					tip = "-> MIFARE Plus S 2K or 4K";
 				}
-			} 
+			}
 			PrintAndLogEx(NORMAL, "       -  HB : %s%s", sprint_hex(card.ats + pos, card.ats[0] - pos), tip);
 			if (card.ats[pos] == 0xC1) {
 				PrintAndLogEx(NORMAL, "               c1 -> Mifare or (multiple) virtual cards of various type");
@@ -573,9 +573,9 @@ int CmdHF14AInfo(const char *Cmd) {
 	} else {
 		PrintAndLogEx(INFO, "proprietary non iso14443-4 card found, RATS not supported");
 	}
-	
+
 	detect_classic_magic();
-	
+
 	if (isMifareClassic) {
 		int res = detect_classic_prng();
 		if ( res == 1 )
@@ -584,11 +584,11 @@ int CmdHF14AInfo(const char *Cmd) {
 			PrintAndLogEx(SUCCESS, "Prng detection: " _YELLOW_(HARD));
 		else
 			PrintAndLogEx(FAILED, "prng detection:  " _RED_(failed));
-		
+
 		if ( do_nack_test )
 			detect_classic_nackbug(silent);
 	}
-	
+
 	return select_status;
 }
 
@@ -610,11 +610,11 @@ int CmdHF14ACUIDs(const char *Cmd) {
 			PrintAndLogEx(NORMAL, "\n[!] aborted via keyboard!\n");
 			break;
 		}
-		
+
 		// execute anticollision procedure
 		UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0}};
 		SendCommand(&c);
-    
+
 		UsbCommand resp;
 		WaitForResponse(CMD_ACK,&resp);
 
@@ -639,7 +639,7 @@ int CmdHF14ACUIDs(const char *Cmd) {
 int CmdHF14ASim(const char *Cmd) {
 	bool errors = false;
 	uint8_t flags = 0;
-	uint8_t tagtype = 1;	
+	uint8_t tagtype = 1;
 	uint8_t cmdp = 0;
 	uint8_t uid[10] = {0,0,0,0,0,0,0,0,0,0};
 	int uidlen = 0;
@@ -647,7 +647,7 @@ int CmdHF14ASim(const char *Cmd) {
 	bool setEmulatorMem = false;
 	bool verbose = false;
 	nonces_t data[1];
-	
+
 	while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
 		switch(param_getchar(Cmd, cmdp)) {
 			case 'h':
@@ -658,19 +658,19 @@ int CmdHF14ASim(const char *Cmd) {
 				// Retrieve the tag type
 				tagtype = param_get8ex(Cmd, cmdp+1, 0, 10);
 				if (tagtype == 0)
-					errors = true; 
+					errors = true;
 				cmdp += 2;
 				break;
 			case 'u':
 			case 'U':
-				// Retrieve the full 4,7,10 byte long uid 
+				// Retrieve the full 4,7,10 byte long uid
 				param_gethex_ex(Cmd, cmdp+1, uid, &uidlen);
 				switch(uidlen) {
 					//case 20: flags |= FLAG_10B_UID_IN_DATA; break;
 					case 14: flags |= FLAG_7B_UID_IN_DATA; break;
 					case  8: flags |= FLAG_4B_UID_IN_DATA; break;
 					default: errors = true;	break;
-				}				
+				}
 				if (!errors) {
 					PrintAndLogEx(SUCCESS, "Emulating ISO/IEC 14443 type A tag with %d byte UID (%s)", uidlen>>1, sprint_hex(uid, uidlen>>1));
 					useUIDfromEML = false;
@@ -691,7 +691,7 @@ int CmdHF14ASim(const char *Cmd) {
 			case 'E':
 				setEmulatorMem = true;
 				cmdp++;
-				break;				
+				break;
 			default:
 				PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
 				errors = true;
@@ -702,22 +702,22 @@ int CmdHF14ASim(const char *Cmd) {
 	//Validations
 	if (errors || cmdp == 0) return usage_hf_14a_sim();
 
-	if ( useUIDfromEML ) 
+	if ( useUIDfromEML )
 		flags |= FLAG_UID_IN_EMUL;
-	
-	UsbCommand c = {CMD_SIMULATE_TAG_ISO_14443a,{ tagtype, flags, 0 }};	
+
+	UsbCommand c = {CMD_SIMULATE_TAG_ISO_14443a,{ tagtype, flags, 0 }};
 	memcpy(c.d.asBytes, uid, uidlen>>1);
 	clearCommandBuffer();
-	SendCommand(&c);	
+	SendCommand(&c);
 	UsbCommand resp;
-	
+
 	PrintAndLogEx(SUCCESS, "press pm3-button to abort simulation");
-	
+
 	while( !ukbhit() ){
 		if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500) ) continue;
 		if ( !(flags & FLAG_NR_AR_ATTACK) ) break;
 		if ( (resp.arg[0] & 0xffff) != CMD_SIMULATE_MIFARE_CARD ) break;
-			
+
 		memcpy(data, resp.d.asBytes, sizeof(data) );
 		readerAttack(data[0], setEmulatorMem, verbose);
 	}
@@ -726,7 +726,7 @@ int CmdHF14ASim(const char *Cmd) {
 }
 
 int CmdHF14ASniff(const char *Cmd) {
-	int param = 0;	
+	int param = 0;
 	uint8_t ctmp;
 	for (int i = 0; i < 2; i++) {
 		ctmp = tolower(param_getchar(Cmd, i));
@@ -744,7 +744,7 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
 	static bool responseNum = false;
 	uint16_t cmdc = 0;
 	*dataoutlen = 0;
-	
+
 	if (activateField) {
 		responseNum = false;
 		UsbCommand resp;
@@ -769,8 +769,8 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
 		}
 
 		if (resp.arg[0] == 2) {		// 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
-			// get ATS 
-			UsbCommand cr = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT, 2, 0}}; 
+			// get ATS
+			UsbCommand cr = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT, 2, 0}};
 			uint8_t rats[] = { 0xE0, 0x80 }; // FSDI=8 (FSD=256), CID=0
 			memcpy(cr.d.asBytes, rats, 2);
 			SendCommand(&cr);
@@ -778,52 +778,52 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
 				PrintAndLogEx(ERR, "Proxmark connection timeout.");
 				return 1;
 			}
-			
+
 			if (resp.arg[0] <= 0) { // ats_len
 				PrintAndLogEx(ERR, "Can't get ATS.");
 				return 1;
 			}
 		}
 	}
-	
+
 	if (leaveSignalON)
 		cmdc |= ISO14A_NO_DISCONNECT;
 
-	UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_APPEND_CRC | cmdc, (datainlen & 0xFFFF) + 2, 0}}; 
+	UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_APPEND_CRC | cmdc, (datainlen & 0xFFFF) + 2, 0}};
 	uint8_t header[] = {0x0a | responseNum, 0x00};
 	responseNum ^= 1;
 	memcpy(c.d.asBytes, header, 2);
 	memcpy(&c.d.asBytes[2], datain, datainlen);
 	SendCommand(&c);
-	
+
     uint8_t *recv;
     UsbCommand resp;
 
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         recv = resp.d.asBytes;
         int iLen = resp.arg[0];
-		
+
         if(!iLen) {
 			PrintAndLogEx(ERR, "No card response.");
             return 1;
 		}
-		
+
 		*dataoutlen = iLen - 2;
 		if (*dataoutlen < 0)
 			*dataoutlen = 0;
-		
+
 		if (maxdataoutlen && *dataoutlen > maxdataoutlen) {
 			PrintAndLogEx(ERR, "Buffer too small(%d). Needs %d bytes", *dataoutlen, maxdataoutlen);
 			return 2;
 		}
-		
+
 		if (recv[0] != header[0]) {
 			PrintAndLogEx(ERR, "iso14443-4 framing error. Card send %2x must be %2x", dataout[0], header[0]);
 			return 2;
 		}
-		
+
 		memcpy(dataout, &recv[2], *dataoutlen);
-		
+
 		// CRC Check
 		if (iLen == -1) {
 			PrintAndLogEx(ERR, "ISO 14443A CRC error.");
@@ -835,7 +835,7 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
         PrintAndLogEx(ERR, "Reply timeout.");
 		return 4;
     }
-	
+
 	return 0;
 }
 
@@ -846,8 +846,8 @@ int SelectCard14443_4(bool disconnect, iso14a_card_select_t *card) {
 
 	if (card)
 		memset(card, 0, sizeof(iso14a_card_select_t));
-	
-	DropField();	
+
+	DropField();
 
 	// Anticollision + SELECT card
 	UsbCommand ca = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};
@@ -869,8 +869,8 @@ int SelectCard14443_4(bool disconnect, iso14a_card_select_t *card) {
 	}
 
 	if (resp.arg[0] == 2) {		// 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
-		// get ATS 
-		UsbCommand cr = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT, 2, 0}}; 
+		// get ATS
+		UsbCommand cr = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT, 2, 0}};
 		uint8_t rats[] = { 0xE0, 0x80 }; // FSDI=8 (FSD=256), CID=0
 		memcpy(cr.d.asBytes, rats, 2);
 		SendCommand(&cr);
@@ -878,7 +878,7 @@ int SelectCard14443_4(bool disconnect, iso14a_card_select_t *card) {
 			PrintAndLogEx(ERR, "Proxmark connection timeout.");
 			return 1;
 		}
-		
+
 		if (resp.arg[0] <= 0) { // ats_len
 			PrintAndLogEx(ERR, "Can't get ATS.");
 			return 1;
@@ -898,39 +898,39 @@ int SelectCard14443_4(bool disconnect, iso14a_card_select_t *card) {
 			if (fsci < sizeof(atsFSC))
 				frameLength = atsFSC[fsci];
 		}
-		
+
 		if (card)
 			memcpy(card, vcard, sizeof(iso14a_card_select_t));
 	}
-	
+
 	if (disconnect)
-		DropField();	
+		DropField();
 
 	return 0;
 }
 
 int CmdExchangeAPDU(bool chainingin, uint8_t *datain, int datainlen, bool activateField, uint8_t *dataout, int maxdataoutlen, int *dataoutlen, bool *chainingout) {
 	*chainingout = false;
-	
+
 	if (activateField) {
 		// select with no disconnect and set frameLength
 		int selres = SelectCard14443_4(false, NULL);
 		if (selres)
 			return selres;
 	}
-	
+
 	uint16_t cmdc = 0;
 	if (chainingin)
 		cmdc = ISO14A_SEND_CHAINING;
-	
+
 	// "Command APDU" length should be 5+255+1, but javacard's APDU buffer might be smaller - 133 bytes
 	// https://stackoverflow.com/questions/32994936/safe-max-java-card-apdu-data-command-and-respond-size
 	// here length USB_CMD_DATA_SIZE=512
 	// timeout must be authomatically set by "get ATS"
-	UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_APDU | ISO14A_NO_DISCONNECT | cmdc, (datainlen & 0xFFFF), 0}}; 
+	UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_APDU | ISO14A_NO_DISCONNECT | cmdc, (datainlen & 0xFFFF), 0}};
 	memcpy(c.d.asBytes, datain, datainlen);
 	SendCommand(&c);
-	
+
     uint8_t *recv;
     UsbCommand resp;
 
@@ -938,24 +938,24 @@ int CmdExchangeAPDU(bool chainingin, uint8_t *datain, int datainlen, bool activa
         recv = resp.d.asBytes;
         int iLen = resp.arg[0];
 		uint8_t res = resp.arg[1];
-		
+
 		int dlen = iLen - 2;
 		if (dlen < 0)
 			dlen = 0;
 		*dataoutlen += dlen;
-		
+
 		if (maxdataoutlen && *dataoutlen > maxdataoutlen) {
 			PrintAndLogEx(ERR, "APDU: Buffer too small(%d). Needs %d bytes", *dataoutlen, maxdataoutlen);
 			return 2;
 		}
-		
+
 		// I-block ACK
 		if ((res & 0xf2) == 0xa2) {
 			*dataoutlen = 0;
 			*chainingout = true;
 			return 0;
 		}
-		
+
         if(!iLen) {
 			PrintAndLogEx(ERR, "APDU: No APDU response.");
             return 1;
@@ -966,7 +966,7 @@ int CmdExchangeAPDU(bool chainingin, uint8_t *datain, int datainlen, bool activa
 			PrintAndLogEx(ERR, "APDU: Small APDU response. Len=%d", iLen);
 			return 2;
 		}
-		
+
 		// check block TODO
 		if (iLen == -2) {
 			PrintAndLogEx(ERR, "APDU: Block type mismatch.");
@@ -974,12 +974,12 @@ int CmdExchangeAPDU(bool chainingin, uint8_t *datain, int datainlen, bool activa
 		}
 
 		memcpy(dataout, recv, dlen);
-		
+
 		// chaining
 		if ((res & 0x10) != 0) {
 			*chainingout = true;
 		}
-		
+
 		// CRC Check
 		if (iLen == -1) {
 			PrintAndLogEx(ERR, "APDU: ISO 14443A CRC error.");
@@ -999,12 +999,12 @@ int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool lea
 	int res;
 
 	// 3 byte here - 1b framing header, 2b crc16
-	if (APDUInFramingEnable && 
+	if (APDUInFramingEnable &&
 		( (frameLength && (datainlen > frameLength - 3)) || (datainlen > USB_CMD_DATA_SIZE - 3)) ) {
 		int clen = 0;
-		
+
 		bool vActivateField = activateField;
-		
+
 		do {
 			int vlen = MIN(frameLength - 3, datainlen - clen);
 			bool chainBlockNotLast = ((clen + vlen) < datainlen);
@@ -1022,10 +1022,10 @@ int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool lea
 			if ((*dataoutlen == 0) && (*dataoutlen != 0 || chaining != chainBlockNotLast)) {
 				if (!leaveSignalON)
 					DropField();
-				
+
 				return 201;
 			}
-			
+
 			clen += vlen;
 			vActivateField = false;
 			if (*dataoutlen) {
@@ -1033,32 +1033,32 @@ int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool lea
 					PrintAndLogEx(WARNING, "APDU: I-block/R-block sequence error. Data len=%d, Sent=%d, Last packet len=%d", datainlen, clen, *dataoutlen);
 				break;
 			}
-		} while (clen < datainlen);		
+		} while (clen < datainlen);
 	} else {
 		res = CmdExchangeAPDU(false, datain, datainlen, activateField, dataout, maxdataoutlen, dataoutlen, &chaining);
 		if (res) {
 			if (!leaveSignalON)
 				DropField();
-			
+
 			return res;
 		}
 	}
-	
+
 	while (chaining) {
 		// I-block with chaining
 		res = CmdExchangeAPDU(false, NULL, 0, false, &dataout[*dataoutlen], maxdataoutlen, dataoutlen, &chaining);
-		
+
 		if (res) {
 			if (!leaveSignalON)
 				DropField();
-			
+
 			return 100;
 		}
-	}	
-	
+	}
+
 	if (!leaveSignalON)
 		DropField();
-	
+
 	return 0;
 }
 
@@ -1070,8 +1070,8 @@ int CmdHF14AAPDU(const char *cmd) {
 	bool leaveSignalON = false;
 	bool decodeTLV = false;
 
-	CLIParserInit("hf 14a apdu", 
-		"Sends an ISO 7816-4 APDU via ISO 14443-4 block transmission protocol (T=CL)", 
+	CLIParserInit("hf 14a apdu",
+		"Sends an ISO 7816-4 APDU via ISO 14443-4 block transmission protocol (T=CL)",
 		"Sample:\n\thf 14a apdu -st 00A404000E325041592E5359532E444446303100\n");
 
 	void* argtable[] = {
@@ -1083,7 +1083,7 @@ int CmdHF14AAPDU(const char *cmd) {
 		arg_param_end
 	};
 	CLIExecWithReturn(cmd, argtable, false);
-			
+
 	activateField = arg_get_lit(1);
 	leaveSignalON = arg_get_lit(2);
 	decodeTLV = arg_get_lit(3);
@@ -1092,21 +1092,21 @@ int CmdHF14AAPDU(const char *cmd) {
 
 CLIParserFree();
 	PrintAndLogEx(NORMAL, ">>>>[%s%s%s] %s", activateField ? "sel ": "", leaveSignalON ? "keep ": "", decodeTLV ? "TLV": "", sprint_hex(data, datalen));
-	
+
 	int res = ExchangeAPDU14a(data, datalen, activateField, leaveSignalON, data, USB_CMD_DATA_SIZE, &datalen);
 
 	if (res)
 		return res;
 
 	PrintAndLogEx(NORMAL, "<<<< %s", sprint_hex(data, datalen));
-	
-	PrintAndLogEx(SUCCESS, "APDU response: %02x %02x - %s", data[datalen - 2], data[datalen - 1], GetAPDUCodeDescription(data[datalen - 2], data[datalen - 1])); 
+
+	PrintAndLogEx(SUCCESS, "APDU response: %02x %02x - %s", data[datalen - 2], data[datalen - 1], GetAPDUCodeDescription(data[datalen - 2], data[datalen - 1]));
 
 	// TLV decoder
 	if (decodeTLV && datalen > 4) {
 		TLVPrintFromBuffer(data, datalen - 2);
 	}
-	
+
 	return 0;
 }
 
@@ -1140,7 +1140,7 @@ int CmdHF14ACmdRaw(const char *cmd) {
 				case 'H':
 				case 'h':
 					return usage_hf_14a_raw();
-                case 'r': 
+                case 'r':
                     reply = false;
                     break;
                 case 'c':
@@ -1155,7 +1155,7 @@ int CmdHF14ACmdRaw(const char *cmd) {
                 case 's':
                     active_select = true;
                     break;
-                case 'b': 
+                case 'b':
                     sscanf(cmd+i+2, "%d", &temp);
                     numbits = temp & 0xFFFF;
                     i+=3;
@@ -1235,21 +1235,21 @@ int CmdHF14ACmdRaw(const char *cmd) {
     if (power) {
         c.arg[0] |= ISO14A_NO_DISCONNECT;
 	}
-	
+
     if (datalen > 0) {
         c.arg[0] |= ISO14A_RAW;
 	}
-	
+
 	if (topazmode) {
 		c.arg[0] |= ISO14A_TOPAZMODE;
 	}
 	if (no_rats) {
 		c.arg[0] |= ISO14A_NO_RATS;
 	}
-			
+
 	// Max buffer is USB_CMD_DATA_SIZE
 	datalen = (datalen > USB_CMD_DATA_SIZE) ? USB_CMD_DATA_SIZE : datalen;
-		
+
     c.arg[1] = (datalen & 0xFFFF) | ((uint32_t)(numbits << 16));
     memcpy(c.d.asBytes, data, datalen);
 
@@ -1270,7 +1270,7 @@ static int waitCmd(uint8_t iSelect) {
     UsbCommand resp;
     uint16_t len = 0;
 
-    if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {        
+    if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
 		len = (resp.arg[0] & 0xFFFF);
 		if (iSelect){
 			len = (resp.arg[1] & 0xFFFF);
@@ -1282,10 +1282,10 @@ static int waitCmd(uint8_t iSelect) {
 		} else {
 			PrintAndLogEx(NORMAL, "received %i bytes", len);
 		}
-		
+
         if (!len)
             return 1;
-		
+
 		PrintAndLogEx(NORMAL, "%s", sprint_hex(resp.d.asBytes, len) );
     } else {
         PrintAndLogEx(WARNING, "timeout while waiting for reply.");
@@ -1295,9 +1295,9 @@ static int waitCmd(uint8_t iSelect) {
 }
 
 int CmdHF14AAntiFuzz(const char *cmd) {
-	
-	CLIParserInit("hf 14a antifuzz", 
-		"Tries to fuzz the ISO14443a anticollision phase", 
+
+	CLIParserInit("hf 14a antifuzz",
+		"Tries to fuzz the ISO14443a anticollision phase",
 		"Usage:\n"
 		"\thf 14a antifuzz -4\n");
 
@@ -1312,21 +1312,21 @@ int CmdHF14AAntiFuzz(const char *cmd) {
 
 	uint8_t arg0 = FLAG_4B_UID_IN_DATA;
 	if (arg_get_lit(2))
-		arg0 = FLAG_7B_UID_IN_DATA;		
+		arg0 = FLAG_7B_UID_IN_DATA;
 	if (arg_get_lit(3))
 		arg0 = FLAG_10B_UID_IN_DATA;
 
 	CLIParserFree();
-	UsbCommand c = {CMD_ANTIFUZZ_ISO_14443a, {arg0, 0, 0}};	
+	UsbCommand c = {CMD_ANTIFUZZ_ISO_14443a, {arg0, 0, 0}};
 	clearCommandBuffer();
-    SendCommand(&c);	
+    SendCommand(&c);
 	return 0;
 }
 
 int CmdHF14AChaining(const char *cmd) {
-	
-	CLIParserInit("hf 14a chaining", 
-		"Enable/Disable ISO14443a input chaining. Maximum input length goes from ATS.", 
+
+	CLIParserInit("hf 14a chaining",
+		"Enable/Disable ISO14443a input chaining. Maximum input length goes from ATS.",
 		"Usage:\n"
 		"\thf 14a chaining disable -> disable chaining\n"
 		"\thf 14a chaining         -> show chaining enable/disable state\n");
@@ -1340,17 +1340,17 @@ int CmdHF14AChaining(const char *cmd) {
 
 	struct arg_str *str = arg_get_str(1);
 	int len = arg_get_str_len(1);
-	
+
 	if (len && (!strcmp(str->sval[0], "enable") || !strcmp(str->sval[0], "1")))
 		APDUInFramingEnable = true;
-	
+
 	if (len && (!strcmp(str->sval[0], "disable") || !strcmp(str->sval[0], "0")))
 		APDUInFramingEnable = false;
 
 	CLIParserFree();
 
 	PrintAndLogEx(INFO, "\nISO 14443-4 input chaining %s.\n", APDUInFramingEnable ? "enabled" : "disabled");
-	
+
 	return 0;
 }
 
diff --git a/client/cmdhf14a.h b/client/cmdhf14a.h
index 3fe04d26c..4396c4b79 100644
--- a/client/cmdhf14a.h
+++ b/client/cmdhf14a.h
@@ -31,13 +31,13 @@
 #include "cmdhf.h"		// list cmd
 #include "mifare/mifarehost.h"
 #include "emv/apduinfo.h"
-#include "emv/emvcore.h"						  
+#include "emv/emvcore.h"
 
-// structure and database for uid -> tagtype lookups 
-typedef struct { 
+// structure and database for uid -> tagtype lookups
+typedef struct {
 	uint8_t uid;
 	char* desc;
-} manufactureName; 
+} manufactureName;
 
 extern int CmdHF14A(const char *Cmd);
 extern int CmdHF14AList(const char *Cmd);
@@ -51,7 +51,7 @@ extern int CmdHF14AAntiFuzz(const char *cmd);
 
 extern char* getTagInfo(uint8_t uid);
 extern int Hf14443_4aGetCardData(iso14a_card_select_t * card);
-extern int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen);									
+extern int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen);
 extern int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen);
 
 extern int usage_hf_14a_sim(void);
diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c
index 4109a999a..f74ca9a34 100644
--- a/client/cmdhf14b.c
+++ b/client/cmdhf14b.c
@@ -43,7 +43,7 @@ int usage_hf_14b_raw(void){
 	PrintAndLogEx(NORMAL, "       -ss   active signal field ON with select for SRx ST Microelectronics tags");
 	PrintAndLogEx(NORMAL, "Example:");
 	PrintAndLogEx(NORMAL, "       hf 14b raw -s -c -p 0200a40400");
-	return 0;    
+	return 0;
 }
 int usage_hf_14b_sniff(void){
 	PrintAndLogEx(NORMAL, "It get data from the field and saves it into command buffer.");
@@ -53,7 +53,7 @@ int usage_hf_14b_sniff(void){
 	PrintAndLogEx(NORMAL, "       h    this help");
 	PrintAndLogEx(NORMAL, "Example:");
 	PrintAndLogEx(NORMAL, "       hf 14b sniff");
-	return 0;    
+	return 0;
 }
 int usage_hf_14b_sim(void){
 	PrintAndLogEx(NORMAL, "Emulating ISO/IEC 14443 type B tag with 4 UID / PUPI");
@@ -64,7 +64,7 @@ int usage_hf_14b_sim(void){
 	PrintAndLogEx(NORMAL, "Example:");
 	PrintAndLogEx(NORMAL, "       hf 14b sim");
 	PrintAndLogEx(NORMAL, "       hf 14b sim u 11223344");
-	return 0;    
+	return 0;
 }
 int usage_hf_14b_read_srx(void){
 	PrintAndLogEx(NORMAL, "Usage:  hf 14b sriread [h] <1|2>");
@@ -94,7 +94,7 @@ int usage_hf_14b_dump(void){
 	PrintAndLogEx(NORMAL, "This command dumps the contents of a ISO-14443-B tag and save it to file\n"
 	                      "\n"
 	                      "Usage: hf 14b dump [h] [card memory] <f filname> \n"
-	                      "Options:\n"						  
+	                      "Options:\n"
 	                      "\th             this help\n"
 						  "\t[card memory] 1 = SRIX4K (default), 2 = SRI512"
 	                      "\tf <name>      filename,  if no <name> UID will be used as filename\n"
@@ -128,12 +128,12 @@ int CmdHF14BList(const char *Cmd) {
 int CmdHF14BSim(const char *Cmd) {
 	char cmdp = tolower(param_getchar(Cmd, 0));
 	if (cmdp == 'h') return usage_hf_14b_sim();
-	
+
 	uint32_t pupi = 0;
 	if (cmdp == 'u') {
 		pupi = param_get32ex(Cmd, 1, 0, 16);
 	}
-	
+
 	UsbCommand c = {CMD_SIMULATE_TAG_ISO_14443B, {pupi, 0, 0}};
 	clearCommandBuffer();
 	SendCommand(&c);
@@ -141,10 +141,10 @@ int CmdHF14BSim(const char *Cmd) {
 }
 
 int CmdHF14BSniff(const char *Cmd) {
-	
+
 	char cmdp = tolower(param_getchar(Cmd, 0));
 	if (cmdp == 'h') return usage_hf_14b_sniff();
-	
+
 	UsbCommand c = {CMD_SNOOP_ISO_14443B, {0, 0, 0}};
 	clearCommandBuffer();
 	SendCommand(&c);
@@ -159,25 +159,25 @@ int CmdHF14BCmdRaw (const char *Cmd) {
 	uint16_t datalen = 0;
 	uint32_t flags = ISO14B_CONNECT;
 	uint32_t temp = 0;
-	
+
 	if ( strlen(Cmd) < 3 ) return usage_hf_14b_raw();
 
     // strip
     while (*Cmd==' ' || *Cmd=='\t') ++Cmd;
-    
+
     while (Cmd[i]!='\0') {
         if (Cmd[i]==' ' || Cmd[i]=='\t') { ++i; continue; }
         if (Cmd[i]=='-') {
             switch (tolower(Cmd[i+1])) {
 				case 'h':
 					return usage_hf_14b_raw();
-                case 'r': 
+                case 'r':
                     reply = false;
                     break;
                 case 'c':
                     flags |= ISO14B_APPEND_CRC;
                     break;
-                case 'p': 
+                case 'p':
 					power = true;
                     break;
 				case 's':
@@ -201,7 +201,7 @@ int CmdHF14BCmdRaw (const char *Cmd) {
             buf[strlen(buf)+1]=0;
             buf[strlen(buf)]=Cmd[i];
             i++;
-            
+
             if (strlen(buf)>=2) {
                 sscanf(buf,"%x",&temp);
                 data[datalen++] = (uint8_t)(temp & 0xff);
@@ -213,7 +213,7 @@ int CmdHF14BCmdRaw (const char *Cmd) {
         PrintAndLogEx(WARNING, "unknown parameter '%c'\n", param_getchar(Cmd, i));
 		return 0;
     }
-	
+
 	if (!power)
         flags |= ISO14B_DISCONNECT;
 
@@ -223,16 +223,16 @@ int CmdHF14BCmdRaw (const char *Cmd) {
 	// Max buffer is USB_CMD_DATA_SIZE
 	datalen = (datalen > USB_CMD_DATA_SIZE) ? USB_CMD_DATA_SIZE : datalen;
 
-	UsbCommand c = {CMD_ISO_14443B_COMMAND, {flags, datalen, 0}}; 
+	UsbCommand c = {CMD_ISO_14443B_COMMAND, {flags, datalen, 0}};
 	memcpy(c.d.asBytes, data, datalen);
 	clearCommandBuffer();
 	SendCommand(&c);
 
-	if (!reply) return 1; 
+	if (!reply) return 1;
 
 	bool success = true;
 	// get back iso14b_card_select_t, don't print it.
-	if (select) 
+	if (select)
 		success = waitCmd14b(false);
 
 	// get back response from the raw bytes you sent.
@@ -245,47 +245,47 @@ static bool get_14b_UID(iso14b_card_select_t *card) {
 
 	if (!card)
 		return false;
-	
+
 	int8_t retry = 3;
 	UsbCommand resp;
 	UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_SR | ISO14B_DISCONNECT, 0, 0}};
-		
-	// test for 14b SR		
+
+	// test for 14b SR
 	while (retry--) {
 
 		clearCommandBuffer();
-		SendCommand(&c);		
+		SendCommand(&c);
 		if (WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
-			
+
 			uint8_t status = resp.arg[0];
 			if ( status == 0) {
 				memcpy(card, (iso14b_card_select_t *)resp.d.asBytes, sizeof(iso14b_card_select_t));
 				return true;
 			}
-		} 
+		}
 	} // retry
 
 	// test 14b standard
-	c.arg[0] = ISO14B_CONNECT | ISO14B_SELECT_STD | ISO14B_DISCONNECT;	
+	c.arg[0] = ISO14B_CONNECT | ISO14B_SELECT_STD | ISO14B_DISCONNECT;
 	retry = 3;
 	while (retry--) {
 
 
 		clearCommandBuffer();
-		SendCommand(&c);		
+		SendCommand(&c);
 		if (WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
-			
+
 			uint8_t status = resp.arg[0];
 			if ( status == 0) {
 				memcpy(card, (iso14b_card_select_t *)resp.d.asBytes, sizeof(iso14b_card_select_t));
 				return true;
 			}
-		} 
-	} // retry	
-	
+		}
+	} // retry
+
 	if ( retry <= 0 )
 		PrintAndLogEx(WARNING, "timeout while waiting for reply.");
-	
+
 	return false;
 }
 
@@ -302,11 +302,11 @@ static void print_atqb_resp(uint8_t *data, uint8_t cid){
 	uint8_t BitRate = data[4];
 	if (!BitRate) PrintAndLogEx(NORMAL, "      Bit Rate: 106 kbit/s only PICC <-> PCD");
 	if (BitRate & 0x10)	PrintAndLogEx(NORMAL, "      Bit Rate: 212 kbit/s PICC -> PCD supported");
-	if (BitRate & 0x20)	PrintAndLogEx(NORMAL, "      Bit Rate: 424 kbit/s PICC -> PCD supported"); 
-	if (BitRate & 0x40)	PrintAndLogEx(NORMAL, "      Bit Rate: 847 kbit/s PICC -> PCD supported"); 
+	if (BitRate & 0x20)	PrintAndLogEx(NORMAL, "      Bit Rate: 424 kbit/s PICC -> PCD supported");
+	if (BitRate & 0x40)	PrintAndLogEx(NORMAL, "      Bit Rate: 847 kbit/s PICC -> PCD supported");
 	if (BitRate & 0x01)	PrintAndLogEx(NORMAL, "      Bit Rate: 212 kbit/s PICC <- PCD supported");
-	if (BitRate & 0x02)	PrintAndLogEx(NORMAL, "      Bit Rate: 424 kbit/s PICC <- PCD supported"); 
-	if (BitRate & 0x04)	PrintAndLogEx(NORMAL, "      Bit Rate: 847 kbit/s PICC <- PCD supported"); 
+	if (BitRate & 0x02)	PrintAndLogEx(NORMAL, "      Bit Rate: 424 kbit/s PICC <- PCD supported");
+	if (BitRate & 0x04)	PrintAndLogEx(NORMAL, "      Bit Rate: 847 kbit/s PICC <- PCD supported");
 	if (BitRate & 0x80)	PrintAndLogEx(NORMAL, "                Same bit rate <-> required");
 
 	uint16_t maxFrame = data[5] >> 4;
@@ -316,12 +316,12 @@ static void print_atqb_resp(uint8_t *data, uint8_t cid){
 	else if (maxFrame == 7)	maxFrame = 128;
 	else if (maxFrame == 8)	maxFrame = 256;
 	else maxFrame = 257;
-	
+
 	PrintAndLogEx(NORMAL, "Max Frame Size: %u%s bytes", maxFrame, (maxFrame == 257) ? "+ RFU" : "");
 
 	uint8_t protocolT = data[5] & 0xF;
 	PrintAndLogEx(NORMAL, " Protocol Type: Protocol is %scompliant with ISO/IEC 14443-4",(protocolT) ? "" : "not " );
-	
+
 	uint8_t fwt = data[6]>>4;
 	if ( fwt < 16 ){
 		uint32_t etus = (32 << fwt);
@@ -330,7 +330,7 @@ static void print_atqb_resp(uint8_t *data, uint8_t cid){
 	} else {
 		PrintAndLogEx(NORMAL, "Frame Wait Integer: %u - RFU", fwt);
 	}
-	
+
 	PrintAndLogEx(NORMAL, " App Data Code: Application is %s",(data[6]&4) ? "Standard" : "Proprietary");
 	PrintAndLogEx(NORMAL, " Frame Options: NAD is %ssupported",(data[6]&2) ? "" : "not ");
 	PrintAndLogEx(NORMAL, " Frame Options: CID is %ssupported",(data[6]&1) ? "" : "not ");
@@ -429,33 +429,33 @@ static void print_st_general_info(uint8_t *data, uint8_t len){
 // 0200a4040010a000000018300301000000000000000000 (resp 02 6a 82 [4b 4c])
 //03 = ?  (resp 03 [e3 c2])
 //c2 = ?  (resp c2 [66 15])
-//b2 = ?  (resp a3 [e9 67])		
+//b2 = ?  (resp a3 [e9 67])
 //a2 = ?  (resp 02 [6a d3])
 
 // 14b get and print Full Info (as much as we know)
 bool HF14B_Std_Info(bool verbose){
 
 	bool isSuccess = false;
-	
-	// 14b get and print UID only (general info) 
+
+	// 14b get and print UID only (general info)
 	UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_STD | ISO14B_DISCONNECT, 0, 0}};
 	clearCommandBuffer();
 	SendCommand(&c);
 	UsbCommand resp;
-	
+
 	if (!WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
 		if (verbose) PrintAndLogEx(WARNING, "command execution timeout");
-		switch_off_field_14b();		
+		switch_off_field_14b();
 	return false;
     }
-	
+
 	iso14b_card_select_t card;
 	memcpy(&card, (iso14b_card_select_t *)resp.d.asBytes, sizeof(iso14b_card_select_t));
-	
-	uint64_t status = resp.arg[0];	
-	
+
+	uint64_t status = resp.arg[0];
+
 	switch( status ){
-		case 0: 
+		case 0:
 			PrintAndLogEx(NORMAL, " UID    : %s", sprint_hex(card.uid, card.uidlen));
 			PrintAndLogEx(NORMAL, " ATQB   : %s", sprint_hex(card.atqb, sizeof(card.atqb)));
 			PrintAndLogEx(NORMAL, " CHIPID : %02X", card.chipid);
@@ -465,20 +465,20 @@ bool HF14B_Std_Info(bool verbose){
 		case 2:
 			if (verbose) PrintAndLogEx(FAILED, "ISO 14443-3 ATTRIB fail");
 			break;
-		case 3: 
+		case 3:
 			if (verbose) PrintAndLogEx(FAILED, "ISO 14443-3 CRC fail");
 			break;
 		default:
 			if (verbose) PrintAndLogEx(FAILED, "ISO 14443-b card select failed");
 			break;
 	}
-	
+
 	return isSuccess;
 }
 
 // SRx get and print full info (needs more info...)
 bool HF14B_ST_Info(bool verbose){
-	
+
 	UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_SR | ISO14B_DISCONNECT, 0, 0}};
 	clearCommandBuffer();
 	SendCommand(&c);
@@ -491,9 +491,9 @@ bool HF14B_ST_Info(bool verbose){
 
 	iso14b_card_select_t card;
 	memcpy(&card, (iso14b_card_select_t *)resp.d.asBytes, sizeof(iso14b_card_select_t));
-	
-	uint64_t status = resp.arg[0];	
-	if ( status > 0 ) 
+
+	uint64_t status = resp.arg[0];
+	if ( status > 0 )
 		return false;
 
 	print_st_general_info(card.uid, card.uidlen);
@@ -507,16 +507,16 @@ bool HF14B_ST_Info(bool verbose){
 	//
 	// if (model == 0x2) { //SR176 has special command:
 		// data[1] = 0xf;
-		// resplen = 4;			
+		// resplen = 4;
 	// } else {
 		// data[1] = 0xff;
 		// resplen = 6;
 	// }
 
 	// //std read cmd
-	// if (HF14BCmdRaw(true, true, data, &datalen, false)==0) 
+	// if (HF14BCmdRaw(true, true, data, &datalen, false)==0)
 		// return rawClose();
-	
+
 	// if (datalen != resplen || !crc) return rawClose();
 	//print_ST_Lock_info(data[5]>>2);
 	return true;
@@ -541,7 +541,7 @@ bool HF14BInfo(bool verbose){
 int CmdHF14Binfo(const char *Cmd){
 	char cmdp = tolower(param_getchar(Cmd, 0));
 	if (cmdp == 'h') return usage_hf_14b_info();
-	
+
 	bool verbose = !(cmdp == 's');
 	return HF14BInfo(verbose);
 }
@@ -559,14 +559,14 @@ bool HF14B_ST_Reader(bool verbose){
 		if (verbose) PrintAndLogEx(WARNING, "command execution timeout");
 		return false;
     }
-	
+
 	iso14b_card_select_t card;
 	memcpy(&card, (iso14b_card_select_t *)resp.d.asBytes, sizeof(iso14b_card_select_t));
 
 	uint64_t status = resp.arg[0];
 
 	switch( status ){
-		case 0: 
+		case 0:
 			print_st_general_info(card.uid, card.uidlen);
 			isSuccess = true;
 			break;
@@ -576,38 +576,38 @@ bool HF14B_ST_Reader(bool verbose){
 		case 2:
 			if (verbose) PrintAndLogEx(FAILED, "ISO 14443-3 ATTRIB fail");
 			break;
-		case 3: 
+		case 3:
 			if (verbose) PrintAndLogEx(FAILED, "ISO 14443-3 CRC fail");
 			break;
 		default:
 			if (verbose) PrintAndLogEx(FAILED, "ISO 14443-b card select SRx failed");
 			break;
 	}
-	return isSuccess;		
+	return isSuccess;
 }
 
 bool HF14B_Std_Reader(bool verbose){
 
 	bool isSuccess = false;
 
-	// 14b get and print UID only (general info) 
+	// 14b get and print UID only (general info)
 	UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_STD | ISO14B_DISCONNECT, 0, 0}};
 	clearCommandBuffer();
 	SendCommand(&c);
 	UsbCommand resp;
-	
+
 	if (!WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
 		if (verbose) PrintAndLogEx(WARNING, "command execution timeout");
 		return false;
     }
-	
+
 	iso14b_card_select_t card;
 	memcpy(&card, (iso14b_card_select_t *)resp.d.asBytes, sizeof(iso14b_card_select_t));
-	
-	uint64_t status = resp.arg[0];	
-	
+
+	uint64_t status = resp.arg[0];
+
 	switch( status ){
-		case 0: 
+		case 0:
 			PrintAndLogEx(NORMAL, " UID    : %s", sprint_hex(card.uid, card.uidlen));
 			PrintAndLogEx(NORMAL, " ATQB   : %s", sprint_hex(card.atqb, sizeof(card.atqb)));
 			PrintAndLogEx(NORMAL, " CHIPID : %02X", card.chipid);
@@ -617,14 +617,14 @@ bool HF14B_Std_Reader(bool verbose){
 		case 2:
 			if (verbose) PrintAndLogEx(FAILED, "ISO 14443-3 ATTRIB fail");
 			break;
-		case 3: 
+		case 3:
 			if (verbose) PrintAndLogEx(FAILED, "ISO 14443-3 CRC fail");
 			break;
 		default:
 			if (verbose) PrintAndLogEx(FAILED, "ISO 14443-b card select failed");
 			break;
 	}
-	return isSuccess;	
+	return isSuccess;
 }
 
 // test for other 14b type tags (mimic another reader - don't have tags to identify)
@@ -633,17 +633,17 @@ bool HF14B_Other_Reader(){
 	// uint8_t data[] = {0x00, 0x0b, 0x3f, 0x80};
 	// uint8_t datalen = 4;
 
-	// // 14b get and print UID only (general info) 
+	// // 14b get and print UID only (general info)
 	// uint32_t flags = ISO14B_CONNECT | ISO14B_SELECT_STD | ISO14B_RAW | ISO14B_APPEND_CRC;
-	
-	// UsbCommand c = {CMD_ISO_14443B_COMMAND, {flags, datalen, 0}}; 
+
+	// UsbCommand c = {CMD_ISO_14443B_COMMAND, {flags, datalen, 0}};
 	// memcpy(c.d.asBytes, data, datalen);
 
 	// clearCommandBuffer();
 	// SendCommand(&c);
 	// UsbCommand resp;
 	// WaitForResponse(CMD_ACK,&resp);
-	
+
 	// if (datalen > 2 ) {
 		// PrintAndLogEx(NORMAL, "\n14443-3b tag found:");
 		// PrintAndLogEx(NORMAL, "unknown tag type answered to a 0x000b3f80 command ans:");
@@ -658,7 +658,7 @@ bool HF14B_Other_Reader(){
 	// SendCommand(&c);
 	// UsbCommand resp;
 	// WaitForResponse(CMD_ACK, &resp);
-	
+
 	// if (datalen > 0) {
 		// PrintAndLogEx(NORMAL, "\n14443-3b tag found:");
 		// PrintAndLogEx(NORMAL, "Unknown tag type answered to a 0x0A command ans:");
@@ -681,14 +681,14 @@ bool HF14B_Other_Reader(){
 		// rawClose();
 		// return true;
 	// }
-	
+
 	// rawClose();
 	return false;
 }
 
 // get and print general info about all known 14b chips
 bool HF14BReader(bool verbose){
-	
+
 	// try std 14b (atqb)
 	if (HF14B_Std_Reader(verbose)) return true;
 
@@ -707,7 +707,7 @@ bool HF14BReader(bool verbose){
 int CmdHF14BReader(const char *Cmd){
 	char cmdp = tolower(param_getchar(Cmd, 0));
 	if (cmdp == 'h') return usage_hf_14b_reader();
-	
+
 	bool verbose = !(cmdp == 's');
 	return HF14BReader(verbose);
 }
@@ -722,7 +722,7 @@ int CmdHF14BReadSri(const char *Cmd){
 
 	uint8_t tagtype = param_get8(Cmd, 0);
 	uint8_t blocks = (tagtype == 1) ? 0x7F : 0x0F;
-	
+
 	UsbCommand c = {CMD_READ_SRI_TAG, {blocks, 0, 0}};
 	clearCommandBuffer();
 	SendCommand(&c);
@@ -736,7 +736,7 @@ int CmdHF14BWriteSri(const char *Cmd){
  *
  * For SR512  blocks 00 - 0F
  * hf 14b raw -c -p 09 $sr512wblock $sr512wdata
- * 
+ *
  * Special block FF =  otp_lock_reg block.
  * Data len 4 bytes-
  */
@@ -744,38 +744,38 @@ int CmdHF14BWriteSri(const char *Cmd){
 	uint8_t blockno = -1;
 	uint8_t data[4] = {0x00};
 	bool isSrix4k = true;
-	char str[30];	
+	char str[30];
 	memset(str, 0x00, sizeof(str));
 
 	if (strlen(Cmd) < 1 || cmdp == 'h') return usage_hf_14b_write_srx();
 
 	if ( cmdp == '2' )
 		isSrix4k = false;
-	
+
 	//blockno = param_get8(Cmd, 1);
-	
+
 	if ( param_gethex(Cmd, 1, &blockno, 2) ) {
 		PrintAndLogEx(WARNING, "block number must include 2 HEX symbols");
 		return 0;
 	}
-	
+
 	if ( isSrix4k ){
 		if ( blockno > 0x7f && blockno != 0xff ){
 			PrintAndLogEx(FAILED, "block number out of range");
 			return 0;
-		}		
+		}
 	} else {
 		if ( blockno > 0x0f && blockno != 0xff ){
 			PrintAndLogEx(FAILED, "block number out of range");
 			return 0;
-		}		
+		}
 	}
-	
+
 	if (param_gethex(Cmd, 2, data, 8)) {
 		PrintAndLogEx(WARNING, "data must include 8 HEX symbols");
 		return 0;
 	}
- 
+
 	if ( blockno == 0xff) {
 		PrintAndLogEx(SUCCESS, "[%s] Write special block %02X [ %s ]",
 			(isSrix4k) ? "SRIX4K":"SRI512",
@@ -785,11 +785,11 @@ int CmdHF14BWriteSri(const char *Cmd){
 	} else {
 		PrintAndLogEx(SUCCESS, "[%s] Write block %02X [ %s ]",
 			(isSrix4k) ? "SRIX4K":"SRI512",
-			blockno, 
+			blockno,
 			sprint_hex(data,4)
 		);
 	}
-	
+
 	sprintf(str, "-ss -c %02x %02x %02x %02x %02x %02x", ISO14443B_WRITE_BLK, blockno, data[0], data[1], data[2], data[3]);
 	CmdHF14BCmdRaw(str);
 	return 0;
@@ -797,7 +797,7 @@ int CmdHF14BWriteSri(const char *Cmd){
 
 // need to write to file
 int CmdHF14BDump(const char*Cmd) {
-	
+
 	uint8_t fileNameLen = 0;
 	char filename[FILE_PATH_SIZE] = {0};
 	char * fptr = filename;
@@ -806,13 +806,13 @@ int CmdHF14BDump(const char*Cmd) {
 	uint16_t cardsize = 0;
 	uint8_t blocks = 0;
 	iso14b_card_select_t card;
-	
+
 	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
 		switch (tolower(param_getchar(Cmd, cmdp))) {
 		case 'h':
 			return usage_hf_14b_dump();
 		case 'f':
-			fileNameLen = param_getstr(Cmd, cmdp+1, filename, FILE_PATH_SIZE); 
+			fileNameLen = param_getstr(Cmd, cmdp+1, filename, FILE_PATH_SIZE);
 			cmdp += 2;
 			break;
 		default:
@@ -839,26 +839,26 @@ int CmdHF14BDump(const char*Cmd) {
 		default:
 			cardsize = (4096/8) + 4;
 			blocks = 0x7F;
-			break;			
+			break;
 	}
-	
+
 	if (!get_14b_UID(&card)) {
 		PrintAndLogEx(WARNING, "No tag found.");
 		return 1;
 	}
-		
+
 	if (fileNameLen < 1) {
 		PrintAndLogEx(INFO, "Using UID as filename");
-		fptr += sprintf(fptr, "hf-14b-"); 
+		fptr += sprintf(fptr, "hf-14b-");
 		FillFileNameByUID(fptr, card.uid, "-dump", card.uidlen);
-	}		
+	}
 
-	// detect blocksize from card :)	
+	// detect blocksize from card :)
 	PrintAndLogEx(NORMAL, "Reading memory from tag UID %s", sprint_hex(card.uid, card.uidlen));
-	
+
 	uint8_t data[cardsize];
 	memset(data, 0, sizeof(data));
-	
+
 	int blocknum = 0;
 	uint8_t *recv = NULL;
 
@@ -874,30 +874,30 @@ int CmdHF14BDump(const char*Cmd) {
 			goto out;
 		}
 	}
-	
+
 	c.arg[0] = ISO14B_APPEND_CRC | ISO14B_RAW;
 	c.arg[1] = 2;
-	
+
 	uint8_t *req = c.d.asBytes;
-	req[0] = ISO14443B_READ_BLK;	
-	
+	req[0] = ISO14443B_READ_BLK;
+
 	for (int retry = 0; retry < 5; retry++) {
-	
+
 		req[1] = blocknum;
-	
+
 		clearCommandBuffer();
 		SendCommand(&c);
-				
+
 		if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
 
 			uint8_t status = resp.arg[0] & 0xFF;
 			if ( status > 0 ) {
-				continue;		
+				continue;
 			}
-			
+
 			uint16_t len = (resp.arg[1] & 0xFFFF);
 			recv = resp.d.asBytes;
-			
+
 			if ( !check_crc(CRC_14443_B, recv, len) ) {
 				PrintAndLogEx(FAILED, "crc fail, retrying one more time");
 				continue;
@@ -909,43 +909,43 @@ int CmdHF14BDump(const char*Cmd) {
 				//last read.
 				break;
 			}
-			
-						
+
+
 			retry = 0;
 			blocknum++;
 			if ( blocknum > blocks ) {
 				// read config block
 				blocknum = 0xFF;
 			}
-			
+
 			printf("."); fflush(stdout);
-		} 
+		}
 	}
-	
+
 	if ( blocknum != 0xFF) {
 		PrintAndLogEx(NORMAL, "\n Dump failed");
 		goto out;
 	}
-	
+
 	PrintAndLogEx(NORMAL, "\n");
 	PrintAndLogEx(NORMAL, "block#   | data         | ascii");
-	PrintAndLogEx(NORMAL, "---------+--------------+----------");	
+	PrintAndLogEx(NORMAL, "---------+--------------+----------");
 
 	for (int i = 0; i <= blocks; i++) {
 		PrintAndLogEx(NORMAL,
-			"%3d/0x%02X | %s | %s", 
+			"%3d/0x%02X | %s | %s",
 			i,
 			i,
 			sprint_hex(data + (i*4), 4 ),
 			sprint_ascii(data + (i*4), 4)
 		);
 	}
-	
+
 	PrintAndLogEx(NORMAL, "\n");
 
-	
+
 	size_t datalen = (blocks+1) * 4;
-	saveFileEML(filename, "eml", data, datalen, 4);	
+	saveFileEML(filename, "eml", data, datalen, 4);
 	saveFile(filename, "bin", data, datalen);
 out:
 	return switch_off_field_14b();
@@ -955,16 +955,16 @@ uint32_t srix4kEncode(uint32_t value) {
 /*
 // vv = value
 // pp = position
-//                vv vv vv pp 
+//                vv vv vv pp
 4 bytes			: 00 1A 20 01
 */
 	// only the lower crumbs.
 	uint8_t block = (value & 0xFF);
 	uint8_t i = 0;
 	uint8_t valuebytes[] = {0,0,0};
-		
+
 	num_to_bytes(value, 3, valuebytes);
-	
+
 	// Scrambled part
 	// Crumb swapping of value.
 	uint8_t temp[] = {0,0};
@@ -975,7 +975,7 @@ uint32_t srix4kEncode(uint32_t value) {
 
 	// chksum part
 	uint32_t chksum = 0xFF - block;
-	
+
 	// chksum is reduced by each nibbles of value.
 	for (i = 0; i < 3; ++i){
 		chksum -= NIBBLE_HIGH(valuebytes[i]);
@@ -984,23 +984,23 @@ uint32_t srix4kEncode(uint32_t value) {
 
 	// base4 conversion and left shift twice
 	i = 3;
-	uint8_t base4[] = {0,0,0,0};	
+	uint8_t base4[] = {0,0,0,0};
 	while( chksum !=0 ){
         base4[i--] = (chksum % 4 << 2);
 		chksum /= 4;
     }
-	
+
 	// merge scambled and chksum parts
-	uint32_t encvalue = 
+	uint32_t encvalue =
 		( NIBBLE_LOW ( base4[0]) << 28 ) |
 		( NIBBLE_HIGH( temp[0])  << 24 ) |
-		
+
 		( NIBBLE_LOW ( base4[1]) << 20 ) |
 		( NIBBLE_LOW ( temp[0])  << 16 ) |
-		
+
 		( NIBBLE_LOW ( base4[2]) << 12 ) |
 		( NIBBLE_HIGH( temp[1])  << 8 ) |
-		
+
 		( NIBBLE_LOW ( base4[3]) << 4 ) |
 		  NIBBLE_LOW ( temp[1] );
 
@@ -1040,12 +1040,12 @@ int srix4kValid(const char *Cmd){
 	uint32_t block18 = 0xC04F42C5;
 	uint32_t block19 = 0xC1484807;
 	uint32_t block21 = 0xD1BCABA4;
-  
+
 	uint32_t test_b18 = 0x00313918;
 	uint32_t test_b18_enc = srix4kEncode(test_b18);
 	//uint32_t test_b18_dec = srix4kDecode(test_b18_enc);
 	PrintAndLogEx(SUCCESS, "ENCODE & CHECKSUM |  %08X -> %08X (%s)", test_b18, test_b18_enc , "");
-	
+
 	uint32_t magic = srix4kGetMagicbytes(uid, block6, block18, block19);
 	PrintAndLogEx(SUCCESS, "BLOCK 21 |  %08X -> %08X (no XOR)", block21, magic ^ block21);
 	return 0;
@@ -1056,22 +1056,22 @@ bool waitCmd14b(bool verbose) {
 	bool crc = false;
 	uint8_t data[USB_CMD_DATA_SIZE] = {0x00};
 	uint8_t status = 0;
-	uint16_t len = 0;	
+	uint16_t len = 0;
     UsbCommand resp;
 
     if (WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
 
 		status = (resp.arg[0] & 0xFF);
 		if ( status > 0 ) return false;
-			
+
 		len = (resp.arg[1] & 0xFFFF);
-		
+
 		memcpy(data, resp.d.asBytes, len);
-		
+
 		if (verbose) {
 			if ( len >= 3 ) {
 				crc = check_crc(CRC_14443_B, data, len);
-		
+
 				PrintAndLogEx(NORMAL, "[LEN %u] %s[%02X %02X] %s",
 					len,
 					sprint_hex(data, len-2),
@@ -1082,7 +1082,7 @@ bool waitCmd14b(bool verbose) {
 			} else {
 				PrintAndLogEx(NORMAL, "[LEN %u] %s", len,	sprint_hex(data, len) );
 			}
-		}	
+		}
 		return true;
     } else {
         PrintAndLogEx(WARNING, "command execution timeout");
@@ -1092,7 +1092,7 @@ bool waitCmd14b(bool verbose) {
 
 static command_t CommandTable[] = {
 	{"help",        CmdHelp,        1, "This help"},
-	{"dump",		CmdHF14BDump,	0, "Read all memory pages of an ISO14443-B tag, save to file"},	
+	{"dump",		CmdHF14BDump,	0, "Read all memory pages of an ISO14443-B tag, save to file"},
 	{"info",        CmdHF14Binfo,   0, "Tag information"},
 	{"list",        CmdHF14BList,   0, "[Deprecated] List ISO 14443B history"},
 	{"raw",         CmdHF14BCmdRaw, 0, "Send raw hex data to tag"},
diff --git a/client/cmdhf14b.h b/client/cmdhf14b.h
index 793949c86..74b279620 100644
--- a/client/cmdhf14b.h
+++ b/client/cmdhf14b.h
@@ -51,7 +51,7 @@ extern bool HF14BInfo(bool verbose);
 extern bool HF14BReader(bool verbose);
 extern int CmdHF14BCmdRaw (const char *Cmd);
 
-// SRi  ST Microelectronics read/write 
+// SRi  ST Microelectronics read/write
 extern int CmdHF14BReadSri(const char *Cmd);
 extern int CmdHF14BWriteSri(const char *Cmd);
 
diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index 097a52704..dc1a47f40 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -15,13 +15,13 @@
 // Mode 1:
 // All steps are done on the proxmark, the output of the commands is returned via
 // USB-debug-print commands.
-// Mode 2: 
+// Mode 2:
 // The protocol is done on the PC, passing only Iso15693 data frames via USB. This
 // allows direct communication with a tag on command level
 // Mode 3:
 // The proxmark just samples the antenna and passes this "analog" data via USB to
 // the client. Signal Processing & decoding is done on the pc. This is the slowest
-// variant, but offers the possibility to analyze the waveforms directly. 
+// variant, but offers the possibility to analyze the waveforms directly.
 #include "cmdhf15.h"
 
 #define FrameSOF				Iso15693FrameSOF
@@ -35,18 +35,18 @@
 
 #define sprintUID(target, uid)	Iso15693sprintUID((target), (uid))
 
-// structure and database for uid -> tagtype lookups 
-typedef struct { 
+// structure and database for uid -> tagtype lookups
+typedef struct {
 	uint64_t uid;
 	int mask; // how many MSB bits used
 	char* desc;
-} productName; 
+} productName;
 
 const productName uidmapping[] = {
 
 	// UID, #significant Bits, "Vendor(+Product)"
 	{ 0xE001000000000000LL, 16, "Motorola UK" },
-	
+
 	// E0 02 xx
 	//   02 = ST Microelectronics
 	//   XX = IC id (Chip ID Family)
@@ -56,8 +56,8 @@ const productName uidmapping[] = {
 	{ 0xE0020A0000000000LL, 24, "ST Microelectronics; LRIS2K  [IC id = 10]"},
 	{ 0xE002440000000000LL, 24, "ST Microelectronics; LRIS64K [IC id = 68]"},
 
-	{ 0xE003000000000000LL, 16, "Hitachi, Ltd Japan" }, 
-	
+	{ 0xE003000000000000LL, 16, "Hitachi, Ltd Japan" },
+
 	// E0 04 xx
 	//   04 = Manufacturer code (Philips/NXP)
 	//   XX = IC id (Chip ID Family)
@@ -67,7 +67,7 @@ const productName uidmapping[] = {
 	//I-Code SLIX          [IC id = 01 + bit36 set to 1 (starting from bit0 - different from normal SLI)]
 	//I-Code SLIX-S        [IC id = 02 + bit36 set to 1]
 	//I-Code SLIX-L        [IC id = 03 + bit36 set to 1]
-	{ 0xE004000000000000LL, 16, "NXP Semiconductors Germany (Philips)" }, 
+	{ 0xE004000000000000LL, 16, "NXP Semiconductors Germany (Philips)" },
 	{ 0xE004010000000000LL, 24, "NXP(Philips); IC SL2 ICS20/ICS21(SLI) ICS2002/ICS2102(SLIX)" },
 	{ 0xE004020000000000LL, 24, "NXP(Philips); IC SL2 ICS53/ICS54(SLI-S) ICS5302/ICS5402(SLIX-S)" },
 	{ 0xE004030000000000LL, 24, "NXP(Philips); IC SL2 ICS50/ICS51(SLI-L) ICS5002/ICS5102(SLIX-L)" },
@@ -75,7 +75,7 @@ const productName uidmapping[] = {
 	// E0 05 XX .. .. ..
 	//   05 = Manufacturer code (Infineon)
 	//   XX = IC id (Chip ID Family)
-	{ 0xE005000000000000LL, 16, "Infineon Technologies AG Germany" }, 
+	{ 0xE005000000000000LL, 16, "Infineon Technologies AG Germany" },
 	{ 0xE005A10000000000LL, 24, "Infineon; SRF55V01P [IC id = 161] plain mode 1kBit"},
 	{ 0xE005A80000000000LL, 24, "Infineon; SRF55V01P [IC id = 168] pilot series 1kBit"},
 	{ 0xE005400000000000LL, 24, "Infineon; SRF55V02P [IC id = 64]  plain mode 2kBit"},
@@ -84,10 +84,10 @@ const productName uidmapping[] = {
 	{ 0xE005100000000000LL, 24, "Infineon; SRF55V10S [IC id = 16]  secure mode 10KBit"},
 	{ 0xE0051E0000000000LL, 23, "Infineon; SLE66r01P [IC id = 3x = My-d Move or My-d move NFC]"},
 	{ 0xE005200000000000LL, 21, "Infineon; SLE66r01P [IC id = 3x = My-d Move or My-d move NFC]"},
-	
-	{ 0xE006000000000000LL, 16, "Cylink USA" }, 
-	
-	
+
+	{ 0xE006000000000000LL, 16, "Cylink USA" },
+
+
 	// E0 07 xx
 	//   07 = Texas Instruments
 	//   XX = from bit 41 to bit 43 = product configuration - from bit 44 to bit 47 IC id (Chip ID Family)
@@ -101,11 +101,11 @@ const productName uidmapping[] = {
 	{ 0xE007100000000000LL, 20, "Texas Instrument; Tag-it HF-I Plus Chip; 64x32bit" },
 	{ 0xE007800000000000LL, 23, "Texas Instrument; Tag-it HF-I Plus (RF-HDT-DVBB tag or Third Party Products)" },
 	{ 0xE007C00000000000LL, 23, "Texas Instrument; Tag-it HF-I Standard; 8x32bit" },
-	{ 0xE007C40000000000LL, 23, "Texas Instrument; Tag-it HF-I Pro; 8x23bit; password" },	
+	{ 0xE007C40000000000LL, 23, "Texas Instrument; Tag-it HF-I Pro; 8x23bit; password" },
 
-	{ 0xE008000000000000LL, 16, "Fujitsu Limited Japan" }, 
-	{ 0xE009000000000000LL, 16, "Matsushita Electronics Corporation, Semiconductor Company Japan" }, 
-	{ 0xE00A000000000000LL, 16, "NEC Japan" }, 
+	{ 0xE008000000000000LL, 16, "Fujitsu Limited Japan" },
+	{ 0xE009000000000000LL, 16, "Matsushita Electronics Corporation, Semiconductor Company Japan" },
+	{ 0xE00A000000000000LL, 16, "NEC Japan" },
 	{ 0xE00B000000000000LL, 16, "Oki Electric Industry Co. Ltd Japan" },
 	{ 0xE00C000000000000LL, 16, "Toshiba Corp. Japan" },
 	{ 0xE00D000000000000LL, 16, "Mitsubishi Electric Corp. Japan" },
@@ -119,13 +119,13 @@ const productName uidmapping[] = {
 	{ 0xE013000000000000LL, 16, "ORGA Kartensysteme GmbH Germany" },
 	{ 0xE014000000000000LL, 16, "SHARP Corporation Japan" },
 	{ 0xE015000000000000LL, 16, "ATMEL France" },
-	
+
 	{ 0xE016000000000000LL, 16, "EM Microelectronic-Marin SA Switzerland (Skidata)"},
 	{ 0xE016040000000000LL, 24, "EM-Marin SA (Skidata Keycard-eco); EM4034 [IC id = 01] (Read/Write - no AFI)"},
 	{ 0xE0160C0000000000LL, 24, "EM-Marin SA (Skidata); EM4035 [IC id = 03] (Read/Write - replaced by 4233)"},
 	{ 0xE016100000000000LL, 24, "EM-Marin SA (Skidata); EM4135 [IC id = 04] (Read/Write - replaced by 4233) 36x64bit start page 13"},
 	{ 0xE016140000000000LL, 24, "EM-Marin SA (Skidata); EM4036 [IC id = 05] 28pF"},
-	{ 0xE016180000000000LL, 24, "EM-Marin SA (Skidata); EM4006 [IC id = 06] (Read Only)"}, 
+	{ 0xE016180000000000LL, 24, "EM-Marin SA (Skidata); EM4006 [IC id = 06] (Read Only)"},
 	{ 0xE0161C0000000000LL, 24, "EM-Marin SA (Skidata); EM4133 [IC id = 07] 23,5pF (Read/Write)"},
 	{ 0xE016200000000000LL, 24, "EM-Marin SA (Skidata); EM4033 [IC id = 08] 23,5pF (Read Only - no AFI / no DSFID / no security blocks)"},
 	{ 0xE016240000000000LL, 24, "EM-Marin SA (Skidata); EM4233 [IC id = 09] 23,5pF CustomerID-102"},
@@ -165,7 +165,7 @@ const productName uidmapping[] = {
 	{ 0xE030000000000000LL, 16, "BeeDar Technology Inc. USA" },
 	{ 0xE031000000000000LL, 16, "RFIDsec Denmark" },
 	{ 0xE032000000000000LL, 16, "Schweizer Electronic AG Germany" },
-	{ 0xE033000000000000LL, 16, "AMIC Technology Corp Taiwan" }, 
+	{ 0xE033000000000000LL, 16, "AMIC Technology Corp Taiwan" },
 	{ 0xE034000000000000LL, 16, "Mikron JSC Russia" },
 	{ 0xE035000000000000LL, 16, "Fraunhofer Institute for Photonic Microsystems Germany" },
 	{ 0xE036000000000000LL, 16, "IDS Microchip AG Switzerland" },
@@ -177,7 +177,7 @@ const productName uidmapping[] = {
 	{ 0xE03C000000000000LL, 16, "Verayo Inc. USA" },
 	{ 0xE03D000000000000LL, 16, "HID Global USA" },
 	{ 0xE03E000000000000LL, 16, "Productivity Engineering Gmbh Germany" },
-	{ 0xE03F000000000000LL, 16, "Austriamicrosystems AG (reserved) Austria" }, 
+	{ 0xE03F000000000000LL, 16, "Austriamicrosystems AG (reserved) Austria" },
 	{ 0xE040000000000000LL, 16, "Gemalto SA France" },
 	{ 0xE041000000000000LL, 16, "Renesas Electronics Corporation Japan" },
 	{ 0xE042000000000000LL, 16, "3Alogics Inc Korea" },
@@ -202,53 +202,53 @@ int getUID(uint8_t *buf) {
 	c.arg[0] = 5; // len
 
 	uint8_t retry;
-	
-	// don't give up the at the first try			
+
+	// don't give up the at the first try
 	for (retry = 0; retry < 3; retry++) {
 
 		clearCommandBuffer();
 		SendCommand(&c);
-		
+
 		if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
-			
+
 			uint8_t resplen = resp.arg[0];
 			if (resplen >= 12 && CheckCrc(resp.d.asBytes, 12)) {
 			   memcpy(buf, resp.d.asBytes + 2, 8);
 			   return 1;
-			} 
-		} 
+			}
+		}
 	} // retry
-	
+
 	if ( retry >= 3 )
 		PrintAndLogEx(WARNING, "timeout while waiting for reply.");
-	
+
 	return 0;
 }
 
 // get a product description based on the UID
 //		uid[8] 	tag uid
-// returns description of the best match	
+// returns description of the best match
 static char* getTagInfo_15(uint8_t *uid) {
 	uint64_t myuid, mask;
-	int i = 0, best = -1;	
+	int i = 0, best = -1;
 	memcpy(&myuid, uid, sizeof(uint64_t));
 	while (uidmapping[i].mask > 0) {
 		mask = (~0LL) << (64-uidmapping[i].mask);
 		if ((myuid & mask) == uidmapping[i].uid) {
-			if (best == -1) { 
+			if (best == -1) {
 				best = i;
 			} else {
 				if (uidmapping[i].mask > uidmapping[best].mask) {
 					best=i;
 				}
-			}					
-		} 
+			}
+		}
 		i++;
-	} 
+	}
 
 	if (best >= 0)
 		return uidmapping[best].desc;
-	return uidmapping[i].desc; 
+	return uidmapping[i].desc;
 }
 
 // return a clear-text message to an errorcode
@@ -333,7 +333,7 @@ int usage_15_dump(void){
 	return 0;
 }
 int usage_15_restore(void){
-    char *options[][2]={ 
+    char *options[][2]={
         {"h", "this help"},
         {"-2", "use slower '1 out of 256' mode"},
         {"-o", "set OPTION Flag (needed for TI)"},
@@ -398,7 +398,7 @@ int usage_15_readmulti(void){
 int CmdHF15Demod(const char *Cmd) {
 	char cmdp = tolower(param_getchar(Cmd, 0));
 	if (cmdp == 'h') return usage_15_demod();
-	
+
 	// The sampling rate is 106.353 ksps/s, for T = 18.8 us
 	int i, j;
 	int max = 0, maxPos = 0;
@@ -419,7 +419,7 @@ int CmdHF15Demod(const char *Cmd) {
 	}
 
 	PrintAndLogEx(NORMAL, "SOF at %d, correlation %d", maxPos, max / (ARRAYLEN(FrameSOF) / skip));
-	
+
 	i = maxPos + ARRAYLEN(FrameSOF) / skip;
 	int k = 0;
 	uint8_t outBuf[20];
@@ -439,7 +439,7 @@ int CmdHF15Demod(const char *Cmd) {
 		// Even things out by the length of the target waveform.
 		corr0 *= 4;
 		corr1 *= 4;
-		
+
 		if (corrEOF > corr1 && corrEOF > corr0) {
 			PrintAndLogEx(NORMAL, "EOF at %d", i);
 			break;
@@ -459,13 +459,13 @@ int CmdHF15Demod(const char *Cmd) {
 			break;
 		}
 	}
-	
+
 	if (mask != 0x01) {
 		PrintAndLogEx(WARNING, "Error, uneven octet! (discard extra bits!)");
 		PrintAndLogEx(NORMAL, "   mask = %02x", mask);
 	}
 	PrintAndLogEx(NORMAL, "%d octets", k);
-	
+
 	for (i = 0; i < k; i++)
 		PrintAndLogEx(NORMAL, "# %2d: %02x ", i, outBuf[i]);
 
@@ -480,10 +480,10 @@ int CmdHF15Samples(const char *Cmd) {
 	if (cmdp == 'h' || cmdp == 'H') return usage_15_samples();
 
 	UsbCommand c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_15693, {0,0,0}};
-	clearCommandBuffer();	
+	clearCommandBuffer();
 	SendCommand(&c);
-	
-	//download samples 
+
+	//download samples
 	getSamples(0, false);
 	return 0;
 }
@@ -504,17 +504,17 @@ int CmdHF15Info(const char *Cmd) {
 	char cmdbuf[100];
 	char *cmd = cmdbuf;
 	memset(cmdbuf, 0, sizeof(cmdbuf));
-	
+
 	strncpy(cmd, Cmd, 99);
-	
+
 	if ( !prepareHF15Cmd(&cmd, &c, ISO15_CMD_SYSINFO) )
 		return 0;
 
 	AddCrc(req,  c.arg[0]);
 	c.arg[0] += 2;
 
-	//PrintAndLogEx(NORMAL, "cmd %s", sprint_hex(c.d.asBytes, reqlen) ); 
-	
+	//PrintAndLogEx(NORMAL, "cmd %s", sprint_hex(c.d.asBytes, reqlen) );
+
 	clearCommandBuffer();
 	SendCommand(&c);
 
@@ -522,44 +522,44 @@ int CmdHF15Info(const char *Cmd) {
 		PrintAndLogEx(WARNING, "iso15693 card select failed");
 		return 1;
 	}
-	
+
 	uint32_t status = resp.arg[0];
-	
+
 	if ( status < 2 ) {
 		PrintAndLogEx(WARNING, "iso15693 card doesn't answer to systeminfo command");
-		return 1;		
+		return 1;
 	}
-	
-	recv = resp.d.asBytes;	
-	
+
+	recv = resp.d.asBytes;
+
 	if ( recv[0] & ISO15_RES_ERROR ) {
-		PrintAndLogEx(WARNING, "iso15693 card returned error %i: %s", recv[0], TagErrorStr(recv[0])); 
+		PrintAndLogEx(WARNING, "iso15693 card returned error %i: %s", recv[0], TagErrorStr(recv[0]));
 		return 3;
 	}
-	
+
 	PrintAndLogEx(NORMAL, "  UID  : %s", sprintUID(NULL, recv+2));
 	PrintAndLogEx(NORMAL, "  TYPE : %s", getTagInfo_15(recv+2));
 	PrintAndLogEx(NORMAL, "  SYSINFO : %s", sprint_hex(recv, status-2));
 
 	// DSFID
-	if (recv[1] & 0x01) 
+	if (recv[1] & 0x01)
 		PrintAndLogEx(NORMAL, "     - DSFID supported        [0x%02X]", recv[10]);
-	else 
+	else
 		PrintAndLogEx(NORMAL, "     - DSFID not supported");
-	
+
 	// AFI
-	if (recv[1] & 0x02) 
+	if (recv[1] & 0x02)
 		PrintAndLogEx(NORMAL, "     - AFI   supported        [0x%02X]", recv[11]);
-	else 
+	else
 		PrintAndLogEx(NORMAL, "     - AFI   not supported");
 
 	// IC reference
-	if (recv[1] & 0x08) 
+	if (recv[1] & 0x08)
 		PrintAndLogEx(NORMAL, "     - IC reference supported [0x%02X]", recv[14]);
-	else 
+	else
 		PrintAndLogEx(NORMAL, "     - IC reference not supported");
 
-	// memory 
+	// memory
 	if (recv[1] & 0x04) {
 		PrintAndLogEx(NORMAL, "     - Tag provides info on memory layout (vendor dependent)");
 		uint8_t blocks = recv[12]+1;
@@ -577,7 +577,7 @@ int CmdHF15Info(const char *Cmd) {
 int CmdHF15Record(const char *Cmd) {
 	char cmdp =  tolower(param_getchar(Cmd, 0));
 	if (cmdp == 'h') return usage_15_record();
-	
+
 	UsbCommand c = {CMD_RECORD_RAW_ADC_SAMPLES_ISO_15693, {0,0,0}};
 	clearCommandBuffer();
 	SendCommand(&c);
@@ -586,7 +586,7 @@ int CmdHF15Record(const char *Cmd) {
 
 // used with 'hf search'
 int HF15Reader(const char *Cmd, bool verbose) {
-	uint8_t uid[8] = {0,0,0,0,0,0,0,0};	
+	uint8_t uid[8] = {0,0,0,0,0,0,0,0};
 	if (!getUID(uid)) {
 		if (verbose) PrintAndLogEx(WARNING, "No tag found.");
 		return 0;
@@ -600,7 +600,7 @@ int HF15Reader(const char *Cmd, bool verbose) {
 int CmdHF15Reader(const char *Cmd) {
 	char cmdp = tolower(param_getchar(Cmd, 0));
 	if (cmdp == 'h') return usage_15_reader();
-	
+
 	HF15Reader(Cmd, true);
 	return 0;
 }
@@ -611,12 +611,12 @@ int CmdHF15Sim(const char *Cmd) {
 	char cmdp =tolower(param_getchar(Cmd, 0));
 	if (strlen(Cmd) < 1 || cmdp == 'h') return usage_15_sim();
 
-	uint8_t uid[8] = {0,0,0,0,0,0,0,0};	
+	uint8_t uid[8] = {0,0,0,0,0,0,0,0};
 	if (param_gethex(Cmd, 0, uid, 16)) {
 		PrintAndLogEx(WARNING, "UID must include 16 HEX symbols");
 		return 0;
 	}
-	
+
 	PrintAndLogEx(SUCCESS, "Starting simulating UID %s", sprint_hex(uid, sizeof(uid)) );
 
 	UsbCommand c = {CMD_SIMTAG_ISO_15693, {0, 0, 0}};
@@ -634,7 +634,7 @@ int CmdHF15Afi(const char *Cmd) {
 	if (cmdp == 'h') return usage_15_findafi();
 
 	PrintAndLogEx(SUCCESS, "press pm3-button to cancel");
-	
+
 	UsbCommand c = {CMD_ISO_15693_FIND_AFI, {strtol(Cmd, NULL, 0), 0, 0}};
 	clearCommandBuffer();
 	SendCommand(&c);
@@ -649,20 +649,20 @@ typedef struct {
 // Reads all memory pages
 // need to write to file
 int CmdHF15Dump(const char*Cmd) {
-	
+
 	uint8_t fileNameLen = 0;
 	char filename[FILE_PATH_SIZE] = {0};
 	char * fptr = filename;
 	bool errors = false;
 	uint8_t cmdp = 0;
-	uint8_t uid[8] = {0,0,0,0,0,0,0,0};	
-	
+	uint8_t uid[8] = {0,0,0,0,0,0,0,0};
+
 	while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
 		switch (tolower(param_getchar(Cmd, cmdp))) {
 		case 'h':
 			return usage_15_dump();
 		case 'f':
-			fileNameLen = param_getstr(Cmd, cmdp+1, filename, FILE_PATH_SIZE); 
+			fileNameLen = param_getstr(Cmd, cmdp+1, filename, FILE_PATH_SIZE);
 			cmdp += 2;
 			break;
 		default:
@@ -674,7 +674,7 @@ int CmdHF15Dump(const char*Cmd) {
 
 	//Validations
 	if (errors) return usage_15_dump();
-	
+
 	if (fileNameLen < 1) {
 
 		PrintAndLogEx(INFO, "Using UID as filename");
@@ -683,12 +683,12 @@ int CmdHF15Dump(const char*Cmd) {
 			PrintAndLogEx(WARNING, "No tag found.");
 			return 1;
 		}
-		
-		fptr += sprintf(fptr, "hf-15-"); 
+
+		fptr += sprintf(fptr, "hf-15-");
 		FillFileNameByUID(fptr,uid,"-dump",sizeof(uid));
-	}	
+	}
 	// detect blocksize from card :)
-	
+
 	PrintAndLogEx(NORMAL, "Reading memory from tag UID " _YELLOW_(%s), sprintUID(NULL, uid));
 
 	int blocknum = 0;
@@ -696,7 +696,7 @@ int CmdHF15Dump(const char*Cmd) {
 
 	// memory.
 	t15memory mem[256];
-	
+
 	uint8_t data[256*4] = {0};
 	memset(data, 0, sizeof(data));
 
@@ -708,64 +708,64 @@ int CmdHF15Dump(const char*Cmd) {
 
 	// copy uid to read command
 	memcpy(req+2, uid, sizeof(uid));
-	
+
 	for (int retry = 0; retry < 5; retry++) {
-	
+
 		req[10] = blocknum;
 		AddCrc(req, 11);
 		c.arg[0] = 13;
-	
+
 		clearCommandBuffer();
 		SendCommand(&c);
-				
+
 		if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
 
 			uint8_t len = resp.arg[0];
 			if ( len < 2 ) {
 				PrintAndLogEx(FAILED, "iso15693 card select failed");
-				continue;		
+				continue;
 			}
-			
+
 			recv = resp.d.asBytes;
-			
+
 			if ( !CheckCrc(recv, len) ) {
 				PrintAndLogEx(FAILED, "crc fail");
 				continue;
 			}
 
 			if (recv[0] & ISO15_RES_ERROR) {
-				PrintAndLogEx(FAILED, "Tag returned Error %i: %s", recv[1], TagErrorStr(recv[1]) ); 
+				PrintAndLogEx(FAILED, "Tag returned Error %i: %s", recv[1], TagErrorStr(recv[1]) );
 				break;
 			}
-								
+
 			mem[blocknum].lock = resp.d.asBytes[0];
-			memcpy(mem[blocknum].block, resp.d.asBytes + 1, 4);					
+			memcpy(mem[blocknum].block, resp.d.asBytes + 1, 4);
 			memcpy(data + (blocknum * 4), resp.d.asBytes + 1, 4);
-			
+
 			retry = 0;
 			blocknum++;
-			
+
 			printf("."); fflush(stdout);
-		} 
+		}
 	}
 	PrintAndLogEx(NORMAL, "\n");
 
 	PrintAndLogEx(NORMAL, "block#   | data         |lck| ascii");
-	PrintAndLogEx(NORMAL, "---------+--------------+---+----------");	
+	PrintAndLogEx(NORMAL, "---------+--------------+---+----------");
 	for (int i = 0; i < blocknum; i++) {
 		PrintAndLogEx(NORMAL, "%3d/0x%02X | %s | %d | %s", i, i, sprint_hex(mem[i].block, 4 ), mem[i].lock, sprint_ascii(mem[i].block, 4) );
 	}
 	PrintAndLogEx(NORMAL, "\n");
 
 	size_t datalen = blocknum * 4;
-	saveFileEML(filename, "eml", data, datalen, 4);	
+	saveFileEML(filename, "eml", data, datalen, 4);
 	saveFile(filename, "bin", data, datalen);
 	return 0;
 }
 
 int CmdHF15Restore(const char*Cmd) {
 	FILE *f;
-	
+
 	uint8_t uid[8]={0x00};
 	char filename[FILE_PATH_SIZE] = {0x00};
 	char buff[255] = {0x00};
@@ -796,20 +796,20 @@ int CmdHF15Restore(const char*Cmd) {
 				break;
 			case 'f':
 				param_getstr(Cmd, cmdp+1, filename, FILE_PATH_SIZE);
-				cmdp++;	
+				cmdp++;
 				break;
 			case 'r':
 				retries=param_get8ex(Cmd, cmdp+1, 3, 10);
-				cmdp++;	
+				cmdp++;
 				break;
 			case 'b':
 				blocksize=param_get8ex(Cmd, cmdp+1, 4, 10);
-				cmdp++;	
+				cmdp++;
 				break;
 			case 'u':
 				param_getstr(Cmd, cmdp+1, buff, FILE_PATH_SIZE);
-				cmdp++;	
-				snprintf(filename,sizeof(filename),"hf-15-dump-%s-bin",buff);				
+				cmdp++;
+				snprintf(filename,sizeof(filename),"hf-15-dump-%s-bin",buff);
 				break;
 			case 'h':
 				return usage_15_restore();
@@ -821,7 +821,7 @@ int CmdHF15Restore(const char*Cmd) {
 	}
 
 	PrintAndLogEx(INFO,"Blocksize: %u",blocksize);
-	
+
 	if ( !strlen(filename)) {
 		PrintAndLogEx(WARNING,"Please provide a filename");
 		return usage_15_restore();
@@ -831,18 +831,18 @@ int CmdHF15Restore(const char*Cmd) {
 		PrintAndLogEx(WARNING, "Could not find file %s", filename);
 		return 2;
 	}
-	
+
 	if (!getUID(uid)) {
 		PrintAndLogEx(WARNING, "No tag found");
 		fclose(f);
 		return 3;
 	}
-	
+
 	while (1) {
 		tried = 0;
 		hex[0] = 0x00;
 		tmpCmd[0] = 0x00;
-		
+
 		bytes_read = fread( buff, 1, blocksize, f );
 		if ( bytes_read == 0) {
 			PrintAndLogEx(SUCCESS, "File reading done `%s`", filename);
@@ -853,13 +853,13 @@ int CmdHF15Restore(const char*Cmd) {
 			fclose(f);
 			return 2;
 		}
-		
+
 		for(int j=0; j < blocksize; j++)
 			snprintf(hex+j*2, 3, "%02X", buff[j]);
-		
+
 		for(int j=0; j < sizeof(uid)/sizeof(uid[0]); j++)
 			snprintf(buff+j*2,3,"%02X", uid[j]);
-		
+
 		//TODO: Addressed mode currently not work
 		//snprintf(tmpCmd, sizeof(tmpCmd), "%s %s %d %s", newCmdPrefix, buff, i, hex);
 		snprintf(tmpCmd, sizeof(tmpCmd), "%s u %u %s", newCmdPrefix, i, hex);
@@ -894,23 +894,23 @@ int CmdHF15Raw(const char *Cmd) {
 	char buf[5] = "";
 	uint8_t data[100];
 	uint32_t datalen = 0, temp;
-	
+
 	// strip
 	while (*Cmd==' ' || *Cmd=='\t') Cmd++;
-	
+
 	while (Cmd[i]!='\0') {
 		if (Cmd[i]==' ' || Cmd[i]=='\t') { i++; continue; }
 		if (Cmd[i]=='-') {
 			switch (Cmd[i+1]) {
-				case 'r': 
-				case 'R': 
+				case 'r':
+				case 'R':
 					reply = 0;
 					break;
 				case '2':
 					fast = 0;
 					break;
 				case 'c':
-				case 'C':				
+				case 'C':
 					crc = true;
 					break;
 				default:
@@ -926,7 +926,7 @@ int CmdHF15Raw(const char *Cmd) {
 		    buf[strlen(buf)+1] = 0;
 		    buf[strlen(buf)] = Cmd[i];
 		    i++;
-		    
+
 		    if (strlen(buf) >= 2) {
 		    	sscanf(buf, "%x", &temp);
 		    	data[datalen] = (uint8_t)(temp & 0xff);
@@ -938,20 +938,20 @@ int CmdHF15Raw(const char *Cmd) {
 		PrintAndLogEx(WARNING, "Invalid char on input");
 		return 0;
 	}
-	
+
 	if (crc) {
 		AddCrc(data, datalen);
 		datalen += 2;
 	}
-	
+
 	c.arg[0] = datalen;
 	c.arg[1] = fast;
 	c.arg[2] = reply;
 	memcpy(c.d.asBytes, data, datalen);
 
-	clearCommandBuffer();	
+	clearCommandBuffer();
 	SendCommand(&c);
-	
+
 	if (reply) {
 		if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
 			uint8_t len = resp.arg[0];
@@ -959,7 +959,7 @@ int CmdHF15Raw(const char *Cmd) {
 			PrintAndLogEx(NORMAL, "%s", sprint_hex(resp.d.asBytes, len) );
 		} else {
 			PrintAndLogEx(WARNING, "timeout while waiting for reply.");
-		}		
+		}
 	}
 	return 0;
 }
@@ -977,7 +977,7 @@ int prepareHF15Cmd(char **cmd, UsbCommand *c, uint8_t iso15cmd) {
 
 	// strip
 	while (**cmd==' ' || **cmd=='\t') (*cmd)++;
-	
+
 	if (strstr(*cmd, "-2") == *cmd) {
 	 	c->arg[1] = 0; // use 1of256
 	 	(*cmd) += 2;
@@ -985,15 +985,15 @@ int prepareHF15Cmd(char **cmd, UsbCommand *c, uint8_t iso15cmd) {
 
 	// strip
 	while (**cmd==' ' || **cmd=='\t') (*cmd)++;
-	
+
 	if (strstr(*cmd, "-o") == *cmd) {
 	 	req[reqlen] = ISO15_REQ_OPTION;
 	 	(*cmd) += 2;
 	}
-	
+
 	// strip
 	while (**cmd == ' ' || **cmd == '\t') (*cmd)++;
-	
+
 	switch (**cmd) {
 		case 0:
 			PrintAndLogEx(WARNING, "missing addr");
@@ -1017,28 +1017,28 @@ int prepareHF15Cmd(char **cmd, UsbCommand *c, uint8_t iso15cmd) {
 			memcpy(&req[reqlen], uid, sizeof(uid));
 			PrintAndLogEx(NORMAL, "Detected UID %s", sprintUID(NULL, uid));
 			reqlen += sizeof(uid);
-			break;			
+			break;
 		default:
 			req[reqlen++] |= ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | ISO15_REQ_NONINVENTORY | ISO15_REQ_ADDRESS;
 			req[reqlen++] = iso15cmd;
-			
+
 		    // parse UID
 			for (int i=0; i<8 && (*cmd)[i*2] && (*cmd)[i*2+1]; i++) {
 				sscanf((char[]){(*cmd)[i*2], (*cmd)[i*2+1],0}, "%X", &temp);
 				uid[7-i] = temp & 0xff;
-			}				
-				
+			}
+
 			PrintAndLogEx(NORMAL, "Using UID %s", sprintUID(NULL, uid));
 			memcpy(&req[reqlen], uid, sizeof(uid));
 			reqlen +=  sizeof(uid);
 			break;
 	}
-	// skip to next space		
+	// skip to next space
 	while (**cmd!=' ' && **cmd!='\t') (*cmd)++;
 	// skip over the space
 	while (**cmd==' ' || **cmd=='\t') (*cmd)++;
-	
-	c->arg[0] = reqlen;	
+
+	c->arg[0] = reqlen;
 	return 1;
 }
 
@@ -1066,7 +1066,7 @@ int CmdHF15Readmulti(const char *Cmd) {
 
 	// add OPTION flag, in order to get lock-info
 	req[0] |= ISO15_REQ_OPTION;
-	
+
 	reqlen = c.arg[0];
 
 	// decimal
@@ -1074,11 +1074,11 @@ int CmdHF15Readmulti(const char *Cmd) {
 	pagecount = param_get8ex(cmd, 1, 0, 10);
 
 	//PrintAndLogEx(NORMAL, "ice %d %d\n", pagenum, pagecount);
-	
+
 	// 0 means 1 page,
-	// 1 means 2 pages, ...	
-	if (pagecount > 0) pagecount--; 
-	
+	// 1 means 2 pages, ...
+	if (pagecount > 0) pagecount--;
+
 	req[reqlen++] = pagenum;
 	req[reqlen++] = pagecount;
 	AddCrc(req, reqlen);
@@ -1086,27 +1086,27 @@ int CmdHF15Readmulti(const char *Cmd) {
 
 	clearCommandBuffer();
 	SendCommand(&c);
-	
+
 	if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
 		PrintAndLogEx(FAILED, "iso15693 card select failed");
 		return 1;
 	}
-	
-	uint32_t status = resp.arg[0];	
+
+	uint32_t status = resp.arg[0];
 	if ( status < 2 ) {
 		PrintAndLogEx(FAILED, "iso15693 card select failed");
-		return 1;		
+		return 1;
 	}
 
-	recv = resp.d.asBytes;	
-	
+	recv = resp.d.asBytes;
+
 	if (!CheckCrc(recv, status)) {
 		PrintAndLogEx(FAILED, "CRC failed");
 		return 2;
-	} 
-	
+	}
+
 	if ( recv[0] & ISO15_RES_ERROR ) {
-		PrintAndLogEx(FAILED, "iso15693 card returned error %i: %s", recv[0], TagErrorStr(recv[0])); 
+		PrintAndLogEx(FAILED, "iso15693 card returned error %i: %s", recv[0], TagErrorStr(recv[0]));
 		return 3;
 	}
 
@@ -1116,7 +1116,7 @@ int CmdHF15Readmulti(const char *Cmd) {
 	// print response
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "block#   | data         |lck| ascii");
-	PrintAndLogEx(NORMAL, "---------+--------------+---+----------");	
+	PrintAndLogEx(NORMAL, "---------+--------------+---+----------");
 	for (int i = start; i < stop; i += 5) {
 		PrintAndLogEx(NORMAL, "%3d/0x%02X | %s | %d | %s", currblock, currblock, sprint_hex(recv+i+1, 4 ), recv[i], sprint_ascii(recv+i+1, 4) );
 		currblock++;
@@ -1133,7 +1133,7 @@ int CmdHF15Read(const char *Cmd) {
 
 	char cmdp = param_getchar(Cmd, 0);
 	if (strlen(Cmd)<3 || cmdp == 'h' || cmdp == 'H')  return usage_15_read();
-	
+
 	UsbCommand resp;
 	uint8_t *recv;
 
@@ -1141,27 +1141,27 @@ int CmdHF15Read(const char *Cmd) {
 	// arg0 (datalen,  cmd len?  .arg0 == crc?)
 	// arg1	(speed == 0 == 1 of 256,  == 1 == 1 of 4 )
 	// arg2 (recv == 1 == expect a response)
-	UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}}; 
+	UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}};
 	uint8_t *req = c.d.asBytes;
 	int reqlen = 0, blocknum;
 	char cmdbuf[100];
 	char *cmd = cmdbuf;
 	strncpy(cmd, Cmd, 99);
-	
+
 	if ( !prepareHF15Cmd(&cmd, &c, ISO15_CMD_READ) )
 		return 0;
 
 	// add OPTION flag, in order to get lock-info
 	req[0] |= ISO15_REQ_OPTION;
-	
+
 	reqlen = c.arg[0];
 
 	blocknum = strtol(cmd, NULL, 0);
-	
+
 	req[reqlen++] = (uint8_t)blocknum;
-	
+
 	AddCrc(req, reqlen);
-	
+
 	c.arg[0] = reqlen+2;
 
 	clearCommandBuffer();
@@ -1171,31 +1171,31 @@ int CmdHF15Read(const char *Cmd) {
 		PrintAndLogEx(NORMAL, "iso15693 card select failed");
 		return 1;
 	}
-	
-	uint32_t status = resp.arg[0];	
+
+	uint32_t status = resp.arg[0];
 	if ( status < 2 ) {
 		PrintAndLogEx(NORMAL, "iso15693 card select failed");
-		return 1;		
+		return 1;
 	}
 
-	recv = resp.d.asBytes;	
-	
+	recv = resp.d.asBytes;
+
 	if ( !CheckCrc(recv, status) ) {
 		PrintAndLogEx(NORMAL, "CRC failed");
 		return 2;
-	} 
-	
+	}
+
 	if ( recv[0] & ISO15_RES_ERROR ) {
-		PrintAndLogEx(WARNING, "iso15693 card returned error %i: %s", recv[0], TagErrorStr(recv[0])); 
+		PrintAndLogEx(WARNING, "iso15693 card returned error %i: %s", recv[0], TagErrorStr(recv[0]));
 		return 3;
 	}
-	
+
 	// print response
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "block #%3d  |lck| ascii", blocknum );
 	PrintAndLogEx(NORMAL, "------------+---+------" );
 	PrintAndLogEx(NORMAL, "%s| %d | %s", sprint_hex(recv+2, status-4), recv[1], sprint_ascii(recv+2, status-4) );
-	PrintAndLogEx(NORMAL, "");	
+	PrintAndLogEx(NORMAL, "");
 	return 0;
 }
 
@@ -1207,7 +1207,7 @@ int CmdHF15Write(const char *Cmd) {
 
 	char cmdp = param_getchar(Cmd, 0);
 	if (strlen(Cmd)<3 || cmdp == 'h' || cmdp == 'H') return usage_15_write();
-	
+
 	UsbCommand resp;
 	uint8_t *recv;
 	UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}}; // len,speed,recv?
@@ -1216,38 +1216,38 @@ int CmdHF15Write(const char *Cmd) {
 	char cmdbuf[100];
 	char *cmd = cmdbuf;
 	char *cmd2;
-	
+
 	strncpy(cmd, Cmd, 99);
 
 	if ( !prepareHF15Cmd(&cmd, &c, ISO15_CMD_WRITE) )
 		return 0;
 
 	reqlen = c.arg[0];
-	
-	// *cmd -> page num ; *cmd2 -> data 
+
+	// *cmd -> page num ; *cmd2 -> data
 	cmd2=cmd;
 	while (*cmd2!=' ' && *cmd2!='\t' && *cmd2) cmd2++;
 	*cmd2 = 0;
-	cmd2++;	
-		
+	cmd2++;
+
 	pagenum = strtol(cmd, NULL, 0);
 
-	req[reqlen++] = (uint8_t)pagenum;	
-	
-	while (cmd2[0] && cmd2[1]) { // hexdata, read by 2 hexchars 
+	req[reqlen++] = (uint8_t)pagenum;
+
+	while (cmd2[0] && cmd2[1]) { // hexdata, read by 2 hexchars
 		if (*cmd2==' ') {
-			cmd2++; 
-			continue; 
+			cmd2++;
+			continue;
 		}
 		sscanf((char[]){cmd2[0],cmd2[1],0},"%X",&temp);
 		req[reqlen++]=temp & 0xff;
 		cmd2+=2;
-	} 
+	}
 	AddCrc(req, reqlen);
 	c.arg[0] = reqlen+2;
-	
+
 	PrintAndLogEx(NORMAL, "iso15693 writing to page %02d (0x%02X) | data ", pagenum, pagenum);
-	
+
 	clearCommandBuffer();
 	SendCommand(&c);
 
@@ -1255,25 +1255,25 @@ int CmdHF15Write(const char *Cmd) {
 		PrintAndLogEx(FAILED, "iso15693 card timeout, data may be written anyway");
 		return 1;
 	}
-	
-	uint32_t status = resp.arg[0];	
+
+	uint32_t status = resp.arg[0];
 	if ( status < 2 ) {
 		PrintAndLogEx(FAILED, "iso15693 card select failed");
-		return 1;		
+		return 1;
 	}
 
-	recv = resp.d.asBytes;	
-	
+	recv = resp.d.asBytes;
+
 	if ( !CheckCrc(recv, status) ) {
 		PrintAndLogEx(FAILED, "CRC failed");
 		return 2;
-	} 
-	
+	}
+
 	if ( recv[0] & ISO15_RES_ERROR ) {
-		PrintAndLogEx(NORMAL, "iso15693 card returned error %i: %s", recv[0], TagErrorStr(recv[0])); 
+		PrintAndLogEx(NORMAL, "iso15693 card returned error %i: %s", recv[0], TagErrorStr(recv[0]));
 		return 3;
 	}
-	
+
 	PrintAndLogEx(NORMAL, "OK");
 	return 0;
 }
@@ -1283,22 +1283,22 @@ static command_t CommandTable15[] = {
 	{"demod",		CmdHF15Demod,   	1, "Demodulate ISO15693 from tag"},
 	{"dump",		CmdHF15Dump,		0, "Read all memory pages of an ISO15693 tag, save to file"},
 	{"findafi",		CmdHF15Afi,     	0, "Brute force AFI of an ISO15693 tag"},
-	{"info",		CmdHF15Info,		0, "Tag information"},	
+	{"info",		CmdHF15Info,		0, "Tag information"},
 	{"list",		CmdHF15List,    	0, "[Deprecated] List ISO15693 history"},
-	{"raw",			CmdHF15Raw,			0, "Send raw hex data to tag"}, 
+	{"raw",			CmdHF15Raw,			0, "Send raw hex data to tag"},
 	{"reader",		CmdHF15Reader,  	0, "Act like an ISO15693 reader"},
 	{"record",		CmdHF15Record,  	0, "Record Samples (ISO15693)"},
 	{"restore",		CmdHF15Restore,		0, "Restore from file to all memory pages of an ISO15693 tag"},
 	{"sim",			CmdHF15Sim,     	0, "Fake an ISO15693 tag"},
 	{"samples",		CmdHF15Samples,		0, "Acquire Samples as Reader (enables carrier, sends inquiry)"},
-	{"read",		CmdHF15Read,		0, "Read a block"},	
-	{"write",		CmdHF15Write,		0, "Write a block"},	
+	{"read",		CmdHF15Read,		0, "Read a block"},
+	{"write",		CmdHF15Write,		0, "Write a block"},
 	{"readmulti",	CmdHF15Readmulti,	0, "Reads multiple Blocks"},
 	{NULL, NULL, 0, NULL}
 };
 
 int CmdHF15(const char *Cmd) {
-	clearCommandBuffer();	
+	clearCommandBuffer();
 	CmdsParse(CommandTable15, Cmd);
 	return 0;
 }
diff --git a/client/cmdhfepa.c b/client/cmdhfepa.c
index dd110c9c0..4e7510fe0 100644
--- a/client/cmdhfepa.c
+++ b/client/cmdhfepa.c
@@ -127,8 +127,8 @@ int CmdHFEPAPACEReplay(const char *Cmd)
 			memcpy(usb_cmd.d.asBytes, // + (j * sizeof(usb_cmd.d.asBytes)),
 			       apdus[i] + (j * sizeof(usb_cmd.d.asBytes)),
 			       packet_length);
-				   
-			clearCommandBuffer();				   
+
+			clearCommandBuffer();
 			SendCommand(&usb_cmd);
 			WaitForResponse(CMD_ACK, &resp);
 			if (resp.arg[0] != 0) {
diff --git a/client/cmdhffelica.c b/client/cmdhffelica.c
index efb6b68d7..2a0380fc5 100644
--- a/client/cmdhffelica.c
+++ b/client/cmdhffelica.c
@@ -82,20 +82,20 @@ int CmdHFFelicaReader(const char *Cmd) {
 		//SendCommand(&cDisconnect);
 		return 0;
 	}
-	
+
 	felica_card_select_t card;
 	memcpy(&card, (felica_card_select_t *)resp.d.asBytes, sizeof(felica_card_select_t));
 	uint64_t status = resp.arg[0];
-	
+
 	switch(status) {
 		case 1: {
-			if (!silent) 
-				PrintAndLogEx(WARNING, "card timeout"); 
+			if (!silent)
+				PrintAndLogEx(WARNING, "card timeout");
 			break;
 		}
 		case 2: {
 			if (!silent)
-				PrintAndLogEx(WARNING, "card answered wrong"); 
+				PrintAndLogEx(WARNING, "card answered wrong");
 			break;
 		}
 		case 3: {
@@ -105,15 +105,15 @@ int CmdHFFelicaReader(const char *Cmd) {
 		}
 		case 0: {
 			PrintAndLogEx(SUCCESS, "FeliCa tag info");
-			
+
 			PrintAndLogEx(NORMAL, "IDm  %s", sprint_hex(card.IDm, sizeof(card.IDm)));
 			PrintAndLogEx(NORMAL, "  - CODE    %s", sprint_hex(card.code, sizeof(card.code)));
 			PrintAndLogEx(NORMAL, "  - NFCID2  %s", sprint_hex(card.uid, sizeof(card.uid)));
-			
+
 			PrintAndLogEx(NORMAL, "Parameter (PAD) | %s", sprint_hex(card.PMm, sizeof(card.PMm)));
 			PrintAndLogEx(NORMAL, "  - IC CODE %s", sprint_hex(card.iccode, sizeof(card.iccode)));
 			PrintAndLogEx(NORMAL, "  - MRT     %s", sprint_hex(card.mrt, sizeof(card.mrt)));
-			
+
 			PrintAndLogEx(NORMAL, "SERVICE CODE %s", sprint_hex(card.servicecode, sizeof(card.servicecode)));
 			break;
 		}
@@ -125,12 +125,12 @@ int CmdHFFelicaReader(const char *Cmd) {
 int CmdHFFelicaSim(const char *Cmd) {
 	bool errors = false;
 	uint8_t flags = 0;
-	uint8_t tagtype = 1;	
+	uint8_t tagtype = 1;
 	uint8_t cmdp = 0;
 	uint8_t uid[10] = {0,0,0,0,0,0,0,0,0,0};
 	int uidlen = 0;
 	bool verbose =  false;
-	
+
 	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
 		switch (param_getchar(Cmd, cmdp)) {
 			case 'h':
@@ -141,12 +141,12 @@ int CmdHFFelicaSim(const char *Cmd) {
 				// Retrieve the tag type
 				tagtype = param_get8ex(Cmd, cmdp+1, 0, 10);
 				if (tagtype == 0)
-					errors = true; 
+					errors = true;
 				cmdp += 2;
 				break;
 			case 'u':
 			case 'U':
-				// Retrieve the full 4,7,10 byte long uid 
+				// Retrieve the full 4,7,10 byte long uid
 				param_gethex_ex(Cmd, cmdp+1, uid, &uidlen);
 				if (!errors) {
 					PrintAndLogEx(NORMAL, "Emulating ISO18092/FeliCa tag with %d byte UID (%s)", uidlen>>1, sprint_hex(uid, uidlen>>1));
@@ -161,7 +161,7 @@ int CmdHFFelicaSim(const char *Cmd) {
 			case 'e':
 			case 'E':
 				cmdp++;
-				break;				
+				break;
 			default:
 				PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
 				errors = true;
@@ -171,29 +171,29 @@ int CmdHFFelicaSim(const char *Cmd) {
 
 	//Validations
 	if (errors || cmdp == 0) return usage_hf_felica_sim();
-	
-	UsbCommand c = {CMD_FELICA_SIMULATE_TAG,{ tagtype, flags, 0 }};	
+
+	UsbCommand c = {CMD_FELICA_SIMULATE_TAG,{ tagtype, flags, 0 }};
 	memcpy(c.d.asBytes, uid, uidlen>>1);
 	clearCommandBuffer();
-	SendCommand(&c);	
+	SendCommand(&c);
 	UsbCommand resp;
-	
+
 	if ( verbose )
 		PrintAndLogEx(NORMAL, "Press pm3-button to abort simulation");
-	
+
 	while( !ukbhit() ){
-		if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500) ) continue;		
+		if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500) ) continue;
 	}
 	return 0;
 }
 
-int CmdHFFelicaSniff(const char *Cmd) {	
+int CmdHFFelicaSniff(const char *Cmd) {
 
 	uint8_t cmdp = 0;
 	uint64_t samples2skip = 0;
 	uint64_t triggers2skip = 0;
 	bool errors = false;
-			
+
 	while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
 		switch(param_getchar(Cmd, cmdp)) {
 		case 'h':
@@ -204,7 +204,7 @@ int CmdHFFelicaSniff(const char *Cmd) {
 			samples2skip = param_get32ex(Cmd, cmdp+1, 0, 10);
 			cmdp += 2;
 			break;
-		case 't': 
+		case 't':
 		case 'T':
 			triggers2skip = param_get32ex(Cmd, cmdp+1, 0, 10);
 			cmdp += 2;
@@ -217,7 +217,7 @@ int CmdHFFelicaSniff(const char *Cmd) {
 	}
 	//Validations
 	if (errors || cmdp == 0) return usage_hf_felica_sniff();
-	
+
 	UsbCommand c = {CMD_FELICA_SNOOP, {samples2skip, triggers2skip, 0}};
 	clearCommandBuffer();
 	SendCommand(&c);
@@ -231,21 +231,21 @@ int CmdHFFelicaSimLite(const char *Cmd) {
 
     if (!uid)
 		return usage_hf_felica_simlite();
-	
+
 	UsbCommand c = {CMD_FELICA_LITE_SIM, {uid, 0, 0} };
 	clearCommandBuffer();
 	SendCommand(&c);
 	return 0;
 }
- 
+
 static void printSep() {
 	PrintAndLogEx(NORMAL, "------------------------------------------------------------------------------------");
 }
 
 uint16_t PrintFliteBlock(uint16_t tracepos, uint8_t *trace, uint16_t tracelen) {
-	if (tracepos+19 >= tracelen) 
+	if (tracepos+19 >= tracelen)
 		return tracelen;
-	
+
 	trace += tracepos;
 	uint8_t blocknum = trace[0];
 	uint8_t status1 = trace[1];
@@ -276,23 +276,23 @@ uint16_t PrintFliteBlock(uint16_t tracepos, uint8_t *trace, uint16_t tracelen) {
 			uint32_t regA = trace[3] | trace[4] << 8 | trace[5] << 16 | trace[ 6] << 24;
 			uint32_t regB = trace[7] | trace[8] << 8 | trace[9] << 16 | trace[10] << 24;
 			line[0] = 0;
-			for (int j = 0; j < 8; j++) 
+			for (int j = 0; j < 8; j++)
 				snprintf(line + (j*2), sizeof(line)-1-(j*2), "%02x", trace[j+11]);
-			
+
 			PrintAndLogEx(NORMAL,  "REG: regA: %d regB: %d regC: %s ", regA, regB, line);
 			}
 		break;
-		case 0x80: PrintAndLogEx(NORMAL,  "Random Challenge, WO:  %s ", line); break;  
-		case 0x81: PrintAndLogEx(NORMAL,  "MAC, only set on dual read:  %s ", line); break;            
+		case 0x80: PrintAndLogEx(NORMAL,  "Random Challenge, WO:  %s ", line); break;
+		case 0x81: PrintAndLogEx(NORMAL,  "MAC, only set on dual read:  %s ", line); break;
 		case 0x82: {
 			char idd[20];
 			char idm[20];
-			for (int j = 0; j < 8; j++) 
+			for (int j = 0; j < 8; j++)
 				snprintf(idd + (j*2), sizeof(idd)-1-(j*2), "%02x", trace[j+3]);
-			
-			for (int j = 0; j < 6; j++) 
+
+			for (int j = 0; j < 6; j++)
 				snprintf(idm + (j*2), sizeof(idm)-1-(j*2), "%02x", trace[j+13]);
-				
+
 			PrintAndLogEx(NORMAL,  "ID Block, IDd: 0x%s DFC: 0x%02x%02x Arb: %s ", idd, trace[11], trace [12], idm);
 			}
 		break;
@@ -301,16 +301,16 @@ uint16_t PrintFliteBlock(uint16_t tracepos, uint8_t *trace, uint16_t tracelen) {
 			char pmm[20];
 			for (int j = 0; j < 8; j++)
 				snprintf(idm + (j*2), sizeof(idm)-1-(j*2), "%02x", trace[j+3]);
-			
+
 			for (int j = 0; j < 8; j++)
 				snprintf(pmm + (j*2), sizeof(pmm)-1-(j*2), "%02x", trace[j+11]);
-			
+
 			PrintAndLogEx(NORMAL,  "DeviceId:  IDm: 0x%s PMm: 0x%s ", idm, pmm);
 			}
-		break;    
+		break;
 		case 0x84: PrintAndLogEx(NORMAL,  "SER_C: 0x%02x%02x ", trace[3], trace[4]); break;
-		case 0x85: PrintAndLogEx(NORMAL,  "SYS_Cl 0x%02x%02x ", trace[3], trace[4]); break;   
-		case 0x86: PrintAndLogEx(NORMAL,  "CKV (key version): 0x%02x%02x ", trace[3], trace[4]); break;  
+		case 0x85: PrintAndLogEx(NORMAL,  "SYS_Cl 0x%02x%02x ", trace[3], trace[4]); break;
+		case 0x86: PrintAndLogEx(NORMAL,  "CKV (key version): 0x%02x%02x ", trace[3], trace[4]); break;
 		case 0x87: PrintAndLogEx(NORMAL,  "CK (card key), WO:   %s ", line); break;
 		case 0x88: {
 			PrintAndLogEx(NORMAL,  "Memory Configuration (MC):");
@@ -325,15 +325,15 @@ uint16_t PrintFliteBlock(uint16_t tracepos, uint8_t *trace, uint16_t tracelen) {
 			PrintAndLogEx(NORMAL,  "Memory config writable : %s", (trace[3+2] == 0xff) ? "yes" : "no");
 			PrintAndLogEx(NORMAL,  "RW access for S_PAD : %s ", sprint_bin(trace+3, 2) );
 			}
-		break;         
+		break;
 		case 0x90: {
             PrintAndLogEx(NORMAL,  "Write count, RO:   %02x %02x %02x ", trace[3], trace[4], trace[5]);
 			}
-		break; 
+		break;
 		case 0x91: {
             PrintAndLogEx(NORMAL,  "MAC_A, RW (auth):   %s ", line);
            }
-		break; 
+		break;
 		case 0x92:
             PrintAndLogEx(NORMAL,  "State:");
             PrintAndLogEx(NORMAL,  "Polling disabled: %s", trace[3+8] ? "yes" : "no");
@@ -342,7 +342,7 @@ uint16_t PrintFliteBlock(uint16_t tracepos, uint8_t *trace, uint16_t tracelen) {
 		case 0xa0:
             PrintAndLogEx(NORMAL,  "CRC of all bloacks match : %s", (trace[3+2]==0xff) ? "no" : "yes");
 			break;
-		default: 
+		default:
 			PrintAndLogEx(WARNING,  "INVALID %d: %s", blocknum, line);
 		break;
 	}
@@ -360,7 +360,7 @@ int CmdHFFelicaDumpLite(const char *Cmd) {
 	clearCommandBuffer();
 	SendCommand(&c);
 	UsbCommand resp;
-	
+
 	uint8_t timeout = 0;
 	while ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
 		timeout++;
@@ -381,32 +381,32 @@ int CmdHFFelicaDumpLite(const char *Cmd) {
 		PrintAndLogEx(WARNING, "\nButton pressed. Aborted.");
 		return 1;
 	}
-	
-	uint64_t tracelen = resp.arg[1];	
+
+	uint64_t tracelen = resp.arg[1];
 	uint8_t *trace = calloc(tracelen, sizeof(uint8_t));
 	if ( trace == NULL ) {
-		PrintAndLogEx(WARNING, "Cannot allocate memory for trace");		
+		PrintAndLogEx(WARNING, "Cannot allocate memory for trace");
 		return 1;
 	}
 
 	// only download data if there is any.
-	if ( tracelen > 0 ) {		
-	
+	if ( tracelen > 0 ) {
+
 		if ( !GetFromDevice(BIG_BUF, trace, tracelen, 0, NULL, 2500, false) ){
 			PrintAndLogEx(WARNING, "command execution time out");
 			free(trace);
 			return 0;
 		}
-		
+
 		PrintAndLogEx(SUCCESS, "Recorded Activity (trace len = %d bytes)", tracelen);
-		
+
 		print_hex_break(trace, tracelen, 32);
-		
+
 		printSep();
 		uint16_t tracepos = 0;
 		while (tracepos < tracelen)
 			tracepos = PrintFliteBlock(tracepos, trace, tracelen);
-		
+
 		printSep();
 	}
 
@@ -440,7 +440,7 @@ int CmdHFFelicaCmdRaw(const char *cmd) {
 				case 'H':
 				case 'h':
 					return usage_hf_felica_raw();
-                case 'r': 
+                case 'r':
                     reply = false;
                     break;
                 case 'c':
@@ -455,7 +455,7 @@ int CmdHFFelicaCmdRaw(const char *cmd) {
                 case 's':
                     active_select = true;
                     break;
-                case 'b': 
+                case 'b':
                     sscanf(cmd+i+2, "%d", &temp);
                     numbits = temp & 0xFFFF;
                     i+=3;
@@ -507,14 +507,14 @@ int CmdHFFelicaCmdRaw(const char *cmd) {
     if (power) {
         c.arg[0] |= FELICA_NO_DISCONNECT;
 	}
-	
+
     if (datalen > 0) {
         c.arg[0] |= FELICA_RAW;
 	}
-			
+
 	// Max buffer is USB_CMD_DATA_SIZE
 	datalen = (datalen > USB_CMD_DATA_SIZE) ? USB_CMD_DATA_SIZE : datalen;
-		
+
     c.arg[1] = (datalen & 0xFFFF) | (uint32_t)(numbits << 16);
     memcpy(c.d.asBytes, data, datalen);
 
@@ -534,7 +534,7 @@ void waitCmdFelica(uint8_t iSelect) {
     UsbCommand resp;
     uint16_t len = 0;
 
-    if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {        
+    if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
         len = iSelect ? (resp.arg[1] & 0xffff) : (resp.arg[0]  & 0xffff);
         PrintAndLogEx(NORMAL, "received %i octets", len);
         if(!len)
diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index 6d7741153..ea5d55c66 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -50,17 +50,17 @@
 static int CmdHelp(const char *Cmd);
 
 int CmdHFFidoInfo(const char *cmd) {
-	
+
 	if (cmd && strlen(cmd) > 0)
 		PrintAndLog("WARNING: command don't have any parameters.\n");
-	
+
 	// info about 14a part
 	CmdHF14AInfo("");
 
 	// FIDO info
-	PrintAndLog("--------------------------------------------"); 
+	PrintAndLog("--------------------------------------------");
 	SetAPDULogging(false);
-	
+
 	uint8_t buf[APDU_RES_LEN] = {0};
 	size_t len = 0;
 	uint16_t sw = 0;
@@ -70,27 +70,27 @@ int CmdHFFidoInfo(const char *cmd) {
 		DropField();
 		return res;
 	}
-	
+
 	if (sw != 0x9000) {
 		if (sw)
-			PrintAndLog("Not a FIDO card! APDU response: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
+			PrintAndLog("Not a FIDO card! APDU response: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
 		else
-			PrintAndLog("APDU exchange error. Card returns 0x0000."); 
-		
+			PrintAndLog("APDU exchange error. Card returns 0x0000.");
+
 		DropField();
 		return 0;
 	}
-	
+
 	if (!strncmp((char *)buf, "U2F_V2", 7)) {
 		if (!strncmp((char *)buf, "FIDO_2_0", 8)) {
-			PrintAndLog("FIDO2 authenricator detected. Version: %.*s", len, buf); 
+			PrintAndLog("FIDO2 authenricator detected. Version: %.*s", len, buf);
 		} else {
-			PrintAndLog("FIDO authenricator detected (not standard U2F)."); 
-			PrintAndLog("Non U2F authenticator version:"); 
+			PrintAndLog("FIDO authenricator detected (not standard U2F).");
+			PrintAndLog("Non U2F authenticator version:");
 			dump_buffer((const unsigned char *)buf, len, NULL, 0);
 		}
 	} else {
-		PrintAndLog("FIDO U2F authenricator detected. Version: %.*s", len, buf); 
+		PrintAndLog("FIDO U2F authenricator detected. Version: %.*s", len, buf);
 	}
 
 	res = FIDO2GetInfo(buf, sizeof(buf), &len, &sw);
@@ -99,32 +99,32 @@ int CmdHFFidoInfo(const char *cmd) {
 		return res;
 	}
 	if (sw != 0x9000) {
-		PrintAndLog("FIDO2 version not exists (%04x - %s).", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
-		
+		PrintAndLog("FIDO2 version not exists (%04x - %s).", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
+
 		return 0;
 	}
-	
+
 	if(buf[0]) {
-		PrintAndLog("FIDO2 ger version error: %d - %s", buf[0], fido2GetCmdErrorDescription(buf[0])); 
+		PrintAndLog("FIDO2 ger version error: %d - %s", buf[0], fido2GetCmdErrorDescription(buf[0]));
 		return 0;
 	}
 
 	if (len > 1) {
 //		if (false) {
-//			PrintAndLog("FIDO2 version: (len=%d)", len); 
+//			PrintAndLog("FIDO2 version: (len=%d)", len);
 //			dump_buffer((const unsigned char *)buf, len, NULL, 0);
 //		}
 
-		PrintAndLog("FIDO2 version CBOR decoded:"); 
+		PrintAndLog("FIDO2 version CBOR decoded:");
 		TinyCborPrintFIDOPackage(fido2CmdGetInfo, true, &buf[1], len - 1);
 	} else {
-		PrintAndLog("FIDO2 version length error"); 
+		PrintAndLog("FIDO2 version length error");
 	}
-		
+
 	return 0;
 }
 
-json_t *OpenJson(int paramnum, char *fname, void* argtable[], bool *err) {	
+json_t *OpenJson(int paramnum, char *fname, void* argtable[], bool *err) {
 	json_t *root = NULL;
 	json_error_t error;
 	*err = false;
@@ -132,17 +132,17 @@ json_t *OpenJson(int paramnum, char *fname, void* argtable[], bool *err) {
 	uint8_t jsonname[250] ={0};
 	char *cjsonname = (char *)jsonname;
 	int jsonnamelen = 0;
-	
+
 	// CLIGetStrWithReturn(paramnum, jsonname, &jsonnamelen);
 	if (CLIParamStrToBuf(arg_get_str(paramnum), jsonname, sizeof(jsonname), &jsonnamelen))  {
 		CLIParserFree();
 		return NULL;
 	}
-	
+
 	// current path + file name
 	if (!strstr(cjsonname, ".json"))
 		strcat(cjsonname, ".json");
-	
+
 	if (jsonnamelen) {
 		strcpy(fname, get_my_executable_directory());
 		strcat(fname, cjsonname);
@@ -151,16 +151,16 @@ json_t *OpenJson(int paramnum, char *fname, void* argtable[], bool *err) {
 			if (!root) {
 				PrintAndLog("ERROR: json error on line %d: %s", error.line, error.text);
 				*err = true;
-				return NULL; 
+				return NULL;
 			}
-			
+
 			if (!json_is_object(root)) {
 				PrintAndLog("ERROR: Invalid json format. root must be an object.");
 				json_decref(root);
 				*err = true;
-				return NULL; 
+				return NULL;
 			}
-			
+
 		} else {
 			root = json_object();
 		}
@@ -175,9 +175,9 @@ int CmdHFFidoRegister(const char *cmd) {
 	int applen = 0;
 	uint8_t adata[250] = {0};
 	json_t *root = NULL;
-	
-	CLIParserInit("hf fido reg", 
-		"Initiate a U2F token registration. Needs two 32-byte hash number. \nchallenge parameter (32b) and application parameter (32b).", 
+
+	CLIParserInit("hf fido reg",
+		"Initiate a U2F token registration. Needs two 32-byte hash number. \nchallenge parameter (32b) and application parameter (32b).",
 		"Usage:\n\thf fido reg -> execute command with 2 parameters, filled 0x00\n"
 			"\thf fido reg 000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f 000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f -> execute command with parameters"
 			"\thf fido reg -p s0 s1 -> execute command with plain parameters");
@@ -194,7 +194,7 @@ int CmdHFFidoRegister(const char *cmd) {
 		arg_param_end
 	};
 	CLIExecWithReturn(cmd, argtable, true);
-	
+
 	bool APDULogging = arg_get_lit(1);
 	bool verbose = arg_get_lit(2);
 	bool verbose2 = arg_get_lit(2) > 1;
@@ -206,12 +206,12 @@ int CmdHFFidoRegister(const char *cmd) {
 	root = OpenJson(5, fname, argtable, &err);
 	if(err)
 		return 1;
-	if (root) {	
+	if (root) {
 		size_t jlen;
 		JsonLoadBufAsHex(root, "$.ChallengeParam", data, 32, &jlen);
 		JsonLoadBufAsHex(root, "$.ApplicationParam", &data[32], 32, &jlen);
 	}
-	
+
 	if (paramsPlain) {
 		memset(cdata, 0x00, 32);
 		CLIGetStrWithReturn(6, cdata, &chlen);
@@ -228,8 +228,8 @@ int CmdHFFidoRegister(const char *cmd) {
 	}
 	if (chlen)
 		memmove(data, cdata, 32);
-	
-	
+
+
 	if (paramsPlain) {
 		memset(adata, 0x00, 32);
 		CLIGetStrWithReturn(7, adata, &applen);
@@ -246,14 +246,14 @@ int CmdHFFidoRegister(const char *cmd) {
 	}
 	if (applen)
 		memmove(&data[32], adata, 32);
-	
-	CLIParserFree();	
-	
+
+	CLIParserFree();
+
 	SetAPDULogging(APDULogging);
 
 	// challenge parameter [32 bytes] - The challenge parameter is the SHA-256 hash of the Client Data, a stringified JSON data structure that the FIDO Client prepares
 	// application parameter [32 bytes] - The application parameter is the SHA-256 hash of the UTF-8 encoding of the application identity
-	
+
 	uint8_t buf[2048] = {0};
 	size_t len = 0;
 	uint16_t sw = 0;
@@ -266,9 +266,9 @@ int CmdHFFidoRegister(const char *cmd) {
 		DropField();
 		return res;
 	}
-	
+
 	if (sw != 0x9000) {
-		PrintAndLog("Can't select FIDO application. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
+		PrintAndLog("Can't select FIDO application. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
 		DropField();
 		return 2;
 	}
@@ -279,12 +279,12 @@ int CmdHFFidoRegister(const char *cmd) {
 		PrintAndLog("Can't execute register command. res=%x. Exit...", res);
 		return res;
 	}
-	
+
 	if (sw != 0x9000) {
-		PrintAndLog("ERROR execute register command. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
+		PrintAndLog("ERROR execute register command. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
 		return 3;
 	}
-	
+
 	PrintAndLog("");
 	if (APDULogging)
 		PrintAndLog("---------------------------------------------------------------");
@@ -300,10 +300,10 @@ int CmdHFFidoRegister(const char *cmd) {
 		return 5;
 	}
 	PrintAndLog("User public key: %s", sprint_hex(&buf[1], 65));
-	
+
 	uint8_t keyHandleLen = buf[66];
 	PrintAndLog("Key handle[%d]: %s", keyHandleLen, sprint_hex(&buf[67], keyHandleLen));
-	
+
 	int derp = 67 + keyHandleLen;
 	int derLen = (buf[derp + 2] << 8) + buf[derp + 3] + 4;
 	if (verbose2) {
@@ -315,26 +315,26 @@ int CmdHFFidoRegister(const char *cmd) {
 			PrintAndLog("------------------DER-------------------");
 		PrintAndLog("DER certificate[%d]: %s...", derLen, sprint_hex(&buf[derp], 20));
 	}
-	
+
 	// check and print DER certificate
 	uint8_t public_key[65] = {0};
-	
+
 	// print DER certificate in TLV view
 	if (showDERTLV) {
 		PrintAndLog("----------------DER TLV-----------------");
 		asn1_print(&buf[derp], derLen, "  ");
 		PrintAndLog("----------------DER TLV-----------------");
 	}
-	
+
     FIDOCheckDERAndGetKey(&buf[derp], derLen, verbose, public_key, sizeof(public_key));
-	
+
 	// get hash
 	int hashp = 1 + 65 + 1 + keyHandleLen + derLen;
 	PrintAndLog("Hash[%d]: %s", len - hashp, sprint_hex(&buf[hashp], len - hashp));
 
 	// check ANSI X9.62 format ECDSA signature (on P-256)
-	uint8_t rval[300] = {0}; 
-	uint8_t sval[300] = {0}; 
+	uint8_t rval[300] = {0};
+	uint8_t sval[300] = {0};
 	res = ecdsa_asn1_get_signature(&buf[hashp], len - hashp, rval, sval);
 	if (!res) {
 		if (verbose) {
@@ -346,7 +346,7 @@ int CmdHFFidoRegister(const char *cmd) {
 		size_t xbuflen = 0;
 		res = FillBuffer(xbuf, sizeof(xbuf), &xbuflen,
 			"\x00", 1,
-			&data[32], 32,           // application parameter  
+			&data[32], 32,           // application parameter
 			&data[0], 32,            // challenge parameter
 			&buf[67], keyHandleLen,  // keyHandle
 			&buf[1], 65,             // user public key
@@ -362,11 +362,11 @@ int CmdHFFidoRegister(const char *cmd) {
 		} else {
 			PrintAndLog("Signature is OK.");
 		}
-		
+
 	} else {
 		PrintAndLog("Invalid signature. res=%d.", res);
 	}
-	
+
 	PrintAndLog("\nauth command: ");
 	printf("hf fido auth %s%s", paramsPlain?"-p ":"", sprint_hex_inrow(&buf[67], keyHandleLen));
 	if(chlen || applen)
@@ -374,7 +374,7 @@ int CmdHFFidoRegister(const char *cmd) {
 	if(applen)
 		printf(" %s", paramsPlain?(char *)adata:sprint_hex_inrow(adata, 32));
 	printf("\n");
-	
+
 	if (root) {
 		JsonSaveBufAsHex(root, "ChallengeParam", data, 32);
 		JsonSaveBufAsHex(root, "ApplicationParam", &data[32], 32);
@@ -382,18 +382,18 @@ int CmdHFFidoRegister(const char *cmd) {
 		JsonSaveInt(root, "KeyHandleLen", keyHandleLen);
 		JsonSaveBufAsHexCompact(root, "KeyHandle", &buf[67], keyHandleLen);
 		JsonSaveBufAsHexCompact(root, "DER", &buf[67 + keyHandleLen], derLen);
-	
+
 		res = json_dump_file(root, fname, JSON_INDENT(2));
 		if (res) {
 			PrintAndLog("ERROR: can't save the file: %s", fname);
 			return 200;
 		}
 		PrintAndLog("File `%s` saved.", fname);
-		
+
 		// free json object
 		json_decref(root);
 	}
-	
+
 	return 0;
 };
 
@@ -401,13 +401,13 @@ int CmdHFFidoAuthenticate(const char *cmd) {
 	uint8_t data[512] = {0};
 	uint8_t hdata[250] = {0};
 	bool public_key_loaded = false;
-	uint8_t public_key[65] = {0}; 
+	uint8_t public_key[65] = {0};
 	int hdatalen = 0;
 	uint8_t keyHandleLen = 0;
 	json_t *root = NULL;
-	
-	CLIParserInit("hf fido auth", 
-		"Initiate a U2F token authentication. Needs key handle and two 32-byte hash number. \nkey handle(var 0..255), challenge parameter (32b) and application parameter (32b).", 
+
+	CLIParserInit("hf fido auth",
+		"Initiate a U2F token authentication. Needs key handle and two 32-byte hash number. \nkey handle(var 0..255), challenge parameter (32b) and application parameter (32b).",
 		"Usage:\n\thf fido auth 000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f -> execute command with 2 parameters, filled 0x00 and key handle\n"
 			"\thf fido auth 000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f "
 				"000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f 000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f -> execute command with parameters");
@@ -428,7 +428,7 @@ int CmdHFFidoAuthenticate(const char *cmd) {
 		arg_param_end
 	};
 	CLIExecWithReturn(cmd, argtable, true);
-	
+
 	bool APDULogging = arg_get_lit(1);
 	bool verbose = arg_get_lit(2);
 	bool paramsPlain = arg_get_lit(3);
@@ -443,7 +443,7 @@ int CmdHFFidoAuthenticate(const char *cmd) {
 	root = OpenJson(7, fname, argtable, &err);
 	if(err)
 		return 1;
-	if (root) {	
+	if (root) {
 		size_t jlen;
 		JsonLoadBufAsHex(root, "$.ChallengeParam", data, 32, &jlen);
 		JsonLoadBufAsHex(root, "$.ApplicationParam", &data[32], 32, &jlen);
@@ -452,7 +452,7 @@ int CmdHFFidoAuthenticate(const char *cmd) {
 		data[64] = keyHandleLen;
 		JsonLoadBufAsHex(root, "$.PublicKey", public_key, 65, &jlen);
 		public_key_loaded = (jlen > 0);
-	} 
+	}
 
 	// public key
 	CLIGetHexWithReturn(8, hdata, &hdatalen);
@@ -463,8 +463,8 @@ int CmdHFFidoAuthenticate(const char *cmd) {
 	if (hdatalen) {
 		memmove(public_key, hdata, hdatalen);
 		public_key_loaded = true;
-	}	
-	
+	}
+
 	CLIGetHexWithReturn(9, hdata, &hdatalen);
 	if (hdatalen > 255) {
 		PrintAndLog("ERROR: application parameter length must be less than 255.");
@@ -510,8 +510,8 @@ int CmdHFFidoAuthenticate(const char *cmd) {
 	if (hdatalen)
 		memmove(&data[32], hdata, 32);
 
-	CLIParserFree();	
-	
+	CLIParserFree();
+
 	SetAPDULogging(APDULogging);
 
 	// (in parameter) conrtol byte 0x07 - check only, 0x03 - user presense + cign. 0x08 - sign only
@@ -521,7 +521,7 @@ int CmdHFFidoAuthenticate(const char *cmd) {
 	// key handle [N]
 
 	uint8_t datalen = 32 + 32 + 1 + keyHandleLen;
-	
+
 	uint8_t buf[2048] = {0};
 	size_t len = 0;
 	uint16_t sw = 0;
@@ -534,9 +534,9 @@ int CmdHFFidoAuthenticate(const char *cmd) {
 		DropField();
 		return res;
 	}
-	
+
 	if (sw != 0x9000) {
-		PrintAndLog("Can't select FIDO application. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
+		PrintAndLog("Can't select FIDO application. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
 		DropField();
 		return 2;
 	}
@@ -547,12 +547,12 @@ int CmdHFFidoAuthenticate(const char *cmd) {
 		PrintAndLog("Can't execute authentication command. res=%x. Exit...", res);
 		return res;
 	}
-	
+
 	if (sw != 0x9000) {
-		PrintAndLog("ERROR execute authentication command. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
+		PrintAndLog("ERROR execute authentication command. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
 		return 3;
 	}
-	
+
 	PrintAndLog("---------------------------------------------------------------");
 	PrintAndLog("User presence: %s", (buf[0]?"verified":"not verified"));
 	uint32_t cntr =  (uint32_t)bytes_to_num(&buf[1], 4);
@@ -560,8 +560,8 @@ int CmdHFFidoAuthenticate(const char *cmd) {
 	PrintAndLog("Hash[%d]: %s", len - 5, sprint_hex(&buf[5], len - 5));
 
 	// check ANSI X9.62 format ECDSA signature (on P-256)
-	uint8_t rval[300] = {0}; 
-	uint8_t sval[300] = {0}; 
+	uint8_t rval[300] = {0};
+	uint8_t sval[300] = {0};
 	res = ecdsa_asn1_get_signature(&buf[5], len - 5, rval, sval);
 	if (!res) {
 		if (verbose) {
@@ -588,27 +588,27 @@ int CmdHFFidoAuthenticate(const char *cmd) {
 			} else {
 				PrintAndLog("Signature is OK.");
 			}
-		} else {		
+		} else {
 			PrintAndLog("No public key provided. can't check signature.");
 		}
 	} else {
 		PrintAndLog("Invalid signature. res=%d.", res);
 	}
-	
+
 	if (root) {
 		JsonSaveBufAsHex(root, "ChallengeParam", data, 32);
 		JsonSaveBufAsHex(root, "ApplicationParam", &data[32], 32);
 		JsonSaveInt(root, "KeyHandleLen", keyHandleLen);
 		JsonSaveBufAsHexCompact(root, "KeyHandle", &data[65], keyHandleLen);
 		JsonSaveInt(root, "Counter", cntr);
-	
+
 		res = json_dump_file(root, fname, JSON_INDENT(2));
 		if (res) {
 			PrintAndLog("ERROR: can't save the file: %s", fname);
 			return 200;
 		}
 		PrintAndLog("File `%s` saved.", fname);
-		
+
 		// free json object
 		json_decref(root);
 	}
@@ -616,7 +616,7 @@ int CmdHFFidoAuthenticate(const char *cmd) {
 };
 
 void CheckSlash(char *fileName) {
-	if ((fileName[strlen(fileName) - 1] != '/') && 
+	if ((fileName[strlen(fileName) - 1] != '/') &&
 		(fileName[strlen(fileName) - 1] != '\\'))
 		strcat(fileName, "/");
 }
@@ -625,22 +625,22 @@ int GetExistsFileNameJson(char *prefixDir, char *reqestedFileName, char *fileNam
 	fileName[0] = 0x00;
 	strcpy(fileName, get_my_executable_directory());
 	CheckSlash(fileName);
-	
+
 	strcat(fileName, prefixDir);
 	CheckSlash(fileName);
-	
+
 	strcat(fileName, reqestedFileName);
 	if (!strstr(fileName, ".json"))
 		strcat(fileName, ".json");
-	
+
 	if (access(fileName, F_OK) < 0) {
 		strcpy(fileName, get_my_executable_directory());
 		CheckSlash(fileName);
-		
+
 		strcat(fileName, reqestedFileName);
 		if (!strstr(fileName, ".json"))
 			strcat(fileName, ".json");
-		
+
 		if (access(fileName, F_OK) < 0) {
 			return 1; // file not found
 		}
@@ -652,9 +652,9 @@ int CmdHFFido2MakeCredential(const char *cmd) {
 	json_error_t error;
 	json_t *root = NULL;
 	char fname[300] = {0};
-	
-	CLIParserInit("hf fido make", 
-		"Execute a FIDO2 Make Credentional command. Needs json file with parameters. Sample file `fido2.json`. File can be placed in proxmark directory or in `proxmark/fido` directory.", 
+
+	CLIParserInit("hf fido make",
+		"Execute a FIDO2 Make Credentional command. Needs json file with parameters. Sample file `fido2.json`. File can be placed in proxmark directory or in `proxmark/fido` directory.",
 		"Usage:\n\thf fido make -> execute command default parameters file `fido2.json`\n"
 			"\thf fido make test.json -> execute command with parameters file `text.json`");
 
@@ -668,7 +668,7 @@ int CmdHFFido2MakeCredential(const char *cmd) {
 		arg_param_end
 	};
 	CLIExecWithReturn(cmd, argtable, true);
-	
+
 	bool APDULogging = arg_get_lit(1);
 	bool verbose = arg_get_lit(2);
 	bool verbose2 = arg_get_lit(2) > 1;
@@ -685,8 +685,8 @@ int CmdHFFido2MakeCredential(const char *cmd) {
 		jsonnamelen = strlen(cjsonname);
 	}
 
-	CLIParserFree();	
-	
+	CLIParserFree();
+
 	SetAPDULogging(APDULogging);
 
 	int res = GetExistsFileNameJson("fido", cjsonname, fname);
@@ -695,12 +695,12 @@ int CmdHFFido2MakeCredential(const char *cmd) {
 		return res;
 	}
 	PrintAndLog("fname: %s\n", fname);
-	root = json_load_file(fname, 0, &error);	
+	root = json_load_file(fname, 0, &error);
 	if (!root) {
 		PrintAndLog("ERROR: json error on line %d: %s", error.line, error.text);
 		return 1;
 	}
-	
+
 	uint8_t data[2048] = {0};
 	size_t datalen = 0;
 	uint8_t buf[2048] = {0};
@@ -715,9 +715,9 @@ int CmdHFFido2MakeCredential(const char *cmd) {
 		DropField();
 		return res;
 	}
-	
+
 	if (sw != 0x9000) {
-		PrintAndLog("Can't select FIDO application. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
+		PrintAndLog("Can't select FIDO application. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
 		DropField();
 		return 2;
 	}
@@ -725,28 +725,28 @@ int CmdHFFido2MakeCredential(const char *cmd) {
 	res = FIDO2CreateMakeCredentionalReq(root, data, sizeof(data), &datalen);
 	if (res)
 		return res;
-	
+
 	if (showCBOR) {
 		PrintAndLog("CBOR make credentional request:");
 		PrintAndLog("---------------- CBOR ------------------");
 		TinyCborPrintFIDOPackage(fido2CmdMakeCredential, false, data, datalen);
 		PrintAndLog("---------------- CBOR ------------------");
 	}
-	
+
 	res = FIDO2MakeCredential(data, datalen, buf,  sizeof(buf), &len, &sw);
 	DropField();
 	if (res) {
 		PrintAndLog("Can't execute make credential command. res=%x. Exit...", res);
 		return res;
 	}
-	
+
 	if (sw != 0x9000) {
-		PrintAndLog("ERROR execute make credential command. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
+		PrintAndLog("ERROR execute make credential command. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
 		return 3;
 	}
-	
+
 	if(buf[0]) {
-		PrintAndLog("FIDO2 make credential error: %d - %s", buf[0], fido2GetCmdErrorDescription(buf[0])); 
+		PrintAndLog("FIDO2 make credential error: %d - %s", buf[0], fido2GetCmdErrorDescription(buf[0]));
 		return 0;
 	}
 
@@ -760,7 +760,7 @@ int CmdHFFido2MakeCredential(const char *cmd) {
 
 	// parse returned cbor
 	FIDO2MakeCredentionalParseRes(root, &buf[1], len - 1, verbose, verbose2, showCBOR, showDERTLV);
-	
+
 	if (root) {
 		res = json_dump_file(root, fname, JSON_INDENT(2));
 		if (res) {
@@ -769,7 +769,7 @@ int CmdHFFido2MakeCredential(const char *cmd) {
 		}
 		PrintAndLog("File `%s` saved.", fname);
 	}
-	
+
 	json_decref(root);
 
 	return 0;
@@ -779,9 +779,9 @@ int CmdHFFido2GetAssertion(const char *cmd) {
 	json_error_t error;
 	json_t *root = NULL;
 	char fname[300] = {0};
-	
-	CLIParserInit("hf fido assert", 
-		"Execute a FIDO2 Get Assertion command. Needs json file with parameters. Sample file `fido2.json`. File can be placed in proxmark directory or in `proxmark/fido` directory.", 
+
+	CLIParserInit("hf fido assert",
+		"Execute a FIDO2 Get Assertion command. Needs json file with parameters. Sample file `fido2.json`. File can be placed in proxmark directory or in `proxmark/fido` directory.",
 		"Usage:\n\thf fido assert -> execute command default parameters file `fido2.json`\n"
 			"\thf fido assert test.json -l -> execute command with parameters file `text.json` and add to request CredentialId");
 
@@ -795,7 +795,7 @@ int CmdHFFido2GetAssertion(const char *cmd) {
 		arg_param_end
 	};
 	CLIExecWithReturn(cmd, argtable, true);
-	
+
 	bool APDULogging = arg_get_lit(1);
 	bool verbose = arg_get_lit(2);
 	bool verbose2 = arg_get_lit(2) > 1;
@@ -812,8 +812,8 @@ int CmdHFFido2GetAssertion(const char *cmd) {
 		jsonnamelen = strlen(cjsonname);
 	}
 
-	CLIParserFree();	
-	
+	CLIParserFree();
+
 	SetAPDULogging(APDULogging);
 
 	int res = GetExistsFileNameJson("fido", "fido2", fname);
@@ -822,12 +822,12 @@ int CmdHFFido2GetAssertion(const char *cmd) {
 		return res;
 	}
 	PrintAndLog("fname: %s\n", fname);
-	root = json_load_file(fname, 0, &error);	
+	root = json_load_file(fname, 0, &error);
 	if (!root) {
 		PrintAndLog("ERROR: json error on line %d: %s", error.line, error.text);
 		return 1;
 	}
-	
+
 	uint8_t data[2048] = {0};
 	size_t datalen = 0;
 	uint8_t buf[2048] = {0};
@@ -842,9 +842,9 @@ int CmdHFFido2GetAssertion(const char *cmd) {
 		DropField();
 		return res;
 	}
-	
+
 	if (sw != 0x9000) {
-		PrintAndLog("Can't select FIDO application. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
+		PrintAndLog("Can't select FIDO application. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
 		DropField();
 		return 2;
 	}
@@ -852,28 +852,28 @@ int CmdHFFido2GetAssertion(const char *cmd) {
 	res = FIDO2CreateGetAssertionReq(root, data, sizeof(data), &datalen, createAllowList);
 	if (res)
 		return res;
-	
+
 	if (showCBOR) {
 		PrintAndLog("CBOR get assertion request:");
 		PrintAndLog("---------------- CBOR ------------------");
 		TinyCborPrintFIDOPackage(fido2CmdGetAssertion, false, data, datalen);
 		PrintAndLog("---------------- CBOR ------------------");
 	}
-	
+
 	res = FIDO2GetAssertion(data, datalen, buf,  sizeof(buf), &len, &sw);
 	DropField();
 	if (res) {
 		PrintAndLog("Can't execute get assertion command. res=%x. Exit...", res);
 		return res;
 	}
-	
+
 	if (sw != 0x9000) {
-		PrintAndLog("ERROR execute get assertion command. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
+		PrintAndLog("ERROR execute get assertion command. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
 		return 3;
 	}
-	
+
 	if(buf[0]) {
-		PrintAndLog("FIDO2 get assertion error: %d - %s", buf[0], fido2GetCmdErrorDescription(buf[0])); 
+		PrintAndLog("FIDO2 get assertion error: %d - %s", buf[0], fido2GetCmdErrorDescription(buf[0]));
 		return 0;
 	}
 
@@ -887,7 +887,7 @@ int CmdHFFido2GetAssertion(const char *cmd) {
 
 	// parse returned cbor
 	FIDO2GetAssertionParseRes(root, &buf[1], len - 1, verbose, verbose2, showCBOR);
-	
+
 	if (root) {
 		res = json_dump_file(root, fname, JSON_INDENT(2));
 		if (res) {
@@ -898,7 +898,7 @@ int CmdHFFido2GetAssertion(const char *cmd) {
 	}
 
 	json_decref(root);
-	
+
 	return 0;
 };
 
diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index 82e14d5ea..25be7df47 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -58,7 +58,7 @@ int usage_hf_iclass_decrypt(void) {
 	PrintAndLogEx(NORMAL, "which is defined by the configuration block.");
 	PrintAndLogEx(NORMAL, "OBS! In order to use this function, the file 'iclass_decryptionkey.bin' must reside");
 	PrintAndLogEx(NORMAL, "in the working directory. The file should be 16 bytes binary data");
-	PrintAndLogEx(NORMAL, "");	
+	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Usage: hf iclass decrypt f <tagdump>");
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Examples:");
@@ -192,14 +192,14 @@ int usage_hf_iclass_replay(void) {
 	PrintAndLogEx(NORMAL, "    h       This help text");
 	PrintAndLogEx(NORMAL, "    <mac>   Mac bytes to replay (8 hexsymbols)");
 	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        hf iclass replay 00112233");	
+	PrintAndLogEx(NORMAL, "        hf iclass replay 00112233");
 	return 0;
 }
 int usage_hf_iclass_sniff(void) {
 	PrintAndLogEx(NORMAL, "Sniff the communication between reader and tag");
 	PrintAndLogEx(NORMAL, "Usage:  hf iclass sniff [h]");
 	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "		 hf iclass sniff");	
+	PrintAndLogEx(NORMAL, "		 hf iclass sniff");
 	return 0;
 }
 int usage_hf_iclass_loclass(void) {
@@ -218,7 +218,7 @@ int usage_hf_iclass_loclass(void) {
 	return 0;
 }
 int usage_hf_iclass_chk(void) {
-	PrintAndLogEx(NORMAL, "Checkkeys loads a dictionary text file with 8byte hex keys to test authenticating against a iClass tag");	
+	PrintAndLogEx(NORMAL, "Checkkeys loads a dictionary text file with 8byte hex keys to test authenticating against a iClass tag");
 	PrintAndLogEx(NORMAL, "Usage: hf iclass chk [h|e|r] [f  (*.dic)]");
 	PrintAndLogEx(NORMAL, "Options:");
 	PrintAndLogEx(NORMAL, "      h             Show this help");
@@ -227,12 +227,12 @@ int usage_hf_iclass_chk(void) {
 	PrintAndLogEx(NORMAL, "      e             elite");
 	PrintAndLogEx(NORMAL, "      c             credit key  (if not use, default is debit)");
 	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "		 hf iclass chk f default_iclass_keys.dic");	
+	PrintAndLogEx(NORMAL, "		 hf iclass chk f default_iclass_keys.dic");
 	PrintAndLogEx(NORMAL, "		 hf iclass chk f default_iclass_keys.dic e");
 	return 0;
 }
 int usage_hf_iclass_lookup(void) {
-	PrintAndLogEx(NORMAL, "Lookup keys takes some sniffed trace data and tries to verify what key was used against a dictionary file");	
+	PrintAndLogEx(NORMAL, "Lookup keys takes some sniffed trace data and tries to verify what key was used against a dictionary file");
 	PrintAndLogEx(NORMAL, "Usage: hf iclass lookup [h|e|r] [f  (*.dic)] [u <csn>] [p <epurse>] [m <macs>]");
 	PrintAndLogEx(NORMAL, "Options:");
 	PrintAndLogEx(NORMAL, "      h             Show this help");
@@ -308,33 +308,33 @@ int CmdHFiClassSim(const char *Cmd) {
 	}
 
 	uint8_t numberOfCSNs = 0;
-	
+
 /*
 		// pre-defined 8 CSN by Holiman
-		uint8_t csns[8*NUM_CSNS] = {		
-			0x00, 0x0B, 0x0F, 0xFF, 0xF7, 0xFF, 0x12, 0xE0, 
-			0x00, 0x13, 0x94, 0x7E, 0x76, 0xFF, 0x12, 0xE0, 
-			0x2A, 0x99, 0xAC, 0x79, 0xEC, 0xFF, 0x12, 0xE0,	
-			0x17, 0x12, 0x01, 0xFD, 0xF7, 0xFF, 0x12, 0xE0, 
-			0xCD, 0x56, 0x01, 0x7C, 0x6F, 0xFF, 0x12, 0xE0, 
-			0x4B, 0x5E, 0x0B, 0x72, 0xEF, 0xFF, 0x12, 0xE0, 
-			0x00, 0x73, 0xD8, 0x75, 0x58, 0xFF, 0x12, 0xE0, 
-			0x0C, 0x90, 0x32, 0xF3, 0x5D, 0xFF, 0x12, 0xE0  
+		uint8_t csns[8*NUM_CSNS] = {
+			0x00, 0x0B, 0x0F, 0xFF, 0xF7, 0xFF, 0x12, 0xE0,
+			0x00, 0x13, 0x94, 0x7E, 0x76, 0xFF, 0x12, 0xE0,
+			0x2A, 0x99, 0xAC, 0x79, 0xEC, 0xFF, 0x12, 0xE0,
+			0x17, 0x12, 0x01, 0xFD, 0xF7, 0xFF, 0x12, 0xE0,
+			0xCD, 0x56, 0x01, 0x7C, 0x6F, 0xFF, 0x12, 0xE0,
+			0x4B, 0x5E, 0x0B, 0x72, 0xEF, 0xFF, 0x12, 0xE0,
+			0x00, 0x73, 0xD8, 0x75, 0x58, 0xFF, 0x12, 0xE0,
+			0x0C, 0x90, 0x32, 0xF3, 0x5D, 0xFF, 0x12, 0xE0
 		};
 */
 /*
-		pre-defined 9 CSN by iceman		
-		only one csn depend on several others. 
+		pre-defined 9 CSN by iceman
+		only one csn depend on several others.
 		six depends only on the first csn,  (0,1, 0x45)
 */
 		uint8_t csns[8*NUM_CSNS] = {
-			0x01, 0x0A, 0x0F, 0xFF, 0xF7, 0xFF, 0x12, 0xE0, 
-			0x0C, 0x06, 0x0C, 0xFE, 0xF7, 0xFF, 0x12, 0xE0, 
-			0x10, 0x97, 0x83, 0x7B, 0xF7, 0xFF, 0x12, 0xE0, 
-			0x13, 0x97, 0x82, 0x7A, 0xF7, 0xFF, 0x12, 0xE0, 
-			0x07, 0x0E, 0x0D, 0xF9, 0xF7, 0xFF, 0x12, 0xE0, 
-			0x14, 0x96, 0x84, 0x76, 0xF7, 0xFF, 0x12, 0xE0, 
-			0x17, 0x96, 0x85, 0x71, 0xF7, 0xFF, 0x12, 0xE0, 
+			0x01, 0x0A, 0x0F, 0xFF, 0xF7, 0xFF, 0x12, 0xE0,
+			0x0C, 0x06, 0x0C, 0xFE, 0xF7, 0xFF, 0x12, 0xE0,
+			0x10, 0x97, 0x83, 0x7B, 0xF7, 0xFF, 0x12, 0xE0,
+			0x13, 0x97, 0x82, 0x7A, 0xF7, 0xFF, 0x12, 0xE0,
+			0x07, 0x0E, 0x0D, 0xF9, 0xF7, 0xFF, 0x12, 0xE0,
+			0x14, 0x96, 0x84, 0x76, 0xF7, 0xFF, 0x12, 0xE0,
+			0x17, 0x96, 0x85, 0x71, 0xF7, 0xFF, 0x12, 0xE0,
 			0xCE, 0xC5, 0x0F, 0x77, 0xF7, 0xFF, 0x12, 0xE0,
 			0xD2, 0x5A, 0x82, 0xF8, 0xF7, 0xFF, 0x12, 0xE0
 			//0x04, 0x08, 0x9F, 0x78, 0x6E, 0xFF, 0x12, 0xE0
@@ -357,10 +357,10 @@ int CmdHFiClassSim(const char *Cmd) {
 			0x00, 0x02, 0x04, 0x1E, 0xF7, 0xFF, 0x12, 0xE0,
 			0x00, 0x07, 0x03, 0x1B, 0xF7, 0xFF, 0x12, 0xE0,
 			0x00, 0x00, 0x02, 0x24, 0xF7, 0xFF, 0x12, 0xE0,
-			0x00, 0x05, 0x01, 0x21, 0xF7, 0xFF, 0x12, 0xE0 
-		};		
+			0x00, 0x05, 0x01, 0x21, 0xF7, 0xFF, 0x12, 0xE0
+		};
 */
-	
+
 /* DUMPFILE FORMAT:
  *
  * <8-byte CSN><8-byte CC><4 byte NR><4 byte MAC>....
@@ -372,9 +372,9 @@ int CmdHFiClassSim(const char *Cmd) {
  * CC are all zeroes, CSN is the same as was sent in
  **/
 	uint8_t tries = 0;
-			
+
 	switch(simType) {
-		
+
 		case 2: {
 			PrintAndLogEx(INFO, "Starting iCLASS sim 2 attack (elite mode)");
 			PrintAndLogEx(INFO, "press keyboard to cancel");
@@ -383,7 +383,7 @@ int CmdHFiClassSim(const char *Cmd) {
 			memcpy(c.d.asBytes, csns, 8 * NUM_CSNS);
 			clearCommandBuffer();
 			SendCommand(&c);
-			
+
 			while ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
 				tries++;
 				if (ukbhit()) {
@@ -402,19 +402,19 @@ int CmdHFiClassSim(const char *Cmd) {
 
 			if ( num_mac == 0 )
 				break;
-			
+
 			size_t datalen = NUM_CSNS * 24;
 			void* dump = calloc(datalen, sizeof(uint8_t));
 			if ( !dump ) {
 				PrintAndLogEx(WARNING, "Failed to allocate memory");
 				return 2;
 			}
-			
+
 			memset(dump, 0, datalen);//<-- Need zeroes for the EPURSE - field (offical)
-			
+
 			uint8_t i = 0;
 			for (i = 0 ; i < NUM_CSNS ; i++) {
-				//copy CSN 
+				//copy CSN
 				memcpy(dump + i*24, csns + i*8, 8);
 				//copy epurse
 				memcpy(dump + i*24 + 8, resp.d.asBytes + i*16, 8);
@@ -423,7 +423,7 @@ int CmdHFiClassSim(const char *Cmd) {
 			}
 			/** Now, save to dumpfile **/
 			saveFile("iclass_mac_attack", "bin", dump, datalen);
-			free(dump);			
+			free(dump);
 			break;
 		}
 		case 4: {
@@ -454,16 +454,16 @@ int CmdHFiClassSim(const char *Cmd) {
 
 			if ( num_mac == 0 )
 				break;
-			
+
 			size_t datalen = NUM_CSNS * 24;
 			void* dump = calloc(datalen, sizeof(uint8_t));
 			if ( !dump ) {
 				PrintAndLogEx(WARNING, "Failed to allocate memory");
 				return 2;
 			}
-			
+
 			#define MAC_ITEM_SIZE 24
-			
+
 			//KEYROLL 1
 			//Need zeroes for the CC-field
 			memset(dump, 0, datalen);
@@ -483,17 +483,17 @@ int CmdHFiClassSim(const char *Cmd) {
 			for (uint8_t i = 0; i < NUM_CSNS; i++) {
 				resp_index =  (i + NUM_CSNS) * 16;
 				// Copy CSN
-				memcpy(dump + i*MAC_ITEM_SIZE, csns + i*8, 8); 
+				memcpy(dump + i*MAC_ITEM_SIZE, csns + i*8, 8);
 				// copy EPURSE
 				memcpy(dump + i*MAC_ITEM_SIZE + 8, resp.d.asBytes + resp_index, 8);
 				// copy NR_MAC (eight bytes from the response)  ( 8b csn + 8 epurse == 16)
 				memcpy(dump + i*MAC_ITEM_SIZE + 16, resp.d.asBytes + resp_index + 8, 8);
 				resp_index++;
-			}						
-			saveFile("iclass_mac_attack_keyroll_B", "bin", dump, datalen);			
-			free(dump);			
+			}
+			saveFile("iclass_mac_attack_keyroll_B", "bin", dump, datalen);
+			free(dump);
 			break;
-		}		
+		}
 		case 1:
 		case 3:
 		default: {
@@ -502,7 +502,7 @@ int CmdHFiClassSim(const char *Cmd) {
 			clearCommandBuffer();
 			SendCommand(&c);
 			break;
-		}		
+		}
 	}
 	return 0;
 }
@@ -513,12 +513,12 @@ int HFiClassReader(const char *Cmd, bool loop, bool verbose) {
 	uint32_t flags = FLAG_ICLASS_READER_CSN | FLAG_ICLASS_READER_CC |  FLAG_ICLASS_READER_AIA |
 					FLAG_ICLASS_READER_CONF | FLAG_ICLASS_READER_ONLY_ONCE |
 					FLAG_ICLASS_READER_ONE_TRY;
-					
+
 	UsbCommand c = {CMD_READER_ICLASS, {flags, 0, 0}};
 	// loop in client not device - else on windows have a communication error
 	UsbCommand resp;
 	while (!ukbhit()){
-	
+
 		clearCommandBuffer();
 		SendCommand(&c);
 		if (WaitForResponseTimeout(CMD_ACK,&resp, 4500)) {
@@ -530,7 +530,7 @@ int HFiClassReader(const char *Cmd, bool loop, bool verbose) {
 			if ( (readStatus == 0 && !loop) || readStatus == 0xFF) {
 				// abort
 				if (verbose) {
-					PrintAndLogEx(FAILED, "Quitting..."); 
+					PrintAndLogEx(FAILED, "Quitting...");
 					DropField();
 					return 0;
 				}
@@ -539,7 +539,7 @@ int HFiClassReader(const char *Cmd, bool loop, bool verbose) {
 				PrintAndLogEx(NORMAL, "   CSN: %s", sprint_hex(data, 8));
 				tagFound = true;
 			}
-			if (readStatus & FLAG_ICLASS_READER_CC) { 
+			if (readStatus & FLAG_ICLASS_READER_CC) {
 				PrintAndLogEx(NORMAL, "    CC: %s", sprint_hex(data+16, 8));
 			}
 			if (readStatus & FLAG_ICLASS_READER_CONF) {
@@ -547,9 +547,9 @@ int HFiClassReader(const char *Cmd, bool loop, bool verbose) {
 			}
 			if (readStatus & FLAG_ICLASS_READER_AIA) {
 				bool legacy = ( memcmp( (uint8_t *)(data + 8*5), "\xff\xff\xff\xff\xff\xff\xff\xff", 8) == 0 );
-				
+
 				bool se_enabled = ( memcmp( (uint8_t *)(data + 8*5), "\xff\xff\xff\x00\x06\xff\xff\xff", 8) == 0 );
-				
+
 				PrintAndLogEx(NORMAL, " App IA: %s", sprint_hex(data+8*5, 8));
 				if ( legacy )
 					PrintAndLogEx(SUCCESS, "      : Possible iClass (legacy credential tag)");
@@ -564,7 +564,7 @@ int HFiClassReader(const char *Cmd, bool loop, bool verbose) {
 				return 1;
 			}
 		} else {
-			if (verbose) 
+			if (verbose)
 				PrintAndLogEx(WARNING, "command execute timeout");
 		}
 		if (!loop) break;
@@ -573,7 +573,7 @@ int HFiClassReader(const char *Cmd, bool loop, bool verbose) {
 	return 0;
 }
 
-int CmdHFiClassReader(const char *Cmd) {	
+int CmdHFiClassReader(const char *Cmd) {
 	char cmdp = param_getchar(Cmd, 0);
 	if (cmdp == 'h' || cmdp == 'H') return usage_hf_iclass_reader();
 	bool findone = (cmdp == '1') ? false : true;
@@ -581,13 +581,13 @@ int CmdHFiClassReader(const char *Cmd) {
 }
 
 int CmdHFiClassReader_Replay(const char *Cmd) {
-	
+
 	char cmdp = param_getchar(Cmd, 0);
 	if (strlen(Cmd)<1 || cmdp == 'H' || cmdp == 'h') return usage_hf_iclass_replay();
-	
+
 	uint8_t readerType = 0;
 	uint8_t MAC[4] = {0x00, 0x00, 0x00, 0x00};
-	
+
 	if (param_gethex(Cmd, 0, MAC, 8)) {
 		PrintAndLogEx(FAILED, "MAC must include 8 HEX symbols");
 		return 1;
@@ -612,24 +612,24 @@ int CmdHFiClassELoad(const char *Cmd) {
 
 	char ctmp = param_getchar(Cmd, 0);
 	if (strlen(Cmd)< 1 || ctmp == 'h' || ctmp == 'H') return usage_hf_iclass_eload();
-	
+
 	if ( ctmp != 'f' && ctmp != 'F') return usage_hf_iclass_eload();
-	
+
 	//File handling and reading
 	FILE *f;
 	char filename[FILE_PATH_SIZE];
-	
+
 	if ( param_getstr(Cmd, 1, filename, FILE_PATH_SIZE) >= FILE_PATH_SIZE ) {
 		PrintAndLogEx(FAILED, "Filename too long");
 		return 1;
 	}
-	
+
 	f = fopen(filename, "rb");
 	if ( !f ){
 		PrintAndLogEx(FAILED, "File: " _YELLOW_(%s) ": not found or locked.", filename);
 		return 1;
 	}
-	
+
 	// get filesize in order to malloc memory
 	fseek(f, 0, SEEK_END);
 	long fsize = ftell(f);
@@ -647,7 +647,7 @@ int CmdHFiClassELoad(const char *Cmd) {
 		fclose(f);
 		return 1;
 	}
-	
+
 	size_t bytes_read = fread(dump, 1, fsize, f);
 	fclose(f);
 
@@ -688,12 +688,12 @@ static int readKeyfile(const char *filename, size_t len, uint8_t* buffer) {
 	fseek(f, 0, SEEK_SET);
 	size_t bytes_read = fread(buffer, 1, len, f);
 	fclose(f);
-	
+
 	if (fsize != len) {
 		PrintAndLogEx(WARNING, "Warning, file size is %d, expected %d", fsize, len);
 		return 1;
 	}
-	
+
 	if (bytes_read != len) {
 		PrintAndLogEx(WARNING, "Warning, could only read %d bytes, expected %d" ,bytes_read, len);
 		return 1;
@@ -705,10 +705,10 @@ int CmdHFiClassDecrypt(const char *Cmd) {
 
 	char opt = param_getchar(Cmd, 0);
 	if (strlen(Cmd)<1 || opt == 'h' || opt == 'H') return usage_hf_iclass_decrypt();
-	
+
 	uint8_t key[16] = { 0 };
 	if (readKeyfile("iclass_decryptionkey.bin", 16, key)) return usage_hf_iclass_decrypt();
-	
+
 	PrintAndLogEx(SUCCESS, "decryption key loaded from file");
 
 	//Open the tagdump-file
@@ -719,28 +719,28 @@ int CmdHFiClassDecrypt(const char *Cmd) {
 		if (!f) {
 			PrintAndLogEx(WARNING, "could not find file %s", filename);
 			return 1;
-		}		
+		}
 	} else {
 		return usage_hf_iclass_decrypt();
-	}	
+	}
 
 	fseek(f, 0, SEEK_END);
 	long fsize = ftell(f);
 	fseek(f, 0, SEEK_SET);
-		
+
 	if ( fsize < 0 ) {
 		PrintAndLogEx(WARNING, "error, when getting filesize");
 		fclose(f);
 		return 2;
 	}
-	
+
 	uint8_t *decrypted = calloc(fsize, sizeof(uint8_t));
 	if ( !decrypted ) {
 		PrintAndLogEx(WARNING, "Failed to allocate memory");
 		fclose(f);
 		return 1;
 	}
-	
+
 	size_t bytes_read = fread(decrypted, 1, fsize, f);
 	fclose(f);
 	if ( bytes_read == 0) {
@@ -750,15 +750,15 @@ int CmdHFiClassDecrypt(const char *Cmd) {
 	}
 
 	picopass_hdr *hdr = (picopass_hdr *)decrypted;
-		
+
 	uint8_t mem = hdr->conf.mem_config;
 	uint8_t chip = hdr->conf.chip_config;
 	uint8_t applimit = hdr->conf.app_limit;
 	uint8_t kb = 2;
 	uint8_t app_areas = 2;
 	uint8_t max_blk = 31;
-	getMemConfig(mem, chip, &max_blk, &app_areas, &kb);	
-	
+	getMemConfig(mem, chip, &max_blk, &app_areas, &kb);
+
 	//Use the first block (CSN) for filename
 	char outfilename[FILE_PATH_SIZE] = {0};
 	snprintf(outfilename, FILE_PATH_SIZE, "iclass_tagdump-%02x%02x%02x%02x%02x%02x%02x%02x-decrypted",
@@ -772,18 +772,18 @@ int CmdHFiClassDecrypt(const char *Cmd) {
 	uint8_t enc_dump[8] = {0};
 	uint8_t empty[8] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};
 	for(uint16_t blocknum=0; blocknum < applimit; ++blocknum) {
-		
+
 		uint8_t idx = blocknum*8;
 		memcpy(enc_dump, decrypted + idx, 8);
-		
+
 		// block 7 or higher,  and not empty 0xFF
 		if(blocknum > 6 &&  memcmp(enc_dump, empty, 8) != 0 ) {
 			mbedtls_des3_crypt_ecb(&ctx, enc_dump, decrypted + idx );
 		}
 	}
-	
+
 	saveFile(outfilename, "bin", decrypted, fsize);
-	free(decrypted);	
+	free(decrypted);
 	printIclassDumpContents(decrypted, 1, (fsize/8), fsize);
 	return 0;
 }
@@ -799,7 +799,7 @@ static int iClassEncryptBlkData(uint8_t *blkData) {
 	uint8_t *encrypted = encryptedData;
 	mbedtls_des3_context ctx;
 	mbedtls_des3_set2key_enc( &ctx, key);
-	
+
 	mbedtls_des3_crypt_ecb(&ctx, blkData,encrypted);
 	memcpy(blkData,encrypted,8);
 	return 1;
@@ -832,7 +832,7 @@ static bool select_only(uint8_t *CSN, uint8_t *CCNR, bool use_credit_key, bool v
 	UsbCommand resp;
 	UsbCommand c = {CMD_READER_ICLASS, {0}};
 	c.arg[0] = FLAG_ICLASS_READER_ONLY_ONCE | FLAG_ICLASS_READER_CC | FLAG_ICLASS_READER_ONE_TRY;
-	
+
 	if (use_credit_key)
 		c.arg[0] |= FLAG_ICLASS_READER_CEDITKEY;
 
@@ -847,20 +847,20 @@ static bool select_only(uint8_t *CSN, uint8_t *CCNR, bool use_credit_key, bool v
 	uint8_t *data = resp.d.asBytes;
 
 	memcpy(CSN, data, 8);
-	
-	if (CCNR != NULL) 
+
+	if (CCNR != NULL)
 		memcpy(CCNR, data+16, 8);
-	
+
 	if (isOK > 0 && verbose) {
 		PrintAndLogEx(SUCCESS, "CSN  | %s", sprint_hex(CSN, 8));
 		PrintAndLogEx(SUCCESS, "CCNR | %s", sprint_hex(CCNR, 8));
 	}
-	
+
 	if (isOK <= 1){
 		PrintAndLogEx(FAILED, "failed to obtain CC! Tag-select is aborting...  (%d)", isOK);
 		return false;
 	}
-	return true;	
+	return true;
 }
 
 static bool select_and_auth(uint8_t *KEY, uint8_t *MAC, uint8_t *div_key, bool use_credit_key, bool elite, bool rawkey, bool verbose) {
@@ -876,7 +876,7 @@ static bool select_and_auth(uint8_t *KEY, uint8_t *MAC, uint8_t *div_key, bool u
 		memcpy(div_key, KEY, 8);
 	else
 		HFiClassCalcDivKey(CSN, KEY, div_key, elite);
-	
+
 	if (verbose) PrintAndLogEx(SUCCESS, "authing with %s: %s", rawkey ? "raw key" : "diversified key", sprint_hex(div_key, 8) );
 
 	doMAC(CCNR, div_key, MAC);
@@ -955,7 +955,7 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
 			break;
 		case 'f':
 		case 'F':
-			fileNameLen = param_getstr(Cmd, cmdp+1, filename, sizeof(filename)); 
+			fileNameLen = param_getstr(Cmd, cmdp+1, filename, sizeof(filename));
 			if (fileNameLen < 1) {
 				PrintAndLogEx(WARNING, "no filename found after f");
 				errors = true;
@@ -966,7 +966,7 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
 		case 'K':
 			have_debit_key = true;
 			dataLen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
-			if (dataLen == 16) { 
+			if (dataLen == 16) {
 				errors = param_gethex(tempStr, 0, KEY, dataLen);
 			} else if (dataLen == 1) {
 				keyNbr = param_get8(Cmd, cmdp+1);
@@ -991,7 +991,7 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
 		case 'V':
 			verbose = true;
 			cmdp++;
-			break;				
+			break;
 		default:
 			PrintAndLogEx(WARNING, "Unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
 			errors = true;
@@ -999,16 +999,16 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
 		}
 	}
 	if (errors || cmdp < 2) return usage_hf_iclass_dump();
-	
+
 	// if no debit key given try credit key on AA1 (not for iclass but for some picopass this will work)
 	if (!have_debit_key && have_credit_key) use_credit_key = true;
 
 	uint32_t flags = FLAG_ICLASS_READER_CSN | FLAG_ICLASS_READER_CC |
 					FLAG_ICLASS_READER_CONF | FLAG_ICLASS_READER_ONLY_ONCE |
 					FLAG_ICLASS_READER_ONE_TRY;
-	
+
 	//get config and first 3 blocks
-	UsbCommand c = {CMD_READER_ICLASS, {flags, 0, 0}};					
+	UsbCommand c = {CMD_READER_ICLASS, {flags, 0, 0}};
 	UsbCommand resp;
 	uint8_t tag_data[255*8];
 
@@ -1020,7 +1020,7 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
 		return 0;
 	}
 	DropField();
-	
+
 	uint8_t readStatus = resp.arg[0] & 0xff;
 	uint8_t *data  = resp.d.asBytes;
 
@@ -1028,7 +1028,7 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
 		PrintAndLogEx(FAILED, "no tag found");
 		return 0;
 	}
-	
+
 	if( readStatus & (FLAG_ICLASS_READER_CSN | FLAG_ICLASS_READER_CONF | FLAG_ICLASS_READER_CC)){
 		memcpy(tag_data, data, 8*3);
 		blockno += 2; // 2 to force re-read of block 2 later. (seems to respond differently..)
@@ -1037,7 +1037,7 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
 		// large memory - not able to dump pages currently
 		if (numblks > maxBlk) numblks = maxBlk;
 	}
-	
+
 	// authenticate debit key and get div_key - later store in dump block 3
 	if (!select_and_auth(KEY, MAC, div_key, use_credit_key, elite, rawkey, verbose)){
 		//try twice - for some reason it sometimes fails the first time...
@@ -1048,7 +1048,7 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
 			return 0;
 		}
 	}
-	
+
 	// begin dump
 	UsbCommand w = {CMD_ICLASS_DUMP, {blockno, numblks-blockno+1}};
 	clearCommandBuffer();
@@ -1061,31 +1061,31 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
 			DropField();
 			return 0;
 		}
-		
+
 		if (WaitForResponseTimeout(CMD_ACK, &resp, 2000) )
 			break;
 	}
 	// dump cmd switch off at device when finised.
-	
+
 	uint32_t blocksRead = resp.arg[1];
 	uint8_t isOK = resp.arg[0] & 0xff;
 	if (!isOK && !blocksRead) {
 		PrintAndLogEx(WARNING, "read block failed");
 		return 0;
 	}
-	
+
 	uint32_t startindex = resp.arg[2];
 	if (blocksRead*8 > sizeof(tag_data) - (blockno*8)) {
 		PrintAndLogEx(FAILED, "data exceeded buffer size!");
 		blocksRead = (sizeof(tag_data)/8) - blockno;
 	}
-	
+
 	// response ok - now get bigbuf content of the dump
 	if ( !GetFromDevice(BIG_BUF, tag_data+(blockno*8), blocksRead*8, startindex, NULL, 2500, false) ) {
 		PrintAndLogEx(WARNING, "command execution time out");
 		return 0;
 	}
-	
+
 	size_t gotBytes = blocksRead*8 + blockno*8;
 
 	// try AA2
@@ -1118,7 +1118,7 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
 			if (!isOK && !blocksRead) {
 				PrintAndLogEx(WARNING, "read block failed 2");
 				return 0;
-			}		
+			}
 
 			startindex = resp.arg[2];
 			if (blocksRead * 8 > sizeof(tag_data) - gotBytes) {
@@ -1131,19 +1131,19 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
 				return 0;
 			}
 
-			gotBytes += blocksRead * 8;			
+			gotBytes += blocksRead * 8;
 		}
 	}
 
 	DropField();
-	
+
 	// add diversified keys to dump
 	if (have_debit_key) memcpy(tag_data+(3*8),div_key,8);
 	if (have_credit_key) memcpy(tag_data+(4*8),c_div_key,8);
 
 	// print the dump
 	PrintAndLogEx(NORMAL, "------+--+-------------------------+\n");
-	PrintAndLogEx(NORMAL, "CSN   |00| %s|\n", sprint_hex(tag_data, 8));	
+	PrintAndLogEx(NORMAL, "CSN   |00| %s|\n", sprint_hex(tag_data, 8));
 	printIclassDumpContents(tag_data, 1, (gotBytes/8), gotBytes);
 
 	if (filename[0] == 0){
@@ -1170,7 +1170,7 @@ static int WriteBlock(uint8_t blockno, uint8_t *bldata, uint8_t *KEY, bool use_c
 	UsbCommand w = {CMD_ICLASS_WRITEBLOCK, {blockno}};
 	memcpy(w.d.asBytes, bldata, 8);
 	memcpy(w.d.asBytes + 8, MAC, 4);
-	
+
 	clearCommandBuffer();
 	SendCommand(&w);
 	if (!WaitForResponseTimeout(CMD_ACK, &resp, 4500)) {
@@ -1232,7 +1232,7 @@ int CmdHFiClass_WriteBlock(const char *Cmd) {
 		case 'k':
 		case 'K':
 			dataLen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
-			if (dataLen == 16) { 
+			if (dataLen == 16) {
 				errors = param_gethex(tempStr, 0, KEY, dataLen);
 			} else if (dataLen == 1) {
 				keyNbr = param_get8(Cmd, cmdp+1);
@@ -1257,7 +1257,7 @@ int CmdHFiClass_WriteBlock(const char *Cmd) {
 		case 'V':
 			verbose = true;
 			cmdp++;
-			break;				
+			break;
 		default:
 			PrintAndLogEx(WARNING, "unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
 			errors = true;
@@ -1311,7 +1311,7 @@ int CmdHFiClassCloneTag(const char *Cmd) {
 			break;
 		case 'f':
 		case 'F':
-			fileNameLen = param_getstr(Cmd, cmdp+1, filename, sizeof(filename)); 
+			fileNameLen = param_getstr(Cmd, cmdp+1, filename, sizeof(filename));
 			if (fileNameLen < 1) {
 				PrintAndLogEx(WARNING, "No filename found after f");
 				errors = true;
@@ -1321,7 +1321,7 @@ int CmdHFiClassCloneTag(const char *Cmd) {
 		case 'k':
 		case 'K':
 			dataLen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
-			if (dataLen == 16) { 
+			if (dataLen == 16) {
 				errors = param_gethex(tempStr, 0, KEY, dataLen);
 			} else if (dataLen == 1) {
 				keyNbr = param_get8(Cmd, cmdp+1);
@@ -1354,7 +1354,7 @@ int CmdHFiClassCloneTag(const char *Cmd) {
 		case 'V':
 			verbose = true;
 			cmdp++;
-			break;	
+			break;
 		default:
 			PrintAndLogEx(WARNING, "unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
 			errors = true;
@@ -1380,7 +1380,7 @@ int CmdHFiClassCloneTag(const char *Cmd) {
 
 	if (startblock<5) {
 		PrintAndLogEx(WARNING, "you cannot write key blocks this way. yet... make your start block > 4");
-		fclose(f);	
+		fclose(f);
 		return 0;
 	}
 	// now read data from the file from block 6 --- 19
@@ -1455,7 +1455,7 @@ static int ReadBlock(uint8_t *KEY, uint8_t blockno, uint8_t keyType, bool elite,
 		PrintAndLogEx(WARNING, "Command execute timeout");
 		return 0;
 	}
-	
+
 	uint8_t isOK = resp.arg[0] & 0xff;
 	if (!isOK) {
 		PrintAndLogEx(WARNING, "read block failed");
@@ -1506,7 +1506,7 @@ int CmdHFiClass_ReadBlock(const char *Cmd) {
 		case 'K':
 			auth = true;
 			dataLen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
-			if (dataLen == 16) { 
+			if (dataLen == 16) {
 				errors = param_gethex(tempStr, 0, KEY, dataLen);
 			} else if (dataLen == 1) {
 				keyNbr = param_get8(Cmd, cmdp+1);
@@ -1531,7 +1531,7 @@ int CmdHFiClass_ReadBlock(const char *Cmd) {
 		case 'V':
 			verbose = true;
 			cmdp++;
-			break;			
+			break;
 		default:
 			PrintAndLogEx(WARNING, "unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
 			errors = true;
@@ -1550,7 +1550,7 @@ int CmdHFiClass_loclass(const char *Cmd) {
 
 	if (strlen(Cmd)<1 || opt == 'h')
 		usage_hf_iclass_loclass();
-	
+
 	char fileName[FILE_PATH_SIZE] = {0};
 	if (opt == 'f') {
 		if (param_getstr(Cmd, 1, fileName, sizeof(fileName)) > 0) {
@@ -1575,7 +1575,7 @@ void printIclassDumpContents(uint8_t *iclass_dump, uint8_t startblock, uint8_t e
 	uint8_t mem_config;
 	memcpy(&mem_config, iclass_dump + 13,1);
 	uint8_t maxmemcount;
-	
+
 	uint8_t filemaxblock = filesize / 8;
 
 	if (mem_config & 0x80)
@@ -1585,21 +1585,21 @@ void printIclassDumpContents(uint8_t *iclass_dump, uint8_t startblock, uint8_t e
 
 	if (startblock == 0)
 		startblock = 6;
-	
+
 	if ((endblock > maxmemcount) || (endblock == 0))
 		endblock = maxmemcount;
-	
+
 	// remember endblock needs to relate to zero-index arrays.
 	if (endblock > filemaxblock-1)
 		endblock = filemaxblock-1;
 
 	//PrintAndLog	("startblock: %d, endblock: %d, filesize: %d, maxmemcount: %d, filemaxblock: %d",startblock, endblock,filesize, maxmemcount, filemaxblock);
-	
+
 	int i = startblock;
 	PrintAndLogEx(NORMAL, "------+--+-------------------------+\n");
 	while (i <= endblock){
 		uint8_t *blk = iclass_dump + (i * 8);
-		PrintAndLogEx(NORMAL, "      |%02X| %s\n", i, sprint_hex_ascii(blk, 8) );	
+		PrintAndLogEx(NORMAL, "      |%02X| %s\n", i, sprint_hex_ascii(blk, 8) );
 		i++;
 	}
 	PrintAndLogEx(NORMAL, "------+--+-------------------------+\n");
@@ -1613,7 +1613,7 @@ int CmdHFiClassReadTagFile(const char *Cmd) {
 	char filename[FILE_PATH_SIZE];
 	if (param_getstr(Cmd, 0, filename, sizeof(filename)) < 1)
 		return usage_hf_iclass_readtagfile();
-	
+
 	if (param_getstr(Cmd, 1, tempnum, sizeof(tempnum)) < 1)
 		startblock = 0;
 	else
@@ -1623,7 +1623,7 @@ int CmdHFiClassReadTagFile(const char *Cmd) {
 		endblock = 0;
 	else
 		sscanf(tempnum,"%d",&endblock);
-	
+
 	// file handling and reading
 	f = fopen(filename,"rb");
 	if(!f) {
@@ -1648,7 +1648,7 @@ int CmdHFiClassReadTagFile(const char *Cmd) {
 	}
 	size_t bytes_read = fread(dump, 1, fsize, f);
 	fclose(f);
-	
+
 	uint8_t *csn = dump;
 	PrintAndLogEx(NORMAL, "------+--+-------------------------+\n");
 	PrintAndLogEx(NORMAL, "CSN   |00| %s|\n", sprint_hex(csn, 8) );
@@ -1670,10 +1670,10 @@ void HFiClassCalcDivKey(uint8_t	*CSN, uint8_t *KEY, uint8_t *div_key, bool elite
 
 		//Permute from iclass format to standard format
 		permutekey_rev(key_sel, key_sel_p);
-		diversifyKey(CSN, key_sel_p, div_key);	
+		diversifyKey(CSN, key_sel_p, div_key);
 	} else {
 		diversifyKey(CSN, KEY, div_key);
-	}		
+	}
 }
 
 //when told CSN, oldkey, newkey, if new key is elite (elite), and if old key was elite (oldElite)
@@ -1686,14 +1686,14 @@ static void HFiClassCalcNewKey(uint8_t *CSN, uint8_t *OLDKEY, uint8_t *NEWKEY, u
 	HFiClassCalcDivKey(CSN, OLDKEY, old_div_key, oldElite);
 	//get new div key
 	HFiClassCalcDivKey(CSN, NEWKEY, new_div_key, elite);
-	
+
 	for (uint8_t i = 0; i < sizeof(old_div_key); i++){
 		xor_div_key[i] = old_div_key[i] ^ new_div_key[i];
 	}
 	if (verbose) {
 		PrintAndLogEx(SUCCESS, "Old div key : %s\n",sprint_hex(old_div_key,8));
 		PrintAndLogEx(SUCCESS, "New div key : %s\n",sprint_hex(new_div_key,8));
-		PrintAndLogEx(SUCCESS, "Xor div key : %s\n",sprint_hex(xor_div_key,8));		
+		PrintAndLogEx(SUCCESS, "Xor div key : %s\n",sprint_hex(xor_div_key,8));
 	}
 }
 
@@ -1727,7 +1727,7 @@ int CmdHFiClassCalcNewKey(const char *Cmd) {
 		case 'n':
 		case 'N':
 			dataLen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
-			if (dataLen == 16) { 
+			if (dataLen == 16) {
 				errors = param_gethex(tempStr, 0, NEWKEY, dataLen);
 			} else if (dataLen == 1) {
 				keyNbr = param_get8(Cmd, cmdp+1);
@@ -1746,7 +1746,7 @@ int CmdHFiClassCalcNewKey(const char *Cmd) {
 		case 'o':
 		case 'O':
 			dataLen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
-			if (dataLen == 16) { 
+			if (dataLen == 16) {
 				errors = param_gethex(tempStr, 0, OLDKEY, dataLen);
 			} else if (dataLen == 1) {
 				keyNbr = param_get8(Cmd, cmdp+1);
@@ -1776,11 +1776,11 @@ int CmdHFiClassCalcNewKey(const char *Cmd) {
 		}
 	}
 	if (errors || cmdp < 4) return usage_hf_iclass_calc_newkey();
-		
+
 	if (!givenCSN)
 		if (!select_only(CSN, CCNR, false, true))
 			return 0;
-	
+
 	HFiClassCalcNewKey(CSN, OLDKEY, NEWKEY, xor_div_key, elite, oldElite, true);
 	return 0;
 }
@@ -1818,7 +1818,7 @@ static int loadKeys(char *filename) {
 	uint8_t i = 0;
 	for (; i < bytes_read/8; i++)
 		memcpy(iClass_Key_Table[i],dump+(i*8),8);
-	
+
 	free(dump);
 	PrintAndLogEx(SUCCESS, "%u keys loaded", i);
 	return 1;
@@ -1845,7 +1845,7 @@ static int printKeys(void) {
 	PrintAndLogEx(NORMAL, "");
 	for (uint8_t i = 0; i < ICLASS_KEYS_MAX; i++)
 		PrintAndLogEx(NORMAL, "%u: %s", i, sprint_hex(iClass_Key_Table[i],8));
-	PrintAndLogEx(NORMAL, "");	
+	PrintAndLogEx(NORMAL, "");
 	return 0;
 }
 
@@ -1867,7 +1867,7 @@ int CmdHFiClassManageKeys(const char *Cmd) {
 			return usage_hf_iclass_managekeys();
 		case 'f':
 		case 'F':
-			fileNameLen = param_getstr(Cmd, cmdp+1, filename, sizeof(filename)); 
+			fileNameLen = param_getstr(Cmd, cmdp+1, filename, sizeof(filename));
 			if (fileNameLen < 1) {
 				PrintAndLogEx(WARNING, "No filename found after f");
 				errors = true;
@@ -1885,7 +1885,7 @@ int CmdHFiClassManageKeys(const char *Cmd) {
 			break;
 		case 'k':
 		case 'K':
-			operation += 3; //set key 
+			operation += 3; //set key
 			dataLen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
 			if (dataLen == 16) { //ul-c or ev1/ntag key length
 				errors = param_gethex(tempStr, 0, KEY, dataLen);
@@ -1917,7 +1917,7 @@ int CmdHFiClassManageKeys(const char *Cmd) {
 		}
 	}
 	if (errors) return usage_hf_iclass_managekeys();
-		
+
 	if (operation == 0){
 		PrintAndLogEx(WARNING, "no operation specified (load, save, or print)\n");
 		return usage_hf_iclass_managekeys();
@@ -1945,10 +1945,10 @@ int CmdHFiClassCheckKeys(const char *Cmd) {
 
 	// empty string
 	if (strlen(Cmd) == 0) return usage_hf_iclass_chk();
-	
+
 	uint8_t CSN[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
 	uint8_t CCNR[12] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-		
+
 	// elite key,  raw key, standard key
 	bool use_elite = false;
 	bool use_raw = false;
@@ -1962,19 +1962,19 @@ int CmdHFiClassCheckKeys(const char *Cmd) {
 	char filename[FILE_PATH_SIZE] = {0};
 	uint8_t fileNameLen = 0;
 
-	uint8_t *keyBlock = NULL;	
+	uint8_t *keyBlock = NULL;
 	iclass_premac_t *pre = NULL;
 	int keycnt = 0;
-	
+
 	// time
 	uint64_t t1 = msclock();
-	
+
 	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
 		switch ( tolower(param_getchar(Cmd, cmdp))) {
 		case 'h':
 			return usage_hf_iclass_chk();
 		case 'f':
-			fileNameLen = param_getstr(Cmd, cmdp+1, filename, sizeof(filename)); 
+			fileNameLen = param_getstr(Cmd, cmdp+1, filename, sizeof(filename));
 			if (fileNameLen < 1) {
 				PrintAndLogEx(WARNING, "no filename found after f");
 				errors = true;
@@ -1987,7 +1987,7 @@ int CmdHFiClassCheckKeys(const char *Cmd) {
 			break;
 		case 'c':
 			use_credit_key = true;
-			cmdp++;			
+			cmdp++;
 			break;
 		case 'r':
 			use_raw = true;
@@ -1999,9 +1999,9 @@ int CmdHFiClassCheckKeys(const char *Cmd) {
 			break;
 		}
 	}
-	if (errors) return usage_hf_iclass_chk();	
+	if (errors) return usage_hf_iclass_chk();
+
 
-	
 	// Get CSN / UID and CCNR
 	PrintAndLogEx(SUCCESS, "Reading tag CSN");
 	for (uint8_t i=0; i<10 && !got_csn; i++) {
@@ -2011,7 +2011,7 @@ int CmdHFiClassCheckKeys(const char *Cmd) {
 			PrintAndLogEx(WARNING, "one more try\n");
 		}
 	}
-	
+
 	if ( !got_csn ) {
 		PrintAndLogEx(WARNING, "can't select card, aborting...");
 		return 1;
@@ -2023,13 +2023,13 @@ int CmdHFiClassCheckKeys(const char *Cmd) {
 		free(keyBlock);
 		return 1;
 	}
-		
+
 	pre = calloc(keycnt, sizeof(iclass_premac_t));
 	if ( !pre ) {
 		free(keyBlock);
 		return 1;
 	}
-	
+
 	PrintAndLogEx(SUCCESS, "Generating diversified keys, MAC");
 	if (use_elite)
 		PrintAndLogEx(SUCCESS, "Using elite algo");
@@ -2046,43 +2046,43 @@ int CmdHFiClassCheckKeys(const char *Cmd) {
 		free(pre);
 		return 1;
 	}
-	
+
 	//PrintPreCalcMac(keyBlock, keycnt, pre);
 
 	// max 42 keys inside USB_COMMAND.  512/4 = 103 mac
 	uint32_t chunksize = keycnt > (USB_CMD_DATA_SIZE/4) ? (USB_CMD_DATA_SIZE/4) : keycnt;
 	bool lastChunk = false;
 
-	// main keychunk loop	
+	// main keychunk loop
 	for (uint32_t i = 0; i < keycnt; i += chunksize) {
-		
+
 		uint64_t t2 = msclock();
 		uint8_t timeout = 0;
-		
+
 		if (ukbhit()) {
 			int gc = getchar(); (void)gc;
 			PrintAndLogEx(NORMAL, "\n[!] Aborted via keyboard!\n");
 			goto out;
 		}
-		
+
 		uint32_t keys = ((keycnt - i)  > chunksize) ? chunksize : keycnt - i;
-		
+
 		// last chunk?
 		if ( keys == keycnt - i)
 			lastChunk = true;
-		
+
 		UsbCommand c = {CMD_ICLASS_CHECK_KEYS, { (lastChunk << 8), keys, 0}};
-		
+
 		// bit 16
 		//   - 1 indicates credit key
 		//   - 0 indicates debit key (default)
 		c.arg[0] |= (use_credit_key << 16);
-		
+
 		memcpy(c.d.asBytes, pre + i, 4 * keys);
 		clearCommandBuffer();
 		SendCommand(&c);
 		UsbCommand resp;
-		
+
 		while ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
 			timeout++;
 			printf("."); fflush(stdout);
@@ -2092,17 +2092,17 @@ int CmdHFiClassCheckKeys(const char *Cmd) {
 			}
 		}
 
-		uint8_t found = resp.arg[1] & 0xFF;			
+		uint8_t found = resp.arg[1] & 0xFF;
 		uint8_t isOK = resp.arg[0] & 0xFF;
-		
+
 		t2 = msclock() - t2;
 		switch ( isOK ) {
 			case 1: {
 				found_debit = true;
-				
+
 				PrintAndLogEx(NORMAL, "\n[-] Chunk [%d/%d]: %.1fs [%s]  found key  %s (index %u)"
 						, i
-						, keycnt						
+						, keycnt
 						, (float)(t2/1000.0)
 						, (use_credit_key) ? "credit" : "debit"
 						, sprint_hex(keyBlock + (i+found)*8, 8)
@@ -2130,13 +2130,13 @@ int CmdHFiClassCheckKeys(const char *Cmd) {
 			break;
 		}
 
-	} // end chunks of keys	
-	
-out:	
+	} // end chunks of keys
+
+out:
 	t1 = msclock() - t1;
 
 	PrintAndLogEx(SUCCESS, "\nTime in iclass checkkeys: %.0f seconds\n", (float)t1/1000.0);
-	
+
 	DropField();
 	free(pre);
 	free(keyBlock);
@@ -2144,29 +2144,29 @@ out:
 }
 
 static int cmp_uint32( const void *a, const void *b) {
-	
+
 	const iclass_prekey_t* x = (const iclass_prekey_t *)a;
 	const iclass_prekey_t* y = (const iclass_prekey_t *)b;
-	
+
 	uint32_t mx = bytes_to_num( (uint8_t*)x->mac, 4);
 	uint32_t my = bytes_to_num( (uint8_t*)y->mac, 4);
-	
+
     if (mx < my)
 		return -1;
-    else 
+    else
 		return mx > my;
 }
 
 // this method tries to identify in which configuration mode a iClass / iClass SE reader is in.
 // Standard or Elite / HighSecurity mode.  It uses a default key dictionary list in order to work.
 int CmdHFiClassLookUp(const char *Cmd) {
-	
+
 	uint8_t CSN[8];
 	uint8_t EPURSE[8] = { 0,0,0,0,0,0,0,0 };
 	uint8_t MACS[8]= { 0,0,0,0,0,0,0,0 };
 	uint8_t CCNR[12];
 	uint8_t MAC_TAG[4] = { 0,0,0,0 };
-	
+
 	// elite key,  raw key, standard key
 	bool use_elite = false;
 	bool use_raw = false;
@@ -2176,7 +2176,7 @@ int CmdHFiClassLookUp(const char *Cmd) {
 	char filename[FILE_PATH_SIZE] = {0};
 	uint8_t fileNameLen = 0;
 
-	uint8_t *keyBlock = NULL;	
+	uint8_t *keyBlock = NULL;
 	iclass_prekey_t *prekey = NULL;
 	int keycnt = 0, len = 0;
 
@@ -2184,13 +2184,13 @@ int CmdHFiClassLookUp(const char *Cmd) {
 	if (strlen(Cmd) == 0) errors = true;
 	// time
 	uint64_t t1 = msclock();
-	
+
 	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
 		switch (tolower(param_getchar(Cmd, cmdp))) {
 		case 'h':
 			return usage_hf_iclass_lookup();
 		case 'f':
-			fileNameLen = param_getstr(Cmd, cmdp+1, filename, sizeof(filename)); 
+			fileNameLen = param_getstr(Cmd, cmdp+1, filename, sizeof(filename));
 			if (fileNameLen < 1) {
 				PrintAndLogEx(WARNING, "No filename found after f");
 				errors = true;
@@ -2203,7 +2203,7 @@ int CmdHFiClassLookUp(const char *Cmd) {
 				PrintAndLogEx(WARNING, "Wrong CSN length, expected %d got [%d]", sizeof(CSN), len>>1);
 				errors = true;
 			}
-			cmdp += 2;			
+			cmdp += 2;
 			break;
 		case 'm':
 			param_gethex_ex(Cmd, cmdp+1, MACS, &len);
@@ -2213,7 +2213,7 @@ int CmdHFiClassLookUp(const char *Cmd) {
 			} else {
 				memcpy(MAC_TAG, MACS+4, 4);
 			}
-			cmdp += 2;			
+			cmdp += 2;
 			break;
 		case 'p':
 			param_gethex_ex(Cmd, cmdp+1, EPURSE, &len);
@@ -2221,7 +2221,7 @@ int CmdHFiClassLookUp(const char *Cmd) {
 				PrintAndLogEx(WARNING, "Wrong EPURSE length, expected %d got [%d]  ", sizeof(EPURSE), len>>1);
 				errors = true;
 			}
-			cmdp += 2;			
+			cmdp += 2;
 			break;
 		break;
 		case 'e':
@@ -2239,24 +2239,24 @@ int CmdHFiClassLookUp(const char *Cmd) {
 		}
 	}
 
-	if (errors) return usage_hf_iclass_lookup();	
+	if (errors) return usage_hf_iclass_lookup();
 
 	// stupid copy.. CCNR is a combo of epurse and reader nonce
 	memcpy(CCNR, EPURSE, 8);
 	memcpy(CCNR+8, MACS, 4);
-	
+
 	PrintAndLogEx(SUCCESS, "CSN     | %s", sprint_hex( CSN, sizeof(CSN) ));
 	PrintAndLogEx(SUCCESS, "Epurse  | %s", sprint_hex( EPURSE, sizeof(EPURSE) ));
 	PrintAndLogEx(SUCCESS, "MACS    | %s", sprint_hex( MACS, sizeof(MACS) ));
 	PrintAndLogEx(SUCCESS, "CCNR    | %s", sprint_hex( CCNR, sizeof(CCNR) ));
 	PrintAndLogEx(SUCCESS, "MAC_TAG | %s", sprint_hex( MAC_TAG, sizeof(MAC_TAG) ));
-	
+
 	int res = LoadDictionaryKeyFile( filename, &keyBlock, &keycnt);
 	if ( res > 0) {
 		free(keyBlock);
 		return 1;
 	}
-	//iclass_prekey_t	
+	//iclass_prekey_t
 	prekey = calloc(keycnt, sizeof(iclass_prekey_t));
 	if ( !prekey ) {
 		free(keyBlock);
@@ -2269,22 +2269,22 @@ int CmdHFiClassLookUp(const char *Cmd) {
 		free(keyBlock);
 		free(prekey);
 		return 1;
-	}	
+	}
 
 	PrintAndLogEx(FAILED, "Sorting");
-			
+
 	// sort mac list.
 	qsort( prekey, keycnt, sizeof(iclass_prekey_t), cmp_uint32);
 
 	//PrintPreCalc(prekey, keycnt);
-	
-	PrintAndLogEx(FAILED, "Searching");	
+
+	PrintAndLogEx(FAILED, "Searching");
 	iclass_prekey_t *item;
 	iclass_prekey_t lookup;
 	memcpy(lookup.mac, MAC_TAG, 4);
-	
+
 	// binsearch
-	item = (iclass_prekey_t*) bsearch(&lookup, prekey, keycnt, sizeof(iclass_prekey_t), cmp_uint32);	
+	item = (iclass_prekey_t*) bsearch(&lookup, prekey, keycnt, sizeof(iclass_prekey_t), cmp_uint32);
 	if( item != NULL )
 		PrintAndLogEx(SUCCESS, "\n[debit] found key %s", sprint_hex(item->key, 8));
 
@@ -2292,9 +2292,9 @@ int CmdHFiClassLookUp(const char *Cmd) {
 	PrintAndLogEx(NORMAL, "\nTime in iclass : %.0f seconds\n", (float)t1/1000.0);
 	free(prekey);
 	free(keyBlock);
-	PrintAndLogEx(NORMAL, "");		
+	PrintAndLogEx(NORMAL, "");
 	return 0;
-}	
+}
 
 int LoadDictionaryKeyFile( char* filename, uint8_t **keys, int *keycnt) {
 
@@ -2302,7 +2302,7 @@ int LoadDictionaryKeyFile( char* filename, uint8_t **keys, int *keycnt) {
 	FILE * f;
 	uint8_t *p;
 	int keyitems = 0;
-	
+
 	if ( !(f = fopen( filename , "r")) ) {
 		PrintAndLogEx(FAILED, "File: " _YELLOW_(%s) ": not found or locked.", filename);
 		return 1;
@@ -2311,12 +2311,12 @@ int LoadDictionaryKeyFile( char* filename, uint8_t **keys, int *keycnt) {
 	while( fgets(buf, sizeof(buf), f) ){
 		if (strlen(buf) < 16 || buf[15] == '\n')
 			continue;
-	
+
 		//goto next line
-		while (fgetc(f) != '\n' && !feof(f)) {}; 
-		
-		//The line start with # is comment, skip		
-		if( buf[0]=='#' ) 
+		while (fgetc(f) != '\n' && !feof(f)) {};
+
+		//The line start with # is comment, skip
+		if( buf[0]=='#' )
 			continue;
 
 		// doesn't this only test first char only?
@@ -2324,7 +2324,7 @@ int LoadDictionaryKeyFile( char* filename, uint8_t **keys, int *keycnt) {
 			PrintAndLogEx(ERR, "file content error. '%s' must include 16 HEX symbols", buf);
 			continue;
 		}
-		
+
 		// null terminator (skip the rest of the line)
 		buf[16] = 0;
 
@@ -2353,15 +2353,15 @@ int GenerateMacFromKeyFile( uint8_t* CSN, uint8_t* CCNR, bool use_raw, bool use_
 
 	for ( int i=0; i < keycnt; i++) {
 
-		memcpy(key, keys + 8 * i , 8); 
-		
+		memcpy(key, keys + 8 * i , 8);
+
 		if (use_raw)
 			memcpy(div_key, key, 8);
 		else
 			HFiClassCalcDivKey(CSN, key, div_key, use_elite);
 
 		doMAC(CCNR, div_key, list[i].mac);
-	}	
+	}
 	return 0;
 }
 
@@ -2370,9 +2370,9 @@ int GenerateFromKeyFile( uint8_t* CSN, uint8_t* CCNR, bool use_raw, bool use_eli
 	uint8_t div_key[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
 
 	for ( int i=0; i < keycnt; i++) {
-				
-		memcpy(list[i].key, keys + 8 * i , 8); 
-		
+
+		memcpy(list[i].key, keys + 8 * i , 8);
+
 		// generate diversifed key
 		if (use_raw)
 			memcpy(div_key, list[i].key, 8);
@@ -2381,7 +2381,7 @@ int GenerateFromKeyFile( uint8_t* CSN, uint8_t* CCNR, bool use_raw, bool use_eli
 
 		// generate MAC
 		doMAC(CCNR, div_key, list[i].mac);
-	}	
+	}
 	return 0;
 }
 
@@ -2391,9 +2391,9 @@ void PrintPreCalcMac(uint8_t* keys, int keycnt, iclass_premac_t* pre_list) {
 	iclass_prekey_t* b =  calloc(keycnt, sizeof(iclass_prekey_t));
 	if ( !b )
 		return;
-		
-	for ( int i=0; i < keycnt; i++) {		
-		memcpy(b[i].key, keys + 8 * i , 8); 
+
+	for ( int i=0; i < keycnt; i++) {
+		memcpy(b[i].key, keys + 8 * i , 8);
 		memcpy(b[i].mac, pre_list[i].mac, 4);
 	}
 	PrintPreCalc(b, keycnt);
@@ -2406,7 +2406,7 @@ void PrintPreCalc(iclass_prekey_t* list, int itemcnt) {
 	PrintAndLogEx(NORMAL, "-----+------------------+---------");
 	for ( int i=0; i < itemcnt; i++) {
 
-		if (i < 10 ) {			
+		if (i < 10 ) {
 			PrintAndLogEx(NORMAL, "[%2d] | %016" PRIx64 " | %08" PRIx32, i, bytes_to_num(list[i].key, 8), bytes_to_num( list[i].mac, 4) );
 		} else if ( i == 10 ) {
 			PrintAndLogEx(SUCCESS, "... skip printing the rest");
@@ -2414,7 +2414,7 @@ void PrintPreCalc(iclass_prekey_t* list, int itemcnt) {
 	}
 }
 
-static void permute(uint8_t *data, uint8_t len, uint8_t *output){	
+static void permute(uint8_t *data, uint8_t len, uint8_t *output){
 #define KEY_SIZE 8
 
 	if ( len > KEY_SIZE ) {
@@ -2433,7 +2433,7 @@ static void permute(uint8_t *data, uint8_t len, uint8_t *output){
 		mask = 0x80 >> i;
 		for( j=0; j < KEY_SIZE; ++j){
 			p >>= 1;
-			if (data[j] & mask) 
+			if (data[j] & mask)
 				p |= 0x80;
 		}
 		output[i] = p;
@@ -2463,17 +2463,17 @@ static void shave(uint8_t *data, uint8_t len){
 		data[i] &= 0xFE;
 }
 static void generate_rev(uint8_t *data, uint8_t len) {
-	uint8_t *key = calloc(len, sizeof(uint8_t));	
+	uint8_t *key = calloc(len, sizeof(uint8_t));
 	PrintAndLogEx(SUCCESS, "input permuted key | %s \n", sprint_hex(data, len));
 	permute_rev(data, len, key);
 	PrintAndLogEx(SUCCESS, "    unpermuted key | %s \n", sprint_hex(key, len));
 	shave(key, len);
 	PrintAndLogEx(SUCCESS, "               key | %s \n", sprint_hex(key, len));
-	free(key);	
+	free(key);
 }
 static void generate(uint8_t *data, uint8_t len) {
 	uint8_t *key = calloc(len, sizeof(uint8_t));
-	uint8_t *pkey = calloc(len, sizeof(uint8_t));	
+	uint8_t *pkey = calloc(len, sizeof(uint8_t));
 	PrintAndLogEx(SUCCESS, "   input key | %s \n", sprint_hex(data, len));
 	permute(data, len, pkey);
 	PrintAndLogEx(SUCCESS, "permuted key | %s \n", sprint_hex(pkey, len));
@@ -2483,9 +2483,9 @@ static void generate(uint8_t *data, uint8_t len) {
 	free(pkey);
 }
 
-int CmdHFiClassPermuteKey(const char *Cmd) { 
+int CmdHFiClassPermuteKey(const char *Cmd) {
 
-	uint8_t key[8] = {0};	
+	uint8_t key[8] = {0};
 	uint8_t key_std_format[8] = {0};
 	uint8_t key_iclass_format[8] = {0};
 	uint8_t data[16] = {0};
@@ -2493,13 +2493,13 @@ int CmdHFiClassPermuteKey(const char *Cmd) {
 	int len = 0;
 	char cmdp = param_getchar(Cmd, 0);
 	if (strlen(Cmd) == 0|| cmdp == 'h' || cmdp == 'H') return usage_hf_iclass_permutekey();
-		
+
 	isReverse = ( cmdp == 'r' || cmdp == 'R' );
-	
+
 	param_gethex_ex(Cmd, 1, data, &len);
 	if ( len%2 ) return usage_hf_iclass_permutekey();
 
-	len >>= 1;	
+	len >>= 1;
 
 	memcpy(key, data, 8);
 
@@ -2510,7 +2510,7 @@ int CmdHFiClassPermuteKey(const char *Cmd) {
 	}
 	else {
 		generate(data, len);
-		permutekey(key, key_iclass_format);		
+		permutekey(key, key_iclass_format);
 		PrintAndLogEx(SUCCESS, "holiman std key | %s \n", sprint_hex(key_iclass_format, 8));
 	}
 	return 0;
diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index 41df287a9..bf61b570a 100644
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -11,7 +11,7 @@
 
 static int CmdHelp(const char *Cmd);
 
-#define MAX_LENGTH 1024	
+#define MAX_LENGTH 1024
 
 int usage_legic_calccrc(void){
 	PrintAndLogEx(NORMAL, "Calculates the legic crc8/crc16 on the given data.");
@@ -28,7 +28,7 @@ int usage_legic_calccrc(void){
 	PrintAndLogEx(NORMAL, "      hf legic crc d deadbeef1122 u 9A c 16");
 	return 0;
 }
-int usage_legic_rdmem(void){	
+int usage_legic_rdmem(void){
 	PrintAndLogEx(NORMAL, "Read data from a legic tag.");
 	PrintAndLogEx(NORMAL, "Usage:  hf legic rdmem [h] <offset> <length> <IV>");
 	PrintAndLogEx(NORMAL, "Options:");
@@ -94,7 +94,7 @@ int usage_legic_info(void){
 int usage_legic_dump(void){
 	PrintAndLogEx(NORMAL, "Reads all pages from LEGIC Prime MIM22, MIM256, MIM1024");
 	PrintAndLogEx(NORMAL, "and saves binary dump into the file `filename.bin` or `cardUID.bin`");
-	PrintAndLogEx(NORMAL, "It autodetects card type.\n");	
+	PrintAndLogEx(NORMAL, "It autodetects card type.\n");
 	PrintAndLogEx(NORMAL, "Usage:  hf legic dump [h] o <filename w/o .bin>");
 	PrintAndLogEx(NORMAL, "Options:");
 	PrintAndLogEx(NORMAL, "      h             : this help");
@@ -121,11 +121,11 @@ int usage_legic_eload(void){
 	PrintAndLogEx(NORMAL, "It loads binary dump from the file `filename.bin`");
 	PrintAndLogEx(NORMAL, "Usage:  hf legic eload [h] [card memory] <file name w/o `.bin`>");
 	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h             : this help");	
+	PrintAndLogEx(NORMAL, "      h             : this help");
 	PrintAndLogEx(NORMAL, "      [card memory] : 0 = MIM22");
 	PrintAndLogEx(NORMAL, "                    : 1 = MIM256 (default)");
 	PrintAndLogEx(NORMAL, "                    : 2 = MIM1024");
-	PrintAndLogEx(NORMAL, "      <filename>    : filename w/o .bin to load");	
+	PrintAndLogEx(NORMAL, "      <filename>    : filename w/o .bin to load");
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Examples:");
 	PrintAndLogEx(NORMAL, "      hf legic eload 2 myfile");
@@ -139,9 +139,9 @@ int usage_legic_esave(void){
 	PrintAndLogEx(NORMAL, "      [card memory] : 0 = MIM22");
 	PrintAndLogEx(NORMAL, "                    : 1 = MIM256 (default)");
 	PrintAndLogEx(NORMAL, "                    : 2 = MIM1024");
-	PrintAndLogEx(NORMAL, "      <filename>    : filename w/o .bin to load");	
+	PrintAndLogEx(NORMAL, "      <filename>    : filename w/o .bin to load");
 	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");	
+	PrintAndLogEx(NORMAL, "Examples:");
 	PrintAndLogEx(NORMAL, "      hf legic esave 2 myfile");
 	return 0;
 }
@@ -151,7 +151,7 @@ int usage_legic_wipe(void){
 	PrintAndLogEx(NORMAL, "Options:");
 	PrintAndLogEx(NORMAL, "      h             : this help");
 	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");	
+	PrintAndLogEx(NORMAL, "Examples:");
 	PrintAndLogEx(NORMAL, "      hf legic wipe");
 	return 0;
 }
@@ -181,7 +181,7 @@ int CmdLegicInfo(const char *Cmd) {
 	}
 
 	PrintAndLogEx(SUCCESS, "Reading tag memory %d b...", card.cardsize);
-	
+
 	// allocate receiver buffer
 	uint8_t *data = calloc(card.cardsize, sizeof(uint8_t));
 	 if (!data) {
@@ -195,11 +195,11 @@ int CmdLegicInfo(const char *Cmd) {
 		free(data);
 		return 3;
 	}
-	
+
 	// Output CDF System area (9 bytes) plus remaining header area (12 bytes)
 	crc = data[4];
-	uint32_t calc_crc =  CRC8Legic(data, 4);	
-	
+	uint32_t calc_crc =  CRC8Legic(data, 4);
+
 	PrintAndLogEx(NORMAL, "\nCDF: System Area");
 	PrintAndLogEx(NORMAL, "------------------------------------------------------");
 	PrintAndLogEx(NORMAL, "MCD: %02x, MSN: %02x %02x %02x, MCC: %02x %s",
@@ -210,7 +210,7 @@ int CmdLegicInfo(const char *Cmd) {
 		data[4],
 		(calc_crc == crc) ? "OK":"Fail"
 	);
- 
+
 	// MCD = Manufacturer ID (should be list meaning something?)
 
 	token_type[0] = 0;
@@ -224,7 +224,7 @@ int CmdLegicInfo(const char *Cmd) {
 			data[5],
 			data[6]
 		);
-	
+
 	} else if (dcf > 60000) {		// Master token?
 
 		int fl = 0;
@@ -303,7 +303,7 @@ int CmdLegicInfo(const char *Cmd) {
 			}
 		}
 	}
-	
+
 	uint8_t segCrcBytes[8] = {0,0,0,0,0,0,0,0};
 	uint32_t segCalcCRC = 0;
 	uint32_t segCRC = 0;
@@ -311,14 +311,14 @@ int CmdLegicInfo(const char *Cmd) {
 	// Not Data card?
 	if (dcf > 60000)
 		goto out;
-	
+
 	PrintAndLogEx(NORMAL, "\nADF: User Area");
 	PrintAndLogEx(NORMAL, "------------------------------------------------------");
 
 	if(bIsSegmented) {
 
 		// Data start point on segmented cards
-		i = 22;  
+		i = 22;
 
 		// decode segments
 		for (segmentNum=1; segmentNum < 128; segmentNum++ )
@@ -332,7 +332,7 @@ int CmdLegicInfo(const char *Cmd) {
 			bool hasWRP = (wrp > wrc);
 			int wrp_len = (wrp - wrc);
 			int remain_seg_payload_len = (segment_len - wrp - 5);
-	
+
 			// validate segment-crc
 			segCrcBytes[0]=data[0];			//uid0
 			segCrcBytes[1]=data[1];			//uid1
@@ -352,7 +352,7 @@ int CmdLegicInfo(const char *Cmd) {
 				data[i+1] ^ crc,
 				data[i+2] ^ crc,
 				data[i+3] ^ crc,
-				segment_len, 
+				segment_len,
 				segment_flag,
 				(segment_flag & 0x4) >> 2,
 				(segment_flag & 0x8) >> 3,
@@ -374,7 +374,7 @@ int CmdLegicInfo(const char *Cmd) {
 					data[k] ^= crc;
 
 				print_hex_break( data+i, wrc, 16);
-		
+
 				i += wrc;
 			}
 
@@ -385,14 +385,14 @@ int CmdLegicInfo(const char *Cmd) {
 
 				for (k=i; k < (i+wrp_len); ++k)
 					data[k] ^= crc;
-		
+
 				print_hex_break( data+i, wrp_len, 16);
-		
+
 				i += wrp_len;
-		
+
 				// does this one work? (Answer: Only if KGH/BGH is used with BCD encoded card number! So maybe this will show just garbage...)
 				if( wrp_len == 8 )
-					PrintAndLogEx(NORMAL, "Card ID: %2X%02X%02X", data[i-4]^crc, data[i-3]^crc, data[i-2]^crc);			
+					PrintAndLogEx(NORMAL, "Card ID: %2X%02X%02X", data[i-4]^crc, data[i-3]^crc, data[i-2]^crc);
 			}
 
 			PrintAndLogEx(NORMAL, "Remaining segment payload:  (I %d | K %d | Remain LEN %d)", i, k, remain_seg_payload_len);
@@ -401,19 +401,19 @@ int CmdLegicInfo(const char *Cmd) {
 
 			for ( k=i; k < (i+remain_seg_payload_len); ++k)
 				data[k] ^= crc;
-	
+
 			print_hex_break( data+i, remain_seg_payload_len, 16);
 
 			i += remain_seg_payload_len;
-	
+
 			PrintAndLogEx(NORMAL, "-----+------------------------------------------------\n");
 
 			// end with last segment
-			if (segment_flag & 0x8) 
+			if (segment_flag & 0x8)
 				goto out;
 
 		} // end for loop
-	
+
 	} else {
 
 		// Data start point on unsegmented cards
@@ -447,7 +447,7 @@ int CmdLegicInfo(const char *Cmd) {
 			PrintAndLogEx(NORMAL, "-----+------------------------------------------------");
 			print_hex_break( data + i, wrp_len, 16);
 			i += wrp_len;
-		
+
 			// does this one work? (Answer: Only if KGH/BGH is used with BCD encoded card number! So maybe this will show just garbage...)
 			if( wrp_len == 8 )
 				PrintAndLogEx(NORMAL, "Card ID: %2X%02X%02X", data[i-4], data[i-3], data[i-2]);
@@ -458,7 +458,7 @@ int CmdLegicInfo(const char *Cmd) {
 		PrintAndLogEx(NORMAL, "-----+------------------------------------------------");
 		print_hex_break( data + i, remain_seg_payload_len, 16);
 		i += remain_seg_payload_len;
-	
+
 		PrintAndLogEx(NORMAL, "-----+------------------------------------------------\n");
 	}
 
@@ -474,11 +474,11 @@ int CmdLegicRdmem(const char *Cmd) {
 
 	char cmdp = tolower(param_getchar(Cmd, 0));
 	if ( cmdp == 'h' ) return usage_legic_rdmem();
-	
+
 	uint32_t offset = 0, len = 0, iv = 1;
 	uint16_t datalen = 0;
 	sscanf(Cmd, "%x %x %x", &offset, &len, &iv);
-	
+
 	// sanity checks
 	if ( len + offset >= MAX_LENGTH ) {
 		PrintAndLogEx(WARNING, "Out-of-bounds, Cardsize = %d, [offset+len = %d ]", MAX_LENGTH, len + offset);
@@ -486,14 +486,14 @@ int CmdLegicRdmem(const char *Cmd) {
 	}
 
 	PrintAndLogEx(SUCCESS, "Reading %d bytes, from offset %d", len, offset);
-	
+
 	// allocate receiver buffer
 	uint8_t *data = calloc(len, sizeof(uint8_t));
 	if ( !data ){
 		PrintAndLogEx(WARNING, "Cannot allocate memory");
 		return -2;
 	}
-	
+
 	int status = legic_read_mem(offset, len, iv, data, &datalen);
 	if ( status == 0 ) {
 	PrintAndLogEx(NORMAL, "\n ##  |  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F");
@@ -523,7 +523,7 @@ int CmdLegicRfWrite(const char *Cmd) {
 	bool errors = false;
 	int len = 0, bg, en;
 	uint32_t offset = 0, IV = 0x55;
-	
+
 	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
 		switch (tolower(param_getchar(Cmd, cmdp))) {
 		case 'd':
@@ -542,7 +542,7 @@ int CmdLegicRfWrite(const char *Cmd) {
 				errors = true;
 				break;
 			}
-			
+
 			// limit number of bytes to write. This is not a 'restore' command.
 			if ( (len >> 1) > 100 ){
 				PrintAndLogEx(WARNING, "Max bound on 100bytes to write a one time.");
@@ -554,20 +554,20 @@ int CmdLegicRfWrite(const char *Cmd) {
 			// more than once - we have to clean previous malloc
 			if (data)
 				free(data);
-			
+
 			data = calloc(len >> 1, sizeof(uint8_t));
 			if ( data == NULL ) {
 				PrintAndLogEx(WARNING, "Can't allocate memory. exiting");
 				errors = true;
 				break;
 			}
-			
+
 			if (param_gethex(Cmd, cmdp+1, data, len)) {
 				errors = true;
 				break;
 			}
 
-			len >>= 1;	
+			len >>= 1;
 			cmdp += 2;
 			break;
 		case 'o':
@@ -585,7 +585,7 @@ int CmdLegicRfWrite(const char *Cmd) {
 	}
 	//Validations
 	if (errors || cmdp == 0){
-		if (data) 
+		if (data)
 			free(data);
 		return usage_legic_write();
 	}
@@ -598,14 +598,14 @@ int CmdLegicRfWrite(const char *Cmd) {
 	}
 
 	legic_print_type(card.cardsize, 0);
-	
+
 	// OUT-OF-BOUNDS checks
 	// UID 4+1 bytes can't be written to.
 	if ( offset < 5 ) {
 		PrintAndLogEx(WARNING, "Out-of-bounds, bytes 0-1-2-3-4 can't be written to. Offset = %d", offset);
 		return -2;
 	}
-	
+
 	if ( len + offset >= card.cardsize ) {
 		PrintAndLogEx(WARNING, "Out-of-bounds, Cardsize = %d, [offset+len = %d ]", card.cardsize, len + offset);
 		return -2;
@@ -623,17 +623,17 @@ int CmdLegicRfWrite(const char *Cmd) {
 			return 0;
 		}
 	}
-	
+
 	legic_chk_iv(&IV);
-	
+
 	PrintAndLogEx(SUCCESS, "Writing to tag");
 
 	UsbCommand c = {CMD_WRITER_LEGIC_RF, {offset, len, IV}};
-	memcpy(c.d.asBytes, data, len);	
+	memcpy(c.d.asBytes, data, len);
 	UsbCommand resp;
 	clearCommandBuffer();
 	SendCommand(&c);
-	
+
 
 	uint8_t timeout = 0;
 	while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
@@ -643,9 +643,9 @@ int CmdLegicRfWrite(const char *Cmd) {
 			PrintAndLogEx(WARNING, "\ncommand execution time out");
 			return 1;
 		}
-	}	
+	}
 	PrintAndLogEx(NORMAL, "\n");
-	
+
 	uint8_t isOK = resp.arg[0] & 0xFF;
 	if ( !isOK ) {
 		PrintAndLogEx(WARNING, "Failed writing tag");
@@ -662,7 +662,7 @@ int CmdLegicCalcCrc(const char *Cmd){
 	bool errors = false;
 	int len = 0;
 	int bg, en;
-	
+
 	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
 		switch (tolower(param_getchar(Cmd, cmdp))) {
 		case 'd':
@@ -691,13 +691,13 @@ int CmdLegicCalcCrc(const char *Cmd){
 				errors = true;
 				break;
 			}
-			
+
 			if (param_gethex(Cmd, cmdp+1, data, len)) {
 				errors = true;
 				break;
 			}
 
-			len >>= 1;	
+			len >>= 1;
 			cmdp += 2;
 			break;
 		case 'u':
@@ -722,7 +722,7 @@ int CmdLegicCalcCrc(const char *Cmd){
 		if (data) free(data);
 		return usage_legic_calccrc();
 	}
-	
+
 	switch (type){
 		case 16:
 			init_table(CRC_LEGIC);
@@ -732,20 +732,20 @@ int CmdLegicCalcCrc(const char *Cmd){
 			PrintAndLogEx(SUCCESS, "Legic crc8: %X",  CRC8Legic(data, len) );
 			break;
 	}
-	
+
 	if (data) free(data);
 	return 0;
-} 
+}
 
 int legic_read_mem(uint32_t offset, uint32_t len, uint32_t iv, uint8_t *out, uint16_t *outlen) {
-	
+
 	legic_chk_iv(&iv);
-	
+
 	UsbCommand c = {CMD_READER_LEGIC_RF, {offset, len, iv}};
 	clearCommandBuffer();
 	SendCommand(&c);
 	UsbCommand resp;
-	
+
 	uint8_t timeout = 0;
 	while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
 		++timeout;
@@ -754,19 +754,19 @@ int legic_read_mem(uint32_t offset, uint32_t len, uint32_t iv, uint8_t *out, uin
 			PrintAndLogEx(WARNING, "\ncommand execution time out");
 			return 1;
 		}
-	}	
+	}
 	PrintAndLogEx(NORMAL, "\n");
-	
+
 	uint8_t isOK = resp.arg[0] & 0xFF;
 	*outlen = resp.arg[1];
 	if ( !isOK ) {
 		PrintAndLogEx(WARNING, "Failed reading tag");
 		return 2;
 	}
-	
+
 	if ( *outlen != len )
 		PrintAndLogEx(WARNING, "Fail, only managed to read %u bytes", *outlen);
-	
+
 	// copy data from device
 	if ( !GetFromDevice( BIG_BUF_EML, out, *outlen, 0, NULL, 2500, false) ) {
 		PrintAndLogEx(WARNING, "Fail, transfer from device time-out");
@@ -780,7 +780,7 @@ int legic_print_type(uint32_t tagtype, uint8_t spaces){
 	spc[10]=0x00;
 	char *spacer = spc + (10-spaces);
 
-	if ( tagtype == 22 )	
+	if ( tagtype == 22 )
 		PrintAndLogEx(SUCCESS, "%sTYPE : MIM%d card (outdated)", spacer, tagtype);
 	else if ( tagtype == 256 )
 		PrintAndLogEx(SUCCESS, "%sTYPE : MIM%d card (234 bytes)", spacer, tagtype);
@@ -800,11 +800,11 @@ int legic_get_type(legic_card_select_t *card){
 	UsbCommand resp;
 	if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500))
 		return 2;
-	
+
 	uint8_t isOK = resp.arg[0] & 0xFF;
-	if ( !isOK ) 
+	if ( !isOK )
 		return 3;
-	
+
 	memcpy(card, (legic_card_select_t *)resp.d.asBytes, sizeof(legic_card_select_t));
 	return 0;
 }
@@ -815,20 +815,20 @@ void legic_chk_iv(uint32_t *iv){
 	}
 	// IV must be odd
 	if ( (*iv & 1) == 0 ){
-		*iv |= 0x01;  
-		PrintAndLogEx(INFO, "LSB of IV must be SET %u", *iv);	
+		*iv |= 0x01;
+		PrintAndLogEx(INFO, "LSB of IV must be SET %u", *iv);
 	}
 }
 void legic_seteml(uint8_t *src, uint32_t offset, uint32_t numofbytes) {
 	size_t len = 0;
 
-	UsbCommand c = {CMD_LEGIC_ESET, {0, 0, 0}};	
+	UsbCommand c = {CMD_LEGIC_ESET, {0, 0, 0}};
 	for(size_t i = offset; i < numofbytes; i += USB_CMD_DATA_SIZE) {
-		
-		len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);		
+
+		len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);
 		c.arg[0] = i; // offset
 		c.arg[1] = len; // number of bytes
-		memcpy(c.d.asBytes, src+i, len); 
+		memcpy(c.d.asBytes, src+i, len);
 		clearCommandBuffer();
 		SendCommand(&c);
 	}
@@ -838,15 +838,15 @@ int HFLegicReader(const char *Cmd, bool verbose) {
 
 	char cmdp = tolower(param_getchar(Cmd, 0));
 	if ( cmdp == 'h' ) return usage_legic_reader();
-	
+
 	legic_card_select_t card;
 	switch (legic_get_type(&card)){
-		case 1: 
+		case 1:
 			return 2;
-		case 2: 
-			if ( verbose ) PrintAndLogEx(WARNING, "command execution time out"); 
+		case 2:
+			if ( verbose ) PrintAndLogEx(WARNING, "command execution time out");
 			return 1;
-		case 3: 
+		case 3:
 			if ( verbose ) PrintAndLogEx(WARNING, "legic card select failed");
 			return 2;
 		default: break;
@@ -866,20 +866,20 @@ int CmdLegicDump(const char *Cmd){
 	char *fnameptr = filename;
 	size_t fileNlen = 0;
 	bool errors = false;
-	uint16_t dumplen;	
+	uint16_t dumplen;
 	uint8_t cmdp = 0;
-	
+
 	memset(filename, 0, sizeof(filename));
-	
+
 	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
 		switch (tolower(param_getchar(Cmd, cmdp))) {
 			case 'h':
 				return usage_legic_dump();
 			case 'o':
 				fileNlen = param_getstr(Cmd, cmdp+1, filename, FILE_PATH_SIZE);
-				if (!fileNlen) 
-					errors = true; 
-				if (fileNlen > FILE_PATH_SIZE-5) 
+				if (!fileNlen)
+					errors = true;
+				if (fileNlen > FILE_PATH_SIZE-5)
 					fileNlen = FILE_PATH_SIZE-5;
 				cmdp += 2;
 				break;
@@ -891,7 +891,7 @@ int CmdLegicDump(const char *Cmd){
 	}
 	//Validations
 	if (errors) return usage_legic_dump();
-	
+
 	// tagtype
 	legic_card_select_t card;
 	if (legic_get_type(&card)) {
@@ -899,8 +899,8 @@ int CmdLegicDump(const char *Cmd){
 		return -1;
 	}
 	dumplen = card.cardsize;
-	
-	legic_print_type(dumplen, 0);	
+
+	legic_print_type(dumplen, 0);
 	PrintAndLogEx(SUCCESS, "Reading tag memory %d b...", dumplen);
 
 	UsbCommand c = {CMD_READER_LEGIC_RF, {0x00, dumplen, 0x55}};
@@ -916,9 +916,9 @@ int CmdLegicDump(const char *Cmd){
 			PrintAndLogEx(WARNING, "\ncommand execution time out");
 			return 1;
 		}
-	}	
+	}
 	PrintAndLogEx(NORMAL, "\n");
-		
+
 	uint8_t isOK = resp.arg[0] & 0xFF;
 	if ( !isOK ) {
 		PrintAndLogEx(WARNING, "Failed dumping tag data");
@@ -931,7 +931,7 @@ int CmdLegicDump(const char *Cmd){
 		PrintAndLogEx(WARNING, "Fail, cannot allocate memory");
 		return 3;
 	}
-	
+
 	if ( readlen != dumplen )
 		PrintAndLogEx(WARNING, "Fail, only managed to read 0x%02X bytes of 0x%02X", readlen, dumplen);
 
@@ -949,7 +949,7 @@ int CmdLegicDump(const char *Cmd){
 		sprintf(fnameptr + fileNlen,".bin");
 
 	f = fopen(filename, "wb");
-	if (!f) { 
+	if (!f) {
 		PrintAndLogEx(WARNING, "Could not create file name %s", filename);
 		if (data)
 			free(data);
@@ -961,7 +961,7 @@ int CmdLegicDump(const char *Cmd){
 	free(data);
 	PrintAndLogEx(SUCCESS, "Wrote %d bytes to %s", readlen, filename);
 	return 0;
-}	
+}
 
 int CmdLegicRestore(const char *Cmd){
 
@@ -970,11 +970,11 @@ int CmdLegicRestore(const char *Cmd){
 	char *fnameptr = filename;
 	size_t fileNlen = 0;
 	bool errors = false;
-	uint16_t numofbytes;	
+	uint16_t numofbytes;
 	uint8_t cmdp = 0;
-	
+
 	memset(filename, 0, sizeof(filename));
-	
+
 	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
 		switch (tolower(param_getchar(Cmd, cmdp))) {
 			case 'h':
@@ -982,12 +982,12 @@ int CmdLegicRestore(const char *Cmd){
 				break;
 			case 'i':
 				fileNlen = param_getstr(Cmd, cmdp+1, filename, FILE_PATH_SIZE);
-				if (!fileNlen) 
+				if (!fileNlen)
 					errors = true;
-				
-				if (fileNlen > FILE_PATH_SIZE-5) 
+
+				if (fileNlen > FILE_PATH_SIZE-5)
 					fileNlen = FILE_PATH_SIZE-5;
-				cmdp += 2;				
+				cmdp += 2;
 				break;
 			default:
 				PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
@@ -997,23 +997,23 @@ int CmdLegicRestore(const char *Cmd){
 	}
 	//Validations
 	if (errors || cmdp == 0) return usage_legic_restore();
-	
+
 	// tagtype
 	legic_card_select_t card;
 	if (legic_get_type(&card)) {
 		PrintAndLogEx(WARNING, "Failed to identify tagtype");
 		return 1;
 	}
-	numofbytes = card.cardsize;	
-	
+	numofbytes = card.cardsize;
+
 	// set up buffer
 	uint8_t *data = calloc(numofbytes, sizeof(uint8_t) );
 	if (!data) {
 		PrintAndLogEx(WARNING, "Fail, cannot allocate memory");
-		return 2;		
+		return 2;
 	}
-	
-	legic_print_type(numofbytes, 0);	
+
+	legic_print_type(numofbytes, 0);
 
 	// set up file
 	fnameptr += fileNlen;
@@ -1024,13 +1024,13 @@ int CmdLegicRestore(const char *Cmd){
 		PrintAndLogEx(WARNING, "File %s not found or locked", filename);
 		free(data);
 		return 3;
-	}	
-	
-	// verify size of dumpfile is the same as card.	
+	}
+
+	// verify size of dumpfile is the same as card.
 	fseek(f, 0, SEEK_END); // seek to end of file
 	size_t filesize = ftell(f); // get current file pointer
 	fseek(f, 0, SEEK_SET); // seek back to beginning of file
-	
+
 	if ( filesize != numofbytes) {
 		PrintAndLogEx(WARNING, "Fail, filesize and cardsize is not equal. [%u != %u]", filesize, numofbytes);
 		free(data);
@@ -1041,13 +1041,13 @@ int CmdLegicRestore(const char *Cmd){
 	// load file
 	size_t bytes_read = fread(data, 1, numofbytes, f);
 	fclose(f);
-	
+
 	if ( bytes_read == 0){
 		PrintAndLogEx(WARNING, "File reading error");
 		free(data);
 		return 2;
 	}
-	
+
 	PrintAndLogEx(SUCCESS, "Restoring to card");
 
 	// transfer to device
@@ -1055,36 +1055,36 @@ int CmdLegicRestore(const char *Cmd){
 	UsbCommand c = {CMD_WRITER_LEGIC_RF, {0, 0, 0x55}};
 	UsbCommand resp;
 	for(size_t i = 7; i < numofbytes; i += USB_CMD_DATA_SIZE) {
-		
-		len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);		
+
+		len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);
 		c.arg[0] = i; // offset
 		c.arg[1] = len; // number of bytes
-		memcpy(c.d.asBytes, data+i, len); 
+		memcpy(c.d.asBytes, data+i, len);
 		clearCommandBuffer();
 		SendCommand(&c);
-	
+
 		uint8_t timeout = 0;
 		while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
 			++timeout;
 			printf("."); fflush(stdout);
 			if (timeout > 7) {
 				PrintAndLogEx(WARNING, "\ncommand execution time out");
-				free(data);	
+				free(data);
 				return 1;
 			}
-		}	
+		}
 		PrintAndLogEx(NORMAL, "\n");
-		
+
 		uint8_t isOK = resp.arg[0] & 0xFF;
 		if ( !isOK ) {
 			PrintAndLogEx(WARNING, "Failed writing tag [msg = %u]", resp.arg[1] & 0xFF);
-			free(data);	
+			free(data);
 			return 1;
 		}
 		PrintAndLogEx(SUCCESS, "Wrote chunk [offset %d | len %d | total %d", i, len, i+len);
-	}	
-	
-	free(data);	
+	}
+
+	free(data);
 	PrintAndLogEx(SUCCESS, "\nWrote %d bytes to card from file %s", numofbytes, filename);
 	return 0;
 }
@@ -1095,14 +1095,14 @@ int CmdLegicELoad(const char *Cmd) {
 	char *fnameptr = filename;
 	int len, numofbytes;
 	int nameParamNo = 1;
-	
+
 	char cmdp = tolower(param_getchar(Cmd, 0));
 	if ( cmdp == 'h' || cmdp == 0x00)
 		return usage_legic_eload();
 
 	switch (cmdp) {
 		case '0' : numofbytes = 22; break;
-		case '1' : 
+		case '1' :
 		case '\0': numofbytes = 256; break;
 		case '2' : numofbytes = 1024; break;
 		default  : numofbytes = 256;  nameParamNo = 0;break;
@@ -1112,19 +1112,19 @@ int CmdLegicELoad(const char *Cmd) {
 	uint8_t *data = calloc(numofbytes, sizeof(uint8_t));
 	if (!data) {
 		PrintAndLogEx(WARNING, "Fail, cannot allocate memory");
-		return 3;		
+		return 3;
 	}
-	
+
 	// set up file
 	len = param_getstr(Cmd, nameParamNo, filename, FILE_PATH_SIZE);
-	if (len > FILE_PATH_SIZE - 5) 
+	if (len > FILE_PATH_SIZE - 5)
 		len = FILE_PATH_SIZE - 5;
 	fnameptr += len;
 	sprintf(fnameptr, ".bin");
-	
+
 	// open file
 	f = fopen(filename,"rb");
-	if (!f) { 
+	if (!f) {
 		PrintAndLogEx(WARNING, "File %s not found or locked", filename);
 		free(data);
 		return 1;
@@ -1136,16 +1136,16 @@ int CmdLegicELoad(const char *Cmd) {
 		PrintAndLogEx(WARNING, "File reading error");
 		free(data);
 		fclose(f);
-		f = NULL;		
+		f = NULL;
 		return 2;
 	}
 	fclose(f);
 	f = NULL;
-	
+
 	// transfer to device
 	legic_seteml(data, 0, numofbytes);
-		
-	free(data);	
+
+	free(data);
 	PrintAndLogEx(SUCCESS, "\nLoaded %d bytes from file: %s  to emulator memory", numofbytes, filename);
 	return 0;
 }
@@ -1155,48 +1155,48 @@ int CmdLegicESave(const char *Cmd) {
 	char filename[FILE_PATH_SIZE];
 	char *fnameptr = filename;
 	int fileNlen, numofbytes, nameParamNo = 1;
-	
+
 	memset(filename, 0, sizeof(filename));
 
 	char cmdp = tolower(param_getchar(Cmd, 0));
-	
+
 	if ( cmdp == 'h' || cmdp == 0x00)
 		return usage_legic_esave();
 
 	switch (cmdp) {
 		case '0' : numofbytes = 22; break;
-		case '1' : 
+		case '1' :
 		case '\0': numofbytes = 256; break;
 		case '2' : numofbytes = 1024; break;
 		default  : numofbytes = 256; nameParamNo = 0; break;
 	}
 
 	fileNlen = param_getstr(Cmd, nameParamNo, filename, FILE_PATH_SIZE);
-	
-	if (fileNlen > FILE_PATH_SIZE - 5) 
+
+	if (fileNlen > FILE_PATH_SIZE - 5)
 		fileNlen = FILE_PATH_SIZE - 5;
 
 	// set up buffer
 	uint8_t *data = calloc(numofbytes, sizeof(uint8_t));
 	if (!data) {
 		PrintAndLogEx(WARNING, "Fail, cannot allocate memory");
-		return 3;		
+		return 3;
 	}
-		
+
 	// download emulator memory
-	PrintAndLogEx(SUCCESS, "Reading emulator memory...");	
+	PrintAndLogEx(SUCCESS, "Reading emulator memory...");
 	if (!GetFromDevice( BIG_BUF_EML, data, numofbytes, 0, NULL, 2500, false)) {
 		PrintAndLogEx(WARNING, "Fail, transfer from device time-out");
 		free(data);
 		return 4;
 	}
 	// user supplied filename?
-	if (fileNlen < 1)		
+	if (fileNlen < 1)
 		sprintf(fnameptr,"%02X%02X%02X%02X.bin", data[0], data[1], data[2], data[3]);
 	else
 		sprintf(fnameptr + fileNlen,".bin");
-	
-	saveFileEML(filename, "eml", data, numofbytes, 8);	
+
+	saveFileEML(filename, "eml", data, numofbytes, 8);
 	saveFile(filename, "bin", data, numofbytes);
 	return 0;
 }
@@ -1204,57 +1204,57 @@ int CmdLegicESave(const char *Cmd) {
 int CmdLegicWipe(const char *Cmd){
 
 	char cmdp = tolower(param_getchar(Cmd, 0));
-	
+
 	if ( cmdp == 'h') return usage_legic_wipe();
-	
+
 	// tagtype
 	legic_card_select_t card;
 	if (legic_get_type(&card)) {
 		PrintAndLogEx(WARNING, "Failed to identify tagtype");
 		return 1;
 	}
-	
+
 	// set up buffer
 	uint8_t *data = calloc(card.cardsize, sizeof(uint8_t));
 	if (!data) {
 		PrintAndLogEx(WARNING, "Fail, cannot allocate memory");
-		return 2;		
+		return 2;
 	}
-	
+
 	legic_print_type(card.cardsize, 0);
 
 	PrintAndLogEx(SUCCESS, "Erasing");
-	
+
 	// transfer to device
 	size_t len = 0;
 	UsbCommand c = {CMD_WRITER_LEGIC_RF, {0, 0, 0x55}};
 	UsbCommand resp;
 	for(size_t i = 7; i < card.cardsize; i += USB_CMD_DATA_SIZE) {
-		
+
 		printf("."); fflush(stdout);
-		len = MIN((card.cardsize - i), USB_CMD_DATA_SIZE);		
+		len = MIN((card.cardsize - i), USB_CMD_DATA_SIZE);
 		c.arg[0] = i; // offset
 		c.arg[1] = len; // number of bytes
-		memcpy(c.d.asBytes, data+i, len); 
+		memcpy(c.d.asBytes, data+i, len);
 		clearCommandBuffer();
 		SendCommand(&c);
-	
+
 		uint8_t timeout = 0;
 		while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
 			++timeout;
 			printf("."); fflush(stdout);
 			if (timeout > 7) {
 				PrintAndLogEx(WARNING, "\ncommand execution time out");
-				free(data);					
+				free(data);
 				return 3;
 			}
-		}	
-		PrintAndLogEx(NORMAL, "\n");		
+		}
+		PrintAndLogEx(NORMAL, "\n");
 
 		uint8_t isOK = resp.arg[0] & 0xFF;
 		if ( !isOK ) {
 			PrintAndLogEx(WARNING, "Failed writing tag [msg = %u]", resp.arg[1] & 0xFF);
-			free(data);	
+			free(data);
 			return 4;
 		}
 	}
@@ -1276,7 +1276,7 @@ static command_t CommandTable[] =  {
 	{"rdmem",	CmdLegicRdmem,		0, "Read bytes from a LEGIC Prime tag"},
 	{"sim",		CmdLegicRfSim,		0, "Start tag simulator"},
 	{"write",	CmdLegicRfWrite,	0, "Write data to a LEGIC Prime tag"},
-	{"crc",		CmdLegicCalcCrc,	1, "Calculate Legic CRC over given bytes"},	
+	{"crc",		CmdLegicCalcCrc,	1, "Calculate Legic CRC over given bytes"},
 	{"eload",	CmdLegicELoad,		1, "Load binary dump to emulator memory"},
 	{"esave",	CmdLegicESave,		1, "Save emulator memory to binary file"},
 	{"list",	CmdLegicList,		1, "[Deprecated] List LEGIC history"},
diff --git a/client/cmdhflist.c b/client/cmdhflist.c
index faed275cd..f605008c5 100644
--- a/client/cmdhflist.c
+++ b/client/cmdhflist.c
@@ -103,7 +103,7 @@ uint8_t iclass_CRC_check(bool isResponse, uint8_t* d, uint8_t n) {
 			return check_crc( CRC_ICLASS, d+1, n-1);
 		}
 		return 2;
-	} 
+	}
 	/**
 	These tag responses should have CRC. Total length leftmost
 
@@ -154,12 +154,12 @@ int applyIso14443a(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize) {
 		case ISO14443A_CMD_REQA:		snprintf(exp,size,"REQA"); break;
 		case ISO14443A_CMD_READBLOCK:	snprintf(exp,size,"READBLOCK(%d)",cmd[1]); break;
 		case ISO14443A_CMD_WRITEBLOCK:	snprintf(exp,size,"WRITEBLOCK(%d)",cmd[1]); break;
-		case ISO14443A_CMD_HALT:		
-			snprintf(exp,size,"HALT"); 
+		case ISO14443A_CMD_HALT:
+			snprintf(exp,size,"HALT");
 			MifareAuthState = masNone;
 			break;
 		case ISO14443A_CMD_RATS:		snprintf(exp,size,"RATS"); break;
-		case ISO14443A_CMD_OPTS:        snprintf(exp,size,"OPTIONAL TIMESLOT"); break;		
+		case ISO14443A_CMD_OPTS:        snprintf(exp,size,"OPTIONAL TIMESLOT"); break;
 		case MIFARE_CMD_INC:			snprintf(exp,size,"INC(%d)",cmd[1]); break;
 		case MIFARE_CMD_DEC:			snprintf(exp,size,"DEC(%d)",cmd[1]); break;
 		case MIFARE_CMD_RESTORE:		snprintf(exp,size,"RESTORE(%d)",cmd[1]); break;
@@ -176,7 +176,7 @@ int applyIso14443a(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize) {
 		}
 		case MIFARE_AUTH_KEYB: {
 			MifareAuthState = masNt;
-			snprintf(exp,size,"AUTH-B(%d)",cmd[1]); 
+			snprintf(exp,size,"AUTH-B(%d)",cmd[1]);
 			break;
 		}
 		case MIFARE_MAGICWUPC1:			snprintf(exp,size,"MAGIC WUPC1"); break;
@@ -184,7 +184,7 @@ int applyIso14443a(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize) {
 		case MIFARE_MAGICWIPEC:			snprintf(exp,size,"MAGIC WIPEC"); break;
 		case MIFARE_ULC_AUTH_1 :		snprintf(exp,size,"AUTH "); break;
 		case MIFARE_ULC_AUTH_2 : 		snprintf(exp,size,"AUTH_ANSW"); break;
-		case MIFARE_ULEV1_AUTH :	
+		case MIFARE_ULEV1_AUTH :
 			if ( cmdsize == 7 )
 				snprintf(exp,size,"PWD-AUTH KEY: 0x%02x%02x%02x%02x", cmd[1], cmd[2], cmd[3], cmd[4] );
 			else
@@ -192,18 +192,18 @@ int applyIso14443a(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize) {
 			break;
 		case MIFARE_ULEV1_FASTREAD : {
 			if ( cmdsize >=3 && cmd[2] <= 0xE6)
-				snprintf(exp,size,"READ RANGE (%d-%d)",cmd[1],cmd[2]); 
+				snprintf(exp,size,"READ RANGE (%d-%d)",cmd[1],cmd[2]);
 			else
 				// outside limits, useful for some tags...
-				snprintf(exp,size,"READ RANGE (%d-%d) (?)",cmd[1], cmd[2]); 
+				snprintf(exp,size,"READ RANGE (%d-%d) (?)",cmd[1], cmd[2]);
 			break;
 		}
 		case MIFARE_ULC_WRITE : {
 			if ( cmd[1] < 0x21 )
-				snprintf(exp,size,"WRITEBLOCK(%d)",cmd[1]); 
+				snprintf(exp,size,"WRITEBLOCK(%d)",cmd[1]);
 			else
-				// outside limits, useful for some tags...				
-				snprintf(exp, size, "WRITEBLOCK(%d) (?)", cmd[1]); 
+				// outside limits, useful for some tags...
+				snprintf(exp, size, "WRITEBLOCK(%d) (?)", cmd[1]);
 			break;
 		}
 		case MIFARE_ULEV1_READ_CNT :{
@@ -278,9 +278,9 @@ void annotateIso15693(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize) {
 		default: break;
 	}
 
-	if ( cmd[1] >= 0x2D && cmd[1] <= 0x9F ) snprintf(exp, size, "Optional RFU"); 
-	else if ( cmd[1] >= 0xA0 && cmd[1] <= 0xDF ) snprintf(exp, size, "Cust IC MFG dependent"); 
-	else if ( cmd[1] >= 0xE0 && cmd[1] <= 0xFF ) snprintf(exp, size, "Proprietary IC MFG dependent"); 
+	if ( cmd[1] >= 0x2D && cmd[1] <= 0x9F ) snprintf(exp, size, "Optional RFU");
+	else if ( cmd[1] >= 0xA0 && cmd[1] <= 0xDF ) snprintf(exp, size, "Cust IC MFG dependent");
+	else if ( cmd[1] >= 0xE0 && cmd[1] <= 0xFF ) snprintf(exp, size, "Proprietary IC MFG dependent");
 	else
 		snprintf(exp, size, "?");
 }
@@ -302,10 +302,10 @@ void annotateTopaz(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
 	}
 }
 
-// iso 7816-3 
+// iso 7816-3
 void annotateIso7816(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
 	// S-block
-	if ( (cmd[0] & 0xC0) && (cmdsize == 3) ) {		
+	if ( (cmd[0] & 0xC0) && (cmdsize == 3) ) {
 		switch ( (cmd[0] & 0x3f)  ) {
 			case 0x00 	: snprintf(exp, size, "S-block RESYNCH req"); break;
 			case 0x20 	: snprintf(exp, size, "S-block RESYNCH resp"); break;
@@ -316,11 +316,11 @@ void annotateIso7816(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
 			case 0x03	: snprintf(exp, size, "S-block WTX reqt"); break;
 			case 0x23	: snprintf(exp, size, "S-block WTX resp"); break;
 			default		: snprintf(exp, size, "S-block"); break;
-		}		
+		}
 	}
 	// R-block (ack)
 	else if ( ((cmd[0] & 0xD0) == 0x80) && ( cmdsize > 2) ) {
-		if ( (cmd[0] & 0x10) == 0 ) 
+		if ( (cmd[0] & 0x10) == 0 )
 			snprintf(exp, size, "R-block ACK");
 		else
 			snprintf(exp, size, "R-block NACK");
@@ -365,20 +365,20 @@ void annotateIso7816(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
 
 // MIFARE DESFire
 void annotateMfDesfire(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
-	
+
 	// it's basically a ISO14443a tag, so try annotation from there
 	if (!applyIso14443a(exp, size, cmd, cmdsize)){
 		// S-block 11xxx010
-		if ( (cmd[0] & 0xC0) && (cmdsize == 3) ) {		
+		if ( (cmd[0] & 0xC0) && (cmdsize == 3) ) {
 			switch ( (cmd[0] & 0x30)  ) {
 				case 0x30	: snprintf(exp, size, "S-block DESELECT"); break;
 				case 0x00	: snprintf(exp, size, "S-block WTX"); break;
 				default		: snprintf(exp, size, "S-block"); break;
-			}		
+			}
 		}
 		// R-block (ack) 101xx01x
 		else if ( ((cmd[0] & 0xB0) == 0xA0) && ( cmdsize > 2) ) {
-			if ( (cmd[0] & 0x10) == 0 ) 
+			if ( (cmd[0] & 0x10) == 0 )
 				snprintf(exp, size, "R-block ACK(%d)", (cmd[0] & 0x01));
 			else
 				snprintf(exp, size, "R-block NACK(%d)", (cmd[0] & 0x01));
@@ -450,14 +450,14 @@ void annotateMfDesfire(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
 void annotateIso14443b(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize) {
 	switch(cmd[0]){
 		case ISO14443B_REQB   		: {
-			
+
 			switch ( cmd[2] & 0x07 ) {
 				case 0: snprintf(exp, size,"1 slot ");break;
-				case 1: snprintf(exp, size,"2 slots ");break; 
+				case 1: snprintf(exp, size,"2 slots ");break;
 				case 2: snprintf(exp, size,"4 slots ");break;
 				case 3: snprintf(exp, size,"8 slots ");break;
 				default: snprintf(exp, size,"16 slots ");break;
-			}			
+			}
 			if ( (cmd[2] & 0x8) )
 				snprintf(exp, size,"WUPB");
 			else
@@ -480,12 +480,12 @@ void annotateIso14443b(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize) {
 	}
 }
 
-// LEGIC 
+// LEGIC
 // 1 = read
 // 0 = write
 // Quite simpel tag
-void annotateLegic(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){	
-	uint8_t bitsend = cmd[0];	
+void annotateLegic(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
+	uint8_t bitsend = cmd[0];
 	uint8_t cmdBit = (cmd[1] & 1);
 	switch (bitsend){
 		case 7:
@@ -505,11 +505,11 @@ void annotateLegic(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
 		case 11: {
 
 			uint16_t address = (cmd[2] << 7) | cmd[1] >> 1;
-			
-			if (cmdBit == LEGIC_READ) 
+
+			if (cmdBit == LEGIC_READ)
 				snprintf(exp, size, "READ Byte(%d)", address);
-			
-			if (cmdBit == LEGIC_WRITE ) 
+
+			if (cmdBit == LEGIC_WRITE )
 				snprintf(exp, size, "WRITE Byte(%d)", address);
 			break;
 		}
@@ -535,7 +535,7 @@ void annotateLegic(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
 	}
 }
 
-void annotateFelica(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){	
+void annotateFelica(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
 
 	switch(cmd[0]){
 		case FELICA_POLL_REQ: snprintf(exp,size ,"POLLING");break;
@@ -547,7 +547,7 @@ void annotateFelica(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
 		case FELICA_RDBLK_REQ: snprintf(exp,size ,"READ BLK");break;
 		case FELICA_RDBLK_ACK: snprintf(exp,size ,"READ BLK ACK");break;
 		case FELICA_WRTBLK_REQ:	snprintf(exp,size ,"WRITE BLK");break;
-		case FELICA_WRTBLK_ACK: snprintf(exp,size ,"WRITE BLK ACK");break;		
+		case FELICA_WRTBLK_ACK: snprintf(exp,size ,"WRITE BLK ACK");break;
 		case FELICA_SRCHSYSCODE_REQ: snprintf(exp,size ,"SEARCH SERVICE CODE");break;
 		case FELICA_SRCHSYSCODE_ACK: snprintf(exp,size ,"SSC ACK");break;
 		case FELICA_REQSYSCODE_REQ: snprintf(exp,size ,"REQUEST SYSTEM CODE");break;
@@ -555,11 +555,11 @@ void annotateFelica(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
 		case FELICA_AUTH1_REQ: snprintf(exp,size ,"AUTH 1");break;
 		case FELICA_AUTH1_ACK: snprintf(exp,size ,"AUTH 1 ACK");break;
 		case FELICA_AUTH2_REQ: snprintf(exp,size ,"AUTH 2");break;
-		case FELICA_AUTH2_ACK: snprintf(exp,size ,"AUTH 2 ACK");break;		
+		case FELICA_AUTH2_ACK: snprintf(exp,size ,"AUTH 2 ACK");break;
 		case FELICA_RDSEC_REQ: snprintf(exp,size ,"READ");break;
 		case FELICA_RDSEC_ACK: snprintf(exp,size ,"READ ACK");break;
 		case FELICA_WRTSEC_REQ: snprintf(exp,size ,"WRITE");break;
-		case FELICA_WRTSEC_ACK: snprintf(exp,size ,"WRITE ACK");break;	
+		case FELICA_WRTSEC_ACK: snprintf(exp,size ,"WRITE ACK");break;
 		case FELICA_REQSRV2_REQ: snprintf(exp,size ,"REQUEST SERVICE v2");break;
 		case FELICA_REQSRV2_ACK: snprintf(exp,size ,"REQ SERV v2 ACK");break;
 		case FELICA_GETSTATUS_REQ: snprintf(exp,size ,"GET STATUS");break;
@@ -567,17 +567,17 @@ void annotateFelica(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
 		case FELICA_OSVER_REQ: snprintf(exp,size ,"REQUEST SPECIFIC VERSION");break;
 		case FELICA_OSVER_ACK: snprintf(exp,size ,"RSV ACK");break;
 		case FELICA_RESET_MODE_REQ: snprintf(exp,size ,"RESET MODE");break;
-		case FELICA_RESET_MODE_ACK: snprintf(exp,size ,"RESET MODE ACK");break;		
+		case FELICA_RESET_MODE_ACK: snprintf(exp,size ,"RESET MODE ACK");break;
 		case FELICA_AUTH1V2_REQ: snprintf(exp,size ,"AUTH 1 v2");break;
 		case FELICA_AUTH1V2_ACK: snprintf(exp,size ,"AUTH 1 v2 ACK");break;
 		case FELICA_AUTH2V2_REQ: snprintf(exp,size ,"AUTH 2 v2");break;
-		case FELICA_AUTH2V2_ACK: snprintf(exp,size ,"AUTH 2 v2 ACK");break;		
+		case FELICA_AUTH2V2_ACK: snprintf(exp,size ,"AUTH 2 v2 ACK");break;
 		case FELICA_RDSECV2_REQ: snprintf(exp,size ,"READ v2");break;
 		case FELICA_RDSECV2_ACK: snprintf(exp,size ,"READ v2 ACK");break;
 		case FELICA_WRTSECV2_REQ: snprintf(exp,size ,"WRITE v2");break;
-		case FELICA_WRTSECV2_ACK: snprintf(exp,size ,"WRITE v2 ACK");break;		
+		case FELICA_WRTSECV2_ACK: snprintf(exp,size ,"WRITE v2 ACK");break;
 		case FELICA_UPDATE_RNDID_REQ: snprintf(exp,size ,"UPDATE RANDOM ID");break;
-		case FELICA_UPDATE_RNDID_ACK: snprintf(exp,size ,"URI ACK");break;		
+		case FELICA_UPDATE_RNDID_ACK: snprintf(exp,size ,"URI ACK");break;
 		default                     : snprintf(exp,size ,"?");break;
 	}
 }
@@ -585,15 +585,15 @@ void annotateFelica(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
 void annotateMifare(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize, uint8_t* parity, uint8_t paritysize, bool isResponse) {
 	if (!isResponse && cmdsize == 1) {
 		switch(cmd[0]) {
-			case ISO14443A_CMD_WUPA:        
-			case ISO14443A_CMD_REQA:		
+			case ISO14443A_CMD_WUPA:
+			case ISO14443A_CMD_REQA:
 				MifareAuthState = masNone;
 				break;
 			default:
 				break;
 		}
 	}
-	
+
 	// get UID
 	if (MifareAuthState == masNone) {
 		if (cmdsize == 9 && cmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT && cmd[1] == 0x70) {
@@ -609,7 +609,7 @@ void annotateMifare(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize, uint8
 			AuthData.uid = bytes_to_num(&cmd[2], 4);
 		}
 	}
-	
+
 	switch(MifareAuthState) {
 		case masNt:
 			if (cmdsize == 4 && isResponse) {
@@ -652,18 +652,18 @@ void annotateMifare(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize, uint8
 		default:
 			break;
 	}
-	
+
 	if (!isResponse && ((MifareAuthState == masNone) || (MifareAuthState == masError)))
 		annotateIso14443a(exp, size, cmd, cmdsize);
-	
+
 }
 
 bool DecodeMifareData(uint8_t *cmd, uint8_t cmdsize, uint8_t *parity, bool isResponse, uint8_t *mfData, size_t *mfDataLen) {
-	static struct Crypto1State *traceCrypto1;	
+	static struct Crypto1State *traceCrypto1;
 	static uint64_t mfLastKey;
-	
+
 	*mfDataLen = 0;
-	
+
 	if (MifareAuthState == masAuthComplete) {
 		if (traceCrypto1) {
 			crypto1_destroy(traceCrypto1);
@@ -673,21 +673,21 @@ bool DecodeMifareData(uint8_t *cmd, uint8_t cmdsize, uint8_t *parity, bool isRes
 		MifareAuthState = masFirstData;
 		return false;
 	}
-	
+
 	if (cmdsize > 32)
 		return false;
-	
+
 	if (MifareAuthState == masFirstData) {
 		if (AuthData.first_auth) {
 			AuthData.ks2 = AuthData.ar_enc ^ prng_successor(AuthData.nt, 64);
 			AuthData.ks3 = AuthData.at_enc ^ prng_successor(AuthData.nt, 96);
 
 			mfLastKey = GetCrypto1ProbableKey(&AuthData);
-			PrintAndLogEx(NORMAL, "            |            |  *  |%49s %012"PRIx64" prng %s |     |", 
-				"key", 
+			PrintAndLogEx(NORMAL, "            |            |  *  |%49s %012"PRIx64" prng %s |     |",
+				"key",
 				mfLastKey,
 				validate_prng_nonce(AuthData.nt) ? _GREEN_(WEAK): _YELLOW_(HARD));
-			
+
 			AuthData.first_auth = false;
 
 			traceCrypto1 = lfsr_recovery64(AuthData.ks2, AuthData.ks3);
@@ -704,7 +704,7 @@ bool DecodeMifareData(uint8_t *cmd, uint8_t cmdsize, uint8_t *parity, bool isRes
 					traceCrypto1 = lfsr_recovery64(AuthData.ks2, AuthData.ks3);
 				};
 			}
-			
+
 			// check default keys
 			if (!traceCrypto1) {
 				for (int i = 0; i < MIFARE_DEFAULTKEYS_SIZE; i++){
@@ -717,10 +717,10 @@ bool DecodeMifareData(uint8_t *cmd, uint8_t cmdsize, uint8_t *parity, bool isRes
 					};
 				}
 			}
-			
+
 			// nested
 			if (!traceCrypto1 && validate_prng_nonce(AuthData.nt)) {
-				uint32_t ntx = prng_successor(AuthData.nt, 90); 
+				uint32_t ntx = prng_successor(AuthData.nt, 90);
 				for (int i = 0; i < 16383; i++) {
 					ntx = prng_successor(ntx, 1);
 					if (NTParityChk(&AuthData, ntx)){
@@ -729,15 +729,15 @@ bool DecodeMifareData(uint8_t *cmd, uint8_t cmdsize, uint8_t *parity, bool isRes
 						uint32_t ks3 = AuthData.at_enc ^ prng_successor(ntx, 96);
 						struct Crypto1State *pcs = lfsr_recovery64(ks2, ks3);
 						memcpy(mfData, cmd, cmdsize);
-						mf_crypto1_decrypt(pcs, mfData, cmdsize, 0);				
+						mf_crypto1_decrypt(pcs, mfData, cmdsize, 0);
 						crypto1_destroy(pcs);
-						
+
 						if (CheckCrypto1Parity(cmd, cmdsize, mfData, parity) && check_crc(CRC_14443_A, mfData, cmdsize)) {
 							AuthData.ks2 = ks2;
 							AuthData.ks3 = ks3;
 							AuthData.nt = ntx;
 							mfLastKey = GetCrypto1ProbableKey(&AuthData);
-							PrintAndLogEx(NORMAL, "            |            |  *  | nested probable key:%012"PRIx64"      ks2:%08x ks3:%08x |     |", 
+							PrintAndLogEx(NORMAL, "            |            |  *  | nested probable key:%012"PRIx64"      ks2:%08x ks3:%08x |     |",
 								mfLastKey,
 								AuthData.ks2,
 								AuthData.ks3);
@@ -745,10 +745,10 @@ bool DecodeMifareData(uint8_t *cmd, uint8_t cmdsize, uint8_t *parity, bool isRes
 							traceCrypto1 = lfsr_recovery64(AuthData.ks2, AuthData.ks3);
 							break;
 						}
-					}						
+					}
 				}
 			}
-			
+
 			//hardnested
 			if (!traceCrypto1) {
 				PrintAndLogEx(NORMAL, "hardnested not implemented. uid:%x nt:%x ar_enc:%x at_enc:%x\n", AuthData.uid, AuthData.nt, AuthData.ar_enc, AuthData.at_enc);
@@ -780,13 +780,13 @@ bool DecodeMifareData(uint8_t *cmd, uint8_t cmdsize, uint8_t *parity, bool isRes
 		}
 		MifareAuthState = masData;
 	}
-	
+
 	if (MifareAuthState == masData && traceCrypto1) {
 		memcpy(mfData, cmd, cmdsize);
 		mf_crypto1_decrypt(traceCrypto1, mfData, cmdsize, 0);
 		*mfDataLen = cmdsize;
 	}
-	
+
 	return *mfDataLen > 0;
 }
 
@@ -797,7 +797,7 @@ bool NTParityChk(TAuthData *ad, uint32_t ntx) {
 		(oddparity8(ntx >> 24 & 0xff) ^ (ntx >> 16 & 0x01) ^ ((ad->nt_enc_par >> 7) & 0x01) ^ (ad->nt_enc >> 16 & 0x01))
 		)
 		return false;
-	
+
 	uint32_t ar = prng_successor(ntx, 64);
 	if (
 		(oddparity8(ar >> 8 & 0xff) ^ (ar & 0x01) ^ ((ad->ar_enc_par >> 5) & 0x01) ^ (ad->ar_enc & 0x01)) ||
@@ -814,14 +814,14 @@ bool NTParityChk(TAuthData *ad, uint32_t ntx) {
 		(oddparity8(at >> 24 & 0xff) ^ (at >> 16 & 0x01) ^ ((ad->at_enc_par >> 7) & 0x01) ^ (ad->at_enc >> 16 & 0x01))
 		)
 		return false;
-		
+
 	return true;
 }
 
 bool NestedCheckKey(uint64_t key, TAuthData *ad, uint8_t *cmd, uint8_t cmdsize, uint8_t *parity) {
 	uint8_t buf[32] = {0};
 	struct Crypto1State *pcs;
-	
+
 	AuthData.ks2 = 0;
 	AuthData.ks3 = 0;
 
@@ -843,13 +843,13 @@ bool NestedCheckKey(uint64_t key, TAuthData *ad, uint8_t *cmd, uint8_t cmdsize,
 	memcpy(buf, cmd, cmdsize);
 	mf_crypto1_decrypt(pcs, buf, cmdsize, 0);
 	crypto1_destroy(pcs);
-	
+
 	if (!CheckCrypto1Parity(cmd, cmdsize, buf, parity))
 		return false;
 
-	if (!check_crc(CRC_14443_A, buf, cmdsize)) 
+	if (!check_crc(CRC_14443_A, buf, cmdsize))
 		return false;
-	
+
 	AuthData.nt = nt1;
 	AuthData.ks2 = AuthData.ar_enc ^ ar;
 	AuthData.ks3 = AuthData.at_enc ^ at;
@@ -865,7 +865,7 @@ bool CheckCrypto1Parity(uint8_t *cmd_enc, uint8_t cmdsize, uint8_t *cmd, uint8_t
 }
 
 // Another implementation of mfkey64 attack,  more "valid" than "probable"
-// 
+//
 uint64_t GetCrypto1ProbableKey(TAuthData *ad) {
 	struct Crypto1State *revstate = lfsr_recovery64(ad->ks2, ad->ks3);
 	lfsr_rollback_word(revstate, 0, 0);
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index da027aad6..fa1f13102 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -17,7 +17,7 @@
 #define MFBLOCK_SIZE 16
 
 #define MIFARE_4K_MAXBLOCK 256
-#define MIFARE_2K_MAXBLOCK 128 
+#define MIFARE_2K_MAXBLOCK 128
 #define MIFARE_1K_MAXBLOCK 64
 #define MIFARE_MINI_MAXBLOCK 20
 
@@ -77,14 +77,14 @@ int usage_hf14_mf1ksim(void){
 	PrintAndLogEx(NORMAL, "Examples:");
 	PrintAndLogEx(NORMAL, "           hf mf sim u 0a0a0a0a");
 	PrintAndLogEx(NORMAL, "           hf mf sim u 11223344556677");
-	PrintAndLogEx(NORMAL, "           hf mf sim u 112233445566778899AA");	
-	PrintAndLogEx(NORMAL, "           hf mf sim u 11223344 i x");	
+	PrintAndLogEx(NORMAL, "           hf mf sim u 112233445566778899AA");
+	PrintAndLogEx(NORMAL, "           hf mf sim u 11223344 i x");
 	return 0;
 }
 int usage_hf14_dbg(void){
 	PrintAndLogEx(NORMAL, "Usage:  hf mf dbg [h] <debug level>");
 	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "           h    this help");	
+	PrintAndLogEx(NORMAL, "           h    this help");
 	PrintAndLogEx(NORMAL, "       <debug level>  (Optional) see list for valid levels");
 	PrintAndLogEx(NORMAL, "           0 - no debug messages");
 	PrintAndLogEx(NORMAL, "           1 - error messages");
@@ -134,7 +134,7 @@ int usage_hf14_hardnested(void){
 	PrintAndLogEx(NORMAL, "  or  hf mf hardnested r [known target key]");
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h         this help");	
+	PrintAndLogEx(NORMAL, "      h         this help");
 	PrintAndLogEx(NORMAL, "      w         acquire nonces and UID, and write them to binary file with default name hf-mf-<UID>-nonces.bin");
 	PrintAndLogEx(NORMAL, "      s         slower acquisition (required by some non standard cards)");
 	PrintAndLogEx(NORMAL, "      r         read hf-mf-<UID>-nonces.bin if tag present, otherwise read nonces.bin, then start attack");
@@ -147,7 +147,7 @@ int usage_hf14_hardnested(void){
 	PrintAndLogEx(NORMAL, "        i a   = AVX");
 	PrintAndLogEx(NORMAL, "        i s   = SSE2");
 	PrintAndLogEx(NORMAL, "        i m   = MMX");
-	PrintAndLogEx(NORMAL, "        i n   = none (use CPU regular instruction set)");	
+	PrintAndLogEx(NORMAL, "        i n   = none (use CPU regular instruction set)");
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Examples:");
 	PrintAndLogEx(NORMAL, "      hf mf hardnested 0 A FFFFFFFFFFFF 4 A");
@@ -163,7 +163,7 @@ int usage_hf14_hardnested(void){
 int usage_hf14_chk(void){
 	PrintAndLogEx(NORMAL, "Usage:  hf mf chk [h] <block number>|<*card memory> <key type (A/B/?)> [t|d] [<key (12 hex symbols)>] [<dic (*.dic)>]");
 	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h    this help");	
+	PrintAndLogEx(NORMAL, "      h    this help");
 	PrintAndLogEx(NORMAL, "      *    all sectors based on card memory, other values then below defaults to 1k");
 	PrintAndLogEx(NORMAL, "      			0 - MINI(320 bytes)");
 	PrintAndLogEx(NORMAL, "      			1 - 1K");
@@ -182,7 +182,7 @@ int usage_hf14_chk_fast(void){
 	PrintAndLogEx(NORMAL, "This is a improved checkkeys method speedwise. It checks Mifare Classic tags sector keys against a dictionary file with keys");
 	PrintAndLogEx(NORMAL, "Usage:  hf mf fchk [h] <card memory> [t|d|f] [<key (12 hex symbols)>] [<dic (*.dic)>]");
 	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h    this help");	
+	PrintAndLogEx(NORMAL, "      h    this help");
 	PrintAndLogEx(NORMAL, "      <cardmem> all sectors based on card memory, other values than below defaults to 1k");
 	PrintAndLogEx(NORMAL, "      			 0 - MINI(320 bytes)");
 	PrintAndLogEx(NORMAL, "      			 1 - 1K   <default>");
@@ -204,7 +204,7 @@ int usage_hf14_chk_fast(void){
 int usage_hf14_keybrute(void){
 	PrintAndLogEx(NORMAL, "J_Run's 2nd phase of multiple sector nested authentication key recovery");
 	PrintAndLogEx(NORMAL, "You have a known 4 last bytes of a key recovered with mf_nonce_brute tool.");
-	PrintAndLogEx(NORMAL, "First 2 bytes of key will be bruteforced");	
+	PrintAndLogEx(NORMAL, "First 2 bytes of key will be bruteforced");
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, " ---[ This attack is obsolete,  try hardnested instead ]---");
 	PrintAndLogEx(NORMAL, "");
@@ -262,7 +262,7 @@ int usage_hf14_eclr(void){
 int usage_hf14_eset(void){
 	PrintAndLogEx(NORMAL, "Usage:  hf mf eset <block number> <block data (32 hex symbols)>");
 	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        hf mf eset 1 000102030405060708090a0b0c0d0e0f ");	
+	PrintAndLogEx(NORMAL, "        hf mf eset 1 000102030405060708090a0b0c0d0e0f ");
 	return 0;
 }
 int usage_hf14_eload(void){
@@ -272,7 +272,7 @@ int usage_hf14_eload(void){
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Examples:");
 	PrintAndLogEx(NORMAL, "        hf mf eload filename");
-	PrintAndLogEx(NORMAL, "        hf mf eload 4 filename");	
+	PrintAndLogEx(NORMAL, "        hf mf eload 4 filename");
 	return 0;
 }
 int usage_hf14_esave(void){
@@ -283,7 +283,7 @@ int usage_hf14_esave(void){
 	PrintAndLogEx(NORMAL, "Examples:");
 	PrintAndLogEx(NORMAL, "        hf mf esave ");
 	PrintAndLogEx(NORMAL, "        hf mf esave 4");
-	PrintAndLogEx(NORMAL, "        hf mf esave 4 filename");	
+	PrintAndLogEx(NORMAL, "        hf mf esave 4 filename");
 	return 0;
 }
 int usage_hf14_ecfill(void){
@@ -303,7 +303,7 @@ int usage_hf14_ekeyprn(void){
 	PrintAndLogEx(NORMAL, "  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        hf mf ekeyprn 1");	
+	PrintAndLogEx(NORMAL, "        hf mf ekeyprn 1");
 	return 0;
 }
 
@@ -324,7 +324,7 @@ int usage_hf14_csetuid(void){
 }
 int usage_hf14_csetblk(void){
 	PrintAndLogEx(NORMAL, "Set block data for magic Chinese card. Only works with magic cards");
-	PrintAndLogEx(NORMAL, "");		
+	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Usage:  hf mf csetblk [h] <block number> <block data (32 hex symbols)> [w]");
 	PrintAndLogEx(NORMAL, "Options:");
 	PrintAndLogEx(NORMAL, "       h         this help");
@@ -349,7 +349,7 @@ int usage_hf14_cload(void){
 	PrintAndLogEx(NORMAL, "       <filename>   load card with data from eml file");
 	PrintAndLogEx(NORMAL, "Examples:");
 	PrintAndLogEx(NORMAL, "       hf mf cload mydump");
-	PrintAndLogEx(NORMAL, "       hf mf cload e");	
+	PrintAndLogEx(NORMAL, "       hf mf cload e");
 	return 0;
 }
 int usage_hf14_cgetblk(void){
@@ -358,9 +358,9 @@ int usage_hf14_cgetblk(void){
 	PrintAndLogEx(NORMAL, "Usage:  hf mf cgetblk [h] <block number>");
 	PrintAndLogEx(NORMAL, "Options:");
 	PrintAndLogEx(NORMAL, "      h         this help");
-	PrintAndLogEx(NORMAL, "      <block>   block number");		
+	PrintAndLogEx(NORMAL, "      <block>   block number");
 	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      hf mf cgetblk 1");	
+	PrintAndLogEx(NORMAL, "      hf mf cgetblk 1");
 	return 0;
 }
 int usage_hf14_cgetsc(void){
@@ -382,7 +382,7 @@ int usage_hf14_csave(void){
 	PrintAndLogEx(NORMAL, "Options:");
 	PrintAndLogEx(NORMAL, "       h             this help");
 	PrintAndLogEx(NORMAL, "       e             save data to emulator memory");
-	PrintAndLogEx(NORMAL, "       u             save data to file, use carduid as filename");	
+	PrintAndLogEx(NORMAL, "       u             save data to file, use carduid as filename");
 	PrintAndLogEx(NORMAL, "       card memory   0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");
 	PrintAndLogEx(NORMAL, "       o <filename>  save data to file");
 	PrintAndLogEx(NORMAL, "");
@@ -394,7 +394,7 @@ int usage_hf14_csave(void){
 }
 int usage_hf14_nack(void) {
 	PrintAndLogEx(NORMAL, "Test a mifare classic based card for the NACK bug.");
-	PrintAndLogEx(NORMAL, "");	
+	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Usage:  hf mf nack [h] [v]");
 	PrintAndLogEx(NORMAL, "Options:");
 	PrintAndLogEx(NORMAL, "       h             this help");
@@ -414,7 +414,7 @@ int GetHFMF14AUID(uint8_t *uid, int *uidlen) {
 		DropField();
 		return 0;
 	}
-	
+
 	iso14a_card_select_t card;
 	memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
 	memcpy(uid, card.uid, card.uidlen * sizeof(uint8_t));
@@ -426,15 +426,15 @@ char * GenerateFilename(const char *prefix, const char *suffix){
 	uint8_t uid[10] = {0,0,0,0,0,0,0,0,0,0};
 	int uidlen=0;
 	char * fptr = calloc (sizeof (char) * (strlen(prefix) + strlen(suffix)) + sizeof(uid)*2 + 1,  sizeof(uint8_t));
-	
+
 	GetHFMF14AUID(uid, &uidlen);
 	if (!uidlen) {
 		PrintAndLogEx(WARNING, "No tag found.");
 		free(fptr);
 		return NULL;
 	}
-	
-	strcpy(fptr, prefix);	
+
+	strcpy(fptr, prefix);
 	FillFileNameByUID(fptr, uid, suffix, uidlen);
 	return fptr;
 }
@@ -442,12 +442,12 @@ char * GenerateFilename(const char *prefix, const char *suffix){
 int CmdHF14AMfDarkside(const char *Cmd) {
 	uint8_t blockno = 0, key_type = MIFARE_AUTH_KEYA;
 	uint64_t key = 0;
-	
-	char cmdp = tolower(param_getchar(Cmd, 0));	
+
+	char cmdp = tolower(param_getchar(Cmd, 0));
 	if ( cmdp == 'h' ) return usage_hf14_mifare();
-	
-	blockno = param_get8(Cmd, 0);	 
-	
+
+	blockno = param_get8(Cmd, 0);
+
 	cmdp = tolower(param_getchar(Cmd, 1));
 	if (cmdp == 'b')
 		key_type = MIFARE_AUTH_KEYB;
@@ -479,7 +479,7 @@ int CmdHF14AMfWrBl(const char *Cmd) {
 		PrintAndLogEx(NORMAL, "Examples:");
 		PrintAndLogEx(NORMAL, "        hf mf wrbl 0 A FFFFFFFFFFFF 000102030405060708090A0B0C0D0E0F");
 		return 0;
-	}	
+	}
 
 	blockNo = param_get8(Cmd, 0);
 	cmdp = tolower(param_getchar(Cmd, 1));
@@ -487,23 +487,23 @@ int CmdHF14AMfWrBl(const char *Cmd) {
 		PrintAndLogEx(NORMAL, "Key type must be A or B");
 		return 1;
 	}
-	
-	if (cmdp != 'a') 
+
+	if (cmdp != 'a')
 		keyType = 1;
-	
+
 	if (param_gethex(Cmd, 2, key, 12)) {
 		PrintAndLogEx(NORMAL, "Key must include 12 HEX symbols");
 		return 1;
 	}
-	
+
 	if (param_gethex(Cmd, 3, bldata, 32)) {
 		PrintAndLogEx(NORMAL, "Block data must include 32 HEX symbols");
 		return 1;
 	}
-	
+
 	PrintAndLogEx(NORMAL, "--block no:%d, key type:%c, key:%s", blockNo, keyType?'B':'A', sprint_hex(key, 6));
 	PrintAndLogEx(NORMAL, "--data: %s", sprint_hex(bldata, 16));
-	
+
 	UsbCommand c = {CMD_MIFARE_WRITEBL, {blockNo, keyType, 0}};
 	memcpy(c.d.asBytes, key, 6);
 	memcpy(c.d.asBytes + 10, bldata, 16);
@@ -532,24 +532,24 @@ int CmdHF14AMfRdBl(const char *Cmd) {
 		PrintAndLogEx(NORMAL, "Examples:");
 		PrintAndLogEx(NORMAL, "        hf mf rdbl 0 A FFFFFFFFFFFF ");
 		return 0;
-	}	
-	
+	}
+
 	blockNo = param_get8(Cmd, 0);
 	cmdp = tolower(param_getchar(Cmd, 1));
 	if (cmdp == 0x00) {
 		PrintAndLogEx(NORMAL, "Key type must be A or B");
 		return 1;
 	}
-	
-	if (cmdp != 'a') 
+
+	if (cmdp != 'a')
 		keyType = 1;
-	
+
 	if (param_gethex(Cmd, 2, key, 12)) {
 		PrintAndLogEx(NORMAL, "Key must include 12 HEX symbols");
 		return 1;
 	}
 	PrintAndLogEx(NORMAL, "--block no:%d, key type:%c, key:%s ", blockNo, keyType?'B':'A', sprint_hex(key, 6));
-	
+
 	UsbCommand c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}};
 	memcpy(c.d.asBytes, key, 6);
 	clearCommandBuffer();
@@ -581,7 +581,7 @@ int CmdHF14AMfRdBl(const char *Cmd) {
 		PrintAndLogEx(WARNING, "Command execute timeout");
 		return 2;
 	}
-	
+
   return 0;
 }
 
@@ -599,29 +599,29 @@ int CmdHF14AMfRdSc(const char *Cmd) {
 		PrintAndLogEx(NORMAL, "Examples:");
 		PrintAndLogEx(NORMAL, "        hf mf rdsc 0 A FFFFFFFFFFFF ");
 		return 0;
-	}	
-	
+	}
+
 	sectorNo = param_get8(Cmd, 0);
 	if (sectorNo > MIFARE_4K_MAXSECTOR ) {
 		PrintAndLogEx(NORMAL, "Sector number must be less than 40");
 		return 1;
 	}
-	
+
 	cmdp = tolower(param_getchar(Cmd, 1));
 	if (cmdp != 'a' && cmdp != 'b') {
 		PrintAndLogEx(NORMAL, "Key type must be A or B");
 		return 1;
 	}
-	
-	if (cmdp != 'a') 
+
+	if (cmdp != 'a')
 		keyType = 1;
-	
+
 	if (param_gethex(Cmd, 2, key, 12)) {
 		PrintAndLogEx(NORMAL, "Key must include 12 HEX symbols");
 		return 1;
 	}
 	PrintAndLogEx(NORMAL, "--sector no:%d key type:%c key:%s ", sectorNo, keyType?'B':'A', sprint_hex(key, 6));
-	
+
 	UsbCommand c = {CMD_MIFARE_READSC, {sectorNo, keyType, 0}};
 	memcpy(c.d.asBytes, key, 6);
 	clearCommandBuffer();
@@ -639,7 +639,7 @@ int CmdHF14AMfRdSc(const char *Cmd) {
 				PrintAndLogEx(NORMAL, "data   : %s", sprint_hex(data + i * 16, 16));
 			}
 			PrintAndLogEx(NORMAL, "trailer: %s", sprint_hex(data + (sectorNo<32?3:15) * 16, 16));
-					
+
 			PrintAndLogEx(NORMAL, "Trailer decoded:");
             int bln = mfFirstBlockOfSector(sectorNo);
 			int blinc = (mfNumBlocksPerSector(sectorNo) > 4) ? 5 : 1;
@@ -667,10 +667,10 @@ uint16_t NumOfBlocks(char card){
 }
 uint8_t NumOfSectors(char card){
 	switch(card){
-		case '0' : return MIFARE_MINI_MAXSECTOR; 
-		case '1' : return MIFARE_1K_MAXSECTOR; 
-		case '2' : return MIFARE_2K_MAXSECTOR; 
-		case '4' : return MIFARE_4K_MAXSECTOR; 
+		case '0' : return MIFARE_MINI_MAXSECTOR;
+		case '1' : return MIFARE_1K_MAXSECTOR;
+		case '2' : return MIFARE_2K_MAXSECTOR;
+		case '4' : return MIFARE_4K_MAXSECTOR;
 		default  : return MIFARE_1K_MAXSECTOR;
 	}
 }
@@ -700,27 +700,27 @@ int CmdHF14AMfDump(const char *Cmd) {
 	uint8_t carddata[256][16];
 	uint8_t numSectors = 16;
 	uint8_t cmdp = 0;
-	
+
 	char keyFilename[FILE_PATH_SIZE] = {0};
 	char dataFilename[FILE_PATH_SIZE];
 	char * fptr;
-	
+
 	memset(keyFilename, 0, sizeof(keyFilename));
 	memset(dataFilename, 0, sizeof(dataFilename));
-	
-	FILE *f;	
+
+	FILE *f;
 	UsbCommand resp;
-	
+
 	while(param_getchar(Cmd, cmdp) != 0x00) {
 		switch (tolower(param_getchar(Cmd, cmdp))) {
 		case 'h':
 			return usage_hf14_dump();
 		case 'k':
-			param_getstr(Cmd, cmdp+1, keyFilename, FILE_PATH_SIZE); 
+			param_getstr(Cmd, cmdp+1, keyFilename, FILE_PATH_SIZE);
 			cmdp += 2;
 			break;
 		case 'f':
-			param_getstr(Cmd, cmdp+1, dataFilename, FILE_PATH_SIZE); 
+			param_getstr(Cmd, cmdp+1, dataFilename, FILE_PATH_SIZE);
 			cmdp += 2;
 			break;
 		default:
@@ -736,9 +736,9 @@ int CmdHF14AMfDump(const char *Cmd) {
 
 	if ( keyFilename[0] == 0x00 ) {
 		fptr = GenerateFilename("hf-mf-", "-key.bin");
-		if (fptr == NULL) 
+		if (fptr == NULL)
 			return 1;
-		
+
 		strcpy(keyFilename, fptr);
 	}
 
@@ -746,7 +746,7 @@ int CmdHF14AMfDump(const char *Cmd) {
 		PrintAndLogEx(WARNING, "Could not find file " _YELLOW_(%s), keyFilename);
 		return 1;
 	}
-	
+
 	// Read keys A from file
 	size_t bytes_read;
 	for (sectorNo=0; sectorNo<numSectors; sectorNo++) {
@@ -757,7 +757,7 @@ int CmdHF14AMfDump(const char *Cmd) {
 			return 2;
 		}
 	}
-	
+
 	// Read keys B from file
 	for (sectorNo=0; sectorNo<numSectors; sectorNo++) {
 		bytes_read = fread( keyB[sectorNo], 1, 6, f );
@@ -767,16 +767,16 @@ int CmdHF14AMfDump(const char *Cmd) {
 			return 2;
 		}
 	}
-	
+
 	fclose(f);
-			
+
 
 	PrintAndLogEx(INFO, "Reading sector access bits...");
 
 	uint8_t tries = 0;
 	for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
 		for (tries = 0; tries < MIFARE_SECTOR_RETRY; tries++) {
-		
+
 			UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 0, 0}};
 			memcpy(c.d.asBytes, keyA[sectorNo], 6);
 			clearCommandBuffer();
@@ -803,17 +803,17 @@ int CmdHF14AMfDump(const char *Cmd) {
 			}
 		}
 	}
-	
+
 	PrintAndLogEx(SUCCESS, "Finished reading sector access bits");
 	PrintAndLogEx(INFO, "Dumping all blocks from card...");
-	
+
 	bool isOK = true;
 	for (sectorNo = 0; isOK && sectorNo < numSectors; sectorNo++) {
 		for (blockNo = 0; isOK && blockNo < NumBlocksPerSector(sectorNo); blockNo++) {
 			bool received = false;
-			
-			for (tries = 0; tries < MIFARE_SECTOR_RETRY; tries++) {			
-				if (blockNo == NumBlocksPerSector(sectorNo) - 1) {		// sector trailer. At least the Access Conditions can always be read with key A. 
+
+			for (tries = 0; tries < MIFARE_SECTOR_RETRY; tries++) {
+				if (blockNo == NumBlocksPerSector(sectorNo) - 1) {		// sector trailer. At least the Access Conditions can always be read with key A.
 					UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}};
 					memcpy(c.d.asBytes, keyA[sectorNo], 6);
 					clearCommandBuffer();
@@ -877,13 +877,13 @@ int CmdHF14AMfDump(const char *Cmd) {
 		}
 	}
 
-	if (isOK == 0) { 
+	if (isOK == 0) {
 		PrintAndLogEx(FAILED, "Something went wrong");
 		return 0;
 	}
 
 	PrintAndLogEx(SUCCESS, "\nSuccedded in dumping all blocks");
-	
+
 	if ( strlen(dataFilename) < 1 ) {
 		fptr = dataFilename;
 		fptr += sprintf(fptr, "hf-mf-");
@@ -891,7 +891,7 @@ int CmdHF14AMfDump(const char *Cmd) {
 	}
 
 	uint16_t bytes = 16*(FirstBlockOfSector(numSectors - 1) + NumBlocksPerSector(numSectors - 1));
-	
+
 	saveFile(dataFilename, "bin", (uint8_t *)carddata, bytes);
 	saveFileEML(dataFilename, "eml", (uint8_t *)carddata, bytes, MFBLOCK_SIZE);
 	saveFileJSON(dataFilename, "json", jsfCardMemory, (uint8_t *)carddata, bytes);
@@ -907,9 +907,9 @@ int CmdHF14AMfRestore(const char *Cmd) {
 	uint8_t keyB[40][6];
 	uint8_t numSectors = 16;
 	uint8_t cmdp = 0;
-	char keyFilename[FILE_PATH_SIZE] = "";	
+	char keyFilename[FILE_PATH_SIZE] = "";
 	char dataFilename[FILE_PATH_SIZE] = "";
-	char szTemp[FILE_PATH_SIZE-20] = "";	
+	char szTemp[FILE_PATH_SIZE-20] = "";
 	char *fptr;
 	FILE *fdump, *fkeys;
 
@@ -918,7 +918,7 @@ int CmdHF14AMfRestore(const char *Cmd) {
 		case 'h':
 			return usage_hf14_restore();
 		case 'u':
-			param_getstr(Cmd, cmdp+1, szTemp, FILE_PATH_SIZE-20); 
+			param_getstr(Cmd, cmdp+1, szTemp, FILE_PATH_SIZE-20);
 			if(keyFilename[0]==0x00)
 				snprintf(keyFilename, FILE_PATH_SIZE, "hf-mf-%s-key.bin", szTemp);
 			if(dataFilename[0]==0x00)
@@ -926,11 +926,11 @@ int CmdHF14AMfRestore(const char *Cmd) {
 			cmdp+=2;
 			break;
 		case 'k':
-			param_getstr(Cmd, cmdp+1, keyFilename, FILE_PATH_SIZE); 
+			param_getstr(Cmd, cmdp+1, keyFilename, FILE_PATH_SIZE);
 			cmdp += 2;
 			break;
 		case 'f':
-			param_getstr(Cmd, cmdp+1, dataFilename, FILE_PATH_SIZE); 
+			param_getstr(Cmd, cmdp+1, dataFilename, FILE_PATH_SIZE);
 			cmdp += 2;
 			break;
 		default:
@@ -946,9 +946,9 @@ int CmdHF14AMfRestore(const char *Cmd) {
 
 	if ( keyFilename[0] == 0x00 ) {
 		fptr = GenerateFilename("hf-mf-", "-key.bin");
-		if (fptr == NULL) 
+		if (fptr == NULL)
 			return 1;
-		
+
 		strcpy(keyFilename, fptr);
 	}
 
@@ -956,7 +956,7 @@ int CmdHF14AMfRestore(const char *Cmd) {
 		PrintAndLogEx(WARNING, "Could not find file " _YELLOW_(%s), keyFilename);
 		return 1;
 	}
-	
+
 	size_t bytes_read;
 	for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
 		bytes_read = fread( keyA[sectorNo], 1, 6, fkeys );
@@ -980,30 +980,30 @@ int CmdHF14AMfRestore(const char *Cmd) {
 
 	if ( dataFilename[0] == 0x00 ) {
 		fptr = GenerateFilename("hf-mf-", "-data.bin");
-		if (fptr == NULL) 
+		if (fptr == NULL)
 			return 1;
-		
+
 		strcpy(dataFilename,fptr);
 	}
 
 	if ((fdump = fopen(dataFilename, "rb")) == NULL) {
 		PrintAndLogEx(WARNING, "Could not find file " _YELLOW_(%s), dataFilename);
 		return 1;
-	}	
+	}
 	PrintAndLogEx(INFO, "Restoring " _YELLOW_(%s)" to card", dataFilename);
 
 	for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
 		for (blockNo = 0; blockNo < NumBlocksPerSector(sectorNo); blockNo++) {
 			UsbCommand c = {CMD_MIFARE_WRITEBL, {FirstBlockOfSector(sectorNo) + blockNo, keyType, 0}};
-			memcpy(c.d.asBytes, key, 6);			
+			memcpy(c.d.asBytes, key, 6);
 			bytes_read = fread(bldata, 1, 16, fdump);
 			if ( bytes_read != 16) {
 				PrintAndLogEx(WARNING, "File reading error " _YELLOW_(%s), dataFilename);
 				fclose(fdump);
-				fdump = NULL;				
+				fdump = NULL;
 				return 2;
 			}
-					
+
 			if (blockNo == NumBlocksPerSector(sectorNo) - 1) {	// sector trailer
 				bldata[0]  = (keyA[sectorNo][0]);
 				bldata[1]  = (keyA[sectorNo][1]);
@@ -1017,10 +1017,10 @@ int CmdHF14AMfRestore(const char *Cmd) {
 				bldata[13] = (keyB[sectorNo][3]);
 				bldata[14] = (keyB[sectorNo][4]);
 				bldata[15] = (keyB[sectorNo][5]);
-			}		
-			
+			}
+
 			PrintAndLogEx(NORMAL, "Writing to block %3d: %s", FirstBlockOfSector(sectorNo) + blockNo, sprint_hex(bldata, 16));
-			
+
 			memcpy(c.d.asBytes + 10, bldata, 16);
 			clearCommandBuffer();
 			SendCommand(&c);
@@ -1034,7 +1034,7 @@ int CmdHF14AMfRestore(const char *Cmd) {
 			}
 		}
 	}
-	
+
 	fclose(fdump);
 	return 0;
 }
@@ -1056,9 +1056,9 @@ int CmdHF14AMfNested(const char *Cmd) {
 	uint8_t standart[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
 	uint8_t tempkey[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
 	char *fptr;
-	
+
 	if (strlen(Cmd) < 3) return usage_hf14_nested();
-	
+
 	char cmdp, ctmp;
 	cmdp = tolower(param_getchar(Cmd, 0));
 	blockNo = param_get8(Cmd, 1);
@@ -1068,15 +1068,15 @@ int CmdHF14AMfNested(const char *Cmd) {
 		PrintAndLogEx(WARNING, "key type must be A or B");
 		return 1;
 	}
-	
-	if (ctmp != 'a') 
+
+	if (ctmp != 'a')
 		keyType = 1;
-		
+
 	if (param_gethex(Cmd, 3, key, 12)) {
 		PrintAndLogEx(WARNING, "key must include 12 HEX symbols");
 		return 1;
 	}
-	
+
 	if (cmdp == 'o') {
 		trgBlockNo = param_get8(Cmd, 4);
 		ctmp = tolower(param_getchar(Cmd, 5));
@@ -1084,30 +1084,30 @@ int CmdHF14AMfNested(const char *Cmd) {
 			PrintAndLogEx(WARNING, "target key type must be A or B");
 			return 1;
 		}
-		if (ctmp != 'a') { 
+		if (ctmp != 'a') {
 			trgKeyType = 1;
 		}
 	} else {
 		SectorsCnt = NumOfSectors(cmdp);
 	}
-	
+
 	uint8_t j = 4;
 	while ( ctmp != 0x00 ) {
 
 		ctmp = tolower(param_getchar(Cmd, j));
 		transferToEml |= (ctmp == 't');
 		createDumpFile |= (ctmp == 'd');
-		
+
 		j++;
 	}
-	
+
 	// check if we can authenticate to sector
 	res = mfCheckKeys(blockNo, keyType, true, 1, key, &key64);
 	if (res) {
 		PrintAndLogEx(WARNING, "Wrong key. Can't authenticate to block:%3d key type:%c", blockNo, keyType ? 'B' : 'A');
 		return 3;
-	}	
-	
+	}
+
 	if (cmdp == 'o') {
 		int16_t isOK = mfnested(blockNo, keyType, key, trgBlockNo, trgKeyType, keyBlock, true);
 		switch (isOK) {
@@ -1115,7 +1115,7 @@ int CmdHF14AMfNested(const char *Cmd) {
 			case -2 : PrintAndLogEx(WARNING, "Button pressed. Aborted.\n"); break;
 			case -3 : PrintAndLogEx(FAILED, "Tag isn't vulnerable to Nested Attack (PRNG is not predictable).\n"); break;
 			case -4 : PrintAndLogEx(FAILED, "No valid key found"); break;
-			case -5 : 
+			case -5 :
 				key64 = bytes_to_num(keyBlock, 6);
 
 				// transfer key to the emulator
@@ -1127,12 +1127,12 @@ int CmdHF14AMfNested(const char *Cmd) {
 					sectortrailer = trgBlockNo | 0x0f;
 					}
 					mfEmlGetMem(keyBlock, sectortrailer, 1);
-			
+
 					if (!trgKeyType)
 						num_to_bytes(key64, 6, keyBlock);
 					else
 						num_to_bytes(key64, 6, &keyBlock[10]);
-					mfEmlSetMem(keyBlock, sectortrailer, 1);	
+					mfEmlSetMem(keyBlock, sectortrailer, 1);
 					PrintAndLogEx(SUCCESS, "Key transferred to emulator memory.");
 				}
 				return 0;
@@ -1142,10 +1142,10 @@ int CmdHF14AMfNested(const char *Cmd) {
 	}
 	else { // ------------------------------------  multiple sectors working
 		uint64_t t1 = msclock();
-		
+
 		e_sector = calloc(SectorsCnt, sizeof(sector_t));
 		if (e_sector == NULL) return 1;
-		
+
 		//test current key and additional standard keys first
 		// add parameter key
 		memcpy( keyBlock + (MIFARE_DEFAULTKEYS_SIZE * 6), key, 6 );
@@ -1156,21 +1156,21 @@ int CmdHF14AMfNested(const char *Cmd) {
 
 		PrintAndLogEx(SUCCESS, "Testing known keys. Sector count=%d", SectorsCnt);
 		res = mfCheckKeys_fast( SectorsCnt, true, true, 1, MIFARE_DEFAULTKEYS_SIZE + 1, keyBlock, e_sector, false);
-				
+
 		uint64_t t2 = msclock() - t1;
 		PrintAndLogEx(SUCCESS, "Time to check %d known keys: %.0f seconds\n", MIFARE_DEFAULTKEYS_SIZE, (float)t2/1000.0 );
 		PrintAndLogEx(SUCCESS, "enter nested attack");
-		
+
 		// nested sectors
 		iterations = 0;
 		bool calibrate = true;
 
 		for (i = 0; i < MIFARE_SECTOR_RETRY; i++) {
 			for (uint8_t sectorNo = 0; sectorNo < SectorsCnt; ++sectorNo) {
-				for (trgKeyType = 0; trgKeyType < 2; ++trgKeyType) { 
+				for (trgKeyType = 0; trgKeyType < 2; ++trgKeyType) {
 
 					if (e_sector[sectorNo].foundKey[trgKeyType]) continue;
-					
+
 					int16_t isOK = mfnested(blockNo, keyType, key, FirstBlockOfSector(sectorNo), trgKeyType, keyBlock, calibrate);
 					switch (isOK) {
 						case -1 : PrintAndLogEx(WARNING, "error: No response from Proxmark.\n"); break;
@@ -1179,7 +1179,7 @@ int CmdHF14AMfNested(const char *Cmd) {
 						case -4 : //key not found
 							calibrate = false;
 							iterations++;
-							continue; 
+							continue;
 						case -5 :
 							calibrate = false;
 							iterations++;
@@ -1188,7 +1188,7 @@ int CmdHF14AMfNested(const char *Cmd) {
 
 							res = mfCheckKeys_fast( SectorsCnt, true, true, 2, 1, keyBlock, e_sector, false);
 							continue;
-							
+
 						default : PrintAndLogEx(WARNING, "unknown Error.\n");
 					}
 					free(e_sector);
@@ -1196,7 +1196,7 @@ int CmdHF14AMfNested(const char *Cmd) {
 				}
 			}
 		}
-		
+
 		t1 = msclock() - t1;
 		PrintAndLogEx(SUCCESS, "time in nested: %.0f seconds\n", (float)t1/1000.0);
 
@@ -1206,11 +1206,11 @@ int CmdHF14AMfNested(const char *Cmd) {
 		for (i = 0; i < SectorsCnt; i++) {
 			// KEY A  but not KEY B
 			if ( e_sector[i].foundKey[0] && !e_sector[i].foundKey[1] ) {
-				
+
 				uint8_t sectrail = (FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1);
-				
+
 				PrintAndLogEx(SUCCESS, "reading block %d", sectrail);
-							
+
 				UsbCommand c = {CMD_MIFARE_READBL, {sectrail, 0, 0}};
 				num_to_bytes(e_sector[i].Key[0], 6, c.d.asBytes); // KEY A
 				clearCommandBuffer();
@@ -1218,7 +1218,7 @@ int CmdHF14AMfNested(const char *Cmd) {
 
 				UsbCommand resp;
 				if ( !WaitForResponseTimeout(CMD_ACK,&resp,1500)) continue;
-					
+
 				uint8_t isOK  = resp.arg[0] & 0xff;
 				if (!isOK) continue;
 
@@ -1232,10 +1232,10 @@ int CmdHF14AMfNested(const char *Cmd) {
 			}
 		}
 
-		
+
 		//print them
 		printKeyTable( SectorsCnt, e_sector );
-		
+
 		// transfer them to the emulator
 		if (transferToEml) {
 			for (i = 0; i < SectorsCnt; i++) {
@@ -1248,7 +1248,7 @@ int CmdHF14AMfNested(const char *Cmd) {
 			}
 			PrintAndLogEx(SUCCESS, "keys transferred to emulator memory.");
 		}
-		
+
 		// Create dump file
 		if (createDumpFile) {
 			fptr = GenerateFilename("hf-mf-", "-key.bin");
@@ -1256,13 +1256,13 @@ int CmdHF14AMfNested(const char *Cmd) {
 				free(e_sector);
 				return 1;
 			}
-			
-			if ((fkeys = fopen(fptr, "wb")) == NULL) { 
+
+			if ((fkeys = fopen(fptr, "wb")) == NULL) {
 				PrintAndLogEx(WARNING, "could not create file " _YELLOW_(%s), fptr);
 				free(e_sector);
 				return 1;
 			}
-			
+
 			PrintAndLogEx(SUCCESS, "saving keys to binary file " _YELLOW_(%s), fptr);
 			for (i=0; i<SectorsCnt; i++) {
 				if (e_sector[i].foundKey[0]){
@@ -1282,11 +1282,11 @@ int CmdHF14AMfNested(const char *Cmd) {
 			}
 			fflush(fkeys);
 			fclose(fkeys);
-		}		
+		}
 		free(e_sector);
 	}
 
-	free(e_sector);	
+	free(e_sector);
 	return 0;
 }
 
@@ -1301,22 +1301,22 @@ int CmdHF14AMfNestedHard(const char *Cmd) {
 	char filename[FILE_PATH_SIZE], *fptr;
 	char szTemp[FILE_PATH_SIZE-20];
 	char ctmp;
-	
+
 	bool know_target_key = false;
 	bool nonce_file_read = false;
 	bool nonce_file_write = false;
 	bool slow = false;
 	int tests = 0;
-	
+
 	switch(tolower(param_getchar(Cmd, cmdp))) {
 		case 'h': return usage_hf14_hardnested();
 		case 'r':
 			fptr = GenerateFilename("hf-mf-","-nonces.bin");
-			if (fptr == NULL) 
+			if (fptr == NULL)
 				strncpy(filename, "nonces.bin", FILE_PATH_SIZE);
 			else
 				strncpy(filename, fptr, FILE_PATH_SIZE-1);
-				
+
 			nonce_file_read = true;
 			if (!param_gethex(Cmd, cmdp+1, trgkey, 12)) {
 				know_target_key = true;
@@ -1335,7 +1335,7 @@ int CmdHF14AMfNestedHard(const char *Cmd) {
 			{
 				PrintAndLogEx(WARNING, "Block number is missing");
 				return 1;
-			
+
 			}
 			blockNo = param_get8(Cmd, cmdp);
 			ctmp = tolower(param_getchar(Cmd, cmdp+1));
@@ -1343,22 +1343,22 @@ int CmdHF14AMfNestedHard(const char *Cmd) {
 				PrintAndLogEx(WARNING, "Key type must be A or B");
 				return 1;
 			}
-			
-			if (ctmp != 'a') { 
+
+			if (ctmp != 'a') {
 				keyType = 1;
 			}
-			
+
 			if (param_gethex(Cmd, cmdp+2, key, 12)) {
 				PrintAndLogEx(WARNING, "Key must include 12 HEX symbols");
 				return 1;
 			}
-			
+
 			if (param_getchar(Cmd, cmdp+3) == 0x00)
 			{
 				PrintAndLogEx(WARNING, "Target block number is missing");
 				return 1;
 			}
-			
+
 			trgBlockNo = param_get8(Cmd, cmdp+3);
 
 			ctmp = tolower(param_getchar(Cmd, cmdp+4));
@@ -1384,7 +1384,7 @@ int CmdHF14AMfNestedHard(const char *Cmd) {
 		case 'w':
 			nonce_file_write = true;
 			fptr = GenerateFilename("hf-mf-","-nonces.bin");
-			if (fptr == NULL) 
+			if (fptr == NULL)
 				return 1;
 			strncpy(filename, fptr, FILE_PATH_SIZE-1);
 			break;
@@ -1398,7 +1398,7 @@ int CmdHF14AMfNestedHard(const char *Cmd) {
 			strncpy(filename, szTemp, FILE_PATH_SIZE-20);
 			cmdp++;
 			break;
-		case 'i': 
+		case 'i':
 			SetSIMDInstr(SIMD_AUTO);
 			ctmp = tolower(param_getchar(Cmd, cmdp+1));
 			switch (ctmp) {
@@ -1433,7 +1433,7 @@ int CmdHF14AMfNestedHard(const char *Cmd) {
 		}
 		cmdp++;
 	}
-	
+
 	if ( !know_target_key ) {
 		uint64_t key64 = 0;
 		// check if we can authenticate to sector
@@ -1441,12 +1441,12 @@ int CmdHF14AMfNestedHard(const char *Cmd) {
 		if (res) {
 			PrintAndLogEx(WARNING, "Key is wrong. Can't authenticate to block:%3d key type:%c", blockNo, keyType ? 'B' : 'A');
 			return 3;
-		}	
+		}
 	}
-	
-	PrintAndLogEx(NORMAL, "--target block no:%3d, target key type:%c, known target key: 0x%02x%02x%02x%02x%02x%02x%s, file action: %s, Slow: %s, Tests: %d ", 
-			trgBlockNo, 
-			trgKeyType?'B':'A', 
+
+	PrintAndLogEx(NORMAL, "--target block no:%3d, target key type:%c, known target key: 0x%02x%02x%02x%02x%02x%02x%s, file action: %s, Slow: %s, Tests: %d ",
+			trgBlockNo,
+			trgKeyType?'B':'A',
 			trgkey[0], trgkey[1], trgkey[2], trgkey[3], trgkey[4], trgkey[5],
 			know_target_key ? "" : " (not set)",
 			nonce_file_write ? "write": nonce_file_read ? "read" : "none",
@@ -1478,12 +1478,12 @@ void shuffle( uint8_t *array, uint16_t len) {
 	uint16_t x;
 	time_t t;
 	srand((unsigned) time(&t));
-	while (len) {		
+	while (len) {
 		x = randInRange(0, (len -= 6) ) | 0; // 0 = i < n
 		x %= 6;
 		memcpy(tmp, array + x, 6);
-		memcpy(array + x, array + len, 6);	
-		memcpy(array + len, tmp, 6);		
+		memcpy(array + x, array + len, 6);
+		memcpy(array + len, tmp, 6);
 	}
 }
 
@@ -1507,13 +1507,13 @@ int CmdHF14AMfChk_fast(const char *Cmd) {
 	bool use_flashmemory = false;
 
 	sector_t *e_sector = NULL;
-	
+
 	keyBlock = calloc(MIFARE_DEFAULTKEYS_SIZE, 6);
 	if (keyBlock == NULL) return 1;
 
 	for (int cnt = 0; cnt < MIFARE_DEFAULTKEYS_SIZE; cnt++)
 		num_to_bytes(g_mifare_default_keys[cnt], 6, keyBlock + cnt * 6);
-	
+
 	// sectors
 	switch(ctmp) {
 		case '0': sectorsCnt =  MIFARE_MINI_MAXSECTOR; break;
@@ -1524,12 +1524,12 @@ int CmdHF14AMfChk_fast(const char *Cmd) {
 	}
 
 	for (i = 1; param_getchar(Cmd, i); i++) {
-		
+
 		ctmp = tolower(param_getchar(Cmd, i));
 		clen = param_getlength(Cmd, i);
-		
+
 		if (clen == 12) {
-			
+
 			if ( param_gethex(Cmd, i, keyBlock + 6 * keycnt, 12) ){
 				PrintAndLogEx(FAILED, "not hex, skipping");
 				continue;
@@ -1549,36 +1549,36 @@ int CmdHF14AMfChk_fast(const char *Cmd) {
 		} else if ( clen == 1) {
 			if (ctmp == 't' ) { transferToEml = 1; continue; }
 			if (ctmp == 'd' ) { createDumpFile = 1; continue; }
-#ifdef WITH_FLASH			
+#ifdef WITH_FLASH
 			if (ctmp == 'm' ) { use_flashmemory = true; continue; }
-#endif			
+#endif
 		} else {
 			// May be a dic file
 			if ( param_getstr(Cmd, i, filename, FILE_PATH_SIZE) >= FILE_PATH_SIZE ) {
 				PrintAndLogEx(FAILED, "Filename too long");
 				continue;
 			}
-			
+
 			f = fopen( filename, "r");
 			if ( !f ){
 				PrintAndLogEx(FAILED, "File: " _YELLOW_(%s) ": not found or locked.", filename);
 				continue;
 			}
-			
+
 			// read file
 			while( fgets(buf, sizeof(buf), f) ){
 				if (strlen(buf) < 12 || buf[11] == '\n')
 					continue;
-			
+
 				while (fgetc(f) != '\n' && !feof(f)) ;  //goto next line
-				
+
 				if( buf[0]=='#' ) continue;	//The line start with # is comment, skip
 
 				if (!isxdigit(buf[0])){
 					PrintAndLogEx(FAILED, "File content error. '" _YELLOW_(%s)"' must include 12 HEX symbols", buf);
 					continue;
 				}
-				
+
 				buf[12] = 0;
 				if ( keyitems - keycnt < 2) {
 					p = realloc(keyBlock, 6 * (keyitems += 64));
@@ -1600,7 +1600,7 @@ int CmdHF14AMfChk_fast(const char *Cmd) {
 			PrintAndLogEx(SUCCESS, "Loaded %2d keys from " _YELLOW_(%s), keycnt, filename);
 		}
 	}
-		
+
 	if (keycnt == 0 && !use_flashmemory) {
 		PrintAndLogEx(SUCCESS, "No key specified, trying default keys");
 		for (;keycnt < MIFARE_DEFAULTKEYS_SIZE; keycnt++)
@@ -1608,17 +1608,17 @@ int CmdHF14AMfChk_fast(const char *Cmd) {
 				(keyBlock + 6*keycnt)[0],(keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2],
 				(keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4],	(keyBlock + 6*keycnt)[5]);
 	}
-	
+
 	// // initialize storage for found keys
 	e_sector = calloc(sectorsCnt, sizeof(sector_t));
 	if (e_sector == NULL) {
 		free(keyBlock);
 		return 1;
 	}
-			
+
 	uint32_t chunksize = keycnt > (USB_CMD_DATA_SIZE/6) ? (USB_CMD_DATA_SIZE/6) : keycnt;
 	bool firstChunk = true, lastChunk = false;
-	
+
 	// time
 	uint64_t t1 = msclock();
 
@@ -1626,31 +1626,31 @@ int CmdHF14AMfChk_fast(const char *Cmd) {
 		PrintAndLogEx(SUCCESS, "Using dictionary in flash memory");
 		mfCheckKeys_fast( sectorsCnt, true, true, 1, 0, keyBlock, e_sector, use_flashmemory);
 	} else {
-	
+
 		// strategys. 1= deep first on sector 0 AB,  2= width first on all sectors
 		for (uint8_t strategy = 1; strategy < 3; strategy++) {
 			PrintAndLogEx(SUCCESS, "Running strategy %u", strategy);
 
-				// main keychunk loop			
+				// main keychunk loop
 				for (uint32_t i = 0; i < keycnt; i += chunksize) {
-					
+
 					if (ukbhit()) {
 						int gc = getchar(); (void)gc;
 						PrintAndLogEx(WARNING, "\naborted via keyboard!\n");
 						goto out;
 					}
-					
+
 					uint32_t size = ((keycnt - i)  > chunksize) ? chunksize : keycnt - i;
-					
+
 					// last chunk?
 					if ( size == keycnt - i)
 						lastChunk = true;
-					
+
 					int res = mfCheckKeys_fast( sectorsCnt, firstChunk, lastChunk, strategy, size, keyBlock + (i * 6), e_sector, false);
 
 					if ( firstChunk )
 						firstChunk = false;
-								
+
 					// all keys,  aborted
 					if ( res == 0 || res == 2 )
 						goto out;
@@ -1659,25 +1659,25 @@ int CmdHF14AMfChk_fast(const char *Cmd) {
 			lastChunk = false;
 		} // end strategy
 	}
-out: 
+out:
 	t1 = msclock() - t1;
 	PrintAndLogEx(SUCCESS, "Time in checkkeys (fast):  %.1fs\n", (float)(t1/1000.0));
 
 	// check..
 	uint8_t found_keys = 0;
 	for (uint8_t i = 0; i < sectorsCnt; ++i) {
-		
-		if ( e_sector[i].foundKey[0] ) 
+
+		if ( e_sector[i].foundKey[0] )
 			found_keys++;
-		
+
 		if ( e_sector[i].foundKey[1] )
 			found_keys++;
 	}
-	
+
 	if ( found_keys == 0 ) {
 		PrintAndLogEx(WARNING, "No keys found");
 	} else {
-	
+
 		printKeyTable( sectorsCnt, e_sector );
 
 		if (transferToEml) {
@@ -1692,21 +1692,21 @@ out:
 			}
 			PrintAndLogEx(SUCCESS, "Found keys have been transferred to the emulator memory");
 		}
-		
+
 		if (createDumpFile) {
 			fptr = GenerateFilename("hf-mf-", "-key.bin");
-			if (fptr == NULL) 
+			if (fptr == NULL)
 				return 1;
 
 			FILE *fkeys = fopen(fptr, "wb");
-			if (fkeys == NULL) { 
+			if (fkeys == NULL) {
 				PrintAndLogEx(WARNING, "Could not create file " _YELLOW_(%s), fptr);
 				free(keyBlock);
 				free(e_sector);
 				return 1;
 			}
 			PrintAndLogEx(SUCCESS, "Printing keys to binary file " _YELLOW_(%s)"...", fptr);
-		
+
 			for (i=0; i<sectorsCnt; i++) {
 				num_to_bytes(e_sector[i].Key[0], 6, tempkey);
 				fwrite (tempkey, 1, 6, fkeys);
@@ -1718,10 +1718,10 @@ out:
 			}
 
 			fclose(fkeys);
-			PrintAndLogEx(SUCCESS, "Found keys have been dumped to " _YELLOW_(%s)" --> 0xffffffffffff has been inserted for unknown keys.", fptr);			
-		}	
+			PrintAndLogEx(SUCCESS, "Found keys have been dumped to " _YELLOW_(%s)" --> 0xffffffffffff has been inserted for unknown keys.", fptr);
+		}
 	}
-	
+
 	free(keyBlock);
 	free(e_sector);
 	PrintAndLogEx(NORMAL, "");
@@ -1743,12 +1743,12 @@ int CmdHF14AMfChk(const char *Cmd) {
 	uint8_t SectorsCnt = 1;
 	uint8_t keyType = 0;
 	uint32_t keyitems = MIFARE_DEFAULTKEYS_SIZE;
-	uint64_t key64 = 0;	
+	uint64_t key64 = 0;
 	uint8_t tempkey[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
 	char *fptr;
 	int clen = 0;
 	int transferToEml = 0;
-	int createDumpFile = 0;	
+	int createDumpFile = 0;
 	int i, res, keycnt = 0;
 
 	keyBlock = calloc(MIFARE_DEFAULTKEYS_SIZE, 6);
@@ -1756,18 +1756,18 @@ int CmdHF14AMfChk(const char *Cmd) {
 
 	for (int cnt = 0; cnt < MIFARE_DEFAULTKEYS_SIZE; cnt++)
 		num_to_bytes(g_mifare_default_keys[cnt], 6, (uint8_t*)(keyBlock + cnt * 6));
-	
+
 	if (param_getchar(Cmd, 0)=='*') {
 		blockNo = 3;
 		SectorsCnt = NumOfSectors( param_getchar(Cmd+1, 0) );
 	} else {
 		blockNo = param_get8(Cmd, 0);
 	}
-	
+
 	ctmp = tolower(param_getchar(Cmd, 1));
 	clen = param_getlength(Cmd, 1);
 	if (clen == 1) {
-		switch (ctmp) {	
+		switch (ctmp) {
 		case 'a':
 			keyType = 0;
 			break;
@@ -1788,9 +1788,9 @@ int CmdHF14AMfChk(const char *Cmd) {
 
 		ctmp = tolower(param_getchar(Cmd, i));
 		clen = param_getlength(Cmd, i);
-		
+
 		if (clen == 12) {
-			
+
 			if ( param_gethex(Cmd, i, keyBlock + 6 * keycnt, 12) ){
 				PrintAndLogEx(FAILED, "not hex, skipping");
 				continue;
@@ -1816,20 +1816,20 @@ int CmdHF14AMfChk(const char *Cmd) {
 				PrintAndLogEx(FAILED, "File name too long");
 				continue;
 			}
-			
+
 			f = fopen( filename , "r");
 			if ( !f ) {
 				PrintAndLogEx(FAILED, "File: " _YELLOW_(%s) ": not found or locked.", filename);
 				continue;
 			}
-			
+
 			// load keys from dictionary file
 			while( fgets(buf, sizeof(buf), f) ){
 				if (strlen(buf) < 12 || buf[11] == '\n')
 					continue;
-			
+
 				while (fgetc(f) != '\n' && !feof(f)) ;  //goto next line
-				
+
 				if( buf[0]=='#' ) continue;	//The line start with # is comment, skip
 
 				// codesmell, only checks first char?
@@ -1837,7 +1837,7 @@ int CmdHF14AMfChk(const char *Cmd) {
 					PrintAndLogEx(FAILED, "File content error. '" _YELLOW_(%s)"' must include 12 HEX symbols",buf);
 					continue;
 				}
-				
+
 				buf[12] = 0;
 
 				if ( keyitems - keycnt < 2) {
@@ -1860,7 +1860,7 @@ int CmdHF14AMfChk(const char *Cmd) {
 			PrintAndLogEx(SUCCESS, "Loaded %2d keys from " _YELLOW_(%s), keycnt, filename);
 		}
 	}
-	
+
 	if (keycnt == 0) {
 		PrintAndLogEx(INFO, "No key specified, trying default keys");
 		for (;keycnt < MIFARE_DEFAULTKEYS_SIZE; keycnt++)
@@ -1868,7 +1868,7 @@ int CmdHF14AMfChk(const char *Cmd) {
 				(keyBlock + 6*keycnt)[0],(keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2],
 				(keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4],	(keyBlock + 6*keycnt)[5], 6);
 	}
-	
+
 	// initialize storage for found keys
 	e_sector = calloc(SectorsCnt, sizeof(sector_t));
 	if (e_sector == NULL) {
@@ -1883,62 +1883,62 @@ int CmdHF14AMfChk(const char *Cmd) {
 		e_sector[i].foundKey[0] = false;
 		e_sector[i].foundKey[1] = false;
 	}
-		
-	
+
+
 	uint8_t trgKeyType = 0;
 	uint32_t max_keys = keycnt > (USB_CMD_DATA_SIZE/6) ? (USB_CMD_DATA_SIZE/6) : keycnt;
-	
+
 	// time
 	uint64_t t1 = msclock();
 
-	
+
 	// check keys.
 	for (trgKeyType = (keyType==2)?0:keyType; trgKeyType < 2; (keyType==2) ? (++trgKeyType) : (trgKeyType=2) ) {
 
 		int b = blockNo;
 		for (int i = 0; i < SectorsCnt; ++i) {
-			
+
 			// skip already found keys.
 			if (e_sector[i].foundKey[trgKeyType]) continue;
-						
+
 			for (uint32_t c = 0; c < keycnt; c += max_keys) {
-								
+
 				printf("."); fflush(stdout);
 				if (ukbhit()) {
 					int gc = getchar();	(void)gc;
 					PrintAndLogEx(INFO, "\naborted via keyboard!\n");
 					goto out;
 				}
-								
+
 				uint32_t size = keycnt-c > max_keys ? max_keys : keycnt-c;
-				
+
 				res = mfCheckKeys(b, trgKeyType, true, size, &keyBlock[6*c], &key64);
 				if (!res) {
 					e_sector[i].Key[trgKeyType] = key64;
 					e_sector[i].foundKey[trgKeyType] = true;
 					break;
 				}
-				
+
 
 			}
-			b < 127 ? ( b +=4 ) : ( b += 16 );	
+			b < 127 ? ( b +=4 ) : ( b += 16 );
 		}
 	}
 	t1 = msclock() - t1;
 	PrintAndLogEx(SUCCESS, "\nTime in checkkeys: %.0f seconds\n", (float)t1/1000.0);
 
-		
+
 	// 20160116 If Sector A is found, but not Sector B,  try just reading it of the tag?
 	if ( keyType != 1 ) {
 		PrintAndLogEx(INFO, "testing to read key B...");
 		for (i = 0; i < SectorsCnt; i++) {
 			// KEY A  but not KEY B
 			if ( e_sector[i].foundKey[0] && !e_sector[i].foundKey[1] ) {
-							
+
 				uint8_t sectrail = (FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1);
-				
+
 				PrintAndLogEx(NORMAL, "Reading block %d", sectrail);
-				
+
 				UsbCommand c = {CMD_MIFARE_READBL, {sectrail, 0, 0}};
 				num_to_bytes(e_sector[i].Key[0], 6, c.d.asBytes); // KEY A
 				clearCommandBuffer();
@@ -1946,7 +1946,7 @@ int CmdHF14AMfChk(const char *Cmd) {
 
 				UsbCommand resp;
 				if ( !WaitForResponseTimeout(CMD_ACK,&resp,1500)) continue;
-					
+
 				uint8_t isOK  = resp.arg[0] & 0xff;
 				if (!isOK) continue;
 
@@ -1962,10 +1962,10 @@ int CmdHF14AMfChk(const char *Cmd) {
 	}
 
 out:
-	
+
 	//print keys
 	printKeyTable( SectorsCnt, e_sector );
-	
+
 	if (transferToEml) {
 		uint8_t block[16] = {0x00};
 		for (uint8_t i = 0; i < SectorsCnt; ++i ) {
@@ -1978,24 +1978,24 @@ out:
 		}
 		PrintAndLogEx(SUCCESS, "Found keys have been transferred to the emulator memory");
 	}
-	
+
 	if (createDumpFile) {
 		fptr = GenerateFilename("hf-mf-", "-key.bin");
 		if (fptr == NULL) {
 			free(keyBlock);
-			free(e_sector);			
+			free(e_sector);
 			return 1;
 		}
 
 		FILE *fkeys = fopen(fptr, "wb");
-		if (fkeys == NULL) { 
+		if (fkeys == NULL) {
 			PrintAndLogEx(WARNING, "Could not create file " _YELLOW_(%s), fptr);
 			free(keyBlock);
 			free(e_sector);
 			return 1;
 		}
 		PrintAndLogEx(INFO, "Printing keys to binary file " _YELLOW_(%s)"...", fptr);
-	
+
 		for( i=0; i<SectorsCnt; i++) {
 			num_to_bytes(e_sector[i].Key[0], 6, tempkey);
 			fwrite ( tempkey, 1, 6, fkeys );
@@ -2021,9 +2021,9 @@ static void emptySectorTable(){
 	// initialize storage for found keys
 	if (k_sector == NULL)
 		k_sector = calloc(k_sectorsCount, sizeof(sector_t));
-	if (k_sector == NULL) 
+	if (k_sector == NULL)
 		return;
-		
+
 	// empty e_sector
 	for(int i = 0; i < k_sectorsCount; ++i){
 		k_sector[i].Key[0] = 0xffffffffffff;
@@ -2043,9 +2043,9 @@ void showSectorTable(){
 
 void readerAttack(nonces_t data, bool setEmulatorMem, bool verbose) {
 
-	uint64_t key = 0;	
+	uint64_t key = 0;
 	bool success = false;
-	
+
 	if (k_sector == NULL)
 		emptySectorTable();
 
@@ -2087,7 +2087,7 @@ int CmdHF14AMf1kSim(const char *Cmd) {
 	uint8_t cmdp = 0;
 	bool errors = false, verbose = false, setEmulatorMem = false;
 	nonces_t data[1];
-		
+
 	while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
 		switch( tolower(param_getchar(Cmd, cmdp))) {
 		case 'e':
@@ -2130,7 +2130,7 @@ int CmdHF14AMf1kSim(const char *Cmd) {
 	}
 	//Validations
 	if (errors) return usage_hf14_mf1ksim();
-	
+
 	PrintAndLogEx(NORMAL, " uid:%s, numreads:%d, flags:%d (0x%02x) "
 				, (uidlen == 0 ) ? "N/A" : sprint_hex(uid, uidlen>>1)
 				, exitAfterNReads
@@ -2141,12 +2141,12 @@ int CmdHF14AMf1kSim(const char *Cmd) {
 	memcpy(c.d.asBytes, uid, sizeof(uid));
 	clearCommandBuffer();
 	SendCommand(&c);
-	UsbCommand resp;		
+	UsbCommand resp;
 
 	if(flags & FLAG_INTERACTIVE) {
 		PrintAndLogEx(INFO, "Press pm3-button or send another cmd to abort simulation");
 
-		while( !ukbhit() ){	
+		while( !ukbhit() ){
 			if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500) ) continue;
 			if ( !(flags & FLAG_NR_AR_ATTACK) ) break;
 			if ( (resp.arg[0] & 0xffff) != CMD_SIMULATE_MIFARE_CARD ) break;
@@ -2165,7 +2165,7 @@ int CmdHF14AMfSniff(const char *Cmd){
 	//bool wantSaveToEml = false; TODO
 	bool wantSaveToEmlFile = false;
 
-	//var 
+	//var
 	int res = 0, len = 0, blockLen = 0;
 	int pckNum = 0, num = 0;
 	uint8_t sak = 0;
@@ -2177,12 +2177,12 @@ int CmdHF14AMfSniff(const char *Cmd){
 	uint16_t bufsize = 0;
 	uint8_t *bufPtr = NULL;
 	uint16_t traceLen = 0;
-	
+
 	memset(uid, 0x00, sizeof(uid));
-	
+
 	char ctmp = tolower(param_getchar(Cmd, 0));
 	if ( ctmp == 'h') return usage_hf14_sniff();
-	
+
 	for (int i = 0; i < 4; i++) {
 		ctmp = tolower(param_getchar(Cmd, i));
 		if (ctmp == 'l') wantLogToFile = true;
@@ -2190,7 +2190,7 @@ int CmdHF14AMfSniff(const char *Cmd){
 		//if (ctmp == 'e') wantSaveToEml = true; TODO
 		if (ctmp == 'f') wantSaveToEmlFile = true;
 	}
-	
+
 	PrintAndLogEx(NORMAL, "-------------------------------------------------------------------------\n");
 	PrintAndLogEx(NORMAL, "Executing mifare sniffing command. \n");
 	PrintAndLogEx(NORMAL, "Press the key on the proxmark3 device to abort both proxmark3 and client.\n");
@@ -2202,7 +2202,7 @@ int CmdHF14AMfSniff(const char *Cmd){
 	SendCommand(&c);
 
 	UsbCommand resp;
-	
+
 	// wait cycle
 	while (true) {
 		printf("."); fflush(stdout);
@@ -2211,11 +2211,11 @@ int CmdHF14AMfSniff(const char *Cmd){
 			PrintAndLogEx(INFO, "\naborted via keyboard!\n");
 			break;
 		}
-		
+
 		if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
 			continue;
 		}
-		
+
 		res = resp.arg[0] & 0xff;
 		traceLen = resp.arg[1];
 		len = resp.arg[2];
@@ -2234,7 +2234,7 @@ int CmdHF14AMfSniff(const char *Cmd){
 						p = calloc(traceLen, sizeof(uint8_t));
 					else							// need more memory
 						p = realloc(buf, traceLen);
-					
+
 					if (p == NULL) {
 						PrintAndLogEx(FAILED, "Cannot allocate memory for trace");
 						free(buf);
@@ -2268,8 +2268,8 @@ int CmdHF14AMfSniff(const char *Cmd){
 					isTag = false;
 				}
 				bufPtr += 2;
-				
-				// the uid identification package 
+
+				// the uid identification package
 				// 0xFF 0xFF xx xx xx xx xx xx xx xx xx xx aa aa cc 0xFF 0xFF
 				// x = uid,  a = atqa, c = sak
 				if ((len == 17) && (bufPtr[0] == 0xff) && (bufPtr[1] == 0xff) && (bufPtr[15] == 0xff) && (bufPtr[16] == 0xff)) {
@@ -2281,25 +2281,25 @@ int CmdHF14AMfSniff(const char *Cmd){
 						default:   uid_len = 4; break;
 					}
 					sak = bufPtr[14];
-					PrintAndLogEx(SUCCESS, "UID %s | ATQA %02x %02x | SAK 0x%02x", 
+					PrintAndLogEx(SUCCESS, "UID %s | ATQA %02x %02x | SAK 0x%02x",
 						sprint_hex(uid, uid_len),
-						atqa[1], 
-						atqa[0], 
+						atqa[1],
+						atqa[0],
 						sak);
 					if (wantLogToFile || wantDecrypt) {
 						FillFileNameByUID(logHexFileName, uid, ".log", uid_len);
 						AddLogCurrentDT(logHexFileName);
 						PrintAndLogEx(SUCCESS, "Trace saved to %s", logHexFileName);
-					}						
+					}
 					if (wantDecrypt)
 						mfTraceInit(uid, uid_len, atqa, sak, wantSaveToEmlFile);
 				} else {
 					PrintAndLogEx(NORMAL, "%03d| %s |%s", num, isTag ? "TAG" : "RDR", sprint_hex(bufPtr, len));
-					if (wantLogToFile) 
+					if (wantLogToFile)
 						AddLogHex(logHexFileName, isTag ? "TAG| ":"RDR| ", bufPtr, len);
-					if (wantDecrypt) 
+					if (wantDecrypt)
 						mfTraceDecode(bufPtr, len, wantSaveToEmlFile);
-					num++;	
+					num++;
 				}
 				bufPtr += len;
 				bufPtr += ((len-1)/8+1);	// ignore parity
@@ -2316,7 +2316,7 @@ int CmdHF14AMfDbg(const char *Cmd) {
 
 	char ctmp = tolower(param_getchar(Cmd, 0));
 	if (strlen(Cmd) < 1 || ctmp == 'h' ) return usage_hf14_dbg();
-	
+
 	uint8_t dbgMode = param_get8ex(Cmd, 0, 0, 10);
 	if (dbgMode > 4) return usage_hf14_dbg();
 
@@ -2330,50 +2330,50 @@ int CmdHF14AMfKeyBrute(const char *Cmd) {
 	uint8_t blockNo = 0, keytype = 0;
 	uint8_t key[6] = {0, 0, 0, 0, 0, 0};
 	uint64_t foundkey = 0;
-	
-	char cmdp = tolower(param_getchar(Cmd, 0));	
+
+	char cmdp = tolower(param_getchar(Cmd, 0));
 	if ( cmdp == 'h' ) return usage_hf14_keybrute();
-	
+
 	// block number
-	blockNo = param_get8(Cmd, 0);	 
-	
+	blockNo = param_get8(Cmd, 0);
+
 	// keytype
 	cmdp = tolower(param_getchar(Cmd, 1));
 	if ( cmdp == 'b' ) keytype = 1;
-	
+
 	// key
 	if (param_gethex(Cmd, 2, key, 12)) return usage_hf14_keybrute();
-	
+
 	uint64_t t1 = msclock();
-	
+
 	if (mfKeyBrute( blockNo, keytype, key, &foundkey))
 		PrintAndLogEx(SUCCESS, "found valid key: %012" PRIx64 " \n", foundkey);
 	else
 		PrintAndLogEx(FAILED, "key not found");
-	
+
 	t1 = msclock() - t1;
 	PrintAndLogEx(SUCCESS, "\ntime in keybrute: %.0f seconds\n", (float)t1/1000.0);
-	return 0;	
+	return 0;
 }
 
 void printKeyTable( uint8_t sectorscnt, sector_t *e_sector ){
 	char strA[12+1] = {0};
-	char strB[12+1] = {0};	
+	char strB[12+1] = {0};
 	PrintAndLogEx(NORMAL, "|---|----------------|---|----------------|---|");
 	PrintAndLogEx(NORMAL, "|sec|key A           |res|key B           |res|");
 	PrintAndLogEx(NORMAL, "|---|----------------|---|----------------|---|");
 	for (uint8_t i = 0; i < sectorscnt; ++i) {
-		
+
 		snprintf(strA, sizeof(strA), "------------");
 		snprintf(strB, sizeof(strB), "------------");
-		
+
 		if ( e_sector[i].foundKey[0] )
 			snprintf(strA, sizeof(strA), "%012" PRIx64, e_sector[i].Key[0]);
-		
+
 		if ( e_sector[i].foundKey[1] )
 			snprintf(strB, sizeof(strB), "%012" PRIx64, e_sector[i].Key[1]);
 
-		
+
 		PrintAndLogEx(NORMAL, "|%03d|  %s  | %d |  %s  | %d |"
 			, i
 			, strA, e_sector[i].foundKey[0]
@@ -2388,9 +2388,9 @@ int CmdHF14AMfEGet(const char *Cmd) {
 	uint8_t blockNo = 0;
 	uint8_t data[16] = {0x00};
 	char c = tolower(param_getchar(Cmd, 0));
-	
+
 	if (strlen(Cmd) < 1 || c == 'h') return usage_hf14_eget();
-	
+
 	blockNo = param_get8(Cmd, 0);
 
 	PrintAndLogEx(NORMAL, "");
@@ -2405,7 +2405,7 @@ int CmdHF14AMfEGet(const char *Cmd) {
 int CmdHF14AMfEClear(const char *Cmd) {
 	char c = tolower(param_getchar(Cmd, 0));
 	if (c == 'h') return usage_hf14_eclr();
-	
+
 	UsbCommand cmd = {CMD_MIFARE_EML_MEMCLR, {0, 0, 0}};
 	clearCommandBuffer();
 	SendCommand(&cmd);
@@ -2420,14 +2420,14 @@ int CmdHF14AMfESet(const char *Cmd) {
 
 	if (strlen(Cmd) < 3 || c == 'h')
 		return usage_hf14_eset();
-	
+
 	blockNo = param_get8(Cmd, 0);
-	
+
 	if (param_gethex(Cmd, 1, memBlock, 32)) {
 		PrintAndLogEx(WARNING, "block data must include 32 HEX symbols");
 		return 1;
 	}
-	
+
 	//  1 - blocks count
 	return mfEmlSetMem(memBlock, blockNo, 1);
 }
@@ -2440,12 +2440,12 @@ int CmdHF14AMfELoad(const char *Cmd) {
 	uint8_t blockWidth = 16;
 	char c = tolower(param_getchar(Cmd, 0));
 
-	if ( strlen(Cmd) < 2 &&  c == 'h' ) 
+	if ( strlen(Cmd) < 2 &&  c == 'h' )
 		return usage_hf14_eload();
-	
+
 	switch (c) {
 		case '0' : numBlocks = MIFARE_MINI_MAXBLOCK; break;
-		case '1' : 
+		case '1' :
 		case '\0': numBlocks = MIFARE_1K_MAXBLOCK; break;
 		case '2' : numBlocks = MIFARE_2K_MAXBLOCK; break;
 		case '4' : numBlocks = MIFARE_4K_MAXBLOCK; break;
@@ -2456,11 +2456,11 @@ int CmdHF14AMfELoad(const char *Cmd) {
 		}
 	}
 	uint32_t numblk2 = param_get32ex(Cmd, 2, 0, 10);
-	if (numblk2 > 0) 
+	if (numblk2 > 0)
 		numBlocks = numblk2;
 
 	param_getstr(Cmd, nameParamNo, filename, sizeof(filename));
-	
+
 	uint8_t *data = calloc(4096, sizeof(uint8_t));
 	size_t datalen = 0;
 	//int res = loadFile(filename, "bin", data, &datalen);
@@ -2469,26 +2469,26 @@ int CmdHF14AMfELoad(const char *Cmd) {
 		free(data);
 		return 1;
 	}
-	
+
 	// 64 or 256 blocks.
 	if ( (datalen % blockWidth) != 0 ) {
 		PrintAndLogEx(FAILED, "File content error. Size doesn't match blockwidth ");
-		free(data);		
+		free(data);
 		return 2;
 	}
-	
+
 	PrintAndLogEx(INFO, "Copying to emulator memory");
-	
+
 	blockNum = 0;
 	while ( datalen ) {
-		
+
 		if (mfEmlSetMem_xt(data + counter, blockNum, 1, blockWidth)) {
 			PrintAndLogEx(FAILED, "Cant set emul block: %3d", blockNum);
 			free(data);
 			return 3;
 		}
 		printf("."); fflush(stdout);
-		
+
 		blockNum++;
 		counter += blockWidth;
 		datalen -= blockWidth;
@@ -2497,7 +2497,7 @@ int CmdHF14AMfELoad(const char *Cmd) {
 
 	// Ultralight /Ntag
 	if ( blockWidth == 4 ) {
-		if ((blockNum != numBlocks)) {		
+		if ((blockNum != numBlocks)) {
 			PrintAndLogEx(FAILED, "Warning, Ultralight/Ntag file content, Loaded %d blocks into emulator memory", blockNum);
 			free(data);
 			return 0;
@@ -2524,11 +2524,11 @@ int CmdHF14AMfESave(const char *Cmd) {
 
 	memset(filename, 0, sizeof(filename));
 
-	char c = tolower(param_getchar(Cmd, 0));	
+	char c = tolower(param_getchar(Cmd, 0));
 	if (c == 'h') return usage_hf14_esave();
 
 	blocks = NumOfBlocks(c);
-	bytes = blocks * MFBLOCK_SIZE;	
+	bytes = blocks * MFBLOCK_SIZE;
 
 	dump = calloc(bytes, sizeof(uint8_t));
 	if (!dump) {
@@ -2536,23 +2536,23 @@ int CmdHF14AMfESave(const char *Cmd) {
 		return 1;
 	}
 	memset(dump, 0, bytes);
-	
+
 	PrintAndLogEx(INFO, "downloading from emulator memory");
 	if (!GetFromDevice( BIG_BUF_EML, dump, bytes, 0, NULL, 2500, false)) {
 		PrintAndLogEx(WARNING, "Fail, transfer from device time-out");
 		free(dump);
 		return 2;
-	}	
+	}
 
 	len = param_getstr(Cmd, nameParamNo, filename, sizeof(filename));
 	if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5;
-	
+
 	// user supplied filename?
 	if (len < 1) {
 		fnameptr += sprintf(fnameptr, "hf-mf-");
 		FillFileNameByUID(fnameptr, dump, "-dump", 4);
 	}
-	
+
 	saveFile(filename, "bin", dump, bytes);
 	saveFileEML(filename, "eml", dump, bytes, MFBLOCK_SIZE);
 	saveFileJSON(filename, "json", jsfCardMemory, dump, bytes);
@@ -2564,7 +2564,7 @@ int CmdHF14AMfECFill(const char *Cmd) {
 	uint8_t keyType = 0;
 	uint8_t numSectors = 16;
 	char c = tolower(param_getchar(Cmd, 0));
-	
+
 	if (strlen(Cmd) < 1 || c == 'h')
 		return usage_hf14_ecfill();
 
@@ -2596,7 +2596,7 @@ int CmdHF14AMfEKeyPrn(const char *Cmd) {
 		return usage_hf14_ekeyprn();
 
 	numSectors = NumOfSectors(c);
-	
+
 	PrintAndLogEx(NORMAL, "|---|----------------|----------------|");
 	PrintAndLogEx(NORMAL, "|sec|key A           |key B           |");
 	PrintAndLogEx(NORMAL, "|---|----------------|----------------|");
@@ -2613,7 +2613,7 @@ int CmdHF14AMfEKeyPrn(const char *Cmd) {
 	return 0;
 }
 
-// CHINESE MAGIC COMMANDS 
+// CHINESE MAGIC COMMANDS
 int CmdHF14AMfCSetUID(const char *Cmd) {
 	uint8_t wipeCard = 0;
 	uint8_t uid[8] = {0x00};
@@ -2624,7 +2624,7 @@ int CmdHF14AMfCSetUID(const char *Cmd) {
 	int res, argi = 0;
 	char ctmp;
 
-	if (strlen(Cmd) < 1 || param_getchar(Cmd, argi) == 'h') 
+	if (strlen(Cmd) < 1 || param_getchar(Cmd, argi) == 'h')
 		return usage_hf14_csetuid();
 
 	if (param_getchar(Cmd, argi) && param_gethex(Cmd, argi, uid, 8))
@@ -2668,7 +2668,7 @@ int CmdHF14AMfCSetUID(const char *Cmd) {
 		PrintAndLogEx(WARNING, "Can't set UID. error=%d", res);
 		return 1;
 	}
-	
+
 	PrintAndLogEx(SUCCESS, "old UID:%s", sprint_hex(oldUid, 4));
 	PrintAndLogEx(SUCCESS, "new UID:%s", sprint_hex(uid, 4));
 	return 0;
@@ -2686,11 +2686,11 @@ int CmdHF14AMfCSetBlk(const char *Cmd) {
 	blockNo = param_get8(Cmd, 0);
 
 	if (param_gethex(Cmd, 1, block, 32)) return usage_hf14_csetblk();
-	
+
 	ctmp = tolower(param_getchar(Cmd, 2));
 	if (ctmp == 'w')
 		params |= MAGIC_WIPE;
-	
+
 	PrintAndLogEx(NORMAL, "--block number:%2d data:%s", blockNo, sprint_hex(block, 16));
 
 	res = mfCSetBlock(blockNo, block, NULL, params);
@@ -2709,7 +2709,7 @@ int CmdHF14AMfCLoad(const char *Cmd) {
 	bool fillFromJson = false;
 	bool fillFromBin = false;
 	char fileName[50] = {0};
-	
+
 	char ctmp = tolower(param_getchar(Cmd, 0));
 	if ( param_getlength(Cmd, 0) == 1 ) {
 		if (ctmp == 'h' || ctmp == 0x00) return usage_hf14_cload();
@@ -2721,7 +2721,7 @@ int CmdHF14AMfCLoad(const char *Cmd) {
 	if (fillFromJson || fillFromBin)
 		param_getstr(Cmd, 1, fileName, sizeof(fileName));
 
-	
+
 	if (fillFromEmulator) {
 		for (blockNum = 0; blockNum < 16 * 4; blockNum += 1) {
 			if (mfEmlGetMem(buf8, blockNum, 1)) {
@@ -2755,15 +2755,15 @@ int CmdHF14AMfCLoad(const char *Cmd) {
 			res = loadFileEML( Cmd, "eml", data, &datalen);
 		}
 	}
-	
+
 	if ( res ) {
 		if ( data )
 			free(data);
 		return 1;
 	}
-	
+
 //	PrintAndLogEx(INFO, "DATA | %s", sprint_hex(data+1000, 24) );
-	
+
 
 	// 64 or 256blocks.
 	if (datalen != 1024 && datalen != 4096) {
@@ -2771,18 +2771,18 @@ int CmdHF14AMfCLoad(const char *Cmd) {
 		free(data);
 		return 2;
 	}
-	
+
 	PrintAndLogEx(INFO, "Copying to magic card");
-			
+
 	blockNum = 0;
 	while ( datalen ) {
 
-		// switch on field and send magic sequence	
+		// switch on field and send magic sequence
 		if (blockNum == 0) flags = MAGIC_INIT + MAGIC_WUPC;
 
-		// write					
+		// write
 		if (blockNum == 1) flags = 0;
-		
+
 		// Switch off field.
 		if (blockNum == 16 * 4 - 1) flags = MAGIC_HALT + MAGIC_OFF;
 
@@ -2791,14 +2791,14 @@ int CmdHF14AMfCLoad(const char *Cmd) {
 			free(data);
 			return 3;
 		}
-		
+
 		datalen -= 16;
-		
+
 		printf("."); fflush(stdout);
 		blockNum++;
-		
+
 		// magic card type - mifare 1K
-		if (blockNum >= MIFARE_1K_MAXBLOCK ) break;  
+		if (blockNum >= MIFARE_1K_MAXBLOCK ) break;
 	}
 	PrintAndLogEx(NORMAL, "\n");
 
@@ -2808,8 +2808,8 @@ int CmdHF14AMfCLoad(const char *Cmd) {
 		free(data);
 		return 4;
 	}
-	
-	PrintAndLogEx(SUCCESS, "Card loaded %d blocks from file", blockNum);	
+
+	PrintAndLogEx(SUCCESS, "Card loaded %d blocks from file", blockNum);
 	free(data);
 	return 0;
 }
@@ -2832,9 +2832,9 @@ int CmdHF14AMfCGetBlk(const char *Cmd) {
 		PrintAndLogEx(WARNING, "Can't read block. error=%d", res);
 		return 1;
 	}
-	
+
 	PrintAndLogEx(NORMAL, "data: %s", sprint_hex(data, sizeof(data)));
-	
+
 	if (mfIsSectorTrailer(blockNo)) {
 		PrintAndLogEx(NORMAL, "Trailer decoded:");
 		PrintAndLogEx(NORMAL, "Key A: %s", sprint_hex_inrow(data, 6));
@@ -2847,7 +2847,7 @@ int CmdHF14AMfCGetBlk(const char *Cmd) {
 		}
 		PrintAndLogEx(NORMAL, "UserData: %s", sprint_hex_inrow(&data[9], 1));
 	}
-		
+
 	return 0;
 }
 
@@ -2873,9 +2873,9 @@ int CmdHF14AMfCGetSc(const char *Cmd) {
 		blocks = 16;
 		start = 128 + ( sector - 32 ) * 16;
 	}
-	
+
 	flags = MAGIC_INIT + MAGIC_WUPC;
-	
+
 	for (i = 0; i < blocks; i++) {
 		if (i == 1) flags = 0;
 		if (i == blocks-1) flags = MAGIC_HALT + MAGIC_OFF;
@@ -2894,7 +2894,7 @@ int CmdHF14AMfCSave(const char *Cmd) {
 
 	char filename[FILE_PATH_SIZE];
 	char * fnameptr = filename;
-	uint8_t *dump;	
+	uint8_t *dump;
 	bool fillEmulator = false;
 	bool errors = false, hasname = false, useuid = false;
 	int i, len, flags;
@@ -2904,7 +2904,7 @@ int CmdHF14AMfCSave(const char *Cmd) {
 
 	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
 		ctmp = tolower(param_getchar(Cmd, cmdp));
-		switch (ctmp) {	
+		switch (ctmp) {
 		case 'e':
 			useuid = true;
 			fillEmulator = true;
@@ -2924,7 +2924,7 @@ int CmdHF14AMfCSave(const char *Cmd) {
 		case 'u':
 			useuid = true;
 			hasname = true;
-			cmdp++;			
+			cmdp++;
 			break;
 		case 'o':
 			len = param_getstr(Cmd, cmdp+1, filename, FILE_PATH_SIZE);
@@ -2934,9 +2934,9 @@ int CmdHF14AMfCSave(const char *Cmd) {
 			}
 
 			useuid = false;
-			hasname = true;		
+			hasname = true;
 			cmdp += 2;
-			break;			
+			break;
 		default:
 			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
 			errors = true;
@@ -2945,7 +2945,7 @@ int CmdHF14AMfCSave(const char *Cmd) {
 	}
 
 	if (!hasname && !fillEmulator) errors = true;
-	
+
 	if (errors || cmdp == 0) return usage_hf14_csave();
 
 	dump = calloc(bytes, sizeof(uint8_t));
@@ -2954,27 +2954,27 @@ int CmdHF14AMfCSave(const char *Cmd) {
 		return 1;
 	}
 	memset(dump, 0, bytes);
-	
+
 	flags = MAGIC_INIT + MAGIC_WUPC;
 	for (i = 0; i < numblocks; i++) {
 		if (i == 1) flags = 0;
 		if (i == numblocks - 1) flags = MAGIC_HALT + MAGIC_OFF;
-	
+
 		if (mfCGetBlock(i, dump + (i*MFBLOCK_SIZE), flags)) {
 			PrintAndLogEx(WARNING, "Cant get block: %d", i);
 			free(dump);
 			return 2;
 		}
 	}
-	
+
 	if ( useuid ){
-		fnameptr += sprintf(fnameptr, "hf-mf-");		
+		fnameptr += sprintf(fnameptr, "hf-mf-");
 		FillFileNameByUID(fnameptr, dump, "-dump", 4);
 	}
-	
+
 	if (fillEmulator) {
 		PrintAndLogEx(INFO, "uploading to emulator memory");
-		for (i = 0; i < numblocks; i += 5) {			
+		for (i = 0; i < numblocks; i += 5) {
 			if (mfEmlSetMem(dump + (i*MFBLOCK_SIZE), i, 5)) {
 				PrintAndLogEx(WARNING, "Cant set emul block: %d", i);
 			}
@@ -2993,10 +2993,10 @@ int CmdHF14AMfCSave(const char *Cmd) {
 
 //needs nt, ar, at, Data to decrypt
 int CmdHf14AMfDecryptBytes(const char *Cmd){
-	
+
 	char ctmp = tolower(param_getchar(Cmd, 0));
 	if (strlen(Cmd) < 1 || ctmp == 'h') return usage_hf14_decryptbytes();
-	
+
 	uint32_t nt 	= param_get32ex(Cmd,0,0,16);
 	uint32_t ar_enc = param_get32ex(Cmd,1,0,16);
 	uint32_t at_enc = param_get32ex(Cmd,2,0,16);
@@ -3010,7 +3010,7 @@ int CmdHf14AMfDecryptBytes(const char *Cmd){
 	PrintAndLogEx(NORMAL, "nt\t%08X", nt);
 	PrintAndLogEx(NORMAL, "ar enc\t%08X", ar_enc);
 	PrintAndLogEx(NORMAL, "at enc\t%08X", at_enc);
-		
+
 	uint8_t *data = calloc(len, sizeof(uint8_t));
 	param_gethex_ex(Cmd, 3, data, &len);
 	len >>= 1;
@@ -3065,7 +3065,7 @@ int CmdHf14AMfNack(const char *Cmd) {
 
 	if ( verbose )
 		PrintAndLogEx(INFO, "Started testing card for NACK bug. Press key to abort");
-	
+
 	detect_classic_nackbug(verbose);
 	return 0;
 }
@@ -3114,14 +3114,14 @@ int CmdHF14AMfice(const char *Cmd) {
 	if(filename[0]=='\0')
 	{
 		fptr = GenerateFilename("hf-mf-","-nonces.bin");
-		if (fptr == NULL) 
+		if (fptr == NULL)
 			return 1;
 		strcpy(filename, fptr);
 	}
 
 	PrintAndLogEx(NORMAL, "Collecting %u nonces \n", limit);
-	
-	if ((fnonces = fopen(filename,"wb")) == NULL) { 
+
+	if ((fnonces = fopen(filename,"wb")) == NULL) {
 		PrintAndLogEx(WARNING, "Could not create file " _YELLOW_(%s),filename);
 		return 3;
 	}
@@ -3129,21 +3129,21 @@ int CmdHF14AMfice(const char *Cmd) {
 	clearCommandBuffer();
 
 	uint64_t t1 = msclock();
-	
+
 	do {
 		if (ukbhit()) {
 			int gc = getchar(); (void)gc;
 			PrintAndLogEx(INFO, "\naborted via keyboard!\n");
 			break;
 		}
-		
+
 		flags = 0;
 		flags |= initialize ? 0x0001 : 0;
 		flags |= slow ? 0x0002 : 0;
 		UsbCommand c = {CMD_MIFARE_ACQUIRE_NONCES, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, flags}};
 		clearCommandBuffer();
-		SendCommand(&c);		
-	
+		SendCommand(&c);
+
 		if (!WaitForResponseTimeout(CMD_ACK, &resp, 3000)) goto out;
 		if (resp.arg[0])  goto out;
 
@@ -3152,22 +3152,22 @@ int CmdHF14AMfice(const char *Cmd) {
 			fwrite(resp.d.asBytes, 1, items*4, fnonces);
 			fflush(fnonces);
 		}
-	
+
 		total_num_nonces += items;
 		if ( total_num_nonces > part_limit ) {
 			PrintAndLogEx(INFO, "Total nonces %u\n", total_num_nonces);
 			part_limit += 3000;
 		}
-		
-		acquisition_completed = ( total_num_nonces > limit); 
+
+		acquisition_completed = ( total_num_nonces > limit);
 
 		initialize = false;
-		
+
 	} while (!acquisition_completed);
 
 out:
 	PrintAndLogEx(SUCCESS, "time: %" PRIu64 " seconds\n", (msclock()-t1)/1000);
-	
+
 	if ( fnonces ) {
 		fflush(fnonces);
 		fclose(fnonces);
@@ -3185,8 +3185,8 @@ int CmdHF14AMfAuth4(const char *Cmd) {
 	uint8_t key[16] = {0};
 	int keylen = 0;
 
-	CLIParserInit("hf mf auth4", 
-		"Executes AES authentication command in ISO14443-4", 
+	CLIParserInit("hf mf auth4",
+		"Executes AES authentication command in ISO14443-4",
 		"Usage:\n\thf mf auth4 4000 000102030405060708090a0b0c0d0e0f -> executes authentication\n"
 			"\thf mf auth4 9003 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -> executes authentication\n");
 
@@ -3197,16 +3197,16 @@ int CmdHF14AMfAuth4(const char *Cmd) {
 		arg_param_end
 	};
 	CLIExecWithReturn(Cmd, argtable, true);
-	
+
 	CLIGetHexWithReturn(1, keyn, &keynlen);
 	CLIGetHexWithReturn(2, key, &keylen);
 	CLIParserFree();
-	
+
 	if (keynlen != 2) {
 		PrintAndLogEx(ERR, "<Key Num> must be 2 bytes long instead of: %d", keynlen);
 		return 1;
 	}
-	
+
 	if (keylen != 16) {
 		PrintAndLogEx(ERR, "<Key Value> must be 16 bytes long instead of: %d", keylen);
 		return 1;
@@ -3218,8 +3218,8 @@ int CmdHF14AMfAuth4(const char *Cmd) {
 // https://www.nxp.com/docs/en/application-note/AN10787.pdf
 int CmdHF14AMfMAD(const char *cmd) {
 
-	CLIParserInit("hf mf mad", 
-		"Checks and prints Mifare Application Directory (MAD)", 
+	CLIParserInit("hf mf mad",
+		"Checks and prints Mifare Application Directory (MAD)",
 		"Usage:\n\thf mf mad -> shows MAD if exists\n"
 			"\thf mf mad -a 03e1 -k ffffffffffff -b -> shows NDEF data if exists. read card with custom key and key B\n");
 
@@ -3240,7 +3240,7 @@ int CmdHF14AMfMAD(const char *cmd) {
 	int keylen;
 	CLIGetHexWithReturn(3, key, &keylen);
 	bool keyB = arg_get_lit(4);
-	
+
 	CLIParserFree();
 
 	if (aidlen != 2 && keylen > 0) {
@@ -3253,15 +3253,15 @@ int CmdHF14AMfMAD(const char *cmd) {
 		PrintAndLogEx(ERR, "read sector 0 error. card don't have MAD or don't have MAD on default keys.");
 		return 2;
 	}
-	
+
 	if (verbose) {
 		for(int i = 0; i < 4; i ++)
-			PrintAndLogEx(NORMAL, "[%d] %s", i, sprint_hex(&sector0[i * 16], 16));		
+			PrintAndLogEx(NORMAL, "[%d] %s", i, sprint_hex(&sector0[i * 16], 16));
 	}
 
 	bool haveMAD2 = false;
 	MAD1DecodeAndPrint(sector0, verbose, &haveMAD2);
-	
+
 	if (haveMAD2) {
 		if (mfReadSector(MF_MAD2_SECTOR, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector10)) {
 			PrintAndLogEx(ERR, "read sector 0x10 error. card don't have MAD or don't have MAD on default keys.");
@@ -3274,7 +3274,7 @@ int CmdHF14AMfMAD(const char *cmd) {
 	if (aidlen == 2) {
 		uint16_t aaid = (aid[0] << 8) + aid[1];
 		PrintAndLogEx(NORMAL, "\n-------------- AID 0x%04x ---------------", aaid);
-		
+
 		uint16_t mad[7 + 8 + 8 + 8 + 8] = {0};
 		size_t madlen = 0;
 		if (MADDecode(sector0, sector10, mad, &madlen)) {
@@ -3287,7 +3287,7 @@ int CmdHF14AMfMAD(const char *cmd) {
 		if (keylen == 6) {
 			memcpy(akey, key, 6);
 		}
-		
+
 		for (int i = 0; i < madlen; i++) {
 			if (aaid == mad[i]) {
 				uint8_t vsector[16 * 4] = {0};
@@ -3296,20 +3296,20 @@ int CmdHF14AMfMAD(const char *cmd) {
 					PrintAndLogEx(ERR, "read sector %d error.", i + 1);
 					return 2;
 				}
-				
+
 				for(int j = 0; j < (verbose ? 4 : 3); j ++)
-					PrintAndLogEx(NORMAL, " [%03d] %s", (i + 1) * 4 + j, sprint_hex(&vsector[j * 16], 16));		
+					PrintAndLogEx(NORMAL, " [%03d] %s", (i + 1) * 4 + j, sprint_hex(&vsector[j * 16], 16));
 			}
-		}		
+		}
 	}
-	
+
 	return 0;
 }
 
 int CmdHFMFNDEF(const char *cmd) {
 
-	CLIParserInit("hf mf ndef", 
-		"Prints NFC Data Exchange Format (NDEF)", 
+	CLIParserInit("hf mf ndef",
+		"Prints NFC Data Exchange Format (NDEF)",
 		"Usage:\n\thf mf ndef -> shows NDEF data\n"
 			"\thf mf ndef -a 03e1 -k ffffffffffff -b -> shows NDEF data with custom AID, key and with key B\n");
 
@@ -3322,7 +3322,7 @@ int CmdHFMFNDEF(const char *cmd) {
 		arg_param_end
 	};
 	CLIExecWithReturn(cmd, argtable, true);
-	
+
 	bool verbose = arg_get_lit(1);
 	bool verbose2 = arg_get_lit(1) > 1;
 	uint8_t aid[2] = {0};
@@ -3332,38 +3332,38 @@ int CmdHFMFNDEF(const char *cmd) {
 	int keylen;
 	CLIGetHexWithReturn(3, key, &keylen);
 	bool keyB = arg_get_lit(4);
-	
+
 	CLIParserFree();
 
 	uint16_t ndefAID = 0x03e1;
 	if (aidlen == 2)
 		ndefAID = (aid[0] << 8) + aid[1];
-	
+
 	uint8_t ndefkey[6] = {0};
 	memcpy(ndefkey, g_mifare_ndef_key, 6);
 	if (keylen == 6) {
 		memcpy(ndefkey, key, 6);
 	}
-	
+
 	uint8_t sector0[16 * 4] = {0};
 	uint8_t sector10[16 * 4] = {0};
 	uint8_t data[4096] = {0};
 	int datalen = 0;
 
 	PrintAndLogEx(NORMAL, "");
-	
+
 	if (mfReadSector(MF_MAD1_SECTOR, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector0)) {
 		PrintAndLogEx(ERR, "read sector 0 error. card don't have MAD or don't have MAD on default keys.");
 		return 2;
 	}
-	
+
 	bool haveMAD2 = false;
 	int res = MADCheck(sector0, NULL, verbose, &haveMAD2);
 	if (res) {
 		PrintAndLogEx(ERR, "MAD error %d.", res);
 		return res;
 	}
-	
+
 	if (haveMAD2) {
 		if (mfReadSector(MF_MAD2_SECTOR, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector10)) {
 			PrintAndLogEx(ERR, "read sector 0x10 error. card don't have MAD or don't have MAD on default keys.");
@@ -3386,25 +3386,25 @@ int CmdHFMFNDEF(const char *cmd) {
 				PrintAndLogEx(ERR, "read sector %d error.", i + 1);
 				return 2;
 			}
-			
+
 			memcpy(&data[datalen], vsector, 16 * 3);
 			datalen += 16 * 3;
-			
+
 			printf(".");
 		}
 	}
 	printf(" OK\n");
-	
+
 	if (!datalen) {
 		PrintAndLogEx(ERR, "no NDEF data.");
 		return 11;
 	}
-	
+
 	if (verbose2) {
 		PrintAndLogEx(NORMAL, "NDEF data:");
 		dump_buffer(data, datalen, stdout, 1);
 	}
-		
+
 	NDEFDecodeAndPrint(data, datalen, verbose);
 
 	return 0;
@@ -3417,11 +3417,11 @@ int CmdHF14AMfList(const char *Cmd) {
 
 static command_t CommandTable[] = {
 	{"help",		CmdHelp,				1, "This help"},
-	{"list",		CmdHF14AMfList,         0, "[Deprecated] List ISO 14443-a / Mifare history"},	
+	{"list",		CmdHF14AMfList,         0, "[Deprecated] List ISO 14443-a / Mifare history"},
 	{"darkside",	CmdHF14AMfDarkside,		0, "Darkside attack. read parity error messages."},
 	{"nested",		CmdHF14AMfNested,		0, "Nested attack. Test nested authentication"},
 	{"hardnested", 	CmdHF14AMfNestedHard, 	0, "Nested attack for hardened Mifare cards"},
-	{"keybrute",	CmdHF14AMfKeyBrute,		0, "J_Run's 2nd phase of multiple sector nested authentication key recovery"},	
+	{"keybrute",	CmdHF14AMfKeyBrute,		0, "J_Run's 2nd phase of multiple sector nested authentication key recovery"},
 	{"nack",		CmdHf14AMfNack,			0, "Test for Mifare NACK bug"},
 	{"chk",			CmdHF14AMfChk,			0, "Check keys"},
 	{"fchk",		CmdHF14AMfChk_fast,		0, "Check keys fast, targets all keys on card"},
@@ -3433,7 +3433,7 @@ static command_t CommandTable[] = {
 	{"dump",		CmdHF14AMfDump,			0, "Dump MIFARE classic tag to binary file"},
 	{"restore",		CmdHF14AMfRestore,		0, "Restore MIFARE classic binary file to BLANK tag"},
 	{"wrbl",		CmdHF14AMfWrBl,			0, "Write MIFARE classic block"},
-	{"setmod",		CmdHf14AMfSetMod, 		0, "Set MIFARE Classic EV1 load modulation strength"},	
+	{"setmod",		CmdHf14AMfSetMod, 		0, "Set MIFARE Classic EV1 load modulation strength"},
 	{"auth4",		CmdHF14AMfAuth4,		0, "ISO14443-4 AES authentication"},
 //	{"sniff",		CmdHF14AMfSniff,		0, "Sniff card-reader communication"},
 	{"-----------",	CmdHelp,				1, ""},
diff --git a/client/cmdhfmfdes.c b/client/cmdhfmfdes.c
index 0bf5b2443..9ddd23b5f 100644
--- a/client/cmdhfmfdes.c
+++ b/client/cmdhfmfdes.c
@@ -41,14 +41,14 @@ int CmdHF14ADesWb(const char *Cmd)
 	uint8_t keyType = 0;
 	uint8_t key[6] = {0, 0, 0, 0, 0, 0};
 	uint8_t bldata[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-	
+
 	char cmdp	= 0x00;
 
 	if (strlen(Cmd)<3) {
 		PrintAndLogEx(NORMAL, "Usage:  hf mf wrbl    <block number> <key A/B> <key (12 hex symbols)> <block data (32 hex symbols)>");
 		PrintAndLogEx(NORMAL, "        sample: hf mf wrbl 0 A FFFFFFFFFFFF 000102030405060708090A0B0C0D0E0F");
 		return 0;
-	}	
+	}
 
 	blockNo = param_get8(Cmd, 0);
 	cmdp = param_getchar(Cmd, 1);
@@ -67,7 +67,7 @@ int CmdHF14ADesWb(const char *Cmd)
 	}
 	PrintAndLogEx(NORMAL, "--block no:%02x key type:%02x key:%s", blockNo, keyType, sprint_hex(key, 6));
 	PrintAndLogEx(NORMAL, "--data: %s", sprint_hex(bldata, 16));
-	
+
   UsbCommand c = {CMD_MIFARE_WRITEBL, {blockNo, keyType, 0}};
 	memcpy(c.d.asBytes, key, 6);
 	memcpy(c.d.asBytes + 10, bldata, 16);
@@ -89,7 +89,7 @@ int CmdHF14ADesRb(const char *Cmd)
 	// uint8_t blockNo = 0;
 	// uint8_t keyType = 0;
 	// uint8_t key[6] = {0, 0, 0, 0, 0, 0};
-	
+
 	// char cmdp	= 0x00;
 
 
@@ -97,8 +97,8 @@ int CmdHF14ADesRb(const char *Cmd)
 		// PrintAndLogEx(NORMAL, "Usage:  hf mf rdbl    <block number> <key A/B> <key (12 hex symbols)>");
 		// PrintAndLogEx(NORMAL, "        sample: hf mf rdbl 0 A FFFFFFFFFFFF ");
 		// return 0;
-	// }	
-	
+	// }
+
 	// blockNo = param_get8(Cmd, 0);
 	// cmdp = param_getchar(Cmd, 1);
 	// if (cmdp == 0x00) {
@@ -111,7 +111,7 @@ int CmdHF14ADesRb(const char *Cmd)
 		// return 1;
 	// }
 	// PrintAndLogEx(NORMAL, "--block no:%02x key type:%02x key:%s ", blockNo, keyType, sprint_hex(key, 6));
-	
+
   // UsbCommand c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}};
 	// memcpy(c.d.asBytes, key, 6);
   // SendCommand(&c);
@@ -137,7 +137,7 @@ int CmdHF14ADesInfo(const char *Cmd){
 	UsbCommand c = {CMD_MIFARE_DESFIRE_INFO};
     SendCommand(&c);
 	UsbCommand resp;
-	
+
 	if ( !WaitForResponseTimeout(CMD_ACK,&resp,1500) ) {
 		PrintAndLogEx(WARNING, "Command execute timeout");
 		return 0;
@@ -145,16 +145,16 @@ int CmdHF14ADesInfo(const char *Cmd){
 	uint8_t isOK  = resp.arg[0] & 0xff;
 	if ( !isOK ){
 		switch ( resp.arg[1] ) {
-			case 1: 
+			case 1:
 				PrintAndLogEx(WARNING, "Can't select card"); break;
 			case 2:
 				PrintAndLogEx(WARNING, "Card is most likely not Desfire. Its UID has wrong size"); break;
-			case 3:				
+			case 3:
 			default:
 				PrintAndLogEx(WARNING, "Command unsuccessful"); break;
 		}
 		return 0;
-	}  
+	}
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "-- Desfire Information --------------------------------------");
 	PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
@@ -178,21 +178,21 @@ int CmdHF14ADesInfo(const char *Cmd){
 	PrintAndLogEx(NORMAL, "      storage size   : %s", GetCardSizeStr(resp.d.asBytes[19]));
 	PrintAndLogEx(NORMAL, "      Protocol       : %s", GetProtocolStr(resp.d.asBytes[20]));
 	PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
-	
+
 	// Master Key settings
 	GetKeySettings(NULL);
-	
+
 	// Free memory on card
 	c.cmd = CMD_MIFARE_DESFIRE;
 	c.arg[0] = (INIT | DISCONNECT);
 	c.arg[1] = 0x01;
 	c.d.asBytes[0] = GET_FREE_MEMORY;
     SendCommand(&c);
-	if ( !WaitForResponseTimeout(CMD_ACK,&resp,1500)) 
+	if ( !WaitForResponseTimeout(CMD_ACK,&resp,1500))
 		return 0;
-	
+
 	uint8_t tmp[3];
-	memcpy(tmp, resp.d.asBytes+3,3); 
+	memcpy(tmp, resp.d.asBytes+3,3);
 
 	PrintAndLogEx(NORMAL, "   Available free memory on card       : %d bytes", le24toh( tmp ));
 	PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
@@ -203,37 +203,37 @@ int CmdHF14ADesInfo(const char *Cmd){
 		Application keys (APK)       0x01-0x0D
 		Application free             0x0E
 		Application never            0x0F
-		
+
 		ACCESS RIGHTS:
 		keys 0,1,2,3     C
 		keys 4,5,6,7     RW
 		keys 8,9,10,11   W
 		keys 12,13,14,15 R
-	
+
 	*/
-	
+
     return 1;
 }
 
 /*
-  The 7 MSBits (= n) code the storage size itself based on 2^n, 
+  The 7 MSBits (= n) code the storage size itself based on 2^n,
   the LSBit is set to '0' if the size is exactly 2^n
-	and set to '1' if the storage size is between 2^n and 2^(n+1). 
+	and set to '1' if the storage size is between 2^n and 2^(n+1).
 	For this version of DESFire the 7 MSBits are set to 0x0C (2^12 = 4096) and the LSBit is '0'.
 */
 char * GetCardSizeStr( uint8_t fsize ){
- 
+
  	static char buf[30] = {0x00};
 	char *retStr = buf;
 
 	uint16_t usize = 1 << ((fsize >>1) + 1);
 	uint16_t lsize = 1 << (fsize >>1);
-	
+
 	// is  LSB set?
 	if (  fsize & 1 )
 		sprintf(retStr, "0x%02X (%d - %d bytes)",fsize, usize, lsize);
-	else 
-		sprintf(retStr, "0x%02X (%d bytes)", fsize, lsize);		
+	else
+		sprintf(retStr, "0x%02X (%d bytes)", fsize, lsize);
 	return buf;
 }
 
@@ -245,7 +245,7 @@ char * GetProtocolStr(uint8_t id){
 	if ( id == 0x05)
 		sprintf(retStr,"0x%02X (ISO 14443-3, 14443-4)", id);
 	else
-		sprintf(retStr,"0x%02X (Unknown)", id);	
+		sprintf(retStr,"0x%02X (Unknown)", id);
 	return buf;
 }
 
@@ -255,7 +255,7 @@ char * GetVersionStr(uint8_t major, uint8_t minor){
 	char *retStr = buf;
 
 	if ( major == 0x00)
-		sprintf(retStr,"%d.%d (Desfire MF3ICD40)", major, minor);	
+		sprintf(retStr,"%d.%d (Desfire MF3ICD40)", major, minor);
 	else if ( major == 0x01 && minor == 0x00)
 		sprintf(retStr,"%d.%d (Desfire EV1)", major, minor);
 	else if ( major == 0x12 && minor == 0x00)
@@ -266,7 +266,7 @@ char * GetVersionStr(uint8_t major, uint8_t minor){
 }
 
 void GetKeySettings( uint8_t *aid){
-	
+
 	char messStr[512] = {0x00};
 	char *str = messStr;
 	uint8_t isOK = 0;
@@ -275,7 +275,7 @@ void GetKeySettings( uint8_t *aid){
 	UsbCommand resp;
 
 	//memset(messStr, 0x00, 512);
-	
+
 	if ( aid == NULL ){
 		PrintAndLogEx(NORMAL, " CMK - PICC, Card Master Key settings ");
 		PrintAndLogEx(NORMAL, "");
@@ -283,14 +283,14 @@ void GetKeySettings( uint8_t *aid){
 		c.arg[LENPOS] =  0x01;
 		c.d.asBytes[0] = GET_KEY_SETTINGS;  // 0x45
 		SendCommand(&c);
-		if ( !WaitForResponseTimeout(CMD_ACK,&resp,1000) ) {return;}  
+		if ( !WaitForResponseTimeout(CMD_ACK,&resp,1000) ) {return;}
 		isOK  = resp.arg[0] & 0xff;
 		if ( !isOK ){
-			PrintAndLogEx(WARNING, "   Can't select master application");	
+			PrintAndLogEx(WARNING, "   Can't select master application");
 			return;
-		}	
+		}
 
-		str = (resp.d.asBytes[3] & (1 << 3 )) ? "YES":"NO";	
+		str = (resp.d.asBytes[3] & (1 << 3 )) ? "YES":"NO";
 		PrintAndLogEx(NORMAL, "   [0x08] Configuration changeable       : %s", str);
 		str = (resp.d.asBytes[3] & (1 << 2 )) ? "NO":"YES";
 		PrintAndLogEx(NORMAL, "   [0x04] CMK required for create/delete : %s",str);
@@ -298,7 +298,7 @@ void GetKeySettings( uint8_t *aid){
 		PrintAndLogEx(NORMAL, "   [0x02] Directory list access with CMK : %s",str);
 		str = (resp.d.asBytes[3] & (1 << 0 )) ? "YES" : "NO";
 		PrintAndLogEx(NORMAL, "   [0x01] CMK is changeable              : %s", str);
-			
+
 		c.arg[LENPOS] = 0x02; //LEN
 		c.d.asBytes[0] = GET_KEY_VERSION; //0x64
 		c.d.asBytes[1] = 0x00;
@@ -313,7 +313,7 @@ void GetKeySettings( uint8_t *aid){
 		PrintAndLogEx(NORMAL, "   Max number of keys       : %d", resp.d.asBytes[4]);
 		PrintAndLogEx(NORMAL, "   Master key Version       : %d (0x%02x)", resp.d.asBytes[3], resp.d.asBytes[3]);
 		PrintAndLogEx(NORMAL, "   ----------------------------------------------------------");
-		
+
 		c.arg[LENPOS] = 0x02; //LEN
 		c.d.asBytes[0] = AUTHENTICATE; //0x0A
 		c.d.asBytes[1] = 0x00; // KEY 0
@@ -327,7 +327,7 @@ void GetKeySettings( uint8_t *aid){
 		if ( !WaitForResponseTimeout(CMD_ACK,&resp,1000) ) {return;}
 		isOK  = resp.d.asBytes[2] & 0xff;
 		PrintAndLogEx(NORMAL, "   [0x1A] Authenticate ISO  : %s", ( isOK==0xAE ) ? "NO":"YES");
-		
+
 		c.d.asBytes[0] = AUTHENTICATE_AES; //0xAA
 		SendCommand(&c);
 		if ( !WaitForResponseTimeout(CMD_ACK,&resp,1000) ) {return;}
@@ -335,32 +335,32 @@ void GetKeySettings( uint8_t *aid){
 		PrintAndLogEx(NORMAL, "   [0xAA] Authenticate AES  : %s", ( isOK==0xAE ) ? "NO":"YES");
 		PrintAndLogEx(NORMAL, "");
 		PrintAndLogEx(NORMAL, "   ----------------------------------------------------------");
-		
+
 	} else {
 		PrintAndLogEx(NORMAL, " AMK - Application Master Key settings");
-		
+
 		// SELECT AID
 		c.arg[0] = (INIT | CLEARTRACE);
 		c.arg[LENPOS] = 0x04;
 		c.d.asBytes[0] = SELECT_APPLICATION;  // 0x5a
 		memcpy(c.d.asBytes+1, aid, 3);
 		SendCommand(&c);
-		
+
 		if (!WaitForResponseTimeout(CMD_ACK,&resp,1500) ) {
 			PrintAndLogEx(WARNING, "   Timed-out");
 			return;
-		} 
+		}
 		isOK  = resp.arg[0] & 0xff;
 		if ( !isOK ){
-			PrintAndLogEx(WARNING, "   Can't select AID: %s",sprint_hex(aid,3));	
+			PrintAndLogEx(WARNING, "   Can't select AID: %s",sprint_hex(aid,3));
 			return;
-		}		
-		
+		}
+
 		// KEY SETTINGS
 		options = NONE;
 		c.arg[0] = options;
 		c.arg[LENPOS] = 0x01;
-		c.d.asBytes[0] = GET_KEY_SETTINGS; // 0x45		
+		c.d.asBytes[0] = GET_KEY_SETTINGS; // 0x45
 		SendCommand(&c);
 		if ( !WaitForResponseTimeout(CMD_ACK,&resp,1500) ) {
 			return;
@@ -387,9 +387,9 @@ void GetKeySettings( uint8_t *aid){
 			}
 			PrintAndLogEx(NORMAL, "Changekey Access rights");
 			PrintAndLogEx(NORMAL, "-- %s",str);
-			PrintAndLogEx(NORMAL, "");	
+			PrintAndLogEx(NORMAL, "");
 			// same as CMK
-			str = (resp.d.asBytes[3] & (1 << 3 )) ? "YES":"NO";	
+			str = (resp.d.asBytes[3] & (1 << 3 )) ? "YES":"NO";
 			PrintAndLogEx(NORMAL, "   0x08 Configuration changeable       : %s", str);
 			str = (resp.d.asBytes[3] & (1 << 2 )) ? "NO":"YES";
 			PrintAndLogEx(NORMAL, "   0x04 AMK required for create/delete : %s",str);
@@ -398,8 +398,8 @@ void GetKeySettings( uint8_t *aid){
 			str = (resp.d.asBytes[3] & (1 << 0 )) ? "YES" : "NO";
 			PrintAndLogEx(NORMAL, "   0x01 AMK is changeable              : %s", str);
 		}
-		
-		// KEY VERSION  - AMK 
+
+		// KEY VERSION  - AMK
 		c.arg[0] = NONE;
 		c.arg[LENPOS] = 0x02;
 		c.d.asBytes[0] = GET_KEY_VERSION; //0x64
@@ -409,9 +409,9 @@ void GetKeySettings( uint8_t *aid){
 			PrintAndLogEx(WARNING, "   Timed-out");
 			return;
 		}
-		
+
 		int numOfKeys;
-		
+
 		isOK  = resp.arg[0] & 0xff;
 		if ( !isOK ){
 			PrintAndLogEx(WARNING, "   Can't read Application Master key version. Trying all keys");
@@ -422,83 +422,83 @@ void GetKeySettings( uint8_t *aid){
 			PrintAndLogEx(NORMAL, "");
 			PrintAndLogEx(NORMAL, "     Max number of keys  : %d", numOfKeys );
 			PrintAndLogEx(NORMAL, "     Application Master key Version  : %d (0x%02x)", resp.d.asBytes[3], resp.d.asBytes[3]);
-			PrintAndLogEx(NORMAL, "-------------------------------------------------------------");			
+			PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
 		}
-		
-		// LOOP over numOfKeys that we got before. 
+
+		// LOOP over numOfKeys that we got before.
 		// From 0x01 to numOfKeys.  We already got 0x00. (AMK)
 		for(int i=0x01; i<=0x0f; ++i){
-					
+
 		}
-		
-		
+
+
 	}
 }
 
 int CmdHF14ADesEnumApplications(const char *Cmd){
-	
+
 	uint8_t isOK = 0x00;
 	uint8_t aid[3];
 	uint32_t options = (INIT | DISCONNECT);
-	
+
 	UsbCommand c = {CMD_MIFARE_DESFIRE, {options , 0x01 }};
 	c.d.asBytes[0] = GET_APPLICATION_IDS;  //0x6a
-	
+
     SendCommand(&c);
 	UsbCommand resp;
-		
+
 	if ( !WaitForResponseTimeout(CMD_ACK,&resp,1500) ) {
 		return 0;
-	}  
+	}
 	isOK  = resp.arg[0] & 0xff;
 	if ( !isOK ){
 		PrintAndLogEx(NORMAL, "Command unsuccessful");
 		return 0;
-	} 
-	PrintAndLogEx(NORMAL, "");	
+	}
+	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "-- Desfire Enumerate Applications ---------------------------");
 	PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
 
 	UsbCommand respAid;
 	UsbCommand respFiles;
-	
+
 	uint8_t num = 0;
 	int max = resp.arg[1] -3 -2;
-	
+
 	for(int i=3; i<=max; i+=3){
 		PrintAndLogEx(NORMAL, " Aid %d : %02X %02X %02X ",num ,resp.d.asBytes[i],resp.d.asBytes[i+1],resp.d.asBytes[i+2]);
 		num++;
-		
+
 		aid[0] = resp.d.asBytes[i];
 		aid[1] = resp.d.asBytes[i+1];
 		aid[2] = resp.d.asBytes[i+2];
 		GetKeySettings(aid);
-		
+
 		// Select Application
 		c.arg[CMDPOS] = INIT;
-		c.arg[LENPOS] = 0x04; 
+		c.arg[LENPOS] = 0x04;
 		c.d.asBytes[0] = SELECT_APPLICATION;  // 0x5a
 		c.d.asBytes[1] = resp.d.asBytes[i];
-		c.d.asBytes[2] = resp.d.asBytes[i+1];		
+		c.d.asBytes[2] = resp.d.asBytes[i+1];
 		c.d.asBytes[3] = resp.d.asBytes[i+2];
 		SendCommand(&c);
-		
+
 		if (!WaitForResponseTimeout(CMD_ACK,&respAid,1500) ) {
 			PrintAndLogEx(WARNING, "   Timed-out");
 			continue;
-		} 
+		}
 		isOK  = respAid.d.asBytes[2] & 0xff;
 		if ( isOK != 0x00 ){
-			PrintAndLogEx(WARNING, "   Can't select AID: %s",sprint_hex(resp.d.asBytes+i,3));	
+			PrintAndLogEx(WARNING, "   Can't select AID: %s",sprint_hex(resp.d.asBytes+i,3));
 			continue;
 		}
-	
+
 		// Get File IDs
 		c.arg[CMDPOS] = NONE;
 		c.arg[LENPOS] = 0x01;
 		c.d.asBytes[0] = GET_FILE_IDS; // 0x6f
 		SendCommand(&c);
-		
+
 		if ( !WaitForResponseTimeout(CMD_ACK,&respFiles,1500) ) {
 			PrintAndLogEx(WARNING, "   Timed-out");
 			continue;
@@ -506,20 +506,20 @@ int CmdHF14ADesEnumApplications(const char *Cmd){
 			isOK  = respFiles.d.asBytes[2] & 0xff;
 			if ( !isOK ){
 				PrintAndLogEx(WARNING, "   Can't get file ids ");
-			} else {			
-				int respfileLen = resp.arg[1]-3-2;			
+			} else {
+				int respfileLen = resp.arg[1]-3-2;
 				for (int j=0; j< respfileLen; ++j){
 					PrintAndLogEx(NORMAL, "   Fileid %d :", resp.d.asBytes[j+3]);
 				}
 			}
 		}
-		
+
 		// Get ISO File IDs
 		c.arg[CMDPOS] = DISCONNECT;
 		c.arg[LENPOS] = 0x01;
 		c.d.asBytes[0] = GET_ISOFILE_IDS; // 0x61
 		SendCommand(&c);
-		
+
 		if ( !WaitForResponseTimeout(CMD_ACK,&respFiles,1500) ) {
 			PrintAndLogEx(WARNING, "   Timed-out");
 			continue;
@@ -527,27 +527,27 @@ int CmdHF14ADesEnumApplications(const char *Cmd){
 			isOK  = respFiles.d.asBytes[2] & 0xff;
 			if ( !isOK ){
 				PrintAndLogEx(WARNING, "   Can't get ISO file ids ");
-			} else {			
-				int respfileLen = resp.arg[1]-3-2;			
+			} else {
+				int respfileLen = resp.arg[1]-3-2;
 				for (int j=0; j< respfileLen; ++j){
 					PrintAndLogEx(NORMAL, " ISO  Fileid %d :", resp.d.asBytes[j+3]);
 				}
 			}
 		}
-		
-		
+
+
 	}
 	PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
-	
-	
+
+
 	return 1;
 }
 
 // MIAFRE DesFire Authentication
 //
-#define BUFSIZE 256 
+#define BUFSIZE 256
 int CmdHF14ADesAuth(const char *Cmd){
-    
+
 	// NR  DESC		KEYLENGHT
 	// ------------------------
 	// 1 = DES		8
@@ -556,8 +556,8 @@ int CmdHF14ADesAuth(const char *Cmd){
 	// 4 = AES		16
 
 	uint8_t keylength = 8;
-	unsigned char key[24];	
-	
+	unsigned char key[24];
+
     if (strlen(Cmd)<3) {
         PrintAndLogEx(NORMAL, "Usage:  hf mfdes auth <1|2|3> <1|2|3|4> <keyno> <key> ");
 		PrintAndLogEx(NORMAL, "		    Auth modes");
@@ -569,14 +569,14 @@ int CmdHF14ADesAuth(const char *Cmd){
 		PrintAndLogEx(NORMAL, "         hf mfdes auth 1 1 0 11223344");
 		PrintAndLogEx(NORMAL, "         hf mfdes auth 3 4 0 404142434445464748494a4b4c4d4e4f");
         return 0;
-    } 
+    }
 	uint8_t cmdAuthMode	= param_get8(Cmd,0);
 	uint8_t cmdAuthAlgo	= param_get8(Cmd,1);
 	uint8_t cmdKeyNo	= param_get8(Cmd,2);
-	
+
 	switch (cmdAuthMode)
 	{
-		case 1: 
+		case 1:
 			if ( cmdAuthAlgo != 1 && cmdAuthAlgo != 2) {
 				PrintAndLogEx(NORMAL, "Crypto algo not valid for the auth mode");
 				return 1;
@@ -599,13 +599,13 @@ int CmdHF14ADesAuth(const char *Cmd){
 			return 1;
 			break;
 	}
-	
+
 	switch (cmdAuthAlgo){
-		case 2: 
+		case 2:
 			keylength = 16;
 			PrintAndLogEx(NORMAL, "3DES selected");
 			break;
-		case 3: 
+		case 3:
 			keylength = 24;
 			PrintAndLogEx(NORMAL, "3 key 3DES selected");
 			break;
@@ -625,24 +625,24 @@ int CmdHF14ADesAuth(const char *Cmd){
 		PrintAndLogEx(WARNING, "Key must include %d HEX symbols", keylength);
 		return 1;
 	}
-	// algo, nyckell�ngd, 
+	// algo, nyckell�ngd,
 	UsbCommand c = {CMD_MIFARE_DESFIRE_AUTH1, { cmdAuthMode, cmdAuthAlgo, cmdKeyNo }};
-	
+
 	c.d.asBytes[0] = keylength;
 	memcpy(c.d.asBytes+1, key, keylength);
 	clearCommandBuffer();
     SendCommand(&c);
 	UsbCommand resp;
-	
+
 	if (!WaitForResponseTimeout(CMD_ACK,&resp,3000)) {
 		PrintAndLogEx(WARNING, "Client command execute timeout");
 		return 0;
-	}  
+	}
 
 	uint8_t isOK  = resp.arg[0] & 0xff;
 	if ( isOK) {
 		uint8_t * data= resp.d.asBytes;
-		
+
 		PrintAndLogEx(NORMAL, "  Key        :%s",sprint_hex(key, keylength));
 		PrintAndLogEx(NORMAL, "  SESSION    :%s",sprint_hex(data, keylength));
 		PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
@@ -650,7 +650,7 @@ int CmdHF14ADesAuth(const char *Cmd){
 	} else{
 		PrintAndLogEx(NORMAL, "Client command failed.");
 	}
-	PrintAndLogEx(NORMAL, "-------------------------------------------------------------");	
+	PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
     return 1;
 }
 
diff --git a/client/cmdhfmfdes.h b/client/cmdhfmfdes.h
index 18594075c..01ca471c9 100644
--- a/client/cmdhfmfdes.h
+++ b/client/cmdhfmfdes.h
@@ -82,7 +82,7 @@ enum  {
 #define NO_CHANGES				0x0C		//  No changes done to backup files
 											//  ,CommitTransaction/
 											//  AbortTransaction not necessary
-#define OUT_OF_EEPROM_ERROR		0x0E		// Insufficient NV-Memory to 
+#define OUT_OF_EEPROM_ERROR		0x0E		// Insufficient NV-Memory to
 											//  complete command
 #define ILLEGAL_COMMAND_CODE	0x1C		// Command code not supported
 #define INTEGRITY_ERROR			0x1E		// CRC or MAC does not match data
@@ -119,7 +119,7 @@ enum  {
 											//  with same number already exists
 #define EEPROM_ERROR			0xEE // [1]	// Could not complete NV-write
 											//  operation due to loss of power,
-											//  internal backup/rollback 
+											//  internal backup/rollback
 											//  mechanism activated
 #define FILE_NOT_FOUND_ERROR	0xF0		// Specified file number does not
 											//  exist
diff --git a/client/cmdhfmfdesfire.c b/client/cmdhfmfdesfire.c
index a7452eb27..91b9bc645 100644
--- a/client/cmdhfmfdesfire.c
+++ b/client/cmdhfmfdesfire.c
@@ -30,7 +30,7 @@ static int CmdHelp(const char *Cmd);
 //verify n'r=nr
 
 int CmdHF14AMfDESAuth(const char *Cmd){
-        
+
     uint8_t blockNo = 0;
     //keyNo=0;
     uint32_t cuid = 0;
@@ -39,8 +39,8 @@ int CmdHF14AMfDESAuth(const char *Cmd){
     uint8_t b1[8]={ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
     uint8_t b2[8]={ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
     DES_cblock nr,  b0, r1, r0;
-    
-    
+
+
     uint8_t key[8]={ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
     //DES_cblock iv={0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
     DES_key_schedule ks1;
@@ -51,15 +51,15 @@ int CmdHF14AMfDESAuth(const char *Cmd){
         PrintAndLogEx(NORMAL, "Examples:");
         PrintAndLogEx(NORMAL, "        hf desfire des-auth k 0");
         return 0;
-    } 
-    
+    }
+
     //Change key to user defined one
-    
+
     memcpy(key1,key,8);
     //memcpy(key2,key+8,8);
     DES_set_key((DES_cblock *)key1,&ks1);
     //DES_set_key((DES_cblock *)key2,&ks2);
-        
+
     //Auth1
     UsbCommand c = {CMD_MIFARE_DES_AUTH1, {blockNo}};
     SendCommand(&c);
@@ -76,7 +76,7 @@ int CmdHF14AMfDESAuth(const char *Cmd){
     } else {
         PrintAndLogEx(WARNING, "Command execute timeout");
     }
-       
+
     //Do crypto magic
     DES_random_key(&nr);
     //b1=dec(nr)
@@ -89,7 +89,7 @@ int CmdHF14AMfDESAuth(const char *Cmd){
     memcpy(r1,r0,8);
     rol(r1,8);
     PrintAndLogEx(NORMAL, "r1:%s",sprint_hex(r1, 8));
-    for(int i=0;i<8;i++){   
+    for(int i=0;i<8;i++){
       b2[i]=(r1[i] ^ b1[i]);
     }
     DES_ecb_encrypt(&b2,&b2,&ks1,0);
@@ -110,10 +110,10 @@ int CmdHF14AMfDESAuth(const char *Cmd){
 
         if (isOK)
             PrintAndLogEx(NORMAL, "b3:%s", sprint_hex(data2+2, 8));
-	
+
     } else {
         PrintAndLogEx(WARNING, "Command execute timeout");
-    } 
+    }
     return 1;
 }
 
@@ -123,14 +123,14 @@ int CmdHF14AMfDESAuth(const char *Cmd){
 // Reader 2 Card : 03AF, 16 Bytes(b1),16Bytes(b2) CRC1 CRC2
 // Card 2 Reader : 0300, 16 bytes(b3), CRC1 CRC2 ; success
 int CmdHF14AMfAESAuth(const char *Cmd){
-        
+
     uint8_t blockNo = 0;
     //keyNo=0;
     uint32_t cuid = 0;
     uint8_t reply[32] = {0x00};
     //DES_cblock r1_b1;
     //unsigned char * b1, b2, nr, b0, r0, r1;
-    
+
     uint8_t b1[16]={ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
     uint8_t b2[16]={ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
     uint8_t nr[16]={ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
@@ -148,8 +148,8 @@ int CmdHF14AMfAESAuth(const char *Cmd){
         PrintAndLogEx(NORMAL, "Examples:");
         PrintAndLogEx(NORMAL, "        hf desfire aes-auth k 0");
         return 0;
-    } 
-    
+    }
+
     //Change key to user defined one
     //
     // int private_AES_set_encrypt_key(const unsigned char *userKey, const int bits,AES_KEY *key);
@@ -159,7 +159,7 @@ int CmdHF14AMfAESAuth(const char *Cmd){
     //memcpy(key2,key+8,8);
     AES_set_encrypt_key(key,128,&key_e);
     AES_set_decrypt_key(key,128,&key_d);
-        
+
     //Auth1
     UsbCommand c = {CMD_MIFARE_DES_AUTH1, {blockNo}};
     SendCommand(&c);
@@ -180,7 +180,7 @@ int CmdHF14AMfAESAuth(const char *Cmd){
     // void AES_cbc_encrypt(const unsigned char *in, unsigned char *out,
 	//size_t length, const AES_KEY *key,
 	//unsigned char *ivec, const int enc);
-    
+
    //Do crypto magic
     //DES_random_key(&nr);
     //b1=dec(nr)
@@ -217,10 +217,10 @@ int CmdHF14AMfAESAuth(const char *Cmd){
 
         if (isOK)
             PrintAndLogEx(NORMAL, "b3:%s", sprint_hex(data2+2, 16));
-		
+
     } else {
         PrintAndLogEx(WARNING, "Command execute timeout");
-    } 
+    }
     return 1;
 }
 
diff --git a/client/cmdhfmfhard.c b/client/cmdhfmfhard.c
index 1ebf2131d..d5c8c9403 100644
--- a/client/cmdhfmfhard.c
+++ b/client/cmdhfmfhard.c
@@ -11,7 +11,7 @@
 // attacks this doesn't rely on implementation errors but only on the
 // inherent weaknesses of the crypto1 cypher. Described in
 //   Carlo Meijer, Roel Verdult, "Ciphertext-only Cryptanalysis on Hardened
-//   Mifare Classic Cards" in Proceedings of the 22nd ACM SIGSAC Conference on 
+//   Mifare Classic Cards" in Proceedings of the 22nd ACM SIGSAC Conference on
 //   Computer and Communications Security, 2015
 //-----------------------------------------------------------------------------
 
@@ -92,8 +92,8 @@ static void get_SIMD_instruction_set(char* instruction_set) {
 		default:
 			strcpy(instruction_set, "no");
 			break;
-	}	
-}		  
+	}
+}
 
 
 static void print_progress_header(void) {
@@ -222,7 +222,7 @@ static void inflate_free(voidpf opaque, voidpf address)
 #define INPUT_BUFFER_LEN 80
 
 //----------------------------------------------------------------------------
-// Initialize decompression of the respective (HF or LF) FPGA stream 
+// Initialize decompression of the respective (HF or LF) FPGA stream
 //----------------------------------------------------------------------------
 static void init_inflate(z_streamp compressed_stream, uint8_t *input_buffer, uint32_t insize, uint8_t *output_buffer, uint32_t outsize)
 {
@@ -236,7 +236,7 @@ static void init_inflate(z_streamp compressed_stream, uint8_t *input_buffer, uin
 	compressed_stream->zfree = &inflate_free;
 
 	inflateInit2(compressed_stream, 0);
-	
+
 }
 
 
@@ -244,14 +244,14 @@ static void init_bitflip_bitarrays(void)
 {
 #if defined (DEBUG_REDUCTION)
 	uint8_t line = 0;
-#endif	
+#endif
 
 
 	z_stream compressed_stream;
-	
+
 	char state_files_path[strlen(get_my_executable_directory()) + strlen(STATE_FILES_DIRECTORY) + strlen(STATE_FILE_TEMPLATE) + 1];
 	char state_file_name[strlen(STATE_FILE_TEMPLATE)+1];
-	
+
 	for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
 		num_effective_bitflips[odd_even] = 0;
 		for (uint16_t bitflip = 0x001; bitflip < 0x400; bitflip++) {
@@ -339,14 +339,14 @@ static void init_bitflip_bitarrays(void)
 	for(uint16_t i = 0; i < num_1st_byte_effective_bitflips; i++) {
 		PrintAndLogEx(NORMAL, "%03x ",  all_effective_bitflip[i]);
 	}
-#endif	
+#endif
 	qsort(all_effective_bitflip+num_1st_byte_effective_bitflips, num_all_effective_bitflips - num_1st_byte_effective_bitflips, sizeof(uint16_t), compare_count_bitflip_bitarrays);
 #if defined (DEBUG_REDUCTION)
 	PrintAndLogEx(NORMAL, "\n2nd byte effective bitflips (%d): \n", num_all_effective_bitflips - num_1st_byte_effective_bitflips);
 	for(uint16_t i = num_1st_byte_effective_bitflips; i < num_all_effective_bitflips; i++) {
 		PrintAndLogEx(NORMAL, "%03x ",  all_effective_bitflip[i]);
 	}
-#endif	
+#endif
 	char progress_text[80];
 	sprintf(progress_text, "Using %d precalculated bitflip state tables", num_all_effective_bitflips);
 	hardnested_print_progress(0, progress_text, (float)(1LL<<47), 0);
@@ -369,10 +369,10 @@ static void	free_bitflip_bitarrays(void)
 
 static uint32_t *part_sum_a0_bitarrays[2][NUM_PART_SUMS];
 static uint32_t *part_sum_a8_bitarrays[2][NUM_PART_SUMS];
-static uint32_t *sum_a0_bitarrays[2][NUM_SUMS];	
+static uint32_t *sum_a0_bitarrays[2][NUM_SUMS];
 
 static uint16_t PartialSumProperty(uint32_t state, odd_even_t odd_even)
-{ 
+{
 	uint16_t sum = 0;
 	for (uint16_t j = 0; j < 16; j++) {
 		uint32_t st = state;
@@ -408,7 +408,7 @@ static void init_part_sum_bitarrays(void)
 		}
 	}
 	for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
-		//PrintAndLogEx(NORMAL, "(%d, %" PRIu16 ")...", odd_even, part_sum_a0);			
+		//PrintAndLogEx(NORMAL, "(%d, %" PRIu16 ")...", odd_even, part_sum_a0);
 		for (uint32_t state = 0; state < (1<<20); state++) {
 			uint16_t part_sum_a0 = PartialSumProperty(state, odd_even) / 2;
 			for (uint16_t low_bits = 0; low_bits < 1<<4; low_bits++) {
@@ -428,7 +428,7 @@ static void init_part_sum_bitarrays(void)
 		}
 	}
 	for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
-		//PrintAndLogEx(NORMAL, "(%d, %" PRIu16 ")...", odd_even, part_sum_a8); 
+		//PrintAndLogEx(NORMAL, "(%d, %" PRIu16 ")...", odd_even, part_sum_a8);
 		for (uint32_t state = 0; state < (1<<20); state++) {
 			uint16_t part_sum_a8 = PartialSumProperty(state, odd_even) / 2;
 			for (uint16_t high_bits = 0; high_bits < 1<<4; high_bits++) {
@@ -439,7 +439,7 @@ static void init_part_sum_bitarrays(void)
 }
 
 
-static void free_part_sum_bitarrays(void) 
+static void free_part_sum_bitarrays(void)
 {
 	for (int16_t part_sum_a8 = (NUM_PART_SUMS-1); part_sum_a8 >= 0; part_sum_a8--) {
 		free_bitarray(part_sum_a8_bitarrays[ODD_STATE][part_sum_a8]);
@@ -494,14 +494,14 @@ static void free_sum_bitarrays(void)
 char failstr[250] = "";
 #endif
 
-static const float p_K0[NUM_SUMS] = {		// the probability that a random nonce has a Sum Property K 
-	0.0290,	0.0083,	0.0006,	0.0339,	0.0048,	0.0934,	0.0119,	0.0489,	0.0602,	0.4180,	0.0602,	0.0489, 0.0119,	0.0934,	0.0048,	0.0339,	0.0006,	0.0083,	0.0290 
+static const float p_K0[NUM_SUMS] = {		// the probability that a random nonce has a Sum Property K
+	0.0290,	0.0083,	0.0006,	0.0339,	0.0048,	0.0934,	0.0119,	0.0489,	0.0602,	0.4180,	0.0602,	0.0489, 0.0119,	0.0934,	0.0048,	0.0339,	0.0006,	0.0083,	0.0290
 	};
 
-static float my_p_K[NUM_SUMS]; 
+static float my_p_K[NUM_SUMS];
 
 static const float *p_K;
-	
+
 static uint32_t cuid;
 static noncelist_t nonces[256];
 static uint8_t best_first_bytes[256];
@@ -520,7 +520,7 @@ static uint64_t num_keys_tested = 0;
 static statelist_t *candidates = NULL;
 
 
-static int add_nonce(uint32_t nonce_enc, uint8_t par_enc) 
+static int add_nonce(uint32_t nonce_enc, uint8_t par_enc)
 {
 	uint8_t first_byte = nonce_enc >> 24;
 	noncelistentry_t *p1 = nonces[first_byte].first;
@@ -535,7 +535,7 @@ static int add_nonce(uint32_t nonce_enc, uint8_t par_enc)
 		p2 = p1;
 		p1 = p1->next;
 	}
-	
+
 	if (p1 == NULL) { 																	// need to add at the end of the list
 		if (p2 == NULL) { 			// list is empty yet. Add first entry.
 			p2 = nonces[first_byte].first = malloc(sizeof(noncelistentry_t));
@@ -548,7 +548,7 @@ static int add_nonce(uint32_t nonce_enc, uint8_t par_enc)
 		} else {
 			p2 = p2->next = malloc(sizeof(noncelistentry_t));
 		}
-	} else {																			// we have seen this 2nd byte before. Nothing to add or insert. 
+	} else {																			// we have seen this 2nd byte before. Nothing to add or insert.
 		return (0);
 	}
 
@@ -626,7 +626,7 @@ static void free_nonces_memory(void)
 
 
 
-static double p_hypergeometric(uint16_t i_K, uint16_t n, uint16_t k) 
+static double p_hypergeometric(uint16_t i_K, uint16_t n, uint16_t k)
 {
 	// for efficient computation we are using the recursive definition
 	//						(K-k+1) * (n-k+1)
@@ -637,19 +637,19 @@ static double p_hypergeometric(uint16_t i_K, uint16_t n, uint16_t k)
 	// P(X=0) = -----------------------------
 	//               N*(N-1)*...*(N-n+1)
 
-	
+
 	uint16_t const N = 256;
 	uint16_t K = sums[i_K];
 
 
-	
+
 	if (n-k > N-K || k > K) return 0.0;	// avoids log(x<=0) in calculation below
 	if (k == 0) {
 		// use logarithms to avoid overflow with huge factorials (double type can only hold 170!)
 		double log_result = 0.0;
 		for (int16_t i = N-K; i >= N-K-n+1; i--) {
 			log_result += log(i);
-		} 
+		}
 		for (int16_t i = N; i >= N-n+1; i--) {
 			log_result -= log(i);
 		}
@@ -669,8 +669,8 @@ static double p_hypergeometric(uint16_t i_K, uint16_t n, uint16_t k)
 		}
 	}
 }
-	
-	
+
+
 static float sum_probability(uint16_t i_K, uint16_t n, uint16_t k)
 {
 	if (k > sums[i_K]) return 0.0;
@@ -703,7 +703,7 @@ static void init_allbitflips_array(void)
 
 
 static void update_allbitflips_array(void)
-{	
+{
 	if (hardnested_stage & CHECK_2ND_BYTES) {
 		for (uint16_t i = 0; i < 256; i++) {
 			for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
@@ -720,22 +720,22 @@ static void update_allbitflips_array(void)
 	}
 }
 
-	
-static uint32_t estimated_num_states_part_sum_coarse(uint16_t part_sum_a0_idx, uint16_t part_sum_a8_idx, odd_even_t odd_even) 
+
+static uint32_t estimated_num_states_part_sum_coarse(uint16_t part_sum_a0_idx, uint16_t part_sum_a8_idx, odd_even_t odd_even)
 {
 	return part_sum_count[odd_even][part_sum_a0_idx][part_sum_a8_idx];
 }
 
 
-static uint32_t estimated_num_states_part_sum(uint8_t first_byte, uint16_t part_sum_a0_idx, uint16_t part_sum_a8_idx, odd_even_t odd_even) 
+static uint32_t estimated_num_states_part_sum(uint8_t first_byte, uint16_t part_sum_a0_idx, uint16_t part_sum_a8_idx, odd_even_t odd_even)
 {
 	if (odd_even == ODD_STATE) {
-		return count_bitarray_AND3(part_sum_a0_bitarrays[odd_even][part_sum_a0_idx], 
-		                           part_sum_a8_bitarrays[odd_even][part_sum_a8_idx], 
+		return count_bitarray_AND3(part_sum_a0_bitarrays[odd_even][part_sum_a0_idx],
+		                           part_sum_a8_bitarrays[odd_even][part_sum_a8_idx],
 			                       nonces[first_byte].states_bitarray[odd_even]);
 	} else {
-		return count_bitarray_AND4(part_sum_a0_bitarrays[odd_even][part_sum_a0_idx], 
-		                           part_sum_a8_bitarrays[odd_even][part_sum_a8_idx], 
+		return count_bitarray_AND4(part_sum_a0_bitarrays[odd_even][part_sum_a0_idx],
+		                           part_sum_a8_bitarrays[odd_even][part_sum_a8_idx],
 			                       nonces[first_byte].states_bitarray[odd_even],
 		                           nonces[first_byte^0x80].states_bitarray[odd_even]);
 	}
@@ -759,7 +759,7 @@ static uint64_t estimated_num_states(uint8_t first_byte, uint16_t sum_a0, uint16
 				for (uint8_t r = 0; r < NUM_PART_SUMS; r++) {
 					for (uint8_t s = 0; s < NUM_PART_SUMS; s++) {
 						if (2*r*(16-2*s) + (16-2*r)*2*s == sum_a8) {
-							num_states += (uint64_t)estimated_num_states_part_sum(first_byte, p, r, ODD_STATE) 
+							num_states += (uint64_t)estimated_num_states_part_sum(first_byte, p, r, ODD_STATE)
 										* estimated_num_states_part_sum(first_byte, q, s, EVEN_STATE);
 						}
 					}
@@ -780,7 +780,7 @@ static uint64_t estimated_num_states_coarse(uint16_t sum_a0, uint16_t sum_a8)
 				for (uint8_t r = 0; r < NUM_PART_SUMS; r++) {
 					for (uint8_t s = 0; s < NUM_PART_SUMS; s++) {
 						if (2*r*(16-2*s) + (16-2*r)*2*s == sum_a8) {
-							num_states += (uint64_t)estimated_num_states_part_sum_coarse(p, r, ODD_STATE) 
+							num_states += (uint64_t)estimated_num_states_part_sum_coarse(p, r, ODD_STATE)
 										* estimated_num_states_part_sum_coarse(q, s, EVEN_STATE);
 						}
 					}
@@ -826,7 +826,7 @@ static void update_sum_bitarrays(odd_even_t odd_even)
 		}
 		for (uint8_t part_sum_a0 = 0; part_sum_a0 < NUM_PART_SUMS; part_sum_a0++) {
 			for (uint8_t part_sum_a8 = 0; part_sum_a8 < NUM_PART_SUMS; part_sum_a8++) {
-				part_sum_count[odd_even][part_sum_a0][part_sum_a8] 
+				part_sum_count[odd_even][part_sum_a0][part_sum_a8]
 				    += count_bitarray_AND2(part_sum_a0_bitarrays[odd_even][part_sum_a0], part_sum_a8_bitarrays[odd_even][part_sum_a8]);
 			}
 		}
@@ -854,7 +854,7 @@ static int compare_sum_a8_guess(const void *b1, const void *b2)
 }
 
 
-static float check_smallest_bitflip_bitarrays(void) 
+static float check_smallest_bitflip_bitarrays(void)
 {
 	uint32_t num_odd, num_even;
 	uint64_t smallest = 1LL << 48;
@@ -900,7 +900,7 @@ static void update_expected_brute_force(uint8_t best_byte) {
 
 static float sort_best_first_bytes(void)
 {
-	
+
 	// initialize best_first_bytes, do a rough estimation on remaining states for each Sum_a8 property
 	// and the expected number of states to brute force
 	for (uint16_t i = 0; i < 256; i++) {
@@ -914,7 +914,7 @@ static float sort_best_first_bytes(void)
 			nonces[i].expected_num_brute_force += prob_all_failed * (float)nonces[i].sum_a8_guess[j].num_states / 2.0;
 		}
 	}
-	
+
 	// sort based on expected number of states to brute force
 	qsort(best_first_bytes, 256, 1, compare_expected_num_brute_force);
 
@@ -988,11 +988,11 @@ static float sort_best_first_bytes(void)
 }
 
 
-static float update_reduction_rate(float last, bool init) 
+static float update_reduction_rate(float last, bool init)
 {
 #define QUEUE_LEN	4
 	static float queue[QUEUE_LEN];
-	
+
 	for (uint16_t i = 0; i < QUEUE_LEN-1; i++) {
 		if (init) {
 			queue[i] = (float)(1LL << 48);
@@ -1005,7 +1005,7 @@ static float update_reduction_rate(float last, bool init)
 	} else {
 		queue[QUEUE_LEN-1] = last;
 	}
-	
+
 	// linear regression
 	float avg_y = 0.0;
 	float avg_x = 0.0;
@@ -1015,7 +1015,7 @@ static float update_reduction_rate(float last, bool init)
 	}
 	avg_x /= QUEUE_LEN;
 	avg_y /= QUEUE_LEN;
-	
+
 	float dev_xy = 0.0;
 	float dev_x2 = 0.0;
 	for (uint16_t i = 0; i < QUEUE_LEN; i++) {
@@ -1025,9 +1025,9 @@ static float update_reduction_rate(float last, bool init)
 
 	float reduction_rate = -1.0 * dev_xy / dev_x2;  // the negative slope of the linear regression
 
-#if defined (DEBUG_REDUCTION)	
+#if defined (DEBUG_REDUCTION)
 	PrintAndLogEx(NORMAL, "update_reduction_rate(%1.0f) = %1.0f per sample, brute_force_per_sample = %1.0f\n", last, reduction_rate, brute_force_per_second * (float)sample_period / 1000.0);
-#endif	
+#endif
 	return reduction_rate;
 }
 
@@ -1047,12 +1047,12 @@ static bool shrink_key_space(float *brute_forces)
 
 //iceman 2018
 	return ((hardnested_stage & CHECK_2ND_BYTES) &&
-				reduction_rate >= 0.0 && 
+				reduction_rate >= 0.0 &&
 			   ( reduction_rate < brute_force_per_second * (float)sample_period / 1000.0  || *brute_forces < 0x1F00000000));
 }
 
-	
-static void estimate_sum_a8(void) 
+
+static void estimate_sum_a8(void)
 {
 	if (first_byte_num == 256) {
 		for (uint16_t i = 0; i < 256; i++) {
@@ -1066,7 +1066,7 @@ static void estimate_sum_a8(void)
 			}
 		}
 	}
-}	
+}
 
 
 static int read_nonce_file(char *filename)
@@ -1079,9 +1079,9 @@ static int read_nonce_file(char *filename)
 	uint8_t read_buf[9];
 	uint32_t nt_enc1, nt_enc2;
 	uint8_t par_enc;
-	
+
 	num_acquired_nonces = 0;
-	if ((fnonces = fopen(filename,"rb")) == NULL) { 
+	if ((fnonces = fopen(filename,"rb")) == NULL) {
 		PrintAndLogEx(WARNING, "Could not open file %s",filename);
 		return 1;
 	}
@@ -1108,9 +1108,9 @@ static int read_nonce_file(char *filename)
 		bytes_read = fread(read_buf, 1, 9, fnonces);
 	}
 	fclose(fnonces);
-	
+
 	char progress_string[80];
-	sprintf(progress_string, "Read %d nonces from file. cuid=%08x", num_acquired_nonces, cuid); 
+	sprintf(progress_string, "Read %d nonces from file. cuid=%08x", num_acquired_nonces, cuid);
 	hardnested_print_progress(num_acquired_nonces, progress_string, (float)(1LL<<47), 0);
 	sprintf(progress_string, "Target Block=%d, Keytype=%c", trgBlockNo, trgKeyType==0?'A':'B');
 	hardnested_print_progress(num_acquired_nonces, progress_string, (float)(1LL<<47), 0);
@@ -1121,7 +1121,7 @@ static int read_nonce_file(char *filename)
 			break;
 		}
 	}
-	
+
 	return 0;
 }
 
@@ -1145,10 +1145,10 @@ static bool timeout(void)
 }
 
 
-static void 
+static void
 #ifdef __has_attribute
 #if __has_attribute(force_align_arg_pointer)
-__attribute__((force_align_arg_pointer)) 
+__attribute__((force_align_arg_pointer))
 #endif
 #endif
 *check_for_BitFlipProperties_thread(void *args)
@@ -1156,15 +1156,15 @@ __attribute__((force_align_arg_pointer))
 	uint8_t first_byte = ((uint8_t *)args)[0];
 	uint8_t last_byte = ((uint8_t *)args)[1];
 	uint8_t time_budget = ((uint8_t *)args)[2];
-	
+
 	if (hardnested_stage & CHECK_1ST_BYTES) {
 		// for (uint16_t bitflip = 0x001; bitflip < 0x200; bitflip++) {
 		for (uint16_t bitflip_idx = 0; bitflip_idx < num_1st_byte_effective_bitflips; bitflip_idx++) {
 			uint16_t bitflip = all_effective_bitflip[bitflip_idx];
 			if (time_budget & timeout()) {
-#if defined (DEBUG_REDUCTION)				
+#if defined (DEBUG_REDUCTION)
 				PrintAndLogEx(NORMAL, "break at bitflip_idx %d...", bitflip_idx);
-#endif				
+#endif
 				return NULL;
 			}
 			for (uint16_t i = first_byte; i <= last_byte; i++) {
@@ -1243,26 +1243,26 @@ static void check_for_BitFlipProperties(bool time_budget)
 {
 	// create and run worker threads
 	pthread_t thread_id[NUM_CHECK_BITFLIPS_THREADS];
-		
+
 	uint8_t args[NUM_CHECK_BITFLIPS_THREADS][3];
-	uint16_t bytes_per_thread = (256 + (NUM_CHECK_BITFLIPS_THREADS/2)) / NUM_CHECK_BITFLIPS_THREADS; 
+	uint16_t bytes_per_thread = (256 + (NUM_CHECK_BITFLIPS_THREADS/2)) / NUM_CHECK_BITFLIPS_THREADS;
 	for (uint8_t i = 0; i < NUM_CHECK_BITFLIPS_THREADS; i++) {
 		args[i][0] = i * bytes_per_thread;
 		args[i][1] = MIN(args[i][0]+bytes_per_thread-1, 255);
 		args[i][2] = time_budget;
 	}
 	args[NUM_CHECK_BITFLIPS_THREADS-1][1] = MAX(args[NUM_CHECK_BITFLIPS_THREADS-1][1], 255);
-	
+
 	// start threads
 	for (uint8_t i = 0; i < NUM_CHECK_BITFLIPS_THREADS; i++) {
 		pthread_create(&thread_id[i], NULL, check_for_BitFlipProperties_thread, args[i]);
 	}
-	
+
 	// wait for threads to terminate:
 	for (uint8_t i = 0; i < NUM_CHECK_BITFLIPS_THREADS; i++) {
 		pthread_join(thread_id[i], NULL);
 	}
-	
+
 	if (hardnested_stage & CHECK_2ND_BYTES) {
 		hardnested_stage &= ~CHECK_1ST_BYTES;	// we are done with 1st stage, except...
 		for (uint16_t i = 0; i < NUM_CHECK_BITFLIPS_THREADS; i++) {
@@ -1272,7 +1272,7 @@ static void check_for_BitFlipProperties(bool time_budget)
 			}
 		}
 	}
-#if defined (DEBUG_REDUCTION)	
+#if defined (DEBUG_REDUCTION)
 	if (hardnested_stage & CHECK_1ST_BYTES) PrintAndLogEx(NORMAL, "stage 1 not completed yet\n");
 #endif
 }
@@ -1319,12 +1319,12 @@ static void simulate_MFplus_RNG(uint32_t test_cuid, uint64_t test_key, uint32_t
 	for (int8_t byte_pos = 3; byte_pos >= 0; byte_pos--) {
 		uint8_t nt_byte_dec = (nt >> (8*byte_pos)) & 0xff;
 		uint8_t nt_byte_enc = crypto1_byte(&sim_cs, nt_byte_dec ^ (test_cuid >> (8*byte_pos)), false) ^ nt_byte_dec; 	// encode the nonce byte
-		*nt_enc = (*nt_enc << 8) | nt_byte_enc;		
+		*nt_enc = (*nt_enc << 8) | nt_byte_enc;
 		uint8_t ks_par = filter(sim_cs.odd);											// the keystream bit to encode/decode the parity bit
 		uint8_t nt_byte_par_enc = ks_par ^ oddparity8(nt_byte_dec);						// determine the nt byte's parity and encode it
 		*par_enc = (*par_enc << 1) | nt_byte_par_enc;
 	}
-	
+
 }
 
 
@@ -1338,7 +1338,7 @@ static void simulate_acquire_nonces()
 	uint32_t total_num_nonces = 0;
 	float brute_force;
 	bool reported_suma8 = false;
-	
+
 	cuid = (rand() & 0xff) << 24 | (rand() & 0xff) << 16 | (rand() & 0xff) << 8 | (rand() & 0xff);
 	if (known_target_key == -1) {
 		known_target_key = ((uint64_t)rand() & 0xfff) << 36 | ((uint64_t)rand() & 0xfff) << 24 | ((uint64_t)rand() & 0xfff) << 12 | ((uint64_t)rand() & 0xfff);
@@ -1350,7 +1350,7 @@ static void simulate_acquire_nonces()
 	fprintf(fstats, "%012" PRIx64 ";%" PRIx32 ";", known_target_key, cuid);
 
 	num_acquired_nonces = 0;
-	
+
 	do {
 		uint32_t nt_enc = 0;
 		uint8_t par_enc = 0;
@@ -1362,7 +1362,7 @@ static void simulate_acquire_nonces()
 		}
 
 		last_sample_clock = msclock();
-	
+
 		if (first_byte_num == 256 ) {
 			if (hardnested_stage == CHECK_1ST_BYTES) {
 				for (uint16_t i = 0; i < NUM_SUMS; i++) {
@@ -1373,7 +1373,7 @@ static void simulate_acquire_nonces()
 				}
 				hardnested_stage |= CHECK_2ND_BYTES;
 				apply_sum_a0();
-			} 
+			}
 			update_nonce_data(true);
 			acquisition_completed = shrink_key_space(&brute_force);
 			if (!reported_suma8) {
@@ -1392,14 +1392,14 @@ static void simulate_acquire_nonces()
 	} while (!acquisition_completed);
 
 	time_t end_time = time(NULL);
-	// PrintAndLogEx(NORMAL, "Acquired a total of %" PRId32" nonces in %1.0f seconds (%1.0f nonces/minute)", 
-		// num_acquired_nonces, 
-		// difftime(end_time, time1), 
+	// PrintAndLogEx(NORMAL, "Acquired a total of %" PRId32" nonces in %1.0f seconds (%1.0f nonces/minute)",
+		// num_acquired_nonces,
+		// difftime(end_time, time1),
 		// difftime(end_time, time1)!=0.0?(float)total_num_nonces*60.0/difftime(end_time, time1):INFINITY
 		// );
 
 	fprintf(fstats, "%" PRId32 ";%" PRId32 ";%1.0f;", total_num_nonces, num_acquired_nonces, difftime(end_time,time1));
-		
+
 }
 
 
@@ -1421,7 +1421,7 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
 	UsbCommand resp;
 
 	num_acquired_nonces = 0;
-	
+
 	clearCommandBuffer();
 
 	do {
@@ -1434,9 +1434,9 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
 
 		clearCommandBuffer();
 		SendCommand(&c);
-		
+
 		if (field_off) break;
-		
+
 		if (initialize) {
 			if (!WaitForResponseTimeout(CMD_ACK, &resp, 3000)) {
 				//strange second call (iceman)
@@ -1449,7 +1449,7 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
 
 			cuid = resp.arg[1];
 			if (nonce_file_write && fnonces == NULL) {
-				if ((fnonces = fopen(filename,"wb")) == NULL) { 
+				if ((fnonces = fopen(filename,"wb")) == NULL) {
 					PrintAndLogEx(WARNING, "Could not create file %s", filename);
 					return 3;
 				}
@@ -1472,7 +1472,7 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
 				nt_enc1 = bytes_to_num(bufp, 4);
 				nt_enc2 = bytes_to_num(bufp+4, 4);
 				par_enc = bytes_to_num(bufp+8, 1);
-				
+
 				//PrintAndLogEx(NORMAL, "Encrypted nonce: %08x, encrypted_parity: %02x\n", nt_enc1, par_enc >> 4);
 				num_acquired_nonces += add_nonce(nt_enc1, par_enc >> 4);
 				//PrintAndLogEx(NORMAL, "Encrypted nonce: %08x, encrypted_parity: %02x\n", nt_enc2, par_enc & 0x0f);
@@ -1485,7 +1485,7 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
 				bufp += 9;
 			}
 			total_num_nonces += num_sampled_nonces;
-		
+
 			if (first_byte_num == 256 ) {
 				if (hardnested_stage == CHECK_1ST_BYTES) {
 					for (uint16_t i = 0; i < NUM_SUMS; i++) {
@@ -1513,7 +1513,7 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
 				hardnested_print_progress(num_acquired_nonces, "Apply bit flip properties", brute_force, 0);
 			}
 		}
-		
+
 		if (acquisition_completed) {
 			field_off = true;	// switch off field with next SendCommand and then finish
 		}
@@ -1545,12 +1545,12 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
 	if (nonce_file_write) {
 		fclose(fnonces);
 	}
-	
-	// PrintAndLogEx(NORMAL, "Sampled a total of %d nonces in %d seconds (%0.0f nonces/minute)", 
-		// total_num_nonces, 
-		// time(NULL)-time1, 
+
+	// PrintAndLogEx(NORMAL, "Sampled a total of %d nonces in %d seconds (%0.0f nonces/minute)",
+		// total_num_nonces,
+		// time(NULL)-time1,
 		// (float)total_num_nonces*60.0/(time(NULL)-time1));
-	
+
 	return 0;
 }
 
@@ -1594,7 +1594,7 @@ static inline bool remaining_bits_match(uint_fast8_t num_common_bits, uint_fast8
 		}
 	} else {
 		// even bits
-		switch (num_common_bits) {	
+		switch (num_common_bits) {
 			case 0: if (invalid_state(byte_diff, state1, state2, 0, 0)) return false;
 			case 1: if (!invariant_holds(byte_diff, state1, state2, 2, 1)) return true;
 			case 2: if (invalid_state(byte_diff, state1, state2, 2, 1)) return false;
@@ -1604,7 +1604,7 @@ static inline bool remaining_bits_match(uint_fast8_t num_common_bits, uint_fast8
 			case 6: if (invalid_state(byte_diff, state1, state2, 6, 3)) return false;
 		}
 	}
-	
+
 	return true;					// valid state
 }
 
@@ -1637,7 +1637,7 @@ static void init_statelist_cache(void)
 				sl_cache[i][j][k].cache_status = TO_BE_DONE;
 			}
 		}
-	}		
+	}
 	pthread_mutex_unlock(&statelist_cache_mutex);
 }
 
@@ -1651,7 +1651,7 @@ static void free_statelist_cache(void)
 				free(sl_cache[i][j][k].sl);
 			}
 		}
-	}		
+	}
 	pthread_mutex_unlock(&statelist_cache_mutex);
 }
 
@@ -1660,7 +1660,7 @@ static void free_statelist_cache(void)
 static inline bool bitflips_match(uint8_t byte, uint32_t state, odd_even_t odd_even, bool quiet)
 #else
 static inline bool bitflips_match(uint8_t byte, uint32_t state, odd_even_t odd_even)
-#endif	
+#endif
 {
 	uint32_t *bitset = nonces[byte].states_bitarray[odd_even];
 	bool possible = test_bit24(bitset, state);
@@ -1673,11 +1673,11 @@ static inline bool bitflips_match(uint8_t byte, uint32_t state, odd_even_t odd_e
 #endif
 		return false;
 	}
-	
+
 	return true;
 }
-	
-	
+
+
 static uint_fast8_t reverse(uint_fast8_t b)
 {
 	b = (b & 0xF0) >> 4 | (b & 0x0F) << 4;
@@ -1687,11 +1687,11 @@ static uint_fast8_t reverse(uint_fast8_t b)
 }
 
 
-static bool all_bitflips_match(uint8_t byte, uint32_t state, odd_even_t odd_even) 
+static bool all_bitflips_match(uint8_t byte, uint32_t state, odd_even_t odd_even)
 {
 	uint32_t masks[2][8] = {{0x00fffff0, 0x00fffff8, 0x00fffff8, 0x00fffffc, 0x00fffffc, 0x00fffffe, 0x00fffffe, 0x00ffffff},
 							{0x00fffff0, 0x00fffff0, 0x00fffff8, 0x00fffff8, 0x00fffffc, 0x00fffffc, 0x00fffffe, 0x00fffffe} };
-	
+
 	for (uint16_t i = 1; i < 256; i++) {
 		uint_fast8_t bytes_diff = reverse(i);	// start with most common bits
 		uint_fast8_t byte2 = byte ^ bytes_diff;
@@ -1704,16 +1704,16 @@ static bool all_bitflips_match(uint8_t byte, uint32_t state, odd_even_t odd_even
 				if (bitflips_match(byte2, (state & mask) | remaining_bits, odd_even, true)) {
 #else
 				if (bitflips_match(byte2, (state & mask) | remaining_bits, odd_even)) {
-#endif						
+#endif
 					found_match = true;
 					break;
 				}
 			}
 		}
 		if (!found_match) {
-#ifdef DEBUG_KEY_ELIMINATION				
+#ifdef DEBUG_KEY_ELIMINATION
 			if (known_target_key != -1 && state == test_state[odd_even]) {
-				PrintAndLogEx(NORMAL, "all_bitflips_match() 1st Byte: %s test state (0x%06x): Eliminated. Bytes = %02x, %02x, Common Bits = %d\n", 
+				PrintAndLogEx(NORMAL, "all_bitflips_match() 1st Byte: %s test state (0x%06x): Eliminated. Bytes = %02x, %02x, Common Bits = %d\n",
 					odd_even == ODD_STATE ? "odd" : "even",
 					test_state[odd_even],
 					byte,
@@ -1767,15 +1767,15 @@ static void add_matching_states(statelist_t *candidates, uint8_t part_sum_a0, ui
 		free(candidates->states[odd_even]);
 		exit(4);
 	}
-	
+
 	uint32_t *bitarray_a0 = part_sum_a0_bitarrays[odd_even][part_sum_a0/2];
 	uint32_t *bitarray_a8 = part_sum_a8_bitarrays[odd_even][part_sum_a8/2];
 	uint32_t *bitarray_bitflips = nonces[best_first_bytes[0]].states_bitarray[odd_even];
 
 	bitarray_AND4(candidates_bitarray, bitarray_a0, bitarray_a8, bitarray_bitflips);
-	
+
 	bitarray_to_list(best_first_bytes[0], candidates_bitarray, candidates->states[odd_even], &(candidates->len[odd_even]), odd_even);
-	
+
 	if (candidates->len[odd_even] == 0) {
 		free(candidates->states[odd_even]);
 		candidates->states[odd_even] = NULL;
@@ -1825,7 +1825,7 @@ static void add_bitflip_candidates(uint8_t byte)
 			PrintAndLogEx(WARNING, "Out of memory error in add_bitflip_candidates().\n");
 			exit(4);
 		}
-	
+
 		bitarray_to_list(byte, nonces[byte].states_bitarray[odd_even], candidates->states[odd_even], &(candidates->len[odd_even]), odd_even);
 
 		if (candidates->len[odd_even] + 1 < worstcase_size) {
@@ -1844,7 +1844,7 @@ static bool TestIfKeyExists(uint64_t key)
 
 	uint32_t state_odd = pcs->odd & 0x00ffffff;
 	uint32_t state_even = pcs->even & 0x00ffffff;
-	
+
 	uint64_t count = 0;
 	for (statelist_t *p = candidates; p != NULL; p = p->next) {
 		bool found_odd = false;
@@ -1898,10 +1898,10 @@ static void init_book_of_work(void)
 	}
 }
 
-static void 
+static void
 #ifdef __has_attribute
 #if __has_attribute(force_align_arg_pointer)
-__attribute__((force_align_arg_pointer)) 
+__attribute__((force_align_arg_pointer))
 #endif
 #endif
 *generate_candidates_worker_thread(void *args)
@@ -1910,14 +1910,14 @@ __attribute__((force_align_arg_pointer))
 	uint16_t sum_a0 = sums[sum_args[0]];
 	uint16_t sum_a8 = sums[sum_args[1]];
 	// uint16_t my_thread_number = sums[2];
-	
+
 	bool there_might_be_more_work = true;
 	do {
 		there_might_be_more_work = false;
 		for (uint8_t p = 0; p < NUM_PART_SUMS; p++) {
 			for (uint8_t q = 0; q < NUM_PART_SUMS; q++) {
 				if (2*p*(16-2*q) + (16-2*p)*2*q == sum_a0) {
-					// PrintAndLogEx(NORMAL, "Reducing Partial Statelists (p,q) = (%d,%d) with lengths %d, %d\n", 
+					// PrintAndLogEx(NORMAL, "Reducing Partial Statelists (p,q) = (%d,%d) with lengths %d, %d\n",
 							// p, q, partial_statelist[p].len[ODD_STATE], partial_statelist[q].len[EVEN_STATE]);
 					for (uint8_t r = 0; r < NUM_PART_SUMS; r++) {
 						for (uint8_t s = 0; s < NUM_PART_SUMS; s++) {
@@ -1952,13 +1952,13 @@ __attribute__((force_align_arg_pointer))
 									add_cached_states(current_candidates, 2*q, 2*s, EVEN_STATE);
 									even_completed = true;
 								}
-								
+
 								bool work_required = true;
 
 								// if there had been two cached results, there is no more work to do
 								if (even_completed && odd_completed) {
 									work_required = false;
-								}	
+								}
 
 								// if there had been one cached empty result, there is no need to calculate the other part:
 								if (work_required) {
@@ -1966,7 +1966,7 @@ __attribute__((force_align_arg_pointer))
 										current_candidates->len[ODD_STATE] = 0;
 										current_candidates->states[ODD_STATE] = NULL;
 										work_required = false;
-									}									
+									}
 									if (odd_completed && !current_candidates->len[ODD_STATE]) {
 										current_candidates->len[EVEN_STATE] = 0;
 										current_candidates->states[EVEN_STATE] = NULL;
@@ -1995,7 +1995,7 @@ __attribute__((force_align_arg_pointer))
 										work_required = false;
 									}
 								}
-									
+
 								if (work_required) { // we had no cached result. Need to calculate both odd and even
 									sl_cache[p][r][ODD_STATE].cache_status = WORK_IN_PROGRESS;
 									sl_cache[q][s][EVEN_STATE].cache_status = WORK_IN_PROGRESS;
@@ -2027,10 +2027,10 @@ __attribute__((force_align_arg_pointer))
 										// log((uint64_t)current_candidates->len[ODD_STATE] * current_candidates->len[EVEN_STATE])/log(2));
 									// uint32_t estimated_odd = estimated_num_states_part_sum(best_first_bytes[0], p, r, ODD_STATE);
 									// uint32_t estimated_even= estimated_num_states_part_sum(best_first_bytes[0], q, s, EVEN_STATE);
-									// uint64_t estimated_total = (uint64_t)estimated_odd * estimated_even; 
+									// uint64_t estimated_total = (uint64_t)estimated_odd * estimated_even;
 									// PrintAndLogEx(NORMAL, "Estimated: %" PRIu32 " * %" PRIu32 " = %" PRIu64 " (2^%0.1f)\n", estimated_odd, estimated_even, estimated_total, log(estimated_total) / log(2));
 									// if (estimated_odd < current_candidates->len[ODD_STATE] || estimated_even < current_candidates->len[EVEN_STATE]) {
-										// PrintAndLogEx(NORMAL, "############################################################################ERROR! ESTIMATED < REAL !!!\n"); 
+										// PrintAndLogEx(NORMAL, "############################################################################ERROR! ESTIMATED < REAL !!!\n");
 										// //exit(2);
 										// }
 								// }
@@ -2041,14 +2041,14 @@ __attribute__((force_align_arg_pointer))
 			}
 		}
 	} while (there_might_be_more_work);
-	
+
 	return NULL;
 }
 
 
 static void generate_candidates(uint8_t sum_a0_idx, uint8_t sum_a8_idx)
 {
-	
+
 	init_statelist_cache();
 	init_book_of_work();
 
@@ -2058,7 +2058,7 @@ static void generate_candidates(uint8_t sum_a0_idx, uint8_t sum_a8_idx)
 
 	// create and run worker threads
 	pthread_t thread_id[NUM_REDUCTION_WORKING_THREADS];
-		
+
 	uint16_t sums[NUM_REDUCTION_WORKING_THREADS][3];
 	for (uint16_t i = 0; i < NUM_REDUCTION_WORKING_THREADS; i++) {
 		sums[i][0] = sum_a0_idx;
@@ -2066,7 +2066,7 @@ static void generate_candidates(uint8_t sum_a0_idx, uint8_t sum_a8_idx)
 		sums[i][2] = i+1;
 		pthread_create(thread_id + i, NULL, generate_candidates_worker_thread, sums[i]);
 	}
-	
+
 	// wait for threads to terminate:
 	for (uint16_t i = 0; i < NUM_REDUCTION_WORKING_THREADS; i++) {
 		pthread_join(thread_id[i], NULL);
@@ -2074,7 +2074,7 @@ static void generate_candidates(uint8_t sum_a0_idx, uint8_t sum_a8_idx)
 
 	// clean up mutex
 	pthread_mutex_destroy(&statelist_cache_mutex);
-	
+
 	maximum_states = 0;
 	for (statelist_t *sl = candidates; sl != NULL; sl = sl->next) {
 		maximum_states += (uint64_t)sl->len[ODD_STATE] * sl->len[EVEN_STATE];
@@ -2104,8 +2104,8 @@ static void	free_candidates_memory(statelist_t *sl)
 
 static void pre_XOR_nonces(void)
 {
-	// prepare acquired nonces for faster brute forcing. 
-	
+	// prepare acquired nonces for faster brute forcing.
+
 	// XOR the cryptoUID and its parity
 	for (uint16_t i = 0; i < 256; i++) {
 		noncelistentry_t *test_nonce = nonces[i].first;
@@ -2142,8 +2142,8 @@ static void Tests()
 		for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
 			uint32_t *bitset = nonces[best_first_bytes[0]].states_bitarray[odd_even];
 			if (!test_bit24(bitset, test_state[odd_even])) {
-				PrintAndLogEx(NORMAL, "\nBUG: known target key's %s state is not member of first nonce byte's (0x%02x) states_bitarray!\n", 
-					odd_even==EVEN_STATE?"even":"odd ", 
+				PrintAndLogEx(NORMAL, "\nBUG: known target key's %s state is not member of first nonce byte's (0x%02x) states_bitarray!\n",
+					odd_even==EVEN_STATE?"even":"odd ",
 					best_first_bytes[0]);
 			}
 		}
@@ -2153,43 +2153,43 @@ static void Tests()
 		for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
 			uint32_t *bitset = all_bitflips_bitarray[odd_even];
 			if (!test_bit24(bitset, test_state[odd_even])) {
-				PrintAndLogEx(NORMAL, "\nBUG: known target key's %s state is not member of all_bitflips_bitarray!\n", 
+				PrintAndLogEx(NORMAL, "\nBUG: known target key's %s state is not member of all_bitflips_bitarray!\n",
 					odd_even==EVEN_STATE?"even":"odd ");
 			}
 		}
-	}	
+	}
 }
 
 
-static void Tests2(void) 
+static void Tests2(void)
 {
 	if (known_target_key != -1) {
 		for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
 			uint32_t *bitset = nonces[best_first_byte_smallest_bitarray].states_bitarray[odd_even];
 			if (!test_bit24(bitset, test_state[odd_even])) {
 				PrintAndLogEx(NORMAL, "\nBUG: known target key's %s state is not member of first nonce byte's (0x%02x) states_bitarray!\n",
-					odd_even==EVEN_STATE?"even":"odd ", 
+					odd_even==EVEN_STATE?"even":"odd ",
 					best_first_byte_smallest_bitarray);
 			}
 		}
-	}	
+	}
 
 	if (known_target_key != -1) {
 		for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
 			uint32_t *bitset = all_bitflips_bitarray[odd_even];
 			if (!test_bit24(bitset, test_state[odd_even])) {
-				PrintAndLogEx(NORMAL, "\nBUG: known target key's %s state is not member of all_bitflips_bitarray!\n", 
+				PrintAndLogEx(NORMAL, "\nBUG: known target key's %s state is not member of all_bitflips_bitarray!\n",
 					odd_even==EVEN_STATE?"even":"odd ");
 			}
 		}
-	}	
-	
+	}
+
 }
 
 
 static uint16_t real_sum_a8 = 0;
 
-static void set_test_state(uint8_t byte) 
+static void set_test_state(uint8_t byte)
 {
 	struct Crypto1State *pcs;
 	pcs = crypto1_create(known_target_key);
@@ -2201,11 +2201,11 @@ static void set_test_state(uint8_t byte)
 }
 
 
-int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t *trgkey, bool nonce_file_read, bool nonce_file_write, bool slow, int tests, uint64_t *foundkey, char *filename) 
+int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t *trgkey, bool nonce_file_read, bool nonce_file_write, bool slow, int tests, uint64_t *foundkey, char *filename)
 {
-	char progress_text[80];	
+	char progress_text[80];
 	char instr_set[12] = {0};
-	
+
 	get_SIMD_instruction_set(instr_set);
 	PrintAndLogEx(SUCCESS,"Using %s SIMD core.", instr_set);
 
@@ -2217,11 +2217,11 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc
 		// set the correct locale for the stats printing
 		write_stats = true;
 		setlocale(LC_NUMERIC, "");
-		if ((fstats = fopen("hardnested_stats.txt","a")) == NULL) { 
+		if ((fstats = fopen("hardnested_stats.txt","a")) == NULL) {
 			PrintAndLogEx(WARNING, "Could not create/open file hardnested_stats.txt");
 			return 3;
 		}
-		
+
 		for (uint32_t i = 0; i < tests; i++) {
 			start_time = msclock();
 			print_progress_header();
@@ -2241,7 +2241,7 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc
 			init_allbitflips_array();
 			init_nonce_memory();
 			update_reduction_rate(0.0, true);
-			
+
 			simulate_acquire_nonces();
 
 			set_test_state(best_first_bytes[0]);
@@ -2252,7 +2252,7 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc
 			fprintf(fstats, "%" PRIu16 ";%1.1f;", sums[first_byte_Sum], log(p_K0[first_byte_Sum])/log(2.0));
 			fprintf(fstats, "%" PRIu16 ";%1.1f;", sums[nonces[best_first_bytes[0]].sum_a8_guess[0].sum_a8_idx], log(p_K[nonces[best_first_bytes[0]].sum_a8_guess[0].sum_a8_idx])/log(2.0));
 			fprintf(fstats, "%" PRIu16 ";", real_sum_a8);
-	
+
 #ifdef DEBUG_KEY_ELIMINATION
 			failstr[0] = '\0';
 #endif
@@ -2263,7 +2263,7 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc
 			float expected_brute_force1 = (float)num_odd * num_even / 2.0;
 			float expected_brute_force2 = nonces[best_first_bytes[0]].expected_num_brute_force;
 			fprintf(fstats, "%1.1f;%1.1f;", log(expected_brute_force1)/log(2.0), log(expected_brute_force2)/log(2.0));
-			
+
 			if (expected_brute_force1 < expected_brute_force2) {
 				hardnested_print_progress(num_acquired_nonces, "(Ignoring Sum(a8) properties)", expected_brute_force1, 0);
 				set_test_state(best_first_byte_smallest_bitarray);
@@ -2289,7 +2289,7 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc
 				for (uint8_t j = 0; j < NUM_SUMS && !key_found; j++) {
 					float expected_brute_force = nonces[best_first_bytes[0]].expected_num_brute_force;
 					sprintf(progress_text, "(%d. guess: Sum(a8) = %" PRIu16 ")", j+1, sums[nonces[best_first_bytes[0]].sum_a8_guess[j].sum_a8_idx]);
-					hardnested_print_progress(num_acquired_nonces, progress_text, expected_brute_force, 0); 
+					hardnested_print_progress(num_acquired_nonces, progress_text, expected_brute_force, 0);
 					if (sums[nonces[best_first_bytes[0]].sum_a8_guess[j].sum_a8_idx] != real_sum_a8) {
 						sprintf(progress_text, "(Estimated Sum(a8) is WRONG! Correct Sum(a8) = %" PRIu16 ")", real_sum_a8);
 						hardnested_print_progress(num_acquired_nonces, progress_text, expected_brute_force, 0);
@@ -2314,7 +2314,7 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc
 			#else
 			fprintf(fstats, "%1.0f;%d\n", log(num_keys_tested)/log(2.0), (float)num_keys_tested/brute_force_per_second, key_found);
 			#endif
-			
+
 			free_nonces_memory();
 			free_bitarray(all_bitflips_bitarray[ODD_STATE]);
 			free_bitarray(all_bitflips_bitarray[EVEN_STATE]);
@@ -2357,7 +2357,7 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc
 				free_bitarray(all_bitflips_bitarray[EVEN_STATE]);
 				free_sum_bitarrays();
 				free_part_sum_bitarrays();
-				
+
 				return is_OK;
 			}
 		}
@@ -2368,7 +2368,7 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc
 		} else {
 			known_target_key = -1;
 		}
-		
+
 		Tests();
 
 		free_bitflip_bitarrays();
@@ -2378,14 +2378,14 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc
 		uint32_t num_even = nonces[best_first_byte_smallest_bitarray].num_states_bitarray[EVEN_STATE];
 		float expected_brute_force1 = (float)num_odd * num_even / 2.0;
 		float expected_brute_force2 = nonces[best_first_bytes[0]].expected_num_brute_force;
-		
+
 		if (expected_brute_force1 < expected_brute_force2) {
 			hardnested_print_progress(num_acquired_nonces, "(Ignoring Sum(a8) properties)", expected_brute_force1, 0);
 			set_test_state(best_first_byte_smallest_bitarray);
 			add_bitflip_candidates(best_first_byte_smallest_bitarray);
 			Tests2();
 			maximum_states = 0;
-			
+
 			for (statelist_t *sl = candidates; sl != NULL; sl = sl->next) {
 				maximum_states += (uint64_t)sl->len[ODD_STATE] * sl->len[EVEN_STATE];
 			}
@@ -2400,20 +2400,20 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc
 			free_candidates_memory(candidates);
 			candidates = NULL;
 		} else {
-			
+
 			pre_XOR_nonces();
 			prepare_bf_test_nonces(nonces, best_first_bytes[0]);
-			
+
 			for (uint8_t j = 0; j < NUM_SUMS && !key_found; j++) {
 				float expected_brute_force = nonces[best_first_bytes[0]].expected_num_brute_force;
 				sprintf(progress_text, "(%d. guess: Sum(a8) = %" PRIu16 ")", j+1, sums[nonces[best_first_bytes[0]].sum_a8_guess[j].sum_a8_idx]);
-				hardnested_print_progress(num_acquired_nonces, progress_text, expected_brute_force, 0); 
-				
+				hardnested_print_progress(num_acquired_nonces, progress_text, expected_brute_force, 0);
+
 				if (trgkey != NULL && sums[nonces[best_first_bytes[0]].sum_a8_guess[j].sum_a8_idx] != real_sum_a8) {
 					sprintf(progress_text, "(Estimated Sum(a8) is WRONG! Correct Sum(a8) = %" PRIu16 ")", real_sum_a8);
 					hardnested_print_progress(num_acquired_nonces, progress_text, expected_brute_force, 0);
 				}
-				
+
 				generate_candidates(first_byte_Sum, nonces[best_first_bytes[0]].sum_a8_guess[j].sum_a8_idx);
 				key_found = brute_force(foundkey);
 				free_statelist_cache();
@@ -2429,7 +2429,7 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc
 
 			}
 		}
-		
+
 		free_nonces_memory();
 		free_bitarray(all_bitflips_bitarray[ODD_STATE]);
 		free_bitarray(all_bitflips_bitarray[EVEN_STATE]);
diff --git a/client/cmdhfmfp.c b/client/cmdhfmfp.c
index 348a4a9c9..ade39b9bc 100644
--- a/client/cmdhfmfp.c
+++ b/client/cmdhfmfp.c
@@ -34,10 +34,10 @@ static const uint8_t DefaultKey[16] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
 static int CmdHelp(const char *Cmd);
 
 int CmdHFMFPInfo(const char *cmd) {
-	
+
 	if (cmd && strlen(cmd) > 0)
 		PrintAndLogEx(WARNING, "command don't have any parameters.\n");
-	
+
 	// info about 14a part
 	CmdHF14AInfo("");
 
@@ -47,16 +47,16 @@ int CmdHFMFPInfo(const char *cmd) {
 
 	UsbCommand resp;
 	WaitForResponse(CMD_ACK,&resp);
-	
+
 	iso14a_card_select_t card;
 	memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
 
 	uint64_t select_status = resp.arg[0];		// 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
-	
+
 	if (select_status == 1 || select_status == 2) {
 		PrintAndLogEx(NORMAL, "----------------------------------------------");
 		PrintAndLogEx(NORMAL, "Mifare Plus info:");
-		
+
 		// MIFARE Type Identification Procedure
 		// https://www.nxp.com/docs/en/application-note/AN10833.pdf
 		uint16_t ATQA = card.atqa[0] + (card.atqa[1] << 8);
@@ -64,7 +64,7 @@ int CmdHFMFPInfo(const char *cmd) {
 		if (ATQA == 0x0002) PrintAndLogEx(INFO, "ATQA: Mifare Plus 4k 4bUID");
 		if (ATQA == 0x0044) PrintAndLogEx(INFO, "ATQA: Mifare Plus 2k 7bUID");
 		if (ATQA == 0x0042) PrintAndLogEx(INFO, "ATQA: Mifare Plus 4k 7bUID");
-		
+
 		uint8_t SLmode = 0xff;
 		if (card.sak == 0x08) {
 			PrintAndLogEx(INFO, "SAK: Mifare Plus 2k 7bUID");
@@ -98,7 +98,7 @@ int CmdHFMFPInfo(const char *cmd) {
 				}
 			}
 		}
-		
+
 		if (SLmode != 0xff)
 			PrintAndLogEx(INFO, "Mifare Plus SL mode: SL%d", SLmode);
 		else
@@ -106,9 +106,9 @@ int CmdHFMFPInfo(const char *cmd) {
 	} else {
 		PrintAndLogEx(INFO, "Mifare Plus info not available.");
 	}
-	
+
 	DropField();
-	
+
 	return 0;
 }
 
@@ -118,8 +118,8 @@ int CmdHFMFPWritePerso(const char *cmd) {
 	uint8_t key[64] = {0};
 	int keyLen = 0;
 
-	CLIParserInit("hf mfp wrp", 
-		"Executes Write Perso command. Can be used in SL0 mode only.", 
+	CLIParserInit("hf mfp wrp",
+		"Executes Write Perso command. Can be used in SL0 mode only.",
 		"Usage:\n\thf mfp wrp 4000 000102030405060708090a0b0c0d0e0f -> write key (00..0f) to key number 4000 \n"
 			"\thf mfp wrp 4000 -> write default key(0xff..0xff) to key number 4000");
 
@@ -131,19 +131,19 @@ int CmdHFMFPWritePerso(const char *cmd) {
 		arg_param_end
 	};
 	CLIExecWithReturn(cmd, argtable, true);
-	
+
 	bool verbose = arg_get_lit(1);
 	CLIGetHexWithReturn(2, keyNum, &keyNumLen);
 	CLIGetHexWithReturn(3, key, &keyLen);
 	CLIParserFree();
-	
+
 	mfpSetVerboseMode(verbose);
-	
+
 	if (!keyLen) {
 		memmove(key, DefaultKey, 16);
 		keyLen = 16;
 	}
-	
+
 	if (keyNumLen != 2) {
 		PrintAndLogEx(ERR, "Key number length must be 2 bytes instead of: %d", keyNumLen);
 		return 1;
@@ -161,7 +161,7 @@ int CmdHFMFPWritePerso(const char *cmd) {
 		PrintAndLogEx(ERR, "Exchange error: %d", res);
 		return res;
 	}
-	
+
 	if (datalen != 3) {
 		PrintAndLogEx(ERR, "Command must return 3 bytes instead of: %d", datalen);
 		return 1;
@@ -172,7 +172,7 @@ int CmdHFMFPWritePerso(const char *cmd) {
 		return 1;
 	}
 	PrintAndLogEx(INFO, "Write OK.");
-	
+
 	return 0;
 }
 
@@ -186,8 +186,8 @@ int CmdHFMFPInitPerso(const char *cmd) {
 	uint8_t data[250] = {0};
 	int datalen = 0;
 
-	CLIParserInit("hf mfp initp", 
-		"Executes Write Perso command for all card's keys. Can be used in SL0 mode only.", 
+	CLIParserInit("hf mfp initp",
+		"Executes Write Perso command for all card's keys. Can be used in SL0 mode only.",
 		"Usage:\n\thf mfp initp 000102030405060708090a0b0c0d0e0f -> fill all the keys with key (00..0f)\n"
 			"\thf mfp initp -vv -> fill all the keys with default key(0xff..0xff) and show all the data exchange");
 
@@ -198,7 +198,7 @@ int CmdHFMFPInitPerso(const char *cmd) {
 		arg_param_end
 	};
 	CLIExecWithReturn(cmd, argtable, true);
-	
+
 	bool verbose = arg_get_lit(1);
 	bool verbose2 = arg_get_lit(1) > 1;
 	CLIGetHexWithReturn(2, key, &keyLen);
@@ -208,7 +208,7 @@ int CmdHFMFPInitPerso(const char *cmd) {
 		PrintAndLogEx(ERR, "Key length must be 16 bytes instead of: %d", keyLen);
 		return 1;
 	}
-	
+
 	if (!keyLen)
 		memmove(key, DefaultKey, 16);
 
@@ -226,7 +226,7 @@ int CmdHFMFPInitPerso(const char *cmd) {
 			break;
 		}
 	}
-	
+
 	mfpSetVerboseMode(verbose);
 	for (int i = 0; i < sizeof(CardAddresses) / 2; i++) {
 		keyNum[0] = CardAddresses[i] >> 8;
@@ -241,20 +241,20 @@ int CmdHFMFPInitPerso(const char *cmd) {
 			}
 		}
 	}
-	
+
 	DropField();
-	
+
 	if (res)
 		return res;
-	
+
 	PrintAndLogEx(INFO, "Done.");
-	
+
 	return 0;
 }
 
 int CmdHFMFPCommitPerso(const char *cmd) {
-	CLIParserInit("hf mfp commitp", 
-		"Executes Commit Perso command. Can be used in SL0 mode only.", 
+	CLIParserInit("hf mfp commitp",
+		"Executes Commit Perso command. Can be used in SL0 mode only.",
 		"Usage:\n\thf mfp commitp ->  \n");
 
 	void* argtable[] = {
@@ -264,12 +264,12 @@ int CmdHFMFPCommitPerso(const char *cmd) {
 		arg_param_end
 	};
 	CLIExecWithReturn(cmd, argtable, true);
-	
+
 	bool verbose = arg_get_lit(1);
 	CLIParserFree();
-	
+
 	mfpSetVerboseMode(verbose);
-	
+
 	uint8_t data[250] = {0};
 	int datalen = 0;
 
@@ -278,7 +278,7 @@ int CmdHFMFPCommitPerso(const char *cmd) {
 		PrintAndLogEx(ERR, "Exchange error: %d", res);
 		return res;
 	}
-	
+
 	if (datalen != 3) {
 		PrintAndLogEx(ERR, "Command must return 3 bytes instead of: %d", datalen);
 		return 1;
@@ -298,9 +298,9 @@ int CmdHFMFPAuth(const char *cmd) {
 	int keynlen = 0;
 	uint8_t key[250] = {0};
 	int keylen = 0;
-	
-	CLIParserInit("hf mfp auth", 
-		"Executes AES authentication command for Mifare Plus card", 
+
+	CLIParserInit("hf mfp auth",
+		"Executes AES authentication command for Mifare Plus card",
 		"Usage:\n\thf mfp auth 4000 000102030405060708090a0b0c0d0e0f -> executes authentication\n"
 			"\thf mfp auth 9003 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -v -> executes authentication and shows all the system data\n");
 
@@ -312,17 +312,17 @@ int CmdHFMFPAuth(const char *cmd) {
 		arg_param_end
 	};
 	CLIExecWithReturn(cmd, argtable, true);
-	
+
 	bool verbose = arg_get_lit(1);
 	CLIGetHexWithReturn(2, keyn, &keynlen);
 	CLIGetHexWithReturn(3, key, &keylen);
 	CLIParserFree();
-	
+
 	if (keynlen != 2) {
 		PrintAndLogEx(ERR, "ERROR: <Key Num> must be 2 bytes long instead of: %d", keynlen);
 		return 1;
 	}
-	
+
 	if (keylen != 16) {
 		PrintAndLogEx(ERR, "ERROR: <Key Value> must be 16 bytes long instead of: %d", keylen);
 		return 1;
@@ -335,9 +335,9 @@ int CmdHFMFPRdbl(const char *cmd) {
 	uint8_t keyn[2] = {0};
 	uint8_t key[250] = {0};
 	int keylen = 0;
-	
-	CLIParserInit("hf mfp rdbl", 
-		"Reads several blocks from Mifare Plus card.", 
+
+	CLIParserInit("hf mfp rdbl",
+		"Reads several blocks from Mifare Plus card.",
 		"Usage:\n\thf mfp rdbl 0 000102030405060708090a0b0c0d0e0f -> executes authentication and read block 0 data\n"
 			"\thf mfp rdbl 1 -v -> executes authentication and shows sector 1 data with default key 0xFF..0xFF and some additional data\n");
 
@@ -352,7 +352,7 @@ int CmdHFMFPRdbl(const char *cmd) {
 		arg_param_end
 	};
 	CLIExecWithReturn(cmd, argtable, false);
-	
+
 	bool verbose = arg_get_lit(1);
 	int blocksCount = arg_get_int_def(2, 1);
 	bool keyB = arg_get_lit(3);
@@ -360,19 +360,19 @@ int CmdHFMFPRdbl(const char *cmd) {
 	uint32_t blockn = arg_get_int(5);
 	CLIGetHexWithReturn(6, key, &keylen);
 	CLIParserFree();
-	
+
 	mfpSetVerboseMode(verbose);
 
 	if (!keylen) {
 		memmove(key, DefaultKey, 16);
 		keylen = 16;
 	}
-	
+
 	if (blockn > 255) {
 		PrintAndLogEx(ERR, "<Block Num> must be in range [0..255] instead of: %d", blockn);
 		return 1;
 	}
-	
+
 	if (keylen != 16) {
 		PrintAndLogEx(ERR, "<Key Value> must be 16 bytes long instead of: %d", keylen);
 		return 1;
@@ -383,25 +383,25 @@ int CmdHFMFPRdbl(const char *cmd) {
 		PrintAndLogEx(ERR, "blocks count must be less than 3 instead of: %d", blocksCount);
 		return 1;
 	}
-	
+
 	if (blocksCount > 1 && mfIsSectorTrailer(blockn)) {
 		PrintAndLog("WARNING: trailer!");
 	}
-	
+
 	uint8_t sectorNum = mfSectorNum(blockn & 0xff);
 	uint16_t uKeyNum = 0x4000 + sectorNum * 2 + (keyB ? 1 : 0);
 	keyn[0] = uKeyNum >> 8;
 	keyn[1] = uKeyNum & 0xff;
 	if (verbose)
 		PrintAndLogEx(INFO, "--block:%d sector[%d]:%02x key:%04x", blockn, mfNumBlocksPerSector(sectorNum), sectorNum, uKeyNum);
-	
+
 	mf4Session session;
 	int res = MifareAuth4(&session, keyn, key, true, true, verbose);
 	if (res) {
 		PrintAndLogEx(ERR, "Authentication error: %d", res);
 		return res;
 	}
-	
+
 	uint8_t data[250] = {0};
 	int datalen = 0;
 	uint8_t mac[8] = {0};
@@ -410,12 +410,12 @@ int CmdHFMFPRdbl(const char *cmd) {
 		PrintAndLogEx(ERR, "Read error: %d", res);
 		return res;
 	}
-	
+
 	if (datalen && data[0] != 0x90) {
 		PrintAndLogEx(ERR, "Card read error: %02x %s", data[0], mfpGetErrorDescription(data[0]));
 		return 6;
 	}
-	
+
 	if (datalen != 1 + blocksCount * 16 + 8 + 2) {
 		PrintAndLogEx(ERR, "Error return length:%d", datalen);
 		return 5;
@@ -435,11 +435,11 @@ int CmdHFMFPRdbl(const char *cmd) {
 		PrintAndLogEx(WARNING, "WARNING: mac not equal...");
 		PrintAndLogEx(WARNING, "MAC   card: %s", sprint_hex(&data[blocksCount * 16 + 1], 8));
 		PrintAndLogEx(WARNING, "MAC reader: %s", sprint_hex(mac, 8));
-	} else {	
+	} else {
 	if(verbose)
 			PrintAndLogEx(INFO, "MAC: %s", sprint_hex(&data[blocksCount * 16 + 1], 8));
 	}
-	
+
 	return 0;
 }
 
@@ -447,9 +447,9 @@ int CmdHFMFPRdsc(const char *cmd) {
 	uint8_t keyn[2] = {0};
 	uint8_t key[250] = {0};
 	int keylen = 0;
-	
-	CLIParserInit("hf mfp rdsc", 
-		"Reads one sector from Mifare Plus card.", 
+
+	CLIParserInit("hf mfp rdsc",
+		"Reads one sector from Mifare Plus card.",
 		"Usage:\n\thf mfp rdsc 0 000102030405060708090a0b0c0d0e0f -> executes authentication and read sector 0 data\n"
 			"\thf mfp rdsc 1 -v -> executes authentication and shows sector 1 data with default key 0xFF..0xFF and some additional data\n");
 
@@ -463,44 +463,44 @@ int CmdHFMFPRdsc(const char *cmd) {
 		arg_param_end
 	};
 	CLIExecWithReturn(cmd, argtable, false);
-	
+
 	bool verbose = arg_get_lit(1);
 	bool keyB = arg_get_lit(2);
 	bool plain = arg_get_lit(3);
 	uint32_t sectorNum = arg_get_int(4);
 	CLIGetHexWithReturn(5, key, &keylen);
 	CLIParserFree();
-	
+
 	mfpSetVerboseMode(verbose);
 
 	if (!keylen) {
 		memmove(key, DefaultKey, 16);
 		keylen = 16;
 	}
-	
+
 	if (sectorNum > 39) {
 		PrintAndLogEx(ERR, "<Sector Num> must be in range [0..39] instead of: %d", sectorNum);
 		return 1;
 	}
-	
+
 	if (keylen != 16) {
 		PrintAndLogEx(ERR, "<Key Value> must be 16 bytes long instead of: %d", keylen);
 		return 1;
 	}
-	
+
 	uint16_t uKeyNum = 0x4000 + sectorNum * 2 + (keyB ? 1 : 0);
 	keyn[0] = uKeyNum >> 8;
 	keyn[1] = uKeyNum & 0xff;
 	if (verbose)
 		PrintAndLogEx(INFO, "--sector[%d]:%02x key:%04x", mfNumBlocksPerSector(sectorNum), sectorNum, uKeyNum);
-	
+
 	mf4Session session;
 	int res = MifareAuth4(&session, keyn, key, true, true, verbose);
 	if (res) {
 		PrintAndLogEx(ERR, "Authentication error: %d", res);
 		return res;
 	}
-	
+
 	uint8_t data[250] = {0};
 	int datalen = 0;
 	uint8_t mac[8] = {0};
@@ -511,7 +511,7 @@ int CmdHFMFPRdsc(const char *cmd) {
 			DropField();
 			return res;
 		}
-		
+
 		if (datalen && data[0] != 0x90) {
 			PrintAndLogEx(ERR, "Card read error: %02x %s", data[0], mfpGetErrorDescription(data[0]));
 			DropField();
@@ -524,18 +524,18 @@ int CmdHFMFPRdsc(const char *cmd) {
 		}
 
 		PrintAndLogEx(INFO, "data[%03d]: %s", n, sprint_hex(&data[1], 16));
-			
+
 		if (memcmp(&data[1 + 16], mac, 8)) {
 			PrintAndLogEx(WARNING, "WARNING: mac on block %d not equal...", n);
 			PrintAndLogEx(WARNING, "MAC   card: %s", sprint_hex(&data[1 + 16], 8));
 			PrintAndLogEx(WARNING, "MAC reader: %s", sprint_hex(mac, 8));
-		} else {	
+		} else {
 			if(verbose)
 				PrintAndLogEx(INFO, "MAC: %s", sprint_hex(&data[1 + 16], 8));
 		}
 	}
 	DropField();
-	
+
 	return 0;
 }
 
@@ -545,9 +545,9 @@ int CmdHFMFPWrbl(const char *cmd) {
 	int keylen = 0;
 	uint8_t datain[250] = {0};
 	int datainlen = 0;
-	
-	CLIParserInit("hf mfp wrbl", 
-		"Writes one block to Mifare Plus card.", 
+
+	CLIParserInit("hf mfp wrbl",
+		"Writes one block to Mifare Plus card.",
 		"Usage:\n\thf mfp wrbl 1 ff0000000000000000000000000000ff 000102030405060708090a0b0c0d0e0f -> writes block 1 data\n"
 			"\thf mfp wrbl 2 ff0000000000000000000000000000ff -v -> writes block 2 data with default key 0xFF..0xFF and some additional data\n");
 
@@ -561,26 +561,26 @@ int CmdHFMFPWrbl(const char *cmd) {
 		arg_param_end
 	};
 	CLIExecWithReturn(cmd, argtable, false);
-	
+
 	bool verbose = arg_get_lit(1);
 	bool keyB = arg_get_lit(2);
 	uint32_t blockNum = arg_get_int(3);
 	CLIGetHexWithReturn(4, datain, &datainlen);
 	CLIGetHexWithReturn(5, key, &keylen);
 	CLIParserFree();
-	
+
 	mfpSetVerboseMode(verbose);
 
 	if (!keylen) {
 		memmove(key, DefaultKey, 16);
 		keylen = 16;
 	}
-	
+
 	if (blockNum > 39) {
 		PrintAndLogEx(ERR, "<Block Num> must be in range [0..255] instead of: %d", blockNum);
 		return 1;
 	}
-	
+
 	if (keylen != 16) {
 		PrintAndLogEx(ERR, "<Key> must be 16 bytes long instead of: %d", keylen);
 		return 1;
@@ -590,14 +590,14 @@ int CmdHFMFPWrbl(const char *cmd) {
 		PrintAndLogEx(ERR, "<Data> must be 16 bytes long instead of: %d", datainlen);
 		return 1;
 	}
-	
+
 	uint8_t sectorNum = mfSectorNum(blockNum & 0xff);
 	uint16_t uKeyNum = 0x4000 + sectorNum * 2 + (keyB ? 1 : 0);
 	keyn[0] = uKeyNum >> 8;
 	keyn[1] = uKeyNum & 0xff;
 	if (verbose)
 		PrintAndLogEx(INFO, "--block:%d sector[%d]:%02x key:%04x", blockNum & 0xff, mfNumBlocksPerSector(sectorNum), sectorNum, uKeyNum);
-	
+
 	mf4Session session;
 	int res = MifareAuth4(&session, keyn, key, true, true, verbose);
 	if (res) {
@@ -614,37 +614,37 @@ int CmdHFMFPWrbl(const char *cmd) {
 		DropField();
 		return res;
 	}
-	
+
 	if (datalen != 3 && (datalen != 3 + 8)) {
 		PrintAndLogEx(ERR, "Error return length:%d", datalen);
 		DropField();
 		return 5;
 	}
-	
+
 	if (datalen && data[0] != 0x90) {
 		PrintAndLogEx(ERR, "Card write error: %02x %s", data[0], mfpGetErrorDescription(data[0]));
 		DropField();
 		return 6;
 	}
-	
+
 	if (memcmp(&data[1], mac, 8)) {
 		PrintAndLogEx(WARNING, "WARNING: mac not equal...");
 		PrintAndLogEx(WARNING, "MAC   card: %s", sprint_hex(&data[1], 8));
 		PrintAndLogEx(WARNING, "MAC reader: %s", sprint_hex(mac, 8));
-	} else {	
+	} else {
 		if(verbose)
 			PrintAndLogEx(INFO, "MAC: %s", sprint_hex(&data[1], 8));
 	}
-	
+
 	DropField();
-	PrintAndLogEx(INFO, "Write OK.");	
+	PrintAndLogEx(INFO, "Write OK.");
 	return 0;
 }
 
 int CmdHFMFPMAD(const char *cmd) {
 
-	CLIParserInit("hf mfp mad", 
-		"Checks and prints Mifare Application Directory (MAD)", 
+	CLIParserInit("hf mfp mad",
+		"Checks and prints Mifare Application Directory (MAD)",
 		"Usage:\n\thf mfp mad -> shows MAD if exists\n"
 			"\thf mfp mad -a 03e1 -k d3f7d3f7d3f7d3f7d3f7d3f7d3f7d3f7 -> shows NDEF data if exists\n");
 
@@ -657,7 +657,7 @@ int CmdHFMFPMAD(const char *cmd) {
 		arg_param_end
 	};
 	CLIExecWithReturn(cmd, argtable, true);
-	
+
 	bool verbose = arg_get_lit(1);
 	uint8_t aid[2] = {0};
 	int aidlen;
@@ -666,30 +666,30 @@ int CmdHFMFPMAD(const char *cmd) {
 	int keylen;
 	CLIGetHexWithReturn(3, key, &keylen);
 	bool keyB = arg_get_lit(4);
-	
+
 	CLIParserFree();
-	
+
 	if (aidlen != 2 && keylen > 0) {
 		PrintAndLogEx(WARNING, "do not need a key without aid.");
 	}
 
 	uint8_t sector0[16 * 4] = {0};
 	uint8_t sector10[16 * 4] = {0};
-	
+
 	if (mfpReadSector(MF_MAD1_SECTOR, MF_KEY_A, (uint8_t *)g_mifarep_mad_key, sector0, verbose)) {
 		PrintAndLogEx(NORMAL, "");
 		PrintAndLogEx(ERR, "read sector 0 error. card don't have MAD or don't have MAD on default keys.");
 		return 2;
 	}
-	
+
 	if (verbose) {
 		for(int i = 0; i < 4; i ++)
-			PrintAndLogEx(NORMAL, "[%d] %s", i, sprint_hex(&sector0[i * 16], 16));		
+			PrintAndLogEx(NORMAL, "[%d] %s", i, sprint_hex(&sector0[i * 16], 16));
 	}
 
 	bool haveMAD2 = false;
 	MAD1DecodeAndPrint(sector0, verbose, &haveMAD2);
-	
+
 	if (haveMAD2) {
 		if (mfpReadSector(MF_MAD2_SECTOR, MF_KEY_A, (uint8_t *)g_mifarep_mad_key, sector10, verbose)) {
 			PrintAndLogEx(NORMAL, "");
@@ -703,7 +703,7 @@ int CmdHFMFPMAD(const char *cmd) {
 	if (aidlen == 2) {
 		uint16_t aaid = (aid[0] << 8) + aid[1];
 		PrintAndLogEx(NORMAL, "\n-------------- AID 0x%04x ---------------", aaid);
-		
+
 		uint16_t mad[7 + 8 + 8 + 8 + 8] = {0};
 		size_t madlen = 0;
 		if (MADDecode(sector0, sector10, mad, &madlen)) {
@@ -716,7 +716,7 @@ int CmdHFMFPMAD(const char *cmd) {
 		if (keylen == 16) {
 			memcpy(akey, key, 16);
 		}
-		
+
 		for (int i = 0; i < madlen; i++) {
 			if (aaid == mad[i]) {
 				uint8_t vsector[16 * 4] = {0};
@@ -725,20 +725,20 @@ int CmdHFMFPMAD(const char *cmd) {
 					PrintAndLogEx(ERR, "read sector %d error.", i + 1);
 					return 2;
 				}
-				
+
 				for(int j = 0; j < (verbose ? 4 : 3); j ++)
-					PrintAndLogEx(NORMAL, " [%03d] %s", (i + 1) * 4 + j, sprint_hex(&vsector[j * 16], 16));		
+					PrintAndLogEx(NORMAL, " [%03d] %s", (i + 1) * 4 + j, sprint_hex(&vsector[j * 16], 16));
 			}
-		}		
+		}
 	}
-	
+
 	return 0;
 }
 
 int CmdHFMFPNDEF(const char *cmd) {
 
-	CLIParserInit("hf mfp ndef", 
-		"Prints NFC Data Exchange Format (NDEF)", 
+	CLIParserInit("hf mfp ndef",
+		"Prints NFC Data Exchange Format (NDEF)",
 		"Usage:\n\thf mfp ndef -> shows NDEF data\n"
 			"\thf mfp ndef -a 03e1 -k d3f7d3f7d3f7d3f7d3f7d3f7d3f7d3f7 -> shows NDEF data with custom AID and key\n");
 
@@ -751,7 +751,7 @@ int CmdHFMFPNDEF(const char *cmd) {
 		arg_param_end
 	};
 	CLIExecWithReturn(cmd, argtable, true);
-	
+
 	bool verbose = arg_get_lit(1);
 	bool verbose2 = arg_get_lit(1) > 1;
 	uint8_t aid[2] = {0};
@@ -761,38 +761,38 @@ int CmdHFMFPNDEF(const char *cmd) {
 	int keylen;
 	CLIGetHexWithReturn(3, key, &keylen);
 	bool keyB = arg_get_lit(4);
-	
+
 	CLIParserFree();
 
 	uint16_t ndefAID = 0x03e1;
 	if (aidlen == 2)
 		ndefAID = (aid[0] << 8) + aid[1];
-	
+
 	uint8_t ndefkey[16] = {0};
 	memcpy(ndefkey, g_mifarep_ndef_key, 16);
 	if (keylen == 16) {
 		memcpy(ndefkey, key, 16);
 	}
-	
+
 	uint8_t sector0[16 * 4] = {0};
 	uint8_t sector10[16 * 4] = {0};
 	uint8_t data[4096] = {0};
 	int datalen = 0;
 
 	PrintAndLogEx(NORMAL, "");
-	
+
 	if (mfpReadSector(MF_MAD1_SECTOR, MF_KEY_A, (uint8_t *)g_mifarep_mad_key, sector0, verbose)) {
 		PrintAndLogEx(ERR, "read sector 0 error. card don't have MAD or don't have MAD on default keys.");
 		return 2;
 	}
-	
+
 	bool haveMAD2 = false;
 	int res = MADCheck(sector0, NULL, verbose, &haveMAD2);
 	if (res) {
 		PrintAndLogEx(ERR, "MAD error %d.", res);
 		return res;
 	}
-	
+
 	if (haveMAD2) {
 		if (mfpReadSector(MF_MAD2_SECTOR, MF_KEY_A, (uint8_t *)g_mifarep_mad_key, sector10, verbose)) {
 			PrintAndLogEx(ERR, "read sector 0x10 error. card don't have MAD or don't have MAD on default keys.");
@@ -815,25 +815,25 @@ int CmdHFMFPNDEF(const char *cmd) {
 				PrintAndLogEx(ERR, "read sector %d error.", i + 1);
 				return 2;
 			}
-			
+
 			memcpy(&data[datalen], vsector, 16 * 3);
 			datalen += 16 * 3;
-			
+
 			printf(".");
 		}
 	}
 	printf(" OK\n");
-	
+
 	if (!datalen) {
 		PrintAndLogEx(ERR, "no NDEF data.");
 		return 11;
 	}
-	
+
 	if (verbose2) {
 		PrintAndLogEx(NORMAL, "NDEF data:");
 		dump_buffer(data, datalen, stdout, 1);
 	}
-		
+
 	NDEFDecodeAndPrint(data, datalen, verbose);
 
 	return 0;
diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index 8b27d9b22..c24ba6407 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -61,7 +61,7 @@ uint32_t UL_TYPES_ARRAY[MAX_UL_TYPES] = {
 
 uint8_t UL_MEMORY_ARRAY[MAX_UL_TYPES] = {
 		MAX_UL_BLOCKS,		MAX_UL_BLOCKS,	MAX_ULC_BLOCKS,	MAX_ULEV1a_BLOCKS,	MAX_ULEV1b_BLOCKS,	MAX_NTAG_203,
-		MAX_NTAG_203,		MAX_NTAG_210,	MAX_NTAG_212,	MAX_NTAG_213,		MAX_NTAG_215,		MAX_NTAG_216, 
+		MAX_NTAG_203,		MAX_NTAG_210,	MAX_NTAG_212,	MAX_NTAG_213,		MAX_NTAG_215,		MAX_NTAG_216,
 		MAX_UL_BLOCKS,		MAX_MY_D_NFC,	MAX_MY_D_MOVE,	MAX_MY_D_MOVE,		MAX_MY_D_MOVE_LEAN,	MAX_UL_BLOCKS,
 		MAX_ULEV1a_BLOCKS,	MAX_NTAG_213,	MAX_NTAG_216,	MAX_UL_NANO_40
 	};
@@ -69,13 +69,13 @@ uint8_t UL_MEMORY_ARRAY[MAX_UL_TYPES] = {
 //------------------------------------
 // Pwd & Pack generation Stuff
 //------------------------------------
-const uint32_t c_D[] = { 
-	0x6D835AFC, 0x7D15CD97, 0x0942B409, 0x32F9C923, 0xA811FB02, 0x64F121E8, 
-	0xD1CC8B4E, 0xE8873E6F, 0x61399BBB, 0xF1B91926, 0xAC661520, 0xA21A31C9, 
-	0xD424808D, 0xFE118E07, 0xD18E728D, 0xABAC9E17, 0x18066433, 0x00E18E79, 
-	0x65A77305, 0x5AE9E297, 0x11FC628C, 0x7BB3431F, 0x942A8308, 0xB2F8FD20, 
+const uint32_t c_D[] = {
+	0x6D835AFC, 0x7D15CD97, 0x0942B409, 0x32F9C923, 0xA811FB02, 0x64F121E8,
+	0xD1CC8B4E, 0xE8873E6F, 0x61399BBB, 0xF1B91926, 0xAC661520, 0xA21A31C9,
+	0xD424808D, 0xFE118E07, 0xD18E728D, 0xABAC9E17, 0x18066433, 0x00E18E79,
+	0x65A77305, 0x5AE9E297, 0x11FC628C, 0x7BB3431F, 0x942A8308, 0xB2F8FD20,
 	0x5728B869, 0x30726D5A
-};		
+};
 
 void transform_D(uint8_t* ru) {
 	//Transform
@@ -101,12 +101,12 @@ void transform_D(uint8_t* ru) {
 	ru[6] = (v2 >> 16) & 0xFF;
 	ru[7] = (v2 >> 24) & 0xFF;
 }
-		
+
 // Certain pwd generation algo nickname A.
-uint32_t ul_ev1_pwdgenA(uint8_t* uid) { 
+uint32_t ul_ev1_pwdgenA(uint8_t* uid) {
 
 	uint8_t pos = (uid[3] ^ uid[4] ^ uid[5] ^ uid[6]) % 32;
-	
+
 	uint32_t xortable[] = {
 						0x4f2711c1, 0x07D7BB83, 0x9636EF07, 0xB5F4460E, 0xF271141C, 0x7D7BB038, 0x636EF871, 0x5F4468E3,
 						0x271149C7, 0xD7BB0B8F, 0x36EF8F1E, 0xF446863D, 0x7114947A, 0x7BB0B0F5, 0x6EF8F9EB, 0x44686BD7,
@@ -116,7 +116,7 @@ uint32_t ul_ev1_pwdgenA(uint8_t* uid) {
 
 	uint8_t entry[] = {0x00,0x00,0x00,0x00};
 	uint8_t pwd[] = {0x00,0x00,0x00,0x00};
-	
+
 	num_to_bytes( xortable[pos], 4, entry);
 
 	pwd[0] = entry[0] ^ uid[1] ^ uid[2] ^ uid[3];
@@ -131,7 +131,7 @@ uint32_t ul_ev1_pwdgenA(uint8_t* uid) {
 uint32_t ul_ev1_pwdgenB(uint8_t* uid) {
 
 	uint8_t pwd[] = {0x00,0x00,0x00,0x00};
-	
+
 	pwd[0] = uid[1] ^ uid[3] ^ 0xAA;
 	pwd[1] = uid[2] ^ uid[4] ^ 0x55;
 	pwd[2] = uid[3] ^ uid[5] ^ 0xAA;
@@ -157,8 +157,8 @@ uint32_t ul_ev1_pwdgenC(uint8_t* uid){
 	}
 	return BSWAP_32(pwd);
 }
-// Certain pwd generation algo nickname D. 
-// a.k.a xzy 
+// Certain pwd generation algo nickname D.
+// a.k.a xzy
 uint32_t ul_ev1_pwdgenD(uint8_t* uid){
 	uint8_t i;
 	//Rotate
@@ -166,9 +166,9 @@ uint32_t ul_ev1_pwdgenD(uint8_t* uid){
 	uint8_t ru[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; //Rotated UID
 	for (i = 0; i < 7; i++)
 		ru[(i + r) & 7] = uid[i];
-	
+
 	transform_D(ru);
-	
+
 	//Calc key
 	uint32_t pwd = 0; //Key as int
 	r = (ru[0] + ru[2] + ru[4] + ru[6]) & 3; //Offset
@@ -195,11 +195,11 @@ uint16_t ul_ev1_packgenD(uint8_t* uid){
 	uint8_t ru[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; //Rotated UID
 	for (i = 0; i < 7; i++)
 		ru[(i + r) & 7] = uid[i];
-	
+
 	transform_D(ru);
-	
+
 	//Calc pack
-	uint32_t p = 0;	
+	uint32_t p = 0;
 	for (i = 0; i < 8; i++)
 		p += ru[i] * 13;
 
@@ -208,12 +208,12 @@ uint16_t ul_ev1_packgenD(uint8_t* uid){
 }
 
 int ul_ev1_pwdgen_selftest(){
-	
+
 	uint8_t uid1[] = {0x04, 0x11, 0x12, 0x11, 0x12, 0x11, 0x10};
 	uint32_t pwd1 = ul_ev1_pwdgenA(uid1);
 	PrintAndLogEx(NORMAL, "UID | %s | %08X | %s", sprint_hex(uid1,7), pwd1, (pwd1 == 0x8432EB17)?"OK":"->8432EB17<-");
 
-	uint8_t uid2[] = {0x04, 0x1f, 0x98, 0xea, 0x1e, 0x3e, 0x81};		
+	uint8_t uid2[] = {0x04, 0x1f, 0x98, 0xea, 0x1e, 0x3e, 0x81};
 	uint32_t pwd2 = ul_ev1_pwdgenB(uid2);
 	PrintAndLogEx(NORMAL, "UID | %s | %08X | %s", sprint_hex(uid2,7), pwd2, (pwd2 == 0x5fd37eca)?"OK":"->5fd37eca<--");
 
@@ -228,7 +228,7 @@ int ul_ev1_pwdgen_selftest(){
 }
 
 //------------------------------------
-// get version nxp product type 
+// get version nxp product type
 char *getProductTypeStr( uint8_t id){
 
 	static char buf[20];
@@ -243,9 +243,9 @@ char *getProductTypeStr( uint8_t id){
 }
 
 /*
-  The 7 MSBits (=n) code the storage size itself based on 2^n, 
+  The 7 MSBits (=n) code the storage size itself based on 2^n,
   the LSBit is set to '0' if the size is exactly 2^n
-  and set to '1' if the storage size is between 2^n and 2^(n+1). 
+  and set to '1' if the storage size is between 2^n and 2^(n+1).
 */
 char *getUlev1CardSizeStr( uint8_t fsize ){
 
@@ -259,8 +259,8 @@ char *getUlev1CardSizeStr( uint8_t fsize ){
 	// is  LSB set?
 	if (  fsize & 1 )
 		sprintf(retStr, "%02X, (%u <-> %u bytes)",fsize, usize, lsize);
-	else 
-		sprintf(retStr, "%02X, (%u bytes)", fsize, lsize);		
+	else
+		sprintf(retStr, "%02X, (%u bytes)", fsize, lsize);
 	return buf;
 }
 
@@ -291,7 +291,7 @@ static int ul_select( iso14a_card_select_t *card ){
 	UsbCommand resp;
 	bool ans = false;
 	ans = WaitForResponseTimeout(CMD_ACK, &resp, 1500);
-	
+
 	if (!ans || resp.arg[0] < 1) {
 		PrintAndLogEx(WARNING, "iso14443a card select failed");
 		DropField();
@@ -354,7 +354,7 @@ static int ulev1_requestAuthentication( uint8_t *pwd, uint8_t *pack, uint16_t pa
 	int len = ul_send_cmd_raw(cmd, sizeof(cmd), pack, packLength);
 	// NACK tables different tags,  but between 0-9 is a NEGATIVE response.
 	// ACK == 0xA
-	if ( len == 1 && pack[0] <= 0x09 ) 
+	if ( len == 1 && pack[0] <= 0x09 )
 		return -1;
 	return len;
 }
@@ -381,7 +381,7 @@ static int ul_auth_select( iso14a_card_select_t *card, TagTypeUL_t tagtype, bool
 }
 
 static int ulev1_getVersion( uint8_t *response, uint16_t responseLength ){
-	uint8_t cmd[] = {MIFARE_ULEV1_VERSION};	
+	uint8_t cmd[] = {MIFARE_ULEV1_VERSION};
 	int len = ul_send_cmd_raw(cmd, sizeof(cmd), response, responseLength);
 	return len;
 }
@@ -410,7 +410,7 @@ static int ulev1_readSignature( uint8_t *response, uint16_t responseLength ){
 // Fudan check checks for which error is given for a command with incorrect crc
 // NXP UL chip responds with 01, fudan 00.
 // other possible checks:
-//  send a0 + crc 
+//  send a0 + crc
 //  UL responds with 00, fudan doesn't respond
 //  or
 //  send a200 + crc
@@ -422,7 +422,7 @@ static int ulev1_readSignature( uint8_t *response, uint16_t responseLength ){
 // make sure field is off before calling this function
 static int ul_fudan_check( void ){
 	iso14a_card_select_t card;
-	if ( !ul_select(&card) ) 
+	if ( !ul_select(&card) )
 		return UL_ERROR;
 
 	UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_NO_DISCONNECT | ISO14A_NO_RATS, 4, 0}};
@@ -459,7 +459,7 @@ static int ul_print_default( uint8_t *data){
 			case 0xc6: PrintAndLogEx(NORMAL, "   IC type : SLE 66R32P 5120 Bytes"); break; //512 pages /2 sectors
 		}
 	}
-	// CT (cascade tag byte) 0x88 xor SN0 xor SN1 xor SN2 
+	// CT (cascade tag byte) 0x88 xor SN0 xor SN1 xor SN2
 	int crc0 = 0x88 ^ data[0] ^ data[1] ^data[2];
 	if ( data[3] == crc0 )
 		PrintAndLogEx(NORMAL, "      BCC0 : %02X, Ok", data[3]);
@@ -494,7 +494,7 @@ static int ndef_print_CC(uint8_t *data) {
 
 	PrintAndLogEx(NORMAL, "--- NDEF Message");
 	PrintAndLogEx(NORMAL, "Capability Container: %s", sprint_hex(data,4) );
-	PrintAndLogEx(NORMAL, "  %02X : NDEF Magic Number", data[0]); 
+	PrintAndLogEx(NORMAL, "  %02X : NDEF Magic Number", data[0]);
 	PrintAndLogEx(NORMAL, "  %02X : version %d.%d supported by tag", data[1], (data[1] & 0xF0) >> 4, data[1] & 0x0F);
 	PrintAndLogEx(NORMAL, "  %02X : Physical Memory Size: %d bytes", data[2], (data[2] + 1) * 8);
 	if ( data[2] == 0x96 )
@@ -506,8 +506,8 @@ static int ndef_print_CC(uint8_t *data) {
 	else if ( data[2] == 0x6D )
 		PrintAndLogEx(NORMAL, "  %02X : NDEF Memory Size: %d bytes", data[2], 872);
 
-	PrintAndLogEx(NORMAL, "  %02X : %s / %s", data[3], 
-				(data[3] & 0xF0) ? "(RFU)" : "Read access granted without any security", 
+	PrintAndLogEx(NORMAL, "  %02X : %s / %s", data[3],
+				(data[3] & 0xF0) ? "(RFU)" : "Read access granted without any security",
 				(data[3] & 0x0F)==0 ? "Write access granted without any security" : (data[3] & 0x0F)==0x0F ? "No write access granted at all" : "(RFU)");
 	return 0;
 }
@@ -517,15 +517,15 @@ int ul_print_type(uint32_t tagtype, uint8_t spaces){
 	spc[10]=0x00;
 	char *spacer = spc + (10-spaces);
 
-	if ( tagtype & UL )	
+	if ( tagtype & UL )
 		PrintAndLogEx(NORMAL, "%sTYPE : MIFARE Ultralight (MF0ICU1) %s", spacer, (tagtype & MAGIC) ? "<magic>" : "" );
 	else if ( tagtype & UL_C)
 		PrintAndLogEx(NORMAL, "%sTYPE : MIFARE Ultralight C (MF0ULC) %s", spacer, (tagtype & MAGIC) ? "<magic>" : "" );
 	else if ( tagtype & UL_NANO_40)
-		PrintAndLogEx(NORMAL, "%sTYPE : MIFARE Ultralight Nano 40bytes (MF0UNH00)", spacer); 		
+		PrintAndLogEx(NORMAL, "%sTYPE : MIFARE Ultralight Nano 40bytes (MF0UNH00)", spacer);
 	else if ( tagtype & UL_EV1_48)
-		PrintAndLogEx(NORMAL, "%sTYPE : MIFARE Ultralight EV1 48bytes (MF0UL1101)", spacer); 
-	else if ( tagtype & UL_EV1_128)	
+		PrintAndLogEx(NORMAL, "%sTYPE : MIFARE Ultralight EV1 48bytes (MF0UL1101)", spacer);
+	else if ( tagtype & UL_EV1_128)
 		PrintAndLogEx(NORMAL, "%sTYPE : MIFARE Ultralight EV1 128bytes (MF0UL2101)", spacer);
 	else if ( tagtype & UL_EV1 )
 		PrintAndLogEx(NORMAL, "%sTYPE : MIFARE Ultralight EV1 UNKNOWN", spacer);
@@ -546,14 +546,14 @@ int ul_print_type(uint32_t tagtype, uint8_t spaces){
 	else if ( tagtype & NTAG_216 )
 		PrintAndLogEx(NORMAL, "%sTYPE : NTAG 216 888bytes (NT2H1611G0DU)", spacer);
 	else if ( tagtype & NTAG_216_F )
-		PrintAndLogEx(NORMAL, "%sTYPE : NTAG 216F 888bytes (NT2H1611F0DTL)", spacer);	
+		PrintAndLogEx(NORMAL, "%sTYPE : NTAG 216F 888bytes (NT2H1611F0DTL)", spacer);
 	else if ( tagtype & NTAG_I2C_1K )
 		PrintAndLogEx(NORMAL, "%sTYPE : NTAG I%sC 888bytes (NT3H1101FHK)", spacer, "\xFD");
-	else if ( tagtype & NTAG_I2C_2K )	
+	else if ( tagtype & NTAG_I2C_2K )
 		PrintAndLogEx(NORMAL, "%sTYPE : NTAG I%sC 1904bytes (NT3H1201FHK)", spacer, "\xFD");
 	else if ( tagtype & NTAG_I2C_1K_PLUS )
 		PrintAndLogEx(NORMAL, "%sTYPE : NTAG I%sC plus 888bytes (NT3H2111FHK)", spacer, "\xFD");
-	else if ( tagtype & NTAG_I2C_2K_PLUS )	
+	else if ( tagtype & NTAG_I2C_2K_PLUS )
 		PrintAndLogEx(NORMAL, "%sTYPE : NTAG I%sC plus 1912bytes (NT3H2211FHK)", spacer, "\xFD");
 	else if ( tagtype & MY_D )
 		PrintAndLogEx(NORMAL, "%sTYPE : INFINEON my-d\x99 (SLE 66RxxS)", spacer);
@@ -617,29 +617,29 @@ static int ulev1_print_configuration(uint32_t tagtype, uint8_t *data, uint8_t st
 	uint8_t vctid = data[5];
 
 	PrintAndLogEx(NORMAL, "  cfg0 [%u/0x%02X] : %s", startPage, startPage, sprint_hex(data, 4));
-	
+
 	 if ( (tagtype & (NTAG_213_F | NTAG_216_F)) ) {
 		uint8_t mirror_conf = (data[0] & 0xC0);
 		uint8_t mirror_byte = (data[0] & 0x30);
 		bool sleep_en = (data[0] & 0x08);
 		strg_mod_en = (data[0] & 0x04);
 		uint8_t fdp_conf = (data[0] & 0x03);
-		
+
 		switch (mirror_conf) {
 			case 0: PrintAndLogEx(NORMAL, "                    - no ASCII mirror"); break;
 			case 1: PrintAndLogEx(NORMAL, "                    - UID ASCII mirror"); break;
 			case 2: PrintAndLogEx(NORMAL, "                    - NFC counter ASCII mirror"); break;
-			case 3: PrintAndLogEx(NORMAL, "                    - UID and NFC counter ASCII mirror"); break;			
+			case 3: PrintAndLogEx(NORMAL, "                    - UID and NFC counter ASCII mirror"); break;
 			default: break;
 		}
-		
-		PrintAndLogEx(NORMAL, "                    - SLEEP mode %s", (sleep_en) ? "enabled":"disabled");	
-		
+
+		PrintAndLogEx(NORMAL, "                    - SLEEP mode %s", (sleep_en) ? "enabled":"disabled");
+
 		switch (fdp_conf) {
 			case 0: PrintAndLogEx(NORMAL, "                    - no field detect"); break;
 			case 1: PrintAndLogEx(NORMAL, "                    - enabled by first State-of-Frame (start of communication)"); break;
 			case 2: PrintAndLogEx(NORMAL, "                    - enabled by selection of the tag"); break;
-			case 3: PrintAndLogEx(NORMAL, "                    - enabled by field presence"); break;			
+			case 3: PrintAndLogEx(NORMAL, "                    - enabled by field presence"); break;
 			default: break;
 		}
 		// valid mirror start page and byte position within start page.
@@ -656,14 +656,14 @@ static int ulev1_print_configuration(uint32_t tagtype, uint8_t *data, uint8_t st
 				case 2: { PrintAndLogEx(NORMAL, "         mirror start block %02X | byte pos %02X - %s", data[2], mirror_byte, ( data[2]>= 0x4 && data[2] <= 0xE0) ? "OK":"Invalid value"); break;}
 				case 3: { PrintAndLogEx(NORMAL, "         mirror start block %02X | byte pos %02X - %s", data[2], mirror_byte, ( data[2]>= 0x4 && data[2] <= 0xDC) ? "OK":"Invalid value"); break;}
 				default: break;
-			}			
+			}
 		}
 	}
 	PrintAndLogEx(NORMAL, "                    - strong modulation mode %s", (strg_mod_en) ? "enabled":"disabled");
-	
+
 	if ( data[3] < 0xff )
 		PrintAndLogEx(NORMAL, "                    - page %d and above need authentication",data[3]);
-	else 
+	else
 		PrintAndLogEx(NORMAL, "                    - pages don't need authentication");
 
 	PrintAndLogEx(NORMAL, "  cfg1 [%u/0x%02X] : %s", startPage + 1, startPage + 1,  sprint_hex(data+4, 4) );
@@ -671,10 +671,10 @@ static int ulev1_print_configuration(uint32_t tagtype, uint8_t *data, uint8_t st
 		PrintAndLogEx(NORMAL, "                    - Unlimited password attempts");
 	else
 		PrintAndLogEx(NORMAL, "                    - Max number of password attempts is %d", authlim);
-	
+
 	PrintAndLogEx(NORMAL, "                    - NFC counter %s", (nfc_cnf_en) ? "enabled":"disabled");
 	PrintAndLogEx(NORMAL, "                    - NFC counter %s", (nfc_cnf_prot_pwd) ? "not protected":"password protection enabled");
-	
+
 	PrintAndLogEx(NORMAL, "                    - user configuration %s", cfglck ? "permanently locked":"writeable");
 	PrintAndLogEx(NORMAL, "                    - %s access is protected with password", prot ? "read and write":"write");
 	PrintAndLogEx(NORMAL, "                    - %02X, Virtual Card Type Identifier is %s default", vctid, (vctid==0x05)? "":"not");
@@ -701,8 +701,8 @@ static int ulev1_print_counters(){
 }
 
 static int ulev1_print_signature( uint8_t *data, uint8_t len){
-	PrintAndLogEx(NORMAL, "\n--- Tag Signature");	
-	PrintAndLogEx(NORMAL, "IC signature public key name  : NXP NTAG21x (2013)"); 
+	PrintAndLogEx(NORMAL, "\n--- Tag Signature");
+	PrintAndLogEx(NORMAL, "IC signature public key name  : NXP NTAG21x (2013)");
 	PrintAndLogEx(NORMAL, "IC signature public key value : %s", sprint_hex(public_ecda_key, PUBLIC_ECDA_KEYLEN) );
 	PrintAndLogEx(NORMAL, "    Elliptic curve parameters : secp128r1");
 	PrintAndLogEx(NORMAL, "            Tag ECC Signature : %s", sprint_hex(data, len));
@@ -747,22 +747,22 @@ static int ulc_magic_test(){
 		returnValue =  ( !memcmp(nonce1, nonce2, 11) ) ? UL_C_MAGIC : UL_C;
 	} else {
 		returnValue = UL;
-	}	
+	}
 	DropField();
 	return returnValue;
 }
 */
 static int ul_magic_test(){
 	// Magic Ultralight tests
-	// 1) take present UID, and try to write it back. OBSOLETE 
+	// 1) take present UID, and try to write it back. OBSOLETE
 	// 2) make a wrong length write to page0, and see if tag answers with ACK/NACK:
 
 	iso14a_card_select_t card;
-	if ( !ul_select(&card) ) 
+	if ( !ul_select(&card) )
 		return UL_ERROR;
 	int status = ul_comp_write(0, NULL, 0);
 	DropField();
-	if ( status == 0 ) 
+	if ( status == 0 )
 		return MAGIC;
 	return 0;
 }
@@ -777,7 +777,7 @@ uint32_t GetHF14AMfU_Type(void){
 
 	if (!ul_select(&card)) return UL_ERROR;
 
-	// Ultralight - ATQA / SAK 
+	// Ultralight - ATQA / SAK
 	if ( card.atqa[1] != 0x00 || card.atqa[0] != 0x44 || card.sak != 0x00 ) {
 		//PrintAndLogEx(NORMAL, "Tag is not Ultralight | NTAG | MY-D  [ATQA: %02X %02X SAK: %02X]\n", card.atqa[1], card.atqa[0], card.sak);
 		DropField();
@@ -828,7 +828,7 @@ uint32_t GetHF14AMfU_Type(void){
 			DropField();
 			if (status > 1) {
 				tagtype = UL_C;
-			} else { 
+			} else {
 				// need to re-select after authentication error
 				if ( !ul_select(&card) ) return UL_ERROR;
 
@@ -850,12 +850,12 @@ uint32_t GetHF14AMfU_Type(void){
 			}
 		}
 		if (tagtype & UL) {
-			tagtype = ul_fudan_check(); 
+			tagtype = ul_fudan_check();
 			DropField();
 		}
 	} else {
 		DropField();
-		// Infinition MY-D tests   Exam high nibble 
+		// Infinition MY-D tests   Exam high nibble
 		uint8_t nib = (card.uid[1] & 0xf0) >> 4;
 		switch ( nib ){
 			// case 0: tagtype =  SLE66R35E7; break; //or SLE 66R35E7 - mifare compat... should have different sak/atqa for mf 1k
@@ -929,7 +929,7 @@ int CmdHF14AMfUInfo(const char *Cmd){
 	PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
 	ul_print_type(tagtype, 6);
 
-	// Swap endianness 
+	// Swap endianness
 	if (swapEndian && hasAuthKey) authkeyptr = SwapEndian64(authenticationkey, dataLen, (dataLen == 16) ? 8 : 4 );
 
 	if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
@@ -957,10 +957,10 @@ int CmdHF14AMfUInfo(const char *Cmd){
 			PrintAndLogEx(WARNING, "Error: tag didn't answer to READ UL-C");
 			DropField();
 			return status;
-		} 
-		if (status == 16) 
+		}
+		if (status == 16)
 			ulc_print_configuration(ulc_conf);
-		else 
+		else
 			locked = true;
 
 		if ((tagtype & MAGIC)) {
@@ -976,7 +976,7 @@ int CmdHF14AMfUInfo(const char *Cmd){
 
 		} else {
 			DropField();
-			// if we called info with key, just return 
+			// if we called info with key, just return
 			if ( hasAuthKey ) return 1;
 
 			// also try to diversify default keys..  look into CmdHF14AMfuGenDiverseKeys
@@ -989,13 +989,13 @@ int CmdHF14AMfUInfo(const char *Cmd){
 					memcpy(keySwap, SwapEndian64(key,16,8), 16);
 					ulc_print_3deskey(keySwap);
 					return 1;
-				} 
+				}
 			}
 			return 1;
 		}
 	}
 
-	// do counters and signature first (don't neet auth) 
+	// do counters and signature first (don't neet auth)
 
 	// ul counters are different than ntag counters
 	if ((tagtype & (UL_EV1_48 | UL_EV1_128 | UL_EV1))) {
@@ -1006,7 +1006,7 @@ int CmdHF14AMfUInfo(const char *Cmd){
 	}
 
 	// NTAG counters?
-	
+
 	// Read signature
 	if ((tagtype & (UL_EV1_48 | UL_EV1_128 | UL_EV1 | UL_NANO_40 | NTAG_213 | NTAG_213_F | NTAG_215 | NTAG_216 | NTAG_216_F | NTAG_I2C_1K | NTAG_I2C_2K | NTAG_I2C_1K_PLUS | NTAG_I2C_2K_PLUS))) {
 		uint8_t ulev1_signature[32] = {0x00};
@@ -1040,7 +1040,7 @@ int CmdHF14AMfUInfo(const char *Cmd){
 
 		uint8_t startconfigblock = 0;
 		uint8_t ulev1_conf[16] = {0x00};
-		
+
 		// config blocks always are last 4 pages
 		for (uint8_t i = 0; i < MAX_UL_TYPES; i++) {
 			if (tagtype & UL_TYPES_ARRAY[i]) {
@@ -1048,7 +1048,7 @@ int CmdHF14AMfUInfo(const char *Cmd){
 				break;
 			}
 		}
-		
+
 		if (startconfigblock){ // if we know where the config block is...
 			status = ul_read(startconfigblock, ulev1_conf, sizeof(ulev1_conf));
 			if ( status == -1 ) {
@@ -1074,7 +1074,7 @@ int CmdHF14AMfUInfo(const char *Cmd){
 		if ( !authlim && !hasAuthKey ) {
 			PrintAndLogEx(NORMAL, "\n--- Known EV1/NTAG passwords.");
 			len = 0;
-			
+
 			// test pwd gen A
 			num_to_bytes( ul_ev1_pwdgenA(card.uid), 4, key);
 			len = ulev1_requestAuthentication(key, pack, sizeof(pack));
@@ -1084,7 +1084,7 @@ int CmdHF14AMfUInfo(const char *Cmd){
 			}
 
 			if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
-			
+
 			// test pwd gen B
 			num_to_bytes( ul_ev1_pwdgenB(card.uid), 4, key);
 			len = ulev1_requestAuthentication(key, pack, sizeof(pack));
@@ -1102,9 +1102,9 @@ int CmdHF14AMfUInfo(const char *Cmd){
 				PrintAndLogEx(SUCCESS, "Found a default password: %s || Pack: %02X %02X",sprint_hex(key, 4), pack[0], pack[1]);
 				goto out;
 			}
-			
+
 			if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
-						
+
 			// test pwd gen D
 			num_to_bytes( ul_ev1_pwdgenD(card.uid), 4, key);
 			len = ulev1_requestAuthentication(key, pack, sizeof(pack));
@@ -1112,9 +1112,9 @@ int CmdHF14AMfUInfo(const char *Cmd){
 				PrintAndLogEx(SUCCESS, "Found a default password: %s || Pack: %02X %02X",sprint_hex(key, 4), pack[0], pack[1]);
 				goto out;
 			}
-			
-			if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;			
-			
+
+			if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
+
 			for (uint8_t i = 0; i < KEYS_PWD_COUNT; ++i ) {
 				key = default_pwd_pack[i];
 				len = ulev1_requestAuthentication(key, pack, sizeof(pack));
@@ -1140,7 +1140,7 @@ out:
 //
 int CmdHF14AMfUWrBl(const char *Cmd){
 
-	int blockNo = -1;	
+	int blockNo = -1;
 	bool errors = false;
 	bool hasAuthKey = false;
 	bool hasPwdKey = false;
@@ -1166,7 +1166,7 @@ int CmdHF14AMfUWrBl(const char *Cmd){
 					hasPwdKey = true;
 					break;
 				}
-				// UL-C size key	
+				// UL-C size key
 				keylen = param_gethex(Cmd, cmdp+1, data, 32);
 				if (!keylen){
 					memcpy(authenticationkey, data, 16);
@@ -1175,19 +1175,19 @@ int CmdHF14AMfUWrBl(const char *Cmd){
 					break;
 				}
 				PrintAndLogEx(WARNING, "ERROR: Key is incorrect length\n");
-				errors = true; 
+				errors = true;
 				break;
 			case 'b':
 				blockNo = param_get8(Cmd, cmdp+1);
 				if (blockNo < 0) {
 					PrintAndLogEx(WARNING, "Wrong block number");
-					errors = true;									
+					errors = true;
 				}
 				cmdp += 2;
 				break;
 			case 'l':
 				swapEndian = true;
-				cmdp++;	
+				cmdp++;
 				break;
 			case 'd':
 				if ( param_gethex(Cmd, cmdp+1, blockdata, 8) ) {
@@ -1205,7 +1205,7 @@ int CmdHF14AMfUWrBl(const char *Cmd){
 	}
 	//Validations
 	if (errors || cmdp == 0) return usage_hf_mfu_wrbl();
-		
+
 	if ( blockNo == -1 ) return usage_hf_mfu_wrbl();
 	// starting with getting tagtype
 	TagTypeUL_t tagtype = GetHF14AMfU_Type();
@@ -1223,15 +1223,15 @@ int CmdHF14AMfUWrBl(const char *Cmd){
 		return usage_hf_mfu_wrbl();
 	}
 
-	// Swap endianness 
+	// Swap endianness
 	if (swapEndian && hasAuthKey) authKeyPtr = SwapEndian64(authenticationkey, 16, 8);
 	if (swapEndian && hasPwdKey)  authKeyPtr = SwapEndian64(authenticationkey, 4, 4);
 
-	if ( blockNo <= 3) 		
+	if ( blockNo <= 3)
 		PrintAndLogEx(NORMAL, "Special Block: %0d (0x%02X) [ %s]", blockNo, blockNo, sprint_hex(blockdata, 4));
 	else
 		PrintAndLogEx(NORMAL, "Block: %0d (0x%02X) [ %s]", blockNo, blockNo, sprint_hex(blockdata, 4));
-	
+
 	//Send write Block
 	UsbCommand c = {CMD_MIFAREU_WRITEBL, {blockNo}};
 	memcpy(c.d.asBytes, blockdata, 4);
@@ -1244,7 +1244,7 @@ int CmdHF14AMfUWrBl(const char *Cmd){
 		c.arg[1] = 2;
 		memcpy(c.d.asBytes+4, authKeyPtr, 4);
 	}
-	
+
 	clearCommandBuffer();
 	SendCommand(&c);
 	UsbCommand resp;
@@ -1254,7 +1254,7 @@ int CmdHF14AMfUWrBl(const char *Cmd){
 	} else {
 		PrintAndLogEx(WARNING, "Command execute timeout");
 	}
-	
+
 	return 0;
 }
 //
@@ -1262,7 +1262,7 @@ int CmdHF14AMfUWrBl(const char *Cmd){
 //
 int CmdHF14AMfURdBl(const char *Cmd){
 
-	int blockNo = -1;	
+	int blockNo = -1;
 	bool errors = false;
 	bool hasAuthKey = false;
 	bool hasPwdKey = false;
@@ -1286,7 +1286,7 @@ int CmdHF14AMfURdBl(const char *Cmd){
 					hasPwdKey = true;
 					break;
 				}
-				// UL-C size key	
+				// UL-C size key
 				keylen = param_gethex(Cmd, cmdp+1, data, 32);
 				if (!keylen){
 					memcpy(authenticationkey, data, 16);
@@ -1295,20 +1295,20 @@ int CmdHF14AMfURdBl(const char *Cmd){
 					break;
 				}
 				PrintAndLogEx(WARNING, "ERROR: Key is incorrect length\n");
-				errors = true; 
+				errors = true;
 				break;
 			case 'b':
 				blockNo = param_get8(Cmd, cmdp+1);
 				if (blockNo < 0) {
 					PrintAndLogEx(WARNING, "Wrong block number");
-					errors = true;									
+					errors = true;
 				}
 				cmdp += 2;
 				break;
 			case 'l':
 				swapEndian = true;
-				cmdp++;	
-				break;				
+				cmdp++;
+				break;
 			default:
 				PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
 				errors = true;
@@ -1317,7 +1317,7 @@ int CmdHF14AMfURdBl(const char *Cmd){
 	}
 	//Validations
 	if (errors || cmdp == 0) return usage_hf_mfu_rdbl();
-	
+
 	if ( blockNo == -1 ) return usage_hf_mfu_rdbl();
 	// start with getting tagtype
 	TagTypeUL_t tagtype = GetHF14AMfU_Type();
@@ -1335,10 +1335,10 @@ int CmdHF14AMfURdBl(const char *Cmd){
 		return usage_hf_mfu_rdbl();
 	}
 
-	// Swap endianness 
+	// Swap endianness
 	if (swapEndian && hasAuthKey) authKeyPtr = SwapEndian64(authenticationkey, 16, 8);
 	if (swapEndian && hasPwdKey)  authKeyPtr = SwapEndian64(authenticationkey, 4, 4);
-	
+
 	//Read Block
 	UsbCommand c = {CMD_MIFAREU_READBL, {blockNo}};
 	if ( hasAuthKey ){
@@ -1349,7 +1349,7 @@ int CmdHF14AMfURdBl(const char *Cmd){
 		c.arg[1] = 2;
 		memcpy(c.d.asBytes,authKeyPtr,4);
 	}
-	
+
 	clearCommandBuffer();
 	SendCommand(&c);
 	UsbCommand resp;
@@ -1393,14 +1393,14 @@ int usage_hf_mfu_dump(void) {
 	PrintAndLogEx(NORMAL, "Reads all pages from Ultralight, Ultralight-C, Ultralight EV1");
 	PrintAndLogEx(NORMAL, "NTAG 203, NTAG 210, NTAG 212, NTAG 213, NTAG 215, NTAG 216");
 	PrintAndLogEx(NORMAL, "and saves binary dump into the file `filename.bin` or `cardUID.bin`");
-	PrintAndLogEx(NORMAL, "It autodetects card type.\n");	
+	PrintAndLogEx(NORMAL, "It autodetects card type.\n");
 	PrintAndLogEx(NORMAL, "Usage:  hf mfu dump k <key> l f <filename w/o .bin> p <page#> q <#pages>");
 	PrintAndLogEx(NORMAL, "  Options :");
 	PrintAndLogEx(NORMAL, "  k <key> : (optional) key for authentication [UL-C 16bytes, EV1/NTAG 4bytes]");
 	PrintAndLogEx(NORMAL, "  l       : (optional) swap entered key's endianness");
-	PrintAndLogEx(NORMAL, "  f <FN > : filename w/o .bin to save the dump as");	
-	PrintAndLogEx(NORMAL, "  p <Pg > : starting Page number to manually set a page to start the dump at");	
-	PrintAndLogEx(NORMAL, "  q <qty> : number of Pages to manually set how many pages to dump");	
+	PrintAndLogEx(NORMAL, "  f <FN > : filename w/o .bin to save the dump as");
+	PrintAndLogEx(NORMAL, "  p <Pg > : starting Page number to manually set a page to start the dump at");
+	PrintAndLogEx(NORMAL, "  q <qty> : number of Pages to manually set how many pages to dump");
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Examples:");
 	PrintAndLogEx(NORMAL, "       hf mfu dump");
@@ -1419,7 +1419,7 @@ int usage_hf_mfu_restore(void){
 	PrintAndLogEx(NORMAL, "  s       : (optional) enable special write UID -MAGIC TAG ONLY-");
 	PrintAndLogEx(NORMAL, "  e       : (optional) enable special write version/signature -MAGIC NTAG 21* ONLY-");
 	PrintAndLogEx(NORMAL, "  r       : (optional) use the password found in dumpfile to configure tag. requires 'e' parameter to work");
-	PrintAndLogEx(NORMAL, "  f <FN>  : filename w/o .bin to restore");	
+	PrintAndLogEx(NORMAL, "  f <FN>  : filename w/o .bin to restore");
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Examples:");
 	PrintAndLogEx(NORMAL, "       hf mfu restore s f myfile");
@@ -1429,12 +1429,12 @@ int usage_hf_mfu_restore(void){
 }
 
 int usage_hf_mfu_rdbl(void) {
-	PrintAndLogEx(NORMAL, "Read a block and print. It autodetects card type.\n");	
+	PrintAndLogEx(NORMAL, "Read a block and print. It autodetects card type.\n");
 	PrintAndLogEx(NORMAL, "Usage:  hf mfu rdbl b <block number> k <key> l\n");
 	PrintAndLogEx(NORMAL, "Options:");
 	PrintAndLogEx(NORMAL, "  b <no>  : block to read");
 	PrintAndLogEx(NORMAL, "  k <key> : (optional) key for authentication [UL-C 16bytes, EV1/NTAG 4bytes]");
-	PrintAndLogEx(NORMAL, "  l       : (optional) swap entered key's endianness");	
+	PrintAndLogEx(NORMAL, "  l       : (optional) swap entered key's endianness");
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Examples:");
 	PrintAndLogEx(NORMAL, "       hf mfu rdbl b 0");
@@ -1444,13 +1444,13 @@ int usage_hf_mfu_rdbl(void) {
 }
 
 int usage_hf_mfu_wrbl(void) {
-	PrintAndLogEx(NORMAL, "Write a block. It autodetects card type.\n");		
+	PrintAndLogEx(NORMAL, "Write a block. It autodetects card type.\n");
 	PrintAndLogEx(NORMAL, "Usage:  hf mfu wrbl b <block number> d <data> k <key> l\n");
-	PrintAndLogEx(NORMAL, "Options:");	
+	PrintAndLogEx(NORMAL, "Options:");
 	PrintAndLogEx(NORMAL, "  b <no>   : block to write");
 	PrintAndLogEx(NORMAL, "  d <data> : block data - (8 hex symbols)");
 	PrintAndLogEx(NORMAL, "  k <key>  : (optional) key for authentication [UL-C 16bytes, EV1/NTAG 4bytes]");
-	PrintAndLogEx(NORMAL, "  l        : (optional) swap entered key's endianness");	
+	PrintAndLogEx(NORMAL, "  l        : (optional) swap entered key's endianness");
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Examples:");
 	PrintAndLogEx(NORMAL, "        hf mfu wrbl b 0 d 01234567");
@@ -1463,9 +1463,9 @@ int usage_hf_mfu_eload(void) {
 	PrintAndLogEx(NORMAL, "Hint: See script dumptoemul-mfu.lua to convert the .bin to the eml");
 	PrintAndLogEx(NORMAL, "Usage:  hf mfu eload u <file name w/o `.eml`> [numblocks]");
 	PrintAndLogEx(NORMAL, "  Options:");
-	PrintAndLogEx(NORMAL, "    h          : this help");	
+	PrintAndLogEx(NORMAL, "    h          : this help");
 	PrintAndLogEx(NORMAL, "    u          : UL (required)");
-	PrintAndLogEx(NORMAL, "    [filename] : without `.eml` (required)");	
+	PrintAndLogEx(NORMAL, "    [filename] : without `.eml` (required)");
 	PrintAndLogEx(NORMAL, "    numblocks  : number of blocks to load from eml file (optional)");
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "  sample: hf mfu eload u filename");
@@ -1485,7 +1485,7 @@ int usage_hf_mfu_sim(void) {
 	PrintAndLogEx(NORMAL, "Examples:");
 	PrintAndLogEx(NORMAL, "        hf mfu sim t 7");
 	PrintAndLogEx(NORMAL, "        hf mfu sim t 7 u 1122344556677\n");
-	
+
 	return 0;
 }
 
@@ -1497,7 +1497,7 @@ int usage_hf_mfu_ucauth(void) {
 	PrintAndLogEx(NORMAL, "      3 : nfc key");
 	PrintAndLogEx(NORMAL, "      4 : all 0x01 key");
 	PrintAndLogEx(NORMAL, "      5 : all 0xff key");
-	PrintAndLogEx(NORMAL, "      6 : 0x00-0xFF key");		
+	PrintAndLogEx(NORMAL, "      6 : 0x00-0xFF key");
 	PrintAndLogEx(NORMAL, "Examples:");
 	PrintAndLogEx(NORMAL, "       hf mfu cauth k");
 	PrintAndLogEx(NORMAL, "       hf mfu cauth k 3");
@@ -1575,18 +1575,18 @@ void printMFUdumpEx(mfu_dump_t* card, uint16_t pages, uint8_t startpage) {
 	uint8_t j = 0;
 	bool lckbit = false;
 	uint8_t *data = card->data;
-	
+
 	uint8_t lockbytes_sta[] = {0,0};
 	uint8_t lockbytes_dyn[] = {0,0,0};
 	bool bit_stat[16]  = {0};
 	bool bit_dyn[16] = {0};
-	
-	// Load static lock bytes.	
+
+	// Load static lock bytes.
 	memcpy(lockbytes_sta, data+10, sizeof(lockbytes_sta));
 	for(j = 0; j < 16; j++){
 		bit_stat[j] = lockbytes_sta[j/8] & ( 1 <<(7-j%8));
 	}
-	
+
 	// Load dynamic lockbytes if available
 	// TODO -- FIGURE OUT LOCK BYTES FOR TO EV1 and/or NTAG
 	if ( pages == 44 ) {
@@ -1598,7 +1598,7 @@ void printMFUdumpEx(mfu_dump_t* card, uint16_t pages, uint8_t startpage) {
 		}
 		PrintAndLogEx(NORMAL, "DYNAMIC LOCK: %s\n", sprint_hex(lockbytes_dyn,3));
 	}
-	
+
 	for (uint8_t i = 0; i < pages; ++i) {
 		if ( i < 3 ) {
 			PrintAndLogEx(NORMAL, "%3d/0x%02X | %s|   | %s", i+startpage, i+startpage, sprint_hex(data + i * 4, 4), sprint_ascii(data + i * 4,4) );
@@ -1625,7 +1625,7 @@ void printMFUdumpEx(mfu_dump_t* card, uint16_t pages, uint8_t startpage) {
 			case 20:
 			case 21:
 			case 22:
-			case 23: lckbit = bit_dyn[5]; break; 
+			case 23: lckbit = bit_dyn[5]; break;
 			case 24:
 			case 25:
 			case 26:
@@ -1637,11 +1637,11 @@ void printMFUdumpEx(mfu_dump_t* card, uint16_t pages, uint8_t startpage) {
 			case 32:
 			case 33:
 			case 34:
-			case 35: lckbit = bit_dyn[1]; break; 
+			case 35: lckbit = bit_dyn[1]; break;
 			case 36:
 			case 37:
 			case 38:
-			case 39: lckbit = bit_dyn[0]; break; 
+			case 39: lckbit = bit_dyn[0]; break;
 			case 40: lckbit = bit_dyn[12]; break;
 			case 41: lckbit = bit_dyn[11]; break;
 			case 42: lckbit = bit_dyn[10]; break; //auth0
@@ -1664,7 +1664,7 @@ int CmdHF14AMfUDump(const char *Cmd){
 
 	uint8_t data[1024] = {0x00};
 	memset(data, 0x00, sizeof(data));
-	
+
 	bool hasAuthKey = false;
 	int i = 0;
 	int pages = 16;
@@ -1726,12 +1726,12 @@ int CmdHF14AMfUDump(const char *Cmd){
 	if (errors) return usage_hf_mfu_dump();
 
 	//if we entered a key in little endian and set the swapEndian switch - switch it...
-	if (swapEndian && hasAuthKey) 
+	if (swapEndian && hasAuthKey)
 		authKeyPtr = SwapEndian64(authenticationkey, dataLen, (dataLen == 16) ? 8 : 4);
 
 	TagTypeUL_t tagtype = GetHF14AMfU_Type();
 	if (tagtype == UL_ERROR) return -1;
-	
+
 	//get number of pages to read
 	if (!manualPages) {
 		for (uint8_t idx = 0; idx < MAX_UL_TYPES; idx++) {
@@ -1772,16 +1772,16 @@ int CmdHF14AMfUDump(const char *Cmd){
 		PrintAndLogEx(FAILED, "Data exceeded Buffer size!");
 		bufferSize = sizeof(data);
 	}
-	
+
 	if ( !GetFromDevice(BIG_BUF, data, bufferSize, startindex, NULL, 2500, false) ) {
 		PrintAndLogEx(WARNING, "command execution time out");
 		return 1;
 	}
 
 	bool is_partial = (pages != bufferSize/4);
-		
+
 	pages = bufferSize/4;
-	
+
 	iso14a_card_select_t card;
 	mfu_dump_t dump_file_data;
 	uint8_t	get_pack[] = {0,0};
@@ -1793,7 +1793,7 @@ int CmdHF14AMfUDump(const char *Cmd){
 	memset( get_signature, 0, sizeof(get_signature) );
 
 	// not ul_c and not std ul then attempt to collect info like
-	//  VERSION, SIGNATURE, COUNTERS, TEARING, PACK, 
+	//  VERSION, SIGNATURE, COUNTERS, TEARING, PACK,
 	if (!(tagtype & UL_C || tagtype & UL)) {
 		//attempt to read pack
 		if (!ul_auth_select( &card, tagtype, true, authKeyPtr, get_pack, sizeof(get_pack))) {
@@ -1802,14 +1802,14 @@ int CmdHF14AMfUDump(const char *Cmd){
 			get_pack[1] = 0;
 		}
 		DropField();
-		
+
 		// only add pack if not partial read,  and complete pages read.
 		if ( !is_partial && pages == card_mem_size) {
-		
-			// add pack to block read		
+
+			// add pack to block read
 			memcpy(data + (pages*4) - 4, get_pack, sizeof(get_pack));
 		}
-		
+
 		if ( hasAuthKey )
 			ul_auth_select( &card, tagtype, hasAuthKey, authKeyPtr, dummy_pack, sizeof(dummy_pack));
 		else
@@ -1820,13 +1820,13 @@ int CmdHF14AMfUDump(const char *Cmd){
 			ulev1_readTearing(i, get_tearing+i, 1);
 			ulev1_readCounter(i, get_counter, sizeof(get_counter) );
 		}
-		
+
 		DropField();
 		if ( hasAuthKey )
 			ul_auth_select( &card, tagtype, hasAuthKey, authKeyPtr, dummy_pack, sizeof(dummy_pack));
 		else
 			ul_select(&card);
-		
+
 		ulev1_readSignature( get_signature, sizeof(get_signature));
 		DropField();
 	}
@@ -1844,7 +1844,7 @@ int CmdHF14AMfUDump(const char *Cmd){
 
 		if (tagtype & UL_C){ //add 4 pages
 			memcpy(data + pages*4, authKeyPtr, dataLen);
-			pages += dataLen/4;  
+			pages += dataLen/4;
 		} else { // 2nd page from end
 			memcpy(data + (pages*4) - 8, authenticationkey, dataLen);
 		}
@@ -1859,22 +1859,22 @@ int CmdHF14AMfUDump(const char *Cmd){
 	memcpy(dump_file_data.data, data, pages*4);
 
 	printMFUdumpEx(&dump_file_data, pages, startPage);
-	
+
 	// user supplied filename?
 	if (fileNameLen < 1) {
 
 		PrintAndLogEx(INFO, "Using UID as filename");
-	
-		fptr += sprintf(fptr, "hf-mfu-"); 
+
+		fptr += sprintf(fptr, "hf-mfu-");
 		FillFileNameByUID(fptr, card.uid, "-dump", card.uidlen);
-	}	
+	}
 	uint16_t datalen = pages*4 + DUMP_PREFIX_LENGTH;
 	saveFile(filename, "bin", (uint8_t*)&dump_file_data, datalen);
 	saveFileJSON(filename, "json", jsfMfuMemory, (uint8_t*)&dump_file_data, datalen);
-	
-	if ( is_partial ) 
+
+	if ( is_partial )
 		PrintAndLogEx(WARNING, "Partial dump created. (%d of %d blocks)", pages, card_mem_size);
-	
+
 	return 0;
 }
 
@@ -1896,7 +1896,7 @@ int CmdHF14AMfURestore(const char *Cmd){
 
 	char tempStr[50] = {0};
 	char filename[FILE_PATH_SIZE] = {0};
-	uint8_t authkey[16] = {0};	
+	uint8_t authkey[16] = {0};
 	uint8_t	*p_authkey = authkey;
 	uint8_t cmdp = 0, keylen = 0;
 	bool hasKey = false;
@@ -1910,7 +1910,7 @@ int CmdHF14AMfURestore(const char *Cmd){
 	UsbCommand c = {CMD_MIFAREU_WRITEBL, {0,0,0}};
 
 	memset(authkey, 0x00, sizeof(authkey));
-	
+
 	while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
 		switch (tolower(param_getchar(Cmd, cmdp))) {
 		case 'h':
@@ -1936,7 +1936,7 @@ int CmdHF14AMfURestore(const char *Cmd){
 
 			if (filelen > FILE_PATH_SIZE-5)
 				filelen = FILE_PATH_SIZE-5;
-			
+
 			if (filelen < 1)
 				sprintf(filename, "dumpdata.bin");
 
@@ -1963,11 +1963,11 @@ int CmdHF14AMfURestore(const char *Cmd){
 
 	//Validations
 	if (errors || cmdp == 0) return usage_hf_mfu_restore();
-	
+
 	if ((f = fopen(filename,"rb")) == NULL) {
 		PrintAndLogEx(WARNING, "Could not find file " _YELLOW_(%s), filename);
 		return 1;
-	}	
+	}
 
 	// get filesize to know how memory to allocate
 	fseek(f, 0, SEEK_END);
@@ -1994,16 +1994,16 @@ int CmdHF14AMfURestore(const char *Cmd){
 		free(dump);
 		return 1;
 	}
-	
+
 	PrintAndLogEx(INFO, "Restoring " _YELLOW_(%s)" to card", filename);
-	
+
 	mfu_dump_t *mem = (mfu_dump_t*)dump;
 	uint8_t pages = (bytes_read-48)/4;
-	
+
 	// print dump
 	printMFUdumpEx(mem, pages, 0);
-	
-	// Swap endianness 
+
+	// Swap endianness
 	if (swapEndian && hasKey) {
 		if ( keylen == 16 )
 			p_authkey = SwapEndian64(authkey, keylen, 8);
@@ -2016,11 +2016,11 @@ int CmdHF14AMfURestore(const char *Cmd){
 		c.arg[1] = (keylen == 16) ? 1 : 2;
 		memcpy(c.d.asBytes+4, p_authkey, keylen);
 	}
-	
+
 	// write version, signature, pack
 	// only magic NTAG cards
 	if ( write_extra ) {
-		
+
 		#define MFU_NTAG_SPECIAL_PWD		0xF0
 		#define MFU_NTAG_SPECIAL_PACK		0xF1
 		#define MFU_NTAG_SPECIAL_VERSION	0xFA
@@ -2040,13 +2040,13 @@ int CmdHF14AMfURestore(const char *Cmd){
 			clearCommandBuffer();
 			SendCommand(&c);
 			wait4response(MFU_NTAG_SPECIAL_PWD);
-			
+
 			// copy the new key
 			c.arg[1] = 2;
 			memcpy(authkey, c.d.asBytes, 4);
 			memcpy(c.d.asBytes+4, authkey, 4);
 		}
-		
+
 		// pack
 		c.arg[0] = MFU_NTAG_SPECIAL_PACK;
 		c.d.asBytes[0] = mem->pack[0];
@@ -2057,7 +2057,7 @@ int CmdHF14AMfURestore(const char *Cmd){
 		clearCommandBuffer();
 		SendCommand(&c);
 		wait4response(MFU_NTAG_SPECIAL_PACK);
-		
+
 		// Signature
 		for (uint8_t s = MFU_NTAG_SPECIAL_SIGNATURE, i=0; s < MFU_NTAG_SPECIAL_SIGNATURE+8; s++, i += 4){
 			c.arg[0] = s;
@@ -2065,26 +2065,26 @@ int CmdHF14AMfURestore(const char *Cmd){
 			PrintAndLogEx(NORMAL, "special SIG     block written 0x%X - %s\n", s, sprint_hex(c.d.asBytes, 4) );
 			clearCommandBuffer();
 			SendCommand(&c);
-			wait4response(s);		
+			wait4response(s);
 		}
-		
+
 		// Version
-		for (uint8_t s = MFU_NTAG_SPECIAL_VERSION, i=0; s < MFU_NTAG_SPECIAL_VERSION+2; s++, i += 4){		
+		for (uint8_t s = MFU_NTAG_SPECIAL_VERSION, i=0; s < MFU_NTAG_SPECIAL_VERSION+2; s++, i += 4){
 			c.arg[0] = s;
-			memcpy(c.d.asBytes, mem->version+i, 4 );			
+			memcpy(c.d.asBytes, mem->version+i, 4 );
 			PrintAndLogEx(NORMAL, "special VERSION block written 0x%X - %s\n", s, sprint_hex(c.d.asBytes, 4) );
 			clearCommandBuffer();
 			SendCommand(&c);
 			wait4response(s);
 		}
 	}
-	
+
 	PrintAndLogEx(INFO, "Restoring data blocks.");
-	// write all other data 
+	// write all other data
 	// Skip block 0,1,2,3 (only magic tags can write to them)
 	// Skip last 5 blocks usually is configuration
 	for (uint8_t b = 4; b < pages-5; b++) {
-		
+
 		//Send write Block
 		c.arg[0] = b;
 		memcpy(c.d.asBytes, mem->data + (b*4), 4);
@@ -2094,14 +2094,14 @@ int CmdHF14AMfURestore(const char *Cmd){
 		printf("."); fflush(stdout);
 	}
 	PrintAndLogEx(NORMAL, "\n");
-	
+
 	// write special data last
 	if (write_special) {
-		
+
 		PrintAndLogEx(INFO, "Restoring configuration blocks.\n");
-		
+
 		PrintAndLogEx(NORMAL, "authentication with keytype[%x]  %s\n", (uint8_t)(c.arg[1] & 0xff), sprint_hex(p_authkey,4));
-		
+
 		// otp, uid, lock, cfg1, cfg0, dynlockbits
 		uint8_t blocks[] = {3, 0, 1, 2, pages-5, pages-4, pages-3};
 		for ( uint8_t i = 0; i < sizeof(blocks); i++){
@@ -2114,10 +2114,10 @@ int CmdHF14AMfURestore(const char *Cmd){
 			PrintAndLogEx(NORMAL, "special block written %u - %s\n", b, sprint_hex(c.d.asBytes, 4) );
 		}
 	}
-	
+
 	DropField();
 	free(dump);
-	return 0;	
+	return 0;
 }
 //
 //  Load emulator with dump file
@@ -2153,33 +2153,33 @@ int CmdHF14AMfucAuth(const char *Cmd){
 	//Change key to user defined one
 	if (cmdp == 'k'){
 		keyNo = param_get8(Cmd, 1);
-		if(keyNo >= KEYS_3DES_COUNT) 
+		if(keyNo >= KEYS_3DES_COUNT)
 			errors = true;
 	}
 
 	if (cmdp == 'h') errors = true;
-	
-	if (errors) return usage_hf_mfu_ucauth(); 
+
+	if (errors) return usage_hf_mfu_ucauth();
 
 	uint8_t *key = default_3des_keys[keyNo];
 	if (ulc_authentication(key, true))
 		PrintAndLogEx(SUCCESS, "Authentication successful. 3des key: %s",sprint_hex(key, 16));
 	else
 		PrintAndLogEx(WARNING, "Authentication failed");
-		
+
 	return 0;
 }
 
 /**
-A test function to validate that the polarssl-function works the same 
-was as the openssl-implementation. 
-Commented out, since it requires openssl 
+A test function to validate that the polarssl-function works the same
+was as the openssl-implementation.
+Commented out, since it requires openssl
 
 int CmdTestDES(const char * cmd)
 {
-	uint8_t key[16] = {0x00};	
-	
-	memcpy(key,key3_3des_data,16);  
+	uint8_t key[16] = {0x00};
+
+	memcpy(key,key3_3des_data,16);
 	DES_cblock RndA, RndB;
 
 	PrintAndLogEx(NORMAL, "----------OpenSSL DES implementation----------");
@@ -2191,7 +2191,7 @@ int CmdTestDES(const char * cmd)
 		DES_key_schedule ks1,ks2;
 		DES_cblock key1,key2;
 
-		memcpy(key,key3_3des_data,16);  
+		memcpy(key,key3_3des_data,16);
 		memcpy(key1,key,8);
 		memcpy(key2,key+8,8);
 
@@ -2248,7 +2248,7 @@ int CmdTestDES(const char * cmd)
 		rol(random_b,8);
 		memcpy(random_a_and_b  ,random_a,8);
 		memcpy(random_a_and_b+8,random_b,8);
-		
+
 		PrintAndLogEx(NORMAL, "     RA+B:%s",sprint_hex(random_a_and_b, 16));
 
 		des3_set2key_enc(&ctx, key);
@@ -2263,26 +2263,26 @@ int CmdTestDES(const char * cmd)
 
 		PrintAndLogEx(NORMAL, "enc(RA+B):%s",sprint_hex(random_a_and_b, 16));
 	}
-	return 0;	
+	return 0;
 }
 **/
 
-// 
+//
 // Mifare Ultralight C - Set password
 //
 int CmdHF14AMfucSetPwd(const char *Cmd){
 
-	uint8_t pwd[16] = {0x00};	
+	uint8_t pwd[16] = {0x00};
 	char cmdp = tolower(param_getchar(Cmd, 0));
 
 	if (strlen(Cmd) == 0  || cmdp == 'h') return usage_hf_mfu_ucsetpwd();
-	
+
 	if (param_gethex(Cmd, 0, pwd, 32)) {
 		PrintAndLogEx(WARNING, "Password must include 32 HEX symbols");
 		return 1;
 	}
-	
-	UsbCommand c = {CMD_MIFAREUC_SETPWD};	
+
+	UsbCommand c = {CMD_MIFAREUC_SETPWD};
 	memcpy( c.d.asBytes, pwd, 16);
 	clearCommandBuffer();
 	SendCommand(&c);
@@ -2298,7 +2298,7 @@ int CmdHF14AMfucSetPwd(const char *Cmd){
 	} else {
 		PrintAndLogEx(WARNING, "command execution time out");
 		return 1;
-	}	
+	}
 	return 0;
 }
 
@@ -2311,7 +2311,7 @@ int CmdHF14AMfucSetUid(const char *Cmd){
 	UsbCommand resp;
 	uint8_t uid[7] = {0x00};
 	char cmdp = tolower(param_getchar(Cmd, 0));
-	
+
 	if (strlen(Cmd) == 0  || cmdp == 'h') return usage_hf_mfu_ucsetuid();
 
 	if (param_gethex(Cmd, 0, uid, 14)) {
@@ -2319,7 +2319,7 @@ int CmdHF14AMfucSetUid(const char *Cmd){
 		return 1;
 	}
 
-	// read block2. 
+	// read block2.
 	c.arg[0] = 2;
 	clearCommandBuffer();
 	SendCommand(&c);
@@ -2331,7 +2331,7 @@ int CmdHF14AMfucSetUid(const char *Cmd){
 	// save old block2.
 	uint8_t oldblock2[4] = {0x00};
 	memcpy(resp.d.asBytes, oldblock2, 4);
-	
+
 	// block 0.
 	c.cmd = CMD_MIFAREU_WRITEBL;
 	c.arg[0] = 0;
@@ -2370,13 +2370,13 @@ int CmdHF14AMfucSetUid(const char *Cmd){
 	if (!WaitForResponseTimeout(CMD_ACK,&resp,1500) ) {
 		PrintAndLogEx(WARNING, "Command execute timeout");
 		return 5;
-	}	
+	}
 	return 0;
 }
 
 int CmdHF14AMfuGenDiverseKeys(const char *Cmd){
 
-	uint8_t uid[4];	
+	uint8_t uid[4];
 	char cmdp = tolower(param_getchar(Cmd, 0));
 	if (strlen(Cmd) == 0  || cmdp == 'h') return usage_hf_mfu_gendiverse();
 
@@ -2389,13 +2389,13 @@ int CmdHF14AMfuGenDiverseKeys(const char *Cmd){
 		WaitForResponse(CMD_ACK, &resp);
 		iso14a_card_select_t card;
 		memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
-		
-		uint64_t select_status = resp.arg[0];	
+
+		uint64_t select_status = resp.arg[0];
 		// 0: couldn't read,
 		// 1: OK, with ATS
 		// 2: OK, no ATS
 		// 3: proprietary Anticollision
-		
+
 		if ( select_status == 0 ) {
 			PrintAndLogEx(WARNING, "iso14443a card select failed");
 			return 1;
@@ -2404,33 +2404,33 @@ int CmdHF14AMfuGenDiverseKeys(const char *Cmd){
 			PrintAndLogEx(WARNING, "Wrong sized UID, expected 4bytes got %d", card.uidlen);
 			return 1;
 		}
-		memcpy(uid, card.uid, sizeof(uid));	
+		memcpy(uid, card.uid, sizeof(uid));
 	}
 	else {
 		if (param_gethex(Cmd, 0, uid, 8)) return usage_hf_mfu_gendiverse();
 	}
-	
-	
+
+
 	uint8_t iv[8] = { 0x00 };
 	uint8_t block = 0x01;
-	
+
 	uint8_t mifarekeyA[] = { 0xA0,0xA1,0xA2,0xA3,0xA4,0xA5 };
 	uint8_t mifarekeyB[] = { 0xB0,0xB1,0xB2,0xB3,0xB4,0xB5 };
 	uint8_t dkeyA[8] = { 0x00 };
 	uint8_t dkeyB[8] = { 0x00 };
-	
+
 	uint8_t masterkey[] = { 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x88,0x99,0xaa,0xbb,0xcc,0xdd,0xee,0xff };
-	
+
 	uint8_t mix[8] = { 0x00 };
 	uint8_t divkey[8] = { 0x00 };
-	
+
 	memcpy(mix, mifarekeyA, 4);
-	
+
 	mix[4] = mifarekeyA[4] ^ uid[0];
 	mix[5] = mifarekeyA[5] ^ uid[1];
 	mix[6] = block ^ uid[2];
 	mix[7] = uid[3];
-	
+
 	mbedtls_des3_context ctx;
 	mbedtls_des3_set2key_enc(&ctx, masterkey);
 
@@ -2449,17 +2449,17 @@ int CmdHF14AMfuGenDiverseKeys(const char *Cmd){
 	PrintAndLogEx(NORMAL, "Mifare key   :\t %s", sprint_hex(mifarekeyA, sizeof(mifarekeyA)));
 	PrintAndLogEx(NORMAL, "Message      :\t %s", sprint_hex(mix, sizeof(mix)));
 	PrintAndLogEx(NORMAL, "Diversified key: %s", sprint_hex(divkey+1, 6));
-	
+
 	for (int i=0; i < sizeof(mifarekeyA); ++i){
 		dkeyA[i]  = (mifarekeyA[i] << 1) & 0xff;
 		dkeyA[6] |= ((mifarekeyA[i] >> 7) & 1) << (i+1);
 	}
-	
+
 	for (int i=0; i < sizeof(mifarekeyB); ++i){
 		dkeyB[1]  |= ((mifarekeyB[i] >> 7) & 1) << (i+1);
 		dkeyB[2+i] = (mifarekeyB[i] << 1) & 0xff;
 	}
-	
+
 	uint8_t zeros[8] = {0x00};
 	uint8_t newpwd[8] = {0x00};
 	uint8_t dmkey[24] = {0x00};
@@ -2467,7 +2467,7 @@ int CmdHF14AMfuGenDiverseKeys(const char *Cmd){
 	memcpy(dmkey+8, dkeyB, 8);
 	memcpy(dmkey+16, dkeyA, 8);
 	memset(iv, 0x00, 8);
-	
+
 	mbedtls_des3_set3key_enc(&ctx, dmkey);
 
 	mbedtls_des3_crypt_cbc(&ctx  // des3_context
@@ -2477,25 +2477,25 @@ int CmdHF14AMfuGenDiverseKeys(const char *Cmd){
 		, zeros         // input
 		, newpwd         // output
 		);
-	
+
 	PrintAndLogEx(NORMAL, "\n-- DES version");
 	PrintAndLogEx(NORMAL, "Mifare dkeyA :\t %s", sprint_hex(dkeyA, sizeof(dkeyA)));
 	PrintAndLogEx(NORMAL, "Mifare dkeyB :\t %s", sprint_hex(dkeyB, sizeof(dkeyB)));
 	PrintAndLogEx(NORMAL, "Mifare ABA   :\t %s", sprint_hex(dmkey, sizeof(dmkey)));
 	PrintAndLogEx(NORMAL, "Mifare Pwd   :\t %s", sprint_hex(newpwd, sizeof(newpwd)));
-	
-	// next. from the diversify_key method.	
+
+	// next. from the diversify_key method.
 	return 0;
 }
 
 int CmdHF14AMfuPwdGen(const char *Cmd){
-	
-	uint8_t uid[7] = {0x00};	
+
+	uint8_t uid[7] = {0x00};
 	char cmdp = tolower(param_getchar(Cmd, 0));
 	if (strlen(Cmd) == 0  || cmdp == 'h') return usage_hf_mfu_pwdgen();
-	
+
 	if (cmdp == 't') return ul_ev1_pwdgen_selftest();
-	
+
 	if ( cmdp == 'r') {
 			// read uid from tag
 		UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0}};
@@ -2505,7 +2505,7 @@ int CmdHF14AMfuPwdGen(const char *Cmd){
 		WaitForResponse(CMD_ACK, &resp);
 		iso14a_card_select_t card;
 		memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
-		
+
 		uint64_t select_status = resp.arg[0];
 		// 0: couldn't read
 		// 1: OK with ATS
@@ -2519,12 +2519,12 @@ int CmdHF14AMfuPwdGen(const char *Cmd){
 			PrintAndLogEx(WARNING, "Wrong sized UID, expected 7bytes got %d", card.uidlen);
 			return 1;
 		}
-		memcpy(uid, card.uid, sizeof(uid));	
+		memcpy(uid, card.uid, sizeof(uid));
 	}
 	else {
 		if (param_gethex(Cmd, 0, uid, 14)) return usage_hf_mfu_pwdgen();
 	}
-	
+
 	PrintAndLogEx(NORMAL, "---------------------------------");
 	PrintAndLogEx(NORMAL, " Using UID : %s", sprint_hex(uid, 7));
 	PrintAndLogEx(NORMAL, "---------------------------------");
@@ -2548,13 +2548,13 @@ static command_t CommandTable[] = {
 	{"info",	CmdHF14AMfUInfo,	0, "Tag information"},
 	{"dump",	CmdHF14AMfUDump,	0, "Dump Ultralight / Ultralight-C / NTAG tag to binary file"},
 	{"restore", CmdHF14AMfURestore, 0, "Restore a dump onto a MFU MAGIC tag"},
-	{"eload",	CmdHF14AMfUeLoad,   0, "load Ultralight .eml dump file into emulator memory"},	
+	{"eload",	CmdHF14AMfUeLoad,   0, "load Ultralight .eml dump file into emulator memory"},
 	{"rdbl",	CmdHF14AMfURdBl,	0, "Read block"},
 	{"wrbl",	CmdHF14AMfUWrBl,	0, "Write block"},
 	{"cauth",	CmdHF14AMfucAuth,	0, "Authentication    - Ultralight C"},
 	{"setpwd",	CmdHF14AMfucSetPwd, 0, "Set 3des password - Ultralight-C"},
 	{"setuid",	CmdHF14AMfucSetUid, 0, "Set UID - MAGIC tags only"},
-	{"sim",		CmdHF14AMfUSim,     0, "Simulate Ultralight from emulator memory"},		
+	{"sim",		CmdHF14AMfUSim,     0, "Simulate Ultralight from emulator memory"},
 	{"gen",		CmdHF14AMfuGenDiverseKeys , 1, "Generate 3des mifare diversified keys"},
 	{"pwdgen",	CmdHF14AMfuPwdGen, 1, "Generate pwd from known algos"},
 	{NULL, NULL, 0, NULL}
diff --git a/client/cmdhfmfu.h b/client/cmdhfmfu.h
index b03444839..4a5528b83 100644
--- a/client/cmdhfmfu.h
+++ b/client/cmdhfmfu.h
@@ -12,7 +12,7 @@
 #include "comms.h"
 #include "loclass/fileutils.h"
 
-#define DUMP_PREFIX_LENGTH 48 
+#define DUMP_PREFIX_LENGTH 48
 
 typedef struct {
 	uint8_t version[8];
@@ -20,7 +20,7 @@ typedef struct {
 	uint8_t	tearing[3];
 	uint8_t	pack[2];
 	uint8_t tbo1[1];
-	uint8_t	signature[32];	
+	uint8_t	signature[32];
 	//uint8_t	counter[3];
 	uint8_t data[1024];
 } mfu_dump_t;
diff --git a/client/cmdhftopaz.c b/client/cmdhftopaz.c
index 2f80b054c..64d4a6f5b 100644
--- a/client/cmdhftopaz.c
+++ b/client/cmdhftopaz.c
@@ -52,12 +52,12 @@ static int topaz_send_cmd_raw(uint8_t *cmd, uint8_t len, uint8_t *response) {
 	if (resp.arg[0] > 0) {
 		memcpy(response, resp.d.asBytes, resp.arg[0]);
 	}
-	
+
 	return resp.arg[0];
 }
 
 
-// calculate CRC bytes and send topaz command, returns the length of the response (0 in case of error) 
+// calculate CRC bytes and send topaz command, returns the length of the response (0 in case of error)
 static int topaz_send_cmd(uint8_t *cmd, uint8_t len, uint8_t *response) {
 	if (len > 1) {
         uint8_t b1, b2;
@@ -88,7 +88,7 @@ static int topaz_select(uint8_t *atqa, uint8_t *rid_response) {
 		topaz_switch_off_field();
 		return -2;		// RID failed
 	}
-	
+
 	return 0;		// OK
 }
 
@@ -102,7 +102,7 @@ static int topaz_rall(uint8_t *uid, uint8_t *response) {
 		topaz_switch_off_field();
 		return -1;		// RALL failed
 	}
-	
+
 	return 0;
 }
 
@@ -112,7 +112,7 @@ static int topaz_read_block(uint8_t *uid, uint8_t blockno, uint8_t *block_data)
 {
 	uint8_t read8_cmd[] = {TOPAZ_READ8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 	uint8_t read8_response[11];
-	
+
 	read8_cmd[1] = blockno;
 	memcpy(&read8_cmd[10], uid, 4);
 	if (!topaz_send_cmd(read8_cmd, sizeof(read8_cmd), read8_response)) {
@@ -127,7 +127,7 @@ static int topaz_read_block(uint8_t *uid, uint8_t blockno, uint8_t *block_data)
 static int topaz_read_segment(uint8_t *uid, uint8_t segno, uint8_t *segment_data) {
 	uint8_t rseg_cmd[] = {TOPAZ_RSEG, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 	uint8_t rseg_response[131];
-	
+
 	rseg_cmd[1] = segno << 4;
 	memcpy(&rseg_cmd[10], uid, 4);
 	if (!topaz_send_cmd(rseg_cmd, sizeof(rseg_cmd), rseg_response)) {
@@ -138,11 +138,11 @@ static int topaz_read_segment(uint8_t *uid, uint8_t segno, uint8_t *segment_data
 	return 0;
 }
 
-// search for the lock area descriptor for the lockable area including byteno 
+// search for the lock area descriptor for the lockable area including byteno
 static dynamic_lock_area_t *get_dynamic_lock_area(uint16_t byteno) {
-	dynamic_lock_area_t *lock_area;	
+	dynamic_lock_area_t *lock_area;
 	lock_area = topaz_tag.dynamic_lock_areas;
-	
+
 	while (lock_area != NULL) {
 		if (byteno < lock_area->first_locked_byte) {
 			lock_area = lock_area->next;
@@ -158,7 +158,7 @@ static bool topaz_byte_is_locked(uint16_t byteno) {
 	uint8_t *lockbits;
 	uint16_t locked_bytes_per_bit;
 	dynamic_lock_area_t *lock_area;
-	
+
 	if (byteno < TOPAZ_STATIC_MEMORY) {
 		lockbits = &topaz_tag.data_blocks[0x0e][0];
 		locked_bytes_per_bit = 8;
@@ -190,20 +190,20 @@ static int topaz_print_CC(uint8_t *data) {
 	}
 
 	PrintAndLogEx(NORMAL, "Capability Container: %02x %02x %02x %02x", data[0], data[1], data[2], data[3]);
-	PrintAndLogEx(NORMAL, "  %02x: NDEF Magic Number", data[0]); 
+	PrintAndLogEx(NORMAL, "  %02x: NDEF Magic Number", data[0]);
 	PrintAndLogEx(NORMAL, "  %02x: version %d.%d supported by tag", data[1], (data[1] & 0xF0) >> 4, data[1] & 0x0f);
 	uint16_t memsize = (data[2] + 1) * 8;
 	topaz_tag.size = memsize;
 	topaz_tag.dynamic_memory = calloc(memsize - TOPAZ_STATIC_MEMORY, sizeof(uint8_t));
 	PrintAndLogEx(NORMAL, "  %02x: Physical Memory Size of this tag: %d bytes", data[2], memsize);
-	PrintAndLogEx(NORMAL, "  %02x: %s / %s", data[3], 
-				(data[3] & 0xF0) ? "(RFU)" : "Read access granted without any security", 
+	PrintAndLogEx(NORMAL, "  %02x: %s / %s", data[3],
+				(data[3] & 0xF0) ? "(RFU)" : "Read access granted without any security",
 				(data[3] & 0x0F)==0 ? "Write access granted without any security" : (data[3] & 0x0F)==0x0F ? "No write access granted at all" : "(RFU)");
-	return 0;				
+	return 0;
 }
 
 
-// return type, length and value of a TLV, starting at memory position *TLV_ptr 
+// return type, length and value of a TLV, starting at memory position *TLV_ptr
 static void get_TLV(uint8_t **TLV_ptr, uint8_t *TLV_type, uint16_t *TLV_length, uint8_t **TLV_value) {
 	*TLV_length = 0;
 	*TLV_value = NULL;
@@ -236,7 +236,7 @@ static void get_TLV(uint8_t **TLV_ptr, uint8_t *TLV_type, uint16_t *TLV_length,
 
 
 // lock area TLVs contain no information on the start of the respective lockable area. Lockable areas
-// do not include the lock bits and reserved memory. We therefore need to adjust the start of the 
+// do not include the lock bits and reserved memory. We therefore need to adjust the start of the
 // respective lockable areas accordingly
 static void adjust_lock_areas(uint16_t block_start, uint16_t block_size) {
 	dynamic_lock_area_t *lock_area = topaz_tag.dynamic_lock_areas;
@@ -258,8 +258,8 @@ static void topaz_print_control_TLVs(uint8_t *memory) {
 	bool lock_TLV_present = false;
 	bool reserved_memory_control_TLV_present = false;
 	uint16_t next_lockable_byte = 0x0f * 8;				// first byte after static memory area
-	
-	while (*TLV_ptr != 0x03 && *TLV_ptr != 0xFD && *TLV_ptr != 0xFE) {	
+
+	while (*TLV_ptr != 0x03 && *TLV_ptr != 0xFD && *TLV_ptr != 0xFE) {
 		// all Lock Control TLVs shall be present before the NDEF message TLV, the proprietary TLV (and the Terminator TLV)
 		get_TLV(&TLV_ptr, &TLV_type, &TLV_length, &TLV_value);
 		if (TLV_type == 0x01) {			// a Lock Control TLV
@@ -270,7 +270,7 @@ static void topaz_print_control_TLVs(uint8_t *memory) {
 			uint16_t bytes_per_page = 1 << (TLV_value[2] & 0x0f);
 			uint16_t bytes_locked_per_bit = 1 << (TLV_value[2] >> 4);
 			uint16_t area_start = pages_addr * bytes_per_page + byte_offset;
-			PrintAndLogEx(NORMAL, "Lock Area of %d bits at byte offset 0x%04x. Each Lock Bit locks %d bytes.", 
+			PrintAndLogEx(NORMAL, "Lock Area of %d bits at byte offset 0x%04x. Each Lock Bit locks %d bytes.",
 						size_in_bits,
 						area_start,
 						bytes_locked_per_bit);
@@ -294,7 +294,7 @@ static void topaz_print_control_TLVs(uint8_t *memory) {
 			new->byte_offset = area_start;
 			new->size_in_bits = size_in_bits;
 			new->bytes_locked_per_bit = bytes_locked_per_bit;
-			next_lockable_byte += size_in_bits * bytes_locked_per_bit;		
+			next_lockable_byte += size_in_bits * bytes_locked_per_bit;
 		}
 		if (TLV_type == 0x02) {			// a Reserved Memory Control TLV
 			uint8_t pages_addr = TLV_value[0] >> 4;
@@ -302,7 +302,7 @@ static void topaz_print_control_TLVs(uint8_t *memory) {
 			uint16_t size_in_bytes = TLV_value[1] ? TLV_value[1] : 256;
 			uint8_t bytes_per_page = 1 << (TLV_value[2] & 0x0f);
 			uint16_t area_start = pages_addr * bytes_per_page + byte_offset;
-			PrintAndLogEx(NORMAL, "Reserved Memory of %d bytes at byte offset 0x%02x.", 
+			PrintAndLogEx(NORMAL, "Reserved Memory of %d bytes at byte offset 0x%02x.",
 						size_in_bytes,
 						area_start);
 			reserved_memory_control_TLV_present = true;
@@ -312,14 +312,14 @@ static void topaz_print_control_TLVs(uint8_t *memory) {
 			}
 		}
 	}
-	
+
 	if (!lock_TLV_present) {
 		PrintAndLogEx(NORMAL, "(No Lock Control TLV present)");
 	}
-	
+
 	if (!reserved_memory_control_TLV_present) {
 		PrintAndLogEx(NORMAL, "(No Reserved Memory Control TLV present)");
-	}	
+	}
 }
 
 // read all of the dynamic memory
@@ -329,7 +329,7 @@ static int topaz_read_dynamic_data(void){
 		PrintAndLogEx(WARNING, "Error while reading dynamic memory block %02x. Aborting...", 0x0f);
 		return -1;
 	}
-	
+
 	// read the remaining segments
 	uint8_t max_segment = topaz_tag.size / 128 - 1;
 	for (uint8_t segment = 1; segment <= max_segment; segment++) {
@@ -337,10 +337,10 @@ static int topaz_read_dynamic_data(void){
 			PrintAndLogEx(WARNING, "Error while reading dynamic memory block %02x. Aborting...", 0x0f);
 			return -1;
 		}
-	}	
+	}
 	return 0;
 }
-	
+
 
 // read and print the dynamic memory
 static void topaz_print_dynamic_data(void) {
@@ -368,10 +368,10 @@ static void topaz_print_lifecycle_state(uint8_t *data) {
 }
 
 static void topaz_print_NDEF(uint8_t *data) {
-	// to be done. 
+	// to be done.
 }
-	
-// read a Topaz tag and print some useful information	
+
+// read a Topaz tag and print some useful information
 int CmdHFTopazReader(const char *Cmd) {
 	int status;
 	uint8_t atqa[2];
@@ -382,7 +382,7 @@ int CmdHFTopazReader(const char *Cmd) {
 
 	char ctmp = param_getchar(Cmd, 0);
 	if ( ctmp == 'S' || ctmp == 's') verbose = false;
-	
+
 	status = topaz_select(atqa, rid_response);
 
 	if (status == -1) {
@@ -396,7 +396,7 @@ int CmdHFTopazReader(const char *Cmd) {
 		topaz_switch_off_field();
 		return -1;
 	}
-	
+
 	if (status == -2) {
 		PrintAndLogEx(WARNING, "Error: tag didn't answer to RID");
 		topaz_switch_off_field();
@@ -405,14 +405,14 @@ int CmdHFTopazReader(const char *Cmd) {
 
 	topaz_tag.HR01[0] = rid_response[0];
 	topaz_tag.HR01[1] = rid_response[1];
-	
+
 	// ToDo: CRC check
-	PrintAndLogEx(NORMAL, "HR0  : %02x (%sa Topaz tag (%scapable of carrying a NDEF message), %s memory map)", rid_response[0], 
+	PrintAndLogEx(NORMAL, "HR0  : %02x (%sa Topaz tag (%scapable of carrying a NDEF message), %s memory map)", rid_response[0],
 						(rid_response[0] & 0xF0) == 0x10 ? "" : "not ",
 						(rid_response[0] & 0xF0) == 0x10 ? "" : "not ",
 						(rid_response[0] & 0x0F) == 0x01 ? "static" : "dynamic");
 	PrintAndLogEx(NORMAL, "HR1  : %02x", rid_response[1]);
-	
+
 	status = topaz_rall(uid_echo, rall_response);
 
 	if (status == -1) {
@@ -422,19 +422,19 @@ int CmdHFTopazReader(const char *Cmd) {
 	}
 
 	memcpy(topaz_tag.uid, rall_response+2, 7);
-	PrintAndLogEx(NORMAL, "UID  : %02x %02x %02x %02x %02x %02x %02x", 
-			topaz_tag.uid[6], 
-			topaz_tag.uid[5], 
-			topaz_tag.uid[4], 
-			topaz_tag.uid[3], 
-			topaz_tag.uid[2], 
-			topaz_tag.uid[1], 
+	PrintAndLogEx(NORMAL, "UID  : %02x %02x %02x %02x %02x %02x %02x",
+			topaz_tag.uid[6],
+			topaz_tag.uid[5],
+			topaz_tag.uid[4],
+			topaz_tag.uid[3],
+			topaz_tag.uid[2],
+			topaz_tag.uid[1],
 			topaz_tag.uid[0]);
-			
-	PrintAndLogEx(NORMAL, "       UID[6] (Manufacturer Byte) = %02x, Manufacturer: %s", 
-			topaz_tag.uid[6], 
+
+	PrintAndLogEx(NORMAL, "       UID[6] (Manufacturer Byte) = %02x, Manufacturer: %s",
+			topaz_tag.uid[6],
 			getTagInfo(topaz_tag.uid[6]));
-	
+
 	memcpy(topaz_tag.data_blocks, rall_response+2, 0x0f*8);
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Static Data blocks 00 to 0c:");
@@ -449,14 +449,14 @@ int CmdHFTopazReader(const char *Cmd) {
 		lockbits[8] = '\0';
 		PrintAndLogEx(NORMAL, "  0x%02x | 0x%02x | %s|   %-3s", i, i*8, line, lockbits);
 	}
-	
+
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Static Reserved block 0d:");
 	for (uint16_t j = 0; j < 8; j++) {
 		sprintf(&line[3*j], "%02x ", topaz_tag.data_blocks[0x0d][j]);
 	}
 	PrintAndLogEx(NORMAL, "  0x%02x |  0x%02x  | %s|   %-3s", 0x0d, 0x0d*8, line, "n/a");
-	
+
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Static Lockbits and OTP Bytes:");
 	for (uint16_t j = 0; j < 8; j++) {
@@ -467,7 +467,7 @@ int CmdHFTopazReader(const char *Cmd) {
 	PrintAndLogEx(NORMAL, "");
 
 	status = topaz_print_CC(&topaz_tag.data_blocks[1][0]);
-	
+
 	if (status == -1) {
 		PrintAndLogEx(NORMAL, "No NDEF message data present");
 		topaz_switch_off_field();
@@ -476,14 +476,14 @@ int CmdHFTopazReader(const char *Cmd) {
 
 	PrintAndLogEx(NORMAL, "");
 	topaz_print_control_TLVs(&topaz_tag.data_blocks[1][4]);
-	
+
 	PrintAndLogEx(NORMAL, "");
 	topaz_print_dynamic_data();
-	
+
 	topaz_print_lifecycle_state(&topaz_tag.data_blocks[1][0]);
 
 	topaz_print_NDEF(&topaz_tag.data_blocks[1][0]);
-	
+
 	topaz_switch_off_field();
 	return 0;
 }
diff --git a/client/cmdhw.c b/client/cmdhw.c
index ec7b42a1a..640729306 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -26,9 +26,9 @@ static int CmdHelp(const char *Cmd);
 static void lookupChipID(uint32_t iChipID, uint32_t mem_used) {
 	char asBuff[120];
 	memset(asBuff, 0, sizeof(asBuff));
-	uint32_t mem_avail = 0;	
+	uint32_t mem_avail = 0;
 	PrintAndLogEx(NORMAL, "\n [ Hardware ] ");
-	
+
 	switch(iChipID) {
 		case 0x270B0A40: sprintf(asBuff,"AT91SAM7S512 Rev A"); break;
 		case 0x270B0A4F: sprintf(asBuff,"AT91SAM7S512 Rev B"); break;
@@ -69,19 +69,19 @@ static void lookupChipID(uint32_t iChipID, uint32_t mem_used) {
 		case 12: mem_avail = 1024; break;
 		case 14: mem_avail = 2048; break;
 	}
-	
+
 	uint32_t mem_left = 0;
-	if ( mem_avail > 0 ) 
+	if ( mem_avail > 0 )
 		mem_left = (mem_avail * 1024) - mem_used;
-	
-	PrintAndLogEx(NORMAL, "  --= Nonvolatile Program Memory Size: %uK bytes, Used: %u bytes (%2.0f%%) Free: %u bytes (%2.0f%%)", 
-				mem_avail, 
-				mem_used, 
+
+	PrintAndLogEx(NORMAL, "  --= Nonvolatile Program Memory Size: %uK bytes, Used: %u bytes (%2.0f%%) Free: %u bytes (%2.0f%%)",
+				mem_avail,
+				mem_used,
 				mem_avail == 0 ? 0.0f : (float)mem_used/(mem_avail*1024)*100,
 				mem_left,
 				mem_avail == 0 ? 0.0f : (float)mem_left/(mem_avail*1024)*100
 			);
-				
+
 	switch( (iChipID & 0xF000) >> 12 ) {
 		case 0:	 sprintf(asBuff,"None"); break;
 		case 1:	 sprintf(asBuff,"8K bytes"); break;
@@ -140,7 +140,7 @@ static void lookupChipID(uint32_t iChipID, uint32_t mem_used) {
 		case 1: sprintf(asBuff,"ROMless or on-chip Flash");	break;
 		case 2:	sprintf(asBuff,"Embedded Flash Memory"); break;
 		case 3:	sprintf(asBuff,"ROM and Embedded Flash Memory\nNVPSIZ is ROM size\nNVPSIZ2 is Flash size");	break;
-		case 4:	sprintf(asBuff,"SRAM emulating ROM"); break;		
+		case 4:	sprintf(asBuff,"SRAM emulating ROM"); break;
 	}
 	PrintAndLogEx(NORMAL, "  --= Nonvolatile Program Memory Type: %s",asBuff);
 }
@@ -156,7 +156,7 @@ int CmdDetectReader(const char *Cmd) {
 		PrintAndLogEx(NORMAL, "use 'detectreader' or 'detectreader l' or 'detectreader h'");
 		return 0;
 	}
-	clearCommandBuffer();	
+	clearCommandBuffer();
 	SendCommand(&c);
 	return 0;
 }
@@ -211,11 +211,11 @@ int CmdReset(const char *Cmd) {
  */
 int CmdSetDivisor(const char *Cmd) {
 	UsbCommand c = {CMD_SET_LF_DIVISOR, {strtol(Cmd, NULL, 0), 0, 0}};
-	
+
 	if (c.arg[0] < 19 || c.arg[0] > 255) {
 		PrintAndLogEx(NORMAL, "divisor must be between 19 and 255");
 		return 1;
-	} 
+	}
 	// 12 000 000 (12Mhz)
 	clearCommandBuffer();
 	SendCommand(&c);
@@ -224,12 +224,12 @@ int CmdSetDivisor(const char *Cmd) {
 }
 
 int CmdSetMux(const char *Cmd) {
-	
+
 	if (strlen(Cmd) < 5) {
 		PrintAndLogEx(NORMAL, "expected:  lopkd | loraw | hipkd | hiraw");
 		return 1;
 	}
-	
+
 	UsbCommand c = {CMD_SET_ADC_MUX};
 
 	if (strcmp(Cmd, "lopkd") == 0) 		c.arg[0] = 0;
@@ -246,9 +246,9 @@ int CmdTune(const char *Cmd) {
 }
 
 int CmdVersion(const char *Cmd) {
-	
+
 	bool silent = (Cmd[0] == 's' || Cmd[0] ==  'S');
-	if ( silent ) 
+	if ( silent )
 		return 0;
 
 	UsbCommand c = {CMD_VERSION, {0, 0, 0}};
@@ -259,15 +259,15 @@ int CmdVersion(const char *Cmd) {
 #ifdef __WIN32
 		PrintAndLogEx(NORMAL, "\n [ Proxmark3 RFID instrument ]\n");
 #else
-		PrintAndLogEx(NORMAL, "\n\e[34m [ Proxmark3 RFID instrument ]\e[0m\n");	
-#endif	
+		PrintAndLogEx(NORMAL, "\n\e[34m [ Proxmark3 RFID instrument ]\e[0m\n");
+#endif
 		char s[50] = {0};
 #if defined(WITH_FLASH) || defined(WITH_SMARTCARD) || defined(WITH_FPC)
 		strncat(s, "build for RDV40 with ", sizeof(s) - strlen(s) - 1);
 #endif
 #ifdef WITH_FLASH
 		strncat(s, "flashmem; ", sizeof(s) - strlen(s) - 1);
-#endif	
+#endif
 #ifdef WITH_SMARTCARD
 		strncat(s, "smartcard; ", sizeof(s) - strlen(s) - 1);
 #endif
@@ -276,10 +276,10 @@ int CmdVersion(const char *Cmd) {
 #endif
 		PrintAndLogEx(NORMAL, "\n [ CLIENT ]");
 		PrintAndLogEx(NORMAL, "  client: iceman %s \n", s);
-		
+
 		PrintAndLogEx(NORMAL, (char*)resp.d.asBytes);
-		lookupChipID(resp.arg[0], resp.arg[1]);			
-	} 
+		lookupChipID(resp.arg[0], resp.arg[1]);
+	}
 	PrintAndLogEx(NORMAL, "\n");
 	return 0;
 }
@@ -301,7 +301,7 @@ int CmdPing(const char *Cmd) {
 	if (WaitForResponseTimeout(CMD_ACK, &resp, 1000))
 		PrintAndLogEx(NORMAL, "Ping successful");
 	else
-		PrintAndLogEx(NORMAL, "Ping failed");	
+		PrintAndLogEx(NORMAL, "Ping failed");
 	return 0;
 }
 
@@ -312,7 +312,7 @@ static command_t CommandTable[] = {
 #ifdef WITH_LCD
 	{"lcd",           CmdLCD,         0, "<HEX command> <count> -- Send command/data to LCD"},
 	{"lcdreset",      CmdLCDReset,    0, "Hardware reset LCD"},
-#endif	
+#endif
 	{"readmem",       CmdReadmem,     0, "[address] -- Read memory at decimal address from flash"},
 	{"reset",         CmdReset,       0, "Reset the Proxmark3"},
 	{"setlfdivisor",  CmdSetDivisor,  0, "<19 - 255> -- Drive LF antenna at 12Mhz/(divisor+1)"},
diff --git a/client/cmdlf.c b/client/cmdlf.c
index 240a1d402..59dc12654 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -23,7 +23,7 @@ int usage_lf_cmdread(void) {
 	PrintAndLogEx(NORMAL, "       c <cmd>       Command bytes  (in ones and zeros)");
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "       ************* All periods in microseconds (ms)");
-	PrintAndLogEx(NORMAL, "       ************* Use lf config to configure options.");	
+	PrintAndLogEx(NORMAL, "       ************* Use lf config to configure options.");
 	PrintAndLogEx(NORMAL, "Examples:");
 	PrintAndLogEx(NORMAL, "      lf cmdread d 80 z 100 o 200 c 11000");
 	return 0;
@@ -33,7 +33,7 @@ int usage_lf_read(void){
 	PrintAndLogEx(NORMAL, "Options:");
 	PrintAndLogEx(NORMAL, "       h            This help");
 	PrintAndLogEx(NORMAL, "       s            silent run no printout");
-	PrintAndLogEx(NORMAL, "       d #samples   # samples to collect (optional)");	
+	PrintAndLogEx(NORMAL, "       d #samples   # samples to collect (optional)");
 	PrintAndLogEx(NORMAL, "Use 'lf config' to set parameters.");
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Examples:");
@@ -79,7 +79,7 @@ int usage_lf_simfsk(void) {
 	PrintAndLogEx(NORMAL, "FSK1  -  where fc/8 = high  and fc/5 = low");
 	PrintAndLogEx(NORMAL, "FSK1a -  is inverted FSK1,  ie:   fc/5 = high and fc/8 = low");
 	PrintAndLogEx(NORMAL, "FSK2  -  where fc/10 = high  and fc/8 = low");
-	PrintAndLogEx(NORMAL, "FSK2a -  is inverted FSK2,  ie:   fc/10 = high and fc/8 = low");	
+	PrintAndLogEx(NORMAL, "FSK2a -  is inverted FSK2,  ie:   fc/10 = high and fc/8 = low");
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Options:");
 	PrintAndLogEx(NORMAL, "       h              This help");
@@ -176,10 +176,10 @@ int CmdLFCommandRead(const char *Cmd) {
 
 	//Validations
 	if (errors || cmdp == 0)  return usage_lf_cmdread();
-	
+
 	clearCommandBuffer();
 	SendCommand(&c);
-	
+
 	WaitForResponse(CMD_ACK, NULL);
 	getSamples(0, true);
 	return 0;
@@ -197,9 +197,9 @@ int CmdFlexdemod(const char *Cmd) {
 
 	int data[GraphTraceLen];
 	memcpy(data, GraphBuffer, GraphTraceLen);
-	
+
 	size_t size = GraphTraceLen;
-	
+
 	for (i = 0; i < GraphTraceLen; ++i)
 		data[i] = (data[i] < 0) ? -1 : 1;
 
@@ -213,7 +213,7 @@ int CmdFlexdemod(const char *Cmd) {
 		if (i == (start + LONG_WAIT))
 			break;
 	}
-	
+
 	if (start == size - LONG_WAIT) {
 		PrintAndLogEx(NORMAL, "nothing to wait for");
 		return 0;
@@ -221,7 +221,7 @@ int CmdFlexdemod(const char *Cmd) {
 
 	data[start] = 4;
 	data[start+1] = 0;
-	
+
 	uint8_t bits[64] = {0x00};
 
 	i = start;
@@ -250,9 +250,9 @@ int CmdFlexdemod(const char *Cmd) {
 	GraphTraceLen = 32 * 64;
 	i = 0;
 	for (bit = 0; bit < 64; bit++) {
-		
+
 		phase = (bits[bit] == 0) ? 0 : 1;
-		
+
 		for (j = 0; j < 32; j++) {
 			GraphBuffer[i++] = phase;
 			phase = !phase;
@@ -317,7 +317,7 @@ int CmdLFSetConfig(const char *Cmd) {
 
 	//Validations
 	if (errors || cmdp == 0) return usage_lf_config();
-	
+
 	//Bps is limited to 8
 	if (bps >> 4) bps = 8;
 
@@ -352,9 +352,9 @@ bool lf_read(bool silent, uint32_t samples) {
 }
 
 int CmdLFRead(const char *Cmd) {
-	
+
 	if ( IsOffline() ) return 0;
-	
+
 	bool errors = false;
 	bool silent = false;
 	uint32_t samples = 0;
@@ -387,9 +387,9 @@ int CmdLFRead(const char *Cmd) {
 int CmdLFSnoop(const char *Cmd) {
 	uint8_t cmdp = tolower(param_getchar(Cmd, 0));
 	if (cmdp == 'h') return usage_lf_snoop();
-	
+
 	UsbCommand c = {CMD_LF_SNOOP_RAW_ADC_SAMPLES,{0,0,0}};
-	clearCommandBuffer();	
+	clearCommandBuffer();
 	SendCommand(&c);
 	WaitForResponse(CMD_ACK, NULL);
 	getSamples(0, false);
@@ -414,11 +414,11 @@ int CmdLFSim(const char *Cmd) {
 	int gap = 0;
 	sscanf(Cmd, "%i", &gap);
 
-	// convert to bitstream if necessary 
+	// convert to bitstream if necessary
 	ChkBitstream(Cmd);
 
 	PrintAndLogEx(DEBUG, "DEBUG: Sending [%d bytes]\n", GraphTraceLen);
-	
+
 	//can send only 512 bits at a time (1 byte sent per bit...)
 	for (uint16_t i = 0; i < GraphTraceLen; i += USB_CMD_DATA_SIZE) {
 		UsbCommand c = {CMD_UPLOAD_SIM_SAMPLES_125K, {i, FPGA_LF, 0}};
@@ -440,7 +440,7 @@ int CmdLFSim(const char *Cmd) {
 	return 0;
 }
 
-// by marshmellow - sim fsk data given clock, fcHigh, fcLow, invert 
+// by marshmellow - sim fsk data given clock, fcHigh, fcLow, invert
 // - allow pull data from DemodBuffer
 int CmdLFfskSim(const char *Cmd) {
 	//might be able to autodetect FCs and clock from Graphbuffer if using demod buffer
@@ -448,10 +448,10 @@ int CmdLFfskSim(const char *Cmd) {
 	uint8_t fcHigh = 0, fcLow = 0, clk = 0;
 	bool errors = false, separator = false;
 	char hexData[64] = {0x00}; // store entered hex data
-	uint8_t data[255] = {0x00}; 
+	uint8_t data[255] = {0x00};
 	int dataLen = 0;
-	uint8_t cmdp = 0;	
-	
+	uint8_t cmdp = 0;
+
 	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
 		switch (param_getchar(Cmd, cmdp)){
 			case 'h':
@@ -475,11 +475,11 @@ int CmdLFfskSim(const char *Cmd) {
 			case 'd':
 				dataLen = param_getstr(Cmd, cmdp+1, hexData, sizeof(hexData));
 				if (dataLen == 0)
-					errors = true; 
+					errors = true;
 				else
 					dataLen = hextobinarray((char *)data, hexData);
-				   
-				if (dataLen == 0) errors = true; 
+
+				if (dataLen == 0) errors = true;
 				if (errors) PrintAndLogEx(WARNING, "Error getting hex data");
 				cmdp += 2;
 				break;
@@ -489,7 +489,7 @@ int CmdLFfskSim(const char *Cmd) {
 				break;
 		}
 	}
-	
+
 	// No args
 	if (cmdp == 0 && DemodBufferLen == 0) return usage_lf_simfsk();
 
@@ -497,7 +497,7 @@ int CmdLFfskSim(const char *Cmd) {
 	if (errors) return usage_lf_simfsk();
 
 	int firstClockEdge = 0;
-	if (dataLen == 0){ //using DemodBuffer 
+	if (dataLen == 0){ //using DemodBuffer
 		if (clk == 0 || fcHigh == 0 || fcLow == 0){ //manual settings must set them all
 			uint8_t ans = fskClocks(&fcHigh, &fcLow, &clk, &firstClockEdge);
 			if (ans==0){
@@ -522,29 +522,29 @@ int CmdLFfskSim(const char *Cmd) {
 	if (size > USB_CMD_DATA_SIZE) {
 		PrintAndLogEx(NORMAL, "DemodBuffer too long for current implementation - length: %d - max: %d", size, USB_CMD_DATA_SIZE);
 		size = USB_CMD_DATA_SIZE;
-	} 
+	}
 	UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}};
 
 	memcpy(c.d.asBytes, DemodBuffer, size);
 	clearCommandBuffer();
 	SendCommand(&c);
-	
+
 	setClockGrid(clk, 0);
 	return 0;
 }
 
-// by marshmellow - sim ask data given clock, invert, manchester or raw, separator 
+// by marshmellow - sim ask data given clock, invert, manchester or raw, separator
 // - allow pull data from DemodBuffer
 int CmdLFaskSim(const char *Cmd) {
 	// autodetect clock from Graphbuffer if using demod buffer
 	// needs clock, invert, manchester/raw as m or r, separator as s, and bitstream
 	uint8_t encoding = 1, separator = 0, clk = 0, invert = 0;
 	bool errors = false;
-	char hexData[64] = {0x00}; 
+	char hexData[64] = {0x00};
 	uint8_t data[255] = {0x00}; // store entered hex data
 	int dataLen = 0;
 	uint8_t cmdp = 0;
-	
+
 	while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
 		switch (tolower(param_getchar(Cmd, cmdp))) {
 			case 'h': return usage_lf_simask();
@@ -575,11 +575,11 @@ int CmdLFaskSim(const char *Cmd) {
 			case 'd':
 				dataLen = param_getstr(Cmd, cmdp+1, hexData, sizeof(hexData));
 				if (dataLen == 0)
-					errors = true; 
+					errors = true;
 				else
 					dataLen = hextobinarray((char *)data, hexData);
-				
-				if (dataLen == 0) errors = true; 
+
+				if (dataLen == 0) errors = true;
 				if (errors) PrintAndLogEx(WARNING, "Error getting hex data, datalen: %d", dataLen);
 				cmdp += 2;
 				break;
@@ -595,26 +595,26 @@ int CmdLFaskSim(const char *Cmd) {
 
 	//Validations
 	if (errors) return usage_lf_simask();
-	
+
 	if (dataLen == 0){ //using DemodBuffer
-		if (clk == 0) 
+		if (clk == 0)
 			clk = GetAskClock("0", false);
 	} else {
 		setDemodBuf(data, dataLen, 0);
 	}
 	if (clk == 0) clk = 64;
 	if (encoding == 0) clk /= 2; //askraw needs to double the clock speed
-	
+
 	size_t size = DemodBufferLen;
 
 	if (size > USB_CMD_DATA_SIZE) {
 		PrintAndLogEx(NORMAL, "DemodBuffer too long for current implementation - length: %d - max: %d", size, USB_CMD_DATA_SIZE);
 		size = USB_CMD_DATA_SIZE;
 	}
-	
-	PrintAndLogEx(NORMAL, "preparing to sim ask data: %d bits", size);	
 
-	uint16_t arg1, arg2;	
+	PrintAndLogEx(NORMAL, "preparing to sim ask data: %d bits", size);
+
+	uint16_t arg1, arg2;
 	arg1 = clk << 8 | encoding;
 	arg2 = invert << 8 | separator;
 
@@ -625,7 +625,7 @@ int CmdLFaskSim(const char *Cmd) {
 	return 0;
 }
 
-// by marshmellow - sim psk data given carrier, clock, invert 
+// by marshmellow - sim psk data given carrier, clock, invert
 // - allow pull data from DemodBuffer or parameters
 int CmdLFpskSim(const char *Cmd) {
 	//might be able to autodetect FC and clock from Graphbuffer if using demod buffer
@@ -634,11 +634,11 @@ int CmdLFpskSim(const char *Cmd) {
 	uint8_t invert=0;
 	bool errors = false;
 	char hexData[64] = {0x00}; // store entered hex data
-	uint8_t data[255] = {0x00}; 
+	uint8_t data[255] = {0x00};
 	int dataLen = 0;
 	uint8_t cmdp = 0;
 	uint8_t pskType = 1;
-	
+
 	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
 		switch (tolower(param_getchar(Cmd, cmdp))) {
 			case 'h':
@@ -670,11 +670,11 @@ int CmdLFpskSim(const char *Cmd) {
 			case 'd':
 				dataLen = param_getstr(Cmd, cmdp+1, hexData, sizeof(hexData));
 				if (dataLen == 0)
-					errors = true; 
+					errors = true;
 				else
 					dataLen = hextobinarray((char *)data, hexData);
-				    
-				if (dataLen == 0) errors = true; 
+
+				if (dataLen == 0) errors = true;
 				if (errors) PrintAndLogEx(WARNING, "Error getting hex data");
 				cmdp+=2;
 				break;
@@ -693,13 +693,13 @@ int CmdLFpskSim(const char *Cmd) {
 
 	if (dataLen == 0){ //using DemodBuffer
 		PrintAndLogEx(NORMAL, "Getting Clocks");
-		
+
 		if (clk==0) clk = GetPskClock("", false);
 		PrintAndLogEx(NORMAL, "clk: %d",clk);
-		
-		if (!carrier) carrier = GetPskCarrier("", false); 
+
+		if (!carrier) carrier = GetPskCarrier("", false);
 		PrintAndLogEx(NORMAL, "carrier: %d", carrier);
-		
+
 	} else {
 		setDemodBuf(data, dataLen, 0);
 	}
@@ -708,7 +708,7 @@ int CmdLFpskSim(const char *Cmd) {
 
 	if (carrier != 2 && carrier != 4 && carrier != 8 )
 		carrier = 2;
-  
+
 	if (pskType != 1){
 		if (pskType == 2){
 			//need to convert psk2 to psk1 data before sim
@@ -784,14 +784,14 @@ int CmdVchDemod(const char *Cmd) {
 
 	for (i = 0; i < 2048; i += 8) {
 		sum = 0;
-		for (j = 0; j < 8; j++) 
+		for (j = 0; j < 8; j++)
 			sum += GraphBuffer[bestPos+i+j];
-		
+
 		if (sum < 0)
 			bits[i/8] = '.';
 		else
 			bits[i/8] = '1';
-		
+
 		if(abs(sum) < worst) {
 			worst = abs(sum);
 			worstPos = i;
@@ -819,7 +819,7 @@ int CmdVchDemod(const char *Cmd) {
 int CheckChipType(bool getDeviceData) {
 
 	if (!getDeviceData) return 0;
-	
+
 	save_restoreDB(GRAPH_SAVE);
 
 	//check for em4x05/em4x69 chips first
@@ -836,7 +836,7 @@ int CheckChipType(bool getDeviceData) {
 		PrintAndLogEx(SUCCESS, "\nValid T55xx Chip Found");
 		PrintAndLogEx(SUCCESS, "Try " _YELLOW_(`lf t55xx`)" commands");
 		save_restoreGB(GRAPH_RESTORE);
-		return 1;		
+		return 1;
 	}
 
 	save_restoreDB(GRAPH_RESTORE);
@@ -849,16 +849,16 @@ int CmdLFfind(const char *Cmd) {
 	size_t minLength = 2000;
 	char cmdp = tolower(param_getchar(Cmd, 0));
 	char testRaw = param_getchar(Cmd, 1);
-	
+
 	if (strlen(Cmd) > 3 || cmdp == 'h') return usage_lf_find();
-	
+
 	if (cmdp == 'u') testRaw = 'u';
-	
+
 	bool isOnline = (!IsOffline() && (cmdp != '1') );
-	
+
 	if (isOnline)
 		lf_read(true, 30000);
-	
+
 	if (GraphTraceLen < minLength) {
 		PrintAndLogEx(FAILED, "Data in Graphbuffer was too small.");
 		return 0;
@@ -866,9 +866,9 @@ int CmdLFfind(const char *Cmd) {
 
 	PrintAndLogEx(INFO, "NOTE: some demods output possible binary");
 	PrintAndLogEx(INFO, "if it finds something that looks like a tag");
-	PrintAndLogEx(INFO, "False Positives " _YELLOW_(ARE) "possible\n");  
+	PrintAndLogEx(INFO, "False Positives " _YELLOW_(ARE) "possible\n");
 	PrintAndLogEx(INFO, "\nChecking for known tags:\n");
-	
+
 	// only run these tests if device is online
 	if (isOnline) {
 		// only run if graphbuffer is just noise as it should be for hitag
@@ -876,21 +876,21 @@ int CmdLFfind(const char *Cmd) {
 		signal_t *sp = getSignalProperties();
 		if (sp->isnoise) {
 
-			PrintAndLogEx(INFO, "Signal looks just like noise. Looking for Hitag signal now.");	
+			PrintAndLogEx(INFO, "Signal looks just like noise. Looking for Hitag signal now.");
 
 			// 26 === RHT2F_UID_ONLY
 			if (CmdLFHitagReader("26") == 0) { PrintAndLogEx(SUCCESS, "\nValid Hitag Found!"); return 1;}
 			if (CmdCOTAGRead("") > 0) 	{ PrintAndLogEx(SUCCESS, "\nValid COTAG ID Found!"); return 1;}
-			
+
 			PrintAndLogEx(FAILED, "\nNo Data Found! - maybe not an LF tag?");
 		    return 0;
 		}
 	}
-	
+
 	if (EM4x50Read("", false))	{ PrintAndLogEx(SUCCESS, "\nValid EM4x50 ID Found!"); return 1;}
 	if (CmdAWIDDemod(""))		{ PrintAndLogEx(SUCCESS, "\nValid AWID ID Found!"); goto out;}
 	if (CmdEM410xDemod(""))		{ PrintAndLogEx(SUCCESS, "\nValid EM410x ID Found!"); goto out;}
-	if (CmdFdxDemod(""))		{ PrintAndLogEx(SUCCESS, "\nValid FDX-B ID Found!"); goto out;}	
+	if (CmdFdxDemod(""))		{ PrintAndLogEx(SUCCESS, "\nValid FDX-B ID Found!"); goto out;}
 	if (CmdGuardDemod(""))		{ PrintAndLogEx(SUCCESS, "\nValid Guardall G-Prox II ID Found!"); goto out; }
 	if (CmdHIDDemod(""))		{ PrintAndLogEx(SUCCESS, "\nValid HID Prox ID Found!"); goto out;}
 	if (CmdPSKIdteck(""))		{ PrintAndLogEx(SUCCESS, "\nValid Idteck ID Found!"); goto out;}
@@ -901,19 +901,19 @@ int CmdLFfind(const char *Cmd) {
 	if (CmdNexWatchDemod("")) 	{ PrintAndLogEx(SUCCESS, "\nValid NexWatch ID Found!"); goto out;}
 	if (CmdNoralsyDemod(""))	{ PrintAndLogEx(SUCCESS, "\nValid Noralsy ID Found!"); goto out;}
 	if (CmdKeriDemod(""))		{ PrintAndLogEx(SUCCESS, "\nValid KERI ID Found!"); goto out;}
-	if (CmdPacDemod(""))		{ PrintAndLogEx(SUCCESS, "\nValid PAC/Stanley ID Found!"); goto out;}	
+	if (CmdPacDemod(""))		{ PrintAndLogEx(SUCCESS, "\nValid PAC/Stanley ID Found!"); goto out;}
 	if (CmdParadoxDemod(""))	{ PrintAndLogEx(SUCCESS, "\nValid Paradox ID Found!"); goto out;}
-	if (CmdPrescoDemod(""))		{ PrintAndLogEx(SUCCESS, "\nValid Presco ID Found!"); goto out;}				 
+	if (CmdPrescoDemod(""))		{ PrintAndLogEx(SUCCESS, "\nValid Presco ID Found!"); goto out;}
 	if (CmdPyramidDemod(""))	{ PrintAndLogEx(SUCCESS, "\nValid Pyramid ID Found!"); goto out;}
 	if (CmdSecurakeyDemod(""))	{ PrintAndLogEx(SUCCESS, "\nValid Securakey ID Found!"); goto out;}
-	if (CmdVikingDemod(""))		{ PrintAndLogEx(SUCCESS, "\nValid Viking ID Found!"); goto out;}	
+	if (CmdVikingDemod(""))		{ PrintAndLogEx(SUCCESS, "\nValid Viking ID Found!"); goto out;}
 	if (CmdVisa2kDemod(""))		{ PrintAndLogEx(SUCCESS, "\nValid Visa2000 ID Found!"); goto out;}
 
 	//if (CmdFermaxDemod(""))		{ PrintAndLogEx(SUCCESS, "\nValid Fermax ID Found!"); goto out;}
 	// TIdemod?  flexdemod?
-	
+
 	PrintAndLogEx(FAILED, "\nNo known 125/134 KHz tags Found!\n");
-	
+
 	if (testRaw == 'u'){
 		//test unknown tag formats (raw mode)
 		PrintAndLogEx(INFO, "\nChecking for Unknown tags:\n");
@@ -922,31 +922,31 @@ int CmdLFfind(const char *Cmd) {
 
 			PrintAndLogEx(INFO, "Possible Auto Correlation of %d repeating samples",ans);
 
-			if ( ans % 8 == 0) 
+			if ( ans % 8 == 0)
 				PrintAndLogEx(INFO, "Possible %d bytes", (ans / 8));
 		}
 
 		 //fsk
 		if ( GetFskClock("", false) ) {
-			if ( FSKrawDemod("", true) ) { 
+			if ( FSKrawDemod("", true) ) {
 				PrintAndLogEx(NORMAL, "\nUnknown FSK Modulated Tag Found!"); goto out;
 			}
 		}
-		
+
 		bool st = true;
 		if ( ASKDemod_ext("0 0 0", true, false, 1, &st) ) {
 		  PrintAndLogEx(NORMAL, "\nUnknown ASK Modulated and Manchester encoded Tag Found!");
 		  PrintAndLogEx(NORMAL, "\nif it does not look right it could instead be ASK/Biphase - try 'data rawdemod ab'");
 		  goto out;
 		}
-		
+
 		if ( CmdPSK1rawDemod("") ) {
 			PrintAndLogEx(NORMAL, "Possible unknown PSK1 Modulated Tag Found above!\n\nCould also be PSK2 - try 'data rawdemod p2'");
 			PrintAndLogEx(NORMAL, "\nCould also be PSK3 - [currently not supported]");
 			PrintAndLogEx(NORMAL, "\nCould also be NRZ - try 'data nrzrawdemod");
 			goto out;
 		}
-		
+
 		PrintAndLogEx(FAILED, "\nNo Data Found!\n");
 	}
 out:
@@ -970,12 +970,12 @@ static command_t CommandTable[] = {
 	{"keri",		CmdLFKeri,			1, "{ KERI RFIDs...              }"},
 	{"nedap",		CmdLFNedap,			1, "{ Nedap RFIDs...             }"},
 	{"nexwatch",    CmdLFNEXWATCH,      1, "{ NexWatch RFIDs...          }"},
-	{"noralsy",		CmdLFNoralsy,		1, "{ Noralsy RFIDs...           }"},	
+	{"noralsy",		CmdLFNoralsy,		1, "{ Noralsy RFIDs...           }"},
 	{"pac",         CmdLFPac,           1, "{ PAC/Stanley RFIDs...       }"},
 	{"paradox",     CmdLFParadox,       1, "{ Paradox RFIDs...           }"},
 	{"pcf7931",     CmdLFPCF7931,       1, "{ PCF7931 CHIPs...           }"},
 	{"presco",      CmdLFPresco,        1, "{ Presco RFIDs...            }"},
-	{"pyramid",		CmdLFPyramid,       1, "{ Farpointe/Pyramid RFIDs... }"},	
+	{"pyramid",		CmdLFPyramid,       1, "{ Farpointe/Pyramid RFIDs... }"},
 	{"securakey",   CmdLFSecurakey,     1, "{ Securakey RFIDs...         }"},
 	{"ti",          CmdLFTI,            1, "{ TI CHIPs...                }"},
 	{"t55xx",       CmdLFT55XX,         1, "{ T55xx CHIPs...             }"},
@@ -999,7 +999,7 @@ static command_t CommandTable[] = {
 int CmdLF(const char *Cmd) {
 	clearCommandBuffer();
 	CmdsParse(CommandTable, Cmd);
-	return 0; 
+	return 0;
 }
 
 int CmdHelp(const char *Cmd) {
diff --git a/client/cmdlf.h b/client/cmdlf.h
index 04c7317a1..be0313528 100644
--- a/client/cmdlf.h
+++ b/client/cmdlf.h
@@ -17,7 +17,7 @@
 #include <string.h>
 #include <limits.h>
 #include "proxmark3.h"
-#include "lfdemod.h"		// device/client demods of LF signals		
+#include "lfdemod.h"		// device/client demods of LF signals
 #include "util.h"			// for parsing cli command utils
 #include "ui.h"				// for show graph controls
 #include "graph.h"			// for graph data
diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c
index 3cc56f56c..6e181aa34 100644
--- a/client/cmdlfawid.c
+++ b/client/cmdlfawid.c
@@ -11,7 +11,7 @@
 // FSK2a, RF/50, 96 bits (complete)
 //-----------------------------------------------------------------------------
 #include "cmdlfawid.h"  // AWID function declarations
- 
+
 static int CmdHelp(const char *Cmd);
 
 int usage_lf_awid_read(void) {
@@ -21,7 +21,7 @@ int usage_lf_awid_read(void) {
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Usage:  lf awid read [h] [1]");
 	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h :  This help");	
+	PrintAndLogEx(NORMAL, "      h :  This help");
 	PrintAndLogEx(NORMAL, "      1 : (optional) stop after reading a single card");
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Examples:");
@@ -36,7 +36,7 @@ int usage_lf_awid_sim(void) {
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Usage:  lf awid sim [h] <format> <facility-code> <card-number>");
 	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "                h :  This help");	
+	PrintAndLogEx(NORMAL, "                h :  This help");
 	PrintAndLogEx(NORMAL, "         <format> :  format length 26|34|37|50");
 	PrintAndLogEx(NORMAL, "  <facility-code> :  8|16bit value facility code");
 	PrintAndLogEx(NORMAL, "    <card number> :  16|32-bit value card number");
@@ -53,7 +53,7 @@ int usage_lf_awid_clone(void) {
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Usage:  lf awid clone [h] <format> <facility-code> <card-number> [Q5]");
 	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "                h :  This help");	
+	PrintAndLogEx(NORMAL, "                h :  This help");
 	PrintAndLogEx(NORMAL, "         <format> :  format length 26|34|37|50");
 	PrintAndLogEx(NORMAL, "  <facility-code> :  8|16bit value facility code");
 	PrintAndLogEx(NORMAL, "    <card number> :  16|32-bit value card number");
@@ -77,7 +77,7 @@ int usage_lf_awid_brute(void){
 	PrintAndLogEx(NORMAL, "       f <facility-code> :  8|16bit value facility code");
 	PrintAndLogEx(NORMAL, "       c <cardnumber>    :  (optional) cardnumber to start with, max 65535");
 	PrintAndLogEx(NORMAL, "       d <delay>         :  delay betweens attempts in ms. Default 1000ms");
-	PrintAndLogEx(NORMAL, "       v                 :  verbose logging, show all tries");	
+	PrintAndLogEx(NORMAL, "       v                 :  verbose logging, show all tries");
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Examples:");
 	PrintAndLogEx(NORMAL, "       lf awid brute a 26 f 224");
@@ -89,8 +89,8 @@ int usage_lf_awid_brute(void){
 static bool sendPing(void){
 	UsbCommand ping = {CMD_PING, {1, 2, 3}};
 	SendCommand(&ping);
-	SendCommand(&ping);	
-	SendCommand(&ping);	
+	SendCommand(&ping);
+	SendCommand(&ping);
 	clearCommandBuffer();
 	UsbCommand resp;
 	if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000))
@@ -99,10 +99,10 @@ static bool sendPing(void){
 }
 
 static bool sendTry(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint32_t delay, uint8_t *bits, size_t bs_len, bool verbose){
-	
+
 	if ( verbose )
-		PrintAndLogEx(INFO, "Trying FC: %u; CN: %u", fc, cn);		
-	
+		PrintAndLogEx(INFO, "Trying FC: %u; CN: %u", fc, cn);
+
 	if ( !getAWIDBits(fmtlen, fc, cn, bits)) {
 		PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
 		return false;
@@ -116,7 +116,7 @@ static bool sendTry(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint32_t delay, ui
 	memcpy(c.d.asBytes, bits, bs_len);
 	clearCommandBuffer();
 	SendCommand(&c);
-	
+
 	msleep(delay);
 	sendPing();
 	return true;
@@ -125,15 +125,15 @@ static bool sendTry(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint32_t delay, ui
 //refactored by marshmellow
 int getAWIDBits(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint8_t *bits) {
 
-	// the return bits, preamble 0000 0001 
-	bits[7] = 1;  
-	
+	// the return bits, preamble 0000 0001
+	bits[7] = 1;
+
 	uint8_t pre[66];
 	memset(pre, 0, sizeof(pre));
 
 	// add formatlength
 	num_to_bytebits(fmtlen, 8, pre);
-	
+
 	// add facilitycode, cardnumber and wiegand parity bits
 	switch (fmtlen) {
 		case 26:{
@@ -165,14 +165,14 @@ int getAWIDBits(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint8_t *bits) {
 			break;
 		}
 	}
-	
-	// add AWID 4bit parity 
+
+	// add AWID 4bit parity
 	size_t bitLen = addParity(pre, bits+8, 66, 4, 1);
 
 	if (bitLen != 88) return 0;
-	
+
 	PrintAndLogEx(SUCCESS, "awid raw bits:\n %s \n", sprint_bin(bits, bitLen));
-	
+
 	return 1;
 }
 
@@ -192,7 +192,7 @@ static void verify_values(uint8_t *fmtlen, uint32_t *fc, uint32_t *cn){
 			if ((*cn & 0x3FFFF) != *cn) {
 				*cn &= 0x3FFFF;
 				PrintAndLogEx(INFO, "Card Number Truncated to 18-bits (AWID37): %u", *cn);
-			}			
+			}
 			break;
 		case 34:
 			if ((*fc & 0xFF) != *fc) {
@@ -233,7 +233,7 @@ int CmdAWIDRead_device(const char *Cmd) {
 	UsbCommand c = {CMD_AWID_DEMOD_FSK, {findone, 0, 0}};
 	clearCommandBuffer();
 	SendCommand(&c);
-	return 0;   
+	return 0;
 }
 
 //by marshmellow
@@ -283,7 +283,7 @@ int CmdAWIDDemod(const char *Cmd) {
 	// f = facility code, c = card number
 	// w = wiegand parity
 	// (26 bit format shown)
- 
+
 	//get raw ID before removing parities
 	uint32_t rawLo = bytebits_to_byte(bits + idx + 64, 32);
 	uint32_t rawHi = bytebits_to_byte(bits + idx + 32, 32);
@@ -305,9 +305,9 @@ int CmdAWIDDemod(const char *Cmd) {
 	// bbbbbbbb w ffffffff cccccccccccccccc w xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 	// |26 bit|   |-117--| |-----142------|
     //
-	// 00110010 0 0000111110100000 00000000000100010010100010000111 1 000000000 
+	// 00110010 0 0000111110100000 00000000000100010010100010000111 1 000000000
 	// bbbbbbbb w ffffffffffffffff cccccccccccccccccccccccccccccccc w xxxxxxxxx
-	// |50 bit|   |----4000------| |-----------2248975------------| 
+	// |50 bit|   |----4000------| |-----------2248975------------|
 	// b = format bit len, o = odd parity of last 3 bits
 	// f = facility code, c = card number
 	// w = wiegand parity
@@ -319,7 +319,7 @@ int CmdAWIDDemod(const char *Cmd) {
 	uint8_t fmtLen = bytebits_to_byte(bits, 8);
 
 	switch(fmtLen) {
-		case 26: 
+		case 26:
 			fc = bytebits_to_byte(bits + 9, 8);
 			cardnum = bytebits_to_byte(bits + 17, 16);
 			code1 = bytebits_to_byte(bits + 8,fmtLen);
@@ -329,18 +329,18 @@ int CmdAWIDDemod(const char *Cmd) {
 			fc = bytebits_to_byte(bits + 9, 8);
 			cardnum = bytebits_to_byte(bits + 17, 24);
 			code1 = bytebits_to_byte(bits + 8, (fmtLen-32) );
-			code2 = bytebits_to_byte(bits + 8 + (fmtLen-32), 32);			
-			PrintAndLogEx(SUCCESS, "AWID Found - BitLength: %d, FC: %d, Card: %u - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, code2, rawHi2, rawHi, rawLo);			
+			code2 = bytebits_to_byte(bits + 8 + (fmtLen-32), 32);
+			PrintAndLogEx(SUCCESS, "AWID Found - BitLength: %d, FC: %d, Card: %u - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, code2, rawHi2, rawHi, rawLo);
 			break;
 		case 37:
 			fc = bytebits_to_byte(bits + 9, 13);
 			cardnum = bytebits_to_byte(bits + 22, 18);
 			code1 = bytebits_to_byte(bits + 8, (fmtLen-32) );
-			code2 = bytebits_to_byte(bits + 8 + (fmtLen-32), 32);			
+			code2 = bytebits_to_byte(bits + 8 + (fmtLen-32), 32);
 			PrintAndLogEx(SUCCESS, "AWID Found - BitLength: %d, FC: %d, Card: %u - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, code2, rawHi2, rawHi, rawLo);
 			break;
 		// case 40:
-		// break;		
+		// break;
 		case 50:
 			fc = bytebits_to_byte(bits + 9, 16);
 			cardnum = bytebits_to_byte(bits + 25, 32);
@@ -359,7 +359,7 @@ int CmdAWIDDemod(const char *Cmd) {
 				code1 = bytebits_to_byte(bits + 8, fmtLen);
 				PrintAndLogEx(SUCCESS, "AWID Found - BitLength: %d -unknown BitLength- (%u) - Wiegand: %x, Raw: %08x%08x%08x", fmtLen, cardnum, code1, rawHi2, rawHi, rawLo);
 			}
-			break;		
+			break;
 	}
 
 	PrintAndLogEx(DEBUG, "DEBUG: AWID idx: %d, Len: %d Printing Demod Buffer:", idx, size);
@@ -378,22 +378,22 @@ int CmdAWIDSim(const char *Cmd) {
 
 	char cmdp = param_getchar(Cmd, 0);
 	if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_awid_sim();
-	
+
   	fmtlen = param_get8(Cmd, 0);
-	fc = param_get32ex(Cmd, 1, 0, 10);	
+	fc = param_get32ex(Cmd, 1, 0, 10);
 	cn = param_get32ex(Cmd, 2, 0, 10);
 	if ( !fc || !cn) return usage_lf_awid_sim();
-	
+
 	verify_values(&fmtlen, &fc, &cn);
-	
+
 	PrintAndLogEx(SUCCESS, "Simulating AWID %u -- FC: %u; CN: %u\n", fmtlen, fc, cn);
 	PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation or run another command");
-	
+
 	if (!getAWIDBits(fmtlen, fc, cn, bits)) {
 		PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
 		return 1;
 	}
-	
+
 	uint8_t clk = 50, high = 10, low = 8, invert = 1;
 	uint64_t arg1 = (high << 8) + low;
 	uint64_t arg2 = (invert << 8) + clk;
@@ -402,7 +402,7 @@ int CmdAWIDSim(const char *Cmd) {
 	// arg1 --- fcHigh<<8 + fcLow
 	// arg2 --- Inversion and clk setting
 	// 96   --- Bitstream length: 96-bits == 12 bytes
-	UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}};  
+	UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}};
 	memcpy(c.d.asBytes, bits, size);
 	clearCommandBuffer();
 	SendCommand(&c);
@@ -416,7 +416,7 @@ int CmdAWIDClone(const char *Cmd) {
 	uint8_t bits[96];
 	uint8_t *bs=bits;
 	memset(bs,0,sizeof(bits));
-	
+
 	char cmdp = tolower(param_getchar(Cmd, 0));
 	if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_awid_clone();
 
@@ -425,17 +425,17 @@ int CmdAWIDClone(const char *Cmd) {
 	cn = param_get32ex(Cmd, 2, 0, 10);
 
 	if ( !fc || !cn) return usage_lf_awid_clone();
-	
+
 	if (tolower(param_getchar(Cmd, 3)) == 'q')
 		//t5555 (Q5) BITRATE = (RF-2)/2 (iceman)
 		blocks[0] = T5555_MODULATION_FSK2 | T5555_INVERT_OUTPUT | T5555_SET_BITRATE(50) | 3<<T5555_MAXBLOCK_SHIFT;
 
 	verify_values(&fmtlen, &fc, &cn);
-		
+
 	if ( !getAWIDBits(fmtlen, fc, cn, bs)) {
 		PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
 		return 1;
-	}	
+	}
 
 	blocks[1] = bytebits_to_byte(bs, 32);
 	blocks[2] = bytebits_to_byte(bs + 32, 32);
@@ -443,7 +443,7 @@ int CmdAWIDClone(const char *Cmd) {
 
 	PrintAndLogEx(INFO, "Preparing to clone AWID %u to T55x7 with FC: %u, CN: %u", fmtlen, fc, cn);
 	print_blocks(blocks, 4);
-	
+
 	UsbCommand resp;
 	UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
 
@@ -461,7 +461,7 @@ int CmdAWIDClone(const char *Cmd) {
 }
 
 int CmdAWIDBrute(const char *Cmd) {
-	
+
 	bool errors = false, verbose = false;
 	uint32_t fc = 0, cn = 0, delay = 1000;
 	uint8_t fmtlen = 0;
@@ -469,7 +469,7 @@ int CmdAWIDBrute(const char *Cmd) {
 	size_t size = sizeof(bits);
 	memset(bits, 0x00, size);
 	uint8_t cmdp = 0;
-	
+
 	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
 		switch ( tolower(param_getchar(Cmd, cmdp))) {
 		case 'h':
@@ -481,7 +481,7 @@ int CmdAWIDBrute(const char *Cmd) {
 			cmdp += 2;
 			break;
 		case 'd':
-			// delay between attemps,  defaults to 1000ms. 
+			// delay between attemps,  defaults to 1000ms.
 			delay = param_get32ex(Cmd, cmdp+1, 1000, 10);
 			cmdp += 2;
 			break;
@@ -523,16 +523,16 @@ int CmdAWIDBrute(const char *Cmd) {
 			}
 			break;
 	}
-	
+
 	PrintAndLogEx(SUCCESS, "Bruteforceing AWID %d Reader", fmtlen);
 	PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation or press key");
 
 	uint16_t up = cn;
 	uint16_t down = cn;
-	
+
 	// main loop
 	for (;;){
-	
+
 		if ( IsOffline() ) {
 			PrintAndLogEx(WARNING, "Device offline\n");
 			return  2;
@@ -542,11 +542,11 @@ int CmdAWIDBrute(const char *Cmd) {
 			PrintAndLogEx(INFO, "aborted via keyboard!");
 			return sendPing();
 		}
-		
+
 		// Do one up
 		if ( up < 0xFFFF )
 			if ( !sendTry(fmtlen, fc, up++, delay, bits, size, verbose)) return 1;
-		
+
 		// Do one down  (if cardnumber is given)
 		if ( cn > 1 )
 			if ( down > 1 )
diff --git a/client/cmdlfcotag.c b/client/cmdlfcotag.c
index ff0167938..208355ad8 100644
--- a/client/cmdlfcotag.c
+++ b/client/cmdlfcotag.c
@@ -32,7 +32,7 @@ int CmdCOTAGDemod(const char *Cmd) {
 	uint8_t bits[COTAG_BITS] = {0};
 	size_t bitlen = COTAG_BITS;
 	memcpy(bits, DemodBuffer, COTAG_BITS);
-	
+
 	uint8_t alignPos = 0;
 	int err = manrawdecode(bits, &bitlen, 1, &alignPos);
 	if (err){
@@ -45,18 +45,18 @@ int CmdCOTAGDemod(const char *Cmd) {
 	//got a good demod
 	uint16_t cn = bytebits_to_byteLSBF(bits+1, 16);
 	uint32_t fc = bytebits_to_byteLSBF(bits+1+16, 8);
-	
+
 	uint32_t raw1 = bytebits_to_byteLSBF(bits, 32);
 	uint32_t raw2 = bytebits_to_byteLSBF(bits+32, 32);
 	uint32_t raw3 = bytebits_to_byteLSBF(bits+64, 32);
 	uint32_t raw4 = bytebits_to_byteLSBF(bits+96, 32);
-	
+
 	/*
 	fc 161:   1010 0001 -> LSB 1000 0101
 	cn 33593  1000 0011 0011 1001 -> LSB 1001 1100 1100 0001
         cccc cccc cccc cccc                     ffffffff
 	  0 1001 1100 1100 0001 1000 0101 0000 0000 100001010000000001111011100000011010000010000000000000000000000000000000000000000000000000000000100111001100000110000101000
-        1001 1100 1100 0001                     10000101                                                                                         
+        1001 1100 1100 0001                     10000101
 	*/
 	PrintAndLogEx(SUCCESS, "COTAG Found: FC %u, CN: %u Raw: %08X%08X%08X%08X", fc, cn, raw1 ,raw2, raw3, raw4);
 	return 1;
@@ -65,32 +65,32 @@ int CmdCOTAGDemod(const char *Cmd) {
 // When reading a COTAG.
 // 0 = HIGH/LOW signal - maxlength bigbuff
 // 1 = translation for HI/LO into bytes with manchester 0,1 - length 300
-// 2 = raw signal -  maxlength bigbuff		
+// 2 = raw signal -  maxlength bigbuff
 int CmdCOTAGRead(const char *Cmd) {
-	
+
 	if (Cmd[0] == 'h' || Cmd[0] == 'H') return usage_lf_cotag_read();
-	
+
 	uint32_t rawsignal = 1;
 	sscanf(Cmd, "%u", &rawsignal);
- 
+
 	UsbCommand c = {CMD_COTAG, {rawsignal, 0, 0}};
 	clearCommandBuffer();
 	SendCommand(&c);
 	if ( !WaitForResponseTimeout(CMD_ACK, NULL, 7000) ) {
 		PrintAndLogEx(WARNING, "command execution time out");
-		return -1;	
+		return -1;
 	}
-	
+
 	switch ( rawsignal ){
-		case 0: 
+		case 0:
 		case 2: {
 			CmdPlot("");
 			CmdGrid("384");
-			getSamples(0, true); 
+			getSamples(0, true);
 			break;
 		}
 		case 1: {
-			
+
 			if ( !GetFromDevice(BIG_BUF, DemodBuffer, COTAG_BITS, 0, NULL, 1000, false)) {
 				PrintAndLogEx(WARNING, "timeout while waiting for reply.");
 				return -1;
@@ -98,7 +98,7 @@ int CmdCOTAGRead(const char *Cmd) {
 			DemodBufferLen = COTAG_BITS;
 			return CmdCOTAGDemod("");
 		}
-	}	
+	}
 	return 0;
 }
 
diff --git a/client/cmdlfcotag.h b/client/cmdlfcotag.h
index e03f7d5f5..9270ccbb7 100644
--- a/client/cmdlfcotag.h
+++ b/client/cmdlfcotag.h
@@ -17,7 +17,7 @@
 #include "cmdparser.h"  // CmdsParse, CmdsHelp
 #include "comms.h"
 #include "ui.h"			// PrintAndLog
-#include "cmdlf.h"		// Setconfig 
+#include "cmdlf.h"		// Setconfig
 
 #ifndef COTAG_BITS
 #define COTAG_BITS 264
diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 8b9530957..3024470de 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -130,7 +130,7 @@ int usage_lf_em4x50_write(void) {
 	PrintAndLogEx(NORMAL, "Options:");
 	PrintAndLogEx(NORMAL, "       h         - this help");
 	PrintAndLogEx(NORMAL, "       address   - memory address to write to. (0-15)");
-	PrintAndLogEx(NORMAL, "       data      - data to write (hex)");	
+	PrintAndLogEx(NORMAL, "       data      - data to write (hex)");
 	PrintAndLogEx(NORMAL, "       pwd       - password (hex) (optional)");
 	PrintAndLogEx(NORMAL, "Examples:");
 	PrintAndLogEx(NORMAL, "      lf em 4x50_write 1 deadc0de");
@@ -171,7 +171,7 @@ int usage_lf_em4x05_write(void) {
 	PrintAndLogEx(NORMAL, "Options:");
 	PrintAndLogEx(NORMAL, "       h         - this help");
 	PrintAndLogEx(NORMAL, "       address   - memory address to write to. (0-15)");
-	PrintAndLogEx(NORMAL, "       data      - data to write (hex)");	
+	PrintAndLogEx(NORMAL, "       data      - data to write (hex)");
 	PrintAndLogEx(NORMAL, "       pwd       - password (hex) (optional)");
 	PrintAndLogEx(NORMAL, "Examples:");
 	PrintAndLogEx(NORMAL, "      lf em 4x05_write 1 deadc0de");
@@ -251,7 +251,7 @@ void ConstructEM410xEmulGraph(const char *uid,const  uint8_t clock) {
 void printEM410x(uint32_t hi, uint64_t id) {
 
 	if (!id && !hi) return;
-	
+
 	PrintAndLogEx(NORMAL, "EM410x %s pattern found", (hi) ? "XL" : "" );
 
 	uint64_t iii=1;
@@ -263,7 +263,7 @@ void printEM410x(uint32_t hi, uint64_t id) {
 			id2lo=(id2lo<<1LL) | ((id & (iii << (i+((ii-1)*8)))) >> (i+((ii-1)*8)));
 		}
 	}
-	
+
 	if (hi){
 		//output 88 bit em id
 		PrintAndLogEx(NORMAL, "\nEM TAG ID      : %06X%016" PRIX64, hi, id);
@@ -294,12 +294,12 @@ void printEM410x(uint32_t hi, uint64_t id) {
 			(id2lo & 0x000000000f)
 		);
 		uint64_t paxton = (((id>>32) << 24) | (id & 0xffffff))  + 0x143e00;
-		PrintAndLogEx(NORMAL, "}\nOther          : %05" PRIu64 "_%03" PRIu64 "_%08" PRIu64, (id&0xFFFF), ((id>>16LL) & 0xFF), (id & 0xFFFFFF));  
+		PrintAndLogEx(NORMAL, "}\nOther          : %05" PRIu64 "_%03" PRIu64 "_%08" PRIu64, (id&0xFFFF), ((id>>16LL) & 0xFF), (id & 0xFFFFFF));
 		PrintAndLogEx(NORMAL, "Pattern Paxton : %" PRIu64 " [0x%" PRIX64 "]", paxton, paxton);
 
 		uint32_t p1id = (id & 0xFFFFFF);
 		uint8_t arr[32] = {0x00};
-		int i =0; 
+		int i =0;
 		int j = 23;
 		for (; i < 24; ++i, --j	){
 			arr[i] = (p1id >> i) & 1;
@@ -311,12 +311,12 @@ void printEM410x(uint32_t hi, uint64_t id) {
 		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;
@@ -355,12 +355,12 @@ void printEM410x(uint32_t hi, uint64_t id) {
 int AskEm410xDecode(bool verbose, uint32_t *hi, uint64_t *lo ) {
 	size_t idx = 0;
 	uint8_t bits[512] = {0};
-	size_t size = sizeof(bits);	
+	size_t size = sizeof(bits);
 	if ( !getDemodBuf(bits, &size) ) {
 		PrintAndLogEx(DEBUG, "DEBUG: Error - Em410x problem during copy from ASK demod");
 		return 0;
 	}
-	
+
 	int ans = Em410xDecode(bits, &size, &idx, hi, lo);
 	if ( ans < 0){
 
@@ -379,13 +379,13 @@ int AskEm410xDecode(bool verbose, uint32_t *hi, uint64_t *lo ) {
 		PrintAndLogEx(DEBUG, "DEBUG: Error - Em410x decoded to all zeros");
 		return 0;
 	}
-		
+
 	//set GraphBuffer for clone or sim command
 	setDemodBuf(DemodBuffer, (size==40) ? 64 : 128, idx+1);
 	setClockGrid(g_DemodClock, g_DemodStartIdx + ((idx+1)*g_DemodClock));
-	
+
 	PrintAndLogEx(DEBUG, "DEBUG: Em410x idx: %d, Len: %d, Printing Demod Buffer:", idx, size);
-	if (g_debugMode)		
+	if (g_debugMode)
 		printDemodBuff();
 
 	if (verbose)
@@ -422,12 +422,12 @@ int CmdEM410xRead_device(const char *Cmd) {
 int CmdEM410xDemod(const char *Cmd) {
 	char cmdp = tolower(param_getchar(Cmd, 0));
 	if (strlen(Cmd) > 10 || cmdp == 'h') return usage_lf_em410x_demod();
-	
+
 	uint32_t hi = 0;
 	uint64_t lo = 0;
 
 	if (AskEm410xDemod(Cmd, &hi, &lo, true) != 1) return 0;
-	
+
 	g_em410xid = lo;
 	return 1;
 }
@@ -446,14 +446,14 @@ int CmdEM410xSim(const char *Cmd) {
 		PrintAndLogEx(FAILED, "UID must include 10 HEX symbols");
 		return 0;
 	}
-	
+
 	param_getdec(Cmd, 1, &clock);
-	
+
 	PrintAndLogEx(SUCCESS, "Starting simulating UID %02X%02X%02X%02X%02X  clock: %d", uid[0],uid[1],uid[2],uid[3],uid[4],clock);
 	PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation");
 
 	ConstructEM410xEmulGraph(Cmd, clock);
- 
+
 	CmdLFSim("0"); //240 start_gap.
 	return 0;
 }
@@ -470,10 +470,10 @@ int CmdEM410xBrute(const char *Cmd) {
 	uint8_t clock = 64;
 	/* default pause time: 1 second */
 	uint32_t delay = 1000;
-	
+
 	char cmdp = tolower(param_getchar(Cmd, 0));
 	if (cmdp == 'h') return usage_lf_em410x_brute();
-	
+
 	cmdp = tolower(param_getchar(Cmd, 1));
 	if (cmdp == 'd') {
 		delay = param_get32ex(Cmd, 2, 1000, 10);
@@ -483,12 +483,12 @@ int CmdEM410xBrute(const char *Cmd) {
 		delay = param_get32ex(Cmd, 4, 1000, 10);
 	}
 
-	int filelen = param_getstr(Cmd, 0, filename, FILE_PATH_SIZE);	
+	int filelen = param_getstr(Cmd, 0, filename, FILE_PATH_SIZE);
 	if (filelen == 0) {
 		PrintAndLogEx(WARNING, "Error: Please specify a filename");
-		return 1;		
+		return 1;
 	}
-	
+
 	if ((f = fopen(filename, "r")) == NULL) {
 		PrintAndLogEx(WARNING, "Error: Could not open UIDs file [%s]", filename);
 		return 1;
@@ -499,23 +499,23 @@ int CmdEM410xBrute(const char *Cmd) {
 		fclose(f);
 		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)) {
 			PrintAndLogEx(FAILED, "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) {
@@ -531,50 +531,50 @@ int CmdEM410xBrute(const char *Cmd) {
 		uidcnt++;
 	  	memset(buf, 0, sizeof(buf));
 	}
-	
+
 	fclose(f);
-	
+
 	if (uidcnt == 0) {
 		PrintAndLogEx(FAILED, "No UIDs found in file");
 		free(uidBlock);
 		return 1;
 	}
-	
+
 	PrintAndLogEx(SUCCESS, "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()) {
 			int gc = getchar(); (void)gc;
 			PrintAndLogEx(NORMAL, "\nAborted via keyboard!\n");
 			free(uidBlock);
 			return 0;
 		}
-				
+
 		sprintf(testuid, "%010" PRIX64, bytes_to_num(uidBlock + 5*c, 5));
 		PrintAndLogEx(NORMAL, "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
@@ -585,19 +585,19 @@ int CmdEM410xWatch(const char *Cmd) {
 			int gc = getchar(); (void)gc;
 			PrintAndLogEx(NORMAL, "\naborted via keyboard!\n");
 			break;
-		}		
+		}
 		lf_read(true, 8201);
-		
+
 	} while (!CmdEM410xRead(""));
 	return 0;
 }
 
 //currently only supports manchester modulations
 int CmdEM410xWatchnSpoof(const char *Cmd) {
-	
+
 	char cmdp = tolower(param_getchar(Cmd, 0));
 	if (cmdp == 'h') return usage_lf_em410x_ws();
-	
+
 	// loops if the captured ID was in XL-format.
 	CmdEM410xWatch(Cmd);
 	PrintAndLogEx(SUCCESS, "# Replaying captured ID: %010" PRIx64 , g_em410xid);
@@ -608,7 +608,7 @@ int CmdEM410xWatchnSpoof(const char *Cmd) {
 int CmdEM410xWrite(const char *Cmd) {
 	char cmdp = param_getchar(Cmd, 0);
 	if (cmdp == 'h' || cmdp == 'H') return usage_lf_em410x_write();
-	
+
 	uint64_t id = 0xFFFFFFFFFFFFFFFF; // invalid id value
 	int card = 0xFF; // invalid card value
 	uint32_t clock = 0; // invalid clock value
@@ -699,14 +699,14 @@ bool EM_ByteParityTest(uint8_t *BitStream, size_t size, uint8_t rows, uint8_t co
 // 012345678|r3
 // 012345678|r4
 // ------------
-//c012345678| 0  
+//c012345678| 0
 //            |- must be zero
 
 bool EMwordparitytest(uint8_t *bits){
 
 	// last row/col parity must be 0
 	if (bits[44] != 0 ) return false;
-	
+
 	// col parity check
 	uint8_t c1 = bytebits_to_byte(bits, 8) ^ bytebits_to_byte(bits+9, 8) ^ bytebits_to_byte(bits+18, 8) ^ bytebits_to_byte(bits+27, 8);
 	uint8_t c2 = bytebits_to_byte(bits+36, 8);
@@ -718,8 +718,8 @@ bool EMwordparitytest(uint8_t *bits){
 
 		rowP ^= bits[i];
 		if ( i>0 && (i % 9) == 0) {
-			
-			if ( rowP != EVEN )	
+
+			if ( rowP != EVEN )
 				return false;
 
 			rowP = 0;
@@ -733,12 +733,12 @@ bool EMwordparitytest(uint8_t *bits){
 
 uint32_t OutputEM4x50_Block(uint8_t *BitStream, size_t size, bool verbose, bool pTest) {
 	if (size<45) return 0;
-	
+
 	uint32_t code = bytebits_to_byte(BitStream,8);
 	code = code<<8 | bytebits_to_byte(BitStream+9,8);
 	code = code<<8 | bytebits_to_byte(BitStream+18,8);
 	code = code<<8 | bytebits_to_byte(BitStream+27,8);
-	
+
 	if (verbose || g_debugMode){
 		for (uint8_t i = 0; i<5; i++){
 			if (i == 4) PrintAndLogEx(NORMAL, ""); //parity byte spacer
@@ -797,11 +797,11 @@ int EM4x50Read(const char *Cmd, bool verbose) {
 
 	// get user entry if any
 	sscanf(Cmd, "%i %i", &clk, &invert);
-	
+
 	uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
 	size_t size = getFromGraphBuf(bits);
 	computeSignalProperties(bits, size);
-	
+
 	signal_t *sp = getSignalProperties();
 	high = sp->high;
 	low = sp->low;
@@ -835,7 +835,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;
 			}
@@ -863,12 +863,12 @@ 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;
-	
+
 	// now do it again to find the end
 	end = skip;
 	for (i += 3; i < j - 4 ; ++i) {
@@ -894,12 +894,12 @@ int EM4x50Read(const char *Cmd, bool verbose) {
 			return 0;
 		}
 	} else if (start < 0) return 0;
-	
+
 	start = skip;
 	snprintf(tmp2, sizeof(tmp2),"%d %d 1000 %d", clk, invert, clk * 47);
-	// save GraphBuffer - to restore it later	
+	// save GraphBuffer - to restore it later
 	save_restoreGB(GRAPH_SAVE);
-	// get rid of leading crap 
+	// get rid of leading crap
 	snprintf(tmp, sizeof(tmp), "%i", skip);
 	CmdLtrim(tmp);
 	bool pTest;
@@ -910,7 +910,7 @@ int EM4x50Read(const char *Cmd, bool verbose) {
 	while (block < 6) {
 		if (verbose || g_debugMode) PrintAndLogEx(NORMAL, "\nBlock %i:", block);
 		skip = phaseoff;
-		
+
 		// look for LW before start of next block
 		for ( ; i < j - 4 ; ++i) {
 			skip += tmpbuff[i];
@@ -924,9 +924,9 @@ int EM4x50Read(const char *Cmd, bool verbose) {
 			phaseoff = tmpbuff[i+1] - clk;
 		else
 			phaseoff = 0;
-		
+
 		i += 2;
-		
+
 		if (ASKDemod(tmp2, false, false, 1) < 1) {
 			save_restoreGB(GRAPH_RESTORE);
 			return 0;
@@ -934,7 +934,7 @@ int EM4x50Read(const char *Cmd, bool verbose) {
 		//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
@@ -953,7 +953,7 @@ int EM4x50Read(const char *Cmd, bool verbose) {
 			PrintAndLogEx(NORMAL, "Partial data - no end found!");
 			PrintAndLogEx(NORMAL, "Try again with more samples.");
 		}
-		PrintAndLogEx(NORMAL, "Found data at sample: %i - using clock: %i", start, clk);    
+		PrintAndLogEx(NORMAL, "Found data at sample: %i - using clock: %i", start, clk);
 		end = block;
 		for (block=0; block < end; block++){
 			PrintAndLogEx(NORMAL, "Block %d: %08x", block, Code[block]);
@@ -973,7 +973,7 @@ int EM4x50Read(const char *Cmd, bool verbose) {
 
 int CmdEM4x50Read(const char *Cmd) {
 	uint8_t ctmp = tolower(param_getchar(Cmd, 0));
-	if ( ctmp == 'h' ) return usage_lf_em4x50_read();	
+	if ( ctmp == 'h' ) return usage_lf_em4x50_read();
 	return EM4x50Read(Cmd, true);
 }
 int CmdEM4x50Write(const char *Cmd){
@@ -992,7 +992,7 @@ int CmdEM4x50Dump(const char *Cmd){
 #define EM_PREAMBLE_LEN 6
 // download samples from device and copy to Graphbuffer
 bool downloadSamplesEM(){
-	
+
 	// 8 bit preamble + 32 bit word response (max clock (128) * 40bits = 5120 samples)
 	uint8_t got[6000];
 	if ( !GetFromDevice(BIG_BUF, got, sizeof(got), 0, NULL, 2500, false)) {
@@ -1011,9 +1011,9 @@ bool downloadSamplesEM(){
 	return true;
 }
 
-// em_demod 
+// em_demod
 bool doPreambleSearch(size_t *startIdx){
-	
+
 	// sanity check
 	if ( DemodBufferLen < EM_PREAMBLE_LEN) {
 		PrintAndLogEx(DEBUG, "DEBUG: Error - EM4305 demodbuffer too small");
@@ -1022,14 +1022,14 @@ bool doPreambleSearch(size_t *startIdx){
 
 	// set size to 20 to only test first 14 positions for the preamble
 	size_t size = (20 > DemodBufferLen) ? DemodBufferLen : 20;
-	*startIdx = 0; 
+	*startIdx = 0;
 	// skip first two 0 bits as they might have been missed in the demod
 	uint8_t preamble[EM_PREAMBLE_LEN] = {0,0,1,0,1,0};
-	
+
 	if ( !preambleSearchEx(DemodBuffer, preamble, EM_PREAMBLE_LEN, &size, startIdx, true)) {
 		PrintAndLogEx(DEBUG, "DEBUG: Error - EM4305 preamble not found :: %d", *startIdx);
 		return false;
-	} 
+	}
 	return true;
 }
 
@@ -1048,7 +1048,7 @@ bool detectFSK(){
 	return true;
 }
 // PSK clocks should be easy to detect ( but difficult to demod a non-repeating pattern... )
-bool detectPSK(){	
+bool detectPSK(){
 	int	ans = GetPskClock("", false);
 	if (ans <= 0) {
 		PrintAndLogEx(DEBUG, "DEBUG: Error - EM: PSK clock failed");
@@ -1077,14 +1077,14 @@ bool detectASK_MAN(){
 	if ( !ASKDemod_ext("0 0 0", false, false, 1, &stcheck) ) {
 		PrintAndLogEx(DEBUG, "DEBUG: Error - EM: ASK/Manchester Demod failed");
 		return false;
-	} 
+	}
 	return true;
 }
 bool detectASK_BI(){
 	int ans = ASKbiphaseDemod("0 0 1", false);
-	if (!ans) { 
+	if (!ans) {
 		PrintAndLogEx(DEBUG, "DEBUG: Error - EM: ASK/biphase normal demod failed");
-		
+
 		ans = ASKbiphaseDemod("0 1 1", false);
 		if (!ans) {
 			PrintAndLogEx(DEBUG, "DEBUG: Error - EM: ASK/biphase inverted demod failed");
@@ -1104,8 +1104,8 @@ bool setDemodBufferEM(uint32_t *word, size_t idx){
 		PrintAndLogEx(DEBUG, "DEBUG: Error - EM Parity tests failed");
 		return false;
 	}
-		   
-    // test for even parity bits and remove them. (leave out the end row of parities so 36 bits)	
+
+    // test for even parity bits and remove them. (leave out the end row of parities so 36 bits)
 	if (!removeParity(DemodBuffer, idx + EM_PREAMBLE_LEN, 9, 0, 36)) {
 		PrintAndLogEx(DEBUG, "DEBUG: Error - EM, failed removing parity");
 		return false;
@@ -1115,25 +1115,25 @@ bool setDemodBufferEM(uint32_t *word, size_t idx){
 	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...
 bool demodEM4x05resp(uint32_t *word) {
-	size_t idx = 0;	
+	size_t idx = 0;
 	*word = 0;
 	if (detectASK_MAN() && doPreambleSearch( &idx ))
 		return setDemodBufferEM(word, idx);
-	
+
 	if (detectASK_BI() && doPreambleSearch( &idx ))
 		return setDemodBufferEM(word, idx);
-	
+
 	if (detectFSK() && doPreambleSearch( &idx ))
 		return setDemodBufferEM(word, idx);
-	
+
 	if (detectPSK()) {
 		if (doPreambleSearch( &idx ))
 			return setDemodBufferEM(word, idx);
-		
+
 		psk1TOpsk2(DemodBuffer, DemodBufferLen);
 		if (doPreambleSearch( &idx ))
 			return setDemodBufferEM(word, idx);
@@ -1146,7 +1146,7 @@ int EM4x05ReadWord_ext(uint8_t addr, uint32_t pwd, bool usePwd, uint32_t *word)
 	UsbCommand c = {CMD_EM4X_READ_WORD, {addr, pwd, usePwd}};
 	clearCommandBuffer();
 	SendCommand(&c);
-	UsbCommand resp;	
+	UsbCommand resp;
 	if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)){
 		PrintAndLogEx(DEBUG, "Command timed out");
 		return -1;
@@ -1154,7 +1154,7 @@ int EM4x05ReadWord_ext(uint8_t addr, uint32_t pwd, bool usePwd, uint32_t *word)
 	if ( !downloadSamplesEM() ) {
 		return -1;
 	}
-	
+
 	return demodEM4x05resp(word);
 }
 
@@ -1167,7 +1167,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;
 
@@ -1176,7 +1176,7 @@ int CmdEM4x05Dump(const char *Cmd) {
 	PrintAndLogEx(NORMAL, "Addr | data   | ascii");
 	PrintAndLogEx(NORMAL, "-----+--------+------");
 	for (; addr < 16; addr++) {
-		
+
 		if (addr == 2) {
 			if (usePwd) {
 				PrintAndLogEx(NORMAL, " %02u | %08X", addr, pwd, word );
@@ -1200,7 +1200,7 @@ int CmdEM4x05Read(const char *Cmd) {
 
 	addr = param_get8ex(Cmd, 0, 50, 10);
 	pwd =  param_get32ex(Cmd, 1, 1, 16);
-	
+
 	if (addr > 15) {
 		PrintAndLogEx(NORMAL, "Address must be between 0 and 15");
 		return 1;
@@ -1211,7 +1211,7 @@ int CmdEM4x05Read(const char *Cmd) {
 		usePwd = true;
 		PrintAndLogEx(NORMAL, "Reading address %02u | password %08X", addr, pwd);
 	}
-	
+
 	uint32_t word = 0;
 	int isOk = EM4x05ReadWord_ext(addr, pwd, usePwd, &word);
 	if (isOk)
@@ -1224,38 +1224,38 @@ int CmdEM4x05Read(const char *Cmd) {
 int CmdEM4x05Write(const char *Cmd) {
 	uint8_t ctmp = param_getchar(Cmd, 0);
 	if ( strlen(Cmd) == 0 || ctmp == 'H' || ctmp == 'h' ) return usage_lf_em4x05_write();
-	
-	bool usePwd = false;		
+
+	bool usePwd = false;
 	uint8_t addr = 50; // default to invalid address
 	uint32_t data = 0; // default to blank data
 	uint32_t pwd = 1; // default to blank password
-	
+
 	addr = param_get8ex(Cmd, 0, 50, 10);
 	data = param_get32ex(Cmd, 1, 0, 16);
 	pwd =  param_get32ex(Cmd, 2, 1, 16);
-	
+
 	if ( addr > 15 ) {
 		PrintAndLogEx(NORMAL, "Address must be between 0 and 15");
 		return 1;
 	}
 	if ( pwd == 1 )
-		PrintAndLogEx(NORMAL, "Writing address %d data %08X", addr, data);	
+		PrintAndLogEx(NORMAL, "Writing address %d data %08X", addr, data);
 	else {
 		usePwd = true;
-		PrintAndLogEx(NORMAL, "Writing address %d data %08X using password %08X", addr, data, pwd);		
+		PrintAndLogEx(NORMAL, "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)){
 		PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
 		return -1;
 	}
-	
+
 	if (!downloadSamplesEM())
 		return -1;
 
@@ -1265,7 +1265,7 @@ int CmdEM4x05Write(const char *Cmd) {
 	if (isOk)
 		PrintAndLogEx(NORMAL, "Write Verified");
 	else
-		PrintAndLogEx(NORMAL, "Write could not be verified");	
+		PrintAndLogEx(NORMAL, "Write could not be verified");
 	return isOk;
 }
 
@@ -1325,10 +1325,10 @@ void printEM4x05config(uint32_t wordData) {
 	PrintAndLogEx(NORMAL, "    PSK CF:   %u | %s", PSKcf, cf);
 	PrintAndLogEx(NORMAL, "     Delay:   %u | %s", delay, cdelay);
 	PrintAndLogEx(NORMAL, " LastWordR:  %02u | Address of last word for default read - meaning %u blocks are output", LWR, numblks);
-	PrintAndLogEx(NORMAL, " ReadLogin:   %u | Read Login is %s", readLogin, readLogin ? "Required" : "Not Required");	
-	PrintAndLogEx(NORMAL, "   ReadHKL:   %u | Read Housekeeping Words Login is %s", readHKL, readHKL ? "Required" : "Not Required");	
-	PrintAndLogEx(NORMAL, "WriteLogin:   %u | Write Login is %s", writeLogin, writeLogin ? "Required" : "Not Required");	
-	PrintAndLogEx(NORMAL, "  WriteHKL:   %u | Write Housekeeping Words Login is %s", writeHKL, writeHKL ? "Required" : "Not Required");	
+	PrintAndLogEx(NORMAL, " ReadLogin:   %u | Read Login is %s", readLogin, readLogin ? "Required" : "Not Required");
+	PrintAndLogEx(NORMAL, "   ReadHKL:   %u | Read Housekeeping Words Login is %s", readHKL, readHKL ? "Required" : "Not Required");
+	PrintAndLogEx(NORMAL, "WriteLogin:   %u | Write Login is %s", writeLogin, writeLogin ? "Required" : "Not Required");
+	PrintAndLogEx(NORMAL, "  WriteHKL:   %u | Write Housekeeping Words Login is %s", writeHKL, writeHKL ? "Required" : "Not Required");
 	PrintAndLogEx(NORMAL, "    R.A.W.:   %u | Read After Write is %s", raw, raw ? "On" : "Off");
 	PrintAndLogEx(NORMAL, "   Disable:   %u | Disable Command is %s", disable, disable ? "Accepted" : "Not Accepted");
 	PrintAndLogEx(NORMAL, "    R.T.F.:   %u | Reader Talk First is %s", rtf, rtf ? "Enabled" : "Disabled");
@@ -1336,11 +1336,11 @@ void printEM4x05config(uint32_t wordData) {
 }
 
 void printEM4x05info(uint32_t block0, uint32_t serial) {
-		
+
 	uint8_t chipType = (block0 >> 1) & 0xF;
 	uint8_t cap = (block0 >> 5) & 3;
 	uint16_t custCode = (block0 >> 9) & 0x3FF;
-	
+
 	switch (chipType) {
 		case 9:  PrintAndLogEx(NORMAL, "\n Chip Type:   %u | EM4305", chipType); break;
 		case 8:  PrintAndLogEx(NORMAL, "\n Chip Type:   %u | EM4205", chipType); break;
@@ -1366,7 +1366,7 @@ void printEM4x05info(uint32_t block0, uint32_t serial) {
 void printEM4x05ProtectionBits(uint32_t word) {
 	for (uint8_t i = 0; i < 15; i++) {
 		PrintAndLogEx(NORMAL, "      Word:  %02u | %s", i, (((1 << i) & word ) || i < 2) ? "Is Write Locked" : "Is Not Write Locked");
-		if (i==14) 
+		if (i==14)
 			PrintAndLogEx(NORMAL, "      Word:  %02u | %s", i+1, (((1 << i) & word ) || i < 2) ? "Is Write Locked" : "Is Not Write Locked");
 	}
 }
@@ -1390,25 +1390,25 @@ 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 ( !EM4x05IsBlock0(&block0) ) 
+	if ( !EM4x05IsBlock0(&block0) )
 		return -1;
-	
+
 	// read word 1 (serial #) doesn't need pwd
 	// continue if failed, .. non blocking fail.
 	EM4x05ReadWord_ext(EM_SERIAL_BLOCK, 0, false, &serial);
 	printEM4x05info(block0, serial);
 
-	// read word 4 (config block) 
+	// read word 4 (config block)
 	// needs password if one is set
 	if ( EM4x05ReadWord_ext(EM_CONFIG_BLOCK, pwd, usePwd, &word) != 1 )
 		return 0;
-	
+
 	printEM4x05config(word);
 
 	// read word 14 and 15 to see which is being used for the protection bits
@@ -1428,8 +1428,8 @@ int CmdEM4x05Info(const char *Cmd) {
 
 static command_t CommandTable[] = {
 	{"help", 		CmdHelp, 			1, "This help"},
-	//{"410x_demod",	CmdEMdemodASK, 		0, "Extract ID from EM410x tag on antenna)"},  
-	{"410x_demod",	CmdEM410xDemod, 	0, "demodulate a EM410x tag from the GraphBuffer"},  
+	//{"410x_demod",	CmdEMdemodASK, 		0, "Extract ID from EM410x tag on antenna)"},
+	{"410x_demod",	CmdEM410xDemod, 	0, "demodulate a EM410x tag from the GraphBuffer"},
 	{"410x_read",	CmdEM410xRead, 		1, "attempt to read and extract tag data"},
 	{"410x_sim",	CmdEM410xSim, 		0, "simulate EM410x tag"},
 	{"410x_brute",  CmdEM410xBrute,		0, "reader bruteforce attack by simulating EM410x tags"},
diff --git a/client/cmdlfem4x.h b/client/cmdlfem4x.h
index 676c6fd6b..7a8186e6a 100644
--- a/client/cmdlfem4x.h
+++ b/client/cmdlfem4x.h
@@ -50,7 +50,7 @@ extern void printEM410x(uint32_t hi, uint64_t id);
 extern int AskEm410xDecode(bool verbose, uint32_t *hi, uint64_t *lo );
 extern int AskEm410xDemod(const char *Cmd, uint32_t *hi, uint64_t *lo, bool verbose);
 
-extern int usage_lf_em410x_sim(void);  
+extern int usage_lf_em410x_sim(void);
 extern int usage_lf_em410x_ws(void);
 extern int usage_lf_em410x_clone(void);
 extern int usage_lf_em410x_sim(void);
diff --git a/client/cmdlffdx.c b/client/cmdlffdx.c
index 4f867b038..c87f40ba4 100644
--- a/client/cmdlffdx.c
+++ b/client/cmdlffdx.c
@@ -18,8 +18,8 @@
 	COUNTRY CODE (ISO3166) or http://cms.abvma.ca/uploads/ManufacturersISOsandCountryCodes.pdf
 	FLAG (animal/non-animal)
 
-	38 IDbits   
-	10 country code 
+	38 IDbits
+	10 country code
 	1 extra app bit
 	14 reserved bits
 	1 animal bit
@@ -78,12 +78,12 @@ int detectFDXB(uint8_t *dest, size_t *size) {
 	return (int)startIdx;
 }
 
-// clearing the topbit needed for the preambl detection. 
+// clearing the topbit needed for the preambl detection.
 static void verify_values(uint32_t countryid, uint64_t animalid){
 	if ((animalid & 0x3FFFFFFFFF) != animalid) {
 		animalid &= 0x3FFFFFFFFF;
 		PrintAndLogEx(INFO, "Animal ID Truncated to 38bits: %"PRIx64, animalid);
-	}	
+	}
 	if ( (countryid & 0x3ff) != countryid ) {
 		countryid &= 0x3ff;
 		PrintAndLogEx(INFO, "Country ID Truncated to 10bits: %03d", countryid);
@@ -95,31 +95,31 @@ int getFDXBits(uint64_t national_id, uint16_t country, uint8_t isanimal, uint8_t
     // add preamble ten 0x00 and one 0x01
     memset(bits, 0x00, 10);
 	bits[10] = 1;
-	
+
 	// 128bits
     // every 9th bit is 0x01, but we can just fill the rest with 0x01 and overwrite
 	memset(bits, 0x01, 128);
-	
+
     // add preamble ten 0x00 and one 0x01
     memset(bits, 0x00, 10);
 
-	// add reserved 
+	// add reserved
 	num_to_bytebitsLSBF(0x00, 7, bits + 66);
 	num_to_bytebitsLSBF(0x00 >> 7, 7, bits + 74);
 
 	// add animal flag - OK
 	bits[65] = isanimal;
-	
+
 	// add extended flag - OK
 	bits[81] = isextended;
-	
+
 	// add national code 40bits - OK
 	num_to_bytebitsLSBF(national_id >> 0, 8, bits+11);
 	num_to_bytebitsLSBF(national_id >> 8, 8, bits+20);
 	num_to_bytebitsLSBF(national_id >> 16, 8, bits+29);
 	num_to_bytebitsLSBF(national_id >> 24, 8, bits+38);
 	num_to_bytebitsLSBF(national_id >> 32, 6, bits+47);
-	
+
 	// add country code - OK
 	num_to_bytebitsLSBF(country >> 0, 2, bits+53);
 	num_to_bytebitsLSBF(country >> 2, 8, bits+56);
@@ -128,11 +128,11 @@ int getFDXBits(uint64_t national_id, uint16_t country, uint8_t isanimal, uint8_t
 	uint8_t raw[8];
 	for (uint8_t i=0; i<8; ++i)
 		raw[i] = bytebits_to_byte(bits + 11 + i * 9, 8);
-		
+
 	uint16_t crc = crc16_kermit(raw, 8);
 	num_to_bytebitsLSBF(crc >> 0, 8, bits+83);
 	num_to_bytebitsLSBF(crc >> 8, 8, bits+92);
-	
+
 	// extended data - OK
 	num_to_bytebitsLSBF( extended >> 0 , 8, bits+101);
 	num_to_bytebitsLSBF( extended >> 8 , 8, bits+110);
@@ -147,8 +147,8 @@ int getFDXBits(uint64_t national_id, uint16_t country, uint8_t isanimal, uint8_t
 // COUNTRY CODE (ISO3166) or http://cms.abvma.ca/uploads/ManufacturersISOsandCountryCodes.pdf
 // FLAG (animal/non-animal)
 /*
-38 IDbits   
-10 country code 
+38 IDbits
+10 country code
 1 extra app bit
 14 reserved bits
 1 animal bit
@@ -161,11 +161,11 @@ int CmdFDXBdemodBI(const char *Cmd){
 
 	int clk = 32;
 	int invert = 1, errCnt = 0, offset = 0, maxErr = 0;
-	uint8_t bs[MAX_DEMOD_BUF_LEN];	
-	size_t size = getFromGraphBuf(bs);	
-	
+	uint8_t bs[MAX_DEMOD_BUF_LEN];
+	size_t size = getFromGraphBuf(bs);
+
 	errCnt = askdemod(bs, &size, &clk, &invert, maxErr, 0, 0);
-	if ( errCnt < 0 || errCnt > maxErr ) { 
+	if ( errCnt < 0 || errCnt > maxErr ) {
 		PrintAndLogEx(DEBUG, "DEBUG: Error - FDXB no data or error found %d, clock: %d", errCnt, clk);
 		return 0;
 	}
@@ -174,8 +174,8 @@ int CmdFDXBdemodBI(const char *Cmd){
 	if (errCnt < 0 || errCnt > maxErr ) {
 		PrintAndLogEx(DEBUG, "DEBUG: Error - FDXB BiphaseRawDecode: %d", errCnt);
 		return 0;
-	} 
-	
+	}
+
 	int preambleIndex = detectFDXB(bs, &size);
 	if (preambleIndex < 0){
 		PrintAndLogEx(DEBUG, "DEBUG: Error - FDXB preamble not found :: %d",preambleIndex);
@@ -185,7 +185,7 @@ int CmdFDXBdemodBI(const char *Cmd){
 		PrintAndLogEx(DEBUG, "DEBUG: Error - FDXB incorrect data length found");
 		return 0;
 	}
-	
+
 	setDemodBuf(bs, 128, preambleIndex);
 
 	// remove marker bits (1's every 9th digit after preamble) (pType = 2)
@@ -231,7 +231,7 @@ int CmdFDXBdemodBI(const char *Cmd){
 
 
 //see ASKDemod for what args are accepted
-//almost the same demod as cmddata.c/CmdFDXBdemodBI 
+//almost the same demod as cmddata.c/CmdFDXBdemodBI
 int CmdFdxDemod(const char *Cmd) {
 
 	//Differential Biphase / di-phase (inverted biphase)
@@ -279,25 +279,25 @@ int CmdFdxDemod(const char *Cmd) {
 
 
 	uint16_t calcCrc = crc16_kermit(raw, 8);
-	
+
 	PrintAndLogEx(SUCCESS, "\nFDX-B / ISO 11784/5 Animal Tag ID Found:  Raw : %s", sprint_hex(raw, 8));
 	PrintAndLogEx(SUCCESS, "Animal ID          %04u-%012" PRIu64, countryCode, NationalCode);
 	PrintAndLogEx(SUCCESS, "National Code      %012" PRIu64 " (0x%" PRIx64 ")", NationalCode, NationalCode);
 	PrintAndLogEx(SUCCESS, "Country Code       %04u", countryCode);
 	PrintAndLogEx(SUCCESS, "Reserved/RFU       %u (0x04%X)", reservedCode,  reservedCode);
-	PrintAndLogEx(SUCCESS, "Animal Tag         %s", animalBit ? _YELLOW_(True) : "False");	
-	PrintAndLogEx(SUCCESS, "Has extended data  %s [0x%X]", dataBlockBit ? _YELLOW_(True) : "False", extended);	
+	PrintAndLogEx(SUCCESS, "Animal Tag         %s", animalBit ? _YELLOW_(True) : "False");
+	PrintAndLogEx(SUCCESS, "Has extended data  %s [0x%X]", dataBlockBit ? _YELLOW_(True) : "False", extended);
 	PrintAndLogEx(SUCCESS, "CRC-16             0x%04X - 0x%04X [%s]", crc16, calcCrc, (calcCrc == crc16) ? _GREEN_(Ok) : "Failed");
 
 	if (g_debugMode) {
-		PrintAndLogEx(DEBUG, "Start marker %d;   Size %d", preambleIndex, size);	
+		PrintAndLogEx(DEBUG, "Start marker %d;   Size %d", preambleIndex, size);
 		char *bin = sprint_bin_break(DemodBuffer, size, 16);
 		PrintAndLogEx(DEBUG, "DEBUG bin stream:\n%s", bin);
 	}
 
 	// set block 0 for later
 	//g_DemodConfig = T55x7_MODULATION_DIPHASE | T55x7_BITRATE_RF_32 | 4 << T55x7_MAXBLOCK_SHIFT;
-	
+
 	return 1;
 }
 
@@ -314,20 +314,20 @@ int CmdFdxClone(const char *Cmd) {
 	uint8_t bits[128];
 	uint8_t *bs = bits;
 	memset(bs, 0, sizeof(bits));
-	
+
 	char cmdp = param_getchar(Cmd, 0);
 	if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_fdx_clone();
 
 	countryid = param_get32ex(Cmd, 0, 0, 10);
 	animalid = param_get64ex(Cmd, 1, 0, 10);
-	
+
 	verify_values(countryid, animalid);
-	
-	// getFDXBits(uint64_t national_id, uint16_t country, uint8_t isanimal, uint8_t isextended, uint32_t extended, uint8_t *bits) 
+
+	// getFDXBits(uint64_t national_id, uint16_t country, uint8_t isanimal, uint8_t isextended, uint32_t extended, uint8_t *bits)
 	if ( !getFDXBits(animalid, countryid, 1, 0, 0, bs)) {
 		PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
 		return 1;
-	}	
+	}
 
 	//Q5
 	if (param_getchar(Cmd, 2) == 'Q' || param_getchar(Cmd, 2) == 'q')
@@ -341,7 +341,7 @@ int CmdFdxClone(const char *Cmd) {
 
 	PrintAndLogEx(INFO, "Preparing to clone FDX-B to T55x7 with animal ID: %04u-%"PRIu64, countryid, animalid);
 	print_blocks(blocks, 5);
-	
+
 	UsbCommand resp;
 	UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
 
@@ -367,9 +367,9 @@ int CmdFdxSim(const char *Cmd) {
 
 	countryid = param_get32ex(Cmd, 0, 0, 10);
 	animalid = param_get64ex(Cmd, 1, 0, 10);
-	
+
 	verify_values(countryid, animalid);
-	
+
 	// 32, no STT, BIPHASE INVERTED == diphase
 	uint8_t clk = 32, encoding = 2, separator = 0, invert = 1;
 	uint16_t arg1, arg2;
@@ -381,7 +381,7 @@ int CmdFdxSim(const char *Cmd) {
 
 	UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};
 
-	 //getFDXBits(uint64_t national_id, uint16_t country, uint8_t isanimal, uint8_t isextended, uint32_t extended, uint8_t *bits) 
+	 //getFDXBits(uint64_t national_id, uint16_t country, uint8_t isanimal, uint8_t isextended, uint32_t extended, uint8_t *bits)
 	getFDXBits(animalid, countryid, 1, 0, 0, c.d.asBytes);
 	clearCommandBuffer();
 	SendCommand(&c);
diff --git a/client/cmdlffdx.h b/client/cmdlffdx.h
index b7b019909..107bb83ec 100644
--- a/client/cmdlffdx.h
+++ b/client/cmdlffdx.h
@@ -17,7 +17,7 @@
 #include "cmdlf.h"		// lf read
 #include "crc16.h"		// for checksum crc-16_ccitt
 #include "protocols.h"  // for T55xx config register definitions
-#include "lfdemod.h"    // parityTest	 
+#include "lfdemod.h"    // parityTest
 
 extern int CmdLFFdx(const char *Cmd);
 extern int CmdFdxClone(const char *Cmd);
diff --git a/client/cmdlfguard.c b/client/cmdlfguard.c
index 5707c78fb..3e3642766 100644
--- a/client/cmdlfguard.c
+++ b/client/cmdlfguard.c
@@ -18,7 +18,7 @@ int usage_lf_guard_clone(void){
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Usage: lf gprox clone [h] <format> <Facility-Code> <Card-Number>");
 	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "         <format> :  format length 26|32|36|40");	
+	PrintAndLogEx(NORMAL, "         <format> :  format length 26|32|36|40");
 	PrintAndLogEx(NORMAL, "  <Facility-Code> :  8-bit value facility code");
 	PrintAndLogEx(NORMAL, "  <Card Number>   : 16-bit value card number");
 	PrintAndLogEx(NORMAL, "");
@@ -35,7 +35,7 @@ int usage_lf_guard_sim(void) {
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Usage:  lf gprox sim [h] <format> <Facility-Code> <Card-Number>");
 	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "         <format> :  format length 26|32|36|40");	
+	PrintAndLogEx(NORMAL, "         <format> :  format length 26|32|36|40");
 	PrintAndLogEx(NORMAL, "  <Facility-Code> :  8-bit value facility code");
 	PrintAndLogEx(NORMAL, "  <Card Number>   : 16-bit value card number");
 	PrintAndLogEx(NORMAL, "");
@@ -46,33 +46,33 @@ int usage_lf_guard_sim(void) {
 
 // Works for 26bits.
 int GetGuardBits(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint8_t *guardBits) {
-  
+
 	uint8_t xorKey = 0x66;
 	uint8_t i;
 	uint8_t pre[96];
 	uint8_t rawbytes[12];
 	memset(pre, 0x00, sizeof(pre));
-	memset(rawbytes, 0x00, sizeof(rawbytes));	
+	memset(rawbytes, 0x00, sizeof(rawbytes));
 
 	// add format length (decimal)
 	switch (fmtlen) {
 		case 32: {
 			rawbytes[1] = (32 << 2);
-			
+
 			break;
 		}
 		case 36: {
 			// FC = ((ByteStream[3] & 0x7F)<<7) | (ByteStream[4]>>1);
 			// Card = ((ByteStream[4]&1)<<19) | (ByteStream[5]<<11) | (ByteStream[6]<<3) | (ByteStream[7]>>5);
 			rawbytes[1] = (36 << 2);
-			// Get 26 wiegand from FacilityCode, CardNumber	
+			// Get 26 wiegand from FacilityCode, CardNumber
 			uint8_t wiegand[34];
 			memset(wiegand, 0x00, sizeof(wiegand));
 			num_to_bytebits(fc, 8, wiegand);
 			num_to_bytebits(cn, 26, wiegand+8);
 
 			// add wiegand parity bits (dest, source, len)
-			wiegand_add_parity(pre, wiegand, 34);			
+			wiegand_add_parity(pre, wiegand, 34);
 			break;
 		}
 		case 40: {
@@ -82,7 +82,7 @@ int GetGuardBits(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint8_t *guardBits) {
 		case 26:
 		default: {
 			rawbytes[1] = (26 << 2);
-			// Get 26 wiegand from FacilityCode, CardNumber	
+			// Get 26 wiegand from FacilityCode, CardNumber
 			uint8_t wiegand[24];
 			memset(wiegand, 0x00, sizeof(wiegand));
 			num_to_bytebits(fc, 8, wiegand);
@@ -93,27 +93,27 @@ int GetGuardBits(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint8_t *guardBits) {
 			break;
 		}
 	}
-	// 2bit checksum, unknown today, 
+	// 2bit checksum, unknown today,
 	// these two bits are the last ones of rawbyte[1], hence the LSHIFT above.
 
-	
+
 	// xor key
 	rawbytes[0] = xorKey;
-	
+
 	rawbytes[2] = 1;
 	rawbytes[3] = 0;
-	
+
 	// add wiegand to rawbytes
 	for (i = 0; i < 4; ++i)
 		rawbytes[i+4] = bytebits_to_byte( pre + (i*8), 8);
-	
-	PrintAndLogEx(DEBUG, " WIE | %s\n", sprint_hex(rawbytes, sizeof(rawbytes)));	
-	
-	
+
+	PrintAndLogEx(DEBUG, " WIE | %s\n", sprint_hex(rawbytes, sizeof(rawbytes)));
+
+
 	// XOR (only works on wiegand stuff)
 	for (i = 1; i < 12; ++i)
 		rawbytes[i] ^= xorKey ;
-	
+
 	PrintAndLogEx(DEBUG, " XOR | %s \n", sprint_hex(rawbytes, sizeof(rawbytes)));
 
 	// convert rawbytes to bits in pre
@@ -122,7 +122,7 @@ int GetGuardBits(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint8_t *guardBits) {
 
 	PrintAndLogEx(DEBUG, "\n Raw | %s \n", sprint_hex(rawbytes, sizeof(rawbytes)));
 	PrintAndLogEx(DEBUG, " Raw | %s\n", sprint_bin(pre, 64) );
-	
+
 	// add spacer bit 0 every 4 bits, starting with index 0,
 	// 12 bytes, 24 nibbles.  24+1 extra bites. 3bytes.  ie 9bytes | 1byte xorkey, 8bytes rawdata (64bits, should be enough for a 40bit wiegand)
 	addParity(pre, guardBits+6, 64, 5, 3);
@@ -134,30 +134,30 @@ int GetGuardBits(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint8_t *guardBits) {
 	guardBits[3] = 1;
 	guardBits[4] = 1;
 	guardBits[5] = 0;
-	
+
 	PrintAndLogEx(DEBUG, " FIN | %s\n", sprint_bin(guardBits, 96) );
 	return 1;
 }
 
 // by marshmellow
-// demod gProxIIDemod 
-// error returns as -x 
+// demod gProxIIDemod
+// error returns as -x
 // success returns start position in bitstream
 // Bitstream must contain previously askrawdemod and biphasedemoded data
 int detectGProxII(uint8_t *bits, size_t *size) {
-	
+
 	size_t startIdx = 0;
 	uint8_t preamble[] = {1,1,1,1,1,0};
 
 	// sanity check
 	if ( *size < sizeof(preamble) ) return -1;
-	
-	if (!preambleSearch(bits, preamble, sizeof(preamble), size, &startIdx)) 
+
+	if (!preambleSearch(bits, preamble, sizeof(preamble), size, &startIdx))
 		return -2; //preamble not found
 
 	 //gProxII should be 96 bits
-	if (*size != 96) return -3;	
-	
+	if (*size != 96) return -3;
+
 	//check first 6 spacer bits to verify format
 	if (!bits[startIdx+5] && !bits[startIdx+10] && !bits[startIdx+15] && !bits[startIdx+20] && !bits[startIdx+25] && !bits[startIdx+30]){
 		//confirmed proper separator bits found
@@ -180,7 +180,7 @@ int CmdGuardDemod(const char *Cmd) {
 		PrintAndLogEx(DEBUG, "DEBUG: Error - gProxII ASKbiphaseDemod failed");
 		return 0;
 	}
-	
+
 	size_t size = DemodBufferLen;
 
 	int preambleIndex = detectGProxII(DemodBuffer, &size);
@@ -194,11 +194,11 @@ int CmdGuardDemod(const char *Cmd) {
 			PrintAndLogEx(DEBUG, "DEBUG: Error - gProxII size not correct: %d", size);
 		else if (preambleIndex == -5)
 			PrintAndLogEx(DEBUG, "DEBUG: Error - gProxII wrong spacerbits");
-		else				
+		else
 			PrintAndLogEx(DEBUG, "DEBUG: Error - gProxII ans: %d", preambleIndex);
 		return 0;
 	}
-	
+
 	//got a good demod of 96 bits
 	uint8_t ByteStream[8] = {0x00};
 	uint8_t xorKey = 0;
@@ -221,8 +221,8 @@ int CmdGuardDemod(const char *Cmd) {
 	}
 
 	setDemodBuf(DemodBuffer, 96, preambleIndex);
-	setClockGrid(g_DemodClock, g_DemodStartIdx + (preambleIndex*g_DemodClock));	
-	
+	setClockGrid(g_DemodClock, g_DemodStartIdx + (preambleIndex*g_DemodClock));
+
 	//ByteStream contains 8 Bytes (64 bits) of decrypted raw tag data
 	uint8_t fmtLen = ByteStream[0] >> 2;
 	uint32_t FC = 0;
@@ -237,7 +237,7 @@ int CmdGuardDemod(const char *Cmd) {
 			FC = ((ByteStream[3] & 0x7F)<<7) | (ByteStream[4]>>1);
 			Card = ((ByteStream[4]&1)<<19) | (ByteStream[5]<<11) | (ByteStream[6]<<3) | (ByteStream[7]>>5);
 			break;
-		case 26: 
+		case 26:
 			FC = ((ByteStream[3] & 0x7F)<<1) | (ByteStream[4]>>7);
 			Card = ((ByteStream[4]&0x7F)<<9) | (ByteStream[5]<<1) | (ByteStream[6]>>7);
 			break;
@@ -267,20 +267,20 @@ int CmdGuardClone(const char *Cmd) {
 	uint8_t i;
 	uint8_t bs[96];
 	memset(bs, 0x00, sizeof(bs));
-	
+
 	//GuardProxII - compat mode, ASK/Biphase,  data rate 64, 3 data blocks
 	uint32_t blocks[4] = {T55x7_MODULATION_BIPHASE | T55x7_BITRATE_RF_64 | 3 << T55x7_MAXBLOCK_SHIFT, 0, 0, 0};
-	
+
 	if (sscanf(Cmd, "%u %u %u", &fmtlen, &fc, &cn ) != 3) return usage_lf_guard_clone();
 
 	fmtlen &= 0x7f;
 	facilitycode = (fc & 0x000000FF);
 	cardnumber = (cn & 0x0000FFFF);
-	
+
 	if ( !GetGuardBits(fmtlen, facilitycode, cardnumber, bs)) {
 		PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
 		return 1;
-	}	
+	}
 
 	// Q5
 	if (param_getchar(Cmd, 3) == 'Q' || param_getchar(Cmd, 3) == 'q')
@@ -321,17 +321,17 @@ int CmdGuardSim(const char *Cmd) {
 	if (sscanf(Cmd, "%u %u %u", &fmtlen, &fc, &cn ) != 3) return usage_lf_guard_sim();
 
 	uint8_t bs[96];
-	size_t size = sizeof(bs);	
+	size_t size = sizeof(bs);
 	memset(bs, 0x00, size);
 
 	fmtlen &= 0x7F;
 	facilitycode = (fc & 0x000000FF);
 	cardnumber = (cn & 0x0000FFFF);
-	
+
 	if ( !GetGuardBits(fmtlen, facilitycode, cardnumber, bs)) {
 		PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
 		return 1;
-	}	
+	}
 
 	PrintAndLogEx(SUCCESS, "Simulating Guardall - Facility Code: %u, CardNumber: %u", facilitycode, cardnumber );
 
diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c
index 7d1bda95c..87cb8d160 100644
--- a/client/cmdlfhid.c
+++ b/client/cmdlfhid.c
@@ -23,12 +23,12 @@ int usage_lf_hid_read(void){
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Usage:  lf hid read [h] [1]");
 	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h :  This help");	
+	PrintAndLogEx(NORMAL, "      h :  This help");
 	PrintAndLogEx(NORMAL, "      1 : (optional) stop after reading a single card");
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Examples:");
 	PrintAndLogEx(NORMAL, "       lf hid read");
-	PrintAndLogEx(NORMAL, "       lf hid read 1");	
+	PrintAndLogEx(NORMAL, "       lf hid read 1");
 	return 0;
 }
 int usage_lf_hid_wiegand(void){
@@ -76,7 +76,7 @@ int usage_lf_hid_brute(void){
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Usage:  lf hid brute [h] [v] a <format> f <facility-code> c <cardnumber> d <delay>");
 	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h                 :  This help");	
+	PrintAndLogEx(NORMAL, "       h                 :  This help");
 	PrintAndLogEx(NORMAL, "       a <format>        :  26|33|34|35|37|40|44|84");
 	PrintAndLogEx(NORMAL, "       f <facility-code> :  8-bit value HID facility code");
 	PrintAndLogEx(NORMAL, "       c <cardnumber>    :  (optional) cardnumber to start with, max 65535");
@@ -94,8 +94,8 @@ int usage_lf_hid_brute(void){
 static bool sendPing(void){
 	UsbCommand ping = {CMD_PING, {1, 2, 3}};
 	SendCommand(&ping);
-	SendCommand(&ping);	
-	SendCommand(&ping);	
+	SendCommand(&ping);
+	SendCommand(&ping);
 	clearCommandBuffer();
 	UsbCommand resp;
 	if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000))
@@ -107,12 +107,12 @@ static bool sendTry(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint32_t delay, ui
 	// this should be optional.
 	if ( verbose )
 		PrintAndLogEx(INFO, "Trying FC: %u; CN: %u", fc, cn);
-	
+
 	calcWiegand( fmtlen, fc, cn, bits);
 
 	uint64_t arg1 = bytebits_to_byte(bits, 32);
 	uint64_t arg2 = bytebits_to_byte(bits + 32, 32);
-	UsbCommand c = {CMD_HID_SIM_TAG, {arg1, arg2, 0}}; 
+	UsbCommand c = {CMD_HID_SIM_TAG, {arg1, arg2, 0}};
 	clearCommandBuffer();
 	SendCommand(&c);
 
@@ -157,12 +157,12 @@ int CmdHIDDemod(const char *Cmd) {
 
 	setDemodBuf(bits, size, idx);
 	setClockGrid(50, waveIdx + (idx*50));
-	
+
 	if (hi2==0 && hi==0 && lo==0) {
 		PrintAndLogEx(DEBUG, "DEBUG: Error - HID no values found");
 		return 0;
 	}
-	
+
 	if (hi2 != 0){ //extra large HID tags
 		PrintAndLogEx(SUCCESS, "HID Prox TAG ID: %x%08x%08x (%u)", hi2, hi, lo, (lo>>1) & 0xFFFF);
 	} else {  //standard HID tags <38 bits
@@ -216,9 +216,9 @@ int CmdHIDDemod(const char *Cmd) {
 	}
 
 	PrintAndLogEx(DEBUG, "DEBUG: HID idx: %d, Len: %d, Printing Demod Buffer:", idx, size);
-	if (g_debugMode)		
+	if (g_debugMode)
 		printDemodBuff();
-	
+
 	return 1;
 }
 
@@ -231,7 +231,7 @@ int CmdHIDRead(const char *Cmd) {
 // this read loops on device side.
 // uses the demod in lfops.c
 int CmdHIDRead_device(const char *Cmd) {
-	
+
 	if (Cmd[0] == 'h' || Cmd[0] == 'H') return usage_lf_hid_read();
 	uint8_t findone = ( Cmd[0] == '1' ) ? 1 : 0;
 	UsbCommand c = {CMD_HID_DEMOD_FSK, {findone, 0 , 0}};
@@ -246,7 +246,7 @@ int CmdHIDSim(const char *Cmd) {
 
 	uint8_t ctmp = tolower(param_getchar(Cmd, 0));
 	if ( strlen(Cmd) == 0 || ctmp == 'h' ) return usage_lf_hid_sim();
-	
+
 	while (sscanf(&Cmd[i++], "%1x", &n ) == 1) {
 		hi = (hi << 4) | (lo >> 28);
 		lo = (lo << 4) | (n & 0xf);
@@ -262,7 +262,7 @@ int CmdHIDSim(const char *Cmd) {
 }
 
 int CmdHIDClone(const char *Cmd) {
-	
+
 	uint32_t hi2 = 0, hi = 0, lo = 0;
 	uint32_t n = 0, i = 0;
 	UsbCommand c = {CMD_HID_CLONE_TAG};
@@ -308,7 +308,7 @@ typedef struct {
 	size_t   Wiegand_n;
  } wiegand_t;
 
-static void addHIDMarker(uint8_t fmtlen, uint8_t *out) {    
+static void addHIDMarker(uint8_t fmtlen, uint8_t *out) {
 	// temp array
 	uint8_t arr[BITS];
 	memset(arr, 0, BITS);
@@ -316,7 +316,7 @@ static void addHIDMarker(uint8_t fmtlen, uint8_t *out) {
 	// copy inpu
 	uint8_t pos = sizeof(arr)-fmtlen;
 	memcpy(arr+pos, out, fmtlen);
-			
+
 	switch(fmtlen) {
 		case 26:{
 			// start sentinel, BITS-bit 27 = 1
@@ -329,7 +329,7 @@ static void addHIDMarker(uint8_t fmtlen, uint8_t *out) {
 		case 34:
 			// start sentinel, BITS-bit 27 = 1
 			arr[BITS-35] = 1;
-			
+
 			// fmt smaller than 37 used,  bit37 = 1
 			arr[BITS-38]  = 1;
 			memcpy(out, arr, BITS);
@@ -342,13 +342,13 @@ static void addHIDMarker(uint8_t fmtlen, uint8_t *out) {
 	// uint32_t result = 0;
 	// int i;
 
-	// // even parity 
+	// // even parity
 	// for (i = 7;i >= 0;i--)
 		// result ^= (*hi >> i) & i;
 	// for (i = 31;i >= 24;i--)
 		// result ^= (*lo >> i) & 1;
 
-	// *hi |= result << 2; 
+	// *hi |= result << 2;
 
 	// // odd parity bit
 	// result = 0;
@@ -388,14 +388,14 @@ static void calc34(uint16_t fc, uint32_t cardno, uint8_t *out){
 	uint8_t wiegand[32];
 	num_to_bytebits(fc, 16, wiegand);
 	num_to_bytebits(cardno, 16, wiegand + 16);
-  	wiegand_add_parity(out,  wiegand, sizeof(wiegand) );	
+  	wiegand_add_parity(out,  wiegand, sizeof(wiegand) );
 }
 // static void calc35(uint16_t fc, uint32_t cardno,  uint8_t *out){
-	// *lo = ((cardno & 0xFFFFF) << 1) | fc << 21; 
-	// *hi = (1 << 5) | ((fc >> 11) & 1);  
+	// *lo = ((cardno & 0xFFFFF) << 1) | fc << 21;
+	// *hi = (1 << 5) | ((fc >> 11) & 1);
 // }
 static void calc37S(uint16_t fc, uint32_t cardno, uint8_t *out){
-	// FC 2 - 17   - 16 bit  
+	// FC 2 - 17   - 16 bit
 	// cardno 18 - 36  - 19 bit
 	// Even P1   1 - 19
 	// Odd  P37  19 - 36
@@ -406,20 +406,20 @@ static void calc37S(uint16_t fc, uint32_t cardno, uint8_t *out){
 }
 static void calc37H(uint64_t cardno, uint8_t *out){
 	// SC NONE
-	// cardno 1-35 34 bits 
+	// cardno 1-35 34 bits
 	// Even Parity  0th bit  1-18
 	// Odd  Parity 36th bit 19-35
 	uint8_t wiegand[37];
 	num_to_bytebits( (uint32_t)(cardno >> 32), 2, wiegand);
 	num_to_bytebits( (uint32_t)(cardno >> 0), 32, wiegand + 2);
   	wiegand_add_parity(out,  wiegand, sizeof(wiegand) );
-	
+
 	PrintAndLogEx(NORMAL, "%x %x\n", (uint32_t)(cardno >> 32), (uint32_t)cardno );
 }
 // static void calc40(uint64_t cardno,  uint8_t *out){
 	// cardno = (cardno & 0xFFFFFFFFFF);
-	// *lo = ((cardno & 0xFFFFFFFF) << 1 ); 
-	// *hi = (cardno >> 31);  
+	// *lo = ((cardno & 0xFFFFFFFF) << 1 );
+	// *hi = (cardno >> 31);
 // }
 
 void calcWiegand(uint8_t fmtlen, uint16_t fc, uint64_t cardno, uint8_t *bits){
@@ -436,17 +436,17 @@ void calcWiegand(uint8_t fmtlen, uint16_t fc, uint64_t cardno, uint8_t *bits){
 		// case 84 : { break; }
 		default: break;
 	}
-}	
+}
 
 int CmdHIDWiegand(const char *Cmd) {
 	uint32_t oem = 0, fc = 0;
 	uint64_t cardnum = 0;
-	uint64_t blocks = 0, wiegand = 0; 
+	uint64_t blocks = 0, wiegand = 0;
 
 	uint8_t bits[BITS];
 	uint8_t *bs = bits;
 	memset(bs, 0, sizeof(bits));
-	
+
 	uint8_t ctmp = param_getchar(Cmd, 0);
 	if ( strlen(Cmd) == 0 || strlen(Cmd) < 3 || ctmp == 'H' || ctmp == 'h' ) return usage_lf_hid_wiegand();
 
@@ -455,7 +455,7 @@ int CmdHIDWiegand(const char *Cmd) {
 	cardnum = param_get64ex(Cmd, 2, 0, 10);
 
 	uint8_t fmtlen[] = {26,33,34,35,37,38,40};
-	
+
 	PrintAndLogEx(NORMAL, "HID | OEM | FC   | CN      |  Wiegand  |  HID Formatted");
 	PrintAndLogEx(NORMAL, "----+-----+------+---------+-----------+--------------------");
 	for (uint8_t i = 0; i < sizeof(fmtlen); i++){
@@ -463,13 +463,13 @@ int CmdHIDWiegand(const char *Cmd) {
 		calcWiegand( fmtlen[i], fc, cardnum, bs);
 		PrintAndLogEx(NORMAL, "ice:: %s \n", sprint_bin(bs, fmtlen[i]));
 		wiegand = (uint64_t)bytebits_to_byte(bs, 32) << 32 | bytebits_to_byte(bs+32, 32);
-		
-		addHIDMarker(fmtlen[i], bs);	
+
+		addHIDMarker(fmtlen[i], bs);
 		PrintAndLogEx(NORMAL, "ice:: %s\n", sprint_bin(bs, BITS));
 		blocks = (uint64_t)bytebits_to_byte(bs+32, 32) << 32 | bytebits_to_byte(bs+64, 32);
-		uint8_t shifts = 64-fmtlen[i];		
+		uint8_t shifts = 64-fmtlen[i];
 		wiegand >>= shifts;
-		
+
 		PrintAndLogEx(NORMAL, " %u | %03u | %03u  | %" PRIu64 "  | %" PRIX64 "  |  %" PRIX64 ,
 			fmtlen[i],
 			oem,
@@ -484,14 +484,14 @@ int CmdHIDWiegand(const char *Cmd) {
 }
 
 int CmdHIDBrute(const char *Cmd){
-	
+
 	bool errors = false, verbose = false;
 	uint32_t fc = 0, cn = 0, delay = 1000;
 	uint8_t fmtlen = 0;
 	uint8_t bits[96];
 	memset(bits, 0, sizeof(bits));
 	uint8_t cmdp = 0;
-		
+
 	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
 		switch (tolower(param_getchar(Cmd, cmdp))) {
 		case 'h':
@@ -503,7 +503,7 @@ int CmdHIDBrute(const char *Cmd){
 			cmdp += 2;
 			break;
 		case 'd':
-			// delay between attemps,  defaults to 1000ms. 
+			// delay between attemps,  defaults to 1000ms.
 			delay = param_get32ex(Cmd, cmdp+1, 1000, 10);
 			cmdp += 2;
 			break;
@@ -526,7 +526,7 @@ int CmdHIDBrute(const char *Cmd){
 			// negated
 			errors = !is_ftm_ok;
 			break;
-		case 'v':		
+		case 'v':
 			verbose = true;
 			cmdp++;
 			break;
@@ -538,31 +538,31 @@ int CmdHIDBrute(const char *Cmd){
 	}
 	if ( fc == 0 ) errors = true;
 	if ( errors ) return usage_lf_hid_brute();
-	
+
 	PrintAndLogEx(INFO, "Brute-forcing HID reader");
 	PrintAndLogEx(INFO, "Press pm3-button to abort simulation or run another command");
-	
+
 	uint16_t up = cn;
 	uint16_t down = cn;
-	
+
 	// main loop
 	for (;;){
-		
+
 		if ( IsOffline() ) {
 			PrintAndLogEx(WARNING, "Device offline\n");
 			return  2;
 		}
-		
+
 		if (ukbhit()) {
 			int gc = getchar(); (void)gc;
 			PrintAndLogEx(INFO, "aborted via keyboard!");
 			return sendPing();
 		}
-		
+
 		// Do one up
 		if ( up < 0xFFFF )
 			if ( !sendTry(fmtlen, fc, up++, delay, bits, verbose)) return 1;
-		
+
 		// Do one down  (if cardnumber is given)
 		if ( cn > 1 )
 			if ( down > 1 )
diff --git a/client/cmdlfhid.h b/client/cmdlfhid.h
index c34a48406..895117960 100644
--- a/client/cmdlfhid.h
+++ b/client/cmdlfhid.h
@@ -20,7 +20,7 @@
 #include "util.h"		// wiegand_add_parity etc
 #include "cmddata.h"  //for g_debugMode, demodbuff cmds
 #include "cmdlf.h"	  // lf_read
-#include "cmdmain.h"			   
+#include "cmdmain.h"
 #include "util_posix.h"
 #include "lfdemod.h"
 
diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index 69bae1b38..45aeea317 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -43,7 +43,7 @@ int CmdLFHitagList(const char *Cmd) {
 		free(got);
 		return 2;
 	}
-	
+
 	uint16_t traceLen = response.arg[2];
 	if (traceLen > USB_CMD_DATA_SIZE) {
 		uint8_t *p = realloc(got, traceLen);
@@ -59,7 +59,7 @@ int CmdLFHitagList(const char *Cmd) {
 			return 2;
 		}
 	}
-	
+
 	PrintAndLogEx(NORMAL, "recorded activity (TraceLen = %d bytes):");
 	PrintAndLogEx(NORMAL, " ETU     :nbits: who bytes");
 	PrintAndLogEx(NORMAL, "---------+-----+----+-----------");
@@ -70,11 +70,11 @@ int CmdLFHitagList(const char *Cmd) {
 
 	char filename[FILE_PATH_SIZE]  = { 0x00 };
 	FILE* f = NULL;
-  	
+
 	if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
-	
+
 	memcpy(filename, Cmd, len);
-   
+
 	if (strlen(filename) > 0) {
 		f = fopen(filename,"wb");
 		if (!f) {
@@ -84,7 +84,7 @@ int CmdLFHitagList(const char *Cmd) {
 	}
 
 	for (;;) {
-  
+
 		if(i >= traceLen) { break; }
 
 		bool isResponse;
@@ -143,11 +143,11 @@ int CmdLFHitagList(const char *Cmd) {
 				(isResponse ? "TAG" : "   "),
 				line);
 		}
-		
+
 		prev = timestamp;
 		i += (len + 9);
 	}
-  
+
 	if (f) {
 		fclose(f);
 		PrintAndLogEx(NORMAL, "Recorded activity succesfully written to file: %s", filename);
@@ -165,12 +165,12 @@ int CmdLFHitagSnoop(const char *Cmd) {
 }
 
 int CmdLFHitagSim(const char *Cmd) {
-    
+
 	UsbCommand c = {CMD_SIMULATE_HITAG};
 	char filename[FILE_PATH_SIZE] = { 0x00 };
 	FILE* f;
 	bool tag_mem_supplied;
-	
+
 	int len = strlen(Cmd);
 	if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
 	memcpy(filename, Cmd, len);
@@ -201,11 +201,11 @@ int CmdLFHitagSim(const char *Cmd) {
 }
 
 int CmdLFHitagReader(const char *Cmd) {
-	
+
 	UsbCommand c = {CMD_READER_HITAG, {0,0,0} };//, {param_get32ex(Cmd,0,0,10),param_get32ex(Cmd,1,0,16),param_get32ex(Cmd,2,0,16),param_get32ex(Cmd,3,0,16)}};
 	hitag_data* htd = (hitag_data*)c.d.asBytes;
 	hitag_function htf = param_get32ex(Cmd, 0, 0, 10);
-	
+
 	switch (htf) {
 		case 01: { //RHTSF_CHALLENGE
 			c.cmd = CMD_READ_HITAG_S;
@@ -255,7 +255,7 @@ int CmdLFHitagReader(const char *Cmd) {
 	c.arg[0] = htf;
 	clearCommandBuffer();
 	SendCommand(&c);
-	UsbCommand resp;	
+	UsbCommand resp;
 	if ( !WaitForResponseTimeout(CMD_ACK, &resp, 4000) ) {
 		PrintAndLogEx(WARNING, "timeout while waiting for reply.");
 		return 1;
@@ -333,7 +333,7 @@ int CmdLFHitagCheckChallenges(const char *Cmd) {
 	if (len > FILE_PATH_SIZE)
 		len = FILE_PATH_SIZE;
 	memcpy(filename, Cmd, len);
-	
+
 	if (strlen(filename) > 0) {
 		f = fopen(filename,"rb+");
 		if ( !f ) {
@@ -351,7 +351,7 @@ int CmdLFHitagCheckChallenges(const char *Cmd) {
 	} else {
 		file_given = false;
 	}
-	
+
 	//file with all the challenges to try
 	c.arg[0] = (uint32_t)file_given;
 	clearCommandBuffer();
@@ -406,7 +406,7 @@ static command_t CommandTable[] = {
 	{"list",	CmdLFHitagList,    1, "<outfile> List Hitag trace history"},
 	{"reader",	CmdLFHitagReader,  1, "Act like a Hitag Reader"},
 	{"sim",		CmdLFHitagSim,     1, "<infile> Simulate Hitag transponder"},
-	{"simS",	CmdLFHitagSimS,    1, "<hitagS.hts> Simulate HitagS transponder" }, 
+	{"simS",	CmdLFHitagSimS,    1, "<hitagS.hts> Simulate HitagS transponder" },
 	{"snoop",	CmdLFHitagSnoop,   1, "Eavesdrop Hitag communication"},
 	{"writer",	CmdLFHitagWP,      1, "Act like a Hitag Writer" },
 	{"check_challenges",	CmdLFHitagCheckChallenges,   1, "<challenges.cc> test all challenges" },
diff --git a/client/cmdlfindala.c b/client/cmdlfindala.c
index 1707895b0..17e3455d9 100644
--- a/client/cmdlfindala.c
+++ b/client/cmdlfindala.c
@@ -31,7 +31,7 @@ int usage_lf_indala_sim(void) {
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Usage:  lf indala sim [h] <uid>");
 	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "            h :  This help");	
+	PrintAndLogEx(NORMAL, "            h :  This help");
 	PrintAndLogEx(NORMAL, "        <uid> :  64/224 UID");
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Examples:");
@@ -45,7 +45,7 @@ int usage_lf_indala_clone(void) {
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Usage:  lf indala clone [h] <uid> [Q5]");
 	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "            h :  This help");	
+	PrintAndLogEx(NORMAL, "            h :  This help");
 	PrintAndLogEx(NORMAL, "        <uid> :  64/224 UID");
 	PrintAndLogEx(NORMAL, "           Q5 :  optional - clone to Q5 (T5555) instead of T55x7 chip");
 	PrintAndLogEx(NORMAL, "");
@@ -70,10 +70,10 @@ int indala64decode(uint8_t *dest, size_t *size, uint8_t *invert) {
 	if (found_size != 64) return -2;
 
 	if (*invert == 1)
-		for (size_t i = idx; i < found_size + idx; i++) 
+		for (size_t i = idx; i < found_size + idx; i++)
 			dest[i] ^= 1;
 
-	// note: don't change *size until we are sure we got it... 
+	// note: don't change *size until we are sure we got it...
 	*size = found_size;
 	return (int) idx;
 }
@@ -90,9 +90,9 @@ int indala224decode(uint8_t *dest, size_t *size, uint8_t *invert) {
 		*invert ^= 1;
 	}
 	if (found_size != 224) return -2;
-	
+
 	if (*invert==1 && idx > 0)
-		for (size_t i = idx-1; i < found_size + idx + 2; i++) 
+		for (size_t i = idx-1; i < found_size + idx + 2; i++)
 			dest[i] ^= 1;
 
 	// 224 formats are typically PSK2 (afaik 2017 Marshmellow)
@@ -139,14 +139,14 @@ int CmdIndalaDemod(const char *Cmd) {
 			return 0;
 		}
 	}
-	
+
 	setDemodBuf(DemodBuffer, size, (size_t)idx);
 	setClockGrid(g_DemodClock, g_DemodStartIdx + (idx * g_DemodClock));
 	if (invert) {
-		PrintAndLogEx(DEBUG, "DEBUG: Error - Indala had to invert bits");		
-		for (size_t i = 0; i < size; i++) 
+		PrintAndLogEx(DEBUG, "DEBUG: Error - Indala had to invert bits");
+		for (size_t i = 0; i < size; i++)
 			DemodBuffer[i] ^= 1;
-	}	
+	}
 
 	//convert UID to HEX
 	uint32_t uid1, uid2, uid3, uid4, uid5, uid6, uid7;
@@ -162,7 +162,7 @@ int CmdIndalaDemod(const char *Cmd) {
 		uid5 = bytebits_to_byte(DemodBuffer+128,32);
 		uid6 = bytebits_to_byte(DemodBuffer+160,32);
 		uid7 = bytebits_to_byte(DemodBuffer+192,32);
-		PrintAndLogEx(SUCCESS, "Indala Found - bitlength %d, UID = (0x%x%08x%08x%08x%08x%08x%08x)\n%s", 
+		PrintAndLogEx(SUCCESS, "Indala Found - bitlength %d, UID = (0x%x%08x%08x%08x%08x%08x%08x)\n%s",
 			DemodBufferLen,
 		    uid1, uid2, uid3, uid4, uid5, uid6, uid7, sprint_bin_break(DemodBuffer, DemodBufferLen, 32)
 		);
@@ -188,7 +188,7 @@ int CmdIndalaDemodAlt(const char *Cmd) {
 	// under normal conditions it's < 2048
 	uint8_t data[MAX_GRAPH_TRACE_LEN] = {0};
 	size_t datasize = getFromGraphBuf(data);
-	
+
 	uint8_t rawbits[4096];
 	int rawbit = 0;
 	int worst = 0, worstPos = 0;
@@ -196,7 +196,7 @@ int CmdIndalaDemodAlt(const char *Cmd) {
 	//clear clock grid and demod plot
 	setClockGrid(0, 0);
 	DemodBufferLen = 0;
-	
+
 	// PrintAndLogEx(NORMAL, "Expecting a bit less than %d raw bits", GraphTraceLen / 32);
 	// loop through raw signal - since we know it is psk1 rf/32 fc/2 skip every other value (+=2)
 	for (i = 0; i < datasize-1; i += 2) {
@@ -229,7 +229,7 @@ int CmdIndalaDemodAlt(const char *Cmd) {
 			count = 0;
 		}
 	}
-	
+
 	if (rawbit > 0){
 		PrintAndLogEx(INFO, "Recovered %d raw bits, expected: %d", rawbit, GraphTraceLen/32);
 		PrintAndLogEx(INFO, "worst metric (0=best..7=worst): %d at pos %d", worst, worstPos);
@@ -260,7 +260,7 @@ int CmdIndalaDemodAlt(const char *Cmd) {
 			break;
 		}
 	}
-	
+
 	if (start == rawbit - uidlen + 1) {
 		PrintAndLogEx(FAILED, "nothing to wait for");
 		return 0;
@@ -279,7 +279,7 @@ int CmdIndalaDemodAlt(const char *Cmd) {
 	int bit;
 	i = start;
 	int times = 0;
-	
+
 	if (uidlen > rawbit) {
 		PrintAndLogEx(WARNING, "Warning: not enough raw bits to get a full UID");
 		for (bit = 0; bit < rawbit; bit++) {
@@ -297,12 +297,12 @@ int CmdIndalaDemodAlt(const char *Cmd) {
 		}
 		times = 1;
 	}
-	
+
 	//convert UID to HEX
 	uint32_t uid1, uid2, uid3, uid4, uid5, uid6, uid7;
 	int idx;
 	uid1 = uid2 = 0;
-	
+
 	if (uidlen == 64){
 		for( idx=0; idx < 64; idx++) {
 				if (showbits[idx] == '0') {
@@ -311,7 +311,7 @@ int CmdIndalaDemodAlt(const char *Cmd) {
 				} else {
 					uid1 = (uid1<<1) | (uid2>>31);
 					uid2 = (uid2<<1) | 1;
-				} 
+				}
 			}
 		PrintAndLogEx(SUCCESS, "UID | %s (%x%08x)", showbits, uid1, uid2);
 	}
@@ -325,10 +325,10 @@ int CmdIndalaDemodAlt(const char *Cmd) {
 				uid4 = (uid4<<1) | (uid5>>31);
 				uid5 = (uid5<<1) | (uid6>>31);
 				uid6 = (uid6<<1) | (uid7>>31);
-			
-			if (showbits[idx] == '0') 
+
+			if (showbits[idx] == '0')
 				uid7 = (uid7<<1) | 0;
-			else 
+			else
 				uid7 = (uid7<<1) | 1;
 			}
 		PrintAndLogEx(SUCCESS, "UID | %s (%x%08x%08x%08x%08x%08x%08x)", showbits, uid1, uid2, uid3, uid4, uid5, uid6, uid7);
@@ -353,7 +353,7 @@ int CmdIndalaDemodAlt(const char *Cmd) {
 	PrintAndLogEx(DEBUG, "Occurrences: %d (expected %d)", times, (rawbit - start) / uidlen);
 
 	// Remodulating for tag cloning
-	// HACK: 2015-01-04 this will have an impact on our new way of seening lf commands (demod) 
+	// HACK: 2015-01-04 this will have an impact on our new way of seening lf commands (demod)
 	// since this changes graphbuffer data.
 	GraphTraceLen = 32 * uidlen;
 	i = 0;
@@ -388,9 +388,9 @@ int CmdIndalaSim(const char *Cmd) {
 	uint8_t hexuid[100];
 	int len = 0;
 	param_gethex_ex(Cmd, 0, hexuid, &len);
-	if ( len > 28 ) 
+	if ( len > 28 )
 		return usage_lf_indala_sim();
-	
+
 	// convert to binarray
 	uint8_t counter = 223;
 	for (uint8_t i = 0; i < len; i++) {
@@ -399,27 +399,27 @@ int CmdIndalaSim(const char *Cmd) {
 			hexuid[i] >>= 1;
 		}
 	}
-	
-	// indala PSK 
+
+	// indala PSK
 	uint8_t clk = 32, carrier = 2, invert = 0;
 	uint16_t arg1, arg2;
 	arg1 = clk << 8 | carrier;
 	arg2 = invert;
-	
+
 	// It has to send either 64bits (8bytes) or 224bits (28bytes).  Zero padding needed if not.
 	// lf simpsk 1 c 32 r 2 d 0102030405060708
-	
+
 	PrintAndLogEx(SUCCESS, "Simulating Indala UID: %s",  sprint_hex(hexuid, len));
 	PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation or run another command");
-	
-	UsbCommand c = {CMD_PSK_SIM_TAG, {arg1, arg2, size}};  
+
+	UsbCommand c = {CMD_PSK_SIM_TAG, {arg1, arg2, size}};
 	memcpy(c.d.asBytes, bits, size);
 	clearCommandBuffer();
 	SendCommand(&c);
 	return 0;
 }
 
-// iceman - needs refactoring 
+// iceman - needs refactoring
 int CmdIndalaClone(const char *Cmd) {
 	UsbCommand c = {0};
 	uint32_t uid1, uid2, uid3, uid4, uid5, uid6, uid7;
@@ -427,7 +427,7 @@ int CmdIndalaClone(const char *Cmd) {
 	uint32_t n = 0, i = 0;
 
 	if (strchr(Cmd,'l') != 0) {
-		
+
 		while (sscanf(&Cmd[i++], "%1x", &n ) == 1) {
 			uid1 = (uid1 << 4) | (uid2 >> 28);
 			uid2 = (uid2 << 4) | (uid3 >> 28);
@@ -437,7 +437,7 @@ int CmdIndalaClone(const char *Cmd) {
 			uid6 = (uid6 << 4) | (uid7 >> 28);
 			uid7 = (uid7 << 4) | (n & 0xf);
 		}
-	
+
 		PrintAndLogEx(INFO, "Preparing to clone Indala 224bit tag with UID %x%08x%08x%08x%08x%08x%08x", uid1, uid2, uid3, uid4, uid5, uid6, uid7);
 		c.cmd = CMD_INDALA_CLONE_TAG_L;
 		c.d.asDwords[0] = uid1;
@@ -476,7 +476,7 @@ static command_t CommandTable[] = {
 int CmdLFINDALA(const char *Cmd){
 	clearCommandBuffer();
 	CmdsParse(CommandTable, Cmd);
-	return 0; 
+	return 0;
 }
 
 int CmdHelp(const char *Cmd) {
diff --git a/client/cmdlfio.c b/client/cmdlfio.c
index 61fe9d00d..53ad90ec7 100644
--- a/client/cmdlfio.c
+++ b/client/cmdlfio.c
@@ -34,7 +34,7 @@ int usage_lf_io_sim(void) {
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Usage:  lf io sim [h] <version> <facility-code> <card-number>");
 	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "                h :  This help");	
+	PrintAndLogEx(NORMAL, "                h :  This help");
 	PrintAndLogEx(NORMAL, "        <version> :  8bit version");
 	PrintAndLogEx(NORMAL, "  <facility-code> :  8bit value facility code");
 	PrintAndLogEx(NORMAL, "    <card number> :  16bit value card number");
@@ -50,7 +50,7 @@ int usage_lf_io_clone(void) {
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Usage:  lf io clone [h] <version> <facility-code> <card-number> [Q5]");
 	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "                h :  This help");	
+	PrintAndLogEx(NORMAL, "                h :  This help");
 	PrintAndLogEx(NORMAL, "        <version> :  8bit version");
 	PrintAndLogEx(NORMAL, "  <facility-code> :  8bit value facility code");
 	PrintAndLogEx(NORMAL, "    <card number> :  16bit value card number");
@@ -88,18 +88,18 @@ int CmdIOProxDemod(const char *Cmd) {
 	if (size < 65) {
 		PrintAndLogEx(DEBUG, "DEBUG: Error - IO prox not enough samples in GraphBuffer");
 		return 0;
-	}	
-	//get binary from fsk wave	
+	}
+	//get binary from fsk wave
 	int waveIdx = 0;
 	idx = detectIOProx(bits, &size, &waveIdx);
 	if (idx < 0) {
 		if (g_debugMode) {
 			if (idx == -1) {
-				PrintAndLogEx(DEBUG, "DEBUG: Error - IO prox not enough samples");				
+				PrintAndLogEx(DEBUG, "DEBUG: Error - IO prox not enough samples");
 			} else if (idx == -2) {
 				PrintAndLogEx(DEBUG, "DEBUG: Error - IO prox just noise detected");
 			} else if (idx == -3) {
-				PrintAndLogEx(DEBUG, "DEBUG: Error - IO prox error during fskdemod");        
+				PrintAndLogEx(DEBUG, "DEBUG: Error - IO prox error during fskdemod");
 			} else if (idx == -4) {
 				PrintAndLogEx(DEBUG, "DEBUG: Error - IO prox preamble not found");
 			} else if (idx == -5) {
@@ -114,15 +114,15 @@ int CmdIOProxDemod(const char *Cmd) {
 	}
 	setDemodBuf(bits, size, idx);
 	setClockGrid(64, waveIdx + (idx*64));
-	
+
 	if (idx == 0) {
 		if (g_debugMode) {
 			PrintAndLogEx(DEBUG, "DEBUG: Error - IO prox data not found - FSK Bits: %d", size);
 			if (size > 92) PrintAndLogEx(DEBUG, "%s", sprint_bin_break(bits, 92, 16));
-		} 
+		}
 		return retval;
 	}
-	
+
 	//Index map
 	//0           10          20          30          40          50          60
 	//|           |           |           |           |           |           |
@@ -131,7 +131,7 @@ int CmdIOProxDemod(const char *Cmd) {
 	//00000000 0 11110000 1 facility 1 version* 1 code*one 1 code*two 1 ???????? 11
 	//
 	//XSF(version)facility:codeone+codetwo (raw)
-	
+
 	PrintAndLogEx(DEBUG, "%d%d%d%d%d%d%d%d %d", bits[idx], bits[idx+1], bits[idx+2], bits[idx+3], bits[idx+4], bits[idx+5], bits[idx+6], bits[idx+7], bits[idx+8]);
 	PrintAndLogEx(DEBUG, "%d%d%d%d%d%d%d%d %d", bits[idx+9], bits[idx+10], bits[idx+11],bits[idx+12],bits[idx+13],bits[idx+14],bits[idx+15],bits[idx+16],bits[idx+17]);
 	PrintAndLogEx(DEBUG, "%d%d%d%d%d%d%d%d %d facility", bits[idx+18], bits[idx+19], bits[idx+20],bits[idx+21],bits[idx+22],bits[idx+23],bits[idx+24],bits[idx+25],bits[idx+26]);
@@ -139,7 +139,7 @@ int CmdIOProxDemod(const char *Cmd) {
 	PrintAndLogEx(DEBUG, "%d%d%d%d%d%d%d%d %d code1", bits[idx+36], bits[idx+37], bits[idx+38],bits[idx+39],bits[idx+40],bits[idx+41],bits[idx+42],bits[idx+43],bits[idx+44]);
 	PrintAndLogEx(DEBUG, "%d%d%d%d%d%d%d%d %d code2", bits[idx+45], bits[idx+46], bits[idx+47],bits[idx+48],bits[idx+49],bits[idx+50],bits[idx+51],bits[idx+52],bits[idx+53]);
 	PrintAndLogEx(DEBUG, "%d%d%d%d%d%d%d%d %d%d checksum", bits[idx+54],bits[idx+55],bits[idx+56],bits[idx+57],bits[idx+58],bits[idx+59],bits[idx+60],bits[idx+61],bits[idx+62],bits[idx+63]);
-	
+
 	uint32_t code = bytebits_to_byte(bits+idx,32);
 	uint32_t code2 = bytebits_to_byte(bits+idx+32,32);
 	uint8_t version = bytebits_to_byte(bits+idx+27,8); //14,4
@@ -156,13 +156,13 @@ int CmdIOProxDemod(const char *Cmd) {
 
 	char crcStr[30];
 	memset(crcStr, 0x00, sizeof(crcStr) );
-	
+
 	if (crc == calccrc) {
 		snprintf(crcStr, 3, "ok");
 		retval = 1;
 	} else {
 		PrintAndLogEx(DEBUG, "DEBUG: Error - IO prox crc failed");
-			
+
 		snprintf(crcStr, sizeof(crcStr), "failed 0x%02X != 0x%02X", crc, calccrc);
 		retval = 0;
 	}
@@ -172,7 +172,7 @@ int CmdIOProxDemod(const char *Cmd) {
 	if (g_debugMode){
 		PrintAndLogEx(DEBUG, "DEBUG: IO prox idx: %d, Len: %d, Printing demod buffer:", idx, size);
 		printDemodBuff();
-	}	
+	}
 	return retval;
 }
 
@@ -184,7 +184,7 @@ int CmdIOProxDemod(const char *Cmd) {
 //00000000 0 11110000 1 facility 1 version* 1 code*one 1 code*two 1 ???????? 11
 //XSF(version)facility:codeone+codetwo (raw)
 int getIOProxBits(uint8_t version, uint8_t fc, uint16_t cn, uint8_t *bits) {
-	#define SEPARATOR 1	
+	#define SEPARATOR 1
 	uint8_t pos=0;
 	// the return bits, preamble 0000 0000 0
 	uint8_t pre[64];
@@ -192,31 +192,31 @@ int getIOProxBits(uint8_t version, uint8_t fc, uint16_t cn, uint8_t *bits) {
 
 	// skip 9 zeros as preamble
 	pos = 9;
-	
+
 	// another fixed byte 11110000 = 0xF0
 	num_to_bytebits(0xF0, 8, pre+pos);
 	pos += 8;
 	pre[pos] = SEPARATOR;
-	pos++;	
-	
+	pos++;
+
 	// add facilitycode
 	num_to_bytebits(fc, 8, pre+pos);
 	pos += 8;
 	pre[pos] = SEPARATOR;
 	pos++;
-	
+
 	// add version
 	num_to_bytebits(version, 8, pre+pos);
 	pos += 8;
 	pre[pos] = SEPARATOR;
 	pos++;
-	
+
 	// cardnumber high byte
 	num_to_bytebits( ((cn & 0xFF00)>>8), 8, pre+pos);
 	pos += 8;
 	pre[pos] = SEPARATOR;
 	pos++;
-	
+
 	// cardnumber low byte
 	num_to_bytebits( (cn & 0xFF), 8, pre+pos);
 	pos += 8;
@@ -227,18 +227,18 @@ int getIOProxBits(uint8_t version, uint8_t fc, uint16_t cn, uint8_t *bits) {
 	uint16_t crc = 0;
 	for (uint8_t i=1; i<6; ++i)
 		crc += bytebits_to_byte(pre+9*i, 8);
-	
+
 	crc &= 0xFF;
 	crc = 0xff - crc;
 	num_to_bytebits(crc, 8, pre+pos);
 	pos += 8;
-		
+
 	// Final two ONES
 	pre[pos] = SEPARATOR;
 	pre[++pos] = SEPARATOR;
 
 	memcpy(bits, pre, sizeof(pre));
-	
+
 	PrintAndLogEx(SUCCESS, "IO raw bits:\n %s \n", sprint_bin(bits, 64));
 	return 1;
 }
@@ -249,30 +249,30 @@ int CmdIOProxSim(const char *Cmd) {
 	uint8_t bits[64];
 	size_t size = sizeof(bits);
 	memset(bits, 0x00, size);
- 
+
 	char cmdp = tolower(param_getchar(Cmd, 0));
 	if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_io_sim();
-	
+
   	version = param_get8(Cmd, 0);
 	fc = param_get8(Cmd, 1);
 	cn = param_get32ex(Cmd, 2, 0, 10);
 
 	if ( !version | !fc || !cn) return usage_lf_io_sim();
-	
+
 	if ((cn & 0xFFFF) != cn) {
 		cn &= 0xFFFF;
 		PrintAndLogEx(INFO, "Card Number Truncated to 16-bits (IOProx): %u", cn);
 	}
-	
+
 	// clock 64, FSK2a fcHIGH 10 | fcLOW 8
 	uint8_t clk = 64, invert = 1, high = 10, low = 8;
-	uint16_t arg1, arg2;	
+	uint16_t arg1, arg2;
 	arg1 = high << 8 | low;
 	arg2 = invert << 8 | clk;
 
 	PrintAndLogEx(SUCCESS, "Simulating IOProx version: %u FC: %u; CN: %u\n", version, fc, cn);
 	PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation or run another command");
-	
+
 	if ( !getIOProxBits(version, fc, cn, bits)) {
 		PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
 		return 1;
@@ -281,7 +281,7 @@ int CmdIOProxSim(const char *Cmd) {
 	// arg1 --- fcHigh<<8 + fcLow
 	// arg2 --- Invert and clk setting
 	// size --- 64 bits == 8 bytes
-	UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}};  
+	UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}};
 	memcpy(c.d.asBytes, bits, size);
 	clearCommandBuffer();
 	SendCommand(&c);
@@ -289,13 +289,13 @@ int CmdIOProxSim(const char *Cmd) {
 }
 
 int CmdIOProxClone(const char *Cmd) {
-	
+
 	uint32_t blocks[3] = {T55x7_MODULATION_FSK2a | T55x7_BITRATE_RF_64 | 2 << T55x7_MAXBLOCK_SHIFT, 0, 0};
 	uint16_t cn = 0;
 	uint8_t version = 0, fc = 0;
 	uint8_t bits[64];
 	memset(bits,0,sizeof(bits));
-	
+
 	char cmdp = param_getchar(Cmd, 0);
 	if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_io_clone();
 
@@ -304,17 +304,17 @@ int CmdIOProxClone(const char *Cmd) {
 	cn = param_get32ex(Cmd, 2, 0, 10);
 
 	if ( !version | !fc || !cn) return usage_lf_io_clone();
-	
+
 	if ((cn & 0xFFFF) != cn) {
 		cn &= 0xFFFF;
 		PrintAndLogEx(INFO, "Card Number Truncated to 16-bits (IOProx): %u", cn);
 	}
-	
+
 	if ( !getIOProxBits(version, fc, cn, bits)) {
 		PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
 		return 1;
 	}
-	
+
 	if (param_getchar(Cmd, 3) == 'Q' || param_getchar(Cmd, 3) == 'q')
 		blocks[0] = T5555_MODULATION_FSK2 | T5555_INVERT_OUTPUT | T5555_SET_BITRATE(64) | 2 << T5555_MAXBLOCK_SHIFT;
 
@@ -323,7 +323,7 @@ int CmdIOProxClone(const char *Cmd) {
 
 	PrintAndLogEx(INFO, "Preparing to clone IOProx to T55x7 with Version: %u FC: %u, CN: %u", version, fc, cn);
 	print_blocks(blocks, 3);
-	
+
 	//UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
 	UsbCommand c = {CMD_IO_CLONE_TAG, {blocks[1],blocks[2],0}};
 	clearCommandBuffer();
@@ -343,7 +343,7 @@ static command_t CommandTable[] = {
 int CmdLFIO(const char *Cmd){
 	clearCommandBuffer();
 	CmdsParse(CommandTable, Cmd);
-	return 0; 
+	return 0;
 }
 
 int CmdHelp(const char *Cmd) {
diff --git a/client/cmdlfjablotron.c b/client/cmdlfjablotron.c
index 541e7b31b..339752202 100644
--- a/client/cmdlfjablotron.c
+++ b/client/cmdlfjablotron.c
@@ -44,11 +44,11 @@ static uint8_t jablontron_chksum(uint8_t *bits){
 	for (int i=16; i < 56; i += 8) {
 		chksum += bytebits_to_byte(bits+i,8);
 	}
-	chksum ^= 0x3A;	
+	chksum ^= 0x3A;
 	return chksum;
 }
 
-int getJablotronBits(uint64_t fullcode, uint8_t *bits) {	
+int getJablotronBits(uint64_t fullcode, uint8_t *bits) {
 	//preamp
 	num_to_bytebits(0xFFFF, 16, bits);
 
@@ -72,7 +72,7 @@ int detectJablotron(uint8_t *bits, size_t *size) {
 	if (preambleSearch(bits, preamble, sizeof(preamble), size, &startIdx) == 0)
 		return -2; //preamble not found
 	if (*size != 64) return -3; // wrong demoded size
-	
+
 	uint8_t checkchksum = jablontron_chksum(bits+startIdx);
 	uint8_t crc = bytebits_to_byte(bits+startIdx+56, 8);
 	if ( checkchksum != crc ) return -5;
@@ -119,7 +119,7 @@ int CmdJablotronDemod(const char *Cmd) {
 
 	setDemodBuf(DemodBuffer, 64, ans);
 	setClockGrid(g_DemodClock, g_DemodStartIdx + (ans*g_DemodClock));
-	
+
 	//got a good demod
 	uint32_t raw1 = bytebits_to_byte(DemodBuffer, 32);
 	uint32_t raw2 = bytebits_to_byte(DemodBuffer+32, 32);
@@ -136,7 +136,7 @@ int CmdJablotronDemod(const char *Cmd) {
 	);
 
 	id = DEC2BCD(id);
-	// Printed format: 1410-nn-nnnn-nnnn	
+	// Printed format: 1410-nn-nnnn-nnnn
 	PrintAndLogEx(SUCCESS, "Printed: 1410-%02X-%04X-%04X",
 		(uint8_t)(id >> 32) & 0xFF,
 		(uint16_t)(id >> 16) & 0xFFFF,
@@ -157,33 +157,33 @@ int CmdJablotronClone(const char *Cmd) {
 
 	uint8_t bits[64];
 	memset(bits, 0, sizeof(bits));
-	
+
 	char cmdp = tolower(param_getchar(Cmd, 0));
 	if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_jablotron_clone();
 
 	fullcode = param_get64ex(Cmd, 0, 0, 16);
-	
+
 	//Q5
 	if (param_getchar(Cmd, 1) == 'Q' || param_getchar(Cmd, 1) == 'q')
 		blocks[0] = T5555_MODULATION_BIPHASE | T5555_INVERT_OUTPUT | T5555_SET_BITRATE(64) | 2 << T5555_MAXBLOCK_SHIFT;
-	
-	// clearing the topbit needed for the preambl detection. 
+
+	// clearing the topbit needed for the preambl detection.
 	if ((fullcode & 0x7FFFFFFFFF) != fullcode) {
 		fullcode &= 0x7FFFFFFFFF;
 		PrintAndLogEx(INFO, "Card Number Truncated to 39bits: %"PRIx64, fullcode);
 	}
-	
+
 	if ( !getJablotronBits(fullcode, bits)) {
 		PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
 		return 1;
-	}	
-	
+	}
+
 	blocks[1] = bytebits_to_byte(bits, 32);
 	blocks[2] = bytebits_to_byte(bits + 32, 32);
 
 	PrintAndLogEx(INFO, "Preparing to clone Jablotron to T55x7 with FullCode: %"PRIx64, fullcode);
 	print_blocks(blocks, 3);
-	
+
 	UsbCommand resp;
 	UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
 
@@ -208,12 +208,12 @@ int CmdJablotronSim(const char *Cmd) {
 
 	fullcode = param_get64ex(Cmd, 0, 0, 16);
 
-	// clearing the topbit needed for the preambl detection. 
+	// clearing the topbit needed for the preambl detection.
 	if ((fullcode & 0x7FFFFFFFFF) != fullcode) {
 		fullcode &= 0x7FFFFFFFFF;
 		PrintAndLogEx(INFO, "Card Number Truncated to 39bits: %"PRIx64, fullcode);
 	}
-	
+
 	uint8_t clk = 64, encoding = 2, separator = 0, invert = 1;
 	uint16_t arg1, arg2;
 	size_t size = 64;
diff --git a/client/cmdlfkeri.c b/client/cmdlfkeri.c
index 560cd5c96..79fc9e6f1 100644
--- a/client/cmdlfkeri.c
+++ b/client/cmdlfkeri.c
@@ -5,7 +5,7 @@
 // the license.
 //-----------------------------------------------------------------------------
 // Low frequency KERI tag commands
-// PSK1, RF/128, RF/2, 64 bits long 
+// PSK1, RF/128, RF/2, 64 bits long
 //-----------------------------------------------------------------------------
 #include "cmdlfkeri.h"
 
@@ -40,24 +40,24 @@ int usage_lf_keri_sim(void) {
 
 // find KERI preamble in already demoded data
 int detectKeri(uint8_t *dest, size_t *size, bool *invert) {
-	
+
 	uint8_t preamble[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1};
 	uint8_t preamble_i[] = {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0};
 
-	// sanity check. 
+	// sanity check.
 	if ( *size < sizeof(preamble) + 100) return -1;
 
 	size_t startIdx = 0;
-	
+
 	if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx)) {
-		
+
 		// if didn't find preamble try again inverting
-		if (!preambleSearch(DemodBuffer, preamble_i, sizeof(preamble_i), size, &startIdx)) 
+		if (!preambleSearch(DemodBuffer, preamble_i, sizeof(preamble_i), size, &startIdx))
 			return -2;
-		
+
 		*invert ^= 1;
 	}
-	
+
 	if (*size != 64) return -3; //wrong demoded size
 
 	return (int)startIdx;
@@ -69,7 +69,7 @@ int CmdKeriDemod(const char *Cmd) {
 		PrintAndLogEx(DEBUG, "DEBUG: Error - KERI: PSK1 Demod failed");
 		return 0;
 	}
-	bool invert = false;	
+	bool invert = false;
 	size_t size = DemodBufferLen;
 	int idx = detectKeri(DemodBuffer, &size, &invert);
 	if (idx < 0) {
@@ -90,35 +90,35 @@ int CmdKeriDemod(const char *Cmd) {
 	//got a good demod
 	uint32_t raw1 = bytebits_to_byte(DemodBuffer   , 32);
 	uint32_t raw2 = bytebits_to_byte(DemodBuffer+32, 32);
-	
+
 	//get internal id
-	uint32_t ID = bytebits_to_byte(DemodBuffer+29, 32);	
+	uint32_t ID = bytebits_to_byte(DemodBuffer+29, 32);
 	ID &= 0x7FFFFFFF;
-	
+
 	/*
 		000000000000000000000000000001XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX111
 		^^^^^^^^^^^^^^^^^^^^^^^^^^^^^1###############################^^^
 		Preamble block 29 bits of ZEROS
-		32 bit Internal ID  (First bit always 1) 
+		32 bit Internal ID  (First bit always 1)
 		3 bit of 1s in the end
-		
+
 		How this is decoded to Facility ID, Card number is unknown
 		Facility ID =  0-31  (indicates 5 bits)
 		Card number = up to 10 digits
-		
+
 		Might be a hash of FC & CN to generate Internal ID
 	*/
-	
+
 	PrintAndLogEx(SUCCESS, "KERI Tag Found -- Internal ID: %u", ID);
 	PrintAndLogEx(SUCCESS, "Raw: %08X%08X", raw1 ,raw2);
-	
+
 	if (invert){
 		PrintAndLogEx(INFO, "Had to Invert - probably KERI");
 		for (size_t i = 0; i < size; i++)
 			DemodBuffer[i] ^= 1;
-		
+
 		CmdPrintDemodBuff("x");
-	} 
+	}
 	return 1;
 }
 
@@ -132,38 +132,38 @@ int CmdKeriClone(const char *Cmd) {
 	uint32_t internalid = 0;
 	uint32_t blocks[3] = {
 			T55x7_TESTMODE_DISABLED |
-			T55x7_X_MODE | 
-			T55x7_MODULATION_PSK1 | 
-			T55x7_PSKCF_RF_2 | 
+			T55x7_X_MODE |
+			T55x7_MODULATION_PSK1 |
+			T55x7_PSKCF_RF_2 |
 			2 << T55x7_MAXBLOCK_SHIFT,
 			0,
 			0};
-	
+
 	// dynamic bitrate used
 	blocks[0] |= 0xF << 18;
-	
+
 	char cmdp = tolower(param_getchar(Cmd, 0));
 	if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_keri_clone();
 
 	internalid = param_get32ex(Cmd, 0, 0, 10);
-	
+
 	//Q5
 	if (tolower(param_getchar(Cmd, 1)) == 'q') {
-		blocks[0] = 
-			T5555_MODULATION_PSK1 | 
-			T5555_SET_BITRATE(128) | 
-			T5555_PSK_RF_2 | 
+		blocks[0] =
+			T5555_MODULATION_PSK1 |
+			T5555_SET_BITRATE(128) |
+			T5555_PSK_RF_2 |
 			2 << T5555_MAXBLOCK_SHIFT;
 	}
-	
-	
+
+
 	// MSB is ONE
 	internalid |= 0x80000000;
 
 	// 3 LSB is ONE
 	uint64_t data =  ((uint64_t)internalid << 3 ) + 7;
-	
-	// 
+
+	//
 	blocks[1] = data >> 32;
 	blocks[2] = data & 0xFFFFFFFF;
 
@@ -199,21 +199,21 @@ int CmdKeriSim(const char *Cmd) {
 	internalid <<= 3;
 	internalid += 7;
 
-	uint8_t bits[64] = {0x00};	
+	uint8_t bits[64] = {0x00};
 	// loop to bits
 	uint8_t j = 0;
 	for ( int8_t i = 63; i >= 0; --i) {
 		bits[j++] = ((internalid >> i) & 1 );
 	}
-	
+
 	uint8_t clk = 32, carrier = 2, invert = 0;
 	uint16_t arg1, arg2;
 	size_t size = 64;
 	arg1 = clk << 8 | carrier;
 	arg2 = invert;
-	
+
 	PrintAndLogEx(SUCCESS, "Simulating KERI - Internal Id: %u", internalid);
-	
+
 	UsbCommand c = {CMD_PSK_SIM_TAG, {arg1, arg2, size}};
 	memcpy(c.d.asBytes, bits, size);
 	clearCommandBuffer();
@@ -227,7 +227,7 @@ static command_t CommandTable[] = {
 	{"demod", CmdKeriDemod,	1, "Demodulate an KERI tag from the GraphBuffer"},
 	{"read",  CmdKeriRead,	0, "Attempt to read and extract tag data from the antenna"},
 	{"clone", CmdKeriClone,	0, "clone KERI to T55x7"},
-	{"sim",   CmdKeriSim,	0, "simulate KERI tag"},	
+	{"sim",   CmdKeriSim,	0, "simulate KERI tag"},
 	{NULL, NULL, 0, NULL}
 };
 
diff --git a/client/cmdlfnedap.c b/client/cmdlfnedap.c
index 25f9b624b..353ff535d 100644
--- a/client/cmdlfnedap.c
+++ b/client/cmdlfnedap.c
@@ -61,10 +61,10 @@ int GetNedapBits(uint32_t cn, uint8_t *nedapBits) {
 
 	// fixed tagtype code?  0010 1101 = 0x2D
 	num_to_bytebits(0x2D, 8, pre+10);
-	
+
 	// 46 encrypted bits - UNKNOWN ALGO
 	//    -- 16 bits checksum. Should be 4x4 checksum,  based on UID and 2 constant values.
-	//    -- 30 bits undocumented?  
+	//    -- 30 bits undocumented?
 	//num_to_bytebits(cn, 46, pre+18);
 
 	//----from this part, the UID in clear text, with a 1bit ZERO as separator between bytes.
@@ -75,7 +75,7 @@ int GetNedapBits(uint32_t cn, uint8_t *nedapBits) {
 	pre[100] = 0;
 	pre[109] = 0;
 	pre[118] = 0;
-	
+
 	// cardnumber (uid)
 	num_to_bytebits( (cn >>  0) & 0xFF, 8, pre+65);
 	num_to_bytebits( (cn >>  8) & 0xFF, 8, pre+74);
@@ -84,19 +84,19 @@ int GetNedapBits(uint32_t cn, uint8_t *nedapBits) {
 	// two ?
 	num_to_bytebits( 0, 8, pre+92);
 	num_to_bytebits( 0, 8, pre+101);
-	
-	// chksum 
-	num_to_bytebits( (0 >> 0) & 0xFF, 8, pre+110);
-	num_to_bytebits( (0 >> 8) & 0xFF, 8, pre+119);	
 
-	
+	// chksum
+	num_to_bytebits( (0 >> 0) & 0xFF, 8, pre+110);
+	num_to_bytebits( (0 >> 8) & 0xFF, 8, pre+119);
+
+
 	// add paritybits	(bitsource, dest, sourcelen, paritylen, parityType (odd, even,)
 	addParity(pre, pre+64, 64, 8, 1);
 	addParity(pre+64, pre+64, 64, 8, 1);
 
 	pre[63] = GetParity( DemodBuffer, EVEN, 63);
 	pre[127] = GetParity( DemodBuffer+64, EVEN, 63);
-	
+
 	memcpy(nedapBits, pre, 128);
 
 	// 1111111110001011010000010110100011001001000010110101001101011001000110011010010000000000100001110001001000000001000101011100111
@@ -110,7 +110,7 @@ int GetNedapBits(uint32_t cn, uint8_t *nedapBits) {
 //GetParity( uint8_t *bits, uint8_t type, int length)
 
 //NEDAP demod - ASK/Biphase (or Diphase),  RF/64 with preamble of 1111111110  (always a 128 bit data stream)
-//print NEDAP Prox ID, encoding, encrypted ID, 
+//print NEDAP Prox ID, encoding, encrypted ID,
 
 int CmdLFNedapDemod(const char *Cmd) {
 	//raw ask demod no start bit finding just get binary from wave
@@ -141,19 +141,19 @@ int CmdLFNedapDemod(const char *Cmd) {
 /* Index map                                                      E                                                                              E
  preamble    enc tag type         encrypted uid                   P d    33    d    90    d    04    d    71    d    40    d    45    d    E7    P
  1111111110 00101101000001011010001100100100001011010100110101100 1 0 00110011 0 10010000 0 00000100 0 01110001 0 01000000 0 01000101 0 11100111 1
-                                                                         uid2       uid1       uid0         I          I          R           R    
- 1111111110 00101101000001011010001100100100001011010100110101100 1 
- 
- 0 00110011 
- 0 10010000 
+                                                                         uid2       uid1       uid0         I          I          R           R
+ 1111111110 00101101000001011010001100100100001011010100110101100 1
+
+ 0 00110011
+ 0 10010000
  0 00000100
  0 01110001
  0 01000000
  0 01000101
  0 11100111
  1
- 
-	 Tag ID is 049033 
+
+	 Tag ID is 049033
 	 I = Identical on all tags
 	 R = Random ?
 	 UID2, UID1, UID0 == card number
@@ -167,7 +167,7 @@ int CmdLFNedapDemod(const char *Cmd) {
 	raw[3] = bytebits_to_byte(DemodBuffer+idx,32);
 	setDemodBuf(DemodBuffer, 128, idx);
 	setClockGrid(g_DemodClock, g_DemodStartIdx + (idx*g_DemodClock));
-	
+
 	uint8_t firstParity = GetParity( DemodBuffer, EVEN, 63);
 	if ( firstParity != DemodBuffer[63]  ) {
 		PrintAndLogEx(DEBUG, "DEBUG: Error - Nedap 1st 64bit parity check failed:  %d|%d ", DemodBuffer[63], firstParity);
@@ -187,9 +187,9 @@ int CmdLFNedapDemod(const char *Cmd) {
 	uid |= bytebits_to_byte(DemodBuffer+83, 8) << 16;
 
 	uint16_t two = 0;
-	two =  bytebits_to_byte(DemodBuffer+92, 8); 
+	two =  bytebits_to_byte(DemodBuffer+92, 8);
 	two |= bytebits_to_byte(DemodBuffer+101, 8) << 8;
-	
+
 	uint16_t chksum2 = 0;
 	chksum2 =  bytebits_to_byte(DemodBuffer+110, 8);
 	chksum2 |= bytebits_to_byte(DemodBuffer+119, 8) << 8;
@@ -249,11 +249,11 @@ int CmdLFNedapClone(const char *Cmd) {
 	if (sscanf(Cmd, "%u", &cn ) != 1) return usage_lf_nedap_clone();
 
 	cardnumber = (cn & 0x00FFFFFF);
-	
+
 	if ( !GetNedapBits(cardnumber, bits)) {
 		PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
 		return 1;
-	}	
+	}
 
 	((ASK/DIphase   data rawdemod ab 0 64 1 0
 	//NEDAP - compat mode, ASK/DIphase, data rate 64, 4 data blocks
@@ -291,32 +291,32 @@ int CmdLFNedapClone(const char *Cmd) {
 int CmdLFNedapSim(const char *Cmd) {
 
 	uint32_t cardnumber = 0, cn = 0;
-	
+
 	char cmdp = param_getchar(Cmd, 0);
 	if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_nedap_sim();
 
 	if (sscanf(Cmd, "%u", &cn ) != 1) return usage_lf_nedap_sim();
-	
+
 	cardnumber = (cn & 0x00FFFFFF);
-	
+
 	uint8_t bs[128];
 	size_t size = sizeof(bs);
 	memset(bs, 0x00, size);
-	
+
 	// NEDAP,  Biphase = 2, clock 64, inverted,  (DIPhase == inverted BIphase
 	uint8_t  clk = 64, encoding = 2, separator = 0, invert = 1;
 	uint16_t arg1, arg2;
 	arg1 = clk << 8 | encoding;
 	arg2 = invert << 8 | separator;
-	
+
 	if ( !GetNedapBits(cardnumber, bs)) {
 		PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
 		return 1;
-	}	
+	}
 
 	PrintAndLogEx(SUCCESS, "bin  %s", sprint_bin_break(bs, 128, 32));
 	PrintAndLogEx(SUCCESS, "Simulating Nedap - CardNumber: %u", cardnumber );
-	
+
 	UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};
 	memcpy(c.d.asBytes, bs, size);
 	clearCommandBuffer();
@@ -329,51 +329,51 @@ int CmdLFNedapChk(const char *Cmd){
 	uint8_t data[256] = { 0x30, 0x16, 0x00, 0x71, 0x40, 0x21, 0xBE};
 	int len = 0;
 	param_gethex_ex(Cmd, 0, data, &len);
-	
+
 	len = ( len == 0 ) ? 5 : len>>1;
-	
+
 	PrintAndLogEx(SUCCESS, "Input: [%d] %s", len, sprint_hex(data, len));
-	
+
 	//uint8_t last = GetParity(data, EVEN, 62);
 	//PrintAndLogEx(NORMAL, "TEST PARITY::  %d | %d ", DemodBuffer[62], last);
 
     uint8_t cl = 0x1D, ch = 0x1D, carry = 0;
     uint8_t al, bl, temp;
-    
+
 	for (int i =len; i >= 0; --i){
 		al = data[i];
         for (int j = 8; j > 0; --j) {
-			
+
             bl = al ^ ch;
 			//PrintAndLogEx(NORMAL, "BL %02x | CH %02x \n", al, ch);
-			
+
             carry = (cl & 0x80) ? 1 : 0;
             cl <<= 1;
-            
+
             temp = (ch & 0x80) ? 1 : 0;
             ch = (ch << 1) | carry;
             carry = temp;
-            
+
             carry = (al & 0x80) ? 1 : 0;
             al <<= 1;
-            
+
             carry = (bl & 0x80) ? 1 : 0;
             bl <<= 1;
-            
+
             if (carry) {
                 cl ^= 0x21;
                 ch ^= 0x10;
             }
         }
     }
-	
+
 	PrintAndLogEx(SUCCESS, "Nedap checksum: 0x%X", ((ch << 8) | cl) );
 	return 0;
 }
 
 static command_t CommandTable[] = {
     {"help",	CmdHelp,		1, "this help"},
-	{"demod",	CmdLFNedapDemod,0, "demodulate an Nedap tag from the GraphBuffer"},	
+	{"demod",	CmdLFNedapDemod,0, "demodulate an Nedap tag from the GraphBuffer"},
 	{"read",	CmdLFNedapRead, 0, "attempt to read and extract tag data"},
 //	{"clone",	CmdLFNedapClone,0, "<Card Number>  clone nedap tag"},
 	{"sim",		CmdLFNedapSim,  0, "simulate nedap tag"},
diff --git a/client/cmdlfnexwatch.c b/client/cmdlfnexwatch.c
index 4057fe452..dd6bf3ff9 100644
--- a/client/cmdlfnexwatch.c
+++ b/client/cmdlfnexwatch.c
@@ -16,7 +16,7 @@ int detectNexWatch(uint8_t *dest, size_t *size, bool *invert) {
 
 	uint8_t preamble[28]   = {0,0,0,0,0,1,0,1,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
 	uint8_t preamble_i[28] = {1,1,1,1,1,0,1,0,1,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1};
-	// sanity check. 
+	// sanity check.
 	if ( *size < sizeof(preamble) + 100) return -1;
 
 	size_t startIdx = 0;
@@ -26,7 +26,7 @@ int detectNexWatch(uint8_t *dest, size_t *size, bool *invert) {
 		if (!preambleSearch(DemodBuffer, preamble_i, sizeof(preamble_i), size, &startIdx)) return -4;
 		*invert ^= 1;
 	}
-	
+
 	// size tests?
 	return (int) startIdx;
 }
@@ -56,18 +56,18 @@ int CmdNexWatchDemod(const char *Cmd) {
 
 		return 0;
 	}
-	
+
 	setDemodBuf(DemodBuffer, size, idx+4);
 	setClockGrid(g_DemodClock, g_DemodStartIdx + ((idx+4)*g_DemodClock));
-	
+
 	idx = 8+32; // 8 = preamble, 32 = reserved bits (always 0)
-	
+
 	//get ID
 	uint32_t ID = 0;
 	for (uint8_t k = 0; k < 4; k++){
 		for (uint8_t m = 0; m < 8; m++){
 			ID = (ID << 1) | DemodBuffer[m + k + (m*4)];
-		}	
+		}
 	}
 	//parity check (TBD)
 
@@ -79,7 +79,7 @@ int CmdNexWatchDemod(const char *Cmd) {
 		PrintAndLogEx(NORMAL, "Had to Invert - probably NexKey");
 		for (size_t i = 0; i < size; i++)
 			DemodBuffer[i] ^= 1;
-	} 
+	}
 
 	CmdPrintDemodBuff("x");
 	return 1;
@@ -100,7 +100,7 @@ static command_t CommandTable[] = {
 };
 
 int CmdLFNEXWATCH(const char *Cmd) {
-	clearCommandBuffer();	
+	clearCommandBuffer();
 	CmdsParse(CommandTable, Cmd);
 	return 0;
 }
diff --git a/client/cmdlfnexwatch.h b/client/cmdlfnexwatch.h
index 73a44f919..82782926a 100644
--- a/client/cmdlfnexwatch.h
+++ b/client/cmdlfnexwatch.h
@@ -20,7 +20,7 @@
 #include "cmdparser.h"
 #include "cmddata.h" // preamblesearch
 #include "cmdlf.h"
-#include "lfdemod.h"  
+#include "lfdemod.h"
 
 extern int CmdLFNEXWATCH(const char *Cmd);
 extern int CmdNexWatchDemod(const char *Cmd);
diff --git a/client/cmdlfnoralsy.c b/client/cmdlfnoralsy.c
index 0f61e26ea..a858feb2e 100644
--- a/client/cmdlfnoralsy.c
+++ b/client/cmdlfnoralsy.c
@@ -46,7 +46,7 @@ static uint8_t noralsy_chksum( uint8_t* bits, uint8_t len) {
         sum ^= bytebits_to_byte(bits+i, 4);
     return sum & 0x0F ;
 }
-int getnoralsyBits(uint32_t id, uint16_t year, uint8_t *bits) {	
+int getnoralsyBits(uint32_t id, uint16_t year, uint8_t *bits) {
 	//preamp
 	num_to_bytebits(0xBB0214FF, 32, bits);  // --> Have seen 0xBB0214FF / 0xBB0314FF  UNKNOWN
 
@@ -54,15 +54,15 @@ int getnoralsyBits(uint32_t id, uint16_t year, uint8_t *bits) {
 	id = DEC2BCD(id);
 	year = DEC2BCD(year);
 	year &= 0xFF;
-	
+
 	uint16_t sub1 = (id & 0xFFF0000) >> 16;
 	uint8_t sub2 = (id & 0x000FF00) >> 8;
 	uint8_t sub3 = (id & 0x00000FF);
-	
+
 	num_to_bytebits(sub1, 12, bits+32);
 	num_to_bytebits(year, 8, bits+44);
 	num_to_bytebits(0, 4, bits+52);   // --> UNKNOWN. Flag?
-	
+
 	num_to_bytebits(sub2, 8, bits+56);
 	num_to_bytebits(sub3, 8, bits+64);
 
@@ -91,12 +91,12 @@ int detectNoralsy(uint8_t *dest, size_t *size) {
 * 2520116 | BB0214FF2529900116360000 | 10111011 00000011 00010100 11111111 00100101 00101001 10010000 00000001 00010110 00110110 00000000 00000000
 *           aaa*aaaaiiiYY*iiiicc----                ****                   iiiiiiii iiiiYYYY YYYY**** iiiiiiii iiiiiiii cccccccc
 *
-* a = fixed value BB0*14FF 
+* a = fixed value BB0*14FF
 * i = printed id, BCD-format
 * Y = year
 * c = checksum
 * * = unknown
-* 
+*
 **/
 
 //see ASKDemod for what args are accepted
@@ -130,7 +130,7 @@ int CmdNoralsyDemod(const char *Cmd) {
 	}
 	setDemodBuf(DemodBuffer, 96, ans);
 	setClockGrid(g_DemodClock, g_DemodStartIdx + (ans*g_DemodClock));
-	
+
 	//got a good demod
 	uint32_t raw1 = bytebits_to_byte(DemodBuffer, 32);
 	uint32_t raw2 = bytebits_to_byte(DemodBuffer+32, 32);
@@ -144,7 +144,7 @@ int CmdNoralsyDemod(const char *Cmd) {
 	uint16_t year = (raw2 & 0x000ff000) >> 12;
 	year = BCD2DEC(year);
 	year += ( year > 60 ) ? 1900: 2000;
-	
+
 	// calc checksums
 	uint8_t calc1 = noralsy_chksum(DemodBuffer+32, 40);
 	uint8_t calc2 = noralsy_chksum(DemodBuffer, 76);
@@ -152,7 +152,7 @@ int CmdNoralsyDemod(const char *Cmd) {
 	chk1 = bytebits_to_byte(DemodBuffer+72, 4);
 	chk2 = bytebits_to_byte(DemodBuffer+76, 4);
 	// test checksums
-	if ( chk1 != calc1 ) { 
+	if ( chk1 != calc1 ) {
 		if (g_debugMode) PrintAndLogEx(DEBUG, "DEBUG: Error - Noralsy: checksum 1 failed %x - %x\n", chk1, calc1);
 		return 0;
 	}
@@ -160,7 +160,7 @@ int CmdNoralsyDemod(const char *Cmd) {
 		if (g_debugMode) PrintAndLogEx(DEBUG, "DEBUG: Error - Noralsy: checksum 2 failed %x - %x\n", chk2, calc2);
 		return 0;
 	}
-	
+
 	PrintAndLogEx(SUCCESS, "Noralsy Tag Found: Card ID %u, Year: %u Raw: %08X%08X%08X", cardid, year, raw1 ,raw2, raw3);
 	if (raw1 != 0xBB0214FF) {
 		PrintAndLogEx(WARNING, "Unknown bits set in first block! Expected 0xBB0214FF, Found: 0x%08X", raw1);
@@ -175,36 +175,36 @@ int CmdNoralsyRead(const char *Cmd) {
 }
 
 int CmdNoralsyClone(const char *Cmd) {
-	
+
 	uint16_t year = 0;
 	uint32_t id = 0;
 	uint32_t blocks[4] = {T55x7_MODULATION_MANCHESTER | T55x7_BITRATE_RF_32 | T55x7_ST_TERMINATOR | 3 << T55x7_MAXBLOCK_SHIFT, 0, 0};
 	uint8_t bits[96];
 	memset(bits, 0, sizeof(bits));
-	
+
 	char cmdp = param_getchar(Cmd, 0);
 	if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_noralsy_clone();
 
 	id = param_get32ex(Cmd, 0, 0, 10);
 	year = param_get32ex(Cmd, 1, 2000, 10);
-	
+
 	//Q5
 	if (param_getchar(Cmd, 2) == 'Q' || param_getchar(Cmd, 2) == 'q')
 		blocks[0] = T5555_MODULATION_MANCHESTER | T5555_SET_BITRATE(32) | T5555_ST_TERMINATOR | 3 << T5555_MAXBLOCK_SHIFT;
-	
+
 	 if ( !getnoralsyBits(id, year, bits)) {
 		PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
 		return 1;
-	}	
-	
-	// 
+	}
+
+	//
 	blocks[1] = bytebits_to_byte(bits, 32);
 	blocks[2] = bytebits_to_byte(bits + 32, 32);
 	blocks[3] = bytebits_to_byte(bits + 64, 32);
 
 	PrintAndLogEx(INFO, "Preparing to clone Noralsy to T55x7 with CardId: %u", id);
 	print_blocks(blocks, 4);
-	
+
 	UsbCommand resp;
 	UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
 
@@ -241,12 +241,12 @@ int CmdNoralsySim(const char *Cmd) {
 	size_t size = 96;
 	arg1 = clk << 8 | encoding;
 	arg2 = invert << 8 | separator;
-	
+
 	 if ( !getnoralsyBits(id, year, bs)) {
 		PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
 		return 1;
-	}	
-	
+	}
+
 	PrintAndLogEx(SUCCESS, "Simulating Noralsy - CardId: %u", id);
 
 	UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};
diff --git a/client/cmdlfpac.c b/client/cmdlfpac.c
index 73086ce59..a6a79e64a 100644
--- a/client/cmdlfpac.c
+++ b/client/cmdlfpac.c
@@ -55,10 +55,10 @@ int CmdPacDemod(const char *Cmd) {
 	uint32_t raw3 = bytebits_to_byte(DemodBuffer+64, 32);
 	uint32_t raw4 = bytebits_to_byte(DemodBuffer+96, 32);
 
-	// preamble     then appears to have marker bits of "10"                                                                                                                                       CS?    
+	// preamble     then appears to have marker bits of "10"                                                                                                                                       CS?
 	// 11111111001000000 10 01001100 10 00001101 10 00001101 10 00001101 10 00001101 10 00001101 10 00001101 10 00001101 10 00001101 10 10001100 10 100000001
 	// unknown checksum 9 bits at the end
-	
+
 	PrintAndLogEx(NORMAL, "PAC/Stanley Tag Found -- Raw: %08X%08X%08X%08X", raw1 ,raw2, raw3, raw4);
 	PrintAndLogEx(NORMAL, "\nHow the Raw ID is translated by the reader is unknown");
 	return 1;
diff --git a/client/cmdlfparadox.c b/client/cmdlfparadox.c
index 139797a66..113036d6f 100644
--- a/client/cmdlfparadox.c
+++ b/client/cmdlfparadox.c
@@ -41,28 +41,28 @@ int usage_lf_paradox_sim(void) {
 int detectParadox(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32_t *lo, int *waveStartIdx) {
 	//make sure buffer has data
 	if (*size < 96*50) return -1;
-	
+
 	signal_t *sp = getSignalProperties();
 	if (sp->isnoise) return -2;
-	
+
 	// FSK demodulator
 	*size = fskdemod(dest, *size, 50, 1, 10, 8, waveStartIdx); // paradox fsk2a
 
-	//did we get a good demod?	
+	//did we get a good demod?
 	if (*size < 96) return -3;
 
 	// 00001111 bit pattern represent start of frame, 01 pattern represents a 0 and 10 represents a 1
-	size_t startIdx = 0;	
+	size_t startIdx = 0;
 	uint8_t preamble[] = {0,0,0,0,1,1,1,1};
-	if (preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx)) 
+	if (preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
 		return -4; //preamble not found
 
 	size_t numStart = startIdx + sizeof(preamble);
 	// final loop, go over previously decoded FSK data and manchester decode into usable tag ID
 	for (size_t idx = numStart; (idx-numStart) < *size - sizeof(preamble); idx+=2){
-		if (dest[idx] == dest[idx+1]) 
+		if (dest[idx] == dest[idx+1])
 			return -5; //not manchester data
-		
+
 		*hi2 = (*hi2 << 1) | (*hi >> 31);
 		*hi = (*hi << 1) | (*lo >> 31);
 		//Then, shift in a 0 or one into low
@@ -86,8 +86,8 @@ int CmdParadoxDemod(const char *Cmd) {
 		PrintAndLogEx(DEBUG, "DEBUG: Error - Paradox not enough samples");
 		return 0;
 	}
-	
-	uint32_t hi2=0, hi=0, lo=0;	
+
+	uint32_t hi2=0, hi=0, lo=0;
 	int waveIdx=0;
 	//get binary from fsk wave
 	int idx = detectParadox(bits, &size, &hi2, &hi, &lo, &waveIdx);
@@ -96,7 +96,7 @@ int CmdParadoxDemod(const char *Cmd) {
 		if (idx == -1)
 			PrintAndLogEx(DEBUG, "DEBUG: Error - Paradox not enough samples");
 		else if (idx == -2)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - Paradox just noise detected");     
+			PrintAndLogEx(DEBUG, "DEBUG: Error - Paradox just noise detected");
 		else if (idx == -3)
 			PrintAndLogEx(DEBUG, "DEBUG: Error - Paradox problem during FSK demod");
 		else if (idx == -4)
@@ -105,18 +105,18 @@ int CmdParadoxDemod(const char *Cmd) {
 			PrintAndLogEx(DEBUG, "DEBUG: Error - Paradox error in Manchester data, size %d", size);
 		else
 			PrintAndLogEx(DEBUG, "DEBUG: Error - Paradox error demoding fsk %d", idx);
-		
+
 		return 0;
 	}
 
 	setDemodBuf(bits, size, idx);
-	setClockGrid(50, waveIdx + (idx*50));	
-	
+	setClockGrid(50, waveIdx + (idx*50));
+
 	if (hi2==0 && hi==0 && lo==0){
 		if (g_debugMode) PrintAndLogEx(DEBUG, "DEBUG: Error - Paradox no value found");
 		return 0;
 	}
-		
+
 	uint32_t fc = ((hi & 0x3)<<6) | (lo>>26);
 	uint32_t cardnum = (lo>>10) & 0xFFFF;
 	uint32_t rawLo = bytebits_to_byte(bits + idx + 64, 32);
@@ -125,14 +125,14 @@ int CmdParadoxDemod(const char *Cmd) {
 
 	PrintAndLogEx(NORMAL, "Paradox TAG ID: %x%08x - FC: %d - Card: %d - Checksum: %02x - RAW: %08x%08x%08x",
 		hi >> 10,
-		(hi & 0x3)<<26 | (lo>>10), 
+		(hi & 0x3)<<26 | (lo>>10),
 		fc, cardnum,
 		(lo>>2) & 0xFF,
 		rawHi2,
 		rawHi,
 		rawLo
 	);
-	
+
 	PrintAndLogEx(DEBUG, "DEBUG: Paradox idx: %d, len: %d, Printing Demod Buffer:", idx, size);
 	if (g_debugMode)
 		printDemodBuff();
@@ -142,7 +142,7 @@ int CmdParadoxDemod(const char *Cmd) {
 //by marshmellow
 //see ASKDemod for what args are accepted
 int CmdParadoxRead(const char *Cmd) {
-	lf_read(true, 10000);	
+	lf_read(true, 10000);
 	return CmdParadoxDemod(Cmd);
 }
 
@@ -152,29 +152,29 @@ int CmdParadoxSim(const char *Cmd) {
 	if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_paradox_sim();
 
 	uint32_t facilitycode = 0, cardnumber = 0, fc = 0, cn = 0;
-	
+
 	uint8_t bs[96];
 	size_t size = sizeof(bs);
 	memset(bs, 0x00, size);
-	
+
 	// Paradox uses:  fcHigh: 10, fcLow: 8, clk: 50, invert: 1  FSK2a
 	uint8_t clk = 50, invert = 1, high = 10, low = 8;
-	uint16_t arg1, arg2;	
+	uint16_t arg1, arg2;
 	arg1 = high << 8 | low;
 	arg2 = invert << 8 | clk;
-	
+
 	if (sscanf(Cmd, "%u %u", &fc, &cn ) != 2) return usage_lf_paradox_sim();
 
 	facilitycode = (fc & 0x000000FF);
 	cardnumber = (cn & 0x0000FFFF);
-	
+
 	// if ( !GetParadoxBits(facilitycode, cardnumber, bs)) {
 		// PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
 		// return 1;
-	// }	
+	// }
 
 	PrintAndLogEx(NORMAL, "Simulating Paradox - Facility Code: %u, CardNumber: %u", facilitycode, cardnumber );
-	
+
 	UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}};
 	memcpy(c.d.asBytes, bs, size);
 	clearCommandBuffer();
@@ -189,7 +189,7 @@ static command_t CommandTable[] = {
 	{"demod", CmdParadoxDemod,	1, "Demodulate a Paradox FSK tag from the GraphBuffer"},
 	{"read",  CmdParadoxRead,	0, "Attempt to read and Extract tag data from the antenna"},
 //	{"clone",	CmdParadoxClone,0, "clone paradox tag"},
-	{"sim",		CmdParadoxSim,	0, "simulate paradox tag"},	
+	{"sim",		CmdParadoxSim,	0, "simulate paradox tag"},
 	{NULL, NULL, 0, NULL}
 };
 
diff --git a/client/cmdlfpcf7931.c b/client/cmdlfpcf7931.c
index 59ef1c818..c47a44e7b 100644
--- a/client/cmdlfpcf7931.c
+++ b/client/cmdlfpcf7931.c
@@ -30,7 +30,7 @@ static int CmdHelp(const char *Cmd);
 struct pcf7931_config configPcf = {
 	{0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF},
 	PCF7931_DEFAULT_INITDELAY,
-	PCF7931_DEFAULT_OFFSET_WIDTH, 
+	PCF7931_DEFAULT_OFFSET_WIDTH,
 	PCF7931_DEFAULT_OFFSET_POSITION
 	};
 
@@ -38,8 +38,8 @@ struct pcf7931_config configPcf = {
 int pcf7931_resetConfig(){
 	memset(configPcf.Pwd, 0xFF, sizeof(configPcf.Pwd) );
 	configPcf.InitDelay = PCF7931_DEFAULT_INITDELAY;
-	configPcf.OffsetWidth = PCF7931_DEFAULT_OFFSET_WIDTH; 
-	configPcf.OffsetPosition = PCF7931_DEFAULT_OFFSET_POSITION; 
+	configPcf.OffsetWidth = PCF7931_DEFAULT_OFFSET_WIDTH;
+	configPcf.OffsetPosition = PCF7931_DEFAULT_OFFSET_POSITION;
 	return 0;
 }
 
@@ -85,7 +85,7 @@ int usage_pcf7931_config(){
 	PrintAndLogEx(NORMAL, "       pwd     Password, hex, 7bytes, LSB-order");
 	PrintAndLogEx(NORMAL, "       delay   Tag initialization delay (in us) decimal");
 	PrintAndLogEx(NORMAL, "       offset  Low pulses width (in us) decimal");
-	PrintAndLogEx(NORMAL, "       offset  Low pulses position (in us) decimal");	
+	PrintAndLogEx(NORMAL, "       offset  Low pulses position (in us) decimal");
 	PrintAndLogEx(NORMAL, "Examples:");
 	PrintAndLogEx(NORMAL, "      lf pcf7931 config");
 	PrintAndLogEx(NORMAL, "      lf pcf7931 config r");
@@ -94,7 +94,7 @@ int usage_pcf7931_config(){
 	return 0;
 }
 
-int CmdLFPCF7931Read(const char *Cmd){	
+int CmdLFPCF7931Read(const char *Cmd){
 
 	uint8_t ctmp = param_getchar(Cmd, 0);
 	if ( ctmp == 'H' || ctmp == 'h' ) return usage_pcf7931_read();
@@ -110,37 +110,37 @@ int CmdLFPCF7931Read(const char *Cmd){
 	return 0;
 }
 
-int CmdLFPCF7931Config(const char *Cmd){ 
+int CmdLFPCF7931Config(const char *Cmd){
 
 	uint8_t ctmp = param_getchar(Cmd, 0);
 	if ( ctmp == 0) return pcf7931_printConfig();
 	if ( ctmp == 'H' || ctmp == 'h' ) return usage_pcf7931_config();
-	if ( ctmp == 'R' || ctmp == 'r' ) return pcf7931_resetConfig();	
-		
+	if ( ctmp == 'R' || ctmp == 'r' ) return pcf7931_resetConfig();
+
 	if ( param_gethex(Cmd, 0, configPcf.Pwd, 14) ) return usage_pcf7931_config();
-	
+
 	configPcf.InitDelay = (param_get32ex(Cmd,1,0,10) & 0xFFFF);
 	configPcf.OffsetWidth = (int)(param_get32ex(Cmd,2,0,10) & 0xFFFF);
 	configPcf.OffsetPosition = (int)(param_get32ex(Cmd,3,0,10) & 0xFFFF);
-	
+
 	pcf7931_printConfig();
 	return 0;
 }
 
 int CmdLFPCF7931Write(const char *Cmd){
-	
+
 	uint8_t ctmp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) < 1 || ctmp == 'h' || ctmp == 'H') return usage_pcf7931_write();	
+	if (strlen(Cmd) < 1 || ctmp == 'h' || ctmp == 'H') return usage_pcf7931_write();
 
 	uint8_t block = 0, bytepos = 0, data = 0;
-	
+
 	if ( param_getdec(Cmd, 0, &block) ) return usage_pcf7931_write();
 	if ( param_getdec(Cmd, 1, &bytepos) ) return usage_pcf7931_write();
-	
+
 	if ( (block > 7) || (bytepos > 15) ) return usage_pcf7931_write();
 
 	data 	= param_get8ex(Cmd, 2, 0, 16);
-	
+
 	PrintAndLogEx(NORMAL, "Writing block: %d", block);
 	PrintAndLogEx(NORMAL, "          pos: %d", bytepos);
 	PrintAndLogEx(NORMAL, "         data: 0x%02X", data);
diff --git a/client/cmdlfpresco.c b/client/cmdlfpresco.c
index 98df02fe5..1b54899bd 100644
--- a/client/cmdlfpresco.c
+++ b/client/cmdlfpresco.c
@@ -14,7 +14,7 @@ int usage_lf_presco_clone(void){
 	PrintAndLogEx(NORMAL, "clone a Presco tag to a T55x7 tag.");
 	PrintAndLogEx(NORMAL, "Usage: lf presco clone [h] d <Card-ID> c <hex-ID> <Q5>");
 	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "  h             : this help");	
+	PrintAndLogEx(NORMAL, "  h             : this help");
 	PrintAndLogEx(NORMAL, "  d <Card-ID>   : 9 digit presco card ID");
 	PrintAndLogEx(NORMAL, "  c <hex-ID>    : 8 digit hex card number");
 	PrintAndLogEx(NORMAL, "  <Q5>          : specify write to Q5 (t5555 instead of t55x7)");
@@ -31,7 +31,7 @@ int usage_lf_presco_sim(void) {
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Usage:  lf presco sim [h] d <Card-ID> or c <hex-ID>");
 	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "  h             : this help");	
+	PrintAndLogEx(NORMAL, "  h             : this help");
 	PrintAndLogEx(NORMAL, "  d <Card-ID>   : 9 digit presco card number");
 	PrintAndLogEx(NORMAL, "  c <hex-ID>    : 8 digit hex card number");
 	PrintAndLogEx(NORMAL, "");
@@ -54,14 +54,14 @@ int detectPresco(uint8_t *dest, size_t *size) {
 
 // convert base 12 ID to sitecode & usercode & 8 bit other unknown code
 int GetWiegandFromPresco(const char *Cmd, uint32_t *sitecode, uint32_t *usercode, uint32_t *fullcode, bool *Q5) {
-	
+
 	uint8_t val = 0;
 	bool hex = false, errors = false;
 	uint8_t cmdp = 0;
 	char id[11];
 	int stringlen = 0;
 	memset(id, 0x00, sizeof(id));
-	
+
 	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
 		switch (tolower(param_getchar(Cmd, cmdp))) {
 			case 'h':
@@ -93,7 +93,7 @@ int GetWiegandFromPresco(const char *Cmd, uint32_t *sitecode, uint32_t *usercode
 
 	if (!hex) {
 		for (int index =0; index < strlen(id); ++index) {
-		
+
 			// Get value from number string.
 			if ( id[index] == '*' )
 				val = 10;
@@ -101,11 +101,11 @@ int GetWiegandFromPresco(const char *Cmd, uint32_t *sitecode, uint32_t *usercode
 				val = 11;
 			if ( id[index] >= 0x30 && id[index] <= 0x39 )
 				val = id[index] - 0x30;
-			
+
 			*fullcode += val;
-			
+
 			// last digit is only added, not multipled.
-			if ( index < strlen(id)-1 ) 
+			if ( index < strlen(id)-1 )
 					*fullcode *= 12;
 		}
 	}
@@ -146,7 +146,7 @@ int CmdPrescoDemod(const char *Cmd) {
 	}
 	setDemodBuf(DemodBuffer, 128, ans);
 	setClockGrid(g_DemodClock, g_DemodStartIdx + (ans*g_DemodClock));
-	
+
 	//got a good demod
 	uint32_t raw1 = bytebits_to_byte(DemodBuffer, 32);
 	uint32_t raw2 = bytebits_to_byte(DemodBuffer+32, 32);
@@ -178,7 +178,7 @@ int CmdPrescoClone(const char *Cmd) {
 	bool Q5 = false;
 	uint32_t sitecode=0, usercode=0, fullcode=0;
 	uint32_t blocks[5] = {T55x7_MODULATION_MANCHESTER | T55x7_BITRATE_RF_32 | 4 << T55x7_MAXBLOCK_SHIFT | T55x7_ST_TERMINATOR, 0, 0, 0, 0};
-	
+
 	// get wiegand from printed number.
 	if (GetWiegandFromPresco(Cmd, &sitecode, &usercode, &fullcode, &Q5) == -1) return usage_lf_presco_clone();
 
@@ -194,7 +194,7 @@ int CmdPrescoClone(const char *Cmd) {
 		usercode &= 0xFFFF;
 		PrintAndLogEx(INFO, "Card Number Truncated to 16-bits (Presco): %u", usercode);
 	}
-	
+
 	blocks[1] = 0x10D00000; //preamble
 	blocks[2] = 0x00000000;
 	blocks[3] = 0x00000000;
@@ -202,7 +202,7 @@ int CmdPrescoClone(const char *Cmd) {
 
 	PrintAndLogEx(INFO, "Preparing to clone Presco to T55x7 with SiteCode: %u, UserCode: %u, FullCode: %08x", sitecode, usercode, fullcode);
 	print_blocks(blocks, 5);
-	
+
 	UsbCommand resp;
 	UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
 
diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c
index 1153fccc3..796301761 100644
--- a/client/cmdlfpyramid.c
+++ b/client/cmdlfpyramid.c
@@ -80,8 +80,8 @@ int GetPyramidBits(uint32_t fc, uint32_t cn, uint8_t *pyramidBits) {
 
 	// format start bit
 	pre[79] = 1;
-	
-	// Get 26 wiegand from FacilityCode, CardNumber	
+
+	// Get 26 wiegand from FacilityCode, CardNumber
 	uint8_t wiegand[24];
 	memset(wiegand, 0x00, sizeof(wiegand));
 	num_to_bytebits(fc, 8, wiegand);
@@ -89,11 +89,11 @@ int GetPyramidBits(uint32_t fc, uint32_t cn, uint8_t *pyramidBits) {
 
 	// add wiegand parity bits (dest, source, len)
 	wiegand_add_parity(pre+80, wiegand, 24);
-	
+
 	// add paritybits	(bitsource, dest, sourcelen, paritylen, parityType (odd, even,)
 	addParity(pre+8, pyramidBits+8, 102, 8, 1);
 
-	// add checksum		
+	// add checksum
 	uint8_t csBuff[13];
 	for (uint8_t i = 0; i < 13; i++)
 		csBuff[i] = bytebits_to_byte(pyramidBits + 16 + (i*8), 8);
@@ -125,7 +125,7 @@ int CmdPyramidDemod(const char *Cmd) {
 		else if (idx == -3)
 			PrintAndLogEx(DEBUG, "DEBUG: Error - Pyramid: problem during FSK demod");
 		else if (idx == -4)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - Pyramid: preamble not found");				
+			PrintAndLogEx(DEBUG, "DEBUG: Error - Pyramid: preamble not found");
 		else if (idx == -5)
 			PrintAndLogEx(DEBUG, "DEBUG: Error - Pyramid: size not correct: %d", size);
 		else
@@ -134,7 +134,7 @@ int CmdPyramidDemod(const char *Cmd) {
 	}
 	setDemodBuf(bits, size, idx);
 	setClockGrid(50, waveIdx + (idx*50));
-	
+
 	// Index map
 	// 0           10          20          30            40          50          60
 	// |           |           |           |             |           |           |
@@ -209,12 +209,12 @@ int CmdPyramidDemod(const char *Cmd) {
 	for (j=0; j < size; ++j){
 		if(bits[j]) break;
 	}
-	
+
 	uint8_t fmtLen = size-j-8;
 	uint32_t fc = 0;
 	uint32_t cardnum = 0;
 	uint32_t code1 = 0;
-	
+
 	if ( fmtLen == 26 ){
 		fc = bytebits_to_byte(bits+73, 8);
 		cardnum = bytebits_to_byte(bits+81, 16);
@@ -267,11 +267,11 @@ int CmdPyramidClone(const char *Cmd) {
 
 	facilitycode = (fc & 0x000000FF);
 	cardnumber = (cn & 0x0000FFFF);
-	
+
 	if ( !GetPyramidBits(facilitycode, cardnumber, bs)) {
 		PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
 		return 1;
-	}	
+	}
 
 	//Pyramid - compat mode, FSK2a, data rate 50, 4 data blocks
 	blocks[0] = T55x7_MODULATION_FSK2a | T55x7_BITRATE_RF_50 | 4 << T55x7_MAXBLOCK_SHIFT;
@@ -310,29 +310,29 @@ int CmdPyramidSim(const char *Cmd) {
 	if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_pyramid_sim();
 
 	uint32_t facilitycode = 0, cardnumber = 0, fc = 0, cn = 0;
-	
+
 	uint8_t bs[128];
 	size_t size = sizeof(bs);
 	memset(bs, 0x00, size);
-	
+
 	// Pyramid uses:  fcHigh: 10, fcLow: 8, clk: 50, invert: 0
 	uint8_t clk = 50, invert = 0, high = 10, low = 8;
-	uint16_t arg1, arg2;	
+	uint16_t arg1, arg2;
 	arg1 = high << 8 | low;
 	arg2 = invert << 8 | clk;
-	
+
 	if (sscanf(Cmd, "%u %u", &fc, &cn ) != 2) return usage_lf_pyramid_sim();
 
 	facilitycode = (fc & 0x000000FF);
 	cardnumber = (cn & 0x0000FFFF);
-	
+
 	if ( !GetPyramidBits(facilitycode, cardnumber, bs)) {
 		PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
 		return 1;
-	}	
+	}
 
 	PrintAndLogEx(SUCCESS, "Simulating Farpointe/Pyramid - Facility Code: %u, CardNumber: %u", facilitycode, cardnumber );
-	
+
 	UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}};
 	memcpy(c.d.asBytes, bs, size);
 	clearCommandBuffer();
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index e94ec84fe..4eb087874 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -61,7 +61,7 @@ int usage_t55xx_write(){
 	PrintAndLogEx(NORMAL, "     d <data>     - 4 bytes of data to write (8 hex characters)");
 	PrintAndLogEx(NORMAL, "     p <password> - OPTIONAL password 4bytes (8 hex characters)");
 	PrintAndLogEx(NORMAL, "     1            - OPTIONAL write Page 1 instead of Page 0");
-	PrintAndLogEx(NORMAL, "     t            - OPTIONAL test mode write - ****DANGER****");	
+	PrintAndLogEx(NORMAL, "     t            - OPTIONAL test mode write - ****DANGER****");
     PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Examples:");
 	PrintAndLogEx(NORMAL, "      lf t55xx write b 3 d 11223344            - write 11223344 to block 3");
@@ -147,7 +147,7 @@ int usage_t55xx_chk(){
     PrintAndLogEx(NORMAL, "Usage: lf t55xx bruteforce [h] <m> [i <*.dic>]");
 	PrintAndLogEx(NORMAL, "Options:");
 	PrintAndLogEx(NORMAL, "     h			- this help");
-	PrintAndLogEx(NORMAL, "     m			- use dictionary from flashmemory\n");	
+	PrintAndLogEx(NORMAL, "     m			- use dictionary from flashmemory\n");
     PrintAndLogEx(NORMAL, "     i <*.dic>	- loads a default keys dictionary file <*.dic>");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
@@ -221,9 +221,9 @@ int usage_lf_deviceconfig(){
 int CmdHelp(const char *Cmd);
 
 void printT5xxHeader(uint8_t page){
-	PrintAndLogEx(NORMAL, "Reading Page %d:", page);	
+	PrintAndLogEx(NORMAL, "Reading Page %d:", page);
 	PrintAndLogEx(NORMAL, "blk | hex data | binary                           | ascii");
-	PrintAndLogEx(NORMAL, "----+----------+----------------------------------+-------");	
+	PrintAndLogEx(NORMAL, "----+----------+----------------------------------+-------");
 }
 
 int CmdT55xxSetConfig(const char *Cmd) {
@@ -303,11 +303,11 @@ int CmdT55xxSetConfig(const char *Cmd) {
 				config.offset = offset;
 			cmdp+=2;
 			break;
-		case 'q':		
+		case 'q':
 			config.Q5 = true;
 			cmdp++;
 			break;
-		case 's':		
+		case 's':
 			config.ST = true;
 			cmdp++;
 			break;
@@ -333,14 +333,14 @@ int T55xxReadBlock(uint8_t block, bool page1, bool usepwd, bool override, uint32
 	if ( usepwd ) {
 		// try reading the config block and verify that PWD bit is set before doing this!
 		if ( !override ) {
-			
+
 			if ( !AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, false, 0 ) ) return 0;
-			
+
 			if ( !tryDetectModulation() ) {
 				PrintAndLogEx(NORMAL, "Safety Check: Could not detect if PWD bit is set in config block. Exits.");
 				return 0;
 			} else {
-				PrintAndLogEx(NORMAL, "Safety Check: PWD bit is NOT set in config block. Reading without password...");	
+				PrintAndLogEx(NORMAL, "Safety Check: PWD bit is NOT set in config block. Reading without password...");
 				usepwd = false;
 				page1 = false;
 			}
@@ -354,7 +354,7 @@ int T55xxReadBlock(uint8_t block, bool page1, bool usepwd, bool override, uint32
 
 	char blk[10] = {0};
 	sprintf(blk, "%02d", block);
-	printT55xxBlock(blk);	
+	printT55xxBlock(blk);
 	return 1;
 }
 
@@ -405,7 +405,7 @@ int CmdT55xxReadBlock(const char *Cmd) {
 }
 
 bool DecodeT55xxBlock(){
-	
+
 	char buf[30] = {0x00};
 	char *cmdStr = buf;
 	int ans = 0;
@@ -469,7 +469,7 @@ bool DecodeT55xxBlock(){
 
 bool DecodeT5555TraceBlock() {
 	DemodBufferLen = 0x00;
-	
+
 	// According to datasheet. Always: RF/64, not inverted, Manchester
 	return (bool) ASKDemod("64 0 1", false, false, 1);
 }
@@ -510,15 +510,15 @@ int CmdT55xxDetect(const char *Cmd){
 		}
 	}
 	if (errors) return usage_t55xx_detect();
-	
+
 	// sanity check.
 	if (!SanityOfflineCheck(useGB)) return 1;
-	
+
 	if ( !useGB) {
 		if ( !AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, usepwd, password) )
 			return 1;
 	}
-	
+
 	if ( !tryDetectModulation() )
 		PrintAndLogEx(WARNING, "Could not detect modulation automatically. Try setting it manually with \'lf t55xx config\'");
 
@@ -531,7 +531,7 @@ bool tryDetectModulation(){
 	t55xx_conf_block_t tests[15];
 	int bitRate = 0, clk = 0, firstClockEdge = 0;
 	uint8_t hits = 0, fc1 = 0, fc2 = 0, ans = 0;
-	
+
 	ans = fskClocks(&fc1, &fc2, (uint8_t *)&clk, &firstClockEdge);
 
 	if (ans && ((fc1==10 && fc2==8) || (fc1==8 && fc2==5))) {
@@ -625,7 +625,7 @@ bool tryDetectModulation(){
 				++hits;
 			}
 		}
-		
+
 		clk = GetPskClock("", false);
 		if (clk > 0) {
 			// allow undo
@@ -676,7 +676,7 @@ bool tryDetectModulation(){
 		//undo trim samples
 			save_restoreGB(GRAPH_RESTORE);
 		}
-	}		
+	}
 	if ( hits == 1) {
 		config.modulation = tests[0].modulation;
 		config.bitrate = tests[0].bitrate;
@@ -688,13 +688,13 @@ bool tryDetectModulation(){
 		printConfiguration( config );
 		return true;
 	}
-	
+
 	bool retval = false;
 	if ( hits > 1) {
 		PrintAndLogEx(SUCCESS, "Found [%d] possible matches for modulation.", hits);
 		for(int i=0; i<hits; ++i){
 			retval = testKnownConfigBlock(tests[i].block0);
-			if ( retval ) {				
+			if ( retval ) {
 				PrintAndLogEx(NORMAL, "--[%d]--------------- << selected this", i+1);
 				config.modulation = tests[i].modulation;
 				config.bitrate = tests[i].bitrate;
@@ -757,7 +757,7 @@ bool testModulation(uint8_t mode, uint8_t modread){
 			break;
 		case DEMOD_BIa:
 			if (modread == DEMOD_BIa) return true;
-			break;		
+			break;
 		default:
 			return false;
 	}
@@ -821,8 +821,8 @@ bool testQ5(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t	clk){
 		int bitRate       = PackBits(si, 6, DemodBuffer)*2 + 2; si += 6;     //bit rate
 		if (bitRate > 128 || bitRate < 8) continue;
 
-		//uint8_t AOR       = PackBits(si, 1, DemodBuffer); si += 1;   
-		//uint8_t PWD       = PackBits(si, 1, DemodBuffer); si += 1; 
+		//uint8_t AOR       = PackBits(si, 1, DemodBuffer); si += 1;
+		//uint8_t PWD       = PackBits(si, 1, DemodBuffer); si += 1;
 		//uint8_t pskcr     = PackBits(si, 2, DemodBuffer); si += 2;  //could check psk cr
 		//uint8_t inverse   = PackBits(si, 1, DemodBuffer); si += 1;
 		si += 1+1+2+1;
@@ -866,11 +866,11 @@ bool test(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk, bool *Q5)
 
 		int bitRate      = PackBits(si, 6, DemodBuffer); si += 6;     //bit rate (includes extended mode part of rate)
 		uint8_t extend   = PackBits(si, 1, DemodBuffer); si += 1;     //bit 15 extended mode
-		uint8_t modread  = PackBits(si, 5, DemodBuffer); si += 5+2+1; 
+		uint8_t modread  = PackBits(si, 5, DemodBuffer); si += 5+2+1;
 		//uint8_t pskcr   = PackBits(si, 2, DemodBuffer); si += 2+1;  //could check psk cr
 		//uint8_t nml01    = PackBits(si, 1, DemodBuffer); si += 1+5;   //bit 24, 30, 31 could be tested for 0 if not extended mode
 		//uint8_t nml02    = PackBits(si, 2, DemodBuffer); si += 2;
-		
+
 		//if extended mode
 		bool extMode =( (safer == 0x6 || safer == 0x9) && extend) ? true : false;
 
@@ -896,7 +896,7 @@ bool test(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk, bool *Q5)
 }
 
 void printT55xxBlock(const char *blockNum){
-	
+
 	uint8_t i = config.offset;
 	uint8_t endpos = 32 + i;
 	uint32_t blockData = 0;
@@ -927,13 +927,13 @@ int special(const char *Cmd) {
 	PrintAndLogEx(NORMAL, "-------+-------+-------------------------------------+------");
 	int i,j = 0;
 	for (; j < 64; ++j){
-		
+
 		for (i = 0; i < 32; ++i)
 			bits[i]=DemodBuffer[j+i];
-	
+
 		blockData = PackBits(0, 32, bits);
-		
-		PrintAndLogEx(NORMAL, "%02d | 0x%08X | %s",j , blockData, sprint_bin(bits,32));	
+
+		PrintAndLogEx(NORMAL, "%02d | 0x%08X | %s",j , blockData, sprint_bin(bits,32));
 	}
 	return 0;
 }
@@ -980,10 +980,10 @@ int CmdT55xxWakeUp(const char *Cmd) {
 
 int CmdT55xxWriteBlock(const char *Cmd) {
 	uint8_t block = 0xFF; //default to invalid block
-	uint32_t data = 0; //default to blank Block 
+	uint32_t data = 0; //default to blank Block
 	uint32_t password = 0; //default to blank Block 7
 	bool usepwd = false;
-	bool page1 = false;	
+	bool page1 = false;
 	bool gotdata = false;
 	bool testMode = false;
 	bool errors = false;
@@ -1026,21 +1026,21 @@ int CmdT55xxWriteBlock(const char *Cmd) {
 		PrintAndLogEx(WARNING, "Block number must be between 0 and 7");
 		return 0;
 	}
-	
+
 	UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {data, block, 0}};
 	UsbCommand resp;
- 	c.d.asBytes[0] = (page1) ? 0x2 : 0; 
- 	c.d.asBytes[0] |= (testMode) ? 0x4 : 0; 
+ 	c.d.asBytes[0] = (page1) ? 0x2 : 0;
+ 	c.d.asBytes[0] |= (testMode) ? 0x4 : 0;
 
 	char pwdStr[16] = {0};
 	snprintf(pwdStr, sizeof(pwdStr), "pwd: 0x%08X", password);
-	
+
 	PrintAndLogEx(INFO, "Writing page %d  block: %02d  data: 0x%08X %s", page1, block, data,  (usepwd) ? pwdStr : "" );
 
 	//Password mode
 	if (usepwd) {
 		c.arg[2] = password;
-		c.d.asBytes[0] |= 0x1; 
+		c.d.asBytes[0] |= 0x1;
 	}
 	clearCommandBuffer();
 	SendCommand(&c);
@@ -1057,7 +1057,7 @@ int CmdT55xxReadTrace(const char *Cmd) {
 
 	bool pwdmode = false;
 	uint32_t password = 0;
-	
+
 	if (strlen(Cmd) == 0) {
 		// sanity check.
 		if (!SanityOfflineCheck(false)) return 1;
@@ -1071,29 +1071,29 @@ int CmdT55xxReadTrace(const char *Cmd) {
 	} else {
 		if (!DecodeT55xxBlock()) return 1;
 	}
-	
+
 	if ( !DemodBufferLen ) return 1;
-	
+
 	RepaintGraphWindow();
 	uint8_t repeat = (config.offset > 5) ? 32 : 0;
-	
+
 	uint8_t si = config.offset + repeat;
 	uint32_t bl1 = PackBits(si, 32, DemodBuffer);
-	uint32_t bl2 = PackBits(si+32, 32, DemodBuffer);	
-	
+	uint32_t bl2 = PackBits(si+32, 32, DemodBuffer);
+
 	if (config.Q5) {
 		uint32_t hdr = PackBits(si, 9,  DemodBuffer); si += 9;
-    
+
 		if (hdr != 0x1FF) {
 		  PrintAndLogEx(FAILED, "Invalid Q5 Trace data header (expected 0x1FF, found %X)", hdr);
 		  return 1;
 		}
-    
+
 		t5555_tracedata_t data = {.bl1 = bl1, .bl2 = bl2, .icr = 0, .lotidc = '?', .lotid = 0, .wafer = 0, .dw =0};
-			
+
 		data.icr     = PackBits(si, 2,  DemodBuffer); si += 2;
 		data.lotidc  = 'Z' - PackBits(si, 2,  DemodBuffer); si += 3;
-		
+
 		data.lotid   = PackBits(si, 4,  DemodBuffer); si += 5;
 		data.lotid <<= 4;
 		data.lotid  |= PackBits(si, 4,  DemodBuffer); si += 5;
@@ -1103,11 +1103,11 @@ int CmdT55xxReadTrace(const char *Cmd) {
 		data.lotid  |= PackBits(si, 4,  DemodBuffer); si += 5;
 		data.lotid <<= 1;
 		data.lotid  |= PackBits(si, 1,  DemodBuffer); si += 1;
-		
+
 		data.wafer   = PackBits(si, 3,  DemodBuffer); si += 4;
 		data.wafer <<= 2;
 		data.wafer  |= PackBits(si, 2,  DemodBuffer); si += 2;
-		
+
 		data.dw      = PackBits(si, 2,  DemodBuffer); si += 3;
 		data.dw    <<= 4;
 		data.dw     |= PackBits(si, 4,  DemodBuffer); si += 5;
@@ -1115,13 +1115,13 @@ int CmdT55xxReadTrace(const char *Cmd) {
 		data.dw     |= PackBits(si, 4,  DemodBuffer); si += 5;
 		data.dw    <<= 4;
 		data.dw     |= PackBits(si, 4,  DemodBuffer); si += 5;
-	
+
 		printT5555Trace(data, repeat);
-		
+
 	} else {
-	
+
 		t55x7_tracedata_t data = {.bl1 = bl1, .bl2 = bl2, .acl = 0, .mfc = 0, .cid = 0, .year = 0, .quarter = 0, .icr = 0,  .lotid = 0, .wafer = 0, .dw = 0};
-		
+
 		data.acl = PackBits(si, 8,  DemodBuffer); si += 8;
 		if ( data.acl != 0xE0 ) {
 			PrintAndLogEx(FAILED, "The modulation is most likely wrong since the ACL is not 0xE0. ");
@@ -1135,7 +1135,7 @@ int CmdT55xxReadTrace(const char *Cmd) {
 		data.quarter = PackBits(si, 2,  DemodBuffer); si += 2;
 		data.lotid   = PackBits(si, 14, DemodBuffer); si += 14;
 		data.wafer   = PackBits(si, 5,  DemodBuffer); si += 5;
-		data.dw      = PackBits(si, 15, DemodBuffer); 
+		data.dw      = PackBits(si, 15, DemodBuffer);
 
 		time_t t = time(NULL);
 		struct tm tm = *localtime(&t);
@@ -1165,21 +1165,21 @@ void printT55x7Trace( t55x7_tracedata_t data, uint8_t repeat ){
 	PrintAndLogEx(NORMAL, " Raw Data - Page 1");
 	PrintAndLogEx(NORMAL, "     Block 1  : 0x%08X  %s", data.bl1, sprint_bin(DemodBuffer+config.offset+repeat,32) );
 	PrintAndLogEx(NORMAL, "     Block 2  : 0x%08X  %s", data.bl2, sprint_bin(DemodBuffer+config.offset+repeat+32,32) );
-	PrintAndLogEx(NORMAL, "-------------------------------------------------------------");	
+	PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
 
 	/*
 	TRACE - BLOCK O
 		Bits	Definition								HEX
-		1-8		ACL Allocation class (ISO/IEC 15963-1)	0xE0 
+		1-8		ACL Allocation class (ISO/IEC 15963-1)	0xE0
 		9-16	MFC Manufacturer ID (ISO/IEC 7816-6)	0x15 Atmel Corporation
-		17-21	CID										0x1 = Atmel ATA5577M1  0x2 = Atmel ATA5577M2 
+		17-21	CID										0x1 = Atmel ATA5577M1  0x2 = Atmel ATA5577M2
 		22-24	ICR IC revision
 		25-28	YEAR (BCD encoded) 						9 (= 2009)
-		29-30	QUARTER									1,2,3,4 
+		29-30	QUARTER									1,2,3,4
 		31-32	LOT ID
-	
+
 	TRACE - BLOCK 1
-		1-12	LOT ID  
+		1-12	LOT ID
 		13-17	Wafer number
 		18-32	DW,  die number sequential
 	*/
@@ -1188,7 +1188,7 @@ void printT55x7Trace( t55x7_tracedata_t data, uint8_t repeat ){
 void printT5555Trace( t5555_tracedata_t data, uint8_t repeat ){
 	PrintAndLogEx(NORMAL, "-- T5555 (Q5) Trace Information -----------------------------");
 	PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
-	PrintAndLogEx(NORMAL, " ICR IC Revision  : %d", data.icr );	
+	PrintAndLogEx(NORMAL, " ICR IC Revision  : %d", data.icr );
 	PrintAndLogEx(NORMAL, "     Lot          : %c%d", data.lotidc, data.lotid);
 	PrintAndLogEx(NORMAL, "     Wafer number : %d", data.wafer);
 	PrintAndLogEx(NORMAL, "     Die Number   : %d", data.dw);
@@ -1196,7 +1196,7 @@ void printT5555Trace( t5555_tracedata_t data, uint8_t repeat ){
 	PrintAndLogEx(NORMAL, " Raw Data - Page 1");
 	PrintAndLogEx(NORMAL, "     Block 1  : 0x%08X  %s", data.bl1, sprint_bin(DemodBuffer+config.offset+repeat,32) );
 	PrintAndLogEx(NORMAL, "     Block 2  : 0x%08X  %s", data.bl2, sprint_bin(DemodBuffer+config.offset+repeat+32,32) );
-	
+
 	/*
 		** Q5 **
 		TRACE - BLOCK O and BLOCK1
@@ -1224,11 +1224,11 @@ int CmdT55xxInfo(const char *Cmd){
 	char cmdp = tolower(param_getchar(Cmd, 0));
 
 	if (strlen(Cmd) > 1 || cmdp == 'h') return usage_t55xx_info();
-	
+
 	if (strlen(Cmd) == 0) {
 		// sanity check.
 		if (!SanityOfflineCheck(false)) return 1;
-		
+
 		if ( !AquireData( T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, pwdmode, password ) )
 			return 1;
 	}
@@ -1238,29 +1238,29 @@ int CmdT55xxInfo(const char *Cmd){
 	// too little space to start with
 	if ( DemodBufferLen < 32) return 1;
 
-	// 
+	//
 	//PrintAndLogEx(NORMAL, "Offset+32 ==%d\n DemodLen == %d", config.offset + 32, DemodBufferLen);
 
 	uint8_t si = config.offset;
-	uint32_t block0   = PackBits(si, 32, DemodBuffer);	
-	uint32_t safer    = PackBits(si, 4, DemodBuffer); si += 4;	
+	uint32_t block0   = PackBits(si, 32, DemodBuffer);
+	uint32_t safer    = PackBits(si, 4, DemodBuffer); si += 4;
 	uint32_t resv     = PackBits(si, 7, DemodBuffer); si += 7;
 	uint32_t dbr      = PackBits(si, 3, DemodBuffer); si += 3;
 	uint32_t extend   = PackBits(si, 1, DemodBuffer); si += 1;
 	uint32_t datamod  = PackBits(si, 5, DemodBuffer); si += 5;
 	uint32_t pskcf    = PackBits(si, 2, DemodBuffer); si += 2;
-	uint32_t aor      = PackBits(si, 1, DemodBuffer); si += 1;	
-	uint32_t otp      = PackBits(si, 1, DemodBuffer); si += 1;	
+	uint32_t aor      = PackBits(si, 1, DemodBuffer); si += 1;
+	uint32_t otp      = PackBits(si, 1, DemodBuffer); si += 1;
 	uint32_t maxblk   = PackBits(si, 3, DemodBuffer); si += 3;
-	uint32_t pwd      = PackBits(si, 1, DemodBuffer); si += 1;	
-	uint32_t sst      = PackBits(si, 1, DemodBuffer); si += 1;	
+	uint32_t pwd      = PackBits(si, 1, DemodBuffer); si += 1;
+	uint32_t sst      = PackBits(si, 1, DemodBuffer); si += 1;
 	uint32_t fw       = PackBits(si, 1, DemodBuffer); si += 1;
-	uint32_t inv      = PackBits(si, 1, DemodBuffer); si += 1;	
+	uint32_t inv      = PackBits(si, 1, DemodBuffer); si += 1;
 	uint32_t por      = PackBits(si, 1, DemodBuffer); si += 1;
-	
-	if (config.Q5) 
+
+	if (config.Q5)
 		PrintAndLogEx(NORMAL, _RED_(*** Warning ***) " Config Info read off a Q5 will not display as expected");
-	
+
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "-- T55x7 Configuration & Tag Information --------------------");
 	PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
@@ -1292,20 +1292,20 @@ int CmdT55xxDump(const char *Cmd){
 	char cmdp = tolower(param_getchar(Cmd, 0));
 	if ( cmdp == 'h') return usage_t55xx_dump();
 
-	bool usepwd = ( strlen(Cmd) > 0);	
+	bool usepwd = ( strlen(Cmd) > 0);
 	if ( usepwd ){
 		password = param_get32ex(Cmd, 0, 0, 16);
 		if (param_getchar(Cmd, 1) =='o' )
 			override = true;
 	}
-	
+
 	printT5xxHeader(0);
 	for ( uint8_t i = 0; i < 8; ++i)
 		T55xxReadBlock(i, 0, usepwd, override, password);
 
 	printT5xxHeader(1);
 	for ( uint8_t	i = 0; i < 4; i++)
-		T55xxReadBlock(i, 1, usepwd, override, password);		
+		T55xxReadBlock(i, 1, usepwd, override, password);
 
 	return 1;
 }
@@ -1362,7 +1362,7 @@ char * GetBitRateStr(uint32_t id, bool xmode) {
 char * GetSaferStr(uint32_t id){
 	static char buf[40];
 	char *retStr = buf;
-	
+
 	snprintf(retStr,sizeof(buf),"%d",id);
 	if (id == 6) {
 		snprintf(retStr,sizeof(buf),"%d - passwd",id);
@@ -1370,14 +1370,14 @@ char * GetSaferStr(uint32_t id){
 	if (id == 9 ){
 		snprintf(retStr,sizeof(buf),"%d - testmode",id);
 	}
-	
+
 	return buf;
 }
 
 char * GetModulationStr( uint32_t id){
 	static char buf[60];
 	char *retStr = buf;
-	
+
 	switch (id){
 		case 0: snprintf(retStr,sizeof(buf),"%d - DIRECT (ASK/NRZ)",id); break;
 		case 1:	snprintf(retStr,sizeof(buf),"%d - PSK 1 phase change when input changes",id); break;
@@ -1397,12 +1397,12 @@ char * GetModulationStr( uint32_t id){
 }
 
 char * GetModelStrFromCID(uint32_t cid){
-		
+
 	static char buf[10];
 	char *retStr = buf;
-	
+
 	if (cid == 1) snprintf(retStr, sizeof(buf),"ATA5577M1");
-	if (cid == 2) snprintf(retStr, sizeof(buf),"ATA5577M2");	
+	if (cid == 2) snprintf(retStr, sizeof(buf),"ATA5577M2");
 	return buf;
 }
 
@@ -1434,12 +1434,12 @@ void t55x7_create_config_block( int tagtype ){
 	/*
      T55X7_DEFAULT_CONFIG_BLOCK, T55X7_RAW_CONFIG_BLOCK
      T55X7_EM_UNIQUE_CONFIG_BLOCK, T55X7_FDXB_CONFIG_BLOCK,
-	 T55X7_FDXB_CONFIG_BLOCK, T55X7_HID_26_CONFIG_BLOCK, T55X7_INDALA_64_CONFIG_BLOCK, T55X7_INDALA_224_CONFIG_BLOCK 
-	 T55X7_GUARDPROXII_CONFIG_BLOCK, T55X7_VIKING_CONFIG_BLOCK,	T55X7_NORALYS_CONFIG_BLOCK, T55X7_IOPROX_CONFIG_BLOCK	
+	 T55X7_FDXB_CONFIG_BLOCK, T55X7_HID_26_CONFIG_BLOCK, T55X7_INDALA_64_CONFIG_BLOCK, T55X7_INDALA_224_CONFIG_BLOCK
+	 T55X7_GUARDPROXII_CONFIG_BLOCK, T55X7_VIKING_CONFIG_BLOCK,	T55X7_NORALYS_CONFIG_BLOCK, T55X7_IOPROX_CONFIG_BLOCK
 	*/
 	static char buf[60];
 	char *retStr = buf;
-	
+
 	switch (tagtype){
 		case 0: snprintf(retStr, sizeof(buf),"%08X - T55X7 Default", T55X7_DEFAULT_CONFIG_BLOCK); break;
 		case 1: snprintf(retStr, sizeof(buf),"%08X - T55X7 Raw", T55X7_RAW_CONFIG_BLOCK); break;
@@ -1471,7 +1471,7 @@ int CmdResetRead(const char *Cmd) {
 int CmdT55xxWipe(const char *Cmd) {
 	char writeData[20] = {0};
 	char *ptrData = writeData;
-	char cmdp = param_getchar(Cmd, 0);	
+	char cmdp = param_getchar(Cmd, 0);
 	if ( cmdp == 'h' || cmdp == 'H') return usage_t55xx_wipe();
 
 	bool Q5 = (cmdp == 'q' || cmdp == 'Q');
@@ -1479,20 +1479,20 @@ int CmdT55xxWipe(const char *Cmd) {
 	// Try with the default password to reset block 0
 	// With a pwd should work even if pwd bit not set
 	PrintAndLogEx(INFO, "\nBeginning Wipe of a T55xx tag (assuming the tag is not password protected)\n");
-		
+
 	if ( Q5 )
 		snprintf(ptrData,sizeof(writeData),"b 0 d 6001F004 p 0");
 	else
 		snprintf(ptrData,sizeof(writeData),"b 0 d 000880E0 p 0");
-	
+
 	if (!CmdT55xxWriteBlock(ptrData)) PrintAndLogEx(WARNING, "Error writing blk 0");
-	
+
 	for (uint8_t blk = 1; blk<8; blk++) {
-		
+
 		snprintf(ptrData,sizeof(writeData),"b %d d 0", blk);
-		
+
 		if (!CmdT55xxWriteBlock(ptrData)) PrintAndLogEx(WARNING, "Error writing blk %d", blk);
-		
+
 		memset(writeData, 0x00, sizeof(writeData));
 	}
 	return 0;
@@ -1518,22 +1518,22 @@ int CmdT55xxChkPwds(const char *Cmd) {
 	uint8_t timeout = 0;
 
 	memset(line, 0, sizeof(line));
-	
+
     char cmdp = tolower(param_getchar(Cmd, 0));
 	if (strlen(Cmd) == 0 || cmdp == 'h') return usage_t55xx_chk();
-	
+
 	/*
 	if ( T55xxReadBlock(7, 0, 0, 0, 0) ) {
-		
+
 		// now try to validate it..
 		PrintAndLogEx(WARNING, "\n Block 7 was readable");
 		return 1;
 	}
 	*/
-	
+
 	uint64_t t1 = msclock();
 
-	if ( cmdp == 'm' ) {	
+	if ( cmdp == 'm' ) {
 		UsbCommand c = {CMD_T55XX_CHKPWDS, {0,0,0} };
 		clearCommandBuffer();
 		SendCommand(&c);
@@ -1547,15 +1547,15 @@ int CmdT55xxChkPwds(const char *Cmd) {
 				return 2;
 			}
 		}
-		
+
 		if ( resp.arg[0] ) {
 			PrintAndLogEx(SUCCESS, "\nFound a candidate [ %08X ]. Trying to validate", resp.arg[1]);
-			
+
 			if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, resp.arg[1])) {
 				PrintAndLogEx(INFO, "Aquireing data from device failed. Quitting");
 				return 2;
 			}
-			
+
 			found = tryDetectModulation();
 			if (found) {
 				PrintAndLogEx(SUCCESS, "Found valid password: [ %08X ]", resp.arg[1]);
@@ -1565,32 +1565,32 @@ int CmdT55xxChkPwds(const char *Cmd) {
 		} else {
 			PrintAndLogEx(WARNING, "Password NOT found.");
 		}
-		
+
 		goto out;
 	}
-	
+
 	keyBlock = calloc(stKeyBlock, 4);
 	if (keyBlock == NULL) return 1;
 
 	if (cmdp == 'i') {
-	
+
 		int len = strlen(Cmd+2);
 		if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
 		memcpy(filename, Cmd+2, len);
-	
-		FILE * f = fopen( filename , "r");		
+
+		FILE * f = fopen( filename , "r");
 		if ( !f ) {
 			PrintAndLogEx(FAILED, "File: " _YELLOW_(%s) ": not found or locked.", filename);
 			free(keyBlock);
 			return 1;
-		}			
-		
+		}
+
 		while( fgets(line, sizeof(line), f) ){
 			if (strlen(line) < 8 || line[7] == '\n') continue;
-		
+
 			//goto next line
 			while (fgetc(f) != '\n' && !feof(f)) ;
-		
+
 			//The line start with # is comment, skip
 			if( line[0]=='#' ) continue;
 
@@ -1598,9 +1598,9 @@ int CmdT55xxChkPwds(const char *Cmd) {
 				PrintAndLogEx(WARNING, "File content error. '%s' must include 8 HEX symbols", line);
 				continue;
 			}
-			
-			line[8] = 0;		
-			
+
+			line[8] = 0;
+
 			// realloc keyblock array size.
 			if ( stKeyBlock - keycnt < 2) {
 				p = realloc(keyBlock, 4 * (stKeyBlock += 10));
@@ -1615,24 +1615,24 @@ int CmdT55xxChkPwds(const char *Cmd) {
 			}
 			// clear mem
 			memset(keyBlock + 4 * keycnt, 0, 4);
-			
+
 			num_to_bytes( strtoll(line, NULL, 16), 4, keyBlock + 4*keycnt);
-			
+
 //			PrintAndLogEx(NORMAL, "chk custom pwd[%2d] %08X", keycnt, bytes_to_num(keyBlock + 4 * keycnt, 4) );
-			keycnt++;			
+			keycnt++;
 			memset(line, 0, sizeof(line));
 		}
-		
+
 		if (f)
 			fclose(f);
-		
+
 		if (keycnt == 0) {
 			PrintAndLogEx(WARNING, "No keys found in file");
 			free(keyBlock);
 			return 1;
 		}
 		PrintAndLogEx(SUCCESS, "Loaded %d keys", keycnt);
-		
+
 		// loop
 		uint64_t testpwd = 0x00;
 		for (uint16_t c = 0; c < keycnt; ++c ) {
@@ -1642,43 +1642,43 @@ int CmdT55xxChkPwds(const char *Cmd) {
 				free(keyBlock);
 				return  2;
 			}
-		
+
 			if (IsCancelled()) {
 				free(keyBlock);
 				return 0;
 			}
-		
+
 			testpwd = bytes_to_num(keyBlock + 4*c, 4);
 
 			PrintAndLogEx(INFO, "Testing %08X", testpwd);
-						
+
 			if ( !AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, testpwd)) {
 				PrintAndLogEx(INFO, "Aquireing data from device failed. Quitting");
 				free(keyBlock);
 				return 0;
 			}
-			
+
 			found = tryDetectModulation();
 			if ( found )
 				break;
- 
+
 		}
-		if ( found ) 
+		if ( found )
 			PrintAndLogEx(SUCCESS, "Found valid password: [ %08X ]", testpwd);
 		else
-			PrintAndLogEx(WARNING, "Password NOT found.");		
+			PrintAndLogEx(WARNING, "Password NOT found.");
 	}
-	
+
 	free(keyBlock);
-	
+
 out:
 	t1 = msclock() - t1;
-	PrintAndLogEx(SUCCESS, "\nTime in bruteforce: %.0f seconds\n", (float)t1/1000.0);		
+	PrintAndLogEx(SUCCESS, "\nTime in bruteforce: %.0f seconds\n", (float)t1/1000.0);
 	return 0;
 }
 
 int CmdT55xxBruteForce(const char *Cmd) {
-	
+
     uint32_t start_password = 0x00000000; //start password
     uint32_t end_password   = 0xFFFFFFFF; //end   password
 	uint32_t curr = 0;
@@ -1687,52 +1687,52 @@ int CmdT55xxBruteForce(const char *Cmd) {
 
     char cmdp = tolower(param_getchar(Cmd, 0));
 	if (cmdp == 'h') return usage_t55xx_bruteforce();
-	
+
 	uint64_t t1 = msclock();
 
 	// Try to read Block 7, first :)
-	
+
 	// incremental pwd range search
     start_password = param_get32ex(Cmd, 0, 0, 16);
 	end_password = param_get32ex(Cmd, 1, 0, 16);
-	
+
 	curr = start_password;
-	
+
 	if ( start_password >= end_password ) {
 		return usage_t55xx_bruteforce();
 	}
-	
+
     PrintAndLogEx(INFO, "Search password range [%08X -> %08X]", start_password, end_password);
 
     while ( !found ){
 
 		printf("."); fflush(stdout);
-		
+
 		if (IsCancelled()) {
 			return 0;
 		}
-			
+
 		if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, curr)) {
 			PrintAndLogEx(WARNING, "Aquiring data from device failed. Quitting");
 			return 0;
 		}
-		
+
 		found = tryDetectModulation();
 
 		if (curr == end_password)
 			break;
 		curr++;
     }
-    
+
     PrintAndLogEx(NORMAL, "");
-	
+
     if (found)
 		PrintAndLogEx(SUCCESS, "Found valid password: [ %08X ]", curr);
     else
 		PrintAndLogEx(WARNING, "Password NOT found. Last tried: [ %08X ]", --curr);
 
 	t1 = msclock() - t1;
-	PrintAndLogEx(SUCCESS, "\nTime in bruteforce: %.0f seconds\n", (float)t1/1000.0);	
+	PrintAndLogEx(SUCCESS, "\nTime in bruteforce: %.0f seconds\n", (float)t1/1000.0);
     return 0;
 }
 
@@ -1745,7 +1745,7 @@ int tryOnePassword(uint32_t password) {
 
 	if (tryDetectModulation())
 		return 1;
-	else 
+	else
 		return 0;
 }
 
@@ -1767,14 +1767,14 @@ int CmdT55xxRecoverPW(const char *Cmd) {
 		found = tryOnePassword(curr_password);
 		if (found == -1) return 0;
 		bit++;
-		
+
 		if (IsCancelled()) return 0;
 	}
 
 	// now try to use partial original password, since block 7 should have been completely
 	// erased during the write sequence and it is possible that only partial password has been
 	// written
-	// not sure from which end the bit bits are written, so try from both ends 
+	// not sure from which end the bit bits are written, so try from both ends
 	// from low bit to high bit
 	bit = 0;
 	while (bit < 32) {
@@ -1789,7 +1789,7 @@ int CmdT55xxRecoverPW(const char *Cmd) {
 		if (found == -1) return 0;
 		bit++;
 		prev_password = curr_password;
-		
+
 		if (IsCancelled()) return 0;
 	}
 
@@ -1809,7 +1809,7 @@ int CmdT55xxRecoverPW(const char *Cmd) {
 			return 0;
 		bit++;
 		prev_password = curr_password;
-		
+
 		if (IsCancelled()) return 0;
 	}
 
@@ -1823,8 +1823,8 @@ int CmdT55xxRecoverPW(const char *Cmd) {
 	return 0;
 }
 
-// note length of data returned is different for different chips.  
-// some return all page 1 (64 bits) and others return just that block (32 bits) 
+// note length of data returned is different for different chips.
+// some return all page 1 (64 bits) and others return just that block (32 bits)
 // unfortunately the 64 bits makes this more likely to get a false positive...
 bool tryDetectP1(bool getData) {
 	uint8_t preamble[] = {1,1,1,0,0,0,0,0,0,0,0,1,0,1,0,1};
@@ -1841,13 +1841,13 @@ bool tryDetectP1(bool getData) {
 	// try fsk clock detect. if successful it cannot be any other type of modulation...  (in theory...)
 	ans = fskClocks(&fc1, &fc2, (uint8_t *)&clk, &firstClockEdge);
 	if (ans && ((fc1==10 && fc2==8) || (fc1==8 && fc2==5))) {
-		if ( FSKrawDemod("0 0", false) && 
-			  preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) && 
+		if ( FSKrawDemod("0 0", false) &&
+			  preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
 			  (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
 			return true;
 		}
-		if ( FSKrawDemod("0 1", false) && 
-			  preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) && 
+		if ( FSKrawDemod("0 1", false) &&
+			  preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
 			  (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
 			return true;
 		}
@@ -1858,23 +1858,23 @@ bool tryDetectP1(bool getData) {
 	clk = GetAskClock("", false);
 	if (clk > 0) {
 		if ( ASKDemod_ext("0 0 1", false, false, 1, &st) &&
-			  preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) && 
+			  preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
 			  (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
 			return true;
 		}
 		st = true;
 		if ( ASKDemod_ext("0 1 1", false, false, 1, &st)  &&
-				preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) && 
+				preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
 				(DemodBufferLen == 32 || DemodBufferLen == 64) ) {
 			return true;
 		}
 		if ( ASKbiphaseDemod("0 0 0 2", false) &&
-				preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) && 
+				preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
 				(DemodBufferLen == 32 || DemodBufferLen == 64) ) {
 			return true;
 		}
 		if ( ASKbiphaseDemod("0 0 1 2", false) &&
-				preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) && 
+				preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
 				(DemodBufferLen == 32 || DemodBufferLen == 64) ) {
 			return true;
 		}
@@ -1884,17 +1884,17 @@ bool tryDetectP1(bool getData) {
 	clk = GetNrzClock("", false); //has the most false positives :(
 	if (clk > 0) {
 		if ( NRZrawDemod("0 0 1", false)  &&
-				preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) && 
+				preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
 				(DemodBufferLen == 32 || DemodBufferLen == 64) ) {
 			return true;
 		}
 		if ( NRZrawDemod("0 1 1", false)  &&
-				preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) && 
+				preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
 				(DemodBufferLen == 32 || DemodBufferLen == 64) ) {
 			return true;
 		}
 	}
-	
+
 	// Fewer card uses PSK
 	// try psk clock detect. if successful it cannot be any other type of modulation... (in theory...)
 	clk = GetPskClock("", false);
@@ -1904,13 +1904,13 @@ bool tryDetectP1(bool getData) {
 		// skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)
 		//CmdLtrim("160");
 		if ( PSKDemod("0 0 6", false) &&
-			  preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) && 
+			  preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
 			  (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
 			//save_restoreGB(0);
 			return true;
 		}
 		if ( PSKDemod("0 1 6", false) &&
-			  preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) && 
+			  preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
 			  (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
 			//save_restoreGB(0);
 			return true;
@@ -1918,14 +1918,14 @@ bool tryDetectP1(bool getData) {
 		// PSK2 - needs a call to psk1TOpsk2.
 		if ( PSKDemod("0 0 6", false)) {
 			psk1TOpsk2(DemodBuffer, DemodBufferLen);
-			if (preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) && 
+			if (preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
 				  (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
 				//save_restoreGB(0);
 				return true;
 			}
 		} // inverse waves does not affect PSK2 demod
 		//undo trim samples
-		//save_restoreGB(0); 
+		//save_restoreGB(0);
 		// no other modulation clocks = 2 or 4 so quit searching
 		if (fc1 != 8) return false;
 	}
@@ -2013,7 +2013,7 @@ int CmdT55xxSetDeviceConfig(const char *Cmd){
 
 	//Validations
 	if (errors || cmdp == 0) return usage_lf_deviceconfig();
-	
+
 	t55xx_config config = { startgap*8, writegap*8, write0*8, write1*8, readgap*8 };
 
 	UsbCommand c = {CMD_SET_LF_T55XX_CONFIG, {shall_persist,0,0} };
@@ -2036,7 +2036,7 @@ static command_t CommandTable[] = {
 	{"read",		CmdT55xxReadBlock, 0, "b <block> p [password] [o] [1] -- Read T55xx block data. Optional [p password], [override], [page1]"},
 	{"resetread",	CmdResetRead,      0, "Send Reset Cmd then lf read the stream to attempt to identify the start of it (needs a demod and/or plot after)"},
 	{"recoverpw",	CmdT55xxRecoverPW, 0, "[password] Try to recover from bad password write from a cloner. Only use on PW protected chips!"},
-	{"special",		special,           0, "Show block changes with 64 different offsets"},	
+	{"special",		special,           0, "Show block changes with 64 different offsets"},
 	{"trace",		CmdT55xxReadTrace, 1, "[1] Show T55x7 traceability data (page 1/ blk 0-1)"},
 	{"wakeup",		CmdT55xxWakeUp,    0, "Send AOR wakeup command"},
 	{"wipe",		CmdT55xxWipe,      0, "[q] Wipe a T55xx tag and set defaults (will destroy any data on tag)"},
diff --git a/client/cmdlft55xx.h b/client/cmdlft55xx.h
index 775f7ccca..c4e0fc98b 100644
--- a/client/cmdlft55xx.h
+++ b/client/cmdlft55xx.h
@@ -75,15 +75,15 @@ enum {
 
 typedef struct {
 	uint32_t bl1;
-	uint32_t bl2; 
-	uint32_t acl; 
-	uint32_t mfc; 
-	uint32_t cid; 
-	uint32_t year; 
-	uint32_t quarter; 
+	uint32_t bl2;
+	uint32_t acl;
+	uint32_t mfc;
+	uint32_t cid;
+	uint32_t year;
+	uint32_t quarter;
 	uint32_t icr;
-	uint32_t lotid; 
-	uint32_t wafer; 
+	uint32_t lotid;
+	uint32_t wafer;
 	uint32_t dw;
 } t55x7_tracedata_t;
 
@@ -99,18 +99,18 @@ typedef struct {
 
 typedef struct {
 	enum {
-		DEMOD_NRZ  = 0x00,    
+		DEMOD_NRZ  = 0x00,
 		DEMOD_PSK1 = 0x01,
 		DEMOD_PSK2 = 0x02,
 		DEMOD_PSK3 = 0x03,
-		DEMOD_FSK1  = 0x04,     
-		DEMOD_FSK1a = 0x05,     
-		DEMOD_FSK2  = 0x06,     
-		DEMOD_FSK2a = 0x07, 
-		DEMOD_FSK   = 0xF0, //generic FSK (auto detect FCs)    
+		DEMOD_FSK1  = 0x04,
+		DEMOD_FSK1a = 0x05,
+		DEMOD_FSK2  = 0x06,
+		DEMOD_FSK2a = 0x07,
+		DEMOD_FSK   = 0xF0, //generic FSK (auto detect FCs)
 		DEMOD_ASK  = 0x08,
 		DEMOD_BI   = 0x10,
-		DEMOD_BIa  = 0x18,		
+		DEMOD_BIa  = 0x18,
 	}  modulation;
 	bool inverted;
 	uint8_t offset;
diff --git a/client/cmdlfti.c b/client/cmdlfti.c
index e5f3530f0..9928faf27 100644
--- a/client/cmdlfti.c
+++ b/client/cmdlfti.c
@@ -207,7 +207,7 @@ int CmdTIDemod(const char *Cmd)
 	}
 
 	RepaintGraphWindow();
-	
+
 	PrintAndLogEx(INFO, "INFO: raw tag bits = %s", bits);
 
 	TagType = (shift3>>8)&0xff;
@@ -249,16 +249,16 @@ int CmdTIDemod(const char *Cmd)
 		crc = update_crc16(crc, (shift1>>8)&0xff);
 		crc = update_crc16(crc, (shift1>>16)&0xff);
 		crc = update_crc16(crc, (shift1>>24)&0xff);
-		
+
 		//crc =  crc16_ccitt(message, sizeof(message);
 
 		char *crcStr = (crc == (shift2&0xffff) ) ? "Passed" : "Failed";
-	
+
 		PrintAndLogEx(NORMAL, "Tag data = %08X%08X  [Crc %04X %s]", shift1, shift0, crc, crcStr );
 
 		if (crc != (shift2&0xffff))
 			PrintAndLogEx(WARNING, "Error: CRC mismatch, calculated %04X, got %04X", crc, shift2&0xffff);
-   
+
 	}
 	else {
 		PrintAndLogEx(WARNING, "Unknown tag type.");
diff --git a/client/cmdlfviking.c b/client/cmdlfviking.c
index 33a5588d3..7f32ab5e5 100644
--- a/client/cmdlfviking.c
+++ b/client/cmdlfviking.c
@@ -52,18 +52,18 @@ int detectViking(uint8_t *dest, size_t *size) {
 	if (*size < 64*2) return -2;
 	size_t startIdx = 0;
 	uint8_t preamble[] = {1,1,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
-	if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx)) 
+	if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
 		return -4; //preamble not found
-	
-	uint32_t checkCalc = bytebits_to_byte(dest+startIdx,8) ^ 
-						 bytebits_to_byte(dest+startIdx+8,8) ^ 
-						 bytebits_to_byte(dest+startIdx+16,8) ^ 
-						 bytebits_to_byte(dest+startIdx+24,8) ^ 
-						 bytebits_to_byte(dest+startIdx+32,8) ^ 
-						 bytebits_to_byte(dest+startIdx+40,8) ^ 
-						 bytebits_to_byte(dest+startIdx+48,8) ^ 
+
+	uint32_t checkCalc = bytebits_to_byte(dest+startIdx,8) ^
+						 bytebits_to_byte(dest+startIdx+8,8) ^
+						 bytebits_to_byte(dest+startIdx+16,8) ^
+						 bytebits_to_byte(dest+startIdx+24,8) ^
+						 bytebits_to_byte(dest+startIdx+32,8) ^
+						 bytebits_to_byte(dest+startIdx+40,8) ^
+						 bytebits_to_byte(dest+startIdx+48,8) ^
 						 bytebits_to_byte(dest+startIdx+56,8);
-	if ( checkCalc != 0xA8 ) return -5;	
+	if ( checkCalc != 0xA8 ) return -5;
 	if (*size != 64) return -6;
 	//return start position
 	return (int)startIdx;
@@ -108,18 +108,18 @@ int CmdVikingClone(const char *Cmd) {
 	bool Q5 = false;
 	char cmdp = param_getchar(Cmd, 0);
 	if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_viking_clone();
-	
+
 	id = param_get32ex(Cmd, 0, 0, 16);
 	if (id == 0) return usage_lf_viking_clone();
-	
+
 	cmdp = param_getchar(Cmd, 1);
 	if ( cmdp == 'Q' || cmdp == 'q')
 		Q5 = true;
 
 	rawID = getVikingBits(id);
-	
+
 	PrintAndLogEx(INFO, "Preparing to clone Viking tag - ID: %08X, Raw: %08X%08X",id,(uint32_t)(rawID >> 32),(uint32_t) (rawID & 0xFFFFFFFF));
-	
+
 	UsbCommand c = {CMD_VIKING_CLONE_TAG, {rawID >> 32, rawID & 0xFFFFFFFF, Q5}};
 	clearCommandBuffer();
     SendCommand(&c);
@@ -150,7 +150,7 @@ int CmdVikingSim(const char *Cmd) {
 	arg2 = invert << 8 | separator;
 
 	PrintAndLogEx(SUCCESS, "Simulating Viking - ID: %08X, Raw: %08X%08X",id,(uint32_t)(rawID >> 32),(uint32_t) (rawID & 0xFFFFFFFF));
-	
+
 	UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};
 	num_to_bytebits(rawID, size, c.d.asBytes);
 	clearCommandBuffer();
diff --git a/client/cmdlfvisa2000.c b/client/cmdlfvisa2000.c
index 031894728..430aea8f4 100644
--- a/client/cmdlfvisa2000.c
+++ b/client/cmdlfvisa2000.c
@@ -56,7 +56,7 @@ static uint8_t visa_parity( uint32_t id) {
 		,1,0,0,1
 		,1,0,0,1
 		,0,1,1,0
-	};	
+	};
 	uint8_t par = 0;
 	par |= par_lut[ (id >> 28) & 0xF ] << 7;
 	par |= par_lut[ (id >> 24) & 0xF ] << 6;
@@ -66,7 +66,7 @@ static uint8_t visa_parity( uint32_t id) {
 	par |= par_lut[ (id >>  8) & 0xF ] << 2;
 	par |= par_lut[ (id >>  4) & 0xF ] << 1;
 	par |= par_lut[ (id & 0xF) ];
-	return par;	
+	return par;
 }
 
 // by iceman
@@ -91,15 +91,15 @@ int detectVisa2k(uint8_t *dest, size_t *size) {
 * i = card id
 * p = even parity bit for each nibble in card id.
 * c = checksum  (xor of card id)
-* 
+*
 **/
 //see ASKDemod for what args are accepted
 int CmdVisa2kDemod(const char *Cmd) {
-	
+
 	save_restoreGB(GRAPH_SAVE);
-	
+
 	//sCmdAskEdgeDetect("");
-	
+
 	//ASK / Manchester
 	bool st = true;
 	if (!ASKDemod_ext("64 0 0", false, false, 1, &st)) {
@@ -124,18 +124,18 @@ int CmdVisa2kDemod(const char *Cmd) {
 	}
 	setDemodBuf(DemodBuffer, 96, ans);
 	setClockGrid(g_DemodClock, g_DemodStartIdx + (ans*g_DemodClock));
-		
+
 	//got a good demod
 	uint32_t raw1 = bytebits_to_byte(DemodBuffer, 32);
 	uint32_t raw2 = bytebits_to_byte(DemodBuffer+32, 32);
 	uint32_t raw3 = bytebits_to_byte(DemodBuffer+64, 32);
-	
+
 	// chksum
 	uint8_t calc = visa_chksum(raw2);
-	uint8_t chk = raw3 & 0xF;	
-		
+	uint8_t chk = raw3 & 0xF;
+
 	// test checksums
-	if ( chk != calc ) { 
+	if ( chk != calc ) {
 		PrintAndLogEx(DEBUG, "DEBUG: error: Visa2000 checksum failed %x - %x\n", chk, calc);
 		save_restoreGB(GRAPH_RESTORE);
 		return 0;
@@ -146,7 +146,7 @@ int CmdVisa2kDemod(const char *Cmd) {
 	if ( calc_par != chk_par) {
 		PrintAndLogEx(DEBUG, "DEBUG: error: Visa2000 parity failed %x - %x\n", chk_par, calc_par);
 		save_restoreGB(GRAPH_RESTORE);
-		return 0;		
+		return 0;
 	}
 	PrintAndLogEx(SUCCESS, "Visa2000 Tag Found: Card ID %u,  Raw: %08X%08X%08X", raw2,  raw1 ,raw2, raw3);
 	return 1;
@@ -167,17 +167,17 @@ int CmdVisa2kClone(const char *Cmd) {
 	if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_visa2k_clone();
 
 	id = param_get32ex(Cmd, 0, 0, 10);
-	
+
 	//Q5
 	if (param_getchar(Cmd, 1) == 'Q' || param_getchar(Cmd, 1) == 'q')
 		blocks[0] = T5555_MODULATION_MANCHESTER | T5555_SET_BITRATE(64) | T5555_ST_TERMINATOR | 3 << T5555_MAXBLOCK_SHIFT;
-	
+
 	blocks[2] = id;
-	blocks[3] =  (visa_parity(id) << 4) | visa_chksum(id);	
+	blocks[3] =  (visa_parity(id) << 4) | visa_chksum(id);
 
 	PrintAndLogEx(INFO, "Preparing to clone Visa2000 to T55x7 with CardId: %u", id);
 	print_blocks(blocks, 4);
-	
+
 	UsbCommand resp;
 	UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
 
@@ -224,7 +224,7 @@ int CmdVisa2kSim(const char *Cmd) {
 
 static command_t CommandTable[] = {
 	{"help",	CmdHelp,		1, "This help"},
-	{"demod",	CmdVisa2kDemod,	1, "demodulate an VISA2000 tag from the GraphBuffer"},	
+	{"demod",	CmdVisa2kDemod,	1, "demodulate an VISA2000 tag from the GraphBuffer"},
 	{"read",	CmdVisa2kRead,	0, "attempt to read and extract tag data from the antenna"},
 	{"clone",	CmdVisa2kClone,	0, "clone Visa2000 to t55x7"},
 	{"sim",		CmdVisa2kSim,	0, "simulate Visa2000 tag"},
diff --git a/client/cmdmain.c b/client/cmdmain.c
index 9b71df21d..20e388b43 100644
--- a/client/cmdmain.c
+++ b/client/cmdmain.c
@@ -23,7 +23,7 @@ static command_t CommandTable[] = {
 	{"hw",		CmdHW,		1, "{ Hardware commands... }"},
 	{"lf",		CmdLF,		1, "{ Low Frequency commands... }"},
 	{"emv",     CmdEMV,     1, "{ EMV iso14443 and iso7816... }"},
-	{"rem", 	CmdRem,		1, "{ Add text to row in log file }"},	
+	{"rem", 	CmdRem,		1, "{ Add text to row in log file }"},
 	{"reveng",	CmdRev, 	1, "{ Crc calculations from the RevEng software... }"},
 	{"script",	CmdScript,	1, "{ Scripting commands }"},
 	{"trace",	CmdTrace,	1, "{ Trace manipulation... }"},
diff --git a/client/cmdmain.h b/client/cmdmain.h
index 629cd98af..a1ef64e1a 100644
--- a/client/cmdmain.h
+++ b/client/cmdmain.h
@@ -31,7 +31,7 @@
 #include "cmdscript.h"
 #include "cmdcrc.h"
 #include "cmdanalyse.h"
-#include "emv/cmdemv.h"		// EMV				  
+#include "emv/cmdemv.h"		// EMV
 
 #ifdef WITH_FLASH
 #include "cmdflashmem.h"	// rdv40 flashmem commands
diff --git a/client/cmdparser.c b/client/cmdparser.c
index 974439298..bbe7b2d8d 100644
--- a/client/cmdparser.c
+++ b/client/cmdparser.c
@@ -82,7 +82,7 @@ void dumpCommandsRecursive(const command_t cmds[], int markdown) {
 	int i = 0;
 	int w_cmd = 25;
 	int w_off = 8;
-	// First, dump all single commands, which are not a container for 
+	// First, dump all single commands, which are not a container for
 	// other commands
 	if (markdown) {
 		PrintAndLogEx(NORMAL, "|%-*s|%-*s|%s\n",w_cmd,"command",w_off,"offline","description");
@@ -96,7 +96,7 @@ void dumpCommandsRecursive(const command_t cmds[], int markdown) {
 		char* cmd_offline = "N";
 		if (cmds[i].Help[0] == '{' && ++i) continue;
 
-		if ( cmds[i].Offline) 
+		if ( cmds[i].Offline)
 			cmd_offline = "Y";
 		if (markdown)
 		  PrintAndLogEx(NORMAL, "|`%s%-*s`|%-*s|`%s`\n", parent, w_cmd-(int)strlen(parent)-2, cmds[i].Name, w_off, cmd_offline, cmds[i].Help);
@@ -106,7 +106,7 @@ void dumpCommandsRecursive(const command_t cmds[], int markdown) {
 	}
 	PrintAndLogEx(NORMAL, "\n\n");
 	i = 0;
-	
+
 	// Then, print the categories. These will go into subsections with their own tables
 	while (cmds[i].Name) {
 		if(cmds[i].Help[0] != '{' && ++i)  continue;
@@ -118,7 +118,7 @@ void dumpCommandsRecursive(const command_t cmds[], int markdown) {
 		char *old_parent = parent;
 		parent = currentparent;
 		// This is what causes the recursion, since commands Parse-implementation
-		// in turn calls the CmdsParse above. 
+		// in turn calls the CmdsParse above.
 		if (markdown)
 		  cmds[i].Parse("XX_internal_command_dump_markdown_XX");
 		else
diff --git a/client/cmdparser.h b/client/cmdparser.h
index 97b8f2813..eeb9a1460 100644
--- a/client/cmdparser.h
+++ b/client/cmdparser.h
@@ -9,7 +9,7 @@
 //-----------------------------------------------------------------------------
 
 #ifndef CMDPARSER_H__
-#define CMDPARSER_H__ 
+#define CMDPARSER_H__
 
 typedef struct command_s
 {
diff --git a/client/cmdscript.c b/client/cmdscript.c
index 7159fa70b..6ded9c1a9 100644
--- a/client/cmdscript.c
+++ b/client/cmdscript.c
@@ -63,7 +63,7 @@ bool endsWith(char* base, char* str) {
 }
 
 /**
-* Generate a sorted list of available commands, what it does is 
+* Generate a sorted list of available commands, what it does is
 * generate a file listing of the script-directory for files
 * ending with .lua
 */
@@ -129,7 +129,7 @@ int CmdScriptRun(const char *Cmd) {
     if (!endsWith(script_name, ".lua")) {
         suffix = ".lua";
 	}
-	
+
 	char script_path[strlen(get_my_executable_directory()) + strlen(LUA_SCRIPTS_DIRECTORY) + strlen(script_name) + strlen(suffix) + 1];
 	strcpy(script_path, get_my_executable_directory());
 	strcat(script_path, LUA_SCRIPTS_DIRECTORY);
diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index f371c87ce..42d777ee4 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -36,7 +36,7 @@ int usage_sm_reader(void) {
 	PrintAndLogEx(NORMAL, "       s          :  silent (no messages)");
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        sc reader");	
+	PrintAndLogEx(NORMAL, "        sc reader");
 	return 0;
 }
 int usage_sm_info(void) {
@@ -45,7 +45,7 @@ int usage_sm_info(void) {
 	PrintAndLogEx(NORMAL, "       s          :  silent (no messages)");
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        sc info");		
+	PrintAndLogEx(NORMAL, "        sc info");
 	return 0;
 }
 int usage_sm_upgrade(void) {
@@ -64,7 +64,7 @@ int usage_sm_setclock(void) {
 	PrintAndLogEx(NORMAL, "       c <>       :  clockspeed (0 = 16mhz, 1=8mhz, 2=4mhz) ");
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        sc setclock c 2");	
+	PrintAndLogEx(NORMAL, "        sc setclock c 2");
 	return 0;
 }
 int usage_sm_brute(void) {
@@ -93,29 +93,29 @@ static int smart_loadjson(const char *preferredName, const char *suffix, json_t
 	*root = json_load_file(fileName, 0, &error);
 	if (!*root) {
 		PrintAndLogEx(ERR, "json (%s) error on line %d: %s", fileName, error.line, error.text);
-		retval = 2; 
+		retval = 2;
 		goto out;
 	}
-	
+
 	if (!json_is_array(*root)) {
 		PrintAndLogEx(ERR, "Invalid json (%s) format. root must be an array.", fileName);
-		retval = 3; 
+		retval = 3;
 		goto out;
 	}
 
 	PrintAndLogEx(SUCCESS, "Loaded file (%s) OK.", fileName);
-out:	
+out:
 	free(fileName);
-	return retval;	
+	return retval;
 }
 
 uint8_t GetATRTA1(uint8_t *atr, size_t atrlen) {
-	if (atrlen > 2) {		
+	if (atrlen > 2) {
 		uint8_t T0 = atr[1];
 		if (T0 & 0x10)
 			return atr[2];
 	}
-	
+
 	return 0x11; // default value is ‘0x11’, corresponding to fmax=5 MHz, Fi=372, Di=1.
 }
 
@@ -178,7 +178,7 @@ float FArray[] = {
 
 int GetATRDi(uint8_t *atr, size_t atrlen) {
 	uint8_t TA1 = GetATRTA1(atr, atrlen);
-	return DiArray[TA1 & 0x0F];  // The 4 low-order bits of TA1 (4th MSbit to 1st LSbit) encode Di 
+	return DiArray[TA1 & 0x0F];  // The 4 low-order bits of TA1 (4th MSbit to 1st LSbit) encode Di
 }
 
 int GetATRFi(uint8_t *atr, size_t atrlen) {
@@ -192,31 +192,31 @@ float GetATRF(uint8_t *atr, size_t atrlen) {
 }
 
 static int PrintATR(uint8_t *atr, size_t atrlen) {
-	
+
 	uint8_t T0 = atr[1];
 	uint8_t K = T0 & 0x0F;
 	uint8_t TD1 = 0, T1len = 0, TD1len = 0, TDilen = 0;
-	
+
 	if (T0 & 0x10) {
 		PrintAndLog("\t- TA1 (Maximum clock frequency, proposed bit duration) [ 0x%02x ]", atr[2 + T1len]);
 		T1len++;
 	}
-	
+
 	if (T0 & 0x20) {
 		PrintAndLog("\t- TB1 (Deprecated: VPP requirements) [ 0x%02x ]", atr[2 + T1len]);
 		T1len++;
 	}
-	
+
 	if (T0 & 0x40) {
 		PrintAndLog("\t- TC1 (Extra delay between bytes required by card) [ 0x%02x ]", atr[2 + T1len]);
 		T1len++;
 	}
-	
+
 	if (T0 & 0x80) {
 		TD1 = atr[2 + T1len];
 		PrintAndLog("\t- TD1 (First offered transmission protocol, presence of TA2..TD2) [ 0x%02x ] Protocol T%d", TD1, TD1 & 0x0f);
 		T1len++;
-		
+
 		if (TD1 & 0x10) {
 			PrintAndLog("\t- TA2 (Specific protocol and parameters to be used after the ATR) [ 0x%02x ]", atr[2 + T1len + TD1len]);
 			TD1len++;
@@ -254,7 +254,7 @@ static int PrintATR(uint8_t *atr, size_t atrlen) {
 					TDi = atr[2 + T1len + TD1len + TDilen];
 					PrintAndLog("\t- TD%d [ 0x%02x ] Protocol T%d", vi, TDi, TDi & 0x0f);
 					TDilen++;
-					
+
 					nextCycle = true;
 					vi++;
 				}
@@ -265,7 +265,7 @@ static int PrintATR(uint8_t *atr, size_t atrlen) {
 	uint8_t vxor = 0;
 	for (int i = 1; i < atrlen; i++)
 		vxor ^= atr[i];
-	
+
 	if (vxor)
 		PrintAndLogEx(WARNING, "Check summ error. Must be 0 got 0x%02X", vxor);
 	else
@@ -274,26 +274,26 @@ static int PrintATR(uint8_t *atr, size_t atrlen) {
 	if (atr[0] != 0x3b)
 		PrintAndLogEx(WARNING, "Not a direct convention [ 0x%02x ]", atr[0]);
 
-	
+
 	uint8_t calen = 2 + T1len + TD1len + TDilen + K;
-	
+
 	if (atrlen != calen && atrlen != calen + 1)  // may be CRC
 		PrintAndLogEx(ERR, "ATR length error. len: %d, T1len: %d, TD1len: %d, TDilen: %d, K: %d", atrlen, T1len, TD1len, TDilen, K);
-	
+
 	if (K > 0)
 		PrintAndLogEx(INFO, "\nHistorical bytes | len 0x%02d | format %02x", K, atr[2 + T1len + TD1len + TDilen]);
-	
+
 	if (K > 1) {
 		PrintAndLogEx(INFO, "\tHistorical bytes");
 		dump_buffer(&atr[2 + T1len + TD1len + TDilen], K, NULL, 1);
 	}
-	
+
 	return 0;
 }
 
 bool smart_select(bool silent, smart_card_atr_t *atr) {
 	if (atr)
-		memset(atr, 0, sizeof(smart_card_atr_t));		
+		memset(atr, 0, sizeof(smart_card_atr_t));
 
 	UsbCommand c = {CMD_SMART_ATR, {0, 0, 0}};
 	clearCommandBuffer();
@@ -303,21 +303,21 @@ bool smart_select(bool silent, smart_card_atr_t *atr) {
 		if (!silent) PrintAndLogEx(WARNING, "smart card select failed");
 		return false;
 	}
-	
+
 	uint8_t isok = resp.arg[0] & 0xFF;
 	if (!isok) {
 		if (!silent) PrintAndLogEx(WARNING, "smart card select failed");
 		return false;
-	}	
+	}
 
 	smart_card_atr_t card;
 	memcpy(&card, (smart_card_atr_t *)resp.d.asBytes, sizeof(smart_card_atr_t));
 
 	if (atr)
-		memcpy(atr, &card, sizeof(smart_card_atr_t));		
+		memcpy(atr, &card, sizeof(smart_card_atr_t));
 
 	if (!silent)
-		PrintAndLogEx(INFO, "ISO7816-3 ATR : %s", sprint_hex(card.atr, card.atr_len));	
+		PrintAndLogEx(INFO, "ISO7816-3 ATR : %s", sprint_hex(card.atr, card.atr_len));
 
 	return true;
 }
@@ -328,27 +328,27 @@ static int smart_wait(uint8_t *data, bool silent) {
 		if (!silent) PrintAndLogEx(WARNING, "smart card response timeout");
 		return -1;
 	}
-	
-	uint32_t len = resp.arg[0];	
+
+	uint32_t len = resp.arg[0];
 	if ( !len ) {
 		if (!silent) PrintAndLogEx(WARNING, "smart card response failed");
-		return -2;			
+		return -2;
 	}
-	memcpy(data, resp.d.asBytes, len);	
-	if (len >= 2) {		
-		if (!silent) PrintAndLogEx(SUCCESS, "%02X%02X | %s", data[len - 2], data[len - 1], GetAPDUCodeDescription(data[len - 2], data[len - 1])); 
+	memcpy(data, resp.d.asBytes, len);
+	if (len >= 2) {
+		if (!silent) PrintAndLogEx(SUCCESS, "%02X%02X | %s", data[len - 2], data[len - 1], GetAPDUCodeDescription(data[len - 2], data[len - 1]));
 	} else {
 		if (!silent) PrintAndLogEx(SUCCESS, " %d | %s", len, sprint_hex_inrow_ex(data,  len, 8));
 	}
-	
+
 	return len;
 }
 
 static int smart_responseEx(uint8_t *data, bool silent) {
-		
-	int datalen = smart_wait(data, silent);	
+
+	int datalen = smart_wait(data, silent);
 	bool needGetData = false;
-	
+
 	if (datalen < 2 ) {
 		goto out;
 	}
@@ -359,9 +359,9 @@ static int smart_responseEx(uint8_t *data, bool silent) {
 
 	if (needGetData) {
 		int len = data[datalen - 1];
-		if (!silent) PrintAndLogEx(INFO, "Requesting 0x%02X bytes response", len);	
+		if (!silent) PrintAndLogEx(INFO, "Requesting 0x%02X bytes response", len);
 		uint8_t getstatus[] = {0x00, ISO7816_GET_RESPONSE, 0x00, 0x00, len};
-		UsbCommand cStatus = {CMD_SMART_RAW, {SC_RAW, sizeof(getstatus), 0}};	
+		UsbCommand cStatus = {CMD_SMART_RAW, {SC_RAW, sizeof(getstatus), 0}};
 		memcpy(cStatus.d.asBytes, getstatus, sizeof(getstatus) );
 		clearCommandBuffer();
 		SendCommand(&cStatus);
@@ -371,14 +371,14 @@ static int smart_responseEx(uint8_t *data, bool silent) {
 		if (datalen < 2 ) {
 			goto out;
 		}
-		
+
 		// data wo ACK
-		if (datalen != len + 2) { 
+		if (datalen != len + 2) {
 			// data with ACK
 			if (datalen == len + 2 + 1) { // 2 - response, 1 - ACK
 				if (data[0] != ISO7816_GET_RESPONSE) {
 					if (!silent) {
-						PrintAndLogEx(ERR, "GetResponse ACK error. len 0x%x | data[0] %02X", len, data[0]);	
+						PrintAndLogEx(ERR, "GetResponse ACK error. len 0x%x | data[0] %02X", len, data[0]);
 					}
 					datalen = 0;
 					goto out;
@@ -389,12 +389,12 @@ static int smart_responseEx(uint8_t *data, bool silent) {
 			} else {
 				// wrong length
 				if (!silent) {
-					PrintAndLogEx(WARNING, "GetResponse wrong length. Must be 0x%02X got 0x%02X", len, datalen - 3);	
+					PrintAndLogEx(WARNING, "GetResponse wrong length. Must be 0x%02X got 0x%02X", len, datalen - 3);
 				}
 			}
 		}
 	}
-	
+
 out:
 	return datalen;
 }
@@ -407,15 +407,15 @@ int CmdSmartRaw(const char *Cmd) {
 
 	int hexlen = 0;
     bool active = false;
-    bool active_select = false;	
-    bool useT0 = false;	
+    bool active_select = false;
+    bool useT0 = false;
 	uint8_t cmdp = 0;
 	bool errors = false, reply = true, decodeTLV = false, breakloop = false;
 	uint8_t data[USB_CMD_DATA_SIZE] = {0x00};
-		
+
 	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
 		switch (tolower(param_getchar(Cmd, cmdp))) {
-		case 'h': return usage_sm_raw();		
+		case 'h': return usage_sm_raw();
 		case 'r':
 			reply = false;
 			cmdp++;
@@ -431,11 +431,11 @@ int CmdSmartRaw(const char *Cmd) {
 		case 't':
 			decodeTLV = true;
 			cmdp++;
-			break;			
+			break;
 		case '0':
 			useT0 = true;
 			cmdp++;
-			break;			
+			break;
 		case 'd': {
 			switch (param_gethex_to_eol(Cmd, cmdp+1, data, sizeof(data), &hexlen)) {
 			case 1:
@@ -461,14 +461,14 @@ int CmdSmartRaw(const char *Cmd) {
 		if ( breakloop )
 			break;
 	}
-	
+
 	//Validations
-	if (errors || cmdp == 0 ) return usage_sm_raw();			
+	if (errors || cmdp == 0 ) return usage_sm_raw();
 
 	// arg0 = RFU flags
 	// arg1 = length
-	UsbCommand c = {CMD_SMART_RAW, {0, hexlen, 0}};	
-	
+	UsbCommand c = {CMD_SMART_RAW, {0, hexlen, 0}};
+
 	if (active || active_select) {
         c.arg[0] |= SC_CONNECT;
         if (active_select)
@@ -480,28 +480,28 @@ int CmdSmartRaw(const char *Cmd) {
 			c.arg[0] |= SC_RAW_T0;
 		else
 			c.arg[0] |= SC_RAW;
-	}	
-	
+	}
+
 	memcpy(c.d.asBytes, data, hexlen );
 	clearCommandBuffer();
-	SendCommand(&c);	
-	
+	SendCommand(&c);
+
 	// reading response from smart card
 	if ( reply ) {
 
 		uint8_t* buf = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
 		if ( !buf )
-			return 1;		
-		
+			return 1;
+
 		int len = smart_response(buf);
 		if ( len < 0 ) {
 			free(buf);
 			return 2;
 		}
-		
+
 		if ( buf[0] == 0x6C ) {
 			data[4]	= buf[1];
-			
+
 			memcpy(c.d.asBytes, data, sizeof(data) );
 			clearCommandBuffer();
 			SendCommand(&c);
@@ -520,54 +520,54 @@ int CmdSmartRaw(const char *Cmd) {
 
 int ExchangeAPDUSC(uint8_t *datain, int datainlen, bool activateCard, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
 	*dataoutlen = 0;
-	
+
 	if (activateCard)
 		smart_select(false, NULL);
 
 	PrintAndLogEx(DEBUG, "APDU SC");
 
-	UsbCommand c = {CMD_SMART_RAW, {SC_RAW_T0, datainlen, 0}};	
+	UsbCommand c = {CMD_SMART_RAW, {SC_RAW_T0, datainlen, 0}};
 	if (activateCard) {
 		c.arg[0] |= SC_SELECT | SC_CONNECT;
 	}
 	memcpy(c.d.asBytes, datain, datainlen);
 	clearCommandBuffer();
-	SendCommand(&c);	
-	
+	SendCommand(&c);
+
 	int len = smart_responseEx(dataout, true);
-	
+
 	if ( len < 0 ) {
 		return 1;
 	}
-	
+
 	// retry
 	if (len > 1 && dataout[len - 2] == 0x6c && datainlen > 4) {
-		UsbCommand c2 = {CMD_SMART_RAW, {SC_RAW_T0, datainlen, 0}};	
+		UsbCommand c2 = {CMD_SMART_RAW, {SC_RAW_T0, datainlen, 0}};
 		memcpy(c2.d.asBytes, datain, 5);
-		
+
 		// transfer length via T=0
 		c2.d.asBytes[4] = dataout[len - 1];
-		
+
 		clearCommandBuffer();
-		SendCommand(&c2);	
-		
+		SendCommand(&c2);
+
 		len = smart_responseEx(dataout, true);
-	}	
-	
+	}
+
 	*dataoutlen = len;
 	return 0;
-}	
+}
 
 int CmdSmartUpgrade(const char *Cmd) {
 
 	PrintAndLogEx(WARNING, "WARNING - Smartcard socket firmware upgrade.");
 	PrintAndLogEx(WARNING, "A dangerous command, do wrong and you will brick the smart card socket");
-	
+
 	FILE *f;
 	char filename[FILE_PATH_SIZE] = {0};
 	uint8_t cmdp = 0;
 	bool errors = false;
-	
+
 	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
 		switch (tolower(param_getchar(Cmd, cmdp))) {
 		case 'f':
@@ -576,8 +576,8 @@ int CmdSmartUpgrade(const char *Cmd) {
 				PrintAndLogEx(FAILED, "Filename too long");
 				errors = true;
 				break;
-			}			
-			cmdp += 2;			
+			}
+			cmdp += 2;
 			break;
 		case 'h':
 			return usage_sm_upgrade();
@@ -587,17 +587,17 @@ int CmdSmartUpgrade(const char *Cmd) {
 			break;
 		}
 	}
-	
+
 	//Validations
-	if (errors || cmdp == 0 ) return usage_sm_upgrade();			
-	
+	if (errors || cmdp == 0 ) return usage_sm_upgrade();
+
 	// load file
 	f = fopen(filename, "rb");
 	if ( !f ){
 		PrintAndLogEx(FAILED, "File: " _YELLOW_(%s) ": not found or locked.", filename);
 		return 1;
-	}	
-	
+	}
+
 	// get filesize in order to malloc memory
 	fseek(f, 0, SEEK_END);
 	long fsize = ftell(f);
@@ -608,18 +608,18 @@ int CmdSmartUpgrade(const char *Cmd) {
 		fclose(f);
 		return 1;
 	}
-		
+
 	uint8_t *dump = calloc(fsize, sizeof(uint8_t));
 	if (!dump) {
 		PrintAndLogDevice(WARNING, "error, cannot allocate memory ");
 		fclose(f);
 		return 1;
 	}
-	
+
 	size_t bytes_read = fread(dump, 1, fsize, f);
 	if (f)
 		fclose(f);
-	
+
 	PrintAndLogEx(SUCCESS, "Smartcard socket firmware uploading to PM3");
 	//Send to device
 	uint32_t index = 0;
@@ -627,20 +627,20 @@ int CmdSmartUpgrade(const char *Cmd) {
 	uint32_t bytes_remaining = bytes_read;
 
 	while (bytes_remaining > 0){
-		uint32_t bytes_in_packet = MIN(USB_CMD_DATA_SIZE, bytes_remaining);		
+		uint32_t bytes_in_packet = MIN(USB_CMD_DATA_SIZE, bytes_remaining);
 		UsbCommand c = {CMD_SMART_UPLOAD, {index + bytes_sent, bytes_in_packet, 0}};
 
 		// Fill usb bytes with 0xFF
 		memset(c.d.asBytes, 0xFF, USB_CMD_DATA_SIZE);
 		memcpy(c.d.asBytes, dump + bytes_sent, bytes_in_packet);
 		clearCommandBuffer();
-		SendCommand(&c);	
+		SendCommand(&c);
 		if ( !WaitForResponseTimeout(CMD_ACK, NULL, 2000) ) {
 			PrintAndLogEx(WARNING, "timeout while waiting for reply.");
 			free(dump);
 			return 1;
 		}
-		
+
 		bytes_remaining -= bytes_in_packet;
 		bytes_sent += bytes_in_packet;
 		printf("."); fflush(stdout);
@@ -648,9 +648,9 @@ int CmdSmartUpgrade(const char *Cmd) {
 	free(dump);
 	printf("\n");
 	PrintAndLogEx(SUCCESS, "Smartcard socket firmware updating,  don\'t turn off your PM3!");
-	
+
 	// trigger the firmware upgrade
-	UsbCommand c = {CMD_SMART_UPGRADE, {bytes_read, 0, 0}};		
+	UsbCommand c = {CMD_SMART_UPGRADE, {bytes_read, 0, 0}};
 	clearCommandBuffer();
 	SendCommand(&c);
 	UsbCommand resp;
@@ -668,13 +668,13 @@ int CmdSmartUpgrade(const char *Cmd) {
 int CmdSmartInfo(const char *Cmd){
 	uint8_t cmdp = 0;
 	bool errors = false, silent = false;
-	
+
 	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
 		switch (tolower(param_getchar(Cmd, cmdp))) {
 		case 'h': return usage_sm_info();
-		case 's': 
+		case 's':
 			silent = true;
-			break;			
+			break;
 		default:
 			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
 			errors = true;
@@ -682,10 +682,10 @@ int CmdSmartInfo(const char *Cmd){
 		}
 		cmdp++;
 	}
-	
+
 	//Validations
 	if (errors ) return usage_sm_info();
-	
+
 	UsbCommand c = {CMD_SMART_ATR, {0, 0, 0}};
 	clearCommandBuffer();
 	SendCommand(&c);
@@ -694,16 +694,16 @@ int CmdSmartInfo(const char *Cmd){
 		if (!silent) PrintAndLogEx(WARNING, "smart card select failed");
 		return 1;
 	}
-	
+
 	uint8_t isok = resp.arg[0] & 0xFF;
 	if (!isok) {
 		if (!silent) PrintAndLogEx(WARNING, "smart card select failed");
 		return 1;
-	}		
-	
+	}
+
 	smart_card_atr_t card;
 	memcpy(&card, (smart_card_atr_t *)resp.d.asBytes, sizeof(smart_card_atr_t));
-	
+
 	// print header
 	PrintAndLogEx(INFO, "--- Smartcard Information ---------");
 	PrintAndLogEx(INFO, "-------------------------------------------------------------");
@@ -714,7 +714,7 @@ int CmdSmartInfo(const char *Cmd){
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(INFO, "ATR");
 	PrintATR(card.atr, card.atr_len);
-	
+
 	// print D/F (brom byte TA1 or defaults)
 	PrintAndLogEx(NORMAL, "");
 	PrintAndLogEx(INFO, "D/F (TA1)");
@@ -723,11 +723,11 @@ int CmdSmartInfo(const char *Cmd){
 	float F = GetATRF(card.atr, card.atr_len);
 	if (GetATRTA1(card.atr, card.atr_len) == 0x11)
 		PrintAndLogEx(INFO, "Using default values...");
-	
+
 	PrintAndLogEx(NORMAL, "\t- Di %d", Di);
 	PrintAndLogEx(NORMAL, "\t- Fi %d", Fi);
 	PrintAndLogEx(NORMAL, "\t- F  %.1f MHz", F);
-  
+
 	if (Di && Fi) {
 		PrintAndLogEx(NORMAL, "\t- Cycles/ETU %d", Fi/Di);
 		PrintAndLogEx(NORMAL, "\t- %.1f bits/sec at 4MHz", (float)4000000 / (Fi/Di));
@@ -742,24 +742,24 @@ int CmdSmartInfo(const char *Cmd){
 int CmdSmartReader(const char *Cmd){
 	uint8_t cmdp = 0;
 	bool errors = false, silent = false;
-	
+
 	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
 		switch (tolower(param_getchar(Cmd, cmdp))) {
 		case 'h': return usage_sm_reader();
-		case 's': 
+		case 's':
 			silent = true;
-			break;		
+			break;
 		default:
 			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
 			errors = true;
 			break;
 		}
-		cmdp++;		
+		cmdp++;
 	}
-		
+
 	//Validations
 	if (errors ) return usage_sm_reader();
-			
+
 	UsbCommand c = {CMD_SMART_ATR, {0, 0, 0}};
 	clearCommandBuffer();
 	SendCommand(&c);
@@ -768,16 +768,16 @@ int CmdSmartReader(const char *Cmd){
 		if (!silent) PrintAndLogEx(WARNING, "smart card select failed");
 		return 1;
 	}
-	
+
 	uint8_t isok = resp.arg[0] & 0xFF;
 	if (!isok) {
 		if (!silent) PrintAndLogEx(WARNING, "smart card select failed");
 		return 1;
-	}		
+	}
 	smart_card_atr_t card;
 	memcpy(&card, (smart_card_atr_t *)resp.d.asBytes, sizeof(smart_card_atr_t));
-	
-	PrintAndLogEx(INFO, "ISO7816-3 ATR : %s", sprint_hex(card.atr, card.atr_len));	
+
+	PrintAndLogEx(INFO, "ISO7816-3 ATR : %s", sprint_hex(card.atr, card.atr_len));
 	return 0;
 }
 
@@ -788,23 +788,23 @@ int CmdSmartSetClock(const char *Cmd){
 	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
 		switch (tolower(param_getchar(Cmd, cmdp))) {
 		case 'h': return usage_sm_setclock();
-		case 'c': 
+		case 'c':
 			clock = param_get8ex(Cmd, cmdp+1, 2, 10);
 			if ( clock > 2)
 				errors = true;
-			
+
 			cmdp += 2;
-			break;		
+			break;
 		default:
 			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
 			errors = true;
 			break;
 		}
 	}
-		
+
 	//Validations
 	if (errors || cmdp == 0) return usage_sm_setclock();
-			
+
 	UsbCommand c = {CMD_SMART_SETCLOCK, {clock, 0, 0}};
 	clearCommandBuffer();
 	SendCommand(&c);
@@ -813,15 +813,15 @@ int CmdSmartSetClock(const char *Cmd){
 		PrintAndLogEx(WARNING, "smart card select failed");
 		return 1;
 	}
-	
+
 	uint8_t isok = resp.arg[0] & 0xFF;
 	if (!isok) {
 		PrintAndLogEx(WARNING, "smart card set clock failed");
 		return 1;
 	}
-	
+
 	switch (clock) {
-		case 0:			
+		case 0:
 			PrintAndLogEx(SUCCESS, "Clock changed to 16mhz giving 10800 baudrate");
 			break;
 		case 1:
@@ -844,36 +844,36 @@ int CmdSmartList(const char *Cmd) {
 static void smart_brute_prim(){
 
 	uint8_t* buf = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
-	if ( !buf ) 
+	if ( !buf )
 		return;
-	
+
 	int len = 0;
-	uint8_t get_card_data[] = { 
+	uint8_t get_card_data[] = {
 		0x80, 0xCA, 0x9F, 0x13, 0x00,
 		0x80, 0xCA, 0x9F, 0x17, 0x00,
 		0x80, 0xCA,	0x9F, 0x36, 0x00,
 		0x80, 0xCA, 0x9F, 0x4f, 0x00
 	};
-	
-	UsbCommand c = {CMD_SMART_RAW, {SC_RAW_T0, 5, 0}};	
-	
+
+	UsbCommand c = {CMD_SMART_RAW, {SC_RAW_T0, 5, 0}};
+
 	PrintAndLogEx(INFO, "Reading primitives");
 
 	for (int i = 0; i < sizeof(get_card_data); i += 5) {
-		
+
 		memcpy(c.d.asBytes, get_card_data+i, 5 );
 		clearCommandBuffer();
 		SendCommand(&c);
-	
+
 		len = smart_responseEx(buf, true);
 
 		if ( len > 2 ) {
-			
+
 			//if ( decodeTLV ) {
 				//if (!TLVPrintFromBuffer(buf, len-2)) {
 					PrintAndLogEx(SUCCESS, "\tHEX  %d |: %s", len, sprint_hex(buf, len));
 				//}
-			//}										
+			//}
 		}
 		len = 0;
 	}
@@ -883,20 +883,20 @@ static void smart_brute_prim(){
 static int smart_brute_sfi(bool decodeTLV){
 
 	uint8_t* buf = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
-	if ( !buf ) 
+	if ( !buf )
 		return 1;
-	
+
 	int len = 0;
 	// READ RECORD
 	uint8_t READ_RECORD[] = {0x00, 0xB2, 0x00, 0x00, 0x00};
-	UsbCommand c = {CMD_SMART_RAW, {SC_RAW_T0, sizeof(READ_RECORD), 0}};	
+	UsbCommand c = {CMD_SMART_RAW, {SC_RAW_T0, sizeof(READ_RECORD), 0}};
 
 	PrintAndLogEx(INFO, "Start SFI brute forcing");
-	
+
 	for (uint8_t sfi=1; sfi <= 31; sfi++) {
 
 		printf("."); fflush(stdout);
-		
+
 		for (uint16_t rec=1; rec <= 255; rec++) {
 
 			if (ukbhit()) {
@@ -904,40 +904,40 @@ static int smart_brute_sfi(bool decodeTLV){
 				PrintAndLogEx(NORMAL, "\naborted via keyboard!\n");
 				free(buf);
 				return 1;
-			}			
-		
+			}
+
 			READ_RECORD[2] = rec;
 			READ_RECORD[3] = (sfi << 3) | 4;
 
 			memcpy(c.d.asBytes, READ_RECORD, sizeof(READ_RECORD) );
 			clearCommandBuffer();
 			SendCommand(&c);
-			
+
 			len = smart_responseEx(buf, true);
-			
+
 			if ( buf[0] == 0x6C ) {
 				READ_RECORD[4]	= buf[1];
-				
+
 				memcpy(c.d.asBytes, READ_RECORD, sizeof(READ_RECORD) );
 				clearCommandBuffer();
 				SendCommand(&c);
 				len = smart_responseEx(buf, true);
-				
-				READ_RECORD[4] = 0;				
+
+				READ_RECORD[4] = 0;
 			}
-			
+
 			if ( len > 4 ) {
-			
+
 				PrintAndLogEx(SUCCESS, "\n\t file %02d, record %02d found", sfi, rec);
-				
+
 				uint8_t modifier = (buf[0] == 0xC0) ? 1 : 0;
-				
+
 				if ( decodeTLV ) {
 					if (!TLVPrintFromBuffer(buf + modifier, len-2-modifier)) {
 						PrintAndLogEx(SUCCESS, "\tHEX: %s", sprint_hex(buf, len));
 					}
-				}										
-			}		
+				}
+			}
 			memset(buf, 0x00, USB_CMD_DATA_SIZE);
 		}
 	}
@@ -948,77 +948,77 @@ static int smart_brute_sfi(bool decodeTLV){
 static void smart_brute_options(bool decodeTLV) {
 
 	uint8_t* buf = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
-	if ( !buf ) 
+	if ( !buf )
 		return;
-	
+
 	uint8_t GET_PROCESSING_OPTIONS[] = {0x80, 0xA8, 0x00, 0x00, 0x02, 0x83, 0x00, 0x00};
-	
+
 	// Get processing options command
-	UsbCommand c = {CMD_SMART_RAW, {SC_RAW_T0, sizeof(GET_PROCESSING_OPTIONS), 0}};	
-	memcpy(c.d.asBytes, GET_PROCESSING_OPTIONS, sizeof(GET_PROCESSING_OPTIONS) );	
+	UsbCommand c = {CMD_SMART_RAW, {SC_RAW_T0, sizeof(GET_PROCESSING_OPTIONS), 0}};
+	memcpy(c.d.asBytes, GET_PROCESSING_OPTIONS, sizeof(GET_PROCESSING_OPTIONS) );
 	clearCommandBuffer();
 	SendCommand(&c);
-	
+
 	int len = smart_responseEx(buf, true);
 	if ( len > 4 ) {
-		PrintAndLogEx(SUCCESS, "Got processing options");			
+		PrintAndLogEx(SUCCESS, "Got processing options");
 		if ( decodeTLV ) {
 			TLVPrintFromBuffer(buf, len-2);
 		}
 	} else {
 		PrintAndLogEx(FAILED, "Getting processing options failed");
 	}
-	
+
 	free(buf);
 }
 
 int CmdSmartBruteforceSFI(const char *Cmd) {
 
 	uint8_t cmdp = 0;
-	bool errors = false, decodeTLV = false; //, useT0 = false;	
-		
+	bool errors = false, decodeTLV = false; //, useT0 = false;
+
 	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
 		switch (tolower(param_getchar(Cmd, cmdp))) {
-		case 'h': return usage_sm_brute();		
+		case 'h': return usage_sm_brute();
 		case 't':
 			decodeTLV = true;
 			cmdp++;
 			break;
-/*			
+/*
 		case '0':
 			useT0 = true;
 			cmdp++;
 			break;
-*/			
+*/
 		default:
 			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
 			errors = true;
 			break;
 		}
 	}
-	
-	//Validations
-	if (errors) return usage_sm_brute();			
 
-	const char *SELECT = "00a40400%02x%s";	
-	
+	//Validations
+	if (errors) return usage_sm_brute();
+
+	const char *SELECT = "00a40400%02x%s";
+
 //	uint8_t GENERATE_AC[] = {0x80, 0xAE};
 //	uint8_t GET_CHALLENGE[] = {0x00, 0x84, 0x00};
 //	uint8_t GET_DATA[] = {0x80, 0xCA, 0x00, 0x00, 0x00};
 //	uint8_t SELECT[] = {0x00, 0xA4, 0x04, 0x00};
 //	uint8_t UNBLOCK_PIN[] = {0x84, 0x24, 0x00, 0x00, 0x00};
 //	uint8_t VERIFY[] = {0x00, 0x20, 0x00, 0x80};
-		
+
 	// Select AID command
-	UsbCommand cAid = {CMD_SMART_RAW, {SC_RAW_T0, 0, 0}};	
-	
+	UsbCommand cAid = {CMD_SMART_RAW, {SC_RAW_T0, 0, 0}};
+
 	PrintAndLogEx(INFO, "Importing AID list");
 	json_t *root = NULL;
 	smart_loadjson("aidlist", "json", &root);
 
 	uint8_t* buf = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
 	if ( !buf )
-		return 1;		
+		return 1;
 
 	PrintAndLogEx(INFO, "Selecting card");
 	if ( !smart_select(false, NULL) ) {
@@ -1027,14 +1027,14 @@ int CmdSmartBruteforceSFI(const char *Cmd) {
 	}
 
 	char* caid = NULL;
-	
+
 	for (int i = 0; i < json_array_size(root); i++) {
-		
+
 		printf("+"); fflush(stdout);
 
 		if (caid)
 			free(caid);
-		
+
 		json_t *data, *jaid;
 
 		data = json_array_get(root, i);
@@ -1043,47 +1043,47 @@ int CmdSmartBruteforceSFI(const char *Cmd) {
 			json_decref(root);
 			return 1;
 		}
-		
+
 		jaid = json_object_get(data, "AID");
 		if (!json_is_string(jaid)) {
 			PrintAndLogEx(ERR, "AID data [%d] is not a string", i + 1);
 			json_decref(root);
 			return 1;
 		}
-		
+
 		const char* aid = json_string_value(jaid);
-		if ( !aid ) 
+		if ( !aid )
 			continue;
 
 		size_t aidlen = strlen(aid);
 		caid = calloc( 8+2+aidlen+1, sizeof(uint8_t));
-		snprintf(caid, 8+2+aidlen+1, SELECT, aidlen >> 1, aid);		
-		
+		snprintf(caid, 8+2+aidlen+1, SELECT, aidlen >> 1, aid);
+
 		int hexlen = 0;
 		int res = param_gethex_to_eol(caid, 0, cAid.d.asBytes, sizeof(cAid.d.asBytes), &hexlen);
-		if ( res ) 
+		if ( res )
 			continue;
-		
+
 		cAid.arg[1] = hexlen;
 
 		clearCommandBuffer();
-		SendCommand(&cAid);	
-		
-		int len = smart_responseEx(buf, true);		
+		SendCommand(&cAid);
+
+		int len = smart_responseEx(buf, true);
 		if ( len < 3 )
 			continue;
-		
+
 		json_t *jvendor, *jname;
 		jvendor = json_object_get(data, "Vendor");
 		if (!json_is_string(jvendor)) {
 			PrintAndLogEx(ERR, "Vendor data [%d] is not a string", i + 1);
 			continue;
 		}
-		
+
 		const char* vendor = json_string_value(jvendor);
 		if ( !vendor )
 			continue;
-		
+
 		jname = json_object_get(data, "Name");
 		if (!json_is_string(jname)) {
 			PrintAndLogEx(ERR, "Name data [%d] is not a string", i + 1);
@@ -1104,19 +1104,19 @@ int CmdSmartBruteforceSFI(const char *Cmd) {
 		PrintAndLogEx(SUCCESS, "\nSFI brute force done\n");
 	}
 
-	if (caid) 
+	if (caid)
 		free(caid);
-	
+
 	free(buf);
 	json_decref(root);
-	
+
 	PrintAndLogEx(SUCCESS, "\nSearch completed.");
 	return 0;
 }
 
 static command_t CommandTable[] = {
 	{"help",	CmdHelp,            1, "This help"},
-	{"list",	CmdSmartList,       0, "List ISO 7816 history"},	
+	{"list",	CmdSmartList,       0, "List ISO 7816 history"},
 	{"info",	CmdSmartInfo,		1, "Tag information"},
 	{"reader",	CmdSmartReader,		1, "Act like an IS07816 reader"},
 	{"raw",		CmdSmartRaw,		1, "Send raw hex data to tag"},
diff --git a/client/cmdtrace.c b/client/cmdtrace.c
index cf55970b0..a93195635 100644
--- a/client/cmdtrace.c
+++ b/client/cmdtrace.c
@@ -14,7 +14,7 @@ static int CmdHelp(const char *Cmd);
 // trace pointer
 static uint8_t *trace;
 long traceLen = 0;
-	
+
 int usage_trace_list(){
 	PrintAndLogEx(NORMAL, "List protocol data in trace buffer.");
 	PrintAndLogEx(NORMAL, "Usage:  trace list <protocol> [f][c| <0|1>");
@@ -30,7 +30,7 @@ int usage_trace_list(){
 	PrintAndLogEx(NORMAL, "    des    - interpret data as DESFire communications");
 #ifdef WITH_EMV
 	PrintAndLogEx(NORMAL, "    emv    - interpret data as EMV / communications");
-#endif	
+#endif
 	PrintAndLogEx(NORMAL, "    iclass - interpret data as iclass communications");
 	PrintAndLogEx(NORMAL, "    topaz  - interpret data as topaz communications");
 	PrintAndLogEx(NORMAL, "    7816   - interpret data as iso7816-4 communications");
@@ -62,7 +62,7 @@ bool is_last_record(uint16_t tracepos, uint8_t *trace, uint16_t traceLen) {
 }
 
 bool next_record_is_response(uint16_t tracepos, uint8_t *trace) {
-	uint16_t next_records_datalen = *((uint16_t *)(trace + tracepos + sizeof(uint32_t) + sizeof(uint16_t)));	
+	uint16_t next_records_datalen = *((uint16_t *)(trace + tracepos + sizeof(uint32_t) + sizeof(uint16_t)));
 	return(next_records_datalen & 0x8000);
 }
 
@@ -100,7 +100,7 @@ bool merge_topaz_reader_frames(uint32_t timestamp, uint32_t *duration, uint16_t
 	}
 
 	*duration = last_timestamp - timestamp;
-	
+
 	return true;
 }
 
@@ -116,7 +116,7 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
 	uint8_t mfData[32] = {0};
 	size_t mfDataLen = 0;
 
-		
+
 	first_timestamp = *((uint32_t *)(trace));
 	timestamp = *((uint32_t *)(trace + tracepos));
 	tracepos += 4;
@@ -150,7 +150,7 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
 			frame = topaz_reader_command;
 		}
 	}
-	
+
 	//Check the CRC status
 	uint8_t crcStatus = 2;
 
@@ -165,8 +165,8 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
 				crcStatus = iso14443B_CRC_check(frame, data_len);
 				break;
 			case PROTO_MIFARE:
-				crcStatus = mifare_CRC_check(isResponse, frame, data_len);	
-				break;				
+				crcStatus = mifare_CRC_check(isResponse, frame, data_len);
+				break;
 			case ISO_14443A:
 			case MFDES:
 				crcStatus = iso14443A_CRC_check(isResponse, frame, data_len);
@@ -175,7 +175,7 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
 				crcStatus = iso15693_CRC_check(frame, data_len);
 				break;
 			case ISO_7816_4:
-			default: 
+			default:
 				break;
 		}
 	}
@@ -190,11 +190,11 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
 
 		uint8_t parityBits = parityBytes[j >> 3];
 		if (protocol != LEGIC &&
-			protocol != ISO_14443B && 
+			protocol != ISO_14443B &&
 			protocol != ISO_7816_4 &&
 			(isResponse || protocol == ISO_14443A) &&
 			(oddparity8(frame[j]) != ((parityBits >> (7-(j&0x0007))) & 0x01))) {
-				
+
 			snprintf(line[j/18]+(( j % 18) * 4),110, "%02x! ", frame[j]);
 		} else {
 			snprintf(line[j/18]+(( j % 18) * 4),110, "%02x  ", frame[j]);
@@ -228,7 +228,7 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
 
 	if ( protocol == PROTO_MIFARE )
 		annotateMifare(explanation, sizeof(explanation), frame, data_len, parityBytes, parity_len, isResponse);
-		
+
 	if (!isResponse)	{
 		switch(protocol) {
 			case ICLASS:		annotateIclass(explanation,sizeof(explanation),frame,data_len); break;
@@ -274,7 +274,7 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
 	};
 
 	if (is_last_record(tracepos, trace, traceLen)) return traceLen;
-	
+
 	if (showWaitCycles && !isResponse && next_record_is_response(tracepos, trace)) {
 		uint32_t next_timestamp = *((uint32_t *)(trace + tracepos));
 			PrintAndLogEx(NORMAL, " %10u | %10u | %s |fdt (Frame Delay Time): %d",
@@ -298,7 +298,7 @@ void printFelica(uint16_t traceLen, uint8_t *trace) {
 
 		if (tracepos + 3 >= traceLen) break;
 
-		
+
 		uint16_t gap = *((uint16_t *)(trace + tracepos));
 		uint8_t crc_ok = trace[tracepos+2];
 		tracepos += 3;
@@ -377,7 +377,7 @@ void printFelica(uint16_t traceLen, uint8_t *trace) {
 			case FELICA_UPDATE_RNDID_ACK: snprintf(expbuf,49,"Update IDr Resp");break;
 			default: snprintf(expbuf,49,"Unknown");break;
 		}
-		
+
 		int num_lines = MIN((len )/16 + 1, 16);
 		for (int j = 0; j < num_lines ; j++) {
 			if (j == 0) {
@@ -412,7 +412,7 @@ static int SanityOfflineCheck( bool useTraceBuffer ){
 int CmdTraceList(const char *Cmd) {
 
 	clearCommandBuffer();
-		
+
 	bool showWaitCycles = false;
 	bool markCRCBytes = false;
 	bool isOnline = true;
@@ -426,10 +426,10 @@ int CmdTraceList(const char *Cmd) {
 
 	char cmdp = 0;
 	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		
+
 		int slen = param_getstr(Cmd, cmdp, type, sizeof(type) );
 		if ( slen == 1) {
-			
+
 			switch ( tolower(param_getchar(Cmd, cmdp))) {
 			case 'h':
 				return usage_trace_list();
@@ -447,24 +447,24 @@ int CmdTraceList(const char *Cmd) {
 				break;
 			case '1':
 				isOnline = false;
-				cmdp++;				
+				cmdp++;
 				break;
 			default:
 				PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
 				errors = true;
 				break;
 			}
-			
-		} else {			
-			
+
+		} else {
+
 			str_lower(type);
-			
+
 			// validate type of output
 			if (strcmp(type,     "iclass") == 0)	protocol = ICLASS;
 			else if(strcmp(type, "14a") == 0)		protocol = ISO_14443A;
 			else if(strcmp(type, "14b") == 0)		protocol = ISO_14443B;
 			else if(strcmp(type, "topaz") == 0)		protocol = TOPAZ;
-			else if(strcmp(type, "7816") == 0)		protocol = ISO_7816_4;	
+			else if(strcmp(type, "7816") == 0)		protocol = ISO_7816_4;
 			else if(strcmp(type, "des") == 0)		protocol = MFDES;
 			else if(strcmp(type, "legic") == 0)		protocol = LEGIC;
 			else if(strcmp(type, "15") == 0)		protocol = ISO_15693;
@@ -472,22 +472,22 @@ int CmdTraceList(const char *Cmd) {
 			else if(strcmp(type, "mf") == 0)		protocol = PROTO_MIFARE;
 			else if(strcmp(type, "raw") == 0)		protocol = -1;//No crc, no annotations
 			else errors = true;
-			
+
 			cmdp++;
-		}		
+		}
 	}
-	
+
 	//if (!SanityOfflineCheck(isOnline)) return 1;
-	
+
 	//Validations
 	if (errors) return usage_trace_list();
-	
+
 	uint16_t tracepos = 0;
 
 	// reserv some space.
 	if (!trace)
 		trace = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
-	
+
 	if ( isOnline ) {
 		// Query for the size of the trace,  downloading USB_CMD_DATA_SIZE
 		UsbCommand response;
@@ -495,7 +495,7 @@ int CmdTraceList(const char *Cmd) {
 			PrintAndLogEx(WARNING, "timeout while waiting for reply.");
 			return 1;
 		}
-		
+
 		traceLen = response.arg[2];
 		if (traceLen > USB_CMD_DATA_SIZE) {
 			uint8_t *p = realloc(trace, traceLen);
@@ -510,14 +510,14 @@ int CmdTraceList(const char *Cmd) {
 				free(trace);
 				return 3;
 			}
-		}		
+		}
 	}
 
 	PrintAndLogEx(SUCCESS, "Recorded Activity (TraceLen = %d bytes)", traceLen);
 	PrintAndLogEx(INFO, "");
 	if (protocol == FELICA) {
 		printFelica(traceLen, trace);
-	} else { 
+	} else {
 		PrintAndLogEx(NORMAL, "Start = Start of Start Bit, End = End of last modulation. Src = Source of Transfer");
 		if ( protocol == ISO_14443A || protocol == PROTO_MIFARE)
 			PrintAndLogEx(NORMAL, "iso14443a - All times are in carrier periods (1/13.56Mhz)");
@@ -530,7 +530,7 @@ int CmdTraceList(const char *Cmd) {
 			PrintAndLogEx(NORMAL, "ISO15693 - Timings are not as accurate");
 		if ( protocol == ISO_7816_4 )
 			PrintAndLogEx(NORMAL, "ISO7816-4 / Smartcard - Timings N/A yet");
-		
+
 		PrintAndLogEx(NORMAL, "");
 		PrintAndLogEx(NORMAL, "      Start |        End | Src | Data (! denotes parity error)                                           | CRC | Annotation");
 		PrintAndLogEx(NORMAL, "------------+------------+-----+-------------------------------------------------------------------------+-----+--------------------");
@@ -544,24 +544,24 @@ int CmdTraceList(const char *Cmd) {
 }
 
 int CmdTraceLoad(const char *Cmd) {
-	
+
 	FILE *f = NULL;
 	char filename[FILE_PATH_SIZE];
 	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) < 1 || cmdp == 'h' || cmdp == 'H') return usage_trace_load();	
-	
-	param_getstr(Cmd, 0, filename, sizeof(filename));	
-	
-	if ((f = fopen(filename, "rb")) == NULL) { 
+	if (strlen(Cmd) < 1 || cmdp == 'h' || cmdp == 'H') return usage_trace_load();
+
+	param_getstr(Cmd, 0, filename, sizeof(filename));
+
+	if ((f = fopen(filename, "rb")) == NULL) {
 		PrintAndLogEx(FAILED, "Could not open file %s", filename);
 		return 0;
 	}
-	
+
 	// get filesize in order to malloc memory
 	fseek(f, 0, SEEK_END);
 	long fsize = ftell(f);
-	fseek(f, 0, SEEK_SET);	
-	
+	fseek(f, 0, SEEK_SET);
+
 	if (fsize < 0) 	{
 		PrintAndLogEx(FAILED, "error, when getting filesize");
 		fclose(f);
@@ -571,7 +571,7 @@ int CmdTraceLoad(const char *Cmd) {
 		PrintAndLogEx(FAILED, "error, file is too small");
 		fclose(f);
 		return 4;
-	}	
+	}
 
 	if ( trace )
 		free(trace);
@@ -579,36 +579,36 @@ int CmdTraceLoad(const char *Cmd) {
 	trace = calloc(fsize, sizeof(uint8_t));
 	if (!trace) {
 		PrintAndLogEx(FAILED, "Cannot allocate memory for trace");
-		fclose(f);		
+		fclose(f);
 		return 2;
 	}
-	
+
 	size_t bytes_read = fread(trace, 1, fsize, f);
 	traceLen = bytes_read;
 	fclose(f);
-	PrintAndLogEx(SUCCESS, "Recorded Activity (TraceLen = %d bytes) loaded from file %s", traceLen, filename);	
+	PrintAndLogEx(SUCCESS, "Recorded Activity (TraceLen = %d bytes) loaded from file %s", traceLen, filename);
 	return 0;
 }
 
 int CmdTraceSave(const char *Cmd) {
-	
+
 	if (traceLen == 0 ) {
 		PrintAndLogEx(WARNING, "trace is empty, exiting...");
 		return 0;
 	}
-	
+
 	char filename[FILE_PATH_SIZE];
 	char cmdp = param_getchar(Cmd, 0);
 	if (strlen(Cmd) < 1 || cmdp == 'h' || cmdp == 'H') return usage_trace_save();
-	
-	param_getstr(Cmd, 0, filename, sizeof(filename));		
+
+	param_getstr(Cmd, 0, filename, sizeof(filename));
 	saveFile(filename, "bin", trace, traceLen);
 	return 0;
 }
 
 static command_t CommandTable[] = {
 	{"help",	CmdHelp,          1, "This help"},
-	{"list",    CmdTraceList,     1, "List protocol data in trace buffer"},	
+	{"list",    CmdTraceList,     1, "List protocol data in trace buffer"},
 	{"load",	CmdTraceLoad,     1, "Load trace from file"},
 	{"save",	CmdTraceSave,     1, "Save trace buffer to file"},
 	{NULL, NULL, 0, NULL}
@@ -617,7 +617,7 @@ static command_t CommandTable[] = {
 int CmdTrace(const char *Cmd) {
 	clearCommandBuffer();
 	CmdsParse(CommandTable, Cmd);
-	return 0; 
+	return 0;
 }
 
 int CmdHelp(const char *Cmd) {
diff --git a/client/cmdtrace.h b/client/cmdtrace.h
index c6ba0cc38..ca56fd3cc 100644
--- a/client/cmdtrace.h
+++ b/client/cmdtrace.h
@@ -17,7 +17,7 @@
 #include <string.h>
 #include <limits.h>
 #include "proxmark3.h"
-#include "protocols.h"				
+#include "protocols.h"
 #include "parity.h"			// oddparity
 #include "cmdhflist.h"		// annotations
 #include "iso15693tools.h"	// ISO15693 crc
@@ -34,7 +34,7 @@ extern int CmdTraceLoad(const char *Cmd);
 extern int CmdTraceSave(const char *Cmd);
 
 // usages helptext
-extern int usage_trace_list(void);					 
+extern int usage_trace_list(void);
 extern int usage_trace_load(void);
 extern int usage_trace_save(void);
 #endif
diff --git a/client/comms.c b/client/comms.c
index f08c5f413..7e9441a95 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -57,7 +57,7 @@ void SendCommand(UsbCommand *c) {
 	#ifdef COMMS_DEBUG
 	PrintAndLogEx(NORMAL, "Sending %d bytes | cmd %04x\n", sizeof(UsbCommand), c->cmd);
 	#endif
-	
+
 	if (offline) {
 		PrintAndLogEx(NORMAL, "Sending bytes to proxmark failed - offline");
 		return;
@@ -65,22 +65,22 @@ void SendCommand(UsbCommand *c) {
 
 	pthread_mutex_lock(&txBufferMutex);
 	/**
-	This causes hangups at times, when the pm3 unit is unresponsive or disconnected. The main console thread is alive, 
+	This causes hangups at times, when the pm3 unit is unresponsive or disconnected. The main console thread is alive,
 	but comm thread just spins here. Not good.../holiman
 	**/
 	while (txBuffer_pending) {
-		// wait for communication thread to complete sending a previous commmand		
-		pthread_cond_wait(&txBufferSig, &txBufferMutex); 
+		// wait for communication thread to complete sending a previous commmand
+		pthread_cond_wait(&txBufferSig, &txBufferMutex);
 	}
 
 	txBuffer = *c;
 	txBuffer_pending = true;
-	
-	// tell communication thread that a new command can be send	
+
+	// tell communication thread that a new command can be send
 	pthread_cond_signal(&txBufferSig);
 
 	pthread_mutex_unlock(&txBufferMutex);
-	
+
 //__atomic_test_and_set(&txcmd_pending, __ATOMIC_SEQ_CST);
 }
 
@@ -101,7 +101,7 @@ void clearCommandBuffer() {
  * @param UC
  */
 static void storeCommand(UsbCommand *command) {
-	
+
 	pthread_mutex_lock(&rxBufferMutex);
     if ( ( cmd_head+1) % CMD_BUFFER_SIZE == cmd_tail) {
         //If these two are equal, we're about to overwrite in the
@@ -114,7 +114,7 @@ static void storeCommand(UsbCommand *command) {
     memcpy(destination, command, sizeof(UsbCommand));
 
 	 //increment head and wrap
-    cmd_head = (cmd_head +1) % CMD_BUFFER_SIZE;	
+    cmd_head = (cmd_head +1) % CMD_BUFFER_SIZE;
 	pthread_mutex_unlock(&rxBufferMutex);
 }
 /**
@@ -129,7 +129,7 @@ static int getCommand(UsbCommand* response) {
 		pthread_mutex_unlock(&rxBufferMutex);
 		return 0;
 	}
-	
+
     //Pick out the next unread command
     UsbCommand* last_unread = &rxBuffer[cmd_tail];
     memcpy(response, last_unread, sizeof(UsbCommand));
@@ -146,17 +146,17 @@ static int getCommand(UsbCommand* response) {
 // that we weren't necessarily expecting, for example a debug print.
 //-----------------------------------------------------------------------------
 static void UsbCommandReceived(UsbCommand* c) {
-		
+
 	switch(c->cmd) {
 		// First check if we are handling a debug message
 		case CMD_DEBUG_PRINT_STRING: {
 
 			char s[USB_CMD_DATA_SIZE+1];
-			memset(s, 0x00, sizeof(s)); 
+			memset(s, 0x00, sizeof(s));
 			size_t len = MIN(c->arg[0], USB_CMD_DATA_SIZE);
-			memcpy(s, c->d.asBytes, len);			
+			memcpy(s, c->d.asBytes, len);
 			uint64_t flag = c->arg[1];
-			
+
 			switch (flag) {
 				case FLAG_RAWPRINT:
 					printf("%s", s);
@@ -183,7 +183,7 @@ static void UsbCommandReceived(UsbCommand* c) {
 		}
 		// iceman:  hw status - down the path on device, runs printusbspeed which starts sending a lot of
 		// CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K packages which is not dealt with. I wonder if simply ignoring them will
-		// work. lets try it. 
+		// work. lets try it.
 		default: {
 			storeCommand(c);
 			break;
@@ -192,14 +192,14 @@ static void UsbCommandReceived(UsbCommand* c) {
 }
 
 /*
-bool hookUpPM3() {	
+bool hookUpPM3() {
 	bool ret = false;
 	sp = uart_open( comport );
 
 	if (sp == INVALID_SERIAL_PORT) {
 		PrintAndLogEx(WARNING, "Reconnect failed, retrying...  (reason: invalid serial port)\n");
 		sp = NULL;
-		serial_port_name = NULL;		
+		serial_port_name = NULL;
 		ret = false;
 		offline = 1;
 	} else if (sp == CLAIMED_SERIAL_PORT) {
@@ -208,7 +208,7 @@ bool hookUpPM3() {
 		serial_port_name = NULL;
 		ret = false;
 		offline = 1;
-	} else {	
+	} else {
 		PrintAndLogEx(SUCCESS, "Proxmark reconnected\n");
 		serial_port_name = ;
 		ret = true;
@@ -221,44 +221,44 @@ bool hookUpPM3() {
 void
 #ifdef __has_attribute
 #if __has_attribute(force_align_arg_pointer)
-__attribute__((force_align_arg_pointer)) 
+__attribute__((force_align_arg_pointer))
 #endif
 #endif
 *uart_communication(void *targ) {
 	communication_arg_t *conn = (communication_arg_t*)targ;
-	size_t rxlen, totallen = 0;	
+	size_t rxlen, totallen = 0;
 	UsbCommand rx;
 	UsbCommand *prx = &rx;
-	
+
 	//int counter_to_offline = 0;
 
 #if defined(__MACH__) && defined(__APPLE__)
 	disableAppNap("Proxmark3 polling UART");
 #endif
-	
+
 	while (conn->run) {
 		rxlen = 0;
 		bool ACK_received = false;
-		
+
 		if (uart_receive(sp, (uint8_t *)prx, sizeof(UsbCommand) - (prx - &rx), &rxlen) && rxlen) {
 			prx += rxlen;
 			totallen += rxlen;
-			
+
 			if ( totallen < sizeof(UsbCommand)) {
-				
+
 				// iceman: this looping is no working as expected at all. The reassemble of package is nonfunctional.
 				// solved so far with increasing the timeouts of the serial port configuration.
 				PrintAndLogEx(NORMAL, "Foo %d | %d (loop)", prx - &rx, rxlen);
 				continue;
 			}
-		
+
 			totallen = 0;
 			UsbCommandReceived(&rx);
 			if (rx.cmd == CMD_ACK) {
 				ACK_received = true;
 			}
 		}
-		
+
 		prx = &rx;
 
 		pthread_mutex_lock(&txBufferMutex);
@@ -274,11 +274,11 @@ __attribute__((force_align_arg_pointer))
 
 		if (txBuffer_pending) {
 			if (!uart_send(sp, (uint8_t*) &txBuffer, sizeof(UsbCommand))) {
-				//counter_to_offline++;				
+				//counter_to_offline++;
 				PrintAndLogEx(WARNING, "sending bytes to proxmark failed");
 			}
 			txBuffer_pending = false;
-			
+
 			// tell main thread that txBuffer is empty
 			pthread_cond_signal(&txBufferSig);
 		}
@@ -293,13 +293,13 @@ __attribute__((force_align_arg_pointer))
 #if defined(__MACH__) && defined(__APPLE__)
 	enableAppNap();
 #endif
-	
+
 	pthread_exit(NULL);
 	return NULL;
 }
 
 bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode) {
-	
+
 	char *portname = (char *)port;
 	if (!wait_for_port) {
 		sp = uart_open(portname);
@@ -331,7 +331,7 @@ bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode)
 		serial_port_name = portname;
 		conn.run = true;
 		conn.block_after_ACK = flash_mode;
-		pthread_create(&USB_communication_thread, NULL, &uart_communication, &conn);		
+		pthread_create(&USB_communication_thread, NULL, &uart_communication, &conn);
 		//pthread_create(&FPC_communication_thread, NULL, &uart_communication, &conn);
 
 		fflush(stdout);
@@ -350,10 +350,10 @@ void CloseProxmark(void) {
 		pthread_join(USB_communication_thread, NULL);
 	}
 #else
-	pthread_join(USB_communication_thread, NULL);	
+	pthread_join(USB_communication_thread, NULL);
 	//pthread_join(FPC_communication_thread, NULL);
 #endif
-	
+
 	if (sp) {
 		uart_close(sp);
 	}
@@ -376,7 +376,7 @@ void CloseProxmark(void) {
 /**
  * @brief Waits for a certain response type. This method waits for a maximum of
  * ms_timeout milliseconds for a specified response command.
- 
+
  * @param cmd command to wait for, or CMD_UNKNOWN to take any command.
  * @param response struct to copy received command into.
  * @param ms_timeout display message after 3 seconds
@@ -384,25 +384,25 @@ void CloseProxmark(void) {
  * @return true if command was returned, otherwise false
  */
 bool WaitForResponseTimeoutW(uint32_t cmd, UsbCommand* response, size_t ms_timeout, bool show_warning) {
-  
+
 	UsbCommand resp;
 
 	if (response == NULL)
 		response = &resp;
 
 	uint64_t start_time = msclock();
-	
+
 	// Wait until the command is received
 	while (true) {
 
 		while ( getCommand(response) ) {
 			if (cmd == CMD_UNKNOWN || response->cmd == cmd)
-				return true;			
+				return true;
 		}
 
 		if (msclock() - start_time > ms_timeout)
 			break;
-		
+
 		if (msclock() - start_time > 3000 && show_warning) {
 			// 3 seconds elapsed (but this doesn't mean the timeout was exceeded)
 			PrintAndLogEx(NORMAL, "Waiting for a response from the proxmark...");
@@ -435,7 +435,7 @@ bool WaitForResponse(uint32_t cmd, UsbCommand* response) {
 * @return true if command was returned, otherwise false
 */
 bool GetFromDevice(DeviceMemType_t memtype, uint8_t *dest, uint32_t bytes, uint32_t start_index, UsbCommand *response, size_t ms_timeout, bool show_warning) {
-	
+
 	if (dest == NULL) return false;
 	if (bytes == 0) return true;
 
@@ -443,9 +443,9 @@ bool GetFromDevice(DeviceMemType_t memtype, uint8_t *dest, uint32_t bytes, uint3
 	if (response == NULL)
 		response = &resp;
 
-	// clear 
+	// clear
 	clearCommandBuffer();
-			
+
 	switch (memtype) {
 		case BIG_BUF: {
 			UsbCommand c = {CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K, {start_index, bytes, 0}};
@@ -454,10 +454,10 @@ bool GetFromDevice(DeviceMemType_t memtype, uint8_t *dest, uint32_t bytes, uint3
 		}
 		case BIG_BUF_EML: {
 			UsbCommand c = {CMD_DOWNLOAD_EML_BIGBUF, {start_index, bytes, 0}};
-			SendCommand(&c);			
+			SendCommand(&c);
 			return dl_it(dest, bytes, start_index, response, ms_timeout, show_warning, CMD_DOWNLOADED_EML_BIGBUF);
 		}
-		case FLASH_MEM: {			
+		case FLASH_MEM: {
 			UsbCommand c = {CMD_FLASHMEM_DOWNLOAD, {start_index, bytes, 0}};
 			SendCommand(&c);
 			return dl_it(dest, bytes, start_index, response, ms_timeout, show_warning, CMD_FLASHMEM_DOWNLOADED);
@@ -473,46 +473,46 @@ bool GetFromDevice(DeviceMemType_t memtype, uint8_t *dest, uint32_t bytes, uint3
 }
 
 bool dl_it(uint8_t *dest, uint32_t bytes, uint32_t start_index, UsbCommand *response, size_t ms_timeout, bool show_warning, uint32_t rec_cmd) {
-	
+
 	uint32_t bytes_completed = 0;
 	uint64_t start_time = msclock();
-	
+
 	while (true) {
-		
+
 		if (getCommand(response)) {
 
 			// sample_buf is a array pointer, located in data.c
 			// arg0 = offset in transfer. Startindex of this chunk
 			// arg1 = length bytes to transfer
-			// arg2 = bigbuff tracelength (?)			
+			// arg2 = bigbuff tracelength (?)
 			if (response->cmd == rec_cmd) {
-				
+
 				uint32_t offset = response->arg[0];
 				uint32_t copy_bytes = MIN(bytes - bytes_completed, response->arg[1]);
 				//uint32_t tracelen = c->arg[2];
-				
+
 				// extended bounds check1.  upper limit is USB_CMD_DATA_SIZE
 				// shouldn't happen
 				copy_bytes = MIN(copy_bytes, USB_CMD_DATA_SIZE);
-				
-				// extended bounds check2. 
+
+				// extended bounds check2.
 				if ( offset + copy_bytes > bytes ) {
 					PrintAndLogEx(FAILED, "ERROR: Out of bounds when downloading from device,  offset %u | len %u | total len %u > buf_size %u", offset, copy_bytes,  offset+copy_bytes,  bytes);
 					break;
-				}			
-		
+				}
+
 				memcpy(dest + offset, response->d.asBytes, copy_bytes);
 				bytes_completed += copy_bytes;
 			} else if (response->cmd == CMD_ACK) {
 				return true;
 			}
 		}
-		
+
 		if (msclock() - start_time > ms_timeout) {
 			PrintAndLogEx(FAILED, "Timed out while trying to download data from device");
 			break;
 		}
-		
+
 		if (msclock() - start_time > 3000 && show_warning) {
 			// 3 seconds elapsed (but this doesn't mean the timeout was exceeded)
 			PrintAndLogEx(NORMAL, "Waiting for a response from the proxmark...");
diff --git a/client/comms.h b/client/comms.h
index e311f5e0c..d3303be3f 100644
--- a/client/comms.h
+++ b/client/comms.h
@@ -20,7 +20,7 @@
 #include "ui.h"
 #include "common.h"
 #include "util_posix.h"
-#include "util.h" 
+#include "util.h"
 #include "util_darwin.h"
 
 #if defined(__linux__) && !defined(NO_UNLINK)
@@ -43,7 +43,7 @@ typedef struct {
 	bool run; // If TRUE, continue running the uart_communication thread
 	bool block_after_ACK; // if true, block after receiving an ACK package
 } communication_arg_t;
-	
+
 
 bool dl_it(uint8_t *dest, uint32_t bytes, uint32_t start_index, UsbCommand *response, size_t ms_timeout, bool show_warning, uint32_t rec_cmd);
 
@@ -56,7 +56,7 @@ void clearCommandBuffer();
 
 bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode);
 void CloseProxmark(void);
-	
+
 bool WaitForResponseTimeoutW(uint32_t cmd, UsbCommand* response, size_t ms_timeout, bool show_warning);
 bool WaitForResponseTimeout(uint32_t cmd, UsbCommand* response, size_t ms_timeout);
 bool WaitForResponse(uint32_t cmd, UsbCommand* response);
diff --git a/client/crypto/asn1dump.c b/client/crypto/asn1dump.c
index a0abdf3cf..38d03d353 100644
--- a/client/crypto/asn1dump.c
+++ b/client/crypto/asn1dump.c
@@ -12,7 +12,7 @@
 #include "asn1dump.h"
 #include <ctype.h>
 #include <stdlib.h>
-#include <unistd.h> 
+#include <unistd.h>
 #include <stdio.h>
 #include <string.h>
 #include <jansson.h>
@@ -110,7 +110,7 @@ static void asn1_tag_dump_str_time(const struct tlv *tlv, const struct asn1_tag
 	*needdump = false;
 
 	int startindx = longyear ? 4 : 2;
-	
+
 	if (len > 4) {
 		fprintf(f, "\tvalue: '");
 		while (true) {
@@ -119,42 +119,42 @@ static void asn1_tag_dump_str_time(const struct tlv *tlv, const struct asn1_tag
 				fprintf(f, "20");
 			fwrite(tlv->value, 1, longyear ? 4 : 2, f);
 			fprintf(f, "-");
-			if (len < startindx + 2) 
+			if (len < startindx + 2)
 				break;
 			// month
 			fwrite(&tlv->value[startindx], 1, 2, f);
 			fprintf(f, "-");
-			if (len < startindx + 4) 
+			if (len < startindx + 4)
 				break;
 			// day
 			fwrite(&tlv->value[startindx + 2], 1, 2, f);
 			fprintf(f, " ");
-			if (len < startindx + 6) 
+			if (len < startindx + 6)
 				break;
 			// hour
 			fwrite(&tlv->value[startindx + 4], 1, 2, f);
 			fprintf(f, ":");
-			if (len < startindx + 8) 
+			if (len < startindx + 8)
 				break;
 			// min
 			fwrite(&tlv->value[startindx + 6], 1, 2, f);
 			fprintf(f, ":");
-			if (len < startindx + 10) 
+			if (len < startindx + 10)
 				break;
 			// sec
 			fwrite(&tlv->value[startindx + 8], 1, 2, f);
-			if (len < startindx + 11) 
+			if (len < startindx + 11)
 				break;
 			// time zone
 			fprintf(f, " zone: %.*s", len - 10 - (longyear ? 4 : 2), &tlv->value[startindx + 10]);
-	
+
 			break;
 		}
 		fprintf(f, "'\n");
 	} else {
 		fprintf(f, "\n");
 		*needdump = true;
-	}	
+	}
 }
 
 static void asn1_tag_dump_string(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level){
@@ -170,7 +170,7 @@ static void asn1_tag_dump_octet_string(const struct tlv *tlv, const struct asn1_
 			*needdump = true;
 			break;
 		}
-		
+
 	if (*needdump) {
 		fprintf(f, "'\n");
 	} else {
@@ -239,7 +239,7 @@ static char *asn1_oid_description(const char *oid, bool with_group_desc) {
 
 	size_t len = strlen(get_my_executable_directory());
 	if ( len > 300 ) len = 299;
-	
+
 	strncpy(fname, get_my_executable_directory(), len);
 	strcat(fname, "crypto/oids.json");
 	if (access(fname, F_OK) < 0) {
@@ -249,19 +249,19 @@ static char *asn1_oid_description(const char *oid, bool with_group_desc) {
 			goto error; // file not found
 		}
 	}
-	
+
 	// load `oids.json`
 	root = json_load_file(fname, 0, &error);
-	
+
 	if (!root || !json_is_object(root)) {
 		goto error;
 	}
-	
+
 	json_t *elm = json_object_get(root, oid);
 	if (!elm) {
 		goto error;
 	}
-	
+
 	if (JsonLoadStr(elm, "$.d", res))
 		goto error;
 
@@ -271,10 +271,10 @@ static char *asn1_oid_description(const char *oid, bool with_group_desc) {
 		strcat(res, strext);
 		strcat(res, ")");
 	}
-	
+
 	json_decref(root);
 	return res;
-	
+
 error:
 	if (root)
 		json_decref(root);
@@ -287,15 +287,15 @@ static void asn1_tag_dump_object_id(const struct tlv *tlv, const struct asn1_tag
 	asn1_buf.len = tlv->len;
 	asn1_buf.p = (uint8_t *)tlv->value;
 	char pstr[300];
-	mbedtls_oid_get_numeric_string(pstr, sizeof(pstr), &asn1_buf); 
+	mbedtls_oid_get_numeric_string(pstr, sizeof(pstr), &asn1_buf);
 	fprintf(f, " %s", pstr);
-	
+
 	char *jsondesc = asn1_oid_description(pstr, true);
 	if (jsondesc) {
 		fprintf(f, " -  %s", jsondesc);
-	} else {	
+	} else {
 		const char *ppstr;
-		mbedtls_oid_get_attr_short_name(&asn1_buf, &ppstr); 
+		mbedtls_oid_get_attr_short_name(&asn1_buf, &ppstr);
 		if (ppstr && strnlen(ppstr, 1)) {
 			fprintf(f, " (%s)\n", ppstr);
 			return;
@@ -355,6 +355,6 @@ bool asn1_tag_dump(const struct tlv *tlv, FILE *f, int level, bool *candump) {
 		*candump = false;
 		break;
 	};
-	
+
 	return true;
 }
diff --git a/client/crypto/asn1utils.c b/client/crypto/asn1utils.c
index 5be323b45..f8b296e60 100644
--- a/client/crypto/asn1utils.c
+++ b/client/crypto/asn1utils.c
@@ -34,10 +34,10 @@ int ecdsa_asn1_get_signature(uint8_t *signature, size_t signaturelen, uint8_t *r
 			mbedtls_mpi_free(&xmpi);
 			goto exit;
 		}
-		
+
 		res = mbedtls_mpi_write_binary(&xmpi, rval, 32);
 		mbedtls_mpi_free(&xmpi);
-		if (res) 
+		if (res)
 			goto exit;
 
 		mbedtls_mpi_init(&xmpi);
@@ -46,10 +46,10 @@ int ecdsa_asn1_get_signature(uint8_t *signature, size_t signaturelen, uint8_t *r
 			mbedtls_mpi_free(&xmpi);
 			goto exit;
 		}
-		
+
 		res = mbedtls_mpi_write_binary(&xmpi, sval, 32);
 		mbedtls_mpi_free(&xmpi);
-		if (res) 
+		if (res)
 			goto exit;
 
 		// check size
@@ -72,7 +72,7 @@ static bool print_cb(void *data, const struct tlv *tlv, int level, bool is_leaf)
 }
 
 int asn1_print(uint8_t *asn1buf, size_t asn1buflen, char *indent) {
-	
+
 	struct tlvdb *t = NULL;
 	t = tlvdb_parse_multi(asn1buf, asn1buflen);
 	if (t) {
@@ -82,7 +82,7 @@ int asn1_print(uint8_t *asn1buf, size_t asn1buflen, char *indent) {
 		PrintAndLogEx(ERR, "Can't parse data as TLV tree.");
 		return 1;
 	}
-	
+
 	return 0;
 }
 
diff --git a/client/crypto/libpcrypto.c b/client/crypto/libpcrypto.c
index 896048bf0..37668b4e4 100644
--- a/client/crypto/libpcrypto.c
+++ b/client/crypto/libpcrypto.c
@@ -30,7 +30,7 @@ int aes_encode(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *output, int l
 	uint8_t iiv[16] = {0};
 	if (iv)
 		memcpy(iiv, iv, 16);
-	
+
 	mbedtls_aes_context aes;
 	mbedtls_aes_init(&aes);
 	if (mbedtls_aes_setkey_enc(&aes, key, 128))
@@ -46,7 +46,7 @@ int aes_decode(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *output, int l
 	uint8_t iiv[16] = {0};
 	if (iv)
 		memcpy(iiv, iv, 16);
-	
+
 	mbedtls_aes_context aes;
 	mbedtls_aes_init(&aes);
 	if (mbedtls_aes_setkey_dec(&aes, key, 128))
@@ -62,20 +62,20 @@ int aes_decode(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *output, int l
 // https://csrc.nist.gov/CSRC/media/Projects/Cryptographic-Standards-and-Guidelines/documents/examples/AES_CMAC.pdf
 int aes_cmac(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *mac, int length) {
 	memset(mac, 0x00, 16);
-	
-	//  NIST 800-38B 
+
+	//  NIST 800-38B
 	return mbedtls_aes_cmac_prf_128(key, MBEDTLS_AES_BLOCK_SIZE, input, length, mac);
 }
 
 int aes_cmac8(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *mac, int length) {
 	uint8_t cmac[16] = {0};
 	memset(mac, 0x00, 8);
-	
+
 	int res = aes_cmac(iv, key, input, cmac, length);
 	if (res)
 		return res;
-	
-	for(int i = 0; i < 8; i++) 
+
+	for(int i = 0; i < 8; i++)
 		mac[i] = cmac[i * 2 + 1];
 
 	return 0;
@@ -88,73 +88,73 @@ static int fixed_rand(void *rng_state, unsigned char *output, size_t len) {
 	} else {
 		memset(output, 0x00, len);
 	}
-	
+
 	return 0;
 }
 
 int sha256hash(uint8_t *input, int length, uint8_t *hash) {
 	if (!hash || !input)
 		return 1;
-	
+
 	mbedtls_sha256_context sctx;
 	mbedtls_sha256_init(&sctx);
-	mbedtls_sha256_starts(&sctx, 0); // SHA-256, not 224 
+	mbedtls_sha256_starts(&sctx, 0); // SHA-256, not 224
 	mbedtls_sha256_update(&sctx, input, length);
-	mbedtls_sha256_finish(&sctx, hash);	
+	mbedtls_sha256_finish(&sctx, hash);
 	mbedtls_sha256_free(&sctx);
-	
+
 	return 0;
 }
 
 int ecdsa_init_str(mbedtls_ecdsa_context *ctx, char * key_d, char *key_x, char *key_y) {
 	if (!ctx)
 		return 1;
-	
+
 	int res;
 
 	mbedtls_ecdsa_init(ctx);
 	res = mbedtls_ecp_group_load(&ctx->grp, MBEDTLS_ECP_DP_SECP256R1); // secp256r1
-	if (res) 
+	if (res)
 		return res;
-	
+
 	if (key_d) {
 		res = mbedtls_mpi_read_string(&ctx->d, 16, key_d);
-		if (res) 
+		if (res)
 			return res;
 	}
-	
+
 	if (key_x && key_y) {
 		res = mbedtls_ecp_point_read_string(&ctx->Q, 16, key_x, key_y);
-		if (res) 
+		if (res)
 			return res;
 	}
-	
+
 	return 0;
 }
 
 int ecdsa_init(mbedtls_ecdsa_context *ctx, uint8_t * key_d, uint8_t *key_xy) {
 	if (!ctx)
 		return 1;
-	
+
 	int res;
 
 	mbedtls_ecdsa_init(ctx);
 	res = mbedtls_ecp_group_load(&ctx->grp, MBEDTLS_ECP_DP_SECP256R1); // secp256r1
-	if (res) 
+	if (res)
 		return res;
-	
+
 	if (key_d) {
 		res = mbedtls_mpi_read_binary(&ctx->d, key_d, 32);
-		if (res) 
+		if (res)
 			return res;
 	}
-	
+
 	if (key_xy) {
 		res = mbedtls_ecp_point_read_binary(&ctx->grp, &ctx->Q, key_xy, 32 * 2 + 1);
-		if (res) 
+		if (res)
 			return res;
 	}
-	
+
 	return 0;
 }
 
@@ -188,7 +188,7 @@ int ecdsa_key_create(uint8_t * key_d, uint8_t *key_xy) {
 	res = mbedtls_ecp_point_write_binary(&ctx.grp, &ctx.Q, MBEDTLS_ECP_PF_UNCOMPRESSED, &keylen, public_key, sizeof(public_key));
 	if (res)
 		goto exit;
-	
+
 	if (keylen != 65) { // 0x04 <key x 32b><key y 32b>
 		res = 1;
 		goto exit;
@@ -212,20 +212,20 @@ char *ecdsa_get_error(int ret) {
 int ecdsa_public_key_from_pk(mbedtls_pk_context *pk, uint8_t *key, size_t keylen) {
 	int res = 0;
 	size_t realkeylen = 0;
-	if (keylen < 65) 
+	if (keylen < 65)
 		return 1;
-	
+
 	mbedtls_ecdsa_context ctx;
 	mbedtls_ecdsa_init(&ctx);
-	
+
 	res = mbedtls_ecp_group_load(&ctx.grp, MBEDTLS_ECP_DP_SECP256R1); // secp256r1
 	if (res)
 		goto exit;
-	
+
 	res = mbedtls_ecdsa_from_keypair(&ctx, mbedtls_pk_ec(*pk) );
 	if (res)
 		goto exit;
-	
+
 	res = mbedtls_ecp_point_write_binary(&ctx.grp, &ctx.Q, MBEDTLS_ECP_PF_UNCOMPRESSED, &realkeylen, key, keylen);
 	if (realkeylen != 65)
 		res = 2;
@@ -237,8 +237,8 @@ exit:
 int ecdsa_signature_create(uint8_t *key_d, uint8_t *key_xy, uint8_t *input, int length, uint8_t *signature, size_t *signaturelen) {
 	int res;
 	*signaturelen = 0;
-	
-	uint8_t shahash[32] = {0}; 
+
+	uint8_t shahash[32] = {0};
 	res = sha256hash(input, length, shahash);
 	if (res)
 		return res;
@@ -254,10 +254,10 @@ int ecdsa_signature_create(uint8_t *key_d, uint8_t *key_xy, uint8_t *input, int
 	if (res)
         goto exit;
 
-	mbedtls_ecdsa_context ctx;	
+	mbedtls_ecdsa_context ctx;
 	ecdsa_init(&ctx, key_d, key_xy);
 	res = mbedtls_ecdsa_write_signature(&ctx, MBEDTLS_MD_SHA256, shahash, sizeof(shahash), signature, signaturelen, mbedtls_ctr_drbg_random, &ctr_drbg);
-	
+
 exit:
     mbedtls_ctr_drbg_free(&ctr_drbg);
 	mbedtls_ecdsa_free(&ctx);
@@ -267,49 +267,49 @@ exit:
 int ecdsa_signature_create_test(char * key_d, char *key_x, char *key_y, char *random, uint8_t *input, int length, uint8_t *signature, size_t *signaturelen) {
 	int res;
 	*signaturelen = 0;
-	
-	uint8_t shahash[32] = {0}; 
+
+	uint8_t shahash[32] = {0};
 	res = sha256hash(input, length, shahash);
 	if (res)
 		return res;
 
 	int rndlen = 0;
 	param_gethex_to_eol(random, 0, fixed_rand_value, sizeof(fixed_rand_value), &rndlen);
-	
-	mbedtls_ecdsa_context ctx;	
+
+	mbedtls_ecdsa_context ctx;
 	ecdsa_init_str(&ctx, key_d, key_x, key_y);
 	res = mbedtls_ecdsa_write_signature(&ctx, MBEDTLS_MD_SHA256, shahash, sizeof(shahash), signature, signaturelen, fixed_rand, NULL);
-	
+
 	mbedtls_ecdsa_free(&ctx);
 	return res;
 }
 
 int ecdsa_signature_verify_keystr(char *key_x, char *key_y, uint8_t *input, int length, uint8_t *signature, size_t signaturelen) {
 	int res;
-	uint8_t shahash[32] = {0}; 
+	uint8_t shahash[32] = {0};
 	res = sha256hash(input, length, shahash);
 	if (res)
 		return res;
 
-	mbedtls_ecdsa_context ctx;	
+	mbedtls_ecdsa_context ctx;
 	ecdsa_init_str(&ctx, NULL, key_x, key_y);
 	res = mbedtls_ecdsa_read_signature(&ctx, shahash, sizeof(shahash), signature, signaturelen);
-	
+
 	mbedtls_ecdsa_free(&ctx);
 	return res;
 }
 
 int ecdsa_signature_verify(uint8_t *key_xy, uint8_t *input, int length, uint8_t *signature, size_t signaturelen) {
 	int res;
-	uint8_t shahash[32] = {0}; 
+	uint8_t shahash[32] = {0};
 	res = sha256hash(input, length, shahash);
 	if (res)
 		return res;
 
-	mbedtls_ecdsa_context ctx;	
+	mbedtls_ecdsa_context ctx;
 	ecdsa_init(&ctx, NULL, key_xy);
 	res = mbedtls_ecdsa_read_signature(&ctx, shahash, sizeof(shahash), signature, signaturelen);
-	
+
 	mbedtls_ecdsa_free(&ctx);
 	return res;
 }
@@ -325,8 +325,8 @@ int ecdsa_nist_test(bool verbose) {
 	int res;
 	uint8_t input[] = "Example of ECDSA with P-256";
 	int length = strlen((char *)input);
-	uint8_t signature[300] = {0}; 
-	size_t siglen = 0; 
+	uint8_t signature[300] = {0};
+	size_t siglen = 0;
 
 	// NIST ecdsa test
 	if (verbose)
@@ -334,32 +334,32 @@ int ecdsa_nist_test(bool verbose) {
 	// make signature
 	res = ecdsa_signature_create_test(T_PRIVATE_KEY, T_Q_X, T_Q_Y, T_K, input, length, signature, &siglen);
 //	printf("res: %x signature[%x]: %s\n", (res<0)?-res:res, siglen, sprint_hex(signature, siglen));
-	if (res) 
+	if (res)
 		goto exit;
 
 	// check vectors
-	uint8_t rval[300] = {0}; 
-	uint8_t sval[300] = {0}; 
+	uint8_t rval[300] = {0};
+	uint8_t sval[300] = {0};
 	res = ecdsa_asn1_get_signature(signature, siglen, rval, sval);
 	if (res)
 		goto exit;
-	
+
 	int slen = 0;
 	uint8_t rval_s[33] = {0};
 	param_gethex_to_eol(T_R, 0, rval_s, sizeof(rval_s), &slen);
-	uint8_t sval_s[33] = {0}; 
+	uint8_t sval_s[33] = {0};
 	param_gethex_to_eol(T_S, 0, sval_s, sizeof(sval_s), &slen);
 	if (strncmp((char *)rval, (char *)rval_s, 32) || strncmp((char *)sval, (char *)sval_s, 32)) {
 		printf("R or S check error\n");
 		res = 100;
 		goto exit;
 	}
-	
+
 	// verify signature
 	res = ecdsa_signature_verify_keystr(T_Q_X, T_Q_Y, input, length, signature, siglen);
-	if (res) 
+	if (res)
 		goto exit;
-		
+
 	// verify wrong signature
 	input[0] ^= 0xFF;
 	res = ecdsa_signature_verify_keystr(T_Q_X, T_Q_Y, input, length, signature, siglen);
@@ -378,27 +378,27 @@ int ecdsa_nist_test(bool verbose) {
 	uint8_t key_xy[32 * 2 + 2] = {0};
 	memset(signature, 0x00, sizeof(signature));
 	siglen = 0;
-	
+
 	res = ecdsa_key_create(key_d, key_xy);
-	if (res) 
+	if (res)
 		goto exit;
 
 	res = ecdsa_signature_create(key_d, key_xy, input, length, signature, &siglen);
-	if (res) 
+	if (res)
 		goto exit;
 
 	res = ecdsa_signature_verify(key_xy, input, length, signature, siglen);
-	if (res) 
+	if (res)
 		goto exit;
 
 	input[0] ^= 0xFF;
 	res = ecdsa_signature_verify(key_xy, input, length, signature, siglen);
-	if (!res) 
+	if (!res)
 		goto exit;
-	
+
 	if (verbose)
 		printf("passed\n\n");
-	
+
 	return 0;
 exit:
 	if (verbose)
diff --git a/client/emv/apduinfo.c b/client/emv/apduinfo.c
index b1bb84dae..17e87c45f 100644
--- a/client/emv/apduinfo.c
+++ b/client/emv/apduinfo.c
@@ -270,10 +270,10 @@ int CodeCmp(const char *code1, const char *code2) {
 	}
 	if (cmp == 4)
 		return 0;
-	
+
 	if (cmp + xsymb == 4)
 		return xsymb;
-	
+
 	return -1;
 }
 
@@ -282,17 +282,17 @@ const APDUCode* const GetAPDUCode(uint8_t sw1, uint8_t sw2) {
 	int res;
 	int mineq = APDUCodeTableLen;
 	int mineqindx = 0;
-	
+
 	sprintf(buf, "%02X%02X", sw1, sw2);
-	
+
 	for (int i = 0; i < APDUCodeTableLen; i++) {
 		res = CodeCmp(APDUCodeTable[i].ID, buf);
-		
+
 		// equal
-		if (res == 0) { 
+		if (res == 0) {
 			return &APDUCodeTable[i];
 		}
-		
+
 		// with some  'X'
 		if (res > 0 && mineq > res) {
 			mineq = res;
@@ -304,7 +304,7 @@ const APDUCode* const GetAPDUCode(uint8_t sw1, uint8_t sw2) {
 	if (mineqindx < APDUCodeTableLen) {
 		return &APDUCodeTable[mineqindx];
 	}
-	
+
 	return NULL;
 }
 
diff --git a/client/emv/apduinfo.h b/client/emv/apduinfo.h
index a3fa2049b..c64230502 100644
--- a/client/emv/apduinfo.h
+++ b/client/emv/apduinfo.h
@@ -27,7 +27,7 @@ typedef struct {
 	const uint8_t Type;
 	const char *Description;
 } APDUCode;
-	
+
 extern const APDUCode* const GetAPDUCode(uint8_t sw1, uint8_t sw2);
 extern const char* GetAPDUCodeDescription(uint8_t sw1, uint8_t sw2);
 
diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index f14d23f2d..5d73e88c9 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -58,8 +58,8 @@ int CmdEMVSelect(const char *cmd) {
 	uint8_t data[APDU_AID_LEN] = {0};
 	int datalen = 0;
 
-	CLIParserInit("emv select", 
-		"Executes select applet command", 
+	CLIParserInit("emv select",
+		"Executes select applet command",
 		"Usage:\n\temv select -s a00000000101 -> select card, select applet\n\temv select -st a00000000101 -> select card, select applet, show result in TLV\n");
 
 	void* argtable[] = {
@@ -73,7 +73,7 @@ int CmdEMVSelect(const char *cmd) {
 		arg_param_end
 	};
 	CLIExecWithReturn(cmd, argtable, true);
-	
+
 	bool activateField = arg_get_lit(1);
 	bool leaveSignalON = arg_get_lit(2);
 	bool APDULogging = arg_get_lit(3);
@@ -84,9 +84,9 @@ int CmdEMVSelect(const char *cmd) {
 	PrintChannel(channel);
 	CLIGetHexWithReturn(6, data, &datalen);
 	CLIParserFree();
-	
+
 	SetAPDULogging(APDULogging);
-	
+
 	// exec
 	uint8_t buf[APDU_RES_LEN] = {0};
 	size_t len = 0;
@@ -94,11 +94,11 @@ int CmdEMVSelect(const char *cmd) {
 	int res = EMVSelect(channel, activateField, leaveSignalON, data, datalen, buf, sizeof(buf), &len, &sw, NULL);
 
 	if (sw)
-		PrintAndLogEx(INFO, "APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
-	
+		PrintAndLogEx(INFO, "APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
+
 	if (res)
 		return res;
-	
+
 	if (decodeTLV)
 		TLVPrintFromBuffer(buf, len);
 
@@ -107,8 +107,8 @@ int CmdEMVSelect(const char *cmd) {
 
 int CmdEMVSearch(const char *cmd) {
 
-	CLIParserInit("emv search", 
-		"Tries to select all applets from applet list:\n", 
+	CLIParserInit("emv search",
+		"Tries to select all applets from applet list:\n",
 		"Usage:\n\temv search -s -> select card and search\n\temv search -st -> select card, search and show result in TLV\n");
 
 	void* argtable[] = {
@@ -121,7 +121,7 @@ int CmdEMVSearch(const char *cmd) {
 		arg_param_end
 	};
 	CLIExecWithReturn(cmd, argtable, true);
-	
+
 	bool activateField = arg_get_lit(1);
 	bool leaveSignalON = arg_get_lit(2);
 	bool APDULogging = arg_get_lit(3);
@@ -131,9 +131,9 @@ int CmdEMVSearch(const char *cmd) {
 		channel = ECC_CONTACT;
 	PrintChannel(channel);
 	CLIParserFree();
-	
+
 	SetAPDULogging(APDULogging);
-	
+
 	struct tlvdb *t = NULL;
 	const char *al = "Applets list";
 	t = tlvdb_fixed(1, strlen(al), (const unsigned char *)al);
@@ -142,23 +142,23 @@ int CmdEMVSearch(const char *cmd) {
 		tlvdb_free(t);
 		return 2;
 	}
-	
+
 	PrintAndLogEx(SUCCESS, "Search completed.");
 
 	// print list here
-	if (!decodeTLV) {  
+	if (!decodeTLV) {
 		TLVPrintAIDlistFromSelectTLV(t);
 	}
-	
+
 	tlvdb_free(t);
-	
+
 	return 0;
 }
 
 int CmdEMVPPSE(const char *cmd) {
-	
-	CLIParserInit("emv pse", 
-		"Executes PSE/PPSE select command. It returns list of applet on the card:\n", 
+
+	CLIParserInit("emv pse",
+		"Executes PSE/PPSE select command. It returns list of applet on the card:\n",
 		"Usage:\n\temv pse -s1 -> select, get pse\n\temv pse -st2 -> select, get ppse, show result in TLV\n");
 
 	void* argtable[] = {
@@ -173,7 +173,7 @@ int CmdEMVPPSE(const char *cmd) {
 		arg_param_end
 	};
 	CLIExecWithReturn(cmd, argtable, true);
-	
+
 	bool activateField = arg_get_lit(1);
 	bool leaveSignalON = arg_get_lit(2);
 	uint8_t PSENum = 2;
@@ -187,23 +187,23 @@ int CmdEMVPPSE(const char *cmd) {
 	if (arg_get_lit(7))
 		channel = ECC_CONTACT;
 	PrintChannel(channel);
-	CLIParserFree();	
-	
+	CLIParserFree();
+
 	SetAPDULogging(APDULogging);
-	
+
 	// exec
 	uint8_t buf[APDU_RES_LEN] = {0};
 	size_t len = 0;
 	uint16_t sw = 0;
 	int res = EMVSelectPSE(channel, activateField, leaveSignalON, PSENum, buf, sizeof(buf), &len, &sw);
-	
+
 	if (sw)
-		PrintAndLogEx(INFO, "APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
+		PrintAndLogEx(INFO, "APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
 
 	if (res)
 		return res;
-	
-	
+
+
 	if (decodeTLV)
 		TLVPrintFromBuffer(buf, len);
 
@@ -214,11 +214,11 @@ int CmdEMVGPO(const char *cmd) {
 	uint8_t data[APDU_RES_LEN] = {0};
 	int datalen = 0;
 
-	CLIParserInit("emv gpo", 
-		"Executes Get Processing Options command. It returns data in TLV format (0x77 - format2) or plain format (0x80 - format1).\nNeeds a EMV applet to be selected.", 
+	CLIParserInit("emv gpo",
+		"Executes Get Processing Options command. It returns data in TLV format (0x77 - format2) or plain format (0x80 - format1).\nNeeds a EMV applet to be selected.",
 		"Usage:\n\temv gpo -k -> execute GPO\n"
 			"\temv gpo -t 01020304 -> execute GPO with 4-byte PDOL data, show result in TLV\n"
-			"\temv gpo -pmt 9F 37 04 -> load params from file, make PDOL data from PDOL, execute GPO with PDOL, show result in TLV\n"); 
+			"\temv gpo -pmt 9F 37 04 -> load params from file, make PDOL data from PDOL, execute GPO with PDOL, show result in TLV\n");
 
 	void* argtable[] = {
 		arg_param_begin,
@@ -232,7 +232,7 @@ int CmdEMVGPO(const char *cmd) {
 		arg_param_end
 	};
 	CLIExecWithReturn(cmd, argtable, true);
-	
+
 	bool leaveSignalON = arg_get_lit(1);
 	bool paramsLoadFromFile = arg_get_lit(2);
 	bool dataMakeFromPDOL = arg_get_lit(3);
@@ -243,14 +243,14 @@ int CmdEMVGPO(const char *cmd) {
 		channel = ECC_CONTACT;
 	PrintChannel(channel);
 	CLIGetHexWithReturn(7, data, &datalen);
-	CLIParserFree();	
-	
+	CLIParserFree();
+
 	SetAPDULogging(APDULogging);
-	
+
 	// Init TLV tree
 	const char *alr = "Root terminal TLV tree";
 	struct tlvdb *tlvRoot = tlvdb_fixed(1, strlen(alr), (const unsigned char *)alr);
-	
+
 	// calc PDOL
 	struct tlv *pdol_data_tlv = NULL;
 	struct tlvdb *tmp_ext = NULL;
@@ -266,7 +266,7 @@ int CmdEMVGPO(const char *cmd) {
 			PrintAndLogEx(INFO, "Params loading from file...");
 			ParamLoadFromJson(tlvRoot);
 		};
-		
+
 		tmp_ext = tlvdb_external(0x9f38, datalen, data);
 		pdol_data_tlv = dol_process((const struct tlv *)tmp_ext, tlvRoot, 0x83);
 		if (!pdol_data_tlv){
@@ -291,25 +291,25 @@ int CmdEMVGPO(const char *cmd) {
 		return 4;
 	}
 	PrintAndLogEx(INFO, "PDOL data[%d]: %s", pdol_data_tlv_data_len, sprint_hex(pdol_data_tlv_data, pdol_data_tlv_data_len));
-	
+
 	// exec
 	uint8_t buf[APDU_RES_LEN] = {0};
 	size_t len = 0;
 	uint16_t sw = 0;
 	int res = EMVGPO(channel, leaveSignalON, pdol_data_tlv_data, pdol_data_tlv_data_len, buf, sizeof(buf), &len, &sw, tlvRoot);
-	
+
 	if (pdol_data_tlv != &data_tlv)
 		free(pdol_data_tlv);
 
-	tlvdb_free(tmp_ext);	
+	tlvdb_free(tmp_ext);
 	tlvdb_free(tlvRoot);
-	
+
 	if (sw)
-		PrintAndLogEx(INFO, "APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
+		PrintAndLogEx(INFO, "APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
 
 	if (res)
 		return res;
-	
+
 	if (decodeTLV)
 		TLVPrintFromBuffer(buf, len);
 
@@ -320,8 +320,8 @@ int CmdEMVReadRecord(const char *cmd) {
 	uint8_t data[APDU_RES_LEN] = {0};
 	int datalen = 0;
 
-	CLIParserInit("emv readrec", 
-		"Executes Read Record command. It returns data in TLV format.\nNeeds a bank applet to be selected and sometimes needs GPO to be executed.", 
+	CLIParserInit("emv readrec",
+		"Executes Read Record command. It returns data in TLV format.\nNeeds a bank applet to be selected and sometimes needs GPO to be executed.",
 		"Usage:\n\temv readrec -k 0101 -> read file SFI=01, SFIrec=01\n\temv readrec -kt 0201-> read file 0201 and show result in TLV\n");
 
 	void* argtable[] = {
@@ -334,7 +334,7 @@ int CmdEMVReadRecord(const char *cmd) {
 		arg_param_end
 	};
 	CLIExecWithReturn(cmd, argtable, true);
-	
+
 	bool leaveSignalON = arg_get_lit(1);
 	bool APDULogging = arg_get_lit(2);
 	bool decodeTLV = arg_get_lit(3);
@@ -344,27 +344,27 @@ int CmdEMVReadRecord(const char *cmd) {
 	PrintChannel(channel);
 	CLIGetHexWithReturn(5, data, &datalen);
 	CLIParserFree();
-	
+
 	if (datalen != 2) {
 		PrintAndLogEx(ERR, "Command needs to have 2 bytes of data");
 		return 1;
 	}
-	
+
 	SetAPDULogging(APDULogging);
-		
+
 	// exec
 	uint8_t buf[APDU_RES_LEN] = {0};
 	size_t len = 0;
 	uint16_t sw = 0;
 	int res = EMVReadRecord(channel, leaveSignalON, data[0], data[1], buf, sizeof(buf), &len, &sw, NULL);
-	
+
 	if (sw)
-		PrintAndLogEx(INFO, "APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
+		PrintAndLogEx(INFO, "APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
 
 	if (res)
 		return res;
-	
-	
+
+
 	if (decodeTLV)
 		TLVPrintFromBuffer(buf, len);
 
@@ -375,12 +375,12 @@ int CmdEMVAC(const char *cmd) {
 	uint8_t data[APDU_RES_LEN] = {0};
 	int datalen = 0;
 
-	CLIParserInit("emv genac", 
-		"Generate Application Cryptogram command. It returns data in TLV format .\nNeeds a EMV applet to be selected and GPO to be executed.", 
+	CLIParserInit("emv genac",
+		"Generate Application Cryptogram command. It returns data in TLV format .\nNeeds a EMV applet to be selected and GPO to be executed.",
 		"Usage:\n\temv genac -k 0102 -> generate AC with 2-byte CDOLdata and keep field ON after command\n"
 			"\temv genac -t 01020304 -> generate AC with 4-byte CDOL data, show result in TLV\n"
 			"\temv genac -Daac 01020304 -> generate AC with 4-byte CDOL data and terminal decision 'declined'\n"
-			"\temv genac -pmt 9F 37 04 -> load params from file, make CDOL data from CDOL, generate AC with CDOL, show result in TLV"); 
+			"\temv genac -pmt 9F 37 04 -> load params from file, make CDOL data from CDOL, generate AC with CDOL, show result in TLV");
 
 	void* argtable[] = {
 		arg_param_begin,
@@ -396,7 +396,7 @@ int CmdEMVAC(const char *cmd) {
 		arg_param_end
 	};
 	CLIExecWithReturn(cmd, argtable, false);
-	
+
 	bool leaveSignalON = arg_get_lit(1);
 	bool trTypeCDA = arg_get_lit(2);
 	uint8_t termDecision = 0xff;
@@ -426,14 +426,14 @@ int CmdEMVAC(const char *cmd) {
 		channel = ECC_CONTACT;
 	PrintChannel(channel);
 	CLIGetHexWithReturn(9, data, &datalen);
-	CLIParserFree();	
-	
+	CLIParserFree();
+
 	SetAPDULogging(APDULogging);
-	
+
 	// Init TLV tree
 	const char *alr = "Root terminal TLV tree";
 	struct tlvdb *tlvRoot = tlvdb_fixed(1, strlen(alr), (const unsigned char *)alr);
-	
+
 	// calc CDOL
 	struct tlv *cdol_data_tlv = NULL;
 	struct tlvdb *tmp_ext = NULL;
@@ -442,7 +442,7 @@ int CmdEMVAC(const char *cmd) {
 		.len = datalen,
 		.value = (uint8_t *)data,
 	};
-	
+
 	if (dataMakeFromCDOL) {
 		ParamLoadDefaults(tlvRoot);
 
@@ -450,7 +450,7 @@ int CmdEMVAC(const char *cmd) {
 			PrintAndLogEx(INFO, "Params loading from file...");
 			ParamLoadFromJson(tlvRoot);
 		};
-		
+
 		tmp_ext = tlvdb_external(0x8c, datalen, data);
 		cdol_data_tlv = dol_process((const struct tlv *)tmp_ext, tlvRoot, 0x01); // 0x01 - dummy tag
 		if (!cdol_data_tlv){
@@ -465,7 +465,7 @@ int CmdEMVAC(const char *cmd) {
 		}
 		cdol_data_tlv = &data_tlv;
 	}
-	
+
 	PrintAndLogEx(INFO, "CDOL data[%d]: %s", cdol_data_tlv->len, sprint_hex(cdol_data_tlv->value, cdol_data_tlv->len));
 
 	// exec
@@ -473,29 +473,29 @@ int CmdEMVAC(const char *cmd) {
 	size_t len = 0;
 	uint16_t sw = 0;
 	int res = EMVAC(channel, leaveSignalON, termDecision, (uint8_t *)cdol_data_tlv->value, cdol_data_tlv->len, buf, sizeof(buf), &len, &sw, tlvRoot);
-	
+
 	if (cdol_data_tlv != &data_tlv)
 		free(cdol_data_tlv);
 
 	tlvdb_free(tmp_ext);
 	tlvdb_free(tlvRoot);
-	
+
 	if (sw)
-		PrintAndLogEx(INFO, "APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
+		PrintAndLogEx(INFO, "APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
 
 	if (res)
 		return res;
-	
+
 	if (decodeTLV)
 		TLVPrintFromBuffer(buf, len);
 
-	return 0;	
+	return 0;
 }
 
 int CmdEMVGenerateChallenge(const char *cmd) {
 
-	CLIParserInit("emv challenge", 
-		"Executes Generate Challenge command. It returns 4 or 8-byte random number from card.\nNeeds a EMV applet to be selected and GPO to be executed.", 
+	CLIParserInit("emv challenge",
+		"Executes Generate Challenge command. It returns 4 or 8-byte random number from card.\nNeeds a EMV applet to be selected and GPO to be executed.",
 		"Usage:\n\temv challenge -> get challenge\n\temv challenge -k -> get challenge, keep fileld ON\n");
 
 	void* argtable[] = {
@@ -506,34 +506,34 @@ int CmdEMVGenerateChallenge(const char *cmd) {
 		arg_param_end
 	};
 	CLIExecWithReturn(cmd, argtable, true);
-	
+
 	bool leaveSignalON = arg_get_lit(1);
 	bool APDULogging = arg_get_lit(2);
 	EMVCommandChannel channel = ECC_CONTACTLESS;
 	if (arg_get_lit(3))
 		channel = ECC_CONTACT;
 	PrintChannel(channel);
-	CLIParserFree();	
-	
+	CLIParserFree();
+
 	SetAPDULogging(APDULogging);
-	
+
 	// exec
 	uint8_t buf[APDU_RES_LEN] = {0};
 	size_t len = 0;
 	uint16_t sw = 0;
 	int res = EMVGenerateChallenge(channel, leaveSignalON, buf, sizeof(buf), &len, &sw, NULL);
-	
+
 	if (sw)
-		PrintAndLogEx(INFO, "APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
+		PrintAndLogEx(INFO, "APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
 
 	if (res)
 		return res;
 
 	PrintAndLogEx(SUCCESS, "Challenge: %s", sprint_hex(buf, len));
-	
+
 	if (len != 4 && len != 8)
 		PrintAndLogEx(WARNING, "Length of challenge must be 4 or 8, but it %d", len);
-	
+
 	return 0;
 }
 
@@ -541,14 +541,14 @@ int CmdEMVInternalAuthenticate(const char *cmd) {
 	uint8_t data[APDU_RES_LEN] = {0};
 	int datalen = 0;
 
-	CLIParserInit("emv intauth", 
+	CLIParserInit("emv intauth",
 		"Generate Internal Authenticate command. Usually needs 4-byte random number. It returns data in TLV format .\n"
-		"Needs a EMV applet to be selected and GPO to be executed.", 
-		
+		"Needs a EMV applet to be selected and GPO to be executed.",
+
 		"Usage:\n"
 		"\temv intauth -k 01020304 -> execute Internal Authenticate with 4-byte DDOLdata and keep field ON after command\n"
 			"\temv intauth -t 01020304 -> execute Internal Authenticate with 4-byte DDOL data, show result in TLV\n"
-			"\temv intauth -pmt 9F 37 04 -> load params from file, make DDOL data from DDOL, Internal Authenticate with DDOL, show result in TLV"); 
+			"\temv intauth -pmt 9F 37 04 -> load params from file, make DDOL data from DDOL, Internal Authenticate with DDOL, show result in TLV");
 
 	void* argtable[] = {
 		arg_param_begin,
@@ -562,7 +562,7 @@ int CmdEMVInternalAuthenticate(const char *cmd) {
 		arg_param_end
 	};
 	CLIExecWithReturn(cmd, argtable, false);
-	
+
 	bool leaveSignalON = arg_get_lit(1);
 	bool paramsLoadFromFile = arg_get_lit(2);
 	bool dataMakeFromDDOL = arg_get_lit(3);
@@ -573,14 +573,14 @@ int CmdEMVInternalAuthenticate(const char *cmd) {
 		channel = ECC_CONTACT;
 	PrintChannel(channel);
 	CLIGetHexWithReturn(7, data, &datalen);
-	CLIParserFree();	
-	
+	CLIParserFree();
+
 	SetAPDULogging(APDULogging);
 
 	// Init TLV tree
 	const char *alr = "Root terminal TLV tree";
 	struct tlvdb *tlvRoot = tlvdb_fixed(1, strlen(alr), (const unsigned char *)alr);
-	
+
 	// calc DDOL
 	struct tlv *ddol_data_tlv = NULL;
 	struct tlvdb *tmp_ext = NULL;
@@ -589,7 +589,7 @@ int CmdEMVInternalAuthenticate(const char *cmd) {
 		.len = datalen,
 		.value = (uint8_t *)data,
 	};
-	
+
 	if (dataMakeFromDDOL) {
 		ParamLoadDefaults(tlvRoot);
 
@@ -597,7 +597,7 @@ int CmdEMVInternalAuthenticate(const char *cmd) {
 			PrintAndLogEx(INFO, "Params loading from file...");
 			ParamLoadFromJson(tlvRoot);
 		};
-		
+
 		tmp_ext = tlvdb_external(0x9f49, datalen, data);
 		ddol_data_tlv = dol_process((const struct tlv *)tmp_ext, tlvRoot, 0x01); // 0x01 - dummy tag
 		if (!ddol_data_tlv){
@@ -612,44 +612,44 @@ int CmdEMVInternalAuthenticate(const char *cmd) {
 		}
 		ddol_data_tlv = &data_tlv;
 	}
-	
+
 	PrintAndLogEx(INFO, "DDOL data[%d]: %s", ddol_data_tlv->len, sprint_hex(ddol_data_tlv->value, ddol_data_tlv->len));
-	
+
 	// exec
 	uint8_t buf[APDU_RES_LEN] = {0};
 	size_t len = 0;
 	uint16_t sw = 0;
 	int res = EMVInternalAuthenticate(channel, leaveSignalON, data, datalen, buf, sizeof(buf), &len, &sw, NULL);
-	
+
 	if (ddol_data_tlv != &data_tlv)
 		free(ddol_data_tlv);
 
-	tlvdb_free(tmp_ext);	
-	tlvdb_free(tlvRoot);	
-	
+	tlvdb_free(tmp_ext);
+	tlvdb_free(tlvRoot);
+
 	if (sw)
-		PrintAndLogEx(INFO, "APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
+		PrintAndLogEx(INFO, "APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
 
 	if (res)
 		return res;
-	
+
 	if (decodeTLV)
 		TLVPrintFromBuffer(buf, len);
 
-	return 0;	
+	return 0;
 }
 
 #define dreturn(n) {free(pdol_data_tlv); tlvdb_free(tlvSelect); tlvdb_free(tlvRoot); DropFieldEx( channel ); return n;}
 
 void InitTransactionParameters(struct tlvdb *tlvRoot, bool paramLoadJSON, enum TransactionType TrType, bool GenACGPO) {
-	
+
 	ParamLoadDefaults(tlvRoot);
 
 	if (paramLoadJSON) {
 		PrintAndLog("* * Transaction parameters loading from JSON...");
 		ParamLoadFromJson(tlvRoot);
 	}
-	
+
 	//9F66:(Terminal Transaction Qualifiers (TTQ)) len:4
 	char *qVSDC = "\x26\x00\x00\x00";
 	if (GenACGPO) {
@@ -660,7 +660,7 @@ void InitTransactionParameters(struct tlvdb *tlvRoot, bool paramLoadJSON, enum T
 			TLV_ADD(0x9F66, "\x86\x00\x00\x00"); // MSD
 			break;
 		// not standard for contactless. just for test.
-		case TT_VSDC:  
+		case TT_VSDC:
 			TLV_ADD(0x9F66, "\x46\x00\x00\x00"); // VSDC
 			break;
 		case TT_QVSDCMCHIP:
@@ -680,7 +680,7 @@ void ProcessGPOResponseFormat1(struct tlvdb *tlvRoot, uint8_t *buf, size_t len,
 			PrintAndLog("GPO response format1:");
 			TLVPrintFromBuffer(buf, len);
 		}
-		
+
 		if (len < 4 || (len - 4) % 4) {
 			PrintAndLogEx(ERR, "GPO response format1 parsing error. length=%d", len);
 		} else {
@@ -697,7 +697,7 @@ void ProcessGPOResponseFormat1(struct tlvdb *tlvRoot, uint8_t *buf, size_t len,
 			tlvdb_add(tlvRoot, f1AFL);
 			if (decodeTLV)
 				TLVPrintFromTLV(f1AFL);
-		}		
+		}
 	} else {
 		if (decodeTLV)
 			TLVPrintFromBuffer(buf, len);
@@ -710,38 +710,38 @@ void ProcessACResponseFormat1(struct tlvdb *tlvRoot, uint8_t *buf, size_t len, b
 			PrintAndLog("GPO response format1:");
 			TLVPrintFromBuffer(buf, len);
 		}
-		
+
 		uint8_t elmlen = len - 2; // wo 0x80XX
-		
+
 		if (len < 4 + 2 || (elmlen - 2) % 4 || elmlen != buf[1]) {
 			PrintAndLogEx(ERR, "GPO response format1 parsing error. length=%d", len);
 		} else {
 			struct tlvdb *tlvElm = NULL;
 			if (decodeTLV)
 				PrintAndLog("\n------------ Format1 decoded ------------");
-			
+
 			// CID (Cryptogram Information Data)
 			tlvdb_change_or_add_node_ex(tlvRoot, 0x9f27, 1, &buf[2], &tlvElm);
 			if (decodeTLV)
 				TLVPrintFromTLV(tlvElm);
 
 			// ATC (Application Transaction Counter)
-			tlvdb_change_or_add_node_ex(tlvRoot, 0x9f36, 2, &buf[3], &tlvElm);		
+			tlvdb_change_or_add_node_ex(tlvRoot, 0x9f36, 2, &buf[3], &tlvElm);
 			if (decodeTLV)
 				TLVPrintFromTLV(tlvElm);
 
 			// AC (Application Cryptogram)
-			tlvdb_change_or_add_node_ex(tlvRoot, 0x9f26, MIN(8, elmlen - 3), &buf[5], &tlvElm);		
+			tlvdb_change_or_add_node_ex(tlvRoot, 0x9f26, MIN(8, elmlen - 3), &buf[5], &tlvElm);
 			if (decodeTLV)
 				TLVPrintFromTLV(tlvElm);
 
 			// IAD (Issuer Application Data) - optional
 			if (len > 11 + 2) {
-				tlvdb_change_or_add_node_ex(tlvRoot, 0x9f10, elmlen - 11, &buf[13], &tlvElm);		
+				tlvdb_change_or_add_node_ex(tlvRoot, 0x9f10, elmlen - 11, &buf[13], &tlvElm);
 				if (decodeTLV)
 					TLVPrintFromTLV(tlvElm);
-			}			
-		}		
+			}
+		}
 	} else {
 		if (decodeTLV)
 			TLVPrintFromBuffer(buf, len);
@@ -756,15 +756,15 @@ int CmdEMVExec(const char *cmd) {
 	size_t AIDlen = 0;
 	uint8_t ODAiList[4096];
 	size_t ODAiListLen = 0;
-	
+
 	int res;
-	
+
 	struct tlvdb *tlvSelect = NULL;
 	struct tlvdb *tlvRoot = NULL;
 	struct tlv *pdol_data_tlv = NULL;
 
-	CLIParserInit("emv exec", 
-		"Executes EMV contactless transaction", 
+	CLIParserInit("emv exec",
+		"Executes EMV contactless transaction",
 		"Usage:\n"
 			"\temv exec -sat -> select card, execute MSD transaction, show APDU and TLV\n"
 			"\temv exec -satc -> select card, execute CDA transaction, show APDU and TLV\n");
@@ -785,7 +785,7 @@ int CmdEMVExec(const char *cmd) {
 		arg_param_end
 	};
 	CLIExecWithReturn(cmd, argtable, true);
-	
+
 	bool activateField = arg_get_lit(1);
 	bool showAPDU = arg_get_lit(2);
 	bool decodeTLV = arg_get_lit(3);
@@ -807,17 +807,17 @@ int CmdEMVExec(const char *cmd) {
 	PrintChannel(channel);
 	uint8_t psenum = (channel == ECC_CONTACT) ? 1 : 2;
 	CLIParserFree();
-	
+
 #ifndef WITH_SMARTCARD
 	// not compiled with smartcard functionality,  we need to exit
 	if ( channel == ECC_CONTACT ) {
 		PrintAndLogEx(WARNING, "PM3 Client is not compiled with support for SMARTCARD. Exiting.");
 		return 0;
 	}
-#endif	
+#endif
 
 	SetAPDULogging(showAPDU);
-	
+
 	// init applets list tree
 	const char *al = "Applets list";
 	tlvSelect = tlvdb_fixed(1, strlen(al), (const unsigned char *)al);
@@ -831,12 +831,12 @@ int CmdEMVExec(const char *cmd) {
 		res = EMVSearchPSE(channel, activateField, true, psenum, decodeTLV, tlvSelect);
 
 		// check PPSE and select application id
-		if (!res) {	
+		if (!res) {
 			TLVPrintAIDlistFromSelectTLV(tlvSelect);
 			EMVSelectApplication(tlvSelect, AID, &AIDlen);
 		}
 	}
-	
+
 	// Search
 	if (!AIDlen) {
 		PrintAndLogEx(NORMAL, "\n* Search AID in list.");
@@ -849,42 +849,42 @@ int CmdEMVExec(const char *cmd) {
 		TLVPrintAIDlistFromSelectTLV(tlvSelect);
 		EMVSelectApplication(tlvSelect, AID, &AIDlen);
 	}
-	
+
 	// Init TLV tree
 	const char *alr = "Root terminal TLV tree";
 	tlvRoot = tlvdb_fixed(1, strlen(alr), (const unsigned char *)alr);
-	
+
 	// check if we found EMV application on card
 	if (!AIDlen) {
 		PrintAndLogEx(WARNING, "Can't select AID. EMV AID not found");
 		dreturn(2);
 	}
-	
+
 	// Select
 	PrintAndLogEx(NORMAL, "\n* Selecting AID:%s", sprint_hex_inrow(AID, AIDlen));
 	SetAPDULogging(showAPDU);
 	res = EMVSelect(channel, false, true, AID, AIDlen, buf, sizeof(buf), &len, &sw, tlvRoot);
-	
-	if (res) {	
+
+	if (res) {
 		PrintAndLogEx(WARNING, "Can't select AID (%d). Exit...", res);
 		dreturn(3);
 	}
-	
+
 	if (decodeTLV)
 		TLVPrintFromBuffer(buf, len);
 	PrintAndLog("* Selected.");
-	
+
 	PrintAndLog("\n* Init transaction parameters.");
 	InitTransactionParameters(tlvRoot, paramLoadJSON, TrType, GenACGPO);
 	TLVPrintFromTLV(tlvRoot); // TODO delete!!!
-	
+
 	PrintAndLogEx(NORMAL, "\n* Calc PDOL.");
 	pdol_data_tlv = dol_process(tlvdb_get(tlvRoot, 0x9f38, NULL), tlvRoot, 0x83);
 	if (!pdol_data_tlv){
 		PrintAndLogEx(WARNING, "Error: can't create PDOL TLV.");
 		dreturn(4);
 	}
-	
+
 	size_t pdol_data_tlv_data_len;
 	unsigned char *pdol_data_tlv_data = tlv_encode(pdol_data_tlv, &pdol_data_tlv_data_len);
 	if (!pdol_data_tlv_data) {
@@ -895,40 +895,40 @@ int CmdEMVExec(const char *cmd) {
 
 	PrintAndLogEx(NORMAL, "\n* GPO.");
 	res = EMVGPO(channel, true, pdol_data_tlv_data, pdol_data_tlv_data_len, buf, sizeof(buf), &len, &sw, tlvRoot);
-	
+
 	free(pdol_data_tlv_data);
 	//free(pdol_data_tlv); --- free on exit.
-	
-	if (res) {	
+
+	if (res) {
 		PrintAndLogEx(NORMAL, "GPO error(%d): %4x. Exit...", res, sw);
 		dreturn(5);
 	}
 
 	// process response template format 1 [id:80  2b AIP + x4b AFL] and format 2 [id:77 TLV]
 	ProcessGPOResponseFormat1(tlvRoot, buf, len, decodeTLV);
-	
+
 	// extract PAN from track2
 	{
 		const struct tlv *track2 = tlvdb_get(tlvRoot, 0x57, NULL);
 		if (!tlvdb_get(tlvRoot, 0x5a, NULL) && track2 && track2->len >= 8) {
 			struct tlvdb *pan = GetPANFromTrack2(track2);
 			if (pan) {
-				tlvdb_add(tlvRoot, pan); 
-				
-				const struct tlv *pantlv = tlvdb_get(tlvRoot, 0x5a, NULL);	
+				tlvdb_add(tlvRoot, pan);
+
+				const struct tlv *pantlv = tlvdb_get(tlvRoot, 0x5a, NULL);
 				PrintAndLogEx(NORMAL, "\n* * Extracted PAN from track2: %s", sprint_hex(pantlv->value, pantlv->len));
 			} else {
 				PrintAndLogEx(NORMAL, "\n* * WARNING: Can't extract PAN from track2.");
 			}
 		}
 	}
-	
+
 	PrintAndLogEx(NORMAL, "\n* Read records from AFL.");
 	const struct tlv *AFL = tlvdb_get(tlvRoot, 0x94, NULL);
 
 	if (!AFL || !AFL->len)
 		PrintAndLogEx(NORMAL, "WARNING: AFL not found.");
-	
+
 	while (AFL && AFL->len) {
 		if (AFL->len % 4) {
 			PrintAndLogEx(WARNING, "Error: Wrong AFL length: %d", AFL->len);
@@ -940,27 +940,27 @@ int CmdEMVExec(const char *cmd) {
 			uint8_t SFIstart = AFL->value[i * 4 + 1];
 			uint8_t SFIend = AFL->value[i * 4 + 2];
 			uint8_t SFIoffline = AFL->value[i * 4 + 3];
-			
+
 			PrintAndLogEx(NORMAL, "* * SFI[%02x] start:%02x end:%02x offline count:%02x", SFI, SFIstart, SFIend, SFIoffline);
 			if (SFI == 0 || SFI == 31 || SFIstart == 0 || SFIstart > SFIend) {
 				PrintAndLogEx(NORMAL, "SFI ERROR! Skipped...");
 				continue;
 			}
-			
+
 			for (int n = SFIstart; n <= SFIend; n++) {
 				PrintAndLogEx(NORMAL, "* * * SFI[%02x] %d", SFI, n);
-				
+
 				res = EMVReadRecord(channel, true, SFI, n, buf, sizeof(buf), &len, &sw, tlvRoot);
 				if (res) {
 					PrintAndLogEx(WARNING, "Error SFI[%02x]. APDU error %4x", SFI, sw);
 					continue;
 				}
-				
+
 				if (decodeTLV) {
 					TLVPrintFromBuffer(buf, len);
 					PrintAndLogEx(NORMAL, "");
 				}
-				
+
 				// Build Input list for Offline Data Authentication
 				// EMV 4.3 book3 10.3, page 96
 				if (SFIoffline > 0) {
@@ -978,25 +978,25 @@ int CmdEMVExec(const char *cmd) {
 						memcpy(&ODAiList[ODAiListLen], buf, len);
 						ODAiListLen += len;
 					}
-					
+
 					SFIoffline--;
 				}
 			}
 		}
-		
+
 		break;
-	}	
-	
+	}
+
 	// copy Input list for Offline Data Authentication
 	if (ODAiListLen) {
 		struct tlvdb *oda = tlvdb_fixed(0x21, ODAiListLen, ODAiList); // not a standard tag
-		tlvdb_add(tlvRoot, oda); 
+		tlvdb_add(tlvRoot, oda);
 		PrintAndLogEx(NORMAL, "* Input list for Offline Data Authentication added to TLV. len=%d \n", ODAiListLen);
 	}
 
 	// get AIP
 	uint16_t AIP = 0;
-	const struct tlv *AIPtlv = tlvdb_get(tlvRoot, 0x82, NULL);	
+	const struct tlv *AIPtlv = tlvdb_get(tlvRoot, 0x82, NULL);
 	if (AIPtlv) {
 		AIP = AIPtlv->value[0] + AIPtlv->value[1] * 0x100;
 		PrintAndLogEx(NORMAL, "* * AIP=%04x", AIP);
@@ -1012,10 +1012,10 @@ int CmdEMVExec(const char *cmd) {
 
 	// DDA
 	if (AIP & 0x0020) {
-		PrintAndLogEx(NORMAL, "\n* DDA");		
+		PrintAndLogEx(NORMAL, "\n* DDA");
 		trDDA(channel, decodeTLV, tlvRoot);
-	}	
-	
+	}
+
 	// transaction check
 
 	// qVSDC
@@ -1025,11 +1025,11 @@ int CmdEMVExec(const char *cmd) {
 		if (AC) {
 			PrintAndLogEx(NORMAL, "\n--> qVSDC transaction.");
 			PrintAndLogEx(NORMAL, "* AC path");
-			
+
 			// 9F36: Application Transaction Counter (ATC)
 			const struct tlv *ATC = tlvdb_get(tlvRoot, 0x9F36, NULL);
 			if (ATC) {
-			
+
 				// 9F10: Issuer Application Data - optional
 				const struct tlv *IAD = tlvdb_get(tlvRoot, 0x9F10, NULL);
 
@@ -1038,7 +1038,7 @@ int CmdEMVExec(const char *cmd) {
 				PrintAndLogEx(NORMAL, "AC: %s", sprint_hex(AC->value, AC->len));
 				if (IAD) {
 					PrintAndLogEx(NORMAL, "IAD: %s", sprint_hex(IAD->value, IAD->len));
-					
+
 					if (IAD->len >= IAD->value[0] + 1) {
 						PrintAndLogEx(NORMAL, "\tKey index:  0x%02x", IAD->value[1]);
 						PrintAndLogEx(NORMAL, "\tCrypto ver: 0x%02x(%03d)", IAD->value[2], IAD->value[2]);
@@ -1049,13 +1049,13 @@ int CmdEMVExec(const char *cmd) {
 				} else {
 					PrintAndLogEx(NORMAL, "WARNING: IAD not found.");
 				}
-				
+
 			} else {
 				PrintAndLogEx(WARNING, "Error AC: Application Transaction Counter (ATC) not found.");
 			}
 		}
 	}
-	
+
 	// Mastercard M/CHIP
 	if (GetCardPSVendor(AID, AIDlen) == CV_MASTERCARD && (TrType == TT_QVSDCMCHIP || TrType == TT_CDA)){
 		const struct tlv *CDOL1 = tlvdb_get(tlvRoot, 0x8c, NULL);
@@ -1072,7 +1072,7 @@ int CmdEMVExec(const char *cmd) {
 				PrintAndLogEx(WARNING, "Error GetChallenge. Wrong challenge length %d", len);
 				dreturn(6);
 			}
-			
+
 			// ICC Dynamic Number
 			struct tlvdb * ICCDynN = tlvdb_fixed(0x9f4c, len, buf);
 			tlvdb_add(tlvRoot, ICCDynN);
@@ -1080,39 +1080,39 @@ int CmdEMVExec(const char *cmd) {
 				PrintAndLogEx(NORMAL, "\n* * ICC Dynamic Number:");
 				TLVPrintFromTLV(ICCDynN);
 			}
-			
+
 			PrintAndLogEx(NORMAL, "* * Calc CDOL1");
 			struct tlv *cdol_data_tlv = dol_process(tlvdb_get(tlvRoot, 0x8c, NULL), tlvRoot, 0x01); // 0x01 - dummy tag
 			if (!cdol_data_tlv) {
 				PrintAndLogEx(WARNING, "Error: can't create CDOL1 TLV.");
 				dreturn(6);
 			}
-			
+
 			PrintAndLogEx(NORMAL, "CDOL1 data[%d]: %s", cdol_data_tlv->len, sprint_hex(cdol_data_tlv->value, cdol_data_tlv->len));
-			
+
 			PrintAndLogEx(NORMAL, "* * AC1");
 			// EMVAC_TC + EMVAC_CDAREQ --- to get SDAD
 			res = EMVAC(channel, true, (TrType == TT_CDA) ? EMVAC_TC + EMVAC_CDAREQ : EMVAC_TC, (uint8_t *)cdol_data_tlv->value, cdol_data_tlv->len, buf, sizeof(buf), &len, &sw, tlvRoot);
-			
-			if (res) {	
+
+			if (res) {
 				PrintAndLogEx(NORMAL, "AC1 error(%d): %4x. Exit...", res, sw);
 				dreturn(7);
 			}
-			
+
 			if (decodeTLV)
 				TLVPrintFromBuffer(buf, len);
-			
+
 			// CDA
 			PrintAndLogEx(NORMAL, "\n* CDA:");
 			struct tlvdb *ac_tlv = tlvdb_parse_multi(buf, len);
 			res = trCDA(tlvRoot, ac_tlv, pdol_data_tlv, cdol_data_tlv);
-			if (res) {	
+			if (res) {
 				PrintAndLogEx(NORMAL, "CDA error (%d)", res);
 			}
-			
+
 			free(ac_tlv);
 			free(cdol_data_tlv);
-			
+
 			PrintAndLogEx(NORMAL, "\n* M/Chip transaction result:");
 			// 9F27: Cryptogram Information Data (CID)
 			const struct tlv *CID = tlvdb_get(tlvRoot, 0x9F27, NULL);
@@ -1140,14 +1140,14 @@ int CmdEMVExec(const char *cmd) {
 			} else {
 				PrintAndLogEx(WARNING, "Error: CID(9F27) not found.");
 			}
-		
+
 		}
 	}
-		
+
 	// MSD
-	if (AIP & 0x8000 && TrType == TT_MSD) { 
+	if (AIP & 0x8000 && TrType == TT_MSD) {
 		PrintAndLogEx(NORMAL, "\n--> MSD transaction.");
-		
+
 		PrintAndLogEx(NORMAL, "* MSD dCVV path. Check dCVV");
 
 		const struct tlv *track2 = tlvdb_get(tlvRoot, 0x57, NULL);
@@ -1157,7 +1157,7 @@ int CmdEMVExec(const char *cmd) {
 			struct tlvdb *dCVV = GetdCVVRawFromTrack2(track2);
 			PrintAndLogEx(NORMAL, "dCVV raw data:");
 			TLVPrintFromTLV(dCVV);
-			
+
 			if (GetCardPSVendor(AID, AIDlen) == CV_MASTERCARD) {
 				PrintAndLogEx(NORMAL, "\n* Mastercard calculate UDOL");
 
@@ -1179,16 +1179,16 @@ int CmdEMVExec(const char *cmd) {
 				}
 
 				PrintAndLogEx(NORMAL, "UDOL data[%d]: %s", udol_data_tlv->len, sprint_hex(udol_data_tlv->value, udol_data_tlv->len));
-				
+
 				PrintAndLogEx(NORMAL, "\n* Mastercard compute cryptographic checksum(UDOL)");
-				
+
 				res = MSCComputeCryptoChecksum(channel, true, (uint8_t *)udol_data_tlv->value, udol_data_tlv->len, buf, sizeof(buf), &len, &sw, tlvRoot);
 				if (res) {
 					PrintAndLogEx(WARNING, "Error Compute Crypto Checksum. APDU error %4x", sw);
 					free(udol_data_tlv);
 					dreturn(9);
 				}
-				
+
 				// Mastercard compute cryptographic checksum result
 				TLVPrintFromBuffer(buf, len);
 				PrintAndLogEx(NORMAL, "");
@@ -1204,21 +1204,21 @@ int CmdEMVExec(const char *cmd) {
 	// VSDC
 	if (GetCardPSVendor(AID, AIDlen) == CV_VISA && (TrType == TT_VSDC || TrType == TT_CDA)){
 		PrintAndLogEx(NORMAL, "\n--> VSDC transaction.");
-		
+
 		PrintAndLogEx(NORMAL, "* * Calc CDOL1");
 		struct tlv *cdol1_data_tlv = dol_process(tlvdb_get(tlvRoot, 0x8c, NULL), tlvRoot, 0x01); // 0x01 - dummy tag
 		if (!cdol1_data_tlv) {
 			PrintAndLogEx(WARNING, "Error: can't create CDOL1 TLV.");
 			dreturn(6);
 		}
-		
+
 		PrintAndLogEx(NORMAL, "CDOL1 data[%d]: %s", cdol1_data_tlv->len, sprint_hex(cdol1_data_tlv->value, cdol1_data_tlv->len));
-		
+
 		PrintAndLogEx(NORMAL, "* * AC1");
 		// EMVAC_TC + EMVAC_CDAREQ --- to get SDAD
 		res = EMVAC(channel, true, (TrType == TT_CDA) ? EMVAC_TC + EMVAC_CDAREQ : EMVAC_TC, (uint8_t *)cdol1_data_tlv->value, cdol1_data_tlv->len, buf, sizeof(buf), &len, &sw, tlvRoot);
-		
-		if (res) {	
+
+		if (res) {
 			PrintAndLogEx(NORMAL, "AC1 error(%d): %4x. Exit...", res, sw);
 			free(cdol1_data_tlv);
 			dreturn(7);
@@ -1246,10 +1246,10 @@ int CmdEMVExec(const char *cmd) {
 			uint8_t IDDlen = 0;             // Issuer discretionary data length
 			PrintAndLogEx(NORMAL, "IAD length: %d", IAD->len);
 			PrintAndLogEx(NORMAL, "VDDlen: %d", VDDlen);
-			if (VDDlen < IAD->len - 1) 
+			if (VDDlen < IAD->len - 1)
 				IDDlen = IAD->value[VDDlen + 1];
 			PrintAndLogEx(NORMAL, "IDDlen: %d", IDDlen);
-						
+
 			uint8_t DerivKeyIndex = IAD->value[1];
 			CryptoVersion = IAD->value[2];
 
@@ -1267,22 +1267,22 @@ int CmdEMVExec(const char *cmd) {
 				}
 			}
 			if (IDDlen)
-				PrintAndLogEx(NORMAL, "IDD: %s", sprint_hex(&IAD->value[VDDlen + 1], IDDlen));		
+				PrintAndLogEx(NORMAL, "IDD: %s", sprint_hex(&IAD->value[VDDlen + 1], IDDlen));
 		} else {
 			PrintAndLogEx(NORMAL, "Issuer Application Data (IAD) not found.");
 		}
-		
+
 		PrintAndLogEx(NORMAL, "\n* * Processing online request");
 
 		// authorization response code from acquirer
 		const char HostResponse[] = "00"; // 0x3030
 		size_t HostResponseLen = sizeof(HostResponse) - 1;
 		PrintAndLogEx(NORMAL, "Host Response: `%s`", HostResponse);
-		tlvdb_change_or_add_node(tlvRoot, 0x8a, HostResponseLen, (const unsigned char *)HostResponse);		
-		
+		tlvdb_change_or_add_node(tlvRoot, 0x8a, HostResponseLen, (const unsigned char *)HostResponse);
+
 		if (CryptoVersion == 10) {
 			PrintAndLogEx(NORMAL, "\n* * Generate ARPC");
-			
+
 			// Application Cryptogram (AC)
 			const struct tlv *AC = tlvdb_get(tlvRoot, 0x9f26, NULL);
 			if (AC && (AC->len > 0)) {
@@ -1294,18 +1294,18 @@ int CmdEMVExec(const char *cmd) {
 				for (int i = 0; (i < HostResponseLen) && (i < rawARPClen); i++)
 					rawARPC[i] ^= HostResponse[i];
 				PrintAndLogEx(NORMAL, "raw ARPC: %s", sprint_hex(rawARPC, rawARPClen));
-				
+
 				// here must be calculation of ARPC, but we dont know a bank keys.
 				PrintAndLogEx(NORMAL, "ARPC: n/a");
-				
+
 			} else {
 				PrintAndLogEx(NORMAL, "Application Cryptogram (AC) not found.");
 			}
 
 			// here must be external authenticate, but we dont know ARPC
-			
+
 		}
-		
+
 
 		// needs to send AC2 command (res == ARQC)
 		if ((CID & EMVAC_AC_MASK) == EMVAC_ARQC) {
@@ -1315,14 +1315,14 @@ int CmdEMVExec(const char *cmd) {
 				PrintAndLogEx(WARNING, "Error: can't create CDOL2 TLV.");
 				dreturn(6);
 			}
-			
+
 			PrintAndLogEx(NORMAL, "CDOL2 data[%d]: %s", cdol2_data_tlv->len, sprint_hex(cdol2_data_tlv->value, cdol2_data_tlv->len));
-			
+
 			//PrintAndLogEx(NORMAL, "* * AC2");
-			
-			
+
+
 			// here must be AC2, but we dont make external authenticate (
-		
+
 /*			// AC2
 			PRINT_INDENT(level);
 			if ((CID & EMVAC_AC2_MASK) == EMVAC_AAC2)	fprintf(f, "\tAC2: AAC (Transaction declined)\n");
@@ -1331,11 +1331,11 @@ int CmdEMVExec(const char *cmd) {
 			if ((CID & EMVAC_AC2_MASK) == EMVAC_AC2_MASK)	fprintf(f, "\tAC2: RFU\n");
 */
 		}
-		
+
 	}
-	
+
 	DropFieldEx( channel );
-	
+
 	// Destroy TLV's
 	free(pdol_data_tlv);
 	tlvdb_free(tlvSelect);
@@ -1355,8 +1355,8 @@ int CmdEMVScan(const char *cmd) {
 	json_t *root;
 	json_error_t error;
 
-	CLIParserInit("emv scan", 
-		"Scan EMV card and save it contents to a file.", 
+	CLIParserInit("emv scan",
+		"Scan EMV card and save it contents to a file.",
 		"It executes EMV contactless transaction and saves result to a file which can be used for emulation\n"
 			"Usage:\n\temv scan -at -> scan MSD transaction mode and show APDU and TLV\n"
 			"\temv scan -c -> scan CDA transaction mode\n");
@@ -1378,7 +1378,7 @@ int CmdEMVScan(const char *cmd) {
 		arg_param_end
 	};
 	CLIExecWithReturn(cmd, argtable, true);
-	
+
 	bool showAPDU = arg_get_lit(1);
 	bool decodeTLV = arg_get_lit(2);
 	bool extractTLVElements = arg_get_lit(3);
@@ -1404,17 +1404,17 @@ int CmdEMVScan(const char *cmd) {
 	int relfnamelen = 0;
 	CLIGetStrWithReturn(12, relfname, &relfnamelen);
 	CLIParserFree();
-	
+
 #ifndef WITH_SMARTCARD
 	// not compiled with smartcard functionality,  we need to exit
 	if ( channel == ECC_CONTACT ) {
 		PrintAndLogEx(WARNING, "PM3 Client is not compiled with support for SMARTCARD. Exiting.");
 		return 0;
 	}
-#endif	
+#endif
 
 	SetAPDULogging(showAPDU);
-	
+
 	// current path + file name
 	if (!strstr(crelfname, ".json"))
 		strcat(crelfname, ".json");
@@ -1426,12 +1426,12 @@ int CmdEMVScan(const char *cmd) {
 		root = json_load_file(fname, 0, &error);
 		if (!root) {
 			PrintAndLogEx(ERR, "Json error on line %d: %s", error.line, error.text);
-			return 1; 
+			return 1;
 		}
-		
+
 		if (!json_is_object(root)) {
 			PrintAndLogEx(ERR, "Invalid json format. root must be an object.");
-			return 1; 
+			return 1;
 		}
 	} else {
 		root = json_object();
@@ -1441,16 +1441,16 @@ int CmdEMVScan(const char *cmd) {
 	DropFieldEx( channel );
 
 	JsonSaveStr(root, "$.File.Created", "proxmark3 `emv scan`");
-	
+
 	if (channel == ECC_CONTACTLESS) {
 		// iso 14443 select
 		PrintAndLogEx(NORMAL, "--> GET UID, ATS.");
-		
+
 		iso14a_card_select_t card;
 		if (Hf14443_4aGetCardData(&card)) {
 			return 2;
 		}
-		
+
 		JsonSaveStr(root, "$.Card.Contactless.Communication", "iso14443-4a");
 		JsonSaveBufAsHex(root, "$.Card.Contactless.UID", (uint8_t *)&card.uid, card.uidlen);
 		JsonSaveHex(root, "$.Card.Contactless.ATQA", card.atqa[0] + (card.atqa[1] << 2), 2);
@@ -1458,22 +1458,22 @@ int CmdEMVScan(const char *cmd) {
 		JsonSaveBufAsHex(root, "$.Card.Contactless.ATS", (uint8_t *)card.ats, card.ats_len);
 	} else {
 		PrintAndLogEx(NORMAL, "--> GET ATR.");
-		
+
 		smart_card_atr_t card;
 		smart_select(true, &card);
 		if (!card.atr_len) {
 			PrintAndLogEx(ERR, "Can't get ATR from a smart card.");
 			return 1;
 		}
-		
+
 		JsonSaveStr(root, "$.Card.Contact.Communication", "iso7816");
 		JsonSaveBufAsHex(root, "$.Card.Contact.ATR", (uint8_t *)card.atr, card.atr_len);
 	}
-	
+
 	// init applets list tree
 	const char *al = "Applets list";
 	struct tlvdb *tlvSelect = tlvdb_fixed(1, strlen(al), (const unsigned char *)al);
-	
+
 	// EMV PPSE
 	PrintAndLogEx(NORMAL, "--> PPSE.");
 	res = EMVSelectPSE(channel, true, true, 2, buf, sizeof(buf), &len, &sw);
@@ -1481,9 +1481,9 @@ int CmdEMVScan(const char *cmd) {
 	if (!res && sw == 0x9000){
 		if (decodeTLV)
 			TLVPrintFromBuffer(buf, len);
-		
+
 		JsonSaveBufAsHex(root, "$.PPSE.AID", (uint8_t *)"2PAY.SYS.DDF01", 14);
-		
+
 		struct tlvdb *fci = tlvdb_parse_multi(buf, len);
 		if (extractTLVElements)
 			JsonSaveTLVTree(root, root, "$.PPSE.FCITemplate", fci);
@@ -1496,8 +1496,8 @@ int CmdEMVScan(const char *cmd) {
 	res = EMVSearchPSE(channel, false, true, psenum, decodeTLV, tlvSelect);
 
 	// check PPSE and select application id
-	if (!res) {	
-		TLVPrintAIDlistFromSelectTLV(tlvSelect);		
+	if (!res) {
+		TLVPrintAIDlistFromSelectTLV(tlvSelect);
 	} else {
 		// EMV SEARCH with AID list
 		SetAPDULogging(false);
@@ -1526,7 +1526,7 @@ int CmdEMVScan(const char *cmd) {
 	}
 
 	JsonSaveBufAsHex(root, "$.Application.AID", AID, AIDlen);
-	
+
 	// Init TLV tree
 	const char *alr = "Root terminal TLV tree";
 	struct tlvdb *tlvRoot = tlvdb_fixed(1, strlen(alr), (const unsigned char *)alr);
@@ -1536,14 +1536,14 @@ int CmdEMVScan(const char *cmd) {
 	PrintAndLogEx(NORMAL, "\n-->Selecting AID:%s.", sprint_hex_inrow(AID, AIDlen));
 	SetAPDULogging(showAPDU);
 	res = EMVSelect(channel, false, true, AID, AIDlen, buf, sizeof(buf), &len, &sw, tlvRoot);
-	
-	if (res) {	
+
+	if (res) {
 		PrintAndLogEx(ERR, "Can't select AID (%d). Exit...", res);
 		tlvdb_free(tlvRoot);
 		DropFieldEx( channel );
 		return 5;
 	}
-	
+
 	if (decodeTLV)
 		TLVPrintFromBuffer(buf, len);
 
@@ -1562,7 +1562,7 @@ int CmdEMVScan(const char *cmd) {
 	// create transaction parameters
 	PrintAndLogEx(NORMAL, "-->Init transaction parameters.");
 	InitTransactionParameters(tlvRoot, paramLoadJSON, TrType, GenACGPO);
-	
+
 	PrintAndLogEx(NORMAL, "-->Calc PDOL.");
 	struct tlv *pdol_data_tlv = dol_process(tlvdb_get(tlvRoot, 0x9f38, NULL), tlvRoot, 0x83);
 	if (!pdol_data_tlv){
@@ -1571,7 +1571,7 @@ int CmdEMVScan(const char *cmd) {
 		DropFieldEx( channel );
 		return 6;
 	}
-	
+
 	size_t pdol_data_tlv_data_len;
 	unsigned char *pdol_data_tlv_data = tlv_encode(pdol_data_tlv, &pdol_data_tlv_data_len);
 	if (!pdol_data_tlv_data) {
@@ -1584,18 +1584,18 @@ int CmdEMVScan(const char *cmd) {
 
 	PrintAndLogEx(INFO, "-->GPO.");
 	res = EMVGPO(channel, true, pdol_data_tlv_data, pdol_data_tlv_data_len, buf, sizeof(buf), &len, &sw, tlvRoot);
-	
+
 	free(pdol_data_tlv_data);
 	free(pdol_data_tlv);
-	
-	if (res) {	
+
+	if (res) {
 		PrintAndLogEx(ERR, "GPO error(%d): %4x. Exit...", res, sw);
 		tlvdb_free(tlvRoot);
 		DropFieldEx( channel );
 		return 7;
 	}
 	ProcessGPOResponseFormat1(tlvRoot, buf, len, decodeTLV);
-	
+
 	struct tlvdb *gpofci = tlvdb_parse_multi(buf, len);
 	if (extractTLVElements)
 		JsonSaveTLVTree(root, root, "$.Application.GPO", gpofci);
@@ -1609,7 +1609,7 @@ int CmdEMVScan(const char *cmd) {
 
 	PrintAndLogEx(INFO, "-->Read records from AFL.");
 	const struct tlv *AFL = tlvdb_get(tlvRoot, 0x94, NULL);
-	
+
 	while(AFL && AFL->len) {
 		if (AFL->len % 4) {
 			PrintAndLogEx(ERR, "Wrong AFL length: %d", AFL->len);
@@ -1620,7 +1620,7 @@ int CmdEMVScan(const char *cmd) {
 		if (!sfijson) {
 			json_t *app = json_path_get(root, "$.Application");
 			json_object_set_new(app, "Records", json_array());
-			
+
 			sfijson = json_path_get(root, "$.Application.Records");
 		}
 		if (!json_is_array(sfijson)) {
@@ -1632,34 +1632,34 @@ int CmdEMVScan(const char *cmd) {
 			uint8_t SFIstart = AFL->value[i * 4 + 1];
 			uint8_t SFIend = AFL->value[i * 4 + 2];
 			uint8_t SFIoffline = AFL->value[i * 4 + 3];
-			
+
 			PrintAndLogEx(INFO, "--->SFI[%02x] start:%02x end:%02x offline:%02x", SFI, SFIstart, SFIend, SFIoffline);
 			if (SFI == 0 || SFI == 31 || SFIstart == 0 || SFIstart > SFIend) {
 				PrintAndLogEx(ERR, "SFI ERROR! Skipped...");
 				continue;
 			}
-			
+
 			for(int n = SFIstart; n <= SFIend; n++) {
 				PrintAndLogEx(INFO, "---->SFI[%02x] %d", SFI, n);
-				
+
 				res = EMVReadRecord(channel, true, SFI, n, buf, sizeof(buf), &len, &sw, tlvRoot);
 				if (res) {
 					PrintAndLogEx(ERR, "SFI[%02x]. APDU error %4x", SFI, sw);
 					continue;
 				}
-				
+
 				if (decodeTLV) {
 					TLVPrintFromBuffer(buf, len);
 					PrintAndLog("");
 				}
-				
+
 				json_t *jsonelm = json_object();
 				json_array_append_new(sfijson, jsonelm);
 
 				JsonSaveHex(jsonelm, "SFI", SFI, 1);
 				JsonSaveHex(jsonelm, "RecordNum", n, 1);
 				JsonSaveHex(jsonelm, "Offline", SFIoffline, 1);
-				
+
 				struct tlvdb *rsfi = tlvdb_parse_multi(buf, len);
 				if (extractTLVElements)
 					JsonSaveTLVTree(root, jsonelm, "$.Data", rsfi);
@@ -1668,10 +1668,10 @@ int CmdEMVScan(const char *cmd) {
 				tlvdb_free(rsfi);
 			}
 		}
-		
+
 		break;
 	}
-	
+
 	// getting certificates
 	if (tlvdb_get(tlvRoot, 0x90, NULL)) {
 		PrintAndLogEx(INFO, "-->Recovering certificates.");
@@ -1679,22 +1679,22 @@ int CmdEMVScan(const char *cmd) {
 		RecoveryCertificates(tlvRoot, root);
 		PKISetStrictExecution(true);
 	}
-	
+
 	// free tlv object
 	tlvdb_free(tlvRoot);
 
 	DropFieldEx( channel );
-	
+
 	res = json_dump_file(root, fname, JSON_INDENT(2));
 	if (res) {
 		PrintAndLogEx(ERR, "Can't save the file: %s", fname);
 		return 200;
 	}
 	PrintAndLogEx(SUCCESS, "File `%s` saved.", fname);
-	
+
 	// free json object
 	json_decref(root);
-	
+
 	return 0;
 }
 
@@ -1713,9 +1713,9 @@ int CmdEMVRoca(const char *cmd) {
 	size_t len = 0;
 	uint16_t sw = 0;
 	int res;
-		
-	CLIParserInit("emv roca", 
-		"Tries to extract public keys and run the ROCA test against them.\n", 
+
+	CLIParserInit("emv roca",
+		"Tries to extract public keys and run the ROCA test against them.\n",
 		"Usage:\n"
 			"\temv roca -w -> select --CONTACT-- card and run test\n"
 			"\temv roca -> select --CONTACTLESS-- card and run test\n"
@@ -1728,7 +1728,7 @@ int CmdEMVRoca(const char *cmd) {
 		arg_param_end
 	};
 	CLIExecWithReturn(cmd, argtable, true);
-	
+
 	EMVCommandChannel channel = ECC_CONTACTLESS;
 	if (arg_get_lit(1))
 		return roca_self_test();
@@ -1737,20 +1737,20 @@ int CmdEMVRoca(const char *cmd) {
 		channel = ECC_CONTACT;
 	PrintChannel(channel);
 	CLIParserFree();
-	
+
 #ifndef WITH_SMARTCARD
 	// not compiled with smartcard functionality,  we need to exit
 	if ( channel == ECC_CONTACT ) {
 		PrintAndLogEx(WARNING, "PM3 Client is not compiled with support for SMARTCARD. Exiting.");
 		return 0;
 	}
-#endif	
+#endif
 
 	// select card
 	uint8_t psenum = (channel == ECC_CONTACT) ? 1 : 2;
-	
+
 	SetAPDULogging(false);
-	
+
 	// init applets list tree
 	const char *al = "Applets list";
 	struct tlvdb *tlvSelect = tlvdb_fixed(1, strlen(al), (const unsigned char *)al);
@@ -1760,8 +1760,8 @@ int CmdEMVRoca(const char *cmd) {
 	res = EMVSearchPSE(channel, false, true, psenum, false, tlvSelect);
 
 	// check PPSE and select application id
-	if (!res) {	
-		TLVPrintAIDlistFromSelectTLV(tlvSelect);		
+	if (!res) {
+		TLVPrintAIDlistFromSelectTLV(tlvSelect);
 	} else {
 		// EMV SEARCH with AID list
 		PrintAndLogEx(NORMAL, "--> AID search.");
@@ -1795,8 +1795,8 @@ int CmdEMVRoca(const char *cmd) {
 	// EMV SELECT applet
 	PrintAndLogEx(NORMAL, "\n-->Selecting AID:%s.", sprint_hex_inrow(AID, AIDlen));
 	res = EMVSelect(channel, false, true, AID, AIDlen, buf, sizeof(buf), &len, &sw, tlvRoot);
-	
-	if (res) {	
+
+	if (res) {
 		PrintAndLogEx(ERR, "Can't select AID (%d). Exit...", res);
 		tlvdb_free(tlvRoot);
 		DropFieldEx( channel );
@@ -1814,7 +1814,7 @@ int CmdEMVRoca(const char *cmd) {
 		DropFieldEx( channel );
 		return 6;
 	}
-	
+
 	size_t pdol_data_tlv_data_len;
 	unsigned char *pdol_data_tlv_data = tlv_encode(pdol_data_tlv, &pdol_data_tlv_data_len);
 	if (!pdol_data_tlv_data) {
@@ -1828,21 +1828,21 @@ int CmdEMVRoca(const char *cmd) {
 
 	PrintAndLogEx(INFO, "-->GPO.");
 	res = EMVGPO(channel, true, pdol_data_tlv_data, pdol_data_tlv_data_len, buf, sizeof(buf), &len, &sw, tlvRoot);
-	
+
 	free(pdol_data_tlv_data);
 	free(pdol_data_tlv);
-	
-	if (res) {	
+
+	if (res) {
 		PrintAndLogEx(ERR, "GPO error(%d): %4x. Exit...", res, sw);
 		tlvdb_free(tlvRoot);
 		DropFieldEx( channel );
 		return 7;
 	}
 	ProcessGPOResponseFormat1(tlvRoot, buf, len, false);
-	
+
 	PrintAndLogEx(INFO, "-->Read records from AFL.");
 	const struct tlv *AFL = tlvdb_get(tlvRoot, 0x94, NULL);
-	
+
 	while(AFL && AFL->len) {
 		if (AFL->len % 4) {
 			PrintAndLogEx(ERR, "Wrong AFL length: %d", AFL->len);
@@ -1854,16 +1854,16 @@ int CmdEMVRoca(const char *cmd) {
 			uint8_t SFIstart = AFL->value[i * 4 + 1];
 			uint8_t SFIend = AFL->value[i * 4 + 2];
 			uint8_t SFIoffline = AFL->value[i * 4 + 3];
-			
+
 			PrintAndLogEx(INFO, "--->SFI[%02x] start:%02x end:%02x offline:%02x", SFI, SFIstart, SFIend, SFIoffline);
 			if (SFI == 0 || SFI == 31 || SFIstart == 0 || SFIstart > SFIend) {
 				PrintAndLogEx(ERR, "SFI ERROR! Skipped...");
 				continue;
 			}
-			
+
 			for(int n = SFIstart; n <= SFIend; n++) {
 				PrintAndLogEx(INFO, "---->SFI[%02x] %d", SFI, n);
-				
+
 				res = EMVReadRecord(channel, true, SFI, n, buf, sizeof(buf), &len, &sw, tlvRoot);
 				if (res) {
 					PrintAndLogEx(ERR, "SFI[%02x]. APDU error %4x", SFI, sw);
@@ -1871,7 +1871,7 @@ int CmdEMVRoca(const char *cmd) {
 				}
 			}
 		}
-		
+
 		break;
 	}
 
@@ -1892,7 +1892,7 @@ int CmdEMVRoca(const char *cmd) {
 			PrintAndLogEx(WARNING, "WARNING: Issuer certificate not found. Exit.");
 			goto out;
 		}
-	
+
 		PrintAndLogEx(SUCCESS, "Issuer PK recovered. RID %s IDX %02hhx CSN %s",
 				sprint_hex(issuer_pk->rid, 5),
 				issuer_pk->index,
@@ -1912,9 +1912,9 @@ int CmdEMVRoca(const char *cmd) {
 				icc_pk->index,
 				sprint_hex(icc_pk->serial, 3)
 				);
-		
+
 		PrintAndLogEx(INFO, "ICC pk modulus: %s", sprint_hex_inrow(icc_pk->modulus, icc_pk->mlen));
-		
+
 		//	icc_pk->exp, icc_pk->elen
 		//	icc_pk->modulus, icc_pk->mlen
 		if (icc_pk->elen > 0 && icc_pk->mlen > 0) {
@@ -1923,13 +1923,13 @@ int CmdEMVRoca(const char *cmd) {
 			} else {
 				PrintAndLogEx(INFO, "ICC pk is OK(");
 			}
-		}		
-		
+		}
+
 		PKISetStrictExecution(true);
 	}
 
 out:
-	
+
 	// free tlv object
 	tlvdb_free(tlvRoot);
 
@@ -1951,14 +1951,14 @@ static command_t CommandTable[] =  {
 	{"scan",		CmdEMVScan,						0,	"Scan EMV card and save it contents to json file for emulator."},
 	{"test",		CmdEMVTest,						0,	"Crypto logic test."},
 	/*
-	{"getrng",		CmdEMVGetrng,	  				0, "get random number from terminal"}, 
+	{"getrng",		CmdEMVGetrng,	  				0, "get random number from terminal"},
 	{"eload",		CmdEmvELoad, 	  				0, "load EMV tag into device"},
 	{"dump",		CmdEmvDump,	  					0, "dump EMV tag values"},
 	{"sim",			CmdEmvSim,	  					0, "simulate EMV tag"},
-	{"clone",		CmdEmvClone,	  				0, "clone an EMV tag"}, 
+	{"clone",		CmdEmvClone,	  				0, "clone an EMV tag"},
 	*/
-	{"list",		CmdEMVList,	  					0, "[Deprecated] List ISO7816 history"}, 
-	{"roca",		CmdEMVRoca,	  					0, "Extract public keys and run ROCA test"}, 
+	{"list",		CmdEMVList,	  					0, "[Deprecated] List ISO7816 history"},
+	{"roca",		CmdEMVRoca,	  					0, "Extract public keys and run ROCA test"},
 	{NULL, NULL, 0, NULL}
 };
 
diff --git a/client/emv/crypto.c b/client/emv/crypto.c
index c8ced6d43..d8ec5fc08 100644
--- a/client/emv/crypto.c
+++ b/client/emv/crypto.c
@@ -29,7 +29,7 @@ static bool crypto_init(void)
 	if (crypto_backend)
 		return true;
 
-	crypto_backend = crypto_polarssl_init(); 
+	crypto_backend = crypto_polarssl_init();
 
 	if (!crypto_backend)
 		return false;
diff --git a/client/emv/crypto_polarssl.c b/client/emv/crypto_polarssl.c
index 938535059..f04b6c9e5 100644
--- a/client/emv/crypto_polarssl.c
+++ b/client/emv/crypto_polarssl.c
@@ -98,11 +98,11 @@ static struct crypto_pk *crypto_pk_polarssl_open_rsa(va_list vl)
 	int explen = va_arg(vl, size_t);
 
 	mbedtls_rsa_init(&cp->ctx, MBEDTLS_RSA_PKCS_V15, 0);
-	
+
 	cp->ctx.len = modlen; // size(N) in bytes
 	mbedtls_mpi_read_binary(&cp->ctx.N, (const unsigned char *)mod, modlen);
 	mbedtls_mpi_read_binary(&cp->ctx.E, (const unsigned char *)exp, explen);
-	
+
 	int res = mbedtls_rsa_check_pubkey(&cp->ctx);
 	if(res != 0) {
 		fprintf(stderr, "PolarSSL public key error res=%x exp=%d mod=%d.\n", res * -1, explen, modlen);
@@ -133,10 +133,10 @@ static struct crypto_pk *crypto_pk_polarssl_open_priv_rsa(va_list vl)
 	int dqlen = va_arg(vl, size_t);
 	// calc QP via Q and P
 //	char *inv = va_arg(vl, char *);
-//	int invlen = va_arg(vl, size_t);	
-	
+//	int invlen = va_arg(vl, size_t);
+
 	mbedtls_rsa_init(&cp->ctx, MBEDTLS_RSA_PKCS_V15, 0);
-	
+
 	cp->ctx.len = modlen; // size(N) in bytes
 	mbedtls_mpi_read_binary(&cp->ctx.N,  (const unsigned char *)mod, modlen);
 	mbedtls_mpi_read_binary(&cp->ctx.E,  (const unsigned char *)exp, explen);
@@ -147,7 +147,7 @@ static struct crypto_pk *crypto_pk_polarssl_open_priv_rsa(va_list vl)
 	mbedtls_mpi_read_binary(&cp->ctx.DP, (const unsigned char *)dp, dplen);
 	mbedtls_mpi_read_binary(&cp->ctx.DQ, (const unsigned char *)dq, dqlen);
 	mbedtls_mpi_inv_mod(&cp->ctx.QP, &cp->ctx.Q, &cp->ctx.P);
-	
+
 	int res = mbedtls_rsa_check_privkey(&cp->ctx);
 	if(res != 0) {
 		fprintf(stderr, "PolarSSL private key error res=%x exp=%d mod=%d.\n", res * -1, explen, modlen);
@@ -166,7 +166,7 @@ static int myrand(void *rng_state, unsigned char *output, size_t len) {
 
     for( i = 0; i < len; ++i )
         output[i] = rand();
-    
+
     return 0;
 }
 
@@ -175,21 +175,21 @@ static struct crypto_pk *crypto_pk_polarssl_genkey_rsa(va_list vl)
 {
 	struct crypto_pk_polarssl *cp = malloc(sizeof(*cp));
 	memset(cp, 0x00, sizeof(*cp));
-	
+
 	int transient = va_arg(vl, int);
 	unsigned int nbits = va_arg(vl, unsigned int);
 	unsigned int exp = va_arg(vl, unsigned int);
 
 	if (transient) {
 	}
-	
+
 	int res = mbedtls_rsa_gen_key(&cp->ctx, &myrand, NULL, nbits, exp);
 	if (res) {
 		fprintf(stderr, "PolarSSL private key generation error res=%x exp=%d nbits=%d.\n", res * -1, exp, nbits);
 		free(cp);
 		return NULL;
 	}
-	
+
 	return &cp->cp;
 }
 
@@ -206,7 +206,7 @@ static unsigned char *crypto_pk_polarssl_encrypt(const struct crypto_pk *_cp, co
 	struct crypto_pk_polarssl *cp = (struct crypto_pk_polarssl *)_cp;
 	int res;
 	unsigned char *result;
-	
+
 	*clen = 0;
 	size_t keylen = mbedtls_mpi_size(&cp->ctx.N);
 
@@ -222,9 +222,9 @@ static unsigned char *crypto_pk_polarssl_encrypt(const struct crypto_pk *_cp, co
 		free(result);
 		return NULL;
 	}
-	
+
 	*clen = keylen;
-	
+
 	return result;
 }
 
@@ -233,7 +233,7 @@ static unsigned char *crypto_pk_polarssl_decrypt(const struct crypto_pk *_cp, co
 	struct crypto_pk_polarssl *cp = (struct crypto_pk_polarssl *)_cp;
 	int res;
 	unsigned char *result;
-	
+
 	*clen = 0;
 	size_t keylen = mbedtls_mpi_size(&cp->ctx.N);
 
@@ -249,9 +249,9 @@ static unsigned char *crypto_pk_polarssl_decrypt(const struct crypto_pk *_cp, co
 		free(result);
 		return NULL;
 	}
-	
+
 	*clen = keylen;
-	
+
 	return result;
 }
 
@@ -286,7 +286,7 @@ static unsigned char *crypto_pk_polarssl_get_parameter(const struct crypto_pk *_
 			printf("Error get parameter. Param=%d", param);
 			break;
 	}
-	
+
 	return result;
 }
 
diff --git a/client/emv/emv_pk.c b/client/emv/emv_pk.c
index 091ab8062..211e4edc2 100644
--- a/client/emv/emv_pk.c
+++ b/client/emv/emv_pk.c
@@ -486,7 +486,7 @@ struct emv_pk *emv_pk_get_ca_pk(const unsigned char *rid, unsigned char idx)
 	}
 */
 	if (!pk) {
-		const char *relfname = "emv/capk.txt"; 
+		const char *relfname = "emv/capk.txt";
 
 		char fname[strlen(get_my_executable_directory()) + strlen(relfname) + 1];
 		strcpy(fname, get_my_executable_directory());
diff --git a/client/emv/emv_pki.c b/client/emv/emv_pki.c
index 84224a957..2c661f11a 100644
--- a/client/emv/emv_pki.c
+++ b/client/emv/emv_pki.c
@@ -75,7 +75,7 @@ static unsigned char *emv_pki_decode_message(const struct emv_pk *enc_pk,
 		printf("Recovered data:\n");
 		dump_buffer(data, data_len, stdout, 0);
 	}*/
-	
+
 	if (data[data_len-1] != 0xbc || data[0] != 0x6a || data[1] != msgtype) {
 		printf("ERROR: Certificate format\n");
 		free(data);
@@ -117,7 +117,7 @@ static unsigned char *emv_pki_decode_message(const struct emv_pk *enc_pk,
 		printf("ERROR: Calculated wrong hash\n");
 		printf("decoded:    %s\n",sprint_hex(data + data_len - 1 - hash_len, hash_len));
 		printf("calculated: %s\n",sprint_hex(hash, hash_len));
-		
+
 		if (strictExecution) {
 			crypto_hash_close(ch);
 			free(data);
@@ -206,7 +206,7 @@ static struct emv_pk *emv_pki_decode_key_ex(const struct emv_pk *enc_pk,
 		return NULL;
 	}
 
-	if (showData){ 
+	if (showData){
 		printf("Recovered data:\n");
 		dump_buffer(data, data_len, stdout, 0);
 	}
@@ -308,7 +308,7 @@ struct emv_pk *emv_pki_recover_icc_cert(const struct emv_pk *pk, struct tlvdb *d
 		.len = sdatl_len,
 		.value = sdatl
 	};
-	
+
 	struct emv_pk *res = emv_pki_decode_key(pk, 4,
 			tlvdb_get(db, 0x5a, NULL),
 			tlvdb_get(db, 0x9f46, NULL),
@@ -316,7 +316,7 @@ struct emv_pk *emv_pki_recover_icc_cert(const struct emv_pk *pk, struct tlvdb *d
 			tlvdb_get(db, 0x9f48, NULL),
 			sda_tlv,
 			&sda_tdata);
-			
+
 	free(sdatl); // malloc here: emv_pki_sdatl_fill
 	return res;
 }
@@ -335,9 +335,9 @@ struct emv_pk *emv_pki_recover_icc_pe_cert(const struct emv_pk *pk, struct tlvdb
 unsigned char *emv_pki_sdatl_fill(const struct tlvdb *db, size_t *sdatl_len) {
 	uint8_t buf[2048] = {0};
 	size_t len = 0;
-	
+
 	*sdatl_len = 0;
-	
+
 	const struct tlv *sda_tl = tlvdb_get(db, 0x9f4a, NULL);
 	if (!sda_tl || sda_tl->len <= 0)
 		return NULL;
@@ -348,16 +348,16 @@ unsigned char *emv_pki_sdatl_fill(const struct tlvdb *db, size_t *sdatl_len) {
 		if (elm) {
 			memcpy(&buf[len], elm->value, elm->len);
 			len += elm->len;
-		}		
+		}
 	}
-	
+
 	if (len) {
 		*sdatl_len = len;
 		unsigned char *value = malloc(len);
 		memcpy(value, buf, len);
 		return value;
 	}
-	
+
 	return NULL;
 }
 
@@ -365,7 +365,7 @@ unsigned char *emv_pki_sdatl_fill(const struct tlvdb *db, size_t *sdatl_len) {
 struct tlvdb *emv_pki_recover_dac_ex(const struct emv_pk *enc_pk, const struct tlvdb *db, const struct tlv *sda_tlv, bool showData)
 {
 	size_t data_len;
-	
+
 	// Static Data Authentication Tag List
 	size_t sdatl_len;
 	unsigned char *sdatl = emv_pki_sdatl_fill(db, &sdatl_len);
@@ -383,7 +383,7 @@ struct tlvdb *emv_pki_recover_dac_ex(const struct emv_pk *enc_pk, const struct t
 			NULL);
 
 	free(sdatl); // malloc here: emv_pki_sdatl_fill
-	
+
 	if (!data || data_len < 5)
 		return NULL;
 
@@ -436,7 +436,7 @@ struct tlvdb *emv_pki_recover_idn_ex(const struct emv_pk *enc_pk, const struct t
 
 	// 9f4c ICC Dynamic Number
 	struct tlvdb *idn_db = tlvdb_fixed(0x9f4c, idn_len, data + 5);
-	
+
 	free(data);
 
 	return idn_db;
@@ -475,7 +475,7 @@ struct tlvdb *emv_pki_recover_atc_ex(const struct emv_pk *enc_pk, const struct t
 
 	// 9f36 Application Transaction Counter (ATC)
 	struct tlvdb *atc_db = tlvdb_fixed(0x9f36, idn_len, data + 5);
-	
+
 	free(data);
 
 	return atc_db;
diff --git a/client/emv/emv_roca.c b/client/emv/emv_roca.c
index 6f90f11b5..f98117450 100644
--- a/client/emv/emv_roca.c
+++ b/client/emv/emv_roca.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2017-2018 Sectigo Limited
  * modified 2018 iceman  (dropped openssl bignum,  now use mbedtls lib)
  * modified 2018 merlok
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 2 of the License, or
@@ -30,10 +30,10 @@ static uint8_t g_primes[ROCA_PRINTS_LENGTH] = {
 mbedtls_mpi g_prints[ROCA_PRINTS_LENGTH];
 
 void rocacheck_init(void) {
-	
+
 	for (int i = 0; i < ROCA_PRINTS_LENGTH; i++)
 		mbedtls_mpi_init(&g_prints[i]);
-	
+
 	mbedtls_mpi_read_string(&g_prints[0], 10, "1026");
 	mbedtls_mpi_read_string(&g_prints[1], 10, "5658");
 	mbedtls_mpi_read_string(&g_prints[2], 10, "107286");
@@ -61,7 +61,7 @@ void rocacheck_cleanup(void) {
 int bitand_is_zero(	mbedtls_mpi* a, mbedtls_mpi* b ) {
 
 	for (int i = 0; i < mbedtls_mpi_bitlen(a); i++) {
-	
+
 		if (mbedtls_mpi_get_bit(a, i) && mbedtls_mpi_get_bit(b, i))
 			return 0;
 	}
@@ -70,7 +70,7 @@ int bitand_is_zero(	mbedtls_mpi* a, mbedtls_mpi* b ) {
 
 
 mbedtls_mpi_uint mpi_get_uint(const mbedtls_mpi *X) {
-	
+
 	if (X->n == 1 && X->s > 0) {
 		return X->p[0];
 	}
@@ -79,12 +79,12 @@ mbedtls_mpi_uint mpi_get_uint(const mbedtls_mpi *X) {
 }
 
 void print_mpi(const char *msg, int radix, const mbedtls_mpi *X) {
-	
+
 	char Xchar[400] = {0};
 	size_t len = 0;
-	
-	mbedtls_mpi_write_string(X, radix, Xchar, sizeof(Xchar), &len);	
-	printf("%s[%d] %s\n", msg, len, Xchar);	
+
+	mbedtls_mpi_write_string(X, radix, Xchar, sizeof(Xchar), &len);
+	printf("%s[%d] %s\n", msg, len, Xchar);
 }
 
 bool emv_rocacheck(const unsigned char *buf, size_t buflen, bool verbose) {
@@ -97,13 +97,13 @@ bool emv_rocacheck(const unsigned char *buf, size_t buflen, bool verbose) {
 	rocacheck_init();
 
 	MBEDTLS_MPI_CHK( mbedtls_mpi_read_binary(&t_modulus, buf, buflen) );
-	
+
 	for (int i = 0; i < ROCA_PRINTS_LENGTH; i++) {
 
 		mbedtls_mpi t_temp;
 		mbedtls_mpi t_prime;
 		mbedtls_mpi g_one;
-		
+
 		mbedtls_mpi_init(&t_temp);
 		mbedtls_mpi_init(&t_prime);
 		mbedtls_mpi_init(&g_one);
@@ -111,18 +111,18 @@ bool emv_rocacheck(const unsigned char *buf, size_t buflen, bool verbose) {
 		MBEDTLS_MPI_CHK( mbedtls_mpi_read_string(&g_one, 10, "1") );
 
 		MBEDTLS_MPI_CHK( mbedtls_mpi_add_int(&t_prime, &t_prime, g_primes[i]) );
-		
-		MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi(&t_temp, &t_modulus, &t_prime) ); 
-		
+
+		MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi(&t_temp, &t_modulus, &t_prime) );
+
 		MBEDTLS_MPI_CHK( mbedtls_mpi_shift_l(&g_one, mpi_get_uint(&t_temp)) );
-		
+
 		if (bitand_is_zero(&g_one, &g_prints[i])) {
 			if (verbose)
 				PrintAndLogEx(FAILED, "No fingerprint found.\n");
 			goto cleanup;
 		}
-		
-		mbedtls_mpi_free(&g_one);		
+
+		mbedtls_mpi_free(&g_one);
 		mbedtls_mpi_free(&t_temp);
 		mbedtls_mpi_free(&t_prime);
 	}
@@ -149,9 +149,9 @@ int roca_self_test(void) {
 					"\x27\x83\x30\xd3\xf4\x71\xa2\x53\x8f\xa6\x67\x80\x2e\xd2\xa3\xc4"\
 					"\x4a\x8b\x7d\xea\x82\x6e\x88\x8d\x0a\xa3\x41\xfd\x66\x4f\x7f\xa7";
 
-	
+
 	if (emv_rocacheck(keyp, 64, false)) {
-		PrintAndLogEx(SUCCESS, "Weak modulus [ %s]", _GREEN_(PASS) );	
+		PrintAndLogEx(SUCCESS, "Weak modulus [ %s]", _GREEN_(PASS) );
 	}
 	else {
 		ret++;
@@ -168,8 +168,8 @@ int roca_self_test(void) {
 		ret++;
 		PrintAndLogEx(FAILED, "Strong modulus [ %s]", _RED_(FAIL) );
 	} else {
-		PrintAndLogEx(SUCCESS, "Strong modulus [ %s]", _GREEN_(PASS) );	
+		PrintAndLogEx(SUCCESS, "Strong modulus [ %s]", _GREEN_(PASS) );
 	}
-	
+
 	return ret;
 }
diff --git a/client/emv/emv_roca.h b/client/emv/emv_roca.h
index 9e12e4256..b37d4de14 100644
--- a/client/emv/emv_roca.h
+++ b/client/emv/emv_roca.h
@@ -3,7 +3,7 @@
  * Copyright (C) 2017-2018 Sectigo Limited
  * modified 2018 iceman  (dropped openssl bignum,  now use mbedtls lib)
  * modified 2018 merlok
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 2 of the License, or
diff --git a/client/emv/emv_tags.c b/client/emv/emv_tags.c
index 521598b67..2cad81397 100644
--- a/client/emv/emv_tags.c
+++ b/client/emv/emv_tags.c
@@ -199,13 +199,13 @@ static const struct emv_tag emv_tags[] = {
 	{ 0x5f2d, "Language Preference", EMV_TAG_STRING },
 	{ 0x5f30, "Service Code", EMV_TAG_NUMERIC },
 	{ 0x5f34, "Application Primary Account Number (PAN) Sequence Number", EMV_TAG_NUMERIC },
-	{ 0x5f36, "Transaction Currency Exponent",  EMV_TAG_NUMERIC },	
+	{ 0x5f36, "Transaction Currency Exponent",  EMV_TAG_NUMERIC },
 	{ 0x5f50, "Issuer URL", EMV_TAG_STRING },
 	{ 0x5f53, "International Bank Account Number (IBAN)" },
 	{ 0x5f54, "Bank Identifier Code (BIC)" },
 	{ 0x5f55, "Issuer Country Code (alpha2 format)", EMV_TAG_STRING },
 	{ 0x5f56, "Issuer Country Code (alpha3 format)", EMV_TAG_STRING },
-		
+
 	{ 0x61  , "Application Template" },
 	{ 0x6f  , "File Control Information (FCI) Template" },
 	{ 0x70  , "READ RECORD Response Message Template" },
@@ -240,7 +240,7 @@ static const struct emv_tag emv_tags[] = {
 	{ 0x9b  , "Transaction Status Information" },
 	{ 0x9c  , "Transaction Type", EMV_TAG_NUMERIC },
 	{ 0x9d  , "Directory Definition File (DDF) Name" },
-	
+
 	{ 0x9f01, "Acquirer Identifier", EMV_TAG_NUMERIC },
 	{ 0x9f02, "Amount, Authorised (Numeric)", EMV_TAG_NUMERIC },
 	{ 0x9f03, "Amount, Other (Numeric)", EMV_TAG_NUMERIC },
@@ -268,10 +268,10 @@ static const struct emv_tag emv_tags[] = {
 	{ 0x9f1b, "Terminal Floor Limit" },
 	{ 0x9f1c, "Terminal Identification", EMV_TAG_STRING },
 	{ 0x9f1d, "Terminal Risk Management Data" },
-	{ 0x9f1e, "Interface Device (IFD) Serial Number", EMV_TAG_STRING },	
+	{ 0x9f1e, "Interface Device (IFD) Serial Number", EMV_TAG_STRING },
 	{ 0x9f1f, "Track 1 Discretionary Data", EMV_TAG_STRING },
 	{ 0x9f20, "Track 2 Discretionary Data", EMV_TAG_STRING },
-	{ 0x9f21, "Transaction Time" },	
+	{ 0x9f21, "Transaction Time" },
 	{ 0x9f22, "Certification Authority Public Key Index - Terminal" },
 	{ 0x9f23, "Upper Consecutive Offline Limit" },
 	{ 0x9f26, "Application Cryptogram" },
@@ -308,20 +308,20 @@ static const struct emv_tag emv_tags[] = {
 	{ 0x9f4d, "Log Entry" },
 	{ 0x9f4e, "Merchant Name and Location", EMV_TAG_STRING },
 	{ 0x9f4f, "Log Format", EMV_TAG_DOL },
-	
+
 	{ 0x9f50, "Offline Accumulator Balance" },
 	{ 0x9f51, "Application Currency Code" },
 	{ 0x9f51, "DRDOL" },
 
 	{ 0x9f52, "Application Default Action (ADA)" },
 	{ 0x9f52, "Terminal Compatibility Indicator" },
-	
+
 	{ 0x9f53, "Transaction Category Code" },
 	{ 0x9f54, "DS ODS Card" },
-	
-	{ 0x9f55, "Mobile Support Indicator" },	
+
+	{ 0x9f55, "Mobile Support Indicator" },
 	{ 0x9f55, "Issuer Authentication Flags" },
-	
+
 	{ 0x9f56, "Issuer Authentication Indicator" },
 	{ 0x9f57, "Issuer Country Code" },
 	{ 0x9f58, "Consecutive Transaction Counter Limit (CTCL)" },
@@ -332,7 +332,7 @@ static const struct emv_tag emv_tags[] = {
 	{ 0x9f5d, "Application Capabilities Information" },
 	{ 0x9f5e, "Data Storage Identifier" },
 	{ 0x9f5f, "DS Slot Availability" },
-	
+
 	{ 0x9f60, "CVC3 (Track1)" },
 	{ 0x9f61, "CVC3 (Track2)" },
 	{ 0x9f62, "PCVC3 (Track1)" },
@@ -421,7 +421,7 @@ static const struct emv_tag emv_tags[] = {
 	{ 0xff8103, "Tags To Write After Gen AC" },
 	{ 0xff8104, "Data To Send" },
 	{ 0xff8105, "Data Record" },
-	{ 0xff8106, "Discretionary Data" },	
+	{ 0xff8106, "Discretionary Data" },
 };
 
 static int emv_sort_tag(tlv_tag_t tag) {
@@ -554,13 +554,13 @@ static void emv_tag_dump_cvr(const struct tlv *tlv, const struct emv_tag *tag, F
 		fprintf(f, "\tINVALID!\n");
 		return;
 	}
-	
+
 	if (tlv->len != tlv->value[0] + 1) {
 		PRINT_INDENT(level);
 		fprintf(f, "\tINVALID length!\n");
 		return;
 	}
-	
+
 	if (tlv->len >= 2) {
 		// AC1
 		PRINT_INDENT(level);
@@ -587,7 +587,7 @@ static void emv_tag_dump_cvr(const struct tlv *tlv, const struct emv_tag *tag, F
 		PRINT_INDENT(level);
 		fprintf(f, "\tSuccessfully processed issuer script commands: %x\n", tlv->value[4] >> 4);
 	}
-	
+
 	// mask 0F 0F F0 0F
 	uint8_t data[20] = {0};
 	memcpy(data, &tlv->value[1], tlv->len - 1);
@@ -606,7 +606,7 @@ static void emv_tag_dump_cvr(const struct tlv *tlv, const struct emv_tag *tag, F
 		.type = EMV_TAG_BITMASK,
 		.data = EMV_CVR,
 	};
-	
+
 	if (data[0] || data[1] || data[2] || data[3])
 		emv_tag_dump_bitmask(&bit_tlv, &bit_tag, f, level);
 }
@@ -618,7 +618,7 @@ static void emv_tag_dump_cid(const struct tlv *tlv, const struct emv_tag *tag, F
 		fprintf(f, "\tINVALID!\n");
 		return;
 	}
-	
+
 	PRINT_INDENT(level);
 	if ((tlv->value[0] & EMVAC_AC_MASK) == EMVAC_AAC)		fprintf(f, "\tAC1: AAC (Transaction declined)\n");
 	if ((tlv->value[0] & EMVAC_AC_MASK) == EMVAC_TC)		fprintf(f, "\tAC1: TC (Transaction approved)\n");
@@ -757,7 +757,7 @@ static void emv_tag_dump_afl(const struct tlv *tlv, const struct emv_tag *tag, F
 		fprintf(f, "\tINVALID!\n");
 		return;
 	}
-	
+
 	for (int i = 0; i < tlv->len / 4; i++) {
 		PRINT_INDENT(level);
 		fprintf(f, "SFI[%02x] start:%02x end:%02x offline:%02x\n", tlv->value[i * 4 + 0] >> 3, tlv->value[i * 4 + 1], tlv->value[i * 4 + 2], tlv->value[i * 4 + 3]);
@@ -819,13 +819,13 @@ bool emv_tag_dump(const struct tlv *tlv, FILE *f, int level) {
 
 char *emv_get_tag_name(const struct tlv *tlv) {
 	static char *defstr = "";
-	
-	if (!tlv) 
+
+	if (!tlv)
 		return defstr;
 
 	const struct emv_tag *tag = emv_get_tag(tlv);
 	if (tag)
 		return tag->name;
-	
+
 	return defstr;
 }
diff --git a/client/emv/emvcore.c b/client/emv/emvcore.c
index 7af08690c..796fc22ea 100644
--- a/client/emv/emvcore.c
+++ b/client/emv/emvcore.c
@@ -14,7 +14,7 @@
 
 // Got from here. Thanks)
 // https://eftlab.co.uk/index.php/site-map/knowledge-base/211-emv-aid-rid-pix
-static const char *PSElist [] = { 
+static const char *PSElist [] = {
 	"325041592E5359532E4444463031", // 2PAY.SYS.DDF01 - Visa Proximity Payment System Environment - PPSE
 	"315041592E5359532E4444463031"  // 1PAY.SYS.DDF01 - Visa Payment System Environment - PSE
 };
@@ -32,28 +32,28 @@ typedef struct {
 	const char* aid;
 } TAIDList;
 
-static const TAIDList AIDlist [] = { 
+static const TAIDList AIDlist [] = {
 	// Visa International
-	{ CV_VISA, 	"A00000000305076010"},			// VISA ELO Credit	
-	{ CV_VISA, 	"A0000000031010" },				// VISA Debit/Credit (Classic)	
-	{ CV_VISA, 	"A000000003101001" },			// VISA Credit	
-	{ CV_VISA, 	"A000000003101002" },			// VISA Debit	
+	{ CV_VISA, 	"A00000000305076010"},			// VISA ELO Credit
+	{ CV_VISA, 	"A0000000031010" },				// VISA Debit/Credit (Classic)
+	{ CV_VISA, 	"A000000003101001" },			// VISA Credit
+	{ CV_VISA, 	"A000000003101002" },			// VISA Debit
 	{ CV_VISA, 	"A0000000032010" },				// VISA Electron
-	{ CV_VISA, 	"A0000000032020" },				// VISA	
-	{ CV_VISA, 	"A0000000033010" },				// VISA Interlink	
-	{ CV_VISA, 	"A0000000034010" },				// VISA Specific	
-	{ CV_VISA, 	"A0000000035010" },				// VISA Specific	
-	{ CV_VISA, 	"A0000000036010" },				// Domestic Visa Cash Stored Value	
-	{ CV_VISA, 	"A0000000036020" },				// International Visa Cash Stored Value	
-	{ CV_VISA, 	"A0000000038002" },				// VISA Auth, VisaRemAuthen EMV-CAP (DPA)	
-	{ CV_VISA, 	"A0000000038010" },				// VISA Plus	
-	{ CV_VISA, 	"A0000000039010" },				// VISA Loyalty	
-	{ CV_VISA, 	"A000000003999910" },			// VISA Proprietary ATM	
+	{ CV_VISA, 	"A0000000032020" },				// VISA
+	{ CV_VISA, 	"A0000000033010" },				// VISA Interlink
+	{ CV_VISA, 	"A0000000034010" },				// VISA Specific
+	{ CV_VISA, 	"A0000000035010" },				// VISA Specific
+	{ CV_VISA, 	"A0000000036010" },				// Domestic Visa Cash Stored Value
+	{ CV_VISA, 	"A0000000036020" },				// International Visa Cash Stored Value
+	{ CV_VISA, 	"A0000000038002" },				// VISA Auth, VisaRemAuthen EMV-CAP (DPA)
+	{ CV_VISA, 	"A0000000038010" },				// VISA Plus
+	{ CV_VISA, 	"A0000000039010" },				// VISA Loyalty
+	{ CV_VISA, 	"A000000003999910" },			// VISA Proprietary ATM
 	// Visa USA
 	{ CV_VISA, 	"A000000098" },					// Debit Card
 	{ CV_VISA, 	"A0000000980848" },				// Debit Card
 	// Mastercard International
-	{ CV_MASTERCARD, "A00000000401" },			// MasterCard PayPass	
+	{ CV_MASTERCARD, "A00000000401" },			// MasterCard PayPass
 	{ CV_MASTERCARD, "A0000000041010" },		// MasterCard Credit
 	{ CV_MASTERCARD, "A00000000410101213" },	// MasterCard Credit
 	{ CV_MASTERCARD, "A00000000410101215" },	// MasterCard Credit
@@ -65,7 +65,7 @@ static const TAIDList AIDlist [] = {
 	{ CV_MASTERCARD, "A0000000045010" },		// MasterCard Specific
 	{ CV_MASTERCARD, "A0000000046000" },		// Cirrus
 	{ CV_MASTERCARD, "A0000000048002" },		// SecureCode Auth EMV-CAP
-	{ CV_MASTERCARD, "A0000000049999" },		// MasterCard PayPass	
+	{ CV_MASTERCARD, "A0000000049999" },		// MasterCard PayPass
 	// American Express
 	{ CV_AMERICANEXPRESS, "A000000025" },
 	{ CV_AMERICANEXPRESS, "A0000000250000" },
@@ -74,14 +74,14 @@ static const TAIDList AIDlist [] = {
 	{ CV_AMERICANEXPRESS, "A000000025010701" },
 	{ CV_AMERICANEXPRESS, "A000000025010801" },
 	// Groupement des Cartes Bancaires "CB"
-	{ CV_CB, "A0000000421010" },				// Cartes Bancaire EMV Card	
-	{ CV_CB, "A0000000422010" },		
-	{ CV_CB, "A0000000423010" },		
-	{ CV_CB, "A0000000424010" },		
-	{ CV_CB, "A0000000425010" },		
+	{ CV_CB, "A0000000421010" },				// Cartes Bancaire EMV Card
+	{ CV_CB, "A0000000422010" },
+	{ CV_CB, "A0000000423010" },
+	{ CV_CB, "A0000000424010" },
+	{ CV_CB, "A0000000425010" },
 	// JCB CO., LTD.
-	{ CV_JCB, "A00000006510" },					// JCB	
-	{ CV_JCB, "A0000000651010" },				// JCB J Smart Credit	
+	{ CV_JCB, "A00000006510" },					// JCB
+	{ CV_JCB, "A0000000651010" },				// JCB J Smart Credit
 	// Other
 	{ CV_OTHER, "A0000001544442" },				// Banricompras Debito - Banrisul - Banco do Estado do Rio Grande do SUL - S.A.
 	{ CV_OTHER, "F0000000030001" },				// BRADESCO
@@ -106,8 +106,8 @@ enum CardPSVendor GetCardPSVendor(uint8_t * AID, size_t AIDlen) {
 		if (strncmp(AIDlist[i].aid, buf, strlen(AIDlist[i].aid)) == 0){
 			return AIDlist[i].vendor;
 		}
-	}	
-	
+	}
+
 	return CV_NA;
 }
 
@@ -125,7 +125,7 @@ bool TLVPrintFromBuffer(uint8_t *data, int datalen) {
 	t = tlvdb_parse_multi(data, datalen);
 	if (t) {
 		PrintAndLogEx(NORMAL, "-------------------- TLV decoded --------------------");
-		
+
 		tlvdb_visit(t, print_cb, NULL, 0);
 		tlvdb_free(t);
 		return true;
@@ -136,9 +136,9 @@ bool TLVPrintFromBuffer(uint8_t *data, int datalen) {
 }
 
 void TLVPrintFromTLVLev(struct tlvdb *tlv, int level) {
-	if (!tlv) 
+	if (!tlv)
 		return;
-	
+
 	tlvdb_visit(tlv, print_cb, NULL, level);
 }
 
@@ -154,18 +154,18 @@ void TLVPrintAIDlistFromSelectTLV(struct tlvdb *tlv) {
 	struct tlvdb *ttmp = tlvdb_find(tlv, 0x6f);
 	if (!ttmp)
 		PrintAndLogEx(NORMAL, "|                         none                        |");
-		
+
 	while (ttmp) {
 		const struct tlv *tgAID = tlvdb_get_inchild(ttmp, 0x84, NULL);
 		const struct tlv *tgName = tlvdb_get_inchild(ttmp, 0x50, NULL);
 		const struct tlv *tgPrio = tlvdb_get_inchild(ttmp, 0x87, NULL);
 		if (!tgAID)
 			break;
-		PrintAndLogEx(NORMAL, "|%s|   %s  |%s|", 
-			sprint_hex_inrow_ex(tgAID->value, tgAID->len, 18), 
-			(tgPrio) ? sprint_hex(tgPrio->value, 1) : "   ", 
+		PrintAndLogEx(NORMAL, "|%s|   %s  |%s|",
+			sprint_hex_inrow_ex(tgAID->value, tgAID->len, 18),
+			(tgPrio) ? sprint_hex(tgPrio->value, 1) : "   ",
 			(tgName) ? sprint_ascii_ex(tgName->value, tgName->len, 25) : "                         ");
-		
+
 		ttmp = tlvdb_find_next(ttmp, 0x6f);
 	}
 
@@ -183,19 +183,19 @@ struct tlvdb *GetPANFromTrack2(const struct tlv *track2) {
 
 	for (int i = 0; i < track2->len; ++i, tmp += 2)
 		sprintf(tmp, "%02x", (unsigned int)track2->value[i]);
-	
+
 	int posD = strchr(track2Hex, 'd') - track2Hex;
 	if (posD < 1)
 		return NULL;
-	
+
 	track2Hex[posD] = 0;
 	if (strlen(track2Hex) % 2) {
 		track2Hex[posD] = 'F';
 		track2Hex[posD + 1] = '\0';
 	}
-	
+
 	param_gethex_to_eol(track2Hex, 0, PAN, sizeof(PAN), &PANlen);
-	
+
   return tlvdb_fixed(0x5a, PANlen, PAN);
 }
 
@@ -206,13 +206,13 @@ struct tlvdb *GetdCVVRawFromTrack2(const struct tlv *track2) {
 	int dCVVlen = 0;
 	const int PINlen = 5; // must calculated from 9F67 MSD Offset but i have not seen this tag)
 	char *tmp = track2Hex;
-	
+
 	if (!track2)
 		return NULL;
-	
+
 	for (int i = 0; i < track2->len; ++i, tmp += 2)
 		sprintf(tmp, "%02x", (unsigned int)track2->value[i]);
-	
+
 	int posD = strchr(track2Hex, 'd') - track2Hex;
 	if (posD < 1)
 		return NULL;
@@ -226,9 +226,9 @@ struct tlvdb *GetdCVVRawFromTrack2(const struct tlv *track2) {
 	memcpy(dCVVHex + 9, track2Hex + posD + 1, 4);
 	// service code
 	memcpy(dCVVHex + 13, track2Hex + posD + 5, 3);
-	
+
 	param_gethex_to_eol(dCVVHex, 0, dCVV, sizeof(dCVV), &dCVVlen);
-	
+
   return tlvdb_fixed(0x02, dCVVlen, dCVV);
 }
 
@@ -239,17 +239,17 @@ int EMVExchangeEx(EMVCommandChannel channel, bool ActivateField, bool LeaveField
 	if (sw)	*sw = 0;
 	uint16_t isw = 0;
 	int res = 0;
-	
+
 	if (ActivateField) {
 		DropFieldEx( channel );
 		msleep(50);
 	}
-	
+
 	// COMPUTE APDU
 	memcpy(data, &apdu, 5);
 	if (apdu.data)
 		memcpy(&data[5], apdu.data, apdu.Lc);
-	
+
 	if (APDULogging)
 		PrintAndLogEx(SUCCESS, ">>>> %s", sprint_hex(data, (IncludeLe?6:5) + apdu.Lc));
 
@@ -262,24 +262,24 @@ int EMVExchangeEx(EMVCommandChannel channel, bool ActivateField, bool LeaveField
 		}
 		break;
 	case ECC_CONTACT:
-#ifdef WITH_SMARTCARD		
+#ifdef WITH_SMARTCARD
 		res = ExchangeAPDUSC(data, (IncludeLe?6:5) + apdu.Lc, ActivateField, LeaveFieldON, Result, (int)MaxResultLen, (int *)ResultLen);
 #else
 		res = 1;
-#endif	
+#endif
 		if (res) {
 			return res;
 		}
 		break;
 	}
-	
+
 	if (APDULogging)
 		PrintAndLogEx(SUCCESS, "<<<< %s", sprint_hex(Result, *ResultLen));
 
 	if (*ResultLen < 2) {
 		return 200;
 	}
-	
+
 	*ResultLen -= 2;
 	isw = Result[*ResultLen] * 0x0100 + Result[*ResultLen + 1];
 	if (sw)
@@ -301,7 +301,7 @@ int EMVExchangeEx(EMVCommandChannel channel, bool ActivateField, bool LeaveField
 		struct tlvdb *t = tlvdb_parse_multi(Result, *ResultLen);
 		tlvdb_add(tlv, t);
 	}
-	
+
 	return 0;
 }
 
@@ -328,7 +328,7 @@ int EMVSelectPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldO
 		default:
 			return -1;
 	}
-	
+
 	// select
 	res = EMVSelect(channel, ActivateField, LeaveFieldON, buf, len, Result, MaxResultLen, ResultLen, sw, NULL);
 
@@ -351,11 +351,11 @@ int EMVSelectWithRetry(EMVCommandChannel channel, bool ActivateField, bool Leave
 					PrintAndLogEx(WARNING, "Exit...");
 					return 1;
 				}
-				
+
 				retrycnt = 0;
 				PrintAndLogEx(NORMAL, "Retry failed [%s]. Skiped...", sprint_hex_inrow(AID, AIDLen));
 				return res;
-			}	
+			}
 		}
 	} while (res && res != 5);
 
@@ -379,7 +379,7 @@ int EMVCheckAID(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlvdbel
 				tlvdbelm = tlvdb_find_next(tlvdbelm, 0x61);
 				continue;
 			}
-			
+
 			if (res)
 				break;
 
@@ -411,7 +411,7 @@ int EMVSearchPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldO
 			PrintAndLogEx(FAILED, "Select PSE error. APDU error: %04x.", sw);
 			return 1;
 		}
-		
+
 		struct tlvdb *t = NULL;
 		t = tlvdb_parse_multi(data, datalen);
 		if (t) {
@@ -421,18 +421,18 @@ int EMVSearchPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldO
 				uint8_t sfin = 0;
 				tlv_get_uint8(tlvdb_get_tlv(tsfi), &sfin);
 				PrintAndLogEx(INFO, "* PPSE get SFI: 0x%02x.", sfin);
-				
+
 				for (uint8_t ui = 0x01; ui <= 0x10; ui++) {
 					PrintAndLogEx(INFO, "* * Get SFI: 0x%02x. num: 0x%02x", sfin, ui);
 					res = EMVReadRecord(channel, true, sfin, ui, sfidata[ui], APDU_RES_LEN, &sfidatalen[ui], &sw, NULL);
-					
+
 					// end of records
 					if (sw == 0x6a83) {
 						sfidatalen[ui] = 0;
 						PrintAndLogEx(INFO, "* * PPSE get SFI. End of records.");
 						break;
 					}
-					
+
 					// error catch!
 					if (sw != 0x9000) {
 						sfidatalen[ui] = 0;
@@ -455,7 +455,7 @@ int EMVSearchPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldO
 								PrintAndLogEx(FAILED, "SFI 0x%02d don't have records.", sfidatalen[ui]);
 								continue;
 							}
-							res = EMVCheckAID(channel, decodeTLV, tsfitmp, tlv);							
+							res = EMVCheckAID(channel, decodeTLV, tsfitmp, tlv);
 							fileFound = true;
 						}
 						tlvdb_free(tsfi);
@@ -470,21 +470,21 @@ int EMVSearchPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldO
 				res = EMVCheckAID(channel, decodeTLV, ttmp, tlv);
 				fileFound = true;
 			}
-			
+
 			if (!fileFound)
 				PrintAndLogEx(FAILED, "PPSE don't have records.");
 
 			tlvdb_free(t);
 		} else {
 			PrintAndLogEx(WARNING, "PPSE ERROR: Can't get TLV from response.");
-		}		
+		}
 	} else {
 		PrintAndLogEx(WARNING, "PPSE ERROR: Can't select PPSE AID. Error: %d", res);
 	}
-	
+
 	if(!LeaveFieldON)
 		DropFieldEx( channel );
-	
+
 	return res;
 }
 
@@ -494,7 +494,7 @@ int EMVSearch(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON,
 	uint8_t data[APDU_RES_LEN] = {0};
 	size_t datalen = 0;
 	uint16_t sw = 0;
-	
+
 	int res = 0;
 	int retrycnt = 0;
 	for(int i = 0; i < AIDlistLen; i ++) {
@@ -510,20 +510,20 @@ int EMVSearch(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON,
 					PrintAndLogEx(WARNING, "Exit...");
 					return 1;
 				}
-				
+
 				retrycnt = 0;
 				PrintAndLogEx(FAILED, "Retry failed [%s]. Skipped...", AIDlist[i].aid);
 			}
 			continue;
 		}
 		retrycnt = 0;
-		
+
 		if (res)
 			continue;
-		
+
 		if (!datalen)
 			continue;
-		
+
 		if (decodeTLV) {
 			PrintAndLogEx(SUCCESS, "%s", AIDlist[i].aid);
 			TLVPrintFromBuffer(data, datalen);
@@ -536,25 +536,25 @@ int EMVSearch(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON,
 int EMVSelectApplication(struct tlvdb *tlv, uint8_t *AID, size_t *AIDlen) {
 	// check priority. 0x00 - highest
 	int prio = 0xffff;
-	
+
 	*AIDlen = 0;
 
 	struct tlvdb *ttmp = tlvdb_find(tlv, 0x6f);
 	if (!ttmp)
 		return 1;
-		
+
 	while (ttmp) {
 		const struct tlv *tgAID = tlvdb_get_inchild(ttmp, 0x84, NULL);
 		const struct tlv *tgPrio = tlvdb_get_inchild(ttmp, 0x87, NULL);
-		
+
 		if (!tgAID)
 			break;
 
 		if (tgPrio) {
-			int pt = bytes_to_num((uint8_t*)tgPrio->value, (tgPrio->len < 2) ? tgPrio->len : 2); 
+			int pt = bytes_to_num((uint8_t*)tgPrio->value, (tgPrio->len < 2) ? tgPrio->len : 2);
 			if (pt < prio) {
 				prio = pt;
-				
+
 				memcpy(AID, tgAID->value, tgAID->len);
 				*AIDlen = tgAID->len;
 			}
@@ -562,13 +562,13 @@ int EMVSelectApplication(struct tlvdb *tlv, uint8_t *AID, size_t *AIDlen) {
 			// takes the first application from list wo priority
 			if (!*AIDlen) {
 			memcpy(AID, tgAID->value, tgAID->len);
-			*AIDlen = tgAID->len;				
+			*AIDlen = tgAID->len;
 			}
 		}
-		
+
 		ttmp = tlvdb_find_next(ttmp, 0x6f);
 	}
-	
+
 	return 0;
 }
 
@@ -606,7 +606,7 @@ int MSCComputeCryptoChecksum(EMVCommandChannel channel, bool LeaveFieldON, uint8
 	return EMVExchange(channel, LeaveFieldON, (sAPDU){0x80, 0x2a, 0x8e, 0x80, UDOLlen, UDOL}, Result, MaxResultLen, ResultLen, sw, tlv);
 }
 
-// Authentication 
+// Authentication
 struct emv_pk *get_ca_pk(struct tlvdb *db) {
 	const struct tlv *df_tlv = tlvdb_get(db, 0x84, NULL);
 	const struct tlv *caidx_tlv = tlvdb_get(db, 0x8f, NULL);
@@ -625,7 +625,7 @@ int trSDA(struct tlvdb *tlv) {
 		PrintAndLogEx(WARNING, "Error: Key not found. Exit.");
 		return 2;
 	}
-	
+
 	struct emv_pk *issuer_pk = emv_pki_recover_issuer_cert(pk, tlv);
 	if (!issuer_pk) {
 		emv_pk_free(pk);
@@ -652,7 +652,7 @@ int trSDA(struct tlvdb *tlv) {
 		PrintAndLogEx(WARNING, "Can't find input list for Offline Data Authentication. Exit.");
 		return 3;
 	}
-	
+
 	struct tlvdb *dac_db = emv_pki_recover_dac(issuer_pk, tlv, sda_tlv);
 	if (dac_db) {
 		const struct tlv *dac_tlv = tlvdb_get(dac_db, 0x9f45, NULL);
@@ -664,7 +664,7 @@ int trSDA(struct tlvdb *tlv) {
 		PrintAndLogEx(WARNING, "SSAD verify error");
 		return 4;
 	}
-	
+
 	emv_pk_free(issuer_pk);
 	emv_pk_free(pk);
 	return 0;
@@ -708,7 +708,7 @@ int trDDA(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlv) {
 			issuer_pk->serial[1],
 			issuer_pk->serial[2]
 			);
-				
+
 	struct emv_pk *icc_pk = emv_pki_recover_icc_cert(issuer_pk, tlv, sda_tlv);
 	if (!icc_pk) {
 		emv_pk_free(pk);
@@ -769,7 +769,7 @@ int trDDA(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlv) {
 		const struct tlv *atc_tlv = tlvdb_get(atc_db, 0x9f36, NULL);
 		if(atc_tlv) {
 			PrintAndLogEx(NORMAL, "\nATC (Application Transaction Counter) [%zu] %s", atc_tlv->len, sprint_hex_inrow(atc_tlv->value, atc_tlv->len));
-			
+
 			const struct tlv *core_atc_tlv = tlvdb_get(tlv, 0x9f36, NULL);
 			if(tlv_equal(core_atc_tlv, atc_tlv)) {
 				PrintAndLogEx(SUCCESS, "ATC check OK.");
@@ -797,7 +797,7 @@ int trDDA(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlv) {
 			emv_pk_free(icc_pk);
 			return 4;
 		}
-		
+
 		PrintAndLogEx(NORMAL, "\n* * Calc DDOL");
 		const struct tlv *ddol_tlv = tlvdb_get(tlv, 0x9f49, NULL);
 		if (!ddol_tlv) {
@@ -818,7 +818,7 @@ int trDDA(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlv) {
 
 		PrintAndLogEx(NORMAL, "\n* * Internal Authenticate");
 		int res = EMVInternalAuthenticate(channel, true, (uint8_t *)ddol_data_tlv->value, ddol_data_tlv->len, buf, sizeof(buf), &len, &sw, NULL);
-		if (res) {	
+		if (res) {
 			PrintAndLogEx(WARNING, "Internal Authenticate error(%d): %4x. Exit...", res, sw);
 			free(ddol_data_tlv);
 			emv_pk_free(pk);
@@ -835,13 +835,13 @@ int trDDA(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlv) {
 				// parse response 0x80
 				struct tlvdb *t80 = tlvdb_parse_multi(buf, len);
 				const struct tlv * t80tlv = tlvdb_get_tlv(t80);
-				
+
 				// 9f4b Signed Dynamic Application Data
 				dda_db = tlvdb_fixed(0x9f4b, t80tlv->len, t80tlv->value);
 				tlvdb_add(tlv, dda_db);
-				
+
 				tlvdb_free(t80);
-				
+
 				if (decodeTLV){
 					PrintAndLogEx(NORMAL, "* * * Decode response format 1:");
 					TLVPrintFromTLV(dda_db);
@@ -858,7 +858,7 @@ int trDDA(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlv) {
 				return 7;
 			}
 			tlvdb_add(tlv, dda_db);
-			
+
 			if (decodeTLV)
 				TLVPrintFromTLV(dda_db);
 		}
@@ -892,7 +892,7 @@ int trDDA(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlv) {
 			return 9;
 		}
 	}
-	
+
 	emv_pk_free(pk);
 	emv_pk_free(issuer_pk);
 	emv_pk_free(icc_pk);
@@ -931,7 +931,7 @@ int trCDA(struct tlvdb *tlv, struct tlvdb *ac_tlv, struct tlv *pdol_data_tlv, st
 			issuer_pk->serial[1],
 			issuer_pk->serial[2]
 			);
-				
+
 	struct emv_pk *icc_pk = emv_pki_recover_icc_cert(issuer_pk, tlv, sda_tlv);
 	if (!icc_pk) {
 		PrintAndLogEx(WARNING, "Error: ICC setrificate not found. Exit.");
@@ -963,12 +963,12 @@ int trCDA(struct tlvdb *tlv, struct tlvdb *ac_tlv, struct tlv *pdol_data_tlv, st
 		emv_pk_free(icc_pk);
 		return 4;
 	}
-	
+
 	PrintAndLogEx(NORMAL, "\n* * Check Signed Dynamic Application Data (SDAD)");
 	struct tlvdb *idn_db = emv_pki_perform_cda_ex(icc_pk, tlv, ac_tlv,
 			pdol_data_tlv, // pdol
 			ac_data_tlv,   // cdol1
-			NULL,          // cdol2 
+			NULL,          // cdol2
 			true);
 	if (idn_db) {
 		const struct tlv *idn_tlv = tlvdb_get(idn_db, 0x9f4c, NULL);
@@ -986,7 +986,7 @@ int trCDA(struct tlvdb *tlv, struct tlvdb *ac_tlv, struct tlv *pdol_data_tlv, st
 }
 
 int RecoveryCertificates(struct tlvdb *tlvRoot, json_t *root) {
-	
+
 	struct emv_pk *pk = get_ca_pk(tlvRoot);
 	if (!pk) {
 		PrintAndLog("ERROR: Key not found. Exit.");
@@ -1036,11 +1036,11 @@ int RecoveryCertificates(struct tlvdb *tlvRoot, json_t *root) {
 			icc_pk->serial[1],
 			icc_pk->serial[2]
 			);
-	
+
 	char *icc_pk_c = emv_pk_dump_pk(icc_pk);
 	JsonSaveStr(root, "$.ApplicationData.ICCPublicKeyDec", icc_pk_c);
 	JsonSaveBufAsHex(root, "$.ApplicationData.ICCPublicKeyModulus", icc_pk->modulus, icc_pk->mlen);
 	free(issuer_pk_c);
-	
+
 	return 0;
 }
diff --git a/client/emv/emvjson.c b/client/emv/emvjson.c
index dc409a2a5..4468d49b3 100644
--- a/client/emv/emvjson.c
+++ b/client/emv/emvjson.c
@@ -64,7 +64,7 @@ char* GetApplicationDataName(tlv_tag_t tag) {
 	for (int i = 0; i < ApplicationDataLen; i++)
 		if (ApplicationData[i].Tag == tag)
 			return ApplicationData[i].Name;
-		
+
 	return NULL;
 }
 
@@ -73,7 +73,7 @@ int JsonSaveJsonObject(json_t *root, char *path, json_t *value) {
 
 	if (strlen(path) < 1)
 		return 1;
-	
+
 	if (path[0] == '$') {
 		if (json_path_set(root, path, value, 0, &error)) {
 			PrintAndLog("ERROR: can't set json path: ", error.text);
@@ -124,9 +124,9 @@ int JsonSaveHex(json_t *elm, char *path, uint64_t data, int datalen) {
 			len = 1;
 	} else {
 		len = datalen;
-	}	
+	}
 	num_to_bytes(data, len, bdata);
-	
+
 	return JsonSaveBufAsHex(elm, path, bdata, len);
 }
 
@@ -135,7 +135,7 @@ int JsonSaveTLVValue(json_t *root, char *path, struct tlvdb *tlvdbelm) {
 	if (tlvelm)
 		return JsonSaveBufAsHex(root, path, (uint8_t *)tlvelm->value, tlvelm->len);
 	else
-		return 1;	
+		return 1;
 }
 
 int JsonSaveTLVElm(json_t *elm, char *path, struct tlv *tlvelm, bool saveName, bool saveValue, bool saveAppDataLink) {
@@ -143,13 +143,13 @@ int JsonSaveTLVElm(json_t *elm, char *path, struct tlv *tlvelm, bool saveName, b
 
 	if (strlen(path) < 1 || !tlvelm)
 		return 1;
-	
+
 	if (path[0] == '$') {
 
 		json_t *obj = json_path_get(elm, path);
 		if (!obj) {
 			obj = json_object();
-		
+
 			if (json_is_array(elm)) {
 				if (json_array_append_new(elm, obj)) {
 					PrintAndLog("ERROR: can't append array: %s", path);
@@ -162,12 +162,12 @@ int JsonSaveTLVElm(json_t *elm, char *path, struct tlv *tlvelm, bool saveName, b
 				}
 			}
 		}
-		
+
 		if (saveAppDataLink) {
 			char * AppDataName = GetApplicationDataName(tlvelm->tag);
 			if (AppDataName)
 				JsonSaveStr(obj, "appdata", AppDataName);
-		} else {		
+		} else {
 			char * name = emv_get_tag_name(tlvelm);
 			if (saveName && name && strlen(name) > 0 && strncmp(name, "Unknown", 7))
 				JsonSaveStr(obj, "name", emv_get_tag_name(tlvelm));
@@ -193,13 +193,13 @@ int JsonSaveTLVTree(json_t *root, json_t *elm, char *path, struct tlvdb *tlvdbel
 		char * AppDataName = NULL;
 		if (tlvpelm)
 			AppDataName = GetApplicationDataName(tlvpelm->tag);
-		
+
 		if (AppDataName) {
 			char appdatalink[200] = {0};
 			sprintf(appdatalink, "$.ApplicationData.%s", AppDataName);
 			JsonSaveBufAsHex(root, appdatalink, (uint8_t *)tlvpelm->value, tlvpelm->len);
 		}
-		
+
 		json_t *pelm = json_path_get(elm, path);
 		if (pelm && json_is_array(pelm)) {
 			json_t *appendelm = json_object();
@@ -210,20 +210,20 @@ int JsonSaveTLVTree(json_t *root, json_t *elm, char *path, struct tlvdb *tlvdbel
 			JsonSaveTLVTreeElm(elm, path, tlvp, !AppDataName, !tlvdb_elm_get_children(tlvp), AppDataName);
 			pelm = json_path_get(elm, path);
 		}
-		
+
 		if (tlvdb_elm_get_children(tlvp)) {
 			// get path element
 			if(!pelm)
 				return 1;
-			
+
 			// check childs element and add it if not found
 			json_t *chjson = json_path_get(pelm, "$.Childs");
 			if (!chjson) {
 				json_object_set_new(pelm, "Childs", json_array());
-				
+
 				chjson = json_path_get(pelm, "$.Childs");
 			}
-			
+
 			// check
 			if (!json_is_array(chjson)) {
 				PrintAndLog("E->Internal logic error. `$.Childs` is not an array.");
@@ -240,8 +240,8 @@ int JsonSaveTLVTree(json_t *root, json_t *elm, char *path, struct tlvdb *tlvdbel
 }
 
 bool HexToBuffer(const char *errormsg, const char *hexvalue, uint8_t * buffer, size_t maxbufferlen, size_t *bufferlen) {
-	int buflen = 0;	
-	
+	int buflen = 0;
+
 	switch (param_gethex_to_eol(hexvalue, 0, buffer, maxbufferlen, &buflen)) {
 		case 1:
 			PrintAndLog("%s Invalid HEX value.", errormsg);
@@ -253,15 +253,15 @@ bool HexToBuffer(const char *errormsg, const char *hexvalue, uint8_t * buffer, s
 			PrintAndLog("%s Hex value must have even number of digits.", errormsg);
 			return false;
 	}
-	
+
 	if (buflen > maxbufferlen) {
 		PrintAndLog("%s HEX length (%d) more than %d", errormsg, (bufferlen) ? *bufferlen : -1, maxbufferlen);
 		return false;
 	}
-	
+
 	if ( bufferlen )
 		*bufferlen = buflen;
-	
+
 	return true;
 }
 
@@ -272,27 +272,27 @@ int JsonLoadStr(json_t *root, char *path, char *value) {
 	json_t *jelm = json_path_get((const json_t *)root, path);
 	if (!jelm || !json_is_string(jelm))
 		return 2;
-	
+
 	const char * strval = json_string_value(jelm);
 	if (!strval)
 		return 1;
-	
+
 	memcpy(value, strval, strlen(strval));
-	
+
 	return 0;
 }
 
 int JsonLoadBufAsHex(json_t *elm, char *path, uint8_t *data, size_t maxbufferlen, size_t *datalen) {
 	if (datalen)
 		*datalen = 0;
-	
+
 	json_t *jelm = json_path_get((const json_t *)elm, path);
 	if (!jelm || !json_is_string(jelm))
 		return 1;
-	
+
 	if (!HexToBuffer("ERROR load", json_string_value(jelm), data, maxbufferlen, datalen))
 		return 2;
-	
+
 	return 0;
 };
 
@@ -302,11 +302,11 @@ bool ParamLoadFromJson(struct tlvdb *tlv) {
 
 	if (!tlv) {
 		PrintAndLog("ERROR load params: tlv tree is NULL.");
-		return false; 
+		return false;
 	}
 
 	// current path + file name
-	const char *relfname = "emv/defparams.json"; 
+	const char *relfname = "emv/defparams.json";
 	char fname[strlen(get_my_executable_directory()) + strlen(relfname) + 1];
 	strcpy(fname, get_my_executable_directory());
 	strcat(fname, relfname);
@@ -314,16 +314,16 @@ bool ParamLoadFromJson(struct tlvdb *tlv) {
 	root = json_load_file(fname, 0, &error);
 	if (!root) {
 		PrintAndLog("Load params: json error on line %d: %s", error.line, error.text);
-		return false; 
+		return false;
 	}
-	
+
 	if (!json_is_array(root)) {
 		PrintAndLog("Load params: Invalid json format. root must be array.");
-		return false; 
+		return false;
 	}
-	
+
 	PrintAndLog("Load params: json(%d) OK", json_array_size(root));
-	
+
 	for(int i = 0; i < json_array_size(root); i++) {
 		json_t *data, *jtag, *jlength, *jvalue;
 
@@ -334,7 +334,7 @@ bool ParamLoadFromJson(struct tlvdb *tlv) {
 			json_decref(root);
 			return false;
 		}
-		
+
 		jtag = json_object_get(data, "tag");
 		if(!json_is_string(jtag))
 		{
@@ -360,39 +360,39 @@ bool ParamLoadFromJson(struct tlvdb *tlv) {
 			json_decref(root);
 			return false;
 		}
-		
+
 		int tlvLength = json_integer_value(jlength);
 		if (tlvLength > 250) {
 			PrintAndLog("Load params: data [%d] length more than 250", i + 1);
 			json_decref(root);
 			return false;
 		}
-		
+
 		PrintAndLog("TLV param: %s[%d]=%s", tlvTag, tlvLength, tlvValue);
 		uint8_t buf[251] = {0};
 		size_t buflen = 0;
-		
-		if (!HexToBuffer("TLV Error type:", tlvTag, buf, 4, &buflen)) { 
+
+		if (!HexToBuffer("TLV Error type:", tlvTag, buf, 4, &buflen)) {
 			json_decref(root);
 			return false;
 		}
 		tlv_tag_t tag = 0;
 		for (int i = 0; i < buflen; i++) {
 			tag = (tag << 8) | buf[i];
-		}	
-		
+		}
+
 		if (!HexToBuffer("TLV Error value:", tlvValue, buf, sizeof(buf) - 1, &buflen)) {
 			json_decref(root);
 			return false;
 		}
-		
+
 		if (buflen != tlvLength) {
 			PrintAndLog("Load params: data [%d] length of HEX must(%d) be identical to length in TLV param(%d)", i + 1, buflen, tlvLength);
 			json_decref(root);
 			return false;
 		}
-		
-		tlvdb_change_or_add_node(tlv, tag, tlvLength, (const unsigned char *)buf);		
+
+		tlvdb_change_or_add_node(tlv, tag, tlvLength, (const unsigned char *)buf);
 	}
 
 	json_decref(root);
diff --git a/client/emv/test/cda_test.c b/client/emv/test/cda_test.c
index 536a5862b..a029558d6 100644
--- a/client/emv/test/cda_test.c
+++ b/client/emv/test/cda_test.c
@@ -423,7 +423,7 @@ int exec_cda_test(bool verbose)
 {
 	int ret;
 	fprintf(stdout, "\n");
-	
+
 	ret = cda_test_raw(verbose);
 	if (ret) {
 		fprintf(stderr, "CDA raw test: failed\n");
diff --git a/client/emv/test/cda_test.h b/client/emv/test/cda_test.h
index 1d321a26e..8d80043cd 100644
--- a/client/emv/test/cda_test.h
+++ b/client/emv/test/cda_test.h
@@ -13,6 +13,6 @@
  * Lesser General Public License for more details.
  */
 
-#include <stdbool.h> 
- 
+#include <stdbool.h>
+
 extern int exec_cda_test(bool verbose);
diff --git a/client/emv/test/cryptotest.c b/client/emv/test/cryptotest.c
index 4e8df1a25..5d7017f9c 100644
--- a/client/emv/test/cryptotest.c
+++ b/client/emv/test/cryptotest.c
@@ -36,25 +36,25 @@
 int ExecuteCryptoTests(bool verbose) {
 	int res;
 	bool TestFail = false;
-	
+
 	res = mbedtls_mpi_self_test(verbose);
 	if (res) TestFail = true;
-	
+
 	res = mbedtls_aes_self_test(verbose);
 	if (res) TestFail = true;
 
 	res = mbedtls_des_self_test(verbose);
 	if (res) TestFail = true;
-	
+
 	res = mbedtls_sha1_self_test(verbose);
 	if (res) TestFail = true;
 
 	res = mbedtls_md5_self_test(verbose);
 	if (res) TestFail = true;
-	
+
 	res = mbedtls_rsa_self_test(verbose);
 	if (res) TestFail = true;
-	
+
 	res = mbedtls_entropy_self_test(verbose);
 	if (res) TestFail = true;
 
@@ -63,7 +63,7 @@ int ExecuteCryptoTests(bool verbose) {
 
 	res = mbedtls_ctr_drbg_self_test(verbose);
 	if (res) TestFail = true;
-	
+
 	res = mbedtls_base64_self_test(verbose);
 	if (res) TestFail = true;
 
@@ -78,13 +78,13 @@ int ExecuteCryptoTests(bool verbose) {
 
 	res = mbedtls_x509_self_test(verbose);
 	if (res) TestFail = true;
-	
+
 	res = exec_sda_test(verbose);
 	if (res) TestFail = true;
 
 	res = exec_dda_test(verbose);
 	if (res) TestFail = true;
-	
+
 	res = exec_cda_test(verbose);
 	if (res) TestFail = true;
 
@@ -95,12 +95,12 @@ int ExecuteCryptoTests(bool verbose) {
 	if (res) TestFail = true;
 
 	PrintAndLog("\n--------------------------");
-	
+
 	if (TestFail)
 		PrintAndLogEx(FAILED, "\tTest(s) [ %s ]", _RED_(FAIL) );
 	else
 		PrintAndLogEx(SUCCESS, "\tTest(s) [ %s ]", _GREEN_(OK) );
-	
+
 	return TestFail;
 }
 
diff --git a/client/emv/test/dda_test.h b/client/emv/test/dda_test.h
index 354cd7e13..1ae1a0660 100644
--- a/client/emv/test/dda_test.h
+++ b/client/emv/test/dda_test.h
@@ -13,6 +13,6 @@
  * Lesser General Public License for more details.
  */
 
-#include <stdbool.h> 
- 
+#include <stdbool.h>
+
 extern int exec_dda_test(bool verbose);
diff --git a/client/emv/test/sda_test.h b/client/emv/test/sda_test.h
index 43a4c9482..8d47aa9b3 100644
--- a/client/emv/test/sda_test.h
+++ b/client/emv/test/sda_test.h
@@ -12,5 +12,5 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  */
- 
+
 extern int exec_sda_test(bool verbose);
diff --git a/client/emv/tlv.c b/client/emv/tlv.c
index a309d0659..31277c325 100644
--- a/client/emv/tlv.c
+++ b/client/emv/tlv.c
@@ -11,7 +11,7 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * https://github.com/lumag/emv-tools/blob/master/lib/tlv.c
  */
 
@@ -37,8 +37,8 @@
 #define TLV_LEN_INVALID		(~0)
 
 // http://radek.io/2012/11/10/magical-container_of-macro/
-//#define container_of(ptr, type, member) ({			       
-//	const typeof( ((type *)0)->member ) *__mptr = (ptr);	
+//#define container_of(ptr, type, member) ({
+//	const typeof( ((type *)0)->member ) *__mptr = (ptr);
 //        (type *)( (char *)__mptr - offsetof(type,member) );})
 
 struct tlvdb {
@@ -301,14 +301,14 @@ void tlvdb_free(struct tlvdb *tlvdb)
 struct tlvdb *tlvdb_find_next(struct tlvdb *tlvdb, tlv_tag_t tag) {
 	if (!tlvdb)
 		return NULL;
-	
+
 	return tlvdb_find(tlvdb->next, tag);
 }
 
 struct tlvdb *tlvdb_find(struct tlvdb *tlvdb, tlv_tag_t tag) {
 	if (!tlvdb)
 		return NULL;
-	
+
 	for (; tlvdb; tlvdb = tlvdb->next) {
 		if (tlvdb->tag.tag == tag)
 			return tlvdb;
@@ -320,16 +320,16 @@ struct tlvdb *tlvdb_find(struct tlvdb *tlvdb, tlv_tag_t tag) {
 struct tlvdb *tlvdb_find_full(struct tlvdb *tlvdb, tlv_tag_t tag) {
 	if (!tlvdb)
 		return NULL;
-	
+
 	for (; tlvdb; tlvdb = tlvdb->next) {
 		if (tlvdb->tag.tag == tag)
 			return tlvdb;
-		
+
 		if (tlvdb->children) {
 			struct tlvdb * ch = tlvdb_find_full(tlvdb->children, tag);
 			if (ch)
 				return ch;
-		}			
+		}
 	}
 
 	return NULL;
@@ -338,7 +338,7 @@ struct tlvdb *tlvdb_find_full(struct tlvdb *tlvdb, tlv_tag_t tag) {
 struct tlvdb *tlvdb_find_path(struct tlvdb *tlvdb, tlv_tag_t tag[]) {
 	int i = 0;
 	struct tlvdb *tnext = tlvdb;
-	
+
 	while (tnext && tag[i]) {
 		tnext = tlvdb_find(tnext, tag[i]);
 		i++;
@@ -346,7 +346,7 @@ struct tlvdb *tlvdb_find_path(struct tlvdb *tlvdb, tlv_tag_t tag[]) {
 			tnext = tnext->children;
 		}
 	}
-	
+
 	return tnext;
 }
 
@@ -354,11 +354,11 @@ void tlvdb_add(struct tlvdb *tlvdb, struct tlvdb *other)
 {
 	if (tlvdb == other)
 		return;
-	
+
 	while (tlvdb->next) {
 		if (tlvdb->next == other)
 			return;
-		
+
 		tlvdb = tlvdb->next;
 	}
 
@@ -383,20 +383,20 @@ void tlvdb_change_or_add_node_ex(struct tlvdb *tlvdb, tlv_tag_t tag, size_t len,
 		struct tlvdb *tnewelm = tlvdb_fixed(tag, len, value);
 		tnewelm->next = telm->next;
 		tnewelm->parent = telm->parent;
-		
+
 		// if telm stayed first in children chain
 		if (telm->parent && telm->parent->children == telm) {
 			telm->parent->children = tnewelm;
 		}
-		
+
 		// if telm have previous element
 		if (telm != tlvdb) {
 			// elm in root
 			struct tlvdb *celm = tlvdb;
 			// elm in child list of node
 			if (telm->parent && telm->parent->children)
-				celm = telm->parent->children;		
-			
+				celm = telm->parent->children;
+
 			// find previous element
 			for (; celm; celm = celm->next) {
 				if (celm->next == telm) {
@@ -405,15 +405,15 @@ void tlvdb_change_or_add_node_ex(struct tlvdb *tlvdb, tlv_tag_t tag, size_t len,
 				}
 			}
 		}
-		
+
 		// free old element with childrens
 		telm->next = NULL;
 		tlvdb_free(telm);
-		
+
 		if (tlvdb_elm)
 			*tlvdb_elm = tnewelm;
 	}
-	
+
 	return;
 }
 
@@ -557,18 +557,18 @@ struct tlvdb *tlvdb_elm_get_parent(struct tlvdb *tlvdb)
 
 bool tlvdb_get_uint8(struct tlvdb *tlvRoot, tlv_tag_t tag, uint8_t *value)
 {
-	const struct tlv *tlvelm = tlvdb_get(tlvRoot, tag, NULL); 	
+	const struct tlv *tlvelm = tlvdb_get(tlvRoot, tag, NULL);
 	return tlv_get_uint8(tlvelm, value);
 }
 
-bool tlv_get_uint8(const struct tlv *etlv, uint8_t *value) 
+bool tlv_get_uint8(const struct tlv *etlv, uint8_t *value)
 {
 	*value = 0;
 	if (etlv)
 	{
 		if (etlv->len == 0)
 			return true;
-		
+
 		if (etlv->len == 1)
 		{
 			*value = etlv->value[0];
@@ -585,7 +585,7 @@ bool tlv_get_int(const struct tlv *etlv, int *value)
 	{
 		if (etlv->len == 0)
 			return true;
-		
+
 		if (etlv->len <= 4)
 		{
 			for (int i = 0; i < etlv->len; i++)
diff --git a/client/emv/tlv.h b/client/emv/tlv.h
index e75bbf986..7e171c102 100644
--- a/client/emv/tlv.h
+++ b/client/emv/tlv.h
@@ -11,7 +11,7 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * https://github.com/lumag/emv-tools/blob/master/lib/include/openemv/tlv.h
  */
 
diff --git a/client/fido/additional_ca.c b/client/fido/additional_ca.c
index 564eda2ae..ccda7f251 100644
--- a/client/fido/additional_ca.c
+++ b/client/fido/additional_ca.c
@@ -5,7 +5,7 @@
 // at your option, any later version. See the LICENSE.txt file for the text of
 // the license.
 //-----------------------------------------------------------------------------
-// CA PEM certificates 
+// CA PEM certificates
 //-----------------------------------------------------------------------------
 //
 
diff --git a/client/fido/additional_ca.h b/client/fido/additional_ca.h
index 856583039..d0f642e46 100644
--- a/client/fido/additional_ca.h
+++ b/client/fido/additional_ca.h
@@ -5,7 +5,7 @@
 // at your option, any later version. See the LICENSE.txt file for the text of
 // the license.
 //-----------------------------------------------------------------------------
-// CA PEM certificates 
+// CA PEM certificates
 //-----------------------------------------------------------------------------
 //
 
@@ -14,7 +14,7 @@
 
 #include <stddef.h>
 
-// Concatenation of all CA certificates in PEM format if available 
+// Concatenation of all CA certificates in PEM format if available
 extern const char   additional_ca_pem[];
 extern const size_t additional_ca_pem_len;
 
diff --git a/client/fido/cbortools.c b/client/fido/cbortools.c
index 01691dad1..8883ac475 100644
--- a/client/fido/cbortools.c
+++ b/client/fido/cbortools.c
@@ -28,7 +28,7 @@ static CborError dumpelm(CborValue *it, bool *got_next, int nestingLevel) {
 	CborType type = cbor_value_get_type(it);
 	indent(nestingLevel);
 	switch (type) {
-	case CborMapType: 
+	case CborMapType:
 	case CborArrayType: {
 		printf(type == CborArrayType ? "Array[" : "Map[");
 		break;
@@ -67,14 +67,14 @@ static CborError dumpelm(CborValue *it, bool *got_next, int nestingLevel) {
 
 	case CborTagType: {
 		CborTag tag;
-		cbor_value_get_tag(it, &tag);     
+		cbor_value_get_tag(it, &tag);
 		printf("Tag(%lld)", (long long)tag);
 		break;
 	}
 
 	case CborSimpleType: {
 		uint8_t type;
-		cbor_value_get_simple_type(it, &type); 
+		cbor_value_get_simple_type(it, &type);
 		printf("simple(%u)", type);
 		break;
 	}
@@ -118,7 +118,7 @@ static CborError dumpelm(CborValue *it, bool *got_next, int nestingLevel) {
 		printf("CborInvalidType!!!");
 		break;
 	}
-	
+
 	return CborNoError;
 }
 
@@ -131,7 +131,7 @@ static CborError dumprecursive(uint8_t cmdCode, bool isResponse, CborValue *it,
 		bool got_next;
 
 		switch (type) {
-		case CborMapType: 
+		case CborMapType:
 		case CborArrayType: {
 			// recursive type
 			CborValue recursed;
@@ -189,7 +189,7 @@ int TinyCborInit(uint8_t *data, size_t length, CborValue *cb) {
 	CborError err = cbor_parser_init(data, length, 0, &parser, cb);
     if (err)
 		return err;
-	
+
 	return 0;
 }
 
@@ -199,20 +199,20 @@ int TinyCborPrintFIDOPackage(uint8_t cmdCode, bool isResponse, uint8_t *data, si
 	res = TinyCborInit(data, length, &cb);
 	if (res)
 		return res;
-		
+
     CborError err = dumprecursive(cmdCode, isResponse, &cb, false, 0);
 
 	if (err) {
 		fprintf(stderr,
-#if __WORDSIZE == 64		
+#if __WORDSIZE == 64
 		"CBOR parsing failure at offset %" PRId64 " : %s\n",
 #else
-		"CBOR parsing failure at offset %" PRId32 " : %s\n",	
+		"CBOR parsing failure at offset %" PRId32 " : %s\n",
 #endif
 		cb.ptr - data, cbor_error_string(err));
 		return 1;
-	}	
-	
+	}
+
 	return 0;
 }
 
@@ -220,15 +220,15 @@ int JsonObjElmCount(json_t *elm) {
 	int res = 0;
 	const char *key;
 	json_t *value;
-	
+
 	if (!json_is_object(elm))
 		return 0;
-	
+
 	json_object_foreach(elm, key, value) {
 		if (strlen(key) > 0 && key[0] != '.')
-			res++;		
+			res++;
 	}
-	
+
 	return res;
 }
 
@@ -237,7 +237,7 @@ int JsonToCbor(json_t *elm, CborEncoder *encoder) {
 		return 1;
 
 	int res;
-	
+
 	// CBOR map == JSON object
 	if (json_is_object(elm)) {
 		CborEncoder map;
@@ -246,17 +246,17 @@ int JsonToCbor(json_t *elm, CborEncoder *encoder) {
 
 		res = cbor_encoder_create_map(encoder, &map, JsonObjElmCount(elm));
 		cbor_check(res);
-		
+
 		json_object_foreach(elm, key, value) {
 			if (strlen(key) > 0 && key[0] != '.') {
-				res = cbor_encode_text_stringz(&map, key);		
+				res = cbor_encode_text_stringz(&map, key);
 				cbor_check(res);
-				
+
 				// RECURSION!
 				JsonToCbor(value, &map);
 			}
 		}
-		
+
 		res = cbor_encoder_close_container(encoder, &map);
 		cbor_check(res);
 	}
@@ -266,15 +266,15 @@ int JsonToCbor(json_t *elm, CborEncoder *encoder) {
 		size_t index;
 		json_t *value;
 		CborEncoder array;
-		
+
 		res = cbor_encoder_create_array(encoder, &array, json_array_size(elm));
 		cbor_check(res);
-		
+
 		json_array_foreach(elm, index, value) {
 			// RECURSION!
 			JsonToCbor(value, &array);
 		}
-		
+
 		res = cbor_encoder_close_container(encoder, &array);
 		cbor_check(res);
 	}
@@ -304,15 +304,15 @@ int JsonToCbor(json_t *elm, CborEncoder *encoder) {
 				return 100;
 
 			res = cbor_encode_byte_string(encoder, data, datalen);
-			cbor_check(res);			
+			cbor_check(res);
 		} else {
 			res = cbor_encode_text_stringz(encoder, val);
 			cbor_check(res);
 		}
 	}
-	
-	
-	
+
+
+
 	return 0;
 }
 
@@ -324,7 +324,7 @@ int CborMapGetKeyById(CborParser *parser, CborValue *map, uint8_t *data, size_t
 
 	if (cbor_value_get_type(&cb) != CborMapType)
 		return 1;
-		
+
 	err = cbor_value_enter_container(&cb, map);
 	cbor_check(err);
 
@@ -335,10 +335,10 @@ int CborMapGetKeyById(CborParser *parser, CborValue *map, uint8_t *data, size_t
 			return 1;
 
 		cbor_value_get_int64(map, &indx);
-		
+
 		err = cbor_value_advance(map);
 		cbor_check(err);
-		
+
 		if (indx == key)
 			return 0;
 
@@ -361,17 +361,17 @@ CborError CborGetArrayBinStringValueEx(CborValue *elm, uint8_t *data, size_t max
 	CborValue array;
 	if (datalen)
 		*datalen = 0;
-	
+
 	size_t slen = maxdatalen;
 	size_t totallen = 0;
 
 	CborError res = cbor_value_enter_container(elm, &array);
 	cbor_check(res);
-	
+
 	while (!cbor_value_at_end(&array)) {
 		res = cbor_value_copy_byte_string(&array, &data[totallen], &slen, &array);
 		cbor_check(res);
-		
+
 		totallen += slen;
 		if (delimeter) {
 			memcpy(&data[totallen], delimeter, delimeterlen);
@@ -386,13 +386,13 @@ CborError CborGetArrayBinStringValueEx(CborValue *elm, uint8_t *data, size_t max
 	if (datalen)
 		*datalen = totallen;
 
-	return CborNoError;	
+	return CborNoError;
 };
 
 CborError CborGetBinStringValue(CborValue *elm, uint8_t *data, size_t maxdatalen, size_t *datalen) {
 	if (datalen)
 		*datalen = 0;
-	
+
 	size_t slen = maxdatalen;
 
 	CborError res = cbor_value_copy_byte_string(elm, data, &slen, elm);
@@ -401,24 +401,24 @@ CborError CborGetBinStringValue(CborValue *elm, uint8_t *data, size_t maxdatalen
 	if (datalen)
 		*datalen = slen;
 
-	return CborNoError;	
+	return CborNoError;
 };
 
 CborError CborGetArrayStringValue(CborValue *elm, char *data, size_t maxdatalen, size_t *datalen, char *delimeter) {
 	CborValue array;
 	if (datalen)
 		*datalen = 0;
-	
+
 	size_t slen = maxdatalen;
 	size_t totallen = 0;
 
 	CborError res = cbor_value_enter_container(elm, &array);
 	cbor_check(res);
-	
+
 	while (!cbor_value_at_end(&array)) {
 		res = cbor_value_copy_text_string(&array, &data[totallen], &slen, &array);
 		cbor_check(res);
-		
+
 		totallen += slen;
 		if (delimeter) {
 			strcat(data, delimeter);
@@ -434,13 +434,13 @@ CborError CborGetArrayStringValue(CborValue *elm, char *data, size_t maxdatalen,
 	if (datalen)
 		*datalen = totallen;
 
-	return CborNoError;	
+	return CborNoError;
 };
 
 CborError CborGetStringValue(CborValue *elm, char *data, size_t maxdatalen, size_t *datalen) {
 	if (datalen)
 		*datalen = 0;
-	
+
 	size_t slen = maxdatalen;
 
 	CborError res = cbor_value_copy_text_string(elm, data, &slen, elm);
@@ -449,13 +449,13 @@ CborError CborGetStringValue(CborValue *elm, char *data, size_t maxdatalen, size
 	if (datalen)
 		*datalen = slen;
 
-	return CborNoError;	
+	return CborNoError;
 };
 
 CborError CborGetStringValueBuf(CborValue *elm) {
 	static char stringBuf[2048];
 	memset(stringBuf, 0x00, sizeof(stringBuf));
-	
+
 	return CborGetStringValue(elm, stringBuf, sizeof(stringBuf), NULL);
 };
 
@@ -465,10 +465,10 @@ int CBOREncodeElm(json_t *root, char *rootElmId, CborEncoder *encoder) {
 		elm = json_path_get(root, rootElmId);
 	else
 		elm = json_object_get(root, rootElmId);
-	
+
 	if (!elm)
 		return 1;
-	
+
 	int res = JsonToCbor(elm, encoder);
 
 	return res;
@@ -479,11 +479,11 @@ CborError CBOREncodeClientDataHash(json_t *root, CborEncoder *encoder) {
 	size_t jlen;
 
 	JsonLoadBufAsHex(root, "$.ClientDataHash", buf, sizeof(buf), &jlen);
-	
+
 	// fill with 0x00 if not found
 	if (!jlen)
 		jlen = 32;
-	
+
 	int res = cbor_encode_byte_string(encoder, buf, jlen);
 	cbor_check(res);
 
diff --git a/client/fido/cose.c b/client/fido/cose.c
index e45f46290..86c016314 100644
--- a/client/fido/cose.c
+++ b/client/fido/cose.c
@@ -22,13 +22,13 @@ typedef struct {
 	char *Name;
 	char *Description;
 } COSEValueNameDesc_t;
- 
+
 typedef struct {
 	int Value;
 	char *Type;
 	char *Name;
 	char *Description;
-} COSEValueTypeNameDesc_t; 
+} COSEValueTypeNameDesc_t;
 
 // kty - Key Type Values
 COSEValueNameDesc_t COSEKeyTypeValueDesc[] = {
@@ -141,7 +141,7 @@ COSEValueNameDesc_t *GetCOSEAlgElm(int id) {
 			return &COSEAlg[i];
 	return NULL;
 }
-	
+
 const char *GetCOSEAlgName(int id) {
 	COSEValueNameDesc_t *elm = GetCOSEAlgElm(id);
 	if (elm)
@@ -164,11 +164,11 @@ int COSEGetECDSAKey(uint8_t *data, size_t datalen, bool verbose, uint8_t *public
 
 	if(verbose)
 		PrintAndLog("----------- CBOR decode ----------------");
-	
+
 	// kty
 	int res = CborMapGetKeyById(&parser, &map, data, datalen, 1);
 	if(!res) {
-		cbor_value_get_int64(&map, &i64);    
+		cbor_value_get_int64(&map, &i64);
 		if(verbose)
 			PrintAndLog("kty [%lld] %s", (long long)i64, GetCOSEktyDescription(i64));
 		if (i64 != 2)
@@ -178,26 +178,26 @@ int COSEGetECDSAKey(uint8_t *data, size_t datalen, bool verbose, uint8_t *public
 	// algorithm
 	res = CborMapGetKeyById(&parser, &map, data, datalen, 3);
 	if(!res) {
-		cbor_value_get_int64(&map, &i64);    
+		cbor_value_get_int64(&map, &i64);
 		if(verbose)
 			PrintAndLog("algorithm [%lld] %s", (long long)i64, GetCOSEAlgDescription(i64));
 		if (i64 != -7)
 			PrintAndLog("ERROR: algorithm must be -7.");
 	}
-	
+
 	// curve
 	res = CborMapGetKeyById(&parser, &map, data, datalen, -1);
 	if(!res) {
-		cbor_value_get_int64(&map, &i64);    
+		cbor_value_get_int64(&map, &i64);
 		if(verbose)
 			PrintAndLog("curve [%lld] %s", (long long)i64, GetCOSECurveDescription(i64));
 		if (i64 != 1)
 			PrintAndLog("ERROR: curve must be 1.");
 	}
-	
+
 	// plain key
 	public_key[0] = 0x04;
-	
+
 	// x - coordinate
 	res = CborMapGetKeyById(&parser, &map, data, datalen, -2);
 	if(!res) {
@@ -229,10 +229,10 @@ int COSEGetECDSAKey(uint8_t *data, size_t datalen, bool verbose, uint8_t *public
 		if(verbose)
 			PrintAndLog("d - private key [%d]: %s", len, sprint_hex(private_key, len));
 	}
-	
+
 	if(verbose)
 		PrintAndLog("----------- CBOR decode ----------------");
-	
+
 	return 0;
 }
 
diff --git a/client/fido/fidocore.c b/client/fido/fidocore.c
index 49088ec28..a91a57d8f 100644
--- a/client/fido/fidocore.c
+++ b/client/fido/fidocore.c
@@ -101,7 +101,7 @@ fido2Desc_t fido2CmdGetInfoRespDesc[] = {
 	{fido2CmdMakeCredential, 	ptQuery,    0x07, "options"},
 	{fido2CmdMakeCredential, 	ptQuery,    0x08, "pinAuth"},
 	{fido2CmdMakeCredential, 	ptQuery,    0x09, "pinProtocol"},
-	
+
 	{fido2CmdGetAssertion, 		ptResponse, 0x01, "credential"},
 	{fido2CmdGetAssertion, 		ptResponse, 0x02, "authData"},
 	{fido2CmdGetAssertion, 		ptResponse, 0x03, "signature"},
@@ -115,12 +115,12 @@ fido2Desc_t fido2CmdGetInfoRespDesc[] = {
 	{fido2CmdGetAssertion, 		ptQuery,    0x05, "options"},
 	{fido2CmdGetAssertion, 		ptQuery,    0x06, "pinAuth"},
 	{fido2CmdGetAssertion, 		ptQuery,    0x07, "pinProtocol"},
-	
+
 	{fido2CmdGetNextAssertion, 	ptResponse, 0x01, "credential"},
 	{fido2CmdGetNextAssertion, 	ptResponse, 0x02, "authData"},
 	{fido2CmdGetNextAssertion, 	ptResponse, 0x03, "signature"},
 	{fido2CmdGetNextAssertion, 	ptResponse, 0x04, "publicKeyCredentialUserEntity"},
-	
+
 	{fido2CmdGetInfo, 			ptResponse, 0x01, "versions"},
 	{fido2CmdGetInfo, 			ptResponse, 0x02, "extensions"},
 	{fido2CmdGetInfo, 			ptResponse, 0x03, "aaguid"},
@@ -140,7 +140,7 @@ fido2Desc_t fido2CmdGetInfoRespDesc[] = {
 	{fido2CmdClientPIN, 		ptQuery,    0x06, "pinHashEnc"},
 	{fido2CmdClientPIN, 		ptQuery,    0x07, "getKeyAgreement"},
 	{fido2CmdClientPIN, 		ptQuery,    0x08, "getRetries"},
-	
+
 	{fido2COSEKey,		 		ptResponse, 0x01, "kty"},
 	{fido2COSEKey,		 		ptResponse, 0x03, "alg"},
 	{fido2COSEKey,		 		ptResponse,   -1, "crv"},
@@ -153,7 +153,7 @@ char *fido2GetCmdErrorDescription(uint8_t errorCode) {
 	for (int i = 0; i < sizeof(fido2Errors) / sizeof(fido2Error_t); i++)
 		if (fido2Errors[i].ErrorCode == errorCode)
 			return fido2Errors[i].Description;
-		
+
 	return fido2Errors[0].Description;
 }
 
@@ -169,7 +169,7 @@ char *fido2GetCmdMemberDescription(uint8_t cmdCode, bool isResponse, int memberN
 
 int FIDOSelect(bool ActivateField, bool LeaveFieldON, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
 	uint8_t data[] = {0xA0, 0x00, 0x00, 0x06, 0x47, 0x2F, 0x00, 0x01};
-	
+
 	return EMVSelect(ECC_CONTACTLESS, ActivateField, LeaveFieldON, data, sizeof(data), Result, MaxResultLen, ResultLen, sw, NULL);
 }
 
@@ -183,9 +183,9 @@ int FIDOExchange(sAPDU apdu, uint8_t *Result, size_t MaxResultLen, size_t *Resul
 		res = EMVExchange(ECC_CONTACTLESS, true, (sAPDU){0x00, 0xC0, 0x00, 0x00, 0x00, NULL}, &Result[oldlen], MaxResultLen - oldlen, ResultLen, sw, NULL);
 		if (res == 5) // apdu result (sw) not a 0x9000
 			res = 0;
-		
+
 		*ResultLen += oldlen;
-		if (*ResultLen > MaxResultLen) 
+		if (*ResultLen > MaxResultLen)
 			return 100;
 	}
 	return res;
@@ -220,7 +220,7 @@ int FIDO2GetAssertion(uint8_t *params, uint8_t paramslen, uint8_t *Result, size_
 
 int FIDOCheckDERAndGetKey(uint8_t *der, size_t derLen, bool verbose, uint8_t *publicKey, size_t publicKeyMaxLen) {
 	int res;
-	
+
 	// load CA's
 	mbedtls_x509_crt cacert;
 	mbedtls_x509_crt_init(&cacert);
@@ -228,9 +228,9 @@ int FIDOCheckDERAndGetKey(uint8_t *der, size_t derLen, bool verbose, uint8_t *pu
 	if (res < 0) {
 		PrintAndLog("ERROR: CA parse certificate returned -0x%x - %s", -res, ecdsa_get_error(res));
 	}
-	if (verbose) 
+	if (verbose)
 		PrintAndLog("CA load OK. %d skipped", res);
-	
+
 	// load DER certificate from authenticator's data
 	mbedtls_x509_crt cert;
 	mbedtls_x509_crt_init(&cert);
@@ -238,14 +238,14 @@ int FIDOCheckDERAndGetKey(uint8_t *der, size_t derLen, bool verbose, uint8_t *pu
 	if (res) {
 		PrintAndLog("ERROR: DER parse returned 0x%x - %s", (res<0)?-res:res, ecdsa_get_error(res));
 	}
-	
+
 	// get certificate info
 	char linfo[300] = {0};
 	if (verbose) {
 		mbedtls_x509_crt_info(linfo, sizeof(linfo), "  ", &cert);
 		PrintAndLog("DER certificate info:\n%s", linfo);
 	}
-	
+
 	// verify certificate
 	uint32_t verifyflags = 0;
 	res = mbedtls_x509_crt_verify(&cert, &cacert, NULL, NULL, &verifyflags, NULL, NULL);
@@ -254,13 +254,13 @@ int FIDOCheckDERAndGetKey(uint8_t *der, size_t derLen, bool verbose, uint8_t *pu
 	} else {
 		PrintAndLog("Certificate OK.\n");
 	}
-	
+
 	if (verbose) {
 		memset(linfo, 0x00, sizeof(linfo));
 		mbedtls_x509_crt_verify_info(linfo, sizeof(linfo), "  ", verifyflags);
 		PrintAndLog("Verification info:\n%s", linfo);
 	}
-	
+
 	// get public key
 	res = ecdsa_public_key_from_pk(&cert.pk, publicKey, publicKeyMaxLen);
 	if (res) {
@@ -275,7 +275,7 @@ int FIDOCheckDERAndGetKey(uint8_t *der, size_t derLen, bool verbose, uint8_t *pu
 
 	mbedtls_x509_crt_free(&cert);
 	mbedtls_x509_crt_free(&cacert);
-	
+
 	return 0;
 }
 
@@ -291,7 +291,7 @@ int FIDO2CreateMakeCredentionalReq(json_t *root, uint8_t *data, size_t maxdatale
 	int res;
 	CborEncoder encoder;
 	CborEncoder map;
-	
+
 	cbor_encoder_init(&encoder, data, maxdatalen, 0);
 
 	// create main map
@@ -334,31 +334,31 @@ int FIDO2CreateMakeCredentionalReq(json_t *root, uint8_t *data, size_t maxdatale
 	}
 	res = cbor_encoder_close_container(&encoder, &map);
 	fido_check(res);
-	
+
 	size_t len = cbor_encoder_get_buffer_size(&encoder, data);
 	if (datalen)
 		*datalen = len;
-	
+
 	return 0;
 }
 
 bool CheckrpIdHash(json_t *json, uint8_t *hash) {
 	char hashval[300] = {0};
 	uint8_t hash2[32] = {0};
-	
+
 	JsonLoadStr(json, "$.RelyingPartyEntity.id", hashval);
 	int res = sha256hash((uint8_t *)hashval, strlen(hashval), hash2);
 	if (res)
 		return false;
-	
+
 	return !memcmp(hash, hash2, 32);
 }
 
 // check ANSI X9.62 format ECDSA signature (on P-256)
 int FIDO2CheckSignature(json_t *root, uint8_t *publickey, uint8_t *sign, size_t signLen, uint8_t *authData, size_t authDataLen, bool verbose) {
 	int res;
-	uint8_t rval[300] = {0}; 
-	uint8_t sval[300] = {0}; 
+	uint8_t rval[300] = {0};
+	uint8_t sval[300] = {0};
 	res = ecdsa_asn1_get_signature(sign, signLen, rval, sval);
 	if (!res) {
 		if (verbose) {
@@ -372,12 +372,12 @@ int FIDO2CheckSignature(json_t *root, uint8_t *publickey, uint8_t *sign, size_t
 		if (res || clientDataHashLen != 32) {
 			PrintAndLog("ERROR: Can't get clientDataHash from json!");
 			return 2;
-		}			
-		
+		}
+
 		uint8_t xbuf[4096] = {0};
 		size_t xbuflen = 0;
 		res = FillBuffer(xbuf, sizeof(xbuf), &xbuflen,
-			authData, authDataLen,  // rpIdHash[32] + flags[1] + signCount[4] 
+			authData, authDataLen,  // rpIdHash[32] + flags[1] + signCount[4]
 			clientDataHash, 32,     // Hash of the serialized client data. "$.ClientDataHash" from json
 			NULL, 0);
 		//PrintAndLog("--xbuf(%d)[%d]: %s", res, xbuflen, sprint_hex(xbuf, xbuflen));
@@ -391,12 +391,12 @@ int FIDO2CheckSignature(json_t *root, uint8_t *publickey, uint8_t *sign, size_t
 			return res;
 		} else {
 			PrintAndLog("Signature is OK.");
-		}	
+		}
 	} else {
 		PrintAndLog("Invalid signature. res=%d.", res);
 		return res;
 	}
-	
+
 	return 0;
 }
 
@@ -407,37 +407,37 @@ int FIDO2MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, b
 	char *buf;
 	uint8_t *ubuf;
 	size_t n;
-	
+
 	// fmt
 	res = CborMapGetKeyById(&parser, &map, data, dataLen, 1);
 	if (res)
 		return res;
-	
+
 	res = cbor_value_dup_text_string(&map, &buf, &n, &map);
 	cbor_check(res);
 	PrintAndLog("format: %s", buf);
 	free(buf);
 
 	// authData
-	uint8_t authData[400] = {0}; 
+	uint8_t authData[400] = {0};
 	size_t authDataLen = 0;
 	res = CborMapGetKeyById(&parser, &map, data, dataLen, 2);
 	if (res)
 		return res;
 	res = cbor_value_dup_byte_string(&map, &ubuf, &n, &map);
 	cbor_check(res);
-	
+
 	authDataLen = n;
-	memcpy(authData, ubuf, authDataLen); 
-	
+	memcpy(authData, ubuf, authDataLen);
+
 	if (verbose2) {
 		PrintAndLog("authData[%d]: %s", n, sprint_hex_inrow(authData, authDataLen));
 	} else {
 		PrintAndLog("authData[%d]: %s...", n, sprint_hex(authData, MIN(authDataLen, 16)));
 	}
-	
+
 	PrintAndLog("RP ID Hash: %s", sprint_hex(ubuf, 32));
-	
+
 	// check RP ID Hash
 	if (CheckrpIdHash(root, ubuf)) {
 		PrintAndLog("rpIdHash OK.");
@@ -460,17 +460,17 @@ int FIDO2MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, b
 	uint32_t cntr =  (uint32_t)bytes_to_num(&ubuf[33], 4);
 	PrintAndLog("Counter: %d", cntr);
 	JsonSaveInt(root, "$.AppData.Counter", cntr);
-	
+
 	// attestation data
 	PrintAndLog("AAGUID: %s", sprint_hex(&ubuf[37], 16));
 	JsonSaveBufAsHexCompact(root, "$.AppData.AAGUID", &ubuf[37], 16);
-	
+
 	// Credential ID
 	uint8_t cridlen = (uint16_t)bytes_to_num(&ubuf[53], 2);
 	PrintAndLog("Credential id[%d]: %s", cridlen, sprint_hex_inrow(&ubuf[55], cridlen));
 	JsonSaveInt(root, "$.AppData.CredentialIdLen", cridlen);
 	JsonSaveBufAsHexCompact(root, "$.AppData.CredentialId", &ubuf[55], cridlen);
-	
+
 	//Credentional public key (COSE_KEY)
 	uint8_t coseKey[65] = {0};
 	uint16_t cplen = n - 55 - cridlen;
@@ -480,14 +480,14 @@ int FIDO2MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, b
 		PrintAndLog("Credentional public key (COSE_KEY)[%d]: %s...", cplen, sprint_hex(&ubuf[55 + cridlen], MIN(cplen, 16)));
 	}
 	JsonSaveBufAsHexCompact(root, "$.AppData.COSE_KEY", &ubuf[55 + cridlen], cplen);
-	
+
 	if (showCBOR) {
 		PrintAndLog("COSE structure:");
 		PrintAndLog("---------------- CBOR ------------------");
-		TinyCborPrintFIDOPackage(fido2COSEKey, true, &ubuf[55 + cridlen], cplen);		
+		TinyCborPrintFIDOPackage(fido2COSEKey, true, &ubuf[55 + cridlen], cplen);
 		PrintAndLog("---------------- CBOR ------------------");
 	}
-	
+
 	res = COSEGetECDSAKey(&ubuf[55 + cridlen], cplen, verbose, coseKey);
 	if (res) {
 		PrintAndLog("ERROR: Can't get COSE_KEY.");
@@ -497,27 +497,27 @@ int FIDO2MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, b
 	}
 
 	free(ubuf);
-	
+
 	// attStmt - we are check only as DER certificate
 	int64_t alg = 0;
 	uint8_t sign[128] = {0};
 	size_t signLen = 0;
 	uint8_t der[4097] = {0};
 	size_t derLen = 0;
-	
+
 	res = CborMapGetKeyById(&parser, &map, data, dataLen, 3);
 	if (res)
 		return res;
 
 	res = cbor_value_enter_container(&map, &mapsmt);
 	cbor_check(res);
-	
+
 	while (!cbor_value_at_end(&mapsmt)) {
 		char key[100] = {0};
 		res = CborGetStringValue(&mapsmt, key, sizeof(key), &n);
 		cbor_check(res);
 		if (!strcmp(key, "alg")) {
-			cbor_value_get_int64(&mapsmt, &alg);    
+			cbor_value_get_int64(&mapsmt, &alg);
 			PrintAndLog("Alg [%lld] %s", (long long)alg, GetCOSEAlgDescription(alg));
 			res = cbor_value_advance_fixed(&mapsmt);
 			cbor_check(res);
@@ -544,11 +544,11 @@ int FIDO2MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, b
 				PrintAndLog("DER [%d]: %s...", derLen, sprint_hex(der, MIN(derLen, 16)));
 			}
 				JsonSaveBufAsHexCompact(root, "$.AppData.DER", der, derLen);
-		}		
+		}
 	}
 	res = cbor_value_leave_container(&map, &mapsmt);
 	cbor_check(res);
-	
+
 	uint8_t public_key[65] = {0};
 
 	// print DER certificate in TLV view
@@ -562,7 +562,7 @@ int FIDO2MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, b
 
 	// check ANSI X9.62 format ECDSA signature (on P-256)
 	FIDO2CheckSignature(root, public_key, sign, signLen, authData, authDataLen, verbose);
-	
+
 	return 0;
 }
 
@@ -575,7 +575,7 @@ int FIDO2CreateGetAssertionReq(json_t *root, uint8_t *data, size_t maxdatalen, s
 	int res;
 	CborEncoder encoder;
 	CborEncoder map, array, mapint;
-	
+
 	cbor_encoder_init(&encoder, data, maxdatalen, 0);
 
 	// create main map
@@ -605,15 +605,15 @@ int FIDO2CreateGetAssertionReq(json_t *root, uint8_t *data, size_t maxdatalen, s
 					fido_check_if(res) {
 						res = cbor_encode_text_stringz(&mapint, "type");
 						fido_check(res);
-						
+
 						res = cbor_encode_text_stringz(&mapint, "public-key");
-						fido_check(res);					
-						
+						fido_check(res);
+
 						res = cbor_encode_text_stringz(&mapint, "id");
-						fido_check(res);					
-						
+						fido_check(res);
+
 						res = CBOREncodeElm(root, "$.AppData.CredentialId", &mapint);
-						fido_check(res);					
+						fido_check(res);
 					}
 					res = cbor_encoder_close_container(&array, &mapint);
 					fido_check(res);
@@ -632,11 +632,11 @@ int FIDO2CreateGetAssertionReq(json_t *root, uint8_t *data, size_t maxdatalen, s
 	}
 	res = cbor_encoder_close_container(&encoder, &map);
 	fido_check(res);
-	
+
 	size_t len = cbor_encoder_get_buffer_size(&encoder, data);
 	if (datalen)
 		*datalen = len;
-	
+
 	return 0;
 }
 
@@ -646,7 +646,7 @@ int FIDO2GetAssertionParseRes(json_t *root, uint8_t *data, size_t dataLen, bool
 	int res;
 	uint8_t *ubuf;
 	size_t n;
-	
+
 	// credential
 	res = CborMapGetKeyById(&parser, &map, data, dataLen, 1);
 	if (res)
@@ -654,7 +654,7 @@ int FIDO2GetAssertionParseRes(json_t *root, uint8_t *data, size_t dataLen, bool
 
 	res = cbor_value_enter_container(&map, &mapint);
 	cbor_check(res);
-	
+
 	while (!cbor_value_at_end(&mapint)) {
 		char key[100] = {0};
 		res = CborGetStringValue(&mapint, key, sizeof(key), &n);
@@ -676,27 +676,27 @@ int FIDO2GetAssertionParseRes(json_t *root, uint8_t *data, size_t dataLen, bool
 	}
 	res = cbor_value_leave_container(&map, &mapint);
 	cbor_check(res);
-	
+
 	// authData
-	uint8_t authData[400] = {0}; 
+	uint8_t authData[400] = {0};
 	size_t authDataLen = 0;
 	res = CborMapGetKeyById(&parser, &map, data, dataLen, 2);
 	if (res)
 		return res;
 	res = cbor_value_dup_byte_string(&map, &ubuf, &n, &map);
 	cbor_check(res);
-	
+
 	authDataLen = n;
-	memcpy(authData, ubuf, authDataLen); 
-	
+	memcpy(authData, ubuf, authDataLen);
+
 	if (verbose2) {
 		PrintAndLog("authData[%d]: %s", n, sprint_hex_inrow(authData, authDataLen));
 	} else {
 		PrintAndLog("authData[%d]: %s...", n, sprint_hex(authData, MIN(authDataLen, 16)));
 	}
-	
+
 	PrintAndLog("RP ID Hash: %s", sprint_hex(ubuf, 32));
-	
+
 	// check RP ID Hash
 	if (CheckrpIdHash(root, ubuf)) {
 		PrintAndLog("rpIdHash OK.");
@@ -719,17 +719,17 @@ int FIDO2GetAssertionParseRes(json_t *root, uint8_t *data, size_t dataLen, bool
 	uint32_t cntr =  (uint32_t)bytes_to_num(&ubuf[33], 4);
 	PrintAndLog("Counter: %d", cntr);
 	JsonSaveInt(root, "$.AppData.Counter", cntr);
-	
+
 	free(ubuf);
 
 	// publicKeyCredentialUserEntity
 	res = CborMapGetKeyById(&parser, &map, data, dataLen, 4);
-	if (res) {	
+	if (res) {
 		PrintAndLog("UserEntity n/a");
 	} else {
 		res = cbor_value_enter_container(&map, &mapint);
 		cbor_check(res);
-		
+
 		while (!cbor_value_at_end(&mapint)) {
 			char key[100] = {0};
 			res = CborGetStringValue(&mapint, key, sizeof(key), &n);
@@ -747,7 +747,7 @@ int FIDO2GetAssertionParseRes(json_t *root, uint8_t *data, size_t dataLen, bool
 				res = CborGetBinStringValue(&mapint, cid, sizeof(cid), &n);
 				cbor_check(res);
 				PrintAndLog("UserEntity id [%d]: %s", n, sprint_hex(cid, n));
-				
+
 				// check
 				uint8_t idbuf[100] = {0};
 				size_t idbuflen;
@@ -764,15 +764,15 @@ int FIDO2GetAssertionParseRes(json_t *root, uint8_t *data, size_t dataLen, bool
 		res = cbor_value_leave_container(&map, &mapint);
 		cbor_check(res);
 	}
-	
-	
+
+
 	// signature
 	res = CborMapGetKeyById(&parser, &map, data, dataLen, 3);
 	if (res)
 		return res;
 	res = cbor_value_dup_byte_string(&map, &ubuf, &n, &map);
 	cbor_check(res);
-	
+
 	uint8_t *sign = ubuf;
 	size_t signLen = n;
 
@@ -787,7 +787,7 @@ int FIDO2GetAssertionParseRes(json_t *root, uint8_t *data, size_t dataLen, bool
 	uint8_t PublicKey[65] = {0};
 	size_t PublicKeyLen = 0;
 	JsonLoadBufAsHex(root, "$.AppData.COSEPublicKey", PublicKey, 65, &PublicKeyLen);
-	
+
 	// check ANSI X9.62 format ECDSA signature (on P-256)
 	FIDO2CheckSignature(root, PublicKey, sign, signLen, authData, authDataLen, verbose);
 
@@ -799,9 +799,9 @@ int FIDO2GetAssertionParseRes(json_t *root, uint8_t *data, size_t dataLen, bool
 		PrintAndLog("numberOfCredentials: 1 by default");
 	} else {
 		int64_t numberOfCredentials = 0;
-		cbor_value_get_int64(&map, &numberOfCredentials);    
+		cbor_value_get_int64(&map, &numberOfCredentials);
 		PrintAndLog("numberOfCredentials: %lld", (long long)numberOfCredentials);
 	}
-	
+
 	return 0;
 }
diff --git a/client/fido/fidocore.h b/client/fido/fidocore.h
index b0b50e2ac..931cf146b 100644
--- a/client/fido/fidocore.h
+++ b/client/fido/fidocore.h
@@ -25,7 +25,7 @@ typedef enum {
 	fido2CmdClientPIN			= 0x06,
 	fido2CmdReset				= 0x07,
 	fido2CmdGetNextAssertion	= 0x08,
-	
+
 	// another data
 	fido2COSEKey                = 0xF0
 } fido2Commands;
diff --git a/client/flasher.c b/client/flasher.c
index a20b264b9..c1ec7b4f1 100644
--- a/client/flasher.c
+++ b/client/flasher.c
@@ -39,13 +39,13 @@ static void usage(char *argv0) {
 	fprintf(stdout, "Usage:   %s <port> [-b] image.elf [image.elf...]\n\n", argv0);
 	fprintf(stdout, "\t-b\tEnable flashing of bootloader area (DANGEROUS)\n\n");
 	fprintf(stdout, "\nExample:\n\n\t %s "SERIAL_PORT_H" armsrc/obj/fullimage.elf\n", argv0);
-#ifdef __linux__	
+#ifdef __linux__
 	fprintf(stdout, "\nNote (Linux): if the flasher gets stuck in 'Waiting for Proxmark to reappear on <DEVICE>',\n");
 	fprintf(stdout, "              you need to blacklist proxmark for modem-manager - see wiki for more details:\n\n");
 	fprintf(stdout, "              https://github.com/Proxmark/proxmark3/wiki/Gentoo Linux\n\n");
 	fprintf(stdout, "              https://github.com/Proxmark/proxmark3/wiki/Ubuntu Linux\n\n");
 	fprintf(stdout, "              https://github.com/Proxmark/proxmark3/wiki/OSX\n\n");
-#endif	
+#endif
 }
 
 int main(int argc, char **argv) {
@@ -78,7 +78,7 @@ int main(int argc, char **argv) {
 			num_files++;
 		}
 	}
-	
+
 	char* serial_port_name = argv[1];
 
 	if (!OpenProxmark(serial_port_name, true, 60, true)) {
diff --git a/client/fpga_compress.c b/client/fpga_compress.c
index 6e6e67be4..1f959fa9f 100644
--- a/client/fpga_compress.c
+++ b/client/fpga_compress.c
@@ -27,18 +27,18 @@
 #define COMPRESS_LEVEL			9		// use best possible compression
 #define COMPRESS_WINDOW_BITS	15		// default = max = 15 for a window of 2^15 = 32KBytes
 #define COMPRESS_MEM_LEVEL		9		// determines the amount of memory allocated during compression. Default = 8.
-/* COMPRESS_STRATEGY can be 
-	Z_DEFAULT_STRATEGY (the default), 
+/* COMPRESS_STRATEGY can be
+	Z_DEFAULT_STRATEGY (the default),
 	Z_FILTERED (more huffmann, less string matching),
 	Z_HUFFMAN_ONLY (huffman only, no string matching)
 	Z_RLE (distances limited to one)
 	Z_FIXED (prevents the use of dynamic Huffman codes)
-*/	
+*/
 
 #define	COMPRESS_STRATEGY		Z_DEFAULT_STRATEGY
 // zlib tuning parameters:
 #define COMPRESS_GOOD_LENGTH		258
-#define	COMPRESS_MAX_LAZY			258	
+#define	COMPRESS_MAX_LAZY			258
 #define	COMPRESS_MAX_NICE_LENGTH	258
 #define	COMPRESS_MAX_CHAIN			8192
 
@@ -75,7 +75,7 @@ static bool all_feof(FILE *infile[], uint8_t num_infiles)
 		if (!feof(infile[i])) {
 			return false;
 		}
-	}	
+	}
 	return true;
 }
 
@@ -92,21 +92,21 @@ int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile, bool hardn
 		fpga_config = calloc(num_infiles * HARDNESTED_TABLE_SIZE, sizeof(uint8_t));
 	} else {
 		fpga_config = calloc(num_infiles * FPGA_CONFIG_SIZE, sizeof(uint8_t));
-	}		
+	}
 	// read the input files. Interleave them into fpga_config[]
 	i = 0;
 	do {
 
 		if (i >= num_infiles * (hardnested_mode ? HARDNESTED_TABLE_SIZE : FPGA_CONFIG_SIZE)) {
 			if (hardnested_mode) {
-				fprintf(stderr, 
-#if __WORDSIZE == 64		
+				fprintf(stderr,
+#if __WORDSIZE == 64
 				"Input file too big (> %" PRIu64 " bytes). This is probably not a hardnested bitflip state table.\n"
 #else
-				"Input file too big (> %lu bytes). This is probably not a hardnested bitflip state table.\n"	
-#endif				
+				"Input file too big (> %lu bytes). This is probably not a hardnested bitflip state table.\n"
+#endif
 				, HARDNESTED_TABLE_SIZE);
-				
+
 			} else {
 				fprintf(stderr, "Input files too big (total > %lu bytes). These are probably not PM3 FPGA config files.\n", num_infiles * FPGA_CONFIG_SIZE);
 			}
@@ -136,8 +136,8 @@ int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile, bool hardn
 	compressed_fpga_stream.zalloc = fpga_deflate_malloc;
 	compressed_fpga_stream.zfree = fpga_deflate_free;
 	compressed_fpga_stream.opaque = Z_NULL;
-	
-	ret = deflateInit2(&compressed_fpga_stream, 
+
+	ret = deflateInit2(&compressed_fpga_stream,
 						COMPRESS_LEVEL,
 						Z_DEFLATED,
 						COMPRESS_WINDOW_BITS,
@@ -149,7 +149,7 @@ int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile, bool hardn
 	uint8_t *outbuf = calloc(outsize_max, sizeof(uint8_t));
 	compressed_fpga_stream.next_out = outbuf;
 	compressed_fpga_stream.avail_out = outsize_max;
-					
+
 	if (ret == Z_OK) {
 		ret = deflateTune(&compressed_fpga_stream,
 							COMPRESS_GOOD_LENGTH,
@@ -157,11 +157,11 @@ int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile, bool hardn
 							COMPRESS_MAX_NICE_LENGTH,
 							COMPRESS_MAX_CHAIN);
 	}
-	
+
 	if (ret == Z_OK) {
 		ret = deflate(&compressed_fpga_stream, Z_FINISH);
 	}
-	
+
 	fprintf(stdout, "compressed %u input bytes to %lu output bytes\n", i, compressed_fpga_stream.total_out);
 
 	if (ret != Z_STREAM_END) {
@@ -176,10 +176,10 @@ int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile, bool hardn
 		free(fpga_config);
 		return(EXIT_FAILURE);
 		}
-		
+
 	for (i = 0; i < compressed_fpga_stream.total_out; i++) {
 		fputc(outbuf[i], outfile);
-	}	
+	}
 
 	free(outbuf);
 	deflateEnd(&compressed_fpga_stream);
@@ -189,9 +189,9 @@ int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile, bool hardn
 	fclose(outfile);
 	free(infile);
 	free(fpga_config);
-	
+
 	return(EXIT_SUCCESS);
-	
+
 }
 
 
@@ -201,7 +201,7 @@ int zlib_decompress(FILE *infile, FILE *outfile)
 	uint8_t outbuf[DECOMPRESS_BUF_SIZE];
 	uint8_t inbuf[DECOMPRESS_BUF_SIZE];
 	int32_t ret;
-	
+
 	z_stream compressed_fpga_stream;
 
 	// initialize zlib structures
@@ -212,9 +212,9 @@ int zlib_decompress(FILE *infile, FILE *outfile)
 	compressed_fpga_stream.zalloc = fpga_deflate_malloc;
 	compressed_fpga_stream.zfree = fpga_deflate_free;
 	compressed_fpga_stream.opaque = Z_NULL;
-	
+
 	ret = inflateInit2(&compressed_fpga_stream, 0);
-	
+
 	do {
 		if (compressed_fpga_stream.avail_in == 0) {
 			compressed_fpga_stream.next_in = inbuf;
@@ -260,7 +260,7 @@ int zlib_decompress(FILE *infile, FILE *outfile)
 		fclose(infile);
 		return(EXIT_FAILURE);
 	}
-	
+
 }
 
 
@@ -319,7 +319,7 @@ static int FpgaGatherVersion(FILE *infile, char* infile_name, char *dst, int len
 {
 	unsigned int fpga_info_len;
 	char tempstr[40] = {0x00};
-	
+
 	dst[0] = '\0';
 
 	for (uint16_t i = 0; i < FPGA_BITSTREAM_FIXED_HEADER_SIZE; i++) {
@@ -345,7 +345,7 @@ static int FpgaGatherVersion(FILE *infile, char* infile_name, char *dst, int len
 		}
 		strncat(dst, tempstr, len-1);
 	}
-	
+
 	if (bitparse_find_section(infile, 'c', &fpga_info_len)) {
 		strncat(dst, " on ", len-1);
 		for (uint16_t i = 0; i < fpga_info_len; i++) {
@@ -356,7 +356,7 @@ static int FpgaGatherVersion(FILE *infile, char* infile_name, char *dst, int len
 		}
 		strncat(dst, tempstr, len-1);
 	}
-	
+
 	if (bitparse_find_section(infile, 'd', &fpga_info_len)) {
 		strncat(dst, " at ", len-1);
 		for (uint16_t i = 0; i < fpga_info_len; i++) {
@@ -389,11 +389,11 @@ static void print_version_info_preamble(FILE *outfile, int num_infiles) {
 }
 
 static int generate_fpga_version_info(FILE *infile[], char *infile_names[], int num_infiles, FILE *outfile) {
-	
+
 	char version_string[80] = "";
-	
+
 	print_version_info_preamble(outfile, num_infiles);
-	
+
 	for (int i = 0; i < num_infiles; i++) {
 		FpgaGatherVersion(infile[i], infile_names[i], version_string, sizeof(version_string));
 		fprintf(outfile, "\t\" %s\"", version_string);
@@ -401,7 +401,7 @@ static int generate_fpga_version_info(FILE *infile[], char *infile_names[], int
 			fprintf(outfile, ",");
 		}
 		fprintf(outfile,"\n");
-	}	
+	}
 	fprintf(outfile, "};\n");
 	return 0;
 }
@@ -411,19 +411,19 @@ int main(int argc, char **argv)
 	FILE **infiles;
 	char **infile_names;
 	FILE *outfile;
-	
+
 	if (argc == 1 || argc == 2) {
 		usage();
 		return(EXIT_FAILURE);
 	}
-	
+
 	if (!strcmp(argv[1], "-d")) {			// Decompress
 
 		infiles = calloc(1, sizeof(FILE*));
 		if (argc != 4) {
 			usage();
 			return(EXIT_FAILURE);
-		} 
+		}
 		infiles[0] = fopen(argv[2], "rb");
 		if (infiles[0] == NULL) {
 			fprintf(stderr, "Error. Cannot open input file %s\n\n", argv[2]);
@@ -454,10 +454,10 @@ int main(int argc, char **argv)
 		} else { 								// compress 1..n fpga files
 			num_input_files = argc-2;
 		}
-		
+
 		infiles = calloc(num_input_files, sizeof(FILE*));
 		infile_names = calloc(num_input_files, sizeof(char*));
-		for (uint16_t i = 0; i < num_input_files; i++) { 
+		for (uint16_t i = 0; i < num_input_files; i++) {
 			infile_names[i] = argv[i+((hardnested_mode || generate_version_file)?2:1)];
 			infiles[i] = fopen(infile_names[i], "rb");
 			if (infiles[i] == NULL) {
diff --git a/client/graph.c b/client/graph.c
index 42bb79c84..db29919bc 100644
--- a/client/graph.c
+++ b/client/graph.c
@@ -16,7 +16,7 @@ int s_Buff[MAX_GRAPH_TRACE_LEN];
 /* write a manchester bit to the graph */
 void AppendGraph(int redraw, int clock, int bit) {
 	int i;
-	//set first half the clock bit (all 1's or 0's for a 0 or 1 bit) 
+	//set first half the clock bit (all 1's or 0's for a 0 or 1 bit)
 	for (i = 0; i < (int)(clock / 2); ++i)
 		GraphBuffer[GraphTraceLen++] = bit ;
 	//set second half of the clock bit (all 0's or 1's for a 0 or 1 bit)
@@ -59,12 +59,12 @@ void save_restoreGB(uint8_t saveOpt) {
 
 void setGraphBuf(uint8_t *buf, size_t size) {
 	if ( buf == NULL ) return;
-	
+
 	ClearGraph(0);
-	
+
 	if ( size > MAX_GRAPH_TRACE_LEN )
 		size = MAX_GRAPH_TRACE_LEN;
-	
+
 	for (uint16_t i = 0; i < size; ++i)
 		GraphBuffer[i] = buf[i] - 128;
 
@@ -85,22 +85,22 @@ size_t getFromGraphBuf(uint8_t *buf) {
 	return i;
 }
 
-// A simple test to see if there is any data inside Graphbuffer. 
+// A simple test to see if there is any data inside Graphbuffer.
 bool HasGraphData(){
 	if ( GraphTraceLen <= 0) {
 		PrintAndLogEx(NORMAL, "No data available, try reading something first");
 		return false;
 	}
-	return true;	
+	return true;
 }
 
 // Get or auto-detect ask clock rate
 int GetAskClock(const char *str, bool printAns) {
 
 	int clock = param_get32ex(str, 0, 0, 10);
-	if (clock > 0) 
+	if (clock > 0)
 		return clock;
-	
+
 	// Auto-detect clock
 	uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
 	size_t size = getFromGraphBuf(bits);
@@ -115,7 +115,7 @@ int GetAskClock(const char *str, bool printAns) {
 	if (st == false) {
 		idx = DetectASKClock(bits, size, &clock, 20);
 	}
-	
+
 	if ( clock > 0 ) {
 		setClockGrid(clock, idx);
 	}
@@ -146,9 +146,9 @@ uint8_t GetPskCarrier(const char *str, bool printAns) {
 
 int GetPskClock(const char* str, bool printAns) {
 	int clock = param_get32ex(str, 0, 0, 10);
-	if (clock != 0) 
+	if (clock != 0)
 		return clock;
-	
+
 	// Auto-detect clock
 	uint8_t grph[MAX_GRAPH_TRACE_LEN] = {0};
 	size_t size = getFromGraphBuf(grph);
@@ -169,9 +169,9 @@ int GetPskClock(const char* str, bool printAns) {
 int GetNrzClock(const char* str, bool printAns) {
 
 	int clock = param_get32ex(str, 0, 0, 10);
-	if (clock != 0) 
+	if (clock != 0)
 		return clock;
-	
+
 	// Auto-detect clock
 	uint8_t grph[MAX_GRAPH_TRACE_LEN] = {0};
 	size_t size = getFromGraphBuf(grph);
@@ -192,17 +192,17 @@ int GetNrzClock(const char* str, bool printAns) {
 int GetFskClock(const char* str, bool printAns) {
 
 	int clock = param_get32ex(str, 0, 0, 10);
-	if (clock != 0) 
+	if (clock != 0)
 		return clock;
 
 	uint8_t fc1 = 0, fc2 = 0, rf1 = 0;
 	int firstClockEdge = 0;
-	
+
 	if ( !fskClocks(&fc1, &fc2, &rf1, &firstClockEdge))
 		return 0;
-	
+
 	if ((fc1==10 && fc2==8) || (fc1==8 && fc2==5)){
-		if (printAns) 
+		if (printAns)
 			PrintAndLogEx(SUCCESS, "Detected Field Clocks: FC/%d, FC/%d - Bit Clock: RF/%d", fc1, fc2, rf1);
 		setClockGrid(rf1, firstClockEdge);
 		return rf1;
@@ -215,15 +215,15 @@ int GetFskClock(const char* str, bool printAns) {
 bool fskClocks(uint8_t *fc1, uint8_t *fc2, uint8_t *rf1, int *firstClockEdge) {
 	uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
 	size_t size = getFromGraphBuf(bits);
-	if (size == 0) 
+	if (size == 0)
 		return false;
-	
+
 	uint16_t ans = countFC(bits, size, true);
 	if (ans == 0) {
 		PrintAndLogEx(DEBUG, "DEBUG: No data found");
 		return false;
 	}
-	
+
 	*fc1 = (ans >> 8) & 0xFF;
 	*fc2 = ans & 0xFF;
 	*rf1 = detectFSKClk(bits, size, *fc1, *fc2, firstClockEdge);
diff --git a/client/hardnested/hardnested_bf_core.c b/client/hardnested/hardnested_bf_core.c
index 6bf29b795..e80a9cd19 100644
--- a/client/hardnested/hardnested_bf_core.c
+++ b/client/hardnested/hardnested_bf_core.c
@@ -10,7 +10,7 @@
 // attacks this doesn't rely on implementation errors but only on the
 // inherent weaknesses of the crypto1 cypher. Described in
 //   Carlo Meijer, Roel Verdult, "Ciphertext-only Cryptanalysis on Hardened
-//   Mifare Classic Cards" in Proceedings of the 22nd ACM SIGSAC Conference on 
+//   Mifare Classic Cards" in Proceedings of the 22nd ACM SIGSAC Conference on
 //   Computer and Communications Security, 2015
 //-----------------------------------------------------------------------------
 //
@@ -19,7 +19,7 @@
 // - don't rollback. Start with 2nd byte of nonce instead
 // - reuse results of filter subfunctions
 // - reuse results of previous nonces if some first bits are identical
-// 
+//
 //-----------------------------------------------------------------------------
 // aczid's Copyright notice:
 //
@@ -100,7 +100,7 @@ typedef union {
 // size of nonce to be decrypted
 #define KEYSTREAM_SIZE 24
 
-// this needs to be compiled several times for each instruction set. 
+// this needs to be compiled several times for each instruction set.
 // For each instruction set, define a dedicated function name:
 #if defined (__AVX512F__)
 #define BITSLICE_TEST_NONCES bitslice_test_nonces_AVX512
@@ -114,7 +114,7 @@ typedef union {
 #elif defined (__SSE2__)
 #define BITSLICE_TEST_NONCES bitslice_test_nonces_SSE2
 #define CRACK_STATES_BITSLICED crack_states_bitsliced_SSE2
-#elif defined (__MMX__) 
+#elif defined (__MMX__)
 #define BITSLICE_TEST_NONCES bitslice_test_nonces_MMX
 #define CRACK_STATES_BITSLICED crack_states_bitsliced_MMX
 #else
@@ -208,7 +208,7 @@ void BITSLICE_TEST_NONCES(uint32_t nonces_to_bruteforce, uint32_t *bf_test_nonce
 const uint64_t CRACK_STATES_BITSLICED(uint32_t cuid, uint8_t *best_first_bytes, statelist_t *p, uint32_t *keys_found, uint64_t *num_keys_tested, uint32_t nonces_to_bruteforce, uint8_t *bf_test_nonce_2nd_byte, noncelist_t *nonces){
 
     // Unlike aczid's implementation this doesn't roll back at all when performing bitsliced bruteforce.
-	// We know that the best first byte is already shifted in. Testing with the remaining three bytes of 
+	// We know that the best first byte is already shifted in. Testing with the remaining three bytes of
 	// the nonces is sufficient to eliminate most of them. The small rest is tested with a simple unsliced
 	// brute forcing (including roll back).
 
@@ -223,7 +223,7 @@ const uint64_t CRACK_STATES_BITSLICED(uint32_t cuid, uint8_t *best_first_bytes,
 	uint32_t elimination_step = 0;
 	#define MAX_ELIMINATION_STEP	32
 	uint64_t keys_eliminated[MAX_ELIMINATION_STEP] = {0};
-#endif	
+#endif
 #ifdef DEBUG_KEY_ELIMINATION
 	bool bucket_contains_test_key[(p->len[EVEN_STATE] - 1)/MAX_BITSLICES + 1];
 #endif
@@ -233,7 +233,7 @@ const uint64_t CRACK_STATES_BITSLICED(uint32_t cuid, uint8_t *best_first_bytes,
     memset(bs_ones.bytes, 0xff, VECTOR_SIZE);
 	bitslice_t bs_zeroes;
     memset(bs_zeroes.bytes, 0x00, VECTOR_SIZE);
-	
+
     // bitslice all the even states
     bitslice_t **restrict bitsliced_even_states = (bitslice_t **)malloc(((p->len[EVEN_STATE] - 1)/MAX_BITSLICES + 1) * sizeof(bitslice_t *));
 	if (bitsliced_even_states == NULL) {
@@ -284,10 +284,10 @@ const uint64_t CRACK_STATES_BITSLICED(uint32_t cuid, uint8_t *best_first_bytes,
                     lstate_p[bit_idx].bytes64[slice_idx>>6] |= 1ull << (slice_idx & 0x3f);
                 }
             }
-		}			
+		}
         bitsliced_even_states[bitsliced_blocks] = lstate_p;
 		// bitsliced_even_feedback[bitsliced_blocks] = bs_ones;
-		bitsliced_even_feedback[bitsliced_blocks] = lstate_p[(47- 0)/2].value ^ 
+		bitsliced_even_feedback[bitsliced_blocks] = lstate_p[(47- 0)/2].value ^
                                                     lstate_p[(47-10)/2].value ^ lstate_p[(47-12)/2].value ^ lstate_p[(47-14)/2].value ^
                                                     lstate_p[(47-24)/2].value ^ lstate_p[(47-42)/2].value;
 		bitsliced_blocks++;
@@ -298,9 +298,9 @@ const uint64_t CRACK_STATES_BITSLICED(uint32_t cuid, uint8_t *best_first_bytes,
         if(*keys_found){
             goto out;
         }
-		
+
 		// set odd state bits and pre-compute first keystream bit vector. This is the same for all blocks of even states
-		
+
 		state_p = &states[KEYSTREAM_SIZE];
 		uint32_t o = *p_odd;
 
@@ -316,13 +316,13 @@ const uint64_t CRACK_STATES_BITSLICED(uint32_t cuid, uint8_t *best_first_bytes,
 				state_p[state_idx] = bs_zeroes;
 			}
 		}
-		
+
 		bitslice_value_t crypto1_bs_f20b_2[16];
 		bitslice_value_t crypto1_bs_f20b_3[8];
 
 		crypto1_bs_f20b_2[0] = f20b(state_p[47-25].value, state_p[47-27].value, state_p[47-29].value, state_p[47-31].value);
 		crypto1_bs_f20b_3[0] = f20b(state_p[47-41].value, state_p[47-43].value, state_p[47-45].value, state_p[47-47].value);
-		
+
 		bitslice_value_t ksb[8];
 		ksb[0] = f20c(f20a(state_p[47- 9].value, state_p[47-11].value, state_p[47-13].value, state_p[47-15].value),
 		              f20b(state_p[47-17].value, state_p[47-19].value, state_p[47-21].value, state_p[47-23].value),
@@ -347,11 +347,11 @@ const uint64_t CRACK_STATES_BITSLICED(uint32_t cuid, uint8_t *best_first_bytes,
 
 			// pre-compute first feedback bit vector. This is the same for all nonces
 			bitslice_value_t fbb[8];
-            fbb[0] = odd_feedback ^ bitsliced_even_feedback[block_idx]; 
+            fbb[0] = odd_feedback ^ bitsliced_even_feedback[block_idx];
 
             // vector to contain test results (1 = passed, 0 = failed)
             bitslice_t results = bs_ones;
-			
+
 			// parity_bits
 			bitslice_value_t par[8];
 			par[0] = bs_zeroes.value;
@@ -398,7 +398,7 @@ const uint64_t CRACK_STATES_BITSLICED(uint32_t cuid, uint8_t *best_first_bytes,
 						f20a_1 = f20a(state_p[47- 9].value, state_p[47-11].value, state_p[47-13].value, state_p[47-15].value);
 						f20b_1 = crypto1_bs_f20b_2[KEYSTREAM_SIZE - ks_idx - 8];
 						f20b_2 = f20b(state_p[47-25].value, state_p[47-27].value, state_p[47-29].value, state_p[47-31].value);
-						crypto1_bs_f20b_2[KEYSTREAM_SIZE - ks_idx] = f20b_2; 
+						crypto1_bs_f20b_2[KEYSTREAM_SIZE - ks_idx] = f20b_2;
 					} else if (ks_idx > KEYSTREAM_SIZE - 24){
 						f20a_1 = f20a(state_p[47- 9].value, state_p[47-11].value, state_p[47-13].value, state_p[47-15].value);
 						f20b_1 = crypto1_bs_f20b_2[KEYSTREAM_SIZE - ks_idx - 8];
@@ -407,7 +407,7 @@ const uint64_t CRACK_STATES_BITSLICED(uint32_t cuid, uint8_t *best_first_bytes,
 						f20a_1 = f20a(state_p[47- 9].value, state_p[47-11].value, state_p[47-13].value, state_p[47-15].value);
 						f20b_1 = f20b(state_p[47-17].value, state_p[47-19].value, state_p[47-21].value, state_p[47-23].value);
 						f20b_2 = f20b(state_p[47-25].value, state_p[47-27].value, state_p[47-29].value, state_p[47-31].value);
-					}						
+					}
 					// update keystream bit
 					ks_bits = f20c(f20a_1, f20b_1, f20b_2, f20a_2, f20b_3);
 
@@ -436,7 +436,7 @@ const uint64_t CRACK_STATES_BITSLICED(uint32_t cuid, uint8_t *best_first_bytes,
                            && results.bytes64[3] == 0
 #endif
                           ) {
-#if defined (DEBUG_BRUTE_FORCE)						  
+#if defined (DEBUG_BRUTE_FORCE)
 							if (elimination_step < MAX_ELIMINATION_STEP) {
 								keys_eliminated[elimination_step] += MAX_BITSLICES;
 							}
@@ -450,14 +450,14 @@ const uint64_t CRACK_STATES_BITSLICED(uint32_t cuid, uint8_t *best_first_bytes,
 							goto stop_tests;
 						}
 						// prepare for next nonce byte
-#if defined (DEBUG_BRUTE_FORCE)							  
+#if defined (DEBUG_BRUTE_FORCE)
 						elimination_step++;
 #endif
 						parity_bit_vector = bs_zeroes.value;
-					}						
+					}
 					// update feedback bit vector
 					if (ks_idx != 0) {
-						fb_bits = 
+						fb_bits =
 								  (state_p[47- 0].value ^ state_p[47- 5].value ^ state_p[47- 9].value ^
 								   state_p[47-10].value ^ state_p[47-12].value ^ state_p[47-14].value ^
 								   state_p[47-15].value ^ state_p[47-17].value ^ state_p[47-19].value ^
@@ -513,9 +513,9 @@ const uint64_t CRACK_STATES_BITSLICED(uint32_t cuid, uint8_t *best_first_bytes,
 				}
             }
 stop_tests:
-#if defined (DEBUG_BRUTE_FORCE)							  
+#if defined (DEBUG_BRUTE_FORCE)
 			elimination_step = 0;
-#endif			
+#endif
             bucket_states_tested += bucket_size[block_idx];
             // prepare to set new states
 			state_p = &states[KEYSTREAM_SIZE];
@@ -529,12 +529,12 @@ out:
 	free(bitsliced_even_states);
 	free_bitslice(bitsliced_even_feedback);
     __sync_fetch_and_add(num_keys_tested, bucket_states_tested);
-	
-#if defined (DEBUG_BRUTE_FORCE)	
+
+#if defined (DEBUG_BRUTE_FORCE)
 	for (uint32_t i = 0; i < MAX_ELIMINATION_STEP; i++) {
 		printf("Eliminated after %2u test_bytes: %5.2f%%\n", i+1, (float)keys_eliminated[i] / bucket_states_tested * 100);
 	}
-#endif	
+#endif
     return key;
 }
 
@@ -550,17 +550,17 @@ static SIMDExecInstr intSIMDInstr = SIMD_AUTO;
 
 void SetSIMDInstr(SIMDExecInstr instr) {
 	intSIMDInstr = instr;
-	
+
 	crack_states_bitsliced_function_p = &crack_states_bitsliced_dispatch;
 	bitslice_test_nonces_function_p = &bitslice_test_nonces_dispatch;
 }
 
 SIMDExecInstr GetSIMDInstr() {
 	SIMDExecInstr instr = SIMD_NONE;
-	
+
 #if defined (__i386__) || defined (__x86_64__)
 	#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
-		#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2) 
+		#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
 		if (__builtin_cpu_supports("avx512f")) instr = SIMD_AVX512;
 		else if (__builtin_cpu_supports("avx2")) instr = SIMD_AVX2;
 		#else
@@ -573,7 +573,7 @@ SIMDExecInstr GetSIMDInstr() {
 	#endif
 #endif
 		instr = SIMD_NONE;
-		
+
 	return instr;
 }
 
@@ -581,7 +581,7 @@ SIMDExecInstr GetSIMDInstrAuto() {
 	SIMDExecInstr instr = intSIMDInstr;
 	if (instr == SIMD_AUTO)
 		return GetSIMDInstr();
-	
+
 	return instr;
 }
 
@@ -589,8 +589,8 @@ SIMDExecInstr GetSIMDInstrAuto() {
 const uint64_t crack_states_bitsliced_dispatch(uint32_t cuid, uint8_t *best_first_bytes, statelist_t *p, uint32_t *keys_found, uint64_t *num_keys_tested, uint32_t nonces_to_bruteforce, uint8_t *bf_test_nonce_2nd_byte, noncelist_t *nonces) {
 	switch(GetSIMDInstrAuto()) {
 #if defined (__i386__) || defined (__x86_64__)
-	#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))	
-		#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2) 
+	#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
+		#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
 		case SIMD_AVX512:
 			crack_states_bitsliced_function_p = &crack_states_bitsliced_AVX512;
 			break;
@@ -612,7 +612,7 @@ const uint64_t crack_states_bitsliced_dispatch(uint32_t cuid, uint8_t *best_firs
 		default:
 		crack_states_bitsliced_function_p = &crack_states_bitsliced_NOSIMD;
 			break;
-	}	
+	}
 
     // call the most optimized function for this CPU
     return (*crack_states_bitsliced_function_p)(cuid, best_first_bytes, p, keys_found, num_keys_tested, nonces_to_bruteforce, bf_test_nonce_2nd_byte, nonces);
@@ -620,7 +620,7 @@ const uint64_t crack_states_bitsliced_dispatch(uint32_t cuid, uint8_t *best_firs
 
 void bitslice_test_nonces_dispatch(uint32_t nonces_to_bruteforce, uint32_t *bf_test_nonce, uint8_t *bf_test_nonce_par) {
 	switch(GetSIMDInstrAuto()) {
-#if defined (__i386__) || defined (__x86_64__)	
+#if defined (__i386__) || defined (__x86_64__)
 	#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
 		#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
 		case SIMD_AVX512:
@@ -644,7 +644,7 @@ void bitslice_test_nonces_dispatch(uint32_t nonces_to_bruteforce, uint32_t *bf_t
 		default:
 		bitslice_test_nonces_function_p = &bitslice_test_nonces_NOSIMD;
 			break;
-	}	
+	}
 
     // call the most optimized function for this CPU
     (*bitslice_test_nonces_function_p)(nonces_to_bruteforce, bf_test_nonce, bf_test_nonce_par);
diff --git a/client/hardnested/hardnested_bf_core.h b/client/hardnested/hardnested_bf_core.h
index b3df05474..c7d0b03dd 100644
--- a/client/hardnested/hardnested_bf_core.h
+++ b/client/hardnested/hardnested_bf_core.h
@@ -10,7 +10,7 @@
 // attacks this doesn't rely on implementation errors but only on the
 // inherent weaknesses of the crypto1 cypher. Described in
 //   Carlo Meijer, Roel Verdult, "Ciphertext-only Cryptanalysis on Hardened
-//   Mifare Classic Cards" in Proceedings of the 22nd ACM SIGSAC Conference on 
+//   Mifare Classic Cards" in Proceedings of the 22nd ACM SIGSAC Conference on
 //   Computer and Communications Security, 2015
 //-----------------------------------------------------------------------------
 //
@@ -19,7 +19,7 @@
 // - don't rollback. Start with 2nd byte of nonce instead
 // - reuse results of filter subfunctions
 // - reuse results of previous nonces if some first bits are identical
-// 
+//
 //-----------------------------------------------------------------------------
 // aczid's Copyright notice:
 //
diff --git a/client/hardnested/hardnested_bitarray_core.c b/client/hardnested/hardnested_bitarray_core.c
index aca4f149d..1abdd8c79 100644
--- a/client/hardnested/hardnested_bitarray_core.c
+++ b/client/hardnested/hardnested_bitarray_core.c
@@ -10,7 +10,7 @@
 // attacks this doesn't rely on implementation errors but only on the
 // inherent weaknesses of the crypto1 cypher. Described in
 //   Carlo Meijer, Roel Verdult, "Ciphertext-only Cryptanalysis on Hardened
-//   Mifare Classic Cards" in Proceedings of the 22nd ACM SIGSAC Conference on 
+//   Mifare Classic Cards" in Proceedings of the 22nd ACM SIGSAC Conference on
 //   Computer and Communications Security, 2015
 //-----------------------------------------------------------------------------
 // some helper functions which can benefit from SIMD instructions or other special instructions
@@ -25,7 +25,7 @@
 #include <malloc.h>
 #endif
 
-// this needs to be compiled several times for each instruction set. 
+// this needs to be compiled several times for each instruction set.
 // For each instruction set, define a dedicated function name:
 #if defined (__AVX512F__)
 #define MALLOC_BITARRAY malloc_bitarray_AVX512
@@ -83,7 +83,7 @@
 #define COUNT_BITARRAY_AND2 count_bitarray_AND2_SSE2
 #define COUNT_BITARRAY_AND3 count_bitarray_AND3_SSE2
 #define COUNT_BITARRAY_AND4 count_bitarray_AND4_SSE2
-#elif defined (__MMX__) 
+#elif defined (__MMX__)
 #define MALLOC_BITARRAY malloc_bitarray_MMX
 #define FREE_BITARRAY free_bitarray_MMX
 #define BITCOUNT bitcount_MMX
@@ -169,7 +169,7 @@ inline void FREE_BITARRAY(uint32_t *x)
 #endif
 }
 
-	
+
 inline uint32_t BITCOUNT(uint32_t a)
 {
 	return __builtin_popcountl(a);
@@ -200,12 +200,12 @@ inline void BITARRAY_LOW20_AND(uint32_t *restrict A, uint32_t *restrict B)
 {
 	uint16_t *a = (uint16_t *)__builtin_assume_aligned(A, __BIGGEST_ALIGNMENT__);
 	uint16_t *b = (uint16_t *)__builtin_assume_aligned(B, __BIGGEST_ALIGNMENT__);
-	
+
 	for (uint32_t i = 0; i < (1<<20); i++) {
 		if (!b[i]) {
 			a[i] = 0;
 		}
-	}	
+	}
 }
 
 
@@ -227,14 +227,14 @@ inline uint32_t COUNT_BITARRAY_LOW20_AND(uint32_t *restrict A, uint32_t *restric
 	uint16_t *a = (uint16_t *)__builtin_assume_aligned(A, __BIGGEST_ALIGNMENT__);
 	uint16_t *b = (uint16_t *)__builtin_assume_aligned(B, __BIGGEST_ALIGNMENT__);
 	uint32_t count = 0;
-	
+
 	for (uint32_t i = 0; i < (1<<20); i++) {
 		if (!b[i]) {
 			a[i] = 0;
 		}
 		count += BITCOUNT(a[i]);
 	}
-	return count;	
+	return count;
 }
 
 
@@ -318,7 +318,7 @@ count_bitarray_AND4_t *count_bitarray_AND4_function_p = &count_bitarray_AND4_dis
 
 // determine the available instruction set at runtime and call the correct function
 uint32_t *malloc_bitarray_dispatch(uint32_t x) {
-#if defined (__i386__) || defined (__x86_64__)	
+#if defined (__i386__) || defined (__x86_64__)
 	#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
 		#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
 	if (__builtin_cpu_supports("avx512f")) malloc_bitarray_function_p = &malloc_bitarray_AVX512;
@@ -331,7 +331,7 @@ uint32_t *malloc_bitarray_dispatch(uint32_t x) {
 	else if (__builtin_cpu_supports("mmx")) malloc_bitarray_function_p = &malloc_bitarray_MMX;
 	else
 	#endif
-#endif		
+#endif
 		malloc_bitarray_function_p = &malloc_bitarray_NOSIMD;
 
     // call the most optimized function for this CPU
@@ -360,7 +360,7 @@ void free_bitarray_dispatch(uint32_t *x) {
 }
 
 uint32_t bitcount_dispatch(uint32_t a) {
-#if defined (__i386__) || defined (__x86_64__)	
+#if defined (__i386__) || defined (__x86_64__)
 	#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
 		#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
 	if (__builtin_cpu_supports("avx512f")) bitcount_function_p = &bitcount_AVX512;
@@ -381,7 +381,7 @@ uint32_t bitcount_dispatch(uint32_t a) {
 }
 
 uint32_t count_states_dispatch(uint32_t *bitarray) {
-#if defined (__i386__) || defined (__x86_64__)	
+#if defined (__i386__) || defined (__x86_64__)
 	#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
 		#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
 	if (__builtin_cpu_supports("avx512f")) count_states_function_p = &count_states_AVX512;
@@ -393,7 +393,7 @@ uint32_t count_states_dispatch(uint32_t *bitarray) {
 	else if (__builtin_cpu_supports("sse2")) count_states_function_p = &count_states_SSE2;
 	else if (__builtin_cpu_supports("mmx")) count_states_function_p = &count_states_MMX;
 	else
-	#endif 
+	#endif
 #endif
 		count_states_function_p = &count_states_NOSIMD;
 
@@ -402,7 +402,7 @@ uint32_t count_states_dispatch(uint32_t *bitarray) {
 }
 
 void bitarray_AND_dispatch(uint32_t *A, uint32_t *B) {
-#if defined (__i386__) || defined (__x86_64__)	
+#if defined (__i386__) || defined (__x86_64__)
 	#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
 		#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
 	if (__builtin_cpu_supports("avx512f")) bitarray_AND_function_p = &bitarray_AND_AVX512;
@@ -444,7 +444,7 @@ void bitarray_low20_AND_dispatch(uint32_t *A, uint32_t *B) {
 }
 
 uint32_t count_bitarray_AND_dispatch(uint32_t *A, uint32_t *B) {
-#if defined (__i386__) || defined (__x86_64__)	
+#if defined (__i386__) || defined (__x86_64__)
 	#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
 		#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
 	if (__builtin_cpu_supports("avx512f")) count_bitarray_AND_function_p = &count_bitarray_AND_AVX512;
@@ -465,7 +465,7 @@ uint32_t count_bitarray_AND_dispatch(uint32_t *A, uint32_t *B) {
 }
 
 uint32_t count_bitarray_low20_AND_dispatch(uint32_t *A, uint32_t *B) {
-#if defined (__i386__) || defined (__x86_64__)	
+#if defined (__i386__) || defined (__x86_64__)
 	#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
 		#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
 	if (__builtin_cpu_supports("avx512f")) count_bitarray_low20_AND_function_p = &count_bitarray_low20_AND_AVX512;
@@ -486,7 +486,7 @@ uint32_t count_bitarray_low20_AND_dispatch(uint32_t *A, uint32_t *B) {
 }
 
 void bitarray_AND4_dispatch(uint32_t *A, uint32_t *B, uint32_t *C, uint32_t *D) {
-#if defined (__i386__) || defined (__x86_64__)	
+#if defined (__i386__) || defined (__x86_64__)
 	#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
 		#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
 	if (__builtin_cpu_supports("avx512f")) bitarray_AND4_function_p = &bitarray_AND4_AVX512;
@@ -507,7 +507,7 @@ void bitarray_AND4_dispatch(uint32_t *A, uint32_t *B, uint32_t *C, uint32_t *D)
 }
 
 void bitarray_OR_dispatch(uint32_t *A, uint32_t *B) {
-#if defined (__i386__) || defined (__x86_64__)	
+#if defined (__i386__) || defined (__x86_64__)
 	#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
 		#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
 	if (__builtin_cpu_supports("avx512f")) bitarray_OR_function_p = &bitarray_OR_AVX512;
@@ -528,7 +528,7 @@ void bitarray_OR_dispatch(uint32_t *A, uint32_t *B) {
 }
 
 uint32_t count_bitarray_AND2_dispatch(uint32_t *A, uint32_t *B) {
-#if defined (__i386__) || defined (__x86_64__)	
+#if defined (__i386__) || defined (__x86_64__)
 	#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
 		#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
 	if (__builtin_cpu_supports("avx512f")) count_bitarray_AND2_function_p = &count_bitarray_AND2_AVX512;
@@ -549,7 +549,7 @@ uint32_t count_bitarray_AND2_dispatch(uint32_t *A, uint32_t *B) {
 }
 
 uint32_t count_bitarray_AND3_dispatch(uint32_t *A, uint32_t *B, uint32_t *C) {
-#if defined (__i386__) || defined (__x86_64__)	
+#if defined (__i386__) || defined (__x86_64__)
 	#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
 		#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
 	if (__builtin_cpu_supports("avx512f")) count_bitarray_AND3_function_p = &count_bitarray_AND3_AVX512;
@@ -570,7 +570,7 @@ uint32_t count_bitarray_AND3_dispatch(uint32_t *A, uint32_t *B, uint32_t *C) {
 }
 
 uint32_t count_bitarray_AND4_dispatch(uint32_t *A, uint32_t *B, uint32_t *C, uint32_t *D) {
-#if defined (__i386__) || defined (__x86_64__)	
+#if defined (__i386__) || defined (__x86_64__)
 	#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
 		#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
 	if (__builtin_cpu_supports("avx512f")) count_bitarray_AND4_function_p = &count_bitarray_AND4_AVX512;
diff --git a/client/hardnested/hardnested_bitarray_core.h b/client/hardnested/hardnested_bitarray_core.h
index 0d92d6b9a..b12fcf89d 100644
--- a/client/hardnested/hardnested_bitarray_core.h
+++ b/client/hardnested/hardnested_bitarray_core.h
@@ -10,7 +10,7 @@
 // attacks this doesn't rely on implementation errors but only on the
 // inherent weaknesses of the crypto1 cypher. Described in
 //   Carlo Meijer, Roel Verdult, "Ciphertext-only Cryptanalysis on Hardened
-//   Mifare Classic Cards" in Proceedings of the 22nd ACM SIGSAC Conference on 
+//   Mifare Classic Cards" in Proceedings of the 22nd ACM SIGSAC Conference on
 //   Computer and Communications Security, 2015
 //-----------------------------------------------------------------------------
 //
@@ -19,7 +19,7 @@
 // - don't rollback. Start with 2nd byte of nonce instead
 // - reuse results of filter subfunctions
 // - reuse results of previous nonces if some first bits are identical
-// 
+//
 //-----------------------------------------------------------------------------
 // aczid's Copyright notice:
 //
diff --git a/client/hardnested/hardnested_bruteforce.c b/client/hardnested/hardnested_bruteforce.c
index 1a09d7a49..49cd4908d 100644
--- a/client/hardnested/hardnested_bruteforce.c
+++ b/client/hardnested/hardnested_bruteforce.c
@@ -10,7 +10,7 @@
 // attacks this doesn't rely on implementation errors but only on the
 // inherent weaknesses of the crypto1 cypher. Described in
 //   Carlo Meijer, Roel Verdult, "Ciphertext-only Cryptanalysis on Hardened
-//   Mifare Classic Cards" in Proceedings of the 22nd ACM SIGSAC Conference on 
+//   Mifare Classic Cards" in Proceedings of the 22nd ACM SIGSAC Conference on
 //   Computer and Communications Security, 2015
 //-----------------------------------------------------------------------------
 //
@@ -19,7 +19,7 @@
 // - don't rollback. Start with 2nd byte of nonce instead
 // - reuse results of filter subfunctions
 // - reuse results of previous nonces if some first bits are identical
-// 
+//
 //-----------------------------------------------------------------------------
 // aczid's Copyright notice:
 //
@@ -89,7 +89,7 @@ static uint32_t keys_found = 0;
 static uint64_t num_keys_tested;
 static uint64_t found_bs_key = 0;
 
-inline uint8_t trailing_zeros(uint8_t byte) 
+inline uint8_t trailing_zeros(uint8_t byte)
 {
 	static const uint8_t trailing_zeros_LUT[256] = {
 		8, 0, 1, 0, 2, 0, 1, 0,	3, 0, 1, 0, 2, 0, 1, 0,
@@ -126,7 +126,7 @@ bool verify_key(uint32_t cuid, noncelist_t *nonces, uint8_t *best_first_bytes, u
 			for (int8_t byte_pos = 3; byte_pos >= 0; byte_pos--) {
 				uint8_t test_par_enc_bit = (test_nonce->par_enc >> byte_pos) & 0x01;			// the encoded parity bit
 				uint8_t test_byte_enc = (test_nonce->nonce_enc >> (8*byte_pos)) & 0xff; 		// the encoded nonce byte
-				uint8_t test_byte_dec = crypto1_byte(&pcs, test_byte_enc /* ^ (cuid >> (8*byte_pos)) */, true) ^ test_byte_enc; 	// decode the nonce byte	
+				uint8_t test_byte_dec = crypto1_byte(&pcs, test_byte_enc /* ^ (cuid >> (8*byte_pos)) */, true) ^ test_byte_enc; 	// decode the nonce byte
 				uint8_t ks_par = filter(pcs.odd);												// the keystream bit to encode/decode the parity bit
 				uint8_t test_par_enc2 = ks_par ^ evenparity8(test_byte_dec);					// determine the decoded byte's parity and encode it
 				if (test_par_enc_bit != test_par_enc2) {
@@ -138,10 +138,10 @@ bool verify_key(uint32_t cuid, noncelist_t *nonces, uint8_t *best_first_bytes, u
 	}
 	return true;
 }
-static void* 
+static void*
 #ifdef __has_attribute
 	#if __has_attribute(force_align_arg_pointer)
-	__attribute__((force_align_arg_pointer)) 
+	__attribute__((force_align_arg_pointer))
 	#endif
 #endif
 crack_states_thread(void* x){
@@ -161,9 +161,9 @@ crack_states_thread(void* x){
     while(current_bucket < bucket_count){
         statelist_t *bucket = buckets[current_bucket];
         if(bucket){
-#if defined (DEBUG_BRUTE_FORCE)	
+#if defined (DEBUG_BRUTE_FORCE)
 			printf("Thread %u starts working on bucket %u\n", thread_id, current_bucket);
-#endif			
+#endif
             const uint64_t key = crack_states_bitsliced(thread_arg->cuid, thread_arg->best_first_bytes, bucket, &keys_found, &num_keys_tested, nonces_to_bruteforce, bf_test_nonce_2nd_byte, thread_arg->nonces);
             if(key != -1){
                 __atomic_fetch_add(&keys_found, 1, __ATOMIC_SEQ_CST);
@@ -173,7 +173,7 @@ crack_states_thread(void* x){
 				char keystr[18];
 				sprintf(keystr, "%012" PRIx64 "  ", key);
 				sprintf(progress_text, "Brute force phase completed. Key found: " _YELLOW_(%s), keystr);
-				hardnested_print_progress(thread_arg->num_acquired_nonces, progress_text, 0.0, 0);				
+				hardnested_print_progress(thread_arg->num_acquired_nonces, progress_text, 0.0, 0);
                 break;
             } else if(keys_found){
                 break;
@@ -212,20 +212,20 @@ void prepare_bf_test_nonces(noncelist_t *nonces, uint8_t best_first_byte)
 			// trailing_zeros(bf_test_nonce_2nd_byte[1] ^ bf_test_nonce_2nd_byte[0]),
 			// trailing_zeros(bf_test_nonce_2nd_byte[2] ^ bf_test_nonce_2nd_byte[1]),
 			// trailing_zeros(bf_test_nonce_2nd_byte[3] ^ bf_test_nonce_2nd_byte[2]));
-	
+
 	uint8_t best_4[4] = {0};
 	int sum_best = -1;
 	for (uint16_t n1 = 0; n1 < nonces_to_bruteforce; n1++) {
 		for (uint16_t n2 = 0; n2 < nonces_to_bruteforce; n2++) {
 			if (n2 != n1) {
 				for (uint16_t n3 = 0; n3 < nonces_to_bruteforce; n3++) {
-					if ((n3 != n2 && n3 != n1) || nonces_to_bruteforce < 3 
-					    // && trailing_zeros(bf_test_nonce_2nd_byte[n1] ^ bf_test_nonce_2nd_byte[n2]) 
+					if ((n3 != n2 && n3 != n1) || nonces_to_bruteforce < 3
+					    // && trailing_zeros(bf_test_nonce_2nd_byte[n1] ^ bf_test_nonce_2nd_byte[n2])
 						    // > trailing_zeros(bf_test_nonce_2nd_byte[n2] ^ bf_test_nonce_2nd_byte[n3])
 							) {
 						for (uint16_t n4 = 0; n4 < nonces_to_bruteforce; n4++) {
 							if ((n4 != n3 && n4 != n2 && n4 != n1) || nonces_to_bruteforce < 4
-								// && trailing_zeros(bf_test_nonce_2nd_byte[n2] ^ bf_test_nonce_2nd_byte[n3]) 
+								// && trailing_zeros(bf_test_nonce_2nd_byte[n2] ^ bf_test_nonce_2nd_byte[n3])
 								// > trailing_zeros(bf_test_nonce_2nd_byte[n3] ^ bf_test_nonce_2nd_byte[n4])
 								) {
 								int sum = nonces_to_bruteforce > 1 ? trailing_zeros(bf_test_nonce_2nd_byte[n1] ^ bf_test_nonce_2nd_byte[n2]) : 0.0
@@ -245,13 +245,13 @@ void prepare_bf_test_nonces(noncelist_t *nonces, uint8_t best_first_byte)
 			}
 		}
 	}
-	
+
 	uint32_t bf_test_nonce_temp[4];
 	uint8_t bf_test_nonce_par_temp[4];
 	uint8_t bf_test_nonce_2nd_byte_temp[4];
 	for (uint8_t i = 0; i < 4 && i < nonces_to_bruteforce; i++) {
-		bf_test_nonce_temp[i] = bf_test_nonce[best_4[i]]; 
-		
+		bf_test_nonce_temp[i] = bf_test_nonce[best_4[i]];
+
 		bf_test_nonce_par_temp[i] = bf_test_nonce_par[best_4[i]];
 		bf_test_nonce_2nd_byte_temp[i] = bf_test_nonce_2nd_byte[best_4[i]];
 	}
@@ -295,13 +295,13 @@ bool brute_force_bs(float *bf_rate, statelist_t *candidates, uint32_t cuid, uint
 	write_benchfile(candidates);
 #endif
 	bool silent = (bf_rate != NULL);
-	
+
 	keys_found = 0;
 	num_keys_tested = 0;
 	found_bs_key = 0;
-	
+
 	bitslice_test_nonces(nonces_to_bruteforce, bf_test_nonce, bf_test_nonce_par);
-	
+
 	// count number of states to go
 	bucket_count = 0;
 	for (statelist_t *p = candidates; p != NULL; p = p->next) {
@@ -313,7 +313,7 @@ bool brute_force_bs(float *bf_rate, statelist_t *candidates, uint32_t cuid, uint
 
 	uint64_t start_time = msclock();
 
-#if defined(__linux__) ||  defined(__APPLE__)	
+#if defined(__linux__) ||  defined(__APPLE__)
 	if ( NUM_BRUTE_FORCE_THREADS < 0 )
 		return false;
 #endif
@@ -328,7 +328,7 @@ bool brute_force_bs(float *bf_rate, statelist_t *candidates, uint32_t cuid, uint
 		noncelist_t *nonces;
 		uint8_t *best_first_bytes;
 	} thread_args[NUM_BRUTE_FORCE_THREADS];
-	
+
 	for (uint32_t i = 0; i < NUM_BRUTE_FORCE_THREADS; i++){
 		thread_args[i].thread_ID = i;
 		thread_args[i].silent = silent;
@@ -347,10 +347,10 @@ bool brute_force_bs(float *bf_rate, statelist_t *candidates, uint32_t cuid, uint
 
 	if (bf_rate != NULL)
 		*bf_rate = (float)num_keys_tested / ((float)elapsed_time / 1000.0);
-	
+
 	if ( keys_found > 0)
 		*foundkey = found_bs_key;
-	
+
 	return (keys_found != 0);
 }
 
@@ -361,7 +361,7 @@ static bool read_bench_data(statelist_t *test_candidates) {
 	uint32_t temp = 0;
 	uint32_t num_states = 0;
 	uint32_t states_read = 0;
-	
+
 	char bench_file_path[strlen(get_my_executable_directory()) + strlen(TEST_BENCH_FILENAME) + 1];
 	strcpy(bench_file_path, get_my_executable_directory());
 	strcat(bench_file_path, TEST_BENCH_FILENAME);
@@ -371,7 +371,7 @@ static bool read_bench_data(statelist_t *test_candidates) {
 		return false;
 	}
 	bytes_read = fread(&nonces_to_bruteforce, 1, sizeof(nonces_to_bruteforce), benchfile);
-	if (bytes_read != sizeof(nonces_to_bruteforce)) { 
+	if (bytes_read != sizeof(nonces_to_bruteforce)) {
 		fclose(benchfile);
 		return false;
 	}
@@ -388,7 +388,7 @@ static bool read_bench_data(statelist_t *test_candidates) {
 			return false;
 		}
 	}
-	bytes_read = fread(&num_states, 1, sizeof(uint32_t), benchfile); 
+	bytes_read = fread(&num_states, 1, sizeof(uint32_t), benchfile);
 	if (bytes_read != sizeof(uint32_t)) {
 		fclose(benchfile);
 		return false;
@@ -420,9 +420,9 @@ static bool read_bench_data(statelist_t *test_candidates) {
 	for (uint32_t i = states_read; i < TEST_BENCH_SIZE; i++) {
 		test_candidates->states[ODD_STATE][i] = test_candidates->states[ODD_STATE][i-states_read];
 	}
-		
+
 	fclose(benchfile);
-	return true;	
+	return true;
 }
 
 
@@ -435,7 +435,7 @@ float brute_force_benchmark() {
 		test_candidates[i].next = test_candidates + i + 1;
 		test_candidates[i+1].states[ODD_STATE] = test_candidates[0].states[ODD_STATE];
 		test_candidates[i+1].states[EVEN_STATE] = test_candidates[0].states[EVEN_STATE];
-	} 
+	}
 	test_candidates[NUM_BRUTE_FORCE_THREADS-1].next = NULL;
 
 	if (!read_bench_data(test_candidates)) {
@@ -449,13 +449,13 @@ float brute_force_benchmark() {
 		test_candidates[i].states[ODD_STATE][TEST_BENCH_SIZE] = -1;
 		test_candidates[i].states[EVEN_STATE][TEST_BENCH_SIZE] = -1;
 	}
-	
+
 	uint64_t maximum_states = TEST_BENCH_SIZE*TEST_BENCH_SIZE*(uint64_t)NUM_BRUTE_FORCE_THREADS;
 
 	float bf_rate;
 	uint64_t found_key = 0;
 	brute_force_bs(&bf_rate, test_candidates, 0, 0, maximum_states, NULL, 0, &found_key);
-	
+
 	free(test_candidates[0].states[ODD_STATE]);
 	free(test_candidates[0].states[EVEN_STATE]);
 
diff --git a/client/hardnested/hardnested_bruteforce.h b/client/hardnested/hardnested_bruteforce.h
index c978a82c3..68dc7442d 100644
--- a/client/hardnested/hardnested_bruteforce.h
+++ b/client/hardnested/hardnested_bruteforce.h
@@ -10,7 +10,7 @@
 // attacks this doesn't rely on implementation errors but only on the
 // inherent weaknesses of the crypto1 cypher. Described in
 //   Carlo Meijer, Roel Verdult, "Ciphertext-only Cryptanalysis on Hardened
-//   Mifare Classic Cards" in Proceedings of the 22nd ACM SIGSAC Conference on 
+//   Mifare Classic Cards" in Proceedings of the 22nd ACM SIGSAC Conference on
 //   Computer and Communications Security, 2015
 //-----------------------------------------------------------------------------
 
@@ -30,7 +30,7 @@ typedef struct {
 extern void prepare_bf_test_nonces(noncelist_t *nonces, uint8_t best_first_byte);
 extern bool brute_force_bs(float *bf_rate, statelist_t *candidates, uint32_t cuid, uint32_t num_acquired_nonces, uint64_t maximum_states, noncelist_t *nonces, uint8_t *best_first_bytes, uint64_t *found_key);
 extern float brute_force_benchmark();
-extern uint8_t trailing_zeros(uint8_t byte); 
+extern uint8_t trailing_zeros(uint8_t byte);
 extern bool verify_key(uint32_t cuid, noncelist_t *nonces, uint8_t *best_first_bytes, uint32_t odd, uint32_t even);
 
 #endif
diff --git a/client/hardnested/hardnested_tables.c b/client/hardnested/hardnested_tables.c
index 278ed9596..9a520603b 100644
--- a/client/hardnested/hardnested_tables.c
+++ b/client/hardnested/hardnested_tables.c
@@ -10,7 +10,7 @@
 // attacks this doesn't rely on implementation errors but only on the
 // inherent weaknesses of the crypto1 cypher. Described in
 //   Carlo Meijer, Roel Verdult, "Ciphertext-only Cryptanalysis on Hardened
-//   Mifare Classic Cards" in Proceedings of the 22nd ACM SIGSAC Conference on 
+//   Mifare Classic Cards" in Proceedings of the 22nd ACM SIGSAC Conference on
 //   Computer and Communications Security, 2015
 //-----------------------------------------------------------------------------
 //
@@ -39,7 +39,7 @@ typedef enum {
 
 
 static uint16_t PartialSumProperty(uint32_t state, odd_even_t odd_even)
-{ 
+{
 	uint16_t sum = 0;
 	for (uint16_t j = 0; j < 16; j++) {
 		uint32_t st = state;
@@ -203,7 +203,7 @@ static void init_part_sum_bitarrays(void)
 		}
 	}
 	for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
-		//printf("(%d, %" PRIu16 ")...", odd_even, part_sum_a0);			
+		//printf("(%d, %" PRIu16 ")...", odd_even, part_sum_a0);
 		for (uint32_t state = 0; state < (1<<20); state++) {
 			uint16_t part_sum_a0 = PartialSumProperty(state, odd_even) / 2;
 			for (uint16_t low_bits = 0; low_bits < 1<<4; low_bits++) {
@@ -215,7 +215,7 @@ static void init_part_sum_bitarrays(void)
 }
 
 
-static void free_part_sum_bitarrays(void) 
+static void free_part_sum_bitarrays(void)
 {
 	printf("free_part_sum_bitarrays()...");
 	for (int16_t part_sum_a0 = (NUM_PART_SUMS-1); part_sum_a0 >= 0; part_sum_a0--) {
@@ -257,7 +257,7 @@ void init_sum_bitarray(uint16_t sum_a0)
 	printf("done.\n");
 }
 
-	
+
 static void free_sum_bitarray(void)
 {
 	printf("free_sum_bitarray()...");
@@ -275,10 +275,10 @@ static void precalculate_bit0_bitflip_bitarrays(uint8_t const bitflip, uint16_t
 	#else
 	#define NUM_TEST_STATES (1<<23)
 	#endif
-	
+
 	time_t start_time = time(NULL);
 	time_t last_check_time = start_time;
-	
+
 	uint32_t *restrict test_bitarray[2];
 	uint32_t *restrict test_not_bitarray[2];
 
@@ -291,7 +291,7 @@ static void precalculate_bit0_bitflip_bitarrays(uint8_t const bitflip, uint16_t
 	clear_bitarray24(test_not_bitarray[EVEN_STATE]);
 	test_not_bitarray[ODD_STATE] = malloc_bitarray(sizeof(uint32_t) * (1<<19));
 	clear_bitarray24(test_not_bitarray[ODD_STATE]);
-	
+
 	uint32_t count[2];
 	bool all_odd_states_are_possible_for_notbitflip = false;
 
@@ -302,7 +302,7 @@ static void precalculate_bit0_bitflip_bitarrays(uint8_t const bitflip, uint16_t
 		if (difftime(time_now, last_check_time) > 5*60) {	// print status every 5 minutes
 			float runtime = difftime(time_now, start_time);
 			float remaining_time = runtime * ((1<<23) - even_state) / even_state;
-			printf("\n%1.1f hours elapsed, expected completion in %1.1f hours (%1.1f days)", runtime/3600, remaining_time/3600, remaining_time/3600/24); 
+			printf("\n%1.1f hours elapsed, expected completion in %1.1f hours (%1.1f days)", runtime/3600, remaining_time/3600, remaining_time/3600/24);
 			last_check_time = time_now;
 		}
 		for (uint32_t odd_state = next_state(sum_a0_bitarray[ODD_STATE], -1); odd_state < (1<<24); odd_state = next_state(test_bitarray[ODD_STATE], odd_state)) {
@@ -319,15 +319,15 @@ static void precalculate_bit0_bitflip_bitarrays(uint8_t const bitflip, uint16_t
 			} cs_delta;
 			cs_delta.odd = 0;
 			cs_delta.even = 0;
-			
+
 			uint_fast16_t keystream = 0;
-			
+
 			// decrypt 9 bits
 			for (int i = 0; i < 9; i++) {
-				uint_fast8_t keystream_bit = filter(cs.odd & 0x000fffff) ^ filter((cs.odd & 0x000fffff) ^ cs_delta.odd); 
+				uint_fast8_t keystream_bit = filter(cs.odd & 0x000fffff) ^ filter((cs.odd & 0x000fffff) ^ cs_delta.odd);
 				keystream = keystream << 1 | keystream_bit;
 				uint_fast8_t nt_bit = BIT(bitflip, i) ^ keystream_bit;
-				uint_fast8_t LSFR_feedback = BIT(cs_delta.odd, 2) ^ BIT(cs_delta.even, 2) ^ BIT(cs_delta.odd, 3); 
+				uint_fast8_t LSFR_feedback = BIT(cs_delta.odd, 2) ^ BIT(cs_delta.even, 2) ^ BIT(cs_delta.odd, 3);
 
 				cs_delta.even = cs_delta.even << 1 | (LSFR_feedback ^ nt_bit);
 				uint_fast8_t tmp = cs_delta.odd;
@@ -341,7 +341,7 @@ static void precalculate_bit0_bitflip_bitarrays(uint8_t const bitflip, uint16_t
 					cs.odd = even_state >> (7 - i) / 2;
 				}
 			}
-			
+
 			if (evenparity32(keystream) == evenparity32(bitflip)) {
 				// found valid bitflip state
 				even_state_is_possible = true;
@@ -353,7 +353,7 @@ static void precalculate_bit0_bitflip_bitarrays(uint8_t const bitflip, uint16_t
 				set_bit24(test_not_bitarray[EVEN_STATE], even_state);
 				set_bit24(test_not_bitarray[EVEN_STATE], 1 << 23 | even_state);
 				set_bit24(test_not_bitarray[ODD_STATE], odd_state);
-			}				
+			}
 		}
 		if (!even_state_is_possible) {
 			all_odd_states_are_possible_for_notbitflip = true;
@@ -364,9 +364,9 @@ static void precalculate_bit0_bitflip_bitarrays(uint8_t const bitflip, uint16_t
 	for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
 		count[odd_even] = count_states(test_bitarray[odd_even]);
 		if (count[odd_even] != 1<<24) {
-			printf("Writing %d possible %s states for bitflip property %03x (%d (%1.2f%%) states eliminated)\n", 
-				count[odd_even], 
-				odd_even==EVEN_STATE?"even":"odd", 
+			printf("Writing %d possible %s states for bitflip property %03x (%d (%1.2f%%) states eliminated)\n",
+				count[odd_even],
+				odd_even==EVEN_STATE?"even":"odd",
 				bitflip, (1<<24) - count[odd_even],
 				(float)((1<<24) - count[odd_even]) / (1<<24) * 100.0);
 			#ifndef TEST_RUN
@@ -391,9 +391,9 @@ static void precalculate_bit0_bitflip_bitarrays(uint8_t const bitflip, uint16_t
 			}
 			count[odd_even] = count_states(test_bitarray_2nd);
 			if (count[odd_even] != 1<<24) {
-				printf("Writing %d possible %s states for bitflip property %03x (%d (%1.2f%%) states eliminated)\n", 
-					count[odd_even], 
-					odd_even==EVEN_STATE?"even":"odd", 
+				printf("Writing %d possible %s states for bitflip property %03x (%d (%1.2f%%) states eliminated)\n",
+					count[odd_even],
+					odd_even==EVEN_STATE?"even":"odd",
 					bitflip | BITFLIP_2ND_BYTE, (1<<24) - count[odd_even],
 					(float)((1<<24) - count[odd_even]) / (1<<24) * 100.0);
 				#ifndef TEST_RUN
@@ -418,7 +418,7 @@ static void precalculate_bit0_bitflip_bitarrays(uint8_t const bitflip, uint16_t
 		if (difftime(time_now, last_check_time) > 5*60) {	// print status every 5 minutes
 			float runtime = difftime(time_now, start_time);
 			float remaining_time = runtime * ((1<<23) - even_state) / even_state;
-			printf("\n%1.1f hours elapsed, expected completion in %1.1f hours (%1.1f days)", runtime/3600, remaining_time/3600, remaining_time/3600/24); 
+			printf("\n%1.1f hours elapsed, expected completion in %1.1f hours (%1.1f days)", runtime/3600, remaining_time/3600, remaining_time/3600/24);
 			last_check_time = time_now;
 		}
 		for (uint32_t odd_state = next_state(sum_a0_bitarray[ODD_STATE], -1); odd_state < (1<<24); odd_state = next_state(sum_a0_bitarray[ODD_STATE], odd_state)) {
@@ -438,16 +438,16 @@ static void precalculate_bit0_bitflip_bitarrays(uint8_t const bitflip, uint16_t
 			} cs_delta;
 			cs_delta.odd = 0;
 			cs_delta.even = 0;
-			
+
 			uint_fast16_t keystream = 0;
 			// uint_fast16_t nt = 0;
-			
+
 			// decrypt 9 bits
 			for (int i = 0; i < 9; i++) {
-				uint_fast8_t keystream_bit = filter(cs.odd & 0x000fffff) ^ filter((cs.odd & 0x000fffff) ^ cs_delta.odd); 
+				uint_fast8_t keystream_bit = filter(cs.odd & 0x000fffff) ^ filter((cs.odd & 0x000fffff) ^ cs_delta.odd);
 				keystream = keystream << 1 | keystream_bit;
 				uint_fast8_t nt_bit = BIT(bitflip|0x100, i) ^ keystream_bit;
-				uint_fast8_t LSFR_feedback = BIT(cs_delta.odd, 2) ^ BIT(cs_delta.even, 2) ^ BIT(cs_delta.odd, 3); 
+				uint_fast8_t LSFR_feedback = BIT(cs_delta.odd, 2) ^ BIT(cs_delta.even, 2) ^ BIT(cs_delta.odd, 3);
 
 				cs_delta.even = cs_delta.even << 1 | (LSFR_feedback ^ nt_bit);
 				uint_fast8_t tmp = cs_delta.odd;
@@ -461,7 +461,7 @@ static void precalculate_bit0_bitflip_bitarrays(uint8_t const bitflip, uint16_t
 					cs.odd = even_state >> (7 - i) / 2;
 				}
 			}
-			
+
 			if (evenparity32(keystream) != evenparity32(bitflip)) {
 				// found valid !bitflip state
 				even_state_is_possible = true;
@@ -471,14 +471,14 @@ static void precalculate_bit0_bitflip_bitarrays(uint8_t const bitflip, uint16_t
 			}
 		}
 	}
-	
+
 	printf("\nAnalysis completed. Checking for effective !bitflip properties...\n");
 	for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
 		count[odd_even] = count_states(test_not_bitarray[odd_even]);
 		if (count[odd_even] != 1<<24) {
-			printf("Writing %d possible %s states for bitflip property %03x (%d (%1.2f%%) states eliminated)\n", 
-				count[odd_even], 
-				odd_even==EVEN_STATE?"even":"odd", 
+			printf("Writing %d possible %s states for bitflip property %03x (%d (%1.2f%%) states eliminated)\n",
+				count[odd_even],
+				odd_even==EVEN_STATE?"even":"odd",
 				bitflip|0x100, (1<<24) - count[odd_even],
 				(float)((1<<24) - count[odd_even]) / (1<<24) * 100.0);
 			#ifndef TEST_RUN
@@ -503,9 +503,9 @@ static void precalculate_bit0_bitflip_bitarrays(uint8_t const bitflip, uint16_t
 			}
 			count[odd_even] = count_states(test_bitarray_2nd);
 			if (count[odd_even] != 1<<24) {
-				printf("Writing %d possible %s states for bitflip property %03x (%d (%1.2f%%) states eliminated)\n", 
-					count[odd_even], 
-					odd_even==EVEN_STATE?"even":"odd", 
+				printf("Writing %d possible %s states for bitflip property %03x (%d (%1.2f%%) states eliminated)\n",
+					count[odd_even],
+					odd_even==EVEN_STATE?"even":"odd",
 					bitflip | 0x100| BITFLIP_2ND_BYTE, (1<<24) - count[odd_even],
 					(float)((1<<24) - count[odd_even]) / (1<<24) * 100.0);
 				#ifndef TEST_RUN
@@ -524,7 +524,7 @@ static void precalculate_bit0_bitflip_bitarrays(uint8_t const bitflip, uint16_t
 	free_bitarray(test_not_bitarray[EVEN_STATE]);
 	free_bitarray(test_bitarray[ODD_STATE]);
 	free_bitarray(test_bitarray[EVEN_STATE]);
-	
+
 	exit(0);
 }
 
@@ -533,7 +533,7 @@ int main (int argc, char *argv[]) {
 
 	unsigned int bitflip_in;
 	int sum_a0;
-	
+
 	printf("Create tables required by hardnested attack.\n");
 	printf("Expect a runtime in the range of days or weeks.\n");
 	printf("Single thread only. If you want to use several threads, start it multiple times :-)\n\n");
@@ -550,7 +550,7 @@ int main (int argc, char *argv[]) {
 		printf("Bitflip property must be less than or equal to 0xff\n\n");
 		return 1;
 	}
-	
+
 	if(argc == 3) {
 		sscanf(argv[2], "%d", &sum_a0);
 	}
@@ -577,16 +577,16 @@ int main (int argc, char *argv[]) {
 		case  256: break;
 		default: sum_a0 = -1;
 	}
-	
+
 	printf("Calculating for bitflip = %02x, sum_a0 = %d\n", bitflip_in, sum_a0);
-	
+
 	init_part_sum_bitarrays();
 	init_sum_bitarray(sum_a0);
-	
+
 	precalculate_bit0_bitflip_bitarrays(bitflip_in, sum_a0);
 
 	free_sum_bitarray();
 	free_part_sum_bitarrays();
-	
+
 	return 0;
 }
\ No newline at end of file
diff --git a/client/hid-flasher/proxusb.c b/client/hid-flasher/proxusb.c
index eb0860ec1..45100e9ed 100644
--- a/client/hid-flasher/proxusb.c
+++ b/client/hid-flasher/proxusb.c
@@ -155,7 +155,7 @@ usb_dev_handle* findProxmark(int verbose, unsigned int *iface)
 		else {
 			iSelection = 1;
 		}
-	
+
 		iSelection --;
 
 		for (int i = 0; i < iUnit; i++) {
diff --git a/client/hid-flasher/usb_cmd.h b/client/hid-flasher/usb_cmd.h
index 59027c9d3..002c41252 100644
--- a/client/hid-flasher/usb_cmd.h
+++ b/client/hid-flasher/usb_cmd.h
@@ -200,7 +200,7 @@ typedef struct {
 #define CMD_MIFARE_SNIFFER                                                0x0630
 //ultralightC
 #define CMD_MIFAREUC_AUTH                                                 0x0724
-//0x0725 and 0x0726 no longer used 
+//0x0725 and 0x0726 no longer used
 #define CMD_MIFAREUC_SETPWD                                               0x0727
 
 
@@ -214,7 +214,7 @@ typedef struct {
 #define CMD_MIFARE_DESFIRE                                                0x072e
 
 #define CMD_MIFARE_COLLECT_NONCES										  0x072f
-				 
+
 #define CMD_HF_SNIFFER                                                    0x0800
 
 #define CMD_UNKNOWN                                                       0xFFFF
diff --git a/client/jansson/lookup3.h b/client/jansson/lookup3.h
index 2fe4c258f..ec2d0ffd6 100644
--- a/client/jansson/lookup3.h
+++ b/client/jansson/lookup3.h
@@ -3,8 +3,8 @@
 lookup3.c, by Bob Jenkins, May 2006, Public Domain.
 
 These are functions for producing 32-bit hashes for hash table lookup.
-hashword(), hashlittle(), hashlittle2(), hashbig(), mix(), and final() 
-are externally useful functions.  Routines to test the hash are included 
+hashword(), hashlittle(), hashlittle2(), hashbig(), mix(), and final()
+are externally useful functions.  Routines to test the hash are included
 if SELF_TEST is defined.  You can use this free for any purpose.  It's in
 the public domain.  It has no warranty.
 
@@ -12,7 +12,7 @@ You probably want to use hashlittle().  hashlittle() and hashbig()
 hash byte arrays.  hashlittle() is is faster than hashbig() on
 little-endian machines.  Intel and AMD are little-endian machines.
 On second thought, you probably want hashlittle2(), which is identical to
-hashlittle() except it returns two 32-bit hashes for the price of one.  
+hashlittle() except it returns two 32-bit hashes for the price of one.
 You could implement hashbig2() if you wanted but I haven't bothered here.
 
 If you want to find a hash of, say, exactly 7 integers, do
@@ -25,9 +25,9 @@ If you want to find a hash of, say, exactly 7 integers, do
 then use c as the hash value.  If you have a variable length array of
 4-byte integers to hash, use hashword().  If you have a byte array (like
 a character string), use hashlittle().  If you have several byte arrays, or
-a mix of things, see the comments above hashlittle().  
+a mix of things, see the comments above hashlittle().
 
-Why is this so big?  I read 12 bytes at a time into 3 4-byte integers, 
+Why is this so big?  I read 12 bytes at a time into 3 4-byte integers,
 then mix those integers.  This is fast (you can do a lot more thorough
 mixing with 12*3 instructions on 3 integers than you can with 3 instructions
 on 1 byte), but shoehorning those bytes into integers efficiently is messy.
@@ -94,7 +94,7 @@ This was tested for:
   the output delta to a Gray code (a^(a>>1)) so a string of 1's (as
   is commonly produced by subtraction) look like a single 1-bit
   difference.
-* the base values were pseudorandom, all zero but one bit set, or 
+* the base values were pseudorandom, all zero but one bit set, or
   all zero plus a counter that starts at zero.
 
 Some k values for my "a-=c; a^=rot(c,k); c+=b;" arrangement that
@@ -104,7 +104,7 @@ satisfy this are
    14  9  3  7 17  3
 Well, "9 15 3 18 27 15" didn't quite get 32 bits diffing
 for "differ" defined as + with a one-bit base and a two-bit delta.  I
-used http://burtleburtle.net/bob/hash/avalanche.html to choose 
+used http://burtleburtle.net/bob/hash/avalanche.html to choose
 the operations, constants, and arrangements of the variables.
 
 This does not achieve avalanche.  There are input bits of (a,b,c)
@@ -143,7 +143,7 @@ produce values of c that look totally different.  This was tested for
   the output delta to a Gray code (a^(a>>1)) so a string of 1's (as
   is commonly produced by subtraction) look like a single 1-bit
   difference.
-* the base values were pseudorandom, all zero but one bit set, or 
+* the base values were pseudorandom, all zero but one bit set, or
   all zero plus a counter that starts at zero.
 
 These constants passed:
@@ -236,7 +236,7 @@ static uint32_t hashlittle(const void *key, size_t length, uint32_t initval)
     }
 
     /*----------------------------- handle the last (probably partial) block */
-    /* 
+    /*
      * "k[2]&0xffffff" actually reads beyond the end of the string, but
      * then masks off the part it's not allowed to read.  Because the
      * string is aligned, the masked-off tail is in the same word as the
diff --git a/client/jansson/path.c b/client/jansson/path.c
index e3098f5f4..785a3e824 100644
--- a/client/jansson/path.c
+++ b/client/jansson/path.c
@@ -3,7 +3,7 @@
  *
  * Jansson is free software; you can redistribute it and/or modify
  * it under the terms of the MIT license. See LICENSE for details.
- * 
+ *
  * source here https://github.com/rogerz/jansson/blob/json_path/src/path.c
  */
 
diff --git a/client/loclass/cipher.c b/client/loclass/cipher.c
index e8553ba6c..bf921c452 100644
--- a/client/loclass/cipher.c
+++ b/client/loclass/cipher.c
@@ -1,13 +1,13 @@
 /*****************************************************************************
  * WARNING
  *
- * THIS CODE IS CREATED FOR EXPERIMENTATION AND EDUCATIONAL USE ONLY. 
- * 
- * USAGE OF THIS CODE IN OTHER WAYS MAY INFRINGE UPON THE INTELLECTUAL 
- * PROPERTY OF OTHER PARTIES, SUCH AS INSIDE SECURE AND HID GLOBAL, 
- * AND MAY EXPOSE YOU TO AN INFRINGEMENT ACTION FROM THOSE PARTIES. 
- * 
- * THIS CODE SHOULD NEVER BE USED TO INFRINGE PATENTS OR INTELLECTUAL PROPERTY RIGHTS. 
+ * THIS CODE IS CREATED FOR EXPERIMENTATION AND EDUCATIONAL USE ONLY.
+ *
+ * USAGE OF THIS CODE IN OTHER WAYS MAY INFRINGE UPON THE INTELLECTUAL
+ * PROPERTY OF OTHER PARTIES, SUCH AS INSIDE SECURE AND HID GLOBAL,
+ * AND MAY EXPOSE YOU TO AN INFRINGEMENT ACTION FROM THOSE PARTIES.
+ *
+ * THIS CODE SHOULD NEVER BE USED TO INFRINGE PATENTS OR INTELLECTUAL PROPERTY RIGHTS.
  *
  *****************************************************************************
  *
@@ -22,7 +22,7 @@
  *
  * This is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation, or, at your option, any later version. 
+ * by the Free Software Foundation, or, at your option, any later version.
  *
  * This file is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -31,8 +31,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with loclass.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
  ****************************************************************************/
 
 
@@ -218,7 +218,7 @@ void MAC(uint8_t* k, BitstreamIn input, BitstreamOut out)
 	BitstreamIn input_32_zeroes = {zeroes_32,sizeof(zeroes_32)*8,0};
 	State initState = suc(k,init(k),&input);
 	output(k,initState,&input_32_zeroes,&out);
-}	 
+}
 
 void doMAC(uint8_t *cc_nr_p, uint8_t *div_key_p, uint8_t mac[4])
 {
@@ -228,7 +228,7 @@ void doMAC(uint8_t *cc_nr_p, uint8_t *div_key_p, uint8_t mac[4])
 
 	memcpy(cc_nr, cc_nr_p, 12);
     memcpy(div_key, div_key_p, 8);
-    
+
 	reverse_arraybytes(cc_nr, 12);
 	BitstreamIn bitstream = {cc_nr, 12 * 8, 0};
 	uint8_t dest []= {0,0,0,0,0,0,0,0};
diff --git a/client/loclass/cipher.h b/client/loclass/cipher.h
index 632910a98..c6d2f0320 100644
--- a/client/loclass/cipher.h
+++ b/client/loclass/cipher.h
@@ -1,13 +1,13 @@
 /*****************************************************************************
  * WARNING
  *
- * THIS CODE IS CREATED FOR EXPERIMENTATION AND EDUCATIONAL USE ONLY. 
- * 
- * USAGE OF THIS CODE IN OTHER WAYS MAY INFRINGE UPON THE INTELLECTUAL 
- * PROPERTY OF OTHER PARTIES, SUCH AS INSIDE SECURE AND HID GLOBAL, 
- * AND MAY EXPOSE YOU TO AN INFRINGEMENT ACTION FROM THOSE PARTIES. 
- * 
- * THIS CODE SHOULD NEVER BE USED TO INFRINGE PATENTS OR INTELLECTUAL PROPERTY RIGHTS. 
+ * THIS CODE IS CREATED FOR EXPERIMENTATION AND EDUCATIONAL USE ONLY.
+ *
+ * USAGE OF THIS CODE IN OTHER WAYS MAY INFRINGE UPON THE INTELLECTUAL
+ * PROPERTY OF OTHER PARTIES, SUCH AS INSIDE SECURE AND HID GLOBAL,
+ * AND MAY EXPOSE YOU TO AN INFRINGEMENT ACTION FROM THOSE PARTIES.
+ *
+ * THIS CODE SHOULD NEVER BE USED TO INFRINGE PATENTS OR INTELLECTUAL PROPERTY RIGHTS.
  *
  *****************************************************************************
  *
@@ -22,7 +22,7 @@
  *
  * This is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation, or, at your option, any later version. 
+ * by the Free Software Foundation, or, at your option, any later version.
  *
  * This file is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -31,8 +31,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with loclass.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
  ****************************************************************************/
 
 
diff --git a/client/loclass/cipherutils.c b/client/loclass/cipherutils.c
index e22c88894..43b892fd8 100644
--- a/client/loclass/cipherutils.c
+++ b/client/loclass/cipherutils.c
@@ -1,13 +1,13 @@
 /*****************************************************************************
  * WARNING
  *
- * THIS CODE IS CREATED FOR EXPERIMENTATION AND EDUCATIONAL USE ONLY. 
- * 
- * USAGE OF THIS CODE IN OTHER WAYS MAY INFRINGE UPON THE INTELLECTUAL 
- * PROPERTY OF OTHER PARTIES, SUCH AS INSIDE SECURE AND HID GLOBAL, 
- * AND MAY EXPOSE YOU TO AN INFRINGEMENT ACTION FROM THOSE PARTIES. 
- * 
- * THIS CODE SHOULD NEVER BE USED TO INFRINGE PATENTS OR INTELLECTUAL PROPERTY RIGHTS. 
+ * THIS CODE IS CREATED FOR EXPERIMENTATION AND EDUCATIONAL USE ONLY.
+ *
+ * USAGE OF THIS CODE IN OTHER WAYS MAY INFRINGE UPON THE INTELLECTUAL
+ * PROPERTY OF OTHER PARTIES, SUCH AS INSIDE SECURE AND HID GLOBAL,
+ * AND MAY EXPOSE YOU TO AN INFRINGEMENT ACTION FROM THOSE PARTIES.
+ *
+ * THIS CODE SHOULD NEVER BE USED TO INFRINGE PATENTS OR INTELLECTUAL PROPERTY RIGHTS.
  *
  *****************************************************************************
  *
@@ -22,7 +22,7 @@
  *
  * This is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation, or, at your option, any later version. 
+ * by the Free Software Foundation, or, at your option, any later version.
  *
  * This file is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -31,8 +31,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with loclass.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
  ****************************************************************************/
 
 #include <stdint.h>
@@ -212,7 +212,7 @@ int testBitStream()
 		//printf("Bits left: %d\n", bitsLeft(&in));
 		//printf("Bits out: %d\n", numBits(&out));
 	}
-	
+
 	if(memcmp(input, output, sizeof(input)) == 0) {
 		PrintAndLogDevice(SUCCESS, "    Bitstream test 1 ok");
 	} else {
@@ -240,11 +240,11 @@ int testReversedBitstream()
 	while (bitsLeft(&in) > 0) {
 		pushBit(&reversed_out, tailBit(&in));
 	}
-	
+
 	while (bitsLeft(&reversed_in) > 0) {
 		pushBit(&out, tailBit(&reversed_in));
 	}
-	
+
 	if (memcmp(input, output, sizeof(input)) == 0) {
 		PrintAndLogDevice(SUCCESS, "    Bitstream test 2 ok");
 	} else {
diff --git a/client/loclass/cipherutils.h b/client/loclass/cipherutils.h
index 21d11aac0..bc40c560b 100644
--- a/client/loclass/cipherutils.h
+++ b/client/loclass/cipherutils.h
@@ -1,13 +1,13 @@
 /*****************************************************************************
  * WARNING
  *
- * THIS CODE IS CREATED FOR EXPERIMENTATION AND EDUCATIONAL USE ONLY. 
- * 
- * USAGE OF THIS CODE IN OTHER WAYS MAY INFRINGE UPON THE INTELLECTUAL 
- * PROPERTY OF OTHER PARTIES, SUCH AS INSIDE SECURE AND HID GLOBAL, 
- * AND MAY EXPOSE YOU TO AN INFRINGEMENT ACTION FROM THOSE PARTIES. 
- * 
- * THIS CODE SHOULD NEVER BE USED TO INFRINGE PATENTS OR INTELLECTUAL PROPERTY RIGHTS. 
+ * THIS CODE IS CREATED FOR EXPERIMENTATION AND EDUCATIONAL USE ONLY.
+ *
+ * USAGE OF THIS CODE IN OTHER WAYS MAY INFRINGE UPON THE INTELLECTUAL
+ * PROPERTY OF OTHER PARTIES, SUCH AS INSIDE SECURE AND HID GLOBAL,
+ * AND MAY EXPOSE YOU TO AN INFRINGEMENT ACTION FROM THOSE PARTIES.
+ *
+ * THIS CODE SHOULD NEVER BE USED TO INFRINGE PATENTS OR INTELLECTUAL PROPERTY RIGHTS.
  *
  *****************************************************************************
  *
@@ -22,7 +22,7 @@
  *
  * This is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation, or, at your option, any later version. 
+ * by the Free Software Foundation, or, at your option, any later version.
  *
  * This file is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -31,8 +31,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with loclass.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
  ****************************************************************************/
 
 
diff --git a/client/loclass/elite_crack.c b/client/loclass/elite_crack.c
index 630fa72a6..fa370a940 100644
--- a/client/loclass/elite_crack.c
+++ b/client/loclass/elite_crack.c
@@ -1,13 +1,13 @@
 /*****************************************************************************
  * WARNING
  *
- * THIS CODE IS CREATED FOR EXPERIMENTATION AND EDUCATIONAL USE ONLY. 
- * 
- * USAGE OF THIS CODE IN OTHER WAYS MAY INFRINGE UPON THE INTELLECTUAL 
- * PROPERTY OF OTHER PARTIES, SUCH AS INSIDE SECURE AND HID GLOBAL, 
- * AND MAY EXPOSE YOU TO AN INFRINGEMENT ACTION FROM THOSE PARTIES. 
- * 
- * THIS CODE SHOULD NEVER BE USED TO INFRINGE PATENTS OR INTELLECTUAL PROPERTY RIGHTS. 
+ * THIS CODE IS CREATED FOR EXPERIMENTATION AND EDUCATIONAL USE ONLY.
+ *
+ * USAGE OF THIS CODE IN OTHER WAYS MAY INFRINGE UPON THE INTELLECTUAL
+ * PROPERTY OF OTHER PARTIES, SUCH AS INSIDE SECURE AND HID GLOBAL,
+ * AND MAY EXPOSE YOU TO AN INFRINGEMENT ACTION FROM THOSE PARTIES.
+ *
+ * THIS CODE SHOULD NEVER BE USED TO INFRINGE PATENTS OR INTELLECTUAL PROPERTY RIGHTS.
  *
  *****************************************************************************
  *
@@ -22,7 +22,7 @@
  *
  * This is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation, or, at your option, any later version. 
+ * by the Free Software Foundation, or, at your option, any later version.
  *
  * This file is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -31,9 +31,9 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with loclass.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
- * 
+ *
+ *
+ *
  ****************************************************************************/
 #include <stdint.h>
 #include <stdbool.h>
@@ -147,7 +147,7 @@ void hash1(uint8_t csn[] , uint8_t k[]) {
 	k[5] = ~rl( csn[5] + k[3] ) + 1;
 	k[6] = rr( csn[6] + (k[4] ^ 0x3c) );
 	k[7] = rl( csn[7] + (k[5] ^ 0xc3) );
-	
+
 	k[7] &= 0x7F;
 	k[6] &= 0x7F;
 	k[5] &= 0x7F;
@@ -217,7 +217,7 @@ void hash2(uint8_t *key64, uint8_t *outp_keytable) {
     int i;
     for (i=0; i<8; i++)
         key64_negated[i]= ~key64[i];
-	
+
     // Once again, key is on iclass-format
     desencrypt_iclass(key64, key64_negated, z[0]);
 
@@ -319,7 +319,7 @@ int bruteforceItem(dumpdata item, uint16_t keytable[]) {
 	int i;
 	for (i=0; i<8; i++)	{
 		if (keytable[key_index[i]] & (CRACKED | BEING_CRACKED)) continue;
-		
+
 		bytes_to_recover[numbytes_to_recover++] = key_index[i];
 		keytable[key_index[i]] |= BEING_CRACKED;
 
@@ -355,7 +355,7 @@ int bruteforceItem(dumpdata item, uint16_t keytable[]) {
 		PrintAndLogDevice(INFO, "Bruteforcing byte %d", bytes_to_recover[i]);
 
 	while (!found && !(brute & endmask)) {
-		
+
 		//Update the keytable with the brute-values
 		for (i=0; i < numbytes_to_recover; i++) {
 			keytable[bytes_to_recover[i]] &= 0xFF00;
@@ -383,7 +383,7 @@ int bruteforceItem(dumpdata item, uint16_t keytable[]) {
 		if (memcmp(calculated_MAC, item.mac, 4) == 0) {
 			printf("\r\n");
 			for (i =0 ; i < numbytes_to_recover; i++) {
-				PrintAndLogDevice(INFO, "%d: 0x%02x", bytes_to_recover[i], 0xFF & keytable[bytes_to_recover[i]]);	
+				PrintAndLogDevice(INFO, "%d: 0x%02x", bytes_to_recover[i], 0xFF & keytable[bytes_to_recover[i]]);
 			}
 			found = true;
 			break;
@@ -397,7 +397,7 @@ int bruteforceItem(dumpdata item, uint16_t keytable[]) {
 			fflush(stdout);
 		}
 	}
-	
+
 	if (!found) {
 		PrintAndLogDevice(NORMAL, "\n"); PrintAndLogDevice(WARNING, "Failed to recover %d bytes using the following CSN", numbytes_to_recover);
 		printvar("[!] CSN", item.csn, 8);
@@ -501,7 +501,7 @@ int bruteforceDump(uint8_t dump[], size_t dumpsize, uint16_t keytable[]) {
 	}
 	free(attack);
 
-	PrintAndLogDevice(SUCCESS, "time: %" PRIu64 " seconds", (msclock()-t1)/1000);	
+	PrintAndLogDevice(SUCCESS, "time: %" PRIu64 " seconds", (msclock()-t1)/1000);
 
 	// Pick out the first 16 bytes of the keytable.
 	// The keytable is now in 16-bit ints, where the upper 8 bits
@@ -511,7 +511,7 @@ int bruteforceDump(uint8_t dump[], size_t dumpsize, uint16_t keytable[]) {
 
 	for (i = 0 ; i < 16 ; i++) {
 		first16bytes[i] = keytable[i] & 0xFF;
-		
+
 		if (!(keytable[i] & CRACKED))
 			PrintAndLogDevice(WARNING, "error, we are missing byte %d, custom key calculation will fail...", i);
 	}
@@ -551,7 +551,7 @@ int bruteforceFile(const char *filename, uint16_t keytable[]) {
 	size_t bytes_read = fread(dump, 1, fsize, f);
 
 	fclose(f);
-	
+
     if (bytes_read < fsize) {
         PrintAndLogDevice(WARNING, "Error, could only read %d bytes (should be %d)", bytes_read, fsize );
 	}
diff --git a/client/loclass/elite_crack.h b/client/loclass/elite_crack.h
index 5413d84d0..f2cce1064 100644
--- a/client/loclass/elite_crack.h
+++ b/client/loclass/elite_crack.h
@@ -1,13 +1,13 @@
 /*****************************************************************************
  * WARNING
  *
- * THIS CODE IS CREATED FOR EXPERIMENTATION AND EDUCATIONAL USE ONLY. 
- * 
- * USAGE OF THIS CODE IN OTHER WAYS MAY INFRINGE UPON THE INTELLECTUAL 
- * PROPERTY OF OTHER PARTIES, SUCH AS INSIDE SECURE AND HID GLOBAL, 
- * AND MAY EXPOSE YOU TO AN INFRINGEMENT ACTION FROM THOSE PARTIES. 
- * 
- * THIS CODE SHOULD NEVER BE USED TO INFRINGE PATENTS OR INTELLECTUAL PROPERTY RIGHTS. 
+ * THIS CODE IS CREATED FOR EXPERIMENTATION AND EDUCATIONAL USE ONLY.
+ *
+ * USAGE OF THIS CODE IN OTHER WAYS MAY INFRINGE UPON THE INTELLECTUAL
+ * PROPERTY OF OTHER PARTIES, SUCH AS INSIDE SECURE AND HID GLOBAL,
+ * AND MAY EXPOSE YOU TO AN INFRINGEMENT ACTION FROM THOSE PARTIES.
+ *
+ * THIS CODE SHOULD NEVER BE USED TO INFRINGE PATENTS OR INTELLECTUAL PROPERTY RIGHTS.
  *
  *****************************************************************************
  *
@@ -22,7 +22,7 @@
  *
  * This is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation, or, at your option, any later version. 
+ * by the Free Software Foundation, or, at your option, any later version.
  *
  * This file is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -31,8 +31,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with loclass.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
  ****************************************************************************/
 
 
diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index f9d4db8d1..c26bb2a5d 100644
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -1,13 +1,13 @@
 /*****************************************************************************
  * WARNING
  *
- * THIS CODE IS CREATED FOR EXPERIMENTATION AND EDUCATIONAL USE ONLY. 
- * 
- * USAGE OF THIS CODE IN OTHER WAYS MAY INFRINGE UPON THE INTELLECTUAL 
- * PROPERTY OF OTHER PARTIES, SUCH AS INSIDE SECURE AND HID GLOBAL, 
- * AND MAY EXPOSE YOU TO AN INFRINGEMENT ACTION FROM THOSE PARTIES. 
- * 
- * THIS CODE SHOULD NEVER BE USED TO INFRINGE PATENTS OR INTELLECTUAL PROPERTY RIGHTS. 
+ * THIS CODE IS CREATED FOR EXPERIMENTATION AND EDUCATIONAL USE ONLY.
+ *
+ * USAGE OF THIS CODE IN OTHER WAYS MAY INFRINGE UPON THE INTELLECTUAL
+ * PROPERTY OF OTHER PARTIES, SUCH AS INSIDE SECURE AND HID GLOBAL,
+ * AND MAY EXPOSE YOU TO AN INFRINGEMENT ACTION FROM THOSE PARTIES.
+ *
+ * THIS CODE SHOULD NEVER BE USED TO INFRINGE PATENTS OR INTELLECTUAL PROPERTY RIGHTS.
  *
  *****************************************************************************
  *
@@ -22,7 +22,7 @@
  *
  * This is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation, or, at your option, any later version. 
+ * by the Free Software Foundation, or, at your option, any later version.
  *
  * This file is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -31,8 +31,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with loclass.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
  ****************************************************************************/
 #include "fileutils.h"
 
@@ -101,12 +101,12 @@ int saveFileEML(const char *preferredName, const char *suffix, uint8_t* data, si
 		sprintf(fileName,"%s-%d.%s", preferredName, num, suffix);
 		num++;
 	}
-	
+
 	/* We should have a valid filename now, e.g. dumpdata-3.bin */
 
 	/*Opening file for writing in text mode*/
 	FILE *f = fopen(fileName, "w+");
-	if (!f) {		
+	if (!f) {
 		PrintAndLogDevice(WARNING, "file not found or locked. '" _YELLOW_(%s)"'", fileName);
 		retval =  1;
 		goto out;
@@ -114,7 +114,7 @@ int saveFileEML(const char *preferredName, const char *suffix, uint8_t* data, si
 
 	for (i = 0; i < datalen; i++) {
 		fprintf(f, "%02X", data[i] );
-		
+
 		// no extra line in the end
 		if ( (i+1) % blocksize == 0 && currblock != blocks ) {
 			fprintf(f, "\n");
@@ -131,8 +131,8 @@ int saveFileEML(const char *preferredName, const char *suffix, uint8_t* data, si
 	fflush(f);
 	fclose(f);
 	PrintAndLogDevice(SUCCESS, "saved %d blocks to text file " _YELLOW_(%s), blocks, fileName);
-	
-out:	
+
+out:
 	free(fileName);
 	return retval;
 }
@@ -165,13 +165,13 @@ int saveFileJSON(const char *preferredName, const char *suffix, JSONFileType fty
 				char path[PATH_MAX_LENGTH] = {0};
 				sprintf(path, "$.blocks.%d", i);
 				JsonSaveBufAsHexCompact(root, path, &data[i * 16], 16);
-				
+
 				if (i == 0) {
 					JsonSaveBufAsHexCompact(root, "$.Card.UID", &data[0], 4);
 					JsonSaveBufAsHexCompact(root, "$.Card.SAK", &data[5], 1);
 					JsonSaveBufAsHexCompact(root, "$.Card.ATQA", &data[6], 2);
 				}
-				
+
 				if (mfIsSectorTrailer(i)) {
 					memset(path, 0x00, sizeof(path));
 					sprintf(path, "$.SectorKeys.%d.KeyA", mfSectorNum(i));
@@ -216,7 +216,7 @@ int saveFileJSON(const char *preferredName, const char *suffix, JSONFileType fty
 			uint8_t uid[7] = {0};
 			memcpy(uid, tmp->data, 3);
 			memcpy(uid+3, tmp->data+4, 4);
-			
+
 			JsonSaveBufAsHexCompact(root, "$.Card.UID", uid, sizeof(uid));
 			JsonSaveBufAsHexCompact(root, "$.Card.Version", tmp->version, sizeof(tmp->version));
 			JsonSaveBufAsHexCompact(root, "$.Card.TBO_0", tmp->tbo, sizeof(tmp->tbo));
@@ -233,7 +233,7 @@ int saveFileJSON(const char *preferredName, const char *suffix, JSONFileType fty
 
 				char path[PATH_MAX_LENGTH] = {0};
 				sprintf(path, "$.blocks.%d", i);
-				JsonSaveBufAsHexCompact(root, path, tmp->data + (i * 4), 4);				
+				JsonSaveBufAsHexCompact(root, path, tmp->data + (i * 4), 4);
 			}
 		break;
 	}
@@ -248,7 +248,7 @@ int saveFileJSON(const char *preferredName, const char *suffix, JSONFileType fty
 	PrintAndLogDevice(SUCCESS, "saved to json file " _YELLOW_(%s), fileName);
 	json_decref(root);
 
-out:	
+out:
 	free(fileName);
 	return retval;
 }
@@ -270,7 +270,7 @@ int loadFile(const char *preferredName, const char *suffix, void* data, size_t*
 		free(fileName);
 		return 1;
 	}
-	
+
 	// get filesize in order to malloc memory
 	fseek(f, 0, SEEK_END);
 	long fsize = ftell(f);
@@ -281,14 +281,14 @@ int loadFile(const char *preferredName, const char *suffix, void* data, size_t*
 		retval = 1;
 		goto out;
 	}
-	
+
 	uint8_t *dump = calloc(fsize, sizeof(uint8_t));
 	if ( !dump ) {
 		PrintAndLogDevice(FAILED, "error, cannot allocate memory");
 		retval = 2;
 		goto out;
 	}
-	
+
 	size_t bytes_read = fread(dump, 1, fsize, f);
 
 	if ( bytes_read != fsize ) {
@@ -297,18 +297,18 @@ int loadFile(const char *preferredName, const char *suffix, void* data, size_t*
 		retval = 3;
 		goto out;
 	}
-	
+
 	memcpy( (data), dump, bytes_read);
 	free(dump);
-	
+
 	PrintAndLogDevice(SUCCESS, "loaded %d bytes from binary file " _YELLOW_(%s), bytes_read, fileName);
-	
+
 	*datalen = bytes_read;
 
-out:	
+out:
 	fclose(f);
 	free(fileName);
-	
+
 	return retval;
 }
 
@@ -330,12 +330,12 @@ int loadFileEML(const char *preferredName, const char *suffix, void* data, size_
 		retval = 1;
 		goto out;
 	}
-	
-	// 128 + 2 newline chars + 1 null terminator	
+
+	// 128 + 2 newline chars + 1 null terminator
 	char line[131];
 	memset(line, 0, sizeof(line));
 	uint8_t buf[64] = {0x00};
-	
+
 	while ( !feof(f) ) {
 
 		memset(line, 0, sizeof(line));
@@ -346,10 +346,10 @@ int loadFileEML(const char *preferredName, const char *suffix, void* data, size_
 			retval = 2;
 			goto out;
 		}
-	
+
 		if ( line[0] == '#' )
 			continue;
-		
+
 		int res = param_gethex_to_eol(line, 0, buf, sizeof(buf), &hexlen);
 		if (res == 0 || res == 1) {
 			memcpy(data + counter, buf, hexlen);
@@ -358,11 +358,11 @@ int loadFileEML(const char *preferredName, const char *suffix, void* data, size_
 	}
 	fclose(f);
 	PrintAndLogDevice(SUCCESS, "loaded %d bytes from text file " _YELLOW_(%s), counter, fileName);
-	
+
 	if ( datalen )
 		*datalen = counter;
-		
-out:	
+
+out:
 	free(fileName);
 	return retval;
 }
@@ -372,7 +372,7 @@ int loadFileJSON(const char *preferredName, const char *suffix, void* data, size
 	if ( preferredName == NULL ) return 1;
 	if ( suffix == NULL ) return 1;
 	if ( data == NULL ) return 1;
-	
+
 	*datalen = 0;
 	json_t *root;
 	json_error_t error;
@@ -385,20 +385,20 @@ int loadFileJSON(const char *preferredName, const char *suffix, void* data, size
 	root = json_load_file(fileName, 0, &error);
 	if (!root) {
 		PrintAndLog("ERROR: json " _YELLOW_(%s) " error on line %d: %s", fileName, error.line, error.text);
-		retval = 2; 
+		retval = 2;
 		goto out;
 	}
-	
+
 	if (!json_is_object(root)) {
 		PrintAndLog("ERROR: Invalid json " _YELLOW_(%s) " format. root must be an object.", fileName);
-		retval = 3; 
+		retval = 3;
 		goto out;
 	}
-	
+
 	uint8_t *udata = (uint8_t *)data;
 	char ctype[100] = {0};
 	JsonLoadStr(root, "$.FileType", ctype);
-	
+
 	if (!strcmp(ctype, "raw")) {
 		JsonLoadBufAsHex(root, "$.raw", udata, maxdatalen, datalen);
 	}
@@ -413,15 +413,15 @@ int loadFileJSON(const char *preferredName, const char *suffix, void* data, size
 
 			char path[30] = {0};
 			sprintf(path, "$.blocks.%d", i);
-			
+
 			size_t len = 0;
 			JsonLoadBufAsHex(root, path, &udata[sptr], 16, &len);
 			if (!len)
 				break;
-			
+
 			sptr += len;
 		}
-		
+
 		*datalen = sptr;
 	}
 
@@ -435,21 +435,21 @@ int loadFileJSON(const char *preferredName, const char *suffix, void* data, size
 
 			char path[30] = {0};
 			sprintf(path, "$.blocks.%d", i);
-			
+
 			size_t len = 0;
 			JsonLoadBufAsHex(root, path, &udata[sptr], 4, &len);
 			if (!len)
 				break;
-			
+
 			sptr += len;
 		}
-		
+
 		*datalen = sptr;
 	}
 
-	
+
 	PrintAndLog("loaded from JSON file " _YELLOW_(%s), fileName);
-out:	
+out:
 	json_decref(root);
 	free(fileName);
 	return retval;
@@ -468,12 +468,12 @@ int loadFileDICTIONARY(const char *preferredName, const char *suffix, void* data
 	if (keylen != 4 && keylen != 6 && keylen != 8) {
 		keylen = 6;
 	}
-	
+
 	// double up since its chars
-	keylen <<= 1;	
-	
+	keylen <<= 1;
+
 	char line[255];
-	
+
     size_t counter = 0;
 	int retval = 0;
 	int size = sizeof(char) * (strlen(preferredName) + strlen(suffix) + 10);
@@ -486,10 +486,10 @@ int loadFileDICTIONARY(const char *preferredName, const char *suffix, void* data
 		retval = 1;
 		goto out;
 	}
-	
+
 	// read file
 	while ( fgets(line, sizeof(line), f) ) {
-		
+
 		// add null terminator
 		line[keylen] = 0;
 
@@ -497,18 +497,18 @@ int loadFileDICTIONARY(const char *preferredName, const char *suffix, void* data
 		if (strlen(line) < keylen)
 			continue;
 
-	
+
 		// The line start with # is comment, skip
 		if( line[0] == '#' )
 			continue;
-	
+
 		if (!isxdigit(line[0])){
 			PrintAndLogEx(FAILED, "file content error. '%s' must include " _BLUE_(%2d) "HEX symbols", line, keylen);
 			continue;
-		}	
+		}
 
 		uint64_t key = strtoull(line, NULL, 16);
-		
+
 		num_to_bytes(key, keylen >> 1, data + counter);
 		(*keycnt)++;
 		memset(line, 0, sizeof(line));
@@ -516,12 +516,12 @@ int loadFileDICTIONARY(const char *preferredName, const char *suffix, void* data
 	}
 	fclose(f);
 	PrintAndLogDevice(SUCCESS, "loaded " _GREEN_(%2d) "keys from dictionary file " _YELLOW_(%s), *keycnt, fileName);
-	
-	if ( datalen ) 
-		*datalen = counter;	
-out:	
+
+	if ( datalen )
+		*datalen = counter;
+out:
 	free(fileName);
-	return retval;	
+	return retval;
 }
 
 #else //if we're on ARM
diff --git a/client/loclass/fileutils.h b/client/loclass/fileutils.h
index 9485707f1..94bc18e94 100644
--- a/client/loclass/fileutils.h
+++ b/client/loclass/fileutils.h
@@ -1,13 +1,13 @@
 /*****************************************************************************
  * WARNING
  *
- * THIS CODE IS CREATED FOR EXPERIMENTATION AND EDUCATIONAL USE ONLY. 
- * 
- * USAGE OF THIS CODE IN OTHER WAYS MAY INFRINGE UPON THE INTELLECTUAL 
- * PROPERTY OF OTHER PARTIES, SUCH AS INSIDE SECURE AND HID GLOBAL, 
- * AND MAY EXPOSE YOU TO AN INFRINGEMENT ACTION FROM THOSE PARTIES. 
- * 
- * THIS CODE SHOULD NEVER BE USED TO INFRINGE PATENTS OR INTELLECTUAL PROPERTY RIGHTS. 
+ * THIS CODE IS CREATED FOR EXPERIMENTATION AND EDUCATIONAL USE ONLY.
+ *
+ * USAGE OF THIS CODE IN OTHER WAYS MAY INFRINGE UPON THE INTELLECTUAL
+ * PROPERTY OF OTHER PARTIES, SUCH AS INSIDE SECURE AND HID GLOBAL,
+ * AND MAY EXPOSE YOU TO AN INFRINGEMENT ACTION FROM THOSE PARTIES.
+ *
+ * THIS CODE SHOULD NEVER BE USED TO INFRINGE PATENTS OR INTELLECTUAL PROPERTY RIGHTS.
  *
  *****************************************************************************
  *
@@ -22,7 +22,7 @@
  *
  * This is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation, or, at your option, any later version. 
+ * by the Free Software Foundation, or, at your option, any later version.
  *
  * This file is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -31,8 +31,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with loclass.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
  ****************************************************************************/
 
 #ifndef FILEUTILS_H
@@ -153,7 +153,7 @@ extern int loadFileJSON(const char *preferredName, const char *suffix, void* dat
 extern int loadFileDICTIONARY(const char *preferredName, const char *suffix, void* data, size_t* datalen, uint8_t keylen, uint16_t* keycnt );
 
 #define PrintAndLogDevice(level, format, args...)  PrintAndLogEx(level, format , ## args)
-#else 
+#else
 
 	/**
  * Utility function to print to console. This is used consistently within the library instead
@@ -164,7 +164,7 @@ extern int loadFileDICTIONARY(const char *preferredName, const char *suffix, voi
  */
 #define PrintAndLogDevice(level, format, args...) { }
 
-	
+
 #endif //ON_DEVICE
 
 #endif // FILEUTILS_H
diff --git a/client/loclass/hash1_brute.c b/client/loclass/hash1_brute.c
index 003a10423..d2ae822a5 100644
--- a/client/loclass/hash1_brute.c
+++ b/client/loclass/hash1_brute.c
@@ -38,13 +38,13 @@ void calc_score(uint8_t* csn, uint8_t* k) {
             score +=1;
         }
     }
-	
+
     if (score >=2 && badscore < 2) {
         printf("CSN\t%02x%02x%02x%02x%02x%02x%02x%02x\t%02x %02x %02x %02x %02x %02x %02x %02x\t"
                ,csn[0],csn[1],csn[2],csn[3],csn[4],csn[5],csn[6],csn[7]
                 ,k[0],k[1],k[2],k[3],k[4],k[5],k[6],k[7]
                 );
-				
+
         for (i=0 ; i < score; i++) {
             printf("%d,", uniq_vals[i]);
         }
@@ -62,7 +62,7 @@ void brute_hash1(void){
     calc_score(testcsn,testkey);
     printf("Brute forcing hashones\n");
     //exit(1);
-	
+
     for (a=0; a < 256; a++) {
         //if(a > 0)printf("%d/256 done...\n", a);
         for (b=0; b < 256; b++)
diff --git a/client/loclass/ikeys.c b/client/loclass/ikeys.c
index c1265dc4d..847f90729 100644
--- a/client/loclass/ikeys.c
+++ b/client/loclass/ikeys.c
@@ -1,13 +1,13 @@
 /*****************************************************************************
  * WARNING
  *
- * THIS CODE IS CREATED FOR EXPERIMENTATION AND EDUCATIONAL USE ONLY. 
- * 
- * USAGE OF THIS CODE IN OTHER WAYS MAY INFRINGE UPON THE INTELLECTUAL 
- * PROPERTY OF OTHER PARTIES, SUCH AS INSIDE SECURE AND HID GLOBAL, 
- * AND MAY EXPOSE YOU TO AN INFRINGEMENT ACTION FROM THOSE PARTIES. 
- * 
- * THIS CODE SHOULD NEVER BE USED TO INFRINGE PATENTS OR INTELLECTUAL PROPERTY RIGHTS. 
+ * THIS CODE IS CREATED FOR EXPERIMENTATION AND EDUCATIONAL USE ONLY.
+ *
+ * USAGE OF THIS CODE IN OTHER WAYS MAY INFRINGE UPON THE INTELLECTUAL
+ * PROPERTY OF OTHER PARTIES, SUCH AS INSIDE SECURE AND HID GLOBAL,
+ * AND MAY EXPOSE YOU TO AN INFRINGEMENT ACTION FROM THOSE PARTIES.
+ *
+ * THIS CODE SHOULD NEVER BE USED TO INFRINGE PATENTS OR INTELLECTUAL PROPERTY RIGHTS.
  *
  *****************************************************************************
  *
@@ -22,7 +22,7 @@
  *
  * This is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation, or, at your option, any later version. 
+ * by the Free Software Foundation, or, at your option, any later version.
  *
  * This file is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -31,8 +31,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with loclass.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
  ****************************************************************************/
 
 /**
@@ -207,7 +207,7 @@ void permute(BitstreamIn *p_in, uint64_t z,int l,int r, BitstreamOut* out)
 {
 	if(bitsLeft(p_in) == 0)
 		return;
-	
+
 	bool pn = tailBit(p_in);
 	if( pn ) // pn = 1
 	{
@@ -674,10 +674,10 @@ int doTestsWithKnownInputs() {
 
 static bool readKeyFile(uint8_t key[8]) {
 	bool retval = false;
-	
+
 	//Test a few variants
 	char filename[30] = {0};
-	
+
 	if (fileExists("iclass_key.bin")){
 		sprintf(filename, "%s.bin", "iclass_key");
 	} else if (fileExists("loclass/iclass_key.bin")){
@@ -685,17 +685,17 @@ static bool readKeyFile(uint8_t key[8]) {
 	} else if (fileExists("client/loclass/iclass_key.bin")){
 		sprintf(filename, "%s.bin", "client/loclass/iclass_key");
 	}
-	
+
 	if ( strlen(filename) == 0 )
 		return retval;
-	
+
 	FILE *f = fopen(filename, "rb");
 	if (!f)
 		return retval;
-		
+
 	size_t bytes_read = fread(key, sizeof(uint8_t), 8, f);
 	if ( bytes_read == 8)
-		retval = true;	
+		retval = true;
 
 	if (f)
 		fclose(f);
@@ -716,7 +716,7 @@ int doKeyTests(uint8_t debuglevel) {
 		uint8_t j = 0;
 		for (i = 0; i < sizeof(key); i++)
 			j += key[i];
-		
+
 		if (j != 185) {
 			PrintAndLogDevice(INFO, "A key was loaded, but it does not seem to be the correct one. Aborting these tests");
 		} else {
diff --git a/client/loclass/ikeys.h b/client/loclass/ikeys.h
index 5b44d1796..7de3c582e 100644
--- a/client/loclass/ikeys.h
+++ b/client/loclass/ikeys.h
@@ -1,13 +1,13 @@
 /*****************************************************************************
  * WARNING
  *
- * THIS CODE IS CREATED FOR EXPERIMENTATION AND EDUCATIONAL USE ONLY. 
- * 
- * USAGE OF THIS CODE IN OTHER WAYS MAY INFRINGE UPON THE INTELLECTUAL 
- * PROPERTY OF OTHER PARTIES, SUCH AS INSIDE SECURE AND HID GLOBAL, 
- * AND MAY EXPOSE YOU TO AN INFRINGEMENT ACTION FROM THOSE PARTIES. 
- * 
- * THIS CODE SHOULD NEVER BE USED TO INFRINGE PATENTS OR INTELLECTUAL PROPERTY RIGHTS. 
+ * THIS CODE IS CREATED FOR EXPERIMENTATION AND EDUCATIONAL USE ONLY.
+ *
+ * USAGE OF THIS CODE IN OTHER WAYS MAY INFRINGE UPON THE INTELLECTUAL
+ * PROPERTY OF OTHER PARTIES, SUCH AS INSIDE SECURE AND HID GLOBAL,
+ * AND MAY EXPOSE YOU TO AN INFRINGEMENT ACTION FROM THOSE PARTIES.
+ *
+ * THIS CODE SHOULD NEVER BE USED TO INFRINGE PATENTS OR INTELLECTUAL PROPERTY RIGHTS.
  *
  *****************************************************************************
  *
@@ -22,7 +22,7 @@
  *
  * This is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation, or, at your option, any later version. 
+ * by the Free Software Foundation, or, at your option, any later version.
  *
  * This file is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -31,8 +31,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with loclass.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
  ****************************************************************************/
 
 #ifndef IKEYS_H
diff --git a/client/loclass/main.c b/client/loclass/main.c
index e0dcd48e2..e77cc8103 100644
--- a/client/loclass/main.c
+++ b/client/loclass/main.c
@@ -1,13 +1,13 @@
 /*****************************************************************************
  * WARNING
  *
- * THIS CODE IS CREATED FOR EXPERIMENTATION AND EDUCATIONAL USE ONLY. 
- * 
- * USAGE OF THIS CODE IN OTHER WAYS MAY INFRINGE UPON THE INTELLECTUAL 
- * PROPERTY OF OTHER PARTIES, SUCH AS INSIDE SECURE AND HID GLOBAL, 
- * AND MAY EXPOSE YOU TO AN INFRINGEMENT ACTION FROM THOSE PARTIES. 
- * 
- * THIS CODE SHOULD NEVER BE USED TO INFRINGE PATENTS OR INTELLECTUAL PROPERTY RIGHTS. 
+ * THIS CODE IS CREATED FOR EXPERIMENTATION AND EDUCATIONAL USE ONLY.
+ *
+ * USAGE OF THIS CODE IN OTHER WAYS MAY INFRINGE UPON THE INTELLECTUAL
+ * PROPERTY OF OTHER PARTIES, SUCH AS INSIDE SECURE AND HID GLOBAL,
+ * AND MAY EXPOSE YOU TO AN INFRINGEMENT ACTION FROM THOSE PARTIES.
+ *
+ * THIS CODE SHOULD NEVER BE USED TO INFRINGE PATENTS OR INTELLECTUAL PROPERTY RIGHTS.
  *
  *****************************************************************************
  *
@@ -22,7 +22,7 @@
  *
  * This is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation, or, at your option, any later version. 
+ * by the Free Software Foundation, or, at your option, any later version.
  *
  * This file is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -31,8 +31,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with loclass.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
  ****************************************************************************/
 
 
diff --git a/client/mifare/mad.c b/client/mifare/mad.c
index 96a4bf152..d2df7780c 100644
--- a/client/mifare/mad.c
+++ b/client/mifare/mad.c
@@ -15,7 +15,7 @@
 
 // https://www.nxp.com/docs/en/application-note/AN10787.pdf
 static madAIDDescr madKnownAIDs[] = {
-	{0x0000, "free"}, 
+	{0x0000, "free"},
 	{0x0001, "defect, e.g. access keys are destroyed or unknown"},
 	{0x0002, "reserved"},
 	{0x0003, "contains additional directory info"},
@@ -103,7 +103,7 @@ static const char *GetAIDDescription(uint16_t AID) {
 	for(int i = 0; i < ARRAYLEN(madKnownClusterCodes); i++)
 		if (madKnownClusterCodes[i].AID == (AID >> 8)) // high byte - cluster code
 			return madKnownClusterCodes[i].Description;
-		
+
 	return unknownAID;
 }
 
@@ -121,33 +121,33 @@ int madCRCCheck(uint8_t *sector, bool verbose, int MADver) {
 			return 3;
 		};
 	}
-	
+
 	return 0;
 }
 
 uint16_t madGetAID(uint8_t *sector, int MADver, int sectorNo) {
 	if (MADver == 1)
-		return (sector[16 + 2 + (sectorNo - 1) * 2] << 8) + (sector[16 + 2 + (sectorNo - 1) * 2 + 1]);	
+		return (sector[16 + 2 + (sectorNo - 1) * 2] << 8) + (sector[16 + 2 + (sectorNo - 1) * 2 + 1]);
 	else
-		return (sector[2 + (sectorNo - 1) * 2] << 8) + (sector[2 + (sectorNo - 1) * 2 + 1]);	
+		return (sector[2 + (sectorNo - 1) * 2] << 8) + (sector[2 + (sectorNo - 1) * 2 + 1]);
 }
 
 int MADCheck(uint8_t *sector0, uint8_t *sector10, bool verbose, bool *haveMAD2) {
 	int res = 0;
-	
+
 	if (!sector0)
 		return 1;
-	
+
 	uint8_t GPB = sector0[3 * 16 + 9];
 	if (verbose)
 		PrintAndLogEx(NORMAL, "GPB: 0x%02x", GPB);
-	
+
 	// DA (MAD available)
 	if (!(GPB & 0x80)) {
 		PrintAndLogEx(ERR, "DA=0! MAD not available.");
 		return 1;
 	}
-	
+
 	// MA (multi-application card)
 	if (verbose) {
 		if (GPB & 0x40)
@@ -155,34 +155,34 @@ int MADCheck(uint8_t *sector0, uint8_t *sector10, bool verbose, bool *haveMAD2)
 		else
 			PrintAndLogEx(NORMAL, "Single application card.");
 	}
-	
+
 	uint8_t MADVer = GPB & 0x03;
 	if (verbose)
 		PrintAndLogEx(NORMAL, "MAD version: %d", MADVer);
-	
+
 	//  MAD version
 	if ((MADVer != 0x01) && (MADVer != 0x02)) {
 		PrintAndLogEx(ERR, "Wrong MAD version: 0x%02x", MADVer);
 		return 2;
 	};
-	
+
 	if (haveMAD2)
 		*haveMAD2 = (MADVer == 2);
 
 	res = madCRCCheck(sector0, true, 1);
-	
+
 	if (verbose && !res)
 		PrintAndLogEx(NORMAL, "CRC8-MAD1 OK.");
-	
+
 	if (MADVer == 2 && sector10) {
 		int res2 = madCRCCheck(sector10, true, 2);
 		if (!res)
-			res = res2;	
+			res = res2;
 
 		if (verbose & !res2)
 			PrintAndLogEx(NORMAL, "CRC8-MAD2 OK.");
 	}
-	
+
 	return res;
 }
 
@@ -190,12 +190,12 @@ int MADDecode(uint8_t *sector0, uint8_t *sector10, uint16_t *mad, size_t *madlen
 	*madlen = 0;
 	bool haveMAD2 = false;
 	MADCheck(sector0, sector10, false, &haveMAD2);
-	
+
 	for (int i = 1; i < 16; i++) {
 		mad[*madlen] = madGetAID(sector0, 1, i);
 		(*madlen)++;
 	}
-	
+
 	if (haveMAD2) {
 		// mad2 sector (0x10 == 16dec) here
 		mad[*madlen] = 0x0005;
@@ -206,7 +206,7 @@ int MADDecode(uint8_t *sector0, uint8_t *sector10, uint16_t *mad, size_t *madlen
 			(*madlen)++;
 		}
 	}
-	
+
 	return 0;
 }
 
@@ -215,7 +215,7 @@ int MAD1DecodeAndPrint(uint8_t *sector, bool verbose, bool *haveMAD2) {
 
 	// check MAD1 only
 	MADCheck(sector, NULL, verbose, haveMAD2);
-		
+
 	// info byte
 	uint8_t InfoByte = sector[16 + 1] & 0x3f;
 	if (InfoByte) {
@@ -226,13 +226,13 @@ int MAD1DecodeAndPrint(uint8_t *sector, bool verbose, bool *haveMAD2) {
 	}
 	if (InfoByte == 0x10 || InfoByte >= 0x28)
 		PrintAndLogEx(WARNING, "Info byte error");
-	
+
 	PrintAndLogEx(NORMAL, "00 MAD1");
 	for(int i = 1; i < 16; i++) {
 		uint16_t AID = madGetAID(sector, 1, i);
 		PrintAndLogEx(NORMAL, "%02d [%04X] %s", i, AID, GetAIDDescription(AID));
 	};
-		
+
 	return 0;
 };
 
@@ -250,7 +250,7 @@ int MAD2DecodeAndPrint(uint8_t *sector, bool verbose) {
 	for(int i = 1; i < 8 + 8 + 7 + 1; i++) {
 		uint16_t AID = madGetAID(sector, 2, i);
 		PrintAndLogEx(NORMAL, "%02d [%04X] %s", i + 16, AID, GetAIDDescription(AID));
-	};	
-	
+	};
+
 	return 0;
 };
diff --git a/client/mifare/mad.h b/client/mifare/mad.h
index 6289982d9..d9dd3ff53 100644
--- a/client/mifare/mad.h
+++ b/client/mifare/mad.h
@@ -18,7 +18,7 @@
 typedef struct {
 	uint16_t AID;
 	const char *Description;
-} madAIDDescr;	
+} madAIDDescr;
 
 extern int MADCheck(uint8_t *sector0, uint8_t *sector10, bool verbose, bool *haveMAD2);
 extern int MADDecode(uint8_t *sector0, uint8_t *sector10, uint16_t *mad, size_t *madlen);
diff --git a/client/mifare/mfkey.c b/client/mifare/mfkey.c
index b35a3104c..e463c4505 100644
--- a/client/mifare/mfkey.c
+++ b/client/mifare/mfkey.c
@@ -22,7 +22,7 @@ int compare_uint64(const void *a, const void *b) {
 uint32_t intersection(uint64_t *listA, uint64_t *listB) {
 	if (listA == NULL || listB == NULL)
 		return 0;
-		
+
 	uint64_t *p1, *p2, *p3;
 	p1 = p3 = listA;
 	p2 = listB;
@@ -56,7 +56,7 @@ uint32_t nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint32_t ar, uint64_t
 	for ( pos = 0; pos < 8; pos++ ) {
 		ks3x[7-pos] = (ks_info >> (pos*8)) & 0x0F;
 		bt = (par_info >> (pos*8)) & 0xFF;
-		
+
 		par[7-pos][0] = (bt >> 0) & 1;
 		par[7-pos][1] = (bt >> 1) & 1;
 		par[7-pos][2] = (bt >> 2) & 1;
@@ -128,15 +128,15 @@ bool mfkey32_moebius(nonces_t data, uint64_t *outputkey) {
 	int counter = 0;
 	uint32_t p640 = prng_successor(data.nonce, 64);
 	uint32_t p641 = prng_successor(data.nonce2, 64);
-		
+
 	s = lfsr_recovery32(data.ar ^ p640, 0);
-  
+
 	for(t = s; t->odd | t->even; ++t) {
 		lfsr_rollback_word(t, 0, 0);
 		lfsr_rollback_word(t, data.nr, 1);
 		lfsr_rollback_word(t, data.cuid ^ data.nonce, 0);
 		crypto1_get_lfsr(t, &key);
-		
+
 		crypto1_word(t, data.cuid ^ data.nonce2, 0);
 		crypto1_word(t, data.nr2, 1);
 		if (data.ar2 == (crypto1_word(t, 0, 0) ^ p641)) {
@@ -157,7 +157,7 @@ int mfkey64(nonces_t data, uint64_t *outputkey){
 	uint32_t ks2;    				// keystream used to encrypt reader response
 	uint32_t ks3;    				// keystream used to encrypt tag response
 	struct Crypto1State *revstate;
-	
+
 	// Extract the keystream from the messages
 	ks2 = data.ar ^ prng_successor(data.nonce, 64);
 	ks3 = data.at ^ prng_successor(data.nonce, 96);
@@ -168,6 +168,6 @@ int mfkey64(nonces_t data, uint64_t *outputkey){
 	lfsr_rollback_word(revstate, data.cuid ^ data.nonce, 0);
 	crypto1_get_lfsr(revstate, &key);
 	crypto1_destroy(revstate);
-	*outputkey = key;	
+	*outputkey = key;
 	return 0;
 }
diff --git a/client/mifare/mifare4.c b/client/mifare/mifare4.c
index c95529a84..b829c564a 100644
--- a/client/mifare/mifare4.c
+++ b/client/mifare/mifare4.c
@@ -46,7 +46,7 @@ const char * mfpGetErrorDescription(uint8_t errorCode) {
 	for(int i = 0; i < PlusErrorsLen; i++)
 		if (errorCode == PlusErrors[i].Code)
 			return PlusErrors[i].Description;
-		
+
 	return PlusErrors[0].Description;
 }
 
@@ -74,11 +74,11 @@ AccessConditions_t MFAccessConditionsTrailer[] = {
 
 char *mfGetAccessConditionsDesc(uint8_t blockn, uint8_t *data) {
 	static char StaticNone[] = "none";
-	
+
 	uint8_t data1 = ((data[1] >> 4) & 0x0f) >> blockn;
 	uint8_t data2 = ((data[2]) & 0x0f) >> blockn;
 	uint8_t data3 = ((data[2] >> 4) & 0x0f) >> blockn;
-	
+
 	uint8_t cond = (data1 & 0x01) << 2 | (data2 & 0x01) << 1 | (data3 & 0x01);
 
 	if (blockn == 3) {
@@ -92,7 +92,7 @@ char *mfGetAccessConditionsDesc(uint8_t blockn, uint8_t *data) {
 				return MFAccessConditions[i].description;
 			}
 	};
-	
+
 	return StaticNone;
 };
 
@@ -124,9 +124,9 @@ int CalculateEncIVResponse(mf4Session *session, uint8_t *iv, bool verbose) {
 int CalculateMAC(mf4Session *session, MACType_t mtype, uint8_t blockNum, uint8_t blockCount, uint8_t *data, int datalen, uint8_t *mac, bool verbose) {
 	if (!session || !session->Authenticated || !mac || !data || !datalen || datalen < 1)
 		return 1;
-	
+
 	memset(mac, 0x00, 8);
-	
+
 	uint16_t ctr = session->R_Ctr;
 	switch(mtype) {
 	case mtypWriteCmd:
@@ -162,23 +162,23 @@ int CalculateMAC(mf4Session *session, MACType_t mtype, uint8_t blockNum, uint8_t
 		macdatalen = 1 + 6;
 		break;
 	}
-	
+
 	if (verbose)
 		PrintAndLog("MAC data[%d]: %s", macdatalen, sprint_hex(macdata, macdatalen));
-	
+
 	return aes_cmac8(NULL, session->Kmac, macdata, mac, macdatalen);
 }
 
 int MifareAuth4(mf4Session *session, uint8_t *keyn, uint8_t *key, bool activateField, bool leaveSignalON, bool verbose) {
 	uint8_t data[257] = {0};
 	int datalen = 0;
-	
+
 	uint8_t RndA[17] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x00};
 	uint8_t RndB[17] = {0};
-	
+
 	if (session)
-		session->Authenticated = false;	
-	
+		session->Authenticated = false;
+
 	uint8_t cmd1[] = {0x70, keyn[1], keyn[0], 0x00};
 	int res = ExchangeRAW14a(cmd1, sizeof(cmd1), activateField, true, data, sizeof(data), &datalen);
 	if (res) {
@@ -186,16 +186,16 @@ int MifareAuth4(mf4Session *session, uint8_t *keyn, uint8_t *key, bool activateF
 		DropField();
 		return 2;
 	}
-	
+
 	if (verbose)
 		PrintAndLogEx(INFO, "<phase1: %s", sprint_hex(data, datalen));
-		
+
 	if (datalen < 1) {
 		PrintAndLogEx(ERR, "Card response wrong length: %d", datalen);
 		DropField();
 		return 3;
 	}
-	
+
 	if (data[0] != 0x90) {
 		PrintAndLogEx(ERR, "Card response error: %02x", data[2]);
 		DropField();
@@ -207,7 +207,7 @@ int MifareAuth4(mf4Session *session, uint8_t *keyn, uint8_t *key, bool activateF
 		DropField();
 		return 3;
 	}
-	
+
     aes_decode(NULL, key, &data[1], RndB, 16);
 	RndB[16] = RndB[0];
 	if (verbose)
@@ -223,19 +223,19 @@ int MifareAuth4(mf4Session *session, uint8_t *keyn, uint8_t *key, bool activateF
 	aes_encode(NULL, key, raw, &cmd2[1], 32);
 	if (verbose)
 		PrintAndLogEx(INFO, ">phase2: %s", sprint_hex(cmd2, 33));
-	
+
 	res = ExchangeRAW14a(cmd2, sizeof(cmd2), false, true, data, sizeof(data), &datalen);
 	if (res) {
 		PrintAndLogEx(ERR, "Exchande raw error: %d", res);
 		DropField();
 		return 4;
 	}
-	
+
 	if (verbose)
 		PrintAndLogEx(INFO, "<phase2: %s", sprint_hex(data, datalen));
 
 	aes_decode(NULL, key, &data[1], raw, 32);
-	
+
 	if (verbose) {
 		PrintAndLogEx(INFO, "res: %s", sprint_hex(raw, 32));
 		PrintAndLogEx(INFO, "RndA`: %s", sprint_hex(&raw[4], 16));
@@ -256,31 +256,31 @@ int MifareAuth4(mf4Session *session, uint8_t *keyn, uint8_t *key, bool activateF
 		PrintAndLogEx(INFO, "pic: %s", sprint_hex(&raw[20], 6));
 		PrintAndLogEx(INFO, "pcd: %s", sprint_hex(&raw[26], 6));
 	}
-	
+
 	uint8_t kenc[16] = {0};
 	memcpy(&kenc[0], &RndA[11], 5);
 	memcpy(&kenc[5], &RndB[11], 5);
 	for(int i = 0; i < 5; i++)
 		kenc[10 + i] = RndA[4 + i] ^ RndB[4 + i];
 	kenc[15] = 0x11;
-	
+
 	aes_encode(NULL, key, kenc, kenc, 16);
 	if (verbose) {
 		PrintAndLogEx(INFO, "kenc: %s", sprint_hex(kenc, 16));
 	}
-	
+
 	uint8_t kmac[16] = {0};
 	memcpy(&kmac[0], &RndA[7], 5);
 	memcpy(&kmac[5], &RndB[7], 5);
 	for(int i = 0; i < 5; i++)
 		kmac[10 + i] = RndA[0 + i] ^ RndB[0 + i];
 	kmac[15] = 0x22;
-	
+
 	aes_encode(NULL, key, kmac, kmac, 16);
 	if (verbose) {
 		PrintAndLogEx(INFO, "kmac: %s", sprint_hex(kmac, 16));
-	}	
-	
+	}
+
 	if (!leaveSignalON)
 		DropField();
 
@@ -301,53 +301,53 @@ int MifareAuth4(mf4Session *session, uint8_t *keyn, uint8_t *key, bool activateF
 		memmove(session->Kenc, kenc, 16);
 		memmove(session->Kmac, kmac, 16);
 	}
-	
+
 	if (verbose)
 		PrintAndLogEx(INFO, "Authentication OK");
-	
+
 	return 0;
 }
 
 int intExchangeRAW14aPlus(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
 	if(VerboseMode)
 		PrintAndLogEx(INFO, ">>> %s", sprint_hex(datain, datainlen));
-	
+
 	int res = ExchangeRAW14a(datain, datainlen, activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
 
 	if(VerboseMode)
 		PrintAndLogEx(INFO, "<<< %s", sprint_hex(dataout, *dataoutlen));
-	
+
 	return res;
 }
 
 int MFPWritePerso(uint8_t *keyNum, uint8_t *key, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
 	uint8_t rcmd[3 + 16] = {0xa8, keyNum[1], keyNum[0], 0x00};
 	memmove(&rcmd[3], key, 16);
-	
+
 	return intExchangeRAW14aPlus(rcmd, sizeof(rcmd), activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
 }
 
 int MFPCommitPerso(bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
 	uint8_t rcmd[1] = {0xaa};
-	
+
 	return intExchangeRAW14aPlus(rcmd, sizeof(rcmd), activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
 }
 
 int MFPReadBlock(mf4Session *session, bool plain, uint8_t blockNum, uint8_t blockCount, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen, uint8_t *mac) {
-	uint8_t rcmd[4 + 8] = {(plain?(0x37):(0x33)), blockNum, 0x00, blockCount}; 
+	uint8_t rcmd[4 + 8] = {(plain?(0x37):(0x33)), blockNum, 0x00, blockCount};
 	if (!plain && session)
 		CalculateMAC(session, mtypReadCmd, blockNum, blockCount, rcmd, 4, &rcmd[4], VerboseMode);
-	
+
 	int res = intExchangeRAW14aPlus(rcmd, plain?4:sizeof(rcmd), activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
 	if(res)
 		return res;
 
-	if (session) 
+	if (session)
 		session->R_Ctr++;
-	
+
 	if(session && mac && *dataoutlen > 11)
 		CalculateMAC(session, mtypReadResp, blockNum, blockCount, dataout, *dataoutlen - 8 - 2, mac, VerboseMode);
-	
+
 	return 0;
 }
 
@@ -356,37 +356,37 @@ int MFPWriteBlock(mf4Session *session, uint8_t blockNum, uint8_t *data, bool act
 	memmove(&rcmd[3], data, 16);
 	if (session)
 		CalculateMAC(session, mtypWriteCmd, blockNum, 1, rcmd, 19, &rcmd[19], VerboseMode);
-	
+
 	int res = intExchangeRAW14aPlus(rcmd, sizeof(rcmd), activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
 	if(res)
 		return res;
 
-	if (session) 
+	if (session)
 		session->W_Ctr++;
-	
+
 	if(session && mac && *dataoutlen > 3)
 		CalculateMAC(session, mtypWriteResp, blockNum, 1, dataout, *dataoutlen, mac, VerboseMode);
-	
+
 	return 0;
 }
 
 int mfpReadSector(uint8_t sectorNo, uint8_t keyType, uint8_t *key, uint8_t *dataout, bool verbose){
 	uint8_t keyn[2] = {0};
 	bool plain = false;
-	
+
 	uint16_t uKeyNum = 0x4000 + sectorNo * 2 + (keyType ? 1 : 0);
 	keyn[0] = uKeyNum >> 8;
 	keyn[1] = uKeyNum & 0xff;
 	if (verbose)
 		PrintAndLogEx(INFO, "--sector[%d]:%02x key:%04x", mfNumBlocksPerSector(sectorNo), sectorNo, uKeyNum);
-	
+
 	mf4Session session;
 	int res = MifareAuth4(&session, keyn, key, true, true, verbose);
 	if (res) {
 		PrintAndLogEx(ERR, "Sector %d authentication error: %d", sectorNo, res);
 		return res;
 	}
-	
+
 	uint8_t data[250] = {0};
 	int datalen = 0;
 	uint8_t mac[8] = {0};
@@ -398,7 +398,7 @@ int mfpReadSector(uint8_t sectorNo, uint8_t keyType, uint8_t *key, uint8_t *data
 			DropField();
 			return res;
 		}
-		
+
 		if (datalen && data[0] != 0x90) {
 			PrintAndLogEx(ERR, "Sector %d card read error: %02x %s", sectorNo, data[0], mfpGetErrorDescription(data[0]));
 			DropField();
@@ -411,31 +411,31 @@ int mfpReadSector(uint8_t sectorNo, uint8_t keyType, uint8_t *key, uint8_t *data
 		}
 
 		memcpy(&dataout[(n - firstBlockNo) * 16], &data[1], 16);
-		
+
 		if (verbose)
 			PrintAndLogEx(INFO, "data[%03d]: %s", n, sprint_hex(&data[1], 16));
-			
+
 		if (memcmp(&data[1 + 16], mac, 8)) {
 			PrintAndLogEx(WARNING, "WARNING: mac on block %d not equal...", n);
 			PrintAndLogEx(WARNING, "MAC   card: %s", sprint_hex(&data[1 + 16], 8));
 			PrintAndLogEx(WARNING, "MAC reader: %s", sprint_hex(mac, 8));
-			
+
 			if (!verbose)
-				return 7;			
-		} else {	
+				return 7;
+		} else {
 			if(verbose)
 				PrintAndLogEx(INFO, "MAC: %s", sprint_hex(&data[1 + 16], 8));
 		}
 	}
 	DropField();
 
-	return 0;	
+	return 0;
 }
 
 // Mifare Memory Structure: up to 32 Sectors with 4 blocks each (1k and 2k cards),
 // plus evtl. 8 sectors with 16 blocks each (4k cards)
 uint8_t mfNumBlocksPerSector(uint8_t sectorNo) {
-	if (sectorNo < 32) 
+	if (sectorNo < 32)
 		return 4;
 	else
 		return 16;
@@ -465,5 +465,5 @@ uint8_t mfSectorNum(uint8_t blockNo) {
 		return blockNo / 4;
 	else
 		return 32 + (blockNo - 32 * 4) / 16;
-		
+
 }
diff --git a/client/mifare/mifare4.h b/client/mifare/mifare4.h
index e4bf6e386..c41c05d2e 100644
--- a/client/mifare/mifare4.h
+++ b/client/mifare/mifare4.h
@@ -30,7 +30,7 @@ typedef struct {
 	uint16_t R_Ctr;
 	uint16_t W_Ctr;
 }mf4Session;
-	
+
 typedef enum {
 	mtypReadCmd,
 	mtypReadResp,
@@ -45,7 +45,7 @@ typedef struct {
 
 extern void mfpSetVerboseMode(bool verbose);
 extern const char * mfpGetErrorDescription(uint8_t errorCode);
-	
+
 extern int CalculateMAC(mf4Session *session, MACType_t mtype, uint8_t blockNum, uint8_t blockCount, uint8_t *data, int datalen, uint8_t *mac, bool verbose);
 extern int MifareAuth4(mf4Session *session, uint8_t *keyn, uint8_t *key, bool activateField, bool leaveSignalON, bool verbose);
 
diff --git a/client/mifare/mifarehost.c b/client/mifare/mifarehost.c
index eb89e0389..1d1da1d1c 100644
--- a/client/mifare/mifarehost.c
+++ b/client/mifare/mifarehost.c
@@ -17,7 +17,7 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
 	uint64_t *keylist = NULL, *last_keylist = NULL;
 	uint32_t keycount = 0;
 	int16_t isOK = 0;
-	
+
 	UsbCommand c = {CMD_READER_MIFARE, {true, blockno, key_type}};
 
 	// message
@@ -31,11 +31,11 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
 		SendCommand(&c);
 
 		//flush queue
-		while (ukbhit()) { 
-			int gc = getchar(); (void)gc; 
+		while (ukbhit()) {
+			int gc = getchar(); (void)gc;
 			return -5;
 		}
-		
+
 		// wait cycle
 		while (true) {
 			printf("."); fflush(stdout);
@@ -47,9 +47,9 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
 			UsbCommand resp;
 			if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
 				isOK  = resp.arg[0];
-				if (isOK < 0) 
+				if (isOK < 0)
 					return isOK;
-				
+
 				uid = (uint32_t)bytes_to_num(resp.d.asBytes +  0, 4);
 				nt = (uint32_t)bytes_to_num(resp.d.asBytes +  4, 4);
 				par_list = bytes_to_num(resp.d.asBytes +  8, 8);
@@ -60,7 +60,7 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
 			}
 		}
 		PrintAndLogEx(NORMAL, "\n");
-		
+
 		if (par_list == 0 && c.arg[0] == true) {
 			PrintAndLogEx(SUCCESS, "Parity is all zero. Most likely this card sends NACK on every authentication.");
 		}
@@ -92,7 +92,7 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
 		uint8_t keyBlock[USB_CMD_DATA_SIZE];
 		int max_keys = USB_CMD_DATA_SIZE / 6;
 		for (int i = 0; i < keycount; i += max_keys) {
-			
+
 			int size = keycount - i > max_keys ? max_keys : keycount - i;
 			for (int j = 0; j < size; j++) {
 				if (par_list == 0) {
@@ -101,12 +101,12 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
 					num_to_bytes(keylist[i*max_keys + j], 6, keyBlock+(j*6));
 				}
 			}
-			
+
 			if (!mfCheckKeys(blockno, key_type - 0x60, false, size, keyBlock, key)) {
 				break;
 			}
 		}
-		
+
 		if (*key != -1) {
 			break;
 		} else {
@@ -121,7 +121,7 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
 	return 0;
 }
 int mfCheckKeys(uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t keycnt, uint8_t * keyBlock, uint64_t * key){
-	*key = -1;	
+	*key = -1;
 	UsbCommand c = {CMD_MIFARE_CHKKEYS, { (blockNo | (keyType << 8)), clear_trace, keycnt}};
 	memcpy(c.d.asBytes, keyBlock, 6 * keycnt);
 	clearCommandBuffer();
@@ -133,9 +133,9 @@ int mfCheckKeys(uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t keyc
 	return 0;
 }
 
-// Sends chunks of keys to device. 
+// Sends chunks of keys to device.
 // 0 == ok all keys found
-// 1 == 
+// 1 ==
 // 2 == Time-out, aborting
 int mfCheckKeys_fast( uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk, uint8_t strategy,
 						uint32_t size, uint8_t *keyBlock, sector_t *e_sector, bool use_flashmemory) {
@@ -143,8 +143,8 @@ int mfCheckKeys_fast( uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk,
 	uint64_t t2 = msclock();
 	uint32_t timeout = 0;
 
-	// send keychunk		
-	UsbCommand c = {CMD_MIFARE_CHKKEYS_FAST, { (sectorsCnt | (firstChunk << 8) | (lastChunk << 12) ), ((use_flashmemory << 8) | strategy), size}};	
+	// send keychunk
+	UsbCommand c = {CMD_MIFARE_CHKKEYS_FAST, { (sectorsCnt | (firstChunk << 8) | (lastChunk << 12) ), ((use_flashmemory << 8) | strategy), size}};
 	memcpy(c.d.asBytes, keyBlock, 6 * size);
 	clearCommandBuffer();
 	SendCommand(&c);
@@ -167,11 +167,11 @@ int mfCheckKeys_fast( uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk,
 	uint8_t curr_keys = resp.arg[0];
 
 	PrintAndLogEx(SUCCESS, "\nChunk: %.1fs | found %u/%u keys (%u)", (float)(t2/1000.0), curr_keys, (sectorsCnt<<1), size);
-		
-	// all keys?		
+
+	// all keys?
 	if ( curr_keys == sectorsCnt*2 || lastChunk ) {
-		
-		// success array. each byte is status of key 
+
+		// success array. each byte is status of key
 		uint8_t arr[80];
 		uint64_t foo = 0;
 		uint16_t bar = 0;
@@ -180,10 +180,10 @@ int mfCheckKeys_fast( uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk,
 
 		for (uint8_t i = 0; i < 64; i++)
 			arr[i] = (foo >> i) & 0x1;
-	
+
 		for (uint8_t i = 0; i < 16; i++)
 			arr[i+64] = (bar >> i) & 0x1;
-		
+
 		// initialize storage for found keys
 		icesector_t *tmp = calloc(sectorsCnt, sizeof(icesector_t));
 		if (tmp == NULL)
@@ -203,7 +203,7 @@ int mfCheckKeys_fast( uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk,
 			}
 		}
 		free(tmp);
-		
+
 		if ( curr_keys == sectorsCnt*2 )
 			return 0;
 		if ( lastChunk )
@@ -226,11 +226,11 @@ int mfKeyBrute(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint64_t *resultk
 
 	memset(candidates, 0, sizeof(candidates));
 	memset(keyBlock, 0, sizeof(keyBlock));
-	
+
 	// Generate all possible keys for the first two unknown bytes.
-	for (uint16_t i = 0; i < 0xFFFF; ++i) {		
-		uint32_t j = i * 6;		
-		candidates[0 + j] = i >> 8;	
+	for (uint16_t i = 0; i < 0xFFFF; ++i) {
+		uint32_t j = i * 6;
+		candidates[0 + j] = i >> 8;
 		candidates[1 + j] = i;
 		candidates[2 + j] = key[2];
 		candidates[3 + j] = key[3];
@@ -241,7 +241,7 @@ int mfKeyBrute(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint64_t *resultk
 	for ( i = 0, counter = 1; i < CANDIDATE_SIZE; i += KEYBLOCK_SIZE, ++counter){
 
 		key64 = 0;
-		
+
 		// copy candidatekeys to test key block
 		memcpy(keyBlock, candidates + i, KEYBLOCK_SIZE);
 
@@ -251,8 +251,8 @@ int mfKeyBrute(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint64_t *resultk
 			found = true;
 			break;
 		}
-		
-		// progress 
+
+		// progress
 		if ( counter % 20 == 0 )
 			PrintAndLogEx(SUCCESS, "tried : %s.. \t %u keys", sprint_hex(candidates + i, 6),  counter * KEYS_IN_BLOCK  );
 	}
@@ -270,20 +270,20 @@ int Compare16Bits(const void * a, const void * b) {
 void
 #ifdef __has_attribute
 #if __has_attribute(force_align_arg_pointer)
-__attribute__((force_align_arg_pointer)) 
+__attribute__((force_align_arg_pointer))
 #endif
 #endif
 *nested_worker_thread(void *arg) {
 	struct Crypto1State *p1;
 	StateList_t *statelist = arg;
-	statelist->head.slhead = lfsr_recovery32(statelist->ks1, statelist->nt ^ statelist->uid);	
-	
+	statelist->head.slhead = lfsr_recovery32(statelist->ks1, statelist->nt ^ statelist->uid);
+
 	for (p1 = statelist->head.slhead; *(uint64_t *)p1 != 0; p1++) {};
-	
+
 	statelist->len = p1 - statelist->head.slhead;
 	statelist->tail.sltail = --p1;
 	qsort(statelist->head.slhead, statelist->len, sizeof(uint64_t), Compare16Bits);
-	
+
 	return statelist->head.slhead;
 }
 
@@ -293,7 +293,7 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo
 	UsbCommand resp;
 	StateList_t statelists[2];
 	struct Crypto1State *p1, *p2, *p3, *p4;
-	
+
 	UsbCommand c = {CMD_MIFARE_NESTED, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, calibrate}};
 	memcpy(c.d.asBytes, key, 6);
 	clearCommandBuffer();
@@ -302,9 +302,9 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo
 
 	// error during nested
 	if (resp.arg[0]) return resp.arg[0];
-	
+
 	memcpy(&uid, resp.d.asBytes, 4);
-		
+
 	for (i = 0; i < 2; i++) {
 		statelists[i].blockNo = resp.arg[2] & 0xff;
 		statelists[i].keyType = (resp.arg[2] >> 8) & 0xff;
@@ -312,10 +312,10 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo
 		memcpy(&statelists[i].nt,  (void *)(resp.d.asBytes + 4 + i * 8 + 0), 4);
 		memcpy(&statelists[i].ks1, (void *)(resp.d.asBytes + 4 + i * 8 + 4), 4);
 	}
-	
-	// calc keys	
+
+	// calc keys
 	pthread_t thread_id[2];
-		
+
 	// create and run worker threads
 	for (i = 0; i < 2; i++)
 		pthread_create(thread_id + i, NULL, nested_worker_thread, &statelists[i]);
@@ -327,12 +327,12 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo
 	// the first 16 Bits of the cryptostate already contain part of our key.
 	// Create the intersection of the two lists based on these 16 Bits and
 	// roll back the cryptostate
-	p1 = p3 = statelists[0].head.slhead; 
+	p1 = p3 = statelists[0].head.slhead;
 	p2 = p4 = statelists[1].head.slhead;
 
 	while (p1 <= statelists[0].tail.sltail && p2 <= statelists[1].tail.sltail) {
 		if (Compare16Bits(p1, p2) == 0) {
-			
+
 			struct Crypto1State savestate, *savep = &savestate;
 			savestate = *p1;
 			while(Compare16Bits(p1, savep) == 0 && p1 <= statelists[0].tail.sltail) {
@@ -381,15 +381,15 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo
 	uint8_t keyBlock[USB_CMD_DATA_SIZE] = {0x00};
 
 	for (int i = 0; i < keycnt; i += max_keys) {
-		
+
 		int size = keycnt - i > max_keys ? max_keys : keycnt - i;
-	
+
 		for (int j = 0; j < size; j++) {
 			crypto1_get_lfsr(statelists[0].head.slhead + i, &key64);
 			num_to_bytes(key64, 6, keyBlock + i * 6);
 		}
-		
-		if (!mfCheckKeys(statelists[0].blockNo, statelists[0].keyType, false, size, keyBlock, &key64)) {		
+
+		if (!mfCheckKeys(statelists[0].blockNo, statelists[0].keyType, false, size, keyBlock, &key64)) {
 			free(statelists[0].head.slhead);
 			free(statelists[1].head.slhead);
 			num_to_bytes(key64, 6, resultKey);
@@ -400,14 +400,14 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo
 				key64
 			);
 			return -5;
-		}		
+		}
 	}
-	
+
 out:
 	PrintAndLogEx(SUCCESS, "target block:%3u key type: %c",
 			(uint16_t)resp.arg[2] & 0xff,
 			(resp.arg[2] >> 8) ? 'B' : 'A'
-	);	
+	);
 
 	free(statelists[0].head.slhead);
 	free(statelists[1].head.slhead);
@@ -416,7 +416,7 @@ out:
 
 // MIFARE
 int mfReadSector(uint8_t sectorNo, uint8_t keyType, uint8_t *key, uint8_t *data) {
-	
+
 	UsbCommand c = {CMD_MIFARE_READSC, {sectorNo, keyType, 0}};
 	memcpy(c.d.asBytes, key, 6);
 	clearCommandBuffer();
@@ -436,7 +436,7 @@ int mfReadSector(uint8_t sectorNo, uint8_t keyType, uint8_t *key, uint8_t *data)
 		PrintAndLogEx(ERR, "Command execute timeout");
 		return 2;
 	}
-	
+
 	return 0;
 }
 
@@ -457,7 +457,7 @@ int mfEmlSetMem(uint8_t *data, int blockNum, int blocksCount) {
 
 int mfEmlSetMem_xt(uint8_t *data, int blockNum, int blocksCount, int blockBtWidth) {
 	UsbCommand c = {CMD_MIFARE_EML_MEMSET, {blockNum, blocksCount, blockBtWidth}};
-	memcpy(c.d.asBytes, data, blocksCount * blockBtWidth); 
+	memcpy(c.d.asBytes, data, blocksCount * blockBtWidth);
 	clearCommandBuffer();
 	SendCommand(&c);
 	return 0;
@@ -473,27 +473,27 @@ int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, uint8_
 	int old = mfCGetBlock(0, block0, params);
 	if (old == 0)
 		PrintAndLogEx(SUCCESS, "old block 0:  %s", sprint_hex(block0, sizeof(block0)));
-	else 
-		PrintAndLogEx(FAILED, "couldn't get old data. Will write over the last bytes of Block 0.");	
+	else
+		PrintAndLogEx(FAILED, "couldn't get old data. Will write over the last bytes of Block 0.");
 
 	// fill in the new values
 	// UID
-	memcpy(block0, uid, 4); 
+	memcpy(block0, uid, 4);
 	// Mifare UID BCC
 	block0[4] = block0[0] ^ block0[1] ^ block0[2] ^ block0[3];
 	// mifare classic SAK(byte 5) and ATQA(byte 6 and 7, reversed)
 	if ( sak != NULL )
 		block0[5] = sak[0];
-	
+
 	if ( atqa != NULL ) {
 		block0[6] = atqa[1];
 		block0[7] = atqa[0];
 	}
 	PrintAndLogEx(SUCCESS, "new block 0:  %s", sprint_hex(block0,16));
-	
-	if ( wipecard )		 params |= MAGIC_WIPE;	
+
+	if ( wipecard )		 params |= MAGIC_WIPE;
 	if ( oldUID == NULL) params |= MAGIC_UID;
-	
+
 	return mfCSetBlock(0, block0, oldUID, params);
 }
 
@@ -501,15 +501,15 @@ int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, uint8_t params) {
 
 	uint8_t isOK = 0;
 	UsbCommand c = {CMD_MIFARE_CSETBLOCK, {params, blockNo, 0}};
-	memcpy(c.d.asBytes, data, 16); 
+	memcpy(c.d.asBytes, data, 16);
 	clearCommandBuffer();
 	SendCommand(&c);
 	UsbCommand resp;
 	if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
 		isOK  = resp.arg[0] & 0xff;
-		if (uid != NULL) 
+		if (uid != NULL)
 			memcpy(uid, resp.d.asBytes, 4);
-		if (!isOK) 
+		if (!isOK)
 			return 2;
 	} else {
 		PrintAndLogEx(WARNING, "command execute timeout");
@@ -520,14 +520,14 @@ int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, uint8_t params) {
 
 int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params) {
 	uint8_t isOK = 0;
-	UsbCommand c = {CMD_MIFARE_CGETBLOCK, {params, blockNo, 0}};	
+	UsbCommand c = {CMD_MIFARE_CGETBLOCK, {params, blockNo, 0}};
 	clearCommandBuffer();
 	SendCommand(&c);
 	UsbCommand resp;
 	if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
 		isOK  = resp.arg[0] & 0xff;
-		if (!isOK) 
-			return 2;		
+		if (!isOK)
+			return 2;
 		memcpy(data, resp.d.asBytes, 16);
 	} else {
 		PrintAndLogEx(WARNING, "command execute timeout");
@@ -567,7 +567,7 @@ int isTraceCardEmpty(void) {
 }
 
 int isBlockEmpty(int blockN) {
-	for (int i = 0; i < 16; i++) 
+	for (int i = 0; i < 16; i++)
 		if (traceCard[blockN * 16 + i] != 0) return 0;
 
 	return 1;
@@ -583,10 +583,10 @@ int loadTraceCard(uint8_t *tuid, uint8_t uidlen) {
 	uint8_t buf8[64] = {0x00};
 	int i, blockNum;
 	uint32_t tmp;
-	
-	if (!isTraceCardEmpty()) 
+
+	if (!isTraceCardEmpty())
 		saveTraceCard();
-		
+
 	memset(traceCard, 0x00, 4096);
 	memcpy(traceCard, tuid, uidlen);
 
@@ -594,11 +594,11 @@ int loadTraceCard(uint8_t *tuid, uint8_t uidlen) {
 
 	f = fopen(traceFileName, "r");
 	if (!f) return 1;
-	
+
 	blockNum = 0;
-		
+
 	while (!feof(f)){
-	
+
 		memset(buf, 0, sizeof(buf));
 		if (fgets(buf, sizeof(buf), f) == NULL) {
 			PrintAndLogEx(FAILED, "No trace file found or reading error.");
@@ -632,19 +632,19 @@ int loadTraceCard(uint8_t *tuid, uint8_t uidlen) {
 }
 
 int saveTraceCard(void) {
-	
+
 	if ((!strlen(traceFileName)) || (isTraceCardEmpty())) return 0;
-	
+
 	FILE * f;
 	f = fopen(traceFileName, "w+");
 	if ( !f ) return 1;
 
 	// given 4096 tracecard size,  these loop will only match a 1024, 1kb card memory
-	// 4086/16 == 256blocks. 
+	// 4086/16 == 256blocks.
 	for (uint16_t i = 0; i < 256; i++) {  // blocks
 		for (uint8_t j = 0; j < 16; j++)  // bytes
-			fprintf(f, "%02X", *(traceCard + i * 16 + j)); 
-			
+			fprintf(f, "%02X", *(traceCard + i * 16 + j));
+
 		// no extra line in the end
 		if ( i < 255 )
 			fprintf(f, "\n");
@@ -656,14 +656,14 @@ int saveTraceCard(void) {
 //
 int mfTraceInit(uint8_t *tuid, uint8_t uidlen, uint8_t *atqa, uint8_t sak, bool wantSaveToEmlFile) {
 
-	if (traceCrypto1) 
+	if (traceCrypto1)
 		crypto1_destroy(traceCrypto1);
 
 	traceCrypto1 = NULL;
 
-	if (wantSaveToEmlFile) 
+	if (wantSaveToEmlFile)
 		loadTraceCard(tuid, uidlen);
-		
+
 	traceCard[4] = traceCard[0] ^ traceCard[1] ^ traceCard[2] ^ traceCard[3];
 	traceCard[5] = sak;
 	memcpy(&traceCard[6], atqa, 2);
@@ -676,16 +676,16 @@ int mfTraceInit(uint8_t *tuid, uint8_t uidlen, uint8_t *atqa, uint8_t sak, bool
 void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len, bool isEncrypted){
 	uint8_t	bt = 0;
 	int i;
-	
+
 	if (len != 1) {
 		for (i = 0; i < len; i++)
 			data[i] = crypto1_byte(pcs, 0x00, isEncrypted) ^ data[i];
 	} else {
-		bt = 0;		
+		bt = 0;
 		bt |= (crypto1_bit(pcs, 0, isEncrypted) ^ BIT(data[0], 0)) << 0;
 		bt |= (crypto1_bit(pcs, 0, isEncrypted) ^ BIT(data[0], 1)) << 1;
 		bt |= (crypto1_bit(pcs, 0, isEncrypted) ^ BIT(data[0], 2)) << 2;
-		bt |= (crypto1_bit(pcs, 0, isEncrypted) ^ BIT(data[0], 3)) << 3;			
+		bt |= (crypto1_bit(pcs, 0, isEncrypted) ^ BIT(data[0], 3)) << 3;
 		data[0] = bt;
 	}
 }
@@ -699,28 +699,28 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
 		traceState = TRACE_ERROR;
 		return 1;
 	}
-	
+
 	uint8_t data[255];
 	memset(data, 0x00, sizeof(data));
-	
+
 	memcpy(data, data_src, len);
-	
+
 	if ((traceCrypto1) && ((traceState == TRACE_IDLE) || (traceState > TRACE_AUTH_OK))) {
 		mf_crypto1_decrypt(traceCrypto1, data, len, 0);
 		PrintAndLogEx(NORMAL, "DEC| %s", sprint_hex(data, len));
-		AddLogHex(logHexFileName, "DEC| ", data, len); 
+		AddLogHex(logHexFileName, "DEC| ", data, len);
 	}
-	
+
 	switch (traceState) {
-	case TRACE_IDLE: 
+	case TRACE_IDLE:
 		// check packet crc16!
 		if ((len >= 4) && (!check_crc(CRC_14443_A, data, len))) {
 			PrintAndLogEx(NORMAL, "DEC| CRC ERROR!!!");
-			AddLogLine(logHexFileName, "DEC| ", "CRC ERROR!!!"); 
+			AddLogLine(logHexFileName, "DEC| ", "CRC ERROR!!!");
 			traceState = TRACE_ERROR;  // do not decrypt the next commands
 			return 1;
 		}
-		
+
 		// AUTHENTICATION
 		if ((len == 4) && ((data[0] == MIFARE_AUTH_KEYA) || (data[0] == MIFARE_AUTH_KEYB))) {
 			traceState = TRACE_AUTH1;
@@ -750,7 +750,7 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
 		}
 		return 0;
 
-	case TRACE_READ_DATA: 
+	case TRACE_READ_DATA:
 		if (len == 18) {
 			traceState = TRACE_IDLE;
 
@@ -766,7 +766,7 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
 			return 1;
 		}
 		break;
-	case TRACE_WRITE_OK: 
+	case TRACE_WRITE_OK:
 		if ((len == 1) && (data[0] == 0x0a)) {
 			traceState = TRACE_WRITE_DATA;
 			return 0;
@@ -775,7 +775,7 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
 			return 1;
 		}
 		break;
-	case TRACE_WRITE_DATA: 
+	case TRACE_WRITE_DATA:
 		if (len == 18) {
 			traceState = TRACE_IDLE;
 			memcpy(traceCard + traceCurBlock * 16, data, 16);
@@ -786,7 +786,7 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
 			return 1;
 		}
 		break;
-	case TRACE_AUTH1: 
+	case TRACE_AUTH1:
 		if (len == 4) {
 			traceState = TRACE_AUTH2;
 			nt = bytes_to_num(data, 4);
@@ -796,7 +796,7 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
 			return 1;
 		}
 		break;
-	case TRACE_AUTH2: 
+	case TRACE_AUTH2:
 		if (len == 8) {
 			traceState = TRACE_AUTH_OK;
 			nr_enc = bytes_to_num(data, 4);
@@ -807,11 +807,11 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
 			return 1;
 		}
 		break;
-	case TRACE_AUTH_OK: 
+	case TRACE_AUTH_OK:
 		if (len == 4) {
 			traceState = TRACE_IDLE;
 			at_enc = bytes_to_num(data, 4);
-			
+
 			//  mfkey64 recover key.
 			ks2 = ar_enc ^ prng_successor(nt, 64);
 			ks3 = at_enc ^ prng_successor(nt, 96);
@@ -822,37 +822,37 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
 			lfsr_rollback_word(revstate, cuid ^ nt, 0);
 			crypto1_get_lfsr(revstate, &key);
 			PrintAndLogEx(SUCCESS, "found Key: [%012" PRIx64 "]", key);
-			
+
 			//if ( tryMfk64(cuid, nt, nr_enc, ar_enc, at_enc, &key) )
-			AddLogUint64(logHexFileName, "Found Key: ", key); 
-			
+			AddLogUint64(logHexFileName, "Found Key: ", key);
+
 			int blockShift = ((traceCurBlock & 0xFC) + 3) * 16;
-			if (isBlockEmpty((traceCurBlock & 0xFC) + 3)) 
+			if (isBlockEmpty((traceCurBlock & 0xFC) + 3))
 				memcpy(traceCard + blockShift + 6, trailerAccessBytes, 4);
-			
+
 			// keytype A/B
 			if (traceCurKey)
 				num_to_bytes(key, 6, traceCard + blockShift + 10);
 			else
 				num_to_bytes(key, 6, traceCard + blockShift);
-			
+
 			if (wantSaveToEmlFile)
 				saveTraceCard();
 
 			if (traceCrypto1)
 				crypto1_destroy(traceCrypto1);
-			
+
 			// set cryptosystem state
-			traceCrypto1 = lfsr_recovery64(ks2, ks3);			
+			traceCrypto1 = lfsr_recovery64(ks2, ks3);
 
 		} else {
 			PrintAndLogEx(NORMAL, "[!] nested key recovery not implemented!\n");
 			at_enc = bytes_to_num(data, 4);
-			crypto1_destroy(traceCrypto1);			
+			crypto1_destroy(traceCrypto1);
 			traceState = TRACE_ERROR;
 		}
 		break;
-	default: 
+	default:
 		traceState = TRACE_ERROR;
 		return 1;
 	}
@@ -871,30 +871,30 @@ int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t *data,
 	return 0;
 }
 
-/* Detect Tag Prng, 
+/* Detect Tag Prng,
 * function performs a partial AUTH,  where it tries to authenticate against block0, key A, but only collects tag nonce.
 * the tag nonce is check to see if it has a predictable PRNG.
-* @returns 
+* @returns
 *	TRUE if tag uses WEAK prng (ie Now the NACK bug also needs to be present for Darkside attack)
 *   FALSE is tag uses HARDEND prng (ie hardnested attack possible, with known key)
 */
 int detect_classic_prng(void){
 
-	UsbCommand resp, respA;	
+	UsbCommand resp, respA;
 	uint8_t cmd[] = {MIFARE_AUTH_KEYA, 0x00};
 	uint32_t flags = ISO14A_CONNECT | ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_RATS;
-	
+
 	UsbCommand c = {CMD_READER_ISO_14443a, {flags, sizeof(cmd), 0}};
 	memcpy(c.d.asBytes, cmd, sizeof(cmd));
 
 	clearCommandBuffer();
-	SendCommand(&c);					
-	
+	SendCommand(&c);
+
 	if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
         PrintAndLogEx(WARNING, "PRNG UID: Reply timeout.");
 		return -1;
 	}
-		
+
 	// if select tag failed.
 	if ( resp.arg[0] == 0 ) {
 		PrintAndLogEx(WARNING, "error:  selecting tag failed,  can't detect prng\n");
@@ -909,12 +909,12 @@ int detect_classic_prng(void){
 	if (respA.arg[0] != 4) {
 		PrintAndLogEx(WARNING, "PRNG data error: Wrong length: %d", respA.arg[0]);
 		return -4;
-	}			
+	}
 
 	uint32_t nonce = bytes_to_num(respA.d.asBytes, respA.arg[0]);
 	return validate_prng_nonce(nonce);
 }
-/* Detect Mifare Classic NACK bug 
+/* Detect Mifare Classic NACK bug
 
 returns:
 0 = error during test / aborted
@@ -923,25 +923,25 @@ returns:
 3 = always leak nacks  (clones)
 */
 int detect_classic_nackbug(bool verbose){
-	
+
 	UsbCommand c = {CMD_MIFARE_NACK_DETECT, {0, 0, 0}};
 	clearCommandBuffer();
 	SendCommand(&c);
 	UsbCommand resp;
-	
+
 	if ( verbose )
 		PrintAndLogEx(SUCCESS, "press pm3-button on the proxmark3 device to abort both proxmark3 and client.\n");
-	
-	// for nice animation	
+
+	// for nice animation
 	bool term = !isatty(STDIN_FILENO);
 #if defined(__linux__) || (__APPLE__)
 	char star[] = {'-', '\\', '|', '/'};
-	uint8_t staridx = 0;	
-#endif 
+	uint8_t staridx = 0;
+#endif
 
 	while (true) {
 
-		if (term) {		
+		if (term) {
 			printf(".");
 		} else {
 			printf(
@@ -958,21 +958,21 @@ int detect_classic_nackbug(bool verbose){
 			return -1;
 			break;
 		}
-	
+
 		if (WaitForResponseTimeout(CMD_ACK, &resp, 500)) {
 			int32_t ok = resp.arg[0];
 			uint32_t nacks = resp.arg[1];
 			uint32_t auths = resp.arg[2];
 			PrintAndLogEx(NORMAL, "");
-			
+
 			if ( verbose ) {
 				PrintAndLogEx(SUCCESS, "num of auth requests  : %u", auths);
 				PrintAndLogEx(SUCCESS, "num of received NACK  : %u", nacks);
 			}
 			switch( ok ) {
 				case 99 : PrintAndLogEx(WARNING, "button pressed. Aborted."); return 0;
-				case 96 : 
-				case 98 : { 
+				case 96 :
+				case 98 : {
 							if (verbose)
 								PrintAndLogEx(FAILED, "card random number generator is not predictable.");
 							PrintAndLogEx(WARNING, "detection failed");
@@ -981,10 +981,10 @@ int detect_classic_nackbug(bool verbose){
 				case 97 : {
 							if (verbose) {
 								PrintAndLogEx(FAILED, "card random number generator seems to be based on the well-known generating polynomial");
-								PrintAndLogEx(NORMAL, "[- ]with 16 effective bits only, but shows unexpected behavior, try again."); 
+								PrintAndLogEx(NORMAL, "[- ]with 16 effective bits only, but shows unexpected behavior, try again.");
 							}
 							return 2;
-						}				
+						}
 				case  2 : PrintAndLogEx(SUCCESS, _GREEN_(always leak NACK detected)); return 3;
 				case  1 : PrintAndLogEx(SUCCESS, _GREEN_(NACK bug detected)); return 1;
 				case  0 : PrintAndLogEx(SUCCESS, "No NACK bug detected"); return 2;
@@ -992,12 +992,12 @@ int detect_classic_nackbug(bool verbose){
 			}
 			break;
 		}
-	}	
+	}
 	return 0;
 }
 /* try to see if card responses to "chinese magic backdoor" commands. */
 void detect_classic_magic(void) {
-	
+
 	uint8_t isGeneration = 0;
 	UsbCommand resp;
 	UsbCommand c = {CMD_MIFARE_CIDENT, {0, 0, 0}};
@@ -1005,11 +1005,11 @@ void detect_classic_magic(void) {
 	SendCommand(&c);
 	if (WaitForResponseTimeout(CMD_ACK, &resp, 1500))
 		isGeneration = resp.arg[0] & 0xff;
-	
+
 	switch( isGeneration ){
 		case 1: PrintAndLogEx(SUCCESS, "Answers to magic commands (GEN 1a): " _GREEN_(YES)); break;
 		case 2: PrintAndLogEx(SUCCESS, "Answers to magic commands (GEN 1b): " _GREEN_(YES)); break;
 		//case 4: PrintAndLogEx(SUCCESS, "Answers to magic commands (GEN 2): "  _GREEN_(YES)); break;
 		default: PrintAndLogEx(INFO, "Answers to magic commands: " _YELLOW_(NO)); break;
-	}		
+	}
 }
\ No newline at end of file
diff --git a/client/mifare/mifarehost.h b/client/mifare/mifarehost.h
index 917cf5557..e0f4eaadd 100644
--- a/client/mifare/mifarehost.h
+++ b/client/mifare/mifarehost.h
@@ -55,7 +55,7 @@ typedef struct {
 		uint32_t nt;
 		uint32_t ks1;
 } StateList_t;
-	
+
 typedef struct {
 	uint64_t Key[2];
 	uint8_t foundKey[2];
diff --git a/client/mifare/ndef.c b/client/mifare/ndef.c
index 6c7e12229..e8edc19da 100644
--- a/client/mifare/ndef.c
+++ b/client/mifare/ndef.c
@@ -89,7 +89,7 @@ uint16_t ndefTLVGetLength(uint8_t *data, size_t *indx) {
 		len = data[0];
 		*indx += 1;
 	}
-	
+
 	return len;
 }
 
@@ -107,12 +107,12 @@ int ndefDecodeHeader(uint8_t *data, size_t datalen, NDEFHeader_t *header) {
 	header->len				= 1 + 1 + (header->ShortRecordBit ? 1 : 4) + (header->IDLenPresent ? 1 : 0); // header + typelen + payloadlen + idlen
 	if (header->len > datalen)
 		return 1;
-	
+
 	header->TypeLen = data[1];
 	header->Type = data + header->len;
-	
+
 	header->PayloadLen = (header->ShortRecordBit ? (data[2]) : ((data[2] << 24) + (data[3] << 16) + (data[4] << 8) + data[5]));
-	
+
 	if (header->IDLenPresent) {
 		header->IDLen = (header->ShortRecordBit ? (data[3]) : (data[6]));
 		header->Payload = header->Type + header->TypeLen;
@@ -121,9 +121,9 @@ int ndefDecodeHeader(uint8_t *data, size_t datalen, NDEFHeader_t *header) {
 	}
 
 	header->Payload = header->Type + header->TypeLen + header->IDLen;
-	
+
 	header->RecLen = header->len + header->TypeLen + header->PayloadLen + header->IDLen;
-	
+
 	if (header->RecLen > datalen)
 		return 3;
 
@@ -132,7 +132,7 @@ int ndefDecodeHeader(uint8_t *data, size_t datalen, NDEFHeader_t *header) {
 
 int ndefPrintHeader(NDEFHeader_t *header) {
 	PrintAndLogEx(INFO, "Header:");
-	
+
 	PrintAndLogEx(NORMAL, "\tMessage Begin:    %s", STRBOOL(header->MessageBegin));
 	PrintAndLogEx(NORMAL, "\tMessage End:      %s", STRBOOL(header->MessageEnd));
 	PrintAndLogEx(NORMAL, "\tChunk Flag:       %s", STRBOOL(header->ChunkFlag));
@@ -157,21 +157,21 @@ int ndefDecodeSig(uint8_t *sig, size_t siglen) {
 		return 1;
 	}
 	indx++;
-	
+
 	uint8_t sigType = sig[indx] & 0x7f;
 	bool sigURI = sig[indx] & 0x80;
 
 	PrintAndLogEx(NORMAL, "\tsignature type: %s", ((sigType < stNA) ? ndefSigType_s[sigType] : ndefSigType_s[stNA]));
 	PrintAndLogEx(NORMAL, "\tsignature uri: %s", (sigURI ? "present" : "not present"));
-	
+
 	size_t intsiglen = (sig[indx + 1] << 8) + sig[indx + 2];
 	// ecdsa 0x04
 	if (sigType == stECDSA) {
 		indx += 3;
 		PrintAndLogEx(NORMAL, "\tsignature [%d]: %s", intsiglen, sprint_hex_inrow(&sig[indx], intsiglen));
-		
-		uint8_t rval[300] = {0}; 
-		uint8_t sval[300] = {0}; 
+
+		uint8_t rval[300] = {0};
+		uint8_t sval[300] = {0};
 		int res = ecdsa_asn1_get_signature(&sig[indx], intsiglen, rval, sval);
 		if (!res) {
 			PrintAndLogEx(NORMAL ,"\t\tr: %s", sprint_hex(rval, 32));
@@ -179,28 +179,28 @@ int ndefDecodeSig(uint8_t *sig, size_t siglen) {
 		}
 	}
 	indx += intsiglen;
-	
+
 	if (sigURI) {
 		size_t intsigurilen = (sig[indx] << 8) + sig[indx + 1];
 		indx += 2;
-		PrintAndLogEx(NORMAL, "\tsignature uri [%d]: %.*s", intsigurilen, intsigurilen, &sig[indx]);			
+		PrintAndLogEx(NORMAL, "\tsignature uri [%d]: %.*s", intsigurilen, intsigurilen, &sig[indx]);
 		indx += intsigurilen;
 	}
-		
+
 	uint8_t certFormat = (sig[indx] >> 4) & 0x07;
 	uint8_t certCount = sig[indx] & 0x0f;
 	bool certURI = sig[indx] & 0x80;
-	
+
 	PrintAndLogEx(NORMAL, "\tcertificate format: %s", ((certFormat < sfNA) ? ndefCertificateFormat_s[certFormat] : ndefCertificateFormat_s[sfNA]));
 	PrintAndLogEx(NORMAL, "\tcertificates count: %d", certCount);
-	
+
 	// print certificates
 	indx++;
 	for (int i = 0; i < certCount; i++) {
 		size_t intcertlen = (sig[indx + 1] << 8) + sig[indx + 2];
 		indx += 2;
-		
-		PrintAndLogEx(NORMAL, "\tcertificate %d [%d]: %s", i + 1, intcertlen, sprint_hex_inrow(&sig[indx], intcertlen));			
+
+		PrintAndLogEx(NORMAL, "\tcertificate %d [%d]: %s", i + 1, intcertlen, sprint_hex_inrow(&sig[indx], intcertlen));
 		indx += intcertlen;
 	}
 
@@ -208,32 +208,32 @@ int ndefDecodeSig(uint8_t *sig, size_t siglen) {
 	if ((indx <= siglen) && certURI) {
 		size_t inturilen = (sig[indx] << 8) + sig[indx + 1];
 		indx += 2;
-		PrintAndLogEx(NORMAL, "\tcertificate uri [%d]: %.*s", inturilen, inturilen, &sig[indx]);			
+		PrintAndLogEx(NORMAL, "\tcertificate uri [%d]: %.*s", inturilen, inturilen, &sig[indx]);
 		indx += inturilen;
 	}
-	
+
 	return 0;
 };
 
 int ndefDecodePayload(NDEFHeader_t *ndef) {
-	
+
 	switch(ndef->TypeNameFormat) {
 	case tnfWellKnownRecord:
 		PrintAndLogEx(INFO, "Well Known Record");
 		PrintAndLogEx(NORMAL, "\ttype:    %.*s", ndef->TypeLen, ndef->Type);
-		
+
 		if (!strncmp((char *)ndef->Type, "T", ndef->TypeLen)) {
 			PrintAndLogEx(NORMAL, "\ttext   : %.*s", ndef->PayloadLen, ndef->Payload);
 		}
-		
+
 		if (!strncmp((char *)ndef->Type, "U", ndef->TypeLen)) {
 			PrintAndLogEx(NORMAL, "\turi    : %s%.*s", (ndef->Payload[0] <= 0x23 ? URI_s[ndef->Payload[0]] : "[err]"), ndef->PayloadLen, &ndef->Payload[1]);
 		}
-		
+
 		if (!strncmp((char *)ndef->Type, "Sig", ndef->TypeLen)) {
 			ndefDecodeSig(ndef->Payload, ndef->PayloadLen);
 		}
-		
+
 		break;
 	case tnfAbsoluteURIRecord:
 		PrintAndLogEx(INFO, "Absolute URI Record");
@@ -242,7 +242,7 @@ int ndefDecodePayload(NDEFHeader_t *ndef) {
 		break;
 	default:
 		break;
-	}	
+	}
 	return 0;
 }
 
@@ -251,9 +251,9 @@ int ndefRecordDecodeAndPrint(uint8_t *ndefRecord, size_t ndefRecordLen) {
 	int res = ndefDecodeHeader(ndefRecord, ndefRecordLen, &NDEFHeader);
 	if (res)
 		return res;
-	
+
 	ndefPrintHeader(&NDEFHeader);
-	
+
 	if (NDEFHeader.TypeLen) {
 		PrintAndLogEx(INFO, "Type data:");
 		dump_buffer(NDEFHeader.Type, NDEFHeader.TypeLen, stdout, 1);
@@ -275,13 +275,13 @@ int ndefRecordDecodeAndPrint(uint8_t *ndefRecord, size_t ndefRecordLen) {
 int ndefRecordsDecodeAndPrint(uint8_t *ndefRecord, size_t ndefRecordLen) {
 	bool firstRec = true;
 	size_t len = 0;
-	
+
 	while (len < ndefRecordLen) {
 		NDEFHeader_t NDEFHeader = {0};
 		int res = ndefDecodeHeader(&ndefRecord[len], ndefRecordLen - len, &NDEFHeader);
 		if (res)
 			return res;
-		
+
 		if (firstRec) {
 			if (!NDEFHeader.MessageBegin) {
 				PrintAndLogEx(ERR, "NDEF first record have MessageBegin=false!");
@@ -289,27 +289,27 @@ int ndefRecordsDecodeAndPrint(uint8_t *ndefRecord, size_t ndefRecordLen) {
 			}
 			firstRec = false;
 		}
-		
+
 		if (NDEFHeader.MessageEnd && len + NDEFHeader.RecLen != ndefRecordLen) {
 			PrintAndLogEx(ERR, "NDEF records have wrong length. Must be %d, calculated %d", ndefRecordLen, len + NDEFHeader.RecLen);
 			return 1;
 		}
-		
-		ndefRecordDecodeAndPrint(&ndefRecord[len], NDEFHeader.RecLen);		
-		
+
+		ndefRecordDecodeAndPrint(&ndefRecord[len], NDEFHeader.RecLen);
+
 		len += NDEFHeader.RecLen;
-		
+
 		if (NDEFHeader.MessageEnd)
 			break;
-	}	
-	
+	}
+
 	return 0;
 }
 
 int NDEFDecodeAndPrint(uint8_t *ndef, size_t ndefLen, bool verbose) {
-	
+
 	size_t indx = 0;
-	
+
 	PrintAndLogEx(INFO, "NDEF decoding:");
 	while (indx < ndefLen) {
 		switch (ndef[indx]) {
@@ -326,11 +326,11 @@ int NDEFDecodeAndPrint(uint8_t *ndef, size_t ndefLen, bool verbose) {
 				indx++;
 				uint16_t len = ndefTLVGetLength(&ndef[indx], &indx);
 				PrintAndLogEx(INFO, "-- NDEF message. len: %d", len);
-				
+
 				int res = ndefRecordsDecodeAndPrint(&ndef[indx], len);
 				if (res)
 					return res;
-				
+
 				indx += len;
 				break;
 			}
@@ -350,8 +350,8 @@ int NDEFDecodeAndPrint(uint8_t *ndef, size_t ndefLen, bool verbose) {
 				PrintAndLogEx(ERR, "unknown tag 0x%02x", ndef[indx]);
 				return 1;
 			}
-		}		
+		}
 	}
-	
+
 	return 0;
 }
diff --git a/client/proxguiqt.h b/client/proxguiqt.h
index f01526178..dbd2a9983 100644
--- a/client/proxguiqt.h
+++ b/client/proxguiqt.h
@@ -115,7 +115,7 @@ class ProxGuiQT : public QObject
 		char **argv;
 		//void (*main_func)(void);
 		WorkerThread *proxmarkThread;
-		
+
 	public:
 		ProxGuiQT(int argc, char **argv, WorkerThread *wthread);
 		~ProxGuiQT(void);
@@ -124,7 +124,7 @@ class ProxGuiQT : public QObject
 		void HideGraphWindow(void);
 		void MainLoop(void);
 		void Exit(void);
-		
+
 	private slots:
 		void _ShowGraphWindow(void);
 		void _RepaintGraphWindow(void);
diff --git a/client/proxmark3.c b/client/proxmark3.c
index 072fec427..45ed2b47a 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -47,7 +47,7 @@ static void showBanner(void){
 void
 #ifdef __has_attribute
 #if __has_attribute(force_align_arg_pointer)
-__attribute__((force_align_arg_pointer)) 
+__attribute__((force_align_arg_pointer))
 #endif
 #endif
 main_loop(char *script_cmds_file, char *script_cmd, bool usb_present) {
@@ -57,39 +57,39 @@ main_loop(char *script_cmds_file, char *script_cmd, bool usb_present) {
 	bool stdinOnPipe = !isatty(STDIN_FILENO);
 	FILE *sf = NULL;
 	char script_cmd_buf[256] = {0x00};  // iceman, needs lua script the same file_path_buffer as the rest
-	
+
 	PrintAndLogEx(DEBUG, "ISATTY/STDIN_FILENO == %s\n", (stdinOnPipe) ? "true" : "false");
-	
+
 	if (usb_present) {
 		SetOffline(false);
 		// cache Version information now:
 		if ( execCommand || script_cmds_file || stdinOnPipe)
 			CmdVersion("s");
-		else 
+		else
 			CmdVersion("");
 	} else {
 		SetOffline(true);
 	}
 
 	if (script_cmds_file) {
-		
-		sf = fopen(script_cmds_file, "r");		
+
+		sf = fopen(script_cmds_file, "r");
 		if (sf)
 			PrintAndLogEx(SUCCESS, "executing commands from file: %s\n", script_cmds_file);
 	}
 
 	read_history(".history");
-	
+
 	// loops every time enter is pressed...
 	while (1) {
-		
+
 		// this should hook up the PM3 again.
 		/*
 		if ( IsOffline() ) {
-			
+
 			// sets the global variable, SP and offline)
 			usb_present = hookUpPM3();
-		
+
 			// usb and the reader_thread is NULL,  create a new reader thread.
 			if (usb_present && !IsOffline() ) {
 				rarg.run = 1;
@@ -97,7 +97,7 @@ main_loop(char *script_cmds_file, char *script_cmd, bool usb_present) {
 				// cache Version information now:
 				if ( execCommand || script_cmds_file || stdinOnPipe)
 					CmdVersion("s");
-				else 
+				else
 					CmdVersion("");
 			}
 		}
@@ -105,16 +105,16 @@ main_loop(char *script_cmds_file, char *script_cmd, bool usb_present) {
 
 		// If there is a script file
 		if (sf) {
-			
+
 			// clear array
 			memset(script_cmd_buf, 0, sizeof(script_cmd_buf));
-			
+
 			// read script file
 			if (!fgets(script_cmd_buf, sizeof(script_cmd_buf), sf)) {
 				fclose(sf);
 				sf = NULL;
 			} else {
-				
+
 				// remove linebreaks
 				strcleanrn(script_cmd_buf, sizeof(script_cmd_buf));
 
@@ -124,7 +124,7 @@ main_loop(char *script_cmds_file, char *script_cmd, bool usb_present) {
 		} else {
 			// If there is a script command
 			if (execCommand){
-				
+
 				if ((cmd = strmcopy(script_cmd)) != NULL)
 					PrintAndLogEx(NORMAL, PROXPROMPT"%s", cmd);
 
@@ -136,10 +136,10 @@ main_loop(char *script_cmds_file, char *script_cmd, bool usb_present) {
 
 				// if there is a pipe from stdin
 				if (stdinOnPipe) {
-					
+
 					// clear array
 					memset(script_cmd_buf, 0, sizeof(script_cmd_buf));
-					// get 
+					// get
 					if (!fgets(script_cmd_buf, sizeof(script_cmd_buf), stdin)) {
 						PrintAndLogEx(ERR, "STDIN unexpected end, exit...");
 						break;
@@ -149,17 +149,17 @@ main_loop(char *script_cmds_file, char *script_cmd, bool usb_present) {
 
 					if ((cmd = strmcopy(script_cmd_buf)) != NULL)
 						PrintAndLogEx(NORMAL, PROXPROMPT"%s", cmd);
-				
-				} else {		
+
+				} else {
 					cmd = readline(PROXPROMPT);
 					fflush(NULL);
 				}
 			}
 		}
-		
+
 		// execute command
 		if (cmd) {
-			
+
 			// rtrim
 			size_t l = strlen(cmd);
 			if ( l > 0 && isspace(cmd[l - 1]))
@@ -170,9 +170,9 @@ main_loop(char *script_cmds_file, char *script_cmd, bool usb_present) {
 				HIST_ENTRY * entry = history_get(history_length);
 				if ((!entry) || (strcmp(entry->line, cmd) != 0))
 					add_history(cmd);
-				
+
 				// exit or quit
-				if (ret == 99) 
+				if (ret == 99)
 					break;
 			}
 			free(cmd);
@@ -181,17 +181,17 @@ main_loop(char *script_cmds_file, char *script_cmd, bool usb_present) {
 			PrintAndLogEx(NORMAL, "\n");
 			break;
 		}
-	} // end while 
-	
+	} // end while
+
 	if (sf)
 		fclose(sf);
-	
+
 	write_history(".history");
 
 	if (cmd) {
 		free(cmd);
 		cmd = NULL;
-	}		
+	}
 }
 
 static void dumpAllHelp(int markdown) {
@@ -231,7 +231,7 @@ static void set_my_executable_path(void) {
 static void show_help(bool showFullHelp, char *command_line){
 	PrintAndLogEx(NORMAL, "syntax: %s <port> [-h | -help | -m | -f | -flush | -w | -wait | -c | -command | -l | -lua] [cmd_script_file_name] [command][lua_script_name]\n", command_line);
 	PrintAndLogEx(NORMAL, "\texample:'%s "SERIAL_PORT_H"'\n\n", command_line);
-	
+
 	if (showFullHelp){
 		PrintAndLogEx(NORMAL, "help: <-h|-help> Dump all interactive command's help at once.\n");
 		PrintAndLogEx(NORMAL, "\t%s  -h\n\n", command_line);
@@ -252,7 +252,7 @@ static void show_help(bool showFullHelp, char *command_line){
 
 int main(int argc, char* argv[]) {
 	srand(time(0));
-  
+
 	bool usb_present = false;
 	bool waitCOMPort = false;
 	bool executeCommand = false;
@@ -264,35 +264,35 @@ int main(int argc, char* argv[]) {
 	using_history();
 
 #ifdef RL_STATE_READCMD
-  	rl_extend_line_buffer(1024);		
+  	rl_extend_line_buffer(1024);
 #endif
-  
+
 	if (argc < 2) {
 		show_help(true, argv[0]);
 		return 1;
 	}
 
 	for (int i = 1; i < argc; i++) {
-	
+
 		// helptext
 		if (strcmp(argv[i], "-h") == 0 || strcmp(argv[i], "-help") == 0) {
 			show_help(false, argv[0]);
 			dumpAllHelp(0);
 			return 0;
 		}
-		
+
 		// dump markup
 		if (strcmp(argv[i], "-m") == 0) {
 			dumpAllHelp(1);
 			return 0;
-		}	   
+		}
 
 		// flush output
 		if (strcmp(argv[i], "-f") == 0 || strcmp(argv[i], "-flush") == 0){
 			SetFlushAfterWrite(true);
 			PrintAndLogEx(INFO, "Output will be flushed after every print.\n");
 		}
-		
+
 		// wait for comport
 		if (strcmp(argv[i], "-w") == 0 || strcmp(argv[i], "-wait") == 0){
 			waitCOMPort = true;
@@ -314,10 +314,10 @@ int main(int argc, char* argv[]) {
 	if (argc > 2 && argv[argc - 1] && argv[argc - 1][0] != '-') {
 		if (executeCommand){
 			script_cmd = argv[argc - 1];
-			
+
 			while (script_cmd[strlen(script_cmd) - 1] == ' ')
 				script_cmd[strlen(script_cmd) - 1] = 0x00;
-			
+
 			if (strlen(script_cmd) == 0) {
 				script_cmd = NULL;
 			} else {
@@ -332,7 +332,7 @@ int main(int argc, char* argv[]) {
 						script_cmd = ctmp;
 					}
 				}
-				
+
 				PrintAndLogEx(SUCCESS, "execute command from commandline: %s\n", script_cmd);
 			}
 		} else {
@@ -347,16 +347,16 @@ int main(int argc, char* argv[]) {
 	}
 
 #if defined(__linux__) || (__APPLE__)
-// ascii art doesn't work well on mingw :( 
+// ascii art doesn't work well on mingw :(
 
 	bool stdinOnPipe = !isatty(STDIN_FILENO);
 	if ( !executeCommand && !script_cmds_file && !stdinOnPipe )
-		showBanner();  
+		showBanner();
 #endif
-	
+
 	// set global variables
 	set_my_executable_path();
-	
+
 	// try to open USB connection to Proxmark
 	usb_present = OpenProxmark(argv[1], waitCOMPort, 20, false);
 
@@ -375,15 +375,15 @@ int main(int argc, char* argv[]) {
 		main_loop(script_cmds_file, script_cmd, usb_present);
 	}
 #  endif
-	
+
 #else
 	main_loop(script_cmds_file, script_cmd, usb_present);
-#endif	
- 
+#endif
+
  	// Clean up the port
 	if (usb_present) {
 		CloseProxmark();
 	}
-	
+
 	exit(0);
 }
diff --git a/client/proxmark3.h b/client/proxmark3.h
index 0a69e71ba..52fe27385 100644
--- a/client/proxmark3.h
+++ b/client/proxmark3.h
@@ -13,7 +13,7 @@
 #define PROXMARK3_H__
 
 #include "usb_cmd.h"
-#include "cmdscript.h"  // CmdScriptRun  
+#include "cmdscript.h"  // CmdScriptRun
 
 #define PROXPROMPT "pm3 --> "
 
diff --git a/client/reveng/cli.c b/client/reveng/cli.c
index 6e147ba20..562b2d084 100644
--- a/client/reveng/cli.c
+++ b/client/reveng/cli.c
@@ -377,7 +377,7 @@ ipqx:
 
 			/* allocate argument array */
 			args = argc - optind;
-			
+
 			apolys = calloc(args * sizeof(poly_t), sizeof(char));
 			if ( !apolys ){
 				uerror("cannot allocate memory for argument list");
diff --git a/client/reveng/getopt.c b/client/reveng/getopt.c
index ebea43f06..7987d8e6b 100644
--- a/client/reveng/getopt.c
+++ b/client/reveng/getopt.c
@@ -35,7 +35,7 @@ int getopt(int argc, char *argv[], const char *optstring)
 {
     //static int pos = 0;
     char *str;
-    
+
     if (pos == 0) {
 	if ((optind >= argc) || (*argv[optind] != '-'))
 	    return EOF;
@@ -43,7 +43,7 @@ int getopt(int argc, char *argv[], const char *optstring)
 	if (argv[optind][pos] == '\0')
 	    return EOF;
     }
-    
+
     str = strchr(optstring, argv[optind][pos]);
     if (str == NULL) {
 	optopt = argv[optind][pos];
@@ -52,7 +52,7 @@ int getopt(int argc, char *argv[], const char *optstring)
 		    optopt);
 	return '?';
     }
-    
+
     if (str[1] == ':') {
 	if (argv[optind][pos+1] != '\0') {
 	    optarg = &argv[optind][pos+1];
diff --git a/client/reveng/preset.c b/client/reveng/preset.c
index 82a18b977..dd093a6f3 100644
--- a/client/reveng/preset.c
+++ b/client/reveng/preset.c
@@ -811,7 +811,7 @@ int mbynam(model_t *dest, const char *key) {
 
 	if (!aliases->name)
 		return(-1);
-	
+
 	ukey = calloc((size_t) 1 + strlen(key) + 1, sizeof(char));
 	if (!ukey) {
 		uerror("[!] cannot allocate memory for comparison string");
@@ -863,7 +863,7 @@ char * mnames(void) {
 		++aptr;
 	}
 	if (!size) return(NULL);
-	
+
 	string = calloc(size, sizeof(char));
 	if (string) {
 		aptr = aliases;
diff --git a/client/reveng/reveng.c b/client/reveng/reveng.c
index 550dc2da5..1525bb265 100644
--- a/client/reveng/reveng.c
+++ b/client/reveng/reveng.c
@@ -173,7 +173,7 @@ modpol(const poly_t init, int rflags, int args, const poly_t *argpolys) {
 	unsigned long alen, blen;
 
 	if(args < 2) return(NULL);
-	
+
 	result = calloc(((((args - 1) * args) >> 1) + 1) * sizeof(poly_t), sizeof(char));
 	if(!result)
 		uerror("cannot allocate memory for codeword table");
@@ -482,7 +482,7 @@ chkres(int *resc, model_t **result, const poly_t divisor, const poly_t init, int
 		uerror("cannot reallocate result array");
 		return;
 	}
-	
+
 	rptr = *result + *resc - 1;
 	rptr->spoly  = pclone(divisor);
 	rptr->init   = pclone(init);
diff --git a/client/scandir.c b/client/scandir.c
index 619bd72c6..d7cb0e9d6 100644
--- a/client/scandir.c
+++ b/client/scandir.c
@@ -28,7 +28,7 @@ int scandir (const char *dir,
 	int count = 0;
 	int allocated = 0;
 	int err_no = 0;
-	
+
 	if (!(dirp = opendir (dir)))
 		return -1;
 
diff --git a/client/scripting.c b/client/scripting.c
index 6f6a30f53..5f01f6afe 100644
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -1,6 +1,6 @@
 //-----------------------------------------------------------------------------
 // Copyright (C) 2013 m h swende <martin at swende.se>
-// Modified 2015,2016, iceman 
+// Modified 2015,2016, iceman
 //
 // This code is licensed to you under the terms of the GNU GPL, version 2 or,
 // at your option, any later version. See the LICENSE.txt file for the text of
@@ -54,9 +54,9 @@ static int l_SendCommand(lua_State *L){
  * @return
  */
 static int l_GetFromBigBuf(lua_State *L){
-	
+
 	int len = 0, startindex = 0;
-	
+
     //Check number of arguments
     int n = lua_gettop(L);
     if (n == 0) {
@@ -81,10 +81,10 @@ static int l_GetFromBigBuf(lua_State *L){
 	if ( !GetFromDevice(BIG_BUF, data, len, startindex, NULL, 2500, false)) {
 		free(data);
 		lua_pushnil(L);
-        lua_pushstring(L, "command execution time out");		
+        lua_pushstring(L, "command execution time out");
 		return 2;
 	}
-	
+
 	//Push it as a string
 	lua_pushlstring(L,(const char *)data, len);
 	free(data);
@@ -103,11 +103,11 @@ static int l_GetFromFlashMem(lua_State *L){
 
 #ifndef WITH_FLASH
 	lua_pushnil(L);
-	lua_pushstring(L, "Not compiled with FLASH MEM support");		
+	lua_pushstring(L, "Not compiled with FLASH MEM support");
 	return 2;
 #else
 	int len = 0, startindex = 0;
-	
+
     int n = lua_gettop(L);
     if (n == 0) {
         lua_pushnil(L);
@@ -123,13 +123,13 @@ static int l_GetFromFlashMem(lua_State *L){
 	if ( !data ) {
         lua_pushnil(L);
         lua_pushstring(L, "Allocating memory failed");
-        return 2; 
+        return 2;
 	}
-	
+
 	if ( !GetFromDevice(FLASH_MEM, data, len, startindex, NULL, -1, false)) {
 		free(data);
 		lua_pushnil(L);
-        lua_pushstring(L, "command execution time out");		
+        lua_pushstring(L, "command execution time out");
 		return 2;
 	}
 
@@ -160,7 +160,7 @@ static int l_WaitForResponseTimeout(lua_State *L){
         lua_pushstring(L, "You need to supply at least command to wait for");
         return 2;
     }
-	
+
 	// extract first param.  cmd byte to look for
     if (n >= 1) {
         cmd = luaL_checkunsigned(L, 1);
@@ -208,7 +208,7 @@ static int l_mfDarkside(lua_State *L){
 		case 2:{
 			const char *p_keytype = luaL_checklstring(L, 2, &size);
 			if (size != 2)  return returnToLuaWithError(L,"Wrong size of keytype, got %d bytes, expected 1", (int) size);
-			sscanf(p_keytype, "%x", &keytype);			
+			sscanf(p_keytype, "%x", &keytype);
 		}
 		case 1: {
 			const char *p_blockno = luaL_checklstring(L, 1, &size);
@@ -223,7 +223,7 @@ static int l_mfDarkside(lua_State *L){
 
     uint8_t dest_key[8];
     num_to_bytes(key, sizeof(dest_key), dest_key);
-	
+
     //Push the retval on the stack
     lua_pushinteger(L, retval);
     lua_pushlstring(L, (const char *) dest_key, sizeof(dest_key));
@@ -282,16 +282,16 @@ static int l_CmdConsole(lua_State *L) {
 static int l_iso15693_crc(lua_State *L) {
 	uint32_t tmp;
 	unsigned char buf[USB_CMD_DATA_SIZE] = {0x00};
-    size_t size = 0;	
+    size_t size = 0;
     const char *data = luaL_checklstring(L, 1, &size);
-	
+
 	for (int i = 0; i < size; i += 2) {
 		sscanf(&data[i], "%02x", &tmp);
 		buf[i / 2] = tmp & 0xFF;
 	}
-	
-	size /= 2;	
-	compute_crc(CRC_15693, buf, size, &buf[size], &buf[size+1]);	
+
+	size /= 2;
+	compute_crc(CRC_15693, buf, size, &buf[size], &buf[size+1]);
     lua_pushlstring(L, (const char *)&buf, size+2);
     return 1;
 }
@@ -299,16 +299,16 @@ static int l_iso15693_crc(lua_State *L) {
 static int l_iso14443b_crc(lua_State *L) {
 	uint32_t tmp;
 	unsigned char buf[USB_CMD_DATA_SIZE] = {0x00};
-    size_t size = 0;	
+    size_t size = 0;
     const char *data = luaL_checklstring(L, 1, &size);
-	
+
 	for (int i = 0; i < size; i += 2) {
 		sscanf(&data[i], "%02x", &tmp);
 		buf[i / 2] = tmp & 0xFF;
 	}
-	
-	size /= 2;	
-	compute_crc(CRC_14443_B, buf, size, &buf[size], &buf[size+1]);	
+
+	size /= 2;
+	compute_crc(CRC_14443_B, buf, size, &buf[size], &buf[size+1]);
     lua_pushlstring(L, (const char *)&buf, size+2);
     return 1;
 }
@@ -388,12 +388,12 @@ static int l_aes128encrypt_cbc(lua_State *L) {
     if (size != 32)  return returnToLuaWithError(L,"Wrong size of key, got %d bytes, expected 32", (int) size);
 
     const char *p_txt = luaL_checklstring(L, 2, &size);
-    
+
 	unsigned char indata[16] = {0x00};
 	unsigned char outdata[16] = {0x00};
     unsigned char aes_key[16] = {0x00};
 	unsigned char iv[16] = {0x00};
-	
+
 	for (i = 0; i < 32; i += 2) {
 		sscanf(&p_txt[i], "%02x", &tmp);
 		indata[i / 2] = tmp & 0xFF;
@@ -419,17 +419,17 @@ static int l_aes128encrypt_ecb(lua_State *L) {
     if (size != 32) return returnToLuaWithError(L,"Wrong size of key, got %d bytes, expected 32", (int) size);
 
     const char *p_txt = luaL_checklstring(L, 2, &size);
-    
+
 	unsigned char indata[16] = {0x00};
 	unsigned char outdata[16] = {0x00};
     unsigned char aes_key[16] = {0x00};
-	
+
 	for (i = 0; i < 32; i += 2) {
 		sscanf(&p_txt[i], "%02x", &tmp);
 		indata[i / 2] = tmp & 0xFF;
 		sscanf(&p_key[i], "%02x", &tmp);
 		aes_key[i / 2] = tmp & 0xFF;
-	}	
+	}
     mbedtls_aes_context ctx;
     mbedtls_aes_init(&ctx);
 	mbedtls_aes_setkey_enc(&ctx, aes_key, 128);
@@ -459,7 +459,7 @@ static int l_crc16(lua_State *L) {
 
 static int l_crc64(lua_State *L) {
 	size_t size;
-	uint64_t crc = 0; 
+	uint64_t crc = 0;
 	unsigned char outdata[8] = {0x00};
 
 	const char *p_str = luaL_checklstring(L, 1, &size);
@@ -480,7 +480,7 @@ static int l_crc64(lua_State *L) {
 
 static int l_crc64_ecma182(lua_State *L) {
 	//size_t size;
-	uint64_t crc = 0; 
+	uint64_t crc = 0;
 	unsigned char outdata[8] = {0x00};
 	//const char *p_str = luaL_checklstring(L, 1, &size);
 
@@ -490,7 +490,7 @@ static int l_crc64_ecma182(lua_State *L) {
 
 	// calc hash
 	//crc64_ecma182((uint8_t*) p_str, size, &crc);
-	
+
 	outdata[0] = (uint8_t)(crc >> 56) & 0xff;
 	outdata[1] = (uint8_t)(crc >> 48) & 0xff;
 	outdata[2] = (uint8_t)(crc >> 40) & 0xff;
@@ -505,11 +505,11 @@ static int l_crc64_ecma182(lua_State *L) {
 
 static int l_sha1(lua_State *L) {
 	size_t size;
-	const char *p_str = luaL_checklstring(L, 1, &size);	
-	unsigned char outdata[20] = {0x00};                                                                                                                                                                     
-    mbedtls_sha1( (uint8_t*) p_str, size, outdata);                                                                                                                                                                 
+	const char *p_str = luaL_checklstring(L, 1, &size);
+	unsigned char outdata[20] = {0x00};
+    mbedtls_sha1( (uint8_t*) p_str, size, outdata);
     lua_pushlstring(L, (const char *)&outdata, sizeof(outdata));
-    return 1;	
+    return 1;
 }
 
 static int l_reveng_models(lua_State *L){
@@ -526,11 +526,11 @@ static int l_reveng_models(lua_State *L){
 	char *models[NMODELS];
 
 	width[0] = in_width;
-	
+
 	if (!GetModels(models, &count, width))
 		return returnToLuaWithError(L, "didn't find any models");
-	
-	lua_newtable(L);	
+
+	lua_newtable(L);
 	for (int i = 0; i < count; i++){
 		lua_pushstring(L,  (const char*)models[i]);
 		lua_rawseti(L,-2,i+1);
@@ -553,19 +553,19 @@ static int l_reveng_RunModel(lua_State *L){
 	//reverse = reverse calc option if true
 	//endian = {0 = calc default endian input and output, b = big endian input and output, B = big endian output, r = right justified
 	//          l = little endian input and output, L = little endian output only, t = left justified}
-	//result = calculated crc hex string	
+	//result = calculated crc hex string
 	char result[50];
-	
+
 	const char *inModel = luaL_checkstring(L, 1);
 	const char *inHexStr = luaL_checkstring(L, 2);
     bool reverse =  lua_toboolean(L, 3);
 	const char endian = luaL_checkstring(L, 4)[0];
 
 	int ans = RunModel( (char *)inModel, (char *)inHexStr, reverse, endian, result);
-	if (!ans) 	
+	if (!ans)
 		return returnToLuaWithError(L,"Reveng failed");
 
-	lua_pushstring(L, (const char*)result); 
+	lua_pushstring(L, (const char*)result);
 	return 1;
 }
 
@@ -582,7 +582,7 @@ static int l_hardnested(lua_State *L){
 
 	const char *p_key = luaL_checklstring(L, 3, &size);
     if(size != 12)  return returnToLuaWithError(L,"Wrong size of key, got %d bytes, expected 12", (int) size);
-	
+
     const char *p_trg_blockno = luaL_checklstring(L, 4, &size);
     if(size != 2)  return returnToLuaWithError(L,"Wrong size of trgBlockNo, got %d bytes, expected 2", (int) size);
 
@@ -604,7 +604,7 @@ static int l_hardnested(lua_State *L){
 
 	const char *p_tests = luaL_checklstring(L, 10, &size);
     if(size != 1)  return returnToLuaWithError(L,"Wrong size of tests, got %d bytes, expected 1", (int) size);
-	
+
 	char filename[FILE_PATH_SIZE]="nonces.bin";
 	const char *p_filename = luaL_checklstring(L, 11, &size);
 	if(size != 0)
@@ -634,7 +634,7 @@ static int l_hardnested(lua_State *L){
 			trgkey[i / 2] = tmp & 0xFF;
 		}
 	}
-	
+
     uint64_t foundkey = 0;
 	int retval = mfnestedhard(blockNo, keyType, key, trgBlockNo, trgKeyType, haveTarget ? trgkey : NULL, nonce_file_read,  nonce_file_write,  slow,  tests, &foundkey, filename);
 	DropField();
@@ -642,7 +642,7 @@ static int l_hardnested(lua_State *L){
     //Push the key onto the stack
     uint8_t dest_key[6];
     num_to_bytes(foundkey, sizeof(dest_key), dest_key);
-	
+
     //Push the retval on the stack
     lua_pushinteger(L,retval);
     lua_pushlstring(L, (const char *) dest_key, sizeof(dest_key));
@@ -680,10 +680,10 @@ static int l_keygen_algoD(lua_State *L) {
 
 	uint32_t pwd = ul_ev1_pwdgenD(uid);
 	uint16_t pack = ul_ev1_packgenD(uid);
-	
+
 	lua_pushunsigned(L, pwd);
 	lua_pushunsigned(L, pack);
-	return 2;	
+	return 2;
 }
 
 /**
@@ -724,7 +724,7 @@ int set_pm3_libraries(lua_State *L) {
 		{"iso14443b_crc",				l_iso14443b_crc},
 		{"aes128_decrypt",              l_aes128decrypt_cbc},
 		{"aes128_decrypt_ecb",          l_aes128decrypt_ecb},
-		{"aes128_encrypt",              l_aes128encrypt_cbc},		
+		{"aes128_encrypt",              l_aes128encrypt_cbc},
 		{"aes128_encrypt_ecb",          l_aes128encrypt_ecb},
 		{"crc8legic",					l_crc8legic},
 		{"crc16",                       l_crc16},
@@ -758,7 +758,7 @@ int set_pm3_libraries(lua_State *L) {
     //-- remove the global environment table from the stack
     lua_pop(L, 1);
 
-	
+
 	//--add to the LUA_PATH (package.path in lua)
     // so we can load scripts from the ./scripts/ - directory
 	char scripts_path[strlen(get_my_executable_directory()) + strlen(LUA_SCRIPTS_DIRECTORY) + strlen(LUA_LIBRARIES_WILDCARD) + 1];
@@ -766,7 +766,7 @@ int set_pm3_libraries(lua_State *L) {
 	strcat(scripts_path, LUA_SCRIPTS_DIRECTORY);
 	strcat(scripts_path, LUA_LIBRARIES_WILDCARD);
 	setLuaPath(L, scripts_path);
-	
+
     //-- Last but not least, add to the LUA_PATH (package.path in lua)
     // so we can load libraries from the ./lualib/ - directory
 	char libraries_path[strlen(get_my_executable_directory()) + strlen(LUA_LIBRARIES_DIRECTORY) + strlen(LUA_LIBRARIES_WILDCARD) + 1];
diff --git a/client/ui.c b/client/ui.c
index 71603fed6..96049f6cf 100644
--- a/client/ui.c
+++ b/client/ui.c
@@ -45,18 +45,18 @@ void PrintAndLogOptions(char *str[][2], size_t size, size_t space) {
 }
 void PrintAndLogEx(logLevel_t level, char *fmt, ...) {
 
-	// skip debug messages if client debugging is turned off i.e. 'DATA SETDEBUG 0' 
+	// skip debug messages if client debugging is turned off i.e. 'DATA SETDEBUG 0'
 	if (g_debugMode	== 0 && level == DEBUG)
 		return;
 
-	char prefix[20] = {0};	
+	char prefix[20] = {0};
 	char buffer[MAX_PRINT_BUFFER] = {0};
 	char buffer2[MAX_PRINT_BUFFER+20] = {0};
 	char *token = NULL;
 	int size = 0;
 						//   {NORMAL, SUCCESS, INFO, FAILED, WARNING, ERR, DEBUG}
 	static char *prefixes[7] = { "", "[+] ", "[=] ", "[-] ", "[!] ", "[!!] ", "[#] "};
-	
+
 	switch( level ) {
 		case ERR:
 			strncpy(prefix,_RED_([!!] ), sizeof(prefix)-1);
@@ -65,19 +65,19 @@ void PrintAndLogEx(logLevel_t level, char *fmt, ...) {
 			strncpy(prefix,_RED_([-] ), sizeof(prefix)-1);
 			break;
 		case DEBUG:
-			strncpy(prefix,_BLUE_([#] ), sizeof(prefix)-1);			
+			strncpy(prefix,_BLUE_([#] ), sizeof(prefix)-1);
 			break;
-		case SUCCESS: 
+		case SUCCESS:
 			strncpy(prefix,_GREEN_([+] ), sizeof(prefix)-1);
 			break;
 		case WARNING:
 			strncpy(prefix,_CYAN_([!] ), sizeof(prefix)-1);
-			break;		
+			break;
 		default:
 			strncpy(prefix, prefixes[level], sizeof(prefix)-1);
 			break;
 	}
-	
+
 	va_list args;
 	va_start(args, fmt);
 	vsnprintf(buffer, sizeof(buffer), fmt, args);
@@ -88,26 +88,26 @@ void PrintAndLogEx(logLevel_t level, char *fmt, ...) {
 		PrintAndLog("%s", buffer);
 		return;
 	}
-	
+
 	if (strchr(buffer, '\n')) {
 
 		const char delim[2] = "\n";
-			
+
 		// line starts with newline
-		if (buffer[0] == '\n') 
+		if (buffer[0] == '\n')
 			PrintAndLog("");
-		
+
 		token = strtok(buffer, delim);
-		
+
 		while (token != NULL) {
-			
+
 			size = strlen(buffer2);
-		
+
 			if (strlen(token))
 				snprintf(buffer2+size, sizeof(buffer2)-size, "%s%s\n", prefix, token);
 			else
 				snprintf(buffer2+size, sizeof(buffer2)-size, "\n");
-			
+
 			token = strtok(NULL, delim);
 		}
 		PrintAndLog("%s", buffer2);
@@ -123,10 +123,10 @@ void PrintAndLog(char *fmt, ...) {
 	va_list argptr, argptr2;
 	static FILE *logfile = NULL;
 	static int logging = 1;
-		
+
 	// lock this section to avoid interlacing prints from different threads
 	pthread_mutex_lock(&print_lock);
-  
+
 	if (logging && !logfile) {
 		logfile = fopen(logfilename, "a");
 		if (!logfile) {
@@ -135,10 +135,10 @@ void PrintAndLog(char *fmt, ...) {
 		}
 	}
 
- 
+
 // If there is an incoming message from the hardware (eg: lf hid read) in
 // the background (while the prompt is displayed and accepting user input),
-// stash the prompt and bring it back later.	
+// stash the prompt and bring it back later.
 #ifdef RL_STATE_READCMD
 	// We are using GNU readline. libedit (OSX) doesn't support this flag.
 	int need_hack = (rl_readline_state & RL_STATE_READCMD) > 0;
@@ -151,7 +151,7 @@ void PrintAndLog(char *fmt, ...) {
 		rl_redisplay();
 	}
 #endif
-	
+
 	va_start(argptr, fmt);
 	va_copy(argptr2, argptr);
 	vprintf(fmt, argptr);
@@ -169,7 +169,7 @@ void PrintAndLog(char *fmt, ...) {
 		free(saved_line);
 	}
 #endif
-	
+
 	if (logging && logfile) {
 		vfprintf(logfile, fmt, argptr2);
 		fprintf(logfile, "\n");
@@ -181,13 +181,13 @@ void PrintAndLog(char *fmt, ...) {
 		fflush(stdout);
 
 	//release lock
-	pthread_mutex_unlock(&print_lock);  
+	pthread_mutex_unlock(&print_lock);
 }
 
 void SetLogFilename(char *fn) {
 	logfilename = fn;
 }
- 
+
 void SetFlushAfterWrite(bool value) {
 	flushAfterWrite = value;
 }
@@ -195,29 +195,29 @@ void SetFlushAfterWrite(bool value) {
  void iceIIR_Butterworth(int *data, const size_t len){
 
 	int i,j;
-	
-	int * output =  (int* ) calloc(sizeof(int) * len, sizeof(uint8_t));	
+
+	int * output =  (int* ) calloc(sizeof(int) * len, sizeof(uint8_t));
 	if ( !output ) return;
-	
+
 	// clear mem
 	memset(output, 0x00, len);
-	
+
 	size_t adjustedLen = len;
 	float fc = 0.1125f;          // center frequency
-		
+
     // create very simple low-pass filter to remove images (2nd-order Butterworth)
     float complex iir_buf[3] = {0,0,0};
     float b[3] = {0.003621681514929,  0.007243363029857, 0.003621681514929};
     float a[3] = {1.000000000000000, -1.822694925196308, 0.837181651256023};
-    
+
     float sample           = 0;      // input sample read from array
     float complex x_prime  = 1.0f;   // save sample for estimating frequency
     float complex x;
-		
+
 	for (i = 0; i < adjustedLen; ++i) {
 
 		sample = data[i];
-		
+
         // remove DC offset and mix to complex baseband
         x = (sample - 127.5f) * cexpf( _Complex_I * 2 * M_PI * fc * i );
 
@@ -228,27 +228,27 @@ void SetFlushAfterWrite(bool value) {
         x          = b[0]*iir_buf[0] +
                      b[1]*iir_buf[1] +
                      b[2]*iir_buf[2];
-					 
+
         // compute instantaneous frequency by looking at phase difference
         // between adjacent samples
         float freq = cargf(x * conjf(x_prime));
         x_prime = x;    // retain this sample for next iteration
 
 		output[i] =(freq > 0) ? 127 : -127;
-    } 
+    }
 
 	// show data
 	//memcpy(data, output, adjustedLen);
 	for (j=0; j<adjustedLen; ++j)
 		data[j] = output[j];
-	
+
 	free(output);
 }
 
 void iceSimple_Filter(int *data, const size_t len, uint8_t k){
 // ref: http://www.edn.com/design/systems-design/4320010/A-simple-software-lowpass-filter-suits-embedded-system-applications
 // parameter K
-#define FILTER_SHIFT 4 
+#define FILTER_SHIFT 4
 
 	int32_t filter_reg = 0;
 	int16_t input, output;
diff --git a/client/ui.h b/client/ui.h
index fc3439033..e04612f2e 100644
--- a/client/ui.h
+++ b/client/ui.h
@@ -19,7 +19,7 @@
 #include <stdint.h>
 #include <readline/readline.h>
 #include <pthread.h>
-#include <math.h>	
+#include <math.h>
 #include <complex.h>
 #include "util.h"
 
diff --git a/client/util.c b/client/util.c
index cea42f338..99c44ff13 100644
--- a/client/util.c
+++ b/client/util.c
@@ -21,7 +21,7 @@ uint8_t g_debugMode = 0;
 
 #ifndef _WIN32
 #include <termios.h>
-#include <sys/ioctl.h> 
+#include <sys/ioctl.h>
 #include <unistd.h>
 #include <stdarg.h>
 
@@ -64,10 +64,10 @@ void AddLogLine(char *fn, char *data, char *c) {
     int len = 0;
 
     len = strlen(fn);
-    if (len > FILE_PATH_SIZE) 
+    if (len > FILE_PATH_SIZE)
 		len = FILE_PATH_SIZE;
     memcpy(filename, fn, len);
-   
+
 	f = fopen(filename, "a");
 	if (!f) {
 		printf("Could not append log file %s", filename);
@@ -111,14 +111,14 @@ void FillFileNameByUID(char *filenamePrefix, uint8_t *uid, const char *ext, int
 		printf("[!] error parameter is NULL\n");
 		return;
 	}
-	
+
 	int len = 0;
 	len = strlen(filenamePrefix);
 	//memset(fn, 0x00, FILE_PATH_SIZE);
-	
+
 	for (int j = 0; j < uidlen; j++)
-		sprintf(filenamePrefix + len + j * 2, "%02X", uid[j]); 
-	strcat(filenamePrefix, ext); 
+		sprintf(filenamePrefix + len + j * 2, "%02X", uid[j]);
+	strcat(filenamePrefix, ext);
 }
 
 // fill buffer from structure [{uint8_t data, size_t length},...]
@@ -126,25 +126,25 @@ int FillBuffer(uint8_t *data, size_t maxDataLength, size_t *dataLength, ...) {
 	*dataLength = 0;
 	va_list valist;
 	va_start(valist, dataLength);
-	
+
 	uint8_t *vdata = NULL;
 	size_t vlength = 0;
 	do{
 		vdata = va_arg(valist, uint8_t *);
 		if (!vdata)
 			break;
-		
+
 		vlength = va_arg(valist, size_t);
 		if (*dataLength + vlength >  maxDataLength) {
 			va_end(valist);
 			return 1;
 		}
-		
+
 		memcpy(&data[*dataLength], vdata, vlength);
 		*dataLength += vlength;
-		
+
 	} while (vdata);
-	
+
 	va_end(valist);
 
 	return 0;
@@ -157,13 +157,13 @@ bool CheckStringIsHEXValue(const char *value) {
 
 	if (strlen(value) % 2)
 		return false;
-	
+
 	return true;
 }
 
-void hex_to_buffer(const uint8_t *buf, const uint8_t *hex_data, const size_t hex_len, const size_t hex_max_len, 
+void hex_to_buffer(const uint8_t *buf, const uint8_t *hex_data, const size_t hex_len, const size_t hex_max_len,
 	const size_t min_str_len, const size_t spaces_between, bool uppercase) {
-		
+
 	char *tmp = (char *)buf;
 	size_t i;
 	memset(tmp, 0x00, hex_max_len);
@@ -171,17 +171,17 @@ void hex_to_buffer(const uint8_t *buf, const uint8_t *hex_data, const size_t hex
 	int maxLen = ( hex_len > hex_max_len) ? hex_max_len : hex_len;
 
 	for (i = 0; i < maxLen; ++i, tmp += 2 + spaces_between) {
-		sprintf(tmp, (uppercase) ? "%02X" : "%02x", (unsigned int) hex_data[i]); 
-		
+		sprintf(tmp, (uppercase) ? "%02X" : "%02x", (unsigned int) hex_data[i]);
+
 		for (int j = 0; j < spaces_between; j++)
 			sprintf(tmp + 2 + j, " ");
 	}
-	
+
 	i *= (2 + spaces_between);
 	int minStrLen = min_str_len > i ? min_str_len : 0;
 	if (minStrLen > hex_max_len)
 		minStrLen = hex_max_len;
-	for(; i < minStrLen; i++, tmp += 1) 
+	for(; i < minStrLen; i++, tmp += 1)
 		sprintf(tmp, " ");
 
 	return;
@@ -201,7 +201,7 @@ void print_hex_break(const uint8_t *data, const size_t len, uint8_t breaks) {
 	for (int i = 0; i < len; ++i) {
 
 		printf("%02X ", data[i]);
-		
+
 		// check if a line break is needed
 		if ( breaks > 0 && !((i+1) % breaks) && (i+1 < len) ) {
 			++rownum;
@@ -233,17 +233,17 @@ char *sprint_hex_inrow_spaces(const uint8_t *data, const size_t len, size_t spac
 }
 
 char *sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t breaks) {
-	
+
 	// make sure we don't go beyond our char array memory
 	size_t in_index = 0, out_index = 0;
-	
+
 	int rowlen = (len > MAX_BIN_BREAK_LENGTH ) ? MAX_BIN_BREAK_LENGTH : len;
-		
-	if ( breaks > 0 && len % breaks != 0) 
+
+	if ( breaks > 0 && len % breaks != 0)
 		rowlen = ( len+(len/breaks) > MAX_BIN_BREAK_LENGTH ) ? MAX_BIN_BREAK_LENGTH : len+(len/breaks);
-	
+
 	//printf("(sprint_bin_break) rowlen %d\n", rowlen);
-	
+
 	static char buf[MAX_BIN_BREAK_LENGTH]; // 3072 + end of line characters if broken at 8 bits
 	//clear memory
 	memset(buf, 0x00, sizeof(buf));
@@ -268,21 +268,21 @@ char *sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t brea
 void sprint_bin_break_ex(uint8_t *src, size_t srclen, char *dest , uint8_t breaks) {
 	if ( src == NULL ) return;
 	if ( srclen < 1 ) return;
-	
+
 	// make sure we don't go beyond our char array memory
 	size_t in_index = 0, out_index = 0;
-	int rowlen;	
+	int rowlen;
 	if (breaks==0)
 		rowlen = ( len > MAX_BIN_BREAK_LENGTH ) ? MAX_BIN_BREAK_LENGTH : len;
 	else
 		rowlen = ( len+(len/breaks) > MAX_BIN_BREAK_LENGTH ) ? MAX_BIN_BREAK_LENGTH : len+(len/breaks);
 
 	printf("(sprint_bin_break) rowlen %d\n", rowlen);
-	
+
 	// 3072 + end of line characters if broken at 8 bits
-	dest = (char *)calloc(MAX_BIN_BREAK_LENGTH, sizeof(uint8_t)); 
+	dest = (char *)calloc(MAX_BIN_BREAK_LENGTH, sizeof(uint8_t));
 	if (dest == NULL) return;
-	
+
 	//clear memory
 	memset(dest, 0x00, sizeof(dest));
 
@@ -314,7 +314,7 @@ char *sprint_hex_ascii(const uint8_t *data, const size_t len) {
 	size_t max_len = (len > 1010) ? 1010 : len;
 
 	snprintf(tmp, UTIL_BUFFER_SIZE_SPRINT, "%s| ", sprint_hex(data, max_len) );
-	
+
 	size_t i = 0;
 	size_t pos = (max_len * 3) + 2;
 	while (i < max_len){
@@ -338,11 +338,11 @@ char *sprint_ascii_ex(const uint8_t *data, const size_t len, const size_t min_st
 		tmp[i] = ((c < 32) || (c == 127)) ? '.' : c;
 		++i;
 	}
-	
+
 	int m = min_str_len > i ? min_str_len : 0;
-	for(; i < m; ++i) 
+	for(; i < m; ++i)
 		tmp[i] = ' ';
-	
+
 	return buf;
 }
 char *sprint_ascii(const uint8_t *data, const size_t len) {
@@ -409,7 +409,7 @@ uint8_t *SwapEndian64(const uint8_t *src, const size_t len, const uint8_t blockS
 	return buf;
 }
 
-// takes a uint8_t src array, for len items and reverses the byte order in blocksizes (8,16,32,64), 
+// takes a uint8_t src array, for len items and reverses the byte order in blocksizes (8,16,32,64),
 // returns: the dest array contains the reordered src array.
 void SwapEndian64ex(const uint8_t *src, const size_t len, const uint8_t blockSize, uint8_t *dest){
 	for (uint8_t block=0; block < (uint8_t)(len/blockSize); block++){
@@ -432,10 +432,10 @@ int param_getptr(const char *line, int *bg, int *en, int paramnum)
 {
 	int i;
 	int len = strlen(line);
-	
+
 	*bg = 0;
 	*en = 0;
-	
+
   // skip spaces
 	while (line[*bg] ==' ' || line[*bg]=='\t') (*bg)++;
 	if (*bg >= len) {
@@ -445,13 +445,13 @@ int param_getptr(const char *line, int *bg, int *en, int paramnum)
 	for (i = 0; i < paramnum; i++) {
 		while (line[*bg]!=' ' && line[*bg]!='\t' && line[*bg] != '\0') (*bg)++;
 		while (line[*bg]==' ' || line[*bg]=='\t') (*bg)++;
-		
+
 		if (line[*bg] == '\0') return 1;
 	}
-	
+
 	*en = *bg;
 	while (line[*en] != ' ' && line[*en] != '\t' && line[*en] != '\0') (*en)++;
-	
+
 	(*en)--;
 
 	return 0;
@@ -460,7 +460,7 @@ int param_getptr(const char *line, int *bg, int *en, int paramnum)
 int param_getlength(const char *line, int paramnum)
 {
 	int bg, en;
-	
+
 	if (param_getptr(line, &bg, &en, paramnum)) return 0;
 
 	return en - bg + 1;
@@ -472,12 +472,12 @@ char param_getchar(const char *line, int paramnum) {
 
 char param_getchar_indx(const char *line, int indx, int paramnum) {
 	int bg, en;
-	
+
 	if (param_getptr(line, &bg, &en, paramnum)) return 0x00;
 
 	if (bg + indx > en)
 		return '\0';
-	
+
 	return line[bg + indx];
 }
 
@@ -518,7 +518,7 @@ uint8_t param_isdec(const char *line, int paramnum)
 uint8_t param_get8ex(const char *line, int paramnum, int deflt, int base)
 {
 	int bg, en;
-	if (!param_getptr(line, &bg, &en, paramnum)) 
+	if (!param_getptr(line, &bg, &en, paramnum))
 		return strtoul(&line[bg], NULL, base) & 0xff;
 	else
 		return deflt;
@@ -527,7 +527,7 @@ uint8_t param_get8ex(const char *line, int paramnum, int deflt, int base)
 uint32_t param_get32ex(const char *line, int paramnum, int deflt, int base)
 {
 	int bg, en;
-	if (!param_getptr(line, &bg, &en, paramnum)) 
+	if (!param_getptr(line, &bg, &en, paramnum))
 		return strtoul(&line[bg], NULL, base);
 	else
 		return deflt;
@@ -536,7 +536,7 @@ uint32_t param_get32ex(const char *line, int paramnum, int deflt, int base)
 uint64_t param_get64ex(const char *line, int paramnum, int deflt, int base)
 {
 	int bg, en;
-	if (!param_getptr(line, &bg, &en, paramnum)) 
+	if (!param_getptr(line, &bg, &en, paramnum))
 		return strtoull(&line[bg], NULL, base);
 	else
 		return deflt;
@@ -547,17 +547,17 @@ int param_gethex(const char *line, int paramnum, uint8_t * data, int hexcnt) {
 	uint32_t temp;
 
 	if (hexcnt & 1) return 1;
-	
+
 	if (param_getptr(line, &bg, &en, paramnum)) return 1;
 
 	if (en - bg + 1 != hexcnt) return 1;
 
 	for(i = 0; i < hexcnt; i += 2) {
 		if (!(isxdigit(line[bg + i]) && isxdigit(line[bg + i + 1])) ) return 1;
-		
+
 		sscanf((char[]){line[bg + i], line[bg + i + 1], 0}, "%X", &temp);
 		data[i / 2] = temp & 0xff;
-	}	
+	}
 
 	return 0;
 }
@@ -573,10 +573,10 @@ int param_gethex_ex(const char *line, int paramnum, uint8_t * data, int *hexcnt)
 
 	for(i = 0; i < *hexcnt; i += 2) {
 		if (!(isxdigit(line[bg + i]) && isxdigit(line[bg + i + 1])) ) return 1;
-		
+
 		sscanf((char[]){line[bg + i], line[bg + i + 1], 0}, "%X", &temp);
 		data[i / 2] = temp & 0xff;
-	}	
+	}
 
 	return 0;
 }
@@ -589,21 +589,21 @@ int param_gethex_to_eol(const char *line, int paramnum, uint8_t * data, int maxd
 	if (param_getptr(line, &bg, &en, paramnum)) return 1;
 
 	*datalen = 0;
-	
+
 	int indx = bg;
 	while (line[indx]) {
 		if (line[indx] == '\t' || line[indx] == ' ') {
 			indx++;
 			continue;
 		}
-		
+
 		if (isxdigit(line[indx])) {
 			buf[strlen(buf) + 1] = 0x00;
 			buf[strlen(buf)] = line[indx];
 		} else {
 			// if we have symbols other than spaces and hex
 			return 1;
-		}				
+		}
 
 		if (*datalen >= maxdatalen) {
 			// if we dont have space in buffer and have symbols to translate
@@ -616,14 +616,14 @@ int param_gethex_to_eol(const char *line, int paramnum, uint8_t * data, int maxd
 			*buf = 0;
 			(*datalen)++;
 		}
-		
+
 		indx++;
 	}
 
-	if (strlen(buf) > 0) 
+	if (strlen(buf) > 0)
 		//error when not completed hex bytes
 		return 3;
-		
+
 	return 0;
 }
 
@@ -631,7 +631,7 @@ int param_getstr(const char *line, int paramnum, char * str, size_t buffersize)
 {
 	int bg, en;
 
-	if (param_getptr(line, &bg, &en, paramnum)) {	
+	if (param_getptr(line, &bg, &en, paramnum)) {
 		return 0;
 	}
 
@@ -640,10 +640,10 @@ int param_getstr(const char *line, int paramnum, char * str, size_t buffersize)
 		printf("out of bounds error: want %d bytes have %zu bytes\n", en - bg + 1 + 1, buffersize);
 		return 0;
 	}
-	
+
 	memcpy(str, line + bg, en - bg + 1);
 	str[en - bg + 1] = 0;
-	
+
 	return en - bg + 1;
 }
 
@@ -680,7 +680,7 @@ int hextobinarray(char *target, char *source)
         for(i= 0 ; i < 4 ; ++i, ++count)
             *(target++)= (x >> (3 - i)) & 1;
     }
-    
+
     return count;
 }
 
@@ -755,11 +755,11 @@ void xor(unsigned char * dst, unsigned char * src, size_t len) {
 int32_t le24toh (uint8_t data[3]) {
     return (data[2] << 16) | (data[1] << 8) | data[0];
 }
-// Pack a bitarray into a uint32_t.  
+// Pack a bitarray into a uint32_t.
 uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits) {
 
 	if (len > 32) return 0;
-	
+
 	int i = start;
 	int j = len-1;
 	uint32_t tmp = 0;
@@ -772,7 +772,7 @@ uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits) {
 
 // RotateLeft - Ultralight, Desfire, works on byte level
 // 00-01-02  >> 01-02-00
-void rol(uint8_t *data, const size_t len){	
+void rol(uint8_t *data, const size_t len){
     uint8_t first = data[0];
     for (size_t i = 0; i < len-1; i++) {
         data[i] = data[i+1];
@@ -793,7 +793,7 @@ uint8_t reflect8(uint8_t b) {
 }
 uint16_t reflect16(uint16_t b) {
     uint16_t v = 0;
-    v |= (b & 0x8000) >> 15; 
+    v |= (b & 0x8000) >> 15;
     v |= (b & 0x4000) >> 13;
     v |= (b & 0x2000) >> 11;
     v |= (b & 0x1000) >> 9;
@@ -814,7 +814,7 @@ uint16_t reflect16(uint16_t b) {
 }
 /*
  ref  http://www.csm.ornl.gov/~dunigan/crc.html
- Returns the value v with the bottom b [0,32] bits reflected. 
+ Returns the value v with the bottom b [0,32] bits reflected.
  Example: reflect(0x3e23L,3) == 0x3e26
 */
 uint32_t reflect(uint32_t v, int b) {
@@ -857,7 +857,7 @@ extern void str_lower(char *s ){
 	for(int i=0; i < strlen(s); i++)
 		s[i] = tolower( s[i] );
 }
-extern bool str_startswith(const char *s,  const char *pre) {	
+extern bool str_startswith(const char *s,  const char *pre) {
     return strncmp(pre, s, strlen(pre)) == 0;
 }
 
@@ -888,6 +888,6 @@ extern char *strmcopy(char *buf) {
 	if (str != NULL) {
 		memset(str, 0, strlen(buf) + 1);
 		strcpy(str, buf);
-	}	
+	}
 	return str;
 }
\ No newline at end of file
diff --git a/client/util.h b/client/util.h
index e10f06497..ec99a4903 100644
--- a/client/util.h
+++ b/client/util.h
@@ -199,7 +199,7 @@ extern void FillFileNameByUID(char *filenamePrefix, uint8_t * uid, const char *e
 extern int FillBuffer(uint8_t *data, size_t maxDataLength, size_t *dataLength, ...);
 
 extern bool CheckStringIsHEXValue(const char *value);
-extern void hex_to_buffer(const uint8_t *buf, const uint8_t *hex_data, const size_t hex_len, 
+extern void hex_to_buffer(const uint8_t *buf, const uint8_t *hex_data, const size_t hex_len,
 						  const size_t hex_max_len, const size_t min_str_len, const size_t spaces_between,
 						  bool uppercase);
 
@@ -263,4 +263,4 @@ extern bool str_startswith(const char *s,  const char *pre);  // check for prefi
 extern void strcleanrn(char *buf, size_t len);
 extern void strcreplace(char *buf, size_t len, char from, char to);
 extern char *strmcopy(char *buf);
-#endif 
\ No newline at end of file
+#endif
\ No newline at end of file
diff --git a/client/util_posix.c b/client/util_posix.c
index a45dc48e9..5ecc50d13 100644
--- a/client/util_posix.c
+++ b/client/util_posix.c
@@ -40,7 +40,7 @@ void msleep(uint32_t n) {
 #ifndef CLOCK_MONOTONIC
 	#define CLOCK_MONOTONIC (1)
 #endif
-#ifndef CLOCK_REALTIME	
+#ifndef CLOCK_REALTIME
 	#define CLOCK_REALTIME (2)
 #endif
 
@@ -72,7 +72,7 @@ void msleep(uint32_t n) {
 			uint64_t now = mach_absolute_time();
 
 			if (clock_start_time == 0) {
-				
+
 				mach_timebase_info(&timebase_info);
 				clock_start_time = now;
 			}
diff --git a/client/whereami.c b/client/whereami.c
index acf3ff2e8..127e49504 100644
--- a/client/whereami.c
+++ b/client/whereami.c
@@ -140,7 +140,7 @@ int WAI_PREFIX(getExecutablePath)(char* out, int capacity, int* dirname_length)
   return WAI_PREFIX(getModulePath_)(NULL, out, capacity, dirname_length);
 }
 
-// GetModuleHandleEx() is not available on old mingw environments. We don't need getModulePath() yet. 
+// GetModuleHandleEx() is not available on old mingw environments. We don't need getModulePath() yet.
 // Sacrifice it for the time being to improve backwards compatibility
 /* WAI_NOINLINE
 WAI_FUNCSPEC
diff --git a/common/cmd.c b/common/cmd.c
index bed968c2c..ebeaf4f7c 100644
--- a/common/cmd.c
+++ b/common/cmd.c
@@ -40,7 +40,7 @@ uint8_t cmd_send(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void
 	// Compose the outgoing command frame
 	txcmd.cmd = cmd;
 	txcmd.arg[0] = arg0;
-	txcmd.arg[1] = arg1;	
+	txcmd.arg[1] = arg1;
 	txcmd.arg[2] = arg2;
 
 	// Add the (optional) content to the frame, with a maximum size of USB_CMD_DATA_SIZE
@@ -50,7 +50,7 @@ uint8_t cmd_send(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void
 			txcmd.d.asBytes[i] = ((uint8_t*)data)[i];
 		}
 	}
-	
+
 	uint32_t sendlen = 0;
 	// Send frame and make sure all bytes are transmitted
 	sendlen = usb_write( (uint8_t*)&txcmd, sizeof(UsbCommand) );
@@ -59,6 +59,6 @@ uint8_t cmd_send(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void
 //	usart_init();
 //	usart_writebuffer( (uint8_t*)&txcmd, sizeof(UsbCommand) );
 #endif
-	
+
 	return sendlen;
 }
\ No newline at end of file
diff --git a/common/crapto1/crapto1.h b/common/crapto1/crapto1.h
index c941879ce..5abdaeb09 100644
--- a/common/crapto1/crapto1.h
+++ b/common/crapto1/crapto1.h
@@ -61,7 +61,7 @@ extern bool validate_prng_nonce(uint32_t nonce);
 				break;\
 			else if(__i)\
 				__M = prng_successor(__M, (__i == 7) ? 48 : 8);\
-			else 
+			else
 
 #define LF_POLY_ODD (0x29CE5C)
 #define LF_POLY_EVEN (0x870804)
diff --git a/common/crc.c b/common/crc.c
index 77bea0b47..4097fdd48 100644
--- a/common/crc.c
+++ b/common/crc.c
@@ -5,7 +5,7 @@
 //-----------------------------------------------------------------------------
 // Generic CRC calculation code.
 //-----------------------------------------------------------------------------
-// the Check value below in the comments is CRC of the string '123456789' 
+// the Check value below in the comments is CRC of the string '123456789'
 //
 #include "crc.h"
 
@@ -29,21 +29,21 @@ void crc_init(crc_t *crc, int order, uint32_t polynom, uint32_t initial_value, u
 }
 
 void crc_clear(crc_t *crc) {
-	
+
 	crc->state = crc->initial_value & crc->mask;
-	if (crc->refin) 
+	if (crc->refin)
 		crc->state = reflect(crc->state, crc->order);
 }
 
 void crc_update2(crc_t *crc, uint32_t data, int data_width){
-	
-	if (crc->refin) 
+
+	if (crc->refin)
 		data = reflect(data, data_width);
-	
+
 	// Bring the next byte into the remainder.
 	crc->state ^= data << (crc->order - data_width);
-	
-	for( uint8_t bit = data_width; bit > 0; --bit) {		
+
+	for( uint8_t bit = data_width; bit > 0; --bit) {
 
 		if (crc->state & crc->topbit)
 			crc->state = (crc->state << 1) ^ crc->polynom;
@@ -54,9 +54,9 @@ void crc_update2(crc_t *crc, uint32_t data, int data_width){
 
 void crc_update(crc_t *crc, uint32_t data, int data_width)
 {
-	if (crc->refin) 
+	if (crc->refin)
 		data = reflect(data, data_width);
-	
+
 	int i;
 	for(i=0; i<data_width; i++) {
 		int oldstate = crc->state;
@@ -70,7 +70,7 @@ void crc_update(crc_t *crc, uint32_t data, int data_width)
 
 uint32_t crc_finish(crc_t *crc) {
 	uint32_t val = crc->state;
-	if (crc->refout) 
+	if (crc->refout)
 		val = reflect(val, crc->order);
 	return ( val ^ crc->final_xor ) & crc->mask;
 }
@@ -94,7 +94,7 @@ static void print_crc(crc_t *crc) {
 // width=8  poly=0x31  init=0x00  refin=true  refout=true  xorout=0x00  check=0xA1  name="CRC-8/MAXIM"
 uint32_t CRC8Maxim(uint8_t *buff, size_t size) {
 	crc_t crc;
-	crc_init_ref(&crc, 8, 0x31, 0, 0, true, true);	
+	crc_init_ref(&crc, 8, 0x31, 0, 0, true, true);
 	for ( int i=0; i < size; ++i)
 		crc_update2(&crc, buff[i], 8);
 	return crc_finish(&crc);
@@ -114,7 +114,7 @@ uint32_t CRC4Legic(uint8_t *cmd, size_t size) {
 	crc_update2(&crc, 1, 1); /* CMD_READ */
 	crc_update2(&crc, cmd[0], 8);
 	crc_update2(&crc, cmd[1], 8);
-	return reflect(crc_finish(&crc), 4);	
+	return reflect(crc_finish(&crc), 4);
 }
 // width=8  poly=0x63, reversed poly=0x8D  init=0x55  refin=true  refout=true  xorout=0x0000  check=0xC6  name="CRC-8/LEGIC"
 // the CRC needs to be reversed before returned.
diff --git a/common/crc.h b/common/crc.h
index 40bdc7daf..015fbf60c 100644
--- a/common/crc.h
+++ b/common/crc.h
@@ -26,12 +26,12 @@ typedef struct crc {
 
 /* Initialize a crc structure. order is the order of the polynom, e.g. 32 for a CRC-32
  * polynom is the CRC polynom. initial_value is the initial value of a clean state.
- * final_xor is XORed onto the state before returning it from crc_result(). 
+ * final_xor is XORed onto the state before returning it from crc_result().
  * refin is the setting for reversing (bitwise) the bytes during crc
  * refot is the setting for reversing (bitwise) the crc byte before returning it.
  */
 extern void crc_init_ref(crc_t *crc, int order, uint32_t polynom, uint32_t initial_value, uint32_t final_xor, bool refin, bool refout);
-	
+
 /* Initialize a crc structure. order is the order of the polynom, e.g. 32 for a CRC-32
  * polynom is the CRC polynom. initial_value is the initial value of a clean state.
  * final_xor is XORed onto the state before returning it from crc_result(). */
diff --git a/common/crc16.c b/common/crc16.c
index 8110d8045..b6145013b 100644
--- a/common/crc16.c
+++ b/common/crc16.c
@@ -12,17 +12,17 @@ static bool crc_table_init = false;
 static CrcType_t crc_type = CRC_NONE;
 
 void init_table(CrcType_t ct) {
-	
+
 	// same crc algo, and initialised already
-	if ( ct == crc_type && crc_table_init) 
+	if ( ct == crc_type && crc_table_init)
 		return;
-	
+
 	// not the same crc algo. reset table.
 	if ( ct != crc_type)
 		reset_table();
-	
+
 	crc_type = ct;
-	
+
 	switch (ct) {
 		case CRC_14443_A:
 		case CRC_14443_B:
@@ -59,9 +59,9 @@ void generate_table( uint16_t polynomial, bool refin) {
 
             c = c << 1;
         }
-		if (refin) 
+		if (refin)
 			crc = reflect16(crc);
-		
+
 		crc_table[i] = crc;
 	}
     crc_table_init = true;
@@ -80,20 +80,20 @@ uint16_t crc16_fast(uint8_t const *d, size_t n, uint16_t initval, bool refin, bo
 	// only usable with polynom orders of 8, 16, 24 or 32.
 	if (n == 0)
         return (~initval);
-	
+
 	uint16_t crc = initval;
 
-	if (refin) 
+	if (refin)
 		crc = reflect16(crc);
 
-	if (!refin) 
+	if (!refin)
 		while (n--) crc = (crc << 8) ^ crc_table[ ((crc >> 8) ^ *d++) & 0xFF ];
-	else 
+	else
 		while (n--) crc = (crc >> 8) ^ crc_table[ (crc & 0xFF) ^ *d++];
 
-	if (refout^refin) 
+	if (refout^refin)
 		crc = reflect16(crc);
-	
+
 	return crc;
 }
 
@@ -102,14 +102,14 @@ uint16_t update_crc16_ex( uint16_t crc, uint8_t c, uint16_t polynomial ) {
 	uint16_t i, v, tmp = 0;
 
 	v = (crc ^ c) & 0xff;
-	
+
 	for (i = 0; i < 8; i++) {
-		
+
 		if ( (tmp ^ v) & 1 )
 			tmp = ( tmp >> 1 ) ^ polynomial;
 		else
 			tmp >>= 1;
-		
+
 		v >>= 1;
 	}
 	return ((crc >> 8) ^ tmp) & 0xffff;
@@ -130,19 +130,19 @@ uint16_t crc16(uint8_t const *d, size_t length, uint16_t remainder, uint16_t pol
 
 		// xor in at msb
         remainder ^= (c << 8);
-		
-		// 8 iteration loop		
+
+		// 8 iteration loop
         for (uint8_t j = 8; j; --j) {
             if (remainder & 0x8000) {
                 remainder = (remainder << 1) ^ polynomial;
             } else {
                 remainder <<=  1;
             }
-        }		
+        }
     }
-	if (refout) 
+	if (refout)
 		remainder = reflect16(remainder);
-	
+
     return remainder;
 }
 
@@ -150,9 +150,9 @@ void compute_crc(CrcType_t ct, const uint8_t *d, size_t n, uint8_t *first, uint8
 
 	// can't calc a crc on less than 1 byte
 	if ( n == 0 ) return;
-	
+
 	init_table(ct);
-	
+
 	uint16_t crc = 0;
 	switch (ct) {
 		case CRC_14443_A: crc = crc16_a(d, n); break;
@@ -172,7 +172,7 @@ uint16_t crc(CrcType_t ct, const uint8_t *d, size_t n) {
 
 	// can't calc a crc on less than 3 byte. (1byte + 2 crc bytes)
 	if ( n < 3 ) return 0;
-	
+
 	init_table(ct);
 	switch (ct) {
 		case CRC_14443_A: return crc16_a(d, n);
@@ -192,7 +192,7 @@ uint16_t crc(CrcType_t ct, const uint8_t *d, size_t n) {
 // ct   crc type
 // 	d	buffer with data
 //	n	length (including crc)
-// 
+//
 //  This function uses the message + crc bytes in order to compare the "residue" afterwards.
 // crc16 algos like CRC-A become 0x000
 // while CRC-15693 become 0x0F47
@@ -201,14 +201,14 @@ bool check_crc(CrcType_t ct, const uint8_t *d, size_t n) {
 
 	// can't calc a crc on less than 3 byte. (1byte + 2 crc bytes)
 	if ( n < 3 ) return false;
-	
+
 	init_table(ct);
-			
+
 	switch (ct) {
 		case CRC_14443_A:	return (crc16_a(d, n) == 0);
 		case CRC_14443_B:	return (crc16_x25(d, n) == X25_CRC_CHECK);
 		case CRC_15693:		return (crc16_x25(d, n) == X25_CRC_CHECK);
-		case CRC_ICLASS:	return (crc16_iclass(d, n) == 0); 
+		case CRC_ICLASS:	return (crc16_iclass(d, n) == 0);
 		case CRC_FELICA:	return (crc16_xmodem(d, n) == 0);
 		//case CRC_LEGIC:
 		case CRC_CCITT: return (crc16_ccitt(d, n) == 0);
@@ -222,7 +222,7 @@ uint16_t crc16_ccitt(uint8_t const *d, size_t n) {
 	return crc16_fast(d, n, 0xffff, false, false);
 }
 
-// FDX-B ISO11784/85) uses KERMIT 
+// FDX-B ISO11784/85) uses KERMIT
 // poly=0x1021  init=0x0000  refin=true  refout=true  xorout=0x0000 name="KERMIT"
 uint16_t crc16_kermit(uint8_t const *d, size_t n) {
 	return crc16_fast(d, n, 0x0000, true, true);
@@ -231,7 +231,7 @@ uint16_t crc16_kermit(uint8_t const *d, size_t n) {
 // FeliCa uses XMODEM
 // poly=0x1021  init=0x0000  refin=false  refout=false  xorout=0x0000 name="XMODEM"
 uint16_t crc16_xmodem(uint8_t const *d, size_t n) {
-	return crc16_fast(d, n, 0x0000, false, false); 
+	return crc16_fast(d, n, 0x0000, false, false);
 }
 
 // Following standards uses X-25
@@ -239,14 +239,14 @@ uint16_t crc16_xmodem(uint8_t const *d, size_t n) {
 //   ISO 14443 CRC-B
 //   ISO/IEC 13239 (formerly ISO/IEC 3309)
 // poly=0x1021  init=0xffff  refin=true  refout=true  xorout=0xffff name="X-25"
-uint16_t crc16_x25(uint8_t const *d, size_t n) {	
+uint16_t crc16_x25(uint8_t const *d, size_t n) {
 	uint16_t crc = crc16_fast(d, n, 0xffff, true, true);
 	crc = ~crc;
 	return crc;
 }
 // CRC-A (14443-3)
 // poly=0x1021 init=0xc6c6 refin=true refout=true xorout=0x0000 name="CRC-A"
-uint16_t crc16_a(uint8_t const *d, size_t n) {	
+uint16_t crc16_a(uint8_t const *d, size_t n) {
 	return crc16_fast(d, n, 0xC6C6, true, true);
 }
 
@@ -258,7 +258,7 @@ uint16_t crc16_iclass(uint8_t const *d, size_t n) {
 	return crc16_fast(d, n, 0x4807, true, true);
 }
 
-// This CRC-16 is used in Legic Advant systems. 
+// This CRC-16 is used in Legic Advant systems.
 // poly=0xB400,  init=depends  refin=true  refout=true  xorout=0x0000  check=  name="CRC-16/LEGIC"
 uint16_t crc16_legic(uint8_t const *d, size_t n, uint8_t uidcrc) {
 	uint16_t initial = uidcrc << 8 | uidcrc;
diff --git a/common/crc16.h b/common/crc16.h
index e4c3abac2..c11cf6351 100644
--- a/common/crc16.h
+++ b/common/crc16.h
@@ -47,7 +47,7 @@ uint16_t crc16_kermit(uint8_t const *d, size_t n);
 // Calculate CRC-16/XMODEM (FeliCa)
 uint16_t crc16_xmodem(uint8_t const *d, size_t n);
 
-// Calculate CRC-16/X25 (ISO15693, ISO14443 CRC-B,ISO/IEC 13239) 
+// Calculate CRC-16/X25 (ISO15693, ISO14443 CRC-B,ISO/IEC 13239)
 uint16_t crc16_x25(uint8_t const *d, size_t n);
 
 // Calculate CRC-16/CRC-A (ISO14443 CRC-A)
diff --git a/common/default_version.c b/common/default_version.c
index b564681c7..b143afd4c 100644
--- a/common/default_version.c
+++ b/common/default_version.c
@@ -1,9 +1,9 @@
 #include "proxmark3.h"
 /* This is the default version.c file that Makefile.common falls back to if perl is not available */
-const struct version_information __attribute__((section(".version_information"))) version_information = { 
-		VERSION_INFORMATION_MAGIC, 
+const struct version_information __attribute__((section(".version_information"))) version_information = {
+		VERSION_INFORMATION_MAGIC,
 		1, /* version 1 */
 		0, /* version information not present */
 		2, /* cleanliness couldn't be determined */
 		/* Remaining fields: zero */
-}; 
+};
diff --git a/common/desfire.h b/common/desfire.h
index a2b0599e9..81ca57b92 100644
--- a/common/desfire.h
+++ b/common/desfire.h
@@ -91,7 +91,7 @@ struct desfire_tag {
     desfirekey_t session_key;
 	enum DESFIRE_AUTH_SCHEME authentication_scheme;
     uint8_t authenticated_key_no;
-    
+
 	uint8_t ivect[MAX_CRYPTO_BLOCK_SIZE];
     uint8_t cmac[16];
     uint8_t *crypto_buffer;
diff --git a/common/emvtags.h b/common/emvtags.h
index beecd5716..72cd34ccb 100644
--- a/common/emvtags.h
+++ b/common/emvtags.h
@@ -1,13 +1,13 @@
 //-----------------------------------------------------------------------------
 // Peter Fillmore 2014
 // code derived off merloks mifare code
-// 
+//
 //
 // This code is licensed to you under the terms of the GNU GPL, version 2 or,
 // at your option, any later version. See the LICENSE.txt file for the text of
 // the license.
 //-----------------------------------------------------------------------------
-// structure to hold EMV card and terminal parameters 
+// structure to hold EMV card and terminal parameters
 //-----------------------------------------------------------------------------
 #ifndef __EMVCARD_H
 #define __EMVCARD_H
@@ -16,133 +16,133 @@
 #include <stddef.h>
 
 //structure to hold received/set tag values
-//variable data inputs have length specifiers 
+//variable data inputs have length specifiers
 typedef struct {
     //ISO14443-A card stuff
-    uint8_t ATQA[2]; //Answer to Request 
-    uint8_t UID_len; 
-    uint8_t UID[10]; 
+    uint8_t ATQA[2]; //Answer to Request
+    uint8_t UID_len;
+    uint8_t UID[10];
     uint8_t SAK1; //SAK for UID 1
     uint8_t SAK2; //SAK for UID 2
-    uint8_t ATS_len; //Answer to select  
-    uint8_t ATS[256]; 
-    //ATS 
+    uint8_t ATS_len; //Answer to select
+    uint8_t ATS[256];
+    //ATS
     uint8_t TL;
     uint8_t T0;
     uint8_t TA1;
     uint8_t TB1;
     uint8_t TC1;
     uint8_t* historicalbytes;
-    //PPS response 
+    //PPS response
     uint8_t PPSS;
-        //SFI 2 record 1 
-    uint8_t tag_4F_len; //length of AID 
-    uint8_t tag_4F[16]; //Application Identifier (AID) 
-    uint8_t tag_50_len; //length of application label 
+        //SFI 2 record 1
+    uint8_t tag_4F_len; //length of AID
+    uint8_t tag_4F[16]; //Application Identifier (AID)
+    uint8_t tag_50_len; //length of application label
     uint8_t tag_50[16]; //Application Label
-    uint8_t tag_56_len; //track1 length 
+    uint8_t tag_56_len; //track1 length
     uint8_t tag_56[76]; //Track 1 Data
-    uint8_t tag_57_len; //track2 equiv len 
+    uint8_t tag_57_len; //track2 equiv len
     uint8_t tag_57[19]; //Track 2 Equivalent Data
-    uint8_t tag_5A_len; //PAN length 
+    uint8_t tag_5A_len; //PAN length
     uint8_t tag_5A[10]; //Application Primary Account Number (PAN)
     //uint8_t tag_6F[]; //File Control Information (FCI) Template
     //uint8_t tag_70[255]; //Record Template
     //uint8_t tag_77[]; //Response Message Template Format 2
-    //uint8_t tag_80[]; //Response Message Template Format 1 
+    //uint8_t tag_80[]; //Response Message Template Format 1
     uint8_t tag_82[2]; //Application Interchange Profile AIP
     //uint8_t tag_83[]; //Command Template
-    uint8_t tag_84_len; 
+    uint8_t tag_84_len;
     uint8_t tag_84[16]; //DF Name
-    uint8_t tag_86_len; 
+    uint8_t tag_86_len;
     uint8_t tag_86[261]; //Issuer Script Command
     uint8_t tag_87[1]; //Application Priority Indicator
     uint8_t tag_88[1]; //Short File Identifier
     uint8_t tag_8A[2]; //Authorisation Response Code
-    uint8_t tag_8C_len; 
+    uint8_t tag_8C_len;
     uint8_t tag_8C[252]; //CDOL1
-    uint8_t tag_8D_len; 
+    uint8_t tag_8D_len;
     uint8_t tag_8D[252]; //CDOL2
-    uint8_t tag_8E_len; 
+    uint8_t tag_8E_len;
     uint8_t tag_8E[252]; //Cardholder Verification Method (CVM) List
     uint8_t tag_8F[1];  //Certification Authority Public Key Index
-    uint8_t tag_90_len; 
+    uint8_t tag_90_len;
     uint8_t tag_90[255]; //ssuer Public Key Certificate
-    uint8_t tag_92_len; 
+    uint8_t tag_92_len;
     uint8_t tag_92[255]; //Issuer Public Key Remainder
-    uint8_t tag_93_len; 
+    uint8_t tag_93_len;
     uint8_t tag_93[255]; //Signed Static Application Data
-    uint8_t tag_94_len; 
+    uint8_t tag_94_len;
     uint8_t tag_94[252]; //Application File Locator AFL
     uint8_t tag_95[5]; //Terminal Verification Results
-    uint8_t tag_97_len; 
+    uint8_t tag_97_len;
     uint8_t tag_97[252]; //Transaction Certificate Data Object List (TDOL)
-    uint8_t tag_98[20]; //Transaction Certificate (TC) Hash Value 
+    uint8_t tag_98[20]; //Transaction Certificate (TC) Hash Value
     //assume 20 bytes, change after testing
-    uint8_t tag_99_len; 
-    uint8_t tag_99[20]; //Transaction Personal Identification Number (PIN) Data 
-    uint8_t tag_9A[3]; //Transaction Date 
-    uint8_t tag_9B[2]; //Transaction Status Information 
+    uint8_t tag_99_len;
+    uint8_t tag_99[20]; //Transaction Personal Identification Number (PIN) Data
+    uint8_t tag_9A[3]; //Transaction Date
+    uint8_t tag_9B[2]; //Transaction Status Information
     uint8_t tag_9C[1]; //Transaction Type
     uint8_t tag_9D_len;
     uint8_t tag_9D[16]; //Directory Definition File
-  
+
     uint8_t tag_CD[3]; //Card Issuer Action Codes Paypass
     uint8_t tag_CE[3];
     uint8_t tag_CF[3];
-  
+
     uint8_t tag_D7[3]; //Application Control (PayPass)
-    uint8_t tag_D8[2]; //Application Interchange Profile (PayPass) 
-    uint8_t tag_D9_len; //Application File Locator (PayPass) 
-    uint8_t tag_D9[16]; 
-    uint8_t tag_DA[2]; //Static CVC3track1 
-    uint8_t tag_DB[2]; //Static CVC3track2 
-    uint8_t tag_DC[2]; //IVCVC3 CVC3track1 
-    uint8_t tag_DD[2]; //IVCVC3 CVC3track2 
-    
-    uint8_t tag_AF_len; 
-    uint8_t tag_AF[255]; //Proprietary Information 
-    
-    uint8_t tag_5F20_len; 
+    uint8_t tag_D8[2]; //Application Interchange Profile (PayPass)
+    uint8_t tag_D9_len; //Application File Locator (PayPass)
+    uint8_t tag_D9[16];
+    uint8_t tag_DA[2]; //Static CVC3track1
+    uint8_t tag_DB[2]; //Static CVC3track2
+    uint8_t tag_DC[2]; //IVCVC3 CVC3track1
+    uint8_t tag_DD[2]; //IVCVC3 CVC3track2
+
+    uint8_t tag_AF_len;
+    uint8_t tag_AF[255]; //Proprietary Information
+
+    uint8_t tag_5F20_len;
     uint8_t tag_5F20[26]; //Cardholder Name
-    uint8_t tag_5F24[3]; //Application Expiry Date 
+    uint8_t tag_5F24[3]; //Application Expiry Date
     uint8_t tag_5F25[3]; //Application Effective Date YYMMDD
-    uint8_t tag_5F28[2]; //Issuer Country Code  
+    uint8_t tag_5F28[2]; //Issuer Country Code
     uint8_t tag_5F2A[2]; //Transaction Currency Code
-    uint8_t tag_5F2D_len; 
+    uint8_t tag_5F2D_len;
     uint8_t tag_5F2D[8]; //Language Preference
     uint8_t tag_5F30[2]; //Service Code
     uint8_t tag_5F34[1]; //Application Primary Account Number (PAN) Sequence Number
     uint8_t tag_5F36[2]; //ATC
-    uint8_t tag_5F50_len; 
-    uint8_t tag_5F50[255]; //Issuer URL 
-    uint8_t tag_5F54_len; 
-    uint8_t tag_5F54[11]; //Bank Identifier Code (BIC) 
-    uint8_t tag_9F01[6]; //Acquirer Identifier 
+    uint8_t tag_5F50_len;
+    uint8_t tag_5F50[255]; //Issuer URL
+    uint8_t tag_5F54_len;
+    uint8_t tag_5F54[11]; //Bank Identifier Code (BIC)
+    uint8_t tag_9F01[6]; //Acquirer Identifier
     uint8_t tag_9F02[6]; // Amount, Authorised (Numeric)
-    uint8_t tag_9F03[6]; //Amount, Other (Numeric) 
+    uint8_t tag_9F03[6]; //Amount, Other (Numeric)
     uint8_t tag_9F04[4]; //Amount, Other (Binary)
-    uint8_t tag_9F05_len; 
-    uint8_t tag_9F05[32]; //Application Discretionary Data 
-    uint8_t tag_9F06_len; 
-    uint8_t tag_9F06[16]; //AID terminal 
-    uint8_t tag_9F07[2]; //Application Usage Control  
-    uint8_t tag_9F08[2]; //Application Version Number 
+    uint8_t tag_9F05_len;
+    uint8_t tag_9F05[32]; //Application Discretionary Data
+    uint8_t tag_9F06_len;
+    uint8_t tag_9F06[16]; //AID terminal
+    uint8_t tag_9F07[2]; //Application Usage Control
+    uint8_t tag_9F08[2]; //Application Version Number
     uint8_t tag_9F09[2]; //Application Version Number
-    //uint8_t tag_9F0A[2] 
-    uint8_t tag_9F0B_len; 
+    //uint8_t tag_9F0A[2]
+    uint8_t tag_9F0B_len;
     uint8_t tag_9F0B[45]; //Cardholder Name Extended
-    uint8_t tag_9F0D[5]; //Issuer Action Code - Default 
-    uint8_t tag_9F0E[5]; //Issuer Action Code - Denial 
-    uint8_t tag_9F0F[5]; //Issuer Action Code - Online 
+    uint8_t tag_9F0D[5]; //Issuer Action Code - Default
+    uint8_t tag_9F0E[5]; //Issuer Action Code - Denial
+    uint8_t tag_9F0F[5]; //Issuer Action Code - Online
     uint8_t tag_9F10_len; //Issuer Application Data
-    uint8_t tag_9F10[32]; 
+    uint8_t tag_9F10[32];
     uint8_t tag_9F11[1]; //Issuer Code Table Index
-    uint8_t tag_9F12_len; 
-    uint8_t tag_9F12[255]; //Application Preferred Name 
-    uint8_t tag_9F13[2]; //Last Online Application Transaction Counter (ATC) Registerjk 
+    uint8_t tag_9F12_len;
+    uint8_t tag_9F12[255]; //Application Preferred Name
+    uint8_t tag_9F13[2]; //Last Online Application Transaction Counter (ATC) Registerjk
     uint8_t tag_9F14[1]; //Lower Consecutive Offline Limit
-    uint8_t tag_9F15[2]; //Merchant Category Code 
+    uint8_t tag_9F15[2]; //Merchant Category Code
     uint8_t tag_9F16[15]; //Merchant Identifier
     uint8_t tag_9F17[1]; //Personal Identification Number (PIN) Try Counter
     uint8_t tag_9F18[4]; //Issuer Script Identifier
@@ -150,41 +150,41 @@ typedef struct {
     uint8_t tag_9F1A[2]; //Terminal Country Code
     uint8_t tag_9F1B[4]; //Terminal Floor Limit
     uint8_t tag_9F1C[8]; //Terminal Identification
-    uint8_t tag_9F1D_len; 
-    uint8_t tag_9F1D[8]; //Terminal Risk Management Data 
-    uint8_t tag_9F1E[8]; //Interface Device (IFD) Serial Number 
+    uint8_t tag_9F1D_len;
+    uint8_t tag_9F1D[8]; //Terminal Risk Management Data
+    uint8_t tag_9F1E[8]; //Interface Device (IFD) Serial Number
     uint8_t tag_9F1F_len;
-    uint8_t tag_9F1F[255]; //Track 1 Discretionary Data 
+    uint8_t tag_9F1F[255]; //Track 1 Discretionary Data
     uint8_t tag_9F20_len;
-    uint8_t tag_9F20[255]; //Track 2 DD 
+    uint8_t tag_9F20[255]; //Track 2 DD
     uint8_t tag_9F21[3]; //Transaction Time
     uint8_t tag_9F22[1]; //Certification Authority Public Key Index
     uint8_t tag_9F23[1]; //Upper Consecutive Offline Limit
-    //uint8_t tag_9F24 
-    //uint8_t tag_9F25 
+    //uint8_t tag_9F24
+    //uint8_t tag_9F25
     uint8_t tag_9F26[8]; //Application Cryptogram
     uint8_t tag_9F27[1]; //Cryptogram Information Data
-    //uint8_t tag_9F28 
-    //uint8_t tag_9F29 
+    //uint8_t tag_9F28
+    //uint8_t tag_9F29
     //uint8_t tag_9F2A
     //uint8_t tag_9F2B
     //uint8_t tag_9F2C
-    uint8_t tag_9F2D_len; 
+    uint8_t tag_9F2D_len;
     uint8_t tag_9F2D[255]; //Integrated Circuit Card (ICC) PIN Encipherment Public Key Certificate
     uint8_t tag_9F2E[3]; //Integrated Circuit Card (ICC) PIN Encipherment Public Key Exponent
-    uint8_t tag_9F2F_len; 
-    uint8_t tag_9F2F[255]; //Integrated Circuit Card (ICC) PIN Encipherment Public Key Remainder 
-    //uint8_t tag_9F30 
-    //uint8_t tag_9F31 
-    uint8_t tag_9F32_len; 
+    uint8_t tag_9F2F_len;
+    uint8_t tag_9F2F[255]; //Integrated Circuit Card (ICC) PIN Encipherment Public Key Remainder
+    //uint8_t tag_9F30
+    //uint8_t tag_9F31
+    uint8_t tag_9F32_len;
     uint8_t tag_9F32[3]; //Issuer Public Key Exponent
     uint8_t tag_9F33[3]; //Terminal Capabilities
-    uint8_t tag_9F34[3]; //Cardholder Verification Method (CVM) Results 
+    uint8_t tag_9F34[3]; //Cardholder Verification Method (CVM) Results
     uint8_t tag_9F35[1]; //Terminal Type
     uint8_t tag_9F36[2]; //Application Transaction Counter (ATC)
     uint8_t tag_9F37[8]; //Unpredictable Number
-    uint8_t tag_9F38_len; 
-    uint8_t tag_9F38[255]; //PDOL 
+    uint8_t tag_9F38_len;
+    uint8_t tag_9F38[255]; //PDOL
     uint8_t tag_9F39[1]; //Point-of-Service (POS) Entry Mode
     uint8_t tag_9F40[5]; //Additional Terminal Capabilities
     uint8_t tag_9F41[4]; //Transaction Sequence Counter
@@ -192,21 +192,21 @@ typedef struct {
     uint8_t tag_9F43[4]; //Application Reference Currency Exponent
     uint8_t tag_9F44[1]; //Application Currency Exponent
     uint8_t tag_9F45[2]; //Data Authentication Code
-    uint8_t tag_9F46_len; 
+    uint8_t tag_9F46_len;
     uint8_t tag_9F46[255]; //ICC Public Key Certificate
-    uint8_t tag_9F47_len; 
+    uint8_t tag_9F47_len;
     uint8_t tag_9F47[3]; //ICC Public Key Exponent
-    uint8_t tag_9F48_len; 
+    uint8_t tag_9F48_len;
     uint8_t tag_9F48[255]; //ICC Public Key Remainder
-    uint8_t tag_9F49_len; 
-    uint8_t tag_9F49[252]; 
+    uint8_t tag_9F49_len;
+    uint8_t tag_9F49[252];
     uint8_t tag_9F4A[1]; //SDA Tag list
-    uint8_t tag_9F4B_len; 
-    uint8_t tag_9F4B[255]; //Signed Dynamic Application Data 
+    uint8_t tag_9F4B_len;
+    uint8_t tag_9F4B[255]; //Signed Dynamic Application Data
     uint8_t tag_9F4C[8]; //ICC Dynamic Number
     uint8_t tag_9F4D[2]; //Log Entry
     uint8_t tag_9F4E[255]; //Merchant Name and Location
-    //9F50-9F7F are payment system specific 
+    //9F50-9F7F are payment system specific
     uint8_t tag_9F60[2]; //CVC3 track1
     uint8_t tag_9F61[2]; //CVC3 track2
     uint8_t tag_9F62[6]; //Track 1 Bit Map for CVC3 (PCVC3TRACK1)
@@ -215,33 +215,33 @@ typedef struct {
     uint8_t tag_9F65[2]; //rack 2 Bit Map for CVC3 (PCVC3TRACK2)
     uint8_t tag_9F66[4];   //Track 2 Bit Map for UN and ATC (PUNATCTRACK2), or VISA card type
     uint8_t tag_9F67[1];   //Track 2 Number of ATC Digits (NATCTRACK2)
-    uint8_t tag_9F68_len; 
+    uint8_t tag_9F68_len;
     uint8_t tag_9F68[252]; //Mag Stripe CVM List
-    uint8_t tag_9F69_len; 
+    uint8_t tag_9F69_len;
     uint8_t tag_9F69[255]; //Unpredictable Number Data Object List (UDOL)
     uint8_t tag_9F6A[8]; //Unpredictable Number (Numeric)
-    uint8_t tag_9F6B_len; 
+    uint8_t tag_9F6B_len;
     uint8_t tag_9F6B[19]; //track 2 data
     uint8_t tag_9F6C[2]; //Mag Stripe Application Version  Number(Card)
     //template holders
-    uint8_t tag_61_len; 
+    uint8_t tag_61_len;
     uint8_t tag_61[255]; //Application template
-    uint8_t tag_6F_len; 
+    uint8_t tag_6F_len;
     uint8_t tag_6F[255]; //6F template
-    uint8_t tag_A5_len; 
-    uint8_t tag_A5[255]; //A5 template 
-    uint8_t tag_DFNAME_len; 
-    uint8_t tag_DFNAME[255]; //A5 template 
-    uint8_t tag_70_len; 
+    uint8_t tag_A5_len;
+    uint8_t tag_A5[255]; //A5 template
+    uint8_t tag_DFNAME_len;
+    uint8_t tag_DFNAME[255]; //A5 template
+    uint8_t tag_70_len;
     uint8_t tag_70[255]; //70 template
-    uint8_t tag_77_len; 
+    uint8_t tag_77_len;
     uint8_t tag_77[255]; //77 template
-    uint8_t tag_80_len; 
-    uint8_t tag_80[255]; //80 template 
-    uint8_t tag_91_len; //Issuer Authentication Data 
-    uint8_t tag_91[16]; 
-    uint8_t tag_BF0C_len; 
-    uint8_t tag_BF0C[222]; //File Control Information (FCI) Issuer Discretionary Data 
+    uint8_t tag_80_len;
+    uint8_t tag_80[255]; //80 template
+    uint8_t tag_91_len; //Issuer Authentication Data
+    uint8_t tag_91[16];
+    uint8_t tag_BF0C_len;
+    uint8_t tag_BF0C[222]; //File Control Information (FCI) Issuer Discretionary Data
     uint8_t tag_DFName[16];
     uint8_t tag_DFName_len;
 }emvtags;
diff --git a/common/i2c.c b/common/i2c.c
index 53627966e..dff77a05a 100644
--- a/common/i2c.c
+++ b/common/i2c.c
@@ -22,7 +22,7 @@
 #define SCL_read	(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SCL)
 #define SDA_read	(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SDA)
 
-#define I2C_ERROR  "I2C_WaitAck Error" 
+#define I2C_ERROR  "I2C_WaitAck Error"
 
 volatile unsigned long c;
 
@@ -42,24 +42,24 @@ void __attribute__((optimize("O0"))) I2CSpinDelayClk(uint16_t delay) {
 
 // try i2c bus recovery at 100kHz = 5uS high, 5uS low
 void I2C_recovery(void) {
-	
-	DbpString("Performing i2c bus recovery");	
-			
+
+	DbpString("Performing i2c bus recovery");
+
 	// reset I2C
 	SDA_H; SCL_H;
-	
+
 	 //9nth cycle acts as NACK
 	for (int i = 0; i < 10; i++)  {
 		SCL_H; WaitUS(5);
 		SCL_L; WaitUS(5);
 	}
-	
-    //a STOP signal (SDA from low to high while CLK is high)	
+
+    //a STOP signal (SDA from low to high while CLK is high)
 	SDA_L; WaitUS(5);
 	SCL_H; WaitUS(2);
 	SDA_H; WaitUS(2);
-	
-	bool isok = (SCL_read && SDA_read); 
+
+	bool isok = (SCL_read && SDA_read);
     if (!SDA_read)
 		DbpString("I2C bus recovery  error: SDA still LOW");
 	if (!SCL_read)
@@ -72,7 +72,7 @@ void I2C_init(void) {
 	// Configure reset pin, close up pull up, push-pull output, default high
 	AT91C_BASE_PIOA->PIO_PPUDR = GPIO_RST;
 	AT91C_BASE_PIOA->PIO_MDDR = GPIO_RST;
-  
+
 	// Configure I2C pin, open up, open leakage
 	AT91C_BASE_PIOA->PIO_PPUER |= (GPIO_SCL | GPIO_SDA);
 	AT91C_BASE_PIOA->PIO_MDER |= (GPIO_SCL | GPIO_SDA);
@@ -82,12 +82,12 @@ void I2C_init(void) {
 
 	AT91C_BASE_PIOA->PIO_OER |= (GPIO_SCL | GPIO_SDA | GPIO_RST);
 	AT91C_BASE_PIOA->PIO_PER |= (GPIO_SCL | GPIO_SDA | GPIO_RST);
-	
-	
-	bool isok =  (SCL_read && SDA_read); 
+
+
+	bool isok =  (SCL_read && SDA_read);
 	if ( !isok )
 		I2C_recovery();
-	
+
 }
 
 // set the reset state
@@ -132,7 +132,7 @@ void I2C_Reset_EnterBootloader(void) {
 	WaitMS(10);
 }
 
-// Wait for the clock to go High.	
+// Wait for the clock to go High.
 bool WaitSCL_H_delay(uint32_t delay) {
 	while (delay--)	{
 		if (SCL_read) {
@@ -154,9 +154,9 @@ bool WaitSCL_L_delay(uint32_t delay) {
 		if (!SCL_read) {
 			return true;
 		}
-		I2C_DELAY_1CLK;		
+		I2C_DELAY_1CLK;
 	}
-	return false;	
+	return false;
 }
 // 5000 * 3.07us = 15350us. 15.35ms
 bool WaitSCL_L(void) {
@@ -168,25 +168,25 @@ bool WaitSCL_L(void) {
 // Which ever comes first
 bool WaitSCL_L_timeout(void){
 	volatile uint16_t delay = 1800;
-	while ( delay-- ) {		
+	while ( delay-- ) {
 		// exit on SCL LOW
 		if (!SCL_read)
 			return true;
-		
+
 		WaitMS(1);
 	}
 	return (delay == 0);
 }
 
 bool I2C_Start(void) {
-	
+
 	I2C_DELAY_XCLK(4);
 	SDA_H; I2C_DELAY_1CLK;
-	SCL_H;	
+	SCL_H;
 	if (!WaitSCL_H()) return false;
 
 	I2C_DELAY_2CLK;
-	
+
 	if (!SCL_read) return false;
 	if (!SDA_read) return false;
 
@@ -224,7 +224,7 @@ void I2C_Ack(void) {
 	SCL_L; I2C_DELAY_2CLK;
 	SDA_L; I2C_DELAY_2CLK;
 	SCL_H; I2C_DELAY_2CLK;
-	if (!WaitSCL_H()) return;	
+	if (!WaitSCL_H()) return;
 	SCL_L; I2C_DELAY_2CLK;
 }
 
@@ -233,7 +233,7 @@ void I2C_NoAck(void) {
 	SCL_L; I2C_DELAY_2CLK;
 	SDA_H; I2C_DELAY_2CLK;
 	SCL_H; I2C_DELAY_2CLK;
-	if (!WaitSCL_H()) return;	
+	if (!WaitSCL_H()) return;
 	SCL_L; I2C_DELAY_2CLK;
 }
 
@@ -259,16 +259,16 @@ void I2C_SendByte(uint8_t data)	{
 
 	while (bits--) {
 		SCL_L;
-		
+
 		I2C_DELAY_1CLK;
-		
+
 		if (data & 0x80)
 			SDA_H;
 		else
 			SDA_L;
-		
+
 		data <<= 1;
-		
+
 		I2C_DELAY_1CLK;
 
 		SCL_H;
@@ -286,11 +286,11 @@ int16_t I2C_ReadByte(void) {
 	SDA_H;
 	while (bits--)	{
 		b <<= 1;
-		SCL_L; 
+		SCL_L;
 		if (!WaitSCL_L()) return -2;
-		
+
 		I2C_DELAY_1CLK;
-		
+
 		SCL_H;
 		if (!WaitSCL_H()) return -1;
 
@@ -375,13 +375,13 @@ bool I2C_BufferWrite(uint8_t *data, uint8_t len, uint8_t device_cmd, uint8_t dev
 			break;
 
 		while (len) {
-			
+
 			I2C_SendByte(*data);
 			if (!I2C_WaitAck())
 				break;
 
 			len--;
-			data++;		
+			data++;
 		}
 
 		if (len == 0)
@@ -393,7 +393,7 @@ bool I2C_BufferWrite(uint8_t *data, uint8_t len, uint8_t device_cmd, uint8_t dev
 		if ( MF_DBGLEVEL > 3 ) DbpString(I2C_ERROR);
 		return false;
 	}
-	return true;	
+	return true;
 }
 
 // read one array of data (Data array, Readout length, command to be written , SlaveDevice address  ).
@@ -408,7 +408,7 @@ int16_t I2C_BufferRead(uint8_t *data, uint8_t len, uint8_t device_cmd, uint8_t d
 	WaitUS(600);
 	bool bBreak = true;
 	uint16_t readcount = 0;
-	
+
 	do {
 		if (!I2C_Start())
 			return 0;
@@ -421,7 +421,7 @@ int16_t I2C_BufferRead(uint8_t *data, uint8_t len, uint8_t device_cmd, uint8_t d
 		I2C_SendByte(device_cmd);
 		if (!I2C_WaitAck())
 			break;
-		
+
 		// 0xB1 / 0xC1 == i2c read
 		I2C_Start();
 		I2C_SendByte(device_address | 1);
@@ -442,35 +442,35 @@ int16_t I2C_BufferRead(uint8_t *data, uint8_t len, uint8_t device_cmd, uint8_t d
 		int16_t tmp = I2C_ReadByte();
 		if ( tmp < 0 )
 			return tmp;
-		
+
 		*data = (uint8_t)tmp & 0xFF;
 
 		len--;
 
-		// ��ȡ�ĵ�һ���ֽ�Ϊ��������	
+		// ��ȡ�ĵ�һ���ֽ�Ϊ��������
 		// The first byte in response is the message length
 		if (!readcount && (len > *data)) {
 			len = *data;
 		} else {
-			data++;			
+			data++;
 		}
 		readcount++;
-		
+
 		// acknowledgements. After last byte send NACK.
 		if (len == 0)
 			I2C_NoAck();
 		else
 			I2C_Ack();
 	}
-	
+
 	I2C_Stop();
-	
+
 	// return bytecount - first byte (which is length byte)
 	return --readcount;
 }
 
 int16_t I2C_ReadFW(uint8_t *data, uint8_t len, uint8_t msb, uint8_t lsb, uint8_t device_address) {
-	//START, 0xB0, 0x00, 0x00, START, 0xB1, xx, yy, zz, ......, STOP	
+	//START, 0xB0, 0x00, 0x00, START, 0xB1, xx, yy, zz, ......, STOP
 	bool bBreak = true;
 	uint8_t	readcount = 0;
 
@@ -491,7 +491,7 @@ int16_t I2C_ReadFW(uint8_t *data, uint8_t len, uint8_t msb, uint8_t lsb, uint8_t
 		I2C_SendByte(lsb);
 		if (!I2C_WaitAck())
 			break;
-		
+
 		// 0xB1 / 0xC1  i2c read
 		I2C_Start();
 		I2C_SendByte(device_address | 1);
@@ -509,30 +509,30 @@ int16_t I2C_ReadFW(uint8_t *data, uint8_t len, uint8_t msb, uint8_t lsb, uint8_t
 
 	// reading
 	while (len) {
-		
+
 		int16_t tmp = I2C_ReadByte();
 		if ( tmp < 0 )
 			return tmp;
-		
+
 		*data = (uint8_t)tmp & 0xFF;
 
 		data++;
 		readcount++;
 		len--;
 
-		// acknowledgements. After last byte send NACK.		
+		// acknowledgements. After last byte send NACK.
 		if (len == 0)
 			I2C_NoAck();
 		else
 			I2C_Ack();
 	}
-	
+
 	I2C_Stop();
 	return readcount;
 }
 
 bool I2C_WriteFW(uint8_t *data, uint8_t len, uint8_t msb, uint8_t lsb, uint8_t device_address) {
-	//START, 0xB0, 0x00, 0x00, xx, yy, zz, ......, STOP	
+	//START, 0xB0, 0x00, 0x00, xx, yy, zz, ......, STOP
 	bool bBreak = true;
 
 	do {
@@ -543,7 +543,7 @@ bool I2C_WriteFW(uint8_t *data, uint8_t len, uint8_t msb, uint8_t lsb, uint8_t d
 		I2C_SendByte(device_address & 0xFE);
 		if (!I2C_WaitAck())
 			break;
-		
+
 		I2C_SendByte(msb);
 		if (!I2C_WaitAck())
 			break;
@@ -558,7 +558,7 @@ bool I2C_WriteFW(uint8_t *data, uint8_t len, uint8_t msb, uint8_t lsb, uint8_t d
 				break;
 
 			len--;
-			data++;		
+			data++;
 		}
 
 		if (len == 0)
@@ -570,7 +570,7 @@ bool I2C_WriteFW(uint8_t *data, uint8_t len, uint8_t msb, uint8_t lsb, uint8_t d
 		if ( MF_DBGLEVEL > 3 ) DbpString(I2C_ERROR);
 		return false;
 	}
-	return true;	
+	return true;
 }
 
 void I2C_print_status(void) {
@@ -581,7 +581,7 @@ void I2C_print_status(void) {
 	if ( len > 0 )
 	  	Dbprintf("  version.................v%x.%02d", resp[0], resp[1]);
 	else
-		DbpString("  version.................FAILED");	
+		DbpString("  version.................FAILED");
 }
 
 // Will read response from smart card module,  retries 3 times to get the data.
@@ -590,46 +590,46 @@ bool sc_rx_bytes(uint8_t* dest, uint8_t *destlen) {
 	uint8_t i = 3;
 	int16_t len = 0;
 	while (i--) {
-		
+
 		I2C_WaitForSim();
-	
+
 		len = I2C_BufferRead(dest, *destlen, I2C_DEVICE_CMD_READ, I2C_DEVICE_ADDRESS_MAIN);
-		
+
 		if ( len > 1 ){
 			break;
 		} else if ( len == 1 ) {
 			continue;
 		} else if ( len <= 0 ) {
-			return false;	
-		} 
+			return false;
+		}
 	}
 
 	// after three
 	if ( len <= 1 )
 		return false;
-	
+
 	*destlen = (uint8_t)len & 0xFF;
 	return true;
 }
 
 bool GetATR(smart_card_atr_t *card_ptr) {
-	
+
 	if ( !card_ptr )
 		return false;
-	
+
 	card_ptr->atr_len = 0;
 	memset(card_ptr->atr, 0, sizeof(card_ptr->atr));
 
-	
+
 	// Send ATR
 	// start [C0 01] stop start C1 len aa bb cc stop]
 	I2C_WriteCmd(I2C_DEVICE_CMD_GENERATE_ATR, I2C_DEVICE_ADDRESS_MAIN);
 
 	//wait for sim card to answer.
 	// 1byte = 1ms ,  max frame 256bytes.  SHould wait 256ms atleast just in case.
-	if (!I2C_WaitForSim()) 
+	if (!I2C_WaitForSim())
 		return false;
-		
+
 	// read bytes from module
 	uint8_t len = sizeof(card_ptr->atr);
 	if ( !sc_rx_bytes(card_ptr->atr, &len) )
@@ -639,12 +639,12 @@ bool GetATR(smart_card_atr_t *card_ptr) {
 	if ( (card_ptr->atr[1] & 0x10) == 0x10) pos_td++;
 	if ( (card_ptr->atr[1] & 0x20) == 0x20) pos_td++;
 	if ( (card_ptr->atr[1] & 0x40) == 0x40) pos_td++;
-	
+
 	// T0 indicate presence T=0 vs T=1.  T=1 has checksum TCK
 	if ( (card_ptr->atr[1] & 0x80) == 0x80) {
-		
+
 		pos_td++;
-	
+
 		// 1 == T1 ,  presence of checksum TCK
 		if ( (card_ptr->atr[pos_td] & 0x01) == 0x01) {
 
@@ -683,16 +683,16 @@ void SmartCardRaw( uint64_t arg0, uint64_t arg1, uint8_t *data ) {
 	uint8_t len = 0;
 	uint8_t *resp = BigBuf_malloc(ISO7618_MAX_FRAME);
 	smartcard_command_t flags = arg0;
-	
+
 	if ((flags & SC_CONNECT))
 		clear_trace();
 
 	set_tracing(true);
-	
-	if ((flags & SC_CONNECT)) {	
+
+	if ((flags & SC_CONNECT)) {
 
 		I2C_Reset_EnterMainProgram();
-		
+
 		if ((flags & SC_SELECT)) {
 			smart_card_atr_t card;
 			bool gotATR = GetATR( &card );
@@ -703,15 +703,15 @@ void SmartCardRaw( uint64_t arg0, uint64_t arg1, uint8_t *data ) {
 	}
 
 	if ((flags & SC_RAW) || (flags & SC_RAW_T0)) {
-		
+
 		LogTrace(data, arg1, 0, 0, NULL, true);
-		
+
 		// Send raw bytes
 		// asBytes = A0 A4 00 00 02
 		// arg1 = len 5
 		bool res = I2C_BufferWrite(data, arg1, ((flags & SC_RAW_T0) ? I2C_DEVICE_CMD_SEND_T0 : I2C_DEVICE_CMD_SEND), I2C_DEVICE_ADDRESS_MAIN);
-		if ( !res && MF_DBGLEVEL > 3 ) DbpString(I2C_ERROR);		
-		
+		if ( !res && MF_DBGLEVEL > 3 ) DbpString(I2C_ERROR);
+
 		// read bytes from module
 		len = ISO7618_MAX_FRAME;
 		res = sc_rx_bytes(resp, &len);
@@ -721,11 +721,11 @@ void SmartCardRaw( uint64_t arg0, uint64_t arg1, uint8_t *data ) {
 			len = 0;
 		}
 	}
-OUT:	
+OUT:
 	cmd_send(CMD_ACK, len, 0, 0, resp, len);
 	BigBuf_free();
 	set_tracing(false);
-	LEDsoff();	
+	LEDsoff();
 }
 
 void SmartCardUpgrade(uint64_t arg0) {
@@ -735,8 +735,8 @@ void SmartCardUpgrade(uint64_t arg0) {
 	#define I2C_BLOCK_SIZE 128
 	// write.   Sector0,  with 11,22,33,44
 	// erase is 128bytes, and takes 50ms to execute
-			
-	I2C_Reset_EnterBootloader();	
+
+	I2C_Reset_EnterBootloader();
 
 	bool isOK = true;
 	int16_t res = 0;
@@ -744,16 +744,16 @@ void SmartCardUpgrade(uint64_t arg0) {
 	uint16_t pos = 0;
 	uint8_t *fwdata = BigBuf_get_addr();
 	uint8_t *verfiydata = BigBuf_malloc(I2C_BLOCK_SIZE);
-	
+
 	while (length) {
-		
+
 		uint8_t msb = (pos >> 8) & 0xFF;
 		uint8_t lsb = pos & 0xFF;
-		
+
 		Dbprintf("FW %02X%02X", msb, lsb);
 
 		size_t size = MIN(I2C_BLOCK_SIZE, length);
-		
+
 		// write
 		res = I2C_WriteFW(fwdata+pos, size, msb, lsb, I2C_DEVICE_ADDRESS_BOOT);
 		if ( !res ) {
@@ -761,7 +761,7 @@ void SmartCardUpgrade(uint64_t arg0) {
 			isOK = false;
 			break;
 		}
-		
+
 		// writing takes time.
 		WaitMS(50);
 
@@ -769,23 +769,23 @@ void SmartCardUpgrade(uint64_t arg0) {
 		res = I2C_ReadFW(verfiydata, size, msb, lsb, I2C_DEVICE_ADDRESS_BOOT);
 		if ( res <= 0) {
 			DbpString("Reading back failed");
-			isOK = false;					
+			isOK = false;
 			break;
 		}
-		
+
 		// cmp
 		if ( 0 != memcmp(fwdata+pos, verfiydata, size)) {
 			DbpString("not equal data");
-			isOK = false;					
+			isOK = false;
 			break;
 		}
-				
+
 		length -= size;
 		pos += size;
-	}			
+	}
 	cmd_send(CMD_ACK, isOK, pos, 0, 0, 0);
 	LED_C_OFF();
-	BigBuf_free();	
+	BigBuf_free();
 }
 
 void SmartCardSetBaud(uint64_t arg0) {
@@ -793,13 +793,13 @@ void SmartCardSetBaud(uint64_t arg0) {
 
 void SmartCardSetClock(uint64_t arg0) {
 	LED_D_ON();
-	set_tracing(true);	
-	I2C_Reset_EnterMainProgram();	
+	set_tracing(true);
+	I2C_Reset_EnterMainProgram();
 
 	// Send SIM CLC
 	// start [C0 05 xx] stop
 	I2C_WriteByte(arg0, I2C_DEVICE_CMD_SIM_CLC, I2C_DEVICE_ADDRESS_MAIN);
-				
+
 	cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
 	set_tracing(false);
 	LEDsoff();
diff --git a/common/iso14443crc.c b/common/iso14443crc.c
index 01e77c855..ceac3c4df 100644
--- a/common/iso14443crc.c
+++ b/common/iso14443crc.c
@@ -39,7 +39,7 @@ bool CheckCrc14443(uint16_t CrcType, const uint8_t *data, int length) {
 	if (length < 3) return false;
 	uint8_t b1, b2;
 	ComputeCrc14443(CrcType, data, length - 2, &b1, &b2);
-	if ((b1 == data[length - 2]) && (b2 == data[length - 1])) 
+	if ((b1 == data[length - 2]) && (b2 == data[length - 1]))
 		return true;
 	return false;
 }
diff --git a/common/iso15693tools.c b/common/iso15693tools.c
index 8d06c026c..fbd79da52 100644
--- a/common/iso15693tools.c
+++ b/common/iso15693tools.c
@@ -15,7 +15,7 @@
 char* Iso15693sprintUID(char *target, uint8_t *uid) {
 
 	static char tempbuf[2*8+1] = {0};
-	if (target == NULL) 
+	if (target == NULL)
 		target = tempbuf;
 	sprintf(target, "%02X %02X %02X %02X %02X %02X %02X %02X",
 				uid[7], uid[6], uid[5], uid[4],
diff --git a/common/iso15693tools.h b/common/iso15693tools.h
index 70382ce04..0dd4d4444 100644
--- a/common/iso15693tools.h
+++ b/common/iso15693tools.h
@@ -39,7 +39,7 @@
 
 //RESPONSE FLAGS
 #define ISO15_RES_ERROR				0x01
-#define ISO15_RES_EXT				0x08	// Protocol Extention	
+#define ISO15_RES_EXT				0x08	// Protocol Extention
 
 // RESPONSE ERROR CODES
 #define ISO15_NOERROR				0x00
@@ -47,7 +47,7 @@
 #define ISO15_ERROR_CMD_NOT_REC		0x02	// Command not recognized (eg. parameter error)
 #define ISO15_ERROR_CMD_OPTION		0x03	// Command option not supported
 #define ISO15_ERROR_GENERIC			0x0F	// No additional Info about this error
-#define ISO15_ERROR_BLOCK_UNAVAILABLE		0x10	
+#define ISO15_ERROR_BLOCK_UNAVAILABLE		0x10
 #define ISO15_ERROR_BLOCK_LOCKED_ALREADY	0x11	// cannot lock again
 #define ISO15_ERROR_BLOCK_LOCKED			0x12	// cannot be changed
 #define ISO15_ERROR_BLOCK_WRITE		0x13	// Writing was unsuccessful
diff --git a/common/legic_prng.c b/common/legic_prng.c
index df711aa10..c4927b33b 100644
--- a/common/legic_prng.c
+++ b/common/legic_prng.c
@@ -11,7 +11,7 @@
 // a is 7bit lsfr
 // b is 8bit lsfr
 // c keeps track on which step the prng is.
-// legic_prng_get_bit() = gets a bit muxed from a and b. 
+// legic_prng_get_bit() = gets a bit muxed from a and b.
 struct lfsr {
 	uint8_t  a;
 	uint8_t  b;
@@ -26,10 +26,10 @@ struct lfsr {
 // Now we have a special case with iv == 0
 // it sets b to 0 aswell to make sure we get a all zero keystream out
 // which is used in the initialisation phase sending the IV
-// 
+//
 void legic_prng_init(uint8_t iv) {
 	lfsr.a = iv;
-	lfsr.b = 0;  // hack to get a always 0 keystream 
+	lfsr.b = 0;  // hack to get a always 0 keystream
 	lfsr.c = 0;
 	if(iv)
 		lfsr.b = (iv << 1) | 1;
@@ -37,7 +37,7 @@ void legic_prng_init(uint8_t iv) {
 
 void legic_prng_forward(int count) {
 	if (count == 0) return;
-	
+
 	lfsr.c += count;
 	while(count--) {
 		// According: http://www.proxmark.org/forum/viewtopic.php?pid=5437#p5437
diff --git a/common/lfdemod.c b/common/lfdemod.c
index b9807ff8f..65999ae77 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -8,20 +8,20 @@
 // Low frequency demod/decode commands   - by marshmellow, holiman, iceman and
 //                                         many others who came before
 //
-// NOTES: 
+// NOTES:
 // LF Demod functions are placed here to allow the flexability to use client or
-// device side. Most BUT NOT ALL of these functions are currenlty safe for 
+// device side. Most BUT NOT ALL of these functions are currenlty safe for
 // device side use currently. (DetectST for example...)
 //
 // There are likely many improvements to the code that could be made, please
 // make suggestions...
 //
-// we tried to include author comments so any questions could be directed to 
+// we tried to include author comments so any questions could be directed to
 // the source.
 //
 // There are 4 main sections of code below:
 //
-// Utilities Section: 
+// Utilities Section:
 //    for general utilities used by multiple other functions
 //
 // Clock / Bitrate Detection Section:
@@ -58,7 +58,7 @@ extern void Dbprintf(const char *fmt, ...);
 # include "cmdparser.h"
 # include "cmddata.h"
 # define prnt PrintAndLog
-#else 
+#else
   uint8_t g_debugMode = 0;
 # define prnt Dbprintf
 #endif
@@ -99,11 +99,11 @@ void computeSignalProperties(uint8_t *samples, uint32_t size) {
 	// measure amplitude of signal
 	signalprop.mean = sum / size;
 	signalprop.amplitude = signalprop.high - signalprop.mean;
-	// By measuring mean and look at amplitude of signal from HIGH / LOW, 
+	// By measuring mean and look at amplitude of signal from HIGH / LOW,
 	// we can detect noise
 	signalprop.isnoise =  signalprop.amplitude < NOISE_AMPLITUDE_THRESHOLD;
 
-	if (g_debugMode) 
+	if (g_debugMode)
 		printSignal();
 }
 
@@ -136,17 +136,17 @@ void getHiLo(int *high, int *low, uint8_t fuzzHi, uint8_t fuzzLo) {
 		*low = (signalprop.low * fuzzLo) / 100;
 	} else {
 		uint8_t range = signalprop.high - signalprop.low;
-		
+
 		*low =  signalprop.low + ((range * (100-fuzzLo))/100);
 	}
-	
+
 	// if fuzzing to great and overlap
 	if ( *high < *low ) {
 		*high = signalprop.high;
 		*low =  signalprop.low;
 	}
-	
-	if (g_debugMode) 
+
+	if (g_debugMode)
 		prnt("getHiLo fuzzed: High %d | Low %d", *high, *low);
 }
 
@@ -159,7 +159,7 @@ bool parityTest(uint32_t bits, uint8_t bitLen, uint8_t pType) {
 
 //by marshmellow
 // takes a array of binary values, start position, length of bits per parity (includes parity bit - MAX 32),
-//   Parity Type (1 for odd; 0 for even; 2 for Always 1's; 3 for Always 0's), and binary Length (length to run) 
+//   Parity Type (1 for odd; 0 for even; 2 for Always 1's; 3 for Always 0's), and binary Length (length to run)
 size_t removeParity(uint8_t *bits, size_t startIdx, uint8_t pLen, uint8_t pType, size_t bLen) {
 	uint32_t parityWd = 0;
 	size_t bitCnt = 0;
@@ -201,7 +201,7 @@ size_t addParity(uint8_t *src, uint8_t *dest, uint8_t sourceLen, uint8_t pLen, u
 		switch (pType) {
 			case 3: dest[j++]=0; break; // marker bit which should be a 0
 			case 2: dest[j++]=1; break; // marker bit which should be a 1
-			default: 
+			default:
 				dest[j++] = parityTest(parityWd, pLen-1, pType) ^ 1;
 				break;
 		}
@@ -216,7 +216,7 @@ size_t addParity(uint8_t *src, uint8_t *dest, uint8_t sourceLen, uint8_t pLen, u
 // array must be size dividable with 8
 uint8_t bits_to_array(const uint8_t *bits, size_t size, uint8_t *dest) {
 	if ( (size == 0) || (size % 8) != 0) return 0;
-	
+
 	for(uint32_t i = 0; i < (size / 8); i++)
 		dest[i] = bytebits_to_byte((uint8_t *) bits + (i * 8), 8);
 
@@ -247,14 +247,14 @@ bool preambleSearch(uint8_t *bits, uint8_t *preamble, size_t pLen, size_t *size,
 	return preambleSearchEx(bits, preamble, pLen, size, startIdx, false);
 }
 //by marshmellow
-// search for given preamble in given BitStream and return success=1 or fail=0 and startIndex (where it was found) and length if not fineone 
+// search for given preamble in given BitStream and return success=1 or fail=0 and startIndex (where it was found) and length if not fineone
 // fineone does not look for a repeating preamble for em4x05/4x69 sends preamble once, so look for it once in the first pLen bits
 //(iceman) FINDONE,  only finds start index. NOT SIZE!.  I see Em410xDecode (lfdemod.c) uses SIZE to determine success
 bool preambleSearchEx(uint8_t *bits, uint8_t *preamble, size_t pLen, size_t *size, size_t *startIdx, bool findone)
 {
 	// Sanity check.  If preamble length is bigger than bits length.
 	if ( *size <= pLen ) return false;
-	
+
 	uint8_t foundCnt = 0;
 	for (size_t idx = 0; idx < *size - pLen; idx++) {
 		if (memcmp(bits+idx, preamble, pLen) == 0){
@@ -284,12 +284,12 @@ size_t findModStart(uint8_t *src, size_t size, uint8_t expWaveSize) {
 	for (; i < size-20; i++ ) {
 		if (src[i] < signalprop.mean && isAboveThreshold) {
 			thresholdCnt++;
-			if (thresholdCnt > 2 && waveSizeCnt < expWaveSize+1) break;			
+			if (thresholdCnt > 2 && waveSizeCnt < expWaveSize+1) break;
 			isAboveThreshold = false;
 			waveSizeCnt = 0;
 		} else if (src[i] >= signalprop.mean && !isAboveThreshold) {
 			thresholdCnt++;
-			if (thresholdCnt > 2 && waveSizeCnt < expWaveSize+1) break;			
+			if (thresholdCnt > 2 && waveSizeCnt < expWaveSize+1) break;
 			isAboveThreshold = true;
 			waveSizeCnt = 0;
 		} else {
@@ -326,13 +326,13 @@ void getNextHigh(uint8_t *samples, size_t size, int high, size_t *i) {
 bool loadWaveCounters(uint8_t *samples, size_t size, int lowToLowWaveLen[], int highToLowWaveLen[], int *waveCnt, int *skip, int *minClk, int *high, int *low) {
 	size_t i = 0, firstLow, firstHigh;
 	//size_t testsize = (size < 512) ? size : 512;
-	
+
 	// just noise - no super good detection. good enough
 	if (signalprop.isnoise) {
 		if (g_debugMode == 2) prnt("DEBUG STT: just noise detected - quitting");
 		return false;
 	}
-	
+
 	getHiLo(high, low, 80, 80);
 
 	// get to first full low to prime loop and skip incomplete first pulse
@@ -354,7 +354,7 @@ bool loadWaveCounters(uint8_t *samples, size_t size, int lowToLowWaveLen[], int
 			break;
 
 		highToLowWaveLen[*waveCnt] = i - firstHigh; //first high to first low
-		lowToLowWaveLen[*waveCnt] = i - firstLow;	
+		lowToLowWaveLen[*waveCnt] = i - firstLow;
 		*waveCnt += 1;
 		if (i-firstLow < *minClk && i < size) {
 			*minClk = i - firstLow;
@@ -399,7 +399,7 @@ void askAmp(uint8_t *bits, size_t size) {
 			last = 255;
 		else if ( bits[i-1] - bits[i] >= 20) //large jump down
 			last = 0;
-		
+
 		bits[i] = last;
 	}
 }
@@ -416,7 +416,7 @@ uint32_t manchesterEncode2Bytes(uint16_t datain) {
 }
 
 //by marshmellow
-//encode binary data into binary manchester 
+//encode binary data into binary manchester
 //NOTE: bitstream must have triple the size of "size" available in memory to do the swap
 int ManchesterEncode(uint8_t *bits, size_t size) {
 	//allow up to 4096b out (means bits must be at least 2048+4096 to handle the swap)
@@ -440,18 +440,18 @@ bool DetectCleanAskWave(uint8_t *dest, size_t size, uint8_t high, uint8_t low) {
 	bool allArePeaks = true;
 	uint16_t cntPeaks = 0;
 	size_t loopEnd = 512 + 160;
-	
+
 	// sanity check
 	if (loopEnd > size) loopEnd = size;
-	
+
 	for (size_t i = 160; i < loopEnd; i++){
-		
-		if (dest[i] > low && dest[i] < high) 
+
+		if (dest[i] > low && dest[i] < high)
 			allArePeaks = false;
 		else
 			cntPeaks++;
 	}
-	
+
 	if (!allArePeaks){
 		if (cntPeaks > 250) return true;
 	}
@@ -472,11 +472,11 @@ int DetectStrongAskClock(uint8_t *dest, size_t size, int high, int low, int *clo
 	size_t i = 100;
 	size_t minClk = 512;
 	int shortestWaveIdx = 0;
-	
+
 	// get to first full low to prime loop and skip incomplete first pulse
 	getNextHigh(dest, size, high, &i);
 	getNextLow(dest, size, low, &i);
-	
+
 	// loop through all samples (well, we don't want to go out-of-bounds)
 	while (i < size-512) {
 		// measure from low to low
@@ -491,14 +491,14 @@ int DetectStrongAskClock(uint8_t *dest, size_t size, int high, int low, int *clo
 			shortestWaveIdx = startwave;
 		}
 	}
-	
+
 	// set clock
 	if (g_debugMode == 2) prnt("DEBUG ASK: DetectStrongAskClock smallest wave: %d", minClk);
 	*clock = getClosestClock(minClk);
 
-	if (*clock == 0) 
+	if (*clock == 0)
 		return -1;
-	
+
 	return shortestWaveIdx;
 }
 
@@ -509,27 +509,27 @@ int DetectStrongAskClock(uint8_t *dest, size_t size, int high, int low, int *clo
 int DetectASKClock(uint8_t *dest, size_t size, int *clock, int maxErr) {
 
 	//don't need to loop through entire array. (cotag has clock of 384)
-	uint16_t loopCnt = 1500;  
+	uint16_t loopCnt = 1500;
 
 	// not enough samples
 	if (size <= loopCnt + 60){
 		if (g_debugMode == 2) prnt("DEBUG DetectASKClock: not enough samples - aborting");
-		return -1; 
+		return -1;
 	}
-	
+
 	// just noise - no super good detection. good enough
 	if (signalprop.isnoise) {
 		if (g_debugMode == 2) prnt("DEBUG DetectASKClock: just noise detected - aborting");
 		return -2;
 	}
-	
+
 	size_t i = 1;
 	uint16_t num_clks = 9;
 	// first 255 value pos0 is placeholder for user inputed clock.
 	uint16_t clk[] = {255, 8, 16, 32, 40, 50, 64, 100, 128, 255};
-	
+
 	// sometimes there is a strange end wave - filter out this
-	size -= 60; 
+	size -= 60;
 
 	// What is purpose?
 	// already have a valid clock?
@@ -543,28 +543,28 @@ int DetectASKClock(uint8_t *dest, size_t size, int *clock, int maxErr) {
 	// threshold 75% of high, low peak
 	int peak_hi, peak_low;
 	getHiLo(&peak_hi, &peak_low, 75, 75);
-	
+
 	// test for large clean, STRONG, CLIPPED peaks
-	
+
 	if (!found_clk) {
-		
+
 		if (DetectCleanAskWave(dest, size, peak_hi, peak_low)){
-		
+
 			int idx = DetectStrongAskClock(dest, size, peak_hi, peak_low, clock);
-			if (g_debugMode == 2) 
+			if (g_debugMode == 2)
 				prnt("DEBUG ASK: DetectASKClock Clean ASK Wave detected: clk %i, Best Starting Position: %i", *clock, idx);
-			
+
 			// return shortest wave start position
 			if (idx > -1)
 				return idx;
 		}
 	}
 	// test for weak peaks
-	
+
 	// test clock if given as cmd parameter
 	if ( *clock > 0 )
 		clk[0] = *clock;
-	
+
 	uint8_t clkCnt, tol = 0;
 	size_t j = 0;
 	uint16_t bestErr[] = {1000,1000,1000,1000,1000,1000,1000,1000,1000};
@@ -586,7 +586,7 @@ int DetectASKClock(uint8_t *dest, size_t size, int *clock, int maxErr) {
 			tol = 0;
 		}
 		//if no errors allowed - keep start within the first clock
-		if (!maxErr && size > clk[clkCnt]*2 + tol && clk[clkCnt] < 128) 
+		if (!maxErr && size > clk[clkCnt]*2 + tol && clk[clkCnt] < 128)
 			loopCnt = clk[clkCnt] * 2;
 
 		bestErr[clkCnt] = 1000;
@@ -596,7 +596,7 @@ int DetectASKClock(uint8_t *dest, size_t size, int *clock, int maxErr) {
 		// get to first full low to prime loop and skip incomplete first pulse
 		getNextHigh(dest, size, peak_hi, &j);
 		getNextLow(dest, size, peak_low, &j);
-	
+
 		for (; j < loopCnt; j++){
 			errCnt = 0;
 			// now that we have the first one lined up test rest of wave array
@@ -613,11 +613,11 @@ int DetectASKClock(uint8_t *dest, size_t size, int *clock, int maxErr) {
 			// if we found no errors then we can stop here and a low clock (common clocks)
 			//  this is correct one - return this clock
 			// if (g_debugMode == 2) prnt("DEBUG ASK: clk %d, err %d, startpos %d, endpos %d", clk[clkCnt], errCnt, j, i);
-			if (errCnt == 0 && clkCnt < 7) { 
-				if (!found_clk) 
+			if (errCnt == 0 && clkCnt < 7) {
+				if (!found_clk)
 					*clock = clk[clkCnt];
 				return j;
-			}	
+			}
 			// if we found errors see if it is lowest so far and save it as best run
 			if (errCnt < bestErr[clkCnt]) {
 				bestErr[clkCnt] = errCnt;
@@ -625,9 +625,9 @@ int DetectASKClock(uint8_t *dest, size_t size, int *clock, int maxErr) {
 			}
 		}
 	}
-	
+
 	uint8_t k, best = 0;
-	
+
 	for (k=1; k < num_clks; ++k){
 		if (bestErr[k] < bestErr[best]){
 			if (bestErr[k] == 0) bestErr[k] = 1;
@@ -638,10 +638,10 @@ int DetectASKClock(uint8_t *dest, size_t size, int *clock, int maxErr) {
 		}
 		//if (g_debugMode == 2) prnt("DEBUG ASK: clk %d, # Errors %d, Current Best Clk %d, bestStart %d", clk[k], bestErr[k], clk[best], bestStart[best]);
 	}
-	
-	if (!found_clk) 
+
+	if (!found_clk)
 		*clock = clk[best];
-	
+
 	return bestStart[best];
 }
 
@@ -669,16 +669,16 @@ int DetectStrongNRZClk(uint8_t *dest, size_t size, int peak, int low, bool *stro
 	for (;i < size; i++) {
 		if ((dest[i] >= peak && !lastWasHigh) || (dest[i] <= low && lastWasHigh)) {
 			lastWasHigh = (dest[i] >= peak);
-			if (i-transition1 < lowestTransition) 
+			if (i-transition1 < lowestTransition)
 				lowestTransition = i-transition1;
 			transition1 = i;
 		} else if (dest[i] < peak && dest[i] > low) {
 			transitionSampleCount++;
 		}
 	}
-	if (lowestTransition == 255) 
+	if (lowestTransition == 255)
 		lowestTransition = 0;
-	
+
 	if (g_debugMode == 2) prnt("DEBUG NRZ: detectstrongNRZclk smallest wave: %d", lowestTransition);
 	// if less than 10% of the samples were not peaks (or 90% were peaks) then we have a strong wave
 	if (transitionSampleCount / size < 10) {
@@ -698,23 +698,23 @@ int DetectNRZClock(uint8_t *dest, size_t size, int clock, size_t *clockStartIdx)
 	//if we already have a valid clock quit
 	for (; i < 8; ++i)
 		if (clk[i] == clock) return clock;
-	
+
 	if (size < 20) return 0;
 	// size must be larger than 20 here
 	if (size < loopCnt) loopCnt = size-20;
 
-	
+
 	// just noise - no super good detection. good enough
 	if (signalprop.isnoise) {
 		if (g_debugMode == 2) prnt("DEBUG DetectNZRClock: just noise detected - quitting");
 		return 0;
 	}
-	
+
 	//get high and low peak
 	int peak, low;
 	//getHiLo(dest, loopCnt, &peak, &low, 90, 90);
 	getHiLo(&peak, &low, 90, 90);
-	
+
 	bool strong = false;
 	int lowestTransition = DetectStrongNRZClk(dest, size-20, peak, low, &strong);
 	if (strong) return lowestTransition;
@@ -742,10 +742,10 @@ int DetectNRZClock(uint8_t *dest, size_t size, int clock, size_t *clockStartIdx)
 		}
 	}
 	if (minPeak < 8) return 0;
-	
+
 	bool errBitHigh = 0, bitHigh = 0, lastPeakHigh = 0;
 	uint8_t ignoreCnt = 0, ignoreWindow = 4;
-	int lastBit = 0; 
+	int lastBit = 0;
 	size_t bestStart[] = {0,0,0,0,0,0,0,0,0};
 	peakcnt = 0;
 	//test each valid clock from smallest to greatest to see which lines up
@@ -758,7 +758,7 @@ int DetectNRZClock(uint8_t *dest, size_t size, int clock, size_t *clockStartIdx)
 				peakcnt=0;
 				bitHigh = false;
 				ignoreCnt = 0;
-				lastBit = ii-clk[clkCnt]; 
+				lastBit = ii-clk[clkCnt];
 				//loop through to see if this start location works
 				for (i = ii; i < size-20; ++i) {
 					//if we are at a clock bit
@@ -781,7 +781,7 @@ int DetectNRZClock(uint8_t *dest, size_t size, int clock, size_t *clockStartIdx)
 					} else if (dest[i] < peak && dest[i] > low){
 						if (ignoreCnt == 0){
 							bitHigh = false;
-							if (errBitHigh == true) 
+							if (errBitHigh == true)
 								peakcnt--;
 							errBitHigh = false;
 						} else {
@@ -841,7 +841,7 @@ uint16_t countFC(uint8_t *bits, size_t size, bool fskAdj) {
 			if (fskAdj){
 				//if we had 5 and now have 9 then go back to 8 (for when we get a fc 9 instead of an 8)
 				if (lastFCcnt == 5 && fcCounter == 9) fcCounter--;
-				
+
 				//if fc=9 or 4 add one (for when we get a fc 9 instead of 10 or a 4 instead of a 5)
 				if ((fcCounter == 9) || fcCounter == 4) fcCounter++;
 				// save last field clock count  (fc/xx)
@@ -856,7 +856,7 @@ uint16_t countFC(uint8_t *bits, size_t size, bool fskAdj) {
 				}
 			}
 			if (fcCounter>0 && fcLensFnd<15){
-				//add new fc length 
+				//add new fc length
 				fcCnts[fcLensFnd]++;
 				fcLens[fcLensFnd++] = fcCounter;
 			}
@@ -866,10 +866,10 @@ uint16_t countFC(uint8_t *bits, size_t size, bool fskAdj) {
 			fcCounter++;
 		}
 	}
-	
+
 	uint8_t best1 = 14, best2 = 14, best3 = 14;
 	uint16_t maxCnt1 = 0;
-	// go through fclens and find which ones are bigest 2  
+	// go through fclens and find which ones are bigest 2
 	for (i=0; i<15; i++){
 		// get the 3 best FC values
 		if (fcCnts[i] > maxCnt1) {
@@ -886,7 +886,7 @@ uint16_t countFC(uint8_t *bits, size_t size, bool fskAdj) {
 		if (g_debugMode == 2) prnt("DEBUG countfc: FC %u, Cnt %u, best fc: %u, best2 fc: %u", fcLens[i], fcCnts[i], fcLens[best1], fcLens[best2]);
 		if (fcLens[i] == 0) break;
 	}
-	
+
 	if (fcLens[best1] == 0) return 0;
 	uint8_t fcH = 0, fcL = 0;
 	if (fcLens[best1] > fcLens[best2]){
@@ -903,7 +903,7 @@ uint16_t countFC(uint8_t *bits, size_t size, bool fskAdj) {
 	// TODO: take top 3 answers and compare to known Field clocks to get top 2
 
 	uint16_t fcs = (((uint16_t)fcH)<<8) | fcL;
-	if (fskAdj) return fcs;	
+	if (fskAdj) return fcs;
 	return (uint16_t)fcLens[best2] << 8 | fcLens[best1];
 }
 
@@ -921,16 +921,16 @@ int DetectPSKClock(uint8_t *dest, size_t size, int clock, size_t *firstPhaseShif
 
 	if (size < 160+20) return 0;
 	// size must be larger than 20 here, and 160 later on.
-	if (size < loopCnt) loopCnt = size-20;	
+	if (size < loopCnt) loopCnt = size-20;
 
 	uint16_t fcs = countFC(dest, size, 0);
-	
+
 	*fc = fcs & 0xFF;
-	
+
 	if (g_debugMode == 2) prnt("DEBUG PSK: FC: %d, FC2: %d",*fc, fcs>>8);
-	
+
 	if ((fcs >> 8) == 10 && *fc == 8) return 0;
-	
+
 	if (*fc != 2 && *fc != 4 && *fc != 8) return 0;
 
 
@@ -941,7 +941,7 @@ int DetectPSKClock(uint8_t *dest, size_t size, int clock, size_t *firstPhaseShif
 	uint16_t bestErr[] = {1000,1000,1000,1000,1000,1000,1000,1000,1000};
 	uint16_t peaksdet[] = {0,0,0,0,0,0,0,0,0};
 
-	//find start of modulating data in trace 
+	//find start of modulating data in trace
 	i = findModStart(dest, size, *fc);
 
 	firstFullWave = pskFindFirstPhaseShift(dest, size, curPhase, i, *fc, &fullWaveLen);
@@ -954,7 +954,7 @@ int DetectPSKClock(uint8_t *dest, size_t size, int clock, size_t *firstPhaseShif
 
 	*firstPhaseShift = firstFullWave;
 	if (g_debugMode == 2) prnt("DEBUG PSK: firstFullWave: %d, waveLen: %d",firstFullWave,fullWaveLen);
-	
+
 	//test each valid clock from greatest to smallest to see which lines up
 	for (clkCnt=7; clkCnt >= 1 ; clkCnt--){
 		tol = *fc/2;
@@ -965,7 +965,7 @@ int DetectPSKClock(uint8_t *dest, size_t size, int clock, size_t *firstPhaseShif
 		if (g_debugMode == 2) prnt("DEBUG PSK: clk: %d, lastClkBit: %d", clk[clkCnt], lastClkBit);
 
 		for (i = firstFullWave+fullWaveLen-1; i < loopCnt-2; i++){
-			//top edge of wave = start of new wave 
+			//top edge of wave = start of new wave
 			if (dest[i] < dest[i+1] && dest[i+1] >= dest[i+2]){
 				if (waveStart == 0) {
 					waveStart = i+1;
@@ -973,7 +973,7 @@ int DetectPSKClock(uint8_t *dest, size_t size, int clock, size_t *firstPhaseShif
 				} else { //waveEnd
 					waveEnd = i+1;
 					waveLenCnt = waveEnd-waveStart;
-					if (waveLenCnt > *fc){ 
+					if (waveLenCnt > *fc){
 						//if this wave is a phase shift
 						if (g_debugMode == 2) prnt("DEBUG PSK: phase shift at: %d, len: %d, nextClk: %d, i: %d, fc: %d", waveStart, waveLenCnt, lastClkBit + clk[clkCnt] - tol, i+1, *fc);
 						if (i+1 >= lastClkBit + clk[clkCnt] - tol){ //should be a clock bit
@@ -994,8 +994,8 @@ int DetectPSKClock(uint8_t *dest, size_t size, int clock, size_t *firstPhaseShif
 		if (errCnt == 0) return clk[clkCnt];
 		if (errCnt <= bestErr[clkCnt]) bestErr[clkCnt] = errCnt;
 		if (peakcnt > peaksdet[clkCnt]) peaksdet[clkCnt] = peakcnt;
-	} 
-	//all tested with errors 
+	}
+	//all tested with errors
 	//return the highest clk with the most peaks found
 	uint8_t best = 7;
 	for (i=7; i >= 1; i--){
@@ -1011,9 +1011,9 @@ int DetectPSKClock(uint8_t *dest, size_t size, int clock, size_t *firstPhaseShif
 //detects the bit clock for FSK given the high and low Field Clocks
 uint8_t detectFSKClk(uint8_t *bits, size_t size, uint8_t fcHigh, uint8_t fcLow, int *firstClockEdge) {
 
-	if (size == 0) 
+	if (size == 0)
 		return 0;
-	
+
 	uint8_t clk[] = {8,16,32,40,50,64,100,128,0};
 	uint16_t rfLens[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
 	uint8_t rfCnts[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
@@ -1034,14 +1034,14 @@ uint8_t detectFSKClk(uint8_t *bits, size_t size, uint8_t fcHigh, uint8_t fcLow,
 		fcCounter++;
 		rfCounter++;
 
-		if (bits[i] <= bits[i-1] || bits[i] < bits[i+1]) 
-			continue;		
-		// else new peak 
+		if (bits[i] <= bits[i-1] || bits[i] < bits[i+1])
+			continue;
+		// else new peak
 		// if we got less than the small fc + tolerance then set it to the small fc
 		// if it is inbetween set it to the last counter
 		if (fcCounter < fcHigh && fcCounter > fcLow)
 			fcCounter = lastFCcnt;
-		else if (fcCounter < fcLow+fcTol) 
+		else if (fcCounter < fcLow+fcTol)
 			fcCounter = fcLow;
 		else //set it to the large fc
 			fcCounter = fcHigh;
@@ -1085,14 +1085,14 @@ uint8_t detectFSKClk(uint8_t *bits, size_t size, uint8_t fcHigh, uint8_t fcLow,
 		} else if(rfCnts[i] > rfCnts[rfHighest3]){
 			rfHighest3 = i;
 		}
-		if (g_debugMode == 2) 
+		if (g_debugMode == 2)
 			prnt("DEBUG FSK: RF %d, cnts %d", rfLens[i], rfCnts[i]);
-	}  
-	// set allowed clock remainder tolerance to be 1 large field clock length+1 
-	//   we could have mistakenly made a 9 a 10 instead of an 8 or visa versa so rfLens could be 1 FC off  
-	uint8_t tol1 = fcHigh+1; 
-	
-	if (g_debugMode == 2) 
+	}
+	// set allowed clock remainder tolerance to be 1 large field clock length+1
+	//   we could have mistakenly made a 9 a 10 instead of an 8 or visa versa so rfLens could be 1 FC off
+	uint8_t tol1 = fcHigh+1;
+
+	if (g_debugMode == 2)
 		prnt("DEBUG FSK: most counted rf values: 1 %d, 2 %d, 3 %d", rfLens[rfHighest], rfLens[rfHighest2], rfLens[rfHighest3]);
 
 	// loop to find the highest clock that has a remainder less than the tolerance
@@ -1103,7 +1103,7 @@ uint8_t detectFSKClk(uint8_t *bits, size_t size, uint8_t fcHigh, uint8_t fcLow,
 		if (rfLens[rfHighest] % clk[m] < tol1 || rfLens[rfHighest] % clk[m] > clk[m]-tol1){
 			if (rfLens[rfHighest2] % clk[m] < tol1 || rfLens[rfHighest2] % clk[m] > clk[m]-tol1){
 				if (rfLens[rfHighest3] % clk[m] < tol1 || rfLens[rfHighest3] % clk[m] > clk[m]-tol1){
-					if (g_debugMode == 2) 
+					if (g_debugMode == 2)
 						prnt("DEBUG FSK: clk %d divides into the 3 most rf values within tolerance", clk[m]);
 					break;
 				}
@@ -1146,7 +1146,7 @@ bool findST(int *stStopLoc, int *stStartIdx, int lowToLowWaveLen[], int highToLo
 bool DetectST(uint8_t *buffer, size_t *size, int *foundclock, size_t *ststart, size_t *stend) {
 	size_t bufsize = *size;
 	//need to loop through all samples and identify our clock, look for the ST pattern
-	int clk = 0; 
+	int clk = 0;
 	int tol = 0;
 	int j=0, high, low, skip=0, start=0, end=0, minClk=255;
 	size_t i = 0;
@@ -1181,7 +1181,7 @@ bool DetectST(uint8_t *buffer, size_t *size, int *foundclock, size_t *ststart, s
 		phaseoff = 0;
 	else
 		phaseoff = clk/2;
-	
+
 	// skip over the remainder of ST
 	skip += clk*7/2; //3.5 clocks from tmpbuff[i] = end of st - also aligns for ending point
 
@@ -1212,12 +1212,12 @@ bool DetectST(uint8_t *buffer, size_t *size, int *foundclock, size_t *ststart, s
 	}
 	// if datalen is less than one t55xx block - ERROR
 	if (datalen/clk < 8*4) {
-		if (g_debugMode == 2) prnt("DEBUG STT: datalen is less than 1 full t55xx block - quitting");		
+		if (g_debugMode == 2) prnt("DEBUG STT: datalen is less than 1 full t55xx block - quitting");
 		return false;
 	}
 	size_t dataloc = start;
 	if (buffer[dataloc-(clk*4)-(clk/4)] <= low && buffer[dataloc] <= low && buffer[dataloc-(clk*4)] >= high) {
-		//we have low drift (and a low just before the ST and a low just after the ST) - compensate by backing up the start 
+		//we have low drift (and a low just before the ST and a low just after the ST) - compensate by backing up the start
 		for ( i=0; i <= (clk/4); ++i ) {
 			if ( buffer[dataloc - (clk*4) - i] <= low ) {
 				dataloc -= i;
@@ -1225,10 +1225,10 @@ bool DetectST(uint8_t *buffer, size_t *size, int *foundclock, size_t *ststart, s
 			}
 		}
 	}
-	
+
 	size_t newloc = 0;
 	i=0;
-	if (g_debugMode == 2) prnt("DEBUG STT: Starting STT trim - start: %d, datalen: %d ",dataloc, datalen);		
+	if (g_debugMode == 2) prnt("DEBUG STT: Starting STT trim - start: %d, datalen: %d ",dataloc, datalen);
 	bool firstrun = true;
 	// warning - overwriting buffer given with raw wave data with ST removed...
 	while ( dataloc < bufsize-(clk/2) ) {
@@ -1253,7 +1253,7 @@ bool DetectST(uint8_t *buffer, size_t *size, int *foundclock, size_t *ststart, s
 				if (i+newloc < dataloc)
 					buffer[i+newloc] = buffer[dataloc];
 
-				dataloc++;				
+				dataloc++;
 			}
 		}
 		newloc += i;
@@ -1266,17 +1266,17 @@ bool DetectST(uint8_t *buffer, size_t *size, int *foundclock, size_t *ststart, s
 }
 
 //by marshmellow
-//take 11 10 01 11 00 and make 01100 ... miller decoding 
+//take 11 10 01 11 00 and make 01100 ... miller decoding
 //check for phase errors - should never have half a 1 or 0 by itself and should never exceed 1111 or 0000 in a row
 //decodes miller encoded binary
 //NOTE  askrawdemod will NOT demod miller encoded ask unless the clock is manually set to 1/2 what it is detected as!
 int millerRawDecode(uint8_t *bits, size_t *size, int invert) {
 	if (*size < 16) return -1;
-	
+
 	uint16_t MaxBits = 512, errCnt = 0;
 	size_t i, bitCnt = 0;
 	uint8_t alignCnt = 0, curBit = bits[0], alignedIdx = 0, halfClkErr = 0;
-	
+
 	//find alignment, needs 4 1s or 0s to properly align
 	for (i=1; i < *size-1; i++) {
 		alignCnt = (bits[i] == curBit) ? alignCnt+1 : 0;
@@ -1311,7 +1311,7 @@ int millerRawDecode(uint8_t *bits, size_t *size, int invert) {
 int BiphaseRawDecode(uint8_t *bits, size_t *size, int *offset, int invert) {
 	//sanity check
 	if (*size < 51) return -1;
-	
+
 	uint16_t bitnum = 0;
 	uint16_t errCnt = 0;
 	size_t i = *offset;
@@ -1324,7 +1324,7 @@ int BiphaseRawDecode(uint8_t *bits, size_t *size, int *offset, int invert) {
 		if (bits[i+2] == bits[i+3]) offsetB = false;
 	}
 	if (!offsetA && offsetB) ++*offset;
-	
+
 	for (i = *offset; i < *size-3; i += 2){
 		//check for phase error
 		if (bits[i+1] == bits[i+2]) {
@@ -1352,7 +1352,7 @@ int manrawdecode(uint8_t *bits, size_t *size, uint8_t invert, uint8_t *alignPos)
 
 	// sanity check
 	if (*size < 16) return -1;
-	
+
 	int errCnt = 0, bestErr = 1000;
 	uint16_t bitnum = 0, maxBits = 512, bestRun = 0;
 	size_t i, k;
@@ -1394,7 +1394,7 @@ int cleanAskRawDemod(uint8_t *bits, size_t *size, int clk, int invert, int high,
 	uint8_t cl_4 = clk / 4;
 	uint8_t cl_2 = clk / 2;
 	bool waveHigh = true;
-	
+
 	getNextHigh(bits, *size, high, &pos);
 
 	// sample counts,   like clock = 32.. it tries to find  32/4 = 8,  32/2 = 16
@@ -1409,7 +1409,7 @@ int cleanAskRawDemod(uint8_t *bits, size_t *size, int clk, int invert, int high,
 				// 32-8-1 = 23
 				// 32+8+1 = 41
 				if (smplCnt > clk - cl_4 - 1) { //full clock
-				
+
 					if (smplCnt > clk + cl_4 + 1) { //too many samples
 						errCnt++;
 						if (g_debugMode == 2) prnt("DEBUG ASK: cleanAskRawDemod ASK Modulation Error FULL at: %u  [%u]", i, smplCnt);
@@ -1423,18 +1423,18 @@ int cleanAskRawDemod(uint8_t *bits, size_t *size, int clk, int invert, int high,
 					}
 					if (*startIdx == 0)
 						*startIdx = i - clk;
-					waveHigh = !waveHigh;  
+					waveHigh = !waveHigh;
 					smplCnt = 0;
-					
+
 				// 16-8-1 = 7
 				} else if (smplCnt > cl_2 - cl_4 - 1) { //half clock
-				
+
 					if (smplCnt > cl_2 + cl_4 + 1) { //too many samples
 						errCnt++;
 						if (g_debugMode == 2) prnt("DEBUG ASK: cleanAskRawDemod ASK Modulation Error HALF at: %u  [%u]", i, smplCnt);
 						bits[bitCnt++] = 7;
 					}
-				
+
 					if (waveHigh) {
 						bits[bitCnt++] = invert;
 					} else if (!waveHigh) {
@@ -1442,7 +1442,7 @@ int cleanAskRawDemod(uint8_t *bits, size_t *size, int clk, int invert, int high,
 					}
 					if (*startIdx == 0)
 						*startIdx = i - cl_2;
-					waveHigh = !waveHigh;  
+					waveHigh = !waveHigh;
 					smplCnt = 0;
 				} else {
 					smplCnt++;
@@ -1460,59 +1460,59 @@ int cleanAskRawDemod(uint8_t *bits, size_t *size, int clk, int invert, int high,
 //by marshmellow
 //attempts to demodulate ask modulations, askType == 0 for ask/raw, askType==1 for ask/manchester
 int askdemod_ext(uint8_t *bits, size_t *size, int *clk, int *invert, int maxErr, uint8_t amp, uint8_t askType, int *startIdx) {
-	
+
 	if (*size == 0) return -1;
-	
+
 	int start = DetectASKClock(bits, *size, clk, maxErr);
 	if (*clk == 0 || start < 0) return -3;
-	
+
 	if (*invert != 1) *invert = 0;
-	
+
 	// amplify signal data.
-	// ICEMAN todo,  
+	// ICEMAN todo,
 	if (amp == 1) askAmp(bits, *size);
-	
+
 	if (g_debugMode == 2) prnt("DEBUG ASK: clk %d, beststart %d, amp %d", *clk, start, amp);
-		
+
 	//start pos from detect ask clock is 1/2 clock offset
 	// NOTE: can be negative (demod assumes rest of wave was there)
-	*startIdx = start - (*clk/2); 
+	*startIdx = start - (*clk/2);
 	uint16_t initLoopMax = 1024;
 	if (initLoopMax > *size) initLoopMax = *size;
-	
+
 	// just noise - no super good detection. good enough
 	if (signalprop.isnoise) {
 		if (g_debugMode == 2) prnt("DEBUG askdemod_ext: just noise detected - aborting");
 		return -2;
 	}
-	
+
 	// Detect high and lows
 	//25% clip in case highs and lows aren't clipped [marshmellow]
 	int high, low;
 	//getHiLo(bits, initLoopMax, &high, &low, 75, 75);
 	getHiLo(&high, &low, 75, 75);
-	
+
 	size_t errCnt = 0;
 	// if clean clipped waves detected run alternate demod
 	if (DetectCleanAskWave(bits, *size, high, low)) {
 
 		if (g_debugMode == 2) prnt("DEBUG ASK: Clean Wave Detected - using clean wave demod");
-		
+
 		errCnt = cleanAskRawDemod(bits, size, *clk, *invert, high, low, startIdx);
 
 		if (askType) { //ask/manchester
 			uint8_t alignPos = 0;
 			errCnt = manrawdecode(bits, size, 0, &alignPos);
 			*startIdx += *clk/2 * alignPos;
-			
-			if (g_debugMode) 
+
+			if (g_debugMode)
 				prnt("DEBUG: (askdemod_ext) CLEAN: startIdx %i, alignPos %u", *startIdx, alignPos);
-		} 
+		}
 		return errCnt;
 	}
-	
+
 	if (g_debugMode) prnt("DEBUG: (askdemod_ext) Weak wave detected: startIdx %i", *startIdx);
-	
+
 	int lastBit;  //set first clock check - can go negative
 	size_t i, bitnum = 0;     //output counter
 	uint8_t midBit = 0;
@@ -1532,7 +1532,7 @@ int askdemod_ext(uint8_t *bits, size_t *size, int *clk, int *invert, int maxErr,
 					if (g_debugMode == 2) prnt("DEBUG: (askdemod_ext) Modulation Error at: %u", i);
 					bits[bitnum++] = 7;
 					errCnt++;
-				} 
+				}
 			} else { //in tolerance - looking for peak
 				continue;
 			}
@@ -1566,22 +1566,22 @@ int askdemod(uint8_t *bits, size_t *size, int *clk, int *invert, int maxErr, uin
 // peaks invert bit (high=1 low=0) each clock cycle = 1 bit determined by last peak
 int nrzRawDemod(uint8_t *dest, size_t *size, int *clk, int *invert, int *startIdx) {
 	if (signalprop.isnoise) return -1;
-	
+
 	size_t clkStartIdx = 0;
 	*clk = DetectNRZClock(dest, *size, *clk, &clkStartIdx);
 	if (*clk == 0) return -2;
-	
+
 	size_t i, gLen = 4096;
-	if (gLen > *size) 
+	if (gLen > *size)
 		gLen = *size-20;
-	
-	
+
+
 	// just noise - no super good detection. good enough
 	if (signalprop.isnoise) {
 		if (g_debugMode == 2) prnt("DEBUG nrzRawDemod: just noise detected - quitting");
 		return -3;
 	}
-	
+
 	int high, low;
 	//getHiLo(dest, gLen, &high, &low, 75, 75);
 	getHiLo(&high, &low, 75, 75);
@@ -1594,7 +1594,7 @@ int nrzRawDemod(uint8_t *dest, size_t *size, int *clk, int *invert, int *startId
 		if (dest[i] <= low)  bit = 0;
 		dest[i] = bit;
 	}
-	//now demod based on clock (rf/32 = 32 1's for one 1 bit, 32 0's for one 0 bit) 
+	//now demod based on clock (rf/32 = 32 1's for one 1 bit, 32 0's for one 0 bit)
 	size_t lastBit = 0;
 	size_t numBits = 0;
 	for(i=21; i < *size-20; i++) {
@@ -1615,9 +1615,9 @@ int nrzRawDemod(uint8_t *dest, size_t *size, int *clk, int *invert, int *startId
 
 //translate wave to 11111100000 (1 for each short wave [higher freq] 0 for each long wave [lower freq])
 size_t fsk_wave_demod(uint8_t *dest, size_t size, uint8_t fchigh, uint8_t fclow, int *startIdx) {
-	
+
 	if ( size < 1024 ) return 0; // not enough samples
-	
+
 	if (fchigh == 0) fchigh = 10;
 	if (fclow == 0) fclow = 8;
 
@@ -1629,24 +1629,24 @@ size_t fsk_wave_demod(uint8_t *dest, size_t size, uint8_t fchigh, uint8_t fclow,
 	size_t idx = 1;
 	size_t numBits = 0;
 
-	//find start of modulating data in trace 	
+	//find start of modulating data in trace
 	idx = findModStart(dest, size, fchigh);
 	// Need to threshold first sample
 	dest[idx] = (dest[idx] < signalprop.mean) ? 0 : 1;
-	
+
 	last_transition = idx;
 	idx++;
-	
+
 	// Definition:  cycles between consecutive lo-hi transitions
 	// Lets define some expected lengths. FSK1 is easier since it has bigger differences between.
-	// FSK1 8/5 
+	// FSK1 8/5
 	// 50/8 = 6		| 40/8 = 5  | 64/8 = 8
 	// 50/5 = 10	| 40/5 = 8	| 64/5 = 12
 
 	// FSK2 10/8
 	// 50/10 = 5	| 40/10 = 4 | 64/10 = 6
 	// 50/8  = 6	| 40/8  = 5 | 64/8  = 8
-	
+
 	// count cycles between consecutive lo-hi transitions,
 	// in practice due to noise etc we may end up with anywhere
 	// To allow fuzz would mean  +-1 on expected cycle width.
@@ -1661,14 +1661,14 @@ size_t fsk_wave_demod(uint8_t *dest, size_t size, uint8_t fchigh, uint8_t fclow,
 	// It easy to see to the overgaping, but luckily we the group value also,  like 1111000001111
 	// to separate between which bit to demodulate to.
 
-	// process: 
-	// count width from 0-1 transition to  1-0.  
+	// process:
+	// count width from 0-1 transition to  1-0.
 	// determine the width is withing FUZZ_min and FUZZ_max tolerances
-	// width should be divided with exp_one.  i:e 6+7+6+2=21,  21/5 = 4, 
-	// the 1-0 to 0-1  width should be divided with exp_zero.   Ie: 3+5+6+7 = 21/6 = 3	
-	
+	// width should be divided with exp_one.  i:e 6+7+6+2=21,  21/5 = 4,
+	// the 1-0 to 0-1  width should be divided with exp_zero.   Ie: 3+5+6+7 = 21/6 = 3
+
 	for(; idx < size-20; idx++) {
-		
+
 		// threshold current value
 		dest[idx] = (dest[idx] < signalprop.mean) ? 0 : 1;
 
@@ -1685,14 +1685,14 @@ size_t fsk_wave_demod(uint8_t *dest, size_t size, uint8_t fchigh, uint8_t fclow,
 					dest[numBits-1]=1;
 				}
 				dest[numBits++]=1;
-				
-				
+
+
 				if (numBits > 0 && *startIdx == 0)
 					*startIdx = idx - fclow;
-				
+
 			} else if (currSample > (fchigh+1) && numBits < 3) { //12 + and first two bit = unusable garbage
 				//do nothing with beginning garbage and reset..  should be rare..
-				numBits = 0; 
+				numBits = 0;
 			} else if (currSample == (fclow+1) && LastSample == (fclow-1)) { // had a 7 then a 9 should be two 8's (or 4 then a 6 should be two 5's)
 				dest[numBits++]=1;
 				if (numBits > 0 && *startIdx == 0) {
@@ -1719,21 +1719,21 @@ size_t aggregate_bits(uint8_t *dest, size_t size, uint8_t clk, uint8_t invert, u
 	size_t numBits = 0;
 	uint32_t n = 1;
 	uint8_t hclk = clk/2;
-	
+
 	for( i = 1; i < size; i++) {
 		n++;
 		if (dest[i] == lastval) continue; //skip until we hit a transition
-		
+
 		//find out how many bits (n) we collected (use 1/2 clk tolerance)
-		
+
 		if (dest[i-1] == 1)
 		//if lastval was 1, we have a 1->0 crossing
 			n = (n * fclow + hclk) / clk;
-		else 
-			// 0->1 crossing 
-			n = (n * fchigh + hclk) / clk; 
+		else
+			// 0->1 crossing
+			n = (n * fchigh + hclk) / clk;
 
-		if (n == 0) 
+		if (n == 0)
 			n = 1;
 
 		//first transition - save startidx
@@ -1747,7 +1747,7 @@ size_t aggregate_bits(uint8_t *dest, size_t size, uint8_t clk, uint8_t invert, u
 			}
 		}
 
-		//add to our destination the bits we collected		
+		//add to our destination the bits we collected
 		memset(dest+numBits, dest[i-1] ^ invert , n);
 
 		numBits += n;
@@ -1755,7 +1755,7 @@ size_t aggregate_bits(uint8_t *dest, size_t size, uint8_t clk, uint8_t invert, u
 		lastval = dest[i];
 
 	}//end for
-	
+
 	// if valid extra bits at the end were all the same frequency - add them in
 	if (n > clk/fchigh) {
 		if (dest[i-2] == 1) {
@@ -1786,9 +1786,9 @@ size_t fskdemod(uint8_t *dest, size_t size, uint8_t rfLen, uint8_t invert, uint8
 void psk1TOpsk2(uint8_t *bits, size_t size) {
 	uint8_t lastbit = bits[0];
 	for (size_t i = 1; i < size; i++){
-		//ignore errors		
+		//ignore errors
 		if (bits[i] == 7) continue;
-			
+
 		if (lastbit != bits[i]){
 			lastbit = bits[i];
 			bits[i] = 1;
@@ -1811,11 +1811,11 @@ void psk2TOpsk1(uint8_t *bits, size_t size) {
 	}
 }
 
-//by marshmellow - demodulate PSK1 wave 
-//uses wave lengths (# Samples) 
+//by marshmellow - demodulate PSK1 wave
+//uses wave lengths (# Samples)
 //TODO: Iceman - hard coded value 7,  should be #define
 int pskRawDemod_ext(uint8_t *dest, size_t *size, int *clock, int *invert, int *startIdx) {
-	
+
 	// sanity check
 	if (*size < 170) return -1;
 
@@ -1830,7 +1830,7 @@ int pskRawDemod_ext(uint8_t *dest, size_t *size, int *clock, int *invert, int *s
 	//if clock detect found firstfullwave...
 	uint16_t tol = fc/2;
 	if (firstFullWave == 0) {
-		//find start of modulating data in trace 
+		//find start of modulating data in trace
 		i = findModStart(dest, *size, fc);
 		//find first phase shift
 		firstFullWave = pskFindFirstPhaseShift(dest, *size, &curPhase, i, fc, &fullWaveLen);
@@ -1855,7 +1855,7 @@ int pskRawDemod_ext(uint8_t *dest, size_t *size, int *clock, int *invert, int *s
 	waveStart = 0;
 	dest[numBits++] = curPhase; //set first read bit
 	for (i = firstFullWave + fullWaveLen - 1; i < *size-3; i++){
-		//top edge of wave = start of new wave 
+		//top edge of wave = start of new wave
 		if (dest[i]+fc < dest[i+1] && dest[i+1] >= dest[i+2]){
 			if (waveStart == 0) {
 				waveStart = i+1;
@@ -1864,7 +1864,7 @@ int pskRawDemod_ext(uint8_t *dest, size_t *size, int *clock, int *invert, int *s
 			} else { //waveEnd
 				waveEnd = i+1;
 				waveLenCnt = waveEnd-waveStart;
-				if (waveLenCnt > fc){  
+				if (waveLenCnt > fc){
 					//this wave is a phase shift
 					//prnt("DEBUG: phase shift at: %d, len: %d, nextClk: %d, i: %d, fc: %d",waveStart,waveLenCnt,lastClkBit+*clock-tol,i+1,fc);
 					if (i+1 >= lastClkBit + *clock - tol){ //should be a clock bit
@@ -1925,10 +1925,10 @@ int detectAWID(uint8_t *dest, size_t *size, int *waveStartIdx) {
 	uint8_t preamble[] = {0,0,0,0,0,0,0,1};
 	if (!preambleSearch(dest, preamble, sizeof(preamble), size, &start_idx))
 		return -4; //preamble not found
-	
+
 	// wrong size?  (between to preambles)
 	if (*size != 96) return -5;
-	
+
 	return (int)start_idx;
 }
 
@@ -1936,12 +1936,12 @@ int detectAWID(uint8_t *dest, size_t *size, int *waveStartIdx) {
 //takes 1s and 0s and searches for EM410x format - output EM ID
 int Em410xDecode(uint8_t *bits, size_t *size, size_t *start_idx, uint32_t *hi, uint64_t *lo) {
 	// sanity check
-	if (bits[1] > 1) return -1; 
-	if (*size < 64) return -2;	
+	if (bits[1] > 1) return -1;
+	if (*size < 64) return -2;
 
 	uint8_t fmtlen;
 	*start_idx = 0;
-	
+
 	// preamble 0111111111
 	// include 0 in front to help get start pos
 	uint8_t preamble[] = {0,1,1,1,1,1,1,1,1,1};
@@ -1952,22 +1952,22 @@ int Em410xDecode(uint8_t *bits, size_t *size, size_t *start_idx, uint32_t *hi, u
 	fmtlen = (*size == 128) ? 22 : 10;
 
 	//skip last 4bit parity row for simplicity
-	*size = removeParity(bits, *start_idx + sizeof(preamble), 5, 0, fmtlen * 5);  
-	
+	*size = removeParity(bits, *start_idx + sizeof(preamble), 5, 0, fmtlen * 5);
+
 	switch (*size) {
-	   case 40: { 
+	   case 40: {
 	    // std em410x format
 		*hi = 0;
 		*lo = ((uint64_t)(bytebits_to_byte(bits, 8)) << 32) | (bytebits_to_byte(bits + 8, 32));
 		break;
-	    } 
-	    case 88:  { 
+	    }
+	    case 88:  {
 	    // long em format
-		*hi = (bytebits_to_byte(bits, 24)); 
+		*hi = (bytebits_to_byte(bits, 24));
 		*lo = ((uint64_t)(bytebits_to_byte(bits + 24, 32)) << 32) | (bytebits_to_byte(bits + 24 + 32, 32));
 		break;
-	    } 
-	    default: return -6;	
+	    }
+	    default: return -6;
 	}
 	return 1;
 }
@@ -1977,7 +1977,7 @@ int Em410xDecode(uint8_t *bits, size_t *size, size_t *start_idx, uint32_t *hi, u
 int HIDdemodFSK(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32_t *lo, int *waveStartIdx) {
 	//make sure buffer has data
 	if (*size < 96*50) return -1;
-	
+
 	if (signalprop.isnoise) return -2;
 
 	// FSK demodulator  fsk2a so invert and fc/10/8
@@ -1987,14 +1987,14 @@ int HIDdemodFSK(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32
 	if (*size < 96*2) return -3;
 
 	// 00011101 bit pattern represent start of frame, 01 pattern represents a 0 and 10 represents a 1
-	size_t start_idx = 0;	
+	size_t start_idx = 0;
 	uint8_t preamble[] = {0,0,0,1,1,1,0,1};
-	if (!preambleSearch(dest, preamble, sizeof(preamble), size, &start_idx)) 
+	if (!preambleSearch(dest, preamble, sizeof(preamble), size, &start_idx))
 		return -4; //preamble not found
 
 	// wrong size?  (between to preambles)
 	//if (*size != 96) return -5;
-	
+
 	size_t num_start = start_idx + sizeof(preamble);
 	// final loop, go over previously decoded FSK data and manchester decode into usable tag ID
 	for (size_t idx = num_start; (idx - num_start) < *size - sizeof(preamble); idx += 2) {
@@ -2017,17 +2017,17 @@ int HIDdemodFSK(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32
 // by iceman
 int detectIdteck(uint8_t *dest, size_t *size) {
 	//make sure buffer has data
-	if (*size < 64*2) return -1;	
-	
+	if (*size < 64*2) return -1;
+
 	if (signalprop.isnoise) return -2;
-	
+
 	size_t start_idx = 0;
 	uint8_t preamble[] = {0,1,0,0,1,0,0,1,0,1,0,0,0,1,0,0,0,1,0,1,0,1,0,0,0,1,0,0,1,0,1,1};
-	
+
 	//preamble not found
 	if (!preambleSearch(dest, preamble, sizeof(preamble), size, &start_idx))
-		return -3; 
-	
+		return -3;
+
 	 // wrong demoded size
 	if (*size != 64) return -4;
 	return (int)start_idx;
@@ -2036,15 +2036,15 @@ int detectIdteck(uint8_t *dest, size_t *size) {
 int detectIOProx(uint8_t *dest, size_t *size, int *waveStartIdx) {
 	//make sure buffer has data
 	if (*size < 66*64) return -1;
-	
+
 	if (signalprop.isnoise) return -2;
-	
+
 	// FSK demodulator  RF/64, fsk2a so invert, and fc/10/8
 	*size = fskdemod(dest, *size, 64, 1, 10, 8, waveStartIdx);  //io fsk2a
-	
+
 	//did we get enough demod data?
 	if (*size < 64) return -3;
-	
+
 	//Index map
 	//0           10          20          30          40          50          60
 	//|           |           |           |           |           |           |
@@ -2061,12 +2061,12 @@ int detectIOProx(uint8_t *dest, size_t *size, int *waveStartIdx) {
 
 	// wrong size?  (between to preambles)
 	if (*size != 64) return -5;
-	
-	if (  !dest[start_idx + 8] 
-		&& dest[start_idx + 17] == 1 
-		&& dest[start_idx + 26] == 1 
+
+	if (  !dest[start_idx + 8]
+		&& dest[start_idx + 17] == 1
+		&& dest[start_idx + 26] == 1
 		&& dest[start_idx + 35] == 1
-		&& dest[start_idx + 44] == 1 
+		&& dest[start_idx + 44] == 1
 		&& dest[start_idx + 53] == 1) {
 		//confirmed proper separator bits found
 		//return start position
diff --git a/common/lfdemod.h b/common/lfdemod.h
index a6542059e..222495a99 100644
--- a/common/lfdemod.h
+++ b/common/lfdemod.h
@@ -7,8 +7,8 @@
 // Low frequency demod related commands
 // marshmellow
 // note that many of these demods are not the slickest code and they often rely
-//   on peaks and clock instead of converting to clean signal. 
-//   
+//   on peaks and clock instead of converting to clean signal.
+//
 //-----------------------------------------------------------------------------
 
 #ifndef LFDEMOD_H__
diff --git a/common/parity.h b/common/parity.h
index fe1c2504f..9aaf936ed 100644
--- a/common/parity.h
+++ b/common/parity.h
@@ -6,7 +6,7 @@
 // Parity functions
 //-----------------------------------------------------------------------------
 
-// all functions defined in header file by purpose. Allows compiler optimizations. 
+// all functions defined in header file by purpose. Allows compiler optimizations.
 
 #ifndef __PARITY_H
 #define __PARITY_H
@@ -31,7 +31,7 @@ static inline bool evenparity8(const uint8_t x) {
 }
 
 
-static inline bool evenparity32(uint32_t x) 
+static inline bool evenparity32(uint32_t x)
 {
 #if !defined __GNUC__
 	x ^= x >> 16;
@@ -43,7 +43,7 @@ static inline bool evenparity32(uint32_t x)
 }
 
 
-static inline bool oddparity32(uint32_t x) 
+static inline bool oddparity32(uint32_t x)
 {
 #if !defined __GNUC__
 	x ^= x >> 16;
diff --git a/common/prng.c b/common/prng.c
index 170550edf..b1a608d7e 100644
--- a/common/prng.c
+++ b/common/prng.c
@@ -24,7 +24,7 @@ void burtle_init_mod(prng_ctx *x, uint32_t seed ) {
 }
 
 void burtle_init(prng_ctx *x, uint32_t seed ) {
-    uint32_t i;	
+    uint32_t i;
     x->a = 0xf1ea5eed, x->b = x->c = x->d = seed;
     for (i=0; i < 20; ++i) {
         (void)burtle_get_mod(x);
diff --git a/common/prng.h b/common/prng.h
index 4aa890927..f7a875b6c 100644
--- a/common/prng.h
+++ b/common/prng.h
@@ -8,11 +8,11 @@
 #define __PRNG_H
 #include <stdint.h>
 #include <stddef.h>
-typedef struct prng_ctx { 
-	uint32_t a; 
-	uint32_t b; 
-	uint32_t c; 
-	uint32_t d; 
+typedef struct prng_ctx {
+	uint32_t a;
+	uint32_t b;
+	uint32_t c;
+	uint32_t d;
 } prng_ctx;
 
 //uint32_t burtle_get( prng_ctx *x );
diff --git a/common/protocols.c b/common/protocols.c
index 96ecdab51..9649c51d9 100644
--- a/common/protocols.c
+++ b/common/protocols.c
@@ -30,17 +30,17 @@ uint8_t notset(uint8_t val, uint8_t mask){
 void fuse_config(const picopass_hdr *hdr) {
 	uint8_t fuses = hdr->conf.fuses;
 
-	if (isset(fuses,FUSE_FPERS)) 
+	if (isset(fuses,FUSE_FPERS))
 		PrintAndLogDevice(SUCCESS, "\tMode: Personalization [Programmable]");
-	else 
+	else
 		PrintAndLogDevice(NORMAL, "\tMode: Application [Locked]");
 
 	if (isset(fuses, FUSE_CODING1)) {
 		PrintAndLogDevice(NORMAL, "\tCoding: RFU");
 	} else {
-		if( isset( fuses , FUSE_CODING0)) 
+		if( isset( fuses , FUSE_CODING0))
 			PrintAndLogDevice(NORMAL, "\tCoding: ISO 14443-2 B/ISO 15693");
-		else 
+		else
 			PrintAndLogDevice(NORMAL, "\tCoding: ISO 14443B only");
 	}
 	// 1 1
@@ -54,7 +54,7 @@ void fuse_config(const picopass_hdr *hdr) {
 
 	if( isset( fuses, FUSE_RA))
 		PrintAndLogDevice(NORMAL, "\tRA: Read access enabled");
-	else 
+	else
 		PrintAndLogDevice(WARNING, "\tRA: Read access not enabled");
 }
 
@@ -63,7 +63,7 @@ void getMemConfig(uint8_t mem_cfg, uint8_t chip_cfg, uint8_t *max_blk, uint8_t *
 	uint8_t k16		= isset(mem_cfg, 0x80);
 	//uint8_t k2 		= isset(mem_cfg, 0x08);
 	uint8_t book	= isset(mem_cfg, 0x20);
-	
+
 	if(isset(chip_cfg, 0x10) && !k16 && !book) {
 		*kb = 2;
 		*app_areas = 2;
@@ -100,10 +100,10 @@ void mem_app_config(const picopass_hdr *hdr) {
 	uint8_t max_blk = 31;
 
 	getMemConfig(mem, chip, &max_blk, &app_areas, &kb);
-	
+
 	if (applimit < 6) applimit = 26;
 	if (kb == 2 && (applimit > 0x1f) ) applimit = 26;
-	
+
 	PrintAndLogDevice(NORMAL, " Mem: %u KBits/%u App Areas (%u * 8 bytes) [%02X]", kb, app_areas, max_blk, mem);
 	PrintAndLogDevice(NORMAL, "\tAA1: blocks 06-%02X", applimit);
 	PrintAndLogDevice(NORMAL, "\tAA2: blocks %02X-%02X", applimit+1, max_blk);
diff --git a/common/protocols.h b/common/protocols.h
index 73355c85d..ce56b3175 100644
--- a/common/protocols.h
+++ b/common/protocols.h
@@ -36,7 +36,7 @@ ISO14443B
 	05 = REQB
 	1D = ATTRIB
 	50 = HALT
-	
+
 	BA = PING (reader -> tag)
 	AB = PONG (tag -> reader)
 SRIX4K (tag does not respond to 05)
@@ -132,7 +132,7 @@ ISO 7816-4 Basic interindustry commands. For command APDU's.
 #define ICLASS_CMD_READ4            0x06
 #define ICLASS_CMD_READ_OR_IDENTIFY 0x0C
 
-#define ICLASS_CMD_SELECT           0x81   
+#define ICLASS_CMD_SELECT           0x81
 #define ICLASS_CMD_PAGESEL          0x84
 #define ICLASS_CMD_UPDATE			0x87
 #define ICLASS_CMD_READCHECK_KC     0x18
@@ -309,7 +309,7 @@ ISO 7816-4 Basic interindustry commands. For command APDU's.
 // ISO7816-4	For response APDU's
 #define ISO7816_OK						0x9000
 //	6x xx = ERROR
-	
+
 // MIFARE DESFire command set:
 #define MFDES_CREATE_APPLICATION 		0xca
 #define MFDES_DELETE_APPLICATION 		0xda
@@ -417,7 +417,7 @@ void getMemConfig(uint8_t mem_cfg, uint8_t chip_cfg, uint8_t *max_blk, uint8_t *
 #define T55XX_WRITE_TIMEOUT 1500
 
 uint32_t GetT55xxClockBit(uint32_t clock);
-										  
+
 
 // em4x05 & em4x69 chip configuration register definitions
 #define EM4x05_GET_BITRATE(x)         (((x & 0x3F)*2)+2)
@@ -515,7 +515,7 @@ uint32_t GetT55xxClockBit(uint32_t clock);
 #define SYSTEMCODE_CYBERNE		0x0003 // Cyberne
 #define SYSTEMCODE_SUICA		0x0003 // Suica
 #define SYSTEMCODE_PASMO		0x0003 // Pasmo
-    
+
 //FeliCa Service list Suica/pasmo (little endian)
 #define SERVICE_SUICA_INOUT				0x108f // SUICA/PASMO
 #define SERVICE_SUICA_HISTORY			0x090f // SUICA/PASMO
@@ -569,5 +569,5 @@ typedef struct {
 } picopass_hdr;
 
 
-#endif 
+#endif
 // PROTOCOLS_H
diff --git a/common/radixsort.c b/common/radixsort.c
index 981c19191..fa0643216 100644
--- a/common/radixsort.c
+++ b/common/radixsort.c
@@ -44,13 +44,13 @@ uint64_t * radixSort(uint64_t * array, uint32_t size) {
         counts.c3[x] = o3;
         counts.c2[x] = o2;
         counts.c1[x] = o1;
-        o8 = t8; 
-        o7 = t7; 
-        o6 = t6; 
-        o5 = t5; 
-        o4 = t4; 
-        o3 = t3; 
-        o2 = t2; 
+        o8 = t8;
+        o7 = t7;
+        o6 = t6;
+        o5 = t5;
+        o4 = t4;
+        o3 = t3;
+        o2 = t2;
         o1 = t1;
     }
     // radix
diff --git a/common/random.c b/common/random.c
index 5658683de..96cdbb628 100644
--- a/common/random.c
+++ b/common/random.c
@@ -6,20 +6,20 @@ static uint32_t g_nextrandom;
  *
  * We don't have an implementation of the "rand" function. Instead we use a
  * method of seeding with the time it took to call "autoseed" from first run.
- * 
+ *
  * https://github.com/Proxmark/proxmark3/pull/209/commits/f9c1dcd9f6e68a8c07cffed697a9c4c8caed6015
  *
  * Iceman,  rand needs to be fast.
  * https://software.intel.com/en-us/articles/fast-random-number-generator-on-the-intel-pentiumr-4-processor/
  */
- 
+
 inline void fast_prand(){
 	fast_prandEx(GetTickCount());
 }
 inline void fast_prandEx(uint32_t seed) {
 	g_nextrandom = seed;
 }
- 
+
 uint32_t prand() {
 //	g_nextrandom *= 6364136223846793005;
 //	g_nextrandom += 1;
diff --git a/common/random.h b/common/random.h
index 800ad8103..315794f8d 100644
--- a/common/random.h
+++ b/common/random.h
@@ -6,7 +6,7 @@
 // the license.
 //-----------------------------------------------------------------------------
 // pseudo rng generator.  To be used when PM3 simulates Mifare tag.
-// i.e.  'hf mf sim'  
+// i.e.  'hf mf sim'
 //       'hf 14a sim'
 //-----------------------------------------------------------------------------
 
diff --git a/common/tea.c b/common/tea.c
index 616b4043b..b3e1a39c1 100644
--- a/common/tea.c
+++ b/common/tea.c
@@ -16,17 +16,17 @@ void tea_encrypt(uint8_t *v, uint8_t *key) {
 	uint32_t a=0,b=0,c=0,d=0,y=0,z=0;
 	uint32_t sum = 0;
 	uint8_t n = ROUNDS;
-		
+
 	//key
 	a = bytes_to_num(key, 4);
 	b = bytes_to_num(key+4, 4);
 	c = bytes_to_num(key+8, 4);
 	d = bytes_to_num(key+12, 4);
-	
+
 	//input
 	y = bytes_to_num(v, 4);
 	z = bytes_to_num(v+4, 4);
-		
+
 	while ( n-- > 0 ) {
 		sum += DELTA;
 		y += ((z << 4) + a) ^ (z + sum) ^ ((z >> 5) + b);
@@ -48,7 +48,7 @@ void tea_decrypt(uint8_t *v, uint8_t *key) {
 	b = bytes_to_num(key+4, 4);
 	c = bytes_to_num(key+8, 4);
 	d = bytes_to_num(key+12, 4);
-	
+
 	//input
 	y = bytes_to_num(v, 4);
 	z = bytes_to_num(v+4, 4);
diff --git a/common/usart.c b/common/usart.c
index 32ccb5ca1..c62e3c8f6 100644
--- a/common/usart.c
+++ b/common/usart.c
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------------
 // Iceman, July 2018
 // edits by - Anticat, August 2018
-// 
+//
 // This code is licensed to you under the terms of the GNU GPL, version 2 or,
 // at your option, any later version. See the LICENSE.txt file for the text of
 // the license.
@@ -24,7 +24,7 @@ void usart_close(void) {
 
     // Reset the baud rate divisor register
 	pUS1->US_BRGR = 0;
-	
+
     // Reset the Timeguard Register
     pUS1->US_TTGR = 0;
 
@@ -96,20 +96,20 @@ void usart_init(void) {
 
 	// disable & reset receiver / transmitter for configuration
 	pUS1->US_CR = (AT91C_US_RSTRX | AT91C_US_RSTTX | AT91C_US_RXDIS | AT91C_US_TXDIS);
-	
+
 	//enable the USART1 Peripheral clock
 	AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_US1);
 
 	// disable PIO control of receive / transmit pins
-	pPIO->PIO_PDR |= (AT91C_PA21_RXD1 | AT91C_PA22_TXD1); 
-	
+	pPIO->PIO_PDR |= (AT91C_PA21_RXD1 | AT91C_PA22_TXD1);
+
 	// enable peripheral mode A on receive / transmit pins
 	pPIO->PIO_ASR |= (AT91C_PA21_RXD1 | AT91C_PA22_TXD1);
 	pPIO->PIO_BSR = 0;
 
 	// enable pull-up on receive / transmit pins (see 31.5.1 I/O Lines)
 	pPIO->PIO_PPUER |= (AT91C_PA21_RXD1 | AT91C_PA22_TXD1);
-	
+
     // set mode
     pUS1->US_MR = AT91C_US_USMODE_NORMAL |      // normal mode
                AT91C_US_CLKS_CLOCK |            // MCK (48MHz)
@@ -126,18 +126,18 @@ void usart_init(void) {
 	// For a nice detailed sample, interrupt driven but still relevant.
 	// See https://www.sparkfun.com/datasheets/DevTools/SAM7/at91sam7%20serial%20communications.pdf
 
-	// set baudrate to 115200 
+	// set baudrate to 115200
 	// 115200 * 16 == 1843200
 	//
 	//pUS1->US_BRGR = (48UL*1000*1000) / (9600*16);
 	pUS1->US_BRGR =  48054841 / (9600 << 4);
-	
+
 	// Write the Timeguard Register
 	pUS1->US_TTGR = 0;
 	pUS1->US_RTOR = 0;
 	pUS1->US_FIDI = 0;
 	pUS1->US_IF = 0;
-	
+
 	// re-enable receiver / transmitter
 	pUS1->US_CR = (AT91C_US_RXEN | AT91C_US_TXEN);
 }
\ No newline at end of file
diff --git a/common/usb_cdc.c b/common/usb_cdc.c
index a0005017e..b1acff692 100644
--- a/common/usb_cdc.c
+++ b/common/usb_cdc.c
@@ -36,14 +36,14 @@
 /*
 AT91SAM7S256  USB Device Port
 • Embedded 328-byte dual-port RAM for endpoints
-• Four endpoints 
+• Four endpoints
 – Endpoint 0: 8 bytes
 – Endpoint 1 and 2: 64 bytes ping-pong
 – Endpoint 3: 64 bytes
 – Ping-pong Mode (two memory banks) for bulk endpoints
 */
 
-// 
+//
 #define AT91C_EP_CONTROL        0
 #define AT91C_EP_OUT            1  // cfg bulk out
 #define AT91C_EP_IN             2  // cfg bulk in
@@ -79,7 +79,7 @@ AT91SAM7S256  USB Device Port
 #define _ISO        0x01            //Isochronous Transfer
 #define _BULK       0x02 			//Bulk Transfer
 #define _INTERRUPT  0x03			//Interrupt Transfer
-					  
+
 // (bit7 | 0 = OUT, 1 = IN)
 #define _EP_IN      0x80
 #define _EP_OUT     0x00
@@ -92,7 +92,7 @@ AT91SAM7S256  USB Device Port
 
 
 /* WCID specific Request Code */
-#define MS_OS_DESCRIPTOR_INDEX			0xEE 
+#define MS_OS_DESCRIPTOR_INDEX			0xEE
 #define MS_VENDOR_CODE					0x1C
 #define MS_EXTENDED_COMPAT_ID           0x04
 #define MS_EXTENDED_PROPERTIES          0x05
@@ -143,10 +143,10 @@ static const char devDescriptor[] = {
     0xc4,0x9a, // Vendor ID  [0x9ac4 = J. Westhues]
     0x8f,0x4b, // Product ID [0x4b8f = Proxmark-3 RFID Instrument]
 	0x00,0x01, // BCD Device release number (1.00)
-	1,      // index Manufacturer  
+	1,      // index Manufacturer
 	2,      // index Product
 	3,      // index SerialNumber
-	1       // Number of Configs 
+	1       // Number of Configs
 };
 
 static const char cfgDescriptor[] = {
@@ -154,8 +154,8 @@ static const char cfgDescriptor[] = {
 	/* Configuration 1 descriptor */
 	// -----------------------------
 	9,         // Length
-	USB_DESCRIPTOR_CONFIGURATION, // Descriptor Type	        
-	(9+9+5+5+4+5+7+9+7+7), 0,	  // Total Length 2 EP + Control	
+	USB_DESCRIPTOR_CONFIGURATION, // Descriptor Type
+	(9+9+5+5+4+5+7+9+7+7), 0,	  // Total Length 2 EP + Control
 	2,         // Number of Interfaces
 	1,         // Index value of this Configuration (used in SetConfiguration from Host)
 	0,         // Configuration string index
@@ -174,7 +174,7 @@ static const char cfgDescriptor[] = {
     1,      // Function Protocol: v.25term
 	0,      // iInterface
 */
-	
+
 	/* Interface 0 Descriptor */
 	/* CDC Communication Class Interface Descriptor Requirement for Notification*/
 	// -----------------------------------------------------------
@@ -192,7 +192,7 @@ static const char cfgDescriptor[] = {
 	5,		// Function Length
 	0x24,	// Descriptor type:    CS_INTERFACE
 	0,		// Descriptor subtype: Header Functional Descriptor
-	0x10,0x01, // bcd CDC:1.1	
+	0x10,0x01, // bcd CDC:1.1
 
 	/* ACM Functional Descriptor */
 	4,		// Function Length
@@ -206,23 +206,23 @@ static const char cfgDescriptor[] = {
 	6,		// Descriptor Subtype: Union Functional Descriptor
 	0,		// MasterInterface:    Communication Class Interface
 	1,		// SlaveInterface0:    Data Class Interface
-	
+
 	/* Call Management Functional Descriptor */
 	5,		// Function Length
 	0x24,	// Descriptor Type:    CS_INTERFACE
-	1,		// Descriptor Subtype: Call Management Functional Descriptor 
+	1,		// Descriptor Subtype: Call Management Functional Descriptor
 	0,		// Capabilities:       Device sends/receives call management information only over the Communication Class interface. Device does not handle call management itself
 	1,		// Data Interface:     Data Class Interface
-																			
+
 	/* Protocol Functional Descriptor */
 	/*
 	6,
 	0x24,	// Descriptor Type: CS_INTERFACE
 	0x0B,	// Descriptor Subtype: Protocol Unit functional Descriptor
 	0xDD, 	// constant uniq ID of unit
-	0xFE, 	// protocol  
+	0xFE, 	// protocol
 	*/
-	
+
 	/* CDC Notification Endpoint descriptor */
 	// ---------------------------------------
 	7,	 	                     // Length
@@ -232,7 +232,7 @@ static const char cfgDescriptor[] = {
 	AT91C_EP_CONTROL_SIZE, 0x00, // MaxPacket Size:    EP0 - 8
 	0xFF,		                 // Interval polling
 
-	
+
 	/* Interface 1 Descriptor */
 	/* CDC Data Class Interface 1 Descriptor Requirement */
 	9, 		                  // Length
@@ -283,10 +283,10 @@ static const char bosDescriptor[] = {
 static const char CompatIDFeatureDescriptor[] = {
 		0x28, 0x00, 0x00, 0x00,							// Descriptor Length 40bytes (0x28)
 		0x00, 0x01,										// Version ('1.0')
-		MS_EXTENDED_COMPAT_ID, 0x00,					// Compatibility ID Descriptor Index  0x0004 
+		MS_EXTENDED_COMPAT_ID, 0x00,					// Compatibility ID Descriptor Index  0x0004
 		0x01, 											// Number of sections. 0x1
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,		// Reserved (7bytes)
-		//-----function section 1------		
+		//-----function section 1------
 		0x00,											// Interface Number #0
 		0x01,											// reserved (0x1)
 		0x57, 0x49, 0x4E, 0x55, 0x53, 0x42, 0x00, 0x00,	// Compatible ID  ('WINUSB\0\0')  (8bytes)
@@ -306,7 +306,7 @@ static const char OSprop[] = {
 		MS_EXTENDED_PROPERTIES, 0,
 		// u16 wCount  -- three section
 		3, 0,
-		
+
 		//-----property section 1------
 		// u32 size  ( 14+40+78 == 132)
 		132, 0, 0, 0,
@@ -321,7 +321,7 @@ static const char OSprop[] = {
 		// data {4D36E978-E325-11CE-BFC1-08002BE10318}
 		'{',0,'4',0,'d',0,'3',0,'6',0,'e',0,'9',0,'7',0,'8',0,'-',0,'e',0,'3',0,'2',0,'5',0,
 		'-',0,'1',0,'1',0,'c',0,'e',0,'-',0,'b',0,'f',0,'c',0,'1',0,'-',0,'0',0,'8',0,'0',0,
-		'0',0,'2',0,'b',0,'e',0,'1',0,'0',0,'3',0,'1',0,'8',0,'}',0,0,0,		
+		'0',0,'2',0,'b',0,'e',0,'1',0,'0',0,'3',0,'1',0,'8',0,'}',0,0,0,
 
 		//-----property section 2------
 		// u32 size  ( 14+12+38 == 64)
@@ -343,7 +343,7 @@ static const char OSprop[] = {
 		// u32 type
 		2, 0, 0, 0,  //Unicode string with environment variables
 		// u16 namelen (12)
-		12, 0,		
+		12, 0,
 		// name Icons
 		'I',0,'c',0,'o',0,'n',0,'s',0,0,0,
 		// u32 datalen ( 38*2 ==  76)
@@ -393,12 +393,12 @@ static const char StrMS_OSDescriptor[] = {
 
 const char* getStringDescriptor(uint8_t idx) {
 	switch(idx) {
-		case 0: return StrLanguageCodes; 
+		case 0: return StrLanguageCodes;
 		case 1: return StrManufacturer;
 		case 2: return StrProduct;
 		case 3: return StrSerialNumber;
 		case MS_OS_DESCRIPTOR_INDEX: return StrMS_OSDescriptor;
-		default: 
+		default:
 			return(NULL);
 	}
 }
@@ -446,7 +446,7 @@ static void SpinDelay(int ms) {
 
 	// Borrow a PWM unit for my real-time clock
 	AT91C_BASE_PWMC->PWMC_ENA = PWM_CHANNEL(0);
-	
+
 	// 48 MHz / 1024 gives 46.875 kHz
 	AT91C_BASE_PWMC_CH0->PWMC_CMR = PWM_CH_MODE_PRESCALER(10);
 	AT91C_BASE_PWMC_CH0->PWMC_CDTYR = 0;
@@ -489,7 +489,7 @@ void usb_enable() {
 	// Enables the 48MHz USB clock UDPCK and System Peripheral USB Clock
 	AT91C_BASE_PMC->PMC_SCER |= AT91C_PMC_UDP;
 	AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_UDP);
-	
+
 	AT91C_BASE_UDP->UDP_FADDR = 0;
 	AT91C_BASE_UDP->UDP_GLBSTATE = 0;
 
@@ -507,7 +507,7 @@ void usb_enable() {
 	SpinDelay(100);
 	// Wait for a short while
 	//for (volatile size_t i=0; i<0x100000; i++) {};
-	
+
 	// Reconnect USB reconnect
 	AT91C_BASE_PIOA->PIO_SODR = GPIO_USB_PU;
 	AT91C_BASE_PIOA->PIO_OER = GPIO_USB_PU;
@@ -533,23 +533,23 @@ int GetUSBconfigured(void){
 }
 
 bool usb_check() {
-	
+
 	/*
-	// reconnected ONCE and 
+	// reconnected ONCE and
 	if ( !USB_ATTACHED() ){
 		usb_reconnect = 1;
 		return false;
 	}
-	
-	// only one time after USB been disengaged and re-engaged	
+
+	// only one time after USB been disengaged and re-engaged
 	if ( USB_ATTACHED() && usb_reconnect == 1 ) {
-			
-		if ( usb_configured == 0) {			
+
+		if ( usb_configured == 0) {
 			usb_disable();
-			usb_enable();		
+			usb_enable();
 
 			AT91F_CDC_Enumerate();
-			
+
 			usb_configured = 1;
 			return false;
 		}
@@ -573,7 +573,7 @@ bool usb_check() {
 	else if (isr & AT91C_UDP_EPINT0) {
 		pUdp->UDP_ICR = AT91C_UDP_EPINT0;
 		AT91F_CDC_Enumerate();
-	} 
+	}
 	/*
 	else if (isr & AT91C_UDP_EPINT3 ) {
 		pUdp->UDP_ICR = AT91C_UDP_EPINT3;
@@ -608,20 +608,20 @@ bool usb_poll_validate_length() {
 //* \brief Read available data from Endpoint 1 OUT (host to device)
 //*----------------------------------------------------------------------------
 uint32_t usb_read(byte_t* data, size_t len) {
-	
+
 	if ( len == 0 ) return 0;
-	
+
 	uint8_t bank = btReceiveBank;
 	uint32_t packetSize, nbBytesRcv = 0;
 	uint32_t time_out = 0;
-  
+
 	while (len)  {
 		if (!usb_check()) break;
 
 		if ( pUdp->UDP_CSR[AT91C_EP_OUT] & bank ) {
-			
+
 			packetSize = (pUdp->UDP_CSR[AT91C_EP_OUT] & AT91C_UDP_RXBYTECNT) >> 16;
-			packetSize = MIN( packetSize, len); 
+			packetSize = MIN( packetSize, len);
 			len -= packetSize;
 			while (packetSize--)
 				data[nbBytesRcv++] = pUdp->UDP_FDR[AT91C_EP_OUT];
@@ -632,7 +632,7 @@ uint32_t usb_read(byte_t* data, size_t len) {
 			if (bank == AT91C_UDP_RX_DATA_BK0)
 				bank = AT91C_UDP_RX_DATA_BK1;
 			else
-				bank = AT91C_UDP_RX_DATA_BK0;		
+				bank = AT91C_UDP_RX_DATA_BK0;
 		}
 		if (time_out++ == 0x1fff) break;
 	}
@@ -652,20 +652,20 @@ uint32_t usb_write(const byte_t* data, const size_t len) {
 
 	// can we write?
 	if ( (pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXPKTRDY) != 0 ) return 0;
-	
+
 	size_t length = len;
 	uint32_t cpt = 0;
- 
- 
+
+
 	// send first chunk
 	cpt = MIN(length, AT91C_EP_IN_SIZE);
 	length -= cpt;
 	while (cpt--) {
 		pUdp->UDP_FDR[AT91C_EP_IN] = *data++;
 	}
-	
+
 	UDP_SET_EP_FLAGS(AT91C_EP_IN, AT91C_UDP_TXPKTRDY);
-	
+
 	while (length) {
 		// Send next chunk
 		cpt = MIN(length, AT91C_EP_IN_SIZE);
@@ -673,19 +673,19 @@ uint32_t usb_write(const byte_t* data, const size_t len) {
 		while (cpt--) {
 			pUdp->UDP_FDR[AT91C_EP_IN] = *data++;
 		}
-		
+
 		// Wait for previous chunk to be sent
 		// (iceman) when is the bankswapping done?
 		while (!(pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP)) {
 			if (!usb_check()) return length;
 		}
-		
+
 		UDP_CLEAR_EP_FLAGS(AT91C_EP_IN, AT91C_UDP_TXCOMP);
 		while (pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP);
 		UDP_SET_EP_FLAGS(AT91C_EP_IN, AT91C_UDP_TXPKTRDY);
-		
+
 	}
-  
+
 	// Wait for the end of transfer
 	while (!(pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP)) {
 		if (!usb_check()) return length;
@@ -704,7 +704,7 @@ uint32_t usb_write(const byte_t* data, const size_t len) {
 void AT91F_USB_SendData(AT91PS_UDP pUdp, const char *pData, uint32_t length) {
 	uint32_t cpt = 0;
 	AT91_REG csr;
-	
+
 	do {
 		cpt = MIN(length, AT91C_EP_CONTROL_SIZE);
 		length -= cpt;
@@ -723,7 +723,7 @@ void AT91F_USB_SendData(AT91PS_UDP pUdp, const char *pData, uint32_t length) {
 			csr = pUdp->UDP_CSR[AT91C_EP_CONTROL];
 			// Data IN stage has been stopped by a status OUT
 			if ( csr & AT91C_UDP_RX_DATA_BK0) {
-				
+
 				UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_RX_DATA_BK0)
 				return;
 			}
@@ -736,14 +736,14 @@ void AT91F_USB_SendData(AT91PS_UDP pUdp, const char *pData, uint32_t length) {
 		while (pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_TXCOMP);
 	}
 }
-		
+
 
 //*----------------------------------------------------------------------------
 //* \fn    AT91F_USB_SendZlp
 //* \brief Send zero length packet through the control endpoint
 //*----------------------------------------------------------------------------
 void AT91F_USB_SendZlp(AT91PS_UDP pUdp) {
-	UDP_SET_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_TXPKTRDY);	
+	UDP_SET_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_TXPKTRDY);
 	while ( !(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_TXCOMP) );
 	UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_TXCOMP);
 	while (pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_TXCOMP);
@@ -763,7 +763,7 @@ void AT91F_USB_SendStall(AT91PS_UDP pUdp) {
 //*----------------------------------------------------------------------------
 //* \fn    AT91F_CDC_Enumerate
 //* \brief This function is a callback invoked when a SETUP packet is received
-//* problem:  
+//* problem:
 //* 1. this is for USB endpoint0.  the control endpoint.
 //* 2. mixed with CDC ACM endpoint3 , interrupt, control endpoint
 //*----------------------------------------------------------------------------
@@ -796,22 +796,22 @@ void AT91F_CDC_Enumerate() {
 			if ( wIndex == MS_EXTENDED_COMPAT_ID ) {  // 4
 				//AT91F_USB_SendData(pUdp, CompatIDFeatureDescriptor, MIN(sizeof(CompatIDFeatureDescriptor), wLength));
 				//return;
-			} 
+			}
 		}
 
 		if ( bmRequestType == MS_WCID_GET_FEATURE_DESCRIPTOR ) {  //C1
 			// if ( wIndex == MS_EXTENDED_PROPERTIES ) { // 5  - winusb bug with wIndex == interface index,  so I just send it always)
 				//AT91F_USB_SendData(pUdp, OSprop, MIN(sizeof(OSprop), wLength));
 				//return;
-			// } 
+			// }
 		}
 	}
 	*/
-	
+
 	// Handle supported standard device request Cf Table 9-3 in USB specification Rev 1.1
 	switch ((bRequest << 8) | bmRequestType) {
 	case STD_GET_DESCRIPTOR: {
-		
+
 			if ( wValue == 0x100 )       // Return Device Descriptor
 				AT91F_USB_SendData(pUdp, devDescriptor, MIN(sizeof(devDescriptor), wLength));
 			else if ( wValue == 0x200 )  // Return Configuration Descriptor
@@ -837,25 +837,25 @@ void AT91F_CDC_Enumerate() {
 		pUdp->UDP_GLBSTATE  = (wValue) ? AT91C_UDP_FADDEN : 0;
 		break;
 	case STD_SET_CONFIGURATION:
-	
-		/* 
-		*   Set or clear the device "configured" state. 
-		*   The LSB of wValue is the "Configuration Number". If this value is non-zero, 
-		*   it should be the same number as defined in the Configuration Descriptor; 
-		*   otherwise an error must have occurred. 
-		*   This device has only one configuration and its Config Number is CONF_NB (= 1). 
-		*/  			
+
+		/*
+		*   Set or clear the device "configured" state.
+		*   The LSB of wValue is the "Configuration Number". If this value is non-zero,
+		*   it should be the same number as defined in the Configuration Descriptor;
+		*   otherwise an error must have occurred.
+		*   This device has only one configuration and its Config Number is CONF_NB (= 1).
+		*/
 		AT91F_USB_SendZlp(pUdp);
 		btConfiguration = wValue;
 		pUdp->UDP_GLBSTATE  = (wValue) ? AT91C_UDP_CONFG : AT91C_UDP_FADDEN;
-		
+
 		// make sure we are not stalled
 		/*
 		UDP_CLEAR_EP_FLAGS(AT91C_EP_OUT   , AT91C_UDP_FORCESTALL);
         UDP_CLEAR_EP_FLAGS(AT91C_EP_IN    , AT91C_UDP_FORCESTALL);
 		UDP_CLEAR_EP_FLAGS(AT91C_EP_NOTIFY, AT91C_UDP_FORCESTALL);
 		*/
-		
+
 		// enable endpoints
 		pUdp->UDP_CSR[AT91C_EP_OUT]    = (wValue) ? (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_BULK_OUT) : 0;
 		pUdp->UDP_CSR[AT91C_EP_IN]     = (wValue) ? (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_BULK_IN)  : 0;
@@ -924,8 +924,8 @@ void AT91F_CDC_Enumerate() {
 	// handle CDC class requests
 	case SET_LINE_CODING: {
 	/*
-	    uint8_t i;  
-		for ( i = 0 ; i < 7 ; i++ )  {  
+	    uint8_t i;
+		for ( i = 0 ; i < 7 ; i++ )  {
 			((uint8_t*)&line)[i] =  pUdp->UDP_FDR[AT91C_EP_CONTROL];
 		}  */
 		// ignore SET_LINE_CODING...
diff --git a/common/usb_cdc.h b/common/usb_cdc.h
index fcac556fd..aad046cc1 100644
--- a/common/usb_cdc.h
+++ b/common/usb_cdc.h
@@ -37,7 +37,7 @@
 
 #include <wchar.h>
 #include "at91sam7s512.h"
-#include "config_gpio.h" 
+#include "config_gpio.h"
 #include "proxmark3.h" // USB_CONNECT()
 #include "common.h"
 
diff --git a/common/wiegand.c b/common/wiegand.c
index c9d5fbed1..730cb0206 100644
--- a/common/wiegand.c
+++ b/common/wiegand.c
@@ -17,7 +17,7 @@
 */
 uint8_t getParity( uint8_t *bits, uint8_t len, uint8_t type ) {
     uint8_t x = 0;
-    for(; len > 0; --len) 
+    for(; len > 0; --len)
         x += bits[len - 1];
 
     return (x & 1 ) ^ type;
@@ -35,7 +35,7 @@ uint8_t checkParity(uint32_t bits, uint8_t len, uint8_t type);
 
 // by marshmellow
 // takes a array of binary values, start position, length of bits per parity (includes parity bit),
-// Parity Type (1 for odd; 0 for even; 2 for Always 1's; 3 for Always 0's), and binary Length (length to run) 
+// Parity Type (1 for odd; 0 for even; 2 for Always 1's; 3 for Always 0's), and binary Length (length to run)
 size_t removeParity(uint8_t *bitstream, size_t startIdx, uint8_t pLen, uint8_t pType, size_t bLen) {
 	uint32_t parityWd = 0;
 	size_t j = 0, bitcount = 0;
@@ -69,10 +69,10 @@ size_t removeParity(uint8_t *bitstream, size_t startIdx, uint8_t pLen, uint8_t p
 * @brief addParity
 * @param bits       pointer to the source bitstream of binary values
 * @param dest       pointer to the destination where parities together with bits are added.
-* @param sourceLen  number of 
+* @param sourceLen  number of
 * @param pLen       length bits to be checked
 * @param pType      EVEN|ODD|2 (always 1's)|3 (always 0's)
-* @return 
+* @return
 */
 size_t addParity(uint8_t *bits, uint8_t *dest, uint8_t sourceLen, uint8_t pLen, uint8_t pType)
 {
@@ -83,12 +83,12 @@ size_t addParity(uint8_t *bits, uint8_t *dest, uint8_t sourceLen, uint8_t pLen,
 			parityWd = (parityWd << 1) | bits[word+bit];
 			dest[j++] = (bits[word+bit]);
 		}
-		
+
 		// if parity fails then return 0
 		switch (pType) {
 			case 3: dest[j++] = 0; break; // marker bit which should be a 0
 			case 2: dest[j++] = 1; break; // marker bit which should be a 1
-			default: 
+			default:
 				dest[j++] = parityTest(parityWd, pLen-1, pType) ^ 1;
 				break;
 		}
@@ -115,34 +115,34 @@ void wiegand_add_parity(uint8_t *source, uint8_t *dest, uint8_t len) {
 
 	// half length, Even and Odd is calculated to the middle.
 	uint8_t len_h2 = length >> 1;
-	
+
 	// add EVEN parity at the beginning
     *(dest) = GetParity(source, EVEN, len_h2);
-	
+
     dest += length + 1;
-	
+
 	// add ODD parity at the very end
     *(dest) = GetParity(source + len_h2, ODD, len_h2);
 }
 
 //uint32_t bytebits_to_byte(uint8_t* src, size_t numbits);
 #define MAX_BITS_TXX55 6*4*8
-#define MAX_BYTES_TXX55 6*4	
+#define MAX_BYTES_TXX55 6*4
 /*
 * @brief num_to_wiegand_bytes
 * @param oem       Sometimes call FF Fixfield, SiteCode. Used in a few formats
-* @param fc        Facility code 
+* @param fc        Facility code
 * @param cn        Card number
 * @param dest      pointer to the destination where wiegand bytes will be stored
-* @param formatlen 
+* @param formatlen
 */
 void num_to_wiegand_bytes(uint64_t oem, uint64_t fc, uint64_t cn, uint8_t *dest, uint8_t formatlen){
 
 	uint8_t data[MAX_BITS_TXX55] = {0};
 	memset(data, 0, sizeof(data));
-	
+
 	num_to_wiegand_bits(oem, fc, cn, data, formatlen);
-		
+
 	// loop
 	// (formatlen / 32 ) + 1
 	// (formatlen >> 5) + 1
@@ -150,15 +150,15 @@ void num_to_wiegand_bytes(uint64_t oem, uint64_t fc, uint64_t cn, uint8_t *dest,
 		uint32_t value  = bytebits_to_byte( data + (i * 32), 32);
 		num_to_bytes(value, 32, dest + (i*4) );
 	}
-	
+
 }
 /*
 * @brief num_to_wiegand_bits
 * @param oem       Sometimes call FF Fixfield, SiteCode. Used in a few formats
-* @param fc        Facility code 
+* @param fc        Facility code
 * @param cn        Card number
 * @param dest      pointer to the destination where wiegand bits will be stored
-* @param formatlen 
+* @param formatlen
 */
 void num_to_wiegand_bits(uint64_t oem, uint64_t fc, uint64_t cn, uint8_t *dest, uint8_t formatlen){
 
@@ -166,8 +166,8 @@ void num_to_wiegand_bits(uint64_t oem, uint64_t fc, uint64_t cn, uint8_t *dest,
 	memset(bits, 0, sizeof(bits));
 	uint8_t *temp = bits;
 	uint64_t value = 0;
-	
-	switch ( formatlen ){		
+
+	switch ( formatlen ){
 		case 26 :				// 26bit HID H10301
 			fc &= 0xFF;			// 8bits
 			cn &= 0xFFFF;		// 16bits
@@ -175,26 +175,26 @@ void num_to_wiegand_bits(uint64_t oem, uint64_t fc, uint64_t cn, uint8_t *dest,
 			num_to_bytebits(value, 24, temp);
 			wiegand_add_parity(temp, dest, 24);
 			break;
-		case 261:				// 26bit Indala 
+		case 261:				// 26bit Indala
 			fc &= 0xFFF;		// 12bits
 			cn &= 0xFFF;		// 12bits
 			value = fc << 12 | cn;
 			num_to_bytebits(value, 24, temp);
-			wiegand_add_parity(temp, dest, 24);	
+			wiegand_add_parity(temp, dest, 24);
 			break;
 		case 34 :				// 34bits HID
 			fc &= 0xFFFF;		// 16bits
 			cn &= 0xFFFF;		// 16bits
 			value = fc << 16 | cn;
 			num_to_bytebits(value, 32, temp);
-			wiegand_add_parity(temp, dest, 32);	
+			wiegand_add_parity(temp, dest, 32);
 			break;
 		case 35 :				// 35bits HID
 			fc &= 0xFFF;		// 12bits
 			cn &= 0xFFFFFF;		// 20bits
 			value = fc << 20 | cn;
 			num_to_bytebits(value, 32, temp);
-			wiegand_add_parity(temp, dest, 32);	
+			wiegand_add_parity(temp, dest, 32);
 			break;
 		case 37 : 				// H10304
 			fc &= 0xFFFF;   	// 16bits
diff --git a/include/common.h b/include/common.h
index d3da792aa..8c73100ff 100644
--- a/include/common.h
+++ b/include/common.h
@@ -24,7 +24,7 @@ typedef unsigned char byte_t;
 
 // debug
 // 0 - no debug messages 1 - error messages 2 - all messages 4 - extended debug mode
-#define MF_DBG_NONE          0		
+#define MF_DBG_NONE          0
 #define MF_DBG_ERROR         1
 #define MF_DBG_ALL           2
 #define MF_DBG_EXTENDED      4
@@ -51,7 +51,7 @@ extern uint32_t FLASHMEM_SPIBAUDRATE;
 
 // RDV40 Section
 // 256kb divided into 4k sectors.
-// 
+//
 // last 4k sector = signature
 // second last 4k sector = settings
 // third last 4k sector = default MF keys dictionary
@@ -94,11 +94,11 @@ extern uint32_t FLASHMEM_SPIBAUDRATE;
 	#ifndef DEFAULT_T55XX_KEYS_OFFSET
 	# define DEFAULT_T55XX_KEYS_OFFSET (FLASH_MEM_MAX_4K_SECTOR - 0x3000)
 	#endif
-	
+
 	#ifndef DEFAULT_MF_KEYS_OFFSET
 	# define DEFAULT_MF_KEYS_OFFSET (FLASH_MEM_MAX_4K_SECTOR - 0x4000)
 	#endif
-	
+
 	#ifndef DEFAULT_ICLASS_KEYS_OFFSET
 	# define DEFAULT_ICLASS_KEYS_OFFSET (FLASH_MEM_MAX_4K_SECTOR - 0x5000)
 	#endif
@@ -114,5 +114,5 @@ typedef struct {
 
 #ifdef __cplusplus
 }
-#endif				
+#endif
 #endif
\ No newline at end of file
diff --git a/include/hitag2.h b/include/hitag2.h
index a2d592410..2eeb48f6f 100644
--- a/include/hitag2.h
+++ b/include/hitag2.h
@@ -7,7 +7,7 @@
 //-----------------------------------------------------------------------------
 // Hitag2 type prototyping
 //-----------------------------------------------------------------------------
-// HitagS added 
+// HitagS added
 //-----------------------------------------------------------------------------
 
 #ifndef _HITAG2_H_
diff --git a/include/hitagS.h b/include/hitagS.h
index 11b4fccb3..d74463f20 100644
--- a/include/hitagS.h
+++ b/include/hitagS.h
@@ -34,7 +34,7 @@ typedef enum TAG_STATE {
 	HT_WRITING_PAGE_DATA,
 	HT_WRITING_BLOCK_DATA} TSATE;
 
-//number of start-of-frame bits	
+//number of start-of-frame bits
 typedef enum SOF_TYPE {
 	HT_STANDARD=0,
 	HT_ADVANCED,
diff --git a/include/legic.h b/include/legic.h
index 246af0e8b..d5ba8f166 100644
--- a/include/legic.h
+++ b/include/legic.h
@@ -21,7 +21,7 @@ typedef struct {
 	uint32_t tagtype;
 	uint8_t cmdsize;
 	uint8_t addrsize;
-	uint16_t cardsize;	
+	uint16_t cardsize;
 } legic_card_select_t;
 
 #endif // _LEGIC_H_
diff --git a/include/mifare.h b/include/mifare.h
index 90077f60d..eec72c26f 100644
--- a/include/mifare.h
+++ b/include/mifare.h
@@ -91,7 +91,7 @@ typedef struct {
 	uint32_t nonce;
 	uint32_t ar;
 	uint32_t nr;
-	uint32_t at;  
+	uint32_t at;
 	uint32_t nonce2;
 	uint32_t ar2;
 	uint32_t nr2;
@@ -105,7 +105,7 @@ typedef struct {
 } nonces_t;
 
 //-----------------------------------------------------------------------------
-// ISO 7618  Smart Card 
+// ISO 7618  Smart Card
 //-----------------------------------------------------------------------------
 typedef struct {
 	uint8_t atr_len;
@@ -127,7 +127,7 @@ typedef enum SMARTCARD_COMMAND {
 // mc = manufactureCode
 // mc1 mc2 u1 u2 u3 u4 u5 u6
 // PMm  = Product manufacturer
-// icCode = 
+// icCode =
 //		ic1 = ROM
 //		ic2 = IC
 // maximum response time =
@@ -136,7 +136,7 @@ typedef enum SMARTCARD_COMMAND {
 //		B5(authenticate)
 //		B6(read)
 //		B7(write)
-//		B8()	
+//		B8()
 
 // ServiceCode  2bytes  (access-rights)
 // FileSystem = 1 Block = 16 bytes
@@ -147,7 +147,7 @@ typedef struct {
 	uint8_t PMm[8];
 	uint8_t iccode[2];
 	uint8_t mrt[6];
-	uint8_t servicecode[2];	
+	uint8_t servicecode[2];
 } __attribute__((__packed__)) felica_card_select_t;
 
 typedef enum FELICA_COMMAND {
diff --git a/include/proxmark3.h b/include/proxmark3.h
index 4532baf09..4b16f4eed 100644
--- a/include/proxmark3.h
+++ b/include/proxmark3.h
@@ -86,9 +86,9 @@
 #define LED_D_OFF()		LOW(GPIO_LED_D)
 #define LED_D_INV()		INVBIT(GPIO_LED_D)
 
-// SPI 
-#define SCK_LOW         LOW(GPIO_SPCK) 
-#define SCK_HIGH        HIGH(GPIO_SPCK) 
+// SPI
+#define SCK_LOW         LOW(GPIO_SPCK)
+#define SCK_HIGH        HIGH(GPIO_SPCK)
 #define MOSI_HIGH       HIGH(GPIO_MOSI)
 #define MOSI_LOW        LOW(GPIO_MOSI)
 #define MISO_VALUE      (AT91C_BASE_PIOA->PIO_PDSR & GPIO_MISO)
@@ -106,7 +106,7 @@
 #define BUTTON_PRESS()	!((AT91C_BASE_PIOA->PIO_PDSR & GPIO_BUTTON) == GPIO_BUTTON)
 
 //NVDD goes LOW when USB is attached.
-#define USB_ATTACHED()	!((AT91C_BASE_PIOA->PIO_PDSR & GPIO_NVDD_ON) == GPIO_NVDD_ON)   
+#define USB_ATTACHED()	!((AT91C_BASE_PIOA->PIO_PDSR & GPIO_NVDD_ON) == GPIO_NVDD_ON)
 
 #define VERSION_INFORMATION_MAGIC 0x56334d50
 struct version_information {
diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index a54b27e0f..0680b443a 100644
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -48,7 +48,7 @@ typedef struct{
 	uint16_t write_gap;
 	uint16_t write_0;
 	uint16_t write_1;
-	uint16_t read_gap; 
+	uint16_t read_gap;
 } t55xx_config;
 
 // For the bootloader
@@ -161,7 +161,7 @@ typedef struct{
 #define CMD_SIMULATE_HITAG                                                0x0371
 #define CMD_READER_HITAG                                                  0x0372
 
-// For HitagS 
+// For HitagS
 #define CMD_TEST_HITAGS_TRACES											  0x0367
 #define CMD_SIMULATE_HITAG_S											  0x0368
 #define CMD_READ_HITAG_S												  0x0373
@@ -202,7 +202,7 @@ typedef struct{
 #define CMD_ICLASS_AUTHENTICATION                                         0x0399
 #define CMD_ICLASS_CHECK_KEYS                                             0x039A
 
-// For ISO1092 / FeliCa 
+// For ISO1092 / FeliCa
 #define CMD_FELICA_SIMULATE_TAG                                           0x03A0
 #define CMD_FELICA_SNOOP                                                  0x03A1
 #define CMD_FELICA_COMMAND                                                0x03A2
@@ -253,7 +253,7 @@ typedef struct{
 #define CMD_MIFARE_SNIFFER                                                0x0630
 //ultralightC
 #define CMD_MIFAREUC_AUTH                                                 0x0724
-//0x0725 and 0x0726 no longer used 
+//0x0725 and 0x0726 no longer used
 #define CMD_MIFAREUC_SETPWD                                               0x0727
 
 // mifare desfire
diff --git a/liblua/lgc.c b/liblua/lgc.c
index 535e988ae..af001682c 100644
--- a/liblua/lgc.c
+++ b/liblua/lgc.c
@@ -1053,7 +1053,7 @@ static lu_mem singlestep (lua_State *L) {
         g->gcstate = GCSatomic;  /* finish mark phase */
         g->GCestimate = g->GCmemtrav;  /* save what was counted */;
         work = atomic(L);  /* add what was traversed by 'atomic' */
-        g->GCestimate += work;  /* estimate of total memory traversed */ 
+        g->GCestimate += work;  /* estimate of total memory traversed */
         sw = entersweep(L);
         return work + sw * GCSWEEPCOST;
       }
diff --git a/tools/mfkey/crapto1.c b/tools/mfkey/crapto1.c
index 203efeb4f..9b2b58085 100755
--- a/tools/mfkey/crapto1.c
+++ b/tools/mfkey/crapto1.c
@@ -222,7 +222,7 @@ struct Crypto1State* lfsr_recovery32(uint32_t ks2, uint32_t in)
 
 	// allocate memory for out of place bucket_sort
 	bucket_array_t bucket;
-	
+
 	for (uint32_t i = 0; i < 2; i++) {
 		for (uint32_t j = 0; j <= 0xff; j++) {
 			bucket[i][j].head = malloc(sizeof(uint32_t)<<14);
@@ -424,7 +424,7 @@ uint32_t lfsr_rollback_word(struct Crypto1State *s, uint32_t in, int fb)
 	ret |= lfsr_rollback_bit(s, BEBIT(in, 18), fb) << (18 ^ 24);
 	ret |= lfsr_rollback_bit(s, BEBIT(in, 17), fb) << (17 ^ 24);
 	ret |= lfsr_rollback_bit(s, BEBIT(in, 16), fb) << (16 ^ 24);
-	
+
 	ret |= lfsr_rollback_bit(s, BEBIT(in, 15), fb) << (15 ^ 24);
 	ret |= lfsr_rollback_bit(s, BEBIT(in, 14), fb) << (14 ^ 24);
 	ret |= lfsr_rollback_bit(s, BEBIT(in, 13), fb) << (13 ^ 24);
@@ -433,7 +433,7 @@ uint32_t lfsr_rollback_word(struct Crypto1State *s, uint32_t in, int fb)
 	ret |= lfsr_rollback_bit(s, BEBIT(in, 10), fb) << (10 ^ 24);
 	ret |= lfsr_rollback_bit(s, BEBIT(in, 9), fb) << (9 ^ 24);
 	ret |= lfsr_rollback_bit(s, BEBIT(in, 8), fb) << (8 ^ 24);
-	
+
 	ret |= lfsr_rollback_bit(s, BEBIT(in, 7), fb) << (7 ^ 24);
 	ret |= lfsr_rollback_bit(s, BEBIT(in, 6), fb) << (6 ^ 24);
 	ret |= lfsr_rollback_bit(s, BEBIT(in, 5), fb) << (5 ^ 24);
@@ -483,7 +483,7 @@ uint32_t *lfsr_prefix_ks(uint8_t ks[8], int isodd)
 {
 	uint32_t *candidates = malloc(4 << 10);
 	if(!candidates) return 0;
-	
+
 	uint32_t c,  entry;
 	int size = 0, i, good;
 
@@ -531,7 +531,7 @@ static struct Crypto1State* check_pfx_parity(uint32_t prefix, uint32_t rresp, ui
 	}
 
 	return sl + good;
-} 
+}
 
 /** lfsr_common_prefix
  * Implentation of the common prefix attack.
diff --git a/tools/mfkey/crapto1.h b/tools/mfkey/crapto1.h
index 65c570216..875ffdaab 100755
--- a/tools/mfkey/crapto1.h
+++ b/tools/mfkey/crapto1.h
@@ -44,7 +44,7 @@ uint32_t lfsr_rollback_word(struct Crypto1State* s, uint32_t in, int fb);
 int nonce_distance(uint32_t from, uint32_t to);
 #define SWAPENDIAN(x)\
 	(x = (x >> 8 & 0xff00ff) | (x & 0xff00ff) << 8, x = x >> 16 | x << 16)
-	
+
 #define FOREACH_VALID_NONCE(N, FILTER, FSIZE)\
 	uint32_t __n = 0,__M = 0, N = 0;\
 	int __i;\
@@ -54,7 +54,7 @@ int nonce_distance(uint32_t from, uint32_t to);
 				break;\
 			else if(__i)\
 				__M = prng_successor(__M, (__i == 7) ? 48 : 8);\
-			else 
+			else
 
 #define LF_POLY_ODD (0x29CE5C)
 #define LF_POLY_EVEN (0x870804)
diff --git a/tools/mfkey/crypto1.c b/tools/mfkey/crypto1.c
index f49a07225..14e2cc829 100755
--- a/tools/mfkey/crypto1.c
+++ b/tools/mfkey/crypto1.c
@@ -25,8 +25,8 @@ struct Crypto1State * crypto1_create(uint64_t key)
 	struct Crypto1State *s = malloc(sizeof(*s));
 	if ( !s ) return NULL;
 
-	s->odd = s->even = 0;	
-	
+	s->odd = s->even = 0;
+
 	int i;
 	//for(i = 47;s && i > 0; i -= 2) {
 	for(i = 47; i > 0; i -= 2) {
@@ -103,7 +103,7 @@ uint32_t crypto1_word(struct Crypto1State *s, uint32_t in, int is_encrypted)
 	ret |= crypto1_bit(s, BEBIT(in, 5), is_encrypted) << (5 ^ 24);
 	ret |= crypto1_bit(s, BEBIT(in, 6), is_encrypted) << (6 ^ 24);
 	ret |= crypto1_bit(s, BEBIT(in, 7), is_encrypted) << (7 ^ 24);
-	
+
 	ret |= crypto1_bit(s, BEBIT(in, 8), is_encrypted) << (8 ^ 24);
 	ret |= crypto1_bit(s, BEBIT(in, 9), is_encrypted) << (9 ^ 24);
 	ret |= crypto1_bit(s, BEBIT(in, 10), is_encrypted) << (10 ^ 24);
diff --git a/tools/mfkey/mfkey32.c b/tools/mfkey/mfkey32.c
index 1196868d4..2761a063b 100755
--- a/tools/mfkey/mfkey32.c
+++ b/tools/mfkey/mfkey32.c
@@ -43,14 +43,14 @@ int main (int argc, char *argv[]) {
 	uint32_t p64 = prng_successor(nt, 64);
 	printf("  nt': %08x\n", p64);
 	printf(" nt'': %08x\n", prng_successor(p64, 32));
-	
+
 	// Extract the keystream from the messages
 	printf("\nKeystream used to generate {ar} and {at}:\n");
 	ks2 = ar0_enc ^ p64;
 	printf("  ks2: %08x\n", ks2);
 
 	s = lfsr_recovery32(ar0_enc ^ p64, 0);
-  
+
 	for(t = s; t->odd | t->even; ++t) {
 		lfsr_rollback_word(t, 0, 0);
 		lfsr_rollback_word(t, nr0_enc, 1);
diff --git a/tools/mfkey/mfkey32v2.c b/tools/mfkey/mfkey32v2.c
index 9c04e9c18..03189aa73 100644
--- a/tools/mfkey/mfkey32v2.c
+++ b/tools/mfkey/mfkey32v2.c
@@ -3,7 +3,7 @@
 #include "crapto1.h"
 #include <stdio.h>
 #include <stdlib.h>
- 
+
 int main (int argc, char *argv[]) {
 	struct Crypto1State *s,*t;
 	uint64_t key;     // recovered key
@@ -46,7 +46,7 @@ int main (int argc, char *argv[]) {
 	printf("\nLFSR succesors of the tag challenge:\n");
 	uint32_t p64 = prng_successor(nt0, 64);
 	uint32_t p64b = prng_successor(nt1, 64);
-	
+
 	printf("  nt': %08x\n", p64);
 	printf(" nt'': %08x\n", prng_successor(p64, 32));
 
@@ -56,13 +56,13 @@ int main (int argc, char *argv[]) {
 	printf("  ks2: %08x\n",ks2);
 
 	s = lfsr_recovery32(ar0_enc ^ p64, 0);
-  
+
 	for(t = s; t->odd | t->even; ++t) {
 		lfsr_rollback_word(t, 0, 0);
 		lfsr_rollback_word(t, nr0_enc, 1);
 		lfsr_rollback_word(t, uid ^ nt0, 0);
 		crypto1_get_lfsr(t, &key);
-		
+
 		crypto1_word(t, uid ^ nt1, 0);
 		crypto1_word(t, nr1_enc, 1);
 		if (ar1_enc == (crypto1_word(t, 0, 0) ^ p64b)) {
diff --git a/tools/mfkey/mfkey64.c b/tools/mfkey/mfkey64.c
index bf1226ba8..a05cd223e 100755
--- a/tools/mfkey/mfkey64.c
+++ b/tools/mfkey/mfkey64.c
@@ -26,7 +26,7 @@ int main (int argc, char *argv[]) {
 
 	int encc = argc - 6;
 	int enclen[encc];
-	uint8_t enc[encc][120]; 
+	uint8_t enc[encc][120];
 
 	sscanf(argv[1],"%x",&uid);
 	sscanf(argv[2],"%x",&nt);
@@ -39,7 +39,7 @@ int main (int argc, char *argv[]) {
 			sscanf(argv[i+6] + i2*2, "%2x", (unsigned int *)&enc[i][i2]);
 		}
 	}
-	
+
 	printf("Recovering key for:\n");
 
 	printf("  uid: %08x\n",uid);
@@ -60,7 +60,7 @@ int main (int argc, char *argv[]) {
 	printf("\nLFSR succesors of the tag challenge:\n");
 	printf("  nt': %08x\n",prng_successor(nt, 64));
 	printf(" nt'': %08x\n",prng_successor(nt, 96));
-	
+
 	// Extract the keystream from the messages
 	printf("\nKeystream used to generate {ar} and {at}:\n");
 	ks2 = ar_enc ^ prng_successor(nt, 64);
@@ -73,11 +73,11 @@ int main (int argc, char *argv[]) {
 	// Decrypting communication using keystream if presented
 	if (argc > 6 ) {
 		printf("\nDecrypted communication:\n");
-		uint8_t ks4; 
+		uint8_t ks4;
 		int rollb = 0;
 		for (int i = 0; i < encc; i++) {
 			printf("{dec%d}: ", i);
-			for (int i2 = 0; i2 < enclen[i]; i2++) {  
+			for (int i2 = 0; i2 < enclen[i]; i2++) {
 				ks4 = crypto1_byte(revstate, 0, 0);
 				printf("%02x", ks4 ^ enc[i][i2]);
 				rollb += 1;
@@ -87,7 +87,7 @@ int main (int argc, char *argv[]) {
 		for (int i = 0; i < rollb; i++)
 			lfsr_rollback_byte(revstate, 0, 0);
 	}
-  
+
 	lfsr_rollback_word(revstate, 0, 0);
 	lfsr_rollback_word(revstate, 0, 0);
 	lfsr_rollback_word(revstate, nr_enc, 1);
diff --git a/tools/nonce2key/crapto1.c b/tools/nonce2key/crapto1.c
index fcfa931c4..5412ca8f6 100644
--- a/tools/nonce2key/crapto1.c
+++ b/tools/nonce2key/crapto1.c
@@ -221,7 +221,7 @@ struct Crypto1State* lfsr_recovery32(uint32_t ks2, uint32_t in)
 
 	// allocate memory for out of place bucket_sort
 	bucket_array_t bucket;
-	
+
 	for (uint32_t i = 0; i < 2; i++) {
 		for (uint32_t j = 0; j <= 0xff; j++) {
 			bucket[i][j].head = malloc(sizeof(uint32_t)<<14);
@@ -423,7 +423,7 @@ uint32_t lfsr_rollback_word(struct Crypto1State *s, uint32_t in, int fb)
 	ret |= lfsr_rollback_bit(s, BEBIT(in, 18), fb) << (18 ^ 24);
 	ret |= lfsr_rollback_bit(s, BEBIT(in, 17), fb) << (17 ^ 24);
 	ret |= lfsr_rollback_bit(s, BEBIT(in, 16), fb) << (16 ^ 24);
-	
+
 	ret |= lfsr_rollback_bit(s, BEBIT(in, 15), fb) << (15 ^ 24);
 	ret |= lfsr_rollback_bit(s, BEBIT(in, 14), fb) << (14 ^ 24);
 	ret |= lfsr_rollback_bit(s, BEBIT(in, 13), fb) << (13 ^ 24);
@@ -432,7 +432,7 @@ uint32_t lfsr_rollback_word(struct Crypto1State *s, uint32_t in, int fb)
 	ret |= lfsr_rollback_bit(s, BEBIT(in, 10), fb) << (10 ^ 24);
 	ret |= lfsr_rollback_bit(s, BEBIT(in, 9), fb) << (9 ^ 24);
 	ret |= lfsr_rollback_bit(s, BEBIT(in, 8), fb) << (8 ^ 24);
-	
+
 	ret |= lfsr_rollback_bit(s, BEBIT(in, 7), fb) << (7 ^ 24);
 	ret |= lfsr_rollback_bit(s, BEBIT(in, 6), fb) << (6 ^ 24);
 	ret |= lfsr_rollback_bit(s, BEBIT(in, 5), fb) << (5 ^ 24);
@@ -482,7 +482,7 @@ uint32_t *lfsr_prefix_ks(uint8_t ks[8], int isodd)
 {
 	uint32_t *candidates = malloc(4 << 10);
 	if(!candidates) return 0;
-	
+
 	uint32_t c,  entry;
 	int size = 0, i, good;
 
@@ -530,7 +530,7 @@ static struct Crypto1State* check_pfx_parity(uint32_t prefix, uint32_t rresp, ui
 	}
 
 	return sl + good;
-} 
+}
 
 /** lfsr_common_prefix
  * Implentation of the common prefix attack.
diff --git a/tools/nonce2key/crapto1.h b/tools/nonce2key/crapto1.h
index 3eaf88b72..2fd6600ec 100644
--- a/tools/nonce2key/crapto1.h
+++ b/tools/nonce2key/crapto1.h
@@ -44,7 +44,7 @@ uint32_t lfsr_rollback_word(struct Crypto1State* s, uint32_t in, int fb);
 int nonce_distance(uint32_t from, uint32_t to);
 #define SWAPENDIAN(x)\
 	(x = (x >> 8 & 0xff00ff) | (x & 0xff00ff) << 8, x = x >> 16 | x << 16)
-	
+
 #define FOREACH_VALID_NONCE(N, FILTER, FSIZE)\
 	uint32_t __n = 0,__M = 0, N = 0;\
 	int __i;\
@@ -54,7 +54,7 @@ int nonce_distance(uint32_t from, uint32_t to);
 				break;\
 			else if(__i)\
 				__M = prng_successor(__M, (__i == 7) ? 48 : 8);\
-			else 
+			else
 
 #define LF_POLY_ODD (0x29CE5C)
 #define LF_POLY_EVEN (0x870804)
diff --git a/tools/nonce2key/crypto1.c b/tools/nonce2key/crypto1.c
index f49a07225..14e2cc829 100644
--- a/tools/nonce2key/crypto1.c
+++ b/tools/nonce2key/crypto1.c
@@ -25,8 +25,8 @@ struct Crypto1State * crypto1_create(uint64_t key)
 	struct Crypto1State *s = malloc(sizeof(*s));
 	if ( !s ) return NULL;
 
-	s->odd = s->even = 0;	
-	
+	s->odd = s->even = 0;
+
 	int i;
 	//for(i = 47;s && i > 0; i -= 2) {
 	for(i = 47; i > 0; i -= 2) {
@@ -103,7 +103,7 @@ uint32_t crypto1_word(struct Crypto1State *s, uint32_t in, int is_encrypted)
 	ret |= crypto1_bit(s, BEBIT(in, 5), is_encrypted) << (5 ^ 24);
 	ret |= crypto1_bit(s, BEBIT(in, 6), is_encrypted) << (6 ^ 24);
 	ret |= crypto1_bit(s, BEBIT(in, 7), is_encrypted) << (7 ^ 24);
-	
+
 	ret |= crypto1_bit(s, BEBIT(in, 8), is_encrypted) << (8 ^ 24);
 	ret |= crypto1_bit(s, BEBIT(in, 9), is_encrypted) << (9 ^ 24);
 	ret |= crypto1_bit(s, BEBIT(in, 10), is_encrypted) << (10 ^ 24);
diff --git a/tools/nonce2key/nonce2key.c b/tools/nonce2key/nonce2key.c
index fffa5a2ac..f7bbc43b7 100644
--- a/tools/nonce2key/nonce2key.c
+++ b/tools/nonce2key/nonce2key.c
@@ -20,7 +20,7 @@ int main(const int argc, const char* argv[]) {
 	sscanf(argv[2],"%08x", &nt);
 	sscanf(argv[3],"%016" SCNx64 ,&par_info);
 	sscanf(argv[4],"%016" SCNx64 ,&ks_info);
-  
+
 	// Reset the last three significant bits of the reader nonce
 	nr &= 0xffffff1f;
 
@@ -47,7 +47,7 @@ int main(const int argc, const char* argv[]) {
 		printf("%01x|\n", par[i][7]);
 	}
 	printf("+----+--------+---+-----+---------------+\n");
- 
+
 	state = lfsr_common_prefix(nr,rr,ks3x,par);
 	lfsr_rollback_word(state,uid^nt,0);
 	crypto1_get_lfsr(state,&key_recovered);
diff --git a/uart/uart.h b/uart/uart.h
index a1521a58d..d724831be 100644
--- a/uart/uart.h
+++ b/uart/uart.h
@@ -86,7 +86,7 @@ void uart_close(const serial_port sp);
  *
  * Returns FALSE if there was an error reading from the device. Note that a
  * partial read may have completed into the buffer by the corresponding
- * implementation, so pszRxLen should be checked to see if any data was written. 
+ * implementation, so pszRxLen should be checked to see if any data was written.
  */
 bool uart_receive(const serial_port sp, uint8_t* pbtRx, size_t pszMaxRxLen, size_t* pszRxLen);
 
diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index c3ff7dcca..58f24298d 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -34,7 +34,7 @@
  */
 
 // Test if we are dealing with posix operating systems
-#ifndef _WIN32	 
+#ifndef _WIN32
 #define _DEFAULT_SOURCE
 
 #include "uart.h"
@@ -88,7 +88,7 @@ serial_port uart_open(const char* pcPortName) {
 		}
 
 		timeout.tv_usec = 300000;  // 300 000 micro seconds
-		
+
 		char *colon = strrchr(addrstr, ':');
 		char *portstr;
 		if (colon) {
@@ -142,7 +142,7 @@ serial_port uart_open(const char* pcPortName) {
 		return sp;
 	}
 
-  
+
 	sp->fd = open(pcPortName, O_RDWR | O_NOCTTY | O_NDELAY | O_NONBLOCK);
 	if (sp->fd == -1) {
 		uart_close(sp);
@@ -196,12 +196,12 @@ serial_port uart_open(const char* pcPortName) {
 
 #ifdef WITH_FPC
 	if ( uart_set_speed(sp, 115200) ) {
-		printf("[=] UART Setting serial baudrate 115200 [FPC enabled]\n");  
+		printf("[=] UART Setting serial baudrate 115200 [FPC enabled]\n");
 	} else {
 		uart_set_speed(sp, 9600);
-		printf("[=] UART Setting serial baudrate 9600 [FPC enabled]\n");		
+		printf("[=] UART Setting serial baudrate 9600 [FPC enabled]\n");
 	}
-#else	
+#else
 	// set speed, works for UBUNTU 14.04
 	bool success = uart_set_speed(sp, 460800);
 	if (success) {
@@ -210,7 +210,7 @@ serial_port uart_open(const char* pcPortName) {
 		uart_set_speed(sp, 115200);
 		printf("[=] UART Setting serial baudrate 115200\n");
 	}
-#endif  
+#endif
 	return sp;
 }
 
@@ -229,7 +229,7 @@ void uart_close(const serial_port sp) {
 	int err = fcntl(spu->fd, F_SETLK, &fl);
 	if ( err == -1) {
 		//perror("fcntl");
-	}  
+	}
 	close(spu->fd);
 	free(sp);
 }
@@ -242,7 +242,7 @@ bool uart_receive(const serial_port sp, uint8_t* pbtRx, size_t pszMaxRxLen, size
 
 	// Reset the output count
 	*pszRxLen = 0;
-  
+
 	do {
 		// Reset file descriptor
 		FD_ZERO(&rfds);
@@ -365,11 +365,11 @@ bool uart_set_speed(serial_port sp, const uint32_t uiPortSpeed) {
 #  endif
 		default: return false;
 	};
-	
+
 	struct termios ti;
-	if (tcgetattr(spu->fd,&ti) == -1) 
+	if (tcgetattr(spu->fd,&ti) == -1)
 		return false;
-	
+
 	// Set port speed (Input and Output)
 	cfsetispeed(&ti, stPortSpeed);
 	cfsetospeed(&ti, stPortSpeed);
@@ -380,10 +380,10 @@ uint32_t uart_get_speed(const serial_port sp) {
 	struct termios ti;
 	uint32_t uiPortSpeed;
 	const serial_port_unix* spu = (serial_port_unix*)sp;
-	
-	if (tcgetattr(spu->fd, &ti) == -1) 
+
+	if (tcgetattr(spu->fd, &ti) == -1)
 		return 0;
-	
+
 	// Set port speed (Input)
 	speed_t stPortSpeed = cfgetispeed(&ti);
 	switch (stPortSpeed) {
diff --git a/uart/uart_win32.c b/uart/uart_win32.c
index 438f586c8..5f269c677 100644
--- a/uart/uart_win32.c
+++ b/uart/uart_win32.c
@@ -67,8 +67,8 @@ serial_port uart_open(const char* pcPortName) {
 		uart_close(sp);
 		return INVALID_SERIAL_PORT;
 	}
-  
-	// Prepare the device control 
+
+	// Prepare the device control
 	// doesn't matter since PM3 device ignors this CDC command:  set_line_coding in usb_cdc.c
 	memset(&sp->dcb, 0, sizeof(DCB));
 	sp->dcb.DCBlength = sizeof(DCB);
@@ -77,7 +77,7 @@ serial_port uart_open(const char* pcPortName) {
 		printf("[!] UART error cdc setup\n");
 		return INVALID_SERIAL_PORT;
 	}
-  
+
 	// Update the active serial port
 	if (!SetCommState(sp->hPort, &sp->dcb)) {
 		uart_close(sp);
@@ -92,20 +92,20 @@ serial_port uart_open(const char* pcPortName) {
 	sp->ct.ReadTotalTimeoutConstant    = 1500;
 	sp->ct.WriteTotalTimeoutMultiplier = 1000;
 	sp->ct.WriteTotalTimeoutConstant   = 0;
-#else	
+#else
 	sp->ct.ReadIntervalTimeout         = 30;
 	sp->ct.ReadTotalTimeoutMultiplier  = 0;
 	sp->ct.ReadTotalTimeoutConstant    = 30;
 	sp->ct.WriteTotalTimeoutMultiplier = 30;
 	sp->ct.WriteTotalTimeoutConstant   = 0;
-#endif 
- 
+#endif
+
 	if (!SetCommTimeouts(sp->hPort, &sp->ct)) {
 		uart_close(sp);
 		printf("[!] UART error while setting comm time outs\n");
 		return INVALID_SERIAL_PORT;
 	}
-  
+
 	PurgeComm(sp->hPort, PURGE_RXABORT | PURGE_RXCLEAR);
 
 #ifdef WITH_FPC
@@ -113,7 +113,7 @@ serial_port uart_open(const char* pcPortName) {
 		printf("[=] UART Setting serial baudrate 115200 [FPC enabled]\n");
 	} else {
 		uart_set_speed(sp, 9600);
-		printf("[=] UART Setting serial baudrate 9600 [FPC enabled]\n");		
+		printf("[=] UART Setting serial baudrate 9600 [FPC enabled]\n");
 	}
 #else
 	bool success = uart_set_speed(sp, 460800);
@@ -123,7 +123,7 @@ serial_port uart_open(const char* pcPortName) {
 		uart_set_speed(sp, 115200);
 		printf("[=] UART Setting serial baudrate 115200\n");
 	}
-#endif  
+#endif
 	return sp;
 }
 
@@ -149,7 +149,7 @@ bool uart_set_speed(serial_port sp, const uint32_t uiPortSpeed) {
 		default:
 			return false;
 	};
-	
+
 	spw = (serial_port_windows*)sp;
 	spw->dcb.BaudRate = uiPortSpeed;
 	bool result = SetCommState(spw->hPort, &spw->dcb);
@@ -170,7 +170,7 @@ bool uart_receive(const serial_port sp, uint8_t* p_rx, size_t pszMaxRxLen, size_
 }
 
 bool uart_send(const serial_port sp, const uint8_t* p_tx, const size_t len) {
-	DWORD txlen = 0;		
+	DWORD txlen = 0;
 	return WriteFile(((serial_port_windows*)sp)->hPort, p_tx, len, &txlen, NULL);
 }
 
diff --git a/zlib/deflate.c b/zlib/deflate.c
index 8e9a3e653..593f5ebd3 100644
--- a/zlib/deflate.c
+++ b/zlib/deflate.c
@@ -61,14 +61,14 @@ const char deflate_copyright[] =
  */
 
 //-----------------------------------------------------------------------------
-// This version of zlib is modified for use within the Proxmark3 project. 
+// This version of zlib is modified for use within the Proxmark3 project.
 // Files from the original distribution which are not required for this
 // purpose are not included. All modifications can easily be found
 // by searching for #ifdef ZLIB_PM3_TUNED and #ifndef ZLIB_PM3_TUNED.
 //-----------------------------------------------------------------------------
 
 
- 
+
 /* ===========================================================================
  *  Function prototypes.
  */
@@ -1776,7 +1776,7 @@ local uInt try_harder(s, strstart, lookahead, hash_head)
 		} else {
 			combined_gain = s->strstart - strstart + 1 - MIN_MATCH;  // (possibly truncated) previous_length - 3 literals
 		}
-		if (match_length < MIN_MATCH) { 
+		if (match_length < MIN_MATCH) {
 			combined_gain += 0;							// no gain
 		} else {
 			combined_gain += match_length - MIN_MATCH; 	// match_length bytes are coded as three literals
@@ -1791,7 +1791,7 @@ local uInt try_harder(s, strstart, lookahead, hash_head)
 		hash_head = s->head[s->ins_h];
 	} while (s->strstart <= strstart-1 + prev_length 			// try to truncate the previous match to 1, 3, ... prev_length
 			&& s->strstart <= s->window_size - MIN_LOOKAHEAD);	// watch out for the end of the input
-	
+
 	s->strstart = strstart_save;
 	s->lookahead = lookahead_save;
 	s->ins_h = ins_h_save;
diff --git a/zlib/inflate.c b/zlib/inflate.c
index 656cd6464..1b3003370 100644
--- a/zlib/inflate.c
+++ b/zlib/inflate.c
@@ -81,14 +81,14 @@
  */
 
 //-----------------------------------------------------------------------------
-// This version of zlib is modified for use within the Proxmark3 project. 
+// This version of zlib is modified for use within the Proxmark3 project.
 // Files from the original distribution which are not required for this
 // purpose are not included. All modifications can easily be found
 // by searching for #ifdef ZLIB_PM3_TUNED and #ifndef ZLIB_PM3_TUNED.
 //-----------------------------------------------------------------------------
 
 
- 
+
 #include "zutil.h"
 #include "inftrees.h"
 #include "inflate.h"
@@ -858,7 +858,7 @@ int flush;
 #ifdef ZLIB_PM3_TUNED
                 strm->msg = (char *)"fixed block coding not supported";
 				state->mode = BAD;
-#else				
+#else
                 fixedtables(state);
                 Tracev((stderr, "inflate:     fixed codes block%s\n",
                         state->last ? " (last)" : ""));
diff --git a/zlib/trees.c b/zlib/trees.c
index df83f56a3..9d032bf9c 100644
--- a/zlib/trees.c
+++ b/zlib/trees.c
@@ -33,7 +33,7 @@
 /* @(#) $Id$ */
 
 //-----------------------------------------------------------------------------
-// This version of zlib is modified for use within the Proxmark3 project. 
+// This version of zlib is modified for use within the Proxmark3 project.
 // Files from the original distribution which are not required for this
 // purpose are not included. All modifications can easily be found
 // by searching for #ifdef ZLIB_PM3_TUNED and #ifndef ZLIB_PM3_TUNED.
@@ -997,9 +997,9 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
 #ifdef DEBUG
         s->compressed_len += 3 + s->opt_len;
 #endif
-#ifndef ZLIB_PM3_TUNED	
+#ifndef ZLIB_PM3_TUNED
     }
-#endif	
+#endif
     Assert (s->compressed_len == s->bits_sent, "bad compressed size");
     /* The above check is made mod 2^32, for files larger than 512 MB
      * and uLong implemented on 32 bits.
diff --git a/zlib/zlib.h b/zlib/zlib.h
index b2aa55728..d62758aaf 100644
--- a/zlib/zlib.h
+++ b/zlib/zlib.h
@@ -29,7 +29,7 @@
 */
 
 //-----------------------------------------------------------------------------
-// This version of zlib is modified for use within the Proxmark3 project. 
+// This version of zlib is modified for use within the Proxmark3 project.
 // Files from the original distribution which are not required for this
 // purpose are not included. All modifications can easily be found
 // by searching for #ifdef ZLIB_PM3_TUNED and #ifndef ZLIB_PM3_TUNED.

From bdd04942901fb86e9585fd8cafd1a1fc87fa8649 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 9 Mar 2019 09:11:08 +0100
Subject: [PATCH 0681/1938] remove spurious spaces & tabs at end of lines: cpp
 files

---
 client/proxgui.cpp   |  2 +-
 client/proxguiqt.cpp | 28 ++++++++++++++--------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/client/proxgui.cpp b/client/proxgui.cpp
index 3815579f4..b71ca59e3 100644
--- a/client/proxgui.cpp
+++ b/client/proxgui.cpp
@@ -19,7 +19,7 @@ WorkerThread::WorkerThread(char *script_cmds_file, char *script_cmd, bool usb_pr
 {
 }
 
-WorkerThread::~WorkerThread() 
+WorkerThread::~WorkerThread()
 {
 }
 
diff --git a/client/proxguiqt.cpp b/client/proxguiqt.cpp
index c8ccba197..f5bdc0243 100644
--- a/client/proxguiqt.cpp
+++ b/client/proxguiqt.cpp
@@ -58,11 +58,11 @@ void ProxGuiQT::_ShowGraphWindow(void) {
 		return;
 
 	if (!plotwidget) {
-		
+
 #if defined(__MACH__) && defined(__APPLE__)
 		makeFocusable();
-#endif	
-	
+#endif
+
 		plotwidget = new ProxWidget();
 	}
 	plotwidget->show();
@@ -114,7 +114,7 @@ void ProxGuiQT::MainLoop()
 	makeUnfocusable();
 #endif
 
-	
+
 	plotapp->exec();
 }
 
@@ -248,7 +248,7 @@ int Plot::xCoordOf(int i, QRect r ) {
 }
 
 int Plot::yCoordOf(int v, QRect r, int maxVal) {
-	int z = (r.bottom() - r.top()) / 2;	
+	int z = (r.bottom() - r.top()) / 2;
 	if ( maxVal == 0 ) ++maxVal;
 	return -(z * v) / maxVal + z;
 }
@@ -427,10 +427,10 @@ void Plot::PlotGraph(int *buffer, int len, QRect plotRect, QRect annotationRect,
 }
 
 void Plot::plotGridLines(QPainter* painter, QRect r) {
-		
+
 	// set GridOffset
 	if (PlotGridX <= 0) return;
-	
+
 	int offset = GridOffset;
 	if (GridLocked && PlotGridX) {
 		offset = GridOffset + PlotGridX - (GraphStart % PlotGridX);
@@ -447,9 +447,9 @@ void Plot::plotGridLines(QPainter* painter, QRect r) {
 	if ((PlotGridX > 0) && ((PlotGridX * GraphPixelsPerPoint) > 1)) {
 		for (i = (offset * GraphPixelsPerPoint); i < r.right(); i += grid_delta_x) {
 			painter->drawLine(r.left()+i, r.top(), r.left()+i, r.bottom());
-		} 
+		}
 	}
-	
+
 	if (PlotGridY > 0) {
 		for (i = 0; yCoordOf(i, r, g_absVMax) > r.top(); i += grid_delta_y) {
 			// line above mid
@@ -565,7 +565,7 @@ Plot::Plot(QWidget *parent) : QWidget(parent), GraphStart(0), GraphPixelsPerPoin
 	CursorBPos = 0;
 
 	setWindowTitle(tr("Sliders"));
-	
+
 	master = parent;
 }
 
@@ -605,7 +605,7 @@ void Plot::keyPressEvent(QKeyEvent *event)
 		else
 			offset = (int)(20 / GraphPixelsPerPoint);
 	}
-	
+
 	switch(event->key()) {
 		case Qt::Key_Down:
 			if (GraphPixelsPerPoint <= 50) {
@@ -635,7 +635,7 @@ void Plot::keyPressEvent(QKeyEvent *event)
 			}
 			break;
 
-		case Qt::Key_G:		
+		case Qt::Key_G:
 			if (PlotGridX || PlotGridY) {
 				PlotGridX = 0;
 				PlotGridY = 0;
@@ -644,7 +644,7 @@ void Plot::keyPressEvent(QKeyEvent *event)
 					PlotGridXdefault = 64;
 				if ( PlotGridYdefault < 0 )
 					PlotGridYdefault = 0;
-				
+
 				PlotGridX = PlotGridXdefault;
 				PlotGridY = PlotGridYdefault;
 			}
@@ -663,7 +663,7 @@ void Plot::keyPressEvent(QKeyEvent *event)
 			puts("\tL                        Toggle lock grid relative to samples");
 			puts("\tQ                        Hide window");
 			puts("\tLEFT                     Move left");
-			puts("\t<CTLR> LEFT              Move left 1 sample");	
+			puts("\t<CTLR> LEFT              Move left 1 sample");
 			puts("\t<SHIFT> LEFT             Page left");
 			puts("\tLEFT MOUSE CLICK         Set yellow cursor");
 			puts("\tRIGHT                    Move right");

From 716c17bac87fa1d6164c2fa7c4b9517444116d30 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 9 Mar 2019 09:11:26 +0100
Subject: [PATCH 0682/1938] Introduce make style, more to come

---
 Makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index a1c593a76..93ee2d19c 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,7 @@ recovery/%: FORCE
 	$(MAKE) -C recovery $(patsubst recovery/%,%,$@)
 FORCE: # Dummy target to force remake in the subdirectories, even if files exist (this Makefile doesn't know about the prerequisites)
 
-.PHONY: all clean help _test flash-bootrom flash-os flash-all FORCE
+.PHONY: all clean help _test flash-bootrom flash-os flash-all style FORCE
 
 help:
 	@echo Multi-OS Makefile, you are running on $(DETECTED_OS)
@@ -88,5 +88,8 @@ endif
 # easy printing of MAKE VARIABLES
 print-%: ; @echo $* = $($*) 
 
+style:
+	find . \( -name "*.[ch]" -or -name "*.cpp" \) -exec perl -pi -e 's/[ \t\r]+$$//' {} \;
+
 # Dummy target to test for GNU make availability
 _test:

From 05ff45e5504ae6cf88bae013f5d395584f6086d1 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 9 Mar 2019 10:34:43 +0100
Subject: [PATCH 0683/1938] lua: fix mix of spaces & tabs

---
 client/scripts/14araw.lua            | 230 ++++----
 client/scripts/Legic_clone.lua       | 786 +++++++++++++--------------
 client/scripts/amiibo.lua            |   6 +-
 client/scripts/brutesim.lua          | 414 +++++++-------
 client/scripts/calc_di.lua           | 224 ++++----
 client/scripts/calc_ev1_it.lua       | 232 ++++----
 client/scripts/calc_mizip.lua        | 256 ++++-----
 client/scripts/calypso.lua           | 306 +++++------
 client/scripts/cmdline.lua           |  16 +-
 client/scripts/didump.lua            | 442 +++++++--------
 client/scripts/dumptoemul-mfu.lua    | 164 +++---
 client/scripts/dumptoemul.lua        | 152 +++---
 client/scripts/e.lua                 | 100 ++--
 client/scripts/emul2dump.lua         | 118 ++--
 client/scripts/emul2html.lua         |  58 +-
 client/scripts/formatMifare.lua      | 430 +++++++--------
 client/scripts/hf_read.lua           |  24 +-
 client/scripts/htmldump.lua          |  58 +-
 client/scripts/iso15_magic.lua       | 140 ++---
 client/scripts/legic.lua             | 706 ++++++++++++------------
 client/scripts/legic_buffer2card.lua |  58 +-
 client/scripts/lf_bulk.lua           | 220 ++++----
 client/scripts/mfkeys.lua            | 364 ++++++-------
 client/scripts/mifare_access.lua     | 140 ++---
 client/scripts/mifare_autopwn.lua    | 320 +++++------
 client/scripts/mifareplus.lua        | 502 ++++++++---------
 client/scripts/ndef_dump.lua         | 320 +++++------
 client/scripts/ntag_3d.lua           | 552 +++++++++----------
 client/scripts/parameters.lua        |  44 +-
 client/scripts/read_pwd_mem.lua      | 282 +++++-----
 client/scripts/remagic.lua           | 132 ++---
 client/scripts/test_t55x7_ask.lua    | 150 ++---
 client/scripts/test_t55x7_bi.lua     | 142 ++---
 client/scripts/test_t55x7_fsk.lua    | 154 +++---
 client/scripts/test_t55x7_psk.lua    | 166 +++---
 client/scripts/tnp3clone.lua         | 252 ++++-----
 client/scripts/tnp3dump.lua          | 446 +++++++--------
 client/scripts/tnp3sim.lua           | 694 +++++++++++------------
 client/scripts/tracetest.lua         | 162 +++---
 client/scripts/ufodump.lua           | 222 ++++----
 client/scripts/ul_uid.lua            | 186 +++----
 41 files changed, 5185 insertions(+), 5185 deletions(-)

diff --git a/client/scripts/14araw.lua b/client/scripts/14araw.lua
index 01af5422e..e0448d9db 100644
--- a/client/scripts/14araw.lua
+++ b/client/scripts/14araw.lua
@@ -6,22 +6,22 @@ example = "script run 14araw -x 6000F57b"
 author = "Martin Holst Swende"
 desc =
 [[
-This is a script to allow raw 1444a commands to be sent and received. 
+This is a script to allow raw 1444a commands to be sent and received.
 
 Arguments:
-	-o 				do not connect - use this only if you previously used -p to stay connected 
-	-r 				do not read response
-	-c 				calculate and append CRC
-	-p 				stay connected - dont inactivate the field
-	-x <payload> 	Data to send (NO SPACES!)
-	-d 				Debug flag
-	-t				Topaz mode
-	-3				ISO14443-4 (use RATS)
+    -o              do not connect - use this only if you previously used -p to stay connected
+    -r              do not read response
+    -c              calculate and append CRC
+    -p              stay connected - dont inactivate the field
+    -x <payload>    Data to send (NO SPACES!)
+    -d              Debug flag
+    -t              Topaz mode
+    -3              ISO14443-4 (use RATS)
 
-Examples : 
+Examples :
 
 # 1. Connect and don't disconnect
-script run 14araw -p 
+script run 14araw -p
 # 2. Send mf auth, read response (nonce)
 script run 14araw -o -x 6000F57b -p
 # 3. disconnect
@@ -33,11 +33,11 @@ script run 14araw -x 6000F57b
 
 --[[
 
-This script communicates with 
-/armsrc/iso14443a.c, specifically ReaderIso14443a() at around line 1779 and onwards. 
+This script communicates with
+/armsrc/iso14443a.c, specifically ReaderIso14443a() at around line 1779 and onwards.
 
-Check there for details about data format and how commands are interpreted on the 
-device-side.  
+Check there for details about data format and how commands are interpreted on the
+device-side.
 ]]
 
 -- Some globals
@@ -45,143 +45,143 @@ local TIMEOUT = 2000 -- Shouldn't take longer than 2 seconds
 local DEBUG = false -- the debug flag
 
 -------------------------------
--- Some utilities 
+-- Some utilities
 -------------------------------
 
---- 
+---
 -- A debug printout-function
 local function dbg(args)
-	if DEBUG then
-		print("###", args)
-	end
-end 
---- 
+    if DEBUG then
+        print("###", args)
+    end
+end
+---
 -- This is only meant to be used when errors occur
 local function oops(err)
-	print("ERROR: ",err)
+    print("ERROR: ",err)
 end
---- 
+---
 -- Usage help
 local function help()
-	print(desc)
-	print("Example usage")
-	print(example)
+    print(desc)
+    print("Example usage")
+    print(example)
 end
---- 
+---
 -- The main entry point
 function main(args)
 
-	if args == nil or #args == 0 then return help() end
+    if args == nil or #args == 0 then return help() end
 
-	local ignore_response = false
-	local append_crc = false
-	local stayconnected = false
-	local payload = nil
-	local doconnect = true
-	local topaz_mode = false
-	local no_rats = false
-	
-	-- Read the parameters
-	for o, a in getopt.getopt(args, 'orcpx:dt3') do
-		if o == "o" then doconnect = false end		
-		if o == "r" then ignore_response = true end
-		if o == "c" then append_crc = true end
-		if o == "p" then stayconnected = true end
-		if o == "x" then payload = a end
-		if o == "d" then DEBUG = true end
-		if o == "t" then topaz_mode = true end
-		if o == "3" then no_rats = true end
-	end
+    local ignore_response = false
+    local append_crc = false
+    local stayconnected = false
+    local payload = nil
+    local doconnect = true
+    local topaz_mode = false
+    local no_rats = false
 
-	-- First of all, connect
-	if doconnect then
-		dbg("doconnect")
-		-- We reuse the connect functionality from a 
-		-- common library
-		info, err = lib14a.read(true, no_rats)
+    -- Read the parameters
+    for o, a in getopt.getopt(args, 'orcpx:dt3') do
+        if o == "o" then doconnect = false end
+        if o == "r" then ignore_response = true end
+        if o == "c" then append_crc = true end
+        if o == "p" then stayconnected = true end
+        if o == "x" then payload = a end
+        if o == "d" then DEBUG = true end
+        if o == "t" then topaz_mode = true end
+        if o == "3" then no_rats = true end
+    end
 
-		if err then return oops(err) end
-		print(("Connected to card, uid = %s"):format(info.uid))
-	end
+    -- First of all, connect
+    if doconnect then
+        dbg("doconnect")
+        -- We reuse the connect functionality from a
+        -- common library
+        info, err = lib14a.read(true, no_rats)
 
-	-- The actual raw payload, if any
-	if payload then
-		res,err = sendRaw(payload,{ignore_response = ignore_response, topaz_mode = topaz_mode, append_crc = append_crc})
-		if err then return oops(err) end
-	
-		if not ignoreresponse then 
-			-- Display the returned data	
-			showdata(res)
-		end
-	end
-	-- And, perhaps disconnect?
-	if not stayconnected then 
-		disconnect()
-	end
+        if err then return oops(err) end
+        print(("Connected to card, uid = %s"):format(info.uid))
+    end
+
+    -- The actual raw payload, if any
+    if payload then
+        res,err = sendRaw(payload,{ignore_response = ignore_response, topaz_mode = topaz_mode, append_crc = append_crc})
+        if err then return oops(err) end
+
+        if not ignoreresponse then
+            -- Display the returned data
+            showdata(res)
+        end
+    end
+    -- And, perhaps disconnect?
+    if not stayconnected then
+        disconnect()
+    end
 end
 
 --- Picks out and displays the data read from a tag
 -- Specifically, takes a usb packet, converts to a Command
--- (as in commands.lua), takes the data-array and 
+-- (as in commands.lua), takes the data-array and
 -- reads the number of bytes specified in arg1 (arg0 in c-struct)
 -- and displays the data
 -- @param usbpacket the data received from the device
 function showdata(usbpacket)
-	local cmd_response = Command.parse(usbpacket)
-	local len = tonumber(cmd_response.arg1) *2
-	--print("data length:",len)
-	local data = string.sub(tostring(cmd_response.data), 0, len);
-	print("<< ",data)
-	--print("----------------")
+    local cmd_response = Command.parse(usbpacket)
+    local len = tonumber(cmd_response.arg1) *2
+    --print("data length:",len)
+    local data = string.sub(tostring(cmd_response.data), 0, len);
+    print("<< ",data)
+    --print("----------------")
 end
 
 function sendRaw(rawdata, options)
-	print(">> ", rawdata)
-	
-	local flags = lib14a.ISO14A_COMMAND.ISO14A_NO_DISCONNECT + lib14a.ISO14A_COMMAND.ISO14A_RAW
+    print(">> ", rawdata)
 
-	if options.topaz_mode then
-		flags = flags + lib14a.ISO14A_COMMAND.ISO14A_TOPAZMODE
-	end
-	if options.append_crc then
-		flags = flags + lib14a.ISO14A_COMMAND.ISO14A_APPEND_CRC
-	end	
-	
-	local command = Command:new{cmd = cmds.CMD_READER_ISO_14443a, 
-									arg1 = flags, -- Send raw 
-									-- arg2 contains the length, which is half the length 
-									-- of the ASCII-string rawdata
-									arg2 = string.len(rawdata)/2, 
-									data = rawdata}
-	return lib14a.sendToDevice(command, options.ignore_response) 
+    local flags = lib14a.ISO14A_COMMAND.ISO14A_NO_DISCONNECT + lib14a.ISO14A_COMMAND.ISO14A_RAW
+
+    if options.topaz_mode then
+        flags = flags + lib14a.ISO14A_COMMAND.ISO14A_TOPAZMODE
+    end
+    if options.append_crc then
+        flags = flags + lib14a.ISO14A_COMMAND.ISO14A_APPEND_CRC
+    end
+
+    local command = Command:new{cmd = cmds.CMD_READER_ISO_14443a,
+                                arg1 = flags, -- Send raw
+                                -- arg2 contains the length, which is half the length
+                                -- of the ASCII-string rawdata
+                                arg2 = string.len(rawdata)/2,
+                                data = rawdata}
+    return lib14a.sendToDevice(command, options.ignore_response)
 end
 
 -- Sends an instruction to do nothing, only disconnect
 function disconnect()
-	local command = Command:new{cmd = cmds.CMD_READER_ISO_14443a, arg1 = 0,	}
-	-- We can ignore the response here, no ACK is returned for this command
-	-- Check /armsrc/iso14443a.c, ReaderIso14443a() for details
-	return lib14a.sendToDevice(command,true) 
-end								
+    local command = Command:new{cmd = cmds.CMD_READER_ISO_14443a, arg1 = 0,}
+    -- We can ignore the response here, no ACK is returned for this command
+    -- Check /armsrc/iso14443a.c, ReaderIso14443a() for details
+    return lib14a.sendToDevice(command,true)
+end
 
 -------------------------
--- 	Testing
+-- Testing
 -------------------------
 function selftest()
-	DEBUG = true
-	dbg("Performing test")
-	main()
-	main("-p")
-	main(" -o -x 6000F57b -p")
-	main("-o")
-	main("-x 6000F57b")
-	dbg("Tests done")
+    DEBUG = true
+    dbg("Performing test")
+    main()
+    main("-p")
+    main(" -o -x 6000F57b -p")
+    main("-o")
+    main("-x 6000F57b")
+    dbg("Tests done")
 end
--- Flip the switch here to perform a sanity check. 
+-- Flip the switch here to perform a sanity check.
 -- It read a nonce in two different ways, as specified in the usage-section
-if "--test"==args then 
-	selftest()
-else 
-	-- Call the main 
-	main(args)
+if "--test"==args then
+    selftest()
+else
+    -- Call the main
+    main(args)
 end
diff --git a/client/scripts/Legic_clone.lua b/client/scripts/Legic_clone.lua
index 4c638f82f..dcac7f323 100644
--- a/client/scripts/Legic_clone.lua
+++ b/client/scripts/Legic_clone.lua
@@ -1,87 +1,87 @@
 --[[
-	script to create a clone-dump with new crc
+    script to create a clone-dump with new crc
   Author: mosci
    my Fork: https://github.com/icsom/proxmark3.git
-	Upstream: https://github.com/Proxmark/proxmark3.git
+    Upstream: https://github.com/Proxmark/proxmark3.git
 
-	1. read tag-dump, xor byte 22..end with byte 0x05 of the inputfile
-	2. write to outfile 
-	3. set byte 0x05 to newcrc
-	4. until byte 0x21 plain like in inputfile
-	5. from 0x22..end xored with newcrc
-	6. calculate new crc on each segment (needs to know the new MCD & MSN0..2)
-	
-	simplest usage:
-	read a valid legic tag with 'hf legic reader'
-	save the dump with 'hf legic save orig.hex'
+    1. read tag-dump, xor byte 22..end with byte 0x05 of the inputfile
+    2. write to outfile
+    3. set byte 0x05 to newcrc
+    4. until byte 0x21 plain like in inputfile
+    5. from 0x22..end xored with newcrc
+    6. calculate new crc on each segment (needs to know the new MCD & MSN0..2)
+
+    simplest usage:
+    read a valid legic tag with 'hf legic reader'
+    save the dump with 'hf legic save orig.hex'
   place your 'empty' tag on the reader and run 'script run Legic_clone -i orig.hex -w'
   you will see some output like:
-		read 1024 bytes from legic_dumps/j_0000.hex
-		
-		place your empty tag onto the PM3 to read and display the MCD & MSN0..2
-		the values will be shown below
-		 confirm whnen ready [y/n] ?y
-		#db# setting up legic card
-		#db# MIM 256 card found, reading card ...
-		#db# Card read, use 'hf legic decode' or
-		#db# 'data hexsamples 8' to view results
-		0b ad c0 de  <- !! here you'll see the MCD & MSN of your empty tag, which has to be typed in manually as seen below !!
-		type in  MCD as 2-digit value - e.g.: 00 (default: 79 )
-		 > 0b
-		type in MSN0 as 2-digit value - e.g.: 01 (default: 28 )
-		 > ad
-		type in MSN1 as 2-digit value - e.g.: 02 (default: d1 )
-		 > c0
-		type in MSN2 as 2-digit value - e.g.: 03 (default: 43 )
-		 > de
-		MCD:0b, MSN:ad c0 de, MCC:79 <- this crc is calculated from the MCD & MSN and must match the one on yout empty tag
-		
-		wrote 1024 bytes to myLegicClone.hex
-		enter number of bytes to write? (default: 86 )
-		
-		loaded 1024 samples
-		#db# setting up legic card
-		#db# MIM 256 card found, writing 0x00 - 0x01 ...
-		#db# write successful
-		...
-		#db# setting up legic card
-		#db# MIM 256 card found, writing 0x56 - 0x01 ...
-		#db# write successful
-		proxmark3>
-	
-	the default value (number of bytes to write) is calculated over all valid segments and should be ok - just hit enter, wait until write has finished
-	and your clone should be ready (except there has to be a additional KGH-CRC to be calculated - which credentials are unknown until yet)
-	
-	the '-w' switch will only work with my fork - it needs the binary legic_crc8 which is not part of the proxmark3-master-branch
-	also the ability to write DCF is not possible with the proxmark3-master-branch
-	but creating dumpfile-clone files will be possible (without valid segment-crc - this has to done manually with) 
+        read 1024 bytes from legic_dumps/j_0000.hex
 
-	
-	(example)	Legic-Prime Layout with 'Kaba Group Header'
-			+----+----+----+----+----+----+----+----+
-  0x00|MCD |MSN0|MSN1|MSN2|MCC | 60 | ea | 9f |		
-			+----+----+----+----+----+----+----+----+
-	0x08| ff | 00 | 00 | 00 | 11 |Bck0|Bck1|Bck2|
-			+----+----+----+----+----+----+----+----+
-	0x10|Bck3|Bck4|Bck5|BCC | 00 | 00 |Seg0|Seg1|
-			+----+----+----+----+----+----+----+----+
-	0x18|Seg2|Seg3|SegC|Stp0|Stp1|Stp2|Stp3|UID0|
-			+----+----+----+----+----+----+----+----+
-	0x20|UID1|UID2|kghC|
-			+----+----+----+
-					
-				MCD=	ManufacturerID						(1 Byte)
-		MSN0..2=	ManufactureSerialNumber		(3 Byte)
-				MCC=	CRC												(1 Byte) calculated over MCD,MSN0..2
-				DCF=	DecrementalField					(2 Byte) 'credential' (enduser-Tag) seems to have always DCF-low=0x60 DCF-high=0xea
-		Bck0..5=	Backup										(6 Byte) Bck0 'dirty-flag', Bck1..5 SegmentHeader-Backup 
-				BCC=	BackupCRC									(1 Byte) CRC calculated over Bck1..5
-		Seg0..3=	SegmentHeader 						(on MIM 4 Byte )
-			 SegC=	SegmentCRC								(1 Byte) calculated over MCD,MSN0..2,Seg0..3
-		Stp0..n=	Stamp0...									(variable length) length = Segment-Len - UserData - 1
-		UID0..n=	UserDater									(variable length - with KGH hex 0x00-0x63 / dec 0-99) length = Segment-Len - WRP - WRC - 1 
-		 	 kghC=	KabaGroupHeader						(1 Byte + addr 0x0c must be 0x11)
-	as seen on ths example: addr 0x05..0x08 & 0x0c must have been set to this values - otherwise kghCRC will not be created by a official reader (not accepted)
+        place your empty tag onto the PM3 to read and display the MCD & MSN0..2
+        the values will be shown below
+         confirm whnen ready [y/n] ?y
+        #db# setting up legic card
+        #db# MIM 256 card found, reading card ...
+        #db# Card read, use 'hf legic decode' or
+        #db# 'data hexsamples 8' to view results
+        0b ad c0 de  <- !! here you'll see the MCD & MSN of your empty tag, which has to be typed in manually as seen below !!
+        type in  MCD as 2-digit value - e.g.: 00 (default: 79 )
+         > 0b
+        type in MSN0 as 2-digit value - e.g.: 01 (default: 28 )
+         > ad
+        type in MSN1 as 2-digit value - e.g.: 02 (default: d1 )
+         > c0
+        type in MSN2 as 2-digit value - e.g.: 03 (default: 43 )
+         > de
+        MCD:0b, MSN:ad c0 de, MCC:79 <- this crc is calculated from the MCD & MSN and must match the one on yout empty tag
+
+        wrote 1024 bytes to myLegicClone.hex
+        enter number of bytes to write? (default: 86 )
+
+        loaded 1024 samples
+        #db# setting up legic card
+        #db# MIM 256 card found, writing 0x00 - 0x01 ...
+        #db# write successful
+        ...
+        #db# setting up legic card
+        #db# MIM 256 card found, writing 0x56 - 0x01 ...
+        #db# write successful
+        proxmark3>
+
+    the default value (number of bytes to write) is calculated over all valid segments and should be ok - just hit enter, wait until write has finished
+    and your clone should be ready (except there has to be a additional KGH-CRC to be calculated - which credentials are unknown until yet)
+
+    the '-w' switch will only work with my fork - it needs the binary legic_crc8 which is not part of the proxmark3-master-branch
+    also the ability to write DCF is not possible with the proxmark3-master-branch
+    but creating dumpfile-clone files will be possible (without valid segment-crc - this has to done manually with)
+
+
+    (example)   Legic-Prime Layout with 'Kaba Group Header'
+      +----+----+----+----+----+----+----+----+
+  0x00|MCD |MSN0|MSN1|MSN2|MCC | 60 | ea | 9f |
+      +----+----+----+----+----+----+----+----+
+  0x08| ff | 00 | 00 | 00 | 11 |Bck0|Bck1|Bck2|
+      +----+----+----+----+----+----+----+----+
+  0x10|Bck3|Bck4|Bck5|BCC | 00 | 00 |Seg0|Seg1|
+      +----+----+----+----+----+----+----+----+
+  0x18|Seg2|Seg3|SegC|Stp0|Stp1|Stp2|Stp3|UID0|
+      +----+----+----+----+----+----+----+----+
+  0x20|UID1|UID2|kghC|
+      +----+----+----+
+
+        MCD=     ManufacturerID           (1 Byte)
+        MSN0..2= ManufactureSerialNumber  (3 Byte)
+        MCC=     CRC                      (1 Byte) calculated over MCD,MSN0..2
+        DCF=     DecrementalField         (2 Byte) 'credential' (enduser-Tag) seems to have always DCF-low=0x60 DCF-high=0xea
+        Bck0..5= Backup                   (6 Byte) Bck0 'dirty-flag', Bck1..5 SegmentHeader-Backup
+        BCC=     BackupCRC                (1 Byte) CRC calculated over Bck1..5
+        Seg0..3= SegmentHeader            (on MIM 4 Byte )
+        SegC=    SegmentCRC               (1 Byte) calculated over MCD,MSN0..2,Seg0..3
+        Stp0..n= Stamp0...                (variable length) length = Segment-Len - UserData - 1
+        UID0..n= UserDater                (variable length - with KGH hex 0x00-0x63 / dec 0-99) length = Segment-Len - WRP - WRC - 1
+        kghC=    KabaGroupHeader          (1 Byte + addr 0x0c must be 0x11)
+    as seen on this example: addr 0x05..0x08 & 0x0c must have been set to this values - otherwise kghCRC will not be created by a official reader (not accepted)
 --]]
 
 example = "Script create a clone-dump of a dump from a Legic Prime Tag"
@@ -89,24 +89,24 @@ author = "Mosci"
 desc =
 [[
 This is a script which create a clone-dump of a dump from a Legic Prime Tag (MIM256 or MIM1024)
-(created with 'hf legic save my_dump.hex') 
+(created with 'hf legic save my_dump.hex')
 requiered arguments:
-	-i <input file>		(file to read data from)
-	
-optional arguments :
-	-h                  - Help text
-	-o <output file> 	- requieres option -c to be given
-	-c <new-tag crc> 	- requieres option -o to be given
-	-d					- Display content of found Segments
-	-s					- Display summary at the end
-	-w					- write directly to Tag - a file myLegicClone.hex wille be generated also
-	
-	e.g.: 
-	hint: using the CRC '00' will result in a plain dump ( -c 00 )
+    -i <input file>     (file to read data from)
 
-Examples : 
-	script run legic_clone -i my_dump.hex -o my_clone.hex -c f8
-	script run legic_clone -i my_dump.hex -d -s
+optional arguments :
+    -h                  - Help text
+    -o <output file>    - requieres option -c to be given
+    -c <new-tag crc>    - requieres option -o to be given
+    -d                  - Display content of found Segments
+    -s                  - Display summary at the end
+    -w                  - write directly to Tag - a file myLegicClone.hex wille be generated also
+
+    e.g.:
+    hint: using the CRC '00' will result in a plain dump ( -c 00 )
+
+Examples :
+    script run legic_clone -i my_dump.hex -o my_clone.hex -c f8
+    script run legic_clone -i my_dump.hex -d -s
 ]]
 
 local utils = require('utils')
@@ -114,33 +114,33 @@ local getopt = require('getopt')
 local bxor = bit32.bxor
 
 -- we need always 2 digits
-function prepend_zero(s) 
-	if (string.len(s)==1) then return "0" .. s
-	else 
-		if (string.len(s)==0) then return "00"
-		else return s
-		end
-	end
+function prepend_zero(s)
+    if (string.len(s)==1) then return "0" .. s
+    else
+        if (string.len(s)==0) then return "00"
+        else return s
+        end
+    end
 end
 
---- 
+---
 -- This is only meant to be used when errors occur
 function oops(err)
-	print("ERROR: ",err)
-	return nil, err
+    print("ERROR: ",err)
+    return nil, err
 end
 
---- 
+---
 -- Usage help
 function help()
-	print(desc)
-	print("Example usage")
-	print(example)
+    print(desc)
+    print("Example usage")
+    print(example)
 end
 
 -- Check availability of file
 function file_check(file_name)
-  local file_found=io.open(file_name, "r")      
+  local file_found=io.open(file_name, "r")
   if file_found==nil then
     file_found=false
   else
@@ -152,113 +152,113 @@ end
 --- xor-wrapper
 -- xor all from addr 0x22 (start counting from 1 => 23)
 function xorme(hex, xor, index)
-	if ( index >= 23 ) then
-		return ('%02x'):format(bxor( tonumber(hex,16) , tonumber(xor,16) ))
-	else
-		return hex
-	end
+    if ( index >= 23 ) then
+        return ('%02x'):format(bxor( tonumber(hex,16) , tonumber(xor,16) ))
+    else
+        return hex
+    end
 end
 
 -- read input-file into array
 function getInputBytes(infile)
-	local line
-	local bytes = {}
+    local line
+    local bytes = {}
 
-	local fhi,err = io.open(infile)
-	if err then print("OOps ... faild to read from file ".. infile); return false; end
+    local fhi,err = io.open(infile)
+    if err then print("OOps ... faild to read from file ".. infile); return false; end
 
-	while true do
-		line = fhi:read()
-		if line == nil then break end
+    while true do
+        line = fhi:read()
+        if line == nil then break end
 
-		for byte in line:gmatch("%w+") do 
-			table.insert(bytes, byte)
-		end
-	end
-	
-	fhi:close()
+        for byte in line:gmatch("%w+") do
+            table.insert(bytes, byte)
+        end
+    end
 
-	print("\nread ".. #bytes .." bytes from ".. infile)
-	return bytes
+    fhi:close()
+
+    print("\nread ".. #bytes .." bytes from ".. infile)
+    return bytes
 end
 
 -- write to file
 function writeOutputBytes(bytes, outfile)
-	local line
-	local bcnt=0
-	local fho,err = io.open(outfile,"w")
-	if err then print("OOps ... faild to open output-file ".. outfile); return false; end
+    local line
+    local bcnt=0
+    local fho,err = io.open(outfile,"w")
+    if err then print("OOps ... faild to open output-file ".. outfile); return false; end
 
-	for i = 1, #bytes do
-		if (bcnt == 0) then 
-			line=bytes[i]
-		elseif (bcnt <= 7) then 
-			line=line.." "..bytes[i]
-		end
-		if (bcnt == 7) then
-			-- write line to new file
-			fho:write(line.."\n")
-			-- reset counter & line
-			bcnt=-1
-			line=""
-		end
-		bcnt=bcnt+1
-	end
-	fho:close()
-	print("\nwrote ".. #bytes .." bytes to " .. outfile)
-	return true
+    for i = 1, #bytes do
+        if (bcnt == 0) then
+            line=bytes[i]
+        elseif (bcnt <= 7) then
+            line=line.." "..bytes[i]
+        end
+        if (bcnt == 7) then
+            -- write line to new file
+            fho:write(line.."\n")
+            -- reset counter & line
+            bcnt=-1
+            line=""
+        end
+        bcnt=bcnt+1
+    end
+    fho:close()
+    print("\nwrote ".. #bytes .." bytes to " .. outfile)
+    return true
 end
 
 -- xore certain bytes
 function xorBytes(inBytes, crc)
-	local bytes = {}
-	for index = 1, #inBytes do
-		bytes[index] = xorme(inBytes[index], crc, index)
-	end
-	if (#inBytes == #bytes) then
-		-- replace crc
-		bytes[5] = string.sub(crc,-2)
-		return bytes
-	else
-		print("error: byte-count missmatch")
-		return false
-	end
+    local bytes = {}
+    for index = 1, #inBytes do
+        bytes[index] = xorme(inBytes[index], crc, index)
+    end
+    if (#inBytes == #bytes) then
+        -- replace crc
+        bytes[5] = string.sub(crc,-2)
+        return bytes
+    else
+        print("error: byte-count missmatch")
+        return false
+    end
 end
 
 -- get raw segment-data
 function getSegmentData(bytes, start, index)
-	local raw, len, valid, last, wrp, wrc, rd, crc
-	local segment = {}
-	segment[0] = bytes[start].." "..bytes[start+1].." "..bytes[start+2].." "..bytes[start+3]
-	-- flag = high nibble of byte 1
-	segment[1] = string.sub(bytes[start+1],0,1)
+    local raw, len, valid, last, wrp, wrc, rd, crc
+    local segment = {}
+    segment[0] = bytes[start].." "..bytes[start+1].." "..bytes[start+2].." "..bytes[start+3]
+    -- flag = high nibble of byte 1
+    segment[1] = string.sub(bytes[start+1],0,1)
 
-	-- valid = bit 6 of byte 1
-	segment[2] = tonumber(bit32.extract("0x"..bytes[start+1],6,1),16)
+    -- valid = bit 6 of byte 1
+    segment[2] = tonumber(bit32.extract("0x"..bytes[start+1],6,1),16)
 
-	-- last = bit 7 of byte 1
-	segment[3] = tonumber(bit32.extract("0x"..bytes[start+1],7,1),16)
+    -- last = bit 7 of byte 1
+    segment[3] = tonumber(bit32.extract("0x"..bytes[start+1],7,1),16)
 
-	-- len = (byte 0)+(bit0-3 of byte 1)
+    -- len = (byte 0)+(bit0-3 of byte 1)
   segment[4] = tonumber(("%03x"):format(tonumber(bit32.extract("0x"..bytes[start+1],0,3),16)..tonumber(bytes[start],16)),16)
-  
-	-- wrp (write proteted) = byte 2
-	segment[5] = tonumber(bytes[start+2])
 
-	-- wrc (write control) - bit 4-6 of byte 3
-	segment[6] = tonumber(bit32.extract("0x"..bytes[start+3],4,3),16)
+    -- wrp (write proteted) = byte 2
+    segment[5] = tonumber(bytes[start+2])
 
-	-- rd (read disabled) - bit 7 of byte 3
-	segment[7] = tonumber(bit32.extract("0x"..bytes[start+3],7,1),16)
+    -- wrc (write control) - bit 4-6 of byte 3
+    segment[6] = tonumber(bit32.extract("0x"..bytes[start+3],4,3),16)
 
-	-- crc byte 4
-	segment[8] = bytes[start+4]
+    -- rd (read disabled) - bit 7 of byte 3
+    segment[7] = tonumber(bit32.extract("0x"..bytes[start+3],7,1),16)
 
-	-- segment index
-	segment[9] = index
+    -- crc byte 4
+    segment[8] = bytes[start+4]
 
-	-- # crc-byte
-	segment[10] = start+4
+    -- segment index
+    segment[9] = index
+
+    -- # crc-byte
+    segment[10] = start+4
   return segment
 end
 
@@ -276,7 +276,7 @@ function CheckKgh(bytes, segStart, segEnd)
     local WRP = bytes[(segStart+2)]
     local WRC = ("%02x"):format(tonumber(bit32.extract("0x"..bytes[segStart+3],4,3),16))
     local RD = ("%02x"):format(tonumber(bit32.extract("0x"..bytes[segStart+3],7,1),16))
-    local XX = "00"  
+    local XX = "00"
     cmd = bytes[1]..bytes[2]..bytes[3]..bytes[4]..WRP..WRC..RD..XX
     for i=(segStart+5), (segStart+5+dataLen-2) do
       cmd = cmd..bytes[i]
@@ -294,247 +294,247 @@ end
 
 -- get only the addresses of segemnt-crc's and the length of bytes
 function getSegmentCrcBytes(bytes)
-	local start=23
-	local index=0
-	local crcbytes = {}
-	repeat
-		seg = getSegmentData(bytes,start,index)
-		crcbytes[index]= seg[10]
-		start = start + seg[4]
-		index = index + 1
-	until (seg[3] == 1 or tonumber(seg[9]) == 126 )	
-	crcbytes[index] = start
-	return crcbytes
+    local start=23
+    local index=0
+    local crcbytes = {}
+    repeat
+        seg = getSegmentData(bytes,start,index)
+        crcbytes[index]= seg[10]
+        start = start + seg[4]
+        index = index + 1
+    until (seg[3] == 1 or tonumber(seg[9]) == 126 )
+    crcbytes[index] = start
+    return crcbytes
 end
 
 -- print segment-data (hf legic decode like)
 function displaySegments(bytes)
-	--display segment header(s)
-	start=23
-	index="00"
-	
-	--repeat until last-flag ist set to 1 or segment-index has reached 126
-	repeat
-		wrc=""
-		wrp=""
-		pld=""
-		Seg = getSegmentData(bytes,start,index)
-    KGH = CheckKgh(bytes,start,(start+tonumber(Seg[4],10)))
-		printSegment(Seg)
+    --display segment header(s)
+    start=23
+    index="00"
 
-		-- wrc
-		if(Seg[6]>0) then
-			print("WRC protected area:")
-			-- length of wrc = wrc
-			for i=1, Seg[6] do
-				-- starts at (segment-start + segment-header + segment-crc)-1 
-				wrc = wrc..bytes[(start+4+1+i)-1].." " 
-			end
-			print(wrc)
-		elseif(Seg[5]>0) then
-			print("Remaining write protected area:")
-			-- length of wrp = (wrp-wrc)
-			for i=1, (Seg[5]-Seg[6]) do
-				-- starts at (segment-start + segment-header + segment-crc + wrc)-1 
-				wrp = wrp..bytes[(start+4+1+Seg[6]+i)-1].." " 
-			end
-			print(wrp)
-		end
-		
-		-- payload 
-		print("Remaining segment payload:")
-		--length of payload = segment-len - segment-header - segment-crc - wrp -wrc
-		for i=1, (Seg[4]-4-1-Seg[5]-Seg[6]) do
-			-- starts at (segment-start + segment-header + segment-crc + segment-wrp + segemnt-wrc)-1
-			pld = pld..bytes[(start+4+1+Seg[5]+Seg[6]+i)-1].." " 
-		end
-		print(pld)
+    --repeat until last-flag ist set to 1 or segment-index has reached 126
+    repeat
+        wrc=""
+        wrp=""
+        pld=""
+        Seg = getSegmentData(bytes,start,index)
+    KGH = CheckKgh(bytes,start,(start+tonumber(Seg[4],10)))
+        printSegment(Seg)
+
+        -- wrc
+        if(Seg[6]>0) then
+            print("WRC protected area:")
+            -- length of wrc = wrc
+            for i=1, Seg[6] do
+                -- starts at (segment-start + segment-header + segment-crc)-1
+                wrc = wrc..bytes[(start+4+1+i)-1].." "
+            end
+            print(wrc)
+        elseif(Seg[5]>0) then
+            print("Remaining write protected area:")
+            -- length of wrp = (wrp-wrc)
+            for i=1, (Seg[5]-Seg[6]) do
+                -- starts at (segment-start + segment-header + segment-crc + wrc)-1
+                wrp = wrp..bytes[(start+4+1+Seg[6]+i)-1].." "
+            end
+            print(wrp)
+        end
+
+        -- payload
+        print("Remaining segment payload:")
+        --length of payload = segment-len - segment-header - segment-crc - wrp -wrc
+        for i=1, (Seg[4]-4-1-Seg[5]-Seg[6]) do
+            -- starts at (segment-start + segment-header + segment-crc + segment-wrp + segemnt-wrc)-1
+            pld = pld..bytes[(start+4+1+Seg[5]+Seg[6]+i)-1].." "
+        end
+        print(pld)
     if (KGH) then print("'Kaba Group Header' detected"); end
-		start = start+Seg[4]
-		index = prepend_zero(tonumber(Seg[9])+1)
-    
-	until (Seg[3] == 1 or tonumber(Seg[9]) == 126 )
+        start = start+Seg[4]
+        index = prepend_zero(tonumber(Seg[9])+1)
+
+    until (Seg[3] == 1 or tonumber(Seg[9]) == 126 )
 end
 
 -- print Segment values
 function printSegment(SegmentData)
-	res = "\nSegment "..SegmentData[9]..": "
-	res = res..	"raw header="..SegmentData[0]..", "
-	res = res..	"flag="..SegmentData[1].." (valid="..SegmentData[2].." last="..SegmentData[3].."), "
-	res = res..	"len="..("%04d"):format(SegmentData[4])..", "
-	res = res..	"WRP="..prepend_zero(SegmentData[5])..", "
-	res = res..	"WRC="..prepend_zero(SegmentData[6])..", "
-	res = res.. "RD="..SegmentData[7]..", "
-	res = res.. "crc="..SegmentData[8]
-	print(res)	
+    res = "\nSegment "..SegmentData[9]..": "
+    res = res.. "raw header="..SegmentData[0]..", "
+    res = res.. "flag="..SegmentData[1].." (valid="..SegmentData[2].." last="..SegmentData[3].."), "
+    res = res.. "len="..("%04d"):format(SegmentData[4])..", "
+    res = res.. "WRP="..prepend_zero(SegmentData[5])..", "
+    res = res.. "WRC="..prepend_zero(SegmentData[6])..", "
+    res = res.. "RD="..SegmentData[7]..", "
+    res = res.. "crc="..SegmentData[8]
+    print(res)
 end
 
 -- write clone-data to tag
 function writeToTag(plainBytes)
-	local SegCrcs = {}
-	if(utils.confirm("\nplace your empty tag onto the PM3 to read and display the MCD & MSN0..2\nthe values will be shown below\n confirm when ready") == false) then
+    local SegCrcs = {}
+    if(utils.confirm("\nplace your empty tag onto the PM3 to read and display the MCD & MSN0..2\nthe values will be shown below\n confirm when ready") == false) then
     return
   end
 
-	-- gather MCD & MSN from new Tag - this must be enterd manually
-	cmd = 'hf legic read 0x00 0x04'
-	core.console(cmd)
-	print("\nthese are the MCD MSN0 MSN1 MSN2 from the Tag that has being read:")
-	cmd = 'data hexsamples 4'
-	core.console(cmd)
+    -- gather MCD & MSN from new Tag - this must be enterd manually
+    cmd = 'hf legic read 0x00 0x04'
+    core.console(cmd)
+    print("\nthese are the MCD MSN0 MSN1 MSN2 from the Tag that has being read:")
+    cmd = 'data hexsamples 4'
+    core.console(cmd)
   print("^^ use this values as input for the following answers (one 2-digit-value per question/answer):")
-	-- enter MCD & MSN (in hex)
-	MCD  = utils.input("type in  MCD as 2-digit value - e.g.: 00", plainBytes[1])
-	MSN0 = utils.input("type in MSN0 as 2-digit value - e.g.: 01", plainBytes[2])
-	MSN1 = utils.input("type in MSN1 as 2-digit value - e.g.: 02", plainBytes[3])
-	MSN2 = utils.input("type in MSN2 as 2-digit value - e.g.: 03", plainBytes[4])
+    -- enter MCD & MSN (in hex)
+    MCD  = utils.input("type in  MCD as 2-digit value - e.g.: 00", plainBytes[1])
+    MSN0 = utils.input("type in MSN0 as 2-digit value - e.g.: 01", plainBytes[2])
+    MSN1 = utils.input("type in MSN1 as 2-digit value - e.g.: 02", plainBytes[3])
+    MSN2 = utils.input("type in MSN2 as 2-digit value - e.g.: 03", plainBytes[4])
 
-	-- calculate crc8 over MCD & MSN
-	cmd = MCD..MSN0..MSN1..MSN2
-	MCC = ("%02x"):format(utils.Crc8Legic(cmd))
-	print("MCD:"..MCD..", MSN:"..MSN0.." "..MSN1.." "..MSN2..", MCC:"..MCC)
+    -- calculate crc8 over MCD & MSN
+    cmd = MCD..MSN0..MSN1..MSN2
+    MCC = ("%02x"):format(utils.Crc8Legic(cmd))
+    print("MCD:"..MCD..", MSN:"..MSN0.." "..MSN1.." "..MSN2..", MCC:"..MCC)
 
-	-- calculate new Segment-CRC for each valid segment
-	SegCrcs = getSegmentCrcBytes(plainBytes)
-	for i=0, (#SegCrcs-1) do   
+    -- calculate new Segment-CRC for each valid segment
+    SegCrcs = getSegmentCrcBytes(plainBytes)
+    for i=0, (#SegCrcs-1) do
     -- SegCrcs[i]-4 = address of first byte of segmentHeader (low byte segment-length)
     segLen=tonumber(("%1x"):format(tonumber(bit32.extract("0x"..plainBytes[(SegCrcs[i]-3)],0,3),16))..("%02x"):format(tonumber(plainBytes[SegCrcs[i]-4],16)),16)
     segStart=(SegCrcs[i]-4)
     segEnd=(SegCrcs[i]-4+segLen)
     KGH=CheckKgh(plainBytes,segStart,segEnd)
-    if (KGH) then 
+    if (KGH) then
       print("'Kaba Group Header' detected - re-calculate...")
     end
-		cmd = MCD..MSN0..MSN1..MSN2..plainBytes[SegCrcs[i]-4]..plainBytes[SegCrcs[i]-3]..plainBytes[SegCrcs[i]-2]..plainBytes[SegCrcs[i]-1]
-		plainBytes[SegCrcs[i]] = ("%02x"):format(utils.Crc8Legic(cmd))
-	end
+        cmd = MCD..MSN0..MSN1..MSN2..plainBytes[SegCrcs[i]-4]..plainBytes[SegCrcs[i]-3]..plainBytes[SegCrcs[i]-2]..plainBytes[SegCrcs[i]-1]
+        plainBytes[SegCrcs[i]] = ("%02x"):format(utils.Crc8Legic(cmd))
+    end
 
-	-- apply MCD & MSN to plain data
-	plainBytes[1] = MCD
-	plainBytes[2] = MSN0
-	plainBytes[3] = MSN1
-	plainBytes[4] = MSN2
-	plainBytes[5] = MCC
-	
-	-- prepare plainBytes for writing (xor plain data with new MCC)
-	bytes = xorBytes(plainBytes, MCC)
-	
-	-- write data to file
-	if (writeOutputBytes(bytes, "myLegicClone.hex")) then
-		WriteBytes = utils.input("enter number of bytes to write?", SegCrcs[#SegCrcs])
+    -- apply MCD & MSN to plain data
+    plainBytes[1] = MCD
+    plainBytes[2] = MSN0
+    plainBytes[3] = MSN1
+    plainBytes[4] = MSN2
+    plainBytes[5] = MCC
 
-		-- load file into pm3-buffer
-		cmd = 'hf legic load myLegicClone.hex'
-		core.console(cmd)
-		
-		-- write pm3-buffer to Tag
-		for i=0, WriteBytes do
-			if ( i<5 or i>6) then
-				cmd = ('hf legic write 0x%02x 0x01'):format(i)
-				core.console(cmd)
-			elseif (i == 6) then
-				-- write DCF in reverse order (requires 'mosci-patch')
-				cmd = 'hf legic write 0x05 0x02'
-				core.console(cmd)
-			else
-				print("skipping byte 0x05 - will be written next step")
-			end				
-			utils.Sleep(0.2)
-		end
-	end
+    -- prepare plainBytes for writing (xor plain data with new MCC)
+    bytes = xorBytes(plainBytes, MCC)
+
+    -- write data to file
+    if (writeOutputBytes(bytes, "myLegicClone.hex")) then
+        WriteBytes = utils.input("enter number of bytes to write?", SegCrcs[#SegCrcs])
+
+        -- load file into pm3-buffer
+        cmd = 'hf legic load myLegicClone.hex'
+        core.console(cmd)
+
+        -- write pm3-buffer to Tag
+        for i=0, WriteBytes do
+            if ( i<5 or i>6) then
+                cmd = ('hf legic write 0x%02x 0x01'):format(i)
+                core.console(cmd)
+            elseif (i == 6) then
+                -- write DCF in reverse order (requires 'mosci-patch')
+                cmd = 'hf legic write 0x05 0x02'
+                core.console(cmd)
+            else
+                print("skipping byte 0x05 - will be written next step")
+            end
+            utils.Sleep(0.2)
+        end
+    end
 end
 
 -- main function
 function main(args)
-	-- some variables
-	local i=0
-	local oldcrc, newcrc, infile, outfile
-	local bytes = {}
-	local segments = {}
-	
-	-- parse arguments for the script
-	for o, a in getopt.getopt(args, 'hwsdc:i:o:') do
-		-- output file
-		if o == "o" then 
-			outfile = a
-			ofs = true
-			if (file_check(a)) then
-				local answer = utils.confirm("\nthe output-file "..a.." alredy exists!\nthis will delete the previous content!\ncontinue?")
-				if (answer==false) then return oops("quiting") end
-			end
-		end		
-		-- input file
-		if o == "i" then
-			infile = a 
-			if (file_check(infile)==false) then
-				return oops("input file: "..infile.." not found")
-			else
-				bytes = getInputBytes(infile)
-				oldcrc = bytes[5]
-				ifs = true
-				if (bytes == false) then return oops('couldnt get input bytes') end
-			end
-			i = i+1
-		end
-		-- new crc
-		if o == "c" then 
-			newcrc = a
-			ncs = true
-		end
-		-- display segments switch
-		if o == "d" then ds = true; end
-		-- display summary switch
-		if o == "s" then ss = true; end
-		-- write to tag switch
-		if o == "w" then ws = true; end
-		-- help
-		if o == "h" then return help() end
-	end
-	
-	if (not ifs) then return oops("option -i <input file> is required but missing") end
-	
-	-- bytes to plain
-	bytes = xorBytes(bytes, oldcrc)
-	
-	-- show segments (works only on plain bytes)
-	if (ds) then
-		print("+------------------------------------------- Segments -------------------------------------------+") 
-		displaySegments(bytes); 
-	end
+    -- some variables
+    local i=0
+    local oldcrc, newcrc, infile, outfile
+    local bytes = {}
+    local segments = {}
 
-	if (ofs and ncs) then
-		-- xor bytes with new crc
-		newBytes = xorBytes(bytes, newcrc)
-		-- write output
-		if (writeOutputBytes(newBytes, outfile)) then
-			-- show summary if requested
-			if (ss) then
-				-- information
-				res = "\n+-------------------------------------------- Summary -------------------------------------------+"
-				res = res .."\ncreated clone_dump from\n\t"..infile.." crc: "..oldcrc.."\ndump_file:"
-				res = res .."\n\t"..outfile.." crc: "..string.sub(newcrc,-2)
-				res = res .."\nyou may load the new file with: hf legic load "..outfile
-				res = res .."\n\nif you don't write to tag immediately ('-w' switch) you will need to recalculate each segmentCRC"
-				res = res .."\nafter writing this dump to a tag!"
-				res = res .."\n\na segmentCRC gets calculated over MCD,MSN0..3,Segment-Header0..3"
-				res = res .."\ne.g. (based on Segment00 of the data from "..infile.."):"
-				res = res .."\nhf legic crc8 "..bytes[1]..bytes[2]..bytes[3]..bytes[4]..bytes[23]..bytes[24]..bytes[25]..bytes[26]
-				-- this can not be calculated without knowing the new MCD, MSN0..2
-				print(res)
-			end
-		end
-	else
-		if (ss) then
-			-- show why the output-file was not written
-			print("\nnew file not written - some arguments are missing ..")
-			print("output file: ".. (ofs and outfile or "not given"))
-			print("new crc: ".. (ncs and newcrc or "not given"))
-		end
-	end
-	-- write to tag
-	if (ws and #bytes == 1024) then
-			writeToTag(bytes)
-	end
+    -- parse arguments for the script
+    for o, a in getopt.getopt(args, 'hwsdc:i:o:') do
+        -- output file
+        if o == "o" then
+            outfile = a
+            ofs = true
+            if (file_check(a)) then
+                local answer = utils.confirm("\nthe output-file "..a.." alredy exists!\nthis will delete the previous content!\ncontinue?")
+                if (answer==false) then return oops("quiting") end
+            end
+        end
+        -- input file
+        if o == "i" then
+            infile = a
+            if (file_check(infile)==false) then
+                return oops("input file: "..infile.." not found")
+            else
+                bytes = getInputBytes(infile)
+                oldcrc = bytes[5]
+                ifs = true
+                if (bytes == false) then return oops('couldnt get input bytes') end
+            end
+            i = i+1
+        end
+        -- new crc
+        if o == "c" then
+            newcrc = a
+            ncs = true
+        end
+        -- display segments switch
+        if o == "d" then ds = true; end
+        -- display summary switch
+        if o == "s" then ss = true; end
+        -- write to tag switch
+        if o == "w" then ws = true; end
+        -- help
+        if o == "h" then return help() end
+    end
+
+    if (not ifs) then return oops("option -i <input file> is required but missing") end
+
+    -- bytes to plain
+    bytes = xorBytes(bytes, oldcrc)
+
+    -- show segments (works only on plain bytes)
+    if (ds) then
+        print("+------------------------------------------- Segments -------------------------------------------+")
+        displaySegments(bytes);
+    end
+
+    if (ofs and ncs) then
+        -- xor bytes with new crc
+        newBytes = xorBytes(bytes, newcrc)
+        -- write output
+        if (writeOutputBytes(newBytes, outfile)) then
+            -- show summary if requested
+            if (ss) then
+                -- information
+                res = "\n+-------------------------------------------- Summary -------------------------------------------+"
+                res = res .."\ncreated clone_dump from\n\t"..infile.." crc: "..oldcrc.."\ndump_file:"
+                res = res .."\n\t"..outfile.." crc: "..string.sub(newcrc,-2)
+                res = res .."\nyou may load the new file with: hf legic load "..outfile
+                res = res .."\n\nif you don't write to tag immediately ('-w' switch) you will need to recalculate each segmentCRC"
+                res = res .."\nafter writing this dump to a tag!"
+                res = res .."\n\na segmentCRC gets calculated over MCD,MSN0..3,Segment-Header0..3"
+                res = res .."\ne.g. (based on Segment00 of the data from "..infile.."):"
+                res = res .."\nhf legic crc8 "..bytes[1]..bytes[2]..bytes[3]..bytes[4]..bytes[23]..bytes[24]..bytes[25]..bytes[26]
+                -- this can not be calculated without knowing the new MCD, MSN0..2
+                print(res)
+            end
+        end
+    else
+        if (ss) then
+            -- show why the output-file was not written
+            print("\nnew file not written - some arguments are missing ..")
+            print("output file: ".. (ofs and outfile or "not given"))
+            print("new crc: ".. (ncs and newcrc or "not given"))
+        end
+    end
+    -- write to tag
+    if (ws and #bytes == 1024) then
+            writeToTag(bytes)
+    end
 end
 
 -- call main with arguments
diff --git a/client/scripts/amiibo.lua b/client/scripts/amiibo.lua
index cc2459f30..2bcd2a07e 100644
--- a/client/scripts/amiibo.lua
+++ b/client/scripts/amiibo.lua
@@ -88,10 +88,10 @@ local function emulate_amiibo (amiibo_data)
    local simCmd = Command:new{cmd = cmds.CMD_SIMULATE_TAG_ISO_14443a, arg1 = 7, arg2 = uid_first, arg3 = uid_second}
    local _, err = reader.sendToDevice(simCmd)
    if err then
-   	  print('Failed to start simulator', err)
-   	  return
+      print('Failed to start simulator', err)
+      return
    else
-   	  print('Starting simulator')
+      print('Starting simulator')
    end
 end
 
diff --git a/client/scripts/brutesim.lua b/client/scripts/brutesim.lua
index 50e3b5888..9527d8970 100644
--- a/client/scripts/brutesim.lua
+++ b/client/scripts/brutesim.lua
@@ -21,7 +21,7 @@ desc = [[
 
 This script uses the proxmark3 implementations of simulation to bruteforce given ranges of id.
 It uses both LF and HF simulations.
-																							  
+
     -- Author note
     -- I wrote this as i was doing a PACS audit. This is far from complete, but is easily expandable.
     -- The idea was based on proxbrute, but i needed more options, and support for different readers.
@@ -38,8 +38,8 @@ usage = [[
 script run brutesim -r rfid_tag -f facility_code -b base_card_number -c count -t timeout -d direction
 
 Arguments:
-	-h          this help
-	-r      	*see below		RFID Tag: the RFID tag to emulate
+    -h       this help
+    -r       *see below           RFID Tag: the RFID tag to emulate
              pyramid
              awid
              fdx
@@ -50,251 +50,251 @@ Arguments:
              14a
              hid
 
-	-f		0-999                facility code (dfx: country id, 14a: type)
-	-b		0-65535              base card number to start from
-	-c		1-65536			     number of cards to try
-	-t		.0-99999, pause		 timeout between cards (use the word 'pause' to wait for user input)
-	-d		up, down             direction to move through card numbers
+    -f       0-999                facility code (dfx: country id, 14a: type)
+    -b       0-65535              base card number to start from
+    -c       1-65536              number of cards to try
+    -t       .0-99999, pause      timeout between cards (use the word 'pause' to wait for user input)
+    -d       up, down             direction to move through card numbers
 ]]
 
 local DEBUG = true
-local bor = bit32.bor	
-local bxor = bit32.bxor	
+local bor = bit32.bor
+local bxor = bit32.bxor
 local lshift = bit32.lshift
---- 
+---
 -- A debug printout-function
 local function dbg(args)
     if type(args) == "table" then
-		local i = 1
-		while args[i] do
-			dbg(args[i])
-			i = i+1
-		end
-	else
-		print("###", args)
-	end	
+        local i = 1
+        while args[i] do
+            dbg(args[i])
+            i = i+1
+        end
+    else
+        print("###", args)
+    end
 end
---- 
+---
 -- This is only meant to be used when errors occur
 local function oops(err)
-	print("ERROR: ",err)
-	return nil,err
+    print("ERROR: ",err)
+    return nil,err
 end
---- 
+---
 -- Usage help
 local function help()
-	print(copyright)
-	print(author)
-	print(version)	
-	print(desc)
-	print("Example usage")
-	print(example)
+    print(copyright)
+    print(author)
+    print(version)
+    print(desc)
+    print("Example usage")
+    print(example)
 end
 --
 -- Exit message
 function exitMsg(msg)
-	print( string.rep('--',20) )
-	print( string.rep('--',20) )
-	print(msg)
-	print()
+    print( string.rep('--',20) )
+    print( string.rep('--',20) )
+    print(msg)
+    print()
 end
 --
 -- Check if a string is empty
 local function isempty(s)
-	return s == nil or s == ''
+    return s == nil or s == ''
 end
 
--- The code below was blatantly stolen from Brian Redbeard's lf_bulk_program.lua script		
+-- The code below was blatantly stolen from Brian Redbeard's lf_bulk_program.lua script
 local function toBits(num, bits)
-	bits = bits or math.max(1, select(2, math.frexp(num)))
-	local t = {}
-	for b = bits, 1, -1 do
-		t[b] = math.fmod(num, 2)
-		num = math.floor((num - t[b]) / 2)
-	end
-	return table.concat(t)
+    bits = bits or math.max(1, select(2, math.frexp(num)))
+    local t = {}
+    for b = bits, 1, -1 do
+        t[b] = math.fmod(num, 2)
+        num = math.floor((num - t[b]) / 2)
+    end
+    return table.concat(t)
 end
 --
--- check for parity in bit-string. 
+-- check for parity in bit-string.
 local function evenparity(s)
-	local _, count = string.gsub(s, "1", "")
-	local p = count % 2
-	if (p == 0) then
-		return false
-	end
-	return true
+    local _, count = string.gsub(s, "1", "")
+    local p = count % 2
+    if (p == 0) then
+        return false
+    end
+    return true
 end
 --
--- 	calcs hex for HID 
+-- calcs hex for HID
 local function cardHex(i, f)
-	fac = lshift(f, 16)
-	id = bor(i, fac)
-	stream = toBits(id, 26)
-	high = evenparity(string.sub(stream, 0, 12)) and 1 or 0
-	low = not evenparity(string.sub(stream, 13)) and 1 or 0
-	bits = bor(lshift(id, 1), low)
-	bits = bor(bits, lshift(high, 25))
-	preamble = bor(0, lshift(1, 5))
-	bits = bor(bits, lshift(1, 26))
-	return ("%04x%08x"):format(preamble, bits)
+    fac = lshift(f, 16)
+    id = bor(i, fac)
+    stream = toBits(id, 26)
+    high = evenparity(string.sub(stream, 0, 12)) and 1 or 0
+    low = not evenparity(string.sub(stream, 13)) and 1 or 0
+    bits = bor(lshift(id, 1), low)
+    bits = bor(bits, lshift(high, 25))
+    preamble = bor(0, lshift(1, 5))
+    bits = bor(bits, lshift(1, 26))
+    return ("%04x%08x"):format(preamble, bits)
 end
 --
 --
 local function main(args)
 
-	print( string.rep('--',20) )
-	print( string.rep('--',20) )	
-	print()
-	
-	if #args == 0 then return help() end
+    print( string.rep('--',20) )
+    print( string.rep('--',20) )
+    print()
 
-	for o, a in getopt.getopt(args, 'r:f:b:c:t:d:h') do			-- Populate command like arguments
-		if o == 'r' then rfidtag = a end
-		if o == 'f' then facility = a end
-		if o == 'b' then baseid = a end
-		if o == 'c' then count = a end
-		if o == 't' then timeout = a end
-		if o == 'd' then direction = a end
-		if o == 'h' then return print(usage) end
-	end
+    if #args == 0 then return help() end
 
-	-- Check to see if -r argument was passed 
-	if isempty(rfidtag) then
-		print("You must supply the flag -r (rfid tag)")
-		print(usage)
-		return
-	end
+    for o, a in getopt.getopt(args, 'r:f:b:c:t:d:h') do -- Populate command like arguments
+        if o == 'r' then rfidtag = a end
+        if o == 'f' then facility = a end
+        if o == 'b' then baseid = a end
+        if o == 'c' then count = a end
+        if o == 't' then timeout = a end
+        if o == 'd' then direction = a end
+        if o == 'h' then return print(usage) end
+    end
 
-	-- Check what RFID Tag we are using
-	if rfidtag == 'pyramid' then
-		consolecommand = 'lf pyramid sim'			-- set the console command
-		rfidtagname = 'Farpointe/Pyramid'			-- set the display name
-		facilityrequired = 1						-- set if FC is required
-	elseif rfidtag == 'awid' then
-		consolecommand = 'lf awid sim'
-		rfidtagname = 'AWID'
-		facilityrequired = 1
-	elseif rfidtag == 'fdx' then					-- I'm not sure why you would need to bruteforce this ¯\_(ツ)_/¯ 
-		consolecommand = 'lf fdx sim'
-		rfidtagname = 'FDX-B'
-		facilityrequired = 1
-	elseif rfidtag == 'jablotron' then
-		consolecommand = 'lf jablotron sim'
-		rfidtagname = 'Jablotron'
-		facilityrequired = 0
-	elseif rfidtag == 'noralsy' then
-		consolecommand = 'lf noralsy sim'
-		rfidtagname = 'Noralsy'
-		facilityrequired = 0
-	elseif rfidtag == 'presco' then
-		consolecommand = 'lf presco sim d'
-		rfidtagname = 'Presco'
-		facilityrequired = 0
-	elseif rfidtag == 'visa2000' then
-		consolecommand = 'lf visa2000 sim'
-		rfidtagname = 'Visa2000'
-		facilityrequired = 0
-	elseif rfidtag == '14a' then
-		consolecommand = 'hf 14a sim'
-		if facility == "1" then rfidtagname = 'MIFARE Classic'		-- Here we use the -f option to read the 14a type instead of the facility code
-		elseif facility == "2" then rfidtagname = 'MIFARE Ultralight'
-		elseif facility == "3" then rfidtagname = 'MIFARE Desfire'
-		elseif facility == "4" then rfidtagname = 'ISO/IEC 14443-4'
-		elseif facility == "5" then rfidtagname = 'MIFARE Tnp3xxx'
-		else 
-			print("Invalid 14a type (-f) supplied. Must be 1-5")
-			print(usage)
-			return
-		end
-		facilityrequired = 0						-- Disable the FC required check, as we used it for type instead of FC
-	elseif rfidtag == 'hid' then
-		consolecommand = 'lf hid sim'
-		rfidtagname = 'HID'
-		facilityrequired = 1
-	else									-- Display error and exit out if bad RFID tag was supplied
-		print("Invalid rfid tag (-r) supplied")
-		print(usage)
-		return
-	end
-	
-	if isempty(baseid) then 						-- Display error and exit out if no starting id is set
-		print("You must supply the flag -b (base id)")
-		print(usage)
-		return
-	end
+    -- Check to see if -r argument was passed
+    if isempty(rfidtag) then
+        print("You must supply the flag -r (rfid tag)")
+        print(usage)
+        return
+    end
 
-	if isempty(count) then 							-- Display error and exit out of no count is set
-		print("You must supply the flag -c (count)")
-		print(usage)
-		return
-	end
-	
-	if facilityrequired == 1 then						-- If FC is required
-		facilitymessage = " - Facility Code: "				-- Add FC to status message
-		if isempty(facility) then 					-- If FC was left blank, display warning and set FC to 0 
-			print("Using 0 for the facility code as -f was not supplied")
-			facility = 0 						
-		end
-	else									-- If FC is not required
-		facility = ""							-- Clear FC
-		facilitymessage = ""						-- Remove FC from status message
-	end
-	
-	if isempty(timeout) then 						-- If timeout was not supplied, show warning and set timeout to 0
-		print("Using 0 for the timeout as -t was not supplied")
-		timeout = 0 
-	end
-	
-	if isempty(direction) then 						-- If direction was not supplied, show warning and set direction to down
-		print("Using down for direction as -d was not supplied")
-		direction = 'down' 
-	end
-	
-	if tonumber(count) < 1 then
-		print("Count -c must be set to 1 or higher")
-		return
-	else
-		count = count -1 						-- Make our count accurate by removing 1, because math
-	end							
-	
-	if direction == 'down' then 						-- If counting down, set up our for loop to count down
-		endid = baseid - count
-		fordirection = -1
-	elseif direction == 'up' then						-- If counting up, set our for loop to count up
-		endid = baseid + count
-		fordirection = 1
-	else									-- If invalid direction was set, show warning and set up our for loop to count down
-		print("Invalid direction (-d) supplied, using down")
-		endid = baseid - count
-		fordirection = -1
-	end
-	
+    -- Check what RFID Tag we are using
+    if rfidtag == 'pyramid' then
+        consolecommand = 'lf pyramid sim' -- set the console command
+        rfidtagname = 'Farpointe/Pyramid' -- set the display name
+        facilityrequired = 1              -- set if FC is required
+    elseif rfidtag == 'awid' then
+        consolecommand = 'lf awid sim'
+        rfidtagname = 'AWID'
+        facilityrequired = 1
+    elseif rfidtag == 'fdx' then          -- I'm not sure why you would need to bruteforce this ¯\_(ツ)_/¯
+        consolecommand = 'lf fdx sim'
+        rfidtagname = 'FDX-B'
+        facilityrequired = 1
+    elseif rfidtag == 'jablotron' then
+        consolecommand = 'lf jablotron sim'
+        rfidtagname = 'Jablotron'
+        facilityrequired = 0
+    elseif rfidtag == 'noralsy' then
+        consolecommand = 'lf noralsy sim'
+        rfidtagname = 'Noralsy'
+        facilityrequired = 0
+    elseif rfidtag == 'presco' then
+        consolecommand = 'lf presco sim d'
+        rfidtagname = 'Presco'
+        facilityrequired = 0
+    elseif rfidtag == 'visa2000' then
+        consolecommand = 'lf visa2000 sim'
+        rfidtagname = 'Visa2000'
+        facilityrequired = 0
+    elseif rfidtag == '14a' then
+        consolecommand = 'hf 14a sim'
+        if facility == "1" then rfidtagname = 'MIFARE Classic' -- Here we use the -f option to read the 14a type instead of the facility code
+        elseif facility == "2" then rfidtagname = 'MIFARE Ultralight'
+        elseif facility == "3" then rfidtagname = 'MIFARE Desfire'
+        elseif facility == "4" then rfidtagname = 'ISO/IEC 14443-4'
+        elseif facility == "5" then rfidtagname = 'MIFARE Tnp3xxx'
+        else
+            print("Invalid 14a type (-f) supplied. Must be 1-5")
+            print(usage)
+            return
+        end
+        facilityrequired = 0              -- Disable the FC required check, as we used it for type instead of FC
+    elseif rfidtag == 'hid' then
+        consolecommand = 'lf hid sim'
+        rfidtagname = 'HID'
+        facilityrequired = 1
+    else                                  -- Display error and exit out if bad RFID tag was supplied
+        print("Invalid rfid tag (-r) supplied")
+        print(usage)
+        return
+    end
 
-	
-	-- display status message
-	print("")									
-	print("BruteForcing "..rfidtagname..""..facilitymessage..""..facility.." - CardNumber Start: "..baseid.." - CardNumber End: "..endid.." - TimeOut: "..timeout)
-	print("")
-	
-	-- loop through for each count (-c)
-	for cardnum = baseid, endid, fordirection do
-		
-		-- If rfid tag is set to HID, convert card to HEX using the stolen code above 
-		if rfidtag == 'hid' then cardnum = cardHex(cardnum, facility) end
-		
-		-- send command to proxmark
-		core.console(consolecommand..' '..facility..' '..cardnum)
+    if isempty(baseid) then               -- Display error and exit out if no starting id is set
+        print("You must supply the flag -b (base id)")
+        print(usage)
+        return
+    end
 
-		if timeout == 'pause' then			
-			print("Press enter to continue ...")
-			io.read()
-		else
-			os.execute("sleep "..timeout.."")
-		end
-	end
-	
-	-- ping the proxmark to stop emulation and see if its still responding		
-	core.console('hw ping')
+    if isempty(count) then                -- Display error and exit out of no count is set
+        print("You must supply the flag -c (count)")
+        print(usage)
+        return
+    end
+
+    if facilityrequired == 1 then         -- If FC is required
+        facilitymessage = " - Facility Code: " -- Add FC to status message
+        if isempty(facility) then         -- If FC was left blank, display warning and set FC to 0
+            print("Using 0 for the facility code as -f was not supplied")
+            facility = 0
+        end
+    else                                  -- If FC is not required
+        facility = ""                     -- Clear FC
+        facilitymessage = ""              -- Remove FC from status message
+    end
+
+    if isempty(timeout) then              -- If timeout was not supplied, show warning and set timeout to 0
+        print("Using 0 for the timeout as -t was not supplied")
+        timeout = 0
+    end
+
+    if isempty(direction) then            -- If direction was not supplied, show warning and set direction to down
+        print("Using down for direction as -d was not supplied")
+        direction = 'down'
+    end
+
+    if tonumber(count) < 1 then
+        print("Count -c must be set to 1 or higher")
+        return
+    else
+        count = count -1                  -- Make our count accurate by removing 1, because math
+    end
+
+    if direction == 'down' then           -- If counting down, set up our for loop to count down
+        endid = baseid - count
+        fordirection = -1
+    elseif direction == 'up' then         -- If counting up, set our for loop to count up
+        endid = baseid + count
+        fordirection = 1
+    else                                  -- If invalid direction was set, show warning and set up our for loop to count down
+        print("Invalid direction (-d) supplied, using down")
+        endid = baseid - count
+        fordirection = -1
+    end
+
+
+
+    -- display status message
+    print("")
+    print("BruteForcing "..rfidtagname..""..facilitymessage..""..facility.." - CardNumber Start: "..baseid.." - CardNumber End: "..endid.." - TimeOut: "..timeout)
+    print("")
+
+    -- loop through for each count (-c)
+    for cardnum = baseid, endid, fordirection do
+
+        -- If rfid tag is set to HID, convert card to HEX using the stolen code above
+        if rfidtag == 'hid' then cardnum = cardHex(cardnum, facility) end
+
+        -- send command to proxmark
+        core.console(consolecommand..' '..facility..' '..cardnum)
+
+        if timeout == 'pause' then
+            print("Press enter to continue ...")
+            io.read()
+        else
+            os.execute("sleep "..timeout.."")
+        end
+    end
+
+    -- ping the proxmark to stop emulation and see if its still responding
+    core.console('hw ping')
 end
 
 main(args)
\ No newline at end of file
diff --git a/client/scripts/calc_di.lua b/client/scripts/calc_di.lua
index b46d45b51..e0b587332 100644
--- a/client/scripts/calc_di.lua
+++ b/client/scripts/calc_di.lua
@@ -7,170 +7,170 @@ copyright = ''
 author = "Iceman"
 version = 'v1.0.0'
 desc = [[
-This script calculates mifare keys based on uid diversification for DI. 
+This script calculates mifare keys based on uid diversification for DI.
 Algo not found by me.
 ]]
 example = [[
-	 -- if called without, it reads tag uid
-	 script run calc_di
-	 
-	 -- 
-	 script run calc_di -u 11223344556677
+     -- if called without, it reads tag uid
+     script run calc_di
+
+     --
+     script run calc_di -u 11223344556677
 ]]
 usage = [[
 script run calc_di -h -u <uid>
 
 Arguments:
-	-h             : this help
-	-u <UID>       : UID
+    -h             : this help
+    -u <UID>       : UID
 ]]
 
 local DEBUG = true
 local BAR = '286329204469736E65792032303133'
 local MIS = '0A14FD0507FF4BCD026BA83F0A3B89A9'
 local bxor = bit32.bxor
---- 
+---
 -- A debug printout-function
 local function dbg(args)
     if not DEBUG then return end
     if type(args) == "table" then
-		local i = 1
-		while args[i] do
-			dbg(args[i])
-			i = i+1
-		end
-	else
-		print("###", args)
-	end	
-end	
---- 
+        local i = 1
+        while args[i] do
+            dbg(args[i])
+            i = i+1
+        end
+    else
+        print("###", args)
+    end
+end
+---
 -- This is only meant to be used when errors occur
 local function oops(err)
-	print("ERROR: ",err)
-	return nil,err
+    print("ERROR: ",err)
+    return nil,err
 end
---- 
+---
 -- Usage help
 local function help()
-	print(copyright)
-	print(author)	
-	print(version)	
-	print(desc)
-	print('Example usage')
-	print(example)
+    print(copyright)
+    print(author)
+    print(version)
+    print(desc)
+    print('Example usage')
+    print(example)
 end
 ---
 -- Exit message
 local function exitMsg(msg)
-	print( string.rep('--',20) )
-	print( string.rep('--',20) )
-	print(msg)
-	print()
+    print( string.rep('--',20) )
+    print( string.rep('--',20) )
+    print(msg)
+    print()
 end
 ---
 -- dumps all keys to file
 local function dumptofile(keys)
-	dbg('dumping keys to file')
+    dbg('dumping keys to file')
 
-	if utils.confirm('Do you wish to save the keys to dumpfile?') then 
-		local destination = utils.input('Select a filename to store to', 'dumpkeys.bin')
-		local file = io.open(destination, 'wb')
-		if file == nil then 
-			print('Could not write to file ', destination)
-			return
-		end
+    if utils.confirm('Do you wish to save the keys to dumpfile?') then
+        local destination = utils.input('Select a filename to store to', 'dumpkeys.bin')
+        local file = io.open(destination, 'wb')
+        if file == nil then
+            print('Could not write to file ', destination)
+            return
+        end
 
-		-- Mifare Mini has 5 sectors, 
-		local key_a = ''
-		local key_b = ''
-		
-		for sector = 0, #keys do
-			local keyA, keyB = unpack(keys[sector])
-			key_a = key_a .. bin.pack('H', keyA);
-			key_b = key_b .. bin.pack('H', keyB);
-		end
-		file:write(key_a)
-		file:write(key_b)
-		file:close()
-	end
+        -- Mifare Mini has 5 sectors,
+        local key_a = ''
+        local key_b = ''
+
+        for sector = 0, #keys do
+            local keyA, keyB = unpack(keys[sector])
+            key_a = key_a .. bin.pack('H', keyA);
+            key_b = key_b .. bin.pack('H', keyB);
+        end
+        file:write(key_a)
+        file:write(key_b)
+        file:close()
+    end
 end
 ---
 -- create key
 local function keygen(uid)
-	local data = MIS..uid..BAR
-	local hash = utils.ConvertAsciiToBytes(utils.Sha1Hex(data))
-	return string.format("%02X%02X%02X%02X%02X%02X",
-		hash[3+1],
-		hash[2+1],
-		hash[1+1],
-		hash[0+1],
-		hash[7+1],
-		hash[6+1]
-		)
+    local data = MIS..uid..BAR
+    local hash = utils.ConvertAsciiToBytes(utils.Sha1Hex(data))
+    return string.format("%02X%02X%02X%02X%02X%02X",
+        hash[3+1],
+        hash[2+1],
+        hash[1+1],
+        hash[0+1],
+        hash[7+1],
+        hash[6+1]
+        )
 end
 ---
 -- print keys
 local function printKeys(keys)
-	print('|---|----------------|---|----------------|---|')
-	print('|sec|key A           |res|key B           |res|')
-	print('|---|----------------|---|----------------|---|')
-	for sector = 0, #keys do
-		local keyA, keyB = unpack(keys[sector])
-		print(('|%03d|  %s  | %s |  %s  | %s |'):format(sector, keyA, 1, keyB, 1))
-	end	
-	print('|---|----------------|---|----------------|---|')
+    print('|---|----------------|---|----------------|---|')
+    print('|sec|key A           |res|key B           |res|')
+    print('|---|----------------|---|----------------|---|')
+    for sector = 0, #keys do
+        local keyA, keyB = unpack(keys[sector])
+        print(('|%03d|  %s  | %s |  %s  | %s |'):format(sector, keyA, 1, keyB, 1))
+    end
+    print('|---|----------------|---|----------------|---|')
 end
 ---
 -- createfull set of keys
 local function createKeys(uid)
-	local key = keygen(uid)
-	local k = {}
-	for i = 0,4 do
-		k[i] = { key, key }
-	end
-	return k
+    local key = keygen(uid)
+    local k = {}
+    for i = 0,4 do
+        k[i] = { key, key }
+    end
+    return k
 end
 ---
 -- main
 local function main(args)
 
-	print( string.rep('==', 30) )
-	print()
-			
-	local uid
-	local useUID = false
-	
-	-- Arguments for the script
-	for o, a in getopt.getopt(args, 'hu:') do
-		if o == "h" then return help() end		
-		if o == "u" then uid = a; useUID = true end		
-	end
+    print( string.rep('==', 30) )
+    print()
 
-	if useUID then
-		-- uid string checks if supplied
-		if uid == nil then return oops('empty uid string') end
-		if #uid == 0 then return oops('empty uid string') end
-		if #uid ~= 14 then return oops('uid wrong length. Should be 7 hex bytes') end
-	else
-		-- GET TAG UID	
-		local tag, err = lib14a.read(false, true)
-		if not tag then return oops(err) end
-		core.clearCommandBuffer()
+    local uid
+    local useUID = false
 
-		-- simple tag check
-		if 0x09 ~= tag.sak then
-			if 0x4400 ~= tag.atqa then 
-				return oops(('[fail] found tag %s :: looking for Mifare Mini 0.3k'):format(tag.name)) 
-			end
-		end		
-		uid = tag.uid
-	end
-	
-	print('|UID|', uid)	
-	
-	local keys, err = createKeys( uid )	
-	printKeys( keys )
-	dumptofile( keys )
+    -- Arguments for the script
+    for o, a in getopt.getopt(args, 'hu:') do
+        if o == "h" then return help() end
+        if o == "u" then uid = a; useUID = true end
+    end
+
+    if useUID then
+        -- uid string checks if supplied
+        if uid == nil then return oops('empty uid string') end
+        if #uid == 0 then return oops('empty uid string') end
+        if #uid ~= 14 then return oops('uid wrong length. Should be 7 hex bytes') end
+    else
+        -- GET TAG UID
+        local tag, err = lib14a.read(false, true)
+        if not tag then return oops(err) end
+        core.clearCommandBuffer()
+
+        -- simple tag check
+        if 0x09 ~= tag.sak then
+            if 0x4400 ~= tag.atqa then
+                return oops(('[fail] found tag %s :: looking for Mifare Mini 0.3k'):format(tag.name))
+            end
+        end
+        uid = tag.uid
+    end
+
+    print('|UID|', uid)
+
+    local keys, err = createKeys( uid )
+    printKeys( keys )
+    dumptofile( keys )
 end
 
 main(args)
\ No newline at end of file
diff --git a/client/scripts/calc_ev1_it.lua b/client/scripts/calc_ev1_it.lua
index f7a59dc1e..c6070d20d 100644
--- a/client/scripts/calc_ev1_it.lua
+++ b/client/scripts/calc_ev1_it.lua
@@ -12,167 +12,167 @@ Algo not found by me.
 ]]
 example =[[
      -- if called without, it reads tag uid
-	 script run calc_ev1_it
-	 
-	 --
-	 script run calc_ev1_it -u 11223344556677
+     script run calc_ev1_it
+
+     --
+     script run calc_ev1_it -u 11223344556677
 ]]
 usage = [[
 script run calc_ev1_it -h -u <uid> "
 
 Arguments:
-	-h             : this help
-	-u <UID>       : UID
+    -h             : this help
+    -u <UID>       : UID
 ]]
 
 local DEBUG = true
 local bxor = bit32.bxor
---- 
+---
 -- A debug printout-function
 local function dbg(args)
-	if not DEBUG then return end
-	
+    if not DEBUG then return end
+
     if type(args) == "table" then
-		local i = 1
-		while args[i] do
-			dbg(args[i])
-			i = i+1
-		end
-	else
-		print("###", args)
-	end	
-end	
---- 
+        local i = 1
+        while args[i] do
+            dbg(args[i])
+            i = i+1
+        end
+    else
+        print("###", args)
+    end
+end
+---
 -- This is only meant to be used when errors occur
 local function oops(err)
-	print("ERROR: ",err)
-	return nil,err
+    print("ERROR: ",err)
+    return nil,err
 end
---- 
+---
 -- Usage help
 local function help()
-	print(copyright)
-	print(author)	
-	print(version)	
-	print(desc)
-	print("Example usage")
-	print(example)
+    print(copyright)
+    print(author)
+    print(version)
+    print(desc)
+    print("Example usage")
+    print(example)
 end
 --
 -- Exit message
 function exitMsg(msg)
-	print( string.rep('--',20) )
-	print( string.rep('--',20) )
-	print(msg)
-	print()
+    print( string.rep('--',20) )
+    print( string.rep('--',20) )
+    print(msg)
+    print()
 end
 
 local _xortable = {
     --[[ position, 4byte xor
     --]]
-	{"00","4f2711c1"},
-	{"01","07D7BB83"},
-	{"02","9636EF07"},
-	{"03","B5F4460E"},
-	{"04","F271141C"},
-	{"05","7D7BB038"},
-	{"06","636EF871"},
-	{"07","5F4468E3"},
-	{"08","271149C7"},
-	{"09","D7BB0B8F"},
-	{"0A","36EF8F1E"},
-	{"0B","F446863D"},
-	{"0C","7114947A"},
-	{"0D","7BB0B0F5"},
-	{"0E","6EF8F9EB"},
-	{"0F","44686BD7"},
-	{"10","11494fAF"},
-	{"11","BB0B075F"},
-	{"12","EF8F96BE"},
-	{"13","4686B57C"},
-	{"14","1494F2F9"},
-	{"15","B0B07DF3"},
-	{"16","F8F963E6"},
-	{"17","686B5FCC"},
-	{"18","494F2799"},
-	{"19","0B07D733"},
-	{"1A","8F963667"},
-	{"1B","86B5F4CE"},
-	{"1C","94F2719C"},
-	{"1D","B07D7B38"},
-	{"1E","F9636E70"},
-	{"1F","6B5F44E0"},
+    {"00","4f2711c1"},
+    {"01","07D7BB83"},
+    {"02","9636EF07"},
+    {"03","B5F4460E"},
+    {"04","F271141C"},
+    {"05","7D7BB038"},
+    {"06","636EF871"},
+    {"07","5F4468E3"},
+    {"08","271149C7"},
+    {"09","D7BB0B8F"},
+    {"0A","36EF8F1E"},
+    {"0B","F446863D"},
+    {"0C","7114947A"},
+    {"0D","7BB0B0F5"},
+    {"0E","6EF8F9EB"},
+    {"0F","44686BD7"},
+    {"10","11494fAF"},
+    {"11","BB0B075F"},
+    {"12","EF8F96BE"},
+    {"13","4686B57C"},
+    {"14","1494F2F9"},
+    {"15","B0B07DF3"},
+    {"16","F8F963E6"},
+    {"17","686B5FCC"},
+    {"18","494F2799"},
+    {"19","0B07D733"},
+    {"1A","8F963667"},
+    {"1B","86B5F4CE"},
+    {"1C","94F2719C"},
+    {"1D","B07D7B38"},
+    {"1E","F9636E70"},
+    {"1F","6B5F44E0"},
 }
 
 local function findEntryByUid( uid )
 
-	-- xor UID4,UID5,UID6,UID7
-	-- mod 0x20 (dec 32)
-	local pos = (bxor(uid[4], uid[5], uid[6], uid[7])) % 32
+    -- xor UID4,UID5,UID6,UID7
+    -- mod 0x20 (dec 32)
+    local pos = (bxor(uid[4], uid[5], uid[6], uid[7])) % 32
+
+    -- convert to hexstring
+    pos = string.format('%02X', pos)
 
-	-- convert to hexstring
-	pos = string.format('%02X', pos)
-	
     for k, v in pairs(_xortable) do
-		if ( v[1]  == pos ) then
-			return utils.ConvertHexToBytes(v[2])
-		end
-	end
-	return nil
+        if ( v[1]  == pos ) then
+            return utils.ConvertHexToBytes(v[2])
+        end
+    end
+    return nil
 end
 ---
 -- create pwd
 local function pwdgen(uid)
-	--  PWD CALC	
-	--	PWD0  =  T0 xor B xor C xor D
-	--	PWD1  =  T1 xor A xor C xor E 
-	--	PWD2  =  T2 xor A xor B xor F 
-	--	PWD3  =  T3 xor G 
-	local uidbytes = utils.ConvertHexToBytes(uid)
+    --  PWD CALC
+    --  PWD0  =  T0 xor B xor C xor D
+    --  PWD1  =  T1 xor A xor C xor E
+    --  PWD2  =  T2 xor A xor B xor F
+    --  PWD3  =  T3 xor G
+    local uidbytes = utils.ConvertHexToBytes(uid)
     local entry = findEntryByUid(uidbytes)
-	if entry == nil then return nil, "Can't find a xor entry" end
+    if entry == nil then return nil, "Can't find a xor entry" end
 
     local pwd0 = bxor( entry[1], uidbytes[2], uidbytes[3], uidbytes[4])
-	local pwd1 = bxor( entry[2], uidbytes[1], uidbytes[3], uidbytes[5])
-	local pwd2 = bxor( entry[3], uidbytes[1], uidbytes[2], uidbytes[6])
-	local pwd3 = bxor( entry[4], uidbytes[7])
-	return string.format('%02X%02X%02X%02X', pwd0, pwd1, pwd2, pwd3)
+    local pwd1 = bxor( entry[2], uidbytes[1], uidbytes[3], uidbytes[5])
+    local pwd2 = bxor( entry[3], uidbytes[1], uidbytes[2], uidbytes[6])
+    local pwd3 = bxor( entry[4], uidbytes[7])
+    return string.format('%02X%02X%02X%02X', pwd0, pwd1, pwd2, pwd3)
 end
 --
 -- main
 local function main(args)
 
-	print( string.rep('--',20) )
-	print( string.rep('--',20) )	
-	print()
-			
-	local uid = '04111211121110'
-	local useUID = false
-	
-	-- Arguments for the script
-	for o, a in getopt.getopt(args, 'hu:') do
-		if o == "h" then return help() end		
-		if o == "u" then uid = a; useUID = true end		
-	end
+    print( string.rep('--',20) )
+    print( string.rep('--',20) )
+    print()
 
-	if useUID then
-		-- uid string checks
-		if uid == nil then return oops('empty uid string') end
-		if #uid == 0 then return oops('empty uid string') end
-		if #uid ~= 14 then return oops('uid wrong length. Should be 7 hex bytes') end
-	else
-		-- GET TAG UID	
-		local tag, err = lib14a.read(false, true)
-		if not tag then return oops(err) end
-		core.clearCommandBuffer()
-		uid = tag.uid	
-	end
-	
-	print('UID | '..uid)
-	local pwd, err = pwdgen(uid)
-	if not pwd then return ooops(err) end
-	
-	print(string.format('PWD | %s', pwd))
+    local uid = '04111211121110'
+    local useUID = false
+
+    -- Arguments for the script
+    for o, a in getopt.getopt(args, 'hu:') do
+        if o == "h" then return help() end
+        if o == "u" then uid = a; useUID = true end
+    end
+
+    if useUID then
+        -- uid string checks
+        if uid == nil then return oops('empty uid string') end
+        if #uid == 0 then return oops('empty uid string') end
+        if #uid ~= 14 then return oops('uid wrong length. Should be 7 hex bytes') end
+    else
+        -- GET TAG UID
+        local tag, err = lib14a.read(false, true)
+        if not tag then return oops(err) end
+        core.clearCommandBuffer()
+        uid = tag.uid
+    end
+
+    print('UID | '..uid)
+    local pwd, err = pwdgen(uid)
+    if not pwd then return ooops(err) end
+
+    print(string.format('PWD | %s', pwd))
 end
 
 main(args)
\ No newline at end of file
diff --git a/client/scripts/calc_mizip.lua b/client/scripts/calc_mizip.lua
index 4500c9c0f..42f13c578 100644
--- a/client/scripts/calc_mizip.lua
+++ b/client/scripts/calc_mizip.lua
@@ -6,192 +6,192 @@ local utils =  require('utils')
 author = 'Iceman'
 version = 'v1.0.0'
 desc = [[
-This script calculates mifare keys based on uid diversification for mizip. 
+This script calculates mifare keys based on uid diversification for mizip.
 Algo not found by me.
 ]]
 example = [[
-	 -- if called without, it reads tag uid
-	 script run calc_mizip
-	 
-	 --
-	 script run calc_mizip -u 11223344
+     -- if called without, it reads tag uid
+     script run calc_mizip
+
+     --
+     script run calc_mizip -u 11223344
 ]]
 usage = [[
 script run calc_mizip -h -u <uid>
 
 Arguments:
-	-h             : this help
-	-u <UID>       : UID
+    -h             : this help
+    -u <UID>       : UID
 ]]
 local DEBUG = true
 local bxor = bit32.bxor
 local _xortable = {
     --[[ sector key A/B, 6byte xor
     --]]
-	{1, "09125a2589e5", "F12C8453D821"},
-	{2, "AB75C937922F", "73E799FE3241"},
-	{3, "E27241AF2C09", "AA4D137656AE"},
-	{4, "317AB72F4490", "B01327272DFD"},
+    {1, "09125a2589e5", "F12C8453D821"},
+    {2, "AB75C937922F", "73E799FE3241"},
+    {3, "E27241AF2C09", "AA4D137656AE"},
+    {4, "317AB72F4490", "B01327272DFD"},
 }
---- 
+---
 -- A debug printout-function
 local function dbg(args)
     if not DEBUG then return end
     if type(args) == "table" then
-		local i = 1
-		while args[i] do
-			dbg(args[i])
-			i = i+1
-		end
-	else
-		print("###", args)
-	end	
-end	
---- 
+        local i = 1
+        while args[i] do
+            dbg(args[i])
+            i = i+1
+        end
+    else
+        print("###", args)
+    end
+end
+---
 -- This is only meant to be used when errors occur
 local function oops(err)
-	print("ERROR: ",err)
-	return nil,err
+    print("ERROR: ",err)
+    return nil,err
 end
---- 
+---
 -- Usage help
 local function help()
-	print(copyright)
-	print(author)	
-	print(version)	
-	print(desc)
-	print("Example usage")
-	print(example)
+    print(copyright)
+    print(author)
+    print(version)
+    print(desc)
+    print("Example usage")
+    print(example)
 end
 --
 -- Exit message
 local function exitMsg(msg)
-	print( string.rep('--',20) )
-	print( string.rep('--',20) )
-	print(msg)
-	print()
+    print( string.rep('--',20) )
+    print( string.rep('--',20) )
+    print(msg)
+    print()
 end
 --
 -- dumps all keys to file
 local function dumptofile(keys)
-	dbg('dumping keys to file')
+    dbg('dumping keys to file')
 
-	if utils.confirm('Do you wish to save the keys to dumpfile?') then 
-		local destination = utils.input('Select a filename to store to', 'dumpkeys.bin')
-		local file = io.open(destination, 'wb')
-		if file == nil then 
-			print('Could not write to file ', destination)
-			return
-		end
+    if utils.confirm('Do you wish to save the keys to dumpfile?') then
+        local destination = utils.input('Select a filename to store to', 'dumpkeys.bin')
+        local file = io.open(destination, 'wb')
+        if file == nil then
+            print('Could not write to file ', destination)
+            return
+        end
 
-		-- Mifare Mini has 5 sectors, 
-		local key_a = ''
-		local key_b = ''
-		
-		for sector = 0, #keys do
-			local keyA, keyB = unpack(keys[sector])
-			key_a = key_a .. bin.pack('H', keyA);
-			key_b = key_b .. bin.pack('H', keyB);
-		end
-		file:write(key_a)
-		file:write(key_b)
-		file:close()
-	end
+        -- Mifare Mini has 5 sectors,
+        local key_a = ''
+        local key_b = ''
+
+        for sector = 0, #keys do
+            local keyA, keyB = unpack(keys[sector])
+            key_a = key_a .. bin.pack('H', keyA);
+            key_b = key_b .. bin.pack('H', keyB);
+        end
+        file:write(key_a)
+        file:write(key_b)
+        file:close()
+    end
 end
 ---
 -- key bytes to string
 local function keyStr(p1, p2, p3, p4, p5, p6)
-	return string.format('%02X%02X%02X%02X%02X%02X',p1, p2, p3, p4, p5, p6)
+    return string.format('%02X%02X%02X%02X%02X%02X',p1, p2, p3, p4, p5, p6)
 end
 ---
 -- create key
 local function calckey(uid, xorkey, keytype)
-	local p1,p2,p3,p4,p5,p6
-	if keytype == 'A' then 
-		p1 = bxor( uid[1], xorkey[1])
-		p2 = bxor( uid[2], xorkey[2])
-		p3 = bxor( uid[3], xorkey[3])
-		p4 = bxor( uid[4], xorkey[4])
-		p5 = bxor( uid[1], xorkey[5])
-		p6 = bxor( uid[2], xorkey[6])
-	else
-		p1 = bxor( uid[3], xorkey[1])
-		p2 = bxor( uid[4], xorkey[2])
-		p3 = bxor( uid[1], xorkey[3])
-		p4 = bxor( uid[2], xorkey[4])
-		p5 = bxor( uid[3], xorkey[5])
-		p6 = bxor( uid[4], xorkey[6])
-	end
-	return keyStr(p1,p2,p3,p4,p5,p6)
-end 
+    local p1,p2,p3,p4,p5,p6
+    if keytype == 'A' then
+        p1 = bxor( uid[1], xorkey[1])
+        p2 = bxor( uid[2], xorkey[2])
+        p3 = bxor( uid[3], xorkey[3])
+        p4 = bxor( uid[4], xorkey[4])
+        p5 = bxor( uid[1], xorkey[5])
+        p6 = bxor( uid[2], xorkey[6])
+    else
+        p1 = bxor( uid[3], xorkey[1])
+        p2 = bxor( uid[4], xorkey[2])
+        p3 = bxor( uid[1], xorkey[3])
+        p4 = bxor( uid[2], xorkey[4])
+        p5 = bxor( uid[3], xorkey[5])
+        p6 = bxor( uid[4], xorkey[6])
+    end
+    return keyStr(p1,p2,p3,p4,p5,p6)
+end
 ---
 -- print keys
 local function printKeys(keys)
-	print('|---|----------------|---|----------------|---|')
-	print('|sec|key A           |res|key B           |res|')
-	print('|---|----------------|---|----------------|---|')
-	for sector = 0, #keys do
-		local keyA, keyB = unpack(keys[sector])
-		print(('|%03d|  %s  | %s |  %s  | %s |'):format(sector, keyA, 1, keyB, 1))
-	end	
-	print('|---|----------------|---|----------------|---|')
+    print('|---|----------------|---|----------------|---|')
+    print('|sec|key A           |res|key B           |res|')
+    print('|---|----------------|---|----------------|---|')
+    for sector = 0, #keys do
+        local keyA, keyB = unpack(keys[sector])
+        print(('|%03d|  %s  | %s |  %s  | %s |'):format(sector, keyA, 1, keyB, 1))
+    end
+    print('|---|----------------|---|----------------|---|')
 end
 ---
 -- create a full set of keys
 local function createKeys(uid)
-	local uidbytes = utils.ConvertHexToBytes(uid)
-	
-	local k = {}
-	k[0] = { keyStr(0xA0,0xA1,0xA2,0xA3,0xA4,0xA5), keyStr(0xB4,0xC1,0x32,0x43,0x9e,0xef) }
+    local uidbytes = utils.ConvertHexToBytes(uid)
+
+    local k = {}
+    k[0] = { keyStr(0xA0,0xA1,0xA2,0xA3,0xA4,0xA5), keyStr(0xB4,0xC1,0x32,0x43,0x9e,0xef) }
 
     for _, v in pairs(_xortable) do
-		local keyA = calckey(uidbytes, utils.ConvertHexToBytes(v[2]), 'A')
-		local keyB = calckey(uidbytes, utils.ConvertHexToBytes(v[3]), 'B')
-		k[v[1]] = { keyA, keyB }
-	end
-	return k
+        local keyA = calckey(uidbytes, utils.ConvertHexToBytes(v[2]), 'A')
+        local keyB = calckey(uidbytes, utils.ConvertHexToBytes(v[3]), 'B')
+        k[v[1]] = { keyA, keyB }
+    end
+    return k
 end
 ---
 -- main
 local function main(args)
 
-	print( string.rep('==', 30) )
-	print()
-			
-	local uid = '11223344'
-	local useUID = false
-	
-	-- Arguments for the script
-	for o, a in getopt.getopt(args, 'hu:') do
-		if o == "h" then return help() end		
-		if o == "u" then uid = a ; useUID = true end		
-	end
+    print( string.rep('==', 30) )
+    print()
 
-	if useUID then
-		-- uid string checks
-		if uid == nil then return oops('empty uid string') end
-		if #uid == 0 then return oops('empty uid string') end
-		if #uid ~= 8 then return oops('uid wrong length. Should be 4 hex bytes') end
-	else
-		-- GET TAG UID	
-		local tag, err = lib14a.read(false, true)
-		if not tag then return oops(err) end
-		core.clearCommandBuffer()
+    local uid = '11223344'
+    local useUID = false
 
-		-- simple tag check
-		if 0x09 ~= tag.sak then
-			if 0x4400 ~= tag.atqa then 
-				return oops(('[fail] found tag %s :: looking for Mifare Mini 0.3k'):format(tag.name)) 
-			end
-		end		
-		uid = tag.uid
-	end	
-	
-	print('|UID|', uid)
-	
-	local keys, err = createKeys( uid )
-	printKeys( keys )
-	dumptofile( keys )
+    -- Arguments for the script
+    for o, a in getopt.getopt(args, 'hu:') do
+        if o == "h" then return help() end
+        if o == "u" then uid = a ; useUID = true end
+    end
+
+    if useUID then
+        -- uid string checks
+        if uid == nil then return oops('empty uid string') end
+        if #uid == 0 then return oops('empty uid string') end
+        if #uid ~= 8 then return oops('uid wrong length. Should be 4 hex bytes') end
+    else
+        -- GET TAG UID
+        local tag, err = lib14a.read(false, true)
+        if not tag then return oops(err) end
+        core.clearCommandBuffer()
+
+        -- simple tag check
+        if 0x09 ~= tag.sak then
+            if 0x4400 ~= tag.atqa then
+                return oops(('[fail] found tag %s :: looking for Mifare Mini 0.3k'):format(tag.name))
+            end
+        end
+        uid = tag.uid
+    end
+
+    print('|UID|', uid)
+
+    local keys, err = createKeys( uid )
+    printKeys( keys )
+    dumptofile( keys )
 end
 
 main(args)
\ No newline at end of file
diff --git a/client/scripts/calypso.lua b/client/scripts/calypso.lua
index ce90a25fd..2b7252261 100644
--- a/client/scripts/calypso.lua
+++ b/client/scripts/calypso.lua
@@ -11,15 +11,15 @@ desc =
 This is a script to communicate with a CALYSPO / 14443b tag using the '14b raw' commands
 
 Arguments:
-	-b 				123
-Examples : 
-	script run f -b 11223344
-	script run f
+    -b              123
+Examples :
+    script run f -b 11223344
+    script run f
 
-Examples : 
+Examples :
 
 # 1. Connect and don't disconnect
-script run f  
+script run f
 # 2. Send mf auth, read response
 script run f
 # 3. disconnect
@@ -28,56 +28,56 @@ script run f
 ]]
 
 --[[
-This script communicates with  /armsrc/iso14443b.c, 
-Check there for details about data format and how commands are interpreted on the 
-device-side.  
+This script communicates with  /armsrc/iso14443b.c,
+Check there for details about data format and how commands are interpreted on the
+device-side.
 ]]
 
 ---
 --
 local function calypso_switch_on_field()
-	local flags = lib14b.ISO14B_COMMAND.ISO14B_CONNECT
-	local c = Command:new{cmd = cmds.CMD_ISO_14443B_COMMAND, arg1 = flags}
-	return lib14b.sendToDevice(c, true) 
+    local flags = lib14b.ISO14B_COMMAND.ISO14B_CONNECT
+    local c = Command:new{cmd = cmds.CMD_ISO_14443B_COMMAND, arg1 = flags}
+    return lib14b.sendToDevice(c, true)
 end
 ---
 -- Disconnect (poweroff) the antenna forcing a disconnect of a 14b tag.
 local function calypso_switch_off_field()
-	local flags = lib14b.ISO14B_COMMAND.ISO14B_DISCONNECT
-	local c = Command:new{cmd = cmds.CMD_ISO_14443B_COMMAND, arg1 = flags}
-	return lib14b.sendToDevice(c, true) 
+    local flags = lib14b.ISO14B_COMMAND.ISO14B_DISCONNECT
+    local c = Command:new{cmd = cmds.CMD_ISO_14443B_COMMAND, arg1 = flags}
+    return lib14b.sendToDevice(c, true)
 end
 
 local function calypso_parse(result)
-	local r = Command.parse(result)
-	local len = r.arg2 * 2
-	r.data = string.sub(r.data, 0, len);
-	print('GOT:', r.data)
-	if r.arg1 == 0 then
-		return r, nil
-	end 
-	return nil,nil
+    local r = Command.parse(result)
+    local len = r.arg2 * 2
+    r.data = string.sub(r.data, 0, len);
+    print('GOT:', r.data)
+    if r.arg1 == 0 then
+        return r, nil
+    end
+    return nil,nil
 end
---- 
+---
 -- A debug printout-function
 local function dbg(args)
-	if DEBUG then
-		print("###", args)
-	end
-end 
---- 
+    if DEBUG then
+        print("###", args)
+    end
+end
+---
 -- This is only meant to be used when errors occur
 local function oops(err)
-	print("ERROR: ", err)
-	calypso_switch_off_field()
-	return nil, err
+    print("ERROR: ", err)
+    calypso_switch_off_field()
+    return nil, err
 end
---- 
+---
 -- Usage help
 local function help()
-	print(desc)
-	print("Example usage")
-	print(example)
+    print(desc)
+    print("Example usage")
+    print(example)
 end
 --
 -- helper function,  give current count of items in lua-table.
@@ -87,7 +87,7 @@ local function tablelen(T)
   return count
 end
 ---
--- helper function, gives a sorted table from table t,  
+-- helper function, gives a sorted table from table t,
 -- order can be a seperate sorting-order function.
 local function spairs(t, order)
     -- collect the keys
@@ -95,7 +95,7 @@ local function spairs(t, order)
     for k in pairs(t) do keys[#keys+1] = k end
 
     -- if order function given, sort by it by passing the table and keys a, b,
-    -- otherwise just sort the keys 
+    -- otherwise just sort the keys
     if order then
         table.sort(keys, function(a,b) return order(t, a, b) end)
     else
@@ -112,54 +112,54 @@ local function spairs(t, order)
     end
 end
 ---
--- Sends a usbpackage ,  "hf 14b raw" 
+-- Sends a usbpackage ,  "hf 14b raw"
 -- if it reads the response, it converts it to a lua object "Command" first and the Data is cut to correct length.
 local function calypso_send_cmd_raw(data, ignoreresponse )
 
-	local command, flags, result, err
-	flags = lib14b.ISO14B_COMMAND.ISO14B_RAW +
-			lib14b.ISO14B_COMMAND.ISO14B_APPEND_CRC
+    local command, flags, result, err
+    flags = lib14b.ISO14B_COMMAND.ISO14B_RAW +
+            lib14b.ISO14B_COMMAND.ISO14B_APPEND_CRC
 
-	data = data or "00"
+    data = data or "00"
 
-	command = Command:new{cmd = cmds.CMD_ISO_14443B_COMMAND, 
-							arg1 = flags, 	
-							arg2 = #data/2,	-- LEN of data, half the length of the ASCII-string hex string
-							arg3 = 0,
-							data = data}	-- data bytes (commands etc)
-	result, err = lib14b.sendToDevice(command, false) 
-	
-	if ignoreresponse then return response, err end
-	
-	if result then
-		local r = calypso_parse(result)
-		return r, nil
-	end
-	return respone, err
+    command = Command:new{cmd = cmds.CMD_ISO_14443B_COMMAND,
+                            arg1 = flags,
+                            arg2 = #data/2, -- LEN of data, half the length of the ASCII-string hex string
+                            arg3 = 0,
+                            data = data}    -- data bytes (commands etc)
+    result, err = lib14b.sendToDevice(command, false)
+
+    if ignoreresponse then return response, err end
+
+    if result then
+        local r = calypso_parse(result)
+        return r, nil
+    end
+    return respone, err
 end
 ---
 -- calypso_card_num : Reads card number from ATR and
 -- writes it in the tree in decimal format.
 local function calypso_card_num(card)
-	if not card then return end
-	local card_num = tonumber( card.uid:sub(1,8),16 )
-	print('Card UID', card.uid)
-	print('Card Number', card_num) 
+    if not card then return end
+    local card_num = tonumber( card.uid:sub(1,8),16 )
+    print('Card UID', card.uid)
+    print('Card Number', card_num)
 end
 ---
 -- analyse CALYPSO apdu status bytes.
 local function calypso_apdu_status(apdu)
-	-- last two is CRC
-	-- next two is APDU status bytes.
-	local status = false
-	local mess = 'FAIL'
-	local sw = apdu:sub( #apdu-7, #apdu-4)	
-	desc, err = iso7816.tostring(sw)
-	print ('SW', sw, desc, err )
+    -- last two is CRC
+    -- next two is APDU status bytes.
+    local status = false
+    local mess = 'FAIL'
+    local sw = apdu:sub( #apdu-7, #apdu-4)
+    desc, err = iso7816.tostring(sw)
+    print ('SW', sw, desc, err )
 
-	status = ( sw == '9000' )
-	
-	return status
+    status = ( sw == '9000' )
+
+    return status
 end
 
 local _calypso_cmds = {
@@ -167,16 +167,16 @@ local _calypso_cmds = {
 -- Break down of command bytes:
 --  A4 = select
 --  Master File  3F00
---  0x3F = master file 
+--  0x3F = master file
 --  0x00 = master file id, is constant to 0x00.
 
 --  DF Dedicated File  38nn
 --  can be seen as directories
---  0x38  
+--  0x38
 --  0xNN  id
---	["01.Select ICC file"]	=	'0294 a4 080004 3f00 0002',
+--  ["01.Select ICC file"] = '0294 a4 080004 3f00 0002',
 
--- 	EF Elementary File 
+--  EF Elementary File
 --  EF1 Pin file
 --  EF2 Key file
 --  Grey Lock file
@@ -184,93 +184,93 @@ local _calypso_cmds = {
 --  Electronic Purse file
 --  Electronic Transaction log file
 
-	
-	--["01.Select ICC file"]	=	'0294 a4 00 0002 3f00',
-	["01.Select ICC file"]	=	'0294 a4 080004 3f00 0002',
-	["02.ICC"]				=	'0394 b2 01 041d',
-	["03.Select EnvHol file"] =	'0294 a4 080004 2000 2001',
-	["04.EnvHol1"]			=	'0394 b2 01 041d',
-	["05.Select EvLog file"] =	'0294 a4 080004 2000 2010',
-	["06.EvLog1"]			=	'0394 b2 01 041d',
-	["07.EvLog2"]			=	'0294 b2 02 041d',
-	["08.EvLog3"]			=	'0394 b2 03 041d',
-	["09.Select ConList file"] ='0294 a4 080004 2000 2050',
-	["10.ConList"]			=	'0394 b2 01 041d',
-	["11.Select Contra file"] =	'0294 a4 080004 2000 2020',
-	["12.Contra1"]			=	'0394 b2 01 041d',
-	["13.Contra2"]			=	'0294 b2 02 041d',
-	["14.Contra3"]			=	'0394 b2 03 041d',
-	["15.Contra4"]			=	'0294 b2 04 041d',
-	["16.Select Counter file"]=	'0394 a4 080004 2000 2069',
-	["17.Counter"]			=	'0294 b2 01 041d',
-	["18.Select SpecEv file"]=	'0394 a4 080004 2000 2040',
-	["19.SpecEv1"]			=	'0294 b2 01 041d',
+
+    --["01.Select ICC file"]    = '0294 a4 00 0002 3f00',
+    ["01.Select ICC file"]    = '0294 a4 080004 3f00 0002',
+    ["02.ICC"]                = '0394 b2 01 041d',
+    ["03.Select EnvHol file"] = '0294 a4 080004 2000 2001',
+    ["04.EnvHol1"]            = '0394 b2 01 041d',
+    ["05.Select EvLog file"]  = '0294 a4 080004 2000 2010',
+    ["06.EvLog1"]             = '0394 b2 01 041d',
+    ["07.EvLog2"]             = '0294 b2 02 041d',
+    ["08.EvLog3"]             = '0394 b2 03 041d',
+    ["09.Select ConList file"]= '0294 a4 080004 2000 2050',
+    ["10.ConList"]            = '0394 b2 01 041d',
+    ["11.Select Contra file"] = '0294 a4 080004 2000 2020',
+    ["12.Contra1"]            = '0394 b2 01 041d',
+    ["13.Contra2"]            = '0294 b2 02 041d',
+    ["14.Contra3"]            = '0394 b2 03 041d',
+    ["15.Contra4"]            = '0294 b2 04 041d',
+    ["16.Select Counter file"]= '0394 a4 080004 2000 2069',
+    ["17.Counter"]            = '0294 b2 01 041d',
+    ["18.Select SpecEv file"] = '0394 a4 080004 2000 2040',
+    ["19.SpecEv1"]            = '0294 b2 01 041d',
 }
 
---- 
+---
 -- The main entry point
 function main(args)
 
-	print( string.rep('--',20) )
-	print( string.rep('--',20) )	
-	print()
-	
-	local data, apdu, flags, uid, cid, result, err, card
-	-- Read the parameters
-	for o, a in getopt.getopt(args, 'h') do
-		if o == "h" then return help() end
-	end
-	
-	calypso_switch_on_field()
-			
-	-- Select 14b tag.
-	card, err = lib14b.waitFor14443b()	
-	if not card then return oops(err) end
-	
-	calypso_card_num(card)
-	cid = card.cid
+    print( string.rep('--',20) )
+    print( string.rep('--',20) )
+    print()
 
-	--[[
-	NAME        VALUE  APDU_POS
-	PCB         0x0A   0
-	CID         0x00   1
-	CLA         0x94   2
-	SELECT FILE 0xA4   3
-	READ FILE   0xB2   3
-	P1                 4
-	P2                 5
-	LEN_
-	         0  1  2  3  4  5  6  7
-	apdu = '02 94 a4 08 00 04 3f 00 00 02'  --select ICC file
-	DF_NAME = "1TIC.ICA" 
-	--]]
-	--for i = 1,10 do
-		--result, err = calypso_send_cmd_raw('0294a40800043f000002',false)  --select ICC file
-		for i, apdu in spairs(_calypso_cmds) do
-			print('>>', i )
-			apdu = apdu:gsub("%s+","")
-			result, err = calypso_send_cmd_raw(apdu , false)
-			if result then 
-				calypso_apdu_status(result.data)
-				print('<<', result.data )
-			else
-				print('<< no answer')
-			end
-		end
-	calypso_switch_off_field()
+    local data, apdu, flags, uid, cid, result, err, card
+    -- Read the parameters
+    for o, a in getopt.getopt(args, 'h') do
+        if o == "h" then return help() end
+    end
+
+    calypso_switch_on_field()
+
+    -- Select 14b tag.
+    card, err = lib14b.waitFor14443b()
+    if not card then return oops(err) end
+
+    calypso_card_num(card)
+    cid = card.cid
+
+    --[[
+    NAME        VALUE  APDU_POS
+    PCB         0x0A   0
+    CID         0x00   1
+    CLA         0x94   2
+    SELECT FILE 0xA4   3
+    READ FILE   0xB2   3
+    P1                 4
+    P2                 5
+    LEN_
+             0  1  2  3  4  5  6  7
+    apdu = '02 94 a4 08 00 04 3f 00 00 02'  --select ICC file
+    DF_NAME = "1TIC.ICA"
+    --]]
+    --for i = 1,10 do
+        --result, err = calypso_send_cmd_raw('0294a40800043f000002',false)  --select ICC file
+        for i, apdu in spairs(_calypso_cmds) do
+            print('>>', i )
+            apdu = apdu:gsub("%s+","")
+            result, err = calypso_send_cmd_raw(apdu , false)
+            if result then
+                calypso_apdu_status(result.data)
+                print('<<', result.data )
+            else
+                print('<< no answer')
+            end
+        end
+    calypso_switch_off_field()
 end
 ---
--- a simple selftest function, tries to convert 
+-- a simple selftest function, tries to convert
 function selftest()
-	DEBUG = true
-	dbg("Performing test")
-	dbg("Tests done")
+    DEBUG = true
+    dbg("Performing test")
+    dbg("Tests done")
 end
--- Flip the switch here to perform a sanity check. 
+-- Flip the switch here to perform a sanity check.
 -- It read a nonce in two different ways, as specified in the usage-section
-if "--test"==args then 
-	selftest()
-else 
-	-- Call the main 
-	main(args)
+if "--test"==args then
+    selftest()
+else
+    -- Call the main
+    main(args)
 end
\ No newline at end of file
diff --git a/client/scripts/cmdline.lua b/client/scripts/cmdline.lua
index 9c4df1446..29627afc7 100644
--- a/client/scripts/cmdline.lua
+++ b/client/scripts/cmdline.lua
@@ -1,12 +1,12 @@
 print("This is how a cmd-line interface could be implemented\nPrint 'exit' to exit.\n")
 local answer
 repeat
-  	io.write("$>")
-  	io.flush()
-  	answer=io.read()
-  	if answer ~= 'exit' then
-  		local func = assert(loadstring("return " .. answer))
-  		io.write("\n"..tostring(func() or "").."\n");
-  	end--]]
-until answer=="exit" 
+    io.write("$>")
+    io.flush()
+    answer=io.read()
+    if answer ~= 'exit' then
+        local func = assert(loadstring("return " .. answer))
+        io.write("\n"..tostring(func() or "").."\n");
+    end--]]
+until answer=="exit"
 print("Bye\n");
diff --git a/client/scripts/didump.lua b/client/scripts/didump.lua
index b63d2ed07..b6bc03a11 100644
--- a/client/scripts/didump.lua
+++ b/client/scripts/didump.lua
@@ -1,4 +1,4 @@
---- 
+---
 -- requirements
 local cmds = require('commands')
 local getopt = require('getopt')
@@ -8,9 +8,9 @@ local json = require('dkjson')
 local toys = require('default_toys_di')
 
 example =[[
-	script run didump
-	script run didump -t
-	script run didump -r
+    script run didump
+    script run didump -t
+    script run didump -r
 ]]
 author = "Iceman"
 usage = "script run didump -h -t"
@@ -18,9 +18,9 @@ desc = [[
 This is a script to dump and decrypt the data of a specific type of Mifare Mini token.
 The dump is decrypted. If a raw dump is wanted, use the -r parameter
 Arguments:
-	-h             : this help
-	-r		: raw
-	-t			   : selftest
+    -h             : this help
+    -r             : raw
+    -t             : selftest
 ]]
 
 local band=bit32.band
@@ -40,50 +40,50 @@ local numBlocks = 20
 local numSectors = 5
 local CHECKSUM_OFFSET = 12; -- +1???
 
---- 
+---
 -- A debug printout-function
 local function dbg(args)
     if not DEBUG then return end
-	if type(args) == "table" then
-		local i = 1
-		while args[i] do
-			print("###", args[i])
-			i = i+1
-		end
-	else
-		print("###", args)
-	end
-end 
---- 
+    if type(args) == "table" then
+        local i = 1
+        while args[i] do
+            print("###", args[i])
+            i = i+1
+        end
+    else
+        print("###", args)
+    end
+end
+---
 -- This is only meant to be used when errors occur
 local function oops(err)
-	print("ERROR: ",err)
-	core.clearCommandBuffer()
-	return false	
+    print("ERROR: ",err)
+    core.clearCommandBuffer()
+    return false
 end
---- 
+---
 -- Usage help
 local function help()
-	print(desc)
-	print("Example usage")
-	print(example)
+    print(desc)
+    print("Example usage")
+    print(example)
 end
 ---
 --
 local function print_info(tagdata)
-	--got table with data.
-	local h = tagdata[2]:sub(1,8)
-	local t = tostring( tonumber( h, 16 ) )
-	local item = toys.Find(t)
-	print( ("Modelid : %s , %s,  v.%s.0"):format(t, item[3], item[2]))
+    --got table with data.
+    local h = tagdata[2]:sub(1,8)
+    local t = tostring( tonumber( h, 16 ) )
+    local item = toys.Find(t)
+    print( ("Modelid : %s , %s,  v.%s.0"):format(t, item[3], item[2]))
 end
 ---
 -- Get checksum,
 -- called: data is string (32 hex digits)
 -- returns: number
 local function getChecksum(data)
-	local chksum = data:sub(25,32)
-	return tonumber(chksum,16)
+    local chksum = data:sub(25,32)
+    return tonumber(chksum,16)
 end
 ---
 -- calculate checksum
@@ -91,8 +91,8 @@ end
 -- returns: number
 local function calculateChecksum(data)
 
-	-- Generate table
-	local _tbl = {}
+    -- Generate table
+    local _tbl = {}
 _tbl[0] = { 0x0 }
 _tbl[1] = { 0x77073096 }
 _tbl[2] = { 0xEE0E612C }
@@ -351,248 +351,248 @@ _tbl[254] = { 0x5A05DF1B }
 _tbl[255] = { 0x2D02EF8D }
 
 
-	-- Calculate it
-	local ret = 0
-	for i,item in pairs(data) do
-		local tmp =  band(ret, 0xFF)
-		local index = band( bxor(tmp, item), 0xFF)
-		ret = bxor(rsh(ret,8), _tbl[index][1])
-	end
-	return ret
+    -- Calculate it
+    local ret = 0
+    for i,item in pairs(data) do
+        local tmp =  band(ret, 0xFF)
+        local index = band( bxor(tmp, item), 0xFF)
+        ret = bxor(rsh(ret,8), _tbl[index][1])
+    end
+    return ret
 end
 ---
 -- update checksum
 -- called: data is string, ( >= 24 hex digits )
 -- returns: string, (data concat new checksum)
 local function updateChecksum(data)
-	local part = data:sub(1,24)
-	local chksum = calculateChecksum( utils.ConvertHexToBytes(part))	
-	return string.format("%s%X", part, chksum)
+    local part = data:sub(1,24)
+    local chksum = calculateChecksum( utils.ConvertHexToBytes(part))
+    return string.format("%s%X", part, chksum)
 end
 ---
 -- receives the answer from deviceside, used with a readblock command
 local function waitCmd()
-	local response = core.WaitForResponseTimeout(cmds.CMD_ACK,TIMEOUT)
-	if response then
-		local count,cmd,arg0 = bin.unpack('LL',response)
-		if(arg0==1) then
-			local count,arg1,arg2,data = bin.unpack('LLH511',response,count)
-			return data:sub(1,32)
-		else
-			return nil, "Couldn't read block.." 
-		end
-	end
-	return nil, "No response from device"
+    local response = core.WaitForResponseTimeout(cmds.CMD_ACK,TIMEOUT)
+    if response then
+        local count,cmd,arg0 = bin.unpack('LL',response)
+        if(arg0==1) then
+            local count,arg1,arg2,data = bin.unpack('LLH511',response,count)
+            return data:sub(1,32)
+        else
+            return nil, "Couldn't read block.."
+        end
+    end
+    return nil, "No response from device"
 end
 
 local function keygen(uid)
-	local data = MIS..uid..BAR
-	local hash = utils.ConvertAsciiToBytes(utils.Sha1Hex(data))
-	return string.format("%02X%02X%02X%02X%02X%02X",
-		hash[3+1],
-		hash[2+1],
-		hash[1+1],
-		hash[0+1],
-		hash[7+1],
-		hash[6+1]
-		)
+    local data = MIS..uid..BAR
+    local hash = utils.ConvertAsciiToBytes(utils.Sha1Hex(data))
+    return string.format("%02X%02X%02X%02X%02X%02X",
+        hash[3+1],
+        hash[2+1],
+        hash[1+1],
+        hash[0+1],
+        hash[7+1],
+        hash[6+1]
+        )
 end
 
 --- encode 'table' into a json formatted string
--- 
+--
 local function convert_to_json( obj )
-	if type(obj) == "table" then
-		return json.encode (obj, { indent = true })
-	end
-	return oops('[fail] input object must be a lua-TABLE')
+    if type(obj) == "table" then
+        return json.encode (obj, { indent = true })
+    end
+    return oops('[fail] input object must be a lua-TABLE')
 end
 --
--- Save 
+-- Save
 local function save_json(filename, data)
-	jsondata = convert_to_json(data)
-	filename = filename or 'dumpdata.json'
-	local f = io.open(filename, "w")
-	if not f then return oops(string.format("Could not write to file %s", tostring(filename))) end	
-	f:write(jsondata)
-	io.close(f)
-	return filename   
+    jsondata = convert_to_json(data)
+    filename = filename or 'dumpdata.json'
+    local f = io.open(filename, "w")
+    if not f then return oops(string.format("Could not write to file %s", tostring(filename))) end
+    f:write(jsondata)
+    io.close(f)
+    return filename
 end
---- loads a json formatted text file with 
+--- loads a json formatted text file with
 --
 -- @param filename the file containing the json-dump  (defaults to dumpdata.json)
 local function load_json(filename)
-	filename = filename or 'dumpdata.json'
-	local f = io.open(filename, "rb")
-	if not f then return oops(string.format("Could not read file %s", tostring(filename)))	end
-	
-	-- Read file
-	local t = f:read("*all")
-	io.close(f)
+    filename = filename or 'dumpdata.json'
+    local f = io.open(filename, "rb")
+    if not f then return oops(string.format("Could not read file %s", tostring(filename))) end
 
-	local obj, pos, err = json.decode(t, 1, nil)
-	if err then return oops(string.format("importing json file failed. %s", err)) end
+    -- Read file
+    local t = f:read("*all")
+    io.close(f)
 
-	dbg(string.format('loaded file %s', input))
-	return obj
+    local obj, pos, err = json.decode(t, 1, nil)
+    if err then return oops(string.format("importing json file failed. %s", err)) end
 
---	local len, hex = bin.unpack( ("H%d"):format(#t), t)
+    dbg(string.format('loaded file %s', input))
+    return obj
+
+--  local len, hex = bin.unpack( ("H%d"):format(#t), t)
 end
 ---
 -- Generate encryption key
 local function create_key(uid)
-	local key = ''
-	local sha = utils.Sha1Hex( FOO..BAR..uid )
-	sha  = utils.ConvertBytesToHex( utils.ConvertAsciiToBytes(sha:sub(1,16)) )
-	key = utils.SwapEndiannessStr( sha:sub(1,8) , 32 )
-	key = key..utils.SwapEndiannessStr( sha:sub(9,16), 32 )
-	key = key..utils.SwapEndiannessStr( sha:sub(17,24), 32 )
-	key = key..utils.SwapEndiannessStr( sha:sub(25,32), 32 )
-	return key
+    local key = ''
+    local sha = utils.Sha1Hex( FOO..BAR..uid )
+    sha  = utils.ConvertBytesToHex( utils.ConvertAsciiToBytes(sha:sub(1,16)) )
+    key = utils.SwapEndiannessStr( sha:sub(1,8) , 32 )
+    key = key..utils.SwapEndiannessStr( sha:sub(9,16), 32 )
+    key = key..utils.SwapEndiannessStr( sha:sub(17,24), 32 )
+    key = key..utils.SwapEndiannessStr( sha:sub(25,32), 32 )
+    return key
 end
 --- reads all blocks from tag
 --
 local function readtag(mfkey, aeskey )
-	
-	local tagdata = {}
-	
-	for blockNo = 0, numBlocks-1 do
 
-		if core.ukbhit() then
-			print("[fail] aborted by user")
-			return nil
-		end
+    local tagdata = {}
 
-		-- read block from tag.
-		cmd = Command:new{cmd = cmds.CMD_MIFARE_READBL, arg1 = blockNo ,arg2 = 0,arg3 = 0, data = mfkey}
-		local err = core.SendCommand(cmd:getBytes())
-		if err then return oops(err) end
-		local blockdata, err = waitCmd()
-		if err then return oops(err) end	
+    for blockNo = 0, numBlocks-1 do
 
-		-- rules:
-		-- the following blocks is NOT encrypted
-		-- block 0 (manufacturing) and 18 
-		-- block with all zeros
-		-- sector trailor
-		if blockNo == 0 or blockNo == 18 then
-		
-		elseif  blockNo%4 ~= 3 then
-			
-			if not string.find(blockdata, '^0+$') then
-				if aeskey then					
-					local decrypted, err = core.aes128_decrypt_ecb(aeskey, blockdata)
-					if err then dbg(err) end
-					blockdata  =  utils.ConvertAsciiToHex(decrypted)					
-				end
-			end
-		else
-			-- Sectorblocks, not encrypted, but we add our known key to it since it is normally zeros.
-			blockdata = mfkey..blockdata:sub(13,20)..mfkey
-			--dbg(blockdata:sub(13,20))			
-		end
-		table.insert(tagdata, blockdata)
-	end
-	return tagdata
+        if core.ukbhit() then
+            print("[fail] aborted by user")
+            return nil
+        end
+
+        -- read block from tag.
+        cmd = Command:new{cmd = cmds.CMD_MIFARE_READBL, arg1 = blockNo ,arg2 = 0,arg3 = 0, data = mfkey}
+        local err = core.SendCommand(cmd:getBytes())
+        if err then return oops(err) end
+        local blockdata, err = waitCmd()
+        if err then return oops(err) end
+
+        -- rules:
+        -- the following blocks is NOT encrypted
+        -- block 0 (manufacturing) and 18
+        -- block with all zeros
+        -- sector trailor
+        if blockNo == 0 or blockNo == 18 then
+
+        elseif  blockNo%4 ~= 3 then
+
+            if not string.find(blockdata, '^0+$') then
+                if aeskey then
+                    local decrypted, err = core.aes128_decrypt_ecb(aeskey, blockdata)
+                    if err then dbg(err) end
+                    blockdata  =  utils.ConvertAsciiToHex(decrypted)
+                end
+            end
+        else
+            -- Sectorblocks, not encrypted, but we add our known key to it since it is normally zeros.
+            blockdata = mfkey..blockdata:sub(13,20)..mfkey
+            --dbg(blockdata:sub(13,20))
+        end
+        table.insert(tagdata, blockdata)
+    end
+    return tagdata
 end
 ---
 -- simple selftest of functionality
 local function selftest()
-	local testdata = '000F42430D0A14000001D11F'..'5D738517'
-	local chksum = getChecksum(testdata)
-	local calc = calculateChecksum( utils.ConvertHexToBytes(testdata:sub(1,24)))
-	print (  testdata:sub(1,24) )
-	print (  ('%x - %x'):format(chksum, calc))
-	
-	local isValid = false
-	local validStr = "FAIL"
-	if calc == chksum then
-		isValid = true
-		validStr = "OK"
-	end	
-	local newtestdata = updateChecksum(testdata)
-	local revalidated = "FAIL"
-	if newtestdata == testdata then
-		revalidated = "OK"
-	end	
-	print  ('TESTDATA      :: '..testdata)
-	print  ('DATA          :: '..testdata:sub(1,24))	
-	print (('VALID CHKSUM  :: %s'):format(validStr ))	
-	print (('UPDATE CHKSUM :: %s'):format(revalidated))	
-	
-	local testkey = keygen('0456263a873a80')
-	print ('TEST KEY       :: '..testkey)
-	print ('VALID KEY      :: 29564af75805')
+    local testdata = '000F42430D0A14000001D11F'..'5D738517'
+    local chksum = getChecksum(testdata)
+    local calc = calculateChecksum( utils.ConvertHexToBytes(testdata:sub(1,24)))
+    print (  testdata:sub(1,24) )
+    print (  ('%x - %x'):format(chksum, calc))
+
+    local isValid = false
+    local validStr = "FAIL"
+    if calc == chksum then
+        isValid = true
+        validStr = "OK"
+    end
+    local newtestdata = updateChecksum(testdata)
+    local revalidated = "FAIL"
+    if newtestdata == testdata then
+        revalidated = "OK"
+    end
+    print  ('TESTDATA      :: '..testdata)
+    print  ('DATA          :: '..testdata:sub(1,24))
+    print (('VALID CHKSUM  :: %s'):format(validStr ))
+    print (('UPDATE CHKSUM :: %s'):format(revalidated))
+
+    local testkey = keygen('0456263a873a80')
+    print ('TEST KEY       :: '..testkey)
+    print ('VALID KEY      :: 29564af75805')
 end
 local function setdevicedebug( status )
-	local c = 'hf mf dbg '
-	if status then
-		c = c..'1'
-	else
-		c = c..'0'
-	end 
-	core.console(c) 
+    local c = 'hf mf dbg '
+    if status then
+        c = c..'1'
+    else
+        c = c..'0'
+    end
+    core.console(c)
 end
---- 
+---
 -- The main entry point
 -- -d decrypt
 -- -e encrypt
 -- -v validate
 function main(args)
 
-	local cmd, tag, err, blockNo, mfkey
-	local shall_validate = false
-	local shall_dec = false
-	local shall_enc = false
-	local blocks = {}
-	local aeskey = ''
-	local input = ''
-	
-	-- Read the parameters
-	for o, a in getopt.getopt(args, 'htdevi:') do
-		if o == "h" then help() return end
-		if o == "t" then return selftest() end
-		if o == "d" then shall_dec = true end
-		if o == "e" then shall_enc = true end
-		if o == "v" then shall_validate = true end
-		if o == "i" then input = load_json(a) end
-	end
+    local cmd, tag, err, blockNo, mfkey
+    local shall_validate = false
+    local shall_dec = false
+    local shall_enc = false
+    local blocks = {}
+    local aeskey = ''
+    local input = ''
 
-	-- Turn off Debug
-	setdevicedebug(false)
+    -- Read the parameters
+    for o, a in getopt.getopt(args, 'htdevi:') do
+        if o == "h" then help() return end
+        if o == "t" then return selftest() end
+        if o == "d" then shall_dec = true end
+        if o == "e" then shall_enc = true end
+        if o == "v" then shall_validate = true end
+        if o == "i" then input = load_json(a) end
+    end
 
-	-- GET TAG UID
-	tag, err = lib14a.read(false, true)
-	if not tag then return oops(err) end
-	core.clearCommandBuffer()
-	
-	-- simple tag check
-	if 0x09 ~= tag.sak then
-		if 0x4400 ~= tag.atqa then 
-			return oops(('[fail] found tag %s :: looking for Mifare Mini 0.3k'):format(tag.name)) 
-		end
-			end
-	dbg ('[ok] found '..tag.name)
-	
-	-- tag key
-	mfkey = keygen(tag.uid)
-	dbg('[ok] using mf keyA : '.. mfkey)
-	
-	-- AES key
-	aeskey = create_key(tag.uid)
-	dbg('[ok] using AES key : '.. aeskey)
+    -- Turn off Debug
+    setdevicedebug(false)
 
-	-- read tag data, complete, enc/dec	
-	tagdata = readtag(mfkey, aeskey)
-	dbg('[ok] read card data')
+    -- GET TAG UID
+    tag, err = lib14a.read(false, true)
+    if not tag then return oops(err) end
+    core.clearCommandBuffer()
 
-	-- show information?
-	print_info(tagdata)
+    -- simple tag check
+    if 0x09 ~= tag.sak then
+        if 0x4400 ~= tag.atqa then
+            return oops(('[fail] found tag %s :: looking for Mifare Mini 0.3k'):format(tag.name))
+        end
+            end
+    dbg ('[ok] found '..tag.name)
 
-	-- save 
-	res = save_json(nil, tagdata)
-	if not res then return oops('[fail] saving json file') end
-	
-	dbg('[ok] read card data')
+    -- tag key
+    mfkey = keygen(tag.uid)
+    dbg('[ok] using mf keyA : '.. mfkey)
+
+    -- AES key
+    aeskey = create_key(tag.uid)
+    dbg('[ok] using AES key : '.. aeskey)
+
+    -- read tag data, complete, enc/dec
+    tagdata = readtag(mfkey, aeskey)
+    dbg('[ok] read card data')
+
+    -- show information?
+    print_info(tagdata)
+
+    -- save
+    res = save_json(nil, tagdata)
+    if not res then return oops('[fail] saving json file') end
+
+    dbg('[ok] read card data')
 end
 
 main(args)
diff --git a/client/scripts/dumptoemul-mfu.lua b/client/scripts/dumptoemul-mfu.lua
index bb04008e9..34fbdc1d0 100644
--- a/client/scripts/dumptoemul-mfu.lua
+++ b/client/scripts/dumptoemul-mfu.lua
@@ -13,120 +13,120 @@ This script takes a dumpfile from 'hf mfu dump' and converts it to a format that
 by the emulator
 
 Arguments:
-	-h 				This help
-	-i <file>		Specifies the dump-file (input). If omitted, 'dumpdata.bin' is used	
-	-o <filename>	Specifies the output file. If omitted, <uid>.eml is used. 	
+    -h              This help
+    -i <file>       Specifies the dump-file (input). If omitted, 'dumpdata.bin' is used
+    -o <filename>   Specifies the output file. If omitted, <uid>.eml is used.
 
 ]]
 local DEBUG = false
 
---- 
+---
 -- A debug printout-function
 local function dbg(args)
-	if not DEBUG then return end
-	
-	if type(args) == 'table' then
-		local i = 1
-		while result[i] do
-			dbg(result[i])
-			i = i+1
-		end
-	else
-		print('###', args)
-	end
-end 
---- 
+    if not DEBUG then return end
+
+    if type(args) == 'table' then
+        local i = 1
+        while result[i] do
+            dbg(result[i])
+            i = i+1
+        end
+    else
+        print('###', args)
+    end
+end
+---
 -- This is only meant to be used when errors occur
 local function oops(err)
-	print('ERROR: ',err)
-	return nil,err
+    print('ERROR: ',err)
+    return nil,err
 end
---- 
+---
 -- Usage help
 function help()
-	print(desc)
-	print(author)
-	print("Example usage")
-	print(example)
+    print(desc)
+    print(author)
+    print("Example usage")
+    print(example)
 end
 
 local function convert_to_ascii(hexdata)
-	if string.len(hexdata) % 8 ~= 0 then 
-		return oops(("Bad data, length should be a multiple of 8 (was %d)"):format(string.len(hexdata)))
-	end
+    if string.len(hexdata) % 8 ~= 0 then
+        return oops(("Bad data, length should be a multiple of 8 (was %d)"):format(string.len(hexdata)))
+    end
 
-	local js,i = "[";
-	for i = 1, string.len(hexdata),8 do
-		js = js .."'" ..string.sub(hexdata,i,i+7).."',\n"
-	end
-	js = js .. "]"
-	return js
+    local js,i = "[";
+    for i = 1, string.len(hexdata),8 do
+        js = js .."'" ..string.sub(hexdata,i,i+7).."',\n"
+    end
+    js = js .. "]"
+    return js
 end
 
 local function readdump(infile)
-	 t = infile:read("*all")
-	 len = string.len(t)
-	 local len,hex = bin.unpack(("H%d"):format(len),t)
-	 return hex
+     t = infile:read("*all")
+     len = string.len(t)
+     local len,hex = bin.unpack(("H%d"):format(len),t)
+     return hex
 end
 
 local function convert_to_emulform(hexdata)
-	if string.len(hexdata) % 8 ~= 0 then 
-		return oops(("Bad data, length should be a multiple of 8 (was %d)"):format(string.len(hexdata)))
-	end
-	local ascii,i = "";
-	for i = 1, string.len(hexdata), 8 do
-		ascii = ascii..string.sub(hexdata, i, i+7).."\n"
-	end	
-	return string.sub(ascii, 1, -2)
+    if string.len(hexdata) % 8 ~= 0 then
+        return oops(("Bad data, length should be a multiple of 8 (was %d)"):format(string.len(hexdata)))
+    end
+    local ascii,i = "";
+    for i = 1, string.len(hexdata), 8 do
+        ascii = ascii..string.sub(hexdata, i, i+7).."\n"
+    end
+    return string.sub(ascii, 1, -2)
 end
 
 local function main(args)
 
-	local input = "dumpdata.bin"
-	local output
+    local input = "dumpdata.bin"
+    local output
 
-	for o, a in getopt.getopt(args, 'i:o:h') do
-		if o == "h" then return help() end		
-		if o == "i" then input = a end
-		if o == "o" then output = a end
-	end
-	-- Validate the parameters
-	
-	local infile = io.open(input, "rb")
-	if infile == nil then 
-		return oops("Could not read file ", input)
-	end
-	local dumpdata = readdump(infile)
-	-- The hex-data is now in ascii-format,
+    for o, a in getopt.getopt(args, 'i:o:h') do
+        if o == "h" then return help() end
+        if o == "i" then input = a end
+        if o == "o" then output = a end
+    end
+    -- Validate the parameters
 
-	-- But first, check the uid
-	-- lua uses start index and endindex,  not count.	
-	-- UID is  3three skip bcc0 then 4bytes.
-	-- 1 lua is one-index.
-	-- 1 + 96 (48*2)  new dump format has version/signature/counter data here
-	-- 97,98,99,100,101,102   UID first three bytes 
-	-- 103,104 bcc0
-	-- 105---  UID last four bytes
-	local uid = string.sub(dumpdata, 97, 97+5)..string.sub(dumpdata, 97+8, 97+8+7)
-	output = output or (uid .. ".eml")
+    local infile = io.open(input, "rb")
+    if infile == nil then
+        return oops("Could not read file ", input)
+    end
+    local dumpdata = readdump(infile)
+    -- The hex-data is now in ascii-format,
 
-	-- Format some linebreaks
-	dumpdata = convert_to_emulform(dumpdata)
+    -- But first, check the uid
+    -- lua uses start index and endindex,  not count.
+    -- UID is  3three skip bcc0 then 4bytes.
+    -- 1 lua is one-index.
+    -- 1 + 96 (48*2)  new dump format has version/signature/counter data here
+    -- 97,98,99,100,101,102   UID first three bytes
+    -- 103,104 bcc0
+    -- 105---  UID last four bytes
+    local uid = string.sub(dumpdata, 97, 97+5)..string.sub(dumpdata, 97+8, 97+8+7)
+    output = output or (uid .. ".eml")
 
-	local outfile = io.open(output, "w")
-	if outfile == nil then 
-		return oops("Could not write to file ", output)
-	end
-	
-	outfile:write(dumpdata:lower())
-	io.close(outfile)
-	print(("Wrote an emulator-dump to the file %s"):format(output))
+    -- Format some linebreaks
+    dumpdata = convert_to_emulform(dumpdata)
+
+    local outfile = io.open(output, "w")
+    if outfile == nil then
+        return oops("Could not write to file ", output)
+    end
+
+    outfile:write(dumpdata:lower())
+    io.close(outfile)
+    print(("Wrote an emulator-dump to the file %s"):format(output))
 end
 
 --[[
-In the future, we may implement so that scripts are invoked directly 
+In the future, we may implement so that scripts are invoked directly
 into a 'main' function, instead of being executed blindly. For future
-compatibility, I have done so, but I invoke my main from here.  
+compatibility, I have done so, but I invoke my main from here.
 --]]
 main(args)
diff --git a/client/scripts/dumptoemul.lua b/client/scripts/dumptoemul.lua
index 1e4d6323a..08e5e03dd 100644
--- a/client/scripts/dumptoemul.lua
+++ b/client/scripts/dumptoemul.lua
@@ -11,117 +11,117 @@ This script takes a dumpfile from 'hf mf dump' and converts it to a format that
 by the emulator
 
 Arguments:
-	-h 				This help
-	-i <file>		Specifies the dump-file (input). If omitted, 'dumpdata.bin' is used	
-	-o <filename>	Specifies the output file. If omitted, <uid>.eml is used. 	
+    -h              This help
+    -i <file>       Specifies the dump-file (input). If omitted, 'dumpdata.bin' is used
+    -o <filename>   Specifies the output file. If omitted, <uid>.eml is used.
 
 ]]
 local DEBUG = false
 -------------------------------
--- Some utilities 
+-- Some utilities
 -------------------------------
 
---- 
+---
 -- A debug printout-function
 local function dbg(args)
-	if not DEBUG then return end
-	
-	if type(args) == 'table' then
-		local i = 1
-		while result[i] do
-			dbg(result[i])
-			i = i+1
-		end
-	else
-		print('###', args)
-	end
-end 
---- 
+    if not DEBUG then return end
+
+    if type(args) == 'table' then
+        local i = 1
+        while result[i] do
+            dbg(result[i])
+            i = i+1
+        end
+    else
+        print('###', args)
+    end
+end
+---
 -- This is only meant to be used when errors occur
 local function oops(err)
-	print('ERROR: ',err)
-	return nil,err
+    print('ERROR: ',err)
+    return nil,err
 end
---- 
+---
 -- Usage help
 function help()
-	print(desc)
-	print(author)
-	print("Example usage")
-	print(example)
+    print(desc)
+    print(author)
+    print("Example usage")
+    print(example)
 end
 
 local function convert_to_ascii(hexdata)
-	if string.len(hexdata) % 32 ~= 0 then 
-		return oops(("Bad data, length should be a multiple of 32 (was %d)"):format(string.len(hexdata)))
-	end
+    if string.len(hexdata) % 32 ~= 0 then
+        return oops(("Bad data, length should be a multiple of 32 (was %d)"):format(string.len(hexdata)))
+    end
 
-	local js,i = "[";
-	for i = 1, string.len(hexdata),32 do
-		js = js .."'" ..string.sub(hexdata,i,i+31).."',\n"
-	end
-	js = js .. "]"
-	return js
+    local js,i = "[";
+    for i = 1, string.len(hexdata),32 do
+        js = js .."'" ..string.sub(hexdata,i,i+31).."',\n"
+    end
+    js = js .. "]"
+    return js
 end
 
 local function readdump(infile)
-	 t = infile:read("*all")
-	 len = string.len(t)
-	 local len,hex = bin.unpack(("H%d"):format(len),t)
-	 return hex
+     t = infile:read("*all")
+     len = string.len(t)
+     local len,hex = bin.unpack(("H%d"):format(len),t)
+     return hex
 end
 
 local function convert_to_emulform(hexdata)
-	if string.len(hexdata) % 32 ~= 0 then 
-		return oops(("Bad data, length should be a multiple of 32 (was %d)"):format(string.len(hexdata)))
-	end
-	local ascii,i = "";
-	for i = 1, string.len(hexdata),32 do
-		ascii = ascii..string.sub(hexdata,i,i+31).."\n"
-	end
-	return string.sub(ascii, 1, -2)
+    if string.len(hexdata) % 32 ~= 0 then
+        return oops(("Bad data, length should be a multiple of 32 (was %d)"):format(string.len(hexdata)))
+    end
+    local ascii,i = "";
+    for i = 1, string.len(hexdata),32 do
+        ascii = ascii..string.sub(hexdata,i,i+31).."\n"
+    end
+    return string.sub(ascii, 1, -2)
 end
 
 local function main(args)
 
-	local input = "dumpdata.bin"
-	local output
+    local input = "dumpdata.bin"
+    local output
 
-	for o, a in getopt.getopt(args, 'i:o:h') do
-		if o == "h" then return help() end		
-		if o == "i" then input = a end
-		if o == "o" then output = a end
-	end
-	-- Validate the parameters
-	
-	local infile = io.open(input, "rb")
-	if infile == nil then 
-		return oops("Could not read file ", input)
-	end
-	local dumpdata = readdump(infile)
-	-- The hex-data is now in ascii-format,
+    for o, a in getopt.getopt(args, 'i:o:h') do
+        if o == "h" then return help() end
+        if o == "i" then input = a end
+        if o == "o" then output = a end
+    end
+    -- Validate the parameters
 
-	-- But first, check the uid
-	local uid = string.sub(dumpdata,1,8)
-	output = output or (uid .. ".eml")
+    local infile = io.open(input, "rb")
+    if infile == nil then
+        return oops("Could not read file ", input)
+    end
+    local dumpdata = readdump(infile)
+    -- The hex-data is now in ascii-format,
 
-	-- Format some linebreaks
-	dumpdata = convert_to_emulform(dumpdata)
+    -- But first, check the uid
+    local uid = string.sub(dumpdata,1,8)
+    output = output or (uid .. ".eml")
 
-	local outfile = io.open(output, "w")
-	if outfile == nil then 
-		return oops("Could not write to file ", output)
-	end
-	
-	outfile:write(dumpdata:lower())
-	io.close(outfile)
-	print(("Wrote an emulator-dump to the file %s"):format(output))
+    -- Format some linebreaks
+    dumpdata = convert_to_emulform(dumpdata)
+
+    local outfile = io.open(output, "w")
+    if outfile == nil then
+        return oops("Could not write to file ", output)
+    end
+
+    outfile:write(dumpdata:lower())
+    io.close(outfile)
+    print(("Wrote an emulator-dump to the file %s"):format(output))
 end
 
 
 --[[
-In the future, we may implement so that scripts are invoked directly 
+In the future, we may implement so that scripts are invoked directly
 into a 'main' function, instead of being executed blindly. For future
-compatibility, I have done so, but I invoke my main from here.  
+compatibility, I have done so, but I invoke my main from here.
 --]]
 main(args)
diff --git a/client/scripts/e.lua b/client/scripts/e.lua
index 4e032337e..6b9d80364 100644
--- a/client/scripts/e.lua
+++ b/client/scripts/e.lua
@@ -5,73 +5,73 @@ example = "script calculates many different checksums (CRC) over the provided he
 author = "Iceman"
 desc =
 [[
-This script calculates many checksums (CRC) over the provided hex input. 
+This script calculates many checksums (CRC) over the provided hex input.
 
 Arguments:
-	-b 				data in hex
-	-w				bitwidth of the CRC family of algorithm. <optional> defaults to all known CRC presets.
-Examples : 
-	script run e -b 010203040506070809
-	script run e -b 010203040506070809 -w 16
+    -b              data in hex
+    -w              bitwidth of the CRC family of algorithm. <optional> defaults to all known CRC presets.
+Examples :
+    script run e -b 010203040506070809
+    script run e -b 010203040506070809 -w 16
 ]]
 
---- 
+---
 -- A debug printout-function
 function dbg(args)
-	if DEBUG then
-		print("###", args)
-	end
-end 
---- 
+    if DEBUG then
+        print("###", args)
+    end
+end
+---
 -- This is only meant to be used when errors occur
 function oops(err)
-	print("[!] ERROR: ",err)
-	return nil,err
+    print("[!] ERROR: ",err)
+    return nil,err
 end
---- 
+---
 -- Usage help
 function help()
-	print(desc)
-	print("Example usage")
-	print(example)
+    print(desc)
+    print("Example usage")
+    print(example)
 end
---- 
+---
 -- The main entry point
 function main(args)
 
-	local data
-	local width = 0
+    local data
+    local width = 0
 
-	-- Read the parameters
-	for o, a in getopt.getopt(args, 'hb:w:') do
-		if o == "h" then return help() end
-		if o == "b" then data = a end
-		if o == "w" then width = a end
-	end
+    -- Read the parameters
+    for o, a in getopt.getopt(args, 'hb:w:') do
+        if o == "h" then return help() end
+        if o == "b" then data = a end
+        if o == "w" then width = a end
+    end
 
-	data = data or '01020304'	
-	width = width or 0
-	
-	print( string.rep('-',60) )
-	print('Bit width of CRC | '..width)
-	print('Bytes            | '..data)
-	print('')
-	print( ('%-20s| %-16s| %s'):format('Model','CRC', 'CRC reverse','bigEnd', 'bigEnd','little','little'))
-	print( string.rep('-',60) )
-	local lists, err = core.reveng_models(width)	
-	if lists == nil then return oops(err) end
-	
-	for _,i in pairs(lists) do
-		if string.len(i) > 1 then
-			local a1 = core.reveng_runmodel(i, data, false, '0')
-			local a2 = core.reveng_runmodel(i, data, true, '0')
-			local a3 = core.reveng_runmodel(i, data, false, 'b')
-			local a4 = core.reveng_runmodel(i, data, false, 'B')
-			local a5 = core.reveng_runmodel(i, data, false, 'l')
-			local a6 = core.reveng_runmodel(i, data, false, 'L')		
-			print( ('%-20s| %-16s| %-16s| %-16s| %-16s| %-16s| %-16s'):format(i, a1:upper(), a2:upper(),a3:upper(),a4:upper(),a5:upper(),a6:upper() ) )
-		end
-	end
+    data = data or '01020304'
+    width = width or 0
+
+    print( string.rep('-',60) )
+    print('Bit width of CRC | '..width)
+    print('Bytes            | '..data)
+    print('')
+    print( ('%-20s| %-16s| %s'):format('Model','CRC', 'CRC reverse','bigEnd', 'bigEnd','little','little'))
+    print( string.rep('-',60) )
+    local lists, err = core.reveng_models(width)
+    if lists == nil then return oops(err) end
+
+    for _,i in pairs(lists) do
+        if string.len(i) > 1 then
+            local a1 = core.reveng_runmodel(i, data, false, '0')
+            local a2 = core.reveng_runmodel(i, data, true, '0')
+            local a3 = core.reveng_runmodel(i, data, false, 'b')
+            local a4 = core.reveng_runmodel(i, data, false, 'B')
+            local a5 = core.reveng_runmodel(i, data, false, 'l')
+            local a6 = core.reveng_runmodel(i, data, false, 'L')
+            print( ('%-20s| %-16s| %-16s| %-16s| %-16s| %-16s| %-16s'):format(i, a1:upper(), a2:upper(),a3:upper(),a4:upper(),a5:upper(),a6:upper() ) )
+        end
+    end
 end
 
 main(args)
\ No newline at end of file
diff --git a/client/scripts/emul2dump.lua b/client/scripts/emul2dump.lua
index 315ad99ab..04b9da12b 100644
--- a/client/scripts/emul2dump.lua
+++ b/client/scripts/emul2dump.lua
@@ -1,60 +1,60 @@
-local getopt = require('getopt')
-local bin = require('bin')
-local dumplib = require('html_dumplib')
-
-example =[[
-	1. script run emul2dump
-	2. script run emul2dump -i myfile.eml
-	3. script run emul2dump -i myfile.eml -o myfile.bin
-]]
-author = "Iceman"
-usage = "script run emul2dump [-i <file>] [-o <file>]"
-desc =[[
-This script takes an dumpfile on EML (ASCII) format and converts it to the PM3 dumpbin file to be used with "hf mf restore"
-
-Arguments:
-	-h              This help
-	-i <filename>	Specifies the dump-file (input). If omitted, 'dumpdata.eml' is used	
-	-o <filename>	Specifies the output file. If omitted, <currdate>.bin is used. 	
-]]
-
---- 
--- This is only meant to be used when errors occur
-function oops(err)
-	print("ERROR: ",err)
-end
---- 
--- Usage help
-function help()
-	print(desc)
-	print("Example usage")
-	print(example)
-end
---
--- Exit message
-function ExitMsg(msg)
-	print( string.rep('--',20) )
-	print( string.rep('--',20) )
-	print(msg)
-	print()
-end
-
-local function main(args)
-	
-	local input = "dumpdata.eml"
-	local output  = os.date("%Y-%m-%d_%H%M%S.bin");
-	
-	-- Arguments for the script
-	for o, a in getopt.getopt(args, 'hi:o:') do
-		if o == "h" then return help() end		
-		if o == "i" then input = a	end
-		if o == "o" then output = a end
-	end
-
-	local filename, err = dumplib.convert_eml_to_bin(input,output)
-	if err then return oops(err) end
-
-	ExitMsg(("Wrote a BIN dump to the file %s"):format(filename))
-end
-
+local getopt = require('getopt')
+local bin = require('bin')
+local dumplib = require('html_dumplib')
+
+example =[[
+    1. script run emul2dump
+    2. script run emul2dump -i myfile.eml
+    3. script run emul2dump -i myfile.eml -o myfile.bin
+]]
+author = "Iceman"
+usage = "script run emul2dump [-i <file>] [-o <file>]"
+desc =[[
+This script takes an dumpfile on EML (ASCII) format and converts it to the PM3 dumpbin file to be used with "hf mf restore"
+
+Arguments:
+    -h              This help
+    -i <filename>   Specifies the dump-file (input). If omitted, 'dumpdata.eml' is used
+    -o <filename>   Specifies the output file. If omitted, <currdate>.bin is used.
+]]
+
+---
+-- This is only meant to be used when errors occur
+function oops(err)
+    print("ERROR: ",err)
+end
+---
+-- Usage help
+function help()
+    print(desc)
+    print("Example usage")
+    print(example)
+end
+--
+-- Exit message
+function ExitMsg(msg)
+    print( string.rep('--',20) )
+    print( string.rep('--',20) )
+    print(msg)
+    print()
+end
+
+local function main(args)
+
+    local input = "dumpdata.eml"
+    local output  = os.date("%Y-%m-%d_%H%M%S.bin");
+
+    -- Arguments for the script
+    for o, a in getopt.getopt(args, 'hi:o:') do
+        if o == "h" then return help() end
+        if o == "i" then input = a end
+        if o == "o" then output = a end
+    end
+
+    local filename, err = dumplib.convert_eml_to_bin(input,output)
+    if err then return oops(err) end
+
+    ExitMsg(("Wrote a BIN dump to the file %s"):format(filename))
+end
+
 main(args)
\ No newline at end of file
diff --git a/client/scripts/emul2html.lua b/client/scripts/emul2html.lua
index 52d4dacb0..db76ec9c0 100644
--- a/client/scripts/emul2html.lua
+++ b/client/scripts/emul2html.lua
@@ -8,60 +8,60 @@ example = "script run emul2html -o dumpdata.eml "
 author = "Martin Holst Swende"
 usage = "script run htmldump [-i <file>] [-o <file>]"
 desc =[[
-This script takes a dumpfile on EML (ASCII) format and produces a html based dump, which is a 
-bit more easily analyzed. 
+This script takes a dumpfile on EML (ASCII) format and produces a html based dump, which is a
+bit more easily analyzed.
 
 Arguments:
-	-h 				This help
-	-i <file>		Specifies the dump-file (input). If omitted, 'dumpdata.eml' is used	
-	-o <filename>	Speciies the output file. If omitted, <curdate>.html is used. 	
+    -h              This help
+    -i <file>       Specifies the dump-file (input). If omitted, 'dumpdata.eml' is used
+    -o <filename>   Speciies the output file. If omitted, <curdate>.html is used.
 
 ]]
 
 -------------------------------
--- Some utilities 
+-- Some utilities
 -------------------------------
 
---- 
+---
 -- A debug printout-function
 function dbg(args)
-	if DEBUG then
-		print("###", args)
-	end
-end 
---- 
+    if DEBUG then
+        print("###", args)
+    end
+end
+---
 -- This is only meant to be used when errors occur
 function oops(err)
-	print("ERROR: ",err)
+    print("ERROR: ",err)
 end
 
 
---- 
+---
 -- Usage help
 function help()
-	print(desc)
-	print("Example usage")
-	print(example)
+    print(desc)
+    print("Example usage")
+    print(example)
 end
 
 local function main(args)
 
-	local input = "dumpdata.eml"
-	local output = os.date("%Y-%m-%d_%H%M%S.html");
-	for o, a in getopt.getopt(args, 'i:o:h') do
-		if o == "h" then return help() end		
-		if o == "i" then input = a end
-		if o == "o" then output = a end
-	end
-	local filename, err = dumplib.convert_eml_to_html(input,output)
-	if err then return oops(err) end
+    local input = "dumpdata.eml"
+    local output = os.date("%Y-%m-%d_%H%M%S.html");
+    for o, a in getopt.getopt(args, 'i:o:h') do
+        if o == "h" then return help() end
+        if o == "i" then input = a end
+        if o == "o" then output = a end
+    end
+    local filename, err = dumplib.convert_eml_to_html(input,output)
+    if err then return oops(err) end
 
-	print(("Wrote a HTML dump to the file %s"):format(filename))
+    print(("Wrote a HTML dump to the file %s"):format(filename))
 end
 
 --[[
-In the future, we may implement so that scripts are invoked directly 
+In the future, we may implement so that scripts are invoked directly
 into a 'main' function, instead of being executed blindly. For future
-compatibility, I have done so, but I invoke my main from here.  
+compatibility, I have done so, but I invoke my main from here.
 --]]
 main(args)
\ No newline at end of file
diff --git a/client/scripts/formatMifare.lua b/client/scripts/formatMifare.lua
index 35475db84..90801b2a2 100644
--- a/client/scripts/formatMifare.lua
+++ b/client/scripts/formatMifare.lua
@@ -1,216 +1,216 @@
-local cmds = require('commands')
-local getopt = require('getopt')
-local bin = require('bin')
-local lib14a = require('read14a')
-local utils = require('utils')
-
-example = [[
-    -- generate commands
-	1. script run formatMifare
-	
-	-- generate command, replacing key with new key.
-	2. script run formatMifare -k aabbccddeeff -n 112233445566 -a FF0780
-	
-	-- generate commands and excute them against card.
-	3. script run formatMifare -x
-]]
-copyright = ''
-version = ''
-author = 'Iceman'
-usage = [[
-   script run formatMifare -k <key> -n <key> -a <access> -x   
-]]
-desc = [[
-This script will generate 'hf mf wrbl' commands for each block to format a Mifare card.
-
-Alla datablocks gets 0x00
-As default the script sets the keys A/B to 0xFFFFFFFFFFFF
-and the access bytes will become 0x78,0x77,0x88
-The GDB will become 0x00
-
-The script will skip the manufactoring block 0.
-
-
-Arguments:
-	-h             - this help
-	-k <key>       - the current six byte key with write access
-	-n <key>       - the new key that will be written to the card
-	-a <access>    - the new access bytes that will be written to the card
-	-x             - execute the commands aswell.
-]]
-local TIMEOUT = 2000 -- Shouldn't take longer than 2 seconds
-local DEBUG = true -- the debug flag
-local CmdString = 'hf mf wrbl %d B %s %s'
-local numBlocks = 64
-local numSectors = 16
---- 
--- A debug printout-function
-function dbg(args)
-	if not DEBUG then
-		return
-	end
-	
-    if type(args) == "table" then
-		local i = 1
-		while result[i] do
-			dbg(result[i])
-			i = i+1
-		end
-	else
-		print("###", args)
-	end	
-end	
---- 
--- This is only meant to be used when errors occur
-function oops(err)
-	print("ERROR: ",err)
-end
---- 
--- Usage help
-function help()
-	print(copyright)
-	print(author)
-	print(version)	
-	print(desc)
-	print("Example usage")
-	print(example)
-end
---
--- Exit message
-function ExitMsg(msg)
-	print( string.rep('--',20) )
-	print( string.rep('--',20) )
-	print(msg)
-	print()
-end
---
--- Read information from a card
-function GetCardInfo()
-	result, err = lib14a.read(false, true)
-	if not result then
-		print(err)
-		return
-	end
-	print(("Found:  %s"):format(result.name))
-
-	core.clearCommandBuffer()
-	
-	if 0x18 == result.sak then -- NXP MIFARE Classic 4k | Plus 4k
-		-- IFARE Classic 4K offers 4096 bytes split into forty sectors, 
-		-- of which 32 are same size as in the 1K with eight more that are quadruple size sectors. 
-		numSectors = 40
-	elseif 0x08 == result.sak then  -- NXP MIFARE CLASSIC 1k | Plus 2k
-		-- 1K offers 1024 bytes of data storage, split into 16 sector
-		numSectors = 16
-	elseif 0x09 == result.sak then  -- NXP MIFARE Mini 0.3k
-		-- MIFARE Classic mini offers 320 bytes split into five sectors.
-		numSectors = 5
-	elseif  0x10 == result.sak then -- NXP MIFARE Plus 2k
-		numSectors = 32
-	elseif  0x01 == result.sak then -- NXP MIFARE TNP3xxx 1K
-		numSectors = 16
-	else
-		print("I don't know how many sectors there are on this type of card, defaulting to 16")
-	end	
-	--[[
-	 The mifare Classic 1k card has 16 sectors of 4 data blocks each. 
-	 The first 32 sectors of a mifare Classic 4k card consists of 4 data blocks and the remaining
-	 8 sectors consist of 16 data blocks. 
-	--]]
-	
-	-- Defaults to 16 * 4 = 64  - 1 = 63
-    numBlocks = numSectors * 4 - 1  
-		
-	if numSectors > 32 then
-		numBlocks = 32*4+ (numSectors-32)*16 -1
-	end
-	
-end
-
-local function main(args)
-
-	print( string.rep('--',20) )
-	print( string.rep('--',20) )
-	print()
-	
-	local OldKey, NewKey, Accessbytes
-	local x = false
-	
-	-- Arguments for the script
-	for o, a in getopt.getopt(args, 'hk:n:a:x') do
-		if o == "h" then return help() end		
-		if o == "k" then OldKey = a end
-		if o == "n" then NewKey = a	end
-		if o == "a" then Accessbytes = a end
-		if o == "x" then x = true end
-	end
-
-	-- validate input args.
-	OldKey =  OldKey or 'FFFFFFFFFFFF'
-	if #(OldKey) ~= 12 then
-		return oops( string.format('Wrong length of write key (was %d) expected 12', #OldKey))
-	end
-	
-	NewKey =  NewKey or 'FFFFFFFFFFFF'
-	if #(NewKey) ~= 12 then
-		return oops( string.format('Wrong length of new key (was %d) expected 12', #NewKey))
-	end
-
-	--Accessbytes =  Accessbytes or '787788'
-	Accessbytes =  Accessbytes or 'FF0780'
-	if #(Accessbytes) ~= 6 then
-		return oops( string.format('Wrong length of accessbytes (was %d) expected 12', #Accessbytes))
-	end
-
-	GetCardInfo()
-	
-	-- Show info
-	print( string.format('Estimating number of blocks: %d', numBlocks))
-	print( string.format('Old key:    %s', OldKey))
-	print( string.format('New key:    %s', NewKey))
-	print( string.format('New Access: %s', Accessbytes))
-	print( string.rep('--',20) )
-
-		-- Set new block data
-	local EMPTY_BL = string.rep('00',16)
-	local EMPTY_SECTORTRAIL = string.format('%s%s%s%s',NewKey,Accessbytes,'00',NewKey)
-	
-	dbg( string.format('New sector-trailer : %s',EMPTY_SECTORTRAIL))
-	dbg( string.format('New emptyblock: %s',EMPTY_BL))
-	dbg('')
-	
-	if x then 
-		print('[Warning] you have used the EXECUTE parameter, which means this will run these commands against card.')
-	end 
-	-- Ask
-	local dialogResult = utils.confirm("Do you want to erase this card")
-	if dialogResult == false then 
-		return ExitMsg('Quiting it is then. Your wish is my command...')
-	end	
-
-	print( string.rep('--',20) )
-	
-	-- main loop
-	for block=0,numBlocks,1 do
-
-		local reminder = (block+1) % 4
-		local cmd
-		if reminder == 0 then
-			cmd = CmdString:format(block, OldKey , EMPTY_SECTORTRAIL)
-		else
-			cmd = CmdString:format(block, OldKey , EMPTY_BL)		
-		end	
-	
-		if block ~= 0 then
-			print(cmd)
-			if x then core.console(cmd) end
-		end
-		
-		if core.ukbhit() then
-			print("aborted by user")
-			break
-		end
-	end
-end
-
+local cmds = require('commands')
+local getopt = require('getopt')
+local bin = require('bin')
+local lib14a = require('read14a')
+local utils = require('utils')
+
+example = [[
+    -- generate commands
+    1. script run formatMifare
+
+    -- generate command, replacing key with new key.
+    2. script run formatMifare -k aabbccddeeff -n 112233445566 -a FF0780
+
+    -- generate commands and excute them against card.
+    3. script run formatMifare -x
+]]
+copyright = ''
+version = ''
+author = 'Iceman'
+usage = [[
+   script run formatMifare -k <key> -n <key> -a <access> -x
+]]
+desc = [[
+This script will generate 'hf mf wrbl' commands for each block to format a Mifare card.
+
+Alla datablocks gets 0x00
+As default the script sets the keys A/B to 0xFFFFFFFFFFFF
+and the access bytes will become 0x78,0x77,0x88
+The GDB will become 0x00
+
+The script will skip the manufactoring block 0.
+
+
+Arguments:
+    -h             - this help
+    -k <key>       - the current six byte key with write access
+    -n <key>       - the new key that will be written to the card
+    -a <access>    - the new access bytes that will be written to the card
+    -x             - execute the commands aswell.
+]]
+local TIMEOUT = 2000 -- Shouldn't take longer than 2 seconds
+local DEBUG = true -- the debug flag
+local CmdString = 'hf mf wrbl %d B %s %s'
+local numBlocks = 64
+local numSectors = 16
+---
+-- A debug printout-function
+function dbg(args)
+    if not DEBUG then
+        return
+    end
+
+    if type(args) == "table" then
+        local i = 1
+        while result[i] do
+            dbg(result[i])
+            i = i+1
+        end
+    else
+        print("###", args)
+    end
+end
+---
+-- This is only meant to be used when errors occur
+function oops(err)
+    print("ERROR: ",err)
+end
+---
+-- Usage help
+function help()
+    print(copyright)
+    print(author)
+    print(version)
+    print(desc)
+    print("Example usage")
+    print(example)
+end
+--
+-- Exit message
+function ExitMsg(msg)
+    print( string.rep('--',20) )
+    print( string.rep('--',20) )
+    print(msg)
+    print()
+end
+--
+-- Read information from a card
+function GetCardInfo()
+    result, err = lib14a.read(false, true)
+    if not result then
+        print(err)
+        return
+    end
+    print(("Found:  %s"):format(result.name))
+
+    core.clearCommandBuffer()
+
+    if 0x18 == result.sak then -- NXP MIFARE Classic 4k | Plus 4k
+        -- IFARE Classic 4K offers 4096 bytes split into forty sectors,
+        -- of which 32 are same size as in the 1K with eight more that are quadruple size sectors.
+        numSectors = 40
+    elseif 0x08 == result.sak then  -- NXP MIFARE CLASSIC 1k | Plus 2k
+        -- 1K offers 1024 bytes of data storage, split into 16 sector
+        numSectors = 16
+    elseif 0x09 == result.sak then  -- NXP MIFARE Mini 0.3k
+        -- MIFARE Classic mini offers 320 bytes split into five sectors.
+        numSectors = 5
+    elseif  0x10 == result.sak then -- NXP MIFARE Plus 2k
+        numSectors = 32
+    elseif  0x01 == result.sak then -- NXP MIFARE TNP3xxx 1K
+        numSectors = 16
+    else
+        print("I don't know how many sectors there are on this type of card, defaulting to 16")
+    end
+    --[[
+     The mifare Classic 1k card has 16 sectors of 4 data blocks each.
+     The first 32 sectors of a mifare Classic 4k card consists of 4 data blocks and the remaining
+     8 sectors consist of 16 data blocks.
+    --]]
+
+    -- Defaults to 16 * 4 = 64  - 1 = 63
+    numBlocks = numSectors * 4 - 1
+
+    if numSectors > 32 then
+        numBlocks = 32*4+ (numSectors-32)*16 -1
+    end
+
+end
+
+local function main(args)
+
+    print( string.rep('--',20) )
+    print( string.rep('--',20) )
+    print()
+
+    local OldKey, NewKey, Accessbytes
+    local x = false
+
+    -- Arguments for the script
+    for o, a in getopt.getopt(args, 'hk:n:a:x') do
+        if o == "h" then return help() end
+        if o == "k" then OldKey = a end
+        if o == "n" then NewKey = a end
+        if o == "a" then Accessbytes = a end
+        if o == "x" then x = true end
+    end
+
+    -- validate input args.
+    OldKey =  OldKey or 'FFFFFFFFFFFF'
+    if #(OldKey) ~= 12 then
+        return oops( string.format('Wrong length of write key (was %d) expected 12', #OldKey))
+    end
+
+    NewKey =  NewKey or 'FFFFFFFFFFFF'
+    if #(NewKey) ~= 12 then
+        return oops( string.format('Wrong length of new key (was %d) expected 12', #NewKey))
+    end
+
+    --Accessbytes =  Accessbytes or '787788'
+    Accessbytes =  Accessbytes or 'FF0780'
+    if #(Accessbytes) ~= 6 then
+        return oops( string.format('Wrong length of accessbytes (was %d) expected 12', #Accessbytes))
+    end
+
+    GetCardInfo()
+
+    -- Show info
+    print( string.format('Estimating number of blocks: %d', numBlocks))
+    print( string.format('Old key:    %s', OldKey))
+    print( string.format('New key:    %s', NewKey))
+    print( string.format('New Access: %s', Accessbytes))
+    print( string.rep('--',20) )
+
+        -- Set new block data
+    local EMPTY_BL = string.rep('00',16)
+    local EMPTY_SECTORTRAIL = string.format('%s%s%s%s',NewKey,Accessbytes,'00',NewKey)
+
+    dbg( string.format('New sector-trailer : %s',EMPTY_SECTORTRAIL))
+    dbg( string.format('New emptyblock: %s',EMPTY_BL))
+    dbg('')
+
+    if x then
+        print('[Warning] you have used the EXECUTE parameter, which means this will run these commands against card.')
+    end
+    -- Ask
+    local dialogResult = utils.confirm("Do you want to erase this card")
+    if dialogResult == false then
+        return ExitMsg('Quiting it is then. Your wish is my command...')
+    end
+
+    print( string.rep('--',20) )
+
+    -- main loop
+    for block=0,numBlocks,1 do
+
+        local reminder = (block+1) % 4
+        local cmd
+        if reminder == 0 then
+            cmd = CmdString:format(block, OldKey , EMPTY_SECTORTRAIL)
+        else
+            cmd = CmdString:format(block, OldKey , EMPTY_BL)
+        end
+
+        if block ~= 0 then
+            print(cmd)
+            if x then core.console(cmd) end
+        end
+
+        if core.ukbhit() then
+            print("aborted by user")
+            break
+        end
+    end
+end
+
 main(args)
\ No newline at end of file
diff --git a/client/scripts/hf_read.lua b/client/scripts/hf_read.lua
index 82655a364..7653e6e75 100644
--- a/client/scripts/hf_read.lua
+++ b/client/scripts/hf_read.lua
@@ -1,18 +1,18 @@
 local reader = require('hf_reader')
 
 local function main(args)
-	print("WORK IN PROGRESS - not expected to be functional yet")
-	info, err = reader.waitForTag()
+    print("WORK IN PROGRESS - not expected to be functional yet")
+    info, err = reader.waitForTag()
 
-	if err then 
-		print(err)
-		return
-	end
-	local k,v
-	print("Tag info")
-	for k,v in pairs(info) do
-		print(string.format("	%s : %s", tostring(k), tostring(v)))
-	end
-	return
+    if err then
+        print(err)
+        return
+    end
+    local k,v
+    print("Tag info")
+    for k,v in pairs(info) do
+        print(string.format("    %s : %s", tostring(k), tostring(v)))
+    end
+    return
 end
 main(args)
\ No newline at end of file
diff --git a/client/scripts/htmldump.lua b/client/scripts/htmldump.lua
index 0299e13c5..40f3028b4 100644
--- a/client/scripts/htmldump.lua
+++ b/client/scripts/htmldump.lua
@@ -8,58 +8,58 @@ example = "script run htmldump -o mifarecard_foo.html"
 author = "Martin Holst Swende"
 usage = "script run htmldump [-i <file>] [-o <file>]"
 desc =[[
-This script takes a dumpfile and produces a html based dump, which is a 
-bit more easily analyzed. 
+This script takes a dumpfile and produces a html based dump, which is a
+bit more easily analyzed.
 
 Arguments:
-	-h 				This help
-	-i <file>		Specifies the dump-file (input). If omitted, 'dumpdata.bin' is used	
-	-o <filename>	Speciies the output file. If omitted, <curtime>.html is used. 	
+    -h              This help
+    -i <file>       Specifies the dump-file (input). If omitted, 'dumpdata.bin' is used
+    -o <filename>   Speciies the output file. If omitted, <curtime>.html is used.
 
 ]]
 
 -------------------------------
--- Some utilities 
+-- Some utilities
 -------------------------------
 
---- 
+---
 -- A debug printout-function
 function dbg(args)
-	if DEBUG then
-		print("###", args)
-	end
-end 
---- 
+    if DEBUG then
+        print("###", args)
+    end
+end
+---
 -- This is only meant to be used when errors occur
 function oops(err)
-	print("ERROR: ",err)
+    print("ERROR: ",err)
 end
---- 
+---
 -- Usage help
 function help()
-	print(desc)
-	print("Example usage")
-	print(example)
+    print(desc)
+    print("Example usage")
+    print(example)
 end
 
 local function main(args)
 
-	local input = "dumpdata.bin"
-	local output = os.date("%Y-%m-%d_%H%M%S.html");
-	for o, a in getopt.getopt(args, 'i:o:h') do
-		if o == "h" then return help() end		
-		if o == "i" then input = a end
-		if o == "o" then output = a end
-	end
-	local filename, err = dumplib.convert_bin_to_html(input,output,16)
-	if err then return oops(err) end
+    local input = "dumpdata.bin"
+    local output = os.date("%Y-%m-%d_%H%M%S.html");
+    for o, a in getopt.getopt(args, 'i:o:h') do
+        if o == "h" then return help() end
+        if o == "i" then input = a end
+        if o == "o" then output = a end
+    end
+    local filename, err = dumplib.convert_bin_to_html(input,output,16)
+    if err then return oops(err) end
 
-	print(("Wrote a HTML dump to the file %s"):format(filename))
+    print(("Wrote a HTML dump to the file %s"):format(filename))
 end
 
 --[[
-In the future, we may implement so that scripts are invoked directly 
+In the future, we may implement so that scripts are invoked directly
 into a 'main' function, instead of being executed blindly. For future
-compatibility, I have done so, but I invoke my main from here.  
+compatibility, I have done so, but I invoke my main from here.
 --]]
 main(args)
\ No newline at end of file
diff --git a/client/scripts/iso15_magic.lua b/client/scripts/iso15_magic.lua
index 3923f2b1e..939c7a943 100644
--- a/client/scripts/iso15_magic.lua
+++ b/client/scripts/iso15_magic.lua
@@ -7,112 +7,112 @@ copyright = 'Copyright (c) 2018 IceSQL AB. All rights reserved.'
 author = 'Christian Herrmann'
 version = 'v1.0.4'
 desc = [[
-This script tries to set UID on a IS15693 SLIX magic card 
+This script tries to set UID on a IS15693 SLIX magic card
 Remember the UID  ->MUST<- start with 0xE0
  ]]
 example = [[
 
-	 -- ISO15693 slix magic tag
+     -- ISO15693 slix magic tag
 
-	 script run iso15_magic -u E004013344556677
-	 
-	 script run iso15_magic -u E004013344556677 -a
+     script run iso15_magic -u E004013344556677
+
+     script run iso15_magic -u E004013344556677 -a
 ]]
 usage = [[
 script run iso15_magic -h -u <uid>
 
 Arguments:
-	-h             : this help
-	-u <UID>       : UID (16 hexsymbols)
-	-a             : use offical pm3 repo ISO15 commands instead of iceman fork.
+    -h             : this help
+    -u <UID>       : UID (16 hexsymbols)
+    -a             : use offical pm3 repo ISO15 commands instead of iceman fork.
 ]]
 
 local DEBUG = true
---- 
+---
 -- A debug printout-function
 local function dbg(args)
     if not DEBUG then return end
     if type(args) == "table" then
-		local i = 1
-		while args[i] do
-			dbg(args[i])
-			i = i+1
-		end
-	else
-		print("###", args)
-	end	
-end	
---- 
+        local i = 1
+        while args[i] do
+            dbg(args[i])
+            i = i+1
+        end
+    else
+        print("###", args)
+    end
+end
+---
 -- This is only meant to be used when errors occur
 local function oops(err)
-	print("ERROR: ",err)
-	return nil, err
+    print("ERROR: ",err)
+    return nil, err
 end
---- 
+---
 -- Usage help
 local function help()
-	print(copyright)
-	print(author)	
-	print(version)	
-	print(desc)
-	print('Example usage')
-	print(example)
+    print(copyright)
+    print(author)
+    print(version)
+    print(desc)
+    print('Example usage')
+    print(example)
 end
 --
 --- Set UID on magic command enabled on a ICEMAN based REPO
 local function magicUID_iceman(b0, b1)
-	print('Using backdoor Magic tag function')
- 	core.console("hf 15 raw -2 -c 02213E00000000")
-	core.console("hf 15 raw -2 -c 02213F69960000")		
-	core.console("hf 15 raw -2 -c 022138"..b1)
-	core.console("hf 15 raw -2 -c 022139"..b0)
+    print('Using backdoor Magic tag function')
+    core.console("hf 15 raw -2 -c 02213E00000000")
+    core.console("hf 15 raw -2 -c 02213F69960000")
+    core.console("hf 15 raw -2 -c 022138"..b1)
+    core.console("hf 15 raw -2 -c 022139"..b0)
 end
 --
 --- Set UID on magic command enabled,  OFFICAL REPO
 local function magicUID_offical(b0, b1)
-	print('Using backdoor Magic tag function OFFICAL REPO')
- 	core.console("hf 15 cmd raw -c 02213E00000000")
-	core.console("hf 15 cmd raw -c 02213F69960000")		
-	core.console("hf 15 cmd raw -c 022138"..b1)
-	core.console("hf 15 cmd raw -c 022139"..b0)
+    print('Using backdoor Magic tag function OFFICAL REPO')
+    core.console("hf 15 cmd raw -c 02213E00000000")
+    core.console("hf 15 cmd raw -c 02213F69960000")
+    core.console("hf 15 cmd raw -c 022138"..b1)
+    core.console("hf 15 cmd raw -c 022139"..b0)
 end
---- 
+---
 -- The main entry point
 function main(args)
 
-	print( string.rep('--',20) )
-	print( string.rep('--',20) )	
-	print()
+    print( string.rep('--',20) )
+    print( string.rep('--',20) )
+    print()
 
-	local uid = 'E004013344556677'
-	local use_iceman = true
-	
-	-- Read the parameters
-	for o, a in getopt.getopt(args, 'hu:a') do
-		if o == "h" then return help() end
-		if o == "u" then uid = a end
-		if o == "a" then use_iceman = false end
-	end	
-	
-	-- uid string checks
-	if uid == nil then return oops('empty uid string') end
-	if #uid == 0 then return oops('empty uid string') end
-	if #uid ~= 16 then return oops('uid wrong length. Should be 8 hex bytes') end
+    local uid = 'E004013344556677'
+    local use_iceman = true
 
-	local bytes = utils.ConvertHexToBytes(uid)
-	
-	local block0 = string.format('%02X%02X%02X%02X', bytes[4], bytes[3], bytes[2], bytes[1])
-	local block1 = string.format('%02X%02X%02X%02X', bytes[8], bytes[7], bytes[6], bytes[5])
-	
-	print('new UID | '..uid)
-	
-	core.clearCommandBuffer()
-	
-	if use_iceman then
-		magicUID_iceman(block0, block1)
-	else
-		magicUID_offical(block0, block1)
-	end
+    -- Read the parameters
+    for o, a in getopt.getopt(args, 'hu:a') do
+        if o == "h" then return help() end
+        if o == "u" then uid = a end
+        if o == "a" then use_iceman = false end
+    end
+
+    -- uid string checks
+    if uid == nil then return oops('empty uid string') end
+    if #uid == 0 then return oops('empty uid string') end
+    if #uid ~= 16 then return oops('uid wrong length. Should be 8 hex bytes') end
+
+    local bytes = utils.ConvertHexToBytes(uid)
+
+    local block0 = string.format('%02X%02X%02X%02X', bytes[4], bytes[3], bytes[2], bytes[1])
+    local block1 = string.format('%02X%02X%02X%02X', bytes[8], bytes[7], bytes[6], bytes[5])
+
+    print('new UID | '..uid)
+
+    core.clearCommandBuffer()
+
+    if use_iceman then
+        magicUID_iceman(block0, block1)
+    else
+        magicUID_offical(block0, block1)
+    end
 end
 
 main(args)
diff --git a/client/scripts/legic.lua b/client/scripts/legic.lua
index 264d4dfef..97fd64f11 100644
--- a/client/scripts/legic.lua
+++ b/client/scripts/legic.lua
@@ -3,7 +3,7 @@ if it don't works with you tag-layout - be so kind and let me know ;-)
 
 Tested on Tags with those Layouts:
 
-(example)	Legic-Prime Layout with 'Kaba Group Header'
+(example)   Legic-Prime Layout with 'Kaba Group Header'
       +----+----+----+----+----+----+----+----+
   0x00|MCD |MSN0|MSN1|MSN2|MCC | 60 | ea | 9f |
       +----+----+----+----+----+----+----+----+
@@ -31,7 +31,7 @@ UID   = dec User-ID for online-Mapping
 kghC  = crc8 over MCD + MSN0..MSN2 + UID
 
 
-(example)	Legic-Cash on MIM256/1024 tag' (37 bytes)
+(example)   Legic-Cash on MIM256/1024 tag' (37 bytes)
       +----+----+----+----+----+----+----+----+
   0x00|Seg0|Seg1|Seg2|Seg3|SegC|STP0|STP1|STP2|
       +----+----+----+----+----+----+----+----+
@@ -56,7 +56,7 @@ LRS = ID of the reader that changed the shadow balance (?? should be always the
 CV  = Counter value for transactions
 CHK = crc16 over SHD + LRS + CV
 
-(example)	Legic-Prime Layout 'gantner unsegmented user-credential'
+(example)   Legic-Prime Layout 'gantner unsegmented user-credential'
       +----+----+----+----+----+----+----+----+
   0x00|MCD |MSN0|MSN1|MSN2|MCC | 60 | ea | 08 |
       +----+----+----+----+----+----+----+----+
@@ -73,7 +73,7 @@ Dat   = Online-Mapping Data
 uCRC  = crc8 over addr 0x00..0x03+0x07..0x0E
 
 
-(example)	Legic-Prime Layout 'gantner unsegmented Master-Token (IAM) with a stamp_len of 4'
+(example)   Legic-Prime Layout 'gantner unsegmented Master-Token (IAM) with a stamp_len of 4'
       +----+----+----+----+----+----+----+----+
   0x00|MCD |MSN0|MSN1|MSN2|MCC | 20 | f8 | 08 |
       +----+----+----+----+----+----+----+----+
@@ -224,16 +224,16 @@ local currency = {
 ---
 -- This is only meant to be used when errors occur
 function oops(err)
-	print(acred.."ERROR: "..acoff ,err)
-	return nil, err
+    print(acred.."ERROR: "..acoff ,err)
+    return nil, err
 end
 
 ---
 -- Usage help
 function help()
-	print(desc)
-	print("Version: "..version)
-	print("Example usage: "..example)
+    print(desc)
+    print("Version: "..version)
+    print("Example usage: "..example)
 end
 
 ---
@@ -265,28 +265,28 @@ end
 ---
 -- xor single byte
 function xorme(hex, xor, index)
-	if ( index >= 23 ) then
-		return ('%02x'):format(bxor( tonumber(hex,16) , tonumber(xor,16) ))
-	else
-		return hex
-	end
+    if ( index >= 23 ) then
+        return ('%02x'):format(bxor( tonumber(hex,16) , tonumber(xor,16) ))
+    else
+        return hex
+    end
 end
 
 ---
 -- (de)obfuscate bytes
 function xorBytes(inBytes, crc)
-	local bytes = {}
-	for index = 1, #inBytes do
-		bytes[index] = xorme(inBytes[index], crc, index)
-	end
-	if (#inBytes == #bytes) then
-		-- replace crc
-		bytes[5] = string.sub(crc,-2)
-		return bytes
-	else
-		print("error: byte-count missmatch")
-		return false
-	end
+    local bytes = {}
+    for index = 1, #inBytes do
+        bytes[index] = xorme(inBytes[index], crc, index)
+    end
+    if (#inBytes == #bytes) then
+        -- replace crc
+        bytes[5] = string.sub(crc,-2)
+        return bytes
+    else
+        print("error: byte-count missmatch")
+        return false
+    end
 end
 
 ---
@@ -317,9 +317,9 @@ end
 ---
 -- put a string into a bytes-table
 function str2bytes(s)
-	if (string.len(s)%2 ~= 0) then
-		return print("stamp should be a even hexstring e.g.: deadbeef or 0badc0de")
-	end
+    if (string.len(s)%2 ~= 0) then
+        return print("stamp should be a even hexstring e.g.: deadbeef or 0badc0de")
+    end
   local res={}
   for i=1, string.len(s), 2 do
     table.insert(res, string.sub(s,i,(i+1)))
@@ -330,29 +330,29 @@ end
 ---
 -- put certain bytes into a new table
 function bytesToTable(bytes, bstart, bend)
-	local t={}
-	for i=0, (bend-bstart) do
-		t[i]=bytes[bstart+i]
-	end
-	return t
+    local t={}
+    for i=0, (bend-bstart) do
+        t[i]=bytes[bstart+i]
+    end
+    return t
 end
 
 ---
 -- read file into table
 function getInputBytes(infile)
-	local line
-	local bytes = {}
-	local fhi,err = io.open(infile,"rb")
-	if err then oops("faild to read from file ".. infile); return false; end
+    local line
+    local bytes = {}
+    local fhi,err = io.open(infile,"rb")
+    if err then oops("faild to read from file ".. infile); return false; end
 
-	file_data = fhi:read("*a");
-	for i = 1, #file_data do
-		bytes[i] = string.format("%x",file_data:byte(i))
-	end
-	fhi:close()
-	if (bytes[7]=='00') then return false end
-	print(#bytes .. " bytes from "..infile.." loaded")
-	return bytes
+    file_data = fhi:read("*a");
+    for i = 1, #file_data do
+        bytes[i] = string.format("%x",file_data:byte(i))
+    end
+    fhi:close()
+    if (bytes[7]=='00') then return false end
+    print(#bytes .. " bytes from "..infile.." loaded")
+    return bytes
 end
 
 ---
@@ -385,7 +385,7 @@ end
 ---
 -- put bytes into tag-table
 function bytesToTag(bytes, tag)
-	if istable(tag) == false then return oops("tag is no table in: bytesToTag ("..type(tag)..")") end
+    if istable(tag) == false then return oops("tag is no table in: bytesToTag ("..type(tag)..")") end
 
     tag.MCD =bytes[1];
     tag.MSN0=bytes[2];
@@ -453,7 +453,7 @@ end
 ---
 -- read Tag-Table in bytes-table
 function tagToBytes(tag)
-	if istable(tag) == false then return oops("tag is no table in tagToBytes ("..type(tag)..")") end
+    if istable(tag) == false then return oops("tag is no table in tagToBytes ("..type(tag)..")") end
 
     local bytes = {}
     local i, i2
@@ -524,249 +524,249 @@ end
 ---
 -- write virtual Tag to real Tag
 function writeToTag(tag)
-	local bytes
-	local filename = 'MylegicClone.hex'
-	local taglen = 22
-	if(utils.confirm(acred.."\nplace the (empty) Tag onto the PM3\nand confirm writing to this Tag: "..acoff) == false) then
-		return
-	end
-	
-	-- get used bytes / tag-len
-	if (istable(tag.SEG)) then
-		if (istable(tag.Bck)) then
-			for i=0, #tag.SEG do
-				taglen = taglen + tag.SEG[i] . len + 5
-			end
-		end
-		local uid_old = tag.MCD..tag.MSN0..tag.MSN1..tag.MSN2
-		
-		-- read new tag into memory so we can xor the new data with the new MCC
-		outTAG = readFromPM3()
-		outbytes = tagToBytes(outTAG)
-		-- copy 'inputbuffer' to 'outputbuffer'
-		tag.MCD  = outbytes[1]
-		tag.MSN0 = outbytes[2]
-		tag.MSN1 = outbytes[3]
-		tag.MSN2 = outbytes[4]
-		tag.MCC  = outbytes[5]
-		-- recheck all segments-crc/kghcrc (only on a credential)
-		if (istable(tag.Bck)) then
-			checkAllSegCrc(tag)
-			checkAllKghCrc(tag)
-			local uid_new = tag.MCD..tag.MSN0..tag.MSN1..tag.MSN2
-			for i=0, #tag.SEG do
-				if (check43rdPartyCash1(uid_old, tag.SEG[i].data)) then
-					io.write(accyan.."\nfixing known checksums"..acoff.." ... ")
-					if (fix3rdPartyCash1(uid_new, tag.SEG[i].data)) then
-						io.write(acgreen.." done\n"..acoff)
-					else 	
-						oops("\nsomething went wrong at the repair of the 3rd-party-cash-segment") 
-					end
-				end
-			end
-		end
-		bytes = tagToBytes(tag)
-		-- master-token-crc
-		if (tag.Type ~= "SAM") then 
-			bytes[22] = calcMtCrc(bytes) 
-		end
-		if (bytes) then
-			print("write temp-file '"..filename.."'")
-			print(accyan)
-			writeFile(bytes, filename..".bin")
-			print(acoff)
-		end
-	end
+    local bytes
+    local filename = 'MylegicClone.hex'
+    local taglen = 22
+    if(utils.confirm(acred.."\nplace the (empty) Tag onto the PM3\nand confirm writing to this Tag: "..acoff) == false) then
+        return
+    end
 
-	-- write data to file
-	if (taglen > 0) then
-		WriteBytes = utils.input(acyellow.."enter number of bytes to write?"..acoff, taglen)
-		-- load file into pm3-buffer
-		if (type(filename) ~= "string") then 
-			filename = input(acyellow.."filename to load to pm3-buffer?"..acoff, "legic.temp")
-		end
-		
-		cmd = 'hf legic eload 2 '..filename
-		core.console(cmd)
-		-- write pm3-buffer to Tag
-		for i=0, WriteBytes do
-			if (i > 6) then
-				cmd = ("hf legic write o %x d %s "):format(i, padString(bytes[i]))
-				print(acgreen..cmd..acoff)
-				core.console(cmd)
-				core.clearCommandBuffer()
-			elseif (i == 6) then
-				-- write DCF in reverse order (requires 'mosci-patch')
-				cmd = ('hf legic write o 05 d %s%s'):format(padString(bytes[i-1]), padString(bytes[i]))
-				print(acgreen..cmd..acoff)
-				core.console(cmd)
-				core.clearCommandBuffer()
-			elseif (i == 5) then
-				print(acgreen.."skip byte 0x05 - will be written next step"..acoff)
-			else
-				print(acgreen.."skip byte 0x00-0x04 - unwritable area"..acoff)
-			end
-			utils.Sleep(0.2)
-		end
-	end
+    -- get used bytes / tag-len
+    if (istable(tag.SEG)) then
+        if (istable(tag.Bck)) then
+            for i=0, #tag.SEG do
+                taglen = taglen + tag.SEG[i] . len + 5
+            end
+        end
+        local uid_old = tag.MCD..tag.MSN0..tag.MSN1..tag.MSN2
+
+        -- read new tag into memory so we can xor the new data with the new MCC
+        outTAG = readFromPM3()
+        outbytes = tagToBytes(outTAG)
+        -- copy 'inputbuffer' to 'outputbuffer'
+        tag.MCD  = outbytes[1]
+        tag.MSN0 = outbytes[2]
+        tag.MSN1 = outbytes[3]
+        tag.MSN2 = outbytes[4]
+        tag.MCC  = outbytes[5]
+        -- recheck all segments-crc/kghcrc (only on a credential)
+        if (istable(tag.Bck)) then
+            checkAllSegCrc(tag)
+            checkAllKghCrc(tag)
+            local uid_new = tag.MCD..tag.MSN0..tag.MSN1..tag.MSN2
+            for i=0, #tag.SEG do
+                if (check43rdPartyCash1(uid_old, tag.SEG[i].data)) then
+                    io.write(accyan.."\nfixing known checksums"..acoff.." ... ")
+                    if (fix3rdPartyCash1(uid_new, tag.SEG[i].data)) then
+                        io.write(acgreen.." done\n"..acoff)
+                    else
+                        oops("\nsomething went wrong at the repair of the 3rd-party-cash-segment")
+                    end
+                end
+            end
+        end
+        bytes = tagToBytes(tag)
+        -- master-token-crc
+        if (tag.Type ~= "SAM") then
+            bytes[22] = calcMtCrc(bytes)
+        end
+        if (bytes) then
+            print("write temp-file '"..filename.."'")
+            print(accyan)
+            writeFile(bytes, filename..".bin")
+            print(acoff)
+        end
+    end
+
+    -- write data to file
+    if (taglen > 0) then
+        WriteBytes = utils.input(acyellow.."enter number of bytes to write?"..acoff, taglen)
+        -- load file into pm3-buffer
+        if (type(filename) ~= "string") then
+            filename = input(acyellow.."filename to load to pm3-buffer?"..acoff, "legic.temp")
+        end
+
+        cmd = 'hf legic eload 2 '..filename
+        core.console(cmd)
+        -- write pm3-buffer to Tag
+        for i=0, WriteBytes do
+            if (i > 6) then
+                cmd = ("hf legic write o %x d %s "):format(i, padString(bytes[i]))
+                print(acgreen..cmd..acoff)
+                core.console(cmd)
+                core.clearCommandBuffer()
+            elseif (i == 6) then
+                -- write DCF in reverse order (requires 'mosci-patch')
+                cmd = ('hf legic write o 05 d %s%s'):format(padString(bytes[i-1]), padString(bytes[i]))
+                print(acgreen..cmd..acoff)
+                core.console(cmd)
+                core.clearCommandBuffer()
+            elseif (i == 5) then
+                print(acgreen.."skip byte 0x05 - will be written next step"..acoff)
+            else
+                print(acgreen.."skip byte 0x00-0x04 - unwritable area"..acoff)
+            end
+            utils.Sleep(0.2)
+        end
+    end
 end
 
 --- File I/O ---
 ---
 -- read file into virtual-tag
 local function readFile(filename)
-	print(accyan)
-	local bytes = {}
-	local tag = {}
-	if  file_check(filename) == false then 
-		return oops("input file: "..filename.." not found")
-	end
+    print(accyan)
+    local bytes = {}
+    local tag = {}
+    if  file_check(filename) == false then
+        return oops("input file: "..filename.." not found")
+    end
 
-	bytes = getInputBytes(filename)
+    bytes = getInputBytes(filename)
 
-	if bytes == false then return oops('couldnt get input bytes') end
+    if bytes == false then return oops('couldnt get input bytes') end
 
-	-- make plain bytes
-	bytes = xorBytes(bytes,bytes[5])
-	print("create virtual tag from ".. #bytes .. " bytes")
-	-- create Tag for plain bytes
-	tag = createTagTable()
-	-- load plain bytes to tag-table
-	print(acoff)
-	tag = bytesToTag(bytes, tag)
+    -- make plain bytes
+    bytes = xorBytes(bytes,bytes[5])
+    print("create virtual tag from ".. #bytes .. " bytes")
+    -- create Tag for plain bytes
+    tag = createTagTable()
+    -- load plain bytes to tag-table
+    print(acoff)
+    tag = bytesToTag(bytes, tag)
 
-	return tag
+    return tag
 end
 
 ---
 -- write bytes to file
 function writeFile(bytes, filename)
-	if (filename ~= 'MylegicClone.hex') then
-		if (file_check(filename)) then
-			local answer = confirm("\nthe output-file "..filename.." already exists!\nthis will delete the previous content!\ncontinue?")
-			if not answer then return print("user abort") end
-		end
-	end
-	local line
-	local bcnt = 0
-	local fho, err = io.open(filename, "w")
-	if err then 
-		return oops("OOps ... failed to open output-file ".. filename)
-	end
-	bytes = xorBytes(bytes, bytes[5])
-	for i = 1, #bytes do
-		if (bcnt == 0) then
-			line = bytes[i]
-		elseif (bcnt <= 7) then
-			line = line.." "..bytes[i]
-		end
-		if (bcnt == 7) then
-			-- write line to new file
-			fho:write(line.."\n")
-			-- reset counter & line
-			bcnt = -1
-			line = ""
-		end
-		bcnt = bcnt + 1
-	end
-	fho:close()
-	print("\nwrote ".. #bytes .." bytes to " .. filename)
-	return true
+    if (filename ~= 'MylegicClone.hex') then
+        if (file_check(filename)) then
+            local answer = confirm("\nthe output-file "..filename.." already exists!\nthis will delete the previous content!\ncontinue?")
+            if not answer then return print("user abort") end
+        end
+    end
+    local line
+    local bcnt = 0
+    local fho, err = io.open(filename, "w")
+    if err then
+        return oops("OOps ... failed to open output-file ".. filename)
+    end
+    bytes = xorBytes(bytes, bytes[5])
+    for i = 1, #bytes do
+        if (bcnt == 0) then
+            line = bytes[i]
+        elseif (bcnt <= 7) then
+            line = line.." "..bytes[i]
+        end
+        if (bcnt == 7) then
+            -- write line to new file
+            fho:write(line.."\n")
+            -- reset counter & line
+            bcnt = -1
+            line = ""
+        end
+        bcnt = bcnt + 1
+    end
+    fho:close()
+    print("\nwrote ".. #bytes .." bytes to " .. filename)
+    return true
 end
 
 --- Map related ---
 ---
 -- make tagMap
 local function makeTagMap()
-	local tagMap = {}
-	if (#tagMap == 0) then
-		tagMap['name'] = input(accyan.."enter Name for this Map: "..acoff , "newTagMap")
-		tagMap['mappings'] = {}
-		tagMap['crc8'] = {}
-		-- insert fixed Tag-CRC
-		table.insert(tagMap.crc8, {name = 'TAG-CRC', pos = 5, seq = {1, 4}})
-		tagMap['crc16'] = {}
-	end
-	print(accyan.."new tagMap created"..acoff)
-	return tagMap
+    local tagMap = {}
+    if (#tagMap == 0) then
+        tagMap['name'] = input(accyan.."enter Name for this Map: "..acoff , "newTagMap")
+        tagMap['mappings'] = {}
+        tagMap['crc8'] = {}
+        -- insert fixed Tag-CRC
+        table.insert(tagMap.crc8, {name = 'TAG-CRC', pos = 5, seq = {1, 4}})
+        tagMap['crc16'] = {}
+    end
+    print(accyan.."new tagMap created"..acoff)
+    return tagMap
 end
 
 ---
 -- save mapping to file
 local function saveTagMap(map, filename)
-	if (string.len(filename)>0) then
-		if (file_check(filename)) then
-			local answer = confirm("\nthe output-file "..filename.." alredy exists!\nthis will delete the previous content!\ncontinue?")
-			if not answer then return print("user abort") end
-		end
-	end
+    if (string.len(filename)>0) then
+        if (file_check(filename)) then
+            local answer = confirm("\nthe output-file "..filename.." alredy exists!\nthis will delete the previous content!\ncontinue?")
+            if not answer then return print("user abort") end
+        end
+    end
 
-	local line
-	local fho,err = io.open(filename, "w")
-	if err then oops("OOps ... faild to open output-file ".. filename) end
+    local line
+    local fho,err = io.open(filename, "w")
+    if err then oops("OOps ... faild to open output-file ".. filename) end
 
-	-- write line to new file
-	for k, v in pairs(map) do
-		if (istable(v)) then
-			for k2, v2 in pairs(v) do
-				if (k == 'mappings') then
-					fho:write(k..","..k2..","..v2['name']..","..v2['start']..","..v2['end']..","..((v2['highlight']) and "1" or "0").."\n")
-				elseif (k == "crc8") then
-					local tmp = ""
-					tmp = k..","..k2..","..v2['name']..","..v2['pos']..","
-					tmp=tmp..tbl2seqstr(v2['seq'])
-					fho:write(tmp.."\n")
-				end
-			end
-		else
-			fho:write(k..","..v.."\n")
-		end
-	end
-	fho:close()
-	return true
+    -- write line to new file
+    for k, v in pairs(map) do
+        if (istable(v)) then
+            for k2, v2 in pairs(v) do
+                if (k == 'mappings') then
+                    fho:write(k..","..k2..","..v2['name']..","..v2['start']..","..v2['end']..","..((v2['highlight']) and "1" or "0").."\n")
+                elseif (k == "crc8") then
+                    local tmp = ""
+                    tmp = k..","..k2..","..v2['name']..","..v2['pos']..","
+                    tmp=tmp..tbl2seqstr(v2['seq'])
+                    fho:write(tmp.."\n")
+                end
+            end
+        else
+            fho:write(k..","..v.."\n")
+        end
+    end
+    fho:close()
+    return true
 end
 
 ---
 -- toggle higligh
 local function toggleHighlight(tbl)
-	if (tbl['highlight']) then
-		tbl['highlight'] = false
-	else
-		tbl['highlight'] = true
-	end
-	return tbl
+    if (tbl['highlight']) then
+        tbl['highlight'] = false
+    else
+        tbl['highlight'] = true
+    end
+    return tbl
 end
 
 ---
 -- return table od seqence-string
 local function seqstr2tbl(seqstr)
-	local s = split(seqstr)
-	local res = {}
-	if (#s >= 1) then
-		for sk, sv in pairs(s) do
-			s2 = split(sv, '-')
-			if(#s2 == 2) then
-				table.insert(res, s2[1])
-				table.insert(res, s2[2])
-			end
-		end
-	end
-	return res
+    local s = split(seqstr)
+    local res = {}
+    if (#s >= 1) then
+        for sk, sv in pairs(s) do
+            s2 = split(sv, '-')
+            if(#s2 == 2) then
+                table.insert(res, s2[1])
+                table.insert(res, s2[2])
+            end
+        end
+    end
+    return res
 end
 
 ---
 -- return sequence-string from table
 local function tbl2seqstr(seqtbl)
-	local res = ""
-	if (istable(seqtbl)) then
-		for sk, sv in pairs(seqtbl) do
-			res = res..sv..((sk%2==0) and "," or "-")
-		end
-		if (string.sub(res, string.len(res))== ",") then
-			res = string.sub(res, 1, string.len(res)-1)
-		end
-	end
-	return res
+    local res = ""
+    if (istable(seqtbl)) then
+        for sk, sv in pairs(seqtbl) do
+            res = res..sv..((sk%2==0) and "," or "-")
+        end
+        if (string.sub(res, string.len(res))== ",") then
+            res = string.sub(res, 1, string.len(res)-1)
+        end
+    end
+    return res
 end
 
 ---
@@ -778,18 +778,18 @@ function loadTagMap(filename)
   local line, fields
   local temp={}
   local offset=0
-	if (file_check(filename)==false) then
-		return oops("input file: "..filename.." not found")
-	else
-		local fhi,err = io.open(filename)
-  	while true do
-  		line = fhi:read()
-  		if line == nil then
+    if (file_check(filename)==false) then
+        return oops("input file: "..filename.." not found")
+    else
+        local fhi,err = io.open(filename)
+    while true do
+        line = fhi:read()
+        if line == nil then
         break
       else
         fields=split(line)
       end
-  		if (#fields==2) then
+        if (#fields==2) then
         if (fields[1]=='offset') then
           offset=tonumber(fields[2],10)
         end
@@ -823,9 +823,9 @@ function loadTagMap(filename)
         end
         table.insert(map.crc8, temp)
       end
-  	end
-  	fhi:close()
-	end
+    end
+    fhi:close()
+  end
   return map
 end
 
@@ -1127,10 +1127,10 @@ function mapAllSegments(tag, tagMap)
   segs=getSegmentStats(bytes)
   if (istable(segs)) then
     for k, v in pairs(segs) do
-  	  -- wrp (write proteted) = byte 2
-  	  WRP = tonumber(bytes[v['start']+2],16)
-  	  -- wrc (write control) - bit 4-6 of byte 3
-  	  WRC = tonumber(bbit("0x"..bytes[v['start']+3],4,3),16)
+      -- wrp (write proteted) = byte 2
+      WRP = tonumber(bytes[v['start']+2],16)
+      -- wrc (write control) - bit 4-6 of byte 3
+      WRC = tonumber(bbit("0x"..bytes[v['start']+3],4,3),16)
       --tagMap=mapTokenData(tagMap, 'Segment '..("%02d"):format(v['index']).." HDR", v['start'], v['start']+3)
       tagMap=mapTokenData(tagMap, 'Segment '..("%02d"):format(v['index']).." CRC", v['start']+4, v['start']+4, true)
       table.insert(tagMap.crc8, {name = 'Segment '..("%02d"):format(v['index']).." CRC", pos=v['start']+4, seq={1,4,v['start'],v['start']+3}} )
@@ -1327,11 +1327,11 @@ function dumpTable(tab, header, tstart, tend)
   for i=tstart, tend do
     res=res..tab[i].." "
   end
-	if (#header == 0) then
-		return res
-	else
-		return (header.." #"..(tend-tstart+1).."\n"..res)
-	end
+    if (#header == 0) then
+        return res
+    else
+        return (header.." #"..(tend-tstart+1).."\n"..res)
+    end
 end
 
 ---
@@ -1377,7 +1377,7 @@ end
 -- dump Legic-Cash data
 function dumpLegicCash(tag, x)
 
-	if istable(tag.SEG[x]) == false then return end
+    if istable(tag.SEG[x]) == false then return end
 
      io.write("in Segment "..tag.SEG[x].index.." :\n")
      print("--------------------------------\n\tLegic-Cash Values\n--------------------------------")
@@ -1403,7 +1403,7 @@ function dumpLegicCash(tag, x)
 --  raw 3rd-party
 function print3rdPartyCash1(tag, x)
 
-	if istable(tag.SEG[x]) == false then return end
+    if istable(tag.SEG[x]) == false then return end
 
     local uid=tag.MCD..tag.MSN0..tag.MSN1..tag.MSN2
      print("\n\t\tStamp  :  "..dumpTable(tag.SEG[x].data, "", 0 , 2))
@@ -1608,25 +1608,25 @@ function getSegmentData(bytes, start, index)
   if (bytes[start]) then
     local i
     -- #index
-	  segment.index = index
-	  -- flag = high nibble of byte 1
-	  segment.flag = string.sub(bytes[start+1],0,1)
-	  -- valid = bit 6 of byte 1
-	  segment.valid = bbit("0x"..bytes[start+1],6,1)
-	  -- last = bit 7 of byte 1
-	  segment.last = bbit("0x"..bytes[start+1],7,1)
-	  -- len = (byte 0)+(bit0-3 of byte 1)
+      segment.index = index
+      -- flag = high nibble of byte 1
+      segment.flag = string.sub(bytes[start+1],0,1)
+      -- valid = bit 6 of byte 1
+      segment.valid = bbit("0x"..bytes[start+1],6,1)
+      -- last = bit 7 of byte 1
+      segment.last = bbit("0x"..bytes[start+1],7,1)
+      -- len = (byte 0)+(bit0-3 of byte 1)
     segment.len = tonumber(bbit("0x"..bytes[start+1],0,4)..bytes[start],16)
     -- raw segment header
     segment.raw = {bytes[start], bytes[start+1], bytes[start+2], bytes[start+3]}
-	  -- wrp (write proteted) = byte 2
-	  segment.WRP = tonumber(bytes[start+2],16)
-	  -- wrc (write control) - bit 4-6 of byte 3
-	  segment.WRC = tonumber(bbit("0x"..bytes[start+3],4,3),16)
-	  -- rd (read disabled) - bit 7 of byte 3
-	  segment.RD = tonumber(bbit("0x"..bytes[start+3],7,1),16)
-	  -- crc byte 4
-	  segment.crc = bytes[start+4]
+      -- wrp (write proteted) = byte 2
+      segment.WRP = tonumber(bytes[start+2],16)
+      -- wrc (write control) - bit 4-6 of byte 3
+      segment.WRC = tonumber(bbit("0x"..bytes[start+3],4,3),16)
+      -- rd (read disabled) - bit 7 of byte 3
+      segment.RD = tonumber(bbit("0x"..bytes[start+3],7,1),16)
+      -- crc byte 4
+      segment.crc = bytes[start+4]
     -- segment-data starts at segment.len - segment.header - segment.crc
     for i=0, (segment.len-5) do
       segment.data[i]=bytes[start+5+i]
@@ -1645,11 +1645,11 @@ function getSegmentStats(bytes)
   x=0
   repeat
     local s={}
-	  -- valid = bit 6 of byte 1
-	  sValid = bbit("0x"..bytes[sStart+1],6,1)
-	  -- last = bit 7 of byte 1
-	  sLast = bbit("0x"..bytes[sStart+1],7,1)
-	  -- len = (byte 0)+(bit0-3 of byte 1)
+      -- valid = bit 6 of byte 1
+      sValid = bbit("0x"..bytes[sStart+1],6,1)
+      -- last = bit 7 of byte 1
+      sLast = bbit("0x"..bytes[sStart+1],7,1)
+      -- len = (byte 0)+(bit0-3 of byte 1)
     sLen = tonumber(bbit("0x"..bytes[sStart+1],0,4)..bytes[sStart],16)
     --print("index: "..("%02d"):format(x).." Len: "..sLen.." start:"..sStart.." end: "..(sStart+sLen-1))
     s['index']=x
@@ -1721,18 +1721,18 @@ end
 ---
 -- edit Segment Data
 function editSegmentData(data)
-	io.write("\n")
-	if istable(data) == false then print("no Segment-Data found") end
+    io.write("\n")
+    if istable(data) == false then print("no Segment-Data found") end
 
-	local lc = check4LegicCash(data)
+    local lc = check4LegicCash(data)
 
     for i=0, #data-1 do
-		data[i]=input(accyan.."Data"..i..acoff..": ", data[i])
+        data[i]=input(accyan.."Data"..i..acoff..": ", data[i])
     end
-	if (lc) then
-		data = fixLegicCash(data)
-	end
-	return data
+    if (lc) then
+        data = fixLegicCash(data)
+    end
+    return data
 end
 
 ---
@@ -2302,10 +2302,10 @@ function modifyMode()
     ["lf"] = function(x)
 
               if (type(x)=='string' and file_check(x)) then
-				filename = x
+                filename = x
               else
-				filename = input("enter filename: ", "legic.temp")
-			  end
+                filename = input("enter filename: ", "legic.temp")
+              end
               inTAG=readFile(filename)
               -- check for existing tagMap
               if (file_check(filename..".map")) then
@@ -2408,10 +2408,10 @@ function modifyMode()
     -- dump single segment
     ["ds"] = function(x)
                 if (type(x)=="string" and string.len(x)>0) then
-					sel = tonumber(x,10)
+                    sel = tonumber(x,10)
                 else
-					sel = selectSegment(inTAG)
-				end
+                    sel = selectSegment(inTAG)
+                end
                 if (sel) then print("\n"..(dumpSegment(inTAG, sel) or acred.."no Segments available") ..acoff.."\n") end
               end,
     ---
@@ -2423,9 +2423,9 @@ function modifyMode()
                 if(istable(inTAG.SEG[0])) then
                   inTAG=editSegment(inTAG, sel)
                   inTAG.SEG[sel]=regenSegmentHeader(inTAG.SEG[sel])
-				else
-					print(acyellow.."no Segments in Tag"..acoff)
-				end
+                else
+                    print(acyellow.."no Segments in Tag"..acoff)
+                end
               end
             end,
     ---
@@ -2481,15 +2481,15 @@ function modifyMode()
     ["tk"] = function(x)
                if (istable(inTAG) and istable(inTAG.SEG[0])) then
                 if (type(x)=="string" and string.len(x)>0) then
-					sel = tonumber(x,10)
-				else
-					sel = selectSegment(inTAG)
-				end
-                if(inTAG.SEG[sel].kgh) then
-					inTAG.SEG[sel].kgh = false
+                    sel = tonumber(x,10)
                 else
-					inTAG.SEG[sel].kgh = true
-				end
+                    sel = selectSegment(inTAG)
+                end
+                if(inTAG.SEG[sel].kgh) then
+                    inTAG.SEG[sel].kgh = false
+                else
+                    inTAG.SEG[sel].kgh = true
+                end
                end
               end,
     ---
@@ -2508,10 +2508,10 @@ function modifyMode()
     ["xc"] = function(x)
                if (istable(inTAG) and istable(inTAG.SEG[0])) then
                  if (type(x)=="string" and string.len(x)>0) then
-					sel = tonumber(x,10)
+                    sel = tonumber(x,10)
                  else
-					sel = selectSegment(inTAG)
-				 end
+                    sel = selectSegment(inTAG)
+                 end
                  print("k "..kghCrcCredentials(inTAG, sel))
                end
               end,
@@ -2519,10 +2519,10 @@ function modifyMode()
     -- fix legic-cash checksums
     ["flc"] = function(x)
                 if (type(x)=="string" and string.len(x)>0) then
-					x = tonumber(x,10)
+                    x = tonumber(x,10)
                 else
-					x = selectSegment(inTAG)
-				end
+                    x = selectSegment(inTAG)
+                end
                 inTAG.SEG[x].data=fixLegicCash(inTAG.SEG[x].data)
               end,
     ---
@@ -2540,8 +2540,8 @@ function modifyMode()
                   print(string.format("User-Selected Index %02d", x))
                 else
                 -- or try to find match
-					x = autoSelectSegment(inTAG, "legiccash")
-				end
+                    x = autoSelectSegment(inTAG, "legiccash")
+                end
                 -- dump it
                 dumpLegicCash(inTAG, x)
               end,
@@ -2555,8 +2555,8 @@ function modifyMode()
                   print(string.format("User-Selected Index %02d", x))
                 else
                 -- or try to find match
-					x = autoSelectSegment(inTAG, "3rdparty")
-				end
+                    x = autoSelectSegment(inTAG, "3rdparty")
+                end
                 if (istable(inTAG) and istable(inTAG.SEG[x]) and inTAG.SEG[x].len == 100) then
                   uid=inTAG.MCD..inTAG.MSN0..inTAG.MSN1..inTAG.MSN2
                   if (check43rdPartyCash1(uid, inTAG.SEG[x].data)) then
@@ -2574,8 +2574,8 @@ function modifyMode()
                   print(string.format("User-Selected Index %02d", x))
                 else
                 -- or try to find match
-					x = autoSelectSegment(inTAG, "3rdparty")
-				end
+                    x = autoSelectSegment(inTAG, "3rdparty")
+                end
                 print3rdPartyCash1(inTAG, x)
               end,
     ---
@@ -2589,8 +2589,8 @@ function modifyMode()
 
                 else
                 -- or try to find match
-					x = autoSelectSegment(inTAG, "3rdparty")
-				end
+                    x = autoSelectSegment(inTAG, "3rdparty")
+                end
                 if (istable(inTAG) and istable(inTAG.SEG[x]) and inTAG.SEG[x].len == 100) then
                   inTAG=edit3rdPartyCash1(inTAG, x)
                     dump3rdPartyCash1(inTAG, x)
@@ -2600,10 +2600,10 @@ function modifyMode()
     -- force fixing 3rd-party-checksums
     ["f3p"] = function(x)
                if(type(x)=="string" and string.len(x)>=2) then
-					x = tonumber(x, 10)
-				else
-					x = selectSegment(inTAG)
-				end
+                    x = tonumber(x, 10)
+                else
+                    x = selectSegment(inTAG)
+                end
                if (istable(inTAG.SEG[x])) then
                   local uid=inTAG.MCD..inTAG.MSN0..inTAG.MSN1..inTAG.MSN2
                   inTAG.SEG[x].data=fix3rdPartyCash1(uid, inTAG.SEG[x].data)
@@ -2613,10 +2613,10 @@ function modifyMode()
     -- get stamp from single segment
     ["gs"] = function(x)
                 if(type(x)=="string" and string.len(x)>=2) then
-					x = tonumber(x, 10)
+                    x = tonumber(x, 10)
                 else
-					x = selectSegment(inTAG)
-				end
+                    x = selectSegment(inTAG)
+                end
                 local stamp=getSegmentStamp(inTAG.SEG[x])
                 print("Stamp : "..stamp)
                 stamp=str2bytes(stamp)
@@ -2663,8 +2663,8 @@ function modifyMode()
     elseif (type(actions[string.lower(string.sub(ic,0,1))])=='function') then
       actions[string.lower(string.sub(ic,0,1))](string.sub(ic,3))
     else
-	  actions.h('')
-	end
+      actions.h('')
+    end
   until (string.sub(ic,0,1)=="q")
 end
 
@@ -2673,40 +2673,40 @@ end
 function main(args)
   -- set init colors/switch (can be toggled with 'tac' => 'toggle ansicolors')
   load_colors(colored_output)
-	if (#args == 0 ) then modifyMode() end
+    if (#args == 0 ) then modifyMode() end
   --- variables
   local inTAG, backupTAG, outTAG, outfile, interactive, crc, ofs, cfs, dfs
-	-- just a spacer for better readability
+    -- just a spacer for better readability
   print()
   --- parse arguments
-	for o, a in getopt.getopt(args, 'hrmi:do:c:') do
+    for o, a in getopt.getopt(args, 'hrmi:do:c:') do
     -- display help
     if o == "h" then return help(); end
     -- read tag from PM3
     if o == "r" then inTAG=readFromPM3() end
     -- input file
-		if o == "i" then inTAG=readFile(a) end
+        if o == "i" then inTAG=readFile(a) end
     -- dump virtual-Tag
     if o == "d" then dfs=true end
     -- interacive modifying
     if o == "m" then
-		interactive = true
-		modifyMode()
-	end
+        interactive = true
+        modifyMode()
+    end
     -- xor (e.g. for clone or plain file)
     if o == "c" then
-		cfs = true
-		crc = a
-	end
+        cfs = true
+        crc = a
+    end
     -- output file
-	if o == "o" then
-		outfile = a
-		ofs = true
-	end
+    if o == "o" then
+        outfile = a
+        ofs = true
+    end
   end
 
   -- file conversion (output to file)
-	if ofs == false then return end
+    if ofs == false then return end
 
     -- dump infile / tag-read
     if (dfs) then
diff --git a/client/scripts/legic_buffer2card.lua b/client/scripts/legic_buffer2card.lua
index 845e8e8e5..68440b8ac 100644
--- a/client/scripts/legic_buffer2card.lua
+++ b/client/scripts/legic_buffer2card.lua
@@ -4,51 +4,51 @@ author = "Mosci"
 desc =
 [[
 This is a script which writes value 0x01 to bytes from position 0x07 until 0xFF on a Legic Prime Tag (MIM256 or MIM1024)
-(created with 'hf legic save my_dump.hex') 
-	
-optional arguments :
-	-h       - Help text
+(created with 'hf legic save my_dump.hex')
 
-Examples : 
-	script run legic_buffer2card
+optional arguments :
+    -h       - Help text
+
+Examples :
+    script run legic_buffer2card
 ]]
 
 local utils = require('utils')
 local getopt = require('getopt')
---- 
+---
 -- This is only meant to be used when errors occur
 function oops(err)
-	print("ERROR: ",err)
-	return nil, err
+    print("ERROR: ",err)
+    return nil, err
    end
---- 
+---
 -- Usage help
 function help()
-	print(desc)
-	print("Example usage")
-	print(example)
+    print(desc)
+    print("Example usage")
+    print(example)
 end
 --
 -- simple loop-write from 0x07 to 0xff
 function main()
 
-	-- parse arguments for the script
-	for o, a in getopt.getopt(args, 'h') do
-		if o == "h" then return help() end
-	end
+    -- parse arguments for the script
+    for o, a in getopt.getopt(args, 'h') do
+        if o == "h" then return help() end
+    end
 
-	local cmd = ''
-	local i
-	for i = 7, 255 do
-	    cmd = ('hf legic write 0x%02x 0x01'):format(i)
-	    print(cmd)
-		core.clearCommandBuffer()
-	    core.console(cmd)
-		
-		-- got a 'cmd-buffer overflow' on my mac - so just wait a little
-		-- works without that pause on my linux-box
-		utils.Sleep(0.1)
-	end
+    local cmd = ''
+    local i
+    for i = 7, 255 do
+        cmd = ('hf legic write 0x%02x 0x01'):format(i)
+        print(cmd)
+        core.clearCommandBuffer()
+        core.console(cmd)
+
+        -- got a 'cmd-buffer overflow' on my mac - so just wait a little
+        -- works without that pause on my linux-box
+        utils.Sleep(0.1)
+    end
 end
 
 main()
diff --git a/client/scripts/lf_bulk.lua b/client/scripts/lf_bulk.lua
index 7f02094b8..b4604bebb 100644
--- a/client/scripts/lf_bulk.lua
+++ b/client/scripts/lf_bulk.lua
@@ -12,59 +12,59 @@ Perform bulk enrollment of 26 bit H10301 style RFID Tags
 For more info, check the comments in the code
 ]]
 example = [[
-	-- 
-	script run lf_bulk.lua -f 1 -b 1000 -c 10
+    --
+    script run lf_bulk.lua -f 1 -b 1000 -c 10
 ]]
 usage = [[
 script run lf_bulk.lua -f facility -b base_id_num -c count
 
 Arguments:
-	-h 		: this help
-	-f		: facility id
-	-b		: starting card id
-	-c		: count,  number of cards to make
+    -h      : this help
+    -f      : facility id
+    -b      : starting card id
+    -c      : count,  number of cards to make
 ]]
 local DEBUG = true
 --local bxor = bit32.bxor
 local bor = bit32.bor
 local lshift = bit32.lshift
---- 
+---
 -- A debug printout-function
 local function dbg(args)
     if not DEBUG then return end
     if type(args) == "table" then
-		local i = 1
-		while args[i] do
-			dbg(args[i])
-			i = i+1
-		end
-	else
-		print("###", args)
-	end	
-end	
---- 
+        local i = 1
+        while args[i] do
+            dbg(args[i])
+            i = i+1
+        end
+    else
+        print("###", args)
+    end
+end
+---
 -- This is only meant to be used when errors occur
 local function oops(err)
-	print("ERROR: ",err)
-	return nil,err
+    print("ERROR: ",err)
+    return nil,err
 end
---- 
+---
 -- Usage help
 local function help()
-	print(copyright)
-	print(author)	
-	print(version)	
-	print(desc)
-	print('Example usage')
-	print(example)
+    print(copyright)
+    print(author)
+    print(version)
+    print(desc)
+    print('Example usage')
+    print(example)
 end
 ---
 -- Exit message
 local function exitMsg(msg)
-	print( string.rep('--',20) )
-	print( string.rep('--',20) )
-	print(msg)
-	print()
+    print( string.rep('--',20) )
+    print( string.rep('--',20) )
+    print(msg)
+    print()
 end
 --[[Implement a function to simply visualize the bitstream in a text format
 --This is especially helpful for troubleshooting bitwise math issues]]--
@@ -81,22 +81,22 @@ end
 
 --[[
   Likely, I'm an idiot, but I couldn't find any parity functions in Lua
-  This can also be done with a combination of bitwise operations (in fact, 
+  This can also be done with a combination of bitwise operations (in fact,
   is the canonically "correct" way to do it, but my brain doesn't just
   default to this and so counting some ones is good enough for me
 ]]--
 local function evenparity(s)
-	local _, count = string.gsub(s, "1", "")	
-	local p = count % 2
-	if (p == 0) then
-		return false
-	else
-		return true
-	end
+    local _, count = string.gsub(s, "1", "")
+    local p = count % 2
+    if (p == 0) then
+        return false
+    else
+        return true
+    end
 end
-	
+
 local function isempty(s)
-	return s == nil or s == ''
+    return s == nil or s == ''
 end
 
 --[[
@@ -105,89 +105,89 @@ end
   hex.  This should be easy enough to extend to non 26bit formats
 ]]--
 local function cardHex(i, f)
-	fac = lshift(f, 16)
-	id = bor(i, fac)
-	stream = toBits(id, 24)
+    fac = lshift(f, 16)
+    id = bor(i, fac)
+    stream = toBits(id, 24)
 
-	--As the function defaults to even parity and returns a boolean,
-	--perform a 'not' function to get odd parity
-	high = evenparity(string.sub(stream,1,12)) and 1 or 0
-	low =  not evenparity(string.sub(stream,13)) and 1 or 0
-	bits = bor( lshift(id, 1), low)
-	bits = bor( bits, lshift(high, 25))
+    --As the function defaults to even parity and returns a boolean,
+    --perform a 'not' function to get odd parity
+    high = evenparity(string.sub(stream,1,12)) and 1 or 0
+    low =  not evenparity(string.sub(stream,13)) and 1 or 0
+    bits = bor( lshift(id, 1), low)
+    bits = bor( bits, lshift(high, 25))
 
-	--Since the lua library bit32 is (obviously) 32 bits and we need to
-	--encode 36 bits to properly do a 26 bit tag with the preamble we need
-	--to create a higher order and lower order component which we will
-	--then assemble in the return.  The math above defines the proper
-	--encoding as per HID/Weigand/etc.  These bit flips are due to the
-	--format length check on bit 38 (cmdlfhid.c:64) and 
-	--bit 31 (cmdlfhid.c:66).
-	preamble = bor(0, lshift(1, 5))
-	bits = bor(bits, lshift(1, 26))
+    --Since the lua library bit32 is (obviously) 32 bits and we need to
+    --encode 36 bits to properly do a 26 bit tag with the preamble we need
+    --to create a higher order and lower order component which we will
+    --then assemble in the return.  The math above defines the proper
+    --encoding as per HID/Weigand/etc.  These bit flips are due to the
+    --format length check on bit 38 (cmdlfhid.c:64) and
+    --bit 31 (cmdlfhid.c:66).
+    preamble = bor(0, lshift(1, 5))
+    bits = bor(bits, lshift(1, 26))
 
-	return ("%04x%08x"):format(preamble, bits)
+    return ("%04x%08x"):format(preamble, bits)
 end
 ---
 -- main
 local function main(args)
 
-	print( string.rep('--',20) )
-	print( string.rep('--',20) )	
-	print()
-	
-	if #args == 0 then return help() end
-	
-	--I really wish a better getopt function would be brought in supporting
-	--long arguments, but it seems this library was chosen for BSD style
-	--compatibility
-	for o, a in getopt.getopt(args, 'f:b:c:h') do
-		if o == 'h' then return help() end
-		if o == 'f' then 
-			if isempty(a) then 
-				print("You did not supply a facility code, using 0")
-				facility = 0
-			else 
-				facility = a
-			end
-		end 
-		if o == 'b' then 
-			if isempty(a) then return oops("You must supply the flag -b (base id)") end
-			baseid = a
-		end
-		if o == 'c' then 
-			if isempty(a) then return oops("You must supply the flag -c (count)") end
-			count = a
-		end
-	end
+    print( string.rep('--',20) )
+    print( string.rep('--',20) )
+    print()
 
-	--Due to my earlier complaints about how this specific getopt library
-	--works, specifying ":" does not enforce supplying a value, thus we
-	--need to do these checks all over again.
-	if isempty(baseid) then return oops("You must supply the flag -b (base id)") end
-	if isempty(count) then return oops("You must supply the flag -c (count)") end
+    if #args == 0 then return help() end
 
-	--If the facility ID is non specified, ensure we code it as zero
-	if isempty(facility) then 
-		print("Using 0 for the facility code as -f was not supplied")
-		facility = 0 
-	end
+    --I really wish a better getopt function would be brought in supporting
+    --long arguments, but it seems this library was chosen for BSD style
+    --compatibility
+    for o, a in getopt.getopt(args, 'f:b:c:h') do
+        if o == 'h' then return help() end
+        if o == 'f' then
+            if isempty(a) then
+                print("You did not supply a facility code, using 0")
+                facility = 0
+            else
+                facility = a
+            end
+        end
+        if o == 'b' then
+            if isempty(a) then return oops("You must supply the flag -b (base id)") end
+            baseid = a
+        end
+        if o == 'c' then
+            if isempty(a) then return oops("You must supply the flag -c (count)") end
+            count = a
+        end
+    end
 
-	--The next baseid + count function presents a logic/UX conflict
-	--where users specifying -c 1 (count = 1) would try to program two
-	--tags.  This makes it so that -c 0 & -c 1 both code one tag, and all
-	--other values encode the expected amount.
-	if tonumber(count) > 0 then count = count - 1 end
+    --Due to my earlier complaints about how this specific getopt library
+    --works, specifying ":" does not enforce supplying a value, thus we
+    --need to do these checks all over again.
+    if isempty(baseid) then return oops("You must supply the flag -b (base id)") end
+    if isempty(count) then return oops("You must supply the flag -c (count)") end
 
-	endid = baseid + count
+    --If the facility ID is non specified, ensure we code it as zero
+    if isempty(facility) then
+        print("Using 0 for the facility code as -f was not supplied")
+        facility = 0
+    end
 
-	for cardnum = baseid, endid do 
-		local card = cardHex(cardnum, facility)
-		print("Press enter to program card "..cardnum..":"..facility.." (hex: "..card..")")
-		--This would be better with "press any key", but we'll take what we can get.
-		io.read()
-		core.console( ('lf hid clone %s'):format(card) )
-	end
+    --The next baseid + count function presents a logic/UX conflict
+    --where users specifying -c 1 (count = 1) would try to program two
+    --tags.  This makes it so that -c 0 & -c 1 both code one tag, and all
+    --other values encode the expected amount.
+    if tonumber(count) > 0 then count = count - 1 end
+
+    endid = baseid + count
+
+    for cardnum = baseid, endid do
+        local card = cardHex(cardnum, facility)
+        print("Press enter to program card "..cardnum..":"..facility.." (hex: "..card..")")
+        --This would be better with "press any key", but we'll take what we can get.
+        io.read()
+        core.console( ('lf hid clone %s'):format(card) )
+    end
 end
 
 main(args)
\ No newline at end of file
diff --git a/client/scripts/mfkeys.lua b/client/scripts/mfkeys.lua
index 085390526..18078b822 100644
--- a/client/scripts/mfkeys.lua
+++ b/client/scripts/mfkeys.lua
@@ -1,12 +1,12 @@
 --[[
-	This is an example of Lua-scripting within proxmark3. This is a lua-side
-	implementation of hf mf chk
+    This is an example of Lua-scripting within proxmark3. This is a lua-side
+    implementation of hf mf chk
 
-	This code is licensed to you under the terms of the GNU GPL, version 2 or,
-	at your option, any later version. See the LICENSE.txt file for the text of
-	the license.
+    This code is licensed to you under the terms of the GNU GPL, version 2 or,
+    at your option, any later version. See the LICENSE.txt file for the text of
+    the license.
 
-	Copyright (C) 2013 m h swende <martin at swende.se>
+    Copyright (C) 2013 m h swende <martin at swende.se>
 --]]
 -- Loads the commands-library
 local cmds = require('commands')
@@ -19,7 +19,7 @@ local getopt = require('getopt')
 local utils = require('utils')
 
 example =[[
-	 script run mfkeys
+     script run mfkeys
 ]]
 author = "Holiman"
 usage = "script run mfkeys"
@@ -29,247 +29,247 @@ If you want to add more, just put them inside /lualibs/mf_default_keys.lua\n"):f
 [[
 
 Arguments:
-	-h             : this help
-	-p             : print keys
+    -h             : this help
+    -p             : print keys
 ]]
 
 local TIMEOUT = 10000 -- 10 seconds
---- 
+---
 -- This is only meant to be used when errors occur
 local function oops(err)
-	print('ERROR: ',err)
-	return nil,err
+    print('ERROR: ',err)
+    return nil,err
 end
---- 
+---
 -- Usage help
 local function help()
-	print(desc)
-	print("Example usage")
-	print(example)
+    print(desc)
+    print("Example usage")
+    print(example)
 end
 --
 -- waits for answer from pm3 device
 local function checkCommand(command)
-	core.clearCommandBuffer()
-	local usb = command:getBytes()
-	core.SendCommand(usb)
-	local result = core.WaitForResponseTimeout(cmds.CMD_ACK, TIMEOUT)
-	if result then
-		local count, cmd, arg0 = bin.unpack('LL',result)
-		if(arg0==1) then
-			local count, arg1, arg2, data = bin.unpack('LLH511',result,count)
-			key = data:sub(1,12)
-			return key
-		else
-			return nil
-		end
-	else
-		print("Timeout while waiting for response. Increase TIMEOUT in mfkeys.lua to wait longer")
-		return nil, "Timeout while waiting for device to respond"
-	end
+    core.clearCommandBuffer()
+    local usb = command:getBytes()
+    core.SendCommand(usb)
+    local result = core.WaitForResponseTimeout(cmds.CMD_ACK, TIMEOUT)
+    if result then
+        local count, cmd, arg0 = bin.unpack('LL',result)
+        if(arg0==1) then
+            local count, arg1, arg2, data = bin.unpack('LLH511',result,count)
+            key = data:sub(1,12)
+            return key
+        else
+            return nil
+        end
+    else
+        print("Timeout while waiting for response. Increase TIMEOUT in mfkeys.lua to wait longer")
+        return nil, "Timeout while waiting for device to respond"
+    end
 end
 
 local function checkBlock(blockno, testkeys, keytype)
 
-	-- The command data is only 512 bytes, each key is 6 bytes, meaning that we can send max 85 keys in one go. 
-	-- If there's more, we need to split it up
-	local arg1 = bit32.bor(bit32.lshift(keytype, 8), blockno)
+    -- The command data is only 512 bytes, each key is 6 bytes, meaning that we can send max 85 keys in one go.
+    -- If there's more, we need to split it up
+    local arg1 = bit32.bor(bit32.lshift(keytype, 8), blockno)
 
-	local start, remaining = 1, #testkeys
-	local chunksize = remaining
-	if remaining > 85 then chunksize = 85 end
-	local n = chunksize
-	
-	while remaining > 0 do
-		--print('start', start, 'chunksize', chunksize, 'testkeys kvar', remaining, 'N-index=', n)
+    local start, remaining = 1, #testkeys
+    local chunksize = remaining
+    if remaining > 85 then chunksize = 85 end
+    local n = chunksize
 
-		local d1 = table.concat(testkeys, "", start, n)
-			
-		print(("Testing block %d, keytype %d, with %d keys"):format(blockno, keytype, chunksize))
-		local command = Command:new{cmd = cmds.CMD_MIFARE_CHKKEYS,
-								arg1 =  arg1,
-								arg2 = 0,
-								arg3 = chunksize,
-								data = d1}
-		local status = checkCommand(command)
-		if status then return status, blockno end
-		start = start + chunksize
-		remaining = remaining - chunksize
-		
-		if remaining < 85 then chunksize = remaining end
-		n = n + chunksize
-	end
-	return nil
+    while remaining > 0 do
+        --print('start', start, 'chunksize', chunksize, 'testkeys kvar', remaining, 'N-index=', n)
+
+        local d1 = table.concat(testkeys, "", start, n)
+
+        print(("Testing block %d, keytype %d, with %d keys"):format(blockno, keytype, chunksize))
+        local command = Command:new{cmd = cmds.CMD_MIFARE_CHKKEYS,
+                                arg1 =  arg1,
+                                arg2 = 0,
+                                arg3 = chunksize,
+                                data = d1}
+        local status = checkCommand(command)
+        if status then return status, blockno end
+        start = start + chunksize
+        remaining = remaining - chunksize
+
+        if remaining < 85 then chunksize = remaining end
+        n = n + chunksize
+    end
+    return nil
 end
 
 -- A function to display the results
 local function display_results(keys)
-	local sector, keyA, keyB, succA, succB
-	print('')
-	print('|---|----------------|---|----------------|---|')
-	print('|sec|key A           |res|key B           |res|')
-	print('|---|----------------|---|----------------|---|')
+    local sector, keyA, keyB, succA, succB
+    print('')
+    print('|---|----------------|---|----------------|---|')
+    print('|sec|key A           |res|key B           |res|')
+    print('|---|----------------|---|----------------|---|')
 
-	for sector = 0, #keys do
-		succA, succB, keyA, keyB = unpack(keys[sector])
-		print(('|%03d|  %s  | %s |  %s  | %s |'):format(sector, keyA, succA, keyB, succB))
-	end
-	print('|---|----------------|---|----------------|---|')
+    for sector = 0, #keys do
+        succA, succB, keyA, keyB = unpack(keys[sector])
+        print(('|%03d|  %s  | %s |  %s  | %s |'):format(sector, keyA, succA, keyB, succB))
+    end
+    print('|---|----------------|---|----------------|---|')
 end
 -- A little helper to place an item first in the list
 local function placeFirst(akey, list)
-	akey = akey:lower()
-	if list[1] == akey then
-		-- Already at pole position
-		return list
-	end
-	local result = {akey}
-	--print(("Putting '%s' first"):format(akey))
-	for i,v in ipairs(list) do
-		if v ~= akey then 
-			result[#result+1] = v
-		end
-	end
-	return result
+    akey = akey:lower()
+    if list[1] == akey then
+        -- Already at pole position
+        return list
+    end
+    local result = {akey}
+    --print(("Putting '%s' first"):format(akey))
+    for i,v in ipairs(list) do
+        if v ~= akey then
+            result[#result+1] = v
+        end
+    end
+    return result
 end
 --[[
-The mifare Classic 1k card has 16 sectors of 4 data blocks each. 
+The mifare Classic 1k card has 16 sectors of 4 data blocks each.
 The first 32 sectors of a mifare Classic 4k card consists of 4 data blocks and the remaining
-8 sectors consist of 16 data blocks. 
+8 sectors consist of 16 data blocks.
 --]]
 local function get_blockno(s)
 
-	local b, sector
+    local b, sector
 
-	if type(s) == 'string' then
-		sector = tonumber(s)
-	else
-		sector = s
-	end
+    if type(s) == 'string' then
+        sector = tonumber(s)
+    else
+        sector = s
+    end
 
-	if sector < 32 then
-		b = sector * 4
-	else
-		b = 32 * 4 + (sector - 32) * 16
+    if sector < 32 then
+        b = sector * 4
+    else
+        b = 32 * 4 + (sector - 32) * 16
 end
-	return ('%02x'):format(b)
+    return ('%02x'):format(b)
 end
 --
 -- dumps all keys to file
 local function dumptofile(keys)
-	if utils.confirm('Do you wish to save the keys to dumpfile?') then
-		local destination = utils.input('Select a filename to store to', 'dumpkeys.bin')
-		local file = io.open(destination, 'wb')
-		if file == nil then
-			print('Could not write to file ', destination)
-			return
-		end
+    if utils.confirm('Do you wish to save the keys to dumpfile?') then
+        local destination = utils.input('Select a filename to store to', 'dumpkeys.bin')
+        local file = io.open(destination, 'wb')
+        if file == nil then
+            print('Could not write to file ', destination)
+            return
+        end
 
-		local key_a = ''
-		local key_b = ''
+        local key_a = ''
+        local key_b = ''
 
-		--for sector,_ in pairs(keys) do
-		for sector = 0, #keys do
-			local succA, succB, keyA, keyB = unpack(keys[sector])
-			key_a = key_a .. bin.pack('H', keyA);
-			key_b = key_b .. bin.pack('H', keyB);
-		end
-		file:write(key_a)
-		file:write(key_b)
-		file:close()
-	end
+        --for sector,_ in pairs(keys) do
+        for sector = 0, #keys do
+            local succA, succB, keyA, keyB = unpack(keys[sector])
+            key_a = key_a .. bin.pack('H', keyA);
+            key_b = key_b .. bin.pack('H', keyB);
+        end
+        file:write(key_a)
+        file:write(key_b)
+        file:close()
+    end
 end
-local function printkeys() 
-	for i=1, #keylist do
-		print(i, keylist[i])		
-	end
-	print ('Number of keys: '..#keylist)
+local function printkeys()
+    for i=1, #keylist do
+        print(i, keylist[i])
+    end
+    print ('Number of keys: '..#keylist)
 end
 local function perform_check(numsectors)
 
-	local keyType = 0 -- A=0, B=1
+    local keyType = 0 -- A=0, B=1
 
-	-- empty list of found keys
-	local keys = {}
-	for i = 0, numsectors-1 do
-		keys[i] = {0,0,'',''}
-	end	
+    -- empty list of found keys
+    local keys = {}
+    for i = 0, numsectors-1 do
+        keys[i] = {0,0,'',''}
+    end
 
-	for sector = 0, #keys do
-		-- Check if user aborted
-		if core.ukbhit() then
-			print('Aborted by user')
-			break
-		end 
+    for sector = 0, #keys do
+        -- Check if user aborted
+        if core.ukbhit() then
+            print('Aborted by user')
+            break
+        end
 
-		local targetblock = tonumber(get_blockno(sector), 16)
-		
-		local succA, succB, keyA, keyB = unpack(keys[sector])
-		
-		local keyA = checkBlock(targetblock, keylist, 0)
-		if keyA then succA = 1; keylist = placeFirst(keyA, keylist) end
-		keyA = keyA or '------------'
+        local targetblock = tonumber(get_blockno(sector), 16)
 
-		local keyB = checkBlock(targetblock, keylist, 1)
-		if keyB then succB = 1; keylist = placeFirst(keyB, keylist) end
-		keyB = keyB or '------------'
+        local succA, succB, keyA, keyB = unpack(keys[sector])
 
-		keys[sector] = {succA, succB, keyA, keyB}
-	end
-	
-	display_results(keys)
+        local keyA = checkBlock(targetblock, keylist, 0)
+        if keyA then succA = 1; keylist = placeFirst(keyA, keylist) end
+        keyA = keyA or '------------'
 
-	-- save to dumpkeys.bin
-	dumptofile(keys)
+        local keyB = checkBlock(targetblock, keylist, 1)
+        if keyB then succB = 1; keylist = placeFirst(keyB, keylist) end
+        keyB = keyB or '------------'
+
+        keys[sector] = {succA, succB, keyA, keyB}
+    end
+
+    display_results(keys)
+
+    -- save to dumpkeys.bin
+    dumptofile(keys)
 end
 --
 -- shows tag information
 local function taginfo(tag)
 
-	local sectors = 16
-	-- Show tag info
-	print((' Found tag %s'):format(tag.name))
+    local sectors = 16
+    -- Show tag info
+    print((' Found tag %s'):format(tag.name))
 
-	if 0x18 == tag.sak then --NXP MIFARE Classic 4k | Plus 4k
-		-- MIFARE Classic 4K offers 4096 bytes split into forty sectors,
-		-- of which 32 are same size as in the 1K with eight more that are quadruple size sectors.
-		sectors = 40
-	elseif 0x08 == tag.sak then -- NXP MIFARE CLASSIC 1k | Plus 2k
-		-- 1K offers 1024 bytes of data storage, split into 16 sector
-		sectors = 16
-	elseif 0x09 == tag.sak then -- NXP MIFARE Mini 0.3k
-		-- MIFARE Classic mini offers 320 bytes split into five sectors.
-		sectors = 5
-	elseif  0x10 == tag.sak then-- "NXP MIFARE Plus 2k"
-		sectors = 32
-	else
-		print("I don't know how many sectors there are on this type of card, defaulting to 16")
-	end
-	return sectors
+    if 0x18 == tag.sak then --NXP MIFARE Classic 4k | Plus 4k
+        -- MIFARE Classic 4K offers 4096 bytes split into forty sectors,
+        -- of which 32 are same size as in the 1K with eight more that are quadruple size sectors.
+        sectors = 40
+    elseif 0x08 == tag.sak then -- NXP MIFARE CLASSIC 1k | Plus 2k
+        -- 1K offers 1024 bytes of data storage, split into 16 sector
+        sectors = 16
+    elseif 0x09 == tag.sak then -- NXP MIFARE Mini 0.3k
+        -- MIFARE Classic mini offers 320 bytes split into five sectors.
+        sectors = 5
+    elseif  0x10 == tag.sak then-- "NXP MIFARE Plus 2k"
+        sectors = 32
+    else
+        print("I don't know how many sectors there are on this type of card, defaulting to 16")
+    end
+    return sectors
 end
 ---
 -- The main entry point
 local function main(args)
 
-	local start_time = os.time()
-	local numSectors = 16
+    local start_time = os.time()
+    local numSectors = 16
 
-	-- Arguments for the script
-	for o, a in getopt.getopt(args, 'hp') do
-		if o == "h" then return help() end
-		if o == "p" then return printkeys() end
-	end
-	-- identify tag
-	tag, err = lib14a.read(false, true)
-	if not tag then return oops(err) end
+    -- Arguments for the script
+    for o, a in getopt.getopt(args, 'hp') do
+        if o == "h" then return help() end
+        if o == "p" then return printkeys() end
+    end
+    -- identify tag
+    tag, err = lib14a.read(false, true)
+    if not tag then return oops(err) end
 
-	-- detect sectors and print taginfo
-	numsectors = taginfo(tag)
+    -- detect sectors and print taginfo
+    numsectors = taginfo(tag)
 
-	perform_check(numsectors)
+    perform_check(numsectors)
 
-	local end_time = os.time()
-	print('mfkeys - Total execution time: '..os.difftime(end_time, start_time)..' sec')
+    local end_time = os.time()
+    print('mfkeys - Total execution time: '..os.difftime(end_time, start_time)..' sec')
 end
 
 main( args)
\ No newline at end of file
diff --git a/client/scripts/mifare_access.lua b/client/scripts/mifare_access.lua
index 273d524c8..20120aced 100644
--- a/client/scripts/mifare_access.lua
+++ b/client/scripts/mifare_access.lua
@@ -11,8 +11,8 @@ usage = [[
 script run mifare_access -h -a <access bytes>
 
 Arguments:
-	-h                   : this help
-	-a <access bytes>    : 4 bytes ACCESS CONDITIONS
+    -h                   : this help
+    -a <access bytes>    : 4 bytes ACCESS CONDITIONS
 ]]
 
 local DEBUG = true
@@ -20,35 +20,35 @@ local bxor = bit32.bxor
 local band = bit32.band
 local rshift = bit32.rshift
 
---- 
+---
 -- A debug printout-function
 local function dbg(args)
     if not DEBUG then return end
     if type(args) == "table" then
-		local i = 1
-		while args[i] do
-			dbg(args[i])
-			i = i+1
-		end
-	else
-		print("###", args)
-	end	
-end	
---- 
+        local i = 1
+        while args[i] do
+            dbg(args[i])
+            i = i+1
+        end
+    else
+        print("###", args)
+    end
+end
+---
 -- This is only meant to be used when errors occur
 local function oops(err)
-	print("ERROR: ",err)
-	return nil, err
+    print("ERROR: ",err)
+    return nil, err
 end
---- 
+---
 -- Usage help
 local function help()
-	print(copyright)
-	print(author)	
-	print(version)	
-	print(desc)
-	print('Example usage')
-	print(example)
+    print(copyright)
+    print(author)
+    print(version)
+    print(desc)
+    print('Example usage')
+    print(example)
 end
 
 local access_condition_sector_trailer = {}
@@ -73,58 +73,58 @@ access_condition_data_block[0x7] = {'never','never','never','never'}
 
 local function main(args)
 
-	print( string.rep('--',20) )
-	print( string.rep('--',20) )	
-	print()
+    print( string.rep('--',20) )
+    print( string.rep('--',20) )
+    print()
 
-	local access = ''
-	
-	-- Read the parameters
-	for o, a in getopt.getopt(args, 'ha:') do
-		if o == "h" then return help() end
-		if o == "a" then access = a end
-	end	
-		
-	if access == nil then return oops('empty ACCESS CONDITIONS') end
-	if #access == 0 then return oops('empty ACCESS CONDITIONS') end
-	if #access ~= 8 then return oops("Wrong length. Should be 4 hex bytes ACCESS CONDITIONS (e.g. 7F0F0869)") end
-	
-	local c2_b = tonumber(string.sub(access, 1, 1), 16)
-	local c1_b = tonumber(string.sub(access, 2, 2), 16)
-	local c1 = tonumber(string.sub(access, 3, 3), 16)
-	local c3_b = tonumber(string.sub(access, 4, 4), 16)
-	local c3 = tonumber(string.sub(access, 5, 5), 16)
-	local c2 = tonumber(string.sub(access, 6, 6), 16)
-	local gpb = string.sub(access, 7, 8)
+    local access = ''
 
-	if bxor(c1, c1_b) ~= 0xF then print("!!! bitflip in c1") end
-	if bxor(c2, c2_b) ~= 0xF then print("!!! bitflip in c2") end
-	if bxor(c3, c3_b) ~= 0xF then print("!!! bitflip in c3") end
+    -- Read the parameters
+    for o, a in getopt.getopt(args, 'ha:') do
+        if o == "h" then return help() end
+        if o == "a" then access = a end
+    end
 
-	local ab = c1 * 256 + c2 * 16 + c3
+    if access == nil then return oops('empty ACCESS CONDITIONS') end
+    if #access == 0 then return oops('empty ACCESS CONDITIONS') end
+    if #access ~= 8 then return oops("Wrong length. Should be 4 hex bytes ACCESS CONDITIONS (e.g. 7F0F0869)") end
 
-	for block = 0,3 do
-		print("--> block "..block)
-		-- mask bits for block
-		local abi = band(rshift(ab, block), 0x111)
-		-- compress bits
-		abi = band(abi + rshift(abi, 3) + rshift(abi, 6),7)
---			print(abi)
-		if block == 3 then
-			print("     KEYSECXA read: "..access_condition_sector_trailer[abi][1])
-			print("    KEYSECXA write: "..access_condition_sector_trailer[abi][2])
-			print(" ACCESS COND. read: "..access_condition_sector_trailer[abi][3])
-			print("ACCESS COND. write: "..access_condition_sector_trailer[abi][4])
-			print("     KEYSECXB read: "..access_condition_sector_trailer[abi][5])
-			print("    KEYSECXB write: "..access_condition_sector_trailer[abi][6])
-		else
-			print("                   read: "..access_condition_data_block[abi][1])
-			print("                  write: "..access_condition_data_block[abi][2])
-			print("                    inc: "..access_condition_data_block[abi][3])
-			print("decr, transfer, restore: "..access_condition_data_block[abi][4])
-		end
-	end
+    local c2_b = tonumber(string.sub(access, 1, 1), 16)
+    local c1_b = tonumber(string.sub(access, 2, 2), 16)
+    local c1 = tonumber(string.sub(access, 3, 3), 16)
+    local c3_b = tonumber(string.sub(access, 4, 4), 16)
+    local c3 = tonumber(string.sub(access, 5, 5), 16)
+    local c2 = tonumber(string.sub(access, 6, 6), 16)
+    local gpb = string.sub(access, 7, 8)
 
-	print("GPB: "..gpb)
+    if bxor(c1, c1_b) ~= 0xF then print("!!! bitflip in c1") end
+    if bxor(c2, c2_b) ~= 0xF then print("!!! bitflip in c2") end
+    if bxor(c3, c3_b) ~= 0xF then print("!!! bitflip in c3") end
+
+    local ab = c1 * 256 + c2 * 16 + c3
+
+    for block = 0,3 do
+        print("--> block "..block)
+        -- mask bits for block
+        local abi = band(rshift(ab, block), 0x111)
+        -- compress bits
+        abi = band(abi + rshift(abi, 3) + rshift(abi, 6),7)
+        -- print(abi)
+        if block == 3 then
+            print("     KEYSECXA read: "..access_condition_sector_trailer[abi][1])
+            print("    KEYSECXA write: "..access_condition_sector_trailer[abi][2])
+            print(" ACCESS COND. read: "..access_condition_sector_trailer[abi][3])
+            print("ACCESS COND. write: "..access_condition_sector_trailer[abi][4])
+            print("     KEYSECXB read: "..access_condition_sector_trailer[abi][5])
+            print("    KEYSECXB write: "..access_condition_sector_trailer[abi][6])
+        else
+            print("                   read: "..access_condition_data_block[abi][1])
+            print("                  write: "..access_condition_data_block[abi][2])
+            print("                    inc: "..access_condition_data_block[abi][3])
+            print("decr, transfer, restore: "..access_condition_data_block[abi][4])
+        end
+    end
+
+    print("GPB: "..gpb)
 end
 main(args)
diff --git a/client/scripts/mifare_autopwn.lua b/client/scripts/mifare_autopwn.lua
index 738ca6950..b99488d96 100644
--- a/client/scripts/mifare_autopwn.lua
+++ b/client/scripts/mifare_autopwn.lua
@@ -7,208 +7,208 @@ example = "script run mifare_autopwn"
 author = "Martin Holst Swende"
 desc =
 [[
-This is a script which automates cracking and dumping mifare classic cards. It sets itself into 
-'listening'-mode, after which it cracks and dumps any mifare classic card that you 
-place by the device. 
+This is a script which automates cracking and dumping mifare classic cards. It sets itself into
+'listening'-mode, after which it cracks and dumps any mifare classic card that you
+place by the device.
 
 Arguments:
-	-h 			this help
-	-d 			debug logging on
-	-k			known key for Sector 0 ,  keytype A
+    -h          this help
+    -d          debug logging on
+    -k          known key for Sector 0 ,  keytype A
 
 
 Output files from this operation:
-	<uid>.eml 		- emulator file
-	<uid>.html 		- html file containing card data
-	dumpkeys.bin	- keys are dumped here. OBS! This file is volatile, as other commands overwrite it sometimes.
-	dumpdata.bin	- card data in binary form. OBS! This file is volatile, as other commands (hf mf dump) overwrite it. 
+    <uid>.eml       - emulator file
+    <uid>.html      - html file containing card data
+    dumpkeys.bin    - keys are dumped here. OBS! This file is volatile, as other commands overwrite it sometimes.
+    dumpdata.bin    - card data in binary form. OBS! This file is volatile, as other commands (hf mf dump) overwrite it.
 
 ]]
 
 -------------------------------
--- Some utilities 
+-- Some utilities
 -------------------------------
 local DEBUG = false
---- 
+---
 -- A debug printout-function
 local function dbg(args)
-	if not DEBUG then return end
-	
-	if type(args) == 'table' then
-		local i = 1
-		while result[i] do
-			dbg(result[i])
-			i = i+1
-		end
-	else
-		print('###', args)
-	end	
-end 
---- 
--- This is only meant to be used when errors occur
-local function oops(err)
-	print("ERROR: ",err)
-	return nil,err
-end
---- 
--- Usage help
-local function help()
-	print(desc)
-	print("Example usage")
-	print(example)
+    if not DEBUG then return end
+
+    if type(args) == 'table' then
+        local i = 1
+        while result[i] do
+            dbg(result[i])
+            i = i+1
+        end
+    else
+        print('###', args)
+    end
 end
 ---
--- Waits for a mifare card to be placed within the vicinity of the reader. 
+-- This is only meant to be used when errors occur
+local function oops(err)
+    print("ERROR: ",err)
+    return nil,err
+end
+---
+-- Usage help
+local function help()
+    print(desc)
+    print("Example usage")
+    print(example)
+end
+---
+-- Waits for a mifare card to be placed within the vicinity of the reader.
 -- @return if successfull: an table containing card info
 -- @return if unsuccessfull : nil, error
 local function wait_for_mifare()
-	while not core.ukbhit() do
-		res, err = lib14a.read()
-		if res then return res end
-		-- err means that there was no response from card
-	end
-	return nil, "Aborted by user"
+    while not core.ukbhit() do
+        res, err = lib14a.read()
+        if res then return res end
+        -- err means that there was no response from card
+    end
+    return nil, "Aborted by user"
 end
 
 local function nested(key,sak)
-	local typ = 1
-	if 0x18 == sak then --NXP MIFARE Classic 4k | Plus 4k | Ev1 4k
-		typ = 4
-	elseif 0x08 == sak then -- NXP MIFARE CLASSIC 1k | Plus 2k | Ev1 1K
-		typ = 1
-	elseif 0x09 == sak then -- NXP MIFARE Mini 0.3k
-		typ = 0
-	elseif 0x10 == sak then-- "NXP MIFARE Plus 2k"
-		typ = 2
-	elseif 0x01 == sak then-- "NXP MIFARE TNP3xxx 1K"
-		typ = 1
-	else
-		print("I don't know how many sectors there are on this type of card, defaulting to 16")
-	end
-	local cmd = string.format("hf mf nested %d 0 A %s d", typ, key)
-	core.console(cmd)
+    local typ = 1
+    if 0x18 == sak then --NXP MIFARE Classic 4k | Plus 4k | Ev1 4k
+        typ = 4
+    elseif 0x08 == sak then -- NXP MIFARE CLASSIC 1k | Plus 2k | Ev1 1K
+        typ = 1
+    elseif 0x09 == sak then -- NXP MIFARE Mini 0.3k
+        typ = 0
+    elseif 0x10 == sak then-- "NXP MIFARE Plus 2k"
+        typ = 2
+    elseif 0x01 == sak then-- "NXP MIFARE TNP3xxx 1K"
+        typ = 1
+    else
+        print("I don't know how many sectors there are on this type of card, defaulting to 16")
+    end
+    local cmd = string.format("hf mf nested %d 0 A %s d", typ, key)
+    core.console(cmd)
 end
 
 local function dump(uid, numsectors)
-	dbg('dumping tag memory')
+    dbg('dumping tag memory')
 
-	local typ = 1
-	if 0x18 == sak then --NXP MIFARE Classic 4k | Plus 4k | Ev1 4k
-		typ = 4
-	elseif 0x08 == sak then -- NXP MIFARE CLASSIC 1k | Plus 2k | Ev1 1K
-		typ = 1
-	elseif 0x09 == sak then -- NXP MIFARE Mini 0.3k
-		typ = 0
-	elseif 0x10 == sak then-- "NXP MIFARE Plus 2k"
-		typ = 2
-	elseif 0x01 == sak then-- "NXP MIFARE TNP3xxx 1K"
-		typ = 1
-	end
+    local typ = 1
+    if 0x18 == sak then --NXP MIFARE Classic 4k | Plus 4k | Ev1 4k
+        typ = 4
+    elseif 0x08 == sak then -- NXP MIFARE CLASSIC 1k | Plus 2k | Ev1 1K
+        typ = 1
+    elseif 0x09 == sak then -- NXP MIFARE Mini 0.3k
+        typ = 0
+    elseif 0x10 == sak then-- "NXP MIFARE Plus 2k"
+        typ = 2
+    elseif 0x01 == sak then-- "NXP MIFARE TNP3xxx 1K"
+        typ = 1
+    end
 
-	if utils.confirm('Do you wish to create a memory dump of tag?') then 
+    if utils.confirm('Do you wish to create a memory dump of tag?') then
 
-		local dumpfile = 'hf-mf-'..uid..'-data.bin'
+        local dumpfile = 'hf-mf-'..uid..'-data.bin'
 
-		local dmp = ('hf mf dump %s f %s'):format(typ, dumpfile)
-		core.console(dmp)
+        local dmp = ('hf mf dump %s f %s'):format(typ, dumpfile)
+        core.console(dmp)
 
-		-- Save the global args, those are *our* arguments
-		local myargs = args
-		-- Set the arguments for htmldump script
-		args =('-i %s -o %s.html'):format(dumpfile, uid)
-		-- call it 
-		require('htmldump')
+        -- Save the global args, those are *our* arguments
+        local myargs = args
+        -- Set the arguments for htmldump script
+        args =('-i %s -o %s.html'):format(dumpfile, uid)
+        -- call it
+        require('htmldump')
 
-		-- dump to emulator
-		args =('-i %s -o %s.eml'):format(dumpfile, uid)
-		require('dumptoemul')
+        -- dump to emulator
+        args =('-i %s -o %s.eml'):format(dumpfile, uid)
+        require('dumptoemul')
 
-		-- Set back args. Not that it's used, just for the karma... 
-		args = myargs
-	end
+        -- Set back args. Not that it's used, just for the karma...
+        args = myargs
+    end
 end
 --
 -- performs a test if tag nonce uses weak or hardend prng
 local function perform_prng_test()
-	local isweak = core.detect_prng()
-	if isweak == 1 then
-		dbg('PRNG detection : WEAK nonce detected')
-	elseif isweak == 0 then
-		dbg('PRNG detection : HARDEND nonce detected')
-	else
-		dbg('PRNG detection : failed')	
-	end
-	return isweak
+    local isweak = core.detect_prng()
+    if isweak == 1 then
+        dbg('PRNG detection : WEAK nonce detected')
+    elseif isweak == 0 then
+        dbg('PRNG detection : HARDEND nonce detected')
+    else
+        dbg('PRNG detection : failed')
+    end
+    return isweak
 end
---- 
+---
 -- The main entry point
 local function main(args)
 
-	local verbose, exit, res, uid, err, _, sak
-	local seen_uids = {}
-	local key = ''
-	local print_message = true
-	-- Read the parameters
-	for o, a in getopt.getopt(args, 'hdk:') do
-		if o == "h" then help() return end
-		if o == "d" then DEBUG = true end
-		if o == 'k' then key = a end
-	end
+    local verbose, exit, res, uid, err, _, sak
+    local seen_uids = {}
+    local key = ''
+    local print_message = true
+    -- Read the parameters
+    for o, a in getopt.getopt(args, 'hdk:') do
+        if o == "h" then help() return end
+        if o == "d" then DEBUG = true end
+        if o == 'k' then key = a end
+    end
 
-	while not exit do
-		if print_message then
-			print("Waiting for card or press any key to stop")
-			print_message = false
-		end
-		res, err = wait_for_mifare()
-		if err then return oops(err) end
-		-- Seen already?
-		uid = res.uid
-		sak = res.sak
-			
-		if not seen_uids[uid] then
-			-- Store it
-			seen_uids[uid] = uid
-			
-			-- check if PRNG is WEAK
-			if perform_prng_test() == 1 then  
-				print("Card found, commencing crack on UID", uid)
+    while not exit do
+        if print_message then
+            print("Waiting for card or press any key to stop")
+            print_message = false
+        end
+        res, err = wait_for_mifare()
+        if err then return oops(err) end
+        -- Seen already?
+        uid = res.uid
+        sak = res.sak
 
-				if #key == 12 then
-					print("Using key: "..key);
-				else 
-					-- Crack it
-					local cnt
-					err, res = core.mfDarkside()
-					if     err == -1 then return oops("Button pressed. Aborted.") 
-					elseif err == -2 then return oops("Card is not vulnerable to Darkside attack (doesn't send NACK on authentication requests).")
-					elseif err == -3 then return oops("Card is not vulnerable to Darkside attack (its random number generator is not predictable).")
-					elseif err == -4 then return oops([[
-		Card is not vulnerable to Darkside attack (its random number generator seems to be based on the wellknown
-		generating polynomial with 16 effective bits only, but shows unexpected behaviour.]])
-					elseif err == -5 then return oops("Aborted via keyboard.")
-					end
-					-- The key is actually 8 bytes, so a 
-					-- 6-byte key is sent as 00XXXXXX
-					-- This means we unpack it as first
-					-- two bytes, then six bytes actual key data
-					-- We can discard first and second return values
-					_,_,key = bin.unpack("H2H6",res)
-					print("Found valid key: "..key);
-				end
-				-- Use nested attack
-				nested(key, sak)
-				-- Dump info
-				dump(uid, sak)
+        if not seen_uids[uid] then
+            -- Store it
+            seen_uids[uid] = uid
 
-				if #key == 12 then exit = true end
-			else
-				print("Card found, darkside attack useless PRNG hardend on UID", uid)
-			end
-			print_message = true
-		end
-	end
+            -- check if PRNG is WEAK
+            if perform_prng_test() == 1 then
+                print("Card found, commencing crack on UID", uid)
+
+                if #key == 12 then
+                    print("Using key: "..key);
+                else
+                    -- Crack it
+                    local cnt
+                    err, res = core.mfDarkside()
+                    if     err == -1 then return oops("Button pressed. Aborted.")
+                    elseif err == -2 then return oops("Card is not vulnerable to Darkside attack (doesn't send NACK on authentication requests).")
+                    elseif err == -3 then return oops("Card is not vulnerable to Darkside attack (its random number generator is not predictable).")
+                    elseif err == -4 then return oops([[
+        Card is not vulnerable to Darkside attack (its random number generator seems to be based on the wellknown
+        generating polynomial with 16 effective bits only, but shows unexpected behaviour.]])
+                    elseif err == -5 then return oops("Aborted via keyboard.")
+                    end
+                    -- The key is actually 8 bytes, so a
+                    -- 6-byte key is sent as 00XXXXXX
+                    -- This means we unpack it as first
+                    -- two bytes, then six bytes actual key data
+                    -- We can discard first and second return values
+                    _,_,key = bin.unpack("H2H6",res)
+                    print("Found valid key: "..key);
+                end
+                -- Use nested attack
+                nested(key, sak)
+                -- Dump info
+                dump(uid, sak)
+
+                if #key == 12 then exit = true end
+            else
+                print("Card found, darkside attack useless PRNG hardend on UID", uid)
+            end
+            print_message = true
+        end
+    end
 end
 
--- Call the main 
+-- Call the main
 main(args)
diff --git a/client/scripts/mifareplus.lua b/client/scripts/mifareplus.lua
index 39462360a..b559b6beb 100644
--- a/client/scripts/mifareplus.lua
+++ b/client/scripts/mifareplus.lua
@@ -9,19 +9,19 @@ desc =
 [[
 Purpose: Lua script to communicate with the Mifare Plus EV1, including personalization (setting the keys) and proximity check. Manually edit the file to add to the commands you can send the card.
 Please read the NXP manual before running this script to prevent making irreversible changes. Also note:
-	- The Mifare Plus must start in SL0 for personalization. Card can then be moved to SL1 or SL3.
-	- The keys are hardcoded in the script to "00...". Unless you change this, only use this script for testing purposes.
-	- Make sure you choose your card size correctly (2kB or 4kB).
+    - The Mifare Plus must start in SL0 for personalization. Card can then be moved to SL1 or SL3.
+    - The keys are hardcoded in the script to "00...". Unless you change this, only use this script for testing purposes.
+    - Make sure you choose your card size correctly (2kB or 4kB).
 Small changes can be to made this script to communicate with the Mifare Plus S, X, or SE.
 ]]
 usage = [[
 script run mifareplus -h
 Arguments:
-	-h             : this help
+    -h             : this help
 ]]
 
 
--- Default 
+-- Default
 SIXTEEN_BYTES_ZEROS = '00000000000000000000000000000000'
 
 -- ISO7816 commands used
@@ -38,264 +38,264 @@ PROXIMITYCHECK = '03F2'
 VERIFYPC = '03FD'
 READPLAINNOMACUNMACED = '0336'
 
---- 
+---
 -- This is only meant to be used when errors occur
 local function oops(err)
-	print('ERROR: ',err)
-	return nil, err
+    print('ERROR: ',err)
+    return nil, err
 end
 ---
 -- Usage help
 local function help()
-	print(copyright)
-	print(author)	
-	print(version)	
-	print(desc)
-	print('Example usage')
-	print(example)
+    print(copyright)
+    print(author)
+    print(version)
+    print(desc)
+    print('Example usage')
+    print(example)
 end
 ---
 -- Used to send raw data to the firmware to subsequently forward the data to the card.
 local function sendRaw(rawdata, crc, power)
-	print(("<sent>: 	  %s"):format(rawdata))
+    print(("<sent>:       %s"):format(rawdata))
 
-	local flags = lib14a.ISO14A_COMMAND.ISO14A_RAW
-	if crc then
-		flags = flags + lib14a.ISO14A_COMMAND.ISO14A_APPEND_CRC
-	end
-	if power then
-		flags = flags + lib14a.ISO14A_COMMAND.ISO14A_NO_DISCONNECT
-	end
+    local flags = lib14a.ISO14A_COMMAND.ISO14A_RAW
+    if crc then
+        flags = flags + lib14a.ISO14A_COMMAND.ISO14A_APPEND_CRC
+    end
+    if power then
+        flags = flags + lib14a.ISO14A_COMMAND.ISO14A_NO_DISCONNECT
+    end
 
-	local command = Command:new{cmd = cmds.CMD_READER_ISO_14443a, 
-								arg1 = flags, -- Send raw
-								arg2 = string.len(rawdata) / 2, -- arg2 contains the length, which is half the length of the ASCII-string rawdata
-								data = rawdata}
-	local ignore_response = false
-	local result, err = lib14a.sendToDevice(command, ignore_response)
-	if result then
-		--unpack the first 4 parts of the result as longs, and the last as an extremely long string to later be cut down based on arg1, the number of bytes returned
-		local count,cmd,arg1,arg2,arg3,data = bin.unpack('LLLLH512',result)
+    local command = Command:new{cmd = cmds.CMD_READER_ISO_14443a,
+                                arg1 = flags, -- Send raw
+                                arg2 = string.len(rawdata) / 2, -- arg2 contains the length, which is half the length of the ASCII-string rawdata
+                                data = rawdata}
+    local ignore_response = false
+    local result, err = lib14a.sendToDevice(command, ignore_response)
+    if result then
+        --unpack the first 4 parts of the result as longs, and the last as an extremely long string to later be cut down based on arg1, the number of bytes returned
+        local count,cmd,arg1,arg2,arg3,data = bin.unpack('LLLLH512',result)
 
-		returned_bytes = string.sub(data, 1, arg1 * 2)
-		if #returned_bytes > 0 then
-			print(("<recvd>: %s"):format(returned_bytes)) -- need to multiply by 2 because the hex digits are actually two bytes when they are strings
-			return returned_bytes
-		else
-			return nil
-		end
-	else
-		oops("Error sending the card raw data.")
-		return nil
-	end
+        returned_bytes = string.sub(data, 1, arg1 * 2)
+        if #returned_bytes > 0 then
+            print(("<recvd>: %s"):format(returned_bytes)) -- need to multiply by 2 because the hex digits are actually two bytes when they are strings
+            return returned_bytes
+        else
+            return nil
+        end
+    else
+        oops("Error sending the card raw data.")
+        return nil
+    end
 end
 
 -- Sends an instruction to do nothing, only disconnect
 local function disconnect()
-	local command = Command:new{cmd = cmds.CMD_READER_ISO_14443a, arg1 = 0,	}
-	-- We can ignore the response here, no ACK is returned for this command
-	-- Check /armsrc/iso14443a.c, ReaderIso14443a() for details
-	return lib14a.sendToDevice(command,true) 
-end	
+    local command = Command:new{cmd = cmds.CMD_READER_ISO_14443a, arg1 = 0,}
+    -- We can ignore the response here, no ACK is returned for this command
+    -- Check /armsrc/iso14443a.c, ReaderIso14443a() for details
+    return lib14a.sendToDevice(command,true)
+end
 
 local function writePerso()
-	-- Used to write any data, including the keys (Key A and Key B), for all the sectors.
-	-- writePerso() command parameters:
-	--		1 byte  - 0xA8 - Command Code
-	--		2 bytes - Address of the first block or key to be written to (40 blocks are numbered from 0x0000 to 0x00FF)
-	--		X bytes - The data bytes to be written, starting from the first block. Amount of data sent can be from 16 to 240 bytes in 16 byte increments. This allows
-	--				up to 15 blocks to be written at once.
-	-- response from PICC:
-	--		0x90 - OK
-	--		0x09 - targeted block is invalid for writes, i.e. block 0, which contains manufacturer data
-	--		0x0B - command invalid
-	--		0x0C - unexpected command length
-	
+    -- Used to write any data, including the keys (Key A and Key B), for all the sectors.
+    -- writePerso() command parameters:
+    --      1 byte  - 0xA8 - Command Code
+    --      2 bytes - Address of the first block or key to be written to (40 blocks are numbered from 0x0000 to 0x00FF)
+    --      X bytes - The data bytes to be written, starting from the first block. Amount of data sent can be from 16 to 240 bytes in 16 byte increments. This allows
+    --                up to 15 blocks to be written at once.
+    -- response from PICC:
+    --      0x90 - OK
+    --      0x09 - targeted block is invalid for writes, i.e. block 0, which contains manufacturer data
+    --      0x0B - command invalid
+    --      0x0C - unexpected command length
 
 
-	cardsize = 4 --need to set to 4 for 4k or 2 for 2k
-	if(cardsize == 4) then
-		numsectors = 39
-	elseif(cardsize == 2) then
-		numsectors = 31
-	else
-		oops("Invalid card size")
-	end
 
-	-- Write to the AES sector keys
-	print("Setting AES Sector keys")
-	for i=0,numsectors do --for each sector number
-		local keyA_block = "40" .. string.format("%02x", i * 2)
-		local keyB_block = "40" .. string.format("%02x", (i * 2) + 1)
-		--Can also calculate the keys fancily to make them unique, if desired
-		keyA = SIXTEEN_BYTES_ZEROS
-		keyB = SIXTEEN_BYTES_ZEROS
-		writeBlock(keyA_block, keyA)
-		writeBlock(keyB_block, keyB)
-	end
-	print("Finished setting AES Sector keys")
+    cardsize = 4 --need to set to 4 for 4k or 2 for 2k
+    if(cardsize == 4) then
+        numsectors = 39
+    elseif(cardsize == 2) then
+        numsectors = 31
+    else
+        oops("Invalid card size")
+    end
 
-	print("Setting misc keys which haven't been set yet.")
-	--CardMasterKey
-	blocknum = "9000"
-	writeBlock(blocknum, SIXTEEN_BYTES_ZEROS)
-	--CardConfigurationKey
-	blocknum = "9001"
-	writeBlock(blocknum, SIXTEEN_BYTES_ZEROS)
-	--L3SwitchKey
-	blocknum = "9003"
-	writeBlock(blocknum, SIXTEEN_BYTES_ZEROS)
-	--SL1CardAuthKey
-	blocknum = "9004"
-	writeBlock(blocknum, SIXTEEN_BYTES_ZEROS)
-	--L3SectorSwitchKey
-	blocknum = "9006"
-	writeBlock(blocknum, SIXTEEN_BYTES_ZEROS)
-	--L1L3MixSectorSwitchKey
-	blocknum = "9007"
-	writeBlock(blocknum, SIXTEEN_BYTES_ZEROS)
-	--VC Keys
-	--VCProximityKey
-	blocknum = "A001"
-	writeBlock(blocknum, SIXTEEN_BYTES_ZEROS)
-	--VCSelectENCKey
-	blocknum = "A080"
-	writeBlock(blocknum, SIXTEEN_BYTES_ZEROS)
-	--VCSelectMACKey
-	blocknum = "A081"
-	writeBlock(blocknum, SIXTEEN_BYTES_ZEROS)
-	--TransactionMACKey1
-	blocknum = "C000"
-	writeBlock(blocknum, SIXTEEN_BYTES_ZEROS)
-	--TransactionMACConfKey1
-	blocknum = "C001"
-	writeBlock(blocknum, SIXTEEN_BYTES_ZEROS)
-	print("Finished setting misc keys.")
+    -- Write to the AES sector keys
+    print("Setting AES Sector keys")
+    for i=0,numsectors do --for each sector number
+        local keyA_block = "40" .. string.format("%02x", i * 2)
+        local keyB_block = "40" .. string.format("%02x", (i * 2) + 1)
+        --Can also calculate the keys fancily to make them unique, if desired
+        keyA = SIXTEEN_BYTES_ZEROS
+        keyB = SIXTEEN_BYTES_ZEROS
+        writeBlock(keyA_block, keyA)
+        writeBlock(keyB_block, keyB)
+    end
+    print("Finished setting AES Sector keys")
 
-	print("WritePerso finished! Card is ready to move into new security level.")
+    print("Setting misc keys which haven't been set yet.")
+    --CardMasterKey
+    blocknum = "9000"
+    writeBlock(blocknum, SIXTEEN_BYTES_ZEROS)
+    --CardConfigurationKey
+    blocknum = "9001"
+    writeBlock(blocknum, SIXTEEN_BYTES_ZEROS)
+    --L3SwitchKey
+    blocknum = "9003"
+    writeBlock(blocknum, SIXTEEN_BYTES_ZEROS)
+    --SL1CardAuthKey
+    blocknum = "9004"
+    writeBlock(blocknum, SIXTEEN_BYTES_ZEROS)
+    --L3SectorSwitchKey
+    blocknum = "9006"
+    writeBlock(blocknum, SIXTEEN_BYTES_ZEROS)
+    --L1L3MixSectorSwitchKey
+    blocknum = "9007"
+    writeBlock(blocknum, SIXTEEN_BYTES_ZEROS)
+    --VC Keys
+    --VCProximityKey
+    blocknum = "A001"
+    writeBlock(blocknum, SIXTEEN_BYTES_ZEROS)
+    --VCSelectENCKey
+    blocknum = "A080"
+    writeBlock(blocknum, SIXTEEN_BYTES_ZEROS)
+    --VCSelectMACKey
+    blocknum = "A081"
+    writeBlock(blocknum, SIXTEEN_BYTES_ZEROS)
+    --TransactionMACKey1
+    blocknum = "C000"
+    writeBlock(blocknum, SIXTEEN_BYTES_ZEROS)
+    --TransactionMACConfKey1
+    blocknum = "C001"
+    writeBlock(blocknum, SIXTEEN_BYTES_ZEROS)
+    print("Finished setting misc keys.")
+
+    print("WritePerso finished! Card is ready to move into new security level.")
 end
 
 local function writeBlock(blocknum, data)
-	-- Method writes 16 bytes of the string sent (data) to the specified block number
-	-- The block numbers sent to the card need to be in little endian format (i.e. block 0x0001 is sent as 0x1000)
-	blocknum_little_endian = string.sub(blocknum, 3, 4) .. string.sub(blocknum, 1, 2)
-	commandString = WRITEPERSO .. blocknum_little_endian .. data --Write 16 bytes (32 hex chars).
-	response = sendRaw(commandString, true, true) --0x90 is returned upon success
-	if string.sub(response, 3, 4) ~= "90" then
-		oops(("error occurred while trying to write to block %s"):format(blocknum))
-	end
+    -- Method writes 16 bytes of the string sent (data) to the specified block number
+    -- The block numbers sent to the card need to be in little endian format (i.e. block 0x0001 is sent as 0x1000)
+    blocknum_little_endian = string.sub(blocknum, 3, 4) .. string.sub(blocknum, 1, 2)
+    commandString = WRITEPERSO .. blocknum_little_endian .. data --Write 16 bytes (32 hex chars).
+    response = sendRaw(commandString, true, true) --0x90 is returned upon success
+    if string.sub(response, 3, 4) ~= "90" then
+        oops(("error occurred while trying to write to block %s"):format(blocknum))
+    end
 end
 
 local function authenticateAES()
-	-- Used to try to authenticate with the AES keys we programmed into the card, to ensure the authentication works correctly.
-	commandString = AUTH_FIRST
-	commandString = commandString .. ''
+    -- Used to try to authenticate with the AES keys we programmed into the card, to ensure the authentication works correctly.
+    commandString = AUTH_FIRST
+    commandString = commandString .. ''
 end
 
 local function getVersion()
-	sendRaw(GETVERS_INIT, true, true)
-	sendRaw(GETVERS_CONT, true, true)
-	sendRaw(GETVERS_CONT, true, true)
+    sendRaw(GETVERS_INIT, true, true)
+    sendRaw(GETVERS_CONT, true, true)
+    sendRaw(GETVERS_CONT, true, true)
 end
 
 local function commitPerso(SL)
-	--pass SL as "01" to move to SL1 or "03" to move to SL3.
-	commandString = COMMITPERSO .. SL
-	response = sendRaw(commandString, true, true) --0x90 is returned upon success
-	if string.sub(response, 3, 4) ~= "90" then
-		oops("error occurred while trying to switch security level")
-	end
+    --pass SL as "01" to move to SL1 or "03" to move to SL3.
+    commandString = COMMITPERSO .. SL
+    response = sendRaw(commandString, true, true) --0x90 is returned upon success
+    if string.sub(response, 3, 4) ~= "90" then
+        oops("error occurred while trying to switch security level")
+    end
 end
 
 local function calculateMAC(MAC_input)
-	-- Pad the input if it is not a multiple of 16 bytes (32 nibbles). 
-	if(string.len(MAC_input) % 32 ~= 0) then
-		MAC_input = MAC_input .. "80"
-	end
-	while(string.len(MAC_input) % 32 ~= 0) do
-		MAC_input = MAC_input .. "0"
-	end
-	print("Padded MAC Input = " .. MAC_input .. ", length (bytes) = " .. string.len(MAC_input) / 2)
+    -- Pad the input if it is not a multiple of 16 bytes (32 nibbles).
+    if(string.len(MAC_input) % 32 ~= 0) then
+        MAC_input = MAC_input .. "80"
+    end
+    while(string.len(MAC_input) % 32 ~= 0) do
+        MAC_input = MAC_input .. "0"
+    end
+    print("Padded MAC Input = " .. MAC_input .. ", length (bytes) = " .. string.len(MAC_input) / 2)
 
-	--The MAC would actually be calculated here, and the output stored in raw_output
-	raw_output = "00010203040506070001020304050607" -- Dummy filler for now of 16-byte output. To be filled with actual MAC for testing purposes.
+    --The MAC would actually be calculated here, and the output stored in raw_output
+    raw_output = "00010203040506070001020304050607" -- Dummy filler for now of 16-byte output. To be filled with actual MAC for testing purposes.
 
-	-- The final 8-byte MAC output is a concatenation of every 2nd byte starting from the second MSB.
-	final_output = ""
-	j = 3
-	for i = 1,8 do
-		final_output = final_output .. string.sub(RndR, j, j + 1) .. string.sub(RndC, j, j + 1)
-		j = j + 4
-	end
-	return final_output
+    -- The final 8-byte MAC output is a concatenation of every 2nd byte starting from the second MSB.
+    final_output = ""
+    j = 3
+    for i = 1,8 do
+        final_output = final_output .. string.sub(RndR, j, j + 1) .. string.sub(RndC, j, j + 1)
+        j = j + 4
+    end
+    return final_output
 end
 
 local function proximityCheck()
-	--PreparePC--
-	commandString = PREPAREPC
-	response = sendRaw(commandString, true, true)
-	if not response then return oops("This card is not support the proximity check command.") end
-	
-	OPT = string.sub(response, 5, 6)
-	if tonumber(OPT) == 1 then
-		pps_present = true
-	else
-		pps_present = false
-	end
-	pubRespTime = string.sub(response, 7, 10)
-	if(pps_present == true) then
-		pps = string.sub(response, 11, 12)
-	else
-		pps = ''
-	end
-	print("OPT = " .. OPT .. " pubRespTime = " .. pubRespTime .. " pps = " .. pps)
+    --PreparePC--
+    commandString = PREPAREPC
+    response = sendRaw(commandString, true, true)
+    if not response then return oops("This card is not support the proximity check command.") end
 
-	--PC--
-	RndC = "0001020304050607" --Random Challenge
-	num_rounds = 8 --Needs to be 1, 2, 4, or 8
-	part_len = 8 / num_rounds
-	j = 1
-	RndR = ""
-	for i = 1,num_rounds do
-		pRndC = ""
-		for q = 1,(part_len*2) do
-			pRndC = pRndC .. string.sub(RndC,j,j)
-			j = j + 1
-		end
-		commandString = PROXIMITYCHECK .. "0" .. tostring(part_len) .. pRndC
-		pRndR = string.sub(sendRaw(commandString, true, true), 3, 3+part_len)
-		RndR = RndR .. pRndR
-	end
-	print("RndC = " .. RndC .. " RndR = " .. RndR)
+    OPT = string.sub(response, 5, 6)
+    if tonumber(OPT) == 1 then
+        pps_present = true
+    else
+        pps_present = false
+    end
+    pubRespTime = string.sub(response, 7, 10)
+    if(pps_present == true) then
+        pps = string.sub(response, 11, 12)
+    else
+        pps = ''
+    end
+    print("OPT = " .. OPT .. " pubRespTime = " .. pubRespTime .. " pps = " .. pps)
 
-	--VerifyPC--
-	MAC_input = "FD" .. OPT .. pubRespTime
-	if pps_present then
-		MAC_input = MAC_input .. pps
-	end
-	rnum_concat = ""
-	rnum_concat = RndR .. RndC --temporary (only works for when a single random challenge (8 bytes) is sent)
-	-- j = 1
-	-- for i = 1,8 do
-	-- 	rnum_concat = rnum_concat .. string.sub(RndR, j, j + 1) .. string.sub(RndC, j, j + 1)
-	-- 	j = j + 2
-	-- end
-	MAC_input = MAC_input .. rnum_concat
-	print("Concatenation of random numbers = " .. rnum_concat)
-	print("Final PCD concatenation before input into MAC function = " .. MAC_input)
-	MAC_tag = calculateMAC(MAC_input)
-	print("8-byte PCD MAC_tag (placeholder - currently incorrect) = " .. MAC_tag)
-	commandString = VERIFYPC .. MAC_tag
-	response = sendRaw(commandString, true, true)
-	print(#response, response)
-	if #response < 20 then return oops("Wrong response length (expected 20, got "..#response..") exiting") end
-	
-	PICC_MAC = string.sub(response, 5, 20)
-	print("8-byte MAC returned by PICC = " .. PICC_MAC)
-	MAC_input = "90" .. string.sub(MAC_input, 3)
-	print("Final PICC concatenation before input into MAC function = " .. MAC_input)
-	MAC_tag = calculateMAC(MAC_input)
-	print("8-byte PICC MAC_tag (placeholder - currently incorrect) = " .. MAC_tag)
+    --PC--
+    RndC = "0001020304050607" --Random Challenge
+    num_rounds = 8 --Needs to be 1, 2, 4, or 8
+    part_len = 8 / num_rounds
+    j = 1
+    RndR = ""
+    for i = 1,num_rounds do
+        pRndC = ""
+        for q = 1,(part_len*2) do
+            pRndC = pRndC .. string.sub(RndC,j,j)
+            j = j + 1
+        end
+        commandString = PROXIMITYCHECK .. "0" .. tostring(part_len) .. pRndC
+        pRndR = string.sub(sendRaw(commandString, true, true), 3, 3+part_len)
+        RndR = RndR .. pRndR
+    end
+    print("RndC = " .. RndC .. " RndR = " .. RndR)
+
+    --VerifyPC--
+    MAC_input = "FD" .. OPT .. pubRespTime
+    if pps_present then
+        MAC_input = MAC_input .. pps
+    end
+    rnum_concat = ""
+    rnum_concat = RndR .. RndC --temporary (only works for when a single random challenge (8 bytes) is sent)
+    -- j = 1
+    -- for i = 1,8 do
+    --   rnum_concat = rnum_concat .. string.sub(RndR, j, j + 1) .. string.sub(RndC, j, j + 1)
+    --   j = j + 2
+    -- end
+    MAC_input = MAC_input .. rnum_concat
+    print("Concatenation of random numbers = " .. rnum_concat)
+    print("Final PCD concatenation before input into MAC function = " .. MAC_input)
+    MAC_tag = calculateMAC(MAC_input)
+    print("8-byte PCD MAC_tag (placeholder - currently incorrect) = " .. MAC_tag)
+    commandString = VERIFYPC .. MAC_tag
+    response = sendRaw(commandString, true, true)
+    print(#response, response)
+    if #response < 20 then return oops("Wrong response length (expected 20, got "..#response..") exiting") end
+
+    PICC_MAC = string.sub(response, 5, 20)
+    print("8-byte MAC returned by PICC = " .. PICC_MAC)
+    MAC_input = "90" .. string.sub(MAC_input, 3)
+    print("Final PICC concatenation before input into MAC function = " .. MAC_input)
+    MAC_tag = calculateMAC(MAC_input)
+    print("8-byte PICC MAC_tag (placeholder - currently incorrect) = " .. MAC_tag)
 
 end
 
@@ -303,47 +303,47 @@ end
 -- The main entry point
 function main(args)
 
-	local o, a
-	for o, a in getopt.getopt(args, 'h') do			-- Populate command line arguments
-		if o == "h" then return help() end
-	end
+    local o, a
+    for o, a in getopt.getopt(args, 'h') do -- Populate command line arguments
+        if o == "h" then return help() end
+    end
 
-	-- Initialize the card using the already-present read14a library
-	-- Perform RATS and PPS (Protocol and Parameter Selection) check to finish the ISO 14443-4 protocol.
-	info,err = lib14a.read(true, false)
-	if not info then oops(err); disconnect(); return; end
-	
-    -- 
-	response = sendRaw("D01100", true, true)	
-	if not response then oops("No response from PPS check"); disconnect(); return;  end
+    -- Initialize the card using the already-present read14a library
+    -- Perform RATS and PPS (Protocol and Parameter Selection) check to finish the ISO 14443-4 protocol.
+    info,err = lib14a.read(true, false)
+    if not info then oops(err); disconnect(); return; end
 
-	print("Connected to")
-	print(" Type : "..info.name)
-	print("  UID : "..info.uid)
-	
-	-- Now, the card is initialized and we can do more interesting things.
+    --
+    response = sendRaw("D01100", true, true)
+    if not response then oops("No response from PPS check"); disconnect(); return;  end
 
-	--writePerso()
-	--commitPerso("03") --move to SL3
-	--getVersion()
-	proximityCheck()
+    print("Connected to")
+    print(" Type : "..info.name)
+    print("  UID : "..info.uid)
 
-	--commandString = VERIFYPC .. "186EFDE8DDC7D30B"
-	-- MAC = f5180d6e 40fdeae8 e9dd6ac7 bcd3350b
-	-- response = sendRaw(commandString, true, true)
+    -- Now, the card is initialized and we can do more interesting things.
 
-	-- attempt to read VCProximityKey at block A001
-	-- commandString = READPLAINNOMACUNMACED .. "01A0" .. "01"
-	-- response = sendRaw(commandString, true, true)
+    --writePerso()
+    --commitPerso("03") --move to SL3
+    --getVersion()
+    proximityCheck()
 
-	-- authenticate with CardConfigurationKey
-	-- commandString = AUTH_FIRST .. "0190" .. "00"
-	-- response = sendRaw(commandString, true, true)
+    --commandString = VERIFYPC .. "186EFDE8DDC7D30B"
+    -- MAC = f5180d6e 40fdeae8 e9dd6ac7 bcd3350b
+    -- response = sendRaw(commandString, true, true)
 
-	-- Power off the Proxmark
-	sendRaw(POWEROFF, false, false)
-	
-	disconnect()
+    -- attempt to read VCProximityKey at block A001
+    -- commandString = READPLAINNOMACUNMACED .. "01A0" .. "01"
+    -- response = sendRaw(commandString, true, true)
+
+    -- authenticate with CardConfigurationKey
+    -- commandString = AUTH_FIRST .. "0190" .. "00"
+    -- response = sendRaw(commandString, true, true)
+
+    -- Power off the Proxmark
+    sendRaw(POWEROFF, false, false)
+
+    disconnect()
 end
 
 main(args)
diff --git a/client/scripts/ndef_dump.lua b/client/scripts/ndef_dump.lua
index f1bf70ddd..4a740d7e6 100644
--- a/client/scripts/ndef_dump.lua
+++ b/client/scripts/ndef_dump.lua
@@ -4,20 +4,20 @@ local getopt = require('getopt')
 local cmds = require('commands')
 local taglib = require('taglib')
 
-local desc = 
+local desc =
 [[This script will automatically recognize and dump full content of a NFC NDEF Initialized tag; non-initialized tags will be ignored.
 
 It also write the dump to an eml-file <uid>.eml.
 
 (The difference between an .eml-file and a .bin-file is that the eml file contains
-ASCII representation of the hex-data, with linebreaks between 'rows'. A .bin-file contains the 
-raw data, but when saving into that for, we lose the infromation about how the memory is structured. 
-For example: 24 bytes could be 6 blocks of 4 bytes, or vice versa. 
+ASCII representation of the hex-data, with linebreaks between 'rows'. A .bin-file contains the
+raw data, but when saving into that for, we lose the infromation about how the memory is structured.
+For example: 24 bytes could be 6 blocks of 4 bytes, or vice versa.
 Therefore, the .eml is better to use file when saving dumps.)
 
 Arguments:
-	-d 				debug logging on
-	-h 				this help
+    -h              this help
+    -d              debug logging on
 
 ]]
 local example = "script run xxx"
@@ -25,116 +25,116 @@ local author = "Martin Holst Swende & Asper"
 ---
 -- PrintAndLog
 local function prlog(...)
-	-- TODO; replace this with a call to the proper PrintAndLog
-	print(...)
+    -- TODO; replace this with a call to the proper PrintAndLog
+    print(...)
 end
---- 
+---
 -- This is only meant to be used when errors occur
 local function oops(err)
-	prlog("ERROR: ",err)
-	return nil,err
+    prlog("ERROR: ",err)
+    return nil,err
 end
 
 
 -- Perhaps this will be moved to a separate library at one point
 local utils = {
-	--- Writes an eml-file.
-	-- @param uid - the uid of the tag. Used in filename
-	-- @param blockData. Assumed to be on the format {'\0\1\2\3,'\b\e\e\f' ..., 
-	-- that is, blockData[row] contains a string with the actual data, not ascii hex representation 
-	-- return filename if all went well, 
-	-- @reurn nil, error message if unsuccessfull
-	writeDumpFile = function(uid, blockData)
-		local destination = string.format("%s.eml", uid)
-		local file = io.open(destination, "w")
-		if file == nil then 
-			return nil, string.format("Could not write to file %s", destination)
-		end
-		local rowlen = string.len(blockData[1])
+    --- Writes an eml-file.
+    -- @param uid - the uid of the tag. Used in filename
+    -- @param blockData. Assumed to be on the format {'\0\1\2\3,'\b\e\e\f' ...,
+    -- that is, blockData[row] contains a string with the actual data, not ascii hex representation
+    -- return filename if all went well,
+    -- @reurn nil, error message if unsuccessfull
+    writeDumpFile = function(uid, blockData)
+        local destination = string.format("%s.eml", uid)
+        local file = io.open(destination, "w")
+        if file == nil then
+            return nil, string.format("Could not write to file %s", destination)
+        end
+        local rowlen = string.len(blockData[1])
 
-		for i,block in ipairs(blockData) do
-			if rowlen ~= string.len(block) then
-				prlog(string.format("WARNING: Dumpdata seems corrupted, line %d was not the same length as line 1",i))
-			end
+        for i,block in ipairs(blockData) do
+            if rowlen ~= string.len(block) then
+                prlog(string.format("WARNING: Dumpdata seems corrupted, line %d was not the same length as line 1",i))
+            end
 
-			local formatString = string.format("H%d", string.len(block))
-			local _,hex = bin.unpack(formatString,block)
-			file:write(hex.."\n")
-		end
-		file:close()	
-		return destination
-	end,
+            local formatString = string.format("H%d", string.len(block))
+            local _,hex = bin.unpack(formatString,block)
+            file:write(hex.."\n")
+        end
+        file:close()
+        return destination
+    end,
 }
 
---- 
+---
 -- Usage help
 local function help()
-	prlog(desc)
-	prlog("Example usage")
-	prlog(example)
+    prlog(desc)
+    prlog("Example usage")
+    prlog(example)
 end
 
 local function debug(...)
-	if DEBUG then 
-		prlog("debug:", ...)
-	end
+    if DEBUG then
+        prlog("debug:", ...)
+    end
 end
 
 
 --- This function is a lua-implementation of
 -- cmdhf14a.c:waitCmd(uint8_t iSelect)
 local function waitCmd(iSelect)
-	local response = core.WaitForResponseTimeout(cmds.CMD_ACK,1000)
-	if response then
-		local count,cmd,arg0,arg1,arg2 = bin.unpack('LLLL',response)
-		
-		local iLen = arg0
-		if iSelect then	iLen = arg1 end
-	    debug(("Received %i octets (arg0:%d, arg1:%d)"):format(iLen, arg0, arg1))
-	    if iLen == 0 then return nil, "No response from tag" end
-		local recv = string.sub(response,count, iLen+count-1)
-	    return recv
-	end
-	return nil, "No response from device"
+    local response = core.WaitForResponseTimeout(cmds.CMD_ACK,1000)
+    if response then
+        local count,cmd,arg0,arg1,arg2 = bin.unpack('LLLL',response)
+
+        local iLen = arg0
+        if iSelect then iLen = arg1 end
+        debug(("Received %i octets (arg0:%d, arg1:%d)"):format(iLen, arg0, arg1))
+        if iLen == 0 then return nil, "No response from tag" end
+        local recv = string.sub(response,count, iLen+count-1)
+        return recv
+    end
+    return nil, "No response from device"
 end
 
 
 local function show(data)
-	if DEBUG then
-	    local formatString = ("H%d"):format(string.len(data))
-	    local _,hexdata = bin.unpack(formatString, data)
-	    debug("Hexdata" , hexdata)
-	end
+    if DEBUG then
+        local formatString = ("H%d"):format(string.len(data))
+        local _,hexdata = bin.unpack(formatString, data)
+        debug("Hexdata" , hexdata)
+    end
 end
 --- Fire up a connection with a tag, return uid
 -- @return UID if successfull
 -- @return nil, errormessage if unsuccessfull
 
 local function open()
-	debug("Opening connection")
-	core.clearCommandBuffer()
-	local x = string.format("hf 14a raw -r -p -s")
-	debug(x)
-	core.console(x)	
-	debug("done")
-	data, err = waitCmd(true)
-	if err then return oops(err) end		
-	show(data)
-	local formatString = ("H%d"):format(string.len(data))
-	local _,uid = bin.unpack(formatString, data)
-	return uid
+    debug("Opening connection")
+    core.clearCommandBuffer()
+    local x = string.format("hf 14a raw -r -p -s")
+    debug(x)
+    core.console(x)
+    debug("done")
+    data, err = waitCmd(true)
+    if err then return oops(err) end
+    show(data)
+    local formatString = ("H%d"):format(string.len(data))
+    local _,uid = bin.unpack(formatString, data)
+    return uid
 end
 --- Shut down tag communication
 -- return no return values
 local function close()
-	debug("Closing connection")
-	core.clearCommandBuffer()
-	local x = string.format("hf 14a raw -r")
-	debug(x)
-	core.console(x)	
-	debug("done")
-	--data, err = waitCmd(true)
-	--data, err = waitCmd(false)
+    debug("Closing connection")
+    core.clearCommandBuffer()
+    local x = string.format("hf 14a raw -r")
+    debug(x)
+    core.console(x)
+    debug("done")
+    --data, err = waitCmd(true)
+    --data, err = waitCmd(false)
 
 end
 
@@ -143,105 +143,105 @@ end
 -- @return {block, block+1, block+2, block+3} if successfull
 -- @return nil, errormessage if unsuccessfull
 local function getBlock(block)
-	local data, err
+    local data, err
 
-	core.clearCommandBuffer()
-	
-	local x = string.format("hf 14a raw -r -c -p 30 %02x", block)
-	debug(x)
-	core.console(x)	
-	debug("done")
-	-- By now, there should be an ACK waiting from the device, since 
-	-- we used the -r flag (don't read response).
+    core.clearCommandBuffer()
 
-	data, err = waitCmd(false)
-	if err then return oops(err) end
-	show(data)
-	
-	if string.len(data) < 18 then
-		return nil, ("Expected at least 18 bytes, got %d - this tag is not NDEF-compliant"):format(string.len(data))
-	end
-	-- Now, parse out the block data
-	-- 0534 00B9 049C AD7F 4A00 0000 E110 1000 2155
-	-- b0b0 b0b0 b1b1 b1b1 b2b2 b2b2 b3b3 b3b3 CRCC
-	b0 = string.sub(data,1,4)
-	b1 = string.sub(data,5,8)
-	b2 = string.sub(data,9,12)
-	b3 = string.sub(data,13,16)
-	return {b0,b1,b2,b3}
+    local x = string.format("hf 14a raw -r -c -p 30 %02x", block)
+    debug(x)
+    core.console(x)
+    debug("done")
+    -- By now, there should be an ACK waiting from the device, since
+    -- we used the -r flag (don't read response).
+
+    data, err = waitCmd(false)
+    if err then return oops(err) end
+    show(data)
+
+    if string.len(data) < 18 then
+        return nil, ("Expected at least 18 bytes, got %d - this tag is not NDEF-compliant"):format(string.len(data))
+    end
+    -- Now, parse out the block data
+    -- 0534 00B9 049C AD7F 4A00 0000 E110 1000 2155
+    -- b0b0 b0b0 b1b1 b1b1 b2b2 b2b2 b3b3 b3b3 CRCC
+    b0 = string.sub(data,1,4)
+    b1 = string.sub(data,5,8)
+    b2 = string.sub(data,9,12)
+    b3 = string.sub(data,13,16)
+    return {b0,b1,b2,b3}
 end
 
 
 
 
 local function main( args)
-	debug("script started")
-	local err, data, data2,k,v,i
-	-- Read the parameters
-	for o, a in getopt.getopt(args, 'hd') do
-		if o == "h" then help() return end
-		if o == "d" then DEBUG = true end
-	end
+    debug("script started")
+    local err, data, data2,k,v,i
+    -- Read the parameters
+    for o, a in getopt.getopt(args, 'hd') do
+        if o == "h" then help() return end
+        if o == "d" then DEBUG = true end
+    end
 
-	-- Info contained within the tag (block 0 example)
-	-- 0534 00B9 049C AD7F 4A00 0000 E110 1000 2155
-	-- b0b0 b0b0 b1b1 b1b1 b2b2 b2b2 b3b3 b3b3 CRCC	
-	-- MM?? ???? ???? ???? ???? ???? NNVV SS?? ----
-	-- M = Manufacturer info
-	-- N = NDEF-Structure-Compliant (if value is E1)
-	-- V = NFC Forum Specification version (if 10 = v1.0)
+    -- Info contained within the tag (block 0 example)
+    -- 0534 00B9 049C AD7F 4A00 0000 E110 1000 2155
+    -- b0b0 b0b0 b1b1 b1b1 b2b2 b2b2 b3b3 b3b3 CRCC
+    -- MM?? ???? ???? ???? ???? ???? NNVV SS?? ----
+    -- M = Manufacturer info
+    -- N = NDEF-Structure-Compliant (if value is E1)
+    -- V = NFC Forum Specification version (if 10 = v1.0)
 
-	-- First, 'connect' (fire up the field) and get the uid
-	local uidHexstr = open()
+    -- First, 'connect' (fire up the field) and get the uid
+    local uidHexstr = open()
 
-	-- First, get blockt 3 byte 2
-	local blocks, err = getBlock(0)
-	if err then return oops(err) end
-	-- Block 3 contains number of blocks
-	local b3chars = {string.byte(blocks[4], 1,4)}
-	local numBlocks = b3chars[3] * 2 + 6
-	prlog("Number of blocks:", numBlocks)
+    -- First, get blockt 3 byte 2
+    local blocks, err = getBlock(0)
+    if err then return oops(err) end
+    -- Block 3 contains number of blocks
+    local b3chars = {string.byte(blocks[4], 1,4)}
+    local numBlocks = b3chars[3] * 2 + 6
+    prlog("Number of blocks:", numBlocks)
 
-	-- NDEF compliant?
-	if b3chars[1] ~= 0xE1 then 
-		return oops("This tag is not NDEF-Compliant")
-	end 
+    -- NDEF compliant?
+    if b3chars[1] ~= 0xE1 then
+        return oops("This tag is not NDEF-Compliant")
+    end
 
-	local ndefVersion = b3chars[2] 	
+    local ndefVersion = b3chars[2]
 
-	-- Block 1, byte 1 contains manufacturer info
-	local bl1_b1 = string.byte(blocks[1], 1)
-	local manufacturer = taglib.lookupManufacturer(bl1_b1)
+    -- Block 1, byte 1 contains manufacturer info
+    local bl1_b1 = string.byte(blocks[1], 1)
+    local manufacturer = taglib.lookupManufacturer(bl1_b1)
 
-	-- Reuse existing info
-	local blockData = {blocks[1],blocks[2],blocks[3],blocks[4]}
+    -- Reuse existing info
+    local blockData = {blocks[1],blocks[2],blocks[3],blocks[4]}
 
 
-	--[[ Due to the infineon my-d move bug 
-	(if I send 30 0F i receive block0f+block00+block01+block02 insted of block0f+block10+block11+block12) 
-	the only way to avoid this is to send the read command as many times as block numbers 
-	removing bytes from 5 to 18 from each answer.
-	--]]
-	prlog("Dumping data...please wait")
-	for i=4,numBlocks-1,1 do
-		blocks, err = getBlock(i)
-		if err then return oops(err) end
-		table.insert(blockData,blocks[1])
-	end
-	-- Deactivate field
-	close()
-	-- Print results
-	prlog(string.format("Tag manufacturer: %s", manufacturer))
-	prlog(string.format("Tag UID: %s", uidHexstr))
-	prlog(string.format("Tag NDEF version: 0x%02x", ndefVersion))
-	
-	for k,v in ipairs(blockData) do
-		prlog(string.format("Block %02x: %02x %02x %02x %02x",k-1, string.byte(v, 1,4)))
-	end
-	local filename, err = utils.writeDumpFile(uidHexstr, blockData)
-	if err then return oops(err) end
+    --[[ Due to the infineon my-d move bug
+    (if I send 30 0F i receive block0f+block00+block01+block02 insted of block0f+block10+block11+block12)
+    the only way to avoid this is to send the read command as many times as block numbers
+    removing bytes from 5 to 18 from each answer.
+    --]]
+    prlog("Dumping data...please wait")
+    for i=4,numBlocks-1,1 do
+        blocks, err = getBlock(i)
+        if err then return oops(err) end
+        table.insert(blockData,blocks[1])
+    end
+    -- Deactivate field
+    close()
+    -- Print results
+    prlog(string.format("Tag manufacturer: %s", manufacturer))
+    prlog(string.format("Tag UID: %s", uidHexstr))
+    prlog(string.format("Tag NDEF version: 0x%02x", ndefVersion))
 
-	prlog(string.format("Dumped data into %s", filename))
+    for k,v in ipairs(blockData) do
+        prlog(string.format("Block %02x: %02x %02x %02x %02x",k-1, string.byte(v, 1,4)))
+    end
+    local filename, err = utils.writeDumpFile(uidHexstr, blockData)
+    if err then return oops(err) end
+
+    prlog(string.format("Dumped data into %s", filename))
 
 end
 main(args)
\ No newline at end of file
diff --git a/client/scripts/ntag_3d.lua b/client/scripts/ntag_3d.lua
index 278f800be..890f29d94 100644
--- a/client/scripts/ntag_3d.lua
+++ b/client/scripts/ntag_3d.lua
@@ -12,25 +12,25 @@ Thanks to @jack for his invaluable input on some of the configuration.
 example =[[
      -- This will generate GOLD, PLA, TH, EU, 200m,  tagbased uid.
      script run ntag_3d -c 46 -m 50 -p 5448 -s 4555  -l 200
-	 
+
      -- This will generate GOLD, PLA, TH, EU, 200m,  userbased uid.
      script run ntag_3d -u 11223344556677 -c 46 -m 50 -p 5448 -s 4555  -l 200
-	 
-	 -- This will generate GOLD, PLA, TH, EU, 200m,  userbased uid. and configure a MAGIC NTAG.
-     script run ntag_3d -u 11223344556677 -c 46 -m 50 -p 5448 -s 4555  -l 200 -1	 
+
+     -- This will generate GOLD, PLA, TH, EU, 200m,  userbased uid. and configure a MAGIC NTAG.
+     script run ntag_3d -u 11223344556677 -c 46 -m 50 -p 5448 -s 4555  -l 200 -1
 ]]
 usage = [[
 script run calc_ntag_3d -h -t -u <uid> -c <color> -m <material> -p <region> -s <region> -l <length>
 
 Arguments:
-	-h             : this help
-	-t             : selftest
-	-u <UID>       : UID
-	-c <COLOR>     : color of filament
-	-m <MATERIAL>  : material of filament
-	-p <REGION>    : Manufacturer region
-	-s <REGION>    : Sales region
-	-l <LENGTH>    : Spool length.  Use only 100,200,300.   300 has problems on OSX
+    -h             : this help
+    -t             : selftest
+    -u <UID>       : UID
+    -c <COLOR>     : color of filament
+    -m <MATERIAL>  : material of filament
+    -p <REGION>    : Manufacturer region
+    -s <REGION>    : Sales region
+    -l <LENGTH>    : Spool length.  Use only 100,200,300.   300 has problems on OSX
 ]]
 
 local DEBUG = true
@@ -40,344 +40,344 @@ local band = bit32.band
 local rshift = bit32.rshift
 
 local _regions = {
-	{'4742', 'GB'},
-	{'5457', 'TW'},
-	{'4555', 'EU'},
-	{'5553', 'US'},
-	{'454E', 'EN'},
-	{'4A50', 'JP'},
-	{'434E', 'CN'},
-	{'5448', 'TH'},
-	{'4153', 'AS'},
-	{'5246', 'RF'},
-	{'4746', 'GF'},
-	{'4341', 'CA'},
-	{'504D', 'PM'},
-	{'5044', 'PD'},
+    {'4742', 'GB'},
+    {'5457', 'TW'},
+    {'4555', 'EU'},
+    {'5553', 'US'},
+    {'454E', 'EN'},
+    {'4A50', 'JP'},
+    {'434E', 'CN'},
+    {'5448', 'TH'},
+    {'4153', 'AS'},
+    {'5246', 'RF'},
+    {'4746', 'GF'},
+    {'4341', 'CA'},
+    {'504D', 'PM'},
+    {'5044', 'PD'},
 }
 local _manufacturers = {
-	{'5457', 'TW'},
-	{'434E', 'CN'},
-	{'5448', 'TH'},
+    {'5457', 'TW'},
+    {'434E', 'CN'},
+    {'5448', 'TH'},
 }
 local _sales = {
-	{'4742', 'GB'},
-	{'4555', 'EU'},
-	{'5553', 'US'},
-	{'454E', 'EN'},
-	{'504D', 'PM'},
+    {'4742', 'GB'},
+    {'4555', 'EU'},
+    {'5553', 'US'},
+    {'454E', 'EN'},
+    {'504D', 'PM'},
 }
 local _materials = {
-	{'20', 'Other material'},
-	{'41', 'ABS'},
-	{'46', 'Flexible TPE Tree'},
-	{'46', 'TPE'},
-	{'46', 'PVA'},
-	{'47', 'PETG'},	
-	{'50', 'PLA'},
-	{'51', 'PLA'},
-	{'54', 'Tough PLA'},
-	{'55', 'UVCR'},
-	{'56', 'Water Soluble PVA'},
+    {'20', 'Other material'},
+    {'41', 'ABS'},
+    {'46', 'Flexible TPE Tree'},
+    {'46', 'TPE'},
+    {'46', 'PVA'},
+    {'47', 'PETG'},
+    {'50', 'PLA'},
+    {'51', 'PLA'},
+    {'54', 'Tough PLA'},
+    {'55', 'UVCR'},
+    {'56', 'Water Soluble PVA'},
 }
 local _colors = {
-	{'30', 'Bronze'},
-	{'31', 'Silver'},
-	{'32', 'Clear Red'},
-	{'33', 'Clear'},
-	{'34', 'Bottle Green'},
-	{'35', 'Neon Magenta'},
-	{'36', 'SteelBlue'},
-	{'37', 'Sun Orange'},
-	{'38', 'Pearl White'},
-	{'39', 'Copper'},
-	{'41', 'Purple'},
-	{'42', 'Blue'},
-	{'43', 'Neon Tangerine'},
-	{'44', 'Viridity'},
-	{'45', 'Olivine'},
-	{'46', 'Gold'},
-	{'47', 'Green'},
-	{'48', 'Neon Green'},
-	{'49', 'Snow White'},
-	{'4A', 'Neon Yellow'},
-	{'4B', 'Black'},
-	{'4C', 'Violet'},
-	{'4D', 'Grape Purple'},
-	{'4E', 'Purpurine'},
-	{'4F', 'Clear Yellow'},
-	{'50', 'Clear Green'},
-	{'51', 'Clear Tangerine'},
-	{'52', 'Red'},
-	{'53', 'Cyber Yellow'},
-	{'54', 'Tangerine'},
-	{'55', 'Clear Blue'},
-	{'56', 'Clear Purple'},
-	{'57', 'White'},
-	{'58', 'Clear Magenta'},
-	{'59', 'Yellow'},
-	{'5A', 'Nature'},
+    {'30', 'Bronze'},
+    {'31', 'Silver'},
+    {'32', 'Clear Red'},
+    {'33', 'Clear'},
+    {'34', 'Bottle Green'},
+    {'35', 'Neon Magenta'},
+    {'36', 'SteelBlue'},
+    {'37', 'Sun Orange'},
+    {'38', 'Pearl White'},
+    {'39', 'Copper'},
+    {'41', 'Purple'},
+    {'42', 'Blue'},
+    {'43', 'Neon Tangerine'},
+    {'44', 'Viridity'},
+    {'45', 'Olivine'},
+    {'46', 'Gold'},
+    {'47', 'Green'},
+    {'48', 'Neon Green'},
+    {'49', 'Snow White'},
+    {'4A', 'Neon Yellow'},
+    {'4B', 'Black'},
+    {'4C', 'Violet'},
+    {'4D', 'Grape Purple'},
+    {'4E', 'Purpurine'},
+    {'4F', 'Clear Yellow'},
+    {'50', 'Clear Green'},
+    {'51', 'Clear Tangerine'},
+    {'52', 'Red'},
+    {'53', 'Cyber Yellow'},
+    {'54', 'Tangerine'},
+    {'55', 'Clear Blue'},
+    {'56', 'Clear Purple'},
+    {'57', 'White'},
+    {'58', 'Clear Magenta'},
+    {'59', 'Yellow'},
+    {'5A', 'Nature'},
 }
 ---
 --
 local function find( arr, name )
-	if not name then return nil end
+    if not name then return nil end
     name = name:lower()
     for k, v in pairs(arr) do
-		if ( v[2]:lower() == name or v[1]:lower() == name ) then
-			return v
-		end
-	end
-	return nil
+        if ( v[2]:lower() == name or v[1]:lower() == name ) then
+            return v
+        end
+    end
+    return nil
 end
 ---
 --
 local function list( arr, desc )
-	print ('Value\t'..desc)
-	print (string.rep('=', 20))
+    print ('Value\t'..desc)
+    print (string.rep('=', 20))
     for k, v in pairs(arr) do
-		print(("%s\t%s"):format(v[1],v[2]))
-	end 
+        print(("%s\t%s"):format(v[1],v[2]))
+    end
 end
---- 
+---
 -- A debug printout-function
 local function dbg(args)
-	if not DEBUG then return end
-	
-	if type(args) == 'table' then
-		local i = 1
-		while result[i] do
-			dbg(result[i])
-			i = i+1
-		end
-	else
-		print('###', args)
-	end
-end 
---- 
+    if not DEBUG then return end
+
+    if type(args) == 'table' then
+        local i = 1
+        while result[i] do
+            dbg(result[i])
+            i = i+1
+        end
+    else
+        print('###', args)
+    end
+end
+---
 -- This is only meant to be used when errors occur
 local function oops(err)
-	print('ERROR: ',err)
-	return nil,err
+    print('ERROR: ',err)
+    return nil,err
 end
---- 
+---
 -- Usage help
 local function help()
-	print(copyright)
-	print(version)	
-	print(desc)
-	print('Example usage')
-	print(example)
+    print(copyright)
+    print(version)
+    print(desc)
+    print('Example usage')
+    print(example)
 end
 --
 -- Exit message
 local function ExitMsg(msg)
-	print( string.rep('--',20) )
-	print( string.rep('--',20) )
-	print(msg)
-	print()
+    print( string.rep('--',20) )
+    print( string.rep('--',20) )
+    print(msg)
+    print()
 end
 ---
 --
 local function write_tag(uid, t)
 
-	print('Writing to tag')
-	core.console('hf mf dbg 0')
-	
-	local cmd = ''
-	local pwd, pack = core.keygen_algo_d(uid)
-	
-	for i= 8, 23 do
-		cmd = ('hf mfu wrbl b %02d d %s k %08X'):format(i, t[i], pwd)
-		core.console(cmd)
-	end
-	
-	--cfg1
-	core.console(('hf mfu wrbl b 42 d %s k %08X'):format(t[42], pwd))
-	--cfg0
-	core.console(('hf mfu wrbl b 41 d %s k %08X'):format(t[41], pwd))
-	--dynamic	
-	core.console(('hf mfu wrbl b 40 d %s k %08X'):format(t[40], pwd))
-	
-	core.console('hf mf dbg 1')
-	print('Done')	
+    print('Writing to tag')
+    core.console('hf mf dbg 0')
+
+    local cmd = ''
+    local pwd, pack = core.keygen_algo_d(uid)
+
+    for i= 8, 23 do
+        cmd = ('hf mfu wrbl b %02d d %s k %08X'):format(i, t[i], pwd)
+        core.console(cmd)
+    end
+
+    --cfg1
+    core.console(('hf mfu wrbl b 42 d %s k %08X'):format(t[42], pwd))
+    --cfg0
+    core.console(('hf mfu wrbl b 41 d %s k %08X'):format(t[41], pwd))
+    --dynamic
+    core.console(('hf mfu wrbl b 40 d %s k %08X'):format(t[40], pwd))
+
+    core.console('hf mf dbg 1')
+    print('Done')
 end
 ---
 -- configures a magic NTAG for NTAG213, with UID and PWD,PACK.
 local function configure_magic_ntag(uid)
 
-	print('Configuring MAGIC NTAG')
-	-- Save the global args, those are *our* arguments
-	local myargs = args
-	
-	local pwd, pack = core.keygen_algo_d(uid)
-	
-	-- Set the arguments for mfu_magic script v1.0.8
-	-- -t 12   == configure NTAG213F
-	-- -u    == set UID
-	-- -p    == set pwd
-	-- -a    == set pack
-	args =('-t 12 -u %s -p %08X -a %04X'):format(uid, pwd, pack)
-	require('../scripts/mfu_magic')
-	
-	-- Set back args. Not that it's used, just for the karma... 
-	args = myargs
-	
-	print('Done')
+    print('Configuring MAGIC NTAG')
+    -- Save the global args, those are *our* arguments
+    local myargs = args
+
+    local pwd, pack = core.keygen_algo_d(uid)
+
+    -- Set the arguments for mfu_magic script v1.0.8
+    -- -t 12   == configure NTAG213F
+    -- -u    == set UID
+    -- -p    == set pwd
+    -- -a    == set pack
+    args =('-t 12 -u %s -p %08X -a %04X'):format(uid, pwd, pack)
+    require('../scripts/mfu_magic')
+
+    -- Set back args. Not that it's used, just for the karma...
+    args = myargs
+
+    print('Done')
 end
 ---
 -- generates random hex numbers between 31-39
 local function random_num_hex(length)
-	local str = ""
-	local i
-	for i = 1, length, 1 do
-		str = str..math.random(31, 39)
-	end
-	return str
+    local str = ""
+    local i
+    for i = 1, length, 1 do
+        str = str..math.random(31, 39)
+    end
+    return str
 end
 ---
 --
 local function nwo( val )
-	local b1 = band(val, 0xFF)
-	local b2 = band( rshift(val,  8), 0xFF)
-	local b3 = band( rshift(val, 16), 0xFF)
-	local b4 = band( rshift(val, 24), 0xFF)
-	return ('%02X%02X%02X%02X'):format(b1, b2, b3, b4)
+    local b1 = band(val, 0xFF)
+    local b2 = band( rshift(val,  8), 0xFF)
+    local b3 = band( rshift(val, 16), 0xFF)
+    local b4 = band( rshift(val, 24), 0xFF)
+    return ('%02X%02X%02X%02X'):format(b1, b2, b3, b4)
 end
 ---
 -- NTAG213 template
 local function template_NTAG213(uid, material, color, length, manufacture, sales)
-	local pwd, pack = core.keygen_algo_d(uid)
+    local pwd, pack = core.keygen_algo_d(uid)
 
-	local m = tonumber(length, 10) * 1000
-	local m_str = nwo(m)
-	
-	local t = {}
-	-- default empty file
-	for i = 0,42 do
-		t[i] = '00000000'
-	end
---	t[4]  = '0103A00C' --
---	t[5]  = '340300FE' -- 
+    local m = tonumber(length, 10) * 1000
+    local m_str = nwo(m)
+
+    local t = {}
+    -- default empty file
+    for i = 0,42 do
+        t[i] = '00000000'
+    end
+--  t[4]  = '0103A00C' --
+--  t[5]  = '340300FE' --
 -- 6,7
-	t[8]  = '5A'..material..color..'00'  -- 5A, material, color, 00
-	t[9]  = '00'..random_num_hex(3)  -- 00, three bytes serial number
-	t[10] = m_str  -- total capacity
-	t[11] = m_str  -- total capacity
-	t[12] = 'D2002D00'  -- fixed
-	t[13] = manufacture..sales  -- regioner, 
-	t[14] = random_num_hex(4)  -- serial number
+    t[8]  = '5A'..material..color..'00'  -- 5A, material, color, 00
+    t[9]  = '00'..random_num_hex(3)  -- 00, three bytes serial number
+    t[10] = m_str  -- total capacity
+    t[11] = m_str  -- total capacity
+    t[12] = 'D2002D00'  -- fixed
+    t[13] = manufacture..sales  -- regioner,
+    t[14] = random_num_hex(4)  -- serial number
 -- 15,16
-	t[17] = '34000000' -- fixed
+    t[17] = '34000000' -- fixed
 -- 18,19
-	-- remaining capacity of spool
-	t[20] = m_str
-	t[21] = nwo( bxor(  m, 0x54321248))
-	t[22] = nwo( bxor( (m - 3876923 ), 0x31275455))
-	t[23] = nwo( bxor( (m + 6923923 ), 0x76235481))
--- 24-39	
-	t[40] = '000000BD' --dynamic
-	t[41] = '07000008' --cfg0
-	t[42] = '80050000' --cfg1
-	t[43] = ('%08X'):format(pwd)
-	t[44] = ('%04X0000'):format(pack)
-	return t
+    -- remaining capacity of spool
+    t[20] = m_str
+    t[21] = nwo( bxor(  m, 0x54321248))
+    t[22] = nwo( bxor( (m - 3876923 ), 0x31275455))
+    t[23] = nwo( bxor( (m + 6923923 ), 0x76235481))
+-- 24-39
+    t[40] = '000000BD' --dynamic
+    t[41] = '07000008' --cfg0
+    t[42] = '80050000' --cfg1
+    t[43] = ('%08X'):format(pwd)
+    t[44] = ('%04X0000'):format(pack)
+    return t
 end
 ---
 -- outputs the called arguments
 local function print_conf(uid, material, color, length, producer, sales )
-	print('Create tag as following')
-	print( string.rep('--',16) )
-	print('UID           ', uid)
-	print('Material      ', material[2])
-	print('Color         ', color[2])
-	print('Spool length  ', length)
-	print('Region')
-	print('  manufacturer', producer[2])
-	print('  sales       ', sales[2])
-	print( string.rep('--',16) )	
+    print('Create tag as following')
+    print( string.rep('--',16) )
+    print('UID           ', uid)
+    print('Material      ', material[2])
+    print('Color         ', color[2])
+    print('Spool length  ', length)
+    print('Region')
+    print('  manufacturer', producer[2])
+    print('  sales       ', sales[2])
+    print( string.rep('--',16) )
 end
 ---
 -- self test
-local function selftest()	
-	list(_regions, 'Regions')
-	list(_materials, 'Materials')
-	list(_colors, 'Colors')
-	return nil
+local function selftest()
+    list(_regions, 'Regions')
+    list(_materials, 'Materials')
+    list(_colors, 'Colors')
+    return nil
 end
---- 
+---
 -- The main entry point
 local function main(args)
 
-	math.randomseed(os.time());
-	math.random();
+    math.randomseed(os.time());
+    math.random();
 
-	print( string.rep('--',20) )
-	print( string.rep('--',20) )	
-	print()
-						
-	local uid = '04C5DF4A6D5180'
-	local useUID = false
-	local useMAGIC = false
-	local material, color, length, producer, sales
-	
-	if #args == 0 then return help() end
+    print( string.rep('--',20) )
+    print( string.rep('--',20) )
+    print()
 
-	-- Read the parameters
-	for o, a in getopt.getopt(args, 'ht1u:l:m:c:p:s:') do
-		if o == "h" then return help() end
-		if o == "t" then return selftest() end
-		if o == "u" then uid = a; useUID = true end
-		if o == "m" then material = a end
-		if o == "c" then color = a end
-		if o == "l" then length = tonumber(a) end
-		if o == "p" then producer = a end
-		if o == "s" then sales = a end
-		if o == "1" then useMAGIC = true end
-	end
+    local uid = '04C5DF4A6D5180'
+    local useUID = false
+    local useMAGIC = false
+    local material, color, length, producer, sales
 
-	color = find(_colors, color)
-	if not color then list(_colors, 'Colors'); return oops('\n\nNot valid color') end
-	
-	material = find(_materials, material)
-	if not material then list(_materials, 'Materials'); return oops('\n\nNot valid material') end
-	
-	producer = find(_manufacturers, producer)
-	if not producer then list(_manufacturers, 'Regions Manufacturers'); return oops('\n\nNo valid manufacturer region') end
+    if #args == 0 then return help() end
 
-	sales = find(_sales, sales)
-	if not sales then list(_sales, 'Regions Sales'); return oops('\n\nNo valid sales region') end
-	
-	if length > 300 then
-		return oops('\n\nNot valid spool length. Must be lesser than 300')
-	end
-	
-	if useUID then
-		-- uid string checks
-		if uid == nil then return oops('empty uid string') end
-		if #uid == 0 then return oops('empty uid string') end
-		if #uid ~= 14 then return oops('uid wrong length. Should be 7 hex bytes') end
-	else
-		-- GET TAG UID	
-		local tag, err = lib14a.read(false, true)
-		if not tag then return oops(err) end
-		core.clearCommandBuffer()
-		uid = tag.uid	
-	end
+    -- Read the parameters
+    for o, a in getopt.getopt(args, 'ht1u:l:m:c:p:s:') do
+        if o == "h" then return help() end
+        if o == "t" then return selftest() end
+        if o == "u" then uid = a; useUID = true end
+        if o == "m" then material = a end
+        if o == "c" then color = a end
+        if o == "l" then length = tonumber(a) end
+        if o == "p" then producer = a end
+        if o == "s" then sales = a end
+        if o == "1" then useMAGIC = true end
+    end
 
-	--print
-	print_conf(uid, material, color, length, producer, sales )
-	
-	-- create template
-	local t = template_NTAG213(uid, material[1], color[1], length, producer[1], sales[1])
+    color = find(_colors, color)
+    if not color then list(_colors, 'Colors'); return oops('\n\nNot valid color') end
 
-	-- using MAGIC NTAG
-	if useMAGIC then
-		configure_magic_ntag(uid)
-	end
-	
-	-- write template data to tag
-	write_tag(uid, t)
+    material = find(_materials, material)
+    if not material then list(_materials, 'Materials'); return oops('\n\nNot valid material') end
+
+    producer = find(_manufacturers, producer)
+    if not producer then list(_manufacturers, 'Regions Manufacturers'); return oops('\n\nNo valid manufacturer region') end
+
+    sales = find(_sales, sales)
+    if not sales then list(_sales, 'Regions Sales'); return oops('\n\nNo valid sales region') end
+
+    if length > 300 then
+        return oops('\n\nNot valid spool length. Must be lesser than 300')
+    end
+
+    if useUID then
+        -- uid string checks
+        if uid == nil then return oops('empty uid string') end
+        if #uid == 0 then return oops('empty uid string') end
+        if #uid ~= 14 then return oops('uid wrong length. Should be 7 hex bytes') end
+    else
+        -- GET TAG UID
+        local tag, err = lib14a.read(false, true)
+        if not tag then return oops(err) end
+        core.clearCommandBuffer()
+        uid = tag.uid
+    end
+
+    --print
+    print_conf(uid, material, color, length, producer, sales )
+
+    -- create template
+    local t = template_NTAG213(uid, material[1], color[1], length, producer[1], sales[1])
+
+    -- using MAGIC NTAG
+    if useMAGIC then
+        configure_magic_ntag(uid)
+    end
+
+    -- write template data to tag
+    write_tag(uid, t)
 end
 
 main(args)
\ No newline at end of file
diff --git a/client/scripts/parameters.lua b/client/scripts/parameters.lua
index fa260204f..f51266f7f 100644
--- a/client/scripts/parameters.lua
+++ b/client/scripts/parameters.lua
@@ -6,40 +6,40 @@ getopt = require('getopt')
 usage = "script run parameters.lua -a 1 -blala -c -de"
 author = "Martin Holst Swende"
 desc =[[
-This is an example script to demonstrate handle parameters in scripts. 
+This is an example script to demonstrate handle parameters in scripts.
 For more info, check the comments in the code
 ]]
 
 local function main(args)
 
-	print(desc)
-	print("These parameters were passed")
-	--[[
-	When passing parameters, 
-	x:		means that a value should follow x
-	y		means that 'y' is a flag, either on or off
-	So, the string a:b:def means that we support up to 
-	5 parameters; two with values and three flags. The following 
-	should be valid: 
+    print(desc)
+    print("These parameters were passed")
+    --[[
+    When passing parameters,
+    x:      means that a value should follow x
+    y       means that 'y' is a flag, either on or off
+    So, the string a:b:def means that we support up to
+    5 parameters; two with values and three flags. The following
+    should be valid:
 
-	script run parameters.lua -a 1 -blala -c -de
+    script run parameters.lua -a 1 -blala -c -de
 
-	Notice two things:
-	1. 'blala' works just like 'b lala', both set 'b' to 'lala'
-	2. Flags can be put together, '-de' is the same as '-d -e'
-	3. The format -b=lala is *not* supported
-	4. The format b lala (without -) is *not* supported
-	--]]
+    Notice two things:
+    1. 'blala' works just like 'b lala', both set 'b' to 'lala'
+    2. Flags can be put together, '-de' is the same as '-d -e'
+    3. The format -b=lala is *not* supported
+    4. The format b lala (without -) is *not* supported
+    --]]
 
-	for o, a in getopt.getopt(args, 'a:b:ced') do
-		print(o, a)
-	end
+    for o, a in getopt.getopt(args, 'a:b:ced') do
+        print(o, a)
+    end
 end
 
 
 --[[
-In the future, we may implement so that scripts are invoked directly 
+In the future, we may implement so that scripts are invoked directly
 into a 'main' function, instead of being executed blindly. For future
-compatibility, I have done so, but I invoke my main from here.  
+compatibility, I have done so, but I invoke my main from here.
 --]]
 main(args)
\ No newline at end of file
diff --git a/client/scripts/read_pwd_mem.lua b/client/scripts/read_pwd_mem.lua
index a0688a639..4611c32cc 100644
--- a/client/scripts/read_pwd_mem.lua
+++ b/client/scripts/read_pwd_mem.lua
@@ -1,141 +1,141 @@
-local getopt = require('getopt')
-local bin = require('bin')
-
-copyright = 'Copyright (c) 2018 Bogito. All rights reserved.'
-author = "Bogito"
-version = 'v1.0.1'
-desc =
-[[
-This script will read the flash memory of RDV4 and print the stored passwords.
-It was meant to be used as a help tool after using the BogRun standalone mode.
-
-(Iceman) script adapted to read and print keys in the default dictionary flashmemory sections.
-]]
-usage = 
-[[
-Usage:
-	script run read_pwd_mem -h -o <offset> -l <length> -k <keylength>
-
-Arguments:
-	-h              :  this help
-	-o <offset>     :  memory offset, default is 0
-	-l <length>     :  length in bytes, default is 256
-	-k <keylen>     :  key length in bytes <4|6|8> ,  default is 4
-	-m              :  print Mifare dictionary keys
-	-t              :  print t55xx dictionary passwords
-	-i              :  print iClass dictionary keys
-]]
-example =
-[[
-	-- This will scan the first 256 bytes of flash memory for stored passwords
-	script run read_pwd_mem
-
-	-- This will scan 256 bytes of flash memory at offset 64 for stored passwords
-	script run read_pwd_mem -o 64
-
-	-- This will scan 32 bytes of flash memory at offset 64 for stored passwords
-	script run read_pwd_mem -o 64 -l 32
-	
-	-- This will print found
-	script run read_pwd_mem -o 241664 -k 6
-]]
---- 
--- This is only meant to be used when errors occur
-local function oops(err)
-	print("ERROR: ", err)
-	return nil, err
-end
----
--- Usage help
-local function help()
-	print(copyright)
-	print(version)
-	print(desc)
-	print(usage)
-	print('Example usage:')
-	print(example)
-end
----
--- The main entry point
-local function main(args)
-
-	print( string.rep('--',20) )
-	print( string.rep('--',20) )
-	print()
-	
-	local data, err, quadlet
-	local cnt = 0
-	local offset = 0
-	local length = 256
-	local keylength = 4
-	local usedkey = false
-	
-	for o, a in getopt.getopt(args, 'ho:l:k:mti') do
-	
-		-- help
-		if o == "h" then return help() end
-		
-		-- offset
-		if o == "o" then offset = tonumber(a) end
-		
-		-- num of bytes to read
-		if o == "l" then length = tonumber(a) end
-		
-		-- keylength
-		if o == "k" then keylength = tonumber(a); usedkey = true end
-		
-		if o == "m" then keylength =6; usedkey = true; offset = 0x3F000-0x4000; end
-		if o == "t" then keylength =4; usedkey = true; offset = 0x3F000-0x3000; end
-		if o == "i" then keylength =8; usedkey = true; offset = 0x3F000-0x5000; end
-	end
-	
-	if length < 0 or length > 256 then
-		return oops('Error: Length is not valid. Must be less than 256')
-	end
-	
-	if (offset < 0) or (offset % 4 ~= 0) then
-		return oops('Error: Offset is not valid. Mod-4 values are only allowed.')
-	end
-	
-	print('Memory offset', offset)
-	print('Length       ', length)
-	print('Key length   ', keylength)
-	print( string.rep('--',20) )
-
-	if usedkey then length = 4096 end
-	
-	data, err = core.GetFromFlashMem(offset, length)	
-	if err then return oops(err) end
-
-	if usedkey then
-	
-		_, keys, s = bin.unpack('SH'..length-2, data)
-		if keys == 0xFFFF then return "No keys found in section" end
-		
-		local kl = keylength * 2	
-		for i = 1, keys do
-		
-			key  = string.sub(s, (i - 1) * kl + 1, i * kl )
-			print(string.format("[%02d] %s",i, key))
-		end	
-		print( string.rep('--',20) )
-		print( ('[+] found %d passwords'):format(keys))		
-	else
-	
-		_, s = bin.unpack('H'..length, data)
-		
-		local cnt = 0, i
-		for i = 1, (length/keylength) do
-		
-			key  = string.sub(s, (i-1)*8+1, i*8)
-			if key == "FFFFFFFF" then break end
-			print(string.format("[%02d] %s",i, key))
-			cnt = cnt + 1
-		end
-		print( string.rep('--',20) )
-		print( ('[+] found %d passwords'):format(cnt))
-	end
-	print( string.rep('--',20) )	
-end
-
-main(args)
+local getopt = require('getopt')
+local bin = require('bin')
+
+copyright = 'Copyright (c) 2018 Bogito. All rights reserved.'
+author = "Bogito"
+version = 'v1.0.1'
+desc =
+[[
+This script will read the flash memory of RDV4 and print the stored passwords.
+It was meant to be used as a help tool after using the BogRun standalone mode.
+
+(Iceman) script adapted to read and print keys in the default dictionary flashmemory sections.
+]]
+usage =
+[[
+Usage:
+    script run read_pwd_mem -h -o <offset> -l <length> -k <keylength>
+
+Arguments:
+    -h              :  this help
+    -o <offset>     :  memory offset, default is 0
+    -l <length>     :  length in bytes, default is 256
+    -k <keylen>     :  key length in bytes <4|6|8> ,  default is 4
+    -m              :  print Mifare dictionary keys
+    -t              :  print t55xx dictionary passwords
+    -i              :  print iClass dictionary keys
+]]
+example =
+[[
+    -- This will scan the first 256 bytes of flash memory for stored passwords
+    script run read_pwd_mem
+
+    -- This will scan 256 bytes of flash memory at offset 64 for stored passwords
+    script run read_pwd_mem -o 64
+
+    -- This will scan 32 bytes of flash memory at offset 64 for stored passwords
+    script run read_pwd_mem -o 64 -l 32
+
+    -- This will print found
+    script run read_pwd_mem -o 241664 -k 6
+]]
+---
+-- This is only meant to be used when errors occur
+local function oops(err)
+    print("ERROR: ", err)
+    return nil, err
+end
+---
+-- Usage help
+local function help()
+    print(copyright)
+    print(version)
+    print(desc)
+    print(usage)
+    print('Example usage:')
+    print(example)
+end
+---
+-- The main entry point
+local function main(args)
+
+    print( string.rep('--',20) )
+    print( string.rep('--',20) )
+    print()
+
+    local data, err, quadlet
+    local cnt = 0
+    local offset = 0
+    local length = 256
+    local keylength = 4
+    local usedkey = false
+
+    for o, a in getopt.getopt(args, 'ho:l:k:mti') do
+
+        -- help
+        if o == "h" then return help() end
+
+        -- offset
+        if o == "o" then offset = tonumber(a) end
+
+        -- num of bytes to read
+        if o == "l" then length = tonumber(a) end
+
+        -- keylength
+        if o == "k" then keylength = tonumber(a); usedkey = true end
+
+        if o == "m" then keylength =6; usedkey = true; offset = 0x3F000-0x4000; end
+        if o == "t" then keylength =4; usedkey = true; offset = 0x3F000-0x3000; end
+        if o == "i" then keylength =8; usedkey = true; offset = 0x3F000-0x5000; end
+    end
+
+    if length < 0 or length > 256 then
+        return oops('Error: Length is not valid. Must be less than 256')
+    end
+
+    if (offset < 0) or (offset % 4 ~= 0) then
+        return oops('Error: Offset is not valid. Mod-4 values are only allowed.')
+    end
+
+    print('Memory offset', offset)
+    print('Length       ', length)
+    print('Key length   ', keylength)
+    print( string.rep('--',20) )
+
+    if usedkey then length = 4096 end
+
+    data, err = core.GetFromFlashMem(offset, length)
+    if err then return oops(err) end
+
+    if usedkey then
+
+        _, keys, s = bin.unpack('SH'..length-2, data)
+        if keys == 0xFFFF then return "No keys found in section" end
+
+        local kl = keylength * 2
+        for i = 1, keys do
+
+            key  = string.sub(s, (i - 1) * kl + 1, i * kl )
+            print(string.format("[%02d] %s",i, key))
+        end
+        print( string.rep('--',20) )
+        print( ('[+] found %d passwords'):format(keys))
+    else
+
+        _, s = bin.unpack('H'..length, data)
+
+        local cnt = 0, i
+        for i = 1, (length/keylength) do
+
+            key  = string.sub(s, (i-1)*8+1, i*8)
+            if key == "FFFFFFFF" then break end
+            print(string.format("[%02d] %s",i, key))
+            cnt = cnt + 1
+        end
+        print( string.rep('--',20) )
+        print( ('[+] found %d passwords'):format(cnt))
+    end
+    print( string.rep('--',20) )
+end
+
+main(args)
diff --git a/client/scripts/remagic.lua b/client/scripts/remagic.lua
index 10e25583a..29e9a2c56 100644
--- a/client/scripts/remagic.lua
+++ b/client/scripts/remagic.lua
@@ -4,100 +4,100 @@ example = "script run remagic"
 author = "Iceman"
 desc =
 [[
-This is a script that tries to bring back a chinese magic card (1k generation1) 
+This is a script that tries to bring back a chinese magic card (1k generation1)
 from the dead when it's block 0 has been written with bad values.
 or mifare Ultralight magic card which answers to chinese backdoor commands
 
 Arguments:
-	-h		this help
-	-u		remagic a Ultralight tag w 7 bytes UID.
+    -h      this help
+    -u      remagic a Ultralight tag w 7 bytes UID.
 ]]
---- 
+---
 -- A debug printout-function
 local function dbg(args)
-	if DEBUG then
-		print('###', args)
-	end
-end 
---- 
+    if DEBUG then
+        print('###', args)
+    end
+end
+---
 -- This is only meant to be used when errors occur
 local function oops(err)
-	print('ERROR: ',err)
+    print('ERROR: ',err)
 end
---- 
+---
 -- Usage help
 local function help()
-	print(desc)
-	print('Example usage')
-	print(example)
+    print(desc)
+    print('Example usage')
+    print(example)
 end
 
 local function cmdUltralight()
-	return {
+    return {
     --[[
     --]]
-	[0] = "hf 14a raw -p -a -b 7 40",
-	[1] = "hf 14a raw -p -a 43",
-	[2] = "hf 14a raw -c -a A2005380712A",
-	[3] = "hf 14a raw -p -a -b 7 40",
-	[4] = "hf 14a raw -p -a 43",	
-	[5] = "hf 14a raw -c -a A2010200D980",
-	[6] = "hf 14a raw -p -a -b 7 40",
-	[7] = "hf 14a raw -p -a 43",
-	[8] = "hf 14a raw -c -a A2025B480000",
-	[9] = "hf 14a raw -c -a 5000",
-	}
+    [0] = "hf 14a raw -p -a -b 7 40",
+    [1] = "hf 14a raw -p -a 43",
+    [2] = "hf 14a raw -c -a A2005380712A",
+    [3] = "hf 14a raw -p -a -b 7 40",
+    [4] = "hf 14a raw -p -a 43",
+    [5] = "hf 14a raw -c -a A2010200D980",
+    [6] = "hf 14a raw -p -a -b 7 40",
+    [7] = "hf 14a raw -p -a 43",
+    [8] = "hf 14a raw -c -a A2025B480000",
+    [9] = "hf 14a raw -c -a 5000",
+    }
 end
 local function cmdClassic()
-	return {
+    return {
     --[[
     --]]
-	[0] = "hf 14a raw -p -a -b 7 40",
-	[1] = "hf 14a raw -p -a 43",
-	[2] = "hf 14a raw -c -p -a A000",
-	[3] = "hf 14a raw -c -p -a 01020304049802000000000000001001",
-	[4] = "hf 14a raw -c -a 5000",
-	}
+    [0] = "hf 14a raw -p -a -b 7 40",
+    [1] = "hf 14a raw -p -a 43",
+    [2] = "hf 14a raw -c -p -a A000",
+    [3] = "hf 14a raw -c -p -a 01020304049802000000000000001001",
+    [4] = "hf 14a raw -c -a 5000",
+    }
 end
 local function cmdRestoreST()
-	local arr = {}
-	for i = 0, 15 do
-		local blk = 3 + (4*i)
-		arr[i] = "hf mf csetbl "..blk.." FFFFFFFFFFFFFF078000FFFFFFFFFFFF"
-	end
-	return arr
-end 
-local function sendCmds( cmds )
-	for i = 0, #cmds do
-		if cmds[i]  then 
-			print ( cmds[i]  )
-			core.console( cmds[i] )
-			core.clearCommandBuffer()
-		end
-	end
+    local arr = {}
+    for i = 0, 15 do
+        local blk = 3 + (4*i)
+        arr[i] = "hf mf csetbl "..blk.." FFFFFFFFFFFFFF078000FFFFFFFFFFFF"
+    end
+    return arr
 end
---- 
+local function sendCmds( cmds )
+    for i = 0, #cmds do
+        if cmds[i]  then
+            print ( cmds[i]  )
+            core.console( cmds[i] )
+            core.clearCommandBuffer()
+        end
+    end
+end
+---
 -- The main entry point
 function main(args)
 
-	local i
-	local cmds = {}
-	local isUltralight = false
-	
-	-- Read the parameters
-	for o, a in getopt.getopt(args, 'hu') do
-		if o == "h" then return help() end
-		if o == "u" then isUltralight = true end
-	end
+    local i
+    local cmds = {}
+    local isUltralight = false
 
-	core.clearCommandBuffer()
-	
-	if isUltralight then
-		sendCmds ( cmdUltralight() )
-	else
-		sendCmds( cmdClassic() )
-		sendCmds( cmdRestoreST() )
-	end
+    -- Read the parameters
+    for o, a in getopt.getopt(args, 'hu') do
+        if o == "h" then return help() end
+        if o == "u" then isUltralight = true end
+    end
+
+    core.clearCommandBuffer()
+
+    if isUltralight then
+        sendCmds ( cmdUltralight() )
+    else
+        sendCmds( cmdClassic() )
+        sendCmds( cmdRestoreST() )
+    end
 end
 
 main(args)
diff --git a/client/scripts/test_t55x7_ask.lua b/client/scripts/test_t55x7_ask.lua
index 189cc4734..3f224b28a 100644
--- a/client/scripts/test_t55x7_ask.lua
+++ b/client/scripts/test_t55x7_ask.lua
@@ -7,7 +7,7 @@ local format=string.format
 local floor=math.floor
 
 example =[[
-	1. script run test_t55x7_ask
+    1. script run test_t55x7_ask
 ]]
 author = "Iceman"
 usage = "script run test_t55x7_ask"
@@ -15,32 +15,32 @@ desc =[[
 This script will program a T55x7 TAG with the configuration: block 0x00 data 0x000100
 The outlined procedure is as following:
 
---ASK 
-	00 00 80 40
+--ASK
+    00 00 80 40
 --           max 2
 --        manchester
 --     bit rate
- 
+
 "lf t55xx write b 0 d 00008040"
 "lf t55xx detect"
 "lf t55xx info"
 
 Loop:
-	change the configuretion block 0 with:
-	-xx 00 xxxx = RF/8 
-	-xx 04 xxxx = RF/16
-	-xx 08 xxxx = RF/32
-	-xx 0C xxxx = RF/40
-	-xx 10 xxxx = RF/50
-	-xx 14 xxxx = RF/64
-	-xx 18 xxxx = RF/100
-	-xx 1C xxxx = RF/128
+    change the configuretion block 0 with:
+    -xx 00 xxxx = RF/8
+    -xx 04 xxxx = RF/16
+    -xx 08 xxxx = RF/32
+    -xx 0C xxxx = RF/40
+    -xx 10 xxxx = RF/50
+    -xx 14 xxxx = RF/64
+    -xx 18 xxxx = RF/100
+    -xx 1C xxxx = RF/128
 
 
 testsuit for the ASK/MANCHESTER demod
 
 Arguments:
-	-h             : this help
+    -h             : this help
 ]]
 
 local TIMEOUT = 2000 -- Shouldn't take longer than 2 seconds
@@ -51,90 +51,90 @@ local config1 = '00'
 local config2 = '8040'
 
 local procedurecmds = {
-	[1] = '%s%02X%s',
-	[2] = 'lf t55xx detect',
-	[3] = 'lf t55xx info',
+    [1] = '%s%02X%s',
+    [2] = 'lf t55xx detect',
+    [3] = 'lf t55xx info',
 }
---- 
+---
 -- A debug printout-function
 local function dbg(args)
-	if not DEBUG then
-		return
-	end
-	
+    if not DEBUG then
+        return
+    end
+
     if type(args) == "table" then
-		local i = 1
-		while args[i] do
-			dbg(args[i])
-			i = i+1
-		end
-	else
-		print("###", args)
-	end	
-end	
---- 
+        local i = 1
+        while args[i] do
+            dbg(args[i])
+            i = i+1
+        end
+    else
+        print("###", args)
+    end
+end
+---
 -- This is only meant to be used when errors occur
 local function oops(err)
-	print("ERROR: ",err)
+    print("ERROR: ",err)
 end
---- 
+---
 -- Usage help
 local function help()
-	print(desc)
-	print("Example usage")
-	print(example)
+    print(desc)
+    print("Example usage")
+    print(example)
 end
 --
 -- Exit message
 local function ExitMsg(msg)
-	print( string.rep('--',20) )
-	print( string.rep('--',20) )
-	print(msg)
-	print()
+    print( string.rep('--',20) )
+    print( string.rep('--',20) )
+    print(msg)
+    print()
 end
 
 local function test()
-	local y
-	local block = "00"
-	for y = 0x0, 0x1d, 0x4 do
-		for _ = 1, #procedurecmds do
-			local pcmd = procedurecmds[_]
-			
-			if #pcmd == 0 then  
-			
-			elseif _ == 1 then
+    local y
+    local block = "00"
+    for y = 0x0, 0x1d, 0x4 do
+        for _ = 1, #procedurecmds do
+            local pcmd = procedurecmds[_]
 
-				local config = pcmd:format(config1, y, config2)
-				dbg(('lf t55xx write b 0  d %s'):format(config))			
-				config = tonumber(config,16) 
-				
-				local writecmd = Command:new{cmd = cmds.CMD_T55XX_WRITE_BLOCK,arg1 = config, arg2 = block, arg3 = "00", data = "00"}
-				local err = core.SendCommand(writecmd:getBytes())
-				if err then return oops(err) end
-				local response = core.WaitForResponseTimeout(cmds.CMD_ACK,TIMEOUT)
+            if #pcmd == 0 then
 
-			else
-				dbg(pcmd)
-				core.console( pcmd )
-			end			
-		end
-		core.clearCommandBuffer()	
-	end
-	print( string.rep('--',20) )
+            elseif _ == 1 then
+
+                local config = pcmd:format(config1, y, config2)
+                dbg(('lf t55xx write b 0  d %s'):format(config))
+                config = tonumber(config,16)
+
+                local writecmd = Command:new{cmd = cmds.CMD_T55XX_WRITE_BLOCK,arg1 = config, arg2 = block, arg3 = "00", data = "00"}
+                local err = core.SendCommand(writecmd:getBytes())
+                if err then return oops(err) end
+                local response = core.WaitForResponseTimeout(cmds.CMD_ACK,TIMEOUT)
+
+            else
+                dbg(pcmd)
+                core.console( pcmd )
+            end
+        end
+        core.clearCommandBuffer()
+    end
+    print( string.rep('--',20) )
 end
 
 local function main(args)
 
-	print( string.rep('--',20) )
-	print( string.rep('--',20) )
+    print( string.rep('--',20) )
+    print( string.rep('--',20) )
 
-	-- Arguments for the script
-	for o, arg in getopt.getopt(args, 'h') do
-		if o == "h" then return help() end
-	end
+    -- Arguments for the script
+    for o, arg in getopt.getopt(args, 'h') do
+        if o == "h" then return help() end
+    end
 
-	core.clearCommandBuffer()
-	test()
-	print( string.rep('--',20) )
+    core.clearCommandBuffer()
+    test()
+    print( string.rep('--',20) )
 end
 main(args)
\ No newline at end of file
diff --git a/client/scripts/test_t55x7_bi.lua b/client/scripts/test_t55x7_bi.lua
index f9a0688fe..dce5350dc 100644
--- a/client/scripts/test_t55x7_bi.lua
+++ b/client/scripts/test_t55x7_bi.lua
@@ -4,7 +4,7 @@ local bin = require('bin')
 local utils = require('utils')
 
 example =[[
-	1. script run test_t55x7_bi
+    1. script run test_t55x7_bi
 ]]
 author = "Iceman"
 usage = "script run test_t55x7_bi"
@@ -20,21 +20,21 @@ The outlined procedure is as following:
 "lf t55xx info"
 
 Loop:
-	change the configuretion block 0 with:
-    -xx01xxxx = RF/8 
+    change the configuretion block 0 with:
+    -xx01xxxx = RF/8
     -xx05xxxx = RF/16
-	-xx09xxxx = RF/32
-	-xx0Dxxxx = RF/40
-	-xx11xxxx = RF/50
-	-xx15xxxx = RF/64
-	-xx19xxxx = RF/100
-	-xx1Dxxxx = RF/128
+    -xx09xxxx = RF/32
+    -xx0Dxxxx = RF/40
+    -xx11xxxx = RF/50
+    -xx15xxxx = RF/64
+    -xx19xxxx = RF/100
+    -xx1Dxxxx = RF/128
 
 
 testsuit for the BIPHASE demod
 
 Arguments:
-	-h             : this help
+    -h             : this help
 ]]
 
 local TIMEOUT = 2000 -- Shouldn't take longer than 2 seconds
@@ -45,90 +45,90 @@ local config1 = '00'
 local config2 = '0040'
 
 local procedurecmds = {
-	[1] = '%s%02X%s',
-	[2] = 'lf t55xx detect',
-	[3] = 'lf t55xx info',
+    [1] = '%s%02X%s',
+    [2] = 'lf t55xx detect',
+    [3] = 'lf t55xx info',
 }
---- 
+---
 -- A debug printout-function
 local function dbg(args)
-	if not DEBUG then
-		return
-	end
-	
+    if not DEBUG then
+        return
+    end
+
     if type(args) == "table" then
-		local i = 1
-		while args[i] do
-			dbg(args[i])
-			i = i+1
-		end
-	else
-		print("###", args)
-	end	
-end	
---- 
+        local i = 1
+        while args[i] do
+            dbg(args[i])
+            i = i+1
+        end
+    else
+        print("###", args)
+    end
+end
+---
 -- This is only meant to be used when errors occur
 local function oops(err)
-	print("ERROR: ",err)
+    print("ERROR: ",err)
 end
---- 
+---
 -- Usage help
 local function help()
-	print(desc)
-	print("Example usage")
-	print(example)
+    print(desc)
+    print("Example usage")
+    print(example)
 end
 --
 -- Exit message
 local function ExitMsg(msg)
-	print( string.rep('--',20) )
-	print( string.rep('--',20) )
-	print(msg)
-	print()
+    print( string.rep('--',20) )
+    print( string.rep('--',20) )
+    print(msg)
+    print()
 end
 
 local function test()
-	local y
-	local block = "00"
-	for y = 1, 0x1D, 4 do
-		for _ = 1, #procedurecmds do
-			local pcmd = procedurecmds[_]
-			
-			if #pcmd == 0 then  
-			
-			elseif _ == 1 then
+    local y
+    local block = "00"
+    for y = 1, 0x1D, 4 do
+        for _ = 1, #procedurecmds do
+            local pcmd = procedurecmds[_]
 
-				local config = pcmd:format(config1, y, config2)
-				dbg(('lf t55xx write b 0 d %s'):format(config))
-		
-				config = tonumber(config,16) 		
-				local writecmd = Command:new{cmd = cmds.CMD_T55XX_WRITE_BLOCK,arg1 = config, arg2 = block, arg3 = "00", data = "00"}
-				local err = core.SendCommand(writecmd:getBytes())
-				if err then return oops(err) end
-				local response = core.WaitForResponseTimeout(cmds.CMD_ACK,TIMEOUT)
-			else
-				dbg(pcmd)
-				core.console( pcmd )
-			end
-		end
-		core.clearCommandBuffer()	
-	end
-	print( string.rep('--',20) )
+            if #pcmd == 0 then
+
+            elseif _ == 1 then
+
+                local config = pcmd:format(config1, y, config2)
+                dbg(('lf t55xx write b 0 d %s'):format(config))
+
+                config = tonumber(config,16)
+                local writecmd = Command:new{cmd = cmds.CMD_T55XX_WRITE_BLOCK,arg1 = config, arg2 = block, arg3 = "00", data = "00"}
+                local err = core.SendCommand(writecmd:getBytes())
+                if err then return oops(err) end
+                local response = core.WaitForResponseTimeout(cmds.CMD_ACK,TIMEOUT)
+            else
+                dbg(pcmd)
+                core.console( pcmd )
+            end
+        end
+        core.clearCommandBuffer()
+    end
+    print( string.rep('--',20) )
 
 end
 
 local function main(args)
 
-	print( string.rep('--',20) )
-	print( string.rep('--',20) )
+    print( string.rep('--',20) )
+    print( string.rep('--',20) )
 
-	-- Arguments for the script
-	for o, arg in getopt.getopt(args, 'h') do
-		if o == "h" then return help() end
-	end
+    -- Arguments for the script
+    for o, arg in getopt.getopt(args, 'h') do
+        if o == "h" then return help() end
+    end
 
-	core.clearCommandBuffer()
-	test()
-	print( string.rep('--',20) )
+    core.clearCommandBuffer()
+    test()
+    print( string.rep('--',20) )
 end
 main(args)
diff --git a/client/scripts/test_t55x7_fsk.lua b/client/scripts/test_t55x7_fsk.lua
index 0d067b96a..9dbb1b6bb 100644
--- a/client/scripts/test_t55x7_fsk.lua
+++ b/client/scripts/test_t55x7_fsk.lua
@@ -4,7 +4,7 @@ local bin = require('bin')
 local utils = require('utils')
 
 example =[[
-	1. script run test_t55x7_fsk
+    1. script run test_t55x7_fsk
 ]]
 author = "Iceman"
 usage = "script run test_t55x7_fsk"
@@ -12,32 +12,32 @@ desc =[[
 This script will program a T55x7 TAG with the configuration: block 0x00 data 0x000100
 The outlined procedure is as following:
 
---ASK 
-	00 00 80 40
+--ASK
+    00 00 80 40
 --           max 2 blocks
 --        FSK1
 --     bit rate
- 
+
 "lf t55xx write b 0 d 00007040"
 "lf t55xx detect"
 "lf t55xx info"
 
 Loop:
-	change the configuretion block 0 with:
-    -xx 00 xxxx = RF/8 
+    change the configuretion block 0 with:
+    -xx 00 xxxx = RF/8
     -xx 04 xxxx = RF/16
-	-xx 08 xxxx = RF/32
-	-xx 0C xxxx = RF/40
-	-xx 10 xxxx = RF/50
-	-xx 14 xxxx = RF/64
-	-xx 18 xxxx = RF/100
-	-xx 1C xxxx = RF/128
+    -xx 08 xxxx = RF/32
+    -xx 0C xxxx = RF/40
+    -xx 10 xxxx = RF/50
+    -xx 14 xxxx = RF/64
+    -xx 18 xxxx = RF/100
+    -xx 1C xxxx = RF/128
 
 
 testsuit for the ASK/MANCHESTER demod
 
 Arguments:
-	-h             : this help
+    -h             : this help
 ]]
 
 local TIMEOUT = 2000 -- Shouldn't take longer than 2 seconds
@@ -48,93 +48,93 @@ local config1 = '00'
 local config2 = '040'
 
 local procedurecmds = {
-	[1] = '%s%02X%X%s',
-	[2] = 'lf t55xx detect',
-	[3] = 'lf t55xx info',
+    [1] = '%s%02X%X%s',
+    [2] = 'lf t55xx detect',
+    [3] = 'lf t55xx info',
 }
---- 
+---
 -- A debug printout-function
 local function dbg(args)
-	if not DEBUG then
-		return
-	end
-	
+    if not DEBUG then
+        return
+    end
+
     if type(args) == "table" then
-		local i = 1
-		while args[i] do
-			dbg(args[i])
-			i = i+1
-		end
-	else
-		print("###", args)
-	end	
-end	
---- 
+        local i = 1
+        while args[i] do
+            dbg(args[i])
+            i = i+1
+        end
+    else
+        print("###", args)
+    end
+end
+---
 -- This is only meant to be used when errors occur
 local function oops(err)
-	print("ERROR: ",err)
+    print("ERROR: ",err)
 end
---- 
+---
 -- Usage help
 local function help()
-	print(desc)
-	print("Example usage")
-	print(example)
+    print(desc)
+    print("Example usage")
+    print(example)
 end
 --
 -- Exit message
 local function ExitMsg(msg)
-	print( string.rep('--',20) )
-	print( string.rep('--',20) )
-	print(msg)
-	print()
+    print( string.rep('--',20) )
+    print( string.rep('--',20) )
+    print(msg)
+    print()
 end
 
 local function test(modulation)
-	local y
-	local block = "00"
-	for y = 0x0, 0x1d, 0x4 do
-		for _ = 1, #procedurecmds do
-			local pcmd = procedurecmds[_]
-			
-			if #pcmd == 0 then  
-			
-			elseif _ == 1 then
+    local y
+    local block = "00"
+    for y = 0x0, 0x1d, 0x4 do
+        for _ = 1, #procedurecmds do
+            local pcmd = procedurecmds[_]
 
-				local config = pcmd:format(config1, y, modulation, config2)
-				dbg(('lf t55xx write b 0 d %s'):format(config))
-				
-				config = tonumber(config,16) 
-				local writecmd = Command:new{cmd = cmds.CMD_T55XX_WRITE_BLOCK,arg1 = config, arg2 = block, arg3 = "00", data = "00"}
-				local err = core.SendCommand(writecmd:getBytes())
-				if err then return oops(err) end
-				local response = core.WaitForResponseTimeout(cmds.CMD_ACK,TIMEOUT)
+            if #pcmd == 0 then
 
-			else
-				dbg(pcmd)
-				core.console( pcmd )
-			end			
-		end
-		core.clearCommandBuffer()	
-	end
-	print( string.rep('--',20) )
+            elseif _ == 1 then
+
+                local config = pcmd:format(config1, y, modulation, config2)
+                dbg(('lf t55xx write b 0 d %s'):format(config))
+
+                config = tonumber(config,16)
+                local writecmd = Command:new{cmd = cmds.CMD_T55XX_WRITE_BLOCK,arg1 = config, arg2 = block, arg3 = "00", data = "00"}
+                local err = core.SendCommand(writecmd:getBytes())
+                if err then return oops(err) end
+                local response = core.WaitForResponseTimeout(cmds.CMD_ACK,TIMEOUT)
+
+            else
+                dbg(pcmd)
+                core.console( pcmd )
+            end
+        end
+        core.clearCommandBuffer()
+    end
+    print( string.rep('--',20) )
 end
 
 local function main(args)
 
-	print( string.rep('--',20) )
-	print( string.rep('--',20) )
+    print( string.rep('--',20) )
+    print( string.rep('--',20) )
 
-	-- Arguments for the script
-	for o, arg in getopt.getopt(args, 'h') do
-		if o == "h" then return help() end
-	end
+    -- Arguments for the script
+    for o, arg in getopt.getopt(args, 'h') do
+        if o == "h" then return help() end
+    end
 
-	core.clearCommandBuffer()
-	test(4)
-	test(5)
-	test(6)
-	test(7)
-	print( string.rep('--',20) )
+    core.clearCommandBuffer()
+    test(4)
+    test(5)
+    test(6)
+    test(7)
+    print( string.rep('--',20) )
 end
 main(args)
\ No newline at end of file
diff --git a/client/scripts/test_t55x7_psk.lua b/client/scripts/test_t55x7_psk.lua
index 15bdb71d3..bd3aa2f79 100644
--- a/client/scripts/test_t55x7_psk.lua
+++ b/client/scripts/test_t55x7_psk.lua
@@ -4,8 +4,8 @@ local bin = require('bin')
 local utils = require('utils')
 
 example =[[
-	1. script run test_t55x7_psk
-	2. script run test_t55x7_psk -o 
+    1. script run test_t55x7_psk
+    2. script run test_t55x7_psk -o
 ]]
 author = "Iceman"
 usage = "script run test_t55x7_psk"
@@ -18,21 +18,21 @@ The outlined procedure is as following:
 "lf t55xx info"
 
 Loop OUTER:
-	change the configuretion block 0 with:
+    change the configuretion block 0 with:
     -xxxx8xxx = PSK RF/2 with Manchester modulation
     -xxxx1xxx = PSK RF/2 with PSK1 modulation (phase change when input changes)
     -xxxx2xxx = PSK RF/2 with PSk2 modulation (phase change on bitclk if input high)
     -xxxx3xxx = PSK RF/2 with PSk3 modulation (phase change on rising edge of input)
-	Loop INNER
-	    for each outer configuration, also do 
-			XXXXX0XX = PSK RF/2
-			XXXXX4XX = PSK RF/4
-			XXXXX8XX = PSK RF/8
+    Loop INNER
+        for each outer configuration, also do
+            XXXXX0XX = PSK RF/2
+            XXXXX4XX = PSK RF/4
+            XXXXX8XX = PSK RF/8
 
 In all 12 individual test for the PSK demod
 
 Arguments:
-	-h             : this help
+    -h             : this help
 ]]
 
 local TIMEOUT = 2000 -- Shouldn't take longer than 2 seconds
@@ -40,111 +40,111 @@ local DEBUG = true -- the debug flag
 
 -- --BLOCK 0 = 00 08 80 40 PSK
              -- -----------
-			   -- 08------- bitrate
-				  -- 8----- modulation PSK1
-				   -- 0---- PSK ClockRate
-				      -- 40 max 2 blocks
+               -- 08------- bitrate
+                  -- 8----- modulation PSK1
+                   -- 0---- PSK ClockRate
+                      -- 40 max 2 blocks
 
 local procedurecmds = {
-	[1] = '00%02X%X%X40',
-	[2] = 'lf t55xx detect',
-	[3] = 'lf t55xx info',
+    [1] = '00%02X%X%X40',
+    [2] = 'lf t55xx detect',
+    [3] = 'lf t55xx info',
 }
---- 
+---
 -- A debug printout-function
 local function dbg(args)
-	if not DEBUG then
-		return
-	end
-	
+    if not DEBUG then
+        return
+    end
+
     if type(args) == "table" then
-		local i = 1
-		while args[i] do
-			dbg(args[i])
-			i = i+1
-		end
-	else
-		print("###", args)
-	end	
-end	
---- 
+        local i = 1
+        while args[i] do
+            dbg(args[i])
+            i = i+1
+        end
+    else
+        print("###", args)
+    end
+end
+---
 -- This is only meant to be used when errors occur
 local function oops(err)
-	print("ERROR: ",err)
+    print("ERROR: ",err)
 end
---- 
+---
 -- Usage help
 local function help()
-	print(desc)
-	print("Example usage")
-	print(example)
+    print(desc)
+    print("Example usage")
+    print(example)
 end
 --
 -- Exit message
 local function ExitMsg(msg)
-	print( string.rep('--',20) )
-	print( string.rep('--',20) )
-	print(msg)
-	print()
+    print( string.rep('--',20) )
+    print( string.rep('--',20) )
+    print(msg)
+    print()
 end
 
 local function test(modulation)
-	local bitrate
-	local clockrate
-	local block = "00"
-	for bitrate = 0x0, 0x1d, 0x4 do
-	
-		for clockrate = 0,8,4 do
+    local bitrate
+    local clockrate
+    local block = "00"
+    for bitrate = 0x0, 0x1d, 0x4 do
 
-			for _ = 1, #procedurecmds do
-				local cmd = procedurecmds[_]
-				
-				if #cmd == 0 then  
-				
-				elseif _ == 1 then
+        for clockrate = 0,8,4 do
 
-					dbg("Writing to T55x7 TAG")
+            for _ = 1, #procedurecmds do
+                local cmd = procedurecmds[_]
 
-					local config = cmd:format(bitrate, modulation, clockrate)
-					dbg(('lf t55xx write b 0  d %s'):format(config))
-					
-					config = tonumber(config,16) 
-					local writecmd = Command:new{cmd = cmds.CMD_T55XX_WRITE_BLOCK,arg1 = config, arg2 = block, arg3 = "00", data = "00"}
-					local err = core.SendCommand(writecmd:getBytes())
-					if err then return oops(err) end
-					local response = core.WaitForResponseTimeout(cmds.CMD_ACK,TIMEOUT)
-				else
-					dbg(cmd)
-					core.console( cmd )
-				end
-			end
-			core.clearCommandBuffer()	
-		end
-	end
-	print( string.rep('--',20) )
+                if #cmd == 0 then
+
+                elseif _ == 1 then
+
+                    dbg("Writing to T55x7 TAG")
+
+                    local config = cmd:format(bitrate, modulation, clockrate)
+                    dbg(('lf t55xx write b 0  d %s'):format(config))
+
+                    config = tonumber(config,16)
+                    local writecmd = Command:new{cmd = cmds.CMD_T55XX_WRITE_BLOCK,arg1 = config, arg2 = block, arg3 = "00", data = "00"}
+                    local err = core.SendCommand(writecmd:getBytes())
+                    if err then return oops(err) end
+                    local response = core.WaitForResponseTimeout(cmds.CMD_ACK,TIMEOUT)
+                else
+                    dbg(cmd)
+                    core.console( cmd )
+                end
+            end
+            core.clearCommandBuffer()
+        end
+    end
+    print( string.rep('--',20) )
 end
 
 local function main(args)
 
-	print( string.rep('--',20) )
-	print( string.rep('--',20) )
+    print( string.rep('--',20) )
+    print( string.rep('--',20) )
 
-	-- Arguments for the script
-	for o, arg in getopt.getopt(args, 'h') do
-		if o == "h" then return help() end
-	end
+    -- Arguments for the script
+    for o, arg in getopt.getopt(args, 'h') do
+        if o == "h" then return help() end
+    end
 
-	core.clearCommandBuffer()
+    core.clearCommandBuffer()
 
-	test(1)  -- PSK1
-	--test(2) -- PSK2
-	--test(3) -- PSK3
-	
-	print( string.rep('--',20) )
+    test(1)  -- PSK1
+    --test(2) -- PSK2
+    --test(3) -- PSK3
+
+    print( string.rep('--',20) )
 end
 main(args)
 
--- Where it iterates over 
+-- Where it iterates over
   -- xxxx8xxx = PSK RF/2 with Manchester modulation
   -- xxxx1xxx = PSK RF/2 with PSK1 modulation (phase change when input changes)
   -- xxxx2xxx = PSK RF/2 with PSk2 modulation (phase change on bitclk if input high)
diff --git a/client/scripts/tnp3clone.lua b/client/scripts/tnp3clone.lua
index b17cf2661..386a7e25c 100644
--- a/client/scripts/tnp3clone.lua
+++ b/client/scripts/tnp3clone.lua
@@ -11,10 +11,10 @@ local bor = bit32.bor
 local band = bit32.band
 
 example =[[
-	script run tnp3clone
-	script run tnp3clone -h
-	script run tnp3clone -l
-	script run tnp3clone -t aa00 -s 0030
+    script run tnp3clone
+    script run tnp3clone -h
+    script run tnp3clone -l
+    script run tnp3clone -t aa00 -s 0030
 
 ]]
 author = "Iceman"
@@ -23,152 +23,152 @@ desc =[[
 This script will try making a barebone clone of a tnp3 tag on to a magic generation1 card.
 
 Arguments:
-	-h             : this help
-	-l             : list all known toy tokens
-	-t <data>      : toytype id, 4hex symbols
-	-s <data>      : subtype id, 4hex symbols		
-	
-	For fun,  try the following subtype id: 
-	0612 - Lightcore
-	0118 - Series 1
-	0138 - Series 2
-	0234 - Special
-	023c - Special
-	0020 - Swapforce
+    -h             : this help
+    -l             : list all known toy tokens
+    -t <data>      : toytype id, 4hex symbols
+    -s <data>      : subtype id, 4hex symbols
+
+    For fun,  try the following subtype id:
+    0612 - Lightcore
+    0118 - Series 1
+    0138 - Series 2
+    0234 - Special
+    023c - Special
+    0020 - Swapforce
 ]]
 
 -- This is only meant to be used when errors occur
 local function oops(err)
-	print("ERROR: ",err)
+    print("ERROR: ",err)
 end
 -- Usage help
 local function help()
-	print(desc)
-	print("Example usage")
-	print(example)
+    print(desc)
+    print("Example usage")
+    print(example)
 end
 
 local function waitCmd()
-	local response = core.WaitForResponseTimeout(cmds.CMD_ACK,2000)
-	if response then
-		local count,cmd,arg0 = bin.unpack('LL',response)
-		if(arg0==1) then
-			local count,arg1,arg2,data = bin.unpack('LLH511',response,count)
-			return data:sub(1,32)
-		else
-			return nil, "Couldn't read block." 
-		end
-	end
-	return nil, "No response from device"
+    local response = core.WaitForResponseTimeout(cmds.CMD_ACK,2000)
+    if response then
+        local count,cmd,arg0 = bin.unpack('LL',response)
+        if(arg0==1) then
+            local count,arg1,arg2,data = bin.unpack('LLH511',response,count)
+            return data:sub(1,32)
+        else
+            return nil, "Couldn't read block."
+        end
+    end
+    return nil, "No response from device"
 end
 
 local function readblock( blocknum, keyA )
-	-- Read block N
-	cmd = Command:new{cmd = cmds.CMD_MIFARE_READBL, arg1 = blocknum, arg2 = 0, arg3 = 0, data = keyA}
-	err = core.SendCommand(cmd:getBytes())
-	if err then return nil, err end
-	local block0, err = waitCmd()
-	if err then return nil, err end
-	return block0
+    -- Read block N
+    cmd = Command:new{cmd = cmds.CMD_MIFARE_READBL, arg1 = blocknum, arg2 = 0, arg3 = 0, data = keyA}
+    err = core.SendCommand(cmd:getBytes())
+    if err then return nil, err end
+    local block0, err = waitCmd()
+    if err then return nil, err end
+    return block0
 end
 
 local function readmagicblock( blocknum )
-	-- Read block N
-	local CSETBLOCK_SINGLE_OPERATION = 0x1F
-	cmd = Command:new{cmd = cmds.CMD_MIFARE_CGETBLOCK, arg1 = CSETBLOCK_SINGLE_OPERATION, arg2 = 0, arg3 = blocknum}
- 	err = core.SendCommand(cmd:getBytes())
-	if err then return nil, err end
-	local block0, err = waitCmd()
-	if err then return nil, err end
-	return block0
+    -- Read block N
+    local CSETBLOCK_SINGLE_OPERATION = 0x1F
+    cmd = Command:new{cmd = cmds.CMD_MIFARE_CGETBLOCK, arg1 = CSETBLOCK_SINGLE_OPERATION, arg2 = 0, arg3 = blocknum}
+    err = core.SendCommand(cmd:getBytes())
+    if err then return nil, err end
+    local block0, err = waitCmd()
+    if err then return nil, err end
+    return block0
 end
 
 local function main(args)
 
-	print( string.rep('--',20) )
-	print( string.rep('--',20) )
-	
-	local numBlocks = 64
-	local cset = 'hf mf csetbl '
-	local csetuid = 'hf mf csetuid '
-	local cget = 'hf mf cgetbl '
-	local empty = '00000000000000000000000000000000'
-	local AccAndKeyB = '7F0F0869000000000000'
-	local atqa = '0F01'
-	local sak = '81'
-	-- Defaults to Gusto
-	local toytype = 'C201'
-	local subtype = '0030'
-	local DEBUG = true
-	
-	-- Arguments for the script
-	for o, a in getopt.getopt(args, 'ht:s:l') do
-		if o == "h" then return help() end		
-		if o == "t" then toytype = a end
-		if o == "s" then subtype = a end
-		if o == "l" then return toys.List() end
-	end
+    print( string.rep('--',20) )
+    print( string.rep('--',20) )
 
-	if #toytype ~= 4 then return oops('[!] Wrong size - toytype. (4hex symbols)') end	
-	if #subtype ~= 4 then return oops('[!] Wrong size - subtype. (4hex symbols)') end	
+    local numBlocks = 64
+    local cset = 'hf mf csetbl '
+    local csetuid = 'hf mf csetuid '
+    local cget = 'hf mf cgetbl '
+    local empty = '00000000000000000000000000000000'
+    local AccAndKeyB = '7F0F0869000000000000'
+    local atqa = '0F01'
+    local sak = '81'
+    -- Defaults to Gusto
+    local toytype = 'C201'
+    local subtype = '0030'
+    local DEBUG = true
 
-	-- look up type, find & validate types
-	local item = toys.Find( toytype, subtype)
-	if item then
-		print( ('[+] Looking up input: Found %s - %s (%s)'):format(item[6],item[5], item[4]) )
-	else
-		print('[-] Didn\'t find item type. If you are sure about it, post on forum')
-	end
-	--15,16
-	--13-14
-	
-	-- find tag
-	result, err = lib14a.read(false, true)
-	if not result then return oops(err) end
+    -- Arguments for the script
+    for o, a in getopt.getopt(args, 'ht:s:l') do
+        if o == "h" then return help() end
+        if o == "t" then toytype = a end
+        if o == "s" then subtype = a end
+        if o == "l" then return toys.List() end
+    end
 
-	-- load keys
-	local akeys  = pre.GetAll(result.uid)
-	local keyA = akeys:sub(1, 12 ) 
+    if #toytype ~= 4 then return oops('[!] Wrong size - toytype. (4hex symbols)') end
+    if #subtype ~= 4 then return oops('[!] Wrong size - subtype. (4hex symbols)') end
 
-	local b0 = readblock(0, keyA)
-	if not b0 then
-		print('[-] failed reading block with factorydefault key. Trying chinese magic read.')
-	    b0, err = readmagicblock(0)
-		if not b0 then 
-			oops('[!] '..err) 
-			return oops('[!] failed reading block with chinese magic command. Quitting...')
-		end
-	end
-	core.clearCommandBuffer()
+    -- look up type, find & validate types
+    local item = toys.Find( toytype, subtype)
+    if item then
+        print( ('[+] Looking up input: Found %s - %s (%s)'):format(item[6],item[5], item[4]) )
+    else
+        print('[-] Didn\'t find item type. If you are sure about it, post on forum')
+    end
+    --15,16
+    --13-14
 
-	-- wipe card.
-	local cmd  = (csetuid..'%s %s %s w'):format(result.uid, atqa, sak)	
-	core.console(cmd) 
-	core.clearCommandBuffer()
-	
-	local b1 = toytype..string.rep('00',10)..subtype
-	
-	local calc = utils.Crc16(b0..b1)
-	local calcEndian = bor(rsh(calc,8), lsh(band(calc, 0xff), 8))
-	
-	local cmd  = (cset..'1 %s%04x'):format( b1, calcEndian)	
-	core.console(cmd) 
-	core.clearCommandBuffer()
-	
-	local pos, key
-	for blockNo = 2, numBlocks-1, 1 do
-		pos = (math.floor( blockNo / 4 ) * 12)+1
-		key = akeys:sub(pos, pos + 11 )
-		if  blockNo%4 == 3 then
-			cmd =  ('%s %d %s%s'):format(cset,blockNo,key,AccAndKeyB) 
-			core.console(cmd)
-		end		
-	end 
-	core.clearCommandBuffer()
-	
-	-- Set sector trailer S0, since it has different access rights
-	cmd = ('%s 3 %s0f0f0f69000000000000'):format(cset, keyA)
-	core.console(cmd)
-	core.clearCommandBuffer()
+    -- find tag
+    result, err = lib14a.read(false, true)
+    if not result then return oops(err) end
+
+    -- load keys
+    local akeys  = pre.GetAll(result.uid)
+    local keyA = akeys:sub(1, 12 )
+
+    local b0 = readblock(0, keyA)
+    if not b0 then
+        print('[-] failed reading block with factorydefault key. Trying chinese magic read.')
+        b0, err = readmagicblock(0)
+        if not b0 then
+            oops('[!] '..err)
+            return oops('[!] failed reading block with chinese magic command. Quitting...')
+        end
+    end
+    core.clearCommandBuffer()
+
+    -- wipe card.
+    local cmd  = (csetuid..'%s %s %s w'):format(result.uid, atqa, sak)
+    core.console(cmd)
+    core.clearCommandBuffer()
+
+    local b1 = toytype..string.rep('00',10)..subtype
+
+    local calc = utils.Crc16(b0..b1)
+    local calcEndian = bor(rsh(calc,8), lsh(band(calc, 0xff), 8))
+
+    local cmd  = (cset..'1 %s%04x'):format( b1, calcEndian)
+    core.console(cmd)
+    core.clearCommandBuffer()
+
+    local pos, key
+    for blockNo = 2, numBlocks-1, 1 do
+        pos = (math.floor( blockNo / 4 ) * 12)+1
+        key = akeys:sub(pos, pos + 11 )
+        if  blockNo%4 == 3 then
+            cmd =  ('%s %d %s%s'):format(cset,blockNo,key,AccAndKeyB)
+            core.console(cmd)
+        end
+    end
+    core.clearCommandBuffer()
+
+    -- Set sector trailer S0, since it has different access rights
+    cmd = ('%s 3 %s0f0f0f69000000000000'):format(cset, keyA)
+    core.console(cmd)
+    core.clearCommandBuffer()
 end
 main(args)
diff --git a/client/scripts/tnp3dump.lua b/client/scripts/tnp3dump.lua
index 8c354ef89..2a5545497 100644
--- a/client/scripts/tnp3dump.lua
+++ b/client/scripts/tnp3dump.lua
@@ -8,15 +8,15 @@ local dumplib = require('html_dumplib')
 local toys = require('default_toys')
 
 example =[[
-	script run tnp3dump
-	script run tnp3dump -n
-	script run tnp3dump -p
-	script run tnp3dump -k aabbccddeeff
-	script run tnp3dump -k aabbccddeeff -n
-	script run tnp3dump -o myfile 
-	script run tnp3dump -n -o myfile 
-	script run tnp3dump -p -o myfile 
-	script run tnp3dump -k aabbccddeeff -n -o myfile 
+    script run tnp3dump
+    script run tnp3dump -n
+    script run tnp3dump -p
+    script run tnp3dump -k aabbccddeeff
+    script run tnp3dump -k aabbccddeeff -n
+    script run tnp3dump -o myfile
+    script run tnp3dump -n -o myfile
+    script run tnp3dump -p -o myfile
+    script run tnp3dump -k aabbccddeeff -n -o myfile
 ]]
 author = "Iceman"
 usage = "script run tnp3dump -k <key> -n -p -o <filename>"
@@ -24,262 +24,262 @@ desc =[[
 This script will try to dump the contents of a Mifare TNP3xxx card.
 It will need a valid KeyA in order to find the other keys and decode the card.
 Arguments:
-	-h             : this help
-	-k <key>       : Sector 0 Key A.
-	-n             : Use the nested cmd to find all keys
-	-p             : Use the precalc to find all keys
-	-o             : filename for the saved dumps
+    -h             : this help
+    -k <key>       : Sector 0 Key A.
+    -n             : Use the nested cmd to find all keys
+    -p             : Use the precalc to find all keys
+    -o             : filename for the saved dumps
 ]]
 local RANDOM = '20436F707972696768742028432920323031302041637469766973696F6E2E20416C6C205269676874732052657365727665642E20'
 local TIMEOUT = 2500 -- Shouldn't take longer than 2 seconds
 local DEBUG = false -- the debug flag
 local numBlocks = 64
 local numSectors = 16
---- 
+---
 -- A debug printout-function
 function dbg(args)
-	if not DEBUG then return end
-	
+    if not DEBUG then return end
+
     if type(args) == "table" then
-		local i = 1
-		while result[i] do
-			dbg(result[i])
-			i = i+1
-		end
-	else
-		print("###", args)
-	end	
-end	
---- 
+        local i = 1
+        while result[i] do
+            dbg(result[i])
+            i = i+1
+        end
+    else
+        print("###", args)
+    end
+end
+---
 -- This is only meant to be used when errors occur
 function oops(err)
-	print("ERROR: ",err)
-	return nil,err
+    print("ERROR: ",err)
+    return nil,err
 end
---- 
+---
 -- Usage help
 function help()
-	print(desc)
-	print("Example usage")
-	print(example)
+    print(desc)
+    print("Example usage")
+    print(example)
 end
 --
 -- Exit message
 function ExitMsg(msg)
-	print( string.rep('--',20) )
-	print( string.rep('--',20) )
-	print(msg)
-	print()
+    print( string.rep('--',20) )
+    print( string.rep('--',20) )
+    print(msg)
+    print()
 end
 
 local function readdumpkeys(infile)
-	 t = infile:read("*all")
-	 len = string.len(t)
-	 local len,hex = bin.unpack(("H%d"):format(len),t)
-	 return hex
+     t = infile:read("*all")
+     len = string.len(t)
+     local len,hex = bin.unpack(("H%d"):format(len),t)
+     return hex
 end
 
 local function waitCmd()
-	local response = core.WaitForResponseTimeout(cmds.CMD_ACK, TIMEOUT)
-	if response then
-		local count, cmd, arg0 = bin.unpack('LL',response)
-		if(arg0==1) then
-			local count,arg1,arg2,data = bin.unpack('LLH511',response,count)
-			return data:sub(1,32)
-		else
-			return nil, "Couldn't read block.. ["..arg0.."]"
-		end
-	end
-	return nil, 'No response from device'
+    local response = core.WaitForResponseTimeout(cmds.CMD_ACK, TIMEOUT)
+    if response then
+        local count, cmd, arg0 = bin.unpack('LL',response)
+        if(arg0==1) then
+            local count,arg1,arg2,data = bin.unpack('LLH511',response,count)
+            return data:sub(1,32)
+        else
+            return nil, "Couldn't read block.. ["..arg0.."]"
+        end
+    end
+    return nil, 'No response from device'
 end
 
 local function main(args)
 
-	print( string.rep('--',20) )
-	print( string.rep('--',20) )
-	
-	local keyA
-	local cmd
-	local err
-	local useNested = false
-	local usePreCalc = false
-	local cmdReadBlockString = 'hf mf rdbl %d A %s'
-	local input = "dumpkeys.bin"
-	local outputTemplate = os.date("toydump_%Y-%m-%d_%H%M%S");
+    print( string.rep('--',20) )
+    print( string.rep('--',20) )
 
-	-- Arguments for the script
-	for o, a in getopt.getopt(args, 'hk:npo:') do
-		if o == "h" then return help() end		
-		if o == "k" then keyA = a end
-		if o == "n" then useNested = true end
-		if o == "p" then usePreCalc = true end
-		if o == "o" then outputTemplate = a end		
-	end
-	
-	-- validate input args.
-	keyA =  keyA or '4b0b20107ccb'
-	if #(keyA) ~= 12 then
-		return oops( string.format('Wrong length of write key (was %d) expected 12', #keyA))
-	end
+    local keyA
+    local cmd
+    local err
+    local useNested = false
+    local usePreCalc = false
+    local cmdReadBlockString = 'hf mf rdbl %d A %s'
+    local input = "dumpkeys.bin"
+    local outputTemplate = os.date("toydump_%Y-%m-%d_%H%M%S");
 
-	-- Turn off Debug
-	local cmdSetDbgOff = "hf mf dbg 0"
-	core.console( cmdSetDbgOff) 
-	
-	result, err = lib14a.read(false, true)
-	if not result then
-		return oops(err)
-	end
+    -- Arguments for the script
+    for o, a in getopt.getopt(args, 'hk:npo:') do
+        if o == "h" then return help() end
+        if o == "k" then keyA = a end
+        if o == "n" then useNested = true end
+        if o == "p" then usePreCalc = true end
+        if o == "o" then outputTemplate = a end
+    end
 
-	core.clearCommandBuffer()
-	
-	-- Show tag info
-	print((' Found tag %s'):format(result.name))
+    -- validate input args.
+    keyA =  keyA or '4b0b20107ccb'
+    if #(keyA) ~= 12 then
+        return oops( string.format('Wrong length of write key (was %d) expected 12', #keyA))
+    end
 
-	dbg(('Using keyA : %s'):format(keyA))
+    -- Turn off Debug
+    local cmdSetDbgOff = "hf mf dbg 0"
+    core.console( cmdSetDbgOff)
 
-	--Trying to find the other keys
-	if useNested then
-	  core.console( ('hf mf nested 1 0 A %s d'):format(keyA) )
-	end
+    result, err = lib14a.read(false, true)
+    if not result then
+        return oops(err)
+    end
 
-	core.clearCommandBuffer()
-	
-	local akeys = ''
-	if usePreCalc then
-		local pre = require('precalc')
-		akeys = pre.GetAll(result.uid)
-		dbg(akeys)
-	else
-		print('Loading dumpkeys.bin')
-		local hex, err = utils.ReadDumpFile(input)
-		if not hex then
-			return oops(err)
-		end
-		akeys = hex:sub(0,12*16)
-	end
-	
-	-- Read block 0
-	dbg('Reading block 0')
-	cmd = Command:new{cmd = cmds.CMD_MIFARE_READBL, arg1 = 0, arg2 = 0, arg3 = 0, data = keyA}
-	err = core.SendCommand(cmd:getBytes())
-	if err then return oops(err) end
-	local block0, err = waitCmd()
-	if err then return oops(err) end
-	
-	core.clearCommandBuffer()
-	
-	-- Read block 1
-	dbg('Reading block 1')
-	cmd = Command:new{cmd = cmds.CMD_MIFARE_READBL, arg1 = 1, arg2 = 0, arg3 = 0, data = keyA}
-	err = core.SendCommand(cmd:getBytes())
-	if err then return oops(err) end
-	local block1, err = waitCmd()
-	if err then return oops(err) end
+    core.clearCommandBuffer()
 
-	core.clearCommandBuffer()
-	
-	local tmpHash = block0..block1..'%02x'..RANDOM
+    -- Show tag info
+    print((' Found tag %s'):format(result.name))
 
-	local key
-	local pos = 0
-	local blockNo
-	local blocks = {}
-	
-	-- main loop
-	io.write('Reading blocks > ')
-	for blockNo = 0, numBlocks-1, 1 do
+    dbg(('Using keyA : %s'):format(keyA))
 
-		io.flush()
-		
-		if core.ukbhit() then
-			print("aborted by user")
-			break
-		end
-	
-		core.clearCommandBuffer()
-		
-		pos = (math.floor( blockNo / 4 ) * 12)+1
-		key = akeys:sub(pos, pos + 11 )
-		cmd = Command:new{cmd = cmds.CMD_MIFARE_READBL, arg1 = blockNo ,arg2 = 0,arg3 = 0, data = key}
-		local err = core.SendCommand(cmd:getBytes())
-		if err then return oops(err) end
-		local blockdata, err = waitCmd()
-		if err then return oops(err) end		
+    --Trying to find the other keys
+    if useNested then
+      core.console( ('hf mf nested 1 0 A %s d'):format(keyA) )
+    end
+
+    core.clearCommandBuffer()
+
+    local akeys = ''
+    if usePreCalc then
+        local pre = require('precalc')
+        akeys = pre.GetAll(result.uid)
+        dbg(akeys)
+    else
+        print('Loading dumpkeys.bin')
+        local hex, err = utils.ReadDumpFile(input)
+        if not hex then
+            return oops(err)
+        end
+        akeys = hex:sub(0,12*16)
+    end
+
+    -- Read block 0
+    dbg('Reading block 0')
+    cmd = Command:new{cmd = cmds.CMD_MIFARE_READBL, arg1 = 0, arg2 = 0, arg3 = 0, data = keyA}
+    err = core.SendCommand(cmd:getBytes())
+    if err then return oops(err) end
+    local block0, err = waitCmd()
+    if err then return oops(err) end
+
+    core.clearCommandBuffer()
+
+    -- Read block 1
+    dbg('Reading block 1')
+    cmd = Command:new{cmd = cmds.CMD_MIFARE_READBL, arg1 = 1, arg2 = 0, arg3 = 0, data = keyA}
+    err = core.SendCommand(cmd:getBytes())
+    if err then return oops(err) end
+    local block1, err = waitCmd()
+    if err then return oops(err) end
+
+    core.clearCommandBuffer()
+
+    local tmpHash = block0..block1..'%02x'..RANDOM
+
+    local key
+    local pos = 0
+    local blockNo
+    local blocks = {}
+
+    -- main loop
+    io.write('Reading blocks > ')
+    for blockNo = 0, numBlocks-1, 1 do
+
+        io.flush()
+
+        if core.ukbhit() then
+            print("aborted by user")
+            break
+        end
+
+        core.clearCommandBuffer()
+
+        pos = (math.floor( blockNo / 4 ) * 12)+1
+        key = akeys:sub(pos, pos + 11 )
+        cmd = Command:new{cmd = cmds.CMD_MIFARE_READBL, arg1 = blockNo ,arg2 = 0,arg3 = 0, data = key}
+        local err = core.SendCommand(cmd:getBytes())
+        if err then return oops(err) end
+        local blockdata, err = waitCmd()
+        if err then return oops(err) end
 
 
-		if  blockNo%4 ~= 3 then
-		
-			if blockNo < 8 then
-				-- Block 0-7 not encrypted
-				blocks[blockNo+1] = ('%02d  :: %s'):format(blockNo,blockdata)
-			else
-				-- blocks with zero not encrypted.
-				if string.find(blockdata, '^0+$') then
-					blocks[blockNo+1] = ('%02d  :: %s'):format(blockNo,blockdata)
-				else
-					local baseStr = utils.ConvertHexToAscii(tmpHash:format(blockNo))
-					local key = md5.sumhexa(baseStr)
-					local aestest = core.aes128_decrypt(key, blockdata)
-					local hex = utils.ConvertAsciiToHex(aestest)
-					
-					blocks[blockNo+1] = ('%02d  :: %s'):format(blockNo,hex)
-					io.write(blockNo..',')
-				end		
-			end
-		else
-			-- Sectorblocks, not encrypted
-			blocks[blockNo+1] = ('%02d  :: %s%s'):format(blockNo,key,blockdata:sub(13,32)) 
-		end
-	end
-	io.write('\n')
-	
-	core.clearCommandBuffer()
-		
-	-- Print results
-	local bindata = {}
-	local emldata = ''
+        if  blockNo%4 ~= 3 then
 
-	for _,s in pairs(blocks) do
-		local slice = s:sub(8,#s)
-		local str = utils.ConvertHexToAscii(slice)
-		emldata = emldata..slice..'\n'
-		for c in (str):gmatch('.') do
-			bindata[#bindata+1] = c
-		end		
-	end 
+            if blockNo < 8 then
+                -- Block 0-7 not encrypted
+                blocks[blockNo+1] = ('%02d  :: %s'):format(blockNo,blockdata)
+            else
+                -- blocks with zero not encrypted.
+                if string.find(blockdata, '^0+$') then
+                    blocks[blockNo+1] = ('%02d  :: %s'):format(blockNo,blockdata)
+                else
+                    local baseStr = utils.ConvertHexToAscii(tmpHash:format(blockNo))
+                    local key = md5.sumhexa(baseStr)
+                    local aestest = core.aes128_decrypt(key, blockdata)
+                    local hex = utils.ConvertAsciiToHex(aestest)
 
-	print( string.rep('--',20) )
-	
-	local uid = block0:sub(1,8)
-	local toytype = block1:sub(1,4)
-	local cardidLsw = block1:sub(9,16)
-	local cardidMsw = block1:sub(16,24)
-	local cardid = block1:sub(9,24)
-	local subtype = block1:sub(25,28)
-	
-	-- Write dump to files
-	if not DEBUG then
-		local foo = dumplib.SaveAsBinary(bindata, outputTemplate..'-'..uid..'.bin')
-		print(("Wrote a BIN dump to:  %s"):format(foo))
-		local bar = dumplib.SaveAsText(emldata, outputTemplate..'-'..uid..'.eml')
-		print(("Wrote a EML dump to:  %s"):format(bar))
-	end
-	
-	print( string.rep('--',20) )
-	-- Show info 
+                    blocks[blockNo+1] = ('%02d  :: %s'):format(blockNo,hex)
+                    io.write(blockNo..',')
+                end
+            end
+        else
+            -- Sectorblocks, not encrypted
+            blocks[blockNo+1] = ('%02d  :: %s%s'):format(blockNo,key,blockdata:sub(13,32))
+        end
+    end
+    io.write('\n')
 
-	local item = toys.Find(toytype, subtype)
-	if item then
-		print(('            ITEM TYPE : %s - %s (%s)'):format(item[6],item[5], item[4]) )
-	else
-		print(('            ITEM TYPE : 0x%s 0x%s'):format(toytype, subtype))
-	end
+    core.clearCommandBuffer()
 
-	print( ('                  UID : 0x%s'):format(uid) )
-	print( ('               CARDID : 0x%s'):format(cardid ) )
-	print( string.rep('--',20) )
-	
-	core.clearCommandBuffer()
+    -- Print results
+    local bindata = {}
+    local emldata = ''
+
+    for _,s in pairs(blocks) do
+        local slice = s:sub(8,#s)
+        local str = utils.ConvertHexToAscii(slice)
+        emldata = emldata..slice..'\n'
+        for c in (str):gmatch('.') do
+            bindata[#bindata+1] = c
+        end
+    end
+
+    print( string.rep('--',20) )
+
+    local uid = block0:sub(1,8)
+    local toytype = block1:sub(1,4)
+    local cardidLsw = block1:sub(9,16)
+    local cardidMsw = block1:sub(16,24)
+    local cardid = block1:sub(9,24)
+    local subtype = block1:sub(25,28)
+
+    -- Write dump to files
+    if not DEBUG then
+        local foo = dumplib.SaveAsBinary(bindata, outputTemplate..'-'..uid..'.bin')
+        print(("Wrote a BIN dump to:  %s"):format(foo))
+        local bar = dumplib.SaveAsText(emldata, outputTemplate..'-'..uid..'.eml')
+        print(("Wrote a EML dump to:  %s"):format(bar))
+    end
+
+    print( string.rep('--',20) )
+    -- Show info
+
+    local item = toys.Find(toytype, subtype)
+    if item then
+        print(('            ITEM TYPE : %s - %s (%s)'):format(item[6],item[5], item[4]) )
+    else
+        print(('            ITEM TYPE : 0x%s 0x%s'):format(toytype, subtype))
+    end
+
+    print( ('                  UID : 0x%s'):format(uid) )
+    print( ('               CARDID : 0x%s'):format(cardid ) )
+    print( string.rep('--',20) )
+
+    core.clearCommandBuffer()
 end
 main(args)
\ No newline at end of file
diff --git a/client/scripts/tnp3sim.lua b/client/scripts/tnp3sim.lua
index ca729f38d..f64bebfce 100644
--- a/client/scripts/tnp3sim.lua
+++ b/client/scripts/tnp3sim.lua
@@ -6,11 +6,11 @@ local utils = require('utils')
 local md5 = require('md5')
 local toys = require('default_toys')
 local pre = require('precalc')
-		
+
 example =[[
-	1. script run tnp3sim
-	2. script run tnp3sim -m
-	3. script run tnp3sim -m -i myfile
+    1. script run tnp3sim
+    2. script run tnp3sim -m
+    3. script run tnp3sim -m -i myfile
 ]]
 author = "Iceman"
 usage = "script run tnp3sim -h -m -i <filename>"
@@ -21,11 +21,11 @@ For an experimental mode, it tries to manipulate some data.
 At last it sends all data to the PM3 device memory where it can be used in the command  "hf mf sim"
 
 Arguments:
-	-h             : this help
-	-m             : Maxed out items (experimental)
-	-i             : filename for the datadump to read (bin)
+    -h             : this help
+    -m             : Maxed out items (experimental)
+    -i             : filename for the datadump to read (bin)
 
-	]]
+    ]]
 
 local TIMEOUT = 2000 -- Shouldn't take longer than 2 seconds
 local DEBUG = true -- the debug flag
@@ -40,239 +40,239 @@ local char = string.char
 local sub = string.sub
 local format = string.format
 
---- 
+---
 -- A debug printout-function
 function dbg(args)
-	if not DEBUG then return end
-	
+    if not DEBUG then return end
+
     if type(args) == "table" then
-		local i = 1
-		while result[i] do
-			dbg(result[i])
-			i = i+1
-		end
-	else
-		print("###", args)
-	end	
-end	
---- 
+        local i = 1
+        while result[i] do
+            dbg(result[i])
+            i = i+1
+        end
+    else
+        print("###", args)
+    end
+end
+---
 -- This is only meant to be used when errors occur
 function oops(err)
-	print("ERROR: ",err)
-	return nil,err
+    print("ERROR: ",err)
+    return nil,err
 end
---- 
+---
 -- Usage help
 function help()
-	print(desc)
-	print("Example usage")
-	print(example)
+    print(desc)
+    print("Example usage")
+    print(example)
 end
 --
 -- Exit message
 function ExitMsg(msg)
-	print( string.rep('--',20) )
-	print( string.rep('--',20) )
-	print(msg)
-	print()
+    print( string.rep('--',20) )
+    print( string.rep('--',20) )
+    print(msg)
+    print()
 end
 
 local function writedumpfile(infile)
-	 t = infile:read("*all")
-	 len = string.len(t)
-	 local len,hex = bin.unpack(("H%d"):format(len),t)
-	 return hex
+     t = infile:read("*all")
+     len = string.len(t)
+     local len,hex = bin.unpack(("H%d"):format(len),t)
+     return hex
 end
 -- blocks with data
 -- there are two dataareas, in block 8 or block 36,   ( 1==8 ,
 -- checksum type =  0, 1, 2, 3
 local function GetCheckSum(blocks, dataarea, chksumtype)
 
-	local crc
-	local area = 36
-	if  dataarea == 1 then
-		area = 8
-	end
-	
-	if chksumtype == 0 then
-		crc = blocks[1]:sub(29,32)
-	elseif chksumtype == 1 then
-		crc = blocks[area]:sub(29,32)
-	elseif chksumtype == 2 then	
-		crc = blocks[area]:sub(25,28)
-	elseif chksumtype == 3 then
-		crc = blocks[area]:sub(21,24)		
-	end
-	return utils.SwapEndianness(crc,16)
+    local crc
+    local area = 36
+    if  dataarea == 1 then
+        area = 8
+    end
+
+    if chksumtype == 0 then
+        crc = blocks[1]:sub(29,32)
+    elseif chksumtype == 1 then
+        crc = blocks[area]:sub(29,32)
+    elseif chksumtype == 2 then
+        crc = blocks[area]:sub(25,28)
+    elseif chksumtype == 3 then
+        crc = blocks[area]:sub(21,24)
+    end
+    return utils.SwapEndianness(crc,16)
 end
 
 local function SetAllCheckSum(blocks)
-	print('Updating all checksums')
-	SetCheckSum(blocks, 3)
-	SetCheckSum(blocks, 2)
-	SetCheckSum(blocks, 1)
-	SetCheckSum(blocks, 0)
+    print('Updating all checksums')
+    SetCheckSum(blocks, 3)
+    SetCheckSum(blocks, 2)
+    SetCheckSum(blocks, 1)
+    SetCheckSum(blocks, 0)
 end
 
 local function SetCheckSum(blocks, chksumtype)
 
-	if blocks == nil then return nil, 'Argument \"blocks\" nil' end
-	local newcrc
-	local area1 = 8
-	local area2 = 36
-	
-	if chksumtype == 0 then
-		newcrc = ('%04X'):format(CalcCheckSum(blocks,1,0))	
-		blocks[1] = blocks[1]:sub(1,28)..newcrc:sub(3,4)..newcrc:sub(1,2)
-	elseif chksumtype == 1 then
-		newcrc = ('%04X'):format(CalcCheckSum(blocks,1,1))	
-		blocks[area1] = blocks[area1]:sub(1,28)..newcrc:sub(3,4)..newcrc:sub(1,2)
-		newcrc = ('%04X'):format(CalcCheckSum(blocks,2,1))	
-		blocks[area2] = blocks[area2]:sub(1,28)..newcrc:sub(3,4)..newcrc:sub(1,2)
-	elseif chksumtype == 2 then	
-		newcrc = ('%04X'):format(CalcCheckSum(blocks,1,2))	
-		blocks[area1] = blocks[area1]:sub(1,24)..newcrc:sub(3,4)..newcrc:sub(1,2)..blocks[area1]:sub(29,32)
-		newcrc = ('%04X'):format(CalcCheckSum(blocks,2,2))	
-		blocks[area2] = blocks[area2]:sub(1,24)..newcrc:sub(3,4)..newcrc:sub(1,2)..blocks[area2]:sub(29,32)
-	elseif chksumtype == 3 then
-		newcrc = ('%04X'):format(CalcCheckSum(blocks,1,3))	
-		blocks[area1] = blocks[area1]:sub(1,20)..newcrc:sub(3,4)..newcrc:sub(1,2)..blocks[area1]:sub(25,32)
-		newcrc = ('%04X'):format(CalcCheckSum(blocks,2,3))	
-		blocks[area2] = blocks[area2]:sub(1,20)..newcrc:sub(3,4)..newcrc:sub(1,2)..blocks[area2]:sub(25,32)
-	end
+    if blocks == nil then return nil, 'Argument \"blocks\" nil' end
+    local newcrc
+    local area1 = 8
+    local area2 = 36
+
+    if chksumtype == 0 then
+        newcrc = ('%04X'):format(CalcCheckSum(blocks,1,0))
+        blocks[1] = blocks[1]:sub(1,28)..newcrc:sub(3,4)..newcrc:sub(1,2)
+    elseif chksumtype == 1 then
+        newcrc = ('%04X'):format(CalcCheckSum(blocks,1,1))
+        blocks[area1] = blocks[area1]:sub(1,28)..newcrc:sub(3,4)..newcrc:sub(1,2)
+        newcrc = ('%04X'):format(CalcCheckSum(blocks,2,1))
+        blocks[area2] = blocks[area2]:sub(1,28)..newcrc:sub(3,4)..newcrc:sub(1,2)
+    elseif chksumtype == 2 then
+        newcrc = ('%04X'):format(CalcCheckSum(blocks,1,2))
+        blocks[area1] = blocks[area1]:sub(1,24)..newcrc:sub(3,4)..newcrc:sub(1,2)..blocks[area1]:sub(29,32)
+        newcrc = ('%04X'):format(CalcCheckSum(blocks,2,2))
+        blocks[area2] = blocks[area2]:sub(1,24)..newcrc:sub(3,4)..newcrc:sub(1,2)..blocks[area2]:sub(29,32)
+    elseif chksumtype == 3 then
+        newcrc = ('%04X'):format(CalcCheckSum(blocks,1,3))
+        blocks[area1] = blocks[area1]:sub(1,20)..newcrc:sub(3,4)..newcrc:sub(1,2)..blocks[area1]:sub(25,32)
+        newcrc = ('%04X'):format(CalcCheckSum(blocks,2,3))
+        blocks[area2] = blocks[area2]:sub(1,20)..newcrc:sub(3,4)..newcrc:sub(1,2)..blocks[area2]:sub(25,32)
+    end
 end
 
 function CalcCheckSum(blocks, dataarea, chksumtype)
-	local area = 36
-	if dataarea == 1 then
-		area = 8
-	end
-	
-	if chksumtype == 0 then
-		data = blocks[0]..blocks[1]:sub(1,28)
-	elseif chksumtype == 1 then
-		data = blocks[area]:sub(1,28)..'0500'
-	elseif chksumtype == 2 then	
-		data =	blocks[area+1]..blocks[area+2]..blocks[area+4]
-	elseif chksumtype == 3 then
-		data =  blocks[area+5]..blocks[area+6]..blocks[area+8]..string.rep('00',0xe0)	
-	end
-	return utils.Crc16(data)
+    local area = 36
+    if dataarea == 1 then
+        area = 8
+    end
+
+    if chksumtype == 0 then
+        data = blocks[0]..blocks[1]:sub(1,28)
+    elseif chksumtype == 1 then
+        data = blocks[area]:sub(1,28)..'0500'
+    elseif chksumtype == 2 then
+        data = blocks[area+1]..blocks[area+2]..blocks[area+4]
+    elseif chksumtype == 3 then
+        data = blocks[area+5]..blocks[area+6]..blocks[area+8]..string.rep('00',0xe0)
+    end
+    return utils.Crc16(data)
 end
 
 local function ValidateCheckSums(blocks)
-	print(' Validating checksums')
-	
-	local isOk, crc, calc
-	-- Checksum Type 0
-	crc = GetCheckSum(blocks,1,0)
-	calc = CalcCheckSum(blocks, 1, 0)
-	if crc == calc then isOk='Ok' else isOk = 'Error' end
-	io.write( ('TYPE 0       : %04x = %04x -- %s\n'):format(crc,calc,isOk))
+    print(' Validating checksums')
 
-	-- Checksum Type 1 (DATAAREAHEADER 1)
-	crc = GetCheckSum(blocks,1,1)
-	calc = CalcCheckSum(blocks,1,1)
-	if crc == calc then isOk='Ok' else isOk = 'Error' end
-	io.write( ('TYPE 1 area 1: %04x = %04x -- %s\n'):format(crc,calc,isOk))
-	
-	-- Checksum Type 1 (DATAAREAHEADER 2)
-	crc = GetCheckSum(blocks,2,1)
-	calc = CalcCheckSum(blocks,2,1)
-	if crc == calc then isOk='Ok' else isOk = 'Error' end
-	io.write( ('TYPE 1 area 2: %04x = %04x -- %s\n'):format(crc,calc,isOk))
-	
-	-- Checksum Type 2 (DATAAREA 1)
-	crc = GetCheckSum(blocks,1,2)
-	calc = CalcCheckSum(blocks,1,2)
-	if crc == calc then isOk='Ok' else isOk = 'Error' end	
-	io.write( ('TYPE 2 area 1: %04x = %04x -- %s\n'):format(crc,calc,isOk))
+    local isOk, crc, calc
+    -- Checksum Type 0
+    crc = GetCheckSum(blocks,1,0)
+    calc = CalcCheckSum(blocks, 1, 0)
+    if crc == calc then isOk='Ok' else isOk = 'Error' end
+    io.write( ('TYPE 0       : %04x = %04x -- %s\n'):format(crc,calc,isOk))
 
-	-- Checksum Type 2 (DATAAREA 2)
-	crc = GetCheckSum(blocks,2,2)
-	calc = CalcCheckSum(blocks,2,2)
-	if crc == calc then isOk='Ok' else isOk = 'Error' end	
-	io.write( ('TYPE 2 area 2: %04x = %04x -- %s\n'):format(crc,calc,isOk))
+    -- Checksum Type 1 (DATAAREAHEADER 1)
+    crc = GetCheckSum(blocks,1,1)
+    calc = CalcCheckSum(blocks,1,1)
+    if crc == calc then isOk='Ok' else isOk = 'Error' end
+    io.write( ('TYPE 1 area 1: %04x = %04x -- %s\n'):format(crc,calc,isOk))
 
-	-- Checksum Type 3 (DATAAREA 1)
-	crc = GetCheckSum(blocks,1,3)
-	calc = CalcCheckSum(blocks,1,3)
-	if crc == calc then isOk='Ok' else isOk = 'Error' end	
-	io.write( ('TYPE 3 area 1: %04x = %04x -- %s\n'):format(crc,calc,isOk))
+    -- Checksum Type 1 (DATAAREAHEADER 2)
+    crc = GetCheckSum(blocks,2,1)
+    calc = CalcCheckSum(blocks,2,1)
+    if crc == calc then isOk='Ok' else isOk = 'Error' end
+    io.write( ('TYPE 1 area 2: %04x = %04x -- %s\n'):format(crc,calc,isOk))
 
-	-- Checksum Type 3 (DATAAREA 2)
-	crc = GetCheckSum(blocks,2,3)
-	calc = CalcCheckSum(blocks,2,3)
-	if crc == calc then isOk='Ok' else isOk = 'Error' end	
-	io.write( ('TYPE 3 area 2: %04x = %04x -- %s\n'):format(crc,calc,isOk))
+    -- Checksum Type 2 (DATAAREA 1)
+    crc = GetCheckSum(blocks,1,2)
+    calc = CalcCheckSum(blocks,1,2)
+    if crc == calc then isOk='Ok' else isOk = 'Error' end
+    io.write( ('TYPE 2 area 1: %04x = %04x -- %s\n'):format(crc,calc,isOk))
+
+    -- Checksum Type 2 (DATAAREA 2)
+    crc = GetCheckSum(blocks,2,2)
+    calc = CalcCheckSum(blocks,2,2)
+    if crc == calc then isOk='Ok' else isOk = 'Error' end
+    io.write( ('TYPE 2 area 2: %04x = %04x -- %s\n'):format(crc,calc,isOk))
+
+    -- Checksum Type 3 (DATAAREA 1)
+    crc = GetCheckSum(blocks,1,3)
+    calc = CalcCheckSum(blocks,1,3)
+    if crc == calc then isOk='Ok' else isOk = 'Error' end
+    io.write( ('TYPE 3 area 1: %04x = %04x -- %s\n'):format(crc,calc,isOk))
+
+    -- Checksum Type 3 (DATAAREA 2)
+    crc = GetCheckSum(blocks,2,3)
+    calc = CalcCheckSum(blocks,2,3)
+    if crc == calc then isOk='Ok' else isOk = 'Error' end
+    io.write( ('TYPE 3 area 2: %04x = %04x -- %s\n'):format(crc,calc,isOk))
 
 end
 
 local function AddKey(keys, blockNo, data)
-	local pos = (math.floor( blockNo / 4 ) * 12)+1
-	local key = keys:sub(pos, pos + 11 )
-	return key..data:sub(13)
+    local pos = (math.floor( blockNo / 4 ) * 12)+1
+    local key = keys:sub(pos, pos + 11 )
+    return key..data:sub(13)
 end
 
 local function LoadEmulator(uid, blocks)
-	print('Sending dumpdata to emulator memory')
-	local keys = pre.GetAll(uid)
-	local cmd, blockdata
-	for _,b in pairs(blocks) do 
-		
-		blockdata = b
-		
-		if  _%4 ~= 3 then
-			if (_ >= 8 and _<=21)  or  (_ >= 36 and _<=49) then
-				local base = ('%s%s%02x%s'):format(blocks[0], blocks[1], _ , RANDOM)	
-				local baseStr = utils.ConvertHexToAscii(base)
-				local key = md5.sumhexa(baseStr)
-				local enc = core.aes128_encrypt(key, blockdata)
-				blockdata = utils.ConvertAsciiToHex(enc)
-				io.write( _..',')
-			end
-		else		
-			-- add keys if not existing..
-			if ( blockdata:sub(1,12) == '000000000000' ) then
-				blockdata = AddKey(keys, _, blockdata)
-			end
-		end
-		core.clearCommandBuffer()
-		cmd = Command:new{cmd = cmds.CMD_MIFARE_EML_MEMSET, arg1 = _ ,arg2 = 1,arg3 = 16, data = blockdata}
-		local err = core.SendCommand(cmd:getBytes())
-		if err then return err end
-	end
-	io.write('\n')
+    print('Sending dumpdata to emulator memory')
+    local keys = pre.GetAll(uid)
+    local cmd, blockdata
+    for _,b in pairs(blocks) do
+
+        blockdata = b
+
+        if  _%4 ~= 3 then
+            if (_ >= 8 and _<=21)  or  (_ >= 36 and _<=49) then
+                local base = ('%s%s%02x%s'):format(blocks[0], blocks[1], _ , RANDOM)
+                local baseStr = utils.ConvertHexToAscii(base)
+                local key = md5.sumhexa(baseStr)
+                local enc = core.aes128_encrypt(key, blockdata)
+                blockdata = utils.ConvertAsciiToHex(enc)
+                io.write( _..',')
+            end
+        else
+            -- add keys if not existing..
+            if ( blockdata:sub(1,12) == '000000000000' ) then
+                blockdata = AddKey(keys, _, blockdata)
+            end
+        end
+        core.clearCommandBuffer()
+        cmd = Command:new{cmd = cmds.CMD_MIFARE_EML_MEMSET, arg1 = _ ,arg2 = 1,arg3 = 16, data = blockdata}
+        local err = core.SendCommand(cmd:getBytes())
+        if err then return err end
+    end
+    io.write('\n')
 end
 
 local function Num2Card(m, l)
 
-	local k = {
-		0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39,0x42, 0x43, 0x44, 0x46, 0x47, 0x48, 0x4A, 0x4B,
-		0x4C, 0x4D, 0x4E, 0x50, 0x51, 0x52, 0x53, 0x54,0x56, 0x57, 0x58, 0x59, 0x5A, 0x00
-	}
-	local msw = tonumber(utils.SwapEndiannessStr(m,32),16)
-	local lsw = tonumber(utils.SwapEndiannessStr(l,32),16)
+    local k = {
+        0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39,0x42, 0x43, 0x44, 0x46, 0x47, 0x48, 0x4A, 0x4B,
+        0x4C, 0x4D, 0x4E, 0x50, 0x51, 0x52, 0x53, 0x54,0x56, 0x57, 0x58, 0x59, 0x5A, 0x00
+    }
+    local msw = tonumber(utils.SwapEndiannessStr(m,32),16)
+    local lsw = tonumber(utils.SwapEndiannessStr(l,32),16)
 
-	if msw > 0x17ea1 then
-		return "too big"
-	end
+    if msw > 0x17ea1 then
+        return "too big"
+    end
 
-	if msw == 0x17ea1 and lsw > 0x8931fee8 then
-		return "out of range"
-	end
+    if msw == 0x17ea1 and lsw > 0x8931fee8 then
+        return "out of range"
+    end
 
-	local s = ""
-	local index
-	for i = 1,10 do
-		index, msw, lsw = DivideByK( msw, lsw)
-		if ( index <= 1 ) then
-			s = char(k[index]) .. s
-		else
-			s = char(k[index-1]) .. s
-		end 
-		print (index-1, msw, lsw)
-	end
+    local s = ""
+    local index
+    for i = 1,10 do
+        index, msw, lsw = DivideByK( msw, lsw)
+        if ( index <= 1 ) then
+            s = char(k[index]) .. s
+        else
+            s = char(k[index-1]) .. s
+        end
+        print (index-1, msw, lsw)
+    end
     return s
 end
 --33LRT-LM9Q9
@@ -289,43 +289,43 @@ end
 
 function DivideByK(msw, lsw)
 
-	local lowLSW
-	local highLSW
-	local remainder = 0
-	local RADIX = 29
+    local lowLSW
+    local highLSW
+    local remainder = 0
+    local RADIX = 29
 
-	--local num = 0 | band( rshift(msw,16), 0xffff)
-	local num = band( rshift(msw, 16), 0xffff)
- 
-	--highLSW = 0 | lshift( (num / RADIX) , 16)
-	highLSW = lshift( (num / RADIX) , 16)
-	remainder = num % RADIX
+    --local num = 0 | band( rshift(msw,16), 0xffff)
+    local num = band( rshift(msw, 16), 0xffff)
 
-	num =  bor( lshift(remainder,16), band(msw, 0xffff))
+    --highLSW = 0 | lshift( (num / RADIX) , 16)
+    highLSW = lshift( (num / RADIX) , 16)
+    remainder = num % RADIX
 
-	--highLSW |= num / RADIX
-	highLSW = highLSW or (num / RADIX)
-	remainder = num % RADIX
+    num =  bor( lshift(remainder,16), band(msw, 0xffff))
 
-	num =  bor( lshift(remainder,16), ( band(rshift(lsw,16), 0xffff)))
+    --highLSW |= num / RADIX
+    highLSW = highLSW or (num / RADIX)
+    remainder = num % RADIX
 
-	--lowLSW = 0 | (num / RADIX) << 16
-	lowLSW = 0 or (lshift( (num / RADIX), 16))
-	remainder = num % RADIX
+    num =  bor( lshift(remainder,16), ( band(rshift(lsw,16), 0xffff)))
 
-	num =  bor( lshift(remainder,16) , band(lsw, 0xffff) )
+    --lowLSW = 0 | (num / RADIX) << 16
+    lowLSW = 0 or (lshift( (num / RADIX), 16))
+    remainder = num % RADIX
+
+    num =  bor( lshift(remainder,16) , band(lsw, 0xffff) )
+
+    lowLSW = bor(lowLSW, (num / RADIX))
+    remainder = num % RADIX
+    return remainder, highLSW, lowLSW
+
+                -- uint num = 0 | (msw >> 16) & 0xffff;
 
-	lowLSW = bor(lowLSW, (num / RADIX))
-	remainder = num % RADIX
-	return remainder, highLSW, lowLSW
-	
-	            -- uint num = 0 | (msw >> 16) & 0xffff;
- 
             -- highLSW = 0 | (num / RADIX) << 16;
             -- remainder = num % RADIX;
 
             -- num = (remainder << 16) | (msw & 0xffff);
- 
+
             -- highLSW |= num / RADIX;
             -- remainder = num % RADIX;
 
@@ -343,147 +343,147 @@ end
 
 local function main(args)
 
-	print( string.rep('--',20) )
-	print( string.rep('--',20) )
-	
-	local result, err, hex
-	local maxed = false
-	local inputTemplate = "dumpdata.bin"
-	local outputTemplate = os.date("toydump_%Y-%m-%d_%H%M");
-	
-		-- Arguments for the script
-	for o, a in getopt.getopt(args, 'hmi:o:') do
-		if o == "h" then return help() end		
-		if o == "m" then maxed = true end
-		if o == "o" then outputTemplate = a end		
-		if o == "i" then inputTemplate = a end
-	end
-	
-	-- Turn off Debug
-	local cmdSetDbgOff = "hf mf dbg 0"
-	core.console( cmdSetDbgOff) 
-	
-	-- Load dump.bin file
-	print( (' Load data from %s'):format(inputTemplate))
-	hex, err = utils.ReadDumpFile(inputTemplate)
-	if not hex then return oops(err) end
-	
-	local blocks = {}
-	local blockindex = 0
-	for i = 1, #hex, 32 do
-		blocks[blockindex] = hex:sub(i,i+31)
-		blockindex = blockindex + 1
-	end
+    print( string.rep('--',20) )
+    print( string.rep('--',20) )
 
-	if DEBUG then ValidateCheckSums(blocks)	end
-	
-	--
-	print( string.rep('--',20) )	
-	print(' Gathering info')
-	local uid = blocks[0]:sub(1,8)
-	local toytype = blocks[1]:sub(1,4)
-	local cardidLsw = blocks[1]:sub(9,16)
-	local cardidMsw = blocks[1]:sub(17,24)
-	local subtype  = blocks[1]:sub(25,28)
+    local result, err, hex
+    local maxed = false
+    local inputTemplate = "dumpdata.bin"
+    local outputTemplate = os.date("toydump_%Y-%m-%d_%H%M");
 
-	-- Show info 
-	print( string.rep('--',20) )
-	
-	local item = toys.Find( toytype, subtype)
-	if item then
-		local itemStr = ('%s - %s (%s)'):format(item[6],item[5], item[4])
-		print(' ITEM TYPE : '..itemStr )
-	else
-		print( (' ITEM TYPE : 0x%s 0x%s'):format(toytype, subtype) )
-	end	
-	
-	print( ('       UID : 0x%s'):format(uid) )
-	print( ('    CARDID : 0x%s %s [%s]'):format(
-								cardidMsw,cardidLsw, 
-								--Num2Card(cardidMsw, cardidLsw))
-								'')
-								)
-	print( string.rep('--',20) )
+        -- Arguments for the script
+    for o, a in getopt.getopt(args, 'hmi:o:') do
+        if o == "h" then return help() end
+        if o == "m" then maxed = true end
+        if o == "o" then outputTemplate = a end
+        if o == "i" then inputTemplate = a end
+    end
+
+    -- Turn off Debug
+    local cmdSetDbgOff = "hf mf dbg 0"
+    core.console( cmdSetDbgOff)
+
+    -- Load dump.bin file
+    print( (' Load data from %s'):format(inputTemplate))
+    hex, err = utils.ReadDumpFile(inputTemplate)
+    if not hex then return oops(err) end
+
+    local blocks = {}
+    local blockindex = 0
+    for i = 1, #hex, 32 do
+        blocks[blockindex] = hex:sub(i,i+31)
+        blockindex = blockindex + 1
+    end
+
+    if DEBUG then ValidateCheckSums(blocks) end
+
+    --
+    print( string.rep('--',20) )
+    print(' Gathering info')
+    local uid = blocks[0]:sub(1,8)
+    local toytype = blocks[1]:sub(1,4)
+    local cardidLsw = blocks[1]:sub(9,16)
+    local cardidMsw = blocks[1]:sub(17,24)
+    local subtype  = blocks[1]:sub(25,28)
+
+    -- Show info
+    print( string.rep('--',20) )
+
+    local item = toys.Find( toytype, subtype)
+    if item then
+        local itemStr = ('%s - %s (%s)'):format(item[6],item[5], item[4])
+        print(' ITEM TYPE : '..itemStr )
+    else
+        print( (' ITEM TYPE : 0x%s 0x%s'):format(toytype, subtype) )
+    end
+
+    print( ('       UID : 0x%s'):format(uid) )
+    print( ('    CARDID : 0x%s %s [%s]'):format(
+                                cardidMsw,cardidLsw,
+                                --Num2Card(cardidMsw, cardidLsw))
+                                '')
+                                )
+    print( string.rep('--',20) )
 
 
-	-- Experience should be:  	
-	local experience = blocks[8]:sub(1,6)
-	print(('Experience  : %d'):format(utils.SwapEndianness(experience,16)))
-	
-	local money = blocks[8]:sub(7,10)
-	print(('Money       : %d'):format(utils.SwapEndianness(money,16)))
+    -- Experience should be:
+    local experience = blocks[8]:sub(1,6)
+    print(('Experience  : %d'):format(utils.SwapEndianness(experience,16)))
 
-	-- 
-	
-	-- Sequence number
-	local seqnum = blocks[8]:sub(18,19)
-	print(('Sequence number : %d'):format( tonumber(seqnum,16)))
-	
-	local fairy = blocks[9]:sub(1,8)
-	--FD0F = Left, FF0F = Right
-	local path = 'not choosen'
-	if fairy:sub(2,2) == 'D' then
-		path = 'Left'
-	elseif fairy:sub(2,2) == 'F' then
-		path = 'Right'
-	end
-	print(('Fairy       : %d [Path: %s] '):format(utils.SwapEndianness(fairy,24),path))
-	
-	local hat = blocks[9]:sub(8,11)
-	print(('Hat         : %d'):format(utils.SwapEndianness(hat,16)))
+    local money = blocks[8]:sub(7,10)
+    print(('Money       : %d'):format(utils.SwapEndianness(money,16)))
 
-	local level = blocks[13]:sub(27,28)
-	print(('LEVEL : %d'):format( tonumber(level,16)))
+    --
 
-	--local health = blocks[]:sub();
-	--print(('Health : %d'):format( tonumber(health,16))
-	
-	--0x0D    0x29    0x0A    0x02    16-bit hero points value. Maximum 100.
-	local heropoints = blocks[13]:sub(20,23)
-	print(('Hero points : %d'):format(utils.SwapEndianness(heropoints,16)))
+    -- Sequence number
+    local seqnum = blocks[8]:sub(18,19)
+    print(('Sequence number : %d'):format( tonumber(seqnum,16)))
 
-	--0x10    0x2C    0x0C    0x04    32 bit flag value indicating heroic challenges completed.
-	local challenges = blocks[16]:sub(25,32)
-	print(('Finished hero challenges : %d'):format(utils.SwapEndianness(challenges,32)))
-	
-	-- Character Name
-	local name1 = blocks[10]:sub(1,32)
-	local name2 = blocks[12]:sub(1,32)
-	print('Custom name : '..utils.ConvertHexToAscii(name1..name2))
-	
-	if maxed then
-		print('Lets try to max out some values')
-		-- max out money, experience
-		--print (blocks[8])
-		blocks[8] = 'FFFFFF'..'FFFF'..blocks[8]:sub(11,32)
-		blocks[36] = 'FFFFFF'..'FFFF'..blocks[36]:sub(11,32)
-		--print (blocks[8])
-	
-		-- max out hero challenges
-		--print (blocks[16])
-		blocks[16] = blocks[16]:sub(1,24)..'FFFFFFFF'
-		blocks[44] = blocks[44]:sub(1,24)..'FFFFFFFF'
-		--print (blocks[16])
-		
-		-- max out heropoints
-		--print (blocks[13])
-		blocks[13] = blocks[13]:sub(1,19)..'0064'..blocks[13]:sub(24,32)
-		blocks[41] = blocks[41]:sub(1,19)..'0064'..blocks[41]:sub(24,32)
-		--print (blocks[13])
-	
-		-- Update Checksums
-		SetAllCheckSum(blocks)
+    local fairy = blocks[9]:sub(1,8)
+    --FD0F = Left, FF0F = Right
+    local path = 'not choosen'
+    if fairy:sub(2,2) == 'D' then
+        path = 'Left'
+    elseif fairy:sub(2,2) == 'F' then
+        path = 'Right'
+    end
+    print(('Fairy       : %d [Path: %s] '):format(utils.SwapEndianness(fairy,24),path))
 
-		-- Validate Checksums
-		ValidateCheckSums(blocks)
-	end
+    local hat = blocks[9]:sub(8,11)
+    print(('Hat         : %d'):format(utils.SwapEndianness(hat,16)))
 
-	--Load dumpdata to emulator memory
-	if DEBUG then
-		err = LoadEmulator(uid, blocks)
-		if err then return oops(err) end	
-		core.clearCommandBuffer()
-		print('The simulation is now prepared.\n --> run \"hf mf sim u '..uid..'\" <--')
-	end
+    local level = blocks[13]:sub(27,28)
+    print(('LEVEL : %d'):format( tonumber(level,16)))
+
+    --local health = blocks[]:sub();
+    --print(('Health : %d'):format( tonumber(health,16))
+
+    --0x0D    0x29    0x0A    0x02    16-bit hero points value. Maximum 100.
+    local heropoints = blocks[13]:sub(20,23)
+    print(('Hero points : %d'):format(utils.SwapEndianness(heropoints,16)))
+
+    --0x10    0x2C    0x0C    0x04    32 bit flag value indicating heroic challenges completed.
+    local challenges = blocks[16]:sub(25,32)
+    print(('Finished hero challenges : %d'):format(utils.SwapEndianness(challenges,32)))
+
+    -- Character Name
+    local name1 = blocks[10]:sub(1,32)
+    local name2 = blocks[12]:sub(1,32)
+    print('Custom name : '..utils.ConvertHexToAscii(name1..name2))
+
+    if maxed then
+        print('Lets try to max out some values')
+        -- max out money, experience
+        --print (blocks[8])
+        blocks[8] = 'FFFFFF'..'FFFF'..blocks[8]:sub(11,32)
+        blocks[36] = 'FFFFFF'..'FFFF'..blocks[36]:sub(11,32)
+        --print (blocks[8])
+
+        -- max out hero challenges
+        --print (blocks[16])
+        blocks[16] = blocks[16]:sub(1,24)..'FFFFFFFF'
+        blocks[44] = blocks[44]:sub(1,24)..'FFFFFFFF'
+        --print (blocks[16])
+
+        -- max out heropoints
+        --print (blocks[13])
+        blocks[13] = blocks[13]:sub(1,19)..'0064'..blocks[13]:sub(24,32)
+        blocks[41] = blocks[41]:sub(1,19)..'0064'..blocks[41]:sub(24,32)
+        --print (blocks[13])
+
+        -- Update Checksums
+        SetAllCheckSum(blocks)
+
+        -- Validate Checksums
+        ValidateCheckSums(blocks)
+    end
+
+    --Load dumpdata to emulator memory
+    if DEBUG then
+        err = LoadEmulator(uid, blocks)
+        if err then return oops(err) end
+        core.clearCommandBuffer()
+        print('The simulation is now prepared.\n --> run \"hf mf sim u '..uid..'\" <--')
+    end
 end
 main(args)
\ No newline at end of file
diff --git a/client/scripts/tracetest.lua b/client/scripts/tracetest.lua
index ae4055aed..96d1f79c6 100644
--- a/client/scripts/tracetest.lua
+++ b/client/scripts/tracetest.lua
@@ -5,122 +5,122 @@ local utils = require('utils')
 local dumplib = require('html_dumplib')
 
 example =[[
-	1. script run tracetest
+    1. script run tracetest
 ]]
 author = "Iceman"
 usage = "script run tracetest"
 desc =[[
-This script will load several traces files in ../traces/ folder and do 
+This script will load several traces files in ../traces/ folder and do
 "data load"
-"lf search 1 u" 
+"lf search 1 u"
 
-The following tracefiles will be loaded:  
+The following tracefiles will be loaded:
    em*.pm3
    m*.pm3
 
 Arguments:
-	-h             : this help
+    -h             : this help
 ]]
 
 local TIMEOUT = 2000 -- Shouldn't take longer than 2 seconds
 local DEBUG = true -- the debug flag
---- 
+---
 -- A debug printout-function
 function dbg(args)
-	if not DEBUG then
-		return
-	end
-	
+    if not DEBUG then
+        return
+    end
+
     if type(args) == "table" then
-		local i = 1
-		while result[i] do
-			dbg(result[i])
-			i = i+1
-		end
-	else
-		print("###", args)
-	end	
-end	
---- 
+        local i = 1
+        while result[i] do
+            dbg(result[i])
+            i = i+1
+        end
+    else
+        print("###", args)
+    end
+end
+---
 -- This is only meant to be used when errors occur
 function oops(err)
-	print("ERROR: ",err)
+    print("ERROR: ",err)
 end
---- 
+---
 -- Usage help
 function help()
-	print(desc)
-	print("Example usage")
-	print(example)
+    print(desc)
+    print("Example usage")
+    print(example)
 end
 --
 -- Exit message
 function ExitMsg(msg)
-	print( string.rep('--',20) )
-	print( string.rep('--',20) )
-	print(msg)
-	print()
+    print( string.rep('--',20) )
+    print( string.rep('--',20) )
+    print(msg)
+    print()
 end
 
 
 local function main(args)
 
-	print( string.rep('--',20) )
-	print( string.rep('--',20) )
-	
-	local cmdDataLoad = 'data load %s';
-	local tracesEM = "find '../traces/' -iname 'em*.pm3' -type f"
-	local tracesMOD = "find '../traces/' -iname 'm*.pm3' -type f"
+    print( string.rep('--',20) )
+    print( string.rep('--',20) )
 
-	local write2File = false
-	local outputTemplate = os.date("testtest_%Y-%m-%d_%H%M%S")
+    local cmdDataLoad = 'data load %s';
+    local tracesEM = "find '../traces/' -iname 'em*.pm3' -type f"
+    local tracesMOD = "find '../traces/' -iname 'm*.pm3' -type f"
 
-	-- Arguments for the script
-	for o, arg in getopt.getopt(args, 'h') do
-		if o == "h" then return help() end		
-	end
-	
-	core.clearCommandBuffer()
-	
-	local files = {}
-	
-	-- Find a set of traces staring with EM
-	local p = assert( io.popen(tracesEM))
-	for file in p:lines() do
-		table.insert(files, file)
-	end
-	p.close();
-	
-	-- Find a set of traces staring with MOD
-	p = assert( io.popen(tracesMOD) )
-	for file in p:lines() do
-		table.insert(files, file)
-	end
-	p.close();
-	
-	local cmdLFSEARCH = "lf search 1 u" 
-	
-	-- main loop
-	io.write('Starting to test traces > ')
-	for _,file in pairs(files) do
+    local write2File = false
+    local outputTemplate = os.date("testtest_%Y-%m-%d_%H%M%S")
 
-		local x = "data load "..file
-		dbg(x)
-		core.console(x) 
-		
-		dbg(cmdLFSEARCH)
-		core.console(cmdLFSEARCH)
-		
-		core.clearCommandBuffer()
-		
-		if core.ukbhit() then
-			print("aborted by user")
-			break
-		end
-	end
-	io.write('\n')
+    -- Arguments for the script
+    for o, arg in getopt.getopt(args, 'h') do
+        if o == "h" then return help() end
+    end
 
-	print( string.rep('--',20) )
+    core.clearCommandBuffer()
+
+    local files = {}
+
+    -- Find a set of traces staring with EM
+    local p = assert( io.popen(tracesEM))
+    for file in p:lines() do
+        table.insert(files, file)
+    end
+    p.close();
+
+    -- Find a set of traces staring with MOD
+    p = assert( io.popen(tracesMOD) )
+    for file in p:lines() do
+        table.insert(files, file)
+    end
+    p.close();
+
+    local cmdLFSEARCH = "lf search 1 u"
+
+    -- main loop
+    io.write('Starting to test traces > ')
+    for _,file in pairs(files) do
+
+        local x = "data load "..file
+        dbg(x)
+        core.console(x)
+
+        dbg(cmdLFSEARCH)
+        core.console(cmdLFSEARCH)
+
+        core.clearCommandBuffer()
+
+        if core.ukbhit() then
+            print("aborted by user")
+            break
+        end
+    end
+    io.write('\n')
+
+    print( string.rep('--',20) )
 
 end
 main(args)
\ No newline at end of file
diff --git a/client/scripts/ufodump.lua b/client/scripts/ufodump.lua
index a77bb6c92..67949fd94 100644
--- a/client/scripts/ufodump.lua
+++ b/client/scripts/ufodump.lua
@@ -3,8 +3,8 @@ local getopt = require('getopt')
 local lib14a = require('read14a')
 local utils = require('utils')
 example = [[
-	script run ufodump
-	script run ufodump -b 10
+    script run ufodump
+    script run ufodump -b 10
 ]]
 author = "Iceman"
 desc =
@@ -22,155 +22,155 @@ Arguments:
 -- Some globals
 local TIMEOUT = 2000 -- Shouldn't take longer than 2 seconds
 local DEBUG = false -- the debug flag
---- 
+---
 -- A debug printout-function
 local function dbg(args)
-	if DEBUG then
-		print("###", args)
-	end
-end 
---- 
+    if DEBUG then
+        print("###", args)
+    end
+end
+---
 -- This is only meant to be used when errors occur
 local function oops(err)
-	print("ERROR: ",err)
-	core.clearCommandBuffer()	
+    print("ERROR: ",err)
+    core.clearCommandBuffer()
 end
---- 
+---
 -- Usage help
 local function help()
-	print(desc)
-	print("Example usage")
-	print(example)
+    print(desc)
+    print("Example usage")
+    print(example)
 end
 --
 -- writes data to ascii textfile.
 function writeDumpFile(uid, blockData)
-		local destination = string.format("%s.eml", uid)
-		local file = io.open(destination, "w")
-		if file == nil then 
-			return nil, string.format("Could not write to file %s", destination)
-		end
-		local rowlen = string.len(blockData[1])
+        local destination = string.format("%s.eml", uid)
+        local file = io.open(destination, "w")
+        if file == nil then
+            return nil, string.format("Could not write to file %s", destination)
+        end
+        local rowlen = string.len(blockData[1])
 
-		for i,block in ipairs(blockData) do
-			if rowlen ~= string.len(block) then
-				print(string.format("WARNING: Dumpdata seems corrupted, line %d was not the same length as line 1",i))
-			end
-			file:write(block.."\n")
-		end
-		file:close()	
-		return destination
+        for i,block in ipairs(blockData) do
+            if rowlen ~= string.len(block) then
+                print(string.format("WARNING: Dumpdata seems corrupted, line %d was not the same length as line 1",i))
+            end
+            file:write(block.."\n")
+        end
+        file:close()
+        return destination
 end
 --
 --- Picks out and displays the data read from a tag
 -- Specifically, takes a usb packet, converts to a Command
--- (as in commands.lua), takes the data-array and 
+-- (as in commands.lua), takes the data-array and
 -- reads the number of bytes specified in arg1 (arg0 in c-struct)
 -- and displays the data
 -- @blockno just to print which block the data belong to
 -- @param usbpacket the data received from the device
 function showdata(blockno, data)
-	local xorkey = '55AA55AA55AA55AA6262'
-	local s = data.." | "
-	local dex = ''
-	local rs 
-	for i = 1, 20-4, 4 do
-		local item = string.sub(data, i, i+3)
-		local xor = string.sub(xorkey, i, i+3)
+    local xorkey = '55AA55AA55AA55AA6262'
+    local s = data.." | "
+    local dex = ''
+    local rs
+    for i = 1, 20-4, 4 do
+        local item = string.sub(data, i, i+3)
+        local xor = string.sub(xorkey, i, i+3)
 
-		if blockno > 2 then
-			rs = bit32.bxor(tonumber(item,16) , tonumber(xor,16))
-		else
-			rs = tonumber(item, 16)
-		end
-		dex = (dex..'%04X'):format(rs)
-	end 
-	s = s..dex.." | "
-	print( (" %02d | %s"):format(blockno,s))
+        if blockno > 2 then
+            rs = bit32.bxor(tonumber(item,16) , tonumber(xor,16))
+        else
+            rs = tonumber(item, 16)
+        end
+        dex = (dex..'%04X'):format(rs)
+    end
+    s = s..dex.." | "
+    print( (" %02d | %s"):format(blockno,s))
 end
 --
 -- Send a "raw" iso14443a package, ie "hf 14a raw" command
 function sendRaw(rawdata, options)
-	--print(">> ", rawdata)	
-	local flags = lib14a.ISO14A_COMMAND.ISO14A_NO_DISCONNECT + lib14a.ISO14A_COMMAND.ISO14A_RAW + lib14a.ISO14A_COMMAND.ISO14A_APPEND_CRC + lib14a.ISO14A_COMMAND.ISO14A_NO_RATS
-	local command = Command:new{cmd = cmds.CMD_READER_ISO_14443a, 
-									arg1 = flags, -- Send raw 
-									-- arg2 contains the length, which is half the length 
-									-- of the ASCII-string rawdata
-									arg2 = string.len(rawdata)/2, 
-									data = rawdata}
-	return lib14a.sendToDevice(command, options.ignore_response) 
+    --print(">> ", rawdata)
+    local flags = lib14a.ISO14A_COMMAND.ISO14A_NO_DISCONNECT + lib14a.ISO14A_COMMAND.ISO14A_RAW + lib14a.ISO14A_COMMAND.ISO14A_APPEND_CRC + lib14a.ISO14A_COMMAND.ISO14A_NO_RATS
+    local command = Command:new{cmd = cmds.CMD_READER_ISO_14443a,
+                                arg1 = flags, -- Send raw
+                                -- arg2 contains the length, which is half the length
+                                -- of the ASCII-string rawdata
+                                arg2 = string.len(rawdata)/2,
+                                data = rawdata}
+    return lib14a.sendToDevice(command, options.ignore_response)
 end
 --
 -- Sends an instruction to do nothing, only disconnect
 function disconnect()
-	local command = Command:new{cmd = cmds.CMD_READER_ISO_14443a, arg1 = 0,	}
-	-- We can ignore the response here, no ACK is returned for this command
-	-- Check /armsrc/iso14443a.c, ReaderIso14443a() for details
-	return lib14a.sendToDevice(command, true) 	
-	--core.console("hf 14a raw -r")	
-end			
---- 
+    local command = Command:new{cmd = cmds.CMD_READER_ISO_14443a, arg1 = 0,}
+    -- We can ignore the response here, no ACK is returned for this command
+    -- Check /armsrc/iso14443a.c, ReaderIso14443a() for details
+    return lib14a.sendToDevice(command, true)
+    --core.console("hf 14a raw -r")
+end
+---
 -- The main entry point
 function main(args)
 
-	local ignore_response = false
-	local endblock = 20
-	
-	-- Read the parameters
-	for o, a in getopt.getopt(args, 'hb:') do
-		if o == "h" then return help() end
-		if o == "b" then endblock = a end		
-	end
-	endblock = endblock or 20
-	
-	-- First of all, connect
-	info, err = lib14a.read(true, true)
-	if err then disconnect() return oops(err) end	
-	core.clearCommandBuffer()
-	
-	local blockData = {}
-	
-	-- Show tag info
-	print(("\nFound Card UID [%s]\n"):format(info.uid))
+    local ignore_response = false
+    local endblock = 20
 
-	print("blk | data             | xored")
-	print("----+------------------+-------------------")
-	for block = 00, endblock do
-		local cmd = string.format("10%02x00", block)
-		res, err = sendRaw(cmd , {ignore_response = ignore_response})		
-		if err then disconnect() return oops(err) end
-		
-		local cmd_response = Command.parse(res)
-		local len = tonumber(cmd_response.arg1) * 2
-		local data = string.sub(tostring(cmd_response.data), 0, len-4)
+    -- Read the parameters
+    for o, a in getopt.getopt(args, 'hb:') do
+        if o == "h" then return help() end
+        if o == "b" then endblock = a end
+    end
+    endblock = endblock or 20
 
-		showdata(block, data)
-		table.insert(blockData, data)
-	end 
-	print("----+------------------+-------------------")
-	disconnect()
-	
-	local filename, err = writeDumpFile(info.uid, blockData)
-	if err then return oops(err) end
+    -- First of all, connect
+    info, err = lib14a.read(true, true)
+    if err then disconnect() return oops(err) end
+    core.clearCommandBuffer()
 
-	print(string.format("\nDumped data into %s", filename))
+    local blockData = {}
+
+    -- Show tag info
+    print(("\nFound Card UID [%s]\n"):format(info.uid))
+
+    print("blk | data             | xored")
+    print("----+------------------+-------------------")
+    for block = 00, endblock do
+        local cmd = string.format("10%02x00", block)
+        res, err = sendRaw(cmd , {ignore_response = ignore_response})
+        if err then disconnect() return oops(err) end
+
+        local cmd_response = Command.parse(res)
+        local len = tonumber(cmd_response.arg1) * 2
+        local data = string.sub(tostring(cmd_response.data), 0, len-4)
+
+        showdata(block, data)
+        table.insert(blockData, data)
+    end
+    print("----+------------------+-------------------")
+    disconnect()
+
+    local filename, err = writeDumpFile(info.uid, blockData)
+    if err then return oops(err) end
+
+    print(string.format("\nDumped data into %s", filename))
 end
-	
+
 -------------------------
--- 	Testing
+-- Testing
 -------------------------
 function selftest()
-	DEBUG = true
-	dbg("Performing test")
-	main()
-	dbg("Tests done")
+    DEBUG = true
+    dbg("Performing test")
+    main()
+    dbg("Tests done")
 end
--- Flip the switch here to perform a sanity check. 
+-- Flip the switch here to perform a sanity check.
 -- It read a nonce in two different ways, as specified in the usage-section
-if "--test"==args then 
-	selftest()
-else 
-	-- Call the main 
-	main(args)
+if "--test"==args then
+    selftest()
+else
+    -- Call the main
+    main(args)
 end
\ No newline at end of file
diff --git a/client/scripts/ul_uid.lua b/client/scripts/ul_uid.lua
index d87939c4a..7dbb51b49 100644
--- a/client/scripts/ul_uid.lua
+++ b/client/scripts/ul_uid.lua
@@ -6,139 +6,139 @@ author = "Iceman"
 version = 'v1.0.0'
 desc = [[
 This script tries to set UID on a mifare Ultralight magic card which either
- - answers to chinese backdoor commands 
+ - answers to chinese backdoor commands
  - brickable magic tag  (must write in one session)
 ]]
 example = [[
-	 -- backdoor magic tag
-	 script run ul_uid -u 11223344556677
-	 
-	 -- brickable magic tag
-	 script run ul_uid -b -u 11223344556677
+     -- backdoor magic tag
+     script run ul_uid -u 11223344556677
+
+     -- brickable magic tag
+     script run ul_uid -b -u 11223344556677
 ]]
 usage = [[
 script run ul_uid -h -b -u <uid>
 
 Arguments:
-	-h             : this help
-	-u <UID>       : UID (14 hexsymbols)
-	-b             : write to brickable magic tag
+    -h             : this help
+    -u <UID>       : UID (14 hexsymbols)
+    -b             : write to brickable magic tag
 ]]
 
 local DEBUG = true
 local bxor = bit32.bxor
---- 
+---
 -- A debug printout-function
 local function dbg(args)
     if not DEBUG then return end
     if type(args) == "table" then
-		local i = 1
-		while args[i] do
-			dbg(args[i])
-			i = i+1
-		end
-	else
-		print("###", args)
-	end	
-end	
---- 
+        local i = 1
+        while args[i] do
+            dbg(args[i])
+            i = i+1
+        end
+    else
+        print("###", args)
+    end
+end
+---
 -- This is only meant to be used when errors occur
 local function oops(err)
-	print("ERROR: ",err)
-	return nil, err
+    print("ERROR: ",err)
+    return nil, err
 end
---- 
+---
 -- Usage help
 local function help()
-	print(copyright)
-	print(author)	
-	print(version)	
-	print(desc)
-	print('Example usage')
-	print(example)
+    print(copyright)
+    print(author)
+    print(version)
+    print(desc)
+    print('Example usage')
+    print(example)
 end
 --
 --- Set UID on magic command enabled
 function magicUID(b0, b1, b2)
 
-	print('Using backdoor Magic tag function')
+    print('Using backdoor Magic tag function')
 
-	-- write block 0
-	core.console("hf 14a raw -p -a -b 7 40")
-	core.console("hf 14a raw -p -a 43")
-	core.console("hf 14a raw -c -a A200"..b0)
+    -- write block 0
+    core.console("hf 14a raw -p -a -b 7 40")
+    core.console("hf 14a raw -p -a 43")
+    core.console("hf 14a raw -c -a A200"..b0)
 
-	-- write block 1
-	core.console("hf 14a raw -p -a -b 7 40")
-	core.console("hf 14a raw -p -a 43")
-	core.console("hf 14a raw -c -a A201"..b1)
+    -- write block 1
+    core.console("hf 14a raw -p -a -b 7 40")
+    core.console("hf 14a raw -p -a 43")
+    core.console("hf 14a raw -c -a A201"..b1)
 
-	-- write block 2	
-	core.console("hf 14a raw -p -a -b 7 40")
-	core.console("hf 14a raw -p -a 43")
-	core.console("hf 14a raw -c -a A202"..b2)
+    -- write block 2
+    core.console("hf 14a raw -p -a -b 7 40")
+    core.console("hf 14a raw -p -a 43")
+    core.console("hf 14a raw -c -a A202"..b2)
 end
 --
---- Set UID on magic but brickable 
+--- Set UID on magic but brickable
 function brickableUID(b0, b1, b2)
-	
-	print('Using BRICKABLE Magic tag function')
-	
-	core.console("hf 14a raw -p -s -3")
-	
-	-- write block 0
-	core.console("hf 14a raw -p -c A200"..b0)
 
-	-- write block 1
-	core.console("hf 14a raw -p -c A201"..b1)
+    print('Using BRICKABLE Magic tag function')
 
-	-- write block 2	
-	core.console("hf 14a raw -p -c A202"..b2)
+    core.console("hf 14a raw -p -s -3")
+
+    -- write block 0
+    core.console("hf 14a raw -p -c A200"..b0)
+
+    -- write block 1
+    core.console("hf 14a raw -p -c A201"..b1)
+
+    -- write block 2
+    core.console("hf 14a raw -p -c A202"..b2)
 end
---- 
+---
 -- The main entry point
 function main(args)
 
-	print( string.rep('--',20) )
-	print( string.rep('--',20) )	
-	print()
+    print( string.rep('--',20) )
+    print( string.rep('--',20) )
+    print()
 
-	local uid = '04112233445566'
-	local tagtype = 1
-	
-	-- Read the parameters
-	for o, a in getopt.getopt(args, 'hu:b') do
-		if o == "h" then return help() end
-		if o == "u" then uid = a end
-		if o == "b" then tagtype = 2 end
-	end	
-	
-	-- uid string checks
-	if uid == nil then return oops('empty uid string') end
-	if #uid == 0 then return oops('empty uid string') end
-	if #uid ~= 14 then return oops('uid wrong length. Should be 7 hex bytes') end
+    local uid = '04112233445566'
+    local tagtype = 1
 
-	local uidbytes = utils.ConvertHexToBytes(uid)
-	
-	local bcc1 = bxor(0x88, uidbytes[1], uidbytes[2], uidbytes[3])
-	local bcc2 = bxor(uidbytes[4], uidbytes[5], uidbytes[6], uidbytes[7])
-	
-	local block0 = string.format('%02X%02X%02X%02X', uidbytes[1], uidbytes[2], uidbytes[3], bcc1)
-	local block1 = string.format('%02X%02X%02X%02X', uidbytes[4], uidbytes[5], uidbytes[6], uidbytes[7])
-	local block2 = string.format('%02X%02X%02X%02X', bcc2, 0x48, 0x00, 0x00)
-	
-	print('new UID | '..uid)
-	
-	core.clearCommandBuffer()
-	
-	if tagtype == 2 then
-		brickableUID(block0, block1, block2)
-	else
-		magicUID(block0, block1, block2)
-	end
-	
-		--halt
-	core.console("hf 14a raw -c -a 5000")
+    -- Read the parameters
+    for o, a in getopt.getopt(args, 'hu:b') do
+        if o == "h" then return help() end
+        if o == "u" then uid = a end
+        if o == "b" then tagtype = 2 end
+    end
+
+    -- uid string checks
+    if uid == nil then return oops('empty uid string') end
+    if #uid == 0 then return oops('empty uid string') end
+    if #uid ~= 14 then return oops('uid wrong length. Should be 7 hex bytes') end
+
+    local uidbytes = utils.ConvertHexToBytes(uid)
+
+    local bcc1 = bxor(0x88, uidbytes[1], uidbytes[2], uidbytes[3])
+    local bcc2 = bxor(uidbytes[4], uidbytes[5], uidbytes[6], uidbytes[7])
+
+    local block0 = string.format('%02X%02X%02X%02X', uidbytes[1], uidbytes[2], uidbytes[3], bcc1)
+    local block1 = string.format('%02X%02X%02X%02X', uidbytes[4], uidbytes[5], uidbytes[6], uidbytes[7])
+    local block2 = string.format('%02X%02X%02X%02X', bcc2, 0x48, 0x00, 0x00)
+
+    print('new UID | '..uid)
+
+    core.clearCommandBuffer()
+
+    if tagtype == 2 then
+        brickableUID(block0, block1, block2)
+    else
+        magicUID(block0, block1, block2)
+    end
+
+        --halt
+    core.console("hf 14a raw -c -a 5000")
 end
 
 main(args)

From 2d1a077ae4a52c66ae6565cb2a4c40a3ceaffa7d Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 9 Mar 2019 10:40:45 +0100
Subject: [PATCH 0684/1938] lua: more fix mix of spaces & tabs

---
 client/lualibs/7816_error.lua      | 116 ++--
 client/lualibs/commands.lua        | 106 ++--
 client/lualibs/default_toys.lua    |  56 +-
 client/lualibs/default_toys_di.lua |  30 +-
 client/lualibs/getopt.lua          |  22 +-
 client/lualibs/hf_reader.lua       |  36 +-
 client/lualibs/html_dumplib.lua    | 262 ++++-----
 client/lualibs/htmlskel.lua        | 642 ++++++++++-----------
 client/lualibs/precalc.lua         |  94 ++--
 client/lualibs/read14a.lua         | 172 +++---
 client/lualibs/read14b.lua         | 204 +++----
 client/lualibs/read15.lua          | 230 ++++----
 client/lualibs/taglib.lua          |  18 +-
 client/lualibs/utils.lua           | 858 ++++++++++++++---------------
 14 files changed, 1423 insertions(+), 1423 deletions(-)

diff --git a/client/lualibs/7816_error.lua b/client/lualibs/7816_error.lua
index 47779388d..038f668fb 100644
--- a/client/lualibs/7816_error.lua
+++ b/client/lualibs/7816_error.lua
@@ -1,78 +1,78 @@
 --[[
 local _errorcodes = {
-	SW_NO_ERROR = 0x9000,
-	SW_BYTES_REMAINING_00 = 0x6100, -- Response bytes remaining 
-	SW_WARNING_STATE_UNCHANGED = 0x6200,  -- Warning, card state unchanged = 
-	SW_WRONG_LENGTH = 0x6700, -- : Wrong length
-	SW_WRONG_P1P2 = 0x6B00, --  : Incorrect parameters (P1,P2)
-	SW_CORRECT_LENGTH_00 = 0x6C00, -- : Correct Expected Length (Le)
-	SW_INS_NOT_SUPPORTED = 0x6D00, --  : INS value not supported
-	SW_CLA_NOT_SUPPORTED = 0x6E00, --  : CLA value not supported
-	SW_UNKNOWN = 0x6F00, --  : No precise diagnosis
+    SW_NO_ERROR = 0x9000,
+    SW_BYTES_REMAINING_00 = 0x6100, -- Response bytes remaining
+    SW_WARNING_STATE_UNCHANGED = 0x6200,  -- Warning, card state unchanged =
+    SW_WRONG_LENGTH = 0x6700, -- : Wrong length
+    SW_WRONG_P1P2 = 0x6B00, --  : Incorrect parameters (P1,P2)
+    SW_CORRECT_LENGTH_00 = 0x6C00, -- : Correct Expected Length (Le)
+    SW_INS_NOT_SUPPORTED = 0x6D00, --  : INS value not supported
+    SW_CLA_NOT_SUPPORTED = 0x6E00, --  : CLA value not supported
+    SW_UNKNOWN = 0x6F00, --  : No precise diagnosis
 
-	SW_LOGICAL_CHANNEL_NOT_SUPPORTED  = 0x6881, -- : Card does not support the operation on the specified logical channel
-	SW_SECURE_MESSAGING_NOT_SUPPORTED = 0x6882, --  : Card does not support secure messaging
-	SW_LAST_COMMAND_EXPECTED = 0x6883, --  : Last command in chain expected
-	SW_COMMAND_CHAINING_NOT_SUPPORTED = 0x6884, --  : Command chaining not supported
+    SW_LOGICAL_CHANNEL_NOT_SUPPORTED  = 0x6881, -- : Card does not support the operation on the specified logical channel
+    SW_SECURE_MESSAGING_NOT_SUPPORTED = 0x6882, --  : Card does not support secure messaging
+    SW_LAST_COMMAND_EXPECTED = 0x6883, --  : Last command in chain expected
+    SW_COMMAND_CHAINING_NOT_SUPPORTED = 0x6884, --  : Command chaining not supported
 
-	SW_SECURITY_STATUS_NOT_SATISFIED = 0x6982, --  : Security condition not satisfied
-	SW_FILE_INVALID = 0x6983, -- : File invalid 
-	SW_DATA_INVALID = 0x6984, --  : Data invalid
-	SW_CONDITIONS_NOT_SATISFIED = 0x6985, -- : Conditions of use not satisfied
-	SW_COMMAND_NOT_ALLOWED = 0x6986, --  : Command not allowed (no current EF)
-	SW_APPLET_SELECT_FAILED = 0x6999, --  : Applet selection failed
+    SW_SECURITY_STATUS_NOT_SATISFIED = 0x6982, --  : Security condition not satisfied
+    SW_FILE_INVALID = 0x6983, -- : File invalid
+    SW_DATA_INVALID = 0x6984, --  : Data invalid
+    SW_CONDITIONS_NOT_SATISFIED = 0x6985, -- : Conditions of use not satisfied
+    SW_COMMAND_NOT_ALLOWED = 0x6986, --  : Command not allowed (no current EF)
+    SW_APPLET_SELECT_FAILED = 0x6999, --  : Applet selection failed
 
-	SW_WRONG_DATA = 0x6A80, --  : Wrong data
-	SW_FUNC_NOT_SUPPORTED = 0x6A81, --  : Function not supported
-	SW_FILE_NOT_FOUND = 0x6A82, --  : File not found
-	SW_RECORD_NOT_FOUND = 0x6A83, --  : Record not found
-	SW_FILE_FULL = 0x6A84, --  : Not enough memory space in the file
-	SW_INCORRECT_P1P2 = 0x6A86, --  : Incorrect parameters (P1,P2)
+    SW_WRONG_DATA = 0x6A80, --  : Wrong data
+    SW_FUNC_NOT_SUPPORTED = 0x6A81, --  : Function not supported
+    SW_FILE_NOT_FOUND = 0x6A82, --  : File not found
+    SW_RECORD_NOT_FOUND = 0x6A83, --  : Record not found
+    SW_FILE_FULL = 0x6A84, --  : Not enough memory space in the file
+    SW_INCORRECT_P1P2 = 0x6A86, --  : Incorrect parameters (P1,P2)
 }
 --]]
 local _errorcodes = {
-	SW_NO_ERROR = '9000',
-	SW_BYTES_REMAINING_00 = '6100', -- Response bytes remaining 
-	SW_WARNING_STATE_UNCHANGED = '6200',  -- Warning', card state unchanged = 
-	SW_WRONG_LENGTH = '6700', -- : Wrong length
-	SW_WRONG_P1P2 = '6B00', --  : Incorrect parameters (P1,P2)
-	SW_CORRECT_LENGTH_00 = '6C00', -- : Correct Expected Length (Le)
-	SW_INS_NOT_SUPPORTED = '6D00', --  : INS value not supported
-	SW_CLA_NOT_SUPPORTED = '6E00', --  : CLA value not supported
-	SW_UNKNOWN = '6F00', --  : No precise diagnosis
+    SW_NO_ERROR = '9000',
+    SW_BYTES_REMAINING_00 = '6100', -- Response bytes remaining
+    SW_WARNING_STATE_UNCHANGED = '6200',  -- Warning', card state unchanged =
+    SW_WRONG_LENGTH = '6700', -- : Wrong length
+    SW_WRONG_P1P2 = '6B00', --  : Incorrect parameters (P1,P2)
+    SW_CORRECT_LENGTH_00 = '6C00', -- : Correct Expected Length (Le)
+    SW_INS_NOT_SUPPORTED = '6D00', --  : INS value not supported
+    SW_CLA_NOT_SUPPORTED = '6E00', --  : CLA value not supported
+    SW_UNKNOWN = '6F00', --  : No precise diagnosis
 
-	SW_LOGICAL_CHANNEL_NOT_SUPPORTED  = '6881', -- : Card does not support the operation on the specified logical channel
-	SW_SECURE_MESSAGING_NOT_SUPPORTED = '6882', --  : Card does not support secure messaging
-	SW_LAST_COMMAND_EXPECTED = '6883', --  : Last command in chain expected
-	SW_COMMAND_CHAINING_NOT_SUPPORTED = '6884', --  : Command chaining not supported
+    SW_LOGICAL_CHANNEL_NOT_SUPPORTED  = '6881', -- : Card does not support the operation on the specified logical channel
+    SW_SECURE_MESSAGING_NOT_SUPPORTED = '6882', --  : Card does not support secure messaging
+    SW_LAST_COMMAND_EXPECTED = '6883', --  : Last command in chain expected
+    SW_COMMAND_CHAINING_NOT_SUPPORTED = '6884', --  : Command chaining not supported
 
-	SW_SECURITY_STATUS_NOT_SATISFIED = '6982', --  : Security condition not satisfied
-	SW_FILE_INVALID = '6983', -- : File invalid 
-	SW_DATA_INVALID = '6984', --  : Data invalid
-	SW_CONDITIONS_NOT_SATISFIED = '6985', -- : Conditions of use not satisfied
-	SW_COMMAND_NOT_ALLOWED = '6986', --  : Command not allowed (no current EF)
-	SW_APPLET_SELECT_FAILED = '6999', --  : Applet selection failed
+    SW_SECURITY_STATUS_NOT_SATISFIED = '6982', --  : Security condition not satisfied
+    SW_FILE_INVALID = '6983', -- : File invalid
+    SW_DATA_INVALID = '6984', --  : Data invalid
+    SW_CONDITIONS_NOT_SATISFIED = '6985', -- : Conditions of use not satisfied
+    SW_COMMAND_NOT_ALLOWED = '6986', --  : Command not allowed (no current EF)
+    SW_APPLET_SELECT_FAILED = '6999', --  : Applet selection failed
 
-	SW_WRONG_DATA = '6A80', --  : Wrong data
-	SW_FUNC_NOT_SUPPORTED = '6A81', --  : Function not supported
-	SW_FILE_NOT_FOUND = '6A82', --  : File not found
-	SW_RECORD_NOT_FOUND = '6A83', --  : Record not found
-	SW_FILE_FULL = '6A84', --  : Not enough memory space in the file
-	SW_INCORRECT_P1P2 = '6A86', --  : Incorrect parameters (P1,P2)
+    SW_WRONG_DATA = '6A80', --  : Wrong data
+    SW_FUNC_NOT_SUPPORTED = '6A81', --  : Function not supported
+    SW_FILE_NOT_FOUND = '6A82', --  : File not found
+    SW_RECORD_NOT_FOUND = '6A83', --  : Record not found
+    SW_FILE_FULL = '6A84', --  : Not enough memory space in the file
+    SW_INCORRECT_P1P2 = '6A86', --  : Incorrect parameters (P1,P2)
 }
 
 local _reverse_lookup,k,v = {}
 for k, v in pairs(_errorcodes) do
-	_reverse_lookup[v] =  k
+    _reverse_lookup[v] =  k
 end
 
 _errorcodes.tostring = function(command)
-	if(type(command) == 'string') then
-		return ("%s (%d)"):format(_reverse_lookup[command] or "ERROR UNDEFINED!", command) 
-	end
-	if(type(command) == 'number') then
-		return ("%s (%d)"):format(_reverse_lookup[ tostring(command)] or "ERROR UNDEFINED!", command) 
-	end
-	return ("Error, numeric or string argument expected, got : %s"):format(tostring(command))
+    if(type(command) == 'string') then
+        return ("%s (%d)"):format(_reverse_lookup[command] or "ERROR UNDEFINED!", command)
+    end
+    if(type(command) == 'number') then
+        return ("%s (%d)"):format(_reverse_lookup[ tostring(command)] or "ERROR UNDEFINED!", command)
+    end
+    return ("Error, numeric or string argument expected, got : %s"):format(tostring(command))
 end
 return _errorcodes
\ No newline at end of file
diff --git a/client/lualibs/commands.lua b/client/lualibs/commands.lua
index e65d0f706..c493699c5 100644
--- a/client/lualibs/commands.lua
+++ b/client/lualibs/commands.lua
@@ -1,73 +1,73 @@
 --[[
-Handle Proxmark USB Commands 
+Handle Proxmark USB Commands
 --]]
 
 local _commands = require('usb_cmd')
 
 local _reverse_lookup,k,v = {}
-	for k, v in pairs(_commands) do
-		_reverse_lookup[v] =  k
-	end
-	_commands.tostring = function(command)
-	if(type(command) == 'number') then
-		return ("%s (%d)"):format(_reverse_lookup[command]or "ERROR UNDEFINED!", command) 
-	end
-	return ("Error, numeric argument expected, got : %s"):format(tostring(command))
+    for k, v in pairs(_commands) do
+        _reverse_lookup[v] =  k
+    end
+    _commands.tostring = function(command)
+    if(type(command) == 'number') then
+        return ("%s (%d)"):format(_reverse_lookup[command]or "ERROR UNDEFINED!", command)
+    end
+    return ("Error, numeric argument expected, got : %s"):format(tostring(command))
 end
 
 Command = {
 
-	new = function(self, o)
+    new = function(self, o)
 
-		local o = o or {}   -- create object if user does not provide one
-		setmetatable(o, self) -- DIY inheritance a'la javascript
-		self.__index = self
+        local o = o or {}   -- create object if user does not provide one
+        setmetatable(o, self) -- DIY inheritance a'la javascript
+        self.__index = self
 
-		o.cmd = o.cmd or _commands.CMD_UNKNOWN
-		o.arg1 = o.arg1 or 0
-		o.arg2 = o.arg2 or 0
-		o.arg3 = o.arg3 or 0 
-		local data = o.data or "0"
+        o.cmd = o.cmd or _commands.CMD_UNKNOWN
+        o.arg1 = o.arg1 or 0
+        o.arg2 = o.arg2 or 0
+        o.arg3 = o.arg3 or 0
+        local data = o.data or "0"
 
-		if(type(data) == 'string') then
-			-- We need to check if it is correct length, otherwise pad it
-			local len = string.len(data)
-			if(len < 1024) then  
-				--Should be 1024 hex characters to represent 512 bytes of data 
-				data = data .. string.rep("0",1024 - len ) 
-			end
-			if(len > 1024) then
-				-- OOps, a bit too much data here
-				print( ( "WARNING: data size too large, was %s chars, will be truncated "):format(len) )
-				--
-				data = data:sub(1,1024)
-			end
-		else 
-			print(("WARNING; data was NOT a (hex-) string, but was %s"):format(type(data)))
-		end
-		o.data = data
-		return o
-	end,
-	parse = function (packet)
-		local count, cmd, arg1, arg2, arg3, data = bin.unpack('LLLLH511', packet)
-		return Command:new{cmd = cmd, arg1 = arg1, arg2 = arg2, arg3 = arg3, data = data}
-	end
+        if(type(data) == 'string') then
+            -- We need to check if it is correct length, otherwise pad it
+            local len = string.len(data)
+            if(len < 1024) then
+                --Should be 1024 hex characters to represent 512 bytes of data
+                data = data .. string.rep("0",1024 - len )
+            end
+            if(len > 1024) then
+                -- OOps, a bit too much data here
+                print( ( "WARNING: data size too large, was %s chars, will be truncated "):format(len) )
+                --
+                data = data:sub(1,1024)
+            end
+        else
+            print(("WARNING; data was NOT a (hex-) string, but was %s"):format(type(data)))
+        end
+        o.data = data
+        return o
+    end,
+    parse = function (packet)
+        local count, cmd, arg1, arg2, arg3, data = bin.unpack('LLLLH511', packet)
+        return Command:new{cmd = cmd, arg1 = arg1, arg2 = arg2, arg3 = arg3, data = data}
+    end
 
 }
 function Command:__tostring()
-	local output = ("%s\r\nargs : (%s, %s, %s)\r\ndata:\r\n%s\r\n"):format(
-		_commands.tostring(self.cmd),
-		tostring(self.arg1),
-	 	tostring(self.arg2),
-	 	tostring(self.arg3),
-	 	tostring(self.data))
-	return output
+    local output = ("%s\r\nargs : (%s, %s, %s)\r\ndata:\r\n%s\r\n"):format(
+        _commands.tostring(self.cmd),
+        tostring(self.arg1),
+        tostring(self.arg2),
+        tostring(self.arg3),
+        tostring(self.data))
+    return output
 end
 function Command:getBytes()
-	--If a hex-string has been used
-	local data  = self.data
-	local cmd = self.cmd 
-	local arg1, arg2, arg3 = self.arg1, self.arg2, self.arg3
-	return bin.pack("LLLLH",cmd, arg1, arg2, arg3, data);
+    --If a hex-string has been used
+    local data  = self.data
+    local cmd = self.cmd
+    local arg1, arg2, arg3 = self.arg1, self.arg2, self.arg3
+    return bin.pack("LLLLH",cmd, arg1, arg2, arg3, data);
 end
 return _commands
diff --git a/client/lualibs/default_toys.lua b/client/lualibs/default_toys.lua
index 62fe88f31..a0591c1fc 100644
--- a/client/lualibs/default_toys.lua
+++ b/client/lualibs/default_toys.lua
@@ -185,25 +185,25 @@ local _names = {
 
 {"404", "9401", "0030", "earth", "legendary","Bash"},
 {"416", "a001", "0030", "magic", "legendary", "Spyro"},
-	--{"", "", "0030", "magic", "legendary", "Deja Vu"},
+    --{"", "", "0030", "magic", "legendary", "Deja Vu"},
 {"419", "a301", "0030", "tech", "legendary", "Trigger Happy"},
-	--{"", "", "0030", "tech", "legendary", "bouncer"},
-	--{"", "", "0030", "tech", "legendary", "jawbreaker"},
+    --{"", "", "0030", "tech", "legendary", "bouncer"},
+    --{"", "", "0030", "tech", "legendary", "jawbreaker"},
 {"430", "ae01", "0030", "undead", "legendary", "Chop Chop"},
-	--{"", "", "0030", "undead", "legendary", "grim creeper"},
-	--{"", "", "0030", "undead", "legendary", "night shift"},
-	
-	--{"", "", "0030", "air", "legendary", "blades"},
-	--{"", "", "0030", "air", "legendary", "jet vac"},	
-	--{"", "", "0030", "air", "legendary", "Free Ranger"},
-	--{"", "", "0030", "life", "legendary", "stealth elf"},
-	--{"", "", "0030", "life", "legendary", "Bushwhack"},
-	--{"", "", "0030", "fire", "legendary", "ignitor"},
-	--{"", "", "0030", "water", "legendary", "slam bam"},
-	--{"", "", "0030", "water", "legendary", "chill"},
+    --{"", "", "0030", "undead", "legendary", "grim creeper"},
+    --{"", "", "0030", "undead", "legendary", "night shift"},
+
+    --{"", "", "0030", "air", "legendary", "blades"},
+    --{"", "", "0030", "air", "legendary", "jet vac"},
+    --{"", "", "0030", "air", "legendary", "Free Ranger"},
+    --{"", "", "0030", "life", "legendary", "stealth elf"},
+    --{"", "", "0030", "life", "legendary", "Bushwhack"},
+    --{"", "", "0030", "fire", "legendary", "ignitor"},
+    --{"", "", "0030", "water", "legendary", "slam bam"},
+    --{"", "", "0030", "water", "legendary", "chill"},
+
+    --{"", "", "0030", "", "legendary", "zoo lou"},
 
-	--{"", "", "0030", "", "legendary", "zoo lou"},	
-	
 {"450", "c201", "0030", "air", "trapmaster", "Gusto"},
 --{"450", "c201", "0234", "air", "trapmaster", "Special Gusto"},
 {"451", "c301", "0030", "air", "trapmaster", "Thunderbolt"},
@@ -453,23 +453,23 @@ local _names = {
 
 local function find( main, sub)
     main = main:lower()
-	sub = sub:lower()
+    sub = sub:lower()
     for k, v in pairs(_names) do
-		if ( v[2]:lower() == main and v[3]:lower() == sub) then
-			return v
-		end
-	end
-	return nil
+        if ( v[2]:lower() == main and v[3]:lower() == sub) then
+            return v
+        end
+    end
+    return nil
 end
 local function list()
-	print ("Type\tSub\tElement\tGame            Name")
-	print (string.rep('=', 54))
+    print ("Type\tSub\tElement\tGame            Name")
+    print (string.rep('=', 54))
     for k, v in pairs(_names) do
-		print(("%s\t%s\t%s\t%-9s\t%s"):format(v[2],v[3],v[4], v[5], v[6] ))
-	end 
+        print(("%s\t%s\t%s\t%-9s\t%s"):format(v[2],v[3],v[4], v[5], v[6] ))
+    end
 end
 
 return {
-	Find = find,
-	List = list,
+    Find = find,
+    List = list,
 }
diff --git a/client/lualibs/default_toys_di.lua b/client/lualibs/default_toys_di.lua
index 4d5d75020..8060dbcd4 100644
--- a/client/lualibs/default_toys_di.lua
+++ b/client/lualibs/default_toys_di.lua
@@ -1,5 +1,5 @@
-    --[[ 
-		decimal, di edition, model name
+    --[[
+        decimal, di edition, model name
     --]]
 local _names = {
 {"1000001","1","Mr. Incredible"},
@@ -319,8 +319,8 @@ local _names = {
 {"4000226","3","?? unknown ??"},
 {"4000227","3","?? unknown ??"},
 {"4000229","3","Quad Jumper"},
---[[ 
-	these below are Portals. Not to be used for tags.
+--[[
+    these below are Portals. Not to be used for tags.
 --]]
 {"8032384","0","Infinity Base - 3DS"},
 {"8032385","0","Infinity Base - Xbox"},
@@ -332,21 +332,21 @@ local _names = {
 local function find( main )
     main = main:lower()
     for k, v in pairs(_names) do
-		if ( v[1]:lower() == main ) then
-			return v
-		end
-	end
-	return nil
+        if ( v[1]:lower() == main ) then
+            return v
+        end
+    end
+    return nil
 end
 local function list()
-	print ("Type\tEdition\t Model name")
-	print (string.rep('=', 54))
+    print ("Type\tEdition\t Model name")
+    print (string.rep('=', 54))
     for k, v in pairs(_names) do
-		print(("%s\t%s\t%s"):format(v[1],v[2],v[3] ))
-	end 
+        print(("%s\t%s\t%s"):format(v[1],v[2],v[3] ))
+    end
 end
 
 return {
-	Find = find,
-	List = list,
+    Find = find,
+    List = list,
 }
diff --git a/client/lualibs/getopt.lua b/client/lualibs/getopt.lua
index add11842a..2265c106b 100644
--- a/client/lualibs/getopt.lua
+++ b/client/lualibs/getopt.lua
@@ -7,19 +7,19 @@ https://github.com/attractivechaos/klib/blob/master/lua/klib.lua
 
 --[[
   The MIT License
-  
+
   Copyright (c) 2011, Attractive Chaos <attractor@live.co.uk>
-  
+
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal
   in the Software without restriction, including without limitation the rights
   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
   copies of the Software, and to permit persons to whom the Software is
   furnished to do so, subject to the following conditions:
-  
+
   The above copyright notice and this permission notice shall be included in
   all copies or substantial portions of the Software.
-  
+
   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -56,8 +56,8 @@ local function getopt(args, ostr)
   return function ()
     if place == 0 then -- update scanning pointer
       place = 1
-      if #args == 0 
-        or args[1]:sub(1, 1) ~= '-' then 
+      if #args == 0
+        or args[1]:sub(1, 1) ~= '-' then
         place = 0; return nil end
       if #args[1] >= 2 then
         place = place + 1
@@ -96,12 +96,12 @@ local function getopt(args, ostr)
            if ostr:sub(1, 1) == ':' then return ':' end
           return '?';
         else arg = args[1] end
-		end
-			table.remove(args, 1);
-			place = 0;
-		end
+        end
+            table.remove(args, 1);
+            place = 0;
+        end
     return optopt, arg;
   end
 end
 
-return { getopt = getopt } 
+return { getopt = getopt }
diff --git a/client/lualibs/hf_reader.lua b/client/lualibs/hf_reader.lua
index c9970f772..d0550a335 100644
--- a/client/lualibs/hf_reader.lua
+++ b/client/lualibs/hf_reader.lua
@@ -1,7 +1,7 @@
 --[[
-THIS IS WORK IN PROGREESS, very much not finished. 
+THIS IS WORK IN PROGREESS, very much not finished.
 
-This library utilises other libraries under the hood, but can be used as a generic reader for 13.56MHz tags. 
+This library utilises other libraries under the hood, but can be used as a generic reader for 13.56MHz tags.
 ]]
 
 local reader14443A = require('read14a')
@@ -10,26 +10,26 @@ local reader15693 = require('read15')
 
 ---
 -- This method library can be set waits or a 13.56 MHz tag, and when one is found, returns info about
--- what tag it is. 
--- 
+-- what tag it is.
+--
 -- @return if successfull: an table containing card info
 -- @return if unsuccessfull : nil, error
 local function waitForTag()
-	print("Waiting for card... press any key to quit")
-	local readers = {reader14443A, reader14443B, reader15693}
-	local i = 0;
-	while not core.ukbhit() do
-		i = (i % 3) +1
-		r = readers[i]
-		print("Reading with ",i)
-		res, err = r.read()
-		if res then return res end
-		print(err)
-			-- err means that there was no response from card
-	end
-	return nil, "Aborted by user"
+    print("Waiting for card... press any key to quit")
+    local readers = {reader14443A, reader14443B, reader15693}
+    local i = 0;
+    while not core.ukbhit() do
+        i = (i % 3) +1
+        r = readers[i]
+        print("Reading with ",i)
+        res, err = r.read()
+        if res then return res end
+        print(err)
+            -- err means that there was no response from card
+    end
+    return nil, "Aborted by user"
 end
 
 return {
-	waitForTag = waitForTag,
+    waitForTag = waitForTag,
 }
\ No newline at end of file
diff --git a/client/lualibs/html_dumplib.lua b/client/lualibs/html_dumplib.lua
index 59cebf593..de462f19b 100644
--- a/client/lualibs/html_dumplib.lua
+++ b/client/lualibs/html_dumplib.lua
@@ -2,154 +2,154 @@ bin = require('bin')
 
 
 -------------------------------
--- Some utilities 
+-- Some utilities
 -------------------------------
 
---- 
+---
 -- A debug printout-function
 local function dbg(args)
-	
+
     if type(args) == "table" then
-		local i = 1
-		while args[i] do
-			print("###", args[i])
-			i = i+1
-		end
-	else
-		print("###", args)
-	end	
-end	
---- 
+        local i = 1
+        while args[i] do
+            print("###", args[i])
+            i = i+1
+        end
+    else
+        print("###", args)
+    end
+end
+---
 -- This is only meant to be used when errors occur
 local function oops(err)
-	print("ERROR: ",err)
-	return nil, err
+    print("ERROR: ",err)
+    return nil, err
 end
 
 local function save_HTML(javascript, filename)
 
-	-- Read the HTML-skel file
-	local skel = require("htmlskel")
-	html = skel.getHTML(javascript);
+    -- Read the HTML-skel file
+    local skel = require("htmlskel")
+    html = skel.getHTML(javascript);
 
-	-- Open the output file
-	
-	local outfile = io.open(filename, "w")
-	if outfile == nil then 
-		return oops(string.format("Could not write to file %s",tostring(filename)))
-	end
-	-- Write the data into it
-	outfile:write(html)
-	io.close(outfile)
+    -- Open the output file
 
-	-- Done
-	return filename
+    local outfile = io.open(filename, "w")
+    if outfile == nil then
+        return oops(string.format("Could not write to file %s",tostring(filename)))
+    end
+    -- Write the data into it
+    outfile:write(html)
+    io.close(outfile)
+
+    -- Done
+    return filename
 
 end
 
 local function save_TEXT(data,filename)
-	-- Open the output file
-	local outfile = io.open(filename, "w")
-	if outfile == nil then 
-		return oops(string.format("Could not write to file %s",tostring(filename)))
-	end
-	
-	outfile:write(data)
-	io.close(outfile)
-	return filename   
+    -- Open the output file
+    local outfile = io.open(filename, "w")
+    if outfile == nil then
+        return oops(string.format("Could not write to file %s",tostring(filename)))
+    end
+
+    outfile:write(data)
+    io.close(outfile)
+    return filename
 end
 
 local function save_BIN(data, filename)
-	-- Open the output file
-	
-	local outfile = io.open(filename, "wb")
-	if outfile == nil then 
-		return oops(string.format("Could not write to file %s",tostring(filename)))
-	end
-	
-	-- Write the data into it
-	local i = 1
-	while data[i] do
-		outfile:write(data[i])
-		i = i+1
-	end
-	
-	io.close(outfile)
-	return filename   
+    -- Open the output file
+
+    local outfile = io.open(filename, "wb")
+    if outfile == nil then
+        return oops(string.format("Could not write to file %s",tostring(filename)))
+    end
+
+    -- Write the data into it
+    local i = 1
+    while data[i] do
+        outfile:write(data[i])
+        i = i+1
+    end
+
+    io.close(outfile)
+    return filename
 end
 
 local function convert_ascii_dump_to_JS(infile)
-	local t = infile:read("*all")
-	local cleaned
-	local output = "[";
-	for line in string.gmatch(t, "[^\n]+") do 
-	    if string.byte(line,1) ~= string.byte("+",1) then
-			cleaned = (line or ''):gsub('%s+','')
-			output = output .. "'"..cleaned.."',\n"
+    local t = infile:read("*all")
+    local cleaned
+    local output = "[";
+    for line in string.gmatch(t, "[^\n]+") do
+        if string.byte(line,1) ~= string.byte("+",1) then
+            cleaned = (line or ''):gsub('%s+','')
+            output = output .. "'"..cleaned.."',\n"
         end
-	end
-	output = output .. "]"
-	return output
+    end
+    output = output .. "]"
+    return output
 end
 
 local function convert_binary_dump_to_JS(infile, blockLen)
-	 local bindata = infile:read("*all")
-	 len = string.len(bindata)
+     local bindata = infile:read("*all")
+     len = string.len(bindata)
 
-	if len % blockLen ~= 0 then 
-		return oops(("Bad data, length (%d) should be a multiple of blocklen (%d)"):format(len, blockLen))
-	end
+    if len % blockLen ~= 0 then
+        return oops(("Bad data, length (%d) should be a multiple of blocklen (%d)"):format(len, blockLen))
+    end
 
-	local _,hex = bin.unpack(("H%d"):format(len),bindata)
+    local _,hex = bin.unpack(("H%d"):format(len),bindata)
 
-	-- Now that we've converted binary data into hex, we doubled the size. 
-	-- One byte, like 0xDE is now 
-	-- the characters 'D' and 'E' : one byte each. 
-	-- Thus:
-	blockLen = blockLen * 2
+    -- Now that we've converted binary data into hex, we doubled the size.
+    -- One byte, like 0xDE is now
+    -- the characters 'D' and 'E' : one byte each.
+    -- Thus:
+    blockLen = blockLen * 2
 
-	local js,i = "[";
-	for i = 1, string.len(hex),blockLen do
-		js = js .."'" ..string.sub(hex,i,i+blockLen -1).."',\n"
-	end
-	js = js .. "]"
-	return js
+    local js,i = "[";
+    for i = 1, string.len(hex),blockLen do
+        js = js .."'" ..string.sub(hex,i,i+blockLen -1).."',\n"
+    end
+    js = js .. "]"
+    return js
 end
 
 local function convert_ascii_dump_to_BIN(infile)
-	local t = infile:read("*all")
-	local cleaned
-	local output = {};
-	for line in string.gmatch(t, "[^\n]+") do 
-		if string.byte(line) ~= string.byte("+") then
-			cleaned = (line or ''):gsub('%s+','')
-			for c in cleaned:gmatch('..') do				
-				output[#output+1] = string.char( tonumber(c,16) )
-			end
-		end
-	end
-	return output
+    local t = infile:read("*all")
+    local cleaned
+    local output = {};
+    for line in string.gmatch(t, "[^\n]+") do
+        if string.byte(line) ~= string.byte("+") then
+            cleaned = (line or ''):gsub('%s+','')
+            for c in cleaned:gmatch('..') do
+                output[#output+1] = string.char( tonumber(c,16) )
+            end
+        end
+    end
+    return output
 end
 
 
 ---
--- Converts a .eml-file into a HTML/Javascript file. 
+-- Converts a .eml-file into a HTML/Javascript file.
 -- @param input the file to convert
 -- @param output the file to write to
--- @return the name of the new file. 
+-- @return the name of the new file.
 local function convert_eml_to_html(input, output)
-	input = input or 'dumpdata.eml'
-	output = output or input .. 'html'
+    input = input or 'dumpdata.eml'
+    output = output or input .. 'html'
 
-	local infile = io.open(input, "r")
-	if infile == nil then 
-		return oops(string.format("Could not read file %s",tostring(input)))
-	end
+    local infile = io.open(input, "r")
+    if infile == nil then
+        return oops(string.format("Could not read file %s",tostring(input)))
+    end
 
-	-- Read file, get JS
-	local javascript = convert_ascii_dump_to_JS(infile)
-	io.close(infile)
-	return save_HTML(javascript, output )
+    -- Read file, get JS
+    local javascript = convert_ascii_dump_to_JS(infile)
+    io.close(infile)
+    return save_HTML(javascript, output )
 end
 
 --- Converts a binary dump into HTML/Javascript file
@@ -157,46 +157,46 @@ end
 -- @param output the file to write to
 -- @param blockLen, the length of each block. Defaults to 16 bytes
 local function convert_bin_to_html(input, output, blockLen)
-	input = input or 'dumpdata.bin'
-	blockLen = blockLen or 16
-	output = output or input .. 'html'
+    input = input or 'dumpdata.bin'
+    blockLen = blockLen or 16
+    output = output or input .. 'html'
 
-	local infile = io.open(input, "rb")
-	if infile == nil then 
-		return oops(string.format("Could not read file %s",tostring(input)))
-	end
-	-- Read file, get JS
-	local javascript = convert_binary_dump_to_JS(infile, blockLen)
-	io.close(infile)
+    local infile = io.open(input, "rb")
+    if infile == nil then
+        return oops(string.format("Could not read file %s",tostring(input)))
+    end
+    -- Read file, get JS
+    local javascript = convert_binary_dump_to_JS(infile, blockLen)
+    io.close(infile)
 
-	return save_HTML(javascript, output )
+    return save_HTML(javascript, output )
 end
 
 --- Converts a eml dump into a binary file
 -- @param input the file containing the eml-dump  (defaults to dumpdata.eml)
 -- @param output the file to write to  ( defaults to dumpdata.bin)
 local function convert_eml_to_bin(input, output)
-	input = input or 'dumpdata.eml'
-	output = output or 'dumpdata.bin'
+    input = input or 'dumpdata.eml'
+    output = output or 'dumpdata.bin'
 
-	local infile = io.open(input, "rb")
-	if infile == nil then 
-		return oops(string.format("Could not read file %s",tostring(input)))
-	end
-	-- Read file, get BIN
-	local data = convert_ascii_dump_to_BIN(infile)
-	io.close(infile)
+    local infile = io.open(input, "rb")
+    if infile == nil then
+        return oops(string.format("Could not read file %s",tostring(input)))
+    end
+    -- Read file, get BIN
+    local data = convert_ascii_dump_to_BIN(infile)
+    io.close(infile)
 
-	return save_BIN(data, output )
+    return save_BIN(data, output )
 end
 
 
 return {
-	convert_bin_to_html = convert_bin_to_html,
-	convert_eml_to_html = convert_eml_to_html,
-	convert_eml_to_bin = convert_eml_to_bin,
+    convert_bin_to_html = convert_bin_to_html,
+    convert_eml_to_html = convert_eml_to_html,
+    convert_eml_to_bin = convert_eml_to_bin,
     SaveAsBinary = save_BIN,
-	SaveAsText = save_TEXT,
+    SaveAsText = save_TEXT,
     SaveAsBinary = save_BIN,
-	SaveAsText = save_TEXT,
+    SaveAsText = save_TEXT,
 }
diff --git a/client/lualibs/htmlskel.lua b/client/lualibs/htmlskel.lua
index f216df1e1..ee5f6583e 100644
--- a/client/lualibs/htmlskel.lua
+++ b/client/lualibs/htmlskel.lua
@@ -2,360 +2,360 @@ local skel_1 = [[
 <html>
 <head>
 
-	<script>
-		var dictionary =  {}
-		function add(commaSeparated)
-		{
-			var fields = commaSeparated.split(",");
-			var manufacturerCode = fields[0];
-			var modelCode 	= fields[1];
-			var modelSubCode= fields[2];
-			var modelName 	= fields[3]; 
-			var ATQA 		= fields[4];
-			var SAK 		= fields[5];
+    <script>
+        var dictionary =  {}
+        function add(commaSeparated)
+        {
+            var fields = commaSeparated.split(",");
+            var manufacturerCode = fields[0];
+            var modelCode   = fields[1];
+            var modelSubCode= fields[2];
+            var modelName   = fields[3];
+            var ATQA        = fields[4];
+            var SAK         = fields[5];
 
-			//In the data below, wrong endian is used. Mifare is 
-			// written as "0004" instead of "0400", so we need to 
-			// flip it
-			ATQA = ATQA.substr(2,4)+ATQA.substr(0,2)
+            //In the data below, wrong endian is used. Mifare is
+            // written as "0004" instead of "0400", so we need to
+            // flip it
+            ATQA = ATQA.substr(2,4)+ATQA.substr(0,2)
 
-			var info = {
-				modelCode : modelCode, 
-				modelSubCode : modelSubCode,
-				modelName : modelName,
-				ATQA 	: ATQA, 
-				SAK 	: SAK
-			}
-			console.log("Adding "+modelName+" , "+SAK)
+            var info = {
+                modelCode : modelCode,
+                modelSubCode : modelSubCode,
+                modelName : modelName,
+                ATQA    : ATQA,
+                SAK     : SAK
+            }
+            console.log("Adding "+modelName+" , "+SAK)
 
-			dictionary[ATQA] = dictionary[ATQA] || [];
-			dictionary[ATQA].push(info)
-		}
-		function lookup(atqa, sak)
-		{
-			if (!dictionary[atqa]) return "UNKNOWN";
+            dictionary[ATQA] = dictionary[ATQA] || [];
+            dictionary[ATQA].push(info)
+        }
+        function lookup(atqa, sak)
+        {
+            if (!dictionary[atqa]) return "UNKNOWN";
 
-			var possibleMatches = [];
-			for(var i = 0 ; i < dictionary[atqa].length ; i++)
-			{
+            var possibleMatches = [];
+            for(var i = 0 ; i < dictionary[atqa].length ; i++)
+            {
 
-				var info = dictionary[atqa][i];
-				console.log("Comparing "+sak+ " with "+ info.SAK);
-				if(sak && info.SAK == sak)//exact match
-				{
-					return info.modelName;
-//					possibleMatches.push(info.modelName);
-				}else //SAK unknown
-				{
-					possibleMatches.push(info.modelName);
-				}
-			}
-			if(possibleMatches.length > 0)
-				return possibleMatches.join(" or ");
-			return "UNKNOWN"
-		}
+                var info = dictionary[atqa][i];
+                console.log("Comparing "+sak+ " with "+ info.SAK);
+                if(sak && info.SAK == sak)//exact match
+                {
+                    return info.modelName;
+//                  possibleMatches.push(info.modelName);
+                }else //SAK unknown
+                {
+                    possibleMatches.push(info.modelName);
+                }
+            }
+            if(possibleMatches.length > 0)
+                return possibleMatches.join(" or ");
+            return "UNKNOWN"
+        }
 
-		add("04,,,Mifare TNP3xxx Activision 1K,0f01,01");
-		add("04,,,Mifare Mini,0004,09");
-		add("04,,,Mifare Classic 1k/Mifare Plus(4 byte UID) 2K SL1,0004,08");
-		add("04,,,Mifare Plus (4 byte UID) 2K SL2,0004,10");
-		add("04,,,Mifare Plus (4 byte UID) 4K SL2,0004,11");
-		add("04,,,Mifare Plus (4 byte UID) 4K SL1,0004,18");
-		add("04,,,Mifare Plus (4 byte UID) 2K/4K SL3,0004,20");
-		add("04,,,Mifare Classic 4K,0002,18");
-		add("xx,,,NDEF Tags,0044,00  ");
-		add("04,,,Mifare Ultralight/UltralightC,0044,04");
-		add("04,,,Mifare Plus (7 byte UID) 2K SL1,0042,08");
-		add("04,,,Mifare Plus (7 byte UID) 2K SL1,0044,08");
-		add("04,,,Mifare Plus (7 byte UID) 4K SL1,0042,18");
-		add("04,,,Mifare Plus (7 byte UID) 4K SL1,0044,18");
-		add("04,,,Mifare Plus (7 byte UID),0042,10");
-		add("04,,,Mifare Plus (7 byte UID),0044,10");
-		add("04,,,Mifare Plus (7 byte UID),0042,11");
-		add("04,,,Mifare Plus (7 byte UID),0044,11");
-		add("04,,,Mifare Plus (7 byte UID),0042,20");
-		add("04,,,Mifare Plus (7 byte UID),0044,20");
-		add("04,,,Mifare DesFire / DesFire EV1,0344,20067577810280");
-		add("04,,,JCOP31,0304,283877B14A434F503331");
-		add("04,,,JCOP31 v2.4.1,0048,207877B1024A434F5076323431");
-		add("04,,,JCOP41 v2.2,0048,203833B14A434F503431563232");
-		add("04,,,JCOP41 v2.3.1,0004,283833B14A434F50343156323331");
-		add("05,,,Mifare Classic 1K,0004,88");
-		add("40,,,MPCOS,0002,98");
-		add("25,,,Topaz/Topaz512/Jewel,0C00,");
-		add("1D,,,FM1208SH01,0004,53");
-		add("1D,,,FM1208,0008,20");
-		add("Nokia,,,Mifare Classic 4K emulated by Nokia 6212,0002,38");
-		add("Nokia,,,Mifare Classic 4K emulated by Nokia 6131,0008,38");
-		add("04,,,Smart MX with Mifare 4K emulation,0002");
-		add("04,,,Smart MX with Mifare 4K emulation,0102");
-		add("04,,,Smart MX with Mifare 4K emulation,0202");
-		add("04,,,Smart MX with Mifare 4K emulation,0302");
-		add("04,,,Smart MX with Mifare 4K emulation,0402");
-		add("04,,,Smart MX with Mifare 4K emulation,0502");
-		add("04,,,Smart MX with Mifare 4K emulation,0602");
-		add("04,,,Smart MX with Mifare 4K emulation,0702");
-		add("04,,,Smart MX with Mifare 4K emulation,0802");
-		add("04,,,Smart MX with Mifare 4K emulation,0902");
-		add("04,,,Smart MX with Mifare 4K emulation,0A02");
-		add("04,,,Smart MX with Mifare 4K emulation,0B02");
-		add("04,,,Smart MX with Mifare 4K emulation,0C02");
-		add("04,,,Smart MX with Mifare 4K emulation,0D02");
-		add("04,,,Smart MX with Mifare 4K emulation,0E02");
-		add("04,,,Smart MX with Mifare 4K emulation,0F02");
-		add("04,,,Smart MX with Mifare 1K emulation,0004");
-		add("04,,,Smart MX with Mifare 1K emulation,0104");
-		add("04,,,Smart MX with Mifare 1K emulation,0204");
-		add("04,,,Smart MX with Mifare 1K emulation,0304");
-		add("04,,,Smart MX with Mifare 1K emulation,0404");
-		add("04,,,Smart MX with Mifare 1K emulation,0504");
-		add("04,,,Smart MX with Mifare 1K emulation,0604");
-		add("04,,,Smart MX with Mifare 1K emulation,0704");
-		add("04,,,Smart MX with Mifare 1K emulation,0804");
-		add("04,,,Smart MX with Mifare 1K emulation,0904");
-		add("04,,,Smart MX with Mifare 1K emulation,0A04");
-		add("04,,,Smart MX with Mifare 1K emulation,0B04");
-		add("04,,,Smart MX with Mifare 1K emulation,0C04");
-		add("04,,,Smart MX with Mifare 1K emulation,0D04");
-		add("04,,,Smart MX with Mifare 1K emulation,0E04");
-		add("04,,,Smart MX with Mifare 1K emulation,0F04");
-		add("04,,,Smart MX with 7 byte UID,0048");
-		add("04,,,Smart MX with 7 byte UID,0148");
-		add("04,,,Smart MX with 7 byte UID,0248");
-		add("04,,,Smart MX with 7 byte UID,0348");
-		add("04,,,Smart MX with 7 byte UID,0448");
-		add("04,,,Smart MX with 7 byte UID,0548");
-		add("04,,,Smart MX with 7 byte UID,0648");
-		add("04,,,Smart MX with 7 byte UID,0748");
-		add("04,,,Smart MX with 7 byte UID,0848");
-		add("04,,,Smart MX with 7 byte UID,0948");
-		add("04,,,Smart MX with 7 byte UID,0A48");
-		add("04,,,Smart MX with 7 byte UID,0B48");
-		add("04,,,Smart MX with 7 byte UID,0C48");
-		add("04,,,Smart MX with 7 byte UID,0D48");
-		add("04,,,Smart MX with 7 byte UID,0E48");
-		add("04,,,Smart MX with 7 byte UID,0F48");	
-	</script>
+        add("04,,,Mifare TNP3xxx Activision 1K,0f01,01");
+        add("04,,,Mifare Mini,0004,09");
+        add("04,,,Mifare Classic 1k/Mifare Plus(4 byte UID) 2K SL1,0004,08");
+        add("04,,,Mifare Plus (4 byte UID) 2K SL2,0004,10");
+        add("04,,,Mifare Plus (4 byte UID) 4K SL2,0004,11");
+        add("04,,,Mifare Plus (4 byte UID) 4K SL1,0004,18");
+        add("04,,,Mifare Plus (4 byte UID) 2K/4K SL3,0004,20");
+        add("04,,,Mifare Classic 4K,0002,18");
+        add("xx,,,NDEF Tags,0044,00  ");
+        add("04,,,Mifare Ultralight/UltralightC,0044,04");
+        add("04,,,Mifare Plus (7 byte UID) 2K SL1,0042,08");
+        add("04,,,Mifare Plus (7 byte UID) 2K SL1,0044,08");
+        add("04,,,Mifare Plus (7 byte UID) 4K SL1,0042,18");
+        add("04,,,Mifare Plus (7 byte UID) 4K SL1,0044,18");
+        add("04,,,Mifare Plus (7 byte UID),0042,10");
+        add("04,,,Mifare Plus (7 byte UID),0044,10");
+        add("04,,,Mifare Plus (7 byte UID),0042,11");
+        add("04,,,Mifare Plus (7 byte UID),0044,11");
+        add("04,,,Mifare Plus (7 byte UID),0042,20");
+        add("04,,,Mifare Plus (7 byte UID),0044,20");
+        add("04,,,Mifare DesFire / DesFire EV1,0344,20067577810280");
+        add("04,,,JCOP31,0304,283877B14A434F503331");
+        add("04,,,JCOP31 v2.4.1,0048,207877B1024A434F5076323431");
+        add("04,,,JCOP41 v2.2,0048,203833B14A434F503431563232");
+        add("04,,,JCOP41 v2.3.1,0004,283833B14A434F50343156323331");
+        add("05,,,Mifare Classic 1K,0004,88");
+        add("40,,,MPCOS,0002,98");
+        add("25,,,Topaz/Topaz512/Jewel,0C00,");
+        add("1D,,,FM1208SH01,0004,53");
+        add("1D,,,FM1208,0008,20");
+        add("Nokia,,,Mifare Classic 4K emulated by Nokia 6212,0002,38");
+        add("Nokia,,,Mifare Classic 4K emulated by Nokia 6131,0008,38");
+        add("04,,,Smart MX with Mifare 4K emulation,0002");
+        add("04,,,Smart MX with Mifare 4K emulation,0102");
+        add("04,,,Smart MX with Mifare 4K emulation,0202");
+        add("04,,,Smart MX with Mifare 4K emulation,0302");
+        add("04,,,Smart MX with Mifare 4K emulation,0402");
+        add("04,,,Smart MX with Mifare 4K emulation,0502");
+        add("04,,,Smart MX with Mifare 4K emulation,0602");
+        add("04,,,Smart MX with Mifare 4K emulation,0702");
+        add("04,,,Smart MX with Mifare 4K emulation,0802");
+        add("04,,,Smart MX with Mifare 4K emulation,0902");
+        add("04,,,Smart MX with Mifare 4K emulation,0A02");
+        add("04,,,Smart MX with Mifare 4K emulation,0B02");
+        add("04,,,Smart MX with Mifare 4K emulation,0C02");
+        add("04,,,Smart MX with Mifare 4K emulation,0D02");
+        add("04,,,Smart MX with Mifare 4K emulation,0E02");
+        add("04,,,Smart MX with Mifare 4K emulation,0F02");
+        add("04,,,Smart MX with Mifare 1K emulation,0004");
+        add("04,,,Smart MX with Mifare 1K emulation,0104");
+        add("04,,,Smart MX with Mifare 1K emulation,0204");
+        add("04,,,Smart MX with Mifare 1K emulation,0304");
+        add("04,,,Smart MX with Mifare 1K emulation,0404");
+        add("04,,,Smart MX with Mifare 1K emulation,0504");
+        add("04,,,Smart MX with Mifare 1K emulation,0604");
+        add("04,,,Smart MX with Mifare 1K emulation,0704");
+        add("04,,,Smart MX with Mifare 1K emulation,0804");
+        add("04,,,Smart MX with Mifare 1K emulation,0904");
+        add("04,,,Smart MX with Mifare 1K emulation,0A04");
+        add("04,,,Smart MX with Mifare 1K emulation,0B04");
+        add("04,,,Smart MX with Mifare 1K emulation,0C04");
+        add("04,,,Smart MX with Mifare 1K emulation,0D04");
+        add("04,,,Smart MX with Mifare 1K emulation,0E04");
+        add("04,,,Smart MX with Mifare 1K emulation,0F04");
+        add("04,,,Smart MX with 7 byte UID,0048");
+        add("04,,,Smart MX with 7 byte UID,0148");
+        add("04,,,Smart MX with 7 byte UID,0248");
+        add("04,,,Smart MX with 7 byte UID,0348");
+        add("04,,,Smart MX with 7 byte UID,0448");
+        add("04,,,Smart MX with 7 byte UID,0548");
+        add("04,,,Smart MX with 7 byte UID,0648");
+        add("04,,,Smart MX with 7 byte UID,0748");
+        add("04,,,Smart MX with 7 byte UID,0848");
+        add("04,,,Smart MX with 7 byte UID,0948");
+        add("04,,,Smart MX with 7 byte UID,0A48");
+        add("04,,,Smart MX with 7 byte UID,0B48");
+        add("04,,,Smart MX with 7 byte UID,0C48");
+        add("04,,,Smart MX with 7 byte UID,0D48");
+        add("04,,,Smart MX with 7 byte UID,0E48");
+        add("04,,,Smart MX with 7 byte UID,0F48");
+    </script>
 
-	<style>
-		* {
-			background-color: #2F3440;
-			background-color:#232323;
-			color : #F5E5C0;
-			xtext-transform: uppercase;
-			font-size: 1.05em;
-			font-family: monospace,Arial;
-		}
-		table{
-			float:left;
-			border: 1px solid white;
-		}
-		td {
-			empty-cells: show;
-		}
-		td.blockzero, .turqoise{
-			color: rgb(140, 245, 193);
-		}
-		td.key_a, .yellow{
-			color : #F8CA4D;
-		}
-		td.key_b, .blue{
-			color : #3F5666;
-		}
-		td.accessconditions, .red{
-			color : #EA6045;
-		}
-	
-		td.sectorhdr{
-			border-top: 1px solid white;
-		}
-	</style>
-	<script>
-	/** Jquery for the poor **/
-	function dc(x){return document.createElement(x)}
+    <style>
+        * {
+            background-color: #2F3440;
+            background-color:#232323;
+            color : #F5E5C0;
+            xtext-transform: uppercase;
+            font-size: 1.05em;
+            font-family: monospace,Arial;
+        }
+        table{
+            float:left;
+            border: 1px solid white;
+        }
+        td {
+            empty-cells: show;
+        }
+        td.blockzero, .turqoise{
+            color: rgb(140, 245, 193);
+        }
+        td.key_a, .yellow{
+            color : #F8CA4D;
+        }
+        td.key_b, .blue{
+            color : #3F5666;
+        }
+        td.accessconditions, .red{
+            color : #EA6045;
+        }
 
-	function tr(table){
-		var row = dc('tr');
-		table.appendChild(row);
-		return row;
-	}
-	function td(row, text){
-		var tdata = dc('td');
-		row.appendChild(tdata);
-		tdata.appendChild(document.createTextNode(text))
-		return tdata;
-	}
+        td.sectorhdr{
+            border-top: 1px solid white;
+        }
+    </style>
+    <script>
+    /** Jquery for the poor **/
+    function dc(x){return document.createElement(x)}
 
-	/**
-	* The identifiers that determine how to highlight data and present information
-	**/
-	var identifiers = [
-		function(data)
-		{
-			// Should be 32 characters long ( 16 bytes per block)
-			if(data[0].length != 32) { return false; }
-			// ... add more checks if necessary ... 
+    function tr(table){
+        var row = dc('tr');
+        table.appendChild(row);
+        return row;
+    }
+    function td(row, text){
+        var tdata = dc('td');
+        row.appendChild(tdata);
+        tdata.appendChild(document.createTextNode(text))
+        return tdata;
+    }
 
-			var info = {Type : "Mifare"}
-			info['Size'] = (data[0].length / 2 * data.length) + " Bytes";
-			info['UID'] = data[0].substring(0,8);
-			info['SAK'] = data[0].substring(10,12);
-			info['ATQA'] = data[0].substring(12,16);
+    /**
+    * The identifiers that determine how to highlight data and present information
+    **/
+    var identifiers = [
+        function(data)
+        {
+            // Should be 32 characters long ( 16 bytes per block)
+            if(data[0].length != 32) { return false; }
+            // ... add more checks if necessary ...
 
-			info['Name'] = lookup(info.ATQA, info.SAK);
-			return {info: info, highlighter : mifareHighlighter }
-		},
-		function(data)
-		{
-			// Should be 8 characters long ( 4 bytes per block)
-			if(data[0].length != 8) { return false; }
-			// ... add more checks if necessary ... 
-			var info = {Type : "NDEF"}
-			info['Size'] = (data[0].length / 2 * data.length) + " Bytes";
+            var info = {Type : "Mifare"}
+            info['Size'] = (data[0].length / 2 * data.length) + " Bytes";
+            info['UID'] = data[0].substring(0,8);
+            info['SAK'] = data[0].substring(10,12);
+            info['ATQA'] = data[0].substring(12,16);
 
-			return {info: info, highlighter : ndefHighligheter }
-		}, 
+            info['Name'] = lookup(info.ATQA, info.SAK);
+            return {info: info, highlighter : mifareHighlighter }
+        },
+        function(data)
+        {
+            // Should be 8 characters long ( 4 bytes per block)
+            if(data[0].length != 8) { return false; }
+            // ... add more checks if necessary ...
+            var info = {Type : "NDEF"}
+            info['Size'] = (data[0].length / 2 * data.length) + " Bytes";
 
-		function(data)
-		{//This is the catch-all
-			return {info: {type : "Unknown"}, highlighter : noHighlighter}
-		}
-	]
-	
+            return {info: info, highlighter : ndefHighligheter }
+        },
 
-	/**
-	* Helper function to convert bin-data into printable chars
-	**/
-
-	function to_ascii(hexval)
-	{
-		var intval = parseInt(hexval,16);
-		if(intval > 31 && intval < 127)
-		{
-			return String.fromCharCode(intval);
-		}
-		return ".";
-	}
+        function(data)
+        {//This is the catch-all
+            return {info: {type : "Unknown"}, highlighter : noHighlighter}
+        }
+    ]
 
 
-	function loadIntoTable(data, info, ascii)
-	{
-		var t = dc("table")
-		for(var i = 0 ; i < data.length ; i++)
-		{
-			line = data[i];
-			var row = tr(t);
-			var bytes = line.match(/(.{1,2})/g);
-			for(var b = 0 ; b < bytes.length ; b++)
-			{
-					var elem = td(row, ascii ? to_ascii(bytes[b]) : bytes[b]);
-					info.highlighter.addClass(elem,i,b, bytes[b]);
-			}
-		}
-		document.body.appendChild(t);
-	}
-	function loadGeneralInfo(data, info)
-	{
-		var t = dc("table");
-		for (var key in info)
-		{
-			var row = tr(t);
-			td(row,key);
-			td(row,info[key]);			
-		}
-		document.body.appendChild(t);
-	}
+    /**
+    * Helper function to convert bin-data into printable chars
+    **/
 
-	function handle(dump)
-	{
-		var data = dump.data;
-		var info = null;
-		for(var i = 0; i < identifiers.length && !info; i++)
-			info = identifiers[i](data);
+    function to_ascii(hexval)
+    {
+        var intval = parseInt(hexval,16);
+        if(intval > 31 && intval < 127)
+        {
+            return String.fromCharCode(intval);
+        }
+        return ".";
+    }
 
-		console.log(info);
 
-		loadIntoTable(data, info, false);
-		loadIntoTable(data, info, true);
-		loadGeneralInfo(data, info.info);
+    function loadIntoTable(data, info, ascii)
+    {
+        var t = dc("table")
+        for(var i = 0 ; i < data.length ; i++)
+        {
+            line = data[i];
+            var row = tr(t);
+            var bytes = line.match(/(.{1,2})/g);
+            for(var b = 0 ; b < bytes.length ; b++)
+            {
+                    var elem = td(row, ascii ? to_ascii(bytes[b]) : bytes[b]);
+                    info.highlighter.addClass(elem,i,b, bytes[b]);
+            }
+        }
+        document.body.appendChild(t);
+    }
+    function loadGeneralInfo(data, info)
+    {
+        var t = dc("table");
+        for (var key in info)
+        {
+            var row = tr(t);
+            td(row,key);
+            td(row,info[key]);
+        }
+        document.body.appendChild(t);
+    }
 
-	}
-	var noHighlighter = {
-		addClass : function(el ,line, byte)
-		{
-			return;
-		}
-	};
-	var ndefHighligheter = {
-		addClass : function(el ,line, byte, value)
-		{
-			if(line  < 3)
-			{
-				el.className += " red";
-			}
-			if ( line == 3)
-			{
-				console.log(value);
-				if( byte == 0 && "e1" == value.toLowerCase())	el.className += " turqoise";
-				if( byte == 1 )	el.className += " yellow";
-				if( byte == 2 )	el.className += " blue";
-				return;
-			}
-		}
-	};
-	var mifareHighlighter = {
-		addClass : function(el ,line, byte)
-		{
-			if (line == 0)
-			{
-				el.className += " blockzero";
-			}
-			
-			if(line < 128){
-				linesPerSector = 4;
-			} else {
-				//Quadruple size sectors
-				linesPerSector = 16;
-				line = line - 128;
-			}
+    function handle(dump)
+    {
+        var data = dump.data;
+        var info = null;
+        for(var i = 0; i < identifiers.length && !info; i++)
+            info = identifiers[i](data);
 
-			if(line % linesPerSector == 0)
-			{
-				el.className += " sectorhdr";
-			}
-			if(line % linesPerSector == (linesPerSector -1))
-			{
-				el.className += " sectortrailer";
-				if(byte == undefined)
-				{
-					return;
-				}		
+        console.log(info);
 
-				if(byte < 6) el.className += " key_a";
-				else if(byte < 10) el.className += " accessconditions";
-				else el.className += " key_b";
-			}
+        loadIntoTable(data, info, false);
+        loadIntoTable(data, info, true);
+        loadGeneralInfo(data, info.info);
 
-		}
-	};
+    }
+    var noHighlighter = {
+        addClass : function(el ,line, byte)
+        {
+            return;
+        }
+    };
+    var ndefHighligheter = {
+        addClass : function(el ,line, byte, value)
+        {
+            if(line  < 3)
+            {
+                el.className += " red";
+            }
+            if ( line == 3)
+            {
+                console.log(value);
+                if( byte == 0 && "e1" == value.toLowerCase()) el.className += " turqoise";
+                if( byte == 1 ) el.className += " yellow";
+                if( byte == 2 ) el.className += " blue";
+                return;
+            }
+        }
+    };
+    var mifareHighlighter = {
+        addClass : function(el ,line, byte)
+        {
+            if (line == 0)
+            {
+                el.className += " blockzero";
+            }
+
+            if(line < 128){
+                linesPerSector = 4;
+            } else {
+                //Quadruple size sectors
+                linesPerSector = 16;
+                line = line - 128;
+            }
+
+            if(line % linesPerSector == 0)
+            {
+                el.className += " sectorhdr";
+            }
+            if(line % linesPerSector == (linesPerSector -1))
+            {
+                el.className += " sectortrailer";
+                if(byte == undefined)
+                {
+                    return;
+                }
+
+                if(byte < 6) el.className += " key_a";
+                else if(byte < 10) el.className += " accessconditions";
+                else el.className += " key_b";
+            }
+
+        }
+    };
+
+    </script>
 
-	</script>
-	
 </head>
 <body></body>
 <script>
-	var x = { data : 
+    var x = { data :
 ]]
 local skel_2 = [[
-			
-		};
-	handle(x);
-	</script>
+
+        };
+    handle(x);
+    </script>
 </html>
 
 ]]
 local function getHTML(data)
-	return skel_1 .. data .. skel_2
+    return skel_1 .. data .. skel_2
 end
 
 return {getHTML = getHTML}
diff --git a/client/lualibs/precalc.lua b/client/lualibs/precalc.lua
index cedad4cf2..71d91c05a 100644
--- a/client/lualibs/precalc.lua
+++ b/client/lualibs/precalc.lua
@@ -1,5 +1,5 @@
 --[[
-	This is an experimental lib. 
+    This is an experimental lib.
 --]]
 local utils = require('utils')
 
@@ -35,60 +35,60 @@ shifts[9]= { 0xD, 0xB, 0x0, 0x6, 0x6, 0x0, 0xB, 0xD, 0xA, 0xC, 0x7, 0x1, 0x1, 0x
 shifts[10]= { 0xe, 0x1, 0x1, 0xe, 0x1, 0xe, 0xe, 0x1, 0x1, 0xe, 0xe, 0x1, 0xe, 0x1, 0x1, 0xe }
 
 local function ApplyPermutationAndShifts( pos, value, nibble)
-	local shiftbytes = shifts[pos]
-	local shiftElem = shiftbytes[nibble+1] --one indexed
-	local shiftOne = shiftbytes[1]
-	local rs = bit32.bxor(value, shiftOne, shiftElem)
-	return rs
+    local shiftbytes = shifts[pos]
+    local shiftElem = shiftbytes[nibble+1] --one indexed
+    local shiftOne = shiftbytes[1]
+    local rs = bit32.bxor(value, shiftOne, shiftElem)
+    return rs
 end
 
 local function GetOne( uid, block )
 
-	if uid == nil then return nil, 'empty uid string' end
-	if #uid == 0 then return nil, 'empty uid string' end
-	if #uid ~= 8 then return nil, 'uid wrong length. Should be 4 hex bytes' end
-	if type(block) ~= 'number' then return nil, 'block is not number' end
-	if  block > 16 or block < 0 then return nil, 'block is out-of-range' end
-	
-	local s = ('%s%02X'):format(uid,block)
-	local nibble1 = tonumber(s:sub(1,1),16) + 1
+    if uid == nil then return nil, 'empty uid string' end
+    if #uid == 0 then return nil, 'empty uid string' end
+    if #uid ~= 8 then return nil, 'uid wrong length. Should be 4 hex bytes' end
+    if type(block) ~= 'number' then return nil, 'block is not number' end
+    if  block > 16 or block < 0 then return nil, 'block is out-of-range' end
 
-	local permuted = ''
-	for i = 1, #s do		
-		local el_row = shifts[i]
-		local el_value = el_row[nibble1] 
-		j = 1
-		while j <= i do
-			if  i-j > 0 then 
-				local nibble = tonumber(s:sub(j+1,j+1),16) 
-				el_value = ApplyPermutationAndShifts(i-j, el_value, nibble)
-			end
-			j = j+1
-		end 
-		permuted =('%s%X'):format(permuted,el_value)
-	end	
+    local s = ('%s%02X'):format(uid,block)
+    local nibble1 = tonumber(s:sub(1,1),16) + 1
 
-	permuted = 'C2'..permuted
-	local crc64numStr = utils.Crc64(permuted)
-	local keybytes = utils.ConvertAsciiToBytes(crc64numStr, true)
-	local key = utils.ConvertBytesToHex(keybytes) 
-	return key:sub(1,12)
+    local permuted = ''
+    for i = 1, #s do
+        local el_row = shifts[i]
+        local el_value = el_row[nibble1]
+        j = 1
+        while j <= i do
+            if  i-j > 0 then
+                local nibble = tonumber(s:sub(j+1,j+1),16)
+                el_value = ApplyPermutationAndShifts(i-j, el_value, nibble)
+            end
+            j = j+1
+        end
+        permuted =('%s%X'):format(permuted,el_value)
+    end
+
+    permuted = 'C2'..permuted
+    local crc64numStr = utils.Crc64(permuted)
+    local keybytes = utils.ConvertAsciiToBytes(crc64numStr, true)
+    local key = utils.ConvertBytesToHex(keybytes)
+    return key:sub(1,12)
 end
 
-local PreCalc = 
+local PreCalc =
 {
-	GetAll = function(id)
-		if id == nil then return nil, 'empty string' end
-		if #id == 0 then return nil, 'empty string' end
-		if #id ~= 8 then return nil, 'wrong length. Should be 4 hex bytes' end
-		
-		local list = '4b0b20107ccb'
-		for i = 1,15 do
-			local key, err  = GetOne(id,i)
-			if not key then return oops(err) end
-			list = list..key
-		end
-		return list
-	end,
+    GetAll = function(id)
+        if id == nil then return nil, 'empty string' end
+        if #id == 0 then return nil, 'empty string' end
+        if #id ~= 8 then return nil, 'wrong length. Should be 4 hex bytes' end
+
+        local list = '4b0b20107ccb'
+        for i = 1,15 do
+            local key, err  = GetOne(id,i)
+            if not key then return oops(err) end
+            list = list..key
+        end
+        return list
+    end,
 }
 return PreCalc
\ No newline at end of file
diff --git a/client/lualibs/read14a.lua b/client/lualibs/read14a.lua
index 9e53cacca..8ed87f5eb 100644
--- a/client/lualibs/read14a.lua
+++ b/client/lualibs/read14a.lua
@@ -1,32 +1,32 @@
 --[[
-	This is a library to read 14443a tags. It can be used something like this
+    This is a library to read 14443a tags. It can be used something like this
 
-	local reader = require('read14a')
-	result, err = reader.read14443a()
-	if not result then
-		print(err)
-		return
-	end
-	print(result.name)
+    local reader = require('read14a')
+    result, err = reader.read14443a()
+    if not result then
+        print(err)
+        return
+    end
+    print(result.name)
 
 --]]
 -- Loads the commands-library
 local cmds = require('commands')
 local TIMEOUT = 2000 -- Shouldn't take longer than 2 seconds
 local ISO14A_COMMAND = {
-	ISO14A_CONNECT = 1,
-	ISO14A_NO_DISCONNECT = 2,
-	ISO14A_APDU = 4,
-	ISO14A_RAW = 8,
-	ISO14A_REQUEST_TRIGGER = 0x10,
-	ISO14A_APPEND_CRC = 0x20,
-	ISO14A_SET_TIMEOUT = 0x40,
-	ISO14A_NO_SELECT = 0x80,
-	ISO14A_TOPAZMODE = 0x100,
-	ISO14A_NO_RATS = 0x200
+    ISO14A_CONNECT = 1,
+    ISO14A_NO_DISCONNECT = 2,
+    ISO14A_APDU = 4,
+    ISO14A_RAW = 8,
+    ISO14A_REQUEST_TRIGGER = 0x10,
+    ISO14A_APPEND_CRC = 0x20,
+    ISO14A_SET_TIMEOUT = 0x40,
+    ISO14A_NO_SELECT = 0x80,
+    ISO14A_TOPAZMODE = 0x100,
+    ISO14A_NO_RATS = 0x200
 }
 
-local ISO14443a_TYPES = {}		
+local ISO14443a_TYPES = {}
 ISO14443a_TYPES[0x00] = "NXP MIFARE Ultralight | Ultralight C | NTAG"
 ISO14443a_TYPES[0x01] = "NXP MIFARE TNP3xxx Activision Game Appliance"
 ISO14443a_TYPES[0x04] = "NXP MIFARE (various !DESFire !DESFire EV1)"
@@ -45,50 +45,50 @@ ISO14443a_TYPES[0x98] = "Gemplus MPCOS"
 
 
 local function tostring_14443a(sak)
-	return ISO14443a_TYPES[sak] or ("Unknown (SAK=%x)"):format(sak)
+    return ISO14443a_TYPES[sak] or ("Unknown (SAK=%x)"):format(sak)
 end
 
 local function parse14443a(data)
-	--[[
+    --[[
 
-	Based on this struct : 
+    Based on this struct :
 
-	typedef struct {
-		byte_t uid[10];
-		byte_t uidlen;
-		byte_t atqa[2];
-		byte_t sak;
-		byte_t ats_len;
-		byte_t ats[256];
-	} __attribute__((__packed__)) iso14a_card_select_t;
+    typedef struct {
+        byte_t uid[10];
+        byte_t uidlen;
+        byte_t atqa[2];
+        byte_t sak;
+        byte_t ats_len;
+        byte_t ats[256];
+    } __attribute__((__packed__)) iso14a_card_select_t;
 
-	--]]
+    --]]
 
-	local count, uid, uidlen, atqa, sak, ats_len, ats = bin.unpack('H10CH2CC',data)
-	uid = uid:sub(1, 2*uidlen)
-	--print("uid, atqa, sak: ",uid, atqa, sak)
-	--print("TYPE: ", tostring_1443a(sak))
-	return { uid = uid, atqa  = atqa, sak = sak, name = tostring_14443a(sak), data = data}
+    local count, uid, uidlen, atqa, sak, ats_len, ats = bin.unpack('H10CH2CC',data)
+    uid = uid:sub(1, 2*uidlen)
+    --print("uid, atqa, sak: ",uid, atqa, sak)
+    --print("TYPE: ", tostring_1443a(sak))
+    return { uid = uid, atqa  = atqa, sak = sak, name = tostring_14443a(sak), data = data}
 end
 
 --- Sends a USBpacket to the device
 -- @param command - the usb packet to send
 -- @param ignoreresponse - if set to true, we don't read the device answer packet
--- 		which is usually recipe for fail. If not sent, the host will wait 2s for a
--- 		response of type CMD_ACK
--- @return 	packet,nil if successfull
---			nil, errormessage if unsuccessfull
+--     which is usually recipe for fail. If not sent, the host will wait 2s for a
+--     response of type CMD_ACK
+-- @return packet,nil if successfull
+--         nil, errormessage if unsuccessfull
 local function sendToDevice(command, ignoreresponse)
-	--core.clearCommandBuffer()
-	local err = core.SendCommand(command:getBytes())
-	if err then
-		print(err)
-		return nil, err
-	end
-	if ignoreresponse then return nil,nil end
+    --core.clearCommandBuffer()
+    local err = core.SendCommand(command:getBytes())
+    if err then
+        print(err)
+        return nil, err
+    end
+    if ignoreresponse then return nil,nil end
 
-	local response = core.WaitForResponseTimeout(cmds.CMD_ACK, TIMEOUT)
-	return response,nil
+    local response = core.WaitForResponseTimeout(cmds.CMD_ACK, TIMEOUT)
+    return response,nil
 end
 
 -- This function does a connect and retrieves som einfo
@@ -96,34 +96,34 @@ end
 -- @return if successfull: an table containing card info
 -- @return if unsuccessfull : nil, error
 local function read14443a(dont_disconnect, no_rats)
-	local command, result, info, err, data
+    local command, result, info, err, data
 
-	command = Command:new{cmd = cmds.CMD_READER_ISO_14443a, arg1 = ISO14A_COMMAND.ISO14A_CONNECT }
+    command = Command:new{cmd = cmds.CMD_READER_ISO_14443a, arg1 = ISO14A_COMMAND.ISO14A_CONNECT }
 
-	if dont_disconnect then
-		command.arg1 = command.arg1 + ISO14A_COMMAND.ISO14A_NO_DISCONNECT
-	end
-	if no_rats then
-		command.arg1 = command.arg1 + ISO14A_COMMAND.ISO14A_NO_RATS
-	end
-	
-	local result,err = sendToDevice(command)
-	if result then
-		local count,cmd,arg0,arg1,arg2 = bin.unpack('LLLL',result)
-		if arg0 == 0 then
-			return nil, "iso14443a card select failed"
-		end
-		data = string.sub(result,count)
-		info, err = parse14443a(data)
-	else
-		err ="No response from card"
-	end
+    if dont_disconnect then
+        command.arg1 = command.arg1 + ISO14A_COMMAND.ISO14A_NO_DISCONNECT
+    end
+    if no_rats then
+        command.arg1 = command.arg1 + ISO14A_COMMAND.ISO14A_NO_RATS
+    end
 
-	if err then
-		print(err)
-		return nil, err
-	end
-	return info
+    local result,err = sendToDevice(command)
+    if result then
+        local count,cmd,arg0,arg1,arg2 = bin.unpack('LLLL',result)
+        if arg0 == 0 then
+            return nil, "iso14443a card select failed"
+        end
+        data = string.sub(result,count)
+        info, err = parse14443a(data)
+    else
+        err ="No response from card"
+    end
+
+    if err then
+        print(err)
+        return nil, err
+    end
+    return info
 end
 
 ---
@@ -131,20 +131,20 @@ end
 -- @return if successfull: an table containing card info
 -- @return if unsuccessfull : nil, error
 local function waitFor14443a()
-	print("Waiting for card... press any key to quit")
-	while not core.ukbhit() do
-		res, err = read14443a()
-		if res then return res end
-		-- err means that there was no response from card
-	end
-	return nil, "Aborted by user"
+    print("Waiting for card... press any key to quit")
+    while not core.ukbhit() do
+        res, err = read14443a()
+        if res then return res end
+        -- err means that there was no response from card
+    end
+    return nil, "Aborted by user"
 end
 local library = {
-	read = read14443a,
-	waitFor14443a = waitFor14443a,
-	parse14443a = parse14443a,
-	sendToDevice = sendToDevice,
-	ISO14A_COMMAND = ISO14A_COMMAND,
+    read = read14443a,
+    waitFor14443a = waitFor14443a,
+    parse14443a = parse14443a,
+    sendToDevice = sendToDevice,
+    ISO14A_COMMAND = ISO14A_COMMAND,
 }
 
 return library
diff --git a/client/lualibs/read14b.lua b/client/lualibs/read14b.lua
index b92fb0b3b..3711c02a3 100644
--- a/client/lualibs/read14b.lua
+++ b/client/lualibs/read14b.lua
@@ -1,13 +1,13 @@
 --[[
-	This is a library to read 14443b tags. It can be used something like this
+    This is a library to read 14443b tags. It can be used something like this
 
-	local reader = require('read14b')
-	result, err = reader.select1443b()
-	if not result then
-		print(err)
-		return
-	end
-	print(result.name)
+    local reader = require('read14b')
+    result, err = reader.select1443b()
+    if not result then
+        print(err)
+        return
+    end
+    print(result.name)
 
 --]]
 -- Loads the commands-library
@@ -15,68 +15,68 @@ local cmds = require('commands')
 local utils = require('utils')
 local TIMEOUT = 2500
 local ISO14B_COMMAND = {
-	ISO14B_CONNECT = 1,
-	ISO14B_DISCONNECT = 2,
-	ISO14B_APDU = 4,
-	ISO14B_RAW = 8,
-	ISO14B_REQUEST_TRIGGER = 0x10,
-	ISO14B_APPEND_CRC = 0x20,
-	ISO14B_SELECT_STD = 0x40,
-	ISO14B_SELECT_SR = 0x80,
+    ISO14B_CONNECT = 1,
+    ISO14B_DISCONNECT = 2,
+    ISO14B_APDU = 4,
+    ISO14B_RAW = 8,
+    ISO14B_REQUEST_TRIGGER = 0x10,
+    ISO14B_APPEND_CRC = 0x20,
+    ISO14B_SELECT_STD = 0x40,
+    ISO14B_SELECT_SR = 0x80,
 }
 
 local function parse1443b(data)
-	--[[
-	
-	Based on this struct : 
-	
-	typedef struct {
-		byte_t uid[10];
-		byte_t uidlen;
-		byte_t atqb[7];
-		byte_t chipid;
-		byte_t cid;
-	} __attribute__((__packed__)) iso14b_card_select_t;
+    --[[
 
-	--]]
-	
-	local count, uid, uidlen, atqb, chipid, cid = bin.unpack('H10CH7CC',data)
-	uid = uid:sub(1, 2*uidlen)
-	return { uid = uid, uidlen = uidlen, atqb = atqb, chipid = chipid, cid = cid }
+    Based on this struct :
+
+    typedef struct {
+        byte_t uid[10];
+        byte_t uidlen;
+        byte_t atqb[7];
+        byte_t chipid;
+        byte_t cid;
+    } __attribute__((__packed__)) iso14b_card_select_t;
+
+    --]]
+
+    local count, uid, uidlen, atqb, chipid, cid = bin.unpack('H10CH7CC',data)
+    uid = uid:sub(1, 2*uidlen)
+    return { uid = uid, uidlen = uidlen, atqb = atqb, chipid = chipid, cid = cid }
 end
 
 --- Sends a USBpacket to the device
 -- @param command - the usb packet to send
--- @param ignoreresponse - if set to true, we don't read the device answer packet 
--- 		which is usually recipe for fail. If not sent, the host will wait 2s for a 
--- 		response of type CMD_ACK
--- @return 	packet,nil if successfull
---			nil, errormessage if unsuccessfull
+-- @param ignoreresponse - if set to true, we don't read the device answer packet
+--      which is usually recipe for fail. If not sent, the host will wait 2s for a
+--      response of type CMD_ACK
+-- @return packet,nil if successfull
+--         nil, errormessage if unsuccessfull
 local function sendToDevice(cmd, ignoreresponse)
-	--core.clearCommandBuffer()
-	local bytes = cmd:getBytes()
-	local count,c,arg0,arg1,arg2 = bin.unpack('LLLL',bytes)
-	local err = core.SendCommand(cmd:getBytes())
-	if err then
-		print('ERROR',err)
-		return nil, err
-	end
-	if ignoreresponse then return nil,nil end
-	
-	local response = core.WaitForResponseTimeout(cmds.CMD_ACK, TIMEOUT)
-	return response,nil
+    --core.clearCommandBuffer()
+    local bytes = cmd:getBytes()
+    local count,c,arg0,arg1,arg2 = bin.unpack('LLLL',bytes)
+    local err = core.SendCommand(cmd:getBytes())
+    if err then
+        print('ERROR',err)
+        return nil, err
+    end
+    if ignoreresponse then return nil,nil end
+
+    local response = core.WaitForResponseTimeout(cmds.CMD_ACK, TIMEOUT)
+    return response,nil
 end
 --- Picks out and displays the data read from a tag
 -- Specifically, takes a usb packet, converts to a Command
--- (as in commands.lua), takes the data-array and 
+-- (as in commands.lua), takes the data-array and
 -- reads the number of bytes specified in arg1 (arg0 in c-struct)
 -- and displays the data
 -- @param usbpacket the data received from the device
 local function showData(usbpacket)
-	local response = Command.parse(usbpacket)
-	local len = response.arg2 * 2
-	local data = string.sub(response.data, 0, len);
-	print("<< ",data)
+    local response = Command.parse(usbpacket)
+    local len = response.arg2 * 2
+    local data = string.sub(response.data, 0, len);
+    print("<< ",data)
 end
 
 
@@ -85,74 +85,74 @@ end
 -- @return if unsuccessfull : nil, error
 local function read14443b(disconnect)
 
-	local command, result, info, err, data
+    local command, result, info, err, data
 
-	local flags = ISO14B_COMMAND.ISO14B_CONNECT + 
-				  ISO14B_COMMAND.ISO14B_SELECT_STD
-	
-	if disconnect then
-		print('DISCONNECT')
-		flags = flags + ISO14B_COMMAND.ISO14B_DISCONNECT
-	end
+    local flags = ISO14B_COMMAND.ISO14B_CONNECT +
+                  ISO14B_COMMAND.ISO14B_SELECT_STD
 
-	command = Command:new{cmd = cmds.CMD_ISO_14443B_COMMAND, arg1 = flags}
-	local result, err = sendToDevice(command, false) 
-	if result then
-		local count,cmd,arg0,arg1,arg2 = bin.unpack('LLLL',result)
-		if arg0 == 0 then 
-			data = string.sub(result, count)
-			info, err = parse1443b(data)
-		else
-			err = "iso14443b card select failed"
-		end
-	else
-		err = "No response from card"
-	end
+    if disconnect then
+        print('DISCONNECT')
+        flags = flags + ISO14B_COMMAND.ISO14B_DISCONNECT
+    end
 
-	if err then 
-		print(err) 
-		return nil, err
-	end
-	return info
+    command = Command:new{cmd = cmds.CMD_ISO_14443B_COMMAND, arg1 = flags}
+    local result, err = sendToDevice(command, false)
+    if result then
+        local count,cmd,arg0,arg1,arg2 = bin.unpack('LLLL',result)
+        if arg0 == 0 then
+            data = string.sub(result, count)
+            info, err = parse1443b(data)
+        else
+            err = "iso14443b card select failed"
+        end
+    else
+        err = "No response from card"
+    end
+
+    if err then
+        print(err)
+        return nil, err
+    end
+    return info
 end
 --PING / PONG - Custom Anticollison for Navigo.
 -- AA / BB ?!?
 -- local ping = ('BA00')
 -- result, err = sendRaw(ping, 1, 1)
 -- if result then
-	-- resp = Command.parse( result )
-	-- if arg1 == 0 then 
-		-- return nil, "iso14443b card - PING/PONG failed"
-	-- end		
-	-- showData(result)
+    -- resp = Command.parse( result )
+    -- if arg1 == 0 then
+        -- return nil, "iso14443b card - PING/PONG failed"
+    -- end
+    -- showData(result)
 -- else
-	-- err = "No response from card"
-	-- print(err) 
-	-- return nil, err
+    -- err = "No response from card"
+    -- print(err)
+    -- return nil, err
 -- end
 
 
 ---
--- Waits for a mifare card to be placed within the vicinity of the reader. 
+-- Waits for a mifare card to be placed within the vicinity of the reader.
 -- @return if successfull: an table containing card info
 -- @return if unsuccessfull : nil, error
 local function waitFor14443b()
-	print("Waiting for card... press any key to quit")
-	while not core.ukbhit() do
-		res, err = read14443b(false)
-		if res then return res end
-		-- err means that there was no response from card
-	end
-	return nil, "Aborted by user"
+    print("Waiting for card... press any key to quit")
+    while not core.ukbhit() do
+        res, err = read14443b(false)
+        if res then return res end
+        -- err means that there was no response from card
+    end
+    return nil, "Aborted by user"
 end
 
 local library = {
-	read = read14443b,
-	waitFor14443b = waitFor14443b,
-	parse1443b  = parse1443b,
-	sendToDevice = sendToDevice,
-	showData = showData,
-	ISO14B_COMMAND = ISO14B_COMMAND,
+    read = read14443b,
+    waitFor14443b = waitFor14443b,
+    parse1443b  = parse1443b,
+    sendToDevice = sendToDevice,
+    showData = showData,
+    ISO14B_COMMAND = ISO14B_COMMAND,
 }
 
 return library
\ No newline at end of file
diff --git a/client/lualibs/read15.lua b/client/lualibs/read15.lua
index b0089b769..5d231ad52 100644
--- a/client/lualibs/read15.lua
+++ b/client/lualibs/read15.lua
@@ -1,13 +1,13 @@
 --[[
-	This is a library to read 15693 tags. It can be used something like this
+    This is a library to read 15693 tags. It can be used something like this
 
-	local reader = require('read15')
-	local info, err = reader.read()
-	if not info then
-		print(err)
-		return
-	end
-	print(info.UID)
+    local reader = require('read15')
+    local info, err = reader.read()
+    if not info then
+        print(err)
+        return
+    end
+    print(info.UID)
 
 --]]
 -- Loads the commands-library
@@ -19,60 +19,60 @@ local TIMEOUT = 2000 -- Shouldn't take longer than 2 seconds
 --- Sends a USBpacket to the device
 -- @param command - the usb packet to send
 -- @param ignoreresponse - if set to true, we don't read the device answer packet
--- 		which is usually recipe for fail. If not sent, the host will wait 2s for a
--- 		response of type CMD_ACK
--- @return 	packet,nil if successfull
---			nil, errormessage if unsuccessfull
+--      which is usually recipe for fail. If not sent, the host will wait 2s for a
+--      response of type CMD_ACK
+-- @return packet,nil if successfull
+--         nil, errormessage if unsuccessfull
 local function sendToDevice(command, ignoreresponse)
-	local err = core.SendCommand(command:getBytes())
-	if err then
-		print(err)
-		return nil, err
-	end
-	if ignoreresponse then return nil, nil end
+    local err = core.SendCommand(command:getBytes())
+    if err then
+        print(err)
+        return nil, err
+    end
+    if ignoreresponse then return nil, nil end
 
-	local response = core.WaitForResponseTimeout(cmds.CMD_ACK, TIMEOUT)
-	return response, nil
+    local response = core.WaitForResponseTimeout(cmds.CMD_ACK, TIMEOUT)
+    return response, nil
 end
 
 local function errorString15693(number)
-	local errors = {}
-	errors[0x01] =  "The command is not supported"
-	errors[0x02] =  "The command is not recognised"
-	errors[0x03] =  "The option is not supported."
-	errors[0x0f] =  "Unknown error."
-	errors[0x10] =  "The specified block is not available (doesn’t exist)."
-	errors[0x11] =  "The specified block is already -locked and thus cannot be locked again"
-	errors[0x12] =  "The specified block is locked and its content cannot be changed."
-	errors[0x13] =  "The specified block was not successfully programmed."
-	errors[0x14] =  "The specified block was not successfully locked."
-	
-	return errors[number] or "Reserved for Future Use or Custom command error." 
+    local errors = {}
+    errors[0x01] =  "The command is not supported"
+    errors[0x02] =  "The command is not recognised"
+    errors[0x03] =  "The option is not supported."
+    errors[0x0f] =  "Unknown error."
+    errors[0x10] =  "The specified block is not available (doesn’t exist)."
+    errors[0x11] =  "The specified block is already -locked and thus cannot be locked again"
+    errors[0x12] =  "The specified block is locked and its content cannot be changed."
+    errors[0x13] =  "The specified block was not successfully programmed."
+    errors[0x14] =  "The specified block was not successfully locked."
+
+    return errors[number] or "Reserved for Future Use or Custom command error."
 end
 
 
 local function parse15693(data)
-	local bytes = utils.ConvertAsciiToBytes(data)
-	local tmp = utils.ConvertAsciiToHex(data)
-	
-	-- define ISO15_CRC_CHECK 0F47
-	local crcStr = utils.Crc15(tmp, #tmp)
+    local bytes = utils.ConvertAsciiToBytes(data)
+    local tmp = utils.ConvertAsciiToHex(data)
 
-	if string.sub(crcStr, #crcStr - 3) ~= '470F' then
-		print("CRC", crc )
-		return nil, "CRC failed"
-	end
+    -- define ISO15_CRC_CHECK 0F47
+    local crcStr = utils.Crc15(tmp, #tmp)
 
-	if bytes[1] % 2 == 1 then
-		-- Above is a poor-mans bit check:
-		-- recv[0] & ISO15_RES_ERROR //(0x01)
-		local err = "Tag returned error %i: %s"
-		err = string.format(err, bytes[1], errorString15693(bytes[1]))
-		return nil, err
-	end
-	local uid = utils.ConvertBytesToHex( bytes, true )
-	uid = uid:sub(5, #uid-4)
-	return { uid = uid, }
+    if string.sub(crcStr, #crcStr - 3) ~= '470F' then
+        print("CRC", crc )
+        return nil, "CRC failed"
+    end
+
+    if bytes[1] % 2 == 1 then
+        -- Above is a poor-mans bit check:
+        -- recv[0] & ISO15_RES_ERROR //(0x01)
+        local err = "Tag returned error %i: %s"
+        err = string.format(err, bytes[1], errorString15693(bytes[1]))
+        return nil, err
+    end
+    local uid = utils.ConvertBytesToHex( bytes, true )
+    uid = uid:sub(5, #uid-4)
+    return { uid = uid, }
 end
 
 -- This function does a connect and retrieves som info
@@ -83,62 +83,62 @@ local function read15693(slow, dont_readresponse)
 
 --[[
 
-	We start by trying this command:		 
-	MANDATORY (present in ALL iso15693 tags) command (the example below is sent to a tag different from the above one):
-	 
-		pm3> hf 15 info u
-		UID=E007C1A257394244         
-		Tag Info: Texas Instrument; Tag-it HF-I Standard; 8x32bit         
-		pm3>
-	 
-	From which we obtain less information than the above one.	
-	
-	"260100" means  
-	0x26
-	-- #define ISO15_REQ_SUBCARRIER_SINGLE	0x00	// Tag should respond using one subcarrier (ASK)
-	-- #define ISO15_REQ_DATARATE_HIGH		0x02	// Tag should respond using high data rate
-	-- #define ISO15_REQ_NONINVENTORY		0x00
-	0x01  
-		inventory
-	0x00
-	
-	--]]
+    We start by trying this command:
+    MANDATORY (present in ALL iso15693 tags) command (the example below is sent to a tag different from the above one):
 
-	local command, result, info, err, data
+        pm3> hf 15 info u
+        UID=E007C1A257394244
+        Tag Info: Texas Instrument; Tag-it HF-I Standard; 8x32bit
+        pm3>
 
-	data = utils.Crc15("260100")
+    From which we obtain less information than the above one.
 
-	command = Command:new{cmd = cmds.CMD_ISO_15693_COMMAND, 
-								arg1 = #data / 2,
-								arg2 = 1,
-								arg3 = 1,
-								data = data}
-														
-	if slow then
-		command.arg2 = 0
-	end
-	if dont_readresponse then
-		command.arg3 = 0 
-	end
-	
-	local result, err = sendToDevice(command, dont_readresponse)
-	if not result then
-		print(err)
-		return nil, "15693 identify: no answer"
-	end
-	
-	local count, cmd, len, arg2, arg3 = bin.unpack('LLLL', result)
-	if  len > 0 then
-		data = string.sub(result, count, count+len-1)
-		info, err = parse15693(data)
-		if err then 
-			print(err)	
-			return nil, err
-		end
-		return info
-	else
-		return nil, "Failed to get response"
-	end
+    "260100" means
+    0x26
+    -- #define ISO15_REQ_SUBCARRIER_SINGLE  0x00    // Tag should respond using one subcarrier (ASK)
+    -- #define ISO15_REQ_DATARATE_HIGH      0x02    // Tag should respond using high data rate
+    -- #define ISO15_REQ_NONINVENTORY       0x00
+    0x01
+        inventory
+    0x00
+
+    --]]
+
+    local command, result, info, err, data
+
+    data = utils.Crc15("260100")
+
+    command = Command:new{cmd = cmds.CMD_ISO_15693_COMMAND,
+                                arg1 = #data / 2,
+                                arg2 = 1,
+                                arg3 = 1,
+                                data = data}
+
+    if slow then
+        command.arg2 = 0
+    end
+    if dont_readresponse then
+        command.arg3 = 0
+    end
+
+    local result, err = sendToDevice(command, dont_readresponse)
+    if not result then
+        print(err)
+        return nil, "15693 identify: no answer"
+    end
+
+    local count, cmd, len, arg2, arg3 = bin.unpack('LLLL', result)
+    if  len > 0 then
+        data = string.sub(result, count, count+len-1)
+        info, err = parse15693(data)
+        if err then
+            print(err)
+            return nil, err
+        end
+        return info
+    else
+        return nil, "Failed to get response"
+    end
 end
 
 ---
@@ -146,19 +146,19 @@ end
 -- @return if successfull: an table containing card info
 -- @return if unsuccessfull : nil, error
 local function waitFor15693()
-	print("Waiting for card... press any key to quit")
-	while not core.ukbhit() do
-		res, err = read15693()
-		if res then return res end
-		-- err means that there was no response from card
-	end
-	return nil, "Aborted by user"
+    print("Waiting for card... press any key to quit")
+    while not core.ukbhit() do
+        res, err = read15693()
+        if res then return res end
+        -- err means that there was no response from card
+    end
+    return nil, "Aborted by user"
 end
 local library = {
-	read = read15693,
-	waitFor15693 = waitFor15693,
-	parse15693 = parse15693,
-	sendToDevice = sendToDevice,
+    read = read15693,
+    waitFor15693 = waitFor15693,
+    parse15693 = parse15693,
+    sendToDevice = sendToDevice,
 }
 
 return library
diff --git a/client/lualibs/taglib.lua b/client/lualibs/taglib.lua
index 97194714c..715a29487 100644
--- a/client/lualibs/taglib.lua
+++ b/client/lualibs/taglib.lua
@@ -109,16 +109,16 @@ m[0x6B]='ISSM France'
 m[0x6C]='Wisesec Ltd Israel'
 m[0x7C]='DB HiTek Co Ltd Korea'
 m[0x7D]='SATO Vicinity Australia'
-m[0x7E]='Holtek Taiwan'	
+m[0x7E]='Holtek Taiwan'
 
 return {
-	lookupManufacturer = function (value)
-		if type(value) == 'string' then
-			local v = tonumber(value, 16)
-			print(string.format("WARNING: lookupManufacturer expects numeric value, converted %s into %x", value,v))
-			value = v
-		end
+    lookupManufacturer = function (value)
+        if type(value) == 'string' then
+            local v = tonumber(value, 16)
+            print(string.format("WARNING: lookupManufacturer expects numeric value, converted %s into %x", value,v))
+            value = v
+        end
 
-		return m[value] or "no tag-info available"
-	end,
+        return m[value] or "no tag-info available"
+    end,
 }
\ No newline at end of file
diff --git a/client/lualibs/utils.lua b/client/lualibs/utils.lua
index ca49c21e9..697e48b72 100644
--- a/client/lualibs/utils.lua
+++ b/client/lualibs/utils.lua
@@ -1,430 +1,430 @@
---[[
-	This may be moved to a separate library at some point (Holiman)
---]]
-local Utils = 
-{
-	-- Asks the user for Yes or No
-	confirm = function(message, ...)
-		local answer
-		message = message .. " [y/n] ?"
-		repeat
-			io.write(message)
-			io.flush()
-			answer = io.read()
-			if answer == 'Y' or answer == "y" then
-				return true
-			elseif answer == 'N' or answer == 'n' then 
-				return false
-			end
-		until false
-	end,
-	---
-	-- Asks the user for input
-	input = function (message , default)
-		local answer
-		if default ~= nil then
-			message = message .. " (default: ".. default.. " )"
-		end
-		message = message .." \n > "
-		io.write(message)
-		io.flush()
-		answer = io.read()
-		if answer == '' then answer = default end
-
-		return answer
-	end,
-	
-	------------ FILE READING
-	ReadDumpFile = function (filename)
-	
-		filename = filename or 'dumpdata.bin'
-		if #filename == 0 then
-			return nil, 'Filename length is zero'
-		end
-
-		infile = io.open(filename, "rb")
-		if infile == nil then 
-			return nil, string.format("Could not read file %s",filename)
-		end
-		local t = infile:read("*all")
-		io.close(infile)
-		len = string.len(t)
-		local  _,hex = bin.unpack(("H%d"):format(len),t)
-		return hex
-	end,
-	
-	------------ FILE WRITING (EML)
-	--- Writes an eml-file.
-	-- @param uid - the uid of the tag. Used in filename
-	-- @param blockData. Assumed to be on the format {'\0\1\2\3,'\b\e\e\f' ..., 
-	-- that is, blockData[row] contains a string with the actual data, not ascii hex representation 
-	-- return filename if all went well, 
-	-- @reurn nil, error message if unsuccessfulls	
-	WriteDumpFile = function(uid, blockData)
-		local destination = string.format("%s.eml", uid)
-		local file = io.open(destination, "w")
-		if file == nil then 
-			return nil, string.format("Could not write to file %s", destination)
-		end
-		local rowlen = string.len(blockData[1])
-
-		for i,block in ipairs(blockData) do
-			if rowlen ~= string.len(block) then
-				prlog(string.format("WARNING: Dumpdata seems corrupted, line %d was not the same length as line 1",i))
-			end
-
-			local formatString = string.format("H%d", string.len(block))
-			local _,hex = bin.unpack(formatString,block)
-			file:write(hex.."\n")
-		end
-		file:close()	
-		return destination
-	end,
-	
-	------------ string split function
-	Split = function( inSplitPattern, outResults )
-		if not outResults then
-			outResults = {}
-		end
-		local start = 1
-		local splitStart, splitEnd = string.find( self, inSplitPattern, start )
-		while splitStart do
-			table.insert( outResults, string.sub( self, start, splitStart-1 ) )
-			start = splitEnd + 1
-			splitStart, splitEnd = string.find( self, inSplitPattern, start )
-		end
-		table.insert( outResults, string.sub( self, start ) )
-		return outResults
-	end,
-	
-	----ISO14443-B CRC
-	Crc14b = function(s)
-		if s == nil then return nil end
-		if #s == 0 then return nil end
-		if  type(s) == 'string' then
-			local utils = require('utils')
-			return utils.ConvertAsciiToHex(
-							core.iso14443b_crc(s)
-							)
-		end
-		return nil		
-	end,
-	----ISO15693 CRC
-	Crc15 = function(s)
-		if s == nil then return nil end
-		if #s == 0 then return nil end
-		if  type(s) == 'string' then
-			local utils = require('utils')
-			return utils.ConvertAsciiToHex(
-							core.iso15693_crc(s)
-							)
-		end
-		return nil		
-	end,
-		
-	------------ CRC-8 Legic checksums
-	-- Takes a hex string and calculates a crc8
-	Crc8Legic = function(s)
-		if s == nil then return nil end
-		if #s == 0 then return nil end
-		if  type(s) == 'string' then
-			local utils = require('utils')
-			local asc = utils.ConvertHexToAscii(s)
-			local hash = core.crc8legic(asc)
-			return hash
-		end
-		return nil
-	end,
-	
-	------------ CRC-16 ccitt checksums
-	-- Takes a hex string and calculates a crc16
-	Crc16 = function(s)
-		if s == nil then return nil end
-		if #s == 0 then return nil end
-		if  type(s) == 'string' then
-			local utils = require('utils')
-			local asc = utils.ConvertHexToAscii(s)
-			local hash = core.crc16(asc)
-			return hash
-		end
-		return nil
-	end,
-	
-	
-	------------ CRC-64 ecma checksums
-	-- Takes a hex string and calculates a crc64 ecma hash
-	Crc64 = function(s)
-		if s == nil then return nil end
-		if #s == 0 then return nil end
-		if  type(s) == 'string' then
-			local utils = require('utils')
-			local asc = utils.ConvertHexToAscii(s)
-			local hash = core.crc64(asc)
-			return hash
-		end
-		return nil
-	end,
-	------------ CRC-64 ecma 182 checksums
-	-- Takes a hex string and calculates a crc64 ecma182 hash
-	Crc64_ecma182 = function(s)
-		if s == nil then return nil end
-		if #s == 0 then return nil end
-		if  type(s) == 'string' then
-			local utils = require('utils')
-			local asc = utils.ConvertHexToAscii(s)
-			local hash = core.crc64_ecma182(asc)
-			return hash
-		end
-		return nil
-	end,
-
-	------------ SHA1 hash
-	-- Takes a string and calculates a SHA1 hash
-	Sha1 = function(s)
-		if s == nil then return nil end
-		if #s == 0 then return nil end
-		if  type(s) == 'string' then
-			return core.sha1(s)
-		end
-		return nil
-	end,	
-	-- Takes a hex string and calculates a SHA1 hash
-	Sha1Hex = function(s)
-		if s == nil then return nil end
-		if #s == 0 then return nil end
-		if  type(s) == 'string' then
-			local utils = require('utils')
-			local asc = utils.ConvertHexToAscii(s)
-			local hash = core.sha1(asc)
-			return hash
-		end
-		return nil
-	end,	
-
-	
-	-- input parameter is a string
-	-- Swaps the endianess and returns a number,  
-	-- IE:  'cd7a' -> '7acd'  -> 0x7acd
-	SwapEndianness = function(s, len)
-		if s == nil then return nil end
-		if #s == 0 then return '' end
-		if  type(s) ~= 'string' then return nil end
-		
-		local retval = 0
-		if len == 16 then
-			local t = s:sub(3,4)..s:sub(1,2)
-			retval = tonumber(t,16)
-		elseif len == 24 then
-			local t = s:sub(5,6)..s:sub(3,4)..s:sub(1,2)
-			retval = tonumber(t,16)
-		elseif len == 32 then
-			local t = s:sub(7,8)..s:sub(5,6)..s:sub(3,4)..s:sub(1,2)
-			retval = tonumber(t,16)
-		end
-		return retval
-	end,
-	
-	-- input parameter is a string
-	-- Swaps the endianess and returns a string,  
-	-- IE:  'cd7a' -> '7acd'  -> 0x7acd
-	SwapEndiannessStr = function(s, len)
-		if s == nil then return nil end
-		if #s == 0 then return '' end
-		if  type(s) ~= 'string' then return nil end
-		
-		local retval
-		if len == 16 then
-			retval = s:sub(3,4)..s:sub(1,2)
-		elseif len == 24 then
-			retval = s:sub(5,6)..s:sub(3,4)..s:sub(1,2)
-		elseif len == 32 then
-			retval = s:sub(7,8)..s:sub(5,6)..s:sub(3,4)..s:sub(1,2)
-		end
-		return retval
-	end,	
-	------------ CONVERSIONS
-	
-	--
-	-- Converts DECIMAL to HEX
-    ConvertDecToHex = function(IN)
-		local B,K,OUT,I,D = 16, "0123456789ABCDEF", "", 0
-		while IN > 0 do
-			I = I+1
-			IN, D = math.floor(IN/B), math.modf(IN, B) + 1
-			OUT = string.sub(K, D, D)..OUT
-		end
-		return OUT
-	end,
-	---
-	-- Convert Byte array to string of hex
-	ConvertBytesToHex = function(bytes, reverse)
-		if bytes == nil then return '' end
-		if #bytes == 0 then return '' end
-		local s={}
-		if reverse then
-			local j=1
-			for i = #bytes, 1, -1 do
-				s[i] = string.format("%02X", bytes[j]) 
-				j = j + 1
-			end
-		else
-			for i = 1, #bytes do
-				s[i] = string.format("%02X", bytes[i]) 
-			end
-		end
-		return table.concat(s)
-	end,		
-	-- Convert byte array to string with ascii
-    ConvertBytesToAscii = function(bytes)
-		if bytes == nil then return '' end
-		if #bytes == 0 then return '' end
-		local s={}
-		for i = 1, #(bytes) do
-			s[i] = string.char(bytes[i]) 
-		end
-		return table.concat(s)		
-	end,	 
-	ConvertHexToBytes = function(s)
-		local t={}
-		if s == nil then return t end
-		if #s == 0 then return t end
-		for k in s:gmatch"(%x%x)" do
-			table.insert(t,tonumber(k,16))
-		end
-		return t
-	end,
-	ConvertAsciiToBytes = function(s, reverse)
-		local t = {}
-		if s == nil then return t end
-		if #s == 0 then return t end
-		
-		for k in s:gmatch"(.)" do
-			table.insert(t, string.byte(k))
-		end
-		
-		if not reverse then
-			return t
-		end
-	
-		local rev = {}
-		if reverse then
-			for i = #t, 1,-1 do
-				table.insert(rev, t[i] )
-			end
-		end
-		return rev
-	end,
-	
-	ConvertHexToAscii = function(s, useSafechars)
-		if s == nil then return '' end
-		if #s == 0 then return '' end
-		local t={}
-		for k in s:gmatch"(%x%x)" do
-
-			local n = tonumber(k,16)		
-			local c 
-			if useSafechars and ( (n < 32) or (n == 127) ) then
-				c = '.';
-			else
-				c = string.char(n)
-			end
-			table.insert(t,c)
-		end
-		return table.concat(t)	
-	end,
-	
-	ConvertAsciiToHex = function(s)		
-		if s == nil then return '' end
-		if #s == 0 then return '' end
-		local t={}
-		for k in s:gmatch"(.)" do
-			table.insert(t, string.format("%02X", string.byte(k)))
-		end
-		return table.concat(t)
-	end,
-	
-	hexlify = function(s)
-		local u = require('utils')
-		return u.ConvertAsciiToHex(s)
-	end,
-	
-	Chars2num = function(s)
-        return (s:byte(1)*16777216)+(s:byte(2)*65536)+(s:byte(3)*256)+(s:byte(4))
-	end,
-	
-	-- use length of string to determine 8,16,32,64 bits
-	bytes_to_int = function(str,endian,signed) 
-		local t = {str:byte(1, -1)}
-		if endian == "big" then --reverse bytes
-			local tt = {}
-			for k = 1, #t do
-				tt[#t-k+1] = t[k]
-			end
-			t = tt
-		end
-		local n = 0
-		for k = 1, #t do
-			n = n + t[k] * 2^((k-1) * 8)
-		end
-		if signed then
-			n = (n > 2^(#t*8-1) -1) and (n - 2^(#t*8)) or n -- if last bit set, negative.
-		end
-		return n
-	end,
-	
-	-- a simple implementation of a sleep command. Thanks to Mosci
-	-- takes number of seconds to sleep
-	Sleep = function(n)
-		local clock = os.clock
-		local t0 = clock()
-		while clock() - t0 <= n do end
-		return nil	
-	end,
-	
-	-- function convertStringToBytes(str)
-	-- local bytes = {}
-	-- local strLength = string.len(str)
-	-- for i=1,strLength do
-		-- table.insert(bytes, string.byte(str, i))
-	-- end
-
-	-- return bytes
--- end
-
--- function convertBytesToString(bytes)
-	-- local bytesLength = table.getn(bytes)
-	-- local str = ""
-	-- for i=1,bytesLength do
-		-- str = str .. string.char(bytes[i])
-	-- end
-
-	-- return str
--- end
-
--- function convertHexStringToBytes(str)
-	-- local bytes = {}
-	-- local strLength = string.len(str)
-	-- for k=2,strLength,2 do
-		-- local hexString = "0x" .. string.sub(str, (k - 1), k)
-		-- table.insert(bytes, hex.to_dec(hexString))
-	-- end
-
-	-- return bytes
--- end
-
--- function convertBytesToHexString(bytes)
-	-- local str = ""
-	-- local bytesLength = table.getn(bytes)
-	-- for i=1,bytesLength do
-		-- local hexString = string.sub(hex.to_hex(bytes[i]), 3)
-		-- if string.len(hexString) == 1 then
-			-- hexString = "0" .. hexString
-		-- end
-		-- str = str .. hexString
-	-- end
-
-	-- return str
--- end
-
-}
+--[[
+    This may be moved to a separate library at some point (Holiman)
+--]]
+local Utils =
+{
+    -- Asks the user for Yes or No
+    confirm = function(message, ...)
+        local answer
+        message = message .. " [y/n] ?"
+        repeat
+            io.write(message)
+            io.flush()
+            answer = io.read()
+            if answer == 'Y' or answer == "y" then
+                return true
+            elseif answer == 'N' or answer == 'n' then
+                return false
+            end
+        until false
+    end,
+    ---
+    -- Asks the user for input
+    input = function (message , default)
+        local answer
+        if default ~= nil then
+            message = message .. " (default: ".. default.. " )"
+        end
+        message = message .." \n > "
+        io.write(message)
+        io.flush()
+        answer = io.read()
+        if answer == '' then answer = default end
+
+        return answer
+    end,
+
+    ------------ FILE READING
+    ReadDumpFile = function (filename)
+
+        filename = filename or 'dumpdata.bin'
+        if #filename == 0 then
+            return nil, 'Filename length is zero'
+        end
+
+        infile = io.open(filename, "rb")
+        if infile == nil then
+            return nil, string.format("Could not read file %s",filename)
+        end
+        local t = infile:read("*all")
+        io.close(infile)
+        len = string.len(t)
+        local  _,hex = bin.unpack(("H%d"):format(len),t)
+        return hex
+    end,
+
+    ------------ FILE WRITING (EML)
+    --- Writes an eml-file.
+    -- @param uid - the uid of the tag. Used in filename
+    -- @param blockData. Assumed to be on the format {'\0\1\2\3,'\b\e\e\f' ...,
+    -- that is, blockData[row] contains a string with the actual data, not ascii hex representation
+    -- return filename if all went well,
+    -- @reurn nil, error message if unsuccessfulls
+    WriteDumpFile = function(uid, blockData)
+        local destination = string.format("%s.eml", uid)
+        local file = io.open(destination, "w")
+        if file == nil then
+            return nil, string.format("Could not write to file %s", destination)
+        end
+        local rowlen = string.len(blockData[1])
+
+        for i,block in ipairs(blockData) do
+            if rowlen ~= string.len(block) then
+                prlog(string.format("WARNING: Dumpdata seems corrupted, line %d was not the same length as line 1",i))
+            end
+
+            local formatString = string.format("H%d", string.len(block))
+            local _,hex = bin.unpack(formatString,block)
+            file:write(hex.."\n")
+        end
+        file:close()
+        return destination
+    end,
+
+    ------------ string split function
+    Split = function( inSplitPattern, outResults )
+        if not outResults then
+            outResults = {}
+        end
+        local start = 1
+        local splitStart, splitEnd = string.find( self, inSplitPattern, start )
+        while splitStart do
+            table.insert( outResults, string.sub( self, start, splitStart-1 ) )
+            start = splitEnd + 1
+            splitStart, splitEnd = string.find( self, inSplitPattern, start )
+        end
+        table.insert( outResults, string.sub( self, start ) )
+        return outResults
+    end,
+
+    ----ISO14443-B CRC
+    Crc14b = function(s)
+        if s == nil then return nil end
+        if #s == 0 then return nil end
+        if  type(s) == 'string' then
+            local utils = require('utils')
+            return utils.ConvertAsciiToHex(
+                            core.iso14443b_crc(s)
+                            )
+        end
+        return nil
+    end,
+    ----ISO15693 CRC
+    Crc15 = function(s)
+        if s == nil then return nil end
+        if #s == 0 then return nil end
+        if  type(s) == 'string' then
+            local utils = require('utils')
+            return utils.ConvertAsciiToHex(
+                            core.iso15693_crc(s)
+                            )
+        end
+        return nil
+    end,
+
+    ------------ CRC-8 Legic checksums
+    -- Takes a hex string and calculates a crc8
+    Crc8Legic = function(s)
+        if s == nil then return nil end
+        if #s == 0 then return nil end
+        if  type(s) == 'string' then
+            local utils = require('utils')
+            local asc = utils.ConvertHexToAscii(s)
+            local hash = core.crc8legic(asc)
+            return hash
+        end
+        return nil
+    end,
+
+    ------------ CRC-16 ccitt checksums
+    -- Takes a hex string and calculates a crc16
+    Crc16 = function(s)
+        if s == nil then return nil end
+        if #s == 0 then return nil end
+        if  type(s) == 'string' then
+            local utils = require('utils')
+            local asc = utils.ConvertHexToAscii(s)
+            local hash = core.crc16(asc)
+            return hash
+        end
+        return nil
+    end,
+
+
+    ------------ CRC-64 ecma checksums
+    -- Takes a hex string and calculates a crc64 ecma hash
+    Crc64 = function(s)
+        if s == nil then return nil end
+        if #s == 0 then return nil end
+        if  type(s) == 'string' then
+            local utils = require('utils')
+            local asc = utils.ConvertHexToAscii(s)
+            local hash = core.crc64(asc)
+            return hash
+        end
+        return nil
+    end,
+    ------------ CRC-64 ecma 182 checksums
+    -- Takes a hex string and calculates a crc64 ecma182 hash
+    Crc64_ecma182 = function(s)
+        if s == nil then return nil end
+        if #s == 0 then return nil end
+        if  type(s) == 'string' then
+            local utils = require('utils')
+            local asc = utils.ConvertHexToAscii(s)
+            local hash = core.crc64_ecma182(asc)
+            return hash
+        end
+        return nil
+    end,
+
+    ------------ SHA1 hash
+    -- Takes a string and calculates a SHA1 hash
+    Sha1 = function(s)
+        if s == nil then return nil end
+        if #s == 0 then return nil end
+        if  type(s) == 'string' then
+            return core.sha1(s)
+        end
+        return nil
+    end,
+    -- Takes a hex string and calculates a SHA1 hash
+    Sha1Hex = function(s)
+        if s == nil then return nil end
+        if #s == 0 then return nil end
+        if  type(s) == 'string' then
+            local utils = require('utils')
+            local asc = utils.ConvertHexToAscii(s)
+            local hash = core.sha1(asc)
+            return hash
+        end
+        return nil
+    end,
+
+
+    -- input parameter is a string
+    -- Swaps the endianess and returns a number,
+    -- IE:  'cd7a' -> '7acd'  -> 0x7acd
+    SwapEndianness = function(s, len)
+        if s == nil then return nil end
+        if #s == 0 then return '' end
+        if  type(s) ~= 'string' then return nil end
+
+        local retval = 0
+        if len == 16 then
+            local t = s:sub(3,4)..s:sub(1,2)
+            retval = tonumber(t,16)
+        elseif len == 24 then
+            local t = s:sub(5,6)..s:sub(3,4)..s:sub(1,2)
+            retval = tonumber(t,16)
+        elseif len == 32 then
+            local t = s:sub(7,8)..s:sub(5,6)..s:sub(3,4)..s:sub(1,2)
+            retval = tonumber(t,16)
+        end
+        return retval
+    end,
+
+    -- input parameter is a string
+    -- Swaps the endianess and returns a string,
+    -- IE:  'cd7a' -> '7acd'  -> 0x7acd
+    SwapEndiannessStr = function(s, len)
+        if s == nil then return nil end
+        if #s == 0 then return '' end
+        if  type(s) ~= 'string' then return nil end
+
+        local retval
+        if len == 16 then
+            retval = s:sub(3,4)..s:sub(1,2)
+        elseif len == 24 then
+            retval = s:sub(5,6)..s:sub(3,4)..s:sub(1,2)
+        elseif len == 32 then
+            retval = s:sub(7,8)..s:sub(5,6)..s:sub(3,4)..s:sub(1,2)
+        end
+        return retval
+    end,
+    ------------ CONVERSIONS
+
+    --
+    -- Converts DECIMAL to HEX
+    ConvertDecToHex = function(IN)
+        local B,K,OUT,I,D = 16, "0123456789ABCDEF", "", 0
+        while IN > 0 do
+            I = I+1
+            IN, D = math.floor(IN/B), math.modf(IN, B) + 1
+            OUT = string.sub(K, D, D)..OUT
+        end
+        return OUT
+    end,
+    ---
+    -- Convert Byte array to string of hex
+    ConvertBytesToHex = function(bytes, reverse)
+        if bytes == nil then return '' end
+        if #bytes == 0 then return '' end
+        local s={}
+        if reverse then
+            local j=1
+            for i = #bytes, 1, -1 do
+                s[i] = string.format("%02X", bytes[j])
+                j = j + 1
+            end
+        else
+            for i = 1, #bytes do
+                s[i] = string.format("%02X", bytes[i])
+            end
+        end
+        return table.concat(s)
+    end,
+    -- Convert byte array to string with ascii
+    ConvertBytesToAscii = function(bytes)
+        if bytes == nil then return '' end
+        if #bytes == 0 then return '' end
+        local s={}
+        for i = 1, #(bytes) do
+            s[i] = string.char(bytes[i])
+        end
+        return table.concat(s)
+    end,
+    ConvertHexToBytes = function(s)
+        local t={}
+        if s == nil then return t end
+        if #s == 0 then return t end
+        for k in s:gmatch"(%x%x)" do
+            table.insert(t,tonumber(k,16))
+        end
+        return t
+    end,
+    ConvertAsciiToBytes = function(s, reverse)
+        local t = {}
+        if s == nil then return t end
+        if #s == 0 then return t end
+
+        for k in s:gmatch"(.)" do
+            table.insert(t, string.byte(k))
+        end
+
+        if not reverse then
+            return t
+        end
+
+        local rev = {}
+        if reverse then
+            for i = #t, 1,-1 do
+                table.insert(rev, t[i] )
+            end
+        end
+        return rev
+    end,
+
+    ConvertHexToAscii = function(s, useSafechars)
+        if s == nil then return '' end
+        if #s == 0 then return '' end
+        local t={}
+        for k in s:gmatch"(%x%x)" do
+
+            local n = tonumber(k,16)
+            local c
+            if useSafechars and ( (n < 32) or (n == 127) ) then
+                c = '.';
+            else
+                c = string.char(n)
+            end
+            table.insert(t,c)
+        end
+        return table.concat(t)
+    end,
+
+    ConvertAsciiToHex = function(s)
+        if s == nil then return '' end
+        if #s == 0 then return '' end
+        local t={}
+        for k in s:gmatch"(.)" do
+            table.insert(t, string.format("%02X", string.byte(k)))
+        end
+        return table.concat(t)
+    end,
+
+    hexlify = function(s)
+        local u = require('utils')
+        return u.ConvertAsciiToHex(s)
+    end,
+
+    Chars2num = function(s)
+        return (s:byte(1)*16777216)+(s:byte(2)*65536)+(s:byte(3)*256)+(s:byte(4))
+    end,
+
+    -- use length of string to determine 8,16,32,64 bits
+    bytes_to_int = function(str,endian,signed)
+        local t = {str:byte(1, -1)}
+        if endian == "big" then --reverse bytes
+            local tt = {}
+            for k = 1, #t do
+                tt[#t-k+1] = t[k]
+            end
+            t = tt
+        end
+        local n = 0
+        for k = 1, #t do
+            n = n + t[k] * 2^((k-1) * 8)
+        end
+        if signed then
+            n = (n > 2^(#t*8-1) -1) and (n - 2^(#t*8)) or n -- if last bit set, negative.
+        end
+        return n
+    end,
+
+    -- a simple implementation of a sleep command. Thanks to Mosci
+    -- takes number of seconds to sleep
+    Sleep = function(n)
+        local clock = os.clock
+        local t0 = clock()
+        while clock() - t0 <= n do end
+        return nil
+    end,
+
+    -- function convertStringToBytes(str)
+    -- local bytes = {}
+    -- local strLength = string.len(str)
+    -- for i=1,strLength do
+        -- table.insert(bytes, string.byte(str, i))
+    -- end
+
+    -- return bytes
+-- end
+
+-- function convertBytesToString(bytes)
+    -- local bytesLength = table.getn(bytes)
+    -- local str = ""
+    -- for i=1,bytesLength do
+        -- str = str .. string.char(bytes[i])
+    -- end
+
+    -- return str
+-- end
+
+-- function convertHexStringToBytes(str)
+    -- local bytes = {}
+    -- local strLength = string.len(str)
+    -- for k=2,strLength,2 do
+        -- local hexString = "0x" .. string.sub(str, (k - 1), k)
+        -- table.insert(bytes, hex.to_dec(hexString))
+    -- end
+
+    -- return bytes
+-- end
+
+-- function convertBytesToHexString(bytes)
+    -- local str = ""
+    -- local bytesLength = table.getn(bytes)
+    -- for i=1,bytesLength do
+        -- local hexString = string.sub(hex.to_hex(bytes[i]), 3)
+        -- if string.len(hexString) == 1 then
+            -- hexString = "0" .. hexString
+        -- end
+        -- str = str .. hexString
+    -- end
+
+    -- return str
+-- end
+
+}
 return Utils
\ No newline at end of file

From 248a861613b8d2206dac358a2878b4fee87ba97c Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 9 Mar 2019 10:42:03 +0100
Subject: [PATCH 0685/1938] bootrom: fix mix of spaces & tabs

---
 bootrom/bootrom.c      | 412 ++++++++++++++++++++---------------------
 bootrom/flash-reset.s  |  50 ++---
 bootrom/ldscript-flash |  74 ++++----
 bootrom/ram-reset.s    |   6 +-
 4 files changed, 271 insertions(+), 271 deletions(-)

diff --git a/bootrom/bootrom.c b/bootrom/bootrom.c
index c037da122..fda79f905 100644
--- a/bootrom/bootrom.c
+++ b/bootrom/bootrom.c
@@ -16,11 +16,11 @@ extern char _bootrom_start, _bootrom_end, _flash_start, _flash_end;
 extern uint32_t _osimage_entry;
 
 void DbpString(char *str) {
-	byte_t len = 0;
-	while (str[len] != 0x00)
-		len++;
+    byte_t len = 0;
+    while (str[len] != 0x00)
+        len++;
 
-	cmd_send(CMD_DEBUG_PRINT_STRING, len, 0, 0, (byte_t*)str, len);
+    cmd_send(CMD_DEBUG_PRINT_STRING, len, 0, 0, (byte_t*)str, len);
 }
 
 static void ConfigClocks(void) {
@@ -30,54 +30,54 @@ static void ConfigClocks(void) {
     // enable system clock and USB clock
     AT91C_BASE_PMC->PMC_SCER |= AT91C_PMC_PCK | AT91C_PMC_UDP;
 
-	// enable the clock to the following peripherals
+    // enable the clock to the following peripherals
     AT91C_BASE_PMC->PMC_PCER =
-		(1<<AT91C_ID_PIOA)	|
-		(1<<AT91C_ID_ADC)	|
-		(1<<AT91C_ID_SPI)	|
-		(1<<AT91C_ID_SSC)	|
-		(1<<AT91C_ID_PWMC)	|
-		(1<<AT91C_ID_UDP);
+        (1<<AT91C_ID_PIOA)   |
+        (1<<AT91C_ID_ADC)    |
+        (1<<AT91C_ID_SPI)    |
+        (1<<AT91C_ID_SSC)    |
+        (1<<AT91C_ID_PWMC)   |
+        (1<<AT91C_ID_UDP);
 
-	// worst case scenario, with MAINCK = 16Mhz xtal, startup delay is 1.4ms
-	// if SLCK slow clock runs at its worst case (max) frequency of 42khz
-	// max startup delay = (1.4ms*42k)/8 = 7.356 so round up to 8
+    // worst case scenario, with MAINCK = 16Mhz xtal, startup delay is 1.4ms
+    // if SLCK slow clock runs at its worst case (max) frequency of 42khz
+    // max startup delay = (1.4ms*42k)/8 = 7.356 so round up to 8
 
-	// enable main oscillator and set startup delay
+    // enable main oscillator and set startup delay
     AT91C_BASE_PMC->PMC_MOR =
         AT91C_CKGR_MOSCEN |
         PMC_MAIN_OSC_STARTUP_DELAY(8);
 
-	// wait for main oscillator to stabilize
-	while ( !(AT91C_BASE_PMC->PMC_SR & AT91C_PMC_MOSCS) ) {};
+    // wait for main oscillator to stabilize
+    while ( !(AT91C_BASE_PMC->PMC_SR & AT91C_PMC_MOSCS) ) {};
 
     // PLL output clock frequency in range  80 - 160 MHz needs CKGR_PLL = 00
     // PLL output clock frequency in range 150 - 180 MHz needs CKGR_PLL = 10
     // PLL output is MAINCK * multiplier / divisor = 16Mhz * 12 / 2 = 96Mhz
     AT91C_BASE_PMC->PMC_PLLR =
-    	PMC_PLL_DIVISOR(2) |
-		//PMC_PLL_COUNT_BEFORE_LOCK(0x10) |
-		PMC_PLL_COUNT_BEFORE_LOCK(0x3F) |
-		PMC_PLL_FREQUENCY_RANGE(0) |
-		PMC_PLL_MULTIPLIER(12) |
-		PMC_PLL_USB_DIVISOR(1);
+        PMC_PLL_DIVISOR(2) |
+        //PMC_PLL_COUNT_BEFORE_LOCK(0x10) |
+        PMC_PLL_COUNT_BEFORE_LOCK(0x3F) |
+        PMC_PLL_FREQUENCY_RANGE(0) |
+        PMC_PLL_MULTIPLIER(12) |
+        PMC_PLL_USB_DIVISOR(1);
 
-	// wait for PLL to lock
-	while ( !(AT91C_BASE_PMC->PMC_SR & AT91C_PMC_LOCK) ) {};
+    // wait for PLL to lock
+    while ( !(AT91C_BASE_PMC->PMC_SR & AT91C_PMC_LOCK) ) {};
 
-	// we want a master clock (MCK) to be PLL clock / 2 = 96Mhz / 2 = 48Mhz
-	// datasheet recommends that this register is programmed in two operations
-	// when changing to PLL, program the prescaler first then the source
+    // we want a master clock (MCK) to be PLL clock / 2 = 96Mhz / 2 = 48Mhz
+    // datasheet recommends that this register is programmed in two operations
+    // when changing to PLL, program the prescaler first then the source
     AT91C_BASE_PMC->PMC_MCKR = AT91C_PMC_PRES_CLK_2;
 
-	// wait for main clock ready signal
-	while ( !(AT91C_BASE_PMC->PMC_SR & AT91C_PMC_MCKRDY) ) {};
+    // wait for main clock ready signal
+    while ( !(AT91C_BASE_PMC->PMC_SR & AT91C_PMC_MCKRDY) ) {};
 
-	// set the source to PLL
+    // set the source to PLL
     AT91C_BASE_PMC->PMC_MCKR = AT91C_PMC_PRES_CLK_2 | AT91C_PMC_CSS_PLL_CLK;
 
-	// wait for main clock ready signal
-	while ( !(AT91C_BASE_PMC->PMC_SR & AT91C_PMC_MCKRDY) ) {};
+    // wait for main clock ready signal
+    while ( !(AT91C_BASE_PMC->PMC_SR & AT91C_PMC_MCKRDY) ) {};
 }
 
 static void Fatal(void) {
@@ -85,140 +85,140 @@ static void Fatal(void) {
 }
 
 void UsbPacketReceived(uint8_t *packet, int len) {
-	int i, dont_ack = 0;
-	UsbCommand* c = (UsbCommand *)packet;
-	volatile uint32_t *p;
+    int i, dont_ack = 0;
+    UsbCommand* c = (UsbCommand *)packet;
+    volatile uint32_t *p;
 
-	//if ( len != sizeof(UsbCommand)) Fatal();
+    //if ( len != sizeof(UsbCommand)) Fatal();
 
-	uint32_t arg0 = (uint32_t)c->arg[0];
+    uint32_t arg0 = (uint32_t)c->arg[0];
 
-	switch(c->cmd) {
-		case CMD_DEVICE_INFO: {
-			dont_ack = 1;
-			arg0 = DEVICE_INFO_FLAG_BOOTROM_PRESENT | DEVICE_INFO_FLAG_CURRENT_MODE_BOOTROM |
-			DEVICE_INFO_FLAG_UNDERSTANDS_START_FLASH;
-			if(common_area.flags.osimage_present)
-				arg0 |= DEVICE_INFO_FLAG_OSIMAGE_PRESENT;
+    switch(c->cmd) {
+        case CMD_DEVICE_INFO: {
+            dont_ack = 1;
+            arg0 = DEVICE_INFO_FLAG_BOOTROM_PRESENT | DEVICE_INFO_FLAG_CURRENT_MODE_BOOTROM |
+            DEVICE_INFO_FLAG_UNDERSTANDS_START_FLASH;
+            if(common_area.flags.osimage_present)
+                arg0 |= DEVICE_INFO_FLAG_OSIMAGE_PRESENT;
 
-			cmd_send(CMD_DEVICE_INFO,arg0,1,2,0,0);
-		} break;
+            cmd_send(CMD_DEVICE_INFO,arg0,1,2,0,0);
+        } break;
 
-		case CMD_SETUP_WRITE: {
-			/* The temporary write buffer of the embedded flash controller is mapped to the
-			* whole memory region, only the last 8 bits are decoded.
-			*/
-			p = (volatile uint32_t *)&_flash_start;
-			for(i = 0; i < 12; i++)
-				p[i+arg0] = c->d.asDwords[i];
-		} break;
+        case CMD_SETUP_WRITE: {
+            /* The temporary write buffer of the embedded flash controller is mapped to the
+            * whole memory region, only the last 8 bits are decoded.
+            */
+            p = (volatile uint32_t *)&_flash_start;
+            for(i = 0; i < 12; i++)
+                p[i+arg0] = c->d.asDwords[i];
+        } break;
 
-		case CMD_FINISH_WRITE: {
-			uint32_t* flash_mem = (uint32_t*)(&_flash_start);
-			for ( int j=0; j<2; j++) {
-				for(i = 0+(64*j); i < 64+(64*j); i++) {
-					flash_mem[i] = c->d.asDwords[i];
-				}
+        case CMD_FINISH_WRITE: {
+            uint32_t* flash_mem = (uint32_t*)(&_flash_start);
+            for ( int j=0; j<2; j++) {
+                for(i = 0+(64*j); i < 64+(64*j); i++) {
+                    flash_mem[i] = c->d.asDwords[i];
+                }
 
-				uint32_t flash_address = arg0 + (0x100*j);
+                uint32_t flash_address = arg0 + (0x100*j);
 
-				/* Check that the address that we are supposed to write to is within our allowed region */
-				if( ((flash_address + AT91C_IFLASH_PAGE_SIZE - 1) >= end_addr) || (flash_address < start_addr) ) {
-					/* Disallow write */
-					dont_ack = 1;
-					cmd_send(CMD_NACK,0,0,0,0,0);
-				} else {
-					uint32_t page_n = (flash_address - ((uint32_t)flash_mem)) / AT91C_IFLASH_PAGE_SIZE;
-					/* Translate address to flash page and do flash, update here for the 512k part */
-					AT91C_BASE_EFC0->EFC_FCR = MC_FLASH_COMMAND_KEY |
-					MC_FLASH_COMMAND_PAGEN(page_n) |
-					AT91C_MC_FCMD_START_PROG;
-				}
+                /* Check that the address that we are supposed to write to is within our allowed region */
+                if( ((flash_address + AT91C_IFLASH_PAGE_SIZE - 1) >= end_addr) || (flash_address < start_addr) ) {
+                    /* Disallow write */
+                    dont_ack = 1;
+                    cmd_send(CMD_NACK,0,0,0,0,0);
+                } else {
+                    uint32_t page_n = (flash_address - ((uint32_t)flash_mem)) / AT91C_IFLASH_PAGE_SIZE;
+                    /* Translate address to flash page and do flash, update here for the 512k part */
+                    AT91C_BASE_EFC0->EFC_FCR = MC_FLASH_COMMAND_KEY |
+                    MC_FLASH_COMMAND_PAGEN(page_n) |
+                    AT91C_MC_FCMD_START_PROG;
+                }
 
-				// Wait until flashing of page finishes
-				uint32_t sr;
-				while(!((sr = AT91C_BASE_EFC0->EFC_FSR) & AT91C_MC_FRDY));
-				if(sr & (AT91C_MC_LOCKE | AT91C_MC_PROGE)) {
-					dont_ack = 1;
-					cmd_send(CMD_NACK,sr,0,0,0,0);
-				}
-			}
-		} break;
+                // Wait until flashing of page finishes
+                uint32_t sr;
+                while(!((sr = AT91C_BASE_EFC0->EFC_FSR) & AT91C_MC_FRDY));
+                if(sr & (AT91C_MC_LOCKE | AT91C_MC_PROGE)) {
+                    dont_ack = 1;
+                    cmd_send(CMD_NACK,sr,0,0,0,0);
+                }
+            }
+        } break;
 
-		case CMD_HARDWARE_RESET: {
-			usb_disable();
-			AT91C_BASE_RSTC->RSTC_RCR = RST_CONTROL_KEY | AT91C_RSTC_PROCRST;
-		} break;
+        case CMD_HARDWARE_RESET: {
+            usb_disable();
+            AT91C_BASE_RSTC->RSTC_RCR = RST_CONTROL_KEY | AT91C_RSTC_PROCRST;
+        } break;
 
-		case CMD_START_FLASH: {
-			if (c->arg[2] == START_FLASH_MAGIC)
-				bootrom_unlocked = 1;
-			else
-				bootrom_unlocked = 0;
+        case CMD_START_FLASH: {
+            if (c->arg[2] == START_FLASH_MAGIC)
+                bootrom_unlocked = 1;
+            else
+                bootrom_unlocked = 0;
 
-			int prot_start = (int)&_bootrom_start;
-			int prot_end = (int)&_bootrom_end;
-			int allow_start = (int)&_flash_start;
-			int allow_end = (int)&_flash_end;
-			int cmd_start = c->arg[0];
-			int cmd_end = c->arg[1];
+            int prot_start = (int)&_bootrom_start;
+            int prot_end = (int)&_bootrom_end;
+            int allow_start = (int)&_flash_start;
+            int allow_end = (int)&_flash_end;
+            int cmd_start = c->arg[0];
+            int cmd_end = c->arg[1];
 
-			/* Only allow command if the bootrom is unlocked, or the parameters are outside of the protected
-			* bootrom area. In any case they must be within the flash area.
-			*/
-			if( (bootrom_unlocked || ((cmd_start >= prot_end) || (cmd_end < prot_start))) &&
-				(cmd_start >= allow_start) &&
-				(cmd_end <= allow_end) ) {
-				start_addr = cmd_start;
-				end_addr = cmd_end;
-			} else {
-				start_addr = end_addr = 0;
-				dont_ack = 1;
-				cmd_send(CMD_NACK,0,0,0,0,0);
-			}
-		} break;
+            /* Only allow command if the bootrom is unlocked, or the parameters are outside of the protected
+            * bootrom area. In any case they must be within the flash area.
+            */
+            if( (bootrom_unlocked || ((cmd_start >= prot_end) || (cmd_end < prot_start))) &&
+                (cmd_start >= allow_start) &&
+                (cmd_end <= allow_end) ) {
+                start_addr = cmd_start;
+                end_addr = cmd_end;
+            } else {
+                start_addr = end_addr = 0;
+                dont_ack = 1;
+                cmd_send(CMD_NACK,0,0,0,0,0);
+            }
+        } break;
 
-		default: {
-			Fatal();
-		} break;
-	}
+        default: {
+            Fatal();
+        } break;
+    }
 
-	if (!dont_ack)
-		cmd_send(CMD_ACK,arg0,0,0,0,0);
+    if (!dont_ack)
+        cmd_send(CMD_ACK,arg0,0,0,0,0);
 }
 
 static void flash_mode(int externally_entered) {
-	start_addr = 0;
-	end_addr = 0;
-	bootrom_unlocked = 0;
-	uint8_t rx[sizeof(UsbCommand)];
+    start_addr = 0;
+    end_addr = 0;
+    bootrom_unlocked = 0;
+    uint8_t rx[sizeof(UsbCommand)];
 
-	usb_enable();
+    usb_enable();
 
-	// wait for reset to be complete?
-	for (volatile size_t i=0; i<0x100000; i++) {};
+    // wait for reset to be complete?
+    for (volatile size_t i=0; i<0x100000; i++) {};
 
-	for(;;) {
-		WDT_HIT();
+    for(;;) {
+        WDT_HIT();
 
-		// Check if there is a usb packet available
-		if (usb_poll_validate_length()) {
-			if (usb_read(rx, sizeof(rx)) )
-				UsbPacketReceived(rx, sizeof(rx));
-		}
+        // Check if there is a usb packet available
+        if (usb_poll_validate_length()) {
+            if (usb_read(rx, sizeof(rx)) )
+                UsbPacketReceived(rx, sizeof(rx));
+        }
 
-		if (!externally_entered && !BUTTON_PRESS()) {
-			/* Perform a reset to leave flash mode */
-			usb_disable();
-			LED_B_ON();
-			AT91C_BASE_RSTC->RSTC_RCR = RST_CONTROL_KEY | AT91C_RSTC_PROCRST;
-			for(;;) {};
-		}
-		if (externally_entered && BUTTON_PRESS()) {
-			/* Let the user's button press override the automatic leave */
-			externally_entered = 0;
-		}
-	}
+        if (!externally_entered && !BUTTON_PRESS()) {
+            /* Perform a reset to leave flash mode */
+            usb_disable();
+            LED_B_ON();
+            AT91C_BASE_RSTC->RSTC_RCR = RST_CONTROL_KEY | AT91C_RSTC_PROCRST;
+            for(;;) {};
+        }
+        if (externally_entered && BUTTON_PRESS()) {
+            /* Let the user's button press override the automatic leave */
+            externally_entered = 0;
+        }
+    }
 }
 
 void BootROM(void) {
@@ -229,54 +229,54 @@ void BootROM(void) {
     // Kill all the pullups, especially the one on USB D+; leave them for
     // the unused pins, though.
     AT91C_BASE_PIOA->PIO_PPUDR =
-    	GPIO_USB_PU			|
-		GPIO_LED_A			|
-		GPIO_LED_B			|
-		GPIO_LED_C			|
-		GPIO_LED_D			|
-		GPIO_FPGA_DIN		|
-		GPIO_FPGA_DOUT		|
-		GPIO_FPGA_CCLK		|
-		GPIO_FPGA_NINIT		|
-		GPIO_FPGA_NPROGRAM	|
-		GPIO_FPGA_DONE		|
-		GPIO_MUXSEL_HIPKD	|
-		GPIO_MUXSEL_HIRAW	|
-		GPIO_MUXSEL_LOPKD	|
-		GPIO_MUXSEL_LORAW	|
-		GPIO_RELAY			|
-		GPIO_NVDD_ON;
-		// (and add GPIO_FPGA_ON)
-	// These pins are outputs
+        GPIO_USB_PU         |
+        GPIO_LED_A          |
+        GPIO_LED_B          |
+        GPIO_LED_C          |
+        GPIO_LED_D          |
+        GPIO_FPGA_DIN       |
+        GPIO_FPGA_DOUT      |
+        GPIO_FPGA_CCLK      |
+        GPIO_FPGA_NINIT     |
+        GPIO_FPGA_NPROGRAM  |
+        GPIO_FPGA_DONE      |
+        GPIO_MUXSEL_HIPKD   |
+        GPIO_MUXSEL_HIRAW   |
+        GPIO_MUXSEL_LOPKD   |
+        GPIO_MUXSEL_LORAW   |
+        GPIO_RELAY          |
+        GPIO_NVDD_ON;
+        // (and add GPIO_FPGA_ON)
+    // These pins are outputs
     AT91C_BASE_PIOA->PIO_OER =
-    	GPIO_LED_A			|
-		GPIO_LED_B			|
-		GPIO_LED_C			|
-		GPIO_LED_D			|
-		GPIO_RELAY			|
-		GPIO_NVDD_ON;
-	// PIO controls the following pins
+        GPIO_LED_A          |
+        GPIO_LED_B          |
+        GPIO_LED_C          |
+        GPIO_LED_D          |
+        GPIO_RELAY          |
+        GPIO_NVDD_ON;
+    // PIO controls the following pins
     AT91C_BASE_PIOA->PIO_PER =
-    	GPIO_USB_PU			|
-		GPIO_LED_A			|
-		GPIO_LED_B			|
-		GPIO_LED_C			|
-		GPIO_LED_D;
+        GPIO_USB_PU         |
+        GPIO_LED_A          |
+        GPIO_LED_B          |
+        GPIO_LED_C          |
+        GPIO_LED_D;
 
-	// USB_D_PLUS_PULLUP_OFF();
-	usb_disable();
-	LED_D_OFF();
-	LED_C_ON();
-	LED_B_OFF();
-	LED_A_OFF();
+    // USB_D_PLUS_PULLUP_OFF();
+    usb_disable();
+    LED_D_OFF();
+    LED_C_ON();
+    LED_B_OFF();
+    LED_A_OFF();
 
-	// Set the first 256kb memory flashspeed
-	AT91C_BASE_EFC0->EFC_FMR = AT91C_MC_FWS_1FWS | MC_FLASH_MODE_MASTER_CLK_IN_MHZ(48);
+    // Set the first 256kb memory flashspeed
+    AT91C_BASE_EFC0->EFC_FMR = AT91C_MC_FWS_1FWS | MC_FLASH_MODE_MASTER_CLK_IN_MHZ(48);
 
-	// 9 = 256, 10+ is 512kb
-	uint8_t id = ( *(AT91C_DBGU_CIDR) & 0xF00) >> 8;
-	if ( id > 9 )
-		AT91C_BASE_EFC1->EFC_FMR = AT91C_MC_FWS_1FWS | MC_FLASH_MODE_MASTER_CLK_IN_MHZ(48);
+    // 9 = 256, 10+ is 512kb
+    uint8_t id = ( *(AT91C_DBGU_CIDR) & 0xF00) >> 8;
+    if ( id > 9 )
+        AT91C_BASE_EFC1->EFC_FMR = AT91C_MC_FWS_1FWS | MC_FLASH_MODE_MASTER_CLK_IN_MHZ(48);
 
     // Initialize all system clocks
     ConfigClocks();
@@ -288,36 +288,36 @@ void BootROM(void) {
     case AT91C_RSTC_RSTTYP_WATCHDOG:
     case AT91C_RSTC_RSTTYP_SOFTWARE:
     case AT91C_RSTC_RSTTYP_USER:
-	    /* In these cases the common_area in RAM should be ok, retain it if it's there */
-	    if(common_area.magic == COMMON_AREA_MAGIC && common_area.version == 1)
-		    common_area_present = 1;
-	    break;
+        /* In these cases the common_area in RAM should be ok, retain it if it's there */
+        if(common_area.magic == COMMON_AREA_MAGIC && common_area.version == 1)
+            common_area_present = 1;
+        break;
     default: /* Otherwise, initialize it from scratch */
-	    break;
+        break;
     }
 
     if (!common_area_present){
-	    /* Common area not ok, initialize it */
-	    int i;
-		/* Makeshift memset, no need to drag util.c into this */
-		for(i=0; i<sizeof(common_area); i++)
-		    ((char*)&common_area)[i] = 0;
+        /* Common area not ok, initialize it */
+        int i;
+        /* Makeshift memset, no need to drag util.c into this */
+        for(i=0; i<sizeof(common_area); i++)
+            ((char*)&common_area)[i] = 0;
 
-	    common_area.magic = COMMON_AREA_MAGIC;
-	    common_area.version = 1;
-	    common_area.flags.bootrom_present = 1;
+        common_area.magic = COMMON_AREA_MAGIC;
+        common_area.version = 1;
+        common_area.flags.bootrom_present = 1;
     }
 
     common_area.flags.bootrom_present = 1;
     if (common_area.command == COMMON_AREA_COMMAND_ENTER_FLASH_MODE) {
-	    common_area.command = COMMON_AREA_COMMAND_NONE;
-	    flash_mode(1);
+        common_area.command = COMMON_AREA_COMMAND_NONE;
+        flash_mode(1);
     } else if (BUTTON_PRESS()) {
-	    flash_mode(0);
+        flash_mode(0);
     } else if (_osimage_entry == 0xffffffffU) {
-	    flash_mode(1);
+        flash_mode(1);
     } else {
-	    // jump to Flash address of the osimage entry point (LSBit set for thumb mode)
-	    __asm("bx %0\n" : : "r" ( ((int)&_osimage_entry) | 0x1 ) );
+        // jump to Flash address of the osimage entry point (LSBit set for thumb mode)
+        __asm("bx %0\n" : : "r" ( ((int)&_osimage_entry) | 0x1 ) );
     }
 }
diff --git a/bootrom/flash-reset.s b/bootrom/flash-reset.s
index 95c8f590c..efd0cccc2 100644
--- a/bootrom/flash-reset.s
+++ b/bootrom/flash-reset.s
@@ -12,40 +12,40 @@
 
 .global flashstart
 flashstart:
-	b	reset
-	b	undefined_instruction
-	b	software_interrupt
-	b	prefetch_abort
-	b	data_abort
-	b	. @reserved
-	ldr	pc, [pc,#-0xF20]	@ IRQ - read the AIC
-	b	fiq
+    b   reset
+    b   undefined_instruction
+    b   software_interrupt
+    b   prefetch_abort
+    b   data_abort
+    b   . @reserved
+    ldr pc, [pc,#-0xF20]    @ IRQ - read the AIC
+    b   fiq
 
 reset:
-	ldr	sp, =_stack_end		@ initialize stack pointer to top of RAM
+    ldr sp, =_stack_end     @ initialize stack pointer to top of RAM
 
-	@ copy bootloader to RAM (in case the user re-flashes the bootloader)
-	ldr	r0, =__bootphase2_src_start__
-	ldr	r1, =__bootphase2_start__
-	ldr	r2, =__bootphase2_end__
+    @ copy bootloader to RAM (in case the user re-flashes the bootloader)
+    ldr r0, =__bootphase2_src_start__
+    ldr r1, =__bootphase2_start__
+    ldr r2, =__bootphase2_end__
 1:
-	ldr	r3, [r0], #4
-	str	r3, [r1], #4
-	cmp	r1, r2
-	blo	1b
+    ldr r3, [r0], #4
+    str r3, [r1], #4
+    cmp r1, r2
+    blo 1b
 
-	ldr	r3, =ram_start		@ start address of RAM bootloader
-	bx	r3			@ jump to it
+    ldr r3, =ram_start      @ start address of RAM bootloader
+    bx  r3                  @ jump to it
 
-	.ltorg
+    .ltorg
 
 undefined_instruction:
-	b	.
+    b   .
 software_interrupt:
-	b	.
+    b   .
 prefetch_abort:
-	b	.
+    b   .
 data_abort:
-	b	.
+    b   .
 fiq:
-	b	.
+    b   .
diff --git a/bootrom/ldscript-flash b/bootrom/ldscript-flash
index f1bab1494..26acf8242 100644
--- a/bootrom/ldscript-flash
+++ b/bootrom/ldscript-flash
@@ -12,52 +12,52 @@ INCLUDE ../common/ldscript.common
 
 PHDRS
 {
-	phase1 PT_LOAD;
-	phase2 PT_LOAD;
-	bss PT_LOAD;
+    phase1 PT_LOAD;
+    phase2 PT_LOAD;
+    bss PT_LOAD;
 }
 
 ENTRY(flashstart)
 SECTIONS
 {
-	.bootphase1 : {
-		*(.startup)
+    .bootphase1 : {
+        *(.startup)
 
-		. = ALIGN(4);
-		_version_information_start = .;
-		KEEP(*(.version_information));
+        . = ALIGN(4);
+        _version_information_start = .;
+        KEEP(*(.version_information));
 
-		. = LENGTH(bootphase1) - 0x4;
-		LONG(_version_information_start);
-	} >bootphase1 :phase1
+        . = LENGTH(bootphase1) - 0x4;
+        LONG(_version_information_start);
+    } >bootphase1 :phase1
 
-	.bootphase2 : {
-		*(.startphase2)
-		*(.text)
-		*(.text.*)
-		*(.eh_frame)
-		*(.glue_7)
-		*(.glue_7t)
-		*(.rodata)
-		*(.rodata.*)
-		*(.data)
-		*(.data.*)
-		. = ALIGN(4);
-	} >ram AT>bootphase2 :phase2
+    .bootphase2 : {
+        *(.startphase2)
+        *(.text)
+        *(.text.*)
+        *(.eh_frame)
+        *(.glue_7)
+        *(.glue_7t)
+        *(.rodata)
+        *(.rodata.*)
+        *(.data)
+        *(.data.*)
+        . = ALIGN(4);
+    } >ram AT>bootphase2 :phase2
 
-	__bootphase2_src_start__ = LOADADDR(.bootphase2);
-	__bootphase2_start__ = ADDR(.bootphase2);
-	__bootphase2_end__ = __bootphase2_start__ + SIZEOF(.bootphase2);
+    __bootphase2_src_start__ = LOADADDR(.bootphase2);
+    __bootphase2_start__ = ADDR(.bootphase2);
+    __bootphase2_end__ = __bootphase2_start__ + SIZEOF(.bootphase2);
 
-	.bss : {
-		__bss_start__ = .;
-		*(.bss)
-		*(.bss.*)
-		. = ALIGN(4);
-		__bss_end__ = .;
-	} >ram AT>ram :bss
+    .bss : {
+        __bss_start__ = .;
+        *(.bss)
+        *(.bss.*)
+        . = ALIGN(4);
+        __bss_end__ = .;
+    } >ram AT>ram :bss
 
-	.commonarea (NOLOAD) : {
-		*(.commonarea)
-	} >commonarea
+    .commonarea (NOLOAD) : {
+        *(.commonarea)
+    } >commonarea
 }
diff --git a/bootrom/ram-reset.s b/bootrom/ram-reset.s
index ade70d8cc..ab57ee29a 100644
--- a/bootrom/ram-reset.s
+++ b/bootrom/ram-reset.s
@@ -14,7 +14,7 @@
 
 .global ram_start
 ram_start:
-	ldr	sp,     =_stack_end
-	bl	BootROM
+    ldr sp,     =_stack_end
+    bl  BootROM
 
-	.ltorg
+    .ltorg

From e559a4a5afdaa105aeb5f3eca9dd7487417cff38 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 9 Mar 2019 10:46:59 +0100
Subject: [PATCH 0686/1938] tools: fix mix of spaces & tabs

---
 tools/mfkey/crapto1.c       | 712 ++++++++++++++++++------------------
 tools/mfkey/crapto1.h       |  58 +--
 tools/mfkey/crypto1.c       | 170 ++++-----
 tools/mfkey/mfkey32.c       | 102 +++---
 tools/mfkey/mfkey32v2.c     | 112 +++---
 tools/mfkey/mfkey64.c       | 156 ++++----
 tools/nonce2key/crapto1.c   | 712 ++++++++++++++++++------------------
 tools/nonce2key/crapto1.h   |  50 +--
 tools/nonce2key/crypto1.c   | 170 ++++-----
 tools/nonce2key/nonce2key.c |  82 ++---
 10 files changed, 1162 insertions(+), 1162 deletions(-)

diff --git a/tools/mfkey/crapto1.c b/tools/mfkey/crapto1.c
index 9b2b58085..cfb07cea4 100755
--- a/tools/mfkey/crapto1.c
+++ b/tools/mfkey/crapto1.c
@@ -34,65 +34,65 @@ static void __attribute__((constructor)) fill_lut()
 
 
 typedef struct bucket {
-	uint32_t *head;
-	uint32_t *bp;
+    uint32_t *head;
+    uint32_t *bp;
 } bucket_t;
 
 typedef bucket_t bucket_array_t[2][0x100];
 
 typedef struct bucket_info {
-	struct {
-		uint32_t *head, *tail;
-		} bucket_info[2][0x100];
-		uint32_t numbuckets;
-	} bucket_info_t;
+    struct {
+        uint32_t *head, *tail;
+        } bucket_info[2][0x100];
+        uint32_t numbuckets;
+    } bucket_info_t;
 
 
 static void bucket_sort_intersect(uint32_t* const estart, uint32_t* const estop,
-								  uint32_t* const ostart, uint32_t* const ostop,
-								  bucket_info_t *bucket_info, bucket_array_t bucket)
+                                  uint32_t* const ostart, uint32_t* const ostop,
+                                  bucket_info_t *bucket_info, bucket_array_t bucket)
 {
-	uint32_t *p1, *p2;
-	uint32_t *start[2];
-	uint32_t *stop[2];
+    uint32_t *p1, *p2;
+    uint32_t *start[2];
+    uint32_t *stop[2];
 
-	start[0] = estart;
-	stop[0] = estop;
-	start[1] = ostart;
-	stop[1] = ostop;
+    start[0] = estart;
+    stop[0] = estop;
+    start[1] = ostart;
+    stop[1] = ostop;
 
-	// init buckets to be empty
-	for (uint32_t i = 0; i < 2; i++) {
-		for (uint32_t j = 0x00; j <= 0xff; j++) {
-			bucket[i][j].bp = bucket[i][j].head;
-		}
-	}
+    // init buckets to be empty
+    for (uint32_t i = 0; i < 2; i++) {
+        for (uint32_t j = 0x00; j <= 0xff; j++) {
+            bucket[i][j].bp = bucket[i][j].head;
+        }
+    }
 
-	// sort the lists into the buckets based on the MSB (contribution bits)
-	for (uint32_t i = 0; i < 2; i++) {
-		for (p1 = start[i]; p1 <= stop[i]; p1++) {
-			uint32_t bucket_index = (*p1 & 0xff000000) >> 24;
-			*(bucket[i][bucket_index].bp++) = *p1;
-		}
-	}
+    // sort the lists into the buckets based on the MSB (contribution bits)
+    for (uint32_t i = 0; i < 2; i++) {
+        for (p1 = start[i]; p1 <= stop[i]; p1++) {
+            uint32_t bucket_index = (*p1 & 0xff000000) >> 24;
+            *(bucket[i][bucket_index].bp++) = *p1;
+        }
+    }
 
 
-	// write back intersecting buckets as sorted list.
-	// fill in bucket_info with head and tail of the bucket contents in the list and number of non-empty buckets.
-	uint32_t nonempty_bucket;
-	for (uint32_t i = 0; i < 2; i++) {
-		p1 = start[i];
-		nonempty_bucket = 0;
-		for (uint32_t j = 0x00; j <= 0xff; j++) {
-			if (bucket[0][j].bp != bucket[0][j].head && bucket[1][j].bp != bucket[1][j].head) { // non-empty intersecting buckets only
-				bucket_info->bucket_info[i][nonempty_bucket].head = p1;
-				for (p2 = bucket[i][j].head; p2 < bucket[i][j].bp; *p1++ = *p2++);
-				bucket_info->bucket_info[i][nonempty_bucket].tail = p1 - 1;
-				nonempty_bucket++;
-			}
-		}
-		bucket_info->numbuckets = nonempty_bucket;
-		}
+    // write back intersecting buckets as sorted list.
+    // fill in bucket_info with head and tail of the bucket contents in the list and number of non-empty buckets.
+    uint32_t nonempty_bucket;
+    for (uint32_t i = 0; i < 2; i++) {
+        p1 = start[i];
+        nonempty_bucket = 0;
+        for (uint32_t j = 0x00; j <= 0xff; j++) {
+            if (bucket[0][j].bp != bucket[0][j].head && bucket[1][j].bp != bucket[1][j].head) { // non-empty intersecting buckets only
+                bucket_info->bucket_info[i][nonempty_bucket].head = p1;
+                for (p2 = bucket[i][j].head; p2 < bucket[i][j].bp; *p1++ = *p2++);
+                bucket_info->bucket_info[i][nonempty_bucket].tail = p1 - 1;
+                nonempty_bucket++;
+            }
+        }
+        bucket_info->numbuckets = nonempty_bucket;
+        }
 }
 
 
@@ -101,11 +101,11 @@ static void bucket_sort_intersect(uint32_t* const estart, uint32_t* const estop,
  */
 static inline void update_contribution(uint32_t *item, const uint32_t mask1, const uint32_t mask2)
 {
-	uint32_t p = *item >> 25;
+    uint32_t p = *item >> 25;
 
-	p = p << 1 | parity(*item & mask1);
-	p = p << 1 | parity(*item & mask2);
-	*item = p << 24 | (*item & 0xffffff);
+    p = p << 1 | parity(*item & mask1);
+    p = p << 1 | parity(*item & mask2);
+    *item = p << 24 | (*item & 0xffffff);
 }
 
 /** extend_table
@@ -113,83 +113,83 @@ static inline void update_contribution(uint32_t *item, const uint32_t mask1, con
  */
 static inline void extend_table(uint32_t *tbl, uint32_t **end, int bit, int m1, int m2, uint32_t in)
 {
-	in <<= 24;
-	for(*tbl <<= 1; tbl <= *end; *++tbl <<= 1)
-		if(filter(*tbl) ^ filter(*tbl | 1)) {
-			*tbl |= filter(*tbl) ^ bit;
-			update_contribution(tbl, m1, m2);
-			*tbl ^= in;
-		} else if(filter(*tbl) == bit) {
-			*++*end = tbl[1];
-			tbl[1] = tbl[0] | 1;
-			update_contribution(tbl, m1, m2);
-			*tbl++ ^= in;
-			update_contribution(tbl, m1, m2);
-			*tbl ^= in;
-		} else
-			*tbl-- = *(*end)--;
+    in <<= 24;
+    for(*tbl <<= 1; tbl <= *end; *++tbl <<= 1)
+        if(filter(*tbl) ^ filter(*tbl | 1)) {
+            *tbl |= filter(*tbl) ^ bit;
+            update_contribution(tbl, m1, m2);
+            *tbl ^= in;
+        } else if(filter(*tbl) == bit) {
+            *++*end = tbl[1];
+            tbl[1] = tbl[0] | 1;
+            update_contribution(tbl, m1, m2);
+            *tbl++ ^= in;
+            update_contribution(tbl, m1, m2);
+            *tbl ^= in;
+        } else
+            *tbl-- = *(*end)--;
 }
 /** extend_table_simple
  * using a bit of the keystream extend the table of possible lfsr states
  */
 static inline void extend_table_simple(uint32_t *tbl, uint32_t **end, int bit)
 {
-	for(*tbl <<= 1; tbl <= *end; *++tbl <<= 1) {
-		if(filter(*tbl) ^ filter(*tbl | 1)) {	// replace
-			*tbl |= filter(*tbl) ^ bit;
-		} else if(filter(*tbl) == bit) {		// insert
-			*++*end = *++tbl;
-			*tbl = tbl[-1] | 1;
-		} else	{								// drop
-			*tbl-- = *(*end)--;
-		}
-	}
+    for(*tbl <<= 1; tbl <= *end; *++tbl <<= 1) {
+        if(filter(*tbl) ^ filter(*tbl | 1)) {   // replace
+            *tbl |= filter(*tbl) ^ bit;
+        } else if(filter(*tbl) == bit) {        // insert
+            *++*end = *++tbl;
+            *tbl = tbl[-1] | 1;
+        } else {                                // drop
+            *tbl-- = *(*end)--;
+        }
+    }
 }
 /** recover
  * recursively narrow down the search space, 4 bits of keystream at a time
  */
 static struct Crypto1State*
 recover(uint32_t *o_head, uint32_t *o_tail, uint32_t oks,
-	uint32_t *e_head, uint32_t *e_tail, uint32_t eks, int rem,
-	struct Crypto1State *sl, uint32_t in, bucket_array_t bucket)
+    uint32_t *e_head, uint32_t *e_tail, uint32_t eks, int rem,
+    struct Crypto1State *sl, uint32_t in, bucket_array_t bucket)
 {
-	uint32_t *o, *e;
-	bucket_info_t bucket_info;
+    uint32_t *o, *e;
+    bucket_info_t bucket_info;
 
-	if(rem == -1) {
-		for(e = e_head; e <= e_tail; ++e) {
-			*e = *e << 1 ^ parity(*e & LF_POLY_EVEN) ^ !!(in & 4);
-			for(o = o_head; o <= o_tail; ++o, ++sl) {
-				sl->even = *o;
-				sl->odd = *e ^ parity(*o & LF_POLY_ODD);
-				sl[1].odd = sl[1].even = 0;
-			}
-		}
-		return sl;
-	}
+    if(rem == -1) {
+        for(e = e_head; e <= e_tail; ++e) {
+            *e = *e << 1 ^ parity(*e & LF_POLY_EVEN) ^ !!(in & 4);
+            for(o = o_head; o <= o_tail; ++o, ++sl) {
+                sl->even = *o;
+                sl->odd = *e ^ parity(*o & LF_POLY_ODD);
+                sl[1].odd = sl[1].even = 0;
+            }
+        }
+        return sl;
+    }
 
-	for(uint32_t i = 0; i < 4 && rem--; i++) {
-		oks >>= 1;
-		eks >>= 1;
-		in >>= 2;
-		extend_table(o_head, &o_tail, oks & 1, LF_POLY_EVEN << 1 | 1, LF_POLY_ODD << 1, 0);
-		if(o_head > o_tail)
-			return sl;
+    for(uint32_t i = 0; i < 4 && rem--; i++) {
+        oks >>= 1;
+        eks >>= 1;
+        in >>= 2;
+        extend_table(o_head, &o_tail, oks & 1, LF_POLY_EVEN << 1 | 1, LF_POLY_ODD << 1, 0);
+        if(o_head > o_tail)
+            return sl;
 
-		extend_table(e_head, &e_tail, eks & 1, LF_POLY_ODD, LF_POLY_EVEN << 1 | 1, in & 3);
-		if(e_head > e_tail)
-			return sl;
-	}
+        extend_table(e_head, &e_tail, eks & 1, LF_POLY_ODD, LF_POLY_EVEN << 1 | 1, in & 3);
+        if(e_head > e_tail)
+            return sl;
+    }
 
-	bucket_sort_intersect(e_head, e_tail, o_head, o_tail, &bucket_info, bucket);
+    bucket_sort_intersect(e_head, e_tail, o_head, o_tail, &bucket_info, bucket);
 
-	for (int i = bucket_info.numbuckets - 1; i >= 0; i--) {
-		sl = recover(bucket_info.bucket_info[1][i].head, bucket_info.bucket_info[1][i].tail, oks,
-					 bucket_info.bucket_info[0][i].head, bucket_info.bucket_info[0][i].tail, eks,
-					 rem, sl, in, bucket);
-		}
+    for (int i = bucket_info.numbuckets - 1; i >= 0; i--) {
+        sl = recover(bucket_info.bucket_info[1][i].head, bucket_info.bucket_info[1][i].tail, oks,
+                     bucket_info.bucket_info[0][i].head, bucket_info.bucket_info[0][i].tail, eks,
+                     rem, sl, in, bucket);
+        }
 
-	return sl;
+    return sl;
 }
 /** lfsr_recovery
  * recover the state of the lfsr given 32 bits of the keystream
@@ -198,87 +198,87 @@ recover(uint32_t *o_head, uint32_t *o_tail, uint32_t oks,
  */
 struct Crypto1State* lfsr_recovery32(uint32_t ks2, uint32_t in)
 {
-	struct Crypto1State *statelist;
-	uint32_t *odd_head = 0, *odd_tail = 0, oks = 0;
-	uint32_t *even_head = 0, *even_tail = 0, eks = 0;
-	int i;
+    struct Crypto1State *statelist;
+    uint32_t *odd_head = 0, *odd_tail = 0, oks = 0;
+    uint32_t *even_head = 0, *even_tail = 0, eks = 0;
+    int i;
 
-	// split the keystream into an odd and even part
-	for(i = 31; i >= 0; i -= 2)
-		oks = oks << 1 | BEBIT(ks2, i);
-	for(i = 30; i >= 0; i -= 2)
-		eks = eks << 1 | BEBIT(ks2, i);
+    // split the keystream into an odd and even part
+    for(i = 31; i >= 0; i -= 2)
+        oks = oks << 1 | BEBIT(ks2, i);
+    for(i = 30; i >= 0; i -= 2)
+        eks = eks << 1 | BEBIT(ks2, i);
 
-	odd_head = odd_tail = malloc(sizeof(uint32_t) << 21);
-	even_head = even_tail = malloc(sizeof(uint32_t) << 21);
-	statelist =  malloc(sizeof(struct Crypto1State) << 18);
-	if(!odd_tail-- || !even_tail-- || !statelist) {
-		free(statelist);
-		statelist = 0;
-		goto out;
-	}
+    odd_head = odd_tail = malloc(sizeof(uint32_t) << 21);
+    even_head = even_tail = malloc(sizeof(uint32_t) << 21);
+    statelist =  malloc(sizeof(struct Crypto1State) << 18);
+    if(!odd_tail-- || !even_tail-- || !statelist) {
+        free(statelist);
+        statelist = 0;
+        goto out;
+    }
 
-	statelist->odd = statelist->even = 0;
+    statelist->odd = statelist->even = 0;
 
-	// allocate memory for out of place bucket_sort
-	bucket_array_t bucket;
+    // allocate memory for out of place bucket_sort
+    bucket_array_t bucket;
 
-	for (uint32_t i = 0; i < 2; i++) {
-		for (uint32_t j = 0; j <= 0xff; j++) {
-			bucket[i][j].head = malloc(sizeof(uint32_t)<<14);
-			if (!bucket[i][j].head) {
-				goto out;
-			}
-		}
-	}
+    for (uint32_t i = 0; i < 2; i++) {
+        for (uint32_t j = 0; j <= 0xff; j++) {
+            bucket[i][j].head = malloc(sizeof(uint32_t)<<14);
+            if (!bucket[i][j].head) {
+                goto out;
+            }
+        }
+    }
 
-	// initialize statelists: add all possible states which would result into the rightmost 2 bits of the keystream
-	for(i = 1 << 20; i >= 0; --i) {
-		if(filter(i) == (oks & 1))
-			*++odd_tail = i;
-		if(filter(i) == (eks & 1))
-			*++even_tail = i;
-	}
+    // initialize statelists: add all possible states which would result into the rightmost 2 bits of the keystream
+    for(i = 1 << 20; i >= 0; --i) {
+        if(filter(i) == (oks & 1))
+            *++odd_tail = i;
+        if(filter(i) == (eks & 1))
+            *++even_tail = i;
+    }
 
-	// extend the statelists. Look at the next 8 Bits of the keystream (4 Bit each odd and even):
-	for(i = 0; i < 4; i++) {
-		extend_table_simple(odd_head,  &odd_tail, (oks >>= 1) & 1);
-		extend_table_simple(even_head, &even_tail, (eks >>= 1) & 1);
-	}
+    // extend the statelists. Look at the next 8 Bits of the keystream (4 Bit each odd and even):
+    for(i = 0; i < 4; i++) {
+        extend_table_simple(odd_head,  &odd_tail, (oks >>= 1) & 1);
+        extend_table_simple(even_head, &even_tail, (eks >>= 1) & 1);
+    }
 
-	// the statelists now contain all states which could have generated the last 10 Bits of the keystream.
-	// 22 bits to go to recover 32 bits in total. From now on, we need to take the "in"
-	// parameter into account.
-	in = (in >> 16 & 0xff) | (in << 16) | (in & 0xff00);		// Byte swapping
-	recover(odd_head, odd_tail, oks, even_head, even_tail, eks, 11, statelist, in << 1, bucket);
+    // the statelists now contain all states which could have generated the last 10 Bits of the keystream.
+    // 22 bits to go to recover 32 bits in total. From now on, we need to take the "in"
+    // parameter into account.
+    in = (in >> 16 & 0xff) | (in << 16) | (in & 0xff00); // Byte swapping
+    recover(odd_head, odd_tail, oks, even_head, even_tail, eks, 11, statelist, in << 1, bucket);
 
 out:
-	for (uint32_t i = 0; i < 2; i++)
-		for (uint32_t j = 0; j <= 0xff; j++)
-			free(bucket[i][j].head);
-	free(odd_head);
-	free(even_head);
-	return statelist;
+    for (uint32_t i = 0; i < 2; i++)
+        for (uint32_t j = 0; j <= 0xff; j++)
+            free(bucket[i][j].head);
+    free(odd_head);
+    free(even_head);
+    return statelist;
 }
 
 static const uint32_t S1[] = {     0x62141, 0x310A0, 0x18850, 0x0C428, 0x06214,
-	0x0310A, 0x85E30, 0xC69AD, 0x634D6, 0xB5CDE, 0xDE8DA, 0x6F46D, 0xB3C83,
-	0x59E41, 0xA8995, 0xD027F, 0x6813F, 0x3409F, 0x9E6FA};
+    0x0310A, 0x85E30, 0xC69AD, 0x634D6, 0xB5CDE, 0xDE8DA, 0x6F46D, 0xB3C83,
+    0x59E41, 0xA8995, 0xD027F, 0x6813F, 0x3409F, 0x9E6FA};
 static const uint32_t S2[] = {  0x3A557B00, 0x5D2ABD80, 0x2E955EC0, 0x174AAF60,
-	0x0BA557B0, 0x05D2ABD8, 0x0449DE68, 0x048464B0, 0x42423258, 0x278192A8,
-	0x156042D0, 0x0AB02168, 0x43F89B30, 0x61FC4D98, 0x765EAD48, 0x7D8FDD20,
-	0x7EC7EE90, 0x7F63F748, 0x79117020};
+    0x0BA557B0, 0x05D2ABD8, 0x0449DE68, 0x048464B0, 0x42423258, 0x278192A8,
+    0x156042D0, 0x0AB02168, 0x43F89B30, 0x61FC4D98, 0x765EAD48, 0x7D8FDD20,
+    0x7EC7EE90, 0x7F63F748, 0x79117020};
 static const uint32_t T1[] = {
-	0x4F37D, 0x279BE, 0x97A6A, 0x4BD35, 0x25E9A, 0x12F4D, 0x097A6, 0x80D66,
-	0xC4006, 0x62003, 0xB56B4, 0x5AB5A, 0xA9318, 0xD0F39, 0x6879C, 0xB057B,
-	0x582BD, 0x2C15E, 0x160AF, 0x8F6E2, 0xC3DC4, 0xE5857, 0x72C2B, 0x39615,
-	0x98DBF, 0xC806A, 0xE0680, 0x70340, 0x381A0, 0x98665, 0x4C332, 0xA272C};
+    0x4F37D, 0x279BE, 0x97A6A, 0x4BD35, 0x25E9A, 0x12F4D, 0x097A6, 0x80D66,
+    0xC4006, 0x62003, 0xB56B4, 0x5AB5A, 0xA9318, 0xD0F39, 0x6879C, 0xB057B,
+    0x582BD, 0x2C15E, 0x160AF, 0x8F6E2, 0xC3DC4, 0xE5857, 0x72C2B, 0x39615,
+    0x98DBF, 0xC806A, 0xE0680, 0x70340, 0x381A0, 0x98665, 0x4C332, 0xA272C};
 static const uint32_t T2[] = {  0x3C88B810, 0x5E445C08, 0x2982A580, 0x14C152C0,
-	0x4A60A960, 0x253054B0, 0x52982A58, 0x2FEC9EA8, 0x1156C4D0, 0x08AB6268,
-	0x42F53AB0, 0x217A9D58, 0x161DC528, 0x0DAE6910, 0x46D73488, 0x25CB11C0,
-	0x52E588E0, 0x6972C470, 0x34B96238, 0x5CFC3A98, 0x28DE96C8, 0x12CFC0E0,
-	0x4967E070, 0x64B3F038, 0x74F97398, 0x7CDC3248, 0x38CE92A0, 0x1C674950,
-	0x0E33A4A8, 0x01B959D0, 0x40DCACE8, 0x26CEDDF0};
+    0x4A60A960, 0x253054B0, 0x52982A58, 0x2FEC9EA8, 0x1156C4D0, 0x08AB6268,
+    0x42F53AB0, 0x217A9D58, 0x161DC528, 0x0DAE6910, 0x46D73488, 0x25CB11C0,
+    0x52E588E0, 0x6972C470, 0x34B96238, 0x5CFC3A98, 0x28DE96C8, 0x12CFC0E0,
+    0x4967E070, 0x64B3F038, 0x74F97398, 0x7CDC3248, 0x38CE92A0, 0x1C674950,
+    0x0E33A4A8, 0x01B959D0, 0x40DCACE8, 0x26CEDDF0};
 static const uint32_t C1[] = { 0x846B5, 0x4235A, 0x211AD};
 static const uint32_t C2[] = { 0x1A822E0, 0x21A822E0, 0x21A822E0};
 /** Reverse 64 bits of keystream into possible cipher states
@@ -286,69 +286,69 @@ static const uint32_t C2[] = { 0x1A822E0, 0x21A822E0, 0x21A822E0};
  */
 struct Crypto1State* lfsr_recovery64(uint32_t ks2, uint32_t ks3)
 {
-	struct Crypto1State *statelist, *sl;
-	uint8_t oks[32], eks[32], hi[32];
-	uint32_t low = 0,  win = 0;
-	uint32_t *tail, table[1 << 16];
-	int i, j;
+    struct Crypto1State *statelist, *sl;
+    uint8_t oks[32], eks[32], hi[32];
+    uint32_t low = 0,  win = 0;
+    uint32_t *tail, table[1 << 16];
+    int i, j;
 
-	sl = statelist = malloc(sizeof(struct Crypto1State) << 4);
-	if(!sl)
-		return 0;
-	sl->odd = sl->even = 0;
+    sl = statelist = malloc(sizeof(struct Crypto1State) << 4);
+    if(!sl)
+        return 0;
+    sl->odd = sl->even = 0;
 
-	for(i = 30; i >= 0; i -= 2) {
-		oks[i >> 1] = BEBIT(ks2, i);
-		oks[16 + (i >> 1)] = BEBIT(ks3, i);
-	}
-	for(i = 31; i >= 0; i -= 2) {
-		eks[i >> 1] = BEBIT(ks2, i);
-		eks[16 + (i >> 1)] = BEBIT(ks3, i);
-	}
+    for(i = 30; i >= 0; i -= 2) {
+        oks[i >> 1] = BEBIT(ks2, i);
+        oks[16 + (i >> 1)] = BEBIT(ks3, i);
+    }
+    for(i = 31; i >= 0; i -= 2) {
+        eks[i >> 1] = BEBIT(ks2, i);
+        eks[16 + (i >> 1)] = BEBIT(ks3, i);
+    }
 
-	for(i = 0xfffff; i >= 0; --i) {
-		if (filter(i) != oks[0])
-			continue;
+    for(i = 0xfffff; i >= 0; --i) {
+        if (filter(i) != oks[0])
+            continue;
 
-		*(tail = table) = i;
-		for(j = 1; tail >= table && j < 29; ++j)
-			extend_table_simple(table, &tail, oks[j]);
+        *(tail = table) = i;
+        for(j = 1; tail >= table && j < 29; ++j)
+            extend_table_simple(table, &tail, oks[j]);
 
-		if(tail < table)
-			continue;
+        if(tail < table)
+            continue;
 
-		for(j = 0; j < 19; ++j)
-			low = low << 1 | parity(i & S1[j]);
-		for(j = 0; j < 32; ++j)
-			hi[j] = parity(i & T1[j]);
+        for(j = 0; j < 19; ++j)
+            low = low << 1 | parity(i & S1[j]);
+        for(j = 0; j < 32; ++j)
+            hi[j] = parity(i & T1[j]);
 
-		for(; tail >= table; --tail) {
-			for(j = 0; j < 3; ++j) {
-				*tail = *tail << 1;
-				*tail |= parity((i & C1[j]) ^ (*tail & C2[j]));
-				if(filter(*tail) != oks[29 + j])
-					goto continue2;
-			}
+        for(; tail >= table; --tail) {
+            for(j = 0; j < 3; ++j) {
+                *tail = *tail << 1;
+                *tail |= parity((i & C1[j]) ^ (*tail & C2[j]));
+                if(filter(*tail) != oks[29 + j])
+                    goto continue2;
+            }
 
-			for(j = 0; j < 19; ++j)
-				win = win << 1 | parity(*tail & S2[j]);
+            for(j = 0; j < 19; ++j)
+                win = win << 1 | parity(*tail & S2[j]);
 
-			win ^= low;
-			for(j = 0; j < 32; ++j) {
-				win = win << 1 ^ hi[j] ^ parity(*tail & T2[j]);
-				if(filter(win) != eks[j])
-					goto continue2;
-			}
+            win ^= low;
+            for(j = 0; j < 32; ++j) {
+                win = win << 1 ^ hi[j] ^ parity(*tail & T2[j]);
+                if(filter(win) != eks[j])
+                    goto continue2;
+            }
 
-			*tail = *tail << 1 | parity(LF_POLY_EVEN & *tail);
-			sl->odd = *tail ^ parity(LF_POLY_ODD & win);
-			sl->even = win;
-			++sl;
-			sl->odd = sl->even = 0;
-			continue2:;
-		}
-	}
-	return statelist;
+            *tail = *tail << 1 | parity(LF_POLY_EVEN & *tail);
+            sl->odd = *tail ^ parity(LF_POLY_ODD & win);
+            sl->even = win;
+            ++sl;
+            sl->odd = sl->even = 0;
+            continue2:;
+        }
+    }
+    return statelist;
 }
 
 /** lfsr_rollback_bit
@@ -356,93 +356,93 @@ struct Crypto1State* lfsr_recovery64(uint32_t ks2, uint32_t ks3)
  */
 uint8_t lfsr_rollback_bit(struct Crypto1State *s, uint32_t in, int fb)
 {
-	int out;
-	uint8_t ret;
-	uint32_t t;
+    int out;
+    uint8_t ret;
+    uint32_t t;
 
-	s->odd &= 0xffffff;
-	t = s->odd, s->odd = s->even, s->even = t;
+    s->odd &= 0xffffff;
+    t = s->odd, s->odd = s->even, s->even = t;
 
-	out = s->even & 1;
-	out ^= LF_POLY_EVEN & (s->even >>= 1);
-	out ^= LF_POLY_ODD & s->odd;
-	out ^= !!in;
-	out ^= (ret = filter(s->odd)) & !!fb;
+    out = s->even & 1;
+    out ^= LF_POLY_EVEN & (s->even >>= 1);
+    out ^= LF_POLY_ODD & s->odd;
+    out ^= !!in;
+    out ^= (ret = filter(s->odd)) & !!fb;
 
-	s->even |= parity(out) << 23;
-	return ret;
+    s->even |= parity(out) << 23;
+    return ret;
 }
 /** lfsr_rollback_byte
  * Rollback the shift register in order to get previous states
  */
 uint8_t lfsr_rollback_byte(struct Crypto1State *s, uint32_t in, int fb)
 {
-	/*
-	int i, ret = 0;
-	for (i = 7; i >= 0; --i)
-		ret |= lfsr_rollback_bit(s, BIT(in, i), fb) << i;
+    /*
+    int i, ret = 0;
+    for (i = 7; i >= 0; --i)
+        ret |= lfsr_rollback_bit(s, BIT(in, i), fb) << i;
 */
 // unfold loop 20160112
-	uint8_t ret = 0;
-	ret |= lfsr_rollback_bit(s, BIT(in, 7), fb) << 7;
-	ret |= lfsr_rollback_bit(s, BIT(in, 6), fb) << 6;
-	ret |= lfsr_rollback_bit(s, BIT(in, 5), fb) << 5;
-	ret |= lfsr_rollback_bit(s, BIT(in, 4), fb) << 4;
-	ret |= lfsr_rollback_bit(s, BIT(in, 3), fb) << 3;
-	ret |= lfsr_rollback_bit(s, BIT(in, 2), fb) << 2;
-	ret |= lfsr_rollback_bit(s, BIT(in, 1), fb) << 1;
-	ret |= lfsr_rollback_bit(s, BIT(in, 0), fb) << 0;
-	return ret;
+    uint8_t ret = 0;
+    ret |= lfsr_rollback_bit(s, BIT(in, 7), fb) << 7;
+    ret |= lfsr_rollback_bit(s, BIT(in, 6), fb) << 6;
+    ret |= lfsr_rollback_bit(s, BIT(in, 5), fb) << 5;
+    ret |= lfsr_rollback_bit(s, BIT(in, 4), fb) << 4;
+    ret |= lfsr_rollback_bit(s, BIT(in, 3), fb) << 3;
+    ret |= lfsr_rollback_bit(s, BIT(in, 2), fb) << 2;
+    ret |= lfsr_rollback_bit(s, BIT(in, 1), fb) << 1;
+    ret |= lfsr_rollback_bit(s, BIT(in, 0), fb) << 0;
+    return ret;
 }
 /** lfsr_rollback_word
  * Rollback the shift register in order to get previous states
  */
 uint32_t lfsr_rollback_word(struct Crypto1State *s, uint32_t in, int fb)
 {
-	/*
-	int i;
-	uint32_t ret = 0;
-	for (i = 31; i >= 0; --i)
-		ret |= lfsr_rollback_bit(s, BEBIT(in, i), fb) << (i ^ 24);
+    /*
+    int i;
+    uint32_t ret = 0;
+    for (i = 31; i >= 0; --i)
+        ret |= lfsr_rollback_bit(s, BEBIT(in, i), fb) << (i ^ 24);
 */
 // unfold loop 20160112
-	uint32_t ret = 0;
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 31), fb) << (31 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 30), fb) << (30 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 29), fb) << (29 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 28), fb) << (28 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 27), fb) << (27 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 26), fb) << (26 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 25), fb) << (25 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 24), fb) << (24 ^ 24);
+    uint32_t ret = 0;
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 31), fb) << (31 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 30), fb) << (30 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 29), fb) << (29 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 28), fb) << (28 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 27), fb) << (27 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 26), fb) << (26 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 25), fb) << (25 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 24), fb) << (24 ^ 24);
 
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 23), fb) << (23 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 22), fb) << (22 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 21), fb) << (21 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 20), fb) << (20 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 19), fb) << (19 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 18), fb) << (18 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 17), fb) << (17 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 16), fb) << (16 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 23), fb) << (23 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 22), fb) << (22 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 21), fb) << (21 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 20), fb) << (20 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 19), fb) << (19 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 18), fb) << (18 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 17), fb) << (17 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 16), fb) << (16 ^ 24);
 
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 15), fb) << (15 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 14), fb) << (14 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 13), fb) << (13 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 12), fb) << (12 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 11), fb) << (11 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 10), fb) << (10 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 9), fb) << (9 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 8), fb) << (8 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 15), fb) << (15 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 14), fb) << (14 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 13), fb) << (13 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 12), fb) << (12 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 11), fb) << (11 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 10), fb) << (10 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 9), fb) << (9 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 8), fb) << (8 ^ 24);
 
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 7), fb) << (7 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 6), fb) << (6 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 5), fb) << (5 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 4), fb) << (4 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 3), fb) << (3 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 2), fb) << (2 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 1), fb) << (1 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 0), fb) << (0 ^ 24);
-	return ret;
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 7), fb) << (7 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 6), fb) << (6 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 5), fb) << (5 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 4), fb) << (4 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 3), fb) << (3 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 2), fb) << (2 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 1), fb) << (1 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 0), fb) << (0 ^ 24);
+    return ret;
 }
 
 /** nonce_distance
@@ -451,23 +451,23 @@ uint32_t lfsr_rollback_word(struct Crypto1State *s, uint32_t in, int fb)
 static uint16_t *dist = 0;
 int nonce_distance(uint32_t from, uint32_t to)
 {
-	uint16_t x, i;
-	if(!dist) {
-		dist = malloc(2 << 16);
-		if(!dist)
-			return -1;
-		for (x = i = 1; i; ++i) {
-			dist[(x & 0xff) << 8 | x >> 8] = i;
-			x = x >> 1 | (x ^ x >> 2 ^ x >> 3 ^ x >> 5) << 15;
-		}
-	}
-	return (65535 + dist[to >> 16] - dist[from >> 16]) % 65535;
+    uint16_t x, i;
+    if(!dist) {
+        dist = malloc(2 << 16);
+        if(!dist)
+            return -1;
+        for (x = i = 1; i; ++i) {
+            dist[(x & 0xff) << 8 | x >> 8] = i;
+            x = x >> 1 | (x ^ x >> 2 ^ x >> 3 ^ x >> 5) << 15;
+        }
+    }
+    return (65535 + dist[to >> 16] - dist[from >> 16]) % 65535;
 }
 
 
 static uint32_t fastfwd[2][8] = {
-	{ 0, 0x4BC53, 0xECB1, 0x450E2, 0x25E29, 0x6E27A, 0x2B298, 0x60ECB},
-	{ 0, 0x1D962, 0x4BC53, 0x56531, 0xECB1, 0x135D3, 0x450E2, 0x58980}};
+    { 0, 0x4BC53, 0xECB1, 0x450E2, 0x25E29, 0x6E27A, 0x2B298, 0x60ECB},
+    { 0, 0x1D962, 0x4BC53, 0x56531, 0xECB1, 0x135D3, 0x450E2, 0x58980}};
 
 
 /** lfsr_prefix_ks
@@ -481,25 +481,25 @@ static uint32_t fastfwd[2][8] = {
  */
 uint32_t *lfsr_prefix_ks(uint8_t ks[8], int isodd)
 {
-	uint32_t *candidates = malloc(4 << 10);
-	if(!candidates) return 0;
+    uint32_t *candidates = malloc(4 << 10);
+    if(!candidates) return 0;
 
-	uint32_t c,  entry;
-	int size = 0, i, good;
+    uint32_t c,  entry;
+    int size = 0, i, good;
 
-	for(i = 0; i < 1 << 21; ++i) {
-		for(c = 0, good = 1; good && c < 8; ++c) {
-			entry = i ^ fastfwd[isodd][c];
-			good &= (BIT(ks[c], isodd) == filter(entry >> 1));
-			good &= (BIT(ks[c], isodd + 2) == filter(entry));
-		}
-		if(good)
-			candidates[size++] = i;
-	}
+    for(i = 0; i < 1 << 21; ++i) {
+        for(c = 0, good = 1; good && c < 8; ++c) {
+            entry = i ^ fastfwd[isodd][c];
+            good &= (BIT(ks[c], isodd) == filter(entry >> 1));
+            good &= (BIT(ks[c], isodd + 2) == filter(entry));
+        }
+        if(good)
+            candidates[size++] = i;
+    }
 
-	candidates[size] = -1;
+    candidates[size] = -1;
 
-	return candidates;
+    return candidates;
 }
 
 /** check_pfx_parity
@@ -507,30 +507,30 @@ uint32_t *lfsr_prefix_ks(uint8_t ks[8], int isodd)
  */
 static struct Crypto1State* check_pfx_parity(uint32_t prefix, uint32_t rresp, uint8_t parities[8][8], uint32_t odd, uint32_t even, struct Crypto1State* sl)
 {
-	uint32_t ks1, nr, ks2, rr, ks3, c, good = 1;
+    uint32_t ks1, nr, ks2, rr, ks3, c, good = 1;
 
-	for(c = 0; good && c < 8; ++c) {
-		sl->odd = odd ^ fastfwd[1][c];
-		sl->even = even ^ fastfwd[0][c];
+    for(c = 0; good && c < 8; ++c) {
+        sl->odd = odd ^ fastfwd[1][c];
+        sl->even = even ^ fastfwd[0][c];
 
-		lfsr_rollback_bit(sl, 0, 0);
-		lfsr_rollback_bit(sl, 0, 0);
+        lfsr_rollback_bit(sl, 0, 0);
+        lfsr_rollback_bit(sl, 0, 0);
 
-		ks3 = lfsr_rollback_bit(sl, 0, 0);
-		ks2 = lfsr_rollback_word(sl, 0, 0);
-		ks1 = lfsr_rollback_word(sl, prefix | c << 5, 1);
+        ks3 = lfsr_rollback_bit(sl, 0, 0);
+        ks2 = lfsr_rollback_word(sl, 0, 0);
+        ks1 = lfsr_rollback_word(sl, prefix | c << 5, 1);
 
-		nr = ks1 ^ (prefix | c << 5);
-		rr = ks2 ^ rresp;
+        nr = ks1 ^ (prefix | c << 5);
+        rr = ks2 ^ rresp;
 
-		good &= parity(nr & 0x000000ff) ^ parities[c][3] ^ BIT(ks2, 24);
-		good &= parity(rr & 0xff000000) ^ parities[c][4] ^ BIT(ks2, 16);
-		good &= parity(rr & 0x00ff0000) ^ parities[c][5] ^ BIT(ks2,  8);
-		good &= parity(rr & 0x0000ff00) ^ parities[c][6] ^ BIT(ks2,  0);
-		good &= parity(rr & 0x000000ff) ^ parities[c][7] ^ ks3;
-	}
+        good &= parity(nr & 0x000000ff) ^ parities[c][3] ^ BIT(ks2, 24);
+        good &= parity(rr & 0xff000000) ^ parities[c][4] ^ BIT(ks2, 16);
+        good &= parity(rr & 0x00ff0000) ^ parities[c][5] ^ BIT(ks2,  8);
+        good &= parity(rr & 0x0000ff00) ^ parities[c][6] ^ BIT(ks2,  0);
+        good &= parity(rr & 0x000000ff) ^ parities[c][7] ^ ks3;
+    }
 
-	return sl + good;
+    return sl + good;
 }
 
 /** lfsr_common_prefix
@@ -545,30 +545,30 @@ static struct Crypto1State* check_pfx_parity(uint32_t prefix, uint32_t rresp, ui
 
 struct Crypto1State* lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8])
 {
-	struct Crypto1State *statelist, *s;
-	uint32_t *odd, *even, *o, *e, top;
+    struct Crypto1State *statelist, *s;
+    uint32_t *odd, *even, *o, *e, top;
 
-	odd = lfsr_prefix_ks(ks, 1);
-	even = lfsr_prefix_ks(ks, 0);
+    odd = lfsr_prefix_ks(ks, 1);
+    even = lfsr_prefix_ks(ks, 0);
 
-	s = statelist = malloc((sizeof *statelist) << 24);
-	if(!s || !odd || !even) {
-		free(statelist);
-		statelist = 0;
+    s = statelist = malloc((sizeof *statelist) << 24);
+    if(!s || !odd || !even) {
+        free(statelist);
+        statelist = 0;
                 goto out;
-	}
+    }
 
-	for(o = odd; *o + 1; ++o)
-		for(e = even; *e + 1; ++e)
-			for(top = 0; top < 64; ++top) {
-				*o += 1 << 21;
-				*e += (!(top & 7) + 1) << 21;
-				s = check_pfx_parity(pfx, rr, par, *o, *e, s);
-			}
+    for(o = odd; *o + 1; ++o)
+        for(e = even; *e + 1; ++e)
+            for(top = 0; top < 64; ++top) {
+                *o += 1 << 21;
+                *e += (!(top & 7) + 1) << 21;
+                s = check_pfx_parity(pfx, rr, par, *o, *e, s);
+            }
 
-	s->odd = s->even = 0;
+    s->odd = s->even = 0;
 out:
-	free(odd);
-	free(even);
-	return statelist;
+    free(odd);
+    free(even);
+    return statelist;
 }
diff --git a/tools/mfkey/crapto1.h b/tools/mfkey/crapto1.h
index 875ffdaab..75391c4f2 100755
--- a/tools/mfkey/crapto1.h
+++ b/tools/mfkey/crapto1.h
@@ -43,18 +43,18 @@ uint8_t lfsr_rollback_byte(struct Crypto1State* s, uint32_t in, int fb);
 uint32_t lfsr_rollback_word(struct Crypto1State* s, uint32_t in, int fb);
 int nonce_distance(uint32_t from, uint32_t to);
 #define SWAPENDIAN(x)\
-	(x = (x >> 8 & 0xff00ff) | (x & 0xff00ff) << 8, x = x >> 16 | x << 16)
+    (x = (x >> 8 & 0xff00ff) | (x & 0xff00ff) << 8, x = x >> 16 | x << 16)
 
 #define FOREACH_VALID_NONCE(N, FILTER, FSIZE)\
-	uint32_t __n = 0,__M = 0, N = 0;\
-	int __i;\
-	for(; __n < 1 << 16; N = prng_successor(__M = ++__n, 16))\
-		for(__i = FSIZE - 1; __i >= 0; __i--)\
-			if(BIT(FILTER, __i) ^ parity(__M & 0xFF01))\
-				break;\
-			else if(__i)\
-				__M = prng_successor(__M, (__i == 7) ? 48 : 8);\
-			else
+    uint32_t __n = 0,__M = 0, N = 0;\
+    int __i;\
+    for(; __n < 1 << 16; N = prng_successor(__M = ++__n, 16))\
+        for(__i = FSIZE - 1; __i >= 0; __i--)\
+            if(BIT(FILTER, __i) ^ parity(__M & 0xFF01))\
+                break;\
+            else if(__i)\
+                __M = prng_successor(__M, (__i == 7) ? 48 : 8);\
+            else
 
 #define LF_POLY_ODD (0x29CE5C)
 #define LF_POLY_EVEN (0x870804)
@@ -63,31 +63,31 @@ int nonce_distance(uint32_t from, uint32_t to);
 static inline int parity(uint32_t x)
 {
 #if !defined __i386__ || !defined __GNUC__
-	x ^= x >> 16;
-	x ^= x >> 8;
-	x ^= x >> 4;
-	return BIT(0x6996, x & 0xf);
+    x ^= x >> 16;
+    x ^= x >> 8;
+    x ^= x >> 4;
+    return BIT(0x6996, x & 0xf);
 #else
-	__asm__(	"movl %1, %%eax\n"
-		"mov %%ax, %%cx\n"
-		"shrl $0x10, %%eax\n"
-		"xor %%ax, %%cx\n"
-                "xor %%ch, %%cl\n"
-                "setpo %%al\n"
-                "movzx %%al, %0\n": "=r"(x) : "r"(x): "eax","ecx");
-	return x;
+    __asm__( "movl %1, %%eax\n"
+             "mov %%ax, %%cx\n"
+             "shrl $0x10, %%eax\n"
+             "xor %%ax, %%cx\n"
+             "xor %%ch, %%cl\n"
+             "setpo %%al\n"
+             "movzx %%al, %0\n": "=r"(x) : "r"(x): "eax","ecx");
+    return x;
 #endif
 }
 static inline int filter(uint32_t const x)
 {
-	uint32_t f;
+    uint32_t f;
 
-	f  = 0xf22c0 >> (x       & 0xf) & 16;
-	f |= 0x6c9c0 >> (x >>  4 & 0xf) &  8;
-	f |= 0x3c8b0 >> (x >>  8 & 0xf) &  4;
-	f |= 0x1e458 >> (x >> 12 & 0xf) &  2;
-	f |= 0x0d938 >> (x >> 16 & 0xf) &  1;
-	return BIT(0xEC57E80A, f);
+    f  = 0xf22c0 >> (x       & 0xf) & 16;
+    f |= 0x6c9c0 >> (x >>  4 & 0xf) &  8;
+    f |= 0x3c8b0 >> (x >>  8 & 0xf) &  4;
+    f |= 0x1e458 >> (x >> 12 & 0xf) &  2;
+    f |= 0x0d938 >> (x >> 16 & 0xf) &  1;
+    return BIT(0xEC57E80A, f);
 }
 #ifdef __cplusplus
 }
diff --git a/tools/mfkey/crypto1.c b/tools/mfkey/crypto1.c
index 14e2cc829..e8384c16a 100755
--- a/tools/mfkey/crypto1.c
+++ b/tools/mfkey/crypto1.c
@@ -22,115 +22,115 @@
 
 struct Crypto1State * crypto1_create(uint64_t key)
 {
-	struct Crypto1State *s = malloc(sizeof(*s));
-	if ( !s ) return NULL;
+    struct Crypto1State *s = malloc(sizeof(*s));
+    if ( !s ) return NULL;
 
-	s->odd = s->even = 0;
+    s->odd = s->even = 0;
 
-	int i;
-	//for(i = 47;s && i > 0; i -= 2) {
-	for(i = 47; i > 0; i -= 2) {
-		s->odd  = s->odd  << 1 | BIT(key, (i - 1) ^ 7);
-		s->even = s->even << 1 | BIT(key, i ^ 7);
-	}
-	return s;
+    int i;
+    //for(i = 47;s && i > 0; i -= 2) {
+    for(i = 47; i > 0; i -= 2) {
+        s->odd  = s->odd  << 1 | BIT(key, (i - 1) ^ 7);
+        s->even = s->even << 1 | BIT(key, i ^ 7);
+    }
+    return s;
 }
 void crypto1_destroy(struct Crypto1State *state)
 {
-	free(state);
+    free(state);
 }
 void crypto1_get_lfsr(struct Crypto1State *state, uint64_t *lfsr)
 {
-	int i;
-	for(*lfsr = 0, i = 23; i >= 0; --i) {
-		*lfsr = *lfsr << 1 | BIT(state->odd, i ^ 3);
-		*lfsr = *lfsr << 1 | BIT(state->even, i ^ 3);
-	}
+    int i;
+    for(*lfsr = 0, i = 23; i >= 0; --i) {
+        *lfsr = *lfsr << 1 | BIT(state->odd, i ^ 3);
+        *lfsr = *lfsr << 1 | BIT(state->even, i ^ 3);
+    }
 }
 uint8_t crypto1_bit(struct Crypto1State *s, uint8_t in, int is_encrypted)
 {
-	uint32_t feedin;
-	uint32_t tmp;
-	uint8_t ret = filter(s->odd);
+    uint32_t feedin;
+    uint32_t tmp;
+    uint8_t ret = filter(s->odd);
 
-	feedin  = ret & !!is_encrypted;
-	feedin ^= !!in;
-	feedin ^= LF_POLY_ODD & s->odd;
-	feedin ^= LF_POLY_EVEN & s->even;
-	s->even = s->even << 1 | parity(feedin);
+    feedin  = ret & !!is_encrypted;
+    feedin ^= !!in;
+    feedin ^= LF_POLY_ODD & s->odd;
+    feedin ^= LF_POLY_EVEN & s->even;
+    s->even = s->even << 1 | parity(feedin);
 
-	tmp = s->odd;
-	s->odd = s->even;
-	s->even = tmp;
+    tmp = s->odd;
+    s->odd = s->even;
+    s->even = tmp;
 
-	return ret;
+    return ret;
 }
 uint8_t crypto1_byte(struct Crypto1State *s, uint8_t in, int is_encrypted)
 {
-	/*
-	uint8_t i, ret = 0;
+    /*
+    uint8_t i, ret = 0;
 
-	for (i = 0; i < 8; ++i)
-		ret |= crypto1_bit(s, BIT(in, i), is_encrypted) << i;
-	*/
+    for (i = 0; i < 8; ++i)
+        ret |= crypto1_bit(s, BIT(in, i), is_encrypted) << i;
+    */
 // unfold loop 20161012
-	uint8_t ret = 0;
-	ret |= crypto1_bit(s, BIT(in, 0), is_encrypted) << 0;
-	ret |= crypto1_bit(s, BIT(in, 1), is_encrypted) << 1;
-	ret |= crypto1_bit(s, BIT(in, 2), is_encrypted) << 2;
-	ret |= crypto1_bit(s, BIT(in, 3), is_encrypted) << 3;
-	ret |= crypto1_bit(s, BIT(in, 4), is_encrypted) << 4;
-	ret |= crypto1_bit(s, BIT(in, 5), is_encrypted) << 5;
-	ret |= crypto1_bit(s, BIT(in, 6), is_encrypted) << 6;
-	ret |= crypto1_bit(s, BIT(in, 7), is_encrypted) << 7;
-	return ret;
+    uint8_t ret = 0;
+    ret |= crypto1_bit(s, BIT(in, 0), is_encrypted) << 0;
+    ret |= crypto1_bit(s, BIT(in, 1), is_encrypted) << 1;
+    ret |= crypto1_bit(s, BIT(in, 2), is_encrypted) << 2;
+    ret |= crypto1_bit(s, BIT(in, 3), is_encrypted) << 3;
+    ret |= crypto1_bit(s, BIT(in, 4), is_encrypted) << 4;
+    ret |= crypto1_bit(s, BIT(in, 5), is_encrypted) << 5;
+    ret |= crypto1_bit(s, BIT(in, 6), is_encrypted) << 6;
+    ret |= crypto1_bit(s, BIT(in, 7), is_encrypted) << 7;
+    return ret;
 }
 uint32_t crypto1_word(struct Crypto1State *s, uint32_t in, int is_encrypted)
 {
-	/*
-	uint32_t i, ret = 0;
+    /*
+    uint32_t i, ret = 0;
 
-	for (i = 0; i < 32; ++i)
-		ret |= crypto1_bit(s, BEBIT(in, i), is_encrypted) << (i ^ 24);
+    for (i = 0; i < 32; ++i)
+        ret |= crypto1_bit(s, BEBIT(in, i), is_encrypted) << (i ^ 24);
 */
 //unfold loop 2016012
-	uint32_t ret = 0;
-	ret |= crypto1_bit(s, BEBIT(in, 0), is_encrypted) << (0 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 1), is_encrypted) << (1 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 2), is_encrypted) << (2 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 3), is_encrypted) << (3 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 4), is_encrypted) << (4 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 5), is_encrypted) << (5 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 6), is_encrypted) << (6 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 7), is_encrypted) << (7 ^ 24);
+    uint32_t ret = 0;
+    ret |= crypto1_bit(s, BEBIT(in, 0), is_encrypted) << (0 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 1), is_encrypted) << (1 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 2), is_encrypted) << (2 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 3), is_encrypted) << (3 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 4), is_encrypted) << (4 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 5), is_encrypted) << (5 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 6), is_encrypted) << (6 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 7), is_encrypted) << (7 ^ 24);
 
-	ret |= crypto1_bit(s, BEBIT(in, 8), is_encrypted) << (8 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 9), is_encrypted) << (9 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 10), is_encrypted) << (10 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 11), is_encrypted) << (11 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 12), is_encrypted) << (12 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 13), is_encrypted) << (13 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 14), is_encrypted) << (14 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 15), is_encrypted) << (15 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 8), is_encrypted) << (8 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 9), is_encrypted) << (9 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 10), is_encrypted) << (10 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 11), is_encrypted) << (11 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 12), is_encrypted) << (12 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 13), is_encrypted) << (13 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 14), is_encrypted) << (14 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 15), is_encrypted) << (15 ^ 24);
 
-	ret |= crypto1_bit(s, BEBIT(in, 16), is_encrypted) << (16 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 17), is_encrypted) << (17 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 18), is_encrypted) << (18 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 19), is_encrypted) << (19 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 20), is_encrypted) << (20 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 21), is_encrypted) << (21 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 22), is_encrypted) << (22 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 23), is_encrypted) << (23 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 16), is_encrypted) << (16 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 17), is_encrypted) << (17 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 18), is_encrypted) << (18 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 19), is_encrypted) << (19 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 20), is_encrypted) << (20 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 21), is_encrypted) << (21 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 22), is_encrypted) << (22 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 23), is_encrypted) << (23 ^ 24);
 
-	ret |= crypto1_bit(s, BEBIT(in, 24), is_encrypted) << (24 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 25), is_encrypted) << (25 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 26), is_encrypted) << (26 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 27), is_encrypted) << (27 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 28), is_encrypted) << (28 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 29), is_encrypted) << (29 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 30), is_encrypted) << (30 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 31), is_encrypted) << (31 ^ 24);
-	return ret;
+    ret |= crypto1_bit(s, BEBIT(in, 24), is_encrypted) << (24 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 25), is_encrypted) << (25 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 26), is_encrypted) << (26 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 27), is_encrypted) << (27 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 28), is_encrypted) << (28 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 29), is_encrypted) << (29 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 30), is_encrypted) << (30 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 31), is_encrypted) << (31 ^ 24);
+    return ret;
 }
 
 /* prng_successor
@@ -138,9 +138,9 @@ uint32_t crypto1_word(struct Crypto1State *s, uint32_t in, int is_encrypted)
  */
 uint32_t prng_successor(uint32_t x, uint32_t n)
 {
-	SWAPENDIAN(x);
-	while(n--)
-		x = x >> 1 | (x >> 16 ^ x >> 18 ^ x >> 19 ^ x >> 21) << 31;
+    SWAPENDIAN(x);
+    while(n--)
+        x = x >> 1 | (x >> 16 ^ x >> 18 ^ x >> 19 ^ x >> 21) << 31;
 
-	return SWAPENDIAN(x);
+    return SWAPENDIAN(x);
 }
diff --git a/tools/mfkey/mfkey32.c b/tools/mfkey/mfkey32.c
index 2761a063b..df4dc65cd 100755
--- a/tools/mfkey/mfkey32.c
+++ b/tools/mfkey/mfkey32.c
@@ -5,63 +5,63 @@
 #include <stdlib.h>
 
 int main (int argc, char *argv[]) {
-	struct Crypto1State *s,*t;
-	uint64_t key;     // recovered key
-	uint32_t uid;     // serial number
-	uint32_t nt;      // tag challenge
-	uint32_t nr0_enc; // first encrypted reader challenge
-	uint32_t ar0_enc; // first encrypted reader response
-	uint32_t nr1_enc; // second encrypted reader challenge
-	uint32_t ar1_enc; // second encrypted reader response
-	uint32_t ks2;     // keystream used to encrypt reader response
+    struct Crypto1State *s,*t;
+    uint64_t key;     // recovered key
+    uint32_t uid;     // serial number
+    uint32_t nt;      // tag challenge
+    uint32_t nr0_enc; // first encrypted reader challenge
+    uint32_t ar0_enc; // first encrypted reader response
+    uint32_t nr1_enc; // second encrypted reader challenge
+    uint32_t ar1_enc; // second encrypted reader response
+    uint32_t ks2;     // keystream used to encrypt reader response
 
-	printf("MIFARE Classic key recovery - based 32 bits of keystream\n");
-	printf("Recover key from two 32-bit reader authentication answers only!\n\n");
+    printf("MIFARE Classic key recovery - based 32 bits of keystream\n");
+    printf("Recover key from two 32-bit reader authentication answers only!\n\n");
 
-	if (argc < 7) {
-		printf(" syntax: %s <uid> <nt> <nr_0> <ar_0> <nr_1> <ar_1>\n\n",argv[0]);
-		return 1;
-	}
+    if (argc < 7) {
+        printf(" syntax: %s <uid> <nt> <nr_0> <ar_0> <nr_1> <ar_1>\n\n",argv[0]);
+        return 1;
+    }
 
-	sscanf(argv[1],"%x",&uid);
-	sscanf(argv[2],"%x",&nt);
-	sscanf(argv[3],"%x",&nr0_enc);
-	sscanf(argv[4],"%x",&ar0_enc);
-	sscanf(argv[5],"%x",&nr1_enc);
-	sscanf(argv[6],"%x",&ar1_enc);
+    sscanf(argv[1],"%x",&uid);
+    sscanf(argv[2],"%x",&nt);
+    sscanf(argv[3],"%x",&nr0_enc);
+    sscanf(argv[4],"%x",&ar0_enc);
+    sscanf(argv[5],"%x",&nr1_enc);
+    sscanf(argv[6],"%x",&ar1_enc);
 
-	printf("Recovering key for:\n");
-	printf("    uid: %08x\n",uid);
-	printf("     nt: %08x\n",nt);
-	printf(" {nr_0}: %08x\n",nr0_enc);
-	printf(" {ar_0}: %08x\n",ar0_enc);
-	printf(" {nr_1}: %08x\n",nr1_enc);
-	printf(" {ar_1}: %08x\n",ar1_enc);
+    printf("Recovering key for:\n");
+    printf("    uid: %08x\n",uid);
+    printf("     nt: %08x\n",nt);
+    printf(" {nr_0}: %08x\n",nr0_enc);
+    printf(" {ar_0}: %08x\n",ar0_enc);
+    printf(" {nr_1}: %08x\n",nr1_enc);
+    printf(" {ar_1}: %08x\n",ar1_enc);
 
-	// Generate lfsr succesors of the tag challenge
-	printf("\nLFSR succesors of the tag challenge:\n");
-	uint32_t p64 = prng_successor(nt, 64);
-	printf("  nt': %08x\n", p64);
-	printf(" nt'': %08x\n", prng_successor(p64, 32));
+    // Generate lfsr succesors of the tag challenge
+    printf("\nLFSR succesors of the tag challenge:\n");
+    uint32_t p64 = prng_successor(nt, 64);
+    printf("  nt': %08x\n", p64);
+    printf(" nt'': %08x\n", prng_successor(p64, 32));
 
-	// Extract the keystream from the messages
-	printf("\nKeystream used to generate {ar} and {at}:\n");
-	ks2 = ar0_enc ^ p64;
-	printf("  ks2: %08x\n", ks2);
+    // Extract the keystream from the messages
+    printf("\nKeystream used to generate {ar} and {at}:\n");
+    ks2 = ar0_enc ^ p64;
+    printf("  ks2: %08x\n", ks2);
 
-	s = lfsr_recovery32(ar0_enc ^ p64, 0);
+    s = lfsr_recovery32(ar0_enc ^ p64, 0);
 
-	for(t = s; t->odd | t->even; ++t) {
-		lfsr_rollback_word(t, 0, 0);
-		lfsr_rollback_word(t, nr0_enc, 1);
-		lfsr_rollback_word(t, uid ^ nt, 0);
-		crypto1_get_lfsr(t, &key);
-		crypto1_word(t, uid ^ nt, 0);
-		crypto1_word(t, nr1_enc, 1);
-		if (ar1_enc == (crypto1_word(t, 0, 0) ^ p64)) {
-			printf("\nFound Key: [%012" PRIx64 "]\n\n",key);
-			break;}
-	}
-	free(s);
-	return 0;
+    for(t = s; t->odd | t->even; ++t) {
+        lfsr_rollback_word(t, 0, 0);
+        lfsr_rollback_word(t, nr0_enc, 1);
+        lfsr_rollback_word(t, uid ^ nt, 0);
+        crypto1_get_lfsr(t, &key);
+        crypto1_word(t, uid ^ nt, 0);
+        crypto1_word(t, nr1_enc, 1);
+        if (ar1_enc == (crypto1_word(t, 0, 0) ^ p64)) {
+            printf("\nFound Key: [%012" PRIx64 "]\n\n",key);
+            break;}
+    }
+    free(s);
+    return 0;
 }
diff --git a/tools/mfkey/mfkey32v2.c b/tools/mfkey/mfkey32v2.c
index 03189aa73..d799dc8e6 100644
--- a/tools/mfkey/mfkey32v2.c
+++ b/tools/mfkey/mfkey32v2.c
@@ -5,70 +5,70 @@
 #include <stdlib.h>
 
 int main (int argc, char *argv[]) {
-	struct Crypto1State *s,*t;
-	uint64_t key;     // recovered key
-	uint32_t uid;     // serial number
-	uint32_t nt0;      // tag challenge first
-	uint32_t nt1;      // tag challenge second
-	uint32_t nr0_enc; // first encrypted reader challenge
-	uint32_t ar0_enc; // first encrypted reader response
-	uint32_t nr1_enc; // second encrypted reader challenge
-	uint32_t ar1_enc; // second encrypted reader response
-	uint32_t ks2;     // keystream used to encrypt reader response
+    struct Crypto1State *s,*t;
+    uint64_t key;     // recovered key
+    uint32_t uid;     // serial number
+    uint32_t nt0;      // tag challenge first
+    uint32_t nt1;      // tag challenge second
+    uint32_t nr0_enc; // first encrypted reader challenge
+    uint32_t ar0_enc; // first encrypted reader response
+    uint32_t nr1_enc; // second encrypted reader challenge
+    uint32_t ar1_enc; // second encrypted reader response
+    uint32_t ks2;     // keystream used to encrypt reader response
 
-	printf("MIFARE Classic key recovery - based 32 bits of keystream  VERSION2\n");
-	printf("Recover key from two 32-bit reader authentication answers only\n");
-	printf("This version implements Moebius two different nonce solution (like the supercard)\n\n");
+    printf("MIFARE Classic key recovery - based 32 bits of keystream  VERSION2\n");
+    printf("Recover key from two 32-bit reader authentication answers only\n");
+    printf("This version implements Moebius two different nonce solution (like the supercard)\n\n");
 
-	if (argc < 8) {
-		printf("syntax: %s <uid> <nt> <nr_0> <ar_0> <nt1> <nr_1> <ar_1>\n\n", argv[0]);
-		return 1;
-	}
+    if (argc < 8) {
+        printf("syntax: %s <uid> <nt> <nr_0> <ar_0> <nt1> <nr_1> <ar_1>\n\n", argv[0]);
+        return 1;
+    }
 
-	sscanf(argv[1],"%x",&uid);
-	sscanf(argv[2],"%x",&nt0);
-	sscanf(argv[3],"%x",&nr0_enc);
-	sscanf(argv[4],"%x",&ar0_enc);
-	sscanf(argv[5],"%x",&nt1);
-	sscanf(argv[6],"%x",&nr1_enc);
-	sscanf(argv[7],"%x",&ar1_enc);
+    sscanf(argv[1],"%x",&uid);
+    sscanf(argv[2],"%x",&nt0);
+    sscanf(argv[3],"%x",&nr0_enc);
+    sscanf(argv[4],"%x",&ar0_enc);
+    sscanf(argv[5],"%x",&nt1);
+    sscanf(argv[6],"%x",&nr1_enc);
+    sscanf(argv[7],"%x",&ar1_enc);
 
-	printf("Recovering key for:\n");
-	printf("    uid: %08x\n",uid);
-	printf("   nt_0: %08x\n",nt0);
-	printf(" {nr_0}: %08x\n",nr0_enc);
-	printf(" {ar_0}: %08x\n",ar0_enc);
-	printf("   nt_1: %08x\n",nt1);
-	printf(" {nr_1}: %08x\n",nr1_enc);
-	printf(" {ar_1}: %08x\n",ar1_enc);
+    printf("Recovering key for:\n");
+    printf("    uid: %08x\n",uid);
+    printf("   nt_0: %08x\n",nt0);
+    printf(" {nr_0}: %08x\n",nr0_enc);
+    printf(" {ar_0}: %08x\n",ar0_enc);
+    printf("   nt_1: %08x\n",nt1);
+    printf(" {nr_1}: %08x\n",nr1_enc);
+    printf(" {ar_1}: %08x\n",ar1_enc);
 
-	// Generate lfsr succesors of the tag challenge
-	printf("\nLFSR succesors of the tag challenge:\n");
-	uint32_t p64 = prng_successor(nt0, 64);
-	uint32_t p64b = prng_successor(nt1, 64);
+    // Generate lfsr succesors of the tag challenge
+    printf("\nLFSR succesors of the tag challenge:\n");
+    uint32_t p64 = prng_successor(nt0, 64);
+    uint32_t p64b = prng_successor(nt1, 64);
 
-	printf("  nt': %08x\n", p64);
-	printf(" nt'': %08x\n", prng_successor(p64, 32));
+    printf("  nt': %08x\n", p64);
+    printf(" nt'': %08x\n", prng_successor(p64, 32));
 
-	// Extract the keystream from the messages
-	printf("\nKeystream used to generate {ar} and {at}:\n");
-	ks2 = ar0_enc ^ p64;
-	printf("  ks2: %08x\n",ks2);
+    // Extract the keystream from the messages
+    printf("\nKeystream used to generate {ar} and {at}:\n");
+    ks2 = ar0_enc ^ p64;
+    printf("  ks2: %08x\n",ks2);
 
-	s = lfsr_recovery32(ar0_enc ^ p64, 0);
+    s = lfsr_recovery32(ar0_enc ^ p64, 0);
 
-	for(t = s; t->odd | t->even; ++t) {
-		lfsr_rollback_word(t, 0, 0);
-		lfsr_rollback_word(t, nr0_enc, 1);
-		lfsr_rollback_word(t, uid ^ nt0, 0);
-		crypto1_get_lfsr(t, &key);
+    for(t = s; t->odd | t->even; ++t) {
+        lfsr_rollback_word(t, 0, 0);
+        lfsr_rollback_word(t, nr0_enc, 1);
+        lfsr_rollback_word(t, uid ^ nt0, 0);
+        crypto1_get_lfsr(t, &key);
 
-		crypto1_word(t, uid ^ nt1, 0);
-		crypto1_word(t, nr1_enc, 1);
-		if (ar1_enc == (crypto1_word(t, 0, 0) ^ p64b)) {
-			printf("\nFound Key: [%012" PRIx64 "]\n\n",key);
-			break;}
-	}
-	free(s);
-	return 0;
+        crypto1_word(t, uid ^ nt1, 0);
+        crypto1_word(t, nr1_enc, 1);
+        if (ar1_enc == (crypto1_word(t, 0, 0) ^ p64b)) {
+            printf("\nFound Key: [%012" PRIx64 "]\n\n",key);
+            break;}
+    }
+    free(s);
+    return 0;
 }
diff --git a/tools/mfkey/mfkey64.c b/tools/mfkey/mfkey64.c
index a05cd223e..f7cf790eb 100755
--- a/tools/mfkey/mfkey64.c
+++ b/tools/mfkey/mfkey64.c
@@ -6,94 +6,94 @@
 #include "crapto1.h"
 
 int main (int argc, char *argv[]) {
-	struct Crypto1State *revstate;
-	uint64_t key;     // recovered key
-	uint32_t uid;     // serial number
-	uint32_t nt;      // tag challenge
-	uint32_t nr_enc;  // encrypted reader challenge
-	uint32_t ar_enc;  // encrypted reader response
-	uint32_t at_enc;  // encrypted tag response
-	uint32_t ks2;     // keystream used to encrypt reader response
-	uint32_t ks3;     // keystream used to encrypt tag response
+    struct Crypto1State *revstate;
+    uint64_t key;     // recovered key
+    uint32_t uid;     // serial number
+    uint32_t nt;      // tag challenge
+    uint32_t nr_enc;  // encrypted reader challenge
+    uint32_t ar_enc;  // encrypted reader response
+    uint32_t at_enc;  // encrypted tag response
+    uint32_t ks2;     // keystream used to encrypt reader response
+    uint32_t ks3;     // keystream used to encrypt tag response
 
-	printf("MIFARE Classic key recovery - based 64 bits of keystream\n");
-	printf("Recover key from only one complete authentication!\n\n");
+    printf("MIFARE Classic key recovery - based 64 bits of keystream\n");
+    printf("Recover key from only one complete authentication!\n\n");
 
-	if (argc < 6) {
-		printf(" syntax: %s <uid> <nt> <{nr}> <{ar}> <{at}> [enc...]\n\n", argv[0]);
-		return 1;
-	}
+    if (argc < 6) {
+        printf(" syntax: %s <uid> <nt> <{nr}> <{ar}> <{at}> [enc...]\n\n", argv[0]);
+        return 1;
+    }
 
-	int encc = argc - 6;
-	int enclen[encc];
-	uint8_t enc[encc][120];
+    int encc = argc - 6;
+    int enclen[encc];
+    uint8_t enc[encc][120];
 
-	sscanf(argv[1],"%x",&uid);
-	sscanf(argv[2],"%x",&nt);
-	sscanf(argv[3],"%x",&nr_enc);
-	sscanf(argv[4],"%x",&ar_enc);
-	sscanf(argv[5],"%x",&at_enc);
-	for (int i = 0; i < encc; i++) {
-		enclen[i] = strlen(argv[i + 6]) / 2;
-		for (int i2 = 0; i2 < enclen[i]; i2++) {
-			sscanf(argv[i+6] + i2*2, "%2x", (unsigned int *)&enc[i][i2]);
-		}
-	}
+    sscanf(argv[1],"%x",&uid);
+    sscanf(argv[2],"%x",&nt);
+    sscanf(argv[3],"%x",&nr_enc);
+    sscanf(argv[4],"%x",&ar_enc);
+    sscanf(argv[5],"%x",&at_enc);
+    for (int i = 0; i < encc; i++) {
+        enclen[i] = strlen(argv[i + 6]) / 2;
+        for (int i2 = 0; i2 < enclen[i]; i2++) {
+            sscanf(argv[i+6] + i2*2, "%2x", (unsigned int *)&enc[i][i2]);
+        }
+    }
 
-	printf("Recovering key for:\n");
+    printf("Recovering key for:\n");
 
-	printf("  uid: %08x\n",uid);
-	printf("   nt: %08x\n",nt);
-	printf(" {nr}: %08x\n",nr_enc);
-	printf(" {ar}: %08x\n",ar_enc);
-	printf(" {at}: %08x\n",at_enc);
+    printf("  uid: %08x\n",uid);
+    printf("   nt: %08x\n",nt);
+    printf(" {nr}: %08x\n",nr_enc);
+    printf(" {ar}: %08x\n",ar_enc);
+    printf(" {at}: %08x\n",at_enc);
 
-	for (int i = 0; i < encc; i++) {
-		printf("{enc%d}: ", i);
-		for (int i2 = 0; i2 < enclen[i]; i2++) {
-			printf("%02x", enc[i][i2]);
-		}
-		printf("\n");
-	}
+    for (int i = 0; i < encc; i++) {
+        printf("{enc%d}: ", i);
+        for (int i2 = 0; i2 < enclen[i]; i2++) {
+            printf("%02x", enc[i][i2]);
+        }
+        printf("\n");
+    }
 
-	// Generate lfsr succesors of the tag challenge
-	printf("\nLFSR succesors of the tag challenge:\n");
-	printf("  nt': %08x\n",prng_successor(nt, 64));
-	printf(" nt'': %08x\n",prng_successor(nt, 96));
+    // Generate lfsr succesors of the tag challenge
+    printf("\nLFSR succesors of the tag challenge:\n");
+    printf("  nt': %08x\n",prng_successor(nt, 64));
+    printf(" nt'': %08x\n",prng_successor(nt, 96));
 
-	// Extract the keystream from the messages
-	printf("\nKeystream used to generate {ar} and {at}:\n");
-	ks2 = ar_enc ^ prng_successor(nt, 64);
-	ks3 = at_enc ^ prng_successor(nt, 96);
-	printf("  ks2: %08x\n",ks2);
-	printf("  ks3: %08x\n",ks3);
+    // Extract the keystream from the messages
+    printf("\nKeystream used to generate {ar} and {at}:\n");
+    ks2 = ar_enc ^ prng_successor(nt, 64);
+    ks3 = at_enc ^ prng_successor(nt, 96);
+    printf("  ks2: %08x\n",ks2);
+    printf("  ks3: %08x\n",ks3);
 
-	revstate = lfsr_recovery64(ks2, ks3);
+    revstate = lfsr_recovery64(ks2, ks3);
 
-	// Decrypting communication using keystream if presented
-	if (argc > 6 ) {
-		printf("\nDecrypted communication:\n");
-		uint8_t ks4;
-		int rollb = 0;
-		for (int i = 0; i < encc; i++) {
-			printf("{dec%d}: ", i);
-			for (int i2 = 0; i2 < enclen[i]; i2++) {
-				ks4 = crypto1_byte(revstate, 0, 0);
-				printf("%02x", ks4 ^ enc[i][i2]);
-				rollb += 1;
-			}
-			printf("\n");
-		}
-		for (int i = 0; i < rollb; i++)
-			lfsr_rollback_byte(revstate, 0, 0);
-	}
+    // Decrypting communication using keystream if presented
+    if (argc > 6 ) {
+        printf("\nDecrypted communication:\n");
+        uint8_t ks4;
+        int rollb = 0;
+        for (int i = 0; i < encc; i++) {
+            printf("{dec%d}: ", i);
+            for (int i2 = 0; i2 < enclen[i]; i2++) {
+                ks4 = crypto1_byte(revstate, 0, 0);
+                printf("%02x", ks4 ^ enc[i][i2]);
+                rollb += 1;
+            }
+            printf("\n");
+        }
+        for (int i = 0; i < rollb; i++)
+            lfsr_rollback_byte(revstate, 0, 0);
+    }
 
-	lfsr_rollback_word(revstate, 0, 0);
-	lfsr_rollback_word(revstate, 0, 0);
-	lfsr_rollback_word(revstate, nr_enc, 1);
-	lfsr_rollback_word(revstate, uid ^ nt, 0);
-	crypto1_get_lfsr(revstate, &key);
-	printf("\nFound Key: [%012" PRIx64 "]\n\n", key);
-	crypto1_destroy(revstate);
-	return 0;
+    lfsr_rollback_word(revstate, 0, 0);
+    lfsr_rollback_word(revstate, 0, 0);
+    lfsr_rollback_word(revstate, nr_enc, 1);
+    lfsr_rollback_word(revstate, uid ^ nt, 0);
+    crypto1_get_lfsr(revstate, &key);
+    printf("\nFound Key: [%012" PRIx64 "]\n\n", key);
+    crypto1_destroy(revstate);
+    return 0;
 }
diff --git a/tools/nonce2key/crapto1.c b/tools/nonce2key/crapto1.c
index 5412ca8f6..c4701b7e9 100644
--- a/tools/nonce2key/crapto1.c
+++ b/tools/nonce2key/crapto1.c
@@ -34,65 +34,65 @@ static void __attribute__((constructor)) fill_lut()
 
 
 typedef struct bucket {
-	uint32_t *head;
-	uint32_t *bp;
+    uint32_t *head;
+    uint32_t *bp;
 } bucket_t;
 
 typedef bucket_t bucket_array_t[2][0x100];
 
 typedef struct bucket_info {
-	struct {
-		uint32_t *head, *tail;
-		} bucket_info[2][0x100];
-		uint32_t numbuckets;
-	} bucket_info_t;
+    struct {
+        uint32_t *head, *tail;
+        } bucket_info[2][0x100];
+        uint32_t numbuckets;
+    } bucket_info_t;
 
 
 static void bucket_sort_intersect(uint32_t* const estart, uint32_t* const estop,
-								  uint32_t* const ostart, uint32_t* const ostop,
-								  bucket_info_t *bucket_info, bucket_array_t bucket)
+                                  uint32_t* const ostart, uint32_t* const ostop,
+                                  bucket_info_t *bucket_info, bucket_array_t bucket)
 {
-	uint32_t *p1, *p2;
-	uint32_t *start[2];
-	uint32_t *stop[2];
+    uint32_t *p1, *p2;
+    uint32_t *start[2];
+    uint32_t *stop[2];
 
-	start[0] = estart;
-	stop[0] = estop;
-	start[1] = ostart;
-	stop[1] = ostop;
+    start[0] = estart;
+    stop[0] = estop;
+    start[1] = ostart;
+    stop[1] = ostop;
 
-	// init buckets to be empty
-	for (uint32_t i = 0; i < 2; i++) {
-		for (uint32_t j = 0x00; j <= 0xff; j++) {
-			bucket[i][j].bp = bucket[i][j].head;
-		}
-	}
+    // init buckets to be empty
+    for (uint32_t i = 0; i < 2; i++) {
+        for (uint32_t j = 0x00; j <= 0xff; j++) {
+            bucket[i][j].bp = bucket[i][j].head;
+        }
+    }
 
-	// sort the lists into the buckets based on the MSB (contribution bits)
-	for (uint32_t i = 0; i < 2; i++) {
-		for (p1 = start[i]; p1 <= stop[i]; p1++) {
-			uint32_t bucket_index = (*p1 & 0xff000000) >> 24;
-			*(bucket[i][bucket_index].bp++) = *p1;
-		}
-	}
+    // sort the lists into the buckets based on the MSB (contribution bits)
+    for (uint32_t i = 0; i < 2; i++) {
+        for (p1 = start[i]; p1 <= stop[i]; p1++) {
+            uint32_t bucket_index = (*p1 & 0xff000000) >> 24;
+            *(bucket[i][bucket_index].bp++) = *p1;
+        }
+    }
 
 
-	// write back intersecting buckets as sorted list.
-	// fill in bucket_info with head and tail of the bucket contents in the list and number of non-empty buckets.
-	uint32_t nonempty_bucket;
-	for (uint32_t i = 0; i < 2; i++) {
-		p1 = start[i];
-		nonempty_bucket = 0;
-		for (uint32_t j = 0x00; j <= 0xff; j++) {
-			if (bucket[0][j].bp != bucket[0][j].head && bucket[1][j].bp != bucket[1][j].head) { // non-empty intersecting buckets only
-				bucket_info->bucket_info[i][nonempty_bucket].head = p1;
-				for (p2 = bucket[i][j].head; p2 < bucket[i][j].bp; *p1++ = *p2++);
-				bucket_info->bucket_info[i][nonempty_bucket].tail = p1 - 1;
-				nonempty_bucket++;
-			}
-		}
-		bucket_info->numbuckets = nonempty_bucket;
-		}
+    // write back intersecting buckets as sorted list.
+    // fill in bucket_info with head and tail of the bucket contents in the list and number of non-empty buckets.
+    uint32_t nonempty_bucket;
+    for (uint32_t i = 0; i < 2; i++) {
+        p1 = start[i];
+        nonempty_bucket = 0;
+        for (uint32_t j = 0x00; j <= 0xff; j++) {
+            if (bucket[0][j].bp != bucket[0][j].head && bucket[1][j].bp != bucket[1][j].head) { // non-empty intersecting buckets only
+                bucket_info->bucket_info[i][nonempty_bucket].head = p1;
+                for (p2 = bucket[i][j].head; p2 < bucket[i][j].bp; *p1++ = *p2++);
+                bucket_info->bucket_info[i][nonempty_bucket].tail = p1 - 1;
+                nonempty_bucket++;
+            }
+        }
+        bucket_info->numbuckets = nonempty_bucket;
+        }
 }
 
 /** update_contribution
@@ -100,11 +100,11 @@ static void bucket_sort_intersect(uint32_t* const estart, uint32_t* const estop,
  */
 static inline void update_contribution(uint32_t *item, const uint32_t mask1, const uint32_t mask2)
 {
-	uint32_t p = *item >> 25;
+    uint32_t p = *item >> 25;
 
-	p = p << 1 | parity(*item & mask1);
-	p = p << 1 | parity(*item & mask2);
-	*item = p << 24 | (*item & 0xffffff);
+    p = p << 1 | parity(*item & mask1);
+    p = p << 1 | parity(*item & mask2);
+    *item = p << 24 | (*item & 0xffffff);
 }
 
 /** extend_table
@@ -112,83 +112,83 @@ static inline void update_contribution(uint32_t *item, const uint32_t mask1, con
  */
 static inline void extend_table(uint32_t *tbl, uint32_t **end, int bit, int m1, int m2, uint32_t in)
 {
-	in <<= 24;
-	for(*tbl <<= 1; tbl <= *end; *++tbl <<= 1)
-		if(filter(*tbl) ^ filter(*tbl | 1)) {
-			*tbl |= filter(*tbl) ^ bit;
-			update_contribution(tbl, m1, m2);
-			*tbl ^= in;
-		} else if(filter(*tbl) == bit) {
-			*++*end = tbl[1];
-			tbl[1] = tbl[0] | 1;
-			update_contribution(tbl, m1, m2);
-			*tbl++ ^= in;
-			update_contribution(tbl, m1, m2);
-			*tbl ^= in;
-		} else
-			*tbl-- = *(*end)--;
+    in <<= 24;
+    for(*tbl <<= 1; tbl <= *end; *++tbl <<= 1)
+        if(filter(*tbl) ^ filter(*tbl | 1)) {
+            *tbl |= filter(*tbl) ^ bit;
+            update_contribution(tbl, m1, m2);
+            *tbl ^= in;
+        } else if(filter(*tbl) == bit) {
+            *++*end = tbl[1];
+            tbl[1] = tbl[0] | 1;
+            update_contribution(tbl, m1, m2);
+            *tbl++ ^= in;
+            update_contribution(tbl, m1, m2);
+            *tbl ^= in;
+        } else
+            *tbl-- = *(*end)--;
 }
 /** extend_table_simple
  * using a bit of the keystream extend the table of possible lfsr states
  */
 static inline void extend_table_simple(uint32_t *tbl, uint32_t **end, int bit)
 {
-	for(*tbl <<= 1; tbl <= *end; *++tbl <<= 1) {
-		if(filter(*tbl) ^ filter(*tbl | 1)) {	// replace
-			*tbl |= filter(*tbl) ^ bit;
-		} else if(filter(*tbl) == bit) {		// insert
-			*++*end = *++tbl;
-			*tbl = tbl[-1] | 1;
-		} else	{								// drop
-			*tbl-- = *(*end)--;
-		}
-	}
+    for(*tbl <<= 1; tbl <= *end; *++tbl <<= 1) {
+        if(filter(*tbl) ^ filter(*tbl | 1)) {   // replace
+            *tbl |= filter(*tbl) ^ bit;
+        } else if(filter(*tbl) == bit) {        // insert
+            *++*end = *++tbl;
+            *tbl = tbl[-1] | 1;
+        } else {                                // drop
+            *tbl-- = *(*end)--;
+        }
+    }
 }
 /** recover
  * recursively narrow down the search space, 4 bits of keystream at a time
  */
 static struct Crypto1State*
 recover(uint32_t *o_head, uint32_t *o_tail, uint32_t oks,
-	uint32_t *e_head, uint32_t *e_tail, uint32_t eks, int rem,
-	struct Crypto1State *sl, uint32_t in, bucket_array_t bucket)
+    uint32_t *e_head, uint32_t *e_tail, uint32_t eks, int rem,
+    struct Crypto1State *sl, uint32_t in, bucket_array_t bucket)
 {
-	uint32_t *o, *e;
-	bucket_info_t bucket_info;
+    uint32_t *o, *e;
+    bucket_info_t bucket_info;
 
-	if(rem == -1) {
-		for(e = e_head; e <= e_tail; ++e) {
-			*e = *e << 1 ^ parity(*e & LF_POLY_EVEN) ^ !!(in & 4);
-			for(o = o_head; o <= o_tail; ++o, ++sl) {
-				sl->even = *o;
-				sl->odd = *e ^ parity(*o & LF_POLY_ODD);
-				sl[1].odd = sl[1].even = 0;
-			}
-		}
-		return sl;
-	}
+    if(rem == -1) {
+        for(e = e_head; e <= e_tail; ++e) {
+            *e = *e << 1 ^ parity(*e & LF_POLY_EVEN) ^ !!(in & 4);
+            for(o = o_head; o <= o_tail; ++o, ++sl) {
+                sl->even = *o;
+                sl->odd = *e ^ parity(*o & LF_POLY_ODD);
+                sl[1].odd = sl[1].even = 0;
+            }
+        }
+        return sl;
+    }
 
-	for(uint32_t i = 0; i < 4 && rem--; i++) {
-		oks >>= 1;
-		eks >>= 1;
-		in >>= 2;
-		extend_table(o_head, &o_tail, oks & 1, LF_POLY_EVEN << 1 | 1, LF_POLY_ODD << 1, 0);
-		if(o_head > o_tail)
-			return sl;
+    for(uint32_t i = 0; i < 4 && rem--; i++) {
+        oks >>= 1;
+        eks >>= 1;
+        in >>= 2;
+        extend_table(o_head, &o_tail, oks & 1, LF_POLY_EVEN << 1 | 1, LF_POLY_ODD << 1, 0);
+        if(o_head > o_tail)
+            return sl;
 
-		extend_table(e_head, &e_tail, eks & 1, LF_POLY_ODD, LF_POLY_EVEN << 1 | 1, in & 3);
-		if(e_head > e_tail)
-			return sl;
-	}
+        extend_table(e_head, &e_tail, eks & 1, LF_POLY_ODD, LF_POLY_EVEN << 1 | 1, in & 3);
+        if(e_head > e_tail)
+            return sl;
+    }
 
-	bucket_sort_intersect(e_head, e_tail, o_head, o_tail, &bucket_info, bucket);
+    bucket_sort_intersect(e_head, e_tail, o_head, o_tail, &bucket_info, bucket);
 
-	for (int i = bucket_info.numbuckets - 1; i >= 0; i--) {
-		sl = recover(bucket_info.bucket_info[1][i].head, bucket_info.bucket_info[1][i].tail, oks,
-					 bucket_info.bucket_info[0][i].head, bucket_info.bucket_info[0][i].tail, eks,
-					 rem, sl, in, bucket);
-		}
+    for (int i = bucket_info.numbuckets - 1; i >= 0; i--) {
+        sl = recover(bucket_info.bucket_info[1][i].head, bucket_info.bucket_info[1][i].tail, oks,
+                     bucket_info.bucket_info[0][i].head, bucket_info.bucket_info[0][i].tail, eks,
+                     rem, sl, in, bucket);
+        }
 
-	return sl;
+    return sl;
 }
 /** lfsr_recovery
  * recover the state of the lfsr given 32 bits of the keystream
@@ -197,87 +197,87 @@ recover(uint32_t *o_head, uint32_t *o_tail, uint32_t oks,
  */
 struct Crypto1State* lfsr_recovery32(uint32_t ks2, uint32_t in)
 {
-	struct Crypto1State *statelist;
-	uint32_t *odd_head = 0, *odd_tail = 0, oks = 0;
-	uint32_t *even_head = 0, *even_tail = 0, eks = 0;
-	int i;
+    struct Crypto1State *statelist;
+    uint32_t *odd_head = 0, *odd_tail = 0, oks = 0;
+    uint32_t *even_head = 0, *even_tail = 0, eks = 0;
+    int i;
 
-	// split the keystream into an odd and even part
-	for(i = 31; i >= 0; i -= 2)
-		oks = oks << 1 | BEBIT(ks2, i);
-	for(i = 30; i >= 0; i -= 2)
- 		eks = eks << 1 | BEBIT(ks2, i);
+    // split the keystream into an odd and even part
+    for(i = 31; i >= 0; i -= 2)
+        oks = oks << 1 | BEBIT(ks2, i);
+    for(i = 30; i >= 0; i -= 2)
+        eks = eks << 1 | BEBIT(ks2, i);
 
-	odd_head = odd_tail = malloc(sizeof(uint32_t) << 21);
-	even_head = even_tail = malloc(sizeof(uint32_t) << 21);
-	statelist =  malloc(sizeof(struct Crypto1State) << 18);
-	if(!odd_tail-- || !even_tail-- || !statelist) {
-		free(statelist);
-		statelist = 0;
-		goto out;
-	}
+    odd_head = odd_tail = malloc(sizeof(uint32_t) << 21);
+    even_head = even_tail = malloc(sizeof(uint32_t) << 21);
+    statelist =  malloc(sizeof(struct Crypto1State) << 18);
+    if(!odd_tail-- || !even_tail-- || !statelist) {
+        free(statelist);
+        statelist = 0;
+        goto out;
+    }
 
-	statelist->odd = statelist->even = 0;
+    statelist->odd = statelist->even = 0;
 
-	// allocate memory for out of place bucket_sort
-	bucket_array_t bucket;
+    // allocate memory for out of place bucket_sort
+    bucket_array_t bucket;
 
-	for (uint32_t i = 0; i < 2; i++) {
-		for (uint32_t j = 0; j <= 0xff; j++) {
-			bucket[i][j].head = malloc(sizeof(uint32_t)<<14);
-			if (!bucket[i][j].head) {
-				goto out;
-			}
-		}
-	}
+    for (uint32_t i = 0; i < 2; i++) {
+        for (uint32_t j = 0; j <= 0xff; j++) {
+            bucket[i][j].head = malloc(sizeof(uint32_t)<<14);
+            if (!bucket[i][j].head) {
+                goto out;
+            }
+        }
+    }
 
-	// initialize statelists: add all possible states which would result into the rightmost 2 bits of the keystream
-	for(i = 1 << 20; i >= 0; --i) {
-		if(filter(i) == (oks & 1))
-			*++odd_tail = i;
-		if(filter(i) == (eks & 1))
-			*++even_tail = i;
-	}
+    // initialize statelists: add all possible states which would result into the rightmost 2 bits of the keystream
+    for(i = 1 << 20; i >= 0; --i) {
+        if(filter(i) == (oks & 1))
+            *++odd_tail = i;
+        if(filter(i) == (eks & 1))
+            *++even_tail = i;
+    }
 
-	// extend the statelists. Look at the next 8 Bits of the keystream (4 Bit each odd and even):
-	for(i = 0; i < 4; i++) {
-		extend_table_simple(odd_head,  &odd_tail, (oks >>= 1) & 1);
-		extend_table_simple(even_head, &even_tail, (eks >>= 1) & 1);
-	}
+    // extend the statelists. Look at the next 8 Bits of the keystream (4 Bit each odd and even):
+    for(i = 0; i < 4; i++) {
+        extend_table_simple(odd_head,  &odd_tail, (oks >>= 1) & 1);
+        extend_table_simple(even_head, &even_tail, (eks >>= 1) & 1);
+    }
 
-	// the statelists now contain all states which could have generated the last 10 Bits of the keystream.
-	// 22 bits to go to recover 32 bits in total. From now on, we need to take the "in"
-	// parameter into account.
-	in = (in >> 16 & 0xff) | (in << 16) | (in & 0xff00);		// Byte swapping
-	recover(odd_head, odd_tail, oks, even_head, even_tail, eks, 11, statelist, in << 1, bucket);
+    // the statelists now contain all states which could have generated the last 10 Bits of the keystream.
+    // 22 bits to go to recover 32 bits in total. From now on, we need to take the "in"
+    // parameter into account.
+    in = (in >> 16 & 0xff) | (in << 16) | (in & 0xff00); // Byte swapping
+    recover(odd_head, odd_tail, oks, even_head, even_tail, eks, 11, statelist, in << 1, bucket);
 
 out:
-	for (uint32_t i = 0; i < 2; i++)
-		for (uint32_t j = 0; j <= 0xff; j++)
-			free(bucket[i][j].head);
-	free(odd_head);
-	free(even_head);
-	return statelist;
+    for (uint32_t i = 0; i < 2; i++)
+        for (uint32_t j = 0; j <= 0xff; j++)
+            free(bucket[i][j].head);
+    free(odd_head);
+    free(even_head);
+    return statelist;
 }
 
 static const uint32_t S1[] = {     0x62141, 0x310A0, 0x18850, 0x0C428, 0x06214,
-	0x0310A, 0x85E30, 0xC69AD, 0x634D6, 0xB5CDE, 0xDE8DA, 0x6F46D, 0xB3C83,
-	0x59E41, 0xA8995, 0xD027F, 0x6813F, 0x3409F, 0x9E6FA};
+    0x0310A, 0x85E30, 0xC69AD, 0x634D6, 0xB5CDE, 0xDE8DA, 0x6F46D, 0xB3C83,
+    0x59E41, 0xA8995, 0xD027F, 0x6813F, 0x3409F, 0x9E6FA};
 static const uint32_t S2[] = {  0x3A557B00, 0x5D2ABD80, 0x2E955EC0, 0x174AAF60,
-	0x0BA557B0, 0x05D2ABD8, 0x0449DE68, 0x048464B0, 0x42423258, 0x278192A8,
-	0x156042D0, 0x0AB02168, 0x43F89B30, 0x61FC4D98, 0x765EAD48, 0x7D8FDD20,
-	0x7EC7EE90, 0x7F63F748, 0x79117020};
+    0x0BA557B0, 0x05D2ABD8, 0x0449DE68, 0x048464B0, 0x42423258, 0x278192A8,
+    0x156042D0, 0x0AB02168, 0x43F89B30, 0x61FC4D98, 0x765EAD48, 0x7D8FDD20,
+    0x7EC7EE90, 0x7F63F748, 0x79117020};
 static const uint32_t T1[] = {
-	0x4F37D, 0x279BE, 0x97A6A, 0x4BD35, 0x25E9A, 0x12F4D, 0x097A6, 0x80D66,
-	0xC4006, 0x62003, 0xB56B4, 0x5AB5A, 0xA9318, 0xD0F39, 0x6879C, 0xB057B,
-	0x582BD, 0x2C15E, 0x160AF, 0x8F6E2, 0xC3DC4, 0xE5857, 0x72C2B, 0x39615,
-	0x98DBF, 0xC806A, 0xE0680, 0x70340, 0x381A0, 0x98665, 0x4C332, 0xA272C};
+    0x4F37D, 0x279BE, 0x97A6A, 0x4BD35, 0x25E9A, 0x12F4D, 0x097A6, 0x80D66,
+    0xC4006, 0x62003, 0xB56B4, 0x5AB5A, 0xA9318, 0xD0F39, 0x6879C, 0xB057B,
+    0x582BD, 0x2C15E, 0x160AF, 0x8F6E2, 0xC3DC4, 0xE5857, 0x72C2B, 0x39615,
+    0x98DBF, 0xC806A, 0xE0680, 0x70340, 0x381A0, 0x98665, 0x4C332, 0xA272C};
 static const uint32_t T2[] = {  0x3C88B810, 0x5E445C08, 0x2982A580, 0x14C152C0,
-	0x4A60A960, 0x253054B0, 0x52982A58, 0x2FEC9EA8, 0x1156C4D0, 0x08AB6268,
-	0x42F53AB0, 0x217A9D58, 0x161DC528, 0x0DAE6910, 0x46D73488, 0x25CB11C0,
-	0x52E588E0, 0x6972C470, 0x34B96238, 0x5CFC3A98, 0x28DE96C8, 0x12CFC0E0,
-	0x4967E070, 0x64B3F038, 0x74F97398, 0x7CDC3248, 0x38CE92A0, 0x1C674950,
-	0x0E33A4A8, 0x01B959D0, 0x40DCACE8, 0x26CEDDF0};
+    0x4A60A960, 0x253054B0, 0x52982A58, 0x2FEC9EA8, 0x1156C4D0, 0x08AB6268,
+    0x42F53AB0, 0x217A9D58, 0x161DC528, 0x0DAE6910, 0x46D73488, 0x25CB11C0,
+    0x52E588E0, 0x6972C470, 0x34B96238, 0x5CFC3A98, 0x28DE96C8, 0x12CFC0E0,
+    0x4967E070, 0x64B3F038, 0x74F97398, 0x7CDC3248, 0x38CE92A0, 0x1C674950,
+    0x0E33A4A8, 0x01B959D0, 0x40DCACE8, 0x26CEDDF0};
 static const uint32_t C1[] = { 0x846B5, 0x4235A, 0x211AD};
 static const uint32_t C2[] = { 0x1A822E0, 0x21A822E0, 0x21A822E0};
 /** Reverse 64 bits of keystream into possible cipher states
@@ -285,69 +285,69 @@ static const uint32_t C2[] = { 0x1A822E0, 0x21A822E0, 0x21A822E0};
  */
 struct Crypto1State* lfsr_recovery64(uint32_t ks2, uint32_t ks3)
 {
-	struct Crypto1State *statelist, *sl;
-	uint8_t oks[32], eks[32], hi[32];
-	uint32_t low = 0,  win = 0;
-	uint32_t *tail, table[1 << 16];
-	int i, j;
+    struct Crypto1State *statelist, *sl;
+    uint8_t oks[32], eks[32], hi[32];
+    uint32_t low = 0,  win = 0;
+    uint32_t *tail, table[1 << 16];
+    int i, j;
 
-	sl = statelist = malloc(sizeof(struct Crypto1State) << 4);
-	if(!sl)
-		return 0;
-	sl->odd = sl->even = 0;
+    sl = statelist = malloc(sizeof(struct Crypto1State) << 4);
+    if(!sl)
+        return 0;
+    sl->odd = sl->even = 0;
 
-	for(i = 30; i >= 0; i -= 2) {
-		oks[i >> 1] = BEBIT(ks2, i);
-		oks[16 + (i >> 1)] = BEBIT(ks3, i);
-	}
-	for(i = 31; i >= 0; i -= 2) {
-		eks[i >> 1] = BEBIT(ks2, i);
-		eks[16 + (i >> 1)] = BEBIT(ks3, i);
-	}
+    for(i = 30; i >= 0; i -= 2) {
+        oks[i >> 1] = BEBIT(ks2, i);
+        oks[16 + (i >> 1)] = BEBIT(ks3, i);
+    }
+    for(i = 31; i >= 0; i -= 2) {
+        eks[i >> 1] = BEBIT(ks2, i);
+        eks[16 + (i >> 1)] = BEBIT(ks3, i);
+    }
 
-	for(i = 0xfffff; i >= 0; --i) {
-		if (filter(i) != oks[0])
-			continue;
+    for(i = 0xfffff; i >= 0; --i) {
+        if (filter(i) != oks[0])
+            continue;
 
-		*(tail = table) = i;
-		for(j = 1; tail >= table && j < 29; ++j)
-			extend_table_simple(table, &tail, oks[j]);
+        *(tail = table) = i;
+        for(j = 1; tail >= table && j < 29; ++j)
+            extend_table_simple(table, &tail, oks[j]);
 
-		if(tail < table)
-			continue;
+        if(tail < table)
+            continue;
 
-		for(j = 0; j < 19; ++j)
-			low = low << 1 | parity(i & S1[j]);
-		for(j = 0; j < 32; ++j)
-			hi[j] = parity(i & T1[j]);
+        for(j = 0; j < 19; ++j)
+            low = low << 1 | parity(i & S1[j]);
+        for(j = 0; j < 32; ++j)
+            hi[j] = parity(i & T1[j]);
 
-		for(; tail >= table; --tail) {
-			for(j = 0; j < 3; ++j) {
-				*tail = *tail << 1;
-				*tail |= parity((i & C1[j]) ^ (*tail & C2[j]));
-				if(filter(*tail) != oks[29 + j])
-					goto continue2;
-			}
+        for(; tail >= table; --tail) {
+            for(j = 0; j < 3; ++j) {
+                *tail = *tail << 1;
+                *tail |= parity((i & C1[j]) ^ (*tail & C2[j]));
+                if(filter(*tail) != oks[29 + j])
+                    goto continue2;
+            }
 
-			for(j = 0; j < 19; ++j)
-				win = win << 1 | parity(*tail & S2[j]);
+            for(j = 0; j < 19; ++j)
+                win = win << 1 | parity(*tail & S2[j]);
 
-			win ^= low;
-			for(j = 0; j < 32; ++j) {
-				win = win << 1 ^ hi[j] ^ parity(*tail & T2[j]);
-				if(filter(win) != eks[j])
-					goto continue2;
-			}
+            win ^= low;
+            for(j = 0; j < 32; ++j) {
+                win = win << 1 ^ hi[j] ^ parity(*tail & T2[j]);
+                if(filter(win) != eks[j])
+                    goto continue2;
+            }
 
-			*tail = *tail << 1 | parity(LF_POLY_EVEN & *tail);
-			sl->odd = *tail ^ parity(LF_POLY_ODD & win);
-			sl->even = win;
-			++sl;
-			sl->odd = sl->even = 0;
-			continue2:;
-		}
-	}
-	return statelist;
+            *tail = *tail << 1 | parity(LF_POLY_EVEN & *tail);
+            sl->odd = *tail ^ parity(LF_POLY_ODD & win);
+            sl->even = win;
+            ++sl;
+            sl->odd = sl->even = 0;
+            continue2:;
+        }
+    }
+    return statelist;
 }
 
 /** lfsr_rollback_bit
@@ -355,93 +355,93 @@ struct Crypto1State* lfsr_recovery64(uint32_t ks2, uint32_t ks3)
  */
 uint8_t lfsr_rollback_bit(struct Crypto1State *s, uint32_t in, int fb)
 {
-	int out;
-	uint8_t ret;
-	uint32_t t;
+    int out;
+    uint8_t ret;
+    uint32_t t;
 
-	s->odd &= 0xffffff;
-	t = s->odd, s->odd = s->even, s->even = t;
+    s->odd &= 0xffffff;
+    t = s->odd, s->odd = s->even, s->even = t;
 
-	out = s->even & 1;
-	out ^= LF_POLY_EVEN & (s->even >>= 1);
-	out ^= LF_POLY_ODD & s->odd;
-	out ^= !!in;
-	out ^= (ret = filter(s->odd)) & !!fb;
+    out = s->even & 1;
+    out ^= LF_POLY_EVEN & (s->even >>= 1);
+    out ^= LF_POLY_ODD & s->odd;
+    out ^= !!in;
+    out ^= (ret = filter(s->odd)) & !!fb;
 
-	s->even |= parity(out) << 23;
-	return ret;
+    s->even |= parity(out) << 23;
+    return ret;
 }
 /** lfsr_rollback_byte
  * Rollback the shift register in order to get previous states
  */
 uint8_t lfsr_rollback_byte(struct Crypto1State *s, uint32_t in, int fb)
 {
-	/*
-	int i, ret = 0;
-	for (i = 7; i >= 0; --i)
-		ret |= lfsr_rollback_bit(s, BIT(in, i), fb) << i;
+    /*
+    int i, ret = 0;
+    for (i = 7; i >= 0; --i)
+        ret |= lfsr_rollback_bit(s, BIT(in, i), fb) << i;
 */
 // unfold loop 20160112
-	uint8_t ret = 0;
-	ret |= lfsr_rollback_bit(s, BIT(in, 7), fb) << 7;
-	ret |= lfsr_rollback_bit(s, BIT(in, 6), fb) << 6;
-	ret |= lfsr_rollback_bit(s, BIT(in, 5), fb) << 5;
-	ret |= lfsr_rollback_bit(s, BIT(in, 4), fb) << 4;
-	ret |= lfsr_rollback_bit(s, BIT(in, 3), fb) << 3;
-	ret |= lfsr_rollback_bit(s, BIT(in, 2), fb) << 2;
-	ret |= lfsr_rollback_bit(s, BIT(in, 1), fb) << 1;
-	ret |= lfsr_rollback_bit(s, BIT(in, 0), fb) << 0;
-	return ret;
+    uint8_t ret = 0;
+    ret |= lfsr_rollback_bit(s, BIT(in, 7), fb) << 7;
+    ret |= lfsr_rollback_bit(s, BIT(in, 6), fb) << 6;
+    ret |= lfsr_rollback_bit(s, BIT(in, 5), fb) << 5;
+    ret |= lfsr_rollback_bit(s, BIT(in, 4), fb) << 4;
+    ret |= lfsr_rollback_bit(s, BIT(in, 3), fb) << 3;
+    ret |= lfsr_rollback_bit(s, BIT(in, 2), fb) << 2;
+    ret |= lfsr_rollback_bit(s, BIT(in, 1), fb) << 1;
+    ret |= lfsr_rollback_bit(s, BIT(in, 0), fb) << 0;
+    return ret;
 }
 /** lfsr_rollback_word
  * Rollback the shift register in order to get previous states
  */
 uint32_t lfsr_rollback_word(struct Crypto1State *s, uint32_t in, int fb)
 {
-	/*
-	int i;
-	uint32_t ret = 0;
-	for (i = 31; i >= 0; --i)
-		ret |= lfsr_rollback_bit(s, BEBIT(in, i), fb) << (i ^ 24);
+    /*
+    int i;
+    uint32_t ret = 0;
+    for (i = 31; i >= 0; --i)
+        ret |= lfsr_rollback_bit(s, BEBIT(in, i), fb) << (i ^ 24);
 */
 // unfold loop 20160112
-	uint32_t ret = 0;
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 31), fb) << (31 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 30), fb) << (30 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 29), fb) << (29 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 28), fb) << (28 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 27), fb) << (27 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 26), fb) << (26 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 25), fb) << (25 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 24), fb) << (24 ^ 24);
+    uint32_t ret = 0;
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 31), fb) << (31 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 30), fb) << (30 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 29), fb) << (29 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 28), fb) << (28 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 27), fb) << (27 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 26), fb) << (26 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 25), fb) << (25 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 24), fb) << (24 ^ 24);
 
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 23), fb) << (23 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 22), fb) << (22 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 21), fb) << (21 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 20), fb) << (20 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 19), fb) << (19 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 18), fb) << (18 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 17), fb) << (17 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 16), fb) << (16 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 23), fb) << (23 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 22), fb) << (22 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 21), fb) << (21 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 20), fb) << (20 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 19), fb) << (19 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 18), fb) << (18 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 17), fb) << (17 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 16), fb) << (16 ^ 24);
 
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 15), fb) << (15 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 14), fb) << (14 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 13), fb) << (13 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 12), fb) << (12 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 11), fb) << (11 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 10), fb) << (10 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 9), fb) << (9 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 8), fb) << (8 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 15), fb) << (15 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 14), fb) << (14 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 13), fb) << (13 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 12), fb) << (12 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 11), fb) << (11 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 10), fb) << (10 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 9), fb) << (9 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 8), fb) << (8 ^ 24);
 
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 7), fb) << (7 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 6), fb) << (6 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 5), fb) << (5 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 4), fb) << (4 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 3), fb) << (3 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 2), fb) << (2 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 1), fb) << (1 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 0), fb) << (0 ^ 24);
-	return ret;
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 7), fb) << (7 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 6), fb) << (6 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 5), fb) << (5 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 4), fb) << (4 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 3), fb) << (3 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 2), fb) << (2 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 1), fb) << (1 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 0), fb) << (0 ^ 24);
+    return ret;
 }
 
 /** nonce_distance
@@ -450,23 +450,23 @@ uint32_t lfsr_rollback_word(struct Crypto1State *s, uint32_t in, int fb)
 static uint16_t *dist = 0;
 int nonce_distance(uint32_t from, uint32_t to)
 {
-	uint16_t x, i;
-	if(!dist) {
-		dist = malloc(2 << 16);
-		if(!dist)
-			return -1;
-		for (x = i = 1; i; ++i) {
-			dist[(x & 0xff) << 8 | x >> 8] = i;
-			x = x >> 1 | (x ^ x >> 2 ^ x >> 3 ^ x >> 5) << 15;
-		}
-	}
-	return (65535 + dist[to >> 16] - dist[from >> 16]) % 65535;
+    uint16_t x, i;
+    if(!dist) {
+        dist = malloc(2 << 16);
+        if(!dist)
+            return -1;
+        for (x = i = 1; i; ++i) {
+            dist[(x & 0xff) << 8 | x >> 8] = i;
+            x = x >> 1 | (x ^ x >> 2 ^ x >> 3 ^ x >> 5) << 15;
+        }
+    }
+    return (65535 + dist[to >> 16] - dist[from >> 16]) % 65535;
 }
 
 
 static uint32_t fastfwd[2][8] = {
-	{ 0, 0x4BC53, 0xECB1, 0x450E2, 0x25E29, 0x6E27A, 0x2B298, 0x60ECB},
-	{ 0, 0x1D962, 0x4BC53, 0x56531, 0xECB1, 0x135D3, 0x450E2, 0x58980}};
+    { 0, 0x4BC53, 0xECB1, 0x450E2, 0x25E29, 0x6E27A, 0x2B298, 0x60ECB},
+    { 0, 0x1D962, 0x4BC53, 0x56531, 0xECB1, 0x135D3, 0x450E2, 0x58980}};
 
 
 /** lfsr_prefix_ks
@@ -480,25 +480,25 @@ static uint32_t fastfwd[2][8] = {
  */
 uint32_t *lfsr_prefix_ks(uint8_t ks[8], int isodd)
 {
-	uint32_t *candidates = malloc(4 << 10);
-	if(!candidates) return 0;
+    uint32_t *candidates = malloc(4 << 10);
+    if(!candidates) return 0;
 
-	uint32_t c,  entry;
-	int size = 0, i, good;
+    uint32_t c,  entry;
+    int size = 0, i, good;
 
-	for(i = 0; i < 1 << 21; ++i) {
-		for(c = 0, good = 1; good && c < 8; ++c) {
-			entry = i ^ fastfwd[isodd][c];
-			good &= (BIT(ks[c], isodd) == filter(entry >> 1));
-			good &= (BIT(ks[c], isodd + 2) == filter(entry));
-		}
-		if(good)
-			candidates[size++] = i;
-	}
+    for(i = 0; i < 1 << 21; ++i) {
+        for(c = 0, good = 1; good && c < 8; ++c) {
+            entry = i ^ fastfwd[isodd][c];
+            good &= (BIT(ks[c], isodd) == filter(entry >> 1));
+            good &= (BIT(ks[c], isodd + 2) == filter(entry));
+        }
+        if(good)
+            candidates[size++] = i;
+    }
 
-	candidates[size] = -1;
+    candidates[size] = -1;
 
-	return candidates;
+    return candidates;
 }
 
 /** check_pfx_parity
@@ -506,30 +506,30 @@ uint32_t *lfsr_prefix_ks(uint8_t ks[8], int isodd)
  */
 static struct Crypto1State* check_pfx_parity(uint32_t prefix, uint32_t rresp, uint8_t parities[8][8], uint32_t odd, uint32_t even, struct Crypto1State* sl)
 {
-	uint32_t ks1, nr, ks2, rr, ks3, c, good = 1;
+    uint32_t ks1, nr, ks2, rr, ks3, c, good = 1;
 
-	for(c = 0; good && c < 8; ++c) {
-		sl->odd = odd ^ fastfwd[1][c];
-		sl->even = even ^ fastfwd[0][c];
+    for(c = 0; good && c < 8; ++c) {
+        sl->odd = odd ^ fastfwd[1][c];
+        sl->even = even ^ fastfwd[0][c];
 
-		lfsr_rollback_bit(sl, 0, 0);
-		lfsr_rollback_bit(sl, 0, 0);
+        lfsr_rollback_bit(sl, 0, 0);
+        lfsr_rollback_bit(sl, 0, 0);
 
-		ks3 = lfsr_rollback_bit(sl, 0, 0);
-		ks2 = lfsr_rollback_word(sl, 0, 0);
-		ks1 = lfsr_rollback_word(sl, prefix | c << 5, 1);
+        ks3 = lfsr_rollback_bit(sl, 0, 0);
+        ks2 = lfsr_rollback_word(sl, 0, 0);
+        ks1 = lfsr_rollback_word(sl, prefix | c << 5, 1);
 
-		nr = ks1 ^ (prefix | c << 5);
-		rr = ks2 ^ rresp;
+        nr = ks1 ^ (prefix | c << 5);
+        rr = ks2 ^ rresp;
 
-		good &= parity(nr & 0x000000ff) ^ parities[c][3] ^ BIT(ks2, 24);
-		good &= parity(rr & 0xff000000) ^ parities[c][4] ^ BIT(ks2, 16);
-		good &= parity(rr & 0x00ff0000) ^ parities[c][5] ^ BIT(ks2,  8);
-		good &= parity(rr & 0x0000ff00) ^ parities[c][6] ^ BIT(ks2,  0);
-		good &= parity(rr & 0x000000ff) ^ parities[c][7] ^ ks3;
-	}
+        good &= parity(nr & 0x000000ff) ^ parities[c][3] ^ BIT(ks2, 24);
+        good &= parity(rr & 0xff000000) ^ parities[c][4] ^ BIT(ks2, 16);
+        good &= parity(rr & 0x00ff0000) ^ parities[c][5] ^ BIT(ks2,  8);
+        good &= parity(rr & 0x0000ff00) ^ parities[c][6] ^ BIT(ks2,  0);
+        good &= parity(rr & 0x000000ff) ^ parities[c][7] ^ ks3;
+    }
 
-	return sl + good;
+    return sl + good;
 }
 
 /** lfsr_common_prefix
@@ -544,30 +544,30 @@ static struct Crypto1State* check_pfx_parity(uint32_t prefix, uint32_t rresp, ui
 
 struct Crypto1State* lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8])
 {
-	struct Crypto1State *statelist, *s;
-	uint32_t *odd, *even, *o, *e, top;
+    struct Crypto1State *statelist, *s;
+    uint32_t *odd, *even, *o, *e, top;
 
-	odd = lfsr_prefix_ks(ks, 1);
-	even = lfsr_prefix_ks(ks, 0);
+    odd = lfsr_prefix_ks(ks, 1);
+    even = lfsr_prefix_ks(ks, 0);
 
-	s = statelist = malloc((sizeof *statelist) << 20);
-	if(!s || !odd || !even) {
-		free(statelist);
-		statelist = 0;
+    s = statelist = malloc((sizeof *statelist) << 20);
+    if(!s || !odd || !even) {
+        free(statelist);
+        statelist = 0;
                 goto out;
-	}
+    }
 
-	for(o = odd; *o + 1; ++o)
-		for(e = even; *e + 1; ++e)
-			for(top = 0; top < 64; ++top) {
-				*o += 1 << 21;
-				*e += (!(top & 7) + 1) << 21;
-				s = check_pfx_parity(pfx, rr, par, *o, *e, s);
-			}
+    for(o = odd; *o + 1; ++o)
+        for(e = even; *e + 1; ++e)
+            for(top = 0; top < 64; ++top) {
+                *o += 1 << 21;
+                *e += (!(top & 7) + 1) << 21;
+                s = check_pfx_parity(pfx, rr, par, *o, *e, s);
+            }
 
-	s->odd = s->even = 0;
+    s->odd = s->even = 0;
 out:
-	free(odd);
-	free(even);
-	return statelist;
+    free(odd);
+    free(even);
+    return statelist;
 }
diff --git a/tools/nonce2key/crapto1.h b/tools/nonce2key/crapto1.h
index 2fd6600ec..4117dd6a1 100644
--- a/tools/nonce2key/crapto1.h
+++ b/tools/nonce2key/crapto1.h
@@ -43,18 +43,18 @@ uint8_t lfsr_rollback_byte(struct Crypto1State* s, uint32_t in, int fb);
 uint32_t lfsr_rollback_word(struct Crypto1State* s, uint32_t in, int fb);
 int nonce_distance(uint32_t from, uint32_t to);
 #define SWAPENDIAN(x)\
-	(x = (x >> 8 & 0xff00ff) | (x & 0xff00ff) << 8, x = x >> 16 | x << 16)
+    (x = (x >> 8 & 0xff00ff) | (x & 0xff00ff) << 8, x = x >> 16 | x << 16)
 
 #define FOREACH_VALID_NONCE(N, FILTER, FSIZE)\
-	uint32_t __n = 0,__M = 0, N = 0;\
-	int __i;\
-	for(; __n < 1 << 16; N = prng_successor(__M = ++__n, 16))\
-		for(__i = FSIZE - 1; __i >= 0; __i--)\
-			if(BIT(FILTER, __i) ^ parity(__M & 0xFF01))\
-				break;\
-			else if(__i)\
-				__M = prng_successor(__M, (__i == 7) ? 48 : 8);\
-			else
+    uint32_t __n = 0,__M = 0, N = 0;\
+    int __i;\
+    for(; __n < 1 << 16; N = prng_successor(__M = ++__n, 16))\
+        for(__i = FSIZE - 1; __i >= 0; __i--)\
+            if(BIT(FILTER, __i) ^ parity(__M & 0xFF01))\
+                break;\
+            else if(__i)\
+                __M = prng_successor(__M, (__i == 7) ? 48 : 8);\
+            else
 
 #define LF_POLY_ODD (0x29CE5C)
 #define LF_POLY_EVEN (0x870804)
@@ -63,31 +63,31 @@ int nonce_distance(uint32_t from, uint32_t to);
 static inline int parity(uint32_t x)
 {
 #if !defined __i386__ || !defined __GNUC__
-	x ^= x >> 16;
-	x ^= x >> 8;
-	x ^= x >> 4;
-	return BIT(0x6996, x & 0xf);
+    x ^= x >> 16;
+    x ^= x >> 8;
+    x ^= x >> 4;
+    return BIT(0x6996, x & 0xf);
 #else
         __asm__(    "movl %1, %%eax\n"
-		"mov %%ax, %%cx\n"
-		"shrl $0x10, %%eax\n"
-		"xor %%ax, %%cx\n"
+        "mov %%ax, %%cx\n"
+        "shrl $0x10, %%eax\n"
+        "xor %%ax, %%cx\n"
                 "xor %%ch, %%cl\n"
                 "setpo %%al\n"
                 "movzx %%al, %0\n": "=r"(x) : "r"(x): "eax","ecx");
-	return x;
+    return x;
 #endif
 }
 static inline int filter(uint32_t const x)
 {
-	uint32_t f;
+    uint32_t f;
 
-	f  = 0xf22c0 >> (x       & 0xf) & 16;
-	f |= 0x6c9c0 >> (x >>  4 & 0xf) &  8;
-	f |= 0x3c8b0 >> (x >>  8 & 0xf) &  4;
-	f |= 0x1e458 >> (x >> 12 & 0xf) &  2;
-	f |= 0x0d938 >> (x >> 16 & 0xf) &  1;
-	return BIT(0xEC57E80A, f);
+    f  = 0xf22c0 >> (x       & 0xf) & 16;
+    f |= 0x6c9c0 >> (x >>  4 & 0xf) &  8;
+    f |= 0x3c8b0 >> (x >>  8 & 0xf) &  4;
+    f |= 0x1e458 >> (x >> 12 & 0xf) &  2;
+    f |= 0x0d938 >> (x >> 16 & 0xf) &  1;
+    return BIT(0xEC57E80A, f);
 }
 #ifdef __cplusplus
 }
diff --git a/tools/nonce2key/crypto1.c b/tools/nonce2key/crypto1.c
index 14e2cc829..e8384c16a 100644
--- a/tools/nonce2key/crypto1.c
+++ b/tools/nonce2key/crypto1.c
@@ -22,115 +22,115 @@
 
 struct Crypto1State * crypto1_create(uint64_t key)
 {
-	struct Crypto1State *s = malloc(sizeof(*s));
-	if ( !s ) return NULL;
+    struct Crypto1State *s = malloc(sizeof(*s));
+    if ( !s ) return NULL;
 
-	s->odd = s->even = 0;
+    s->odd = s->even = 0;
 
-	int i;
-	//for(i = 47;s && i > 0; i -= 2) {
-	for(i = 47; i > 0; i -= 2) {
-		s->odd  = s->odd  << 1 | BIT(key, (i - 1) ^ 7);
-		s->even = s->even << 1 | BIT(key, i ^ 7);
-	}
-	return s;
+    int i;
+    //for(i = 47;s && i > 0; i -= 2) {
+    for(i = 47; i > 0; i -= 2) {
+        s->odd  = s->odd  << 1 | BIT(key, (i - 1) ^ 7);
+        s->even = s->even << 1 | BIT(key, i ^ 7);
+    }
+    return s;
 }
 void crypto1_destroy(struct Crypto1State *state)
 {
-	free(state);
+    free(state);
 }
 void crypto1_get_lfsr(struct Crypto1State *state, uint64_t *lfsr)
 {
-	int i;
-	for(*lfsr = 0, i = 23; i >= 0; --i) {
-		*lfsr = *lfsr << 1 | BIT(state->odd, i ^ 3);
-		*lfsr = *lfsr << 1 | BIT(state->even, i ^ 3);
-	}
+    int i;
+    for(*lfsr = 0, i = 23; i >= 0; --i) {
+        *lfsr = *lfsr << 1 | BIT(state->odd, i ^ 3);
+        *lfsr = *lfsr << 1 | BIT(state->even, i ^ 3);
+    }
 }
 uint8_t crypto1_bit(struct Crypto1State *s, uint8_t in, int is_encrypted)
 {
-	uint32_t feedin;
-	uint32_t tmp;
-	uint8_t ret = filter(s->odd);
+    uint32_t feedin;
+    uint32_t tmp;
+    uint8_t ret = filter(s->odd);
 
-	feedin  = ret & !!is_encrypted;
-	feedin ^= !!in;
-	feedin ^= LF_POLY_ODD & s->odd;
-	feedin ^= LF_POLY_EVEN & s->even;
-	s->even = s->even << 1 | parity(feedin);
+    feedin  = ret & !!is_encrypted;
+    feedin ^= !!in;
+    feedin ^= LF_POLY_ODD & s->odd;
+    feedin ^= LF_POLY_EVEN & s->even;
+    s->even = s->even << 1 | parity(feedin);
 
-	tmp = s->odd;
-	s->odd = s->even;
-	s->even = tmp;
+    tmp = s->odd;
+    s->odd = s->even;
+    s->even = tmp;
 
-	return ret;
+    return ret;
 }
 uint8_t crypto1_byte(struct Crypto1State *s, uint8_t in, int is_encrypted)
 {
-	/*
-	uint8_t i, ret = 0;
+    /*
+    uint8_t i, ret = 0;
 
-	for (i = 0; i < 8; ++i)
-		ret |= crypto1_bit(s, BIT(in, i), is_encrypted) << i;
-	*/
+    for (i = 0; i < 8; ++i)
+        ret |= crypto1_bit(s, BIT(in, i), is_encrypted) << i;
+    */
 // unfold loop 20161012
-	uint8_t ret = 0;
-	ret |= crypto1_bit(s, BIT(in, 0), is_encrypted) << 0;
-	ret |= crypto1_bit(s, BIT(in, 1), is_encrypted) << 1;
-	ret |= crypto1_bit(s, BIT(in, 2), is_encrypted) << 2;
-	ret |= crypto1_bit(s, BIT(in, 3), is_encrypted) << 3;
-	ret |= crypto1_bit(s, BIT(in, 4), is_encrypted) << 4;
-	ret |= crypto1_bit(s, BIT(in, 5), is_encrypted) << 5;
-	ret |= crypto1_bit(s, BIT(in, 6), is_encrypted) << 6;
-	ret |= crypto1_bit(s, BIT(in, 7), is_encrypted) << 7;
-	return ret;
+    uint8_t ret = 0;
+    ret |= crypto1_bit(s, BIT(in, 0), is_encrypted) << 0;
+    ret |= crypto1_bit(s, BIT(in, 1), is_encrypted) << 1;
+    ret |= crypto1_bit(s, BIT(in, 2), is_encrypted) << 2;
+    ret |= crypto1_bit(s, BIT(in, 3), is_encrypted) << 3;
+    ret |= crypto1_bit(s, BIT(in, 4), is_encrypted) << 4;
+    ret |= crypto1_bit(s, BIT(in, 5), is_encrypted) << 5;
+    ret |= crypto1_bit(s, BIT(in, 6), is_encrypted) << 6;
+    ret |= crypto1_bit(s, BIT(in, 7), is_encrypted) << 7;
+    return ret;
 }
 uint32_t crypto1_word(struct Crypto1State *s, uint32_t in, int is_encrypted)
 {
-	/*
-	uint32_t i, ret = 0;
+    /*
+    uint32_t i, ret = 0;
 
-	for (i = 0; i < 32; ++i)
-		ret |= crypto1_bit(s, BEBIT(in, i), is_encrypted) << (i ^ 24);
+    for (i = 0; i < 32; ++i)
+        ret |= crypto1_bit(s, BEBIT(in, i), is_encrypted) << (i ^ 24);
 */
 //unfold loop 2016012
-	uint32_t ret = 0;
-	ret |= crypto1_bit(s, BEBIT(in, 0), is_encrypted) << (0 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 1), is_encrypted) << (1 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 2), is_encrypted) << (2 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 3), is_encrypted) << (3 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 4), is_encrypted) << (4 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 5), is_encrypted) << (5 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 6), is_encrypted) << (6 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 7), is_encrypted) << (7 ^ 24);
+    uint32_t ret = 0;
+    ret |= crypto1_bit(s, BEBIT(in, 0), is_encrypted) << (0 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 1), is_encrypted) << (1 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 2), is_encrypted) << (2 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 3), is_encrypted) << (3 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 4), is_encrypted) << (4 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 5), is_encrypted) << (5 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 6), is_encrypted) << (6 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 7), is_encrypted) << (7 ^ 24);
 
-	ret |= crypto1_bit(s, BEBIT(in, 8), is_encrypted) << (8 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 9), is_encrypted) << (9 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 10), is_encrypted) << (10 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 11), is_encrypted) << (11 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 12), is_encrypted) << (12 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 13), is_encrypted) << (13 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 14), is_encrypted) << (14 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 15), is_encrypted) << (15 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 8), is_encrypted) << (8 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 9), is_encrypted) << (9 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 10), is_encrypted) << (10 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 11), is_encrypted) << (11 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 12), is_encrypted) << (12 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 13), is_encrypted) << (13 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 14), is_encrypted) << (14 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 15), is_encrypted) << (15 ^ 24);
 
-	ret |= crypto1_bit(s, BEBIT(in, 16), is_encrypted) << (16 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 17), is_encrypted) << (17 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 18), is_encrypted) << (18 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 19), is_encrypted) << (19 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 20), is_encrypted) << (20 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 21), is_encrypted) << (21 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 22), is_encrypted) << (22 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 23), is_encrypted) << (23 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 16), is_encrypted) << (16 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 17), is_encrypted) << (17 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 18), is_encrypted) << (18 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 19), is_encrypted) << (19 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 20), is_encrypted) << (20 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 21), is_encrypted) << (21 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 22), is_encrypted) << (22 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 23), is_encrypted) << (23 ^ 24);
 
-	ret |= crypto1_bit(s, BEBIT(in, 24), is_encrypted) << (24 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 25), is_encrypted) << (25 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 26), is_encrypted) << (26 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 27), is_encrypted) << (27 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 28), is_encrypted) << (28 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 29), is_encrypted) << (29 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 30), is_encrypted) << (30 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 31), is_encrypted) << (31 ^ 24);
-	return ret;
+    ret |= crypto1_bit(s, BEBIT(in, 24), is_encrypted) << (24 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 25), is_encrypted) << (25 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 26), is_encrypted) << (26 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 27), is_encrypted) << (27 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 28), is_encrypted) << (28 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 29), is_encrypted) << (29 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 30), is_encrypted) << (30 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 31), is_encrypted) << (31 ^ 24);
+    return ret;
 }
 
 /* prng_successor
@@ -138,9 +138,9 @@ uint32_t crypto1_word(struct Crypto1State *s, uint32_t in, int is_encrypted)
  */
 uint32_t prng_successor(uint32_t x, uint32_t n)
 {
-	SWAPENDIAN(x);
-	while(n--)
-		x = x >> 1 | (x >> 16 ^ x >> 18 ^ x >> 19 ^ x >> 21) << 31;
+    SWAPENDIAN(x);
+    while(n--)
+        x = x >> 1 | (x >> 16 ^ x >> 18 ^ x >> 19 ^ x >> 21) << 31;
 
-	return SWAPENDIAN(x);
+    return SWAPENDIAN(x);
 }
diff --git a/tools/nonce2key/nonce2key.c b/tools/nonce2key/nonce2key.c
index f7bbc43b7..52b7998ae 100644
--- a/tools/nonce2key/nonce2key.c
+++ b/tools/nonce2key/nonce2key.c
@@ -4,54 +4,54 @@
 #include <stdio.h>
 
 int main(const int argc, const char* argv[]) {
-	struct Crypto1State *state;
-	uint32_t pos, uid, nt, nr, rr, nr_diff;
-	uint8_t bt, i, ks3x[8], par[8][8];
-	uint64_t key_recovered;
-	uint64_t par_info;
-	uint64_t ks_info;
-	nr = rr = 0;
+    struct Crypto1State *state;
+    uint32_t pos, uid, nt, nr, rr, nr_diff;
+    uint8_t bt, i, ks3x[8], par[8][8];
+    uint64_t key_recovered;
+    uint64_t par_info;
+    uint64_t ks_info;
+    nr = rr = 0;
 
-	if (argc < 5) {
-		printf("\nsyntax: %s <uid> <nt> <par> <ks>\n\n",argv[0]);
-		return 1;
-	}
-	sscanf(argv[1],"%08x", &uid);
-	sscanf(argv[2],"%08x", &nt);
-	sscanf(argv[3],"%016" SCNx64 ,&par_info);
-	sscanf(argv[4],"%016" SCNx64 ,&ks_info);
+    if (argc < 5) {
+        printf("\nsyntax: %s <uid> <nt> <par> <ks>\n\n",argv[0]);
+        return 1;
+    }
+    sscanf(argv[1],"%08x", &uid);
+    sscanf(argv[2],"%08x", &nt);
+    sscanf(argv[3],"%016" SCNx64 ,&par_info);
+    sscanf(argv[4],"%016" SCNx64 ,&ks_info);
 
-	// Reset the last three significant bits of the reader nonce
-	nr &= 0xffffff1f;
+    // Reset the last three significant bits of the reader nonce
+    nr &= 0xffffff1f;
 
-	printf("\nuid(%08x) nt(%08x) par(%016" PRIx64 ") ks(%016" PRIx64 ")\n\n", uid, nt, par_info, ks_info);
+    printf("\nuid(%08x) nt(%08x) par(%016" PRIx64 ") ks(%016" PRIx64 ")\n\n", uid, nt, par_info, ks_info);
 
-	for ( pos = 0; pos < 8; pos++ ) {
-		ks3x[7-pos] = (ks_info >> (pos*8)) & 0x0f;
-		bt = (par_info >> (pos*8)) & 0xff;
+    for ( pos = 0; pos < 8; pos++ ) {
+        ks3x[7-pos] = (ks_info >> (pos*8)) & 0x0f;
+        bt = (par_info >> (pos*8)) & 0xff;
 
-		for ( i = 0; i < 8; i++) {
-			par[7-pos][i] = (bt >> i) & 0x01;
-		}
-	}
+        for ( i = 0; i < 8; i++) {
+            par[7-pos][i] = (bt >> i) & 0x01;
+        }
+    }
 
-	printf("|diff|{nr}    |ks3|ks3^5|parity         |\n");
-	printf("+----+--------+---+-----+---------------+\n");
+    printf("|diff|{nr}    |ks3|ks3^5|parity         |\n");
+    printf("+----+--------+---+-----+---------------+\n");
 
-	for ( i = 0; i < 8; i++) {
-		nr_diff = nr | i << 5;
-		printf("| %02x |%08x| %01x |  %01x  |", i << 5, nr_diff, ks3x[i], ks3x[i]^5);
+    for ( i = 0; i < 8; i++) {
+        nr_diff = nr | i << 5;
+        printf("| %02x |%08x| %01x |  %01x  |", i << 5, nr_diff, ks3x[i], ks3x[i]^5);
 
-		for ( pos = 0; pos < 7; pos++)
-			printf("%01x,", par[i][pos]);
-		printf("%01x|\n", par[i][7]);
-	}
-	printf("+----+--------+---+-----+---------------+\n");
+        for ( pos = 0; pos < 7; pos++)
+            printf("%01x,", par[i][pos]);
+        printf("%01x|\n", par[i][7]);
+    }
+    printf("+----+--------+---+-----+---------------+\n");
 
-	state = lfsr_common_prefix(nr,rr,ks3x,par);
-	lfsr_rollback_word(state,uid^nt,0);
-	crypto1_get_lfsr(state,&key_recovered);
-	printf("\nkey recovered: %012" PRIx64 "\n\n", key_recovered);
-	crypto1_destroy(state);
-	return 0;
+    state = lfsr_common_prefix(nr,rr,ks3x,par);
+    lfsr_rollback_word(state,uid^nt,0);
+    crypto1_get_lfsr(state,&key_recovered);
+    printf("\nkey recovered: %012" PRIx64 "\n\n", key_recovered);
+    crypto1_destroy(state);
+    return 0;
 }

From bcb33ca5ef5336013998d6530c0f739780fdaaa4 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 9 Mar 2019 10:52:45 +0100
Subject: [PATCH 0687/1938] tools scripts: fix mix of spaces & tabs

---
 tools/findbits.py        | 110 +++++++++++++++++++--------------------
 tools/findbits_test.py   |  94 ++++++++++++++++-----------------
 tools/install-gnuarm4.sh |   6 +--
 tools/mkversion.pl       |  50 +++++++++---------
 tools/rfidtest.pl        |  94 ++++++++++++++++-----------------
 tools/srecswap.pl        |  38 +++++++-------
 tools/xorcheck.py        |  36 ++++++-------
 7 files changed, 214 insertions(+), 214 deletions(-)

diff --git a/tools/findbits.py b/tools/findbits.py
index 501d23019..fb088d739 100755
--- a/tools/findbits.py
+++ b/tools/findbits.py
@@ -25,77 +25,77 @@ import os
 
 # invert binary string
 def invert(data):
-	return ''.join('0' if c == '1' else '1' for c in data)
+    return ''.join('0' if c == '1' else '1' for c in data)
 
 # do the actual search
 def search(target,data):
-	location = data.find(target)
-	if location >= 0:
-		print '*** Match at bit %d:' % location,
-		print '%s<%s>%s' % (data[:location],target,data[location+len(target):])
-	else:
-		print 'Not found'
+    location = data.find(target)
+    if location >= 0:
+        print '*** Match at bit %d:' % location,
+        print '%s<%s>%s' % (data[:location],target,data[location+len(target):])
+    else:
+        print 'Not found'
 
 # convert integer to binary string
 def binstring(number):
-	return bin(number)[2:] if number > 0 else ''
+    return bin(number)[2:] if number > 0 else ''
 
 # reverse string order
 def stringreverse(data):
-	return data[::-1]
+    return data[::-1]
 
 # match forward, backward and inverted
 def domatch(binary,number):
-	reversed= stringreverse(number)
-	inverted= invert(binary)
+    reversed= stringreverse(number)
+    inverted= invert(binary)
 
-	print '  Forward: (%s)' % number,
-	search(binary,number)
-	print '  Reverse: (%s)' % reversed,
-	search(binary,reversed)
-	print '  Inverse: (%s)' % inverted
-	print '    Forward: (%s)' % number,
-	search(inverted,number)
-	print '    Reverse: (%s)' % reversed,
-	search(inverted,reversed)
+    print '  Forward: (%s)' % number,
+    search(binary,number)
+    print '  Reverse: (%s)' % reversed,
+    search(binary,reversed)
+    print '  Inverse: (%s)' % inverted
+    print '    Forward: (%s)' % number,
+    search(inverted,number)
+    print '    Reverse: (%s)' % reversed,
+    search(inverted,reversed)
 
 def main():
-	if(len(sys.argv) < 3):
-		print
-		print '\t'+sys.argv[0] + ' - Search bitstream for a known number'
-		print
-		print 'Usage: ' + sys.argv[0] + ' <NUMBER> <BITSTREAM>'
-		print
-		print '\tNUMBER will be converted to it\'s BINARY equivalent for all valid'
-		print '\tinstances of BINARY, OCTAL, DECIMAL and HEX, and the bitstream'
-		print '\tand it\'s inverse will be searched for a pattern match. Note that'
-		print '\tNUMBER must be specified in BINARY to match leading zeros.'
-		print
-		print 'Example:'
-		print
-		print '\tfindbits.py 73 0110010101110011'
-		print
-		os._exit(True)
+    if(len(sys.argv) < 3):
+        print
+        print '\t'+sys.argv[0] + ' - Search bitstream for a known number'
+        print
+        print 'Usage: ' + sys.argv[0] + ' <NUMBER> <BITSTREAM>'
+        print
+        print '\tNUMBER will be converted to it\'s BINARY equivalent for all valid'
+        print '\tinstances of BINARY, OCTAL, DECIMAL and HEX, and the bitstream'
+        print '\tand it\'s inverse will be searched for a pattern match. Note that'
+        print '\tNUMBER must be specified in BINARY to match leading zeros.'
+        print
+        print 'Example:'
+        print
+        print '\tfindbits.py 73 0110010101110011'
+        print
+        os._exit(True)
 
-	bases=	{
-		2:'BINARY',
-		8:'OCTAL',
-		10:'DECIMAL',
-		16:'HEX',
-			}
+    bases=    {
+        2:'BINARY',
+        8:'OCTAL',
+        10:'DECIMAL',
+        16:'HEX',
+            }
 
-	for base, base_name in sorted(bases.iteritems()):
-		try:
-			number= int(sys.argv[1],base)
-			print
-			print 'Trying', base_name
-			# do BINARY as specified to preserve leading zeros
-			if base == 2:
-				domatch(sys.argv[1],sys.argv[2])
-			else:
-				domatch(binstring(number),sys.argv[2])
-		except:
-			continue
+    for base, base_name in sorted(bases.iteritems()):
+        try:
+            number= int(sys.argv[1],base)
+            print
+            print 'Trying', base_name
+            # do BINARY as specified to preserve leading zeros
+            if base == 2:
+                domatch(sys.argv[1],sys.argv[2])
+            else:
+                domatch(binstring(number),sys.argv[2])
+        except:
+            continue
 
 if __name__ == '__main__':
-	main()
+    main()
diff --git a/tools/findbits_test.py b/tools/findbits_test.py
index 3288cb35b..4415ce726 100644
--- a/tools/findbits_test.py
+++ b/tools/findbits_test.py
@@ -4,65 +4,65 @@ from itertools import imap
 import unittest, sys, findbits
 
 class TestFindBits(unittest.TestCase):
-	def setUp(self):
-		self.old_stdout = sys.stdout
-		sys.stdout = OutputBuffer()
+    def setUp(self):
+        self.old_stdout = sys.stdout
+        sys.stdout = OutputBuffer()
 
-	def tearDown(self):
-		sys.stdout = self.old_stdout
+    def tearDown(self):
+        sys.stdout = self.old_stdout
 
-	INVERT_CASES = [
-			('10', '01'),
-			('', ''),
-			]
-	def test_invert(self):
-		self.commutative_test(findbits.invert, self.INVERT_CASES)
+    INVERT_CASES = [
+            ('10', '01'),
+            ('', ''),
+            ]
+    def test_invert(self):
+        self.commutative_test(findbits.invert, self.INVERT_CASES)
 
-	SEARCH_CASES = [
-			('1111', '10111101', ['Match at bit 2', '0<1111>0']),
-			('00', '10111101', ['Not found']),
-			]
-	def test_search(self):
-		for target, data, expected_fragments in self.SEARCH_CASES:
-			sys.stdout.clear_buffer()
-			findbits.search(target, data)
-			for fragment in expected_fragments:
-				self.assertIn(fragment, sys.stdout.content)
+    SEARCH_CASES = [
+            ('1111', '10111101', ['Match at bit 2', '0<1111>0']),
+            ('00', '10111101', ['Not found']),
+            ]
+    def test_search(self):
+        for target, data, expected_fragments in self.SEARCH_CASES:
+            sys.stdout.clear_buffer()
+            findbits.search(target, data)
+            for fragment in expected_fragments:
+                self.assertIn(fragment, sys.stdout.content)
 
-	BINSTRING_CASES = [
-			(42, '101010'),
-			(1, '1'),
-			(0, ''),
-			]
-	def test_binstring(self):
-		self.unary_operation_test(findbits.binstring, self.BINSTRING_CASES)
+    BINSTRING_CASES = [
+            (42, '101010'),
+            (1, '1'),
+            (0, ''),
+            ]
+    def test_binstring(self):
+        self.unary_operation_test(findbits.binstring, self.BINSTRING_CASES)
 
-	REVERSE_CASES = [
-			('abc', 'cba'),
-			('', ''),
-			]
-	def test_stringreverse(self):
-		self.commutative_test(findbits.stringreverse, self.REVERSE_CASES)
+    REVERSE_CASES = [
+            ('abc', 'cba'),
+            ('', ''),
+            ]
+    def test_stringreverse(self):
+        self.commutative_test(findbits.stringreverse, self.REVERSE_CASES)
 
-	def commutative_test(self, operation, cases):
-		self.unary_operation_test(operation, cases)
-		self.unary_operation_test(operation, imap(reversed, cases))
+    def commutative_test(self, operation, cases):
+        self.unary_operation_test(operation, cases)
+        self.unary_operation_test(operation, imap(reversed, cases))
 
-	def unary_operation_test(self, operation, cases):
-		for case_in, case_out in cases:
-			self.assertEqual(operation(case_in), case_out)
+    def unary_operation_test(self, operation, cases):
+        for case_in, case_out in cases:
+            self.assertEqual(operation(case_in), case_out)
 
 
 class OutputBuffer(object):
-	def __init__(self):
-		self.clear_buffer()
+    def __init__(self):
+        self.clear_buffer()
 
-	def clear_buffer(self):
-		self.content = ''
+    def clear_buffer(self):
+        self.content = ''
 
-	def write(self, data):
-		self.content += data
+    def write(self, data):
+        self.content += data
 
 
 if __name__ == '__main__':
-	unittest.main()
\ No newline at end of file
+    unittest.main()
\ No newline at end of file
diff --git a/tools/install-gnuarm4.sh b/tools/install-gnuarm4.sh
index 793bdbf5d..a5d92c5d5 100755
--- a/tools/install-gnuarm4.sh
+++ b/tools/install-gnuarm4.sh
@@ -14,16 +14,16 @@ if [ "${1}" = "" ]; then
         echo "Syntax: ${0} </installation/target/directory> [download & build directory (default ${PWD})]"
         exit 1
 else
-	DESTDIR="${1}"
+    DESTDIR="${1}"
 fi
 
 # Where do you want to build the tools. This is where the log files
 # will be written (which you can monitor with 'tail' during compilation).
 # You can delete this directory after everything is done.
 if [ ! "${2}" = "" ]; then
-	SRCDIR="${2}"
+    SRCDIR="${2}"
 else
-	SRCDIR="${PWD}"
+    SRCDIR="${PWD}"
 fi
 BUILDDIR=${SRCDIR}/build-gnuarm4
 
diff --git a/tools/mkversion.pl b/tools/mkversion.pl
index 674c44177..023c84c8b 100644
--- a/tools/mkversion.pl
+++ b/tools/mkversion.pl
@@ -32,28 +32,28 @@ my $commandGIT = "env which git";
 
 if ( defined($commandGIT) )  {
 
-	my $githistory = `git fetch --all`;
-	# now avoiding the "fatal: No names found, cannot describe anything." error by fallbacking to abbrev hash in such case
-	my $gitversion = `git describe --dirty --always`;
-	my $gitbranch = `git rev-parse --abbrev-ref HEAD`;
-	$clean = $gitversion =~ '-dirty' ? 0 : 1;
+    my $githistory = `git fetch --all`;
+    # now avoiding the "fatal: No names found, cannot describe anything." error by fallbacking to abbrev hash in such case
+    my $gitversion = `git describe --dirty --always`;
+    my $gitbranch = `git rev-parse --abbrev-ref HEAD`;
+    $clean = $gitversion =~ '-dirty' ? 0 : 1;
 
-	if ( defined($gitbranch) and defined($gitversion) ) {
-		$fullgitinfo =  $fullgitinfo.'/'. $gitbranch . '/' . $gitversion;
+    if ( defined($gitbranch) and defined($gitversion) ) {
+        $fullgitinfo =  $fullgitinfo.'/'. $gitbranch . '/' . $gitversion;
 
-		my @compiletime = localtime();
-		$compiletime[4] += 1;
-		$compiletime[5] += 1900;
-		$ctime = sprintf("%6\$04i-%5\$02i-%4\$02i %3\$02i:%2\$02i:%1\$02i", @compiletime);
-	} else {
-		$fullgitinfo =  $fullgitinfo.'/master/release (git)';
-	}
+        my @compiletime = localtime();
+        $compiletime[4] += 1;
+        $compiletime[5] += 1900;
+        $ctime = sprintf("%6\$04i-%5\$02i-%4\$02i %3\$02i:%2\$02i:%1\$02i", @compiletime);
+    } else {
+        $fullgitinfo =  $fullgitinfo.'/master/release (git)';
+    }
 } else {
-	$fullgitinfo =  $fullgitinfo.'/master/release (no_git)';
-	my @dl_time = localtime( (stat('../README.md'))[10] );
-	$dl_time[4] += 1;
-	$dl_time[5] += 1900;
-	$ctime = sprintf("%6\$04i-%5\$02i-%4\$02i %3\$02i:%2\$02i:%1\$02i", @dl_time);
+    $fullgitinfo =  $fullgitinfo.'/master/release (no_git)';
+    my @dl_time = localtime( (stat('../README.md'))[10] );
+    $dl_time[4] += 1;
+    $dl_time[5] += 1900;
+    $ctime = sprintf("%6\$04i-%5\$02i-%4\$02i %3\$02i:%2\$02i:%1\$02i", @dl_time);
 }
 
 $fullgitinfo =~ s/(\s)//g;
@@ -66,11 +66,11 @@ print <<EOF
 #include "proxmark3.h"
 /* Generated file, do not edit */
 const struct version_information __attribute__((section(".version_information"))) version_information = {
-	VERSION_INFORMATION_MAGIC,
-	1,
-	1,
-	$clean,
-	"$fullgitinfo",
-	"$ctime",
+    VERSION_INFORMATION_MAGIC,
+    1,
+    1,
+    $clean,
+    "$fullgitinfo",
+    "$ctime",
 };
 EOF
diff --git a/tools/rfidtest.pl b/tools/rfidtest.pl
index db898d329..304f59454 100644
--- a/tools/rfidtest.pl
+++ b/tools/rfidtest.pl
@@ -16,20 +16,20 @@ if ($search =~ /^[01]+$/) { }
 # decimal
 elsif ($search =~ /^\d+$/)
 {
-	$search = unpack("B*", pack("N", $search));
-	$search =~ s/^0*//;
+    $search = unpack("B*", pack("N", $search));
+    $search =~ s/^0*//;
 }
 # hex
 elsif ($search =~ /^[\da-fA-F]+$/)
 {
-	$search = unpack("B*", pack("H*", $search));
-	$search =~ s/^0*//;
+    $search = unpack("B*", pack("H*", $search));
+    $search =~ s/^0*//;
 }
 # ascii
 else
 {
-	$search = unpack("B*", $search);
-	$search =~ s/^0*//;
+    $search = unpack("B*", $search);
+    $search =~ s/^0*//;
 }
 
 
@@ -44,12 +44,12 @@ $data =~ s/\s//g;
 if ($data =~ /^[01]+$/) { }
 elsif ($data =~ /^[\da-fA-F]+$/)
 {
-	$data = unpack("B*", pack("H*", $data));
-	$search =~ s/^0*//;
+    $data = unpack("B*", pack("H*", $data));
+    $search =~ s/^0*//;
 }
 else
 {
-	die "Seriously. What sort of data is this file? Binary or hex only please.\n";
+    die "Seriously. What sort of data is this file? Binary or hex only please.\n";
 }
 
 
@@ -66,12 +66,12 @@ my $man;
 my $last = 0;
 for (my $i = 1; $i < @bits; $i++)
 {
-	# if we changed, flip our bit
-	if ($bits[$i-1] == 1)
-	{
-		$last ^= 1;
-	}
-	$man .= $last;
+    # if we changed, flip our bit
+    if ($bits[$i-1] == 1)
+    {
+        $last ^= 1;
+    }
+    $man .= $last;
 }
 
 print "Testing with manchester demodulation...\n";
@@ -83,37 +83,37 @@ test_all($man, $search, 1);
 
 sub test_all
 {
-	my ($data, $search, $flip) = @_;
-	
-	if ($flip)
-	{
-		$data =~ s/(.)/$1 ^ 1/eg;
-	}
-	
-	# first just see if our data is in the stream
-	if ($data =~ /$search/)
-	{
-		print "Found $search in our stream ($data)\n";
-	}
+    my ($data, $search, $flip) = @_;
 
-	# try removing parity every 4 and 8 bits
-	foreach my $parity (4, 8)
-	{
-		# try removing a parity bit every $parity bits
-		# test by cutting off a bit at a time in case we're in the wrong bit position
-		my $tmp = $data;
-		foreach (1 .. $parity)
-		{
-			my $test = $tmp;
-			$test =~ s/(.{$parity})./$1/g;
-		
-			if ($test =~ /$search/)
-			{
-				print "Found $search with parity every " . ($parity + 1) . "th bit, round $_ out of $parity ($test)\n";
-			}
-		
-			# chop of a bit to change our bit position next round
-			$tmp =~ s/^.//;
-		}
-	}
+    if ($flip)
+    {
+        $data =~ s/(.)/$1 ^ 1/eg;
+    }
+
+    # first just see if our data is in the stream
+    if ($data =~ /$search/)
+    {
+        print "Found $search in our stream ($data)\n";
+    }
+
+    # try removing parity every 4 and 8 bits
+    foreach my $parity (4, 8)
+    {
+        # try removing a parity bit every $parity bits
+        # test by cutting off a bit at a time in case we're in the wrong bit position
+        my $tmp = $data;
+        foreach (1 .. $parity)
+        {
+            my $test = $tmp;
+            $test =~ s/(.{$parity})./$1/g;
+
+            if ($test =~ /$search/)
+            {
+                print "Found $search with parity every " . ($parity + 1) . "th bit, round $_ out of $parity ($test)\n";
+            }
+
+            # chop of a bit to change our bit position next round
+            $tmp =~ s/^.//;
+        }
+    }
 }
diff --git a/tools/srecswap.pl b/tools/srecswap.pl
index fd6f9a944..47db8e687 100644
--- a/tools/srecswap.pl
+++ b/tools/srecswap.pl
@@ -6,30 +6,30 @@
 # Jonathan Westhues, April 2004
 
 if(@ARGV == 0) {
-	die "usage: $0 file-to-endian-swap.s19 > out.s19\n";
+    die "usage: $0 file-to-endian-swap.s19 > out.s19\n";
 }
 
 while(<>) {
-	chomp;
+    chomp;
 
-	if(/^S0/) {
-		next;
-	}
-	if(/^S7/) {
-		print "$_\n";
-		next;
-	}
+    if(/^S0/) {
+        next;
+    }
+    if(/^S7/) {
+        print "$_\n";
+        next;
+    }
 
-	if(not /^S3(..)(........)(.*)(..)$/) {
-		die "bad S record at line $.\n";
-	}
+    if(not /^S3(..)(........)(.*)(..)$/) {
+        die "bad S record at line $.\n";
+    }
 
-	$data = $3;
-	$checksum = $4;
+    $data = $3;
+    $checksum = $4;
 
-	print "S3$1$2";
-	while($data =~ m#(..)(..)(..)(..)#g) {
-		print "$4$3$2$1";
-	}
-	print "$checksum\n";
+    print "S3$1$2";
+    while($data =~ m#(..)(..)(..)(..)#g) {
+        print "$4$3$2$1";
+    }
+    print "$checksum\n";
 }
diff --git a/tools/xorcheck.py b/tools/xorcheck.py
index 73eeb4a7f..091998a31 100755
--- a/tools/xorcheck.py
+++ b/tools/xorcheck.py
@@ -24,29 +24,29 @@ import sys
 import os
 
 if(len(sys.argv) < 3):
-	print
-	print '\t'+sys.argv[0] + ' - Generate final byte for XOR LRC'
-	print
-	print 'Usage: ' + sys.argv[0] + ' <ID Byte1> <ID Byte2> ... <LRC>'
-	print
-	print '\tSpecifying the bytes of a UID with a known LRC will find the last byte value'
-	print '\tneeded to generate that LRC with a rolling XOR. All bytes should be specified in HEX.'
-	print
-	print 'Example:'
-	print
-	print '\txorcheck.py 04 00 80 64 ba'
-	print
-	print 'Should produce the output:'
-	print
-	print '\tTarget (BA) requires final LRC XOR byte value: 5A'
-	print
-	os._exit(True)
+    print
+    print '\t'+sys.argv[0] + ' - Generate final byte for XOR LRC'
+    print
+    print 'Usage: ' + sys.argv[0] + ' <ID Byte1> <ID Byte2> ... <LRC>'
+    print
+    print '\tSpecifying the bytes of a UID with a known LRC will find the last byte value'
+    print '\tneeded to generate that LRC with a rolling XOR. All bytes should be specified in HEX.'
+    print
+    print 'Example:'
+    print
+    print '\txorcheck.py 04 00 80 64 ba'
+    print
+    print 'Should produce the output:'
+    print
+    print '\tTarget (BA) requires final LRC XOR byte value: 5A'
+    print
+    os._exit(True)
 
 target= int(sys.argv[len(sys.argv) - 1],16)
 
 lrc= 0x00
 for i in range(len(sys.argv) - 1):
-	lrc ^= int(sys.argv[i + 1],16)
+    lrc ^= int(sys.argv[i + 1],16)
 print
 print 'Target (%02X) requires final LRC XOR byte value: %02X' % (target,lrc)
 print

From 46af10d54d5f4dc82227b2ccd19afbc56accaa65 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 9 Mar 2019 11:10:22 +0100
Subject: [PATCH 0688/1938] scripts: fix mix of spaces & tabs

---
 fpga/tests/plot_edgedetect.py |  4 ++--
 proxmark3.sh                  | 34 +++++++++++++++++-----------------
 update.sh                     | 34 +++++++++++++++++-----------------
 3 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/fpga/tests/plot_edgedetect.py b/fpga/tests/plot_edgedetect.py
index 4e244ebc3..3249de6c2 100755
--- a/fpga/tests/plot_edgedetect.py
+++ b/fpga/tests/plot_edgedetect.py
@@ -11,8 +11,8 @@ import matplotlib.pyplot as plt
 import sys
 
 if len(sys.argv) != 2:
-	print "Usage: %s <basename>" % sys.argv[0]
-	sys.exit(1)
+    print "Usage: %s <basename>" % sys.argv[0]
+    sys.exit(1)
 
 BASENAME = sys.argv[1]
 
diff --git a/proxmark3.sh b/proxmark3.sh
index e58749b2e..34691b95a 100755
--- a/proxmark3.sh
+++ b/proxmark3.sh
@@ -1,26 +1,26 @@
 #!/bin/bash
 
 function wait4proxmark_Linux {
-	echo >&2 "Waiting for Proxmark to appear..."
-	while [ ! -c /dev/ttyACM? -a ! -L /dev/pm3-? ]; do
-		sleep .1
-	done
-	local PM3=`ls -1 /dev/pm3-? /dev/ttyACM? 2>/dev/null | head -1`
-	echo >&2 -e "Found proxmark on ${PM3}\n"
-	echo $PM3
+    echo >&2 "Waiting for Proxmark to appear..."
+    while [ ! -c /dev/ttyACM? -a ! -L /dev/pm3-? ]; do
+        sleep .1
+    done
+    local PM3=`ls -1 /dev/pm3-? /dev/ttyACM? 2>/dev/null | head -1`
+    echo >&2 -e "Found proxmark on ${PM3}\n"
+    echo $PM3
 }
 
 function wait4proxmark_macOS {
-	echo >&2 "Waiting for Proxmark to appear..."
-	while true; do
-		PM3=$(ls /dev/pm3-* /dev/cu.usbmodem* 2>/dev/null | head -1)
-		if [[ $PM3 != "" ]]; then
-			#echo >&2 -e "Found proxmark on $(ls /dev/pm3-* /dev/cu.usbmodem* 2>/dev/null | head -1)\n"
-			break
-		fi
-		sleep .1
-	done
-	echo $PM3
+    echo >&2 "Waiting for Proxmark to appear..."
+    while true; do
+        PM3=$(ls /dev/pm3-* /dev/cu.usbmodem* 2>/dev/null | head -1)
+        if [[ $PM3 != "" ]]; then
+            #echo >&2 -e "Found proxmark on $(ls /dev/pm3-* /dev/cu.usbmodem* 2>/dev/null | head -1)\n"
+            break
+        fi
+        sleep .1
+    done
+    echo $PM3
 }
 
 # start proxmark with first detected interface
diff --git a/update.sh b/update.sh
index 3546cc3d1..fe5f0dd95 100755
--- a/update.sh
+++ b/update.sh
@@ -1,26 +1,26 @@
 #!/bin/bash
 
 function wait4proxmark_Linux {
-	echo >&2 "Waiting for Proxmark to appear..."
-	while [ ! -c /dev/ttyACM? -a ! -L /dev/pm3-? ]; do
-		sleep .1
-	done
-	local PM3=`ls -1 /dev/pm3-? /dev/ttyACM? 2>/dev/null | head -1`
-	echo >&2 -e "Found proxmark on ${PM3}\n"
-	echo $PM3
+    echo >&2 "Waiting for Proxmark to appear..."
+    while [ ! -c /dev/ttyACM? -a ! -L /dev/pm3-? ]; do
+        sleep .1
+    done
+    local PM3=`ls -1 /dev/pm3-? /dev/ttyACM? 2>/dev/null | head -1`
+    echo >&2 -e "Found proxmark on ${PM3}\n"
+    echo $PM3
 }
 
 function wait4proxmark_macOS {
-	echo >&2 "Waiting for Proxmark to appear..."
-	while true; do
-		PM3=$(ls /dev/pm3-* /dev/cu.usbmodem* 2>/dev/null | head -1)
-		if [[ $PM3 != "" ]]; then
-			#echo >&2 -e "Found proxmark on $(ls /dev/pm3-* /dev/cu.usbmodem* 2>/dev/null | head -1)\n"
-			break
-		fi
-		sleep .1
-	done
-	echo $PM3
+    echo >&2 "Waiting for Proxmark to appear..."
+    while true; do
+        PM3=$(ls /dev/pm3-* /dev/cu.usbmodem* 2>/dev/null | head -1)
+        if [[ $PM3 != "" ]]; then
+            #echo >&2 -e "Found proxmark on $(ls /dev/pm3-* /dev/cu.usbmodem* 2>/dev/null | head -1)\n"
+            break
+        fi
+        sleep .1
+    done
+    echo $PM3
 }
 
 # Detect OS and flash bootroom & system image

From 59eb83bf90acee21351181178ad976ac7b5dcf61 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 9 Mar 2019 11:10:54 +0100
Subject: [PATCH 0689/1938] fix: use defines instead.

---
 client/cmdlft55xx.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 4eb087874..4acf07c3e 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1900,19 +1900,19 @@ bool tryDetectP1(bool getData) {
 	clk = GetPskClock("", false);
 	if (clk > 0) {
 		// allow undo
-		// save_restoreGB(1);
+		// save_restoreGB(GRAPH_SAVE);
 		// skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)
 		//CmdLtrim("160");
 		if ( PSKDemod("0 0 6", false) &&
 			  preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
 			  (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
-			//save_restoreGB(0);
+			//save_restoreGB(GRAPH_RESTORE);
 			return true;
 		}
 		if ( PSKDemod("0 1 6", false) &&
 			  preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
 			  (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
-			//save_restoreGB(0);
+			//save_restoreGB(GRAPH_RESTORE);
 			return true;
 		}
 		// PSK2 - needs a call to psk1TOpsk2.
@@ -1920,12 +1920,12 @@ bool tryDetectP1(bool getData) {
 			psk1TOpsk2(DemodBuffer, DemodBufferLen);
 			if (preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
 				  (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
-				//save_restoreGB(0);
+				//save_restoreGB(GRAPH_RESTORE);
 				return true;
 			}
 		} // inverse waves does not affect PSK2 demod
 		//undo trim samples
-		//save_restoreGB(0);
+		//save_restoreGB(GRAPH_RESTORE); 
 		// no other modulation clocks = 2 or 4 so quit searching
 		if (fc1 != 8) return false;
 	}

From dc36bd5e5a59e10870f02ef42fdec5a1663287cf Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 9 Mar 2019 11:13:46 +0100
Subject: [PATCH 0690/1938] fix: 'lf CheckChipType' - restores
 demodbuff/graphbuf properly

---
 client/cmdlf.c | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/client/cmdlf.c b/client/cmdlf.c
index 59dc12654..7358d9da1 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -816,10 +816,13 @@ int CmdVchDemod(const char *Cmd) {
 }
 
 //by marshmellow
-int CheckChipType(bool getDeviceData) {
+bool CheckChipType(bool getDeviceData) {
 
-	if (!getDeviceData) return 0;
+	bool retval = false;
 
+	if (!getDeviceData) return retval;
+
+	save_restoreGB(GRAPH_SAVE);
 	save_restoreDB(GRAPH_SAVE);
 
 	//check for em4x05/em4x69 chips first
@@ -827,20 +830,22 @@ int CheckChipType(bool getDeviceData) {
 	if (EM4x05IsBlock0(&word)) {
 		PrintAndLogEx(SUCCESS, "\nValid EM4x05/EM4x69 Chip Found");
 		PrintAndLogEx(SUCCESS, "Try " _YELLOW_(`lf em 4x05`) " commands");
-		save_restoreGB(GRAPH_RESTORE);
-		return 1;
+		retval = true;
+		goto out;
 	}
 
 	//check for t55xx chip...
 	if (tryDetectP1(true)) {
 		PrintAndLogEx(SUCCESS, "\nValid T55xx Chip Found");
 		PrintAndLogEx(SUCCESS, "Try " _YELLOW_(`lf t55xx`)" commands");
-		save_restoreGB(GRAPH_RESTORE);
-		return 1;
+		retval = true;
+		goto out;
 	}
 
+out:	
+	save_restoreGB(GRAPH_RESTORE);
 	save_restoreDB(GRAPH_RESTORE);
-	return 0;
+	return retval;
 }
 
 //by marshmellow

From 1fe75f248150b553eaa6d17db243aacbb5d99847 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 9 Mar 2019 11:15:18 +0100
Subject: [PATCH 0691/1938] zlib, uart: fix mix of spaces & tabs

---
 uart/uart.h       |   4 +-
 uart/uart_posix.c | 528 +++++++++++++++++++++++-----------------------
 uart/uart_win32.c | 184 ++++++++--------
 zlib/deflate.c    | 132 ++++++------
 zlib/inflate.c    |   2 +-
 zlib/trees.c      |   2 +-
 6 files changed, 426 insertions(+), 426 deletions(-)

diff --git a/uart/uart.h b/uart/uart.h
index d724831be..f7bd2117f 100644
--- a/uart/uart.h
+++ b/uart/uart.h
@@ -44,11 +44,11 @@
 
 
 #if defined (_WIN32)
-#define SERIAL_PORT_H	"com3"
+#define SERIAL_PORT_H   "com3"
 #elif defined(__APPLE__)
 #define SERIAL_PORT_H   "/dev/cu.usbmodem"
 #else
-#define SERIAL_PORT_H	"/dev/ttyACM0"
+#define SERIAL_PORT_H   "/dev/ttyACM0"
 #endif
 
 /* serial_port is declared as a void*, which you should cast to whatever type
diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index 58f24298d..b2639f2f0 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -62,363 +62,363 @@
 
 typedef struct termios term_info;
 typedef struct {
-	int fd;           // Serial port file descriptor
-	term_info tiOld;  // Terminal info before using the port
-	term_info tiNew;  // Terminal info during the transaction
+    int fd;           // Serial port file descriptor
+    term_info tiOld;  // Terminal info before using the port
+    term_info tiNew;  // Terminal info during the transaction
 } serial_port_unix;
 
 // Set time-out on 30 miliseconds
 struct timeval timeout = {
-	.tv_sec  =     0, // 0 second
-	.tv_usec = 30000  // 30 000 micro seconds
+    .tv_sec  =     0, // 0 second
+    .tv_usec = 30000  // 30 000 micro seconds
 };
 
 serial_port uart_open(const char* pcPortName) {
-	serial_port_unix* sp = calloc(sizeof(serial_port_unix), sizeof(uint8_t));
-	if (sp == 0) return INVALID_SERIAL_PORT;
+    serial_port_unix* sp = calloc(sizeof(serial_port_unix), sizeof(uint8_t));
+    if (sp == 0) return INVALID_SERIAL_PORT;
 
-	if (memcmp(pcPortName, "tcp:", 4) == 0) {
-		struct addrinfo *addr, *rp;
-		char *addrstr = strdup(pcPortName + 4);
+    if (memcmp(pcPortName, "tcp:", 4) == 0) {
+        struct addrinfo *addr, *rp;
+        char *addrstr = strdup(pcPortName + 4);
 
-		if (addrstr == NULL) {
-			printf("Error: strdup\n");
-			free(sp);
-			return INVALID_SERIAL_PORT;
-		}
+        if (addrstr == NULL) {
+            printf("Error: strdup\n");
+            free(sp);
+            return INVALID_SERIAL_PORT;
+        }
 
-		timeout.tv_usec = 300000;  // 300 000 micro seconds
+        timeout.tv_usec = 300000;  // 300 000 micro seconds
 
-		char *colon = strrchr(addrstr, ':');
-		char *portstr;
-		if (colon) {
-			portstr = colon + 1;
-			*colon = '\0';
-		} else {
-			portstr = "7901";
-		}
+        char *colon = strrchr(addrstr, ':');
+        char *portstr;
+        if (colon) {
+            portstr = colon + 1;
+            *colon = '\0';
+        } else {
+            portstr = "7901";
+        }
 
-		int s = getaddrinfo(addrstr, portstr, NULL, &addr);
-		if (s != 0) {
-			printf("Error: getaddrinfo: %s\n", gai_strerror(s));
-			freeaddrinfo(addr);
-			free(addrstr);
-			free(sp);
-			return INVALID_SERIAL_PORT;
-		}
+        int s = getaddrinfo(addrstr, portstr, NULL, &addr);
+        if (s != 0) {
+            printf("Error: getaddrinfo: %s\n", gai_strerror(s));
+            freeaddrinfo(addr);
+            free(addrstr);
+            free(sp);
+            return INVALID_SERIAL_PORT;
+        }
 
-		int sfd;
-		for (rp = addr; rp != NULL; rp = rp->ai_next) {
-			sfd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
+        int sfd;
+        for (rp = addr; rp != NULL; rp = rp->ai_next) {
+            sfd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
 
-			if (sfd == -1)
-				continue;
+            if (sfd == -1)
+                continue;
 
-			if (connect(sfd, rp->ai_addr, rp->ai_addrlen) != -1)
-				break;
+            if (connect(sfd, rp->ai_addr, rp->ai_addrlen) != -1)
+                break;
 
-			close(sfd);
-		}
+            close(sfd);
+        }
 
-		if (rp == NULL) {               /* No address succeeded */
-			printf("Error: Could not connect\n");
-			freeaddrinfo(addr);
-			free(addrstr);
-			free(sp);
-			return INVALID_SERIAL_PORT;
-		}
+        if (rp == NULL) {               /* No address succeeded */
+            printf("Error: Could not connect\n");
+            freeaddrinfo(addr);
+            free(addrstr);
+            free(sp);
+            return INVALID_SERIAL_PORT;
+        }
 
-		freeaddrinfo(addr);
-		free(addrstr);
+        freeaddrinfo(addr);
+        free(addrstr);
 
-		sp->fd = sfd;
+        sp->fd = sfd;
 
-		int one = 1;
-		int res = setsockopt(sp->fd, SOL_TCP, TCP_NODELAY, &one, sizeof(one));
-		if ( res != 0) {
-			free(sp);
-			return INVALID_SERIAL_PORT;
-		}
-		return sp;
-	}
+        int one = 1;
+        int res = setsockopt(sp->fd, SOL_TCP, TCP_NODELAY, &one, sizeof(one));
+        if ( res != 0) {
+            free(sp);
+            return INVALID_SERIAL_PORT;
+        }
+        return sp;
+    }
 
 
-	sp->fd = open(pcPortName, O_RDWR | O_NOCTTY | O_NDELAY | O_NONBLOCK);
-	if (sp->fd == -1) {
-		uart_close(sp);
-		return INVALID_SERIAL_PORT;
-	}
+    sp->fd = open(pcPortName, O_RDWR | O_NOCTTY | O_NDELAY | O_NONBLOCK);
+    if (sp->fd == -1) {
+        uart_close(sp);
+        return INVALID_SERIAL_PORT;
+    }
 
-	// Finally figured out a way to claim a serial port interface under unix
-	// We just try to set a (advisory) lock on the file descriptor
-	struct flock fl;
-	fl.l_type   = F_WRLCK;
-	fl.l_whence = SEEK_SET;
-	fl.l_start  = 0;
-	fl.l_len    = 0;
-	fl.l_pid    = getpid();
+    // Finally figured out a way to claim a serial port interface under unix
+    // We just try to set a (advisory) lock on the file descriptor
+    struct flock fl;
+    fl.l_type   = F_WRLCK;
+    fl.l_whence = SEEK_SET;
+    fl.l_start  = 0;
+    fl.l_len    = 0;
+    fl.l_pid    = getpid();
 
-	// Does the system allows us to place a lock on this file descriptor
-	if (fcntl(sp->fd, F_SETLK, &fl) == -1) {
-		// A conflicting lock is held by another process
-		free(sp);
-		return CLAIMED_SERIAL_PORT;
-	}
+    // Does the system allows us to place a lock on this file descriptor
+    if (fcntl(sp->fd, F_SETLK, &fl) == -1) {
+        // A conflicting lock is held by another process
+        free(sp);
+        return CLAIMED_SERIAL_PORT;
+    }
 
-	// Try to retrieve the old (current) terminal info struct
-	if (tcgetattr(sp->fd,&sp->tiOld) == -1) {
-		uart_close(sp);
-		return INVALID_SERIAL_PORT;
-	}
+    // Try to retrieve the old (current) terminal info struct
+    if (tcgetattr(sp->fd,&sp->tiOld) == -1) {
+        uart_close(sp);
+        return INVALID_SERIAL_PORT;
+    }
 
-	// Duplicate the (old) terminal info struct
-	sp->tiNew = sp->tiOld;
+    // Duplicate the (old) terminal info struct
+    sp->tiNew = sp->tiOld;
 
-	// Configure the serial port
-	sp->tiNew.c_cflag = CS8 | CLOCAL | CREAD;
-	sp->tiNew.c_iflag = IGNPAR;
-	sp->tiNew.c_oflag = 0;
-	sp->tiNew.c_lflag = 0;
+    // Configure the serial port
+    sp->tiNew.c_cflag = CS8 | CLOCAL | CREAD;
+    sp->tiNew.c_iflag = IGNPAR;
+    sp->tiNew.c_oflag = 0;
+    sp->tiNew.c_lflag = 0;
 
-	// Block until n bytes are received
-	sp->tiNew.c_cc[VMIN] = 0;
-	// Block until a timer expires (n * 100 mSec.)
-	sp->tiNew.c_cc[VTIME] = 0;
+    // Block until n bytes are received
+    sp->tiNew.c_cc[VMIN] = 0;
+    // Block until a timer expires (n * 100 mSec.)
+    sp->tiNew.c_cc[VTIME] = 0;
 
-	// Try to set the new terminal info struct
-	if (tcsetattr(sp->fd, TCSANOW, &sp->tiNew) == -1) {
-		uart_close(sp);
-		return INVALID_SERIAL_PORT;
-	}
+    // Try to set the new terminal info struct
+    if (tcsetattr(sp->fd, TCSANOW, &sp->tiNew) == -1) {
+        uart_close(sp);
+        return INVALID_SERIAL_PORT;
+    }
 
   // Flush all lingering data that may exist
   tcflush(sp->fd, TCIOFLUSH);
 
 #ifdef WITH_FPC
-	if ( uart_set_speed(sp, 115200) ) {
-		printf("[=] UART Setting serial baudrate 115200 [FPC enabled]\n");
-	} else {
-		uart_set_speed(sp, 9600);
-		printf("[=] UART Setting serial baudrate 9600 [FPC enabled]\n");
-	}
+    if ( uart_set_speed(sp, 115200) ) {
+        printf("[=] UART Setting serial baudrate 115200 [FPC enabled]\n");
+    } else {
+        uart_set_speed(sp, 9600);
+        printf("[=] UART Setting serial baudrate 9600 [FPC enabled]\n");
+    }
 #else
-	// set speed, works for UBUNTU 14.04
-	bool success = uart_set_speed(sp, 460800);
-	if (success) {
-		printf("[=] UART Setting serial baudrate 460800\n");
-	} else {
-		uart_set_speed(sp, 115200);
-		printf("[=] UART Setting serial baudrate 115200\n");
-	}
+    // set speed, works for UBUNTU 14.04
+    bool success = uart_set_speed(sp, 460800);
+    if (success) {
+        printf("[=] UART Setting serial baudrate 460800\n");
+    } else {
+        uart_set_speed(sp, 115200);
+        printf("[=] UART Setting serial baudrate 115200\n");
+    }
 #endif
-	return sp;
+    return sp;
 }
 
 void uart_close(const serial_port sp) {
-	serial_port_unix* spu = (serial_port_unix*)sp;
-	tcflush(spu->fd, TCIOFLUSH);
-	tcsetattr(spu->fd, TCSANOW, &(spu->tiOld));
-	struct flock fl;
-	fl.l_type   = F_UNLCK;
-	fl.l_whence = SEEK_SET;
-	fl.l_start  = 0;
-	fl.l_len    = 0;
-	fl.l_pid    = getpid();
+    serial_port_unix* spu = (serial_port_unix*)sp;
+    tcflush(spu->fd, TCIOFLUSH);
+    tcsetattr(spu->fd, TCSANOW, &(spu->tiOld));
+    struct flock fl;
+    fl.l_type   = F_UNLCK;
+    fl.l_whence = SEEK_SET;
+    fl.l_start  = 0;
+    fl.l_len    = 0;
+    fl.l_pid    = getpid();
 
-	// Does the system allows us to place a lock on this file descriptor
-	int err = fcntl(spu->fd, F_SETLK, &fl);
-	if ( err == -1) {
-		//perror("fcntl");
-	}
-	close(spu->fd);
-	free(sp);
+    // Does the system allows us to place a lock on this file descriptor
+    int err = fcntl(spu->fd, F_SETLK, &fl);
+    if ( err == -1) {
+        //perror("fcntl");
+    }
+    close(spu->fd);
+    free(sp);
 }
 
 bool uart_receive(const serial_port sp, uint8_t* pbtRx, size_t pszMaxRxLen, size_t* pszRxLen) {
-	int res;
-	int byteCount;
-	fd_set rfds;
-	struct timeval tv;
+    int res;
+    int byteCount;
+    fd_set rfds;
+    struct timeval tv;
 
-	// Reset the output count
-	*pszRxLen = 0;
+    // Reset the output count
+    *pszRxLen = 0;
 
-	do {
-		// Reset file descriptor
-		FD_ZERO(&rfds);
-		FD_SET(((serial_port_unix*)sp)->fd, &rfds);
-		tv = timeout;
-		res = select(((serial_port_unix*)sp)->fd + 1, &rfds, NULL, NULL, &tv);
+    do {
+        // Reset file descriptor
+        FD_ZERO(&rfds);
+        FD_SET(((serial_port_unix*)sp)->fd, &rfds);
+        tv = timeout;
+        res = select(((serial_port_unix*)sp)->fd + 1, &rfds, NULL, NULL, &tv);
 
-		// Read error
-		if (res < 0) {
-			return false;
-		}
+        // Read error
+        if (res < 0) {
+            return false;
+        }
 
-		// Read time-out
-		if (res == 0) {
-			if (*pszRxLen == 0) {
-				// Error, we received no data
-				return false;
-			} else {
-				// We received some data, but nothing more is available
-				return true;
-			}
-		}
+        // Read time-out
+        if (res == 0) {
+            if (*pszRxLen == 0) {
+                // Error, we received no data
+                return false;
+            } else {
+                // We received some data, but nothing more is available
+                return true;
+            }
+        }
 
-		// Retrieve the count of the incoming bytes
-		res = ioctl(((serial_port_unix*)sp)->fd, FIONREAD, &byteCount);
-		if (res < 0) return false;
+        // Retrieve the count of the incoming bytes
+        res = ioctl(((serial_port_unix*)sp)->fd, FIONREAD, &byteCount);
+        if (res < 0) return false;
 
-		// Cap the number of bytes, so we don't overrun the buffer
-		if (pszMaxRxLen - (*pszRxLen) < byteCount) {
-			byteCount = pszMaxRxLen - (*pszRxLen);
-		}
+        // Cap the number of bytes, so we don't overrun the buffer
+        if (pszMaxRxLen - (*pszRxLen) < byteCount) {
+            byteCount = pszMaxRxLen - (*pszRxLen);
+        }
 
-		// There is something available, read the data
-		res = read(((serial_port_unix*)sp)->fd, pbtRx + (*pszRxLen), byteCount);
+        // There is something available, read the data
+        res = read(((serial_port_unix*)sp)->fd, pbtRx + (*pszRxLen), byteCount);
 
-		// Stop if the OS has some troubles reading the data
-		if (res <= 0) return false;
+        // Stop if the OS has some troubles reading the data
+        if (res <= 0) return false;
 
-		*pszRxLen += res;
+        *pszRxLen += res;
 
-		if (*pszRxLen == pszMaxRxLen) {
-			// We have all the data we wanted.
-			return true;
-		}
+        if (*pszRxLen == pszMaxRxLen) {
+            // We have all the data we wanted.
+            return true;
+        }
 
-	} while (byteCount);
+    } while (byteCount);
 
-	return true;
+    return true;
 }
 
 bool uart_send(const serial_port sp, const uint8_t* pbtTx, const size_t len) {
-	int32_t res;
-	size_t pos = 0;
-	fd_set rfds;
-	struct timeval tv;
+    int32_t res;
+    size_t pos = 0;
+    fd_set rfds;
+    struct timeval tv;
 
-	while (pos < len) {
-		// Reset file descriptor
-		FD_ZERO(&rfds);
-		FD_SET(((serial_port_unix*)sp)->fd, &rfds);
-		tv = timeout;
-		res = select(((serial_port_unix*)sp)->fd+1, NULL, &rfds, NULL, &tv);
+    while (pos < len) {
+        // Reset file descriptor
+        FD_ZERO(&rfds);
+        FD_SET(((serial_port_unix*)sp)->fd, &rfds);
+        tv = timeout;
+        res = select(((serial_port_unix*)sp)->fd+1, NULL, &rfds, NULL, &tv);
 
-		// Write error
-		if (res < 0) {
-			printf("UART:: write error (%d)\n", res);
-			return false;
-		}
+        // Write error
+        if (res < 0) {
+            printf("UART:: write error (%d)\n", res);
+            return false;
+        }
 
-		// Write time-out
-		if (res == 0) {
-			printf("UART:: write time-out\n");
-			return false;
-		}
+        // Write time-out
+        if (res == 0) {
+            printf("UART:: write time-out\n");
+            return false;
+        }
 
-		// Send away the bytes
-		res = write(((serial_port_unix*)sp)->fd, pbtTx + pos, len - pos);
+        // Send away the bytes
+        res = write(((serial_port_unix*)sp)->fd, pbtTx + pos, len - pos);
 
-		// Stop if the OS has some troubles sending the data
-		if (res <= 0) return false;
+        // Stop if the OS has some troubles sending the data
+        if (res <= 0) return false;
 
-		pos += res;
-	}
-	return true;
+        pos += res;
+    }
+    return true;
 }
 
 bool uart_set_speed(serial_port sp, const uint32_t uiPortSpeed) {
-	const serial_port_unix* spu = (serial_port_unix*)sp;
-	speed_t stPortSpeed;
-	switch (uiPortSpeed) {
-		case 0: stPortSpeed = B0; break;
-		case 50: stPortSpeed = B50; break;
-		case 75: stPortSpeed = B75; break;
-		case 110: stPortSpeed = B110; break;
-		case 134: stPortSpeed = B134; break;
-		case 150: stPortSpeed = B150; break;
-		case 300: stPortSpeed = B300; break;
-		case 600: stPortSpeed = B600; break;
-		case 1200: stPortSpeed = B1200; break;
-		case 1800: stPortSpeed = B1800; break;
-		case 2400: stPortSpeed = B2400; break;
-		case 4800: stPortSpeed = B4800; break;
-		case 9600: stPortSpeed = B9600; break;
-		case 19200: stPortSpeed = B19200; break;
-		case 38400: stPortSpeed = B38400; break;
+    const serial_port_unix* spu = (serial_port_unix*)sp;
+    speed_t stPortSpeed;
+    switch (uiPortSpeed) {
+        case 0: stPortSpeed = B0; break;
+        case 50: stPortSpeed = B50; break;
+        case 75: stPortSpeed = B75; break;
+        case 110: stPortSpeed = B110; break;
+        case 134: stPortSpeed = B134; break;
+        case 150: stPortSpeed = B150; break;
+        case 300: stPortSpeed = B300; break;
+        case 600: stPortSpeed = B600; break;
+        case 1200: stPortSpeed = B1200; break;
+        case 1800: stPortSpeed = B1800; break;
+        case 2400: stPortSpeed = B2400; break;
+        case 4800: stPortSpeed = B4800; break;
+        case 9600: stPortSpeed = B9600; break;
+        case 19200: stPortSpeed = B19200; break;
+        case 38400: stPortSpeed = B38400; break;
 #  ifdef B57600
-		case 57600: stPortSpeed = B57600; break;
+        case 57600: stPortSpeed = B57600; break;
 #  endif
 #  ifdef B115200
-		case 115200: stPortSpeed = B115200; break;
+        case 115200: stPortSpeed = B115200; break;
 #  endif
 #  ifdef B230400
-		case 230400: stPortSpeed = B230400; break;
+        case 230400: stPortSpeed = B230400; break;
 #  endif
 #  ifdef B460800
-		case 460800: stPortSpeed = B460800; break;
+        case 460800: stPortSpeed = B460800; break;
 #  endif
 #  ifdef B921600
-		case 921600: stPortSpeed = B921600; break;
+        case 921600: stPortSpeed = B921600; break;
 #  endif
-		default: return false;
-	};
+        default: return false;
+    };
 
-	struct termios ti;
-	if (tcgetattr(spu->fd,&ti) == -1)
-		return false;
+    struct termios ti;
+    if (tcgetattr(spu->fd,&ti) == -1)
+        return false;
 
-	// Set port speed (Input and Output)
-	cfsetispeed(&ti, stPortSpeed);
-	cfsetospeed(&ti, stPortSpeed);
-	return (tcsetattr(spu->fd, TCSANOW, &ti) != -1);
+    // Set port speed (Input and Output)
+    cfsetispeed(&ti, stPortSpeed);
+    cfsetospeed(&ti, stPortSpeed);
+    return (tcsetattr(spu->fd, TCSANOW, &ti) != -1);
 }
 
 uint32_t uart_get_speed(const serial_port sp) {
-	struct termios ti;
-	uint32_t uiPortSpeed;
-	const serial_port_unix* spu = (serial_port_unix*)sp;
+    struct termios ti;
+    uint32_t uiPortSpeed;
+    const serial_port_unix* spu = (serial_port_unix*)sp;
 
-	if (tcgetattr(spu->fd, &ti) == -1)
-		return 0;
+    if (tcgetattr(spu->fd, &ti) == -1)
+        return 0;
 
-	// Set port speed (Input)
-	speed_t stPortSpeed = cfgetispeed(&ti);
-	switch (stPortSpeed) {
-		case B0: uiPortSpeed = 0; break;
-		case B50: uiPortSpeed = 50; break;
-		case B75: uiPortSpeed = 75; break;
-		case B110: uiPortSpeed = 110; break;
-		case B134: uiPortSpeed = 134; break;
-		case B150: uiPortSpeed = 150; break;
-		case B300: uiPortSpeed = 300; break;
-		case B600: uiPortSpeed = 600; break;
-		case B1200: uiPortSpeed = 1200; break;
-		case B1800: uiPortSpeed = 1800; break;
-		case B2400: uiPortSpeed = 2400; break;
-		case B4800: uiPortSpeed = 4800; break;
-		case B9600: uiPortSpeed = 9600; break;
-		case B19200: uiPortSpeed = 19200; break;
-		case B38400: uiPortSpeed = 38400; break;
+    // Set port speed (Input)
+    speed_t stPortSpeed = cfgetispeed(&ti);
+    switch (stPortSpeed) {
+        case B0: uiPortSpeed = 0; break;
+        case B50: uiPortSpeed = 50; break;
+        case B75: uiPortSpeed = 75; break;
+        case B110: uiPortSpeed = 110; break;
+        case B134: uiPortSpeed = 134; break;
+        case B150: uiPortSpeed = 150; break;
+        case B300: uiPortSpeed = 300; break;
+        case B600: uiPortSpeed = 600; break;
+        case B1200: uiPortSpeed = 1200; break;
+        case B1800: uiPortSpeed = 1800; break;
+        case B2400: uiPortSpeed = 2400; break;
+        case B4800: uiPortSpeed = 4800; break;
+        case B9600: uiPortSpeed = 9600; break;
+        case B19200: uiPortSpeed = 19200; break;
+        case B38400: uiPortSpeed = 38400; break;
 #  ifdef B57600
-		case B57600: uiPortSpeed = 57600; break;
+        case B57600: uiPortSpeed = 57600; break;
 #  endif
 #  ifdef B115200
-		case B115200: uiPortSpeed = 115200; break;
+        case B115200: uiPortSpeed = 115200; break;
 #  endif
 #  ifdef B230400
-		case B230400: uiPortSpeed = 230400; break;
+        case B230400: uiPortSpeed = 230400; break;
 #  endif
 #  ifdef B460800
-		case B460800: uiPortSpeed = 460800; break;
+        case B460800: uiPortSpeed = 460800; break;
 #  endif
 #  ifdef B921600
-		case B921600: uiPortSpeed = 921600; break;
+        case B921600: uiPortSpeed = 921600; break;
 #  endif
-		default: return 0;
-	};
-	return uiPortSpeed;
+        default: return 0;
+    };
+    return uiPortSpeed;
 }
 #endif
diff --git a/uart/uart_win32.c b/uart/uart_win32.c
index 5f269c677..f3f129d85 100644
--- a/uart/uart_win32.c
+++ b/uart/uart_win32.c
@@ -49,129 +49,129 @@ typedef struct {
 } serial_port_windows;
 
 serial_port uart_open(const char* pcPortName) {
-	char acPortName[255];
-	serial_port_windows* sp = calloc(sizeof(serial_port_windows), sizeof(uint8_t));
+    char acPortName[255];
+    serial_port_windows* sp = calloc(sizeof(serial_port_windows), sizeof(uint8_t));
 
-	if (sp == 0) {
-		printf("[!] UART failed to allocate memory\n");
-		return INVALID_SERIAL_PORT;
-	}
-	// Copy the input "com?" to "\\.\COM?" format
-	sprintf(acPortName,"\\\\.\\%s", pcPortName);
-	_strupr(acPortName);
+    if (sp == 0) {
+        printf("[!] UART failed to allocate memory\n");
+        return INVALID_SERIAL_PORT;
+    }
+    // Copy the input "com?" to "\\.\COM?" format
+    sprintf(acPortName,"\\\\.\\%s", pcPortName);
+    _strupr(acPortName);
 
-	// Try to open the serial port
-	// r/w,  none-share comport, no security, existing, no overlapping, no templates
-	sp->hPort = CreateFileA(acPortName, GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL);
-	if (sp->hPort == INVALID_HANDLE_VALUE) {
-		uart_close(sp);
-		return INVALID_SERIAL_PORT;
-	}
+    // Try to open the serial port
+    // r/w,  none-share comport, no security, existing, no overlapping, no templates
+    sp->hPort = CreateFileA(acPortName, GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL);
+    if (sp->hPort == INVALID_HANDLE_VALUE) {
+        uart_close(sp);
+        return INVALID_SERIAL_PORT;
+    }
 
-	// Prepare the device control
-	// doesn't matter since PM3 device ignors this CDC command:  set_line_coding in usb_cdc.c
-	memset(&sp->dcb, 0, sizeof(DCB));
-	sp->dcb.DCBlength = sizeof(DCB);
-	if (!BuildCommDCBA("baud=115200 parity=N data=8 stop=1", &sp->dcb)) {
-		uart_close(sp);
-		printf("[!] UART error cdc setup\n");
-		return INVALID_SERIAL_PORT;
-	}
+    // Prepare the device control
+    // doesn't matter since PM3 device ignors this CDC command:  set_line_coding in usb_cdc.c
+    memset(&sp->dcb, 0, sizeof(DCB));
+    sp->dcb.DCBlength = sizeof(DCB);
+    if (!BuildCommDCBA("baud=115200 parity=N data=8 stop=1", &sp->dcb)) {
+        uart_close(sp);
+        printf("[!] UART error cdc setup\n");
+        return INVALID_SERIAL_PORT;
+    }
 
-	// Update the active serial port
-	if (!SetCommState(sp->hPort, &sp->dcb)) {
-		uart_close(sp);
-		printf("[!] UART error while setting com state\n");
-		return INVALID_SERIAL_PORT;
-	}
-	// all zero's configure: no timeout for read/write used.
-	// took settings from libnfc/buses/uart.c
+    // Update the active serial port
+    if (!SetCommState(sp->hPort, &sp->dcb)) {
+        uart_close(sp);
+        printf("[!] UART error while setting com state\n");
+        return INVALID_SERIAL_PORT;
+    }
+    // all zero's configure: no timeout for read/write used.
+    // took settings from libnfc/buses/uart.c
 #ifdef WITH_FPC
-	sp->ct.ReadIntervalTimeout         = 1000;
-	sp->ct.ReadTotalTimeoutMultiplier  = 0;
-	sp->ct.ReadTotalTimeoutConstant    = 1500;
-	sp->ct.WriteTotalTimeoutMultiplier = 1000;
-	sp->ct.WriteTotalTimeoutConstant   = 0;
+    sp->ct.ReadIntervalTimeout         = 1000;
+    sp->ct.ReadTotalTimeoutMultiplier  = 0;
+    sp->ct.ReadTotalTimeoutConstant    = 1500;
+    sp->ct.WriteTotalTimeoutMultiplier = 1000;
+    sp->ct.WriteTotalTimeoutConstant   = 0;
 #else
-	sp->ct.ReadIntervalTimeout         = 30;
-	sp->ct.ReadTotalTimeoutMultiplier  = 0;
-	sp->ct.ReadTotalTimeoutConstant    = 30;
-	sp->ct.WriteTotalTimeoutMultiplier = 30;
-	sp->ct.WriteTotalTimeoutConstant   = 0;
+    sp->ct.ReadIntervalTimeout         = 30;
+    sp->ct.ReadTotalTimeoutMultiplier  = 0;
+    sp->ct.ReadTotalTimeoutConstant    = 30;
+    sp->ct.WriteTotalTimeoutMultiplier = 30;
+    sp->ct.WriteTotalTimeoutConstant   = 0;
 #endif
 
-	if (!SetCommTimeouts(sp->hPort, &sp->ct)) {
-		uart_close(sp);
-		printf("[!] UART error while setting comm time outs\n");
-		return INVALID_SERIAL_PORT;
-	}
+    if (!SetCommTimeouts(sp->hPort, &sp->ct)) {
+        uart_close(sp);
+        printf("[!] UART error while setting comm time outs\n");
+        return INVALID_SERIAL_PORT;
+    }
 
-	PurgeComm(sp->hPort, PURGE_RXABORT | PURGE_RXCLEAR);
+    PurgeComm(sp->hPort, PURGE_RXABORT | PURGE_RXCLEAR);
 
 #ifdef WITH_FPC
-	if ( uart_set_speed(sp, 115200) ) {
-		printf("[=] UART Setting serial baudrate 115200 [FPC enabled]\n");
-	} else {
-		uart_set_speed(sp, 9600);
-		printf("[=] UART Setting serial baudrate 9600 [FPC enabled]\n");
-	}
+    if ( uart_set_speed(sp, 115200) ) {
+        printf("[=] UART Setting serial baudrate 115200 [FPC enabled]\n");
+    } else {
+        uart_set_speed(sp, 9600);
+        printf("[=] UART Setting serial baudrate 9600 [FPC enabled]\n");
+    }
 #else
-	bool success = uart_set_speed(sp, 460800);
-	if (success) {
-		printf("[=] UART Setting serial baudrate 460800\n");
-	} else {
-		uart_set_speed(sp, 115200);
-		printf("[=] UART Setting serial baudrate 115200\n");
-	}
+    bool success = uart_set_speed(sp, 460800);
+    if (success) {
+        printf("[=] UART Setting serial baudrate 460800\n");
+    } else {
+        uart_set_speed(sp, 115200);
+        printf("[=] UART Setting serial baudrate 115200\n");
+    }
 #endif
-	return sp;
+    return sp;
 }
 
 void uart_close(const serial_port sp) {
-	if (((serial_port_windows*)sp)->hPort != INVALID_HANDLE_VALUE )
-		CloseHandle(((serial_port_windows*)sp)->hPort);
-	free(sp);
+    if (((serial_port_windows*)sp)->hPort != INVALID_HANDLE_VALUE )
+        CloseHandle(((serial_port_windows*)sp)->hPort);
+    free(sp);
 }
 
 bool uart_set_speed(serial_port sp, const uint32_t uiPortSpeed) {
-	serial_port_windows* spw;
+    serial_port_windows* spw;
 
-	// Set port speed (Input and Output)
-	switch (uiPortSpeed) {
-		case 9600:
-		case 19200:
-		case 38400:
-		case 57600:
-		case 115200:
-		case 230400:
-		case 460800:
-		break;
-		default:
-			return false;
-	};
+    // Set port speed (Input and Output)
+    switch (uiPortSpeed) {
+        case 9600:
+        case 19200:
+        case 38400:
+        case 57600:
+        case 115200:
+        case 230400:
+        case 460800:
+        break;
+        default:
+            return false;
+    };
 
-	spw = (serial_port_windows*)sp;
-	spw->dcb.BaudRate = uiPortSpeed;
-	bool result = SetCommState(spw->hPort, &spw->dcb);
-	PurgeComm(spw->hPort, PURGE_RXABORT | PURGE_RXCLEAR);
-	return result;
+    spw = (serial_port_windows*)sp;
+    spw->dcb.BaudRate = uiPortSpeed;
+    bool result = SetCommState(spw->hPort, &spw->dcb);
+    PurgeComm(spw->hPort, PURGE_RXABORT | PURGE_RXCLEAR);
+    return result;
 }
 
 uint32_t uart_get_speed(const serial_port sp) {
-	const serial_port_windows* spw = (serial_port_windows*)sp;
-	if (!GetCommState(spw->hPort, (serial_port) & spw->dcb))
-		return spw->dcb.BaudRate;
+    const serial_port_windows* spw = (serial_port_windows*)sp;
+    if (!GetCommState(spw->hPort, (serial_port) & spw->dcb))
+        return spw->dcb.BaudRate;
 
-	return 0;
+    return 0;
 }
 
 bool uart_receive(const serial_port sp, uint8_t* p_rx, size_t pszMaxRxLen, size_t* len) {
-	return ReadFile(((serial_port_windows*)sp)->hPort, p_rx, pszMaxRxLen, (LPDWORD)len, NULL);
+    return ReadFile(((serial_port_windows*)sp)->hPort, p_rx, pszMaxRxLen, (LPDWORD)len, NULL);
 }
 
 bool uart_send(const serial_port sp, const uint8_t* p_tx, const size_t len) {
-	DWORD txlen = 0;
-	return WriteFile(((serial_port_windows*)sp)->hPort, p_tx, len, &txlen, NULL);
+    DWORD txlen = 0;
+    return WriteFile(((serial_port_windows*)sp)->hPort, p_tx, len, &txlen, NULL);
 }
 
 #endif
\ No newline at end of file
diff --git a/zlib/deflate.c b/zlib/deflate.c
index 593f5ebd3..91f1f1dc7 100644
--- a/zlib/deflate.c
+++ b/zlib/deflate.c
@@ -1160,10 +1160,10 @@ local uInt longest_match(s, cur_match)
 {
     unsigned chain_length = s->max_chain_length;/* max hash chain length */
     register Bytef *scan = s->window + s->strstart; /* current string */
-    register Bytef *match;                       /* matched string */
+    register Bytef *match;                      /* matched string */
     register int len;                           /* length of current match */
 #ifdef ZLIB_PM3_TUNED
-	int best_len = 	MIN_MATCH-1;				// lift the restriction on prev-length
+    int best_len = MIN_MATCH-1;                 /* lift the restriction on prev-length */
 #else
     int best_len = s->prev_length;              /* best match length so far */
 #endif
@@ -1737,73 +1737,73 @@ local block_state deflate_fast(s, flush)
 
 #ifdef ZLIB_PM3_TUNED
 local uInt try_harder(s, strstart, lookahead, hash_head)
-	deflate_state *s;
-	uInt strstart;
-	uInt lookahead;
-	IPos hash_head;
+    deflate_state *s;
+    uInt strstart;
+    uInt lookahead;
+    IPos hash_head;
 {
-	uInt strstart_save = s->strstart;
-	s->strstart = strstart;
-	uInt lookahead_save = s->lookahead;
-	s->lookahead = lookahead;
-	uInt ins_h_save = s->ins_h;
-	uInt combined_gain;
-	uInt best_combined_gain = 0;
-	uInt match_length;
-	uInt prev_length = s->prev_length < MIN_MATCH ? 1 : s->prev_length;
-	uInt best_prev_length = prev_length;
-	uInt current_match_start = s->match_start;
-	uInt current_match_length = s->match_length;
+    uInt strstart_save = s->strstart;
+    s->strstart = strstart;
+    uInt lookahead_save = s->lookahead;
+    s->lookahead = lookahead;
+    uInt ins_h_save = s->ins_h;
+    uInt combined_gain;
+    uInt best_combined_gain = 0;
+    uInt match_length;
+    uInt prev_length = s->prev_length < MIN_MATCH ? 1 : s->prev_length;
+    uInt best_prev_length = prev_length;
+    uInt current_match_start = s->match_start;
+    uInt current_match_length = s->match_length;
 
-	do {
+    do {
         if (hash_head != NIL && s->strstart - hash_head <= MAX_DIST(s)) {
-			match_length = longest_match (s, hash_head);
-			/* longest_match() sets match_start */
-		} else {
-			match_length = MIN_MATCH - 1;
-		}
+            match_length = longest_match (s, hash_head);
+            /* longest_match() sets match_start */
+        } else {
+            match_length = MIN_MATCH - 1;
+        }
 #if TOO_FAR <= 32767
-		if (match_length == MIN_MATCH && s->strstart - s->match_start > TOO_FAR) {
-			match_length = MIN_MATCH-1;
-		}
+        if (match_length == MIN_MATCH && s->strstart - s->match_start > TOO_FAR) {
+            match_length = MIN_MATCH-1;
+        }
 #endif
-		if (s->strstart == strstart) {						// store match at current position
-			current_match_length = match_length;
-			current_match_start = s->match_start;
-		}
-		if (s->strstart - strstart + 1 < MIN_MATCH) { 		// previous match reduced to one or two literals
-			combined_gain = 0;								// need one literal per byte: no gain (assuming 8 bits per literal)
-		} else {
-			combined_gain = s->strstart - strstart + 1 - MIN_MATCH;  // (possibly truncated) previous_length - 3 literals
-		}
-		if (match_length < MIN_MATCH) {
-			combined_gain += 0;							// no gain
-		} else {
-			combined_gain += match_length - MIN_MATCH; 	// match_length bytes are coded as three literals
-		}
-		if (combined_gain >= best_combined_gain) {			// in case of a tie we prefer the longer prev_length
-			best_combined_gain = combined_gain;
-			best_prev_length = s->strstart - strstart + 1;
-		}
-		s->strstart++;
-		s->lookahead--;
-		UPDATE_HASH(s, s->ins_h, s->window[(s->strstart) + (MIN_MATCH-1)]);
-		hash_head = s->head[s->ins_h];
-	} while (s->strstart <= strstart-1 + prev_length 			// try to truncate the previous match to 1, 3, ... prev_length
-			&& s->strstart <= s->window_size - MIN_LOOKAHEAD);	// watch out for the end of the input
+        if (s->strstart == strstart) {                      // store match at current position
+            current_match_length = match_length;
+            current_match_start = s->match_start;
+        }
+        if (s->strstart - strstart + 1 < MIN_MATCH) {       // previous match reduced to one or two literals
+            combined_gain = 0;                              // need one literal per byte: no gain (assuming 8 bits per literal)
+        } else {
+            combined_gain = s->strstart - strstart + 1 - MIN_MATCH;  // (possibly truncated) previous_length - 3 literals
+        }
+        if (match_length < MIN_MATCH) {
+            combined_gain += 0;                             // no gain
+        } else {
+            combined_gain += match_length - MIN_MATCH;      // match_length bytes are coded as three literals
+        }
+        if (combined_gain >= best_combined_gain) {          // in case of a tie we prefer the longer prev_length
+            best_combined_gain = combined_gain;
+            best_prev_length = s->strstart - strstart + 1;
+        }
+        s->strstart++;
+        s->lookahead--;
+        UPDATE_HASH(s, s->ins_h, s->window[(s->strstart) + (MIN_MATCH-1)]);
+        hash_head = s->head[s->ins_h];
+    } while (s->strstart <= strstart-1 + prev_length        // try to truncate the previous match to 1, 3, ... prev_length
+            && s->strstart <= s->window_size - MIN_LOOKAHEAD); // watch out for the end of the input
 
-	s->strstart = strstart_save;
-	s->lookahead = lookahead_save;
-	s->ins_h = ins_h_save;
-	s->match_length = current_match_length;
-	s->match_start = current_match_start;
-	if (best_prev_length >= MIN_MATCH) {
-		s->prev_length = best_prev_length;
-		s->match_length = MIN_MATCH - 1;
-	} else {
-		s->prev_length = MIN_MATCH - 1;
-	}
-	return best_combined_gain;
+    s->strstart = strstart_save;
+    s->lookahead = lookahead_save;
+    s->ins_h = ins_h_save;
+    s->match_length = current_match_length;
+    s->match_start = current_match_start;
+    if (best_prev_length >= MIN_MATCH) {
+        s->prev_length = best_prev_length;
+        s->match_length = MIN_MATCH - 1;
+    } else {
+        s->prev_length = MIN_MATCH - 1;
+    }
+    return best_combined_gain;
 }
 #endif
 
@@ -1850,9 +1850,9 @@ local block_state deflate_slow(s, flush)
         s->match_length = MIN_MATCH-1;
 
 #ifdef ZLIB_PM3_TUNED
-		if (s->prev_length < s->max_lazy_match) {
-			try_harder(s, s->strstart, s->lookahead, hash_head);
-		}
+        if (s->prev_length < s->max_lazy_match) {
+            try_harder(s, s->strstart, s->lookahead, hash_head);
+        }
 
 #else
         if (hash_head != NIL && s->prev_length < s->max_lazy_match &&
diff --git a/zlib/inflate.c b/zlib/inflate.c
index 1b3003370..40d9f568f 100644
--- a/zlib/inflate.c
+++ b/zlib/inflate.c
@@ -857,7 +857,7 @@ int flush;
             case 1:                             /* fixed block */
 #ifdef ZLIB_PM3_TUNED
                 strm->msg = (char *)"fixed block coding not supported";
-				state->mode = BAD;
+                state->mode = BAD;
 #else
                 fixedtables(state);
                 Tracev((stderr, "inflate:     fixed codes block%s\n",
diff --git a/zlib/trees.c b/zlib/trees.c
index 9d032bf9c..eff4d8545 100644
--- a/zlib/trees.c
+++ b/zlib/trees.c
@@ -989,7 +989,7 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
 #endif
     } else {
 #endif /* !ZLIB_PM3_TUNED */
-		send_bits(s, (DYN_TREES<<1)+last, 3);
+        send_bits(s, (DYN_TREES<<1)+last, 3);
         send_all_trees(s, s->l_desc.max_code+1, s->d_desc.max_code+1,
                        max_blindex+1);
         compress_block(s, (const ct_data *)s->dyn_ltree,

From 957464ca88da52fbfee44b217a8a31716563b4a0 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 9 Mar 2019 11:19:45 +0100
Subject: [PATCH 0692/1938] armsrc Standalone: fix mix of spaces & tabs

---
 armsrc/Standalone/hf_bog.c       | 390 +++++++++++++--------------
 armsrc/Standalone/hf_colin.c     |  18 +-
 armsrc/Standalone/hf_mattyrun.c  | 410 ++++++++++++++--------------
 armsrc/Standalone/hf_mattyrun.h  |   4 +-
 armsrc/Standalone/hf_young.c     | 414 ++++++++++++++--------------
 armsrc/Standalone/lf_hidbrute.c  | 444 +++++++++++++++----------------
 armsrc/Standalone/lf_proxbrute.c | 244 ++++++++---------
 armsrc/Standalone/lf_samyrun.c   | 196 +++++++-------
 armsrc/Standalone/readme.md      |  80 +++---
 9 files changed, 1100 insertions(+), 1100 deletions(-)

diff --git a/armsrc/Standalone/hf_bog.c b/armsrc/Standalone/hf_bog.c
index 1f62e4c0c..826fab0ee 100644
--- a/armsrc/Standalone/hf_bog.c
+++ b/armsrc/Standalone/hf_bog.c
@@ -28,20 +28,20 @@ from the client to view the stored quadlets.
 #define MAX_PWDS_PER_SESSION 64
 
 uint8_t FindOffsetInFlash() {
-	uint8_t mem[4] = { 0x00, 0x00, 0x00, 0x00 };
-	uint8_t eom[4] = { 0xFF, 0xFF, 0xFF, 0xFF };
-	uint8_t memcnt = 0;
+    uint8_t mem[4] = { 0x00, 0x00, 0x00, 0x00 };
+    uint8_t eom[4] = { 0xFF, 0xFF, 0xFF, 0xFF };
+    uint8_t memcnt = 0;
 
-	while (memcnt < 0xFF)
-	{
-		Flash_ReadData(memcnt, mem, 4);
-		if (memcmp(mem, eom, 4) == 0) {
-			return memcnt;
-		}
-		memcnt += 4;
-	}
+    while (memcnt < 0xFF)
+    {
+        Flash_ReadData(memcnt, mem, 4);
+        if (memcmp(mem, eom, 4) == 0) {
+            return memcnt;
+        }
+        memcnt += 4;
+    }
 
-	return 0; // wrap-around
+    return 0; // wrap-around
 }
 
 void EraseMemory() {
@@ -55,247 +55,247 @@ void EraseMemory() {
 
     if (MF_DBGLEVEL > 1) Dbprintf("[!] Erased flash!");
     FlashStop();
-	SpinDelay(100);
+    SpinDelay(100);
 }
 
 // This is actually copied from SniffIso14443a
 void RAMFUNC SniffAndStore(uint8_t param) {
 
-	iso14443a_setup(FPGA_HF_ISO14443A_SNIFFER);
+    iso14443a_setup(FPGA_HF_ISO14443A_SNIFFER);
 
-	// Allocate memory from BigBuf for some buffers
-	// free all previous allocations first
-	BigBuf_free(); BigBuf_Clear_ext(false);
-	clear_trace();
-	set_tracing(true);
+    // Allocate memory from BigBuf for some buffers
+    // free all previous allocations first
+    BigBuf_free(); BigBuf_Clear_ext(false);
+    clear_trace();
+    set_tracing(true);
 
-	// Array to store the authpwds
-	uint8_t *capturedPwds = BigBuf_malloc(4 * MAX_PWDS_PER_SESSION);
+    // Array to store the authpwds
+    uint8_t *capturedPwds = BigBuf_malloc(4 * MAX_PWDS_PER_SESSION);
 
-	// The command (reader -> tag) that we're receiving.
-	uint8_t *receivedCmd = BigBuf_malloc(MAX_FRAME_SIZE);
-	uint8_t *receivedCmdPar = BigBuf_malloc(MAX_PARITY_SIZE);
+    // The command (reader -> tag) that we're receiving.
+    uint8_t *receivedCmd = BigBuf_malloc(MAX_FRAME_SIZE);
+    uint8_t *receivedCmdPar = BigBuf_malloc(MAX_PARITY_SIZE);
 
-	// The response (tag -> reader) that we're receiving.
-	uint8_t *receivedResp = BigBuf_malloc(MAX_FRAME_SIZE);
-	uint8_t *receivedRespPar = BigBuf_malloc(MAX_PARITY_SIZE);
+    // The response (tag -> reader) that we're receiving.
+    uint8_t *receivedResp = BigBuf_malloc(MAX_FRAME_SIZE);
+    uint8_t *receivedRespPar = BigBuf_malloc(MAX_PARITY_SIZE);
 
-	// The DMA buffer, used to stream samples from the FPGA
-	uint8_t *dmaBuf = BigBuf_malloc(DMA_BUFFER_SIZE);
-	uint8_t *data = dmaBuf;
+    // The DMA buffer, used to stream samples from the FPGA
+    uint8_t *dmaBuf = BigBuf_malloc(DMA_BUFFER_SIZE);
+    uint8_t *data = dmaBuf;
 
-	uint8_t previous_data = 0;
-	int dataLen = 0;
-	bool TagIsActive = false;
-	bool ReaderIsActive = false;
+    uint8_t previous_data = 0;
+    int dataLen = 0;
+    bool TagIsActive = false;
+    bool ReaderIsActive = false;
 
-	// Set up the demodulator for tag -> reader responses.
-	DemodInit(receivedResp, receivedRespPar);
+    // Set up the demodulator for tag -> reader responses.
+    DemodInit(receivedResp, receivedRespPar);
 
-	// Set up the demodulator for the reader -> tag commands
-	UartInit(receivedCmd, receivedCmdPar);
+    // Set up the demodulator for the reader -> tag commands
+    UartInit(receivedCmd, receivedCmdPar);
 
-	// Setup and start DMA.
-	if ( !FpgaSetupSscDma((uint8_t*) dmaBuf, DMA_BUFFER_SIZE) ){
-		if (MF_DBGLEVEL > 1) Dbprintf("FpgaSetupSscDma failed. Exiting");
-		return;
-	}
+    // Setup and start DMA.
+    if ( !FpgaSetupSscDma((uint8_t*) dmaBuf, DMA_BUFFER_SIZE) ){
+        if (MF_DBGLEVEL > 1) Dbprintf("FpgaSetupSscDma failed. Exiting");
+        return;
+    }
 
-	tUart* uart = GetUart();
-	tDemod* demod = GetDemod();
+    tUart* uart = GetUart();
+    tDemod* demod = GetDemod();
 
-	// We won't start recording the frames that we acquire until we trigger;
-	// a good trigger condition to get started is probably when we see a
-	// response from the tag.
-	// triggered == false -- to wait first for card
-	bool triggered = !(param & 0x03);
+    // We won't start recording the frames that we acquire until we trigger;
+    // a good trigger condition to get started is probably when we see a
+    // response from the tag.
+    // triggered == false -- to wait first for card
+    bool triggered = !(param & 0x03);
 
-	uint32_t rsamples = 0;
+    uint32_t rsamples = 0;
 
-	// Current captured passwords counter
-	uint8_t auth_attempts = 0;
+    // Current captured passwords counter
+    uint8_t auth_attempts = 0;
 
-	SpinDelay(50);
+    SpinDelay(50);
 
-	// loop and listen
-	while (!BUTTON_PRESS()) {
+    // loop and listen
+    while (!BUTTON_PRESS()) {
         WDT_HIT();
         LED_A_ON();
 
-		int register readBufDataP = data - dmaBuf;
-		int register dmaBufDataP = DMA_BUFFER_SIZE - AT91C_BASE_PDC_SSC->PDC_RCR;
-		if (readBufDataP <= dmaBufDataP)
-			dataLen = dmaBufDataP - readBufDataP;
-		else
-			dataLen = DMA_BUFFER_SIZE - readBufDataP + dmaBufDataP;
+        int register readBufDataP = data - dmaBuf;
+        int register dmaBufDataP = DMA_BUFFER_SIZE - AT91C_BASE_PDC_SSC->PDC_RCR;
+        if (readBufDataP <= dmaBufDataP)
+            dataLen = dmaBufDataP - readBufDataP;
+        else
+            dataLen = DMA_BUFFER_SIZE - readBufDataP + dmaBufDataP;
 
-		// test for length of buffer
-		if (dataLen > DMA_BUFFER_SIZE) { // TODO: Check if this works properly
-			Dbprintf("[!] blew circular buffer! | datalen %u", dataLen);
-			break;
-		}
-		if (dataLen < 1) continue;
+        // test for length of buffer
+        if (dataLen > DMA_BUFFER_SIZE) { // TODO: Check if this works properly
+            Dbprintf("[!] blew circular buffer! | datalen %u", dataLen);
+            break;
+        }
+        if (dataLen < 1) continue;
 
-		// primary buffer was stopped( <-- we lost data!
-		if (!AT91C_BASE_PDC_SSC->PDC_RCR) {
-			AT91C_BASE_PDC_SSC->PDC_RPR = (uint32_t) dmaBuf;
-			AT91C_BASE_PDC_SSC->PDC_RCR = DMA_BUFFER_SIZE;
-			//Dbprintf("[-] RxEmpty ERROR | data length %d", dataLen); // temporary
-		}
-		// secondary buffer sets as primary, secondary buffer was stopped
-		if (!AT91C_BASE_PDC_SSC->PDC_RNCR) {
-			AT91C_BASE_PDC_SSC->PDC_RNPR = (uint32_t) dmaBuf;
-			AT91C_BASE_PDC_SSC->PDC_RNCR = DMA_BUFFER_SIZE;
-		}
+        // primary buffer was stopped( <-- we lost data!
+        if (!AT91C_BASE_PDC_SSC->PDC_RCR) {
+            AT91C_BASE_PDC_SSC->PDC_RPR = (uint32_t) dmaBuf;
+            AT91C_BASE_PDC_SSC->PDC_RCR = DMA_BUFFER_SIZE;
+            //Dbprintf("[-] RxEmpty ERROR | data length %d", dataLen); // temporary
+        }
+        // secondary buffer sets as primary, secondary buffer was stopped
+        if (!AT91C_BASE_PDC_SSC->PDC_RNCR) {
+            AT91C_BASE_PDC_SSC->PDC_RNPR = (uint32_t) dmaBuf;
+            AT91C_BASE_PDC_SSC->PDC_RNCR = DMA_BUFFER_SIZE;
+        }
 
-		LED_A_OFF();
+        LED_A_OFF();
 
-		// Need two samples to feed Miller and Manchester-Decoder
-		if (rsamples & 0x01) {
+        // Need two samples to feed Miller and Manchester-Decoder
+        if (rsamples & 0x01) {
 
-			if (!TagIsActive) {		// no need to try decoding reader data if the tag is sending
-				uint8_t readerdata = (previous_data & 0xF0) | (*data >> 4);
-				if (MillerDecoding(readerdata, (rsamples-1)*4)) {
-					LED_C_ON();
+            if (!TagIsActive) { // no need to try decoding reader data if the tag is sending
+                uint8_t readerdata = (previous_data & 0xF0) | (*data >> 4);
+                if (MillerDecoding(readerdata, (rsamples-1)*4)) {
+                    LED_C_ON();
 
-					// check - if there is a short 7bit request from reader
-					if ((!triggered) && (param & 0x02) && (uart->len == 1) && (uart->bitCount == 7)) triggered = true;
+                    // check - if there is a short 7bit request from reader
+                    if ((!triggered) && (param & 0x02) && (uart->len == 1) && (uart->bitCount == 7)) triggered = true;
 
-					if (triggered) {
-						if ((receivedCmd) && ((receivedCmd[0] == MIFARE_ULEV1_AUTH) || (receivedCmd[0] == MIFARE_ULC_AUTH_1))) {
-							if (MF_DBGLEVEL > 1) Dbprintf("PWD-AUTH KEY: 0x%02x%02x%02x%02x", receivedCmd[1], receivedCmd[2], receivedCmd[3], receivedCmd[4]);
+                    if (triggered) {
+                        if ((receivedCmd) && ((receivedCmd[0] == MIFARE_ULEV1_AUTH) || (receivedCmd[0] == MIFARE_ULC_AUTH_1))) {
+                            if (MF_DBGLEVEL > 1) Dbprintf("PWD-AUTH KEY: 0x%02x%02x%02x%02x", receivedCmd[1], receivedCmd[2], receivedCmd[3], receivedCmd[4]);
 
-							// temporarily save the captured pwd in our array
-							memcpy(&capturedPwds[4 * auth_attempts], receivedCmd+1, 4);
-							auth_attempts++;
-						}
+                            // temporarily save the captured pwd in our array
+                            memcpy(&capturedPwds[4 * auth_attempts], receivedCmd+1, 4);
+                            auth_attempts++;
+                        }
 
-						if (!LogTrace(receivedCmd,
-										uart->len,
-										uart->startTime*16 - DELAY_READER_AIR2ARM_AS_SNIFFER,
-										uart->endTime*16 - DELAY_READER_AIR2ARM_AS_SNIFFER,
-										uart->parity,
-										true)) break;
-					}
-					/* ready to receive another command. */
-					UartReset();
-					/* reset the demod code, which might have been */
-					/* false-triggered by the commands from the reader. */
-					DemodReset();
-					LED_B_OFF();
-				}
-				ReaderIsActive = (uart->state != STATE_UNSYNCD);
-			}
+                        if (!LogTrace(receivedCmd,
+                                      uart->len,
+                                      uart->startTime*16 - DELAY_READER_AIR2ARM_AS_SNIFFER,
+                                      uart->endTime*16 - DELAY_READER_AIR2ARM_AS_SNIFFER,
+                                      uart->parity,
+                                      true)) break;
+                    }
+                    /* ready to receive another command. */
+                    UartReset();
+                    /* reset the demod code, which might have been */
+                    /* false-triggered by the commands from the reader. */
+                    DemodReset();
+                    LED_B_OFF();
+                }
+                ReaderIsActive = (uart->state != STATE_UNSYNCD);
+            }
 
-			// no need to try decoding tag data if the reader is sending - and we cannot afford the time
-			if (!ReaderIsActive) {
-				uint8_t tagdata = (previous_data << 4) | (*data & 0x0F);
-				if (ManchesterDecoding(tagdata, 0, (rsamples-1)*4)) {
-					LED_B_ON();
+            // no need to try decoding tag data if the reader is sending - and we cannot afford the time
+            if (!ReaderIsActive) {
+                uint8_t tagdata = (previous_data << 4) | (*data & 0x0F);
+                if (ManchesterDecoding(tagdata, 0, (rsamples-1)*4)) {
+                    LED_B_ON();
 
-					if (!LogTrace(receivedResp,
-									demod->len,
-									demod->startTime*16 - DELAY_TAG_AIR2ARM_AS_SNIFFER,
-									demod->endTime*16 - DELAY_TAG_AIR2ARM_AS_SNIFFER,
-									demod->parity,
-									false)) break;
+                    if (!LogTrace(receivedResp,
+                                  demod->len,
+                                  demod->startTime*16 - DELAY_TAG_AIR2ARM_AS_SNIFFER,
+                                  demod->endTime*16 - DELAY_TAG_AIR2ARM_AS_SNIFFER,
+                                  demod->parity,
+                                  false)) break;
 
-					if ((!triggered) && (param & 0x01)) triggered = true;
+                    if ((!triggered) && (param & 0x01)) triggered = true;
 
-					// ready to receive another response.
-					DemodReset();
-					// reset the Miller decoder including its (now outdated) input buffer
-					UartReset();
-					//UartInit(receivedCmd, receivedCmdPar);
-					LED_C_OFF();
-				}
-				TagIsActive = (demod->state != DEMOD_UNSYNCD);
-			}
-		}
+                    // ready to receive another response.
+                    DemodReset();
+                    // reset the Miller decoder including its (now outdated) input buffer
+                    UartReset();
+                    //UartInit(receivedCmd, receivedCmdPar);
+                    LED_C_OFF();
+                }
+                TagIsActive = (demod->state != DEMOD_UNSYNCD);
+            }
+        }
 
-		previous_data = *data;
-		rsamples++;
-		data++;
-		if (data == dmaBuf + DMA_BUFFER_SIZE) {
-			data = dmaBuf;
-		}
-	} // end main loop
+        previous_data = *data;
+        rsamples++;
+        data++;
+        if (data == dmaBuf + DMA_BUFFER_SIZE) {
+            data = dmaBuf;
+        }
+    } // end main loop
 
-	FpgaDisableSscDma();
-	set_tracing(false);
+    FpgaDisableSscDma();
+    set_tracing(false);
 
-	Dbprintf("Stopped sniffing");
+    Dbprintf("Stopped sniffing");
 
-	SpinDelay(200);
+    SpinDelay(200);
 
-	// Write stuff to flash
-	if (auth_attempts > 0) {
-		if (MF_DBGLEVEL > 1) Dbprintf("[!] Authentication attempts = %u", auth_attempts);
+    // Write stuff to flash
+    if (auth_attempts > 0) {
+        if (MF_DBGLEVEL > 1) Dbprintf("[!] Authentication attempts = %u", auth_attempts);
 
-		// Setting the SPI Baudrate to 48MHz to avoid the bit-flip issue (https://github.com/RfidResearchGroup/proxmark3/issues/34)
-		FlashmemSetSpiBaudrate(48000000);
+        // Setting the SPI Baudrate to 48MHz to avoid the bit-flip issue (https://github.com/RfidResearchGroup/proxmark3/issues/34)
+        FlashmemSetSpiBaudrate(48000000);
 
-		// Find the offset in flash mem to continue writing the auth attempts
-		uint8_t memoffset = FindOffsetInFlash();
-		if (MF_DBGLEVEL > 1) Dbprintf("[!] Memory offset = %u", memoffset);
+        // Find the offset in flash mem to continue writing the auth attempts
+        uint8_t memoffset = FindOffsetInFlash();
+        if (MF_DBGLEVEL > 1) Dbprintf("[!] Memory offset = %u", memoffset);
 
-		if ((memoffset + 4 * auth_attempts) > 0xFF)
-		{
-			// We opt to keep the new data only
-			memoffset = 0;
-			if (MF_DBGLEVEL > 1) Dbprintf("[!] Size of total data > 256 bytes. Discarding the old data.");
-		}
+        if ((memoffset + 4 * auth_attempts) > 0xFF)
+        {
+            // We opt to keep the new data only
+            memoffset = 0;
+            if (MF_DBGLEVEL > 1) Dbprintf("[!] Size of total data > 256 bytes. Discarding the old data.");
+        }
 
-		// Get previous data from flash mem
-		uint8_t *previousdata = BigBuf_malloc(memoffset);
-		if (memoffset > 0)
-		{
-			uint16_t readlen = Flash_ReadData(0, previousdata, memoffset);
-			if (MF_DBGLEVEL > 1) Dbprintf("[!] Read %u bytes from flash mem", readlen);
-		}
+        // Get previous data from flash mem
+        uint8_t *previousdata = BigBuf_malloc(memoffset);
+        if (memoffset > 0)
+        {
+            uint16_t readlen = Flash_ReadData(0, previousdata, memoffset);
+            if (MF_DBGLEVEL > 1) Dbprintf("[!] Read %u bytes from flash mem", readlen);
+        }
 
-		// create new bigbuf to hold all data
-		size_t total_size = memoffset + 4 * auth_attempts;
-		uint8_t *total_data = BigBuf_malloc(total_size);
+        // create new bigbuf to hold all data
+        size_t total_size = memoffset + 4 * auth_attempts;
+        uint8_t *total_data = BigBuf_malloc(total_size);
 
-		// Add the previousdata array into total_data array
-		memcpy(total_data, previousdata, memoffset);
+        // Add the previousdata array into total_data array
+        memcpy(total_data, previousdata, memoffset);
 
-		// Copy bytes of capturedPwds immediately following bytes of previousdata
-		memcpy(total_data + memoffset, capturedPwds, 4 * auth_attempts);
+        // Copy bytes of capturedPwds immediately following bytes of previousdata
+        memcpy(total_data + memoffset, capturedPwds, 4 * auth_attempts);
 
-		// Erase first page of flash mem
-		EraseMemory();
+        // Erase first page of flash mem
+        EraseMemory();
 
-		// Write total data to flash mem
-		uint16_t writelen = Flash_WriteData(0, total_data, memoffset + 4 * auth_attempts);
-		if (MF_DBGLEVEL > 1) Dbprintf("[!] Wrote %u bytes into flash mem", writelen);
+        // Write total data to flash mem
+        uint16_t writelen = Flash_WriteData(0, total_data, memoffset + 4 * auth_attempts);
+        if (MF_DBGLEVEL > 1) Dbprintf("[!] Wrote %u bytes into flash mem", writelen);
 
                 // If pwd saved successfully, blink led A three times
-		if (writelen > 0) {
-			SpinErr(0, 200, 5); // blink led A
-		}
+        if (writelen > 0) {
+            SpinErr(0, 200, 5); // blink led A
+        }
 
-		SpinDelay(100);
+        SpinDelay(100);
 
-		// Reset the SPI Baudrate to the default value (24MHz)
-		FlashmemSetSpiBaudrate(24000000);
-	}
+        // Reset the SPI Baudrate to the default value (24MHz)
+        FlashmemSetSpiBaudrate(24000000);
+    }
 }
 
 void RunMod() {
 
-	StandAloneMode();
+    StandAloneMode();
 
-	Dbprintf(">>  Bogiton 14a Sniff UL/UL-EV1/NTAG a.k.a BogitoRun Started  <<");
-	Dbprintf("Starting to sniff");
+    Dbprintf(">>  Bogiton 14a Sniff UL/UL-EV1/NTAG a.k.a BogitoRun Started  <<");
+    Dbprintf("Starting to sniff");
 
-	// param:
-	// bit 0 - trigger from first card answer
-	// bit 1 - trigger from first reader 7-bit request
-	SniffAndStore(0);
-	LEDsoff();
-	SpinDelay(300);
-	Dbprintf("- [ End ] -> You can take shell back ...");
-	Dbprintf("- [  !  ] -> use 'script run read_pwd_mem' to print passwords");
+    // param:
+    // bit 0 - trigger from first card answer
+    // bit 1 - trigger from first reader 7-bit request
+    SniffAndStore(0);
+    LEDsoff();
+    SpinDelay(300);
+    Dbprintf("- [ End ] -> You can take shell back ...");
+    Dbprintf("- [  !  ] -> use 'script run read_pwd_mem' to print passwords");
 }
diff --git a/armsrc/Standalone/hf_colin.c b/armsrc/Standalone/hf_colin.c
index c1b8d65ab..229236376 100644
--- a/armsrc/Standalone/hf_colin.c
+++ b/armsrc/Standalone/hf_colin.c
@@ -171,8 +171,8 @@ void WriteTagToFlash(uint8_t index, size_t size)
 
     while (bytes_remaining > 0)
     {
-		Flash_CheckBusy(BUSY_TIMEOUT);
-		Flash_WriteEnable();
+        Flash_CheckBusy(BUSY_TIMEOUT);
+        Flash_WriteEnable();
 
         uint32_t bytes_in_packet = MIN(FLASH_MEM_BLOCK_SIZE, bytes_remaining);
 
@@ -210,7 +210,7 @@ void WriteTagToFlash(uint8_t index, size_t size)
 
 void RunMod()
 {
-	StandAloneMode();
+    StandAloneMode();
     FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
 
     currline = 20;
@@ -323,12 +323,12 @@ ACCBITS : 796788[00]+VALUE
     {
         for (uint16_t sectorNo = 0; sectorNo < sectorsCnt; sectorNo++)
         {
-			foundKey[t][sectorNo][0] = 0xFF;
-			foundKey[t][sectorNo][1] = 0xFF;
-			foundKey[t][sectorNo][2] = 0xFF;
-			foundKey[t][sectorNo][3] = 0xFF;
-			foundKey[t][sectorNo][4] = 0xFF;
-			foundKey[t][sectorNo][5] = 0xFF;
+            foundKey[t][sectorNo][0] = 0xFF;
+            foundKey[t][sectorNo][1] = 0xFF;
+            foundKey[t][sectorNo][2] = 0xFF;
+            foundKey[t][sectorNo][3] = 0xFF;
+            foundKey[t][sectorNo][4] = 0xFF;
+            foundKey[t][sectorNo][5] = 0xFF;
         }
     }
 
diff --git a/armsrc/Standalone/hf_mattyrun.c b/armsrc/Standalone/hf_mattyrun.c
index 1f3d4b70c..1061d9bfe 100644
--- a/armsrc/Standalone/hf_mattyrun.c
+++ b/armsrc/Standalone/hf_mattyrun.c
@@ -215,244 +215,244 @@ static int saMifareChkKeys(uint8_t blockNo, uint8_t keyType, bool clearTrace, ui
 
 
 void RunMod() {
-	StandAloneMode();
-	Dbprintf(">>  Matty mifare chk/dump/sim  a.k.a MattyRun Started  <<");
+    StandAloneMode();
+    Dbprintf(">>  Matty mifare chk/dump/sim  a.k.a MattyRun Started  <<");
     FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
 
-	/*
-		It will check if the keys from the attacked tag are a subset from
-		the hardcoded set of keys inside of the ARM. If this is the case
-		then it will load the keys into the emulator memory and also the
-		content of the victim tag, to finally simulate it.
+    /*
+        It will check if the keys from the attacked tag are a subset from
+        the hardcoded set of keys inside of the ARM. If this is the case
+        then it will load the keys into the emulator memory and also the
+        content of the victim tag, to finally simulate it.
 
-		Alternatively, it can be dumped into a blank card.
+        Alternatively, it can be dumped into a blank card.
 
-		This source code has been tested only in Mifare 1k.
+        This source code has been tested only in Mifare 1k.
 
-		If you're using the proxmark connected to a device that has an OS, and you're not using the proxmark3 client to see the debug
-		messages, you MUST uncomment usb_disable().
-	*/
+        If you're using the proxmark connected to a device that has an OS, and you're not using the proxmark3 client to see the debug
+        messages, you MUST uncomment usb_disable().
+    */
 
-	// Comment this line below if you want to see debug messages.
+    // Comment this line below if you want to see debug messages.
     // usb_disable();
 
     /*
-		Pseudo-configuration block.
+        Pseudo-configuration block.
     */
-	bool printKeys = false; 		// Prints keys
-	bool transferToEml = true; 		// Transfer keys to emulator memory
-	bool ecfill = true; 			// Fill emulator memory with cards content.
-	bool simulation = true; 		// Simulates an exact copy of the target tag
-	bool fillFromEmulator = false; 	// Dump emulator memory.
+    bool printKeys = false;         // Prints keys
+    bool transferToEml = true;      // Transfer keys to emulator memory
+    bool ecfill = true;             // Fill emulator memory with cards content.
+    bool simulation = true;         // Simulates an exact copy of the target tag
+    bool fillFromEmulator = false;  // Dump emulator memory.
 
 
-	uint16_t mifare_size = 1024; 	// Mifare 1k (only 1k supported for now)
-	uint8_t sectorSize = 64; 		// 1k's sector size is 64 bytes.
-	uint8_t blockNo = 3; 			// Security block is number 3 for each sector.
-	uint8_t sectorsCnt = (mifare_size/sectorSize);
-	uint8_t keyType = 2; 			// Keytype buffer
-	uint64_t key64; 				// Defines current key
-	uint8_t *keyBlock = NULL; 		// Where the keys will be held in memory.
-	uint8_t stKeyBlock = 20; 		// Set the quantity of keys in the block.
-	uint8_t filled = 0; 			// Used to check if the memory was filled with success.
-	bool keyFound = false;
+    uint16_t mifare_size = 1024;    // Mifare 1k (only 1k supported for now)
+    uint8_t sectorSize = 64;        // 1k's sector size is 64 bytes.
+    uint8_t blockNo = 3;            // Security block is number 3 for each sector.
+    uint8_t sectorsCnt = (mifare_size/sectorSize);
+    uint8_t keyType = 2;            // Keytype buffer
+    uint64_t key64;                 // Defines current key
+    uint8_t *keyBlock = NULL;       // Where the keys will be held in memory.
+    uint8_t stKeyBlock = 20;        // Set the quantity of keys in the block.
+    uint8_t filled = 0;             // Used to check if the memory was filled with success.
+    bool keyFound = false;
 
-	/*
-		Set of keys to be used.
-	*/
-	uint64_t mfKeys[] = {
-		0xffffffffffff, // Default key
-		0x000000000000, // Blank key
-		0xa0a1a2a3a4a5, // NFCForum MAD key
-		0xb0b1b2b3b4b5,
-		0xaabbccddeeff,
-		0x4d3a99c351dd,
-		0x1a982c7e459a,
-		0xd3f7d3f7d3f7,
-		0x714c5c886e97,
-		0x587ee5f9350f,
-		0xa0478cc39091,
-		0x533cb6c723f6,
-		0x8fd0a4f256e9,
-	};
+    /*
+        Set of keys to be used.
+    */
+    uint64_t mfKeys[] = {
+        0xffffffffffff, // Default key
+        0x000000000000, // Blank key
+        0xa0a1a2a3a4a5, // NFCForum MAD key
+        0xb0b1b2b3b4b5,
+        0xaabbccddeeff,
+        0x4d3a99c351dd,
+        0x1a982c7e459a,
+        0xd3f7d3f7d3f7,
+        0x714c5c886e97,
+        0x587ee5f9350f,
+        0xa0478cc39091,
+        0x533cb6c723f6,
+        0x8fd0a4f256e9,
+    };
 
-	/*
-		This part allocates the byte representation of the
-		keys in keyBlock's memory space .
-	*/
-	keyBlock = BigBuf_malloc(stKeyBlock * 6);
-	int mfKeysCnt = sizeof(mfKeys) / sizeof(uint64_t);
+    /*
+        This part allocates the byte representation of the
+        keys in keyBlock's memory space .
+    */
+    keyBlock = BigBuf_malloc(stKeyBlock * 6);
+    int mfKeysCnt = sizeof(mfKeys) / sizeof(uint64_t);
 
-	for (int mfKeyCounter = 0; mfKeyCounter < mfKeysCnt; mfKeyCounter++) {
-		num_to_bytes(mfKeys[mfKeyCounter], 6, (uint8_t*)(keyBlock + mfKeyCounter * 6));
-	}
+    for (int mfKeyCounter = 0; mfKeyCounter < mfKeysCnt; mfKeyCounter++) {
+        num_to_bytes(mfKeys[mfKeyCounter], 6, (uint8_t*)(keyBlock + mfKeyCounter * 6));
+    }
 
-	/*
-		Pretty print of the keys to be checked.
-	*/
-	if (printKeys) {
-		Dbprintf("[+] Printing mf keys");
-		for (uint8_t keycnt = 0; keycnt < mfKeysCnt; keycnt++)
-			Dbprintf("[-] chk mf key[%2d] %02x%02x%02x%02x%02x%02x", keycnt,
-				(keyBlock + 6*keycnt)[0],(keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2],
-				(keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4],	(keyBlock + 6*keycnt)[5], 6);
-		DbpString("--------------------------------------------------------");
-	}
+    /*
+        Pretty print of the keys to be checked.
+    */
+    if (printKeys) {
+        Dbprintf("[+] Printing mf keys");
+        for (uint8_t keycnt = 0; keycnt < mfKeysCnt; keycnt++)
+            Dbprintf("[-] chk mf key[%2d] %02x%02x%02x%02x%02x%02x", keycnt,
+                (keyBlock + 6*keycnt)[0], (keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2],
+                (keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4], (keyBlock + 6*keycnt)[5], 6);
+        DbpString("--------------------------------------------------------");
+    }
 
-	/*
-		Initialization of validKeys and foundKeys storages.
-		- validKey will store whether the sector has a valid A/B key.
-		- foundKey will store the found A/B key for each sector.
-	*/
-	bool validKey[2][40];
-	uint8_t foundKey[2][40][6];
-	for (uint16_t t = 0; t < 2; t++) {
-		for (uint16_t sectorNo = 0; sectorNo < sectorsCnt; sectorNo++) {
-			validKey[t][sectorNo] = false;
-			for (uint16_t i = 0; i < 6; i++) {
-				foundKey[t][sectorNo][i] = 0xff;
-			}
-		}
-	}
+    /*
+        Initialization of validKeys and foundKeys storages.
+        - validKey will store whether the sector has a valid A/B key.
+        - foundKey will store the found A/B key for each sector.
+    */
+    bool validKey[2][40];
+    uint8_t foundKey[2][40][6];
+    for (uint16_t t = 0; t < 2; t++) {
+        for (uint16_t sectorNo = 0; sectorNo < sectorsCnt; sectorNo++) {
+            validKey[t][sectorNo] = false;
+            for (uint16_t i = 0; i < 6; i++) {
+                foundKey[t][sectorNo][i] = 0xff;
+            }
+        }
+    }
 
-	/*
-		Iterates through each sector checking if there is a correct key.
-	*/
-	int key = -1;
-	int block = 0;
-	bool err = 0;
-	bool allKeysFound = true;
-	uint32_t size = mfKeysCnt;
+    /*
+        Iterates through each sector checking if there is a correct key.
+    */
+    int key = -1;
+    int block = 0;
+    bool err = 0;
+    bool allKeysFound = true;
+    uint32_t size = mfKeysCnt;
 
-	for (int type = !keyType; type < 2 && !err; keyType == 2 ? (type++) : (type = 2)) {
-		block = blockNo;
-		for (int sec = 0; sec < sectorsCnt && !err; ++sec) {
-			Dbprintf("\tCurrent sector:%3d, block:%3d, key type: %c, key count: %i ", sec, block, type ? 'B':'A', mfKeysCnt);
-			key = saMifareChkKeys(block, type, true, size, &keyBlock[0], &key64);
-			if (key == -1) {
-				LED(LED_RED, 50); //red
-				Dbprintf("\t✕ Key not found for this sector!");
-				allKeysFound = false;
-				// break;
-			} else if (key == -2) {
-				err = 1; // Can't select card.
-				break;
-			} else {
-				num_to_bytes(key64, 6, foundKey[type][sec]);
-				validKey[type][sec] = true;
-				keyFound = true;
-				Dbprintf("\t✓ Found valid key: [%02x%02x%02x%02x%02x%02x]\n",
-					(keyBlock + 6*key)[0], (keyBlock + 6*key)[1], (keyBlock + 6*key)[2],
-					(keyBlock + 6*key)[3], (keyBlock + 6*key)[4], (keyBlock + 6*key)[5]
-				);
-			}
+    for (int type = !keyType; type < 2 && !err; keyType == 2 ? (type++) : (type = 2)) {
+        block = blockNo;
+        for (int sec = 0; sec < sectorsCnt && !err; ++sec) {
+            Dbprintf("\tCurrent sector:%3d, block:%3d, key type: %c, key count: %i ", sec, block, type ? 'B':'A', mfKeysCnt);
+            key = saMifareChkKeys(block, type, true, size, &keyBlock[0], &key64);
+            if (key == -1) {
+                LED(LED_RED, 50); //red
+                Dbprintf("\t✕ Key not found for this sector!");
+                allKeysFound = false;
+                // break;
+            } else if (key == -2) {
+                err = 1; // Can't select card.
+                break;
+            } else {
+                num_to_bytes(key64, 6, foundKey[type][sec]);
+                validKey[type][sec] = true;
+                keyFound = true;
+                Dbprintf("\t✓ Found valid key: [%02x%02x%02x%02x%02x%02x]\n",
+                    (keyBlock + 6*key)[0], (keyBlock + 6*key)[1], (keyBlock + 6*key)[2],
+                    (keyBlock + 6*key)[3], (keyBlock + 6*key)[4], (keyBlock + 6*key)[5]
+                );
+            }
 
-			block < 127 ? (block += 4) : (block += 16);
-		}
-	}
+            block < 127 ? (block += 4) : (block += 16);
+        }
+    }
 
-	/*
-		TODO:
-		- Get UID from tag and set accordingly in emulator memory and call mifare1ksim with right flags (iceman)
-	*/
-	if (!allKeysFound && keyFound) {
-		Dbprintf("\t✕ There's currently no nested attack in MattyRun, sorry!");
-		LED_C_ON(); //red
-		LED_A_ON(); //yellow
-		// no room to run nested attack on device (iceman)
-		// Do nested attack, set allKeysFound = true;
-		// allKeysFound = true;
-	} else {
-		Dbprintf("\t✕ There's nothing I can do without at least a one valid key, sorry!");
-		LED_C_ON(); //red
-	}
+    /*
+        TODO:
+        - Get UID from tag and set accordingly in emulator memory and call mifare1ksim with right flags (iceman)
+    */
+    if (!allKeysFound && keyFound) {
+        Dbprintf("\t✕ There's currently no nested attack in MattyRun, sorry!");
+        LED_C_ON(); //red
+        LED_A_ON(); //yellow
+        // no room to run nested attack on device (iceman)
+        // Do nested attack, set allKeysFound = true;
+        // allKeysFound = true;
+    } else {
+        Dbprintf("\t✕ There's nothing I can do without at least a one valid key, sorry!");
+        LED_C_ON(); //red
+    }
 
-	/*
-		If enabled, transfers found keys to memory and loads target content in emulator memory. Then it simulates to be the tag it has basically cloned.
-	*/
-	if ((transferToEml) && (allKeysFound)) {
+    /*
+        If enabled, transfers found keys to memory and loads target content in emulator memory. Then it simulates to be the tag it has basically cloned.
+    */
+    if ((transferToEml) && (allKeysFound)) {
 
-		emlClearMem();
+        emlClearMem();
 
-		uint8_t mblock[16];
-		for (uint16_t sectorNo = 0; sectorNo < sectorsCnt; sectorNo++) {
-			if (validKey[0][sectorNo] || validKey[1][sectorNo]) {
-				emlGetMem(mblock, FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 1); // data, block num, blocks count (max 4)
-					for (uint16_t t = 0; t < 2; t++) {
-						if (validKey[t][sectorNo]) {
-							memcpy(mblock + t*10, foundKey[t][sectorNo], 6);
-						}
-					}
-					emlSetMem(mblock, FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 1);
-				}
-			}
-		Dbprintf("\t✓ Found keys have been transferred to the emulator memory.");
-		if (ecfill) {
+        uint8_t mblock[16];
+        for (uint16_t sectorNo = 0; sectorNo < sectorsCnt; sectorNo++) {
+            if (validKey[0][sectorNo] || validKey[1][sectorNo]) {
+                emlGetMem(mblock, FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 1); // data, block num, blocks count (max 4)
+                    for (uint16_t t = 0; t < 2; t++) {
+                        if (validKey[t][sectorNo]) {
+                            memcpy(mblock + t*10, foundKey[t][sectorNo], 6);
+                        }
+                    }
+                    emlSetMem(mblock, FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 1);
+                }
+            }
+        Dbprintf("\t✓ Found keys have been transferred to the emulator memory.");
+        if (ecfill) {
 
-			Dbprintf("\tFilling in with key A.");
-			MifareECardLoad(sectorsCnt, 0, 0, &filled);
-			if (filled != 1) {
-				Dbprintf("\t✕ Failed filling with A.");
-			}
+            Dbprintf("\tFilling in with key A.");
+            MifareECardLoad(sectorsCnt, 0, 0, &filled);
+            if (filled != 1) {
+                Dbprintf("\t✕ Failed filling with A.");
+            }
 
-			Dbprintf("\tFilling in with key B.");
-			MifareECardLoad(sectorsCnt, 1, 0, &filled);
-			if (filled != 1) {
-				Dbprintf("\t✕ Failed filling with B.");
-			}
+            Dbprintf("\tFilling in with key B.");
+            MifareECardLoad(sectorsCnt, 1, 0, &filled);
+            if (filled != 1) {
+                Dbprintf("\t✕ Failed filling with B.");
+            }
 
-			if ((filled == 1) && simulation) {
-				Dbprintf("\t✓ Filled, simulation started.");
+            if ((filled == 1) && simulation) {
+                Dbprintf("\t✓ Filled, simulation started.");
 
-				// This will tell the fpga to emulate using previous keys and current target tag content.
-				Dbprintf("\t Press button to abort simulation at anytime.");
+                // This will tell the fpga to emulate using previous keys and current target tag content.
+                Dbprintf("\t Press button to abort simulation at anytime.");
 
-				LED_B_ON(); // green
-				// assuming arg0==0,  use hardcoded uid 0xdeadbeaf
-				Mifare1ksim( FLAG_4B_UID_IN_DATA | FLAG_UID_IN_EMUL, 0, 0, uid);
-				LED_B_OFF();
+                LED_B_ON(); // green
+                // assuming arg0==0,  use hardcoded uid 0xdeadbeaf
+                Mifare1ksim( FLAG_4B_UID_IN_DATA | FLAG_UID_IN_EMUL, 0, 0, uid);
+                LED_B_OFF();
 
-				/*
-					Needs further testing.
-				*/
-				if (fillFromEmulator) {
-					uint8_t retry = 5, cnt;
-					Dbprintf("\t Trying to dump into blank card.");
-					int flags = 0;
-					LED_A_ON(); //yellow
-					for (int blockNum = 0; blockNum < 16 * 4; blockNum += 1) {
-						cnt = 0;
-						emlGetMem(mblock, blockNum, 1);
-						// switch on field and send magic sequence
-						if (blockNum == 0) flags = 0x08 + 0x02;
+                /*
+                    Needs further testing.
+                */
+                if (fillFromEmulator) {
+                    uint8_t retry = 5, cnt;
+                    Dbprintf("\t Trying to dump into blank card.");
+                    int flags = 0;
+                    LED_A_ON(); //yellow
+                    for (int blockNum = 0; blockNum < 16 * 4; blockNum += 1) {
+                        cnt = 0;
+                        emlGetMem(mblock, blockNum, 1);
+                        // switch on field and send magic sequence
+                        if (blockNum == 0) flags = 0x08 + 0x02;
 
-						// just write
-						if (blockNum == 1) flags = 0;
+                        // just write
+                        if (blockNum == 1) flags = 0;
 
-						// Done. Magic Halt and switch off field.
-						if (blockNum == 16 * 4 - 1) flags = 0x04 + 0x10;
+                        // Done. Magic Halt and switch off field.
+                        if (blockNum == 16 * 4 - 1) flags = 0x04 + 0x10;
 
-						while (!saMifareCSetBlock(0, flags & 0xFE, blockNum, mblock) && cnt <= retry) {
-							cnt++;
-							Dbprintf("\t! Could not write block. Retrying.");
-						}
-						if (cnt == retry) {
-							Dbprintf("\t✕ Retries failed. Aborting.");
-							break;
-						}
-					}
+                        while (!saMifareCSetBlock(0, flags & 0xFE, blockNum, mblock) && cnt <= retry) {
+                            cnt++;
+                            Dbprintf("\t! Could not write block. Retrying.");
+                        }
+                        if (cnt == retry) {
+                            Dbprintf("\t✕ Retries failed. Aborting.");
+                            break;
+                        }
+                    }
 
-					if (!err) {
-						LED_B_ON();
-					} else {
-						LED_C_ON();
-					}
+                    if (!err) {
+                        LED_B_ON();
+                    } else {
+                        LED_C_ON();
+                    }
 
-				}
-			} else if (filled != 1) {
-				Dbprintf("\t✕ Memory could not be filled due to errors.");
-				LED_C_ON();
-			}
-		}
-	}
+                }
+            } else if (filled != 1) {
+                Dbprintf("\t✕ Memory could not be filled due to errors.");
+                LED_C_ON();
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/armsrc/Standalone/hf_mattyrun.h b/armsrc/Standalone/hf_mattyrun.h
index 9bf2166ab..8b33e67c5 100644
--- a/armsrc/Standalone/hf_mattyrun.h
+++ b/armsrc/Standalone/hf_mattyrun.h
@@ -14,8 +14,8 @@
 
 //#include <stdbool.h> // for bool
 #include "standalone.h" // standalone definitions
-#include "apps.h" 		// debugstatements, lfops?
-#include "usb_cmd.h"	// mifare1ksim flags
+#include "apps.h"       // debugstatements, lfops?
+#include "usb_cmd.h"    // mifare1ksim flags
 #include "mifareutil.h"
 
 #define OPTS 2
diff --git a/armsrc/Standalone/hf_young.c b/armsrc/Standalone/hf_young.c
index 3feb77a94..76c7b8c30 100644
--- a/armsrc/Standalone/hf_young.c
+++ b/armsrc/Standalone/hf_young.c
@@ -11,252 +11,252 @@
 #include "hf_young.h"
 
 typedef struct {
-	uint8_t uid[10];
-	uint8_t uidlen;
-	uint8_t atqa[2];
-	uint8_t sak;
+    uint8_t uid[10];
+    uint8_t uidlen;
+    uint8_t atqa[2];
+    uint8_t sak;
 } __attribute__((__packed__)) card_clone_t;
 
 
 void RunMod() {
-	StandAloneMode();
-	Dbprintf(">>  Craig Young Mifare sniff UID/clone uid 2 magic/sim  a.k.a YoungRun Started  <<");
-	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
+    StandAloneMode();
+    Dbprintf(">>  Craig Young Mifare sniff UID/clone uid 2 magic/sim  a.k.a YoungRun Started  <<");
+    FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
 
-	int selected = 0, playing = 0, iGotoRecord = 0, iGotoClone = 0;
-	int cardRead[OPTS] = {0};
+    int selected = 0, playing = 0, iGotoRecord = 0, iGotoClone = 0;
+    int cardRead[OPTS] = {0};
 
-	card_clone_t uids[OPTS];
-	iso14a_card_select_t card[OPTS];
-	uint8_t params = (MAGIC_SINGLE | MAGIC_DATAIN);
+    card_clone_t uids[OPTS];
+    iso14a_card_select_t card[OPTS];
+    uint8_t params = (MAGIC_SINGLE | MAGIC_DATAIN);
 
-	LED(selected + 1, 0);
+    LED(selected + 1, 0);
 
-	for (;;) {
-		WDT_HIT();
-		// exit from Standalone Mode,   send a usbcommand.
-		if (usb_poll_validate_length()) return;
+    for (;;) {
+        WDT_HIT();
+        // exit from Standalone Mode,   send a usbcommand.
+        if (usb_poll_validate_length()) return;
 
-		SpinDelay(300);
+        SpinDelay(300);
 
-		if (iGotoRecord == 1 || cardRead[selected] == 0) {
-			iGotoRecord = 0;
-			LEDsoff();
-			LED(selected + 1, 0);
-			LED(LED_RED2, 0);
+        if (iGotoRecord == 1 || cardRead[selected] == 0) {
+            iGotoRecord = 0;
+            LEDsoff();
+            LED(selected + 1, 0);
+            LED(LED_RED2, 0);
 
-			// record
-			Dbprintf("Enabling iso14443a reader mode for [Bank: %d]...", selected);
-			/* need this delay to prevent catching some weird data */
-			SpinDelay(500);
-			iso14443a_setup(FPGA_HF_ISO14443A_READER_MOD);
+            // record
+            Dbprintf("Enabling iso14443a reader mode for [Bank: %d]...", selected);
+            /* need this delay to prevent catching some weird data */
+            SpinDelay(500);
+            iso14443a_setup(FPGA_HF_ISO14443A_READER_MOD);
 
-			for (;;) {
-				// exit from Standalone Mode,   send a usbcommand.
-				if (usb_poll_validate_length()) return;
+            for (;;) {
+                // exit from Standalone Mode,   send a usbcommand.
+                if (usb_poll_validate_length()) return;
 
-				if (BUTTON_PRESS()) {
-					if (cardRead[selected]) {
-						Dbprintf("Button press detected -- replaying card in bank[%d]", selected);
-						break;
-					} else if (cardRead[(selected+1) % OPTS]) {
-						Dbprintf("Button press detected but no card in bank[%d] so playing from bank[%d]", selected, (selected+1)%OPTS);
-						selected = (selected+1) % OPTS;
-						break; // playing = 1;
-					} else {
-						Dbprintf("Button press detected but no stored tag to play. (Ignoring button)");
-						SpinDelay(300);
-					}
-				}
+                if (BUTTON_PRESS()) {
+                    if (cardRead[selected]) {
+                        Dbprintf("Button press detected -- replaying card in bank[%d]", selected);
+                        break;
+                    } else if (cardRead[(selected+1) % OPTS]) {
+                        Dbprintf("Button press detected but no card in bank[%d] so playing from bank[%d]", selected, (selected+1)%OPTS);
+                        selected = (selected+1) % OPTS;
+                        break; // playing = 1;
+                    } else {
+                        Dbprintf("Button press detected but no stored tag to play. (Ignoring button)");
+                        SpinDelay(300);
+                    }
+                }
 
-				if (!iso14443a_select_card(NULL, &card[selected], NULL, true, 0, true)) {
-					continue;
-				} else {
-					Dbprintf("Read UID:");
-					Dbhexdump(card[selected].uidlen, card[selected].uid, 0);
+                if (!iso14443a_select_card(NULL, &card[selected], NULL, true, 0, true)) {
+                    continue;
+                } else {
+                    Dbprintf("Read UID:");
+                    Dbhexdump(card[selected].uidlen, card[selected].uid, 0);
 
-					if (memcmp(uids[(selected+1)%OPTS].uid, card[selected].uid, card[selected].uidlen ) == 0 ) {
-						Dbprintf("Card selected has same UID as what is stored in the other bank. Skipping.");
-					} else {
-						uids[selected].sak = card[selected].sak;
-						uids[selected].uidlen = card[selected].uidlen;
-						memcpy(uids[selected].uid , card[selected].uid, uids[selected].uidlen);
-						memcpy(uids[selected].atqa, card[selected].atqa, 2);
+                    if (memcmp(uids[(selected+1)%OPTS].uid, card[selected].uid, card[selected].uidlen ) == 0 ) {
+                        Dbprintf("Card selected has same UID as what is stored in the other bank. Skipping.");
+                    } else {
+                        uids[selected].sak = card[selected].sak;
+                        uids[selected].uidlen = card[selected].uidlen;
+                        memcpy(uids[selected].uid , card[selected].uid, uids[selected].uidlen);
+                        memcpy(uids[selected].atqa, card[selected].atqa, 2);
 
-						if (uids[selected].uidlen > 4)
-							Dbprintf("Bank[%d] received a 7-byte UID", selected);
-						else
-							Dbprintf("Bank[%d] received a 4-byte UID", selected);
-						break;
-					}
-				}
-			}
+                        if (uids[selected].uidlen > 4)
+                            Dbprintf("Bank[%d] received a 7-byte UID", selected);
+                        else
+                            Dbprintf("Bank[%d] received a 4-byte UID", selected);
+                        break;
+                    }
+                }
+            }
 
-			Dbprintf("ATQA = %02X%02X", uids[selected].atqa[0], uids[selected].atqa[1]);
-			Dbprintf("SAK = %02X", uids[selected].sak);
-			LEDsoff();
-			LED(LED_GREEN,  200);
-			LED(LED_ORANGE, 200);
-			LED(LED_GREEN,  200);
-			LED(LED_ORANGE, 200);
+            Dbprintf("ATQA = %02X%02X", uids[selected].atqa[0], uids[selected].atqa[1]);
+            Dbprintf("SAK = %02X", uids[selected].sak);
+            LEDsoff();
+            LED(LED_GREEN,  200);
+            LED(LED_ORANGE, 200);
+            LED(LED_GREEN,  200);
+            LED(LED_ORANGE, 200);
 
-			LEDsoff();
-			LED(selected + 1, 0);
+            LEDsoff();
+            LED(selected + 1, 0);
 
-			// Next state is replay:
-			playing = 1;
+            // Next state is replay:
+            playing = 1;
 
-			cardRead[selected] = 1;
-		}
+            cardRead[selected] = 1;
+        }
 
-		/* MF Classic UID clone */
-		else if (iGotoClone==1) {
-			iGotoClone=0;
-			LEDsoff();
-			LED(selected + 1, 0);
-			LED(LED_ORANGE, 250);
+        /* MF Classic UID clone */
+        else if (iGotoClone==1) {
+            iGotoClone=0;
+            LEDsoff();
+            LED(selected + 1, 0);
+            LED(LED_ORANGE, 250);
 
-			// magiccards holds 4bytes uid.  *usually*
-			uint32_t tmpuid = bytes_to_num(uids[selected].uid, 4);
+            // magiccards holds 4bytes uid.  *usually*
+            uint32_t tmpuid = bytes_to_num(uids[selected].uid, 4);
 
-			// record
-			Dbprintf("Preparing to Clone card [Bank: %d]; uid: %08x", selected, tmpuid);
+            // record
+            Dbprintf("Preparing to Clone card [Bank: %d]; uid: %08x", selected, tmpuid);
 
-			// wait for button to be released
-			// Delay cloning until card is in place
-			while (BUTTON_PRESS())
-				WDT_HIT();
+            // wait for button to be released
+            // Delay cloning until card is in place
+            while (BUTTON_PRESS())
+                WDT_HIT();
 
-			Dbprintf("Starting clone. [Bank: %d]", selected);
-			// need this delay to prevent catching some weird data
-			SpinDelay(500);
-			// Begin clone function here:
-			/* Example from client/mifarehost.c for commanding a block write for "magic Chinese" cards:
-					UsbCommand c = {CMD_MIFARE_CSETBLOCK, {params & (0xFE | (uid == NULL ? 0:1)), blockNo, 0}};
-					memcpy(c.d.asBytes, data, 16);
-					SendCommand(&c);
+            Dbprintf("Starting clone. [Bank: %d]", selected);
+            // need this delay to prevent catching some weird data
+            SpinDelay(500);
+            // Begin clone function here:
+            /* Example from client/mifarehost.c for commanding a block write for "magic Chinese" cards:
+                    UsbCommand c = {CMD_MIFARE_CSETBLOCK, {params & (0xFE | (uid == NULL ? 0:1)), blockNo, 0}};
+                    memcpy(c.d.asBytes, data, 16);
+                    SendCommand(&c);
 
-				Block read is similar:
-					UsbCommand c = {CMD_MIFARE_CGETBLOCK, {params, blockNo, 0}};
-				We need to imitate that call with blockNo 0 to set a uid.
+                Block read is similar:
+                    UsbCommand c = {CMD_MIFARE_CGETBLOCK, {params, blockNo, 0}};
+                We need to imitate that call with blockNo 0 to set a uid.
 
-				The get and set commands are handled in this file:
-					// Work with "magic Chinese" card
-					case CMD_MIFARE_CSETBLOCK:
-							MifareCSetBlock(c->arg[0], c->arg[1], c->d.asBytes);
-							break;
-					case CMD_MIFARE_CGETBLOCK:
-							MifareCGetBlock(c->arg[0], c->arg[1], c->d.asBytes);
-							break;
+                The get and set commands are handled in this file:
+                    // Work with "magic Chinese" card
+                    case CMD_MIFARE_CSETBLOCK:
+                            MifareCSetBlock(c->arg[0], c->arg[1], c->d.asBytes);
+                            break;
+                    case CMD_MIFARE_CGETBLOCK:
+                            MifareCGetBlock(c->arg[0], c->arg[1], c->d.asBytes);
+                            break;
 
-				mfCSetUID provides example logic for UID set workflow:
-					-Read block0 from card in field with MifareCGetBlock()
-					-Configure new values without replacing reserved bytes
-							memcpy(block0, uid, 4); // Copy UID bytes from byte array
-							// Mifare UID BCC
-							block0[4] = block0[0]^block0[1]^block0[2]^block0[3]; // BCC on byte 5
-							Bytes 5-7 are reserved SAK and ATQA for mifare classic
-					-Use mfCSetBlock(0, block0, oldUID, wantWipe, MAGIC_SINGLE) to write it
-			*/
-			uint8_t oldBlock0[16] = {0}, newBlock0[16] = {0}, testBlock0[16] = {0};
-			// arg0 = Flags, arg1=blockNo
-			MifareCGetBlock(params, 0, oldBlock0);
-			if (oldBlock0[0] == 0 && oldBlock0[0] == oldBlock0[1]  && oldBlock0[1] == oldBlock0[2] && oldBlock0[2] == oldBlock0[3]) {
-				Dbprintf("No changeable tag detected. Returning to replay mode for bank[%d]", selected);
-				playing = 1;
-			} else {
-				Dbprintf("UID from target tag: %02X%02X%02X%02X", oldBlock0[0], oldBlock0[1], oldBlock0[2], oldBlock0[3]);
-				memcpy(newBlock0, oldBlock0, 16);
+                mfCSetUID provides example logic for UID set workflow:
+                    -Read block0 from card in field with MifareCGetBlock()
+                    -Configure new values without replacing reserved bytes
+                            memcpy(block0, uid, 4); // Copy UID bytes from byte array
+                            // Mifare UID BCC
+                            block0[4] = block0[0]^block0[1]^block0[2]^block0[3]; // BCC on byte 5
+                            Bytes 5-7 are reserved SAK and ATQA for mifare classic
+                    -Use mfCSetBlock(0, block0, oldUID, wantWipe, MAGIC_SINGLE) to write it
+            */
+            uint8_t oldBlock0[16] = {0}, newBlock0[16] = {0}, testBlock0[16] = {0};
+            // arg0 = Flags, arg1=blockNo
+            MifareCGetBlock(params, 0, oldBlock0);
+            if (oldBlock0[0] == 0 && oldBlock0[0] == oldBlock0[1]  && oldBlock0[1] == oldBlock0[2] && oldBlock0[2] == oldBlock0[3]) {
+                Dbprintf("No changeable tag detected. Returning to replay mode for bank[%d]", selected);
+                playing = 1;
+            } else {
+                Dbprintf("UID from target tag: %02X%02X%02X%02X", oldBlock0[0], oldBlock0[1], oldBlock0[2], oldBlock0[3]);
+                memcpy(newBlock0, oldBlock0, 16);
 
-				// Copy uid for bank (2nd is for longer UIDs not supported if classic)
-				memcpy(newBlock0, uids[selected].uid, 4);
-				newBlock0[4] = newBlock0[0] ^ newBlock0[1] ^ newBlock0[2] ^ newBlock0[3];
+                // Copy uid for bank (2nd is for longer UIDs not supported if classic)
+                memcpy(newBlock0, uids[selected].uid, 4);
+                newBlock0[4] = newBlock0[0] ^ newBlock0[1] ^ newBlock0[2] ^ newBlock0[3];
 
-				// arg0 = workFlags, arg1 = blockNo, datain
-				MifareCSetBlock(params, 0, newBlock0);
-				MifareCGetBlock(params, 0, testBlock0);
+                // arg0 = workFlags, arg1 = blockNo, datain
+                MifareCSetBlock(params, 0, newBlock0);
+                MifareCGetBlock(params, 0, testBlock0);
 
-				if (memcmp(testBlock0, newBlock0, 16)==0) {
-					DbpString("Cloned successfull!");
-					cardRead[selected] = 0; // Only if the card was cloned successfully should we clear it
-					playing = 0;
-					iGotoRecord = 1;
-					selected = (selected + 1) % OPTS;
-				} else {
-					Dbprintf("Clone failed. Back to replay mode on bank[%d]", selected);
-					playing = 1;
-				}
-			}
-			LEDsoff();
-			LED(selected + 1, 0);
-		}
+                if (memcmp(testBlock0, newBlock0, 16)==0) {
+                    DbpString("Cloned successfull!");
+                    cardRead[selected] = 0; // Only if the card was cloned successfully should we clear it
+                    playing = 0;
+                    iGotoRecord = 1;
+                    selected = (selected + 1) % OPTS;
+                } else {
+                    Dbprintf("Clone failed. Back to replay mode on bank[%d]", selected);
+                    playing = 1;
+                }
+            }
+            LEDsoff();
+            LED(selected + 1, 0);
+        }
 
-		// Change where to record (or begin playing)
-		// button_pressed == BUTTON_SINGLE_CLICK && cardRead[selected])
-		else if (playing==1) {
-			LEDsoff();
-			LED(selected + 1, 0);
+        // Change where to record (or begin playing)
+        // button_pressed == BUTTON_SINGLE_CLICK && cardRead[selected])
+        else if (playing==1) {
+            LEDsoff();
+            LED(selected + 1, 0);
 
-			// Begin transmitting
-			LED(LED_GREEN, 0);
-			DbpString("Playing");
-			for ( ; ; ) {
-				// exit from Standalone Mode,   send a usbcommand.
-				if (usb_poll_validate_length()) return;
+            // Begin transmitting
+            LED(LED_GREEN, 0);
+            DbpString("Playing");
+            for ( ; ; ) {
+                // exit from Standalone Mode,   send a usbcommand.
+                if (usb_poll_validate_length()) return;
 
-				int button_action = BUTTON_HELD(1000);
-				if ( button_action == 0) { // No button action, proceed with sim
+                int button_action = BUTTON_HELD(1000);
+                if ( button_action == 0) { // No button action, proceed with sim
 
-					uint8_t flags = FLAG_4B_UID_IN_DATA;
-					uint8_t data[USB_CMD_DATA_SIZE] = {0}; // in case there is a read command received we shouldn't break
+                    uint8_t flags = FLAG_4B_UID_IN_DATA;
+                    uint8_t data[USB_CMD_DATA_SIZE] = {0}; // in case there is a read command received we shouldn't break
 
-					memcpy(data, uids[selected].uid, uids[selected].uidlen);
+                    memcpy(data, uids[selected].uid, uids[selected].uidlen);
 
-					uint64_t tmpuid = bytes_to_num(uids[selected].uid, uids[selected].uidlen);
+                    uint64_t tmpuid = bytes_to_num(uids[selected].uid, uids[selected].uidlen);
 
-					if (  uids[selected].uidlen == 7 ) {
-						flags = FLAG_7B_UID_IN_DATA;
-						Dbprintf("Simulating ISO14443a tag with uid: %014" PRIx64 " [Bank: %d]", tmpuid, selected);
-					} else {
-						Dbprintf("Simulating ISO14443a tag with uid: %08" PRIx64 " [Bank: %d]", tmpuid, selected);
-					}
+                    if (  uids[selected].uidlen == 7 ) {
+                        flags = FLAG_7B_UID_IN_DATA;
+                        Dbprintf("Simulating ISO14443a tag with uid: %014" PRIx64 " [Bank: %d]", tmpuid, selected);
+                    } else {
+                        Dbprintf("Simulating ISO14443a tag with uid: %08" PRIx64 " [Bank: %d]", tmpuid, selected);
+                    }
 
-					if (uids[selected].sak == 0x08 && uids[selected].atqa[0] == 0x04 && uids[selected].atqa[1] == 0) {
-						DbpString("Mifare Classic 1k");
-						SimulateIso14443aTag(1, flags, data);
-					} else if (uids[selected].sak == 0x18 && uids[selected].atqa[0] == 0x02 && uids[selected].atqa[1] == 0) {
-						DbpString("Mifare Classic 4k (4b uid)");
-						SimulateIso14443aTag(8, flags, data);
-					} else if (uids[selected].sak == 0x08 && uids[selected].atqa[0] == 0x44 && uids[selected].atqa[1] == 0) {
-						DbpString("Mifare Classic 4k (7b uid)");
-						SimulateIso14443aTag(8, flags, data);
-					} else if (uids[selected].sak == 0x00 && uids[selected].atqa[0] == 0x44 && uids[selected].atqa[1] == 0) {
-						DbpString("Mifare Ultralight");
-						SimulateIso14443aTag(2, flags, data);
-					} else if (uids[selected].sak == 0x20 && uids[selected].atqa[0] == 0x04 && uids[selected].atqa[1] == 0x03) {
-						DbpString("Mifare DESFire");
-						SimulateIso14443aTag(3, flags, data);
-					} else {
-						Dbprintf("Unrecognized tag type -- defaulting to Mifare Classic emulation");
-						SimulateIso14443aTag(1, flags, data);
-					}
+                    if (uids[selected].sak == 0x08 && uids[selected].atqa[0] == 0x04 && uids[selected].atqa[1] == 0) {
+                        DbpString("Mifare Classic 1k");
+                        SimulateIso14443aTag(1, flags, data);
+                    } else if (uids[selected].sak == 0x18 && uids[selected].atqa[0] == 0x02 && uids[selected].atqa[1] == 0) {
+                        DbpString("Mifare Classic 4k (4b uid)");
+                        SimulateIso14443aTag(8, flags, data);
+                    } else if (uids[selected].sak == 0x08 && uids[selected].atqa[0] == 0x44 && uids[selected].atqa[1] == 0) {
+                        DbpString("Mifare Classic 4k (7b uid)");
+                        SimulateIso14443aTag(8, flags, data);
+                    } else if (uids[selected].sak == 0x00 && uids[selected].atqa[0] == 0x44 && uids[selected].atqa[1] == 0) {
+                        DbpString("Mifare Ultralight");
+                        SimulateIso14443aTag(2, flags, data);
+                    } else if (uids[selected].sak == 0x20 && uids[selected].atqa[0] == 0x04 && uids[selected].atqa[1] == 0x03) {
+                        DbpString("Mifare DESFire");
+                        SimulateIso14443aTag(3, flags, data);
+                    } else {
+                        Dbprintf("Unrecognized tag type -- defaulting to Mifare Classic emulation");
+                        SimulateIso14443aTag(1, flags, data);
+                    }
 
-				} else if (button_action == BUTTON_SINGLE_CLICK) {
-					selected = (selected + 1) % OPTS;
-					Dbprintf("Done playing. Switching to record mode on bank %d", selected);
-					iGotoRecord = 1;
-					break;
-				} else if (button_action == BUTTON_HOLD) {
-					Dbprintf("Playtime over. Begin cloning...");
-					iGotoClone = 1;
-					break;
-				}
-			}
+                } else if (button_action == BUTTON_SINGLE_CLICK) {
+                    selected = (selected + 1) % OPTS;
+                    Dbprintf("Done playing. Switching to record mode on bank %d", selected);
+                    iGotoRecord = 1;
+                    break;
+                } else if (button_action == BUTTON_HOLD) {
+                    Dbprintf("Playtime over. Begin cloning...");
+                    iGotoClone = 1;
+                    break;
+                }
+            }
 
-			/* We pressed a button so ignore it here with a delay */
-			SpinDelay(300);
-			LEDsoff();
-			LED(selected + 1, 0);
-		}
-	}
+            /* We pressed a button so ignore it here with a delay */
+            SpinDelay(300);
+            LEDsoff();
+            LED(selected + 1, 0);
+        }
+    }
 }
\ No newline at end of file
diff --git a/armsrc/Standalone/lf_hidbrute.c b/armsrc/Standalone/lf_hidbrute.c
index f8b41771c..b730246fa 100644
--- a/armsrc/Standalone/lf_hidbrute.c
+++ b/armsrc/Standalone/lf_hidbrute.c
@@ -28,296 +28,296 @@
 
 // samy's sniff and repeat routine for LF
 void RunMod() {
-	StandAloneMode();
-	Dbprintf(">>  LF HID corporate bruteforce a.k.a CorporateBrute Started  <<");
-	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
+    StandAloneMode();
+    Dbprintf(">>  LF HID corporate bruteforce a.k.a CorporateBrute Started  <<");
+    FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
 
-	uint32_t high[OPTS], low[OPTS];
-	int selected = 0;
-	int playing = 0;
-	int cardRead = 0;
+    uint32_t high[OPTS], low[OPTS];
+    int selected = 0;
+    int playing = 0;
+    int cardRead = 0;
 
-	// Turn on selected LED
-	LED(selected + 1, 0);
+    // Turn on selected LED
+    LED(selected + 1, 0);
 
-	for (;;) {
-		WDT_HIT();
+    for (;;) {
+        WDT_HIT();
 
-		// exit from SamyRun,   send a usbcommand.
-		if (usb_poll_validate_length()) break;
+        // exit from SamyRun,   send a usbcommand.
+        if (usb_poll_validate_length()) break;
 
-		// Was our button held down or pressed?
-		int button_pressed = BUTTON_HELD(1000);
-		SpinDelay(300);
+        // Was our button held down or pressed?
+        int button_pressed = BUTTON_HELD(1000);
+        SpinDelay(300);
 
-		// Button was held for a second, begin recording
-		if (button_pressed > 0 && cardRead == 0) {
-			LEDsoff();
-			LED(selected + 1, 0);
-			LED(LED_RED2, 0);
+        // Button was held for a second, begin recording
+        if (button_pressed > 0 && cardRead == 0) {
+            LEDsoff();
+            LED(selected + 1, 0);
+            LED(LED_RED2, 0);
 
-			// record
-			DbpString("[=] starting recording");
+            // record
+            DbpString("[=] starting recording");
 
-			// wait for button to be released
-			while(BUTTON_PRESS())
-				WDT_HIT();
+            // wait for button to be released
+            while(BUTTON_PRESS())
+                WDT_HIT();
 
-			/* need this delay to prevent catching some weird data */
-			SpinDelay(500);
+            /* need this delay to prevent catching some weird data */
+            SpinDelay(500);
 
-			CmdHIDdemodFSK(1, &high[selected], &low[selected], 0);
-			Dbprintf("[=] recorded %x %x %08x", selected, high[selected], low[selected]);
+            CmdHIDdemodFSK(1, &high[selected], &low[selected], 0);
+            Dbprintf("[=] recorded %x %x %08x", selected, high[selected], low[selected]);
 
-			LEDsoff();
-			LED(selected + 1, 0);
-			// Finished recording
-			// If we were previously playing, set playing off
-			// so next button push begins playing what we recorded
-			playing = 0;
-			cardRead = 1;
-		}
-		else if (button_pressed > 0 && cardRead == 1) {
-			LEDsoff();
-			LED(selected + 1, 0);
-			LED(LED_ORANGE, 0);
+            LEDsoff();
+            LED(selected + 1, 0);
+            // Finished recording
+            // If we were previously playing, set playing off
+            // so next button push begins playing what we recorded
+            playing = 0;
+            cardRead = 1;
+        }
+        else if (button_pressed > 0 && cardRead == 1) {
+            LEDsoff();
+            LED(selected + 1, 0);
+            LED(LED_ORANGE, 0);
 
-			// record
-			Dbprintf("[=] cloning %x %x %08x", selected, high[selected], low[selected]);
+            // record
+            Dbprintf("[=] cloning %x %x %08x", selected, high[selected], low[selected]);
 
-			// wait for button to be released
-			while(BUTTON_PRESS())
-				WDT_HIT();
+            // wait for button to be released
+            while(BUTTON_PRESS())
+                WDT_HIT();
 
-			/* need this delay to prevent catching some weird data */
-			SpinDelay(500);
+            /* need this delay to prevent catching some weird data */
+            SpinDelay(500);
 
-			CopyHIDtoT55x7(0, high[selected], low[selected], 0);
-			Dbprintf("[=] cloned %x %x %08x", selected, high[selected], low[selected]);
+            CopyHIDtoT55x7(0, high[selected], low[selected], 0);
+            Dbprintf("[=] cloned %x %x %08x", selected, high[selected], low[selected]);
 
-			LEDsoff();
-			LED(selected + 1, 0);
-			// Finished recording
+            LEDsoff();
+            LED(selected + 1, 0);
+            // Finished recording
 
-			// If we were previously playing, set playing off
-			// so next button push begins playing what we recorded
-			playing = 0;
-			cardRead = 0;
-		}
+            // If we were previously playing, set playing off
+            // so next button push begins playing what we recorded
+            playing = 0;
+            cardRead = 0;
+        }
 
-		// Change where to record (or begin playing)
-		else if (button_pressed) {
-			// Next option if we were previously playing
-			if (playing)
-				selected = (selected + 1) % OPTS;
+        // Change where to record (or begin playing)
+        else if (button_pressed) {
+            // Next option if we were previously playing
+            if (playing)
+                selected = (selected + 1) % OPTS;
 
-			playing = !playing;
+            playing = !playing;
 
-			LEDsoff();
-			LED(selected + 1, 0);
+            LEDsoff();
+            LED(selected + 1, 0);
 
-			// Begin transmitting
-			if (playing && selected != 2) {
+            // Begin transmitting
+            if (playing && selected != 2) {
 
-				LED(LED_GREEN, 0);
-				DbpString("[=] playing");
+                LED(LED_GREEN, 0);
+                DbpString("[=] playing");
 
-				// wait for button to be released
-				while (BUTTON_PRESS())
-					WDT_HIT();
+                // wait for button to be released
+                while (BUTTON_PRESS())
+                    WDT_HIT();
 
-				Dbprintf("[=] %x %x %08x", selected, high[selected], low[selected]);
-				CmdHIDsimTAG(high[selected], low[selected], 0);
-				DbpString("[=] done playing");
+                Dbprintf("[=] %x %x %08x", selected, high[selected], low[selected]);
+                CmdHIDsimTAG(high[selected], low[selected], 0);
+                DbpString("[=] done playing");
 
-				if (BUTTON_HELD(1000) > 0)
-					goto out;
+                if (BUTTON_HELD(1000) > 0)
+                    goto out;
 
-				/* We pressed a button so ignore it here with a delay */
-				SpinDelay(300);
+                /* We pressed a button so ignore it here with a delay */
+                SpinDelay(300);
 
-				// when done, we're done playing, move to next option
-				selected = (selected + 1) % OPTS;
-				playing = !playing;
-				LEDsoff();
-				LED(selected + 1, 0);
-			}
-			else if (playing && selected == 2)
-			{
-				// Now it work only with HID Corporate 1000 (35bit), but is easily extensible to others RFID.
-				// It is necessary only to calculate the correct parity.
+                // when done, we're done playing, move to next option
+                selected = (selected + 1) % OPTS;
+                playing = !playing;
+                LEDsoff();
+                LED(selected + 1, 0);
+            }
+            else if (playing && selected == 2)
+            {
+                // Now it work only with HID Corporate 1000 (35bit), but is easily extensible to others RFID.
+                // It is necessary only to calculate the correct parity.
 
-				// Brute force code
-				// Check if the badge is an HID Corporate 1000
-				if( (high[selected] & 0xFFFFFFF8) != 0x28 ) {
-					DbpString("[-] Card is not a HID Corporate 1000. Skipping bruteforce.");
-					continue;
-				}
+                // Brute force code
+                // Check if the badge is an HID Corporate 1000
+                if( (high[selected] & 0xFFFFFFF8) != 0x28 ) {
+                    DbpString("[-] Card is not a HID Corporate 1000. Skipping bruteforce.");
+                    continue;
+                }
 
-				LED(LED_GREEN, 0);
-				DbpString("[=] entering bruteforce mode");
-				// wait for button to be released
-				while (BUTTON_PRESS())
-					WDT_HIT();
+                LED(LED_GREEN, 0);
+                DbpString("[=] entering bruteforce mode");
+                // wait for button to be released
+                while (BUTTON_PRESS())
+                    WDT_HIT();
 
-				// Calculate Facility Code and Card Number from high and low
-				uint32_t cardnum = (low[selected] >> 1) & 0xFFFFF;
-				uint32_t fc = ((high[selected] & 1 ) << 11 ) | (low[selected] >> 21);
-				uint32_t original_cardnum = cardnum;
+                // Calculate Facility Code and Card Number from high and low
+                uint32_t cardnum = (low[selected] >> 1) & 0xFFFFF;
+                uint32_t fc = ((high[selected] & 1 ) << 11 ) | (low[selected] >> 21);
+                uint32_t original_cardnum = cardnum;
 
-				Dbprintf("[=] Proxbrute - starting decrementing card number");
+                Dbprintf("[=] Proxbrute - starting decrementing card number");
 
-				while (cardnum >= 0) {
+                while (cardnum >= 0) {
 
-					// Needed for exiting from proxbrute when button is pressed
-					if (BUTTON_PRESS()) {
-						if (BUTTON_HELD(1000) > 0) {
-							goto out;
-						} else {
-							while (BUTTON_PRESS()) {
-								WDT_HIT();
-							}
-							break;
-						}
-					}
+                    // Needed for exiting from proxbrute when button is pressed
+                    if (BUTTON_PRESS()) {
+                        if (BUTTON_HELD(1000) > 0) {
+                            goto out;
+                        } else {
+                            while (BUTTON_PRESS()) {
+                                WDT_HIT();
+                            }
+                            break;
+                        }
+                    }
 
-					// Decrement Card Number
-					cardnum--;
+                    // Decrement Card Number
+                    cardnum--;
 
-					// Calculate checksum of HID Corporate 1000 and set card number and facility code in high and low variables
-					hid_corporate_1000_calculate_checksum_and_set(&high[selected], &low[selected], cardnum, fc);
+                    // Calculate checksum of HID Corporate 1000 and set card number and facility code in high and low variables
+                    hid_corporate_1000_calculate_checksum_and_set(&high[selected], &low[selected], cardnum, fc);
 
-					// Print actual code to brute
-					Dbprintf("[=] TAG ID: %x%08x (%d) - FC: %u - Card: %u", high[selected], low[selected], (low[selected] >> 1) & 0xFFFF, fc, cardnum);
+                    // Print actual code to brute
+                    Dbprintf("[=] TAG ID: %x%08x (%d) - FC: %u - Card: %u", high[selected], low[selected], (low[selected] >> 1) & 0xFFFF, fc, cardnum);
 
-					CmdHIDsimTAGEx(high[selected], low[selected], 1, 50000);
-				}
+                    CmdHIDsimTAGEx(high[selected], low[selected], 1, 50000);
+                }
 
-				cardnum = original_cardnum;
+                cardnum = original_cardnum;
 
-				Dbprintf("[=] Proxbrute - starting incrementing card number");
+                Dbprintf("[=] Proxbrute - starting incrementing card number");
 
-				while (cardnum <= 0xFFFFF) {
+                while (cardnum <= 0xFFFFF) {
 
-					// Needed for exiting from proxbrute when button is pressed
-					if (BUTTON_PRESS()) {
-						if (BUTTON_HELD(1000) > 0) {
-							goto out;
-						} else {
-							while (BUTTON_PRESS()) { WDT_HIT(); }
-							break;
-						}
-					}
+                    // Needed for exiting from proxbrute when button is pressed
+                    if (BUTTON_PRESS()) {
+                        if (BUTTON_HELD(1000) > 0) {
+                            goto out;
+                        } else {
+                            while (BUTTON_PRESS()) { WDT_HIT(); }
+                            break;
+                        }
+                    }
 
-					// Decrement Card Number
-					cardnum++;
+                    // Decrement Card Number
+                    cardnum++;
 
-					// Calculate checksum of HID Corporate 1000 and set card number and facility code in high and low variables
-					hid_corporate_1000_calculate_checksum_and_set(&high[selected], &low[selected], cardnum, fc);
+                    // Calculate checksum of HID Corporate 1000 and set card number and facility code in high and low variables
+                    hid_corporate_1000_calculate_checksum_and_set(&high[selected], &low[selected], cardnum, fc);
 
-					// Print actual code to brute
-					Dbprintf("[=] TAG ID: %x%08x (%d) - FC: %u - Card: %u", high[selected], low[selected], (low[selected] >> 1) & 0xFFFF, fc, cardnum);
+                    // Print actual code to brute
+                    Dbprintf("[=] TAG ID: %x%08x (%d) - FC: %u - Card: %u", high[selected], low[selected], (low[selected] >> 1) & 0xFFFF, fc, cardnum);
 
-					CmdHIDsimTAGEx(high[selected], low[selected], 1, 50000);
-				}
+                    CmdHIDsimTAGEx(high[selected], low[selected], 1, 50000);
+                }
 
-				DbpString("[=] done bruteforcing");
-				if (BUTTON_HELD(1000) > 0)
-					goto out;
+                DbpString("[=] done bruteforcing");
+                if (BUTTON_HELD(1000) > 0)
+                    goto out;
 
-				/* We pressed a button so ignore it here with a delay */
-				SpinDelay(300);
+                /* We pressed a button so ignore it here with a delay */
+                SpinDelay(300);
 
-				// when done, we're done playing, move to next option
-				selected = (selected + 1) % OPTS;
-				playing = !playing;
-				LEDsoff();
-				LED(selected + 1, 0);
+                // when done, we're done playing, move to next option
+                selected = (selected + 1) % OPTS;
+                playing = !playing;
+                LEDsoff();
+                LED(selected + 1, 0);
 
-			} else {
-				while(BUTTON_PRESS())
-					WDT_HIT();
-			}
-		}
-	}
+            } else {
+                while(BUTTON_PRESS())
+                    WDT_HIT();
+            }
+        }
+    }
 
 out:
-	DbpString("[=] exiting");
-	LEDsoff();
+    DbpString("[=] exiting");
+    LEDsoff();
 }
 
 // Function that calculate next value for the brutforce of HID corporate 1000
 void hid_corporate_1000_calculate_checksum_and_set( uint32_t *high, uint32_t *low, uint32_t cardnum, uint32_t fc) {
 
-	uint32_t new_high = 0;
-	uint32_t new_low = 0;
+    uint32_t new_high = 0;
+    uint32_t new_low = 0;
 
-	// Calculate new high and low base value from card number and facility code, without parity
-	new_low = (fc << 21) | (cardnum << 1);
-	new_high = 0x28 | ((fc >> 11) & 1); // 0x28 is 101000
+    // Calculate new high and low base value from card number and facility code, without parity
+    new_low = (fc << 21) | (cardnum << 1);
+    new_high = 0x28 | ((fc >> 11) & 1); // 0x28 is 101000
 
-	int n_ones;
-	uint32_t i;
+    int n_ones;
+    uint32_t i;
 
-	// Calculating and setting parity bit 34
-	// Select only bit used for parity bit 34 in low number (10110110110110110110110110110110)
-	uint32_t parity_bit_34_low = new_low & 0xB6DB6DB6;
-	n_ones = 0;
-	// Calculate number of ones in low number
-	for ( i = 1; i != 0; i <<= 1) {
-		if( parity_bit_34_low & i )
-			n_ones++;
-	}
-	// Calculate number of ones in high number
-	if (new_high & 1)
-		n_ones++;
+    // Calculating and setting parity bit 34
+    // Select only bit used for parity bit 34 in low number (10110110110110110110110110110110)
+    uint32_t parity_bit_34_low = new_low & 0xB6DB6DB6;
+    n_ones = 0;
+    // Calculate number of ones in low number
+    for ( i = 1; i != 0; i <<= 1) {
+        if( parity_bit_34_low & i )
+            n_ones++;
+    }
+    // Calculate number of ones in high number
+    if (new_high & 1)
+        n_ones++;
 
-	// Set parity bit (Even parity)
-	if (n_ones % 2)
-		new_high = new_high | 0x2;
+    // Set parity bit (Even parity)
+    if (n_ones % 2)
+        new_high = new_high | 0x2;
 
-	// Calculating and setting parity bit 1
-	// Select only bit used for parity bit 1 in low number (01101101101101101101101101101100)
-	uint32_t parity_bit_1_low = new_low & 0x6DB6DB6C;
-	n_ones = 0;
+    // Calculating and setting parity bit 1
+    // Select only bit used for parity bit 1 in low number (01101101101101101101101101101100)
+    uint32_t parity_bit_1_low = new_low & 0x6DB6DB6C;
+    n_ones = 0;
 
-	// Calculate number of ones in low number
-	for ( i=1; i != 0; i <<= 1) {
-		if( parity_bit_1_low & i )
-			n_ones++;
-	}
-	// Calculate number of ones in high number
-	if ( new_high & 0x1)
-		n_ones++;
+    // Calculate number of ones in low number
+    for ( i=1; i != 0; i <<= 1) {
+        if( parity_bit_1_low & i )
+            n_ones++;
+    }
+    // Calculate number of ones in high number
+    if ( new_high & 0x1)
+        n_ones++;
 
-	if ( new_high & 0x2)
-		n_ones++;
+    if ( new_high & 0x2)
+        n_ones++;
 
-	// Set parity bit (Odd parity)
-	if (!(n_ones % 2))
-		new_low = new_low | 0x1;
+    // Set parity bit (Odd parity)
+    if (!(n_ones % 2))
+        new_low = new_low | 0x1;
 
-	// Calculating and setting parity bit 35
-	n_ones = 0;
-	// Calculate number of ones in low number (all bit of low, bitmask unnecessary)
-	for (i = 1; i != 0; i <<= 1) {
-		if ( new_low & i )
-			n_ones++;
-	}
-	// Calculate number of ones in high number
-	if ( new_high & 0x1)
-		n_ones++;
+    // Calculating and setting parity bit 35
+    n_ones = 0;
+    // Calculate number of ones in low number (all bit of low, bitmask unnecessary)
+    for (i = 1; i != 0; i <<= 1) {
+        if ( new_low & i )
+            n_ones++;
+    }
+    // Calculate number of ones in high number
+    if ( new_high & 0x1)
+        n_ones++;
 
-	if ( new_high & 0x2)
-		n_ones++;
+    if ( new_high & 0x2)
+        n_ones++;
 
-	// Set parity bit (Odd parity)
-	if (!(n_ones % 2))
-		new_high = new_high | 0x4;
+    // Set parity bit (Odd parity)
+    if (!(n_ones % 2))
+        new_high = new_high | 0x4;
 
-	// Setting new calculated values
-	*low = new_low;
-	*high = new_high;
+    // Setting new calculated values
+    *low = new_low;
+    *high = new_high;
 }
 
 // prepare a waveform pattern in the buffer based on the ID given then
diff --git a/armsrc/Standalone/lf_proxbrute.c b/armsrc/Standalone/lf_proxbrute.c
index 268a96eec..7d1bdd35d 100644
--- a/armsrc/Standalone/lf_proxbrute.c
+++ b/armsrc/Standalone/lf_proxbrute.c
@@ -13,157 +13,157 @@
 
 // samy's sniff and repeat routine for LF
 void RunMod() {
-	StandAloneMode();
-	Dbprintf(">>  LF HID proxII bruteforce a.k.a ProxBrute Started (Brad Antoniewicz) <<");
-	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
+    StandAloneMode();
+    Dbprintf(">>  LF HID proxII bruteforce a.k.a ProxBrute Started (Brad Antoniewicz) <<");
+    FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
 
-	uint32_t high[OPTS], low[OPTS];
-	int selected = 0;
-	int playing = 0;
-	int cardRead = 0;
+    uint32_t high[OPTS], low[OPTS];
+    int selected = 0;
+    int playing = 0;
+    int cardRead = 0;
 
-	// Turn on selected LED
-	LED(selected + 1, 0);
+    // Turn on selected LED
+    LED(selected + 1, 0);
 
-	for (;;) {
-		WDT_HIT();
+    for (;;) {
+        WDT_HIT();
 
-		// exit from SamyRun,   send a usbcommand.
-		if (usb_poll_validate_length()) break;
+        // exit from SamyRun,   send a usbcommand.
+        if (usb_poll_validate_length()) break;
 
-		// Was our button held down or pressed?
-		int button_pressed = BUTTON_HELD(1000);
-		SpinDelay(300);
+        // Was our button held down or pressed?
+        int button_pressed = BUTTON_HELD(1000);
+        SpinDelay(300);
 
-		// Button was held for a second, begin recording
-		if (button_pressed > 0 && cardRead == 0) {
-			LEDsoff();
-			LED(selected + 1, 0);
-			LED(LED_RED2, 0);
+        // Button was held for a second, begin recording
+        if (button_pressed > 0 && cardRead == 0) {
+            LEDsoff();
+            LED(selected + 1, 0);
+            LED(LED_RED2, 0);
 
-			// record
-			DbpString("[=] starting recording");
+            // record
+            DbpString("[=] starting recording");
 
-			// wait for button to be released
-			while (BUTTON_PRESS())
-				WDT_HIT();
+            // wait for button to be released
+            while (BUTTON_PRESS())
+                WDT_HIT();
 
-			/* need this delay to prevent catching some weird data */
-			SpinDelay(500);
+            /* need this delay to prevent catching some weird data */
+            SpinDelay(500);
 
-			CmdHIDdemodFSK(1, &high[selected], &low[selected], 0);
-			Dbprintf("[=] recorded %x %x %08x", selected, high[selected], low[selected]);
+            CmdHIDdemodFSK(1, &high[selected], &low[selected], 0);
+            Dbprintf("[=] recorded %x %x %08x", selected, high[selected], low[selected]);
 
-			LEDsoff();
-			LED(selected + 1, 0);
-			// Finished recording
-			// If we were previously playing, set playing off
-			// so next button push begins playing what we recorded
-			playing = 0;
-			cardRead = 1;
-		}
-		else if (button_pressed > 0 && cardRead == 1) {
-			LEDsoff();
-			LED(selected + 1, 0);
-			LED(LED_ORANGE, 0);
+            LEDsoff();
+            LED(selected + 1, 0);
+            // Finished recording
+            // If we were previously playing, set playing off
+            // so next button push begins playing what we recorded
+            playing = 0;
+            cardRead = 1;
+        }
+        else if (button_pressed > 0 && cardRead == 1) {
+            LEDsoff();
+            LED(selected + 1, 0);
+            LED(LED_ORANGE, 0);
 
-			// record
-			Dbprintf("[=] cloning %x %x %08x", selected, high[selected], low[selected]);
+            // record
+            Dbprintf("[=] cloning %x %x %08x", selected, high[selected], low[selected]);
 
-			// wait for button to be released
-			while (BUTTON_PRESS())
-				WDT_HIT();
+            // wait for button to be released
+            while (BUTTON_PRESS())
+                WDT_HIT();
 
-			/* need this delay to prevent catching some weird data */
-			SpinDelay(500);
+            /* need this delay to prevent catching some weird data */
+            SpinDelay(500);
 
-			CopyHIDtoT55x7(0, high[selected], low[selected], 0);
-			Dbprintf("[=] cloned %x %x %08x", selected, high[selected], low[selected]);
+            CopyHIDtoT55x7(0, high[selected], low[selected], 0);
+            Dbprintf("[=] cloned %x %x %08x", selected, high[selected], low[selected]);
 
-			LEDsoff();
-			LED(selected + 1, 0);
-			// Finished recording
+            LEDsoff();
+            LED(selected + 1, 0);
+            // Finished recording
 
-			// If we were previously playing, set playing off
-			// so next button push begins playing what we recorded
-			playing = 0;
-			cardRead = 0;
-		}
+            // If we were previously playing, set playing off
+            // so next button push begins playing what we recorded
+            playing = 0;
+            cardRead = 0;
+        }
 
-		// Change where to record (or begin playing)
-		else if (button_pressed) {
-			// Next option if we were previously playing
-			if (playing)
-				selected = (selected + 1) % OPTS;
-			playing = !playing;
+        // Change where to record (or begin playing)
+        else if (button_pressed) {
+            // Next option if we were previously playing
+            if (playing)
+                selected = (selected + 1) % OPTS;
+            playing = !playing;
 
-			LEDsoff();
-			LED(selected + 1, 0);
+            LEDsoff();
+            LED(selected + 1, 0);
 
-			// Begin transmitting
-			if (playing) {
-				LED(LED_GREEN, 0);
-				DbpString("[=] playing");
-				// wait for button to be released
-				while (BUTTON_PRESS())
-					WDT_HIT();
+            // Begin transmitting
+            if (playing) {
+                LED(LED_GREEN, 0);
+                DbpString("[=] playing");
+                // wait for button to be released
+                while (BUTTON_PRESS())
+                    WDT_HIT();
 
-				/* START PROXBRUTE */
+                /* START PROXBRUTE */
 
-				/*
-				ProxBrute - brad a. - foundstone
+                /*
+                ProxBrute - brad a. - foundstone
 
-				Following code is a trivial brute forcer once you read a valid tag
-				the idea is you get a valid tag, then just try and brute force to
-				another priv level. The problem is that it has no idea if the code
-				worked or not, so its a crap shoot. One option is to time how long
-				it takes to get a valid ID then start from scratch every time.
-				*/
-				if ( selected == 1 ) {
-					DbpString("[=] entering ProxBrute Mode");
-					Dbprintf("[=] current Tag: Selected = %x Facility = %08x ID = %08x", selected, high[selected], low[selected]);
-					LED(LED_ORANGE, 0);
-					LED(LED_RED, 0);
-					for (uint16_t i = low[selected]-1; i > 0; i--) {
-						if (BUTTON_PRESS()) {
-							DbpString("[-] told to stop");
-							break;
-						}
+                Following code is a trivial brute forcer once you read a valid tag
+                the idea is you get a valid tag, then just try and brute force to
+                another priv level. The problem is that it has no idea if the code
+                worked or not, so its a crap shoot. One option is to time how long
+                it takes to get a valid ID then start from scratch every time.
+                */
+                if ( selected == 1 ) {
+                    DbpString("[=] entering ProxBrute Mode");
+                    Dbprintf("[=] current Tag: Selected = %x Facility = %08x ID = %08x", selected, high[selected], low[selected]);
+                    LED(LED_ORANGE, 0);
+                    LED(LED_RED, 0);
+                    for (uint16_t i = low[selected]-1; i > 0; i--) {
+                        if (BUTTON_PRESS()) {
+                            DbpString("[-] told to stop");
+                            break;
+                        }
 
-						Dbprintf("[=] trying Facility = %08x ID %08x", high[selected], i);
-						CmdHIDsimTAGEx(high[selected], i, 0, 20000);
-						SpinDelay(500);
-					}
+                        Dbprintf("[=] trying Facility = %08x ID %08x", high[selected], i);
+                        CmdHIDsimTAGEx(high[selected], i, 0, 20000);
+                        SpinDelay(500);
+                    }
 
-				} else {
-					DbpString("[=] RED is lit, not entering ProxBrute Mode");
-					Dbprintf("[=] %x %x %x", selected, high[selected], low[selected]);
-					CmdHIDsimTAGEx(high[selected], low[selected], 0, 20000);
-					DbpString("[=] done playing");
-				}
+                } else {
+                    DbpString("[=] RED is lit, not entering ProxBrute Mode");
+                    Dbprintf("[=] %x %x %x", selected, high[selected], low[selected]);
+                    CmdHIDsimTAGEx(high[selected], low[selected], 0, 20000);
+                    DbpString("[=] done playing");
+                }
 
-				/*   END PROXBRUTE */
+                /*   END PROXBRUTE */
 
 
-				if (BUTTON_HELD(1000) > 0)
-					goto out;
+                if (BUTTON_HELD(1000) > 0)
+                    goto out;
 
-				/* We pressed a button so ignore it here with a delay */
-				SpinDelay(300);
+                /* We pressed a button so ignore it here with a delay */
+                SpinDelay(300);
 
-				// when done, we're done playing, move to next option
-				selected = (selected + 1) % OPTS;
-				playing = !playing;
-				LEDsoff();
-				LED(selected + 1, 0);
-			}
-			else {
-				while (BUTTON_PRESS())
-					WDT_HIT();
-			}
-		}
-	}
+                // when done, we're done playing, move to next option
+                selected = (selected + 1) % OPTS;
+                playing = !playing;
+                LEDsoff();
+                LED(selected + 1, 0);
+            }
+            else {
+                while (BUTTON_PRESS())
+                    WDT_HIT();
+            }
+        }
+    }
 out:
-	DbpString("[=] exiting");
-	LEDsoff();
+    DbpString("[=] exiting");
+    LEDsoff();
 }
\ No newline at end of file
diff --git a/armsrc/Standalone/lf_samyrun.c b/armsrc/Standalone/lf_samyrun.c
index c96a2ced6..8536260ff 100644
--- a/armsrc/Standalone/lf_samyrun.c
+++ b/armsrc/Standalone/lf_samyrun.c
@@ -12,132 +12,132 @@
 
 // samy's sniff and repeat routine for LF
 void RunMod() {
-	StandAloneMode();
-	Dbprintf(">>  LF HID Read/Clone/Sim a.k.a SamyRun Started  <<");
-	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
+    StandAloneMode();
+    Dbprintf(">>  LF HID Read/Clone/Sim a.k.a SamyRun Started  <<");
+    FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
 
-	uint32_t high[OPTS], low[OPTS];
-	int selected = 0;
-	int playing = 0;
-	int cardRead = 0;
-	bool gotCard;
-	// Turn on selected LED
-	LED(selected + 1, 0);
+    uint32_t high[OPTS], low[OPTS];
+    int selected = 0;
+    int playing = 0;
+    int cardRead = 0;
+    bool gotCard;
+    // Turn on selected LED
+    LED(selected + 1, 0);
 
-	for (;;) {
-		WDT_HIT();
+    for (;;) {
+        WDT_HIT();
 
-		// exit from SamyRun,   send a usbcommand.
-		if (usb_poll_validate_length()) break;
+        // exit from SamyRun,   send a usbcommand.
+        if (usb_poll_validate_length()) break;
 
-		// Was our button held down or pressed?
-		int button_pressed = BUTTON_HELD(1000);
+        // Was our button held down or pressed?
+        int button_pressed = BUTTON_HELD(1000);
 
-		Dbprintf("button %d", button_pressed);
-		SpinDelay(300);
+        Dbprintf("button %d", button_pressed);
+        SpinDelay(300);
 
-		// Button was held for a second, begin recording
-		if (button_pressed > 0 && cardRead == 0) {
-			LEDsoff();
-			LED(selected + 1, 0);
-			LED(LED_RED2, 0);
+        // Button was held for a second, begin recording
+        if (button_pressed > 0 && cardRead == 0) {
+            LEDsoff();
+            LED(selected + 1, 0);
+            LED(LED_RED2, 0);
 
-			// record
-			DbpString("[=] starting recording");
+            // record
+            DbpString("[=] starting recording");
 
-			// wait for button to be released
-			while (BUTTON_PRESS())
-				WDT_HIT();
+            // wait for button to be released
+            while (BUTTON_PRESS())
+                WDT_HIT();
 
-			/* need this delay to prevent catching some weird data */
-			SpinDelay(500);
+            /* need this delay to prevent catching some weird data */
+            SpinDelay(500);
 
-			CmdHIDdemodFSK(1, &high[selected], &low[selected], 0);
-			Dbprintf("[=] recorded bank %x | %x %08x", selected, high[selected], low[selected]);
+            CmdHIDdemodFSK(1, &high[selected], &low[selected], 0);
+            Dbprintf("[=] recorded bank %x | %x %08x", selected, high[selected], low[selected]);
 
-			LEDsoff();
-			LED(selected + 1, 0);
-			// Finished recording
-			// If we were previously playing, set playing off
-			// so next button push begins playing what we recorded
-			playing = 0;
-			cardRead = 1;
+            LEDsoff();
+            LED(selected + 1, 0);
+            // Finished recording
+            // If we were previously playing, set playing off
+            // so next button push begins playing what we recorded
+            playing = 0;
+            cardRead = 1;
 
-			gotCard	= true;
-		}
-		else if (button_pressed > 0 && cardRead == 1) {
-			LEDsoff();
-			LED(selected + 1, 0);
-			LED(LED_ORANGE, 0);
+            gotCard = true;
+        }
+        else if (button_pressed > 0 && cardRead == 1) {
+            LEDsoff();
+            LED(selected + 1, 0);
+            LED(LED_ORANGE, 0);
 
-			// record
-			Dbprintf("[=] cloning %x %x %08x", selected, high[selected], low[selected]);
+            // record
+            Dbprintf("[=] cloning %x %x %08x", selected, high[selected], low[selected]);
 
-			// wait for button to be released
-			while (BUTTON_PRESS())
-				WDT_HIT();
+            // wait for button to be released
+            while (BUTTON_PRESS())
+                WDT_HIT();
 
-			/* need this delay to prevent catching some weird data */
-			SpinDelay(500);
+            /* need this delay to prevent catching some weird data */
+            SpinDelay(500);
 
-			CopyHIDtoT55x7(0, high[selected], low[selected], 0);
-			Dbprintf("[=] cloned %x %x %08x", selected, high[selected], low[selected]);
+            CopyHIDtoT55x7(0, high[selected], low[selected], 0);
+            Dbprintf("[=] cloned %x %x %08x", selected, high[selected], low[selected]);
 
-			LEDsoff();
-			LED(selected + 1, 0);
-			// Finished recording
+            LEDsoff();
+            LED(selected + 1, 0);
+            // Finished recording
 
-			// If we were previously playing, set playing off
-			// so next button push begins playing what we recorded
-			playing = 0;
-			cardRead = 0;
-		}
+            // If we were previously playing, set playing off
+            // so next button push begins playing what we recorded
+            playing = 0;
+            cardRead = 0;
+        }
 
-		// Change where to record (or begin playing)
-		else if (button_pressed && gotCard) {
-			// Next option if we were previously playing
-			if (playing)
-				selected = (selected + 1) % OPTS;
+        // Change where to record (or begin playing)
+        else if (button_pressed && gotCard) {
+            // Next option if we were previously playing
+            if (playing)
+                selected = (selected + 1) % OPTS;
 
-			playing = !playing;
+            playing = !playing;
 
-			LEDsoff();
-			LED(selected + 1, 0);
+            LEDsoff();
+            LED(selected + 1, 0);
 
-			// Begin transmitting
-			if (playing) {
+            // Begin transmitting
+            if (playing) {
 
-				LED(LED_GREEN, 0);
-				DbpString("[=] playing");
+                LED(LED_GREEN, 0);
+                DbpString("[=] playing");
 
-				// wait for button to be released
-				while (BUTTON_PRESS())
-					WDT_HIT();
+                // wait for button to be released
+                while (BUTTON_PRESS())
+                    WDT_HIT();
 
-				Dbprintf("[=] %x %x %08x", selected, high[selected], low[selected]);
-				CmdHIDsimTAG(high[selected], low[selected], false);
-				DbpString("[=] done playing");
+                Dbprintf("[=] %x %x %08x", selected, high[selected], low[selected]);
+                CmdHIDsimTAG(high[selected], low[selected], false);
+                DbpString("[=] done playing");
 
-				if (BUTTON_HELD(1000) > 0)
-					goto out;
+                if (BUTTON_HELD(1000) > 0)
+                    goto out;
 
-				/* We pressed a button so ignore it here with a delay */
-				SpinDelay(300);
+                /* We pressed a button so ignore it here with a delay */
+                SpinDelay(300);
 
-				// when done, we're done playing, move to next option
-				selected = (selected + 1) % OPTS;
-				playing = !playing;
-				LEDsoff();
-				LED(selected + 1, 0);
-			}
-			else {
-				while (BUTTON_PRESS())
-					WDT_HIT();
-			}
-		}
-	}
+                // when done, we're done playing, move to next option
+                selected = (selected + 1) % OPTS;
+                playing = !playing;
+                LEDsoff();
+                LED(selected + 1, 0);
+            }
+            else {
+                while (BUTTON_PRESS())
+                    WDT_HIT();
+            }
+        }
+    }
 
 out:
-	DbpString("[=] exiting");
-	LEDsoff();
+    DbpString("[=] exiting");
+    LEDsoff();
 }
\ No newline at end of file
diff --git a/armsrc/Standalone/readme.md b/armsrc/Standalone/readme.md
index 618fcdc13..b694971a5 100644
--- a/armsrc/Standalone/readme.md
+++ b/armsrc/Standalone/readme.md
@@ -11,19 +11,19 @@ Each standalone mod needs to have its own compiler flag to be added in `armsrc\m
 The RunMod function is your "main" function when running.  You need to check for Usb commands,  in order to let the pm3 client break the standalone mode.  See this basic skeleton of main function RunMod().
 ````
 void RunMod() {
-	// led show
-	StandAloneMode();
-	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
+    // led show
+    StandAloneMode();
+    FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
 
-	// main loop
-	for (;;) {		
-		WDT_HIT();
-		
-		// exit from standalone mode, just send a usbcommand
-		if (usb_poll_validate_length()) break;
-		
-		// do your standalone stuff..
-	}
+    // main loop
+    for (;;) {
+        WDT_HIT();
+
+        // exit from standalone mode, just send a usbcommand
+        if (usb_poll_validate_length()) break;
+
+        // do your standalone stuff..
+    }
 ````
 
 As it is now, you can only have one standalone mode installed at the time.  
@@ -47,9 +47,9 @@ Add your source code file like the following sample in the `armsrc\makefile`
 ```
 # WITH_HF_COLIN
 ifneq (,$(findstring WITH_HF_COLIN,$(APP_CFLAGS)))
-	SRC_STANDALONE = hf_colin.c vtsend.c
+    SRC_STANDALONE = hf_colin.c vtsend.c
 else
-	SRC_STANDALONE =
+    SRC_STANDALONE =
 endif
 ```
 
@@ -67,36 +67,36 @@ Once all this is done, you and others can now easily compile different standalon
 ````
 #remove one of the following defines and comment out the relevant line
 #in the next section to remove that particular feature from compilation.
-# NO space,TABs after the "\" sign.  
+# NO space,TABs after the "\" sign.
 APP_CFLAGS = -DWITH_CRC \
-			 -DON_DEVICE \
-			 -DWITH_LF \
-			 -DWITH_HITAG \
- 			 -DWITH_ISO15693 \
-			 -DWITH_LEGICRF \
-			 -DWITH_ISO14443b \
-			 -DWITH_ISO14443a \
-			 -DWITH_ICLASS \
-			 -DWITH_FELICA \
-			 -DWITH_FLASH \
-			 -DWITH_SMARTCARD \
-			 -DWITH_HFSNOOP \
-			 -DWITH_HF_COLIN\
-			 -DWITH_FPC \
-			 -fno-strict-aliasing -ffunction-sections -fdata-sections
+             -DON_DEVICE \
+             -DWITH_LF \
+             -DWITH_HITAG \
+             -DWITH_ISO15693 \
+             -DWITH_LEGICRF \
+             -DWITH_ISO14443b \
+             -DWITH_ISO14443a \
+             -DWITH_ICLASS \
+             -DWITH_FELICA \
+             -DWITH_FLASH \
+             -DWITH_SMARTCARD \
+             -DWITH_HFSNOOP \
+             -DWITH_HF_COLIN\
+             -DWITH_FPC \
+             -fno-strict-aliasing -ffunction-sections -fdata-sections
 
 ### IMPORTANT -  move the commented variable below this line
-#			 -DWITH_LCD \
-#			 -DWITH_EMV \
-#			 -DWITH_FPC \
+#             -DWITH_LCD \
+#             -DWITH_EMV \
+#             -DWITH_FPC \
 #
 # Standalone Mods
 #-------------------------------------------------------
-#			 -DWITH_LF_ICERUN
-#			 -DWITH_LF_SAMYRUN
-#			 -DWITH_LF_PROXBRUTE
-#			 -DWITH_LF_HIDBRUTE
-#			 -DWITH_HF_YOUNG
-#			 -DWITH_HF_MATTYRUN
-#			 -DWITH_HF_COLIN
+#             -DWITH_LF_ICERUN
+#             -DWITH_LF_SAMYRUN
+#             -DWITH_LF_PROXBRUTE
+#             -DWITH_LF_HIDBRUTE
+#             -DWITH_HF_YOUNG
+#             -DWITH_HF_MATTYRUN
+#             -DWITH_HF_COLIN
 ````

From e093d1ab2927fe83d6ed073b2ad7db7676ca9d9b Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 9 Mar 2019 11:29:34 +0100
Subject: [PATCH 0693/1938] Adds colors, etc

---
 client/cmdlfem4x.c | 73 +++++++++++++++++++++++-----------------------
 1 file changed, 36 insertions(+), 37 deletions(-)

diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 3024470de..843c63809 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -252,7 +252,7 @@ void printEM410x(uint32_t hi, uint64_t id) {
 
 	if (!id && !hi) return;
 
-	PrintAndLogEx(NORMAL, "EM410x %s pattern found", (hi) ? "XL" : "" );
+	PrintAndLogEx(SUCCESS, "EM410x %s pattern found", (hi) ? "XL" : "" );
 
 	uint64_t iii=1;
 	uint64_t id2lo=0;
@@ -549,7 +549,7 @@ int CmdEM410xBrute(const char *Cmd) {
 
 		if (ukbhit()) {
 			int gc = getchar(); (void)gc;
-			PrintAndLogEx(NORMAL, "\nAborted via keyboard!\n");
+			PrintAndLogEx(WARNING, "\nAborted via keyboard!\n");
 			free(uidBlock);
 			return 0;
 		}
@@ -583,7 +583,7 @@ int CmdEM410xWatch(const char *Cmd) {
 	do {
 		if (ukbhit()) {
 			int gc = getchar(); (void)gc;
-			PrintAndLogEx(NORMAL, "\naborted via keyboard!\n");
+			PrintAndLogEx(WARNING, "\naborted via keyboard!\n");
 			break;
 		}
 		lf_read(true, 8201);
@@ -606,8 +606,8 @@ int CmdEM410xWatchnSpoof(const char *Cmd) {
 }
 
 int CmdEM410xWrite(const char *Cmd) {
-	char cmdp = param_getchar(Cmd, 0);
-	if (cmdp == 'h' || cmdp == 'H') return usage_lf_em410x_write();
+	char cmdp = tolower(param_getchar(Cmd, 0));
+	if (cmdp == 'h') return usage_lf_em410x_write();
 
 	uint64_t id = 0xFFFFFFFFFFFFFFFF; // invalid id value
 	int card = 0xFF; // invalid card value
@@ -666,26 +666,27 @@ int CmdEM410xWrite(const char *Cmd) {
 }
 
 //**************** Start of EM4x50 Code ************************
-bool EM_EndParityTest(uint8_t *BitStream, size_t size, uint8_t rows, uint8_t cols, uint8_t pType) {
-	if (rows*cols>size) return false;
-	uint8_t colP=0;
+bool EM_EndParityTest(uint8_t *bs, size_t size, uint8_t rows, uint8_t cols, uint8_t pType) {
+	if (rows * cols > size) return false;
+	uint8_t colP = 0;
 	//assume last col is a parity and do not test
 	for (uint8_t colNum = 0; colNum < cols-1; colNum++) {
 		for (uint8_t rowNum = 0; rowNum < rows; rowNum++) {
-			colP ^= BitStream[(rowNum*cols)+colNum];
+			colP ^= bs[(rowNum * cols) + colNum];
 		}
 		if (colP != pType) return false;
 	}
 	return true;
 }
 
-bool EM_ByteParityTest(uint8_t *BitStream, size_t size, uint8_t rows, uint8_t cols, uint8_t pType) {
-	if (rows*cols>size) return false;
-	uint8_t rowP=0;
+bool EM_ByteParityTest(uint8_t *bs, size_t size, uint8_t rows, uint8_t cols, uint8_t pType) {
+	if (rows * cols > size) return false;
+	
+	uint8_t rowP = 0;
 	//assume last row is a parity row and do not test
 	for (uint8_t rowNum = 0; rowNum < rows-1; rowNum++) {
 		for (uint8_t colNum = 0; colNum < cols; colNum++) {
-			rowP ^= BitStream[(rowNum*cols)+colNum];
+			rowP ^= bs[(rowNum * cols) + colNum];
 		}
 		if (rowP != pType) return false;
 	}
@@ -755,10 +756,8 @@ uint32_t OutputEM4x50_Block(uint8_t *BitStream, size_t size, bool verbose, bool
 			    bytebits_to_byte(BitStream+i*9,8)
 			);
 		}
-		if (pTest)
-			PrintAndLogEx(NORMAL, "Parity Passed");
-		else
-			PrintAndLogEx(NORMAL, "Parity Failed");
+		
+		PrintAndLogEx(SUCCESS, "Parity checks | %s", (pTest)? _GREEN_(Passed) : _RED_(Failed));
 	}
 	return code;
 }
@@ -949,7 +948,7 @@ int EM4x50Read(const char *Cmd, bool verbose) {
 	//print full code:
 	if (verbose || g_debugMode || AllPTest){
 		if (!complete) {
-			PrintAndLogEx(NORMAL, "*** Warning!");
+			PrintAndLogEx(NORMAL, _RED_(*** Warning!) );
 			PrintAndLogEx(NORMAL, "Partial data - no end found!");
 			PrintAndLogEx(NORMAL, "Try again with more samples.");
 		}
@@ -958,11 +957,11 @@ int EM4x50Read(const char *Cmd, bool verbose) {
 		for (block=0; block < end; block++){
 			PrintAndLogEx(NORMAL, "Block %d: %08x", block, Code[block]);
 		}
-		if (AllPTest) {
-			PrintAndLogEx(NORMAL, "Parities Passed");
-		} else {
-			PrintAndLogEx(NORMAL, "Parities Failed");
-			PrintAndLogEx(NORMAL, "Try cleaning the read samples with 'data askedge'");
+		
+		PrintAndLogEx(NORMAL, "Parities checks | %s", (AllPTest) ? _GREEN_(Passed) : _RED_(Failed) );
+		
+		if (AllPTest == 0) {
+			PrintAndLogEx(NORMAL, "Try cleaning the read samples with " _YELLOW_('data askedge') );
 		}
 	}
 
@@ -1005,7 +1004,7 @@ bool downloadSamplesEM(){
 	computeSignalProperties(got, sizeof(got));
 	RepaintGraphWindow();
 	if (getSignalProperties()->isnoise) {
-		PrintAndLogEx(DEBUG, "No tag found");
+		PrintAndLogEx(DEBUG, "No tag found - signal looks like noise");
 		return false;
 	}
 	return true;
@@ -1148,7 +1147,7 @@ int EM4x05ReadWord_ext(uint8_t addr, uint32_t pwd, bool usePwd, uint32_t *word)
 	SendCommand(&c);
 	UsbCommand resp;
 	if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)){
-		PrintAndLogEx(DEBUG, "Command timed out");
+		PrintAndLogEx(DEBUG, "timeout while waiting for reply.");
 		return -1;
 	}
 	if ( !downloadSamplesEM() ) {
@@ -1162,8 +1161,8 @@ int CmdEM4x05Dump(const char *Cmd) {
 	uint8_t addr = 0;
 	uint32_t pwd = 0;
 	bool usePwd = false;
-	uint8_t ctmp = param_getchar(Cmd, 0);
-	if ( ctmp == 'H' || ctmp == 'h' ) return usage_lf_em4x05_dump();
+	uint8_t ctmp = tolower(param_getchar(Cmd, 0));
+	if ( ctmp == 'h' ) return usage_lf_em4x05_dump();
 
 	// for now use default input of 1 as invalid (unlikely 1 will be a valid password...)
 	pwd = param_get32ex(Cmd, 0, 1, 16);
@@ -1181,7 +1180,7 @@ int CmdEM4x05Dump(const char *Cmd) {
 			if (usePwd) {
 				PrintAndLogEx(NORMAL, " %02u | %08X", addr, pwd, word );
 			} else {
-				PrintAndLogEx(NORMAL, " 02 | cannot read");
+				PrintAndLogEx(NORMAL, " 02 | " _RED_(cannot read) );
 			}
 		} else {
 			success &= EM4x05ReadWord_ext(addr, pwd, usePwd, &word);
@@ -1195,8 +1194,8 @@ int CmdEM4x05Read(const char *Cmd) {
 	uint8_t addr;
 	uint32_t pwd;
 	bool usePwd = false;
-	uint8_t ctmp = param_getchar(Cmd, 0);
-	if ( strlen(Cmd) == 0 || ctmp == 'H' || ctmp == 'h' ) return usage_lf_em4x05_read();
+	uint8_t ctmp = tolower(param_getchar(Cmd, 0));
+	if ( strlen(Cmd) == 0 || ctmp == 'h' ) return usage_lf_em4x05_read();
 
 	addr = param_get8ex(Cmd, 0, 50, 10);
 	pwd =  param_get32ex(Cmd, 1, 1, 16);
@@ -1217,13 +1216,13 @@ int CmdEM4x05Read(const char *Cmd) {
 	if (isOk)
 		PrintAndLogEx(NORMAL, "Address %02d | %08X - %s", addr, word, (addr > 13) ? "Lock" : "");
 	else
-		PrintAndLogEx(NORMAL, "Read Address %02d | failed",addr);
+		PrintAndLogEx(NORMAL, "Read Address %02d | " _RED_(failed), addr);
 	return isOk;
 }
 
 int CmdEM4x05Write(const char *Cmd) {
-	uint8_t ctmp = param_getchar(Cmd, 0);
-	if ( strlen(Cmd) == 0 || ctmp == 'H' || ctmp == 'h' ) return usage_lf_em4x05_write();
+	uint8_t ctmp = tolower(param_getchar(Cmd, 0));
+	if ( strlen(Cmd) == 0 || ctmp == 'h' ) return usage_lf_em4x05_write();
 
 	bool usePwd = false;
 	uint8_t addr = 50; // default to invalid address
@@ -1263,9 +1262,9 @@ int CmdEM4x05Write(const char *Cmd) {
 	uint32_t dummy = 0;
 	int isOk = demodEM4x05resp(&dummy);
 	if (isOk)
-		PrintAndLogEx(NORMAL, "Write Verified");
+		PrintAndLogEx(NORMAL, "Write " _GREEN_(Verified) );
 	else
-		PrintAndLogEx(NORMAL, "Write could not be verified");
+		PrintAndLogEx(NORMAL, "Write could " _RED_(not) "be verified");
 	return isOk;
 }
 
@@ -1385,8 +1384,8 @@ int CmdEM4x05Info(const char *Cmd) {
 	uint32_t pwd;
 	uint32_t word = 0, block0 = 0, serial = 0;
   	bool usePwd = false;
-	uint8_t ctmp = param_getchar(Cmd, 0);
-	if ( ctmp == 'H' || ctmp == 'h' ) return usage_lf_em4x05_info();
+	uint8_t ctmp = tolower(param_getchar(Cmd, 0));
+	if ( ctmp == 'h' ) return usage_lf_em4x05_info();
 
 	// for now use default input of 1 as invalid (unlikely 1 will be a valid password...)
 	pwd = param_get32ex(Cmd, 0, 1, 16);

From cc9ec2d79ce594f65a67f11dd40402ea78d60cc8 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 9 Mar 2019 11:30:26 +0100
Subject: [PATCH 0694/1938] textual

---
 client/cmdhf14a.c    | 2 +-
 client/cmdhffelica.c | 2 +-
 client/cmdhficlass.c | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 90753fef8..98a6168b2 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -607,7 +607,7 @@ int CmdHF14ACUIDs(const char *Cmd) {
 
 		if (ukbhit()) {
 			int gc = getchar(); (void)gc;
-			PrintAndLogEx(NORMAL, "\n[!] aborted via keyboard!\n");
+			PrintAndLogEx(WARNING, "\n[!] aborted via keyboard!\n");
 			break;
 		}
 
diff --git a/client/cmdhffelica.c b/client/cmdhffelica.c
index 2a0380fc5..7a00c2490 100644
--- a/client/cmdhffelica.c
+++ b/client/cmdhffelica.c
@@ -367,7 +367,7 @@ int CmdHFFelicaDumpLite(const char *Cmd) {
 		printf("."); fflush(stdout);
 		if (ukbhit()) {
 			int gc = getchar(); (void)gc;
-			PrintAndLogEx(NORMAL, "\n[!] aborted via keyboard!\n");
+			PrintAndLogEx(WARNING, "\n[!] aborted via keyboard!\n");
 			DropField();
 			return 1;
 		}
diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index 25be7df47..21384d935 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -1057,7 +1057,7 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
 		printf("."); fflush(stdout);
 		if (ukbhit()) {
 			int gc = getchar(); (void)gc;
-			PrintAndLogEx(NORMAL, "\n[!] aborted via keyboard!\n");
+			PrintAndLogEx(WARNING, "\n[!] aborted via keyboard!\n");
 			DropField();
 			return 0;
 		}
@@ -2061,7 +2061,7 @@ int CmdHFiClassCheckKeys(const char *Cmd) {
 
 		if (ukbhit()) {
 			int gc = getchar(); (void)gc;
-			PrintAndLogEx(NORMAL, "\n[!] Aborted via keyboard!\n");
+			PrintAndLogEx(WARNING, "\n[!] Aborted via keyboard!\n");
 			goto out;
 		}
 

From d998602690f0872d6be9e0998783f51456e7862a Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 9 Mar 2019 11:31:53 +0100
Subject: [PATCH 0695/1938] textual

---
 client/cmdlft55xx.c   | 2 +-
 client/cmdsmartcard.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 4acf07c3e..068fd2612 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1501,7 +1501,7 @@ int CmdT55xxWipe(const char *Cmd) {
 bool IsCancelled(void) {
 	if (ukbhit()) {
 		int gc = getchar(); (void)gc;
-		PrintAndLogEx(NORMAL, "\naborted via keyboard!\n");
+		PrintAndLogEx(WARNING, "\naborted via keyboard!\n");
 		return true;
 	}
 	return false;
diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index 42d777ee4..0faacd23a 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -901,7 +901,7 @@ static int smart_brute_sfi(bool decodeTLV){
 
 			if (ukbhit()) {
 				int gc = getchar();	(void)gc;
-				PrintAndLogEx(NORMAL, "\naborted via keyboard!\n");
+				PrintAndLogEx(WARNING, "\naborted via keyboard!\n");
 				free(buf);
 				return 1;
 			}

From 6b9e5e04009867883dd6ab1fa07b5702433ada24 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 9 Mar 2019 11:36:05 +0100
Subject: [PATCH 0696/1938] chg: unified code

---
 client/cmdlf.c        | 3 +--
 client/cmdlfparadox.c | 5 ++---
 client/cmdlfpyramid.c | 3 +--
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/client/cmdlf.c b/client/cmdlf.c
index 7358d9da1..71c429f00 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -878,8 +878,7 @@ int CmdLFfind(const char *Cmd) {
 	if (isOnline) {
 		// only run if graphbuffer is just noise as it should be for hitag
 		// The improved noise detection will find Cotag.
-		signal_t *sp = getSignalProperties();
-		if (sp->isnoise) {
+		if (getSignalProperties()->isnoise) {
 
 			PrintAndLogEx(INFO, "Signal looks just like noise. Looking for Hitag signal now.");
 
diff --git a/client/cmdlfparadox.c b/client/cmdlfparadox.c
index 113036d6f..4ffd7ef61 100644
--- a/client/cmdlfparadox.c
+++ b/client/cmdlfparadox.c
@@ -41,9 +41,8 @@ int usage_lf_paradox_sim(void) {
 int detectParadox(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32_t *lo, int *waveStartIdx) {
 	//make sure buffer has data
 	if (*size < 96*50) return -1;
-
-	signal_t *sp = getSignalProperties();
-	if (sp->isnoise) return -2;
+	
+	if (getSignalProperties()->isnoise) return -2;
 
 	// FSK demodulator
 	*size = fskdemod(dest, *size, 50, 1, 10, 8, waveStartIdx); // paradox fsk2a
diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c
index 796301761..af8c570c5 100644
--- a/client/cmdlfpyramid.c
+++ b/client/cmdlfpyramid.c
@@ -52,8 +52,7 @@ int detectPyramid(uint8_t *dest, size_t *size, int *waveStartIdx) {
 	if (*size < 128*50) return -1;
 
 	//test samples are not just noise
-	signal_t *sp = getSignalProperties();
-	if (sp->isnoise) return -2;
+	if (getSignalProperties()->isnoise) return -2;
 
 	// FSK demodulator RF/50 FSK 10,8
 	*size = fskdemod(dest, *size, 50, 0, 10, 8, waveStartIdx);  // pyramid fsk2

From 29adb88f32b5340f5d056648a5bfe1ba5f9a343a Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 9 Mar 2019 11:49:56 +0100
Subject: [PATCH 0697/1938] fix: use correct define

---
 include/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/common.h b/include/common.h
index 8c73100ff..4b4cf99f3 100644
--- a/include/common.h
+++ b/include/common.h
@@ -82,7 +82,7 @@ extern uint32_t FLASHMEM_SPIBAUDRATE;
 # define FLASH_MEM_SIGNATURE_OFFSET	(FLASH_MEM_MAX_SIZE - FLASH_MEM_SIGNATURE_LEN)
 #endif
 
-#if WITH_FLASH
+#ifdef WITH_FLASH
 	#ifndef T55XX_CONFIG_LEN
 	# define T55XX_CONFIG_LEN	sizeof( t55xx_config )
 	#endif

From f4409ab3750a35f12bbdc848998f3a61ae7e22bc Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 9 Mar 2019 11:51:18 +0100
Subject: [PATCH 0698/1938] chg: revert it

---
 armsrc/fpgaloader.c | 11 +++--------
 armsrc/fpgaloader.h |  1 -
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/armsrc/fpgaloader.c b/armsrc/fpgaloader.c
index 6f8489026..18430b78b 100644
--- a/armsrc/fpgaloader.c
+++ b/armsrc/fpgaloader.c
@@ -118,7 +118,7 @@ void SetupSpi(int mode) {
 // Set up the synchronous serial port, with the one set of options that we
 // always use when we are talking to the FPGA. Both RX and TX are enabled.
 //-----------------------------------------------------------------------------
-void FpgaSetupSscExt(uint8_t clearPCER) {
+void FpgaSetupSsc(void) {
 	// First configure the GPIOs, and get ourselves a clock.
 	AT91C_BASE_PIOA->PIO_ASR =
 		GPIO_SSC_FRAME	|
@@ -127,10 +127,7 @@ void FpgaSetupSscExt(uint8_t clearPCER) {
 		GPIO_SSC_CLK;
 	AT91C_BASE_PIOA->PIO_PDR = GPIO_SSC_DOUT;
 
-	if ( clearPCER )
 		AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_SSC);
-	else
-		AT91C_BASE_PMC->PMC_PCER |= (1 << AT91C_ID_SSC);
 
 	// Now set up the SSC proper, starting from a known state.
 	AT91C_BASE_SSC->SSC_CR = AT91C_SSC_SWRST;
@@ -152,9 +149,7 @@ void FpgaSetupSscExt(uint8_t clearPCER) {
 
 	AT91C_BASE_SSC->SSC_CR = AT91C_SSC_RXEN | AT91C_SSC_TXEN;
 }
-void FpgaSetupSsc(void) {
-	FpgaSetupSscExt(true);
-}
+
 //-----------------------------------------------------------------------------
 // Set up DMA to receive samples from the FPGA. We will use the PDC, with
 // a single buffer as a circular buffer (so that we just chain back to
@@ -247,7 +242,7 @@ static bool reset_fpga_stream(int bitstream_version, z_streamp compressed_fpga_s
 	return false;
 }
 
-static void DownloadFPGA_byte(unsigned char w) {
+static void DownloadFPGA_byte( uint8_t w) {
 #define SEND_BIT(x) { if(w & (1<<x) ) HIGH(GPIO_FPGA_DIN); else LOW(GPIO_FPGA_DIN); HIGH(GPIO_FPGA_CCLK); LOW(GPIO_FPGA_CCLK); }
 	SEND_BIT(7);
 	SEND_BIT(6);
diff --git a/armsrc/fpgaloader.h b/armsrc/fpgaloader.h
index 852d66dfa..7f9ec28e6 100644
--- a/armsrc/fpgaloader.h
+++ b/armsrc/fpgaloader.h
@@ -27,7 +27,6 @@ void FpgaSendCommand(uint16_t cmd, uint16_t v);
 void FpgaWriteConfWord(uint8_t v);
 void FpgaDownloadAndGo(int bitstream_version);
 // void FpgaGatherVersion(int bitstream_version, char *dst, int len);
-void FpgaSetupSscExt(uint8_t clearPCER);
 void FpgaSetupSsc(void);
 void SetupSpi(int mode);
 bool FpgaSetupSscDma(uint8_t *buf, int len);

From a819d522c15a8b103515536c4c73d96c13b7f52d Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 9 Mar 2019 11:51:46 +0100
Subject: [PATCH 0699/1938] textual

---
 armsrc/hfsnoop.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/armsrc/hfsnoop.c b/armsrc/hfsnoop.c
index cc72c7176..d66f88276 100644
--- a/armsrc/hfsnoop.c
+++ b/armsrc/hfsnoop.c
@@ -20,7 +20,7 @@ static void RAMFUNC optimizedSnoop(void)
 			dest++;
 		}
 	}
-    //setting tracelen - importsnt!  it was set by buffer overflow before
+    //setting tracelen - important!  it was set by buffer overflow before
     set_tracelen( BigBuf_max_traceLen());
 }
 

From cc81b5bed9023a4ac93e6d45eab4584b13051150 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 9 Mar 2019 12:31:29 +0100
Subject: [PATCH 0700/1938] fix: tolower

---
 client/cmddata.c     | 8 ++++----
 client/cmdhf.c       | 8 ++++----
 client/cmdhf15.c     | 5 ++---
 client/cmdhficlass.c | 8 ++++----
 client/cmdlfem4x.c   | 2 +-
 client/cmdlft55xx.c  | 6 +++---
 6 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/client/cmddata.c b/client/cmddata.c
index 998ce3779..cdd26c27b 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -863,8 +863,8 @@ int CmdBitsamples(const char *Cmd)
 
 int CmdBuffClear(const char *Cmd)
 {
-	char cmdp = param_getchar(Cmd, 0);
-	if (cmdp == 'h' || cmdp == 'H') return usage_data_buffclear();
+	char cmdp = tolower(param_getchar(Cmd, 0));
+	if (cmdp == 'h') return usage_data_buffclear();
 
 	UsbCommand c = {CMD_BUFF_CLEAR, {0,0,0}};
 	clearCommandBuffer();
@@ -891,8 +891,8 @@ int CmdDec(const char *Cmd)
  */
 int CmdUndec(const char *Cmd)
 {
-	char cmdp = param_getchar(Cmd, 0);
-	if (cmdp == 'h' || cmdp == 'H') return usage_data_undecimate();
+	char cmdp = tolower(param_getchar(Cmd, 0));
+	if (cmdp == 'h') return usage_data_undecimate();
 
 	uint8_t factor = param_get8ex(Cmd, 0, 2, 10);
 
diff --git a/client/cmdhf.c b/client/cmdhf.c
index af5aa4c2b..6931f5c14 100644
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -38,8 +38,8 @@ int usage_hf_snoop(){
 
 int CmdHFSearch(const char *Cmd){
 
-	char cmdp = param_getchar(Cmd, 0);
-	if (cmdp == 'h' || cmdp == 'H') return usage_hf_search();
+	char cmdp = tolower(param_getchar(Cmd, 0));
+	if (cmdp == 'h') return usage_hf_search();
 
 	int ans = CmdHF14AInfo("s");
 	if (ans > 0) {
@@ -94,8 +94,8 @@ int CmdHFTune(const char *Cmd) {
 }
 
 int CmdHFSnoop(const char *Cmd) {
-	char cmdp = param_getchar(Cmd, 0);
-	if (cmdp == 'h' || cmdp == 'H') return usage_hf_snoop();
+	char cmdp = tolower(param_getchar(Cmd, 0));
+	if (cmdp == 'h') return usage_hf_snoop();
 
 	int skippairs =  param_get32ex(Cmd, 0, 0, 10);
 	int skiptriggers =  param_get32ex(Cmd, 1, 0, 10);
diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index dc1a47f40..bdec7c339 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -476,14 +476,13 @@ int CmdHF15Demod(const char *Cmd) {
 // * Acquire Samples as Reader (enables carrier, sends inquiry)
 //helptext
 int CmdHF15Samples(const char *Cmd) {
-	char cmdp = param_getchar(Cmd, 0);
-	if (cmdp == 'h' || cmdp == 'H') return usage_15_samples();
+	char cmdp = tolower(param_getchar(Cmd, 0));
+	if (cmdp == 'h') return usage_15_samples();
 
 	UsbCommand c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_15693, {0,0,0}};
 	clearCommandBuffer();
 	SendCommand(&c);
 
-	//download samples
 	getSamples(0, false);
 	return 0;
 }
diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index 21384d935..e21de76ab 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -277,8 +277,8 @@ int CmdHFiClassList(const char *Cmd) {
 }
 
 int CmdHFiClassSniff(const char *Cmd) {
-	char cmdp = param_getchar(Cmd, 0);
-	if (cmdp == 'h' || cmdp == 'H')	return usage_hf_iclass_sniff();
+	char cmdp = tolower(param_getchar(Cmd, 0));
+	if (cmdp == 'h' ) return usage_hf_iclass_sniff();
 	UsbCommand c = {CMD_SNOOP_ICLASS};
 	SendCommand(&c);
 	return 0;
@@ -286,8 +286,8 @@ int CmdHFiClassSniff(const char *Cmd) {
 
 int CmdHFiClassSim(const char *Cmd) {
 
-	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd)<1 || cmdp == 'H' || cmdp == 'h') return usage_hf_iclass_sim();
+	char cmdp = tolower(param_getchar(Cmd, 0));
+	if (strlen(Cmd) < 1 || cmdp == 'h') return usage_hf_iclass_sim();
 
 	uint8_t simType = 0;
 	uint8_t CSN[8] = {0, 0, 0, 0, 0, 0, 0, 0};
diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 843c63809..47a05b260 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -607,7 +607,7 @@ int CmdEM410xWatchnSpoof(const char *Cmd) {
 
 int CmdEM410xWrite(const char *Cmd) {
 	char cmdp = tolower(param_getchar(Cmd, 0));
-	if (cmdp == 'h') return usage_lf_em410x_write();
+	if (cmdp == 0x00 || cmdp == 'h') return usage_lf_em410x_write();
 
 	uint64_t id = 0xFFFFFFFFFFFFFFFF; // invalid id value
 	int card = 0xFF; // invalid card value
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 068fd2612..285eb75bb 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1471,10 +1471,10 @@ int CmdResetRead(const char *Cmd) {
 int CmdT55xxWipe(const char *Cmd) {
 	char writeData[20] = {0};
 	char *ptrData = writeData;
-	char cmdp = param_getchar(Cmd, 0);
-	if ( cmdp == 'h' || cmdp == 'H') return usage_t55xx_wipe();
+	char cmdp = tolower(param_getchar(Cmd, 0));
+	if ( cmdp == 'h') return usage_t55xx_wipe();
 
-	bool Q5 = (cmdp == 'q' || cmdp == 'Q');
+	bool Q5 = (cmdp == 'q');
 
 	// Try with the default password to reset block 0
 	// With a pwd should work even if pwd bit not set

From 45e8403d4d4f50c3b193c0f2eec06352c8200f25 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 9 Mar 2019 12:54:39 +0100
Subject: [PATCH 0701/1938] fix: 'lf t55' - aquiredata uses getsamples

---
 client/cmdlft55xx.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 285eb75bb..3e4e8dc2a 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1325,15 +1325,8 @@ bool AquireData( uint8_t page, uint8_t block, bool pwdmode, uint32_t password )
 		return false;
 	}
 
-	uint8_t got[8000];
-	if ( !GetFromDevice(BIG_BUF, got, sizeof(got), 0, NULL, 4000, true)) {
-		PrintAndLogEx(WARNING, "command execution time out");
-		return false;
-	}
-	setGraphBuf(got, sizeof(got));
-	// set signal properties low/high/mean/amplitude and is_noise detection
-	computeSignalProperties(got, sizeof(got));
-	RepaintGraphWindow();
+    getSamples(12000, true);
+        
 	return !getSignalProperties()->isnoise;
 }
 

From aebfe193dcbdd34a5fe5e7666f2a934151a2d6b7 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 9 Mar 2019 13:54:03 +0100
Subject: [PATCH 0702/1938] chg:  'data raw' - skip if signal is noise

---
 client/cmddata.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/client/cmddata.c b/client/cmddata.c
index cdd26c27b..6d83a4e0b 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -1041,6 +1041,9 @@ int FSKrawDemod(const char *Cmd, bool verbose) {
 		}
 	}
 
+    if (getSignalProperties()->isnoise)
+        return 0;
+    
 	uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
 	size_t BitLen = getFromGraphBuf(bits);
 	if (BitLen == 0) return 0;
@@ -1106,6 +1109,10 @@ int PSKDemod(const char *Cmd, bool verbose) {
 		if (g_debugMode || verbose) PrintAndLogEx(WARNING, "Invalid argument: %s", Cmd);
 		return 0;
 	}
+        
+    if (getSignalProperties()->isnoise)
+        return 0;
+    
 	uint8_t BitStream[MAX_GRAPH_TRACE_LEN] = {0};
 	size_t BitLen = getFromGraphBuf(BitStream);
 	if (BitLen == 0) return 0;
@@ -1210,6 +1217,9 @@ int NRZrawDemod(const char *Cmd, bool verbose) {
 		PrintAndLogEx(WARNING, "(NRZrawDemod) Invalid argument: %s", Cmd);
 		return 0;
 	}
+        
+    if (getSignalProperties()->isnoise)
+        return 0;
 
 	uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
 	size_t BitLen = getFromGraphBuf(bits);

From 6d364ec70d897235117579bf57e62972a431a807 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 9 Mar 2019 14:00:46 +0100
Subject: [PATCH 0703/1938] chg: 'data detectclocks' - skip if isnoise

---
 client/graph.c | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/client/graph.c b/client/graph.c
index db29919bc..0f7789093 100644
--- a/client/graph.c
+++ b/client/graph.c
@@ -96,7 +96,9 @@ bool HasGraphData(){
 
 // Get or auto-detect ask clock rate
 int GetAskClock(const char *str, bool printAns) {
-
+    if (getSignalProperties()->isnoise)
+        return false;
+    
 	int clock = param_get32ex(str, 0, 0, 10);
 	if (clock > 0)
 		return clock;
@@ -127,6 +129,9 @@ int GetAskClock(const char *str, bool printAns) {
 }
 
 uint8_t GetPskCarrier(const char *str, bool printAns) {
+    if (getSignalProperties()->isnoise)
+        return false;
+    
 	uint8_t carrier = 0;
 	uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
 	size_t size = getFromGraphBuf(bits);
@@ -145,6 +150,10 @@ uint8_t GetPskCarrier(const char *str, bool printAns) {
 }
 
 int GetPskClock(const char* str, bool printAns) {
+
+    if (getSignalProperties()->isnoise)
+        return -1;
+    
 	int clock = param_get32ex(str, 0, 0, 10);
 	if (clock != 0)
 		return clock;
@@ -168,10 +177,13 @@ int GetPskClock(const char* str, bool printAns) {
 
 int GetNrzClock(const char* str, bool printAns) {
 
+    if (getSignalProperties()->isnoise)
+        return -1;
+    
 	int clock = param_get32ex(str, 0, 0, 10);
 	if (clock != 0)
 		return clock;
-
+    
 	// Auto-detect clock
 	uint8_t grph[MAX_GRAPH_TRACE_LEN] = {0};
 	size_t size = getFromGraphBuf(grph);
@@ -213,6 +225,10 @@ int GetFskClock(const char* str, bool printAns) {
 	return 0;
 }
 bool fskClocks(uint8_t *fc1, uint8_t *fc2, uint8_t *rf1, int *firstClockEdge) {
+
+    if (getSignalProperties()->isnoise)
+        return false;
+
 	uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
 	size_t size = getFromGraphBuf(bits);
 	if (size == 0)

From 89db6064d063f91d3c7bfa29f7d11504ca3cf542 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 9 Mar 2019 17:25:53 +0100
Subject: [PATCH 0704/1938] fix: 'lf paradox demod' - wrong check

---
 client/cmdlfparadox.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdlfparadox.c b/client/cmdlfparadox.c
index 4ffd7ef61..238d7bc00 100644
--- a/client/cmdlfparadox.c
+++ b/client/cmdlfparadox.c
@@ -53,7 +53,7 @@ int detectParadox(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint
 	// 00001111 bit pattern represent start of frame, 01 pattern represents a 0 and 10 represents a 1
 	size_t startIdx = 0;
 	uint8_t preamble[] = {0,0,0,0,1,1,1,1};
-	if (preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
+	if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
 		return -4; //preamble not found
 
 	size_t numStart = startIdx + sizeof(preamble);

From 2b1b76c2a9f5bb210b8db32fd5477b39ed11b3cd Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 9 Mar 2019 18:16:50 +0100
Subject: [PATCH 0705/1938] liblua: fix mix of spaces & tabs

---
 liblua/lapi.c     |  12 +--
 liblua/lapi.h     |   6 +-
 liblua/lauxlib.c  |  12 +--
 liblua/lauxlib.h  |  42 ++++-----
 liblua/lbaselib.c |   4 +-
 liblua/lbitlib.c  |   8 +-
 liblua/lcode.c    |   2 +-
 liblua/lcode.h    |   8 +-
 liblua/lctype.c   |  36 +++----
 liblua/lctype.h   |  52 +++++------
 liblua/ldblib.c   |   4 +-
 liblua/ldebug.c   |   2 +-
 liblua/ldebug.h   |   8 +-
 liblua/ldo.c      |  20 ++--
 liblua/ldo.h      |   8 +-
 liblua/ldump.c    |  22 ++---
 liblua/lfunc.h    |   4 +-
 liblua/lgc.c      |  32 +++----
 liblua/lgc.h      |  84 ++++++++---------
 liblua/liolib.c   |  68 +++++++-------
 liblua/llex.c     |   6 +-
 liblua/llex.h     |   4 +-
 liblua/llimits.h  | 112 +++++++++++-----------
 liblua/lmathlib.c |   4 +-
 liblua/lmem.c     |   2 +-
 liblua/lmem.h     |  12 +--
 liblua/loadlib.c  |  44 ++++-----
 liblua/lobject.c  |  10 +-
 liblua/lobject.h  | 232 +++++++++++++++++++++++-----------------------
 liblua/lopcodes.c |  82 ++++++++--------
 liblua/lopcodes.h | 214 +++++++++++++++++++++---------------------
 liblua/loslib.c   |  22 ++---
 liblua/lparser.c  |  12 +--
 liblua/lparser.h  |  24 ++---
 liblua/lstate.c   |  12 +--
 liblua/lstate.h   |  56 +++++------
 liblua/lstring.c  |   2 +-
 liblua/lstring.h  |  12 +--
 liblua/lstrlib.c  |  38 ++++----
 liblua/ltable.c   |  20 ++--
 liblua/ltable.h   |  10 +-
 liblua/ltablib.c  |   2 +-
 liblua/ltm.h      |   8 +-
 liblua/lua.c      |  42 ++++-----
 liblua/lua.h      | 195 +++++++++++++++++++-------------------
 liblua/luac.c     |  88 +++++++++---------
 liblua/luaconf.h  | 230 ++++++++++++++++++++++-----------------------
 liblua/lualib.h   |  20 ++--
 liblua/lundump.c  |  48 +++++-----
 liblua/lundump.h  |   4 +-
 liblua/lvm.c      |  28 +++---
 liblua/lvm.h      |   4 +-
 liblua/lzio.h     |  26 +++---
 53 files changed, 1030 insertions(+), 1029 deletions(-)

diff --git a/liblua/lapi.c b/liblua/lapi.c
index 791d85454..3d7fa5701 100644
--- a/liblua/lapi.c
+++ b/liblua/lapi.c
@@ -35,21 +35,21 @@ const char lua_ident[] =
 
 
 /* value at a non-valid index */
-#define NONVALIDVALUE		cast(TValue *, luaO_nilobject)
+#define NONVALIDVALUE cast(TValue *, luaO_nilobject)
 
 /* corresponding test */
-#define isvalid(o)	((o) != luaO_nilobject)
+#define isvalid(o) ((o) != luaO_nilobject)
 
 /* test for pseudo index */
-#define ispseudo(i)		((i) <= LUA_REGISTRYINDEX)
+#define ispseudo(i) ((i) <= LUA_REGISTRYINDEX)
 
 /* test for valid but not pseudo index */
-#define isstackindex(i, o)	(isvalid(o) && !ispseudo(i))
+#define isstackindex(i, o) (isvalid(o) && !ispseudo(i))
 
 #define api_checkvalidindex(L, o)  api_check(L, isvalid(o), "invalid index")
 
 #define api_checkstackindex(L, i, o)  \
-	api_check(L, isstackindex(i, o), "index not in the stack")
+    api_check(L, isstackindex(i, o), "index not in the stack")
 
 
 static TValue *index2addr (lua_State *L, int idx) {
@@ -874,7 +874,7 @@ LUA_API void lua_setuservalue (lua_State *L, int idx) {
 
 #define checkresults(L,na,nr) \
      api_check(L, (nr) == LUA_MULTRET || (L->ci->top - L->top >= (nr) - (na)), \
-	"results from function overflow current stack size")
+    "results from function overflow current stack size")
 
 
 LUA_API int lua_getctx (lua_State *L, int *ctx) {
diff --git a/liblua/lapi.h b/liblua/lapi.h
index 0909a3911..3d45c0b66 100644
--- a/liblua/lapi.h
+++ b/liblua/lapi.h
@@ -12,13 +12,13 @@
 #include "lstate.h"
 
 #define api_incr_top(L)   {L->top++; api_check(L, L->top <= L->ci->top, \
-				"stack overflow");}
+                "stack overflow");}
 
 #define adjustresults(L,nres) \
     { if ((nres) == LUA_MULTRET && L->ci->top < L->top) L->ci->top = L->top; }
 
-#define api_checknelems(L,n)	api_check(L, (n) < (L->top - L->ci->func), \
-				  "not enough elements in the stack")
+#define api_checknelems(L,n) api_check(L, (n) < (L->top - L->ci->func), \
+                  "not enough elements in the stack")
 
 
 #endif
diff --git a/liblua/lauxlib.c b/liblua/lauxlib.c
index 2e989d661..9a91a2a4b 100644
--- a/liblua/lauxlib.c
+++ b/liblua/lauxlib.c
@@ -31,8 +31,8 @@
 */
 
 
-#define LEVELS1	12	/* size of the first part of the stack */
-#define LEVELS2	10	/* size of the second part of the stack */
+#define LEVELS1 12  /* size of the first part of the stack */
+#define LEVELS2 10  /* size of the second part of the stack */
 
 
 
@@ -222,7 +222,7 @@ LUALIB_API int luaL_fileresult (lua_State *L, int stat, const char *fname) {
 }
 
 
-#if !defined(inspectstat)	/* { */
+#if !defined(inspectstat) /* { */
 
 #if defined(LUA_USE_POSIX)
 
@@ -241,7 +241,7 @@ LUALIB_API int luaL_fileresult (lua_State *L, int stat, const char *fname) {
 
 #endif
 
-#endif				/* } */
+#endif                    /* } */
 
 
 LUALIB_API int luaL_execresult (lua_State *L, int stat) {
@@ -428,7 +428,7 @@ LUALIB_API lua_Unsigned luaL_optunsigned (lua_State *L, int narg,
 ** check whether buffer is using a userdata on the stack as a temporary
 ** buffer
 */
-#define buffonstack(B)	((B)->b != (B)->initb)
+#define buffonstack(B) ((B)->b != (B)->initb)
 
 
 /*
@@ -516,7 +516,7 @@ LUALIB_API char *luaL_buffinitsize (lua_State *L, luaL_Buffer *B, size_t sz) {
 */
 
 /* index of free-list header */
-#define freelist	0
+#define freelist 0
 
 
 LUALIB_API int luaL_ref (lua_State *L, int t) {
diff --git a/liblua/lauxlib.h b/liblua/lauxlib.h
index ac4d15fbb..e9f4130a6 100644
--- a/liblua/lauxlib.h
+++ b/liblua/lauxlib.h
@@ -27,7 +27,7 @@ typedef struct luaL_Reg {
 
 
 LUALIB_API void (luaL_checkversion_) (lua_State *L, lua_Number ver);
-#define luaL_checkversion(L)	luaL_checkversion_(L, LUA_VERSION_NUM)
+#define luaL_checkversion(L) luaL_checkversion_(L, LUA_VERSION_NUM)
 
 LUALIB_API int (luaL_getmetafield) (lua_State *L, int obj, const char *e);
 LUALIB_API int (luaL_callmeta) (lua_State *L, int obj, const char *e);
@@ -75,7 +75,7 @@ LUALIB_API void (luaL_unref) (lua_State *L, int t, int ref);
 LUALIB_API int (luaL_loadfilex) (lua_State *L, const char *filename,
                                                const char *mode);
 
-#define luaL_loadfile(L,f)	luaL_loadfilex(L,f,NULL)
+#define luaL_loadfile(L,f) luaL_loadfilex(L,f,NULL)
 
 LUALIB_API int (luaL_loadbufferx) (lua_State *L, const char *buff, size_t sz,
                                    const char *name, const char *mode);
@@ -105,33 +105,33 @@ LUALIB_API void (luaL_requiref) (lua_State *L, const char *modname,
 */
 
 
-#define luaL_newlibtable(L,l)	\
+#define luaL_newlibtable(L,l) \
   lua_createtable(L, 0, sizeof(l)/sizeof((l)[0]) - 1)
 
-#define luaL_newlib(L,l)	(luaL_newlibtable(L,l), luaL_setfuncs(L,l,0))
+#define luaL_newlib(L,l) (luaL_newlibtable(L,l), luaL_setfuncs(L,l,0))
 
-#define luaL_argcheck(L, cond,numarg,extramsg)	\
-		((void)((cond) || luaL_argerror(L, (numarg), (extramsg))))
-#define luaL_checkstring(L,n)	(luaL_checklstring(L, (n), NULL))
-#define luaL_optstring(L,n,d)	(luaL_optlstring(L, (n), (d), NULL))
-#define luaL_checkint(L,n)	((int)luaL_checkinteger(L, (n)))
-#define luaL_optint(L,n,d)	((int)luaL_optinteger(L, (n), (d)))
-#define luaL_checklong(L,n)	((long)luaL_checkinteger(L, (n)))
-#define luaL_optlong(L,n,d)	((long)luaL_optinteger(L, (n), (d)))
+#define luaL_argcheck(L, cond,numarg,extramsg) \
+        ((void)((cond) || luaL_argerror(L, (numarg), (extramsg))))
+#define luaL_checkstring(L,n) (luaL_checklstring(L, (n), NULL))
+#define luaL_optstring(L,n,d) (luaL_optlstring(L, (n), (d), NULL))
+#define luaL_checkint(L,n) ((int)luaL_checkinteger(L, (n)))
+#define luaL_optint(L,n,d) ((int)luaL_optinteger(L, (n), (d)))
+#define luaL_checklong(L,n) ((long)luaL_checkinteger(L, (n)))
+#define luaL_optlong(L,n,d) ((long)luaL_optinteger(L, (n), (d)))
 
-#define luaL_typename(L,i)	lua_typename(L, lua_type(L,(i)))
+#define luaL_typename(L,i) lua_typename(L, lua_type(L,(i)))
 
 #define luaL_dofile(L, fn) \
-	(luaL_loadfile(L, fn) || lua_pcall(L, 0, LUA_MULTRET, 0))
+    (luaL_loadfile(L, fn) || lua_pcall(L, 0, LUA_MULTRET, 0))
 
 #define luaL_dostring(L, s) \
-	(luaL_loadstring(L, s) || lua_pcall(L, 0, LUA_MULTRET, 0))
+    (luaL_loadstring(L, s) || lua_pcall(L, 0, LUA_MULTRET, 0))
 
-#define luaL_getmetatable(L,n)	(lua_getfield(L, LUA_REGISTRYINDEX, (n)))
+#define luaL_getmetatable(L,n) (lua_getfield(L, LUA_REGISTRYINDEX, (n)))
 
-#define luaL_opt(L,f,n,d)	(lua_isnoneornil(L,(n)) ? (d) : f(L,(n)))
+#define luaL_opt(L,f,n,d) (lua_isnoneornil(L,(n)) ? (d) : f(L,(n)))
 
-#define luaL_loadbuffer(L,s,sz,n)	luaL_loadbufferx(L,s,sz,n,NULL)
+#define luaL_loadbuffer(L,s,sz,n) luaL_loadbufferx(L,s,sz,n,NULL)
 
 
 /*
@@ -153,7 +153,7 @@ typedef struct luaL_Buffer {
   ((void)((B)->n < (B)->size || luaL_prepbuffsize((B), 1)), \
    ((B)->b[(B)->n++] = (c)))
 
-#define luaL_addsize(B,s)	((B)->n += (s))
+#define luaL_addsize(B,s) ((B)->n += (s))
 
 LUALIB_API void (luaL_buffinit) (lua_State *L, luaL_Buffer *B);
 LUALIB_API char *(luaL_prepbuffsize) (luaL_Buffer *B, size_t sz);
@@ -164,7 +164,7 @@ LUALIB_API void (luaL_pushresult) (luaL_Buffer *B);
 LUALIB_API void (luaL_pushresultsize) (luaL_Buffer *B, size_t sz);
 LUALIB_API char *(luaL_buffinitsize) (lua_State *L, luaL_Buffer *B, size_t sz);
 
-#define luaL_prepbuffer(B)	luaL_prepbuffsize(B, LUAL_BUFFERSIZE)
+#define luaL_prepbuffer(B) luaL_prepbuffsize(B, LUAL_BUFFERSIZE)
 
 /* }====================================================== */
 
@@ -202,7 +202,7 @@ LUALIB_API void (luaL_pushmodule) (lua_State *L, const char *modname,
 LUALIB_API void (luaL_openlib) (lua_State *L, const char *libname,
                                 const luaL_Reg *l, int nup);
 
-#define luaL_register(L,n,l)	(luaL_openlib(L,(n),(l),0))
+#define luaL_register(L,n,l) (luaL_openlib(L,(n),(l),0))
 
 #endif
 
diff --git a/liblua/lbaselib.c b/liblua/lbaselib.c
index 540e9a5cc..f5db0b9fe 100644
--- a/liblua/lbaselib.c
+++ b/liblua/lbaselib.c
@@ -43,7 +43,7 @@ static int luaB_print (lua_State *L) {
 }
 
 
-#define SPACECHARS	" \f\n\r\t\v"
+#define SPACECHARS " \f\n\r\t\v"
 
 static int luaB_tonumber (lua_State *L) {
   if (lua_isnoneornil(L, 2)) {  /* standard conversion */
@@ -280,7 +280,7 @@ static int luaB_loadfile (lua_State *L) {
 ** string to avoid it being collected while parsed. 'load' has four
 ** optional arguments (chunk, source name, mode, and environment).
 */
-#define RESERVEDSLOT	5
+#define RESERVEDSLOT 5
 
 
 /*
diff --git a/liblua/lbitlib.c b/liblua/lbitlib.c
index 9637532e3..b1c0e2839 100644
--- a/liblua/lbitlib.c
+++ b/liblua/lbitlib.c
@@ -15,18 +15,18 @@
 
 /* number of bits to consider in a number */
 #if !defined(LUA_NBITS)
-#define LUA_NBITS	32
+#define LUA_NBITS 32
 #endif
 
 
-#define ALLONES		(~(((~(lua_Unsigned)0) << (LUA_NBITS - 1)) << 1))
+#define ALLONES (~(((~(lua_Unsigned)0) << (LUA_NBITS - 1)) << 1))
 
 /* macro to trim extra bits */
-#define trim(x)		((x) & ALLONES)
+#define trim(x) ((x) & ALLONES)
 
 
 /* builds a number with 'n' ones (1 <= n <= LUA_NBITS) */
-#define mask(n)		(~((ALLONES << 1) << ((n) - 1)))
+#define mask(n) (~((ALLONES << 1) << ((n) - 1)))
 
 
 typedef lua_Unsigned b_uint;
diff --git a/liblua/lcode.c b/liblua/lcode.c
index 56c26ac8a..df9ee6d86 100644
--- a/liblua/lcode.c
+++ b/liblua/lcode.c
@@ -26,7 +26,7 @@
 #include "lvm.h"
 
 
-#define hasjumps(e)	((e)->t != (e)->f)
+#define hasjumps(e) ((e)->t != (e)->f)
 
 
 static int isnumeral(expdesc *e) {
diff --git a/liblua/lcode.h b/liblua/lcode.h
index 5a1fa9fea..17337f1cb 100644
--- a/liblua/lcode.h
+++ b/liblua/lcode.h
@@ -36,13 +36,13 @@ typedef enum BinOpr {
 typedef enum UnOpr { OPR_MINUS, OPR_NOT, OPR_LEN, OPR_NOUNOPR } UnOpr;
 
 
-#define getcode(fs,e)	((fs)->f->code[(e)->u.info])
+#define getcode(fs,e) ((fs)->f->code[(e)->u.info])
 
-#define luaK_codeAsBx(fs,o,A,sBx)	luaK_codeABx(fs,o,A,(sBx)+MAXARG_sBx)
+#define luaK_codeAsBx(fs,o,A,sBx) luaK_codeABx(fs,o,A,(sBx)+MAXARG_sBx)
 
-#define luaK_setmultret(fs,e)	luaK_setreturns(fs, e, LUA_MULTRET)
+#define luaK_setmultret(fs,e) luaK_setreturns(fs, e, LUA_MULTRET)
 
-#define luaK_jumpto(fs,t)	luaK_patchlist(fs, luaK_jump(fs), t)
+#define luaK_jumpto(fs,t) luaK_patchlist(fs, luaK_jump(fs), t)
 
 LUAI_FUNC int luaK_codeABx (FuncState *fs, OpCode o, int A, unsigned int Bx);
 LUAI_FUNC int luaK_codeABC (FuncState *fs, OpCode o, int A, int B, int C);
diff --git a/liblua/lctype.c b/liblua/lctype.c
index 55e433a5d..2afccf0bb 100644
--- a/liblua/lctype.c
+++ b/liblua/lctype.c
@@ -9,44 +9,44 @@
 
 #include "lctype.h"
 
-#if !LUA_USE_CTYPE	/* { */
+#if !LUA_USE_CTYPE /* { */
 
 #include <limits.h>
 
 LUAI_DDEF const lu_byte luai_ctype_[UCHAR_MAX + 2] = {
   0x00,  /* EOZ */
-  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,	/* 0. */
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,    /* 0. */
   0x00,  0x08,  0x08,  0x08,  0x08,  0x08,  0x00,  0x00,
-  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,	/* 1. */
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,    /* 1. */
   0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
-  0x0c,  0x04,  0x04,  0x04,  0x04,  0x04,  0x04,  0x04,	/* 2. */
+  0x0c,  0x04,  0x04,  0x04,  0x04,  0x04,  0x04,  0x04,    /* 2. */
   0x04,  0x04,  0x04,  0x04,  0x04,  0x04,  0x04,  0x04,
-  0x16,  0x16,  0x16,  0x16,  0x16,  0x16,  0x16,  0x16,	/* 3. */
+  0x16,  0x16,  0x16,  0x16,  0x16,  0x16,  0x16,  0x16,    /* 3. */
   0x16,  0x16,  0x04,  0x04,  0x04,  0x04,  0x04,  0x04,
-  0x04,  0x15,  0x15,  0x15,  0x15,  0x15,  0x15,  0x05,	/* 4. */
+  0x04,  0x15,  0x15,  0x15,  0x15,  0x15,  0x15,  0x05,    /* 4. */
   0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,
-  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,	/* 5. */
+  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,    /* 5. */
   0x05,  0x05,  0x05,  0x04,  0x04,  0x04,  0x04,  0x05,
-  0x04,  0x15,  0x15,  0x15,  0x15,  0x15,  0x15,  0x05,	/* 6. */
+  0x04,  0x15,  0x15,  0x15,  0x15,  0x15,  0x15,  0x05,    /* 6. */
   0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,
-  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,	/* 7. */
+  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,    /* 7. */
   0x05,  0x05,  0x05,  0x04,  0x04,  0x04,  0x04,  0x00,
-  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,	/* 8. */
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,    /* 8. */
   0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
-  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,	/* 9. */
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,    /* 9. */
   0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
-  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,	/* a. */
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,    /* a. */
   0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
-  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,	/* b. */
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,    /* b. */
   0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
-  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,	/* c. */
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,    /* c. */
   0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
-  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,	/* d. */
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,    /* d. */
   0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
-  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,	/* e. */
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,    /* e. */
   0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
-  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,	/* f. */
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,    /* f. */
   0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
 };
 
-#endif			/* } */
+#endif             /* } */
diff --git a/liblua/lctype.h b/liblua/lctype.h
index 99c7d1223..eda021a90 100644
--- a/liblua/lctype.h
+++ b/liblua/lctype.h
@@ -20,58 +20,58 @@
 
 #if 'A' == 65 && '0' == 48
 /* ASCII case: can use its own tables; faster and fixed */
-#define LUA_USE_CTYPE	0
+#define LUA_USE_CTYPE 0
 #else
 /* must use standard C ctype */
-#define LUA_USE_CTYPE	1
+#define LUA_USE_CTYPE 1
 #endif
 
 #endif
 
 
-#if !LUA_USE_CTYPE	/* { */
+#if !LUA_USE_CTYPE /* { */
 
 #include <limits.h>
 
 #include "llimits.h"
 
 
-#define ALPHABIT	0
-#define DIGITBIT	1
-#define PRINTBIT	2
-#define SPACEBIT	3
-#define XDIGITBIT	4
+#define ALPHABIT  0
+#define DIGITBIT  1
+#define PRINTBIT  2
+#define SPACEBIT  3
+#define XDIGITBIT 4
 
 
-#define MASK(B)		(1 << (B))
+#define MASK(B) (1 << (B))
 
 
 /*
 ** add 1 to char to allow index -1 (EOZ)
 */
-#define testprop(c,p)	(luai_ctype_[(c)+1] & (p))
+#define testprop(c,p) (luai_ctype_[(c)+1] & (p))
 
 /*
 ** 'lalpha' (Lua alphabetic) and 'lalnum' (Lua alphanumeric) both include '_'
 */
-#define lislalpha(c)	testprop(c, MASK(ALPHABIT))
-#define lislalnum(c)	testprop(c, (MASK(ALPHABIT) | MASK(DIGITBIT)))
-#define lisdigit(c)	testprop(c, MASK(DIGITBIT))
-#define lisspace(c)	testprop(c, MASK(SPACEBIT))
-#define lisprint(c)	testprop(c, MASK(PRINTBIT))
-#define lisxdigit(c)	testprop(c, MASK(XDIGITBIT))
+#define lislalpha(c) testprop(c, MASK(ALPHABIT))
+#define lislalnum(c) testprop(c, (MASK(ALPHABIT) | MASK(DIGITBIT)))
+#define lisdigit(c)  testprop(c, MASK(DIGITBIT))
+#define lisspace(c)  testprop(c, MASK(SPACEBIT))
+#define lisprint(c)  testprop(c, MASK(PRINTBIT))
+#define lisxdigit(c) testprop(c, MASK(XDIGITBIT))
 
 /*
 ** this 'ltolower' only works for alphabetic characters
 */
-#define ltolower(c)	((c) | ('A' ^ 'a'))
+#define ltolower(c) ((c) | ('A' ^ 'a'))
 
 
 /* two more entries for 0 and -1 (EOZ) */
 LUAI_DDEC const lu_byte luai_ctype_[UCHAR_MAX + 2];
 
 
-#else			/* }{ */
+#else               /* }{ */
 
 /*
 ** use standard C ctypes
@@ -80,16 +80,16 @@ LUAI_DDEC const lu_byte luai_ctype_[UCHAR_MAX + 2];
 #include <ctype.h>
 
 
-#define lislalpha(c)	(isalpha(c) || (c) == '_')
-#define lislalnum(c)	(isalnum(c) || (c) == '_')
-#define lisdigit(c)	(isdigit(c))
-#define lisspace(c)	(isspace(c))
-#define lisprint(c)	(isprint(c))
-#define lisxdigit(c)	(isxdigit(c))
+#define lislalpha(c) (isalpha(c) || (c) == '_')
+#define lislalnum(c) (isalnum(c) || (c) == '_')
+#define lisdigit(c)  (isdigit(c))
+#define lisspace(c)  (isspace(c))
+#define lisprint(c)  (isprint(c))
+#define lisxdigit(c) (isxdigit(c))
 
-#define ltolower(c)	(tolower(c))
+#define ltolower(c) (tolower(c))
 
-#endif			/* } */
+#endif              /* } */
 
 #endif
 
diff --git a/liblua/ldblib.c b/liblua/ldblib.c
index c02269457..65d2c971e 100644
--- a/liblua/ldblib.c
+++ b/liblua/ldblib.c
@@ -18,7 +18,7 @@
 #include "lualib.h"
 
 
-#define HOOKKEY		"_HKEY"
+#define HOOKKEY "_HKEY"
 
 
 
@@ -253,7 +253,7 @@ static int db_upvaluejoin (lua_State *L) {
 }
 
 
-#define gethooktable(L)	luaL_getsubtable(L, LUA_REGISTRYINDEX, HOOKKEY)
+#define gethooktable(L) luaL_getsubtable(L, LUA_REGISTRYINDEX, HOOKKEY)
 
 
 static void hookf (lua_State *L, lua_Debug *ar) {
diff --git a/liblua/ldebug.c b/liblua/ldebug.c
index 7e04f9d09..3c3f32e90 100644
--- a/liblua/ldebug.c
+++ b/liblua/ldebug.c
@@ -30,7 +30,7 @@
 
 
 
-#define noLuaClosure(f)		((f) == NULL || (f)->c.tt == LUA_TCCL)
+#define noLuaClosure(f) ((f) == NULL || (f)->c.tt == LUA_TCCL)
 
 
 static const char *getfuncname (lua_State *L, CallInfo *ci, const char **name);
diff --git a/liblua/ldebug.h b/liblua/ldebug.h
index fe39556b0..f95965029 100644
--- a/liblua/ldebug.h
+++ b/liblua/ldebug.h
@@ -11,14 +11,14 @@
 #include "lstate.h"
 
 
-#define pcRel(pc, p)	(cast(int, (pc) - (p)->code) - 1)
+#define pcRel(pc, p) (cast(int, (pc) - (p)->code) - 1)
 
-#define getfuncline(f,pc)	(((f)->lineinfo) ? (f)->lineinfo[pc] : 0)
+#define getfuncline(f,pc) (((f)->lineinfo) ? (f)->lineinfo[pc] : 0)
 
-#define resethookcount(L)	(L->hookcount = L->basehookcount)
+#define resethookcount(L) (L->hookcount = L->basehookcount)
 
 /* Active Lua function (given call info) */
-#define ci_func(ci)		(clLvalue((ci)->func))
+#define ci_func(ci) (clLvalue((ci)->func))
 
 
 LUAI_FUNC l_noret luaG_typeerror (lua_State *L, const TValue *o,
diff --git a/liblua/ldo.c b/liblua/ldo.c
index aafa3dca2..6c97ba5bf 100644
--- a/liblua/ldo.c
+++ b/liblua/ldo.c
@@ -50,22 +50,22 @@
 
 #if defined(__cplusplus) && !defined(LUA_USE_LONGJMP)
 /* C++ exceptions */
-#define LUAI_THROW(L,c)		throw(c)
+#define LUAI_THROW(L,c) throw(c)
 #define LUAI_TRY(L,c,a) \
-	try { a } catch(...) { if ((c)->status == 0) (c)->status = -1; }
-#define luai_jmpbuf		int  /* dummy variable */
+    try { a } catch(...) { if ((c)->status == 0) (c)->status = -1; }
+#define luai_jmpbuf int  /* dummy variable */
 
 #elif defined(LUA_USE_ULONGJMP)
 /* in Unix, try _longjmp/_setjmp (more efficient) */
-#define LUAI_THROW(L,c)		_longjmp((c)->b, 1)
-#define LUAI_TRY(L,c,a)		if (_setjmp((c)->b) == 0) { a }
-#define luai_jmpbuf		jmp_buf
+#define LUAI_THROW(L,c) _longjmp((c)->b, 1)
+#define LUAI_TRY(L,c,a) if (_setjmp((c)->b) == 0) { a }
+#define luai_jmpbuf jmp_buf
 
 #else
 /* default handling with long jumps */
-#define LUAI_THROW(L,c)		longjmp((c)->b, 1)
-#define LUAI_TRY(L,c,a)		if (setjmp((c)->b) == 0) { a }
-#define luai_jmpbuf		jmp_buf
+#define LUAI_THROW(L,c) longjmp((c)->b, 1)
+#define LUAI_TRY(L,c,a) if (setjmp((c)->b) == 0) { a }
+#define luai_jmpbuf jmp_buf
 
 #endif
 
@@ -155,7 +155,7 @@ static void correctstack (lua_State *L, TValue *oldstack) {
 
 
 /* some space for error handling */
-#define ERRORSTACKSIZE	(LUAI_MAXSTACK + 200)
+#define ERRORSTACKSIZE (LUAI_MAXSTACK + 200)
 
 
 void luaD_reallocstack (lua_State *L, int newsize) {
diff --git a/liblua/ldo.h b/liblua/ldo.h
index 27b837d99..f1c1b48d8 100644
--- a/liblua/ldo.h
+++ b/liblua/ldo.h
@@ -13,14 +13,14 @@
 #include "lzio.h"
 
 
-#define luaD_checkstack(L,n)	if (L->stack_last - L->top <= (n)) \
-				    luaD_growstack(L, n); else condmovestack(L);
+#define luaD_checkstack(L,n) if (L->stack_last - L->top <= (n)) \
+                    luaD_growstack(L, n); else condmovestack(L);
 
 
 #define incr_top(L) {L->top++; luaD_checkstack(L,0);}
 
-#define savestack(L,p)		((char *)(p) - (char *)L->stack)
-#define restorestack(L,n)	((TValue *)((char *)L->stack + (n)))
+#define savestack(L,p)    ((char *)(p) - (char *)L->stack)
+#define restorestack(L,n) ((TValue *)((char *)L->stack + (n)))
 
 
 /* type of protected functions, to be ran by `runprotected' */
diff --git a/liblua/ldump.c b/liblua/ldump.c
index d5e6a47cb..aca840679 100644
--- a/liblua/ldump.c
+++ b/liblua/ldump.c
@@ -23,8 +23,8 @@ typedef struct {
  int status;
 } DumpState;
 
-#define DumpMem(b,n,size,D)	DumpBlock(b,(n)*(size),D)
-#define DumpVar(x,D)		DumpMem(&x,1,sizeof(x),D)
+#define DumpMem(b,n,size,D) DumpBlock(b,(n)*(size),D)
+#define DumpVar(x,D)        DumpMem(&x,1,sizeof(x),D)
 
 static void DumpBlock(const void* b, size_t size, DumpState* D)
 {
@@ -67,13 +67,13 @@ static void DumpString(const TString* s, DumpState* D)
  }
  else
  {
-  size_t size=s->tsv.len+1;		/* include trailing '\0' */
+  size_t size=s->tsv.len+1; /* include trailing '\0' */
   DumpVar(size,D);
   DumpBlock(getstr(s),size*sizeof(char),D);
  }
 }
 
-#define DumpCode(f,D)	 DumpVector(f->code,f->sizecode,sizeof(Instruction),D)
+#define DumpCode(f,D) DumpVector(f->code,f->sizecode,sizeof(Instruction),D)
 
 static void DumpFunction(const Proto* f, DumpState* D);
 
@@ -88,16 +88,16 @@ static void DumpConstants(const Proto* f, DumpState* D)
   switch (ttypenv(o))
   {
    case LUA_TNIL:
-	break;
+    break;
    case LUA_TBOOLEAN:
-	DumpChar(bvalue(o),D);
-	break;
+    DumpChar(bvalue(o),D);
+    break;
    case LUA_TNUMBER:
-	DumpNumber(nvalue(o),D);
-	break;
+    DumpNumber(nvalue(o),D);
+    break;
    case LUA_TSTRING:
-	DumpString(rawtsvalue(o),D);
-	break;
+    DumpString(rawtsvalue(o),D);
+    break;
     default: lua_assert(0);
   }
  }
diff --git a/liblua/lfunc.h b/liblua/lfunc.h
index e236a717c..fee3205ad 100644
--- a/liblua/lfunc.h
+++ b/liblua/lfunc.h
@@ -11,10 +11,10 @@
 #include "lobject.h"
 
 
-#define sizeCclosure(n)	(cast(int, sizeof(CClosure)) + \
+#define sizeCclosure(n) (cast(int, sizeof(CClosure)) + \
                          cast(int, sizeof(TValue)*((n)-1)))
 
-#define sizeLclosure(n)	(cast(int, sizeof(LClosure)) + \
+#define sizeLclosure(n) (cast(int, sizeof(LClosure)) + \
                          cast(int, sizeof(TValue *)*((n)-1)))
 
 
diff --git a/liblua/lgc.c b/liblua/lgc.c
index af001682c..7388d1b28 100644
--- a/liblua/lgc.c
+++ b/liblua/lgc.c
@@ -28,44 +28,44 @@
 ** cost of sweeping one element (the size of a small object divided
 ** by some adjust for the sweep speed)
 */
-#define GCSWEEPCOST	((sizeof(TString) + 4) / 4)
+#define GCSWEEPCOST ((sizeof(TString) + 4) / 4)
 
 /* maximum number of elements to sweep in each single step */
-#define GCSWEEPMAX	(cast_int((GCSTEPSIZE / GCSWEEPCOST) / 4))
+#define GCSWEEPMAX  (cast_int((GCSTEPSIZE / GCSWEEPCOST) / 4))
 
 /* maximum number of finalizers to call in each GC step */
-#define GCFINALIZENUM	4
+#define GCFINALIZENUM 4
 
 
 /*
 ** macro to adjust 'stepmul': 'stepmul' is actually used like
 ** 'stepmul / STEPMULADJ' (value chosen by tests)
 */
-#define STEPMULADJ		200
+#define STEPMULADJ    200
 
 
 /*
 ** macro to adjust 'pause': 'pause' is actually used like
 ** 'pause / PAUSEADJ' (value chosen by tests)
 */
-#define PAUSEADJ		100
+#define PAUSEADJ      100
 
 
 /*
 ** 'makewhite' erases all color bits plus the old bit and then
 ** sets only the current white bit
 */
-#define maskcolors	(~(bit2mask(BLACKBIT, OLDBIT) | WHITEBITS))
-#define makewhite(g,x)	\
+#define maskcolors (~(bit2mask(BLACKBIT, OLDBIT) | WHITEBITS))
+#define makewhite(g,x) \
  (gch(x)->marked = cast_byte((gch(x)->marked & maskcolors) | luaC_white(g)))
 
-#define white2gray(x)	resetbits(gch(x)->marked, WHITEBITS)
-#define black2gray(x)	resetbit(gch(x)->marked, BLACKBIT)
+#define white2gray(x) resetbits(gch(x)->marked, WHITEBITS)
+#define black2gray(x) resetbit(gch(x)->marked, BLACKBIT)
 
 
-#define isfinalized(x)		testbit(gch(x)->marked, FINALIZEDBIT)
+#define isfinalized(x) testbit(gch(x)->marked, FINALIZEDBIT)
 
-#define checkdeadkey(n)	lua_assert(!ttisdeadkey(gkey(n)) || ttisnil(gval(n)))
+#define checkdeadkey(n) lua_assert(!ttisdeadkey(gkey(n)) || ttisnil(gval(n)))
 
 
 #define checkconsistency(obj)  \
@@ -76,7 +76,7 @@
   if (valiswhite(o)) reallymarkobject(g,gcvalue(o)); }
 
 #define markobject(g,t) { if ((t) && iswhite(obj2gco(t))) \
-		reallymarkobject(g, obj2gco(t)); }
+        reallymarkobject(g, obj2gco(t)); }
 
 static void reallymarkobject (global_State *g, GCObject *o);
 
@@ -91,13 +91,13 @@ static void reallymarkobject (global_State *g, GCObject *o);
 /*
 ** one after last element in a hash array
 */
-#define gnodelast(h)	gnode(h, cast(size_t, sizenode(h)))
+#define gnodelast(h) gnode(h, cast(size_t, sizenode(h)))
 
 
 /*
 ** link table 'h' into list pointed by 'p'
 */
-#define linktable(h,p)	((h)->gclist = *(p), *(p) = obj2gco(h))
+#define linktable(h,p) ((h)->gclist = *(p), *(p) = obj2gco(h))
 
 
 /*
@@ -680,7 +680,7 @@ static void freeobj (lua_State *L, GCObject *o) {
 }
 
 
-#define sweepwholelist(L,p)	sweeplist(L,p,MAX_LUMEM)
+#define sweepwholelist(L,p) sweeplist(L,p,MAX_LUMEM)
 static GCObject **sweeplist (lua_State *L, GCObject **p, lu_mem count);
 
 
@@ -915,7 +915,7 @@ static void setpause (global_State *g, l_mem estimate) {
 
 
 #define sweepphases  \
-	(bitmask(GCSsweepstring) | bitmask(GCSsweepudata) | bitmask(GCSsweep))
+    (bitmask(GCSsweepstring) | bitmask(GCSsweepudata) | bitmask(GCSsweep))
 
 
 /*
diff --git a/liblua/lgc.h b/liblua/lgc.h
index dee270b4d..1c92199a5 100644
--- a/liblua/lgc.h
+++ b/liblua/lgc.h
@@ -29,25 +29,25 @@
 /* how much to allocate before next GC step */
 #if !defined(GCSTEPSIZE)
 /* ~100 small strings */
-#define GCSTEPSIZE	(cast_int(100 * sizeof(TString)))
+#define GCSTEPSIZE (cast_int(100 * sizeof(TString)))
 #endif
 
 
 /*
 ** Possible states of the Garbage Collector
 */
-#define GCSpropagate	0
-#define GCSatomic	1
-#define GCSsweepstring	2
-#define GCSsweepudata	3
-#define GCSsweep	4
-#define GCSpause	5
+#define GCSpropagate   0
+#define GCSatomic      1
+#define GCSsweepstring 2
+#define GCSsweepudata  3
+#define GCSsweep       4
+#define GCSpause       5
 
 
 #define issweepphase(g)  \
-	(GCSsweepstring <= (g)->gcstate && (g)->gcstate <= GCSsweep)
+    (GCSsweepstring <= (g)->gcstate && (g)->gcstate <= GCSsweep)
 
-#define isgenerational(g)	((g)->gckind == KGC_GEN)
+#define isgenerational(g) ((g)->gckind == KGC_GEN)
 
 /*
 ** macros to tell when main invariant (white objects cannot point to black
@@ -58,7 +58,7 @@
 ** invariant must be kept all times.
 */
 
-#define keepinvariant(g)	(isgenerational(g) || g->gcstate <= GCSatomic)
+#define keepinvariant(g) (isgenerational(g) || g->gcstate <= GCSatomic)
 
 
 /*
@@ -73,66 +73,66 @@
 /*
 ** some useful bit tricks
 */
-#define resetbits(x,m)		((x) &= cast(lu_byte, ~(m)))
-#define setbits(x,m)		((x) |= (m))
-#define testbits(x,m)		((x) & (m))
-#define bitmask(b)		(1<<(b))
-#define bit2mask(b1,b2)		(bitmask(b1) | bitmask(b2))
-#define l_setbit(x,b)		setbits(x, bitmask(b))
-#define resetbit(x,b)		resetbits(x, bitmask(b))
-#define testbit(x,b)		testbits(x, bitmask(b))
+#define resetbits(x,m)  ((x) &= cast(lu_byte, ~(m)))
+#define setbits(x,m)    ((x) |= (m))
+#define testbits(x,m)   ((x) & (m))
+#define bitmask(b)      (1<<(b))
+#define bit2mask(b1,b2) (bitmask(b1) | bitmask(b2))
+#define l_setbit(x,b)   setbits(x, bitmask(b))
+#define resetbit(x,b)   resetbits(x, bitmask(b))
+#define testbit(x,b)    testbits(x, bitmask(b))
 
 
 /* Layout for bit use in `marked' field: */
-#define WHITE0BIT	0  /* object is white (type 0) */
-#define WHITE1BIT	1  /* object is white (type 1) */
-#define BLACKBIT	2  /* object is black */
-#define FINALIZEDBIT	3  /* object has been separated for finalization */
-#define SEPARATED	4  /* object is in 'finobj' list or in 'tobefnz' */
-#define FIXEDBIT	5  /* object is fixed (should not be collected) */
-#define OLDBIT		6  /* object is old (only in generational mode) */
+#define WHITE0BIT    0  /* object is white (type 0) */
+#define WHITE1BIT    1  /* object is white (type 1) */
+#define BLACKBIT     2  /* object is black */
+#define FINALIZEDBIT 3  /* object has been separated for finalization */
+#define SEPARATED    4  /* object is in 'finobj' list or in 'tobefnz' */
+#define FIXEDBIT     5  /* object is fixed (should not be collected) */
+#define OLDBIT       6  /* object is old (only in generational mode) */
 /* bit 7 is currently used by tests (luaL_checkmemory) */
 
-#define WHITEBITS	bit2mask(WHITE0BIT, WHITE1BIT)
+#define WHITEBITS bit2mask(WHITE0BIT, WHITE1BIT)
 
 
 #define iswhite(x)      testbits((x)->gch.marked, WHITEBITS)
 #define isblack(x)      testbit((x)->gch.marked, BLACKBIT)
 #define isgray(x)  /* neither white nor black */  \
-	(!testbits((x)->gch.marked, WHITEBITS | bitmask(BLACKBIT)))
+    (!testbits((x)->gch.marked, WHITEBITS | bitmask(BLACKBIT)))
 
-#define isold(x)	testbit((x)->gch.marked, OLDBIT)
+#define isold(x) testbit((x)->gch.marked, OLDBIT)
 
 /* MOVE OLD rule: whenever an object is moved to the beginning of
    a GC list, its old bit must be cleared */
-#define resetoldbit(o)	resetbit((o)->gch.marked, OLDBIT)
+#define resetoldbit(o) resetbit((o)->gch.marked, OLDBIT)
 
-#define otherwhite(g)	(g->currentwhite ^ WHITEBITS)
-#define isdeadm(ow,m)	(!(((m) ^ WHITEBITS) & (ow)))
-#define isdead(g,v)	isdeadm(otherwhite(g), (v)->gch.marked)
+#define otherwhite(g) (g->currentwhite ^ WHITEBITS)
+#define isdeadm(ow,m) (!(((m) ^ WHITEBITS) & (ow)))
+#define isdead(g,v) isdeadm(otherwhite(g), (v)->gch.marked)
 
-#define changewhite(x)	((x)->gch.marked ^= WHITEBITS)
-#define gray2black(x)	l_setbit((x)->gch.marked, BLACKBIT)
+#define changewhite(x) ((x)->gch.marked ^= WHITEBITS)
+#define gray2black(x) l_setbit((x)->gch.marked, BLACKBIT)
 
-#define valiswhite(x)	(iscollectable(x) && iswhite(gcvalue(x)))
+#define valiswhite(x) (iscollectable(x) && iswhite(gcvalue(x)))
 
-#define luaC_white(g)	cast(lu_byte, (g)->currentwhite & WHITEBITS)
+#define luaC_white(g) cast(lu_byte, (g)->currentwhite & WHITEBITS)
 
 
 #define luaC_condGC(L,c) \
-	{if (G(L)->GCdebt > 0) {c;}; condchangemem(L);}
-#define luaC_checkGC(L)		luaC_condGC(L, luaC_step(L);)
+    {if (G(L)->GCdebt > 0) {c;}; condchangemem(L);}
+#define luaC_checkGC(L) luaC_condGC(L, luaC_step(L);)
 
 
 #define luaC_barrier(L,p,v) { if (valiswhite(v) && isblack(obj2gco(p)))  \
-	luaC_barrier_(L,obj2gco(p),gcvalue(v)); }
+    luaC_barrier_(L,obj2gco(p),gcvalue(v)); }
 
 #define luaC_barrierback(L,p,v) { if (valiswhite(v) && isblack(obj2gco(p)))  \
-	luaC_barrierback_(L,p); }
+    luaC_barrierback_(L,p); }
 
 #define luaC_objbarrier(L,p,o)  \
-	{ if (iswhite(obj2gco(o)) && isblack(obj2gco(p))) \
-		luaC_barrier_(L,obj2gco(p),obj2gco(o)); }
+    { if (iswhite(obj2gco(o)) && isblack(obj2gco(p))) \
+        luaC_barrier_(L,obj2gco(p),obj2gco(o)); }
 
 #define luaC_objbarrierback(L,p,o)  \
    { if (iswhite(obj2gco(o)) && isblack(obj2gco(p))) luaC_barrierback_(L,p); }
diff --git a/liblua/liolib.c b/liblua/liolib.c
index 3f80db192..9db6f6f87 100644
--- a/liblua/liolib.c
+++ b/liblua/liolib.c
@@ -37,10 +37,10 @@
 ** the standard ones.
 */
 #define lua_checkmode(mode) \
-	(*mode != '\0' && strchr("rwa", *(mode++)) != NULL &&	\
-	(*mode != '+' || ++mode) &&  /* skip if char is '+' */	\
-	(*mode != 'b' || ++mode) &&  /* skip if char is 'b' */	\
-	(*mode == '\0'))
+    (*mode != '\0' && strchr("rwa", *(mode++)) != NULL && \
+    (*mode != '+' || ++mode) &&  /* skip if char is '+' */ \
+    (*mode != 'b' || ++mode) &&  /* skip if char is 'b' */ \
+    (*mode == '\0'))
 
 #endif
 
@@ -51,29 +51,29 @@
 ** =======================================================
 */
 
-#if !defined(lua_popen)	/* { */
+#if !defined(lua_popen) /* { */
 
-#if defined(LUA_USE_POPEN)	/* { */
+#if defined(LUA_USE_POPEN) /* { */
 
-#define lua_popen(L,c,m)	((void)L, fflush(NULL), popen(c,m))
-#define lua_pclose(L,file)	((void)L, pclose(file))
+#define lua_popen(L,c,m) ((void)L, fflush(NULL), popen(c,m))
+#define lua_pclose(L,file) ((void)L, pclose(file))
 
-#elif defined(LUA_WIN)		/* }{ */
+#elif defined(LUA_WIN)     /* }{ */
 
-#define lua_popen(L,c,m)		((void)L, _popen(c,m))
-#define lua_pclose(L,file)		((void)L, _pclose(file))
+#define lua_popen(L,c,m) ((void)L, _popen(c,m))
+#define lua_pclose(L,file) ((void)L, _pclose(file))
 
 
-#else				/* }{ */
+#else                      /* }{ */
 
-#define lua_popen(L,c,m)		((void)((void)c, m),  \
-		luaL_error(L, LUA_QL("popen") " not supported"), (FILE*)0)
-#define lua_pclose(L,file)		((void)((void)L, file), -1)
+#define lua_popen(L,c,m) ((void)((void)c, m),  \
+        luaL_error(L, LUA_QL("popen") " not supported"), (FILE*)0)
+#define lua_pclose(L,file) ((void)((void)L, file), -1)
 
 
-#endif				/* } */
+#endif                     /* } */
 
-#endif			/* } */
+#endif                  /* } */
 
 /* }====================================================== */
 
@@ -84,46 +84,46 @@
 ** =======================================================
 */
 
-#if !defined(lua_fseek)	/* { */
+#if !defined(lua_fseek) /* { */
 
 #if defined(LUA_USE_POSIX)
 
-#define l_fseek(f,o,w)		fseeko(f,o,w)
-#define l_ftell(f)		ftello(f)
-#define l_seeknum		off_t
+#define l_fseek(f,o,w) fseeko(f,o,w)
+#define l_ftell(f) ftello(f)
+#define l_seeknum off_t
 
 #elif defined(LUA_WIN) && !defined(_CRTIMP_TYPEINFO) \
    && defined(_MSC_VER) && (_MSC_VER >= 1400)
 /* Windows (but not DDK) and Visual C++ 2005 or higher */
 
-#define l_fseek(f,o,w)		_fseeki64(f,o,w)
-#define l_ftell(f)		_ftelli64(f)
-#define l_seeknum		__int64
+#define l_fseek(f,o,w) _fseeki64(f,o,w)
+#define l_ftell(f) _ftelli64(f)
+#define l_seeknum __int64
 
 #else
 
-#define l_fseek(f,o,w)		fseek(f,o,w)
-#define l_ftell(f)		ftell(f)
-#define l_seeknum		long
+#define l_fseek(f,o,w) fseek(f,o,w)
+#define l_ftell(f) ftell(f)
+#define l_seeknum long
 
 #endif
 
-#endif			/* } */
+#endif                   /* } */
 
 /* }====================================================== */
 
 
-#define IO_PREFIX	"_IO_"
-#define IO_INPUT	(IO_PREFIX "input")
-#define IO_OUTPUT	(IO_PREFIX "output")
+#define IO_PREFIX "_IO_"
+#define IO_INPUT (IO_PREFIX "input")
+#define IO_OUTPUT (IO_PREFIX "output")
 
 
 typedef luaL_Stream LStream;
 
 
-#define tolstream(L)	((LStream *)luaL_checkudata(L, 1, LUA_FILEHANDLE))
+#define tolstream(L) ((LStream *)luaL_checkudata(L, 1, LUA_FILEHANDLE))
 
-#define isclosed(p)	((p)->closef == NULL)
+#define isclosed(p) ((p)->closef == NULL)
 
 
 static int io_type (lua_State *L) {
@@ -389,7 +389,7 @@ static int read_line (lua_State *L, FILE *f, int chop) {
 }
 
 
-#define MAX_SIZE_T	(~(size_t)0)
+#define MAX_SIZE_T (~(size_t)0)
 
 static void read_all (lua_State *L, FILE *f) {
   size_t rlen = LUAL_BUFFERSIZE;  /* how much to read in each cycle */
diff --git a/liblua/llex.c b/liblua/llex.c
index 81b8de9e3..bd83444ce 100644
--- a/liblua/llex.c
+++ b/liblua/llex.c
@@ -29,7 +29,7 @@
 
 
 
-#define currIsNewline(ls)	(ls->current == '\n' || ls->current == '\r')
+#define currIsNewline(ls) (ls->current == '\n' || ls->current == '\r')
 
 
 /* ORDER RESERVED */
@@ -201,11 +201,11 @@ static void buffreplace (LexState *ls, char from, char to) {
 #if ANDROID
 #define getlocaldecpoint() '.'
 #elif !defined(getlocaledecpoint)
-#define getlocaledecpoint()	(localeconv()->decimal_point[0])
+#define getlocaledecpoint() (localeconv()->decimal_point[0])
 #endif
 
 
-#define buff2d(b,e)	luaO_str2d(luaZ_buffer(b), luaZ_bufflen(b) - 1, e)
+#define buff2d(b,e) luaO_str2d(luaZ_buffer(b), luaZ_bufflen(b) - 1, e)
 
 /*
 ** in case of format error, try to change decimal point separator to
diff --git a/liblua/llex.h b/liblua/llex.h
index 9ca8a2994..f78926d66 100644
--- a/liblua/llex.h
+++ b/liblua/llex.h
@@ -11,7 +11,7 @@
 #include "lzio.h"
 
 
-#define FIRST_RESERVED	257
+#define FIRST_RESERVED 257
 
 
 
@@ -31,7 +31,7 @@ enum RESERVED {
 };
 
 /* number of reserved words */
-#define NUM_RESERVED	(cast(int, TK_WHILE-FIRST_RESERVED+1))
+#define NUM_RESERVED (cast(int, TK_WHILE-FIRST_RESERVED+1))
 
 
 typedef union {
diff --git a/liblua/llimits.h b/liblua/llimits.h
index 1b8c79bda..f5f8ed9e1 100644
--- a/liblua/llimits.h
+++ b/liblua/llimits.h
@@ -27,11 +27,11 @@ typedef LUAI_MEM l_mem;
 typedef unsigned char lu_byte;
 
 
-#define MAX_SIZET	((size_t)(~(size_t)0)-2)
+#define MAX_SIZET ((size_t)(~(size_t)0)-2)
 
-#define MAX_LUMEM	((lu_mem)(~(lu_mem)0)-2)
+#define MAX_LUMEM ((lu_mem)(~(lu_mem)0)-2)
 
-#define MAX_LMEM	((l_mem) ((MAX_LUMEM >> 1) - 2))
+#define MAX_LMEM  ((l_mem) ((MAX_LUMEM >> 1) - 2))
 
 
 #define MAX_INT (INT_MAX-2)  /* maximum value of an int (-2 for safety) */
@@ -47,7 +47,7 @@ typedef unsigned char lu_byte;
 
 /* type to ensure maximum alignment */
 #if !defined(LUAI_USER_ALIGNMENT_T)
-#define LUAI_USER_ALIGNMENT_T	union { double u; void *s; long l; }
+#define LUAI_USER_ALIGNMENT_T union { double u; void *s; long l; }
 #endif
 
 typedef LUAI_USER_ALIGNMENT_T L_Umaxalign;
@@ -59,13 +59,13 @@ typedef LUAI_UACNUMBER l_uacNumber;
 
 /* internal assertions for in-house debugging */
 #if defined(lua_assert)
-#define check_exp(c,e)		(lua_assert(c), (e))
+#define check_exp(c,e) (lua_assert(c), (e))
 /* to avoid problems with conditions too long */
-#define lua_longassert(c)	{ if (!(c)) lua_assert(0); }
+#define lua_longassert(c) { if (!(c)) lua_assert(0); }
 #else
-#define lua_assert(c)		((void)0)
-#define check_exp(c,e)		(e)
-#define lua_longassert(c)	((void)0)
+#define lua_assert(c) ((void)0)
+#define check_exp(c,e) (e)
+#define lua_longassert(c) ((void)0)
 #endif
 
 /*
@@ -75,38 +75,38 @@ typedef LUAI_UACNUMBER l_uacNumber;
 
 #if defined(LUA_USE_APICHECK)
 #include <assert.h>
-#define luai_apicheck(L,e)	assert(e)
+#define luai_apicheck(L,e) assert(e)
 #else
-#define luai_apicheck(L,e)	lua_assert(e)
+#define luai_apicheck(L,e) lua_assert(e)
 #endif
 
 #endif
 
-#define api_check(l,e,msg)	luai_apicheck(l,(e) && msg)
+#define api_check(l,e,msg) luai_apicheck(l,(e) && msg)
 
 
 #if !defined(UNUSED)
-#define UNUSED(x)	((void)(x))	/* to avoid warnings */
+#define UNUSED(x) ((void)(x)) /* to avoid warnings */
 #endif
 
 
-#define cast(t, exp)	((t)(exp))
+#define cast(t, exp) ((t)(exp))
 
-#define cast_byte(i)	cast(lu_byte, (i))
-#define cast_num(i)	cast(lua_Number, (i))
-#define cast_int(i)	cast(int, (i))
-#define cast_uchar(i)	cast(unsigned char, (i))
+#define cast_byte(i) cast(lu_byte, (i))
+#define cast_num(i) cast(lua_Number, (i))
+#define cast_int(i) cast(int, (i))
+#define cast_uchar(i) cast(unsigned char, (i))
 
 
 /*
 ** non-return type
 */
 #if defined(__GNUC__)
-#define l_noret		void __attribute__((noreturn))
+#define l_noret  void __attribute__((noreturn))
 #elif defined(_MSC_VER)
-#define l_noret		void __declspec(noreturn)
+#define l_noret void __declspec(noreturn)
 #else
-#define l_noret		void
+#define l_noret void
 #endif
 
 
@@ -116,14 +116,14 @@ typedef LUAI_UACNUMBER l_uacNumber;
 ** in a program. (Value must fit in an unsigned short int.)
 */
 #if !defined(LUAI_MAXCCALLS)
-#define LUAI_MAXCCALLS		200
+#define LUAI_MAXCCALLS 200
 #endif
 
 /*
 ** maximum number of upvalues in a closure (both C and Lua). (Value
 ** must fit in an unsigned char.)
 */
-#define MAXUPVAL	UCHAR_MAX
+#define MAXUPVAL UCHAR_MAX
 
 
 /*
@@ -135,19 +135,19 @@ typedef lu_int32 Instruction;
 
 
 /* maximum stack for a Lua function */
-#define MAXSTACK	250
+#define MAXSTACK 250
 
 
 
 /* minimum size for the string table (must be power of 2) */
 #if !defined(MINSTRTABSIZE)
-#define MINSTRTABSIZE	32
+#define MINSTRTABSIZE 32
 #endif
 
 
 /* minimum size for string buffer */
 #if !defined(LUA_MINBUFFER)
-#define LUA_MINBUFFER	32
+#define LUA_MINBUFFER 32
 #endif
 
 
@@ -167,27 +167,27 @@ typedef lu_int32 Instruction;
 ** created/deleted/resumed/yielded.
 */
 #if !defined(luai_userstateopen)
-#define luai_userstateopen(L)		((void)L)
+#define luai_userstateopen(L) ((void)L)
 #endif
 
 #if !defined(luai_userstateclose)
-#define luai_userstateclose(L)		((void)L)
+#define luai_userstateclose(L) ((void)L)
 #endif
 
 #if !defined(luai_userstatethread)
-#define luai_userstatethread(L,L1)	((void)L)
+#define luai_userstatethread(L,L1) ((void)L)
 #endif
 
 #if !defined(luai_userstatefree)
-#define luai_userstatefree(L,L1)	((void)L)
+#define luai_userstatefree(L,L1) ((void)L)
 #endif
 
 #if !defined(luai_userstateresume)
-#define luai_userstateresume(L,n)       ((void)L)
+#define luai_userstateresume(L,n) ((void)L)
 #endif
 
 #if !defined(luai_userstateyield)
-#define luai_userstateyield(L,n)        ((void)L)
+#define luai_userstateyield(L,n) ((void)L)
 #endif
 
 /*
@@ -200,29 +200,29 @@ typedef lu_int32 Instruction;
 ** both small and large values (outside the range of integers).
 */
 
-#if defined(MS_ASMTRICK) || defined(LUA_MSASMTRICK)	/* { */
+#if defined(MS_ASMTRICK) || defined(LUA_MSASMTRICK) /* { */
 /* trick with Microsoft assembler for X86 */
 
 #define lua_number2int(i,n)  __asm {__asm fld n   __asm fistp i}
-#define lua_number2integer(i,n)		lua_number2int(i, n)
+#define lua_number2integer(i,n) lua_number2int(i, n)
 #define lua_number2unsigned(i,n)  \
   {__int64 l; __asm {__asm fld n   __asm fistp l} i = (unsigned int)l;}
 
 
-#elif defined(LUA_IEEE754TRICK)		/* }{ */
+#elif defined(LUA_IEEE754TRICK) /* }{ */
 /* the next trick should work on any machine using IEEE754 with
    a 32-bit int type */
 
 union luai_Cast { double l_d; LUA_INT32 l_p[2]; };
 
-#if !defined(LUA_IEEEENDIAN)	/* { */
-#define LUAI_EXTRAIEEE	\
+#if !defined(LUA_IEEEENDIAN) /* { */
+#define LUAI_EXTRAIEEE \
   static const union luai_Cast ieeeendian = {-(33.0 + 6755399441055744.0)};
-#define LUA_IEEEENDIANLOC	(ieeeendian.l_p[1] == 33)
+#define LUA_IEEEENDIANLOC (ieeeendian.l_p[1] == 33)
 #else
-#define LUA_IEEEENDIANLOC	LUA_IEEEENDIAN
-#define LUAI_EXTRAIEEE		/* empty */
-#endif				/* } */
+#define LUA_IEEEENDIANLOC LUA_IEEEENDIAN
+#define LUAI_EXTRAIEEE /* empty */
+#endif                       /* } */
 
 #define lua_number2int32(i,n,t) \
   { LUAI_EXTRAIEEE \
@@ -233,38 +233,38 @@ union luai_Cast { double l_d; LUA_INT32 l_p[2]; };
   { volatile union luai_Cast u; u.l_d = (n) + 1.0;  /* avoid -0 */ \
     (i) = u.l_p[0]; (i) += u.l_p[1]; }  /* add double bits for his hash */
 
-#define lua_number2int(i,n)		lua_number2int32(i, n, int)
-#define lua_number2unsigned(i,n)	lua_number2int32(i, n, lua_Unsigned)
+#define lua_number2int(i,n) lua_number2int32(i, n, int)
+#define lua_number2unsigned(i,n) lua_number2int32(i, n, lua_Unsigned)
 
 /* the trick can be expanded to lua_Integer when it is a 32-bit value */
 #if defined(LUA_IEEELL)
-#define lua_number2integer(i,n)		lua_number2int32(i, n, lua_Integer)
+#define lua_number2integer(i,n) lua_number2int32(i, n, lua_Integer)
 #endif
 
-#endif				/* } */
+#endif /* } */
 
 
 /* the following definitions always work, but may be slow */
 
 #if !defined(lua_number2int)
-#define lua_number2int(i,n)	((i)=(int)(n))
+#define lua_number2int(i,n) ((i)=(int)(n))
 #endif
 
 #if !defined(lua_number2integer)
-#define lua_number2integer(i,n)	((i)=(lua_Integer)(n))
+#define lua_number2integer(i,n) ((i)=(lua_Integer)(n))
 #endif
 
-#if !defined(lua_number2unsigned)	/* { */
+#if !defined(lua_number2unsigned) /* { */
 /* the following definition assures proper modulo behavior */
 #if defined(LUA_NUMBER_DOUBLE) || defined(LUA_NUMBER_FLOAT)
 #include <math.h>
-#define SUPUNSIGNED	((lua_Number)(~(lua_Unsigned)0) + 1)
+#define SUPUNSIGNED ((lua_Number)(~(lua_Unsigned)0) + 1)
 #define lua_number2unsigned(i,n)  \
-	((i)=(lua_Unsigned)((n) - floor((n)/SUPUNSIGNED)*SUPUNSIGNED))
+    ((i)=(lua_Unsigned)((n) - floor((n)/SUPUNSIGNED)*SUPUNSIGNED))
 #else
-#define lua_number2unsigned(i,n)	((i)=(lua_Unsigned)(n))
+#define lua_number2unsigned(i,n) ((i)=(lua_Unsigned)(n))
 #endif
-#endif				/* } */
+#endif                            /* } */
 
 
 #if !defined(lua_unsigned2number)
@@ -293,17 +293,17 @@ union luai_Cast { double l_d; LUA_INT32 l_p[2]; };
 ** macro to control inclusion of some hard tests on stack reallocation
 */
 #if !defined(HARDSTACKTESTS)
-#define condmovestack(L)	((void)0)
+#define condmovestack(L) ((void)0)
 #else
 /* realloc stack keeping its size */
-#define condmovestack(L)	luaD_reallocstack((L), (L)->stacksize)
+#define condmovestack(L) luaD_reallocstack((L), (L)->stacksize)
 #endif
 
 #if !defined(HARDMEMTESTS)
-#define condchangemem(L)	condmovestack(L)
+#define condchangemem(L) condmovestack(L)
 #else
 #define condchangemem(L)  \
-	((void)(!(G(L)->gcrunning) || (luaC_fullgc(L, 0), 1)))
+    ((void)(!(G(L)->gcrunning) || (luaC_fullgc(L, 0), 1)))
 #endif
 
 #endif
diff --git a/liblua/lmathlib.c b/liblua/lmathlib.c
index a49f1fd25..835a5494b 100644
--- a/liblua/lmathlib.c
+++ b/liblua/lmathlib.c
@@ -18,8 +18,8 @@
 
 
 #undef PI
-#define PI	((lua_Number)(3.1415926535897932384626433832795))
-#define RADIANS_PER_DEGREE	((lua_Number)(PI/180.0))
+#define PI ((lua_Number)(3.1415926535897932384626433832795))
+#define RADIANS_PER_DEGREE ((lua_Number)(PI/180.0))
 
 
 
diff --git a/liblua/lmem.c b/liblua/lmem.c
index 3f88496e0..6db0b791c 100644
--- a/liblua/lmem.c
+++ b/liblua/lmem.c
@@ -40,7 +40,7 @@
 
 
 
-#define MINSIZEARRAY	4
+#define MINSIZEARRAY 4
 
 
 void *luaM_growaux_ (lua_State *L, void *block, int *size, size_t size_elems,
diff --git a/liblua/lmem.h b/liblua/lmem.h
index 5f850999a..4a9a3c27f 100644
--- a/liblua/lmem.h
+++ b/liblua/lmem.h
@@ -26,16 +26,16 @@
      (cast(size_t, (n)+1) > MAX_SIZET/(e)) ? (luaM_toobig(L), 0) : 0), \
    luaM_realloc_(L, (b), (on)*(e), (n)*(e)))
 
-#define luaM_freemem(L, b, s)	luaM_realloc_(L, (b), (s), 0)
-#define luaM_free(L, b)		luaM_realloc_(L, (b), sizeof(*(b)), 0)
+#define luaM_freemem(L, b, s) luaM_realloc_(L, (b), (s), 0)
+#define luaM_free(L, b) luaM_realloc_(L, (b), sizeof(*(b)), 0)
 #define luaM_freearray(L, b, n)   luaM_reallocv(L, (b), n, 0, sizeof((b)[0]))
 
-#define luaM_malloc(L,s)	luaM_realloc_(L, NULL, 0, (s))
-#define luaM_new(L,t)		cast(t *, luaM_malloc(L, sizeof(t)))
+#define luaM_malloc(L,s) luaM_realloc_(L, NULL, 0, (s))
+#define luaM_new(L,t) cast(t *, luaM_malloc(L, sizeof(t)))
 #define luaM_newvector(L,n,t) \
-		cast(t *, luaM_reallocv(L, NULL, 0, n, sizeof(t)))
+        cast(t *, luaM_reallocv(L, NULL, 0, n, sizeof(t)))
 
-#define luaM_newobject(L,tag,s)	luaM_realloc_(L, NULL, tag, (s))
+#define luaM_newobject(L,tag,s) luaM_realloc_(L, NULL, tag, (s))
 
 #define luaM_growvector(L,v,nelems,size,t,limit,e) \
           if ((nelems)+1 > (size)) \
diff --git a/liblua/loadlib.c b/liblua/loadlib.c
index a9959277b..52b48855d 100644
--- a/liblua/loadlib.c
+++ b/liblua/loadlib.c
@@ -35,17 +35,17 @@
 ** variables that Lua check to set its paths.
 */
 #if !defined(LUA_PATH)
-#define LUA_PATH	"LUA_PATH"
+#define LUA_PATH "LUA_PATH"
 #endif
 
 #if !defined(LUA_CPATH)
-#define LUA_CPATH	"LUA_CPATH"
+#define LUA_CPATH "LUA_CPATH"
 #endif
 
-#define LUA_PATHSUFFIX		"_" LUA_VERSION_MAJOR "_" LUA_VERSION_MINOR
+#define LUA_PATHSUFFIX "_" LUA_VERSION_MAJOR "_" LUA_VERSION_MINOR
 
-#define LUA_PATHVERSION		LUA_PATH LUA_PATHSUFFIX
-#define LUA_CPATHVERSION	LUA_CPATH LUA_PATHSUFFIX
+#define LUA_PATHVERSION LUA_PATH LUA_PATHSUFFIX
+#define LUA_CPATHVERSION LUA_CPATH LUA_PATHSUFFIX
 
 /*
 ** LUA_PATH_SEP is the character that separates templates in a path.
@@ -57,16 +57,16 @@
 ** luaopen_ function name.
 */
 #if !defined (LUA_PATH_SEP)
-#define LUA_PATH_SEP		";"
+#define LUA_PATH_SEP ";"
 #endif
 #if !defined (LUA_PATH_MARK)
-#define LUA_PATH_MARK		"?"
+#define LUA_PATH_MARK "?"
 #endif
 #if !defined (LUA_EXEC_DIR)
-#define LUA_EXEC_DIR		"!"
+#define LUA_EXEC_DIR "!"
 #endif
 #if !defined (LUA_IGMARK)
-#define LUA_IGMARK		"-"
+#define LUA_IGMARK "-"
 #endif
 
 
@@ -77,32 +77,32 @@
 ** when searching for a Lua loader.
 */
 #if !defined(LUA_CSUBSEP)
-#define LUA_CSUBSEP		LUA_DIRSEP
+#define LUA_CSUBSEP LUA_DIRSEP
 #endif
 
 #if !defined(LUA_LSUBSEP)
-#define LUA_LSUBSEP		LUA_DIRSEP
+#define LUA_LSUBSEP LUA_DIRSEP
 #endif
 
 
 /* prefix for open functions in C libraries */
-#define LUA_POF		"luaopen_"
+#define LUA_POF "luaopen_"
 
 /* separator for open functions in C libraries */
-#define LUA_OFSEP	"_"
+#define LUA_OFSEP "_"
 
 
 /* table (in the registry) that keeps handles for all loaded C libraries */
-#define CLIBS		"_CLIBS"
+#define CLIBS "_CLIBS"
 
-#define LIB_FAIL	"open"
+#define LIB_FAIL "open"
 
 
 /* error codes for ll_loadfunc */
-#define ERRLIB		1
-#define ERRFUNC		2
+#define ERRLIB  1
+#define ERRFUNC 2
 
-#define setprogdir(L)		((void)0)
+#define setprogdir(L) ((void)0)
 
 
 /*
@@ -161,7 +161,7 @@ static lua_CFunction ll_sym (lua_State *L, void *lib, const char *sym) {
 ** optional flags for LoadLibraryEx
 */
 #if !defined(LUA_LLE_FLAGS)
-#define LUA_LLE_FLAGS	0
+#define LUA_LLE_FLAGS 0
 #endif
 
 
@@ -220,10 +220,10 @@ static lua_CFunction ll_sym (lua_State *L, void *lib, const char *sym) {
 */
 
 #undef LIB_FAIL
-#define LIB_FAIL	"absent"
+#define LIB_FAIL "absent"
 
 
-#define DLMSG	"dynamic libraries not enabled; check your Lua installation"
+#define DLMSG "dynamic libraries not enabled; check your Lua installation"
 
 
 static void ll_unloadlib (void *lib) {
@@ -619,7 +619,7 @@ static int ll_seeall (lua_State *L) {
 
 
 /* auxiliary mark (for internal use) */
-#define AUXMARK		"\1"
+#define AUXMARK "\1"
 
 
 /*
diff --git a/liblua/lobject.c b/liblua/lobject.c
index c152785a5..2e6f2b95a 100644
--- a/liblua/lobject.c
+++ b/liblua/lobject.c
@@ -241,13 +241,13 @@ const char *luaO_pushfstring (lua_State *L, const char *fmt, ...) {
 
 
 /* number of chars of a literal string without the ending \0 */
-#define LL(x)	(sizeof(x)/sizeof(char) - 1)
+#define LL(x) (sizeof(x)/sizeof(char) - 1)
 
-#define RETS	"..."
-#define PRE	"[string \""
-#define POS	"\"]"
+#define RETS "..."
+#define PRE "[string \""
+#define POS "\"]"
 
-#define addstr(a,b,l)	( memcpy(a,b,(l) * sizeof(char)), a += (l) )
+#define addstr(a,b,l) ( memcpy(a,b,(l) * sizeof(char)), a += (l) )
 
 void luaO_chunkid (char *out, const char *source, size_t bufflen) {
   size_t l = strlen(source);
diff --git a/liblua/lobject.h b/liblua/lobject.h
index dd23b9143..acf95689d 100644
--- a/liblua/lobject.h
+++ b/liblua/lobject.h
@@ -19,14 +19,14 @@
 /*
 ** Extra tags for non-values
 */
-#define LUA_TPROTO	LUA_NUMTAGS
-#define LUA_TUPVAL	(LUA_NUMTAGS+1)
-#define LUA_TDEADKEY	(LUA_NUMTAGS+2)
+#define LUA_TPROTO    LUA_NUMTAGS
+#define LUA_TUPVAL    (LUA_NUMTAGS+1)
+#define LUA_TDEADKEY  (LUA_NUMTAGS+2)
 
 /*
 ** number of all possible tags (including LUA_TNONE but excluding DEADKEY)
 */
-#define LUA_TOTALTAGS	(LUA_TUPVAL+2)
+#define LUA_TOTALTAGS (LUA_TUPVAL+2)
 
 
 /*
@@ -36,7 +36,7 @@
 ** bit 6: whether value is collectable
 */
 
-#define VARBITS		(3 << 4)
+#define VARBITS (3 << 4)
 
 
 /*
@@ -47,21 +47,21 @@
 */
 
 /* Variant tags for functions */
-#define LUA_TLCL	(LUA_TFUNCTION | (0 << 4))  /* Lua closure */
-#define LUA_TLCF	(LUA_TFUNCTION | (1 << 4))  /* light C function */
-#define LUA_TCCL	(LUA_TFUNCTION | (2 << 4))  /* C closure */
+#define LUA_TLCL (LUA_TFUNCTION | (0 << 4))  /* Lua closure */
+#define LUA_TLCF (LUA_TFUNCTION | (1 << 4))  /* light C function */
+#define LUA_TCCL (LUA_TFUNCTION | (2 << 4))  /* C closure */
 
 
 /* Variant tags for strings */
-#define LUA_TSHRSTR	(LUA_TSTRING | (0 << 4))  /* short strings */
-#define LUA_TLNGSTR	(LUA_TSTRING | (1 << 4))  /* long strings */
+#define LUA_TSHRSTR (LUA_TSTRING | (0 << 4))  /* short strings */
+#define LUA_TLNGSTR (LUA_TSTRING | (1 << 4))  /* long strings */
 
 
 /* Bit mark for collectable types */
-#define BIT_ISCOLLECTABLE	(1 << 6)
+#define BIT_ISCOLLECTABLE (1 << 6)
 
 /* mark a tag as collectable */
-#define ctb(t)			((t) | BIT_ISCOLLECTABLE)
+#define ctb(t) ((t) | BIT_ISCOLLECTABLE)
 
 
 /*
@@ -74,7 +74,7 @@ typedef union GCObject GCObject;
 ** Common Header for all collectable objects (in macro form, to be
 ** included in other objects)
 */
-#define CommonHeader	GCObject *next; lu_byte tt; lu_byte marked
+#define CommonHeader GCObject *next; lu_byte tt; lu_byte marked
 
 
 /*
@@ -92,7 +92,7 @@ typedef struct GCheader {
 typedef union Value Value;
 
 
-#define numfield	lua_Number n;    /* numbers */
+#define numfield lua_Number n;    /* numbers */
 
 
 
@@ -101,88 +101,88 @@ typedef union Value Value;
 ** an actual value plus a tag with its type.
 */
 
-#define TValuefields	Value value_; int tt_
+#define TValuefields Value value_; int tt_
 
 typedef struct lua_TValue TValue;
 
 
 /* macro defining a nil value */
-#define NILCONSTANT	{NULL}, LUA_TNIL
+#define NILCONSTANT {NULL}, LUA_TNIL
 
 
-#define val_(o)		((o)->value_)
-#define num_(o)		(val_(o).n)
+#define val_(o) ((o)->value_)
+#define num_(o) (val_(o).n)
 
 
 /* raw type tag of a TValue */
-#define rttype(o)	((o)->tt_)
+#define rttype(o) ((o)->tt_)
 
 /* tag with no variants (bits 0-3) */
-#define novariant(x)	((x) & 0x0F)
+#define novariant(x) ((x) & 0x0F)
 
 /* type tag of a TValue (bits 0-3 for tags + variant bits 4-5) */
-#define ttype(o)	(rttype(o) & 0x3F)
+#define ttype(o) (rttype(o) & 0x3F)
 
 /* type tag of a TValue with no variants (bits 0-3) */
-#define ttypenv(o)	(novariant(rttype(o)))
+#define ttypenv(o) (novariant(rttype(o)))
 
 
 /* Macros to test type */
-#define checktag(o,t)		(rttype(o) == (t))
-#define checktype(o,t)		(ttypenv(o) == (t))
-#define ttisnumber(o)		checktag((o), LUA_TNUMBER)
-#define ttisnil(o)		checktag((o), LUA_TNIL)
-#define ttisboolean(o)		checktag((o), LUA_TBOOLEAN)
-#define ttislightuserdata(o)	checktag((o), LUA_TLIGHTUSERDATA)
-#define ttisstring(o)		checktype((o), LUA_TSTRING)
-#define ttisshrstring(o)	checktag((o), ctb(LUA_TSHRSTR))
-#define ttislngstring(o)	checktag((o), ctb(LUA_TLNGSTR))
-#define ttistable(o)		checktag((o), ctb(LUA_TTABLE))
-#define ttisfunction(o)		checktype(o, LUA_TFUNCTION)
-#define ttisclosure(o)		((rttype(o) & 0x1F) == LUA_TFUNCTION)
-#define ttisCclosure(o)		checktag((o), ctb(LUA_TCCL))
-#define ttisLclosure(o)		checktag((o), ctb(LUA_TLCL))
-#define ttislcf(o)		checktag((o), LUA_TLCF)
-#define ttisuserdata(o)		checktag((o), ctb(LUA_TUSERDATA))
-#define ttisthread(o)		checktag((o), ctb(LUA_TTHREAD))
-#define ttisdeadkey(o)		checktag((o), LUA_TDEADKEY)
+#define checktag(o,t)        (rttype(o) == (t))
+#define checktype(o,t)       (ttypenv(o) == (t))
+#define ttisnumber(o)        checktag((o), LUA_TNUMBER)
+#define ttisnil(o)           checktag((o), LUA_TNIL)
+#define ttisboolean(o)       checktag((o), LUA_TBOOLEAN)
+#define ttislightuserdata(o) checktag((o), LUA_TLIGHTUSERDATA)
+#define ttisstring(o)        checktype((o), LUA_TSTRING)
+#define ttisshrstring(o)     checktag((o), ctb(LUA_TSHRSTR))
+#define ttislngstring(o)     checktag((o), ctb(LUA_TLNGSTR))
+#define ttistable(o)         checktag((o), ctb(LUA_TTABLE))
+#define ttisfunction(o)      checktype(o, LUA_TFUNCTION)
+#define ttisclosure(o)       ((rttype(o) & 0x1F) == LUA_TFUNCTION)
+#define ttisCclosure(o)      checktag((o), ctb(LUA_TCCL))
+#define ttisLclosure(o)      checktag((o), ctb(LUA_TLCL))
+#define ttislcf(o)           checktag((o), LUA_TLCF)
+#define ttisuserdata(o)      checktag((o), ctb(LUA_TUSERDATA))
+#define ttisthread(o)        checktag((o), ctb(LUA_TTHREAD))
+#define ttisdeadkey(o)       checktag((o), LUA_TDEADKEY)
 
-#define ttisequal(o1,o2)	(rttype(o1) == rttype(o2))
+#define ttisequal(o1,o2)     (rttype(o1) == rttype(o2))
 
 /* Macros to access values */
-#define nvalue(o)	check_exp(ttisnumber(o), num_(o))
-#define gcvalue(o)	check_exp(iscollectable(o), val_(o).gc)
-#define pvalue(o)	check_exp(ttislightuserdata(o), val_(o).p)
-#define rawtsvalue(o)	check_exp(ttisstring(o), &val_(o).gc->ts)
-#define tsvalue(o)	(&rawtsvalue(o)->tsv)
-#define rawuvalue(o)	check_exp(ttisuserdata(o), &val_(o).gc->u)
-#define uvalue(o)	(&rawuvalue(o)->uv)
-#define clvalue(o)	check_exp(ttisclosure(o), &val_(o).gc->cl)
-#define clLvalue(o)	check_exp(ttisLclosure(o), &val_(o).gc->cl.l)
-#define clCvalue(o)	check_exp(ttisCclosure(o), &val_(o).gc->cl.c)
-#define fvalue(o)	check_exp(ttislcf(o), val_(o).f)
-#define hvalue(o)	check_exp(ttistable(o), &val_(o).gc->h)
-#define bvalue(o)	check_exp(ttisboolean(o), val_(o).b)
-#define thvalue(o)	check_exp(ttisthread(o), &val_(o).gc->th)
+#define nvalue(o)       check_exp(ttisnumber(o), num_(o))
+#define gcvalue(o)      check_exp(iscollectable(o), val_(o).gc)
+#define pvalue(o)       check_exp(ttislightuserdata(o), val_(o).p)
+#define rawtsvalue(o)   check_exp(ttisstring(o), &val_(o).gc->ts)
+#define tsvalue(o)      (&rawtsvalue(o)->tsv)
+#define rawuvalue(o)    check_exp(ttisuserdata(o), &val_(o).gc->u)
+#define uvalue(o)       (&rawuvalue(o)->uv)
+#define clvalue(o)      check_exp(ttisclosure(o), &val_(o).gc->cl)
+#define clLvalue(o)     check_exp(ttisLclosure(o), &val_(o).gc->cl.l)
+#define clCvalue(o)     check_exp(ttisCclosure(o), &val_(o).gc->cl.c)
+#define fvalue(o)       check_exp(ttislcf(o), val_(o).f)
+#define hvalue(o)       check_exp(ttistable(o), &val_(o).gc->h)
+#define bvalue(o)       check_exp(ttisboolean(o), val_(o).b)
+#define thvalue(o)      check_exp(ttisthread(o), &val_(o).gc->th)
 /* a dead value may get the 'gc' field, but cannot access its contents */
-#define deadvalue(o)	check_exp(ttisdeadkey(o), cast(void *, val_(o).gc))
+#define deadvalue(o)    check_exp(ttisdeadkey(o), cast(void *, val_(o).gc))
 
-#define l_isfalse(o)	(ttisnil(o) || (ttisboolean(o) && bvalue(o) == 0))
+#define l_isfalse(o)    (ttisnil(o) || (ttisboolean(o) && bvalue(o) == 0))
 
 
-#define iscollectable(o)	(rttype(o) & BIT_ISCOLLECTABLE)
+#define iscollectable(o) (rttype(o) & BIT_ISCOLLECTABLE)
 
 
 /* Macros for internal tests */
-#define righttt(obj)		(ttype(obj) == gcvalue(obj)->gch.tt)
+#define righttt(obj) (ttype(obj) == gcvalue(obj)->gch.tt)
 
 #define checkliveness(g,obj) \
-	lua_longassert(!iscollectable(obj) || \
-			(righttt(obj) && !isdead(g,gcvalue(obj))))
+    lua_longassert(!iscollectable(obj) || \
+            (righttt(obj) && !isdead(g,gcvalue(obj))))
 
 
 /* Macros to set values */
-#define settt_(o,t)	((o)->tt_=(t))
+#define settt_(o,t) ((o)->tt_=(t))
 
 #define setnvalue(obj,x) \
   { TValue *io=(obj); num_(io)=(x); settt_(io, LUA_TNUMBER); }
@@ -233,14 +233,14 @@ typedef struct lua_TValue TValue;
     val_(io).gc=cast(GCObject *, (x)); settt_(io, ctb(LUA_TTABLE)); \
     checkliveness(G(L),io); }
 
-#define setdeadvalue(obj)	settt_(obj, LUA_TDEADKEY)
+#define setdeadvalue(obj) settt_(obj, LUA_TDEADKEY)
 
 
 
 #define setobj(L,obj1,obj2) \
-	{ const TValue *io2=(obj2); TValue *io1=(obj1); \
-	  io1->value_ = io2->value_; io1->tt_ = io2->tt_; \
-	  checkliveness(G(L),io1); }
+    { const TValue *io2=(obj2); TValue *io1=(obj1); \
+      io1->value_ = io2->value_; io1->tt_ = io2->tt_; \
+      checkliveness(G(L),io1); }
 
 
 /*
@@ -248,23 +248,23 @@ typedef struct lua_TValue TValue;
 */
 
 /* from stack to (same) stack */
-#define setobjs2s	setobj
+#define setobjs2s       setobj
 /* to stack (not from same stack) */
-#define setobj2s	setobj
-#define setsvalue2s	setsvalue
-#define sethvalue2s	sethvalue
-#define setptvalue2s	setptvalue
+#define setobj2s        setobj
+#define setsvalue2s     setsvalue
+#define sethvalue2s     sethvalue
+#define setptvalue2s    setptvalue
 /* from table to same table */
-#define setobjt2t	setobj
+#define setobjt2t       setobj
 /* to table */
-#define setobj2t	setobj
+#define setobj2t        setobj
 /* to new object */
-#define setobj2n	setobj
-#define setsvalue2n	setsvalue
+#define setobj2n        setobj
+#define setsvalue2n     setsvalue
 
 
 /* check whether a number is valid (useful only for NaN trick) */
-#define luai_checknum(L,o,c)	{ /* empty */ }
+#define luai_checknum(L,o,c) { /* empty */ }
 
 
 /*
@@ -282,7 +282,7 @@ typedef struct lua_TValue TValue;
 */
 
 /* allows for external implementation for part of the trick */
-#if !defined(NNMARK)	/* { */
+#if !defined(NNMARK) /* { */
 
 
 #if !defined(LUA_IEEEENDIAN)
@@ -290,70 +290,70 @@ typedef struct lua_TValue TValue;
 #endif
 
 
-#define NNMARK		0x7FF7A500
-#define NNMASK		0x7FFFFF00
+#define NNMARK 0x7FF7A500
+#define NNMASK 0x7FFFFF00
 
 #undef TValuefields
 #undef NILCONSTANT
 
-#if (LUA_IEEEENDIAN == 0)	/* { */
+#if (LUA_IEEEENDIAN == 0) /* { */
 
 /* little endian */
 #define TValuefields  \
-	union { struct { Value v__; int tt__; } i; double d__; } u
-#define NILCONSTANT	{{{NULL}, tag2tt(LUA_TNIL)}}
+    union { struct { Value v__; int tt__; } i; double d__; } u
+#define NILCONSTANT {{{NULL}, tag2tt(LUA_TNIL)}}
 /* field-access macros */
-#define v_(o)		((o)->u.i.v__)
-#define d_(o)		((o)->u.d__)
-#define tt_(o)		((o)->u.i.tt__)
+#define v_(o)   ((o)->u.i.v__)
+#define d_(o)   ((o)->u.d__)
+#define tt_(o)  ((o)->u.i.tt__)
 
-#else				/* }{ */
+#else                     /* }{ */
 
 /* big endian */
 #define TValuefields  \
-	union { struct { int tt__; Value v__; } i; double d__; } u
-#define NILCONSTANT	{{tag2tt(LUA_TNIL), {NULL}}}
+    union { struct { int tt__; Value v__; } i; double d__; } u
+#define NILCONSTANT {{tag2tt(LUA_TNIL), {NULL}}}
 /* field-access macros */
-#define v_(o)		((o)->u.i.v__)
-#define d_(o)		((o)->u.d__)
-#define tt_(o)		((o)->u.i.tt__)
+#define v_(o)  ((o)->u.i.v__)
+#define d_(o)  ((o)->u.d__)
+#define tt_(o) ((o)->u.i.tt__)
 
-#endif				/* } */
+#endif                    /* } */
 
-#endif			/* } */
+#endif              /* } */
 
 
 /* correspondence with standard representation */
 #undef val_
-#define val_(o)		v_(o)
+#define val_(o) v_(o)
 #undef num_
-#define num_(o)		d_(o)
+#define num_(o) d_(o)
 
 
 #undef numfield
-#define numfield	/* no such field; numbers are the entire struct */
+#define numfield /* no such field; numbers are the entire struct */
 
 /* basic check to distinguish numbers from non-numbers */
 #undef ttisnumber
-#define ttisnumber(o)	((tt_(o) & NNMASK) != NNMARK)
+#define ttisnumber(o)   ((tt_(o) & NNMASK) != NNMARK)
 
-#define tag2tt(t)	(NNMARK | (t))
+#define tag2tt(t)       (NNMARK | (t))
 
 #undef rttype
-#define rttype(o)	(ttisnumber(o) ? LUA_TNUMBER : tt_(o) & 0xff)
+#define rttype(o)       (ttisnumber(o) ? LUA_TNUMBER : tt_(o) & 0xff)
 
 #undef settt_
-#define settt_(o,t)	(tt_(o) = tag2tt(t))
+#define settt_(o,t)     (tt_(o) = tag2tt(t))
 
 #undef setnvalue
 #define setnvalue(obj,x) \
-	{ TValue *io_=(obj); num_(io_)=(x); lua_assert(ttisnumber(io_)); }
+    { TValue *io_=(obj); num_(io_)=(x); lua_assert(ttisnumber(io_)); }
 
 #undef setobj
 #define setobj(L,obj1,obj2) \
-	{ const TValue *o2_=(obj2); TValue *o1_=(obj1); \
-	  o1_->u = o2_->u; \
-	  checkliveness(G(L),o1_); }
+    { const TValue *o2_=(obj2); TValue *o1_=(obj1); \
+      o1_->u = o2_->u; \
+      checkliveness(G(L),o1_); }
 
 
 /*
@@ -362,16 +362,16 @@ typedef struct lua_TValue TValue;
 
 #undef checktag
 #undef checktype
-#define checktag(o,t)	(tt_(o) == tag2tt(t))
-#define checktype(o,t)	(ctb(tt_(o) | VARBITS) == ctb(tag2tt(t) | VARBITS))
+#define checktag(o,t)  (tt_(o) == tag2tt(t))
+#define checktype(o,t) (ctb(tt_(o) | VARBITS) == ctb(tag2tt(t) | VARBITS))
 
 #undef ttisequal
 #define ttisequal(o1,o2)  \
-	(ttisnumber(o1) ? ttisnumber(o2) : (tt_(o1) == tt_(o2)))
+    (ttisnumber(o1) ? ttisnumber(o2) : (tt_(o1) == tt_(o2)))
 
 
 #undef luai_checknum
-#define luai_checknum(L,o,c)	{ if (!ttisnumber(o)) c; }
+#define luai_checknum(L,o,c) { if (!ttisnumber(o)) c; }
 
 #endif
 /* }====================================================== */
@@ -419,7 +419,7 @@ typedef union TString {
 
 
 /* get the actual string (array of bytes) from a TString */
-#define getstr(ts)	cast(const char *, (ts) + 1)
+#define getstr(ts) cast(const char *, (ts) + 1)
 
 /* get the actual string (array of bytes) from a Lua value */
 #define svalue(o)       getstr(rawtsvalue(o))
@@ -511,7 +511,7 @@ typedef struct UpVal {
 */
 
 #define ClosureHeader \
-	CommonHeader; lu_byte nupvalues; GCObject *gclist
+    CommonHeader; lu_byte nupvalues; GCObject *gclist
 
 typedef struct CClosure {
   ClosureHeader;
@@ -533,9 +533,9 @@ typedef union Closure {
 } Closure;
 
 
-#define isLfunction(o)	ttisLclosure(o)
+#define isLfunction(o) ttisLclosure(o)
 
-#define getproto(o)	(clLvalue(o)->p)
+#define getproto(o) (clLvalue(o)->p)
 
 
 /*
@@ -575,17 +575,17 @@ typedef struct Table {
 ** `module' operation for hashing (size is always a power of 2)
 */
 #define lmod(s,size) \
-	(check_exp((size&(size-1))==0, (cast(int, (s) & ((size)-1)))))
+    (check_exp((size&(size-1))==0, (cast(int, (s) & ((size)-1)))))
 
 
-#define twoto(x)	(1<<(x))
-#define sizenode(t)	(twoto((t)->lsizenode))
+#define twoto(x) (1<<(x))
+#define sizenode(t) (twoto((t)->lsizenode))
 
 
 /*
 ** (address of) a fixed nil value
 */
-#define luaO_nilobject		(&luaO_nilobject_)
+#define luaO_nilobject (&luaO_nilobject_)
 
 
 LUAI_DDEC const TValue luaO_nilobject_;
diff --git a/liblua/lopcodes.c b/liblua/lopcodes.c
index ef7369275..5dcb89eaa 100644
--- a/liblua/lopcodes.c
+++ b/liblua/lopcodes.c
@@ -62,46 +62,46 @@ LUAI_DDEF const char *const luaP_opnames[NUM_OPCODES+1] = {
 #define opmode(t,a,b,c,m) (((t)<<7) | ((a)<<6) | ((b)<<4) | ((c)<<2) | (m))
 
 LUAI_DDEF const lu_byte luaP_opmodes[NUM_OPCODES] = {
-/*       T  A    B       C     mode		   opcode	*/
-  opmode(0, 1, OpArgR, OpArgN, iABC)		/* OP_MOVE */
- ,opmode(0, 1, OpArgK, OpArgN, iABx)		/* OP_LOADK */
- ,opmode(0, 1, OpArgN, OpArgN, iABx)		/* OP_LOADKX */
- ,opmode(0, 1, OpArgU, OpArgU, iABC)		/* OP_LOADBOOL */
- ,opmode(0, 1, OpArgU, OpArgN, iABC)		/* OP_LOADNIL */
- ,opmode(0, 1, OpArgU, OpArgN, iABC)		/* OP_GETUPVAL */
- ,opmode(0, 1, OpArgU, OpArgK, iABC)		/* OP_GETTABUP */
- ,opmode(0, 1, OpArgR, OpArgK, iABC)		/* OP_GETTABLE */
- ,opmode(0, 0, OpArgK, OpArgK, iABC)		/* OP_SETTABUP */
- ,opmode(0, 0, OpArgU, OpArgN, iABC)		/* OP_SETUPVAL */
- ,opmode(0, 0, OpArgK, OpArgK, iABC)		/* OP_SETTABLE */
- ,opmode(0, 1, OpArgU, OpArgU, iABC)		/* OP_NEWTABLE */
- ,opmode(0, 1, OpArgR, OpArgK, iABC)		/* OP_SELF */
- ,opmode(0, 1, OpArgK, OpArgK, iABC)		/* OP_ADD */
- ,opmode(0, 1, OpArgK, OpArgK, iABC)		/* OP_SUB */
- ,opmode(0, 1, OpArgK, OpArgK, iABC)		/* OP_MUL */
- ,opmode(0, 1, OpArgK, OpArgK, iABC)		/* OP_DIV */
- ,opmode(0, 1, OpArgK, OpArgK, iABC)		/* OP_MOD */
- ,opmode(0, 1, OpArgK, OpArgK, iABC)		/* OP_POW */
- ,opmode(0, 1, OpArgR, OpArgN, iABC)		/* OP_UNM */
- ,opmode(0, 1, OpArgR, OpArgN, iABC)		/* OP_NOT */
- ,opmode(0, 1, OpArgR, OpArgN, iABC)		/* OP_LEN */
- ,opmode(0, 1, OpArgR, OpArgR, iABC)		/* OP_CONCAT */
- ,opmode(0, 0, OpArgR, OpArgN, iAsBx)		/* OP_JMP */
- ,opmode(1, 0, OpArgK, OpArgK, iABC)		/* OP_EQ */
- ,opmode(1, 0, OpArgK, OpArgK, iABC)		/* OP_LT */
- ,opmode(1, 0, OpArgK, OpArgK, iABC)		/* OP_LE */
- ,opmode(1, 0, OpArgN, OpArgU, iABC)		/* OP_TEST */
- ,opmode(1, 1, OpArgR, OpArgU, iABC)		/* OP_TESTSET */
- ,opmode(0, 1, OpArgU, OpArgU, iABC)		/* OP_CALL */
- ,opmode(0, 1, OpArgU, OpArgU, iABC)		/* OP_TAILCALL */
- ,opmode(0, 0, OpArgU, OpArgN, iABC)		/* OP_RETURN */
- ,opmode(0, 1, OpArgR, OpArgN, iAsBx)		/* OP_FORLOOP */
- ,opmode(0, 1, OpArgR, OpArgN, iAsBx)		/* OP_FORPREP */
- ,opmode(0, 0, OpArgN, OpArgU, iABC)		/* OP_TFORCALL */
- ,opmode(0, 1, OpArgR, OpArgN, iAsBx)		/* OP_TFORLOOP */
- ,opmode(0, 0, OpArgU, OpArgU, iABC)		/* OP_SETLIST */
- ,opmode(0, 1, OpArgU, OpArgN, iABx)		/* OP_CLOSURE */
- ,opmode(0, 1, OpArgU, OpArgN, iABC)		/* OP_VARARG */
- ,opmode(0, 0, OpArgU, OpArgU, iAx)		/* OP_EXTRAARG */
+/*       T  A    B       C     mode     opcode */
+  opmode(0, 1, OpArgR, OpArgN, iABC)    /* OP_MOVE */
+ ,opmode(0, 1, OpArgK, OpArgN, iABx)    /* OP_LOADK */
+ ,opmode(0, 1, OpArgN, OpArgN, iABx)    /* OP_LOADKX */
+ ,opmode(0, 1, OpArgU, OpArgU, iABC)    /* OP_LOADBOOL */
+ ,opmode(0, 1, OpArgU, OpArgN, iABC)    /* OP_LOADNIL */
+ ,opmode(0, 1, OpArgU, OpArgN, iABC)    /* OP_GETUPVAL */
+ ,opmode(0, 1, OpArgU, OpArgK, iABC)    /* OP_GETTABUP */
+ ,opmode(0, 1, OpArgR, OpArgK, iABC)    /* OP_GETTABLE */
+ ,opmode(0, 0, OpArgK, OpArgK, iABC)    /* OP_SETTABUP */
+ ,opmode(0, 0, OpArgU, OpArgN, iABC)    /* OP_SETUPVAL */
+ ,opmode(0, 0, OpArgK, OpArgK, iABC)    /* OP_SETTABLE */
+ ,opmode(0, 1, OpArgU, OpArgU, iABC)    /* OP_NEWTABLE */
+ ,opmode(0, 1, OpArgR, OpArgK, iABC)    /* OP_SELF */
+ ,opmode(0, 1, OpArgK, OpArgK, iABC)    /* OP_ADD */
+ ,opmode(0, 1, OpArgK, OpArgK, iABC)    /* OP_SUB */
+ ,opmode(0, 1, OpArgK, OpArgK, iABC)    /* OP_MUL */
+ ,opmode(0, 1, OpArgK, OpArgK, iABC)    /* OP_DIV */
+ ,opmode(0, 1, OpArgK, OpArgK, iABC)    /* OP_MOD */
+ ,opmode(0, 1, OpArgK, OpArgK, iABC)    /* OP_POW */
+ ,opmode(0, 1, OpArgR, OpArgN, iABC)    /* OP_UNM */
+ ,opmode(0, 1, OpArgR, OpArgN, iABC)    /* OP_NOT */
+ ,opmode(0, 1, OpArgR, OpArgN, iABC)    /* OP_LEN */
+ ,opmode(0, 1, OpArgR, OpArgR, iABC)    /* OP_CONCAT */
+ ,opmode(0, 0, OpArgR, OpArgN, iAsBx)   /* OP_JMP */
+ ,opmode(1, 0, OpArgK, OpArgK, iABC)    /* OP_EQ */
+ ,opmode(1, 0, OpArgK, OpArgK, iABC)    /* OP_LT */
+ ,opmode(1, 0, OpArgK, OpArgK, iABC)    /* OP_LE */
+ ,opmode(1, 0, OpArgN, OpArgU, iABC)    /* OP_TEST */
+ ,opmode(1, 1, OpArgR, OpArgU, iABC)    /* OP_TESTSET */
+ ,opmode(0, 1, OpArgU, OpArgU, iABC)    /* OP_CALL */
+ ,opmode(0, 1, OpArgU, OpArgU, iABC)    /* OP_TAILCALL */
+ ,opmode(0, 0, OpArgU, OpArgN, iABC)    /* OP_RETURN */
+ ,opmode(0, 1, OpArgR, OpArgN, iAsBx)   /* OP_FORLOOP */
+ ,opmode(0, 1, OpArgR, OpArgN, iAsBx)   /* OP_FORPREP */
+ ,opmode(0, 0, OpArgN, OpArgU, iABC)    /* OP_TFORCALL */
+ ,opmode(0, 1, OpArgR, OpArgN, iAsBx)   /* OP_TFORLOOP */
+ ,opmode(0, 0, OpArgU, OpArgU, iABC)    /* OP_SETLIST */
+ ,opmode(0, 1, OpArgU, OpArgN, iABx)    /* OP_CLOSURE */
+ ,opmode(0, 1, OpArgU, OpArgN, iABC)    /* OP_VARARG */
+ ,opmode(0, 0, OpArgU, OpArgU, iAx)     /* OP_EXTRAARG */
 };
 
diff --git a/liblua/lopcodes.h b/liblua/lopcodes.h
index 07d2b3f39..3c8948440 100644
--- a/liblua/lopcodes.h
+++ b/liblua/lopcodes.h
@@ -14,12 +14,12 @@
   We assume that instructions are unsigned numbers.
   All instructions have an opcode in the first 6 bits.
   Instructions can have the following fields:
-	`A' : 8 bits
-	`B' : 9 bits
-	`C' : 9 bits
-	'Ax' : 26 bits ('A', 'B', and 'C' together)
-	`Bx' : 18 bits (`B' and `C' together)
-	`sBx' : signed Bx
+    `A' : 8 bits
+    `B' : 9 bits
+    `C' : 9 bits
+    'Ax' : 26 bits ('A', 'B', and 'C' together)
+    `Bx' : 18 bits (`B' and `C' together)
+    `sBx' : signed Bx
 
   A signed argument is represented in excess K; that is, the number
   value is the unsigned value minus K. K is exactly the maximum value
@@ -35,20 +35,20 @@ enum OpMode {iABC, iABx, iAsBx, iAx};  /* basic instruction format */
 /*
 ** size and position of opcode arguments.
 */
-#define SIZE_C		9
-#define SIZE_B		9
-#define SIZE_Bx		(SIZE_C + SIZE_B)
-#define SIZE_A		8
-#define SIZE_Ax		(SIZE_C + SIZE_B + SIZE_A)
+#define SIZE_C  9
+#define SIZE_B  9
+#define SIZE_Bx (SIZE_C + SIZE_B)
+#define SIZE_A  8
+#define SIZE_Ax (SIZE_C + SIZE_B + SIZE_A)
 
-#define SIZE_OP		6
+#define SIZE_OP 6
 
-#define POS_OP		0
-#define POS_A		(POS_OP + SIZE_OP)
-#define POS_C		(POS_A + SIZE_A)
-#define POS_B		(POS_C + SIZE_C)
-#define POS_Bx		POS_C
-#define POS_Ax		POS_A
+#define POS_OP  0
+#define POS_A   (POS_OP + SIZE_OP)
+#define POS_C   (POS_A + SIZE_A)
+#define POS_B   (POS_C + SIZE_C)
+#define POS_Bx  POS_C
+#define POS_Ax  POS_A
 
 
 /*
@@ -57,17 +57,17 @@ enum OpMode {iABC, iABx, iAsBx, iAx};  /* basic instruction format */
 ** so they must fit in LUAI_BITSINT-1 bits (-1 for sign)
 */
 #if SIZE_Bx < LUAI_BITSINT-1
-#define MAXARG_Bx        ((1<<SIZE_Bx)-1)
-#define MAXARG_sBx        (MAXARG_Bx>>1)         /* `sBx' is signed */
+#define MAXARG_Bx       ((1<<SIZE_Bx)-1)
+#define MAXARG_sBx      (MAXARG_Bx>>1)         /* `sBx' is signed */
 #else
-#define MAXARG_Bx        MAX_INT
-#define MAXARG_sBx        MAX_INT
+#define MAXARG_Bx       MAX_INT
+#define MAXARG_sBx      MAX_INT
 #endif
 
 #if SIZE_Ax < LUAI_BITSINT-1
-#define MAXARG_Ax	((1<<SIZE_Ax)-1)
+#define MAXARG_Ax       ((1<<SIZE_Ax)-1)
 #else
-#define MAXARG_Ax	MAX_INT
+#define MAXARG_Ax       MAX_INT
 #endif
 
 
@@ -77,53 +77,53 @@ enum OpMode {iABC, iABx, iAsBx, iAx};  /* basic instruction format */
 
 
 /* creates a mask with `n' 1 bits at position `p' */
-#define MASK1(n,p)	((~((~(Instruction)0)<<(n)))<<(p))
+#define MASK1(n,p)      ((~((~(Instruction)0)<<(n)))<<(p))
 
 /* creates a mask with `n' 0 bits at position `p' */
-#define MASK0(n,p)	(~MASK1(n,p))
+#define MASK0(n,p)      (~MASK1(n,p))
 
 /*
 ** the following macros help to manipulate instructions
 */
 
-#define GET_OPCODE(i)	(cast(OpCode, ((i)>>POS_OP) & MASK1(SIZE_OP,0)))
-#define SET_OPCODE(i,o)	((i) = (((i)&MASK0(SIZE_OP,POS_OP)) | \
-		((cast(Instruction, o)<<POS_OP)&MASK1(SIZE_OP,POS_OP))))
+#define GET_OPCODE(i) (cast(OpCode, ((i)>>POS_OP) & MASK1(SIZE_OP,0)))
+#define SET_OPCODE(i,o) ((i) = (((i)&MASK0(SIZE_OP,POS_OP)) | \
+        ((cast(Instruction, o)<<POS_OP)&MASK1(SIZE_OP,POS_OP))))
 
-#define getarg(i,pos,size)	(cast(int, ((i)>>pos) & MASK1(size,0)))
-#define setarg(i,v,pos,size)	((i) = (((i)&MASK0(size,pos)) | \
+#define getarg(i,pos,size) (cast(int, ((i)>>pos) & MASK1(size,0)))
+#define setarg(i,v,pos,size) ((i) = (((i)&MASK0(size,pos)) | \
                 ((cast(Instruction, v)<<pos)&MASK1(size,pos))))
 
-#define GETARG_A(i)	getarg(i, POS_A, SIZE_A)
-#define SETARG_A(i,v)	setarg(i, v, POS_A, SIZE_A)
+#define GETARG_A(i)     getarg(i, POS_A, SIZE_A)
+#define SETARG_A(i,v)   setarg(i, v, POS_A, SIZE_A)
 
-#define GETARG_B(i)	getarg(i, POS_B, SIZE_B)
-#define SETARG_B(i,v)	setarg(i, v, POS_B, SIZE_B)
+#define GETARG_B(i)     getarg(i, POS_B, SIZE_B)
+#define SETARG_B(i,v)   setarg(i, v, POS_B, SIZE_B)
 
-#define GETARG_C(i)	getarg(i, POS_C, SIZE_C)
-#define SETARG_C(i,v)	setarg(i, v, POS_C, SIZE_C)
+#define GETARG_C(i)     getarg(i, POS_C, SIZE_C)
+#define SETARG_C(i,v)   setarg(i, v, POS_C, SIZE_C)
 
-#define GETARG_Bx(i)	getarg(i, POS_Bx, SIZE_Bx)
-#define SETARG_Bx(i,v)	setarg(i, v, POS_Bx, SIZE_Bx)
+#define GETARG_Bx(i)    getarg(i, POS_Bx, SIZE_Bx)
+#define SETARG_Bx(i,v)  setarg(i, v, POS_Bx, SIZE_Bx)
 
-#define GETARG_Ax(i)	getarg(i, POS_Ax, SIZE_Ax)
-#define SETARG_Ax(i,v)	setarg(i, v, POS_Ax, SIZE_Ax)
+#define GETARG_Ax(i)    getarg(i, POS_Ax, SIZE_Ax)
+#define SETARG_Ax(i,v)  setarg(i, v, POS_Ax, SIZE_Ax)
 
-#define GETARG_sBx(i)	(GETARG_Bx(i)-MAXARG_sBx)
-#define SETARG_sBx(i,b)	SETARG_Bx((i),cast(unsigned int, (b)+MAXARG_sBx))
+#define GETARG_sBx(i)   (GETARG_Bx(i)-MAXARG_sBx)
+#define SETARG_sBx(i,b) SETARG_Bx((i),cast(unsigned int, (b)+MAXARG_sBx))
 
 
-#define CREATE_ABC(o,a,b,c)	((cast(Instruction, o)<<POS_OP) \
-			| (cast(Instruction, a)<<POS_A) \
-			| (cast(Instruction, b)<<POS_B) \
-			| (cast(Instruction, c)<<POS_C))
+#define CREATE_ABC(o,a,b,c)    ((cast(Instruction, o)<<POS_OP) \
+            | (cast(Instruction, a)<<POS_A) \
+            | (cast(Instruction, b)<<POS_B) \
+            | (cast(Instruction, c)<<POS_C))
 
-#define CREATE_ABx(o,a,bc)	((cast(Instruction, o)<<POS_OP) \
-			| (cast(Instruction, a)<<POS_A) \
-			| (cast(Instruction, bc)<<POS_Bx))
+#define CREATE_ABx(o,a,bc)     ((cast(Instruction, o)<<POS_OP) \
+            | (cast(Instruction, a)<<POS_A) \
+            | (cast(Instruction, bc)<<POS_Bx))
 
-#define CREATE_Ax(o,a)		((cast(Instruction, o)<<POS_OP) \
-			| (cast(Instruction, a)<<POS_Ax))
+#define CREATE_Ax(o,a)         ((cast(Instruction, o)<<POS_OP) \
+            | (cast(Instruction, a)<<POS_Ax))
 
 
 /*
@@ -131,24 +131,24 @@ enum OpMode {iABC, iABx, iAsBx, iAx};  /* basic instruction format */
 */
 
 /* this bit 1 means constant (0 means register) */
-#define BITRK		(1 << (SIZE_B - 1))
+#define BITRK      (1 << (SIZE_B - 1))
 
 /* test whether value is a constant */
-#define ISK(x)		((x) & BITRK)
+#define ISK(x)     ((x) & BITRK)
 
 /* gets the index of the constant */
-#define INDEXK(r)	((int)(r) & ~BITRK)
+#define INDEXK(r)  ((int)(r) & ~BITRK)
 
-#define MAXINDEXRK	(BITRK - 1)
+#define MAXINDEXRK (BITRK - 1)
 
 /* code a constant index as a RK value */
-#define RKASK(x)	((x) | BITRK)
+#define RKASK(x)   ((x) | BITRK)
 
 
 /*
 ** invalid register that fits in 8 bits
 */
-#define NO_REG		MAXARG_A
+#define NO_REG     MAXARG_A
 
 
 /*
@@ -164,68 +164,68 @@ enum OpMode {iABC, iABx, iAsBx, iAx};  /* basic instruction format */
 
 typedef enum {
 /*----------------------------------------------------------------------
-name		args	description
+name            args    description
 ------------------------------------------------------------------------*/
-OP_MOVE,/*	A B	R(A) := R(B)					*/
-OP_LOADK,/*	A Bx	R(A) := Kst(Bx)					*/
-OP_LOADKX,/*	A 	R(A) := Kst(extra arg)				*/
-OP_LOADBOOL,/*	A B C	R(A) := (Bool)B; if (C) pc++			*/
-OP_LOADNIL,/*	A B	R(A), R(A+1), ..., R(A+B) := nil		*/
-OP_GETUPVAL,/*	A B	R(A) := UpValue[B]				*/
+OP_MOVE,/*      A B     R(A) := R(B)                                    */
+OP_LOADK,/*     A Bx    R(A) := Kst(Bx)                                 */
+OP_LOADKX,/*    A       R(A) := Kst(extra arg)                          */
+OP_LOADBOOL,/*  A B C   R(A) := (Bool)B; if (C) pc++                    */
+OP_LOADNIL,/*   A B     R(A), R(A+1), ..., R(A+B) := nil                */
+OP_GETUPVAL,/*  A B     R(A) := UpValue[B]                              */
 
-OP_GETTABUP,/*	A B C	R(A) := UpValue[B][RK(C)]			*/
-OP_GETTABLE,/*	A B C	R(A) := R(B)[RK(C)]				*/
+OP_GETTABUP,/*  A B C   R(A) := UpValue[B][RK(C)]                       */
+OP_GETTABLE,/*  A B C   R(A) := R(B)[RK(C)]                             */
 
-OP_SETTABUP,/*	A B C	UpValue[A][RK(B)] := RK(C)			*/
-OP_SETUPVAL,/*	A B	UpValue[B] := R(A)				*/
-OP_SETTABLE,/*	A B C	R(A)[RK(B)] := RK(C)				*/
+OP_SETTABUP,/*  A B C   UpValue[A][RK(B)] := RK(C)                      */
+OP_SETUPVAL,/*  A B     UpValue[B] := R(A)                              */
+OP_SETTABLE,/*  A B C   R(A)[RK(B)] := RK(C)                            */
 
-OP_NEWTABLE,/*	A B C	R(A) := {} (size = B,C)				*/
+OP_NEWTABLE,/*  A B C   R(A) := {} (size = B,C)                         */
 
-OP_SELF,/*	A B C	R(A+1) := R(B); R(A) := R(B)[RK(C)]		*/
+OP_SELF,/*      A B C   R(A+1) := R(B); R(A) := R(B)[RK(C)]             */
 
-OP_ADD,/*	A B C	R(A) := RK(B) + RK(C)				*/
-OP_SUB,/*	A B C	R(A) := RK(B) - RK(C)				*/
-OP_MUL,/*	A B C	R(A) := RK(B) * RK(C)				*/
-OP_DIV,/*	A B C	R(A) := RK(B) / RK(C)				*/
-OP_MOD,/*	A B C	R(A) := RK(B) % RK(C)				*/
-OP_POW,/*	A B C	R(A) := RK(B) ^ RK(C)				*/
-OP_UNM,/*	A B	R(A) := -R(B)					*/
-OP_NOT,/*	A B	R(A) := not R(B)				*/
-OP_LEN,/*	A B	R(A) := length of R(B)				*/
+OP_ADD,/*       A B C   R(A) := RK(B) + RK(C)                           */
+OP_SUB,/*       A B C   R(A) := RK(B) - RK(C)                           */
+OP_MUL,/*       A B C   R(A) := RK(B) * RK(C)                           */
+OP_DIV,/*       A B C   R(A) := RK(B) / RK(C)                           */
+OP_MOD,/*       A B C   R(A) := RK(B) % RK(C)                           */
+OP_POW,/*       A B C   R(A) := RK(B) ^ RK(C)                           */
+OP_UNM,/*       A B     R(A) := -R(B)                                   */
+OP_NOT,/*       A B     R(A) := not R(B)                                */
+OP_LEN,/*       A B     R(A) := length of R(B)                          */
 
-OP_CONCAT,/*	A B C	R(A) := R(B).. ... ..R(C)			*/
+OP_CONCAT,/*    A B C   R(A) := R(B).. ... ..R(C)                       */
 
-OP_JMP,/*	A sBx	pc+=sBx; if (A) close all upvalues >= R(A) + 1	*/
-OP_EQ,/*	A B C	if ((RK(B) == RK(C)) ~= A) then pc++		*/
-OP_LT,/*	A B C	if ((RK(B) <  RK(C)) ~= A) then pc++		*/
-OP_LE,/*	A B C	if ((RK(B) <= RK(C)) ~= A) then pc++		*/
+OP_JMP,/*       A sBx   pc+=sBx; if (A) close all upvalues >= R(A) + 1  */
+OP_EQ,/*        A B C   if ((RK(B) == RK(C)) ~= A) then pc++            */
+OP_LT,/*        A B C   if ((RK(B) <  RK(C)) ~= A) then pc++            */
+OP_LE,/*        A B C   if ((RK(B) <= RK(C)) ~= A) then pc++            */
 
-OP_TEST,/*	A C	if not (R(A) <=> C) then pc++			*/
-OP_TESTSET,/*	A B C	if (R(B) <=> C) then R(A) := R(B) else pc++	*/
+OP_TEST,/*      A C     if not (R(A) <=> C) then pc++                   */
+OP_TESTSET,/*   A B C   if (R(B) <=> C) then R(A) := R(B) else pc++     */
 
-OP_CALL,/*	A B C	R(A), ... ,R(A+C-2) := R(A)(R(A+1), ... ,R(A+B-1)) */
-OP_TAILCALL,/*	A B C	return R(A)(R(A+1), ... ,R(A+B-1))		*/
-OP_RETURN,/*	A B	return R(A), ... ,R(A+B-2)	(see note)	*/
+OP_CALL,/*      A B C   R(A), ... ,R(A+C-2) := R(A)(R(A+1), ... ,R(A+B-1)) */
+OP_TAILCALL,/*  A B C   return R(A)(R(A+1), ... ,R(A+B-1))              */
+OP_RETURN,/*    A B     return R(A), ... ,R(A+B-2)        (see note)    */
 
-OP_FORLOOP,/*	A sBx	R(A)+=R(A+2);
-			if R(A) <?= R(A+1) then { pc+=sBx; R(A+3)=R(A) }*/
-OP_FORPREP,/*	A sBx	R(A)-=R(A+2); pc+=sBx				*/
+OP_FORLOOP,/*   A sBx   R(A)+=R(A+2);
+            if R(A) <?= R(A+1) then { pc+=sBx; R(A+3)=R(A) }*/
+OP_FORPREP,/*   A sBx   R(A)-=R(A+2); pc+=sBx                           */
 
-OP_TFORCALL,/*	A C	R(A+3), ... ,R(A+2+C) := R(A)(R(A+1), R(A+2));	*/
-OP_TFORLOOP,/*	A sBx	if R(A+1) ~= nil then { R(A)=R(A+1); pc += sBx }*/
+OP_TFORCALL,/*  A C     R(A+3), ... ,R(A+2+C) := R(A)(R(A+1), R(A+2));  */
+OP_TFORLOOP,/*  A sBx   if R(A+1) ~= nil then { R(A)=R(A+1); pc += sBx }*/
 
-OP_SETLIST,/*	A B C	R(A)[(C-1)*FPF+i] := R(A+i), 1 <= i <= B	*/
+OP_SETLIST,/*   A B C   R(A)[(C-1)*FPF+i] := R(A+i), 1 <= i <= B        */
 
-OP_CLOSURE,/*	A Bx	R(A) := closure(KPROTO[Bx])			*/
+OP_CLOSURE,/*   A Bx    R(A) := closure(KPROTO[Bx])                      */
 
-OP_VARARG,/*	A B	R(A), R(A+1), ..., R(A+B-2) = vararg		*/
+OP_VARARG,/*    A B     R(A), R(A+1), ..., R(A+B-2) = vararg            */
 
-OP_EXTRAARG/*	Ax	extra (larger) argument for previous opcode	*/
+OP_EXTRAARG/*   Ax      extra (larger) argument for previous opcode     */
 } OpCode;
 
 
-#define NUM_OPCODES	(cast(int, OP_EXTRAARG) + 1)
+#define NUM_OPCODES (cast(int, OP_EXTRAARG) + 1)
 
 
 
@@ -271,18 +271,18 @@ enum OpArgMask {
 
 LUAI_DDEC const lu_byte luaP_opmodes[NUM_OPCODES];
 
-#define getOpMode(m)	(cast(enum OpMode, luaP_opmodes[m] & 3))
-#define getBMode(m)	(cast(enum OpArgMask, (luaP_opmodes[m] >> 4) & 3))
-#define getCMode(m)	(cast(enum OpArgMask, (luaP_opmodes[m] >> 2) & 3))
-#define testAMode(m)	(luaP_opmodes[m] & (1 << 6))
-#define testTMode(m)	(luaP_opmodes[m] & (1 << 7))
+#define getOpMode(m) (cast(enum OpMode, luaP_opmodes[m] & 3))
+#define getBMode(m)  (cast(enum OpArgMask, (luaP_opmodes[m] >> 4) & 3))
+#define getCMode(m)  (cast(enum OpArgMask, (luaP_opmodes[m] >> 2) & 3))
+#define testAMode(m) (luaP_opmodes[m] & (1 << 6))
+#define testTMode(m) (luaP_opmodes[m] & (1 << 7))
 
 
 LUAI_DDEC const char *const luaP_opnames[NUM_OPCODES+1];  /* opcode names */
 
 
 /* number of list items to accumulate before a SETLIST instruction */
-#define LFIELDS_PER_FLUSH	50
+#define LFIELDS_PER_FLUSH 50
 
 
 #endif
diff --git a/liblua/loslib.c b/liblua/loslib.c
index 5170fd0d0..2b7a8b5f6 100644
--- a/liblua/loslib.c
+++ b/liblua/loslib.c
@@ -26,12 +26,12 @@
 #if !defined(LUA_STRFTIMEOPTIONS)
 
 #if !defined(LUA_USE_POSIX)
-#define LUA_STRFTIMEOPTIONS	{ "aAbBcdHIjmMpSUwWxXyYz%", "" }
+#define LUA_STRFTIMEOPTIONS { "aAbBcdHIjmMpSUwWxXyYz%", "" }
 #else
 #define LUA_STRFTIMEOPTIONS \
-	{ "aAbBcCdDeFgGhHIjmMnprRStTuUVwWxXyYzZ%", "" \
-	  "", "E", "cCxXyY",  \
-	  "O", "deHImMSuUVwWy" }
+    { "aAbBcCdDeFgGhHIjmMnprRStTuUVwWxXyYzZ%", "" \
+      "", "E", "cCxXyY",  \
+      "O", "deHImMSuUVwWy" }
 #endif
 
 #endif
@@ -44,7 +44,7 @@
 */
 #if defined(LUA_USE_MKSTEMP)
 #include <unistd.h>
-#define LUA_TMPNAMBUFSIZE	32
+#define LUA_TMPNAMBUFSIZE 32
 #define lua_tmpnam(b,e) { \
         strcpy(b, "/tmp/lua_XXXXXX"); \
         e = mkstemp(b); \
@@ -53,8 +53,8 @@
 
 #elif !defined(lua_tmpnam)
 
-#define LUA_TMPNAMBUFSIZE	L_tmpnam
-#define lua_tmpnam(b,e)		{ e = (tmpnam(b) == NULL); }
+#define LUA_TMPNAMBUFSIZE L_tmpnam
+#define lua_tmpnam(b,e) { e = (tmpnam(b) == NULL); }
 
 #endif
 
@@ -65,13 +65,13 @@
 */
 #if defined(LUA_USE_GMTIME_R)
 
-#define l_gmtime(t,r)		gmtime_r(t,r)
-#define l_localtime(t,r)	localtime_r(t,r)
+#define l_gmtime(t,r)    gmtime_r(t,r)
+#define l_localtime(t,r) localtime_r(t,r)
 
 #elif !defined(l_gmtime)
 
-#define l_gmtime(t,r)		((void)r, gmtime(t))
-#define l_localtime(t,r)  	((void)r, localtime(t))
+#define l_gmtime(t,r)    ((void)r, gmtime(t))
+#define l_localtime(t,r) ((void)r, localtime(t))
 
 #endif
 
diff --git a/liblua/lparser.c b/liblua/lparser.c
index d8f5b4ffc..453452298 100644
--- a/liblua/lparser.c
+++ b/liblua/lparser.c
@@ -29,10 +29,10 @@
 
 /* maximum number of local variables per function (must be smaller
    than 250, due to the bytecode format) */
-#define MAXVARS		200
+#define MAXVARS 200
 
 
-#define hasmultret(k)		((k) == VCALL || (k) == VVARARG)
+#define hasmultret(k) ((k) == VCALL || (k) == VVARARG)
 
 
 
@@ -119,7 +119,7 @@ static void checknext (LexState *ls, int c) {
 }
 
 
-#define check_condition(ls,c,msg)	{ if (!(c)) luaX_syntaxerror(ls, msg); }
+#define check_condition(ls,c,msg) { if (!(c)) luaX_syntaxerror(ls, msg); }
 
 
 
@@ -192,7 +192,7 @@ static void new_localvarliteral_ (LexState *ls, const char *name, size_t sz) {
 }
 
 #define new_localvarliteral(ls,v) \
-	new_localvarliteral_(ls, "" v, (sizeof(v)/sizeof(char))-1)
+    new_localvarliteral_(ls, "" v, (sizeof(v)/sizeof(char))-1)
 
 
 static LocVar *getlocvar (FuncState *fs, int i) {
@@ -334,7 +334,7 @@ static void enterlevel (LexState *ls) {
 }
 
 
-#define leavelevel(ls)	((ls)->L->nCcalls--)
+#define leavelevel(ls) ((ls)->L->nCcalls--)
 
 
 static void closegoto (LexState *ls, int g, Labeldesc *label) {
@@ -1027,7 +1027,7 @@ static const struct {
    {2, 2}, {1, 1}                   /* and, or */
 };
 
-#define UNARY_PRIORITY	8  /* priority for unary operators */
+#define UNARY_PRIORITY 8  /* priority for unary operators */
 
 
 /*
diff --git a/liblua/lparser.h b/liblua/lparser.h
index 301167d4f..4dbb6e21f 100644
--- a/liblua/lparser.h
+++ b/liblua/lparser.h
@@ -17,25 +17,25 @@
 */
 
 typedef enum {
-  VVOID,	/* no value */
+  VVOID,        /* no value */
   VNIL,
   VTRUE,
   VFALSE,
-  VK,		/* info = index of constant in `k' */
-  VKNUM,	/* nval = numerical value */
-  VNONRELOC,	/* info = result register */
-  VLOCAL,	/* info = local register */
+  VK,           /* info = index of constant in `k' */
+  VKNUM,        /* nval = numerical value */
+  VNONRELOC,    /* info = result register */
+  VLOCAL,       /* info = local register */
   VUPVAL,       /* info = index of upvalue in 'upvalues' */
-  VINDEXED,	/* t = table register/upvalue; idx = index R/K */
-  VJMP,		/* info = instruction pc */
-  VRELOCABLE,	/* info = instruction pc */
-  VCALL,	/* info = instruction pc */
-  VVARARG	/* info = instruction pc */
+  VINDEXED,     /* t = table register/upvalue; idx = index R/K */
+  VJMP,         /* info = instruction pc */
+  VRELOCABLE,   /* info = instruction pc */
+  VCALL,        /* info = instruction pc */
+  VVARARG       /* info = instruction pc */
 } expkind;
 
 
-#define vkisvar(k)	(VLOCAL <= (k) && (k) <= VINDEXED)
-#define vkisinreg(k)	((k) == VNONRELOC || (k) == VLOCAL)
+#define vkisvar(k)   (VLOCAL <= (k) && (k) <= VINDEXED)
+#define vkisinreg(k) ((k) == VNONRELOC || (k) == VLOCAL)
 
 typedef struct expdesc {
   expkind k;
diff --git a/liblua/lstate.c b/liblua/lstate.c
index 207a106d5..486442ac7 100644
--- a/liblua/lstate.c
+++ b/liblua/lstate.c
@@ -27,19 +27,19 @@
 
 
 #if !defined(LUAI_GCPAUSE)
-#define LUAI_GCPAUSE	200  /* 200% */
+#define LUAI_GCPAUSE 200  /* 200% */
 #endif
 
 #if !defined(LUAI_GCMAJOR)
-#define LUAI_GCMAJOR	200  /* 200% */
+#define LUAI_GCMAJOR 200  /* 200% */
 #endif
 
 #if !defined(LUAI_GCMUL)
-#define LUAI_GCMUL	200 /* GC runs 'twice the speed' of memory allocation */
+#define LUAI_GCMUL   200 /* GC runs 'twice the speed' of memory allocation */
 #endif
 
 
-#define MEMERRMSG	"not enough memory"
+#define MEMERRMSG "not enough memory"
 
 
 /*
@@ -48,7 +48,7 @@
 */
 #if !defined(luai_makeseed)
 #include <time.h>
-#define luai_makeseed()		cast(unsigned int, time(NULL))
+#define luai_makeseed() cast(unsigned int, time(NULL))
 #endif
 
 
@@ -74,7 +74,7 @@ typedef struct LG {
 
 
 
-#define fromstate(L)	(cast(LX *, cast(lu_byte *, (L)) - offsetof(LX, l)))
+#define fromstate(L) (cast(LX *, cast(lu_byte *, (L)) - offsetof(LX, l)))
 
 
 /*
diff --git a/liblua/lstate.h b/liblua/lstate.h
index c8a31f5c0..f862da81f 100644
--- a/liblua/lstate.h
+++ b/liblua/lstate.h
@@ -51,9 +51,9 @@ struct lua_longjmp;  /* defined in ldo.c */
 
 
 /* kinds of Garbage Collection */
-#define KGC_NORMAL	0
-#define KGC_EMERGENCY	1	/* gc was forced by an allocation failure */
-#define KGC_GEN		2	/* generational collection */
+#define KGC_NORMAL    0
+#define KGC_EMERGENCY 1 /* gc was forced by an allocation failure */
+#define KGC_GEN       2 /* generational collection */
 
 
 typedef struct stringtable {
@@ -68,7 +68,7 @@ typedef struct stringtable {
 */
 typedef struct CallInfo {
   StkId func;  /* function index in the stack */
-  StkId	top;  /* top for this function */
+  StkId top;  /* top for this function */
   struct CallInfo *previous, *next;  /* dynamic call link */
   short nresults;  /* expected number of results from this function */
   lu_byte callstatus;
@@ -92,18 +92,18 @@ typedef struct CallInfo {
 /*
 ** Bits in CallInfo status
 */
-#define CIST_LUA	(1<<0)	/* call is running a Lua function */
-#define CIST_HOOKED	(1<<1)	/* call is running a debug hook */
-#define CIST_REENTRY	(1<<2)	/* call is running on same invocation of
+#define CIST_LUA        (1<<0) /* call is running a Lua function */
+#define CIST_HOOKED     (1<<1) /* call is running a debug hook */
+#define CIST_REENTRY    (1<<2) /* call is running on same invocation of
                                    luaV_execute of previous call */
-#define CIST_YIELDED	(1<<3)	/* call reentered after suspension */
-#define CIST_YPCALL	(1<<4)	/* call is a yieldable protected call */
-#define CIST_STAT	(1<<5)	/* call has an error status (pcall) */
-#define CIST_TAIL	(1<<6)	/* call was tail called */
-#define CIST_HOOKYIELD	(1<<7)	/* last hook called yielded */
+#define CIST_YIELDED    (1<<3) /* call reentered after suspension */
+#define CIST_YPCALL     (1<<4) /* call is a yieldable protected call */
+#define CIST_STAT       (1<<5) /* call has an error status (pcall) */
+#define CIST_TAIL       (1<<6) /* call was tail called */
+#define CIST_HOOKYIELD  (1<<7) /* last hook called yielded */
 
 
-#define isLua(ci)	((ci)->callstatus & CIST_LUA)
+#define isLua(ci) ((ci)->callstatus & CIST_LUA)
 
 
 /*
@@ -176,7 +176,7 @@ struct lua_State {
 };
 
 
-#define G(L)	(L->l_G)
+#define G(L) (L->l_G)
 
 
 /*
@@ -194,29 +194,29 @@ union GCObject {
 };
 
 
-#define gch(o)		(&(o)->gch)
+#define gch(o)          (&(o)->gch)
 
 /* macros to convert a GCObject into a specific value */
 #define rawgco2ts(o)  \
-	check_exp(novariant((o)->gch.tt) == LUA_TSTRING, &((o)->ts))
-#define gco2ts(o)	(&rawgco2ts(o)->tsv)
-#define rawgco2u(o)	check_exp((o)->gch.tt == LUA_TUSERDATA, &((o)->u))
-#define gco2u(o)	(&rawgco2u(o)->uv)
-#define gco2lcl(o)	check_exp((o)->gch.tt == LUA_TLCL, &((o)->cl.l))
-#define gco2ccl(o)	check_exp((o)->gch.tt == LUA_TCCL, &((o)->cl.c))
+    check_exp(novariant((o)->gch.tt) == LUA_TSTRING, &((o)->ts))
+#define gco2ts(o)       (&rawgco2ts(o)->tsv)
+#define rawgco2u(o)     check_exp((o)->gch.tt == LUA_TUSERDATA, &((o)->u))
+#define gco2u(o)        (&rawgco2u(o)->uv)
+#define gco2lcl(o)      check_exp((o)->gch.tt == LUA_TLCL, &((o)->cl.l))
+#define gco2ccl(o)      check_exp((o)->gch.tt == LUA_TCCL, &((o)->cl.c))
 #define gco2cl(o)  \
-	check_exp(novariant((o)->gch.tt) == LUA_TFUNCTION, &((o)->cl))
-#define gco2t(o)	check_exp((o)->gch.tt == LUA_TTABLE, &((o)->h))
-#define gco2p(o)	check_exp((o)->gch.tt == LUA_TPROTO, &((o)->p))
-#define gco2uv(o)	check_exp((o)->gch.tt == LUA_TUPVAL, &((o)->uv))
-#define gco2th(o)	check_exp((o)->gch.tt == LUA_TTHREAD, &((o)->th))
+    check_exp(novariant((o)->gch.tt) == LUA_TFUNCTION, &((o)->cl))
+#define gco2t(o)        check_exp((o)->gch.tt == LUA_TTABLE, &((o)->h))
+#define gco2p(o)        check_exp((o)->gch.tt == LUA_TPROTO, &((o)->p))
+#define gco2uv(o)       check_exp((o)->gch.tt == LUA_TUPVAL, &((o)->uv))
+#define gco2th(o)       check_exp((o)->gch.tt == LUA_TTHREAD, &((o)->th))
 
 /* macro to convert any Lua object into a GCObject */
-#define obj2gco(v)	(cast(GCObject *, (v)))
+#define obj2gco(v) (cast(GCObject *, (v)))
 
 
 /* actual number of total bytes allocated */
-#define gettotalbytes(g)	((g)->totalbytes + (g)->GCdebt)
+#define gettotalbytes(g) ((g)->totalbytes + (g)->GCdebt)
 
 LUAI_FUNC void luaE_setdebt (global_State *g, l_mem debt);
 LUAI_FUNC void luaE_freethread (lua_State *L, lua_State *L1);
diff --git a/liblua/lstring.c b/liblua/lstring.c
index 8b5af0b2e..049d09b67 100644
--- a/liblua/lstring.c
+++ b/liblua/lstring.c
@@ -23,7 +23,7 @@
 ** compute its hash
 */
 #if !defined(LUAI_HASHLIMIT)
-#define LUAI_HASHLIMIT		5
+#define LUAI_HASHLIMIT 5
 #endif
 
 
diff --git a/liblua/lstring.h b/liblua/lstring.h
index d312ff3d2..b7891d6b1 100644
--- a/liblua/lstring.h
+++ b/liblua/lstring.h
@@ -12,26 +12,26 @@
 #include "lstate.h"
 
 
-#define sizestring(s)	(sizeof(union TString)+((s)->len+1)*sizeof(char))
+#define sizestring(s) (sizeof(union TString)+((s)->len+1)*sizeof(char))
 
-#define sizeudata(u)	(sizeof(union Udata)+(u)->len)
+#define sizeudata(u) (sizeof(union Udata)+(u)->len)
 
-#define luaS_newliteral(L, s)	(luaS_newlstr(L, "" s, \
+#define luaS_newliteral(L, s) (luaS_newlstr(L, "" s, \
                                  (sizeof(s)/sizeof(char))-1))
 
-#define luaS_fix(s)	l_setbit((s)->tsv.marked, FIXEDBIT)
+#define luaS_fix(s) l_setbit((s)->tsv.marked, FIXEDBIT)
 
 
 /*
 ** test whether a string is a reserved word
 */
-#define isreserved(s)	((s)->tsv.tt == LUA_TSHRSTR && (s)->tsv.extra > 0)
+#define isreserved(s) ((s)->tsv.tt == LUA_TSHRSTR && (s)->tsv.extra > 0)
 
 
 /*
 ** equality for short strings, which are always internalized
 */
-#define eqshrstr(a,b)	check_exp((a)->tsv.tt == LUA_TSHRSTR, (a) == (b))
+#define eqshrstr(a,b) check_exp((a)->tsv.tt == LUA_TSHRSTR, (a) == (b))
 
 
 LUAI_FUNC unsigned int luaS_hash (const char *str, size_t l, unsigned int seed);
diff --git a/liblua/lstrlib.c b/liblua/lstrlib.c
index fcc61c9a6..685beb77f 100644
--- a/liblua/lstrlib.c
+++ b/liblua/lstrlib.c
@@ -25,12 +25,12 @@
 ** pattern-matching. This limit is arbitrary.
 */
 #if !defined(LUA_MAXCAPTURES)
-#define LUA_MAXCAPTURES		32
+#define LUA_MAXCAPTURES 32
 #endif
 
 
 /* macro to `unsign' a character */
-#define uchar(c)	((unsigned char)(c))
+#define uchar(c) ((unsigned char)(c))
 
 
 
@@ -103,7 +103,7 @@ static int str_upper (lua_State *L) {
 
 
 /* reasonable limit to avoid arithmetic overflow */
-#define MAXSIZE		((~(size_t)0) >> 1)
+#define MAXSIZE ((~(size_t)0) >> 1)
 
 static int str_rep (lua_State *L) {
   size_t l, lsep;
@@ -191,8 +191,8 @@ static int str_dump (lua_State *L) {
 */
 
 
-#define CAP_UNFINISHED	(-1)
-#define CAP_POSITION	(-2)
+#define CAP_UNFINISHED (-1)
+#define CAP_POSITION   (-2)
 
 
 typedef struct MatchState {
@@ -215,12 +215,12 @@ static const char *match (MatchState *ms, const char *s, const char *p);
 
 /* maximum recursion depth for 'match' */
 #if !defined(MAXCCALLS)
-#define MAXCCALLS	200
+#define MAXCCALLS 200
 #endif
 
 
-#define L_ESC		'%'
-#define SPECIALS	"^$*+?.([%-"
+#define L_ESC '%'
+#define SPECIALS "^$*+?.([%-"
 
 
 static int check_capture (MatchState *ms, int l) {
@@ -791,19 +791,19 @@ static int str_gsub (lua_State *L) {
 ** 'string.format'; LUA_INTFRM_T is the integer type corresponding to
 ** the previous length
 */
-#if !defined(LUA_INTFRMLEN)	/* { */
+#if !defined(LUA_INTFRMLEN) /* { */
 #if defined(LUA_USE_LONGLONG)
 
-#define LUA_INTFRMLEN		"ll"
-#define LUA_INTFRM_T		long long
+#define LUA_INTFRMLEN "ll"
+#define LUA_INTFRM_T long long
 
 #else
 
-#define LUA_INTFRMLEN		"l"
-#define LUA_INTFRM_T		long
+#define LUA_INTFRMLEN "l"
+#define LUA_INTFRM_T long
 
 #endif
-#endif				/* } */
+#endif                      /* } */
 
 
 /*
@@ -813,21 +813,21 @@ static int str_gsub (lua_State *L) {
 */
 #if !defined(LUA_FLTFRMLEN)
 
-#define LUA_FLTFRMLEN		""
-#define LUA_FLTFRM_T		double
+#define LUA_FLTFRMLEN ""
+#define LUA_FLTFRM_T double
 
 #endif
 
 
 /* maximum size of each formatted item (> len(format('%99.99f', -1e308))) */
-#define MAX_ITEM	512
+#define MAX_ITEM 512
 /* valid flags in a format specification */
-#define FLAGS	"-+ #0"
+#define FLAGS "-+ #0"
 /*
 ** maximum size of each format specification (such as '%-099.99d')
 ** (+10 accounts for %99.99x plus margin of error)
 */
-#define MAX_FORMAT	(sizeof(FLAGS) + sizeof(LUA_INTFRMLEN) + 10)
+#define MAX_FORMAT (sizeof(FLAGS) + sizeof(LUA_INTFRMLEN) + 10)
 
 
 static void addquoted (lua_State *L, luaL_Buffer *b, int arg) {
diff --git a/liblua/ltable.c b/liblua/ltable.c
index 420391fc7..713ff34c7 100644
--- a/liblua/ltable.c
+++ b/liblua/ltable.c
@@ -40,33 +40,33 @@
 ** max size of array part is 2^MAXBITS
 */
 #if LUAI_BITSINT >= 32
-#define MAXBITS		30
+#define MAXBITS 30
 #else
-#define MAXBITS		(LUAI_BITSINT-2)
+#define MAXBITS (LUAI_BITSINT-2)
 #endif
 
-#define MAXASIZE	(1 << MAXBITS)
+#define MAXASIZE (1 << MAXBITS)
 
 
-#define hashpow2(t,n)		(gnode(t, lmod((n), sizenode(t))))
+#define hashpow2(t,n) (gnode(t, lmod((n), sizenode(t))))
 
-#define hashstr(t,str)		hashpow2(t, (str)->tsv.hash)
-#define hashboolean(t,p)	hashpow2(t, p)
+#define hashstr(t,str) hashpow2(t, (str)->tsv.hash)
+#define hashboolean(t,p) hashpow2(t, p)
 
 
 /*
 ** for some types, it is better to avoid modulus by power of 2, as
 ** they tend to have many 2 factors.
 */
-#define hashmod(t,n)	(gnode(t, ((n) % ((sizenode(t)-1)|1))))
+#define hashmod(t,n) (gnode(t, ((n) % ((sizenode(t)-1)|1))))
 
 
-#define hashpointer(t,p)	hashmod(t, IntPoint(p))
+#define hashpointer(t,p) hashmod(t, IntPoint(p))
 
 
-#define dummynode		(&dummynode_)
+#define dummynode (&dummynode_)
 
-#define isdummy(n)		((n) == dummynode)
+#define isdummy(n) ((n) == dummynode)
 
 static const Node dummynode_ = {
   {NILCONSTANT},  /* value */
diff --git a/liblua/ltable.h b/liblua/ltable.h
index 2f6f5c2dc..b7d4f7db9 100644
--- a/liblua/ltable.h
+++ b/liblua/ltable.h
@@ -10,12 +10,12 @@
 #include "lobject.h"
 
 
-#define gnode(t,i)	(&(t)->node[i])
-#define gkey(n)		(&(n)->i_key.tvk)
-#define gval(n)		(&(n)->i_val)
-#define gnext(n)	((n)->i_key.nk.next)
+#define gnode(t,i) (&(t)->node[i])
+#define gkey(n)    (&(n)->i_key.tvk)
+#define gval(n)    (&(n)->i_val)
+#define gnext(n)   ((n)->i_key.nk.next)
 
-#define invalidateTMcache(t)	((t)->flags = 0)
+#define invalidateTMcache(t) ((t)->flags = 0)
 
 
 LUAI_FUNC const TValue *luaH_getint (Table *t, int key);
diff --git a/liblua/ltablib.c b/liblua/ltablib.c
index ad798b4e2..ba8de3f29 100644
--- a/liblua/ltablib.c
+++ b/liblua/ltablib.c
@@ -16,7 +16,7 @@
 #include "lualib.h"
 
 
-#define aux_getn(L,n)	(luaL_checktype(L, n, LUA_TTABLE), luaL_len(L, n))
+#define aux_getn(L,n) (luaL_checktype(L, n, LUA_TTABLE), luaL_len(L, n))
 
 
 
diff --git a/liblua/ltm.h b/liblua/ltm.h
index 89bdc19a1..a12037628 100644
--- a/liblua/ltm.h
+++ b/liblua/ltm.h
@@ -33,7 +33,7 @@ typedef enum {
   TM_LE,
   TM_CONCAT,
   TM_CALL,
-  TM_N		/* number of elements in the enum */
+  TM_N    /* number of elements in the enum */
 } TMS;
 
 
@@ -41,10 +41,10 @@ typedef enum {
 #define gfasttm(g,et,e) ((et) == NULL ? NULL : \
   ((et)->flags & (1u<<(e))) ? NULL : luaT_gettm(et, e, (g)->tmname[e]))
 
-#define fasttm(l,et,e)	gfasttm(G(l), et, e)
+#define fasttm(l,et,e) gfasttm(G(l), et, e)
 
-#define ttypename(x)	luaT_typenames_[(x) + 1]
-#define objtypename(x)	ttypename(ttypenv(x))
+#define ttypename(x)   luaT_typenames_[(x) + 1]
+#define objtypename(x) ttypename(ttypenv(x))
 
 LUAI_DDEC const char *const luaT_typenames_[LUA_TOTALTAGS];
 
diff --git a/liblua/lua.c b/liblua/lua.c
index 6a0071292..cd6984494 100644
--- a/liblua/lua.c
+++ b/liblua/lua.c
@@ -19,24 +19,24 @@
 
 
 #if !defined(LUA_PROMPT)
-#define LUA_PROMPT		"> "
-#define LUA_PROMPT2		">> "
+#define LUA_PROMPT  "> "
+#define LUA_PROMPT2 ">> "
 #endif
 
 #if !defined(LUA_PROGNAME)
-#define LUA_PROGNAME		"lua"
+#define LUA_PROGNAME "lua"
 #endif
 
 #if !defined(LUA_MAXINPUT)
-#define LUA_MAXINPUT		512
+#define LUA_MAXINPUT 512
 #endif
 
 #if !defined(LUA_INIT)
-#define LUA_INIT		"LUA_INIT"
+#define LUA_INIT "LUA_INIT"
 #endif
 
 #define LUA_INITVERSION  \
-	LUA_INIT "_" LUA_VERSION_MAJOR "_" LUA_VERSION_MINOR
+    LUA_INIT "_" LUA_VERSION_MAJOR "_" LUA_VERSION_MINOR
 
 
 /*
@@ -45,13 +45,13 @@
 */
 #if defined(LUA_USE_ISATTY)
 #include <unistd.h>
-#define lua_stdin_is_tty()	isatty(0)
+#define lua_stdin_is_tty() isatty(0)
 #elif defined(LUA_WIN)
 #include <io.h>
 #include <stdio.h>
-#define lua_stdin_is_tty()	_isatty(_fileno(stdin))
+#define lua_stdin_is_tty() _isatty(_fileno(stdin))
 #else
-#define lua_stdin_is_tty()	1  /* assume stdin is a tty */
+#define lua_stdin_is_tty() 1  /* assume stdin is a tty */
 #endif
 
 
@@ -66,19 +66,19 @@
 #include <stdio.h>
 #include <readline/readline.h>
 #include <readline/history.h>
-#define lua_readline(L,b,p)	((void)L, ((b)=readline(p)) != NULL)
+#define lua_readline(L,b,p) ((void)L, ((b)=readline(p)) != NULL)
 #define lua_saveline(L,idx) \
         if (lua_rawlen(L,idx) > 0)  /* non-empty line? */ \
           add_history(lua_tostring(L, idx));  /* add it to history */
-#define lua_freeline(L,b)	((void)L, free(b))
+#define lua_freeline(L,b) ((void)L, free(b))
 
 #elif !defined(lua_readline)
 
 #define lua_readline(L,b,p) \
         ((void)L, fputs(p, stdout), fflush(stdout),  /* show prompt */ \
         fgets(b, LUA_MAXINPUT, stdin) != NULL)  /* get line */
-#define lua_saveline(L,idx)	{ (void)L; (void)idx; }
-#define lua_freeline(L,b)	{ (void)L; (void)b; }
+#define lua_saveline(L,idx) { (void)L; (void)idx; }
+#define lua_freeline(L,b) { (void)L; (void)b; }
 
 #endif
 
@@ -241,8 +241,8 @@ static const char *get_prompt (lua_State *L, int firstline) {
 }
 
 /* mark in error messages for incomplete statements */
-#define EOFMARK		"<eof>"
-#define marklen		(sizeof(EOFMARK)/sizeof(char) - 1)
+#define EOFMARK "<eof>"
+#define marklen (sizeof(EOFMARK)/sizeof(char) - 1)
 
 static int incomplete (lua_State *L, int status) {
   if (status == LUA_ERRSYNTAX) {
@@ -342,16 +342,16 @@ static int handle_script (lua_State *L, char **argv, int n) {
 
 
 /* check that argument has no extra characters at the end */
-#define noextrachars(x)		{if ((x)[2] != '\0') return -1;}
+#define noextrachars(x) {if ((x)[2] != '\0') return -1;}
 
 
 /* indices of various argument indicators in array args */
-#define has_i		0	/* -i */
-#define has_v		1	/* -v */
-#define has_e		2	/* -e */
-#define has_E		3	/* -E */
+#define has_i 0 /* -i */
+#define has_v 1 /* -v */
+#define has_e 2 /* -e */
+#define has_E 3 /* -E */
 
-#define num_has		4	/* number of 'has_*' */
+#define num_has 4 /* number of 'has_*' */
 
 
 static int collectargs (char **argv, int *args) {
diff --git a/liblua/lua.h b/liblua/lua.h
index eb0482b8f..8346e227a 100644
--- a/liblua/lua.h
+++ b/liblua/lua.h
@@ -16,39 +16,39 @@
 #include "luaconf.h"
 
 
-#define LUA_VERSION_MAJOR	"5"
-#define LUA_VERSION_MINOR	"2"
-#define LUA_VERSION_NUM		502
-#define LUA_VERSION_RELEASE	"2"
+#define LUA_VERSION_MAJOR   "5"
+#define LUA_VERSION_MINOR   "2"
+#define LUA_VERSION_NUM     502
+#define LUA_VERSION_RELEASE "2"
 
-#define LUA_VERSION	"Lua " LUA_VERSION_MAJOR "." LUA_VERSION_MINOR
-#define LUA_RELEASE	LUA_VERSION "." LUA_VERSION_RELEASE
-#define LUA_COPYRIGHT	LUA_RELEASE "  Copyright (C) 1994-2013 Lua.org, PUC-Rio"
-#define LUA_AUTHORS	"R. Ierusalimschy, L. H. de Figueiredo, W. Celes"
+#define LUA_VERSION   "Lua " LUA_VERSION_MAJOR "." LUA_VERSION_MINOR
+#define LUA_RELEASE   LUA_VERSION "." LUA_VERSION_RELEASE
+#define LUA_COPYRIGHT LUA_RELEASE "  Copyright (C) 1994-2013 Lua.org, PUC-Rio"
+#define LUA_AUTHORS   "R. Ierusalimschy, L. H. de Figueiredo, W. Celes"
 
 
 /* mark for precompiled code ('<esc>Lua') */
-#define LUA_SIGNATURE	"\033Lua"
+#define LUA_SIGNATURE "\033Lua"
 
 /* option for multiple returns in 'lua_pcall' and 'lua_call' */
-#define LUA_MULTRET	(-1)
+#define LUA_MULTRET (-1)
 
 
 /*
 ** pseudo-indices
 */
-#define LUA_REGISTRYINDEX	LUAI_FIRSTPSEUDOIDX
-#define lua_upvalueindex(i)	(LUA_REGISTRYINDEX - (i))
+#define LUA_REGISTRYINDEX   LUAI_FIRSTPSEUDOIDX
+#define lua_upvalueindex(i) (LUA_REGISTRYINDEX - (i))
 
 
 /* thread status */
-#define LUA_OK		0
-#define LUA_YIELD	1
-#define LUA_ERRRUN	2
-#define LUA_ERRSYNTAX	3
-#define LUA_ERRMEM	4
-#define LUA_ERRGCMM	5
-#define LUA_ERRERR	6
+#define LUA_OK        0
+#define LUA_YIELD     1
+#define LUA_ERRRUN    2
+#define LUA_ERRSYNTAX 3
+#define LUA_ERRMEM    4
+#define LUA_ERRGCMM   5
+#define LUA_ERRERR    6
 
 
 typedef struct lua_State lua_State;
@@ -73,30 +73,30 @@ typedef void * (*lua_Alloc) (void *ud, void *ptr, size_t osize, size_t nsize);
 /*
 ** basic types
 */
-#define LUA_TNONE		(-1)
+#define LUA_TNONE            (-1)
 
-#define LUA_TNIL		0
-#define LUA_TBOOLEAN		1
-#define LUA_TLIGHTUSERDATA	2
-#define LUA_TNUMBER		3
-#define LUA_TSTRING		4
-#define LUA_TTABLE		5
-#define LUA_TFUNCTION		6
-#define LUA_TUSERDATA		7
-#define LUA_TTHREAD		8
+#define LUA_TNIL             0
+#define LUA_TBOOLEAN         1
+#define LUA_TLIGHTUSERDATA   2
+#define LUA_TNUMBER          3
+#define LUA_TSTRING          4
+#define LUA_TTABLE           5
+#define LUA_TFUNCTION        6
+#define LUA_TUSERDATA        7
+#define LUA_TTHREAD          8
 
-#define LUA_NUMTAGS		9
+#define LUA_NUMTAGS          9
 
 
 
 /* minimum Lua stack available to a C function */
-#define LUA_MINSTACK	20
+#define LUA_MINSTACK 20
 
 
 /* predefined values in the registry */
-#define LUA_RIDX_MAINTHREAD	1
-#define LUA_RIDX_GLOBALS	2
-#define LUA_RIDX_LAST		LUA_RIDX_GLOBALS
+#define LUA_RIDX_MAINTHREAD  1
+#define LUA_RIDX_GLOBALS     2
+#define LUA_RIDX_LAST        LUA_RIDX_GLOBALS
 
 
 /* type of numbers in Lua */
@@ -172,7 +172,7 @@ LUA_API int             (lua_toboolean) (lua_State *L, int idx);
 LUA_API const char     *(lua_tolstring) (lua_State *L, int idx, size_t *len);
 LUA_API size_t          (lua_rawlen) (lua_State *L, int idx);
 LUA_API lua_CFunction   (lua_tocfunction) (lua_State *L, int idx);
-LUA_API void	       *(lua_touserdata) (lua_State *L, int idx);
+LUA_API void           *(lua_touserdata) (lua_State *L, int idx);
 LUA_API lua_State      *(lua_tothread) (lua_State *L, int idx);
 LUA_API const void     *(lua_topointer) (lua_State *L, int idx);
 
@@ -181,19 +181,19 @@ LUA_API const void     *(lua_topointer) (lua_State *L, int idx);
 ** Comparison and arithmetic functions
 */
 
-#define LUA_OPADD	0	/* ORDER TM */
-#define LUA_OPSUB	1
-#define LUA_OPMUL	2
-#define LUA_OPDIV	3
-#define LUA_OPMOD	4
-#define LUA_OPPOW	5
-#define LUA_OPUNM	6
+#define LUA_OPADD 0 /* ORDER TM */
+#define LUA_OPSUB 1
+#define LUA_OPMUL 2
+#define LUA_OPDIV 3
+#define LUA_OPMOD 4
+#define LUA_OPPOW 5
+#define LUA_OPUNM 6
 
 LUA_API void  (lua_arith) (lua_State *L, int op);
 
-#define LUA_OPEQ	0
-#define LUA_OPLT	1
-#define LUA_OPLE	2
+#define LUA_OPEQ  0
+#define LUA_OPLT  1
+#define LUA_OPLE  2
 
 LUA_API int   (lua_rawequal) (lua_State *L, int idx1, int idx2);
 LUA_API int   (lua_compare) (lua_State *L, int idx1, int idx2, int op);
@@ -250,13 +250,13 @@ LUA_API void  (lua_setuservalue) (lua_State *L, int idx);
 */
 LUA_API void  (lua_callk) (lua_State *L, int nargs, int nresults, int ctx,
                            lua_CFunction k);
-#define lua_call(L,n,r)		lua_callk(L, (n), (r), 0, NULL)
+#define lua_call(L,n,r) lua_callk(L, (n), (r), 0, NULL)
 
 LUA_API int   (lua_getctx) (lua_State *L, int *ctx);
 
 LUA_API int   (lua_pcallk) (lua_State *L, int nargs, int nresults, int errfunc,
                             int ctx, lua_CFunction k);
-#define lua_pcall(L,n,r,f)	lua_pcallk(L, (n), (r), (f), 0, NULL)
+#define lua_pcall(L,n,r,f) lua_pcallk(L, (n), (r), (f), 0, NULL)
 
 LUA_API int   (lua_load) (lua_State *L, lua_Reader reader, void *dt,
                                         const char *chunkname,
@@ -270,7 +270,7 @@ LUA_API int (lua_dump) (lua_State *L, lua_Writer writer, void *data);
 */
 LUA_API int  (lua_yieldk) (lua_State *L, int nresults, int ctx,
                            lua_CFunction k);
-#define lua_yield(L,n)		lua_yieldk(L, (n), 0, NULL)
+#define lua_yield(L,n) lua_yieldk(L, (n), 0, NULL)
 LUA_API int  (lua_resume) (lua_State *L, lua_State *from, int narg);
 LUA_API int  (lua_status) (lua_State *L);
 
@@ -278,18 +278,18 @@ LUA_API int  (lua_status) (lua_State *L);
 ** garbage-collection function and options
 */
 
-#define LUA_GCSTOP		0
-#define LUA_GCRESTART		1
-#define LUA_GCCOLLECT		2
-#define LUA_GCCOUNT		3
-#define LUA_GCCOUNTB		4
-#define LUA_GCSTEP		5
-#define LUA_GCSETPAUSE		6
-#define LUA_GCSETSTEPMUL	7
-#define LUA_GCSETMAJORINC	8
-#define LUA_GCISRUNNING		9
-#define LUA_GCGEN		10
-#define LUA_GCINC		11
+#define LUA_GCSTOP          0
+#define LUA_GCRESTART       1
+#define LUA_GCCOLLECT       2
+#define LUA_GCCOUNT         3
+#define LUA_GCCOUNTB        4
+#define LUA_GCSTEP          5
+#define LUA_GCSETPAUSE      6
+#define LUA_GCSETSTEPMUL    7
+#define LUA_GCSETMAJORINC   8
+#define LUA_GCISRUNNING     9
+#define LUA_GCGEN          10
+#define LUA_GCINC          11
 
 LUA_API int (lua_gc) (lua_State *L, int what, int data);
 
@@ -316,34 +316,35 @@ LUA_API void      (lua_setallocf) (lua_State *L, lua_Alloc f, void *ud);
 ** ===============================================================
 */
 
-#define lua_tonumber(L,i)	lua_tonumberx(L,i,NULL)
-#define lua_tointeger(L,i)	lua_tointegerx(L,i,NULL)
-#define lua_tounsigned(L,i)	lua_tounsignedx(L,i,NULL)
+#define lua_tonumber(L,i)        lua_tonumberx(L,i,NULL)
+#define lua_tointeger(L,i)       lua_tointegerx(L,i,NULL)
+#define lua_tounsigned(L,i)      lua_tounsignedx(L,i,NULL)
 
-#define lua_pop(L,n)		lua_settop(L, -(n)-1)
+#define lua_pop(L,n)             lua_settop(L, -(n)-1)
 
-#define lua_newtable(L)		lua_createtable(L, 0, 0)
+#define lua_newtable(L)          lua_createtable(L, 0, 0)
 
-#define lua_register(L,n,f) (lua_pushcfunction(L, (f)), lua_setglobal(L, (n)))
+#define lua_register(L,n,f) \
+    (lua_pushcfunction(L, (f)), lua_setglobal(L, (n)))
 
-#define lua_pushcfunction(L,f)	lua_pushcclosure(L, (f), 0)
+#define lua_pushcfunction(L,f)   lua_pushcclosure(L, (f), 0)
 
-#define lua_isfunction(L,n)	(lua_type(L, (n)) == LUA_TFUNCTION)
-#define lua_istable(L,n)	(lua_type(L, (n)) == LUA_TTABLE)
-#define lua_islightuserdata(L,n)	(lua_type(L, (n)) == LUA_TLIGHTUSERDATA)
-#define lua_isnil(L,n)		(lua_type(L, (n)) == LUA_TNIL)
-#define lua_isboolean(L,n)	(lua_type(L, (n)) == LUA_TBOOLEAN)
-#define lua_isthread(L,n)	(lua_type(L, (n)) == LUA_TTHREAD)
-#define lua_isnone(L,n)		(lua_type(L, (n)) == LUA_TNONE)
-#define lua_isnoneornil(L, n)	(lua_type(L, (n)) <= 0)
+#define lua_isfunction(L,n)      (lua_type(L, (n)) == LUA_TFUNCTION)
+#define lua_istable(L,n)         (lua_type(L, (n)) == LUA_TTABLE)
+#define lua_islightuserdata(L,n) (lua_type(L, (n)) == LUA_TLIGHTUSERDATA)
+#define lua_isnil(L,n)           (lua_type(L, (n)) == LUA_TNIL)
+#define lua_isboolean(L,n)       (lua_type(L, (n)) == LUA_TBOOLEAN)
+#define lua_isthread(L,n)        (lua_type(L, (n)) == LUA_TTHREAD)
+#define lua_isnone(L,n)          (lua_type(L, (n)) == LUA_TNONE)
+#define lua_isnoneornil(L, n)    (lua_type(L, (n)) <= 0)
 
-#define lua_pushliteral(L, s)	\
-	lua_pushlstring(L, "" s, (sizeof(s)/sizeof(char))-1)
+#define lua_pushliteral(L, s) \
+    lua_pushlstring(L, "" s, (sizeof(s)/sizeof(char))-1)
 
-#define lua_pushglobaltable(L)  \
-	lua_rawgeti(L, LUA_REGISTRYINDEX, LUA_RIDX_GLOBALS)
+#define lua_pushglobaltable(L) \
+    lua_rawgeti(L, LUA_REGISTRYINDEX, LUA_RIDX_GLOBALS)
 
-#define lua_tostring(L,i)	lua_tolstring(L, (i), NULL)
+#define lua_tostring(L,i)        lua_tolstring(L, (i), NULL)
 
 
 
@@ -357,20 +358,20 @@ LUA_API void      (lua_setallocf) (lua_State *L, lua_Alloc f, void *ud);
 /*
 ** Event codes
 */
-#define LUA_HOOKCALL	0
-#define LUA_HOOKRET	1
-#define LUA_HOOKLINE	2
-#define LUA_HOOKCOUNT	3
+#define LUA_HOOKCALL     0
+#define LUA_HOOKRET      1
+#define LUA_HOOKLINE     2
+#define LUA_HOOKCOUNT    3
 #define LUA_HOOKTAILCALL 4
 
 
 /*
 ** Event masks
 */
-#define LUA_MASKCALL	(1 << LUA_HOOKCALL)
-#define LUA_MASKRET	(1 << LUA_HOOKRET)
-#define LUA_MASKLINE	(1 << LUA_HOOKLINE)
-#define LUA_MASKCOUNT	(1 << LUA_HOOKCOUNT)
+#define LUA_MASKCALL     (1 << LUA_HOOKCALL)
+#define LUA_MASKRET      (1 << LUA_HOOKRET)
+#define LUA_MASKLINE     (1 << LUA_HOOKLINE)
+#define LUA_MASKCOUNT    (1 << LUA_HOOKCOUNT)
 
 typedef struct lua_Debug lua_Debug;  /* activation record */
 
@@ -398,17 +399,17 @@ LUA_API int (lua_gethookcount) (lua_State *L);
 
 struct lua_Debug {
   int event;
-  const char *name;	/* (n) */
-  const char *namewhat;	/* (n) 'global', 'local', 'field', 'method' */
-  const char *what;	/* (S) 'Lua', 'C', 'main', 'tail' */
-  const char *source;	/* (S) */
-  int currentline;	/* (l) */
-  int linedefined;	/* (S) */
-  int lastlinedefined;	/* (S) */
-  unsigned char nups;	/* (u) number of upvalues */
+  const char *name;     /* (n) */
+  const char *namewhat; /* (n) 'global', 'local', 'field', 'method' */
+  const char *what;     /* (S) 'Lua', 'C', 'main', 'tail' */
+  const char *source;   /* (S) */
+  int currentline;      /* (l) */
+  int linedefined;      /* (S) */
+  int lastlinedefined;  /* (S) */
+  unsigned char nups;   /* (u) number of upvalues */
   unsigned char nparams;/* (u) number of parameters */
   char isvararg;        /* (u) */
-  char istailcall;	/* (t) */
+  char istailcall;      /* (t) */
   char short_src[LUA_IDSIZE]; /* (S) */
   /* private part */
   struct CallInfo *i_ci;  /* active function */
diff --git a/liblua/luac.c b/liblua/luac.c
index 5081836d4..d1533d4e7 100644
--- a/liblua/luac.c
+++ b/liblua/luac.c
@@ -20,17 +20,17 @@
 #include "lundump.h"
 
 static void PrintFunction(const Proto* f, int full);
-#define luaU_print	PrintFunction
+#define luaU_print PrintFunction
 
-#define PROGNAME	"luac"		/* default program name */
-#define OUTPUT		PROGNAME ".out"	/* default output file */
+#define PROGNAME   "luac"               /* default program name */
+#define OUTPUT     PROGNAME ".out"      /* default output file */
 
-static int listing=0;			/* list bytecodes? */
-static int dumping=1;			/* dump bytecodes? */
-static int stripping=0;			/* strip debug information? */
-static char Output[]={ OUTPUT };	/* default output file name */
-static const char* output=Output;	/* actual output file name */
-static const char* progname=PROGNAME;	/* actual program name */
+static int listing=0;                   /* list bytecodes? */
+static int dumping=1;                   /* dump bytecodes? */
+static int stripping=0;                 /* strip debug information? */
+static char Output[]={ OUTPUT };        /* default output file name */
+static const char* output=Output;       /* actual output file name */
+static const char* progname=PROGNAME;   /* actual program name */
 
 static void fatal(const char* message)
 {
@@ -64,7 +64,7 @@ static void usage(const char* message)
  exit(EXIT_FAILURE);
 }
 
-#define IS(s)	(strcmp(argv[i],s)==0)
+#define IS(s) (strcmp(argv[i],s)==0)
 
 static int doargs(int argc, char* argv[])
 {
@@ -73,32 +73,32 @@ static int doargs(int argc, char* argv[])
  if (argv[0]!=NULL && *argv[0]!=0) progname=argv[0];
  for (i=1; i<argc; i++)
  {
-  if (*argv[i]!='-')			/* end of options; keep it */
+  if (*argv[i]!='-')                    /* end of options; keep it */
    break;
-  else if (IS("--"))			/* end of options; skip it */
+  else if (IS("--"))                    /* end of options; skip it */
   {
    ++i;
    if (version) ++version;
    break;
   }
-  else if (IS("-"))			/* end of options; use stdin */
+  else if (IS("-"))                     /* end of options; use stdin */
    break;
-  else if (IS("-l"))			/* list */
+  else if (IS("-l"))                    /* list */
    ++listing;
-  else if (IS("-o"))			/* output file */
+  else if (IS("-o"))                    /* output file */
   {
    output=argv[++i];
    if (output==NULL || *output==0 || (*output=='-' && output[1]!=0))
     usage(LUA_QL("-o") " needs argument");
    if (IS("-")) output=NULL;
   }
-  else if (IS("-p"))			/* parse only */
+  else if (IS("-p"))                    /* parse only */
    dumping=0;
-  else if (IS("-s"))			/* strip debug information */
+  else if (IS("-s"))                    /* strip debug information */
    stripping=1;
-  else if (IS("-v"))			/* show version */
+  else if (IS("-v"))                    /* show version */
    ++version;
-  else					/* unknown option */
+  else                                  /* unknown option */
    usage(argv[i]);
  }
  if (i==argc && (listing || !dumping))
@@ -218,7 +218,7 @@ int main(int argc, char* argv[])
 #include "lobject.h"
 #include "lopcodes.h"
 
-#define VOID(p)		((const void*)(p))
+#define VOID(p) ((const void*)(p))
 
 static void PrintString(const TString* ts)
 {
@@ -239,10 +239,10 @@ static void PrintString(const TString* ts)
    case '\r': printf("\\r"); break;
    case '\t': printf("\\t"); break;
    case '\v': printf("\\v"); break;
-   default:	if (isprint(c))
-   			printf("%c",c);
-		else
-			printf("\\%03d",c);
+   default: if (isprint(c))
+                printf("%c",c);
+            else
+                printf("\\%03d",c);
   }
  }
  printf("%c",'"');
@@ -254,25 +254,25 @@ static void PrintConstant(const Proto* f, int i)
  switch (ttype(o))
  {
   case LUA_TNIL:
-	printf("nil");
-	break;
+    printf("nil");
+    break;
   case LUA_TBOOLEAN:
-	printf(bvalue(o) ? "true" : "false");
-	break;
+    printf(bvalue(o) ? "true" : "false");
+    break;
   case LUA_TNUMBER:
-	printf(LUA_NUMBER_FMT,nvalue(o));
-	break;
+    printf(LUA_NUMBER_FMT,nvalue(o));
+    break;
   case LUA_TSTRING:
-	PrintString(rawtsvalue(o));
-	break;
-  default:				/* cannot happen */
-	printf("? type=%d",ttype(o));
-	break;
+    PrintString(rawtsvalue(o));
+    break;
+  default: /* cannot happen */
+    printf("? type=%d",ttype(o));
+    break;
  }
 }
 
 #define UPVALNAME(x) ((f->upvalues[x].name) ? getstr(f->upvalues[x].name) : "-")
-#define MYK(x)		(-1-(x))
+#define MYK(x) (-1-(x))
 
 static void PrintCode(const Proto* f)
 {
@@ -372,8 +372,8 @@ static void PrintCode(const Proto* f)
  }
 }
 
-#define SS(x)	((x==1)?"":"s")
-#define S(x)	(int)(x),SS(x)
+#define SS(x) ((x==1)?"":"s")
+#define S(x)  (int)(x),SS(x)
 
 static void PrintHeader(const Proto* f)
 {
@@ -385,14 +385,14 @@ static void PrintHeader(const Proto* f)
  else
   s="(string)";
  printf("\n%s <%s:%d,%d> (%d instruction%s at %p)\n",
- 	(f->linedefined==0)?"main":"function",s,
-	f->linedefined,f->lastlinedefined,
-	S(f->sizecode),VOID(f));
+    (f->linedefined==0)?"main":"function",s,
+    f->linedefined,f->lastlinedefined,
+    S(f->sizecode),VOID(f));
  printf("%d%s param%s, %d slot%s, %d upvalue%s, ",
-	(int)(f->numparams),f->is_vararg?"+":"",SS(f->numparams),
-	S(f->maxstacksize),S(f->sizeupvalues));
+    (int)(f->numparams),f->is_vararg?"+":"",SS(f->numparams),
+    S(f->maxstacksize),S(f->sizeupvalues));
  printf("%d local%s, %d constant%s, %d function%s\n",
-	S(f->sizelocvars),S(f->sizek),S(f->sizep));
+    S(f->sizelocvars),S(f->sizek),S(f->sizep));
 }
 
 static void PrintDebug(const Proto* f)
diff --git a/liblua/luaconf.h b/liblua/luaconf.h
index df802c952..f004c5a8a 100644
--- a/liblua/luaconf.h
+++ b/liblua/luaconf.h
@@ -30,32 +30,32 @@
 
 
 #if !defined(LUA_ANSI) && defined(_WIN32) && !defined(_WIN32_WCE)
-#define LUA_WIN		/* enable goodies for regular Windows platforms */
+#define LUA_WIN                 /* enable goodies for regular Windows platforms */
 #endif
 
 #if defined(LUA_WIN)
 #define LUA_DL_DLL
-#define LUA_USE_AFORMAT		/* assume 'printf' handles 'aA' specifiers */
+#define LUA_USE_AFORMAT         /* assume 'printf' handles 'aA' specifiers */
 #endif
 
 
 
 #if defined(LUA_USE_LINUX)
 #define LUA_USE_POSIX
-#define LUA_USE_DLOPEN		/* needs an extra library: -ldl */
-#define LUA_USE_READLINE	/* needs some extra libraries */
-#define LUA_USE_STRTODHEX	/* assume 'strtod' handles hex formats */
-#define LUA_USE_AFORMAT		/* assume 'printf' handles 'aA' specifiers */
-#define LUA_USE_LONGLONG	/* assume support for long long */
+#define LUA_USE_DLOPEN          /* needs an extra library: -ldl */
+#define LUA_USE_READLINE        /* needs some extra libraries */
+#define LUA_USE_STRTODHEX       /* assume 'strtod' handles hex formats */
+#define LUA_USE_AFORMAT         /* assume 'printf' handles 'aA' specifiers */
+#define LUA_USE_LONGLONG        /* assume support for long long */
 #endif
 
 #if defined(LUA_USE_MACOSX)
 #define LUA_USE_POSIX
-#define LUA_USE_DLOPEN		/* does not need -ldl */
-#define LUA_USE_READLINE	/* needs an extra library: -lreadline */
-#define LUA_USE_STRTODHEX	/* assume 'strtod' handles hex formats */
-#define LUA_USE_AFORMAT		/* assume 'printf' handles 'aA' specifiers */
-#define LUA_USE_LONGLONG	/* assume support for long long */
+#define LUA_USE_DLOPEN          /* does not need -ldl */
+#define LUA_USE_READLINE        /* needs an extra library: -lreadline */
+#define LUA_USE_STRTODHEX       /* assume 'strtod' handles hex formats */
+#define LUA_USE_AFORMAT         /* assume 'printf' handles 'aA' specifiers */
+#define LUA_USE_LONGLONG        /* assume support for long long */
 #endif
 
 
@@ -84,31 +84,31 @@
 ** hierarchy or if you want to install your libraries in
 ** non-conventional directories.
 */
-#if defined(_WIN32)	/* { */
+#if defined(_WIN32) /* { */
 /*
 ** In Windows, any exclamation mark ('!') in the path is replaced by the
 ** path of the directory of the executable file of the current process.
 */
-#define LUA_LDIR	"!\\lua\\"
-#define LUA_CDIR	"!\\"
+#define LUA_LDIR "!\\lua\\"
+#define LUA_CDIR "!\\"
 #define LUA_PATH_DEFAULT  \
-		LUA_LDIR"?.lua;"  LUA_LDIR"?\\init.lua;" \
-		LUA_CDIR"?.lua;"  LUA_CDIR"?\\init.lua;" ".\\?.lua"
+        LUA_LDIR"?.lua;"  LUA_LDIR"?\\init.lua;" \
+        LUA_CDIR"?.lua;"  LUA_CDIR"?\\init.lua;" ".\\?.lua"
 #define LUA_CPATH_DEFAULT \
-		LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll;" ".\\?.dll"
+        LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll;" ".\\?.dll"
 
-#else			/* }{ */
+#else               /* }{ */
 
-#define LUA_VDIR	LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "/"
-#define LUA_ROOT	"/usr/local/"
-#define LUA_LDIR	LUA_ROOT "share/lua/" LUA_VDIR
-#define LUA_CDIR	LUA_ROOT "lib/lua/" LUA_VDIR
+#define LUA_VDIR LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "/"
+#define LUA_ROOT "/usr/local/"
+#define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR
+#define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR
 #define LUA_PATH_DEFAULT  \
-		LUA_LDIR"?.lua;"  LUA_LDIR"?/init.lua;" \
-		LUA_CDIR"?.lua;"  LUA_CDIR"?/init.lua;" "./?.lua"
+        LUA_LDIR"?.lua;"  LUA_LDIR"?/init.lua;" \
+        LUA_CDIR"?.lua;"  LUA_CDIR"?/init.lua;" "./?.lua"
 #define LUA_CPATH_DEFAULT \
-		LUA_CDIR"?.so;" LUA_CDIR"loadall.so;" "./?.so"
-#endif			/* } */
+        LUA_CDIR"?.so;" LUA_CDIR"loadall.so;" "./?.so"
+#endif              /* } */
 
 
 /*
@@ -117,9 +117,9 @@
 ** and is not Windows. (On Windows Lua automatically uses "\".)
 */
 #if defined(_WIN32)
-#define LUA_DIRSEP	"\\"
+#define LUA_DIRSEP "\\"
 #else
-#define LUA_DIRSEP	"/"
+#define LUA_DIRSEP "/"
 #endif
 
 
@@ -128,7 +128,7 @@
 @@ environment, used to access global names.
 ** CHANGE it if you do not like this name.
 */
-#define LUA_ENV		"_ENV"
+#define LUA_ENV "_ENV"
 
 
 /*
@@ -140,24 +140,24 @@
 ** the libraries, you may want to use the following definition (define
 ** LUA_BUILD_AS_DLL to get it).
 */
-#if defined(LUA_BUILD_AS_DLL)	/* { */
+#if defined(LUA_BUILD_AS_DLL) /* { */
 
-#if defined(LUA_CORE) || defined(LUA_LIB)	/* { */
+#if defined(LUA_CORE) || defined(LUA_LIB) /* { */
 #define LUA_API __declspec(dllexport)
-#else						/* }{ */
+#else                                     /* }{ */
 #define LUA_API __declspec(dllimport)
-#endif						/* } */
+#endif                                    /* } */
 
-#else				/* }{ */
+#else                         /* }{ */
 
-#define LUA_API		extern
+#define LUA_API extern
 
-#endif				/* } */
+#endif                        /* } */
 
 
 /* more often than not the libs go together with the core */
-#define LUALIB_API	LUA_API
-#define LUAMOD_API	LUALIB_API
+#define LUALIB_API LUA_API
+#define LUAMOD_API LUALIB_API
 
 
 /*
@@ -175,16 +175,16 @@
 ** default definition.
 */
 #if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 302) && \
-    defined(__ELF__)		/* { */
-#define LUAI_FUNC	__attribute__((visibility("hidden"))) extern
-#define LUAI_DDEC	LUAI_FUNC
-#define LUAI_DDEF	/* empty */
+    defined(__ELF__) /* { */
+#define LUAI_FUNC __attribute__((visibility("hidden"))) extern
+#define LUAI_DDEC LUAI_FUNC
+#define LUAI_DDEF /* empty */
 
-#else				/* }{ */
-#define LUAI_FUNC	extern
-#define LUAI_DDEC	extern
-#define LUAI_DDEF	/* empty */
-#endif				/* } */
+#else                /* }{ */
+#define LUAI_FUNC extern
+#define LUAI_DDEC extern
+#define LUAI_DDEF /* empty */
+#endif               /* } */
 
 
 
@@ -192,8 +192,8 @@
 @@ LUA_QL describes how error messages quote program elements.
 ** CHANGE it if you want a different appearance.
 */
-#define LUA_QL(x)	"'" x "'"
-#define LUA_QS		LUA_QL("%s")
+#define LUA_QL(x) "'" x "'"
+#define LUA_QS    LUA_QL("%s")
 
 
 /*
@@ -201,7 +201,7 @@
 @* of a function in debug information.
 ** CHANGE it if you want a different size.
 */
-#define LUA_IDSIZE	60
+#define LUA_IDSIZE 60
 
 
 /*
@@ -211,8 +211,8 @@
 */
 #if defined(LUA_LIB) || defined(lua_c)
 #include <stdio.h>
-#define luai_writestring(s,l)	fwrite((s), sizeof(char), (l), stdout)
-#define luai_writeline()	(luai_writestring("\n", 1), fflush(stdout))
+#define luai_writestring(s,l) fwrite((s), sizeof(char), (l), stdout)
+#define luai_writeline()      (luai_writestring("\n", 1), fflush(stdout))
 #endif
 
 /*
@@ -220,7 +220,7 @@
 ** (A format string with one argument is enough for Lua...)
 */
 #define luai_writestringerror(s,p) \
-	(fprintf(stderr, (s), (p)), fflush(stderr))
+    (fprintf(stderr, (s), (p)), fflush(stderr))
 
 
 /*
@@ -244,7 +244,7 @@
 ** You can define it to get all options, or change specific options
 ** to fit your specific needs.
 */
-#if defined(LUA_COMPAT_ALL)	/* { */
+#if defined(LUA_COMPAT_ALL) /* { */
 
 /*
 @@ LUA_COMPAT_UNPACK controls the presence of global 'unpack'.
@@ -263,9 +263,9 @@
 ** You can call your C function directly (with light C functions).
 */
 #define lua_cpcall(L,f,u)  \
-	(lua_pushcfunction(L, (f)), \
-	 lua_pushlightuserdata(L,(u)), \
-	 lua_pcall(L,1,0,0))
+    (lua_pushcfunction(L, (f)), \
+     lua_pushlightuserdata(L,(u)), \
+     lua_pcall(L,1,0,0))
 
 
 /*
@@ -290,12 +290,12 @@
 ** changes in the API. The macros themselves document how to
 ** change your code to avoid using them.
 */
-#define lua_strlen(L,i)		lua_rawlen(L, (i))
+#define lua_strlen(L,i) lua_rawlen(L, (i))
 
-#define lua_objlen(L,i)		lua_rawlen(L, (i))
+#define lua_objlen(L,i) lua_rawlen(L, (i))
 
-#define lua_equal(L,idx1,idx2)		lua_compare(L,(idx1),(idx2),LUA_OPEQ)
-#define lua_lessthan(L,idx1,idx2)	lua_compare(L,(idx1),(idx2),LUA_OPLT)
+#define lua_equal(L,idx1,idx2)    lua_compare(L,(idx1),(idx2),LUA_OPEQ)
+#define lua_lessthan(L,idx1,idx2) lua_compare(L,(idx1),(idx2),LUA_OPLT)
 
 /*
 @@ LUA_COMPAT_MODULE controls compatibility with previous
@@ -303,7 +303,7 @@
 */
 #define LUA_COMPAT_MODULE
 
-#endif				/* } */
+#endif                          /* } */
 
 /* }================================================================== */
 
@@ -315,14 +315,14 @@
 ** your machine. Probably you do not need to change this.
 */
 /* avoid overflows in comparison */
-#if INT_MAX-20 < 32760		/* { */
-#define LUAI_BITSINT	16
-#elif INT_MAX > 2147483640L	/* }{ */
+#if INT_MAX-20 < 32760          /* { */
+#define LUAI_BITSINT 16
+#elif INT_MAX > 2147483640L     /* }{ */
 /* int has at least 32 bits */
-#define LUAI_BITSINT	32
-#else				/* }{ */
+#define LUAI_BITSINT 32
+#else                           /* }{ */
 #error "you must define LUA_BITSINT with number of bits in an integer"
-#endif				/* } */
+#endif                          /* } */
 
 
 /*
@@ -335,16 +335,16 @@
 ** good enough for your machine. Probably you do not need to change
 ** this.
 */
-#if LUAI_BITSINT >= 32		/* { */
-#define LUA_INT32	int
-#define LUAI_UMEM	size_t
-#define LUAI_MEM	ptrdiff_t
-#else				/* }{ */
+#if LUAI_BITSINT >= 32 /* { */
+#define LUA_INT32 int
+#define LUAI_UMEM size_t
+#define LUAI_MEM  ptrdiff_t
+#else                  /* }{ */
 /* 16-bit ints */
-#define LUA_INT32	long
-#define LUAI_UMEM	unsigned long
-#define LUAI_MEM	long
-#endif				/* } */
+#define LUA_INT32 long
+#define LUAI_UMEM unsigned long
+#define LUAI_MEM  long
+#endif                 /* } */
 
 
 /*
@@ -354,13 +354,13 @@
 ** space (and to reserve some numbers for pseudo-indices).
 */
 #if LUAI_BITSINT >= 32
-#define LUAI_MAXSTACK		1000000
+#define LUAI_MAXSTACK 1000000
 #else
-#define LUAI_MAXSTACK		15000
+#define LUAI_MAXSTACK 15000
 #endif
 
 /* reserve some space for error handling */
-#define LUAI_FIRSTPSEUDOIDX	(-LUAI_MAXSTACK - 1000)
+#define LUAI_FIRSTPSEUDOIDX (-LUAI_MAXSTACK - 1000)
 
 
 
@@ -369,7 +369,7 @@
 @@ LUAL_BUFFERSIZE is the buffer size used by the lauxlib buffer system.
 ** CHANGE it if it uses too much C-stack space.
 */
-#define LUAL_BUFFERSIZE		BUFSIZ
+#define LUAL_BUFFERSIZE BUFSIZ
 
 
 
@@ -384,13 +384,13 @@
 */
 
 #define LUA_NUMBER_DOUBLE
-#define LUA_NUMBER	double
+#define LUA_NUMBER double
 
 /*
 @@ LUAI_UACNUMBER is the result of an 'usual argument conversion'
 @* over a number.
 */
-#define LUAI_UACNUMBER	double
+#define LUAI_UACNUMBER double
 
 
 /*
@@ -399,16 +399,16 @@
 @@ lua_number2str converts a number to a string.
 @@ LUAI_MAXNUMBER2STR is maximum size of previous conversion.
 */
-#define LUA_NUMBER_SCAN		"%lf"
-#define LUA_NUMBER_FMT		"%.14g"
-#define lua_number2str(s,n)	sprintf((s), LUA_NUMBER_FMT, (n))
-#define LUAI_MAXNUMBER2STR	32 /* 16 digits, sign, point, and \0 */
+#define LUA_NUMBER_SCAN "%lf"
+#define LUA_NUMBER_FMT "%.14g"
+#define lua_number2str(s,n) sprintf((s), LUA_NUMBER_FMT, (n))
+#define LUAI_MAXNUMBER2STR 32 /* 16 digits, sign, point, and \0 */
 
 
 /*
 @@ l_mathop allows the addition of an 'l' or 'f' to all math operations
 */
-#define l_mathop(x)		(x)
+#define l_mathop(x) (x)
 
 
 /*
@@ -419,10 +419,10 @@
 ** systems, you can leave 'lua_strx2number' undefined and Lua will
 ** provide its own implementation.
 */
-#define lua_str2number(s,p)	strtod((s), (p))
+#define lua_str2number(s,p) strtod((s), (p))
 
 #if defined(LUA_USE_STRTODHEX)
-#define lua_strx2number(s,p)	strtod((s), (p))
+#define lua_strx2number(s,p) strtod((s), (p))
 #endif
 
 
@@ -433,21 +433,21 @@
 /* the following operations need the math library */
 #if defined(lobject_c) || defined(lvm_c)
 #include <math.h>
-#define luai_nummod(L,a,b)	((a) - l_mathop(floor)((a)/(b))*(b))
-#define luai_numpow(L,a,b)	(l_mathop(pow)(a,b))
+#define luai_nummod(L,a,b) ((a) - l_mathop(floor)((a)/(b))*(b))
+#define luai_numpow(L,a,b) (l_mathop(pow)(a,b))
 #endif
 
 /* these are quite standard operations */
 #if defined(LUA_CORE)
-#define luai_numadd(L,a,b)	((a)+(b))
-#define luai_numsub(L,a,b)	((a)-(b))
-#define luai_nummul(L,a,b)	((a)*(b))
-#define luai_numdiv(L,a,b)	((a)/(b))
-#define luai_numunm(L,a)	(-(a))
-#define luai_numeq(a,b)		((a)==(b))
-#define luai_numlt(L,a,b)	((a)<(b))
-#define luai_numle(L,a,b)	((a)<=(b))
-#define luai_numisnan(L,a)	(!luai_numeq((a), (a)))
+#define luai_numadd(L,a,b) ((a)+(b))
+#define luai_numsub(L,a,b) ((a)-(b))
+#define luai_nummul(L,a,b) ((a)*(b))
+#define luai_numdiv(L,a,b) ((a)/(b))
+#define luai_numunm(L,a)   (-(a))
+#define luai_numeq(a,b)    ((a)==(b))
+#define luai_numlt(L,a,b)  ((a)<(b))
+#define luai_numle(L,a,b)  ((a)<=(b))
+#define luai_numisnan(L,a) (!luai_numeq((a), (a)))
 #endif
 
 
@@ -457,13 +457,13 @@
 ** CHANGE that if ptrdiff_t is not adequate on your machine. (On most
 ** machines, ptrdiff_t gives a good choice between int or long.)
 */
-#define LUA_INTEGER	ptrdiff_t
+#define LUA_INTEGER ptrdiff_t
 
 /*
 @@ LUA_UNSIGNED is the integral type used by lua_pushunsigned/lua_tounsigned.
 ** It must have at least 32 bits.
 */
-#define LUA_UNSIGNED	unsigned LUA_INT32
+#define LUA_UNSIGNED unsigned LUA_INT32
 
 
 
@@ -471,7 +471,7 @@
 ** Some tricks with doubles
 */
 
-#if defined(LUA_NUMBER_DOUBLE) && !defined(LUA_ANSI)	/* { */
+#if defined(LUA_NUMBER_DOUBLE) && !defined(LUA_ANSI) /* { */
 /*
 ** The next definitions activate some tricks to speed up the
 ** conversion from doubles to integer types, mainly to LUA_UNSIGNED.
@@ -498,10 +498,10 @@
 */
 
 /* Microsoft compiler on a Pentium (32 bit) ? */
-#if defined(LUA_WIN) && defined(_MSC_VER) && defined(_M_IX86)	/* { */
+#if defined(LUA_WIN) && defined(_MSC_VER) && defined(_M_IX86) /* { */
 
 #define LUA_MSASMTRICK
-#define LUA_IEEEENDIAN		0
+#define LUA_IEEEENDIAN 0
 #define LUA_NANTRICK
 
 
@@ -510,28 +510,28 @@
 
 #define LUA_IEEE754TRICK
 #define LUA_IEEELL
-#define LUA_IEEEENDIAN		0
+#define LUA_IEEEENDIAN 0
 #define LUA_NANTRICK
 
 /* pentium 64 bits? */
-#elif defined(__x86_64)						/* }{ */
+#elif defined(__x86_64)                                        /* }{ */
 
 #define LUA_IEEE754TRICK
-#define LUA_IEEEENDIAN		0
+#define LUA_IEEEENDIAN 0
 
-#elif defined(__POWERPC__) || defined(__ppc__)			/* }{ */
+#elif defined(__POWERPC__) || defined(__ppc__)                 /* }{ */
 
 #define LUA_IEEE754TRICK
-#define LUA_IEEEENDIAN		1
+#define LUA_IEEEENDIAN 1
 
-#else								/* }{ */
+#else                                                          /* }{ */
 
 /* assume IEEE754 and a 32-bit integer type */
 #define LUA_IEEE754TRICK
 
-#endif								/* } */
+#endif                                                         /* } */
 
-#endif							/* } */
+#endif                                                    /* } */
 
 /* }================================================================== */
 
diff --git a/liblua/lualib.h b/liblua/lualib.h
index 9fd126bf7..0a123aa2c 100644
--- a/liblua/lualib.h
+++ b/liblua/lualib.h
@@ -14,31 +14,31 @@
 
 LUAMOD_API int (luaopen_base) (lua_State *L);
 
-#define LUA_COLIBNAME	"coroutine"
+#define LUA_COLIBNAME "coroutine"
 LUAMOD_API int (luaopen_coroutine) (lua_State *L);
 
-#define LUA_TABLIBNAME	"table"
+#define LUA_TABLIBNAME "table"
 LUAMOD_API int (luaopen_table) (lua_State *L);
 
-#define LUA_IOLIBNAME	"io"
+#define LUA_IOLIBNAME "io"
 LUAMOD_API int (luaopen_io) (lua_State *L);
 
-#define LUA_OSLIBNAME	"os"
+#define LUA_OSLIBNAME "os"
 LUAMOD_API int (luaopen_os) (lua_State *L);
 
-#define LUA_STRLIBNAME	"string"
+#define LUA_STRLIBNAME "string"
 LUAMOD_API int (luaopen_string) (lua_State *L);
 
-#define LUA_BITLIBNAME	"bit32"
+#define LUA_BITLIBNAME "bit32"
 LUAMOD_API int (luaopen_bit32) (lua_State *L);
 
-#define LUA_MATHLIBNAME	"math"
+#define LUA_MATHLIBNAME "math"
 LUAMOD_API int (luaopen_math) (lua_State *L);
 
-#define LUA_DBLIBNAME	"debug"
+#define LUA_DBLIBNAME "debug"
 LUAMOD_API int (luaopen_debug) (lua_State *L);
 
-#define LUA_LOADLIBNAME	"package"
+#define LUA_LOADLIBNAME "package"
 LUAMOD_API int (luaopen_package) (lua_State *L);
 
 
@@ -48,7 +48,7 @@ LUALIB_API void (luaL_openlibs) (lua_State *L);
 
 
 #if !defined(lua_assert)
-#define lua_assert(x)	((void)0)
+#define lua_assert(x) ((void)0)
 #endif
 
 
diff --git a/liblua/lundump.c b/liblua/lundump.c
index 54de011a4..0ee0f3527 100644
--- a/liblua/lundump.c
+++ b/liblua/lundump.c
@@ -33,13 +33,13 @@ static l_noret error(LoadState* S, const char* why)
  luaD_throw(S->L,LUA_ERRSYNTAX);
 }
 
-#define LoadMem(S,b,n,size)	LoadBlock(S,b,(n)*(size))
-#define LoadByte(S)		(lu_byte)LoadChar(S)
-#define LoadVar(S,x)		LoadMem(S,&x,1,sizeof(x))
-#define LoadVector(S,b,n,size)	LoadMem(S,b,n,size)
+#define LoadMem(S,b,n,size)    LoadBlock(S,b,(n)*(size))
+#define LoadByte(S)            (lu_byte)LoadChar(S)
+#define LoadVar(S,x)           LoadMem(S,&x,1,sizeof(x))
+#define LoadVector(S,b,n,size) LoadMem(S,b,n,size)
 
 #if !defined(luai_verifycode)
-#define luai_verifycode(L,b,f)	/* empty */
+#define luai_verifycode(L,b,f) /* empty */
 #endif
 
 static void LoadBlock(LoadState* S, void* b, size_t size)
@@ -79,7 +79,7 @@ static TString* LoadString(LoadState* S)
  {
   char* s=luaZ_openspace(S->L,S->b,size);
   LoadBlock(S,s,size*sizeof(char));
-  return luaS_newlstr(S->L,s,size-1);		/* remove trailing '\0' */
+  return luaS_newlstr(S->L,s,size-1); /* remove trailing '\0' */
  }
 }
 
@@ -107,17 +107,17 @@ static void LoadConstants(LoadState* S, Proto* f)
   switch (t)
   {
    case LUA_TNIL:
-	setnilvalue(o);
-	break;
+    setnilvalue(o);
+    break;
    case LUA_TBOOLEAN:
-	setbvalue(o,LoadChar(S));
-	break;
+    setbvalue(o,LoadChar(S));
+    break;
    case LUA_TNUMBER:
-	setnvalue(o,LoadNumber(S));
-	break;
+    setnvalue(o,LoadNumber(S));
+    break;
    case LUA_TSTRING:
-	setsvalue2n(S->L,o,LoadString(S));
-	break;
+    setsvalue2n(S->L,o,LoadString(S));
+    break;
     default: lua_assert(0);
   }
  }
@@ -182,17 +182,17 @@ static void LoadFunction(LoadState* S, Proto* f)
 }
 
 /* the code below must be consistent with the code in luaU_header */
-#define N0	LUAC_HEADERSIZE
-#define N1	(sizeof(LUA_SIGNATURE)-sizeof(char))
-#define N2	N1+2
-#define N3	N2+6
+#define N0 LUAC_HEADERSIZE
+#define N1 (sizeof(LUA_SIGNATURE)-sizeof(char))
+#define N2 N1+2
+#define N3 N2+6
 
 static void LoadHeader(LoadState* S)
 {
  lu_byte h[LUAC_HEADERSIZE];
  lu_byte s[LUAC_HEADERSIZE];
  luaU_header(h);
- memcpy(s,h,sizeof(char));			/* first char already read */
+ memcpy(s,h,sizeof(char)); /* first char already read */
  LoadBlock(S,s+sizeof(char),LUAC_HEADERSIZE-sizeof(char));
  if (memcmp(h,s,N0)==0) return;
  if (memcmp(h,s,N1)!=0) error(S,"not a");
@@ -232,9 +232,9 @@ Closure* luaU_undump (lua_State* L, ZIO* Z, Mbuffer* buff, const char* name)
  return cl;
 }
 
-#define MYINT(s)	(s[0]-'0')
-#define VERSION		MYINT(LUA_VERSION_MAJOR)*16+MYINT(LUA_VERSION_MINOR)
-#define FORMAT		0		/* this is the official format */
+#define MYINT(s) (s[0]-'0')
+#define VERSION  MYINT(LUA_VERSION_MAJOR)*16+MYINT(LUA_VERSION_MINOR)
+#define FORMAT 0 /* this is the official format */
 
 /*
 * make header for precompiled chunks
@@ -248,11 +248,11 @@ void luaU_header (lu_byte* h)
  h+=sizeof(LUA_SIGNATURE)-sizeof(char);
  *h++=cast_byte(VERSION);
  *h++=cast_byte(FORMAT);
- *h++=cast_byte(*(char*)&x);			/* endianness */
+ *h++=cast_byte(*(char*)&x); /* endianness */
  *h++=cast_byte(sizeof(int));
  *h++=cast_byte(sizeof(size_t));
  *h++=cast_byte(sizeof(Instruction));
  *h++=cast_byte(sizeof(lua_Number));
- *h++=cast_byte(((lua_Number)0.5)==0);		/* is lua_Number integral? */
+ *h++=cast_byte(((lua_Number)0.5)==0); /* is lua_Number integral? */
  memcpy(h,LUAC_TAIL,sizeof(LUAC_TAIL)-sizeof(char));
 }
diff --git a/liblua/lundump.h b/liblua/lundump.h
index 2b8accecb..9a0643d57 100644
--- a/liblua/lundump.h
+++ b/liblua/lundump.h
@@ -20,9 +20,9 @@ LUAI_FUNC void luaU_header (lu_byte* h);
 LUAI_FUNC int luaU_dump (lua_State* L, const Proto* f, lua_Writer w, void* data, int strip);
 
 /* data to catch conversion errors */
-#define LUAC_TAIL		"\x19\x93\r\n\x1a\n"
+#define LUAC_TAIL "\x19\x93\r\n\x1a\n"
 
 /* size in bytes of header of binary files */
-#define LUAC_HEADERSIZE		(sizeof(LUA_SIGNATURE)-sizeof(char)+2+6+sizeof(LUAC_TAIL)-sizeof(char))
+#define LUAC_HEADERSIZE (sizeof(LUA_SIGNATURE)-sizeof(char)+2+6+sizeof(LUAC_TAIL)-sizeof(char))
 
 #endif
diff --git a/liblua/lvm.c b/liblua/lvm.c
index 657d5c456..8e8f26636 100644
--- a/liblua/lvm.c
+++ b/liblua/lvm.c
@@ -29,7 +29,7 @@
 
 
 /* limit for table tag-method chains (to avoid loops) */
-#define MAXTAGLOOP	100
+#define MAXTAGLOOP 100
 
 
 const TValue *luaV_tonumber (const TValue *obj, TValue *n) {
@@ -482,18 +482,18 @@ void luaV_finishOp (lua_State *L) {
 */
 
 #if !defined luai_runtimecheck
-#define luai_runtimecheck(L, c)		/* void */
+#define luai_runtimecheck(L, c) /* void */
 #endif
 
 
-#define RA(i)	(base+GETARG_A(i))
+#define RA(i)  (base+GETARG_A(i))
 /* to be used after possible stack reallocation */
-#define RB(i)	check_exp(getBMode(GET_OPCODE(i)) == OpArgR, base+GETARG_B(i))
-#define RC(i)	check_exp(getCMode(GET_OPCODE(i)) == OpArgR, base+GETARG_C(i))
-#define RKB(i)	check_exp(getBMode(GET_OPCODE(i)) == OpArgK, \
-	ISK(GETARG_B(i)) ? k+INDEXK(GETARG_B(i)) : base+GETARG_B(i))
-#define RKC(i)	check_exp(getCMode(GET_OPCODE(i)) == OpArgK, \
-	ISK(GETARG_C(i)) ? k+INDEXK(GETARG_C(i)) : base+GETARG_C(i))
+#define RB(i)  check_exp(getBMode(GET_OPCODE(i)) == OpArgR, base+GETARG_B(i))
+#define RC(i)  check_exp(getCMode(GET_OPCODE(i)) == OpArgR, base+GETARG_C(i))
+#define RKB(i) check_exp(getBMode(GET_OPCODE(i)) == OpArgK, \
+    ISK(GETARG_B(i)) ? k+INDEXK(GETARG_B(i)) : base+GETARG_B(i))
+#define RKC(i) check_exp(getCMode(GET_OPCODE(i)) == OpArgK, \
+    ISK(GETARG_C(i)) ? k+INDEXK(GETARG_C(i)) : base+GETARG_C(i))
 #define KBx(i)  \
   (k + (GETARG_Bx(i) != 0 ? GETARG_Bx(i) - 1 : GETARG_Ax(*ci->u.l.savedpc++)))
 
@@ -505,10 +505,10 @@ void luaV_finishOp (lua_State *L) {
     ci->u.l.savedpc += GETARG_sBx(i) + e; }
 
 /* for test instructions, execute the jump instruction that follows it */
-#define donextjump(ci)	{ i = *ci->u.l.savedpc; dojump(ci, i, 1); }
+#define donextjump(ci) { i = *ci->u.l.savedpc; dojump(ci, i, 1); }
 
 
-#define Protect(x)	{ {x;}; base = ci->u.l.base; }
+#define Protect(x) { {x;}; base = ci->u.l.base; }
 
 #define checkGC(L,c)  \
   Protect( luaC_condGC(L,{L->top = (c);  /* limit of live values */ \
@@ -527,9 +527,9 @@ void luaV_finishOp (lua_State *L) {
         else { Protect(luaV_arith(L, ra, rb, rc, tm)); } }
 
 
-#define vmdispatch(o)	switch(o)
-#define vmcase(l,b)	case l: {b}  break;
-#define vmcasenb(l,b)	case l: {b}		/* nb = no break */
+#define vmdispatch(o) switch(o)
+#define vmcase(l,b)   case l: {b}  break;
+#define vmcasenb(l,b) case l: {b} /* nb = no break */
 
 void luaV_execute (lua_State *L) {
   CallInfo *ci = L->ci;
diff --git a/liblua/lvm.h b/liblua/lvm.h
index 07e25f9c6..caff32d21 100644
--- a/liblua/lvm.h
+++ b/liblua/lvm.h
@@ -15,11 +15,11 @@
 
 #define tostring(L,o) (ttisstring(o) || (luaV_tostring(L, o)))
 
-#define tonumber(o,n)	(ttisnumber(o) || (((o) = luaV_tonumber(o,n)) != NULL))
+#define tonumber(o,n) (ttisnumber(o) || (((o) = luaV_tonumber(o,n)) != NULL))
 
 #define equalobj(L,o1,o2)  (ttisequal(o1, o2) && luaV_equalobj_(L, o1, o2))
 
-#define luaV_rawequalobj(o1,o2)		equalobj(NULL,o1,o2)
+#define luaV_rawequalobj(o1,o2) equalobj(NULL,o1,o2)
 
 
 /* not to called directly */
diff --git a/liblua/lzio.h b/liblua/lzio.h
index 08682301e..f0cbe7e96 100644
--- a/liblua/lzio.h
+++ b/liblua/lzio.h
@@ -13,7 +13,7 @@
 #include "lmem.h"
 
 
-#define EOZ	(-1)			/* end of stream */
+#define EOZ (-1) /* end of stream */
 
 typedef struct Zio ZIO;
 
@@ -28,35 +28,35 @@ typedef struct Mbuffer {
 
 #define luaZ_initbuffer(L, buff) ((buff)->buffer = NULL, (buff)->buffsize = 0)
 
-#define luaZ_buffer(buff)	((buff)->buffer)
-#define luaZ_sizebuffer(buff)	((buff)->buffsize)
-#define luaZ_bufflen(buff)	((buff)->n)
+#define luaZ_buffer(buff)     ((buff)->buffer)
+#define luaZ_sizebuffer(buff) ((buff)->buffsize)
+#define luaZ_bufflen(buff)    ((buff)->n)
 
 #define luaZ_resetbuffer(buff) ((buff)->n = 0)
 
 
 #define luaZ_resizebuffer(L, buff, size) \
-	(luaM_reallocvector(L, (buff)->buffer, (buff)->buffsize, size, char), \
-	(buff)->buffsize = size)
+    (luaM_reallocvector(L, (buff)->buffer, (buff)->buffsize, size, char), \
+    (buff)->buffsize = size)
 
-#define luaZ_freebuffer(L, buff)	luaZ_resizebuffer(L, buff, 0)
+#define luaZ_freebuffer(L, buff) luaZ_resizebuffer(L, buff, 0)
 
 
 LUAI_FUNC char *luaZ_openspace (lua_State *L, Mbuffer *buff, size_t n);
 LUAI_FUNC void luaZ_init (lua_State *L, ZIO *z, lua_Reader reader,
                                         void *data);
-LUAI_FUNC size_t luaZ_read (ZIO* z, void* b, size_t n);	/* read next n bytes */
+LUAI_FUNC size_t luaZ_read (ZIO* z, void* b, size_t n); /* read next n bytes */
 
 
 
 /* --------- Private Part ------------------ */
 
 struct Zio {
-  size_t n;			/* bytes still unread */
-  const char *p;		/* current position in buffer */
-  lua_Reader reader;		/* reader function */
-  void* data;			/* additional data */
-  lua_State *L;			/* Lua state (for reader) */
+  size_t n;             /* bytes still unread */
+  const char *p;        /* current position in buffer */
+  lua_Reader reader;    /* reader function */
+  void* data;           /* additional data */
+  lua_State *L;         /* Lua state (for reader) */
 };
 
 

From 9502b54aa07aaa037100aaabfddf65dd0f056fe2 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 9 Mar 2019 18:41:30 +0100
Subject: [PATCH 0706/1938] include: fix mix of spaces & tabs

---
 include/at91sam7s512.h | 888 ++++++++++++++++++++---------------------
 include/common.h       |  42 +-
 include/config_gpio.h  |  66 +--
 include/hitag2.h       |  36 +-
 include/hitagS.h       |  86 ++--
 include/legic.h        |  10 +-
 include/mifare.h       | 174 ++++----
 include/proxmark3.h    | 140 +++----
 include/usb_cmd.h      | 140 +++----
 9 files changed, 791 insertions(+), 791 deletions(-)

diff --git a/include/at91sam7s512.h b/include/at91sam7s512.h
index 7dd557636..f8fa2e8d4 100644
--- a/include/at91sam7s512.h
+++ b/include/at91sam7s512.h
@@ -71,126 +71,126 @@ typedef volatile unsigned int AT91_REG;// Hardware register definition
 // *****************************************************************************
 #ifndef __ASSEMBLY__
 typedef struct _AT91S_SYS {
-	AT91_REG	 AIC_SMR[32]; 	// Source Mode Register
-	AT91_REG	 AIC_SVR[32]; 	// Source Vector Register
-	AT91_REG	 AIC_IVR; 	// IRQ Vector Register
-	AT91_REG	 AIC_FVR; 	// FIQ Vector Register
-	AT91_REG	 AIC_ISR; 	// Interrupt Status Register
-	AT91_REG	 AIC_IPR; 	// Interrupt Pending Register
-	AT91_REG	 AIC_IMR; 	// Interrupt Mask Register
-	AT91_REG	 AIC_CISR; 	// Core Interrupt Status Register
-	AT91_REG	 Reserved0[2]; 	//
-	AT91_REG	 AIC_IECR; 	// Interrupt Enable Command Register
-	AT91_REG	 AIC_IDCR; 	// Interrupt Disable Command Register
-	AT91_REG	 AIC_ICCR; 	// Interrupt Clear Command Register
-	AT91_REG	 AIC_ISCR; 	// Interrupt Set Command Register
-	AT91_REG	 AIC_EOICR; 	// End of Interrupt Command Register
-	AT91_REG	 AIC_SPU; 	// Spurious Vector Register
-	AT91_REG	 AIC_DCR; 	// Debug Control Register (Protect)
-	AT91_REG	 Reserved1[1]; 	//
-	AT91_REG	 AIC_FFER; 	// Fast Forcing Enable Register
-	AT91_REG	 AIC_FFDR; 	// Fast Forcing Disable Register
-	AT91_REG	 AIC_FFSR; 	// Fast Forcing Status Register
-	AT91_REG	 Reserved2[45]; 	//
-	AT91_REG	 DBGU_CR; 	// Control Register
-	AT91_REG	 DBGU_MR; 	// Mode Register
-	AT91_REG	 DBGU_IER; 	// Interrupt Enable Register
-	AT91_REG	 DBGU_IDR; 	// Interrupt Disable Register
-	AT91_REG	 DBGU_IMR; 	// Interrupt Mask Register
-	AT91_REG	 DBGU_CSR; 	// Channel Status Register
-	AT91_REG	 DBGU_RHR; 	// Receiver Holding Register
-	AT91_REG	 DBGU_THR; 	// Transmitter Holding Register
-	AT91_REG	 DBGU_BRGR; 	// Baud Rate Generator Register
-	AT91_REG	 Reserved3[7]; 	//
-	AT91_REG	 DBGU_CIDR; 	// Chip ID Register
-	AT91_REG	 DBGU_EXID; 	// Chip ID Extension Register
-	AT91_REG	 DBGU_FNTR; 	// Force NTRST Register
-	AT91_REG	 Reserved4[45]; 	//
-	AT91_REG	 DBGU_RPR; 	// Receive Pointer Register
-	AT91_REG	 DBGU_RCR; 	// Receive Counter Register
-	AT91_REG	 DBGU_TPR; 	// Transmit Pointer Register
-	AT91_REG	 DBGU_TCR; 	// Transmit Counter Register
-	AT91_REG	 DBGU_RNPR; 	// Receive Next Pointer Register
-	AT91_REG	 DBGU_RNCR; 	// Receive Next Counter Register
-	AT91_REG	 DBGU_TNPR; 	// Transmit Next Pointer Register
-	AT91_REG	 DBGU_TNCR; 	// Transmit Next Counter Register
-	AT91_REG	 DBGU_PTCR; 	// PDC Transfer Control Register
-	AT91_REG	 DBGU_PTSR; 	// PDC Transfer Status Register
-	AT91_REG	 Reserved5[54]; 	//
-	AT91_REG	 PIOA_PER; 	// PIO Enable Register
-	AT91_REG	 PIOA_PDR; 	// PIO Disable Register
-	AT91_REG	 PIOA_PSR; 	// PIO Status Register
-	AT91_REG	 Reserved6[1]; 	//
-	AT91_REG	 PIOA_OER; 	// Output Enable Register
-	AT91_REG	 PIOA_ODR; 	// Output Disable Registerr
-	AT91_REG	 PIOA_OSR; 	// Output Status Register
-	AT91_REG	 Reserved7[1]; 	//
-	AT91_REG	 PIOA_IFER; 	// Input Filter Enable Register
-	AT91_REG	 PIOA_IFDR; 	// Input Filter Disable Register
-	AT91_REG	 PIOA_IFSR; 	// Input Filter Status Register
-	AT91_REG	 Reserved8[1]; 	//
-	AT91_REG	 PIOA_SODR; 	// Set Output Data Register
-	AT91_REG	 PIOA_CODR; 	// Clear Output Data Register
-	AT91_REG	 PIOA_ODSR; 	// Output Data Status Register
-	AT91_REG	 PIOA_PDSR; 	// Pin Data Status Register
-	AT91_REG	 PIOA_IER; 	// Interrupt Enable Register
-	AT91_REG	 PIOA_IDR; 	// Interrupt Disable Register
-	AT91_REG	 PIOA_IMR; 	// Interrupt Mask Register
-	AT91_REG	 PIOA_ISR; 	// Interrupt Status Register
-	AT91_REG	 PIOA_MDER; 	// Multi-driver Enable Register
-	AT91_REG	 PIOA_MDDR; 	// Multi-driver Disable Register
-	AT91_REG	 PIOA_MDSR; 	// Multi-driver Status Register
-	AT91_REG	 Reserved9[1]; 	//
-	AT91_REG	 PIOA_PPUDR; 	// Pull-up Disable Register
-	AT91_REG	 PIOA_PPUER; 	// Pull-up Enable Register
-	AT91_REG	 PIOA_PPUSR; 	// Pull-up Status Register
-	AT91_REG	 Reserved10[1]; 	//
-	AT91_REG	 PIOA_ASR; 	// Select A Register
-	AT91_REG	 PIOA_BSR; 	// Select B Register
-	AT91_REG	 PIOA_ABSR; 	// AB Select Status Register
-	AT91_REG	 Reserved11[9]; 	//
-	AT91_REG	 PIOA_OWER; 	// Output Write Enable Register
-	AT91_REG	 PIOA_OWDR; 	// Output Write Disable Register
-	AT91_REG	 PIOA_OWSR; 	// Output Write Status Register
-	AT91_REG	 Reserved12[469]; 	//
-	AT91_REG	 PMC_SCER; 	// System Clock Enable Register
-	AT91_REG	 PMC_SCDR; 	// System Clock Disable Register
-	AT91_REG	 PMC_SCSR; 	// System Clock Status Register
-	AT91_REG	 Reserved13[1]; 	//
-	AT91_REG	 PMC_PCER; 	// Peripheral Clock Enable Register
-	AT91_REG	 PMC_PCDR; 	// Peripheral Clock Disable Register
-	AT91_REG	 PMC_PCSR; 	// Peripheral Clock Status Register
-	AT91_REG	 Reserved14[1]; 	//
-	AT91_REG	 PMC_MOR; 	// Main Oscillator Register
-	AT91_REG	 PMC_MCFR; 	// Main Clock  Frequency Register
-	AT91_REG	 Reserved15[1]; 	//
-	AT91_REG	 PMC_PLLR; 	// PLL Register
-	AT91_REG	 PMC_MCKR; 	// Master Clock Register
-	AT91_REG	 Reserved16[3]; 	//
-	AT91_REG	 PMC_PCKR[3]; 	// Programmable Clock Register
-	AT91_REG	 Reserved17[5]; 	//
-	AT91_REG	 PMC_IER; 	// Interrupt Enable Register
-	AT91_REG	 PMC_IDR; 	// Interrupt Disable Register
-	AT91_REG	 PMC_SR; 	// Status Register
-	AT91_REG	 PMC_IMR; 	// Interrupt Mask Register
-	AT91_REG	 Reserved18[36]; 	//
-	AT91_REG	 RSTC_RCR; 	// Reset Control Register
-	AT91_REG	 RSTC_RSR; 	// Reset Status Register
-	AT91_REG	 RSTC_RMR; 	// Reset Mode Register
-	AT91_REG	 Reserved19[5]; 	//
-	AT91_REG	 RTTC_RTMR; 	// Real-time Mode Register
-	AT91_REG	 RTTC_RTAR; 	// Real-time Alarm Register
-	AT91_REG	 RTTC_RTVR; 	// Real-time Value Register
-	AT91_REG	 RTTC_RTSR; 	// Real-time Status Register
-	AT91_REG	 PITC_PIMR; 	// Period Interval Mode Register
-	AT91_REG	 PITC_PISR; 	// Period Interval Status Register
-	AT91_REG	 PITC_PIVR; 	// Period Interval Value Register
-	AT91_REG	 PITC_PIIR; 	// Period Interval Image Register
-	AT91_REG	 WDTC_WDCR; 	// Watchdog Control Register
-	AT91_REG	 WDTC_WDMR; 	// Watchdog Mode Register
-	AT91_REG	 WDTC_WDSR; 	// Watchdog Status Register
-	AT91_REG	 Reserved20[5]; 	//
-	AT91_REG	 VREG_MR; 	// Voltage Regulator Mode Register
+    AT91_REG	 AIC_SMR[32]; 	// Source Mode Register
+    AT91_REG	 AIC_SVR[32]; 	// Source Vector Register
+    AT91_REG	 AIC_IVR; 	// IRQ Vector Register
+    AT91_REG	 AIC_FVR; 	// FIQ Vector Register
+    AT91_REG	 AIC_ISR; 	// Interrupt Status Register
+    AT91_REG	 AIC_IPR; 	// Interrupt Pending Register
+    AT91_REG	 AIC_IMR; 	// Interrupt Mask Register
+    AT91_REG	 AIC_CISR; 	// Core Interrupt Status Register
+    AT91_REG	 Reserved0[2]; 	//
+    AT91_REG	 AIC_IECR; 	// Interrupt Enable Command Register
+    AT91_REG	 AIC_IDCR; 	// Interrupt Disable Command Register
+    AT91_REG	 AIC_ICCR; 	// Interrupt Clear Command Register
+    AT91_REG	 AIC_ISCR; 	// Interrupt Set Command Register
+    AT91_REG	 AIC_EOICR; 	// End of Interrupt Command Register
+    AT91_REG	 AIC_SPU; 	// Spurious Vector Register
+    AT91_REG	 AIC_DCR; 	// Debug Control Register (Protect)
+    AT91_REG	 Reserved1[1]; 	//
+    AT91_REG	 AIC_FFER; 	// Fast Forcing Enable Register
+    AT91_REG	 AIC_FFDR; 	// Fast Forcing Disable Register
+    AT91_REG	 AIC_FFSR; 	// Fast Forcing Status Register
+    AT91_REG	 Reserved2[45]; 	//
+    AT91_REG	 DBGU_CR; 	// Control Register
+    AT91_REG	 DBGU_MR; 	// Mode Register
+    AT91_REG	 DBGU_IER; 	// Interrupt Enable Register
+    AT91_REG	 DBGU_IDR; 	// Interrupt Disable Register
+    AT91_REG	 DBGU_IMR; 	// Interrupt Mask Register
+    AT91_REG	 DBGU_CSR; 	// Channel Status Register
+    AT91_REG	 DBGU_RHR; 	// Receiver Holding Register
+    AT91_REG	 DBGU_THR; 	// Transmitter Holding Register
+    AT91_REG	 DBGU_BRGR; 	// Baud Rate Generator Register
+    AT91_REG	 Reserved3[7]; 	//
+    AT91_REG	 DBGU_CIDR; 	// Chip ID Register
+    AT91_REG	 DBGU_EXID; 	// Chip ID Extension Register
+    AT91_REG	 DBGU_FNTR; 	// Force NTRST Register
+    AT91_REG	 Reserved4[45]; 	//
+    AT91_REG	 DBGU_RPR; 	// Receive Pointer Register
+    AT91_REG	 DBGU_RCR; 	// Receive Counter Register
+    AT91_REG	 DBGU_TPR; 	// Transmit Pointer Register
+    AT91_REG	 DBGU_TCR; 	// Transmit Counter Register
+    AT91_REG	 DBGU_RNPR; 	// Receive Next Pointer Register
+    AT91_REG	 DBGU_RNCR; 	// Receive Next Counter Register
+    AT91_REG	 DBGU_TNPR; 	// Transmit Next Pointer Register
+    AT91_REG	 DBGU_TNCR; 	// Transmit Next Counter Register
+    AT91_REG	 DBGU_PTCR; 	// PDC Transfer Control Register
+    AT91_REG	 DBGU_PTSR; 	// PDC Transfer Status Register
+    AT91_REG	 Reserved5[54]; 	//
+    AT91_REG	 PIOA_PER; 	// PIO Enable Register
+    AT91_REG	 PIOA_PDR; 	// PIO Disable Register
+    AT91_REG	 PIOA_PSR; 	// PIO Status Register
+    AT91_REG	 Reserved6[1]; 	//
+    AT91_REG	 PIOA_OER; 	// Output Enable Register
+    AT91_REG	 PIOA_ODR; 	// Output Disable Registerr
+    AT91_REG	 PIOA_OSR; 	// Output Status Register
+    AT91_REG	 Reserved7[1]; 	//
+    AT91_REG	 PIOA_IFER; 	// Input Filter Enable Register
+    AT91_REG	 PIOA_IFDR; 	// Input Filter Disable Register
+    AT91_REG	 PIOA_IFSR; 	// Input Filter Status Register
+    AT91_REG	 Reserved8[1]; 	//
+    AT91_REG	 PIOA_SODR; 	// Set Output Data Register
+    AT91_REG	 PIOA_CODR; 	// Clear Output Data Register
+    AT91_REG	 PIOA_ODSR; 	// Output Data Status Register
+    AT91_REG	 PIOA_PDSR; 	// Pin Data Status Register
+    AT91_REG	 PIOA_IER; 	// Interrupt Enable Register
+    AT91_REG	 PIOA_IDR; 	// Interrupt Disable Register
+    AT91_REG	 PIOA_IMR; 	// Interrupt Mask Register
+    AT91_REG	 PIOA_ISR; 	// Interrupt Status Register
+    AT91_REG	 PIOA_MDER; 	// Multi-driver Enable Register
+    AT91_REG	 PIOA_MDDR; 	// Multi-driver Disable Register
+    AT91_REG	 PIOA_MDSR; 	// Multi-driver Status Register
+    AT91_REG	 Reserved9[1]; 	//
+    AT91_REG	 PIOA_PPUDR; 	// Pull-up Disable Register
+    AT91_REG	 PIOA_PPUER; 	// Pull-up Enable Register
+    AT91_REG	 PIOA_PPUSR; 	// Pull-up Status Register
+    AT91_REG	 Reserved10[1]; 	//
+    AT91_REG	 PIOA_ASR; 	// Select A Register
+    AT91_REG	 PIOA_BSR; 	// Select B Register
+    AT91_REG	 PIOA_ABSR; 	// AB Select Status Register
+    AT91_REG	 Reserved11[9]; 	//
+    AT91_REG	 PIOA_OWER; 	// Output Write Enable Register
+    AT91_REG	 PIOA_OWDR; 	// Output Write Disable Register
+    AT91_REG	 PIOA_OWSR; 	// Output Write Status Register
+    AT91_REG	 Reserved12[469]; 	//
+    AT91_REG	 PMC_SCER; 	// System Clock Enable Register
+    AT91_REG	 PMC_SCDR; 	// System Clock Disable Register
+    AT91_REG	 PMC_SCSR; 	// System Clock Status Register
+    AT91_REG	 Reserved13[1]; 	//
+    AT91_REG	 PMC_PCER; 	// Peripheral Clock Enable Register
+    AT91_REG	 PMC_PCDR; 	// Peripheral Clock Disable Register
+    AT91_REG	 PMC_PCSR; 	// Peripheral Clock Status Register
+    AT91_REG	 Reserved14[1]; 	//
+    AT91_REG	 PMC_MOR; 	// Main Oscillator Register
+    AT91_REG	 PMC_MCFR; 	// Main Clock  Frequency Register
+    AT91_REG	 Reserved15[1]; 	//
+    AT91_REG	 PMC_PLLR; 	// PLL Register
+    AT91_REG	 PMC_MCKR; 	// Master Clock Register
+    AT91_REG	 Reserved16[3]; 	//
+    AT91_REG	 PMC_PCKR[3]; 	// Programmable Clock Register
+    AT91_REG	 Reserved17[5]; 	//
+    AT91_REG	 PMC_IER; 	// Interrupt Enable Register
+    AT91_REG	 PMC_IDR; 	// Interrupt Disable Register
+    AT91_REG	 PMC_SR; 	// Status Register
+    AT91_REG	 PMC_IMR; 	// Interrupt Mask Register
+    AT91_REG	 Reserved18[36]; 	//
+    AT91_REG	 RSTC_RCR; 	// Reset Control Register
+    AT91_REG	 RSTC_RSR; 	// Reset Status Register
+    AT91_REG	 RSTC_RMR; 	// Reset Mode Register
+    AT91_REG	 Reserved19[5]; 	//
+    AT91_REG	 RTTC_RTMR; 	// Real-time Mode Register
+    AT91_REG	 RTTC_RTAR; 	// Real-time Alarm Register
+    AT91_REG	 RTTC_RTVR; 	// Real-time Value Register
+    AT91_REG	 RTTC_RTSR; 	// Real-time Status Register
+    AT91_REG	 PITC_PIMR; 	// Period Interval Mode Register
+    AT91_REG	 PITC_PISR; 	// Period Interval Status Register
+    AT91_REG	 PITC_PIVR; 	// Period Interval Value Register
+    AT91_REG	 PITC_PIIR; 	// Period Interval Image Register
+    AT91_REG	 WDTC_WDCR; 	// Watchdog Control Register
+    AT91_REG	 WDTC_WDMR; 	// Watchdog Mode Register
+    AT91_REG	 WDTC_WDSR; 	// Watchdog Status Register
+    AT91_REG	 Reserved20[5]; 	//
+    AT91_REG	 VREG_MR; 	// Voltage Regulator Mode Register
 } AT91S_SYS, *AT91PS_SYS;
 #else
 
@@ -201,26 +201,26 @@ typedef struct _AT91S_SYS {
 // *****************************************************************************
 #ifndef __ASSEMBLY__
 typedef struct _AT91S_AIC {
-	AT91_REG	 AIC_SMR[32]; 	// Source Mode Register
-	AT91_REG	 AIC_SVR[32]; 	// Source Vector Register
-	AT91_REG	 AIC_IVR; 	// IRQ Vector Register
-	AT91_REG	 AIC_FVR; 	// FIQ Vector Register
-	AT91_REG	 AIC_ISR; 	// Interrupt Status Register
-	AT91_REG	 AIC_IPR; 	// Interrupt Pending Register
-	AT91_REG	 AIC_IMR; 	// Interrupt Mask Register
-	AT91_REG	 AIC_CISR; 	// Core Interrupt Status Register
-	AT91_REG	 Reserved0[2]; 	//
-	AT91_REG	 AIC_IECR; 	// Interrupt Enable Command Register
-	AT91_REG	 AIC_IDCR; 	// Interrupt Disable Command Register
-	AT91_REG	 AIC_ICCR; 	// Interrupt Clear Command Register
-	AT91_REG	 AIC_ISCR; 	// Interrupt Set Command Register
-	AT91_REG	 AIC_EOICR; 	// End of Interrupt Command Register
-	AT91_REG	 AIC_SPU; 	// Spurious Vector Register
-	AT91_REG	 AIC_DCR; 	// Debug Control Register (Protect)
-	AT91_REG	 Reserved1[1]; 	//
-	AT91_REG	 AIC_FFER; 	// Fast Forcing Enable Register
-	AT91_REG	 AIC_FFDR; 	// Fast Forcing Disable Register
-	AT91_REG	 AIC_FFSR; 	// Fast Forcing Status Register
+    AT91_REG	 AIC_SMR[32]; 	// Source Mode Register
+    AT91_REG	 AIC_SVR[32]; 	// Source Vector Register
+    AT91_REG	 AIC_IVR; 	// IRQ Vector Register
+    AT91_REG	 AIC_FVR; 	// FIQ Vector Register
+    AT91_REG	 AIC_ISR; 	// Interrupt Status Register
+    AT91_REG	 AIC_IPR; 	// Interrupt Pending Register
+    AT91_REG	 AIC_IMR; 	// Interrupt Mask Register
+    AT91_REG	 AIC_CISR; 	// Core Interrupt Status Register
+    AT91_REG	 Reserved0[2]; 	//
+    AT91_REG	 AIC_IECR; 	// Interrupt Enable Command Register
+    AT91_REG	 AIC_IDCR; 	// Interrupt Disable Command Register
+    AT91_REG	 AIC_ICCR; 	// Interrupt Clear Command Register
+    AT91_REG	 AIC_ISCR; 	// Interrupt Set Command Register
+    AT91_REG	 AIC_EOICR; 	// End of Interrupt Command Register
+    AT91_REG	 AIC_SPU; 	// Spurious Vector Register
+    AT91_REG	 AIC_DCR; 	// Debug Control Register (Protect)
+    AT91_REG	 Reserved1[1]; 	//
+    AT91_REG	 AIC_FFER; 	// Fast Forcing Enable Register
+    AT91_REG	 AIC_FFDR; 	// Fast Forcing Disable Register
+    AT91_REG	 AIC_FFSR; 	// Fast Forcing Status Register
 } AT91S_AIC, *AT91PS_AIC;
 #else
 #define AIC_SMR         (AT91_CAST(AT91_REG *) 	0x00000000) // (AIC_SMR) Source Mode Register
@@ -266,16 +266,16 @@ typedef struct _AT91S_AIC {
 // *****************************************************************************
 #ifndef __ASSEMBLY__
 typedef struct _AT91S_PDC {
-	AT91_REG	 PDC_RPR; 	// Receive Pointer Register
-	AT91_REG	 PDC_RCR; 	// Receive Counter Register
-	AT91_REG	 PDC_TPR; 	// Transmit Pointer Register
-	AT91_REG	 PDC_TCR; 	// Transmit Counter Register
-	AT91_REG	 PDC_RNPR; 	// Receive Next Pointer Register
-	AT91_REG	 PDC_RNCR; 	// Receive Next Counter Register
-	AT91_REG	 PDC_TNPR; 	// Transmit Next Pointer Register
-	AT91_REG	 PDC_TNCR; 	// Transmit Next Counter Register
-	AT91_REG	 PDC_PTCR; 	// PDC Transfer Control Register
-	AT91_REG	 PDC_PTSR; 	// PDC Transfer Status Register
+    AT91_REG	 PDC_RPR; 	// Receive Pointer Register
+    AT91_REG	 PDC_RCR; 	// Receive Counter Register
+    AT91_REG	 PDC_TPR; 	// Transmit Pointer Register
+    AT91_REG	 PDC_TCR; 	// Transmit Counter Register
+    AT91_REG	 PDC_RNPR; 	// Receive Next Pointer Register
+    AT91_REG	 PDC_RNCR; 	// Receive Next Counter Register
+    AT91_REG	 PDC_TNPR; 	// Transmit Next Pointer Register
+    AT91_REG	 PDC_TNCR; 	// Transmit Next Counter Register
+    AT91_REG	 PDC_PTCR; 	// PDC Transfer Control Register
+    AT91_REG	 PDC_PTSR; 	// PDC Transfer Status Register
 } AT91S_PDC, *AT91PS_PDC;
 #else
 #define PDC_RPR         (AT91_CAST(AT91_REG *) 	0x00000000) // (PDC_RPR) Receive Pointer Register
@@ -302,30 +302,30 @@ typedef struct _AT91S_PDC {
 // *****************************************************************************
 #ifndef __ASSEMBLY__
 typedef struct _AT91S_DBGU {
-	AT91_REG	 DBGU_CR; 	// Control Register
-	AT91_REG	 DBGU_MR; 	// Mode Register
-	AT91_REG	 DBGU_IER; 	// Interrupt Enable Register
-	AT91_REG	 DBGU_IDR; 	// Interrupt Disable Register
-	AT91_REG	 DBGU_IMR; 	// Interrupt Mask Register
-	AT91_REG	 DBGU_CSR; 	// Channel Status Register
-	AT91_REG	 DBGU_RHR; 	// Receiver Holding Register
-	AT91_REG	 DBGU_THR; 	// Transmitter Holding Register
-	AT91_REG	 DBGU_BRGR; 	// Baud Rate Generator Register
-	AT91_REG	 Reserved0[7]; 	//
-	AT91_REG	 DBGU_CIDR; 	// Chip ID Register
-	AT91_REG	 DBGU_EXID; 	// Chip ID Extension Register
-	AT91_REG	 DBGU_FNTR; 	// Force NTRST Register
-	AT91_REG	 Reserved1[45]; 	//
-	AT91_REG	 DBGU_RPR; 	// Receive Pointer Register
-	AT91_REG	 DBGU_RCR; 	// Receive Counter Register
-	AT91_REG	 DBGU_TPR; 	// Transmit Pointer Register
-	AT91_REG	 DBGU_TCR; 	// Transmit Counter Register
-	AT91_REG	 DBGU_RNPR; 	// Receive Next Pointer Register
-	AT91_REG	 DBGU_RNCR; 	// Receive Next Counter Register
-	AT91_REG	 DBGU_TNPR; 	// Transmit Next Pointer Register
-	AT91_REG	 DBGU_TNCR; 	// Transmit Next Counter Register
-	AT91_REG	 DBGU_PTCR; 	// PDC Transfer Control Register
-	AT91_REG	 DBGU_PTSR; 	// PDC Transfer Status Register
+    AT91_REG	 DBGU_CR; 	// Control Register
+    AT91_REG	 DBGU_MR; 	// Mode Register
+    AT91_REG	 DBGU_IER; 	// Interrupt Enable Register
+    AT91_REG	 DBGU_IDR; 	// Interrupt Disable Register
+    AT91_REG	 DBGU_IMR; 	// Interrupt Mask Register
+    AT91_REG	 DBGU_CSR; 	// Channel Status Register
+    AT91_REG	 DBGU_RHR; 	// Receiver Holding Register
+    AT91_REG	 DBGU_THR; 	// Transmitter Holding Register
+    AT91_REG	 DBGU_BRGR; 	// Baud Rate Generator Register
+    AT91_REG	 Reserved0[7]; 	//
+    AT91_REG	 DBGU_CIDR; 	// Chip ID Register
+    AT91_REG	 DBGU_EXID; 	// Chip ID Extension Register
+    AT91_REG	 DBGU_FNTR; 	// Force NTRST Register
+    AT91_REG	 Reserved1[45]; 	//
+    AT91_REG	 DBGU_RPR; 	// Receive Pointer Register
+    AT91_REG	 DBGU_RCR; 	// Receive Counter Register
+    AT91_REG	 DBGU_TPR; 	// Transmit Pointer Register
+    AT91_REG	 DBGU_TCR; 	// Transmit Counter Register
+    AT91_REG	 DBGU_RNPR; 	// Receive Next Pointer Register
+    AT91_REG	 DBGU_RNCR; 	// Receive Next Counter Register
+    AT91_REG	 DBGU_TNPR; 	// Transmit Next Pointer Register
+    AT91_REG	 DBGU_TNCR; 	// Transmit Next Counter Register
+    AT91_REG	 DBGU_PTCR; 	// PDC Transfer Control Register
+    AT91_REG	 DBGU_PTSR; 	// PDC Transfer Status Register
 } AT91S_DBGU, *AT91PS_DBGU;
 #else
 #define DBGU_CR         (AT91_CAST(AT91_REG *) 	0x00000000) // (DBGU_CR) Control Register
@@ -387,41 +387,41 @@ typedef struct _AT91S_DBGU {
 // *****************************************************************************
 #ifndef __ASSEMBLY__
 typedef struct _AT91S_PIO {
-	AT91_REG	 PIO_PER; 	// PIO Enable Register
-	AT91_REG	 PIO_PDR; 	// PIO Disable Register
-	AT91_REG	 PIO_PSR; 	// PIO Status Register
-	AT91_REG	 Reserved0[1]; 	//
-	AT91_REG	 PIO_OER; 	// Output Enable Register
-	AT91_REG	 PIO_ODR; 	// Output Disable Registerr
-	AT91_REG	 PIO_OSR; 	// Output Status Register
-	AT91_REG	 Reserved1[1]; 	//
-	AT91_REG	 PIO_IFER; 	// Input Filter Enable Register
-	AT91_REG	 PIO_IFDR; 	// Input Filter Disable Register
-	AT91_REG	 PIO_IFSR; 	// Input Filter Status Register
-	AT91_REG	 Reserved2[1]; 	//
-	AT91_REG	 PIO_SODR; 	// Set Output Data Register
-	AT91_REG	 PIO_CODR; 	// Clear Output Data Register
-	AT91_REG	 PIO_ODSR; 	// Output Data Status Register
-	AT91_REG	 PIO_PDSR; 	// Pin Data Status Register
-	AT91_REG	 PIO_IER; 	// Interrupt Enable Register
-	AT91_REG	 PIO_IDR; 	// Interrupt Disable Register
-	AT91_REG	 PIO_IMR; 	// Interrupt Mask Register
-	AT91_REG	 PIO_ISR; 	// Interrupt Status Register
-	AT91_REG	 PIO_MDER; 	// Multi-driver Enable Register
-	AT91_REG	 PIO_MDDR; 	// Multi-driver Disable Register
-	AT91_REG	 PIO_MDSR; 	// Multi-driver Status Register
-	AT91_REG	 Reserved3[1]; 	//
-	AT91_REG	 PIO_PPUDR; 	// Pull-up Disable Register
-	AT91_REG	 PIO_PPUER; 	// Pull-up Enable Register
-	AT91_REG	 PIO_PPUSR; 	// Pull-up Status Register
-	AT91_REG	 Reserved4[1]; 	//
-	AT91_REG	 PIO_ASR; 	// Select A Register
-	AT91_REG	 PIO_BSR; 	// Select B Register
-	AT91_REG	 PIO_ABSR; 	// AB Select Status Register
-	AT91_REG	 Reserved5[9]; 	//
-	AT91_REG	 PIO_OWER; 	// Output Write Enable Register
-	AT91_REG	 PIO_OWDR; 	// Output Write Disable Register
-	AT91_REG	 PIO_OWSR; 	// Output Write Status Register
+    AT91_REG	 PIO_PER; 	// PIO Enable Register
+    AT91_REG	 PIO_PDR; 	// PIO Disable Register
+    AT91_REG	 PIO_PSR; 	// PIO Status Register
+    AT91_REG	 Reserved0[1]; 	//
+    AT91_REG	 PIO_OER; 	// Output Enable Register
+    AT91_REG	 PIO_ODR; 	// Output Disable Registerr
+    AT91_REG	 PIO_OSR; 	// Output Status Register
+    AT91_REG	 Reserved1[1]; 	//
+    AT91_REG	 PIO_IFER; 	// Input Filter Enable Register
+    AT91_REG	 PIO_IFDR; 	// Input Filter Disable Register
+    AT91_REG	 PIO_IFSR; 	// Input Filter Status Register
+    AT91_REG	 Reserved2[1]; 	//
+    AT91_REG	 PIO_SODR; 	// Set Output Data Register
+    AT91_REG	 PIO_CODR; 	// Clear Output Data Register
+    AT91_REG	 PIO_ODSR; 	// Output Data Status Register
+    AT91_REG	 PIO_PDSR; 	// Pin Data Status Register
+    AT91_REG	 PIO_IER; 	// Interrupt Enable Register
+    AT91_REG	 PIO_IDR; 	// Interrupt Disable Register
+    AT91_REG	 PIO_IMR; 	// Interrupt Mask Register
+    AT91_REG	 PIO_ISR; 	// Interrupt Status Register
+    AT91_REG	 PIO_MDER; 	// Multi-driver Enable Register
+    AT91_REG	 PIO_MDDR; 	// Multi-driver Disable Register
+    AT91_REG	 PIO_MDSR; 	// Multi-driver Status Register
+    AT91_REG	 Reserved3[1]; 	//
+    AT91_REG	 PIO_PPUDR; 	// Pull-up Disable Register
+    AT91_REG	 PIO_PPUER; 	// Pull-up Enable Register
+    AT91_REG	 PIO_PPUSR; 	// Pull-up Status Register
+    AT91_REG	 Reserved4[1]; 	//
+    AT91_REG	 PIO_ASR; 	// Select A Register
+    AT91_REG	 PIO_BSR; 	// Select B Register
+    AT91_REG	 PIO_ABSR; 	// AB Select Status Register
+    AT91_REG	 Reserved5[9]; 	//
+    AT91_REG	 PIO_OWER; 	// Output Write Enable Register
+    AT91_REG	 PIO_OWDR; 	// Output Write Disable Register
+    AT91_REG	 PIO_OWSR; 	// Output Write Status Register
 } AT91S_PIO, *AT91PS_PIO;
 #else
 #define PIO_PER         (AT91_CAST(AT91_REG *) 	0x00000000) // (PIO_PER) PIO Enable Register
@@ -461,10 +461,10 @@ typedef struct _AT91S_PIO {
 // *****************************************************************************
 #ifndef __ASSEMBLY__
 typedef struct _AT91S_CKGR {
-	AT91_REG	 CKGR_MOR; 	// Main Oscillator Register
-	AT91_REG	 CKGR_MCFR; 	// Main Clock  Frequency Register
-	AT91_REG	 Reserved0[1]; 	//
-	AT91_REG	 CKGR_PLLR; 	// PLL Register
+    AT91_REG	 CKGR_MOR; 	// Main Oscillator Register
+    AT91_REG	 CKGR_MCFR; 	// Main Clock  Frequency Register
+    AT91_REG	 Reserved0[1]; 	//
+    AT91_REG	 CKGR_PLLR; 	// PLL Register
 } AT91S_CKGR, *AT91PS_CKGR;
 #else
 #define CKGR_MOR        (AT91_CAST(AT91_REG *) 	0x00000000) // (CKGR_MOR) Main Oscillator Register
@@ -500,26 +500,26 @@ typedef struct _AT91S_CKGR {
 // *****************************************************************************
 #ifndef __ASSEMBLY__
 typedef struct _AT91S_PMC {
-	AT91_REG	 PMC_SCER; 	// System Clock Enable Register
-	AT91_REG	 PMC_SCDR; 	// System Clock Disable Register
-	AT91_REG	 PMC_SCSR; 	// System Clock Status Register
-	AT91_REG	 Reserved0[1]; 	//
-	AT91_REG	 PMC_PCER; 	// Peripheral Clock Enable Register
-	AT91_REG	 PMC_PCDR; 	// Peripheral Clock Disable Register
-	AT91_REG	 PMC_PCSR; 	// Peripheral Clock Status Register
-	AT91_REG	 Reserved1[1]; 	//
-	AT91_REG	 PMC_MOR; 	// Main Oscillator Register
-	AT91_REG	 PMC_MCFR; 	// Main Clock  Frequency Register
-	AT91_REG	 Reserved2[1]; 	//
-	AT91_REG	 PMC_PLLR; 	// PLL Register
-	AT91_REG	 PMC_MCKR; 	// Master Clock Register
-	AT91_REG	 Reserved3[3]; 	//
-	AT91_REG	 PMC_PCKR[3]; 	// Programmable Clock Register
-	AT91_REG	 Reserved4[5]; 	//
-	AT91_REG	 PMC_IER; 	// Interrupt Enable Register
-	AT91_REG	 PMC_IDR; 	// Interrupt Disable Register
-	AT91_REG	 PMC_SR; 	// Status Register
-	AT91_REG	 PMC_IMR; 	// Interrupt Mask Register
+    AT91_REG	 PMC_SCER; 	// System Clock Enable Register
+    AT91_REG	 PMC_SCDR; 	// System Clock Disable Register
+    AT91_REG	 PMC_SCSR; 	// System Clock Status Register
+    AT91_REG	 Reserved0[1]; 	//
+    AT91_REG	 PMC_PCER; 	// Peripheral Clock Enable Register
+    AT91_REG	 PMC_PCDR; 	// Peripheral Clock Disable Register
+    AT91_REG	 PMC_PCSR; 	// Peripheral Clock Status Register
+    AT91_REG	 Reserved1[1]; 	//
+    AT91_REG	 PMC_MOR; 	// Main Oscillator Register
+    AT91_REG	 PMC_MCFR; 	// Main Clock  Frequency Register
+    AT91_REG	 Reserved2[1]; 	//
+    AT91_REG	 PMC_PLLR; 	// PLL Register
+    AT91_REG	 PMC_MCKR; 	// Master Clock Register
+    AT91_REG	 Reserved3[3]; 	//
+    AT91_REG	 PMC_PCKR[3]; 	// Programmable Clock Register
+    AT91_REG	 Reserved4[5]; 	//
+    AT91_REG	 PMC_IER; 	// Interrupt Enable Register
+    AT91_REG	 PMC_IDR; 	// Interrupt Disable Register
+    AT91_REG	 PMC_SR; 	// Status Register
+    AT91_REG	 PMC_IMR; 	// Interrupt Mask Register
 } AT91S_PMC, *AT91PS_PMC;
 #else
 #define PMC_SCER        (AT91_CAST(AT91_REG *) 	0x00000000) // (PMC_SCER) System Clock Enable Register
@@ -577,9 +577,9 @@ typedef struct _AT91S_PMC {
 // *****************************************************************************
 #ifndef __ASSEMBLY__
 typedef struct _AT91S_RSTC {
-	AT91_REG	 RSTC_RCR; 	// Reset Control Register
-	AT91_REG	 RSTC_RSR; 	// Reset Status Register
-	AT91_REG	 RSTC_RMR; 	// Reset Mode Register
+    AT91_REG	 RSTC_RCR; 	// Reset Control Register
+    AT91_REG	 RSTC_RSR; 	// Reset Status Register
+    AT91_REG	 RSTC_RMR; 	// Reset Mode Register
 } AT91S_RSTC, *AT91PS_RSTC;
 #else
 #define RSTC_RCR        (AT91_CAST(AT91_REG *) 	0x00000000) // (RSTC_RCR) Reset Control Register
@@ -615,10 +615,10 @@ typedef struct _AT91S_RSTC {
 // *****************************************************************************
 #ifndef __ASSEMBLY__
 typedef struct _AT91S_RTTC {
-	AT91_REG	 RTTC_RTMR; 	// Real-time Mode Register
-	AT91_REG	 RTTC_RTAR; 	// Real-time Alarm Register
-	AT91_REG	 RTTC_RTVR; 	// Real-time Value Register
-	AT91_REG	 RTTC_RTSR; 	// Real-time Status Register
+    AT91_REG	 RTTC_RTMR; 	// Real-time Mode Register
+    AT91_REG	 RTTC_RTAR; 	// Real-time Alarm Register
+    AT91_REG	 RTTC_RTVR; 	// Real-time Value Register
+    AT91_REG	 RTTC_RTSR; 	// Real-time Status Register
 } AT91S_RTTC, *AT91PS_RTTC;
 #else
 #define RTTC_RTMR       (AT91_CAST(AT91_REG *) 	0x00000000) // (RTTC_RTMR) Real-time Mode Register
@@ -645,10 +645,10 @@ typedef struct _AT91S_RTTC {
 // *****************************************************************************
 #ifndef __ASSEMBLY__
 typedef struct _AT91S_PITC {
-	AT91_REG	 PITC_PIMR; 	// Period Interval Mode Register
-	AT91_REG	 PITC_PISR; 	// Period Interval Status Register
-	AT91_REG	 PITC_PIVR; 	// Period Interval Value Register
-	AT91_REG	 PITC_PIIR; 	// Period Interval Image Register
+    AT91_REG	 PITC_PIMR; 	// Period Interval Mode Register
+    AT91_REG	 PITC_PISR; 	// Period Interval Status Register
+    AT91_REG	 PITC_PIVR; 	// Period Interval Value Register
+    AT91_REG	 PITC_PIIR; 	// Period Interval Image Register
 } AT91S_PITC, *AT91PS_PITC;
 #else
 #define PITC_PIMR       (AT91_CAST(AT91_REG *) 	0x00000000) // (PITC_PIMR) Period Interval Mode Register
@@ -673,9 +673,9 @@ typedef struct _AT91S_PITC {
 // *****************************************************************************
 #ifndef __ASSEMBLY__
 typedef struct _AT91S_WDTC {
-	AT91_REG	 WDTC_WDCR; 	// Watchdog Control Register
-	AT91_REG	 WDTC_WDMR; 	// Watchdog Mode Register
-	AT91_REG	 WDTC_WDSR; 	// Watchdog Status Register
+    AT91_REG	 WDTC_WDCR; 	// Watchdog Control Register
+    AT91_REG	 WDTC_WDMR; 	// Watchdog Mode Register
+    AT91_REG	 WDTC_WDSR; 	// Watchdog Status Register
 } AT91S_WDTC, *AT91PS_WDTC;
 #else
 #define WDTC_WDCR       (AT91_CAST(AT91_REG *) 	0x00000000) // (WDTC_WDCR) Watchdog Control Register
@@ -704,7 +704,7 @@ typedef struct _AT91S_WDTC {
 // *****************************************************************************
 #ifndef __ASSEMBLY__
 typedef struct _AT91S_VREG {
-	AT91_REG	 VREG_MR; 	// Voltage Regulator Mode Register
+    AT91_REG	 VREG_MR; 	// Voltage Regulator Mode Register
 } AT91S_VREG, *AT91PS_VREG;
 #else
 #define VREG_MR         (AT91_CAST(AT91_REG *) 	0x00000000) // (VREG_MR) Voltage Regulator Mode Register
@@ -718,10 +718,10 @@ typedef struct _AT91S_VREG {
 // *****************************************************************************
 #ifndef __ASSEMBLY__
 typedef struct _AT91S_EFC {
-	AT91_REG	 EFC_FMR; 	// MC Flash Mode Register
-	AT91_REG	 EFC_FCR; 	// MC Flash Command Register
-	AT91_REG	 EFC_FSR; 	// MC Flash Status Register
-	AT91_REG	 EFC_VR; 	// MC Flash Version Register
+    AT91_REG	 EFC_FMR; 	// MC Flash Mode Register
+    AT91_REG	 EFC_FCR; 	// MC Flash Command Register
+    AT91_REG	 EFC_FSR; 	// MC Flash Status Register
+    AT91_REG	 EFC_VR; 	// MC Flash Version Register
 } AT91S_EFC, *AT91PS_EFC;
 #else
 #define MC_FMR          (AT91_CAST(AT91_REG *) 	0x00000000) // (MC_FMR) MC Flash Mode Register
@@ -788,22 +788,22 @@ typedef struct _AT91S_EFC {
 // *****************************************************************************
 #ifndef __ASSEMBLY__
 typedef struct _AT91S_MC {
-	AT91_REG	 MC_RCR; 	// MC Remap Control Register
-	AT91_REG	 MC_ASR; 	// MC Abort Status Register
-	AT91_REG	 MC_AASR; 	// MC Abort Address Status Register
-	AT91_REG	 Reserved0[1]; 	//
-	AT91_REG	 MC_PUIA[16]; 	// MC Protection Unit Area
-	AT91_REG	 MC_PUP; 	// MC Protection Unit Peripherals
-	AT91_REG	 MC_PUER; 	// MC Protection Unit Enable Register
-	AT91_REG	 Reserved1[2]; 	//
-	AT91_REG	 MC0_FMR; 	// MC Flash Mode Register
-	AT91_REG	 MC0_FCR; 	// MC Flash Command Register
-	AT91_REG	 MC0_FSR; 	// MC Flash Status Register
-	AT91_REG	 MC0_VR; 	// MC Flash Version Register
-	AT91_REG	 MC1_FMR; 	// MC Flash Mode Register
-	AT91_REG	 MC1_FCR; 	// MC Flash Command Register
-	AT91_REG	 MC1_FSR; 	// MC Flash Status Register
-	AT91_REG	 MC1_VR; 	// MC Flash Version Register
+    AT91_REG	 MC_RCR; 	// MC Remap Control Register
+    AT91_REG	 MC_ASR; 	// MC Abort Status Register
+    AT91_REG	 MC_AASR; 	// MC Abort Address Status Register
+    AT91_REG	 Reserved0[1]; 	//
+    AT91_REG	 MC_PUIA[16]; 	// MC Protection Unit Area
+    AT91_REG	 MC_PUP; 	// MC Protection Unit Peripherals
+    AT91_REG	 MC_PUER; 	// MC Protection Unit Enable Register
+    AT91_REG	 Reserved1[2]; 	//
+    AT91_REG	 MC0_FMR; 	// MC Flash Mode Register
+    AT91_REG	 MC0_FCR; 	// MC Flash Command Register
+    AT91_REG	 MC0_FSR; 	// MC Flash Status Register
+    AT91_REG	 MC0_VR; 	// MC Flash Version Register
+    AT91_REG	 MC1_FMR; 	// MC Flash Mode Register
+    AT91_REG	 MC1_FCR; 	// MC Flash Command Register
+    AT91_REG	 MC1_FSR; 	// MC Flash Status Register
+    AT91_REG	 MC1_VR; 	// MC Flash Version Register
 } AT91S_MC, *AT91PS_MC;
 #else
 #define MC_RCR          (AT91_CAST(AT91_REG *) 	0x00000000) // (MC_RCR) MC Remap Control Register
@@ -865,27 +865,27 @@ typedef struct _AT91S_MC {
 // *****************************************************************************
 #ifndef __ASSEMBLY__
 typedef struct _AT91S_SPI {
-	AT91_REG	 SPI_CR; 	// Control Register
-	AT91_REG	 SPI_MR; 	// Mode Register
-	AT91_REG	 SPI_RDR; 	// Receive Data Register
-	AT91_REG	 SPI_TDR; 	// Transmit Data Register
-	AT91_REG	 SPI_SR; 	// Status Register
-	AT91_REG	 SPI_IER; 	// Interrupt Enable Register
-	AT91_REG	 SPI_IDR; 	// Interrupt Disable Register
-	AT91_REG	 SPI_IMR; 	// Interrupt Mask Register
-	AT91_REG	 Reserved0[4]; 	//
-	AT91_REG	 SPI_CSR[4]; 	// Chip Select Register
-	AT91_REG	 Reserved1[48]; 	//
-	AT91_REG	 SPI_RPR; 	// Receive Pointer Register
-	AT91_REG	 SPI_RCR; 	// Receive Counter Register
-	AT91_REG	 SPI_TPR; 	// Transmit Pointer Register
-	AT91_REG	 SPI_TCR; 	// Transmit Counter Register
-	AT91_REG	 SPI_RNPR; 	// Receive Next Pointer Register
-	AT91_REG	 SPI_RNCR; 	// Receive Next Counter Register
-	AT91_REG	 SPI_TNPR; 	// Transmit Next Pointer Register
-	AT91_REG	 SPI_TNCR; 	// Transmit Next Counter Register
-	AT91_REG	 SPI_PTCR; 	// PDC Transfer Control Register
-	AT91_REG	 SPI_PTSR; 	// PDC Transfer Status Register
+    AT91_REG	 SPI_CR; 	// Control Register
+    AT91_REG	 SPI_MR; 	// Mode Register
+    AT91_REG	 SPI_RDR; 	// Receive Data Register
+    AT91_REG	 SPI_TDR; 	// Transmit Data Register
+    AT91_REG	 SPI_SR; 	// Status Register
+    AT91_REG	 SPI_IER; 	// Interrupt Enable Register
+    AT91_REG	 SPI_IDR; 	// Interrupt Disable Register
+    AT91_REG	 SPI_IMR; 	// Interrupt Mask Register
+    AT91_REG	 Reserved0[4]; 	//
+    AT91_REG	 SPI_CSR[4]; 	// Chip Select Register
+    AT91_REG	 Reserved1[48]; 	//
+    AT91_REG	 SPI_RPR; 	// Receive Pointer Register
+    AT91_REG	 SPI_RCR; 	// Receive Counter Register
+    AT91_REG	 SPI_TPR; 	// Transmit Pointer Register
+    AT91_REG	 SPI_TCR; 	// Transmit Counter Register
+    AT91_REG	 SPI_RNPR; 	// Receive Next Pointer Register
+    AT91_REG	 SPI_RNCR; 	// Receive Next Counter Register
+    AT91_REG	 SPI_TNPR; 	// Transmit Next Pointer Register
+    AT91_REG	 SPI_TNCR; 	// Transmit Next Counter Register
+    AT91_REG	 SPI_PTCR; 	// PDC Transfer Control Register
+    AT91_REG	 SPI_PTSR; 	// PDC Transfer Status Register
 } AT91S_SPI, *AT91PS_SPI;
 #else
 #define SPI_CR          (AT91_CAST(AT91_REG *) 	0x00000000) // (SPI_CR) Control Register
@@ -959,29 +959,29 @@ typedef struct _AT91S_SPI {
 // *****************************************************************************
 #ifndef __ASSEMBLY__
 typedef struct _AT91S_ADC {
-	AT91_REG	 ADC_CR; 	// ADC Control Register
-	AT91_REG	 ADC_MR; 	// ADC Mode Register
-	AT91_REG	 Reserved0[2]; 	//
-	AT91_REG	 ADC_CHER; 	// ADC Channel Enable Register
-	AT91_REG	 ADC_CHDR; 	// ADC Channel Disable Register
-	AT91_REG	 ADC_CHSR; 	// ADC Channel Status Register
-	AT91_REG	 ADC_SR; 	// ADC Status Register
-	AT91_REG	 ADC_LCDR; 	// ADC Last Converted Data Register
-	AT91_REG	 ADC_IER; 	// ADC Interrupt Enable Register
-	AT91_REG	 ADC_IDR; 	// ADC Interrupt Disable Register
-	AT91_REG	 ADC_IMR; 	// ADC Interrupt Mask Register
-	AT91_REG	 ADC_CDR[8]; // ADC Channel Data Register
-	AT91_REG	 Reserved1[44]; 	//
-	AT91_REG	 ADC_RPR; 	// Receive Pointer Register
-	AT91_REG	 ADC_RCR; 	// Receive Counter Register
-	AT91_REG	 ADC_TPR; 	// Transmit Pointer Register
-	AT91_REG	 ADC_TCR; 	// Transmit Counter Register
-	AT91_REG	 ADC_RNPR; 	// Receive Next Pointer Register
-	AT91_REG	 ADC_RNCR; 	// Receive Next Counter Register
-	AT91_REG	 ADC_TNPR; 	// Transmit Next Pointer Register
-	AT91_REG	 ADC_TNCR; 	// Transmit Next Counter Register
-	AT91_REG	 ADC_PTCR; 	// PDC Transfer Control Register
-	AT91_REG	 ADC_PTSR; 	// PDC Transfer Status Register
+    AT91_REG	 ADC_CR; 	// ADC Control Register
+    AT91_REG	 ADC_MR; 	// ADC Mode Register
+    AT91_REG	 Reserved0[2]; 	//
+    AT91_REG	 ADC_CHER; 	// ADC Channel Enable Register
+    AT91_REG	 ADC_CHDR; 	// ADC Channel Disable Register
+    AT91_REG	 ADC_CHSR; 	// ADC Channel Status Register
+    AT91_REG	 ADC_SR; 	// ADC Status Register
+    AT91_REG	 ADC_LCDR; 	// ADC Last Converted Data Register
+    AT91_REG	 ADC_IER; 	// ADC Interrupt Enable Register
+    AT91_REG	 ADC_IDR; 	// ADC Interrupt Disable Register
+    AT91_REG	 ADC_IMR; 	// ADC Interrupt Mask Register
+    AT91_REG	 ADC_CDR[8]; // ADC Channel Data Register
+    AT91_REG	 Reserved1[44]; 	//
+    AT91_REG	 ADC_RPR; 	// Receive Pointer Register
+    AT91_REG	 ADC_RCR; 	// Receive Counter Register
+    AT91_REG	 ADC_TPR; 	// Transmit Pointer Register
+    AT91_REG	 ADC_TCR; 	// Transmit Counter Register
+    AT91_REG	 ADC_RNPR; 	// Receive Next Pointer Register
+    AT91_REG	 ADC_RNCR; 	// Receive Next Counter Register
+    AT91_REG	 ADC_TNPR; 	// Transmit Next Pointer Register
+    AT91_REG	 ADC_TNCR; 	// Transmit Next Counter Register
+    AT91_REG	 ADC_PTCR; 	// PDC Transfer Control Register
+    AT91_REG	 ADC_PTSR; 	// PDC Transfer Status Register
 } AT91S_ADC, *AT91PS_ADC;
 #else
 #define ADC_CR          (AT91_CAST(AT91_REG *) 	0x00000000) // (ADC_CR) ADC Control Register
@@ -1080,34 +1080,34 @@ typedef struct _AT91S_ADC {
 // *****************************************************************************
 #ifndef __ASSEMBLY__
 typedef struct _AT91S_SSC {
-	AT91_REG	 SSC_CR; 	// Control Register
-	AT91_REG	 SSC_CMR; 	// Clock Mode Register
-	AT91_REG	 Reserved0[2]; 	//
-	AT91_REG	 SSC_RCMR; 	// Receive Clock ModeRegister
-	AT91_REG	 SSC_RFMR; 	// Receive Frame Mode Register
-	AT91_REG	 SSC_TCMR; 	// Transmit Clock Mode Register
-	AT91_REG	 SSC_TFMR; 	// Transmit Frame Mode Register
-	AT91_REG	 SSC_RHR; 	// Receive Holding Register
-	AT91_REG	 SSC_THR; 	// Transmit Holding Register
-	AT91_REG	 Reserved1[2]; 	//
-	AT91_REG	 SSC_RSHR; 	// Receive Sync Holding Register
-	AT91_REG	 SSC_TSHR; 	// Transmit Sync Holding Register
-	AT91_REG	 Reserved2[2]; 	//
-	AT91_REG	 SSC_SR; 	// Status Register
-	AT91_REG	 SSC_IER; 	// Interrupt Enable Register
-	AT91_REG	 SSC_IDR; 	// Interrupt Disable Register
-	AT91_REG	 SSC_IMR; 	// Interrupt Mask Register
-	AT91_REG	 Reserved3[44]; 	//
-	AT91_REG	 SSC_RPR; 	// Receive Pointer Register
-	AT91_REG	 SSC_RCR; 	// Receive Counter Register
-	AT91_REG	 SSC_TPR; 	// Transmit Pointer Register
-	AT91_REG	 SSC_TCR; 	// Transmit Counter Register
-	AT91_REG	 SSC_RNPR; 	// Receive Next Pointer Register
-	AT91_REG	 SSC_RNCR; 	// Receive Next Counter Register
-	AT91_REG	 SSC_TNPR; 	// Transmit Next Pointer Register
-	AT91_REG	 SSC_TNCR; 	// Transmit Next Counter Register
-	AT91_REG	 SSC_PTCR; 	// PDC Transfer Control Register
-	AT91_REG	 SSC_PTSR; 	// PDC Transfer Status Register
+    AT91_REG	 SSC_CR; 	// Control Register
+    AT91_REG	 SSC_CMR; 	// Clock Mode Register
+    AT91_REG	 Reserved0[2]; 	//
+    AT91_REG	 SSC_RCMR; 	// Receive Clock ModeRegister
+    AT91_REG	 SSC_RFMR; 	// Receive Frame Mode Register
+    AT91_REG	 SSC_TCMR; 	// Transmit Clock Mode Register
+    AT91_REG	 SSC_TFMR; 	// Transmit Frame Mode Register
+    AT91_REG	 SSC_RHR; 	// Receive Holding Register
+    AT91_REG	 SSC_THR; 	// Transmit Holding Register
+    AT91_REG	 Reserved1[2]; 	//
+    AT91_REG	 SSC_RSHR; 	// Receive Sync Holding Register
+    AT91_REG	 SSC_TSHR; 	// Transmit Sync Holding Register
+    AT91_REG	 Reserved2[2]; 	//
+    AT91_REG	 SSC_SR; 	// Status Register
+    AT91_REG	 SSC_IER; 	// Interrupt Enable Register
+    AT91_REG	 SSC_IDR; 	// Interrupt Disable Register
+    AT91_REG	 SSC_IMR; 	// Interrupt Mask Register
+    AT91_REG	 Reserved3[44]; 	//
+    AT91_REG	 SSC_RPR; 	// Receive Pointer Register
+    AT91_REG	 SSC_RCR; 	// Receive Counter Register
+    AT91_REG	 SSC_TPR; 	// Transmit Pointer Register
+    AT91_REG	 SSC_TCR; 	// Transmit Counter Register
+    AT91_REG	 SSC_RNPR; 	// Receive Next Pointer Register
+    AT91_REG	 SSC_RNCR; 	// Receive Next Counter Register
+    AT91_REG	 SSC_TNPR; 	// Transmit Next Pointer Register
+    AT91_REG	 SSC_TNCR; 	// Transmit Next Counter Register
+    AT91_REG	 SSC_PTCR; 	// PDC Transfer Control Register
+    AT91_REG	 SSC_PTSR; 	// PDC Transfer Status Register
 } AT91S_SSC, *AT91PS_SSC;
 #else
 #define SSC_CR          (AT91_CAST(AT91_REG *) 	0x00000000) // (SSC_CR) Control Register
@@ -1194,33 +1194,33 @@ typedef struct _AT91S_SSC {
 // *****************************************************************************
 #ifndef __ASSEMBLY__
 typedef struct _AT91S_USART {
-	AT91_REG	 US_CR; 	// Control Register
-	AT91_REG	 US_MR; 	// Mode Register
-	AT91_REG	 US_IER; 	// Interrupt Enable Register
-	AT91_REG	 US_IDR; 	// Interrupt Disable Register
-	AT91_REG	 US_IMR; 	// Interrupt Mask Register
-	AT91_REG	 US_CSR; 	// Channel Status Register
-	AT91_REG	 US_RHR; 	// Receiver Holding Register
-	AT91_REG	 US_THR; 	// Transmitter Holding Register
-	AT91_REG	 US_BRGR; 	// Baud Rate Generator Register
-	AT91_REG	 US_RTOR; 	// Receiver Time-out Register
-	AT91_REG	 US_TTGR; 	// Transmitter Time-guard Register
-	AT91_REG	 Reserved0[5]; 	//
-	AT91_REG	 US_FIDI; 	// FI_DI_Ratio Register
-	AT91_REG	 US_NER; 	// Nb Errors Register
-	AT91_REG	 Reserved1[1]; 	//
-	AT91_REG	 US_IF; 	// IRDA_FILTER Register
-	AT91_REG	 Reserved2[44]; 	//
-	AT91_REG	 US_RPR; 	// Receive Pointer Register
-	AT91_REG	 US_RCR; 	// Receive Counter Register
-	AT91_REG	 US_TPR; 	// Transmit Pointer Register
-	AT91_REG	 US_TCR; 	// Transmit Counter Register
-	AT91_REG	 US_RNPR; 	// Receive Next Pointer Register
-	AT91_REG	 US_RNCR; 	// Receive Next Counter Register
-	AT91_REG	 US_TNPR; 	// Transmit Next Pointer Register
-	AT91_REG	 US_TNCR; 	// Transmit Next Counter Register
-	AT91_REG	 US_PTCR; 	// PDC Transfer Control Register
-	AT91_REG	 US_PTSR; 	// PDC Transfer Status Register
+    AT91_REG	 US_CR; 	// Control Register
+    AT91_REG	 US_MR; 	// Mode Register
+    AT91_REG	 US_IER; 	// Interrupt Enable Register
+    AT91_REG	 US_IDR; 	// Interrupt Disable Register
+    AT91_REG	 US_IMR; 	// Interrupt Mask Register
+    AT91_REG	 US_CSR; 	// Channel Status Register
+    AT91_REG	 US_RHR; 	// Receiver Holding Register
+    AT91_REG	 US_THR; 	// Transmitter Holding Register
+    AT91_REG	 US_BRGR; 	// Baud Rate Generator Register
+    AT91_REG	 US_RTOR; 	// Receiver Time-out Register
+    AT91_REG	 US_TTGR; 	// Transmitter Time-guard Register
+    AT91_REG	 Reserved0[5]; 	//
+    AT91_REG	 US_FIDI; 	// FI_DI_Ratio Register
+    AT91_REG	 US_NER; 	// Nb Errors Register
+    AT91_REG	 Reserved1[1]; 	//
+    AT91_REG	 US_IF; 	// IRDA_FILTER Register
+    AT91_REG	 Reserved2[44]; 	//
+    AT91_REG	 US_RPR; 	// Receive Pointer Register
+    AT91_REG	 US_RCR; 	// Receive Counter Register
+    AT91_REG	 US_TPR; 	// Transmit Pointer Register
+    AT91_REG	 US_TCR; 	// Transmit Counter Register
+    AT91_REG	 US_RNPR; 	// Receive Next Pointer Register
+    AT91_REG	 US_RNCR; 	// Receive Next Counter Register
+    AT91_REG	 US_TNPR; 	// Transmit Next Pointer Register
+    AT91_REG	 US_TNCR; 	// Transmit Next Counter Register
+    AT91_REG	 US_PTCR; 	// PDC Transfer Control Register
+    AT91_REG	 US_PTSR; 	// PDC Transfer Status Register
 } AT91S_USART, *AT91PS_USART;
 #else
 #define US_CR           (AT91_CAST(AT91_REG *) 	0x00000000) // (US_CR) Control Register
@@ -1306,29 +1306,29 @@ typedef struct _AT91S_USART {
 // *****************************************************************************
 #ifndef __ASSEMBLY__
 typedef struct _AT91S_TWI {
-	AT91_REG	 TWI_CR; 	// Control Register
-	AT91_REG	 TWI_MMR; 	// Master Mode Register
-	AT91_REG	 Reserved0[1]; 	//
-	AT91_REG	 TWI_IADR; 	// Internal Address Register
-	AT91_REG	 TWI_CWGR; 	// Clock Waveform Generator Register
-	AT91_REG	 Reserved1[3]; 	//
-	AT91_REG	 TWI_SR; 	// Status Register
-	AT91_REG	 TWI_IER; 	// Interrupt Enable Register
-	AT91_REG	 TWI_IDR; 	// Interrupt Disable Register
-	AT91_REG	 TWI_IMR; 	// Interrupt Mask Register
-	AT91_REG	 TWI_RHR; 	// Receive Holding Register
-	AT91_REG	 TWI_THR; 	// Transmit Holding Register
-	AT91_REG	 Reserved2[50]; 	//
-	AT91_REG	 TWI_RPR; 	// Receive Pointer Register
-	AT91_REG	 TWI_RCR; 	// Receive Counter Register
-	AT91_REG	 TWI_TPR; 	// Transmit Pointer Register
-	AT91_REG	 TWI_TCR; 	// Transmit Counter Register
-	AT91_REG	 TWI_RNPR; 	// Receive Next Pointer Register
-	AT91_REG	 TWI_RNCR; 	// Receive Next Counter Register
-	AT91_REG	 TWI_TNPR; 	// Transmit Next Pointer Register
-	AT91_REG	 TWI_TNCR; 	// Transmit Next Counter Register
-	AT91_REG	 TWI_PTCR; 	// PDC Transfer Control Register
-	AT91_REG	 TWI_PTSR; 	// PDC Transfer Status Register
+    AT91_REG	 TWI_CR; 	// Control Register
+    AT91_REG	 TWI_MMR; 	// Master Mode Register
+    AT91_REG	 Reserved0[1]; 	//
+    AT91_REG	 TWI_IADR; 	// Internal Address Register
+    AT91_REG	 TWI_CWGR; 	// Clock Waveform Generator Register
+    AT91_REG	 Reserved1[3]; 	//
+    AT91_REG	 TWI_SR; 	// Status Register
+    AT91_REG	 TWI_IER; 	// Interrupt Enable Register
+    AT91_REG	 TWI_IDR; 	// Interrupt Disable Register
+    AT91_REG	 TWI_IMR; 	// Interrupt Mask Register
+    AT91_REG	 TWI_RHR; 	// Receive Holding Register
+    AT91_REG	 TWI_THR; 	// Transmit Holding Register
+    AT91_REG	 Reserved2[50]; 	//
+    AT91_REG	 TWI_RPR; 	// Receive Pointer Register
+    AT91_REG	 TWI_RCR; 	// Receive Counter Register
+    AT91_REG	 TWI_TPR; 	// Transmit Pointer Register
+    AT91_REG	 TWI_TCR; 	// Transmit Counter Register
+    AT91_REG	 TWI_RNPR; 	// Receive Next Pointer Register
+    AT91_REG	 TWI_RNCR; 	// Receive Next Counter Register
+    AT91_REG	 TWI_TNPR; 	// Transmit Next Pointer Register
+    AT91_REG	 TWI_TNCR; 	// Transmit Next Counter Register
+    AT91_REG	 TWI_PTCR; 	// PDC Transfer Control Register
+    AT91_REG	 TWI_PTSR; 	// PDC Transfer Status Register
 } AT91S_TWI, *AT91PS_TWI;
 #else
 #define TWI_CR          (AT91_CAST(AT91_REG *) 	0x00000000) // (TWI_CR) Control Register
@@ -1381,17 +1381,17 @@ typedef struct _AT91S_TWI {
 // *****************************************************************************
 #ifndef __ASSEMBLY__
 typedef struct _AT91S_TC {
-	AT91_REG	 TC_CCR; 	// Channel Control Register
-	AT91_REG	 TC_CMR; 	// Channel Mode Register (Capture Mode / Waveform Mode)
-	AT91_REG	 Reserved0[2]; 	//
-	AT91_REG	 TC_CV; 	// Counter Value
-	AT91_REG	 TC_RA; 	// Register A
-	AT91_REG	 TC_RB; 	// Register B
-	AT91_REG	 TC_RC; 	// Register C
-	AT91_REG	 TC_SR; 	// Status Register
-	AT91_REG	 TC_IER; 	// Interrupt Enable Register
-	AT91_REG	 TC_IDR; 	// Interrupt Disable Register
-	AT91_REG	 TC_IMR; 	// Interrupt Mask Register
+    AT91_REG	 TC_CCR; 	// Channel Control Register
+    AT91_REG	 TC_CMR; 	// Channel Mode Register (Capture Mode / Waveform Mode)
+    AT91_REG	 Reserved0[2]; 	//
+    AT91_REG	 TC_CV; 	// Counter Value
+    AT91_REG	 TC_RA; 	// Register A
+    AT91_REG	 TC_RB; 	// Register B
+    AT91_REG	 TC_RC; 	// Register C
+    AT91_REG	 TC_SR; 	// Status Register
+    AT91_REG	 TC_IER; 	// Interrupt Enable Register
+    AT91_REG	 TC_IDR; 	// Interrupt Disable Register
+    AT91_REG	 TC_IMR; 	// Interrupt Mask Register
 } AT91S_TC, *AT91PS_TC;
 #else
 #define TC_CCR          (AT91_CAST(AT91_REG *) 	0x00000000) // (TC_CCR) Channel Control Register
@@ -1525,14 +1525,14 @@ typedef struct _AT91S_TC {
 // *****************************************************************************
 #ifndef __ASSEMBLY__
 typedef struct _AT91S_TCB {
-	AT91S_TC	 TCB_TC0; 	// TC Channel 0
-	AT91_REG	 Reserved0[4]; 	//
-	AT91S_TC	 TCB_TC1; 	// TC Channel 1
-	AT91_REG	 Reserved1[4]; 	//
-	AT91S_TC	 TCB_TC2; 	// TC Channel 2
-	AT91_REG	 Reserved2[4]; 	//
-	AT91_REG	 TCB_BCR; 	// TC Block Control Register
-	AT91_REG	 TCB_BMR; 	// TC Block Mode Register
+    AT91S_TC	 TCB_TC0; 	// TC Channel 0
+    AT91_REG	 Reserved0[4]; 	//
+    AT91S_TC	 TCB_TC1; 	// TC Channel 1
+    AT91_REG	 Reserved1[4]; 	//
+    AT91S_TC	 TCB_TC2; 	// TC Channel 2
+    AT91_REG	 Reserved2[4]; 	//
+    AT91_REG	 TCB_BCR; 	// TC Block Control Register
+    AT91_REG	 TCB_BMR; 	// TC Block Mode Register
 } AT91S_TCB, *AT91PS_TCB;
 #else
 #define TCB_BCR         (AT91_CAST(AT91_REG *) 	0x000000C0) // (TCB_BCR) TC Block Control Register
@@ -1563,12 +1563,12 @@ typedef struct _AT91S_TCB {
 // *****************************************************************************
 #ifndef __ASSEMBLY__
 typedef struct _AT91S_PWMC_CH {
-	AT91_REG	 PWMC_CMR; 		// Channel Mode Register
-	AT91_REG	 PWMC_CDTYR; 	// Channel Duty Cycle Register
-	AT91_REG	 PWMC_CPRDR; 	// Channel Period Register
-	AT91_REG	 PWMC_CCNTR; 	// Channel Counter Register
-	AT91_REG	 PWMC_CUPDR; 	// Channel Update Register
-	AT91_REG	 PWMC_Reserved[3]; 	// Reserved
+    AT91_REG	 PWMC_CMR; 		// Channel Mode Register
+    AT91_REG	 PWMC_CDTYR; 	// Channel Duty Cycle Register
+    AT91_REG	 PWMC_CPRDR; 	// Channel Period Register
+    AT91_REG	 PWMC_CCNTR; 	// Channel Counter Register
+    AT91_REG	 PWMC_CUPDR; 	// Channel Update Register
+    AT91_REG	 PWMC_Reserved[3]; 	// Reserved
 } AT91S_PWMC_CH, *AT91PS_PWMC_CH;
 #else
 #define PWMC_CMR        (AT91_CAST(AT91_REG *) 	0x00000000) // (PWMC_CMR) Channel Mode Register
@@ -1601,18 +1601,18 @@ typedef struct _AT91S_PWMC_CH {
 // *****************************************************************************
 #ifndef __ASSEMBLY__
 typedef struct _AT91S_PWMC {
-	AT91_REG	 PWMC_MR; 	// PWMC Mode Register
-	AT91_REG	 PWMC_ENA; 	// PWMC Enable Register
-	AT91_REG	 PWMC_DIS; 	// PWMC Disable Register
-	AT91_REG	 PWMC_SR; 	// PWMC Status Register
-	AT91_REG	 PWMC_IER; 	// PWMC Interrupt Enable Register
-	AT91_REG	 PWMC_IDR; 	// PWMC Interrupt Disable Register
-	AT91_REG	 PWMC_IMR; 	// PWMC Interrupt Mask Register
-	AT91_REG	 PWMC_ISR; 	// PWMC Interrupt Status Register
-	AT91_REG	 Reserved0[55]; 	//
-	AT91_REG	 PWMC_VR; 	// PWMC Version Register
-	AT91_REG	 Reserved1[64]; 	//
-	AT91S_PWMC_CH	 PWMC_CH[4]; 	// PWMC Channel
+    AT91_REG	 PWMC_MR; 	// PWMC Mode Register
+    AT91_REG	 PWMC_ENA; 	// PWMC Enable Register
+    AT91_REG	 PWMC_DIS; 	// PWMC Disable Register
+    AT91_REG	 PWMC_SR; 	// PWMC Status Register
+    AT91_REG	 PWMC_IER; 	// PWMC Interrupt Enable Register
+    AT91_REG	 PWMC_IDR; 	// PWMC Interrupt Disable Register
+    AT91_REG	 PWMC_IMR; 	// PWMC Interrupt Mask Register
+    AT91_REG	 PWMC_ISR; 	// PWMC Interrupt Status Register
+    AT91_REG	 Reserved0[55]; 	//
+    AT91_REG	 PWMC_VR; 	// PWMC Version Register
+    AT91_REG	 Reserved1[64]; 	//
+    AT91S_PWMC_CH	 PWMC_CH[4]; 	// PWMC Channel
 } AT91S_PWMC, *AT91PS_PWMC;
 #else
 #define PWMC_MR         (AT91_CAST(AT91_REG *) 	0x00000000) // (PWMC_MR) PWMC Mode Register
@@ -1650,23 +1650,23 @@ typedef struct _AT91S_PWMC {
 // *****************************************************************************
 #ifndef __ASSEMBLY__
 typedef struct _AT91S_UDP {
-	AT91_REG	 UDP_NUM; 	// Frame Number Register
-	AT91_REG	 UDP_GLBSTATE; 	// Global State Register
-	AT91_REG	 UDP_FADDR; 	// Function Address Register
-	AT91_REG	 Reserved0[1]; 	//
-	AT91_REG	 UDP_IER; 	// Interrupt Enable Register
-	AT91_REG	 UDP_IDR; 	// Interrupt Disable Register
-	AT91_REG	 UDP_IMR; 	// Interrupt Mask Register
-	AT91_REG	 UDP_ISR; 	// Interrupt Status Register
-	AT91_REG	 UDP_ICR; 	// Interrupt Clear Register
-	AT91_REG	 Reserved1[1]; 	//
-	AT91_REG	 UDP_RSTEP; 	// Reset Endpoint Register
-	AT91_REG	 Reserved2[1]; 	//
-	AT91_REG	 UDP_CSR[4]; 	// Endpoint Control and Status Register
-	AT91_REG	 Reserved3[4]; 	//
-	AT91_REG	 UDP_FDR[4]; 	// Endpoint FIFO Data Register
-	AT91_REG	 Reserved4[5]; 	//
-	AT91_REG	 UDP_TXVC; 	// Transceiver Control Register
+    AT91_REG	 UDP_NUM; 	// Frame Number Register
+    AT91_REG	 UDP_GLBSTATE; 	// Global State Register
+    AT91_REG	 UDP_FADDR; 	// Function Address Register
+    AT91_REG	 Reserved0[1]; 	//
+    AT91_REG	 UDP_IER; 	// Interrupt Enable Register
+    AT91_REG	 UDP_IDR; 	// Interrupt Disable Register
+    AT91_REG	 UDP_IMR; 	// Interrupt Mask Register
+    AT91_REG	 UDP_ISR; 	// Interrupt Status Register
+    AT91_REG	 UDP_ICR; 	// Interrupt Clear Register
+    AT91_REG	 Reserved1[1]; 	//
+    AT91_REG	 UDP_RSTEP; 	// Reset Endpoint Register
+    AT91_REG	 Reserved2[1]; 	//
+    AT91_REG	 UDP_CSR[4]; 	// Endpoint Control and Status Register
+    AT91_REG	 Reserved3[4]; 	//
+    AT91_REG	 UDP_FDR[4]; 	// Endpoint FIFO Data Register
+    AT91_REG	 Reserved4[5]; 	//
+    AT91_REG	 UDP_TXVC; 	// Transceiver Control Register
 } AT91S_UDP, *AT91PS_UDP;
 #else
 #define UDP_FRM_NUM     (AT91_CAST(AT91_REG *) 	0x00000000) // (UDP_FRM_NUM) Frame Number Register
diff --git a/include/common.h b/include/common.h
index 4b4cf99f3..4f856ac8e 100644
--- a/include/common.h
+++ b/include/common.h
@@ -71,44 +71,44 @@ extern uint32_t FLASHMEM_SPIBAUDRATE;
 
 
 #ifndef FLASH_MEM_ID_LEN
-# define FLASH_MEM_ID_LEN			8
+# define FLASH_MEM_ID_LEN 8
 #endif
 
 #ifndef FLASH_MEM_SIGNATURE_LEN
-# define FLASH_MEM_SIGNATURE_LEN	128
+# define FLASH_MEM_SIGNATURE_LEN 128
 #endif
 
 #ifndef FLASH_MEM_SIGNATURE_OFFSET
-# define FLASH_MEM_SIGNATURE_OFFSET	(FLASH_MEM_MAX_SIZE - FLASH_MEM_SIGNATURE_LEN)
+# define FLASH_MEM_SIGNATURE_OFFSET (FLASH_MEM_MAX_SIZE - FLASH_MEM_SIGNATURE_LEN)
 #endif
 
 #ifdef WITH_FLASH
-	#ifndef T55XX_CONFIG_LEN
-	# define T55XX_CONFIG_LEN	sizeof( t55xx_config )
-	#endif
+    #ifndef T55XX_CONFIG_LEN
+    # define T55XX_CONFIG_LEN sizeof( t55xx_config )
+    #endif
 
-	#ifndef T55XX_CONFIG_OFFSET
-	# define T55XX_CONFIG_OFFSET	(FLASH_MEM_MAX_4K_SECTOR - 0x2000)
-	#endif
+    #ifndef T55XX_CONFIG_OFFSET
+    # define T55XX_CONFIG_OFFSET (FLASH_MEM_MAX_4K_SECTOR - 0x2000)
+    #endif
 
-	#ifndef DEFAULT_T55XX_KEYS_OFFSET
-	# define DEFAULT_T55XX_KEYS_OFFSET (FLASH_MEM_MAX_4K_SECTOR - 0x3000)
-	#endif
+    #ifndef DEFAULT_T55XX_KEYS_OFFSET
+    # define DEFAULT_T55XX_KEYS_OFFSET (FLASH_MEM_MAX_4K_SECTOR - 0x3000)
+    #endif
 
-	#ifndef DEFAULT_MF_KEYS_OFFSET
-	# define DEFAULT_MF_KEYS_OFFSET (FLASH_MEM_MAX_4K_SECTOR - 0x4000)
-	#endif
+    #ifndef DEFAULT_MF_KEYS_OFFSET
+    # define DEFAULT_MF_KEYS_OFFSET (FLASH_MEM_MAX_4K_SECTOR - 0x4000)
+    #endif
 
-	#ifndef DEFAULT_ICLASS_KEYS_OFFSET
-	# define DEFAULT_ICLASS_KEYS_OFFSET (FLASH_MEM_MAX_4K_SECTOR - 0x5000)
-	#endif
+    #ifndef DEFAULT_ICLASS_KEYS_OFFSET
+    # define DEFAULT_ICLASS_KEYS_OFFSET (FLASH_MEM_MAX_4K_SECTOR - 0x5000)
+    #endif
 #endif
 
 // RDV40,  validation structure to help identifying that client/firmware is talking with RDV40
 typedef struct {
-	uint8_t magic[4];
-	uint8_t flashid[FLASH_MEM_ID_LEN];
-	uint8_t signature[FLASH_MEM_SIGNATURE_LEN];
+    uint8_t magic[4];
+    uint8_t flashid[FLASH_MEM_ID_LEN];
+    uint8_t signature[FLASH_MEM_SIGNATURE_LEN];
 } __attribute__((__packed__)) rdv40_validation_t;
 
 
diff --git a/include/config_gpio.h b/include/config_gpio.h
index bcc06eaa7..89e63de5d 100644
--- a/include/config_gpio.h
+++ b/include/config_gpio.h
@@ -9,45 +9,45 @@
 #ifndef __CONFIG_GPIO_H
 #define __CONFIG_GPIO_H
 
-#define GPIO_LED_A			AT91C_PIO_PA0
-#define GPIO_PA1			AT91C_PIO_PA1
-#define GPIO_LED_D			AT91C_PIO_PA2
-#define GPIO_NVDD_ON		AT91C_PIO_PA3
-#define GPIO_FPGA_NINIT		AT91C_PIO_PA4
-#define GPIO_PA5			AT91C_PIO_PA5
-#define GPIO_PCK0			AT91C_PA6_PCK0
-#define GPIO_LRST			AT91C_PIO_PA7
-#define GPIO_LED_B			AT91C_PIO_PA8
-#define GPIO_LED_C			AT91C_PIO_PA9
+#define GPIO_LED_A          AT91C_PIO_PA0
+#define GPIO_PA1            AT91C_PIO_PA1
+#define GPIO_LED_D          AT91C_PIO_PA2
+#define GPIO_NVDD_ON        AT91C_PIO_PA3
+#define GPIO_FPGA_NINIT     AT91C_PIO_PA4
+#define GPIO_PA5            AT91C_PIO_PA5
+#define GPIO_PCK0           AT91C_PA6_PCK0
+#define GPIO_LRST           AT91C_PIO_PA7
+#define GPIO_LED_B          AT91C_PIO_PA8
+#define GPIO_LED_C          AT91C_PIO_PA9
 
 // defines for flash mem,  or rdv40 ?
 // flashmem hooked on PA10
-//#define GPIO_NCS2			AT91C_PIO_PA1
-#define GPIO_NCS2			AT91C_PA10_NPCS2
-#define GPIO_NCS0			AT91C_PA11_NPCS0
+//#define GPIO_NCS2            AT91C_PIO_PA1
+#define GPIO_NCS2           AT91C_PA10_NPCS2
+#define GPIO_NCS0           AT91C_PA11_NPCS0
 
-#define GPIO_MISO			AT91C_PA12_MISO
-#define GPIO_MOSI			AT91C_PA13_MOSI
-#define GPIO_SPCK			AT91C_PA14_SPCK
-#define GPIO_SSC_FRAME		AT91C_PA15_TF
-#define GPIO_SSC_CLK		AT91C_PA16_TK
-#define GPIO_SSC_DOUT		AT91C_PA17_TD
-#define GPIO_SSC_DIN		AT91C_PA18_RD
-#define GPIO_MUXSEL_HIPKD	AT91C_PIO_PA19
-#define GPIO_MUXSEL_LOPKD	AT91C_PIO_PA20
+#define GPIO_MISO           AT91C_PA12_MISO
+#define GPIO_MOSI           AT91C_PA13_MOSI
+#define GPIO_SPCK           AT91C_PA14_SPCK
+#define GPIO_SSC_FRAME      AT91C_PA15_TF
+#define GPIO_SSC_CLK        AT91C_PA16_TK
+#define GPIO_SSC_DOUT       AT91C_PA17_TD
+#define GPIO_SSC_DIN        AT91C_PA18_RD
+#define GPIO_MUXSEL_HIPKD   AT91C_PIO_PA19
+#define GPIO_MUXSEL_LOPKD   AT91C_PIO_PA20
 
 // RDV40 has no HIRAW/LORAW,  its used for FPC
-#define GPIO_MUXSEL_HIRAW	AT91C_PIO_PA21
-#define GPIO_MUXSEL_LORAW	AT91C_PIO_PA22
+#define GPIO_MUXSEL_HIRAW   AT91C_PIO_PA21
+#define GPIO_MUXSEL_LORAW   AT91C_PIO_PA22
 
-#define GPIO_BUTTON			AT91C_PIO_PA23
-#define GPIO_USB_PU			AT91C_PIO_PA24
-#define GPIO_RELAY			AT91C_PIO_PA25
-#define GPIO_FPGA_ON		AT91C_PIO_PA26
-#define GPIO_FPGA_DONE		AT91C_PIO_PA27
-#define GPIO_FPGA_NPROGRAM	AT91C_PIO_PA28
-#define GPIO_FPGA_CCLK		AT91C_PIO_PA29
-#define GPIO_FPGA_DIN		AT91C_PIO_PA30
-#define GPIO_FPGA_DOUT		AT91C_PIO_PA31
+#define GPIO_BUTTON         AT91C_PIO_PA23
+#define GPIO_USB_PU         AT91C_PIO_PA24
+#define GPIO_RELAY          AT91C_PIO_PA25
+#define GPIO_FPGA_ON        AT91C_PIO_PA26
+#define GPIO_FPGA_DONE      AT91C_PIO_PA27
+#define GPIO_FPGA_NPROGRAM  AT91C_PIO_PA28
+#define GPIO_FPGA_CCLK      AT91C_PIO_PA29
+#define GPIO_FPGA_DIN       AT91C_PIO_PA30
+#define GPIO_FPGA_DOUT      AT91C_PIO_PA31
 
 #endif
diff --git a/include/hitag2.h b/include/hitag2.h
index 2eeb48f6f..96cfb7abb 100644
--- a/include/hitag2.h
+++ b/include/hitag2.h
@@ -20,36 +20,36 @@
 #endif
 
 typedef enum {
-	RHTSF_CHALLENGE			  = 01,
-	RHTSF_KEY				  = 02,
-	WHTSF_CHALLENGE           = 03,
-	WHTSF_KEY                 = 04,
-	RHT2F_PASSWORD            = 21,
-	RHT2F_AUTHENTICATE        = 22,
-	RHT2F_CRYPTO              = 23,
-	WHT2F_CRYPTO              = 24,
-	RHT2F_TEST_AUTH_ATTEMPTS  = 25,
-	RHT2F_UID_ONLY            = 26,
+    RHTSF_CHALLENGE           = 01,
+    RHTSF_KEY                 = 02,
+    WHTSF_CHALLENGE           = 03,
+    WHTSF_KEY                 = 04,
+    RHT2F_PASSWORD            = 21,
+    RHT2F_AUTHENTICATE        = 22,
+    RHT2F_CRYPTO              = 23,
+    WHT2F_CRYPTO              = 24,
+    RHT2F_TEST_AUTH_ATTEMPTS  = 25,
+    RHT2F_UID_ONLY            = 26,
 } hitag_function;
 
 typedef struct {
-	byte_t password[4];
+    byte_t password[4];
 } PACKED rht2d_password;
 
 typedef struct {
-	byte_t NrAr[8];
-	byte_t data[4];
+    byte_t NrAr[8];
+    byte_t data[4];
 } PACKED rht2d_authenticate;
 
 typedef struct {
-	byte_t key[6];
-	byte_t data[4];
+    byte_t key[6];
+    byte_t data[4];
 } PACKED rht2d_crypto;
 
 typedef union {
-	rht2d_password pwd;
-	rht2d_authenticate auth;
-	rht2d_crypto crypto;
+    rht2d_password pwd;
+    rht2d_authenticate auth;
+    rht2d_crypto crypto;
 } hitag_data;
 
 #endif
diff --git a/include/hitagS.h b/include/hitagS.h
index d74463f20..307e456b3 100644
--- a/include/hitagS.h
+++ b/include/hitagS.h
@@ -18,57 +18,57 @@
 
 //protocol-state
 typedef enum PROTO_STATE {
-	HT_READY=0,
-	HT_INIT,
-	HT_AUTHENTICATE,
-	HT_SELECTED,
-	HT_QUIET,
-	HT_TTF,
-	HT_FAIL} PSTATE;
+    HT_READY=0,
+    HT_INIT,
+    HT_AUTHENTICATE,
+    HT_SELECTED,
+    HT_QUIET,
+    HT_TTF,
+    HT_FAIL} PSTATE;
 
 //tag-state
 typedef enum TAG_STATE {
-	HT_NO_OP=0,
-	HT_READING_PAGE,
-	HT_WRITING_PAGE_ACK,
-	HT_WRITING_PAGE_DATA,
-	HT_WRITING_BLOCK_DATA} TSATE;
+    HT_NO_OP=0,
+    HT_READING_PAGE,
+    HT_WRITING_PAGE_ACK,
+    HT_WRITING_PAGE_DATA,
+    HT_WRITING_BLOCK_DATA} TSATE;
 
 //number of start-of-frame bits
 typedef enum SOF_TYPE {
-	HT_STANDARD=0,
-	HT_ADVANCED,
-	HT_FAST_ADVANCED,
-	HT_ONE,
-	HT_NO_BITS} stype;
+    HT_STANDARD=0,
+    HT_ADVANCED,
+    HT_FAST_ADVANCED,
+    HT_ONE,
+    HT_NO_BITS} stype;
 
 struct hitagS_tag {
-	PSTATE pstate; //protocol-state
-	TSATE tstate;  //tag-state
-	uint32_t uid;
-	uint32_t pages[16][4];
-	uint64_t key;
-	byte_t pwdl0, pwdl1, pwdh0;
-	//con0
-	int max_page;
-	stype mode;
-	//con1
-	bool auth;  //0=Plain 1=Auth
-	bool TTFC;  //Transponder Talks first coding. 0=Manchester 1=Biphase
-	int TTFDR;  //data rate in TTF Mode
-	int TTFM;   //the number of pages that are sent to the RWD
-	bool LCON;  //0=con1/2 read write 1=con1 read only and con2 OTP
-	bool LKP;   //0=page2/3 read write 1=page2/3 read only in Plain mode and no access in authenticate mode
-	//con2
-	//0=read write 1=read only
-	bool LCK7; //page4/5
-	bool LCK6; //page6/7
-	bool LCK5; //page8-11
-	bool LCK4; //page12-15
-	bool LCK3; //page16-23
-	bool LCK2; //page24-31
-	bool LCK1; //page32-47
-	bool LCK0; //page48-63
+    PSTATE pstate; //protocol-state
+    TSATE tstate;  //tag-state
+    uint32_t uid;
+    uint32_t pages[16][4];
+    uint64_t key;
+    byte_t pwdl0, pwdl1, pwdh0;
+    //con0
+    int max_page;
+    stype mode;
+    //con1
+    bool auth;  //0=Plain 1=Auth
+    bool TTFC;  //Transponder Talks first coding. 0=Manchester 1=Biphase
+    int TTFDR;  //data rate in TTF Mode
+    int TTFM;   //the number of pages that are sent to the RWD
+    bool LCON;  //0=con1/2 read write 1=con1 read only and con2 OTP
+    bool LKP;   //0=page2/3 read write 1=page2/3 read only in Plain mode and no access in authenticate mode
+    //con2
+    //0=read write 1=read only
+    bool LCK7; //page4/5
+    bool LCK6; //page6/7
+    bool LCK5; //page8-11
+    bool LCK4; //page12-15
+    bool LCK3; //page16-23
+    bool LCK2; //page24-31
+    bool LCK1; //page32-47
+    bool LCK0; //page48-63
 } ;
 
 #endif
diff --git a/include/legic.h b/include/legic.h
index d5ba8f166..574cb7fdf 100644
--- a/include/legic.h
+++ b/include/legic.h
@@ -17,11 +17,11 @@
 // LEGIC
 //-----------------------------------------------------------------------------
 typedef struct {
-	uint8_t uid[4];
-	uint32_t tagtype;
-	uint8_t cmdsize;
-	uint8_t addrsize;
-	uint16_t cardsize;
+    uint8_t uid[4];
+    uint32_t tagtype;
+    uint8_t cmdsize;
+    uint8_t addrsize;
+    uint16_t cardsize;
 } legic_card_select_t;
 
 #endif // _LEGIC_H_
diff --git a/include/mifare.h b/include/mifare.h
index eec72c26f..222719188 100644
--- a/include/mifare.h
+++ b/include/mifare.h
@@ -13,111 +13,111 @@
 
 #include "common.h"
 
-#define MF_KEY_A	0
-#define MF_KEY_B	1
+#define MF_KEY_A 0
+#define MF_KEY_B 1
 
-#define MF_MAD1_SECTOR	0x00
-#define MF_MAD2_SECTOR	0x10
+#define MF_MAD1_SECTOR 0x00
+#define MF_MAD2_SECTOR 0x10
 
 //-----------------------------------------------------------------------------
 // ISO 14443A
 //-----------------------------------------------------------------------------
 typedef struct {
-	byte_t uid[10];
-	byte_t uidlen;
-	byte_t atqa[2];
-	byte_t sak;
-	byte_t ats_len;
-	byte_t ats[256];
+    byte_t uid[10];
+    byte_t uidlen;
+    byte_t atqa[2];
+    byte_t sak;
+    byte_t ats_len;
+    byte_t ats[256];
 } __attribute__((__packed__)) iso14a_card_select_t;
 
 typedef enum ISO14A_COMMAND {
-	ISO14A_CONNECT = 			(1 << 0),
-	ISO14A_NO_DISCONNECT =		(1 << 1),
-	ISO14A_APDU = 				(1 << 2),
-	ISO14A_RAW =				(1 << 3),
-	ISO14A_REQUEST_TRIGGER =	(1 << 4),
-	ISO14A_APPEND_CRC =			(1 << 5),
-	ISO14A_SET_TIMEOUT =		(1 << 6),
-	ISO14A_NO_SELECT =			(1 << 7),
-	ISO14A_TOPAZMODE =			(1 << 8),
-	ISO14A_NO_RATS =            (1 << 9),
-	ISO14A_SEND_CHAINING =      (1 << 10)
+    ISO14A_CONNECT =         (1 << 0),
+    ISO14A_NO_DISCONNECT =   (1 << 1),
+    ISO14A_APDU =            (1 << 2),
+    ISO14A_RAW =             (1 << 3),
+    ISO14A_REQUEST_TRIGGER = (1 << 4),
+    ISO14A_APPEND_CRC =      (1 << 5),
+    ISO14A_SET_TIMEOUT =     (1 << 6),
+    ISO14A_NO_SELECT =       (1 << 7),
+    ISO14A_TOPAZMODE =       (1 << 8),
+    ISO14A_NO_RATS =         (1 << 9),
+    ISO14A_SEND_CHAINING =   (1 << 10)
 } iso14a_command_t;
 
 typedef struct {
-	uint8_t* response;
-	size_t   response_n;
-	uint8_t* modulation;
-	size_t   modulation_n;
-	uint32_t ProxToAirDuration;
+    uint8_t* response;
+    size_t   response_n;
+    uint8_t* modulation;
+    size_t   modulation_n;
+    uint32_t ProxToAirDuration;
 } tag_response_info_t;
 //-----------------------------------------------------------------------------
 // ISO 14443B
 //-----------------------------------------------------------------------------
 typedef struct {
-	byte_t uid[10];
-	byte_t uidlen;
-	byte_t atqb[7];
-	byte_t chipid;
-	byte_t cid;
+    byte_t uid[10];
+    byte_t uidlen;
+    byte_t atqb[7];
+    byte_t chipid;
+    byte_t cid;
 } __attribute__((__packed__)) iso14b_card_select_t;
 
 typedef enum ISO14B_COMMAND {
-	ISO14B_CONNECT = 			(1 << 0),
-	ISO14B_DISCONNECT =			(1 << 1),
-	ISO14B_APDU = 				(1 << 2),
-	ISO14B_RAW =				(1 << 3),
-	ISO14B_REQUEST_TRIGGER =	(1 << 4),
-	ISO14B_APPEND_CRC =			(1 << 5),
-	ISO14B_SELECT_STD =			(1 << 6),
-	ISO14B_SELECT_SR =			(1 << 7)
+    ISO14B_CONNECT =         (1 << 0),
+    ISO14B_DISCONNECT =      (1 << 1),
+    ISO14B_APDU =            (1 << 2),
+    ISO14B_RAW =             (1 << 3),
+    ISO14B_REQUEST_TRIGGER = (1 << 4),
+    ISO14B_APPEND_CRC =      (1 << 5),
+    ISO14B_SELECT_STD =      (1 << 6),
+    ISO14B_SELECT_SR =       (1 << 7)
 } iso14b_command_t;
 
 typedef enum ISO15_COMMAND {
-	ISO15_CONNECT = 		(1 << 0),
-	ISO15_NO_DISCONNECT =	(1 << 1),
-	ISO15_RAW =				(1 << 2),
-	ISO15_APPEND_CRC =		(1 << 3),
-	ISO15_HIGH_SPEED =		(1 << 4),
-	ISO15_READ_RESPONSE =	(1 << 5)
+    ISO15_CONNECT =          (1 << 0),
+    ISO15_NO_DISCONNECT =    (1 << 1),
+    ISO15_RAW =              (1 << 2),
+    ISO15_APPEND_CRC =       (1 << 3),
+    ISO15_HIGH_SPEED =       (1 << 4),
+    ISO15_READ_RESPONSE =    (1 << 5)
 } iso15_command_t;
 
 //-----------------------------------------------------------------------------
 // "hf 14a sim x", "hf mf sim x" attacks
 //-----------------------------------------------------------------------------
 typedef struct {
-	uint32_t cuid;
-	uint32_t nonce;
-	uint32_t ar;
-	uint32_t nr;
-	uint32_t at;
-	uint32_t nonce2;
-	uint32_t ar2;
-	uint32_t nr2;
-	uint8_t  sector;
-	uint8_t  keytype;
-	enum {
-		EMPTY,
-		FIRST,
-		SECOND,
-	} state;
+    uint32_t cuid;
+    uint32_t nonce;
+    uint32_t ar;
+    uint32_t nr;
+    uint32_t at;
+    uint32_t nonce2;
+    uint32_t ar2;
+    uint32_t nr2;
+    uint8_t  sector;
+    uint8_t  keytype;
+    enum {
+        EMPTY,
+        FIRST,
+        SECOND,
+    } state;
 } nonces_t;
 
 //-----------------------------------------------------------------------------
 // ISO 7618  Smart Card
 //-----------------------------------------------------------------------------
 typedef struct {
-	uint8_t atr_len;
-	uint8_t atr[30];
+    uint8_t atr_len;
+    uint8_t atr[30];
 } __attribute__((__packed__)) smart_card_atr_t;
 
 typedef enum SMARTCARD_COMMAND {
-	SC_CONNECT = 			(1 << 0),
-	SC_NO_DISCONNECT =		(1 << 1),
-	SC_RAW =				(1 << 2),
-	SC_SELECT =				(1 << 3),
-	SC_RAW_T0 =				(1 << 4),
+    SC_CONNECT =             (1 << 0),
+    SC_NO_DISCONNECT =       (1 << 1),
+    SC_RAW =                 (1 << 2),
+    SC_SELECT =              (1 << 3),
+    SC_RAW_T0 =              (1 << 4),
 } smartcard_command_t;
 
 //-----------------------------------------------------------------------------
@@ -128,34 +128,34 @@ typedef enum SMARTCARD_COMMAND {
 // mc1 mc2 u1 u2 u3 u4 u5 u6
 // PMm  = Product manufacturer
 // icCode =
-//		ic1 = ROM
-//		ic2 = IC
+//    ic1 = ROM
+//    ic2 = IC
 // maximum response time =
-//		B3(request service)
-//		B4(request response)
-//		B5(authenticate)
-//		B6(read)
-//		B7(write)
-//		B8()
+//    B3(request service)
+//    B4(request response)
+//    B5(authenticate)
+//    B6(read)
+//    B7(write)
+//    B8()
 
 // ServiceCode  2bytes  (access-rights)
 // FileSystem = 1 Block = 16 bytes
 typedef struct {
-	uint8_t IDm[8];
-	uint8_t code[2];
-	uint8_t uid[6];
-	uint8_t PMm[8];
-	uint8_t iccode[2];
-	uint8_t mrt[6];
-	uint8_t servicecode[2];
+    uint8_t IDm[8];
+    uint8_t code[2];
+    uint8_t uid[6];
+    uint8_t PMm[8];
+    uint8_t iccode[2];
+    uint8_t mrt[6];
+    uint8_t servicecode[2];
 } __attribute__((__packed__)) felica_card_select_t;
 
 typedef enum FELICA_COMMAND {
-	FELICA_CONNECT = 			(1 << 0),
-	FELICA_NO_DISCONNECT =		(1 << 1),
-	FELICA_RAW =				(1 << 3),
-	FELICA_APPEND_CRC =			(1 << 5),
-	FELICA_NO_SELECT =			(1 << 6),
+    FELICA_CONNECT =         (1 << 0),
+    FELICA_NO_DISCONNECT =   (1 << 1),
+    FELICA_RAW =             (1 << 3),
+    FELICA_APPEND_CRC =      (1 << 5),
+    FELICA_NO_SELECT =       (1 << 6),
 } felica_command_t;
 
 #endif // _MIFARE_H_
diff --git a/include/proxmark3.h b/include/proxmark3.h
index 4b16f4eed..ff3a8dfde 100644
--- a/include/proxmark3.h
+++ b/include/proxmark3.h
@@ -16,56 +16,56 @@
 #include "config_gpio.h"
 #include "usb_cmd.h"
 
-#define WDT_HIT()								AT91C_BASE_WDTC->WDTC_WDCR = 0xa5000001
+#define WDT_HIT()                               AT91C_BASE_WDTC->WDTC_WDCR = 0xa5000001
 
-#define PWM_CH_MODE_PRESCALER(x)				((x) << 0)
-#define PWM_CHANNEL(x)							(1 << (x))
+#define PWM_CH_MODE_PRESCALER(x)                ((x) << 0)
+#define PWM_CHANNEL(x)                          (1 << (x))
 
-#define ADC_CHAN_LF								4
-#define ADC_CHAN_HF								5
-#define ADC_CHAN_HF_RDV40						7
-#define ADC_MODE_PRESCALE(x)					((x) << 8)
-#define ADC_MODE_STARTUP_TIME(x)				((x) << 16)
-#define ADC_MODE_SAMPLE_HOLD_TIME(x)			((x) << 24)
-#define ADC_CHANNEL(x)							(1 << (x))
-#define ADC_END_OF_CONVERSION(x)				(1 << (x))
+#define ADC_CHAN_LF                             4
+#define ADC_CHAN_HF                             5
+#define ADC_CHAN_HF_RDV40                       7
+#define ADC_MODE_PRESCALE(x)                    ((x) << 8)
+#define ADC_MODE_STARTUP_TIME(x)                ((x) << 16)
+#define ADC_MODE_SAMPLE_HOLD_TIME(x)            ((x) << 24)
+#define ADC_CHANNEL(x)                          (1 << (x))
+#define ADC_END_OF_CONVERSION(x)                (1 << (x))
 
-#define SSC_CLOCK_MODE_START(x)					((x) << 8)
-#define SSC_FRAME_MODE_WORDS_PER_TRANSFER(x)	((x) << 8)
-#define SSC_CLOCK_MODE_SELECT(x)				((x) << 0)
-#define SSC_FRAME_MODE_BITS_IN_WORD(x)			(((x)-1) << 0)
+#define SSC_CLOCK_MODE_START(x)                 ((x) << 8)
+#define SSC_FRAME_MODE_WORDS_PER_TRANSFER(x)    ((x) << 8)
+#define SSC_CLOCK_MODE_SELECT(x)                ((x) << 0)
+#define SSC_FRAME_MODE_BITS_IN_WORD(x)          (((x)-1) << 0)
 
-#define MC_FLASH_COMMAND_KEY					((0x5a) << 24)
-#define MC_FLASH_MODE_FLASH_WAIT_STATES(x)		((x) << 8)
-#define MC_FLASH_MODE_MASTER_CLK_IN_MHZ(x)		(((x)+((x)/2)) << 16)
-#define MC_FLASH_COMMAND_PAGEN(x)				((x) << 8)
+#define MC_FLASH_COMMAND_KEY                    ((0x5a) << 24)
+#define MC_FLASH_MODE_FLASH_WAIT_STATES(x)      ((x) << 8)
+#define MC_FLASH_MODE_MASTER_CLK_IN_MHZ(x)      (((x)+((x)/2)) << 16)
+#define MC_FLASH_COMMAND_PAGEN(x)               ((x) << 8)
 
-#define RST_CONTROL_KEY							(0xa5 << 24)
+#define RST_CONTROL_KEY                         (0xa5 << 24)
 
-#define PMC_MAIN_OSC_STARTUP_DELAY(x)			((x) << 8)
-#define PMC_PLL_DIVISOR(x)						(x)
-#define PMC_PLL_MULTIPLIER(x)					(((x)-1) << 16)
-#define PMC_PLL_COUNT_BEFORE_LOCK(x)			(((x) & 0x3F) << 8)		// 6bit register 0011 1111
-#define PMC_PLL_FREQUENCY_RANGE(x)				(((x) & 0x3) << 14)		// 2bit register
-#define PMC_PLL_USB_DIVISOR(x)					((x) << 28)
+#define PMC_MAIN_OSC_STARTUP_DELAY(x)           ((x) << 8)
+#define PMC_PLL_DIVISOR(x)                      (x)
+#define PMC_PLL_MULTIPLIER(x)                   (((x)-1) << 16)
+#define PMC_PLL_COUNT_BEFORE_LOCK(x)            (((x) & 0x3F) << 8)        // 6bit register 0011 1111
+#define PMC_PLL_FREQUENCY_RANGE(x)              (((x) & 0x3) << 14)        // 2bit register
+#define PMC_PLL_USB_DIVISOR(x)                  ((x) << 28)
 
-#define UDP_INTERRUPT_ENDPOINT(x)				(1 << (x))
-#define UDP_CSR_BYTES_RECEIVED(x)				(((x) >> 16) & 0x7ff)
+#define UDP_INTERRUPT_ENDPOINT(x)               (1 << (x))
+#define UDP_CSR_BYTES_RECEIVED(x)               (((x) >> 16) & 0x7ff)
 //**************************************************************
 
 
 
-#define LOW(x)	 AT91C_BASE_PIOA->PIO_CODR |= (x)
-#define HIGH(x)	 AT91C_BASE_PIOA->PIO_SODR |= (x)
+#define LOW(x)      AT91C_BASE_PIOA->PIO_CODR |= (x)
+#define HIGH(x)     AT91C_BASE_PIOA->PIO_SODR |= (x)
 
-#define GETBIT(x) (AT91C_BASE_PIOA->PIO_ODSR & (x)) ? 1:0
+#define GETBIT(x)   (AT91C_BASE_PIOA->PIO_ODSR & (x)) ? 1:0
 #define SETBIT(x, y) (y) ? (HIGH(x)):(LOW(x))
-#define INVBIT(x) SETBIT((x), !(GETBIT(x)))
+#define INVBIT(x)   SETBIT((x), !(GETBIT(x)))
 
 // Setup for SPI current modes
-#define SPI_FPGA_MODE	0
-#define SPI_LCD_MODE	1
-#define SPI_MEM_MODE	2
+#define SPI_FPGA_MODE   0
+#define SPI_LCD_MODE    1
+#define SPI_MEM_MODE    2
 
 #ifndef COTAG_BITS
 #define COTAG_BITS 264
@@ -73,25 +73,25 @@
 
 //#define PACKED __attribute__((__packed__))
 
-#define LED_A_ON()		HIGH(GPIO_LED_A)
-#define LED_A_OFF()		LOW(GPIO_LED_A)
-#define LED_A_INV()		INVBIT(GPIO_LED_A)
-#define LED_B_ON()		HIGH(GPIO_LED_B)
-#define LED_B_OFF()		LOW(GPIO_LED_B)
-#define LED_B_INV()		INVBIT(GPIO_LED_B)
-#define LED_C_ON()		HIGH(GPIO_LED_C)
-#define LED_C_OFF()		LOW(GPIO_LED_C)
-#define LED_C_INV()		INVBIT(GPIO_LED_C)
-#define LED_D_ON()		HIGH(GPIO_LED_D)
-#define LED_D_OFF()		LOW(GPIO_LED_D)
-#define LED_D_INV()		INVBIT(GPIO_LED_D)
+#define LED_A_ON()        HIGH(GPIO_LED_A)
+#define LED_A_OFF()       LOW(GPIO_LED_A)
+#define LED_A_INV()       INVBIT(GPIO_LED_A)
+#define LED_B_ON()        HIGH(GPIO_LED_B)
+#define LED_B_OFF()       LOW(GPIO_LED_B)
+#define LED_B_INV()       INVBIT(GPIO_LED_B)
+#define LED_C_ON()        HIGH(GPIO_LED_C)
+#define LED_C_OFF()       LOW(GPIO_LED_C)
+#define LED_C_INV()       INVBIT(GPIO_LED_C)
+#define LED_D_ON()        HIGH(GPIO_LED_D)
+#define LED_D_OFF()       LOW(GPIO_LED_D)
+#define LED_D_INV()       INVBIT(GPIO_LED_D)
 
 // SPI
-#define SCK_LOW         LOW(GPIO_SPCK)
-#define SCK_HIGH        HIGH(GPIO_SPCK)
-#define MOSI_HIGH       HIGH(GPIO_MOSI)
-#define MOSI_LOW        LOW(GPIO_MOSI)
-#define MISO_VALUE      (AT91C_BASE_PIOA->PIO_PDSR & GPIO_MISO)
+#define SCK_LOW           LOW(GPIO_SPCK)
+#define SCK_HIGH          HIGH(GPIO_SPCK)
+#define MOSI_HIGH         HIGH(GPIO_MOSI)
+#define MOSI_LOW          LOW(GPIO_MOSI)
+#define MISO_VALUE        (AT91C_BASE_PIOA->PIO_PDSR & GPIO_MISO)
 
 // fpga
 #define NCS_0_LOW         LOW(GPIO_NCS0)
@@ -101,35 +101,35 @@
 #define NCS_1_LOW         LOW(GPIO_NCS2)
 #define NCS_1_HIGH        HIGH(GPIO_NCS2)
 
-#define RELAY_ON()		HIGH(GPIO_RELAY)
-#define RELAY_OFF()		LOW(GPIO_RELAY)
-#define BUTTON_PRESS()	!((AT91C_BASE_PIOA->PIO_PDSR & GPIO_BUTTON) == GPIO_BUTTON)
+#define RELAY_ON()        HIGH(GPIO_RELAY)
+#define RELAY_OFF()       LOW(GPIO_RELAY)
+#define BUTTON_PRESS()    !((AT91C_BASE_PIOA->PIO_PDSR & GPIO_BUTTON) == GPIO_BUTTON)
 
 //NVDD goes LOW when USB is attached.
-#define USB_ATTACHED()	!((AT91C_BASE_PIOA->PIO_PDSR & GPIO_NVDD_ON) == GPIO_NVDD_ON)
+#define USB_ATTACHED()    !((AT91C_BASE_PIOA->PIO_PDSR & GPIO_NVDD_ON) == GPIO_NVDD_ON)
 
 #define VERSION_INFORMATION_MAGIC 0x56334d50
 struct version_information {
-	int magic; /* Magic sequence to identify this as a correct version information structure. Must be VERSION_INFORMATION_MAGIC */
-	char versionversion; /* Must be 1 */
-	char present; /* 1 if the version information could be created at compile time, otherwise 0 and the remaining fields (except for magic) are empty */
-	char clean; /* 1: Tree was clean, no local changes. 0: Tree was unclean. 2: Couldn't be determined */
-	char gitversion[50]; /* String with the git revision */
-	char buildtime[30]; /* string with the build time */
+    int magic; /* Magic sequence to identify this as a correct version information structure. Must be VERSION_INFORMATION_MAGIC */
+    char versionversion; /* Must be 1 */
+    char present; /* 1 if the version information could be created at compile time, otherwise 0 and the remaining fields (except for magic) are empty */
+    char clean; /* 1: Tree was clean, no local changes. 0: Tree was unclean. 2: Couldn't be determined */
+    char gitversion[50]; /* String with the git revision */
+    char buildtime[30]; /* string with the build time */
 } __attribute__((packed));
 
 #define COMMON_AREA_MAGIC 0x43334d50
 #define COMMON_AREA_COMMAND_NONE 0
 #define COMMON_AREA_COMMAND_ENTER_FLASH_MODE 1
 struct common_area {
-	int magic; /* Magic sequence, to distinguish against random uninitialized memory */
-	char version; /* Must be 1 */
-	char command;
-	struct {
-		unsigned int bootrom_present:1; /* Set when a bootrom that is capable of parsing the common area is present */
-		unsigned int osimage_present:1; /* Set when a osimage that is capable of parsing the common area is present */
-	} __attribute__((packed)) flags;
-	int arg1, arg2;
+    int magic; /* Magic sequence, to distinguish against random uninitialized memory */
+    char version; /* Must be 1 */
+    char command;
+    struct {
+        unsigned int bootrom_present:1; /* Set when a bootrom that is capable of parsing the common area is present */
+        unsigned int osimage_present:1; /* Set when a osimage that is capable of parsing the common area is present */
+    } __attribute__((packed)) flags;
+    int arg1, arg2;
 } __attribute__((packed));
 
 #endif
diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index 0680b443a..2e2526bf3 100644
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -36,19 +36,19 @@ typedef struct {
 } PACKED UsbCommand;
 // A struct used to send sample-configs over USB
 typedef struct{
-	uint8_t decimation;
-	uint8_t bits_per_sample;
-	bool averaging;
-	int divisor;
-	int trigger_threshold;
+    uint8_t decimation;
+    uint8_t bits_per_sample;
+    bool averaging;
+    int divisor;
+    int trigger_threshold;
 } sample_config;
 
 typedef struct{
-	uint16_t start_gap;
-	uint16_t write_gap;
-	uint16_t write_0;
-	uint16_t write_1;
-	uint16_t read_gap;
+    uint16_t start_gap;
+    uint16_t write_gap;
+    uint16_t write_0;
+    uint16_t write_1;
+    uint16_t read_gap;
 } t55xx_config;
 
 // For the bootloader
@@ -69,35 +69,35 @@ typedef struct{
 #define CMD_BUFF_CLEAR                                                    0x0105
 #define CMD_READ_MEM                                                      0x0106
 #define CMD_VERSION                                                       0x0107
-#define CMD_STATUS														  0x0108
-#define CMD_PING														  0x0109
+#define CMD_STATUS                                                        0x0108
+#define CMD_PING                                                          0x0109
 
-#define CMD_DOWNLOAD_EML_BIGBUF											  0x0110
-#define CMD_DOWNLOADED_EML_BIGBUF										  0x0111
+#define CMD_DOWNLOAD_EML_BIGBUF                                           0x0110
+#define CMD_DOWNLOADED_EML_BIGBUF                                         0x0111
 
 
 
 
 // RDV40, Flash memory operations
-#define CMD_FLASHMEM_READ												  0x0120
-#define CMD_FLASHMEM_WRITE												  0x0121
-#define CMD_FLASHMEM_WIPE												  0x0122
-#define CMD_FLASHMEM_DOWNLOAD											  0x0123
-#define CMD_FLASHMEM_DOWNLOADED											  0x0124
-#define CMD_FLASHMEM_INFO												  0x0125
+#define CMD_FLASHMEM_READ                                                 0x0120
+#define CMD_FLASHMEM_WRITE                                                0x0121
+#define CMD_FLASHMEM_WIPE                                                 0x0122
+#define CMD_FLASHMEM_DOWNLOAD                                             0x0123
+#define CMD_FLASHMEM_DOWNLOADED                                           0x0124
+#define CMD_FLASHMEM_INFO                                                 0x0125
 #define CMD_FLASHMEM_SET_SPIBAUDRATE                                      0x0126
 
 // RDV40,  Smart card operations
-#define CMD_SMART_RAW													  0x0140
-#define CMD_SMART_UPGRADE												  0x0141
-#define CMD_SMART_UPLOAD												  0x0142
-#define CMD_SMART_ATR													  0x0143
-#define CMD_SMART_SETBAUD												  0x0144
-#define CMD_SMART_SETCLOCK												  0x0145
+#define CMD_SMART_RAW                                                     0x0140
+#define CMD_SMART_UPGRADE                                                 0x0141
+#define CMD_SMART_UPLOAD                                                  0x0142
+#define CMD_SMART_ATR                                                     0x0143
+#define CMD_SMART_SETBAUD                                                 0x0144
+#define CMD_SMART_SETCLOCK                                                0x0145
 
 // RDV40,  FPC serial
-#define CMD_FPC_SEND													  0x0160
-#define CMD_FPC_READ													  0x0161
+#define CMD_FPC_SEND                                                      0x0160
+#define CMD_FPC_READ                                                      0x0161
 
 // For low-frequency tags
 #define CMD_READ_TI_TYPE                                                  0x0202
@@ -136,9 +136,9 @@ typedef struct{
 #define CMD_PSK_SIM_TAG                                                   0x0220
 #define CMD_AWID_DEMOD_FSK                                                0x0221
 #define CMD_VIKING_CLONE_TAG                                              0x0222
-#define CMD_T55XX_WAKEUP	                                              0x0224
-#define CMD_COTAG														  0x0225
-#define CMD_SET_LF_T55XX_CONFIG											  0x0226
+#define CMD_T55XX_WAKEUP                                                  0x0224
+#define CMD_COTAG                                                         0x0225
+#define CMD_SET_LF_T55XX_CONFIG                                           0x0226
 
 #define CMD_T55XX_CHKPWDS                                                 0x0230
 
@@ -162,13 +162,13 @@ typedef struct{
 #define CMD_READER_HITAG                                                  0x0372
 
 // For HitagS
-#define CMD_TEST_HITAGS_TRACES											  0x0367
-#define CMD_SIMULATE_HITAG_S											  0x0368
-#define CMD_READ_HITAG_S												  0x0373
-#define CMD_WR_HITAG_S													  0x0375
-#define CMD_EMU_HITAG_S													  0x0376
+#define CMD_TEST_HITAGS_TRACES                                            0x0367
+#define CMD_SIMULATE_HITAG_S                                              0x0368
+#define CMD_READ_HITAG_S                                                  0x0373
+#define CMD_WR_HITAG_S                                                    0x0375
+#define CMD_EMU_HITAG_S                                                   0x0376
 
-#define CMD_ANTIFUZZ_ISO_14443a											  0x0380
+#define CMD_ANTIFUZZ_ISO_14443a                                           0x0380
 #define CMD_SIMULATE_TAG_ISO_14443B                                       0x0381
 #define CMD_SNOOP_ISO_14443B                                              0x0382
 
@@ -185,9 +185,9 @@ typedef struct{
 #define CMD_EPA_PACE_COLLECT_NONCE                                        0x038A
 #define CMD_EPA_PACE_REPLAY                                               0x038B
 
-#define CMD_LEGIC_INFO													  0x03BC
-#define CMD_LEGIC_ESET													  0x03BD
-#define CMD_LEGIC_EGET													  0x03BE
+#define CMD_LEGIC_INFO                                                    0x03BC
+#define CMD_LEGIC_ESET                                                    0x03BD
+#define CMD_LEGIC_EGET                                                    0x03BE
 
 #define CMD_ICLASS_READCHECK                                              0x038F
 #define CMD_ICLASS_CLONE                                                  0x0390
@@ -236,19 +236,19 @@ typedef struct{
 #define CMD_READER_MIFARE                                                 0x0611
 #define CMD_MIFARE_NESTED                                                 0x0612
 #define CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES                               0x0613
-#define CMD_MIFARE_ACQUIRE_NONCES										  0x0614
+#define CMD_MIFARE_ACQUIRE_NONCES                                         0x0614
 
 #define CMD_MIFARE_READBL                                                 0x0620
 #define CMD_MIFAREU_READBL                                                0x0720
 #define CMD_MIFARE_READSC                                                 0x0621
 #define CMD_MIFAREU_READCARD                                              0x0721
 #define CMD_MIFARE_WRITEBL                                                0x0622
-#define CMD_MIFAREU_WRITEBL						                          0x0722
-#define CMD_MIFAREU_WRITEBL_COMPAT					                      0x0723
+#define CMD_MIFAREU_WRITEBL                                               0x0722
+#define CMD_MIFAREU_WRITEBL_COMPAT                                        0x0723
 
 #define CMD_MIFARE_CHKKEYS                                                0x0623
 #define CMD_MIFARE_SETMOD                                                 0x0624
-#define CMD_MIFARE_CHKKEYS_FAST											  0x0625
+#define CMD_MIFARE_CHKKEYS_FAST                                           0x0625
 
 #define CMD_MIFARE_SNIFFER                                                0x0630
 //ultralightC
@@ -265,8 +265,8 @@ typedef struct{
 #define CMD_MIFARE_DESFIRE_INFO                                           0x072d
 #define CMD_MIFARE_DESFIRE                                                0x072e
 
-#define CMD_MIFARE_COLLECT_NONCES										  0x072f
-#define CMD_MIFARE_NACK_DETECT											  0x0730
+#define CMD_MIFARE_COLLECT_NONCES                                         0x072f
+#define CMD_MIFARE_NACK_DETECT                                            0x0730
 
 #define CMD_HF_SNIFFER                                                    0x0800
 
@@ -284,46 +284,46 @@ typedef struct{
 #define CMD_UNKNOWN                                                       0xFFFF
 
 //Mifare simulation flags
-#define FLAG_INTERACTIVE		0x01
-#define FLAG_4B_UID_IN_DATA 	0x02
-#define FLAG_7B_UID_IN_DATA 	0x04
-#define FLAG_10B_UID_IN_DATA 	0x08
-#define FLAG_UID_IN_EMUL		0x10
-#define FLAG_NR_AR_ATTACK 		0x20
-//#define FLAG_RANDOM_NONCE		0x40
+#define FLAG_INTERACTIVE        0x01
+#define FLAG_4B_UID_IN_DATA     0x02
+#define FLAG_7B_UID_IN_DATA     0x04
+#define FLAG_10B_UID_IN_DATA    0x08
+#define FLAG_UID_IN_EMUL        0x10
+#define FLAG_NR_AR_ATTACK       0x20
+//#define FLAG_RANDOM_NONCE       0x40
 
 //Iclass reader flags
-#define FLAG_ICLASS_READER_ONLY_ONCE	0x01
-#define FLAG_ICLASS_READER_CC			0x02
-#define FLAG_ICLASS_READER_CSN			0x04
-#define FLAG_ICLASS_READER_CONF			0x08
-#define FLAG_ICLASS_READER_AIA			0x10
-#define FLAG_ICLASS_READER_ONE_TRY      0x20
-#define FLAG_ICLASS_READER_CEDITKEY     0x40
+#define FLAG_ICLASS_READER_ONLY_ONCE   0x01
+#define FLAG_ICLASS_READER_CC          0x02
+#define FLAG_ICLASS_READER_CSN         0x04
+#define FLAG_ICLASS_READER_CONF        0x08
+#define FLAG_ICLASS_READER_AIA         0x10
+#define FLAG_ICLASS_READER_ONE_TRY     0x20
+#define FLAG_ICLASS_READER_CEDITKEY    0x40
 
 // Dbprintf flags
-#define FLAG_RAWPRINT	0x0111
-#define FLAG_NOOPT		0x0000
-#define FLAG_NOLOG		0x0001
-#define FLAG_NONEWLINE	0x0010
-#define FLAG_NOPROMPT	0x0100
+#define FLAG_RAWPRINT    0x0111
+#define FLAG_NOOPT       0x0000
+#define FLAG_NOLOG       0x0001
+#define FLAG_NONEWLINE   0x0010
+#define FLAG_NOPROMPT    0x0100
 
 
 // CMD_DEVICE_INFO response packet has flags in arg[0], flag definitions:
 /* Whether a bootloader that understands the common_area is present */
-#define DEVICE_INFO_FLAG_BOOTROM_PRESENT         	(1<<0)
+#define DEVICE_INFO_FLAG_BOOTROM_PRESENT             (1<<0)
 
 /* Whether a osimage that understands the common_area is present */
-#define DEVICE_INFO_FLAG_OSIMAGE_PRESENT         	(1<<1)
+#define DEVICE_INFO_FLAG_OSIMAGE_PRESENT             (1<<1)
 
 /* Set if the bootloader is currently executing */
-#define DEVICE_INFO_FLAG_CURRENT_MODE_BOOTROM    	(1<<2)
+#define DEVICE_INFO_FLAG_CURRENT_MODE_BOOTROM        (1<<2)
 
 /* Set if the OS is currently executing */
-#define DEVICE_INFO_FLAG_CURRENT_MODE_OS         	(1<<3)
+#define DEVICE_INFO_FLAG_CURRENT_MODE_OS             (1<<3)
 
 /* Set if this device understands the extend start flash command */
-#define DEVICE_INFO_FLAG_UNDERSTANDS_START_FLASH 	(1<<4)
+#define DEVICE_INFO_FLAG_UNDERSTANDS_START_FLASH     (1<<4)
 
 /* CMD_START_FLASH may have three arguments: start of area to flash,
    end of area to flash, optional magic.

From 23f1a253a71fbb79b239e4d1e34270b08ad5ce43 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 9 Mar 2019 19:19:50 +0100
Subject: [PATCH 0707/1938] common: fix mix of spaces & tabs

---
 common/bucketsort.c      |   76 +-
 common/bucketsort.h      |   16 +-
 common/cmd.c             |   42 +-
 common/crapto1/crapto1.c |  644 ++++----
 common/crapto1/crapto1.h |   34 +-
 common/crapto1/crypto1.c |  194 +--
 common/crc.c             |  146 +-
 common/crc.h             |   40 +-
 common/crc16.c           |  252 ++--
 common/crc16.h           |   22 +-
 common/crc64.c           |   12 +-
 common/default_version.c |   10 +-
 common/desfire.h         |  132 +-
 common/i2c.c             | 1056 ++++++-------
 common/i2c.h             |   18 +-
 common/iso14443crc.c     |   14 +-
 common/iso15693tools.c   |   22 +-
 common/iso15693tools.h   |  166 +-
 common/ldscript.common   |   12 +-
 common/legic_prng.c      |   48 +-
 common/lfdemod.c         | 3072 +++++++++++++++++++-------------------
 common/lfdemod.h         |   20 +-
 common/parity.h          |   20 +-
 common/prng.c            |    8 +-
 common/prng.h            |    8 +-
 common/protocols.c       |  202 +--
 common/protocols.h       |  766 +++++-----
 common/random.c          |   12 +-
 common/tea.c             |   74 +-
 common/usart.c           |   92 +-
 common/usb_cdc.c         | 1172 +++++++--------
 common/wiegand.c         |  244 +--
 32 files changed, 4323 insertions(+), 4323 deletions(-)

diff --git a/common/bucketsort.c b/common/bucketsort.c
index 162869e38..c42b8673f 100644
--- a/common/bucketsort.c
+++ b/common/bucketsort.c
@@ -1,47 +1,47 @@
 #include "bucketsort.h"
 
 extern void bucket_sort_intersect(uint32_t* const estart, uint32_t* const estop,
-								  uint32_t* const ostart, uint32_t* const ostop,
-								  bucket_info_t *bucket_info, bucket_array_t bucket)
+                                  uint32_t* const ostart, uint32_t* const ostop,
+                                  bucket_info_t *bucket_info, bucket_array_t bucket)
 {
-	uint32_t *p1, *p2;
-	uint32_t *start[2];
-	uint32_t *stop[2];
+    uint32_t *p1, *p2;
+    uint32_t *start[2];
+    uint32_t *stop[2];
 
-	start[0] = estart;
-	stop[0] = estop;
-	start[1] = ostart;
-	stop[1] = ostop;
+    start[0] = estart;
+    stop[0] = estop;
+    start[1] = ostart;
+    stop[1] = ostop;
 
-	// init buckets to be empty
-	for (uint32_t i = 0; i < 2; i++) {
-		for (uint32_t j = 0x00; j <= 0xff; j++) {
-			bucket[i][j].bp = bucket[i][j].head;
-		}
-	}
+    // init buckets to be empty
+    for (uint32_t i = 0; i < 2; i++) {
+        for (uint32_t j = 0x00; j <= 0xff; j++) {
+            bucket[i][j].bp = bucket[i][j].head;
+        }
+    }
 
-	// sort the lists into the buckets based on the MSB (contribution bits)
-	for (uint32_t i = 0; i < 2; i++) {
-		for (p1 = start[i]; p1 <= stop[i]; p1++) {
-			uint32_t bucket_index = (*p1 & 0xff000000) >> 24;
-			*(bucket[i][bucket_index].bp++) = *p1;
-		}
-	}
+    // sort the lists into the buckets based on the MSB (contribution bits)
+    for (uint32_t i = 0; i < 2; i++) {
+        for (p1 = start[i]; p1 <= stop[i]; p1++) {
+            uint32_t bucket_index = (*p1 & 0xff000000) >> 24;
+            *(bucket[i][bucket_index].bp++) = *p1;
+        }
+    }
 
-	// write back intersecting buckets as sorted list.
-	// fill in bucket_info with head and tail of the bucket contents in the list and number of non-empty buckets.
-	uint32_t nonempty_bucket;
-	for (uint32_t i = 0; i < 2; i++) {
-		p1 = start[i];
-		nonempty_bucket = 0;
-		for (uint32_t j = 0x00; j <= 0xff; j++) {
-			if (bucket[0][j].bp != bucket[0][j].head && bucket[1][j].bp != bucket[1][j].head) { // non-empty intersecting buckets only
-				bucket_info->bucket_info[i][nonempty_bucket].head = p1;
-				for (p2 = bucket[i][j].head; p2 < bucket[i][j].bp; *p1++ = *p2++);
-				bucket_info->bucket_info[i][nonempty_bucket].tail = p1 - 1;
-				nonempty_bucket++;
-			}
-		}
-		bucket_info->numbuckets = nonempty_bucket;
-	}
+    // write back intersecting buckets as sorted list.
+    // fill in bucket_info with head and tail of the bucket contents in the list and number of non-empty buckets.
+    uint32_t nonempty_bucket;
+    for (uint32_t i = 0; i < 2; i++) {
+        p1 = start[i];
+        nonempty_bucket = 0;
+        for (uint32_t j = 0x00; j <= 0xff; j++) {
+            if (bucket[0][j].bp != bucket[0][j].head && bucket[1][j].bp != bucket[1][j].head) { // non-empty intersecting buckets only
+                bucket_info->bucket_info[i][nonempty_bucket].head = p1;
+                for (p2 = bucket[i][j].head; p2 < bucket[i][j].bp; *p1++ = *p2++);
+                bucket_info->bucket_info[i][nonempty_bucket].tail = p1 - 1;
+                nonempty_bucket++;
+            }
+        }
+        bucket_info->numbuckets = nonempty_bucket;
+    }
 }
diff --git a/common/bucketsort.h b/common/bucketsort.h
index be504508a..30da87f2c 100644
--- a/common/bucketsort.h
+++ b/common/bucketsort.h
@@ -5,20 +5,20 @@
 #include <stdlib.h>
 
 typedef struct bucket {
-	uint32_t *head;
-	uint32_t *bp;
+    uint32_t *head;
+    uint32_t *bp;
 } bucket_t;
 
 typedef bucket_t bucket_array_t[2][0x100];
 
 typedef struct bucket_info {
-	struct {
-		uint32_t *head, *tail;
-		} bucket_info[2][0x100];
-		uint32_t numbuckets;
+    struct {
+        uint32_t *head, *tail;
+        } bucket_info[2][0x100];
+        uint32_t numbuckets;
 } bucket_info_t;
 
 void bucket_sort_intersect(uint32_t* const estart, uint32_t* const estop,
-								  uint32_t* const ostart, uint32_t* const ostop,
-								  bucket_info_t *bucket_info, bucket_array_t bucket);
+                                  uint32_t* const ostart, uint32_t* const ostop,
+                                  bucket_info_t *bucket_info, bucket_array_t bucket);
 #endif
\ No newline at end of file
diff --git a/common/cmd.c b/common/cmd.c
index ebeaf4f7c..bc042b068 100644
--- a/common/cmd.c
+++ b/common/cmd.c
@@ -32,33 +32,33 @@
 #include "cmd.h"
 
 uint8_t cmd_send(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void* data, size_t len) {
-	UsbCommand txcmd;
+    UsbCommand txcmd;
 
-	for (size_t i=0; i < sizeof(UsbCommand); i++)
-		((uint8_t*)&txcmd)[i] = 0x00;
+    for (size_t i=0; i < sizeof(UsbCommand); i++)
+        ((uint8_t*)&txcmd)[i] = 0x00;
 
-	// Compose the outgoing command frame
-	txcmd.cmd = cmd;
-	txcmd.arg[0] = arg0;
-	txcmd.arg[1] = arg1;
-	txcmd.arg[2] = arg2;
+    // Compose the outgoing command frame
+    txcmd.cmd = cmd;
+    txcmd.arg[0] = arg0;
+    txcmd.arg[1] = arg1;
+    txcmd.arg[2] = arg2;
 
-	// Add the (optional) content to the frame, with a maximum size of USB_CMD_DATA_SIZE
-	if (data && len) {
-		len = MIN(len, USB_CMD_DATA_SIZE);
-		for (size_t i=0; i<len; i++) {
-			txcmd.d.asBytes[i] = ((uint8_t*)data)[i];
-		}
-	}
+    // Add the (optional) content to the frame, with a maximum size of USB_CMD_DATA_SIZE
+    if (data && len) {
+        len = MIN(len, USB_CMD_DATA_SIZE);
+        for (size_t i=0; i<len; i++) {
+            txcmd.d.asBytes[i] = ((uint8_t*)data)[i];
+        }
+    }
 
-	uint32_t sendlen = 0;
-	// Send frame and make sure all bytes are transmitted
-	sendlen = usb_write( (uint8_t*)&txcmd, sizeof(UsbCommand) );
+    uint32_t sendlen = 0;
+    // Send frame and make sure all bytes are transmitted
+    sendlen = usb_write( (uint8_t*)&txcmd, sizeof(UsbCommand) );
 
 #ifdef WITH_FPC
-//	usart_init();
-//	usart_writebuffer( (uint8_t*)&txcmd, sizeof(UsbCommand) );
+// usart_init();
+// usart_writebuffer( (uint8_t*)&txcmd, sizeof(UsbCommand) );
 #endif
 
-	return sendlen;
+    return sendlen;
 }
\ No newline at end of file
diff --git a/common/crapto1/crapto1.c b/common/crapto1/crapto1.c
index f0b37dbae..67b4f5651 100644
--- a/common/crapto1/crapto1.c
+++ b/common/crapto1/crapto1.c
@@ -1,19 +1,19 @@
 /*  crapto1.c
 
-	This program is free software; you can redistribute it and/or
-	modify it under the terms of the GNU General Public License
-	as published by the Free Software Foundation; either version 2
-	of the License, or (at your option) any later version.
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License
+    as published by the Free Software Foundation; either version 2
+    of the License, or (at your option) any later version.
 
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 51 Franklin Street, Fifth Floor,
-	Boston, MA  02110-1301, US$
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA  02110-1301, US$
 
     Copyright (C) 2008-2014 bla <blapost@gmail.com>
 */
@@ -26,9 +26,9 @@
 static uint8_t filterlut[1 << 20];
 static void __attribute__((constructor)) fill_lut()
 {
-		uint32_t i;
-		for(i = 0; i < 1 << 20; ++i)
-				filterlut[i] = filter(i);
+        uint32_t i;
+        for(i = 0; i < 1 << 20; ++i)
+                filterlut[i] = filter(i);
 }
 #define filter(x) (filterlut[(x) & 0xfffff])
 #endif
@@ -38,11 +38,11 @@ static void __attribute__((constructor)) fill_lut()
  */
 static inline void update_contribution(uint32_t *item, const uint32_t mask1, const uint32_t mask2)
 {
-	uint32_t p = *item >> 25;
+    uint32_t p = *item >> 25;
 
-	p = p << 1 | evenparity32(*item & mask1);
-	p = p << 1 | evenparity32(*item & mask2);
-	*item = p << 24 | (*item & 0xffffff);
+    p = p << 1 | evenparity32(*item & mask1);
+    p = p << 1 | evenparity32(*item & mask2);
+    *item = p << 24 | (*item & 0xffffff);
 }
 
 /** extend_table
@@ -50,83 +50,83 @@ static inline void update_contribution(uint32_t *item, const uint32_t mask1, con
  */
 static inline void extend_table(uint32_t *tbl, uint32_t **end, int bit, int m1, int m2, uint32_t in)
 {
-	in <<= 24;
-	for(*tbl <<= 1; tbl <= *end; *++tbl <<= 1)
-		if(filter(*tbl) ^ filter(*tbl | 1)) {
-			*tbl |= filter(*tbl) ^ bit;
-			update_contribution(tbl, m1, m2);
-			*tbl ^= in;
-		} else if(filter(*tbl) == bit) {
-			*++*end = tbl[1];
-			tbl[1] = tbl[0] | 1;
-			update_contribution(tbl, m1, m2);
-			*tbl++ ^= in;
-			update_contribution(tbl, m1, m2);
-			*tbl ^= in;
-		} else
-			*tbl-- = *(*end)--;
+    in <<= 24;
+    for(*tbl <<= 1; tbl <= *end; *++tbl <<= 1)
+        if(filter(*tbl) ^ filter(*tbl | 1)) {
+            *tbl |= filter(*tbl) ^ bit;
+            update_contribution(tbl, m1, m2);
+            *tbl ^= in;
+        } else if(filter(*tbl) == bit) {
+            *++*end = tbl[1];
+            tbl[1] = tbl[0] | 1;
+            update_contribution(tbl, m1, m2);
+            *tbl++ ^= in;
+            update_contribution(tbl, m1, m2);
+            *tbl ^= in;
+        } else
+            *tbl-- = *(*end)--;
 }
 /** extend_table_simple
  * using a bit of the keystream extend the table of possible lfsr states
  */
 static inline void extend_table_simple(uint32_t *tbl, uint32_t **end, int bit)
 {
-	for(*tbl <<= 1; tbl <= *end; *++tbl <<= 1) {
-		if(filter(*tbl) ^ filter(*tbl | 1)) {	// replace
-			*tbl |= filter(*tbl) ^ bit;
-		} else if(filter(*tbl) == bit) {		// insert
-			*++*end = *++tbl;
-			*tbl = tbl[-1] | 1;
-		} else	{								// drop
-			*tbl-- = *(*end)--;
+    for(*tbl <<= 1; tbl <= *end; *++tbl <<= 1) {
+        if(filter(*tbl) ^ filter(*tbl | 1)) { // replace
+            *tbl |= filter(*tbl) ^ bit;
+        } else if(filter(*tbl) == bit) {      // insert
+            *++*end = *++tbl;
+            *tbl = tbl[-1] | 1;
+        } else {                              // drop
+            *tbl-- = *(*end)--;
 }
-	}
+    }
 }
 /** recover
  * recursively narrow down the search space, 4 bits of keystream at a time
  */
 static struct Crypto1State*
 recover(uint32_t *o_head, uint32_t *o_tail, uint32_t oks,
-	uint32_t *e_head, uint32_t *e_tail, uint32_t eks, int rem,
-	struct Crypto1State *sl, uint32_t in, bucket_array_t bucket)
+    uint32_t *e_head, uint32_t *e_tail, uint32_t eks, int rem,
+    struct Crypto1State *sl, uint32_t in, bucket_array_t bucket)
 {
-	uint32_t *o, *e;
-	bucket_info_t bucket_info;
+    uint32_t *o, *e;
+    bucket_info_t bucket_info;
 
-	if(rem == -1) {
-		for(e = e_head; e <= e_tail; ++e) {
-			*e = *e << 1 ^ evenparity32(*e & LF_POLY_EVEN) ^ !!(in & 4);
-			for(o = o_head; o <= o_tail; ++o, ++sl) {
-				sl->even = *o;
-				sl->odd = *e ^ evenparity32(*o & LF_POLY_ODD);
-				sl[1].odd = sl[1].even = 0;
-			}
-		}
-		return sl;
-	}
+    if(rem == -1) {
+        for(e = e_head; e <= e_tail; ++e) {
+            *e = *e << 1 ^ evenparity32(*e & LF_POLY_EVEN) ^ !!(in & 4);
+            for(o = o_head; o <= o_tail; ++o, ++sl) {
+                sl->even = *o;
+                sl->odd = *e ^ evenparity32(*o & LF_POLY_ODD);
+                sl[1].odd = sl[1].even = 0;
+            }
+        }
+        return sl;
+    }
 
-	for(uint32_t i = 0; i < 4 && rem--; i++) {
-		oks >>= 1;
-		eks >>= 1;
-		in >>= 2;
-		extend_table(o_head, &o_tail, oks & 1, LF_POLY_EVEN << 1 | 1, LF_POLY_ODD << 1, 0);
-		if(o_head > o_tail)
-			return sl;
+    for(uint32_t i = 0; i < 4 && rem--; i++) {
+        oks >>= 1;
+        eks >>= 1;
+        in >>= 2;
+        extend_table(o_head, &o_tail, oks & 1, LF_POLY_EVEN << 1 | 1, LF_POLY_ODD << 1, 0);
+        if(o_head > o_tail)
+            return sl;
 
-		extend_table(e_head, &e_tail, eks & 1, LF_POLY_ODD, LF_POLY_EVEN << 1 | 1, in & 3);
-		if(e_head > e_tail)
-			return sl;
-	}
+        extend_table(e_head, &e_tail, eks & 1, LF_POLY_ODD, LF_POLY_EVEN << 1 | 1, in & 3);
+        if(e_head > e_tail)
+            return sl;
+    }
 
-	bucket_sort_intersect(e_head, e_tail, o_head, o_tail, &bucket_info, bucket);
+    bucket_sort_intersect(e_head, e_tail, o_head, o_tail, &bucket_info, bucket);
 
-	for (int i = bucket_info.numbuckets - 1; i >= 0; i--) {
-		sl = recover(bucket_info.bucket_info[1][i].head, bucket_info.bucket_info[1][i].tail, oks,
-					 bucket_info.bucket_info[0][i].head, bucket_info.bucket_info[0][i].tail, eks,
-					 rem, sl, in, bucket);
-	}
+    for (int i = bucket_info.numbuckets - 1; i >= 0; i--) {
+        sl = recover(bucket_info.bucket_info[1][i].head, bucket_info.bucket_info[1][i].tail, oks,
+                     bucket_info.bucket_info[0][i].head, bucket_info.bucket_info[0][i].tail, eks,
+                     rem, sl, in, bucket);
+    }
 
-	return sl;
+    return sl;
 }
 /** lfsr_recovery
  * recover the state of the lfsr given 32 bits of the keystream
@@ -135,87 +135,87 @@ recover(uint32_t *o_head, uint32_t *o_tail, uint32_t oks,
  */
 struct Crypto1State* lfsr_recovery32(uint32_t ks2, uint32_t in)
 {
-	struct Crypto1State *statelist;
-	uint32_t *odd_head = 0, *odd_tail = 0, oks = 0;
-	uint32_t *even_head = 0, *even_tail = 0, eks = 0;
-	int i;
+    struct Crypto1State *statelist;
+    uint32_t *odd_head = 0, *odd_tail = 0, oks = 0;
+    uint32_t *even_head = 0, *even_tail = 0, eks = 0;
+    int i;
 
-	// split the keystream into an odd and even part
-	for (i = 31; i >= 0; i -= 2)
-		oks = oks << 1 | BEBIT(ks2, i);
-	for (i = 30; i >= 0; i -= 2)
- 		eks = eks << 1 | BEBIT(ks2, i);
+    // split the keystream into an odd and even part
+    for (i = 31; i >= 0; i -= 2)
+        oks = oks << 1 | BEBIT(ks2, i);
+    for (i = 30; i >= 0; i -= 2)
+        eks = eks << 1 | BEBIT(ks2, i);
 
-	odd_head = odd_tail = malloc(sizeof(uint32_t) << 21);
-	even_head = even_tail = malloc(sizeof(uint32_t) << 21);
-	statelist =  malloc(sizeof(struct Crypto1State) << 18);
-	if (!odd_tail-- || !even_tail-- || !statelist) {
-		free(statelist);
-		statelist = 0;
-		goto out;
-	}
+    odd_head = odd_tail = malloc(sizeof(uint32_t) << 21);
+    even_head = even_tail = malloc(sizeof(uint32_t) << 21);
+    statelist =  malloc(sizeof(struct Crypto1State) << 18);
+    if (!odd_tail-- || !even_tail-- || !statelist) {
+        free(statelist);
+        statelist = 0;
+        goto out;
+    }
 
-	statelist->odd = statelist->even = 0;
+    statelist->odd = statelist->even = 0;
 
-	// allocate memory for out of place bucket_sort
-	bucket_array_t bucket;
+    // allocate memory for out of place bucket_sort
+    bucket_array_t bucket;
 
-	for (uint32_t i = 0; i < 2; i++) {
-		for (uint32_t j = 0; j <= 0xff; j++) {
-			bucket[i][j].head = malloc(sizeof(uint32_t) << 14);
-			if (!bucket[i][j].head) {
-				goto out;
-			}
-		}
-	}
+    for (uint32_t i = 0; i < 2; i++) {
+        for (uint32_t j = 0; j <= 0xff; j++) {
+            bucket[i][j].head = malloc(sizeof(uint32_t) << 14);
+            if (!bucket[i][j].head) {
+                goto out;
+            }
+        }
+    }
 
-	// initialize statelists: add all possible states which would result into the rightmost 2 bits of the keystream
-	for(i = 1 << 20; i >= 0; --i) {
-		if(filter(i) == (oks & 1))
-			*++odd_tail = i;
-		if(filter(i) == (eks & 1))
-			*++even_tail = i;
-	}
+    // initialize statelists: add all possible states which would result into the rightmost 2 bits of the keystream
+    for(i = 1 << 20; i >= 0; --i) {
+        if(filter(i) == (oks & 1))
+            *++odd_tail = i;
+        if(filter(i) == (eks & 1))
+            *++even_tail = i;
+    }
 
-	// extend the statelists. Look at the next 8 Bits of the keystream (4 Bit each odd and even):
-	for(i = 0; i < 4; i++) {
-		extend_table_simple(odd_head,  &odd_tail, (oks >>= 1) & 1);
-		extend_table_simple(even_head, &even_tail, (eks >>= 1) & 1);
-	}
+    // extend the statelists. Look at the next 8 Bits of the keystream (4 Bit each odd and even):
+    for(i = 0; i < 4; i++) {
+        extend_table_simple(odd_head,  &odd_tail, (oks >>= 1) & 1);
+        extend_table_simple(even_head, &even_tail, (eks >>= 1) & 1);
+    }
 
-	// the statelists now contain all states which could have generated the last 10 Bits of the keystream.
-	// 22 bits to go to recover 32 bits in total. From now on, we need to take the "in"
-	// parameter into account.
-	in = (in >> 16 & 0xff) | (in << 16) | (in & 0xff00);		// Byte swapping
-	recover(odd_head, odd_tail, oks, even_head, even_tail, eks, 11, statelist, in << 1, bucket);
+    // the statelists now contain all states which could have generated the last 10 Bits of the keystream.
+    // 22 bits to go to recover 32 bits in total. From now on, we need to take the "in"
+    // parameter into account.
+    in = (in >> 16 & 0xff) | (in << 16) | (in & 0xff00); // Byte swapping
+    recover(odd_head, odd_tail, oks, even_head, even_tail, eks, 11, statelist, in << 1, bucket);
 
 out:
-	for (uint32_t i = 0; i < 2; i++)
-		for (uint32_t j = 0; j <= 0xff; j++)
-			free(bucket[i][j].head);
-	free(odd_head);
-	free(even_head);
-	return statelist;
+    for (uint32_t i = 0; i < 2; i++)
+        for (uint32_t j = 0; j <= 0xff; j++)
+            free(bucket[i][j].head);
+    free(odd_head);
+    free(even_head);
+    return statelist;
 }
 
 static const uint32_t S1[] = {     0x62141, 0x310A0, 0x18850, 0x0C428, 0x06214,
-	0x0310A, 0x85E30, 0xC69AD, 0x634D6, 0xB5CDE, 0xDE8DA, 0x6F46D, 0xB3C83,
-	0x59E41, 0xA8995, 0xD027F, 0x6813F, 0x3409F, 0x9E6FA};
+    0x0310A, 0x85E30, 0xC69AD, 0x634D6, 0xB5CDE, 0xDE8DA, 0x6F46D, 0xB3C83,
+    0x59E41, 0xA8995, 0xD027F, 0x6813F, 0x3409F, 0x9E6FA};
 static const uint32_t S2[] = {  0x3A557B00, 0x5D2ABD80, 0x2E955EC0, 0x174AAF60,
-	0x0BA557B0, 0x05D2ABD8, 0x0449DE68, 0x048464B0, 0x42423258, 0x278192A8,
-	0x156042D0, 0x0AB02168, 0x43F89B30, 0x61FC4D98, 0x765EAD48, 0x7D8FDD20,
-	0x7EC7EE90, 0x7F63F748, 0x79117020};
+    0x0BA557B0, 0x05D2ABD8, 0x0449DE68, 0x048464B0, 0x42423258, 0x278192A8,
+    0x156042D0, 0x0AB02168, 0x43F89B30, 0x61FC4D98, 0x765EAD48, 0x7D8FDD20,
+    0x7EC7EE90, 0x7F63F748, 0x79117020};
 static const uint32_t T1[] = {
-	0x4F37D, 0x279BE, 0x97A6A, 0x4BD35, 0x25E9A, 0x12F4D, 0x097A6, 0x80D66,
-	0xC4006, 0x62003, 0xB56B4, 0x5AB5A, 0xA9318, 0xD0F39, 0x6879C, 0xB057B,
-	0x582BD, 0x2C15E, 0x160AF, 0x8F6E2, 0xC3DC4, 0xE5857, 0x72C2B, 0x39615,
-	0x98DBF, 0xC806A, 0xE0680, 0x70340, 0x381A0, 0x98665, 0x4C332, 0xA272C};
+    0x4F37D, 0x279BE, 0x97A6A, 0x4BD35, 0x25E9A, 0x12F4D, 0x097A6, 0x80D66,
+    0xC4006, 0x62003, 0xB56B4, 0x5AB5A, 0xA9318, 0xD0F39, 0x6879C, 0xB057B,
+    0x582BD, 0x2C15E, 0x160AF, 0x8F6E2, 0xC3DC4, 0xE5857, 0x72C2B, 0x39615,
+    0x98DBF, 0xC806A, 0xE0680, 0x70340, 0x381A0, 0x98665, 0x4C332, 0xA272C};
 static const uint32_t T2[] = {  0x3C88B810, 0x5E445C08, 0x2982A580, 0x14C152C0,
-	0x4A60A960, 0x253054B0, 0x52982A58, 0x2FEC9EA8, 0x1156C4D0, 0x08AB6268,
-	0x42F53AB0, 0x217A9D58, 0x161DC528, 0x0DAE6910, 0x46D73488, 0x25CB11C0,
-	0x52E588E0, 0x6972C470, 0x34B96238, 0x5CFC3A98, 0x28DE96C8, 0x12CFC0E0,
-	0x4967E070, 0x64B3F038, 0x74F97398, 0x7CDC3248, 0x38CE92A0, 0x1C674950,
-	0x0E33A4A8, 0x01B959D0, 0x40DCACE8, 0x26CEDDF0};
+    0x4A60A960, 0x253054B0, 0x52982A58, 0x2FEC9EA8, 0x1156C4D0, 0x08AB6268,
+    0x42F53AB0, 0x217A9D58, 0x161DC528, 0x0DAE6910, 0x46D73488, 0x25CB11C0,
+    0x52E588E0, 0x6972C470, 0x34B96238, 0x5CFC3A98, 0x28DE96C8, 0x12CFC0E0,
+    0x4967E070, 0x64B3F038, 0x74F97398, 0x7CDC3248, 0x38CE92A0, 0x1C674950,
+    0x0E33A4A8, 0x01B959D0, 0x40DCACE8, 0x26CEDDF0};
 static const uint32_t C1[] = { 0x846B5, 0x4235A, 0x211AD};
 static const uint32_t C2[] = { 0x1A822E0, 0x21A822E0, 0x21A822E0};
 /** Reverse 64 bits of keystream into possible cipher states
@@ -223,69 +223,69 @@ static const uint32_t C2[] = { 0x1A822E0, 0x21A822E0, 0x21A822E0};
  */
 struct Crypto1State* lfsr_recovery64(uint32_t ks2, uint32_t ks3)
 {
-	struct Crypto1State *statelist, *sl;
-	uint8_t oks[32], eks[32], hi[32];
-	uint32_t low = 0,  win = 0;
-	uint32_t *tail, table[1 << 16];
-	int i, j;
+    struct Crypto1State *statelist, *sl;
+    uint8_t oks[32], eks[32], hi[32];
+    uint32_t low = 0,  win = 0;
+    uint32_t *tail, table[1 << 16];
+    int i, j;
 
-	sl = statelist = malloc(sizeof(struct Crypto1State) << 4);
-	if(!sl)
-		return 0;
-	sl->odd = sl->even = 0;
+    sl = statelist = malloc(sizeof(struct Crypto1State) << 4);
+    if(!sl)
+        return 0;
+    sl->odd = sl->even = 0;
 
-	for(i = 30; i >= 0; i -= 2) {
-		oks[i >> 1] = BEBIT(ks2, i);
-		oks[16 + (i >> 1)] = BEBIT(ks3, i);
-	}
-	for(i = 31; i >= 0; i -= 2) {
-		eks[i >> 1] = BEBIT(ks2, i);
-		eks[16 + (i >> 1)] = BEBIT(ks3, i);
-	}
+    for(i = 30; i >= 0; i -= 2) {
+        oks[i >> 1] = BEBIT(ks2, i);
+        oks[16 + (i >> 1)] = BEBIT(ks3, i);
+    }
+    for(i = 31; i >= 0; i -= 2) {
+        eks[i >> 1] = BEBIT(ks2, i);
+        eks[16 + (i >> 1)] = BEBIT(ks3, i);
+    }
 
-	for(i = 0xfffff; i >= 0; --i) {
-		if (filter(i) != oks[0])
-			continue;
+    for(i = 0xfffff; i >= 0; --i) {
+        if (filter(i) != oks[0])
+            continue;
 
-		*(tail = table) = i;
-		for(j = 1; tail >= table && j < 29; ++j)
-			extend_table_simple(table, &tail, oks[j]);
+        *(tail = table) = i;
+        for(j = 1; tail >= table && j < 29; ++j)
+            extend_table_simple(table, &tail, oks[j]);
 
-		if(tail < table)
-			continue;
+        if(tail < table)
+            continue;
 
-		for(j = 0; j < 19; ++j)
-			low = low << 1 | evenparity32(i & S1[j]);
-		for(j = 0; j < 32; ++j)
-			hi[j] = evenparity32(i & T1[j]);
+        for(j = 0; j < 19; ++j)
+            low = low << 1 | evenparity32(i & S1[j]);
+        for(j = 0; j < 32; ++j)
+            hi[j] = evenparity32(i & T1[j]);
 
-		for(; tail >= table; --tail) {
-			for(j = 0; j < 3; ++j) {
-				*tail = *tail << 1;
-				*tail |= evenparity32((i & C1[j]) ^ (*tail & C2[j]));
-				if(filter(*tail) != oks[29 + j])
-					goto continue2;
-			}
+        for(; tail >= table; --tail) {
+            for(j = 0; j < 3; ++j) {
+                *tail = *tail << 1;
+                *tail |= evenparity32((i & C1[j]) ^ (*tail & C2[j]));
+                if(filter(*tail) != oks[29 + j])
+                    goto continue2;
+            }
 
-			for(j = 0; j < 19; ++j)
-				win = win << 1 | evenparity32(*tail & S2[j]);
+            for(j = 0; j < 19; ++j)
+                win = win << 1 | evenparity32(*tail & S2[j]);
 
-			win ^= low;
-			for(j = 0; j < 32; ++j) {
-				win = win << 1 ^ hi[j] ^ evenparity32(*tail & T2[j]);
-				if(filter(win) != eks[j])
-					goto continue2;
-			}
+            win ^= low;
+            for(j = 0; j < 32; ++j) {
+                win = win << 1 ^ hi[j] ^ evenparity32(*tail & T2[j]);
+                if(filter(win) != eks[j])
+                    goto continue2;
+            }
 
-			*tail = *tail << 1 | evenparity32(LF_POLY_EVEN & *tail);
-			sl->odd = *tail ^ evenparity32(LF_POLY_ODD & win);
-			sl->even = win;
-			++sl;
-			sl->odd = sl->even = 0;
-			continue2:;
-		}
-	}
-	return statelist;
+            *tail = *tail << 1 | evenparity32(LF_POLY_EVEN & *tail);
+            sl->odd = *tail ^ evenparity32(LF_POLY_ODD & win);
+            sl->even = win;
+            ++sl;
+            sl->odd = sl->even = 0;
+            continue2:;
+        }
+    }
+    return statelist;
 }
 
 /** lfsr_rollback_bit
@@ -293,37 +293,37 @@ struct Crypto1State* lfsr_recovery64(uint32_t ks2, uint32_t ks3)
  */
 uint8_t lfsr_rollback_bit(struct Crypto1State *s, uint32_t in, int fb)
 {
-	int out;
-	uint8_t ret;
-	uint32_t t;
+    int out;
+    uint8_t ret;
+    uint32_t t;
 
-	s->odd &= 0xffffff;
-	t = s->odd, s->odd = s->even, s->even = t;
+    s->odd &= 0xffffff;
+    t = s->odd, s->odd = s->even, s->even = t;
 
-	out = s->even & 1;
-	out ^= LF_POLY_EVEN & (s->even >>= 1);
-	out ^= LF_POLY_ODD & s->odd;
-	out ^= !!in;
-	out ^= (ret = filter(s->odd)) & !!fb;
+    out = s->even & 1;
+    out ^= LF_POLY_EVEN & (s->even >>= 1);
+    out ^= LF_POLY_ODD & s->odd;
+    out ^= !!in;
+    out ^= (ret = filter(s->odd)) & !!fb;
 
-	s->even |= evenparity32(out) << 23;
-	return ret;
+    s->even |= evenparity32(out) << 23;
+    return ret;
 }
 /** lfsr_rollback_byte
  * Rollback the shift register in order to get previous states
  */
 uint8_t lfsr_rollback_byte(struct Crypto1State *s, uint32_t in, int fb)
 {
-	uint8_t ret = 0;
-	ret |= lfsr_rollback_bit(s, BIT(in, 7), fb) << 7;
-	ret |= lfsr_rollback_bit(s, BIT(in, 6), fb) << 6;
-	ret |= lfsr_rollback_bit(s, BIT(in, 5), fb) << 5;
-	ret |= lfsr_rollback_bit(s, BIT(in, 4), fb) << 4;
-	ret |= lfsr_rollback_bit(s, BIT(in, 3), fb) << 3;
-	ret |= lfsr_rollback_bit(s, BIT(in, 2), fb) << 2;
-	ret |= lfsr_rollback_bit(s, BIT(in, 1), fb) << 1;
-	ret |= lfsr_rollback_bit(s, BIT(in, 0), fb) << 0;
-	return ret;
+    uint8_t ret = 0;
+    ret |= lfsr_rollback_bit(s, BIT(in, 7), fb) << 7;
+    ret |= lfsr_rollback_bit(s, BIT(in, 6), fb) << 6;
+    ret |= lfsr_rollback_bit(s, BIT(in, 5), fb) << 5;
+    ret |= lfsr_rollback_bit(s, BIT(in, 4), fb) << 4;
+    ret |= lfsr_rollback_bit(s, BIT(in, 3), fb) << 3;
+    ret |= lfsr_rollback_bit(s, BIT(in, 2), fb) << 2;
+    ret |= lfsr_rollback_bit(s, BIT(in, 1), fb) << 1;
+    ret |= lfsr_rollback_bit(s, BIT(in, 0), fb) << 0;
+    return ret;
 }
 /** lfsr_rollback_word
  * Rollback the shift register in order to get previous states
@@ -331,43 +331,43 @@ uint8_t lfsr_rollback_byte(struct Crypto1State *s, uint32_t in, int fb)
 uint32_t lfsr_rollback_word(struct Crypto1State *s, uint32_t in, int fb)
 {
 
-	uint32_t ret = 0;
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 31), fb) << (31 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 30), fb) << (30 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 29), fb) << (29 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 28), fb) << (28 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 27), fb) << (27 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 26), fb) << (26 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 25), fb) << (25 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 24), fb) << (24 ^ 24);
+    uint32_t ret = 0;
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 31), fb) << (31 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 30), fb) << (30 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 29), fb) << (29 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 28), fb) << (28 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 27), fb) << (27 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 26), fb) << (26 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 25), fb) << (25 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 24), fb) << (24 ^ 24);
 
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 23), fb) << (23 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 22), fb) << (22 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 21), fb) << (21 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 20), fb) << (20 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 19), fb) << (19 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 18), fb) << (18 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 17), fb) << (17 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 16), fb) << (16 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 23), fb) << (23 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 22), fb) << (22 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 21), fb) << (21 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 20), fb) << (20 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 19), fb) << (19 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 18), fb) << (18 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 17), fb) << (17 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 16), fb) << (16 ^ 24);
 
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 15), fb) << (15 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 14), fb) << (14 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 13), fb) << (13 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 12), fb) << (12 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 11), fb) << (11 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 10), fb) << (10 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 9), fb) << (9 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 8), fb) << (8 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 15), fb) << (15 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 14), fb) << (14 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 13), fb) << (13 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 12), fb) << (12 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 11), fb) << (11 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 10), fb) << (10 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 9), fb) << (9 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 8), fb) << (8 ^ 24);
 
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 7), fb) << (7 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 6), fb) << (6 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 5), fb) << (5 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 4), fb) << (4 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 3), fb) << (3 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 2), fb) << (2 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 1), fb) << (1 ^ 24);
-	ret |= lfsr_rollback_bit(s, BEBIT(in, 0), fb) << (0 ^ 24);
-	return ret;
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 7), fb) << (7 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 6), fb) << (6 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 5), fb) << (5 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 4), fb) << (4 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 3), fb) << (3 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 2), fb) << (2 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 1), fb) << (1 ^ 24);
+    ret |= lfsr_rollback_bit(s, BEBIT(in, 0), fb) << (0 ^ 24);
+    return ret;
 }
 
 /** nonce_distance
@@ -376,17 +376,17 @@ uint32_t lfsr_rollback_word(struct Crypto1State *s, uint32_t in, int fb)
 static uint16_t *dist = 0;
 int nonce_distance(uint32_t from, uint32_t to)
 {
-	uint16_t x, i;
-	if(!dist) {
-		dist = calloc(2 << 16,  sizeof(uint8_t));
-		if(!dist)
-			return -1;
-		for (x = i = 1; i; ++i) {
-			dist[(x & 0xff) << 8 | x >> 8] = i;
-			x = x >> 1 | (x ^ x >> 2 ^ x >> 3 ^ x >> 5) << 15;
-		}
-	}
-	return (65535 + dist[to >> 16] - dist[from >> 16]) % 65535;
+    uint16_t x, i;
+    if(!dist) {
+        dist = calloc(2 << 16,  sizeof(uint8_t));
+        if(!dist)
+            return -1;
+        for (x = i = 1; i; ++i) {
+            dist[(x & 0xff) << 8 | x >> 8] = i;
+            x = x >> 1 | (x ^ x >> 2 ^ x >> 3 ^ x >> 5) << 15;
+        }
+    }
+    return (65535 + dist[to >> 16] - dist[from >> 16]) % 65535;
 }
 
 /** validate_prng_nonce
@@ -396,14 +396,14 @@ int nonce_distance(uint32_t from, uint32_t to)
  *   false = hardend prng
  */
 bool validate_prng_nonce(uint32_t nonce) {
-	// init prng table:
-	nonce_distance(nonce, nonce);
-	return ((65535 - dist[nonce >> 16] + dist[nonce & 0xffff]) % 65535) == 16;
+    // init prng table:
+    nonce_distance(nonce, nonce);
+    return ((65535 - dist[nonce >> 16] + dist[nonce & 0xffff]) % 65535) == 16;
 }
 
 static uint32_t fastfwd[2][8] = {
-	{ 0, 0x4BC53, 0xECB1, 0x450E2, 0x25E29, 0x6E27A, 0x2B298, 0x60ECB},
-	{ 0, 0x1D962, 0x4BC53, 0x56531, 0xECB1, 0x135D3, 0x450E2, 0x58980}};
+    { 0, 0x4BC53, 0xECB1, 0x450E2, 0x25E29, 0x6E27A, 0x2B298, 0x60ECB},
+    { 0, 0x1D962, 0x4BC53, 0x56531, 0xECB1, 0x135D3, 0x450E2, 0x58980}};
 
 /** lfsr_prefix_ks
  *
@@ -416,25 +416,25 @@ static uint32_t fastfwd[2][8] = {
  */
 uint32_t *lfsr_prefix_ks(uint8_t ks[8], int isodd)
 {
-	uint32_t *candidates = calloc(4 << 10, sizeof(uint8_t));
-	if (!candidates) return 0;
+    uint32_t *candidates = calloc(4 << 10, sizeof(uint8_t));
+    if (!candidates) return 0;
 
-	uint32_t c,  entry;
-	int size = 0, i, good;
+    uint32_t c,  entry;
+    int size = 0, i, good;
 
-	for (i = 0; i < 1 << 21; ++i) {
-		for (c = 0, good = 1; good && c < 8; ++c) {
-			entry = i ^ fastfwd[isodd][c];
-			good &= (BIT(ks[c], isodd) == filter(entry >> 1));
-			good &= (BIT(ks[c], isodd + 2) == filter(entry));
-		}
-		if (good)
-			candidates[size++] = i;
-	}
+    for (i = 0; i < 1 << 21; ++i) {
+        for (c = 0, good = 1; good && c < 8; ++c) {
+            entry = i ^ fastfwd[isodd][c];
+            good &= (BIT(ks[c], isodd) == filter(entry >> 1));
+            good &= (BIT(ks[c], isodd + 2) == filter(entry));
+        }
+        if (good)
+            candidates[size++] = i;
+    }
 
-	candidates[size] = -1;
+    candidates[size] = -1;
 
-	return candidates;
+    return candidates;
 }
 
 /** check_pfx_parity
@@ -442,33 +442,33 @@ uint32_t *lfsr_prefix_ks(uint8_t ks[8], int isodd)
  */
 static struct Crypto1State* check_pfx_parity(uint32_t prefix, uint32_t rresp, uint8_t parities[8][8], uint32_t odd, uint32_t even, struct Crypto1State* sl, uint32_t no_par)
 {
-	uint32_t ks1, nr, ks2, rr, ks3, c, good = 1;
+    uint32_t ks1, nr, ks2, rr, ks3, c, good = 1;
 
-	for(c = 0; good && c < 8; ++c) {
-		sl->odd = odd ^ fastfwd[1][c];
-		sl->even = even ^ fastfwd[0][c];
+    for(c = 0; good && c < 8; ++c) {
+        sl->odd = odd ^ fastfwd[1][c];
+        sl->even = even ^ fastfwd[0][c];
 
-		lfsr_rollback_bit(sl, 0, 0);
-		lfsr_rollback_bit(sl, 0, 0);
+        lfsr_rollback_bit(sl, 0, 0);
+        lfsr_rollback_bit(sl, 0, 0);
 
-		ks3 = lfsr_rollback_bit(sl, 0, 0);
-		ks2 = lfsr_rollback_word(sl, 0, 0);
-		ks1 = lfsr_rollback_word(sl, prefix | c << 5, 1);
+        ks3 = lfsr_rollback_bit(sl, 0, 0);
+        ks2 = lfsr_rollback_word(sl, 0, 0);
+        ks1 = lfsr_rollback_word(sl, prefix | c << 5, 1);
 
-		if (no_par)
-			break;
+        if (no_par)
+            break;
 
-		nr = ks1 ^ (prefix | c << 5);
-		rr = ks2 ^ rresp;
+        nr = ks1 ^ (prefix | c << 5);
+        rr = ks2 ^ rresp;
 
-		good &= evenparity32(nr & 0x000000ff) ^ parities[c][3] ^ BIT(ks2, 24);
-		good &= evenparity32(rr & 0xff000000) ^ parities[c][4] ^ BIT(ks2, 16);
-		good &= evenparity32(rr & 0x00ff0000) ^ parities[c][5] ^ BIT(ks2,  8);
-		good &= evenparity32(rr & 0x0000ff00) ^ parities[c][6] ^ BIT(ks2,  0);
-		good &= evenparity32(rr & 0x000000ff) ^ parities[c][7] ^ ks3;
-	}
+        good &= evenparity32(nr & 0x000000ff) ^ parities[c][3] ^ BIT(ks2, 24);
+        good &= evenparity32(rr & 0xff000000) ^ parities[c][4] ^ BIT(ks2, 16);
+        good &= evenparity32(rr & 0x00ff0000) ^ parities[c][5] ^ BIT(ks2,  8);
+        good &= evenparity32(rr & 0x0000ff00) ^ parities[c][6] ^ BIT(ks2,  0);
+        good &= evenparity32(rr & 0x000000ff) ^ parities[c][7] ^ ks3;
+    }
 
-	return sl + good;
+    return sl + good;
 }
 
 
@@ -484,30 +484,30 @@ static struct Crypto1State* check_pfx_parity(uint32_t prefix, uint32_t rresp, ui
 
 struct Crypto1State* lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8], uint32_t no_par)
 {
-	struct Crypto1State *statelist, *s;
-	uint32_t *odd, *even, *o, *e, top;
+    struct Crypto1State *statelist, *s;
+    uint32_t *odd, *even, *o, *e, top;
 
-	odd = lfsr_prefix_ks(ks, 1);
-	even = lfsr_prefix_ks(ks, 0);
+    odd = lfsr_prefix_ks(ks, 1);
+    even = lfsr_prefix_ks(ks, 0);
 
-	s = statelist = malloc((sizeof *statelist) << 24); // was << 20. Need more for no_par special attack. Enough???
-	if (!s || !odd || !even) {
-		free(statelist);
-		statelist = 0;
-		goto out;
-	}
+    s = statelist = malloc((sizeof *statelist) << 24); // was << 20. Need more for no_par special attack. Enough???
+    if (!s || !odd || !even) {
+        free(statelist);
+        statelist = 0;
+        goto out;
+    }
 
-	for (o = odd; *o + 1; ++o)
-		for (e = even; *e + 1; ++e)
-			for (top = 0; top < 64; ++top) {
-				*o += 1 << 21;
-				*e += (!(top & 7) + 1) << 21;
-				s = check_pfx_parity(pfx, rr, par, *o, *e, s, no_par);
-			}
+    for (o = odd; *o + 1; ++o)
+        for (e = even; *e + 1; ++e)
+            for (top = 0; top < 64; ++top) {
+                *o += 1 << 21;
+                *e += (!(top & 7) + 1) << 21;
+                s = check_pfx_parity(pfx, rr, par, *o, *e, s, no_par);
+            }
 
-	s->odd = s->even = 0;
+    s->odd = s->even = 0;
 out:
-	free(odd);
-	free(even);
-	return statelist;
+    free(odd);
+    free(even);
+    return statelist;
 }
diff --git a/common/crapto1/crapto1.h b/common/crapto1/crapto1.h
index 5abdaeb09..b51b2aa15 100644
--- a/common/crapto1/crapto1.h
+++ b/common/crapto1/crapto1.h
@@ -28,7 +28,7 @@ extern "C" {
 #endif
 
 struct Crypto1State {uint32_t odd, even;};
-#if defined(__arm__) && !defined(__linux__) && !defined(_WIN32) && !defined(__APPLE__)		// bare metal ARM Proxmark lacks malloc()/free()
+#if defined(__arm__) && !defined(__linux__) && !defined(_WIN32) && !defined(__APPLE__) // bare metal ARM Proxmark lacks malloc()/free()
 void crypto1_create(struct Crypto1State *s, uint64_t key);
 #else
 struct Crypto1State *crypto1_create(uint64_t key);
@@ -53,15 +53,15 @@ uint32_t lfsr_rollback_word(struct Crypto1State* s, uint32_t in, int fb);
 int nonce_distance(uint32_t from, uint32_t to);
 extern bool validate_prng_nonce(uint32_t nonce);
 #define FOREACH_VALID_NONCE(N, FILTER, FSIZE)\
-	uint32_t __n = 0,__M = 0, N = 0;\
-	int __i;\
-	for(; __n < 1 << 16; N = prng_successor(__M = ++__n, 16))\
-		for(__i = FSIZE - 1; __i >= 0; __i--)\
-			if(BIT(FILTER, __i) ^ evenparity32(__M & 0xFF01))\
-				break;\
-			else if(__i)\
-				__M = prng_successor(__M, (__i == 7) ? 48 : 8);\
-			else
+    uint32_t __n = 0,__M = 0, N = 0;\
+    int __i;\
+    for(; __n < 1 << 16; N = prng_successor(__M = ++__n, 16))\
+        for(__i = FSIZE - 1; __i >= 0; __i--)\
+            if(BIT(FILTER, __i) ^ evenparity32(__M & 0xFF01))\
+                break;\
+            else if(__i)\
+                __M = prng_successor(__M, (__i == 7) ? 48 : 8);\
+            else
 
 #define LF_POLY_ODD (0x29CE5C)
 #define LF_POLY_EVEN (0x870804)
@@ -69,14 +69,14 @@ extern bool validate_prng_nonce(uint32_t nonce);
 #define BEBIT(x, n) BIT(x, (n) ^ 24)
 static inline int filter(uint32_t const x)
 {
-	uint32_t f;
+    uint32_t f;
 
-	f  = 0xf22c0 >> (x       & 0xf) & 16;
-	f |= 0x6c9c0 >> (x >>  4 & 0xf) &  8;
-	f |= 0x3c8b0 >> (x >>  8 & 0xf) &  4;
-	f |= 0x1e458 >> (x >> 12 & 0xf) &  2;
-	f |= 0x0d938 >> (x >> 16 & 0xf) &  1;
-	return BIT(0xEC57E80A, f);
+    f  = 0xf22c0 >> (x       & 0xf) & 16;
+    f |= 0x6c9c0 >> (x >>  4 & 0xf) &  8;
+    f |= 0x3c8b0 >> (x >>  8 & 0xf) &  4;
+    f |= 0x1e458 >> (x >> 12 & 0xf) &  2;
+    f |= 0x0d938 >> (x >> 16 & 0xf) &  1;
+    return BIT(0xEC57E80A, f);
 }
 #ifdef __cplusplus
 }
diff --git a/common/crapto1/crypto1.c b/common/crapto1/crypto1.c
index 034d92215..f4147bf4f 100644
--- a/common/crapto1/crypto1.c
+++ b/common/crapto1/crypto1.c
@@ -1,21 +1,21 @@
 /*  crypto1.c
 
-	This program is free software; you can redistribute it and/or
-	modify it under the terms of the GNU General Public License
-	as published by the Free Software Foundation; either version 2
-	of the License, or (at your option) any later version.
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License
+    as published by the Free Software Foundation; either version 2
+    of the License, or (at your option) any later version.
 
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-	MA  02110-1301, US
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+    MA  02110-1301, US
 
-	Copyright (C) 2008-2008 bla <blapost@gmail.com>
+    Copyright (C) 2008-2008 bla <blapost@gmail.com>
 */
 #include "crapto1.h"
 
@@ -23,121 +23,121 @@
 #include "parity.h"
 
 #define SWAPENDIAN(x)\
-	(x = (x >> 8 & 0xff00ff) | (x & 0xff00ff) << 8, x = x >> 16 | x << 16)
+    (x = (x >> 8 & 0xff00ff) | (x & 0xff00ff) << 8, x = x >> 16 | x << 16)
 
-#if defined(__arm__) && !defined(__linux__) && !defined(_WIN32) && !defined(__APPLE__)		// bare metal ARM Proxmark lacks malloc()/free()
+#if defined(__arm__) && !defined(__linux__) && !defined(_WIN32) && !defined(__APPLE__) // bare metal ARM Proxmark lacks malloc()/free()
 void crypto1_create(struct Crypto1State *s, uint64_t key)
 {
-	int i;
+    int i;
 
-	for(i = 47;s && i > 0; i -= 2) {
-		s->odd  = s->odd  << 1 | BIT(key, (i - 1) ^ 7);
-		s->even = s->even << 1 | BIT(key, i ^ 7);
-	}
-	return;
+    for(i = 47;s && i > 0; i -= 2) {
+        s->odd  = s->odd  << 1 | BIT(key, (i - 1) ^ 7);
+        s->even = s->even << 1 | BIT(key, i ^ 7);
+    }
+    return;
 }
 void crypto1_destroy(struct Crypto1State *state)
 {
-	state->odd = 0;
-	state->even = 0;
+    state->odd = 0;
+    state->even = 0;
 }
 #else
 struct Crypto1State * crypto1_create(uint64_t key)
 {
-	struct Crypto1State *s = malloc(sizeof(*s));
-	if ( !s ) return NULL;
+    struct Crypto1State *s = malloc(sizeof(*s));
+    if ( !s ) return NULL;
 
-	s->odd = s->even = 0;
+    s->odd = s->even = 0;
 
-	int i;
-	for(i = 47; i > 0; i -= 2) {
-		s->odd  = s->odd  << 1 | BIT(key, (i - 1) ^ 7);
-		s->even = s->even << 1 | BIT(key, i ^ 7);
-	}
-	return s;
+    int i;
+    for(i = 47; i > 0; i -= 2) {
+        s->odd  = s->odd  << 1 | BIT(key, (i - 1) ^ 7);
+        s->even = s->even << 1 | BIT(key, i ^ 7);
+    }
+    return s;
 }
 void crypto1_destroy(struct Crypto1State *state)
 {
-	free(state);
+    free(state);
 }
 #endif
 void crypto1_get_lfsr(struct Crypto1State *state, uint64_t *lfsr)
 {
-	int i;
-	for(*lfsr = 0, i = 23; i >= 0; --i) {
-		*lfsr = *lfsr << 1 | BIT(state->odd, i ^ 3);
-		*lfsr = *lfsr << 1 | BIT(state->even, i ^ 3);
-	}
+    int i;
+    for(*lfsr = 0, i = 23; i >= 0; --i) {
+        *lfsr = *lfsr << 1 | BIT(state->odd, i ^ 3);
+        *lfsr = *lfsr << 1 | BIT(state->even, i ^ 3);
+    }
 }
 uint8_t crypto1_bit(struct Crypto1State *s, uint8_t in, int is_encrypted)
 {
-	uint32_t feedin, t;
-	uint8_t ret = filter(s->odd);
+    uint32_t feedin, t;
+    uint8_t ret = filter(s->odd);
 
-	feedin  = ret & !!is_encrypted;
-	feedin ^= !!in;
-	feedin ^= LF_POLY_ODD & s->odd;
-	feedin ^= LF_POLY_EVEN & s->even;
-	s->even = s->even << 1 | evenparity32(feedin);
+    feedin  = ret & !!is_encrypted;
+    feedin ^= !!in;
+    feedin ^= LF_POLY_ODD & s->odd;
+    feedin ^= LF_POLY_EVEN & s->even;
+    s->even = s->even << 1 | evenparity32(feedin);
 
-	t = s->odd;
-	s->odd = s->even;
-	s->even = t;
+    t = s->odd;
+    s->odd = s->even;
+    s->even = t;
 
-	return ret;
+    return ret;
 }
 uint8_t crypto1_byte(struct Crypto1State *s, uint8_t in, int is_encrypted)
 {
-	uint8_t ret = 0;
-	ret |= crypto1_bit(s, BIT(in, 0), is_encrypted) << 0;
-	ret |= crypto1_bit(s, BIT(in, 1), is_encrypted) << 1;
-	ret |= crypto1_bit(s, BIT(in, 2), is_encrypted) << 2;
-	ret |= crypto1_bit(s, BIT(in, 3), is_encrypted) << 3;
-	ret |= crypto1_bit(s, BIT(in, 4), is_encrypted) << 4;
-	ret |= crypto1_bit(s, BIT(in, 5), is_encrypted) << 5;
-	ret |= crypto1_bit(s, BIT(in, 6), is_encrypted) << 6;
-	ret |= crypto1_bit(s, BIT(in, 7), is_encrypted) << 7;
-	return ret;
+    uint8_t ret = 0;
+    ret |= crypto1_bit(s, BIT(in, 0), is_encrypted) << 0;
+    ret |= crypto1_bit(s, BIT(in, 1), is_encrypted) << 1;
+    ret |= crypto1_bit(s, BIT(in, 2), is_encrypted) << 2;
+    ret |= crypto1_bit(s, BIT(in, 3), is_encrypted) << 3;
+    ret |= crypto1_bit(s, BIT(in, 4), is_encrypted) << 4;
+    ret |= crypto1_bit(s, BIT(in, 5), is_encrypted) << 5;
+    ret |= crypto1_bit(s, BIT(in, 6), is_encrypted) << 6;
+    ret |= crypto1_bit(s, BIT(in, 7), is_encrypted) << 7;
+    return ret;
 }
 uint32_t crypto1_word(struct Crypto1State *s, uint32_t in, int is_encrypted)
 {
-	uint32_t ret = 0;
-	ret |= crypto1_bit(s, BEBIT(in, 0), is_encrypted) << (0 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 1), is_encrypted) << (1 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 2), is_encrypted) << (2 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 3), is_encrypted) << (3 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 4), is_encrypted) << (4 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 5), is_encrypted) << (5 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 6), is_encrypted) << (6 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 7), is_encrypted) << (7 ^ 24);
+    uint32_t ret = 0;
+    ret |= crypto1_bit(s, BEBIT(in, 0), is_encrypted) << (0 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 1), is_encrypted) << (1 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 2), is_encrypted) << (2 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 3), is_encrypted) << (3 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 4), is_encrypted) << (4 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 5), is_encrypted) << (5 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 6), is_encrypted) << (6 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 7), is_encrypted) << (7 ^ 24);
 
-	ret |= crypto1_bit(s, BEBIT(in, 8), is_encrypted) << (8 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 9), is_encrypted) << (9 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 10), is_encrypted) << (10 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 11), is_encrypted) << (11 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 12), is_encrypted) << (12 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 13), is_encrypted) << (13 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 14), is_encrypted) << (14 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 15), is_encrypted) << (15 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 8), is_encrypted) << (8 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 9), is_encrypted) << (9 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 10), is_encrypted) << (10 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 11), is_encrypted) << (11 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 12), is_encrypted) << (12 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 13), is_encrypted) << (13 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 14), is_encrypted) << (14 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 15), is_encrypted) << (15 ^ 24);
 
-	ret |= crypto1_bit(s, BEBIT(in, 16), is_encrypted) << (16 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 17), is_encrypted) << (17 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 18), is_encrypted) << (18 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 19), is_encrypted) << (19 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 20), is_encrypted) << (20 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 21), is_encrypted) << (21 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 22), is_encrypted) << (22 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 23), is_encrypted) << (23 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 16), is_encrypted) << (16 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 17), is_encrypted) << (17 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 18), is_encrypted) << (18 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 19), is_encrypted) << (19 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 20), is_encrypted) << (20 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 21), is_encrypted) << (21 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 22), is_encrypted) << (22 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 23), is_encrypted) << (23 ^ 24);
 
-	ret |= crypto1_bit(s, BEBIT(in, 24), is_encrypted) << (24 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 25), is_encrypted) << (25 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 26), is_encrypted) << (26 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 27), is_encrypted) << (27 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 28), is_encrypted) << (28 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 29), is_encrypted) << (29 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 30), is_encrypted) << (30 ^ 24);
-	ret |= crypto1_bit(s, BEBIT(in, 31), is_encrypted) << (31 ^ 24);
-	return ret;
+    ret |= crypto1_bit(s, BEBIT(in, 24), is_encrypted) << (24 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 25), is_encrypted) << (25 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 26), is_encrypted) << (26 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 27), is_encrypted) << (27 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 28), is_encrypted) << (28 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 29), is_encrypted) << (29 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 30), is_encrypted) << (30 ^ 24);
+    ret |= crypto1_bit(s, BEBIT(in, 31), is_encrypted) << (31 ^ 24);
+    return ret;
 }
 
 /* prng_successor
@@ -145,9 +145,9 @@ uint32_t crypto1_word(struct Crypto1State *s, uint32_t in, int is_encrypted)
  */
 uint32_t prng_successor(uint32_t x, uint32_t n)
 {
-	SWAPENDIAN(x);
-	while(n--)
-		x = x >> 1 | (x >> 16 ^ x >> 18 ^ x >> 19 ^ x >> 21) << 31;
+    SWAPENDIAN(x);
+    while(n--)
+        x = x >> 1 | (x >> 16 ^ x >> 18 ^ x >> 19 ^ x >> 21) << 31;
 
-	return SWAPENDIAN(x);
+    return SWAPENDIAN(x);
 }
diff --git a/common/crc.c b/common/crc.c
index 4097fdd48..b91eea505 100644
--- a/common/crc.c
+++ b/common/crc.c
@@ -10,118 +10,118 @@
 #include "crc.h"
 
 void crc_init_ref(crc_t *crc, int order, uint32_t polynom, uint32_t initial_value, uint32_t final_xor, bool refin, bool refout) {
-	crc_init(crc, order, polynom, initial_value, final_xor);
-	crc->refin = refin;
-	crc->refout = refout;
-	crc_clear(crc);
+    crc_init(crc, order, polynom, initial_value, final_xor);
+    crc->refin = refin;
+    crc->refout = refout;
+    crc_clear(crc);
 }
 
 void crc_init(crc_t *crc, int order, uint32_t polynom, uint32_t initial_value, uint32_t final_xor) {
-	crc->order = order;
-	crc->topbit = BITMASK( order-1 );
-	crc->polynom = polynom;
-	crc->initial_value = initial_value;
-	crc->final_xor = final_xor;
-	crc->mask = (1L<<order)-1;
-	crc->refin = false;
-	crc->refout = false;
-	crc_clear(crc);
+    crc->order = order;
+    crc->topbit = BITMASK( order-1 );
+    crc->polynom = polynom;
+    crc->initial_value = initial_value;
+    crc->final_xor = final_xor;
+    crc->mask = (1L<<order)-1;
+    crc->refin = false;
+    crc->refout = false;
+    crc_clear(crc);
 }
 
 void crc_clear(crc_t *crc) {
 
-	crc->state = crc->initial_value & crc->mask;
-	if (crc->refin)
-		crc->state = reflect(crc->state, crc->order);
+    crc->state = crc->initial_value & crc->mask;
+    if (crc->refin)
+        crc->state = reflect(crc->state, crc->order);
 }
 
 void crc_update2(crc_t *crc, uint32_t data, int data_width){
 
-	if (crc->refin)
-		data = reflect(data, data_width);
+    if (crc->refin)
+        data = reflect(data, data_width);
 
-	// Bring the next byte into the remainder.
-	crc->state ^= data << (crc->order - data_width);
+    // Bring the next byte into the remainder.
+    crc->state ^= data << (crc->order - data_width);
 
-	for( uint8_t bit = data_width; bit > 0; --bit) {
+    for( uint8_t bit = data_width; bit > 0; --bit) {
 
-		if (crc->state & crc->topbit)
-			crc->state = (crc->state << 1) ^ crc->polynom;
-		else
-			crc->state = (crc->state << 1);
-	}
+        if (crc->state & crc->topbit)
+            crc->state = (crc->state << 1) ^ crc->polynom;
+        else
+            crc->state = (crc->state << 1);
+    }
 }
 
 void crc_update(crc_t *crc, uint32_t data, int data_width)
 {
-	if (crc->refin)
-		data = reflect(data, data_width);
+    if (crc->refin)
+        data = reflect(data, data_width);
 
-	int i;
-	for(i=0; i<data_width; i++) {
-		int oldstate = crc->state;
-		crc->state = crc->state >> 1;
-		if( (oldstate^data) & 1 ) {
-			crc->state ^= crc->polynom;
-		}
-		data >>= 1;
-	}
+    int i;
+    for(i=0; i<data_width; i++) {
+        int oldstate = crc->state;
+        crc->state = crc->state >> 1;
+        if( (oldstate^data) & 1 ) {
+            crc->state ^= crc->polynom;
+        }
+        data >>= 1;
+    }
 }
 
 uint32_t crc_finish(crc_t *crc) {
-	uint32_t val = crc->state;
-	if (crc->refout)
-		val = reflect(val, crc->order);
-	return ( val ^ crc->final_xor ) & crc->mask;
+    uint32_t val = crc->state;
+    if (crc->refout)
+        val = reflect(val, crc->order);
+    return ( val ^ crc->final_xor ) & crc->mask;
 }
 
 /*
 static void print_crc(crc_t *crc) {
-	printf(" Order  %d\n Poly   %x\n Init   %x\n Final  %x\n Mask   %x\n topbit %x\n RefIn  %s\n RefOut %s\n State  %x\n",
-		crc->order,
-		crc->polynom,
-		crc->initial_value,
-		crc->final_xor,
-		crc->mask,
-		crc->topbit,
-		(crc->refin) ? "TRUE":"FALSE",
-		(crc->refout) ? "TRUE":"FALSE",
-		crc->state
-	);
+    printf(" Order  %d\n Poly   %x\n Init   %x\n Final  %x\n Mask   %x\n topbit %x\n RefIn  %s\n RefOut %s\n State  %x\n",
+        crc->order,
+        crc->polynom,
+        crc->initial_value,
+        crc->final_xor,
+        crc->mask,
+        crc->topbit,
+        (crc->refin) ? "TRUE":"FALSE",
+        (crc->refout) ? "TRUE":"FALSE",
+        crc->state
+    );
 }
 */
 
 // width=8  poly=0x31  init=0x00  refin=true  refout=true  xorout=0x00  check=0xA1  name="CRC-8/MAXIM"
 uint32_t CRC8Maxim(uint8_t *buff, size_t size) {
-	crc_t crc;
-	crc_init_ref(&crc, 8, 0x31, 0, 0, true, true);
-	for ( int i=0; i < size; ++i)
-		crc_update2(&crc, buff[i], 8);
-	return crc_finish(&crc);
+    crc_t crc;
+    crc_init_ref(&crc, 8, 0x31, 0, 0, true, true);
+    for ( int i=0; i < size; ++i)
+        crc_update2(&crc, buff[i], 8);
+    return crc_finish(&crc);
 }
 // width=8 poly=0x1d, init=0xc7 (0xe3 - WRONG! but it mentioned in MAD datasheet) refin=false  refout=false  xorout=0x00 name="CRC-8/MIFARE-MAD"
 uint32_t CRC8Mad(uint8_t *buff, size_t size) {
-	crc_t crc;
-	crc_init_ref(&crc, 8, 0x1d, 0xc7, 0, false, false);
-	for ( int i = 0; i < size; ++i)
-		crc_update2(&crc, buff[i], 8);
-	return crc_finish(&crc);
+    crc_t crc;
+    crc_init_ref(&crc, 8, 0x1d, 0xc7, 0, false, false);
+    for ( int i = 0; i < size; ++i)
+        crc_update2(&crc, buff[i], 8);
+    return crc_finish(&crc);
 }
 // width=4  poly=0xC, reversed poly=0x7  init=0x5   refin=true  refout=true  xorout=0x0000  check=  name="CRC-4/LEGIC"
 uint32_t CRC4Legic(uint8_t *cmd, size_t size) {
- 	crc_t crc;
- 	crc_init_ref(&crc, 4, 0x19 >> 1, 0x5, 0, true, true);
-	crc_update2(&crc, 1, 1); /* CMD_READ */
-	crc_update2(&crc, cmd[0], 8);
-	crc_update2(&crc, cmd[1], 8);
-	return reflect(crc_finish(&crc), 4);
+    crc_t crc;
+    crc_init_ref(&crc, 4, 0x19 >> 1, 0x5, 0, true, true);
+    crc_update2(&crc, 1, 1); /* CMD_READ */
+    crc_update2(&crc, cmd[0], 8);
+    crc_update2(&crc, cmd[1], 8);
+    return reflect(crc_finish(&crc), 4);
 }
 // width=8  poly=0x63, reversed poly=0x8D  init=0x55  refin=true  refout=true  xorout=0x0000  check=0xC6  name="CRC-8/LEGIC"
 // the CRC needs to be reversed before returned.
 uint32_t CRC8Legic(uint8_t *buff, size_t size) {
-	crc_t crc;
-	crc_init_ref(&crc, 8, 0x63, 0x55, 0, true, true);
-	for ( int i = 0; i < size; ++i)
-		crc_update2(&crc, buff[i], 8);
-	return reflect8(crc_finish(&crc));
+    crc_t crc;
+    crc_init_ref(&crc, 8, 0x63, 0x55, 0, true, true);
+    for ( int i = 0; i < size; ++i)
+        crc_update2(&crc, buff[i], 8);
+    return reflect8(crc_finish(&crc));
 }
\ No newline at end of file
diff --git a/common/crc.h b/common/crc.h
index 015fbf60c..5a15563b7 100644
--- a/common/crc.h
+++ b/common/crc.h
@@ -9,19 +9,19 @@
 #ifndef __CRC_H
 #define __CRC_H
 
-#include "common.h"	//stdint, stddef, stdbool
-#include "util.h"	// reflect, bswap_16
+#include "common.h" //stdint, stddef, stdbool
+#include "util.h"   // reflect, bswap_16
 
 typedef struct crc {
-	uint32_t state;
-	int order;
-	uint32_t polynom;
-	uint32_t initial_value;
-	uint32_t final_xor;
-	uint32_t mask;
-	int topbit;
-	bool refin;    /* Parameter: Reflect input bytes?        */
-	bool refout;   /* Parameter: Reflect output CRC?         */
+    uint32_t state;
+    int order;
+    uint32_t polynom;
+    uint32_t initial_value;
+    uint32_t final_xor;
+    uint32_t mask;
+    int topbit;
+    bool refin;    /* Parameter: Reflect input bytes?        */
+    bool refout;   /* Parameter: Reflect output CRC?         */
 } crc_t;
 
 /* Initialize a crc structure. order is the order of the polynom, e.g. 32 for a CRC-32
@@ -64,14 +64,14 @@ uint32_t CRC8Legic(uint8_t *buff, size_t size);
 
 /* Static initialization of a crc structure */
 #define CRC_INITIALIZER(_order, _polynom, _initial_value, _final_xor) { \
-	.state = ((_initial_value) & ((1L<<(_order))-1)), \
-	.order = (_order), \
-	.polynom = (_polynom), \
-	.initial_value = (_initial_value), \
-	.final_xor = (_final_xor), \
-	.mask = ((1L<<(_order))-1) \
-	.refin = false, \
-	.refout = false \
-	}
+    .state = ((_initial_value) & ((1L<<(_order))-1)), \
+    .order = (_order), \
+    .polynom = (_polynom), \
+    .initial_value = (_initial_value), \
+    .final_xor = (_final_xor), \
+    .mask = ((1L<<(_order))-1) \
+    .refin = false, \
+    .refout = false \
+    }
 
 #endif /* __CRC_H */
diff --git a/common/crc16.c b/common/crc16.c
index b6145013b..af3ca2676 100644
--- a/common/crc16.c
+++ b/common/crc16.c
@@ -13,125 +13,125 @@ static CrcType_t crc_type = CRC_NONE;
 
 void init_table(CrcType_t ct) {
 
-	// same crc algo, and initialised already
-	if ( ct == crc_type && crc_table_init)
-		return;
+    // same crc algo, and initialised already
+    if ( ct == crc_type && crc_table_init)
+        return;
 
-	// not the same crc algo. reset table.
-	if ( ct != crc_type)
-		reset_table();
+    // not the same crc algo. reset table.
+    if ( ct != crc_type)
+        reset_table();
 
-	crc_type = ct;
+    crc_type = ct;
 
-	switch (ct) {
-		case CRC_14443_A:
-		case CRC_14443_B:
-		case CRC_15693:
-		case CRC_ICLASS: generate_table(CRC16_POLY_CCITT, true); break;
-		case CRC_FELICA: generate_table(CRC16_POLY_CCITT, false); break;
-		case CRC_LEGIC: generate_table(CRC16_POLY_LEGIC, true); break;
-		case CRC_CCITT: generate_table(CRC16_POLY_CCITT, false); break;
-		case CRC_KERMIT: generate_table(CRC16_POLY_CCITT, true); break;
-		default:
-			crc_table_init = false;
-			crc_type = CRC_NONE;
-			break;
-	}
+    switch (ct) {
+        case CRC_14443_A:
+        case CRC_14443_B:
+        case CRC_15693:
+        case CRC_ICLASS: generate_table(CRC16_POLY_CCITT, true); break;
+        case CRC_FELICA: generate_table(CRC16_POLY_CCITT, false); break;
+        case CRC_LEGIC: generate_table(CRC16_POLY_LEGIC, true); break;
+        case CRC_CCITT: generate_table(CRC16_POLY_CCITT, false); break;
+        case CRC_KERMIT: generate_table(CRC16_POLY_CCITT, true); break;
+        default:
+            crc_table_init = false;
+            crc_type = CRC_NONE;
+            break;
+    }
 }
 
 void generate_table( uint16_t polynomial, bool refin) {
 
-	uint16_t i, j, crc, c;
+    uint16_t i, j, crc, c;
 
-	for (i = 0; i < 256; i++) {
-		crc = 0;
-		if (refin)
-			c = reflect8(i) << 8;
-		else
-			c = i << 8;
+    for (i = 0; i < 256; i++) {
+        crc = 0;
+        if (refin)
+            c = reflect8(i) << 8;
+        else
+            c = i << 8;
 
         for (j = 0; j < 8; j++) {
 
             if ( (crc ^ c) & 0x8000 )
-				crc = ( crc << 1 ) ^ polynomial;
+                crc = ( crc << 1 ) ^ polynomial;
             else
-				crc =   crc << 1;
+                crc =   crc << 1;
 
             c = c << 1;
         }
-		if (refin)
-			crc = reflect16(crc);
+        if (refin)
+            crc = reflect16(crc);
 
-		crc_table[i] = crc;
-	}
+        crc_table[i] = crc;
+    }
     crc_table_init = true;
 }
 
 void reset_table(void) {
-	memset(crc_table, 0, sizeof(crc_table));
-	crc_table_init = false;
-	crc_type = CRC_NONE;
+    memset(crc_table, 0, sizeof(crc_table));
+    crc_table_init = false;
+    crc_type = CRC_NONE;
 }
 
 // table lookup LUT solution
 uint16_t crc16_fast(uint8_t const *d, size_t n, uint16_t initval, bool refin, bool refout) {
 
-	// fast lookup table algorithm without augmented zero bytes, e.g. used in pkzip.
-	// only usable with polynom orders of 8, 16, 24 or 32.
-	if (n == 0)
+    // fast lookup table algorithm without augmented zero bytes, e.g. used in pkzip.
+    // only usable with polynom orders of 8, 16, 24 or 32.
+    if (n == 0)
         return (~initval);
 
-	uint16_t crc = initval;
+    uint16_t crc = initval;
 
-	if (refin)
-		crc = reflect16(crc);
+    if (refin)
+        crc = reflect16(crc);
 
-	if (!refin)
-		while (n--) crc = (crc << 8) ^ crc_table[ ((crc >> 8) ^ *d++) & 0xFF ];
-	else
-		while (n--) crc = (crc >> 8) ^ crc_table[ (crc & 0xFF) ^ *d++];
+    if (!refin)
+        while (n--) crc = (crc << 8) ^ crc_table[ ((crc >> 8) ^ *d++) & 0xFF ];
+    else
+        while (n--) crc = (crc >> 8) ^ crc_table[ (crc & 0xFF) ^ *d++];
 
-	if (refout^refin)
-		crc = reflect16(crc);
+    if (refout^refin)
+        crc = reflect16(crc);
 
-	return crc;
+    return crc;
 }
 
 // bit looped solution  TODO REMOVED
 uint16_t update_crc16_ex( uint16_t crc, uint8_t c, uint16_t polynomial ) {
-	uint16_t i, v, tmp = 0;
+    uint16_t i, v, tmp = 0;
 
-	v = (crc ^ c) & 0xff;
+    v = (crc ^ c) & 0xff;
 
-	for (i = 0; i < 8; i++) {
+    for (i = 0; i < 8; i++) {
 
-		if ( (tmp ^ v) & 1 )
-			tmp = ( tmp >> 1 ) ^ polynomial;
-		else
-			tmp >>= 1;
+        if ( (tmp ^ v) & 1 )
+            tmp = ( tmp >> 1 ) ^ polynomial;
+        else
+            tmp >>= 1;
 
-		v >>= 1;
-	}
-	return ((crc >> 8) ^ tmp) & 0xffff;
+        v >>= 1;
+    }
+    return ((crc >> 8) ^ tmp) & 0xffff;
 }
 uint16_t update_crc16( uint16_t crc, uint8_t c ) {
-	return update_crc16_ex( crc, c, CRC16_POLY_CCITT);
+    return update_crc16_ex( crc, c, CRC16_POLY_CCITT);
 }
 
 // two ways.  msb or lsb loop.
 uint16_t crc16(uint8_t const *d, size_t length, uint16_t remainder, uint16_t polynomial, bool refin, bool refout) {
-	if (length == 0)
+    if (length == 0)
         return (~remainder);
 
-	uint8_t c;
+    uint8_t c;
     for (uint32_t i = 0; i < length; ++i) {
-		c = d[i];
-		if (refin) c = reflect8(c);
+        c = d[i];
+        if (refin) c = reflect8(c);
 
-		// xor in at msb
+        // xor in at msb
         remainder ^= (c << 8);
 
-		// 8 iteration loop
+        // 8 iteration loop
         for (uint8_t j = 8; j; --j) {
             if (remainder & 0x8000) {
                 remainder = (remainder << 1) ^ polynomial;
@@ -140,58 +140,58 @@ uint16_t crc16(uint8_t const *d, size_t length, uint16_t remainder, uint16_t pol
             }
         }
     }
-	if (refout)
-		remainder = reflect16(remainder);
+    if (refout)
+        remainder = reflect16(remainder);
 
     return remainder;
 }
 
 void compute_crc(CrcType_t ct, const uint8_t *d, size_t n, uint8_t *first, uint8_t *second) {
 
-	// can't calc a crc on less than 1 byte
-	if ( n == 0 ) return;
+    // can't calc a crc on less than 1 byte
+    if ( n == 0 ) return;
 
-	init_table(ct);
+    init_table(ct);
 
-	uint16_t crc = 0;
-	switch (ct) {
-		case CRC_14443_A: crc = crc16_a(d, n); break;
-		case CRC_14443_B:
-		case CRC_15693: crc = crc16_x25(d, n); break;
-		case CRC_ICLASS: crc = crc16_iclass(d, n); break;
-		case CRC_FELICA:crc = crc16_xmodem(d, n); break;
-		//case CRC_LEGIC:
-		case CRC_CCITT: crc = crc16_ccitt(d, n); break;
-		case CRC_KERMIT: crc = crc16_kermit(d, n); break;
-		default: break;
-	}
-	*first = (crc & 0xFF);
+    uint16_t crc = 0;
+    switch (ct) {
+        case CRC_14443_A: crc = crc16_a(d, n); break;
+        case CRC_14443_B:
+        case CRC_15693: crc = crc16_x25(d, n); break;
+        case CRC_ICLASS: crc = crc16_iclass(d, n); break;
+        case CRC_FELICA:crc = crc16_xmodem(d, n); break;
+        //case CRC_LEGIC:
+        case CRC_CCITT: crc = crc16_ccitt(d, n); break;
+        case CRC_KERMIT: crc = crc16_kermit(d, n); break;
+        default: break;
+    }
+    *first = (crc & 0xFF);
     *second = ((crc >> 8) & 0xFF);
 }
 uint16_t crc(CrcType_t ct, const uint8_t *d, size_t n) {
 
-	// can't calc a crc on less than 3 byte. (1byte + 2 crc bytes)
-	if ( n < 3 ) return 0;
+    // can't calc a crc on less than 3 byte. (1byte + 2 crc bytes)
+    if ( n < 3 ) return 0;
 
-	init_table(ct);
-	switch (ct) {
-		case CRC_14443_A: return crc16_a(d, n);
-		case CRC_14443_B:
-		case CRC_15693: return crc16_x25(d, n);
-		case CRC_ICLASS: return crc16_iclass(d, n);
-		case CRC_FELICA: return crc16_xmodem(d, n);
-		//case CRC_LEGIC:
-		case CRC_CCITT: return crc16_ccitt(d, n);
-		case CRC_KERMIT: return crc16_kermit(d, n);
-		default: break;
-	}
-	return 0;
+    init_table(ct);
+    switch (ct) {
+        case CRC_14443_A: return crc16_a(d, n);
+        case CRC_14443_B:
+        case CRC_15693: return crc16_x25(d, n);
+        case CRC_ICLASS: return crc16_iclass(d, n);
+        case CRC_FELICA: return crc16_xmodem(d, n);
+        //case CRC_LEGIC:
+        case CRC_CCITT: return crc16_ccitt(d, n);
+        case CRC_KERMIT: return crc16_kermit(d, n);
+        default: break;
+    }
+    return 0;
 }
 
 // check CRC
 // ct   crc type
-// 	d	buffer with data
-//	n	length (including crc)
+// d    buffer with data
+// n    length (including crc)
 //
 //  This function uses the message + crc bytes in order to compare the "residue" afterwards.
 // crc16 algos like CRC-A become 0x000
@@ -199,39 +199,39 @@ uint16_t crc(CrcType_t ct, const uint8_t *d, size_t n) {
 // If calculated with crc bytes,  the residue should be 0xF0B8
 bool check_crc(CrcType_t ct, const uint8_t *d, size_t n) {
 
-	// can't calc a crc on less than 3 byte. (1byte + 2 crc bytes)
-	if ( n < 3 ) return false;
+    // can't calc a crc on less than 3 byte. (1byte + 2 crc bytes)
+    if ( n < 3 ) return false;
 
-	init_table(ct);
+    init_table(ct);
 
-	switch (ct) {
-		case CRC_14443_A:	return (crc16_a(d, n) == 0);
-		case CRC_14443_B:	return (crc16_x25(d, n) == X25_CRC_CHECK);
-		case CRC_15693:		return (crc16_x25(d, n) == X25_CRC_CHECK);
-		case CRC_ICLASS:	return (crc16_iclass(d, n) == 0);
-		case CRC_FELICA:	return (crc16_xmodem(d, n) == 0);
-		//case CRC_LEGIC:
-		case CRC_CCITT: return (crc16_ccitt(d, n) == 0);
-		default: break;
-	}
-	return false;
+    switch (ct) {
+        case CRC_14443_A: return (crc16_a(d, n) == 0);
+        case CRC_14443_B: return (crc16_x25(d, n) == X25_CRC_CHECK);
+        case CRC_15693:   return (crc16_x25(d, n) == X25_CRC_CHECK);
+        case CRC_ICLASS:  return (crc16_iclass(d, n) == 0);
+        case CRC_FELICA:  return (crc16_xmodem(d, n) == 0);
+        //case CRC_LEGIC:
+        case CRC_CCITT:   return (crc16_ccitt(d, n) == 0);
+        default: break;
+    }
+    return false;
 }
 
 // poly=0x1021  init=0xffff  refin=false  refout=false  xorout=0x0000  check=0x29b1  residue=0x0000  name="CRC-16/CCITT-FALSE"
 uint16_t crc16_ccitt(uint8_t const *d, size_t n) {
-	return crc16_fast(d, n, 0xffff, false, false);
+    return crc16_fast(d, n, 0xffff, false, false);
 }
 
 // FDX-B ISO11784/85) uses KERMIT
 // poly=0x1021  init=0x0000  refin=true  refout=true  xorout=0x0000 name="KERMIT"
 uint16_t crc16_kermit(uint8_t const *d, size_t n) {
-	return crc16_fast(d, n, 0x0000, true, true);
+    return crc16_fast(d, n, 0x0000, true, true);
 }
 
 // FeliCa uses XMODEM
 // poly=0x1021  init=0x0000  refin=false  refout=false  xorout=0x0000 name="XMODEM"
 uint16_t crc16_xmodem(uint8_t const *d, size_t n) {
-	return crc16_fast(d, n, 0x0000, false, false);
+    return crc16_fast(d, n, 0x0000, false, false);
 }
 
 // Following standards uses X-25
@@ -240,14 +240,14 @@ uint16_t crc16_xmodem(uint8_t const *d, size_t n) {
 //   ISO/IEC 13239 (formerly ISO/IEC 3309)
 // poly=0x1021  init=0xffff  refin=true  refout=true  xorout=0xffff name="X-25"
 uint16_t crc16_x25(uint8_t const *d, size_t n) {
-	uint16_t crc = crc16_fast(d, n, 0xffff, true, true);
-	crc = ~crc;
-	return crc;
+    uint16_t crc = crc16_fast(d, n, 0xffff, true, true);
+    crc = ~crc;
+    return crc;
 }
 // CRC-A (14443-3)
 // poly=0x1021 init=0xc6c6 refin=true refout=true xorout=0x0000 name="CRC-A"
 uint16_t crc16_a(uint8_t const *d, size_t n) {
-	return crc16_fast(d, n, 0xC6C6, true, true);
+    return crc16_fast(d, n, 0xC6C6, true, true);
 }
 
 // iClass crc
@@ -255,12 +255,12 @@ uint16_t crc16_a(uint8_t const *d, size_t n) {
 // poly       0x1021 reflected 0x8408
 // poly=0x1021  init=0x4807  refin=true  refout=true  xorout=0x0BC3  check=0xF0B8  name="CRC-16/ICLASS"
 uint16_t crc16_iclass(uint8_t const *d, size_t n) {
-	return crc16_fast(d, n, 0x4807, true, true);
+    return crc16_fast(d, n, 0x4807, true, true);
 }
 
 // This CRC-16 is used in Legic Advant systems.
 // poly=0xB400,  init=depends  refin=true  refout=true  xorout=0x0000  check=  name="CRC-16/LEGIC"
 uint16_t crc16_legic(uint8_t const *d, size_t n, uint8_t uidcrc) {
-	uint16_t initial = uidcrc << 8 | uidcrc;
-	return crc16_fast(d, n, initial, true, true);
+    uint16_t initial = uidcrc << 8 | uidcrc;
+    return crc16_fast(d, n, initial, true, true);
 }
diff --git a/common/crc16.h b/common/crc16.h
index c11cf6351..6b3f1432b 100644
--- a/common/crc16.h
+++ b/common/crc16.h
@@ -14,20 +14,20 @@
 
 #define CRC16_POLY_CCITT  0x1021
 #define CRC16_POLY_LEGIC  0xc6c6 //0x6363
-#define CRC16_POLY_DNP	  0x3d65
+#define CRC16_POLY_DNP    0x3d65
 
-#define X25_CRC_CHECK		((uint16_t)(~0xF0B8 & 0xFFFF)) 	// use this for checking of a correct crc
+#define X25_CRC_CHECK     ((uint16_t)(~0xF0B8 & 0xFFFF)) // use this for checking of a correct crc
 
 typedef enum {
-	CRC_NONE,
-	CRC_14443_A,
-	CRC_14443_B,
-	CRC_15693,
-	CRC_ICLASS,
-	CRC_FELICA,
-	CRC_LEGIC,
-	CRC_CCITT,
-	CRC_KERMIT,
+    CRC_NONE,
+    CRC_14443_A,
+    CRC_14443_B,
+    CRC_15693,
+    CRC_ICLASS,
+    CRC_FELICA,
+    CRC_LEGIC,
+    CRC_CCITT,
+    CRC_KERMIT,
 } CrcType_t;
 
 uint16_t update_crc16_ex( uint16_t crc, uint8_t c, uint16_t polynomial );
diff --git a/common/crc64.c b/common/crc64.c
index adf62d97d..5dc779f8d 100644
--- a/common/crc64.c
+++ b/common/crc64.c
@@ -6,7 +6,7 @@
 #define CRC64_ECMA_PRESET 0x0000000000000000
 
 const uint64_t crc64_table[] = {
-		 0x0000000000000000, 0x42F0E1EBA9EA3693, 0x85E1C3D753D46D26, 0xC711223CFA3E5BB5,
+         0x0000000000000000, 0x42F0E1EBA9EA3693, 0x85E1C3D753D46D26, 0xC711223CFA3E5BB5,
          0x493366450E42ECDF, 0x0BC387AEA7A8DA4C, 0xCCD2A5925D9681F9, 0x8E224479F47CB76A,
          0x9266CC8A1C85D9BE, 0xD0962D61B56FEF2D, 0x17870F5D4F51B498, 0x5577EEB6E6BB820B,
          0xDB55AACF12C73561, 0x99A54B24BB2D03F2, 0x5EB4691841135847, 0x1C4488F3E8F96ED4,
@@ -74,10 +74,10 @@ const uint64_t crc64_table[] = {
 
 void crc64 (const uint8_t *data, const size_t len, uint64_t *crc) {
 
-	for (size_t i = 0; i < len; i++) {
-		uint8_t tableIndex = (((uint8_t)(*crc >> 56)) ^ data[i]) & 0xff;
-		*crc = crc64_table[tableIndex] ^ (*crc << 8);
-	}
+    for (size_t i = 0; i < len; i++) {
+        uint8_t tableIndex = (((uint8_t)(*crc >> 56)) ^ data[i]) & 0xff;
+        *crc = crc64_table[tableIndex] ^ (*crc << 8);
+    }
 }
 
-//suint8_t x = 	(c & 0xFF00000000000000 ) >> 56;
\ No newline at end of file
+//suint8_t x = (c & 0xFF00000000000000 ) >> 56;
\ No newline at end of file
diff --git a/common/default_version.c b/common/default_version.c
index b143afd4c..af5bc59e2 100644
--- a/common/default_version.c
+++ b/common/default_version.c
@@ -1,9 +1,9 @@
 #include "proxmark3.h"
 /* This is the default version.c file that Makefile.common falls back to if perl is not available */
 const struct version_information __attribute__((section(".version_information"))) version_information = {
-		VERSION_INFORMATION_MAGIC,
-		1, /* version 1 */
-		0, /* version information not present */
-		2, /* cleanliness couldn't be determined */
-		/* Remaining fields: zero */
+        VERSION_INFORMATION_MAGIC,
+        1, /* version 1 */
+        0, /* version information not present */
+        2, /* cleanliness couldn't be determined */
+        /* Remaining fields: zero */
 };
diff --git a/common/desfire.h b/common/desfire.h
index 81ca57b92..3cffd2967 100644
--- a/common/desfire.h
+++ b/common/desfire.h
@@ -55,15 +55,15 @@ typedef enum {
 
 
 enum DESFIRE_AUTH_SCHEME {
-	AS_LEGACY,
-	AS_NEW
+    AS_LEGACY,
+    AS_NEW
 };
 
 enum DESFIRE_CRYPTOALGO {
-	T_DES = 0x00,
-	T_3DES = 0x01,
-	T_3K3DES = 0x02,
-	T_AES = 0x03
+    T_DES = 0x00,
+    T_3DES = 0x01,
+    T_3K3DES = 0x02,
+    T_AES = 0x03
 };
 
 
@@ -74,7 +74,7 @@ struct desfire_key {
     // DES_key_schedule ks1;
     // DES_key_schedule ks2;
     // DES_key_schedule ks3;
-	AesCtx aes_ks;
+    AesCtx aes_ks;
     uint8_t cmac_sk1[24];
     uint8_t cmac_sk2[24];
     uint8_t aes_version;
@@ -89,10 +89,10 @@ struct desfire_tag {
     uint8_t last_internal_error;
     uint8_t last_pcd_error;
     desfirekey_t session_key;
-	enum DESFIRE_AUTH_SCHEME authentication_scheme;
+    enum DESFIRE_AUTH_SCHEME authentication_scheme;
     uint8_t authenticated_key_no;
 
-	uint8_t ivect[MAX_CRYPTO_BLOCK_SIZE];
+    uint8_t ivect[MAX_CRYPTO_BLOCK_SIZE];
     uint8_t cmac[16];
     uint8_t *crypto_buffer;
     size_t crypto_buffer_size;
@@ -111,66 +111,66 @@ enum DESFIRE_FILE_TYPES {
 };
 
 enum DESFIRE_STATUS {
-    OPERATION_OK 				= 0x00,
-    NO_CHANGES 					= 0x0c,
-    OUT_OF_EEPROM_ERROR 		= 0x0e,
-    ILLEGAL_COMMAND_CODE 		= 0x1c,
-    INTEGRITY_ERROR 			= 0x1e,
-    NO_SUCH_KEY 				= 0x40,
-    LENGTH_ERROR 				= 0x7e,
-    PERMISSION_DENIED 			= 0x9d,
-    PARAMETER_ERROR 			= 0x9e,
-    APPLICATION_NOT_FOUND 		= 0xa0,
-    APPL_INTEGRITY_ERROR 		= 0xa1,
-    AUTHENTICATION_ERROR 		= 0xae,
-    ADDITIONAL_FRAME 			= 0xaf,
-    BOUNDARY_ERROR 				= 0xbe,
-    PICC_INTEGRITY_ERROR 		= 0xc1,
-    COMMAND_ABORTED 			= 0xca,
-    PICC_DISABLED_ERROR 		= 0xcd,
-    COUNT_ERROR 				= 0xce,
-    DUPLICATE_ERROR 			= 0xde,
-    EEPROM_ERROR 				= 0xee,
-    FILE_NOT_FOUND 				= 0xf0,
-    FILE_INTEGRITY_ERROR 		= 0xf1
+    OPERATION_OK                        = 0x00,
+    NO_CHANGES                          = 0x0c,
+    OUT_OF_EEPROM_ERROR                 = 0x0e,
+    ILLEGAL_COMMAND_CODE                = 0x1c,
+    INTEGRITY_ERROR                     = 0x1e,
+    NO_SUCH_KEY                         = 0x40,
+    LENGTH_ERROR                        = 0x7e,
+    PERMISSION_DENIED                   = 0x9d,
+    PARAMETER_ERROR                     = 0x9e,
+    APPLICATION_NOT_FOUND               = 0xa0,
+    APPL_INTEGRITY_ERROR                = 0xa1,
+    AUTHENTICATION_ERROR                = 0xae,
+    ADDITIONAL_FRAME                    = 0xaf,
+    BOUNDARY_ERROR                      = 0xbe,
+    PICC_INTEGRITY_ERROR                = 0xc1,
+    COMMAND_ABORTED                     = 0xca,
+    PICC_DISABLED_ERROR                 = 0xcd,
+    COUNT_ERROR                         = 0xce,
+    DUPLICATE_ERROR                     = 0xde,
+    EEPROM_ERROR                        = 0xee,
+    FILE_NOT_FOUND                      = 0xf0,
+    FILE_INTEGRITY_ERROR                = 0xf1
 };
 
 enum DESFIRE_CMD {
-    CREATE_APPLICATION 			= 0xca,
-    DELETE_APPLICATION 			= 0xda,
-    GET_APPLICATION_IDS 		= 0x6a,
-    SELECT_APPLICATION 			= 0x5a,
-    FORMAT_PICC 				= 0xfc,
-    GET_VERSION 				= 0x60,
-    READ_DATA 					= 0xbd,
-    WRITE_DATA					= 0x3d,
-    GET_VALUE 					= 0x6c,
-    CREDIT 						= 0x0c,
-    DEBIT 						= 0xdc,
-    LIMITED_CREDIT 				= 0x1c,
-    WRITE_RECORD 				= 0x3b,
-    READ_RECORDS 				= 0xbb,
-    CLEAR_RECORD_FILE 			= 0xeb,
-    COMMIT_TRANSACTION 			= 0xc7,
-    ABORT_TRANSACTION 			= 0xa7,
-    GET_FREE_MEMORY             = 0x6e,
-	GET_FILE_IDS 				= 0x6f,
-    GET_FILE_SETTINGS 			= 0xf5,
-    CHANGE_FILE_SETTINGS 		= 0x5f,
-    CREATE_STD_DATA_FILE 		= 0xcd,
-    CREATE_BACKUP_DATA_FILE 	= 0xcb,
-    CREATE_VALUE_FILE 			= 0xcc,
-    CREATE_LINEAR_RECORD_FILE 	= 0xc1,
-    CREATE_CYCLIC_RECORD_FILE 	= 0xc0,
-    DELETE_FILE 				= 0xdf,
-    AUTHENTICATE	 			= 0x0a,  // AUTHENTICATE_NATIVE
-	AUTHENTICATE_ISO 			= 0x1a,  // AUTHENTICATE_STANDARD
-	AUTHENTICATE_AES 			= 0xaa,
-    CHANGE_KEY_SETTINGS 		= 0x54,
-    GET_KEY_SETTINGS 			= 0x45,
-    CHANGE_KEY 					= 0xc4,
-    GET_KEY_VERSION 			= 0x64,
-    AUTHENTICATION_FRAME 		= 0xAF
+    CREATE_APPLICATION                  = 0xca,
+    DELETE_APPLICATION                  = 0xda,
+    GET_APPLICATION_IDS                 = 0x6a,
+    SELECT_APPLICATION                  = 0x5a,
+    FORMAT_PICC                         = 0xfc,
+    GET_VERSION                         = 0x60,
+    READ_DATA                           = 0xbd,
+    WRITE_DATA                          = 0x3d,
+    GET_VALUE                           = 0x6c,
+    CREDIT                              = 0x0c,
+    DEBIT                               = 0xdc,
+    LIMITED_CREDIT                      = 0x1c,
+    WRITE_RECORD                        = 0x3b,
+    READ_RECORDS                        = 0xbb,
+    CLEAR_RECORD_FILE                   = 0xeb,
+    COMMIT_TRANSACTION                  = 0xc7,
+    ABORT_TRANSACTION                   = 0xa7,
+    GET_FREE_MEMORY                     = 0x6e,
+    GET_FILE_IDS                        = 0x6f,
+    GET_FILE_SETTINGS                   = 0xf5,
+    CHANGE_FILE_SETTINGS                = 0x5f,
+    CREATE_STD_DATA_FILE                = 0xcd,
+    CREATE_BACKUP_DATA_FILE             = 0xcb,
+    CREATE_VALUE_FILE                   = 0xcc,
+    CREATE_LINEAR_RECORD_FILE           = 0xc1,
+    CREATE_CYCLIC_RECORD_FILE           = 0xc0,
+    DELETE_FILE                         = 0xdf,
+    AUTHENTICATE                        = 0x0a,  // AUTHENTICATE_NATIVE
+    AUTHENTICATE_ISO                    = 0x1a,  // AUTHENTICATE_STANDARD
+    AUTHENTICATE_AES                    = 0xaa,
+    CHANGE_KEY_SETTINGS                 = 0x54,
+    GET_KEY_SETTINGS                    = 0x45,
+    CHANGE_KEY                          = 0xc4,
+    GET_KEY_VERSION                     = 0x64,
+    AUTHENTICATION_FRAME                = 0xAF
 };
 
 #endif
diff --git a/common/i2c.c b/common/i2c.c
index dff77a05a..041b3e7ec 100644
--- a/common/i2c.c
+++ b/common/i2c.c
@@ -10,797 +10,797 @@
 //-----------------------------------------------------------------------------
 #include "i2c.h"
 
-#define	GPIO_RST	AT91C_PIO_PA1
-#define GPIO_SCL	AT91C_PIO_PA5
-#define GPIO_SDA	AT91C_PIO_PA7
+#define GPIO_RST AT91C_PIO_PA1
+#define GPIO_SCL AT91C_PIO_PA5
+#define GPIO_SDA AT91C_PIO_PA7
 
-#define SCL_H		HIGH(GPIO_SCL)
-#define SCL_L		LOW(GPIO_SCL)
-#define SDA_H		HIGH(GPIO_SDA)
-#define SDA_L		LOW(GPIO_SDA)
+#define SCL_H    HIGH(GPIO_SCL)
+#define SCL_L    LOW(GPIO_SCL)
+#define SDA_H    HIGH(GPIO_SDA)
+#define SDA_L    LOW(GPIO_SDA)
 
-#define SCL_read	(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SCL)
-#define SDA_read	(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SDA)
+#define SCL_read (AT91C_BASE_PIOA->PIO_PDSR & GPIO_SCL)
+#define SDA_read (AT91C_BASE_PIOA->PIO_PDSR & GPIO_SDA)
 
 #define I2C_ERROR  "I2C_WaitAck Error"
 
 volatile unsigned long c;
 
-//	ֱ��ʹ��ѭ������ʱ��һ��ѭ�� 6 ��ָ�48M�� Delay=1 ���Ϊ 200kbps
+// ֱ��ʹ��ѭ������ʱ��һ��ѭ�� 6 ��ָ�48M�� Delay=1 ���Ϊ 200kbps
 // timer.
 // I2CSpinDelayClk(4) = 12.31us
 // I2CSpinDelayClk(1) = 3.07us
 void __attribute__((optimize("O0"))) I2CSpinDelayClk(uint16_t delay) {
-	for (c = delay * 2; c; c--) {};
+    for (c = delay * 2; c; c--) {};
 }
 
-#define I2C_DELAY_1CLK 		I2CSpinDelayClk(1)
-#define I2C_DELAY_2CLK		I2CSpinDelayClk(2)
-#define I2C_DELAY_XCLK(x)	I2CSpinDelayClk((x))
+#define I2C_DELAY_1CLK    I2CSpinDelayClk(1)
+#define I2C_DELAY_2CLK    I2CSpinDelayClk(2)
+#define I2C_DELAY_XCLK(x) I2CSpinDelayClk((x))
 
 #define  ISO7618_MAX_FRAME 255
 
 // try i2c bus recovery at 100kHz = 5uS high, 5uS low
 void I2C_recovery(void) {
 
-	DbpString("Performing i2c bus recovery");
+    DbpString("Performing i2c bus recovery");
 
-	// reset I2C
-	SDA_H; SCL_H;
+    // reset I2C
+    SDA_H; SCL_H;
 
-	 //9nth cycle acts as NACK
-	for (int i = 0; i < 10; i++)  {
-		SCL_H; WaitUS(5);
-		SCL_L; WaitUS(5);
-	}
+     //9nth cycle acts as NACK
+    for (int i = 0; i < 10; i++)  {
+        SCL_H; WaitUS(5);
+        SCL_L; WaitUS(5);
+    }
 
     //a STOP signal (SDA from low to high while CLK is high)
-	SDA_L; WaitUS(5);
-	SCL_H; WaitUS(2);
-	SDA_H; WaitUS(2);
+    SDA_L; WaitUS(5);
+    SCL_H; WaitUS(2);
+    SDA_H; WaitUS(2);
 
-	bool isok = (SCL_read && SDA_read);
+    bool isok = (SCL_read && SDA_read);
     if (!SDA_read)
-		DbpString("I2C bus recovery  error: SDA still LOW");
-	if (!SCL_read)
-		DbpString("I2C bus recovery  error: SCL still LOW");
-	if (isok)
-		DbpString("I2C bus recovery complete");
+        DbpString("I2C bus recovery  error: SDA still LOW");
+    if (!SCL_read)
+        DbpString("I2C bus recovery  error: SCL still LOW");
+    if (isok)
+        DbpString("I2C bus recovery complete");
 }
 
 void I2C_init(void) {
-	// Configure reset pin, close up pull up, push-pull output, default high
-	AT91C_BASE_PIOA->PIO_PPUDR = GPIO_RST;
-	AT91C_BASE_PIOA->PIO_MDDR = GPIO_RST;
+    // Configure reset pin, close up pull up, push-pull output, default high
+    AT91C_BASE_PIOA->PIO_PPUDR = GPIO_RST;
+    AT91C_BASE_PIOA->PIO_MDDR = GPIO_RST;
 
-	// Configure I2C pin, open up, open leakage
-	AT91C_BASE_PIOA->PIO_PPUER |= (GPIO_SCL | GPIO_SDA);
-	AT91C_BASE_PIOA->PIO_MDER |= (GPIO_SCL | GPIO_SDA);
+    // Configure I2C pin, open up, open leakage
+    AT91C_BASE_PIOA->PIO_PPUER |= (GPIO_SCL | GPIO_SDA);
+    AT91C_BASE_PIOA->PIO_MDER |= (GPIO_SCL | GPIO_SDA);
 
-	// default three lines all pull up
-	AT91C_BASE_PIOA->PIO_SODR |= (GPIO_SCL | GPIO_SDA | GPIO_RST);
+    // default three lines all pull up
+    AT91C_BASE_PIOA->PIO_SODR |= (GPIO_SCL | GPIO_SDA | GPIO_RST);
 
-	AT91C_BASE_PIOA->PIO_OER |= (GPIO_SCL | GPIO_SDA | GPIO_RST);
-	AT91C_BASE_PIOA->PIO_PER |= (GPIO_SCL | GPIO_SDA | GPIO_RST);
+    AT91C_BASE_PIOA->PIO_OER |= (GPIO_SCL | GPIO_SDA | GPIO_RST);
+    AT91C_BASE_PIOA->PIO_PER |= (GPIO_SCL | GPIO_SDA | GPIO_RST);
 
 
-	bool isok =  (SCL_read && SDA_read);
-	if ( !isok )
-		I2C_recovery();
+    bool isok =  (SCL_read && SDA_read);
+    if ( !isok )
+        I2C_recovery();
 
 }
 
 // set the reset state
 void I2C_SetResetStatus(uint8_t LineRST, uint8_t LineSCK, uint8_t LineSDA) {
-	if (LineRST)
-		HIGH(GPIO_RST);
-	else
-		LOW(GPIO_RST);
+    if (LineRST)
+        HIGH(GPIO_RST);
+    else
+        LOW(GPIO_RST);
 
-	if (LineSCK)
-		HIGH(GPIO_SCL);
-	else
-		LOW(GPIO_SCL);
+    if (LineSCK)
+        HIGH(GPIO_SCL);
+    else
+        LOW(GPIO_SCL);
 
-	if (LineSDA)
-		HIGH(GPIO_SDA);
-	else
-		LOW(GPIO_SDA);
+    if (LineSDA)
+        HIGH(GPIO_SDA);
+    else
+        LOW(GPIO_SDA);
 }
 
 // Reset the SIM_Adapter, then  enter the main program
 // Note: the SIM_Adapter will not enter the main program after power up. Please run this function before use SIM_Adapter.
 void I2C_Reset_EnterMainProgram(void) {
-	StartTicks();
-	I2C_init();
-	I2C_SetResetStatus(0, 0, 0);
-	WaitMS(30);
-	I2C_SetResetStatus(1, 0, 0);
-	WaitMS(30);
-	I2C_SetResetStatus(1, 1, 1);
-	WaitMS(10);
+    StartTicks();
+    I2C_init();
+    I2C_SetResetStatus(0, 0, 0);
+    WaitMS(30);
+    I2C_SetResetStatus(1, 0, 0);
+    WaitMS(30);
+    I2C_SetResetStatus(1, 1, 1);
+    WaitMS(10);
 }
 
 // Reset the SIM_Adapter, then enter the bootloader program
 // Reserve for firmware update.
 void I2C_Reset_EnterBootloader(void) {
-	StartTicks();
-	I2C_init();
-	I2C_SetResetStatus(0, 1, 1);
-	WaitMS(100);
-	I2C_SetResetStatus(1, 1, 1);
-	WaitMS(10);
+    StartTicks();
+    I2C_init();
+    I2C_SetResetStatus(0, 1, 1);
+    WaitMS(100);
+    I2C_SetResetStatus(1, 1, 1);
+    WaitMS(10);
 }
 
 // Wait for the clock to go High.
 bool WaitSCL_H_delay(uint32_t delay) {
-	while (delay--)	{
-		if (SCL_read) {
-			return true;
-		}
-		I2C_DELAY_1CLK;
-	}
-	return false;
+    while (delay--) {
+        if (SCL_read) {
+            return true;
+        }
+        I2C_DELAY_1CLK;
+    }
+    return false;
 }
 
 // 5000 * 3.07us = 15350us. 15.35ms
 // 15000 * 3.07us = 46050us. 46.05ms
 bool WaitSCL_H(void) {
-	return WaitSCL_H_delay(15000);
+    return WaitSCL_H_delay(15000);
 }
 
 bool WaitSCL_L_delay(uint32_t delay) {
-	while (delay--)	{
-		if (!SCL_read) {
-			return true;
-		}
-		I2C_DELAY_1CLK;
-	}
-	return false;
+    while (delay--) {
+        if (!SCL_read) {
+            return true;
+        }
+        I2C_DELAY_1CLK;
+    }
+    return false;
 }
 // 5000 * 3.07us = 15350us. 15.35ms
 bool WaitSCL_L(void) {
-	return WaitSCL_L_delay(15000);
+    return WaitSCL_L_delay(15000);
 }
 
 // Wait max 1800ms or until SCL goes LOW.
 // It timeout reading response from card
 // Which ever comes first
 bool WaitSCL_L_timeout(void){
-	volatile uint16_t delay = 1800;
-	while ( delay-- ) {
-		// exit on SCL LOW
-		if (!SCL_read)
-			return true;
+    volatile uint16_t delay = 1800;
+    while ( delay-- ) {
+        // exit on SCL LOW
+        if (!SCL_read)
+            return true;
 
-		WaitMS(1);
-	}
-	return (delay == 0);
+        WaitMS(1);
+    }
+    return (delay == 0);
 }
 
 bool I2C_Start(void) {
 
-	I2C_DELAY_XCLK(4);
-	SDA_H; I2C_DELAY_1CLK;
-	SCL_H;
-	if (!WaitSCL_H()) return false;
+    I2C_DELAY_XCLK(4);
+    SDA_H; I2C_DELAY_1CLK;
+    SCL_H;
+    if (!WaitSCL_H()) return false;
 
-	I2C_DELAY_2CLK;
+    I2C_DELAY_2CLK;
 
-	if (!SCL_read) return false;
-	if (!SDA_read) return false;
+    if (!SCL_read) return false;
+    if (!SDA_read) return false;
 
-	SDA_L; I2C_DELAY_2CLK;
-	return true;
+    SDA_L; I2C_DELAY_2CLK;
+    return true;
 }
 
 bool I2C_WaitForSim() {
 
-	// wait for data from card
-	if (!WaitSCL_L_timeout())
-		return false;
+    // wait for data from card
+    if (!WaitSCL_L_timeout())
+        return false;
 
-	// 8051 speaks with smart card.
-	// 1000*50*3.07 = 153.5ms
-	// 1byte transfer == 1ms  with max frame being 256bytes
-	if (!WaitSCL_H_delay(10 * 1000 * 50) )
-		return false;
+    // 8051 speaks with smart card.
+    // 1000*50*3.07 = 153.5ms
+    // 1byte transfer == 1ms  with max frame being 256bytes
+    if (!WaitSCL_H_delay(10 * 1000 * 50) )
+        return false;
 
-	return true;
+    return true;
 }
 
 // send i2c STOP
 void I2C_Stop(void) {
-	SCL_L; I2C_DELAY_2CLK;
-	SDA_L; I2C_DELAY_2CLK;
-	SCL_H; I2C_DELAY_2CLK;
-	if (!WaitSCL_H()) return;
-	SDA_H;
-	I2C_DELAY_XCLK(8);
+    SCL_L; I2C_DELAY_2CLK;
+    SDA_L; I2C_DELAY_2CLK;
+    SCL_H; I2C_DELAY_2CLK;
+    if (!WaitSCL_H()) return;
+    SDA_H;
+    I2C_DELAY_XCLK(8);
 }
 
 // Send i2c ACK
 void I2C_Ack(void) {
-	SCL_L; I2C_DELAY_2CLK;
-	SDA_L; I2C_DELAY_2CLK;
-	SCL_H; I2C_DELAY_2CLK;
-	if (!WaitSCL_H()) return;
-	SCL_L; I2C_DELAY_2CLK;
+    SCL_L; I2C_DELAY_2CLK;
+    SDA_L; I2C_DELAY_2CLK;
+    SCL_H; I2C_DELAY_2CLK;
+    if (!WaitSCL_H()) return;
+    SCL_L; I2C_DELAY_2CLK;
 }
 
 // Send i2c NACK
 void I2C_NoAck(void) {
-	SCL_L; I2C_DELAY_2CLK;
-	SDA_H; I2C_DELAY_2CLK;
-	SCL_H; I2C_DELAY_2CLK;
-	if (!WaitSCL_H()) return;
-	SCL_L; I2C_DELAY_2CLK;
+    SCL_L; I2C_DELAY_2CLK;
+    SDA_H; I2C_DELAY_2CLK;
+    SCL_H; I2C_DELAY_2CLK;
+    if (!WaitSCL_H()) return;
+    SCL_L; I2C_DELAY_2CLK;
 }
 
 bool I2C_WaitAck(void) {
-	SCL_L; I2C_DELAY_1CLK;
-	SDA_H; I2C_DELAY_1CLK;
-	SCL_H;
-	if (!WaitSCL_H())
-		return false;
+    SCL_L; I2C_DELAY_1CLK;
+    SDA_H; I2C_DELAY_1CLK;
+    SCL_H;
+    if (!WaitSCL_H())
+        return false;
 
-	I2C_DELAY_2CLK;
-	I2C_DELAY_2CLK;
-	if (SDA_read) {
-		SCL_L;
-		return false;
-	}
-	SCL_L;
-	return true;
+    I2C_DELAY_2CLK;
+    I2C_DELAY_2CLK;
+    if (SDA_read) {
+        SCL_L;
+        return false;
+    }
+    SCL_L;
+    return true;
 }
 
-void I2C_SendByte(uint8_t data)	{
-	uint8_t bits = 8;
+void I2C_SendByte(uint8_t data) {
+    uint8_t bits = 8;
 
-	while (bits--) {
-		SCL_L;
+    while (bits--) {
+        SCL_L;
 
-		I2C_DELAY_1CLK;
+        I2C_DELAY_1CLK;
 
-		if (data & 0x80)
-			SDA_H;
-		else
-			SDA_L;
+        if (data & 0x80)
+            SDA_H;
+        else
+            SDA_L;
 
-		data <<= 1;
+        data <<= 1;
 
-		I2C_DELAY_1CLK;
+        I2C_DELAY_1CLK;
 
-		SCL_H;
-		if (!WaitSCL_H())
-			return;
+        SCL_H;
+        if (!WaitSCL_H())
+            return;
 
-		I2C_DELAY_2CLK;
-	}
-	SCL_L;
+        I2C_DELAY_2CLK;
+    }
+    SCL_L;
 }
 
 int16_t I2C_ReadByte(void) {
-	uint8_t bits = 8, b = 0;
+    uint8_t bits = 8, b = 0;
 
-	SDA_H;
-	while (bits--)	{
-		b <<= 1;
-		SCL_L;
-		if (!WaitSCL_L()) return -2;
+    SDA_H;
+    while (bits--) {
+        b <<= 1;
+        SCL_L;
+        if (!WaitSCL_L()) return -2;
 
-		I2C_DELAY_1CLK;
+        I2C_DELAY_1CLK;
 
-		SCL_H;
-		if (!WaitSCL_H()) return -1;
+        SCL_H;
+        if (!WaitSCL_H()) return -1;
 
-		I2C_DELAY_1CLK;
-		if (SDA_read)
-			b |= 0x01;
-	}
-	SCL_L;
-	return b;
+        I2C_DELAY_1CLK;
+        if (SDA_read)
+            b |= 0x01;
+    }
+    SCL_L;
+    return b;
 }
 
 // Sends one byte  ( command to be written, SlaveDevice address)
 bool I2C_WriteCmd(uint8_t device_cmd, uint8_t device_address) {
-	bool bBreak = true;
-	do 	{
-		if (!I2C_Start())
-			return false;
+    bool bBreak = true;
+    do {
+        if (!I2C_Start())
+            return false;
 
-		I2C_SendByte(device_address & 0xFE);
-		if (!I2C_WaitAck())
-			break;
+        I2C_SendByte(device_address & 0xFE);
+        if (!I2C_WaitAck())
+            break;
 
-		I2C_SendByte(device_cmd);
-		if (!I2C_WaitAck())
-			break;
+        I2C_SendByte(device_cmd);
+        if (!I2C_WaitAck())
+            break;
 
-		bBreak = false;
-	} while (false);
+        bBreak = false;
+    } while (false);
 
-	I2C_Stop();
-	if (bBreak)	{
-		if ( MF_DBGLEVEL > 3 ) DbpString(I2C_ERROR);
-		return false;
-	}
-	return true;
+    I2C_Stop();
+    if (bBreak) {
+        if ( MF_DBGLEVEL > 3 ) DbpString(I2C_ERROR);
+        return false;
+    }
+    return true;
 }
 
 // Sends 1 byte data (Data to be written, command to be written , SlaveDevice address  ).
 bool I2C_WriteByte(uint8_t data, uint8_t device_cmd, uint8_t device_address) {
-	bool bBreak = true;
-	do 	{
-		if (!I2C_Start())
-			return false;
+    bool bBreak = true;
+    do {
+        if (!I2C_Start())
+            return false;
 
-		I2C_SendByte(device_address & 0xFE);
-		if (!I2C_WaitAck())
-			break;
+        I2C_SendByte(device_address & 0xFE);
+        if (!I2C_WaitAck())
+            break;
 
-		I2C_SendByte(device_cmd);
-		if (!I2C_WaitAck())
-			break;
+        I2C_SendByte(device_cmd);
+        if (!I2C_WaitAck())
+            break;
 
-		I2C_SendByte(data);
-		if (!I2C_WaitAck())
-			break;
+        I2C_SendByte(data);
+        if (!I2C_WaitAck())
+            break;
 
-		bBreak = false;
-	} while (false);
+        bBreak = false;
+    } while (false);
 
-	I2C_Stop();
-	if (bBreak)	{
-		if ( MF_DBGLEVEL > 3 ) DbpString(I2C_ERROR);
-		return false;
-	}
-	return true;
+    I2C_Stop();
+    if (bBreak) {
+        if ( MF_DBGLEVEL > 3 ) DbpString(I2C_ERROR);
+        return false;
+    }
+    return true;
 }
 
 //Sends array of data (Array, length, command to be written , SlaveDevice address  ).
 // len = uint8 (max buffer to write 256bytes)
 bool I2C_BufferWrite(uint8_t *data, uint8_t len, uint8_t device_cmd, uint8_t device_address) {
-	bool bBreak = true;
-	do {
-		if (!I2C_Start())
-			return false;
+    bool bBreak = true;
+    do {
+        if (!I2C_Start())
+            return false;
 
-		I2C_SendByte(device_address & 0xFE);
-		if (!I2C_WaitAck())
-			break;
+        I2C_SendByte(device_address & 0xFE);
+        if (!I2C_WaitAck())
+            break;
 
-		I2C_SendByte(device_cmd);
-		if (!I2C_WaitAck())
-			break;
+        I2C_SendByte(device_cmd);
+        if (!I2C_WaitAck())
+            break;
 
-		while (len) {
+        while (len) {
 
-			I2C_SendByte(*data);
-			if (!I2C_WaitAck())
-				break;
+            I2C_SendByte(*data);
+            if (!I2C_WaitAck())
+                break;
 
-			len--;
-			data++;
-		}
+            len--;
+            data++;
+        }
 
-		if (len == 0)
-			bBreak = false;
-	} while (false);
+        if (len == 0)
+            bBreak = false;
+    } while (false);
 
-	I2C_Stop();
-	if (bBreak)	{
-		if ( MF_DBGLEVEL > 3 ) DbpString(I2C_ERROR);
-		return false;
-	}
-	return true;
+    I2C_Stop();
+    if (bBreak) {
+        if ( MF_DBGLEVEL > 3 ) DbpString(I2C_ERROR);
+        return false;
+    }
+    return true;
 }
 
 // read one array of data (Data array, Readout length, command to be written , SlaveDevice address  ).
 // len = uint8 (max buffer to read 256bytes)
 int16_t I2C_BufferRead(uint8_t *data, uint8_t len, uint8_t device_cmd, uint8_t device_address) {
 
-	if ( !data || len == 0 )
-		return 0;
+    if ( !data || len == 0 )
+        return 0;
 
-	// extra wait  500us (514us measured)
-	// 200us  (xx measured)
-	WaitUS(600);
-	bool bBreak = true;
-	uint16_t readcount = 0;
+    // extra wait  500us (514us measured)
+    // 200us  (xx measured)
+    WaitUS(600);
+    bool bBreak = true;
+    uint16_t readcount = 0;
 
-	do {
-		if (!I2C_Start())
-			return 0;
+    do {
+        if (!I2C_Start())
+            return 0;
 
-		// 0xB0 / 0xC0  == i2c write
-		I2C_SendByte(device_address & 0xFE);
-		if (!I2C_WaitAck())
-			break;
+        // 0xB0 / 0xC0  == i2c write
+        I2C_SendByte(device_address & 0xFE);
+        if (!I2C_WaitAck())
+            break;
 
-		I2C_SendByte(device_cmd);
-		if (!I2C_WaitAck())
-			break;
+        I2C_SendByte(device_cmd);
+        if (!I2C_WaitAck())
+            break;
 
-		// 0xB1 / 0xC1 == i2c read
-		I2C_Start();
-		I2C_SendByte(device_address | 1);
-		if (!I2C_WaitAck())
-			break;
+        // 0xB1 / 0xC1 == i2c read
+        I2C_Start();
+        I2C_SendByte(device_address | 1);
+        if (!I2C_WaitAck())
+            break;
 
-		bBreak = false;
-	} while (false);
+        bBreak = false;
+    } while (false);
 
-	if (bBreak)	{
-		I2C_Stop();
-		if ( MF_DBGLEVEL > 3 ) DbpString(I2C_ERROR);
-		return 0;
-	}
+    if (bBreak) {
+        I2C_Stop();
+        if ( MF_DBGLEVEL > 3 ) DbpString(I2C_ERROR);
+        return 0;
+    }
 
-	while (len) {
+    while (len) {
 
-		int16_t tmp = I2C_ReadByte();
-		if ( tmp < 0 )
-			return tmp;
+        int16_t tmp = I2C_ReadByte();
+        if ( tmp < 0 )
+            return tmp;
 
-		*data = (uint8_t)tmp & 0xFF;
+        *data = (uint8_t)tmp & 0xFF;
 
-		len--;
+        len--;
 
-		// ��ȡ�ĵ�һ���ֽ�Ϊ��������
-		// The first byte in response is the message length
-		if (!readcount && (len > *data)) {
-			len = *data;
-		} else {
-			data++;
-		}
-		readcount++;
+        // ��ȡ�ĵ�һ���ֽ�Ϊ��������
+        // The first byte in response is the message length
+        if (!readcount && (len > *data)) {
+            len = *data;
+        } else {
+            data++;
+        }
+        readcount++;
 
-		// acknowledgements. After last byte send NACK.
-		if (len == 0)
-			I2C_NoAck();
-		else
-			I2C_Ack();
-	}
+        // acknowledgements. After last byte send NACK.
+        if (len == 0)
+            I2C_NoAck();
+        else
+            I2C_Ack();
+    }
 
-	I2C_Stop();
+    I2C_Stop();
 
-	// return bytecount - first byte (which is length byte)
-	return --readcount;
+    // return bytecount - first byte (which is length byte)
+    return --readcount;
 }
 
 int16_t I2C_ReadFW(uint8_t *data, uint8_t len, uint8_t msb, uint8_t lsb, uint8_t device_address) {
-	//START, 0xB0, 0x00, 0x00, START, 0xB1, xx, yy, zz, ......, STOP
-	bool bBreak = true;
-	uint8_t	readcount = 0;
+    //START, 0xB0, 0x00, 0x00, START, 0xB1, xx, yy, zz, ......, STOP
+    bool bBreak = true;
+    uint8_t readcount = 0;
 
-	// sending
-	do {
-		if (!I2C_Start())
-			return 0;
+    // sending
+    do {
+        if (!I2C_Start())
+            return 0;
 
-		// 0xB0 / 0xC0  i2c write
-		I2C_SendByte(device_address & 0xFE);
-		if (!I2C_WaitAck())
-			break;
+        // 0xB0 / 0xC0  i2c write
+        I2C_SendByte(device_address & 0xFE);
+        if (!I2C_WaitAck())
+            break;
 
-		I2C_SendByte(msb);
-		if (!I2C_WaitAck())
-			break;
+        I2C_SendByte(msb);
+        if (!I2C_WaitAck())
+            break;
 
-		I2C_SendByte(lsb);
-		if (!I2C_WaitAck())
-			break;
+        I2C_SendByte(lsb);
+        if (!I2C_WaitAck())
+            break;
 
-		// 0xB1 / 0xC1  i2c read
-		I2C_Start();
-		I2C_SendByte(device_address | 1);
-		if (!I2C_WaitAck())
-			break;
+        // 0xB1 / 0xC1  i2c read
+        I2C_Start();
+        I2C_SendByte(device_address | 1);
+        if (!I2C_WaitAck())
+            break;
 
-		bBreak = false;
-	} while (false);
+        bBreak = false;
+    } while (false);
 
-	if (bBreak)	{
-		I2C_Stop();
-		if ( MF_DBGLEVEL > 3 ) DbpString(I2C_ERROR);
-		return 0;
-	}
+    if (bBreak) {
+        I2C_Stop();
+        if ( MF_DBGLEVEL > 3 ) DbpString(I2C_ERROR);
+        return 0;
+    }
 
-	// reading
-	while (len) {
+    // reading
+    while (len) {
 
-		int16_t tmp = I2C_ReadByte();
-		if ( tmp < 0 )
-			return tmp;
+        int16_t tmp = I2C_ReadByte();
+        if ( tmp < 0 )
+            return tmp;
 
-		*data = (uint8_t)tmp & 0xFF;
+        *data = (uint8_t)tmp & 0xFF;
 
-		data++;
-		readcount++;
-		len--;
+        data++;
+        readcount++;
+        len--;
 
-		// acknowledgements. After last byte send NACK.
-		if (len == 0)
-			I2C_NoAck();
-		else
-			I2C_Ack();
-	}
+        // acknowledgements. After last byte send NACK.
+        if (len == 0)
+            I2C_NoAck();
+        else
+            I2C_Ack();
+    }
 
-	I2C_Stop();
-	return readcount;
+    I2C_Stop();
+    return readcount;
 }
 
 bool I2C_WriteFW(uint8_t *data, uint8_t len, uint8_t msb, uint8_t lsb, uint8_t device_address) {
-	//START, 0xB0, 0x00, 0x00, xx, yy, zz, ......, STOP
-	bool bBreak = true;
+    //START, 0xB0, 0x00, 0x00, xx, yy, zz, ......, STOP
+    bool bBreak = true;
 
-	do {
-		if (!I2C_Start())
-			return false;
+    do {
+        if (!I2C_Start())
+            return false;
 
-		// 0xB0  == i2c write
-		I2C_SendByte(device_address & 0xFE);
-		if (!I2C_WaitAck())
-			break;
+        // 0xB0  == i2c write
+        I2C_SendByte(device_address & 0xFE);
+        if (!I2C_WaitAck())
+            break;
 
-		I2C_SendByte(msb);
-		if (!I2C_WaitAck())
-			break;
+        I2C_SendByte(msb);
+        if (!I2C_WaitAck())
+            break;
 
-		I2C_SendByte(lsb);
-		if (!I2C_WaitAck())
-			break;
+        I2C_SendByte(lsb);
+        if (!I2C_WaitAck())
+            break;
 
-		while (len) {
-			I2C_SendByte(*data);
-			if (!I2C_WaitAck())
-				break;
+        while (len) {
+            I2C_SendByte(*data);
+            if (!I2C_WaitAck())
+                break;
 
-			len--;
-			data++;
-		}
+            len--;
+            data++;
+        }
 
-		if (len == 0)
-			bBreak = false;
-	} while (false);
+        if (len == 0)
+            bBreak = false;
+    } while (false);
 
-	I2C_Stop();
-	if (bBreak)	{
-		if ( MF_DBGLEVEL > 3 ) DbpString(I2C_ERROR);
-		return false;
-	}
-	return true;
+    I2C_Stop();
+    if (bBreak) {
+        if ( MF_DBGLEVEL > 3 ) DbpString(I2C_ERROR);
+        return false;
+    }
+    return true;
 }
 
 void I2C_print_status(void) {
-	DbpString("Smart card module (ISO 7816)");
-	uint8_t resp[] = {0,0,0,0};
-	I2C_Reset_EnterMainProgram();
-	uint8_t len = I2C_BufferRead(resp, sizeof(resp), I2C_DEVICE_CMD_GETVERSION, I2C_DEVICE_ADDRESS_MAIN);
-	if ( len > 0 )
-	  	Dbprintf("  version.................v%x.%02d", resp[0], resp[1]);
-	else
-		DbpString("  version.................FAILED");
+    DbpString("Smart card module (ISO 7816)");
+    uint8_t resp[] = {0,0,0,0};
+    I2C_Reset_EnterMainProgram();
+    uint8_t len = I2C_BufferRead(resp, sizeof(resp), I2C_DEVICE_CMD_GETVERSION, I2C_DEVICE_ADDRESS_MAIN);
+    if ( len > 0 )
+        Dbprintf("  version.................v%x.%02d", resp[0], resp[1]);
+    else
+        DbpString("  version.................FAILED");
 }
 
 // Will read response from smart card module,  retries 3 times to get the data.
 bool sc_rx_bytes(uint8_t* dest, uint8_t *destlen) {
 
-	uint8_t i = 3;
-	int16_t len = 0;
-	while (i--) {
+    uint8_t i = 3;
+    int16_t len = 0;
+    while (i--) {
 
-		I2C_WaitForSim();
+        I2C_WaitForSim();
 
-		len = I2C_BufferRead(dest, *destlen, I2C_DEVICE_CMD_READ, I2C_DEVICE_ADDRESS_MAIN);
+        len = I2C_BufferRead(dest, *destlen, I2C_DEVICE_CMD_READ, I2C_DEVICE_ADDRESS_MAIN);
 
-		if ( len > 1 ){
-			break;
-		} else if ( len == 1 ) {
-			continue;
-		} else if ( len <= 0 ) {
-			return false;
-		}
-	}
+        if ( len > 1 ){
+            break;
+        } else if ( len == 1 ) {
+            continue;
+        } else if ( len <= 0 ) {
+            return false;
+        }
+    }
 
-	// after three
-	if ( len <= 1 )
-		return false;
+    // after three
+    if ( len <= 1 )
+        return false;
 
-	*destlen = (uint8_t)len & 0xFF;
-	return true;
+    *destlen = (uint8_t)len & 0xFF;
+    return true;
 }
 
 bool GetATR(smart_card_atr_t *card_ptr) {
 
-	if ( !card_ptr )
-		return false;
+    if ( !card_ptr )
+        return false;
 
-	card_ptr->atr_len = 0;
-	memset(card_ptr->atr, 0, sizeof(card_ptr->atr));
+    card_ptr->atr_len = 0;
+    memset(card_ptr->atr, 0, sizeof(card_ptr->atr));
 
 
-	// Send ATR
-	// start [C0 01] stop start C1 len aa bb cc stop]
-	I2C_WriteCmd(I2C_DEVICE_CMD_GENERATE_ATR, I2C_DEVICE_ADDRESS_MAIN);
+    // Send ATR
+    // start [C0 01] stop start C1 len aa bb cc stop]
+    I2C_WriteCmd(I2C_DEVICE_CMD_GENERATE_ATR, I2C_DEVICE_ADDRESS_MAIN);
 
-	//wait for sim card to answer.
-	// 1byte = 1ms ,  max frame 256bytes.  SHould wait 256ms atleast just in case.
-	if (!I2C_WaitForSim())
-		return false;
+    //wait for sim card to answer.
+    // 1byte = 1ms ,  max frame 256bytes.  SHould wait 256ms atleast just in case.
+    if (!I2C_WaitForSim())
+        return false;
 
-	// read bytes from module
-	uint8_t len = sizeof(card_ptr->atr);
-	if ( !sc_rx_bytes(card_ptr->atr, &len) )
-		return false;
+    // read bytes from module
+    uint8_t len = sizeof(card_ptr->atr);
+    if ( !sc_rx_bytes(card_ptr->atr, &len) )
+        return false;
 
-	uint8_t pos_td = 1;
-	if ( (card_ptr->atr[1] & 0x10) == 0x10) pos_td++;
-	if ( (card_ptr->atr[1] & 0x20) == 0x20) pos_td++;
-	if ( (card_ptr->atr[1] & 0x40) == 0x40) pos_td++;
+    uint8_t pos_td = 1;
+    if ( (card_ptr->atr[1] & 0x10) == 0x10) pos_td++;
+    if ( (card_ptr->atr[1] & 0x20) == 0x20) pos_td++;
+    if ( (card_ptr->atr[1] & 0x40) == 0x40) pos_td++;
 
-	// T0 indicate presence T=0 vs T=1.  T=1 has checksum TCK
-	if ( (card_ptr->atr[1] & 0x80) == 0x80) {
+    // T0 indicate presence T=0 vs T=1.  T=1 has checksum TCK
+    if ( (card_ptr->atr[1] & 0x80) == 0x80) {
 
-		pos_td++;
+        pos_td++;
 
-		// 1 == T1 ,  presence of checksum TCK
-		if ( (card_ptr->atr[pos_td] & 0x01) == 0x01) {
+        // 1 == T1 ,  presence of checksum TCK
+        if ( (card_ptr->atr[pos_td] & 0x01) == 0x01) {
 
-			uint8_t chksum = 0;
-			// xor property.  will be zero when xored with chksum.
-			for (uint8_t i = 1; i < len; ++i)
-				chksum ^= card_ptr->atr[i];
+            uint8_t chksum = 0;
+            // xor property.  will be zero when xored with chksum.
+            for (uint8_t i = 1; i < len; ++i)
+                chksum ^= card_ptr->atr[i];
 
-			if ( chksum ) {
-				if ( MF_DBGLEVEL > 2) DbpString("Wrong ATR checksum");
-			}
-		}
-	}
+            if ( chksum ) {
+                if ( MF_DBGLEVEL > 2) DbpString("Wrong ATR checksum");
+            }
+        }
+    }
 
-	card_ptr->atr_len = len;
-	LogTrace(card_ptr->atr, card_ptr->atr_len, 0, 0, NULL, false);
-	return true;
+    card_ptr->atr_len = len;
+    LogTrace(card_ptr->atr, card_ptr->atr_len, 0, 0, NULL, false);
+    return true;
 }
 
 void SmartCardAtr(void) {
-	smart_card_atr_t card;
-	LED_D_ON();
-	clear_trace();
-	set_tracing(true);
-	I2C_Reset_EnterMainProgram();
-	bool isOK = GetATR( &card );
-	cmd_send(CMD_ACK, isOK, sizeof(smart_card_atr_t), 0, &card, sizeof(smart_card_atr_t));
-	set_tracing(false);
-	LEDsoff();
+    smart_card_atr_t card;
+    LED_D_ON();
+    clear_trace();
+    set_tracing(true);
+    I2C_Reset_EnterMainProgram();
+    bool isOK = GetATR( &card );
+    cmd_send(CMD_ACK, isOK, sizeof(smart_card_atr_t), 0, &card, sizeof(smart_card_atr_t));
+    set_tracing(false);
+    LEDsoff();
 }
 
 void SmartCardRaw( uint64_t arg0, uint64_t arg1, uint8_t *data ) {
 
-	LED_D_ON();
+    LED_D_ON();
 
-	uint8_t len = 0;
-	uint8_t *resp = BigBuf_malloc(ISO7618_MAX_FRAME);
-	smartcard_command_t flags = arg0;
+    uint8_t len = 0;
+    uint8_t *resp = BigBuf_malloc(ISO7618_MAX_FRAME);
+    smartcard_command_t flags = arg0;
 
-	if ((flags & SC_CONNECT))
-		clear_trace();
+    if ((flags & SC_CONNECT))
+        clear_trace();
 
-	set_tracing(true);
+    set_tracing(true);
 
-	if ((flags & SC_CONNECT)) {
+    if ((flags & SC_CONNECT)) {
 
-		I2C_Reset_EnterMainProgram();
+        I2C_Reset_EnterMainProgram();
 
-		if ((flags & SC_SELECT)) {
-			smart_card_atr_t card;
-			bool gotATR = GetATR( &card );
-			//cmd_send(CMD_ACK, gotATR, sizeof(smart_card_atr_t), 0, &card, sizeof(smart_card_atr_t));
-			if ( !gotATR )
-				goto OUT;
-		}
-	}
+        if ((flags & SC_SELECT)) {
+            smart_card_atr_t card;
+            bool gotATR = GetATR( &card );
+            //cmd_send(CMD_ACK, gotATR, sizeof(smart_card_atr_t), 0, &card, sizeof(smart_card_atr_t));
+            if ( !gotATR )
+                goto OUT;
+        }
+    }
 
-	if ((flags & SC_RAW) || (flags & SC_RAW_T0)) {
+    if ((flags & SC_RAW) || (flags & SC_RAW_T0)) {
 
-		LogTrace(data, arg1, 0, 0, NULL, true);
+        LogTrace(data, arg1, 0, 0, NULL, true);
 
-		// Send raw bytes
-		// asBytes = A0 A4 00 00 02
-		// arg1 = len 5
-		bool res = I2C_BufferWrite(data, arg1, ((flags & SC_RAW_T0) ? I2C_DEVICE_CMD_SEND_T0 : I2C_DEVICE_CMD_SEND), I2C_DEVICE_ADDRESS_MAIN);
-		if ( !res && MF_DBGLEVEL > 3 ) DbpString(I2C_ERROR);
+        // Send raw bytes
+        // asBytes = A0 A4 00 00 02
+        // arg1 = len 5
+        bool res = I2C_BufferWrite(data, arg1, ((flags & SC_RAW_T0) ? I2C_DEVICE_CMD_SEND_T0 : I2C_DEVICE_CMD_SEND), I2C_DEVICE_ADDRESS_MAIN);
+        if ( !res && MF_DBGLEVEL > 3 ) DbpString(I2C_ERROR);
 
-		// read bytes from module
-		len = ISO7618_MAX_FRAME;
-		res = sc_rx_bytes(resp, &len);
-		if ( res ) {
-			LogTrace(resp, len, 0, 0, NULL, false);
-		} else {
-			len = 0;
-		}
-	}
+        // read bytes from module
+        len = ISO7618_MAX_FRAME;
+        res = sc_rx_bytes(resp, &len);
+        if ( res ) {
+            LogTrace(resp, len, 0, 0, NULL, false);
+        } else {
+            len = 0;
+        }
+    }
 OUT:
-	cmd_send(CMD_ACK, len, 0, 0, resp, len);
-	BigBuf_free();
-	set_tracing(false);
-	LEDsoff();
+    cmd_send(CMD_ACK, len, 0, 0, resp, len);
+    BigBuf_free();
+    set_tracing(false);
+    LEDsoff();
 }
 
 void SmartCardUpgrade(uint64_t arg0) {
 
-	LED_C_ON();
+    LED_C_ON();
 
-	#define I2C_BLOCK_SIZE 128
-	// write.   Sector0,  with 11,22,33,44
-	// erase is 128bytes, and takes 50ms to execute
+    #define I2C_BLOCK_SIZE 128
+    // write.   Sector0,  with 11,22,33,44
+    // erase is 128bytes, and takes 50ms to execute
 
-	I2C_Reset_EnterBootloader();
+    I2C_Reset_EnterBootloader();
 
-	bool isOK = true;
-	int16_t res = 0;
-	uint16_t length = arg0;
-	uint16_t pos = 0;
-	uint8_t *fwdata = BigBuf_get_addr();
-	uint8_t *verfiydata = BigBuf_malloc(I2C_BLOCK_SIZE);
+    bool isOK = true;
+    int16_t res = 0;
+    uint16_t length = arg0;
+    uint16_t pos = 0;
+    uint8_t *fwdata = BigBuf_get_addr();
+    uint8_t *verfiydata = BigBuf_malloc(I2C_BLOCK_SIZE);
 
-	while (length) {
+    while (length) {
 
-		uint8_t msb = (pos >> 8) & 0xFF;
-		uint8_t lsb = pos & 0xFF;
+        uint8_t msb = (pos >> 8) & 0xFF;
+        uint8_t lsb = pos & 0xFF;
 
-		Dbprintf("FW %02X%02X", msb, lsb);
+        Dbprintf("FW %02X%02X", msb, lsb);
 
-		size_t size = MIN(I2C_BLOCK_SIZE, length);
+        size_t size = MIN(I2C_BLOCK_SIZE, length);
 
-		// write
-		res = I2C_WriteFW(fwdata+pos, size, msb, lsb, I2C_DEVICE_ADDRESS_BOOT);
-		if ( !res ) {
-			DbpString("Writing failed");
-			isOK = false;
-			break;
-		}
+        // write
+        res = I2C_WriteFW(fwdata+pos, size, msb, lsb, I2C_DEVICE_ADDRESS_BOOT);
+        if ( !res ) {
+            DbpString("Writing failed");
+            isOK = false;
+            break;
+        }
 
-		// writing takes time.
-		WaitMS(50);
+        // writing takes time.
+        WaitMS(50);
 
-		// read
-		res = I2C_ReadFW(verfiydata, size, msb, lsb, I2C_DEVICE_ADDRESS_BOOT);
-		if ( res <= 0) {
-			DbpString("Reading back failed");
-			isOK = false;
-			break;
-		}
+        // read
+        res = I2C_ReadFW(verfiydata, size, msb, lsb, I2C_DEVICE_ADDRESS_BOOT);
+        if ( res <= 0) {
+            DbpString("Reading back failed");
+            isOK = false;
+            break;
+        }
 
-		// cmp
-		if ( 0 != memcmp(fwdata+pos, verfiydata, size)) {
-			DbpString("not equal data");
-			isOK = false;
-			break;
-		}
+        // cmp
+        if ( 0 != memcmp(fwdata+pos, verfiydata, size)) {
+            DbpString("not equal data");
+            isOK = false;
+            break;
+        }
 
-		length -= size;
-		pos += size;
-	}
-	cmd_send(CMD_ACK, isOK, pos, 0, 0, 0);
-	LED_C_OFF();
-	BigBuf_free();
+        length -= size;
+        pos += size;
+    }
+    cmd_send(CMD_ACK, isOK, pos, 0, 0, 0);
+    LED_C_OFF();
+    BigBuf_free();
 }
 
 void SmartCardSetBaud(uint64_t arg0) {
 }
 
 void SmartCardSetClock(uint64_t arg0) {
-	LED_D_ON();
-	set_tracing(true);
-	I2C_Reset_EnterMainProgram();
+    LED_D_ON();
+    set_tracing(true);
+    I2C_Reset_EnterMainProgram();
 
-	// Send SIM CLC
-	// start [C0 05 xx] stop
-	I2C_WriteByte(arg0, I2C_DEVICE_CMD_SIM_CLC, I2C_DEVICE_ADDRESS_MAIN);
+    // Send SIM CLC
+    // start [C0 05 xx] stop
+    I2C_WriteByte(arg0, I2C_DEVICE_CMD_SIM_CLC, I2C_DEVICE_ADDRESS_MAIN);
 
-	cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
-	set_tracing(false);
-	LEDsoff();
+    cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
+    set_tracing(false);
+    LEDsoff();
 }
diff --git a/common/i2c.h b/common/i2c.h
index e5ff26e4d..4254a73c3 100644
--- a/common/i2c.h
+++ b/common/i2c.h
@@ -8,16 +8,16 @@
 #include "BigBuf.h"
 #include "mifare.h"
 
-#define I2C_DEVICE_ADDRESS_BOOT		0xB0
-#define I2C_DEVICE_ADDRESS_MAIN		0xC0
+#define I2C_DEVICE_ADDRESS_BOOT     0xB0
+#define I2C_DEVICE_ADDRESS_MAIN     0xC0
 
-#define I2C_DEVICE_CMD_GENERATE_ATR	0x01
-#define I2C_DEVICE_CMD_SEND			0x02
-#define I2C_DEVICE_CMD_READ			0x03
-#define I2C_DEVICE_CMD_SETBAUD		0x04
-#define I2C_DEVICE_CMD_SIM_CLC		0x05
-#define I2C_DEVICE_CMD_GETVERSION	0x06
-#define I2C_DEVICE_CMD_SEND_T0		0x07
+#define I2C_DEVICE_CMD_GENERATE_ATR 0x01
+#define I2C_DEVICE_CMD_SEND         0x02
+#define I2C_DEVICE_CMD_READ         0x03
+#define I2C_DEVICE_CMD_SETBAUD      0x04
+#define I2C_DEVICE_CMD_SIM_CLC      0x05
+#define I2C_DEVICE_CMD_GETVERSION   0x06
+#define I2C_DEVICE_CMD_SEND_T0      0x07
 
 
 void I2C_recovery(void);
diff --git a/common/iso14443crc.c b/common/iso14443crc.c
index ceac3c4df..891eb9b14 100644
--- a/common/iso14443crc.c
+++ b/common/iso14443crc.c
@@ -22,7 +22,7 @@ void ComputeCrc14443(uint16_t CrcType, const uint8_t *data, int length,
     uint8_t b;
     uint16_t crc = CrcType;
 
-	do {
+    do {
         b = *data++;
         UpdateCrc14443(b, &crc);
     } while (--length);
@@ -36,10 +36,10 @@ void ComputeCrc14443(uint16_t CrcType, const uint8_t *data, int length,
 }
 
 bool CheckCrc14443(uint16_t CrcType, const uint8_t *data, int length) {
-	if (length < 3) return false;
-	uint8_t b1, b2;
-	ComputeCrc14443(CrcType, data, length - 2, &b1, &b2);
-	if ((b1 == data[length - 2]) && (b2 == data[length - 1]))
-		return true;
-	return false;
+    if (length < 3) return false;
+    uint8_t b1, b2;
+    ComputeCrc14443(CrcType, data, length - 2, &b1, &b2);
+    if ((b1 == data[length - 2]) && (b2 == data[length - 1]))
+        return true;
+    return false;
 }
diff --git a/common/iso15693tools.c b/common/iso15693tools.c
index fbd79da52..e821feb1f 100644
--- a/common/iso15693tools.c
+++ b/common/iso15693tools.c
@@ -9,17 +9,17 @@
 
 // returns a string representation of the UID
 // UID is transmitted and stored LSB first, displayed MSB first
-//		target    char* buffer, where to put the UID, if NULL a static buffer is returned
-//		uid[]		the UID in transmission order
-//	return: ptr to string
+// target    char* buffer, where to put the UID, if NULL a static buffer is returned
+// uid[]     the UID in transmission order
+// return: ptr to string
 char* Iso15693sprintUID(char *target, uint8_t *uid) {
 
-	static char tempbuf[2*8+1] = {0};
-	if (target == NULL)
-		target = tempbuf;
-	sprintf(target, "%02X %02X %02X %02X %02X %02X %02X %02X",
-				uid[7], uid[6], uid[5], uid[4],
-				uid[3], uid[2], uid[1], uid[0]
-	);
-	return target;
+    static char tempbuf[2*8+1] = {0};
+    if (target == NULL)
+        target = tempbuf;
+    sprintf(target, "%02X %02X %02X %02X %02X %02X %02X %02X",
+                uid[7], uid[6], uid[5], uid[4],
+                uid[3], uid[2], uid[1], uid[0]
+    );
+    return target;
 }
\ No newline at end of file
diff --git a/common/iso15693tools.h b/common/iso15693tools.h
index 0dd4d4444..1937ec84e 100644
--- a/common/iso15693tools.h
+++ b/common/iso15693tools.h
@@ -17,58 +17,58 @@
 #include "crc16.h"
 
 // REQUEST FLAGS
-#define ISO15_REQ_SUBCARRIER_SINGLE	0x00	// Tag should respond using one subcarrier (ASK)
-#define ISO15_REQ_SUBCARRIER_TWO	0x01	// Tag should respond using two subcarriers (FSK)
-#define ISO15_REQ_DATARATE_LOW		0x00	// Tag should respond using low data rate
-#define ISO15_REQ_DATARATE_HIGH		0x02	// Tag should respond using high data rate
-#define ISO15_REQ_NONINVENTORY		0x00
-#define ISO15_REQ_INVENTORY			0x04	// This is an inventory request - see inventory flags
-#define ISO15_REQ_PROTOCOL_NONEXT	0x00
-#define ISO15_REQ_PROTOCOL_EXT		0x08	// RFU
+#define ISO15_REQ_SUBCARRIER_SINGLE      0x00 // Tag should respond using one subcarrier (ASK)
+#define ISO15_REQ_SUBCARRIER_TWO         0x01 // Tag should respond using two subcarriers (FSK)
+#define ISO15_REQ_DATARATE_LOW           0x00 // Tag should respond using low data rate
+#define ISO15_REQ_DATARATE_HIGH          0x02 // Tag should respond using high data rate
+#define ISO15_REQ_NONINVENTORY           0x00
+#define ISO15_REQ_INVENTORY              0x04 // This is an inventory request - see inventory flags
+#define ISO15_REQ_PROTOCOL_NONEXT        0x00
+#define ISO15_REQ_PROTOCOL_EXT           0x08 // RFU
 
 // REQUEST FLAGS when INVENTORY is not set
-#define ISO15_REQ_SELECT			0x10	// only selected cards response
-#define ISO15_REQ_ADDRESS			0x20	// this req contains an address
-#define ISO15_REQ_OPTION			0x40	// Command specific option selector
+#define ISO15_REQ_SELECT                 0x10 // only selected cards response
+#define ISO15_REQ_ADDRESS                0x20 // this req contains an address
+#define ISO15_REQ_OPTION                 0x40 // Command specific option selector
 
 //REQUEST FLAGS when INVENTORY is set
-#define ISO15_REQINV_AFI			0x10	// AFI Field is present
-#define ISO15_REQINV_SLOT1			0x20	// 1 Slot
-#define ISO15_REQINV_SLOT16			0x00	// 16 Slots
-#define ISO15_REQINV_OPTION			0x40	// Command specific option selector
+#define ISO15_REQINV_AFI                 0x10 // AFI Field is present
+#define ISO15_REQINV_SLOT1               0x20 // 1 Slot
+#define ISO15_REQINV_SLOT16              0x00 // 16 Slots
+#define ISO15_REQINV_OPTION              0x40 // Command specific option selector
 
 //RESPONSE FLAGS
-#define ISO15_RES_ERROR				0x01
-#define ISO15_RES_EXT				0x08	// Protocol Extention
+#define ISO15_RES_ERROR                  0x01
+#define ISO15_RES_EXT                    0x08 // Protocol Extention
 
 // RESPONSE ERROR CODES
-#define ISO15_NOERROR				0x00
-#define ISO15_ERROR_CMD_NOT_SUP		0x01	// Command not supported
-#define ISO15_ERROR_CMD_NOT_REC		0x02	// Command not recognized (eg. parameter error)
-#define ISO15_ERROR_CMD_OPTION		0x03	// Command option not supported
-#define ISO15_ERROR_GENERIC			0x0F	// No additional Info about this error
-#define ISO15_ERROR_BLOCK_UNAVAILABLE		0x10
-#define ISO15_ERROR_BLOCK_LOCKED_ALREADY	0x11	// cannot lock again
-#define ISO15_ERROR_BLOCK_LOCKED			0x12	// cannot be changed
-#define ISO15_ERROR_BLOCK_WRITE		0x13	// Writing was unsuccessful
-#define ISO15_ERROR_BLOCL_WRITELOCK	0x14	// Locking was unsuccessful
+#define ISO15_NOERROR                    0x00
+#define ISO15_ERROR_CMD_NOT_SUP          0x01 // Command not supported
+#define ISO15_ERROR_CMD_NOT_REC          0x02 // Command not recognized (eg. parameter error)
+#define ISO15_ERROR_CMD_OPTION           0x03 // Command option not supported
+#define ISO15_ERROR_GENERIC              0x0F // No additional Info about this error
+#define ISO15_ERROR_BLOCK_UNAVAILABLE    0x10
+#define ISO15_ERROR_BLOCK_LOCKED_ALREADY 0x11 // cannot lock again
+#define ISO15_ERROR_BLOCK_LOCKED         0x12 // cannot be changed
+#define ISO15_ERROR_BLOCK_WRITE          0x13 // Writing was unsuccessful
+#define ISO15_ERROR_BLOCL_WRITELOCK      0x14 // Locking was unsuccessful
 
 // COMMAND CODES
-#define ISO15_CMD_INVENTORY			0x01
-#define ISO15_CMD_STAYQUIET			0x02
-#define ISO15_CMD_READ				0x20
-#define ISO15_CMD_WRITE				0x21
-#define ISO15_CMD_LOCK				0x22
-#define ISO15_CMD_READMULTI			0x23
-#define ISO15_CMD_WRITEMULTI		0x24
-#define ISO15_CMD_SELECT			0x25
-#define ISO15_CMD_RESET				0x26
-#define ISO15_CMD_WRITEAFI			0x27
-#define ISO15_CMD_LOCKAFI			0x28
-#define ISO15_CMD_WRITEDSFID		0x29
-#define ISO15_CMD_LOCKDSFID			0x2A
-#define ISO15_CMD_SYSINFO			0x2B
-#define ISO15_CMD_SECSTATUS			0x2C
+#define ISO15_CMD_INVENTORY              0x01
+#define ISO15_CMD_STAYQUIET              0x02
+#define ISO15_CMD_READ                   0x20
+#define ISO15_CMD_WRITE                  0x21
+#define ISO15_CMD_LOCK                   0x22
+#define ISO15_CMD_READMULTI              0x23
+#define ISO15_CMD_WRITEMULTI             0x24
+#define ISO15_CMD_SELECT                 0x25
+#define ISO15_CMD_RESET                  0x26
+#define ISO15_CMD_WRITEAFI               0x27
+#define ISO15_CMD_LOCKAFI                0x28
+#define ISO15_CMD_WRITEDSFID             0x29
+#define ISO15_CMD_LOCKDSFID              0x2A
+#define ISO15_CMD_SYSINFO                0x2B
+#define ISO15_CMD_SECSTATUS              0x2C
 
 char* Iso15693sprintUID(char *target, uint8_t *uid);
 
@@ -78,49 +78,49 @@ char* Iso15693sprintUID(char *target, uint8_t *uid);
 // Mode: highspeed && one subcarrier (ASK)
 //-----------------------------------------------------------------------------
 
-	// The sampling rate is 106.353 ksps/s, for T = 18.8 us
+    // The sampling rate is 106.353 ksps/s, for T = 18.8 us
 
-	// SOF defined as
-	// 1) Unmodulated time of 56.64us
-	// 2) 24 pulses of 423.75khz
-	// 3) logic '1' (unmodulated for 18.88us followed by 8 pulses of 423.75khz)
+    // SOF defined as
+    // 1) Unmodulated time of 56.64us
+    // 2) 24 pulses of 423.75khz
+    // 3) logic '1' (unmodulated for 18.88us followed by 8 pulses of 423.75khz)
 
-	static const int Iso15693FrameSOF[] = {
-		-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-		-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-		 1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-		 1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-		-1, -1, -1, -1,
-		-1, -1, -1, -1,
-		 1,  1,  1,  1,
-		 1,  1,  1,  1
-	};
-	static const int Iso15693Logic0[] = {
-		 1,  1,  1,  1,
-		 1,  1,  1,  1,
-		-1, -1, -1, -1,
-		-1, -1, -1, -1
-	};
-	static const int Iso15693Logic1[] = {
-		-1, -1, -1, -1,
-		-1, -1, -1, -1,
-		 1,  1,  1,  1,
-		 1,  1,  1,  1
-	};
+    static const int Iso15693FrameSOF[] = {
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+         1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
+         1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
+        -1, -1, -1, -1,
+        -1, -1, -1, -1,
+         1,  1,  1,  1,
+         1,  1,  1,  1
+    };
+    static const int Iso15693Logic0[] = {
+         1,  1,  1,  1,
+         1,  1,  1,  1,
+        -1, -1, -1, -1,
+        -1, -1, -1, -1
+    };
+    static const int Iso15693Logic1[] = {
+        -1, -1, -1, -1,
+        -1, -1, -1, -1,
+         1,  1,  1,  1,
+         1,  1,  1,  1
+    };
 
-	// EOF defined as
-	// 1) logic '0' (8 pulses of 423.75khz followed by unmodulated for 18.88us)
-	// 2) 24 pulses of 423.75khz
-	// 3) Unmodulated time of 56.64us
-	static const int Iso15693FrameEOF[] = {
-		 1,  1,  1,  1,
-		 1,  1,  1,  1,
-		-1, -1, -1, -1,
-		-1, -1, -1, -1,
-		 1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-		 1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-		-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-		-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
-	};
+    // EOF defined as
+    // 1) logic '0' (8 pulses of 423.75khz followed by unmodulated for 18.88us)
+    // 2) 24 pulses of 423.75khz
+    // 3) Unmodulated time of 56.64us
+    static const int Iso15693FrameEOF[] = {
+         1,  1,  1,  1,
+         1,  1,  1,  1,
+        -1, -1, -1, -1,
+        -1, -1, -1, -1,
+         1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
+         1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
+    };
 
 #endif
\ No newline at end of file
diff --git a/common/ldscript.common b/common/ldscript.common
index c0134ffd0..5b2f1e3c4 100644
--- a/common/ldscript.common
+++ b/common/ldscript.common
@@ -11,13 +11,13 @@ ms of the GNU GPL, version 2 or,
 
 /* AT91SAM7S256 has 256k Flash and 64k RAM */
 /* AT91SAM7S512 has 512k Flash and 64k RAM */
-MEMORY 
+MEMORY
 {
-	bootphase1 : ORIGIN = 0x00100000, LENGTH = 0x200             /* Phase 1 bootloader: Copies real bootloader to RAM */
-	bootphase2 : ORIGIN = 0x00100200, LENGTH = 0x2000 - 0x200    /* Main bootloader code, stored in Flash, executed from RAM */
-	osimage    : ORIGIN = 0x00102000, LENGTH = 512K - 0x2000     /* Place where the main OS will end up */
-	ram        : ORIGIN = 0x00200000, LENGTH = 64K - 0x20        /* RAM, minus small common area */
-	commonarea : ORIGIN = 0x00200000 + 64K - 0x20, LENGTH = 0x20 /* Communication between bootloader and main OS */
+    bootphase1 : ORIGIN = 0x00100000, LENGTH = 0x200             /* Phase 1 bootloader: Copies real bootloader to RAM */
+    bootphase2 : ORIGIN = 0x00100200, LENGTH = 0x2000 - 0x200    /* Main bootloader code, stored in Flash, executed from RAM */
+    osimage    : ORIGIN = 0x00102000, LENGTH = 512K - 0x2000     /* Place where the main OS will end up */
+    ram        : ORIGIN = 0x00200000, LENGTH = 64K - 0x20        /* RAM, minus small common area */
+    commonarea : ORIGIN = 0x00200000 + 64K - 0x20, LENGTH = 0x20 /* Communication between bootloader and main OS */
 }
 
 /* Export some information that can be used from within the firmware */
diff --git a/common/legic_prng.c b/common/legic_prng.c
index c4927b33b..75e04d8b6 100644
--- a/common/legic_prng.c
+++ b/common/legic_prng.c
@@ -13,9 +13,9 @@
 // c keeps track on which step the prng is.
 // legic_prng_get_bit() = gets a bit muxed from a and b.
 struct lfsr {
-	uint8_t  a;
-	uint8_t  b;
-	uint32_t c;
+    uint8_t  a;
+    uint8_t  b;
+    uint32_t c;
 } lfsr;
 
 // Normal init is set following variables with a random value IV
@@ -28,38 +28,38 @@ struct lfsr {
 // which is used in the initialisation phase sending the IV
 //
 void legic_prng_init(uint8_t iv) {
-	lfsr.a = iv;
-	lfsr.b = 0;  // hack to get a always 0 keystream
-	lfsr.c = 0;
-	if(iv)
-		lfsr.b = (iv << 1) | 1;
+    lfsr.a = iv;
+    lfsr.b = 0;  // hack to get a always 0 keystream
+    lfsr.c = 0;
+    if(iv)
+        lfsr.b = (iv << 1) | 1;
 }
 
 void legic_prng_forward(int count) {
-	if (count == 0) return;
+    if (count == 0) return;
 
-	lfsr.c += count;
-	while(count--) {
-		// According: http://www.proxmark.org/forum/viewtopic.php?pid=5437#p5437
-		lfsr.a = (lfsr.a >> 1 | (lfsr.a ^ lfsr.a >> 6) << 6) & 0x7F;
-		lfsr.b = lfsr.b >> 1 | (lfsr.b ^ lfsr.b >> 2 ^ lfsr.b >> 3 ^ lfsr.b >> 7) << 7;
-	}
+    lfsr.c += count;
+    while(count--) {
+        // According: http://www.proxmark.org/forum/viewtopic.php?pid=5437#p5437
+        lfsr.a = (lfsr.a >> 1 | (lfsr.a ^ lfsr.a >> 6) << 6) & 0x7F;
+        lfsr.b = lfsr.b >> 1 | (lfsr.b ^ lfsr.b >> 2 ^ lfsr.b >> 3 ^ lfsr.b >> 7) << 7;
+    }
 }
 
 uint32_t legic_prng_count() {
-	return lfsr.c;
+    return lfsr.c;
 }
 
 uint8_t legic_prng_get_bit() {
-	uint8_t idx = 7 - ( (lfsr.a & 4) | (lfsr.a >> 2 & 2) | (lfsr.a >> 4 & 1) );
-	return lfsr.b >> idx & 1;
+    uint8_t idx = 7 - ( (lfsr.a & 4) | (lfsr.a >> 2 & 2) | (lfsr.a >> 4 & 1) );
+    return lfsr.b >> idx & 1;
 }
 
 uint32_t legic_prng_get_bits(uint8_t len){
-	uint32_t a = 0;
-	for(uint8_t i = 0; i < len; ++i) {
-		a |= legic_prng_get_bit() << i;
-		legic_prng_forward(1);
-	}
-	return a;
+    uint32_t a = 0;
+    for(uint8_t i = 0; i < len; ++i) {
+        a |= legic_prng_get_bit() << i;
+        legic_prng_forward(1);
+    }
+    return a;
 }
\ No newline at end of file
diff --git a/common/lfdemod.c b/common/lfdemod.c
index 65999ae77..13c2a3f9f 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -65,124 +65,124 @@ extern void Dbprintf(const char *fmt, ...);
 
 signal_t signalprop = { 255, -255, 0, 0, true };
 signal_t* getSignalProperties(void) {
-	return &signalprop;
+    return &signalprop;
 }
 
 static void resetSignal(void) {
-	signalprop.low = 255;
-	signalprop.high = -255;
-	signalprop.mean = 0;
-	signalprop.amplitude = 0;
-	signalprop.isnoise = true;
+    signalprop.low = 255;
+    signalprop.high = -255;
+    signalprop.mean = 0;
+    signalprop.amplitude = 0;
+    signalprop.isnoise = true;
 }
 
 static void printSignal(void) {
-	prnt("LF signal properties:");
-	prnt("  high..........%d", signalprop.high);
-	prnt("  low...........%d", signalprop.low);
-	prnt("  mean..........%d", signalprop.mean);
-	prnt("  amplitude.....%d", signalprop.amplitude);
-	prnt("  is Noise......%s", (signalprop.isnoise) ? "Yes" : "No");
-	prnt("  THRESHOLD noise amplitude......%d" , NOISE_AMPLITUDE_THRESHOLD);
+    prnt("LF signal properties:");
+    prnt("  high..........%d", signalprop.high);
+    prnt("  low...........%d", signalprop.low);
+    prnt("  mean..........%d", signalprop.mean);
+    prnt("  amplitude.....%d", signalprop.amplitude);
+    prnt("  is Noise......%s", (signalprop.isnoise) ? "Yes" : "No");
+    prnt("  THRESHOLD noise amplitude......%d" , NOISE_AMPLITUDE_THRESHOLD);
 }
 
 void computeSignalProperties(uint8_t *samples, uint32_t size) {
-	resetSignal();
+    resetSignal();
 
-	uint32_t sum = 0;
-	for ( uint32_t i = 0; i < size; i++) {
-		if ( samples[i] < signalprop.low ) signalprop.low = samples[i];
-		if ( samples[i] > signalprop.high ) signalprop.high = samples[i];
-		sum += samples[i];
-	}
+    uint32_t sum = 0;
+    for ( uint32_t i = 0; i < size; i++) {
+        if ( samples[i] < signalprop.low ) signalprop.low = samples[i];
+        if ( samples[i] > signalprop.high ) signalprop.high = samples[i];
+        sum += samples[i];
+    }
 
-	// measure amplitude of signal
-	signalprop.mean = sum / size;
-	signalprop.amplitude = signalprop.high - signalprop.mean;
-	// By measuring mean and look at amplitude of signal from HIGH / LOW,
-	// we can detect noise
-	signalprop.isnoise =  signalprop.amplitude < NOISE_AMPLITUDE_THRESHOLD;
+    // measure amplitude of signal
+    signalprop.mean = sum / size;
+    signalprop.amplitude = signalprop.high - signalprop.mean;
+    // By measuring mean and look at amplitude of signal from HIGH / LOW,
+    // we can detect noise
+    signalprop.isnoise =  signalprop.amplitude < NOISE_AMPLITUDE_THRESHOLD;
 
-	if (g_debugMode)
-		printSignal();
+    if (g_debugMode)
+        printSignal();
 }
 
 void removeSignalOffset(uint8_t *samples, uint32_t size) {
-	if ( samples == NULL || size < SIGNAL_MIN_SAMPLES ) return;
+    if ( samples == NULL || size < SIGNAL_MIN_SAMPLES ) return;
 
-	int acc_off = 0;
-	for (uint32_t i = SIGNAL_IGNORE_FIRST_SAMPLES; i < size; i++)
-		acc_off += samples[i] - 128;
-	acc_off /= (int)(size - SIGNAL_IGNORE_FIRST_SAMPLES);
+    int acc_off = 0;
+    for (uint32_t i = SIGNAL_IGNORE_FIRST_SAMPLES; i < size; i++)
+        acc_off += samples[i] - 128;
+    acc_off /= (int)(size - SIGNAL_IGNORE_FIRST_SAMPLES);
 
-	// shift and saturate samples to center the mean
-	for ( uint32_t i = 0; i < size; i++) {
-		if (acc_off > 0) {
-			samples[i] = (samples[i] >= acc_off)? samples[i] - acc_off : 0;
-		}
-		if (acc_off < 0) {
-			samples[i] = (255 - samples[i] >=  -acc_off)? samples[i] - acc_off : 255;
-		}
-	}
+    // shift and saturate samples to center the mean
+    for ( uint32_t i = 0; i < size; i++) {
+        if (acc_off > 0) {
+            samples[i] = (samples[i] >= acc_off)? samples[i] - acc_off : 0;
+        }
+        if (acc_off < 0) {
+            samples[i] = (255 - samples[i] >=  -acc_off)? samples[i] - acc_off : 255;
+        }
+    }
 }
 
 //by marshmellow
 //get high and low values of a wave with passed in fuzz factor. also return noise test = 1 for passed or 0 for only noise
 //void getHiLo(uint8_t *bits, size_t size, int *high, int *low, uint8_t fuzzHi, uint8_t fuzzLo) {
 void getHiLo(int *high, int *low, uint8_t fuzzHi, uint8_t fuzzLo) {
-	// add fuzz.
-	*high = (signalprop.high * fuzzHi) / 100;
-	if ( signalprop.low < 0 ) {
-		*low = (signalprop.low * fuzzLo) / 100;
-	} else {
-		uint8_t range = signalprop.high - signalprop.low;
+    // add fuzz.
+    *high = (signalprop.high * fuzzHi) / 100;
+    if ( signalprop.low < 0 ) {
+        *low = (signalprop.low * fuzzLo) / 100;
+    } else {
+        uint8_t range = signalprop.high - signalprop.low;
 
-		*low =  signalprop.low + ((range * (100-fuzzLo))/100);
-	}
+        *low =  signalprop.low + ((range * (100-fuzzLo))/100);
+    }
 
-	// if fuzzing to great and overlap
-	if ( *high < *low ) {
-		*high = signalprop.high;
-		*low =  signalprop.low;
-	}
+    // if fuzzing to great and overlap
+    if ( *high < *low ) {
+        *high = signalprop.high;
+        *low =  signalprop.low;
+    }
 
-	if (g_debugMode)
-		prnt("getHiLo fuzzed: High %d | Low %d", *high, *low);
+    if (g_debugMode)
+        prnt("getHiLo fuzzed: High %d | Low %d", *high, *low);
 }
 
 // by marshmellow
 // pass bits to be tested in bits, length bits passed in bitLen, and parity type (even=0 | odd=1) in pType
 // returns 1 if passed
 bool parityTest(uint32_t bits, uint8_t bitLen, uint8_t pType) {
-	return oddparity32(bits) ^ pType;
+    return oddparity32(bits) ^ pType;
 }
 
 //by marshmellow
 // takes a array of binary values, start position, length of bits per parity (includes parity bit - MAX 32),
 //   Parity Type (1 for odd; 0 for even; 2 for Always 1's; 3 for Always 0's), and binary Length (length to run)
 size_t removeParity(uint8_t *bits, size_t startIdx, uint8_t pLen, uint8_t pType, size_t bLen) {
-	uint32_t parityWd = 0;
-	size_t bitCnt = 0;
-	for (int word = 0; word < (bLen); word += pLen){
-		for (int bit=0; bit < pLen; bit++){
-			if (word+bit >= bLen) break;
-			parityWd = (parityWd << 1) | bits[startIdx+word+bit];
-			bits[bitCnt++] = (bits[startIdx+word+bit]);
-		}
-		if (word+pLen > bLen) break;
+    uint32_t parityWd = 0;
+    size_t bitCnt = 0;
+    for (int word = 0; word < (bLen); word += pLen){
+        for (int bit=0; bit < pLen; bit++){
+            if (word+bit >= bLen) break;
+            parityWd = (parityWd << 1) | bits[startIdx+word+bit];
+            bits[bitCnt++] = (bits[startIdx+word+bit]);
+        }
+        if (word+pLen > bLen) break;
 
-		bitCnt--; // overwrite parity with next data
-		// if parity fails then return 0
-		switch (pType) {
-			case 3: if (bits[bitCnt]==1) {return 0;} break; //should be 0 spacer bit
-			case 2: if (bits[bitCnt]==0) {return 0;} break; //should be 1 spacer bit
-			default: if (parityTest(parityWd, pLen, pType) == 0) { return 0; } break; //test parity
-		}
-		parityWd = 0;
-	}
-	// if we got here then all the parities passed
-	//return size
-	return bitCnt;
+        bitCnt--; // overwrite parity with next data
+        // if parity fails then return 0
+        switch (pType) {
+            case 3: if (bits[bitCnt]==1) {return 0;} break; //should be 0 spacer bit
+            case 2: if (bits[bitCnt]==0) {return 0;} break; //should be 1 spacer bit
+            default: if (parityTest(parityWd, pLen, pType) == 0) { return 0; } break; //test parity
+        }
+        parityWd = 0;
+    }
+    // if we got here then all the parities passed
+    //return size
+    return bitCnt;
 }
 
 // by marshmellow
@@ -190,61 +190,61 @@ size_t removeParity(uint8_t *bits, size_t startIdx, uint8_t pLen, uint8_t pType,
 //   Parity Type (1 for odd; 0 for even; 2 Always 1's; 3 Always 0's), and binary Length (length to run)
 //   Make sure *dest is long enough to store original sourceLen + #_of_parities_to_be_added
 size_t addParity(uint8_t *src, uint8_t *dest, uint8_t sourceLen, uint8_t pLen, uint8_t pType) {
-	uint32_t parityWd = 0;
-	size_t j = 0, bitCnt = 0;
-	for (int word = 0; word < sourceLen; word += pLen-1) {
-		for (int bit=0; bit < pLen-1; bit++){
-			parityWd = (parityWd << 1) | src[word+bit];
-			dest[j++] = (src[word+bit]);
-		}
-		// if parity fails then return 0
-		switch (pType) {
-			case 3: dest[j++]=0; break; // marker bit which should be a 0
-			case 2: dest[j++]=1; break; // marker bit which should be a 1
-			default:
-				dest[j++] = parityTest(parityWd, pLen-1, pType) ^ 1;
-				break;
-		}
-		bitCnt += pLen;
-		parityWd = 0;
-	}
-	// if we got here then all the parities passed
-	//return ID start index and size
-	return bitCnt;
+    uint32_t parityWd = 0;
+    size_t j = 0, bitCnt = 0;
+    for (int word = 0; word < sourceLen; word += pLen-1) {
+        for (int bit=0; bit < pLen-1; bit++){
+            parityWd = (parityWd << 1) | src[word+bit];
+            dest[j++] = (src[word+bit]);
+        }
+        // if parity fails then return 0
+        switch (pType) {
+            case 3: dest[j++]=0; break; // marker bit which should be a 0
+            case 2: dest[j++]=1; break; // marker bit which should be a 1
+            default:
+                dest[j++] = parityTest(parityWd, pLen-1, pType) ^ 1;
+                break;
+        }
+        bitCnt += pLen;
+        parityWd = 0;
+    }
+    // if we got here then all the parities passed
+    //return ID start index and size
+    return bitCnt;
 }
 
 // array must be size dividable with 8
 uint8_t bits_to_array(const uint8_t *bits, size_t size, uint8_t *dest) {
-	if ( (size == 0) || (size % 8) != 0) return 0;
+    if ( (size == 0) || (size % 8) != 0) return 0;
 
-	for(uint32_t i = 0; i < (size / 8); i++)
-		dest[i] = bytebits_to_byte((uint8_t *) bits + (i * 8), 8);
+    for(uint32_t i = 0; i < (size / 8); i++)
+        dest[i] = bytebits_to_byte((uint8_t *) bits + (i * 8), 8);
 
-	return 0;
+    return 0;
 }
 
 uint32_t bytebits_to_byte(uint8_t *src, size_t numbits) {
-	uint32_t num = 0;
-	for(int i = 0 ; i < numbits ; i++) {
-		num = (num << 1) | (*src);
-		src++;
-	}
-	return num;
+    uint32_t num = 0;
+    for(int i = 0 ; i < numbits ; i++) {
+        num = (num << 1) | (*src);
+        src++;
+    }
+    return num;
 }
 
 //least significant bit first
 uint32_t bytebits_to_byteLSBF(uint8_t *src, size_t numbits) {
-	uint32_t num = 0;
-	for(int i = 0 ; i < numbits ; i++) {
-		num = (num << 1) | *(src + (numbits-(i+1)));
-	}
-	return num;
+    uint32_t num = 0;
+    for(int i = 0 ; i < numbits ; i++) {
+        num = (num << 1) | *(src + (numbits-(i+1)));
+    }
+    return num;
 }
 
 //by marshmellow
 //search for given preamble in given BitStream and return success = TRUE or fail = FALSE and startIndex and length
 bool preambleSearch(uint8_t *bits, uint8_t *preamble, size_t pLen, size_t *size, size_t *startIdx){
-	return preambleSearchEx(bits, preamble, pLen, size, startIdx, false);
+    return preambleSearchEx(bits, preamble, pLen, size, startIdx, false);
 }
 //by marshmellow
 // search for given preamble in given BitStream and return success=1 or fail=0 and startIndex (where it was found) and length if not fineone
@@ -252,210 +252,210 @@ bool preambleSearch(uint8_t *bits, uint8_t *preamble, size_t pLen, size_t *size,
 //(iceman) FINDONE,  only finds start index. NOT SIZE!.  I see Em410xDecode (lfdemod.c) uses SIZE to determine success
 bool preambleSearchEx(uint8_t *bits, uint8_t *preamble, size_t pLen, size_t *size, size_t *startIdx, bool findone)
 {
-	// Sanity check.  If preamble length is bigger than bits length.
-	if ( *size <= pLen ) return false;
+    // Sanity check.  If preamble length is bigger than bits length.
+    if ( *size <= pLen ) return false;
 
-	uint8_t foundCnt = 0;
-	for (size_t idx = 0; idx < *size - pLen; idx++) {
-		if (memcmp(bits+idx, preamble, pLen) == 0){
-			//first index found
-			foundCnt++;
-			if (foundCnt == 1){
-				if (g_debugMode) prnt("DEBUG: (preambleSearchEx) preamble found at %i", idx);
-				*startIdx = idx;
-				if (findone) return true;
-			}
-			if (foundCnt == 2){
-				if (g_debugMode) prnt("DEBUG: (preambleSearchEx) preamble 2 found at %i", idx);
-				*size = idx - *startIdx;
-				return true;
-			}
-		}
-	}
-	return (foundCnt > 0);
+    uint8_t foundCnt = 0;
+    for (size_t idx = 0; idx < *size - pLen; idx++) {
+        if (memcmp(bits+idx, preamble, pLen) == 0){
+            //first index found
+            foundCnt++;
+            if (foundCnt == 1){
+                if (g_debugMode) prnt("DEBUG: (preambleSearchEx) preamble found at %i", idx);
+                *startIdx = idx;
+                if (findone) return true;
+            }
+            if (foundCnt == 2){
+                if (g_debugMode) prnt("DEBUG: (preambleSearchEx) preamble 2 found at %i", idx);
+                *size = idx - *startIdx;
+                return true;
+            }
+        }
+    }
+    return (foundCnt > 0);
 }
 
 // find start of modulating data (for fsk and psk) in case of beginning noise or slow chip startup.
 size_t findModStart(uint8_t *src, size_t size, uint8_t expWaveSize) {
-	size_t i = 0;
-	size_t waveSizeCnt = 0;
-	uint8_t thresholdCnt = 0;
-	bool isAboveThreshold = src[i++] >= signalprop.mean; //FSK_PSK_THRESHOLD;
-	for (; i < size-20; i++ ) {
-		if (src[i] < signalprop.mean && isAboveThreshold) {
-			thresholdCnt++;
-			if (thresholdCnt > 2 && waveSizeCnt < expWaveSize+1) break;
-			isAboveThreshold = false;
-			waveSizeCnt = 0;
-		} else if (src[i] >= signalprop.mean && !isAboveThreshold) {
-			thresholdCnt++;
-			if (thresholdCnt > 2 && waveSizeCnt < expWaveSize+1) break;
-			isAboveThreshold = true;
-			waveSizeCnt = 0;
-		} else {
-			waveSizeCnt++;
-		}
-		if (thresholdCnt > 10) break;
-	}
-	if (g_debugMode == 2) prnt("DEBUG: threshold Count reached at index %u, count: %u", i, thresholdCnt);
-	return i;
+    size_t i = 0;
+    size_t waveSizeCnt = 0;
+    uint8_t thresholdCnt = 0;
+    bool isAboveThreshold = src[i++] >= signalprop.mean; //FSK_PSK_THRESHOLD;
+    for (; i < size-20; i++ ) {
+        if (src[i] < signalprop.mean && isAboveThreshold) {
+            thresholdCnt++;
+            if (thresholdCnt > 2 && waveSizeCnt < expWaveSize+1) break;
+            isAboveThreshold = false;
+            waveSizeCnt = 0;
+        } else if (src[i] >= signalprop.mean && !isAboveThreshold) {
+            thresholdCnt++;
+            if (thresholdCnt > 2 && waveSizeCnt < expWaveSize+1) break;
+            isAboveThreshold = true;
+            waveSizeCnt = 0;
+        } else {
+            waveSizeCnt++;
+        }
+        if (thresholdCnt > 10) break;
+    }
+    if (g_debugMode == 2) prnt("DEBUG: threshold Count reached at index %u, count: %u", i, thresholdCnt);
+    return i;
 }
 
 int getClosestClock(int testclk) {
-	uint16_t clocks[] = {8, 16, 32, 40, 50, 64, 128, 256, 384};
-	uint8_t limit[]  = {1,  2,  4,  4,  5,  8,   8,   8,   8};
+    uint16_t clocks[] = {8, 16, 32, 40, 50, 64, 128, 256, 384};
+    uint8_t limit[]  = {1,  2,  4,  4,  5,  8,   8,   8,   8};
 
-	for (uint8_t i = 0; i < 9; i++)
-		if ( testclk >= clocks[i]-limit[i] && testclk <= clocks[i]+limit[i] )
-			return clocks[i];
+    for (uint8_t i = 0; i < 9; i++)
+        if ( testclk >= clocks[i]-limit[i] && testclk <= clocks[i]+limit[i] )
+            return clocks[i];
 
-	return 0;
+    return 0;
 }
 
 void getNextLow(uint8_t *samples, size_t size, int low, size_t *i) {
-	while ((samples[*i] > low) && (*i < size))
-		*i += 1;
+    while ((samples[*i] > low) && (*i < size))
+        *i += 1;
 }
 
 void getNextHigh(uint8_t *samples, size_t size, int high, size_t *i) {
-	while ((samples[*i] < high) && (*i < size))
-		*i += 1;
+    while ((samples[*i] < high) && (*i < size))
+        *i += 1;
 }
 
 // load wave counters
 bool loadWaveCounters(uint8_t *samples, size_t size, int lowToLowWaveLen[], int highToLowWaveLen[], int *waveCnt, int *skip, int *minClk, int *high, int *low) {
-	size_t i = 0, firstLow, firstHigh;
-	//size_t testsize = (size < 512) ? size : 512;
+    size_t i = 0, firstLow, firstHigh;
+    //size_t testsize = (size < 512) ? size : 512;
 
-	// just noise - no super good detection. good enough
-	if (signalprop.isnoise) {
-		if (g_debugMode == 2) prnt("DEBUG STT: just noise detected - quitting");
-		return false;
-	}
+    // just noise - no super good detection. good enough
+    if (signalprop.isnoise) {
+        if (g_debugMode == 2) prnt("DEBUG STT: just noise detected - quitting");
+        return false;
+    }
 
-	getHiLo(high, low, 80, 80);
+    getHiLo(high, low, 80, 80);
 
-	// get to first full low to prime loop and skip incomplete first pulse
-	getNextHigh(samples, size, *high, &i);
-	getNextLow(samples, size, *low, &i);
-	*skip = i;
+    // get to first full low to prime loop and skip incomplete first pulse
+    getNextHigh(samples, size, *high, &i);
+    getNextLow(samples, size, *low, &i);
+    *skip = i;
 
-	// populate tmpbuff buffer with pulse lengths
-	while (i < size) {
-		// measure from low to low
-		firstLow = i;
-		//find first high point for this wave
-		getNextHigh(samples, size, *high, &i);
-		firstHigh = i;
+    // populate tmpbuff buffer with pulse lengths
+    while (i < size) {
+        // measure from low to low
+        firstLow = i;
+        //find first high point for this wave
+        getNextHigh(samples, size, *high, &i);
+        firstHigh = i;
 
-		getNextLow(samples, size, *low, &i);
+        getNextLow(samples, size, *low, &i);
 
-		if (*waveCnt >= (size/LOWEST_DEFAULT_CLOCK))
-			break;
+        if (*waveCnt >= (size/LOWEST_DEFAULT_CLOCK))
+            break;
 
-		highToLowWaveLen[*waveCnt] = i - firstHigh; //first high to first low
-		lowToLowWaveLen[*waveCnt] = i - firstLow;
-		*waveCnt += 1;
-		if (i-firstLow < *minClk && i < size) {
-			*minClk = i - firstLow;
-		}
-	}
-	return true;
+        highToLowWaveLen[*waveCnt] = i - firstHigh; //first high to first low
+        lowToLowWaveLen[*waveCnt] = i - firstLow;
+        *waveCnt += 1;
+        if (i-firstLow < *minClk && i < size) {
+            *minClk = i - firstLow;
+        }
+    }
+    return true;
 }
 
 size_t pskFindFirstPhaseShift(uint8_t *samples, size_t size, uint8_t *curPhase, size_t waveStart, uint16_t fc, uint16_t *fullWaveLen) {
-	uint16_t loopCnt = (size+3 < 4096) ? size : 4096;  //don't need to loop through entire array...
+    uint16_t loopCnt = (size+3 < 4096) ? size : 4096;  //don't need to loop through entire array...
 
-	uint16_t avgWaveVal=0, lastAvgWaveVal=0;
-	size_t i = waveStart, waveEnd, waveLenCnt, firstFullWave;
-	for (; i<loopCnt; i++) {
-		// find peak // was "samples[i] + fc" but why?  must have been used to weed out some wave error... removed..
-		if (samples[i] < samples[i+1] && samples[i+1] >= samples[i+2]){
-			waveEnd = i+1;
-			if (g_debugMode == 2) prnt("DEBUG PSK: waveEnd: %u, waveStart: %u", waveEnd, waveStart);
-			waveLenCnt = waveEnd-waveStart;
-			if (waveLenCnt > fc && waveStart > fc && !(waveLenCnt > fc+8)){ //not first peak and is a large wave but not out of whack
-				lastAvgWaveVal = avgWaveVal/(waveLenCnt);
-				firstFullWave = waveStart;
-				*fullWaveLen = waveLenCnt;
-				//if average wave value is > graph 0 then it is an up wave or a 1 (could cause inverting)
-				if (lastAvgWaveVal > FSK_PSK_THRESHOLD) *curPhase ^= 1;
-				return firstFullWave;
-			}
-			waveStart = i+1;
-			avgWaveVal = 0;
-		}
-		avgWaveVal += samples[i+2];
-	}
-	return 0;
+    uint16_t avgWaveVal=0, lastAvgWaveVal=0;
+    size_t i = waveStart, waveEnd, waveLenCnt, firstFullWave;
+    for (; i<loopCnt; i++) {
+        // find peak // was "samples[i] + fc" but why?  must have been used to weed out some wave error... removed..
+        if (samples[i] < samples[i+1] && samples[i+1] >= samples[i+2]){
+            waveEnd = i+1;
+            if (g_debugMode == 2) prnt("DEBUG PSK: waveEnd: %u, waveStart: %u", waveEnd, waveStart);
+            waveLenCnt = waveEnd-waveStart;
+            if (waveLenCnt > fc && waveStart > fc && !(waveLenCnt > fc+8)){ //not first peak and is a large wave but not out of whack
+                lastAvgWaveVal = avgWaveVal/(waveLenCnt);
+                firstFullWave = waveStart;
+                *fullWaveLen = waveLenCnt;
+                //if average wave value is > graph 0 then it is an up wave or a 1 (could cause inverting)
+                if (lastAvgWaveVal > FSK_PSK_THRESHOLD) *curPhase ^= 1;
+                return firstFullWave;
+            }
+            waveStart = i+1;
+            avgWaveVal = 0;
+        }
+        avgWaveVal += samples[i+2];
+    }
+    return 0;
 }
 
 //by marshmellow
 //amplify based on ask edge detection  -  not accurate enough to use all the time
 void askAmp(uint8_t *bits, size_t size) {
-	uint8_t last = 128;
-	for(size_t i = 1; i < size; ++i){
-		if ( bits[i] - bits[i-1] >= 30) //large jump up
-			last = 255;
-		else if ( bits[i-1] - bits[i] >= 20) //large jump down
-			last = 0;
+    uint8_t last = 128;
+    for(size_t i = 1; i < size; ++i){
+        if ( bits[i] - bits[i-1] >= 30) //large jump up
+            last = 255;
+        else if ( bits[i-1] - bits[i] >= 20) //large jump down
+            last = 0;
 
-		bits[i] = last;
-	}
+        bits[i] = last;
+    }
 }
 
 // iceman, simplify this
 uint32_t manchesterEncode2Bytes(uint16_t datain) {
-	uint32_t output = 0;
-	uint8_t curBit = 0;
-	for (uint8_t i = 0; i < 16; i++) {
-		curBit = (datain >> (15-i) & 1);
-		output |= ( 1 << ( ( (15-i) * 2 ) + curBit));
-	}
-	return output;
+    uint32_t output = 0;
+    uint8_t curBit = 0;
+    for (uint8_t i = 0; i < 16; i++) {
+        curBit = (datain >> (15-i) & 1);
+        output |= ( 1 << ( ( (15-i) * 2 ) + curBit));
+    }
+    return output;
 }
 
 //by marshmellow
 //encode binary data into binary manchester
 //NOTE: bitstream must have triple the size of "size" available in memory to do the swap
 int ManchesterEncode(uint8_t *bits, size_t size) {
-	//allow up to 4096b out (means bits must be at least 2048+4096 to handle the swap)
-	size = (size > 2048) ? 2048 : size;
-	size_t modIdx = size;
-	size_t i;
-	for (size_t idx=0; idx < size; idx++){
-		bits[idx+modIdx++] = bits[idx];
-		bits[idx+modIdx++] = bits[idx]^1;
-	}
-	for (i=0; i < (size*2); i++){
-		bits[i] = bits[i+size];
-	}
-	return i;
+    //allow up to 4096b out (means bits must be at least 2048+4096 to handle the swap)
+    size = (size > 2048) ? 2048 : size;
+    size_t modIdx = size;
+    size_t i;
+    for (size_t idx=0; idx < size; idx++){
+        bits[idx+modIdx++] = bits[idx];
+        bits[idx+modIdx++] = bits[idx]^1;
+    }
+    for (i=0; i < (size*2); i++){
+        bits[i] = bits[i+size];
+    }
+    return i;
 }
 
 // by marshmellow
 // to detect a wave that has heavily clipped (clean) samples
 // loop 512 samples,   if 250 of them is deemed maxed out,  we assume the wave is clipped.
 bool DetectCleanAskWave(uint8_t *dest, size_t size, uint8_t high, uint8_t low) {
-	bool allArePeaks = true;
-	uint16_t cntPeaks = 0;
-	size_t loopEnd = 512 + 160;
+    bool allArePeaks = true;
+    uint16_t cntPeaks = 0;
+    size_t loopEnd = 512 + 160;
 
-	// sanity check
-	if (loopEnd > size) loopEnd = size;
+    // sanity check
+    if (loopEnd > size) loopEnd = size;
 
-	for (size_t i = 160; i < loopEnd; i++){
+    for (size_t i = 160; i < loopEnd; i++){
 
-		if (dest[i] > low && dest[i] < high)
-			allArePeaks = false;
-		else
-			cntPeaks++;
-	}
+        if (dest[i] > low && dest[i] < high)
+            allArePeaks = false;
+        else
+            cntPeaks++;
+    }
 
-	if (!allArePeaks){
-		if (cntPeaks > 250) return true;
-	}
-	return allArePeaks;
+    if (!allArePeaks){
+        if (cntPeaks > 250) return true;
+    }
+    return allArePeaks;
 }
 
 
@@ -468,38 +468,38 @@ bool DetectCleanAskWave(uint8_t *dest, size_t size, uint8_t high, uint8_t low) {
 // to help detect clocks on heavily clipped samples
 // based on count of low to low
 int DetectStrongAskClock(uint8_t *dest, size_t size, int high, int low, int *clock) {
-	size_t startwave;
-	size_t i = 100;
-	size_t minClk = 512;
-	int shortestWaveIdx = 0;
+    size_t startwave;
+    size_t i = 100;
+    size_t minClk = 512;
+    int shortestWaveIdx = 0;
 
-	// get to first full low to prime loop and skip incomplete first pulse
-	getNextHigh(dest, size, high, &i);
-	getNextLow(dest, size, low, &i);
+    // get to first full low to prime loop and skip incomplete first pulse
+    getNextHigh(dest, size, high, &i);
+    getNextLow(dest, size, low, &i);
 
-	// loop through all samples (well, we don't want to go out-of-bounds)
-	while (i < size-512) {
-		// measure from low to low
-		startwave = i;
+    // loop through all samples (well, we don't want to go out-of-bounds)
+    while (i < size-512) {
+        // measure from low to low
+        startwave = i;
 
-		getNextHigh(dest, size, high, &i);
-		getNextLow(dest, size, low, &i);
+        getNextHigh(dest, size, high, &i);
+        getNextLow(dest, size, low, &i);
 
-		//get minimum measured distance
-		if (i-startwave < minClk && i < size) {
-			minClk = i - startwave;
-			shortestWaveIdx = startwave;
-		}
-	}
+        //get minimum measured distance
+        if (i-startwave < minClk && i < size) {
+            minClk = i - startwave;
+            shortestWaveIdx = startwave;
+        }
+    }
 
-	// set clock
-	if (g_debugMode == 2) prnt("DEBUG ASK: DetectStrongAskClock smallest wave: %d", minClk);
-	*clock = getClosestClock(minClk);
+    // set clock
+    if (g_debugMode == 2) prnt("DEBUG ASK: DetectStrongAskClock smallest wave: %d", minClk);
+    *clock = getClosestClock(minClk);
 
-	if (*clock == 0)
-		return -1;
+    if (*clock == 0)
+        return -1;
 
-	return shortestWaveIdx;
+    return shortestWaveIdx;
 }
 
 // by marshmellow
@@ -508,312 +508,312 @@ int DetectStrongAskClock(uint8_t *dest, size_t size, int high, int low, int *clo
 // return start index of best starting position for that clock and return clock (by reference)
 int DetectASKClock(uint8_t *dest, size_t size, int *clock, int maxErr) {
 
-	//don't need to loop through entire array. (cotag has clock of 384)
-	uint16_t loopCnt = 1500;
+    //don't need to loop through entire array. (cotag has clock of 384)
+    uint16_t loopCnt = 1500;
 
-	// not enough samples
-	if (size <= loopCnt + 60){
-		if (g_debugMode == 2) prnt("DEBUG DetectASKClock: not enough samples - aborting");
-		return -1;
-	}
+    // not enough samples
+    if (size <= loopCnt + 60){
+        if (g_debugMode == 2) prnt("DEBUG DetectASKClock: not enough samples - aborting");
+        return -1;
+    }
 
-	// just noise - no super good detection. good enough
-	if (signalprop.isnoise) {
-		if (g_debugMode == 2) prnt("DEBUG DetectASKClock: just noise detected - aborting");
-		return -2;
-	}
+    // just noise - no super good detection. good enough
+    if (signalprop.isnoise) {
+        if (g_debugMode == 2) prnt("DEBUG DetectASKClock: just noise detected - aborting");
+        return -2;
+    }
 
-	size_t i = 1;
-	uint16_t num_clks = 9;
-	// first 255 value pos0 is placeholder for user inputed clock.
-	uint16_t clk[] = {255, 8, 16, 32, 40, 50, 64, 100, 128, 255};
+    size_t i = 1;
+    uint16_t num_clks = 9;
+    // first 255 value pos0 is placeholder for user inputed clock.
+    uint16_t clk[] = {255, 8, 16, 32, 40, 50, 64, 100, 128, 255};
 
-	// sometimes there is a strange end wave - filter out this
-	size -= 60;
+    // sometimes there is a strange end wave - filter out this
+    size -= 60;
 
-	// What is purpose?
-	// already have a valid clock?
-	uint8_t found_clk = 0;
-	for (; i < num_clks; ++i) {
-		if (clk[i] == *clock) {
-			found_clk = i;
-		}
-	}
+    // What is purpose?
+    // already have a valid clock?
+    uint8_t found_clk = 0;
+    for (; i < num_clks; ++i) {
+        if (clk[i] == *clock) {
+            found_clk = i;
+        }
+    }
 
-	// threshold 75% of high, low peak
-	int peak_hi, peak_low;
-	getHiLo(&peak_hi, &peak_low, 75, 75);
+    // threshold 75% of high, low peak
+    int peak_hi, peak_low;
+    getHiLo(&peak_hi, &peak_low, 75, 75);
 
-	// test for large clean, STRONG, CLIPPED peaks
+    // test for large clean, STRONG, CLIPPED peaks
 
-	if (!found_clk) {
+    if (!found_clk) {
 
-		if (DetectCleanAskWave(dest, size, peak_hi, peak_low)){
+        if (DetectCleanAskWave(dest, size, peak_hi, peak_low)){
 
-			int idx = DetectStrongAskClock(dest, size, peak_hi, peak_low, clock);
-			if (g_debugMode == 2)
-				prnt("DEBUG ASK: DetectASKClock Clean ASK Wave detected: clk %i, Best Starting Position: %i", *clock, idx);
+            int idx = DetectStrongAskClock(dest, size, peak_hi, peak_low, clock);
+            if (g_debugMode == 2)
+                prnt("DEBUG ASK: DetectASKClock Clean ASK Wave detected: clk %i, Best Starting Position: %i", *clock, idx);
 
-			// return shortest wave start position
-			if (idx > -1)
-				return idx;
-		}
-	}
-	// test for weak peaks
+            // return shortest wave start position
+            if (idx > -1)
+                return idx;
+        }
+    }
+    // test for weak peaks
 
-	// test clock if given as cmd parameter
-	if ( *clock > 0 )
-		clk[0] = *clock;
+    // test clock if given as cmd parameter
+    if ( *clock > 0 )
+        clk[0] = *clock;
 
-	uint8_t clkCnt, tol = 0;
-	size_t j = 0;
-	uint16_t bestErr[] = {1000,1000,1000,1000,1000,1000,1000,1000,1000};
-	uint8_t bestStart[] = {0,0,0,0,0,0,0,0,0};
-	size_t errCnt = 0, arrLoc, loopEnd;
+    uint8_t clkCnt, tol = 0;
+    size_t j = 0;
+    uint16_t bestErr[] = {1000,1000,1000,1000,1000,1000,1000,1000,1000};
+    uint8_t bestStart[] = {0,0,0,0,0,0,0,0,0};
+    size_t errCnt = 0, arrLoc, loopEnd;
 
-	if (found_clk) {
-		clkCnt = found_clk;
-		num_clks = found_clk + 1;
-	} else {
-		clkCnt = 1;
-	}
+    if (found_clk) {
+        clkCnt = found_clk;
+        num_clks = found_clk + 1;
+    } else {
+        clkCnt = 1;
+    }
 
-	//test each valid clock from smallest to greatest to see which lines up
-	for (; clkCnt < num_clks; clkCnt++) {
-		if (clk[clkCnt] <= 32) {
-			tol = 1;
-		} else {
-			tol = 0;
-		}
-		//if no errors allowed - keep start within the first clock
-		if (!maxErr && size > clk[clkCnt]*2 + tol && clk[clkCnt] < 128)
-			loopCnt = clk[clkCnt] * 2;
+    //test each valid clock from smallest to greatest to see which lines up
+    for (; clkCnt < num_clks; clkCnt++) {
+        if (clk[clkCnt] <= 32) {
+            tol = 1;
+        } else {
+            tol = 0;
+        }
+        //if no errors allowed - keep start within the first clock
+        if (!maxErr && size > clk[clkCnt]*2 + tol && clk[clkCnt] < 128)
+            loopCnt = clk[clkCnt] * 2;
 
-		bestErr[clkCnt] = 1000;
+        bestErr[clkCnt] = 1000;
 
-		//try lining up the peaks by moving starting point (try first few clocks)
+        //try lining up the peaks by moving starting point (try first few clocks)
 
-		// get to first full low to prime loop and skip incomplete first pulse
-		getNextHigh(dest, size, peak_hi, &j);
-		getNextLow(dest, size, peak_low, &j);
+        // get to first full low to prime loop and skip incomplete first pulse
+        getNextHigh(dest, size, peak_hi, &j);
+        getNextLow(dest, size, peak_low, &j);
 
-		for (; j < loopCnt; j++){
-			errCnt = 0;
-			// now that we have the first one lined up test rest of wave array
-			loopEnd = ((size-j-tol) / clk[clkCnt]) - 1;
-			for (i=0; i < loopEnd; ++i){
-				arrLoc = j + (i * clk[clkCnt]);
-				if (dest[arrLoc] >= peak_hi || dest[arrLoc] <= peak_low){
-				} else if (dest[arrLoc-tol] >= peak_hi || dest[arrLoc-tol] <= peak_low){
-				} else if (dest[arrLoc+tol] >= peak_hi || dest[arrLoc+tol] <= peak_low){
-				} else {  //error no peak detected
-					errCnt++;
-				}
-			}
-			// if we found no errors then we can stop here and a low clock (common clocks)
-			//  this is correct one - return this clock
-			// if (g_debugMode == 2) prnt("DEBUG ASK: clk %d, err %d, startpos %d, endpos %d", clk[clkCnt], errCnt, j, i);
-			if (errCnt == 0 && clkCnt < 7) {
-				if (!found_clk)
-					*clock = clk[clkCnt];
-				return j;
-			}
-			// if we found errors see if it is lowest so far and save it as best run
-			if (errCnt < bestErr[clkCnt]) {
-				bestErr[clkCnt] = errCnt;
-				bestStart[clkCnt] = j;
-			}
-		}
-	}
+        for (; j < loopCnt; j++){
+            errCnt = 0;
+            // now that we have the first one lined up test rest of wave array
+            loopEnd = ((size-j-tol) / clk[clkCnt]) - 1;
+            for (i=0; i < loopEnd; ++i){
+                arrLoc = j + (i * clk[clkCnt]);
+                if (dest[arrLoc] >= peak_hi || dest[arrLoc] <= peak_low){
+                } else if (dest[arrLoc-tol] >= peak_hi || dest[arrLoc-tol] <= peak_low){
+                } else if (dest[arrLoc+tol] >= peak_hi || dest[arrLoc+tol] <= peak_low){
+                } else {  //error no peak detected
+                    errCnt++;
+                }
+            }
+            // if we found no errors then we can stop here and a low clock (common clocks)
+            //  this is correct one - return this clock
+            // if (g_debugMode == 2) prnt("DEBUG ASK: clk %d, err %d, startpos %d, endpos %d", clk[clkCnt], errCnt, j, i);
+            if (errCnt == 0 && clkCnt < 7) {
+                if (!found_clk)
+                    *clock = clk[clkCnt];
+                return j;
+            }
+            // if we found errors see if it is lowest so far and save it as best run
+            if (errCnt < bestErr[clkCnt]) {
+                bestErr[clkCnt] = errCnt;
+                bestStart[clkCnt] = j;
+            }
+        }
+    }
 
-	uint8_t k, best = 0;
+    uint8_t k, best = 0;
 
-	for (k=1; k < num_clks; ++k){
-		if (bestErr[k] < bestErr[best]){
-			if (bestErr[k] == 0) bestErr[k] = 1;
-			// current best bit to error ratio     vs  new bit to error ratio
-			if ( (size/clk[best])/bestErr[best] < (size/clk[k])/bestErr[k] ){
-				best = k;
-			}
-		}
-		//if (g_debugMode == 2) prnt("DEBUG ASK: clk %d, # Errors %d, Current Best Clk %d, bestStart %d", clk[k], bestErr[k], clk[best], bestStart[best]);
-	}
+    for (k=1; k < num_clks; ++k){
+        if (bestErr[k] < bestErr[best]){
+            if (bestErr[k] == 0) bestErr[k] = 1;
+            // current best bit to error ratio     vs  new bit to error ratio
+            if ( (size/clk[best])/bestErr[best] < (size/clk[k])/bestErr[k] ){
+                best = k;
+            }
+        }
+        //if (g_debugMode == 2) prnt("DEBUG ASK: clk %d, # Errors %d, Current Best Clk %d, bestStart %d", clk[k], bestErr[k], clk[best], bestStart[best]);
+    }
 
-	if (!found_clk)
-		*clock = clk[best];
+    if (!found_clk)
+        *clock = clk[best];
 
-	return bestStart[best];
+    return bestStart[best];
 }
 
 int DetectStrongNRZClk(uint8_t *dest, size_t size, int peak, int low, bool *strong) {
-	//find shortest transition from high to low
-	*strong = false;
-	size_t i = 0;
-	size_t transition1 = 0;
-	int lowestTransition = 255;
-	bool lastWasHigh = false;
-	size_t transitionSampleCount = 0;
-	//find first valid beginning of a high or low wave
-	while ((dest[i] >= peak || dest[i] <= low) && (i < size))
-		++i;
-	while ((dest[i] < peak && dest[i] > low) && (i < size))
-		++i;
+    //find shortest transition from high to low
+    *strong = false;
+    size_t i = 0;
+    size_t transition1 = 0;
+    int lowestTransition = 255;
+    bool lastWasHigh = false;
+    size_t transitionSampleCount = 0;
+    //find first valid beginning of a high or low wave
+    while ((dest[i] >= peak || dest[i] <= low) && (i < size))
+        ++i;
+    while ((dest[i] < peak && dest[i] > low) && (i < size))
+        ++i;
 
-	lastWasHigh = (dest[i] >= peak);
+    lastWasHigh = (dest[i] >= peak);
 
-	if (i == size)
-		return 0;
+    if (i == size)
+        return 0;
 
-	transition1 = i;
+    transition1 = i;
 
-	for (;i < size; i++) {
-		if ((dest[i] >= peak && !lastWasHigh) || (dest[i] <= low && lastWasHigh)) {
-			lastWasHigh = (dest[i] >= peak);
-			if (i-transition1 < lowestTransition)
-				lowestTransition = i-transition1;
-			transition1 = i;
-		} else if (dest[i] < peak && dest[i] > low) {
-			transitionSampleCount++;
-		}
-	}
-	if (lowestTransition == 255)
-		lowestTransition = 0;
+    for (;i < size; i++) {
+        if ((dest[i] >= peak && !lastWasHigh) || (dest[i] <= low && lastWasHigh)) {
+            lastWasHigh = (dest[i] >= peak);
+            if (i-transition1 < lowestTransition)
+                lowestTransition = i-transition1;
+            transition1 = i;
+        } else if (dest[i] < peak && dest[i] > low) {
+            transitionSampleCount++;
+        }
+    }
+    if (lowestTransition == 255)
+        lowestTransition = 0;
 
-	if (g_debugMode == 2) prnt("DEBUG NRZ: detectstrongNRZclk smallest wave: %d", lowestTransition);
-	// if less than 10% of the samples were not peaks (or 90% were peaks) then we have a strong wave
-	if (transitionSampleCount / size < 10) {
-		*strong = true;
-		lowestTransition = getClosestClock(lowestTransition);
-	}
-	return lowestTransition;
+    if (g_debugMode == 2) prnt("DEBUG NRZ: detectstrongNRZclk smallest wave: %d", lowestTransition);
+    // if less than 10% of the samples were not peaks (or 90% were peaks) then we have a strong wave
+    if (transitionSampleCount / size < 10) {
+        *strong = true;
+        lowestTransition = getClosestClock(lowestTransition);
+    }
+    return lowestTransition;
 }
 
 //by marshmellow
 //detect nrz clock by reading #peaks vs no peaks(or errors)
 int DetectNRZClock(uint8_t *dest, size_t size, int clock, size_t *clockStartIdx) {
-	size_t i = 0;
-	uint8_t clk[] = {8,16,32,40,50,64,100,128,255};
-	size_t loopCnt = 4096;  //don't need to loop through entire array...
+    size_t i = 0;
+    uint8_t clk[] = {8,16,32,40,50,64,100,128,255};
+    size_t loopCnt = 4096;  //don't need to loop through entire array...
 
-	//if we already have a valid clock quit
-	for (; i < 8; ++i)
-		if (clk[i] == clock) return clock;
+    //if we already have a valid clock quit
+    for (; i < 8; ++i)
+        if (clk[i] == clock) return clock;
 
-	if (size < 20) return 0;
-	// size must be larger than 20 here
-	if (size < loopCnt) loopCnt = size-20;
+    if (size < 20) return 0;
+    // size must be larger than 20 here
+    if (size < loopCnt) loopCnt = size-20;
 
 
-	// just noise - no super good detection. good enough
-	if (signalprop.isnoise) {
-		if (g_debugMode == 2) prnt("DEBUG DetectNZRClock: just noise detected - quitting");
-		return 0;
-	}
+    // just noise - no super good detection. good enough
+    if (signalprop.isnoise) {
+        if (g_debugMode == 2) prnt("DEBUG DetectNZRClock: just noise detected - quitting");
+        return 0;
+    }
 
-	//get high and low peak
-	int peak, low;
-	//getHiLo(dest, loopCnt, &peak, &low, 90, 90);
-	getHiLo(&peak, &low, 90, 90);
+    //get high and low peak
+    int peak, low;
+    //getHiLo(dest, loopCnt, &peak, &low, 90, 90);
+    getHiLo(&peak, &low, 90, 90);
 
-	bool strong = false;
-	int lowestTransition = DetectStrongNRZClk(dest, size-20, peak, low, &strong);
-	if (strong) return lowestTransition;
-	size_t ii;
-	uint8_t clkCnt;
-	uint8_t tol = 0;
-	uint16_t smplCnt = 0;
-	int16_t peakcnt = 0;
-	int16_t peaksdet[] = {0,0,0,0,0,0,0,0};
-	uint16_t minPeak = 255;
-	bool firstpeak = true;
-	//test for large clipped waves - ignore first peak
-	for (i=0; i<loopCnt; i++){
-		if (dest[i] >= peak || dest[i] <= low){
-			if (firstpeak) continue;
-			smplCnt++;
-		} else {
-			firstpeak = false;
-			if (smplCnt > 0) {
-				if (minPeak > smplCnt && smplCnt > 7) minPeak = smplCnt;
-				peakcnt++;
-				if (g_debugMode == 2) prnt("DEBUG NRZ: minPeak: %d, smplCnt: %d, peakcnt: %d",minPeak,smplCnt,peakcnt);
-				smplCnt = 0;
-			}
-		}
-	}
-	if (minPeak < 8) return 0;
+    bool strong = false;
+    int lowestTransition = DetectStrongNRZClk(dest, size-20, peak, low, &strong);
+    if (strong) return lowestTransition;
+    size_t ii;
+    uint8_t clkCnt;
+    uint8_t tol = 0;
+    uint16_t smplCnt = 0;
+    int16_t peakcnt = 0;
+    int16_t peaksdet[] = {0,0,0,0,0,0,0,0};
+    uint16_t minPeak = 255;
+    bool firstpeak = true;
+    //test for large clipped waves - ignore first peak
+    for (i=0; i<loopCnt; i++){
+        if (dest[i] >= peak || dest[i] <= low){
+            if (firstpeak) continue;
+            smplCnt++;
+        } else {
+            firstpeak = false;
+            if (smplCnt > 0) {
+                if (minPeak > smplCnt && smplCnt > 7) minPeak = smplCnt;
+                peakcnt++;
+                if (g_debugMode == 2) prnt("DEBUG NRZ: minPeak: %d, smplCnt: %d, peakcnt: %d",minPeak,smplCnt,peakcnt);
+                smplCnt = 0;
+            }
+        }
+    }
+    if (minPeak < 8) return 0;
 
-	bool errBitHigh = 0, bitHigh = 0, lastPeakHigh = 0;
-	uint8_t ignoreCnt = 0, ignoreWindow = 4;
-	int lastBit = 0;
-	size_t bestStart[] = {0,0,0,0,0,0,0,0,0};
-	peakcnt = 0;
-	//test each valid clock from smallest to greatest to see which lines up
-	for (clkCnt=0; clkCnt < 8; ++clkCnt){
-		//ignore clocks smaller than smallest peak
-		if (clk[clkCnt] < minPeak - (clk[clkCnt]/4)) continue;
-		//try lining up the peaks by moving starting point (try first 256)
-		for (ii=20; ii < loopCnt; ++ii){
-			if ((dest[ii] >= peak) || (dest[ii] <= low)){
-				peakcnt=0;
-				bitHigh = false;
-				ignoreCnt = 0;
-				lastBit = ii-clk[clkCnt];
-				//loop through to see if this start location works
-				for (i = ii; i < size-20; ++i) {
-					//if we are at a clock bit
-					if ((i >= lastBit + clk[clkCnt] - tol) && (i <= lastBit + clk[clkCnt] + tol)) {
-						//test high/low
-						if (dest[i] >= peak || dest[i] <= low) {
-							//if same peak don't count it
-							if ((dest[i] >= peak && !lastPeakHigh) || (dest[i] <= low && lastPeakHigh)) {
-								peakcnt++;
-							}
-							lastPeakHigh = (dest[i] >= peak);
-							bitHigh = true;
-							errBitHigh = false;
-							ignoreCnt = ignoreWindow;
-							lastBit += clk[clkCnt];
-						} else if (i == lastBit + clk[clkCnt] + tol) {
-							lastBit += clk[clkCnt];
-						}
-					//else if not a clock bit and no peaks
-					} else if (dest[i] < peak && dest[i] > low){
-						if (ignoreCnt == 0){
-							bitHigh = false;
-							if (errBitHigh == true)
-								peakcnt--;
-							errBitHigh = false;
-						} else {
-							ignoreCnt--;
-						}
-						// else if not a clock bit but we have a peak
-					} else if ((dest[i] >= peak || dest[i] <= low) && (!bitHigh)) {
-						//error bar found no clock...
-						errBitHigh = true;
-					}
-				}
-				if (peakcnt > peaksdet[clkCnt]) {
-					bestStart[clkCnt] = ii;
-					peaksdet[clkCnt] = peakcnt;
-				}
-			}
-		}
-	}
+    bool errBitHigh = 0, bitHigh = 0, lastPeakHigh = 0;
+    uint8_t ignoreCnt = 0, ignoreWindow = 4;
+    int lastBit = 0;
+    size_t bestStart[] = {0,0,0,0,0,0,0,0,0};
+    peakcnt = 0;
+    //test each valid clock from smallest to greatest to see which lines up
+    for (clkCnt=0; clkCnt < 8; ++clkCnt){
+        //ignore clocks smaller than smallest peak
+        if (clk[clkCnt] < minPeak - (clk[clkCnt]/4)) continue;
+        //try lining up the peaks by moving starting point (try first 256)
+        for (ii=20; ii < loopCnt; ++ii){
+            if ((dest[ii] >= peak) || (dest[ii] <= low)){
+                peakcnt=0;
+                bitHigh = false;
+                ignoreCnt = 0;
+                lastBit = ii-clk[clkCnt];
+                //loop through to see if this start location works
+                for (i = ii; i < size-20; ++i) {
+                    //if we are at a clock bit
+                    if ((i >= lastBit + clk[clkCnt] - tol) && (i <= lastBit + clk[clkCnt] + tol)) {
+                        //test high/low
+                        if (dest[i] >= peak || dest[i] <= low) {
+                            //if same peak don't count it
+                            if ((dest[i] >= peak && !lastPeakHigh) || (dest[i] <= low && lastPeakHigh)) {
+                                peakcnt++;
+                            }
+                            lastPeakHigh = (dest[i] >= peak);
+                            bitHigh = true;
+                            errBitHigh = false;
+                            ignoreCnt = ignoreWindow;
+                            lastBit += clk[clkCnt];
+                        } else if (i == lastBit + clk[clkCnt] + tol) {
+                            lastBit += clk[clkCnt];
+                        }
+                    //else if not a clock bit and no peaks
+                    } else if (dest[i] < peak && dest[i] > low){
+                        if (ignoreCnt == 0){
+                            bitHigh = false;
+                            if (errBitHigh == true)
+                                peakcnt--;
+                            errBitHigh = false;
+                        } else {
+                            ignoreCnt--;
+                        }
+                        // else if not a clock bit but we have a peak
+                    } else if ((dest[i] >= peak || dest[i] <= low) && (!bitHigh)) {
+                        //error bar found no clock...
+                        errBitHigh = true;
+                    }
+                }
+                if (peakcnt > peaksdet[clkCnt]) {
+                    bestStart[clkCnt] = ii;
+                    peaksdet[clkCnt] = peakcnt;
+                }
+            }
+        }
+    }
 
-	uint8_t best = 0;
-	for (int m = 7; m > 0; m--){
-		if ((peaksdet[m] >= (peaksdet[best]-1)) && (peaksdet[m] <= peaksdet[best]+1) && lowestTransition) {
-			if (clk[m] > (lowestTransition - (clk[m]/8)) && clk[m] < (lowestTransition + (clk[m]/8))) {
-				best = m;
-			}
-		} else if (peaksdet[m] > peaksdet[best]){
-			best = m;
-		}
-		if (g_debugMode == 2) prnt("DEBUG NRZ: Clk: %d, peaks: %d, minPeak: %d, bestClk: %d, lowestTrs: %d", clk[m], peaksdet[m], minPeak, clk[best], lowestTransition);
-	}
-	*clockStartIdx	= bestStart[best];
-	return clk[best];
+    uint8_t best = 0;
+    for (int m = 7; m > 0; m--){
+        if ((peaksdet[m] >= (peaksdet[best]-1)) && (peaksdet[m] <= peaksdet[best]+1) && lowestTransition) {
+            if (clk[m] > (lowestTransition - (clk[m]/8)) && clk[m] < (lowestTransition + (clk[m]/8))) {
+                best = m;
+            }
+        } else if (peaksdet[m] > peaksdet[best]){
+            best = m;
+        }
+        if (g_debugMode == 2) prnt("DEBUG NRZ: Clk: %d, peaks: %d, minPeak: %d, bestClk: %d, lowestTrs: %d", clk[m], peaksdet[m], minPeak, clk[best], lowestTransition);
+    }
+    *clockStartIdx = bestStart[best];
+    return clk[best];
 }
 
 //by marshmellow
@@ -821,299 +821,299 @@ int DetectNRZClock(uint8_t *dest, size_t size, int clock, size_t *clockStartIdx)
 //counts and returns the 2 most common wave lengths
 //mainly used for FSK field clock detection
 uint16_t countFC(uint8_t *bits, size_t size, bool fskAdj) {
-	uint8_t fcLens[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
-	uint16_t fcCnts[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
-	uint8_t fcLensFnd = 0;
-	uint8_t lastFCcnt = 0;
-	uint8_t fcCounter = 0;
-	size_t i;
-	if (size < 180) return 0;
+    uint8_t fcLens[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+    uint16_t fcCnts[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+    uint8_t fcLensFnd = 0;
+    uint8_t lastFCcnt = 0;
+    uint8_t fcCounter = 0;
+    size_t i;
+    if (size < 180) return 0;
 
-	// prime i to first up transition
-	for (i = 160; i < size-20; i++)
-		if (bits[i] > bits[i-1] && bits[i] >= bits[i+1])
-			break;
+    // prime i to first up transition
+    for (i = 160; i < size-20; i++)
+        if (bits[i] > bits[i-1] && bits[i] >= bits[i+1])
+            break;
 
-	for (; i < size-20; i++){
-		if (bits[i] > bits[i-1] && bits[i] >= bits[i+1]){
-			// new up transition
-			fcCounter++;
-			if (fskAdj){
-				//if we had 5 and now have 9 then go back to 8 (for when we get a fc 9 instead of an 8)
-				if (lastFCcnt == 5 && fcCounter == 9) fcCounter--;
+    for (; i < size-20; i++){
+        if (bits[i] > bits[i-1] && bits[i] >= bits[i+1]){
+            // new up transition
+            fcCounter++;
+            if (fskAdj){
+                //if we had 5 and now have 9 then go back to 8 (for when we get a fc 9 instead of an 8)
+                if (lastFCcnt == 5 && fcCounter == 9) fcCounter--;
 
-				//if fc=9 or 4 add one (for when we get a fc 9 instead of 10 or a 4 instead of a 5)
-				if ((fcCounter == 9) || fcCounter == 4) fcCounter++;
-				// save last field clock count  (fc/xx)
-				lastFCcnt = fcCounter;
-			}
-			// find which fcLens to save it to:
-			for (int m=0; m<15; m++){
-				if (fcLens[m] == fcCounter){
-					fcCnts[m]++;
-					fcCounter = 0;
-					break;
-				}
-			}
-			if (fcCounter>0 && fcLensFnd<15){
-				//add new fc length
-				fcCnts[fcLensFnd]++;
-				fcLens[fcLensFnd++] = fcCounter;
-			}
-			fcCounter=0;
-		} else {
-			// count sample
-			fcCounter++;
-		}
-	}
+                //if fc=9 or 4 add one (for when we get a fc 9 instead of 10 or a 4 instead of a 5)
+                if ((fcCounter == 9) || fcCounter == 4) fcCounter++;
+                // save last field clock count  (fc/xx)
+                lastFCcnt = fcCounter;
+            }
+            // find which fcLens to save it to:
+            for (int m=0; m<15; m++){
+                if (fcLens[m] == fcCounter){
+                    fcCnts[m]++;
+                    fcCounter = 0;
+                    break;
+                }
+            }
+            if (fcCounter>0 && fcLensFnd<15){
+                //add new fc length
+                fcCnts[fcLensFnd]++;
+                fcLens[fcLensFnd++] = fcCounter;
+            }
+            fcCounter=0;
+        } else {
+            // count sample
+            fcCounter++;
+        }
+    }
 
-	uint8_t best1 = 14, best2 = 14, best3 = 14;
-	uint16_t maxCnt1 = 0;
-	// go through fclens and find which ones are bigest 2
-	for (i=0; i<15; i++){
-		// get the 3 best FC values
-		if (fcCnts[i] > maxCnt1) {
-			best3 = best2;
-			best2 = best1;
-			maxCnt1 = fcCnts[i];
-			best1 = i;
-		} else if(fcCnts[i] > fcCnts[best2]){
-			best3 = best2;
-			best2 = i;
-		} else if(fcCnts[i] > fcCnts[best3]){
-			best3 = i;
-		}
-		if (g_debugMode == 2) prnt("DEBUG countfc: FC %u, Cnt %u, best fc: %u, best2 fc: %u", fcLens[i], fcCnts[i], fcLens[best1], fcLens[best2]);
-		if (fcLens[i] == 0) break;
-	}
+    uint8_t best1 = 14, best2 = 14, best3 = 14;
+    uint16_t maxCnt1 = 0;
+    // go through fclens and find which ones are bigest 2
+    for (i=0; i<15; i++){
+        // get the 3 best FC values
+        if (fcCnts[i] > maxCnt1) {
+            best3 = best2;
+            best2 = best1;
+            maxCnt1 = fcCnts[i];
+            best1 = i;
+        } else if(fcCnts[i] > fcCnts[best2]){
+            best3 = best2;
+            best2 = i;
+        } else if(fcCnts[i] > fcCnts[best3]){
+            best3 = i;
+        }
+        if (g_debugMode == 2) prnt("DEBUG countfc: FC %u, Cnt %u, best fc: %u, best2 fc: %u", fcLens[i], fcCnts[i], fcLens[best1], fcLens[best2]);
+        if (fcLens[i] == 0) break;
+    }
 
-	if (fcLens[best1] == 0) return 0;
-	uint8_t fcH = 0, fcL = 0;
-	if (fcLens[best1] > fcLens[best2]){
-		fcH = fcLens[best1];
-		fcL = fcLens[best2];
-	} else{
-		fcH = fcLens[best2];
-		fcL = fcLens[best1];
-	}
-	if ((size-180)/fcH/3 > fcCnts[best1] + fcCnts[best2]) {
-		if (g_debugMode == 2) prnt("DEBUG countfc: fc is too large: %u > %u. Not psk or fsk", (size-180)/fcH/3, fcCnts[best1] + fcCnts[best2]);
-		return 0; //lots of waves not psk or fsk
-	}
-	// TODO: take top 3 answers and compare to known Field clocks to get top 2
+    if (fcLens[best1] == 0) return 0;
+    uint8_t fcH = 0, fcL = 0;
+    if (fcLens[best1] > fcLens[best2]){
+        fcH = fcLens[best1];
+        fcL = fcLens[best2];
+    } else{
+        fcH = fcLens[best2];
+        fcL = fcLens[best1];
+    }
+    if ((size-180)/fcH/3 > fcCnts[best1] + fcCnts[best2]) {
+        if (g_debugMode == 2) prnt("DEBUG countfc: fc is too large: %u > %u. Not psk or fsk", (size-180)/fcH/3, fcCnts[best1] + fcCnts[best2]);
+        return 0; //lots of waves not psk or fsk
+    }
+    // TODO: take top 3 answers and compare to known Field clocks to get top 2
 
-	uint16_t fcs = (((uint16_t)fcH)<<8) | fcL;
-	if (fskAdj) return fcs;
-	return (uint16_t)fcLens[best2] << 8 | fcLens[best1];
+    uint16_t fcs = (((uint16_t)fcH)<<8) | fcL;
+    if (fskAdj) return fcs;
+    return (uint16_t)fcLens[best2] << 8 | fcLens[best1];
 }
 
 //by marshmellow
 //detect psk clock by reading each phase shift
 // a phase shift is determined by measuring the sample length of each wave
 int DetectPSKClock(uint8_t *dest, size_t size, int clock, size_t *firstPhaseShift, uint8_t *curPhase, uint8_t *fc) {
-	uint8_t clk[] = {255,16,32,40,50,64,100,128,255}; //255 is not a valid clock
-	uint16_t loopCnt = 4096;  //don't need to loop through entire array...
+    uint8_t clk[] = {255,16,32,40,50,64,100,128,255}; //255 is not a valid clock
+    uint16_t loopCnt = 4096;  //don't need to loop through entire array...
 
-	//if we already have a valid clock quit
-	size_t i = 1;
-	for (; i < 8; ++i)
-		if (clk[i] == clock) return clock;
+    //if we already have a valid clock quit
+    size_t i = 1;
+    for (; i < 8; ++i)
+        if (clk[i] == clock) return clock;
 
-	if (size < 160+20) return 0;
-	// size must be larger than 20 here, and 160 later on.
-	if (size < loopCnt) loopCnt = size-20;
+    if (size < 160+20) return 0;
+    // size must be larger than 20 here, and 160 later on.
+    if (size < loopCnt) loopCnt = size-20;
 
-	uint16_t fcs = countFC(dest, size, 0);
+    uint16_t fcs = countFC(dest, size, 0);
 
-	*fc = fcs & 0xFF;
+    *fc = fcs & 0xFF;
 
-	if (g_debugMode == 2) prnt("DEBUG PSK: FC: %d, FC2: %d",*fc, fcs>>8);
+    if (g_debugMode == 2) prnt("DEBUG PSK: FC: %d, FC2: %d",*fc, fcs>>8);
 
-	if ((fcs >> 8) == 10 && *fc == 8) return 0;
+    if ((fcs >> 8) == 10 && *fc == 8) return 0;
 
-	if (*fc != 2 && *fc != 4 && *fc != 8) return 0;
+    if (*fc != 2 && *fc != 4 && *fc != 8) return 0;
 
 
-	size_t waveStart=0, waveEnd=0, firstFullWave=0, lastClkBit=0;
+    size_t waveStart=0, waveEnd=0, firstFullWave=0, lastClkBit=0;
 
-	uint8_t clkCnt, tol=1;
-	uint16_t peakcnt=0, errCnt=0, waveLenCnt=0, fullWaveLen=0;
-	uint16_t bestErr[] = {1000,1000,1000,1000,1000,1000,1000,1000,1000};
-	uint16_t peaksdet[] = {0,0,0,0,0,0,0,0,0};
+    uint8_t clkCnt, tol=1;
+    uint16_t peakcnt=0, errCnt=0, waveLenCnt=0, fullWaveLen=0;
+    uint16_t bestErr[] = {1000,1000,1000,1000,1000,1000,1000,1000,1000};
+    uint16_t peaksdet[] = {0,0,0,0,0,0,0,0,0};
 
-	//find start of modulating data in trace
-	i = findModStart(dest, size, *fc);
+    //find start of modulating data in trace
+    i = findModStart(dest, size, *fc);
 
-	firstFullWave = pskFindFirstPhaseShift(dest, size, curPhase, i, *fc, &fullWaveLen);
-	if (firstFullWave == 0) {
-		// no phase shift detected - could be all 1's or 0's - doesn't matter where we start
-		// so skip a little to ensure we are past any Start Signal
-		firstFullWave = 160;
-		fullWaveLen = 0;
-	}
+    firstFullWave = pskFindFirstPhaseShift(dest, size, curPhase, i, *fc, &fullWaveLen);
+    if (firstFullWave == 0) {
+        // no phase shift detected - could be all 1's or 0's - doesn't matter where we start
+        // so skip a little to ensure we are past any Start Signal
+        firstFullWave = 160;
+        fullWaveLen = 0;
+    }
 
-	*firstPhaseShift = firstFullWave;
-	if (g_debugMode == 2) prnt("DEBUG PSK: firstFullWave: %d, waveLen: %d",firstFullWave,fullWaveLen);
+    *firstPhaseShift = firstFullWave;
+    if (g_debugMode == 2) prnt("DEBUG PSK: firstFullWave: %d, waveLen: %d",firstFullWave,fullWaveLen);
 
-	//test each valid clock from greatest to smallest to see which lines up
-	for (clkCnt=7; clkCnt >= 1 ; clkCnt--){
-		tol = *fc/2;
-		lastClkBit = firstFullWave; //set end of wave as clock align
-		waveStart = 0;
-		errCnt = 0;
-		peakcnt = 0;
-		if (g_debugMode == 2) prnt("DEBUG PSK: clk: %d, lastClkBit: %d", clk[clkCnt], lastClkBit);
+    //test each valid clock from greatest to smallest to see which lines up
+    for (clkCnt=7; clkCnt >= 1 ; clkCnt--){
+        tol = *fc/2;
+        lastClkBit = firstFullWave; //set end of wave as clock align
+        waveStart = 0;
+        errCnt = 0;
+        peakcnt = 0;
+        if (g_debugMode == 2) prnt("DEBUG PSK: clk: %d, lastClkBit: %d", clk[clkCnt], lastClkBit);
 
-		for (i = firstFullWave+fullWaveLen-1; i < loopCnt-2; i++){
-			//top edge of wave = start of new wave
-			if (dest[i] < dest[i+1] && dest[i+1] >= dest[i+2]){
-				if (waveStart == 0) {
-					waveStart = i+1;
-					waveLenCnt = 0;
-				} else { //waveEnd
-					waveEnd = i+1;
-					waveLenCnt = waveEnd-waveStart;
-					if (waveLenCnt > *fc){
-						//if this wave is a phase shift
-						if (g_debugMode == 2) prnt("DEBUG PSK: phase shift at: %d, len: %d, nextClk: %d, i: %d, fc: %d", waveStart, waveLenCnt, lastClkBit + clk[clkCnt] - tol, i+1, *fc);
-						if (i+1 >= lastClkBit + clk[clkCnt] - tol){ //should be a clock bit
-							peakcnt++;
-							lastClkBit += clk[clkCnt];
-						} else if (i < lastClkBit+8){
-							//noise after a phase shift - ignore
-						} else { //phase shift before supposed to based on clock
-							errCnt++;
-						}
-					} else if (i+1 > lastClkBit + clk[clkCnt] + tol + *fc){
-						lastClkBit+=clk[clkCnt]; //no phase shift but clock bit
-					}
-					waveStart = i+1;
-				}
-			}
-		}
-		if (errCnt == 0) return clk[clkCnt];
-		if (errCnt <= bestErr[clkCnt]) bestErr[clkCnt] = errCnt;
-		if (peakcnt > peaksdet[clkCnt]) peaksdet[clkCnt] = peakcnt;
-	}
-	//all tested with errors
-	//return the highest clk with the most peaks found
-	uint8_t best = 7;
-	for (i=7; i >= 1; i--){
-		if (peaksdet[i] > peaksdet[best])
-			best = i;
+        for (i = firstFullWave+fullWaveLen-1; i < loopCnt-2; i++){
+            //top edge of wave = start of new wave
+            if (dest[i] < dest[i+1] && dest[i+1] >= dest[i+2]){
+                if (waveStart == 0) {
+                    waveStart = i+1;
+                    waveLenCnt = 0;
+                } else { //waveEnd
+                    waveEnd = i+1;
+                    waveLenCnt = waveEnd-waveStart;
+                    if (waveLenCnt > *fc){
+                        //if this wave is a phase shift
+                        if (g_debugMode == 2) prnt("DEBUG PSK: phase shift at: %d, len: %d, nextClk: %d, i: %d, fc: %d", waveStart, waveLenCnt, lastClkBit + clk[clkCnt] - tol, i+1, *fc);
+                        if (i+1 >= lastClkBit + clk[clkCnt] - tol){ //should be a clock bit
+                            peakcnt++;
+                            lastClkBit += clk[clkCnt];
+                        } else if (i < lastClkBit+8){
+                            //noise after a phase shift - ignore
+                        } else { //phase shift before supposed to based on clock
+                            errCnt++;
+                        }
+                    } else if (i+1 > lastClkBit + clk[clkCnt] + tol + *fc){
+                        lastClkBit+=clk[clkCnt]; //no phase shift but clock bit
+                    }
+                    waveStart = i+1;
+                }
+            }
+        }
+        if (errCnt == 0) return clk[clkCnt];
+        if (errCnt <= bestErr[clkCnt]) bestErr[clkCnt] = errCnt;
+        if (peakcnt > peaksdet[clkCnt]) peaksdet[clkCnt] = peakcnt;
+    }
+    //all tested with errors
+    //return the highest clk with the most peaks found
+    uint8_t best = 7;
+    for (i=7; i >= 1; i--){
+        if (peaksdet[i] > peaksdet[best])
+            best = i;
 
-		if (g_debugMode == 2) prnt("DEBUG PSK: Clk: %d, peaks: %d, errs: %d, bestClk: %d",clk[i],peaksdet[i],bestErr[i],clk[best]);
-	}
-	return clk[best];
+        if (g_debugMode == 2) prnt("DEBUG PSK: Clk: %d, peaks: %d, errs: %d, bestClk: %d",clk[i],peaksdet[i],bestErr[i],clk[best]);
+    }
+    return clk[best];
 }
 
 //by marshmellow
 //detects the bit clock for FSK given the high and low Field Clocks
 uint8_t detectFSKClk(uint8_t *bits, size_t size, uint8_t fcHigh, uint8_t fcLow, int *firstClockEdge) {
 
-	if (size == 0)
-		return 0;
+    if (size == 0)
+        return 0;
 
-	uint8_t clk[] = {8,16,32,40,50,64,100,128,0};
-	uint16_t rfLens[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
-	uint8_t rfCnts[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
-	uint8_t rfLensFnd = 0;
-	uint8_t lastFCcnt = 0;
-	uint16_t fcCounter = 0;
-	uint16_t rfCounter = 0;
-	uint8_t firstBitFnd = 0;
-	size_t i;
-	uint8_t fcTol = ((fcHigh * 100 - fcLow * 100)/2 + 50)/100; //(uint8_t)(0.5+(float)(fcHigh-fcLow)/2);
+    uint8_t clk[] = {8,16,32,40,50,64,100,128,0};
+    uint16_t rfLens[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+    uint8_t rfCnts[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+    uint8_t rfLensFnd = 0;
+    uint8_t lastFCcnt = 0;
+    uint16_t fcCounter = 0;
+    uint16_t rfCounter = 0;
+    uint8_t firstBitFnd = 0;
+    size_t i;
+    uint8_t fcTol = ((fcHigh * 100 - fcLow * 100)/2 + 50)/100; //(uint8_t)(0.5+(float)(fcHigh-fcLow)/2);
 
-	// prime i to first peak / up transition
-	for (i = 160; i < size-20; i++)
-		if (bits[i] > bits[i-1] && bits[i] >= bits[i+1])
-			break;
+    // prime i to first peak / up transition
+    for (i = 160; i < size-20; i++)
+        if (bits[i] > bits[i-1] && bits[i] >= bits[i+1])
+            break;
 
-	for (; i < size-20; i++){
-		fcCounter++;
-		rfCounter++;
+    for (; i < size-20; i++){
+        fcCounter++;
+        rfCounter++;
 
-		if (bits[i] <= bits[i-1] || bits[i] < bits[i+1])
-			continue;
-		// else new peak
-		// if we got less than the small fc + tolerance then set it to the small fc
-		// if it is inbetween set it to the last counter
-		if (fcCounter < fcHigh && fcCounter > fcLow)
-			fcCounter = lastFCcnt;
-		else if (fcCounter < fcLow+fcTol)
-			fcCounter = fcLow;
-		else //set it to the large fc
-			fcCounter = fcHigh;
+        if (bits[i] <= bits[i-1] || bits[i] < bits[i+1])
+            continue;
+        // else new peak
+        // if we got less than the small fc + tolerance then set it to the small fc
+        // if it is inbetween set it to the last counter
+        if (fcCounter < fcHigh && fcCounter > fcLow)
+            fcCounter = lastFCcnt;
+        else if (fcCounter < fcLow+fcTol)
+            fcCounter = fcLow;
+        else //set it to the large fc
+            fcCounter = fcHigh;
 
-		//look for bit clock  (rf/xx)
-		if ((fcCounter < lastFCcnt || fcCounter > lastFCcnt)){
-			//not the same size as the last wave - start of new bit sequence
-			if (firstBitFnd > 1){ //skip first wave change - probably not a complete bit
-				for (int ii=0; ii<15; ii++){
-					if (rfLens[ii] >= (rfCounter-4) && rfLens[ii] <= (rfCounter+4)){
-						rfCnts[ii]++;
-						rfCounter = 0;
-						break;
-					}
-				}
-				if (rfCounter > 0 && rfLensFnd < 15){
-					//prnt("DEBUG: rfCntr %d, fcCntr %d",rfCounter,fcCounter);
-					rfCnts[rfLensFnd]++;
-					rfLens[rfLensFnd++] = rfCounter;
-				}
-			} else {
-				*firstClockEdge = i;
-				firstBitFnd++;
-			}
-			rfCounter = 0;
-			lastFCcnt = fcCounter;
-		}
-		fcCounter = 0;
-	}
-	uint8_t rfHighest = 15, rfHighest2 = 15, rfHighest3 = 15;
+        //look for bit clock  (rf/xx)
+        if ((fcCounter < lastFCcnt || fcCounter > lastFCcnt)){
+            //not the same size as the last wave - start of new bit sequence
+            if (firstBitFnd > 1){ //skip first wave change - probably not a complete bit
+                for (int ii=0; ii<15; ii++){
+                    if (rfLens[ii] >= (rfCounter-4) && rfLens[ii] <= (rfCounter+4)){
+                        rfCnts[ii]++;
+                        rfCounter = 0;
+                        break;
+                    }
+                }
+                if (rfCounter > 0 && rfLensFnd < 15){
+                    //prnt("DEBUG: rfCntr %d, fcCntr %d",rfCounter,fcCounter);
+                    rfCnts[rfLensFnd]++;
+                    rfLens[rfLensFnd++] = rfCounter;
+                }
+            } else {
+                *firstClockEdge = i;
+                firstBitFnd++;
+            }
+            rfCounter = 0;
+            lastFCcnt = fcCounter;
+        }
+        fcCounter = 0;
+    }
+    uint8_t rfHighest = 15, rfHighest2 = 15, rfHighest3 = 15;
 
-	for (i=0; i<15; i++){
-		//get highest 2 RF values  (might need to get more values to compare or compare all?)
-		if (rfCnts[i] > rfCnts[rfHighest]){
-			rfHighest3 = rfHighest2;
-			rfHighest2 = rfHighest;
-			rfHighest = i;
-		} else if(rfCnts[i] > rfCnts[rfHighest2]){
-			rfHighest3 = rfHighest2;
-			rfHighest2 = i;
-		} else if(rfCnts[i] > rfCnts[rfHighest3]){
-			rfHighest3 = i;
-		}
-		if (g_debugMode == 2)
-			prnt("DEBUG FSK: RF %d, cnts %d", rfLens[i], rfCnts[i]);
-	}
-	// set allowed clock remainder tolerance to be 1 large field clock length+1
-	//   we could have mistakenly made a 9 a 10 instead of an 8 or visa versa so rfLens could be 1 FC off
-	uint8_t tol1 = fcHigh+1;
+    for (i=0; i<15; i++){
+        //get highest 2 RF values  (might need to get more values to compare or compare all?)
+        if (rfCnts[i] > rfCnts[rfHighest]){
+            rfHighest3 = rfHighest2;
+            rfHighest2 = rfHighest;
+            rfHighest = i;
+        } else if(rfCnts[i] > rfCnts[rfHighest2]){
+            rfHighest3 = rfHighest2;
+            rfHighest2 = i;
+        } else if(rfCnts[i] > rfCnts[rfHighest3]){
+            rfHighest3 = i;
+        }
+        if (g_debugMode == 2)
+            prnt("DEBUG FSK: RF %d, cnts %d", rfLens[i], rfCnts[i]);
+    }
+    // set allowed clock remainder tolerance to be 1 large field clock length+1
+    //   we could have mistakenly made a 9 a 10 instead of an 8 or visa versa so rfLens could be 1 FC off
+    uint8_t tol1 = fcHigh+1;
 
-	if (g_debugMode == 2)
-		prnt("DEBUG FSK: most counted rf values: 1 %d, 2 %d, 3 %d", rfLens[rfHighest], rfLens[rfHighest2], rfLens[rfHighest3]);
+    if (g_debugMode == 2)
+        prnt("DEBUG FSK: most counted rf values: 1 %d, 2 %d, 3 %d", rfLens[rfHighest], rfLens[rfHighest2], rfLens[rfHighest3]);
 
-	// loop to find the highest clock that has a remainder less than the tolerance
-	//   compare samples counted divided by
-	// test 128 down to 32 (shouldn't be possible to have fc/10 & fc/8 and rf/16 or less)
-	int m = 7;
-	for (; m >= 2; m--){
-		if (rfLens[rfHighest] % clk[m] < tol1 || rfLens[rfHighest] % clk[m] > clk[m]-tol1){
-			if (rfLens[rfHighest2] % clk[m] < tol1 || rfLens[rfHighest2] % clk[m] > clk[m]-tol1){
-				if (rfLens[rfHighest3] % clk[m] < tol1 || rfLens[rfHighest3] % clk[m] > clk[m]-tol1){
-					if (g_debugMode == 2)
-						prnt("DEBUG FSK: clk %d divides into the 3 most rf values within tolerance", clk[m]);
-					break;
-				}
-			}
-		}
-	}
+    // loop to find the highest clock that has a remainder less than the tolerance
+    //   compare samples counted divided by
+    // test 128 down to 32 (shouldn't be possible to have fc/10 & fc/8 and rf/16 or less)
+    int m = 7;
+    for (; m >= 2; m--){
+        if (rfLens[rfHighest] % clk[m] < tol1 || rfLens[rfHighest] % clk[m] > clk[m]-tol1){
+            if (rfLens[rfHighest2] % clk[m] < tol1 || rfLens[rfHighest2] % clk[m] > clk[m]-tol1){
+                if (rfLens[rfHighest3] % clk[m] < tol1 || rfLens[rfHighest3] % clk[m] > clk[m]-tol1){
+                    if (g_debugMode == 2)
+                        prnt("DEBUG FSK: clk %d divides into the 3 most rf values within tolerance", clk[m]);
+                    break;
+                }
+            }
+        }
+    }
 
-	if (m < 2) return 0; // oops we went too far
+    if (m < 2) return 0; // oops we went too far
 
-	return clk[m];
+    return clk[m];
 }
 
 
@@ -1124,145 +1124,145 @@ uint8_t detectFSKClk(uint8_t *bits, size_t size, uint8_t fcHigh, uint8_t fcLow,
 
 // look for Sequence Terminator - should be pulses of clk*(1 or 2), clk*2, clk*(1.5 or 2), by idx we mean graph position index...
 bool findST(int *stStopLoc, int *stStartIdx, int lowToLowWaveLen[], int highToLowWaveLen[], int clk, int tol, int buffSize, size_t *i) {
-	if (buffSize < *i+4) return false;
+    if (buffSize < *i+4) return false;
 
-	for (; *i < buffSize - 4; *i+=1) {
-		*stStartIdx += lowToLowWaveLen[*i]; //caution part of this wave may be data and part may be ST....  to be accounted for in main function for now...
-		if (lowToLowWaveLen[*i] >= clk*1-tol && lowToLowWaveLen[*i] <= (clk*2)+tol && highToLowWaveLen[*i] < clk+tol) {           //1 to 2 clocks depending on 2 bits prior
-			if (lowToLowWaveLen[*i+1] >= clk*2-tol && lowToLowWaveLen[*i+1] <= clk*2+tol && highToLowWaveLen[*i+1] > clk*3/2-tol) {       //2 clocks and wave size is 1 1/2
-				if (lowToLowWaveLen[*i+2] >= (clk*3)/2-tol && lowToLowWaveLen[*i+2] <= clk*2+tol && highToLowWaveLen[*i+2] > clk-tol) { //1 1/2 to 2 clocks and at least one full clock wave
-					if (lowToLowWaveLen[*i+3] >= clk*1-tol && lowToLowWaveLen[*i+3] <= clk*2+tol) { //1 to 2 clocks for end of ST + first bit
-						*stStopLoc = *i + 3;
-						return true;
-					}
-				}
-			}
-		}
-	}
-	return false;
+    for (; *i < buffSize - 4; *i+=1) {
+        *stStartIdx += lowToLowWaveLen[*i]; //caution part of this wave may be data and part may be ST....  to be accounted for in main function for now...
+        if (lowToLowWaveLen[*i] >= clk*1-tol && lowToLowWaveLen[*i] <= (clk*2)+tol && highToLowWaveLen[*i] < clk+tol) {           //1 to 2 clocks depending on 2 bits prior
+            if (lowToLowWaveLen[*i+1] >= clk*2-tol && lowToLowWaveLen[*i+1] <= clk*2+tol && highToLowWaveLen[*i+1] > clk*3/2-tol) {       //2 clocks and wave size is 1 1/2
+                if (lowToLowWaveLen[*i+2] >= (clk*3)/2-tol && lowToLowWaveLen[*i+2] <= clk*2+tol && highToLowWaveLen[*i+2] > clk-tol) { //1 1/2 to 2 clocks and at least one full clock wave
+                    if (lowToLowWaveLen[*i+3] >= clk*1-tol && lowToLowWaveLen[*i+3] <= clk*2+tol) { //1 to 2 clocks for end of ST + first bit
+                        *stStopLoc = *i + 3;
+                        return true;
+                    }
+                }
+            }
+        }
+    }
+    return false;
 }
 //by marshmellow
 //attempt to identify a Sequence Terminator in ASK modulated raw wave
 bool DetectST(uint8_t *buffer, size_t *size, int *foundclock, size_t *ststart, size_t *stend) {
-	size_t bufsize = *size;
-	//need to loop through all samples and identify our clock, look for the ST pattern
-	int clk = 0;
-	int tol = 0;
-	int j=0, high, low, skip=0, start=0, end=0, minClk=255;
-	size_t i = 0;
-	//probably should malloc... || test if memory is available ... handle device side? memory danger!!! [marshmellow]
-	int tmpbuff[bufsize / LOWEST_DEFAULT_CLOCK]; // low to low wave count //guess rf/32 clock, if click is smaller we will only have room for a fraction of the samples captured
-	int waveLen[bufsize / LOWEST_DEFAULT_CLOCK]; // high to low wave count //if clock is larger then we waste memory in array size that is not needed...
-	//size_t testsize = (bufsize < 512) ? bufsize : 512;
-	int phaseoff = 0;
-	high = low = 128;
-	memset(tmpbuff, 0, sizeof(tmpbuff));
-	memset(waveLen, 0, sizeof(waveLen));
+    size_t bufsize = *size;
+    //need to loop through all samples and identify our clock, look for the ST pattern
+    int clk = 0;
+    int tol = 0;
+    int j=0, high, low, skip=0, start=0, end=0, minClk=255;
+    size_t i = 0;
+    //probably should malloc... || test if memory is available ... handle device side? memory danger!!! [marshmellow]
+    int tmpbuff[bufsize / LOWEST_DEFAULT_CLOCK]; // low to low wave count //guess rf/32 clock, if click is smaller we will only have room for a fraction of the samples captured
+    int waveLen[bufsize / LOWEST_DEFAULT_CLOCK]; // high to low wave count //if clock is larger then we waste memory in array size that is not needed...
+    //size_t testsize = (bufsize < 512) ? bufsize : 512;
+    int phaseoff = 0;
+    high = low = 128;
+    memset(tmpbuff, 0, sizeof(tmpbuff));
+    memset(waveLen, 0, sizeof(waveLen));
 
-	if (!loadWaveCounters(buffer, bufsize, tmpbuff, waveLen, &j, &skip, &minClk, &high, &low)) return false;
-	// set clock  - might be able to get this externally and remove this work...
-	clk = getClosestClock(minClk);
-		// clock not found - ERROR
-		if (!clk) {
-			if (g_debugMode == 2) prnt("DEBUG STT: clock not found - quitting");
-			return false;
-		}
-	*foundclock = clk;
+    if (!loadWaveCounters(buffer, bufsize, tmpbuff, waveLen, &j, &skip, &minClk, &high, &low)) return false;
+    // set clock  - might be able to get this externally and remove this work...
+    clk = getClosestClock(minClk);
+        // clock not found - ERROR
+        if (!clk) {
+            if (g_debugMode == 2) prnt("DEBUG STT: clock not found - quitting");
+            return false;
+        }
+    *foundclock = clk;
 
-	tol = clk/8;
-	if (!findST(&start, &skip, tmpbuff, waveLen, clk, tol, j, &i)) {
-	// first ST not found - ERROR
-		if (g_debugMode == 2) prnt("DEBUG STT: first STT not found - quitting");
-		return false;
-	} else {
-		if (g_debugMode == 2) prnt("DEBUG STT: first STT found at wave: %i, skip: %i, j=%i", start, skip, j);
-	}
-	if (waveLen[i+2] > clk*1+tol)
-		phaseoff = 0;
-	else
-		phaseoff = clk/2;
+    tol = clk/8;
+    if (!findST(&start, &skip, tmpbuff, waveLen, clk, tol, j, &i)) {
+    // first ST not found - ERROR
+        if (g_debugMode == 2) prnt("DEBUG STT: first STT not found - quitting");
+        return false;
+    } else {
+        if (g_debugMode == 2) prnt("DEBUG STT: first STT found at wave: %i, skip: %i, j=%i", start, skip, j);
+    }
+    if (waveLen[i+2] > clk*1+tol)
+        phaseoff = 0;
+    else
+        phaseoff = clk/2;
 
-	// skip over the remainder of ST
-	skip += clk*7/2; //3.5 clocks from tmpbuff[i] = end of st - also aligns for ending point
+    // skip over the remainder of ST
+    skip += clk*7/2; //3.5 clocks from tmpbuff[i] = end of st - also aligns for ending point
 
-	// now do it again to find the end
-	int dummy1 = 0;
-	end = skip;
-	i += 3;
-	if (!findST(&dummy1, &end, tmpbuff, waveLen, clk, tol, j, &i)) {
-	//didn't find second ST - ERROR
-		if (g_debugMode == 2) prnt("DEBUG STT: second STT not found - quitting");
-		return false;
-	}
-	end -= phaseoff;
-	if (g_debugMode == 2) prnt("DEBUG STT: start of data: %d end of data: %d, datalen: %d, clk: %d, bits: %d, phaseoff: %d", skip, end, end-skip, clk, (end-skip)/clk, phaseoff);
-	//now begin to trim out ST so we can use normal demod cmds
-	start = skip;
-	size_t datalen = end - start;
-	// check validity of datalen (should be even clock increments)  - use a tolerance of up to 1/8th a clock
-	if ( clk - (datalen % clk) <= clk/8) {
-		// padd the amount off - could be problematic...  but shouldn't happen often
-		datalen += clk - (datalen % clk);
-	} else if ( (datalen % clk) <= clk/8 ) {
-		// padd the amount off - could be problematic...  but shouldn't happen often
-		datalen -= datalen % clk;
-	} else {
-		if (g_debugMode == 2) prnt("DEBUG STT: datalen not divisible by clk: %u %% %d = %d - quitting", datalen, clk, datalen % clk);
-		return false;
-	}
-	// if datalen is less than one t55xx block - ERROR
-	if (datalen/clk < 8*4) {
-		if (g_debugMode == 2) prnt("DEBUG STT: datalen is less than 1 full t55xx block - quitting");
-		return false;
-	}
-	size_t dataloc = start;
-	if (buffer[dataloc-(clk*4)-(clk/4)] <= low && buffer[dataloc] <= low && buffer[dataloc-(clk*4)] >= high) {
-		//we have low drift (and a low just before the ST and a low just after the ST) - compensate by backing up the start
-		for ( i=0; i <= (clk/4); ++i ) {
-			if ( buffer[dataloc - (clk*4) - i] <= low ) {
-				dataloc -= i;
-				break;
-			}
-		}
-	}
+    // now do it again to find the end
+    int dummy1 = 0;
+    end = skip;
+    i += 3;
+    if (!findST(&dummy1, &end, tmpbuff, waveLen, clk, tol, j, &i)) {
+    //didn't find second ST - ERROR
+        if (g_debugMode == 2) prnt("DEBUG STT: second STT not found - quitting");
+        return false;
+    }
+    end -= phaseoff;
+    if (g_debugMode == 2) prnt("DEBUG STT: start of data: %d end of data: %d, datalen: %d, clk: %d, bits: %d, phaseoff: %d", skip, end, end-skip, clk, (end-skip)/clk, phaseoff);
+    //now begin to trim out ST so we can use normal demod cmds
+    start = skip;
+    size_t datalen = end - start;
+    // check validity of datalen (should be even clock increments)  - use a tolerance of up to 1/8th a clock
+    if ( clk - (datalen % clk) <= clk/8) {
+        // padd the amount off - could be problematic...  but shouldn't happen often
+        datalen += clk - (datalen % clk);
+    } else if ( (datalen % clk) <= clk/8 ) {
+        // padd the amount off - could be problematic...  but shouldn't happen often
+        datalen -= datalen % clk;
+    } else {
+        if (g_debugMode == 2) prnt("DEBUG STT: datalen not divisible by clk: %u %% %d = %d - quitting", datalen, clk, datalen % clk);
+        return false;
+    }
+    // if datalen is less than one t55xx block - ERROR
+    if (datalen/clk < 8*4) {
+        if (g_debugMode == 2) prnt("DEBUG STT: datalen is less than 1 full t55xx block - quitting");
+        return false;
+    }
+    size_t dataloc = start;
+    if (buffer[dataloc-(clk*4)-(clk/4)] <= low && buffer[dataloc] <= low && buffer[dataloc-(clk*4)] >= high) {
+        //we have low drift (and a low just before the ST and a low just after the ST) - compensate by backing up the start
+        for ( i=0; i <= (clk/4); ++i ) {
+            if ( buffer[dataloc - (clk*4) - i] <= low ) {
+                dataloc -= i;
+                break;
+            }
+        }
+    }
 
-	size_t newloc = 0;
-	i=0;
-	if (g_debugMode == 2) prnt("DEBUG STT: Starting STT trim - start: %d, datalen: %d ",dataloc, datalen);
-	bool firstrun = true;
-	// warning - overwriting buffer given with raw wave data with ST removed...
-	while ( dataloc < bufsize-(clk/2) ) {
-		//compensate for long high at end of ST not being high due to signal loss... (and we cut out the start of wave high part)
-		if (buffer[dataloc]<high && buffer[dataloc]>low && buffer[dataloc+clk/4]<high && buffer[dataloc+clk/4]>low) {
-			for(i=0; i < clk/2-tol; ++i) {
-				buffer[dataloc+i] = high+5;
-			}
-		} //test for small spike outlier (high between two lows) in the case of very strong waves
-		if (buffer[dataloc] > low && buffer[dataloc+clk/4] <= low) {
-			for(i=0; i < clk/4; ++i) {
-				buffer[dataloc+i] = buffer[dataloc+clk/4];
-			}
-		}
-		if (firstrun) {
-			*stend = dataloc;
-			*ststart = dataloc-(clk*4);
-			firstrun=false;
-		}
-		for (i=0; i<datalen; ++i) {
-			if (i+newloc < bufsize) {
-				if (i+newloc < dataloc)
-					buffer[i+newloc] = buffer[dataloc];
+    size_t newloc = 0;
+    i=0;
+    if (g_debugMode == 2) prnt("DEBUG STT: Starting STT trim - start: %d, datalen: %d ",dataloc, datalen);
+    bool firstrun = true;
+    // warning - overwriting buffer given with raw wave data with ST removed...
+    while ( dataloc < bufsize-(clk/2) ) {
+        //compensate for long high at end of ST not being high due to signal loss... (and we cut out the start of wave high part)
+        if (buffer[dataloc]<high && buffer[dataloc]>low && buffer[dataloc+clk/4]<high && buffer[dataloc+clk/4]>low) {
+            for(i=0; i < clk/2-tol; ++i) {
+                buffer[dataloc+i] = high+5;
+            }
+        } //test for small spike outlier (high between two lows) in the case of very strong waves
+        if (buffer[dataloc] > low && buffer[dataloc+clk/4] <= low) {
+            for(i=0; i < clk/4; ++i) {
+                buffer[dataloc+i] = buffer[dataloc+clk/4];
+            }
+        }
+        if (firstrun) {
+            *stend = dataloc;
+            *ststart = dataloc-(clk*4);
+            firstrun=false;
+        }
+        for (i=0; i<datalen; ++i) {
+            if (i+newloc < bufsize) {
+                if (i+newloc < dataloc)
+                    buffer[i+newloc] = buffer[dataloc];
 
-				dataloc++;
-			}
-		}
-		newloc += i;
-		//skip next ST  -  we just assume it will be there from now on...
-		if (g_debugMode == 2) prnt("DEBUG STT: skipping STT at %d to %d", dataloc, dataloc+(clk*4));
-		dataloc += clk*4;
-	}
-	*size = newloc;
-	return true;
+                dataloc++;
+            }
+        }
+        newloc += i;
+        //skip next ST  -  we just assume it will be there from now on...
+        if (g_debugMode == 2) prnt("DEBUG STT: skipping STT at %d to %d", dataloc, dataloc+(clk*4));
+        dataloc += clk*4;
+    }
+    *size = newloc;
+    return true;
 }
 
 //by marshmellow
@@ -1271,37 +1271,37 @@ bool DetectST(uint8_t *buffer, size_t *size, int *foundclock, size_t *ststart, s
 //decodes miller encoded binary
 //NOTE  askrawdemod will NOT demod miller encoded ask unless the clock is manually set to 1/2 what it is detected as!
 int millerRawDecode(uint8_t *bits, size_t *size, int invert) {
-	if (*size < 16) return -1;
+    if (*size < 16) return -1;
 
-	uint16_t MaxBits = 512, errCnt = 0;
-	size_t i, bitCnt = 0;
-	uint8_t alignCnt = 0, curBit = bits[0], alignedIdx = 0, halfClkErr = 0;
+    uint16_t MaxBits = 512, errCnt = 0;
+    size_t i, bitCnt = 0;
+    uint8_t alignCnt = 0, curBit = bits[0], alignedIdx = 0, halfClkErr = 0;
 
-	//find alignment, needs 4 1s or 0s to properly align
-	for (i=1; i < *size-1; i++) {
-		alignCnt = (bits[i] == curBit) ? alignCnt+1 : 0;
-		curBit = bits[i];
-		if (alignCnt == 4) break;
-	}
-	// for now error if alignment not found.  later add option to run it with multiple offsets...
-	if (alignCnt != 4) {
-		if (g_debugMode) prnt("ERROR MillerDecode: alignment not found so either your bits is not miller or your data does not have a 101 in it");
-		return -1;
-	}
-	alignedIdx = (i-1) % 2;
-	for (i = alignedIdx; i < *size-3; i += 2) {
-		halfClkErr = (uint8_t)((halfClkErr << 1 | bits[i]) & 0xFF);
-		if ( (halfClkErr & 0x7) == 5 || (halfClkErr & 0x7) == 2 || (i > 2 && (halfClkErr & 0x7) == 0) || (halfClkErr & 0x1F) == 0x1F) {
-			errCnt++;
-			bits[bitCnt++] = 7;
-			continue;
-		}
-		bits[bitCnt++] = bits[i] ^ bits[i+1] ^ invert;
+    //find alignment, needs 4 1s or 0s to properly align
+    for (i=1; i < *size-1; i++) {
+        alignCnt = (bits[i] == curBit) ? alignCnt+1 : 0;
+        curBit = bits[i];
+        if (alignCnt == 4) break;
+    }
+    // for now error if alignment not found.  later add option to run it with multiple offsets...
+    if (alignCnt != 4) {
+        if (g_debugMode) prnt("ERROR MillerDecode: alignment not found so either your bits is not miller or your data does not have a 101 in it");
+        return -1;
+    }
+    alignedIdx = (i-1) % 2;
+    for (i = alignedIdx; i < *size-3; i += 2) {
+        halfClkErr = (uint8_t)((halfClkErr << 1 | bits[i]) & 0xFF);
+        if ( (halfClkErr & 0x7) == 5 || (halfClkErr & 0x7) == 2 || (i > 2 && (halfClkErr & 0x7) == 0) || (halfClkErr & 0x1F) == 0x1F) {
+            errCnt++;
+            bits[bitCnt++] = 7;
+            continue;
+        }
+        bits[bitCnt++] = bits[i] ^ bits[i+1] ^ invert;
 
-		if (bitCnt > MaxBits) break;
-	}
-	*size = bitCnt;
-	return errCnt;
+        if (bitCnt > MaxBits) break;
+    }
+    *size = bitCnt;
+    return errCnt;
 }
 
 //by marshmellow
@@ -1309,40 +1309,40 @@ int millerRawDecode(uint8_t *bits, size_t *size, int invert) {
 //check for phase errors - should never have 111 or 000 should be 01001011 or 10110100 for 1010
 //decodes biphase or if inverted it is AKA conditional dephase encoding AKA differential manchester encoding
 int BiphaseRawDecode(uint8_t *bits, size_t *size, int *offset, int invert) {
-	//sanity check
-	if (*size < 51) return -1;
+    //sanity check
+    if (*size < 51) return -1;
 
-	uint16_t bitnum = 0;
-	uint16_t errCnt = 0;
-	size_t i = *offset;
-	uint16_t maxbits = 512;
+    uint16_t bitnum = 0;
+    uint16_t errCnt = 0;
+    size_t i = *offset;
+    uint16_t maxbits = 512;
 
-	//check for phase change faults - skip one sample if faulty
-	bool offsetA = true, offsetB = true;
-	for (; i < *offset+48; i += 2){
-		if (bits[i+1] == bits[i+2]) offsetA = false;
-		if (bits[i+2] == bits[i+3]) offsetB = false;
-	}
-	if (!offsetA && offsetB) ++*offset;
+    //check for phase change faults - skip one sample if faulty
+    bool offsetA = true, offsetB = true;
+    for (; i < *offset+48; i += 2){
+        if (bits[i+1] == bits[i+2]) offsetA = false;
+        if (bits[i+2] == bits[i+3]) offsetB = false;
+    }
+    if (!offsetA && offsetB) ++*offset;
 
-	for (i = *offset; i < *size-3; i += 2){
-		//check for phase error
-		if (bits[i+1] == bits[i+2]) {
-			bits[bitnum++] = 7;
-			errCnt++;
-		}
-		if((bits[i]==1 && bits[i+1]==0) || (bits[i]==0 && bits[i+1]==1)){
-			bits[bitnum++] = 1 ^ invert;
-		} else if((bits[i]==0 && bits[i+1]==0) || (bits[i]==1 && bits[i+1]==1)){
-			bits[bitnum++] = invert;
-		} else {
-			bits[bitnum++] = 7;
-			errCnt++;
-		}
-		if (bitnum > maxbits) break;
-	}
-	*size = bitnum;
-	return errCnt;
+    for (i = *offset; i < *size-3; i += 2){
+        //check for phase error
+        if (bits[i+1] == bits[i+2]) {
+            bits[bitnum++] = 7;
+            errCnt++;
+        }
+        if((bits[i]==1 && bits[i+1]==0) || (bits[i]==0 && bits[i+1]==1)){
+            bits[bitnum++] = 1 ^ invert;
+        } else if((bits[i]==0 && bits[i+1]==0) || (bits[i]==1 && bits[i+1]==1)){
+            bits[bitnum++] = invert;
+        } else {
+            bits[bitnum++] = 7;
+            errCnt++;
+        }
+        if (bitnum > maxbits) break;
+    }
+    *size = bitnum;
+    return errCnt;
 }
 
 //by marshmellow
@@ -1350,433 +1350,433 @@ int BiphaseRawDecode(uint8_t *bits, size_t *size, int *offset, int invert) {
 //run through 2 times and take least errCnt
 int manrawdecode(uint8_t *bits, size_t *size, uint8_t invert, uint8_t *alignPos){
 
-	// sanity check
-	if (*size < 16) return -1;
+    // sanity check
+    if (*size < 16) return -1;
 
-	int errCnt = 0, bestErr = 1000;
-	uint16_t bitnum = 0, maxBits = 512, bestRun = 0;
-	size_t i, k;
+    int errCnt = 0, bestErr = 1000;
+    uint16_t bitnum = 0, maxBits = 512, bestRun = 0;
+    size_t i, k;
 
-	//find correct start position [alignment]
-	for (k = 0; k < 2; ++k){
-		for (i = k; i < *size-3; i += 2) {
-			if (bits[i] == bits[i+1])
-				errCnt++;
-		}
-		if (bestErr > errCnt){
-			bestErr = errCnt;
-			bestRun = k;
-		}
-		errCnt = 0;
-	}
-	*alignPos = bestRun;
-	//decode
-	for (i = bestRun; i < *size-3; i += 2){
-		if (bits[i] == 1 && (bits[i+1] == 0)){
-			bits[bitnum++] = invert;
-		} else if ((bits[i] == 0) && bits[i+1] == 1){
-			bits[bitnum++] = invert^1;
-		} else {
-			bits[bitnum++] = 7;
-		}
-		if (bitnum > maxBits) break;
-	}
-	*size = bitnum;
-	return bestErr;
+    //find correct start position [alignment]
+    for (k = 0; k < 2; ++k){
+        for (i = k; i < *size-3; i += 2) {
+            if (bits[i] == bits[i+1])
+                errCnt++;
+        }
+        if (bestErr > errCnt){
+            bestErr = errCnt;
+            bestRun = k;
+        }
+        errCnt = 0;
+    }
+    *alignPos = bestRun;
+    //decode
+    for (i = bestRun; i < *size-3; i += 2){
+        if (bits[i] == 1 && (bits[i+1] == 0)){
+            bits[bitnum++] = invert;
+        } else if ((bits[i] == 0) && bits[i+1] == 1){
+            bits[bitnum++] = invert^1;
+        } else {
+            bits[bitnum++] = 7;
+        }
+        if (bitnum > maxBits) break;
+    }
+    *size = bitnum;
+    return bestErr;
 }
 
 //by marshmellow
 //demodulates strong heavily clipped samples
 //RETURN: num of errors.  if 0, is ok.
 int cleanAskRawDemod(uint8_t *bits, size_t *size, int clk, int invert, int high, int low, int *startIdx) {
-	*startIdx = 0;
-	size_t bitCnt = 0, smplCnt = 1, errCnt = 0, pos = 0;
-	uint8_t cl_4 = clk / 4;
-	uint8_t cl_2 = clk / 2;
-	bool waveHigh = true;
+    *startIdx = 0;
+    size_t bitCnt = 0, smplCnt = 1, errCnt = 0, pos = 0;
+    uint8_t cl_4 = clk / 4;
+    uint8_t cl_2 = clk / 2;
+    bool waveHigh = true;
 
-	getNextHigh(bits, *size, high, &pos);
+    getNextHigh(bits, *size, high, &pos);
 
-	// sample counts,   like clock = 32.. it tries to find  32/4 = 8,  32/2 = 16
-	for (size_t i = pos; i < *size; i++){
-		if (bits[i] >= high && waveHigh){
-			smplCnt++;
-		} else if (bits[i] <= low && !waveHigh){
-			smplCnt++;
-		} else { //transition
-			if ((bits[i] >= high && !waveHigh) || (bits[i] <= low && waveHigh)){
+    // sample counts,   like clock = 32.. it tries to find  32/4 = 8,  32/2 = 16
+    for (size_t i = pos; i < *size; i++){
+        if (bits[i] >= high && waveHigh){
+            smplCnt++;
+        } else if (bits[i] <= low && !waveHigh){
+            smplCnt++;
+        } else { //transition
+            if ((bits[i] >= high && !waveHigh) || (bits[i] <= low && waveHigh)){
 
-				// 32-8-1 = 23
-				// 32+8+1 = 41
-				if (smplCnt > clk - cl_4 - 1) { //full clock
+                // 32-8-1 = 23
+                // 32+8+1 = 41
+                if (smplCnt > clk - cl_4 - 1) { //full clock
 
-					if (smplCnt > clk + cl_4 + 1) { //too many samples
-						errCnt++;
-						if (g_debugMode == 2) prnt("DEBUG ASK: cleanAskRawDemod ASK Modulation Error FULL at: %u  [%u]", i, smplCnt);
-						bits[bitCnt++] = 7;
-					} else if (waveHigh) {
-						bits[bitCnt++] = invert;
-						bits[bitCnt++] = invert;
-					} else if (!waveHigh) {
-						bits[bitCnt++] = invert ^ 1;
-						bits[bitCnt++] = invert ^ 1;
-					}
-					if (*startIdx == 0)
-						*startIdx = i - clk;
-					waveHigh = !waveHigh;
-					smplCnt = 0;
+                    if (smplCnt > clk + cl_4 + 1) { //too many samples
+                        errCnt++;
+                        if (g_debugMode == 2) prnt("DEBUG ASK: cleanAskRawDemod ASK Modulation Error FULL at: %u  [%u]", i, smplCnt);
+                        bits[bitCnt++] = 7;
+                    } else if (waveHigh) {
+                        bits[bitCnt++] = invert;
+                        bits[bitCnt++] = invert;
+                    } else if (!waveHigh) {
+                        bits[bitCnt++] = invert ^ 1;
+                        bits[bitCnt++] = invert ^ 1;
+                    }
+                    if (*startIdx == 0)
+                        *startIdx = i - clk;
+                    waveHigh = !waveHigh;
+                    smplCnt = 0;
 
-				// 16-8-1 = 7
-				} else if (smplCnt > cl_2 - cl_4 - 1) { //half clock
+                // 16-8-1 = 7
+                } else if (smplCnt > cl_2 - cl_4 - 1) { //half clock
 
-					if (smplCnt > cl_2 + cl_4 + 1) { //too many samples
-						errCnt++;
-						if (g_debugMode == 2) prnt("DEBUG ASK: cleanAskRawDemod ASK Modulation Error HALF at: %u  [%u]", i, smplCnt);
-						bits[bitCnt++] = 7;
-					}
+                    if (smplCnt > cl_2 + cl_4 + 1) { //too many samples
+                        errCnt++;
+                        if (g_debugMode == 2) prnt("DEBUG ASK: cleanAskRawDemod ASK Modulation Error HALF at: %u  [%u]", i, smplCnt);
+                        bits[bitCnt++] = 7;
+                    }
 
-					if (waveHigh) {
-						bits[bitCnt++] = invert;
-					} else if (!waveHigh) {
-						bits[bitCnt++] = invert ^ 1;
-					}
-					if (*startIdx == 0)
-						*startIdx = i - cl_2;
-					waveHigh = !waveHigh;
-					smplCnt = 0;
-				} else {
-					smplCnt++;
-					//transition bit oops
-				}
-			} else { //haven't hit new high or new low yet
-				smplCnt++;
-			}
-		}
-	}
-	*size = bitCnt;
-	return errCnt;
+                    if (waveHigh) {
+                        bits[bitCnt++] = invert;
+                    } else if (!waveHigh) {
+                        bits[bitCnt++] = invert ^ 1;
+                    }
+                    if (*startIdx == 0)
+                        *startIdx = i - cl_2;
+                    waveHigh = !waveHigh;
+                    smplCnt = 0;
+                } else {
+                    smplCnt++;
+                    //transition bit oops
+                }
+            } else { //haven't hit new high or new low yet
+                smplCnt++;
+            }
+        }
+    }
+    *size = bitCnt;
+    return errCnt;
 }
 
 //by marshmellow
 //attempts to demodulate ask modulations, askType == 0 for ask/raw, askType==1 for ask/manchester
 int askdemod_ext(uint8_t *bits, size_t *size, int *clk, int *invert, int maxErr, uint8_t amp, uint8_t askType, int *startIdx) {
 
-	if (*size == 0) return -1;
+    if (*size == 0) return -1;
 
-	int start = DetectASKClock(bits, *size, clk, maxErr);
-	if (*clk == 0 || start < 0) return -3;
+    int start = DetectASKClock(bits, *size, clk, maxErr);
+    if (*clk == 0 || start < 0) return -3;
 
-	if (*invert != 1) *invert = 0;
+    if (*invert != 1) *invert = 0;
 
-	// amplify signal data.
-	// ICEMAN todo,
-	if (amp == 1) askAmp(bits, *size);
+    // amplify signal data.
+    // ICEMAN todo,
+    if (amp == 1) askAmp(bits, *size);
 
-	if (g_debugMode == 2) prnt("DEBUG ASK: clk %d, beststart %d, amp %d", *clk, start, amp);
+    if (g_debugMode == 2) prnt("DEBUG ASK: clk %d, beststart %d, amp %d", *clk, start, amp);
 
-	//start pos from detect ask clock is 1/2 clock offset
-	// NOTE: can be negative (demod assumes rest of wave was there)
-	*startIdx = start - (*clk/2);
-	uint16_t initLoopMax = 1024;
-	if (initLoopMax > *size) initLoopMax = *size;
+    //start pos from detect ask clock is 1/2 clock offset
+    // NOTE: can be negative (demod assumes rest of wave was there)
+    *startIdx = start - (*clk/2);
+    uint16_t initLoopMax = 1024;
+    if (initLoopMax > *size) initLoopMax = *size;
 
-	// just noise - no super good detection. good enough
-	if (signalprop.isnoise) {
-		if (g_debugMode == 2) prnt("DEBUG askdemod_ext: just noise detected - aborting");
-		return -2;
-	}
+    // just noise - no super good detection. good enough
+    if (signalprop.isnoise) {
+        if (g_debugMode == 2) prnt("DEBUG askdemod_ext: just noise detected - aborting");
+        return -2;
+    }
 
-	// Detect high and lows
-	//25% clip in case highs and lows aren't clipped [marshmellow]
-	int high, low;
-	//getHiLo(bits, initLoopMax, &high, &low, 75, 75);
-	getHiLo(&high, &low, 75, 75);
+    // Detect high and lows
+    //25% clip in case highs and lows aren't clipped [marshmellow]
+    int high, low;
+    //getHiLo(bits, initLoopMax, &high, &low, 75, 75);
+    getHiLo(&high, &low, 75, 75);
 
-	size_t errCnt = 0;
-	// if clean clipped waves detected run alternate demod
-	if (DetectCleanAskWave(bits, *size, high, low)) {
+    size_t errCnt = 0;
+    // if clean clipped waves detected run alternate demod
+    if (DetectCleanAskWave(bits, *size, high, low)) {
 
-		if (g_debugMode == 2) prnt("DEBUG ASK: Clean Wave Detected - using clean wave demod");
+        if (g_debugMode == 2) prnt("DEBUG ASK: Clean Wave Detected - using clean wave demod");
 
-		errCnt = cleanAskRawDemod(bits, size, *clk, *invert, high, low, startIdx);
+        errCnt = cleanAskRawDemod(bits, size, *clk, *invert, high, low, startIdx);
 
-		if (askType) { //ask/manchester
-			uint8_t alignPos = 0;
-			errCnt = manrawdecode(bits, size, 0, &alignPos);
-			*startIdx += *clk/2 * alignPos;
+        if (askType) { //ask/manchester
+            uint8_t alignPos = 0;
+            errCnt = manrawdecode(bits, size, 0, &alignPos);
+            *startIdx += *clk/2 * alignPos;
 
-			if (g_debugMode)
-				prnt("DEBUG: (askdemod_ext) CLEAN: startIdx %i, alignPos %u", *startIdx, alignPos);
-		}
-		return errCnt;
-	}
+            if (g_debugMode)
+                prnt("DEBUG: (askdemod_ext) CLEAN: startIdx %i, alignPos %u", *startIdx, alignPos);
+        }
+        return errCnt;
+    }
 
-	if (g_debugMode) prnt("DEBUG: (askdemod_ext) Weak wave detected: startIdx %i", *startIdx);
+    if (g_debugMode) prnt("DEBUG: (askdemod_ext) Weak wave detected: startIdx %i", *startIdx);
 
-	int lastBit;  //set first clock check - can go negative
-	size_t i, bitnum = 0;     //output counter
-	uint8_t midBit = 0;
-	uint8_t tol = 0;  //clock tolerance adjust - waves will be accepted as within the clock if they fall + or - this value + clock from last valid wave
-	if (*clk <= 32) tol = 1;    //clock tolerance may not be needed anymore currently set to + or - 1 but could be increased for poor waves or removed entirely
-	size_t MaxBits = 3072;    //max bits to collect
-	lastBit = start - *clk;
+    int lastBit;  //set first clock check - can go negative
+    size_t i, bitnum = 0;     //output counter
+    uint8_t midBit = 0;
+    uint8_t tol = 0;  //clock tolerance adjust - waves will be accepted as within the clock if they fall + or - this value + clock from last valid wave
+    if (*clk <= 32) tol = 1;    //clock tolerance may not be needed anymore currently set to + or - 1 but could be increased for poor waves or removed entirely
+    size_t MaxBits = 3072;    //max bits to collect
+    lastBit = start - *clk;
 
-	for (i = start; i < *size; ++i) {
-		if (i - lastBit >= *clk - tol){
-			if (bits[i] >= high) {
-				bits[bitnum++] = *invert;
-			} else if (bits[i] <= low) {
-				bits[bitnum++] = *invert ^ 1;
-			} else if (i-lastBit >= *clk + tol) {
-				if (bitnum > 0) {
-					if (g_debugMode == 2) prnt("DEBUG: (askdemod_ext) Modulation Error at: %u", i);
-					bits[bitnum++] = 7;
-					errCnt++;
-				}
-			} else { //in tolerance - looking for peak
-				continue;
-			}
-			midBit = 0;
-			lastBit += *clk;
-		} else if (i-lastBit >= (*clk/2 - tol) && !midBit && !askType){
-			if (bits[i] >= high) {
-				bits[bitnum++] = *invert;
-			} else if (bits[i] <= low) {
-				bits[bitnum++] = *invert ^ 1;
-			} else if (i-lastBit >= *clk/2 + tol) {
-				bits[bitnum] = bits[bitnum-1];
-				bitnum++;
-			} else { //in tolerance - looking for peak
-				continue;
-			}
-			midBit = 1;
-		}
-		if (bitnum >= MaxBits) break;
-	}
-	*size = bitnum;
-	return errCnt;
+    for (i = start; i < *size; ++i) {
+        if (i - lastBit >= *clk - tol){
+            if (bits[i] >= high) {
+                bits[bitnum++] = *invert;
+            } else if (bits[i] <= low) {
+                bits[bitnum++] = *invert ^ 1;
+            } else if (i-lastBit >= *clk + tol) {
+                if (bitnum > 0) {
+                    if (g_debugMode == 2) prnt("DEBUG: (askdemod_ext) Modulation Error at: %u", i);
+                    bits[bitnum++] = 7;
+                    errCnt++;
+                }
+            } else { //in tolerance - looking for peak
+                continue;
+            }
+            midBit = 0;
+            lastBit += *clk;
+        } else if (i-lastBit >= (*clk/2 - tol) && !midBit && !askType){
+            if (bits[i] >= high) {
+                bits[bitnum++] = *invert;
+            } else if (bits[i] <= low) {
+                bits[bitnum++] = *invert ^ 1;
+            } else if (i-lastBit >= *clk/2 + tol) {
+                bits[bitnum] = bits[bitnum-1];
+                bitnum++;
+            } else { //in tolerance - looking for peak
+                continue;
+            }
+            midBit = 1;
+        }
+        if (bitnum >= MaxBits) break;
+    }
+    *size = bitnum;
+    return errCnt;
 }
 
 int askdemod(uint8_t *bits, size_t *size, int *clk, int *invert, int maxErr, uint8_t amp, uint8_t askType) {
-	int start = 0;
-	return askdemod_ext(bits, size, clk, invert, maxErr, amp, askType, &start);
+    int start = 0;
+    return askdemod_ext(bits, size, clk, invert, maxErr, amp, askType, &start);
 }
 
 // by marshmellow - demodulate NRZ wave - requires a read with strong signal
 // peaks invert bit (high=1 low=0) each clock cycle = 1 bit determined by last peak
 int nrzRawDemod(uint8_t *dest, size_t *size, int *clk, int *invert, int *startIdx) {
-	if (signalprop.isnoise) return -1;
+    if (signalprop.isnoise) return -1;
 
-	size_t clkStartIdx = 0;
-	*clk = DetectNRZClock(dest, *size, *clk, &clkStartIdx);
-	if (*clk == 0) return -2;
+    size_t clkStartIdx = 0;
+    *clk = DetectNRZClock(dest, *size, *clk, &clkStartIdx);
+    if (*clk == 0) return -2;
 
-	size_t i, gLen = 4096;
-	if (gLen > *size)
-		gLen = *size-20;
+    size_t i, gLen = 4096;
+    if (gLen > *size)
+        gLen = *size-20;
 
 
-	// just noise - no super good detection. good enough
-	if (signalprop.isnoise) {
-		if (g_debugMode == 2) prnt("DEBUG nrzRawDemod: just noise detected - quitting");
-		return -3;
-	}
+    // just noise - no super good detection. good enough
+    if (signalprop.isnoise) {
+        if (g_debugMode == 2) prnt("DEBUG nrzRawDemod: just noise detected - quitting");
+        return -3;
+    }
 
-	int high, low;
-	//getHiLo(dest, gLen, &high, &low, 75, 75);
-	getHiLo(&high, &low, 75, 75);
-	getHiLo(&high, &low, 75, 75);
+    int high, low;
+    //getHiLo(dest, gLen, &high, &low, 75, 75);
+    getHiLo(&high, &low, 75, 75);
+    getHiLo(&high, &low, 75, 75);
 
-	uint8_t bit=0;
-	//convert wave samples to 1's and 0's
-	for(i=20; i < *size-20; i++){
-		if (dest[i] >= high) bit = 1;
-		if (dest[i] <= low)  bit = 0;
-		dest[i] = bit;
-	}
-	//now demod based on clock (rf/32 = 32 1's for one 1 bit, 32 0's for one 0 bit)
-	size_t lastBit = 0;
-	size_t numBits = 0;
-	for(i=21; i < *size-20; i++) {
-		//if transition detected or large number of same bits - store the passed bits
-		if (dest[i] != dest[i-1] || (i-lastBit) == (10 * *clk)) {
-			memset(dest+numBits, dest[i-1] ^ *invert, (i - lastBit + (*clk/4)) / *clk);
-			numBits += (i - lastBit + (*clk/4)) / *clk;
-			if (lastBit == 0) {
-				*startIdx = i - (numBits * *clk);
-				if (g_debugMode == 2) prnt("DEBUG NRZ: startIdx %i", *startIdx);
-			}
-			lastBit = i-1;
-		}
-	}
-	*size = numBits;
-	return 0;
+    uint8_t bit=0;
+    //convert wave samples to 1's and 0's
+    for(i=20; i < *size-20; i++){
+        if (dest[i] >= high) bit = 1;
+        if (dest[i] <= low)  bit = 0;
+        dest[i] = bit;
+    }
+    //now demod based on clock (rf/32 = 32 1's for one 1 bit, 32 0's for one 0 bit)
+    size_t lastBit = 0;
+    size_t numBits = 0;
+    for(i=21; i < *size-20; i++) {
+        //if transition detected or large number of same bits - store the passed bits
+        if (dest[i] != dest[i-1] || (i-lastBit) == (10 * *clk)) {
+            memset(dest+numBits, dest[i-1] ^ *invert, (i - lastBit + (*clk/4)) / *clk);
+            numBits += (i - lastBit + (*clk/4)) / *clk;
+            if (lastBit == 0) {
+                *startIdx = i - (numBits * *clk);
+                if (g_debugMode == 2) prnt("DEBUG NRZ: startIdx %i", *startIdx);
+            }
+            lastBit = i-1;
+        }
+    }
+    *size = numBits;
+    return 0;
 }
 
 //translate wave to 11111100000 (1 for each short wave [higher freq] 0 for each long wave [lower freq])
 size_t fsk_wave_demod(uint8_t *dest, size_t size, uint8_t fchigh, uint8_t fclow, int *startIdx) {
 
-	if ( size < 1024 ) return 0; // not enough samples
+    if ( size < 1024 ) return 0; // not enough samples
 
-	if (fchigh == 0) fchigh = 10;
-	if (fclow == 0) fclow = 8;
+    if (fchigh == 0) fchigh = 10;
+    if (fclow == 0) fclow = 8;
 
-	//set the threshold close to 0 (graph) or 128 std to avoid static
-	size_t preLastSample = 0;
-	size_t LastSample = 0;
-	size_t currSample = 0;
-	size_t last_transition = 0;
-	size_t idx = 1;
-	size_t numBits = 0;
+    //set the threshold close to 0 (graph) or 128 std to avoid static
+    size_t preLastSample = 0;
+    size_t LastSample = 0;
+    size_t currSample = 0;
+    size_t last_transition = 0;
+    size_t idx = 1;
+    size_t numBits = 0;
 
-	//find start of modulating data in trace
-	idx = findModStart(dest, size, fchigh);
-	// Need to threshold first sample
-	dest[idx] = (dest[idx] < signalprop.mean) ? 0 : 1;
+    //find start of modulating data in trace
+    idx = findModStart(dest, size, fchigh);
+    // Need to threshold first sample
+    dest[idx] = (dest[idx] < signalprop.mean) ? 0 : 1;
 
-	last_transition = idx;
-	idx++;
+    last_transition = idx;
+    idx++;
 
-	// Definition:  cycles between consecutive lo-hi transitions
-	// Lets define some expected lengths. FSK1 is easier since it has bigger differences between.
-	// FSK1 8/5
-	// 50/8 = 6		| 40/8 = 5  | 64/8 = 8
-	// 50/5 = 10	| 40/5 = 8	| 64/5 = 12
+    // Definition:  cycles between consecutive lo-hi transitions
+    // Lets define some expected lengths. FSK1 is easier since it has bigger differences between.
+    // FSK1 8/5
+    // 50/8 = 6         | 40/8 = 5  | 64/8 = 8
+    // 50/5 = 10        | 40/5 = 8  | 64/5 = 12
 
-	// FSK2 10/8
-	// 50/10 = 5	| 40/10 = 4 | 64/10 = 6
-	// 50/8  = 6	| 40/8  = 5 | 64/8  = 8
+    // FSK2 10/8
+    // 50/10 = 5        | 40/10 = 4 | 64/10 = 6
+    // 50/8  = 6        | 40/8  = 5 | 64/8  = 8
 
-	// count cycles between consecutive lo-hi transitions,
-	// in practice due to noise etc we may end up with anywhere
-	// To allow fuzz would mean  +-1 on expected cycle width.
-	// FSK1 8/5
-	// 50/8 = 6 (5-7)	| 40/8 = 5 (4-6)	| 64/8 = 8 (7-9)
-	// 50/5 = 10 (9-11)	| 40/5 = 8 (7-9)	| 64/5 = 12 (11-13)
+    // count cycles between consecutive lo-hi transitions,
+    // in practice due to noise etc we may end up with anywhere
+    // To allow fuzz would mean  +-1 on expected cycle width.
+    // FSK1 8/5
+    // 50/8 = 6 (5-7)   | 40/8 = 5 (4-6)        | 64/8 = 8 (7-9)
+    // 50/5 = 10 (9-11) | 40/5 = 8 (7-9)        | 64/5 = 12 (11-13)
 
-	// FSK2 10/8
-	// 50/10 = 5 (4-6)	| 40/10 = 4 (3-5)	| 64/10 = 6 (5-7)
-	// 50/8  = 6 (5-7)	| 40/8  = 5 (4-6)	| 64/8  = 8	(7-9)
-	//
-	// It easy to see to the overgaping, but luckily we the group value also,  like 1111000001111
-	// to separate between which bit to demodulate to.
+    // FSK2 10/8
+    // 50/10 = 5 (4-6)  | 40/10 = 4 (3-5)       | 64/10 = 6 (5-7)
+    // 50/8  = 6 (5-7)  | 40/8  = 5 (4-6)       | 64/8  = 8 (7-9)
+    //
+    // It easy to see to the overgaping, but luckily we the group value also,  like 1111000001111
+    // to separate between which bit to demodulate to.
 
-	// process:
-	// count width from 0-1 transition to  1-0.
-	// determine the width is withing FUZZ_min and FUZZ_max tolerances
-	// width should be divided with exp_one.  i:e 6+7+6+2=21,  21/5 = 4,
-	// the 1-0 to 0-1  width should be divided with exp_zero.   Ie: 3+5+6+7 = 21/6 = 3
+    // process:
+    // count width from 0-1 transition to  1-0.
+    // determine the width is withing FUZZ_min and FUZZ_max tolerances
+    // width should be divided with exp_one.  i:e 6+7+6+2=21,  21/5 = 4,
+    // the 1-0 to 0-1  width should be divided with exp_zero.   Ie: 3+5+6+7 = 21/6 = 3
 
-	for(; idx < size-20; idx++) {
+    for(; idx < size-20; idx++) {
 
-		// threshold current value
-		dest[idx] = (dest[idx] < signalprop.mean) ? 0 : 1;
+        // threshold current value
+        dest[idx] = (dest[idx] < signalprop.mean) ? 0 : 1;
 
-		// Check for 0->1 transition
-		if (dest[idx-1] < dest[idx]) {
-			preLastSample = LastSample;
-			LastSample = currSample;
-			currSample = idx-last_transition;
-			if (currSample < (fclow-2)){            //0-5 = garbage noise (or 0-3)
-				//do nothing with extra garbage
-			} else if (currSample < (fchigh-1)) {           //6-8 = 8 sample waves  (or 3-6 = 5)
-				//correct previous 9 wave surrounded by 8 waves (or 6 surrounded by 5)
-				if (numBits > 1 && LastSample > (fchigh-2) && (preLastSample < (fchigh-1))){
-					dest[numBits-1]=1;
-				}
-				dest[numBits++]=1;
+        // Check for 0->1 transition
+        if (dest[idx-1] < dest[idx]) {
+            preLastSample = LastSample;
+            LastSample = currSample;
+            currSample = idx-last_transition;
+            if (currSample < (fclow-2)){            //0-5 = garbage noise (or 0-3)
+                //do nothing with extra garbage
+            } else if (currSample < (fchigh-1)) {           //6-8 = 8 sample waves  (or 3-6 = 5)
+                //correct previous 9 wave surrounded by 8 waves (or 6 surrounded by 5)
+                if (numBits > 1 && LastSample > (fchigh-2) && (preLastSample < (fchigh-1))){
+                    dest[numBits-1]=1;
+                }
+                dest[numBits++]=1;
 
 
-				if (numBits > 0 && *startIdx == 0)
-					*startIdx = idx - fclow;
+                if (numBits > 0 && *startIdx == 0)
+                    *startIdx = idx - fclow;
 
-			} else if (currSample > (fchigh+1) && numBits < 3) { //12 + and first two bit = unusable garbage
-				//do nothing with beginning garbage and reset..  should be rare..
-				numBits = 0;
-			} else if (currSample == (fclow+1) && LastSample == (fclow-1)) { // had a 7 then a 9 should be two 8's (or 4 then a 6 should be two 5's)
-				dest[numBits++]=1;
-				if (numBits > 0 && *startIdx == 0) {
-					*startIdx = idx - fclow;
-				}
-			} else {                                        //9+ = 10 sample waves (or 6+ = 7)
-				dest[numBits++]=0;
-					if (numBits > 0 && *startIdx == 0) {
-						*startIdx = idx - fchigh;
-					}
-			}
-			last_transition = idx;
-		}
-	}
-	return numBits; //Actually, it returns the number of bytes, but each byte represents a bit: 1 or 0
+            } else if (currSample > (fchigh+1) && numBits < 3) { //12 + and first two bit = unusable garbage
+                //do nothing with beginning garbage and reset..  should be rare..
+                numBits = 0;
+            } else if (currSample == (fclow+1) && LastSample == (fclow-1)) { // had a 7 then a 9 should be two 8's (or 4 then a 6 should be two 5's)
+                dest[numBits++]=1;
+                if (numBits > 0 && *startIdx == 0) {
+                    *startIdx = idx - fclow;
+                }
+            } else {                                        //9+ = 10 sample waves (or 6+ = 7)
+                dest[numBits++]=0;
+                    if (numBits > 0 && *startIdx == 0) {
+                        *startIdx = idx - fchigh;
+                    }
+            }
+            last_transition = idx;
+        }
+    }
+    return numBits; //Actually, it returns the number of bytes, but each byte represents a bit: 1 or 0
 }
 
 //translate 11111100000 to 10
 //rfLen = clock, fchigh = larger field clock, fclow = smaller field clock
 size_t aggregate_bits(uint8_t *dest, size_t size, uint8_t clk, uint8_t invert, uint8_t fchigh, uint8_t fclow, int *startIdx) {
 
-	uint8_t lastval = dest[0];
-	size_t i = 0;
-	size_t numBits = 0;
-	uint32_t n = 1;
-	uint8_t hclk = clk/2;
+    uint8_t lastval = dest[0];
+    size_t i = 0;
+    size_t numBits = 0;
+    uint32_t n = 1;
+    uint8_t hclk = clk/2;
 
-	for( i = 1; i < size; i++) {
-		n++;
-		if (dest[i] == lastval) continue; //skip until we hit a transition
+    for( i = 1; i < size; i++) {
+        n++;
+        if (dest[i] == lastval) continue; //skip until we hit a transition
 
-		//find out how many bits (n) we collected (use 1/2 clk tolerance)
+        //find out how many bits (n) we collected (use 1/2 clk tolerance)
 
-		if (dest[i-1] == 1)
-		//if lastval was 1, we have a 1->0 crossing
-			n = (n * fclow + hclk) / clk;
-		else
-			// 0->1 crossing
-			n = (n * fchigh + hclk) / clk;
+        if (dest[i-1] == 1)
+        //if lastval was 1, we have a 1->0 crossing
+            n = (n * fclow + hclk) / clk;
+        else
+            // 0->1 crossing
+            n = (n * fchigh + hclk) / clk;
 
-		if (n == 0)
-			n = 1;
+        if (n == 0)
+            n = 1;
 
-		//first transition - save startidx
-		if (numBits == 0) {
-			if (lastval == 1) {  //high to low
-				*startIdx += (fclow * i) - (n*clk);
-				if (g_debugMode == 2) prnt("DEBUG (aggregate_bits) FSK startIdx %i, fclow*idx %i, n*clk %u", *startIdx, fclow*i, n*clk);
-			} else {
-				*startIdx += (fchigh * i) - (n*clk);
-				if (g_debugMode == 2) prnt("DEBUG (aggregate_bits) FSK startIdx %i, fchigh*idx %i, n*clk %u", *startIdx, fchigh*i, n*clk);
-			}
-		}
+        //first transition - save startidx
+        if (numBits == 0) {
+            if (lastval == 1) {  //high to low
+                *startIdx += (fclow * i) - (n*clk);
+                if (g_debugMode == 2) prnt("DEBUG (aggregate_bits) FSK startIdx %i, fclow*idx %i, n*clk %u", *startIdx, fclow*i, n*clk);
+            } else {
+                *startIdx += (fchigh * i) - (n*clk);
+                if (g_debugMode == 2) prnt("DEBUG (aggregate_bits) FSK startIdx %i, fchigh*idx %i, n*clk %u", *startIdx, fchigh*i, n*clk);
+            }
+        }
 
-		//add to our destination the bits we collected
-		memset(dest+numBits, dest[i-1] ^ invert , n);
+        //add to our destination the bits we collected
+        memset(dest+numBits, dest[i-1] ^ invert , n);
 
-		numBits += n;
-		n = 0;
-		lastval = dest[i];
+        numBits += n;
+        n = 0;
+        lastval = dest[i];
 
-	}//end for
+    }//end for
 
-	// if valid extra bits at the end were all the same frequency - add them in
-	if (n > clk/fchigh) {
-		if (dest[i-2] == 1) {
-			n = (n * fclow + clk/2) / clk;
-		} else {
-			n = (n * fchigh + clk/2) / clk;
-		}
-		memset(dest+numBits, dest[i-1] ^ invert , n);
-		numBits += n;
-	}
-	return numBits;
+    // if valid extra bits at the end were all the same frequency - add them in
+    if (n > clk/fchigh) {
+        if (dest[i-2] == 1) {
+            n = (n * fclow + clk/2) / clk;
+        } else {
+            n = (n * fchigh + clk/2) / clk;
+        }
+        memset(dest+numBits, dest[i-1] ^ invert , n);
+        numBits += n;
+    }
+    return numBits;
 }
 
 //by marshmellow  (from holiman's base)
 // full fsk demod from GraphBuffer wave to decoded 1s and 0s (no mandemod)
 size_t fskdemod(uint8_t *dest, size_t size, uint8_t rfLen, uint8_t invert, uint8_t fchigh, uint8_t fclow, int *start_idx) {
-	if (signalprop.isnoise) return 0;
-	// FSK demodulator
-	size = fsk_wave_demod(dest, size, fchigh, fclow, start_idx);
-	size = aggregate_bits(dest, size, rfLen, invert, fchigh, fclow, start_idx);
-	return size;
+    if (signalprop.isnoise) return 0;
+    // FSK demodulator
+    size = fsk_wave_demod(dest, size, fchigh, fclow, start_idx);
+    size = aggregate_bits(dest, size, rfLen, invert, fchigh, fclow, start_idx);
+    return size;
 }
 
 // by marshmellow
@@ -1784,31 +1784,31 @@ size_t fskdemod(uint8_t *dest, size_t size, uint8_t rfLen, uint8_t invert, uint8
 // only transition waves are 1s
 //TODO: Iceman - hard coded value 7,  should be #define
 void psk1TOpsk2(uint8_t *bits, size_t size) {
-	uint8_t lastbit = bits[0];
-	for (size_t i = 1; i < size; i++){
-		//ignore errors
-		if (bits[i] == 7) continue;
+    uint8_t lastbit = bits[0];
+    for (size_t i = 1; i < size; i++){
+        //ignore errors
+        if (bits[i] == 7) continue;
 
-		if (lastbit != bits[i]){
-			lastbit = bits[i];
-			bits[i] = 1;
-		} else {
-			bits[i] = 0;
-		}
-	}
+        if (lastbit != bits[i]){
+            lastbit = bits[i];
+            bits[i] = 1;
+        } else {
+            bits[i] = 0;
+        }
+    }
 }
 
 // by marshmellow
 // convert psk2 demod to psk1 demod
 // from only transition waves are 1s to phase shifts change bit
 void psk2TOpsk1(uint8_t *bits, size_t size) {
-	uint8_t phase = 0;
-	for (size_t i = 0; i < size; i++){
-		if (bits[i] == 1){
-			phase ^= 1;
-		}
-		bits[i] = phase;
-	}
+    uint8_t phase = 0;
+    for (size_t i = 0; i < size; i++){
+        if (bits[i] == 1){
+            phase ^= 1;
+        }
+        bits[i] = phase;
+    }
 }
 
 //by marshmellow - demodulate PSK1 wave
@@ -1816,89 +1816,89 @@ void psk2TOpsk1(uint8_t *bits, size_t size) {
 //TODO: Iceman - hard coded value 7,  should be #define
 int pskRawDemod_ext(uint8_t *dest, size_t *size, int *clock, int *invert, int *startIdx) {
 
-	// sanity check
-	if (*size < 170) return -1;
+    // sanity check
+    if (*size < 170) return -1;
 
-	uint8_t curPhase = *invert;
-	uint8_t fc=0;
-	size_t i=0, numBits=0, waveStart=1, waveEnd=0, firstFullWave=0, lastClkBit=0;
-	uint16_t fullWaveLen=0, waveLenCnt=0, avgWaveVal=0;
-	uint16_t errCnt=0, errCnt2=0;
+    uint8_t curPhase = *invert;
+    uint8_t fc=0;
+    size_t i=0, numBits=0, waveStart=1, waveEnd=0, firstFullWave=0, lastClkBit=0;
+    uint16_t fullWaveLen=0, waveLenCnt=0, avgWaveVal=0;
+    uint16_t errCnt=0, errCnt2=0;
 
-	*clock = DetectPSKClock(dest, *size, *clock, &firstFullWave, &curPhase, &fc);
-	if (*clock <= 0) return -1;
-	//if clock detect found firstfullwave...
-	uint16_t tol = fc/2;
-	if (firstFullWave == 0) {
-		//find start of modulating data in trace
-		i = findModStart(dest, *size, fc);
-		//find first phase shift
-		firstFullWave = pskFindFirstPhaseShift(dest, *size, &curPhase, i, fc, &fullWaveLen);
-		if (firstFullWave == 0) {
-			// no phase shift detected - could be all 1's or 0's - doesn't matter where we start
-			// so skip a little to ensure we are past any Start Signal
-			firstFullWave = 160;
-			memset(dest, curPhase, firstFullWave / *clock);
-		} else {
-			memset(dest, curPhase^1, firstFullWave / *clock);
-		}
-	} else {
-		memset(dest, curPhase^1, firstFullWave / *clock);
-	}
-	//advance bits
-	numBits += (firstFullWave / *clock);
-	*startIdx = firstFullWave - (*clock * numBits)+2;
-	//set start of wave as clock align
-	lastClkBit = firstFullWave;
-	if (g_debugMode == 2) prnt("DEBUG PSK: firstFullWave: %u, waveLen: %u, startIdx %i",firstFullWave,fullWaveLen, *startIdx);
-	if (g_debugMode == 2) prnt("DEBUG PSK: clk: %d, lastClkBit: %u, fc: %u", *clock, lastClkBit, fc);
-	waveStart = 0;
-	dest[numBits++] = curPhase; //set first read bit
-	for (i = firstFullWave + fullWaveLen - 1; i < *size-3; i++){
-		//top edge of wave = start of new wave
-		if (dest[i]+fc < dest[i+1] && dest[i+1] >= dest[i+2]){
-			if (waveStart == 0) {
-				waveStart = i+1;
-				waveLenCnt = 0;
-				avgWaveVal = dest[i+1];
-			} else { //waveEnd
-				waveEnd = i+1;
-				waveLenCnt = waveEnd-waveStart;
-				if (waveLenCnt > fc){
-					//this wave is a phase shift
-					//prnt("DEBUG: phase shift at: %d, len: %d, nextClk: %d, i: %d, fc: %d",waveStart,waveLenCnt,lastClkBit+*clock-tol,i+1,fc);
-					if (i+1 >= lastClkBit + *clock - tol){ //should be a clock bit
-						curPhase ^= 1;
-						dest[numBits++] = curPhase;
-						lastClkBit += *clock;
-					} else if (i < lastClkBit+10+fc){
-						//noise after a phase shift - ignore
-					} else { //phase shift before supposed to based on clock
-						errCnt++;
-						dest[numBits++] = 7;
-					}
-				} else if (i+1 > lastClkBit + *clock + tol + fc){
-					lastClkBit += *clock; //no phase shift but clock bit
-					dest[numBits++] = curPhase;
-				} else if (waveLenCnt < fc - 1) { //wave is smaller than field clock (shouldn't happen often)
-					errCnt2++;
-					if (errCnt2 > 101) return errCnt2;
-					avgWaveVal += dest[i+1];
-					continue;
-				}
-				avgWaveVal = 0;
-				waveStart = i+1;
-			}
-		}
-		avgWaveVal += dest[i+1];
-	}
-	*size = numBits;
-	return errCnt;
+    *clock = DetectPSKClock(dest, *size, *clock, &firstFullWave, &curPhase, &fc);
+    if (*clock <= 0) return -1;
+    //if clock detect found firstfullwave...
+    uint16_t tol = fc/2;
+    if (firstFullWave == 0) {
+        //find start of modulating data in trace
+        i = findModStart(dest, *size, fc);
+        //find first phase shift
+        firstFullWave = pskFindFirstPhaseShift(dest, *size, &curPhase, i, fc, &fullWaveLen);
+        if (firstFullWave == 0) {
+            // no phase shift detected - could be all 1's or 0's - doesn't matter where we start
+            // so skip a little to ensure we are past any Start Signal
+            firstFullWave = 160;
+            memset(dest, curPhase, firstFullWave / *clock);
+        } else {
+            memset(dest, curPhase^1, firstFullWave / *clock);
+        }
+    } else {
+        memset(dest, curPhase^1, firstFullWave / *clock);
+    }
+    //advance bits
+    numBits += (firstFullWave / *clock);
+    *startIdx = firstFullWave - (*clock * numBits)+2;
+    //set start of wave as clock align
+    lastClkBit = firstFullWave;
+    if (g_debugMode == 2) prnt("DEBUG PSK: firstFullWave: %u, waveLen: %u, startIdx %i",firstFullWave,fullWaveLen, *startIdx);
+    if (g_debugMode == 2) prnt("DEBUG PSK: clk: %d, lastClkBit: %u, fc: %u", *clock, lastClkBit, fc);
+    waveStart = 0;
+    dest[numBits++] = curPhase; //set first read bit
+    for (i = firstFullWave + fullWaveLen - 1; i < *size-3; i++){
+        //top edge of wave = start of new wave
+        if (dest[i]+fc < dest[i+1] && dest[i+1] >= dest[i+2]){
+            if (waveStart == 0) {
+                waveStart = i+1;
+                waveLenCnt = 0;
+                avgWaveVal = dest[i+1];
+            } else { //waveEnd
+                waveEnd = i+1;
+                waveLenCnt = waveEnd-waveStart;
+                if (waveLenCnt > fc){
+                    //this wave is a phase shift
+                    //prnt("DEBUG: phase shift at: %d, len: %d, nextClk: %d, i: %d, fc: %d",waveStart,waveLenCnt,lastClkBit+*clock-tol,i+1,fc);
+                    if (i+1 >= lastClkBit + *clock - tol){ //should be a clock bit
+                        curPhase ^= 1;
+                        dest[numBits++] = curPhase;
+                        lastClkBit += *clock;
+                    } else if (i < lastClkBit+10+fc){
+                        //noise after a phase shift - ignore
+                    } else { //phase shift before supposed to based on clock
+                        errCnt++;
+                        dest[numBits++] = 7;
+                    }
+                } else if (i+1 > lastClkBit + *clock + tol + fc){
+                    lastClkBit += *clock; //no phase shift but clock bit
+                    dest[numBits++] = curPhase;
+                } else if (waveLenCnt < fc - 1) { //wave is smaller than field clock (shouldn't happen often)
+                    errCnt2++;
+                    if (errCnt2 > 101) return errCnt2;
+                    avgWaveVal += dest[i+1];
+                    continue;
+                }
+                avgWaveVal = 0;
+                waveStart = i+1;
+            }
+        }
+        avgWaveVal += dest[i+1];
+    }
+    *size = numBits;
+    return errCnt;
 }
 
 int pskRawDemod(uint8_t *dest, size_t *size, int *clock, int *invert) {
-	int start_idx = 0;
-	return pskRawDemod_ext(dest, size, clock, invert, &start_idx);
+    int start_idx = 0;
+    return pskRawDemod_ext(dest, size, clock, invert, &start_idx);
 }
 
 
@@ -1910,167 +1910,167 @@ int pskRawDemod(uint8_t *dest, size_t *size, int *clock, int *invert) {
 // by marshmellow
 // FSK Demod then try to locate an AWID ID
 int detectAWID(uint8_t *dest, size_t *size, int *waveStartIdx) {
-	//make sure buffer has enough data (96bits * 50clock samples)
-	if (*size < 96*50) return -1;
+    //make sure buffer has enough data (96bits * 50clock samples)
+    if (*size < 96*50) return -1;
 
-	if (signalprop.isnoise) return -2;
+    if (signalprop.isnoise) return -2;
 
-	// FSK2a demodulator  clock 50, invert 1, fcHigh 10, fcLow 8
-	*size = fskdemod(dest, *size, 50, 1, 10, 8, waveStartIdx); //awid fsk2a
+    // FSK2a demodulator  clock 50, invert 1, fcHigh 10, fcLow 8
+    *size = fskdemod(dest, *size, 50, 1, 10, 8, waveStartIdx); //awid fsk2a
 
-	//did we get a good demod?
-	if (*size < 96) return -3;
+    //did we get a good demod?
+    if (*size < 96) return -3;
 
-	size_t start_idx = 0;
-	uint8_t preamble[] = {0,0,0,0,0,0,0,1};
-	if (!preambleSearch(dest, preamble, sizeof(preamble), size, &start_idx))
-		return -4; //preamble not found
+    size_t start_idx = 0;
+    uint8_t preamble[] = {0,0,0,0,0,0,0,1};
+    if (!preambleSearch(dest, preamble, sizeof(preamble), size, &start_idx))
+        return -4; //preamble not found
 
-	// wrong size?  (between to preambles)
-	if (*size != 96) return -5;
+    // wrong size?  (between to preambles)
+    if (*size != 96) return -5;
 
-	return (int)start_idx;
+    return (int)start_idx;
 }
 
 //by marshmellow
 //takes 1s and 0s and searches for EM410x format - output EM ID
 int Em410xDecode(uint8_t *bits, size_t *size, size_t *start_idx, uint32_t *hi, uint64_t *lo) {
-	// sanity check
-	if (bits[1] > 1) return -1;
-	if (*size < 64) return -2;
+    // sanity check
+    if (bits[1] > 1) return -1;
+    if (*size < 64) return -2;
 
-	uint8_t fmtlen;
-	*start_idx = 0;
+    uint8_t fmtlen;
+    *start_idx = 0;
 
-	// preamble 0111111111
-	// include 0 in front to help get start pos
-	uint8_t preamble[] = {0,1,1,1,1,1,1,1,1,1};
-	if (!preambleSearch(bits, preamble, sizeof(preamble), size, start_idx))
-		return -4;
+    // preamble 0111111111
+    // include 0 in front to help get start pos
+    uint8_t preamble[] = {0,1,1,1,1,1,1,1,1,1};
+    if (!preambleSearch(bits, preamble, sizeof(preamble), size, start_idx))
+        return -4;
 
-	// (iceman) if the preamble doesn't find two occuriences, this identification fails.
-	fmtlen = (*size == 128) ? 22 : 10;
+    // (iceman) if the preamble doesn't find two occuriences, this identification fails.
+    fmtlen = (*size == 128) ? 22 : 10;
 
-	//skip last 4bit parity row for simplicity
-	*size = removeParity(bits, *start_idx + sizeof(preamble), 5, 0, fmtlen * 5);
+    //skip last 4bit parity row for simplicity
+    *size = removeParity(bits, *start_idx + sizeof(preamble), 5, 0, fmtlen * 5);
 
-	switch (*size) {
-	   case 40: {
-	    // std em410x format
-		*hi = 0;
-		*lo = ((uint64_t)(bytebits_to_byte(bits, 8)) << 32) | (bytebits_to_byte(bits + 8, 32));
-		break;
-	    }
-	    case 88:  {
-	    // long em format
-		*hi = (bytebits_to_byte(bits, 24));
-		*lo = ((uint64_t)(bytebits_to_byte(bits + 24, 32)) << 32) | (bytebits_to_byte(bits + 24 + 32, 32));
-		break;
-	    }
-	    default: return -6;
-	}
-	return 1;
+    switch (*size) {
+       case 40: {
+        // std em410x format
+        *hi = 0;
+        *lo = ((uint64_t)(bytebits_to_byte(bits, 8)) << 32) | (bytebits_to_byte(bits + 8, 32));
+        break;
+        }
+        case 88:  {
+        // long em format
+        *hi = (bytebits_to_byte(bits, 24));
+        *lo = ((uint64_t)(bytebits_to_byte(bits + 24, 32)) << 32) | (bytebits_to_byte(bits + 24 + 32, 32));
+        break;
+        }
+        default: return -6;
+    }
+    return 1;
 }
 
 
 // loop to get raw HID waveform then FSK demodulate the TAG ID from it
 int HIDdemodFSK(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32_t *lo, int *waveStartIdx) {
-	//make sure buffer has data
-	if (*size < 96*50) return -1;
+    //make sure buffer has data
+    if (*size < 96*50) return -1;
 
-	if (signalprop.isnoise) return -2;
+    if (signalprop.isnoise) return -2;
 
-	// FSK demodulator  fsk2a so invert and fc/10/8
-	*size = fskdemod(dest, *size, 50, 1, 10, 8, waveStartIdx); //hid fsk2a
+    // FSK demodulator  fsk2a so invert and fc/10/8
+    *size = fskdemod(dest, *size, 50, 1, 10, 8, waveStartIdx); //hid fsk2a
 
-	//did we get a good demod?
-	if (*size < 96*2) return -3;
+    //did we get a good demod?
+    if (*size < 96*2) return -3;
 
-	// 00011101 bit pattern represent start of frame, 01 pattern represents a 0 and 10 represents a 1
-	size_t start_idx = 0;
-	uint8_t preamble[] = {0,0,0,1,1,1,0,1};
-	if (!preambleSearch(dest, preamble, sizeof(preamble), size, &start_idx))
-		return -4; //preamble not found
+    // 00011101 bit pattern represent start of frame, 01 pattern represents a 0 and 10 represents a 1
+    size_t start_idx = 0;
+    uint8_t preamble[] = {0,0,0,1,1,1,0,1};
+    if (!preambleSearch(dest, preamble, sizeof(preamble), size, &start_idx))
+        return -4; //preamble not found
 
-	// wrong size?  (between to preambles)
-	//if (*size != 96) return -5;
+    // wrong size?  (between to preambles)
+    //if (*size != 96) return -5;
 
-	size_t num_start = start_idx + sizeof(preamble);
-	// final loop, go over previously decoded FSK data and manchester decode into usable tag ID
-	for (size_t idx = num_start; (idx - num_start) < *size - sizeof(preamble); idx += 2) {
-		if (dest[idx] == dest[idx+1]){
-			return -5; //not manchester data
-		}
-		*hi2 = (*hi2 << 1) | (*hi >> 31);
-		*hi = (*hi << 1) | (*lo >> 31);
-		//Then, shift in a 0 or one into low
-		*lo <<= 1;
-		if (dest[idx] && !dest[idx+1])  // 1 0
-			*lo |= 1;
-		else // 0 1
-			*lo |= 0;
-	}
-	return (int)start_idx;
+    size_t num_start = start_idx + sizeof(preamble);
+    // final loop, go over previously decoded FSK data and manchester decode into usable tag ID
+    for (size_t idx = num_start; (idx - num_start) < *size - sizeof(preamble); idx += 2) {
+        if (dest[idx] == dest[idx+1]){
+            return -5; //not manchester data
+        }
+        *hi2 = (*hi2 << 1) | (*hi >> 31);
+        *hi = (*hi << 1) | (*lo >> 31);
+        //Then, shift in a 0 or one into low
+        *lo <<= 1;
+        if (dest[idx] && !dest[idx+1])  // 1 0
+            *lo |= 1;
+        else // 0 1
+            *lo |= 0;
+    }
+    return (int)start_idx;
 }
 
 // Find IDTEC PSK1, RF  Preamble == 0x4944544B, Demodsize 64bits
 // by iceman
 int detectIdteck(uint8_t *dest, size_t *size) {
-	//make sure buffer has data
-	if (*size < 64*2) return -1;
+    //make sure buffer has data
+    if (*size < 64*2) return -1;
 
-	if (signalprop.isnoise) return -2;
+    if (signalprop.isnoise) return -2;
 
-	size_t start_idx = 0;
-	uint8_t preamble[] = {0,1,0,0,1,0,0,1,0,1,0,0,0,1,0,0,0,1,0,1,0,1,0,0,0,1,0,0,1,0,1,1};
+    size_t start_idx = 0;
+    uint8_t preamble[] = {0,1,0,0,1,0,0,1,0,1,0,0,0,1,0,0,0,1,0,1,0,1,0,0,0,1,0,0,1,0,1,1};
 
-	//preamble not found
-	if (!preambleSearch(dest, preamble, sizeof(preamble), size, &start_idx))
-		return -3;
+    //preamble not found
+    if (!preambleSearch(dest, preamble, sizeof(preamble), size, &start_idx))
+        return -3;
 
-	 // wrong demoded size
-	if (*size != 64) return -4;
-	return (int)start_idx;
+     // wrong demoded size
+    if (*size != 64) return -4;
+    return (int)start_idx;
 }
 
 int detectIOProx(uint8_t *dest, size_t *size, int *waveStartIdx) {
-	//make sure buffer has data
-	if (*size < 66*64) return -1;
+    //make sure buffer has data
+    if (*size < 66*64) return -1;
 
-	if (signalprop.isnoise) return -2;
+    if (signalprop.isnoise) return -2;
 
-	// FSK demodulator  RF/64, fsk2a so invert, and fc/10/8
-	*size = fskdemod(dest, *size, 64, 1, 10, 8, waveStartIdx);  //io fsk2a
+    // FSK demodulator  RF/64, fsk2a so invert, and fc/10/8
+    *size = fskdemod(dest, *size, 64, 1, 10, 8, waveStartIdx);  //io fsk2a
 
-	//did we get enough demod data?
-	if (*size < 64) return -3;
+    //did we get enough demod data?
+    if (*size < 64) return -3;
 
-	//Index map
-	//0           10          20          30          40          50          60
-	//|           |           |           |           |           |           |
-	//01234567 8 90123456 7 89012345 6 78901234 5 67890123 4 56789012 3 45678901 23
-	//-----------------------------------------------------------------------------
-	//00000000 0 11110000 1 facility 1 version* 1 code*one 1 code*two 1 ???????? 11
-	//
-	//XSF(version)facility:codeone+codetwo
+    //Index map
+    //0           10          20          30          40          50          60
+    //|           |           |           |           |           |           |
+    //01234567 8 90123456 7 89012345 6 78901234 5 67890123 4 56789012 3 45678901 23
+    //-----------------------------------------------------------------------------
+    //00000000 0 11110000 1 facility 1 version* 1 code*one 1 code*two 1 ???????? 11
+    //
+    //XSF(version)facility:codeone+codetwo
 
-	size_t start_idx = 0;
-	uint8_t preamble[] = {0,0,0,0,0,0,0,0,0,1};
-	if (!preambleSearch(dest, preamble, sizeof(preamble), size, &start_idx))
-		return -4; //preamble not found
+    size_t start_idx = 0;
+    uint8_t preamble[] = {0,0,0,0,0,0,0,0,0,1};
+    if (!preambleSearch(dest, preamble, sizeof(preamble), size, &start_idx))
+        return -4; //preamble not found
 
-	// wrong size?  (between to preambles)
-	if (*size != 64) return -5;
+    // wrong size?  (between to preambles)
+    if (*size != 64) return -5;
 
-	if (  !dest[start_idx + 8]
-		&& dest[start_idx + 17] == 1
-		&& dest[start_idx + 26] == 1
-		&& dest[start_idx + 35] == 1
-		&& dest[start_idx + 44] == 1
-		&& dest[start_idx + 53] == 1) {
-		//confirmed proper separator bits found
-		//return start position
-		return (int) start_idx;
-	}
-	return -6;
+    if (  !dest[start_idx + 8]
+        && dest[start_idx + 17] == 1
+        && dest[start_idx + 26] == 1
+        && dest[start_idx + 35] == 1
+        && dest[start_idx + 44] == 1
+        && dest[start_idx + 53] == 1) {
+        //confirmed proper separator bits found
+        //return start position
+        return (int) start_idx;
+    }
+    return -6;
 }
diff --git a/common/lfdemod.h b/common/lfdemod.h
index 222495a99..80f0e06a7 100644
--- a/common/lfdemod.h
+++ b/common/lfdemod.h
@@ -19,7 +19,7 @@
 #include <stdlib.h>  // for
 #include <stdbool.h> // for bool
 #include "parity.h"  // for parity test
-#include "util.h"	 // for ARRAYLEN
+#include "util.h"    // for ARRAYLEN
 
 //might not be high enough for noisy environments
 #define NOISE_AMPLITUDE_THRESHOLD 10
@@ -30,11 +30,11 @@
 
 //generic
 typedef struct {
-	int low;
-	int high;
-	int mean;
-	int amplitude;
-	bool isnoise;
+    int low;
+    int high;
+    int mean;
+    int amplitude;
+    bool isnoise;
 } signal_t;
 signal_t* getSignalProperties(void);
 
@@ -50,12 +50,12 @@ extern int      askdemod(uint8_t *bits, size_t *size, int *clk, int *invert, int
 extern int      askdemod_ext(uint8_t *bits, size_t *size, int *clk, int *invert, int maxErr, uint8_t amp, uint8_t askType, int *startIdx);
 extern void     askAmp(uint8_t *bits, size_t size);
 extern int      BiphaseRawDecode(uint8_t *bits, size_t *size, int *offset, int invert);
-extern uint8_t bits_to_array(const uint8_t *bits, size_t size, uint8_t *dest);
+extern uint8_t  bits_to_array(const uint8_t *bits, size_t size, uint8_t *dest);
 extern uint32_t bytebits_to_byte(uint8_t *src, size_t numbits);
 extern uint32_t bytebits_to_byteLSBF(uint8_t *src, size_t numbits);
 extern uint16_t countFC(uint8_t *bits, size_t size, bool fskAdj);
 extern int      DetectASKClock(uint8_t *dest, size_t size, int *clock, int maxErr);
-extern bool		DetectCleanAskWave(uint8_t *dest, size_t size, uint8_t high, uint8_t low);
+extern bool     DetectCleanAskWave(uint8_t *dest, size_t size, uint8_t high, uint8_t low);
 extern uint8_t  detectFSKClk(uint8_t *bits, size_t size, uint8_t fcHigh, uint8_t fcLow, int *firstClockEdge);
 extern int      DetectNRZClock(uint8_t *dest, size_t size, int clock, size_t *clockStartIdx);
 extern int      DetectPSKClock(uint8_t *dest, size_t size, int clock, size_t *firstPhaseShift, uint8_t *curPhase, uint8_t *fc);
@@ -69,8 +69,8 @@ extern int      ManchesterEncode(uint8_t *bits, size_t size);
 extern int      manrawdecode(uint8_t *bits, size_t *size, uint8_t invert, uint8_t *alignPos);
 extern int      nrzRawDemod(uint8_t *dest, size_t *size, int *clk, int *invert, int *startIdx);
 extern bool     parityTest(uint32_t bits, uint8_t bitLen, uint8_t pType);
-extern bool		preambleSearch(uint8_t *bits, uint8_t *preamble, size_t pLen, size_t *size, size_t *startIdx);
-extern bool		preambleSearchEx(uint8_t *bits, uint8_t *preamble, size_t pLen, size_t *size, size_t *startIdx, bool findone);
+extern bool     preambleSearch(uint8_t *bits, uint8_t *preamble, size_t pLen, size_t *size, size_t *startIdx);
+extern bool     preambleSearchEx(uint8_t *bits, uint8_t *preamble, size_t pLen, size_t *size, size_t *startIdx, bool findone);
 extern int      pskRawDemod(uint8_t *dest, size_t *size, int *clock, int *invert);
 extern int      pskRawDemod_ext(uint8_t *dest, size_t *size, int *clock, int *invert, int *startIdx);
 extern void     psk2TOpsk1(uint8_t *bits, size_t size);
diff --git a/common/parity.h b/common/parity.h
index 9aaf936ed..94d98d913 100644
--- a/common/parity.h
+++ b/common/parity.h
@@ -22,23 +22,23 @@ extern const uint8_t OddByteParity[256];
 
 
 static inline bool oddparity8(const uint8_t x) {
-	return OddByteParity[x];
+    return OddByteParity[x];
 }
 
 
 static inline bool evenparity8(const uint8_t x) {
-	return !OddByteParity[x];
+    return !OddByteParity[x];
 }
 
 
 static inline bool evenparity32(uint32_t x)
 {
 #if !defined __GNUC__
-	x ^= x >> 16;
-	x ^= x >> 8;
-	return evenparity8(x);
+    x ^= x >> 16;
+    x ^= x >> 8;
+    return evenparity8(x);
 #else
-	return __builtin_parity(x);
+    return __builtin_parity(x);
 #endif
 }
 
@@ -46,11 +46,11 @@ static inline bool evenparity32(uint32_t x)
 static inline bool oddparity32(uint32_t x)
 {
 #if !defined __GNUC__
-	x ^= x >> 16;
-	x ^= x >> 8;
-	return oddparity8(x);
+    x ^= x >> 16;
+    x ^= x >> 8;
+    return oddparity8(x);
 #else
-	return !__builtin_parity(x);
+    return !__builtin_parity(x);
 #endif
 }
 
diff --git a/common/prng.c b/common/prng.c
index b1a608d7e..fb39dd11c 100644
--- a/common/prng.c
+++ b/common/prng.c
@@ -17,7 +17,7 @@ uint32_t burtle_get_mod( prng_ctx *x ) {
 
 void burtle_init_mod(prng_ctx *x, uint32_t seed ) {
     x->a = 0xf1ea5eed;
-	x->b = x->c = x->d = seed;
+    x->b = x->c = x->d = seed;
     for (uint8_t i=0; i < 42; ++i) {
         (void)burtle_get_mod(x);
     }
@@ -33,7 +33,7 @@ void burtle_init(prng_ctx *x, uint32_t seed ) {
 
 
 uint32_t GetSimplePrng( uint32_t seed ){
-	seed *= 0x19660D;
-	seed += 0x3C6EF35F;
-	return seed;
+    seed *= 0x19660D;
+    seed += 0x3C6EF35F;
+    return seed;
 }
diff --git a/common/prng.h b/common/prng.h
index f7a875b6c..fc9abd346 100644
--- a/common/prng.h
+++ b/common/prng.h
@@ -9,10 +9,10 @@
 #include <stdint.h>
 #include <stddef.h>
 typedef struct prng_ctx {
-	uint32_t a;
-	uint32_t b;
-	uint32_t c;
-	uint32_t d;
+    uint32_t a;
+    uint32_t b;
+    uint32_t c;
+    uint32_t d;
 } prng_ctx;
 
 //uint32_t burtle_get( prng_ctx *x );
diff --git a/common/protocols.c b/common/protocols.c
index 9649c51d9..be1076846 100644
--- a/common/protocols.c
+++ b/common/protocols.c
@@ -2,17 +2,17 @@
 
 // ATA55xx shared presets & routines
 uint32_t GetT55xxClockBit(uint32_t clock) {
-	switch (clock) {
-		case 128: return T55x7_BITRATE_RF_128;
-		case 100: return T55x7_BITRATE_RF_100;
-		case  64: return T55x7_BITRATE_RF_64;
-		case  50: return T55x7_BITRATE_RF_50;
-		case  40: return T55x7_BITRATE_RF_40;
-		case  32: return T55x7_BITRATE_RF_32;
-		case  16: return T55x7_BITRATE_RF_16;
-		case   8: return T55x7_BITRATE_RF_8;
-		default : return 0;
-	}
+    switch (clock) {
+        case 128: return T55x7_BITRATE_RF_128;
+        case 100: return T55x7_BITRATE_RF_100;
+        case  64: return T55x7_BITRATE_RF_64;
+        case  50: return T55x7_BITRATE_RF_50;
+        case  40: return T55x7_BITRATE_RF_40;
+        case  32: return T55x7_BITRATE_RF_32;
+        case  16: return T55x7_BITRATE_RF_16;
+        case   8: return T55x7_BITRATE_RF_8;
+        default : return 0;
+    }
 }
 
 #ifndef ON_DEVICE
@@ -20,122 +20,122 @@ uint32_t GetT55xxClockBit(uint32_t clock) {
 #define PrintAndLogDevice(level, format, args...)  PrintAndLogEx(level, format , ## args)
 
 uint8_t isset(uint8_t val, uint8_t mask) {
-	return (val & mask);
+    return (val & mask);
 }
 
 uint8_t notset(uint8_t val, uint8_t mask){
-	return !(val & mask);
+    return !(val & mask);
 }
 
 void fuse_config(const picopass_hdr *hdr) {
-	uint8_t fuses = hdr->conf.fuses;
+    uint8_t fuses = hdr->conf.fuses;
 
-	if (isset(fuses,FUSE_FPERS))
-		PrintAndLogDevice(SUCCESS, "\tMode: Personalization [Programmable]");
-	else
-		PrintAndLogDevice(NORMAL, "\tMode: Application [Locked]");
+    if (isset(fuses,FUSE_FPERS))
+        PrintAndLogDevice(SUCCESS, "\tMode: Personalization [Programmable]");
+    else
+        PrintAndLogDevice(NORMAL, "\tMode: Application [Locked]");
 
-	if (isset(fuses, FUSE_CODING1)) {
-		PrintAndLogDevice(NORMAL, "\tCoding: RFU");
-	} else {
-		if( isset( fuses , FUSE_CODING0))
-			PrintAndLogDevice(NORMAL, "\tCoding: ISO 14443-2 B/ISO 15693");
-		else
-			PrintAndLogDevice(NORMAL, "\tCoding: ISO 14443B only");
-	}
-	// 1 1
-	if( isset (fuses,FUSE_CRYPT1) && isset(fuses, FUSE_CRYPT0 )) PrintAndLogDevice(SUCCESS, "\tCrypt: Secured page, keys not locked");
-	// 1 0
-	if( isset (fuses,FUSE_CRYPT1) && notset( fuses, FUSE_CRYPT0 )) PrintAndLogDevice(NORMAL, "\tCrypt: Secured page, keys locked");
-	// 0 1
-	if( notset (fuses,FUSE_CRYPT1) && isset( fuses, FUSE_CRYPT0 )) PrintAndLogDevice(SUCCESS, "\tCrypt: Non secured page");
-	// 0 0
-	if( notset (fuses,FUSE_CRYPT1) && notset( fuses, FUSE_CRYPT0 )) PrintAndLogDevice(NORMAL, "\tCrypt: No auth possible. Read only if RA is enabled");
+    if (isset(fuses, FUSE_CODING1)) {
+        PrintAndLogDevice(NORMAL, "\tCoding: RFU");
+    } else {
+        if( isset( fuses , FUSE_CODING0))
+            PrintAndLogDevice(NORMAL, "\tCoding: ISO 14443-2 B/ISO 15693");
+        else
+            PrintAndLogDevice(NORMAL, "\tCoding: ISO 14443B only");
+    }
+    // 1 1
+    if( isset (fuses,FUSE_CRYPT1) && isset(fuses, FUSE_CRYPT0 )) PrintAndLogDevice(SUCCESS, "\tCrypt: Secured page, keys not locked");
+    // 1 0
+    if( isset (fuses,FUSE_CRYPT1) && notset( fuses, FUSE_CRYPT0 )) PrintAndLogDevice(NORMAL, "\tCrypt: Secured page, keys locked");
+    // 0 1
+    if( notset (fuses,FUSE_CRYPT1) && isset( fuses, FUSE_CRYPT0 )) PrintAndLogDevice(SUCCESS, "\tCrypt: Non secured page");
+    // 0 0
+    if( notset (fuses,FUSE_CRYPT1) && notset( fuses, FUSE_CRYPT0 )) PrintAndLogDevice(NORMAL, "\tCrypt: No auth possible. Read only if RA is enabled");
 
-	if( isset( fuses, FUSE_RA))
-		PrintAndLogDevice(NORMAL, "\tRA: Read access enabled");
-	else
-		PrintAndLogDevice(WARNING, "\tRA: Read access not enabled");
+    if( isset( fuses, FUSE_RA))
+        PrintAndLogDevice(NORMAL, "\tRA: Read access enabled");
+    else
+        PrintAndLogDevice(WARNING, "\tRA: Read access not enabled");
 }
 
 void getMemConfig(uint8_t mem_cfg, uint8_t chip_cfg, uint8_t *max_blk, uint8_t *app_areas, uint8_t *kb) {
-	// mem-bit 5, mem-bit 7, chip-bit 4: defines chip type
-	uint8_t k16		= isset(mem_cfg, 0x80);
-	//uint8_t k2 		= isset(mem_cfg, 0x08);
-	uint8_t book	= isset(mem_cfg, 0x20);
+    // mem-bit 5, mem-bit 7, chip-bit 4: defines chip type
+    uint8_t k16 = isset(mem_cfg, 0x80);
+    //uint8_t k2 = isset(mem_cfg, 0x08);
+    uint8_t book = isset(mem_cfg, 0x20);
 
-	if(isset(chip_cfg, 0x10) && !k16 && !book) {
-		*kb = 2;
-		*app_areas = 2;
-		*max_blk = 31;
-	} else if(isset(chip_cfg, 0x10) && k16 && !book) {
-		*kb = 16;
-		*app_areas = 2;
-		*max_blk = 255; //16kb
-	} else if(notset(chip_cfg, 0x10) && !k16 && !book) {
-		*kb = 16;
-		*app_areas = 16;
-		*max_blk = 255; //16kb
-	} else if(isset(chip_cfg, 0x10) && k16 && book) {
-		*kb = 32;
-		*app_areas = 3;
-		*max_blk = 255; //16kb
-	} else if(notset(chip_cfg, 0x10) && !k16 && book) {
-		*kb = 32;
-		*app_areas = 17;
-		*max_blk = 255; //16kb
-	} else {
-		*kb = 32;
-		*app_areas = 2;
-		*max_blk = 255;
-	}
+    if(isset(chip_cfg, 0x10) && !k16 && !book) {
+        *kb = 2;
+        *app_areas = 2;
+        *max_blk = 31;
+    } else if(isset(chip_cfg, 0x10) && k16 && !book) {
+        *kb = 16;
+        *app_areas = 2;
+        *max_blk = 255; //16kb
+    } else if(notset(chip_cfg, 0x10) && !k16 && !book) {
+        *kb = 16;
+        *app_areas = 16;
+        *max_blk = 255; //16kb
+    } else if(isset(chip_cfg, 0x10) && k16 && book) {
+        *kb = 32;
+        *app_areas = 3;
+        *max_blk = 255; //16kb
+    } else if(notset(chip_cfg, 0x10) && !k16 && book) {
+        *kb = 32;
+        *app_areas = 17;
+        *max_blk = 255; //16kb
+    } else {
+        *kb = 32;
+        *app_areas = 2;
+        *max_blk = 255;
+    }
 }
 
 void mem_app_config(const picopass_hdr *hdr) {
-	uint8_t mem = hdr->conf.mem_config;
-	uint8_t chip = hdr->conf.chip_config;
-	uint8_t applimit = hdr->conf.app_limit;
-	uint8_t kb = 2;
-	uint8_t app_areas = 2;
-	uint8_t max_blk = 31;
+    uint8_t mem = hdr->conf.mem_config;
+    uint8_t chip = hdr->conf.chip_config;
+    uint8_t applimit = hdr->conf.app_limit;
+    uint8_t kb = 2;
+    uint8_t app_areas = 2;
+    uint8_t max_blk = 31;
 
-	getMemConfig(mem, chip, &max_blk, &app_areas, &kb);
+    getMemConfig(mem, chip, &max_blk, &app_areas, &kb);
 
-	if (applimit < 6) applimit = 26;
-	if (kb == 2 && (applimit > 0x1f) ) applimit = 26;
+    if (applimit < 6) applimit = 26;
+    if (kb == 2 && (applimit > 0x1f) ) applimit = 26;
 
-	PrintAndLogDevice(NORMAL, " Mem: %u KBits/%u App Areas (%u * 8 bytes) [%02X]", kb, app_areas, max_blk, mem);
-	PrintAndLogDevice(NORMAL, "\tAA1: blocks 06-%02X", applimit);
-	PrintAndLogDevice(NORMAL, "\tAA2: blocks %02X-%02X", applimit+1, max_blk);
-	PrintAndLogDevice(NORMAL, "\tOTP: 0x%02X%02X", hdr->conf.otp[1],  hdr->conf.otp[0]);
-	PrintAndLogDevice(NORMAL, "\nKeyAccess:");
+    PrintAndLogDevice(NORMAL, " Mem: %u KBits/%u App Areas (%u * 8 bytes) [%02X]", kb, app_areas, max_blk, mem);
+    PrintAndLogDevice(NORMAL, "\tAA1: blocks 06-%02X", applimit);
+    PrintAndLogDevice(NORMAL, "\tAA2: blocks %02X-%02X", applimit+1, max_blk);
+    PrintAndLogDevice(NORMAL, "\tOTP: 0x%02X%02X", hdr->conf.otp[1],  hdr->conf.otp[0]);
+    PrintAndLogDevice(NORMAL, "\nKeyAccess:");
 
-	uint8_t book = isset(mem, 0x20);
-	if (book) {
-		PrintAndLogDevice(NORMAL, "\tRead A - Kd");
-		PrintAndLogDevice(NORMAL, "\tRead B - Kc");
-		PrintAndLogDevice(NORMAL, "\tWrite A - Kd");
-		PrintAndLogDevice(NORMAL, "\tWrite B - Kc");
-		PrintAndLogDevice(NORMAL, "\tDebit  - Kd or Kc");
-		PrintAndLogDevice(NORMAL,"\tCredit - Kc");
-	} else{
-		PrintAndLogDevice(NORMAL, "\tRead A - Kd or Kc");
-		PrintAndLogDevice(NORMAL, "\tRead B - Kd or Kc");
-		PrintAndLogDevice(NORMAL, "\tWrite A - Kc");
-		PrintAndLogDevice(NORMAL, "\tWrite B - Kc");
-		PrintAndLogDevice(NORMAL, "\tDebit  - Kd or Kc");
-		PrintAndLogDevice(NORMAL, "\tCredit - Kc");
-	}
+    uint8_t book = isset(mem, 0x20);
+    if (book) {
+        PrintAndLogDevice(NORMAL, "\tRead A - Kd");
+        PrintAndLogDevice(NORMAL, "\tRead B - Kc");
+        PrintAndLogDevice(NORMAL, "\tWrite A - Kd");
+        PrintAndLogDevice(NORMAL, "\tWrite B - Kc");
+        PrintAndLogDevice(NORMAL, "\tDebit  - Kd or Kc");
+        PrintAndLogDevice(NORMAL,"\tCredit - Kc");
+    } else{
+        PrintAndLogDevice(NORMAL, "\tRead A - Kd or Kc");
+        PrintAndLogDevice(NORMAL, "\tRead B - Kd or Kc");
+        PrintAndLogDevice(NORMAL, "\tWrite A - Kc");
+        PrintAndLogDevice(NORMAL, "\tWrite B - Kc");
+        PrintAndLogDevice(NORMAL, "\tDebit  - Kd or Kc");
+        PrintAndLogDevice(NORMAL, "\tCredit - Kc");
+    }
 }
 void print_picopass_info(const picopass_hdr *hdr) {
-	fuse_config(hdr);
-	mem_app_config(hdr);
+    fuse_config(hdr);
+    mem_app_config(hdr);
 }
 void printIclassDumpInfo(uint8_t* iclass_dump) {
-	print_picopass_info((picopass_hdr *) iclass_dump);
+    print_picopass_info((picopass_hdr *) iclass_dump);
 }
 
 #else
-	#define PrintAndLogDevice(level, format, ...) { }
+    #define PrintAndLogDevice(level, format, ...) { }
 #endif
 //ON_DEVICE
diff --git a/common/protocols.h b/common/protocols.h
index ce56b3175..50e6e0b46 100644
--- a/common/protocols.h
+++ b/common/protocols.h
@@ -9,115 +9,115 @@
 //The following data is taken from http://www.proxmark.org/forum/viewtopic.php?pid=13501#p13501
 /*
 ISO14443A (usually NFC tags)
-	26 (7bits) = REQA
-	30 = Read (usage: 30+1byte block number+2bytes ISO14443A-CRC - answer: 16bytes)
-	A2 = Write (usage: A2+1byte block number+4bytes data+2bytes ISO14443A-CRC - answer: 0A [ACK] or 00 [NAK])
-	52 (7bits) = WUPA (usage: 52(7bits) - answer: 2bytes ATQA)
-	93 20 = Anticollision (usage: 9320 - answer: 4bytes UID+1byte UID-bytes-xor)
-	93 70 = Select (usage: 9370+5bytes 9320 answer - answer: 1byte SAK)
-	95 20 = Anticollision of cascade level2
-	95 70 = Select of cascade level2
-	50 00 = Halt (usage: 5000+2bytes ISO14443A-CRC - no answer from card)
+    26 (7bits) = REQA
+    30 = Read (usage: 30+1byte block number+2bytes ISO14443A-CRC - answer: 16bytes)
+    A2 = Write (usage: A2+1byte block number+4bytes data+2bytes ISO14443A-CRC - answer: 0A [ACK] or 00 [NAK])
+    52 (7bits) = WUPA (usage: 52(7bits) - answer: 2bytes ATQA)
+    93 20 = Anticollision (usage: 9320 - answer: 4bytes UID+1byte UID-bytes-xor)
+    93 70 = Select (usage: 9370+5bytes 9320 answer - answer: 1byte SAK)
+    95 20 = Anticollision of cascade level2
+    95 70 = Select of cascade level2
+    50 00 = Halt (usage: 5000+2bytes ISO14443A-CRC - no answer from card)
 Mifare
-	60 = Authenticate with KeyA
-	61 = Authenticate with KeyB
-	40 (7bits) = Used to put Chinese Changeable UID cards in special mode (must be followed by 43 (8bits) - answer: 0A)
-	C0 = Decrement
-	C1 = Increment
-	C2 = Restore
-	B0 = Transfer
+    60 = Authenticate with KeyA
+    61 = Authenticate with KeyB
+    40 (7bits) = Used to put Chinese Changeable UID cards in special mode (must be followed by 43 (8bits) - answer: 0A)
+    C0 = Decrement
+    C1 = Increment
+    C2 = Restore
+    B0 = Transfer
 Ultralight C
-	A0 = Compatibility Write (to accomodate MIFARE commands)
-	1A = Step1 Authenticate
-	AF = Step2 Authenticate
+    A0 = Compatibility Write (to accomodate MIFARE commands)
+    1A = Step1 Authenticate
+    AF = Step2 Authenticate
 
 
 ISO14443B
-	05 = REQB
-	1D = ATTRIB
-	50 = HALT
+    05 = REQB
+    1D = ATTRIB
+    50 = HALT
 
-	BA = PING (reader -> tag)
-	AB = PONG (tag -> reader)
+    BA = PING (reader -> tag)
+    AB = PONG (tag -> reader)
 SRIX4K (tag does not respond to 05)
-	06 00 = INITIATE
-	0E xx = SELECT ID (xx = Chip-ID)
-	0B = Get UID
-	08 yy = Read Block (yy = block number)
-	09 yy dd dd dd dd = Write Block (yy = block number; dd dd dd dd = data to be written)
-	0C = Reset to Inventory
-	0F = Completion
-	0A 11 22 33 44 55 66 = Authenticate (11 22 33 44 55 66 = data to authenticate)
+    06 00 = INITIATE
+    0E xx = SELECT ID (xx = Chip-ID)
+    0B = Get UID
+    08 yy = Read Block (yy = block number)
+    09 yy dd dd dd dd = Write Block (yy = block number; dd dd dd dd = data to be written)
+    0C = Reset to Inventory
+    0F = Completion
+    0A 11 22 33 44 55 66 = Authenticate (11 22 33 44 55 66 = data to authenticate)
 
 
 ISO15693
-	MANDATORY COMMANDS (all ISO15693 tags must support those)
-		01 = Inventory (usage: 260100+2bytes ISO15693-CRC - answer: 12bytes)
-		02 = Stay Quiet
-	OPTIONAL COMMANDS (not all tags support them)
-		20 = Read Block (usage: 0220+1byte block number+2bytes ISO15693-CRC - answer: 4bytes)
-		21 = Write Block (usage: 0221+1byte block number+4bytes data+2bytes ISO15693-CRC - answer: 4bytes)
-		22 = Lock Block
-		23 = Read Multiple Blocks (usage: 0223+1byte 1st block to read+1byte last block to read+2bytes ISO15693-CRC)
-		25 = Select
-		26 = Reset to Ready
-		27 = Write AFI
-		28 = Lock AFI
-		29 = Write DSFID
-		2A = Lock DSFID
-		2B = Get_System_Info (usage: 022B+2bytes ISO15693-CRC - answer: 14 or more bytes)
-		2C = Read Multiple Block Security Status (usage: 022C+1byte 1st block security to read+1byte last block security to read+2bytes ISO15693-CRC)
+    MANDATORY COMMANDS (all ISO15693 tags must support those)
+        01 = Inventory (usage: 260100+2bytes ISO15693-CRC - answer: 12bytes)
+        02 = Stay Quiet
+    OPTIONAL COMMANDS (not all tags support them)
+        20 = Read Block (usage: 0220+1byte block number+2bytes ISO15693-CRC - answer: 4bytes)
+        21 = Write Block (usage: 0221+1byte block number+4bytes data+2bytes ISO15693-CRC - answer: 4bytes)
+        22 = Lock Block
+        23 = Read Multiple Blocks (usage: 0223+1byte 1st block to read+1byte last block to read+2bytes ISO15693-CRC)
+        25 = Select
+        26 = Reset to Ready
+        27 = Write AFI
+        28 = Lock AFI
+        29 = Write DSFID
+        2A = Lock DSFID
+        2B = Get_System_Info (usage: 022B+2bytes ISO15693-CRC - answer: 14 or more bytes)
+        2C = Read Multiple Block Security Status (usage: 022C+1byte 1st block security to read+1byte last block security to read+2bytes ISO15693-CRC)
 
 EM Microelectronic CUSTOM COMMANDS
-	A5 = Active EAS (followed by 1byte IC Manufacturer code+1byte EAS type)
-	A7 = Write EAS ID (followed by 1byte IC Manufacturer code+2bytes EAS value)
-	B8 = Get Protection Status for a specific block (followed by 1byte IC Manufacturer code+1byte block number+1byte of how many blocks after the previous is needed the info)
-	E4 = Login (followed by 1byte IC Manufacturer code+4bytes password)
+    A5 = Active EAS (followed by 1byte IC Manufacturer code+1byte EAS type)
+    A7 = Write EAS ID (followed by 1byte IC Manufacturer code+2bytes EAS value)
+    B8 = Get Protection Status for a specific block (followed by 1byte IC Manufacturer code+1byte block number+1byte of how many blocks after the previous is needed the info)
+    E4 = Login (followed by 1byte IC Manufacturer code+4bytes password)
 NXP/Philips CUSTOM COMMANDS
-	A0 = Inventory Read
-	A1 = Fast Inventory Read
-	A2 = Set EAS
-	A3 = Reset EAS
-	A4 = Lock EAS
-	A5 = EAS Alarm
-	A6 = Password Protect EAS
-	A7 = Write EAS ID
-	A8 = Read EPC
-	B0 = Inventory Page Read
-	B1 = Fast Inventory Page Read
-	B2 = Get Random Number
-	B3 = Set Password
-	B4 = Write Password
-	B5 = Lock Password
-	B6 = Bit Password Protection
-	B7 = Lock Page Protection Condition
-	B8 = Get Multiple Block Protection Status
-	B9 = Destroy SLI
-	BA = Enable Privacy
-	BB = 64bit Password Protection
-	40 = Long Range CMD (Standard ISO/TR7003:1990)
+    A0 = Inventory Read
+    A1 = Fast Inventory Read
+    A2 = Set EAS
+    A3 = Reset EAS
+    A4 = Lock EAS
+    A5 = EAS Alarm
+    A6 = Password Protect EAS
+    A7 = Write EAS ID
+    A8 = Read EPC
+    B0 = Inventory Page Read
+    B1 = Fast Inventory Page Read
+    B2 = Get Random Number
+    B3 = Set Password
+    B4 = Write Password
+    B5 = Lock Password
+    B6 = Bit Password Protection
+    B7 = Lock Page Protection Condition
+    B8 = Get Multiple Block Protection Status
+    B9 = Destroy SLI
+    BA = Enable Privacy
+    BB = 64bit Password Protection
+    40 = Long Range CMD (Standard ISO/TR7003:1990)
 
 ISO 7816-4 Basic interindustry commands. For command APDU's.
-	B0 = READ BINARY
-	D0 = WRITE BINARY
-	D6 = UPDATE BINARY
-	0E = ERASE BINARY
-	B2 = READ RECORDS
-	D2 = WRITE RECORDS
-	E2 = APPEND RECORD
-	DC = UPDATE RECORD
-	CA = GET DATA
-	DA = PUT DATA
-	A4 = SELECT FILE
-	20 = VERIFY
-	88 = INTERNAL AUTHENTICATION
-	82 = EXTERNAL AUTHENTICATION
-	B4 = GET CHALLENGE
-	70 = MANAGE CHANNEL
+    B0 = READ BINARY
+    D0 = WRITE BINARY
+    D6 = UPDATE BINARY
+    0E = ERASE BINARY
+    B2 = READ RECORDS
+    D2 = WRITE RECORDS
+    E2 = APPEND RECORD
+    DC = UPDATE RECORD
+    CA = GET DATA
+    DA = PUT DATA
+    A4 = SELECT FILE
+    20 = VERIFY
+    88 = INTERNAL AUTHENTICATION
+    82 = EXTERNAL AUTHENTICATION
+    B4 = GET CHALLENGE
+    70 = MANAGE CHANNEL
 
-	For response APDU's
-	90 00 = OK
-	6x xx = ERROR
+    For response APDU's
+    90 00 = OK
+    6x xx = ERROR
 */
 // these cmds are adjusted to ISO15693 and Manchester encoding requests.
 // for instance ICLASS_CMD_SELECT  0x81 tells if ISO14443b/BPSK coding/106 kbits/s
@@ -134,62 +134,62 @@ ISO 7816-4 Basic interindustry commands. For command APDU's.
 
 #define ICLASS_CMD_SELECT           0x81
 #define ICLASS_CMD_PAGESEL          0x84
-#define ICLASS_CMD_UPDATE			0x87
+#define ICLASS_CMD_UPDATE           0x87
 #define ICLASS_CMD_READCHECK_KC     0x18
 #define ICLASS_CMD_READCHECK_KD     0x88
 #define ICLASS_CMD_ACT              0x8E
 
 
 
-#define ISO14443A_CMD_REQA       0x26
-#define ISO14443A_CMD_READBLOCK  0x30
-#define ISO14443A_CMD_WUPA       0x52
-#define ISO14443A_CMD_OPTS       0x35
+#define ISO14443A_CMD_REQA          0x26
+#define ISO14443A_CMD_READBLOCK     0x30
+#define ISO14443A_CMD_WUPA          0x52
+#define ISO14443A_CMD_OPTS          0x35
 #define ISO14443A_CMD_ANTICOLL_OR_SELECT     0x93
 #define ISO14443A_CMD_ANTICOLL_OR_SELECT_2   0x95
 #define ISO14443A_CMD_ANTICOLL_OR_SELECT_3   0x97
-#define ISO14443A_CMD_WRITEBLOCK 0xA0
-#define ISO14443A_CMD_HALT       0x50
-#define ISO14443A_CMD_RATS       0xE0
+#define ISO14443A_CMD_WRITEBLOCK    0xA0
+#define ISO14443A_CMD_HALT          0x50
+#define ISO14443A_CMD_RATS          0xE0
 
-#define MIFARE_AUTH_KEYA	    0x60
-#define MIFARE_AUTH_KEYB	    0x61
-#define MIFARE_MAGICWUPC1	    0x40
-#define MIFARE_MAGICWUPC2		0x43
-#define MIFARE_MAGICWIPEC		0x41
-#define MIFARE_CMD_INC          0xC0
-#define MIFARE_CMD_DEC          0xC1
-#define MIFARE_CMD_RESTORE      0xC2
-#define MIFARE_CMD_TRANSFER     0xB0
+#define MIFARE_AUTH_KEYA            0x60
+#define MIFARE_AUTH_KEYB            0x61
+#define MIFARE_MAGICWUPC1           0x40
+#define MIFARE_MAGICWUPC2           0x43
+#define MIFARE_MAGICWIPEC           0x41
+#define MIFARE_CMD_INC              0xC0
+#define MIFARE_CMD_DEC              0xC1
+#define MIFARE_CMD_RESTORE          0xC2
+#define MIFARE_CMD_TRANSFER         0xB0
 
-#define MIFARE_EV1_PERSONAL_UID 0x40
-#define MIFARE_EV1_SETMODE		0x43
+#define MIFARE_EV1_PERSONAL_UID     0x40
+#define MIFARE_EV1_SETMODE          0x43
 
-#define MIFARE_ULC_WRITE        0xA2
-//#define MIFARE_ULC__COMP_WRITE  0xA0
-#define MIFARE_ULC_AUTH_1       0x1A
-#define MIFARE_ULC_AUTH_2       0xAF
+#define MIFARE_ULC_WRITE            0xA2
+//#define MIFARE_ULC__COMP_WRITE      0xA0
+#define MIFARE_ULC_AUTH_1           0x1A
+#define MIFARE_ULC_AUTH_2           0xAF
 
-#define MIFARE_ULEV1_AUTH		0x1B
-#define MIFARE_ULEV1_VERSION	0x60
-#define MIFARE_ULEV1_FASTREAD	0x3A
-#define MIFARE_ULEV1_READ_CNT	0x39
-#define MIFARE_ULEV1_INCR_CNT	0xA5
-#define MIFARE_ULEV1_READSIG	0x3C
-#define MIFARE_ULEV1_CHECKTEAR	0x3E
-#define MIFARE_ULEV1_VCSL		0x4B
+#define MIFARE_ULEV1_AUTH           0x1B
+#define MIFARE_ULEV1_VERSION        0x60
+#define MIFARE_ULEV1_FASTREAD       0x3A
+#define MIFARE_ULEV1_READ_CNT       0x39
+#define MIFARE_ULEV1_INCR_CNT       0xA5
+#define MIFARE_ULEV1_READSIG        0x3C
+#define MIFARE_ULEV1_CHECKTEAR      0x3E
+#define MIFARE_ULEV1_VCSL           0x4B
 
 // New Mifare UL Nano commands.  Ref:: (https://www.nxp.com/docs/en/data-sheet/MF0UN_H_00.pdf)
-#define MIFARE_ULNANO_WRITESIG	0xA9
-#define MIFARE_ULNANO_LOCKSIF	0xAC
+#define MIFARE_ULNANO_WRITESIG      0xA9
+#define MIFARE_ULNANO_LOCKSIF       0xAC
 
 // mifare 4bit card answers
 #define CARD_ACK      0x0A  // 1010 - ACK
-#define CARD_NACK_IV  0x00	// 0000 - NACK, invalid argument (invalid page address)
-#define CARD_NACK_PA  0x01	// 0001 - NACK, parity / crc error
+#define CARD_NACK_IV  0x00  // 0000 - NACK, invalid argument (invalid page address)
+#define CARD_NACK_PA  0x01  // 0001 - NACK, parity / crc error
 #define CARD_NACK_NA  0x04  // 0100 - NACK, not allowed (command not allowed)
 #define CARD_NACK_TR  0x05  // 0101 - NACK, transmission error
-#define CARD_NACK_EE  0x07	// 0111 - NACK, EEPROM write error
+#define CARD_NACK_EE  0x07  // 0111 - NACK, EEPROM write error
 
 // Magic Generation 1, parameter "work flags"
 // bit 0 - need get UID
@@ -198,14 +198,14 @@ ISO 7816-4 Basic interindustry commands. For command APDU's.
 // bit 3 - turn on FPGA
 // bit 4 - turn off FPGA
 // bit 5 - set datain instead of issuing USB reply (called via ARM for StandAloneMode14a)
-#define MAGIC_UID 			0x01
-#define MAGIC_WUPC			0x02
-#define MAGIC_HALT			0x04
-#define MAGIC_INIT			0x08
-#define MAGIC_OFF			0x10
-#define MAGIC_DATAIN		0x20
-#define MAGIC_WIPE			0x40
-#define MAGIC_SINGLE		(MAGIC_WUPC | MAGIC_HALT | MAGIC_INIT | MAGIC_OFF) //0x1E
+#define MAGIC_UID                   0x01
+#define MAGIC_WUPC                  0x02
+#define MAGIC_HALT                  0x04
+#define MAGIC_INIT                  0x08
+#define MAGIC_OFF                   0x10
+#define MAGIC_DATAIN                0x20
+#define MAGIC_WIPE                  0x40
+#define MAGIC_SINGLE                (MAGIC_WUPC | MAGIC_HALT | MAGIC_INIT | MAGIC_OFF) //0x1E
 
 /**
 06 00 = INITIATE
@@ -229,8 +229,8 @@ ISO 7816-4 Basic interindustry commands. For command APDU's.
 #define ISO14443B_RESET        0x0C
 #define ISO14443B_COMPLETION   0x0F
 #define ISO14443B_AUTHENTICATE 0x0A
-#define ISO14443B_PING		   0xBA
-#define ISO14443B_PONG		   0xAB
+#define ISO14443B_PING         0xBA
+#define ISO14443B_PONG         0xAB
 
 //First byte is 26
 #define ISO15693_INVENTORY     0x01
@@ -251,31 +251,31 @@ ISO 7816-4 Basic interindustry commands. For command APDU's.
 
 
 // Topaz command set:
-#define	TOPAZ_REQA						0x26	// Request
-#define	TOPAZ_WUPA						0x52	// WakeUp
-#define	TOPAZ_RID						0x78	// Read ID
-#define	TOPAZ_RALL						0x00	// Read All (all bytes)
-#define	TOPAZ_READ						0x01	// Read (a single byte)
-#define	TOPAZ_WRITE_E					0x53	// Write-with-erase (a single byte)
-#define	TOPAZ_WRITE_NE					0x1a	// Write-no-erase (a single byte)
+#define TOPAZ_REQA                    0x26 // Request
+#define TOPAZ_WUPA                    0x52 // WakeUp
+#define TOPAZ_RID                     0x78 // Read ID
+#define TOPAZ_RALL                    0x00 // Read All (all bytes)
+#define TOPAZ_READ                    0x01 // Read (a single byte)
+#define TOPAZ_WRITE_E                 0x53 // Write-with-erase (a single byte)
+#define TOPAZ_WRITE_NE                0x1a // Write-no-erase (a single byte)
 // additional commands for Dynamic Memory Model
-#define TOPAZ_RSEG						0x10	// Read segment
-#define TOPAZ_READ8						0x02	// Read (eight bytes)
-#define TOPAZ_WRITE_E8					0x54	// Write-with-erase (eight bytes)
-#define TOPAZ_WRITE_NE8					0x1B	// Write-no-erase (eight bytes)
+#define TOPAZ_RSEG                    0x10 // Read segment
+#define TOPAZ_READ8                   0x02 // Read (eight bytes)
+#define TOPAZ_WRITE_E8                0x54 // Write-with-erase (eight bytes)
+#define TOPAZ_WRITE_NE8               0x1B // Write-no-erase (eight bytes)
 
 
 // Definitions of which protocol annotations there are available
-#define ISO_14443A	 0
-#define ICLASS		 1
-#define ISO_14443B	 2
-#define TOPAZ		 3
-#define ISO_7816_4   4
-#define MFDES		 5
-#define LEGIC		 6
-#define ISO_15693	 7
-#define FELICA		 8
-#define PROTO_MIFARE 9
+#define ISO_14443A       0
+#define ICLASS           1
+#define ISO_14443B       2
+#define TOPAZ            3
+#define ISO_7816_4       4
+#define MFDES            5
+#define LEGIC            6
+#define ISO_15693        7
+#define FELICA           8
+#define PROTO_MIFARE     9
 
 //-- Picopass fuses
 #define FUSE_FPERS   0x80
@@ -288,131 +288,131 @@ ISO 7816-4 Basic interindustry commands. For command APDU's.
 #define FUSE_RA      0x01
 
 // ISO 7816-4 Basic interindustry commands. For command APDU's.
-#define ISO7816_READ_BINARY				0xB0
-#define ISO7816_WRITE_BINARY			0xD0
-#define ISO7816_UPDATE_BINARY 			0xD6
-#define ISO7816_ERASE_BINARY 			0x0E
-#define ISO7816_READ_RECORDS 			0xB2
-#define ISO7816_WRITE_RECORDS 			0xD2
-#define ISO7816_APPEND_RECORD 			0xE2
-#define ISO7816_UPDATE_RECORD 			0xDC
-#define ISO7816_GET_DATA 				0xCA
-#define ISO7816_PUT_DATA 				0xDA
-#define ISO7816_SELECT_FILE 			0xA4
-#define ISO7816_VERIFY 					0x20
+#define ISO7816_READ_BINARY             0xB0
+#define ISO7816_WRITE_BINARY            0xD0
+#define ISO7816_UPDATE_BINARY           0xD6
+#define ISO7816_ERASE_BINARY            0x0E
+#define ISO7816_READ_RECORDS            0xB2
+#define ISO7816_WRITE_RECORDS           0xD2
+#define ISO7816_APPEND_RECORD           0xE2
+#define ISO7816_UPDATE_RECORD           0xDC
+#define ISO7816_GET_DATA                0xCA
+#define ISO7816_PUT_DATA                0xDA
+#define ISO7816_SELECT_FILE             0xA4
+#define ISO7816_VERIFY                  0x20
 #define ISO7816_INTERNAL_AUTHENTICATION 0x88
 #define ISO7816_EXTERNAL_AUTHENTICATION 0x82
-#define ISO7816_GET_CHALLENGE 			0x84
-#define ISO7816_MANAGE_CHANNEL 			0x70
+#define ISO7816_GET_CHALLENGE           0x84
+#define ISO7816_MANAGE_CHANNEL          0x70
 
-#define ISO7816_GET_RESPONSE			0xC0
-// ISO7816-4	For response APDU's
-#define ISO7816_OK						0x9000
-//	6x xx = ERROR
+#define ISO7816_GET_RESPONSE            0xC0
+// ISO7816-4 For response APDU's
+#define ISO7816_OK                      0x9000
+// 6x xx = ERROR
 
 // MIFARE DESFire command set:
-#define MFDES_CREATE_APPLICATION 		0xca
-#define MFDES_DELETE_APPLICATION 		0xda
-#define MFDES_GET_APPLICATION_IDS 		0x6a
-#define MFDES_SELECT_APPLICATION 		0x5a
-#define MFDES_FORMAT_PICC 				0xfc
-#define MFDES_GET_VERSION 				0x60
-#define MFDES_READ_DATA 				0xbd
-#define MFDES_WRITE_DATA				0x3d
-#define MFDES_GET_VALUE 				0x6c
-#define MFDES_CREDIT 					0x0c
-#define MFDES_DEBIT 					0xdc
-#define MFDES_LIMITED_CREDIT 			0x1c
-#define MFDES_WRITE_RECORD 				0x3b
-#define MFDES_READ_RECORDS 				0xbb
-#define MFDES_CLEAR_RECORD_FILE 		0xeb
-#define MFDES_COMMIT_TRANSACTION 		0xc7
-#define MFDES_ABORT_TRANSACTION 		0xa7
-#define MFDES_GET_FREE_MEMORY			0x6e
-#define MFDES_GET_FILE_IDS 				0x6f
-#define MFDES_GET_ISOFILE_IDS 			0x61
-#define MFDES_GET_FILE_SETTINGS 		0xf5
-#define MFDES_CHANGE_FILE_SETTINGS 		0x5f
-#define MFDES_CREATE_STD_DATA_FILE 		0xcd
-#define MFDES_CREATE_BACKUP_DATA_FILE 	0xcb
-#define MFDES_CREATE_VALUE_FILE 		0xcc
-#define MFDES_CREATE_LINEAR_RECORD_FILE	0xc1
-#define MFDES_CREATE_CYCLIC_RECORD_FILE	0xc0
-#define MFDES_DELETE_FILE 				0xdf
-#define MFDES_AUTHENTICATE	 			0x0a  // AUTHENTICATE_NATIVE
-#define MFDES_AUTHENTICATE_ISO 			0x1a  // AUTHENTICATE_STANDARD
-#define MFDES_AUTHENTICATE_AES 			0xaa
-#define MFDES_CHANGE_KEY_SETTINGS 		0x54
-#define MFDES_GET_KEY_SETTINGS 			0x45
-#define MFDES_CHANGE_KEY 				0xc4
-#define MFDES_GET_KEY_VERSION 			0x64
-#define MFDES_AUTHENTICATION_FRAME 		0xAF
+#define MFDES_CREATE_APPLICATION        0xca
+#define MFDES_DELETE_APPLICATION        0xda
+#define MFDES_GET_APPLICATION_IDS       0x6a
+#define MFDES_SELECT_APPLICATION        0x5a
+#define MFDES_FORMAT_PICC               0xfc
+#define MFDES_GET_VERSION               0x60
+#define MFDES_READ_DATA                 0xbd
+#define MFDES_WRITE_DATA                0x3d
+#define MFDES_GET_VALUE                 0x6c
+#define MFDES_CREDIT                    0x0c
+#define MFDES_DEBIT                     0xdc
+#define MFDES_LIMITED_CREDIT            0x1c
+#define MFDES_WRITE_RECORD              0x3b
+#define MFDES_READ_RECORDS              0xbb
+#define MFDES_CLEAR_RECORD_FILE         0xeb
+#define MFDES_COMMIT_TRANSACTION        0xc7
+#define MFDES_ABORT_TRANSACTION         0xa7
+#define MFDES_GET_FREE_MEMORY           0x6e
+#define MFDES_GET_FILE_IDS              0x6f
+#define MFDES_GET_ISOFILE_IDS           0x61
+#define MFDES_GET_FILE_SETTINGS         0xf5
+#define MFDES_CHANGE_FILE_SETTINGS      0x5f
+#define MFDES_CREATE_STD_DATA_FILE      0xcd
+#define MFDES_CREATE_BACKUP_DATA_FILE   0xcb
+#define MFDES_CREATE_VALUE_FILE         0xcc
+#define MFDES_CREATE_LINEAR_RECORD_FILE 0xc1
+#define MFDES_CREATE_CYCLIC_RECORD_FILE 0xc0
+#define MFDES_DELETE_FILE               0xdf
+#define MFDES_AUTHENTICATE              0x0a  // AUTHENTICATE_NATIVE
+#define MFDES_AUTHENTICATE_ISO          0x1a  // AUTHENTICATE_STANDARD
+#define MFDES_AUTHENTICATE_AES          0xaa
+#define MFDES_CHANGE_KEY_SETTINGS       0x54
+#define MFDES_GET_KEY_SETTINGS          0x45
+#define MFDES_CHANGE_KEY                0xc4
+#define MFDES_GET_KEY_VERSION           0x64
+#define MFDES_AUTHENTICATION_FRAME      0xAF
 
 // LEGIC Commands
-#define LEGIC_MIM_22	0x0D
-#define	LEGIC_MIM_256	0x1D
-#define	LEGIC_MIM_1024	0x3D
-#define LEGIC_ACK_22	0x19
-#define LEGIC_ACK_256	0x39
-#define	LEGIC_READ		0x01
-#define LEGIC_WRITE		0x00
+#define LEGIC_MIM_22                    0x0D
+#define	LEGIC_MIM_256                   0x1D
+#define	LEGIC_MIM_1024                  0x3D
+#define LEGIC_ACK_22                    0x19
+#define LEGIC_ACK_256                   0x39
+#define	LEGIC_READ                      0x01
+#define LEGIC_WRITE                     0x00
 
 void printIclassDumpInfo(uint8_t* iclass_dump);
 void getMemConfig(uint8_t mem_cfg, uint8_t chip_cfg, uint8_t *max_blk, uint8_t *app_areas, uint8_t *kb);
 
 /* T55x7 configuration register definitions */
-#define T55x7_POR_DELAY				0x00000001
-#define T55x7_ST_TERMINATOR			0x00000008
-#define T55x7_PWD					0x00000010
-#define T55x7_MAXBLOCK_SHIFT		5
-#define T55x7_AOR					0x00000200
-#define T55x7_PSKCF_RF_2			0
-#define T55x7_PSKCF_RF_4			0x00000400
-#define T55x7_PSKCF_RF_8			0x00000800
-#define T55x7_MODULATION_DIRECT		0
-#define T55x7_MODULATION_PSK1		0x00001000
-#define T55x7_MODULATION_PSK2		0x00002000
-#define T55x7_MODULATION_PSK3		0x00003000
-#define T55x7_MODULATION_FSK1		0x00004000
-#define T55x7_MODULATION_FSK2		0x00005000
-#define T55x7_MODULATION_FSK1a		0x00006000
-#define T55x7_MODULATION_FSK2a		0x00007000
-#define T55x7_MODULATION_MANCHESTER	0x00008000
-#define T55x7_MODULATION_BIPHASE	0x00010000
-#define T55x7_MODULATION_DIPHASE	0x00018000
-#define T55x7_X_MODE				0x00020000
-#define T55x7_BITRATE_RF_8			0
-#define T55x7_BITRATE_RF_16			0x00040000
-#define T55x7_BITRATE_RF_32			0x00080000
-#define T55x7_BITRATE_RF_40			0x000C0000
-#define T55x7_BITRATE_RF_50			0x00100000
-#define T55x7_BITRATE_RF_64			0x00140000
-#define T55x7_BITRATE_RF_100		0x00180000
-#define T55x7_BITRATE_RF_128		0x001C0000
-#define T55x7_TESTMODE_DISABLED		0x60000000
+#define T55x7_POR_DELAY                 0x00000001
+#define T55x7_ST_TERMINATOR             0x00000008
+#define T55x7_PWD                       0x00000010
+#define T55x7_MAXBLOCK_SHIFT            5
+#define T55x7_AOR                       0x00000200
+#define T55x7_PSKCF_RF_2                0
+#define T55x7_PSKCF_RF_4                0x00000400
+#define T55x7_PSKCF_RF_8                0x00000800
+#define T55x7_MODULATION_DIRECT         0
+#define T55x7_MODULATION_PSK1           0x00001000
+#define T55x7_MODULATION_PSK2           0x00002000
+#define T55x7_MODULATION_PSK3           0x00003000
+#define T55x7_MODULATION_FSK1           0x00004000
+#define T55x7_MODULATION_FSK2           0x00005000
+#define T55x7_MODULATION_FSK1a          0x00006000
+#define T55x7_MODULATION_FSK2a          0x00007000
+#define T55x7_MODULATION_MANCHESTER     0x00008000
+#define T55x7_MODULATION_BIPHASE        0x00010000
+#define T55x7_MODULATION_DIPHASE        0x00018000
+#define T55x7_X_MODE                    0x00020000
+#define T55x7_BITRATE_RF_8              0
+#define T55x7_BITRATE_RF_16             0x00040000
+#define T55x7_BITRATE_RF_32             0x00080000
+#define T55x7_BITRATE_RF_40             0x000C0000
+#define T55x7_BITRATE_RF_50             0x00100000
+#define T55x7_BITRATE_RF_64             0x00140000
+#define T55x7_BITRATE_RF_100            0x00180000
+#define T55x7_BITRATE_RF_128            0x001C0000
+#define T55x7_TESTMODE_DISABLED         0x60000000
 
 /* T5555 (Q5) configuration register definitions */
-#define T5555_ST_TERMINATOR			0x00000001
-#define T5555_MAXBLOCK_SHIFT		0x00000001
-#define T5555_MODULATION_MANCHESTER	0
-#define T5555_MODULATION_PSK1		0x00000010
-#define T5555_MODULATION_PSK2		0x00000020
-#define T5555_MODULATION_PSK3		0x00000030
-#define T5555_MODULATION_FSK1		0x00000040
-#define T5555_MODULATION_FSK2		0x00000050
-#define T5555_MODULATION_BIPHASE	0x00000060
-#define T5555_MODULATION_DIRECT		0x00000070
-#define T5555_INVERT_OUTPUT			0x00000080
-#define T5555_PSK_RF_2				0
-#define T5555_PSK_RF_4				0x00000100
-#define T5555_PSK_RF_8				0x00000200
-#define T5555_USE_PWD				0x00000400
-#define T5555_USE_AOR				0x00000800
-#define T5555_SET_BITRATE(x)		(((x-2)/2)<<12)
-#define T5555_GET_BITRATE(x)		((((x >> 12) & 0x3F)*2)+2)
-#define T5555_BITRATE_SHIFT			12 //(RF=2n+2)   ie 64=2*0x1F+2   or n = (RF-2)/2
-#define T5555_FAST_WRITE			0x00004000
-#define T5555_PAGE_SELECT			0x00008000
+#define T5555_ST_TERMINATOR             0x00000001
+#define T5555_MAXBLOCK_SHIFT            0x00000001
+#define T5555_MODULATION_MANCHESTER     0
+#define T5555_MODULATION_PSK1           0x00000010
+#define T5555_MODULATION_PSK2           0x00000020
+#define T5555_MODULATION_PSK3           0x00000030
+#define T5555_MODULATION_FSK1           0x00000040
+#define T5555_MODULATION_FSK2           0x00000050
+#define T5555_MODULATION_BIPHASE        0x00000060
+#define T5555_MODULATION_DIRECT         0x00000070
+#define T5555_INVERT_OUTPUT             0x00000080
+#define T5555_PSK_RF_2                  0
+#define T5555_PSK_RF_4                  0x00000100
+#define T5555_PSK_RF_8                  0x00000200
+#define T5555_USE_PWD                   0x00000400
+#define T5555_USE_AOR                   0x00000800
+#define T5555_SET_BITRATE(x)            (((x-2)/2)<<12)
+#define T5555_GET_BITRATE(x)            ((((x >> 12) & 0x3F)*2)+2)
+#define T5555_BITRATE_SHIFT             12 //(RF=2n+2)   ie 64=2*0x1F+2   or n = (RF-2)/2
+#define T5555_FAST_WRITE                0x00004000
+#define T5555_PAGE_SELECT               0x00008000
 
 #define T55XX_WRITE_TIMEOUT 1500
 
@@ -420,152 +420,152 @@ uint32_t GetT55xxClockBit(uint32_t clock);
 
 
 // em4x05 & em4x69 chip configuration register definitions
-#define EM4x05_GET_BITRATE(x)         (((x & 0x3F)*2)+2)
-#define EM4x05_SET_BITRATE(x)         ((x-2)/2)
-#define EM4x05_MODULATION_NRZ         0x00000000
-#define EM4x05_MODULATION_MANCHESTER  0x00000040
-#define EM4x05_MODULATION_BIPHASE     0x00000080
-#define EM4x05_MODULATION_MILLER      0x000000C0 //not supported by all 4x05/4x69 chips
-#define EM4x05_MODULATION_PSK1        0x00000100 //not supported by all 4x05/4x69 chips
-#define EM4x05_MODULATION_PSK2        0x00000140 //not supported by all 4x05/4x69 chips
-#define EM4x05_MODULATION_PSK3        0x00000180 //not supported by all 4x05/4x69 chips
-#define EM4x05_MODULATION_FSK1        0x00000200 //not supported by all 4x05/4x69 chips
-#define EM4x05_MODULATION_FSK2        0x00000240 //not supported by all 4x05/4x69 chips
-#define EM4x05_PSK_RF_2               0
-#define EM4x05_PSK_RF_4               0x00000400
-#define EM4x05_PSK_RF_8               0x00000800
-#define EM4x05_MAXBLOCK_SHIFT         14
-#define EM4x05_FIRST_USER_BLOCK       5
-#define EM4x05_SET_NUM_BLOCKS(x)      ((x+5-1)<<14) //# of blocks sent during default read mode
-#define EM4x05_GET_NUM_BLOCKS(x)      (((x>>14) & 0xF)-5+1)
-#define EM4x05_READ_LOGIN_REQ         1<<18
-#define EM4x05_READ_HK_LOGIN_REQ      1<<19
-#define EM4x05_WRITE_LOGIN_REQ        1<<20
-#define EM4x05_WRITE_HK_LOGIN_REQ     1<<21
-#define EM4x05_READ_AFTER_WRITE       1<<22
-#define EM4x05_DISABLE_ALLOWED        1<<23
-#define EM4x05_READER_TALK_FIRST      1<<24
+#define EM4x05_GET_BITRATE(x)           (((x & 0x3F)*2)+2)
+#define EM4x05_SET_BITRATE(x)           ((x-2)/2)
+#define EM4x05_MODULATION_NRZ           0x00000000
+#define EM4x05_MODULATION_MANCHESTER    0x00000040
+#define EM4x05_MODULATION_BIPHASE       0x00000080
+#define EM4x05_MODULATION_MILLER        0x000000C0 //not supported by all 4x05/4x69 chips
+#define EM4x05_MODULATION_PSK1          0x00000100 //not supported by all 4x05/4x69 chips
+#define EM4x05_MODULATION_PSK2          0x00000140 //not supported by all 4x05/4x69 chips
+#define EM4x05_MODULATION_PSK3          0x00000180 //not supported by all 4x05/4x69 chips
+#define EM4x05_MODULATION_FSK1          0x00000200 //not supported by all 4x05/4x69 chips
+#define EM4x05_MODULATION_FSK2          0x00000240 //not supported by all 4x05/4x69 chips
+#define EM4x05_PSK_RF_2                 0
+#define EM4x05_PSK_RF_4                 0x00000400
+#define EM4x05_PSK_RF_8                 0x00000800
+#define EM4x05_MAXBLOCK_SHIFT           14
+#define EM4x05_FIRST_USER_BLOCK         5
+#define EM4x05_SET_NUM_BLOCKS(x)        ((x+5-1)<<14) //# of blocks sent during default read mode
+#define EM4x05_GET_NUM_BLOCKS(x)        (((x>>14) & 0xF)-5+1)
+#define EM4x05_READ_LOGIN_REQ           1<<18
+#define EM4x05_READ_HK_LOGIN_REQ        1<<19
+#define EM4x05_WRITE_LOGIN_REQ          1<<20
+#define EM4x05_WRITE_HK_LOGIN_REQ       1<<21
+#define EM4x05_READ_AFTER_WRITE         1<<22
+#define EM4x05_DISABLE_ALLOWED          1<<23
+#define EM4x05_READER_TALK_FIRST        1<<24
 
 
 // FeliCa protocol
-#define FELICA_POLL_REQ			0x00
-#define FELICA_POLL_ACK			0x01
+#define FELICA_POLL_REQ                 0x00
+#define FELICA_POLL_ACK                 0x01
 
-#define FELICA_REQSRV_REQ		0x02
-#define FELICA_REQSRV_ACK		0x03
+#define FELICA_REQSRV_REQ               0x02
+#define FELICA_REQSRV_ACK               0x03
 
-#define FELICA_REQRESP_REQ		0x04
-#define FELICA_REQRESP_ACK		0x05
+#define FELICA_REQRESP_REQ              0x04
+#define FELICA_REQRESP_ACK              0x05
 
-#define FELICA_RDBLK_REQ		0x06
-#define FELICA_RDBLK_ACK		0x07
+#define FELICA_RDBLK_REQ                0x06
+#define FELICA_RDBLK_ACK                0x07
 
-#define FELICA_WRTBLK_REQ		0x08
-#define FELICA_WRTBLK_ACK		0x09
+#define FELICA_WRTBLK_REQ               0x08
+#define FELICA_WRTBLK_ACK               0x09
 
-#define FELICA_SRCHSYSCODE_REQ	0x0a
-#define FELICA_SRCHSYSCODE_ACK	0x0b
+#define FELICA_SRCHSYSCODE_REQ          0x0a
+#define FELICA_SRCHSYSCODE_ACK          0x0b
 
-#define FELICA_REQSYSCODE_REQ	0x0c
-#define FELICA_REQSYSCODE_ACK	0x0d
+#define FELICA_REQSYSCODE_REQ           0x0c
+#define FELICA_REQSYSCODE_ACK           0x0d
 
-#define FELICA_AUTH1_REQ		0x10
-#define FELICA_AUTH1_ACK		0x11
+#define FELICA_AUTH1_REQ                0x10
+#define FELICA_AUTH1_ACK                0x11
 
-#define FELICA_AUTH2_REQ		0x12
-#define FELICA_AUTH2_ACK		0x13
+#define FELICA_AUTH2_REQ                0x12
+#define FELICA_AUTH2_ACK                0x13
 
-#define FELICA_RDSEC_REQ		0x14
-#define FELICA_RDSEC_ACK		0x15
+#define FELICA_RDSEC_REQ                0x14
+#define FELICA_RDSEC_ACK                0x15
 
-#define FELICA_WRTSEC_REQ		0x16
-#define FELICA_WRTSEC_ACK		0x17
+#define FELICA_WRTSEC_REQ               0x16
+#define FELICA_WRTSEC_ACK               0x17
 
-#define FELICA_REQSRV2_REQ		0x32
-#define FELICA_REQSRV2_ACK		0x33
+#define FELICA_REQSRV2_REQ              0x32
+#define FELICA_REQSRV2_ACK              0x33
 
-#define FELICA_GETSTATUS_REQ	0x38
-#define FELICA_GETSTATUS_ACK	0x39
+#define FELICA_GETSTATUS_REQ            0x38
+#define FELICA_GETSTATUS_ACK            0x39
 
-#define FELICA_OSVER_REQ		0x3c
-#define FELICA_OSVER_ACK		0x3d
+#define FELICA_OSVER_REQ                0x3c
+#define FELICA_OSVER_ACK                0x3d
 
-#define FELICA_RESET_MODE_REQ	0x3e
-#define FELICA_RESET_MODE_ACK	0x3f
+#define FELICA_RESET_MODE_REQ           0x3e
+#define FELICA_RESET_MODE_ACK           0x3f
 
-#define FELICA_AUTH1V2_REQ		0x40
-#define FELICA_AUTH1V2_ACK		0x41
+#define FELICA_AUTH1V2_REQ              0x40
+#define FELICA_AUTH1V2_ACK              0x41
 
-#define FELICA_AUTH2V2_REQ		0x42
-#define FELICA_AUTH2V2_ACK		0x43
+#define FELICA_AUTH2V2_REQ              0x42
+#define FELICA_AUTH2V2_ACK              0x43
 
-#define FELICA_RDSECV2_REQ		0x44
-#define FELICA_RDSECV2_ACK		0x45
-#define FELICA_WRTSECV2_REQ		0x46
-#define FELICA_WRTSECV2_ACK		0x47
+#define FELICA_RDSECV2_REQ              0x44
+#define FELICA_RDSECV2_ACK              0x45
+#define FELICA_WRTSECV2_REQ             0x46
+#define FELICA_WRTSECV2_ACK             0x47
 
-#define FELICA_UPDATE_RNDID_REQ 0x4C
-#define FELICA_UPDATE_RNDID_ACK 0x4D
+#define FELICA_UPDATE_RNDID_REQ         0x4C
+#define FELICA_UPDATE_RNDID_ACK         0x4D
 
 // FeliCa SYSTEM list
-#define SYSTEMCODE_ANY  		0xffff // ANY
-#define SYSTEMCODE_FELICA_LITE 	0x88b4 // FeliCa Lite
-#define SYSTEMCODE_COMMON 		0xfe00 // Common
-#define SYSTEMCODE_EDY			0xfe00 // Edy
-#define SYSTEMCODE_CYBERNE		0x0003 // Cyberne
-#define SYSTEMCODE_SUICA		0x0003 // Suica
-#define SYSTEMCODE_PASMO		0x0003 // Pasmo
+#define SYSTEMCODE_ANY                  0xffff // ANY
+#define SYSTEMCODE_FELICA_LITE          0x88b4 // FeliCa Lite
+#define SYSTEMCODE_COMMON               0xfe00 // Common
+#define SYSTEMCODE_EDY                  0xfe00 // Edy
+#define SYSTEMCODE_CYBERNE              0x0003 // Cyberne
+#define SYSTEMCODE_SUICA                0x0003 // Suica
+#define SYSTEMCODE_PASMO                0x0003 // Pasmo
 
 //FeliCa Service list Suica/pasmo (little endian)
-#define SERVICE_SUICA_INOUT				0x108f // SUICA/PASMO
-#define SERVICE_SUICA_HISTORY			0x090f // SUICA/PASMO
-#define SERVICE_FELICA_LITE_READONLY	0x0b00 // FeliCa Lite RO
-#define SERVICE_FELICA_LITE_READWRITE	0x0900 // FeliCa Lite RW
+#define SERVICE_SUICA_INOUT             0x108f // SUICA/PASMO
+#define SERVICE_SUICA_HISTORY           0x090f // SUICA/PASMO
+#define SERVICE_FELICA_LITE_READONLY    0x0b00 // FeliCa Lite RO
+#define SERVICE_FELICA_LITE_READWRITE   0x0900 // FeliCa Lite RW
 
 // Calypso protocol
-#define CALYPSO_GET_RESPONSE   0xC0
-#define CALYPSO_SELECT         0xA4
-#define CALYPSO_INVALIDATE     0x04
-#define CALYPSO_REHABILITATE   0x44
-#define CALYPSO_APPEND_RECORD  0xE2
-#define CALYPSO_DECREASE       0x30
-#define CALYPSO_INCREASE       0x32
-#define CALYPSO_READ_BINARY    0xB0
-#define CALYPSO_READ_RECORD    0xB2
-#define CALYPSO_UPDATE_BINARY  0xD6
-#define CALYPSO_UPDATE_RECORD  0xDC
-#define CALYPSO_WRITE_RECORD   0xD2
-#define CALYPSO_OPEN_SESSION   0x8A
-#define CALYPSO_CLOSE_SESSION  0x8E
-#define CALYPSO_GET_CHALLENGE  0x84
-#define CALYPSO_CHANGE_PIN     0xD8
-#define CALYPSO_VERIFY_PIN     0x20
-#define CALYPSO_SV_GET         0x7C
-#define CALYPSO_SV_DEBIT       0xBA
-#define CALYPSO_SV_RELOAD      0xB8
-#define CALYPSO_SV_UN_DEBIT    0xBC
-#define CALYPSO_SAM_SV_DEBIT   0x54
-#define CALYPSO_SAM_SV_RELOAD  0x56
+#define CALYPSO_GET_RESPONSE            0xC0
+#define CALYPSO_SELECT                  0xA4
+#define CALYPSO_INVALIDATE              0x04
+#define CALYPSO_REHABILITATE            0x44
+#define CALYPSO_APPEND_RECORD           0xE2
+#define CALYPSO_DECREASE                0x30
+#define CALYPSO_INCREASE                0x32
+#define CALYPSO_READ_BINARY             0xB0
+#define CALYPSO_READ_RECORD             0xB2
+#define CALYPSO_UPDATE_BINARY           0xD6
+#define CALYPSO_UPDATE_RECORD           0xDC
+#define CALYPSO_WRITE_RECORD            0xD2
+#define CALYPSO_OPEN_SESSION            0x8A
+#define CALYPSO_CLOSE_SESSION           0x8E
+#define CALYPSO_GET_CHALLENGE           0x84
+#define CALYPSO_CHANGE_PIN              0xD8
+#define CALYPSO_VERIFY_PIN              0x20
+#define CALYPSO_SV_GET                  0x7C
+#define CALYPSO_SV_DEBIT                0xBA
+#define CALYPSO_SV_RELOAD               0xB8
+#define CALYPSO_SV_UN_DEBIT             0xBC
+#define CALYPSO_SAM_SV_DEBIT            0x54
+#define CALYPSO_SAM_SV_RELOAD           0x56
 
 // iclass / picopass chip config structures and shared routines
 typedef struct {
-	uint8_t app_limit;      //[8]
-	uint8_t otp[2];         //[9-10]
-	uint8_t block_writelock;//[11]
-	uint8_t chip_config;    //[12]
-	uint8_t mem_config;     //[13]
-	uint8_t eas;            //[14]
-	uint8_t fuses;          //[15]
+    uint8_t app_limit;      //[8]
+    uint8_t otp[2];         //[9-10]
+    uint8_t block_writelock;//[11]
+    uint8_t chip_config;    //[12]
+    uint8_t mem_config;     //[13]
+    uint8_t eas;            //[14]
+    uint8_t fuses;          //[15]
 } picopass_conf_block;
 
 
 typedef struct {
-	uint8_t csn[8];
-	picopass_conf_block conf;
-	uint8_t epurse[8];
-	uint8_t key_d[8];
-	uint8_t key_c[8];
-	uint8_t app_issuer_area[8];
+    uint8_t csn[8];
+    picopass_conf_block conf;
+    uint8_t epurse[8];
+    uint8_t key_d[8];
+    uint8_t key_c[8];
+    uint8_t app_issuer_area[8];
 } picopass_hdr;
 
 
diff --git a/common/random.c b/common/random.c
index 96cdbb628..060f0bd7a 100644
--- a/common/random.c
+++ b/common/random.c
@@ -14,17 +14,17 @@ static uint32_t g_nextrandom;
  */
 
 inline void fast_prand(){
-	fast_prandEx(GetTickCount());
+    fast_prandEx(GetTickCount());
 }
 inline void fast_prandEx(uint32_t seed) {
-	g_nextrandom = seed;
+    g_nextrandom = seed;
 }
 
 uint32_t prand() {
-//	g_nextrandom *= 6364136223846793005;
-//	g_nextrandom += 1;
+// g_nextrandom *= 6364136223846793005;
+// g_nextrandom += 1;
 //return (uint32_t)(g_nextrandom >> 32) % 0xffffffff;
-	g_nextrandom = (214013 * g_nextrandom + 2531011);
-	return (g_nextrandom>>16) & 0xFFFF;
+    g_nextrandom = (214013 * g_nextrandom + 2531011);
+    return (g_nextrandom>>16) & 0xFFFF;
 }
 
diff --git a/common/tea.c b/common/tea.c
index b3e1a39c1..287a12de9 100644
--- a/common/tea.c
+++ b/common/tea.c
@@ -13,52 +13,52 @@
 
 void tea_encrypt(uint8_t *v, uint8_t *key) {
 
-	uint32_t a=0,b=0,c=0,d=0,y=0,z=0;
-	uint32_t sum = 0;
-	uint8_t n = ROUNDS;
+    uint32_t a=0,b=0,c=0,d=0,y=0,z=0;
+    uint32_t sum = 0;
+    uint8_t n = ROUNDS;
 
-	//key
-	a = bytes_to_num(key, 4);
-	b = bytes_to_num(key+4, 4);
-	c = bytes_to_num(key+8, 4);
-	d = bytes_to_num(key+12, 4);
+    //key
+    a = bytes_to_num(key, 4);
+    b = bytes_to_num(key+4, 4);
+    c = bytes_to_num(key+8, 4);
+    d = bytes_to_num(key+12, 4);
 
-	//input
-	y = bytes_to_num(v, 4);
-	z = bytes_to_num(v+4, 4);
+    //input
+    y = bytes_to_num(v, 4);
+    z = bytes_to_num(v+4, 4);
 
-	while ( n-- > 0 ) {
-		sum += DELTA;
-		y += ((z << 4) + a) ^ (z + sum) ^ ((z >> 5) + b);
-		z += ((y << 4) + c) ^ (y + sum) ^ ((y >> 5) + d);
-	}
+    while ( n-- > 0 ) {
+        sum += DELTA;
+        y += ((z << 4) + a) ^ (z + sum) ^ ((z >> 5) + b);
+        z += ((y << 4) + c) ^ (y + sum) ^ ((y >> 5) + d);
+    }
 
-	num_to_bytes(y, 4, v);
-	num_to_bytes(z, 4, v+4);
+    num_to_bytes(y, 4, v);
+    num_to_bytes(z, 4, v+4);
 }
 
 void tea_decrypt(uint8_t *v, uint8_t *key) {
 
-	uint32_t a=0,b=0,c=0,d=0,y=0,z=0;
-	uint32_t sum = SUM;
-	uint8_t n = ROUNDS;
+    uint32_t a=0,b=0,c=0,d=0,y=0,z=0;
+    uint32_t sum = SUM;
+    uint8_t n = ROUNDS;
 
-	//key
-	a = bytes_to_num(key, 4);
-	b = bytes_to_num(key+4, 4);
-	c = bytes_to_num(key+8, 4);
-	d = bytes_to_num(key+12, 4);
+    //key
+    a = bytes_to_num(key, 4);
+    b = bytes_to_num(key+4, 4);
+    c = bytes_to_num(key+8, 4);
+    d = bytes_to_num(key+12, 4);
 
-	//input
-	y = bytes_to_num(v, 4);
-	z = bytes_to_num(v+4, 4);
+    //input
+    y = bytes_to_num(v, 4);
+    z = bytes_to_num(v+4, 4);
 
-	/* sum = delta<<5, in general sum = delta * n */
-	while ( n-- > 0 ) {
-		z -= ((y << 4) + c) ^ (y + sum) ^ ((y >> 5) + d);
-		y -= ((z << 4) + a) ^ (z + sum) ^ ((z >> 5) + b);
-		sum -= DELTA;
-	}
-	num_to_bytes(y, 4, v);
-	num_to_bytes(z, 4, v+4);
+    /* sum = delta<<5, in general sum = delta * n */
+    while ( n-- > 0 ) {
+        z -= ((y << 4) + c) ^ (y + sum) ^ ((y >> 5) + d);
+        y -= ((z << 4) + a) ^ (z + sum) ^ ((z >> 5) + b);
+        sum -= DELTA;
+    }
+    num_to_bytes(y, 4, v);
+    num_to_bytes(z, 4, v+4);
 }
diff --git a/common/usart.c b/common/usart.c
index c62e3c8f6..9371e6243 100644
--- a/common/usart.c
+++ b/common/usart.c
@@ -11,19 +11,19 @@
 #include "usart.h"
 #include "string.h"
 
-#define AT91_BAUD_RATE				115200
+#define AT91_BAUD_RATE 115200
 
-volatile AT91PS_USART pUS1	= AT91C_BASE_US1;
-volatile AT91PS_PIO pPIO	= AT91C_BASE_PIOA;
-volatile AT91PS_PDC pPDC 	= AT91C_BASE_PDC_US1;
+volatile AT91PS_USART pUS1 = AT91C_BASE_US1;
+volatile AT91PS_PIO pPIO   = AT91C_BASE_PIOA;
+volatile AT91PS_PDC pPDC   = AT91C_BASE_PDC_US1;
 
 /*
 void usart_close(void) {
     // Reset the USART mode
-	pUS1->US_MR = 0;
+    pUS1->US_MR = 0;
 
     // Reset the baud rate divisor register
-	pUS1->US_BRGR = 0;
+    pUS1->US_BRGR = 0;
 
     // Reset the Timeguard Register
     pUS1->US_TTGR = 0;
@@ -32,7 +32,7 @@ void usart_close(void) {
     pUS1->US_IDR = 0xFFFFFFFF;
 
     // Abort the Peripheral Data Transfers
-	pUS1->US_PTCR = AT91C_PDC_RXTDIS | AT91C_PDC_TXTDIS;
+    pUS1->US_PTCR = AT91C_PDC_RXTDIS | AT91C_PDC_TXTDIS;
 
     // Disable receiver and transmitter and stop any activity immediately
     pUS1->US_CR = AT91C_US_TXDIS | AT91C_US_RXDIS | AT91C_US_RSTTX | AT91C_US_RSTRX;
@@ -46,12 +46,12 @@ static uint8_t us_outbuf[sizeof(UsbCommand)];
 /// \param len  Size of the data buffer (in bytes).
 inline int16_t usart_readbuffer(uint8_t *data, size_t len) {
 
-	// Check if the first PDC bank is free
+    // Check if the first PDC bank is free
     if (!(pUS1->US_RCR)) {
         pUS1->US_RPR = (uint32_t)data;
         pUS1->US_RCR = len;
 
-		pUS1->US_PTCR = AT91C_PDC_RXTEN | AT91C_PDC_TXTDIS;
+        pUS1->US_PTCR = AT91C_PDC_RXTEN | AT91C_PDC_TXTDIS;
         return 2;
     }
     // Check if the second PDC bank is free
@@ -59,7 +59,7 @@ inline int16_t usart_readbuffer(uint8_t *data, size_t len) {
         pUS1->US_RNPR = (uint32_t)data;
         pUS1->US_RNCR = len;
 
-		pUS1->US_PTCR = AT91C_PDC_RXTEN | AT91C_PDC_TXTDIS;
+        pUS1->US_PTCR = AT91C_PDC_RXTEN | AT91C_PDC_TXTDIS;
         return 1;
     } else {
         return 0;
@@ -72,21 +72,21 @@ inline int16_t usart_writebuffer(uint8_t *data, size_t len) {
 
     // Check if the first PDC bank is free
     if (!(pUS1->US_TCR)) {
-		memcpy(us_outbuf, data, len);
-		pUS1->US_TPR = (uint32_t)us_outbuf;
+        memcpy(us_outbuf, data, len);
+        pUS1->US_TPR = (uint32_t)us_outbuf;
         pUS1->US_TCR = sizeof(us_outbuf);
 
-		pUS1->US_PTCR = AT91C_PDC_TXTEN | AT91C_PDC_RXTDIS;
-		return 2;
+        pUS1->US_PTCR = AT91C_PDC_TXTEN | AT91C_PDC_RXTDIS;
+        return 2;
     }
     // Check if the second PDC bank is free
     else if (!(pUS1->US_TNCR)) {
-		memcpy(us_outbuf, data, len);
+        memcpy(us_outbuf, data, len);
         pUS1->US_TNPR = (uint32_t)us_outbuf;
         pUS1->US_TNCR = sizeof(us_outbuf);
 
-		pUS1->US_PTCR = AT91C_PDC_TXTEN | AT91C_PDC_RXTDIS;
-		return 1;
+        pUS1->US_PTCR = AT91C_PDC_TXTEN | AT91C_PDC_RXTDIS;
+        return 1;
     } else {
         return 0;
     }
@@ -94,21 +94,21 @@ inline int16_t usart_writebuffer(uint8_t *data, size_t len) {
 
 void usart_init(void) {
 
-	// disable & reset receiver / transmitter for configuration
-	pUS1->US_CR = (AT91C_US_RSTRX | AT91C_US_RSTTX | AT91C_US_RXDIS | AT91C_US_TXDIS);
+    // disable & reset receiver / transmitter for configuration
+    pUS1->US_CR = (AT91C_US_RSTRX | AT91C_US_RSTTX | AT91C_US_RXDIS | AT91C_US_TXDIS);
 
-	//enable the USART1 Peripheral clock
-	AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_US1);
+    //enable the USART1 Peripheral clock
+    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_US1);
 
-	// disable PIO control of receive / transmit pins
-	pPIO->PIO_PDR |= (AT91C_PA21_RXD1 | AT91C_PA22_TXD1);
+    // disable PIO control of receive / transmit pins
+    pPIO->PIO_PDR |= (AT91C_PA21_RXD1 | AT91C_PA22_TXD1);
 
-	// enable peripheral mode A on receive / transmit pins
-	pPIO->PIO_ASR |= (AT91C_PA21_RXD1 | AT91C_PA22_TXD1);
-	pPIO->PIO_BSR = 0;
+    // enable peripheral mode A on receive / transmit pins
+    pPIO->PIO_ASR |= (AT91C_PA21_RXD1 | AT91C_PA22_TXD1);
+    pPIO->PIO_BSR = 0;
 
-	// enable pull-up on receive / transmit pins (see 31.5.1 I/O Lines)
-	pPIO->PIO_PPUER |= (AT91C_PA21_RXD1 | AT91C_PA22_TXD1);
+    // enable pull-up on receive / transmit pins (see 31.5.1 I/O Lines)
+    pPIO->PIO_PPUER |= (AT91C_PA21_RXD1 | AT91C_PA22_TXD1);
 
     // set mode
     pUS1->US_MR = AT91C_US_USMODE_NORMAL |      // normal mode
@@ -118,26 +118,26 @@ void usart_init(void) {
                AT91C_US_NBSTOP_1_BIT |          // 1 stop bit
                AT91C_US_CHMODE_NORMAL;          // channel mode: normal
 
-	// all interrupts disabled
-	pUS1->US_IDR = 0xFFFF;
+    // all interrupts disabled
+    pUS1->US_IDR = 0xFFFF;
 
-	// iceman,  setting 115200 doesn't work. Only speed I got to work is 9600.
-	// something fishy with the AT91SAM7S512 USART..  Or I missed something
-	// For a nice detailed sample, interrupt driven but still relevant.
-	// See https://www.sparkfun.com/datasheets/DevTools/SAM7/at91sam7%20serial%20communications.pdf
+    // iceman,  setting 115200 doesn't work. Only speed I got to work is 9600.
+    // something fishy with the AT91SAM7S512 USART..  Or I missed something
+    // For a nice detailed sample, interrupt driven but still relevant.
+    // See https://www.sparkfun.com/datasheets/DevTools/SAM7/at91sam7%20serial%20communications.pdf
 
-	// set baudrate to 115200
-	// 115200 * 16 == 1843200
-	//
-	//pUS1->US_BRGR = (48UL*1000*1000) / (9600*16);
-	pUS1->US_BRGR =  48054841 / (9600 << 4);
+    // set baudrate to 115200
+    // 115200 * 16 == 1843200
+    //
+    //pUS1->US_BRGR = (48UL*1000*1000) / (9600*16);
+    pUS1->US_BRGR =  48054841 / (9600 << 4);
 
-	// Write the Timeguard Register
-	pUS1->US_TTGR = 0;
-	pUS1->US_RTOR = 0;
-	pUS1->US_FIDI = 0;
-	pUS1->US_IF = 0;
+    // Write the Timeguard Register
+    pUS1->US_TTGR = 0;
+    pUS1->US_RTOR = 0;
+    pUS1->US_FIDI = 0;
+    pUS1->US_IF = 0;
 
-	// re-enable receiver / transmitter
-	pUS1->US_CR = (AT91C_US_RXEN | AT91C_US_TXEN);
+    // re-enable receiver / transmitter
+    pUS1->US_CR = (AT91C_US_RXEN | AT91C_US_TXEN);
 }
\ No newline at end of file
diff --git a/common/usb_cdc.c b/common/usb_cdc.c
index b1acff692..b60ec8176 100644
--- a/common/usb_cdc.c
+++ b/common/usb_cdc.c
@@ -64,21 +64,21 @@ AT91SAM7S256  USB Device Port
 #define USB_DESCRIPTOR_OTHER_SPEED      0x07    // DescriptorType for a Other Speed Configuration.
 #define USB_DESCRIPTOR_INTERFACE_POWER  0x08    // DescriptorType for Interface Power.
 #define USB_DESCRIPTOR_OTG              0x09    // DescriptorType for an OTG Descriptor.
-#define USB_DESCRIPTOR_IAD				0x0B	// DescriptorType for a Interface Association Descriptor
+#define USB_DESCRIPTOR_IAD              0x0B    // DescriptorType for a Interface Association Descriptor
 #define USB_DESCRIPTOR_TYPE_BO          0x0F    // DescriptorType for a BOS Descriptor.
 
 /* Configuration Attributes */
 #define _DEFAULT    (0x01<<7)       //Default Value (Bit 7 is set)
 #define _SELF       (0x01<<6)       //Self-powered (Supports if set)
 #define _RWU        (0x01<<5)       //Remote Wakeup (Supports if set)
-#define _HNP	    (0x01 << 1)     //HNP (Supports if set)
-#define _SRP	  	(0x01)		    //SRP (Supports if set)
+#define _HNP        (0x01 << 1)     //HNP (Supports if set)
+#define _SRP        (0x01)          //SRP (Supports if set)
 
 /* Endpoint Transfer Type */
 #define _CTRL       0x00            //Control Transfer
 #define _ISO        0x01            //Isochronous Transfer
-#define _BULK       0x02 			//Bulk Transfer
-#define _INTERRUPT  0x03			//Interrupt Transfer
+#define _BULK       0x02            //Bulk Transfer
+#define _INTERRUPT  0x03            //Interrupt Transfer
 
 // (bit7 | 0 = OUT, 1 = IN)
 #define _EP_IN      0x80
@@ -92,12 +92,12 @@ AT91SAM7S256  USB Device Port
 
 
 /* WCID specific Request Code */
-#define MS_OS_DESCRIPTOR_INDEX			0xEE
-#define MS_VENDOR_CODE					0x1C
+#define MS_OS_DESCRIPTOR_INDEX          0xEE
+#define MS_VENDOR_CODE                  0x1C
 #define MS_EXTENDED_COMPAT_ID           0x04
 #define MS_EXTENDED_PROPERTIES          0x05
-#define MS_WCID_GET_DESCRIPTOR			0xC0
-#define MS_WCID_GET_FEATURE_DESCRIPTOR	0xC1
+#define MS_WCID_GET_DESCRIPTOR          0xC0
+#define MS_WCID_GET_FEATURE_DESCRIPTOR  0xC1
 
 /* USB standard request code */
 #define STD_GET_STATUS_ZERO           0x0080
@@ -132,275 +132,275 @@ uint8_t btConnection    = 0;
 uint8_t btReceiveBank   = AT91C_UDP_RX_DATA_BK0;
 
 static const char devDescriptor[] = {
-	/* Device descriptor */
-	0x12,      // Length
-	USB_DESCRIPTOR_DEVICE,      // Descriptor Type (DEVICE)
-	0x00,0x02, // Complies with USB Spec. Release (0200h = release 2.00)  0210 == release 2.10
-	2,      // Device Class:    Communication Device Class
-	0,      // Device Subclass: CDC class sub code ACM [ice 0x02 = win10 virtual comport ]
-	0,      // Device Protocol: CDC Device protocol (unused)
-	AT91C_EP_CONTROL_SIZE,      // MaxPacketSize0
+    /* Device descriptor */
+    0x12,      // Length
+    USB_DESCRIPTOR_DEVICE,      // Descriptor Type (DEVICE)
+    0x00,0x02, // Complies with USB Spec. Release (0200h = release 2.00)  0210 == release 2.10
+    2,      // Device Class:    Communication Device Class
+    0,      // Device Subclass: CDC class sub code ACM [ice 0x02 = win10 virtual comport ]
+    0,      // Device Protocol: CDC Device protocol (unused)
+    AT91C_EP_CONTROL_SIZE,      // MaxPacketSize0
     0xc4,0x9a, // Vendor ID  [0x9ac4 = J. Westhues]
     0x8f,0x4b, // Product ID [0x4b8f = Proxmark-3 RFID Instrument]
-	0x00,0x01, // BCD Device release number (1.00)
-	1,      // index Manufacturer
-	2,      // index Product
-	3,      // index SerialNumber
-	1       // Number of Configs
+    0x00,0x01, // BCD Device release number (1.00)
+    1,      // index Manufacturer
+    2,      // index Product
+    3,      // index SerialNumber
+    1       // Number of Configs
 };
 
 static const char cfgDescriptor[] = {
 
-	/* Configuration 1 descriptor */
-	// -----------------------------
-	9,         // Length
-	USB_DESCRIPTOR_CONFIGURATION, // Descriptor Type
-	(9+9+5+5+4+5+7+9+7+7), 0,	  // Total Length 2 EP + Control
-	2,         // Number of Interfaces
-	1,         // Index value of this Configuration (used in SetConfiguration from Host)
-	0,         // Configuration string index
-	_DEFAULT,      // Attributes 0xA0
-	0xFA,      // Max Power consumption
+    /* Configuration 1 descriptor */
+    // -----------------------------
+    9,         // Length
+    USB_DESCRIPTOR_CONFIGURATION, // Descriptor Type
+    (9+9+5+5+4+5+7+9+7+7), 0,     // Total Length 2 EP + Control
+    2,         // Number of Interfaces
+    1,         // Index value of this Configuration (used in SetConfiguration from Host)
+    0,         // Configuration string index
+    _DEFAULT,      // Attributes 0xA0
+    0xFA,      // Max Power consumption
 
-	// IAD to associate the one CDC interface
+    // IAD to associate the one CDC interface
     // --------------------------------------
 /*
-	8,		// Length
-    USB_DESCRIPTOR_IAD,	// IAD_DESCRIPTOR (0x0B)
-    0,		// CDC_INT_INTERFACE NUMBER  (
-	2,		// IAD INTERFACE COUNT (two interfaces)
-    2,		// Function Class: CDC_CLASS
-    2,		// Function SubClass: ACM
-    1,      // Function Protocol: v.25term
-	0,      // iInterface
+    8,         // Length
+    USB_DESCRIPTOR_IAD, // IAD_DESCRIPTOR (0x0B)
+    0,         // CDC_INT_INTERFACE NUMBER  (
+    2,         // IAD INTERFACE COUNT (two interfaces)
+    2,         // Function Class: CDC_CLASS
+    2,         // Function SubClass: ACM
+    1,         // Function Protocol: v.25term
+    0,         // iInterface
 */
 
-	/* Interface 0 Descriptor */
-	/* CDC Communication Class Interface Descriptor Requirement for Notification*/
-	// -----------------------------------------------------------
-	9, 		// Length
-	USB_DESCRIPTOR_INTERFACE, // Descriptor Type
-	0, 		// Interface Number
-	0, 		// Alternate Setting
-	1, 		// Number of Endpoints in this interface
-	2, 		// Interface Class code    (Communication Interface Class)
-	2, 		// Interface Subclass code (Abstract Control Model)
-	1, 		// InterfaceProtocol       (Common AT Commands, V.25term)
-	0, 		// iInterface
+    /* Interface 0 Descriptor */
+    /* CDC Communication Class Interface Descriptor Requirement for Notification*/
+    // -----------------------------------------------------------
+    9,         // Length
+    USB_DESCRIPTOR_INTERFACE, // Descriptor Type
+    0,         // Interface Number
+    0,         // Alternate Setting
+    1,         // Number of Endpoints in this interface
+    2,         // Interface Class code    (Communication Interface Class)
+    2,         // Interface Subclass code (Abstract Control Model)
+    1,         // InterfaceProtocol       (Common AT Commands, V.25term)
+    0,         // iInterface
 
-	/* Header Functional Descriptor */
-	5,		// Function Length
-	0x24,	// Descriptor type:    CS_INTERFACE
-	0,		// Descriptor subtype: Header Functional Descriptor
-	0x10,0x01, // bcd CDC:1.1
+    /* Header Functional Descriptor */
+    5,         // Function Length
+    0x24,      // Descriptor type:    CS_INTERFACE
+    0,         // Descriptor subtype: Header Functional Descriptor
+    0x10,0x01, // bcd CDC:1.1
 
-	/* ACM Functional Descriptor */
-	4,		// Function Length
-	0x24,	// Descriptor Type:    CS_INTERFACE
-	2,		// Descriptor Subtype: Abstract Control Management Functional Descriptor
-	2,		// Capabilities        D1, Device supports the request combination of Set_Line_Coding, Set_Control_Line_State, Get_Line_Coding, and the notification Serial_State
+    /* ACM Functional Descriptor */
+    4,         // Function Length
+    0x24,      // Descriptor Type:    CS_INTERFACE
+    2,         // Descriptor Subtype: Abstract Control Management Functional Descriptor
+    2,         // Capabilities        D1, Device supports the request combination of Set_Line_Coding, Set_Control_Line_State, Get_Line_Coding, and the notification Serial_State
 
-	/* Union Functional Descriptor */
-	5,		// Function Length
-	0x24,	// Descriptor Type:    CS_INTERFACE
-	6,		// Descriptor Subtype: Union Functional Descriptor
-	0,		// MasterInterface:    Communication Class Interface
-	1,		// SlaveInterface0:    Data Class Interface
+    /* Union Functional Descriptor */
+    5,         // Function Length
+    0x24,      // Descriptor Type:    CS_INTERFACE
+    6,         // Descriptor Subtype: Union Functional Descriptor
+    0,         // MasterInterface:    Communication Class Interface
+    1,         // SlaveInterface0:    Data Class Interface
 
-	/* Call Management Functional Descriptor */
-	5,		// Function Length
-	0x24,	// Descriptor Type:    CS_INTERFACE
-	1,		// Descriptor Subtype: Call Management Functional Descriptor
-	0,		// Capabilities:       Device sends/receives call management information only over the Communication Class interface. Device does not handle call management itself
-	1,		// Data Interface:     Data Class Interface
+    /* Call Management Functional Descriptor */
+    5,         // Function Length
+    0x24,      // Descriptor Type:    CS_INTERFACE
+    1,         // Descriptor Subtype: Call Management Functional Descriptor
+    0,         // Capabilities:       Device sends/receives call management information only over the Communication Class interface. Device does not handle call management itself
+    1,         // Data Interface:     Data Class Interface
 
-	/* Protocol Functional Descriptor */
-	/*
-	6,
-	0x24,	// Descriptor Type: CS_INTERFACE
-	0x0B,	// Descriptor Subtype: Protocol Unit functional Descriptor
-	0xDD, 	// constant uniq ID of unit
-	0xFE, 	// protocol
-	*/
+    /* Protocol Functional Descriptor */
+    /*
+    6,
+    0x24,      // Descriptor Type: CS_INTERFACE
+    0x0B,      // Descriptor Subtype: Protocol Unit functional Descriptor
+    0xDD,      // constant uniq ID of unit
+    0xFE,      // protocol
+    */
 
-	/* CDC Notification Endpoint descriptor */
-	// ---------------------------------------
-	7,	 	                     // Length
-	USB_DESCRIPTOR_ENDPOINT,     // Descriptor Type
-	_EP03_IN,                    // EndpointAddress:   Endpoint 03 - IN
-	_INTERRUPT,                  // Attributes
-	AT91C_EP_CONTROL_SIZE, 0x00, // MaxPacket Size:    EP0 - 8
-	0xFF,		                 // Interval polling
+    /* CDC Notification Endpoint descriptor */
+    // ---------------------------------------
+    7,                           // Length
+    USB_DESCRIPTOR_ENDPOINT,     // Descriptor Type
+    _EP03_IN,                    // EndpointAddress:   Endpoint 03 - IN
+    _INTERRUPT,                  // Attributes
+    AT91C_EP_CONTROL_SIZE, 0x00, // MaxPacket Size:    EP0 - 8
+    0xFF,                        // Interval polling
 
 
-	/* Interface 1 Descriptor */
-	/* CDC Data Class Interface 1 Descriptor Requirement */
-	9, 		                  // Length
-	USB_DESCRIPTOR_INTERFACE, // Descriptor Type
-	1, 		                  // Interface Number
-	0, 		                  // Alternate Setting
-	2, 		                  // Number of Endpoints
-	0x0A, 	                  // Interface Class:     CDC Data interface class
-	0, 		                  // Interface Subclass:  not used
-	0,                        // Interface Protocol:  No class specific protocol required (usb spec)
-	0,                        // Interface
+    /* Interface 1 Descriptor */
+    /* CDC Data Class Interface 1 Descriptor Requirement */
+    9,                           // Length
+    USB_DESCRIPTOR_INTERFACE,    // Descriptor Type
+    1,                           // Interface Number
+    0,                           // Alternate Setting
+    2,                           // Number of Endpoints
+    0x0A,                        // Interface Class:     CDC Data interface class
+    0,                           // Interface Subclass:  not used
+    0,                           // Interface Protocol:  No class specific protocol required (usb spec)
+    0,                           // Interface
 
-	/* Endpoint descriptor */
-	7,   		              // Length
-	USB_DESCRIPTOR_ENDPOINT,  // Descriptor Type
-	_EP01_OUT, 	              // Endpoint Address:    Endpoint 01 - OUT
-	_BULK,   	              // Attributes:          BULK
-	AT91C_EP_OUT_SIZE, 0x00,  // MaxPacket Size:      64 bytes
-	0,   		              // Interval:            ignored for bulk
+    /* Endpoint descriptor */
+    7,                           // Length
+    USB_DESCRIPTOR_ENDPOINT,     // Descriptor Type
+    _EP01_OUT,                   // Endpoint Address:    Endpoint 01 - OUT
+    _BULK,                       // Attributes:          BULK
+    AT91C_EP_OUT_SIZE, 0x00,     // MaxPacket Size:      64 bytes
+    0,                           // Interval:            ignored for bulk
 
-	/* Endpoint descriptor */
-	7,   		              // Length
-	USB_DESCRIPTOR_ENDPOINT,  // Descriptor Type
-	_EP02_IN,                 // Endpoint Address:    Endpoint 02 - IN
-	_BULK,   	              // Attribute:           BULK
-	AT91C_EP_IN_SIZE, 0x00,   // MaxPacket Size:      64 bytes
-	0 			              // Interval:            ignored for bulk
+    /* Endpoint descriptor */
+    7,                           // Length
+    USB_DESCRIPTOR_ENDPOINT,     // Descriptor Type
+    _EP02_IN,                    // Endpoint Address:    Endpoint 02 - IN
+    _BULK,                       // Attribute:           BULK
+    AT91C_EP_IN_SIZE, 0x00,      // MaxPacket Size:      64 bytes
+    0                            // Interval:            ignored for bulk
 };
 
 // BOS descriptor
 static const char bosDescriptor[] = {
-		0x5,
-		USB_DESCRIPTOR_TYPE_BO,
-		0xC,
-		0x0,
-		0x1,	// 1 device capability
-		0x7,
-		0x10, 	//USB_DEVICE_CAPABITY_TYPE,
-		0x2,
-		0x2,	// LPM capability bit set
-		0x0,
-		0x0,
-		0x0
+        0x5,
+        USB_DESCRIPTOR_TYPE_BO,
+        0xC,
+        0x0,
+        0x1,  // 1 device capability
+        0x7,
+        0x10, // USB_DEVICE_CAPABITY_TYPE,
+        0x2,
+        0x2,  // LPM capability bit set
+        0x0,
+        0x0,
+        0x0
 };
 
 // Microsoft OS Extended Configuration Compatible ID Descriptor
 /*
 static const char CompatIDFeatureDescriptor[] = {
-		0x28, 0x00, 0x00, 0x00,							// Descriptor Length 40bytes (0x28)
-		0x00, 0x01,										// Version ('1.0')
-		MS_EXTENDED_COMPAT_ID, 0x00,					// Compatibility ID Descriptor Index  0x0004
-		0x01, 											// Number of sections. 0x1
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,		// Reserved (7bytes)
-		//-----function section 1------
-		0x00,											// Interface Number #0
-		0x01,											// reserved (0x1)
-		0x57, 0x49, 0x4E, 0x55, 0x53, 0x42, 0x00, 0x00,	// Compatible ID  ('WINUSB\0\0')  (8bytes)
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	// Sub-Compatible ID (8byte)
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00				// Reserved (6bytes)
+        0x28, 0x00, 0x00, 0x00,                         // Descriptor Length 40bytes (0x28)
+        0x00, 0x01,                                     // Version ('1.0')
+        MS_EXTENDED_COMPAT_ID, 0x00,                    // Compatibility ID Descriptor Index  0x0004
+        0x01,                                           // Number of sections. 0x1
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,       // Reserved (7bytes)
+        //-----function section 1------
+        0x00,                                           // Interface Number #0
+        0x01,                                           // reserved (0x1)
+        0x57, 0x49, 0x4E, 0x55, 0x53, 0x42, 0x00, 0x00, // Compatible ID  ('WINUSB\0\0')  (8bytes)
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // Sub-Compatible ID (8byte)
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00              // Reserved (6bytes)
 };
 */
 
 // Microsoft Extended Properties Feature Descriptor
 /*
 static const char OSprop[] = {
-		// u32 Descriptor Length (10+132+64+102 == 308
-		0x34, 0x01, 0, 0,
-		// u16 Version ('1.0')
-		0, 1,
-		// u16 wIndex
-		MS_EXTENDED_PROPERTIES, 0,
-		// u16 wCount  -- three section
-		3, 0,
+        // u32 Descriptor Length (10+132+64+102 == 308
+        0x34, 0x01, 0, 0,
+        // u16 Version ('1.0')
+        0, 1,
+        // u16 wIndex
+        MS_EXTENDED_PROPERTIES, 0,
+        // u16 wCount  -- three section
+        3, 0,
 
-		//-----property section 1------
-		// u32 size  ( 14+40+78 == 132)
-		132, 0, 0, 0,
-		// u32 type
-		1, 0, 0, 0,  // unicode string
-		// u16 namelen  (20*2 = 40)
-		40, 0,
-		// name  DeviceInterfaceGUID
-		'D',0,'e',0,'v',0,'i',0,'c',0,'e',0,'I',0,'n',0,'t',0,'e',0,'r',0,'f',0,'a',0,'c',0,'e',0,'G',0,'U',0,'I',0,'D',0,0,0,
-		// u32 datalen  (39*2 = 78)
-		78, 0, 0, 0,
-		// data {4D36E978-E325-11CE-BFC1-08002BE10318}
-		'{',0,'4',0,'d',0,'3',0,'6',0,'e',0,'9',0,'7',0,'8',0,'-',0,'e',0,'3',0,'2',0,'5',0,
-		'-',0,'1',0,'1',0,'c',0,'e',0,'-',0,'b',0,'f',0,'c',0,'1',0,'-',0,'0',0,'8',0,'0',0,
-		'0',0,'2',0,'b',0,'e',0,'1',0,'0',0,'3',0,'1',0,'8',0,'}',0,0,0,
+        //-----property section 1------
+        // u32 size  ( 14+40+78 == 132)
+        132, 0, 0, 0,
+        // u32 type
+        1, 0, 0, 0,  // unicode string
+        // u16 namelen  (20*2 = 40)
+        40, 0,
+        // name  DeviceInterfaceGUID
+        'D',0,'e',0,'v',0,'i',0,'c',0,'e',0,'I',0,'n',0,'t',0,'e',0,'r',0,'f',0,'a',0,'c',0,'e',0,'G',0,'U',0,'I',0,'D',0,0,0,
+        // u32 datalen  (39*2 = 78)
+        78, 0, 0, 0,
+        // data {4D36E978-E325-11CE-BFC1-08002BE10318}
+        '{',0,'4',0,'d',0,'3',0,'6',0,'e',0,'9',0,'7',0,'8',0,'-',0,'e',0,'3',0,'2',0,'5',0,
+        '-',0,'1',0,'1',0,'c',0,'e',0,'-',0,'b',0,'f',0,'c',0,'1',0,'-',0,'0',0,'8',0,'0',0,
+        '0',0,'2',0,'b',0,'e',0,'1',0,'0',0,'3',0,'1',0,'8',0,'}',0,0,0,
 
-		//-----property section 2------
-		// u32 size  ( 14+12+38 == 64)
-		64, 0, 0, 0,
-		// u32 type
-		1, 0, 0, 0,  // unicode string
-		// u16 namelen (12)
-		12, 0,
-		// name Label
-		'L',0,'a',0,'b',0,'e',0,'l',0,0,0,
-		// u32 datalen ( 19*2 = 38 )
-		38, 0, 0, 0,
-		// data 'Awesome PM3 Device'
-		'A',0,'w',0,'e',0,'s',0,'o',0,'m',0,'e',0,' ',0,'P',0,'M',0,'3',0,' ',0,'D',0,'e',0,'v',0,'i',0,'c',0,'e',0,0,0,
+        //-----property section 2------
+        // u32 size  ( 14+12+38 == 64)
+        64, 0, 0, 0,
+        // u32 type
+        1, 0, 0, 0,  // unicode string
+        // u16 namelen (12)
+        12, 0,
+        // name Label
+        'L',0,'a',0,'b',0,'e',0,'l',0,0,0,
+        // u32 datalen ( 19*2 = 38 )
+        38, 0, 0, 0,
+        // data 'Awesome PM3 Device'
+        'A',0,'w',0,'e',0,'s',0,'o',0,'m',0,'e',0,' ',0,'P',0,'M',0,'3',0,' ',0,'D',0,'e',0,'v',0,'i',0,'c',0,'e',0,0,0,
 
-		//-----property section 3------
-		// u32 size ( 14+12+76 == 102)
-		102, 0, 0, 0,
-		// u32 type
-		2, 0, 0, 0,  //Unicode string with environment variables
-		// u16 namelen (12)
-		12, 0,
-		// name Icons
-		'I',0,'c',0,'o',0,'n',0,'s',0,0,0,
-		// u32 datalen ( 38*2 ==  76)
-		76, 0, 0, 0,
-		// data '%SystemRoot%\\system32\\Shell32.dll,-13'
-		'%',0,'S',0,'y',0,'s',0,'t',0,'e',0,'m',0,'R',0,'o',0,'o',0,'t',0,'%',0,
-		'\\',0,'s',0,'y',0,'s',0,'t',0,'e',0,'m',0,'3',0,'2',0,'\\',0,
-		'S',0,'h',0,'e',0,'l',0,'l',0,'3',0,'2',0,'.',0,'d',0,'l',0,'l',0,',',0,
-		'-',0,'1',0,'3',0,0,0
+        //-----property section 3------
+        // u32 size ( 14+12+76 == 102)
+        102, 0, 0, 0,
+        // u32 type
+        2, 0, 0, 0,  //Unicode string with environment variables
+        // u16 namelen (12)
+        12, 0,
+        // name Icons
+        'I',0,'c',0,'o',0,'n',0,'s',0,0,0,
+        // u32 datalen ( 38*2 ==  76)
+        76, 0, 0, 0,
+        // data '%SystemRoot%\\system32\\Shell32.dll,-13'
+        '%',0,'S',0,'y',0,'s',0,'t',0,'e',0,'m',0,'R',0,'o',0,'o',0,'t',0,'%',0,
+        '\\',0,'s',0,'y',0,'s',0,'t',0,'e',0,'m',0,'3',0,'2',0,'\\',0,
+        'S',0,'h',0,'e',0,'l',0,'l',0,'3',0,'2',0,'.',0,'d',0,'l',0,'l',0,',',0,
+        '-',0,'1',0,'3',0,0,0
 };
 
 */
 
 static const char StrLanguageCodes[] = {
-  4,			// Length
-  0x03,			// Type is string
-  0x09, 0x04	// supported language Code 0 = 0x0409 (English)
+    4,          // Length
+    0x03,       // Type is string
+    0x09, 0x04  // supported language Code 0 = 0x0409 (English)
 };
 
 // Note: ModemManager (Linux) ignores Proxmark3 devices by matching the
 // manufacturer string "proxmark.org". Don't change this.
 // or use the blacklisting file.
 static const char StrManufacturer[] = {
-  26,			// Length
-  0x03,			// Type is string
-  'p',0,'r',0,'o',0,'x',0,'m',0,'a',0,'r',0,'k',0,'.',0,'o',0,'r',0,'g',0,
+    26,         // Length
+    0x03,       // Type is string
+    'p',0,'r',0,'o',0,'x',0,'m',0,'a',0,'r',0,'k',0,'.',0,'o',0,'r',0,'g',0,
 };
 
 static const char StrProduct[] = {
-	20,			// Length
-	0x03,		// Type is string
-	'p',0,'r',0,'o',0,'x',0,'m',0,'a',0,'r',0,'k',0,'3',0
+    20,         // Length
+    0x03,       // Type is string
+    'p',0,'r',0,'o',0,'x',0,'m',0,'a',0,'r',0,'k',0,'3',0
 };
 
 static const char StrSerialNumber[] = {
-	14,			// Length
-	0x03,		// Type is string
-	'i',0,'c',0,'e',0,'m',0,'a',0,'n',0
+    14,         // Length
+    0x03,       // Type is string
+    'i',0,'c',0,'e',0,'m',0,'a',0,'n',0
 };
 
 // size includes their own field.
 static const char StrMS_OSDescriptor[] = {
-    18,			// length 0x12
-	0x03,		// Type is string
+    18,         // length 0x12
+    0x03,       // Type is string
     'M',0,'S',0,'F',0,'T',0,'1',0,'0',0,'0',0,MS_VENDOR_CODE,0
 };
 
 const char* getStringDescriptor(uint8_t idx) {
-	switch(idx) {
-		case 0: return StrLanguageCodes;
-		case 1: return StrManufacturer;
-		case 2: return StrProduct;
-		case 3: return StrSerialNumber;
-		case MS_OS_DESCRIPTOR_INDEX: return StrMS_OSDescriptor;
-		default:
-			return(NULL);
-	}
+    switch(idx) {
+        case 0: return StrLanguageCodes;
+        case 1: return StrManufacturer;
+        case 2: return StrProduct;
+        case 3: return StrSerialNumber;
+        case MS_OS_DESCRIPTOR_INDEX: return StrMS_OSDescriptor;
+        default:
+            return(NULL);
+    }
 }
 
 // Bitmap for all status bits in CSR which must be written as 1 to cause no effect
@@ -410,57 +410,57 @@ const char* getStringDescriptor(uint8_t idx) {
 
 // Clear flags in the UDP_CSR register and waits for synchronization
 #define UDP_CLEAR_EP_FLAGS(endpoint, flags) { \
-	volatile unsigned int reg; \
-	reg = pUdp->UDP_CSR[(endpoint)]; \
-	reg |= REG_NO_EFFECT_1_ALL; \
-	reg &= ~(flags); \
-	pUdp->UDP_CSR[(endpoint)] = reg; \
+    volatile unsigned int reg; \
+    reg = pUdp->UDP_CSR[(endpoint)]; \
+    reg |= REG_NO_EFFECT_1_ALL; \
+    reg &= ~(flags); \
+    pUdp->UDP_CSR[(endpoint)] = reg; \
 } \
 
 // reset flags in the UDP_CSR register and waits for synchronization
 #define UDP_SET_EP_FLAGS(endpoint, flags) { \
-	volatile unsigned int reg; \
-	reg = pUdp->UDP_CSR[(endpoint)]; \
-	reg |= REG_NO_EFFECT_1_ALL; \
-	reg |= (flags); \
-	pUdp->UDP_CSR[(endpoint)] = reg; \
+    volatile unsigned int reg; \
+    reg = pUdp->UDP_CSR[(endpoint)]; \
+    reg |= REG_NO_EFFECT_1_ALL; \
+    reg |= (flags); \
+    pUdp->UDP_CSR[(endpoint)] = reg; \
 } \
 
 
 typedef struct {
-	uint32_t BitRate;
-	uint8_t Format;
-	uint8_t ParityType;
-	uint8_t DataBits;
+    uint32_t BitRate;
+    uint8_t Format;
+    uint8_t ParityType;
+    uint8_t DataBits;
 } AT91S_CDC_LINE_CODING, *AT91PS_CDC_LINE_CODING;
 
 AT91S_CDC_LINE_CODING line = {
-	115200, // baudrate
-	0,      // 1 Stop Bit
-	0,      // None Parity
-	8};     // 8 Data bits
+    115200, // baudrate
+    0,      // 1 Stop Bit
+    0,      // None Parity
+    8};     // 8 Data bits
 
 static void SpinDelay(int ms) {
-	int us = ms * 1000;
-	int ticks = (48 * us) >> 10;
+    int us = ms * 1000;
+    int ticks = (48 * us) >> 10;
 
-	// Borrow a PWM unit for my real-time clock
-	AT91C_BASE_PWMC->PWMC_ENA = PWM_CHANNEL(0);
+    // Borrow a PWM unit for my real-time clock
+    AT91C_BASE_PWMC->PWMC_ENA = PWM_CHANNEL(0);
 
-	// 48 MHz / 1024 gives 46.875 kHz
-	AT91C_BASE_PWMC_CH0->PWMC_CMR = PWM_CH_MODE_PRESCALER(10);
-	AT91C_BASE_PWMC_CH0->PWMC_CDTYR = 0;
-	AT91C_BASE_PWMC_CH0->PWMC_CPRDR = 0xffff;
+    // 48 MHz / 1024 gives 46.875 kHz
+    AT91C_BASE_PWMC_CH0->PWMC_CMR = PWM_CH_MODE_PRESCALER(10);
+    AT91C_BASE_PWMC_CH0->PWMC_CDTYR = 0;
+    AT91C_BASE_PWMC_CH0->PWMC_CPRDR = 0xffff;
 
-	uint16_t start = AT91C_BASE_PWMC_CH0->PWMC_CCNTR;
+    uint16_t start = AT91C_BASE_PWMC_CH0->PWMC_CCNTR;
 
-	for(;;) {
-		uint16_t now = AT91C_BASE_PWMC_CH0->PWMC_CCNTR;
-		if (now == (uint16_t)(start + ticks))
-			return;
+    for(;;) {
+        uint16_t now = AT91C_BASE_PWMC_CH0->PWMC_CCNTR;
+        if (now == (uint16_t)(start + ticks))
+            return;
 
-		WDT_HIT();
-	}
+        WDT_HIT();
+    }
 }
 
 //*----------------------------------------------------------------------------
@@ -468,13 +468,13 @@ static void SpinDelay(int ms) {
 //* \brief This function deactivates the USB device
 //*----------------------------------------------------------------------------
 void usb_disable() {
-	// Disconnect the USB device
-	AT91C_BASE_PIOA->PIO_ODR = GPIO_USB_PU;
+    // Disconnect the USB device
+    AT91C_BASE_PIOA->PIO_ODR = GPIO_USB_PU;
 
-	// Clear all lingering interrupts
-	if (pUdp->UDP_ISR & AT91C_UDP_ENDBUSRES) {
-		pUdp->UDP_ICR = AT91C_UDP_ENDBUSRES;
-	}
+    // Clear all lingering interrupts
+    if (pUdp->UDP_ISR & AT91C_UDP_ENDBUSRES) {
+        pUdp->UDP_ICR = AT91C_UDP_ENDBUSRES;
+    }
 }
 
 //*----------------------------------------------------------------------------
@@ -482,35 +482,35 @@ void usb_disable() {
 //* \brief This function Activates the USB device
 //*----------------------------------------------------------------------------
 void usb_enable() {
-	// Set the PLL USB Divider
-	AT91C_BASE_CKGR->CKGR_PLLR |= AT91C_CKGR_USBDIV_1 ;
+    // Set the PLL USB Divider
+    AT91C_BASE_CKGR->CKGR_PLLR |= AT91C_CKGR_USBDIV_1 ;
 
-	// Specific Chip USB Initialisation
-	// Enables the 48MHz USB clock UDPCK and System Peripheral USB Clock
-	AT91C_BASE_PMC->PMC_SCER |= AT91C_PMC_UDP;
-	AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_UDP);
+    // Specific Chip USB Initialisation
+    // Enables the 48MHz USB clock UDPCK and System Peripheral USB Clock
+    AT91C_BASE_PMC->PMC_SCER |= AT91C_PMC_UDP;
+    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_UDP);
 
-	AT91C_BASE_UDP->UDP_FADDR = 0;
-	AT91C_BASE_UDP->UDP_GLBSTATE = 0;
+    AT91C_BASE_UDP->UDP_FADDR = 0;
+    AT91C_BASE_UDP->UDP_GLBSTATE = 0;
 
-	// Enable UDP PullUp (USB_DP_PUP) : enable & Clear of the corresponding PIO
-	// Set in PIO mode and Configure in Output
-	AT91C_BASE_PIOA->PIO_PER = GPIO_USB_PU; // Set in PIO mode
-	AT91C_BASE_PIOA->PIO_OER = GPIO_USB_PU; // Configure as Output
+    // Enable UDP PullUp (USB_DP_PUP) : enable & Clear of the corresponding PIO
+    // Set in PIO mode and Configure in Output
+    AT91C_BASE_PIOA->PIO_PER = GPIO_USB_PU; // Set in PIO mode
+    AT91C_BASE_PIOA->PIO_OER = GPIO_USB_PU; // Configure as Output
 
-	// Clear for set the Pullup resistor
-	AT91C_BASE_PIOA->PIO_CODR = GPIO_USB_PU;
+    // Clear for set the Pullup resistor
+    AT91C_BASE_PIOA->PIO_CODR = GPIO_USB_PU;
 
-	// Disconnect and reconnect USB controller for 100ms
-	usb_disable();
+    // Disconnect and reconnect USB controller for 100ms
+    usb_disable();
 
-	SpinDelay(100);
-	// Wait for a short while
-	//for (volatile size_t i=0; i<0x100000; i++) {};
+    SpinDelay(100);
+    // Wait for a short while
+    //for (volatile size_t i=0; i<0x100000; i++) {};
 
-	// Reconnect USB reconnect
-	AT91C_BASE_PIOA->PIO_SODR = GPIO_USB_PU;
-	AT91C_BASE_PIOA->PIO_OER = GPIO_USB_PU;
+    // Reconnect USB reconnect
+    AT91C_BASE_PIOA->PIO_SODR = GPIO_USB_PU;
+    AT91C_BASE_PIOA->PIO_OER = GPIO_USB_PU;
 }
 
 //*----------------------------------------------------------------------------
@@ -520,87 +520,87 @@ void usb_enable() {
 static int usb_reconnect = 0;
 static int usb_configured = 0;
 void SetUSBreconnect(int value) {
-	usb_reconnect = value;
+    usb_reconnect = value;
 }
 int GetUSBreconnect(void) {
-	return usb_reconnect;
+    return usb_reconnect;
 }
 void SetUSBconfigured(int value) {
-	usb_configured = value;
+    usb_configured = value;
 }
 int GetUSBconfigured(void){
-	return usb_configured;
+    return usb_configured;
 }
 
 bool usb_check() {
 
-	/*
-	// reconnected ONCE and
-	if ( !USB_ATTACHED() ){
-		usb_reconnect = 1;
-		return false;
-	}
+    /*
+    // reconnected ONCE and
+    if ( !USB_ATTACHED() ){
+        usb_reconnect = 1;
+        return false;
+    }
 
-	// only one time after USB been disengaged and re-engaged
-	if ( USB_ATTACHED() && usb_reconnect == 1 ) {
+    // only one time after USB been disengaged and re-engaged
+    if ( USB_ATTACHED() && usb_reconnect == 1 ) {
 
-		if ( usb_configured == 0) {
-			usb_disable();
-			usb_enable();
+        if ( usb_configured == 0) {
+            usb_disable();
+            usb_enable();
 
-			AT91F_CDC_Enumerate();
+            AT91F_CDC_Enumerate();
 
-			usb_configured = 1;
-			return false;
-		}
-	}
-	*/
+            usb_configured = 1;
+            return false;
+        }
+    }
+    */
 
-	// interrupt status register
-	AT91_REG isr = pUdp->UDP_ISR;
+    // interrupt status register
+    AT91_REG isr = pUdp->UDP_ISR;
 
-	// end of bus reset
-	if (isr & AT91C_UDP_ENDBUSRES) {
-		pUdp->UDP_ICR = AT91C_UDP_ENDBUSRES;
-		// reset all endpoints
-		pUdp->UDP_RSTEP  = (unsigned int)-1;
-		pUdp->UDP_RSTEP  = 0;
-		// Enable the function
-		pUdp->UDP_FADDR = AT91C_UDP_FEN;
-		// Configure endpoint 0  (enable control endpoint)
-		pUdp->UDP_CSR[AT91C_EP_CONTROL] = (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_CTRL);
-	}
-	else if (isr & AT91C_UDP_EPINT0) {
-		pUdp->UDP_ICR = AT91C_UDP_EPINT0;
-		AT91F_CDC_Enumerate();
-	}
-	/*
-	else if (isr & AT91C_UDP_EPINT3 ) {
-		pUdp->UDP_ICR = AT91C_UDP_EPINT3;
-		AT91F_CDC_Enumerate();
-		//pUdp->UDP_ICR |= AT91C_UDP_EPINT3;
-	}
-	*/
-	return (btConfiguration) ? true : false;
+    // end of bus reset
+    if (isr & AT91C_UDP_ENDBUSRES) {
+        pUdp->UDP_ICR = AT91C_UDP_ENDBUSRES;
+        // reset all endpoints
+        pUdp->UDP_RSTEP  = (unsigned int)-1;
+        pUdp->UDP_RSTEP  = 0;
+        // Enable the function
+        pUdp->UDP_FADDR = AT91C_UDP_FEN;
+        // Configure endpoint 0  (enable control endpoint)
+        pUdp->UDP_CSR[AT91C_EP_CONTROL] = (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_CTRL);
+    }
+    else if (isr & AT91C_UDP_EPINT0) {
+        pUdp->UDP_ICR = AT91C_UDP_EPINT0;
+        AT91F_CDC_Enumerate();
+    }
+    /*
+    else if (isr & AT91C_UDP_EPINT3 ) {
+        pUdp->UDP_ICR = AT91C_UDP_EPINT3;
+        AT91F_CDC_Enumerate();
+        //pUdp->UDP_ICR |= AT91C_UDP_EPINT3;
+    }
+    */
+    return (btConfiguration) ? true : false;
 }
 
 bool usb_poll() {
-	if (!usb_check()) return false;
-	return (pUdp->UDP_CSR[AT91C_EP_OUT] & btReceiveBank);
+    if (!usb_check()) return false;
+    return (pUdp->UDP_CSR[AT91C_EP_OUT] & btReceiveBank);
 }
 
 /**
-	In github PR #129, some users appears to get a false positive from
-	usb_poll, which returns true, but the usb_read operation
-	still returns 0.
-	This check is basically the same as above, but also checks
-	that the length available to read is non-zero, thus hopefully fixes the
-	bug.
+    In github PR #129, some users appears to get a false positive from
+    usb_poll, which returns true, but the usb_read operation
+    still returns 0.
+    This check is basically the same as above, but also checks
+    that the length available to read is non-zero, thus hopefully fixes the
+    bug.
 **/
 bool usb_poll_validate_length() {
-	if (!usb_check()) return false;
-	if (!(pUdp->UDP_CSR[AT91C_EP_OUT] & btReceiveBank)) return false;
-	return ((pUdp->UDP_CSR[AT91C_EP_OUT] & AT91C_UDP_RXBYTECNT) >> 16) >  0;
+    if (!usb_check()) return false;
+    if (!(pUdp->UDP_CSR[AT91C_EP_OUT] & btReceiveBank)) return false;
+    return ((pUdp->UDP_CSR[AT91C_EP_OUT] & AT91C_UDP_RXBYTECNT) >> 16) >  0;
 }
 
 //*----------------------------------------------------------------------------
@@ -609,36 +609,36 @@ bool usb_poll_validate_length() {
 //*----------------------------------------------------------------------------
 uint32_t usb_read(byte_t* data, size_t len) {
 
-	if ( len == 0 ) return 0;
+    if ( len == 0 ) return 0;
 
-	uint8_t bank = btReceiveBank;
-	uint32_t packetSize, nbBytesRcv = 0;
-	uint32_t time_out = 0;
+    uint8_t bank = btReceiveBank;
+    uint32_t packetSize, nbBytesRcv = 0;
+    uint32_t time_out = 0;
 
-	while (len)  {
-		if (!usb_check()) break;
+    while (len)  {
+        if (!usb_check()) break;
 
-		if ( pUdp->UDP_CSR[AT91C_EP_OUT] & bank ) {
+        if ( pUdp->UDP_CSR[AT91C_EP_OUT] & bank ) {
 
-			packetSize = (pUdp->UDP_CSR[AT91C_EP_OUT] & AT91C_UDP_RXBYTECNT) >> 16;
-			packetSize = MIN( packetSize, len);
-			len -= packetSize;
-			while (packetSize--)
-				data[nbBytesRcv++] = pUdp->UDP_FDR[AT91C_EP_OUT];
+            packetSize = (pUdp->UDP_CSR[AT91C_EP_OUT] & AT91C_UDP_RXBYTECNT) >> 16;
+            packetSize = MIN( packetSize, len);
+            len -= packetSize;
+            while (packetSize--)
+                data[nbBytesRcv++] = pUdp->UDP_FDR[AT91C_EP_OUT];
 
-			// flip bank
-			UDP_CLEAR_EP_FLAGS(AT91C_EP_OUT, bank)
+            // flip bank
+            UDP_CLEAR_EP_FLAGS(AT91C_EP_OUT, bank)
 
-			if (bank == AT91C_UDP_RX_DATA_BK0)
-				bank = AT91C_UDP_RX_DATA_BK1;
-			else
-				bank = AT91C_UDP_RX_DATA_BK0;
-		}
-		if (time_out++ == 0x1fff) break;
-	}
+            if (bank == AT91C_UDP_RX_DATA_BK0)
+                bank = AT91C_UDP_RX_DATA_BK1;
+            else
+                bank = AT91C_UDP_RX_DATA_BK0;
+        }
+        if (time_out++ == 0x1fff) break;
+    }
 
-	btReceiveBank = bank;
-	return nbBytesRcv;
+    btReceiveBank = bank;
+    return nbBytesRcv;
 }
 
 //*----------------------------------------------------------------------------
@@ -647,54 +647,54 @@ uint32_t usb_read(byte_t* data, size_t len) {
 //*----------------------------------------------------------------------------
 uint32_t usb_write(const byte_t* data, const size_t len) {
 
-	if (!len) return 0;
-	if (!usb_check()) return 0;
+    if (!len) return 0;
+    if (!usb_check()) return 0;
 
-	// can we write?
-	if ( (pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXPKTRDY) != 0 ) return 0;
+    // can we write?
+    if ( (pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXPKTRDY) != 0 ) return 0;
 
-	size_t length = len;
-	uint32_t cpt = 0;
+    size_t length = len;
+    uint32_t cpt = 0;
 
 
-	// send first chunk
-	cpt = MIN(length, AT91C_EP_IN_SIZE);
-	length -= cpt;
-	while (cpt--) {
-		pUdp->UDP_FDR[AT91C_EP_IN] = *data++;
-	}
+    // send first chunk
+    cpt = MIN(length, AT91C_EP_IN_SIZE);
+    length -= cpt;
+    while (cpt--) {
+        pUdp->UDP_FDR[AT91C_EP_IN] = *data++;
+    }
 
-	UDP_SET_EP_FLAGS(AT91C_EP_IN, AT91C_UDP_TXPKTRDY);
+    UDP_SET_EP_FLAGS(AT91C_EP_IN, AT91C_UDP_TXPKTRDY);
 
-	while (length) {
-		// Send next chunk
-		cpt = MIN(length, AT91C_EP_IN_SIZE);
-		length -= cpt;
-		while (cpt--) {
-			pUdp->UDP_FDR[AT91C_EP_IN] = *data++;
-		}
+    while (length) {
+        // Send next chunk
+        cpt = MIN(length, AT91C_EP_IN_SIZE);
+        length -= cpt;
+        while (cpt--) {
+            pUdp->UDP_FDR[AT91C_EP_IN] = *data++;
+        }
 
-		// Wait for previous chunk to be sent
-		// (iceman) when is the bankswapping done?
-		while (!(pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP)) {
-			if (!usb_check()) return length;
-		}
+        // Wait for previous chunk to be sent
+        // (iceman) when is the bankswapping done?
+        while (!(pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP)) {
+            if (!usb_check()) return length;
+        }
 
-		UDP_CLEAR_EP_FLAGS(AT91C_EP_IN, AT91C_UDP_TXCOMP);
-		while (pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP);
-		UDP_SET_EP_FLAGS(AT91C_EP_IN, AT91C_UDP_TXPKTRDY);
+        UDP_CLEAR_EP_FLAGS(AT91C_EP_IN, AT91C_UDP_TXCOMP);
+        while (pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP);
+        UDP_SET_EP_FLAGS(AT91C_EP_IN, AT91C_UDP_TXPKTRDY);
 
-	}
+    }
 
-	// Wait for the end of transfer
-	while (!(pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP)) {
-		if (!usb_check()) return length;
-	}
+    // Wait for the end of transfer
+    while (!(pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP)) {
+        if (!usb_check()) return length;
+    }
 
-	UDP_CLEAR_EP_FLAGS(AT91C_EP_IN, AT91C_UDP_TXCOMP);
-	while (pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP);
+    UDP_CLEAR_EP_FLAGS(AT91C_EP_IN, AT91C_UDP_TXCOMP);
+    while (pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP);
 
-	return length;
+    return length;
 }
 
 //*----------------------------------------------------------------------------
@@ -702,39 +702,39 @@ uint32_t usb_write(const byte_t* data, const size_t len) {
 //* \brief Send Data through the control endpoint
 //*----------------------------------------------------------------------------
 void AT91F_USB_SendData(AT91PS_UDP pUdp, const char *pData, uint32_t length) {
-	uint32_t cpt = 0;
-	AT91_REG csr;
+    uint32_t cpt = 0;
+    AT91_REG csr;
 
-	do {
-		cpt = MIN(length, AT91C_EP_CONTROL_SIZE);
-		length -= cpt;
+    do {
+        cpt = MIN(length, AT91C_EP_CONTROL_SIZE);
+        length -= cpt;
 
-		while (cpt--)
-			pUdp->UDP_FDR[AT91C_EP_CONTROL] = *pData++;
+        while (cpt--)
+            pUdp->UDP_FDR[AT91C_EP_CONTROL] = *pData++;
 
-		if (pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_TXCOMP) {
-			UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_TXCOMP);
-			while (pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_TXCOMP);
-		}
+        if (pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_TXCOMP) {
+            UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_TXCOMP);
+            while (pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_TXCOMP);
+        }
 
-		UDP_SET_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_TXPKTRDY);
+        UDP_SET_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_TXPKTRDY);
 
-		do {
-			csr = pUdp->UDP_CSR[AT91C_EP_CONTROL];
-			// Data IN stage has been stopped by a status OUT
-			if ( csr & AT91C_UDP_RX_DATA_BK0) {
+        do {
+            csr = pUdp->UDP_CSR[AT91C_EP_CONTROL];
+            // Data IN stage has been stopped by a status OUT
+            if ( csr & AT91C_UDP_RX_DATA_BK0) {
 
-				UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_RX_DATA_BK0)
-				return;
-			}
-		} while ( !(csr & AT91C_UDP_TXCOMP) );
+                UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_RX_DATA_BK0)
+                return;
+            }
+        } while ( !(csr & AT91C_UDP_TXCOMP) );
 
-	} while (length);
+    } while (length);
 
-	if (pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_TXCOMP) {
-		UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_TXCOMP);
-		while (pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_TXCOMP);
-	}
+    if (pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_TXCOMP) {
+        UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_TXCOMP);
+        while (pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_TXCOMP);
+    }
 }
 
 
@@ -743,10 +743,10 @@ void AT91F_USB_SendData(AT91PS_UDP pUdp, const char *pData, uint32_t length) {
 //* \brief Send zero length packet through the control endpoint
 //*----------------------------------------------------------------------------
 void AT91F_USB_SendZlp(AT91PS_UDP pUdp) {
-	UDP_SET_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_TXPKTRDY);
-	while ( !(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_TXCOMP) );
-	UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_TXCOMP);
-	while (pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_TXCOMP);
+    UDP_SET_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_TXPKTRDY);
+    while ( !(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_TXCOMP) );
+    UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_TXCOMP);
+    while (pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_TXCOMP);
 }
 
 //*----------------------------------------------------------------------------
@@ -754,10 +754,10 @@ void AT91F_USB_SendZlp(AT91PS_UDP pUdp) {
 //* \brief Stall the control endpoint
 //*----------------------------------------------------------------------------
 void AT91F_USB_SendStall(AT91PS_UDP pUdp) {
-	UDP_SET_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_FORCESTALL);
-	while ( !(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_ISOERROR) );
-	UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, (AT91C_UDP_FORCESTALL | AT91C_UDP_ISOERROR) );
-	while (pUdp->UDP_CSR[AT91C_EP_CONTROL] & (AT91C_UDP_FORCESTALL | AT91C_UDP_ISOERROR));
+    UDP_SET_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_FORCESTALL);
+    while ( !(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_ISOERROR) );
+    UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, (AT91C_UDP_FORCESTALL | AT91C_UDP_ISOERROR) );
+    while (pUdp->UDP_CSR[AT91C_EP_CONTROL] & (AT91C_UDP_FORCESTALL | AT91C_UDP_ISOERROR));
 }
 
 //*----------------------------------------------------------------------------
@@ -768,181 +768,181 @@ void AT91F_USB_SendStall(AT91PS_UDP pUdp) {
 //* 2. mixed with CDC ACM endpoint3 , interrupt, control endpoint
 //*----------------------------------------------------------------------------
 void AT91F_CDC_Enumerate() {
-	byte_t bmRequestType, bRequest;
-	uint16_t wValue, wIndex, wLength, wStatus;
+    byte_t bmRequestType, bRequest;
+    uint16_t wValue, wIndex, wLength, wStatus;
 
-	if ( !(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_RXSETUP) )
-		return;
+    if ( !(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_RXSETUP) )
+        return;
 
-	bmRequestType = pUdp->UDP_FDR[AT91C_EP_CONTROL];
-	bRequest      = pUdp->UDP_FDR[AT91C_EP_CONTROL];
-	wValue        = (pUdp->UDP_FDR[AT91C_EP_CONTROL] & 0xFF);
-	wValue       |= (pUdp->UDP_FDR[AT91C_EP_CONTROL] << 8);
-	wIndex        = (pUdp->UDP_FDR[AT91C_EP_CONTROL] & 0xFF);
-	wIndex       |= (pUdp->UDP_FDR[AT91C_EP_CONTROL] << 8);
-	wLength       = (pUdp->UDP_FDR[AT91C_EP_CONTROL] & 0xFF);
-	wLength      |= (pUdp->UDP_FDR[AT91C_EP_CONTROL] << 8);
+    bmRequestType = pUdp->UDP_FDR[AT91C_EP_CONTROL];
+    bRequest      = pUdp->UDP_FDR[AT91C_EP_CONTROL];
+    wValue        = (pUdp->UDP_FDR[AT91C_EP_CONTROL] & 0xFF);
+    wValue       |= (pUdp->UDP_FDR[AT91C_EP_CONTROL] << 8);
+    wIndex        = (pUdp->UDP_FDR[AT91C_EP_CONTROL] & 0xFF);
+    wIndex       |= (pUdp->UDP_FDR[AT91C_EP_CONTROL] << 8);
+    wLength       = (pUdp->UDP_FDR[AT91C_EP_CONTROL] & 0xFF);
+    wLength      |= (pUdp->UDP_FDR[AT91C_EP_CONTROL] << 8);
 
-	if (bmRequestType & 0x80) {        // Data Phase Transfer Direction Device to Host
-		UDP_SET_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_DIR);
-		while ( !(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_DIR) );
-	}
-	UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_RXSETUP);
-	while ( (pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_RXSETUP)  );
+    if (bmRequestType & 0x80) {        // Data Phase Transfer Direction Device to Host
+        UDP_SET_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_DIR);
+        while ( !(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_DIR) );
+    }
+    UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_RXSETUP);
+    while ( (pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_RXSETUP)  );
 
-	/*
-	if ( bRequest == MS_VENDOR_CODE) {
-		if ( bmRequestType == MS_WCID_GET_DESCRIPTOR ) { // C0
-			if ( wIndex == MS_EXTENDED_COMPAT_ID ) {  // 4
-				//AT91F_USB_SendData(pUdp, CompatIDFeatureDescriptor, MIN(sizeof(CompatIDFeatureDescriptor), wLength));
-				//return;
-			}
-		}
+    /*
+    if ( bRequest == MS_VENDOR_CODE) {
+        if ( bmRequestType == MS_WCID_GET_DESCRIPTOR ) { // C0
+            if ( wIndex == MS_EXTENDED_COMPAT_ID ) {  // 4
+                //AT91F_USB_SendData(pUdp, CompatIDFeatureDescriptor, MIN(sizeof(CompatIDFeatureDescriptor), wLength));
+                //return;
+            }
+        }
 
-		if ( bmRequestType == MS_WCID_GET_FEATURE_DESCRIPTOR ) {  //C1
-			// if ( wIndex == MS_EXTENDED_PROPERTIES ) { // 5  - winusb bug with wIndex == interface index,  so I just send it always)
-				//AT91F_USB_SendData(pUdp, OSprop, MIN(sizeof(OSprop), wLength));
-				//return;
-			// }
-		}
-	}
-	*/
+        if ( bmRequestType == MS_WCID_GET_FEATURE_DESCRIPTOR ) {  //C1
+            // if ( wIndex == MS_EXTENDED_PROPERTIES ) { // 5  - winusb bug with wIndex == interface index,  so I just send it always)
+                //AT91F_USB_SendData(pUdp, OSprop, MIN(sizeof(OSprop), wLength));
+                //return;
+            // }
+        }
+    }
+    */
 
-	// Handle supported standard device request Cf Table 9-3 in USB specification Rev 1.1
-	switch ((bRequest << 8) | bmRequestType) {
-	case STD_GET_DESCRIPTOR: {
+    // Handle supported standard device request Cf Table 9-3 in USB specification Rev 1.1
+    switch ((bRequest << 8) | bmRequestType) {
+    case STD_GET_DESCRIPTOR: {
 
-			if ( wValue == 0x100 )       // Return Device Descriptor
-				AT91F_USB_SendData(pUdp, devDescriptor, MIN(sizeof(devDescriptor), wLength));
-			else if ( wValue == 0x200 )  // Return Configuration Descriptor
-				AT91F_USB_SendData(pUdp, cfgDescriptor, MIN(sizeof(cfgDescriptor), wLength));
-			else if ( (wValue & 0xF00) == 0xF00) // Return BOS Descriptor
-				AT91F_USB_SendData(pUdp, bosDescriptor, MIN(sizeof(bosDescriptor), wLength));
-			else if ( (wValue & 0x300) == 0x300) { // Return String Descriptor
+            if ( wValue == 0x100 )       // Return Device Descriptor
+                AT91F_USB_SendData(pUdp, devDescriptor, MIN(sizeof(devDescriptor), wLength));
+            else if ( wValue == 0x200 )  // Return Configuration Descriptor
+                AT91F_USB_SendData(pUdp, cfgDescriptor, MIN(sizeof(cfgDescriptor), wLength));
+            else if ( (wValue & 0xF00) == 0xF00) // Return BOS Descriptor
+                AT91F_USB_SendData(pUdp, bosDescriptor, MIN(sizeof(bosDescriptor), wLength));
+            else if ( (wValue & 0x300) == 0x300) { // Return String Descriptor
 
-				const char *strDescriptor = getStringDescriptor(wValue & 0xff);
-				if (strDescriptor != NULL) {
-					AT91F_USB_SendData(pUdp, strDescriptor, MIN(strDescriptor[0], wLength));
-				} else {
-					AT91F_USB_SendStall(pUdp);
-				}
-			} else {
-				AT91F_USB_SendStall(pUdp);
-			}
-		}
-		break;
-	case STD_SET_ADDRESS:
-		AT91F_USB_SendZlp(pUdp);
-		pUdp->UDP_FADDR = (AT91C_UDP_FEN | (wValue & 0x7F) );
-		pUdp->UDP_GLBSTATE  = (wValue) ? AT91C_UDP_FADDEN : 0;
-		break;
-	case STD_SET_CONFIGURATION:
+                const char *strDescriptor = getStringDescriptor(wValue & 0xff);
+                if (strDescriptor != NULL) {
+                    AT91F_USB_SendData(pUdp, strDescriptor, MIN(strDescriptor[0], wLength));
+                } else {
+                    AT91F_USB_SendStall(pUdp);
+                }
+            } else {
+                AT91F_USB_SendStall(pUdp);
+            }
+        }
+        break;
+    case STD_SET_ADDRESS:
+        AT91F_USB_SendZlp(pUdp);
+        pUdp->UDP_FADDR = (AT91C_UDP_FEN | (wValue & 0x7F) );
+        pUdp->UDP_GLBSTATE  = (wValue) ? AT91C_UDP_FADDEN : 0;
+        break;
+    case STD_SET_CONFIGURATION:
 
-		/*
-		*   Set or clear the device "configured" state.
-		*   The LSB of wValue is the "Configuration Number". If this value is non-zero,
-		*   it should be the same number as defined in the Configuration Descriptor;
-		*   otherwise an error must have occurred.
-		*   This device has only one configuration and its Config Number is CONF_NB (= 1).
-		*/
-		AT91F_USB_SendZlp(pUdp);
-		btConfiguration = wValue;
-		pUdp->UDP_GLBSTATE  = (wValue) ? AT91C_UDP_CONFG : AT91C_UDP_FADDEN;
+        /*
+        *   Set or clear the device "configured" state.
+        *   The LSB of wValue is the "Configuration Number". If this value is non-zero,
+        *   it should be the same number as defined in the Configuration Descriptor;
+        *   otherwise an error must have occurred.
+        *   This device has only one configuration and its Config Number is CONF_NB (= 1).
+        */
+        AT91F_USB_SendZlp(pUdp);
+        btConfiguration = wValue;
+        pUdp->UDP_GLBSTATE  = (wValue) ? AT91C_UDP_CONFG : AT91C_UDP_FADDEN;
 
-		// make sure we are not stalled
-		/*
-		UDP_CLEAR_EP_FLAGS(AT91C_EP_OUT   , AT91C_UDP_FORCESTALL);
+        // make sure we are not stalled
+        /*
+        UDP_CLEAR_EP_FLAGS(AT91C_EP_OUT   , AT91C_UDP_FORCESTALL);
         UDP_CLEAR_EP_FLAGS(AT91C_EP_IN    , AT91C_UDP_FORCESTALL);
-		UDP_CLEAR_EP_FLAGS(AT91C_EP_NOTIFY, AT91C_UDP_FORCESTALL);
-		*/
+        UDP_CLEAR_EP_FLAGS(AT91C_EP_NOTIFY, AT91C_UDP_FORCESTALL);
+        */
 
-		// enable endpoints
-		pUdp->UDP_CSR[AT91C_EP_OUT]    = (wValue) ? (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_BULK_OUT) : 0;
-		pUdp->UDP_CSR[AT91C_EP_IN]     = (wValue) ? (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_BULK_IN)  : 0;
-		pUdp->UDP_CSR[AT91C_EP_NOTIFY] = (wValue) ? (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_INT_IN)   : 0;
-		break;
-	case STD_GET_CONFIGURATION:
-		AT91F_USB_SendData(pUdp, (char *) &(btConfiguration), sizeof(btConfiguration));
-		break;
-	case STD_GET_STATUS_ZERO:
-		wStatus = 0;   // Device is Bus powered, remote wakeup disabled
-		AT91F_USB_SendData(pUdp, (char *) &wStatus, sizeof(wStatus));
-		break;
-	case STD_GET_STATUS_INTERFACE:
-		wStatus = 0;   // reserved for future use
-		AT91F_USB_SendData(pUdp, (char *) &wStatus, sizeof(wStatus));
-		break;
-	case STD_GET_STATUS_ENDPOINT:
-		wStatus = 0;
-		wIndex &= 0x0F;
-		if ((pUdp->UDP_GLBSTATE & AT91C_UDP_CONFG) && (wIndex <= AT91C_EP_NOTIFY)) {
-			wStatus = (pUdp->UDP_CSR[wIndex] & AT91C_UDP_EPEDS) ? 0 : 1;
-			AT91F_USB_SendData(pUdp, (char *) &wStatus, sizeof(wStatus));
-		}
-		else if ((pUdp->UDP_GLBSTATE & AT91C_UDP_FADDEN) && (wIndex == AT91C_EP_CONTROL)) {
-			wStatus = (pUdp->UDP_CSR[wIndex] & AT91C_UDP_EPEDS) ? 0 : 1;
-			AT91F_USB_SendData(pUdp, (char *) &wStatus, sizeof(wStatus));
-		} else {
-			AT91F_USB_SendStall(pUdp);
-		}
-		break;
-	case STD_SET_FEATURE_ZERO:
-		AT91F_USB_SendStall(pUdp);
-	    break;
-	case STD_SET_FEATURE_INTERFACE:
-		AT91F_USB_SendZlp(pUdp);
-		break;
-	case STD_SET_FEATURE_ENDPOINT:
-		wIndex &= 0x0F;
-		if ((wValue == 0) && (wIndex >= AT91C_EP_OUT) && (wIndex <= AT91C_EP_NOTIFY)) {
-			pUdp->UDP_CSR[wIndex] = 0;
-			AT91F_USB_SendZlp(pUdp);
-		} else {
-			AT91F_USB_SendStall(pUdp);
-		}
-		break;
-	case STD_CLEAR_FEATURE_ZERO:
-		AT91F_USB_SendStall(pUdp);
-	    break;
-	case STD_CLEAR_FEATURE_INTERFACE:
-		AT91F_USB_SendZlp(pUdp);
-		break;
-	case STD_CLEAR_FEATURE_ENDPOINT:
-		wIndex &= 0x0F;
-		if ((wValue == 0) && (wIndex >= AT91C_EP_OUT) && (wIndex <= AT91C_EP_NOTIFY)) {
+        // enable endpoints
+        pUdp->UDP_CSR[AT91C_EP_OUT]    = (wValue) ? (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_BULK_OUT) : 0;
+        pUdp->UDP_CSR[AT91C_EP_IN]     = (wValue) ? (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_BULK_IN)  : 0;
+        pUdp->UDP_CSR[AT91C_EP_NOTIFY] = (wValue) ? (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_INT_IN)   : 0;
+        break;
+    case STD_GET_CONFIGURATION:
+        AT91F_USB_SendData(pUdp, (char *) &(btConfiguration), sizeof(btConfiguration));
+        break;
+    case STD_GET_STATUS_ZERO:
+        wStatus = 0;   // Device is Bus powered, remote wakeup disabled
+        AT91F_USB_SendData(pUdp, (char *) &wStatus, sizeof(wStatus));
+        break;
+    case STD_GET_STATUS_INTERFACE:
+        wStatus = 0;   // reserved for future use
+        AT91F_USB_SendData(pUdp, (char *) &wStatus, sizeof(wStatus));
+        break;
+    case STD_GET_STATUS_ENDPOINT:
+        wStatus = 0;
+        wIndex &= 0x0F;
+        if ((pUdp->UDP_GLBSTATE & AT91C_UDP_CONFG) && (wIndex <= AT91C_EP_NOTIFY)) {
+            wStatus = (pUdp->UDP_CSR[wIndex] & AT91C_UDP_EPEDS) ? 0 : 1;
+            AT91F_USB_SendData(pUdp, (char *) &wStatus, sizeof(wStatus));
+        }
+        else if ((pUdp->UDP_GLBSTATE & AT91C_UDP_FADDEN) && (wIndex == AT91C_EP_CONTROL)) {
+            wStatus = (pUdp->UDP_CSR[wIndex] & AT91C_UDP_EPEDS) ? 0 : 1;
+            AT91F_USB_SendData(pUdp, (char *) &wStatus, sizeof(wStatus));
+        } else {
+            AT91F_USB_SendStall(pUdp);
+        }
+        break;
+    case STD_SET_FEATURE_ZERO:
+        AT91F_USB_SendStall(pUdp);
+        break;
+    case STD_SET_FEATURE_INTERFACE:
+        AT91F_USB_SendZlp(pUdp);
+        break;
+    case STD_SET_FEATURE_ENDPOINT:
+        wIndex &= 0x0F;
+        if ((wValue == 0) && (wIndex >= AT91C_EP_OUT) && (wIndex <= AT91C_EP_NOTIFY)) {
+            pUdp->UDP_CSR[wIndex] = 0;
+            AT91F_USB_SendZlp(pUdp);
+        } else {
+            AT91F_USB_SendStall(pUdp);
+        }
+        break;
+    case STD_CLEAR_FEATURE_ZERO:
+        AT91F_USB_SendStall(pUdp);
+        break;
+    case STD_CLEAR_FEATURE_INTERFACE:
+        AT91F_USB_SendZlp(pUdp);
+        break;
+    case STD_CLEAR_FEATURE_ENDPOINT:
+        wIndex &= 0x0F;
+        if ((wValue == 0) && (wIndex >= AT91C_EP_OUT) && (wIndex <= AT91C_EP_NOTIFY)) {
 
-			if (wIndex == AT91C_EP_OUT)			pUdp->UDP_CSR[AT91C_EP_OUT] = (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_BULK_OUT);
-			else if (wIndex == AT91C_EP_IN)		pUdp->UDP_CSR[AT91C_EP_IN] = (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_BULK_IN);
-			else if (wIndex == AT91C_EP_NOTIFY) pUdp->UDP_CSR[AT91C_EP_NOTIFY] = (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_INT_IN);
+            if (wIndex == AT91C_EP_OUT)         pUdp->UDP_CSR[AT91C_EP_OUT] = (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_BULK_OUT);
+            else if (wIndex == AT91C_EP_IN)     pUdp->UDP_CSR[AT91C_EP_IN] = (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_BULK_IN);
+            else if (wIndex == AT91C_EP_NOTIFY) pUdp->UDP_CSR[AT91C_EP_NOTIFY] = (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_INT_IN);
 
-			AT91F_USB_SendZlp(pUdp);
-		} else {
-			AT91F_USB_SendStall(pUdp);
-		}
-		break;
+            AT91F_USB_SendZlp(pUdp);
+        } else {
+            AT91F_USB_SendStall(pUdp);
+        }
+        break;
 
-	// handle CDC class requests
-	case SET_LINE_CODING: {
-	/*
-	    uint8_t i;
-		for ( i = 0 ; i < 7 ; i++ )  {
-			((uint8_t*)&line)[i] =  pUdp->UDP_FDR[AT91C_EP_CONTROL];
-		}  */
-		// ignore SET_LINE_CODING...
-		while ( !(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_RX_DATA_BK0) );
-		UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_RX_DATA_BK0);
-		AT91F_USB_SendZlp(pUdp);
-		break;
-	}
-	case GET_LINE_CODING:
-		AT91F_USB_SendData(pUdp, (char *) &line, MIN(sizeof(line), wLength));
-		break;
-	case SET_CONTROL_LINE_STATE:
-		btConnection = wValue;
-		AT91F_USB_SendZlp(pUdp);
-		break;
-	default:
-		AT91F_USB_SendStall(pUdp);
-	    break;
-	}
+    // handle CDC class requests
+    case SET_LINE_CODING: {
+    /*
+        uint8_t i;
+        for ( i = 0 ; i < 7 ; i++ )  {
+            ((uint8_t*)&line)[i] =  pUdp->UDP_FDR[AT91C_EP_CONTROL];
+        }  */
+        // ignore SET_LINE_CODING...
+        while ( !(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_RX_DATA_BK0) );
+        UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_RX_DATA_BK0);
+        AT91F_USB_SendZlp(pUdp);
+        break;
+    }
+    case GET_LINE_CODING:
+        AT91F_USB_SendData(pUdp, (char *) &line, MIN(sizeof(line), wLength));
+        break;
+    case SET_CONTROL_LINE_STATE:
+        btConnection = wValue;
+        AT91F_USB_SendZlp(pUdp);
+        break;
+    default:
+        AT91F_USB_SendStall(pUdp);
+        break;
+    }
 }
\ No newline at end of file
diff --git a/common/wiegand.c b/common/wiegand.c
index 730cb0206..18f1bca7d 100644
--- a/common/wiegand.c
+++ b/common/wiegand.c
@@ -37,27 +37,27 @@ uint8_t checkParity(uint32_t bits, uint8_t len, uint8_t type);
 // takes a array of binary values, start position, length of bits per parity (includes parity bit),
 // Parity Type (1 for odd; 0 for even; 2 for Always 1's; 3 for Always 0's), and binary Length (length to run)
 size_t removeParity(uint8_t *bitstream, size_t startIdx, uint8_t pLen, uint8_t pType, size_t bLen) {
-	uint32_t parityWd = 0;
-	size_t j = 0, bitcount = 0;
-	for (int word = 0; word < (bLen); word += pLen){
-		for (int bit = 0; bit < pLen; ++bit){
-			parityWd = (parityWd << 1) | bitstream[startIdx+word+bit];
-			bitstream[j++] = (bitstream[startIdx + word + bit]);
-		}
-		j--; // overwrite parity with next data
-		// if parity fails then return 0
-		switch (pType) {
-			case 3: if (bitstream[j] == 1) return 0; break; //should be 0 spacer bit
-			case 2: if (bitstream[j] == 0) return 0; break; //should be 1 spacer bit
-			default: //test parity
-				if (parityTest(parityWd, pLen, pType) == 0) return 0; break;
-		}
-		bitcount += ( pLen - 1 );
-		parityWd = 0;
-	}
-	// if we got here then all the parities passed
-	//return ID start index and size
-	return bitcount;
+    uint32_t parityWd = 0;
+    size_t j = 0, bitcount = 0;
+    for (int word = 0; word < (bLen); word += pLen){
+        for (int bit = 0; bit < pLen; ++bit){
+            parityWd = (parityWd << 1) | bitstream[startIdx+word+bit];
+            bitstream[j++] = (bitstream[startIdx + word + bit]);
+        }
+        j--; // overwrite parity with next data
+        // if parity fails then return 0
+        switch (pType) {
+            case 3: if (bitstream[j] == 1) return 0; break; //should be 0 spacer bit
+            case 2: if (bitstream[j] == 0) return 0; break; //should be 1 spacer bit
+            default: //test parity
+                if (parityTest(parityWd, pLen, pType) == 0) return 0; break;
+        }
+        bitcount += ( pLen - 1 );
+        parityWd = 0;
+    }
+    // if we got here then all the parities passed
+    //return ID start index and size
+    return bitcount;
 }
 
 
@@ -76,28 +76,28 @@ size_t removeParity(uint8_t *bitstream, size_t startIdx, uint8_t pLen, uint8_t p
 */
 size_t addParity(uint8_t *bits, uint8_t *dest, uint8_t sourceLen, uint8_t pLen, uint8_t pType)
 {
-	uint32_t parityWd = 0;
-	size_t j = 0, bitCnt = 0;
-	for (int word = 0; word < sourceLen; word += pLen-1) {
-		for (int bit = 0; bit < pLen-1; ++bit){
-			parityWd = (parityWd << 1) | bits[word+bit];
-			dest[j++] = (bits[word+bit]);
-		}
+    uint32_t parityWd = 0;
+    size_t j = 0, bitCnt = 0;
+    for (int word = 0; word < sourceLen; word += pLen-1) {
+        for (int bit = 0; bit < pLen-1; ++bit){
+            parityWd = (parityWd << 1) | bits[word+bit];
+            dest[j++] = (bits[word+bit]);
+        }
 
-		// if parity fails then return 0
-		switch (pType) {
-			case 3: dest[j++] = 0; break; // marker bit which should be a 0
-			case 2: dest[j++] = 1; break; // marker bit which should be a 1
-			default:
-				dest[j++] = parityTest(parityWd, pLen-1, pType) ^ 1;
-				break;
-		}
-		bitCnt += pLen;
-		parityWd = 0;
-	}
-	// if we got here then all the parities passed
-	//return ID start index and size
-	return bitCnt;
+        // if parity fails then return 0
+        switch (pType) {
+            case 3: dest[j++] = 0; break; // marker bit which should be a 0
+            case 2: dest[j++] = 1; break; // marker bit which should be a 1
+            default:
+                dest[j++] = parityTest(parityWd, pLen-1, pType) ^ 1;
+                break;
+        }
+        bitCnt += pLen;
+        parityWd = 0;
+    }
+    // if we got here then all the parities passed
+    //return ID start index and size
+    return bitCnt;
 }
 
 // by marshmellow
@@ -110,18 +110,18 @@ size_t addParity(uint8_t *bits, uint8_t *dest, uint8_t sourceLen, uint8_t pLen,
 */
 void wiegand_add_parity(uint8_t *source, uint8_t *dest, uint8_t len) {
 
-	// Copy to destination, shifted one step to make room for EVEN parity
+    // Copy to destination, shifted one step to make room for EVEN parity
     memcpy(dest+1, source, length);
 
-	// half length, Even and Odd is calculated to the middle.
-	uint8_t len_h2 = length >> 1;
+    // half length, Even and Odd is calculated to the middle.
+    uint8_t len_h2 = length >> 1;
 
-	// add EVEN parity at the beginning
+    // add EVEN parity at the beginning
     *(dest) = GetParity(source, EVEN, len_h2);
 
     dest += length + 1;
 
-	// add ODD parity at the very end
+    // add ODD parity at the very end
     *(dest) = GetParity(source + len_h2, ODD, len_h2);
 }
 
@@ -138,18 +138,18 @@ void wiegand_add_parity(uint8_t *source, uint8_t *dest, uint8_t len) {
 */
 void num_to_wiegand_bytes(uint64_t oem, uint64_t fc, uint64_t cn, uint8_t *dest, uint8_t formatlen){
 
-	uint8_t data[MAX_BITS_TXX55] = {0};
-	memset(data, 0, sizeof(data));
+    uint8_t data[MAX_BITS_TXX55] = {0};
+    memset(data, 0, sizeof(data));
 
-	num_to_wiegand_bits(oem, fc, cn, data, formatlen);
+    num_to_wiegand_bits(oem, fc, cn, data, formatlen);
 
-	// loop
-	// (formatlen / 32 ) + 1
-	// (formatlen >> 5) + 1
-	for (int i = 0; i < formatlen ; ++i){
-		uint32_t value  = bytebits_to_byte( data + (i * 32), 32);
-		num_to_bytes(value, 32, dest + (i*4) );
-	}
+    // loop
+    // (formatlen / 32 ) + 1
+    // (formatlen >> 5) + 1
+    for (int i = 0; i < formatlen ; ++i){
+        uint32_t value  = bytebits_to_byte( data + (i * 32), 32);
+        num_to_bytes(value, 32, dest + (i*4) );
+    }
 
 }
 /*
@@ -162,70 +162,70 @@ void num_to_wiegand_bytes(uint64_t oem, uint64_t fc, uint64_t cn, uint8_t *dest,
 */
 void num_to_wiegand_bits(uint64_t oem, uint64_t fc, uint64_t cn, uint8_t *dest, uint8_t formatlen){
 
-	uint8_t bits[MAX_BITS_TXX55] = {0};
-	memset(bits, 0, sizeof(bits));
-	uint8_t *temp = bits;
-	uint64_t value = 0;
+    uint8_t bits[MAX_BITS_TXX55] = {0};
+    memset(bits, 0, sizeof(bits));
+    uint8_t *temp = bits;
+    uint64_t value = 0;
 
-	switch ( formatlen ){
-		case 26 :				// 26bit HID H10301
-			fc &= 0xFF;			// 8bits
-			cn &= 0xFFFF;		// 16bits
-			value = fc << 16 | cn;
-			num_to_bytebits(value, 24, temp);
-			wiegand_add_parity(temp, dest, 24);
-			break;
-		case 261:				// 26bit Indala
-			fc &= 0xFFF;		// 12bits
-			cn &= 0xFFF;		// 12bits
-			value = fc << 12 | cn;
-			num_to_bytebits(value, 24, temp);
-			wiegand_add_parity(temp, dest, 24);
-			break;
-		case 34 :				// 34bits HID
-			fc &= 0xFFFF;		// 16bits
-			cn &= 0xFFFF;		// 16bits
-			value = fc << 16 | cn;
-			num_to_bytebits(value, 32, temp);
-			wiegand_add_parity(temp, dest, 32);
-			break;
-		case 35 :				// 35bits HID
-			fc &= 0xFFF;		// 12bits
-			cn &= 0xFFFFFF;		// 20bits
-			value = fc << 20 | cn;
-			num_to_bytebits(value, 32, temp);
-			wiegand_add_parity(temp, dest, 32);
-			break;
-		case 37 : 				// H10304
-			fc &= 0xFFFF;   	// 16bits
-			cn &= 0x7FFFF;  	// 19bits
-			value = fc << 19 | cn;
-			num_to_bytebits(value, 35, temp);
-			wiegand_add_parity(temp, dest, 35);
-			break;
-		case 39 :				// 39bit KERI System Pyramid
-			fc &= 0x1FFFF;		// 17bits
-			cn &= 0xFFFFFFFF;	// 20bits
-			value = fc << 20 | cn;
-			num_to_bytebits(value, 37, temp);
-			wiegand_add_parity(temp, dest, 37);
-			break;
-		case 44 :				// 44bit KERI system Pyramid
-			oem &= 0xFF;		// 8bits
-			fc &= 0xFFF;		// 12bits
-			cn &= 0xFFFFFFFF;	// 21bits
-			value = oem << 20 | fc << 12 | cn;
-			num_to_bytebits(value, 42, temp);
-			wiegand_add_parity(temp, dest, 42);
-			break;
-		case 50 :				// AWID 50 RBH
-			fc &= 0xFFFF;		// 16bits
-			cn &= 0xFFFFFFFF	// 32bits
-			value = fc << 32 | cn;
-			num_to_bytebits(value, 48, temp);
-			wiegand_add_parity(temp, dest, 48);  // verify!
-			break;
-		default:
-			break;
-	}
+    switch ( formatlen ){
+        case 26 :               // 26bit HID H10301
+            fc &= 0xFF;         // 8bits
+            cn &= 0xFFFF;       // 16bits
+            value = fc << 16 | cn;
+            num_to_bytebits(value, 24, temp);
+            wiegand_add_parity(temp, dest, 24);
+            break;
+        case 261:               // 26bit Indala
+            fc &= 0xFFF;        // 12bits
+            cn &= 0xFFF;        // 12bits
+            value = fc << 12 | cn;
+            num_to_bytebits(value, 24, temp);
+            wiegand_add_parity(temp, dest, 24);
+            break;
+        case 34 :               // 34bits HID
+            fc &= 0xFFFF;       // 16bits
+            cn &= 0xFFFF;       // 16bits
+            value = fc << 16 | cn;
+            num_to_bytebits(value, 32, temp);
+            wiegand_add_parity(temp, dest, 32);
+            break;
+        case 35 :               // 35bits HID
+            fc &= 0xFFF;        // 12bits
+            cn &= 0xFFFFFF;     // 20bits
+            value = fc << 20 | cn;
+            num_to_bytebits(value, 32, temp);
+            wiegand_add_parity(temp, dest, 32);
+            break;
+        case 37 :               // H10304
+            fc &= 0xFFFF;       // 16bits
+            cn &= 0x7FFFF;      // 19bits
+            value = fc << 19 | cn;
+            num_to_bytebits(value, 35, temp);
+            wiegand_add_parity(temp, dest, 35);
+            break;
+        case 39 :               // 39bit KERI System Pyramid
+            fc &= 0x1FFFF;      // 17bits
+            cn &= 0xFFFFFFFF;   // 20bits
+            value = fc << 20 | cn;
+            num_to_bytebits(value, 37, temp);
+            wiegand_add_parity(temp, dest, 37);
+            break;
+        case 44 :               // 44bit KERI system Pyramid
+            oem &= 0xFF;        // 8bits
+            fc &= 0xFFF;        // 12bits
+            cn &= 0xFFFFFFFF;   // 21bits
+            value = oem << 20 | fc << 12 | cn;
+            num_to_bytebits(value, 42, temp);
+            wiegand_add_parity(temp, dest, 42);
+            break;
+        case 50 :               // AWID 50 RBH
+            fc &= 0xFFFF;       // 16bits
+            cn &= 0xFFFFFFFF    // 32bits
+            value = fc << 32 | cn;
+            num_to_bytebits(value, 48, temp);
+            wiegand_add_parity(temp, dest, 48);  // verify!
+            break;
+        default:
+            break;
+    }
 }
\ No newline at end of file

From 9ebf3f4f6d3cbb0100920ddb8c706a16419b04ab Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 9 Mar 2019 20:34:20 +0100
Subject: [PATCH 0708/1938] chg: use bool instead

---
 client/cmdlfem4x.c | 24 ++++++++++++------------
 client/graph.c     | 10 ++++++----
 client/graph.h     |  4 ++--
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 47a05b260..f9ebf5f03 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -206,11 +206,11 @@ void ConstructEM410xEmulGraph(const char *uid,const  uint8_t clock) {
 	int i, j, binary[4], parity[4];
 	uint32_t n;
 	/* clear our graph */
-	ClearGraph(0);
+	ClearGraph(false);
 
 	/* write 9 start bits */
 	for (i = 0; i < 9; i++)
-		AppendGraph(0, clock, 1);
+		AppendGraph(false, clock, 1);
 
 	/* for each hex char */
 	parity[0] = parity[1] = parity[2] = parity[3] = 0;
@@ -221,13 +221,13 @@ void ConstructEM410xEmulGraph(const char *uid,const  uint8_t clock) {
 			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]);
+		AppendGraph(false, clock, binary[0]);
+		AppendGraph(false, clock, binary[1]);
+		AppendGraph(false, clock, binary[2]);
+		AppendGraph(false, clock, binary[3]);
 
 		/* append parity bit */
-		AppendGraph(0, clock, binary[0] ^ binary[1] ^ binary[2] ^ binary[3]);
+		AppendGraph(false, clock, binary[0] ^ binary[1] ^ binary[2] ^ binary[3]);
 
 		/* keep track of column parity */
 		parity[0] ^= binary[0];
@@ -237,13 +237,13 @@ void ConstructEM410xEmulGraph(const char *uid,const  uint8_t clock) {
 	}
 
 	/* parity columns */
-	AppendGraph(0, clock, parity[0]);
-	AppendGraph(0, clock, parity[1]);
-	AppendGraph(0, clock, parity[2]);
-	AppendGraph(0, clock, parity[3]);
+	AppendGraph(false, clock, parity[0]);
+	AppendGraph(false, clock, parity[1]);
+	AppendGraph(false, clock, parity[2]);
+	AppendGraph(false, clock, parity[3]);
 
 	/* stop bit */
-	AppendGraph(1, clock, 0);
+	AppendGraph(true, clock, 0);
 }
 
 //by marshmellow
diff --git a/client/graph.c b/client/graph.c
index 0f7789093..c3f6a2b99 100644
--- a/client/graph.c
+++ b/client/graph.c
@@ -13,8 +13,10 @@ int GraphBuffer[MAX_GRAPH_TRACE_LEN];
 int GraphTraceLen;
 int s_Buff[MAX_GRAPH_TRACE_LEN];
 
-/* write a manchester bit to the graph */
-void AppendGraph(int redraw, int clock, int bit) {
+/* write a manchester bit to the graph
+TODO,  verfy that this doesn't overflow buffer  (iceman)
+*/
+void AppendGraph(bool redraw, int clock, int bit) {
 	int i;
 	//set first half the clock bit (all 1's or 0's for a 0 or 1 bit)
 	for (i = 0; i < (int)(clock / 2); ++i)
@@ -28,7 +30,7 @@ void AppendGraph(int redraw, int clock, int bit) {
 }
 
 // clear out our graph window
-int ClearGraph(int redraw) {
+int ClearGraph(bool redraw) {
 	int gtl = GraphTraceLen;
 	memset(GraphBuffer, 0x00, GraphTraceLen);
 	GraphTraceLen = 0;
@@ -60,7 +62,7 @@ void save_restoreGB(uint8_t saveOpt) {
 void setGraphBuf(uint8_t *buf, size_t size) {
 	if ( buf == NULL ) return;
 
-	ClearGraph(0);
+	ClearGraph(false);
 
 	if ( size > MAX_GRAPH_TRACE_LEN )
 		size = MAX_GRAPH_TRACE_LEN;
diff --git a/client/graph.h b/client/graph.h
index 3e56d09f2..05750ab16 100644
--- a/client/graph.h
+++ b/client/graph.h
@@ -18,8 +18,8 @@
 #include "lfdemod.h"
 #include "cmddata.h" //for g_debugmode
 
-void AppendGraph(int redraw, int clock, int bit);
-int ClearGraph(int redraw);
+void AppendGraph(bool redraw, int clock, int bit);
+int ClearGraph(bool redraw);
 size_t getFromGraphBuf(uint8_t *buff);
 int GetAskClock(const char *str, bool printAns);
 int GetPskClock(const char *str, bool printAns);

From 8a7c6825b53e400cb480d93dab88ddb8c96182d8 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 9 Mar 2019 20:34:41 +0100
Subject: [PATCH 0709/1938] armsrc: fix mix of spaces & tabs

---
 armsrc/BigBuf.c           |  236 +-
 armsrc/BigBuf.h           |   14 +-
 armsrc/LCD.c              |  172 +-
 armsrc/LCD.h              |  190 +-
 armsrc/appmain.c          | 2248 ++++++++--------
 armsrc/apps.h             |    4 +-
 armsrc/buzzer.c           |  112 +-
 armsrc/des.c              |  450 ++--
 armsrc/des.h              |   10 +-
 armsrc/desfire_crypto.c   |   78 +-
 armsrc/desfire_key.c      |   42 +-
 armsrc/desfire_key.h      |   22 +-
 armsrc/epa.c              |  728 ++---
 armsrc/epa.h              |    6 +-
 armsrc/felica.c           |  806 +++---
 armsrc/flashmem.c         |  620 ++---
 armsrc/flashmem.h         |  104 +-
 armsrc/fonts.c            |  582 ++--
 armsrc/fpgaloader.c       |  568 ++--
 armsrc/fpgaloader.h       |   80 +-
 armsrc/hfsnoop.c          |   90 +-
 armsrc/hitag2.c           | 2722 +++++++++----------
 armsrc/hitagS.c           | 3524 ++++++++++++------------
 armsrc/iclass.c           | 3196 +++++++++++-----------
 armsrc/iso14443a.c        | 5317 +++++++++++++++++++------------------
 armsrc/iso14443a.h        |   96 +-
 armsrc/iso14443b.c        | 2218 ++++++++--------
 armsrc/iso14443b.h        |   18 +-
 armsrc/iso15693.c         | 1298 ++++-----
 armsrc/lfops.c            | 2981 ++++++++++-----------
 armsrc/lfsampling.c       |  554 ++--
 armsrc/lfsampling.h       |    6 +-
 armsrc/mifarecmd.c        | 2936 ++++++++++----------
 armsrc/mifaredesfire.c    |  498 ++--
 armsrc/mifaresniff.c      |  494 ++--
 armsrc/mifaresniff.h      |   22 +-
 armsrc/mifareutil.c       |  902 +++----
 armsrc/mifareutil.h       |    8 +-
 armsrc/optimized_cipher.c |  258 +-
 armsrc/optimized_cipher.h |   16 +-
 armsrc/pcf7931.c          |  788 +++---
 armsrc/printf.c           |  630 ++---
 armsrc/start.c            |   70 +-
 armsrc/string.c           |   84 +-
 armsrc/ticks.c            |  280 +-
 armsrc/util.c             |  288 +-
 armsrc/util.h             |    4 +-
 47 files changed, 18186 insertions(+), 18184 deletions(-)

diff --git a/armsrc/BigBuf.c b/armsrc/BigBuf.c
index b6c9e544d..26421732c 100644
--- a/armsrc/BigBuf.c
+++ b/armsrc/BigBuf.c
@@ -20,7 +20,7 @@ Pointer to highest available memory: BigBuf_hi
 
     high BIGBUF_SIZE
     reserved = BigBuf_malloc()  subtracts amount from BigBuf_hi,
-	low  0x00
+    low  0x00
 */
 
 // High memory mark
@@ -35,92 +35,92 @@ static bool tracing = true; //todo static?
 
 // get the address of BigBuf
 uint8_t *BigBuf_get_addr(void) {
-	return (uint8_t *)BigBuf;
+    return (uint8_t *)BigBuf;
 }
 
 // get the address of the emulator memory. Allocate part of Bigbuf for it, if not yet done
 uint8_t *BigBuf_get_EM_addr(void) {
-	// not yet allocated
-	if (emulator_memory == NULL)
-		emulator_memory = BigBuf_malloc(CARD_MEMORY_SIZE);
+    // not yet allocated
+    if (emulator_memory == NULL)
+        emulator_memory = BigBuf_malloc(CARD_MEMORY_SIZE);
 
-	return emulator_memory;
+    return emulator_memory;
 }
 
 // clear ALL of BigBuf
 void BigBuf_Clear(void) {
-	BigBuf_Clear_ext(true);
+    BigBuf_Clear_ext(true);
 }
 
 // clear ALL of BigBuf
 void BigBuf_Clear_ext(bool verbose) {
-	memset(BigBuf, 0, BIGBUF_SIZE);
-	if (verbose)
-		Dbprintf("Buffer cleared (%i bytes)", BIGBUF_SIZE);
+    memset(BigBuf, 0, BIGBUF_SIZE);
+    if (verbose)
+        Dbprintf("Buffer cleared (%i bytes)", BIGBUF_SIZE);
 }
 
 void BigBuf_Clear_EM(void) {
-	memset(BigBuf_get_EM_addr(), 0, CARD_MEMORY_SIZE);
+    memset(BigBuf_get_EM_addr(), 0, CARD_MEMORY_SIZE);
 }
 
 void BigBuf_Clear_keep_EM(void) {
-	memset(BigBuf, 0, BigBuf_hi);
+    memset(BigBuf, 0, BigBuf_hi);
 }
 
 // allocate a chunk of memory from BigBuf. We allocate high memory first. The unallocated memory
 // at the beginning of BigBuf is always for traces/samples
 uint8_t *BigBuf_malloc(uint16_t chunksize) {
-	if (BigBuf_hi - chunksize < 0)
-		return NULL;							// no memory left
+    if (BigBuf_hi - chunksize < 0)
+        return NULL; // no memory left
 
-	chunksize = (chunksize + 3) & 0xfffc;	// round to next multiple of 4
-	BigBuf_hi -= chunksize; 		  		// aligned to 4 Byte boundary
-	return (uint8_t *)BigBuf + BigBuf_hi;
+    chunksize = (chunksize + 3) & 0xfffc; // round to next multiple of 4
+    BigBuf_hi -= chunksize;  // aligned to 4 Byte boundary
+    return (uint8_t *)BigBuf + BigBuf_hi;
 }
 
 // free ALL allocated chunks. The whole BigBuf is available for traces or samples again.
 void BigBuf_free(void){
-	BigBuf_hi = BIGBUF_SIZE;
-	emulator_memory = NULL;
-	// shouldn't this empty BigBuf also?
+    BigBuf_hi = BIGBUF_SIZE;
+    emulator_memory = NULL;
+    // shouldn't this empty BigBuf also?
 }
 
 // free allocated chunks EXCEPT the emulator memory
 void BigBuf_free_keep_EM(void) {
-	if (emulator_memory != NULL)
-		BigBuf_hi = emulator_memory - (uint8_t *)BigBuf;
-	else
-		BigBuf_hi = BIGBUF_SIZE;
+    if (emulator_memory != NULL)
+        BigBuf_hi = emulator_memory - (uint8_t *)BigBuf;
+    else
+        BigBuf_hi = BIGBUF_SIZE;
 
-	// shouldn't this empty BigBuf also?
+    // shouldn't this empty BigBuf also?
 }
 
 void BigBuf_print_status(void) {
-	Dbprintf("Memory");
-	Dbprintf("  BIGBUF_SIZE.............%d", BIGBUF_SIZE);
-	Dbprintf("  Available memory........%d", BigBuf_hi);
-	Dbprintf("Tracing");
-	Dbprintf("  tracing ................%d", tracing);
-	Dbprintf("  traceLen ...............%d", traceLen);
+    Dbprintf("Memory");
+    Dbprintf("  BIGBUF_SIZE.............%d", BIGBUF_SIZE);
+    Dbprintf("  Available memory........%d", BigBuf_hi);
+    Dbprintf("Tracing");
+    Dbprintf("  tracing ................%d", tracing);
+    Dbprintf("  traceLen ...............%d", traceLen);
 }
 
 // return the maximum trace length (i.e. the unallocated size of BigBuf)
 uint16_t BigBuf_max_traceLen(void) {
-	return BigBuf_hi;
+    return BigBuf_hi;
 }
 
 void clear_trace(void) {
-	traceLen = 0;
+    traceLen = 0;
 }
 void set_tracelen(uint32_t value) {
     traceLen = value;
 }
 void set_tracing(bool enable) {
-	tracing = enable;
+    tracing = enable;
 }
 
 bool get_tracing(void) {
-	return tracing;
+    return tracing;
 }
 
 /**
@@ -128,7 +128,7 @@ bool get_tracing(void) {
  * @return
  */
 uint32_t BigBuf_get_traceLen(void) {
-	return traceLen;
+    return traceLen;
 }
 
 /**
@@ -138,111 +138,111 @@ uint32_t BigBuf_get_traceLen(void) {
   annotation of commands/responses.
 **/
 bool RAMFUNC LogTrace(const uint8_t *btBytes, uint16_t iLen, uint32_t timestamp_start, uint32_t timestamp_end, uint8_t *parity, bool readerToTag) {
-	if (!tracing) return false;
+    if (!tracing) return false;
 
-	uint8_t *trace = BigBuf_get_addr();
+    uint8_t *trace = BigBuf_get_addr();
 
-	uint32_t num_paritybytes = (iLen-1)/8 + 1;	// number of valid paritybytes in *parity
-	uint32_t duration = timestamp_end - timestamp_start;
+    uint32_t num_paritybytes = (iLen-1)/8 + 1; // number of valid paritybytes in *parity
+    uint32_t duration = timestamp_end - timestamp_start;
 
-	// Return when trace is full
-	if (traceLen + sizeof(iLen) + sizeof(timestamp_start) + sizeof(duration) + num_paritybytes + iLen >= BigBuf_max_traceLen()) {
-		tracing = false;	// don't trace any more
-		return false;
-	}
-	// Traceformat:
-	// 32 bits timestamp (little endian)
-	// 16 bits duration (little endian)
-	// 16 bits data length (little endian, Highest Bit used as readerToTag flag)
-	// y Bytes data
-	// x Bytes parity (one byte per 8 bytes data)
+    // Return when trace is full
+    if (traceLen + sizeof(iLen) + sizeof(timestamp_start) + sizeof(duration) + num_paritybytes + iLen >= BigBuf_max_traceLen()) {
+        tracing = false; // don't trace any more
+        return false;
+    }
+    // Traceformat:
+    // 32 bits timestamp (little endian)
+    // 16 bits duration (little endian)
+    // 16 bits data length (little endian, Highest Bit used as readerToTag flag)
+    // y Bytes data
+    // x Bytes parity (one byte per 8 bytes data)
 
-	// timestamp (start)
-	trace[traceLen++] = ((timestamp_start >> 0) & 0xff);
-	trace[traceLen++] = ((timestamp_start >> 8) & 0xff);
-	trace[traceLen++] = ((timestamp_start >> 16) & 0xff);
-	trace[traceLen++] = ((timestamp_start >> 24) & 0xff);
+    // timestamp (start)
+    trace[traceLen++] = ((timestamp_start >> 0) & 0xff);
+    trace[traceLen++] = ((timestamp_start >> 8) & 0xff);
+    trace[traceLen++] = ((timestamp_start >> 16) & 0xff);
+    trace[traceLen++] = ((timestamp_start >> 24) & 0xff);
 
-	// duration
-	trace[traceLen++] = ((duration >> 0) & 0xff);
-	trace[traceLen++] = ((duration >> 8) & 0xff);
+    // duration
+    trace[traceLen++] = ((duration >> 0) & 0xff);
+    trace[traceLen++] = ((duration >> 8) & 0xff);
 
-	// data length
-	trace[traceLen++] = ((iLen >> 0) & 0xff);
-	trace[traceLen++] = ((iLen >> 8) & 0xff);
+    // data length
+    trace[traceLen++] = ((iLen >> 0) & 0xff);
+    trace[traceLen++] = ((iLen >> 8) & 0xff);
 
-	// readerToTag flag
-	if (!readerToTag) {
-		trace[traceLen - 1] |= 0x80;
-	}
+    // readerToTag flag
+    if (!readerToTag) {
+        trace[traceLen - 1] |= 0x80;
+    }
 
-	// data bytes
-	if (btBytes != NULL && iLen != 0) {
-		memcpy(trace + traceLen, btBytes, iLen);
-	}
-	traceLen += iLen;
+    // data bytes
+    if (btBytes != NULL && iLen != 0) {
+        memcpy(trace + traceLen, btBytes, iLen);
+    }
+    traceLen += iLen;
 
-	// parity bytes
-	if (num_paritybytes != 0) {
-		if (parity != NULL) {
-			memcpy(trace + traceLen, parity, num_paritybytes);
-		} else {
-			memset(trace + traceLen, 0x00, num_paritybytes);
-		}
-	}
-	traceLen += num_paritybytes;
+    // parity bytes
+    if (num_paritybytes != 0) {
+        if (parity != NULL) {
+            memcpy(trace + traceLen, parity, num_paritybytes);
+        } else {
+            memset(trace + traceLen, 0x00, num_paritybytes);
+        }
+    }
+    traceLen += num_paritybytes;
 
-	return true;
+    return true;
 }
 
 int LogTraceHitag(const uint8_t * btBytes, int iBits, int iSamples, uint32_t dwParity, int readerToTag) {
-	/**
-	  Todo, rewrite the logger to use the generic functionality instead. It should be noted, however,
-	  that this logger takes number of bits as argument, not number of bytes.
-	  **/
+    /**
+      Todo, rewrite the logger to use the generic functionality instead. It should be noted, however,
+      that this logger takes number of bits as argument, not number of bytes.
+      **/
 
-	if (!tracing) return false;
+    if (!tracing) return false;
 
-	uint8_t *trace = BigBuf_get_addr();
-	uint32_t iLen = nbytes(iBits);
-	// Return when trace is full
-	if (traceLen + sizeof(rsamples) + sizeof(dwParity) + sizeof(iBits) + iLen > BigBuf_max_traceLen()) return false;
+    uint8_t *trace = BigBuf_get_addr();
+    uint32_t iLen = nbytes(iBits);
+    // Return when trace is full
+    if (traceLen + sizeof(rsamples) + sizeof(dwParity) + sizeof(iBits) + iLen > BigBuf_max_traceLen()) return false;
 
-	//Hitag traces appear to use this traceformat:
-	// 32 bits timestamp (little endian,Highest Bit used as readerToTag flag)
-	// 32 bits parity
-	// 8 bits size (number of bits in the trace entry, not number of bytes)
-	// y Bytes data
+    //Hitag traces appear to use this traceformat:
+    // 32 bits timestamp (little endian,Highest Bit used as readerToTag flag)
+    // 32 bits parity
+    // 8 bits size (number of bits in the trace entry, not number of bytes)
+    // y Bytes data
 
-	rsamples += iSamples;
-	trace[traceLen++] = ((rsamples >> 0) & 0xff);
-	trace[traceLen++] = ((rsamples >> 8) & 0xff);
-	trace[traceLen++] = ((rsamples >> 16) & 0xff);
-	trace[traceLen++] = ((rsamples >> 24) & 0xff);
+    rsamples += iSamples;
+    trace[traceLen++] = ((rsamples >> 0) & 0xff);
+    trace[traceLen++] = ((rsamples >> 8) & 0xff);
+    trace[traceLen++] = ((rsamples >> 16) & 0xff);
+    trace[traceLen++] = ((rsamples >> 24) & 0xff);
 
-	if (!readerToTag) {
-		trace[traceLen - 1] |= 0x80;
-	}
+    if (!readerToTag) {
+        trace[traceLen - 1] |= 0x80;
+    }
 
-	trace[traceLen++] = ((dwParity >> 0) & 0xff);
-	trace[traceLen++] = ((dwParity >> 8) & 0xff);
-	trace[traceLen++] = ((dwParity >> 16) & 0xff);
-	trace[traceLen++] = ((dwParity >> 24) & 0xff);
-	trace[traceLen++] = iBits;
+    trace[traceLen++] = ((dwParity >> 0) & 0xff);
+    trace[traceLen++] = ((dwParity >> 8) & 0xff);
+    trace[traceLen++] = ((dwParity >> 16) & 0xff);
+    trace[traceLen++] = ((dwParity >> 24) & 0xff);
+    trace[traceLen++] = iBits;
 
-	memcpy(trace + traceLen, btBytes, iLen);
-	traceLen += iLen;
+    memcpy(trace + traceLen, btBytes, iLen);
+    traceLen += iLen;
 
-	return true;
+    return true;
 }
 
 // Emulator memory
 uint8_t emlSet(uint8_t *data, uint32_t offset, uint32_t length){
-	uint8_t* mem = BigBuf_get_EM_addr();
-	if (offset + length < CARD_MEMORY_SIZE) {
-		memcpy(mem+offset, data, length);
-		return 0;
-	}
-	Dbprintf("Error, trying to set memory outside of bounds! %d  > %d", (offset + length), CARD_MEMORY_SIZE);
-	return 1;
+    uint8_t* mem = BigBuf_get_EM_addr();
+    if (offset + length < CARD_MEMORY_SIZE) {
+        memcpy(mem+offset, data, length);
+        return 0;
+    }
+    Dbprintf("Error, trying to set memory outside of bounds! %d  > %d", (offset + length), CARD_MEMORY_SIZE);
+    return 1;
 }
diff --git a/armsrc/BigBuf.h b/armsrc/BigBuf.h
index 9b7b33e47..e9a7b8098 100644
--- a/armsrc/BigBuf.h
+++ b/armsrc/BigBuf.h
@@ -17,13 +17,13 @@
 #include "string.h"
 #include "ticks.h"
 
-#define BIGBUF_SIZE				40000
-#define MAX_FRAME_SIZE			256		// maximum allowed ISO14443 frame
-#define MAX_PARITY_SIZE			((MAX_FRAME_SIZE + 7) / 8)
-#define MAX_MIFARE_FRAME_SIZE	18		// biggest Mifare frame is answer to a read (one block = 16 Bytes) + 2 Bytes CRC
-#define MAX_MIFARE_PARITY_SIZE	3		// need 18 parity bits for the 18 Byte above. 3 Bytes are enough to store these
-#define CARD_MEMORY_SIZE		4096
-#define DMA_BUFFER_SIZE    		256 	//128  (how big is the dma?!?
+#define BIGBUF_SIZE             40000
+#define MAX_FRAME_SIZE          256 // maximum allowed ISO14443 frame
+#define MAX_PARITY_SIZE         ((MAX_FRAME_SIZE + 7) / 8)
+#define MAX_MIFARE_FRAME_SIZE   18  // biggest Mifare frame is answer to a read (one block = 16 Bytes) + 2 Bytes CRC
+#define MAX_MIFARE_PARITY_SIZE  3   // need 18 parity bits for the 18 Byte above. 3 Bytes are enough to store these
+#define CARD_MEMORY_SIZE        4096
+#define DMA_BUFFER_SIZE         256 //128  (how big is the dma?!?
 
 extern uint8_t *BigBuf_get_addr(void);
 extern uint8_t *BigBuf_get_EM_addr(void);
diff --git a/armsrc/LCD.c b/armsrc/LCD.c
index 3e74c77fa..7987da188 100644
--- a/armsrc/LCD.c
+++ b/armsrc/LCD.c
@@ -9,141 +9,141 @@
 
 void LCDSend(unsigned int data)
 {
-	// 9th bit set for data, clear for command
-	while ((AT91C_BASE_SPI->SPI_SR & AT91C_SPI_TXEMPTY) == 0);	// wait for the transfer to complete
-	// For clarity's sake we pass data with 9th bit clear and commands with 9th
-	// bit set since they're implemented as defines, se we need to invert bit
-	AT91C_BASE_SPI->SPI_TDR = data^0x100;							// Send the data/command
+    // 9th bit set for data, clear for command
+    while ((AT91C_BASE_SPI->SPI_SR & AT91C_SPI_TXEMPTY) == 0);    // wait for the transfer to complete
+    // For clarity's sake we pass data with 9th bit clear and commands with 9th
+    // bit set since they're implemented as defines, se we need to invert bit
+    AT91C_BASE_SPI->SPI_TDR = data^0x100;                         // Send the data/command
 }
 
 void LCDSetXY(unsigned char x, unsigned char y)
 {
-	LCDSend(PPASET);			// page start/end ram
-	LCDSend(y);					// Start Page to display to
-	LCDSend(131);				// End Page to display to
+    LCDSend(PPASET);            // page start/end ram
+    LCDSend(y);                 // Start Page to display to
+    LCDSend(131);               // End Page to display to
 
-	LCDSend(PCASET);			// column start/end ram
-	LCDSend(x);					// Start Column to display to
-	LCDSend(131);				// End Column to display to
+    LCDSend(PCASET);            // column start/end ram
+    LCDSend(x);                 // Start Column to display to
+    LCDSend(131);               // End Column to display to
 }
 
 void LCDSetPixel(unsigned char x, unsigned char y, unsigned char color)
 {
-	LCDSetXY(x,y);				// Set position
-	LCDSend(PRAMWR);			// Now write the pixel to the display
-	LCDSend(color);				// Write the data in the specified Color
+    LCDSetXY(x,y);              // Set position
+    LCDSend(PRAMWR);            // Now write the pixel to the display
+    LCDSend(color);             // Write the data in the specified Color
 }
 
 void LCDFill (unsigned char xs,unsigned char ys,unsigned char width,unsigned char height, unsigned char color)
 {
     unsigned char i,j;
 
-    for (i=0;i < height;i++)	// Number of horizontal lines
+    for (i=0;i < height;i++)    // Number of horizontal lines
     {
-		LCDSetXY(xs,ys+i);		// Goto start of fill area (Top Left)
-		LCDSend(PRAMWR);		// Write to display
+        LCDSetXY(xs,ys+i);      // Goto start of fill area (Top Left)
+        LCDSend(PRAMWR);        // Write to display
 
-		for (j=0;j < width;j++)	// pixels per line
-			LCDSend(color);
+        for (j=0;j < width;j++) // pixels per line
+            LCDSend(color);
     }
 }
 
 void LCDString (char *lcd_string, const char *font_style,unsigned char x, unsigned char y, unsigned char fcolor, unsigned char bcolor)
 {
-	unsigned int  i;
-	unsigned char mask=0, px, py, xme, yme, offset;
-	const char *data;
+    unsigned int  i;
+    unsigned char mask=0, px, py, xme, yme, offset;
+    const char *data;
 
-	data = font_style;			// point to the start of the font table
+    data = font_style;          // point to the start of the font table
 
-	xme = *data;				// get font x width
-	data++;
-	yme = *data;				// get font y length
-	data++;
-	offset = *data;				// get data bytes per font
+    xme = *data;                // get font x width
+    data++;
+    yme = *data;                // get font y length
+    data++;
+    offset = *data;             // get data bytes per font
 
-	do
-	{
-		// point to data in table to be loaded
-		data =  (font_style + offset) + (offset * (int)(*lcd_string - 32));
+    do
+    {
+        // point to data in table to be loaded
+        data =  (font_style + offset) + (offset * (int)(*lcd_string - 32));
 
-		for (i=0;i < yme;i++) {
-			mask |=0x80;
+        for (i=0;i < yme;i++) {
+            mask |=0x80;
 
-			for (px=x; px < (x + xme); px++) {
-				py= y + i;
+            for (px=x; px < (x + xme); px++) {
+                py= y + i;
 
-				if (*data & mask)	LCDSetPixel (px,py,fcolor);
-				else				LCDSetPixel (px,py,bcolor);
+                if (*data & mask)    LCDSetPixel (px,py,fcolor);
+                else                 LCDSetPixel (px,py,bcolor);
 
-				mask>>=1;
-			}
-			data++;
-		}
-		x+=xme;
+                mask>>=1;
+            }
+            data++;
+        }
+        x+=xme;
 
-		lcd_string++;						// next character in string
+        lcd_string++;                       // next character in string
 
-	} while(*lcd_string !='\0');			// keep spitting chars out until end of string
+    } while(*lcd_string !='\0');            // keep spitting chars out until end of string
 }
 
 void LCDReset(void)
 {
-	LED_A_ON();
-	SetupSpi(SPI_LCD_MODE);
-	LOW(GPIO_LRST);
-	SpinDelay(100);
+    LED_A_ON();
+    SetupSpi(SPI_LCD_MODE);
+    LOW(GPIO_LRST);
+    SpinDelay(100);
 
-	HIGH(GPIO_LRST);
-	SpinDelay(100);
-	LED_A_OFF();
+    HIGH(GPIO_LRST);
+    SpinDelay(100);
+    LED_A_OFF();
 }
 
 void LCDInit(void)
 {
-	int i;
+    int i;
 
-	LCDReset();
+    LCDReset();
 
-	LCDSend(PSWRESET);			// software reset
-	SpinDelay(100);
-	LCDSend(PSLEEPOUT);			// exit sleep mode
-	LCDSend(PBSTRON);			// booster on
-	LCDSend(PDISPON);			// display on
-	LCDSend(PNORON);			// normal on
-	LCDSend(PMADCTL);			// rotate display 180 deg
-	LCDSend(0xC0);
+    LCDSend(PSWRESET);          // software reset
+    SpinDelay(100);
+    LCDSend(PSLEEPOUT);         // exit sleep mode
+    LCDSend(PBSTRON);           // booster on
+    LCDSend(PDISPON);           // display on
+    LCDSend(PNORON);            // normal on
+    LCDSend(PMADCTL);           // rotate display 180 deg
+    LCDSend(0xC0);
 
-	LCDSend(PCOLMOD);			// color mode
-	LCDSend(0x02);				// 8bpp color mode
+    LCDSend(PCOLMOD);           // color mode
+    LCDSend(0x02);              // 8bpp color mode
 
-    LCDSend(PSETCON);			// set contrast
+    LCDSend(PSETCON);           // set contrast
     LCDSend(0xDC);
 
-	// clear display
+    // clear display
     LCDSetXY(0,0);
-	LCDSend(PRAMWR);			// Write to display
-	i=LCD_XRES*LCD_YRES;
-	while(i--) LCDSend(WHITE);
+    LCDSend(PRAMWR);            // Write to display
+    i=LCD_XRES*LCD_YRES;
+    while(i--) LCDSend(WHITE);
 
   // test text on different colored backgrounds
-	LCDString(" The quick brown fox  ",	(char *)&FONT6x8,1,1+8*0,WHITE  ,BLACK );
-	LCDString("  jumped over the     ",	(char *)&FONT6x8,1,1+8*1,BLACK  ,WHITE );
-	LCDString("     lazy dog.        ",	(char *)&FONT6x8,1,1+8*2,YELLOW ,RED   );
-	LCDString(" AaBbCcDdEeFfGgHhIiJj ",	(char *)&FONT6x8,1,1+8*3,RED    ,GREEN );
-	LCDString(" KkLlMmNnOoPpQqRrSsTt ",	(char *)&FONT6x8,1,1+8*4,MAGENTA,BLUE  );
-	LCDString("UuVvWwXxYyZz0123456789",	(char *)&FONT6x8,1,1+8*5,BLUE   ,YELLOW);
-	LCDString("`-=[]_;',./~!@#$%^&*()",	(char *)&FONT6x8,1,1+8*6,BLACK  ,CYAN  );
-	LCDString("     _+{}|:\\\"<>?     ",(char *)&FONT6x8,1,1+8*7,BLUE  ,MAGENTA);
+    LCDString(" The quick brown fox  ",    (char *)&FONT6x8,1,1+8*0,WHITE  ,BLACK );
+    LCDString("  jumped over the     ",    (char *)&FONT6x8,1,1+8*1,BLACK  ,WHITE );
+    LCDString("     lazy dog.        ",    (char *)&FONT6x8,1,1+8*2,YELLOW ,RED   );
+    LCDString(" AaBbCcDdEeFfGgHhIiJj ",    (char *)&FONT6x8,1,1+8*3,RED    ,GREEN );
+    LCDString(" KkLlMmNnOoPpQqRrSsTt ",    (char *)&FONT6x8,1,1+8*4,MAGENTA,BLUE  );
+    LCDString("UuVvWwXxYyZz0123456789",    (char *)&FONT6x8,1,1+8*5,BLUE   ,YELLOW);
+    LCDString("`-=[]_;',./~!@#$%^&*()",    (char *)&FONT6x8,1,1+8*6,BLACK  ,CYAN  );
+    LCDString("     _+{}|:\\\"<>?     ",   (char *)&FONT6x8,1,1+8*7,BLUE  ,MAGENTA);
 
-	// color bands
-	LCDFill(0, 1+8* 8, 132, 8, BLACK);
-	LCDFill(0, 1+8* 9, 132, 8, WHITE);
-	LCDFill(0, 1+8*10, 132, 8, RED);
-	LCDFill(0, 1+8*11, 132, 8, GREEN);
-	LCDFill(0, 1+8*12, 132, 8, BLUE);
-	LCDFill(0, 1+8*13, 132, 8, YELLOW);
-	LCDFill(0, 1+8*14, 132, 8, CYAN);
-	LCDFill(0, 1+8*15, 132, 8, MAGENTA);
+    // color bands
+    LCDFill(0, 1+8* 8, 132, 8, BLACK);
+    LCDFill(0, 1+8* 9, 132, 8, WHITE);
+    LCDFill(0, 1+8*10, 132, 8, RED);
+    LCDFill(0, 1+8*11, 132, 8, GREEN);
+    LCDFill(0, 1+8*12, 132, 8, BLUE);
+    LCDFill(0, 1+8*13, 132, 8, YELLOW);
+    LCDFill(0, 1+8*14, 132, 8, CYAN);
+    LCDFill(0, 1+8*15, 132, 8, MAGENTA);
 
 }
diff --git a/armsrc/LCD.h b/armsrc/LCD.h
index 2643f66ee..a21c3eeff 100644
--- a/armsrc/LCD.h
+++ b/armsrc/LCD.h
@@ -14,110 +14,110 @@
 #include "fonts.h"
 
 // The resolution of the LCD
-#define LCD_XRES	132
-#define LCD_YRES	132
+#define LCD_XRES    132
+#define LCD_YRES    132
 
 // 8bpp Color Mode - Some basic colors defined for ease of use
 // remember 8bpp color = 3xRed, 3xGreen & 2xBlue bits
 // organised as RRRGGGBB
 
-#define BLACK		0x00
-#define BLUE		0x03
-#define GREEN		0x1C
-#define CYAN		0x1F
-#define RED			0xE0
-#define MAGENTA		0xE3
-#define YELLOW		0xFC
-#define WHITE		0xFF
+#define BLACK       0x00
+#define BLUE        0x03
+#define GREEN       0x1C
+#define CYAN        0x1F
+#define RED         0xE0
+#define MAGENTA     0xE3
+#define YELLOW      0xFC
+#define WHITE       0xFF
 
 // EPSON LCD command set
-#define ECASET		0x115
-#define EPWRCTR		0x120
-#define ENOP		0x125
-#define ERAMWR		0x15C
-#define ERAMRD		0x15D
-#define EPASET		0x175
-#define EEPSRRD1	0x17C
-#define EEPSRRD2	0x17D
-#define EVOLCTR		0x181
-#define ETMPGRD		0x182
-#define ESLPOUT		0x194
-#define ESLPIN		0x195
-#define EDISNOR		0x1A6
-#define EDISINV		0x1A7
-#define EPTLIN		0x1A8
-#define EPTLOUT		0x1A9
-#define EASCSET		0x1AA
-#define ESCSTART	0x1AB
-#define EDISOFF		0x1AE
-#define EDISON		0x1AF
-#define ECOMSCN		0x1BB
-#define EDATCTL		0x1BC
-#define EDISCTL		0x1CA
-#define EEPCOUT		0x1CC
-#define EEPCTIN		0x1CD
-#define ERGBSET8	0x1CE
-#define EOSCON		0x1D1
-#define EOSCOFF		0x1D2
-#define EVOLUP		0x1D6
-#define EVOLDOWN	0x1D7
-#define ERMWIN		0x1E0
-#define ERMWOUT		0x1EE
-#define EEPMWR		0x1FC
-#define EEPMRD		0x1FD
+#define ECASET      0x115
+#define EPWRCTR     0x120
+#define ENOP        0x125
+#define ERAMWR      0x15C
+#define ERAMRD      0x15D
+#define EPASET      0x175
+#define EEPSRRD1    0x17C
+#define EEPSRRD2    0x17D
+#define EVOLCTR     0x181
+#define ETMPGRD     0x182
+#define ESLPOUT     0x194
+#define ESLPIN      0x195
+#define EDISNOR     0x1A6
+#define EDISINV     0x1A7
+#define EPTLIN      0x1A8
+#define EPTLOUT     0x1A9
+#define EASCSET     0x1AA
+#define ESCSTART    0x1AB
+#define EDISOFF     0x1AE
+#define EDISON      0x1AF
+#define ECOMSCN     0x1BB
+#define EDATCTL     0x1BC
+#define EDISCTL     0x1CA
+#define EEPCOUT     0x1CC
+#define EEPCTIN     0x1CD
+#define ERGBSET8    0x1CE
+#define EOSCON      0x1D1
+#define EOSCOFF     0x1D2
+#define EVOLUP      0x1D6
+#define EVOLDOWN    0x1D7
+#define ERMWIN      0x1E0
+#define ERMWOUT     0x1EE
+#define EEPMWR      0x1FC
+#define EEPMRD      0x1FD
 
 // PHILIPS LCD command set
-#define PNOP		0x100
-#define PSWRESET	0x101
-#define PBSTROFF	0x102
-#define PBSTRON		0x103
-#define PRDDIDIF	0x104
-#define PRDDST		0x109
-#define PSLEEPIN	0x110
-#define PSLEEPOUT	0x111
-#define PPTLON		0x112
-#define PNORON		0x113
-#define PINVOFF		0x120
-#define PINVON		0x121
-#define PDALO		0x122
-#define PDAL		0x123
-#define PSETCON		0x125
-#define PDISPOFF	0x128
-#define PDISPON		0x129
-#define PCASET		0x12A
-#define PPASET		0x12B
-#define PRAMWR		0x12C
-#define PRGBSET		0x12D
-#define PPTLAR		0x130
-#define PVSCRDEF	0x133
-#define PTEOFF		0x134
-#define PTEON		0x135
-#define PMADCTL		0x136
-#define PSEP		0x137
-#define PIDMOFF		0x138
-#define PIDMON		0x139
-#define PCOLMOD		0x13A
-#define PSETVOP		0x1B0
-#define PBRS		0x1B4
-#define PTRS		0x1B6
-#define PFINV		0x1B9
-#define PDOR		0x1BA
-#define PTCDFE		0x1BD
-#define PTCVOPE		0x1BF
-#define PEC			0x1C0
-#define PSETMUL		0x1C2
-#define PTCVOPAB	0x1C3
-#define PTCVOPCD	0x1C4
-#define PTCDF		0x1C5
-#define PDF8C		0x1C6
-#define PSETBS		0x1C7
-#define PRDTEMP		0x1C8
-#define PNLI		0x1C9
-#define PRDID1		0x1DA
-#define PRDID2		0x1DB
-#define PRDID3		0x1DC
-#define PSFD		0x1EF
-#define PECM		0x1F0
+#define PNOP        0x100
+#define PSWRESET    0x101
+#define PBSTROFF    0x102
+#define PBSTRON     0x103
+#define PRDDIDIF    0x104
+#define PRDDST      0x109
+#define PSLEEPIN    0x110
+#define PSLEEPOUT   0x111
+#define PPTLON      0x112
+#define PNORON      0x113
+#define PINVOFF     0x120
+#define PINVON      0x121
+#define PDALO       0x122
+#define PDAL        0x123
+#define PSETCON     0x125
+#define PDISPOFF    0x128
+#define PDISPON     0x129
+#define PCASET      0x12A
+#define PPASET      0x12B
+#define PRAMWR      0x12C
+#define PRGBSET     0x12D
+#define PPTLAR      0x130
+#define PVSCRDEF    0x133
+#define PTEOFF      0x134
+#define PTEON       0x135
+#define PMADCTL     0x136
+#define PSEP        0x137
+#define PIDMOFF     0x138
+#define PIDMON      0x139
+#define PCOLMOD     0x13A
+#define PSETVOP     0x1B0
+#define PBRS        0x1B4
+#define PTRS        0x1B6
+#define PFINV       0x1B9
+#define PDOR        0x1BA
+#define PTCDFE      0x1BD
+#define PTCVOPE     0x1BF
+#define PEC         0x1C0
+#define PSETMUL     0x1C2
+#define PTCVOPAB    0x1C3
+#define PTCVOPCD    0x1C4
+#define PTCDF       0x1C5
+#define PDF8C       0x1C6
+#define PSETBS      0x1C7
+#define PRDTEMP     0x1C8
+#define PNLI        0x1C9
+#define PRDID1      0x1DA
+#define PRDID2      0x1DB
+#define PRDID3      0x1DC
+#define PSFD        0x1EF
+#define PECM        0x1F0
 
 void LCDSend(unsigned int data);
 void LCDInit(void);
diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 68b51913f..2d8730cd7 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -55,55 +55,55 @@ static int ToSendBit;
 struct common_area common_area __attribute__((section(".commonarea")));
 
 void ToSendReset(void) {
-	ToSendMax = -1;
-	ToSendBit = 8;
+    ToSendMax = -1;
+    ToSendBit = 8;
 }
 
 void ToSendStuffBit(int b) {
-	if(ToSendBit >= 8) {
-		ToSendMax++;
-		ToSend[ToSendMax] = 0;
-		ToSendBit = 0;
-	}
+    if(ToSendBit >= 8) {
+        ToSendMax++;
+        ToSend[ToSendMax] = 0;
+        ToSendBit = 0;
+    }
 
-	if(b)
-		ToSend[ToSendMax] |= (1 << (7 - ToSendBit));
+    if(b)
+        ToSend[ToSendMax] |= (1 << (7 - ToSendBit));
 
-	ToSendBit++;
+    ToSendBit++;
 
-	if(ToSendMax >= sizeof(ToSend)) {
-		ToSendBit = 0;
-		DbpString("ToSendStuffBit overflowed!");
-	}
+    if(ToSendMax >= sizeof(ToSend)) {
+        ToSendBit = 0;
+        DbpString("ToSendStuffBit overflowed!");
+    }
 }
 
 void PrintToSendBuffer(void) {
-	DbpString("Printing ToSendBuffer:");
-	Dbhexdump(ToSendMax, ToSend, 0);
+    DbpString("Printing ToSendBuffer:");
+    Dbhexdump(ToSendMax, ToSend, 0);
 }
 
 void print_result(char *name, uint8_t *buf, size_t len) {
 
-	uint8_t *p = buf;
-	uint16_t tmp = len & 0xFFF0;
+    uint8_t *p = buf;
+    uint16_t tmp = len & 0xFFF0;
 
-	for(; p-buf < tmp; p += 16) {
-		Dbprintf("[%s: %02d/%02d] %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x",
-				name,
-				p-buf,
-				len,
-				p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7],p[8], p[9], p[10], p[11], p[12], p[13], p[14], p[15]
-			);
-	}
-	if (len % 16 != 0) {
-		char s[46] = {0};
-		char *sp = s;
-		for (; p-buf < len; p++ ) {
-			sprintf(sp, "%02x ", p[0] );
-			sp += 3;
-		}
-		Dbprintf("[%s: %02d/%02d] %s", name, p-buf, len, s);
-	}
+    for(; p-buf < tmp; p += 16) {
+        Dbprintf("[%s: %02d/%02d] %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x",
+                name,
+                p-buf,
+                len,
+                p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7],p[8], p[9], p[10], p[11], p[12], p[13], p[14], p[15]
+            );
+    }
+    if (len % 16 != 0) {
+        char s[46] = {0};
+        char *sp = s;
+        for (; p-buf < len; p++ ) {
+            sprintf(sp, "%02x ", p[0] );
+            sp += 3;
+        }
+        Dbprintf("[%s: %02d/%02d] %s", name, p-buf, len, s);
+    }
 }
 
 //=============================================================================
@@ -112,77 +112,77 @@ void print_result(char *name, uint8_t *buf, size_t len) {
 
 void DbpStringEx(char *str, uint32_t cmd) {
 #if DEBUG
-	uint8_t len = strlen(str);
-	cmd_send(CMD_DEBUG_PRINT_STRING, len, cmd, 0, (uint8_t*)str, len);
+    uint8_t len = strlen(str);
+    cmd_send(CMD_DEBUG_PRINT_STRING, len, cmd, 0, (uint8_t*)str, len);
 #endif
 }
 
 void DbpString(char *str) {
 #if DEBUG
-	DbpStringEx(str, 0);
+    DbpStringEx(str, 0);
 #endif
 }
 
 #if 0
 void DbpIntegers(int x1, int x2, int x3) {
-	cmd_send(CMD_DEBUG_PRINT_INTEGERS,x1,x2,x3,0,0);
+    cmd_send(CMD_DEBUG_PRINT_INTEGERS,x1,x2,x3,0,0);
 }
 #endif
 void DbprintfEx(uint32_t cmd, const char *fmt, ...) {
 #if DEBUG
-	// should probably limit size here; oh well, let's just use a big buffer
-	char output_string[128] = {0x00};
-	va_list ap;
-	va_start(ap, fmt);
-	kvsprintf(fmt, output_string, 10, ap);
-	va_end(ap);
+    // should probably limit size here; oh well, let's just use a big buffer
+    char output_string[128] = {0x00};
+    va_list ap;
+    va_start(ap, fmt);
+    kvsprintf(fmt, output_string, 10, ap);
+    va_end(ap);
 
-	DbpStringEx(output_string, cmd);
+    DbpStringEx(output_string, cmd);
 #endif
 }
 
 void Dbprintf(const char *fmt, ...) {
 #if DEBUG
-	// should probably limit size here; oh well, let's just use a big buffer
-	char output_string[128] = {0x00};
-	va_list ap;
+    // should probably limit size here; oh well, let's just use a big buffer
+    char output_string[128] = {0x00};
+    va_list ap;
 
-	va_start(ap, fmt);
-	kvsprintf(fmt, output_string, 10, ap);
-	va_end(ap);
+    va_start(ap, fmt);
+    kvsprintf(fmt, output_string, 10, ap);
+    va_end(ap);
 
-	DbpString(output_string);
+    DbpString(output_string);
 #endif
 }
 
 // prints HEX & ASCII
 void Dbhexdump(int len, uint8_t *d, bool bAsci) {
 #if DEBUG
-	int l=0, i;
-	char ascii[9];
+    int l=0, i;
+    char ascii[9];
 
-	while (len > 0) {
+    while (len > 0) {
 
-		l = (len > 8) ? 8 : len;
+        l = (len > 8) ? 8 : len;
 
-		memcpy(ascii, d, l);
-		ascii[l] = 0;
+        memcpy(ascii, d, l);
+        ascii[l] = 0;
 
-		// filter safe ascii
-		for (i=0; i<l; i++) {
+        // filter safe ascii
+        for (i=0; i<l; i++) {
             if (ascii[i] < 32 || ascii[i] > 126) {
                 ascii[i] = '.';
-			}
+            }
         }
 
-		if (bAsci)
-			Dbprintf("%-8s %*D", ascii, l, d, " ");
-		else
-			Dbprintf("%*D", l, d, " ");
+        if (bAsci)
+            Dbprintf("%-8s %*D", ascii, l, d, " ");
+        else
+            Dbprintf("%*D", l, d, " ");
 
-		len -= 8;
-		d += 8;
-	}
+        len -= 8;
+        d += 8;
+    }
 #endif
 }
 
@@ -193,47 +193,47 @@ void Dbhexdump(int len, uint8_t *d, bool bAsci) {
 //-----------------------------------------------------------------------------
 static uint16_t ReadAdc(int ch) {
 
-	// Note: ADC_MODE_PRESCALE and ADC_MODE_SAMPLE_HOLD_TIME are set to the maximum allowed value.
-	// AMPL_HI is are high impedance (10MOhm || 1MOhm) output, the input capacitance of the ADC is 12pF (typical). This results in a time constant
-	// of RC = (0.91MOhm) * 12pF = 10.9us. Even after the maximum configurable sample&hold time of 40us the input capacitor will not be fully charged.
-	//
-	// The maths are:
-	// If there is a voltage v_in at the input, the voltage v_cap at the capacitor (this is what we are measuring) will be
-	//
-	//       v_cap = v_in * (1 - exp(-SHTIM/RC))  =   v_in * (1 - exp(-40us/10.9us))  =  v_in * 0,97                   (i.e. an error of 3%)
+    // Note: ADC_MODE_PRESCALE and ADC_MODE_SAMPLE_HOLD_TIME are set to the maximum allowed value.
+    // AMPL_HI is are high impedance (10MOhm || 1MOhm) output, the input capacitance of the ADC is 12pF (typical). This results in a time constant
+    // of RC = (0.91MOhm) * 12pF = 10.9us. Even after the maximum configurable sample&hold time of 40us the input capacitor will not be fully charged.
+    //
+    // The maths are:
+    // If there is a voltage v_in at the input, the voltage v_cap at the capacitor (this is what we are measuring) will be
+    //
+    //       v_cap = v_in * (1 - exp(-SHTIM/RC))  =   v_in * (1 - exp(-40us/10.9us))  =  v_in * 0,97                   (i.e. an error of 3%)
 
-	AT91C_BASE_ADC->ADC_CR = AT91C_ADC_SWRST;
+    AT91C_BASE_ADC->ADC_CR = AT91C_ADC_SWRST;
     AT91C_BASE_ADC->ADC_MR =
-				  ADC_MODE_PRESCALE(63)				// ADC_CLK = MCK / ((63+1) * 2) = 48MHz / 128 = 375kHz
-				| ADC_MODE_STARTUP_TIME(1)			// Startup Time = (1+1) * 8 / ADC_CLK = 16 / 375kHz = 42,7us   Note: must be > 20us
-				| ADC_MODE_SAMPLE_HOLD_TIME(15);	// Sample & Hold Time SHTIM = 15 / ADC_CLK = 15 / 375kHz = 40us
+                  ADC_MODE_PRESCALE(63)          // ADC_CLK = MCK / ((63+1) * 2) = 48MHz / 128 = 375kHz
+                | ADC_MODE_STARTUP_TIME(1)       // Startup Time = (1+1) * 8 / ADC_CLK = 16 / 375kHz = 42,7us   Note: must be > 20us
+                | ADC_MODE_SAMPLE_HOLD_TIME(15); // Sample & Hold Time SHTIM = 15 / ADC_CLK = 15 / 375kHz = 40us
 
-	AT91C_BASE_ADC->ADC_CHER = ADC_CHANNEL(ch);
-	AT91C_BASE_ADC->ADC_CR = AT91C_ADC_START;
+    AT91C_BASE_ADC->ADC_CHER = ADC_CHANNEL(ch);
+    AT91C_BASE_ADC->ADC_CR = AT91C_ADC_START;
 
-	while (!(AT91C_BASE_ADC->ADC_SR & ADC_END_OF_CONVERSION(ch))) {};
+    while (!(AT91C_BASE_ADC->ADC_SR & ADC_END_OF_CONVERSION(ch))) {};
 
-	return (AT91C_BASE_ADC->ADC_CDR[ch] & 0x3FF);
+    return (AT91C_BASE_ADC->ADC_CDR[ch] & 0x3FF);
 }
 
 // was static - merlok
 uint16_t AvgAdc(int ch) {
-	uint16_t a = 0;
-	for(uint8_t i = 0; i < 32; i++)
-		a += ReadAdc(ch);
+    uint16_t a = 0;
+    for(uint8_t i = 0; i < 32; i++)
+        a += ReadAdc(ch);
 
-	//division by 32
-	return (a + 15) >> 5;
+    //division by 32
+    return (a + 15) >> 5;
 }
 
 void MeasureAntennaTuning(void) {
 
-	uint8_t LF_Results[256];
-	uint32_t i, adcval = 0, peak = 0, peakv = 0, peakf = 0;
-	uint32_t v_lf125 = 0, v_lf134 = 0, v_hf = 0;	// in mV
+    uint8_t LF_Results[256];
+    uint32_t i, adcval = 0, peak = 0, peakv = 0, peakf = 0;
+    uint32_t v_lf125 = 0, v_lf134 = 0, v_hf = 0; // in mV
 
-	memset(LF_Results, 0, sizeof(LF_Results));
-	LED_B_ON();
+    memset(LF_Results, 0, sizeof(LF_Results));
+    LED_B_ON();
 
 /*
  * Sweeps the useful LF range of the proxmark from
@@ -244,77 +244,77 @@ void MeasureAntennaTuning(void) {
  * ( hopefully around 95 if it is tuned to 125kHz!)
  */
 
-  	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | FPGA_LF_ADC_READER_FIELD);
-	SpinDelay(50);
+    FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | FPGA_LF_ADC_READER_FIELD);
+    SpinDelay(50);
 
-	for  (i = 255; i >= 19; i--) {
-		WDT_HIT();
-		FpgaSendCommand(FPGA_CMD_SET_DIVISOR, i);
-		SpinDelay(20);
-		adcval = ((MAX_ADC_LF_VOLTAGE * AvgAdc(ADC_CHAN_LF)) >> 10);
+    for  (i = 255; i >= 19; i--) {
+        WDT_HIT();
+        FpgaSendCommand(FPGA_CMD_SET_DIVISOR, i);
+        SpinDelay(20);
+        adcval = ((MAX_ADC_LF_VOLTAGE * AvgAdc(ADC_CHAN_LF)) >> 10);
         if (i == 95)
             v_lf125 = adcval; // voltage at 125Khz
         if (i == 89)
             v_lf134 = adcval; // voltage at 134Khz
 
-		LF_Results[i] = adcval >> 9; // scale int to fit in byte for graphing purposes
-		if(LF_Results[i] > peak) {
-			peakv = adcval;
-			peakf = i;
-			peak = LF_Results[i];
-		}
-	}
+        LF_Results[i] = adcval >> 9; // scale int to fit in byte for graphing purposes
+        if(LF_Results[i] > peak) {
+            peakv = adcval;
+            peakf = i;
+            peak = LF_Results[i];
+        }
+    }
 
-	LED_A_ON();
-	// Let the FPGA drive the high-frequency antenna around 13.56 MHz.
-	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
-	SpinDelay(50);
-	v_hf = (MAX_ADC_HF_VOLTAGE * AvgAdc(ADC_CHAN_HF)) >> 10;
+    LED_A_ON();
+    // Let the FPGA drive the high-frequency antenna around 13.56 MHz.
+    FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
+    SpinDelay(50);
+    v_hf = (MAX_ADC_HF_VOLTAGE * AvgAdc(ADC_CHAN_HF)) >> 10;
 
-	// RDV40 will hit the roof, try other ADC channel used in that hardware revision.
-	if ( v_hf > MAX_ADC_HF_VOLTAGE-300 ) {
-		v_hf = (MAX_ADC_HF_VOLTAGE_RDV40 * AvgAdc(ADC_CHAN_HF_RDV40)) >> 10;
-	}
+    // RDV40 will hit the roof, try other ADC channel used in that hardware revision.
+    if ( v_hf > MAX_ADC_HF_VOLTAGE-300 ) {
+        v_hf = (MAX_ADC_HF_VOLTAGE_RDV40 * AvgAdc(ADC_CHAN_HF_RDV40)) >> 10;
+    }
 
-	uint64_t arg0 = v_lf134;
-	arg0 <<= 32;
-	arg0 |= v_lf125;
+    uint64_t arg0 = v_lf134;
+    arg0 <<= 32;
+    arg0 |= v_lf125;
 
-	uint64_t arg2 = peakv;
-	arg2 <<= 32;
-	arg2 |= peakf;
+    uint64_t arg2 = peakv;
+    arg2 <<= 32;
+    arg2 |= peakf;
 
-	cmd_send(CMD_MEASURED_ANTENNA_TUNING, arg0, v_hf, arg2, LF_Results, 256);
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	LEDsoff();
+    cmd_send(CMD_MEASURED_ANTENNA_TUNING, arg0, v_hf, arg2, LF_Results, 256);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    LEDsoff();
 }
 
 void MeasureAntennaTuningHf(void) {
-	uint16_t volt = 0;	// in mV
-	// Let the FPGA drive the high-frequency antenna around 13.56 MHz.
-	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
-	SpinDelay(50);
-	volt = (MAX_ADC_HF_VOLTAGE * AvgAdc(ADC_CHAN_HF)) >> 10;
-	bool use_high = ( volt > MAX_ADC_HF_VOLTAGE-300 );
+    uint16_t volt = 0; // in mV
+    // Let the FPGA drive the high-frequency antenna around 13.56 MHz.
+    FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
+    SpinDelay(50);
+    volt = (MAX_ADC_HF_VOLTAGE * AvgAdc(ADC_CHAN_HF)) >> 10;
+    bool use_high = ( volt > MAX_ADC_HF_VOLTAGE-300 );
 
-	while( !BUTTON_PRESS() ){
-		SpinDelay(20);
-		if ( !use_high ) {
-			volt = (MAX_ADC_HF_VOLTAGE * AvgAdc(ADC_CHAN_HF)) >> 10;
-		} else {
-			volt = (MAX_ADC_HF_VOLTAGE_RDV40 * AvgAdc(ADC_CHAN_HF_RDV40)) >> 10;
-		}
-		DbprintfEx(FLAG_NONEWLINE, "%u mV / %5u V", volt, (uint16_t)(volt/1000));
-	}
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	DbprintfEx(FLAG_NOOPT, "\n[+] cancelled", 1);
+    while( !BUTTON_PRESS() ){
+        SpinDelay(20);
+        if ( !use_high ) {
+            volt = (MAX_ADC_HF_VOLTAGE * AvgAdc(ADC_CHAN_HF)) >> 10;
+        } else {
+            volt = (MAX_ADC_HF_VOLTAGE_RDV40 * AvgAdc(ADC_CHAN_HF_RDV40)) >> 10;
+        }
+        DbprintfEx(FLAG_NONEWLINE, "%u mV / %5u V", volt, (uint16_t)(volt/1000));
+    }
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    DbprintfEx(FLAG_NOOPT, "\n[+] cancelled", 1);
 }
 
 void ReadMem(int addr) {
-	const uint8_t *data = ((uint8_t *)addr);
+    const uint8_t *data = ((uint8_t *)addr);
 
     Dbprintf("%x: %02x %02x %02x %02x %02x %02x %02x %02x", addr, data[0], data[1], data[2], data[3], data[4], data[5], data[6], data[7]);
 }
@@ -324,64 +324,64 @@ extern struct version_information version_information;
 /* bootrom version information is pointed to from _bootphase1_version_pointer */
 extern char *_bootphase1_version_pointer, _flash_start, _flash_end, _bootrom_start, _bootrom_end, __data_src_start__;
 void SendVersion(void) {
-	char temp[USB_CMD_DATA_SIZE]; /* Limited data payload in USB packets */
-	char VersionString[USB_CMD_DATA_SIZE] = { '\0' };
+    char temp[USB_CMD_DATA_SIZE]; /* Limited data payload in USB packets */
+    char VersionString[USB_CMD_DATA_SIZE] = { '\0' };
 
-	/* Try to find the bootrom version information. Expect to find a pointer at
-	 * symbol _bootphase1_version_pointer, perform slight sanity checks on the
-	 * pointer, then use it.
-	 */
-	char *bootrom_version = *(char**)&_bootphase1_version_pointer;
+    /* Try to find the bootrom version information. Expect to find a pointer at
+     * symbol _bootphase1_version_pointer, perform slight sanity checks on the
+     * pointer, then use it.
+     */
+    char *bootrom_version = *(char**)&_bootphase1_version_pointer;
 
-	strncat(VersionString, " [ ARM ]\n", sizeof(VersionString) - strlen(VersionString) - 1);
+    strncat(VersionString, " [ ARM ]\n", sizeof(VersionString) - strlen(VersionString) - 1);
 
-	if( bootrom_version < &_flash_start || bootrom_version >= &_flash_end ) {
-		strcat(VersionString, "bootrom version information appears invalid\n");
-	} else {
-		FormatVersionInformation(temp, sizeof(temp), " bootrom: ", bootrom_version);
-		strncat(VersionString, temp, sizeof(VersionString) - strlen(VersionString) - 1);
-	}
+    if( bootrom_version < &_flash_start || bootrom_version >= &_flash_end ) {
+        strcat(VersionString, "bootrom version information appears invalid\n");
+    } else {
+        FormatVersionInformation(temp, sizeof(temp), " bootrom: ", bootrom_version);
+        strncat(VersionString, temp, sizeof(VersionString) - strlen(VersionString) - 1);
+    }
 
-	FormatVersionInformation(temp, sizeof(temp), "      os: ", &version_information);
-	strncat(VersionString, temp, sizeof(VersionString) - strlen(VersionString) - 1);
+    FormatVersionInformation(temp, sizeof(temp), "      os: ", &version_information);
+    strncat(VersionString, temp, sizeof(VersionString) - strlen(VersionString) - 1);
 
-	strncat(VersionString, "\n [ FPGA ]\n", sizeof(VersionString) - strlen(VersionString) - 1);
+    strncat(VersionString, "\n [ FPGA ]\n", sizeof(VersionString) - strlen(VersionString) - 1);
 
-	for (int i = 0; i < fpga_bitstream_num; i++) {
-		strncat(VersionString, fpga_version_information[i], sizeof(VersionString) - strlen(VersionString) - 1);
-		if (i < fpga_bitstream_num - 1) {
-			strncat(VersionString, "\n", sizeof(VersionString) - strlen(VersionString) - 1);
-		}
-	}
-	// Send Chip ID and used flash memory
-	uint32_t text_and_rodata_section_size = (uint32_t)&__data_src_start__ - (uint32_t)&_flash_start;
-	uint32_t compressed_data_section_size = common_area.arg1;
-	cmd_send(CMD_ACK, *(AT91C_DBGU_CIDR), text_and_rodata_section_size + compressed_data_section_size, 0, VersionString, strlen(VersionString));
+    for (int i = 0; i < fpga_bitstream_num; i++) {
+        strncat(VersionString, fpga_version_information[i], sizeof(VersionString) - strlen(VersionString) - 1);
+        if (i < fpga_bitstream_num - 1) {
+            strncat(VersionString, "\n", sizeof(VersionString) - strlen(VersionString) - 1);
+        }
+    }
+    // Send Chip ID and used flash memory
+    uint32_t text_and_rodata_section_size = (uint32_t)&__data_src_start__ - (uint32_t)&_flash_start;
+    uint32_t compressed_data_section_size = common_area.arg1;
+    cmd_send(CMD_ACK, *(AT91C_DBGU_CIDR), text_and_rodata_section_size + compressed_data_section_size, 0, VersionString, strlen(VersionString));
 }
 
 // measure the USB Speed by sending SpeedTestBufferSize bytes to client and measuring the elapsed time.
 // Note: this mimics GetFromBigbuf(), i.e. we have the overhead of the UsbCommand structure included.
 void printUSBSpeed(void) {
-	Dbprintf("USB Speed");
-	Dbprintf("  Sending USB packets to client...");
+    Dbprintf("USB Speed");
+    Dbprintf("  Sending USB packets to client...");
 
-	#define USB_SPEED_TEST_MIN_TIME	1500	// in milliseconds
-	uint8_t *test_data = BigBuf_get_addr();
-	uint32_t end_time;
+    #define USB_SPEED_TEST_MIN_TIME 1500 // in milliseconds
+    uint8_t *test_data = BigBuf_get_addr();
+    uint32_t end_time;
 
-	uint32_t start_time = end_time = GetTickCount();
-	uint32_t bytes_transferred = 0;
+    uint32_t start_time = end_time = GetTickCount();
+    uint32_t bytes_transferred = 0;
 
-	LED_B_ON();
-	while (end_time < start_time + USB_SPEED_TEST_MIN_TIME) {
-		cmd_send(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K, 0, USB_CMD_DATA_SIZE, 0, test_data, USB_CMD_DATA_SIZE);
-		end_time = GetTickCount();
-		bytes_transferred += USB_CMD_DATA_SIZE;
-	}
-	LED_B_OFF();
+    LED_B_ON();
+    while (end_time < start_time + USB_SPEED_TEST_MIN_TIME) {
+        cmd_send(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K, 0, USB_CMD_DATA_SIZE, 0, test_data, USB_CMD_DATA_SIZE);
+        end_time = GetTickCount();
+        bytes_transferred += USB_CMD_DATA_SIZE;
+    }
+    LED_B_OFF();
 
-	Dbprintf("  Time elapsed............%dms", end_time - start_time);
-	Dbprintf("  Bytes transferred.......%d", bytes_transferred);
+    Dbprintf("  Time elapsed............%dms", end_time - start_time);
+    Dbprintf("  Bytes transferred.......%d", bytes_transferred);
     Dbprintf("  USB Transfer Speed PM3 -> Client = %d Bytes/s", 1000 * bytes_transferred / (end_time - start_time));
 }
 
@@ -389,81 +389,81 @@ void printUSBSpeed(void) {
   * Prints runtime information about the PM3.
 **/
 void SendStatus(void) {
-	BigBuf_print_status();
-	Fpga_print_status();
+    BigBuf_print_status();
+    Fpga_print_status();
 #ifdef WITH_FLASH
-	Flashmem_print_status();
+    Flashmem_print_status();
 #endif
 #ifdef WITH_SMARTCARD
-	I2C_print_status();
+    I2C_print_status();
 #endif
 #ifdef WITH_LF
-	printConfig(); 		// LF Sampling config
-	printT55xxConfig();	// LF T55XX Config
+    printConfig();      // LF Sampling config
+    printT55xxConfig(); // LF T55XX Config
 #endif
-	printUSBSpeed();
-	Dbprintf("Various");
-	Dbprintf("  MF_DBGLEVEL.............%d", MF_DBGLEVEL);
-	Dbprintf("  ToSendMax...............%d", ToSendMax);
-	Dbprintf("  ToSendBit...............%d", ToSendBit);
-	Dbprintf("  ToSend BUFFERSIZE.......%d", TOSEND_BUFFER_SIZE);
-	printStandAloneModes();
-	cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
+    printUSBSpeed();
+    Dbprintf("Various");
+    Dbprintf("  MF_DBGLEVEL.............%d", MF_DBGLEVEL);
+    Dbprintf("  ToSendMax...............%d", ToSendMax);
+    Dbprintf("  ToSendBit...............%d", ToSendBit);
+    Dbprintf("  ToSend BUFFERSIZE.......%d", TOSEND_BUFFER_SIZE);
+    printStandAloneModes();
+    cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
 }
 
 // Show some leds in a pattern to identify StandAlone mod is running
 void StandAloneMode(void) {
 
-	DbpString("Stand-alone mode! No PC necessary.");
+    DbpString("Stand-alone mode! No PC necessary.");
 
-	SpinDown(50);
+    SpinDown(50);
     SpinOff(50);
     SpinUp(50);
     SpinOff(50);
     SpinDown(50);
-	SpinDelay(500);
+    SpinDelay(500);
 }
 // detection of which Standalone Modes is installed
 // (iceman)
 void printStandAloneModes(void) {
 
-	DbpString("Installed StandAlone Mode");
+    DbpString("Installed StandAlone Mode");
 
 #if defined(WITH_LF_ICERUN)
-	DbpString("   LF sniff/clone/simulation -  aka IceRun (iceman)");
+    DbpString("   LF sniff/clone/simulation -  aka IceRun (iceman)");
 #endif
 #if defined(WITH_HF_YOUNG)
-	DbpString("   HF Mifare sniff/simulation - (Craig Young)");
+    DbpString("   HF Mifare sniff/simulation - (Craig Young)");
 #endif
 #if defined(WITH_LF_SAMYRUN)
-	DbpString("   LF HID26 standalone - aka SamyRun (Samy Kamkar)");
+    DbpString("   LF HID26 standalone - aka SamyRun (Samy Kamkar)");
 #endif
 #if defined(WITH_LF_PROXBRUTE)
-	DbpString("   LF HID ProxII bruteforce - aka Proxbrute (Brad Antoniewicz)");
+    DbpString("   LF HID ProxII bruteforce - aka Proxbrute (Brad Antoniewicz)");
 #endif
 #if defined(WITH_LF_HIDBRUTE)
-	DbpString("   LF HID corporate 1000 bruteforce - aka Corporatebrute (Federico dotta & Maurizio Agazzini)");
+    DbpString("   LF HID corporate 1000 bruteforce - aka Corporatebrute (Federico dotta & Maurizio Agazzini)");
 #endif
 #if defined(WITH_HF_MATTYRUN)
-	DbpString("   HF Mifare sniff/clone - aka MattyRun (Matías A. Ré Medina)");
+    DbpString("   HF Mifare sniff/clone - aka MattyRun (Matías A. Ré Medina)");
 #endif
 #if defined(WITH_HF_COLIN)
     DbpString("   HF Mifare ultra fast sniff/sim/clone - aka VIGIKPWN (Colin Brigato)");
 #endif
 #if defined(WITH_HF_BOG)
-	DbpString("   HF 14a sniff standalone with ULC/ULEV1/NTAG auth storing in flashmem - aka BogitoRun (Bogito)");
+    DbpString("   HF 14a sniff standalone with ULC/ULEV1/NTAG auth storing in flashmem - aka BogitoRun (Bogito)");
 #endif
 
-	//DbpString("Running ");
-	//Dbprintf("  Is Device attached to USB| %s", USB_ATTACHED() ? "Yes" : "No");
-	//Dbprintf("  Is Device attached to FPC| %s", 0 ? "Yes" : "No");
-	//Dbprintf("  Is USB_reconnect value   | %d", GetUSBreconnect() );
-	//Dbprintf("  Is USB_configured value  | %d", GetUSBconfigured() );
+    //DbpString("Running ");
+    //Dbprintf("  Is Device attached to USB| %s", USB_ATTACHED() ? "Yes" : "No");
+    //Dbprintf("  Is Device attached to FPC| %s", 0 ? "Yes" : "No");
+    //Dbprintf("  Is USB_reconnect value   | %d", GetUSBreconnect() );
+    //Dbprintf("  Is USB_configured value  | %d", GetUSBconfigured() );
 
-	//.. add your own standalone detection based on with compiler directive you are used.
-	// don't "reuse" the already taken ones, this will make things easier when trying to detect the different modes
-	// 2017-08-06  must adapt the makefile and have individual compilation flags for all mods
-	//
+    //.. add your own standalone detection based on with compiler directive you are used.
+    // don't "reuse" the already taken ones, this will make things easier when trying to detect the different modes
+    // 2017-08-06  must adapt the makefile and have individual compilation flags for all mods
+    //
 }
 
 /*
@@ -492,369 +492,369 @@ at the same place! :-)
 LIGHT SCHEME USED:
 */
 static const char LIGHT_SCHEME[] = {
-		0x0, /* ----     | No field detected */
-		0x1, /* X---     | 14% of maximum current detected */
-		0x2, /* -X--     | 29% of maximum current detected */
-		0x4, /* --X-     | 43% of maximum current detected */
-		0x8, /* ---X     | 57% of maximum current detected */
-		0xC, /* --XX     | 71% of maximum current detected */
-		0xE, /* -XXX     | 86% of maximum current detected */
-		0xF, /* XXXX     | 100% of maximum current detected */
+        0x0, /* ----     | No field detected */
+        0x1, /* X---     | 14% of maximum current detected */
+        0x2, /* -X--     | 29% of maximum current detected */
+        0x4, /* --X-     | 43% of maximum current detected */
+        0x8, /* ---X     | 57% of maximum current detected */
+        0xC, /* --XX     | 71% of maximum current detected */
+        0xE, /* -XXX     | 86% of maximum current detected */
+        0xF, /* XXXX     | 100% of maximum current detected */
 };
 static const int LIGHT_LEN = sizeof(LIGHT_SCHEME)/sizeof(LIGHT_SCHEME[0]);
 
 void ListenReaderField(int limit) {
-#define LF_ONLY						1
-#define HF_ONLY						2
-#define REPORT_CHANGE			 	10    // report new values only if they have changed at least by REPORT_CHANGE
+#define LF_ONLY 1
+#define HF_ONLY 2
+#define REPORT_CHANGE 10    // report new values only if they have changed at least by REPORT_CHANGE
 
-	uint16_t lf_av, lf_av_new, lf_baseline = 0, lf_max;
-	uint16_t hf_av, hf_av_new,  hf_baseline = 0, hf_max;
-	uint16_t mode = 1, display_val, display_max, i;
+    uint16_t lf_av, lf_av_new, lf_baseline = 0, lf_max;
+    uint16_t hf_av, hf_av_new,  hf_baseline = 0, hf_max;
+    uint16_t mode = 1, display_val, display_max, i;
 
-	// switch off FPGA - we don't want to measure our own signal
-	// 20180315 - iceman,  why load this before and then turn off?
-	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    // switch off FPGA - we don't want to measure our own signal
+    // 20180315 - iceman,  why load this before and then turn off?
+    FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 
-	LEDsoff();
+    LEDsoff();
 
-	lf_av = lf_max = AvgAdc(ADC_CHAN_LF);
+    lf_av = lf_max = AvgAdc(ADC_CHAN_LF);
 
-	if (limit != HF_ONLY) {
-		Dbprintf("LF 125/134kHz Baseline: %dmV", (MAX_ADC_LF_VOLTAGE * lf_av) >> 10);
-		lf_baseline = lf_av;
-	}
+    if (limit != HF_ONLY) {
+        Dbprintf("LF 125/134kHz Baseline: %dmV", (MAX_ADC_LF_VOLTAGE * lf_av) >> 10);
+        lf_baseline = lf_av;
+    }
 
-	hf_av = hf_max = AvgAdc(ADC_CHAN_HF);
+    hf_av = hf_max = AvgAdc(ADC_CHAN_HF);
 
-	// iceman,  useless,  since we are measuring readerfield,  not our field.  My tests shows a max of 20v from a reader.
-	// RDV40 will hit the roof, try other ADC channel used in that hardware revision.
-	bool use_high = ( ((MAX_ADC_HF_VOLTAGE * hf_max) >> 10) > MAX_ADC_HF_VOLTAGE-300 );
-	if ( use_high ) {
-		hf_av = hf_max = AvgAdc(ADC_CHAN_HF_RDV40);
-	}
+    // iceman,  useless,  since we are measuring readerfield,  not our field.  My tests shows a max of 20v from a reader.
+    // RDV40 will hit the roof, try other ADC channel used in that hardware revision.
+    bool use_high = ( ((MAX_ADC_HF_VOLTAGE * hf_max) >> 10) > MAX_ADC_HF_VOLTAGE-300 );
+    if ( use_high ) {
+        hf_av = hf_max = AvgAdc(ADC_CHAN_HF_RDV40);
+    }
 
-	if (limit != LF_ONLY) {
-		Dbprintf("HF 13.56MHz Baseline: %dmV", (MAX_ADC_HF_VOLTAGE * hf_av) >> 10);
-		hf_baseline = hf_av;
-	}
+    if (limit != LF_ONLY) {
+        Dbprintf("HF 13.56MHz Baseline: %dmV", (MAX_ADC_HF_VOLTAGE * hf_av) >> 10);
+        hf_baseline = hf_av;
+    }
 
-	for(;;) {
-		// Switch modes with button
-		if (BUTTON_PRESS()) {
-			SpinDelay(500);
-			switch (mode) {
-				case 1:
-					mode = 2;
-					DbpString("Signal Strength Mode");
-					break;
-				case 2:
-				default:
-					DbpString("Stopped");
-					LEDsoff();
-					return;
-					break;
-			}
-		}
-		WDT_HIT();
+    for(;;) {
+        // Switch modes with button
+        if (BUTTON_PRESS()) {
+            SpinDelay(500);
+            switch (mode) {
+                case 1:
+                    mode = 2;
+                    DbpString("Signal Strength Mode");
+                    break;
+                case 2:
+                default:
+                    DbpString("Stopped");
+                    LEDsoff();
+                    return;
+                    break;
+            }
+        }
+        WDT_HIT();
 
-		if (limit != HF_ONLY) {
-			if(mode == 1) {
-				if (ABS(lf_av - lf_baseline) > REPORT_CHANGE)
-					LED_D_ON();
-				else
-					LED_D_OFF();
-			}
+        if (limit != HF_ONLY) {
+            if(mode == 1) {
+                if (ABS(lf_av - lf_baseline) > REPORT_CHANGE)
+                    LED_D_ON();
+                else
+                    LED_D_OFF();
+            }
 
-			lf_av_new = AvgAdc(ADC_CHAN_LF);
-			// see if there's a significant change
-			if (ABS(lf_av - lf_av_new) > REPORT_CHANGE) {
-				Dbprintf("LF 125/134kHz Field Change: %5dmV", (MAX_ADC_LF_VOLTAGE * lf_av_new) >> 10);
-				lf_av = lf_av_new;
-				if (lf_av > lf_max)
-					lf_max = lf_av;
-			}
-		}
+            lf_av_new = AvgAdc(ADC_CHAN_LF);
+            // see if there's a significant change
+            if (ABS(lf_av - lf_av_new) > REPORT_CHANGE) {
+                Dbprintf("LF 125/134kHz Field Change: %5dmV", (MAX_ADC_LF_VOLTAGE * lf_av_new) >> 10);
+                lf_av = lf_av_new;
+                if (lf_av > lf_max)
+                    lf_max = lf_av;
+            }
+        }
 
-		if (limit != LF_ONLY) {
-			if (mode == 1){
-				if (ABS(hf_av - hf_baseline) > REPORT_CHANGE)
-					LED_B_ON();
-				else
-					LED_B_OFF();
-			}
+        if (limit != LF_ONLY) {
+            if (mode == 1){
+                if (ABS(hf_av - hf_baseline) > REPORT_CHANGE)
+                    LED_B_ON();
+                else
+                    LED_B_OFF();
+            }
 
-			hf_av_new = (use_high) ? AvgAdc(ADC_CHAN_HF_RDV40) :  AvgAdc(ADC_CHAN_HF);
+            hf_av_new = (use_high) ? AvgAdc(ADC_CHAN_HF_RDV40) :  AvgAdc(ADC_CHAN_HF);
 
-			// see if there's a significant change
-			if(ABS(hf_av - hf_av_new) > REPORT_CHANGE) {
-				Dbprintf("HF 13.56MHz Field Change: %5dmV", (MAX_ADC_HF_VOLTAGE * hf_av_new) >> 10);
-				hf_av = hf_av_new;
-				if (hf_av > hf_max)
-					hf_max = hf_av;
-			}
-		}
+            // see if there's a significant change
+            if(ABS(hf_av - hf_av_new) > REPORT_CHANGE) {
+                Dbprintf("HF 13.56MHz Field Change: %5dmV", (MAX_ADC_HF_VOLTAGE * hf_av_new) >> 10);
+                hf_av = hf_av_new;
+                if (hf_av > hf_max)
+                    hf_max = hf_av;
+            }
+        }
 
-		if (mode == 2) {
-			if (limit == LF_ONLY) {
-				display_val = lf_av;
-				display_max = lf_max;
-			} else if (limit == HF_ONLY) {
-				display_val = hf_av;
-				display_max = hf_max;
-			} else { /* Pick one at random */
-				if( (hf_max - hf_baseline) > (lf_max - lf_baseline) ) {
-					display_val = hf_av;
-					display_max = hf_max;
-				} else {
-					display_val = lf_av;
-					display_max = lf_max;
-				}
-			}
-			for (i=0; i<LIGHT_LEN; i++) {
-				if (display_val >= ((display_max/LIGHT_LEN)*i) && display_val <= ((display_max/LIGHT_LEN)*(i+1))) {
-					if (LIGHT_SCHEME[i] & 0x1) LED_C_ON(); else LED_C_OFF();
-					if (LIGHT_SCHEME[i] & 0x2) LED_A_ON(); else LED_A_OFF();
-					if (LIGHT_SCHEME[i] & 0x4) LED_B_ON(); else LED_B_OFF();
-					if (LIGHT_SCHEME[i] & 0x8) LED_D_ON(); else LED_D_OFF();
-					break;
-				}
-			}
-		}
-	}
+        if (mode == 2) {
+            if (limit == LF_ONLY) {
+                display_val = lf_av;
+                display_max = lf_max;
+            } else if (limit == HF_ONLY) {
+                display_val = hf_av;
+                display_max = hf_max;
+            } else { /* Pick one at random */
+                if( (hf_max - hf_baseline) > (lf_max - lf_baseline) ) {
+                    display_val = hf_av;
+                    display_max = hf_max;
+                } else {
+                    display_val = lf_av;
+                    display_max = lf_max;
+                }
+            }
+            for (i=0; i<LIGHT_LEN; i++) {
+                if (display_val >= ((display_max/LIGHT_LEN)*i) && display_val <= ((display_max/LIGHT_LEN)*(i+1))) {
+                    if (LIGHT_SCHEME[i] & 0x1) LED_C_ON(); else LED_C_OFF();
+                    if (LIGHT_SCHEME[i] & 0x2) LED_A_ON(); else LED_A_OFF();
+                    if (LIGHT_SCHEME[i] & 0x4) LED_B_ON(); else LED_B_OFF();
+                    if (LIGHT_SCHEME[i] & 0x8) LED_D_ON(); else LED_D_OFF();
+                    break;
+                }
+            }
+        }
+    }
 }
 
 void UsbPacketReceived(uint8_t *packet, int len) {
-	UsbCommand *c = (UsbCommand *)packet;
+    UsbCommand *c = (UsbCommand *)packet;
 
-	//Dbprintf("received %d bytes, with command: 0x%04x and args: %d %d %d", len, c->cmd, c->arg[0], c->arg[1], c->arg[2]);
+    //Dbprintf("received %d bytes, with command: 0x%04x and args: %d %d %d", len, c->cmd, c->arg[0], c->arg[1], c->arg[2]);
 
-	switch(c->cmd) {
+    switch(c->cmd) {
 #ifdef WITH_LF
-		case CMD_SET_LF_T55XX_CONFIG:
-			setT55xxConfig( c->arg[0], (t55xx_config *) c->d.asBytes);
-			break;
-		case CMD_SET_LF_SAMPLING_CONFIG:
-			setSamplingConfig((sample_config *) c->d.asBytes);
-			break;
-		case CMD_ACQUIRE_RAW_ADC_SAMPLES_125K: {
-			uint32_t bits = SampleLF(c->arg[0], c->arg[1]);
-			cmd_send(CMD_ACK, bits, 0, 0, 0, 0);
-			break;
-		}
-		case CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K:
-			ModThenAcquireRawAdcSamples125k(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
-			break;
-		case CMD_LF_SNOOP_RAW_ADC_SAMPLES: {
-			uint32_t bits = SnoopLF();
-			cmd_send(CMD_ACK, bits, 0, 0, 0, 0);
-			break;
-		}
-		case CMD_HID_DEMOD_FSK: {
-			uint32_t high, low;
-			CmdHIDdemodFSK(c->arg[0], &high, &low, 1);
-			break;
-		}
-		case CMD_HID_SIM_TAG:
-			CmdHIDsimTAG(c->arg[0], c->arg[1], 1);
-			break;
-		case CMD_FSK_SIM_TAG:
-			CmdFSKsimTAG(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
-			break;
-		case CMD_ASK_SIM_TAG:
-			CmdASKsimTag(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
-			break;
-		case CMD_PSK_SIM_TAG:
-			CmdPSKsimTag(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
-			break;
-		case CMD_HID_CLONE_TAG:
-			CopyHIDtoT55x7(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes[0]);
-			break;
-		case CMD_IO_DEMOD_FSK: {
-			uint32_t high, low;
-			CmdIOdemodFSK(c->arg[0], &high, &low, 1);
-			break;
-		}
-		case CMD_IO_CLONE_TAG:
-			CopyIOtoT55x7(c->arg[0], c->arg[1]);
-			break;
-		case CMD_EM410X_DEMOD: {
-			uint32_t high;
-			uint64_t low;
-			CmdEM410xdemod(c->arg[0], &high, &low, 1);
-			break;
-		}
-		case CMD_EM410X_WRITE_TAG:
-			WriteEM410x(c->arg[0], c->arg[1], c->arg[2]);
-			break;
-		case CMD_READ_TI_TYPE:
-			ReadTItag();
-			break;
-		case CMD_WRITE_TI_TYPE:
-			WriteTItag(c->arg[0],c->arg[1],c->arg[2]);
-			break;
-		case CMD_SIMULATE_TAG_125K:
-			LED_A_ON();
-			SimulateTagLowFrequency(c->arg[0], c->arg[1], 1);
-			LED_A_OFF();
-			break;
-		case CMD_LF_SIMULATE_BIDIR:
-			SimulateTagLowFrequencyBidir(c->arg[0], c->arg[1]);
-			break;
-		case CMD_INDALA_CLONE_TAG:
-			CopyIndala64toT55x7(c->arg[0], c->arg[1]);
-			break;
-		case CMD_INDALA_CLONE_TAG_L:
-			CopyIndala224toT55x7(
-				c->d.asDwords[0], c->d.asDwords[1], c->d.asDwords[2], c->d.asDwords[3],
-				c->d.asDwords[4], c->d.asDwords[5], c->d.asDwords[6]
-				);
-			break;
-		case CMD_T55XX_READ_BLOCK: {
-			T55xxReadBlock(c->arg[0], c->arg[1], c->arg[2]);
-			break;
-		}
-		case CMD_T55XX_WRITE_BLOCK:
-			T55xxWriteBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes[0]);
-			break;
-		case CMD_T55XX_WAKEUP:
-			T55xxWakeUp(c->arg[0]);
-			break;
-		case CMD_T55XX_RESET_READ:
-			T55xxResetRead();
-			break;
-		case CMD_T55XX_CHKPWDS:
-			T55xx_ChkPwds();
-			break;
-		case CMD_PCF7931_READ:
-			ReadPCF7931();
-			break;
-		case CMD_PCF7931_WRITE:
-			WritePCF7931(
-				c->d.asBytes[0], c->d.asBytes[1], c->d.asBytes[2], c->d.asBytes[3],
-				c->d.asBytes[4], c->d.asBytes[5], c->d.asBytes[6], c->d.asBytes[9],
-                c->d.asBytes[7] - 128, c->d.asBytes[8] - 128,
-				c->arg[0],
-				c->arg[1],
-				c->arg[2]
-				);
-			break;
-		case CMD_EM4X_READ_WORD:
-			EM4xReadWord(c->arg[0], c->arg[1], c->arg[2]);
-			break;
-		case CMD_EM4X_WRITE_WORD:
-			EM4xWriteWord(c->arg[0], c->arg[1], c->arg[2]);
-			break;
-		case CMD_AWID_DEMOD_FSK:  {
-			uint32_t high, low;
-			// Set realtime AWID demodulation
-			CmdAWIDdemodFSK(c->arg[0], &high, &low, 1);
-			break;
-		}
-        case CMD_VIKING_CLONE_TAG:
-			CopyVikingtoT55xx(c->arg[0], c->arg[1], c->arg[2]);
+        case CMD_SET_LF_T55XX_CONFIG:
+            setT55xxConfig( c->arg[0], (t55xx_config *) c->d.asBytes);
+            break;
+        case CMD_SET_LF_SAMPLING_CONFIG:
+            setSamplingConfig((sample_config *) c->d.asBytes);
+            break;
+        case CMD_ACQUIRE_RAW_ADC_SAMPLES_125K: {
+            uint32_t bits = SampleLF(c->arg[0], c->arg[1]);
+            cmd_send(CMD_ACK, bits, 0, 0, 0, 0);
+            break;
+        }
+        case CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K:
+            ModThenAcquireRawAdcSamples125k(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+            break;
+        case CMD_LF_SNOOP_RAW_ADC_SAMPLES: {
+            uint32_t bits = SnoopLF();
+            cmd_send(CMD_ACK, bits, 0, 0, 0, 0);
+            break;
+        }
+        case CMD_HID_DEMOD_FSK: {
+            uint32_t high, low;
+            CmdHIDdemodFSK(c->arg[0], &high, &low, 1);
+            break;
+        }
+        case CMD_HID_SIM_TAG:
+            CmdHIDsimTAG(c->arg[0], c->arg[1], 1);
+            break;
+        case CMD_FSK_SIM_TAG:
+            CmdFSKsimTAG(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+            break;
+        case CMD_ASK_SIM_TAG:
+            CmdASKsimTag(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+            break;
+        case CMD_PSK_SIM_TAG:
+            CmdPSKsimTag(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+            break;
+        case CMD_HID_CLONE_TAG:
+            CopyHIDtoT55x7(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes[0]);
+            break;
+        case CMD_IO_DEMOD_FSK: {
+            uint32_t high, low;
+            CmdIOdemodFSK(c->arg[0], &high, &low, 1);
+            break;
+        }
+        case CMD_IO_CLONE_TAG:
+            CopyIOtoT55x7(c->arg[0], c->arg[1]);
+            break;
+        case CMD_EM410X_DEMOD: {
+            uint32_t high;
+            uint64_t low;
+            CmdEM410xdemod(c->arg[0], &high, &low, 1);
+            break;
+        }
+        case CMD_EM410X_WRITE_TAG:
+            WriteEM410x(c->arg[0], c->arg[1], c->arg[2]);
+            break;
+        case CMD_READ_TI_TYPE:
+            ReadTItag();
+            break;
+        case CMD_WRITE_TI_TYPE:
+            WriteTItag(c->arg[0],c->arg[1],c->arg[2]);
+            break;
+        case CMD_SIMULATE_TAG_125K:
+            LED_A_ON();
+            SimulateTagLowFrequency(c->arg[0], c->arg[1], 1);
+            LED_A_OFF();
+            break;
+        case CMD_LF_SIMULATE_BIDIR:
+            SimulateTagLowFrequencyBidir(c->arg[0], c->arg[1]);
+            break;
+        case CMD_INDALA_CLONE_TAG:
+            CopyIndala64toT55x7(c->arg[0], c->arg[1]);
+            break;
+        case CMD_INDALA_CLONE_TAG_L:
+            CopyIndala224toT55x7(
+                c->d.asDwords[0], c->d.asDwords[1], c->d.asDwords[2], c->d.asDwords[3],
+                c->d.asDwords[4], c->d.asDwords[5], c->d.asDwords[6]
+                );
+            break;
+        case CMD_T55XX_READ_BLOCK: {
+            T55xxReadBlock(c->arg[0], c->arg[1], c->arg[2]);
+            break;
+        }
+        case CMD_T55XX_WRITE_BLOCK:
+            T55xxWriteBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes[0]);
+            break;
+        case CMD_T55XX_WAKEUP:
+            T55xxWakeUp(c->arg[0]);
+            break;
+        case CMD_T55XX_RESET_READ:
+            T55xxResetRead();
+            break;
+        case CMD_T55XX_CHKPWDS:
+            T55xx_ChkPwds();
+            break;
+        case CMD_PCF7931_READ:
+            ReadPCF7931();
+            break;
+        case CMD_PCF7931_WRITE:
+            WritePCF7931(
+                c->d.asBytes[0], c->d.asBytes[1], c->d.asBytes[2], c->d.asBytes[3],
+                c->d.asBytes[4], c->d.asBytes[5], c->d.asBytes[6], c->d.asBytes[9],
+                c->d.asBytes[7] - 128, c->d.asBytes[8] - 128,
+                c->arg[0],
+                c->arg[1],
+                c->arg[2]
+                );
+            break;
+        case CMD_EM4X_READ_WORD:
+            EM4xReadWord(c->arg[0], c->arg[1], c->arg[2]);
+            break;
+        case CMD_EM4X_WRITE_WORD:
+            EM4xWriteWord(c->arg[0], c->arg[1], c->arg[2]);
+            break;
+        case CMD_AWID_DEMOD_FSK:  {
+            uint32_t high, low;
+            // Set realtime AWID demodulation
+            CmdAWIDdemodFSK(c->arg[0], &high, &low, 1);
+            break;
+        }
+        case CMD_VIKING_CLONE_TAG:
+            CopyVikingtoT55xx(c->arg[0], c->arg[1], c->arg[2]);
+            break;
+        case CMD_COTAG:
+            Cotag(c->arg[0]);
             break;
-		case CMD_COTAG:
-			Cotag(c->arg[0]);
-			break;
 #endif
 
 #ifdef WITH_HITAG
-		case CMD_SNOOP_HITAG: // Eavesdrop Hitag tag, args = type
-			SnoopHitag(c->arg[0]);
-			break;
-		case CMD_SIMULATE_HITAG: // Simulate Hitag tag, args = memory content
-			SimulateHitagTag((bool)c->arg[0],(byte_t*)c->d.asBytes);
-			break;
-		case CMD_READER_HITAG: // Reader for Hitag tags, args = type and function
-			ReaderHitag((hitag_function)c->arg[0],(hitag_data*)c->d.asBytes);
-			break;
-		case CMD_SIMULATE_HITAG_S:// Simulate Hitag s tag, args = memory content
-			SimulateHitagSTag((bool)c->arg[0],(byte_t*)c->d.asBytes);
-			break;
-		case CMD_TEST_HITAGS_TRACES:// Tests every challenge within the given file
-			check_challenges((bool)c->arg[0],(byte_t*)c->d.asBytes);
-			break;
-		case CMD_READ_HITAG_S: //Reader for only Hitag S tags, args = key or challenge
-			ReadHitagS((hitag_function)c->arg[0],(hitag_data*)c->d.asBytes);
-			break;
-		case CMD_WR_HITAG_S: //writer for Hitag tags args=data to write,page and key or challenge
-			if ((hitag_function)c->arg[0] < 10) {
-				WritePageHitagS((hitag_function)c->arg[0],(hitag_data*)c->d.asBytes,c->arg[2]);
-			} else if ((hitag_function)c->arg[0] >= 10) {
-			  WriterHitag((hitag_function)c->arg[0],(hitag_data*)c->d.asBytes, c->arg[2]);
-			}
-			break;
+        case CMD_SNOOP_HITAG: // Eavesdrop Hitag tag, args = type
+            SnoopHitag(c->arg[0]);
+            break;
+        case CMD_SIMULATE_HITAG: // Simulate Hitag tag, args = memory content
+            SimulateHitagTag((bool)c->arg[0],(byte_t*)c->d.asBytes);
+            break;
+        case CMD_READER_HITAG: // Reader for Hitag tags, args = type and function
+            ReaderHitag((hitag_function)c->arg[0],(hitag_data*)c->d.asBytes);
+            break;
+        case CMD_SIMULATE_HITAG_S:// Simulate Hitag s tag, args = memory content
+            SimulateHitagSTag((bool)c->arg[0],(byte_t*)c->d.asBytes);
+            break;
+        case CMD_TEST_HITAGS_TRACES:// Tests every challenge within the given file
+            check_challenges((bool)c->arg[0],(byte_t*)c->d.asBytes);
+            break;
+        case CMD_READ_HITAG_S: //Reader for only Hitag S tags, args = key or challenge
+            ReadHitagS((hitag_function)c->arg[0],(hitag_data*)c->d.asBytes);
+            break;
+        case CMD_WR_HITAG_S: //writer for Hitag tags args=data to write,page and key or challenge
+            if ((hitag_function)c->arg[0] < 10) {
+                WritePageHitagS((hitag_function)c->arg[0],(hitag_data*)c->d.asBytes,c->arg[2]);
+            } else if ((hitag_function)c->arg[0] >= 10) {
+              WriterHitag((hitag_function)c->arg[0],(hitag_data*)c->d.asBytes, c->arg[2]);
+            }
+            break;
 #endif
 
 #ifdef WITH_ISO15693
-		case CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_15693:
-			AcquireRawAdcSamplesIso15693();
-			break;
-		case CMD_RECORD_RAW_ADC_SAMPLES_ISO_15693:
-			RecordRawAdcSamplesIso15693();
-			break;
-		case CMD_ISO_15693_COMMAND:
-			DirectTag15693Command(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
-			break;
-		case CMD_ISO_15693_FIND_AFI:
-			BruteforceIso15693Afi(c->arg[0]);
-			break;
-		case CMD_READER_ISO_15693:
-			ReaderIso15693(c->arg[0]);
-			break;
-		case CMD_SIMTAG_ISO_15693:
-			SimTagIso15693(c->arg[0], c->d.asBytes);
-			break;
+        case CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_15693:
+            AcquireRawAdcSamplesIso15693();
+            break;
+        case CMD_RECORD_RAW_ADC_SAMPLES_ISO_15693:
+            RecordRawAdcSamplesIso15693();
+            break;
+        case CMD_ISO_15693_COMMAND:
+            DirectTag15693Command(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+            break;
+        case CMD_ISO_15693_FIND_AFI:
+            BruteforceIso15693Afi(c->arg[0]);
+            break;
+        case CMD_READER_ISO_15693:
+            ReaderIso15693(c->arg[0]);
+            break;
+        case CMD_SIMTAG_ISO_15693:
+            SimTagIso15693(c->arg[0], c->d.asBytes);
+            break;
 #endif
 
 #ifdef WITH_LEGICRF
-		case CMD_SIMULATE_TAG_LEGIC_RF:
-			LegicRfSimulate(c->arg[0]);
-			break;
-		case CMD_WRITER_LEGIC_RF:
-			LegicRfWriter(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
-			break;
-		case CMD_READER_LEGIC_RF:
-			LegicRfReader(c->arg[0], c->arg[1], c->arg[2]);
-			break;
-		case CMD_LEGIC_INFO:
-			LegicRfInfo();
-			break;
-		case CMD_LEGIC_ESET:
-			//-----------------------------------------------------------------------------
-			// Note: we call FpgaDownloadAndGo(FPGA_BITSTREAM_HF) here although FPGA is not
-			// involved in dealing with emulator memory. But if it is called later, it might
-			// destroy the Emulator Memory.
-			//-----------------------------------------------------------------------------
-			// arg0 = offset
-			// arg1 = num of bytes
-			FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-			emlSet(c->d.asBytes, c->arg[0], c->arg[1]);
-			break;
+        case CMD_SIMULATE_TAG_LEGIC_RF:
+            LegicRfSimulate(c->arg[0]);
+            break;
+        case CMD_WRITER_LEGIC_RF:
+            LegicRfWriter(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+            break;
+        case CMD_READER_LEGIC_RF:
+            LegicRfReader(c->arg[0], c->arg[1], c->arg[2]);
+            break;
+        case CMD_LEGIC_INFO:
+            LegicRfInfo();
+            break;
+        case CMD_LEGIC_ESET:
+            //-----------------------------------------------------------------------------
+            // Note: we call FpgaDownloadAndGo(FPGA_BITSTREAM_HF) here although FPGA is not
+            // involved in dealing with emulator memory. But if it is called later, it might
+            // destroy the Emulator Memory.
+            //-----------------------------------------------------------------------------
+            // arg0 = offset
+            // arg1 = num of bytes
+            FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
+            emlSet(c->d.asBytes, c->arg[0], c->arg[1]);
+            break;
 #endif
 
 #ifdef WITH_ISO14443b
-		case CMD_READ_SRI_TAG:
-			ReadSTMemoryIso14443b(c->arg[0]);
-			break;
-		case CMD_SNOOP_ISO_14443B:
-			SniffIso14443b();
-			break;
-		case CMD_SIMULATE_TAG_ISO_14443B:
-			SimulateIso14443bTag(c->arg[0]);
-			break;
-		case CMD_ISO_14443B_COMMAND:
-			//SendRawCommand14443B(c->arg[0],c->arg[1],c->arg[2],c->d.asBytes);
-			SendRawCommand14443B_Ex(c);
-			break;
+        case CMD_READ_SRI_TAG:
+            ReadSTMemoryIso14443b(c->arg[0]);
+            break;
+        case CMD_SNOOP_ISO_14443B:
+            SniffIso14443b();
+            break;
+        case CMD_SIMULATE_TAG_ISO_14443B:
+            SimulateIso14443bTag(c->arg[0]);
+            break;
+        case CMD_ISO_14443B_COMMAND:
+            //SendRawCommand14443B(c->arg[0],c->arg[1],c->arg[2],c->d.asBytes);
+            SendRawCommand14443B_Ex(c);
+            break;
 #endif
 
 #ifdef WITH_FELICA
-		case CMD_FELICA_COMMAND:
-			felica_sendraw(c);
-			break;
+        case CMD_FELICA_COMMAND:
+            felica_sendraw(c);
+            break;
         case CMD_FELICA_LITE_SIM:
             felica_sim_lite(c->arg[0]);
             break;
@@ -862,701 +862,701 @@ void UsbPacketReceived(uint8_t *packet, int len) {
             felica_sniff(c->arg[0], c->arg[1]);
             break;
         case CMD_FELICA_LITE_DUMP:
-			felica_dump_lite_s();
+            felica_dump_lite_s();
             break;
 #endif
 
 #ifdef WITH_ISO14443a
-		case CMD_SNOOP_ISO_14443a:
-			SniffIso14443a(c->arg[0]);
-			break;
-		case CMD_READER_ISO_14443a:
-			ReaderIso14443a(c);
-			break;
-		case CMD_SIMULATE_TAG_ISO_14443a:
-			SimulateIso14443aTag(c->arg[0], c->arg[1], c->d.asBytes);  // ## Simulate iso14443a tag - pass tag type & UID
-			break;
-		case CMD_ANTIFUZZ_ISO_14443a:
-			iso14443a_antifuzz(c->arg[0]);
-			break;
-		case CMD_EPA_PACE_COLLECT_NONCE:
-			EPA_PACE_Collect_Nonce(c);
-			break;
-		case CMD_EPA_PACE_REPLAY:
-			EPA_PACE_Replay(c);
-			break;
-		case CMD_READER_MIFARE:
+        case CMD_SNOOP_ISO_14443a:
+            SniffIso14443a(c->arg[0]);
+            break;
+        case CMD_READER_ISO_14443a:
+            ReaderIso14443a(c);
+            break;
+        case CMD_SIMULATE_TAG_ISO_14443a:
+            SimulateIso14443aTag(c->arg[0], c->arg[1], c->d.asBytes);  // ## Simulate iso14443a tag - pass tag type & UID
+            break;
+        case CMD_ANTIFUZZ_ISO_14443a:
+            iso14443a_antifuzz(c->arg[0]);
+            break;
+        case CMD_EPA_PACE_COLLECT_NONCE:
+            EPA_PACE_Collect_Nonce(c);
+            break;
+        case CMD_EPA_PACE_REPLAY:
+            EPA_PACE_Replay(c);
+            break;
+        case CMD_READER_MIFARE:
             ReaderMifare(c->arg[0], c->arg[1], c->arg[2]);
-			break;
-		case CMD_MIFARE_READBL:
-			MifareReadBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
-			break;
-		case CMD_MIFAREU_READBL:
-			MifareUReadBlock(c->arg[0],c->arg[1], c->d.asBytes);
-			break;
-		case CMD_MIFAREUC_AUTH:
-			MifareUC_Auth(c->arg[0],c->d.asBytes);
-			break;
-		case CMD_MIFAREU_READCARD:
-			MifareUReadCard(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
-			break;
-		case CMD_MIFAREUC_SETPWD:
-			MifareUSetPwd(c->arg[0], c->d.asBytes);
-			break;
-		case CMD_MIFARE_READSC:
-			MifareReadSector(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
-			break;
-		case CMD_MIFARE_WRITEBL:
-			MifareWriteBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
-			break;
-		//case CMD_MIFAREU_WRITEBL_COMPAT:
-			//MifareUWriteBlockCompat(c->arg[0], c->d.asBytes);
-			//break;
-		case CMD_MIFAREU_WRITEBL:
-			MifareUWriteBlock(c->arg[0], c->arg[1], c->d.asBytes);
-			break;
-		case CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES:
-			MifareAcquireEncryptedNonces(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
-			break;
-		case CMD_MIFARE_ACQUIRE_NONCES:
-			MifareAcquireNonces(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
-			break;
-		case CMD_MIFARE_NESTED:
-			MifareNested(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
-			break;
-		case CMD_MIFARE_CHKKEYS: {
-			MifareChkKeys(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
-			break;
-		}
-		case CMD_MIFARE_CHKKEYS_FAST: {
-			MifareChkKeys_fast(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
-			break;
-		}
-		case CMD_SIMULATE_MIFARE_CARD:
-			Mifare1ksim(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
-			break;
+            break;
+        case CMD_MIFARE_READBL:
+            MifareReadBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+            break;
+        case CMD_MIFAREU_READBL:
+            MifareUReadBlock(c->arg[0],c->arg[1], c->d.asBytes);
+            break;
+        case CMD_MIFAREUC_AUTH:
+            MifareUC_Auth(c->arg[0],c->d.asBytes);
+            break;
+        case CMD_MIFAREU_READCARD:
+            MifareUReadCard(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+            break;
+        case CMD_MIFAREUC_SETPWD:
+            MifareUSetPwd(c->arg[0], c->d.asBytes);
+            break;
+        case CMD_MIFARE_READSC:
+            MifareReadSector(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+            break;
+        case CMD_MIFARE_WRITEBL:
+            MifareWriteBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+            break;
+        //case CMD_MIFAREU_WRITEBL_COMPAT:
+            //MifareUWriteBlockCompat(c->arg[0], c->d.asBytes);
+            //break;
+        case CMD_MIFAREU_WRITEBL:
+            MifareUWriteBlock(c->arg[0], c->arg[1], c->d.asBytes);
+            break;
+        case CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES:
+            MifareAcquireEncryptedNonces(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+            break;
+        case CMD_MIFARE_ACQUIRE_NONCES:
+            MifareAcquireNonces(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+            break;
+        case CMD_MIFARE_NESTED:
+            MifareNested(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+            break;
+        case CMD_MIFARE_CHKKEYS: {
+            MifareChkKeys(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+            break;
+        }
+        case CMD_MIFARE_CHKKEYS_FAST: {
+            MifareChkKeys_fast(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+            break;
+        }
+        case CMD_SIMULATE_MIFARE_CARD:
+            Mifare1ksim(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+            break;
 
-		// emulator
-		case CMD_MIFARE_SET_DBGMODE:
-			MifareSetDbgLvl(c->arg[0]);
-			break;
-		case CMD_MIFARE_EML_MEMCLR:
-			MifareEMemClr(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
-			break;
-		case CMD_MIFARE_EML_MEMSET:
-			MifareEMemSet(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
-			break;
-		case CMD_MIFARE_EML_MEMGET:
-			MifareEMemGet(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
-			break;
-		case CMD_MIFARE_EML_CARDLOAD:
-			MifareECardLoad(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
-			break;
+        // emulator
+        case CMD_MIFARE_SET_DBGMODE:
+            MifareSetDbgLvl(c->arg[0]);
+            break;
+        case CMD_MIFARE_EML_MEMCLR:
+            MifareEMemClr(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+            break;
+        case CMD_MIFARE_EML_MEMSET:
+            MifareEMemSet(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+            break;
+        case CMD_MIFARE_EML_MEMGET:
+            MifareEMemGet(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+            break;
+        case CMD_MIFARE_EML_CARDLOAD:
+            MifareECardLoad(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+            break;
 
-		// Work with "magic Chinese" card
-		case CMD_MIFARE_CSETBLOCK:
-			MifareCSetBlock(c->arg[0], c->arg[1], c->d.asBytes);
-			break;
-		case CMD_MIFARE_CGETBLOCK:
-			MifareCGetBlock(c->arg[0], c->arg[1], c->d.asBytes);
-			break;
-		case CMD_MIFARE_CIDENT:
-			MifareCIdent();
-			break;
-		// mifare sniffer
-//		case CMD_MIFARE_SNIFFER:
-			//SniffMifare(c->arg[0]);
-//			break;
-		case CMD_MIFARE_SETMOD:
-			MifareSetMod(c->arg[0], c->d.asBytes);
-			break;
-		//mifare desfire
-		case CMD_MIFARE_DESFIRE_READBL:
-			break;
-		case CMD_MIFARE_DESFIRE_WRITEBL:
-			break;
-		case CMD_MIFARE_DESFIRE_AUTH1:
-			MifareDES_Auth1(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
-			break;
-		case CMD_MIFARE_DESFIRE_AUTH2:
-			//MifareDES_Auth2(c->arg[0],c->d.asBytes);
-			break;
-		case CMD_MIFARE_DES_READER:
-			//readermifaredes(c->arg[0], c->arg[1], c->d.asBytes);
-			break;
-		case CMD_MIFARE_DESFIRE_INFO:
-			MifareDesfireGetInformation();
-			break;
-		case CMD_MIFARE_DESFIRE:
-			MifareSendCommand(c->arg[0], c->arg[1], c->d.asBytes);
-			break;
-		case CMD_MIFARE_COLLECT_NONCES:
-			break;
-		case CMD_MIFARE_NACK_DETECT:
-			DetectNACKbug();
-			break;
+        // Work with "magic Chinese" card
+        case CMD_MIFARE_CSETBLOCK:
+            MifareCSetBlock(c->arg[0], c->arg[1], c->d.asBytes);
+            break;
+        case CMD_MIFARE_CGETBLOCK:
+            MifareCGetBlock(c->arg[0], c->arg[1], c->d.asBytes);
+            break;
+        case CMD_MIFARE_CIDENT:
+            MifareCIdent();
+            break;
+        // mifare sniffer
+//        case CMD_MIFARE_SNIFFER:
+//            SniffMifare(c->arg[0]);
+//            break;
+        case CMD_MIFARE_SETMOD:
+            MifareSetMod(c->arg[0], c->d.asBytes);
+            break;
+        //mifare desfire
+        case CMD_MIFARE_DESFIRE_READBL:
+            break;
+        case CMD_MIFARE_DESFIRE_WRITEBL:
+            break;
+        case CMD_MIFARE_DESFIRE_AUTH1:
+            MifareDES_Auth1(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+            break;
+        case CMD_MIFARE_DESFIRE_AUTH2:
+            //MifareDES_Auth2(c->arg[0],c->d.asBytes);
+            break;
+        case CMD_MIFARE_DES_READER:
+            //readermifaredes(c->arg[0], c->arg[1], c->d.asBytes);
+            break;
+        case CMD_MIFARE_DESFIRE_INFO:
+            MifareDesfireGetInformation();
+            break;
+        case CMD_MIFARE_DESFIRE:
+            MifareSendCommand(c->arg[0], c->arg[1], c->d.asBytes);
+            break;
+        case CMD_MIFARE_COLLECT_NONCES:
+            break;
+        case CMD_MIFARE_NACK_DETECT:
+            DetectNACKbug();
+            break;
 #endif
 
 #ifdef WITH_ICLASS
-		// Makes use of ISO14443a FPGA Firmware
-		case CMD_SNOOP_ICLASS:
-			SniffIClass();
-			break;
-		case CMD_SIMULATE_TAG_ICLASS:
-			SimulateIClass(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
-			break;
-		case CMD_READER_ICLASS:
-			ReaderIClass(c->arg[0]);
-			break;
-		case CMD_READER_ICLASS_REPLAY:
-		    ReaderIClass_Replay(c->arg[0], c->d.asBytes);
-			break;
-		case CMD_ICLASS_EML_MEMSET:
-			//iceman, should call FPGADOWNLOAD before, since it corrupts BigBuf
-			FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-			emlSet(c->d.asBytes, c->arg[0], c->arg[1]);
-			break;
-		case CMD_ICLASS_WRITEBLOCK:
-			iClass_WriteBlock(c->arg[0], c->d.asBytes);
-			break;
-		case CMD_ICLASS_READCHECK:  // auth step 1
-			iClass_ReadCheck(c->arg[0], c->arg[1]);
-			break;
-		case CMD_ICLASS_READBLOCK:
-			iClass_ReadBlk(c->arg[0]);
-			break;
-		case CMD_ICLASS_AUTHENTICATION: //check
-			iClass_Authentication(c->d.asBytes);
-			break;
-		case CMD_ICLASS_CHECK_KEYS:
-			iClass_Authentication_fast(c->arg[0], c->arg[1], c->d.asBytes);
-			break;
-		case CMD_ICLASS_DUMP:
-			iClass_Dump(c->arg[0], c->arg[1]);
-			break;
-		case CMD_ICLASS_CLONE:
-			iClass_Clone(c->arg[0], c->arg[1], c->d.asBytes);
-			break;
+        // Makes use of ISO14443a FPGA Firmware
+        case CMD_SNOOP_ICLASS:
+            SniffIClass();
+            break;
+        case CMD_SIMULATE_TAG_ICLASS:
+            SimulateIClass(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+            break;
+        case CMD_READER_ICLASS:
+            ReaderIClass(c->arg[0]);
+            break;
+        case CMD_READER_ICLASS_REPLAY:
+            ReaderIClass_Replay(c->arg[0], c->d.asBytes);
+            break;
+        case CMD_ICLASS_EML_MEMSET:
+            //iceman, should call FPGADOWNLOAD before, since it corrupts BigBuf
+            FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
+            emlSet(c->d.asBytes, c->arg[0], c->arg[1]);
+            break;
+        case CMD_ICLASS_WRITEBLOCK:
+            iClass_WriteBlock(c->arg[0], c->d.asBytes);
+            break;
+        case CMD_ICLASS_READCHECK:  // auth step 1
+            iClass_ReadCheck(c->arg[0], c->arg[1]);
+            break;
+        case CMD_ICLASS_READBLOCK:
+            iClass_ReadBlk(c->arg[0]);
+            break;
+        case CMD_ICLASS_AUTHENTICATION: //check
+            iClass_Authentication(c->d.asBytes);
+            break;
+        case CMD_ICLASS_CHECK_KEYS:
+            iClass_Authentication_fast(c->arg[0], c->arg[1], c->d.asBytes);
+            break;
+        case CMD_ICLASS_DUMP:
+            iClass_Dump(c->arg[0], c->arg[1]);
+            break;
+        case CMD_ICLASS_CLONE:
+            iClass_Clone(c->arg[0], c->arg[1], c->d.asBytes);
+            break;
 #endif
 
 #ifdef WITH_HFSNOOP
-		case CMD_HF_SNIFFER:
-			HfSnoop(c->arg[0], c->arg[1]);
-			break;
+        case CMD_HF_SNIFFER:
+            HfSnoop(c->arg[0], c->arg[1]);
+            break;
 #endif
 
 #ifdef WITH_SMARTCARD
-		case CMD_SMART_ATR: {
-			SmartCardAtr();
-			break;
-		}
-		case CMD_SMART_SETBAUD:{
-			SmartCardSetBaud(c->arg[0]);
-			break;
-		}
-		case CMD_SMART_SETCLOCK:{
-			SmartCardSetClock(c->arg[0]);
-			break;
-		}
-        case CMD_SMART_RAW: {
-			SmartCardRaw(c->arg[0], c->arg[1], c->d.asBytes);
+        case CMD_SMART_ATR: {
+            SmartCardAtr();
             break;
         }
-		case CMD_SMART_UPLOAD: {
-			// upload file from client
-			uint8_t *mem = BigBuf_get_addr();
-			memcpy( mem + c->arg[0], c->d.asBytes, USB_CMD_DATA_SIZE);
-			cmd_send(CMD_ACK,1,0,0,0,0);
-			break;
-		}
-        case CMD_SMART_UPGRADE: {
-			SmartCardUpgrade(c->arg[0]);
+        case CMD_SMART_SETBAUD:{
+            SmartCardSetBaud(c->arg[0]);
             break;
-		}
+        }
+        case CMD_SMART_SETCLOCK:{
+            SmartCardSetClock(c->arg[0]);
+            break;
+        }
+        case CMD_SMART_RAW: {
+            SmartCardRaw(c->arg[0], c->arg[1], c->d.asBytes);
+            break;
+        }
+        case CMD_SMART_UPLOAD: {
+            // upload file from client
+            uint8_t *mem = BigBuf_get_addr();
+            memcpy( mem + c->arg[0], c->d.asBytes, USB_CMD_DATA_SIZE);
+            cmd_send(CMD_ACK,1,0,0,0,0);
+            break;
+        }
+        case CMD_SMART_UPGRADE: {
+            SmartCardUpgrade(c->arg[0]);
+            break;
+        }
 #endif
 
 #ifdef WITH_FPC
-		case CMD_FPC_SEND: {
+        case CMD_FPC_SEND: {
 
 
-			StartTicks();
-			DbpString("Mutual USB/FPC sending from device to client");
+            StartTicks();
+            DbpString("Mutual USB/FPC sending from device to client");
 
-			/*
-			char at[11] = {'\0'};
-			static const char* s_at = "AT+BAUD8\0D\0A";
-			strncat(at, s_at, sizeof(at) - strlen(at) - 1);
-			DbpString("Try AT baud rate setting");
-			usart_init();
-			int16_t res = usart_writebuffer((uint8_t*)&at, sizeof(at));
-			WaitMS(1);
-			Dbprintf("SEND %d | %c%c%c%c%c%c%c%c%c%c%c", res,  at[0], at[1], at[2], at[3], at[4], at[5], at[6], at[7], at[8], at[9], at[10]);
+            /*
+            char at[11] = {'\0'};
+            static const char* s_at = "AT+BAUD8\0D\0A";
+            strncat(at, s_at, sizeof(at) - strlen(at) - 1);
+            DbpString("Try AT baud rate setting");
+            usart_init();
+            int16_t res = usart_writebuffer((uint8_t*)&at, sizeof(at));
+            WaitMS(1);
+            Dbprintf("SEND %d | %c%c%c%c%c%c%c%c%c%c%c", res,  at[0], at[1], at[2], at[3], at[4], at[5], at[6], at[7], at[8], at[9], at[10]);
 
-			uint8_t my_rx[20];
-			memset(my_rx, 0, sizeof(my_rx));
-			res = usart_readbuffer(my_rx, sizeof(my_rx));
-			WaitMS(1);
-			Dbprintf("GOT  %d | %c%c%c%c%c%c%c%c", res,  my_rx[0], my_rx[1], my_rx[2], my_rx[3], my_rx[4], my_rx[5], my_rx[6], my_rx[7]);
-			*/
+            uint8_t my_rx[20];
+            memset(my_rx, 0, sizeof(my_rx));
+            res = usart_readbuffer(my_rx, sizeof(my_rx));
+            WaitMS(1);
+            Dbprintf("GOT  %d | %c%c%c%c%c%c%c%c", res,  my_rx[0], my_rx[1], my_rx[2], my_rx[3], my_rx[4], my_rx[5], my_rx[6], my_rx[7]);
+            */
 
 
-			char dest[USB_CMD_DATA_SIZE] = { '\0' };
-			static const char* welcome = "Proxmark3 Serial interface via FPC ready\n";
-			strncat(dest, welcome, sizeof(dest) - strlen(dest) - 1);
-			sprintf(dest + strlen(dest) - 1, "| bytes 0x%02x 0x%02x 0x%02x 0x%02x \n"
-						, c->d.asBytes[0]
-						, c->d.asBytes[1]
-						, c->d.asBytes[2]
-						, c->d.asBytes[3]
-						);
+            char dest[USB_CMD_DATA_SIZE] = { '\0' };
+            static const char* welcome = "Proxmark3 Serial interface via FPC ready\n";
+            strncat(dest, welcome, sizeof(dest) - strlen(dest) - 1);
+            sprintf(dest + strlen(dest) - 1, "| bytes 0x%02x 0x%02x 0x%02x 0x%02x \n"
+                        , c->d.asBytes[0]
+                        , c->d.asBytes[1]
+                        , c->d.asBytes[2]
+                        , c->d.asBytes[3]
+                        );
 
-			UsbCommand txcmd = { CMD_DEBUG_PRINT_STRING, { strlen(dest), 0, 0 } };
-			memcpy(txcmd.d.asBytes, dest, sizeof(dest));
+            UsbCommand txcmd = { CMD_DEBUG_PRINT_STRING, { strlen(dest), 0, 0 } };
+            memcpy(txcmd.d.asBytes, dest, sizeof(dest));
 
-			LED_A_ON();
+            LED_A_ON();
 
-			usart_init();
-			usart_writebuffer((uint8_t*)&txcmd, sizeof(UsbCommand));
+            usart_init();
+            usart_writebuffer((uint8_t*)&txcmd, sizeof(UsbCommand));
 
-			//usb
-			cmd_send(CMD_DEBUG_PRINT_STRING, strlen(dest), 0, 0, dest, strlen(dest));
-			LED_A_OFF();
+            //usb
+            cmd_send(CMD_DEBUG_PRINT_STRING, strlen(dest), 0, 0, dest, strlen(dest));
+            LED_A_OFF();
 
 
-			/*
-			uint8_t my_rx[sizeof(UsbCommand)];
-			while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
-				LED_B_INV();
-				if (usart_readbuffer(my_rx, sizeof(UsbCommand)) ) {
-					//UsbPacketReceived(my_rx, sizeof(my_rx));
+            /*
+            uint8_t my_rx[sizeof(UsbCommand)];
+            while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
+                LED_B_INV();
+                if (usart_readbuffer(my_rx, sizeof(UsbCommand)) ) {
+                    //UsbPacketReceived(my_rx, sizeof(my_rx));
 
-					UsbCommand *my = (UsbCommand *)my_rx;
-					if (mc->cmd > 0 ) {
-						Dbprintf("received command: 0x%04x and args: %d %d %d", my->cmd, my->arg[0], my->arg[1], my->arg[2]);
-					}
-				}
-			}
-			*/
+                    UsbCommand *my = (UsbCommand *)my_rx;
+                    if (mc->cmd > 0 ) {
+                        Dbprintf("received command: 0x%04x and args: %d %d %d", my->cmd, my->arg[0], my->arg[1], my->arg[2]);
+                    }
+                }
+            }
+            */
 
-			//cmd_send(CMD_DEBUG_PRINT_STRING, strlen(dest), 0, 0, dest, strlen(dest));
+            //cmd_send(CMD_DEBUG_PRINT_STRING, strlen(dest), 0, 0, dest, strlen(dest));
 
-			cmd_send(CMD_ACK,0,0,0,0,0);
-			StopTicks();
-			break;
-		}
+            cmd_send(CMD_ACK,0,0,0,0,0);
+            StopTicks();
+            break;
+        }
 #endif
-		case CMD_BUFF_CLEAR:
-			BigBuf_Clear();
-			BigBuf_free();
-			break;
+        case CMD_BUFF_CLEAR:
+            BigBuf_Clear();
+            BigBuf_free();
+            break;
 
-		case CMD_MEASURE_ANTENNA_TUNING:
-			MeasureAntennaTuning();
-			break;
+        case CMD_MEASURE_ANTENNA_TUNING:
+            MeasureAntennaTuning();
+            break;
 
-		case CMD_MEASURE_ANTENNA_TUNING_HF:
-			MeasureAntennaTuningHf();
-			break;
+        case CMD_MEASURE_ANTENNA_TUNING_HF:
+            MeasureAntennaTuningHf();
+            break;
 
-		case CMD_LISTEN_READER_FIELD:
-			ListenReaderField(c->arg[0]);
-			break;
+        case CMD_LISTEN_READER_FIELD:
+            ListenReaderField(c->arg[0]);
+            break;
 
-		case CMD_FPGA_MAJOR_MODE_OFF:		// ## FPGA Control
-			FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-			SpinDelay(200);
-			LED_D_OFF(); // LED D indicates field ON or OFF
-			break;
+        case CMD_FPGA_MAJOR_MODE_OFF: // ## FPGA Control
+            FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+            SpinDelay(200);
+            LED_D_OFF(); // LED D indicates field ON or OFF
+            break;
 #ifdef WITH_LF
-		case CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K: {
-			LED_B_ON();
-			uint8_t *mem = BigBuf_get_addr();
-			bool isok = false;
-			size_t len = 0;
-			uint32_t startidx = c->arg[0];
-			uint32_t numofbytes = c->arg[1];
-			// arg0 = startindex
-			// arg1 = length bytes to transfer
-			// arg2 = BigBuf tracelen
-			//Dbprintf("transfer to client parameters: %" PRIu32 " | %" PRIu32 " | %" PRIu32, startidx, numofbytes, c->arg[2]);
+        case CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K: {
+            LED_B_ON();
+            uint8_t *mem = BigBuf_get_addr();
+            bool isok = false;
+            size_t len = 0;
+            uint32_t startidx = c->arg[0];
+            uint32_t numofbytes = c->arg[1];
+            // arg0 = startindex
+            // arg1 = length bytes to transfer
+            // arg2 = BigBuf tracelen
+            //Dbprintf("transfer to client parameters: %" PRIu32 " | %" PRIu32 " | %" PRIu32, startidx, numofbytes, c->arg[2]);
 
-			for(size_t i = 0; i < numofbytes; i += USB_CMD_DATA_SIZE) {
-				len = MIN( (numofbytes - i), USB_CMD_DATA_SIZE);
-				isok = cmd_send(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K, i, len, BigBuf_get_traceLen(), mem + startidx + i, len);
-				if (isok != 0)
-					Dbprintf("transfer to client failed ::  | bytes between %d - %d (%d)", i, i+len, len);
-			}
-			// Trigger a finish downloading signal with an ACK frame
-			// iceman,  when did sending samplingconfig array got attached here?!?
-			// arg0 = status of download transfer
-			// arg1 = RFU
-			// arg2 = tracelen?
-			// asbytes = samplingconfig array
-			cmd_send(CMD_ACK, 1, 0, BigBuf_get_traceLen(), getSamplingConfig(), sizeof(sample_config));
-			LED_B_OFF();
-			break;
-		}
+            for(size_t i = 0; i < numofbytes; i += USB_CMD_DATA_SIZE) {
+                len = MIN( (numofbytes - i), USB_CMD_DATA_SIZE);
+                isok = cmd_send(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K, i, len, BigBuf_get_traceLen(), mem + startidx + i, len);
+                if (isok != 0)
+                    Dbprintf("transfer to client failed ::  | bytes between %d - %d (%d)", i, i+len, len);
+            }
+            // Trigger a finish downloading signal with an ACK frame
+            // iceman,  when did sending samplingconfig array got attached here?!?
+            // arg0 = status of download transfer
+            // arg1 = RFU
+            // arg2 = tracelen?
+            // asbytes = samplingconfig array
+            cmd_send(CMD_ACK, 1, 0, BigBuf_get_traceLen(), getSamplingConfig(), sizeof(sample_config));
+            LED_B_OFF();
+            break;
+        }
 #endif
-		case CMD_UPLOAD_SIM_SAMPLES_125K: {
-			// iceman; since changing fpga_bitstreams clears bigbuff, Its better to call it before.
-			// to be able to use this one for uploading data to device
-			// arg1 = 0 upload for LF usage
-			//        1 upload for HF usage
-			#define FPGA_LF 1
-			if ( c->arg[1] == FPGA_LF )
-				FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-			else
-				FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
+        case CMD_UPLOAD_SIM_SAMPLES_125K: {
+            // iceman; since changing fpga_bitstreams clears bigbuff, Its better to call it before.
+            // to be able to use this one for uploading data to device
+            // arg1 = 0 upload for LF usage
+            //        1 upload for HF usage
+            #define FPGA_LF 1
+            if ( c->arg[1] == FPGA_LF )
+                FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
+            else
+                FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
 
-			uint8_t *mem = BigBuf_get_addr();
-			memcpy( mem + c->arg[0], c->d.asBytes, USB_CMD_DATA_SIZE);
-			cmd_send(CMD_ACK,1,0,0,0,0);
-			break;
-		}
-		case CMD_DOWNLOAD_EML_BIGBUF: {
-			LED_B_ON();
-			uint8_t *mem = BigBuf_get_EM_addr();
-			bool isok = false;
-			size_t len = 0;
-			uint32_t startidx = c->arg[0];
-			uint32_t numofbytes = c->arg[1];
+            uint8_t *mem = BigBuf_get_addr();
+            memcpy( mem + c->arg[0], c->d.asBytes, USB_CMD_DATA_SIZE);
+            cmd_send(CMD_ACK,1,0,0,0,0);
+            break;
+        }
+        case CMD_DOWNLOAD_EML_BIGBUF: {
+            LED_B_ON();
+            uint8_t *mem = BigBuf_get_EM_addr();
+            bool isok = false;
+            size_t len = 0;
+            uint32_t startidx = c->arg[0];
+            uint32_t numofbytes = c->arg[1];
 
-			// arg0 = startindex
-			// arg1 = length bytes to transfer
-			// arg2 = RFU
+            // arg0 = startindex
+            // arg1 = length bytes to transfer
+            // arg2 = RFU
 
-			for (size_t i = 0; i < numofbytes; i += USB_CMD_DATA_SIZE) {
-				len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);
-				isok = cmd_send(CMD_DOWNLOADED_EML_BIGBUF, i, len, 0, mem + startidx + i, len);
-				if (isok != 0)
-					Dbprintf("transfer to client failed ::  | bytes between %d - %d (%d)", i, i+len, len);
-			}
-			// Trigger a finish downloading signal with an ACK frame
-			cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
-			LED_B_OFF();
-			break;
-		}
-		case CMD_READ_MEM:
-			ReadMem(c->arg[0]);
-			break;
+            for (size_t i = 0; i < numofbytes; i += USB_CMD_DATA_SIZE) {
+                len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);
+                isok = cmd_send(CMD_DOWNLOADED_EML_BIGBUF, i, len, 0, mem + startidx + i, len);
+                if (isok != 0)
+                    Dbprintf("transfer to client failed ::  | bytes between %d - %d (%d)", i, i+len, len);
+            }
+            // Trigger a finish downloading signal with an ACK frame
+            cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
+            LED_B_OFF();
+            break;
+        }
+        case CMD_READ_MEM:
+            ReadMem(c->arg[0]);
+            break;
 #ifdef WITH_FLASH
-		case CMD_FLASHMEM_SET_SPIBAUDRATE:
-			FlashmemSetSpiBaudrate(c->arg[0]);
-			break;
-		case CMD_FLASHMEM_READ: {
-			LED_B_ON();
-			uint16_t isok = 0;
-			uint32_t startidx = c->arg[0];
-			uint16_t len = c->arg[1];
+        case CMD_FLASHMEM_SET_SPIBAUDRATE:
+            FlashmemSetSpiBaudrate(c->arg[0]);
+            break;
+        case CMD_FLASHMEM_READ: {
+            LED_B_ON();
+            uint16_t isok = 0;
+            uint32_t startidx = c->arg[0];
+            uint16_t len = c->arg[1];
 
-			Dbprintf("FlashMem read | %d - %d | ", startidx, len);
+            Dbprintf("FlashMem read | %d - %d | ", startidx, len);
 
-			size_t size = MIN(USB_CMD_DATA_SIZE, len);
+            size_t size = MIN(USB_CMD_DATA_SIZE, len);
 
-			if (!FlashInit()) {
-   		       break;
-  		    }
+            if (!FlashInit()) {
+                break;
+            }
 
-			uint8_t *mem = BigBuf_malloc(size);
+            uint8_t *mem = BigBuf_malloc(size);
 
-			for(size_t i = 0; i < len; i += size) {
-				len = MIN((len - i), size);
+            for(size_t i = 0; i < len; i += size) {
+                len = MIN((len - i), size);
 
-				Dbprintf("FlashMem reading  | %d | %d | %d |", startidx + i, i, len);
-				isok = Flash_ReadDataCont(startidx + i, mem, len);
-				if ( isok == len ) {
-					print_result("Chunk: ", mem, len);
-				} else {
-					Dbprintf("FlashMem reading failed | %d | %d", len, isok);
-					break;
-				}
-			}
-			BigBuf_free();
-			FlashStop();
-			LED_B_OFF();
-			break;
-		}
-		case CMD_FLASHMEM_WRITE: {
-			LED_B_ON();
-			uint8_t isok = 0;
-			uint16_t res = 0;
-			uint32_t startidx = c->arg[0];
-			uint16_t len = c->arg[1];
-			uint8_t* data = c->d.asBytes;
+                Dbprintf("FlashMem reading  | %d | %d | %d |", startidx + i, i, len);
+                isok = Flash_ReadDataCont(startidx + i, mem, len);
+                if ( isok == len ) {
+                    print_result("Chunk: ", mem, len);
+                } else {
+                    Dbprintf("FlashMem reading failed | %d | %d", len, isok);
+                    break;
+                }
+            }
+            BigBuf_free();
+            FlashStop();
+            LED_B_OFF();
+            break;
+        }
+        case CMD_FLASHMEM_WRITE: {
+            LED_B_ON();
+            uint8_t isok = 0;
+            uint16_t res = 0;
+            uint32_t startidx = c->arg[0];
+            uint16_t len = c->arg[1];
+            uint8_t* data = c->d.asBytes;
 
-			uint32_t tmp = startidx + len;
+            uint32_t tmp = startidx + len;
 
-  			if (!FlashInit()) {
-   		       break;
-  		    }
+            if (!FlashInit()) {
+                break;
+            }
 
-  		    Flash_CheckBusy(BUSY_TIMEOUT);
-  		    Flash_WriteEnable();
+            Flash_CheckBusy(BUSY_TIMEOUT);
+            Flash_WriteEnable();
 
-			if ( startidx == DEFAULT_T55XX_KEYS_OFFSET  )
-				Flash_Erase4k(3, 0xC);
-			else if (startidx ==  DEFAULT_MF_KEYS_OFFSET )
-				Flash_Erase4k(3, 0xB);
-			else if (startidx == DEFAULT_ICLASS_KEYS_OFFSET)
-				Flash_Erase4k(3, 0xA);
+            if ( startidx == DEFAULT_T55XX_KEYS_OFFSET  )
+                Flash_Erase4k(3, 0xC);
+            else if (startidx ==  DEFAULT_MF_KEYS_OFFSET )
+                Flash_Erase4k(3, 0xB);
+            else if (startidx == DEFAULT_ICLASS_KEYS_OFFSET)
+                Flash_Erase4k(3, 0xA);
 
-  		    Flash_CheckBusy(BUSY_TIMEOUT);
-  		    Flash_WriteEnable();
+            Flash_CheckBusy(BUSY_TIMEOUT);
+            Flash_WriteEnable();
 
-			// inside 256b page?
-			if ( (tmp & 0xFF) != 0) {
+            // inside 256b page?
+            if ( (tmp & 0xFF) != 0) {
 
-					// is offset+len larger than a page
-					tmp =  (startidx & 0xFF ) + len;
-					if (tmp > 0xFF ) {
+                    // is offset+len larger than a page
+                    tmp =  (startidx & 0xFF ) + len;
+                    if (tmp > 0xFF ) {
 
-						// data spread over two pages.
+                        // data spread over two pages.
 
-						// offset xxxx10,
-						uint8_t first_len =  (~startidx & 0xFF)+1;
+                        // offset xxxx10,
+                        uint8_t first_len =  (~startidx & 0xFF)+1;
 
-						// first mem page
-						res = Flash_WriteDataCont(startidx, data, first_len);
+                        // first mem page
+                        res = Flash_WriteDataCont(startidx, data, first_len);
 
-						// second mem page
-						res = Flash_WriteDataCont(startidx + first_len, data + first_len, len - first_len);
+                        // second mem page
+                        res = Flash_WriteDataCont(startidx + first_len, data + first_len, len - first_len);
 
-						isok = (res == (len - first_len)) ? 1 : 0;
+                        isok = (res == (len - first_len)) ? 1 : 0;
 
-					} else {
-						res = Flash_WriteDataCont(startidx, data, len);
-						isok = (res == len) ? 1 : 0;
-					}
-			} else {
-				res = Flash_WriteDataCont(startidx, data, len);
-				isok = (res == len) ? 1 : 0;
-			}
-  		    FlashStop();
+                    } else {
+                        res = Flash_WriteDataCont(startidx, data, len);
+                        isok = (res == len) ? 1 : 0;
+                    }
+            } else {
+                res = Flash_WriteDataCont(startidx, data, len);
+                isok = (res == len) ? 1 : 0;
+            }
+            FlashStop();
 
-			cmd_send(CMD_ACK, isok, 0, 0, 0, 0);
-			LED_B_OFF();
-			break;
-		}
-		case CMD_FLASHMEM_WIPE: {
-			LED_B_ON();
-			uint8_t page = c->arg[0];
-			uint8_t initalwipe = c->arg[1];
-			bool isok = false;
-			if ( initalwipe ) {
-				isok = Flash_WipeMemory();
-				cmd_send(CMD_ACK, isok, 0, 0, 0, 0);
-				LED_B_OFF();
-				break;
-			}
-			if ( page < 3)
-				isok = Flash_WipeMemoryPage(page);
+            cmd_send(CMD_ACK, isok, 0, 0, 0, 0);
+            LED_B_OFF();
+            break;
+        }
+        case CMD_FLASHMEM_WIPE: {
+            LED_B_ON();
+            uint8_t page = c->arg[0];
+            uint8_t initalwipe = c->arg[1];
+            bool isok = false;
+            if ( initalwipe ) {
+                isok = Flash_WipeMemory();
+                cmd_send(CMD_ACK, isok, 0, 0, 0, 0);
+                LED_B_OFF();
+                break;
+            }
+            if ( page < 3)
+                isok = Flash_WipeMemoryPage(page);
 
-			cmd_send(CMD_ACK, isok, 0, 0, 0, 0);
-			LED_B_OFF();
-			break;
-		}
-		case CMD_FLASHMEM_DOWNLOAD: {
+            cmd_send(CMD_ACK, isok, 0, 0, 0, 0);
+            LED_B_OFF();
+            break;
+        }
+        case CMD_FLASHMEM_DOWNLOAD: {
 
-			LED_B_ON();
-			uint8_t *mem = BigBuf_malloc(USB_CMD_DATA_SIZE);
-			bool isok = false;
-			size_t len = 0;
-			uint32_t startidx = c->arg[0];
-			uint32_t numofbytes = c->arg[1];
-			// arg0 = startindex
-			// arg1 = length bytes to transfer
-			// arg2 = RFU
+            LED_B_ON();
+            uint8_t *mem = BigBuf_malloc(USB_CMD_DATA_SIZE);
+            bool isok = false;
+            size_t len = 0;
+            uint32_t startidx = c->arg[0];
+            uint32_t numofbytes = c->arg[1];
+            // arg0 = startindex
+            // arg1 = length bytes to transfer
+            // arg2 = RFU
 
-  			if (!FlashInit()) {
-   		       break;
-  		    }
+            if (!FlashInit()) {
+                break;
+            }
 
-			for (size_t i = 0; i < numofbytes; i += USB_CMD_DATA_SIZE) {
-				len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);
+            for (size_t i = 0; i < numofbytes; i += USB_CMD_DATA_SIZE) {
+                len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);
 
-				isok = Flash_ReadDataCont(startidx + i, mem, len);
-				if (!isok )
-					Dbprintf("reading flash memory failed ::  | bytes between %d - %d", i, len);
+                isok = Flash_ReadDataCont(startidx + i, mem, len);
+                if (!isok )
+                    Dbprintf("reading flash memory failed ::  | bytes between %d - %d", i, len);
 
-				isok = cmd_send(CMD_FLASHMEM_DOWNLOADED, i, len, 0, mem, len);
-				if (isok != 0)
-					Dbprintf("transfer to client failed ::  | bytes between %d - %d", i, len);
-			}
-				FlashStop();
+                isok = cmd_send(CMD_FLASHMEM_DOWNLOADED, i, len, 0, mem, len);
+                if (isok != 0)
+                    Dbprintf("transfer to client failed ::  | bytes between %d - %d", i, len);
+            }
+                FlashStop();
 
-			cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
-			LED_B_OFF();
-			break;
-		}
-		case CMD_FLASHMEM_INFO: {
+            cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
+            LED_B_OFF();
+            break;
+        }
+        case CMD_FLASHMEM_INFO: {
 
-			LED_B_ON();
-			rdv40_validation_t *info = (rdv40_validation_t*)BigBuf_malloc( sizeof(rdv40_validation_t) );
+            LED_B_ON();
+            rdv40_validation_t *info = (rdv40_validation_t*)BigBuf_malloc( sizeof(rdv40_validation_t) );
 
-			bool isok = Flash_ReadData(FLASH_MEM_SIGNATURE_OFFSET, info->signature, FLASH_MEM_SIGNATURE_LEN);
+            bool isok = Flash_ReadData(FLASH_MEM_SIGNATURE_OFFSET, info->signature, FLASH_MEM_SIGNATURE_LEN);
 
-			if (FlashInit()) {
-				Flash_UniqueID( info->flashid);
-				FlashStop();
-			}
-			cmd_send(CMD_ACK, isok, 0, 0, info, sizeof(rdv40_validation_t));
-			BigBuf_free();
+            if (FlashInit()) {
+                Flash_UniqueID( info->flashid);
+                FlashStop();
+            }
+            cmd_send(CMD_ACK, isok, 0, 0, info, sizeof(rdv40_validation_t));
+            BigBuf_free();
 
-			LED_B_OFF();
-			break;
-		}
+            LED_B_OFF();
+            break;
+        }
 #endif
-		case CMD_SET_LF_DIVISOR:
-		  	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-			FpgaSendCommand(FPGA_CMD_SET_DIVISOR, c->arg[0]);
-			break;
+        case CMD_SET_LF_DIVISOR:
+            FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
+            FpgaSendCommand(FPGA_CMD_SET_DIVISOR, c->arg[0]);
+            break;
 
-		case CMD_SET_ADC_MUX:
-			switch(c->arg[0]) {
-				case 0: SetAdcMuxFor(GPIO_MUXSEL_LOPKD); break;
-				case 2: SetAdcMuxFor(GPIO_MUXSEL_HIPKD); break;
+        case CMD_SET_ADC_MUX:
+            switch(c->arg[0]) {
+                case 0: SetAdcMuxFor(GPIO_MUXSEL_LOPKD); break;
+                case 2: SetAdcMuxFor(GPIO_MUXSEL_HIPKD); break;
 #ifndef WITH_FPC
-				case 1: SetAdcMuxFor(GPIO_MUXSEL_LORAW); break;
-				case 3: SetAdcMuxFor(GPIO_MUXSEL_HIRAW); break;
+                case 1: SetAdcMuxFor(GPIO_MUXSEL_LORAW); break;
+                case 3: SetAdcMuxFor(GPIO_MUXSEL_HIRAW); break;
 #endif
-				}
-			break;
+                }
+            break;
 
-		case CMD_VERSION:
-			SendVersion();
-			break;
-		case CMD_STATUS:
-			SendStatus();
-			break;
-		case CMD_PING:
-			cmd_send(CMD_ACK,0,0,0,0,0);
-			break;
+        case CMD_VERSION:
+            SendVersion();
+            break;
+        case CMD_STATUS:
+            SendStatus();
+            break;
+        case CMD_PING:
+            cmd_send(CMD_ACK,0,0,0,0,0);
+            break;
 #ifdef WITH_LCD
-		case CMD_LCD_RESET:
-			LCDReset();
-			break;
-		case CMD_LCD:
-			LCDSend(c->arg[0]);
-			break;
+        case CMD_LCD_RESET:
+            LCDReset();
+            break;
+        case CMD_LCD:
+            LCDSend(c->arg[0]);
+            break;
 #endif
-		case CMD_SETUP_WRITE:
-		case CMD_FINISH_WRITE:
-		case CMD_HARDWARE_RESET:
-			usb_disable();
+        case CMD_SETUP_WRITE:
+        case CMD_FINISH_WRITE:
+        case CMD_HARDWARE_RESET:
+            usb_disable();
 
-			// (iceman) why this wait?
-			SpinDelay(1000);
-			AT91C_BASE_RSTC->RSTC_RCR = RST_CONTROL_KEY | AT91C_RSTC_PROCRST;
-			// We're going to reset, and the bootrom will take control.
-			for(;;) {}
-			break;
+            // (iceman) why this wait?
+            SpinDelay(1000);
+            AT91C_BASE_RSTC->RSTC_RCR = RST_CONTROL_KEY | AT91C_RSTC_PROCRST;
+            // We're going to reset, and the bootrom will take control.
+            for(;;) {}
+            break;
 
-		case CMD_START_FLASH:
-			if(common_area.flags.bootrom_present) {
-				common_area.command = COMMON_AREA_COMMAND_ENTER_FLASH_MODE;
-			}
-			usb_disable();
-			AT91C_BASE_RSTC->RSTC_RCR = RST_CONTROL_KEY | AT91C_RSTC_PROCRST;
-			// We're going to flash, and the bootrom will take control.
-			for(;;) {}
-			break;
+        case CMD_START_FLASH:
+            if(common_area.flags.bootrom_present) {
+                common_area.command = COMMON_AREA_COMMAND_ENTER_FLASH_MODE;
+            }
+            usb_disable();
+            AT91C_BASE_RSTC->RSTC_RCR = RST_CONTROL_KEY | AT91C_RSTC_PROCRST;
+            // We're going to flash, and the bootrom will take control.
+            for(;;) {}
+            break;
 
-		case CMD_DEVICE_INFO: {
-			uint32_t dev_info = DEVICE_INFO_FLAG_OSIMAGE_PRESENT | DEVICE_INFO_FLAG_CURRENT_MODE_OS;
-			if (common_area.flags.bootrom_present) {
-				dev_info |= DEVICE_INFO_FLAG_BOOTROM_PRESENT;
-			}
-			cmd_send(CMD_DEVICE_INFO,dev_info,0,0,0,0);
-			break;
-			}
-		default:
-			Dbprintf("%s: 0x%04x","unknown command:", c->cmd);
-			break;
-	}
+        case CMD_DEVICE_INFO: {
+            uint32_t dev_info = DEVICE_INFO_FLAG_OSIMAGE_PRESENT | DEVICE_INFO_FLAG_CURRENT_MODE_OS;
+            if (common_area.flags.bootrom_present) {
+                dev_info |= DEVICE_INFO_FLAG_BOOTROM_PRESENT;
+            }
+            cmd_send(CMD_DEVICE_INFO,dev_info,0,0,0,0);
+            break;
+            }
+        default:
+            Dbprintf("%s: 0x%04x","unknown command:", c->cmd);
+            break;
+    }
 }
 
 void  __attribute__((noreturn)) AppMain(void) {
 
-	SpinDelay(100);
-	clear_trace();
+    SpinDelay(100);
+    clear_trace();
 
-	if(common_area.magic != COMMON_AREA_MAGIC || common_area.version != 1) {
-		/* Initialize common area */
-		memset(&common_area, 0, sizeof(common_area));
-		common_area.magic = COMMON_AREA_MAGIC;
-		common_area.version = 1;
-	}
-	common_area.flags.osimage_present = 1;
+    if(common_area.magic != COMMON_AREA_MAGIC || common_area.version != 1) {
+        /* Initialize common area */
+        memset(&common_area, 0, sizeof(common_area));
+        common_area.magic = COMMON_AREA_MAGIC;
+        common_area.version = 1;
+    }
+    common_area.flags.osimage_present = 1;
 
-	LEDsoff();
+    LEDsoff();
 
-	// The FPGA gets its clock from us from PCK0 output, so set that up.
-	AT91C_BASE_PIOA->PIO_BSR = GPIO_PCK0;
-	AT91C_BASE_PIOA->PIO_PDR = GPIO_PCK0;
-	AT91C_BASE_PMC->PMC_SCER |= AT91C_PMC_PCK0;
-	// PCK0 is PLL clock / 4 = 96Mhz / 4 = 24Mhz
-	AT91C_BASE_PMC->PMC_PCKR[0] = AT91C_PMC_CSS_PLL_CLK | AT91C_PMC_PRES_CLK_4; //  4 for 24Mhz pck0, 2 for 48 MHZ pck0
-	AT91C_BASE_PIOA->PIO_OER = GPIO_PCK0;
+    // The FPGA gets its clock from us from PCK0 output, so set that up.
+    AT91C_BASE_PIOA->PIO_BSR = GPIO_PCK0;
+    AT91C_BASE_PIOA->PIO_PDR = GPIO_PCK0;
+    AT91C_BASE_PMC->PMC_SCER |= AT91C_PMC_PCK0;
+    // PCK0 is PLL clock / 4 = 96Mhz / 4 = 24Mhz
+    AT91C_BASE_PMC->PMC_PCKR[0] = AT91C_PMC_CSS_PLL_CLK | AT91C_PMC_PRES_CLK_4; //  4 for 24Mhz pck0, 2 for 48 MHZ pck0
+    AT91C_BASE_PIOA->PIO_OER = GPIO_PCK0;
 
-	// Reset SPI
-	AT91C_BASE_SPI->SPI_CR = AT91C_SPI_SWRST;
-	AT91C_BASE_SPI->SPI_CR = AT91C_SPI_SWRST; // errata says it needs twice to be correctly set.
+    // Reset SPI
+    AT91C_BASE_SPI->SPI_CR = AT91C_SPI_SWRST;
+    AT91C_BASE_SPI->SPI_CR = AT91C_SPI_SWRST; // errata says it needs twice to be correctly set.
 
-	// Reset SSC
-	AT91C_BASE_SSC->SSC_CR = AT91C_SSC_SWRST;
+    // Reset SSC
+    AT91C_BASE_SSC->SSC_CR = AT91C_SSC_SWRST;
 
-	// Configure MUX
-	SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
+    // Configure MUX
+    SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
 
-	// Load the FPGA image, which we have stored in our flash.
-	// (the HF version by default)
-	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
+    // Load the FPGA image, which we have stored in our flash.
+    // (the HF version by default)
+    FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
 
-	StartTickCount();
+    StartTickCount();
 
 #ifdef WITH_LCD
-	LCDInit();
+    LCDInit();
 #endif
 
 #ifdef WITH_SMARTCARD
-	I2C_init();
+    I2C_init();
 #endif
 
 #ifdef WITH_FPC
-	usart_init();
+    usart_init();
 #endif
 
 #ifdef WITH_FLASH
-	loadT55xxConfig();
+    loadT55xxConfig();
 #endif
 
-	// This is made as late as possible to ensure enumeration without timeout
-	// against device such as http://www.hobbytronics.co.uk/usb-host-board-v2
-	usb_disable();
-	usb_enable();
+    // This is made as late as possible to ensure enumeration without timeout
+    // against device such as http://www.hobbytronics.co.uk/usb-host-board-v2
+    usb_disable();
+    usb_enable();
 
-	uint8_t rx[sizeof(UsbCommand)];
+    uint8_t rx[sizeof(UsbCommand)];
 
-	for(;;) {
-		WDT_HIT();
+    for(;;) {
+        WDT_HIT();
 
-		// Check if there is a usb packet available
-		if (usb_poll_validate_length()) {
-			if (usb_read(rx, sizeof(rx)) )
-				UsbPacketReceived(rx, sizeof(rx));
-		}
+        // Check if there is a usb packet available
+        if (usb_poll_validate_length()) {
+            if (usb_read(rx, sizeof(rx)) )
+                UsbPacketReceived(rx, sizeof(rx));
+        }
 #ifdef WITH_FPC
-		// Check is there is FPC package available
-		/*
-		usart_init();
-		if (usart_readbuffer(rx, sizeof(rx)) )
-			UsbPacketReceived(rx, sizeof(rx) );
-		*/
+        // Check is there is FPC package available
+        /*
+        usart_init();
+        if (usart_readbuffer(rx, sizeof(rx)) )
+            UsbPacketReceived(rx, sizeof(rx) );
+        */
 
 #endif
 
-		// Press button for one second to enter a possible standalone mode
-		if (BUTTON_HELD(1000) > 0) {
+        // Press button for one second to enter a possible standalone mode
+        if (BUTTON_HELD(1000) > 0) {
 
 /*
 * So this is the trigger to execute a standalone mod.  Generic entrypoint by following the standalone/standalone.h headerfile
@@ -1564,13 +1564,13 @@ void  __attribute__((noreturn)) AppMain(void) {
 * Since the standalone is either LF or HF, the somewhat bisarr defines below exists.
 */
 #if defined (WITH_LF) && ( defined (WITH_LF_SAMYRUN) || defined (WITH_LF_HIDBRUTE) || defined (WITH_LF_PROXBRUTE) )
-			RunMod();
+            RunMod();
 #endif
 
 #if defined (WITH_ISO14443a) && ( defined (WITH_HF_YOUNG) || defined(WITH_HF_COLIN) || defined(WITH_HF_MATTYRUN) || defined(WITH_HF_BOG) )
-			RunMod();
+            RunMod();
 #endif
 
-		}
-	}
+        }
+    }
 }
diff --git a/armsrc/apps.h b/armsrc/apps.h
index 276331575..4a775702a 100644
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -202,8 +202,8 @@ void cmac (const desfirekey_t  key, uint8_t *ivect, const uint8_t *data, size_t
 // iso15693.h
 void RecordRawAdcSamplesIso15693(void);
 void AcquireRawAdcSamplesIso15693(void);
-void ReaderIso15693(uint32_t parameter);	// Simulate an ISO15693 reader - greg
-void SimTagIso15693(uint32_t parameter, uint8_t *uid);	// simulate an ISO15693 tag - greg
+void ReaderIso15693(uint32_t parameter); // Simulate an ISO15693 reader - greg
+void SimTagIso15693(uint32_t parameter, uint8_t *uid); // simulate an ISO15693 tag - greg
 void BruteforceIso15693Afi(uint32_t speed); // find an AFI of a tag - atrox
 void DirectTag15693Command(uint32_t datalen,uint32_t speed, uint32_t recv, uint8_t *data); // send arbitrary commands from CLI - atrox
 void Iso15693InitReader(void);
diff --git a/armsrc/buzzer.c b/armsrc/buzzer.c
index 5f29c6472..987d8fade 100644
--- a/armsrc/buzzer.c
+++ b/armsrc/buzzer.c
@@ -2,9 +2,9 @@
 
 void Ring_BEE_ONCE(uint16_t music_note) {
     BEE_ON();
-	SpinDelayUs(music_note);
-	BEE_OFF();
-	SpinDelayUs(music_note);
+    SpinDelayUs(music_note);
+    BEE_OFF();
+    SpinDelayUs(music_note);
 }
 
 void ring_2_7khz(uint16_t count) {
@@ -12,9 +12,9 @@ void ring_2_7khz(uint16_t count) {
 }
 
 void Ring_BEE_TIME(uint16_t music_note,uint16_t count) {
-	for(uint16_t i=0 ; i < count; i++)
-		Ring_BEE_ONCE(music_note);
-	SpinDelay(9);
+    for(uint16_t i=0 ; i < count; i++)
+        Ring_BEE_ONCE(music_note);
+    SpinDelay(9);
 }
 
 void Ring_ALL(uint16_t count) {
@@ -29,58 +29,58 @@ void Ring_ALL(uint16_t count) {
 }
 
 void Ring_Little_Star(uint16_t count) {
-	Ring_BEE_TIME(note_1,count);
-	Ring_BEE_TIME(note_1,count);
-	Ring_BEE_TIME(note_5,count);
-	Ring_BEE_TIME(note_5,count);
-	Ring_BEE_TIME(note_6,count);
-	Ring_BEE_TIME(note_6,count);
-	Ring_BEE_TIME(note_5,2*count);
-	LED_A_ON();
-	/*
-	Ring_BEE_TIME(note_4,count);
-	Ring_BEE_TIME(note_4,count);
-	Ring_BEE_TIME(note_3,count);
-	Ring_BEE_TIME(note_3,count);
-	Ring_BEE_TIME(note_2,count);
-	Ring_BEE_TIME(note_2,count);
-	Ring_BEE_TIME(note_1,2*count);
-	LED_A_OFF();
+    Ring_BEE_TIME(note_1,count);
+    Ring_BEE_TIME(note_1,count);
+    Ring_BEE_TIME(note_5,count);
+    Ring_BEE_TIME(note_5,count);
+    Ring_BEE_TIME(note_6,count);
+    Ring_BEE_TIME(note_6,count);
+    Ring_BEE_TIME(note_5,2*count);
+    LED_A_ON();
+    /*
+    Ring_BEE_TIME(note_4,count);
+    Ring_BEE_TIME(note_4,count);
+    Ring_BEE_TIME(note_3,count);
+    Ring_BEE_TIME(note_3,count);
+    Ring_BEE_TIME(note_2,count);
+    Ring_BEE_TIME(note_2,count);
+    Ring_BEE_TIME(note_1,2*count);
+    LED_A_OFF();
 
-	Ring_BEE_TIME(note_5,count);
-	Ring_BEE_TIME(note_5,count);
-	Ring_BEE_TIME(note_4,count);
-	Ring_BEE_TIME(note_4,count);
-	Ring_BEE_TIME(note_3,count);
-	Ring_BEE_TIME(note_3,count);
-	Ring_BEE_TIME(note_2,2*count);
-	LED_A_ON();
+    Ring_BEE_TIME(note_5,count);
+    Ring_BEE_TIME(note_5,count);
+    Ring_BEE_TIME(note_4,count);
+    Ring_BEE_TIME(note_4,count);
+    Ring_BEE_TIME(note_3,count);
+    Ring_BEE_TIME(note_3,count);
+    Ring_BEE_TIME(note_2,2*count);
+    LED_A_ON();
 
-	Ring_BEE_TIME(note_5,count);
-	Ring_BEE_TIME(note_5,count);
-	Ring_BEE_TIME(note_4,count);
-	Ring_BEE_TIME(note_4,count);
-	Ring_BEE_TIME(note_3,count);
-	Ring_BEE_TIME(note_3,count);
-	Ring_BEE_TIME(note_2,2*count);
-	LED_A_OFF();
+    Ring_BEE_TIME(note_5,count);
+    Ring_BEE_TIME(note_5,count);
+    Ring_BEE_TIME(note_4,count);
+    Ring_BEE_TIME(note_4,count);
+    Ring_BEE_TIME(note_3,count);
+    Ring_BEE_TIME(note_3,count);
+    Ring_BEE_TIME(note_2,2*count);
+    LED_A_OFF();
 
-	Ring_BEE_TIME(note_1,count);
-	Ring_BEE_TIME(note_1,count);
-	Ring_BEE_TIME(note_5,count);
-	Ring_BEE_TIME(note_5,count);
-	Ring_BEE_TIME(note_6,count);
-	Ring_BEE_TIME(note_6,count);
-	Ring_BEE_TIME(note_5,2*count);
-	LED_A_ON();
+    Ring_BEE_TIME(note_1,count);
+    Ring_BEE_TIME(note_1,count);
+    Ring_BEE_TIME(note_5,count);
+    Ring_BEE_TIME(note_5,count);
+    Ring_BEE_TIME(note_6,count);
+    Ring_BEE_TIME(note_6,count);
+    Ring_BEE_TIME(note_5,2*count);
+    LED_A_ON();
 
-	Ring_BEE_TIME(note_4,count);
-	Ring_BEE_TIME(note_4,count);
-	Ring_BEE_TIME(note_3,count);
-	Ring_BEE_TIME(note_3,count);
-	Ring_BEE_TIME(note_2,count);
-	Ring_BEE_TIME(note_2,count);
-	Ring_BEE_TIME(note_1,2*count);
-	LED_B_ON();
-	*/
+    Ring_BEE_TIME(note_4,count);
+    Ring_BEE_TIME(note_4,count);
+    Ring_BEE_TIME(note_3,count);
+    Ring_BEE_TIME(note_3,count);
+    Ring_BEE_TIME(note_2,count);
+    Ring_BEE_TIME(note_2,count);
+    Ring_BEE_TIME(note_1,2*count);
+    LED_B_ON();
+    */
 }
\ No newline at end of file
diff --git a/armsrc/des.c b/armsrc/des.c
index be5670e69..a8c416f06 100644
--- a/armsrc/des.c
+++ b/armsrc/des.c
@@ -22,7 +22,7 @@
  * \email    daniel.otte@rub.de
  * \date     2007-06-16
  * \brief    DES and EDE-DES implementation
- * \license	 GPLv3 or later
+ * \license   GPLv3 or later
  *
  */
 
@@ -72,111 +72,111 @@ const uint8_t sbox[256]  = {
 };
 
 const uint8_t e_permtab[] ={
-	 4,  6, 					/* 4 bytes in 6 bytes out*/
-	32,  1,  2,  3,  4,  5,
-	 4,  5,  6,  7,  8,  9,
-	 8,  9, 10, 11, 12, 13,
-	12, 13, 14, 15, 16, 17,
-	16, 17, 18, 19, 20, 21,
-	20, 21, 22, 23, 24, 25,
-	24, 25, 26, 27, 28, 29,
-	28, 29, 30, 31, 32,  1
+     4,  6,                     /* 4 bytes in 6 bytes out*/
+    32,  1,  2,  3,  4,  5,
+     4,  5,  6,  7,  8,  9,
+     8,  9, 10, 11, 12, 13,
+    12, 13, 14, 15, 16, 17,
+    16, 17, 18, 19, 20, 21,
+    20, 21, 22, 23, 24, 25,
+    24, 25, 26, 27, 28, 29,
+    28, 29, 30, 31, 32,  1
 };
 
 const uint8_t p_permtab[] ={
-	 4,  4,						/* 32 bit -> 32 bit */
-	16,  7, 20, 21,
-	29, 12, 28, 17,
-	 1, 15, 23, 26,
-	 5, 18, 31, 10,
-	 2,  8, 24, 14,
-	32, 27,  3,  9,
-	19, 13, 30,  6,
-	22, 11,  4, 25
+     4,  4,                     /* 32 bit -> 32 bit */
+    16,  7, 20, 21,
+    29, 12, 28, 17,
+     1, 15, 23, 26,
+     5, 18, 31, 10,
+     2,  8, 24, 14,
+    32, 27,  3,  9,
+    19, 13, 30,  6,
+    22, 11,  4, 25
 };
 
 const uint8_t ip_permtab[] ={
-	 8,  8,						/* 64 bit -> 64 bit */
-	58, 50, 42, 34, 26, 18, 10, 2,
-	60, 52, 44, 36, 28, 20, 12, 4,
-	62, 54, 46, 38, 30, 22, 14, 6,
-	64, 56, 48, 40, 32, 24, 16, 8,
-	57, 49, 41, 33, 25, 17,  9, 1,
-	59, 51, 43, 35, 27, 19, 11, 3,
-	61, 53, 45, 37, 29, 21, 13, 5,
-	63, 55, 47, 39, 31, 23, 15, 7
+     8,  8,                     /* 64 bit -> 64 bit */
+    58, 50, 42, 34, 26, 18, 10, 2,
+    60, 52, 44, 36, 28, 20, 12, 4,
+    62, 54, 46, 38, 30, 22, 14, 6,
+    64, 56, 48, 40, 32, 24, 16, 8,
+    57, 49, 41, 33, 25, 17,  9, 1,
+    59, 51, 43, 35, 27, 19, 11, 3,
+    61, 53, 45, 37, 29, 21, 13, 5,
+    63, 55, 47, 39, 31, 23, 15, 7
 };
 
 const uint8_t inv_ip_permtab[] ={
-	 8, 8,						/* 64 bit -> 64 bit */
-	40, 8, 48, 16, 56, 24, 64, 32,
-	39, 7, 47, 15, 55, 23, 63, 31,
-	38, 6, 46, 14, 54, 22, 62, 30,
-	37, 5, 45, 13, 53, 21, 61, 29,
-	36, 4, 44, 12, 52, 20, 60, 28,
-	35, 3, 43, 11, 51, 19, 59, 27,
-	34, 2, 42, 10, 50, 18, 58, 26,
-	33, 1, 41,  9, 49, 17, 57, 25
+     8, 8,                      /* 64 bit -> 64 bit */
+    40, 8, 48, 16, 56, 24, 64, 32,
+    39, 7, 47, 15, 55, 23, 63, 31,
+    38, 6, 46, 14, 54, 22, 62, 30,
+    37, 5, 45, 13, 53, 21, 61, 29,
+    36, 4, 44, 12, 52, 20, 60, 28,
+    35, 3, 43, 11, 51, 19, 59, 27,
+    34, 2, 42, 10, 50, 18, 58, 26,
+    33, 1, 41,  9, 49, 17, 57, 25
 };
 
 const uint8_t pc1_permtab[] ={
-	 8,  7, 					/* 64 bit -> 56 bit*/
-	57, 49, 41, 33, 25, 17,  9,
-	 1, 58, 50, 42, 34, 26, 18,
-	10,  2, 59, 51, 43, 35, 27,
-	19, 11,  3, 60, 52, 44, 36,
-	63, 55, 47, 39, 31, 23, 15,
-	 7, 62, 54, 46, 38, 30, 22,
-	14,  6, 61, 53, 45, 37, 29,
-	21, 13,  5, 28, 20, 12,  4
+     8,  7,                     /* 64 bit -> 56 bit*/
+    57, 49, 41, 33, 25, 17,  9,
+     1, 58, 50, 42, 34, 26, 18,
+    10,  2, 59, 51, 43, 35, 27,
+    19, 11,  3, 60, 52, 44, 36,
+    63, 55, 47, 39, 31, 23, 15,
+     7, 62, 54, 46, 38, 30, 22,
+    14,  6, 61, 53, 45, 37, 29,
+    21, 13,  5, 28, 20, 12,  4
 };
 
 const uint8_t pc2_permtab[] ={
-	 7,	 6, 					/* 56 bit -> 48 bit */
-	14, 17, 11, 24,  1,  5,
-	 3, 28, 15,  6, 21, 10,
-	23, 19, 12,  4, 26,  8,
-	16,  7, 27, 20, 13,  2,
-	41, 52, 31, 37, 47, 55,
-	30, 40, 51, 45, 33, 48,
-	44, 49, 39, 56, 34, 53,
-	46, 42, 50, 36, 29, 32
+     7,  6,                     /* 56 bit -> 48 bit */
+    14, 17, 11, 24,  1,  5,
+     3, 28, 15,  6, 21, 10,
+    23, 19, 12,  4, 26,  8,
+    16,  7, 27, 20, 13,  2,
+    41, 52, 31, 37, 47, 55,
+    30, 40, 51, 45, 33, 48,
+    44, 49, 39, 56, 34, 53,
+    46, 42, 50, 36, 29, 32
 };
 
 const uint8_t splitin6bitword_permtab[] = {
-	 8,  8, 					/* 64 bit -> 64 bit */
-	64, 64,  1,  6,  2,  3,  4,  5,
-	64, 64,  7, 12,  8,  9, 10, 11,
-	64, 64, 13, 18, 14, 15, 16, 17,
-	64, 64, 19, 24, 20, 21, 22, 23,
-	64, 64, 25, 30, 26, 27, 28, 29,
-	64, 64, 31, 36, 32, 33, 34, 35,
-	64, 64, 37, 42, 38, 39, 40, 41,
-	64, 64, 43, 48, 44, 45, 46, 47
+     8,  8,                     /* 64 bit -> 64 bit */
+    64, 64,  1,  6,  2,  3,  4,  5,
+    64, 64,  7, 12,  8,  9, 10, 11,
+    64, 64, 13, 18, 14, 15, 16, 17,
+    64, 64, 19, 24, 20, 21, 22, 23,
+    64, 64, 25, 30, 26, 27, 28, 29,
+    64, 64, 31, 36, 32, 33, 34, 35,
+    64, 64, 37, 42, 38, 39, 40, 41,
+    64, 64, 43, 48, 44, 45, 46, 47
 };
 
 const uint8_t shiftkey_permtab[] = {
-	 7,  7, 					/* 56 bit -> 56 bit */
-	 2,  3,  4,  5,  6,  7,  8,  9,
-	10, 11, 12, 13, 14, 15, 16, 17,
-	18, 19, 20, 21, 22, 23, 24, 25,
-	26, 27, 28,  1,
-	30, 31, 32, 33, 34, 35, 36, 37,
-	38, 39, 40, 41, 42, 43, 44, 45,
-	46, 47, 48, 49, 50, 51, 52, 53,
-	54, 55, 56, 29
+     7,  7,                     /* 56 bit -> 56 bit */
+     2,  3,  4,  5,  6,  7,  8,  9,
+    10, 11, 12, 13, 14, 15, 16, 17,
+    18, 19, 20, 21, 22, 23, 24, 25,
+    26, 27, 28,  1,
+    30, 31, 32, 33, 34, 35, 36, 37,
+    38, 39, 40, 41, 42, 43, 44, 45,
+    46, 47, 48, 49, 50, 51, 52, 53,
+    54, 55, 56, 29
 };
 
 const uint8_t shiftkeyinv_permtab[] = {
-	 7,  7,
-	28,  1,  2,  3,  4,  5,  6,  7,
-	 8,  9, 10, 11, 12, 13, 14, 15,
-	16, 17, 18, 19, 20, 21, 22, 23,
-	24, 25, 26, 27,
-	56, 29, 30, 31, 32, 33, 34, 35,
-	36, 37, 38, 39, 40, 41, 42, 43,
-	44, 45, 46, 47, 48, 49, 50, 51,
-	52, 53, 54, 55
+     7,  7,
+    28,  1,  2,  3,  4,  5,  6,  7,
+     8,  9, 10, 11, 12, 13, 14, 15,
+    16, 17, 18, 19, 20, 21, 22, 23,
+    24, 25, 26, 27,
+    56, 29, 30, 31, 32, 33, 34, 35,
+    36, 37, 38, 39, 40, 41, 42, 43,
+    44, 45, 46, 47, 48, 49, 50, 51,
+    52, 53, 54, 55
 };
 
 /*
@@ -203,241 +203,241 @@ const uint8_t shiftkeyinv_permtab[] = {
 /******************************************************************************/
 
 void permute(const uint8_t *ptable, const uint8_t *in, uint8_t *out){
-	uint8_t ob; /* in-bytes and out-bytes */
-	uint8_t byte, bit; /* counter for bit and byte */
-	ob = ptable[1];
-	ptable = &(ptable[2]);
-	for(byte=0; byte<ob; ++byte){
-		uint8_t x,t=0;
-		for(bit=0; bit<8; ++bit){
-			x = *ptable++ - 1;
-				t<<=1;
-			if((in[x/8]) & (0x80>>(x%8)) ){
-				t|=0x01;
-			}
-		}
-		out[byte]=t;
-	}
+    uint8_t ob; /* in-bytes and out-bytes */
+    uint8_t byte, bit; /* counter for bit and byte */
+    ob = ptable[1];
+    ptable = &(ptable[2]);
+    for(byte=0; byte<ob; ++byte){
+        uint8_t x,t=0;
+        for(bit=0; bit<8; ++bit){
+            x = *ptable++ - 1;
+                t<<=1;
+            if((in[x/8]) & (0x80>>(x%8)) ){
+                t|=0x01;
+            }
+        }
+        out[byte]=t;
+    }
 }
 
 /******************************************************************************/
 
 void changeendian32(uint32_t * a){
-	*a = (*a & 0x000000FF) << 24 |
-		 (*a & 0x0000FF00) <<  8 |
-		 (*a & 0x00FF0000) >>  8 |
-		 (*a & 0xFF000000) >> 24;
+    *a = (*a & 0x000000FF) << 24 |
+         (*a & 0x0000FF00) <<  8 |
+         (*a & 0x00FF0000) >>  8 |
+         (*a & 0xFF000000) >> 24;
 }
 
 /******************************************************************************/
 static inline
 void shiftkey(uint8_t *key){
-	uint8_t k[7];
-	memcpy(k, key, 7);
-	permute((uint8_t*)shiftkey_permtab, k, key);
+    uint8_t k[7];
+    memcpy(k, key, 7);
+    permute((uint8_t*)shiftkey_permtab, k, key);
 }
 
 /******************************************************************************/
 static inline
 void shiftkey_inv(uint8_t *key){
-	uint8_t k[7];
-	memcpy(k, key, 7);
-	permute((uint8_t*)shiftkeyinv_permtab, k, key);
+    uint8_t k[7];
+    memcpy(k, key, 7);
+    permute((uint8_t*)shiftkeyinv_permtab, k, key);
 
 }
 
 /******************************************************************************/
 static inline
 uint64_t splitin6bitwords(uint64_t a){
-	uint64_t ret=0;
-	a &= 0x0000ffffffffffffLL;
-	permute((uint8_t*)splitin6bitword_permtab, (uint8_t*)&a, (uint8_t*)&ret);
-	return ret;
+    uint64_t ret=0;
+    a &= 0x0000ffffffffffffLL;
+    permute((uint8_t*)splitin6bitword_permtab, (uint8_t*)&a, (uint8_t*)&ret);
+    return ret;
 }
 
 /******************************************************************************/
 
 static inline
 uint8_t substitute(uint8_t a, uint8_t * sbp){
-	uint8_t x;
-	x = sbp[a>>1];
-	x = (a&1)?x&0x0F:x>>4;
-	return x;
+    uint8_t x;
+    x = sbp[a>>1];
+    x = (a&1)?x&0x0F:x>>4;
+    return x;
 
 }
 
 /******************************************************************************/
 
 uint32_t des_f(uint32_t r, uint8_t* kr){
-	uint8_t i;
-	uint32_t t=0,ret;
-	uint64_t data;
-	uint8_t *sbp; /* sboxpointer */
-	permute((uint8_t*)e_permtab, (uint8_t*)&r, (uint8_t*)&data);
-	for(i=0; i<6; ++i)
-		((uint8_t*)&data)[i] ^= kr[i];
+    uint8_t i;
+    uint32_t t=0,ret;
+    uint64_t data;
+    uint8_t *sbp; /* sboxpointer */
+    permute((uint8_t*)e_permtab, (uint8_t*)&r, (uint8_t*)&data);
+    for(i=0; i<6; ++i)
+        ((uint8_t*)&data)[i] ^= kr[i];
 
-	/* Sbox substitution */
-	data = splitin6bitwords(data);
-	sbp=(uint8_t*)sbox;
-	for(i=0; i<8; ++i){
-		uint8_t x;
-		x = substitute(((uint8_t*)&data)[i], sbp);
-		t<<=4;
-		t |= x;
-		sbp += 32;
-	}
-	changeendian32(&t);
+    /* Sbox substitution */
+    data = splitin6bitwords(data);
+    sbp=(uint8_t*)sbox;
+    for(i=0; i<8; ++i){
+        uint8_t x;
+        x = substitute(((uint8_t*)&data)[i], sbp);
+        t<<=4;
+        t |= x;
+        sbp += 32;
+    }
+    changeendian32(&t);
 
-	permute((uint8_t*)p_permtab,(uint8_t*)&t, (uint8_t*)&ret);
+    permute((uint8_t*)p_permtab,(uint8_t*)&t, (uint8_t*)&ret);
 
-	return ret;
+    return ret;
 }
 
 /******************************************************************************/
 
 typedef struct {
-	union {
-		uint8_t  v8[8];
-		uint32_t v32[2];
-	} d;
+    union {
+        uint8_t  v8[8];
+        uint32_t v32[2];
+    } d;
 } data_t;
 #define R (data.d.v32[1])
 #define L (data.d.v32[0])
 
 void des_enc(void* out, const void* in, const void* key){
 
-	uint8_t kr[6], k[7];
-	uint8_t i;
-	data_t data;
+    uint8_t kr[6], k[7];
+    uint8_t i;
+    data_t data;
 
-	permute((uint8_t*)ip_permtab, (uint8_t*)in, data.d.v8);
-	permute((uint8_t*)pc1_permtab, (const uint8_t*)key, k);
+    permute((uint8_t*)ip_permtab, (uint8_t*)in, data.d.v8);
+    permute((uint8_t*)pc1_permtab, (const uint8_t*)key, k);
 
-	for(i=0; i<8; ++i){
-		shiftkey(k);
-		if(ROTTABLE&((1<<((i<<1)+0))) )
-			shiftkey(k);
-		permute((uint8_t*)pc2_permtab, k, kr);
-		L ^= des_f(R, kr);
+    for(i=0; i<8; ++i){
+        shiftkey(k);
+        if(ROTTABLE&((1<<((i<<1)+0))) )
+            shiftkey(k);
+        permute((uint8_t*)pc2_permtab, k, kr);
+        L ^= des_f(R, kr);
 
-		shiftkey(k);
-		if(ROTTABLE&((1<<((i<<1)+1))) )
-			shiftkey(k);
-		permute((uint8_t*)pc2_permtab, k, kr);
-		R ^= des_f(L, kr);
+        shiftkey(k);
+        if(ROTTABLE&((1<<((i<<1)+1))) )
+            shiftkey(k);
+        permute((uint8_t*)pc2_permtab, k, kr);
+        R ^= des_f(L, kr);
 
-	}
-	/* L <-> R*/
-	R ^= L;
-	L ^= R;
-	R ^= L;
+    }
+    /* L <-> R*/
+    R ^= L;
+    L ^= R;
+    R ^= L;
 
-	permute((uint8_t*)inv_ip_permtab, data.d.v8, (uint8_t*)out);
+    permute((uint8_t*)inv_ip_permtab, data.d.v8, (uint8_t*)out);
 }
 
 /******************************************************************************/
 
 void des_dec(void* out, const void* in, const uint8_t* key){
 
-	uint8_t kr[6],k[7];
-	int8_t i;
-	data_t data;
+    uint8_t kr[6],k[7];
+    int8_t i;
+    data_t data;
 
-	permute((uint8_t*)ip_permtab, (uint8_t*)in, data.d.v8);
-	permute((uint8_t*)pc1_permtab, (const uint8_t*)key, k);
-	for(i=7; i>=0; --i){
+    permute((uint8_t*)ip_permtab, (uint8_t*)in, data.d.v8);
+    permute((uint8_t*)pc1_permtab, (const uint8_t*)key, k);
+    for(i=7; i>=0; --i){
 
-		permute((uint8_t*)pc2_permtab, k, kr);
-		L ^= des_f(R, kr);
-		shiftkey_inv(k);
-		if(ROTTABLE&((1<<((i<<1)+1))) ){
-			shiftkey_inv(k);
-		}
+        permute((uint8_t*)pc2_permtab, k, kr);
+        L ^= des_f(R, kr);
+        shiftkey_inv(k);
+        if(ROTTABLE&((1<<((i<<1)+1))) ){
+            shiftkey_inv(k);
+        }
 
-		permute((uint8_t*)pc2_permtab, k, kr);
-		R ^= des_f(L, kr);
-		shiftkey_inv(k);
-		if(ROTTABLE&((1<<((i<<1)+0))) ){
-			shiftkey_inv(k);
-		}
+        permute((uint8_t*)pc2_permtab, k, kr);
+        R ^= des_f(L, kr);
+        shiftkey_inv(k);
+        if(ROTTABLE&((1<<((i<<1)+0))) ){
+            shiftkey_inv(k);
+        }
 
-	}
-	/* L <-> R*/
-	R ^= L;
-	L ^= R;
-	R ^= L;
+    }
+    /* L <-> R*/
+    R ^= L;
+    L ^= R;
+    R ^= L;
 
-	permute((uint8_t*)inv_ip_permtab, data.d.v8, (uint8_t*)out);
+    permute((uint8_t*)inv_ip_permtab, data.d.v8, (uint8_t*)out);
 }
 
 /******************************************************************************/
 
 void tdes_enc(void* out, void* in, const void* key){
-	des_enc(out,  in, (uint8_t*)key + 0);
-	des_dec(out, out, (uint8_t*)key + 8);
-	des_enc(out, out, (uint8_t*)key +16);
+    des_enc(out,  in, (uint8_t*)key + 0);
+    des_dec(out, out, (uint8_t*)key + 8);
+    des_enc(out, out, (uint8_t*)key +16);
 }
 
 /******************************************************************************/
 
 void tdes_dec(void* out, void* in, const uint8_t* key){
-	des_dec(out,  in, (uint8_t*)key +16);
-	des_enc(out, out, (uint8_t*)key + 8);
-	des_dec(out, out, (uint8_t*)key + 0);
+    des_dec(out,  in, (uint8_t*)key +16);
+    des_enc(out, out, (uint8_t*)key + 8);
+    des_dec(out, out, (uint8_t*)key + 0);
 }
 
  void tdes_2key_enc(void* out, const void* in, size_t length, const void* key, unsigned char iv[8]){
 
-	if( length % 8 ) return;
+    if( length % 8 ) return;
 
-	uint8_t i;
-	uint8_t* tin = (uint8_t*) in;
-	uint8_t* tout = (uint8_t*) out;
+    uint8_t i;
+    uint8_t* tin = (uint8_t*) in;
+    uint8_t* tout = (uint8_t*) out;
 
-	while( length > 0 )
-	{
-		for( i = 0; i < 8; i++ )
-				tout[i] = (unsigned char)( tin[i] ^ iv[i] );
+    while( length > 0 )
+    {
+        for( i = 0; i < 8; i++ )
+                tout[i] = (unsigned char)( tin[i] ^ iv[i] );
 
-		des_enc(tout,  tin, (uint8_t*)key + 0);
-		des_dec(tout, tout, (uint8_t*)key + 8);
-		des_enc(tout, tout, (uint8_t*)key + 0);
+        des_enc(tout,  tin, (uint8_t*)key + 0);
+        des_dec(tout, tout, (uint8_t*)key + 8);
+        des_enc(tout, tout, (uint8_t*)key + 0);
 
-		memcpy( iv, tout, 8 );
+        memcpy( iv, tout, 8 );
 
-		tin  += 8;
-		tout += 8;
-		length -= 8;
-	}
+        tin  += 8;
+        tout += 8;
+        length -= 8;
+    }
  }
 
  void tdes_2key_dec(void* out, const void* in, size_t length, const void* key, unsigned char iv[8]){
 
-	if( length % 8 ) return;
+    if( length % 8 ) return;
 
-	uint8_t i;
-	unsigned char temp[8];
-	uint8_t* tin = (uint8_t*) in;
-	uint8_t* tout = (uint8_t*) out;
+    uint8_t i;
+    unsigned char temp[8];
+    uint8_t* tin = (uint8_t*) in;
+    uint8_t* tout = (uint8_t*) out;
 
-	while( length > 0 )
-	{
-		memcpy( temp, tin, 8 );
+    while( length > 0 )
+    {
+        memcpy( temp, tin, 8 );
 
-		des_dec(tout,  tin, (uint8_t*)key + 0);
-		des_enc(tout, tout, (uint8_t*)key + 8);
-		des_dec(tout, tout, (uint8_t*)key + 0);
+        des_dec(tout,  tin, (uint8_t*)key + 0);
+        des_enc(tout, tout, (uint8_t*)key + 8);
+        des_dec(tout, tout, (uint8_t*)key + 0);
 
-		for( i = 0; i < 8; i++ )
-			tout[i] = (unsigned char)( tout[i] ^ iv[i] );
+        for( i = 0; i < 8; i++ )
+            tout[i] = (unsigned char)( tout[i] ^ iv[i] );
 
-		memcpy( iv, temp, 8 );
+        memcpy( iv, temp, 8 );
 
-		tin  += 8;
-		tout += 8;
-		length -= 8;
-	}
+        tin  += 8;
+        tout += 8;
+        length -= 8;
+    }
  }
 
 
diff --git a/armsrc/des.h b/armsrc/des.h
index 22735f2f3..2afe39b14 100644
--- a/armsrc/des.h
+++ b/armsrc/des.h
@@ -17,11 +17,11 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 /**
- * \file	des.h
- * \author	Daniel Otte
- * \date	2007-06-16
- * \brief 	des and tdes declarations
- * \license	GPLv3 or later
+ * \file    des.h
+ * \author  Daniel Otte
+ * \date    2007-06-16
+ * \brief   des and tdes declarations
+ * \license GPLv3 or later
  *
  */
 #ifndef __DES_H_
diff --git a/armsrc/desfire_crypto.c b/armsrc/desfire_crypto.c
index d79ecc8e3..dd958d3ea 100644
--- a/armsrc/desfire_crypto.c
+++ b/armsrc/desfire_crypto.c
@@ -85,20 +85,20 @@ void cmac (const desfirekey_t key, uint8_t *ivect, const uint8_t *data, size_t l
     mifare_cypher_blocks_chained (NULL, key, ivect, buffer, len, MCD_SEND, MCO_ENCYPHER);
 
     memcpy (cmac, ivect, kbs);
-	free(buffer);
+    free(buffer);
 }
 
 size_t key_block_size (const desfirekey_t key) {
     size_t block_size = 8;
     switch (key->type) {
-		case T_DES:
-		case T_3DES:
-		case T_3K3DES:
-			block_size = 8;
-			break;
-		case T_AES:
-			block_size = 16;
-			break;
+        case T_DES:
+        case T_3DES:
+        case T_3K3DES:
+            block_size = 8;
+            break;
+        case T_AES:
+            block_size = 16;
+            break;
     }
     return block_size;
 }
@@ -211,7 +211,7 @@ void* mifare_cryto_preprocess_data (desfiretag_t tag, void *data, size_t *nbytes
                 break;
             // Append MAC
             size_t bla = maced_data_length (DESFIRE(tag)->session_key, *nbytes - offset) + offset;
-			bla++;
+            bla++;
 
             memcpy (res + *nbytes, mac, 4);
 
@@ -224,7 +224,7 @@ void* mifare_cryto_preprocess_data (desfiretag_t tag, void *data, size_t *nbytes
 
             if (append_mac) {
                 size_t len = maced_data_length (key, *nbytes);
-				++len;
+                ++len;
                 memcpy (res, data, *nbytes);
                 memcpy (res + *nbytes, DESFIRE (tag)->cmac, CMAC_LENGTH);
                 *nbytes += CMAC_LENGTH;
@@ -448,7 +448,7 @@ void* mifare_cryto_postprocess_data (desfiretag_t tag, void *data, size_t *nbyte
             case AS_LEGACY:
                 AddCrc14A( (uint8_t*)res, end_crc_pos);
                 end_crc_pos = crc_pos + 2;
-				//
+                //
 
 
                 crc = crc16;
@@ -529,11 +529,11 @@ void mifare_cypher_single_block (desfirekey_t key, uint8_t *data, uint8_t *ivect
         switch (operation) {
         case MCO_ENCYPHER:
             //DES_ecb_encrypt ((DES_cblock *) data, (DES_cblock *) edata, &(key->ks1), DES_ENCRYPT);
-			des_enc(edata, data, key->data);
+            des_enc(edata, data, key->data);
             break;
         case MCO_DECYPHER:
             //DES_ecb_encrypt ((DES_cblock *) data, (DES_cblock *) edata, &(key->ks1), DES_DECRYPT);
-			des_dec(edata, data, key->data);
+            des_dec(edata, data, key->data);
             break;
         }
         break;
@@ -543,27 +543,27 @@ void mifare_cypher_single_block (desfirekey_t key, uint8_t *data, uint8_t *ivect
             // DES_ecb_encrypt ((DES_cblock *) data,  (DES_cblock *) edata, &(key->ks1), DES_ENCRYPT);
             // DES_ecb_encrypt ((DES_cblock *) edata, (DES_cblock *) data,  &(key->ks2), DES_DECRYPT);
             // DES_ecb_encrypt ((DES_cblock *) data,  (DES_cblock *) edata, &(key->ks1), DES_ENCRYPT);
-			tdes_enc(edata,data, key->data);
+            tdes_enc(edata,data, key->data);
             break;
         case MCO_DECYPHER:
             // DES_ecb_encrypt ((DES_cblock *) data,  (DES_cblock *) edata, &(key->ks1), DES_DECRYPT);
             // DES_ecb_encrypt ((DES_cblock *) edata, (DES_cblock *) data,  &(key->ks2), DES_ENCRYPT);
             // DES_ecb_encrypt ((DES_cblock *) data,  (DES_cblock *) edata, &(key->ks1), DES_DECRYPT);
-			tdes_dec(data, edata, key->data);
+            tdes_dec(data, edata, key->data);
             break;
         }
         break;
     case T_3K3DES:
         switch (operation) {
         case MCO_ENCYPHER:
-			tdes_enc(edata,data, key->data);
+            tdes_enc(edata,data, key->data);
             // DES_ecb_encrypt ((DES_cblock *) data,  (DES_cblock *) edata, &(key->ks1), DES_ENCRYPT);
             // DES_ecb_encrypt ((DES_cblock *) edata, (DES_cblock *) data,  &(key->ks2), DES_DECRYPT);
             // DES_ecb_encrypt ((DES_cblock *) data,  (DES_cblock *) edata, &(key->ks3), DES_ENCRYPT);
             break;
         case MCO_DECYPHER:
-			tdes_dec(data, edata, key->data);
-			// DES_ecb_encrypt ((DES_cblock *) data,  (DES_cblock *) edata, &(key->ks3), DES_DECRYPT);
+            tdes_dec(data, edata, key->data);
+            // DES_ecb_encrypt ((DES_cblock *) data,  (DES_cblock *) edata, &(key->ks3), DES_DECRYPT);
             // DES_ecb_encrypt ((DES_cblock *) edata, (DES_cblock *) data,  &(key->ks2), DES_ENCRYPT);
             // DES_ecb_encrypt ((DES_cblock *) data,  (DES_cblock *) edata, &(key->ks1), DES_DECRYPT);
             break;
@@ -571,21 +571,21 @@ void mifare_cypher_single_block (desfirekey_t key, uint8_t *data, uint8_t *ivect
         break;
     case T_AES:
         switch (operation)
-		{
-			case MCO_ENCYPHER:
-			{
-				AesCtx ctx;
-				AesCtxIni(&ctx, ivect, key->data, KEY128,CBC);
-				AesEncrypt(&ctx, data, edata, sizeof(edata) );
-				break;
-			}
-			case MCO_DECYPHER:
-			{
-				AesCtx ctx;
-				AesCtxIni(&ctx, ivect, key->data, KEY128,CBC);
-				AesDecrypt(&ctx, edata, data, sizeof(edata));
-				break;
-			}
+        {
+            case MCO_ENCYPHER:
+            {
+                AesCtx ctx;
+                AesCtxIni(&ctx, ivect, key->data, KEY128,CBC);
+                AesEncrypt(&ctx, data, edata, sizeof(edata) );
+                break;
+            }
+            case MCO_DECYPHER:
+            {
+                AesCtx ctx;
+                AesCtxIni(&ctx, ivect, key->data, KEY128,CBC);
+                AesDecrypt(&ctx, edata, data, sizeof(edata));
+                break;
+            }
         }
         break;
     }
@@ -620,11 +620,11 @@ void mifare_cypher_blocks_chained (desfiretag_t tag, desfirekey_t key, uint8_t *
             ivect = DESFIRE (tag)->ivect;
 
         switch (DESFIRE (tag)->authentication_scheme) {
-			case AS_LEGACY:
-				memset (ivect, 0, MAX_CRYPTO_BLOCK_SIZE);
-				break;
-			case AS_NEW:
-				break;
+            case AS_LEGACY:
+                memset (ivect, 0, MAX_CRYPTO_BLOCK_SIZE);
+                break;
+            case AS_NEW:
+                break;
         }
     }
 
diff --git a/armsrc/desfire_key.c b/armsrc/desfire_key.c
index a4ed05f68..f8ea8c794 100644
--- a/armsrc/desfire_key.c
+++ b/armsrc/desfire_key.c
@@ -38,12 +38,12 @@ void Desfire_des_key_new (const uint8_t value[8], desfirekey_t key) {
 }
 
 void Desfire_des_key_new_with_version (const uint8_t value[8], desfirekey_t key) {
-	if ( key != NULL) {
-		key->type = T_DES;
-		memcpy (key->data, value, 8);
-		memcpy (key->data+8, value, 8);
-		update_key_schedules (key);
-	}
+    if ( key != NULL) {
+        key->type = T_DES;
+        memcpy (key->data, value, 8);
+        memcpy (key->data+8, value, 8);
+        update_key_schedules (key);
+    }
 }
 
 void Desfire_3des_key_new (const uint8_t value[16], desfirekey_t key) {
@@ -58,11 +58,11 @@ void Desfire_3des_key_new (const uint8_t value[16], desfirekey_t key) {
 
 void Desfire_3des_key_new_with_version (const uint8_t value[16], desfirekey_t key) {
     if ( key != NULL ){
-		key->type = T_3DES;
-		memcpy (key->data, value, 16);
-		memcpy (key->data + 16, value, 8);
-		update_key_schedules (key);
-	}
+        key->type = T_3DES;
+        memcpy (key->data, value, 16);
+        memcpy (key->data + 16, value, 8);
+        update_key_schedules (key);
+    }
 }
 
 void Desfire_3k3des_key_new (const uint8_t value[24], desfirekey_t key) {
@@ -74,11 +74,11 @@ void Desfire_3k3des_key_new (const uint8_t value[24], desfirekey_t key) {
 }
 
 void Desfire_3k3des_key_new_with_version (const uint8_t value[24], desfirekey_t key) {
-	if ( key != NULL){
-		key->type = T_3K3DES;
-		memcpy (key->data, value, 24);
-		update_key_schedules (key);
-	}
+    if ( key != NULL){
+        key->type = T_3K3DES;
+        memcpy (key->data, value, 24);
+        update_key_schedules (key);
+    }
 }
 
  void Desfire_aes_key_new (const uint8_t value[16], desfirekey_t key) {
@@ -87,11 +87,11 @@ void Desfire_3k3des_key_new_with_version (const uint8_t value[24], desfirekey_t
 
  void Desfire_aes_key_new_with_version (const uint8_t value[16], uint8_t version, desfirekey_t key) {
 
-	if (key != NULL) {
-		memcpy (key->data, value, 16);
-		key->type = T_AES;
-		key->aes_version = version;
-	}
+    if (key != NULL) {
+        memcpy (key->data, value, 16);
+        key->type = T_AES;
+        key->aes_version = version;
+    }
 }
 
 uint8_t Desfire_key_get_version (desfirekey_t key) {
diff --git a/armsrc/desfire_key.h b/armsrc/desfire_key.h
index 4e6fdaea9..cb0e8b250 100644
--- a/armsrc/desfire_key.h
+++ b/armsrc/desfire_key.h
@@ -6,15 +6,15 @@
 #include "iso14443a.h"
 #include "desfire.h"
 //#include "mifare.h" // iso14a_card_select_t struct
-void 		Desfire_des_key_new (const uint8_t value[8], desfirekey_t key);
-void 		Desfire_3des_key_new (const uint8_t value[16], desfirekey_t key);
-void 		Desfire_des_key_new_with_version (const uint8_t value[8], desfirekey_t key);
-void 		Desfire_3des_key_new_with_version (const uint8_t value[16], desfirekey_t key);
-void 		Desfire_3k3des_key_new (const uint8_t value[24], desfirekey_t key);
-void 		Desfire_3k3des_key_new_with_version (const uint8_t value[24], desfirekey_t key);
-void 		Desfire_aes_key_new (const uint8_t value[16], desfirekey_t key);
-void 		Desfire_aes_key_new_with_version (const uint8_t value[16], uint8_t version,desfirekey_t key);
-uint8_t    	Desfire_key_get_version (desfirekey_t key);
-void       	Desfire_key_set_version (desfirekey_t key, uint8_t version);
-void 		Desfire_session_key_new (const uint8_t rnda[], const uint8_t rndb[], desfirekey_t authkey, desfirekey_t key);
+void Desfire_des_key_new (const uint8_t value[8], desfirekey_t key);
+void Desfire_3des_key_new (const uint8_t value[16], desfirekey_t key);
+void Desfire_des_key_new_with_version (const uint8_t value[8], desfirekey_t key);
+void Desfire_3des_key_new_with_version (const uint8_t value[16], desfirekey_t key);
+void Desfire_3k3des_key_new (const uint8_t value[24], desfirekey_t key);
+void Desfire_3k3des_key_new_with_version (const uint8_t value[24], desfirekey_t key);
+void Desfire_aes_key_new (const uint8_t value[16], desfirekey_t key);
+void Desfire_aes_key_new_with_version (const uint8_t value[16], uint8_t version,desfirekey_t key);
+uint8_t Desfire_key_get_version (desfirekey_t key);
+void Desfire_key_set_version (desfirekey_t key, uint8_t version);
+void Desfire_session_key_new (const uint8_t rnda[], const uint8_t rndb[], desfirekey_t authkey, desfirekey_t key);
 #endif
\ No newline at end of file
diff --git a/armsrc/epa.c b/armsrc/epa.c
index 80d51e553..63a57d46b 100644
--- a/armsrc/epa.c
+++ b/armsrc/epa.c
@@ -21,41 +21,41 @@ static const uint8_t pps[] = {0xD0, 0x11, 0x00, 0x52, 0xA6};
 
 // General Authenticate (request encrypted nonce) WITHOUT the Le at the end
 static const uint8_t apdu_general_authenticate_pace_get_nonce[] = {
-	0x10, // CLA
-	0x86, // INS
-	0x00, // P1
-	0x00, // P2
-	0x02, // Lc
-	0x7C, // Type: Dynamic Authentication Data
-	0x00, // Length: 0 bytes
+    0x10, // CLA
+    0x86, // INS
+    0x00, // P1
+    0x00, // P2
+    0x02, // Lc
+    0x7C, // Type: Dynamic Authentication Data
+    0x00, // Length: 0 bytes
 };
 
 // MSE: Set AT (only CLA, INS, P1 and P2)
 static const uint8_t apdu_mse_set_at_start[] = {
-	0x00, // CLA
-	0x22, // INS
-	0xC1, // P1
-	0xA4, // P2
+    0x00, // CLA
+    0x22, // INS
+    0xC1, // P1
+    0xA4, // P2
 };
 
 // SELECT BINARY with the ID for EF.CardAccess
 static const uint8_t apdu_select_binary_cardaccess[] = {
-	0x00, // CLA
-	0xA4, // INS
-	0x02, // P1
-	0x0C, // P2
-	0x02, // Lc
-	0x01, // ID
-	0x1C  // ID
+    0x00, // CLA
+    0xA4, // INS
+    0x02, // P1
+    0x0C, // P2
+    0x02, // Lc
+    0x01, // ID
+    0x1C  // ID
 };
 
 // READ BINARY
 static const uint8_t apdu_read_binary[] = {
-	0x00, // CLA
-	0xB0, // INS
-	0x00, // P1
-	0x00, // P2
-	0x38  // Le
+    0x00, // CLA
+    0xB0, // INS
+    0x00, // P1
+    0x00, // P2
+    0x38  // Le
 };
 
 
@@ -84,14 +84,14 @@ static uint8_t apdu_replay_general_authenticate_pace_mutual_authenticate[75];
 static uint8_t apdu_replay_general_authenticate_pace_perform_key_agreement[18];
 // pointers to the APDUs (for iterations)
 static struct {
-	uint8_t len;
-	uint8_t *data;
+    uint8_t len;
+    uint8_t *data;
 } const apdus_replay[] = {
-	{sizeof(apdu_replay_mse_set_at_pace), apdu_replay_mse_set_at_pace},
-	{sizeof(apdu_replay_general_authenticate_pace_get_nonce), apdu_replay_general_authenticate_pace_get_nonce},
-	{sizeof(apdu_replay_general_authenticate_pace_map_nonce), apdu_replay_general_authenticate_pace_map_nonce},
-	{sizeof(apdu_replay_general_authenticate_pace_mutual_authenticate), apdu_replay_general_authenticate_pace_mutual_authenticate},
-	{sizeof(apdu_replay_general_authenticate_pace_perform_key_agreement), apdu_replay_general_authenticate_pace_perform_key_agreement}
+    {sizeof(apdu_replay_mse_set_at_pace), apdu_replay_mse_set_at_pace},
+    {sizeof(apdu_replay_general_authenticate_pace_get_nonce), apdu_replay_general_authenticate_pace_get_nonce},
+    {sizeof(apdu_replay_general_authenticate_pace_map_nonce), apdu_replay_general_authenticate_pace_map_nonce},
+    {sizeof(apdu_replay_general_authenticate_pace_mutual_authenticate), apdu_replay_general_authenticate_pace_mutual_authenticate},
+    {sizeof(apdu_replay_general_authenticate_pace_perform_key_agreement), apdu_replay_general_authenticate_pace_perform_key_agreement}
 };
 
 // lengths of the replay APDUs
@@ -105,18 +105,18 @@ static char iso_type = 0;
 //-----------------------------------------------------------------------------
 int EPA_APDU(uint8_t *apdu, size_t length, uint8_t *response)
 {
-	switch(iso_type)
-	{
-		case 'a':
-			return iso14_apdu(apdu, (uint16_t) length, false, response, NULL);
-			break;
-		case 'b':
-			return iso14443b_apdu(apdu, length, response);
-			break;
-		default:
-			return 0;
-			break;
-	}
+    switch(iso_type)
+    {
+        case 'a':
+            return iso14_apdu(apdu, (uint16_t) length, false, response, NULL);
+            break;
+        case 'b':
+            return iso14443b_apdu(apdu, length, response);
+            break;
+        default:
+            return 0;
+            break;
+    }
 }
 
 //-----------------------------------------------------------------------------
@@ -124,9 +124,9 @@ int EPA_APDU(uint8_t *apdu, size_t length, uint8_t *response)
 //-----------------------------------------------------------------------------
 void EPA_Finish()
 {
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	LEDsoff();
-	iso_type = 0;
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    LEDsoff();
+    iso_type = 0;
 }
 
 //-----------------------------------------------------------------------------
@@ -146,68 +146,68 @@ size_t EPA_Parse_CardAccess(uint8_t *data,
                             size_t length,
                             pace_version_info_t *pace_info)
 {
-	size_t index = 0;
+    size_t index = 0;
 
-	while (index <= length - 2) {
-		// determine type of element
-		// SET or SEQUENCE
-		if (data[index] == 0x31 || data[index] == 0x30) {
-			// enter the set (skip tag + length)
-			index += 2;
-			// check for extended length
-			if ((data[index - 1] & 0x80) != 0) {
-				index += (data[index-1] & 0x7F);
-			}
-		}
-		// OID
-		else if (data[index] == 0x06) {
-			// is this a PACE OID?
-			if (data[index + 1] == 0x0A // length matches
-			    && memcmp(data + index + 2,
-			              oid_pace_start,
-			              sizeof(oid_pace_start)) == 0 // content matches
-			    && pace_info != NULL)
-			{
-				// first, clear the pace_info struct
-				memset(pace_info, 0, sizeof(pace_version_info_t));
-				memcpy(pace_info->oid, data + index + 2, sizeof(pace_info->oid));
-				// a PACE OID is followed by the version
-				index += data[index + 1] + 2;
-				if (data[index] == 02 && data[index + 1] == 01) {
-					pace_info->version = data[index + 2];
-					index += 3;
-				}
-				else {
-					return index;
-				}
-				// after that there might(!) be the parameter ID
-				if (data[index] == 02 && data[index + 1] == 01) {
-					pace_info->parameter_id = data[index + 2];
-					index += 3;
-				}
-			}
-			else {
-				// skip this OID
-				index += 2 + data[index + 1];
-			}
-		}
-		// if the length is 0, something is wrong
-		// TODO: This needs to be extended to support long tags
-		else if (data[index + 1] == 0) {
-			return index;
-		}
-		else {
-			// skip this part
-			// TODO: This needs to be extended to support long tags
-			// TODO: This needs to be extended to support unknown elements with
-			//       a size > 0x7F
-			index += 2 + data[index + 1];
-		}
-	}
+    while (index <= length - 2) {
+        // determine type of element
+        // SET or SEQUENCE
+        if (data[index] == 0x31 || data[index] == 0x30) {
+            // enter the set (skip tag + length)
+            index += 2;
+            // check for extended length
+            if ((data[index - 1] & 0x80) != 0) {
+                index += (data[index-1] & 0x7F);
+            }
+        }
+        // OID
+        else if (data[index] == 0x06) {
+            // is this a PACE OID?
+            if (data[index + 1] == 0x0A // length matches
+                && memcmp(data + index + 2,
+                          oid_pace_start,
+                          sizeof(oid_pace_start)) == 0 // content matches
+                && pace_info != NULL)
+            {
+                // first, clear the pace_info struct
+                memset(pace_info, 0, sizeof(pace_version_info_t));
+                memcpy(pace_info->oid, data + index + 2, sizeof(pace_info->oid));
+                // a PACE OID is followed by the version
+                index += data[index + 1] + 2;
+                if (data[index] == 02 && data[index + 1] == 01) {
+                    pace_info->version = data[index + 2];
+                    index += 3;
+                }
+                else {
+                    return index;
+                }
+                // after that there might(!) be the parameter ID
+                if (data[index] == 02 && data[index + 1] == 01) {
+                    pace_info->parameter_id = data[index + 2];
+                    index += 3;
+                }
+            }
+            else {
+                // skip this OID
+                index += 2 + data[index + 1];
+            }
+        }
+        // if the length is 0, something is wrong
+        // TODO: This needs to be extended to support long tags
+        else if (data[index + 1] == 0) {
+            return index;
+        }
+        else {
+            // skip this part
+            // TODO: This needs to be extended to support long tags
+            // TODO: This needs to be extended to support unknown elements with
+            //       a size > 0x7F
+            index += 2 + data[index + 1];
+        }
+    }
 
-	// TODO: We should check whether we reached the end in error, but for that
-	//       we need a better parser (e.g. with states like IN_SET or IN_PACE_INFO)
-	return 0;
+    // TODO: We should check whether we reached the end in error, but for that
+    //       we need a better parser (e.g. with states like IN_SET or IN_PACE_INFO)
+    return 0;
 }
 
 //-----------------------------------------------------------------------------
@@ -217,42 +217,42 @@ size_t EPA_Parse_CardAccess(uint8_t *data,
 //-----------------------------------------------------------------------------
 int EPA_Read_CardAccess(uint8_t *buffer, size_t max_length)
 {
-	// the response APDU of the card
-	// since the card doesn't always care for the expected length we send it,
-	// we reserve 262 bytes here just to be safe (256-byte APDU + SW + ISO frame)
-	uint8_t response_apdu[262];
-	int rapdu_length = 0;
+    // the response APDU of the card
+    // since the card doesn't always care for the expected length we send it,
+    // we reserve 262 bytes here just to be safe (256-byte APDU + SW + ISO frame)
+    uint8_t response_apdu[262];
+    int rapdu_length = 0;
 
-	// select the file EF.CardAccess
-	rapdu_length = EPA_APDU((uint8_t *)apdu_select_binary_cardaccess,
-	                          sizeof(apdu_select_binary_cardaccess),
-	                          response_apdu);
-	if (rapdu_length < 6
-	    || response_apdu[rapdu_length - 4] != 0x90
-	    || response_apdu[rapdu_length - 3] != 0x00)
-	{
-		DbpString("Failed to select EF.CardAccess!");
-		return -1;
-	}
+    // select the file EF.CardAccess
+    rapdu_length = EPA_APDU((uint8_t *)apdu_select_binary_cardaccess,
+                              sizeof(apdu_select_binary_cardaccess),
+                              response_apdu);
+    if (rapdu_length < 6
+        || response_apdu[rapdu_length - 4] != 0x90
+        || response_apdu[rapdu_length - 3] != 0x00)
+    {
+        DbpString("Failed to select EF.CardAccess!");
+        return -1;
+    }
 
-	// read the file
-	rapdu_length = EPA_APDU((uint8_t *)apdu_read_binary,
-	                          sizeof(apdu_read_binary),
-	                          response_apdu);
-	if (rapdu_length <= 6
-	    || response_apdu[rapdu_length - 4] != 0x90
-	    || response_apdu[rapdu_length - 3] != 0x00)
-	{
-		Dbprintf("Failed to read EF.CardAccess!");
-		return -1;
-	}
+    // read the file
+    rapdu_length = EPA_APDU((uint8_t *)apdu_read_binary,
+                              sizeof(apdu_read_binary),
+                              response_apdu);
+    if (rapdu_length <= 6
+        || response_apdu[rapdu_length - 4] != 0x90
+        || response_apdu[rapdu_length - 3] != 0x00)
+    {
+        Dbprintf("Failed to read EF.CardAccess!");
+        return -1;
+    }
 
-	// copy the content into the buffer
-	// length of data available: apdu_length - 4 (ISO frame) - 2 (SW)
-	size_t to_copy = rapdu_length - 6;
-	to_copy = to_copy < max_length ? to_copy : max_length;
-	memcpy(buffer, response_apdu+2, to_copy);
-	return to_copy;
+    // copy the content into the buffer
+    // length of data available: apdu_length - 4 (ISO frame) - 2 (SW)
+    size_t to_copy = rapdu_length - 6;
+    to_copy = to_copy < max_length ? to_copy : max_length;
+    memcpy(buffer, response_apdu+2, to_copy);
+    return to_copy;
 }
 
 //-----------------------------------------------------------------------------
@@ -261,11 +261,11 @@ int EPA_Read_CardAccess(uint8_t *buffer, size_t max_length)
 //-----------------------------------------------------------------------------
 static void EPA_PACE_Collect_Nonce_Abort(uint8_t step, int func_return)
 {
-	// power down the field
-	EPA_Finish();
+    // power down the field
+    EPA_Finish();
 
-	// send the USB packet
-	cmd_send(CMD_ACK,step,func_return,0,0,0);
+    // send the USB packet
+    cmd_send(CMD_ACK,step,func_return,0,0,0);
 }
 
 //-----------------------------------------------------------------------------
@@ -273,68 +273,68 @@ static void EPA_PACE_Collect_Nonce_Abort(uint8_t step, int func_return)
 //-----------------------------------------------------------------------------
 void EPA_PACE_Collect_Nonce(UsbCommand *c)
 {
-	/*
-	 * ack layout:
-	 * 	arg:
-	 * 		1. element
-	 *           step where the error occured or 0 if no error occured
+    /*
+     * ack layout:
+     *   arg:
+     *       1. element
+     *           step where the error occured or 0 if no error occured
      *       2. element
      *           return code of the last executed function
-	 * 	d:
-	 * 		Encrypted nonce
-	 */
+     *   d:
+     *       Encrypted nonce
+     */
 
-	// return value of a function
-	int func_return = 0;
+    // return value of a function
+    int func_return = 0;
 
-	// set up communication
-	func_return = EPA_Setup();
-	if (func_return != 0) {
-		EPA_PACE_Collect_Nonce_Abort(1, func_return);
-		return;
-	}
+    // set up communication
+    func_return = EPA_Setup();
+    if (func_return != 0) {
+        EPA_PACE_Collect_Nonce_Abort(1, func_return);
+        return;
+    }
 
-	// read the CardAccess file
-	// this array will hold the CardAccess file
-	uint8_t card_access[256] = {0};
-	int card_access_length = EPA_Read_CardAccess(card_access, 256);
-	// the response has to be at least this big to hold the OID
-	if (card_access_length < 18) {
-		EPA_PACE_Collect_Nonce_Abort(2, card_access_length);
-		return;
-	}
+    // read the CardAccess file
+    // this array will hold the CardAccess file
+    uint8_t card_access[256] = {0};
+    int card_access_length = EPA_Read_CardAccess(card_access, 256);
+    // the response has to be at least this big to hold the OID
+    if (card_access_length < 18) {
+        EPA_PACE_Collect_Nonce_Abort(2, card_access_length);
+        return;
+    }
 
-	// this will hold the PACE info of the card
-	pace_version_info_t pace_version_info;
-	// search for the PACE OID
-	func_return = EPA_Parse_CardAccess(card_access,
-	                                   card_access_length,
-	                                   &pace_version_info);
-	if (func_return != 0 || pace_version_info.version == 0) {
-		EPA_PACE_Collect_Nonce_Abort(3, func_return);
-		return;
-	}
+    // this will hold the PACE info of the card
+    pace_version_info_t pace_version_info;
+    // search for the PACE OID
+    func_return = EPA_Parse_CardAccess(card_access,
+                                       card_access_length,
+                                       &pace_version_info);
+    if (func_return != 0 || pace_version_info.version == 0) {
+        EPA_PACE_Collect_Nonce_Abort(3, func_return);
+        return;
+    }
 
-	// initiate the PACE protocol
-	// use the CAN for the password since that doesn't change
-	func_return = EPA_PACE_MSE_Set_AT(pace_version_info, 2);
+    // initiate the PACE protocol
+    // use the CAN for the password since that doesn't change
+    func_return = EPA_PACE_MSE_Set_AT(pace_version_info, 2);
 
-	// now get the nonce
-	uint8_t nonce[256] = {0};
-	uint8_t requested_size = (uint8_t)c->arg[0];
-	func_return = EPA_PACE_Get_Nonce(requested_size, nonce);
-	// check if the command succeeded
-	if (func_return < 0)
-	{
-		EPA_PACE_Collect_Nonce_Abort(4, func_return);
-		return;
-	}
+    // now get the nonce
+    uint8_t nonce[256] = {0};
+    uint8_t requested_size = (uint8_t)c->arg[0];
+    func_return = EPA_PACE_Get_Nonce(requested_size, nonce);
+    // check if the command succeeded
+    if (func_return < 0)
+    {
+        EPA_PACE_Collect_Nonce_Abort(4, func_return);
+        return;
+    }
 
-	// all done, return
-	EPA_Finish();
+    // all done, return
+    EPA_Finish();
 
-	// save received information
-	cmd_send(CMD_ACK,0,func_return,0,nonce,func_return);
+    // save received information
+    cmd_send(CMD_ACK,0,func_return,0,nonce,func_return);
 }
 
 //-----------------------------------------------------------------------------
@@ -347,44 +347,44 @@ void EPA_PACE_Collect_Nonce(UsbCommand *c)
 //-----------------------------------------------------------------------------
 int EPA_PACE_Get_Nonce(uint8_t requested_length, uint8_t *nonce)
 {
-	// build the APDU
-	uint8_t apdu[sizeof(apdu_general_authenticate_pace_get_nonce) + 1];
-	// copy the constant part
-	memcpy(apdu,
-	       apdu_general_authenticate_pace_get_nonce,
-	       sizeof(apdu_general_authenticate_pace_get_nonce));
-	// append Le (requested length + 2 due to tag/length taking 2 bytes) in RAPDU
-	apdu[sizeof(apdu_general_authenticate_pace_get_nonce)] = requested_length + 4;
+    // build the APDU
+    uint8_t apdu[sizeof(apdu_general_authenticate_pace_get_nonce) + 1];
+    // copy the constant part
+    memcpy(apdu,
+           apdu_general_authenticate_pace_get_nonce,
+           sizeof(apdu_general_authenticate_pace_get_nonce));
+    // append Le (requested length + 2 due to tag/length taking 2 bytes) in RAPDU
+    apdu[sizeof(apdu_general_authenticate_pace_get_nonce)] = requested_length + 4;
 
-	// send it
-	uint8_t response_apdu[262];
-	int send_return = EPA_APDU(apdu,
-	                             sizeof(apdu),
-	                             response_apdu);
-	// check if the command succeeded
-	if (send_return < 6
-		|| response_apdu[send_return - 4] != 0x90
-		|| response_apdu[send_return - 3] != 0x00)
-	{
-		return -1;
-	}
+    // send it
+    uint8_t response_apdu[262];
+    int send_return = EPA_APDU(apdu,
+                                 sizeof(apdu),
+                                 response_apdu);
+    // check if the command succeeded
+    if (send_return < 6
+        || response_apdu[send_return - 4] != 0x90
+        || response_apdu[send_return - 3] != 0x00)
+    {
+        return -1;
+    }
 
-	// if there is no nonce in the RAPDU, return here
-	if (send_return < 10)
-	{
-		// no error
-		return 0;
-	}
-	// get the actual length of the nonce
-	uint8_t nonce_length = response_apdu[5];
-	if (nonce_length > send_return - 10)
-	{
-		nonce_length = send_return - 10;
-	}
-	// copy the nonce
-	memcpy(nonce, response_apdu + 6, nonce_length);
+    // if there is no nonce in the RAPDU, return here
+    if (send_return < 10)
+    {
+        // no error
+        return 0;
+    }
+    // get the actual length of the nonce
+    uint8_t nonce_length = response_apdu[5];
+    if (nonce_length > send_return - 10)
+    {
+        nonce_length = send_return - 10;
+    }
+    // copy the nonce
+    memcpy(nonce, response_apdu + 6, nonce_length);
 
-	return nonce_length;
+    return nonce_length;
 }
 
 //-----------------------------------------------------------------------------
@@ -393,53 +393,53 @@ int EPA_PACE_Get_Nonce(uint8_t requested_length, uint8_t *nonce)
 //-----------------------------------------------------------------------------
 int EPA_PACE_MSE_Set_AT(pace_version_info_t pace_version_info, uint8_t password)
 {
-	// create the MSE: Set AT APDU
-	uint8_t apdu[23];
-	// the minimum length (will be increased as more data is added)
-	size_t apdu_length = 20;
-	// copy the constant part
-	memcpy(apdu,
-	       apdu_mse_set_at_start,
-	       sizeof(apdu_mse_set_at_start));
-	// type: OID
-	apdu[5] = 0x80;
-	// length of the OID
-	apdu[6] = sizeof(pace_version_info.oid);
-	// copy the OID
-	memcpy(apdu + 7,
-	       pace_version_info.oid,
-	       sizeof(pace_version_info.oid));
-	// type: password
-	apdu[17] = 0x83;
-	// length: 1
-	apdu[18] = 1;
-	// password
-	apdu[19] = password;
-	// if standardized domain parameters are used, copy the ID
-	if (pace_version_info.parameter_id != 0) {
-		apdu_length += 3;
-		// type: domain parameter
-		apdu[20] = 0x84;
-		// length: 1
-		apdu[21] = 1;
-		// copy the parameter ID
-		apdu[22] = pace_version_info.parameter_id;
-	}
-	// now set Lc to the actual length
-	apdu[4] = apdu_length - 5;
-	// send it
-	uint8_t response_apdu[6];
-	int send_return = EPA_APDU(apdu,
-	                             apdu_length,
-	                             response_apdu);
-	// check if the command succeeded
-	if (send_return != 6
-		|| response_apdu[send_return - 4] != 0x90
-		|| response_apdu[send_return - 3] != 0x00)
-	{
-		return 1;
-	}
-	return 0;
+    // create the MSE: Set AT APDU
+    uint8_t apdu[23];
+    // the minimum length (will be increased as more data is added)
+    size_t apdu_length = 20;
+    // copy the constant part
+    memcpy(apdu,
+           apdu_mse_set_at_start,
+           sizeof(apdu_mse_set_at_start));
+    // type: OID
+    apdu[5] = 0x80;
+    // length of the OID
+    apdu[6] = sizeof(pace_version_info.oid);
+    // copy the OID
+    memcpy(apdu + 7,
+           pace_version_info.oid,
+           sizeof(pace_version_info.oid));
+    // type: password
+    apdu[17] = 0x83;
+    // length: 1
+    apdu[18] = 1;
+    // password
+    apdu[19] = password;
+    // if standardized domain parameters are used, copy the ID
+    if (pace_version_info.parameter_id != 0) {
+        apdu_length += 3;
+        // type: domain parameter
+        apdu[20] = 0x84;
+        // length: 1
+        apdu[21] = 1;
+        // copy the parameter ID
+        apdu[22] = pace_version_info.parameter_id;
+    }
+    // now set Lc to the actual length
+    apdu[4] = apdu_length - 5;
+    // send it
+    uint8_t response_apdu[6];
+    int send_return = EPA_APDU(apdu,
+                                 apdu_length,
+                                 response_apdu);
+    // check if the command succeeded
+    if (send_return != 6
+        || response_apdu[send_return - 4] != 0x90
+        || response_apdu[send_return - 3] != 0x00)
+    {
+        return 1;
+    }
+    return 0;
 }
 
 //-----------------------------------------------------------------------------
@@ -447,66 +447,66 @@ int EPA_PACE_MSE_Set_AT(pace_version_info_t pace_version_info, uint8_t password)
 //-----------------------------------------------------------------------------
 void EPA_PACE_Replay(UsbCommand *c)
 {
-	uint32_t timings[sizeof(apdu_lengths_replay) / sizeof(apdu_lengths_replay[0])] = {0};
+    uint32_t timings[sizeof(apdu_lengths_replay) / sizeof(apdu_lengths_replay[0])] = {0};
 
-	// if an APDU has been passed, save it
-	if (c->arg[0] != 0) {
-		// make sure it's not too big
-		if(c->arg[2] > apdus_replay[c->arg[0] - 1].len)
-		{
-			cmd_send(CMD_ACK, 1, 0, 0, NULL, 0);
-		}
-		memcpy(apdus_replay[c->arg[0] - 1].data + c->arg[1],
-	           c->d.asBytes,
-	           c->arg[2]);
-		// save/update APDU length
-		if (c->arg[1] == 0) {
-			apdu_lengths_replay[c->arg[0] - 1] = c->arg[2];
-		} else {
-			apdu_lengths_replay[c->arg[0] - 1] += c->arg[2];
-		}
-		cmd_send(CMD_ACK, 0, 0, 0, NULL, 0);
-		return;
-	}
+    // if an APDU has been passed, save it
+    if (c->arg[0] != 0) {
+        // make sure it's not too big
+        if(c->arg[2] > apdus_replay[c->arg[0] - 1].len)
+        {
+            cmd_send(CMD_ACK, 1, 0, 0, NULL, 0);
+        }
+        memcpy(apdus_replay[c->arg[0] - 1].data + c->arg[1],
+               c->d.asBytes,
+               c->arg[2]);
+        // save/update APDU length
+        if (c->arg[1] == 0) {
+            apdu_lengths_replay[c->arg[0] - 1] = c->arg[2];
+        } else {
+            apdu_lengths_replay[c->arg[0] - 1] += c->arg[2];
+        }
+        cmd_send(CMD_ACK, 0, 0, 0, NULL, 0);
+        return;
+    }
 
-	// return value of a function
-	int func_return;
+    // return value of a function
+    int func_return;
 
-	// set up communication
-	func_return = EPA_Setup();
-	if (func_return != 0) {
-		EPA_Finish();
-		cmd_send(CMD_ACK, 2, func_return, 0, NULL, 0);
-		return;
-	}
+    // set up communication
+    func_return = EPA_Setup();
+    if (func_return != 0) {
+        EPA_Finish();
+        cmd_send(CMD_ACK, 2, func_return, 0, NULL, 0);
+        return;
+    }
 
-	// increase the timeout (at least some cards really do need this!)/////////////
-	// iso14a_set_timeout(0x0003FFFF);
+    // increase the timeout (at least some cards really do need this!)/////////////
+    // iso14a_set_timeout(0x0003FFFF);
 
-	// response APDU
-	uint8_t response_apdu[300] = {0};
+    // response APDU
+    uint8_t response_apdu[300] = {0};
 
-	// now replay the data and measure the timings
-	for (int i = 0; i < sizeof(apdu_lengths_replay); i++) {
-		StartCountUS();
-		func_return = EPA_APDU(apdus_replay[i].data,
-		                         apdu_lengths_replay[i],
-		                         response_apdu);
-		timings[i] = GetCountUS();
-		// every step but the last one should succeed
-		if (i < sizeof(apdu_lengths_replay) - 1
-		    && (func_return < 6
-		        || response_apdu[func_return - 4] != 0x90
-		        || response_apdu[func_return - 3] != 0x00))
-		{
-			EPA_Finish();
-			cmd_send(CMD_ACK, 3 + i, func_return, 0, timings, 20);
-			return;
-		}
-	}
-	EPA_Finish();
-	cmd_send(CMD_ACK,0,0,0,timings,20);
-	return;
+    // now replay the data and measure the timings
+    for (int i = 0; i < sizeof(apdu_lengths_replay); i++) {
+        StartCountUS();
+        func_return = EPA_APDU(apdus_replay[i].data,
+                                 apdu_lengths_replay[i],
+                                 response_apdu);
+        timings[i] = GetCountUS();
+        // every step but the last one should succeed
+        if (i < sizeof(apdu_lengths_replay) - 1
+            && (func_return < 6
+                || response_apdu[func_return - 4] != 0x90
+                || response_apdu[func_return - 3] != 0x00))
+        {
+            EPA_Finish();
+            cmd_send(CMD_ACK, 3 + i, func_return, 0, timings, 20);
+            return;
+        }
+    }
+    EPA_Finish();
+    cmd_send(CMD_ACK,0,0,0,timings,20);
+    return;
 }
 
 //-----------------------------------------------------------------------------
@@ -515,40 +515,40 @@ void EPA_PACE_Replay(UsbCommand *c)
 //-----------------------------------------------------------------------------
 int EPA_Setup()
 {
-	int return_code = 0;
-	uint8_t uid[10];
-	uint8_t pps_response[3];
-	uint8_t pps_response_par[1];
-	iso14a_card_select_t card_a_info;
-	iso14b_card_select_t card_b_info;
+    int return_code = 0;
+    uint8_t uid[10];
+    uint8_t pps_response[3];
+    uint8_t pps_response_par[1];
+    iso14a_card_select_t card_a_info;
+    iso14b_card_select_t card_b_info;
 
-	// first, look for type A cards
-	// power up the field
-	iso14443a_setup(FPGA_HF_ISO14443A_READER_MOD);
-	// select the card
-	return_code = iso14443a_select_card(uid, &card_a_info, NULL, true, 0, false);
-	if (return_code == 1) {
-		// send the PPS request
-		ReaderTransmit((uint8_t *)pps, sizeof(pps), NULL);
-		return_code = ReaderReceive(pps_response, pps_response_par);
-		if (return_code != 3 || pps_response[0] != 0xD0) {
-			return return_code == 0 ? 2 : return_code;
-		}
-		Dbprintf("ISO 14443 Type A");
-		iso_type = 'a';
-		return 0;
-	}
+    // first, look for type A cards
+    // power up the field
+    iso14443a_setup(FPGA_HF_ISO14443A_READER_MOD);
+    // select the card
+    return_code = iso14443a_select_card(uid, &card_a_info, NULL, true, 0, false);
+    if (return_code == 1) {
+        // send the PPS request
+        ReaderTransmit((uint8_t *)pps, sizeof(pps), NULL);
+        return_code = ReaderReceive(pps_response, pps_response_par);
+        if (return_code != 3 || pps_response[0] != 0xD0) {
+            return return_code == 0 ? 2 : return_code;
+        }
+        Dbprintf("ISO 14443 Type A");
+        iso_type = 'a';
+        return 0;
+    }
 
-	// if we're here, there is no type A card, so we look for type B
-	// power up the field
-	iso14443b_setup();
-	// select the card
-	return_code = iso14443b_select_card( &card_b_info );
-	if (return_code == 0) {
-		Dbprintf("ISO 14443 Type B");
-		iso_type = 'b';
-		return 0;
-	}
-	Dbprintf("No card found.");
-	return 1;
+    // if we're here, there is no type A card, so we look for type B
+    // power up the field
+    iso14443b_setup();
+    // select the card
+    return_code = iso14443b_select_card( &card_b_info );
+    if (return_code == 0) {
+        Dbprintf("ISO 14443 Type B");
+        iso_type = 'b';
+        return 0;
+    }
+    Dbprintf("No card found.");
+    return 1;
 }
diff --git a/armsrc/epa.h b/armsrc/epa.h
index 550af8200..a0701ab57 100644
--- a/armsrc/epa.h
+++ b/armsrc/epa.h
@@ -18,9 +18,9 @@
 // this struct is used by EPA_Parse_CardAccess and contains info about the
 // PACE protocol supported by the chip
 typedef struct {
-	uint8_t oid[10];
-	uint8_t version;
-	uint8_t parameter_id;
+    uint8_t oid[10];
+    uint8_t version;
+    uint8_t parameter_id;
 } pace_version_info_t;
 
 // note: EPA_PACE_Collect_Nonce and EPA_PACE_Replay are declared in apps.h
diff --git a/armsrc/felica.c b/armsrc/felica.c
index 6b2bb5bfb..07aa763c9 100644
--- a/armsrc/felica.c
+++ b/armsrc/felica.c
@@ -2,9 +2,9 @@
 #include "apps.h"
 #include "BigBuf.h"
 #include "util.h"
-#include "usb_cdc.h"	// for usb_poll_validate_length
+#include "usb_cdc.h" // for usb_poll_validate_length
 #include "protocols.h"
-#include "crc16.h"	// crc16 ccitt
+#include "crc16.h"   // crc16 ccitt
 
 // FeliCa timings
 // minimum time between the start bits of consecutive transfers from reader to tag: 6800 carrier (13.56Mhz) cycles
@@ -23,7 +23,7 @@
 #endif
 
 // CRC skips two first sync bits in data buffer
-#define AddCrc(data, len)		compute_crc(CRC_FELICA, (data)+2, (len),(data)+(len)+2, (data)+(len)+3)
+#define AddCrc(data, len) compute_crc(CRC_FELICA, (data)+2, (len),(data)+(len)+2, (data)+(len)+3)
 
 static uint32_t felica_timeout;
 static uint32_t felica_nexttransfertime;
@@ -35,11 +35,11 @@ static void TransmitFor18092_AsReader(uint8_t * frame, int len, uint32_t *timing
 bool WaitForFelicaReply(uint16_t maxbytes);
 
 void iso18092_set_timeout(uint32_t timeout) {
-	felica_timeout = timeout + (DELAY_AIR2ARM_AS_READER + DELAY_ARM2AIR_AS_READER)/(16*8) + 2;
+    felica_timeout = timeout + (DELAY_AIR2ARM_AS_READER + DELAY_ARM2AIR_AS_READER)/(16*8) + 2;
 }
 
 uint32_t iso18092_get_timeout(void) {
-	return felica_timeout - (DELAY_AIR2ARM_AS_READER + DELAY_ARM2AIR_AS_READER)/(16*8) - 2;
+    return felica_timeout - (DELAY_AIR2ARM_AS_READER + DELAY_ARM2AIR_AS_READER)/(16*8) - 2;
 }
 
 #ifndef FELICA_MAX_FRAME_SIZE
@@ -62,11 +62,11 @@ static struct {
 
     uint16_t  shiftReg; //for synchronization and offset calculation
     int       posCnt;
-    bool	  crc_ok;
+    bool      crc_ok;
     int       rem_len;
     uint16_t  len;
     uint8_t   byte_offset;
-	uint8_t   *framebytes;
+    uint8_t   *framebytes;
  //should be enough. maxlen is 255, 254 for data, 2 for sync, 2 for crc
  // 0,1 -> SYNC, 2 - len,  3-(len+1)->data, then crc
 } FelicaFrame;
@@ -84,13 +84,13 @@ static void FelicaFrameReset() {
     FelicaFrame.byte_offset = 0;
 }
 static void FelicaFrameinit(uint8_t *data) {
-	FelicaFrame.framebytes = data;
-	FelicaFrameReset();
+    FelicaFrame.framebytes = data;
+    FelicaFrameReset();
 }
 
 //shift byte into frame, reversing it at the same time
 static void shiftInByte(uint8_t bt) {
-	uint8_t j;
+    uint8_t j;
     for(j=0; j < FelicaFrame.byte_offset; j++) {
         FelicaFrame.framebytes[FelicaFrame.posCnt] = ( FelicaFrame.framebytes[FelicaFrame.posCnt]<<1 ) + (bt & 1);
         bt >>= 1;
@@ -105,85 +105,85 @@ static void shiftInByte(uint8_t bt) {
 
 static void Process18092Byte(uint8_t bt) {
     switch (FelicaFrame.state) {
-		case STATE_UNSYNCD: {
-			//almost any nonzero byte can be start of SYNC. SYNC should be preceded by zeros, but that is not alsways the case
-			if (bt > 0) {
-				FelicaFrame.shiftReg = reflect8(bt);
-				FelicaFrame.state = STATE_TRYING_SYNC;
-			}
-			break;
-		}
-		case STATE_TRYING_SYNC: {
-			if (bt == 0) {
-				//desync
-				FelicaFrame.shiftReg = bt;
-				FelicaFrame.state = STATE_UNSYNCD;
-			} else {
-				for (uint8_t i=0; i<8; i++) {
+        case STATE_UNSYNCD: {
+            //almost any nonzero byte can be start of SYNC. SYNC should be preceded by zeros, but that is not alsways the case
+            if (bt > 0) {
+                FelicaFrame.shiftReg = reflect8(bt);
+                FelicaFrame.state = STATE_TRYING_SYNC;
+            }
+            break;
+        }
+        case STATE_TRYING_SYNC: {
+            if (bt == 0) {
+                //desync
+                FelicaFrame.shiftReg = bt;
+                FelicaFrame.state = STATE_UNSYNCD;
+            } else {
+                for (uint8_t i=0; i<8; i++) {
 
-					if (FelicaFrame.shiftReg == SYNC_16BIT) {
-						//SYNC done!
-						FelicaFrame.state = STATE_GET_LENGTH;
-						FelicaFrame.framebytes[0] = 0xb2;
-						FelicaFrame.framebytes[1] = 0x4d;
-						FelicaFrame.byte_offset = i;
-						//shift in remaining byte, slowly...
-						for(uint8_t j=i; j<8; j++) {
-							FelicaFrame.framebytes[2] = (FelicaFrame.framebytes[2] << 1) + (bt & 1);
-							bt >>= 1;
-						}
+                    if (FelicaFrame.shiftReg == SYNC_16BIT) {
+                        //SYNC done!
+                        FelicaFrame.state = STATE_GET_LENGTH;
+                        FelicaFrame.framebytes[0] = 0xb2;
+                        FelicaFrame.framebytes[1] = 0x4d;
+                        FelicaFrame.byte_offset = i;
+                        //shift in remaining byte, slowly...
+                        for(uint8_t j=i; j<8; j++) {
+                            FelicaFrame.framebytes[2] = (FelicaFrame.framebytes[2] << 1) + (bt & 1);
+                            bt >>= 1;
+                        }
 
-						FelicaFrame.posCnt = 2;
-						if (i==0)
-							break;
-					}
-					FelicaFrame.shiftReg = (FelicaFrame.shiftReg << 1) + (bt & 1);
-					bt >>= 1;
-				}
+                        FelicaFrame.posCnt = 2;
+                        if (i==0)
+                            break;
+                    }
+                    FelicaFrame.shiftReg = (FelicaFrame.shiftReg << 1) + (bt & 1);
+                    bt >>= 1;
+                }
 
-				//that byte was last byte of sync
-				if (FelicaFrame.shiftReg == SYNC_16BIT) {
-					//Force SYNC on next byte
-					FelicaFrame.state = STATE_GET_LENGTH;
-					FelicaFrame.framebytes[0] = 0xb2;
-					FelicaFrame.framebytes[1] = 0x4d;
-					FelicaFrame.byte_offset = 0;
-					FelicaFrame.posCnt = 1;
-				}
-			}
-			break;
-		}
-		case STATE_GET_LENGTH: {
-			shiftInByte(bt);
-			FelicaFrame.rem_len = FelicaFrame.framebytes[2] - 1;
-			FelicaFrame.len = FelicaFrame.framebytes[2] + 4; //with crc and sync
-			FelicaFrame.state = STATE_GET_DATA;
-			break;
-		}
-		case STATE_GET_DATA: {
-			shiftInByte(bt);
-			if (FelicaFrame.rem_len <= 0) {
-				FelicaFrame.state = STATE_GET_CRC;
-				FelicaFrame.rem_len = 2;
-			}
-			break;
-		}
-		case STATE_GET_CRC: {
-			shiftInByte(bt);
+                //that byte was last byte of sync
+                if (FelicaFrame.shiftReg == SYNC_16BIT) {
+                    //Force SYNC on next byte
+                    FelicaFrame.state = STATE_GET_LENGTH;
+                    FelicaFrame.framebytes[0] = 0xb2;
+                    FelicaFrame.framebytes[1] = 0x4d;
+                    FelicaFrame.byte_offset = 0;
+                    FelicaFrame.posCnt = 1;
+                }
+            }
+            break;
+        }
+        case STATE_GET_LENGTH: {
+            shiftInByte(bt);
+            FelicaFrame.rem_len = FelicaFrame.framebytes[2] - 1;
+            FelicaFrame.len = FelicaFrame.framebytes[2] + 4; //with crc and sync
+            FelicaFrame.state = STATE_GET_DATA;
+            break;
+        }
+        case STATE_GET_DATA: {
+            shiftInByte(bt);
+            if (FelicaFrame.rem_len <= 0) {
+                FelicaFrame.state = STATE_GET_CRC;
+                FelicaFrame.rem_len = 2;
+            }
+            break;
+        }
+        case STATE_GET_CRC: {
+            shiftInByte(bt);
 
-			if ( FelicaFrame.rem_len <= 0 ) {
-				// skip sync 2bytes. IF ok, residue should be 0x0000
-				FelicaFrame.crc_ok = check_crc(CRC_FELICA, FelicaFrame.framebytes+2, FelicaFrame.len-2);
-				FelicaFrame.state = STATE_FULL;
-				FelicaFrame.rem_len = 0;
-				if (MF_DBGLEVEL > 3) Dbprintf("[+] got 2 crc bytes [%s]", (FelicaFrame.crc_ok) ? "OK" : "No" );
-			}
-			break;
-		}
-		case STATE_FULL:  //ignore byte. Don't forget to clear frame to receive next one...
-		default:
-			break;
-	}
+            if ( FelicaFrame.rem_len <= 0 ) {
+                // skip sync 2bytes. IF ok, residue should be 0x0000
+                FelicaFrame.crc_ok = check_crc(CRC_FELICA, FelicaFrame.framebytes+2, FelicaFrame.len-2);
+                FelicaFrame.state = STATE_FULL;
+                FelicaFrame.rem_len = 0;
+                if (MF_DBGLEVEL > 3) Dbprintf("[+] got 2 crc bytes [%s]", (FelicaFrame.crc_ok) ? "OK" : "No" );
+            }
+            break;
+        }
+        case STATE_FULL:  //ignore byte. Don't forget to clear frame to receive next one...
+        default:
+            break;
+    }
 }
 
 /* Perform FeliCa polling card
@@ -192,64 +192,64 @@ static void Process18092Byte(uint8_t bt) {
  */
 static uint8_t felica_select_card(felica_card_select_t *card) {
 
-	// POLL command
-	// 0xB2 0x4B = sync code
-	// 0x06 = len
-	// 0x00 = rfu
-	// 0xff = system service
-	// 0xff = system service
-	// 0x00  =
-	//			b7    = automatic switching of data rate
-	//			b6-b2 = reserved
-	//			b1    = fc/32 (414kbps)
-	//			b0    = fc/64 (212kbps)
-	// 0x00 = timeslot
-	// 0x09 0x21 = crc
-	static uint8_t poll[10] = {0xb2,0x4d,0x06,FELICA_POLL_REQ,0xFF,0xFF,0x00,0x00,0x09,0x21};
+    // POLL command
+    // 0xB2 0x4B = sync code
+    // 0x06 = len
+    // 0x00 = rfu
+    // 0xff = system service
+    // 0xff = system service
+    // 0x00  =
+    // b7    = automatic switching of data rate
+    // b6-b2 = reserved
+    // b1    = fc/32 (414kbps)
+    // b0    = fc/64 (212kbps)
+    // 0x00 = timeslot
+    // 0x09 0x21 = crc
+    static uint8_t poll[10] = {0xb2,0x4d,0x06,FELICA_POLL_REQ,0xFF,0xFF,0x00,0x00,0x09,0x21};
 
-	int len = 20;
+    int len = 20;
 
-	// We try 20 times, or if answer was received.
-	do {
-		// end-of-reception response packet data, wait approx. 501μs
-		// end-of-transmission command packet data, wait approx. 197μs
-		// polling card
-		TransmitFor18092_AsReader(poll, sizeof(poll), NULL, 1, 0);
+    // We try 20 times, or if answer was received.
+    do {
+        // end-of-reception response packet data, wait approx. 501μs
+        // end-of-transmission command packet data, wait approx. 197μs
+        // polling card
+        TransmitFor18092_AsReader(poll, sizeof(poll), NULL, 1, 0);
 
-		// polling card, break if success
-		if (WaitForFelicaReply(512) && FelicaFrame.framebytes[3] == FELICA_POLL_ACK)
-			break;
+        // polling card, break if success
+        if (WaitForFelicaReply(512) && FelicaFrame.framebytes[3] == FELICA_POLL_ACK)
+            break;
 
-		WDT_HIT();
+        WDT_HIT();
 
-	} while (--len);
+    } while (--len);
 
-	// timed-out
-	if ( len == 0 )
-		return 1;
+    // timed-out
+    if ( len == 0 )
+        return 1;
 
-	// wrong answer
-	if (FelicaFrame.framebytes[3] != FELICA_POLL_ACK)
-		return 2;
+    // wrong answer
+    if (FelicaFrame.framebytes[3] != FELICA_POLL_ACK)
+        return 2;
 
-	// VALIDATE CRC   residue is 0, hence if crc is a value it failed.
-	if (!check_crc(CRC_FELICA, FelicaFrame.framebytes+2, FelicaFrame.len-2))
-		return 3;
+    // VALIDATE CRC   residue is 0, hence if crc is a value it failed.
+    if (!check_crc(CRC_FELICA, FelicaFrame.framebytes+2, FelicaFrame.len-2))
+        return 3;
 
-	// copy UID
-	// idm 8
-	if (card) {
-		memcpy(card->IDm, FelicaFrame.framebytes + 4, 8);
-		memcpy(card->PMm, FelicaFrame.framebytes + 4 + 8, 8);
-		//memcpy(card->servicecode, FelicaFrame.framebytes + 4 + 8 + 8, 2);
-		memcpy(card->code, card->IDm, 2);
-		memcpy(card->uid, card->IDm + 2, 6);
-		memcpy(card->iccode, card->PMm, 2);
-		memcpy(card->mrt, card->PMm+2, 6);
+    // copy UID
+    // idm 8
+    if (card) {
+        memcpy(card->IDm, FelicaFrame.framebytes + 4, 8);
+        memcpy(card->PMm, FelicaFrame.framebytes + 4 + 8, 8);
+        //memcpy(card->servicecode, FelicaFrame.framebytes + 4 + 8 + 8, 2);
+        memcpy(card->code, card->IDm, 2);
+        memcpy(card->uid, card->IDm + 2, 6);
+        memcpy(card->iccode, card->PMm, 2);
+        memcpy(card->mrt, card->PMm+2, 6);
 
-	}
-	// more status bytes?
-	return 0;
+    }
+    // more status bytes?
+    return 0;
 }
 
 // poll-0: 0xb2,0x4d,0x06,0x00,0xff,0xff,0x00,0x00,0x09,0x21,
@@ -274,34 +274,34 @@ static void BuildFliteRdblk(uint8_t* idm, int blocknum, uint16_t *blocks ) {
     frameSpace[c++] = 0xb2;
     frameSpace[c++] = 0x4d;
 
-	c++; //set length later
+    c++; //set length later
 
-    frameSpace[c++] = FELICA_RDBLK_REQ; 		//command number
+    frameSpace[c++] = FELICA_RDBLK_REQ; //command number
 
-	//card IDm, from poll
-	frameSpace[c++] = idm[0];
-	frameSpace[c++] = idm[1];
-	frameSpace[c++] = idm[2];
-	frameSpace[c++] = idm[3];
-	frameSpace[c++] = idm[4];
-	frameSpace[c++] = idm[5];
-	frameSpace[c++] = idm[6];
-	frameSpace[c++] = idm[7];
+    //card IDm, from poll
+    frameSpace[c++] = idm[0];
+    frameSpace[c++] = idm[1];
+    frameSpace[c++] = idm[2];
+    frameSpace[c++] = idm[3];
+    frameSpace[c++] = idm[4];
+    frameSpace[c++] = idm[5];
+    frameSpace[c++] = idm[6];
+    frameSpace[c++] = idm[7];
 
-	//number of services
+    //number of services
     frameSpace[c++] = 0x01;
 
-	//service code
-	frameSpace[c++] = (SERVICE_FELICA_LITE_READONLY >> 8);
+    //service code
+    frameSpace[c++] = (SERVICE_FELICA_LITE_READONLY >> 8);
     frameSpace[c++] = SERVICE_FELICA_LITE_READONLY & 0xFF;
 
-	//number of blocks
+    //number of blocks
     frameSpace[c++] = blocknum;
 
     for (i=0; i < blocknum; i++) {
 
-		//3-byte block
-		if (blocks[i] >= 256) {
+        //3-byte block
+        if (blocks[i] >= 256) {
            frameSpace[c++] = 0x00;
            frameSpace[c++] = (blocks[i] >> 8); //block number, little endian....
            frameSpace[c++] = (blocks[i] & 0xff);
@@ -311,70 +311,70 @@ static void BuildFliteRdblk(uint8_t* idm, int blocknum, uint16_t *blocks ) {
         }
     }
 
-	//set length
+    //set length
     frameSpace[2] = c-2;
     AddCrc(frameSpace, c-2);
 }
 
 static void TransmitFor18092_AsReader(uint8_t * frame, int len, uint32_t *timing, uint8_t power, uint8_t highspeed) {
 
-	uint8_t flags = FPGA_MAJOR_MODE_ISO18092;
+    uint8_t flags = FPGA_MAJOR_MODE_ISO18092;
 
-	if ( power )
-		flags |= FPGA_HF_ISO18092_FLAG_READER;
-	if (highspeed)
-		flags |= FPGA_HF_ISO18092_FLAG_424K;
+    if ( power )
+        flags |= FPGA_HF_ISO18092_FLAG_READER;
+    if (highspeed)
+        flags |= FPGA_HF_ISO18092_FLAG_424K;
 
-	FpgaWriteConfWord(flags);
+    FpgaWriteConfWord(flags);
 
-	uint32_t curr_transfer_time = ((MAX(felica_nexttransfertime, GetCountSspClk()) & 0xfffffff8) + 8);
+    uint32_t curr_transfer_time = ((MAX(felica_nexttransfertime, GetCountSspClk()) & 0xfffffff8) + 8);
 
-	while (GetCountSspClk() < curr_transfer_time) {};
+    while (GetCountSspClk() < curr_transfer_time) {};
 
-	felica_lasttime_prox2air_start = curr_transfer_time;
+    felica_lasttime_prox2air_start = curr_transfer_time;
 
     // preamble
-	// sending 0x00 0x00 0x00 0x00 0x00 0x00
-	uint16_t c = 0;
-	while (c < 6) {
+    // sending 0x00 0x00 0x00 0x00 0x00 0x00
+    uint16_t c = 0;
+    while (c < 6) {
 
-		// keep tx buffer in a defined state anyway.
-		if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
-			AT91C_BASE_SSC->SSC_THR = 0x00;
-			c++;
-		}
-	}
-	// sending sync code
+        // keep tx buffer in a defined state anyway.
+        if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
+            AT91C_BASE_SSC->SSC_THR = 0x00;
+            c++;
+        }
+    }
+    // sending sync code
 
-	// sending data
-	c = 0;
-	while (c < len) {
+    // sending data
+    c = 0;
+    while (c < len) {
 
-		// Put byte into tx holding register as soon as it is ready
-		if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
-			AT91C_BASE_SSC->SSC_THR = frame[c++];
-		}
-	}
+        // Put byte into tx holding register as soon as it is ready
+        if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
+            AT91C_BASE_SSC->SSC_THR = frame[c++];
+        }
+    }
 
 /**/
-	while (!(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY))) {};
-	AT91C_BASE_SSC->SSC_THR = 0x00; //minimum delay
+    while (!(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY))) {};
+    AT91C_BASE_SSC->SSC_THR = 0x00; //minimum delay
 
-	while (!(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY))) {};
-	AT91C_BASE_SSC->SSC_THR = 0x00; //spin
+    while (!(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY))) {};
+    AT91C_BASE_SSC->SSC_THR = 0x00; //spin
 /**/
 
-	// log
-	LogTrace(
-		frame,
-		len,
-		(felica_lasttime_prox2air_start<<4) + DELAY_ARM2AIR_AS_READER,
-		((felica_lasttime_prox2air_start + felica_lasttime_prox2air_start)<<4) + DELAY_ARM2AIR_AS_READER,
-		NULL,
-		true
-	);
+    // log
+    LogTrace(
+        frame,
+        len,
+        (felica_lasttime_prox2air_start<<4) + DELAY_ARM2AIR_AS_READER,
+        ((felica_lasttime_prox2air_start + felica_lasttime_prox2air_start)<<4) + DELAY_ARM2AIR_AS_READER,
+        NULL,
+        true
+    );
 
-	felica_nexttransfertime = MAX(felica_nexttransfertime ,felica_lasttime_prox2air_start + FELICA_REQUEST_GUARD_TIME);
+    felica_nexttransfertime = MAX(felica_nexttransfertime ,felica_lasttime_prox2air_start + FELICA_REQUEST_GUARD_TIME);
 }
 
 // Wait for tag reply
@@ -382,161 +382,161 @@ static void TransmitFor18092_AsReader(uint8_t * frame, int len, uint32_t *timing
 // or return TRUE when command is captured
 bool WaitForFelicaReply(uint16_t maxbytes) {
 
-	uint32_t c = 0;
+    uint32_t c = 0;
 
-	// power, no modulation
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_ISO18092 | FPGA_HF_ISO18092_FLAG_READER | FPGA_HF_ISO18092_FLAG_NOMOD);
+    // power, no modulation
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_ISO18092 | FPGA_HF_ISO18092_FLAG_READER | FPGA_HF_ISO18092_FLAG_NOMOD);
 
-	FelicaFrameReset();
+    FelicaFrameReset();
 
-	// clear RXRDY:
-	uint8_t b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
+    // clear RXRDY:
+    uint8_t b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
 
-	uint32_t timeout = iso18092_get_timeout();
-	for(;;) {
+    uint32_t timeout = iso18092_get_timeout();
+    for(;;) {
         WDT_HIT();
 
-		if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
-			b = (uint8_t)(AT91C_BASE_SSC->SSC_RHR);
-			Process18092Byte(b);
-			if (FelicaFrame.state == STATE_FULL) {
-				felica_nexttransfertime =
-					MAX(
-						felica_nexttransfertime,
-						(GetCountSspClk() & 0xfffffff8) - (DELAY_AIR2ARM_AS_READER + DELAY_ARM2AIR_AS_READER)/16 + FELICA_FRAME_DELAY_TIME
-					)
-				;
+        if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
+            b = (uint8_t)(AT91C_BASE_SSC->SSC_RHR);
+            Process18092Byte(b);
+            if (FelicaFrame.state == STATE_FULL) {
+                felica_nexttransfertime =
+                    MAX(
+                        felica_nexttransfertime,
+                        (GetCountSspClk() & 0xfffffff8) - (DELAY_AIR2ARM_AS_READER + DELAY_ARM2AIR_AS_READER)/16 + FELICA_FRAME_DELAY_TIME
+                    )
+                ;
 
-				LogTrace(
-					FelicaFrame.framebytes,
-					FelicaFrame.len,
-					((GetCountSspClk() & 0xfffffff8)<<4) - DELAY_AIR2ARM_AS_READER - timeout,
-					((GetCountSspClk() & 0xfffffff8)<<4) - DELAY_AIR2ARM_AS_READER,
-					NULL,
-					false
-				);
-				return true;
-			} else if (c++ > timeout && FelicaFrame.state == STATE_UNSYNCD) {
-				return false;
-			} else if (FelicaFrame.state == STATE_GET_CRC) {
-				Dbprintf(" Frame: ");
-				Dbhexdump(16, FelicaFrame.framebytes, 0);
-				//return false;
-			}
-		}
-	}
-	return false;
+                LogTrace(
+                    FelicaFrame.framebytes,
+                    FelicaFrame.len,
+                    ((GetCountSspClk() & 0xfffffff8)<<4) - DELAY_AIR2ARM_AS_READER - timeout,
+                    ((GetCountSspClk() & 0xfffffff8)<<4) - DELAY_AIR2ARM_AS_READER,
+                    NULL,
+                    false
+                );
+                return true;
+            } else if (c++ > timeout && FelicaFrame.state == STATE_UNSYNCD) {
+                return false;
+            } else if (FelicaFrame.state == STATE_GET_CRC) {
+                Dbprintf(" Frame: ");
+                Dbhexdump(16, FelicaFrame.framebytes, 0);
+                //return false;
+            }
+        }
+    }
+    return false;
 }
 
 // Set up FeliCa communication (similar to iso14443a_setup)
 // field is setup for "Sending as Reader"
 static void iso18092_setup(uint8_t fpga_minor_mode) {
 
-	LEDsoff();
-	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
+    LEDsoff();
+    FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
 
-	// allocate command receive buffer
-	BigBuf_free(); BigBuf_Clear_ext(false);
+    // allocate command receive buffer
+    BigBuf_free(); BigBuf_Clear_ext(false);
 
-	// Initialize Demod and Uart structs
-	//DemodInit(BigBuf_malloc(MAX_FRAME_SIZE));
-	FelicaFrameinit(BigBuf_malloc(FELICA_MAX_FRAME_SIZE));
+    // Initialize Demod and Uart structs
+    //DemodInit(BigBuf_malloc(MAX_FRAME_SIZE));
+    FelicaFrameinit(BigBuf_malloc(FELICA_MAX_FRAME_SIZE));
 
-	felica_nexttransfertime = 2 * DELAY_ARM2AIR_AS_READER;
-	iso18092_set_timeout(2120); // 106 * 20ms  maximum start-up time of card
+    felica_nexttransfertime = 2 * DELAY_ARM2AIR_AS_READER;
+    iso18092_set_timeout(2120); // 106 * 20ms  maximum start-up time of card
 
-	init_table(CRC_FELICA);
+    init_table(CRC_FELICA);
 
-	// connect Demodulated Signal to ADC:
-	SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
+    // connect Demodulated Signal to ADC:
+    SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
 
-	// Set up the synchronous serial port
-	FpgaSetupSsc();
+    // Set up the synchronous serial port
+    FpgaSetupSsc();
 
-	// LSB transfer.  Remember to set it back to MSB with
-	AT91C_BASE_SSC->SSC_RFMR = SSC_FRAME_MODE_BITS_IN_WORD(8) | SSC_FRAME_MODE_WORDS_PER_TRANSFER(0);
+    // LSB transfer.  Remember to set it back to MSB with
+    AT91C_BASE_SSC->SSC_RFMR = SSC_FRAME_MODE_BITS_IN_WORD(8) | SSC_FRAME_MODE_WORDS_PER_TRANSFER(0);
 
-	// Signal field is on with the appropriate LED
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_ISO18092 | fpga_minor_mode);
+    // Signal field is on with the appropriate LED
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_ISO18092 | fpga_minor_mode);
 
-	//20.4 ms generate field,  start sending polling command afterwars.
-	SpinDelay(100);
+    //20.4 ms generate field,  start sending polling command afterwars.
+    SpinDelay(100);
 
-	// Start the timer
-	StartCountSspClk();
+    // Start the timer
+    StartCountSspClk();
 
-	LED_D_ON();
+    LED_D_ON();
 }
 //-----------------------------------------------------------------------------
 // RAW FeliCa commands. Send out commands and store answers.
 //-----------------------------------------------------------------------------
-// arg0		FeliCa flags
-// arg1		len of commandbytes
+// arg0 FeliCa flags
+// arg1 len of commandbytes
 // d.asBytes command bytes to send
 void felica_sendraw(UsbCommand *c) {
 
-	if (MF_DBGLEVEL > 3) Dbprintf("FeliCa_sendraw Enter");
+    if (MF_DBGLEVEL > 3) Dbprintf("FeliCa_sendraw Enter");
 
-	felica_command_t param = c->arg[0];
-	size_t len = c->arg[1] & 0xffff;
-	uint8_t *cmd = c->d.asBytes;
-	uint32_t arg0 = 0;
+    felica_command_t param = c->arg[0];
+    size_t len = c->arg[1] & 0xffff;
+    uint8_t *cmd = c->d.asBytes;
+    uint32_t arg0 = 0;
 
-	felica_card_select_t card;
+    felica_card_select_t card;
 
-	if ((param & FELICA_CONNECT))
-		clear_trace();
+    if ((param & FELICA_CONNECT))
+        clear_trace();
 
-	set_tracing(true);
+    set_tracing(true);
 
-	if ((param & FELICA_CONNECT)) {
-		iso18092_setup(FPGA_HF_ISO18092_FLAG_READER | FPGA_HF_ISO18092_FLAG_NOMOD);
+    if ((param & FELICA_CONNECT)) {
+        iso18092_setup(FPGA_HF_ISO18092_FLAG_READER | FPGA_HF_ISO18092_FLAG_NOMOD);
 
-		// notify client selecting status.
-		// if failed selecting, turn off antenna and quite.
-		if( !(param & FELICA_NO_SELECT) ) {
-			arg0 = felica_select_card(&card);
-			cmd_send(CMD_ACK, arg0, sizeof(card.uid), 0, &card, sizeof(felica_card_select_t));
-			if ( arg0 > 0 )
-				goto OUT;
-		}
-	}
+        // notify client selecting status.
+        // if failed selecting, turn off antenna and quite.
+        if( !(param & FELICA_NO_SELECT) ) {
+            arg0 = felica_select_card(&card);
+            cmd_send(CMD_ACK, arg0, sizeof(card.uid), 0, &card, sizeof(felica_card_select_t));
+            if ( arg0 > 0 )
+                goto OUT;
+        }
+    }
 
-	if ((param & FELICA_RAW)) {
+    if ((param & FELICA_RAW)) {
 
-		// 2 sync, 1 len, 2crc == 5
-		uint8_t *buf = BigBuf_malloc(len+5);
-		// add sync bits
-	    buf[0] = 0xb2;
-		buf[1] = 0x4d;
-		buf[2] = len;
+        // 2 sync, 1 len, 2crc == 5
+        uint8_t *buf = BigBuf_malloc(len+5);
+        // add sync bits
+        buf[0] = 0xb2;
+        buf[1] = 0x4d;
+        buf[2] = len;
 
-		// copy command
-		memcpy(buf+2, cmd, len);
+        // copy command
+        memcpy(buf+2, cmd, len);
 
-		if ((param & FELICA_APPEND_CRC)) {
-			// Don't append crc on empty bytearray...
-			if ( len > 0 ) {
-				AddCrc(buf, len);
-				len += 2;
-			}
-		}
+        if ((param & FELICA_APPEND_CRC)) {
+            // Don't append crc on empty bytearray...
+            if ( len > 0 ) {
+                AddCrc(buf, len);
+                len += 2;
+            }
+        }
 
-		TransmitFor18092_AsReader(buf, buf[2]+4, NULL, 1, 0);
-		arg0 = !WaitForFelicaReply(1024);
-		cmd_send(CMD_ACK, arg0, 0, 0, FelicaFrame.framebytes+2, FelicaFrame.len-2);
-	}
+        TransmitFor18092_AsReader(buf, buf[2]+4, NULL, 1, 0);
+        arg0 = !WaitForFelicaReply(1024);
+        cmd_send(CMD_ACK, arg0, 0, 0, FelicaFrame.framebytes+2, FelicaFrame.len-2);
+    }
 
-	if ((param & FELICA_NO_DISCONNECT))
-		return;
+    if ((param & FELICA_NO_DISCONNECT))
+        return;
 
 OUT:
-	switch_off();
+    switch_off();
 
-	//Resetting Frame mode (First set in fpgaloader.c)
+    //Resetting Frame mode (First set in fpgaloader.c)
     AT91C_BASE_SSC->SSC_RFMR = SSC_FRAME_MODE_BITS_IN_WORD(8) | AT91C_SSC_MSBF | SSC_FRAME_MODE_WORDS_PER_TRANSFER(0);
 
-	if (MF_DBGLEVEL > 3) Dbprintf("FeliCa_sendraw Exit");
+    if (MF_DBGLEVEL > 3) Dbprintf("FeliCa_sendraw Exit");
 }
 
 void felica_sniff(uint32_t samplesToSkip, uint32_t triggersToSkip) {
@@ -545,11 +545,11 @@ void felica_sniff(uint32_t samplesToSkip, uint32_t triggersToSkip) {
 
     Dbprintf("Snoop FelicaLiteS: Getting first %d frames, Skipping %d triggers.\n", samplesToSkip, triggersToSkip);
 
-  	iso18092_setup( FPGA_HF_ISO18092_FLAG_NOMOD);
+    iso18092_setup( FPGA_HF_ISO18092_FLAG_NOMOD);
 
     //the frame bits are slow enough.
     int n = BigBuf_max_traceLen() / sizeof(uint8_t); // take all memory
-	int numbts = 0;
+    int numbts = 0;
     uint8_t *dest = (uint8_t *)BigBuf_get_addr();
     uint8_t *destend = dest + n-2;
 
@@ -557,13 +557,13 @@ void felica_sniff(uint32_t samplesToSkip, uint32_t triggersToSkip) {
 
     while (dest <= destend) {
         WDT_HIT();
-		if( BUTTON_PRESS()) break;
+        if( BUTTON_PRESS()) break;
 
         if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
             uint8_t dist = (uint8_t)(AT91C_BASE_SSC->SSC_RHR);
             Process18092Byte(dist);
 
-			//to be sure we are in frame
+            //to be sure we are in frame
             if (FelicaFrame.state == STATE_GET_LENGTH) {
                 //length is after 48 (PRE)+16 (SYNC) - 64 ticks +maybe offset? not 100%
                 uint16_t distance = GetCountSspClk() - endframe - 64 + (FelicaFrame.byte_offset > 0 ? (8-FelicaFrame.byte_offset) : 0);
@@ -572,7 +572,7 @@ void felica_sniff(uint32_t samplesToSkip, uint32_t triggersToSkip) {
                 *dest = (distance & 0xff);
                 dest++;
             }
-			//crc NOT checked
+            //crc NOT checked
             if (FelicaFrame.state == STATE_FULL) {
                 endframe = GetCountSspClk();
                 //*dest = FelicaFrame.crc_ok; //kind of wasteful
@@ -590,19 +590,19 @@ void felica_sniff(uint32_t samplesToSkip, uint32_t triggersToSkip) {
 
                 numbts += FelicaFrame.len;
 
-				FelicaFrameReset();
+                FelicaFrameReset();
             }
         }
     }
 
-	switch_off();
+    switch_off();
 
     //reset framing
     AT91C_BASE_SSC->SSC_RFMR = SSC_FRAME_MODE_BITS_IN_WORD(8) | AT91C_SSC_MSBF | SSC_FRAME_MODE_WORDS_PER_TRANSFER(0);
     set_tracelen(numbts);
 
     Dbprintf("Felica sniffing done, tracelen: %i, use hf list felica for annotations", BigBuf_get_traceLen());
-	cmd_send(CMD_ACK,1, numbts,0,0,0);
+    cmd_send(CMD_ACK,1, numbts,0,0,0);
 }
 
 #define R_POLL0_LEN    0x16
@@ -615,19 +615,19 @@ void felica_sim_lite(uint64_t nfcid) {
     int i, curlen = 0;
     uint8_t *curresp = 0;
 
-	uint8_t ndef[8];
-	num_to_bytes(nfcid, 8, ndef);
+    uint8_t ndef[8];
+    num_to_bytes(nfcid, 8, ndef);
 
-	//prepare our 3 responses...
+    //prepare our 3 responses...
     uint8_t resp_poll0[R_POLL0_LEN] = { 0xb2,0x4d,0x12,FELICA_POLL_ACK,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf1,0x00,0x00,0x00,0x01,0x43,0x00,0xb3,0x7f};
     uint8_t resp_poll1[R_POLL1_LEN] = { 0xb2,0x4d,0x14,FELICA_POLL_ACK,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf1,0x00,0x00,0x00,0x01,0x43,0x00, 0x88,0xb4,0xb3,0x7f};
     uint8_t resp_readblk[R_READBLK_LEN] = { 0xb2,0x4d,0x1d,FELICA_RDBLK_ACK,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x10,0x04,0x01,0x00,0x0d,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x23,0xcb,0x6e};
 
-	//NFC tag 3/ ISo technically. Many overlapping standards
+    //NFC tag 3/ ISo technically. Many overlapping standards
     DbpString("Felica Lite-S sim start");
     Dbprintf("NDEF2 UID: %02x %02x %02x %02x %02x %02x %02x %02x",
-		ndef[0], ndef[1], ndef[2], ndef[3],	ndef[4], ndef[5], ndef[6], ndef[7]
-	);
+        ndef[0], ndef[1], ndef[2], ndef[3], ndef[4], ndef[5], ndef[6], ndef[7]
+    );
 
     //fill in blanks
     for( i=0; i<8; i++) {
@@ -641,21 +641,21 @@ void felica_sim_lite(uint64_t nfcid) {
     AddCrc(resp_poll1, resp_poll1[2]);
     AddCrc(resp_readblk, resp_readblk[2]);
 
-	iso18092_setup( FPGA_HF_ISO18092_FLAG_NOMOD);
+    iso18092_setup( FPGA_HF_ISO18092_FLAG_NOMOD);
 
-	bool listenmode = true;
-	//uint32_t frtm = GetCountSspClk();
+    bool listenmode = true;
+    //uint32_t frtm = GetCountSspClk();
     for(;;) {
-		if( BUTTON_PRESS()) break;
+        if( BUTTON_PRESS()) break;
         WDT_HIT();
 
         if (listenmode) {
             //waiting for request...
             if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
 
-				uint8_t dist = (uint8_t)(AT91C_BASE_SSC->SSC_RHR);
-				//frtm = GetCountSspClk();
-				Process18092Byte(dist);
+                uint8_t dist = (uint8_t)(AT91C_BASE_SSC->SSC_RHR);
+                //frtm = GetCountSspClk();
+                Process18092Byte(dist);
 
                 if (FelicaFrame.state == STATE_FULL) {
 
@@ -663,17 +663,17 @@ void felica_sim_lite(uint64_t nfcid) {
 
                         if (FelicaFrame.framebytes[2] == 6 && FelicaFrame.framebytes[3] == 0) {
 
-							//polling... there are two types of polling we answer to
-							if (FelicaFrame.framebytes[6] == 0) {
-								curresp = resp_poll0;
-								curlen = R_POLL0_LEN;
-								listenmode = false;
-							}
-							if (FelicaFrame.framebytes[6] == 1) {
-								curresp = resp_poll1;
-								curlen = R_POLL1_LEN;
-								listenmode = true;
-							}
+                            //polling... there are two types of polling we answer to
+                            if (FelicaFrame.framebytes[6] == 0) {
+                                curresp = resp_poll0;
+                                curlen = R_POLL0_LEN;
+                                listenmode = false;
+                            }
+                            if (FelicaFrame.framebytes[6] == 1) {
+                                curresp = resp_poll1;
+                                curlen = R_POLL1_LEN;
+                                listenmode = true;
+                            }
                         }
 
                         if (FelicaFrame.framebytes[2] > 5 && FelicaFrame.framebytes[3] == 0x06) {
@@ -687,30 +687,30 @@ void felica_sim_lite(uint64_t nfcid) {
                         FelicaFrameReset();
                     } else {
                         //frame invalid, clear it out to allow for the next one
-						FelicaFrameReset();
-					}
-				}
-			}
-		}
-		if (!listenmode) {
-			//trying to answer... here to  start answering immediately.
-			//this one is a bit finicky. Seems that being a bit late is better than earlier
-			//TransmitFor18092_AsReader(curresp, curlen, frtm+512, 0, 0);
-			TransmitFor18092_AsReader(curresp, curlen, NULL, 0, 0);
+                        FelicaFrameReset();
+                    }
+                }
+            }
+        }
+        if (!listenmode) {
+            //trying to answer... here to  start answering immediately.
+            //this one is a bit finicky. Seems that being a bit late is better than earlier
+            //TransmitFor18092_AsReader(curresp, curlen, frtm+512, 0, 0);
+            TransmitFor18092_AsReader(curresp, curlen, NULL, 0, 0);
 
-			//switch back
-			FpgaWriteConfWord(FPGA_MAJOR_MODE_ISO18092 | FPGA_HF_ISO18092_FLAG_NOMOD);
+            //switch back
+            FpgaWriteConfWord(FPGA_MAJOR_MODE_ISO18092 | FPGA_HF_ISO18092_FLAG_NOMOD);
 
-			FelicaFrameReset();
-			listenmode = true;
-			curlen = 0;
-			curresp = NULL;
+            FelicaFrameReset();
+            listenmode = true;
+            curlen = 0;
+            curresp = NULL;
         }
     }
 
     switch_off();
 
-	//reset framing
+    //reset framing
     AT91C_BASE_SSC->SSC_RFMR = SSC_FRAME_MODE_BITS_IN_WORD(8) | AT91C_SSC_MSBF | SSC_FRAME_MODE_WORDS_PER_TRANSFER(0);
 
     DbpString("Felica Lite-S sim end");
@@ -718,80 +718,80 @@ void felica_sim_lite(uint64_t nfcid) {
 
 void felica_dump_lite_s() {
 
-	uint8_t ndef[8];
-	uint8_t poll[10] = { 0xb2,0x4d,0x06,FELICA_POLL_REQ,0xff,0xff,0x00,0x00,0x09,0x21};
-	uint16_t liteblks[28] = {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x90,0x91,0x92,0xa0};
+    uint8_t ndef[8];
+    uint8_t poll[10] = { 0xb2,0x4d,0x06,FELICA_POLL_REQ,0xff,0xff,0x00,0x00,0x09,0x21};
+    uint16_t liteblks[28] = {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x90,0x91,0x92,0xa0};
 
-	// setup device.
-	iso18092_setup(FPGA_HF_ISO18092_FLAG_READER | FPGA_HF_ISO18092_FLAG_NOMOD);
+    // setup device.
+    iso18092_setup(FPGA_HF_ISO18092_FLAG_READER | FPGA_HF_ISO18092_FLAG_NOMOD);
 
-	uint8_t blknum;
-	bool isOK = false;
-	uint16_t cnt = 0, cntfails = 0;
-	uint8_t *dest = BigBuf_get_addr();
+    uint8_t blknum;
+    bool isOK = false;
+    uint16_t cnt = 0, cntfails = 0;
+    uint8_t *dest = BigBuf_get_addr();
 
-	while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
+    while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
 
-		WDT_HIT();
+        WDT_HIT();
 
-		// polling?
-		//TransmitFor18092_AsReader(poll, 10, GetCountSspClk()+512, 1, 0);
-		TransmitFor18092_AsReader(poll, 10, NULL, 1, 0);
+        // polling?
+        //TransmitFor18092_AsReader(poll, 10, GetCountSspClk()+512, 1, 0);
+        TransmitFor18092_AsReader(poll, 10, NULL, 1, 0);
 
-		if (WaitForFelicaReply(512) && FelicaFrame.framebytes[3] == FELICA_POLL_ACK) {
+        if (WaitForFelicaReply(512) && FelicaFrame.framebytes[3] == FELICA_POLL_ACK) {
 
-			// copy 8bytes to ndef.
-			memcpy(ndef, FelicaFrame.framebytes + 4, 8);
-			// for (c=0; c < 8; c++)
-				// ndef[c] = FelicaFrame.framebytes[c+4];
+            // copy 8bytes to ndef.
+            memcpy(ndef, FelicaFrame.framebytes + 4, 8);
+            // for (c=0; c < 8; c++)
+                // ndef[c] = FelicaFrame.framebytes[c+4];
 
-			for (blknum=0; blknum < sizeof(liteblks); ) {
+            for (blknum=0; blknum < sizeof(liteblks); ) {
 
-				// block to read.
-				BuildFliteRdblk(ndef, 1, &liteblks[blknum]);
+                // block to read.
+                BuildFliteRdblk(ndef, 1, &liteblks[blknum]);
 
-				//TransmitFor18092_AsReader(frameSpace, frameSpace[2]+4, GetCountSspClk()+512, 1, 0);
-				TransmitFor18092_AsReader(frameSpace, frameSpace[2]+4, NULL, 1, 0);
+                //TransmitFor18092_AsReader(frameSpace, frameSpace[2]+4, GetCountSspClk()+512, 1, 0);
+                TransmitFor18092_AsReader(frameSpace, frameSpace[2]+4, NULL, 1, 0);
 
-				// read block
-				if (WaitForFelicaReply(1024) && FelicaFrame.framebytes[3] == FELICA_RDBLK_ACK) {
+                // read block
+                if (WaitForFelicaReply(1024) && FelicaFrame.framebytes[3] == FELICA_RDBLK_ACK) {
 
-					dest[cnt++] = liteblks[blknum];
+                    dest[cnt++] = liteblks[blknum];
 
-					uint8_t *fb = FelicaFrame.framebytes;
-					dest[cnt++] = fb[12];
-					dest[cnt++] = fb[13];
+                    uint8_t *fb = FelicaFrame.framebytes;
+                    dest[cnt++] = fb[12];
+                    dest[cnt++] = fb[13];
 
-					//memcpy(dest+cnt, FelicaFrame.framebytes + 15, 16);
-					//cnt += 16;
-					for(uint8_t j=0; j < 16; j++)
-						dest[cnt++] = fb[15+j];
+                    //memcpy(dest+cnt, FelicaFrame.framebytes + 15, 16);
+                    //cnt += 16;
+                    for(uint8_t j=0; j < 16; j++)
+                        dest[cnt++] = fb[15+j];
 
-					blknum++;
-					cntfails = 0;
+                    blknum++;
+                    cntfails = 0;
 
-					// // print raw log.
-					// Dbprintf("LEN %u | Dump bytes count %u ", FelicaFrame.len, cnt);
-					Dbhexdump(FelicaFrame.len, FelicaFrame.framebytes+15, 0);
-				} else {
-					cntfails++;
-					if (cntfails > 12) {
-						blknum++;
-						cntfails = 0;
-					}
-				}
-			}
-			isOK = true;
-			break;
-		}
-	}
+                    // // print raw log.
+                    // Dbprintf("LEN %u | Dump bytes count %u ", FelicaFrame.len, cnt);
+                    Dbhexdump(FelicaFrame.len, FelicaFrame.framebytes+15, 0);
+                } else {
+                    cntfails++;
+                    if (cntfails > 12) {
+                        blknum++;
+                        cntfails = 0;
+                    }
+                }
+            }
+            isOK = true;
+            break;
+        }
+    }
 
-	switch_off();
+    switch_off();
 
-	//Resetting Frame mode (First set in fpgaloader.c)
+    //Resetting Frame mode (First set in fpgaloader.c)
     AT91C_BASE_SSC->SSC_RFMR = SSC_FRAME_MODE_BITS_IN_WORD(8) | AT91C_SSC_MSBF | SSC_FRAME_MODE_WORDS_PER_TRANSFER(0);
 
-	//setting tracelen - important!  it was set by buffer overflow before
+    //setting tracelen - important!  it was set by buffer overflow before
     set_tracelen(cnt);
-	cmd_send(CMD_ACK, isOK, cnt, 0, 0, 0);
+    cmd_send(CMD_ACK, isOK, cnt, 0, 0, 0);
 }
diff --git a/armsrc/flashmem.c b/armsrc/flashmem.c
index c3b7a6e82..1c9304c43 100644
--- a/armsrc/flashmem.c
+++ b/armsrc/flashmem.c
@@ -18,118 +18,118 @@ void FlashmemSetSpiBaudrate(uint32_t baudrate){
    Dbprintf("Spi Baudrate : %dMhz", FLASHMEM_SPIBAUDRATE/1000000);
 }
 
-//	initialize
+// initialize
 bool FlashInit() {
-	FlashSetup(FLASHMEM_SPIBAUDRATE);
+    FlashSetup(FLASHMEM_SPIBAUDRATE);
 
-	StartTicks();
+    StartTicks();
 
-	if (Flash_CheckBusy(BUSY_TIMEOUT)) {
-		StopTicks();
-		return false;
-	}
+    if (Flash_CheckBusy(BUSY_TIMEOUT)) {
+        StopTicks();
+        return false;
+    }
 
-	return true;
+    return true;
 }
 
 void FlashSetup(uint32_t baudrate){
    //WDT_DISABLE
     AT91C_BASE_WDTC->WDTC_WDMR = AT91C_WDTC_WDDIS;
 
-	// PA10 -> SPI_NCS2 chip select (FLASHMEM)
-	// PA11 -> SPI_NCS0 chip select (FPGA)
-	// PA12 -> SPI_MISO Master-In Slave-Out
-	// PA13 -> SPI_MOSI Master-Out Slave-In
-	// PA14 -> SPI_SPCK Serial Clock
+    // PA10 -> SPI_NCS2 chip select (FLASHMEM)
+    // PA11 -> SPI_NCS0 chip select (FPGA)
+    // PA12 -> SPI_MISO Master-In Slave-Out
+    // PA13 -> SPI_MOSI Master-Out Slave-In
+    // PA14 -> SPI_SPCK Serial Clock
 
-	// Disable PIO control of the following pins, allows use by the SPI peripheral
-	AT91C_BASE_PIOA->PIO_PDR |= (GPIO_NCS0 | GPIO_MISO | GPIO_MOSI | GPIO_SPCK | GPIO_NCS2);
+    // Disable PIO control of the following pins, allows use by the SPI peripheral
+    AT91C_BASE_PIOA->PIO_PDR |= (GPIO_NCS0 | GPIO_MISO | GPIO_MOSI | GPIO_SPCK | GPIO_NCS2);
 
-	//	Pull-up Enable
-	AT91C_BASE_PIOA->PIO_PPUER |= (GPIO_NCS0 | GPIO_MISO | GPIO_MOSI | GPIO_SPCK | GPIO_NCS2);
+    // Pull-up Enable
+    AT91C_BASE_PIOA->PIO_PPUER |= (GPIO_NCS0 | GPIO_MISO | GPIO_MOSI | GPIO_SPCK | GPIO_NCS2);
 
-	// Peripheral A
-	AT91C_BASE_PIOA->PIO_ASR |= (GPIO_NCS0 | GPIO_MISO | GPIO_MOSI | GPIO_SPCK);
+    // Peripheral A
+    AT91C_BASE_PIOA->PIO_ASR |= (GPIO_NCS0 | GPIO_MISO | GPIO_MOSI | GPIO_SPCK);
 
-	// Peripheral B
-	AT91C_BASE_PIOA->PIO_BSR |= GPIO_NCS2;
+    // Peripheral B
+    AT91C_BASE_PIOA->PIO_BSR |= GPIO_NCS2;
 
-	//enable the SPI Peripheral clock
-	AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_SPI);
+    //enable the SPI Peripheral clock
+    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_SPI);
 
 
-	//reset spi needs double SWRST, see atmel's errata on this case
-	AT91C_BASE_SPI->SPI_CR = AT91C_SPI_SWRST;
-	AT91C_BASE_SPI->SPI_CR = AT91C_SPI_SWRST;
+    //reset spi needs double SWRST, see atmel's errata on this case
+    AT91C_BASE_SPI->SPI_CR = AT91C_SPI_SWRST;
+    AT91C_BASE_SPI->SPI_CR = AT91C_SPI_SWRST;
 
-	// Enable SPI
-	AT91C_BASE_SPI->SPI_CR = AT91C_SPI_SPIEN;
+    // Enable SPI
+    AT91C_BASE_SPI->SPI_CR = AT91C_SPI_SPIEN;
 
-	//	NPCS2 Mode 0
-	AT91C_BASE_SPI->SPI_MR =
-		(0 << 24)	|		// Delay between chip selects = DYLBCS/MCK BUT:
-		                    // If DLYBCS is less than or equal to six, six MCK periods
-		            	    // will be inserted by default.
-		SPI_PCS(SPI_CSR_NUM) | 		// Peripheral Chip Select (selects SPI_NCS2 or PA10)
-		( 0 << 7)	|		// Disable LLB (1=MOSI2MISO test mode)
-		( 1 << 4)	|		// Disable ModeFault Protection
-		( 0 << 3)  |        // makes spi operate at MCK (1 is MCK/2)
- 		( 0 << 2)	|		// Chip selects connected directly to peripheral
-		AT91C_SPI_PS_FIXED 	|		// Fixed Peripheral Select
-		AT91C_SPI_MSTR;			// Master Mode
+    // NPCS2 Mode 0
+    AT91C_BASE_SPI->SPI_MR =
+        (0 << 24)            | // Delay between chip selects = DYLBCS/MCK BUT:
+                               // If DLYBCS is less than or equal to six, six MCK periods
+                               // will be inserted by default.
+        SPI_PCS(SPI_CSR_NUM) | // Peripheral Chip Select (selects SPI_NCS2 or PA10)
+        ( 0 << 7)            | // Disable LLB (1=MOSI2MISO test mode)
+        ( 1 << 4)            | // Disable ModeFault Protection
+        ( 0 << 3)            | // makes spi operate at MCK (1 is MCK/2)
+        ( 0 << 2)            | // Chip selects connected directly to peripheral
+        AT91C_SPI_PS_FIXED   | // Fixed Peripheral Select
+        AT91C_SPI_MSTR;        // Master Mode
 
-	uint8_t csaat = 1;
-	uint32_t dlybct = 0;
+    uint8_t csaat = 1;
+    uint32_t dlybct = 0;
     if (baudrate > FLASH_MINFAST) {
-		baudrate = 	FLASH_FASTBAUD;
-		//csaat = 0;
-		dlybct = 1500;
-	}
+        baudrate = FLASH_FASTBAUD;
+        //csaat = 0;
+        dlybct = 1500;
+    }
 
-	AT91C_BASE_SPI->SPI_CSR[2] =
-        SPI_DLYBCT(dlybct,MCK)		| // Delay between Consecutive Transfers (32 MCK periods)
-		SPI_DLYBS(0,MCK)		| // Delay Beforce SPCK CLock
-		SPI_SCBR(baudrate,MCK)	| // SPI Baudrate Selection
-		AT91C_SPI_BITS_8		|	  // Bits per Transfer (8 bits)
-		//AT91C_SPI_CSAAT	|	// Chip Select inactive after transfer
-							// 40.4.6.2 SPI: Bad tx_ready Behavior when CSAAT = 1 and SCBR = 1
-							// If the SPI is programmed with CSAAT = 1, SCBR(baudrate) = 1 and two transfers are performed consecutively on
-							// the same slave with an IDLE state between them, the tx_ready signal does not rise after the second data has been
-							// transferred in the shifter. This can imply for example, that the second data is sent twice.
-							// COLIN :: For now we STILL use CSAAT=1 to avoid having to (de)assert  NPCS manually via PIO lines and we deal with delay
-		( csaat << 3) |
-		/* Spi modes:
-			Mode 	CPOL 	CPHA  NCPHA
-			0 	0 	0     1       clock normally low    read on rising edge
-			1 	0 	1     0       clock normally low    read on falling edge
-			2 	1 	0     1       clock normally high   read on falling edge
-			3 	1 	1     0       clock normally high   read on rising edge
-			However, page 512 of the AT91SAM7Sx datasheet say "Note that in SPI
-			master mode the ATSAM7S512/256/128/64/321/32 does not sample the data
-			(MISO) on the opposite edge where data clocks out (MOSI) but the same
-			edge is used as shown in Figure 36-3 and Figure 36-4."  Figure 36-3
-			shows that CPOL=NCPHA=0 or CPOL=NCPHA=1 samples on the rising edge and
-			that the data changes sometime after the rising edge (about 2 ns).  To
-			be consistent with normal SPI operation, it is probably safe to say
-			that the data changes on the falling edge and should be sampled on the
-			rising edge.  Therefore, it appears that NCPHA should be treated the
-			same as CPHA.  Thus:
-			Mode	CPOL	CPHA	NCPHA
-			0	0	0     0       clock normally low    read on rising edge
-			1	0 	1     1       clock normally low    read on falling edge
-			2	1 	0     0       clock normally high   read on falling edge
-			3	1 	1     1       clock normally high   read on rising edge
-		*/
-		( 0 << 1)	|		// Clock Phase data captured on leading edge, changes on following edge
-		( 0 << 0);			// Clock Polarity inactive state is logic 0
+    AT91C_BASE_SPI->SPI_CSR[2] =
+        SPI_DLYBCT(dlybct,MCK)| // Delay between Consecutive Transfers (32 MCK periods)
+        SPI_DLYBS(0,MCK)      | // Delay Beforce SPCK CLock
+        SPI_SCBR(baudrate,MCK)| // SPI Baudrate Selection
+        AT91C_SPI_BITS_8      | // Bits per Transfer (8 bits)
+        //AT91C_SPI_CSAAT       | // Chip Select inactive after transfer
+                            // 40.4.6.2 SPI: Bad tx_ready Behavior when CSAAT = 1 and SCBR = 1
+                            // If the SPI is programmed with CSAAT = 1, SCBR(baudrate) = 1 and two transfers are performed consecutively on
+                            // the same slave with an IDLE state between them, the tx_ready signal does not rise after the second data has been
+                            // transferred in the shifter. This can imply for example, that the second data is sent twice.
+                            // COLIN :: For now we STILL use CSAAT=1 to avoid having to (de)assert  NPCS manually via PIO lines and we deal with delay
+        ( csaat << 3)         |
+        /* Spi modes:
+            Mode CPOL CPHA NCPHA
+            0    0    0    1       clock normally low    read on rising edge
+            1    0    1    0       clock normally low    read on falling edge
+            2    1    0    1       clock normally high   read on falling edge
+            3    1    1    0       clock normally high   read on rising edge
+            However, page 512 of the AT91SAM7Sx datasheet say "Note that in SPI
+            master mode the ATSAM7S512/256/128/64/321/32 does not sample the data
+            (MISO) on the opposite edge where data clocks out (MOSI) but the same
+            edge is used as shown in Figure 36-3 and Figure 36-4."  Figure 36-3
+            shows that CPOL=NCPHA=0 or CPOL=NCPHA=1 samples on the rising edge and
+            that the data changes sometime after the rising edge (about 2 ns).  To
+            be consistent with normal SPI operation, it is probably safe to say
+            that the data changes on the falling edge and should be sampled on the
+            rising edge.  Therefore, it appears that NCPHA should be treated the
+            same as CPHA.  Thus:
+            Mode CPOL CPHA NCPHA
+            0    0    0    0       clock normally low    read on rising edge
+            1    0    1    1       clock normally low    read on falling edge
+            2    1    0    0       clock normally high   read on falling edge
+            3    1    1    1       clock normally high   read on rising edge
+        */
+        ( 0 << 1)             | // Clock Phase data captured on leading edge, changes on following edge
+        ( 0 << 0);              // Clock Polarity inactive state is logic 0
 
-	//	read first, empty buffer
-	if (AT91C_BASE_SPI->SPI_RDR == 0) {};
+    // read first, empty buffer
+    if (AT91C_BASE_SPI->SPI_RDR == 0) {};
 }
 
 void FlashStop(void) {
-	//Bof
-	//* Reset all the Chip Select register
+    //Bof
+    //* Reset all the Chip Select register
     AT91C_BASE_SPI->SPI_CSR[0] = 0;
     AT91C_BASE_SPI->SPI_CSR[1] = 0;
     AT91C_BASE_SPI->SPI_CSR[2] = 0;
@@ -141,164 +141,164 @@ void FlashStop(void) {
     // Disable all interrupts
     AT91C_BASE_SPI->SPI_IDR = 0xFFFFFFFF;
 
-	// SPI disable
-	AT91C_BASE_SPI->SPI_CR = AT91C_SPI_SPIDIS;
+    // SPI disable
+    AT91C_BASE_SPI->SPI_CR = AT91C_SPI_SPIDIS;
 
-	if ( MF_DBGLEVEL > 3 ) Dbprintf("FlashStop");
+    if ( MF_DBGLEVEL > 3 ) Dbprintf("FlashStop");
 
-	StopTicks();
+    StopTicks();
 }
 
-//	send one byte over SPI
+// send one byte over SPI
 uint16_t FlashSendByte(uint32_t data) {
 
-	// wait until SPI is ready for transfer
-	//if you are checking for incoming data returned then the TXEMPTY flag is redundant
-	//while ((AT91C_BASE_SPI->SPI_SR & AT91C_SPI_TXEMPTY) == 0) {};
+    // wait until SPI is ready for transfer
+    //if you are checking for incoming data returned then the TXEMPTY flag is redundant
+    //while ((AT91C_BASE_SPI->SPI_SR & AT91C_SPI_TXEMPTY) == 0) {};
 
-	// send the data
-	AT91C_BASE_SPI->SPI_TDR = data;
+    // send the data
+    AT91C_BASE_SPI->SPI_TDR = data;
 
     //while ((AT91C_BASE_SPI->SPI_SR & AT91C_SPI_TDRE) == 0){};
 
-	// wait recive transfer is complete
-	while ((AT91C_BASE_SPI->SPI_SR & AT91C_SPI_RDRF) == 0){};
+    // wait recive transfer is complete
+    while ((AT91C_BASE_SPI->SPI_SR & AT91C_SPI_RDRF) == 0){};
 
-	// reading incoming data
-	return ((AT91C_BASE_SPI->SPI_RDR) & 0xFFFF);
+    // reading incoming data
+    return ((AT91C_BASE_SPI->SPI_RDR) & 0xFFFF);
 }
 
-//	send last byte over SPI
+// send last byte over SPI
 uint16_t FlashSendLastByte(uint32_t data) {
-	return FlashSendByte(data | AT91C_SPI_LASTXFER);
+    return FlashSendByte(data | AT91C_SPI_LASTXFER);
 }
 
-//	read state register 1
+// read state register 1
 uint8_t Flash_ReadStat1(void) {
-	FlashSendByte(READSTAT1);
-	return FlashSendLastByte(0xFF);
+    FlashSendByte(READSTAT1);
+    return FlashSendLastByte(0xFF);
 }
 
 bool Flash_CheckBusy(uint32_t timeout)
 {
-	WaitUS(WINBOND_WRITE_DELAY);
-	StartCountUS();
-	uint32_t _time = GetCountUS();
+    WaitUS(WINBOND_WRITE_DELAY);
+    StartCountUS();
+    uint32_t _time = GetCountUS();
 
-	if ( MF_DBGLEVEL > 3 ) Dbprintf("Checkbusy in...");
+    if ( MF_DBGLEVEL > 3 ) Dbprintf("Checkbusy in...");
 
-	do
-	{
-		if (!(Flash_ReadStat1() & BUSY))
-		{
-			return false;
-		}
-	} while ((GetCountUS() - _time) < timeout);
+    do
+    {
+        if (!(Flash_ReadStat1() & BUSY))
+        {
+            return false;
+        }
+    } while ((GetCountUS() - _time) < timeout);
 
-	if (timeout <= (GetCountUS() - _time))
-	{
-		return true;
-	}
+    if (timeout <= (GetCountUS() - _time))
+    {
+        return true;
+    }
 
-	return false;
+    return false;
 }
 
 // read ID out
 uint8_t Flash_ReadID(void) {
 
-	if (Flash_CheckBusy(BUSY_TIMEOUT)) return 0;
+    if (Flash_CheckBusy(BUSY_TIMEOUT)) return 0;
 
-	// Manufacture ID / device ID
-	FlashSendByte(ID);
-	FlashSendByte(0x00);
-	FlashSendByte(0x00);
-	FlashSendByte(0x00);
+    // Manufacture ID / device ID
+    FlashSendByte(ID);
+    FlashSendByte(0x00);
+    FlashSendByte(0x00);
+    FlashSendByte(0x00);
 
     uint8_t man_id = FlashSendByte(0xFF);
-	uint8_t dev_id = FlashSendLastByte(0xFF);
+    uint8_t dev_id = FlashSendLastByte(0xFF);
 
-	if ( MF_DBGLEVEL > 3 ) Dbprintf("Flash ReadID  |  Man ID %02x | Device ID %02x", man_id, dev_id);
+    if ( MF_DBGLEVEL > 3 ) Dbprintf("Flash ReadID  |  Man ID %02x | Device ID %02x", man_id, dev_id);
 
-	if ( (man_id == WINBOND_MANID ) && (dev_id == WINBOND_DEVID) )
-		return dev_id;
+    if ( (man_id == WINBOND_MANID ) && (dev_id == WINBOND_DEVID) )
+        return dev_id;
 
-	return 0;
+    return 0;
 }
 
 // read unique id for chip.
 void Flash_UniqueID(uint8_t *uid) {
 
-	if (Flash_CheckBusy(BUSY_TIMEOUT)) return;
+    if (Flash_CheckBusy(BUSY_TIMEOUT)) return;
 
-	// reading unique serial number
-	FlashSendByte(UNIQUE_ID);
-	FlashSendByte(0xFF);
-	FlashSendByte(0xFF);
-	FlashSendByte(0xFF);
-	FlashSendByte(0xFF);
+    // reading unique serial number
+    FlashSendByte(UNIQUE_ID);
+    FlashSendByte(0xFF);
+    FlashSendByte(0xFF);
+    FlashSendByte(0xFF);
+    FlashSendByte(0xFF);
 
-	uid[7] = FlashSendByte(0xFF);
-	uid[6] = FlashSendByte(0xFF);
-	uid[5] = FlashSendByte(0xFF);
-	uid[4] = FlashSendByte(0xFF);
+    uid[7] = FlashSendByte(0xFF);
+    uid[6] = FlashSendByte(0xFF);
+    uid[5] = FlashSendByte(0xFF);
+    uid[4] = FlashSendByte(0xFF);
     uid[3] = FlashSendByte(0xFF);
-	uid[2] = FlashSendByte(0xFF);
-	uid[1] = FlashSendByte(0xFF);
-	uid[0] = FlashSendLastByte(0xFF);
+    uid[2] = FlashSendByte(0xFF);
+    uid[1] = FlashSendByte(0xFF);
+    uid[0] = FlashSendLastByte(0xFF);
 }
 
 uint16_t Flash_ReadData(uint32_t address, uint8_t *out, uint16_t len) {
 
-	if (!FlashInit()) return 0;
+    if (!FlashInit()) return 0;
 
-	// length should never be zero
-	if (!len || Flash_CheckBusy(BUSY_TIMEOUT)) return 0;
+    // length should never be zero
+    if (!len || Flash_CheckBusy(BUSY_TIMEOUT)) return 0;
 
     uint8_t cmd = (FASTFLASH) ? FASTREAD : READDATA;
 
-	FlashSendByte(cmd);
-	Flash_TransferAdresse(address);
+    FlashSendByte(cmd);
+    Flash_TransferAdresse(address);
 
-	if (FASTFLASH){
-		FlashSendByte(DUMMYBYTE);
-	}
+    if (FASTFLASH){
+        FlashSendByte(DUMMYBYTE);
+    }
 
-	uint16_t i = 0;
-	for (; i < (len - 1); i++)
-		out[i] = FlashSendByte(0xFF);
+    uint16_t i = 0;
+    for (; i < (len - 1); i++)
+        out[i] = FlashSendByte(0xFF);
 
-	out[i] = FlashSendLastByte(0xFF);
-	FlashStop();
-	return len;
+    out[i] = FlashSendLastByte(0xFF);
+    FlashStop();
+    return len;
 }
 
 void Flash_TransferAdresse(uint32_t address){
-	FlashSendByte((address >> 16) & 	0xFF);
-	FlashSendByte((address >> 8) & 0xFF);
-	FlashSendByte((address >> 0) & 0xFF);
+    FlashSendByte((address >> 16) & 0xFF);
+    FlashSendByte((address >> 8) & 0xFF);
+    FlashSendByte((address >> 0) & 0xFF);
 }
 
 /* This ensure we can ReadData without having to cycle through initialization everytime */
 uint16_t Flash_ReadDataCont(uint32_t address, uint8_t *out, uint16_t len) {
 
-	// length should never be zero
-	if (!len) return 0;
+    // length should never be zero
+    if (!len) return 0;
 
     uint8_t cmd = (FASTFLASH) ? FASTREAD : READDATA;
 
-	FlashSendByte(cmd);
-	Flash_TransferAdresse(address);
+    FlashSendByte(cmd);
+    Flash_TransferAdresse(address);
 
     if (FASTFLASH){
-		FlashSendByte(DUMMYBYTE);
-	}
+        FlashSendByte(DUMMYBYTE);
+    }
 
-	uint16_t i = 0;
-	for (; i < (len - 1); i++)
-		out[i] = FlashSendByte(0xFF);
+    uint16_t i = 0;
+    for (; i < (len - 1); i++)
+        out[i] = FlashSendByte(0xFF);
 
-	out[i] = FlashSendLastByte(0xFF);
-	return len;
+    out[i] = FlashSendLastByte(0xFF);
+    return len;
 }
 
 
@@ -307,89 +307,89 @@ uint16_t Flash_ReadDataCont(uint32_t address, uint8_t *out, uint16_t len) {
 // if len > 256, it might wrap around and overwrite pos 0.
 uint16_t Flash_WriteData(uint32_t address, uint8_t *in, uint16_t len) {
 
-	// length should never be zero
-	if (!len)
-		return 0;
+    // length should never be zero
+    if (!len)
+        return 0;
 
-	//	Max 256 bytes write
-	if (((address & 0xFF) + len) > 256) {
-		Dbprintf("Flash_WriteData 256 fail [ 0x%02x ] [ %u ]", (address & 0xFF)+len, len );
-		return 0;
-	}
+    // Max 256 bytes write
+    if (((address & 0xFF) + len) > 256) {
+        Dbprintf("Flash_WriteData 256 fail [ 0x%02x ] [ %u ]", (address & 0xFF)+len, len );
+        return 0;
+    }
 
-	// out-of-range
-	if ( (( address >> 16 ) & 0xFF ) > MAX_BLOCKS) {
-		Dbprintf("Flash_WriteData,  block out-of-range");
-		return 0;
-	}
+    // out-of-range
+    if ( (( address >> 16 ) & 0xFF ) > MAX_BLOCKS) {
+        Dbprintf("Flash_WriteData,  block out-of-range");
+        return 0;
+    }
 
-	if (!FlashInit()) {
-		if ( MF_DBGLEVEL > 3 ) Dbprintf("Flash_WriteData init fail");
-		return 0;
-	}
+    if (!FlashInit()) {
+        if ( MF_DBGLEVEL > 3 ) Dbprintf("Flash_WriteData init fail");
+        return 0;
+    }
 
-	Flash_CheckBusy(BUSY_TIMEOUT);
+    Flash_CheckBusy(BUSY_TIMEOUT);
 
-	Flash_WriteEnable();
+    Flash_WriteEnable();
 
-	FlashSendByte(PAGEPROG);
-	FlashSendByte((address >> 16) & 0xFF);
-	FlashSendByte((address >> 8) & 0xFF);
-	FlashSendByte((address >> 0) & 0xFF);
+    FlashSendByte(PAGEPROG);
+    FlashSendByte((address >> 16) & 0xFF);
+    FlashSendByte((address >> 8) & 0xFF);
+    FlashSendByte((address >> 0) & 0xFF);
 
-	uint16_t i = 0;
-	for (; i < (len - 1); i++)
-		FlashSendByte(in[i]);
+    uint16_t i = 0;
+    for (; i < (len - 1); i++)
+        FlashSendByte(in[i]);
 
-	FlashSendLastByte(in[i]);
+    FlashSendLastByte(in[i]);
 
-	FlashStop();
-	return len;
+    FlashStop();
+    return len;
 }
 
 
 // length should never be zero
-//	Max 256 bytes write
+// Max 256 bytes write
 // out-of-range
 uint16_t Flash_WriteDataCont(uint32_t address, uint8_t *in, uint16_t len) {
 
-	if (!len)
-		return 0;
+    if (!len)
+        return 0;
 
-	if (((address & 0xFF) + len) > 256) {
-		Dbprintf("Flash_WriteDataCont 256 fail [ 0x%02x ] [ %u ]", (address & 0xFF)+len, len );
-		return 0;
-	}
+    if (((address & 0xFF) + len) > 256) {
+        Dbprintf("Flash_WriteDataCont 256 fail [ 0x%02x ] [ %u ]", (address & 0xFF)+len, len );
+        return 0;
+    }
 
-	if ( (( address >> 16 ) & 0xFF ) > MAX_BLOCKS) {
-		Dbprintf("Flash_WriteDataCont,  block out-of-range");
-		return 0;
-	}
+    if ( (( address >> 16 ) & 0xFF ) > MAX_BLOCKS) {
+        Dbprintf("Flash_WriteDataCont,  block out-of-range");
+        return 0;
+    }
 
-	FlashSendByte(PAGEPROG);
-	FlashSendByte((address >> 16) & 0xFF);
-	FlashSendByte((address >> 8) & 0xFF);
-	FlashSendByte((address >> 0) & 0xFF);
+    FlashSendByte(PAGEPROG);
+    FlashSendByte((address >> 16) & 0xFF);
+    FlashSendByte((address >> 8) & 0xFF);
+    FlashSendByte((address >> 0) & 0xFF);
 
-	uint16_t i = 0;
-	for (; i < (len - 1); i++)
-		FlashSendByte(in[i]);
+    uint16_t i = 0;
+    for (; i < (len - 1); i++)
+        FlashSendByte(in[i]);
 
-	FlashSendLastByte(in[i]);
-	return len;
+    FlashSendLastByte(in[i]);
+    return len;
 }
 
 // assumes valid start 256 based 00 address
 //
 uint16_t Flash_Write(uint32_t address, uint8_t *in, uint16_t len) {
 
-	bool isok;
-	uint16_t res, bytes_sent = 0, bytes_remaining = len;
+    bool isok;
+    uint16_t res, bytes_sent = 0, bytes_remaining = len;
     uint8_t buf[FLASH_MEM_BLOCK_SIZE];
     while (bytes_remaining > 0) {
 
-		Flash_CheckBusy(BUSY_TIMEOUT);
-		Flash_WriteEnable();
+        Flash_CheckBusy(BUSY_TIMEOUT);
+        Flash_WriteEnable();
 
         uint32_t bytes_in_packet = MIN(FLASH_MEM_BLOCK_SIZE, bytes_remaining);
 
@@ -397,85 +397,85 @@ uint16_t Flash_Write(uint32_t address, uint8_t *in, uint16_t len) {
 
         res = Flash_WriteDataCont(address + bytes_sent, buf, bytes_in_packet);
 
-		bytes_remaining -= bytes_in_packet;
+        bytes_remaining -= bytes_in_packet;
         bytes_sent += bytes_in_packet;
 
         isok = (res == bytes_in_packet);
 
         if (!isok)
-			goto out;
+            goto out;
     }
 
 out:
-	FlashStop();
-	return len;
+    FlashStop();
+    return len;
 }
 
 
 bool Flash_WipeMemoryPage(uint8_t page) {
-	if (!FlashInit()) {
-		if ( MF_DBGLEVEL > 3 ) Dbprintf("Flash_WriteData init fail");
-		return false;
-	}
-	Flash_ReadStat1();
+    if (!FlashInit()) {
+        if ( MF_DBGLEVEL > 3 ) Dbprintf("Flash_WriteData init fail");
+        return false;
+    }
+    Flash_ReadStat1();
 
-	// Each block is 64Kb. One block erase takes 1s ( 1000ms )
-	Flash_WriteEnable(); Flash_Erase64k(page); Flash_CheckBusy(BUSY_TIMEOUT);
+    // Each block is 64Kb. One block erase takes 1s ( 1000ms )
+    Flash_WriteEnable(); Flash_Erase64k(page); Flash_CheckBusy(BUSY_TIMEOUT);
 
-	FlashStop();
-	return true;
+    FlashStop();
+    return true;
 }
 // Wipes flash memory completely, fills with 0xFF
 bool Flash_WipeMemory() {
-	if (!FlashInit()) {
-		if ( MF_DBGLEVEL > 3 ) Dbprintf("Flash_WriteData init fail");
-		return false;
-	}
-	Flash_ReadStat1();
+    if (!FlashInit()) {
+        if ( MF_DBGLEVEL > 3 ) Dbprintf("Flash_WriteData init fail");
+        return false;
+    }
+    Flash_ReadStat1();
 
-	// Each block is 64Kb.  Four blocks
-	// one block erase takes 1s ( 1000ms )
-	Flash_WriteEnable(); Flash_Erase64k(0); Flash_CheckBusy(BUSY_TIMEOUT);
-	Flash_WriteEnable(); Flash_Erase64k(1); Flash_CheckBusy(BUSY_TIMEOUT);
-	Flash_WriteEnable(); Flash_Erase64k(2); Flash_CheckBusy(BUSY_TIMEOUT);
-	Flash_WriteEnable(); Flash_Erase64k(3); Flash_CheckBusy(BUSY_TIMEOUT);
+    // Each block is 64Kb.  Four blocks
+    // one block erase takes 1s ( 1000ms )
+    Flash_WriteEnable(); Flash_Erase64k(0); Flash_CheckBusy(BUSY_TIMEOUT);
+    Flash_WriteEnable(); Flash_Erase64k(1); Flash_CheckBusy(BUSY_TIMEOUT);
+    Flash_WriteEnable(); Flash_Erase64k(2); Flash_CheckBusy(BUSY_TIMEOUT);
+    Flash_WriteEnable(); Flash_Erase64k(3); Flash_CheckBusy(BUSY_TIMEOUT);
 
-	FlashStop();
-	return true;
+    FlashStop();
+    return true;
 }
 
-//	enable the flash write
+// enable the flash write
 void Flash_WriteEnable() {
-	FlashSendLastByte(WRITEENABLE);
-	if ( MF_DBGLEVEL > 3 ) Dbprintf("Flash Write enabled");
+    FlashSendLastByte(WRITEENABLE);
+    if ( MF_DBGLEVEL > 3 ) Dbprintf("Flash Write enabled");
 }
 
-//	erase 4K at one time
+// erase 4K at one time
 // execution time: 0.8ms / 800us
 bool Flash_Erase4k(uint8_t block, uint8_t sector) {
 
-	if (block > MAX_BLOCKS  || sector > MAX_SECTORS) return false;
+    if (block > MAX_BLOCKS  || sector > MAX_SECTORS) return false;
 
-	FlashSendByte(SECTORERASE);
-	FlashSendByte(block);
-	FlashSendByte(sector << 4);
-	FlashSendLastByte(00);
-	return true;
+    FlashSendByte(SECTORERASE);
+    FlashSendByte(block);
+    FlashSendByte(sector << 4);
+    FlashSendLastByte(00);
+    return true;
 }
 
 /*
-//	erase 32K at one time
+// erase 32K at one time
 // execution time: 0,3s / 300ms
 bool Flash_Erase32k(uint32_t address) {
-	if (address & (32*1024 - 1)) {
-		if ( MF_DBGLEVEL > 1 ) Dbprintf("Flash_Erase32k : Address is not align at 4096");
-		return false;
-	}
-	FlashSendByte(BLOCK32ERASE);
-	FlashSendByte((address >> 16) & 0xFF);
-	FlashSendByte((address >> 8) & 0xFF);
-	FlashSendLastByte((address >> 0) & 0xFF);
-	return true;
+    if (address & (32*1024 - 1)) {
+        if ( MF_DBGLEVEL > 1 ) Dbprintf("Flash_Erase32k : Address is not align at 4096");
+        return false;
+    }
+    FlashSendByte(BLOCK32ERASE);
+    FlashSendByte((address >> 16) & 0xFF);
+    FlashSendByte((address >> 8) & 0xFF);
+    FlashSendLastByte((address >> 0) & 0xFF);
+    return true;
 }
 */
 
@@ -489,52 +489,52 @@ bool Flash_Erase32k(uint32_t address) {
 // 0x03 00 00  -- 0x 03 FF FF  == block 3
 bool Flash_Erase64k(uint8_t block) {
 
-	if (block > MAX_BLOCKS) return false;
+    if (block > MAX_BLOCKS) return false;
 
-	FlashSendByte(BLOCK64ERASE);
-	FlashSendByte(block);
-	FlashSendByte(0x00);
-	FlashSendLastByte(0x00);
-	return true;
+    FlashSendByte(BLOCK64ERASE);
+    FlashSendByte(block);
+    FlashSendByte(0x00);
+    FlashSendLastByte(0x00);
+    return true;
 }
 
-//	Erase chip
+// Erase chip
 void Flash_EraseChip(void) {
-	FlashSendLastByte(CHIPERASE);
+    FlashSendLastByte(CHIPERASE);
 }
 
 void Flashmem_print_status(void) {
-	DbpString("Flash memory");
-	Dbprintf("  Baudrate................%dMHz",FLASHMEM_SPIBAUDRATE/1000000);
+    DbpString("Flash memory");
+    Dbprintf("  Baudrate................%dMHz",FLASHMEM_SPIBAUDRATE/1000000);
 
-	if (!FlashInit()) {
-		DbpString("  Init....................FAIL");
-		return;
-	}
-	DbpString("  Init....................OK");
+    if (!FlashInit()) {
+        DbpString("  Init....................FAIL");
+        return;
+    }
+    DbpString("  Init....................OK");
 
-	uint8_t dev_id = Flash_ReadID();
-	switch (dev_id) {
-		case 0x11 :
-			DbpString("  Memory size.............2 mbits / 256kb");
-			break;
-		case 0x10 :
-			DbpString("  Memory size..... .......1 mbits / 128kb");
-			break;
-		case 0x05 :
-			DbpString("  Memory size.............512 kbits / 64kb");
-			break;
-		default :
-			DbpString("  Device ID............... -->  Unknown  <--");
-			break;
-	}
+    uint8_t dev_id = Flash_ReadID();
+    switch (dev_id) {
+        case 0x11 :
+            DbpString("  Memory size.............2 mbits / 256kb");
+            break;
+        case 0x10 :
+            DbpString("  Memory size..... .......1 mbits / 128kb");
+            break;
+        case 0x05 :
+            DbpString("  Memory size.............512 kbits / 64kb");
+            break;
+        default :
+            DbpString("  Device ID............... -->  Unknown  <--");
+            break;
+    }
 
-	uint8_t uid[8] = {0,0,0,0,0,0,0,0};
-	Flash_UniqueID(uid);
-	Dbprintf("  Unique ID...............0x%02x%02x%02x%02x%02x%02x%02x%02x",
-			uid[7], uid[6], uid[5], uid[4],
-			uid[3], uid[2], uid[1], uid[0]
-	);
+    uint8_t uid[8] = {0,0,0,0,0,0,0,0};
+    Flash_UniqueID(uid);
+    Dbprintf("  Unique ID...............0x%02x%02x%02x%02x%02x%02x%02x%02x",
+            uid[7], uid[6], uid[5], uid[4],
+            uid[3], uid[2], uid[1], uid[0]
+    );
 
-	FlashStop();
+    FlashStop();
 }
diff --git a/armsrc/flashmem.h b/armsrc/flashmem.h
index da81363c0..4af499d3a 100644
--- a/armsrc/flashmem.h
+++ b/armsrc/flashmem.h
@@ -23,7 +23,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~//
-//						Common Instructions 						  //
+//                      Common Instructions                           //
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~//
 #ifndef __FLASHMEM_H
 #define __FLASHMEM_H
@@ -32,74 +32,74 @@
 #include "apps.h"
 #include "ticks.h"
 
-//	Used Command
-#define ID				0x90
-#define	MANID			0x90
-#define JEDECID			0x9F
+//    Used Command
+#define ID              0x90
+#define MANID           0x90
+#define JEDECID         0x9F
 
-#define READSTAT1		0x05
-#define READSTAT2		0x35
-#define WRITESTAT		0x01
+#define READSTAT1       0x05
+#define READSTAT2       0x35
+#define WRITESTAT       0x01
 
-#define WRITEDISABLE	0x04
-#define WRITEENABLE		0x06
+#define WRITEDISABLE    0x04
+#define WRITEENABLE     0x06
 
-#define READDATA		0x03
-#define FASTREAD		0x0B
-#define PAGEPROG		0x02
+#define READDATA        0x03
+#define FASTREAD        0x0B
+#define PAGEPROG        0x02
 
-#define SECTORERASE		0x20
-#define BLOCK32ERASE	0x52
-#define BLOCK64ERASE	0xD8
-#define CHIPERASE		0xC7
+#define SECTORERASE     0x20
+#define BLOCK32ERASE    0x52
+#define BLOCK64ERASE    0xD8
+#define CHIPERASE       0xC7
 
-#define UNIQUE_ID		0x4B
+#define UNIQUE_ID       0x4B
 
-//	Not used or not support command
-#define RELEASE			0xAB
-#define POWERDOWN		0xB9
-#define SUSPEND			0x75
-#define RESUME			0x7A
+//    Not used or not support command
+#define RELEASE         0xAB
+#define POWERDOWN       0xB9
+#define SUSPEND         0x75
+#define RESUME          0x7A
 
-#define BUSY_TIMEOUT  1000000000L
+#define BUSY_TIMEOUT    1000000000L
 
-#define WINBOND_MANID	0xEF
-#define WINBOND_DEVID	0x11
-#define PAGESIZE	 	0x100
+#define WINBOND_MANID   0xEF
+#define WINBOND_DEVID   0x11
+#define PAGESIZE        0x100
 #define WINBOND_WRITE_DELAY 0x02
 
-#define SPI_CLK       48000000
+#define SPI_CLK         48000000
 
-#define BUSY          0x01
-#define WRTEN         0x02
-#define SUS           0x40
+#define BUSY            0x01
+#define WRTEN           0x02
+#define SUS             0x40
 
-#define DUMMYBYTE     0xEE
-#define NULLBYTE      0x00
-#define NULLINT       0x0000
-#define NO_CONTINUE   0x00
-#define PASS          0x01
-#define FAIL          0x00
-#define maxAddress    capacity
+#define DUMMYBYTE       0xEE
+#define NULLBYTE        0x00
+#define NULLINT         0x0000
+#define NO_CONTINUE     0x00
+#define PASS            0x01
+#define FAIL            0x00
+#define maxAddress      capacity
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~//
-//     					   List of Error codes						  //
+//                            List of Error codes                          //
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~//
-#define SUCCESS      0x00
-#define CALLBEGIN    0x01
-#define UNKNOWNCHIP  0x02
-#define UNKNOWNCAP   0x03
-#define CHIPBUSY     0x04
-#define OUTOFBOUNDS  0x05
-#define CANTENWRITE  0x06
-#define PREVWRITTEN  0x07
-#define LOWRAM       0x08
-#define NOSUSPEND    0x09
-#define UNKNOWNERROR 0xFF
+#define SUCCESS         0x00
+#define CALLBEGIN       0x01
+#define UNKNOWNCHIP     0x02
+#define UNKNOWNCAP      0x03
+#define CHIPBUSY        0x04
+#define OUTOFBOUNDS     0x05
+#define CANTENWRITE     0x06
+#define PREVWRITTEN     0x07
+#define LOWRAM          0x08
+#define NOSUSPEND       0x09
+#define UNKNOWNERROR    0xFF
 
 // List of blocks
-#define MAX_BLOCKS		4
-#define MAX_SECTORS		16
+#define MAX_BLOCKS      4
+#define MAX_SECTORS     16
 
 
 
diff --git a/armsrc/fonts.c b/armsrc/fonts.c
index d79a61d84..1e4b418c9 100644
--- a/armsrc/fonts.c
+++ b/armsrc/fonts.c
@@ -7,302 +7,302 @@
 //-----------------------------------------------------------------------------
 
 const char FONT6x8[97][8] = {
-	{0x06,0x08,0x08,0x00,0x00,0x00,0x00,0x00},	// columns, rows, bytes per char
-	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},	// space
-	{0x20,0x20,0x20,0x20,0x20,0x00,0x20,0x00},	// !
-	{0x50,0x50,0x50,0x00,0x00,0x00,0x00,0x00},	// "
-	{0x50,0x50,0xF8,0x50,0xF8,0x50,0x50,0x00},	// #
-	{0x20,0x78,0xA0,0x70,0x28,0xF0,0x20,0x00},	// $
-	{0xC0,0xC8,0x10,0x20,0x40,0x98,0x18,0x00},	// %
-	{0x40,0xA0,0xA0,0x40,0xA8,0x90,0x68,0x00},	// &
-	{0x30,0x30,0x20,0x40,0x00,0x00,0x00,0x00},	// '
-	{0x10,0x20,0x40,0x40,0x40,0x20,0x10,0x00},	// (
-	{0x40,0x20,0x10,0x10,0x10,0x20,0x40,0x00},	// )
-	{0x00,0x20,0xA8,0x70,0x70,0xA8,0x20,0x00},	// *
-	{0x00,0x20,0x20,0xF8,0x20,0x20,0x00,0x00},	// +
-	{0x00,0x00,0x00,0x00,0x30,0x30,0x20,0x40},	// ,
-	{0x00,0x00,0x00,0xF8,0x00,0x00,0x00,0x00},	// -
-	{0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x00},	// .
-	{0x00,0x08,0x10,0x20,0x40,0x80,0x00,0x00},	// /
-	{0x70,0x88,0x88,0xA8,0x88,0x88,0x70,0x00},	// 0
-	{0x20,0x60,0x20,0x20,0x20,0x20,0x70,0x00},	// 1
-	{0x70,0x88,0x08,0x70,0x80,0x80,0xF8,0x00},	// 2
-	{0xF8,0x08,0x10,0x30,0x08,0x88,0x70,0x00},	// 3
-	{0x10,0x30,0x50,0x90,0xF8,0x10,0x10,0x00},	// 4
-	{0xF8,0x80,0xF0,0x08,0x08,0x88,0x70,0x00},	// 5
-	{0x38,0x40,0x80,0xF0,0x88,0x88,0x70,0x00},	// 6
-	{0xF8,0x08,0x08,0x10,0x20,0x40,0x80,0x00},	// 7
-	{0x70,0x88,0x88,0x70,0x88,0x88,0x70,0x00},	// 8
-	{0x70,0x88,0x88,0x78,0x08,0x10,0xE0,0x00},	// 9
-	{0x00,0x00,0x20,0x00,0x20,0x00,0x00,0x00},	// :
-	{0x00,0x00,0x20,0x00,0x20,0x20,0x40,0x00},	// ;
-	{0x08,0x10,0x20,0x40,0x20,0x10,0x08,0x00},	// <
-	{0x00,0x00,0xF8,0x00,0xF8,0x00,0x00,0x00},	// =
-	{0x40,0x20,0x10,0x08,0x10,0x20,0x40,0x00},	// >
-	{0x70,0x88,0x08,0x30,0x20,0x00,0x20,0x00},	// ?
-	{0x70,0x88,0xA8,0xB8,0xB0,0x80,0x78,0x00},	// @
-	{0x20,0x50,0x88,0x88,0xF8,0x88,0x88,0x00},	// A
-	{0xF0,0x88,0x88,0xF0,0x88,0x88,0xF0,0x00},	// B
-	{0x70,0x88,0x80,0x80,0x80,0x88,0x70,0x00},	// C
-	{0xF0,0x88,0x88,0x88,0x88,0x88,0xF0,0x00},	// D
-	{0xF8,0x80,0x80,0xF0,0x80,0x80,0xF8,0x00},	// E
-	{0xF8,0x80,0x80,0xF0,0x80,0x80,0x80,0x00},	// F
-	{0x78,0x88,0x80,0x80,0x98,0x88,0x78,0x00},	// G
-	{0x88,0x88,0x88,0xF8,0x88,0x88,0x88,0x00},	// H
-	{0x70,0x20,0x20,0x20,0x20,0x20,0x70,0x00},	// I
-	{0x38,0x10,0x10,0x10,0x10,0x90,0x60,0x00},	// J
-	{0x88,0x90,0xA0,0xC0,0xA0,0x90,0x88,0x00},	// K
-	{0x80,0x80,0x80,0x80,0x80,0x80,0xF8,0x00},	// L
-	{0x88,0xD8,0xA8,0xA8,0xA8,0x88,0x88,0x00},	// M
-	{0x88,0x88,0xC8,0xA8,0x98,0x88,0x88,0x00},	// N
-	{0x70,0x88,0x88,0x88,0x88,0x88,0x70,0x00},	// O
-	{0xF0,0x88,0x88,0xF0,0x80,0x80,0x80,0x00},	// P
-	{0x70,0x88,0x88,0x88,0xA8,0x90,0x68,0x00},	// Q
-	{0xF0,0x88,0x88,0xF0,0xA0,0x90,0x88,0x00},	// R
-	{0x70,0x88,0x80,0x70,0x08,0x88,0x70,0x00},	// S
-	{0xF8,0xA8,0x20,0x20,0x20,0x20,0x20,0x00},	// T
-	{0x88,0x88,0x88,0x88,0x88,0x88,0x70,0x00},	// U
-	{0x88,0x88,0x88,0x88,0x88,0x50,0x20,0x00},	// V
-	{0x88,0x88,0x88,0xA8,0xA8,0xA8,0x50,0x00},	// W
-	{0x88,0x88,0x50,0x20,0x50,0x88,0x88,0x00},	// X
-	{0x88,0x88,0x50,0x20,0x20,0x20,0x20,0x00},	// Y
-	{0xF8,0x08,0x10,0x70,0x40,0x80,0xF8,0x00},	// Z
-	{0x78,0x40,0x40,0x40,0x40,0x40,0x78,0x00},	// [
-	{0x00,0x80,0x40,0x20,0x10,0x08,0x00,0x00},	// backslash
-	{0x78,0x08,0x08,0x08,0x08,0x08,0x78,0x00},	// ]
-	{0x20,0x50,0x88,0x00,0x00,0x00,0x00,0x00},	// ^
-	{0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0x00},	// _
-	{0x60,0x60,0x20,0x10,0x00,0x00,0x00,0x00},	// `
-	{0x00,0x00,0x60,0x10,0x70,0x90,0x78,0x00},	// a
-	{0x80,0x80,0xB0,0xC8,0x88,0xC8,0xB0,0x00},	// b
-	{0x00,0x00,0x70,0x88,0x80,0x88,0x70,0x00},	// c
-	{0x08,0x08,0x68,0x98,0x88,0x98,0x68,0x00},	// d
-	{0x00,0x00,0x70,0x88,0xF8,0x80,0x70,0x00},	// e
-	{0x10,0x28,0x20,0x70,0x20,0x20,0x20,0x00},	// f
-	{0x00,0x00,0x70,0x98,0x98,0x68,0x08,0x70},	// g
-	{0x80,0x80,0xB0,0xC8,0x88,0x88,0x88,0x00},	// h
-	{0x20,0x00,0x60,0x20,0x20,0x20,0x70,0x00},	// i
-	{0x10,0x00,0x10,0x10,0x10,0x90,0x60,0x00},	// j
-	{0x80,0x80,0x90,0xA0,0xC0,0xA0,0x90,0x00},	// k
-	{0x60,0x20,0x20,0x20,0x20,0x20,0x70,0x00},	// l
-	{0x00,0x00,0xD0,0xA8,0xA8,0xA8,0xA8,0x00},	// m
-	{0x00,0x00,0xB0,0xC8,0x88,0x88,0x88,0x00},	// n
-	{0x00,0x00,0x70,0x88,0x88,0x88,0x70,0x00},	// o
-	{0x00,0x00,0xB0,0xC8,0xC8,0xB0,0x80,0x80},	// p
-	{0x00,0x00,0x68,0x98,0x98,0x68,0x08,0x08},	// q
-	{0x00,0x00,0xB0,0xC8,0x80,0x80,0x80,0x00},	// r
-	{0x00,0x00,0x78,0x80,0x70,0x08,0xF0,0x00},	// s
-	{0x20,0x20,0xF8,0x20,0x20,0x28,0x10,0x00},	// t
-	{0x00,0x00,0x88,0x88,0x88,0x98,0x68,0x00},	// u
-	{0x00,0x00,0x88,0x88,0x88,0x50,0x20,0x00},	// v
-	{0x00,0x00,0x88,0x88,0xA8,0xA8,0x50,0x00},	// w
-	{0x00,0x00,0x88,0x50,0x20,0x50,0x88,0x00},	// x
-	{0x00,0x00,0x88,0x88,0x78,0x08,0x88,0x70},	// y
-	{0x00,0x00,0xF8,0x10,0x20,0x40,0xF8,0x00},	// z
-	{0x10,0x20,0x20,0x40,0x20,0x20,0x10,0x00},	// {
-	{0x20,0x20,0x20,0x00,0x20,0x20,0x20,0x00},	// |
-	{0x40,0x20,0x20,0x10,0x20,0x20,0x40,0x00},	// }
-	{0x40,0xA8,0x10,0x00,0x00,0x00,0x00,0x00},	// ~
-	{0x70,0xD8,0xD8,0x70,0x00,0x00,0x00,0x00}	// DEL
+    {0x06,0x08,0x08,0x00,0x00,0x00,0x00,0x00},  // columns, rows, bytes per char
+    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},  // space
+    {0x20,0x20,0x20,0x20,0x20,0x00,0x20,0x00},  // !
+    {0x50,0x50,0x50,0x00,0x00,0x00,0x00,0x00},  // "
+    {0x50,0x50,0xF8,0x50,0xF8,0x50,0x50,0x00},  // #
+    {0x20,0x78,0xA0,0x70,0x28,0xF0,0x20,0x00},  // $
+    {0xC0,0xC8,0x10,0x20,0x40,0x98,0x18,0x00},  // %
+    {0x40,0xA0,0xA0,0x40,0xA8,0x90,0x68,0x00},  // &
+    {0x30,0x30,0x20,0x40,0x00,0x00,0x00,0x00},  // '
+    {0x10,0x20,0x40,0x40,0x40,0x20,0x10,0x00},  // (
+    {0x40,0x20,0x10,0x10,0x10,0x20,0x40,0x00},  // )
+    {0x00,0x20,0xA8,0x70,0x70,0xA8,0x20,0x00},  // *
+    {0x00,0x20,0x20,0xF8,0x20,0x20,0x00,0x00},  // +
+    {0x00,0x00,0x00,0x00,0x30,0x30,0x20,0x40},  // ,
+    {0x00,0x00,0x00,0xF8,0x00,0x00,0x00,0x00},  // -
+    {0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x00},  // .
+    {0x00,0x08,0x10,0x20,0x40,0x80,0x00,0x00},  // /
+    {0x70,0x88,0x88,0xA8,0x88,0x88,0x70,0x00},  // 0
+    {0x20,0x60,0x20,0x20,0x20,0x20,0x70,0x00},  // 1
+    {0x70,0x88,0x08,0x70,0x80,0x80,0xF8,0x00},  // 2
+    {0xF8,0x08,0x10,0x30,0x08,0x88,0x70,0x00},  // 3
+    {0x10,0x30,0x50,0x90,0xF8,0x10,0x10,0x00},  // 4
+    {0xF8,0x80,0xF0,0x08,0x08,0x88,0x70,0x00},  // 5
+    {0x38,0x40,0x80,0xF0,0x88,0x88,0x70,0x00},  // 6
+    {0xF8,0x08,0x08,0x10,0x20,0x40,0x80,0x00},  // 7
+    {0x70,0x88,0x88,0x70,0x88,0x88,0x70,0x00},  // 8
+    {0x70,0x88,0x88,0x78,0x08,0x10,0xE0,0x00},  // 9
+    {0x00,0x00,0x20,0x00,0x20,0x00,0x00,0x00},  // :
+    {0x00,0x00,0x20,0x00,0x20,0x20,0x40,0x00},  // ;
+    {0x08,0x10,0x20,0x40,0x20,0x10,0x08,0x00},  // <
+    {0x00,0x00,0xF8,0x00,0xF8,0x00,0x00,0x00},  // =
+    {0x40,0x20,0x10,0x08,0x10,0x20,0x40,0x00},  // >
+    {0x70,0x88,0x08,0x30,0x20,0x00,0x20,0x00},  // ?
+    {0x70,0x88,0xA8,0xB8,0xB0,0x80,0x78,0x00},  // @
+    {0x20,0x50,0x88,0x88,0xF8,0x88,0x88,0x00},  // A
+    {0xF0,0x88,0x88,0xF0,0x88,0x88,0xF0,0x00},  // B
+    {0x70,0x88,0x80,0x80,0x80,0x88,0x70,0x00},  // C
+    {0xF0,0x88,0x88,0x88,0x88,0x88,0xF0,0x00},  // D
+    {0xF8,0x80,0x80,0xF0,0x80,0x80,0xF8,0x00},  // E
+    {0xF8,0x80,0x80,0xF0,0x80,0x80,0x80,0x00},  // F
+    {0x78,0x88,0x80,0x80,0x98,0x88,0x78,0x00},  // G
+    {0x88,0x88,0x88,0xF8,0x88,0x88,0x88,0x00},  // H
+    {0x70,0x20,0x20,0x20,0x20,0x20,0x70,0x00},  // I
+    {0x38,0x10,0x10,0x10,0x10,0x90,0x60,0x00},  // J
+    {0x88,0x90,0xA0,0xC0,0xA0,0x90,0x88,0x00},  // K
+    {0x80,0x80,0x80,0x80,0x80,0x80,0xF8,0x00},  // L
+    {0x88,0xD8,0xA8,0xA8,0xA8,0x88,0x88,0x00},  // M
+    {0x88,0x88,0xC8,0xA8,0x98,0x88,0x88,0x00},  // N
+    {0x70,0x88,0x88,0x88,0x88,0x88,0x70,0x00},  // O
+    {0xF0,0x88,0x88,0xF0,0x80,0x80,0x80,0x00},  // P
+    {0x70,0x88,0x88,0x88,0xA8,0x90,0x68,0x00},  // Q
+    {0xF0,0x88,0x88,0xF0,0xA0,0x90,0x88,0x00},  // R
+    {0x70,0x88,0x80,0x70,0x08,0x88,0x70,0x00},  // S
+    {0xF8,0xA8,0x20,0x20,0x20,0x20,0x20,0x00},  // T
+    {0x88,0x88,0x88,0x88,0x88,0x88,0x70,0x00},  // U
+    {0x88,0x88,0x88,0x88,0x88,0x50,0x20,0x00},  // V
+    {0x88,0x88,0x88,0xA8,0xA8,0xA8,0x50,0x00},  // W
+    {0x88,0x88,0x50,0x20,0x50,0x88,0x88,0x00},  // X
+    {0x88,0x88,0x50,0x20,0x20,0x20,0x20,0x00},  // Y
+    {0xF8,0x08,0x10,0x70,0x40,0x80,0xF8,0x00},  // Z
+    {0x78,0x40,0x40,0x40,0x40,0x40,0x78,0x00},  // [
+    {0x00,0x80,0x40,0x20,0x10,0x08,0x00,0x00},  // backslash
+    {0x78,0x08,0x08,0x08,0x08,0x08,0x78,0x00},  // ]
+    {0x20,0x50,0x88,0x00,0x00,0x00,0x00,0x00},  // ^
+    {0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0x00},  // _
+    {0x60,0x60,0x20,0x10,0x00,0x00,0x00,0x00},  // `
+    {0x00,0x00,0x60,0x10,0x70,0x90,0x78,0x00},  // a
+    {0x80,0x80,0xB0,0xC8,0x88,0xC8,0xB0,0x00},  // b
+    {0x00,0x00,0x70,0x88,0x80,0x88,0x70,0x00},  // c
+    {0x08,0x08,0x68,0x98,0x88,0x98,0x68,0x00},  // d
+    {0x00,0x00,0x70,0x88,0xF8,0x80,0x70,0x00},  // e
+    {0x10,0x28,0x20,0x70,0x20,0x20,0x20,0x00},  // f
+    {0x00,0x00,0x70,0x98,0x98,0x68,0x08,0x70},  // g
+    {0x80,0x80,0xB0,0xC8,0x88,0x88,0x88,0x00},  // h
+    {0x20,0x00,0x60,0x20,0x20,0x20,0x70,0x00},  // i
+    {0x10,0x00,0x10,0x10,0x10,0x90,0x60,0x00},  // j
+    {0x80,0x80,0x90,0xA0,0xC0,0xA0,0x90,0x00},  // k
+    {0x60,0x20,0x20,0x20,0x20,0x20,0x70,0x00},  // l
+    {0x00,0x00,0xD0,0xA8,0xA8,0xA8,0xA8,0x00},  // m
+    {0x00,0x00,0xB0,0xC8,0x88,0x88,0x88,0x00},  // n
+    {0x00,0x00,0x70,0x88,0x88,0x88,0x70,0x00},  // o
+    {0x00,0x00,0xB0,0xC8,0xC8,0xB0,0x80,0x80},  // p
+    {0x00,0x00,0x68,0x98,0x98,0x68,0x08,0x08},  // q
+    {0x00,0x00,0xB0,0xC8,0x80,0x80,0x80,0x00},  // r
+    {0x00,0x00,0x78,0x80,0x70,0x08,0xF0,0x00},  // s
+    {0x20,0x20,0xF8,0x20,0x20,0x28,0x10,0x00},  // t
+    {0x00,0x00,0x88,0x88,0x88,0x98,0x68,0x00},  // u
+    {0x00,0x00,0x88,0x88,0x88,0x50,0x20,0x00},  // v
+    {0x00,0x00,0x88,0x88,0xA8,0xA8,0x50,0x00},  // w
+    {0x00,0x00,0x88,0x50,0x20,0x50,0x88,0x00},  // x
+    {0x00,0x00,0x88,0x88,0x78,0x08,0x88,0x70},  // y
+    {0x00,0x00,0xF8,0x10,0x20,0x40,0xF8,0x00},  // z
+    {0x10,0x20,0x20,0x40,0x20,0x20,0x10,0x00},  // {
+    {0x20,0x20,0x20,0x00,0x20,0x20,0x20,0x00},  // |
+    {0x40,0x20,0x20,0x10,0x20,0x20,0x40,0x00},  // }
+    {0x40,0xA8,0x10,0x00,0x00,0x00,0x00,0x00},  // ~
+    {0x70,0xD8,0xD8,0x70,0x00,0x00,0x00,0x00}   // DEL
 };
 /*
 const char FONT8x8F[97][8] = {
-	{0x08,0x08,0x08,0x00,0x00,0x00,0x00,0x00},	// columns, rows, bytes per char
-	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},	// space
-	{0x30,0x78,0x78,0x30,0x30,0x00,0x30,0x00},	// !
-	{0x6C,0x6C,0x6C,0x00,0x00,0x00,0x00,0x00},	// "
-	{0x6C,0x6C,0xFE,0x6C,0xFE,0x6C,0x6C,0x00},	// #
-	{0x18,0x3E,0x60,0x3C,0x06,0x7C,0x18,0x00},	// $
-	{0x00,0x63,0x66,0x0C,0x18,0x33,0x63,0x00},	// %
-	{0x1C,0x36,0x1C,0x3B,0x6E,0x66,0x3B,0x00},	// &
-	{0x30,0x30,0x60,0x00,0x00,0x00,0x00,0x00},	// '
-	{0x0C,0x18,0x30,0x30,0x30,0x18,0x0C,0x00},	// (
-	{0x30,0x18,0x0C,0x0C,0x0C,0x18,0x30,0x00},	// )
-	{0x00,0x66,0x3C,0xFF,0x3C,0x66,0x00,0x00},	// *
-	{0x00,0x30,0x30,0xFC,0x30,0x30,0x00,0x00},	// +
-	{0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x30},	// ,
-	{0x00,0x00,0x00,0x7E,0x00,0x00,0x00,0x00},	// -
-	{0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x00},	// .
-	{0x03,0x06,0x0C,0x18,0x30,0x60,0x40,0x00},	// /
-	{0x3E,0x63,0x63,0x6B,0x63,0x63,0x3E,0x00},	// 0
-	{0x18,0x38,0x58,0x18,0x18,0x18,0x7E,0x00},	// 1
-	{0x3C,0x66,0x06,0x1C,0x30,0x66,0x7E,0x00},	// 2
-	{0x3C,0x66,0x06,0x1C,0x06,0x66,0x3C,0x00},	// 3
-	{0x0E,0x1E,0x36,0x66,0x7F,0x06,0x0F,0x00},	// 4
-	{0x7E,0x60,0x7C,0x06,0x06,0x66,0x3C,0x00},	// 5
-	{0x1C,0x30,0x60,0x7C,0x66,0x66,0x3C,0x00},	// 6
-	{0x7E,0x66,0x06,0x0C,0x18,0x18,0x18,0x00},	// 7
-	{0x3C,0x66,0x66,0x3C,0x66,0x66,0x3C,0x00},	// 8
-	{0x3C,0x66,0x66,0x3E,0x06,0x0C,0x38,0x00},	// 9
-	{0x00,0x18,0x18,0x00,0x00,0x18,0x18,0x00},	// :
-	{0x00,0x18,0x18,0x00,0x00,0x18,0x18,0x30},	// ;
-	{0x0C,0x18,0x30,0x60,0x30,0x18,0x0C,0x00},	// <
-	{0x00,0x00,0x7E,0x00,0x00,0x7E,0x00,0x00},	// =
-	{0x30,0x18,0x0C,0x06,0x0C,0x18,0x30,0x00},	// >
-	{0x3C,0x66,0x06,0x0C,0x18,0x00,0x18,0x00},	// ?
-	{0x3E,0x63,0x6F,0x69,0x6F,0x60,0x3E,0x00},	// @
-	{0x18,0x3C,0x66,0x66,0x7E,0x66,0x66,0x00},	// A
-	{0x7E,0x33,0x33,0x3E,0x33,0x33,0x7E,0x00},	// B
-	{0x1E,0x33,0x60,0x60,0x60,0x33,0x1E,0x00},	// C
-	{0x7C,0x36,0x33,0x33,0x33,0x36,0x7C,0x00},	// D
-	{0x7F,0x31,0x34,0x3C,0x34,0x31,0x7F,0x00},	// E
-	{0x7F,0x31,0x34,0x3C,0x34,0x30,0x78,0x00},	// F
-	{0x1E,0x33,0x60,0x60,0x67,0x33,0x1F,0x00},	// G
-	{0x66,0x66,0x66,0x7E,0x66,0x66,0x66,0x00},	// H
-	{0x3C,0x18,0x18,0x18,0x18,0x18,0x3C,0x00},	// I
-	{0x0F,0x06,0x06,0x06,0x66,0x66,0x3C,0x00},	// J
-	{0x73,0x33,0x36,0x3C,0x36,0x33,0x73,0x00},	// K
-	{0x78,0x30,0x30,0x30,0x31,0x33,0x7F,0x00},	// L
-	{0x63,0x77,0x7F,0x7F,0x6B,0x63,0x63,0x00},	// M
-	{0x63,0x73,0x7B,0x6F,0x67,0x63,0x63,0x00},	// N
-	{0x3E,0x63,0x63,0x63,0x63,0x63,0x3E,0x00},	// O
-	{0x7E,0x33,0x33,0x3E,0x30,0x30,0x78,0x00},	// P
-	{0x3C,0x66,0x66,0x66,0x6E,0x3C,0x0E,0x00},	// Q
-	{0x7E,0x33,0x33,0x3E,0x36,0x33,0x73,0x00},	// R
-	{0x3C,0x66,0x30,0x18,0x0C,0x66,0x3C,0x00},	// S
-	{0x7E,0x5A,0x18,0x18,0x18,0x18,0x3C,0x00},	// T
-	{0x66,0x66,0x66,0x66,0x66,0x66,0x7E,0x00},	// U
-	{0x66,0x66,0x66,0x66,0x66,0x3C,0x18,0x00},	// V
-	{0x63,0x63,0x63,0x6B,0x7F,0x77,0x63,0x00},	// W
-	{0x63,0x63,0x36,0x1C,0x1C,0x36,0x63,0x00},	// X
-	{0x66,0x66,0x66,0x3C,0x18,0x18,0x3C,0x00},	// Y
-	{0x7F,0x63,0x46,0x0C,0x19,0x33,0x7F,0x00},	// Z
-	{0x3C,0x30,0x30,0x30,0x30,0x30,0x3C,0x00},	// [
-	{0x60,0x30,0x18,0x0C,0x06,0x03,0x01,0x00},	// backslash
-	{0x3C,0x0C,0x0C,0x0C,0x0C,0x0C,0x3C,0x00},	// ]
-	{0x08,0x1C,0x36,0x63,0x00,0x00,0x00,0x00},	// ^
-	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF},	// _
-	{0x18,0x18,0x0C,0x00,0x00,0x00,0x00,0x00},	// `
-	{0x00,0x00,0x3C,0x06,0x3E,0x66,0x3B,0x00},	// a
-	{0x70,0x30,0x3E,0x33,0x33,0x33,0x6E,0x00},	// b
-	{0x00,0x00,0x3C,0x66,0x60,0x66,0x3C,0x00},	// c
-	{0x0E,0x06,0x3E,0x66,0x66,0x66,0x3B,0x00},	// d
-	{0x00,0x00,0x3C,0x66,0x7E,0x60,0x3C,0x00},	// e
-	{0x1C,0x36,0x30,0x78,0x30,0x30,0x78,0x00},	// f
-	{0x00,0x00,0x3B,0x66,0x66,0x3E,0x06,0x7C},	// g
-	{0x70,0x30,0x36,0x3B,0x33,0x33,0x73,0x00},	// h
-	{0x18,0x00,0x38,0x18,0x18,0x18,0x3C,0x00},	// i
-	{0x06,0x00,0x06,0x06,0x06,0x66,0x66,0x3C},	// j
-	{0x70,0x30,0x33,0x36,0x3C,0x36,0x73,0x00},	// k
-	{0x38,0x18,0x18,0x18,0x18,0x18,0x3C,0x00},	// l
-	{0x00,0x00,0x66,0x7F,0x7F,0x6B,0x63,0x00},	// m
-	{0x00,0x00,0x7C,0x66,0x66,0x66,0x66,0x00},	// n
-	{0x00,0x00,0x3C,0x66,0x66,0x66,0x3C,0x00},	// o
-	{0x00,0x00,0x6E,0x33,0x33,0x3E,0x30,0x78},	// p
-	{0x00,0x00,0x3B,0x66,0x66,0x3E,0x06,0x0F},	// q
-	{0x00,0x00,0x6E,0x3B,0x33,0x30,0x78,0x00},	// r
-	{0x00,0x00,0x3E,0x60,0x3C,0x06,0x7C,0x00},	// s
-	{0x08,0x18,0x3E,0x18,0x18,0x1A,0x0C,0x00},	// t
-	{0x00,0x00,0x66,0x66,0x66,0x66,0x3B,0x00},	// u
-	{0x00,0x00,0x66,0x66,0x66,0x3C,0x18,0x00},	// v
-	{0x00,0x00,0x63,0x6B,0x7F,0x7F,0x36,0x00},	// w
-	{0x00,0x00,0x63,0x36,0x1C,0x36,0x63,0x00},	// x
-	{0x00,0x00,0x66,0x66,0x66,0x3E,0x06,0x7C},	// y
-	{0x00,0x00,0x7E,0x4C,0x18,0x32,0x7E,0x00},	// z
-	{0x0E,0x18,0x18,0x70,0x18,0x18,0x0E,0x00},	// {
-	{0x0C,0x0C,0x0C,0x00,0x0C,0x0C,0x0C,0x00},	// |
-	{0x70,0x18,0x18,0x0E,0x18,0x18,0x70,0x00},	// }
-	{0x3B,0x6E,0x00,0x00,0x00,0x00,0x00,0x00},	// ~
-	{0x1C,0x36,0x36,0x1C,0x00,0x00,0x00,0x00}	// DEL
+    {0x08,0x08,0x08,0x00,0x00,0x00,0x00,0x00},  // columns, rows, bytes per char
+    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},  // space
+    {0x30,0x78,0x78,0x30,0x30,0x00,0x30,0x00},  // !
+    {0x6C,0x6C,0x6C,0x00,0x00,0x00,0x00,0x00},  // "
+    {0x6C,0x6C,0xFE,0x6C,0xFE,0x6C,0x6C,0x00},  // #
+    {0x18,0x3E,0x60,0x3C,0x06,0x7C,0x18,0x00},  // $
+    {0x00,0x63,0x66,0x0C,0x18,0x33,0x63,0x00},  // %
+    {0x1C,0x36,0x1C,0x3B,0x6E,0x66,0x3B,0x00},  // &
+    {0x30,0x30,0x60,0x00,0x00,0x00,0x00,0x00},  // '
+    {0x0C,0x18,0x30,0x30,0x30,0x18,0x0C,0x00},  // (
+    {0x30,0x18,0x0C,0x0C,0x0C,0x18,0x30,0x00},  // )
+    {0x00,0x66,0x3C,0xFF,0x3C,0x66,0x00,0x00},  // *
+    {0x00,0x30,0x30,0xFC,0x30,0x30,0x00,0x00},  // +
+    {0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x30},  // ,
+    {0x00,0x00,0x00,0x7E,0x00,0x00,0x00,0x00},  // -
+    {0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x00},  // .
+    {0x03,0x06,0x0C,0x18,0x30,0x60,0x40,0x00},  // /
+    {0x3E,0x63,0x63,0x6B,0x63,0x63,0x3E,0x00},  // 0
+    {0x18,0x38,0x58,0x18,0x18,0x18,0x7E,0x00},  // 1
+    {0x3C,0x66,0x06,0x1C,0x30,0x66,0x7E,0x00},  // 2
+    {0x3C,0x66,0x06,0x1C,0x06,0x66,0x3C,0x00},  // 3
+    {0x0E,0x1E,0x36,0x66,0x7F,0x06,0x0F,0x00},  // 4
+    {0x7E,0x60,0x7C,0x06,0x06,0x66,0x3C,0x00},  // 5
+    {0x1C,0x30,0x60,0x7C,0x66,0x66,0x3C,0x00},  // 6
+    {0x7E,0x66,0x06,0x0C,0x18,0x18,0x18,0x00},  // 7
+    {0x3C,0x66,0x66,0x3C,0x66,0x66,0x3C,0x00},  // 8
+    {0x3C,0x66,0x66,0x3E,0x06,0x0C,0x38,0x00},  // 9
+    {0x00,0x18,0x18,0x00,0x00,0x18,0x18,0x00},  // :
+    {0x00,0x18,0x18,0x00,0x00,0x18,0x18,0x30},  // ;
+    {0x0C,0x18,0x30,0x60,0x30,0x18,0x0C,0x00},  // <
+    {0x00,0x00,0x7E,0x00,0x00,0x7E,0x00,0x00},  // =
+    {0x30,0x18,0x0C,0x06,0x0C,0x18,0x30,0x00},  // >
+    {0x3C,0x66,0x06,0x0C,0x18,0x00,0x18,0x00},  // ?
+    {0x3E,0x63,0x6F,0x69,0x6F,0x60,0x3E,0x00},  // @
+    {0x18,0x3C,0x66,0x66,0x7E,0x66,0x66,0x00},  // A
+    {0x7E,0x33,0x33,0x3E,0x33,0x33,0x7E,0x00},  // B
+    {0x1E,0x33,0x60,0x60,0x60,0x33,0x1E,0x00},  // C
+    {0x7C,0x36,0x33,0x33,0x33,0x36,0x7C,0x00},  // D
+    {0x7F,0x31,0x34,0x3C,0x34,0x31,0x7F,0x00},  // E
+    {0x7F,0x31,0x34,0x3C,0x34,0x30,0x78,0x00},  // F
+    {0x1E,0x33,0x60,0x60,0x67,0x33,0x1F,0x00},  // G
+    {0x66,0x66,0x66,0x7E,0x66,0x66,0x66,0x00},  // H
+    {0x3C,0x18,0x18,0x18,0x18,0x18,0x3C,0x00},  // I
+    {0x0F,0x06,0x06,0x06,0x66,0x66,0x3C,0x00},  // J
+    {0x73,0x33,0x36,0x3C,0x36,0x33,0x73,0x00},  // K
+    {0x78,0x30,0x30,0x30,0x31,0x33,0x7F,0x00},  // L
+    {0x63,0x77,0x7F,0x7F,0x6B,0x63,0x63,0x00},  // M
+    {0x63,0x73,0x7B,0x6F,0x67,0x63,0x63,0x00},  // N
+    {0x3E,0x63,0x63,0x63,0x63,0x63,0x3E,0x00},  // O
+    {0x7E,0x33,0x33,0x3E,0x30,0x30,0x78,0x00},  // P
+    {0x3C,0x66,0x66,0x66,0x6E,0x3C,0x0E,0x00},  // Q
+    {0x7E,0x33,0x33,0x3E,0x36,0x33,0x73,0x00},  // R
+    {0x3C,0x66,0x30,0x18,0x0C,0x66,0x3C,0x00},  // S
+    {0x7E,0x5A,0x18,0x18,0x18,0x18,0x3C,0x00},  // T
+    {0x66,0x66,0x66,0x66,0x66,0x66,0x7E,0x00},  // U
+    {0x66,0x66,0x66,0x66,0x66,0x3C,0x18,0x00},  // V
+    {0x63,0x63,0x63,0x6B,0x7F,0x77,0x63,0x00},  // W
+    {0x63,0x63,0x36,0x1C,0x1C,0x36,0x63,0x00},  // X
+    {0x66,0x66,0x66,0x3C,0x18,0x18,0x3C,0x00},  // Y
+    {0x7F,0x63,0x46,0x0C,0x19,0x33,0x7F,0x00},  // Z
+    {0x3C,0x30,0x30,0x30,0x30,0x30,0x3C,0x00},  // [
+    {0x60,0x30,0x18,0x0C,0x06,0x03,0x01,0x00},  // backslash
+    {0x3C,0x0C,0x0C,0x0C,0x0C,0x0C,0x3C,0x00},  // ]
+    {0x08,0x1C,0x36,0x63,0x00,0x00,0x00,0x00},  // ^
+    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF},  // _
+    {0x18,0x18,0x0C,0x00,0x00,0x00,0x00,0x00},  // `
+    {0x00,0x00,0x3C,0x06,0x3E,0x66,0x3B,0x00},  // a
+    {0x70,0x30,0x3E,0x33,0x33,0x33,0x6E,0x00},  // b
+    {0x00,0x00,0x3C,0x66,0x60,0x66,0x3C,0x00},  // c
+    {0x0E,0x06,0x3E,0x66,0x66,0x66,0x3B,0x00},  // d
+    {0x00,0x00,0x3C,0x66,0x7E,0x60,0x3C,0x00},  // e
+    {0x1C,0x36,0x30,0x78,0x30,0x30,0x78,0x00},  // f
+    {0x00,0x00,0x3B,0x66,0x66,0x3E,0x06,0x7C},  // g
+    {0x70,0x30,0x36,0x3B,0x33,0x33,0x73,0x00},  // h
+    {0x18,0x00,0x38,0x18,0x18,0x18,0x3C,0x00},  // i
+    {0x06,0x00,0x06,0x06,0x06,0x66,0x66,0x3C},  // j
+    {0x70,0x30,0x33,0x36,0x3C,0x36,0x73,0x00},  // k
+    {0x38,0x18,0x18,0x18,0x18,0x18,0x3C,0x00},  // l
+    {0x00,0x00,0x66,0x7F,0x7F,0x6B,0x63,0x00},  // m
+    {0x00,0x00,0x7C,0x66,0x66,0x66,0x66,0x00},  // n
+    {0x00,0x00,0x3C,0x66,0x66,0x66,0x3C,0x00},  // o
+    {0x00,0x00,0x6E,0x33,0x33,0x3E,0x30,0x78},  // p
+    {0x00,0x00,0x3B,0x66,0x66,0x3E,0x06,0x0F},  // q
+    {0x00,0x00,0x6E,0x3B,0x33,0x30,0x78,0x00},  // r
+    {0x00,0x00,0x3E,0x60,0x3C,0x06,0x7C,0x00},  // s
+    {0x08,0x18,0x3E,0x18,0x18,0x1A,0x0C,0x00},  // t
+    {0x00,0x00,0x66,0x66,0x66,0x66,0x3B,0x00},  // u
+    {0x00,0x00,0x66,0x66,0x66,0x3C,0x18,0x00},  // v
+    {0x00,0x00,0x63,0x6B,0x7F,0x7F,0x36,0x00},  // w
+    {0x00,0x00,0x63,0x36,0x1C,0x36,0x63,0x00},  // x
+    {0x00,0x00,0x66,0x66,0x66,0x3E,0x06,0x7C},  // y
+    {0x00,0x00,0x7E,0x4C,0x18,0x32,0x7E,0x00},  // z
+    {0x0E,0x18,0x18,0x70,0x18,0x18,0x0E,0x00},  // {
+    {0x0C,0x0C,0x0C,0x00,0x0C,0x0C,0x0C,0x00},  // |
+    {0x70,0x18,0x18,0x0E,0x18,0x18,0x70,0x00},  // }
+    {0x3B,0x6E,0x00,0x00,0x00,0x00,0x00,0x00},  // ~
+    {0x1C,0x36,0x36,0x1C,0x00,0x00,0x00,0x00}   // DEL
 };
 
 const char FONT8x16[97][16] = {
-	{0x08,0x10,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},	// columns, rows, bytes per char
-	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},	// space
-	{0x00,0x00,0x18,0x3C,0x3C,0x3C,0x18,0x18,0x18,0x00,0x18,0x18,0x00,0x00,0x00,0x00},	// !
-	{0x00,0x63,0x63,0x63,0x22,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},	// "
-	{0x00,0x00,0x00,0x36,0x36,0x7F,0x36,0x36,0x36,0x7F,0x36,0x36,0x00,0x00,0x00,0x00},	// #
-	{0x0C,0x0C,0x3E,0x63,0x61,0x60,0x3E,0x03,0x03,0x43,0x63,0x3E,0x0C,0x0C,0x00,0x00},	// $
-	{0x00,0x00,0x00,0x00,0x00,0x61,0x63,0x06,0x0C,0x18,0x33,0x63,0x00,0x00,0x00,0x00},	// %
-	{0x00,0x00,0x00,0x1C,0x36,0x36,0x1C,0x3B,0x6E,0x66,0x66,0x3B,0x00,0x00,0x00,0x00},	// &
-	{0x00,0x30,0x30,0x30,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},	// '
-	{0x00,0x00,0x0C,0x18,0x18,0x30,0x30,0x30,0x30,0x18,0x18,0x0C,0x00,0x00,0x00,0x00},	// (
-	{0x00,0x00,0x18,0x0C,0x0C,0x06,0x06,0x06,0x06,0x0C,0x0C,0x18,0x00,0x00,0x00,0x00},	// )
-	{0x00,0x00,0x00,0x00,0x42,0x66,0x3C,0xFF,0x3C,0x66,0x42,0x00,0x00,0x00,0x00,0x00},	// *
-	{0x00,0x00,0x00,0x00,0x18,0x18,0x18,0xFF,0x18,0x18,0x18,0x00,0x00,0x00,0x00,0x00},	// +
-	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x18,0x30,0x00,0x00},	// ,
-	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},	// -
-	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x00,0x00,0x00,0x00},	// .
-	{0x00,0x00,0x01,0x03,0x07,0x0E,0x1C,0x38,0x70,0xE0,0xC0,0x80,0x00,0x00,0x00,0x00},	// /
-	{0x00,0x00,0x3E,0x63,0x63,0x63,0x6B,0x6B,0x63,0x63,0x63,0x3E,0x00,0x00,0x00,0x00},	// 0
-	{0x00,0x00,0x0C,0x1C,0x3C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x3F,0x00,0x00,0x00,0x00},	// 1
-	{0x00,0x00,0x3E,0x63,0x03,0x06,0x0C,0x18,0x30,0x61,0x63,0x7F,0x00,0x00,0x00,0x00},	// 2
-	{0x00,0x00,0x3E,0x63,0x03,0x03,0x1E,0x03,0x03,0x03,0x63,0x3E,0x00,0x00,0x00,0x00},	// 3
-	{0x00,0x00,0x06,0x0E,0x1E,0x36,0x66,0x66,0x7F,0x06,0x06,0x0F,0x00,0x00,0x00,0x00},	// 4
-	{0x00,0x00,0x7F,0x60,0x60,0x60,0x7E,0x03,0x03,0x63,0x73,0x3E,0x00,0x00,0x00,0x00},	// 5
-	{0x00,0x00,0x1C,0x30,0x60,0x60,0x7E,0x63,0x63,0x63,0x63,0x3E,0x00,0x00,0x00,0x00},	// 6
-	{0x00,0x00,0x7F,0x63,0x03,0x06,0x06,0x0C,0x0C,0x18,0x18,0x18,0x00,0x00,0x00,0x00},	// 7
-	{0x00,0x00,0x3E,0x63,0x63,0x63,0x3E,0x63,0x63,0x63,0x63,0x3E,0x00,0x00,0x00,0x00},	// 8
-	{0x00,0x00,0x3E,0x63,0x63,0x63,0x63,0x3F,0x03,0x03,0x06,0x3C,0x00,0x00,0x00,0x00},	// 9
-	{0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x00,0x00,0x00,0x18,0x18,0x00,0x00,0x00,0x00},	// :
-	{0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x00,0x00,0x00,0x18,0x18,0x18,0x30,0x00,0x00},	// ;
-	{0x00,0x00,0x00,0x06,0x0C,0x18,0x30,0x60,0x30,0x18,0x0C,0x06,0x00,0x00,0x00,0x00},	// <
-	{0x00,0x00,0x00,0x00,0x00,0x00,0x7E,0x00,0x00,0x7E,0x00,0x00,0x00,0x00,0x00,0x00},	// =
-	{0x00,0x00,0x00,0x60,0x30,0x18,0x0C,0x06,0x0C,0x18,0x30,0x60,0x00,0x00,0x00,0x00},	// >
-	{0x00,0x00,0x3E,0x63,0x63,0x06,0x0C,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x00,0x00,0x00},	// ?
-	{0x00,0x00,0x3E,0x63,0x63,0x6F,0x6B,0x6B,0x6E,0x60,0x60,0x3E,0x00,0x00,0x00,0x00},	// @
-	{0x00,0x00,0x08,0x1C,0x36,0x63,0x63,0x63,0x7F,0x63,0x63,0x63,0x00,0x00,0x00,0x00},	// A
-	{0x00,0x00,0x7E,0x33,0x33,0x33,0x3E,0x33,0x33,0x33,0x33,0x7E,0x00,0x00,0x00,0x00},	// B
-	{0x00,0x00,0x1E,0x33,0x61,0x60,0x60,0x60,0x60,0x61,0x33,0x1E,0x00,0x00,0x00,0x00},	// C
-	{0x00,0x00,0x7C,0x36,0x33,0x33,0x33,0x33,0x33,0x33,0x36,0x7C,0x00,0x00,0x00,0x00},	// D
-	{0x00,0x00,0x7F,0x33,0x31,0x34,0x3C,0x34,0x30,0x31,0x33,0x7F,0x00,0x00,0x00,0x00},	// E
-	{0x00,0x00,0x7F,0x33,0x31,0x34,0x3C,0x34,0x30,0x30,0x30,0x78,0x00,0x00,0x00,0x00},	// F
-	{0x00,0x00,0x1E,0x33,0x61,0x60,0x60,0x6F,0x63,0x63,0x37,0x1D,0x00,0x00,0x00,0x00},	// G
-	{0x00,0x00,0x63,0x63,0x63,0x63,0x7F,0x63,0x63,0x63,0x63,0x63,0x00,0x00,0x00,0x00},	// H
-	{0x00,0x00,0x3C,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x3C,0x00,0x00,0x00,0x00},	// I
-	{0x00,0x00,0x0F,0x06,0x06,0x06,0x06,0x06,0x06,0x66,0x66,0x3C,0x00,0x00,0x00,0x00},	// J
-	{0x00,0x00,0x73,0x33,0x36,0x36,0x3C,0x36,0x36,0x33,0x33,0x73,0x00,0x00,0x00,0x00},	// K
-	{0x00,0x00,0x78,0x30,0x30,0x30,0x30,0x30,0x30,0x31,0x33,0x7F,0x00,0x00,0x00,0x00},	// L
-	{0x00,0x00,0x63,0x77,0x7F,0x6B,0x63,0x63,0x63,0x63,0x63,0x63,0x00,0x00,0x00,0x00},	// M
-	{0x00,0x00,0x63,0x63,0x73,0x7B,0x7F,0x6F,0x67,0x63,0x63,0x63,0x00,0x00,0x00,0x00},	// N
-	{0x00,0x00,0x1C,0x36,0x63,0x63,0x63,0x63,0x63,0x63,0x36,0x1C,0x00,0x00,0x00,0x00},	// O
-	{0x00,0x00,0x7E,0x33,0x33,0x33,0x3E,0x30,0x30,0x30,0x30,0x78,0x00,0x00,0x00,0x00},	// P
-	{0x00,0x00,0x3E,0x63,0x63,0x63,0x63,0x63,0x63,0x6B,0x6F,0x3E,0x06,0x07,0x00,0x00},	// Q
-	{0x00,0x00,0x7E,0x33,0x33,0x33,0x3E,0x36,0x36,0x33,0x33,0x73,0x00,0x00,0x00,0x00},	// R
-	{0x00,0x00,0x3E,0x63,0x63,0x30,0x1C,0x06,0x03,0x63,0x63,0x3E,0x00,0x00,0x00,0x00},	// S
-	{0x00,0x00,0xFF,0xDB,0x99,0x18,0x18,0x18,0x18,0x18,0x18,0x3C,0x00,0x00,0x00,0x00},	// T
-	{0x00,0x00,0x63,0x63,0x63,0x63,0x63,0x63,0x63,0x63,0x63,0x3E,0x00,0x00,0x00,0x00},	// U
-	{0x00,0x00,0x63,0x63,0x63,0x63,0x63,0x63,0x63,0x36,0x1C,0x08,0x00,0x00,0x00,0x00},	// V
-	{0x00,0x00,0x63,0x63,0x63,0x63,0x63,0x6B,0x6B,0x7F,0x36,0x36,0x00,0x00,0x00,0x00},	// W
-	{0x00,0x00,0xC3,0xC3,0x66,0x3C,0x18,0x18,0x3C,0x66,0xC3,0xC3,0x00,0x00,0x00,0x00},	// X
-	{0x00,0x00,0xC3,0xC3,0xC3,0x66,0x3C,0x18,0x18,0x18,0x18,0x3C,0x00,0x00,0x00,0x00},	// Y
-	{0x00,0x00,0x7F,0x63,0x43,0x06,0x0C,0x18,0x30,0x61,0x63,0x7F,0x00,0x00,0x00,0x00},	// Z
-	{0x00,0x00,0x3C,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x3C,0x00,0x00,0x00,0x00},	// [
-	{0x00,0x00,0x80,0xC0,0xE0,0x70,0x38,0x1C,0x0E,0x07,0x03,0x01,0x00,0x00,0x00,0x00},	// backslash
-	{0x00,0x00,0x3C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x3C,0x00,0x00,0x00,0x00},	// ]
-	{0x08,0x1C,0x36,0x63,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},	// ^
-	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0x00,0x00,0x00},	// _
-	{0x18,0x18,0x0C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},	// `
-	{0x00,0x00,0x00,0x00,0x00,0x3C,0x46,0x06,0x3E,0x66,0x66,0x3B,0x00,0x00,0x00,0x00},	// a
-	{0x00,0x00,0x70,0x30,0x30,0x3C,0x36,0x33,0x33,0x33,0x33,0x6E,0x00,0x00,0x00,0x00},	// b
-	{0x00,0x00,0x00,0x00,0x00,0x3E,0x63,0x60,0x60,0x60,0x63,0x3E,0x00,0x00,0x00,0x00},	// c
-	{0x00,0x00,0x0E,0x06,0x06,0x1E,0x36,0x66,0x66,0x66,0x66,0x3B,0x00,0x00,0x00,0x00},	// d
-	{0x00,0x00,0x00,0x00,0x00,0x3E,0x63,0x63,0x7E,0x60,0x63,0x3E,0x00,0x00,0x00,0x00},	// e
-	{0x00,0x00,0x1C,0x36,0x32,0x30,0x7C,0x30,0x30,0x30,0x30,0x78,0x00,0x00,0x00,0x00},	// f
-	{0x00,0x00,0x00,0x00,0x00,0x3B,0x66,0x66,0x66,0x66,0x3E,0x06,0x66,0x3C,0x00,0x00},	// g
-	{0x00,0x00,0x70,0x30,0x30,0x36,0x3B,0x33,0x33,0x33,0x33,0x73,0x00,0x00,0x00,0x00},	// h
-	{0x00,0x00,0x0C,0x0C,0x00,0x1C,0x0C,0x0C,0x0C,0x0C,0x0C,0x1E,0x00,0x00,0x00,0x00},	// i
-	{0x00,0x00,0x06,0x06,0x00,0x0E,0x06,0x06,0x06,0x06,0x06,0x66,0x66,0x3C,0x00,0x00},	// j
-	{0x00,0x00,0x70,0x30,0x30,0x33,0x33,0x36,0x3C,0x36,0x33,0x73,0x00,0x00,0x00,0x00},	// k
-	{0x00,0x00,0x1C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x1E,0x00,0x00,0x00,0x00},	// l
-	{0x00,0x00,0x00,0x00,0x00,0x6E,0x7F,0x6B,0x6B,0x6B,0x6B,0x6B,0x00,0x00,0x00,0x00},	// m
-	{0x00,0x00,0x00,0x00,0x00,0x6E,0x33,0x33,0x33,0x33,0x33,0x33,0x00,0x00,0x00,0x00},	// n
-	{0x00,0x00,0x00,0x00,0x00,0x3E,0x63,0x63,0x63,0x63,0x63,0x3E,0x00,0x00,0x00,0x00},	// o
-	{0x00,0x00,0x00,0x00,0x00,0x6E,0x33,0x33,0x33,0x33,0x3E,0x30,0x30,0x78,0x00,0x00},	// p
-	{0x00,0x00,0x00,0x00,0x00,0x3B,0x66,0x66,0x66,0x66,0x3E,0x06,0x06,0x0F,0x00,0x00},	// q
-	{0x00,0x00,0x00,0x00,0x00,0x6E,0x3B,0x33,0x30,0x30,0x30,0x78,0x00,0x00,0x00,0x00},	// r
-	{0x00,0x00,0x00,0x00,0x00,0x3E,0x63,0x38,0x0E,0x03,0x63,0x3E,0x00,0x00,0x00,0x00},	// s
-	{0x00,0x00,0x08,0x18,0x18,0x7E,0x18,0x18,0x18,0x18,0x1B,0x0E,0x00,0x00,0x00,0x00},	// t
-	{0x00,0x00,0x00,0x00,0x00,0x66,0x66,0x66,0x66,0x66,0x66,0x3B,0x00,0x00,0x00,0x00},	// u
-	{0x00,0x00,0x00,0x00,0x00,0x63,0x63,0x36,0x36,0x1C,0x1C,0x08,0x00,0x00,0x00,0x00},	// v
-	{0x00,0x00,0x00,0x00,0x00,0x63,0x63,0x63,0x6B,0x6B,0x7F,0x36,0x00,0x00,0x00,0x00},	// w
-	{0x00,0x00,0x00,0x00,0x00,0x63,0x36,0x1C,0x1C,0x1C,0x36,0x63,0x00,0x00,0x00,0x00},	// x
-	{0x00,0x00,0x00,0x00,0x00,0x63,0x63,0x63,0x63,0x63,0x3F,0x03,0x06,0x3C,0x00,0x00},	// y
-	{0x00,0x00,0x00,0x00,0x00,0x7F,0x66,0x0C,0x18,0x30,0x63,0x7F,0x00,0x00,0x00,0x00},	// z
-	{0x00,0x00,0x0E,0x18,0x18,0x18,0x70,0x18,0x18,0x18,0x18,0x0E,0x00,0x00,0x00,0x00},	// {
-	{0x00,0x00,0x18,0x18,0x18,0x18,0x18,0x00,0x18,0x18,0x18,0x18,0x18,0x00,0x00,0x00},	// |
-	{0x00,0x00,0x70,0x18,0x18,0x18,0x0E,0x18,0x18,0x18,0x18,0x70,0x00,0x00,0x00,0x00},	// }
-	{0x00,0x00,0x3B,0x6E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},	// ~
-	{0x00,0x70,0xD8,0xD8,0x70,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}	// DEL
+    {0x08,0x10,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},  // columns, rows, bytes per char
+    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},  // space
+    {0x00,0x00,0x18,0x3C,0x3C,0x3C,0x18,0x18,0x18,0x00,0x18,0x18,0x00,0x00,0x00,0x00},  // !
+    {0x00,0x63,0x63,0x63,0x22,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},  // "
+    {0x00,0x00,0x00,0x36,0x36,0x7F,0x36,0x36,0x36,0x7F,0x36,0x36,0x00,0x00,0x00,0x00},  // #
+    {0x0C,0x0C,0x3E,0x63,0x61,0x60,0x3E,0x03,0x03,0x43,0x63,0x3E,0x0C,0x0C,0x00,0x00},  // $
+    {0x00,0x00,0x00,0x00,0x00,0x61,0x63,0x06,0x0C,0x18,0x33,0x63,0x00,0x00,0x00,0x00},  // %
+    {0x00,0x00,0x00,0x1C,0x36,0x36,0x1C,0x3B,0x6E,0x66,0x66,0x3B,0x00,0x00,0x00,0x00},  // &
+    {0x00,0x30,0x30,0x30,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},  // '
+    {0x00,0x00,0x0C,0x18,0x18,0x30,0x30,0x30,0x30,0x18,0x18,0x0C,0x00,0x00,0x00,0x00},  // (
+    {0x00,0x00,0x18,0x0C,0x0C,0x06,0x06,0x06,0x06,0x0C,0x0C,0x18,0x00,0x00,0x00,0x00},  // )
+    {0x00,0x00,0x00,0x00,0x42,0x66,0x3C,0xFF,0x3C,0x66,0x42,0x00,0x00,0x00,0x00,0x00},  // *
+    {0x00,0x00,0x00,0x00,0x18,0x18,0x18,0xFF,0x18,0x18,0x18,0x00,0x00,0x00,0x00,0x00},  // +
+    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x18,0x30,0x00,0x00},  // ,
+    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},  // -
+    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x00,0x00,0x00,0x00},  // .
+    {0x00,0x00,0x01,0x03,0x07,0x0E,0x1C,0x38,0x70,0xE0,0xC0,0x80,0x00,0x00,0x00,0x00},  // /
+    {0x00,0x00,0x3E,0x63,0x63,0x63,0x6B,0x6B,0x63,0x63,0x63,0x3E,0x00,0x00,0x00,0x00},  // 0
+    {0x00,0x00,0x0C,0x1C,0x3C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x3F,0x00,0x00,0x00,0x00},  // 1
+    {0x00,0x00,0x3E,0x63,0x03,0x06,0x0C,0x18,0x30,0x61,0x63,0x7F,0x00,0x00,0x00,0x00},  // 2
+    {0x00,0x00,0x3E,0x63,0x03,0x03,0x1E,0x03,0x03,0x03,0x63,0x3E,0x00,0x00,0x00,0x00},  // 3
+    {0x00,0x00,0x06,0x0E,0x1E,0x36,0x66,0x66,0x7F,0x06,0x06,0x0F,0x00,0x00,0x00,0x00},  // 4
+    {0x00,0x00,0x7F,0x60,0x60,0x60,0x7E,0x03,0x03,0x63,0x73,0x3E,0x00,0x00,0x00,0x00},  // 5
+    {0x00,0x00,0x1C,0x30,0x60,0x60,0x7E,0x63,0x63,0x63,0x63,0x3E,0x00,0x00,0x00,0x00},  // 6
+    {0x00,0x00,0x7F,0x63,0x03,0x06,0x06,0x0C,0x0C,0x18,0x18,0x18,0x00,0x00,0x00,0x00},  // 7
+    {0x00,0x00,0x3E,0x63,0x63,0x63,0x3E,0x63,0x63,0x63,0x63,0x3E,0x00,0x00,0x00,0x00},  // 8
+    {0x00,0x00,0x3E,0x63,0x63,0x63,0x63,0x3F,0x03,0x03,0x06,0x3C,0x00,0x00,0x00,0x00},  // 9
+    {0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x00,0x00,0x00,0x18,0x18,0x00,0x00,0x00,0x00},  // :
+    {0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x00,0x00,0x00,0x18,0x18,0x18,0x30,0x00,0x00},  // ;
+    {0x00,0x00,0x00,0x06,0x0C,0x18,0x30,0x60,0x30,0x18,0x0C,0x06,0x00,0x00,0x00,0x00},  // <
+    {0x00,0x00,0x00,0x00,0x00,0x00,0x7E,0x00,0x00,0x7E,0x00,0x00,0x00,0x00,0x00,0x00},  // =
+    {0x00,0x00,0x00,0x60,0x30,0x18,0x0C,0x06,0x0C,0x18,0x30,0x60,0x00,0x00,0x00,0x00},  // >
+    {0x00,0x00,0x3E,0x63,0x63,0x06,0x0C,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x00,0x00,0x00},  // ?
+    {0x00,0x00,0x3E,0x63,0x63,0x6F,0x6B,0x6B,0x6E,0x60,0x60,0x3E,0x00,0x00,0x00,0x00},  // @
+    {0x00,0x00,0x08,0x1C,0x36,0x63,0x63,0x63,0x7F,0x63,0x63,0x63,0x00,0x00,0x00,0x00},  // A
+    {0x00,0x00,0x7E,0x33,0x33,0x33,0x3E,0x33,0x33,0x33,0x33,0x7E,0x00,0x00,0x00,0x00},  // B
+    {0x00,0x00,0x1E,0x33,0x61,0x60,0x60,0x60,0x60,0x61,0x33,0x1E,0x00,0x00,0x00,0x00},  // C
+    {0x00,0x00,0x7C,0x36,0x33,0x33,0x33,0x33,0x33,0x33,0x36,0x7C,0x00,0x00,0x00,0x00},  // D
+    {0x00,0x00,0x7F,0x33,0x31,0x34,0x3C,0x34,0x30,0x31,0x33,0x7F,0x00,0x00,0x00,0x00},  // E
+    {0x00,0x00,0x7F,0x33,0x31,0x34,0x3C,0x34,0x30,0x30,0x30,0x78,0x00,0x00,0x00,0x00},  // F
+    {0x00,0x00,0x1E,0x33,0x61,0x60,0x60,0x6F,0x63,0x63,0x37,0x1D,0x00,0x00,0x00,0x00},  // G
+    {0x00,0x00,0x63,0x63,0x63,0x63,0x7F,0x63,0x63,0x63,0x63,0x63,0x00,0x00,0x00,0x00},  // H
+    {0x00,0x00,0x3C,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x3C,0x00,0x00,0x00,0x00},  // I
+    {0x00,0x00,0x0F,0x06,0x06,0x06,0x06,0x06,0x06,0x66,0x66,0x3C,0x00,0x00,0x00,0x00},  // J
+    {0x00,0x00,0x73,0x33,0x36,0x36,0x3C,0x36,0x36,0x33,0x33,0x73,0x00,0x00,0x00,0x00},  // K
+    {0x00,0x00,0x78,0x30,0x30,0x30,0x30,0x30,0x30,0x31,0x33,0x7F,0x00,0x00,0x00,0x00},  // L
+    {0x00,0x00,0x63,0x77,0x7F,0x6B,0x63,0x63,0x63,0x63,0x63,0x63,0x00,0x00,0x00,0x00},  // M
+    {0x00,0x00,0x63,0x63,0x73,0x7B,0x7F,0x6F,0x67,0x63,0x63,0x63,0x00,0x00,0x00,0x00},  // N
+    {0x00,0x00,0x1C,0x36,0x63,0x63,0x63,0x63,0x63,0x63,0x36,0x1C,0x00,0x00,0x00,0x00},  // O
+    {0x00,0x00,0x7E,0x33,0x33,0x33,0x3E,0x30,0x30,0x30,0x30,0x78,0x00,0x00,0x00,0x00},  // P
+    {0x00,0x00,0x3E,0x63,0x63,0x63,0x63,0x63,0x63,0x6B,0x6F,0x3E,0x06,0x07,0x00,0x00},  // Q
+    {0x00,0x00,0x7E,0x33,0x33,0x33,0x3E,0x36,0x36,0x33,0x33,0x73,0x00,0x00,0x00,0x00},  // R
+    {0x00,0x00,0x3E,0x63,0x63,0x30,0x1C,0x06,0x03,0x63,0x63,0x3E,0x00,0x00,0x00,0x00},  // S
+    {0x00,0x00,0xFF,0xDB,0x99,0x18,0x18,0x18,0x18,0x18,0x18,0x3C,0x00,0x00,0x00,0x00},  // T
+    {0x00,0x00,0x63,0x63,0x63,0x63,0x63,0x63,0x63,0x63,0x63,0x3E,0x00,0x00,0x00,0x00},  // U
+    {0x00,0x00,0x63,0x63,0x63,0x63,0x63,0x63,0x63,0x36,0x1C,0x08,0x00,0x00,0x00,0x00},  // V
+    {0x00,0x00,0x63,0x63,0x63,0x63,0x63,0x6B,0x6B,0x7F,0x36,0x36,0x00,0x00,0x00,0x00},  // W
+    {0x00,0x00,0xC3,0xC3,0x66,0x3C,0x18,0x18,0x3C,0x66,0xC3,0xC3,0x00,0x00,0x00,0x00},  // X
+    {0x00,0x00,0xC3,0xC3,0xC3,0x66,0x3C,0x18,0x18,0x18,0x18,0x3C,0x00,0x00,0x00,0x00},  // Y
+    {0x00,0x00,0x7F,0x63,0x43,0x06,0x0C,0x18,0x30,0x61,0x63,0x7F,0x00,0x00,0x00,0x00},  // Z
+    {0x00,0x00,0x3C,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x3C,0x00,0x00,0x00,0x00},  // [
+    {0x00,0x00,0x80,0xC0,0xE0,0x70,0x38,0x1C,0x0E,0x07,0x03,0x01,0x00,0x00,0x00,0x00},  // backslash
+    {0x00,0x00,0x3C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x3C,0x00,0x00,0x00,0x00},  // ]
+    {0x08,0x1C,0x36,0x63,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},  // ^
+    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0x00,0x00,0x00},  // _
+    {0x18,0x18,0x0C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},  // `
+    {0x00,0x00,0x00,0x00,0x00,0x3C,0x46,0x06,0x3E,0x66,0x66,0x3B,0x00,0x00,0x00,0x00},  // a
+    {0x00,0x00,0x70,0x30,0x30,0x3C,0x36,0x33,0x33,0x33,0x33,0x6E,0x00,0x00,0x00,0x00},  // b
+    {0x00,0x00,0x00,0x00,0x00,0x3E,0x63,0x60,0x60,0x60,0x63,0x3E,0x00,0x00,0x00,0x00},  // c
+    {0x00,0x00,0x0E,0x06,0x06,0x1E,0x36,0x66,0x66,0x66,0x66,0x3B,0x00,0x00,0x00,0x00},  // d
+    {0x00,0x00,0x00,0x00,0x00,0x3E,0x63,0x63,0x7E,0x60,0x63,0x3E,0x00,0x00,0x00,0x00},  // e
+    {0x00,0x00,0x1C,0x36,0x32,0x30,0x7C,0x30,0x30,0x30,0x30,0x78,0x00,0x00,0x00,0x00},  // f
+    {0x00,0x00,0x00,0x00,0x00,0x3B,0x66,0x66,0x66,0x66,0x3E,0x06,0x66,0x3C,0x00,0x00},  // g
+    {0x00,0x00,0x70,0x30,0x30,0x36,0x3B,0x33,0x33,0x33,0x33,0x73,0x00,0x00,0x00,0x00},  // h
+    {0x00,0x00,0x0C,0x0C,0x00,0x1C,0x0C,0x0C,0x0C,0x0C,0x0C,0x1E,0x00,0x00,0x00,0x00},  // i
+    {0x00,0x00,0x06,0x06,0x00,0x0E,0x06,0x06,0x06,0x06,0x06,0x66,0x66,0x3C,0x00,0x00},  // j
+    {0x00,0x00,0x70,0x30,0x30,0x33,0x33,0x36,0x3C,0x36,0x33,0x73,0x00,0x00,0x00,0x00},  // k
+    {0x00,0x00,0x1C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x1E,0x00,0x00,0x00,0x00},  // l
+    {0x00,0x00,0x00,0x00,0x00,0x6E,0x7F,0x6B,0x6B,0x6B,0x6B,0x6B,0x00,0x00,0x00,0x00},  // m
+    {0x00,0x00,0x00,0x00,0x00,0x6E,0x33,0x33,0x33,0x33,0x33,0x33,0x00,0x00,0x00,0x00},  // n
+    {0x00,0x00,0x00,0x00,0x00,0x3E,0x63,0x63,0x63,0x63,0x63,0x3E,0x00,0x00,0x00,0x00},  // o
+    {0x00,0x00,0x00,0x00,0x00,0x6E,0x33,0x33,0x33,0x33,0x3E,0x30,0x30,0x78,0x00,0x00},  // p
+    {0x00,0x00,0x00,0x00,0x00,0x3B,0x66,0x66,0x66,0x66,0x3E,0x06,0x06,0x0F,0x00,0x00},  // q
+    {0x00,0x00,0x00,0x00,0x00,0x6E,0x3B,0x33,0x30,0x30,0x30,0x78,0x00,0x00,0x00,0x00},  // r
+    {0x00,0x00,0x00,0x00,0x00,0x3E,0x63,0x38,0x0E,0x03,0x63,0x3E,0x00,0x00,0x00,0x00},  // s
+    {0x00,0x00,0x08,0x18,0x18,0x7E,0x18,0x18,0x18,0x18,0x1B,0x0E,0x00,0x00,0x00,0x00},  // t
+    {0x00,0x00,0x00,0x00,0x00,0x66,0x66,0x66,0x66,0x66,0x66,0x3B,0x00,0x00,0x00,0x00},  // u
+    {0x00,0x00,0x00,0x00,0x00,0x63,0x63,0x36,0x36,0x1C,0x1C,0x08,0x00,0x00,0x00,0x00},  // v
+    {0x00,0x00,0x00,0x00,0x00,0x63,0x63,0x63,0x6B,0x6B,0x7F,0x36,0x00,0x00,0x00,0x00},  // w
+    {0x00,0x00,0x00,0x00,0x00,0x63,0x36,0x1C,0x1C,0x1C,0x36,0x63,0x00,0x00,0x00,0x00},  // x
+    {0x00,0x00,0x00,0x00,0x00,0x63,0x63,0x63,0x63,0x63,0x3F,0x03,0x06,0x3C,0x00,0x00},  // y
+    {0x00,0x00,0x00,0x00,0x00,0x7F,0x66,0x0C,0x18,0x30,0x63,0x7F,0x00,0x00,0x00,0x00},  // z
+    {0x00,0x00,0x0E,0x18,0x18,0x18,0x70,0x18,0x18,0x18,0x18,0x0E,0x00,0x00,0x00,0x00},  // {
+    {0x00,0x00,0x18,0x18,0x18,0x18,0x18,0x00,0x18,0x18,0x18,0x18,0x18,0x00,0x00,0x00},  // |
+    {0x00,0x00,0x70,0x18,0x18,0x18,0x0E,0x18,0x18,0x18,0x18,0x70,0x00,0x00,0x00,0x00},  // }
+    {0x00,0x00,0x3B,0x6E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},  // ~
+    {0x00,0x70,0xD8,0xD8,0x70,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}   // DEL
 };
 */
diff --git a/armsrc/fpgaloader.c b/armsrc/fpgaloader.c
index 18430b78b..2af6fd0ec 100644
--- a/armsrc/fpgaloader.c
+++ b/armsrc/fpgaloader.c
@@ -21,7 +21,7 @@ extern uint8_t _binary_obj_fpga_all_bit_z_start, _binary_obj_fpga_all_bit_z_end;
 static uint8_t *fpga_image_ptr = NULL;
 static uint32_t uncompressed_bytes_cnt;
 
-#define OUTPUT_BUFFER_LEN 		80
+#define OUTPUT_BUFFER_LEN 80
 
 //-----------------------------------------------------------------------------
 // Set up the Serial Peripheral Interface as master
@@ -29,7 +29,7 @@ static uint32_t uncompressed_bytes_cnt;
 // May also be used to write to other SPI attached devices like an LCD
 //-----------------------------------------------------------------------------
 static void DisableSpi(void) {
-	//* Reset all the Chip Select register
+    //* Reset all the Chip Select register
     AT91C_BASE_SPI->SPI_CSR[0] = 0;
     AT91C_BASE_SPI->SPI_CSR[1] = 0;
     AT91C_BASE_SPI->SPI_CSR[2] = 0;
@@ -41,77 +41,77 @@ static void DisableSpi(void) {
     // Disable all interrupts
     AT91C_BASE_SPI->SPI_IDR = 0xFFFFFFFF;
 
-	// SPI disable
-	AT91C_BASE_SPI->SPI_CR = AT91C_SPI_SPIDIS;
+    // SPI disable
+    AT91C_BASE_SPI->SPI_CR = AT91C_SPI_SPIDIS;
 }
 
 void SetupSpi(int mode) {
-	// PA1	-> SPI_NCS3 chip select (MEM)
-	// PA10 -> SPI_NCS2 chip select (LCD)
-	// PA11 -> SPI_NCS0 chip select (FPGA)
-	// PA12 -> SPI_MISO Master-In Slave-Out
-	// PA13 -> SPI_MOSI Master-Out Slave-In
-	// PA14 -> SPI_SPCK Serial Clock
+    // PA1  -> SPI_NCS3 chip select (MEM)
+    // PA10 -> SPI_NCS2 chip select (LCD)
+    // PA11 -> SPI_NCS0 chip select (FPGA)
+    // PA12 -> SPI_MISO Master-In Slave-Out
+    // PA13 -> SPI_MOSI Master-Out Slave-In
+    // PA14 -> SPI_SPCK Serial Clock
 
-	// Disable PIO control of the following pins, allows use by the SPI peripheral
-	AT91C_BASE_PIOA->PIO_PDR = GPIO_NCS0 | GPIO_MISO | GPIO_MOSI | GPIO_SPCK;
+    // Disable PIO control of the following pins, allows use by the SPI peripheral
+    AT91C_BASE_PIOA->PIO_PDR = GPIO_NCS0 | GPIO_MISO | GPIO_MOSI | GPIO_SPCK;
 
-	// Peripheral A
-	AT91C_BASE_PIOA->PIO_ASR = GPIO_NCS0 | GPIO_MISO | GPIO_MOSI | GPIO_SPCK;
+    // Peripheral A
+    AT91C_BASE_PIOA->PIO_ASR = GPIO_NCS0 | GPIO_MISO | GPIO_MOSI | GPIO_SPCK;
 
-	// Peripheral B
-	//AT91C_BASE_PIOA->PIO_BSR |= GPIO_NCS2;
+    // Peripheral B
+    //AT91C_BASE_PIOA->PIO_BSR |= GPIO_NCS2;
 
-	//enable the SPI Peripheral clock
-	AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_SPI);
-	// Enable SPI
-	AT91C_BASE_SPI->SPI_CR = AT91C_SPI_SPIEN;
+    //enable the SPI Peripheral clock
+    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_SPI);
+    // Enable SPI
+    AT91C_BASE_SPI->SPI_CR = AT91C_SPI_SPIEN;
 
-	switch (mode) {
-		case SPI_FPGA_MODE:
-			AT91C_BASE_SPI->SPI_MR =
-				( 0 << 24)			|	// Delay between chip selects (take default: 6 MCK periods)
-				(0xE << 16)			|	// Peripheral Chip Select (selects FPGA SPI_NCS0 or PA11)
-				( 0 << 7)			|	// Local Loopback Disabled
-				AT91C_SPI_MODFDIS 	|	// Mode Fault Detection disabled
-				( 0 << 2)			|	// Chip selects connected directly to peripheral
-				AT91C_SPI_PS_FIXED	|	// Fixed Peripheral Select
-				AT91C_SPI_MSTR;		// Master Mode
+    switch (mode) {
+        case SPI_FPGA_MODE:
+            AT91C_BASE_SPI->SPI_MR =
+                ( 0 << 24)          | // Delay between chip selects (take default: 6 MCK periods)
+                (0xE << 16)         | // Peripheral Chip Select (selects FPGA SPI_NCS0 or PA11)
+                ( 0 << 7)           | // Local Loopback Disabled
+                AT91C_SPI_MODFDIS   | // Mode Fault Detection disabled
+                ( 0 << 2)           | // Chip selects connected directly to peripheral
+                AT91C_SPI_PS_FIXED  | // Fixed Peripheral Select
+                AT91C_SPI_MSTR;       // Master Mode
 
-			AT91C_BASE_SPI->SPI_CSR[0] =
-				( 1 << 24)	|	// Delay between Consecutive Transfers (32 MCK periods)
-				( 1 << 16)	|	// Delay Before SPCK (1 MCK period)
-				( 6 << 8)	|	// Serial Clock Baud Rate (baudrate = MCK/6 = 24Mhz/6 = 4M baud
-				AT91C_SPI_BITS_16 |	// Bits per Transfer (16 bits)
-				( 0 << 3)	|	// Chip Select inactive after transfer
-				AT91C_SPI_NCPHA	|	// Clock Phase data captured on leading edge, changes on following edge
-				( 0 << 0);		// Clock Polarity inactive state is logic 0
-			break;
+            AT91C_BASE_SPI->SPI_CSR[0] =
+                ( 1 << 24)          | // Delay between Consecutive Transfers (32 MCK periods)
+                ( 1 << 16)          | // Delay Before SPCK (1 MCK period)
+                ( 6 << 8)           | // Serial Clock Baud Rate (baudrate = MCK/6 = 24Mhz/6 = 4M baud
+                AT91C_SPI_BITS_16   | // Bits per Transfer (16 bits)
+                ( 0 << 3)           | // Chip Select inactive after transfer
+                AT91C_SPI_NCPHA     | // Clock Phase data captured on leading edge, changes on following edge
+                ( 0 << 0);            // Clock Polarity inactive state is logic 0
+            break;
 /*
-			case SPI_LCD_MODE:
-			AT91C_BASE_SPI->SPI_MR =
-				( 0 << 24)	|	// Delay between chip selects (take default: 6 MCK periods)
-				(0xB << 16)	|	// Peripheral Chip Select (selects LCD SPI_NCS2 or PA10)
-				( 0 << 7)	|	// Local Loopback Disabled
-				( 1 << 4)	|	// Mode Fault Detection disabled
-				( 0 << 2)	|	// Chip selects connected directly to peripheral
-				( 0 << 1) 	|	// Fixed Peripheral Select
-				( 1 << 0);		// Master Mode
+            case SPI_LCD_MODE:
+            AT91C_BASE_SPI->SPI_MR =
+                ( 0 << 24)          | // Delay between chip selects (take default: 6 MCK periods)
+                (0xB << 16)         | // Peripheral Chip Select (selects LCD SPI_NCS2 or PA10)
+                ( 0 << 7)           | // Local Loopback Disabled
+                ( 1 << 4)           | // Mode Fault Detection disabled
+                ( 0 << 2)           | // Chip selects connected directly to peripheral
+                ( 0 << 1)           | // Fixed Peripheral Select
+                ( 1 << 0);            // Master Mode
 
-			AT91C_BASE_SPI->SPI_CSR[2] =
-				( 1 << 24)	|	// Delay between Consecutive Transfers (32 MCK periods)
-				( 1 << 16)	|	// Delay Before SPCK (1 MCK period)
-				( 6 << 8)	|	// Serial Clock Baud Rate (baudrate = MCK/6 = 24Mhz/6 = 4M baud
-				AT91C_SPI_BITS_9 |	// Bits per Transfer (9 bits)
-				( 0 << 3)	|	// Chip Select inactive after transfer
-				( 1 << 1)	|	// Clock Phase data captured on leading edge, changes on following edge
-				( 0 << 0);		// Clock Polarity inactive state is logic 0
-			break;
+            AT91C_BASE_SPI->SPI_CSR[2] =
+                ( 1 << 24)          | // Delay between Consecutive Transfers (32 MCK periods)
+                ( 1 << 16)          | // Delay Before SPCK (1 MCK period)
+                ( 6 << 8)           | // Serial Clock Baud Rate (baudrate = MCK/6 = 24Mhz/6 = 4M baud
+                AT91C_SPI_BITS_9    | // Bits per Transfer (9 bits)
+                ( 0 << 3)           | // Chip Select inactive after transfer
+                ( 1 << 1)           | // Clock Phase data captured on leading edge, changes on following edge
+                ( 0 << 0);            // Clock Polarity inactive state is logic 0
+            break;
 */
-		default:
-			DisableSpi();
-			break;
-	}
+        default:
+            DisableSpi();
+            break;
+    }
 }
 
 //-----------------------------------------------------------------------------
@@ -119,35 +119,35 @@ void SetupSpi(int mode) {
 // always use when we are talking to the FPGA. Both RX and TX are enabled.
 //-----------------------------------------------------------------------------
 void FpgaSetupSsc(void) {
-	// First configure the GPIOs, and get ourselves a clock.
-	AT91C_BASE_PIOA->PIO_ASR =
-		GPIO_SSC_FRAME	|
-		GPIO_SSC_DIN	|
-		GPIO_SSC_DOUT	|
-		GPIO_SSC_CLK;
-	AT91C_BASE_PIOA->PIO_PDR = GPIO_SSC_DOUT;
+    // First configure the GPIOs, and get ourselves a clock.
+    AT91C_BASE_PIOA->PIO_ASR =
+        GPIO_SSC_FRAME  |
+        GPIO_SSC_DIN    |
+        GPIO_SSC_DOUT   |
+        GPIO_SSC_CLK;
+    AT91C_BASE_PIOA->PIO_PDR = GPIO_SSC_DOUT;
 
-		AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_SSC);
+        AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_SSC);
 
-	// Now set up the SSC proper, starting from a known state.
-	AT91C_BASE_SSC->SSC_CR = AT91C_SSC_SWRST;
+    // Now set up the SSC proper, starting from a known state.
+    AT91C_BASE_SSC->SSC_CR = AT91C_SSC_SWRST;
 
-	// RX clock comes from TX clock, RX starts when TX starts, data changes
-	// on RX clock rising edge, sampled on falling edge
-	AT91C_BASE_SSC->SSC_RCMR = SSC_CLOCK_MODE_SELECT(1) | SSC_CLOCK_MODE_START(1);
+    // RX clock comes from TX clock, RX starts when TX starts, data changes
+    // on RX clock rising edge, sampled on falling edge
+    AT91C_BASE_SSC->SSC_RCMR = SSC_CLOCK_MODE_SELECT(1) | SSC_CLOCK_MODE_START(1);
 
-	// 8 bits per transfer, no loopback, MSB first, 1 transfer per sync
-	// pulse, no output sync
-	AT91C_BASE_SSC->SSC_RFMR = SSC_FRAME_MODE_BITS_IN_WORD(8) |	AT91C_SSC_MSBF | SSC_FRAME_MODE_WORDS_PER_TRANSFER(0);
+    // 8 bits per transfer, no loopback, MSB first, 1 transfer per sync
+    // pulse, no output sync
+    AT91C_BASE_SSC->SSC_RFMR = SSC_FRAME_MODE_BITS_IN_WORD(8) | AT91C_SSC_MSBF | SSC_FRAME_MODE_WORDS_PER_TRANSFER(0);
 
-	// clock comes from TK pin, no clock output, outputs change on falling
-	// edge of TK, sample on rising edge of TK, start on positive-going edge of sync
-	AT91C_BASE_SSC->SSC_TCMR = SSC_CLOCK_MODE_SELECT(2) |	SSC_CLOCK_MODE_START(5);
+    // clock comes from TK pin, no clock output, outputs change on falling
+    // edge of TK, sample on rising edge of TK, start on positive-going edge of sync
+    AT91C_BASE_SSC->SSC_TCMR = SSC_CLOCK_MODE_SELECT(2) | SSC_CLOCK_MODE_START(5);
 
-	// tx framing is the same as the rx framing
-	AT91C_BASE_SSC->SSC_TFMR = AT91C_BASE_SSC->SSC_RFMR;
+    // tx framing is the same as the rx framing
+    AT91C_BASE_SSC->SSC_TFMR = AT91C_BASE_SSC->SSC_RFMR;
 
-	AT91C_BASE_SSC->SSC_CR = AT91C_SSC_RXEN | AT91C_SSC_TXEN;
+    AT91C_BASE_SSC->SSC_CR = AT91C_SSC_RXEN | AT91C_SSC_TXEN;
 }
 
 //-----------------------------------------------------------------------------
@@ -157,15 +157,15 @@ void FpgaSetupSsc(void) {
 // is in apps.h, because it should be inlined, for speed.
 //-----------------------------------------------------------------------------
 bool FpgaSetupSscDma(uint8_t *buf, int len) {
-	if (buf == NULL) return false;
+    if (buf == NULL) return false;
 
-	FpgaDisableSscDma();
-	AT91C_BASE_PDC_SSC->PDC_RPR = (uint32_t) buf;		// transfer to this memory address
-	AT91C_BASE_PDC_SSC->PDC_RCR = len;					// transfer this many bytes
-	AT91C_BASE_PDC_SSC->PDC_RNPR = (uint32_t) buf;		// next transfer to same memory address
-	AT91C_BASE_PDC_SSC->PDC_RNCR = len;					// ... with same number of bytes
-	FpgaEnableSscDma();
-	return true;
+    FpgaDisableSscDma();
+    AT91C_BASE_PDC_SSC->PDC_RPR = (uint32_t) buf;  // transfer to this memory address
+    AT91C_BASE_PDC_SSC->PDC_RCR = len;             // transfer this many bytes
+    AT91C_BASE_PDC_SSC->PDC_RNPR = (uint32_t) buf; // next transfer to same memory address
+    AT91C_BASE_PDC_SSC->PDC_RNCR = len;            // ... with same number of bytes
+    FpgaEnableSscDma();
+    return true;
 }
 
 //----------------------------------------------------------------------------
@@ -173,20 +173,20 @@ bool FpgaSetupSscDma(uint8_t *buf, int len) {
 // each call.
 //----------------------------------------------------------------------------
 static int get_from_fpga_combined_stream(z_streamp compressed_fpga_stream, uint8_t *output_buffer) {
-	if (fpga_image_ptr == compressed_fpga_stream->next_out) {	// need more data
-		compressed_fpga_stream->next_out = output_buffer;
-		compressed_fpga_stream->avail_out = OUTPUT_BUFFER_LEN;
-		fpga_image_ptr = output_buffer;
-		int res = inflate(compressed_fpga_stream, Z_SYNC_FLUSH);
+    if (fpga_image_ptr == compressed_fpga_stream->next_out) { // need more data
+        compressed_fpga_stream->next_out = output_buffer;
+        compressed_fpga_stream->avail_out = OUTPUT_BUFFER_LEN;
+        fpga_image_ptr = output_buffer;
+        int res = inflate(compressed_fpga_stream, Z_SYNC_FLUSH);
 
-		if (res != Z_OK)
-			Dbprintf("inflate returned: %d, %s", res, compressed_fpga_stream->msg);
+        if (res != Z_OK)
+            Dbprintf("inflate returned: %d, %s", res, compressed_fpga_stream->msg);
 
-		if (res < 0)
-			return res;
-	}
-	uncompressed_bytes_cnt++;
-	return *fpga_image_ptr++;
+        if (res < 0)
+            return res;
+    }
+    uncompressed_bytes_cnt++;
+    return *fpga_image_ptr++;
 }
 
 //----------------------------------------------------------------------------
@@ -195,140 +195,140 @@ static int get_from_fpga_combined_stream(z_streamp compressed_fpga_stream, uint8
 // 288 bytes from FPGA file 1, followed by 288 bytes from FGPA file 2, etc.
 //----------------------------------------------------------------------------
 static int get_from_fpga_stream(int bitstream_version, z_streamp compressed_fpga_stream, uint8_t *output_buffer) {
-	while((uncompressed_bytes_cnt / FPGA_INTERLEAVE_SIZE) % fpga_bitstream_num != (bitstream_version - 1)) {
-		// skip undesired data belonging to other bitstream_versions
-		get_from_fpga_combined_stream(compressed_fpga_stream, output_buffer);
-	}
+    while((uncompressed_bytes_cnt / FPGA_INTERLEAVE_SIZE) % fpga_bitstream_num != (bitstream_version - 1)) {
+        // skip undesired data belonging to other bitstream_versions
+        get_from_fpga_combined_stream(compressed_fpga_stream, output_buffer);
+    }
 
-	return get_from_fpga_combined_stream(compressed_fpga_stream, output_buffer);
+    return get_from_fpga_combined_stream(compressed_fpga_stream, output_buffer);
 }
 
 static voidpf fpga_inflate_malloc(voidpf opaque, uInt items, uInt size) {
-	return BigBuf_malloc(items*size);
+    return BigBuf_malloc(items*size);
 }
 
 // free eventually allocated BigBuf memory
 static void fpga_inflate_free(voidpf opaque, voidpf address) {
-	BigBuf_free(); BigBuf_Clear_ext(false);
+    BigBuf_free(); BigBuf_Clear_ext(false);
 }
 
 //----------------------------------------------------------------------------
 // Initialize decompression of the respective (HF or LF) FPGA stream
 //----------------------------------------------------------------------------
 static bool reset_fpga_stream(int bitstream_version, z_streamp compressed_fpga_stream, uint8_t *output_buffer) {
-	uint8_t header[FPGA_BITSTREAM_FIXED_HEADER_SIZE];
+    uint8_t header[FPGA_BITSTREAM_FIXED_HEADER_SIZE];
 
-	uncompressed_bytes_cnt = 0;
+    uncompressed_bytes_cnt = 0;
 
-	// initialize z_stream structure for inflate:
-	compressed_fpga_stream->next_in = &_binary_obj_fpga_all_bit_z_start;
-	compressed_fpga_stream->avail_in = &_binary_obj_fpga_all_bit_z_end - &_binary_obj_fpga_all_bit_z_start;
-	compressed_fpga_stream->next_out = output_buffer;
-	compressed_fpga_stream->avail_out = OUTPUT_BUFFER_LEN;
-	compressed_fpga_stream->zalloc = &fpga_inflate_malloc;
-	compressed_fpga_stream->zfree = &fpga_inflate_free;
+    // initialize z_stream structure for inflate:
+    compressed_fpga_stream->next_in = &_binary_obj_fpga_all_bit_z_start;
+    compressed_fpga_stream->avail_in = &_binary_obj_fpga_all_bit_z_end - &_binary_obj_fpga_all_bit_z_start;
+    compressed_fpga_stream->next_out = output_buffer;
+    compressed_fpga_stream->avail_out = OUTPUT_BUFFER_LEN;
+    compressed_fpga_stream->zalloc = &fpga_inflate_malloc;
+    compressed_fpga_stream->zfree = &fpga_inflate_free;
 
-	inflateInit2(compressed_fpga_stream, 0);
+    inflateInit2(compressed_fpga_stream, 0);
 
-	fpga_image_ptr = output_buffer;
+    fpga_image_ptr = output_buffer;
 
-	for (uint16_t i = 0; i < FPGA_BITSTREAM_FIXED_HEADER_SIZE; i++)
-		header[i] = get_from_fpga_stream(bitstream_version, compressed_fpga_stream, output_buffer);
+    for (uint16_t i = 0; i < FPGA_BITSTREAM_FIXED_HEADER_SIZE; i++)
+        header[i] = get_from_fpga_stream(bitstream_version, compressed_fpga_stream, output_buffer);
 
-	// Check for a valid .bit file (starts with bitparse_fixed_header)
-	if (memcmp(bitparse_fixed_header, header, FPGA_BITSTREAM_FIXED_HEADER_SIZE) == 0)
-		return true;
+    // Check for a valid .bit file (starts with bitparse_fixed_header)
+    if (memcmp(bitparse_fixed_header, header, FPGA_BITSTREAM_FIXED_HEADER_SIZE) == 0)
+        return true;
 
-	return false;
+    return false;
 }
 
 static void DownloadFPGA_byte( uint8_t w) {
 #define SEND_BIT(x) { if(w & (1<<x) ) HIGH(GPIO_FPGA_DIN); else LOW(GPIO_FPGA_DIN); HIGH(GPIO_FPGA_CCLK); LOW(GPIO_FPGA_CCLK); }
-	SEND_BIT(7);
-	SEND_BIT(6);
-	SEND_BIT(5);
-	SEND_BIT(4);
-	SEND_BIT(3);
-	SEND_BIT(2);
-	SEND_BIT(1);
-	SEND_BIT(0);
+    SEND_BIT(7);
+    SEND_BIT(6);
+    SEND_BIT(5);
+    SEND_BIT(4);
+    SEND_BIT(3);
+    SEND_BIT(2);
+    SEND_BIT(1);
+    SEND_BIT(0);
 }
 
 // Download the fpga image starting at current stream position with length FpgaImageLen bytes
 static void DownloadFPGA(int bitstream_version, int FpgaImageLen, z_streamp compressed_fpga_stream, uint8_t *output_buffer) {
-	int i = 0;
+    int i = 0;
 
-	AT91C_BASE_PIOA->PIO_OER = GPIO_FPGA_ON;
-	AT91C_BASE_PIOA->PIO_PER = GPIO_FPGA_ON;
-	HIGH(GPIO_FPGA_ON);		// ensure everything is powered on
+    AT91C_BASE_PIOA->PIO_OER = GPIO_FPGA_ON;
+    AT91C_BASE_PIOA->PIO_PER = GPIO_FPGA_ON;
+    HIGH(GPIO_FPGA_ON);  // ensure everything is powered on
 
-	SpinDelay(50);
+    SpinDelay(50);
 
-	LED_D_ON();
+    LED_D_ON();
 
-	// These pins are inputs
+    // These pins are inputs
     AT91C_BASE_PIOA->PIO_ODR =
-    	GPIO_FPGA_NINIT |
-    	GPIO_FPGA_DONE;
-	// PIO controls the following pins
+        GPIO_FPGA_NINIT |
+        GPIO_FPGA_DONE;
+    // PIO controls the following pins
     AT91C_BASE_PIOA->PIO_PER =
-    	GPIO_FPGA_NINIT |
-    	GPIO_FPGA_DONE;
-	// Enable pull-ups
-	AT91C_BASE_PIOA->PIO_PPUER =
-		GPIO_FPGA_NINIT |
-		GPIO_FPGA_DONE;
+        GPIO_FPGA_NINIT |
+        GPIO_FPGA_DONE;
+    // Enable pull-ups
+    AT91C_BASE_PIOA->PIO_PPUER =
+        GPIO_FPGA_NINIT |
+        GPIO_FPGA_DONE;
 
-	// setup initial logic state
-	HIGH(GPIO_FPGA_NPROGRAM);
-	LOW(GPIO_FPGA_CCLK);
-	LOW(GPIO_FPGA_DIN);
-	// These pins are outputs
-	AT91C_BASE_PIOA->PIO_OER =
-		GPIO_FPGA_NPROGRAM	|
-		GPIO_FPGA_CCLK		|
-		GPIO_FPGA_DIN;
+    // setup initial logic state
+    HIGH(GPIO_FPGA_NPROGRAM);
+    LOW(GPIO_FPGA_CCLK);
+    LOW(GPIO_FPGA_DIN);
+    // These pins are outputs
+    AT91C_BASE_PIOA->PIO_OER =
+        GPIO_FPGA_NPROGRAM |
+        GPIO_FPGA_CCLK     |
+        GPIO_FPGA_DIN;
 
-	// enter FPGA configuration mode
-	LOW(GPIO_FPGA_NPROGRAM);
-	SpinDelay(50);
-	HIGH(GPIO_FPGA_NPROGRAM);
+    // enter FPGA configuration mode
+    LOW(GPIO_FPGA_NPROGRAM);
+    SpinDelay(50);
+    HIGH(GPIO_FPGA_NPROGRAM);
 
-	i = 100000;
-	// wait for FPGA ready to accept data signal
-	while ((i) && ( !(AT91C_BASE_PIOA->PIO_PDSR & GPIO_FPGA_NINIT ) ) ) {
-		i--;
-	}
+    i = 100000;
+    // wait for FPGA ready to accept data signal
+    while ((i) && ( !(AT91C_BASE_PIOA->PIO_PDSR & GPIO_FPGA_NINIT ) ) ) {
+        i--;
+    }
 
-	// crude error indicator, leave both red LEDs on and return
-	if (i==0){
-		LED_C_ON();
-		LED_D_ON();
-		return;
-	}
+    // crude error indicator, leave both red LEDs on and return
+    if (i==0){
+        LED_C_ON();
+        LED_D_ON();
+        return;
+    }
 
-	for (i = 0; i < FpgaImageLen; i++) {
-		int b = get_from_fpga_stream(bitstream_version, compressed_fpga_stream, output_buffer);
-		if (b < 0) {
-			Dbprintf("Error %d during FpgaDownload", b);
-			break;
-		}
-		DownloadFPGA_byte(b);
-	}
+    for (i = 0; i < FpgaImageLen; i++) {
+        int b = get_from_fpga_stream(bitstream_version, compressed_fpga_stream, output_buffer);
+        if (b < 0) {
+            Dbprintf("Error %d during FpgaDownload", b);
+            break;
+        }
+        DownloadFPGA_byte(b);
+    }
 
-	// continue to clock FPGA until ready signal goes high
-	i = 100000;
-	while ( (i--) && ( !(AT91C_BASE_PIOA->PIO_PDSR & GPIO_FPGA_DONE ) ) ) {
-		HIGH(GPIO_FPGA_CCLK);
-		LOW(GPIO_FPGA_CCLK);
-	}
-	// crude error indicator, leave both red LEDs on and return
-	if (i==0){
-		LED_C_ON();
-		LED_D_ON();
-		return;
-	}
-	LED_D_OFF();
+    // continue to clock FPGA until ready signal goes high
+    i = 100000;
+    while ( (i--) && ( !(AT91C_BASE_PIOA->PIO_PDSR & GPIO_FPGA_DONE ) ) ) {
+        HIGH(GPIO_FPGA_CCLK);
+        LOW(GPIO_FPGA_CCLK);
+    }
+    // crude error indicator, leave both red LEDs on and return
+    if (i==0){
+        LED_C_ON();
+        LED_D_ON();
+        return;
+    }
+    LED_D_OFF();
 }
 
 /* Simple Xilinx .bit parser. The file starts with the fixed opaque byte sequence
@@ -338,48 +338,48 @@ static void DownloadFPGA(int bitstream_version, int FpgaImageLen, z_streamp comp
  * length.
  */
 static int bitparse_find_section(int bitstream_version, char section_name, uint32_t *section_length, z_streamp compressed_fpga_stream, uint8_t *output_buffer) {
-	int result = 0;
-	#define MAX_FPGA_BIT_STREAM_HEADER_SEARCH 100  // maximum number of bytes to search for the requested section
-	uint16_t numbytes = 0;
-	while(numbytes < MAX_FPGA_BIT_STREAM_HEADER_SEARCH) {
-		char current_name = get_from_fpga_stream(bitstream_version, compressed_fpga_stream, output_buffer);
-		numbytes++;
-		uint32_t current_length = 0;
-		if (current_name < 'a' || current_name > 'e') {
-			/* Strange section name, abort */
-			break;
-		}
-		current_length = 0;
-		switch (current_name) {
-		case 'e':
-			/* Four byte length field */
-			current_length += get_from_fpga_stream(bitstream_version, compressed_fpga_stream, output_buffer) << 24;
-			current_length += get_from_fpga_stream(bitstream_version, compressed_fpga_stream, output_buffer) << 16;
-			numbytes += 2;
-		default: /* Fall through, two byte length field */
-			current_length += get_from_fpga_stream(bitstream_version, compressed_fpga_stream, output_buffer) << 8;
-			current_length += get_from_fpga_stream(bitstream_version, compressed_fpga_stream, output_buffer) << 0;
-			numbytes += 2;
-		}
+    int result = 0;
+    #define MAX_FPGA_BIT_STREAM_HEADER_SEARCH 100  // maximum number of bytes to search for the requested section
+    uint16_t numbytes = 0;
+    while(numbytes < MAX_FPGA_BIT_STREAM_HEADER_SEARCH) {
+        char current_name = get_from_fpga_stream(bitstream_version, compressed_fpga_stream, output_buffer);
+        numbytes++;
+        uint32_t current_length = 0;
+        if (current_name < 'a' || current_name > 'e') {
+            /* Strange section name, abort */
+            break;
+        }
+        current_length = 0;
+        switch (current_name) {
+        case 'e':
+            /* Four byte length field */
+            current_length += get_from_fpga_stream(bitstream_version, compressed_fpga_stream, output_buffer) << 24;
+            current_length += get_from_fpga_stream(bitstream_version, compressed_fpga_stream, output_buffer) << 16;
+            numbytes += 2;
+        default: /* Fall through, two byte length field */
+            current_length += get_from_fpga_stream(bitstream_version, compressed_fpga_stream, output_buffer) << 8;
+            current_length += get_from_fpga_stream(bitstream_version, compressed_fpga_stream, output_buffer) << 0;
+            numbytes += 2;
+        }
 
-		if (current_name != 'e' && current_length > 255) {
-			/* Maybe a parse error */
-			break;
-		}
+        if (current_name != 'e' && current_length > 255) {
+            /* Maybe a parse error */
+            break;
+        }
 
-		if (current_name == section_name) {
-			/* Found it */
-			*section_length = current_length;
-			result = 1;
-			break;
-		}
+        if (current_name == section_name) {
+            /* Found it */
+            *section_length = current_length;
+            result = 1;
+            break;
+        }
 
-		for (uint16_t i = 0; i < current_length && numbytes < MAX_FPGA_BIT_STREAM_HEADER_SEARCH; i++) {
-			get_from_fpga_stream(bitstream_version, compressed_fpga_stream, output_buffer);
-			numbytes++;
-		}
-	}
-	return result;
+        for (uint16_t i = 0; i < current_length && numbytes < MAX_FPGA_BIT_STREAM_HEADER_SEARCH; i++) {
+            get_from_fpga_stream(bitstream_version, compressed_fpga_stream, output_buffer);
+            numbytes++;
+        }
+    }
+    return result;
 }
 
 //----------------------------------------------------------------------------
@@ -388,34 +388,34 @@ static int bitparse_find_section(int bitstream_version, char section_name, uint3
 //----------------------------------------------------------------------------
 void FpgaDownloadAndGo(int bitstream_version) {
 
-	// check whether or not the bitstream is already loaded
-	if (downloaded_bitstream == bitstream_version)
-		return;
+    // check whether or not the bitstream is already loaded
+    if (downloaded_bitstream == bitstream_version)
+        return;
 
-	z_stream compressed_fpga_stream;
-	uint8_t output_buffer[OUTPUT_BUFFER_LEN] = {0x00};
+    z_stream compressed_fpga_stream;
+    uint8_t output_buffer[OUTPUT_BUFFER_LEN] = {0x00};
 
-	bool verbose = (MF_DBGLEVEL > 3);
+    bool verbose = (MF_DBGLEVEL > 3);
 
-	// make sure that we have enough memory to decompress
-	BigBuf_free(); BigBuf_Clear_ext(verbose);
+    // make sure that we have enough memory to decompress
+    BigBuf_free(); BigBuf_Clear_ext(verbose);
 
-	if (!reset_fpga_stream(bitstream_version, &compressed_fpga_stream, output_buffer))
-		return;
+    if (!reset_fpga_stream(bitstream_version, &compressed_fpga_stream, output_buffer))
+        return;
 
-	uint32_t bitstream_length;
-	if (bitparse_find_section(bitstream_version, 'e', &bitstream_length, &compressed_fpga_stream, output_buffer)) {
-		DownloadFPGA(bitstream_version, bitstream_length, &compressed_fpga_stream, output_buffer);
-		downloaded_bitstream = bitstream_version;
-	}
+    uint32_t bitstream_length;
+    if (bitparse_find_section(bitstream_version, 'e', &bitstream_length, &compressed_fpga_stream, output_buffer)) {
+        DownloadFPGA(bitstream_version, bitstream_length, &compressed_fpga_stream, output_buffer);
+        downloaded_bitstream = bitstream_version;
+    }
 
-	inflateEnd(&compressed_fpga_stream);
+    inflateEnd(&compressed_fpga_stream);
 
-	// turn off antenna
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    // turn off antenna
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 
-	// free eventually allocated BigBuf memory
-	BigBuf_free(); BigBuf_Clear_ext(false);
+    // free eventually allocated BigBuf memory
+    BigBuf_free(); BigBuf_Clear_ext(false);
 }
 
 //-----------------------------------------------------------------------------
@@ -424,10 +424,10 @@ void FpgaDownloadAndGo(int bitstream_version) {
 // where C is the 4 bit command and D is the 12 bit data
 //-----------------------------------------------------------------------------
 void FpgaSendCommand(uint16_t cmd, uint16_t v) {
-	SetupSpi(SPI_FPGA_MODE);
-	while ((AT91C_BASE_SPI->SPI_SR & AT91C_SPI_TXEMPTY) == 0);	// wait for the transfer to complete
-	AT91C_BASE_SPI->SPI_TDR = AT91C_SPI_LASTXFER | cmd | v;		// send the data
-	while (!(AT91C_BASE_SPI->SPI_SR & AT91C_SPI_RDRF)) {};		// wait till transfer is complete
+    SetupSpi(SPI_FPGA_MODE);
+    while ((AT91C_BASE_SPI->SPI_SR & AT91C_SPI_TXEMPTY) == 0); // wait for the transfer to complete
+    AT91C_BASE_SPI->SPI_TDR = AT91C_SPI_LASTXFER | cmd | v;    // send the data
+    while (!(AT91C_BASE_SPI->SPI_SR & AT91C_SPI_RDRF)) {};     // wait till transfer is complete
 }
 //-----------------------------------------------------------------------------
 // Write the FPGA setup word (that determines what mode the logic is in, read
@@ -435,7 +435,7 @@ void FpgaSendCommand(uint16_t cmd, uint16_t v) {
 // avoid changing this function's occurence everywhere in the source code.
 //-----------------------------------------------------------------------------
 void FpgaWriteConfWord(uint8_t v) {
-	FpgaSendCommand(FPGA_CMD_SET_CONFREG, v);
+    FpgaSendCommand(FPGA_CMD_SET_CONFREG, v);
 }
 
 //-----------------------------------------------------------------------------
@@ -444,35 +444,35 @@ void FpgaWriteConfWord(uint8_t v) {
 // the samples from the ADC always flow through the FPGA.
 //-----------------------------------------------------------------------------
 void SetAdcMuxFor(uint32_t whichGpio) {
-	AT91C_BASE_PIOA->PIO_OER =
-		GPIO_MUXSEL_HIPKD |
-		GPIO_MUXSEL_LOPKD |
-		GPIO_MUXSEL_LORAW |
-		GPIO_MUXSEL_HIRAW;
+    AT91C_BASE_PIOA->PIO_OER =
+        GPIO_MUXSEL_HIPKD |
+        GPIO_MUXSEL_LOPKD |
+        GPIO_MUXSEL_LORAW |
+        GPIO_MUXSEL_HIRAW;
 
-	AT91C_BASE_PIOA->PIO_PER =
-		GPIO_MUXSEL_HIPKD |
-		GPIO_MUXSEL_LOPKD |
-		GPIO_MUXSEL_LORAW |
-		GPIO_MUXSEL_HIRAW;
+    AT91C_BASE_PIOA->PIO_PER =
+        GPIO_MUXSEL_HIPKD |
+        GPIO_MUXSEL_LOPKD |
+        GPIO_MUXSEL_LORAW |
+        GPIO_MUXSEL_HIRAW;
 
-	LOW(GPIO_MUXSEL_HIPKD);
-	LOW(GPIO_MUXSEL_LOPKD);
+    LOW(GPIO_MUXSEL_HIPKD);
+    LOW(GPIO_MUXSEL_LOPKD);
 #ifndef WITH_FPC
-	LOW(GPIO_MUXSEL_HIRAW);
-	LOW(GPIO_MUXSEL_LORAW);
+    LOW(GPIO_MUXSEL_HIRAW);
+    LOW(GPIO_MUXSEL_LORAW);
 #endif
 
-	HIGH(whichGpio);
+    HIGH(whichGpio);
 }
 
 void Fpga_print_status(void) {
-	Dbprintf("Currently loaded FPGA image");
-	Dbprintf("  mode....................%s", fpga_version_information[downloaded_bitstream-1]);
+    Dbprintf("Currently loaded FPGA image");
+    Dbprintf("  mode....................%s", fpga_version_information[downloaded_bitstream-1]);
 }
 
 int FpgaGetCurrent(void) {
-	return downloaded_bitstream;
+    return downloaded_bitstream;
 }
 
 // Turns off the antenna,
@@ -480,10 +480,10 @@ int FpgaGetCurrent(void) {
 // if HF,  Disable SSC DMA
 // turn off trace and leds off.
 void switch_off(void) {
-	if (MF_DBGLEVEL > 3) Dbprintf("switch_off");
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	if (downloaded_bitstream == FPGA_BITSTREAM_HF )
-		FpgaDisableSscDma();
-	set_tracing(false);
-	LEDsoff();
+    if (MF_DBGLEVEL > 3) Dbprintf("switch_off");
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    if (downloaded_bitstream == FPGA_BITSTREAM_HF )
+        FpgaDisableSscDma();
+    set_tracing(false);
+    LEDsoff();
 }
diff --git a/armsrc/fpgaloader.h b/armsrc/fpgaloader.h
index 7f9ec28e6..ef278cc3e 100644
--- a/armsrc/fpgaloader.h
+++ b/armsrc/fpgaloader.h
@@ -16,11 +16,11 @@
 #include <stdbool.h>
 #include "apps.h"
 #include "fpga.h"
-#include "common.h"		// standard definitions
-#include "proxmark3.h"	// common area
+#include "common.h"     // standard definitions
+#include "proxmark3.h"  // common area
 #include "string.h"
-#include "BigBuf.h"		// bigbuf mem
-#include "zlib.h"		// uncompress
+#include "BigBuf.h"     // bigbuf mem
+#include "zlib.h"       // uncompress
 
 
 void FpgaSendCommand(uint16_t cmd, uint16_t v);
@@ -32,7 +32,7 @@ void SetupSpi(int mode);
 bool FpgaSetupSscDma(uint8_t *buf, int len);
 void Fpga_print_status(void);
 int FpgaGetCurrent(void);
-#define FpgaDisableSscDma(void)	AT91C_BASE_PDC_SSC->PDC_PTCR = AT91C_PDC_RXTDIS;
+#define FpgaDisableSscDma(void) AT91C_BASE_PDC_SSC->PDC_PTCR = AT91C_PDC_RXTDIS;
 #define FpgaEnableSscDma(void) AT91C_BASE_PDC_SSC->PDC_PTCR = AT91C_PDC_RXTEN;
 void SetAdcMuxFor(uint32_t whichGpio);
 
@@ -45,56 +45,56 @@ extern void switch_off(void);
 //#define FPGA_BITSTREAM_FELICA 3
 
 // Definitions for the FPGA commands.
-#define FPGA_CMD_SET_CONFREG						(1<<12)
-#define FPGA_CMD_SET_DIVISOR						(2<<12)
-#define FPGA_CMD_SET_USER_BYTE1						(3<<12)
+#define FPGA_CMD_SET_CONFREG                        (1<<12)
+#define FPGA_CMD_SET_DIVISOR                        (2<<12)
+#define FPGA_CMD_SET_USER_BYTE1                     (3<<12)
 // Definitions for the FPGA configuration word.
 // LF
-#define FPGA_MAJOR_MODE_LF_ADC						(0<<5)
-#define FPGA_MAJOR_MODE_LF_EDGE_DETECT				(1<<5)
-#define FPGA_MAJOR_MODE_LF_PASSTHRU					(2<<5)
+#define FPGA_MAJOR_MODE_LF_ADC                      (0<<5)
+#define FPGA_MAJOR_MODE_LF_EDGE_DETECT              (1<<5)
+#define FPGA_MAJOR_MODE_LF_PASSTHRU                 (2<<5)
 // HF
-#define FPGA_MAJOR_MODE_HF_READER_TX				(0<<5)
-#define FPGA_MAJOR_MODE_HF_READER_RX_XCORR			(1<<5)
-#define FPGA_MAJOR_MODE_HF_SIMULATOR				(2<<5)
-#define FPGA_MAJOR_MODE_HF_ISO14443A				(3<<5)
-#define FPGA_MAJOR_MODE_HF_SNOOP				    (4<<5)
-#define FPGA_MAJOR_MODE_HF_FELICA      				(5<<5)
+#define FPGA_MAJOR_MODE_HF_READER_TX                (0<<5)
+#define FPGA_MAJOR_MODE_HF_READER_RX_XCORR          (1<<5)
+#define FPGA_MAJOR_MODE_HF_SIMULATOR                (2<<5)
+#define FPGA_MAJOR_MODE_HF_ISO14443A                (3<<5)
+#define FPGA_MAJOR_MODE_HF_SNOOP                    (4<<5)
+#define FPGA_MAJOR_MODE_HF_FELICA                   (5<<5)
 // BOTH
-#define FPGA_MAJOR_MODE_OFF_LF						(6<<5)
-#define FPGA_MAJOR_MODE_OFF							(7<<5)
+#define FPGA_MAJOR_MODE_OFF_LF                      (6<<5)
+#define FPGA_MAJOR_MODE_OFF                         (7<<5)
 
 // Options for LF_ADC
-#define FPGA_LF_ADC_READER_FIELD					(1<<0)
+#define FPGA_LF_ADC_READER_FIELD                    (1<<0)
 // Options for LF_EDGE_DETECT
-#define FPGA_CMD_SET_EDGE_DETECT_THRESHOLD			FPGA_CMD_SET_USER_BYTE1
-#define FPGA_LF_EDGE_DETECT_READER_FIELD 			(1<<0)
-#define FPGA_LF_EDGE_DETECT_TOGGLE_MODE				(1<<1)
+#define FPGA_CMD_SET_EDGE_DETECT_THRESHOLD          FPGA_CMD_SET_USER_BYTE1
+#define FPGA_LF_EDGE_DETECT_READER_FIELD            (1<<0)
+#define FPGA_LF_EDGE_DETECT_TOGGLE_MODE             (1<<1)
 // Options for the HF reader, tx to tag
-#define FPGA_HF_READER_TX_SHALLOW_MOD				(1<<0)
+#define FPGA_HF_READER_TX_SHALLOW_MOD               (1<<0)
 // Options for the HF reader, correlating against rx from tag
-#define FPGA_HF_READER_RX_XCORR_848_KHZ				(1<<0)
-#define FPGA_HF_READER_RX_XCORR_SNOOP				(1<<1)
-#define FPGA_HF_READER_RX_XCORR_QUARTER				(1<<2)
+#define FPGA_HF_READER_RX_XCORR_848_KHZ             (1<<0)
+#define FPGA_HF_READER_RX_XCORR_SNOOP               (1<<1)
+#define FPGA_HF_READER_RX_XCORR_QUARTER             (1<<2)
 // Options for the HF simulated tag, how to modulate
-#define FPGA_HF_SIMULATOR_NO_MODULATION				0x0 // 0000
-#define FPGA_HF_SIMULATOR_MODULATE_BPSK				0x1 // 0001
-#define FPGA_HF_SIMULATOR_MODULATE_212K				0x2 // 0010
-#define FPGA_HF_SIMULATOR_MODULATE_424K				0x4 // 0100
-#define FPGA_HF_SIMULATOR_MODULATE_424K_8BIT		0x5 // 0101
+#define FPGA_HF_SIMULATOR_NO_MODULATION             0x0 // 0000
+#define FPGA_HF_SIMULATOR_MODULATE_BPSK             0x1 // 0001
+#define FPGA_HF_SIMULATOR_MODULATE_212K             0x2 // 0010
+#define FPGA_HF_SIMULATOR_MODULATE_424K             0x4 // 0100
+#define FPGA_HF_SIMULATOR_MODULATE_424K_8BIT        0x5 // 0101
 //  no 848K
 
 // Options for ISO14443A
-#define FPGA_HF_ISO14443A_SNIFFER					(0<<0)
-#define FPGA_HF_ISO14443A_TAGSIM_LISTEN				(1<<0)
-#define FPGA_HF_ISO14443A_TAGSIM_MOD				(2<<0)
-#define FPGA_HF_ISO14443A_READER_LISTEN				(3<<0)
-#define FPGA_HF_ISO14443A_READER_MOD				(4<<0)
+#define FPGA_HF_ISO14443A_SNIFFER                   (0<<0)
+#define FPGA_HF_ISO14443A_TAGSIM_LISTEN             (1<<0)
+#define FPGA_HF_ISO14443A_TAGSIM_MOD                (2<<0)
+#define FPGA_HF_ISO14443A_READER_LISTEN             (3<<0)
+#define FPGA_HF_ISO14443A_READER_MOD                (4<<0)
 
 //options for Felica.
-#define FPGA_MAJOR_MODE_ISO18092          			(5<<5) // 01010 0000
+#define FPGA_MAJOR_MODE_ISO18092                    (5<<5) // 01010 0000
 #define FPGA_HF_ISO18092_FLAG_NOMOD                 (1<<0) // 0001 disable modulation module
 #define FPGA_HF_ISO18092_FLAG_424K                  (2<<0) // 0010 should enable 414k mode (untested). No autodetect
-#define FPGA_HF_ISO18092_FLAG_READER	            (4<<0) // 0100 enables antenna power, to act as a reader instead of tag
+#define FPGA_HF_ISO18092_FLAG_READER                (4<<0) // 0100 enables antenna power, to act as a reader instead of tag
 
-#endif
\ No newline at end of file
+#endif
diff --git a/armsrc/hfsnoop.c b/armsrc/hfsnoop.c
index d66f88276..117e064e8 100644
--- a/armsrc/hfsnoop.c
+++ b/armsrc/hfsnoop.c
@@ -2,79 +2,79 @@
 #include "apps.h"
 #include "BigBuf.h"
 #include "util.h"
-#include "usb_cdc.h"	// for usb_poll_validate_length
+#include "usb_cdc.h" // for usb_poll_validate_length
 
 static void RAMFUNC optimizedSnoop(void);
 
 static void RAMFUNC optimizedSnoop(void)
 {
-	int n = BigBuf_max_traceLen() / sizeof(uint16_t); // take all memory
+    int n = BigBuf_max_traceLen() / sizeof(uint16_t); // take all memory
 
-	uint16_t *dest = (uint16_t *)BigBuf_get_addr();
+    uint16_t *dest = (uint16_t *)BigBuf_get_addr();
     uint16_t *destend = dest + n-1;
 
-	// Reading data loop
-	while(dest <= destend) {
-		if(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
-			*dest = (uint16_t)(AT91C_BASE_SSC->SSC_RHR);
-			dest++;
-		}
-	}
+    // Reading data loop
+    while(dest <= destend) {
+        if(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
+            *dest = (uint16_t)(AT91C_BASE_SSC->SSC_RHR);
+            dest++;
+        }
+    }
     //setting tracelen - important!  it was set by buffer overflow before
     set_tracelen( BigBuf_max_traceLen());
 }
 
 void HfSnoop(int samplesToSkip, int triggersToSkip)
 {
-	BigBuf_free(); BigBuf_Clear();
+    BigBuf_free(); BigBuf_Clear();
 
-	Dbprintf("Skipping first %d sample pairs, Skipping %d triggers.\n", samplesToSkip, triggersToSkip);
-	int trigger_cnt = 0;
+    Dbprintf("Skipping first %d sample pairs, Skipping %d triggers.\n", samplesToSkip, triggersToSkip);
+    int trigger_cnt = 0;
 
-	LED_D_ON();
+    LED_D_ON();
 
-	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
+    FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
 
-	SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
+    SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
 
-	// Set up the synchronous serial port
-	FpgaSetupSsc();
+    // Set up the synchronous serial port
+    FpgaSetupSsc();
 
-	// Setting Frame Mode For better performance on high speed data transfer.
-	AT91C_BASE_SSC->SSC_RFMR = SSC_FRAME_MODE_BITS_IN_WORD(16);
+    // Setting Frame Mode For better performance on high speed data transfer.
+    AT91C_BASE_SSC->SSC_RFMR = SSC_FRAME_MODE_BITS_IN_WORD(16);
 
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_SNOOP);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_SNOOP);
     SpinDelay(100);
 
-	uint16_t r = 0;
-	while (!BUTTON_PRESS() && !usb_poll_validate_length() ) {
-		WDT_HIT();
+    uint16_t r = 0;
+    while (!BUTTON_PRESS() && !usb_poll_validate_length() ) {
+        WDT_HIT();
 
-		if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
-			r = (uint16_t)AT91C_BASE_SSC->SSC_RHR;
-			r = MAX(r & 0xff, r >> 8);
+        if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
+            r = (uint16_t)AT91C_BASE_SSC->SSC_RHR;
+            r = MAX(r & 0xff, r >> 8);
             if (r >= 180) {  // 0xB4 ??
                 if (++trigger_cnt > triggersToSkip)
-				break;
-			}
-		}
-	}
+                break;
+            }
+        }
+    }
 
-	if (!BUTTON_PRESS()) {
-		int waitcount = samplesToSkip; // lets wait 40000 ticks of pck0
-		while(waitcount != 0) {
+    if (!BUTTON_PRESS()) {
+        int waitcount = samplesToSkip; // lets wait 40000 ticks of pck0
+        while(waitcount != 0) {
 
-			if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY))
-				waitcount--;
-		}
-		optimizedSnoop();
-		Dbprintf("Trigger kicked! Value: %d, Dumping Samples Hispeed now.", r);
-	}
+            if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY))
+                waitcount--;
+        }
+        optimizedSnoop();
+        Dbprintf("Trigger kicked! Value: %d, Dumping Samples Hispeed now.", r);
+    }
 
-	//Resetting Frame mode (First set in fpgaloader.c)
-	AT91C_BASE_SSC->SSC_RFMR = SSC_FRAME_MODE_BITS_IN_WORD(8) | AT91C_SSC_MSBF | SSC_FRAME_MODE_WORDS_PER_TRANSFER(0);
+    //Resetting Frame mode (First set in fpgaloader.c)
+    AT91C_BASE_SSC->SSC_RFMR = SSC_FRAME_MODE_BITS_IN_WORD(8) | AT91C_SSC_MSBF | SSC_FRAME_MODE_WORDS_PER_TRANSFER(0);
 
-	DbpString("HF Snoop end");
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	LED_D_OFF();
+    DbpString("HF Snoop end");
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    LED_D_OFF();
 }
diff --git a/armsrc/hitag2.c b/armsrc/hitag2.c
index 32db10190..913ea92ab 100644
--- a/armsrc/hitag2.c
+++ b/armsrc/hitag2.c
@@ -30,17 +30,17 @@ static bool bPwd;
 static bool bSuccessful;
 
 struct hitag2_tag {
-	uint32_t uid;
-	enum {
-		TAG_STATE_RESET      = 0x01,       // Just powered up, awaiting GetSnr
-		TAG_STATE_ACTIVATING = 0x02 ,      // In activation phase (password mode), sent UID, awaiting reader password
-		TAG_STATE_ACTIVATED  = 0x03,       // Activation complete, awaiting read/write commands
-		TAG_STATE_WRITING    = 0x04,       // In write command, awaiting sector contents to be written
-	} state;
-	unsigned int active_sector;
-	uint8_t crypto_active;
-	uint64_t cs;
-	uint8_t sectors[12][4];
+    uint32_t uid;
+    enum {
+        TAG_STATE_RESET      = 0x01,       // Just powered up, awaiting GetSnr
+        TAG_STATE_ACTIVATING = 0x02 ,      // In activation phase (password mode), sent UID, awaiting reader password
+        TAG_STATE_ACTIVATED  = 0x03,       // Activation complete, awaiting read/write commands
+        TAG_STATE_WRITING    = 0x04,       // In write command, awaiting sector contents to be written
+    } state;
+    unsigned int active_sector;
+    uint8_t crypto_active;
+    uint64_t cs;
+    uint8_t sectors[12][4];
 };
 
 static struct hitag2_tag tag = {
@@ -62,9 +62,9 @@ static struct hitag2_tag tag = {
 };
 
 static enum {
-	WRITE_STATE_START = 0x0,
-	WRITE_STATE_PAGENUM_WRITTEN,
-	WRITE_STATE_PROG
+    WRITE_STATE_START = 0x0,
+    WRITE_STATE_PAGENUM_WRITTEN,
+    WRITE_STATE_PROG
 } writestate;
 
 
@@ -89,63 +89,63 @@ static uint64_t cipher_state;
 
 // Basic macros:
 
-#define u8				uint8_t
-#define u32				uint32_t
-#define u64				uint64_t
-#define rev8(x)			((((x)>>7)&1)+((((x)>>6)&1)<<1)+((((x)>>5)&1)<<2)+((((x)>>4)&1)<<3)+((((x)>>3)&1)<<4)+((((x)>>2)&1)<<5)+((((x)>>1)&1)<<6)+(((x)&1)<<7))
-#define rev16(x)		(rev8 (x)+(rev8 (x>> 8)<< 8))
-#define rev32(x)		(rev16(x)+(rev16(x>>16)<<16))
-#define rev64(x)		(rev32(x)+(rev32(x>>32)<<32))
-#define bit(x,n)		(((x)>>(n))&1)
-#define bit32(x,n)		((((x)[(n)>>5])>>((n)))&1)
-#define inv32(x,i,n)	((x)[(i)>>5]^=((u32)(n))<<((i)&31))
-#define rotl64(x, n)	((((u64)(x))<<((n)&63))+(((u64)(x))>>((0-(n))&63)))
+#define u8              uint8_t
+#define u32             uint32_t
+#define u64             uint64_t
+#define rev8(x)         ((((x)>>7)&1)+((((x)>>6)&1)<<1)+((((x)>>5)&1)<<2)+((((x)>>4)&1)<<3)+((((x)>>3)&1)<<4)+((((x)>>2)&1)<<5)+((((x)>>1)&1)<<6)+(((x)&1)<<7))
+#define rev16(x)        (rev8 (x)+(rev8 (x>> 8)<< 8))
+#define rev32(x)        (rev16(x)+(rev16(x>>16)<<16))
+#define rev64(x)        (rev32(x)+(rev32(x>>32)<<32))
+#define bit(x,n)        (((x)>>(n))&1)
+#define bit32(x,n)      ((((x)[(n)>>5])>>((n)))&1)
+#define inv32(x,i,n)    ((x)[(i)>>5]^=((u32)(n))<<((i)&31))
+#define rotl64(x, n)    ((((u64)(x))<<((n)&63))+(((u64)(x))>>((0-(n))&63)))
 
 // Single bit Hitag2 functions:
-#define i4(x,a,b,c,d)	((u32)((((x)>>(a))&1)+(((x)>>(b))&1)*2+(((x)>>(c))&1)*4+(((x)>>(d))&1)*8))
+#define i4(x,a,b,c,d)    ((u32)((((x)>>(a))&1)+(((x)>>(b))&1)*2+(((x)>>(c))&1)*4+(((x)>>(d))&1)*8))
 
-static const u32 ht2_f4a = 0x2C79;		// 0010 1100 0111 1001
-static const u32 ht2_f4b = 0x6671;		// 0110 0110 0111 0001
-static const u32 ht2_f5c = 0x7907287B;	// 0111 1001 0000 0111 0010 1000 0111 1011
+static const u32 ht2_f4a = 0x2C79;     // 0010 1100 0111 1001
+static const u32 ht2_f4b = 0x6671;     // 0110 0110 0111 0001
+static const u32 ht2_f5c = 0x7907287B; // 0111 1001 0000 0111 0010 1000 0111 1011
 
 static u32 _f20 (const u64 x)
 {
-	u32	i5;
+    u32 i5;
 
-	i5 = ((ht2_f4a >> i4 (x, 1, 2, 4, 5)) & 1)* 1
-	   + ((ht2_f4b >> i4 (x, 7,11,13,14)) & 1)* 2
-	   + ((ht2_f4b >> i4 (x,16,20,22,25)) & 1)* 4
-	   + ((ht2_f4b >> i4 (x,27,28,30,32)) & 1)* 8
-	   + ((ht2_f4a >> i4 (x,33,42,43,45)) & 1)*16;
+    i5 = ((ht2_f4a >> i4 (x, 1, 2, 4, 5)) & 1)* 1
+       + ((ht2_f4b >> i4 (x, 7,11,13,14)) & 1)* 2
+       + ((ht2_f4b >> i4 (x,16,20,22,25)) & 1)* 4
+       + ((ht2_f4b >> i4 (x,27,28,30,32)) & 1)* 8
+       + ((ht2_f4a >> i4 (x,33,42,43,45)) & 1)*16;
 
-	return (ht2_f5c >> i5) & 1;
+    return (ht2_f5c >> i5) & 1;
 }
 
 static u64 _hitag2_init (const u64 key, const u32 serial, const u32 IV)
 {
-	u32	i;
-	u64	x = ((key & 0xFFFF) << 32) + serial;
+    u32 i;
+    u64 x = ((key & 0xFFFF) << 32) + serial;
 
-	for (i = 0; i < 32; i++)
-	{
-		x >>= 1;
-		x += (u64) (_f20 (x) ^ (((IV >> i) ^ (key >> (i+16))) & 1)) << 47;
-	}
-	return x;
+    for (i = 0; i < 32; i++)
+    {
+        x >>= 1;
+        x += (u64) (_f20 (x) ^ (((IV >> i) ^ (key >> (i+16))) & 1)) << 47;
+    }
+    return x;
 }
 
 static u64 _hitag2_round (u64 *state)
 {
-	u64 x = *state;
+    u64 x = *state;
 
-	x = (x >>  1) +
-	 ((((x >>  0) ^ (x >>  2) ^ (x >>  3) ^ (x >>  6)
-	  ^ (x >>  7) ^ (x >>  8) ^ (x >> 16) ^ (x >> 22)
-	  ^ (x >> 23) ^ (x >> 26) ^ (x >> 30) ^ (x >> 41)
-	  ^ (x >> 42) ^ (x >> 43) ^ (x >> 46) ^ (x >> 47)) & 1) << 47);
+    x = (x >>  1) +
+     ((((x >>  0) ^ (x >>  2) ^ (x >>  3) ^ (x >>  6)
+      ^ (x >>  7) ^ (x >>  8) ^ (x >> 16) ^ (x >> 22)
+      ^ (x >> 23) ^ (x >> 26) ^ (x >> 30) ^ (x >> 41)
+      ^ (x >> 42) ^ (x >> 43) ^ (x >> 46) ^ (x >> 47)) & 1) << 47);
 
-	*state = x;
-	return _f20 (x);
+    *state = x;
+    return _f20 (x);
 }
 
 // "MIKRON"             =  O  N  M  I  K  R
@@ -160,426 +160,426 @@ static u64 _hitag2_round (u64 *state)
 
 static u32 _hitag2_byte (u64 * x)
 {
-	u32	i, c;
+    u32 i, c;
 
-	for (i = 0, c = 0; i < 8; i++) c += (u32) _hitag2_round (x) << (i^7);
-	return c;
+    for (i = 0, c = 0; i < 8; i++) c += (u32) _hitag2_round (x) << (i^7);
+    return c;
 }
 
 static int hitag2_reset(void) {
-	tag.state = TAG_STATE_RESET;
-	tag.crypto_active = 0;
-	return 0;
+    tag.state = TAG_STATE_RESET;
+    tag.crypto_active = 0;
+    return 0;
 }
 
 static int hitag2_init(void) {
-	hitag2_reset();
-	return 0;
+    hitag2_reset();
+    return 0;
 }
 
 static void hitag2_cipher_reset(struct hitag2_tag *tag, const uint8_t *iv)
 {
-	uint64_t key =  ((uint64_t)tag->sectors[2][2]) |
+    uint64_t key =  ((uint64_t)tag->sectors[2][2]) |
                   ((uint64_t)tag->sectors[2][3] << 8) |
                   ((uint64_t)tag->sectors[1][0] << 16) |
                   ((uint64_t)tag->sectors[1][1] << 24) |
                   ((uint64_t)tag->sectors[1][2] << 32) |
                   ((uint64_t)tag->sectors[1][3] << 40);
-	uint32_t uid =  ((uint32_t)tag->sectors[0][0]) |
+    uint32_t uid =  ((uint32_t)tag->sectors[0][0]) |
                   ((uint32_t)tag->sectors[0][1] << 8) |
                   ((uint32_t)tag->sectors[0][2] << 16) |
                   ((uint32_t)tag->sectors[0][3] << 24);
-	uint32_t iv_ = (((uint32_t)(iv[0]))) |
-			(((uint32_t)(iv[1])) << 8) |
-			(((uint32_t)(iv[2])) << 16) |
-			(((uint32_t)(iv[3])) << 24);
-	tag->cs = _hitag2_init(rev64(key), rev32(uid), rev32(iv_));
+    uint32_t iv_ = (((uint32_t)(iv[0]))) |
+            (((uint32_t)(iv[1])) << 8) |
+            (((uint32_t)(iv[2])) << 16) |
+            (((uint32_t)(iv[3])) << 24);
+    tag->cs = _hitag2_init(rev64(key), rev32(uid), rev32(iv_));
 }
 
 static int hitag2_cipher_authenticate(uint64_t* cs, const uint8_t *authenticator_is)
 {
-	uint8_t authenticator_should[4];
-	authenticator_should[0] = ~_hitag2_byte(cs);
-	authenticator_should[1] = ~_hitag2_byte(cs);
-	authenticator_should[2] = ~_hitag2_byte(cs);
-	authenticator_should[3] = ~_hitag2_byte(cs);
-	return (memcmp(authenticator_should, authenticator_is, 4) == 0);
+    uint8_t authenticator_should[4];
+    authenticator_should[0] = ~_hitag2_byte(cs);
+    authenticator_should[1] = ~_hitag2_byte(cs);
+    authenticator_should[2] = ~_hitag2_byte(cs);
+    authenticator_should[3] = ~_hitag2_byte(cs);
+    return (memcmp(authenticator_should, authenticator_is, 4) == 0);
 }
 
 static int hitag2_cipher_transcrypt(uint64_t* cs, uint8_t *data, unsigned int bytes, unsigned int bits)
 {
-	int i;
-	for(i=0; i<bytes; i++) data[i] ^= _hitag2_byte(cs);
-	for(i=0; i<bits; i++) data[bytes] ^= _hitag2_round(cs) << (7-i);
-	return 0;
+    int i;
+    for(i=0; i<bytes; i++) data[i] ^= _hitag2_byte(cs);
+    for(i=0; i<bits; i++) data[bytes] ^= _hitag2_round(cs) << (7-i);
+    return 0;
 }
 
 // Sam7s has several timers, we will use the source TIMER_CLOCK1 (aka AT91C_TC_CLKS_TIMER_DIV1_CLOCK)
 // TIMER_CLOCK1 = MCK/2, MCK is running at 48 MHz, Timer is running at 48/2 = 24 MHz
 // Hitag units (T0) have duration of 8 microseconds (us), which is 1/125000 per second (carrier)
 // T0 = TIMER_CLOCK1 / 125000 = 192
-#define T0 192
+#define T0               192
 
-#define SHORT_COIL()	LOW(GPIO_SSC_DOUT)
-#define OPEN_COIL()		HIGH(GPIO_SSC_DOUT)
+#define SHORT_COIL()     LOW(GPIO_SSC_DOUT)
+#define OPEN_COIL()      HIGH(GPIO_SSC_DOUT)
 
-#define HITAG_FRAME_LEN 20
-#define HITAG_T_STOP  36 /* T_EOF should be > 36 */
-#define HITAG_T_LOW		8  /* T_LOW should be 4..10 */
-#define HITAG_T_0_MIN 15 /* T[0] should be 18..22 */
-#define HITAG_T_1_MIN 25 /* T[1] should be 26..30 */
-//#define HITAG_T_EOF   40 /* T_EOF should be > 36 */
-#define HITAG_T_EOF   80	 /* T_EOF should be > 36 */
-#define HITAG_T_WAIT_1 200 /* T_wresp should be 199..206 */
-#define HITAG_T_WAIT_2 90 /* T_wresp should be 199..206 */
+#define HITAG_FRAME_LEN  20
+#define HITAG_T_STOP     36 /* T_EOF should be > 36 */
+#define HITAG_T_LOW      8  /* T_LOW should be 4..10 */
+#define HITAG_T_0_MIN    15 /* T[0] should be 18..22 */
+#define HITAG_T_1_MIN    25 /* T[1] should be 26..30 */
+//#define HITAG_T_EOF      40 /* T_EOF should be > 36 */
+#define HITAG_T_EOF      80 /* T_EOF should be > 36 */
+#define HITAG_T_WAIT_1   200 /* T_wresp should be 199..206 */
+#define HITAG_T_WAIT_2   90 /* T_wresp should be 199..206 */
 #define HITAG_T_WAIT_MAX 300 /* bit more than HITAG_T_WAIT_1 + HITAG_T_WAIT_2 */
-#define HITAG_T_PROG 614
+#define HITAG_T_PROG     614
 
-#define HITAG_T_TAG_ONE_HALF_PERIOD		10
-#define HITAG_T_TAG_TWO_HALF_PERIOD		25
-#define HITAG_T_TAG_THREE_HALF_PERIOD	41
-#define HITAG_T_TAG_FOUR_HALF_PERIOD	57
+#define HITAG_T_TAG_ONE_HALF_PERIOD     10
+#define HITAG_T_TAG_TWO_HALF_PERIOD     25
+#define HITAG_T_TAG_THREE_HALF_PERIOD   41
+#define HITAG_T_TAG_FOUR_HALF_PERIOD    57
 
-#define HITAG_T_TAG_HALF_PERIOD			16
-#define HITAG_T_TAG_FULL_PERIOD			32
+#define HITAG_T_TAG_HALF_PERIOD         16
+#define HITAG_T_TAG_FULL_PERIOD         32
 
-#define HITAG_T_TAG_CAPTURE_ONE_HALF	13
-#define HITAG_T_TAG_CAPTURE_TWO_HALF	25
-#define HITAG_T_TAG_CAPTURE_THREE_HALF	41
+#define HITAG_T_TAG_CAPTURE_ONE_HALF    13
+#define HITAG_T_TAG_CAPTURE_TWO_HALF    25
+#define HITAG_T_TAG_CAPTURE_THREE_HALF  41
 #define HITAG_T_TAG_CAPTURE_FOUR_HALF   57
 
 
 static void hitag_send_bit(int bit) {
-	LED_A_ON();
-	// Reset clock for the next bit
-	AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;
+    LED_A_ON();
+    // Reset clock for the next bit
+    AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;
 
-	// Fixed modulation, earlier proxmark version used inverted signal
-	if(bit == 0) {
-		// Manchester: Unloaded, then loaded |__--|
-		LOW(GPIO_SSC_DOUT);
-		while(AT91C_BASE_TC0->TC_CV < T0*HITAG_T_TAG_HALF_PERIOD);
-		HIGH(GPIO_SSC_DOUT);
-		while(AT91C_BASE_TC0->TC_CV < T0*HITAG_T_TAG_FULL_PERIOD);
-	} else {
-		// Manchester: Loaded, then unloaded |--__|
-		HIGH(GPIO_SSC_DOUT);
-		while(AT91C_BASE_TC0->TC_CV < T0*HITAG_T_TAG_HALF_PERIOD);
-		LOW(GPIO_SSC_DOUT);
-		while(AT91C_BASE_TC0->TC_CV < T0*HITAG_T_TAG_FULL_PERIOD);
-	}
-	LED_A_OFF();
+    // Fixed modulation, earlier proxmark version used inverted signal
+    if(bit == 0) {
+        // Manchester: Unloaded, then loaded |__--|
+        LOW(GPIO_SSC_DOUT);
+        while(AT91C_BASE_TC0->TC_CV < T0*HITAG_T_TAG_HALF_PERIOD);
+        HIGH(GPIO_SSC_DOUT);
+        while(AT91C_BASE_TC0->TC_CV < T0*HITAG_T_TAG_FULL_PERIOD);
+    } else {
+        // Manchester: Loaded, then unloaded |--__|
+        HIGH(GPIO_SSC_DOUT);
+        while(AT91C_BASE_TC0->TC_CV < T0*HITAG_T_TAG_HALF_PERIOD);
+        LOW(GPIO_SSC_DOUT);
+        while(AT91C_BASE_TC0->TC_CV < T0*HITAG_T_TAG_FULL_PERIOD);
+    }
+    LED_A_OFF();
 }
 
 static void hitag_send_frame(const uint8_t* frame, size_t frame_len)
 {
-	// Send start of frame
-	for(size_t i=0; i<5; i++) {
-		hitag_send_bit(1);
-	}
+    // Send start of frame
+    for(size_t i=0; i<5; i++) {
+        hitag_send_bit(1);
+    }
 
-	// Send the content of the frame
-	for(size_t i=0; i<frame_len; i++) {
-		hitag_send_bit((frame[i/8] >> (7-(i%8)))&1);
-	}
+    // Send the content of the frame
+    for(size_t i=0; i<frame_len; i++) {
+        hitag_send_bit((frame[i/8] >> (7-(i%8)))&1);
+    }
 
-	// Drop the modulation
-	LOW(GPIO_SSC_DOUT);
+    // Drop the modulation
+    LOW(GPIO_SSC_DOUT);
 }
 
 
 static void hitag2_handle_reader_command(uint8_t* rx, const size_t rxlen, uint8_t* tx, size_t* txlen)
 {
-	uint8_t rx_air[HITAG_FRAME_LEN];
+    uint8_t rx_air[HITAG_FRAME_LEN];
 
-	// Copy the (original) received frame how it is send over the air
-	memcpy(rx_air,rx,nbytes(rxlen));
+    // Copy the (original) received frame how it is send over the air
+    memcpy(rx_air,rx,nbytes(rxlen));
 
-	if(tag.crypto_active) {
-		hitag2_cipher_transcrypt(&(tag.cs),rx,rxlen/8,rxlen%8);
-	}
+    if(tag.crypto_active) {
+        hitag2_cipher_transcrypt(&(tag.cs),rx,rxlen/8,rxlen%8);
+    }
 
-	// Reset the transmission frame length
-	*txlen = 0;
+    // Reset the transmission frame length
+    *txlen = 0;
 
-	// Try to find out which command was send by selecting on length (in bits)
-	switch (rxlen) {
-		// Received 11000 from the reader, request for UID, send UID
-		case 05: {
-			// Always send over the air in the clear plaintext mode
-			if(rx_air[0] != 0xC0) {
-				// Unknown frame ?
-				return;
-			}
-			*txlen = 32;
-			memcpy(tx,tag.sectors[0],4);
-			tag.crypto_active = 0;
-		}
-		break;
+    // Try to find out which command was send by selecting on length (in bits)
+    switch (rxlen) {
+        // Received 11000 from the reader, request for UID, send UID
+        case 05: {
+            // Always send over the air in the clear plaintext mode
+            if(rx_air[0] != 0xC0) {
+                // Unknown frame ?
+                return;
+            }
+            *txlen = 32;
+            memcpy(tx,tag.sectors[0],4);
+            tag.crypto_active = 0;
+        }
+        break;
 
-		// Read/Write command: ..xx x..y  yy with yyy == ~xxx, xxx is sector number
-		case 10: {
-			unsigned int sector = (~( ((rx[0]<<2)&0x04) | ((rx[1]>>6)&0x03) ) & 0x07);
-			// Verify complement of sector index
-			if(sector != ((rx[0]>>3)&0x07)) {
-				//DbpString("Transmission error (read/write)");
-				return;
-			}
+        // Read/Write command: ..xx x..y  yy with yyy == ~xxx, xxx is sector number
+        case 10: {
+            unsigned int sector = (~( ((rx[0]<<2)&0x04) | ((rx[1]>>6)&0x03) ) & 0x07);
+            // Verify complement of sector index
+            if(sector != ((rx[0]>>3)&0x07)) {
+                //DbpString("Transmission error (read/write)");
+                return;
+            }
 
-			switch (rx[0] & 0xC6) {
-				// Read command: 11xx x00y
-				case 0xC0:
-					memcpy(tx,tag.sectors[sector],4);
-					*txlen = 32;
-				break;
+            switch (rx[0] & 0xC6) {
+                // Read command: 11xx x00y
+                case 0xC0:
+                    memcpy(tx,tag.sectors[sector],4);
+                    *txlen = 32;
+                break;
 
-				 // Inverted Read command: 01xx x10y
-				case 0x44:
-					for (size_t i=0; i<4; i++) {
-						tx[i] = tag.sectors[sector][i] ^ 0xff;
-					}
-					*txlen = 32;
-				break;
+                 // Inverted Read command: 01xx x10y
+                case 0x44:
+                    for (size_t i=0; i<4; i++) {
+                        tx[i] = tag.sectors[sector][i] ^ 0xff;
+                    }
+                    *txlen = 32;
+                break;
 
-				// Write command: 10xx x01y
-				case 0x82:
-					// Prepare write, acknowledge by repeating command
-					memcpy(tx,rx,nbytes(rxlen));
-					*txlen = rxlen;
-					tag.active_sector = sector;
-					tag.state=TAG_STATE_WRITING;
-				break;
+                // Write command: 10xx x01y
+                case 0x82:
+                    // Prepare write, acknowledge by repeating command
+                    memcpy(tx,rx,nbytes(rxlen));
+                    *txlen = rxlen;
+                    tag.active_sector = sector;
+                    tag.state=TAG_STATE_WRITING;
+                break;
 
-				// Unknown command
-				default:
-					Dbprintf("Unknown command: %02x %02x",rx[0],rx[1]);
-					return;
-				break;
-			}
-		}
-		break;
+                // Unknown command
+                default:
+                    Dbprintf("Unknown command: %02x %02x",rx[0],rx[1]);
+                    return;
+                break;
+            }
+        }
+        break;
 
-		// Writing data or Reader password
-		case 32: {
-			if(tag.state == TAG_STATE_WRITING) {
-				// These are the sector contents to be written. We don't have to do anything else.
-				memcpy(tag.sectors[tag.active_sector],rx,nbytes(rxlen));
-				tag.state=TAG_STATE_RESET;
-				return;
-			} else {
-				// Received RWD password, respond with configuration and our password
-				if(memcmp(rx,tag.sectors[1],4) != 0) {
-					DbpString("Reader password is wrong");
-					return;
-				}
-				*txlen = 32;
-				memcpy(tx,tag.sectors[3],4);
-			}
-		}
-		break;
+        // Writing data or Reader password
+        case 32: {
+            if(tag.state == TAG_STATE_WRITING) {
+                // These are the sector contents to be written. We don't have to do anything else.
+                memcpy(tag.sectors[tag.active_sector],rx,nbytes(rxlen));
+                tag.state=TAG_STATE_RESET;
+                return;
+            } else {
+                // Received RWD password, respond with configuration and our password
+                if(memcmp(rx,tag.sectors[1],4) != 0) {
+                    DbpString("Reader password is wrong");
+                    return;
+                }
+                *txlen = 32;
+                memcpy(tx,tag.sectors[3],4);
+            }
+        }
+        break;
 
-		// Received RWD authentication challenge and respnse
-		case 64: {
-			// Store the authentication attempt
-			if (auth_table_len < (AUTH_TABLE_LENGTH-8)) {
-				memcpy(auth_table+auth_table_len,rx,8);
-				auth_table_len += 8;
-			}
+        // Received RWD authentication challenge and respnse
+        case 64: {
+            // Store the authentication attempt
+            if (auth_table_len < (AUTH_TABLE_LENGTH-8)) {
+                memcpy(auth_table+auth_table_len,rx,8);
+                auth_table_len += 8;
+            }
 
-			// Reset the cipher state
-			hitag2_cipher_reset(&tag,rx);
-			// Check if the authentication was correct
-			if(!hitag2_cipher_authenticate(&(tag.cs),rx+4)) {
-				// The reader failed to authenticate, do nothing
-				Dbprintf("auth: %02x%02x%02x%02x%02x%02x%02x%02x Failed!",rx[0],rx[1],rx[2],rx[3],rx[4],rx[5],rx[6],rx[7]);
-				return;
-			}
-			// Succesful, but commented out reporting back to the Host, this may delay to much.
-			// Dbprintf("auth: %02x%02x%02x%02x%02x%02x%02x%02x OK!",rx[0],rx[1],rx[2],rx[3],rx[4],rx[5],rx[6],rx[7]);
+            // Reset the cipher state
+            hitag2_cipher_reset(&tag,rx);
+            // Check if the authentication was correct
+            if(!hitag2_cipher_authenticate(&(tag.cs),rx+4)) {
+                // The reader failed to authenticate, do nothing
+                Dbprintf("auth: %02x%02x%02x%02x%02x%02x%02x%02x Failed!",rx[0],rx[1],rx[2],rx[3],rx[4],rx[5],rx[6],rx[7]);
+                return;
+            }
+            // Succesful, but commented out reporting back to the Host, this may delay to much.
+            // Dbprintf("auth: %02x%02x%02x%02x%02x%02x%02x%02x OK!",rx[0],rx[1],rx[2],rx[3],rx[4],rx[5],rx[6],rx[7]);
 
-			// Activate encryption algorithm for all further communication
-			tag.crypto_active = 1;
+            // Activate encryption algorithm for all further communication
+            tag.crypto_active = 1;
 
-			// Use the tag password as response
-			memcpy(tx,tag.sectors[3],4);
-			*txlen = 32;
-		}
-		break;
-	}
+            // Use the tag password as response
+            memcpy(tx,tag.sectors[3],4);
+            *txlen = 32;
+        }
+        break;
+    }
 
-//	LogTraceHitag(rx,rxlen,0,0,false);
-//	LogTraceHitag(tx,*txlen,0,0,true);
+// LogTraceHitag(rx,rxlen,0,0,false);
+// LogTraceHitag(tx,*txlen,0,0,true);
 
-	if(tag.crypto_active) {
-		hitag2_cipher_transcrypt(&(tag.cs), tx, *txlen/8, *txlen%8);
-	}
+    if(tag.crypto_active) {
+        hitag2_cipher_transcrypt(&(tag.cs), tx, *txlen/8, *txlen%8);
+    }
 }
 
 static void hitag_reader_send_bit(int bit) {
-	LED_A_ON();
-	// Reset clock for the next bit
-	AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;
+    LED_A_ON();
+    // Reset clock for the next bit
+    AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;
 
-	// Binary puls length modulation (BPLM) is used to encode the data stream
-	// This means that a transmission of a one takes longer than that of a zero
+    // Binary puls length modulation (BPLM) is used to encode the data stream
+    // This means that a transmission of a one takes longer than that of a zero
 
-	// Enable modulation, which means, drop the field
-	HIGH(GPIO_SSC_DOUT);
+    // Enable modulation, which means, drop the field
+    HIGH(GPIO_SSC_DOUT);
 
-	// Wait for 4-10 times the carrier period
-	while(AT91C_BASE_TC0->TC_CV < T0*6);
-	//	SpinDelayUs(8*8);
+    // Wait for 4-10 times the carrier period
+    while(AT91C_BASE_TC0->TC_CV < T0*6);
+    // SpinDelayUs(8*8);
 
-	// Disable modulation, just activates the field again
-	LOW(GPIO_SSC_DOUT);
+    // Disable modulation, just activates the field again
+    LOW(GPIO_SSC_DOUT);
 
-	if(bit == 0) {
-		// Zero bit: |_-|
-		while (AT91C_BASE_TC0->TC_CV < T0*22) {};
+    if(bit == 0) {
+        // Zero bit: |_-|
+        while (AT91C_BASE_TC0->TC_CV < T0*22) {};
 
-	} else {
-		// One bit: |_--|
-		while (AT91C_BASE_TC0->TC_CV < T0*28) {};
-	}
-	LED_A_OFF();
+    } else {
+        // One bit: |_--|
+        while (AT91C_BASE_TC0->TC_CV < T0*28) {};
+    }
+    LED_A_OFF();
 }
 
 
 static void hitag_reader_send_frame(const uint8_t* frame, size_t frame_len)
 {
-	// Send the content of the frame
-	for(size_t i=0; i<frame_len; i++) {
-		hitag_reader_send_bit((frame[i/8] >> (7-(i%8)))&1);
-	}
-	// Send EOF
-	AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;
-	// Enable modulation, which means, drop the field
-	HIGH(GPIO_SSC_DOUT);
-	// Wait for 4-10 times the carrier period
-	while(AT91C_BASE_TC0->TC_CV < T0*6);
-	// Disable modulation, just activates the field again
-	LOW(GPIO_SSC_DOUT);
+    // Send the content of the frame
+    for(size_t i=0; i<frame_len; i++) {
+        hitag_reader_send_bit((frame[i/8] >> (7-(i%8)))&1);
+    }
+    // Send EOF
+    AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;
+    // Enable modulation, which means, drop the field
+    HIGH(GPIO_SSC_DOUT);
+    // Wait for 4-10 times the carrier period
+    while(AT91C_BASE_TC0->TC_CV < T0*6);
+    // Disable modulation, just activates the field again
+    LOW(GPIO_SSC_DOUT);
 }
 
 size_t blocknr;
 
 static bool hitag2_password(uint8_t* rx, const size_t rxlen, uint8_t* tx, size_t* txlen) {
-	// Reset the transmission frame length
-	*txlen = 0;
+    // Reset the transmission frame length
+    *txlen = 0;
 
-	// Try to find out which command was send by selecting on length (in bits)
-	switch (rxlen) {
-		// No answer, try to resurrect
-		case 0: {
-			// Stop if there is no answer (after sending password)
-			if (bPwd) {
-				DbpString("Password failed!");
-				return false;
-			}
-			*txlen = 5;
-			memcpy(tx,"\xc0",nbytes(*txlen));
-		} break;
+    // Try to find out which command was send by selecting on length (in bits)
+    switch (rxlen) {
+        // No answer, try to resurrect
+        case 0: {
+            // Stop if there is no answer (after sending password)
+            if (bPwd) {
+                DbpString("Password failed!");
+                return false;
+            }
+            *txlen = 5;
+            memcpy(tx,"\xc0",nbytes(*txlen));
+        } break;
 
-		// Received UID, tag password
-		case 32: {
-			if (!bPwd) {
-				*txlen = 32;
-				memcpy(tx,password,4);
-				bPwd = true;
-				memcpy(tag.sectors[blocknr],rx,4);
-				blocknr++;
-			} else {
+        // Received UID, tag password
+        case 32: {
+            if (!bPwd) {
+                *txlen = 32;
+                memcpy(tx,password,4);
+                bPwd = true;
+                memcpy(tag.sectors[blocknr],rx,4);
+                blocknr++;
+            } else {
 
-				if(blocknr == 1){
-					//store password in block1, the TAG answers with Block3, but we need the password in memory
-					memcpy(tag.sectors[blocknr],tx,4);
-				} else {
-					memcpy(tag.sectors[blocknr],rx,4);
-				}
+                if(blocknr == 1){
+                    //store password in block1, the TAG answers with Block3, but we need the password in memory
+                    memcpy(tag.sectors[blocknr],tx,4);
+                } else {
+                    memcpy(tag.sectors[blocknr],rx,4);
+                }
 
-				blocknr++;
-				if (blocknr > 7) {
-					DbpString("Read succesful!");
-					bSuccessful = true;
-					return false;
-				}
-				*txlen = 10;
-				tx[0] = 0xc0 | (blocknr << 3) | ((blocknr^7) >> 2);
-				tx[1] = ((blocknr^7) << 6);
-			}
-		} break;
+                blocknr++;
+                if (blocknr > 7) {
+                    DbpString("Read succesful!");
+                    bSuccessful = true;
+                    return false;
+                }
+                *txlen = 10;
+                tx[0] = 0xc0 | (blocknr << 3) | ((blocknr^7) >> 2);
+                tx[1] = ((blocknr^7) << 6);
+            }
+        } break;
 
-		// Unexpected response
+        // Unexpected response
     default: {
-			Dbprintf("Uknown frame length: %d",rxlen);
-			return false;
-		} break;
-	}
-	return true;
+            Dbprintf("Uknown frame length: %d",rxlen);
+            return false;
+        } break;
+    }
+    return true;
 }
 
 static bool hitag2_write_page(uint8_t* rx, const size_t rxlen, uint8_t* tx, size_t* txlen)
 {
-	switch (writestate) {
-	case WRITE_STATE_START:
-		*txlen = 10;
-		tx[0] = 0x82 | (blocknr << 3) | ((blocknr^7) >> 2);
-		tx[1] = ((blocknr^7) << 6);
-		writestate = WRITE_STATE_PAGENUM_WRITTEN;
-		break;
-	case WRITE_STATE_PAGENUM_WRITTEN:
-		// Check if page number was received correctly
-		if ((rxlen == 10) &&
-		    (rx[0] == (0x82 | (blocknr << 3) | ((blocknr^7) >> 2))) &&
-		    (rx[1] == (((blocknr & 0x3) ^ 0x3) << 6))) {
-			*txlen = 32;
-			memset(tx, 0, HITAG_FRAME_LEN);
-			memcpy(tx, writedata, 4);
-			writestate = WRITE_STATE_PROG;
-		} else {
-			Dbprintf("hitag2_write_page: Page number was not received correctly: rxlen=%d rx=%02x%02x%02x%02x",
-				 rxlen, rx[0], rx[1], rx[2], rx[3]);
-			bSuccessful = false;
-			return false;
-		}
-		break;
-	case WRITE_STATE_PROG:
-		if (rxlen == 0) {
-			bSuccessful = true;
-		} else {
-			bSuccessful = false;
-			Dbprintf("hitag2_write_page: unexpected rx data (%d) after page write", rxlen);
-		}
-		return false;
-	default:
-		DbpString("hitag2_write_page: Unknown state %d");
-		bSuccessful = false;
-		return false;
-	}
+    switch (writestate) {
+    case WRITE_STATE_START:
+        *txlen = 10;
+        tx[0] = 0x82 | (blocknr << 3) | ((blocknr^7) >> 2);
+        tx[1] = ((blocknr^7) << 6);
+        writestate = WRITE_STATE_PAGENUM_WRITTEN;
+        break;
+    case WRITE_STATE_PAGENUM_WRITTEN:
+        // Check if page number was received correctly
+        if ((rxlen == 10) &&
+            (rx[0] == (0x82 | (blocknr << 3) | ((blocknr^7) >> 2))) &&
+            (rx[1] == (((blocknr & 0x3) ^ 0x3) << 6))) {
+            *txlen = 32;
+            memset(tx, 0, HITAG_FRAME_LEN);
+            memcpy(tx, writedata, 4);
+            writestate = WRITE_STATE_PROG;
+        } else {
+            Dbprintf("hitag2_write_page: Page number was not received correctly: rxlen=%d rx=%02x%02x%02x%02x",
+                 rxlen, rx[0], rx[1], rx[2], rx[3]);
+            bSuccessful = false;
+            return false;
+        }
+        break;
+    case WRITE_STATE_PROG:
+        if (rxlen == 0) {
+            bSuccessful = true;
+        } else {
+            bSuccessful = false;
+            Dbprintf("hitag2_write_page: unexpected rx data (%d) after page write", rxlen);
+        }
+        return false;
+    default:
+        DbpString("hitag2_write_page: Unknown state %d");
+        bSuccessful = false;
+        return false;
+    }
 
-	return true;
+    return true;
 }
 
 static bool hitag2_crypto(uint8_t* rx, const size_t rxlen, uint8_t* tx, size_t* txlen, bool write) {
-	// Reset the transmission frame length
-	*txlen = 0;
+    // Reset the transmission frame length
+    *txlen = 0;
 
   if(bCrypto) {
-		hitag2_cipher_transcrypt(&cipher_state,rx,rxlen/8,rxlen%8);
-	}
+        hitag2_cipher_transcrypt(&cipher_state,rx,rxlen/8,rxlen%8);
+    }
 
-	if (bCrypto && !bAuthenticating && write) {
-		if (!hitag2_write_page(rx, rxlen, tx, txlen)) {
-			return false;
-		}
-	} else {
+    if (bCrypto && !bAuthenticating && write) {
+        if (!hitag2_write_page(rx, rxlen, tx, txlen)) {
+            return false;
+        }
+    } else {
 
-	// Try to find out which command was send by selecting on length (in bits)
-	switch (rxlen) {
+    // Try to find out which command was send by selecting on length (in bits)
+    switch (rxlen) {
       // No answer, try to resurrect
-		case 0: {
-			// Stop if there is no answer while we are in crypto mode (after sending NrAr)
-			if (bCrypto) {
+        case 0: {
+            // Stop if there is no answer while we are in crypto mode (after sending NrAr)
+            if (bCrypto) {
         // Failed during authentication
         if (bAuthenticating) {
           DbpString("Authentication failed!");
@@ -602,1190 +602,1190 @@ static bool hitag2_crypto(uint8_t* rx, const size_t rxlen, uint8_t* tx, size_t*
           blocknr++;
           bCrypto = false;
         }
-			} else {
-				*txlen = 5;
-				memcpy(tx,"\xc0",nbytes(*txlen));
-			}
-	break;
-	}
+            } else {
+                *txlen = 5;
+                memcpy(tx,"\xc0",nbytes(*txlen));
+            }
+    break;
+    }
       // Received UID, crypto tag answer
-		case 32: {
-			if (!bCrypto) {
+        case 32: {
+            if (!bCrypto) {
         uint64_t ui64key = key[0] | ((uint64_t)key[1]) << 8 | ((uint64_t)key[2]) << 16 | ((uint64_t)key[3]) << 24 | ((uint64_t)key[4]) << 32 | ((uint64_t)key[5]) << 40;
         uint32_t ui32uid = rx[0] | ((uint32_t)rx[1]) << 8 | ((uint32_t)rx[2]) << 16 | ((uint32_t)rx[3]) << 24;
-			Dbprintf("hitag2_crypto: key=0x%x%x uid=0x%x", (uint32_t) ((rev64(ui64key)) >> 32), (uint32_t) ((rev64(ui64key)) & 0xffffffff), rev32(ui32uid));
+            Dbprintf("hitag2_crypto: key=0x%x%x uid=0x%x", (uint32_t) ((rev64(ui64key)) >> 32), (uint32_t) ((rev64(ui64key)) & 0xffffffff), rev32(ui32uid));
         cipher_state = _hitag2_init(rev64(ui64key), rev32(ui32uid), 0);
         memset(tx,0x00,4);
         memset(tx+4,0xff,4);
         hitag2_cipher_transcrypt(&cipher_state,tx+4,4,0);
-				*txlen = 64;
-				bCrypto = true;
-				bAuthenticating = true;
-			} else {
+                *txlen = 64;
+                bCrypto = true;
+                bAuthenticating = true;
+            } else {
         // Check if we received answer tag (at)
         if (bAuthenticating) {
-			bAuthenticating = false;
-				if (write) {
-					if (!hitag2_write_page(rx, rxlen, tx, txlen)) {
-						return false;
-					}
-					break;
-				}
+            bAuthenticating = false;
+                if (write) {
+                    if (!hitag2_write_page(rx, rxlen, tx, txlen)) {
+                        return false;
+                    }
+                    break;
+                }
         } else {
-			// Store the received block
-			memcpy(tag.sectors[blocknr],rx,4);
-			blocknr++;
+            // Store the received block
+            memcpy(tag.sectors[blocknr],rx,4);
+            blocknr++;
         }
         if (blocknr > 7) {
-			DbpString("Read succesful!");
-			bSuccessful = true;
-			return false;
-			} else {
+            DbpString("Read succesful!");
+            bSuccessful = true;
+            return false;
+            } else {
         *txlen = 10;
         tx[0] = 0xc0 | (blocknr << 3) | ((blocknr^7) >> 2);
         tx[1] = ((blocknr^7) << 6);
-			}
-		}
-		} break;
+            }
+        }
+        } break;
 
       // Unexpected response
-		default: {
-			Dbprintf("Uknown frame length: %d",rxlen);
-			return false;
-		} break;
-	}
-	}
+        default: {
+            Dbprintf("Uknown frame length: %d",rxlen);
+            return false;
+        } break;
+    }
+    }
 
-	if(bCrypto) {
-		// We have to return now to avoid double encryption
-		if (!bAuthenticating) {
-		  hitag2_cipher_transcrypt(&cipher_state, tx, *txlen/8, *txlen%8);
-		}
-	}
+    if(bCrypto) {
+        // We have to return now to avoid double encryption
+        if (!bAuthenticating) {
+          hitag2_cipher_transcrypt(&cipher_state, tx, *txlen/8, *txlen%8);
+        }
+    }
 
-	return true;
+    return true;
 }
 
 
 static bool hitag2_authenticate(uint8_t* rx, const size_t rxlen, uint8_t* tx, size_t* txlen) {
-	// Reset the transmission frame length
-	*txlen = 0;
+    // Reset the transmission frame length
+    *txlen = 0;
 
-	// Try to find out which command was send by selecting on length (in bits)
-	switch (rxlen) {
-		// No answer, try to resurrect
-		case 0: {
-			// Stop if there is no answer while we are in crypto mode (after sending NrAr)
-			if (bCrypto) {
-				DbpString("Authentication failed!");
-				return false;
-			}
-			*txlen = 5;
-			memcpy(tx,"\xc0", nbytes(*txlen));
-		} break;
+    // Try to find out which command was send by selecting on length (in bits)
+    switch (rxlen) {
+        // No answer, try to resurrect
+        case 0: {
+            // Stop if there is no answer while we are in crypto mode (after sending NrAr)
+            if (bCrypto) {
+                DbpString("Authentication failed!");
+                return false;
+            }
+            *txlen = 5;
+            memcpy(tx,"\xc0", nbytes(*txlen));
+        } break;
 
-		// Received UID, crypto tag answer
-		case 32: {
-			if (!bCrypto) {
-				*txlen = 64;
-				memcpy(tx, NrAr, 8);
-				bCrypto = true;
-			} else {
-				DbpString("Authentication succesful!");
-				return true;
-			}
-		} break;
+        // Received UID, crypto tag answer
+        case 32: {
+            if (!bCrypto) {
+                *txlen = 64;
+                memcpy(tx, NrAr, 8);
+                bCrypto = true;
+            } else {
+                DbpString("Authentication succesful!");
+                return true;
+            }
+        } break;
 
-		// Unexpected response
-		default: {
-			Dbprintf("Uknown frame length: %d", rxlen);
-			return false;
-		} break;
-	}
+        // Unexpected response
+        default: {
+            Dbprintf("Uknown frame length: %d", rxlen);
+            return false;
+        } break;
+    }
 
-	return true;
+    return true;
 }
 
 
 static bool hitag2_test_auth_attempts(uint8_t* rx, const size_t rxlen, uint8_t* tx, size_t* txlen) {
 
-	// Reset the transmission frame length
-	*txlen = 0;
+    // Reset the transmission frame length
+    *txlen = 0;
 
-	// Try to find out which command was send by selecting on length (in bits)
-	switch (rxlen) {
-			// No answer, try to resurrect
-		case 0: {
-			// Stop if there is no answer while we are in crypto mode (after sending NrAr)
-			if (bCrypto) {
-				Dbprintf("auth: %02x%02x%02x%02x%02x%02x%02x%02x Failed, removed entry!",NrAr[0],NrAr[1],NrAr[2],NrAr[3],NrAr[4],NrAr[5],NrAr[6],NrAr[7]);
+    // Try to find out which command was send by selecting on length (in bits)
+    switch (rxlen) {
+            // No answer, try to resurrect
+        case 0: {
+            // Stop if there is no answer while we are in crypto mode (after sending NrAr)
+            if (bCrypto) {
+                Dbprintf("auth: %02x%02x%02x%02x%02x%02x%02x%02x Failed, removed entry!",NrAr[0],NrAr[1],NrAr[2],NrAr[3],NrAr[4],NrAr[5],NrAr[6],NrAr[7]);
 
-				// Removing failed entry from authentiations table
-				memcpy(auth_table+auth_table_pos,auth_table+auth_table_pos+8,8);
-				auth_table_len -= 8;
+                // Removing failed entry from authentiations table
+                memcpy(auth_table+auth_table_pos,auth_table+auth_table_pos+8,8);
+                auth_table_len -= 8;
 
-				// Return if we reached the end of the authentications table
-				bCrypto = false;
-				if (auth_table_pos == auth_table_len) {
-					return false;
-				}
+                // Return if we reached the end of the authentications table
+                bCrypto = false;
+                if (auth_table_pos == auth_table_len) {
+                    return false;
+                }
 
-				// Copy the next authentication attempt in row (at the same position, b/c we removed last failed entry)
-				memcpy(NrAr,auth_table+auth_table_pos,8);
-			}
-			*txlen = 5;
-			memcpy(tx,"\xc0",nbytes(*txlen));
-		}	break;
+                // Copy the next authentication attempt in row (at the same position, b/c we removed last failed entry)
+                memcpy(NrAr,auth_table+auth_table_pos,8);
+            }
+            *txlen = 5;
+            memcpy(tx,"\xc0",nbytes(*txlen));
+        } break;
 
-			// Received UID, crypto tag answer, or read block response
-		case 32: {
-			if (!bCrypto) {
-				*txlen = 64;
-				memcpy(tx,NrAr,8);
-				bCrypto = true;
-			} else {
-				Dbprintf("auth: %02x%02x%02x%02x%02x%02x%02x%02x OK",NrAr[0],NrAr[1],NrAr[2],NrAr[3],NrAr[4],NrAr[5],NrAr[6],NrAr[7]);
-				bCrypto = false;
-				if ((auth_table_pos+8) == auth_table_len) {
-					return false;
-				}
-				auth_table_pos += 8;
-				memcpy(NrAr,auth_table+auth_table_pos,8);
-			}
-		} break;
+            // Received UID, crypto tag answer, or read block response
+        case 32: {
+            if (!bCrypto) {
+                *txlen = 64;
+                memcpy(tx,NrAr,8);
+                bCrypto = true;
+            } else {
+                Dbprintf("auth: %02x%02x%02x%02x%02x%02x%02x%02x OK",NrAr[0],NrAr[1],NrAr[2],NrAr[3],NrAr[4],NrAr[5],NrAr[6],NrAr[7]);
+                bCrypto = false;
+                if ((auth_table_pos+8) == auth_table_len) {
+                    return false;
+                }
+                auth_table_pos += 8;
+                memcpy(NrAr,auth_table+auth_table_pos,8);
+            }
+        } break;
 
-		default: {
-			Dbprintf("Uknown frame length: %d",rxlen);
-			return false;
-		} break;
-	}
+        default: {
+            Dbprintf("Uknown frame length: %d",rxlen);
+            return false;
+        } break;
+    }
 
-	return true;
+    return true;
 }
 
 static bool hitag2_read_uid(uint8_t* rx, const size_t rxlen, uint8_t* tx, size_t* txlen) {
-	// Reset the transmission frame length
-	*txlen = 0;
+    // Reset the transmission frame length
+    *txlen = 0;
 
-	// Try to find out which command was send by selecting on length (in bits)
-	switch (rxlen) {
-		// No answer, try to resurrect
-		case 0: {
-			// Just starting or if there is no answer
-			*txlen = 5;
-			memcpy(tx, "\xC0", nbytes(*txlen) );
-		} break;
-		// Received UID
-		case 32: {
-			// Check if we received answer tag (at)
-			if (bAuthenticating) {
-				bAuthenticating = false;
-			} else {
-				// Store the received block
-				memcpy(tag.sectors[blocknr], rx, 4);
-				blocknr++;
-			}
-			if (blocknr > 0) {
-				// DbpString("Read successful!");
-				bSuccessful = true;
-				return false;
-			}
-		} break;
-		// Unexpected response
-		default: {
-			Dbprintf("Uknown frame length: %d", rxlen);
-			return false;
-		} break;
-	}
-	return true;
+    // Try to find out which command was send by selecting on length (in bits)
+    switch (rxlen) {
+        // No answer, try to resurrect
+        case 0: {
+            // Just starting or if there is no answer
+            *txlen = 5;
+            memcpy(tx, "\xC0", nbytes(*txlen) );
+        } break;
+        // Received UID
+        case 32: {
+            // Check if we received answer tag (at)
+            if (bAuthenticating) {
+                bAuthenticating = false;
+            } else {
+                // Store the received block
+                memcpy(tag.sectors[blocknr], rx, 4);
+                blocknr++;
+            }
+            if (blocknr > 0) {
+                // DbpString("Read successful!");
+                bSuccessful = true;
+                return false;
+            }
+        } break;
+        // Unexpected response
+        default: {
+            Dbprintf("Uknown frame length: %d", rxlen);
+            return false;
+        } break;
+    }
+    return true;
 }
 
 void SnoopHitag(uint32_t type) {
-	int frame_count;
-	int response;
-	int overflow;
-	bool rising_edge;
-	bool reader_frame;
-	int lastbit;
-	bool bSkip;
-	int tag_sof;
-	uint8_t rx[HITAG_FRAME_LEN];
-	size_t rxlen=0;
+    int frame_count;
+    int response;
+    int overflow;
+    bool rising_edge;
+    bool reader_frame;
+    int lastbit;
+    bool bSkip;
+    int tag_sof;
+    uint8_t rx[HITAG_FRAME_LEN];
+    size_t rxlen=0;
 
-	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
+    FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
 
-	// free eventually allocated BigBuf memory
-	BigBuf_free(); BigBuf_Clear_ext(false);
+    // free eventually allocated BigBuf memory
+    BigBuf_free(); BigBuf_Clear_ext(false);
 
-	// Clean up trace and prepare it for storing frames
-	clear_trace();
-	set_tracing(true);
+    // Clean up trace and prepare it for storing frames
+    clear_trace();
+    set_tracing(true);
 
-	auth_table_len = 0;
-	auth_table_pos = 0;
+    auth_table_len = 0;
+    auth_table_pos = 0;
 
     auth_table = (uint8_t *)BigBuf_malloc(AUTH_TABLE_LENGTH);
-	memset(auth_table, 0x00, AUTH_TABLE_LENGTH);
+    memset(auth_table, 0x00, AUTH_TABLE_LENGTH);
 
-	DbpString("Starting Hitag2 snoop");
-	LED_D_ON();
+    DbpString("Starting Hitag2 snoop");
+    LED_D_ON();
 
-	// Set up eavesdropping mode, frequency divisor which will drive the FPGA
-	// and analog mux selection.
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT  | FPGA_LF_EDGE_DETECT_TOGGLE_MODE);
-	FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
-	SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
-	RELAY_OFF();
+    // Set up eavesdropping mode, frequency divisor which will drive the FPGA
+    // and analog mux selection.
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT  | FPGA_LF_EDGE_DETECT_TOGGLE_MODE);
+    FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
+    SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
+    RELAY_OFF();
 
-	// Configure output pin that is connected to the FPGA (for modulating)
-	AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
-	AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
+    // Configure output pin that is connected to the FPGA (for modulating)
+    AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
+    AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
 
-	// Disable modulation, we are going to eavesdrop, not modulate ;)
-	LOW(GPIO_SSC_DOUT);
+    // Disable modulation, we are going to eavesdrop, not modulate ;)
+    LOW(GPIO_SSC_DOUT);
 
-	// Enable Peripheral Clock for TIMER_CLOCK1, used to capture edges of the reader frames
-	AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC1);
-	AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
+    // Enable Peripheral Clock for TIMER_CLOCK1, used to capture edges of the reader frames
+    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC1);
+    AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
 
-	// Disable timer during configuration
-	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
+    // Disable timer during configuration
+    AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 
-	// Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
-	// external trigger rising edge, load RA on rising edge of TIOA.
-	uint32_t t1_channel_mode = AT91C_TC_CLKS_TIMER_DIV1_CLOCK | AT91C_TC_ETRGEDG_BOTH | AT91C_TC_ABETRG | AT91C_TC_LDRA_BOTH;
-	AT91C_BASE_TC1->TC_CMR = t1_channel_mode;
+    // Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
+    // external trigger rising edge, load RA on rising edge of TIOA.
+    uint32_t t1_channel_mode = AT91C_TC_CLKS_TIMER_DIV1_CLOCK | AT91C_TC_ETRGEDG_BOTH | AT91C_TC_ABETRG | AT91C_TC_LDRA_BOTH;
+    AT91C_BASE_TC1->TC_CMR = t1_channel_mode;
 
-	// Enable and reset counter
-	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
+    // Enable and reset counter
+    AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
-	// Reset the received frame, frame count and timing info
-	memset(rx, 0x00, sizeof(rx));
-	frame_count = 0;
-	response = 0;
-	overflow = 0;
-	reader_frame = false;
-	lastbit = 1;
-	bSkip = true;
-	tag_sof = 4;
+    // Reset the received frame, frame count and timing info
+    memset(rx, 0x00, sizeof(rx));
+    frame_count = 0;
+    response = 0;
+    overflow = 0;
+    reader_frame = false;
+    lastbit = 1;
+    bSkip = true;
+    tag_sof = 4;
 
-	while(!BUTTON_PRESS() && !usb_poll_validate_length()) {
-		// Watchdog hit
-		WDT_HIT();
+    while(!BUTTON_PRESS() && !usb_poll_validate_length()) {
+        // Watchdog hit
+        WDT_HIT();
 
-		// Receive frame, watch for at most T0*EOF periods
-		while (AT91C_BASE_TC1->TC_CV < T0*HITAG_T_EOF) {
-			// Check if rising edge in modulation is detected
-			if(AT91C_BASE_TC1->TC_SR & AT91C_TC_LDRAS) {
-				// Retrieve the new timing values
-				int ra = (AT91C_BASE_TC1->TC_RA/T0);
+        // Receive frame, watch for at most T0*EOF periods
+        while (AT91C_BASE_TC1->TC_CV < T0*HITAG_T_EOF) {
+            // Check if rising edge in modulation is detected
+            if(AT91C_BASE_TC1->TC_SR & AT91C_TC_LDRAS) {
+                // Retrieve the new timing values
+                int ra = (AT91C_BASE_TC1->TC_RA/T0);
 
-				// Find out if we are dealing with a rising or falling edge
-				rising_edge = (AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_FRAME) > 0;
+                // Find out if we are dealing with a rising or falling edge
+                rising_edge = (AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_FRAME) > 0;
 
-				// Shorter periods will only happen with reader frames
-				if (!reader_frame && rising_edge && ra < HITAG_T_TAG_CAPTURE_ONE_HALF) {
-					// Switch from tag to reader capture
-					LED_C_OFF();
-					reader_frame = true;
-					memset(rx,0x00,sizeof(rx));
-					rxlen = 0;
-				}
+                // Shorter periods will only happen with reader frames
+                if (!reader_frame && rising_edge && ra < HITAG_T_TAG_CAPTURE_ONE_HALF) {
+                    // Switch from tag to reader capture
+                    LED_C_OFF();
+                    reader_frame = true;
+                    memset(rx,0x00,sizeof(rx));
+                    rxlen = 0;
+                }
 
-				// Only handle if reader frame and rising edge, or tag frame and falling edge
-				if (reader_frame != rising_edge) {
-				  overflow += ra;
-					continue;
-				}
+                // Only handle if reader frame and rising edge, or tag frame and falling edge
+                if (reader_frame != rising_edge) {
+                  overflow += ra;
+                    continue;
+                }
 
-				// Add the buffered timing values of earlier captured edges which were skipped
-				ra += overflow;
-				overflow = 0;
+                // Add the buffered timing values of earlier captured edges which were skipped
+                ra += overflow;
+                overflow = 0;
 
-				if (reader_frame) {
-					LED_B_ON();
-					// Capture reader frame
-					if(ra >= HITAG_T_STOP) {
-						if (rxlen != 0) {
-							//DbpString("wierd0?");
-						}
-						// Capture the T0 periods that have passed since last communication or field drop (reset)
-						response = (ra - HITAG_T_LOW);
-					} else if(ra >= HITAG_T_1_MIN ) {
-						// '1' bit
-						rx[rxlen / 8] |= 1 << (7-(rxlen%8));
-						rxlen++;
-					} else if(ra >= HITAG_T_0_MIN) {
-						// '0' bit
-						rx[rxlen / 8] |= 0 << (7-(rxlen%8));
-						rxlen++;
-					} else {
-						// Ignore wierd value, is to small to mean anything
-					}
-				} else {
-					LED_C_ON();
-					// Capture tag frame (manchester decoding using only falling edges)
-					if(ra >= HITAG_T_EOF) {
-						if (rxlen != 0) {
-							//DbpString("wierd1?");
-						}
-						// Capture the T0 periods that have passed since last communication or field drop (reset)
-						// We always recieve a 'one' first, which has the falling edge after a half period |-_|
-						response = ra-HITAG_T_TAG_HALF_PERIOD;
-					} else if(ra >= HITAG_T_TAG_CAPTURE_FOUR_HALF) {
-						// Manchester coding example |-_|_-|-_| (101)
-						rx[rxlen / 8] |= 0 << (7-(rxlen%8));
-						rxlen++;
-						rx[rxlen / 8] |= 1 << (7-(rxlen%8));
-						rxlen++;
-					} else if(ra >= HITAG_T_TAG_CAPTURE_THREE_HALF) {
-						// Manchester coding example |_-|...|_-|-_| (0...01)
-						rx[rxlen / 8] |= 0 << (7-(rxlen%8));
-						rxlen++;
-						// We have to skip this half period at start and add the 'one' the second time
-						if (!bSkip) {
-							rx[rxlen / 8] |= 1 << (7-(rxlen%8));
-							rxlen++;
-						}
-						lastbit = !lastbit;
-						bSkip = !bSkip;
-					} else if(ra >= HITAG_T_TAG_CAPTURE_TWO_HALF) {
-						// Manchester coding example |_-|_-| (00) or |-_|-_| (11)
-						if (tag_sof) {
-							// Ignore bits that are transmitted during SOF
-							tag_sof--;
-						} else {
-							// bit is same as last bit
-							rx[rxlen / 8] |= lastbit << (7-(rxlen%8));
-							rxlen++;
-						}
-					} else {
-						// Ignore wierd value, is to small to mean anything
-					}
-				}
-			}
-		}
+                if (reader_frame) {
+                    LED_B_ON();
+                    // Capture reader frame
+                    if(ra >= HITAG_T_STOP) {
+                        if (rxlen != 0) {
+                            //DbpString("wierd0?");
+                        }
+                        // Capture the T0 periods that have passed since last communication or field drop (reset)
+                        response = (ra - HITAG_T_LOW);
+                    } else if(ra >= HITAG_T_1_MIN ) {
+                        // '1' bit
+                        rx[rxlen / 8] |= 1 << (7-(rxlen%8));
+                        rxlen++;
+                    } else if(ra >= HITAG_T_0_MIN) {
+                        // '0' bit
+                        rx[rxlen / 8] |= 0 << (7-(rxlen%8));
+                        rxlen++;
+                    } else {
+                        // Ignore wierd value, is to small to mean anything
+                    }
+                } else {
+                    LED_C_ON();
+                    // Capture tag frame (manchester decoding using only falling edges)
+                    if(ra >= HITAG_T_EOF) {
+                        if (rxlen != 0) {
+                            //DbpString("wierd1?");
+                        }
+                        // Capture the T0 periods that have passed since last communication or field drop (reset)
+                        // We always recieve a 'one' first, which has the falling edge after a half period |-_|
+                        response = ra-HITAG_T_TAG_HALF_PERIOD;
+                    } else if(ra >= HITAG_T_TAG_CAPTURE_FOUR_HALF) {
+                        // Manchester coding example |-_|_-|-_| (101)
+                        rx[rxlen / 8] |= 0 << (7-(rxlen%8));
+                        rxlen++;
+                        rx[rxlen / 8] |= 1 << (7-(rxlen%8));
+                        rxlen++;
+                    } else if(ra >= HITAG_T_TAG_CAPTURE_THREE_HALF) {
+                        // Manchester coding example |_-|...|_-|-_| (0...01)
+                        rx[rxlen / 8] |= 0 << (7-(rxlen%8));
+                        rxlen++;
+                        // We have to skip this half period at start and add the 'one' the second time
+                        if (!bSkip) {
+                            rx[rxlen / 8] |= 1 << (7-(rxlen%8));
+                            rxlen++;
+                        }
+                        lastbit = !lastbit;
+                        bSkip = !bSkip;
+                    } else if(ra >= HITAG_T_TAG_CAPTURE_TWO_HALF) {
+                        // Manchester coding example |_-|_-| (00) or |-_|-_| (11)
+                        if (tag_sof) {
+                            // Ignore bits that are transmitted during SOF
+                            tag_sof--;
+                        } else {
+                            // bit is same as last bit
+                            rx[rxlen / 8] |= lastbit << (7-(rxlen%8));
+                            rxlen++;
+                        }
+                    } else {
+                        // Ignore wierd value, is to small to mean anything
+                    }
+                }
+            }
+        }
 
-		// Check if frame was captured
-		if(rxlen > 0) {
-			frame_count++;
-			if (!LogTraceHitag(rx,rxlen,response,0,reader_frame)) {
-				DbpString("Trace full");
-				break;
-			}
+        // Check if frame was captured
+        if(rxlen > 0) {
+            frame_count++;
+            if (!LogTraceHitag(rx,rxlen,response,0,reader_frame)) {
+                DbpString("Trace full");
+                break;
+            }
 
-			// Check if we recognize a valid authentication attempt
-			if (nbytes(rxlen) == 8) {
-				// Store the authentication attempt
-				if (auth_table_len < (AUTH_TABLE_LENGTH-8)) {
-					memcpy(auth_table+auth_table_len,rx,8);
-					auth_table_len += 8;
-				}
-			}
+            // Check if we recognize a valid authentication attempt
+            if (nbytes(rxlen) == 8) {
+                // Store the authentication attempt
+                if (auth_table_len < (AUTH_TABLE_LENGTH-8)) {
+                    memcpy(auth_table+auth_table_len,rx,8);
+                    auth_table_len += 8;
+                }
+            }
 
-			// Reset the received frame and response timing info
-			memset(rx,0x00,sizeof(rx));
-			response = 0;
-			reader_frame = false;
-			lastbit = 1;
-			bSkip = true;
-			tag_sof = 4;
-			overflow = 0;
+            // Reset the received frame and response timing info
+            memset(rx,0x00,sizeof(rx));
+            response = 0;
+            reader_frame = false;
+            lastbit = 1;
+            bSkip = true;
+            tag_sof = 4;
+            overflow = 0;
 
-			LED_B_OFF();
-			LED_C_OFF();
-		} else {
-			// Save the timer overflow, will be 0 when frame was received
-			overflow += (AT91C_BASE_TC1->TC_CV/T0);
-		}
-		// Reset the frame length
-		rxlen = 0;
-		// Reset the timer to restart while-loop that receives frames
-		AT91C_BASE_TC1->TC_CCR = AT91C_TC_SWTRG;
-	}
+            LED_B_OFF();
+            LED_C_OFF();
+        } else {
+            // Save the timer overflow, will be 0 when frame was received
+            overflow += (AT91C_BASE_TC1->TC_CV/T0);
+        }
+        // Reset the frame length
+        rxlen = 0;
+        // Reset the timer to restart while-loop that receives frames
+        AT91C_BASE_TC1->TC_CCR = AT91C_TC_SWTRG;
+    }
     LED_A_ON();
-	LED_B_OFF();
-	LED_C_OFF();
-	LED_D_OFF();
-	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
+    LED_B_OFF();
+    LED_C_OFF();
+    LED_D_OFF();
+    AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     LED_A_OFF();
-	set_tracing(false);
-//	Dbprintf("frame received: %d",frame_count);
-//	Dbprintf("Authentication Attempts: %d",(auth_table_len/8));
-//	DbpString("All done");
+    set_tracing(false);
+// Dbprintf("frame received: %d",frame_count);
+// Dbprintf("Authentication Attempts: %d",(auth_table_len/8));
+// DbpString("All done");
 }
 
 void SimulateHitagTag(bool tag_mem_supplied, uint8_t* data) {
-	int frame_count;
-	int response;
-	int overflow;
-	uint8_t rx[HITAG_FRAME_LEN];
-	size_t rxlen=0;
-	uint8_t tx[HITAG_FRAME_LEN];
-	size_t txlen=0;
-	bool bQuitTraceFull = false;
-	bQuiet = false;
+    int frame_count;
+    int response;
+    int overflow;
+    uint8_t rx[HITAG_FRAME_LEN];
+    size_t rxlen=0;
+    uint8_t tx[HITAG_FRAME_LEN];
+    size_t txlen=0;
+    bool bQuitTraceFull = false;
+    bQuiet = false;
 
-	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
+    FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
 
-	// free eventually allocated BigBuf memory
-	BigBuf_free(); BigBuf_Clear_ext(false);
+    // free eventually allocated BigBuf memory
+    BigBuf_free(); BigBuf_Clear_ext(false);
 
-	// Clean up trace and prepare it for storing frames
-	clear_trace();
-	set_tracing(true);
+    // Clean up trace and prepare it for storing frames
+    clear_trace();
+    set_tracing(true);
 
-	auth_table_len = 0;
-	auth_table_pos = 0;
+    auth_table_len = 0;
+    auth_table_pos = 0;
     uint8_t* auth_table;
 
     auth_table = (uint8_t *)BigBuf_malloc(AUTH_TABLE_LENGTH);
-	memset(auth_table, 0x00, AUTH_TABLE_LENGTH);
+    memset(auth_table, 0x00, AUTH_TABLE_LENGTH);
 
-	DbpString("Starting Hitag2 simulation");
-	LED_D_ON();
-	hitag2_init();
+    DbpString("Starting Hitag2 simulation");
+    LED_D_ON();
+    hitag2_init();
 
-	if (tag_mem_supplied) {
-		DbpString("Loading hitag2 memory...");
-		memcpy((uint8_t*)tag.sectors,data,48);
-	}
+    if (tag_mem_supplied) {
+        DbpString("Loading hitag2 memory...");
+        memcpy((uint8_t*)tag.sectors,data,48);
+    }
 
-	uint32_t block = 0;
-	for (size_t i=0; i<12; i++) {
-		for (size_t j=0; j<4; j++) {
-			block <<= 8;
-			block |= tag.sectors[i][j];
-		}
-		Dbprintf("| %d | %08x |",i,block);
-	}
+    uint32_t block = 0;
+    for (size_t i=0; i<12; i++) {
+        for (size_t j=0; j<4; j++) {
+            block <<= 8;
+            block |= tag.sectors[i][j];
+        }
+        Dbprintf("| %d | %08x |",i,block);
+    }
 
-	// Set up simulator mode, frequency divisor which will drive the FPGA
-	// and analog mux selection.
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT);
-	SpinDelay(50);
-	FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
-	SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
-	RELAY_OFF();
+    // Set up simulator mode, frequency divisor which will drive the FPGA
+    // and analog mux selection.
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT);
+    SpinDelay(50);
+    FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
+    SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
+    RELAY_OFF();
 
-	// Configure output pin that is connected to the FPGA (for modulating)
-	AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
-	AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
+    // Configure output pin that is connected to the FPGA (for modulating)
+    AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
+    AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
 
-	// Disable modulation at default, which means release resistance
-	LOW(GPIO_SSC_DOUT);
+    // Disable modulation at default, which means release resistance
+    LOW(GPIO_SSC_DOUT);
 
-	// Enable Peripheral Clock for TIMER_CLOCK0, used to measure exact timing before answering
-	AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC0);
+    // Enable Peripheral Clock for TIMER_CLOCK0, used to measure exact timing before answering
+    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC0);
 
-	// Enable Peripheral Clock for TIMER_CLOCK1, used to capture edges of the reader frames
-	AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC1);
-	AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
+    // Enable Peripheral Clock for TIMER_CLOCK1, used to capture edges of the reader frames
+    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC1);
+    AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
 
     // Disable timer during configuration
-	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
+    AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 
-	// Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
-	// external trigger rising edge, load RA on rising edge of TIOA.
-	AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK | AT91C_TC_ETRGEDG_RISING | AT91C_TC_ABETRG | AT91C_TC_LDRA_RISING;
+    // Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
+    // external trigger rising edge, load RA on rising edge of TIOA.
+    AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK | AT91C_TC_ETRGEDG_RISING | AT91C_TC_ABETRG | AT91C_TC_LDRA_RISING;
 
-	// Reset the received frame, frame count and timing info
-	memset(rx,0x00,sizeof(rx));
-	frame_count = 0;
-	response = 0;
-	overflow = 0;
+    // Reset the received frame, frame count and timing info
+    memset(rx,0x00,sizeof(rx));
+    frame_count = 0;
+    response = 0;
+    overflow = 0;
 
-	// Enable and reset counter
-	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
+    // Enable and reset counter
+    AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
-	while(!BUTTON_PRESS() && !usb_poll_validate_length()) {
-		// Watchdog hit
-		WDT_HIT();
+    while(!BUTTON_PRESS() && !usb_poll_validate_length()) {
+        // Watchdog hit
+        WDT_HIT();
 
-		// Receive frame, watch for at most T0*EOF periods
-		while (AT91C_BASE_TC1->TC_CV < T0*HITAG_T_EOF) {
-			// Check if rising edge in modulation is detected
-			if(AT91C_BASE_TC1->TC_SR & AT91C_TC_LDRAS) {
-				// Retrieve the new timing values
-				int ra = (AT91C_BASE_TC1->TC_RA/T0) + overflow;
-				overflow = 0;
+        // Receive frame, watch for at most T0*EOF periods
+        while (AT91C_BASE_TC1->TC_CV < T0*HITAG_T_EOF) {
+            // Check if rising edge in modulation is detected
+            if(AT91C_BASE_TC1->TC_SR & AT91C_TC_LDRAS) {
+                // Retrieve the new timing values
+                int ra = (AT91C_BASE_TC1->TC_RA/T0) + overflow;
+                overflow = 0;
 
-				// Reset timer every frame, we have to capture the last edge for timing
-				AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
+                // Reset timer every frame, we have to capture the last edge for timing
+                AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
-				LED_B_ON();
+                LED_B_ON();
 
-				// Capture reader frame
-				if(ra >= HITAG_T_STOP) {
-					if (rxlen != 0) {
-						//DbpString("wierd0?");
-					}
-					// Capture the T0 periods that have passed since last communication or field drop (reset)
-					response = (ra - HITAG_T_LOW);
-				} else if(ra >= HITAG_T_1_MIN ) {
-					// '1' bit
-					rx[rxlen / 8] |= 1 << (7-(rxlen%8));
-					rxlen++;
-				} else if(ra >= HITAG_T_0_MIN) {
-					// '0' bit
-					rx[rxlen / 8] |= 0 << (7-(rxlen%8));
-					rxlen++;
-				} else {
-					// Ignore wierd value, is to small to mean anything
-				}
-			}
-		}
+                // Capture reader frame
+                if(ra >= HITAG_T_STOP) {
+                    if (rxlen != 0) {
+                        //DbpString("wierd0?");
+                    }
+                    // Capture the T0 periods that have passed since last communication or field drop (reset)
+                    response = (ra - HITAG_T_LOW);
+                } else if(ra >= HITAG_T_1_MIN ) {
+                    // '1' bit
+                    rx[rxlen / 8] |= 1 << (7-(rxlen%8));
+                    rxlen++;
+                } else if(ra >= HITAG_T_0_MIN) {
+                    // '0' bit
+                    rx[rxlen / 8] |= 0 << (7-(rxlen%8));
+                    rxlen++;
+                } else {
+                    // Ignore wierd value, is to small to mean anything
+                }
+            }
+        }
 
-		// Check if frame was captured
-		if(rxlen > 4) {
-			frame_count++;
-			if (!bQuiet) {
-				if (!LogTraceHitag(rx,rxlen,response,0,true)) {
-					DbpString("Trace full");
-					if (bQuitTraceFull) {
-						break;
-					} else {
-						bQuiet = true;
-					}
-				}
-			}
+        // Check if frame was captured
+        if(rxlen > 4) {
+            frame_count++;
+            if (!bQuiet) {
+                if (!LogTraceHitag(rx,rxlen,response,0,true)) {
+                    DbpString("Trace full");
+                    if (bQuitTraceFull) {
+                        break;
+                    } else {
+                        bQuiet = true;
+                    }
+                }
+            }
 
-			// Disable timer 1 with external trigger to avoid triggers during our own modulation
-			AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
+            // Disable timer 1 with external trigger to avoid triggers during our own modulation
+            AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 
-			// Process the incoming frame (rx) and prepare the outgoing frame (tx)
-			hitag2_handle_reader_command(rx,rxlen,tx,&txlen);
+            // Process the incoming frame (rx) and prepare the outgoing frame (tx)
+            hitag2_handle_reader_command(rx,rxlen,tx,&txlen);
 
-			// Wait for HITAG_T_WAIT_1 carrier periods after the last reader bit,
-			// not that since the clock counts since the rising edge, but T_Wait1 is
-			// with respect to the falling edge, we need to wait actually (T_Wait1 - T_Low)
-			// periods. The gap time T_Low varies (4..10). All timer values are in
-			// terms of T0 units
-			while(AT91C_BASE_TC0->TC_CV < T0*(HITAG_T_WAIT_1-HITAG_T_LOW));
+            // Wait for HITAG_T_WAIT_1 carrier periods after the last reader bit,
+            // not that since the clock counts since the rising edge, but T_Wait1 is
+            // with respect to the falling edge, we need to wait actually (T_Wait1 - T_Low)
+            // periods. The gap time T_Low varies (4..10). All timer values are in
+            // terms of T0 units
+            while(AT91C_BASE_TC0->TC_CV < T0*(HITAG_T_WAIT_1-HITAG_T_LOW));
 
-			// Send and store the tag answer (if there is any)
-			if (txlen) {
-				// Transmit the tag frame
-				hitag_send_frame(tx,txlen);
-				// Store the frame in the trace
-				if (!bQuiet) {
-					if (!LogTraceHitag(tx,txlen,0,0,false)) {
-						DbpString("Trace full");
-						if (bQuitTraceFull) {
-							break;
-						} else {
-							bQuiet = true;
-						}
-					}
-				}
-			}
+            // Send and store the tag answer (if there is any)
+            if (txlen) {
+                // Transmit the tag frame
+                hitag_send_frame(tx,txlen);
+                // Store the frame in the trace
+                if (!bQuiet) {
+                    if (!LogTraceHitag(tx,txlen,0,0,false)) {
+                        DbpString("Trace full");
+                        if (bQuitTraceFull) {
+                            break;
+                        } else {
+                            bQuiet = true;
+                        }
+                    }
+                }
+            }
 
-			// Reset the received frame and response timing info
-			memset(rx,0x00,sizeof(rx));
-			response = 0;
+            // Reset the received frame and response timing info
+            memset(rx,0x00,sizeof(rx));
+            response = 0;
 
-			// Enable and reset external trigger in timer for capturing future frames
-			AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
-			LED_B_OFF();
-		}
-		// Reset the frame length
-		rxlen = 0;
-		// Save the timer overflow, will be 0 when frame was received
-		overflow += (AT91C_BASE_TC1->TC_CV/T0);
-		// Reset the timer to restart while-loop that receives frames
-		AT91C_BASE_TC1->TC_CCR = AT91C_TC_SWTRG;
-	}
-	LED_B_OFF();
-	LED_D_OFF();
-	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
-	AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+            // Enable and reset external trigger in timer for capturing future frames
+            AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
+            LED_B_OFF();
+        }
+        // Reset the frame length
+        rxlen = 0;
+        // Save the timer overflow, will be 0 when frame was received
+        overflow += (AT91C_BASE_TC1->TC_CV/T0);
+        // Reset the timer to restart while-loop that receives frames
+        AT91C_BASE_TC1->TC_CCR = AT91C_TC_SWTRG;
+    }
+    LED_B_OFF();
+    LED_D_OFF();
+    AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
+    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 
-	DbpString("Sim Stopped");
-	set_tracing(false);
+    DbpString("Sim Stopped");
+    set_tracing(false);
 }
 
 void ReaderHitag(hitag_function htf, hitag_data* htd) {
-	int frame_count = 0;
-	int response = 0;
-	uint8_t rx[HITAG_FRAME_LEN];
-	size_t rxlen = 0;
-	uint8_t txbuf[HITAG_FRAME_LEN];
-	uint8_t* tx = txbuf;
-	size_t txlen = 0;
-	int lastbit = 1;
-	bool bSkip;
-	int reset_sof;
-	int tag_sof;
-	int t_wait = HITAG_T_WAIT_MAX;
-	bool bStop = false;
-	bool bQuitTraceFull = false;
+    int frame_count = 0;
+    int response = 0;
+    uint8_t rx[HITAG_FRAME_LEN];
+    size_t rxlen = 0;
+    uint8_t txbuf[HITAG_FRAME_LEN];
+    uint8_t* tx = txbuf;
+    size_t txlen = 0;
+    int lastbit = 1;
+    bool bSkip;
+    int reset_sof;
+    int tag_sof;
+    int t_wait = HITAG_T_WAIT_MAX;
+    bool bStop = false;
+    bool bQuitTraceFull = false;
 
-	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-	// Reset the return status
-	bSuccessful = false;
+    FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
+    // Reset the return status
+    bSuccessful = false;
 
-	// Clean up trace and prepare it for storing frames
-	clear_trace();
-	set_tracing(true);
+    // Clean up trace and prepare it for storing frames
+    clear_trace();
+    set_tracing(true);
 
-	//DbpString("Starting Hitag reader family");
+    //DbpString("Starting Hitag reader family");
 
-	// Check configuration
-	switch (htf) {
-		case RHT2F_PASSWORD: {
-			Dbprintf("List identifier in password mode");
-			memcpy(password,htd->pwd.password, 4);
-      		blocknr = 0;
-			bQuitTraceFull = false;
-			bQuiet = false;
-			bPwd = false;
-		} break;
+    // Check configuration
+    switch (htf) {
+        case RHT2F_PASSWORD: {
+            Dbprintf("List identifier in password mode");
+            memcpy(password,htd->pwd.password, 4);
+            blocknr = 0;
+            bQuitTraceFull = false;
+            bQuiet = false;
+            bPwd = false;
+        } break;
 
-		case RHT2F_AUTHENTICATE: {
-			DbpString("Authenticating using nr,ar pair:");
-			memcpy(NrAr,htd->auth.NrAr, 8);
-			Dbhexdump(8,NrAr,false);
-			bQuiet = false;
-			bCrypto = false;
-			bAuthenticating = false;
-			bQuitTraceFull = true;
-		} break;
+        case RHT2F_AUTHENTICATE: {
+            DbpString("Authenticating using nr,ar pair:");
+            memcpy(NrAr,htd->auth.NrAr, 8);
+            Dbhexdump(8,NrAr,false);
+            bQuiet = false;
+            bCrypto = false;
+            bAuthenticating = false;
+            bQuitTraceFull = true;
+        } break;
 
-		case RHT2F_CRYPTO: {
-			DbpString("Authenticating using key:");
-			memcpy(key,htd->crypto.key, 6);	  //HACK; 4 or 6??  I read both in the code.
-			Dbhexdump(6,key,false);
-			blocknr = 0;
-			bQuiet = false;
-			bCrypto = false;
-			bAuthenticating = false;
-			bQuitTraceFull = true;
-		} break;
+        case RHT2F_CRYPTO: {
+            DbpString("Authenticating using key:");
+            memcpy(key,htd->crypto.key, 6);   //HACK; 4 or 6??  I read both in the code.
+            Dbhexdump(6,key,false);
+            blocknr = 0;
+            bQuiet = false;
+            bCrypto = false;
+            bAuthenticating = false;
+            bQuitTraceFull = true;
+        } break;
 
-		case RHT2F_TEST_AUTH_ATTEMPTS: {
-			Dbprintf("Testing %d authentication attempts",(auth_table_len/8));
-			auth_table_pos = 0;
-			memcpy(NrAr, auth_table, 8);
-			bQuitTraceFull = false;
-			bQuiet = false;
-			bCrypto = false;
-		} break;
-		case RHT2F_UID_ONLY: {
-			blocknr = 0;
-			bQuiet = false;
-			bCrypto = false;
-			bAuthenticating = false;
-			bQuitTraceFull = true;
-		} break;
-		default: {
-			Dbprintf("Error, unknown function: %d",htf);
-			set_tracing(false);
-			return;
-		} break;
-	}
+        case RHT2F_TEST_AUTH_ATTEMPTS: {
+            Dbprintf("Testing %d authentication attempts",(auth_table_len/8));
+            auth_table_pos = 0;
+            memcpy(NrAr, auth_table, 8);
+            bQuitTraceFull = false;
+            bQuiet = false;
+            bCrypto = false;
+        } break;
+        case RHT2F_UID_ONLY: {
+            blocknr = 0;
+            bQuiet = false;
+            bCrypto = false;
+            bAuthenticating = false;
+            bQuitTraceFull = true;
+        } break;
+        default: {
+            Dbprintf("Error, unknown function: %d",htf);
+            set_tracing(false);
+            return;
+        } break;
+    }
 
-	LED_D_ON();
-	hitag2_init();
+    LED_D_ON();
+    hitag2_init();
 
-	// Configure output and enable pin that is connected to the FPGA (for modulating)
-	AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
-	AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
+    // Configure output and enable pin that is connected to the FPGA (for modulating)
+    AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
+    AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
 
-	// Set fpga in edge detect with reader field, we can modulate as reader now
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_READER_FIELD);
-	SpinDelay(20);
+    // Set fpga in edge detect with reader field, we can modulate as reader now
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_READER_FIELD);
+    SpinDelay(20);
 
-	// Set Frequency divisor which will drive the FPGA and analog mux selection
-	FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
-	SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
-	RELAY_OFF();
+    // Set Frequency divisor which will drive the FPGA and analog mux selection
+    FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
+    SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
+    RELAY_OFF();
 
-	// Disable modulation at default, which means enable the field
-	LOW(GPIO_SSC_DOUT);
+    // Disable modulation at default, which means enable the field
+    LOW(GPIO_SSC_DOUT);
 
-	// Give it a bit of time for the resonant antenna to settle.
-	SpinDelay(30);
+    // Give it a bit of time for the resonant antenna to settle.
+    SpinDelay(30);
 
-	// Enable Peripheral Clock for TIMER_CLOCK0, used to measure exact timing before answering
-	AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC0);
+    // Enable Peripheral Clock for TIMER_CLOCK0, used to measure exact timing before answering
+    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC0);
 
-	// Enable Peripheral Clock for TIMER_CLOCK1, used to capture edges of the tag frames
-	AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC1);
-	AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
+    // Enable Peripheral Clock for TIMER_CLOCK1, used to capture edges of the tag frames
+    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC1);
+    AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
 
     // Disable timer during configuration
-	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
+    AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 
-	// Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
-	// external trigger rising edge, load RA on falling edge of TIOA.
-	AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK | AT91C_TC_ETRGEDG_FALLING | AT91C_TC_ABETRG | AT91C_TC_LDRA_FALLING;
+    // Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
+    // external trigger rising edge, load RA on falling edge of TIOA.
+    AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK | AT91C_TC_ETRGEDG_FALLING | AT91C_TC_ABETRG | AT91C_TC_LDRA_FALLING;
 
-	// Enable and reset counters
-	AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
-	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
+    // Enable and reset counters
+    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
+    AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
-	// Tag specific configuration settings (sof, timings, etc.)
-	if (htf < 10){
-		// hitagS settings
-		reset_sof = 1;
-		t_wait = 200;
+    // Tag specific configuration settings (sof, timings, etc.)
+    if (htf < 10){
+        // hitagS settings
+        reset_sof = 1;
+        t_wait = 200;
     // DbpString("Configured for hitagS reader");
-	} else if (htf < 20) {
-		// hitag1 settings
-		reset_sof = 1;
-		t_wait = 200;
+    } else if (htf < 20) {
+        // hitag1 settings
+        reset_sof = 1;
+        t_wait = 200;
     // DbpString("Configured for hitag1 reader");
-	} else if (htf < 30) {
-		// hitag2 settings
-		reset_sof = 4;
-		t_wait = HITAG_T_WAIT_2;
+    } else if (htf < 30) {
+        // hitag2 settings
+        reset_sof = 4;
+        t_wait = HITAG_T_WAIT_2;
     // DbpString("Configured for hitag2 reader");
-	} else {
-		Dbprintf("Error, unknown hitag reader type: %d",htf);
-		set_tracing(false);
-		LED_D_OFF();
-		return;
-	}
-	uint8_t attempt_count=0;
-	while (!bStop && !BUTTON_PRESS()) {
-		// Watchdog hit
-		WDT_HIT();
+    } else {
+        Dbprintf("Error, unknown hitag reader type: %d",htf);
+        set_tracing(false);
+        LED_D_OFF();
+        return;
+    }
+    uint8_t attempt_count=0;
+    while (!bStop && !BUTTON_PRESS()) {
+        // Watchdog hit
+        WDT_HIT();
 
-		// Check if frame was captured and store it
-		if (rxlen > 0) {
-			frame_count++;
-			if (!bQuiet) {
-				if (!LogTraceHitag(rx,rxlen, response, 0, false)) {
-					DbpString("Trace full");
-					if (bQuitTraceFull)
-						break;
-					else
-						bQuiet = true;
-				}
-			}
-		}
+        // Check if frame was captured and store it
+        if (rxlen > 0) {
+            frame_count++;
+            if (!bQuiet) {
+                if (!LogTraceHitag(rx,rxlen, response, 0, false)) {
+                    DbpString("Trace full");
+                    if (bQuitTraceFull)
+                        break;
+                    else
+                        bQuiet = true;
+                }
+            }
+        }
 
-		// By default reset the transmission buffer
-		tx = txbuf;
-		switch (htf) {
-			case RHT2F_PASSWORD: {
-				bStop = !hitag2_password(rx,rxlen,tx,&txlen);
-			} break;
-			case RHT2F_AUTHENTICATE: {
-				bStop = !hitag2_authenticate(rx,rxlen,tx,&txlen);
-			} break;
-			case RHT2F_CRYPTO: {
-			bStop = !hitag2_crypto(rx,rxlen,tx,&txlen, false);
-			} break;
-			case RHT2F_TEST_AUTH_ATTEMPTS: {
-				bStop = !hitag2_test_auth_attempts(rx,rxlen,tx,&txlen);
-			} break;
-			case RHT2F_UID_ONLY: {
-				bStop = !hitag2_read_uid(rx, rxlen, tx, &txlen);
-				attempt_count++; //attempt 3 times to get uid then quit
-				if (!bStop && attempt_count == 3)
-					bStop = true;
-			} break;
-			default: {
-				Dbprintf("Error, unknown function: %d",htf);
-				set_tracing(false);
-				LED_D_OFF();
-				return;
-			} break;
-		}
+        // By default reset the transmission buffer
+        tx = txbuf;
+        switch (htf) {
+            case RHT2F_PASSWORD: {
+                bStop = !hitag2_password(rx,rxlen,tx,&txlen);
+            } break;
+            case RHT2F_AUTHENTICATE: {
+                bStop = !hitag2_authenticate(rx,rxlen,tx,&txlen);
+            } break;
+            case RHT2F_CRYPTO: {
+            bStop = !hitag2_crypto(rx,rxlen,tx,&txlen, false);
+            } break;
+            case RHT2F_TEST_AUTH_ATTEMPTS: {
+                bStop = !hitag2_test_auth_attempts(rx,rxlen,tx,&txlen);
+            } break;
+            case RHT2F_UID_ONLY: {
+                bStop = !hitag2_read_uid(rx, rxlen, tx, &txlen);
+                attempt_count++; //attempt 3 times to get uid then quit
+                if (!bStop && attempt_count == 3)
+                    bStop = true;
+            } break;
+            default: {
+                Dbprintf("Error, unknown function: %d",htf);
+                set_tracing(false);
+                LED_D_OFF();
+                return;
+            } break;
+        }
 
-		// Send and store the reader command
-		// Disable timer 1 with external trigger to avoid triggers during our own modulation
-		AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
+        // Send and store the reader command
+        // Disable timer 1 with external trigger to avoid triggers during our own modulation
+        AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 
-		// Wait for HITAG_T_WAIT_2 carrier periods after the last tag bit before transmitting,
-		// Since the clock counts since the last falling edge, a 'one' means that the
-		// falling edge occured halfway the period. with respect to this falling edge,
-		// we need to wait (T_Wait2 + half_tag_period) when the last was a 'one'.
-		// All timer values are in terms of T0 units
-		while (AT91C_BASE_TC0->TC_CV < T0 * (t_wait + (HITAG_T_TAG_HALF_PERIOD * lastbit)));
+        // Wait for HITAG_T_WAIT_2 carrier periods after the last tag bit before transmitting,
+        // Since the clock counts since the last falling edge, a 'one' means that the
+        // falling edge occured halfway the period. with respect to this falling edge,
+        // we need to wait (T_Wait2 + half_tag_period) when the last was a 'one'.
+        // All timer values are in terms of T0 units
+        while (AT91C_BASE_TC0->TC_CV < T0 * (t_wait + (HITAG_T_TAG_HALF_PERIOD * lastbit)));
 
-		// Transmit the reader frame
-		hitag_reader_send_frame(tx, txlen);
+        // Transmit the reader frame
+        hitag_reader_send_frame(tx, txlen);
 
-		// Enable and reset external trigger in timer for capturing future frames
-		AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
+        // Enable and reset external trigger in timer for capturing future frames
+        AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
-		// Add transmitted frame to total count
-		if (txlen > 0) {
-			frame_count++;
-			if (!bQuiet) {
-				// Store the frame in the trace
-				if (!LogTraceHitag(tx, txlen, HITAG_T_WAIT_2, 0, true)) {
-					if (bQuitTraceFull) {
-						break;
-					} else {
-						bQuiet = true;
-					}
-				}
-			}
-		}
+        // Add transmitted frame to total count
+        if (txlen > 0) {
+            frame_count++;
+            if (!bQuiet) {
+                // Store the frame in the trace
+                if (!LogTraceHitag(tx, txlen, HITAG_T_WAIT_2, 0, true)) {
+                    if (bQuitTraceFull) {
+                        break;
+                    } else {
+                        bQuiet = true;
+                    }
+                }
+            }
+        }
 
-		// Reset values for receiving frames
-		memset(rx, 0x00, sizeof(rx));
-		rxlen = 0;
-		lastbit = 1;
-		bSkip = true;
-		tag_sof = reset_sof;
-		response = 0;
-		uint32_t errorCount = 0;
+        // Reset values for receiving frames
+        memset(rx, 0x00, sizeof(rx));
+        rxlen = 0;
+        lastbit = 1;
+        bSkip = true;
+        tag_sof = reset_sof;
+        response = 0;
+        uint32_t errorCount = 0;
 
-		// Receive frame, watch for at most T0*EOF periods
-		while (AT91C_BASE_TC1->TC_CV < T0 * HITAG_T_WAIT_MAX) {
-			// Check if falling edge in tag modulation is detected
-			if (AT91C_BASE_TC1->TC_SR & AT91C_TC_LDRAS) {
-				// Retrieve the new timing values
-				int ra = (AT91C_BASE_TC1->TC_RA/T0);
+        // Receive frame, watch for at most T0*EOF periods
+        while (AT91C_BASE_TC1->TC_CV < T0 * HITAG_T_WAIT_MAX) {
+            // Check if falling edge in tag modulation is detected
+            if (AT91C_BASE_TC1->TC_SR & AT91C_TC_LDRAS) {
+                // Retrieve the new timing values
+                int ra = (AT91C_BASE_TC1->TC_RA/T0);
 
-				// Reset timer every frame, we have to capture the last edge for timing
-				AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;
+                // Reset timer every frame, we have to capture the last edge for timing
+                AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;
 
-				LED_B_ON();
+                LED_B_ON();
 
-				// Capture tag frame (manchester decoding using only falling edges)
-				if (ra >= HITAG_T_EOF) {
-					// Capture the T0 periods that have passed since last communication or field drop (reset)
-					// We always recieve a 'one' first, which has the falling edge after a half period |-_|
-					response = ra-HITAG_T_TAG_HALF_PERIOD;
-				} else if (ra >= HITAG_T_TAG_CAPTURE_FOUR_HALF) {
-					// Manchester coding example |-_|_-|-_| (101)
-					rx[rxlen / 8] |= 0 << (7-(rxlen%8));
-					rxlen++;
-					rx[rxlen / 8] |= 1 << (7-(rxlen%8));
-					rxlen++;
-				} else if (ra >= HITAG_T_TAG_CAPTURE_THREE_HALF) {
-					// Manchester coding example |_-|...|_-|-_| (0...01)
-					rx[rxlen / 8] |= 0 << (7-(rxlen%8));
-					rxlen++;
-					// We have to skip this half period at start and add the 'one' the second time
-					if (!bSkip) {
-						rx[rxlen / 8] |= 1 << (7-(rxlen%8));
-						rxlen++;
-					}
-					lastbit = !lastbit;
-					bSkip = !bSkip;
-				} else if (ra >= HITAG_T_TAG_CAPTURE_TWO_HALF) {
-					// Manchester coding example |_-|_-| (00) or |-_|-_| (11)
-					if (tag_sof) {
-						// Ignore bits that are transmitted during SOF
-						tag_sof--;
-					} else {
-						// bit is same as last bit
-						rx[rxlen / 8] |= lastbit << (7-(rxlen%8));
-						rxlen++;
-					}
-				} else {
-						//Dbprintf("DEBUG: Wierd2");
-						errorCount++;
-					// Ignore wierd value, is to small to mean anything
-				}
-			}
-			//if we saw over 100 wierd values break it probably isn't hitag...
-			if (errorCount > 100) break;
-			// We can break this loop if we received the last bit from a frame
-			if (AT91C_BASE_TC1->TC_CV > T0*HITAG_T_EOF) {
-				if (rxlen > 0) break;
-			}
-		}
-	}
-	LED_B_OFF();
-	LED_D_OFF();
-	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
-	AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	set_tracing(false);
+                // Capture tag frame (manchester decoding using only falling edges)
+                if (ra >= HITAG_T_EOF) {
+                    // Capture the T0 periods that have passed since last communication or field drop (reset)
+                    // We always recieve a 'one' first, which has the falling edge after a half period |-_|
+                    response = ra-HITAG_T_TAG_HALF_PERIOD;
+                } else if (ra >= HITAG_T_TAG_CAPTURE_FOUR_HALF) {
+                    // Manchester coding example |-_|_-|-_| (101)
+                    rx[rxlen / 8] |= 0 << (7-(rxlen%8));
+                    rxlen++;
+                    rx[rxlen / 8] |= 1 << (7-(rxlen%8));
+                    rxlen++;
+                } else if (ra >= HITAG_T_TAG_CAPTURE_THREE_HALF) {
+                    // Manchester coding example |_-|...|_-|-_| (0...01)
+                    rx[rxlen / 8] |= 0 << (7-(rxlen%8));
+                    rxlen++;
+                    // We have to skip this half period at start and add the 'one' the second time
+                    if (!bSkip) {
+                        rx[rxlen / 8] |= 1 << (7-(rxlen%8));
+                        rxlen++;
+                    }
+                    lastbit = !lastbit;
+                    bSkip = !bSkip;
+                } else if (ra >= HITAG_T_TAG_CAPTURE_TWO_HALF) {
+                    // Manchester coding example |_-|_-| (00) or |-_|-_| (11)
+                    if (tag_sof) {
+                        // Ignore bits that are transmitted during SOF
+                        tag_sof--;
+                    } else {
+                        // bit is same as last bit
+                        rx[rxlen / 8] |= lastbit << (7-(rxlen%8));
+                        rxlen++;
+                    }
+                } else {
+                        //Dbprintf("DEBUG: Wierd2");
+                        errorCount++;
+                    // Ignore wierd value, is to small to mean anything
+                }
+            }
+            //if we saw over 100 wierd values break it probably isn't hitag...
+            if (errorCount > 100) break;
+            // We can break this loop if we received the last bit from a frame
+            if (AT91C_BASE_TC1->TC_CV > T0*HITAG_T_EOF) {
+                if (rxlen > 0) break;
+            }
+        }
+    }
+    LED_B_OFF();
+    LED_D_OFF();
+    AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
+    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    set_tracing(false);
 
-	if ( bSuccessful )
-		cmd_send(CMD_ACK, bSuccessful, 0, 0, (uint8_t*)tag.sectors, 48);
-	else
-		cmd_send(CMD_ACK, bSuccessful, 0, 0, 0, 0);
+    if ( bSuccessful )
+        cmd_send(CMD_ACK, bSuccessful, 0, 0, (uint8_t*)tag.sectors, 48);
+    else
+        cmd_send(CMD_ACK, bSuccessful, 0, 0, 0, 0);
 }
 
 void WriterHitag(hitag_function htf, hitag_data* htd, int page) {
-	int frame_count;
-	int response;
-	uint8_t rx[HITAG_FRAME_LEN];
-	size_t rxlen=0;
-	uint8_t txbuf[HITAG_FRAME_LEN];
-	uint8_t* tx = txbuf;
-	size_t txlen=0;
-	int lastbit;
-	bool bSkip;
-	int reset_sof;
-	int tag_sof;
-	int t_wait = HITAG_T_WAIT_MAX;
-	bool bStop;
-	bool bQuitTraceFull = false;
+    int frame_count;
+    int response;
+    uint8_t rx[HITAG_FRAME_LEN];
+    size_t rxlen=0;
+    uint8_t txbuf[HITAG_FRAME_LEN];
+    uint8_t* tx = txbuf;
+    size_t txlen=0;
+    int lastbit;
+    bool bSkip;
+    int reset_sof;
+    int tag_sof;
+    int t_wait = HITAG_T_WAIT_MAX;
+    bool bStop;
+    bool bQuitTraceFull = false;
 
-	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-	// Reset the return status
-	bSuccessful = false;
+    FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
+    // Reset the return status
+    bSuccessful = false;
 
-	// Clean up trace and prepare it for storing frames
-	set_tracing(true);
-	clear_trace();
+    // Clean up trace and prepare it for storing frames
+    set_tracing(true);
+    clear_trace();
 
-	// DbpString("Starting Hitag reader family");
+    // DbpString("Starting Hitag reader family");
 
-	// Check configuration
-	switch(htf) {
-	case WHT2F_CRYPTO: {
-		DbpString("Authenticating using key:");
-		memcpy(key,htd->crypto.key,6);	  //HACK; 4 or 6??  I read both in the code.
-		memcpy(writedata, htd->crypto.data, 4);
-		Dbhexdump(6,key,false);
-		blocknr = page;
-		bQuiet = false;
-		bCrypto = false;
-		bAuthenticating = false;
-		bQuitTraceFull = true;
-		writestate = WRITE_STATE_START;
-	} break;
-	default: {
-		Dbprintf("Error, unknown function: %d",htf);
-		return;
-	} break;
-	}
+    // Check configuration
+    switch(htf) {
+    case WHT2F_CRYPTO: {
+        DbpString("Authenticating using key:");
+        memcpy(key,htd->crypto.key,6);   //HACK; 4 or 6??  I read both in the code.
+        memcpy(writedata, htd->crypto.data, 4);
+        Dbhexdump(6,key,false);
+        blocknr = page;
+        bQuiet = false;
+        bCrypto = false;
+        bAuthenticating = false;
+        bQuitTraceFull = true;
+        writestate = WRITE_STATE_START;
+    } break;
+    default: {
+        Dbprintf("Error, unknown function: %d",htf);
+        return;
+    } break;
+    }
 
-	LED_D_ON();
-	hitag2_init();
+    LED_D_ON();
+    hitag2_init();
 
-	// Configure output and enable pin that is connected to the FPGA (for modulating)
-	AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
-	AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
+    // Configure output and enable pin that is connected to the FPGA (for modulating)
+    AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
+    AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
 
-	// Set fpga in edge detect with reader field, we can modulate as reader now
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_READER_FIELD);
+    // Set fpga in edge detect with reader field, we can modulate as reader now
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_READER_FIELD);
 
-	// Set Frequency divisor which will drive the FPGA and analog mux selection
-	FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
-	SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
-	RELAY_OFF();
+    // Set Frequency divisor which will drive the FPGA and analog mux selection
+    FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
+    SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
+    RELAY_OFF();
 
-	// Disable modulation at default, which means enable the field
-	LOW(GPIO_SSC_DOUT);
+    // Disable modulation at default, which means enable the field
+    LOW(GPIO_SSC_DOUT);
 
-	// Give it a bit of time for the resonant antenna to settle.
-	SpinDelay(30);
+    // Give it a bit of time for the resonant antenna to settle.
+    SpinDelay(30);
 
-	// Enable Peripheral Clock for TIMER_CLOCK0, used to measure exact timing before answering
-	AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC0);
+    // Enable Peripheral Clock for TIMER_CLOCK0, used to measure exact timing before answering
+    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC0);
 
-	// Enable Peripheral Clock for TIMER_CLOCK1, used to capture edges of the tag frames
-	AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC1);
-	AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
+    // Enable Peripheral Clock for TIMER_CLOCK1, used to capture edges of the tag frames
+    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC1);
+    AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
 
-	// Disable timer during configuration
-	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
+    // Disable timer during configuration
+    AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 
-	// Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
-	// external trigger rising edge, load RA on falling edge of TIOA.
-	AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK | AT91C_TC_ETRGEDG_FALLING | AT91C_TC_ABETRG | AT91C_TC_LDRA_FALLING;
+    // Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
+    // external trigger rising edge, load RA on falling edge of TIOA.
+    AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK | AT91C_TC_ETRGEDG_FALLING | AT91C_TC_ABETRG | AT91C_TC_LDRA_FALLING;
 
-	// Enable and reset counters
-	AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
-	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
+    // Enable and reset counters
+    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
+    AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
-	// Reset the received frame, frame count and timing info
-	frame_count = 0;
-	response = 0;
-	lastbit = 1;
-	bStop = false;
+    // Reset the received frame, frame count and timing info
+    frame_count = 0;
+    response = 0;
+    lastbit = 1;
+    bStop = false;
 
-	// Tag specific configuration settings (sof, timings, etc.)
-	if (htf < 10){
-		// hitagS settings
-		reset_sof = 1;
-		t_wait = 200;
-		// DbpString("Configured for hitagS reader");
-	} else if (htf < 20) {
-		// hitag1 settings
-		reset_sof = 1;
-		t_wait = 200;
-		// DbpString("Configured for hitag1 reader");
-	} else if (htf < 30) {
-		// hitag2 settings
-		reset_sof = 4;
-		t_wait = HITAG_T_WAIT_2;
-		// DbpString("Configured for hitag2 reader");
-	} else {
-		Dbprintf("Error, unknown hitag reader type: %d",htf);
-		return;
-	}
-	while(!bStop && !BUTTON_PRESS()) {
-		// Watchdog hit
-		WDT_HIT();
+    // Tag specific configuration settings (sof, timings, etc.)
+    if (htf < 10){
+        // hitagS settings
+        reset_sof = 1;
+        t_wait = 200;
+        // DbpString("Configured for hitagS reader");
+    } else if (htf < 20) {
+        // hitag1 settings
+        reset_sof = 1;
+        t_wait = 200;
+        // DbpString("Configured for hitag1 reader");
+    } else if (htf < 30) {
+        // hitag2 settings
+        reset_sof = 4;
+        t_wait = HITAG_T_WAIT_2;
+        // DbpString("Configured for hitag2 reader");
+    } else {
+        Dbprintf("Error, unknown hitag reader type: %d",htf);
+        return;
+    }
+    while(!bStop && !BUTTON_PRESS()) {
+        // Watchdog hit
+        WDT_HIT();
 
-		// Check if frame was captured and store it
-		if(rxlen > 0) {
-			frame_count++;
-			if (!bQuiet) {
-				if (!LogTraceHitag(rx,rxlen,response,0,false)) {
-					DbpString("Trace full");
-					if (bQuitTraceFull) {
-						break;
-					} else {
-						bQuiet = true;
-					}
-				}
-			}
-		}
+        // Check if frame was captured and store it
+        if(rxlen > 0) {
+            frame_count++;
+            if (!bQuiet) {
+                if (!LogTraceHitag(rx,rxlen,response,0,false)) {
+                    DbpString("Trace full");
+                    if (bQuitTraceFull) {
+                        break;
+                    } else {
+                        bQuiet = true;
+                    }
+                }
+            }
+        }
 
-		// By default reset the transmission buffer
-		tx = txbuf;
-		switch(htf) {
-		case WHT2F_CRYPTO: {
-			bStop = !hitag2_crypto(rx,rxlen,tx,&txlen, true);
-		} break;
-		default: {
-			Dbprintf("Error, unknown function: %d",htf);
-			return;
-		} break;
-		}
+        // By default reset the transmission buffer
+        tx = txbuf;
+        switch(htf) {
+        case WHT2F_CRYPTO: {
+            bStop = !hitag2_crypto(rx,rxlen,tx,&txlen, true);
+        } break;
+        default: {
+            Dbprintf("Error, unknown function: %d",htf);
+            return;
+        } break;
+        }
 
-		// Send and store the reader command
-		// Disable timer 1 with external trigger to avoid triggers during our own modulation
-		AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
+        // Send and store the reader command
+        // Disable timer 1 with external trigger to avoid triggers during our own modulation
+        AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 
-		// Wait for HITAG_T_WAIT_2 carrier periods after the last tag bit before transmitting,
-		// Since the clock counts since the last falling edge, a 'one' means that the
-		// falling edge occured halfway the period. with respect to this falling edge,
-		// we need to wait (T_Wait2 + half_tag_period) when the last was a 'one'.
-		// All timer values are in terms of T0 units
-		while(AT91C_BASE_TC0->TC_CV < T0*(t_wait+(HITAG_T_TAG_HALF_PERIOD*lastbit)));
+        // Wait for HITAG_T_WAIT_2 carrier periods after the last tag bit before transmitting,
+        // Since the clock counts since the last falling edge, a 'one' means that the
+        // falling edge occured halfway the period. with respect to this falling edge,
+        // we need to wait (T_Wait2 + half_tag_period) when the last was a 'one'.
+        // All timer values are in terms of T0 units
+        while(AT91C_BASE_TC0->TC_CV < T0*(t_wait+(HITAG_T_TAG_HALF_PERIOD*lastbit)));
 
-		// Dbprintf("DEBUG: Sending reader frame");
+        // Dbprintf("DEBUG: Sending reader frame");
 
-		// Transmit the reader frame
-		hitag_reader_send_frame(tx,txlen);
+        // Transmit the reader frame
+        hitag_reader_send_frame(tx,txlen);
 
-		// Enable and reset external trigger in timer for capturing future frames
-		AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
+        // Enable and reset external trigger in timer for capturing future frames
+        AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
-		// Add transmitted frame to total count
-		if(txlen > 0) {
-			frame_count++;
-			if (!bQuiet) {
-				// Store the frame in the trace
-				if (!LogTraceHitag(tx,txlen,HITAG_T_WAIT_2,0,true)) {
-					if (bQuitTraceFull) {
-						break;
-					} else {
-						bQuiet = true;
-					}
-				}
-			}
-		}
+        // Add transmitted frame to total count
+        if(txlen > 0) {
+            frame_count++;
+            if (!bQuiet) {
+                // Store the frame in the trace
+                if (!LogTraceHitag(tx,txlen,HITAG_T_WAIT_2,0,true)) {
+                    if (bQuitTraceFull) {
+                        break;
+                    } else {
+                        bQuiet = true;
+                    }
+                }
+            }
+        }
 
-		// Reset values for receiving frames
-		memset(rx,0x00,sizeof(rx));
-		rxlen = 0;
-		lastbit = 1;
-		bSkip = true;
-		tag_sof = reset_sof;
-		response = 0;
-		// Dbprintf("DEBUG: Waiting to receive frame");
-		uint32_t errorCount = 0;
+        // Reset values for receiving frames
+        memset(rx,0x00,sizeof(rx));
+        rxlen = 0;
+        lastbit = 1;
+        bSkip = true;
+        tag_sof = reset_sof;
+        response = 0;
+        // Dbprintf("DEBUG: Waiting to receive frame");
+        uint32_t errorCount = 0;
 
-		// Receive frame, watch for at most T0*EOF periods
-		while (AT91C_BASE_TC1->TC_CV < T0*HITAG_T_WAIT_MAX) {
-			// Check if falling edge in tag modulation is detected
-			if(AT91C_BASE_TC1->TC_SR & AT91C_TC_LDRAS) {
-				// Retrieve the new timing values
-				int ra = (AT91C_BASE_TC1->TC_RA/T0);
+        // Receive frame, watch for at most T0*EOF periods
+        while (AT91C_BASE_TC1->TC_CV < T0*HITAG_T_WAIT_MAX) {
+            // Check if falling edge in tag modulation is detected
+            if(AT91C_BASE_TC1->TC_SR & AT91C_TC_LDRAS) {
+                // Retrieve the new timing values
+                int ra = (AT91C_BASE_TC1->TC_RA/T0);
 
-				// Reset timer every frame, we have to capture the last edge for timing
-				AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;
+                // Reset timer every frame, we have to capture the last edge for timing
+                AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;
 
-				LED_B_ON();
+                LED_B_ON();
 
-				// Capture tag frame (manchester decoding using only falling edges)
-				if(ra >= HITAG_T_EOF) {
-					if (rxlen != 0) {
-						//Dbprintf("DEBUG: Wierd1");
-					}
-					// Capture the T0 periods that have passed since last communication or field drop (reset)
-					// We always recieve a 'one' first, which has the falling edge after a half period |-_|
-					response = ra-HITAG_T_TAG_HALF_PERIOD;
-				} else if(ra >= HITAG_T_TAG_CAPTURE_FOUR_HALF) {
-					// Manchester coding example |-_|_-|-_| (101)
+                // Capture tag frame (manchester decoding using only falling edges)
+                if(ra >= HITAG_T_EOF) {
+                    if (rxlen != 0) {
+                        //Dbprintf("DEBUG: Wierd1");
+                    }
+                    // Capture the T0 periods that have passed since last communication or field drop (reset)
+                    // We always recieve a 'one' first, which has the falling edge after a half period |-_|
+                    response = ra-HITAG_T_TAG_HALF_PERIOD;
+                } else if(ra >= HITAG_T_TAG_CAPTURE_FOUR_HALF) {
+                    // Manchester coding example |-_|_-|-_| (101)
 
-					// need to test to verify we don't exceed memory...
-					// if ( ((rxlen+2) / 8) > HITAG_FRAME_LEN) {
-					//	break;
-					// }
-					rx[rxlen / 8] |= 0 << (7-(rxlen%8));
-					rxlen++;
-					rx[rxlen / 8] |= 1 << (7-(rxlen%8));
-					rxlen++;
-				} else if(ra >= HITAG_T_TAG_CAPTURE_THREE_HALF) {
-					// Manchester coding example |_-|...|_-|-_| (0...01)
+                    // need to test to verify we don't exceed memory...
+                    // if ( ((rxlen+2) / 8) > HITAG_FRAME_LEN) {
+                    //     break;
+                    // }
+                    rx[rxlen / 8] |= 0 << (7-(rxlen%8));
+                    rxlen++;
+                    rx[rxlen / 8] |= 1 << (7-(rxlen%8));
+                    rxlen++;
+                } else if(ra >= HITAG_T_TAG_CAPTURE_THREE_HALF) {
+                    // Manchester coding example |_-|...|_-|-_| (0...01)
 
-					// need to test to verify we don't exceed memory...
-					// if ( ((rxlen+2) / 8) > HITAG_FRAME_LEN) {
-					//	break;
-					// }
-					rx[rxlen / 8] |= 0 << (7-(rxlen%8));
-					rxlen++;
-					// We have to skip this half period at start and add the 'one' the second time
-					if (!bSkip) {
-						rx[rxlen / 8] |= 1 << (7-(rxlen%8));
-						rxlen++;
-					}
-					lastbit = !lastbit;
-					bSkip = !bSkip;
-				} else if(ra >= HITAG_T_TAG_CAPTURE_TWO_HALF) {
-					// Manchester coding example |_-|_-| (00) or |-_|-_| (11)
+                    // need to test to verify we don't exceed memory...
+                    // if ( ((rxlen+2) / 8) > HITAG_FRAME_LEN) {
+                    //     break;
+                    // }
+                    rx[rxlen / 8] |= 0 << (7-(rxlen%8));
+                    rxlen++;
+                    // We have to skip this half period at start and add the 'one' the second time
+                    if (!bSkip) {
+                        rx[rxlen / 8] |= 1 << (7-(rxlen%8));
+                        rxlen++;
+                    }
+                    lastbit = !lastbit;
+                    bSkip = !bSkip;
+                } else if(ra >= HITAG_T_TAG_CAPTURE_TWO_HALF) {
+                    // Manchester coding example |_-|_-| (00) or |-_|-_| (11)
 
-					// need to test to verify we don't exceed memory...
-					// if ( ((rxlen+2) / 8) > HITAG_FRAME_LEN) {
-					//	break;
-					// }
-					if (tag_sof) {
-						// Ignore bits that are transmitted during SOF
-						tag_sof--;
-					} else {
-						// bit is same as last bit
-						rx[rxlen / 8] |= lastbit << (7-(rxlen%8));
-						rxlen++;
-					}
-				} else {
-					// Dbprintf("DEBUG: Wierd2");
-					errorCount++;
-					// Ignore wierd value, is to small to mean anything
-				}
-			}
-			// if we saw over 100 wierd values break it probably isn't hitag...
-			if (errorCount >100) break;
-			// We can break this loop if we received the last bit from a frame
-			if (AT91C_BASE_TC1->TC_CV > T0*HITAG_T_EOF) {
-				if (rxlen>0) break;
-			}
-		}
+                    // need to test to verify we don't exceed memory...
+                    // if ( ((rxlen+2) / 8) > HITAG_FRAME_LEN) {
+                    //     break;
+                    // }
+                    if (tag_sof) {
+                        // Ignore bits that are transmitted during SOF
+                        tag_sof--;
+                    } else {
+                        // bit is same as last bit
+                        rx[rxlen / 8] |= lastbit << (7-(rxlen%8));
+                        rxlen++;
+                    }
+                } else {
+                    // Dbprintf("DEBUG: Wierd2");
+                    errorCount++;
+                    // Ignore wierd value, is to small to mean anything
+                }
+            }
+            // if we saw over 100 wierd values break it probably isn't hitag...
+            if (errorCount >100) break;
+            // We can break this loop if we received the last bit from a frame
+            if (AT91C_BASE_TC1->TC_CV > T0*HITAG_T_EOF) {
+                if (rxlen>0) break;
+            }
+        }
 
-		// Wait some extra time for flash to be programmed
-		if ((rxlen == 0) && (writestate == WRITE_STATE_PROG))
-		{
-			AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;
-			while(AT91C_BASE_TC0->TC_CV < T0*(HITAG_T_PROG - HITAG_T_WAIT_MAX));
-		}
-	}
-	// Dbprintf("DEBUG: Done waiting for frame");
+        // Wait some extra time for flash to be programmed
+        if ((rxlen == 0) && (writestate == WRITE_STATE_PROG))
+        {
+            AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;
+            while(AT91C_BASE_TC0->TC_CV < T0*(HITAG_T_PROG - HITAG_T_WAIT_MAX));
+        }
+    }
+    // Dbprintf("DEBUG: Done waiting for frame");
 
-	LED_B_OFF();
-	LED_D_OFF();
-	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
-	AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	// Dbprintf("frame received: %d",frame_count);
-	// DbpString("All done");
-	cmd_send(CMD_ACK,bSuccessful,0,0,(uint8_t*)tag.sectors,48);
+    LED_B_OFF();
+    LED_D_OFF();
+    AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
+    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    // Dbprintf("frame received: %d",frame_count);
+    // DbpString("All done");
+    cmd_send(CMD_ACK,bSuccessful,0,0,(uint8_t*)tag.sectors,48);
 }
diff --git a/armsrc/hitagS.c b/armsrc/hitagS.c
index 489cf9f7e..544dbf086 100644
--- a/armsrc/hitagS.c
+++ b/armsrc/hitagS.c
@@ -22,17 +22,17 @@
 #define CRC_PRESET 0xFF
 #define CRC_POLYNOM 0x1D
 
-#define u8				uint8_t
-#define u32				uint32_t
-#define u64				uint64_t
-#define rev8(x)			((((x)>>7)&1)+((((x)>>6)&1)<<1)+((((x)>>5)&1)<<2)+((((x)>>4)&1)<<3)+((((x)>>3)&1)<<4)+((((x)>>2)&1)<<5)+((((x)>>1)&1)<<6)+(((x)&1)<<7))
-#define rev16(x)		(rev8 (x)+(rev8 (x>> 8)<< 8))
-#define rev32(x)		(rev16(x)+(rev16(x>>16)<<16))
-#define rev64(x)		(rev32(x)+(rev32(x>>32)<<32))
-#define bit(x,n)		(((x)>>(n))&1)
-#define bit32(x,n)		((((x)[(n)>>5])>>((n)))&1)
-#define inv32(x,i,n)	((x)[(i)>>5]^=((u32)(n))<<((i)&31))
-#define rotl64(x, n)	((((u64)(x))<<((n)&63))+(((u64)(x))>>((0-(n))&63)))
+#define u8              uint8_t
+#define u32             uint32_t
+#define u64             uint64_t
+#define rev8(x)         ((((x)>>7)&1)+((((x)>>6)&1)<<1)+((((x)>>5)&1)<<2)+((((x)>>4)&1)<<3)+((((x)>>3)&1)<<4)+((((x)>>2)&1)<<5)+((((x)>>1)&1)<<6)+(((x)&1)<<7))
+#define rev16(x)        (rev8 (x)+(rev8 (x>> 8)<< 8))
+#define rev32(x)        (rev16(x)+(rev16(x>>16)<<16))
+#define rev64(x)        (rev32(x)+(rev32(x>>32)<<32))
+#define bit(x,n)        (((x)>>(n))&1)
+#define bit32(x,n)      ((((x)[(n)>>5])>>((n)))&1)
+#define inv32(x,i,n)    ((x)[(i)>>5]^=((u32)(n))<<((i)&31))
+#define rotl64(x, n)    ((((u64)(x))<<((n)&63))+(((u64)(x))>>((0-(n))&63)))
 
 static bool bQuiet;
 static bool bSuccessful;
@@ -40,103 +40,103 @@ static struct hitagS_tag tag;
 static byte_t page_to_be_written = 0;
 static int block_data_left = 0;
 typedef enum modulation {
-	AC2K = 0,
-	AC4K,
-	MC4K,
-	MC8K
+    AC2K = 0,
+    AC4K,
+    MC4K,
+    MC8K
 } MOD;
-static MOD m = AC2K;			//used modulation
+static MOD m = AC2K;               //used modulation
 static uint32_t temp_uid;
 static int temp2 = 0;
-static int sof_bits;			//number of start-of-frame bits
-static byte_t pwdh0, pwdl0, pwdl1;	//password bytes
-static uint32_t rnd = 0x74124485;	//randomnumber
+static int sof_bits;               //number of start-of-frame bits
+static byte_t pwdh0, pwdl0, pwdl1; //password bytes
+static uint32_t rnd = 0x74124485;  //randomnumber
 static int test = 0;
 size_t blocknr;
 bool end=false;
 
 // Single bit Hitag2 functions:
-#define i4(x,a,b,c,d)	((u32)((((x)>>(a))&1)+(((x)>>(b))&1)*2+(((x)>>(c))&1)*4+(((x)>>(d))&1)*8))
-static const u32 ht2_f4a = 0x2C79;			// 0010 1100 0111 1001
-static const u32 ht2_f4b = 0x6671;			// 0110 0110 0111 0001
-static const u32 ht2_f5c = 0x7907287B;			// 0111 1001 0000 0111 0010 1000 0111 1011
-#define ht2bs_4a(a,b,c,d)	(~(((a|b)&c)^(a|d)^b))
-#define ht2bs_4b(a,b,c,d)	(~(((d|c)&(a^b))^(d|a|b)))
-#define ht2bs_5c(a,b,c,d,e)	(~((((((c^e)|d)&a)^b)&(c^b))^(((d^e)|a)&((d^b)|c))))
-#define uf20bs				u32
+#define i4(x,a,b,c,d)       ((u32)((((x)>>(a))&1)+(((x)>>(b))&1)*2+(((x)>>(c))&1)*4+(((x)>>(d))&1)*8))
+static const u32 ht2_f4a = 0x2C79;            // 0010 1100 0111 1001
+static const u32 ht2_f4b = 0x6671;            // 0110 0110 0111 0001
+static const u32 ht2_f5c = 0x7907287B;        // 0111 1001 0000 0111 0010 1000 0111 1011
+#define ht2bs_4a(a,b,c,d)   (~(((a|b)&c)^(a|d)^b))
+#define ht2bs_4b(a,b,c,d)   (~(((d|c)&(a^b))^(d|a|b)))
+#define ht2bs_5c(a,b,c,d,e) (~((((((c^e)|d)&a)^b)&(c^b))^(((d^e)|a)&((d^b)|c))))
+#define uf20bs              u32
 
 static u32 f20(const u64 x) {
-	u32 i5;
+    u32 i5;
 
-	i5 = ((ht2_f4a >> i4(x, 1, 2, 4, 5)) & 1) * 1
-			+ ((ht2_f4b >> i4(x, 7, 11, 13, 14)) & 1) * 2
-			+ ((ht2_f4b >> i4(x, 16, 20, 22, 25)) & 1) * 4
-			+ ((ht2_f4b >> i4(x, 27, 28, 30, 32)) & 1) * 8
-			+ ((ht2_f4a >> i4(x, 33, 42, 43, 45)) & 1) * 16;
+    i5 = ((ht2_f4a >> i4(x, 1, 2, 4, 5)) & 1) * 1
+            + ((ht2_f4b >> i4(x, 7, 11, 13, 14)) & 1) * 2
+            + ((ht2_f4b >> i4(x, 16, 20, 22, 25)) & 1) * 4
+            + ((ht2_f4b >> i4(x, 27, 28, 30, 32)) & 1) * 8
+            + ((ht2_f4a >> i4(x, 33, 42, 43, 45)) & 1) * 16;
 
-	return (ht2_f5c >> i5) & 1;
+    return (ht2_f5c >> i5) & 1;
 }
 static u64 hitag2_round(u64 *state) {
-	u64 x = *state;
+    u64 x = *state;
 
-	x = (x >> 1)
-			+ ((((x >> 0) ^ (x >> 2) ^ (x >> 3) ^ (x >> 6) ^ (x >> 7) ^ (x >> 8)
-					^ (x >> 16) ^ (x >> 22) ^ (x >> 23) ^ (x >> 26) ^ (x >> 30)
-					^ (x >> 41) ^ (x >> 42) ^ (x >> 43) ^ (x >> 46) ^ (x >> 47))
-					& 1) << 47);
+    x = (x >> 1)
+            + ((((x >> 0) ^ (x >> 2) ^ (x >> 3) ^ (x >> 6) ^ (x >> 7) ^ (x >> 8)
+                    ^ (x >> 16) ^ (x >> 22) ^ (x >> 23) ^ (x >> 26) ^ (x >> 30)
+                    ^ (x >> 41) ^ (x >> 42) ^ (x >> 43) ^ (x >> 46) ^ (x >> 47))
+                    & 1) << 47);
 
-	*state = x;
-	return f20(x);
+    *state = x;
+    return f20(x);
 }
 static u64 hitag2_init(const u64 key, const u32 serial, const u32 IV) {
-	u32 i;
-	u64 x = ((key & 0xFFFF) << 32) + serial;
-	for (i = 0; i < 32; i++) {
-		x >>= 1;
-		x += (u64) (f20(x) ^ (((IV >> i) ^ (key >> (i + 16))) & 1)) << 47;
-	}
-	return x;
+    u32 i;
+    u64 x = ((key & 0xFFFF) << 32) + serial;
+    for (i = 0; i < 32; i++) {
+        x >>= 1;
+        x += (u64) (f20(x) ^ (((IV >> i) ^ (key >> (i + 16))) & 1)) << 47;
+    }
+    return x;
 }
 static u32 hitag2_byte(u64 *x) {
-	u32 i, c;
+    u32 i, c;
 
-	for (i = 0, c = 0; i < 8; i++)
-		c += (u32) hitag2_round(x) << (i ^ 7);
-	return c;
+    for (i = 0, c = 0; i < 8; i++)
+        c += (u32) hitag2_round(x) << (i ^ 7);
+    return c;
 }
 
 // Sam7s has several timers, we will use the source TIMER_CLOCK1 (aka AT91C_TC_CLKS_TIMER_DIV1_CLOCK)
 // TIMER_CLOCK1 = MCK/2, MCK is running at 48 MHz, Timer is running at 48/2 = 24 MHz
 // Hitag units (T0) have duration of 8 microseconds (us), which is 1/125000 per second (carrier)
 // T0 = TIMER_CLOCK1 / 125000 = 192
-#define T0 							192
+#define T0                             192
 
-#define SHORT_COIL()						LOW(GPIO_SSC_DOUT)
-#define OPEN_COIL()							HIGH(GPIO_SSC_DOUT)
+#define SHORT_COIL()                   LOW(GPIO_SSC_DOUT)
+#define OPEN_COIL()                    HIGH(GPIO_SSC_DOUT)
 
-#define HITAG_FRAME_LEN 					20
-#define HITAG_T_STOP  						36  /* T_EOF should be > 36 */
-#define HITAG_T_LOW							8   /* T_LOW should be 4..10 */
-#define HITAG_T_0_MIN 						15  /* T[0] should be 18..22 */
-#define HITAG_T_1_MIN 						25  /* T[1] should be 26..30 */
+#define HITAG_FRAME_LEN                20
+#define HITAG_T_STOP                   36  /* T_EOF should be > 36 */
+#define HITAG_T_LOW                    8   /* T_LOW should be 4..10 */
+#define HITAG_T_0_MIN                  15  /* T[0] should be 18..22 */
+#define HITAG_T_1_MIN                  25  /* T[1] should be 26..30 */
 //#define HITAG_T_EOF   40 /* T_EOF should be > 36 */
-#define HITAG_T_EOF   						80   /* T_EOF should be > 36 */
-#define HITAG_T_WAIT_1 						200  /* T_wresp should be 199..206 */
-#define HITAG_T_WAIT_2 						90   /* T_wresp should be 199..206 */
-#define HITAG_T_WAIT_MAX 					300  /* bit more than HITAG_T_WAIT_1 + HITAG_T_WAIT_2 */
+#define HITAG_T_EOF                    80   /* T_EOF should be > 36 */
+#define HITAG_T_WAIT_1                 200  /* T_wresp should be 199..206 */
+#define HITAG_T_WAIT_2                 90   /* T_wresp should be 199..206 */
+#define HITAG_T_WAIT_MAX               300  /* bit more than HITAG_T_WAIT_1 + HITAG_T_WAIT_2 */
 
-#define HITAG_T_TAG_ONE_HALF_PERIOD				10
-#define HITAG_T_TAG_TWO_HALF_PERIOD				25
-#define HITAG_T_TAG_THREE_HALF_PERIOD			41
-#define HITAG_T_TAG_FOUR_HALF_PERIOD    		57
+#define HITAG_T_TAG_ONE_HALF_PERIOD    10
+#define HITAG_T_TAG_TWO_HALF_PERIOD    25
+#define HITAG_T_TAG_THREE_HALF_PERIOD  41
+#define HITAG_T_TAG_FOUR_HALF_PERIOD   57
 
-#define HITAG_T_TAG_HALF_PERIOD					16
-#define HITAG_T_TAG_FULL_PERIOD					32
+#define HITAG_T_TAG_HALF_PERIOD        16
+#define HITAG_T_TAG_FULL_PERIOD        32
 
-#define HITAG_T_TAG_CAPTURE_ONE_HALF			13
-#define HITAG_T_TAG_CAPTURE_TWO_HALF			25
-#define HITAG_T_TAG_CAPTURE_THREE_HALF			41
-#define HITAG_T_TAG_CAPTURE_FOUR_HALF   		57
+#define HITAG_T_TAG_CAPTURE_ONE_HALF   13
+#define HITAG_T_TAG_CAPTURE_TWO_HALF   25
+#define HITAG_T_TAG_CAPTURE_THREE_HALF 41
+#define HITAG_T_TAG_CAPTURE_FOUR_HALF  57
 
 #define DEBUG 0
 
@@ -145,793 +145,793 @@ static u32 hitag2_byte(u64 *x) {
  * from http://www.proxmark.org/files/Documents/125%20kHz%20-%20Hitag/HitagS.V11.pdf
  */
 void calc_crc(unsigned char * crc, unsigned char data, unsigned char Bitcount) {
-	*crc ^= data; // crc = crc (exor) data
-	do {
-		if (*crc & 0x80) // if (MSB-CRC == 1)
-				{
-			*crc <<= 1; // CRC = CRC Bit-shift left
-			*crc ^= CRC_POLYNOM; // CRC = CRC (exor) CRC_POLYNOM
-		} else {
-			*crc <<= 1; // CRC = CRC Bit-shift left
-		}
-	} while (--Bitcount);
+    *crc ^= data; // crc = crc (exor) data
+    do {
+        if (*crc & 0x80) // if (MSB-CRC == 1)
+                {
+            *crc <<= 1; // CRC = CRC Bit-shift left
+            *crc ^= CRC_POLYNOM; // CRC = CRC (exor) CRC_POLYNOM
+        } else {
+            *crc <<= 1; // CRC = CRC Bit-shift left
+        }
+    } while (--Bitcount);
 }
 
 static void hitag_send_bit(int bit) {
-	LED_A_ON();
-	// Reset clock for the next bit
-	AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;
+    LED_A_ON();
+    // Reset clock for the next bit
+    AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;
 
-	switch (m) {
-	case AC2K:
-		if (bit == 0) {
-			// AC Coding --__
-			HIGH(GPIO_SSC_DOUT);
-			while (AT91C_BASE_TC0->TC_CV < T0 * 32) {};
+    switch (m) {
+    case AC2K:
+        if (bit == 0) {
+            // AC Coding --__
+            HIGH(GPIO_SSC_DOUT);
+            while (AT91C_BASE_TC0->TC_CV < T0 * 32) {};
 
-			LOW(GPIO_SSC_DOUT);
-			while (AT91C_BASE_TC0->TC_CV < T0 * 64)	{};
+            LOW(GPIO_SSC_DOUT);
+            while (AT91C_BASE_TC0->TC_CV < T0 * 64)  {};
 
-		} else {
-			// AC coding -_-_
-			HIGH(GPIO_SSC_DOUT);
-			while (AT91C_BASE_TC0->TC_CV < T0 * 16) {};
+        } else {
+            // AC coding -_-_
+            HIGH(GPIO_SSC_DOUT);
+            while (AT91C_BASE_TC0->TC_CV < T0 * 16) {};
 
-			LOW(GPIO_SSC_DOUT);
-			while (AT91C_BASE_TC0->TC_CV < T0 * 32) {};
+            LOW(GPIO_SSC_DOUT);
+            while (AT91C_BASE_TC0->TC_CV < T0 * 32) {};
 
-			HIGH(GPIO_SSC_DOUT);
-			while (AT91C_BASE_TC0->TC_CV < T0 * 48) {};
+            HIGH(GPIO_SSC_DOUT);
+            while (AT91C_BASE_TC0->TC_CV < T0 * 48) {};
 
-			LOW(GPIO_SSC_DOUT);
-			while (AT91C_BASE_TC0->TC_CV < T0 * 64) {};
+            LOW(GPIO_SSC_DOUT);
+            while (AT91C_BASE_TC0->TC_CV < T0 * 64) {};
 
-		}
-		LED_A_OFF();
-		break;
-	case AC4K:
-		if (bit == 0) {
-			// AC Coding --__
-			HIGH(GPIO_SSC_DOUT);
-			while (AT91C_BASE_TC0->TC_CV < T0 * HITAG_T_TAG_HALF_PERIOD) {};
+        }
+        LED_A_OFF();
+        break;
+    case AC4K:
+        if (bit == 0) {
+            // AC Coding --__
+            HIGH(GPIO_SSC_DOUT);
+            while (AT91C_BASE_TC0->TC_CV < T0 * HITAG_T_TAG_HALF_PERIOD) {};
 
-			LOW(GPIO_SSC_DOUT);
-			while (AT91C_BASE_TC0->TC_CV < T0 * HITAG_T_TAG_FULL_PERIOD) {};
+            LOW(GPIO_SSC_DOUT);
+            while (AT91C_BASE_TC0->TC_CV < T0 * HITAG_T_TAG_FULL_PERIOD) {};
 
-		} else {
-			// AC coding -_-_
-			HIGH(GPIO_SSC_DOUT);
-			while (AT91C_BASE_TC0->TC_CV < T0 * 8) {};
+        } else {
+            // AC coding -_-_
+            HIGH(GPIO_SSC_DOUT);
+            while (AT91C_BASE_TC0->TC_CV < T0 * 8) {};
 
-			LOW(GPIO_SSC_DOUT);
-			while (AT91C_BASE_TC0->TC_CV < T0 * 16) {};
+            LOW(GPIO_SSC_DOUT);
+            while (AT91C_BASE_TC0->TC_CV < T0 * 16) {};
 
-			HIGH(GPIO_SSC_DOUT);
-			while (AT91C_BASE_TC0->TC_CV < T0 * 24) {};
+            HIGH(GPIO_SSC_DOUT);
+            while (AT91C_BASE_TC0->TC_CV < T0 * 24) {};
 
-			LOW(GPIO_SSC_DOUT);
-			while (AT91C_BASE_TC0->TC_CV < T0 * 32) {};
-		}
-		LED_A_OFF();
-		break;
-	case MC4K:
-		if (bit == 0) {
-			// Manchester: Unloaded, then loaded |__--|
-			LOW(GPIO_SSC_DOUT);
-			while (AT91C_BASE_TC0->TC_CV < T0 * 16) {};
+            LOW(GPIO_SSC_DOUT);
+            while (AT91C_BASE_TC0->TC_CV < T0 * 32) {};
+        }
+        LED_A_OFF();
+        break;
+    case MC4K:
+        if (bit == 0) {
+            // Manchester: Unloaded, then loaded |__--|
+            LOW(GPIO_SSC_DOUT);
+            while (AT91C_BASE_TC0->TC_CV < T0 * 16) {};
 
-			HIGH(GPIO_SSC_DOUT);
-			while (AT91C_BASE_TC0->TC_CV < T0 * 32) {};
+            HIGH(GPIO_SSC_DOUT);
+            while (AT91C_BASE_TC0->TC_CV < T0 * 32) {};
 
-		} else {
-			// Manchester: Loaded, then unloaded |--__|
-			HIGH(GPIO_SSC_DOUT);
-			while (AT91C_BASE_TC0->TC_CV < T0 * 16) {};
+        } else {
+            // Manchester: Loaded, then unloaded |--__|
+            HIGH(GPIO_SSC_DOUT);
+            while (AT91C_BASE_TC0->TC_CV < T0 * 16) {};
 
-			LOW(GPIO_SSC_DOUT);
-			while (AT91C_BASE_TC0->TC_CV < T0 * 32) {};
+            LOW(GPIO_SSC_DOUT);
+            while (AT91C_BASE_TC0->TC_CV < T0 * 32) {};
 
-		}
-		LED_A_OFF();
-		break;
-	case MC8K:
-		if (bit == 0) {
-			// Manchester: Unloaded, then loaded |__--|
-			LOW(GPIO_SSC_DOUT);
-			while (AT91C_BASE_TC0->TC_CV < T0 * 8) {};
+        }
+        LED_A_OFF();
+        break;
+    case MC8K:
+        if (bit == 0) {
+            // Manchester: Unloaded, then loaded |__--|
+            LOW(GPIO_SSC_DOUT);
+            while (AT91C_BASE_TC0->TC_CV < T0 * 8) {};
 
-			HIGH(GPIO_SSC_DOUT);
-			while (AT91C_BASE_TC0->TC_CV < T0 * 16) {};
+            HIGH(GPIO_SSC_DOUT);
+            while (AT91C_BASE_TC0->TC_CV < T0 * 16) {};
 
-		} else {
-			// Manchester: Loaded, then unloaded |--__|
-			HIGH(GPIO_SSC_DOUT);
-			while (AT91C_BASE_TC0->TC_CV < T0 * 8) {};
+        } else {
+            // Manchester: Loaded, then unloaded |--__|
+            HIGH(GPIO_SSC_DOUT);
+            while (AT91C_BASE_TC0->TC_CV < T0 * 8) {};
 
-			LOW(GPIO_SSC_DOUT);
-			while (AT91C_BASE_TC0->TC_CV < T0 * 16) {};
+            LOW(GPIO_SSC_DOUT);
+            while (AT91C_BASE_TC0->TC_CV < T0 * 16) {};
 
-		}
-		LED_A_OFF();
-		break;
-	default:
-		break;
-	}
+        }
+        LED_A_OFF();
+        break;
+    default:
+        break;
+    }
 }
 
 static void hitag_send_frame(const byte_t* frame, size_t frame_len) {
 // Send start of frame
 
-	for (size_t i = 0; i < sof_bits; i++) {
-		hitag_send_bit(1);
-	}
+    for (size_t i = 0; i < sof_bits; i++) {
+        hitag_send_bit(1);
+    }
 
 // Send the content of the frame
-	for (size_t i = 0; i < frame_len; i++) {
-		hitag_send_bit((frame[i / 8] >> (7 - (i % 8))) & 1);
-	}
+    for (size_t i = 0; i < frame_len; i++) {
+        hitag_send_bit((frame[i / 8] >> (7 - (i % 8))) & 1);
+    }
 // Drop the modulation
-	LOW(GPIO_SSC_DOUT);
+    LOW(GPIO_SSC_DOUT);
 }
 
 static void hitag_reader_send_bit(int bit) {
 //Dbprintf("BIT: %d",bit);
-	LED_A_ON();
+    LED_A_ON();
 // Reset clock for the next bit
-	AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;
+    AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;
 
 // Binary puls length modulation (BPLM) is used to encode the data stream
 // This means that a transmission of a one takes longer than that of a zero
 
 // Enable modulation, which means, drop the the field
-	HIGH(GPIO_SSC_DOUT);
-	if (test == 1) {
-		// Wait for 4-10 times the carrier period
-		while (AT91C_BASE_TC0->TC_CV < T0 * 6) {};
+    HIGH(GPIO_SSC_DOUT);
+    if (test == 1) {
+        // Wait for 4-10 times the carrier period
+        while (AT91C_BASE_TC0->TC_CV < T0 * 6) {};
 
-		//	SpinDelayUs(8*8);
+        // SpinDelayUs(8*8);
 
-		// Disable modulation, just activates the field again
-		LOW(GPIO_SSC_DOUT);
+        // Disable modulation, just activates the field again
+        LOW(GPIO_SSC_DOUT);
 
-		if (bit == 0) {
-			// Zero bit: |_-|
-			while (AT91C_BASE_TC0->TC_CV < T0 * 11) {};
+        if (bit == 0) {
+            // Zero bit: |_-|
+            while (AT91C_BASE_TC0->TC_CV < T0 * 11) {};
 
-			//		SpinDelayUs(16*8);
-		} else {
-			// One bit: |_--|
-			while (AT91C_BASE_TC0->TC_CV < T0 * 14) {};
+            // SpinDelayUs(16*8);
+        } else {
+            // One bit: |_--|
+            while (AT91C_BASE_TC0->TC_CV < T0 * 14) {};
 
-			//		SpinDelayUs(22*8);
-		}
-	} else {
-		// Wait for 4-10 times the carrier period
-		while (AT91C_BASE_TC0->TC_CV < T0 * 6) {};
+            // SpinDelayUs(22*8);
+        }
+    } else {
+        // Wait for 4-10 times the carrier period
+        while (AT91C_BASE_TC0->TC_CV < T0 * 6) {};
 
-		//	SpinDelayUs(8*8);
+        // SpinDelayUs(8*8);
 
-		// Disable modulation, just activates the field again
-		LOW(GPIO_SSC_DOUT);
+        // Disable modulation, just activates the field again
+        LOW(GPIO_SSC_DOUT);
 
-		if (bit == 0) {
-			// Zero bit: |_-|
-			while (AT91C_BASE_TC0->TC_CV < T0 * 22) {};
+        if (bit == 0) {
+            // Zero bit: |_-|
+            while (AT91C_BASE_TC0->TC_CV < T0 * 22) {};
 
-			//		SpinDelayUs(16*8);
-		} else {
-			// One bit: |_--|
-			while (AT91C_BASE_TC0->TC_CV < T0 * 28) {};
+            // SpinDelayUs(16*8);
+        } else {
+            // One bit: |_--|
+            while (AT91C_BASE_TC0->TC_CV < T0 * 28) {};
 
-			//		SpinDelayUs(22*8);
-		}
-	}
+            // SpinDelayUs(22*8);
+        }
+    }
 
-	LED_A_OFF();
+    LED_A_OFF();
 }
 
 static void hitag_reader_send_frame(const byte_t* frame, size_t frame_len) {
 // Send the content of the frame
-	for (size_t i = 0; i < frame_len; i++) {
-		if (frame[0] == 0xf8) {
-			//Dbprintf("BIT: %d",(frame[i / 8] >> (7 - (i % 8))) & 1);
-		}
-		hitag_reader_send_bit((frame[i / 8] >> (7 - (i % 8))) & 1);
-	}
+    for (size_t i = 0; i < frame_len; i++) {
+        if (frame[0] == 0xf8) {
+            //Dbprintf("BIT: %d",(frame[i / 8] >> (7 - (i % 8))) & 1);
+        }
+        hitag_reader_send_bit((frame[i / 8] >> (7 - (i % 8))) & 1);
+    }
 // Send EOF
-	AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;
+    AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;
 // Enable modulation, which means, drop the the field
-	HIGH(GPIO_SSC_DOUT);
+    HIGH(GPIO_SSC_DOUT);
 // Wait for 4-10 times the carrier period
-	while (AT91C_BASE_TC0->TC_CV < T0 * 6) {};
+    while (AT91C_BASE_TC0->TC_CV < T0 * 6) {};
 
 // Disable modulation, just activates the field again
-	LOW(GPIO_SSC_DOUT);
+    LOW(GPIO_SSC_DOUT);
 }
 
 /*
  * to check if the right uid was selected
  */
 static int check_select(byte_t* rx, uint32_t uid) {
-	unsigned char resp[48];
-	int i;
-	uint32_t ans = 0x0;
-	for (i = 0; i < 48; i++)
-		resp[i] = (rx[i / 8] >> (7 - (i % 8))) & 0x1;
-	for (i = 0; i < 32; i++)
-		ans += resp[5 + i] << (31 - i);
-	/*if (rx[0] == 0x01 && rx[1] == 0x15 && rx[2] == 0xc1 && rx[3] == 0x14
-	 && rx[4] == 0x65 && rx[5] == 0x38)
-	 Dbprintf("got uid %X", ans);*/
-	temp_uid = ans;
-	if (ans == tag.uid)
-		return 1;
-	return 0;
+    unsigned char resp[48];
+    int i;
+    uint32_t ans = 0x0;
+    for (i = 0; i < 48; i++)
+        resp[i] = (rx[i / 8] >> (7 - (i % 8))) & 0x1;
+    for (i = 0; i < 32; i++)
+        ans += resp[5 + i] << (31 - i);
+    /*if (rx[0] == 0x01 && rx[1] == 0x15 && rx[2] == 0xc1 && rx[3] == 0x14
+     && rx[4] == 0x65 && rx[5] == 0x38)
+     Dbprintf("got uid %X", ans);*/
+    temp_uid = ans;
+    if (ans == tag.uid)
+        return 1;
+    return 0;
 }
 
 /*
  * handles all commands from a reader
  */
 static void hitagS_handle_reader_command(byte_t* rx, const size_t rxlen,
-		byte_t* tx, size_t* txlen) {
-	byte_t rx_air[HITAG_FRAME_LEN];
-	byte_t page;
-	int i;
-	u64 state;
-	unsigned char crc;
+        byte_t* tx, size_t* txlen) {
+    byte_t rx_air[HITAG_FRAME_LEN];
+    byte_t page;
+    int i;
+    u64 state;
+    unsigned char crc;
 
 // Copy the (original) received frame how it is send over the air
-	memcpy(rx_air, rx, nbytes(rxlen));
+    memcpy(rx_air, rx, nbytes(rxlen));
 // Reset the transmission frame length
-	*txlen = 0;
+    *txlen = 0;
 // Try to find out which command was send by selecting on length (in bits)
-	switch (rxlen) {
-	case 5: {
-		//UID request with a selected response protocol mode
-		tag.pstate = HT_READY;
-		tag.tstate = HT_NO_OP;
-		if ((rx[0] & 0xf0) == 0x30) {
-			tag.mode = HT_STANDARD;
-			sof_bits = 1;
-			m = AC2K;
-		}
-		if ((rx[0] & 0xf0) == 0xc0) {
-			tag.mode = HT_ADVANCED;
-			sof_bits = 3;
-			m = AC2K;
-		}
+    switch (rxlen) {
+    case 5: {
+        //UID request with a selected response protocol mode
+        tag.pstate = HT_READY;
+        tag.tstate = HT_NO_OP;
+        if ((rx[0] & 0xf0) == 0x30) {
+            tag.mode = HT_STANDARD;
+            sof_bits = 1;
+            m = AC2K;
+        }
+        if ((rx[0] & 0xf0) == 0xc0) {
+            tag.mode = HT_ADVANCED;
+            sof_bits = 3;
+            m = AC2K;
+        }
 
-		if ((rx[0] & 0xf0) == 0xd0) {
-			tag.mode = HT_FAST_ADVANCED;
-			sof_bits = 3;
-			m = AC4K;
-		}
-		//send uid as a response
-		*txlen = 32;
-		for (i = 0; i < 4; i++)
-			tx[i] = (tag.uid >> (24 - (i * 8))) & 0xff;
-	}
-		break;
-	case 45: {
-		//select command from reader received
-		if (check_select(rx, tag.uid) == 1) {
-			//if the right tag was selected
-			*txlen = 32;
-			switch (tag.mode) {
-			case HT_STANDARD:
-				sof_bits = 1;
-				m = MC4K;
-				break;
-			case HT_ADVANCED:
-				sof_bits = 6;
-				m = MC4K;
-				break;
-			case HT_FAST_ADVANCED:
-				sof_bits = 6;
-				m = MC8K;
-				break;
-			default:
-				break;
-			}
+        if ((rx[0] & 0xf0) == 0xd0) {
+            tag.mode = HT_FAST_ADVANCED;
+            sof_bits = 3;
+            m = AC4K;
+        }
+        //send uid as a response
+        *txlen = 32;
+        for (i = 0; i < 4; i++)
+            tx[i] = (tag.uid >> (24 - (i * 8))) & 0xff;
+    }
+        break;
+    case 45: {
+        //select command from reader received
+        if (check_select(rx, tag.uid) == 1) {
+            //if the right tag was selected
+            *txlen = 32;
+            switch (tag.mode) {
+            case HT_STANDARD:
+                sof_bits = 1;
+                m = MC4K;
+                break;
+            case HT_ADVANCED:
+                sof_bits = 6;
+                m = MC4K;
+                break;
+            case HT_FAST_ADVANCED:
+                sof_bits = 6;
+                m = MC8K;
+                break;
+            default:
+                break;
+            }
 
-			//send configuration
-			for (i = 0; i < 4; i++)
-				tx[i] = (tag.pages[0][1] >> (i * 8)) & 0xff;
-			tx[3] = 0xff;
-			if (tag.mode != HT_STANDARD) {
-				*txlen = 40;
-				crc = CRC_PRESET;
-				for (i = 0; i < 4; i++)
-					calc_crc(&crc, tx[i], 8);
-				tx[4] = crc;
-			}
-		}
-	}
-		break;
-	case 64: {
-		//challenge message received
-		Dbprintf("Challenge for UID: %X", temp_uid);
-		temp2++;
-		*txlen = 32;
-		state = hitag2_init(rev64(tag.key), rev32(tag.pages[0][0]),
-				rev32(((rx[3] << 24) + (rx[2] << 16) + (rx[1] << 8) + rx[0])));
-		Dbprintf(
-				",{0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X}",
-				rx[0], rx[1], rx[2], rx[3], rx[4], rx[5], rx[6], rx[7]);
-		switch (tag.mode) {
-		case HT_STANDARD:
-			sof_bits = 1;
-			m = MC4K;
-			break;
-		case HT_ADVANCED:
-			sof_bits = 6;
-			m = MC4K;
-			break;
-		case HT_FAST_ADVANCED:
-			sof_bits = 6;
-			m = MC8K;
-			break;
-		default:
-			break;
-		}
+            //send configuration
+            for (i = 0; i < 4; i++)
+                tx[i] = (tag.pages[0][1] >> (i * 8)) & 0xff;
+            tx[3] = 0xff;
+            if (tag.mode != HT_STANDARD) {
+                *txlen = 40;
+                crc = CRC_PRESET;
+                for (i = 0; i < 4; i++)
+                    calc_crc(&crc, tx[i], 8);
+                tx[4] = crc;
+            }
+        }
+    }
+        break;
+    case 64: {
+        //challenge message received
+        Dbprintf("Challenge for UID: %X", temp_uid);
+        temp2++;
+        *txlen = 32;
+        state = hitag2_init(rev64(tag.key), rev32(tag.pages[0][0]),
+                rev32(((rx[3] << 24) + (rx[2] << 16) + (rx[1] << 8) + rx[0])));
+        Dbprintf(
+                ",{0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X}",
+                rx[0], rx[1], rx[2], rx[3], rx[4], rx[5], rx[6], rx[7]);
+        switch (tag.mode) {
+        case HT_STANDARD:
+            sof_bits = 1;
+            m = MC4K;
+            break;
+        case HT_ADVANCED:
+            sof_bits = 6;
+            m = MC4K;
+            break;
+        case HT_FAST_ADVANCED:
+            sof_bits = 6;
+            m = MC8K;
+            break;
+        default:
+            break;
+        }
 
-		for (i = 0; i < 4; i++)
-			hitag2_byte(&state);
-		//send con2,pwdh0,pwdl0,pwdl1 encrypted as a response
-		tx[0] = hitag2_byte(&state) ^ ((tag.pages[0][1] >> 16) & 0xff);
-		tx[1] = hitag2_byte(&state) ^ tag.pwdh0;
-		tx[2] = hitag2_byte(&state) ^ tag.pwdl0;
-		tx[3] = hitag2_byte(&state) ^ tag.pwdl1;
-		if (tag.mode != HT_STANDARD) {
-			//add crc8
-			*txlen = 40;
-			crc = CRC_PRESET;
-			calc_crc(&crc, ((tag.pages[0][1] >> 16) & 0xff), 8);
-			calc_crc(&crc, tag.pwdh0, 8);
-			calc_crc(&crc, tag.pwdl0, 8);
-			calc_crc(&crc, tag.pwdl1, 8);
-			tx[4] = (crc ^ hitag2_byte(&state));
-		}
-		/*
-		 * some readers do not allow to authenticate multiple times in a row with the same tag.
-		 * use this to change the uid between authentications.
-		 */
+        for (i = 0; i < 4; i++)
+            hitag2_byte(&state);
+        //send con2,pwdh0,pwdl0,pwdl1 encrypted as a response
+        tx[0] = hitag2_byte(&state) ^ ((tag.pages[0][1] >> 16) & 0xff);
+        tx[1] = hitag2_byte(&state) ^ tag.pwdh0;
+        tx[2] = hitag2_byte(&state) ^ tag.pwdl0;
+        tx[3] = hitag2_byte(&state) ^ tag.pwdl1;
+        if (tag.mode != HT_STANDARD) {
+            //add crc8
+            *txlen = 40;
+            crc = CRC_PRESET;
+            calc_crc(&crc, ((tag.pages[0][1] >> 16) & 0xff), 8);
+            calc_crc(&crc, tag.pwdh0, 8);
+            calc_crc(&crc, tag.pwdl0, 8);
+            calc_crc(&crc, tag.pwdl1, 8);
+            tx[4] = (crc ^ hitag2_byte(&state));
+        }
+        /*
+         * some readers do not allow to authenticate multiple times in a row with the same tag.
+         * use this to change the uid between authentications.
+         */
 
-		/*
-		 if (temp2 % 2 == 0) {
-		 tag.uid = 0x11223344;
-		 tag.pages[0][0] = 0x44332211;
-		 } else {
-		 tag.uid = 0x55667788;
-		 tag.pages[0][0] = 0x88776655;
-		 }
-		 */
-	}
-	case 40:
-		//data received to be written
-		if (tag.tstate == HT_WRITING_PAGE_DATA) {
-			tag.tstate = HT_NO_OP;
-			tag.pages[page_to_be_written / 4][page_to_be_written % 4] = (rx[0]
-					<< 0) + (rx[1] << 8) + (rx[2] << 16) + (rx[3] << 24);
-			//send ack
-			*txlen = 2;
-			tx[0] = 0x40;
-			page_to_be_written = 0;
-			switch (tag.mode) {
-			case HT_STANDARD:
-				sof_bits = 1;
-				m = MC4K;
-				break;
-			case HT_ADVANCED:
-				sof_bits = 6;
-				m = MC4K;
-				break;
-			case HT_FAST_ADVANCED:
-				sof_bits = 6;
-				m = MC8K;
-				break;
-			default:
-				break;
-			}
-		} else if (tag.tstate == HT_WRITING_BLOCK_DATA) {
-			tag.pages[page_to_be_written / 4][page_to_be_written % 4] = (rx[0]
-					<< 24) + (rx[1] << 16) + (rx[2] << 8) + rx[3];
-			//send ack
-			*txlen = 2;
-			tx[0] = 0x40;
-			switch (tag.mode) {
-			case HT_STANDARD:
-				sof_bits = 1;
-				m = MC4K;
-				break;
-			case HT_ADVANCED:
-				sof_bits = 6;
-				m = MC4K;
-				break;
-			case HT_FAST_ADVANCED:
-				sof_bits = 6;
-				m = MC8K;
-				break;
-			default:
-				break;
-			}
-			page_to_be_written++;
-			block_data_left--;
-			if (block_data_left == 0) {
-				tag.tstate = HT_NO_OP;
-				page_to_be_written = 0;
-			}
-		}
-		break;
-	case 20: {
-		//write page, write block, read page or read block command received
-		if ((rx[0] & 0xf0) == 0xc0) //read page
-				{
-			//send page data
-			page = ((rx[0] & 0x0f) * 16) + ((rx[1] & 0xf0) / 16);
-			*txlen = 32;
-			tx[0] = (tag.pages[page / 4][page % 4]) & 0xff;
-			tx[1] = (tag.pages[page / 4][page % 4] >> 8) & 0xff;
-			tx[2] = (tag.pages[page / 4][page % 4] >> 16) & 0xff;
-			tx[3] = (tag.pages[page / 4][page % 4] >> 24) & 0xff;
-			if (tag.LKP && page == 1)
-				tx[3] = 0xff;
+        /*
+         if (temp2 % 2 == 0) {
+         tag.uid = 0x11223344;
+         tag.pages[0][0] = 0x44332211;
+         } else {
+         tag.uid = 0x55667788;
+         tag.pages[0][0] = 0x88776655;
+         }
+         */
+    }
+    case 40:
+        //data received to be written
+        if (tag.tstate == HT_WRITING_PAGE_DATA) {
+            tag.tstate = HT_NO_OP;
+            tag.pages[page_to_be_written / 4][page_to_be_written % 4] = (rx[0]
+                    << 0) + (rx[1] << 8) + (rx[2] << 16) + (rx[3] << 24);
+            //send ack
+            *txlen = 2;
+            tx[0] = 0x40;
+            page_to_be_written = 0;
+            switch (tag.mode) {
+            case HT_STANDARD:
+                sof_bits = 1;
+                m = MC4K;
+                break;
+            case HT_ADVANCED:
+                sof_bits = 6;
+                m = MC4K;
+                break;
+            case HT_FAST_ADVANCED:
+                sof_bits = 6;
+                m = MC8K;
+                break;
+            default:
+                break;
+            }
+        } else if (tag.tstate == HT_WRITING_BLOCK_DATA) {
+            tag.pages[page_to_be_written / 4][page_to_be_written % 4] = (rx[0]
+                    << 24) + (rx[1] << 16) + (rx[2] << 8) + rx[3];
+            //send ack
+            *txlen = 2;
+            tx[0] = 0x40;
+            switch (tag.mode) {
+            case HT_STANDARD:
+                sof_bits = 1;
+                m = MC4K;
+                break;
+            case HT_ADVANCED:
+                sof_bits = 6;
+                m = MC4K;
+                break;
+            case HT_FAST_ADVANCED:
+                sof_bits = 6;
+                m = MC8K;
+                break;
+            default:
+                break;
+            }
+            page_to_be_written++;
+            block_data_left--;
+            if (block_data_left == 0) {
+                tag.tstate = HT_NO_OP;
+                page_to_be_written = 0;
+            }
+        }
+        break;
+    case 20: {
+        //write page, write block, read page or read block command received
+        if ((rx[0] & 0xf0) == 0xc0) //read page
+                {
+            //send page data
+            page = ((rx[0] & 0x0f) * 16) + ((rx[1] & 0xf0) / 16);
+            *txlen = 32;
+            tx[0] = (tag.pages[page / 4][page % 4]) & 0xff;
+            tx[1] = (tag.pages[page / 4][page % 4] >> 8) & 0xff;
+            tx[2] = (tag.pages[page / 4][page % 4] >> 16) & 0xff;
+            tx[3] = (tag.pages[page / 4][page % 4] >> 24) & 0xff;
+            if (tag.LKP && page == 1)
+                tx[3] = 0xff;
 
-			switch (tag.mode) {
-			case HT_STANDARD:
-				sof_bits = 1;
-				m = MC4K;
-				break;
-			case HT_ADVANCED:
-				sof_bits = 6;
-				m = MC4K;
-				break;
-			case HT_FAST_ADVANCED:
-				sof_bits = 6;
-				m = MC8K;
-				break;
-			default:
-				break;
-			}
+            switch (tag.mode) {
+            case HT_STANDARD:
+                sof_bits = 1;
+                m = MC4K;
+                break;
+            case HT_ADVANCED:
+                sof_bits = 6;
+                m = MC4K;
+                break;
+            case HT_FAST_ADVANCED:
+                sof_bits = 6;
+                m = MC8K;
+                break;
+            default:
+                break;
+            }
 
-			if (tag.mode != HT_STANDARD) {
-				//add crc8
-				*txlen = 40;
-				crc = CRC_PRESET;
-				for (i = 0; i < 4; i++)
-					calc_crc(&crc, tx[i], 8);
-				tx[4] = crc;
-			}
+            if (tag.mode != HT_STANDARD) {
+                //add crc8
+                *txlen = 40;
+                crc = CRC_PRESET;
+                for (i = 0; i < 4; i++)
+                    calc_crc(&crc, tx[i], 8);
+                tx[4] = crc;
+            }
 
-			if (tag.LKP && (page == 2 || page == 3)) {
-				//if reader asks for key or password and the LKP-mark is set do not respond
-				sof_bits = 0;
-				*txlen = 0;
-			}
-		} else if ((rx[0] & 0xf0) == 0xd0) //read block
-				{
-			page = ((rx[0] & 0x0f) * 16) + ((rx[1] & 0xf0) / 16);
-			*txlen = 32 * 4;
-			//send page,...,page+3 data
-			for (i = 0; i < 4; i++) {
-				tx[0 + i * 4] = (tag.pages[page / 4][page % 4]) & 0xff;
-				tx[1 + i * 4] = (tag.pages[page / 4][page % 4] >> 8) & 0xff;
-				tx[2 + i * 4] = (tag.pages[page / 4][page % 4] >> 16) & 0xff;
-				tx[3 + i * 4] = (tag.pages[page / 4][page % 4] >> 24) & 0xff;
-				page++;
-			}
+            if (tag.LKP && (page == 2 || page == 3)) {
+                //if reader asks for key or password and the LKP-mark is set do not respond
+                sof_bits = 0;
+                *txlen = 0;
+            }
+        } else if ((rx[0] & 0xf0) == 0xd0) //read block
+                {
+            page = ((rx[0] & 0x0f) * 16) + ((rx[1] & 0xf0) / 16);
+            *txlen = 32 * 4;
+            //send page,...,page+3 data
+            for (i = 0; i < 4; i++) {
+                tx[0 + i * 4] = (tag.pages[page / 4][page % 4]) & 0xff;
+                tx[1 + i * 4] = (tag.pages[page / 4][page % 4] >> 8) & 0xff;
+                tx[2 + i * 4] = (tag.pages[page / 4][page % 4] >> 16) & 0xff;
+                tx[3 + i * 4] = (tag.pages[page / 4][page % 4] >> 24) & 0xff;
+                page++;
+            }
 
-			switch (tag.mode) {
-			case HT_STANDARD:
-				sof_bits = 1;
-				m = MC4K;
-				break;
-			case HT_ADVANCED:
-				sof_bits = 6;
-				m = MC4K;
-				break;
-			case HT_FAST_ADVANCED:
-				sof_bits = 6;
-				m = MC8K;
-				break;
-			default:
-				break;
-			}
+            switch (tag.mode) {
+            case HT_STANDARD:
+                sof_bits = 1;
+                m = MC4K;
+                break;
+            case HT_ADVANCED:
+                sof_bits = 6;
+                m = MC4K;
+                break;
+            case HT_FAST_ADVANCED:
+                sof_bits = 6;
+                m = MC8K;
+                break;
+            default:
+                break;
+            }
 
-			if (tag.mode != HT_STANDARD) {
-				//add crc8
-				*txlen = 32 * 4 + 8;
-				crc = CRC_PRESET;
-				for (i = 0; i < 16; i++)
-					calc_crc(&crc, tx[i], 8);
-				tx[16] = crc;
-			}
+            if (tag.mode != HT_STANDARD) {
+                //add crc8
+                *txlen = 32 * 4 + 8;
+                crc = CRC_PRESET;
+                for (i = 0; i < 16; i++)
+                    calc_crc(&crc, tx[i], 8);
+                tx[16] = crc;
+            }
 
-			if ((page - 4) % 4 != 0 || (tag.LKP && (page - 4) == 0)) {
-				sof_bits = 0;
-				*txlen = 0;
-			}
-		} else if ((rx[0] & 0xf0) == 0x80) //write page
-				{
-			page = ((rx[0] & 0x0f) * 16) + ((rx[1] & 0xf0) / 16);
+            if ((page - 4) % 4 != 0 || (tag.LKP && (page - 4) == 0)) {
+                sof_bits = 0;
+                *txlen = 0;
+            }
+        } else if ((rx[0] & 0xf0) == 0x80) //write page
+                {
+            page = ((rx[0] & 0x0f) * 16) + ((rx[1] & 0xf0) / 16);
 
-			switch (tag.mode) {
-			case HT_STANDARD:
-				sof_bits = 1;
-				m = MC4K;
-				break;
-			case HT_ADVANCED:
-				sof_bits = 6;
-				m = MC4K;
-				break;
-			case HT_FAST_ADVANCED:
-				sof_bits = 6;
-				m = MC8K;
-				break;
-			default:
-				break;
-			}
-			if ((tag.LCON && page == 1)
-					|| (tag.LKP && (page == 2 || page == 3))) {
-				//deny
-				*txlen = 0;
-			} else {
-				//allow
-				*txlen = 2;
-				tx[0] = 0x40;
-				page_to_be_written = page;
-				tag.tstate = HT_WRITING_PAGE_DATA;
-			}
+            switch (tag.mode) {
+            case HT_STANDARD:
+                sof_bits = 1;
+                m = MC4K;
+                break;
+            case HT_ADVANCED:
+                sof_bits = 6;
+                m = MC4K;
+                break;
+            case HT_FAST_ADVANCED:
+                sof_bits = 6;
+                m = MC8K;
+                break;
+            default:
+                break;
+            }
+            if ((tag.LCON && page == 1)
+                    || (tag.LKP && (page == 2 || page == 3))) {
+                //deny
+                *txlen = 0;
+            } else {
+                //allow
+                *txlen = 2;
+                tx[0] = 0x40;
+                page_to_be_written = page;
+                tag.tstate = HT_WRITING_PAGE_DATA;
+            }
 
-		} else if ((rx[0] & 0xf0) == 0x90) //write block
-				{
-			page = ((rx[0] & 0x0f) * 6) + ((rx[1] & 0xf0) / 16);
-			switch (tag.mode) {
-			case HT_STANDARD:
-				sof_bits = 1;
-				m = MC4K;
-				break;
-			case HT_ADVANCED:
-				sof_bits = 6;
-				m = MC4K;
-				break;
-			case HT_FAST_ADVANCED:
-				sof_bits = 6;
-				m = MC8K;
-				break;
-			default:
-				break;
-			}
-			if (page % 4 != 0 || page == 0) {
-				//deny
-				*txlen = 0;
-			} else {
-				//allow
-				*txlen = 2;
-				tx[0] = 0x40;
-				page_to_be_written = page;
-				block_data_left = 4;
-				tag.tstate = HT_WRITING_BLOCK_DATA;
-			}
-		}
-	}
-		break;
-	default:
+        } else if ((rx[0] & 0xf0) == 0x90) //write block
+                {
+            page = ((rx[0] & 0x0f) * 6) + ((rx[1] & 0xf0) / 16);
+            switch (tag.mode) {
+            case HT_STANDARD:
+                sof_bits = 1;
+                m = MC4K;
+                break;
+            case HT_ADVANCED:
+                sof_bits = 6;
+                m = MC4K;
+                break;
+            case HT_FAST_ADVANCED:
+                sof_bits = 6;
+                m = MC8K;
+                break;
+            default:
+                break;
+            }
+            if (page % 4 != 0 || page == 0) {
+                //deny
+                *txlen = 0;
+            } else {
+                //allow
+                *txlen = 2;
+                tx[0] = 0x40;
+                page_to_be_written = page;
+                block_data_left = 4;
+                tag.tstate = HT_WRITING_BLOCK_DATA;
+            }
+        }
+    }
+        break;
+    default:
 
-		break;
-	}
+        break;
+    }
 }
 
 /*
  * to autenticate to a tag with the given key or challenge
  */
 static int hitagS_handle_tag_auth(hitag_function htf,uint64_t key, uint64_t NrAr, byte_t* rx, const size_t rxlen, byte_t* tx,
-		size_t* txlen) {
-	byte_t rx_air[HITAG_FRAME_LEN];
-	int response_bit[200];
-	int i, j, z, k;
-	unsigned char mask = 1;
-	unsigned char uid[32];
-	byte_t uid1 = 0x00, uid2 = 0x00, uid3 = 0x00, uid4 = 0x00;
-	unsigned char crc;
-	u64 state;
-	byte_t auth_ks[4];
-	byte_t conf_pages[3];
-	memcpy(rx_air, rx, nbytes(rxlen));
-	*txlen = 0;
+        size_t* txlen) {
+    byte_t rx_air[HITAG_FRAME_LEN];
+    int response_bit[200];
+    int i, j, z, k;
+    unsigned char mask = 1;
+    unsigned char uid[32];
+    byte_t uid1 = 0x00, uid2 = 0x00, uid3 = 0x00, uid4 = 0x00;
+    unsigned char crc;
+    u64 state;
+    byte_t auth_ks[4];
+    byte_t conf_pages[3];
+    memcpy(rx_air, rx, nbytes(rxlen));
+    *txlen = 0;
 
-	if (tag.pstate == HT_READY && rxlen >= 67) {
-		//received uid
-		if(end==true) {
-			Dbprintf("authentication failed!");
-			return -1;
-		}
-		z = 0;
-		for (i = 0; i < 10; i++) {
-			for (j = 0; j < 8; j++) {
-				response_bit[z] = 0;
-				if ((rx[i] & ((mask << 7) >> j)) != 0)
-					response_bit[z] = 1;
-				z++;
-			}
-		}
-		k = 0;
-		for (i = 5; i < z; i += 2) {
-			uid[k] = response_bit[i];
-			k++;
-			if (k > 31)
-				break;
-		}
-		uid1 = (uid[0] << 7) | (uid[1] << 6) | (uid[2] << 5) | (uid[3] << 4)
-				| (uid[4] << 3) | (uid[5] << 2) | (uid[6] << 1) | uid[7];
-		uid2 = (uid[8] << 7) | (uid[9] << 6) | (uid[10] << 5) | (uid[11] << 4)
-				| (uid[12] << 3) | (uid[13] << 2) | (uid[14] << 1) | uid[15];
-		uid3 = (uid[16] << 7) | (uid[17] << 6) | (uid[18] << 5) | (uid[19] << 4)
-				| (uid[20] << 3) | (uid[21] << 2) | (uid[22] << 1) | uid[23];
-		uid4 = (uid[24] << 7) | (uid[25] << 6) | (uid[26] << 5) | (uid[27] << 4)
-				| (uid[28] << 3) | (uid[29] << 2) | (uid[30] << 1) | uid[31];
-		if (DEBUG)
-			Dbprintf("UID: %02X %02X %02X %02X", uid1, uid2, uid3, uid4);
-		tag.uid = (uid4 << 24 | uid3 << 16 | uid2 << 8 | uid1);
+    if (tag.pstate == HT_READY && rxlen >= 67) {
+        //received uid
+        if(end==true) {
+            Dbprintf("authentication failed!");
+            return -1;
+        }
+        z = 0;
+        for (i = 0; i < 10; i++) {
+            for (j = 0; j < 8; j++) {
+                response_bit[z] = 0;
+                if ((rx[i] & ((mask << 7) >> j)) != 0)
+                    response_bit[z] = 1;
+                z++;
+            }
+        }
+        k = 0;
+        for (i = 5; i < z; i += 2) {
+            uid[k] = response_bit[i];
+            k++;
+            if (k > 31)
+                break;
+        }
+        uid1 = (uid[0] << 7) | (uid[1] << 6) | (uid[2] << 5) | (uid[3] << 4)
+                | (uid[4] << 3) | (uid[5] << 2) | (uid[6] << 1) | uid[7];
+        uid2 = (uid[8] << 7) | (uid[9] << 6) | (uid[10] << 5) | (uid[11] << 4)
+                | (uid[12] << 3) | (uid[13] << 2) | (uid[14] << 1) | uid[15];
+        uid3 = (uid[16] << 7) | (uid[17] << 6) | (uid[18] << 5) | (uid[19] << 4)
+                | (uid[20] << 3) | (uid[21] << 2) | (uid[22] << 1) | uid[23];
+        uid4 = (uid[24] << 7) | (uid[25] << 6) | (uid[26] << 5) | (uid[27] << 4)
+                | (uid[28] << 3) | (uid[29] << 2) | (uid[30] << 1) | uid[31];
+        if (DEBUG)
+            Dbprintf("UID: %02X %02X %02X %02X", uid1, uid2, uid3, uid4);
+        tag.uid = (uid4 << 24 | uid3 << 16 | uid2 << 8 | uid1);
 
-		//select uid
-		*txlen = 45;
-		crc = CRC_PRESET;
-		calc_crc(&crc, 0x00, 5);
-		calc_crc(&crc, uid1, 8);
-		calc_crc(&crc, uid2, 8);
-		calc_crc(&crc, uid3, 8);
-		calc_crc(&crc, uid4, 8);
-		for (i = 0; i < 100; i++) {
-			response_bit[i] = 0;
-		}
-		for (i = 0; i < 5; i++) {
-			response_bit[i] = 0;
-		}
-		for (i = 5; i < 37; i++) {
-			response_bit[i] = uid[i - 5];
-		}
-		for (j = 0; j < 8; j++) {
-			response_bit[i] = 0;
-			if ((crc & ((mask << 7) >> j)) != 0)
-				response_bit[i] = 1;
-			i++;
-		}
-		k = 0;
-		for (i = 0; i < 6; i++) {
-			tx[i] = (response_bit[k] << 7) | (response_bit[k + 1] << 6)
-					| (response_bit[k + 2] << 5) | (response_bit[k + 3] << 4)
-					| (response_bit[k + 4] << 3) | (response_bit[k + 5] << 2)
-					| (response_bit[k + 6] << 1) | response_bit[k + 7];
-			k += 8;
-		}
-		tag.pstate = HT_INIT;
-	} else if (tag.pstate == HT_INIT && rxlen == 44) {
-		// received configuration after select command
-		z = 0;
-		for (i = 0; i < 6; i++) {
-			for (j = 0; j < 8; j++) {
-				response_bit[z] = 0;
-				if ((rx[i] & ((mask << 7) >> j)) != 0)
-					response_bit[z] = 1;
-				z++;
-			}
-		}
-		conf_pages[0] = ((response_bit[4] << 7) | (response_bit[5] << 6)
-				| (response_bit[6] << 5) | (response_bit[7] << 4)
-				| (response_bit[8] << 3) | (response_bit[9] << 2)
-				| (response_bit[10] << 1) | response_bit[11]);
-		//check wich memorysize this tag has
-		if (response_bit[10] == 0 && response_bit[11] == 0)
-			tag.max_page = 32 / 32;
-		if (response_bit[10] == 0 && response_bit[11] == 1)
-			tag.max_page = 256 / 32;
-		if (response_bit[10] == 1 && response_bit[11] == 0)
-			tag.max_page = 2048 / 32;
-		conf_pages[1] = ((response_bit[12] << 7) | (response_bit[13] << 6)
-				| (response_bit[14] << 5) | (response_bit[15] << 4)
-				| (response_bit[16] << 3) | (response_bit[17] << 2)
-				| (response_bit[18] << 1) | response_bit[19]);
-		tag.auth = response_bit[12];
-		tag.TTFC = response_bit[13];
-		//tag.TTFDR in response_bit[14] and response_bit[15]
-		//tag.TTFM in response_bit[16] and response_bit[17]
-		tag.LCON = response_bit[18];
-		tag.LKP = response_bit[19];
-		conf_pages[2] = ((response_bit[20] << 7) | (response_bit[21] << 6)
-				| (response_bit[22] << 5) | (response_bit[23] << 4)
-				| (response_bit[24] << 3) | (response_bit[25] << 2)
-				| (response_bit[26] << 1) | response_bit[27]);
-		tag.LCK7 = response_bit[20];
-		tag.LCK6 = response_bit[21];
-		tag.LCK5 = response_bit[22];
-		tag.LCK4 = response_bit[23];
-		tag.LCK3 = response_bit[24];
-		tag.LCK2 = response_bit[25];
-		tag.LCK1 = response_bit[26];
-		tag.LCK0 = response_bit[27];
+        //select uid
+        *txlen = 45;
+        crc = CRC_PRESET;
+        calc_crc(&crc, 0x00, 5);
+        calc_crc(&crc, uid1, 8);
+        calc_crc(&crc, uid2, 8);
+        calc_crc(&crc, uid3, 8);
+        calc_crc(&crc, uid4, 8);
+        for (i = 0; i < 100; i++) {
+            response_bit[i] = 0;
+        }
+        for (i = 0; i < 5; i++) {
+            response_bit[i] = 0;
+        }
+        for (i = 5; i < 37; i++) {
+            response_bit[i] = uid[i - 5];
+        }
+        for (j = 0; j < 8; j++) {
+            response_bit[i] = 0;
+            if ((crc & ((mask << 7) >> j)) != 0)
+                response_bit[i] = 1;
+            i++;
+        }
+        k = 0;
+        for (i = 0; i < 6; i++) {
+            tx[i] = (response_bit[k] << 7) | (response_bit[k + 1] << 6)
+                    | (response_bit[k + 2] << 5) | (response_bit[k + 3] << 4)
+                    | (response_bit[k + 4] << 3) | (response_bit[k + 5] << 2)
+                    | (response_bit[k + 6] << 1) | response_bit[k + 7];
+            k += 8;
+        }
+        tag.pstate = HT_INIT;
+    } else if (tag.pstate == HT_INIT && rxlen == 44) {
+        // received configuration after select command
+        z = 0;
+        for (i = 0; i < 6; i++) {
+            for (j = 0; j < 8; j++) {
+                response_bit[z] = 0;
+                if ((rx[i] & ((mask << 7) >> j)) != 0)
+                    response_bit[z] = 1;
+                z++;
+            }
+        }
+        conf_pages[0] = ((response_bit[4] << 7) | (response_bit[5] << 6)
+                | (response_bit[6] << 5) | (response_bit[7] << 4)
+                | (response_bit[8] << 3) | (response_bit[9] << 2)
+                | (response_bit[10] << 1) | response_bit[11]);
+        //check wich memorysize this tag has
+        if (response_bit[10] == 0 && response_bit[11] == 0)
+            tag.max_page = 32 / 32;
+        if (response_bit[10] == 0 && response_bit[11] == 1)
+            tag.max_page = 256 / 32;
+        if (response_bit[10] == 1 && response_bit[11] == 0)
+            tag.max_page = 2048 / 32;
+        conf_pages[1] = ((response_bit[12] << 7) | (response_bit[13] << 6)
+                | (response_bit[14] << 5) | (response_bit[15] << 4)
+                | (response_bit[16] << 3) | (response_bit[17] << 2)
+                | (response_bit[18] << 1) | response_bit[19]);
+        tag.auth = response_bit[12];
+        tag.TTFC = response_bit[13];
+        //tag.TTFDR in response_bit[14] and response_bit[15]
+        //tag.TTFM in response_bit[16] and response_bit[17]
+        tag.LCON = response_bit[18];
+        tag.LKP = response_bit[19];
+        conf_pages[2] = ((response_bit[20] << 7) | (response_bit[21] << 6)
+                | (response_bit[22] << 5) | (response_bit[23] << 4)
+                | (response_bit[24] << 3) | (response_bit[25] << 2)
+                | (response_bit[26] << 1) | response_bit[27]);
+        tag.LCK7 = response_bit[20];
+        tag.LCK6 = response_bit[21];
+        tag.LCK5 = response_bit[22];
+        tag.LCK4 = response_bit[23];
+        tag.LCK3 = response_bit[24];
+        tag.LCK2 = response_bit[25];
+        tag.LCK1 = response_bit[26];
+        tag.LCK0 = response_bit[27];
 
-		if (DEBUG)
-			Dbprintf("conf0: %02X conf1: %02X conf2: %02X", conf_pages[0],
-					conf_pages[1], conf_pages[2]);
-		if (tag.auth == 1) {
-			//if the tag is in authentication mode try the key or challenge
-			*txlen = 64;
-			if(end!=true){
-				if(htf==02||htf==04){ //RHTS_KEY //WHTS_KEY
-					state = hitag2_init(rev64(key), rev32(tag.uid),
-							rev32(rnd));
+        if (DEBUG)
+            Dbprintf("conf0: %02X conf1: %02X conf2: %02X", conf_pages[0],
+                    conf_pages[1], conf_pages[2]);
+        if (tag.auth == 1) {
+            //if the tag is in authentication mode try the key or challenge
+            *txlen = 64;
+            if(end!=true){
+                if(htf==02||htf==04){ //RHTS_KEY //WHTS_KEY
+                    state = hitag2_init(rev64(key), rev32(tag.uid),
+                            rev32(rnd));
 
-					for (i = 0; i < 4; i++) {
-						auth_ks[i] = hitag2_byte(&state) ^ 0xff;
-					}
-					*txlen = 64;
-					tx[0] = rnd & 0xff;
-					tx[1] = (rnd >> 8) & 0xff;
-					tx[2] = (rnd >> 16) & 0xff;
-					tx[3] = (rnd >> 24) & 0xff;
+                    for (i = 0; i < 4; i++) {
+                        auth_ks[i] = hitag2_byte(&state) ^ 0xff;
+                    }
+                    *txlen = 64;
+                    tx[0] = rnd & 0xff;
+                    tx[1] = (rnd >> 8) & 0xff;
+                    tx[2] = (rnd >> 16) & 0xff;
+                    tx[3] = (rnd >> 24) & 0xff;
 
-					tx[4] = auth_ks[0];
-					tx[5] = auth_ks[1];
-					tx[6] = auth_ks[2];
-					tx[7] = auth_ks[3];
-					if (DEBUG)
-						Dbprintf("%02X %02X %02X %02X %02X %02X %02X %02X", tx[0],
-								tx[1], tx[2], tx[3], tx[4], tx[5], tx[6], tx[7]);
-				} else if(htf==01 || htf==03) { //RHTS_CHALLENGE //WHTS_CHALLENGE
-					for (i = 0; i < 8; i++)
-						tx[i]=((NrAr>>(56-(i*8)))&0xff);
-				}
-				end=true;
-				tag.pstate = HT_AUTHENTICATE;
-			} else {
-				Dbprintf("authentication failed!");
-				return -1;
-			}
-		} else if (tag.auth == 0) {
-			tag.pstate = HT_SELECTED;
-		}
+                    tx[4] = auth_ks[0];
+                    tx[5] = auth_ks[1];
+                    tx[6] = auth_ks[2];
+                    tx[7] = auth_ks[3];
+                    if (DEBUG)
+                        Dbprintf("%02X %02X %02X %02X %02X %02X %02X %02X", tx[0],
+                                tx[1], tx[2], tx[3], tx[4], tx[5], tx[6], tx[7]);
+                } else if(htf==01 || htf==03) { //RHTS_CHALLENGE //WHTS_CHALLENGE
+                    for (i = 0; i < 8; i++)
+                        tx[i]=((NrAr>>(56-(i*8)))&0xff);
+                }
+                end=true;
+                tag.pstate = HT_AUTHENTICATE;
+            } else {
+                Dbprintf("authentication failed!");
+                return -1;
+            }
+        } else if (tag.auth == 0) {
+            tag.pstate = HT_SELECTED;
+        }
 
-	} else if (tag.pstate == HT_AUTHENTICATE && rxlen == 44) {
-		//encrypted con2,password received.
-		crc = CRC_PRESET;
-		calc_crc(&crc, 0x80, 1);
-		calc_crc(&crc, ((rx[0] & 0x0f) * 16 + ((rx[1] & 0xf0) / 16)), 8);
-		calc_crc(&crc, ((rx[1] & 0x0f) * 16 + ((rx[2] & 0xf0) / 16)), 8);
-		calc_crc(&crc, ((rx[2] & 0x0f) * 16 + ((rx[3] & 0xf0) / 16)), 8);
-		calc_crc(&crc, ((rx[3] & 0x0f) * 16 + ((rx[4] & 0xf0) / 16)), 8);
-		if (DEBUG) {
-			Dbprintf("UID:::%X", tag.uid);
-			Dbprintf("RND:::%X", rnd);
-		}
+    } else if (tag.pstate == HT_AUTHENTICATE && rxlen == 44) {
+        //encrypted con2,password received.
+        crc = CRC_PRESET;
+        calc_crc(&crc, 0x80, 1);
+        calc_crc(&crc, ((rx[0] & 0x0f) * 16 + ((rx[1] & 0xf0) / 16)), 8);
+        calc_crc(&crc, ((rx[1] & 0x0f) * 16 + ((rx[2] & 0xf0) / 16)), 8);
+        calc_crc(&crc, ((rx[2] & 0x0f) * 16 + ((rx[3] & 0xf0) / 16)), 8);
+        calc_crc(&crc, ((rx[3] & 0x0f) * 16 + ((rx[4] & 0xf0) / 16)), 8);
+        if (DEBUG) {
+            Dbprintf("UID:::%X", tag.uid);
+            Dbprintf("RND:::%X", rnd);
+        }
 
-		//decrypt password
-		pwdh0=0;
-		pwdl0=0;
-		pwdl1=0;
-		if(htf==02 || htf==04){ //RHTS_KEY //WHTS_KEY
-		{
-			state = hitag2_init(rev64(key), rev32(tag.uid), rev32(rnd));
-			for (i = 0; i < 5; i++)
-				hitag2_byte(&state);
-			pwdh0 = ((rx[1] & 0x0f) * 16 + ((rx[2] & 0xf0) / 16))
-					^ hitag2_byte(&state);
-			pwdl0 = ((rx[2] & 0x0f) * 16 + ((rx[3] & 0xf0) / 16))
-					^ hitag2_byte(&state);
-			pwdl1 = ((rx[3] & 0x0f) * 16 + ((rx[4] & 0xf0) / 16))
-					^ hitag2_byte(&state);
-		}
+        //decrypt password
+        pwdh0=0;
+        pwdl0=0;
+        pwdl1=0;
+        if(htf==02 || htf==04){ //RHTS_KEY //WHTS_KEY
+        {
+            state = hitag2_init(rev64(key), rev32(tag.uid), rev32(rnd));
+            for (i = 0; i < 5; i++)
+                hitag2_byte(&state);
+            pwdh0 = ((rx[1] & 0x0f) * 16 + ((rx[2] & 0xf0) / 16))
+                    ^ hitag2_byte(&state);
+            pwdl0 = ((rx[2] & 0x0f) * 16 + ((rx[3] & 0xf0) / 16))
+                    ^ hitag2_byte(&state);
+            pwdl1 = ((rx[3] & 0x0f) * 16 + ((rx[4] & 0xf0) / 16))
+                    ^ hitag2_byte(&state);
+        }
 
-		if (DEBUG)
-			Dbprintf("pwdh0 %02X pwdl0 %02X pwdl1 %02X", pwdh0, pwdl0, pwdl1);
+        if (DEBUG)
+            Dbprintf("pwdh0 %02X pwdl0 %02X pwdl1 %02X", pwdh0, pwdl0, pwdl1);
 
 
-		//Dbprintf("%X %02X", rnd, ((rx[4] & 0x0f) * 16) + ((rx[5] & 0xf0) / 16));
-		//rnd += 1;
-	}
-		tag.pstate = HT_SELECTED; //tag is now ready for read/write commands
-	}
-	return 0;
+        //Dbprintf("%X %02X", rnd, ((rx[4] & 0x0f) * 16) + ((rx[5] & 0xf0) / 16));
+        //rnd += 1;
+    }
+        tag.pstate = HT_SELECTED; //tag is now ready for read/write commands
+    }
+    return 0;
 
 }
 
@@ -939,223 +939,223 @@ static int hitagS_handle_tag_auth(hitag_function htf,uint64_t key, uint64_t NrAr
  * Emulates a Hitag S Tag with the given data from the .hts file
  */
 void SimulateHitagSTag(bool tag_mem_supplied, byte_t* data) {
-	int frame_count;
-	int response;
-	int overflow;
-	int i, j;
-	byte_t rx[HITAG_FRAME_LEN];
-	size_t rxlen = 0;
-	//bool bQuitTraceFull = false;
-	bQuiet = false;
-	byte_t txbuf[HITAG_FRAME_LEN];
-	byte_t* tx = txbuf;
-	size_t txlen = 0;
-	// free eventually allocated BigBuf memory
-	BigBuf_free(); BigBuf_Clear_ext(false);
+    int frame_count;
+    int response;
+    int overflow;
+    int i, j;
+    byte_t rx[HITAG_FRAME_LEN];
+    size_t rxlen = 0;
+    //bool bQuitTraceFull = false;
+    bQuiet = false;
+    byte_t txbuf[HITAG_FRAME_LEN];
+    byte_t* tx = txbuf;
+    size_t txlen = 0;
+    // free eventually allocated BigBuf memory
+    BigBuf_free(); BigBuf_Clear_ext(false);
 
-	// Clean up trace and prepare it for storing frames
-	set_tracing(true);
-	clear_trace();
+    // Clean up trace and prepare it for storing frames
+    set_tracing(true);
+    clear_trace();
 
-	DbpString("Starting HitagS simulation");
-	LED_D_ON();
+    DbpString("Starting HitagS simulation");
+    LED_D_ON();
 
-	tag.pstate = HT_READY;
-	tag.tstate = HT_NO_OP;
-	for (i = 0; i < 16; i++)
-		for (j = 0; j < 4; j++)
-			tag.pages[i][j] = 0x0;
-	//read tag data into memory
-	if (tag_mem_supplied) {
-		DbpString("Loading hitagS memory...");
-		memcpy((byte_t*)tag.pages,data,4*64);
-	}
-	tag.uid=(uint32_t)tag.pages[0];
-	Dbprintf("Hitag S simulation started");
-	tag.key=(intptr_t)tag.pages[3];
-	tag.key<<=16;
-	tag.key+=((tag.pages[2][0])<<8)+tag.pages[2][1];
-	tag.pwdl0=tag.pages[2][3];
-	tag.pwdl1=tag.pages[2][2];
-	tag.pwdh0=tag.pages[1][0];
-	//con0
-	tag.max_page=64;
-	if((tag.pages[1][3]&0x2)==0 && (tag.pages[1][3]&0x1)==1)
-		tag.max_page=8;
-	if((tag.pages[1][3]&0x2)==0 && (tag.pages[1][3]&0x1)==0)
-		tag.max_page=0;
-	//con1
-	tag.auth=0;
-	if((tag.pages[1][2]&0x80) == 0x80)
-		tag.auth=1;
-	tag.LCON=0;
-	if((tag.pages[1][2]&0x2) == 0x02)
-		tag.LCON=1;
-	tag.LKP=0;
-	if((tag.pages[1][2]&0x1) == 0x01)
-		tag.LKP=1;
-	//con2
-	//0=read write 1=read only
-	tag.LCK7=0;
-	if((tag.pages[1][1]&0x80) == 0x80)
-		tag.LCK7=1;
-	tag.LCK6=0;
-	if((tag.pages[1][1]&0x40) == 0x040)
-		tag.LCK6=1;
-	tag.LCK5=0;
-	if((tag.pages[1][1]&0x20) == 0x20)
-		tag.LCK5=1;
-	tag.LCK4=0;
-	if((tag.pages[1][1]&0x10) == 0x10)
-		tag.LCK4=1;
-	tag.LCK3=0;
-	if((tag.pages[1][1]&0x8) == 0x08)
-		tag.LCK3=1;
-	tag.LCK2=0;
-	if((tag.pages[1][1]&0x4) == 0x04)
-		tag.LCK2=1;
-	tag.LCK1=0;
-	if((tag.pages[1][1]&0x2) == 0x02)
-		tag.LCK1=1;
-	tag.LCK0=0;
-	if((tag.pages[1][1]&0x1) == 0x01)
-		tag.LCK0=1;
+    tag.pstate = HT_READY;
+    tag.tstate = HT_NO_OP;
+    for (i = 0; i < 16; i++)
+        for (j = 0; j < 4; j++)
+            tag.pages[i][j] = 0x0;
+    //read tag data into memory
+    if (tag_mem_supplied) {
+        DbpString("Loading hitagS memory...");
+        memcpy((byte_t*)tag.pages,data,4*64);
+    }
+    tag.uid=(uint32_t)tag.pages[0];
+    Dbprintf("Hitag S simulation started");
+    tag.key=(intptr_t)tag.pages[3];
+    tag.key<<=16;
+    tag.key+=((tag.pages[2][0])<<8)+tag.pages[2][1];
+    tag.pwdl0=tag.pages[2][3];
+    tag.pwdl1=tag.pages[2][2];
+    tag.pwdh0=tag.pages[1][0];
+    //con0
+    tag.max_page=64;
+    if((tag.pages[1][3]&0x2)==0 && (tag.pages[1][3]&0x1)==1)
+        tag.max_page=8;
+    if((tag.pages[1][3]&0x2)==0 && (tag.pages[1][3]&0x1)==0)
+        tag.max_page=0;
+    //con1
+    tag.auth=0;
+    if((tag.pages[1][2]&0x80) == 0x80)
+        tag.auth=1;
+    tag.LCON=0;
+    if((tag.pages[1][2]&0x2) == 0x02)
+        tag.LCON=1;
+    tag.LKP=0;
+    if((tag.pages[1][2]&0x1) == 0x01)
+        tag.LKP=1;
+    //con2
+    //0=read write 1=read only
+    tag.LCK7=0;
+    if((tag.pages[1][1]&0x80) == 0x80)
+        tag.LCK7=1;
+    tag.LCK6=0;
+    if((tag.pages[1][1]&0x40) == 0x040)
+        tag.LCK6=1;
+    tag.LCK5=0;
+    if((tag.pages[1][1]&0x20) == 0x20)
+        tag.LCK5=1;
+    tag.LCK4=0;
+    if((tag.pages[1][1]&0x10) == 0x10)
+        tag.LCK4=1;
+    tag.LCK3=0;
+    if((tag.pages[1][1]&0x8) == 0x08)
+        tag.LCK3=1;
+    tag.LCK2=0;
+    if((tag.pages[1][1]&0x4) == 0x04)
+        tag.LCK2=1;
+    tag.LCK1=0;
+    if((tag.pages[1][1]&0x2) == 0x02)
+        tag.LCK1=1;
+    tag.LCK0=0;
+    if((tag.pages[1][1]&0x1) == 0x01)
+        tag.LCK0=1;
 
 // Set up simulator mode, frequency divisor which will drive the FPGA
 // and analog mux selection.
-	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT);
-	SpinDelay(20);
-	FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
-	SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
-	RELAY_OFF();
+    FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT);
+    SpinDelay(20);
+    FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
+    SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
+    RELAY_OFF();
 
 // Configure output pin that is connected to the FPGA (for modulating)
-	AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
-	AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
+    AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
+    AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
 
 // Disable modulation at default, which means release resistance
-	LOW(GPIO_SSC_DOUT);
+    LOW(GPIO_SSC_DOUT);
 
 // Enable Peripheral Clock for TIMER_CLOCK0, used to measure exact timing before answering
-	AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC0);
+    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC0);
 
 // Enable Peripheral Clock for TIMER_CLOCK1, used to capture edges of the reader frames
-	AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC1);
-	AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
+    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC1);
+    AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
 
 // Disable timer during configuration
-	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
+    AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 
 // Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
 // external trigger rising edge, load RA on rising edge of TIOA.
-	AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK
-			| AT91C_TC_ETRGEDG_RISING | AT91C_TC_ABETRG | AT91C_TC_LDRA_RISING;
+    AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK
+            | AT91C_TC_ETRGEDG_RISING | AT91C_TC_ABETRG | AT91C_TC_LDRA_RISING;
 
 // Reset the received frame, frame count and timing info
-	memset(rx, 0x00, sizeof(rx));
-	frame_count = 0;
-	response = 0;
-	overflow = 0;
+    memset(rx, 0x00, sizeof(rx));
+    frame_count = 0;
+    response = 0;
+    overflow = 0;
 
 // Enable and reset counter
-	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
+    AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
-	while (!BUTTON_PRESS()) {
-		// Watchdog hit
-		WDT_HIT();
+    while (!BUTTON_PRESS()) {
+        // Watchdog hit
+        WDT_HIT();
 
-		// Receive frame, watch for at most T0*EOF periods
-		while (AT91C_BASE_TC1->TC_CV < T0 * HITAG_T_EOF) {
-			// Check if rising edge in modulation is detected
-			if (AT91C_BASE_TC1->TC_SR & AT91C_TC_LDRAS) {
-				// Retrieve the new timing values
-				int ra = (AT91C_BASE_TC1->TC_RA / T0) + overflow;
-				overflow = 0;
+        // Receive frame, watch for at most T0*EOF periods
+        while (AT91C_BASE_TC1->TC_CV < T0 * HITAG_T_EOF) {
+            // Check if rising edge in modulation is detected
+            if (AT91C_BASE_TC1->TC_SR & AT91C_TC_LDRAS) {
+                // Retrieve the new timing values
+                int ra = (AT91C_BASE_TC1->TC_RA / T0) + overflow;
+                overflow = 0;
 
-				// Reset timer every frame, we have to capture the last edge for timing
-				AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
+                // Reset timer every frame, we have to capture the last edge for timing
+                AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
-				LED_B_ON();
+                LED_B_ON();
 
-				// Capture reader frame
-				if (ra >= HITAG_T_STOP) {
-					if (rxlen != 0) {
-						//DbpString("wierd0?");
-					}
-					// Capture the T0 periods that have passed since last communication or field drop (reset)
-					response = (ra - HITAG_T_LOW);
-				} else if (ra >= HITAG_T_1_MIN) {
-					// '1' bit
-					rx[rxlen / 8] |= 1 << (7 - (rxlen % 8));
-					rxlen++;
-				} else if (ra >= HITAG_T_0_MIN) {
-					// '0' bit
-					rx[rxlen / 8] |= 0 << (7 - (rxlen % 8));
-					rxlen++;
-				} else {
-					// Ignore wierd value, is to small to mean anything
-				}
-			}
-		}
+                // Capture reader frame
+                if (ra >= HITAG_T_STOP) {
+                    if (rxlen != 0) {
+                        //DbpString("wierd0?");
+                    }
+                    // Capture the T0 periods that have passed since last communication or field drop (reset)
+                    response = (ra - HITAG_T_LOW);
+                } else if (ra >= HITAG_T_1_MIN) {
+                    // '1' bit
+                    rx[rxlen / 8] |= 1 << (7 - (rxlen % 8));
+                    rxlen++;
+                } else if (ra >= HITAG_T_0_MIN) {
+                    // '0' bit
+                    rx[rxlen / 8] |= 0 << (7 - (rxlen % 8));
+                    rxlen++;
+                } else {
+                    // Ignore wierd value, is to small to mean anything
+                }
+            }
+        }
 
-		// Check if frame was captured
-		if (rxlen > 0) {
-			frame_count++;
-			if (!bQuiet) {
-				if (!LogTraceHitag(rx, rxlen, response, 0, true)) {
-					DbpString("Trace full");
-					clear_trace();
-				}
-			}
+        // Check if frame was captured
+        if (rxlen > 0) {
+            frame_count++;
+            if (!bQuiet) {
+                if (!LogTraceHitag(rx, rxlen, response, 0, true)) {
+                    DbpString("Trace full");
+                    clear_trace();
+                }
+            }
 
-			// Disable timer 1 with external trigger to avoid triggers during our own modulation
-			AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
+            // Disable timer 1 with external trigger to avoid triggers during our own modulation
+            AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 
-			// Process the incoming frame (rx) and prepare the outgoing frame (tx)
-			hitagS_handle_reader_command(rx, rxlen, tx, &txlen);
+            // Process the incoming frame (rx) and prepare the outgoing frame (tx)
+            hitagS_handle_reader_command(rx, rxlen, tx, &txlen);
 
-			// Wait for HITAG_T_WAIT_1 carrier periods after the last reader bit,
-			// not that since the clock counts since the rising edge, but T_Wait1 is
-			// with respect to the falling edge, we need to wait actually (T_Wait1 - T_Low)
-			// periods. The gap time T_Low varies (4..10). All timer values are in
-			// terms of T0 units
-			while (AT91C_BASE_TC0->TC_CV < T0 * (HITAG_T_WAIT_1 - HITAG_T_LOW))
-				;
+            // Wait for HITAG_T_WAIT_1 carrier periods after the last reader bit,
+            // not that since the clock counts since the rising edge, but T_Wait1 is
+            // with respect to the falling edge, we need to wait actually (T_Wait1 - T_Low)
+            // periods. The gap time T_Low varies (4..10). All timer values are in
+            // terms of T0 units
+            while (AT91C_BASE_TC0->TC_CV < T0 * (HITAG_T_WAIT_1 - HITAG_T_LOW))
+                ;
 
-			// Send and store the tag answer (if there is any)
-			if (txlen > 0) {
-				// Transmit the tag frame
-				hitag_send_frame(tx, txlen);
-				// Store the frame in the trace
-				if (!bQuiet) {
-					if (!LogTraceHitag(tx, txlen, 0, 0, false)) {
-						DbpString("Trace full");
-						clear_trace();
-					}
-				}
-			}
+            // Send and store the tag answer (if there is any)
+            if (txlen > 0) {
+                // Transmit the tag frame
+                hitag_send_frame(tx, txlen);
+                // Store the frame in the trace
+                if (!bQuiet) {
+                    if (!LogTraceHitag(tx, txlen, 0, 0, false)) {
+                        DbpString("Trace full");
+                        clear_trace();
+                    }
+                }
+            }
 
-			// Reset the received frame and response timing info
-			memset(rx, 0x00, sizeof(rx));
-			response = 0;
+            // Reset the received frame and response timing info
+            memset(rx, 0x00, sizeof(rx));
+            response = 0;
 
-			// Enable and reset external trigger in timer for capturing future frames
-			AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
-			LED_B_OFF();
-		}
-		// Reset the frame length
-		rxlen = 0;
-		// Save the timer overflow, will be 0 when frame was received
-		overflow += (AT91C_BASE_TC1->TC_CV / T0);
-		// Reset the timer to restart while-loop that receives frames
-		AT91C_BASE_TC1->TC_CCR = AT91C_TC_SWTRG;
-	}
-	LED_B_OFF();
-	LED_D_OFF();
-	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
-	AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+            // Enable and reset external trigger in timer for capturing future frames
+            AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
+            LED_B_OFF();
+        }
+        // Reset the frame length
+        rxlen = 0;
+        // Save the timer overflow, will be 0 when frame was received
+        overflow += (AT91C_BASE_TC1->TC_CV / T0);
+        // Reset the timer to restart while-loop that receives frames
+        AT91C_BASE_TC1->TC_CCR = AT91C_TC_SWTRG;
+    }
+    LED_B_OFF();
+    LED_D_OFF();
+    AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
+    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 }
 
 /*
@@ -1164,341 +1164,341 @@ void SimulateHitagSTag(bool tag_mem_supplied, byte_t* data) {
  * Reads every page of a hitag S transpoder.
  */
 void ReadHitagS(hitag_function htf, hitag_data* htd) {
-	int i, j, z, k;
-	int frame_count;
-	int response_bit[200];
-	int response;
-	byte_t rx[HITAG_FRAME_LEN];
-	size_t rxlen = 0;
-	byte_t txbuf[HITAG_FRAME_LEN];
-	byte_t* tx = txbuf;
-	size_t txlen = 0;
-	int lastbit;
-	bool bSkip;
-	int reset_sof;
-	int tag_sof;
-	int t_wait = HITAG_T_WAIT_MAX;
-	bool bStop = false;
-	bool bQuitTraceFull = false;
-	int sendNum = 0;
-	unsigned char mask = 1;
-	unsigned char crc;
-	unsigned char pageData[32];
-	page_to_be_written = 0;
+    int i, j, z, k;
+    int frame_count;
+    int response_bit[200];
+    int response;
+    byte_t rx[HITAG_FRAME_LEN];
+    size_t rxlen = 0;
+    byte_t txbuf[HITAG_FRAME_LEN];
+    byte_t* tx = txbuf;
+    size_t txlen = 0;
+    int lastbit;
+    bool bSkip;
+    int reset_sof;
+    int tag_sof;
+    int t_wait = HITAG_T_WAIT_MAX;
+    bool bStop = false;
+    bool bQuitTraceFull = false;
+    int sendNum = 0;
+    unsigned char mask = 1;
+    unsigned char crc;
+    unsigned char pageData[32];
+    page_to_be_written = 0;
 
-	//read given key/challenge
-	byte_t NrAr_[8];
-	uint64_t key = 0;
-	uint64_t NrAr = 0;
-	byte_t key_[6];
-	switch (htf) {
-		case 01: { //RHTS_CHALLENGE
-			DbpString("Authenticating using nr,ar pair:");
-			memcpy(NrAr_, htd->auth.NrAr, 8);
-			Dbhexdump(8, NrAr_, false);
-			NrAr = NrAr_[7] | ((uint64_t)NrAr_[6]) << 8 | ((uint64_t)NrAr_[5]) << 16 | ((uint64_t)NrAr_[4]) << 24 | ((uint64_t)NrAr_[3]) << 32 |
-				        ((uint64_t)NrAr_[2]) << 40| ((uint64_t)NrAr_[1]) << 48 | ((uint64_t)NrAr_[0]) << 56;
-		} break;
-		case 02: { //RHTS_KEY
-			DbpString("Authenticating using key:");
-			memcpy(key_, htd->crypto.key, 6);
-			Dbhexdump(6, key_, false);
-			key = key_[5] | ((uint64_t)key_[4]) << 8 | ((uint64_t)key_[3]) << 16 | ((uint64_t)key_[2]) << 24 | ((uint64_t)key_[1]) << 32 | ((uint64_t)key_[0]) << 40;
-		} break;
-		default: {
-			Dbprintf("Error , unknown function: %d",htf);
-			return;
-		} break;
-	}
+    //read given key/challenge
+    byte_t NrAr_[8];
+    uint64_t key = 0;
+    uint64_t NrAr = 0;
+    byte_t key_[6];
+    switch (htf) {
+        case 01: { //RHTS_CHALLENGE
+            DbpString("Authenticating using nr,ar pair:");
+            memcpy(NrAr_, htd->auth.NrAr, 8);
+            Dbhexdump(8, NrAr_, false);
+            NrAr = NrAr_[7] | ((uint64_t)NrAr_[6]) << 8 | ((uint64_t)NrAr_[5]) << 16 | ((uint64_t)NrAr_[4]) << 24 | ((uint64_t)NrAr_[3]) << 32 |
+                        ((uint64_t)NrAr_[2]) << 40| ((uint64_t)NrAr_[1]) << 48 | ((uint64_t)NrAr_[0]) << 56;
+        } break;
+        case 02: { //RHTS_KEY
+            DbpString("Authenticating using key:");
+            memcpy(key_, htd->crypto.key, 6);
+            Dbhexdump(6, key_, false);
+            key = key_[5] | ((uint64_t)key_[4]) << 8 | ((uint64_t)key_[3]) << 16 | ((uint64_t)key_[2]) << 24 | ((uint64_t)key_[1]) << 32 | ((uint64_t)key_[0]) << 40;
+        } break;
+        default: {
+            Dbprintf("Error , unknown function: %d",htf);
+            return;
+        } break;
+    }
 
-	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-	// Reset the return status
-	bSuccessful = false;
+    FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
+    // Reset the return status
+    bSuccessful = false;
 
-	// Clean up trace and prepare it for storing frames
-	set_tracing(true);
-	clear_trace();
+    // Clean up trace and prepare it for storing frames
+    set_tracing(true);
+    clear_trace();
 
-	bQuiet = false;
-	bQuitTraceFull = true;
+    bQuiet = false;
+    bQuitTraceFull = true;
 
-	LED_D_ON();
+    LED_D_ON();
 
-	// Configure output and enable pin that is connected to the FPGA (for modulating)
-	AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
-	AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
+    // Configure output and enable pin that is connected to the FPGA (for modulating)
+    AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
+    AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
 
-	// Set fpga in edge detect with reader field, we can modulate as reader now
-	FpgaWriteConfWord(
-	FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_READER_FIELD);
+    // Set fpga in edge detect with reader field, we can modulate as reader now
+    FpgaWriteConfWord(
+    FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_READER_FIELD);
 
-	// Set Frequency divisor which will drive the FPGA and analog mux selection
-	FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95);					//125Khz
-	SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
-	RELAY_OFF();
+    // Set Frequency divisor which will drive the FPGA and analog mux selection
+    FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
+    SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
+    RELAY_OFF();
 
-	// Disable modulation at default, which means enable the field
-	LOW(GPIO_SSC_DOUT);
+    // Disable modulation at default, which means enable the field
+    LOW(GPIO_SSC_DOUT);
 
-	// Give it a bit of time for the resonant antenna to settle.
-	SpinDelay(30);
+    // Give it a bit of time for the resonant antenna to settle.
+    SpinDelay(30);
 
-	// Enable Peripheral Clock for TIMER_CLOCK0, used to measure exact timing before answering
-	AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC0);
+    // Enable Peripheral Clock for TIMER_CLOCK0, used to measure exact timing before answering
+    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC0);
 
-	// Enable Peripheral Clock for TIMER_CLOCK1, used to capture edges of the tag frames
-	AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC1);
-	AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
+    // Enable Peripheral Clock for TIMER_CLOCK1, used to capture edges of the tag frames
+    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC1);
+    AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
 
-	// Disable timer during configuration
-	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
+    // Disable timer during configuration
+    AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 
-	// Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
-	// external trigger rising edge, load RA on falling edge of TIOA.
-	AT91C_BASE_TC1->TC_CMR =
-		AT91C_TC_CLKS_TIMER_DIV1_CLOCK 	|
-		AT91C_TC_ETRGEDG_FALLING 		|
-		AT91C_TC_ABETRG 				|
-		AT91C_TC_LDRA_FALLING;
+    // Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
+    // external trigger rising edge, load RA on falling edge of TIOA.
+    AT91C_BASE_TC1->TC_CMR =
+        AT91C_TC_CLKS_TIMER_DIV1_CLOCK  |
+        AT91C_TC_ETRGEDG_FALLING        |
+        AT91C_TC_ABETRG                 |
+        AT91C_TC_LDRA_FALLING;
 
-	// Enable and reset counters
-	AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
-	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
+    // Enable and reset counters
+    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
+    AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
-	// Reset the received frame, frame count and timing info
-	frame_count = 0;
-	response = 0;
-	lastbit = 1;
-	bStop = false;
+    // Reset the received frame, frame count and timing info
+    frame_count = 0;
+    response = 0;
+    lastbit = 1;
+    bStop = false;
 
-	reset_sof = 1;
-	t_wait = 200;
+    reset_sof = 1;
+    t_wait = 200;
 
-	while (!bStop && !BUTTON_PRESS()) {
-		// Watchdog hit
-		WDT_HIT();
+    while (!bStop && !BUTTON_PRESS()) {
+        // Watchdog hit
+        WDT_HIT();
 
-		// Check if frame was captured and store it
-		if (rxlen > 0) {
-			frame_count++;
-			if (!bQuiet) {
-				if (!LogTraceHitag(rx, rxlen, response, 0, false)) {
-					DbpString("Trace full");
-					if (bQuitTraceFull) {
-						break;
-					} else {
-						bQuiet = true;
-					}
-				}
-			}
-		}
+        // Check if frame was captured and store it
+        if (rxlen > 0) {
+            frame_count++;
+            if (!bQuiet) {
+                if (!LogTraceHitag(rx, rxlen, response, 0, false)) {
+                    DbpString("Trace full");
+                    if (bQuitTraceFull) {
+                        break;
+                    } else {
+                        bQuiet = true;
+                    }
+                }
+            }
+        }
 
-		// By default reset the transmission buffer
-		tx = txbuf;
-		txlen = 0;
+        // By default reset the transmission buffer
+        tx = txbuf;
+        txlen = 0;
 
-		if (rxlen == 0) {
-			//start authentication
-			txlen = 5;
-			memcpy(tx, "\xc0", nbytes(txlen));
-			tag.pstate = HT_READY;
-			tag.tstate = HT_NO_OP;
-		} else if (tag.pstate != HT_SELECTED) {
-			if (hitagS_handle_tag_auth(htf, key,NrAr,rx, rxlen, tx, &txlen) == -1)
-				bStop = !false;
-		}
-		if (tag.pstate == HT_SELECTED && tag.tstate == HT_NO_OP && rxlen > 0) {
-			//send read request
-			tag.tstate = HT_READING_PAGE;
-			txlen = 20;
-			crc = CRC_PRESET;
-			tx[0] = 0xc0 + (sendNum / 16);
-			calc_crc(&crc, tx[0], 8);
-			calc_crc(&crc, 0x00 + ((sendNum % 16) * 16), 4);
-			tx[1] = 0x00 + ((sendNum % 16) * 16) + (crc / 16);
-			tx[2] = 0x00 + (crc % 16) * 16;
-		} else if (tag.pstate == HT_SELECTED && tag.tstate == HT_READING_PAGE
-				&& rxlen > 0) {
-			//save received data
-			z = 0;
-			for (i = 0; i < 5; i++) {
-				for (j = 0; j < 8; j++) {
-					response_bit[z] = 0;
-					if ((rx[i] & ((mask << 7) >> j)) != 0)
-						response_bit[z] = 1;
-					z++;
-				}
-			}
-			k = 0;
-			for (i = 4; i < 36; i++) {
-				pageData[k] = response_bit[i];
-				k++;
-			}
-			for (i = 0; i < 4; i++)
-				tag.pages[sendNum / 4][sendNum % 4] = 0x0;
-			for (i = 0; i < 4; i++) {
-				tag.pages[sendNum / 4][sendNum % 4] += ((pageData[i * 8] << 7)
-						| (pageData[1 + (i * 8)] << 6)
-						| (pageData[2 + (i * 8)] << 5)
-						| (pageData[3 + (i * 8)] << 4)
-						| (pageData[4 + (i * 8)] << 3)
-						| (pageData[5 + (i * 8)] << 2)
-						| (pageData[6 + (i * 8)] << 1) | pageData[7 + (i * 8)])
-						<< (i * 8);
-			}
-			if (tag.auth && tag.LKP && sendNum == 1) {
-				Dbprintf("Page[%2d]: %02X %02X %02X %02X", sendNum, pwdh0,
-						(tag.pages[sendNum / 4][sendNum % 4] >> 16) & 0xff,
-						(tag.pages[sendNum / 4][sendNum % 4] >> 8) & 0xff,
-						tag.pages[sendNum / 4][sendNum % 4] & 0xff);
-			} else {
-				Dbprintf("Page[%2d]: %02X %02X %02X %02X", sendNum,
-						(tag.pages[sendNum / 4][sendNum % 4] >> 24) & 0xff,
-						(tag.pages[sendNum / 4][sendNum % 4] >> 16) & 0xff,
-						(tag.pages[sendNum / 4][sendNum % 4] >> 8) & 0xff,
-						tag.pages[sendNum / 4][sendNum % 4] & 0xff);
-			}
+        if (rxlen == 0) {
+            //start authentication
+            txlen = 5;
+            memcpy(tx, "\xc0", nbytes(txlen));
+            tag.pstate = HT_READY;
+            tag.tstate = HT_NO_OP;
+        } else if (tag.pstate != HT_SELECTED) {
+            if (hitagS_handle_tag_auth(htf, key,NrAr,rx, rxlen, tx, &txlen) == -1)
+                bStop = !false;
+        }
+        if (tag.pstate == HT_SELECTED && tag.tstate == HT_NO_OP && rxlen > 0) {
+            //send read request
+            tag.tstate = HT_READING_PAGE;
+            txlen = 20;
+            crc = CRC_PRESET;
+            tx[0] = 0xc0 + (sendNum / 16);
+            calc_crc(&crc, tx[0], 8);
+            calc_crc(&crc, 0x00 + ((sendNum % 16) * 16), 4);
+            tx[1] = 0x00 + ((sendNum % 16) * 16) + (crc / 16);
+            tx[2] = 0x00 + (crc % 16) * 16;
+        } else if (tag.pstate == HT_SELECTED && tag.tstate == HT_READING_PAGE
+                && rxlen > 0) {
+            //save received data
+            z = 0;
+            for (i = 0; i < 5; i++) {
+                for (j = 0; j < 8; j++) {
+                    response_bit[z] = 0;
+                    if ((rx[i] & ((mask << 7) >> j)) != 0)
+                        response_bit[z] = 1;
+                    z++;
+                }
+            }
+            k = 0;
+            for (i = 4; i < 36; i++) {
+                pageData[k] = response_bit[i];
+                k++;
+            }
+            for (i = 0; i < 4; i++)
+                tag.pages[sendNum / 4][sendNum % 4] = 0x0;
+            for (i = 0; i < 4; i++) {
+                tag.pages[sendNum / 4][sendNum % 4] += ((pageData[i * 8] << 7)
+                        | (pageData[1 + (i * 8)] << 6)
+                        | (pageData[2 + (i * 8)] << 5)
+                        | (pageData[3 + (i * 8)] << 4)
+                        | (pageData[4 + (i * 8)] << 3)
+                        | (pageData[5 + (i * 8)] << 2)
+                        | (pageData[6 + (i * 8)] << 1) | pageData[7 + (i * 8)])
+                        << (i * 8);
+            }
+            if (tag.auth && tag.LKP && sendNum == 1) {
+                Dbprintf("Page[%2d]: %02X %02X %02X %02X", sendNum, pwdh0,
+                        (tag.pages[sendNum / 4][sendNum % 4] >> 16) & 0xff,
+                        (tag.pages[sendNum / 4][sendNum % 4] >> 8) & 0xff,
+                        tag.pages[sendNum / 4][sendNum % 4] & 0xff);
+            } else {
+                Dbprintf("Page[%2d]: %02X %02X %02X %02X", sendNum,
+                        (tag.pages[sendNum / 4][sendNum % 4] >> 24) & 0xff,
+                        (tag.pages[sendNum / 4][sendNum % 4] >> 16) & 0xff,
+                        (tag.pages[sendNum / 4][sendNum % 4] >> 8) & 0xff,
+                        tag.pages[sendNum / 4][sendNum % 4] & 0xff);
+            }
 
-			sendNum++;
-			//display key and password if possible
-			if (sendNum == 2 && tag.auth == 1 && tag.LKP) {
-				if (htf == 02) { //RHTS_KEY
-					Dbprintf("Page[ 2]: %02X %02X %02X %02X",
-							(byte_t)(key >> 8) & 0xff,
-							(byte_t) key & 0xff, pwdl1, pwdl0);
-					Dbprintf("Page[ 3]: %02X %02X %02X %02X",
-							(byte_t)(key >> 40) & 0xff,
-							(byte_t)(key >> 32) & 0xff,
-							(byte_t)(key >> 24) & 0xff,
-							(byte_t)(key >> 16) & 0xff);
-				} else {
-					//if the authentication is done with a challenge the key and password are unknown
-					Dbprintf("Page[ 2]: __ __ __ __");
-					Dbprintf("Page[ 3]: __ __ __ __");
-				}
-			}
+            sendNum++;
+            //display key and password if possible
+            if (sendNum == 2 && tag.auth == 1 && tag.LKP) {
+                if (htf == 02) { //RHTS_KEY
+                    Dbprintf("Page[ 2]: %02X %02X %02X %02X",
+                            (byte_t)(key >> 8) & 0xff,
+                            (byte_t) key & 0xff, pwdl1, pwdl0);
+                    Dbprintf("Page[ 3]: %02X %02X %02X %02X",
+                            (byte_t)(key >> 40) & 0xff,
+                            (byte_t)(key >> 32) & 0xff,
+                            (byte_t)(key >> 24) & 0xff,
+                            (byte_t)(key >> 16) & 0xff);
+                } else {
+                    //if the authentication is done with a challenge the key and password are unknown
+                    Dbprintf("Page[ 2]: __ __ __ __");
+                    Dbprintf("Page[ 3]: __ __ __ __");
+                }
+            }
 
-			txlen = 20;
-			crc = CRC_PRESET;
-			tx[0] = 0xc0 + (sendNum / 16);
-			calc_crc(&crc, tx[0], 8);
-			calc_crc(&crc, 0x00 + ((sendNum % 16) * 16), 4);
-			tx[1] = 0x00 + ((sendNum % 16) * 16) + (crc / 16);
-			tx[2] = 0x00 + (crc % 16) * 16;
-			if (sendNum >= tag.max_page) {
-				bStop = !false;
-			}
-		}
+            txlen = 20;
+            crc = CRC_PRESET;
+            tx[0] = 0xc0 + (sendNum / 16);
+            calc_crc(&crc, tx[0], 8);
+            calc_crc(&crc, 0x00 + ((sendNum % 16) * 16), 4);
+            tx[1] = 0x00 + ((sendNum % 16) * 16) + (crc / 16);
+            tx[2] = 0x00 + (crc % 16) * 16;
+            if (sendNum >= tag.max_page) {
+                bStop = !false;
+            }
+        }
 
-		// Send and store the reader command
-		// Disable timer 1 with external trigger to avoid triggers during our own modulation
-		AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
+        // Send and store the reader command
+        // Disable timer 1 with external trigger to avoid triggers during our own modulation
+        AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 
-		// Wait for HITAG_T_WAIT_2 carrier periods after the last tag bit before transmitting,
-		// Since the clock counts since the last falling edge, a 'one' means that the
-		// falling edge occured halfway the period. with respect to this falling edge,
-		// we need to wait (T_Wait2 + half_tag_period) when the last was a 'one'.
-		// All timer values are in terms of T0 units
+        // Wait for HITAG_T_WAIT_2 carrier periods after the last tag bit before transmitting,
+        // Since the clock counts since the last falling edge, a 'one' means that the
+        // falling edge occured halfway the period. with respect to this falling edge,
+        // we need to wait (T_Wait2 + half_tag_period) when the last was a 'one'.
+        // All timer values are in terms of T0 units
 
-		while (AT91C_BASE_TC0->TC_CV < T0 * (t_wait + (HITAG_T_TAG_HALF_PERIOD * lastbit))) {};
+        while (AT91C_BASE_TC0->TC_CV < T0 * (t_wait + (HITAG_T_TAG_HALF_PERIOD * lastbit))) {};
 
-		// Transmit the reader frame
-		hitag_reader_send_frame(tx, txlen);
+        // Transmit the reader frame
+        hitag_reader_send_frame(tx, txlen);
 
-		// Enable and reset external trigger in timer for capturing future frames
-		AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
+        // Enable and reset external trigger in timer for capturing future frames
+        AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
-		// Add transmitted frame to total count
-		if (txlen > 0) {
-			frame_count++;
-			if (!bQuiet) {
-				// Store the frame in the trace
-				if (!LogTraceHitag(tx, txlen, HITAG_T_WAIT_2, 0, true)) {
-					if (bQuitTraceFull) {
-						DbpString("Trace full");
-						break;
-					} else {
-						bQuiet = true;
-					}
-				}
-			}
-		}
+        // Add transmitted frame to total count
+        if (txlen > 0) {
+            frame_count++;
+            if (!bQuiet) {
+                // Store the frame in the trace
+                if (!LogTraceHitag(tx, txlen, HITAG_T_WAIT_2, 0, true)) {
+                    if (bQuitTraceFull) {
+                        DbpString("Trace full");
+                        break;
+                    } else {
+                        bQuiet = true;
+                    }
+                }
+            }
+        }
 
-		// Reset values for receiving frames
-		memset(rx, 0x00, sizeof(rx));
-		rxlen = 0;
-		lastbit = 1;
-		bSkip = true;
-		tag_sof = reset_sof;
-		response = 0;
+        // Reset values for receiving frames
+        memset(rx, 0x00, sizeof(rx));
+        rxlen = 0;
+        lastbit = 1;
+        bSkip = true;
+        tag_sof = reset_sof;
+        response = 0;
 
-		// Receive frame, watch for at most T0*EOF periods
-		while (AT91C_BASE_TC1->TC_CV < T0 * HITAG_T_WAIT_MAX) {
-			// Check if falling edge in tag modulation is detected
-			if (AT91C_BASE_TC1->TC_SR & AT91C_TC_LDRAS) {
-				// Retrieve the new timing values
-				int ra = (AT91C_BASE_TC1->TC_RA / T0);
+        // Receive frame, watch for at most T0*EOF periods
+        while (AT91C_BASE_TC1->TC_CV < T0 * HITAG_T_WAIT_MAX) {
+            // Check if falling edge in tag modulation is detected
+            if (AT91C_BASE_TC1->TC_SR & AT91C_TC_LDRAS) {
+                // Retrieve the new timing values
+                int ra = (AT91C_BASE_TC1->TC_RA / T0);
 
-				// Reset timer every frame, we have to capture the last edge for timing
-				AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;
+                // Reset timer every frame, we have to capture the last edge for timing
+                AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;
 
-				LED_B_ON();
+                LED_B_ON();
 
-				// Capture tag frame (manchester decoding using only falling edges)
-				if (ra >= HITAG_T_EOF) {
-					if (rxlen != 0) {
-						//DbpString("wierd1?");
-					}
-					// Capture the T0 periods that have passed since last communication or field drop (reset)
-					// We always recieve a 'one' first, which has the falling edge after a half period |-_|
-					response = ra - HITAG_T_TAG_HALF_PERIOD;
-				} else if (ra >= HITAG_T_TAG_CAPTURE_FOUR_HALF) {
-					// Manchester coding example |-_|_-|-_| (101)
-					rx[rxlen / 8] |= 0 << (7 - (rxlen % 8));
-					rxlen++;
-					rx[rxlen / 8] |= 1 << (7 - (rxlen % 8));
-					rxlen++;
-				} else if (ra >= HITAG_T_TAG_CAPTURE_THREE_HALF) {
-					// Manchester coding example |_-|...|_-|-_| (0...01)
-					rx[rxlen / 8] |= 0 << (7 - (rxlen % 8));
-					rxlen++;
-					// We have to skip this half period at start and add the 'one' the second time
-					if (!bSkip) {
-						rx[rxlen / 8] |= 1 << (7 - (rxlen % 8));
-						rxlen++;
-					}
-					lastbit = !lastbit;
-					bSkip = !bSkip;
-				} else if (ra >= HITAG_T_TAG_CAPTURE_TWO_HALF) {
-					// Manchester coding example |_-|_-| (00) or |-_|-_| (11)
-					if (tag_sof) {
-						// Ignore bits that are transmitted during SOF
-						tag_sof--;
-					} else {
-						// bit is same as last bit
-						rx[rxlen / 8] |= lastbit << (7 - (rxlen % 8));
-						rxlen++;
-					}
-				} else {
-					// Ignore wierd value, is to small to mean anything
-				}
-			}
+                // Capture tag frame (manchester decoding using only falling edges)
+                if (ra >= HITAG_T_EOF) {
+                    if (rxlen != 0) {
+                        //DbpString("wierd1?");
+                    }
+                    // Capture the T0 periods that have passed since last communication or field drop (reset)
+                    // We always recieve a 'one' first, which has the falling edge after a half period |-_|
+                    response = ra - HITAG_T_TAG_HALF_PERIOD;
+                } else if (ra >= HITAG_T_TAG_CAPTURE_FOUR_HALF) {
+                    // Manchester coding example |-_|_-|-_| (101)
+                    rx[rxlen / 8] |= 0 << (7 - (rxlen % 8));
+                    rxlen++;
+                    rx[rxlen / 8] |= 1 << (7 - (rxlen % 8));
+                    rxlen++;
+                } else if (ra >= HITAG_T_TAG_CAPTURE_THREE_HALF) {
+                    // Manchester coding example |_-|...|_-|-_| (0...01)
+                    rx[rxlen / 8] |= 0 << (7 - (rxlen % 8));
+                    rxlen++;
+                    // We have to skip this half period at start and add the 'one' the second time
+                    if (!bSkip) {
+                        rx[rxlen / 8] |= 1 << (7 - (rxlen % 8));
+                        rxlen++;
+                    }
+                    lastbit = !lastbit;
+                    bSkip = !bSkip;
+                } else if (ra >= HITAG_T_TAG_CAPTURE_TWO_HALF) {
+                    // Manchester coding example |_-|_-| (00) or |-_|-_| (11)
+                    if (tag_sof) {
+                        // Ignore bits that are transmitted during SOF
+                        tag_sof--;
+                    } else {
+                        // bit is same as last bit
+                        rx[rxlen / 8] |= lastbit << (7 - (rxlen % 8));
+                        rxlen++;
+                    }
+                } else {
+                    // Ignore wierd value, is to small to mean anything
+                }
+            }
 
-			// We can break this loop if we received the last bit from a frame
-			if (AT91C_BASE_TC1->TC_CV > T0 * HITAG_T_EOF) {
-				if (rxlen > 0)
-					break;
-			}
-		}
-	}
-	end = false;
-	LED_B_OFF();
-	LED_D_OFF();
-	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
-	AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+            // We can break this loop if we received the last bit from a frame
+            if (AT91C_BASE_TC1->TC_CV > T0 * HITAG_T_EOF) {
+                if (rxlen > 0)
+                    break;
+            }
+        }
+    }
+    end = false;
+    LED_B_OFF();
+    LED_D_OFF();
+    AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
+    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 
-	cmd_send(CMD_ACK, bSuccessful, 0, 0, 0, 0);
+    cmd_send(CMD_ACK, bSuccessful, 0, 0, 0, 0);
 }
 
 /*
@@ -1506,309 +1506,309 @@ void ReadHitagS(hitag_function htf, hitag_data* htd) {
  * Writes the given 32Bit data into page_
  */
 void WritePageHitagS(hitag_function htf, hitag_data* htd,int page_) {
-	int frame_count;
-	int response;
-	byte_t rx[HITAG_FRAME_LEN];
-	size_t rxlen = 0;
-	byte_t txbuf[HITAG_FRAME_LEN];
-	byte_t* tx = txbuf;
-	size_t txlen = 0;
-	int lastbit;
-	bool bSkip;
-	int reset_sof;
-	int tag_sof;
-	int t_wait = HITAG_T_WAIT_MAX;
-	bool bStop;
-	bool bQuitTraceFull = false;
-	int page = page_;
-	unsigned char crc;
-	byte_t data[4]= {0,0,0,0};
+    int frame_count;
+    int response;
+    byte_t rx[HITAG_FRAME_LEN];
+    size_t rxlen = 0;
+    byte_t txbuf[HITAG_FRAME_LEN];
+    byte_t* tx = txbuf;
+    size_t txlen = 0;
+    int lastbit;
+    bool bSkip;
+    int reset_sof;
+    int tag_sof;
+    int t_wait = HITAG_T_WAIT_MAX;
+    bool bStop;
+    bool bQuitTraceFull = false;
+    int page = page_;
+    unsigned char crc;
+    byte_t data[4]= {0,0,0,0};
 
-	//read given key/challenge, the page and the data
-	byte_t NrAr_[8];
-	uint64_t key=0;
-	uint64_t NrAr=0;
-	byte_t key_[6];
-	switch(htf) {
-		case 03: { //WHTS_CHALLENGE
-			memcpy(data,htd->auth.data,4);
-			DbpString("Authenticating using nr,ar pair:");
-			memcpy(NrAr_,htd->auth.NrAr,8);
-			Dbhexdump(8,NrAr_,false);
-			NrAr=NrAr_[7] | ((uint64_t)NrAr_[6]) << 8 | ((uint64_t)NrAr_[5]) << 16 | ((uint64_t)NrAr_[4]) << 24 | ((uint64_t)NrAr_[3]) << 32 |
-				        ((uint64_t)NrAr_[2]) << 40| ((uint64_t)NrAr_[1]) << 48 | ((uint64_t)NrAr_[0]) << 56;
-		} break;
-		case 04: { //WHTS_KEY
-			memcpy(data,htd->crypto.data,4);
-			DbpString("Authenticating using key:");
-			memcpy(key_,htd->crypto.key,6);
-			Dbhexdump(6,key_,false);
-			key=key_[5] | ((uint64_t)key_[4]) << 8 | ((uint64_t)key_[3]) << 16 | ((uint64_t)key_[2]) << 24 | ((uint64_t)key_[1]) << 32 | ((uint64_t)key_[0]) << 40;
-		} break;
-		default: {
-			Dbprintf("Error , unknown function: %d",htf);
-			return;
-		} break;
-	}
+    //read given key/challenge, the page and the data
+    byte_t NrAr_[8];
+    uint64_t key=0;
+    uint64_t NrAr=0;
+    byte_t key_[6];
+    switch(htf) {
+        case 03: { //WHTS_CHALLENGE
+            memcpy(data,htd->auth.data,4);
+            DbpString("Authenticating using nr,ar pair:");
+            memcpy(NrAr_,htd->auth.NrAr,8);
+            Dbhexdump(8,NrAr_,false);
+            NrAr=NrAr_[7] | ((uint64_t)NrAr_[6]) << 8 | ((uint64_t)NrAr_[5]) << 16 | ((uint64_t)NrAr_[4]) << 24 | ((uint64_t)NrAr_[3]) << 32 |
+                        ((uint64_t)NrAr_[2]) << 40| ((uint64_t)NrAr_[1]) << 48 | ((uint64_t)NrAr_[0]) << 56;
+        } break;
+        case 04: { //WHTS_KEY
+            memcpy(data,htd->crypto.data,4);
+            DbpString("Authenticating using key:");
+            memcpy(key_,htd->crypto.key,6);
+            Dbhexdump(6,key_,false);
+            key=key_[5] | ((uint64_t)key_[4]) << 8 | ((uint64_t)key_[3]) << 16 | ((uint64_t)key_[2]) << 24 | ((uint64_t)key_[1]) << 32 | ((uint64_t)key_[0]) << 40;
+        } break;
+        default: {
+            Dbprintf("Error , unknown function: %d",htf);
+            return;
+        } break;
+    }
 
-	Dbprintf("Page: %d",page_);
-	Dbprintf("DATA: %02X %02X %02X %02X", data[0], data[1], data[2], data[3]);
-	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
+    Dbprintf("Page: %d",page_);
+    Dbprintf("DATA: %02X %02X %02X %02X", data[0], data[1], data[2], data[3]);
+    FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
 // Reset the return status
-	bSuccessful = false;
+    bSuccessful = false;
 
-	tag.pstate = HT_READY;
-	tag.tstate = HT_NO_OP;
+    tag.pstate = HT_READY;
+    tag.tstate = HT_NO_OP;
 
 // Clean up trace and prepare it for storing frames
-	set_tracing(true);
-	clear_trace();
+    set_tracing(true);
+    clear_trace();
 
-	bQuiet = false;
-	bQuitTraceFull = true;
+    bQuiet = false;
+    bQuitTraceFull = true;
 
-	LED_D_ON();
+    LED_D_ON();
 
 // Configure output and enable pin that is connected to the FPGA (for modulating)
-	AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
-	AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
+    AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
+    AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
 
 // Set fpga in edge detect with reader field, we can modulate as reader now
-	FpgaWriteConfWord(
-	FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_READER_FIELD);
+    FpgaWriteConfWord(
+    FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_READER_FIELD);
 
 // Set Frequency divisor which will drive the FPGA and analog mux selection
-	FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
-	SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
-	RELAY_OFF();
+    FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
+    SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
+    RELAY_OFF();
 
 // Disable modulation at default, which means enable the field
-	LOW(GPIO_SSC_DOUT);
+    LOW(GPIO_SSC_DOUT);
 
 // Give it a bit of time for the resonant antenna to settle.
-	SpinDelay(30);
+    SpinDelay(30);
 
 // Enable Peripheral Clock for TIMER_CLOCK0, used to measure exact timing before answering
-	AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC0);
+    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC0);
 
 // Enable Peripheral Clock for TIMER_CLOCK1, used to capture edges of the tag frames
-	AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC1);
-	AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
+    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC1);
+    AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
 
 // Disable timer during configuration
-	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
+    AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 
 // Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
 // external trigger rising edge, load RA on falling edge of TIOA.
-	AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK
-			| AT91C_TC_ETRGEDG_FALLING | AT91C_TC_ABETRG
-			| AT91C_TC_LDRA_FALLING;
+    AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK
+            | AT91C_TC_ETRGEDG_FALLING | AT91C_TC_ABETRG
+            | AT91C_TC_LDRA_FALLING;
 
 // Enable and reset counters
-	AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
-	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
+    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
+    AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
 // Reset the received frame, frame count and timing info
-	frame_count = 0;
-	response = 0;
-	lastbit = 1;
-	bStop = false;
+    frame_count = 0;
+    response = 0;
+    lastbit = 1;
+    bStop = false;
 
-	reset_sof = 1;
-	t_wait = 200;
+    reset_sof = 1;
+    t_wait = 200;
 
-	while (!bStop && !BUTTON_PRESS()) {
-		// Watchdog hit
-		WDT_HIT();
+    while (!bStop && !BUTTON_PRESS()) {
+        // Watchdog hit
+        WDT_HIT();
 
-		// Check if frame was captured and store it
-		if (rxlen > 0) {
-			frame_count++;
-			if (!bQuiet) {
-				if (!LogTraceHitag(rx, rxlen, response, 0, false)) {
-					DbpString("Trace full");
-					if (bQuitTraceFull) {
-						break;
-					} else {
-						bQuiet = true;
-					}
-				}
-			}
-		}
+        // Check if frame was captured and store it
+        if (rxlen > 0) {
+            frame_count++;
+            if (!bQuiet) {
+                if (!LogTraceHitag(rx, rxlen, response, 0, false)) {
+                    DbpString("Trace full");
+                    if (bQuitTraceFull) {
+                        break;
+                    } else {
+                        bQuiet = true;
+                    }
+                }
+            }
+        }
 
-		//check for valid input
-		if (page == 0) {
-			Dbprintf(
-					"usage: lf hitag writer [03 | 04] [CHALLENGE | KEY] [page] [byte0] [byte1] [byte2] [byte3]");
-			bStop = !false;
-		}
+        //check for valid input
+        if (page == 0) {
+            Dbprintf(
+                    "usage: lf hitag writer [03 | 04] [CHALLENGE | KEY] [page] [byte0] [byte1] [byte2] [byte3]");
+            bStop = !false;
+        }
 
-		// By default reset the transmission buffer
-		tx = txbuf;
-		txlen = 0;
+        // By default reset the transmission buffer
+        tx = txbuf;
+        txlen = 0;
 
-		if (rxlen == 0 && tag.tstate == HT_WRITING_PAGE_ACK) {
-			//no write access on this page
-			Dbprintf("no write access on page %d", page_);
-			bStop = !false;
-		} else if (rxlen == 0 && tag.tstate != HT_WRITING_PAGE_DATA) {
-			//start the authetication
-			txlen = 5;
-			memcpy(tx, "\xc0", nbytes(txlen));
-			tag.pstate = HT_READY;
-			tag.tstate = HT_NO_OP;
-		} else if (tag.pstate != HT_SELECTED) {
-			//try to authenticate with the given key or challenge
-			if (hitagS_handle_tag_auth(htf,key,NrAr,rx, rxlen, tx, &txlen) == -1)
-				bStop = !false;
-		}
-		if (tag.pstate == HT_SELECTED && tag.tstate == HT_NO_OP && rxlen > 0) {
-			//check if the given page exists
-			if (page > tag.max_page) {
-				Dbprintf("page number too big");
-				bStop = !false;
-			}
-			//ask Tag for write permission
-			tag.tstate = HT_WRITING_PAGE_ACK;
-			txlen = 20;
-			crc = CRC_PRESET;
-			tx[0] = 0x90 + (page / 16);
-			calc_crc(&crc, tx[0], 8);
-			calc_crc(&crc, 0x00 + ((page % 16) * 16), 4);
-			tx[1] = 0x00 + ((page % 16) * 16) + (crc / 16);
-			tx[2] = 0x00 + (crc % 16) * 16;
-		} else if (tag.pstate == HT_SELECTED && tag.tstate == HT_WRITING_PAGE_ACK
-				&& rxlen == 6 && rx[0] == 0xf4) {
-			//ACK recieved to write the page. send data
-			tag.tstate = HT_WRITING_PAGE_DATA;
-			txlen = 40;
-			crc = CRC_PRESET;
-			calc_crc(&crc, data[3], 8);
-			calc_crc(&crc, data[2], 8);
-			calc_crc(&crc, data[1], 8);
-			calc_crc(&crc, data[0], 8);
-			tx[0] = data[3];
-			tx[1] = data[2];
-			tx[2] = data[1];
-			tx[3] = data[0];
-			tx[4] = crc;
-		} else if (tag.pstate == HT_SELECTED && tag.tstate == HT_WRITING_PAGE_DATA
-				&& rxlen == 6 && rx[0] == 0xf4) {
-			//received ACK
-			Dbprintf("Successful!");
-			bStop = !false;
-		}
+        if (rxlen == 0 && tag.tstate == HT_WRITING_PAGE_ACK) {
+            //no write access on this page
+            Dbprintf("no write access on page %d", page_);
+            bStop = !false;
+        } else if (rxlen == 0 && tag.tstate != HT_WRITING_PAGE_DATA) {
+            //start the authetication
+            txlen = 5;
+            memcpy(tx, "\xc0", nbytes(txlen));
+            tag.pstate = HT_READY;
+            tag.tstate = HT_NO_OP;
+        } else if (tag.pstate != HT_SELECTED) {
+            //try to authenticate with the given key or challenge
+            if (hitagS_handle_tag_auth(htf,key,NrAr,rx, rxlen, tx, &txlen) == -1)
+                bStop = !false;
+        }
+        if (tag.pstate == HT_SELECTED && tag.tstate == HT_NO_OP && rxlen > 0) {
+            //check if the given page exists
+            if (page > tag.max_page) {
+                Dbprintf("page number too big");
+                bStop = !false;
+            }
+            //ask Tag for write permission
+            tag.tstate = HT_WRITING_PAGE_ACK;
+            txlen = 20;
+            crc = CRC_PRESET;
+            tx[0] = 0x90 + (page / 16);
+            calc_crc(&crc, tx[0], 8);
+            calc_crc(&crc, 0x00 + ((page % 16) * 16), 4);
+            tx[1] = 0x00 + ((page % 16) * 16) + (crc / 16);
+            tx[2] = 0x00 + (crc % 16) * 16;
+        } else if (tag.pstate == HT_SELECTED && tag.tstate == HT_WRITING_PAGE_ACK
+                && rxlen == 6 && rx[0] == 0xf4) {
+            //ACK recieved to write the page. send data
+            tag.tstate = HT_WRITING_PAGE_DATA;
+            txlen = 40;
+            crc = CRC_PRESET;
+            calc_crc(&crc, data[3], 8);
+            calc_crc(&crc, data[2], 8);
+            calc_crc(&crc, data[1], 8);
+            calc_crc(&crc, data[0], 8);
+            tx[0] = data[3];
+            tx[1] = data[2];
+            tx[2] = data[1];
+            tx[3] = data[0];
+            tx[4] = crc;
+        } else if (tag.pstate == HT_SELECTED && tag.tstate == HT_WRITING_PAGE_DATA
+                && rxlen == 6 && rx[0] == 0xf4) {
+            //received ACK
+            Dbprintf("Successful!");
+            bStop = !false;
+        }
 
-		// Send and store the reader command
-		// Disable timer 1 with external trigger to avoid triggers during our own modulation
-		AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
+        // Send and store the reader command
+        // Disable timer 1 with external trigger to avoid triggers during our own modulation
+        AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 
-		// Wait for HITAG_T_WAIT_2 carrier periods after the last tag bit before transmitting,
-		// Since the clock counts since the last falling edge, a 'one' means that the
-		// falling edge occured halfway the period. with respect to this falling edge,
-		// we need to wait (T_Wait2 + half_tag_period) when the last was a 'one'.
-		// All timer values are in terms of T0 units
+        // Wait for HITAG_T_WAIT_2 carrier periods after the last tag bit before transmitting,
+        // Since the clock counts since the last falling edge, a 'one' means that the
+        // falling edge occured halfway the period. with respect to this falling edge,
+        // we need to wait (T_Wait2 + half_tag_period) when the last was a 'one'.
+        // All timer values are in terms of T0 units
 
-		while (AT91C_BASE_TC0->TC_CV
-				< T0 * (t_wait + (HITAG_T_TAG_HALF_PERIOD * lastbit)))
-			;
+        while (AT91C_BASE_TC0->TC_CV
+                < T0 * (t_wait + (HITAG_T_TAG_HALF_PERIOD * lastbit)))
+            ;
 
-		// Transmit the reader frame
-		hitag_reader_send_frame(tx, txlen);
+        // Transmit the reader frame
+        hitag_reader_send_frame(tx, txlen);
 
-		// Enable and reset external trigger in timer for capturing future frames
-		AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
+        // Enable and reset external trigger in timer for capturing future frames
+        AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
-		// Add transmitted frame to total count
-		if (txlen > 0) {
-			frame_count++;
-			if (!bQuiet) {
-				// Store the frame in the trace
-				if (!LogTraceHitag(tx, txlen, HITAG_T_WAIT_2, 0, true)) {
-					if (bQuitTraceFull) {
-						DbpString("Trace full");
-						break;
-					} else {
-						bQuiet = true;
-					}
-				}
-			}
-		}
+        // Add transmitted frame to total count
+        if (txlen > 0) {
+            frame_count++;
+            if (!bQuiet) {
+                // Store the frame in the trace
+                if (!LogTraceHitag(tx, txlen, HITAG_T_WAIT_2, 0, true)) {
+                    if (bQuitTraceFull) {
+                        DbpString("Trace full");
+                        break;
+                    } else {
+                        bQuiet = true;
+                    }
+                }
+            }
+        }
 
-		// Reset values for receiving frames
-		memset(rx, 0x00, sizeof(rx));
-		rxlen = 0;
-		lastbit = 1;
-		bSkip = true;
-		tag_sof = reset_sof;
-		response = 0;
+        // Reset values for receiving frames
+        memset(rx, 0x00, sizeof(rx));
+        rxlen = 0;
+        lastbit = 1;
+        bSkip = true;
+        tag_sof = reset_sof;
+        response = 0;
 
-		// Receive frame, watch for at most T0*EOF periods
-		while (AT91C_BASE_TC1->TC_CV < T0 * HITAG_T_WAIT_MAX) {
-			// Check if falling edge in tag modulation is detected
-			if (AT91C_BASE_TC1->TC_SR & AT91C_TC_LDRAS) {
-				// Retrieve the new timing values
-				int ra = (AT91C_BASE_TC1->TC_RA / T0);
+        // Receive frame, watch for at most T0*EOF periods
+        while (AT91C_BASE_TC1->TC_CV < T0 * HITAG_T_WAIT_MAX) {
+            // Check if falling edge in tag modulation is detected
+            if (AT91C_BASE_TC1->TC_SR & AT91C_TC_LDRAS) {
+                // Retrieve the new timing values
+                int ra = (AT91C_BASE_TC1->TC_RA / T0);
 
-				// Reset timer every frame, we have to capture the last edge for timing
-				AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;
+                // Reset timer every frame, we have to capture the last edge for timing
+                AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;
 
-				LED_B_ON();
+                LED_B_ON();
 
-				// Capture tag frame (manchester decoding using only falling edges)
-				if (ra >= HITAG_T_EOF) {
-					if (rxlen != 0) {
-						//DbpString("wierd1?");
-					}
-					// Capture the T0 periods that have passed since last communication or field drop (reset)
-					// We always recieve a 'one' first, which has the falling edge after a half period |-_|
-					response = ra - HITAG_T_TAG_HALF_PERIOD;
-				} else if (ra >= HITAG_T_TAG_CAPTURE_FOUR_HALF) {
-					// Manchester coding example |-_|_-|-_| (101)
-					rx[rxlen / 8] |= 0 << (7 - (rxlen % 8));
-					rxlen++;
-					rx[rxlen / 8] |= 1 << (7 - (rxlen % 8));
-					rxlen++;
-				} else if (ra >= HITAG_T_TAG_CAPTURE_THREE_HALF) {
-					// Manchester coding example |_-|...|_-|-_| (0...01)
-					rx[rxlen / 8] |= 0 << (7 - (rxlen % 8));
-					rxlen++;
-					// We have to skip this half period at start and add the 'one' the second time
-					if (!bSkip) {
-						rx[rxlen / 8] |= 1 << (7 - (rxlen % 8));
-						rxlen++;
-					}
-					lastbit = !lastbit;
-					bSkip = !bSkip;
-				} else if (ra >= HITAG_T_TAG_CAPTURE_TWO_HALF) {
-					// Manchester coding example |_-|_-| (00) or |-_|-_| (11)
-					if (tag_sof) {
-						// Ignore bits that are transmitted during SOF
-						tag_sof--;
-					} else {
-						// bit is same as last bit
-						rx[rxlen / 8] |= lastbit << (7 - (rxlen % 8));
-						rxlen++;
-					}
-				} else {
-					// Ignore wierd value, is to small to mean anything
-				}
-			}
+                // Capture tag frame (manchester decoding using only falling edges)
+                if (ra >= HITAG_T_EOF) {
+                    if (rxlen != 0) {
+                        //DbpString("wierd1?");
+                    }
+                    // Capture the T0 periods that have passed since last communication or field drop (reset)
+                    // We always recieve a 'one' first, which has the falling edge after a half period |-_|
+                    response = ra - HITAG_T_TAG_HALF_PERIOD;
+                } else if (ra >= HITAG_T_TAG_CAPTURE_FOUR_HALF) {
+                    // Manchester coding example |-_|_-|-_| (101)
+                    rx[rxlen / 8] |= 0 << (7 - (rxlen % 8));
+                    rxlen++;
+                    rx[rxlen / 8] |= 1 << (7 - (rxlen % 8));
+                    rxlen++;
+                } else if (ra >= HITAG_T_TAG_CAPTURE_THREE_HALF) {
+                    // Manchester coding example |_-|...|_-|-_| (0...01)
+                    rx[rxlen / 8] |= 0 << (7 - (rxlen % 8));
+                    rxlen++;
+                    // We have to skip this half period at start and add the 'one' the second time
+                    if (!bSkip) {
+                        rx[rxlen / 8] |= 1 << (7 - (rxlen % 8));
+                        rxlen++;
+                    }
+                    lastbit = !lastbit;
+                    bSkip = !bSkip;
+                } else if (ra >= HITAG_T_TAG_CAPTURE_TWO_HALF) {
+                    // Manchester coding example |_-|_-| (00) or |-_|-_| (11)
+                    if (tag_sof) {
+                        // Ignore bits that are transmitted during SOF
+                        tag_sof--;
+                    } else {
+                        // bit is same as last bit
+                        rx[rxlen / 8] |= lastbit << (7 - (rxlen % 8));
+                        rxlen++;
+                    }
+                } else {
+                    // Ignore wierd value, is to small to mean anything
+                }
+            }
 
-			// We can break this loop if we received the last bit from a frame
-			if (AT91C_BASE_TC1->TC_CV > T0 * HITAG_T_EOF) {
-				if (rxlen > 0)
-					break;
-			}
-		}
-	}
-	end=false;
-	LED_B_OFF();
-	LED_D_OFF();
-	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
-	AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	cmd_send(CMD_ACK, bSuccessful, 0, 0, 0, 0);
+            // We can break this loop if we received the last bit from a frame
+            if (AT91C_BASE_TC1->TC_CV > T0 * HITAG_T_EOF) {
+                if (rxlen > 0)
+                    break;
+            }
+        }
+    }
+    end=false;
+    LED_B_OFF();
+    LED_D_OFF();
+    AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
+    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    cmd_send(CMD_ACK, bSuccessful, 0, 0, 0, 0);
 }
 
 /*
@@ -1819,327 +1819,327 @@ void WritePageHitagS(hitag_function htf, hitag_data* htd,int page_) {
  * detects these challenges.
  */
 void check_challenges(bool file_given, byte_t* data) {
-	int i, j, z, k;
-	byte_t uid_byte[4];
-	int frame_count;
-	int response;
-	byte_t rx[HITAG_FRAME_LEN];
-	byte_t unlocker[60][8];
-	int u1 = 0;
-	size_t rxlen = 0;
-	byte_t txbuf[HITAG_FRAME_LEN];
-	byte_t* tx = txbuf;
-	size_t txlen = 0;
-	int lastbit;
-	bool bSkip;
-	int reset_sof;
-	int tag_sof;
-	int t_wait = HITAG_T_WAIT_MAX;
-	int STATE = 0;
-	bool bStop;
-	bool bQuitTraceFull = false;
-	int response_bit[200];
-	unsigned char mask = 1;
-	unsigned char uid[32];
-	unsigned char crc;
+    int i, j, z, k;
+    byte_t uid_byte[4];
+    int frame_count;
+    int response;
+    byte_t rx[HITAG_FRAME_LEN];
+    byte_t unlocker[60][8];
+    int u1 = 0;
+    size_t rxlen = 0;
+    byte_t txbuf[HITAG_FRAME_LEN];
+    byte_t* tx = txbuf;
+    size_t txlen = 0;
+    int lastbit;
+    bool bSkip;
+    int reset_sof;
+    int tag_sof;
+    int t_wait = HITAG_T_WAIT_MAX;
+    int STATE = 0;
+    bool bStop;
+    bool bQuitTraceFull = false;
+    int response_bit[200];
+    unsigned char mask = 1;
+    unsigned char uid[32];
+    unsigned char crc;
 
-	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
+    FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
 // Reset the return status
-	bSuccessful = false;
+    bSuccessful = false;
 
 // Clean up trace and prepare it for storing frames
-	set_tracing(true);
-	clear_trace();
+    set_tracing(true);
+    clear_trace();
 
-	bQuiet = false;
-	bQuitTraceFull = true;
+    bQuiet = false;
+    bQuitTraceFull = true;
 
-	LED_D_ON();
+    LED_D_ON();
 
 // Configure output and enable pin that is connected to the FPGA (for modulating)
-	AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
-	AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
+    AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
+    AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
 
 // Set fpga in edge detect with reader field, we can modulate as reader now
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_READER_FIELD);
-	SpinDelay(50);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_READER_FIELD);
+    SpinDelay(50);
 
 // Set Frequency divisor which will drive the FPGA and analog mux selection
-	FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95);					//125Khz
-	SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
-	RELAY_OFF();
+    FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
+    SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
+    RELAY_OFF();
 
 // Disable modulation at default, which means enable the field
-	LOW(GPIO_SSC_DOUT);
+    LOW(GPIO_SSC_DOUT);
 
 // Give it a bit of time for the resonant antenna to settle.
-	SpinDelay(30);
+    SpinDelay(30);
 
 // Enable Peripheral Clock for TIMER_CLOCK0, used to measure exact timing before answering
-	AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC0);
+    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC0);
 
 // Enable Peripheral Clock for TIMER_CLOCK1, used to capture edges of the tag frames
-	AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC1);
-	AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
+    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC1);
+    AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
 
 // Disable timer during configuration
-	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
+    AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 
 // Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
 // external trigger rising edge, load RA on falling edge of TIOA.
-	AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK
+    AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK
 
-	| AT91C_TC_ETRGEDG_FALLING | AT91C_TC_ABETRG | AT91C_TC_LDRA_FALLING;
+    | AT91C_TC_ETRGEDG_FALLING | AT91C_TC_ABETRG | AT91C_TC_LDRA_FALLING;
 
 // Enable and reset counters
-	AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
-	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
+    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
+    AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
 // Reset the received frame, frame count and timing info
-	frame_count = 0;
-	response = 0;
-	lastbit = 1;
-	bStop = false;
+    frame_count = 0;
+    response = 0;
+    lastbit = 1;
+    bStop = false;
 
-	reset_sof = 1;
-	t_wait = 200;
+    reset_sof = 1;
+    t_wait = 200;
 
-	if (file_given) {
-		DbpString("Loading challenges...");
-		memcpy((byte_t*)unlocker,data,60*8);
-	}
+    if (file_given) {
+        DbpString("Loading challenges...");
+        memcpy((byte_t*)unlocker,data,60*8);
+    }
 
-	while (file_given && !bStop && !BUTTON_PRESS()) {
-		// Watchdog hit
-		WDT_HIT();
+    while (file_given && !bStop && !BUTTON_PRESS()) {
+        // Watchdog hit
+        WDT_HIT();
 
-		// Check if frame was captured and store it
-		if (rxlen > 0) {
-			frame_count++;
-			if (!bQuiet) {
-				if (!LogTraceHitag(rx, rxlen, response, 0, false)) {
-					DbpString("Trace full");
-					if (bQuitTraceFull) {
-						break;
-					} else {
-						bQuiet = true;
-					}
-				}
-			}
-		}
+        // Check if frame was captured and store it
+        if (rxlen > 0) {
+            frame_count++;
+            if (!bQuiet) {
+                if (!LogTraceHitag(rx, rxlen, response, 0, false)) {
+                    DbpString("Trace full");
+                    if (bQuitTraceFull) {
+                        break;
+                    } else {
+                        bQuiet = true;
+                    }
+                }
+            }
+        }
 
-		tx = txbuf;
-		txlen = 0;
-		if (rxlen == 0) {
-			if (STATE == 2)
-				// challenge failed
-				Dbprintf("Challenge failed: %02X %02X %02X %02X %02X %02X %02X %02X",
-						unlocker[u1 - 1][0], unlocker[u1 - 1][1],
-						unlocker[u1 - 1][2], unlocker[u1 - 1][3],
-						unlocker[u1 - 1][4], unlocker[u1 - 1][5],
-						unlocker[u1 - 1][6], unlocker[u1 - 1][7]);
-			STATE = 0;
-			txlen = 5;
-			//start new authentication
-			memcpy(tx, "\xc0", nbytes(txlen));
-		} else if (rxlen >= 67 && STATE == 0) {
-			//received uid
-			z = 0;
-			for (i = 0; i < 10; i++) {
-				for (j = 0; j < 8; j++) {
-					response_bit[z] = 0;
-					if ((rx[i] & ((mask << 7) >> j)) != 0)
-						response_bit[z] = 1;
-					z++;
-				}
-			}
-			k = 0;
-			for (i = 5; i < z; i += 2) {
-				uid[k] = response_bit[i];
-				k++;
-				if (k > 31)
-					break;
-			}
-			uid_byte[0] = (uid[0] << 7) | (uid[1] << 6) | (uid[2] << 5)
-					| (uid[3] << 4) | (uid[4] << 3) | (uid[5] << 2)
-					| (uid[6] << 1) | uid[7];
-			uid_byte[1] = (uid[8] << 7) | (uid[9] << 6) | (uid[10] << 5)
-					| (uid[11] << 4) | (uid[12] << 3) | (uid[13] << 2)
-					| (uid[14] << 1) | uid[15];
-			uid_byte[2] = (uid[16] << 7) | (uid[17] << 6) | (uid[18] << 5)
-					| (uid[19] << 4) | (uid[20] << 3) | (uid[21] << 2)
-					| (uid[22] << 1) | uid[23];
-			uid_byte[3] = (uid[24] << 7) | (uid[25] << 6) | (uid[26] << 5)
-					| (uid[27] << 4) | (uid[28] << 3) | (uid[29] << 2)
-					| (uid[30] << 1) | uid[31];
-			//Dbhexdump(10, rx, rxlen);
-			STATE = 1;
-			txlen = 45;
-			crc = CRC_PRESET;
-			calc_crc(&crc, 0x00, 5);
-			calc_crc(&crc, uid_byte[0], 8);
-			calc_crc(&crc, uid_byte[1], 8);
-			calc_crc(&crc, uid_byte[2], 8);
-			calc_crc(&crc, uid_byte[3], 8);
-			for (i = 0; i < 100; i++) {
-				response_bit[i] = 0;
-			}
-			for (i = 0; i < 5; i++) {
-				response_bit[i] = 0;
-			}
-			for (i = 5; i < 37; i++) {
-				response_bit[i] = uid[i - 5];
-			}
-			for (j = 0; j < 8; j++) {
-				response_bit[i] = 0;
-				if ((crc & ((mask << 7) >> j)) != 0)
-					response_bit[i] = 1;
-				i++;
-			}
-			k = 0;
-			for (i = 0; i < 6; i++) {
-				tx[i] = (response_bit[k] << 7) | (response_bit[k + 1] << 6)
-						| (response_bit[k + 2] << 5)
-						| (response_bit[k + 3] << 4)
-						| (response_bit[k + 4] << 3)
-						| (response_bit[k + 5] << 2)
-						| (response_bit[k + 6] << 1) | response_bit[k + 7];
-				k += 8;
-			}
+        tx = txbuf;
+        txlen = 0;
+        if (rxlen == 0) {
+            if (STATE == 2)
+                // challenge failed
+                Dbprintf("Challenge failed: %02X %02X %02X %02X %02X %02X %02X %02X",
+                        unlocker[u1 - 1][0], unlocker[u1 - 1][1],
+                        unlocker[u1 - 1][2], unlocker[u1 - 1][3],
+                        unlocker[u1 - 1][4], unlocker[u1 - 1][5],
+                        unlocker[u1 - 1][6], unlocker[u1 - 1][7]);
+            STATE = 0;
+            txlen = 5;
+            //start new authentication
+            memcpy(tx, "\xc0", nbytes(txlen));
+        } else if (rxlen >= 67 && STATE == 0) {
+            //received uid
+            z = 0;
+            for (i = 0; i < 10; i++) {
+                for (j = 0; j < 8; j++) {
+                    response_bit[z] = 0;
+                    if ((rx[i] & ((mask << 7) >> j)) != 0)
+                        response_bit[z] = 1;
+                    z++;
+                }
+            }
+            k = 0;
+            for (i = 5; i < z; i += 2) {
+                uid[k] = response_bit[i];
+                k++;
+                if (k > 31)
+                    break;
+            }
+            uid_byte[0] = (uid[0] << 7) | (uid[1] << 6) | (uid[2] << 5)
+                    | (uid[3] << 4) | (uid[4] << 3) | (uid[5] << 2)
+                    | (uid[6] << 1) | uid[7];
+            uid_byte[1] = (uid[8] << 7) | (uid[9] << 6) | (uid[10] << 5)
+                    | (uid[11] << 4) | (uid[12] << 3) | (uid[13] << 2)
+                    | (uid[14] << 1) | uid[15];
+            uid_byte[2] = (uid[16] << 7) | (uid[17] << 6) | (uid[18] << 5)
+                    | (uid[19] << 4) | (uid[20] << 3) | (uid[21] << 2)
+                    | (uid[22] << 1) | uid[23];
+            uid_byte[3] = (uid[24] << 7) | (uid[25] << 6) | (uid[26] << 5)
+                    | (uid[27] << 4) | (uid[28] << 3) | (uid[29] << 2)
+                    | (uid[30] << 1) | uid[31];
+            //Dbhexdump(10, rx, rxlen);
+            STATE = 1;
+            txlen = 45;
+            crc = CRC_PRESET;
+            calc_crc(&crc, 0x00, 5);
+            calc_crc(&crc, uid_byte[0], 8);
+            calc_crc(&crc, uid_byte[1], 8);
+            calc_crc(&crc, uid_byte[2], 8);
+            calc_crc(&crc, uid_byte[3], 8);
+            for (i = 0; i < 100; i++) {
+                response_bit[i] = 0;
+            }
+            for (i = 0; i < 5; i++) {
+                response_bit[i] = 0;
+            }
+            for (i = 5; i < 37; i++) {
+                response_bit[i] = uid[i - 5];
+            }
+            for (j = 0; j < 8; j++) {
+                response_bit[i] = 0;
+                if ((crc & ((mask << 7) >> j)) != 0)
+                    response_bit[i] = 1;
+                i++;
+            }
+            k = 0;
+            for (i = 0; i < 6; i++) {
+                tx[i] = (response_bit[k] << 7) | (response_bit[k + 1] << 6)
+                        | (response_bit[k + 2] << 5)
+                        | (response_bit[k + 3] << 4)
+                        | (response_bit[k + 4] << 3)
+                        | (response_bit[k + 5] << 2)
+                        | (response_bit[k + 6] << 1) | response_bit[k + 7];
+                k += 8;
+            }
 
-		} else if (STATE == 1 && rxlen == 44) {
-			//received configuration
-			STATE = 2;
-			z = 0;
-			for (i = 0; i < 6; i++) {
-				for (j = 0; j < 8; j++) {
-					response_bit[z] = 0;
-					if ((rx[i] & ((mask << 7) >> j)) != 0)
-						response_bit[z] = 1;
-					z++;
-				}
-			}
-			txlen = 64;
+        } else if (STATE == 1 && rxlen == 44) {
+            //received configuration
+            STATE = 2;
+            z = 0;
+            for (i = 0; i < 6; i++) {
+                for (j = 0; j < 8; j++) {
+                    response_bit[z] = 0;
+                    if ((rx[i] & ((mask << 7) >> j)) != 0)
+                        response_bit[z] = 1;
+                    z++;
+                }
+            }
+            txlen = 64;
 
-			if (u1 >= (sizeof(unlocker) / sizeof(unlocker[0])))
-				bStop = !false;
-			for (i = 0; i < 8; i++)
-				tx[i] = unlocker[u1][i];
-			u1++;
+            if (u1 >= (sizeof(unlocker) / sizeof(unlocker[0])))
+                bStop = !false;
+            for (i = 0; i < 8; i++)
+                tx[i] = unlocker[u1][i];
+            u1++;
 
-		} else if (STATE == 2 && rxlen >= 44) {
-			STATE = 0;
-		}
+        } else if (STATE == 2 && rxlen >= 44) {
+            STATE = 0;
+        }
 
-		// Send and store the reader command
-		// Disable timer 1 with external trigger to avoid triggers during our own modulation
-		AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
+        // Send and store the reader command
+        // Disable timer 1 with external trigger to avoid triggers during our own modulation
+        AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 
-		// Wait for HITAG_T_WAIT_2 carrier periods after the last tag bit before transmitting,
-		// Since the clock counts since the last falling edge, a 'one' means that the
-		// falling edge occured halfway the period. with respect to this falling edge,
-		// we need to wait (T_Wait2 + half_tag_period) when the last was a 'one'.
-		// All timer values are in terms of T0 units
+        // Wait for HITAG_T_WAIT_2 carrier periods after the last tag bit before transmitting,
+        // Since the clock counts since the last falling edge, a 'one' means that the
+        // falling edge occured halfway the period. with respect to this falling edge,
+        // we need to wait (T_Wait2 + half_tag_period) when the last was a 'one'.
+        // All timer values are in terms of T0 units
 
-		while (AT91C_BASE_TC0->TC_CV
-				< T0 * (t_wait + (HITAG_T_TAG_HALF_PERIOD * lastbit)))
-			;
+        while (AT91C_BASE_TC0->TC_CV
+                < T0 * (t_wait + (HITAG_T_TAG_HALF_PERIOD * lastbit)))
+            ;
 
-		// Transmit the reader frame
-		hitag_reader_send_frame(tx, txlen);
+        // Transmit the reader frame
+        hitag_reader_send_frame(tx, txlen);
 
-		// Enable and reset external trigger in timer for capturing future frames
-		AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
+        // Enable and reset external trigger in timer for capturing future frames
+        AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
-		// Add transmitted frame to total count
-		if (txlen > 0) {
-			frame_count++;
-			if (!bQuiet) {
-				// Store the frame in the trace
-				if (!LogTraceHitag(tx, txlen, HITAG_T_WAIT_2, 0, true)) {
-					if (bQuitTraceFull) {
-						DbpString("Trace full");
-						break;
-					} else {
-						bQuiet = true;
-					}
-				}
-			}
-		}
+        // Add transmitted frame to total count
+        if (txlen > 0) {
+            frame_count++;
+            if (!bQuiet) {
+                // Store the frame in the trace
+                if (!LogTraceHitag(tx, txlen, HITAG_T_WAIT_2, 0, true)) {
+                    if (bQuitTraceFull) {
+                        DbpString("Trace full");
+                        break;
+                    } else {
+                        bQuiet = true;
+                    }
+                }
+            }
+        }
 
-		// Reset values for receiving frames
-		memset(rx, 0x00, sizeof(rx));
-		rxlen = 0;
-		lastbit = 1;
-		bSkip = true;
-		tag_sof = reset_sof;
-		response = 0;
+        // Reset values for receiving frames
+        memset(rx, 0x00, sizeof(rx));
+        rxlen = 0;
+        lastbit = 1;
+        bSkip = true;
+        tag_sof = reset_sof;
+        response = 0;
 
-		// Receive frame, watch for at most T0*EOF periods
-		while (AT91C_BASE_TC1->TC_CV < T0 * HITAG_T_WAIT_MAX) {
-			// Check if falling edge in tag modulation is detected
-			if (AT91C_BASE_TC1->TC_SR & AT91C_TC_LDRAS) {
-				// Retrieve the new timing values
-				int ra = (AT91C_BASE_TC1->TC_RA / T0);
+        // Receive frame, watch for at most T0*EOF periods
+        while (AT91C_BASE_TC1->TC_CV < T0 * HITAG_T_WAIT_MAX) {
+            // Check if falling edge in tag modulation is detected
+            if (AT91C_BASE_TC1->TC_SR & AT91C_TC_LDRAS) {
+                // Retrieve the new timing values
+                int ra = (AT91C_BASE_TC1->TC_RA / T0);
 
-				// Reset timer every frame, we have to capture the last edge for timing
-				AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;
+                // Reset timer every frame, we have to capture the last edge for timing
+                AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;
 
-				LED_B_ON();
+                LED_B_ON();
 
-				// Capture tag frame (manchester decoding using only falling edges)
-				if (ra >= HITAG_T_EOF) {
-					if (rxlen != 0) {
-						//DbpString("wierd1?");
-					}
-					// Capture the T0 periods that have passed since last communication or field drop (reset)
-					// We always recieve a 'one' first, which has the falling edge after a half period |-_|
-					response = ra - HITAG_T_TAG_HALF_PERIOD;
-				} else if (ra >= HITAG_T_TAG_CAPTURE_FOUR_HALF) {
-					// Manchester coding example |-_|_-|-_| (101)
-					rx[rxlen / 8] |= 0 << (7 - (rxlen % 8));
-					rxlen++;
-					rx[rxlen / 8] |= 1 << (7 - (rxlen % 8));
-					rxlen++;
-				} else if (ra >= HITAG_T_TAG_CAPTURE_THREE_HALF) {
-					// Manchester coding example |_-|...|_-|-_| (0...01)
-					rx[rxlen / 8] |= 0 << (7 - (rxlen % 8));
-					rxlen++;
-					// We have to skip this half period at start and add the 'one' the second time
-					if (!bSkip) {
-						rx[rxlen / 8] |= 1 << (7 - (rxlen % 8));
-						rxlen++;
-					}
-					lastbit = !lastbit;
-					bSkip = !bSkip;
-				} else if (ra >= HITAG_T_TAG_CAPTURE_TWO_HALF) {
-					// Manchester coding example |_-|_-| (00) or |-_|-_| (11)
-					if (tag_sof) {
-						// Ignore bits that are transmitted during SOF
-						tag_sof--;
-					} else {
-						// bit is same as last bit
-						rx[rxlen / 8] |= lastbit << (7 - (rxlen % 8));
-						rxlen++;
-					}
-				} else {
-					// Ignore wierd value, is to small to mean anything
-				}
-			}
+                // Capture tag frame (manchester decoding using only falling edges)
+                if (ra >= HITAG_T_EOF) {
+                    if (rxlen != 0) {
+                        //DbpString("wierd1?");
+                    }
+                    // Capture the T0 periods that have passed since last communication or field drop (reset)
+                    // We always recieve a 'one' first, which has the falling edge after a half period |-_|
+                    response = ra - HITAG_T_TAG_HALF_PERIOD;
+                } else if (ra >= HITAG_T_TAG_CAPTURE_FOUR_HALF) {
+                    // Manchester coding example |-_|_-|-_| (101)
+                    rx[rxlen / 8] |= 0 << (7 - (rxlen % 8));
+                    rxlen++;
+                    rx[rxlen / 8] |= 1 << (7 - (rxlen % 8));
+                    rxlen++;
+                } else if (ra >= HITAG_T_TAG_CAPTURE_THREE_HALF) {
+                    // Manchester coding example |_-|...|_-|-_| (0...01)
+                    rx[rxlen / 8] |= 0 << (7 - (rxlen % 8));
+                    rxlen++;
+                    // We have to skip this half period at start and add the 'one' the second time
+                    if (!bSkip) {
+                        rx[rxlen / 8] |= 1 << (7 - (rxlen % 8));
+                        rxlen++;
+                    }
+                    lastbit = !lastbit;
+                    bSkip = !bSkip;
+                } else if (ra >= HITAG_T_TAG_CAPTURE_TWO_HALF) {
+                    // Manchester coding example |_-|_-| (00) or |-_|-_| (11)
+                    if (tag_sof) {
+                        // Ignore bits that are transmitted during SOF
+                        tag_sof--;
+                    } else {
+                        // bit is same as last bit
+                        rx[rxlen / 8] |= lastbit << (7 - (rxlen % 8));
+                        rxlen++;
+                    }
+                } else {
+                    // Ignore wierd value, is to small to mean anything
+                }
+            }
 
-			// We can break this loop if we received the last bit from a frame
-			if (AT91C_BASE_TC1->TC_CV > T0 * HITAG_T_EOF) {
-				if (rxlen > 0)
-					break;
-			}
-		}
-	}
-	LED_B_OFF();
-	LED_D_OFF();
-	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
-	AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	cmd_send(CMD_ACK, bSuccessful, 0, 0, 0, 0);
+            // We can break this loop if we received the last bit from a frame
+            if (AT91C_BASE_TC1->TC_CV > T0 * HITAG_T_EOF) {
+                if (rxlen > 0)
+                    break;
+            }
+        }
+    }
+    LED_B_OFF();
+    LED_D_OFF();
+    AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
+    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    cmd_send(CMD_ACK, bSuccessful, 0, 0, 0, 0);
 }
 
 
diff --git a/armsrc/iclass.c b/armsrc/iclass.c
index af85c18fc..7b529a999 100644
--- a/armsrc/iclass.c
+++ b/armsrc/iclass.c
@@ -61,10 +61,10 @@ int doIClassSimulation(int simulationMode, uint8_t *reader_mac_buf);
 // The length of a received command will in most cases be no more than 18 bytes.
 // 32 should be enough!
 #ifndef ICLASS_BUFFER_SIZE
-	#define ICLASS_BUFFER_SIZE 32
+    #define ICLASS_BUFFER_SIZE 32
 #endif
 
-#define AddCrc(data, len)		compute_crc(CRC_ICLASS, (data), (len), (data)+(len), (data)+(len)+1)
+#define AddCrc(data, len) compute_crc(CRC_ICLASS, (data), (len), (data)+(len), (data)+(len)+1)
 
 //-----------------------------------------------------------------------------
 // The software UART that receives commands from the reader, and its state
@@ -75,7 +75,7 @@ typedef struct {
     enum {
         STATE_UNSYNCD,
         STATE_START_OF_COMMUNICATION,
-		STATE_RECEIVING
+        STATE_RECEIVING
     }       state;
     uint16_t    shiftReg;
     int     bitCnt;
@@ -97,33 +97,33 @@ typedef struct {
 typedef struct {
     enum {
         DEMOD_UNSYNCD,
-		DEMOD_START_OF_COMMUNICATION,
-		DEMOD_START_OF_COMMUNICATION2,
-		DEMOD_START_OF_COMMUNICATION3,
-		DEMOD_SOF_COMPLETE,
-		DEMOD_MANCHESTER_D,
-		DEMOD_MANCHESTER_E,
-		DEMOD_END_OF_COMMUNICATION,
-		DEMOD_END_OF_COMMUNICATION2,
-		DEMOD_MANCHESTER_F,
+        DEMOD_START_OF_COMMUNICATION,
+        DEMOD_START_OF_COMMUNICATION2,
+        DEMOD_START_OF_COMMUNICATION3,
+        DEMOD_SOF_COMPLETE,
+        DEMOD_MANCHESTER_D,
+        DEMOD_MANCHESTER_E,
+        DEMOD_END_OF_COMMUNICATION,
+        DEMOD_END_OF_COMMUNICATION2,
+        DEMOD_MANCHESTER_F,
         DEMOD_ERROR_WAIT
     }       state;
     int     bitCount;
     int     posCount;
-	int     syncBit;
+    int     syncBit;
     uint16_t    shiftReg;
-	uint32_t buffer;
-	uint32_t buffer2;
-	uint32_t buffer3;
-	int     buff;
-	int     samples;
+    uint32_t buffer;
+    uint32_t buffer2;
+    uint32_t buffer3;
+    int     buff;
+    int     samples;
     int     len;
-	enum {
-		SUB_NONE,
-		SUB_FIRST_HALF,
-		SUB_SECOND_HALF,
-		SUB_BOTH
-	}		sub;
+    enum {
+        SUB_NONE,
+        SUB_FIRST_HALF,
+        SUB_SECOND_HALF,
+        SUB_BOTH
+    } sub;
     uint8_t   *output;
 } tDemod;
 
@@ -133,22 +133,22 @@ typedef struct {
 */
 // Static vars for UART
 typedef struct {
-	bool synced;
-	bool frame;
-	bool frame_done;
-	uint8_t *buf;
-	int len;
+    bool synced;
+    bool frame;
+    bool frame_done;
+    uint8_t *buf;
+    int len;
 } tUart;
 static tUart Uart;
 
 static void uart_reset(void){
-	Uart.frame_done = false;
-	Uart.synced = false;
-	Uart.frame = false;
+    Uart.frame_done = false;
+    Uart.synced = false;
+    Uart.frame = false;
 }
 static void uart_init(uint8_t *data){
-	Uart.buf = data;
-	uart_reset();
+    Uart.buf = data;
+    uart_reset();
 }
 static void uart_bit(uint8_t bit) {
     static uint8_t buf = 0xff;
@@ -159,7 +159,7 @@ static void uart_bit(uint8_t bit) {
     buf |= bit ? 1 : 0;
 
     if (!Uart.frame) {
-        if (buf == 0x7b) {	// 0b0111 1011
+        if (buf == 0x7b) { // 0b0111 1011
             Uart.frame = true;
             n_buf = 0;
             Uart.len = 0;
@@ -188,7 +188,7 @@ static void uart_bit(uint8_t bit) {
                     break;
                 default:
                     Uart.frame = false;
-					Uart.synced = false;
+                    Uart.synced = false;
                     Dbprintf("[-] bad %02X at %d:%d", buf, Uart.len, nmsg_byte);
             }
 
@@ -255,8 +255,8 @@ again:
 
 /*
 static void UartReset(){
-	Uart.state = STATE_UNSYNCD;
-	Uart.shiftReg = 0;
+    Uart.state = STATE_UNSYNCD;
+    Uart.shiftReg = 0;
     Uart.bitCnt = 0;
     Uart.byteCnt = 0;
     Uart.posCnt = 0;
@@ -279,220 +279,220 @@ static void UartReset(){
 */
 /*
 static RAMFUNC int OutOfNDecoding(int bit) {
-	//int error = 0;
-	int bitright;
+    //int error = 0;
+    int bitright;
 
-	if (!Uart.bitBuffer) {
-		Uart.bitBuffer = bit ^ 0xFF0;
-		return false;
-	} else {
-		Uart.bitBuffer <<= 4;
-		Uart.bitBuffer ^= bit;
-	}
+    if (!Uart.bitBuffer) {
+        Uart.bitBuffer = bit ^ 0xFF0;
+        return false;
+    } else {
+        Uart.bitBuffer <<= 4;
+        Uart.bitBuffer ^= bit;
+    }
 
-	// if (Uart.swapper) {
-	//	Uart.output[Uart.byteCnt] = Uart.bitBuffer & 0xFF;
-	//	Uart.byteCnt++;
-	//	Uart.swapper = 0;
-	//	if (Uart.byteCnt > 15) return true;
-	//}
-	//else {
-	//	Uart.swapper = 1;
-	//}
+    // if (Uart.swapper) {
+    //    Uart.output[Uart.byteCnt] = Uart.bitBuffer & 0xFF;
+    //    Uart.byteCnt++;
+    //    Uart.swapper = 0;
+    //    if (Uart.byteCnt > 15) return true;
+    // }
+    // else {
+    //    Uart.swapper = 1;
+    // }
 
-	if (Uart.state != STATE_UNSYNCD) {
-		Uart.posCnt++;
+    if (Uart.state != STATE_UNSYNCD) {
+        Uart.posCnt++;
 
-		if ((Uart.bitBuffer & Uart.syncBit) ^ Uart.syncBit)
-			bit = 0;
-		else
-			bit = 1;
+        if ((Uart.bitBuffer & Uart.syncBit) ^ Uart.syncBit)
+            bit = 0;
+        else
+            bit = 1;
 
-		if (((Uart.bitBuffer << 1) & Uart.syncBit) ^ Uart.syncBit)
-			bitright = 0;
-		else
-			bitright = 1;
+        if (((Uart.bitBuffer << 1) & Uart.syncBit) ^ Uart.syncBit)
+            bitright = 0;
+        else
+            bitright = 1;
 
-		if(bit != bitright)
-			bit = bitright;
+        if(bit != bitright)
+            bit = bitright;
 
 
-		// So, now we only have to deal with *bit*, lets see...
-		if (Uart.posCnt == 1) {
-			// measurement first half bitperiod
-			if (!bit) {
-				// Drop in first half means that we are either seeing
-				// an SOF or an EOF.
+        // So, now we only have to deal with *bit*, lets see...
+        if (Uart.posCnt == 1) {
+            // measurement first half bitperiod
+            if (!bit) {
+                // Drop in first half means that we are either seeing
+                // an SOF or an EOF.
 
-				if (Uart.nOutOfCnt == 1) {
-					// End of Communication
-					Uart.state = STATE_UNSYNCD;
-					Uart.highCnt = 0;
-					if (Uart.byteCnt == 0) {
-						// Its not straightforward to show single EOFs
-						// So just leave it and do not return TRUE
-						Uart.output[0] = 0xf0;
-						Uart.byteCnt++;
-					} else {
-						return true;
-					}
-				} else if (Uart.state != STATE_START_OF_COMMUNICATION) {
-					// When not part of SOF or EOF, it is an error
-					Uart.state = STATE_UNSYNCD;
-					Uart.highCnt = 0;
-					//error = 4;
-				}
-			}
-		} else {
-			// measurement second half bitperiod
-			// Count the bitslot we are in... (ISO 15693)
-			Uart.nOutOfCnt++;
+                if (Uart.nOutOfCnt == 1) {
+                    // End of Communication
+                    Uart.state = STATE_UNSYNCD;
+                    Uart.highCnt = 0;
+                    if (Uart.byteCnt == 0) {
+                        // Its not straightforward to show single EOFs
+                        // So just leave it and do not return TRUE
+                        Uart.output[0] = 0xf0;
+                        Uart.byteCnt++;
+                    } else {
+                        return true;
+                    }
+                } else if (Uart.state != STATE_START_OF_COMMUNICATION) {
+                    // When not part of SOF or EOF, it is an error
+                    Uart.state = STATE_UNSYNCD;
+                    Uart.highCnt = 0;
+                    //error = 4;
+                }
+            }
+        } else {
+            // measurement second half bitperiod
+            // Count the bitslot we are in... (ISO 15693)
+            Uart.nOutOfCnt++;
 
-			if (!bit) {
-				if (Uart.dropPosition) {
-					if (Uart.state == STATE_START_OF_COMMUNICATION) {
-						//error = 1;
-					} else {
-						//error = 7;
-					}
-					// It is an error if we already have seen a drop in current frame
-					Uart.state = STATE_UNSYNCD;
-					Uart.highCnt = 0;
-				} else {
-					Uart.dropPosition = Uart.nOutOfCnt;
-				}
-			}
-			Uart.posCnt = 0;
+            if (!bit) {
+                if (Uart.dropPosition) {
+                    if (Uart.state == STATE_START_OF_COMMUNICATION) {
+                        //error = 1;
+                    } else {
+                        //error = 7;
+                    }
+                    // It is an error if we already have seen a drop in current frame
+                    Uart.state = STATE_UNSYNCD;
+                    Uart.highCnt = 0;
+                } else {
+                    Uart.dropPosition = Uart.nOutOfCnt;
+                }
+            }
+            Uart.posCnt = 0;
 
-			if (Uart.nOutOfCnt == Uart.OutOfCnt && Uart.OutOfCnt == 4) {
-				Uart.nOutOfCnt = 0;
+            if (Uart.nOutOfCnt == Uart.OutOfCnt && Uart.OutOfCnt == 4) {
+                Uart.nOutOfCnt = 0;
 
-				if (Uart.state == STATE_START_OF_COMMUNICATION) {
-					if (Uart.dropPosition == 4) {
-						Uart.state = STATE_RECEIVING;
-						Uart.OutOfCnt = 256;
-					} else if (Uart.dropPosition == 3) {
-						Uart.state = STATE_RECEIVING;
-						Uart.OutOfCnt = 4;
-						//Uart.output[Uart.byteCnt] = 0xdd;
-						//Uart.byteCnt++;
-					} else {
-						Uart.state = STATE_UNSYNCD;
-						Uart.highCnt = 0;
-					}
-					Uart.dropPosition = 0;
-				} else {
-					// RECEIVING DATA
-					// 1 out of 4
-					if (!Uart.dropPosition) {
-						Uart.state = STATE_UNSYNCD;
-						Uart.highCnt = 0;
-						//error = 9;
-					} else {
-						Uart.shiftReg >>= 2;
+                if (Uart.state == STATE_START_OF_COMMUNICATION) {
+                    if (Uart.dropPosition == 4) {
+                        Uart.state = STATE_RECEIVING;
+                        Uart.OutOfCnt = 256;
+                    } else if (Uart.dropPosition == 3) {
+                        Uart.state = STATE_RECEIVING;
+                        Uart.OutOfCnt = 4;
+                        //Uart.output[Uart.byteCnt] = 0xdd;
+                        //Uart.byteCnt++;
+                    } else {
+                        Uart.state = STATE_UNSYNCD;
+                        Uart.highCnt = 0;
+                    }
+                    Uart.dropPosition = 0;
+                } else {
+                    // RECEIVING DATA
+                    // 1 out of 4
+                    if (!Uart.dropPosition) {
+                        Uart.state = STATE_UNSYNCD;
+                        Uart.highCnt = 0;
+                        //error = 9;
+                    } else {
+                        Uart.shiftReg >>= 2;
 
-						// Swap bit order
-						Uart.dropPosition--;
-						//if(Uart.dropPosition == 1) { Uart.dropPosition = 2; }
-						//else if(Uart.dropPosition == 2) { Uart.dropPosition = 1; }
+                        // Swap bit order
+                        Uart.dropPosition--;
+                        //if(Uart.dropPosition == 1) { Uart.dropPosition = 2; }
+                        //else if(Uart.dropPosition == 2) { Uart.dropPosition = 1; }
 
-						Uart.shiftReg ^= ((Uart.dropPosition & 0x03) << 6);
-						Uart.bitCnt += 2;
-						Uart.dropPosition = 0;
+                        Uart.shiftReg ^= ((Uart.dropPosition & 0x03) << 6);
+                        Uart.bitCnt += 2;
+                        Uart.dropPosition = 0;
 
-						if (Uart.bitCnt == 8) {
-							Uart.output[Uart.byteCnt] = (Uart.shiftReg & 0xff);
-							Uart.byteCnt++;
-							Uart.bitCnt = 0;
-							Uart.shiftReg = 0;
-						}
-					}
-				}
-			} else if (Uart.nOutOfCnt == Uart.OutOfCnt) {
-				// RECEIVING DATA
-				// 1 out of 256
-				if (!Uart.dropPosition) {
-					Uart.state = STATE_UNSYNCD;
-					Uart.highCnt = 0;
-					//error = 3;
-				} else {
-					Uart.dropPosition--;
-					Uart.output[Uart.byteCnt] = (Uart.dropPosition & 0xff);
-					Uart.byteCnt++;
-					Uart.bitCnt = 0;
-					Uart.shiftReg = 0;
-					Uart.nOutOfCnt = 0;
-					Uart.dropPosition = 0;
-				}
-			}
+                        if (Uart.bitCnt == 8) {
+                            Uart.output[Uart.byteCnt] = (Uart.shiftReg & 0xff);
+                            Uart.byteCnt++;
+                            Uart.bitCnt = 0;
+                            Uart.shiftReg = 0;
+                        }
+                    }
+                }
+            } else if (Uart.nOutOfCnt == Uart.OutOfCnt) {
+                // RECEIVING DATA
+                // 1 out of 256
+                if (!Uart.dropPosition) {
+                    Uart.state = STATE_UNSYNCD;
+                    Uart.highCnt = 0;
+                    //error = 3;
+                } else {
+                    Uart.dropPosition--;
+                    Uart.output[Uart.byteCnt] = (Uart.dropPosition & 0xff);
+                    Uart.byteCnt++;
+                    Uart.bitCnt = 0;
+                    Uart.shiftReg = 0;
+                    Uart.nOutOfCnt = 0;
+                    Uart.dropPosition = 0;
+                }
+            }
 */
-			/*if (error) {
-				Uart.output[Uart.byteCnt] = 0xAA;
-				Uart.byteCnt++;
-				Uart.output[Uart.byteCnt] = error & 0xFF;
-				Uart.byteCnt++;
-				Uart.output[Uart.byteCnt] = 0xAA;
-				Uart.byteCnt++;
-				Uart.output[Uart.byteCnt] = (Uart.bitBuffer >> 8) & 0xFF;
-				Uart.byteCnt++;
-				Uart.output[Uart.byteCnt] = Uart.bitBuffer & 0xFF;
-				Uart.byteCnt++;
-				Uart.output[Uart.byteCnt] = (Uart.syncBit >> 3) & 0xFF;
-				Uart.byteCnt++;
-				Uart.output[Uart.byteCnt] = 0xAA;
-				Uart.byteCnt++;
-				return true;
-			}*/
+            /*if (error) {
+                Uart.output[Uart.byteCnt] = 0xAA;
+                Uart.byteCnt++;
+                Uart.output[Uart.byteCnt] = error & 0xFF;
+                Uart.byteCnt++;
+                Uart.output[Uart.byteCnt] = 0xAA;
+                Uart.byteCnt++;
+                Uart.output[Uart.byteCnt] = (Uart.bitBuffer >> 8) & 0xFF;
+                Uart.byteCnt++;
+                Uart.output[Uart.byteCnt] = Uart.bitBuffer & 0xFF;
+                Uart.byteCnt++;
+                Uart.output[Uart.byteCnt] = (Uart.syncBit >> 3) & 0xFF;
+                Uart.byteCnt++;
+                Uart.output[Uart.byteCnt] = 0xAA;
+                Uart.byteCnt++;
+                return true;
+            }*/
 /*
-		}
-	} else {
-		bit = Uart.bitBuffer & 0xf0;
-		bit >>= 4;
-		bit ^= 0x0F; // drops become 1s ;-)
-		if (bit) {
-			// should have been high or at least (4 * 128) / fc
-			// according to ISO this should be at least (9 * 128 + 20) / fc
-			if (Uart.highCnt == 8) {
-				// we went low, so this could be start of communication
-				// it turns out to be safer to choose a less significant
-				// syncbit... so we check whether the neighbour also represents the drop
-				Uart.posCnt = 1;   // apparently we are busy with our first half bit period
-				Uart.syncBit = bit & 8;
-				Uart.samples = 3;
+        }
+    } else {
+        bit = Uart.bitBuffer & 0xf0;
+        bit >>= 4;
+        bit ^= 0x0F; // drops become 1s ;-)
+        if (bit) {
+            // should have been high or at least (4 * 128) / fc
+            // according to ISO this should be at least (9 * 128 + 20) / fc
+            if (Uart.highCnt == 8) {
+                // we went low, so this could be start of communication
+                // it turns out to be safer to choose a less significant
+                // syncbit... so we check whether the neighbour also represents the drop
+                Uart.posCnt = 1;   // apparently we are busy with our first half bit period
+                Uart.syncBit = bit & 8;
+                Uart.samples = 3;
 
-				if (!Uart.syncBit)	{ Uart.syncBit = bit & 4; Uart.samples = 2; }
-				else if (bit & 4)	{ Uart.syncBit = bit & 4; Uart.samples = 2; bit <<= 2; }
+                if (!Uart.syncBit)  { Uart.syncBit = bit & 4; Uart.samples = 2; }
+                else if (bit & 4)   { Uart.syncBit = bit & 4; Uart.samples = 2; bit <<= 2; }
 
-				if (!Uart.syncBit)	{ Uart.syncBit = bit & 2; Uart.samples = 1; }
-				else if (bit & 2)	{ Uart.syncBit = bit & 2; Uart.samples = 1; bit <<= 1; }
+                if (!Uart.syncBit)  { Uart.syncBit = bit & 2; Uart.samples = 1; }
+                else if (bit & 2)   { Uart.syncBit = bit & 2; Uart.samples = 1; bit <<= 1; }
 
-				if (!Uart.syncBit)	{ Uart.syncBit = bit & 1; Uart.samples = 0;
-					if (Uart.syncBit && (Uart.bitBuffer & 8)) {
-						Uart.syncBit = 8;
+                if (!Uart.syncBit)  { Uart.syncBit = bit & 1; Uart.samples = 0;
+                    if (Uart.syncBit && (Uart.bitBuffer & 8)) {
+                        Uart.syncBit = 8;
 
-						// the first half bit period is expected in next sample
-						Uart.posCnt = 0;
-						Uart.samples = 3;
-					}
-				} else if (bit & 1)	{ Uart.syncBit = bit & 1; Uart.samples = 0; }
+                        // the first half bit period is expected in next sample
+                        Uart.posCnt = 0;
+                        Uart.samples = 3;
+                    }
+                } else if (bit & 1) { Uart.syncBit = bit & 1; Uart.samples = 0; }
 
-				Uart.syncBit <<= 4;
-				Uart.state = STATE_START_OF_COMMUNICATION;
-				Uart.bitCnt = 0;
-				Uart.byteCnt = 0;
-				Uart.nOutOfCnt = 0;
-				Uart.OutOfCnt = 4; // Start at 1/4, could switch to 1/256
-				Uart.dropPosition = 0;
-				Uart.shiftReg = 0;
-				//error = 0;
-			} else {
-				Uart.highCnt = 0;
-			}
-		} else {
-			if (Uart.highCnt < 8)
-				Uart.highCnt++;
-		}
-	}
+                Uart.syncBit <<= 4;
+                Uart.state = STATE_START_OF_COMMUNICATION;
+                Uart.bitCnt = 0;
+                Uart.byteCnt = 0;
+                Uart.nOutOfCnt = 0;
+                Uart.OutOfCnt = 4; // Start at 1/4, could switch to 1/256
+                Uart.dropPosition = 0;
+                Uart.shiftReg = 0;
+                //error = 0;
+            } else {
+                Uart.highCnt = 0;
+            }
+        } else {
+            if (Uart.highCnt < 8)
+                Uart.highCnt++;
+        }
+    }
     return false;
 }
 */
@@ -501,22 +501,22 @@ static RAMFUNC int OutOfNDecoding(int bit) {
 //=============================================================================
 static tDemod Demod;
 static void DemodReset() {
-	Demod.bitCount = 0;
-	Demod.posCount = 0;
-	Demod.syncBit = 0;
-	Demod.shiftReg = 0;
-	Demod.buffer = 0;
-	Demod.buffer2 = 0;
-	Demod.buffer3 = 0;
-	Demod.buff = 0;
-	Demod.samples = 0;
-	Demod.len = 0;
-	Demod.sub = SUB_NONE;
-	Demod.state = DEMOD_UNSYNCD;
+    Demod.bitCount = 0;
+    Demod.posCount = 0;
+    Demod.syncBit = 0;
+    Demod.shiftReg = 0;
+    Demod.buffer = 0;
+    Demod.buffer2 = 0;
+    Demod.buffer3 = 0;
+    Demod.buff = 0;
+    Demod.samples = 0;
+    Demod.len = 0;
+    Demod.sub = SUB_NONE;
+    Demod.state = DEMOD_UNSYNCD;
 }
 static void DemodInit(uint8_t *data) {
-	Demod.output = data;
-	DemodReset();
+    Demod.output = data;
+    DemodReset();
 }
 
 // UART debug
@@ -541,23 +541,23 @@ Recorded Activity (TraceLen = 162 bytes)
        3232 |       3232 | Tag |bb! d4! bb! 02  02  08  04  bb!                                  |  ok |
 */
 static void uart_debug(int error, int bit) {
-	Demod.output[Demod.len] = 0xBB;
-	Demod.len++;
-	Demod.output[Demod.len] = error & 0xFF;
-	Demod.len++;
-	Demod.output[Demod.len] = 0xBB;
-	Demod.len++;
-	Demod.output[Demod.len] = bit & 0xFF;
-	Demod.len++;
-	Demod.output[Demod.len] = Demod.buffer & 0xFF;
-	Demod.len++;
-	// Look harder ;-)
-	Demod.output[Demod.len] = Demod.buffer2 & 0xFF;
-	Demod.len++;
-	Demod.output[Demod.len] = Demod.syncBit & 0xFF;
-	Demod.len++;
-	Demod.output[Demod.len] = 0xBB;
-	Demod.len++;
+    Demod.output[Demod.len] = 0xBB;
+    Demod.len++;
+    Demod.output[Demod.len] = error & 0xFF;
+    Demod.len++;
+    Demod.output[Demod.len] = 0xBB;
+    Demod.len++;
+    Demod.output[Demod.len] = bit & 0xFF;
+    Demod.len++;
+    Demod.output[Demod.len] = Demod.buffer & 0xFF;
+    Demod.len++;
+    // Look harder ;-)
+    Demod.output[Demod.len] = Demod.buffer2 & 0xFF;
+    Demod.len++;
+    Demod.output[Demod.len] = Demod.syncBit & 0xFF;
+    Demod.len++;
+    Demod.output[Demod.len] = 0xBB;
+    Demod.len++;
 }
 
 /*
@@ -569,219 +569,219 @@ static void uart_debug(int error, int bit) {
 *  ISO 15693-2
 *           Tout = 330 µs, Tprog 1 = 4 to 15 ms, Tslot = 330 µs + (number of slots x 160 µs)
 *  ISO 14443a
-*			Tout = 100 µs, Tprog = 4 to 15 ms, Tslot = 100 µs+ (number of slots x 80 µs)
+*           Tout = 100 µs, Tprog = 4 to 15 ms, Tslot = 100 µs+ (number of slots x 80 µs)
 *  ISO 14443b
-			 Tout = 76 µs, Tprog = 4 to 15 ms, Tslot = 119 µs+ (number of slots x 150 µs)
+            Tout = 76 µs, Tprog = 4 to 15 ms, Tslot = 119 µs+ (number of slots x 150 µs)
 *
 *
 *  So for current implementation in ISO15693, its 330 µs from end of reader, to start of card.
 */
 static RAMFUNC int ManchesterDecoding_iclass( uint32_t v) {
-	int bit;
-	int modulation;
-	int error = 0;
+    int bit;
+    int modulation;
+    int error = 0;
 
-	bit = Demod.buffer;
-	Demod.buffer = Demod.buffer2;
-	Demod.buffer2 = Demod.buffer3;
-	Demod.buffer3 = v;
+    bit = Demod.buffer;
+    Demod.buffer = Demod.buffer2;
+    Demod.buffer2 = Demod.buffer3;
+    Demod.buffer3 = v;
 
-	// too few bits?
-	if (Demod.buff < 3) {
-		Demod.buff++;
-		return false;
-	}
+    // too few bits?
+    if (Demod.buff < 3) {
+        Demod.buff++;
+        return false;
+    }
 
-	if (Demod.state == DEMOD_UNSYNCD) {
-		Demod.output[Demod.len] = 0xfa;
-		Demod.syncBit = 0;
-		//Demod.samples = 0;
-		Demod.posCount = 1;		// This is the first half bit period, so after syncing handle the second part
+    if (Demod.state == DEMOD_UNSYNCD) {
+        Demod.output[Demod.len] = 0xfa;
+        Demod.syncBit = 0;
+        //Demod.samples = 0;
+        Demod.posCount = 1; // This is the first half bit period, so after syncing handle the second part
 
-		if (bit & 0x08)
-			Demod.syncBit = 0x08;
+        if (bit & 0x08)
+            Demod.syncBit = 0x08;
 
-		if (bit & 0x04) {
-			if (Demod.syncBit)
-				bit <<= 4;
+        if (bit & 0x04) {
+            if (Demod.syncBit)
+                bit <<= 4;
 
-			Demod.syncBit = 0x04;
-		}
+            Demod.syncBit = 0x04;
+        }
 
-		if (bit & 0x02) {
-			if (Demod.syncBit)
-				bit <<= 2;
+        if (bit & 0x02) {
+            if (Demod.syncBit)
+                bit <<= 2;
 
-			Demod.syncBit = 0x02;
-		}
+            Demod.syncBit = 0x02;
+        }
 
-		if (bit & 0x01 && Demod.syncBit)
-			Demod.syncBit = 0x01;
+        if (bit & 0x01 && Demod.syncBit)
+            Demod.syncBit = 0x01;
 
-		if (Demod.syncBit) {
-			Demod.len = 0;
-			Demod.state = DEMOD_START_OF_COMMUNICATION;
-			Demod.sub = SUB_FIRST_HALF;
-			Demod.bitCount = 0;
-			Demod.shiftReg = 0;
-			Demod.samples = 0;
+        if (Demod.syncBit) {
+            Demod.len = 0;
+            Demod.state = DEMOD_START_OF_COMMUNICATION;
+            Demod.sub = SUB_FIRST_HALF;
+            Demod.bitCount = 0;
+            Demod.shiftReg = 0;
+            Demod.samples = 0;
 
-			if (Demod.posCount) {
+            if (Demod.posCount) {
 
-				switch (Demod.syncBit) {
-					case 0x08: Demod.samples = 3; break;
-					case 0x04: Demod.samples = 2; break;
-					case 0x02: Demod.samples = 1; break;
-					case 0x01: Demod.samples = 0; break;
-				}
-				// SOF must be long burst... otherwise stay unsynced!!!
-				if (!(Demod.buffer & Demod.syncBit) || !(Demod.buffer2 & Demod.syncBit))
-					Demod.state = DEMOD_UNSYNCD;
+                switch (Demod.syncBit) {
+                    case 0x08: Demod.samples = 3; break;
+                    case 0x04: Demod.samples = 2; break;
+                    case 0x02: Demod.samples = 1; break;
+                    case 0x01: Demod.samples = 0; break;
+                }
+                // SOF must be long burst... otherwise stay unsynced!!!
+                if (!(Demod.buffer & Demod.syncBit) || !(Demod.buffer2 & Demod.syncBit))
+                    Demod.state = DEMOD_UNSYNCD;
 
-			} else {
-				// SOF must be long burst... otherwise stay unsynced!!!
-				if (!(Demod.buffer2 & Demod.syncBit) || !(Demod.buffer3 & Demod.syncBit)) {
-					Demod.state = DEMOD_UNSYNCD;
-					error = 0x88;
-					uart_debug(error, bit);
-					return false;
-				}
-			}
-			error = 0;
-		}
-		return false;
-	}
+            } else {
+                // SOF must be long burst... otherwise stay unsynced!!!
+                if (!(Demod.buffer2 & Demod.syncBit) || !(Demod.buffer3 & Demod.syncBit)) {
+                    Demod.state = DEMOD_UNSYNCD;
+                    error = 0x88;
+                    uart_debug(error, bit);
+                    return false;
+                }
+            }
+            error = 0;
+        }
+        return false;
+    }
 
-	// state is DEMOD is in SYNC from here on.
+    // state is DEMOD is in SYNC from here on.
 
-	modulation = bit & Demod.syncBit;
-	modulation |= ((bit << 1) ^ ((Demod.buffer & 0x08) >> 3)) & Demod.syncBit;
-	Demod.samples += 4;
+    modulation = bit & Demod.syncBit;
+    modulation |= ((bit << 1) ^ ((Demod.buffer & 0x08) >> 3)) & Demod.syncBit;
+    Demod.samples += 4;
 
-	if (Demod.posCount == 0) {
-		Demod.posCount = 1;
-		Demod.sub = (modulation) ? SUB_FIRST_HALF : SUB_NONE;
-		return false;
-	}
+    if (Demod.posCount == 0) {
+        Demod.posCount = 1;
+        Demod.sub = (modulation) ? SUB_FIRST_HALF : SUB_NONE;
+        return false;
+    }
 
-	Demod.posCount = 0;
+    Demod.posCount = 0;
 
-	if (modulation) {
+    if (modulation) {
 
-		if (Demod.sub == SUB_FIRST_HALF)
-			Demod.sub = SUB_BOTH;
-		else
-			Demod.sub = SUB_SECOND_HALF;
-	}
+        if (Demod.sub == SUB_FIRST_HALF)
+            Demod.sub = SUB_BOTH;
+        else
+            Demod.sub = SUB_SECOND_HALF;
+    }
 
-	if (Demod.sub == SUB_NONE) {
-		if (Demod.state == DEMOD_SOF_COMPLETE) {
-			Demod.output[Demod.len] = 0x0f;
-			Demod.len++;
-			Demod.state = DEMOD_UNSYNCD;
-			return true;
-		} else {
-			Demod.state = DEMOD_ERROR_WAIT;
-			error = 0x33;
-		}
-	}
+    if (Demod.sub == SUB_NONE) {
+        if (Demod.state == DEMOD_SOF_COMPLETE) {
+            Demod.output[Demod.len] = 0x0f;
+            Demod.len++;
+            Demod.state = DEMOD_UNSYNCD;
+            return true;
+        } else {
+            Demod.state = DEMOD_ERROR_WAIT;
+            error = 0x33;
+        }
+    }
 
-	switch (Demod.state) {
+    switch (Demod.state) {
 
-		case DEMOD_START_OF_COMMUNICATION:
-			if (Demod.sub == SUB_BOTH) {
+        case DEMOD_START_OF_COMMUNICATION:
+            if (Demod.sub == SUB_BOTH) {
 
-				Demod.state = DEMOD_START_OF_COMMUNICATION2;
-				Demod.posCount = 1;
-				Demod.sub = SUB_NONE;
-			} else {
-				Demod.output[Demod.len] = 0xab;
-				Demod.state = DEMOD_ERROR_WAIT;
-				error = 0xd2;
-			}
-			break;
+                Demod.state = DEMOD_START_OF_COMMUNICATION2;
+                Demod.posCount = 1;
+                Demod.sub = SUB_NONE;
+            } else {
+                Demod.output[Demod.len] = 0xab;
+                Demod.state = DEMOD_ERROR_WAIT;
+                error = 0xd2;
+            }
+            break;
 
-		case DEMOD_START_OF_COMMUNICATION2:
-			if (Demod.sub == SUB_SECOND_HALF) {
-				Demod.state = DEMOD_START_OF_COMMUNICATION3;
-			} else {
-				Demod.output[Demod.len] = 0xab;
-				Demod.state = DEMOD_ERROR_WAIT;
-				error = 0xd3;
-			}
-			break;
+        case DEMOD_START_OF_COMMUNICATION2:
+            if (Demod.sub == SUB_SECOND_HALF) {
+                Demod.state = DEMOD_START_OF_COMMUNICATION3;
+            } else {
+                Demod.output[Demod.len] = 0xab;
+                Demod.state = DEMOD_ERROR_WAIT;
+                error = 0xd3;
+            }
+            break;
 
-		case DEMOD_START_OF_COMMUNICATION3:
-			if (Demod.sub == SUB_SECOND_HALF) {
-				Demod.state = DEMOD_SOF_COMPLETE;
-			} else {
-				Demod.output[Demod.len] = 0xab;
-				Demod.state = DEMOD_ERROR_WAIT;
-				error = 0xd4;
-			}
-			break;
+        case DEMOD_START_OF_COMMUNICATION3:
+            if (Demod.sub == SUB_SECOND_HALF) {
+                Demod.state = DEMOD_SOF_COMPLETE;
+            } else {
+                Demod.output[Demod.len] = 0xab;
+                Demod.state = DEMOD_ERROR_WAIT;
+                error = 0xd4;
+            }
+            break;
 
-		case DEMOD_SOF_COMPLETE:
-		case DEMOD_MANCHESTER_D:
-		case DEMOD_MANCHESTER_E:
-			// OPPOSITE FROM ISO14443 - 11110000 = 0 (1 in 14443)
-			//                          00001111 = 1 (0 in 14443)
-			if (Demod.sub == SUB_SECOND_HALF) { // SUB_FIRST_HALF
-				Demod.bitCount++;
-				Demod.shiftReg = (Demod.shiftReg >> 1) ^ 0x100;
-				Demod.state = DEMOD_MANCHESTER_D;
-			} else if (Demod.sub == SUB_FIRST_HALF) { // SUB_SECOND_HALF
-				Demod.bitCount++;
-				Demod.shiftReg >>= 1;
-				Demod.state = DEMOD_MANCHESTER_E;
-			} else if (Demod.sub == SUB_BOTH) {
-				Demod.state = DEMOD_MANCHESTER_F;
-			} else {
-				Demod.state = DEMOD_ERROR_WAIT;
-				error = 0x55;
-			}
-			break;
+        case DEMOD_SOF_COMPLETE:
+        case DEMOD_MANCHESTER_D:
+        case DEMOD_MANCHESTER_E:
+            // OPPOSITE FROM ISO14443 - 11110000 = 0 (1 in 14443)
+            //                          00001111 = 1 (0 in 14443)
+            if (Demod.sub == SUB_SECOND_HALF) { // SUB_FIRST_HALF
+                Demod.bitCount++;
+                Demod.shiftReg = (Demod.shiftReg >> 1) ^ 0x100;
+                Demod.state = DEMOD_MANCHESTER_D;
+            } else if (Demod.sub == SUB_FIRST_HALF) { // SUB_SECOND_HALF
+                Demod.bitCount++;
+                Demod.shiftReg >>= 1;
+                Demod.state = DEMOD_MANCHESTER_E;
+            } else if (Demod.sub == SUB_BOTH) {
+                Demod.state = DEMOD_MANCHESTER_F;
+            } else {
+                Demod.state = DEMOD_ERROR_WAIT;
+                error = 0x55;
+            }
+            break;
 
-		case DEMOD_MANCHESTER_F:
-			// Tag response does not need to be a complete byte!
-			if (Demod.len > 0 || Demod.bitCount > 0) {
-				if (Demod.bitCount > 1) {  // was > 0, do not interpret last closing bit, is part of EOF
-					Demod.shiftReg >>= (9 - Demod.bitCount);	// right align data
-					Demod.output[Demod.len] = Demod.shiftReg & 0xff;
-					Demod.len++;
-				}
+        case DEMOD_MANCHESTER_F:
+            // Tag response does not need to be a complete byte!
+            if (Demod.len > 0 || Demod.bitCount > 0) {
+                if (Demod.bitCount > 1) {  // was > 0, do not interpret last closing bit, is part of EOF
+                    Demod.shiftReg >>= (9 - Demod.bitCount); // right align data
+                    Demod.output[Demod.len] = Demod.shiftReg & 0xff;
+                    Demod.len++;
+                }
 
-				Demod.state = DEMOD_UNSYNCD;
-				return true;
-			} else {
-				Demod.output[Demod.len] = 0xad;
-				Demod.state = DEMOD_ERROR_WAIT;
-				error = 0x03;
-			}
-			break;
+                Demod.state = DEMOD_UNSYNCD;
+                return true;
+            } else {
+                Demod.output[Demod.len] = 0xad;
+                Demod.state = DEMOD_ERROR_WAIT;
+                error = 0x03;
+            }
+            break;
 
-		case DEMOD_ERROR_WAIT:
-			Demod.state = DEMOD_UNSYNCD;
-			break;
+        case DEMOD_ERROR_WAIT:
+            Demod.state = DEMOD_UNSYNCD;
+            break;
 
-		default:
-			Demod.output[Demod.len] = 0xdd;
-			Demod.state = DEMOD_UNSYNCD;
-			break;
-	}
+        default:
+            Demod.output[Demod.len] = 0xdd;
+            Demod.state = DEMOD_UNSYNCD;
+            break;
+    }
 
-	if (Demod.bitCount >= 8) {
-		Demod.shiftReg >>= 1;
-		Demod.output[Demod.len] = (Demod.shiftReg & 0xff);
-		Demod.len++;
-		Demod.bitCount = 0;
-		Demod.shiftReg = 0;
-	}
+    if (Demod.bitCount >= 8) {
+        Demod.shiftReg >>= 1;
+        Demod.output[Demod.len] = (Demod.shiftReg & 0xff);
+        Demod.len++;
+        Demod.bitCount = 0;
+        Demod.shiftReg = 0;
+    }
 
-	if (error) {
-		uart_debug(error, bit);
-		return true;
-	}
+    if (error) {
+        uart_debug(error, bit);
+        return true;
+    }
 
     return false;
 }
@@ -791,49 +791,49 @@ static RAMFUNC int ManchesterDecoding_iclass( uint32_t v) {
 // Both sides of communication!
 //=============================================================================
 static void iclass_setup_sniff(void){
-	if (MF_DBGLEVEL > 3) Dbprintf("iclass_setup_sniff Enter");
+    if (MF_DBGLEVEL > 3) Dbprintf("iclass_setup_sniff Enter");
 
-	LEDsoff();
+    LEDsoff();
 
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 
-	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
+    FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
 
-	// connect Demodulated Signal to ADC:
-	SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
+    // connect Demodulated Signal to ADC:
+    SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
 
-	// Set up the synchronous serial port
-	FpgaSetupSsc();
+    // Set up the synchronous serial port
+    FpgaSetupSsc();
 
-	BigBuf_free(); BigBuf_Clear_ext(false);
-	clear_trace();
-	set_tracing(true);
+    BigBuf_free(); BigBuf_Clear_ext(false);
+    clear_trace();
+    set_tracing(true);
 
-	// Initialize Demod and Uart structs
-	DemodInit(BigBuf_malloc(ICLASS_BUFFER_SIZE));
+    // Initialize Demod and Uart structs
+    DemodInit(BigBuf_malloc(ICLASS_BUFFER_SIZE));
 
-	uart_init(BigBuf_malloc(ICLASS_BUFFER_SIZE));
-	//UartInit(BigBuf_malloc(ICLASS_BUFFER_SIZE));
+    uart_init(BigBuf_malloc(ICLASS_BUFFER_SIZE));
+    //UartInit(BigBuf_malloc(ICLASS_BUFFER_SIZE));
 
-	if (MF_DBGLEVEL > 1) {
-		// Print debug information about the buffer sizes
-		Dbprintf("[+] Sniffing buffers initialized:");
-		Dbprintf("  Trace: %i bytes", BigBuf_max_traceLen());
-		Dbprintf("  Reader -> tag: %i bytes", ICLASS_BUFFER_SIZE);
-		Dbprintf("  tag -> Reader: %i bytes", ICLASS_BUFFER_SIZE);
-		Dbprintf("  DMA: %i bytes", ICLASS_DMA_BUFFER_SIZE);
-	}
+    if (MF_DBGLEVEL > 1) {
+        // Print debug information about the buffer sizes
+        Dbprintf("[+] Sniffing buffers initialized:");
+        Dbprintf("  Trace: %i bytes", BigBuf_max_traceLen());
+        Dbprintf("  Reader -> tag: %i bytes", ICLASS_BUFFER_SIZE);
+        Dbprintf("  tag -> Reader: %i bytes", ICLASS_BUFFER_SIZE);
+        Dbprintf("  DMA: %i bytes", ICLASS_DMA_BUFFER_SIZE);
+    }
 
-	// Set FPGA in the appropriate mode
+    // Set FPGA in the appropriate mode
     // put the FPGA in the appropriate mode
     FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_SNIFFER);
-	SpinDelay(200);
+    SpinDelay(200);
 
-	// Start the SSP timer
-	StartCountSspClk();
+    // Start the SSP timer
+    StartCountSspClk();
 
-	LED_A_ON();
-	if (MF_DBGLEVEL > 3) Dbprintf("[+] iclass_setup_sniff Exit");
+    LED_A_ON();
+    if (MF_DBGLEVEL > 3) Dbprintf("[+] iclass_setup_sniff Exit");
 }
 
 //-----------------------------------------------------------------------------
@@ -844,130 +844,130 @@ static void iclass_setup_sniff(void){
 // turn off afterwards
 void RAMFUNC SniffIClass(void) {
 
-	//int datalen = 0;
-	uint32_t previous_data = 0;
-	uint32_t time_0 = 0, time_start = 0, time_stop  = 0;
+    //int datalen = 0;
+    uint32_t previous_data = 0;
+    uint32_t time_0 = 0, time_start = 0, time_stop  = 0;
     uint32_t sniffCounter = 0;
-	bool TagIsActive = false;
-	bool ReaderIsActive = false;
+    bool TagIsActive = false;
+    bool ReaderIsActive = false;
 
-	iclass_setup_sniff();
+    iclass_setup_sniff();
 
     // The DMA buffer, used to stream samples from the FPGA
-	// *dmaBuf is the start reference.
+    // *dmaBuf is the start reference.
     uint8_t *dmaBuf = BigBuf_malloc(ICLASS_DMA_BUFFER_SIZE);
-	// pointer to samples from fpga
+    // pointer to samples from fpga
     uint8_t *data = dmaBuf;
 
-	// Setup and start DMA.
-	if ( !FpgaSetupSscDma(dmaBuf, ICLASS_DMA_BUFFER_SIZE) ){
-		if (MF_DBGLEVEL > 1) DbpString("[-] FpgaSetupSscDma failed. Exiting");
-		return;
-	}
+    // Setup and start DMA.
+    if ( !FpgaSetupSscDma(dmaBuf, ICLASS_DMA_BUFFER_SIZE) ){
+        if (MF_DBGLEVEL > 1) DbpString("[-] FpgaSetupSscDma failed. Exiting");
+        return;
+    }
 
-	// time ZERO, the point from which it all is calculated.
-	time_0 = GetCountSspClk();
+    // time ZERO, the point from which it all is calculated.
+    time_0 = GetCountSspClk();
 
-	int div = 0;
-	uint8_t tag_byte = 0, foo = 0;
+    int div = 0;
+    uint8_t tag_byte = 0, foo = 0;
     // loop and listen
-	// every sample (1byte in data),
-	//     contains HIGH nibble = reader data
-	//     contains LOW nibble = tag data
-	// so two bytes are needed in order to get 1byte of either reader or tag data.  (ie 2 sample bytes)
-	// since reader data is manchester encoded,  we need 2bytes of data in order to get one demoded byte.  (ie:  4 sample bytes)
-	while (!BUTTON_PRESS()) {
+    // every sample (1byte in data),
+    //     contains HIGH nibble = reader data
+    //     contains LOW nibble = tag data
+    // so two bytes are needed in order to get 1byte of either reader or tag data.  (ie 2 sample bytes)
+    // since reader data is manchester encoded,  we need 2bytes of data in order to get one demoded byte.  (ie:  4 sample bytes)
+    while (!BUTTON_PRESS()) {
         WDT_HIT();
 
-		previous_data <<= 8;
-		previous_data |= *data;
+        previous_data <<= 8;
+        previous_data |= *data;
 
-		sniffCounter++;
-		data++;
+        sniffCounter++;
+        data++;
 
-		if (data == dmaBuf + ICLASS_DMA_BUFFER_SIZE) {
-			data = dmaBuf;
-			AT91C_BASE_PDC_SSC->PDC_RNPR = (uint32_t) dmaBuf;
-			AT91C_BASE_PDC_SSC->PDC_RNCR = ICLASS_DMA_BUFFER_SIZE;
-		}
+        if (data == dmaBuf + ICLASS_DMA_BUFFER_SIZE) {
+            data = dmaBuf;
+            AT91C_BASE_PDC_SSC->PDC_RNPR = (uint32_t) dmaBuf;
+            AT91C_BASE_PDC_SSC->PDC_RNCR = ICLASS_DMA_BUFFER_SIZE;
+        }
 
-		if ( *data & 0xF) {
-			//tag_byte <<= 1;
-			tag_byte ^= (1 << 4);
-			foo ^= (1 << (3 - div));
-			Dbprintf(" %d|%x == %d|%x", tag_byte, tag_byte, foo, foo);
-		}
-		div++;
+        if ( *data & 0xF) {
+            //tag_byte <<= 1;
+            tag_byte ^= (1 << 4);
+            foo ^= (1 << (3 - div));
+            Dbprintf(" %d|%x == %d|%x", tag_byte, tag_byte, foo, foo);
+        }
+        div++;
 
-		// every odd sample
-		if (sniffCounter & 0x01) {
-			// no need to try decoding reader data if the tag is sending
-			// READER TO CARD
-			if (!TagIsActive) {
-				LED_C_INV();
-				// HIGH nibble is always reader data.
-				uint8_t reader_byte = (previous_data & 0xF0) | (*data >> 4);
-				uart_samples(reader_byte);
-				if (Uart.frame_done) {
-					time_stop = GetCountSspClk() - time_0;
-					LogTrace( Uart.buf, Uart.len, time_start, time_stop, NULL, true);
-					DemodReset();
-					uart_reset();
-				} else {
-					time_start = GetCountSspClk() - time_0;
-				}
-				ReaderIsActive = Uart.frame_done;
-			}
-		}
-		// every four sample
-		if ( (sniffCounter % 4) == 0) {
-			// need two samples to feed Manchester
-			// no need to try decoding tag data if the reader is sending - and we cannot afford the time
-			// CARD TO READER
-			if (!ReaderIsActive) {
-				LED_C_INV();
-				// LOW nibble is always tag data.
-				/*
+        // every odd sample
+        if (sniffCounter & 0x01) {
+            // no need to try decoding reader data if the tag is sending
+            // READER TO CARD
+            if (!TagIsActive) {
+                LED_C_INV();
+                // HIGH nibble is always reader data.
+                uint8_t reader_byte = (previous_data & 0xF0) | (*data >> 4);
+                uart_samples(reader_byte);
+                if (Uart.frame_done) {
+                    time_stop = GetCountSspClk() - time_0;
+                    LogTrace( Uart.buf, Uart.len, time_start, time_stop, NULL, true);
+                    DemodReset();
+                    uart_reset();
+                } else {
+                    time_start = GetCountSspClk() - time_0;
+                }
+                ReaderIsActive = Uart.frame_done;
+            }
+        }
+        // every four sample
+        if ( (sniffCounter % 4) == 0) {
+            // need two samples to feed Manchester
+            // no need to try decoding tag data if the reader is sending - and we cannot afford the time
+            // CARD TO READER
+            if (!ReaderIsActive) {
+                LED_C_INV();
+                // LOW nibble is always tag data.
+                /*
 
 
-				uint32_t tag_byte =
-						((previous_data & 0x0F000000) >> 8 )  |
-						((previous_data & 0x000F0000) >> 4 )  |
-						((previous_data & 0x00000F00)      )  |
-						((previous_data & 0x0000000F) << 4 )  |
-						(*data & 0xF);
-						*/
+                uint32_t tag_byte =
+                        ((previous_data & 0x0F000000) >> 8 )  |
+                        ((previous_data & 0x000F0000) >> 4 )  |
+                        ((previous_data & 0x00000F00)      )  |
+                        ((previous_data & 0x0000000F) << 4 )  |
+                        (*data & 0xF);
+                        */
 
 
-				//uint8_t tag_byte = ((previous_data & 0xF) << 4 ) | (*data & 0xF);
-				if (ManchesterDecoding_iclass(foo)) {
-					time_stop = GetCountSspClk() - time_0;
-					LogTrace(Demod.output, Demod.len, time_start, time_stop, NULL, false);
-					DemodReset();
-					uart_reset();
-				} else {
-					time_start = GetCountSspClk() - time_0;
-				}
-				TagIsActive = (Demod.state != DEMOD_UNSYNCD);
-			}
-			tag_byte = 0;
-			foo = 0;
-			div = 0;
-		}
-	} // end main loop
+                //uint8_t tag_byte = ((previous_data & 0xF) << 4 ) | (*data & 0xF);
+                if (ManchesterDecoding_iclass(foo)) {
+                    time_stop = GetCountSspClk() - time_0;
+                    LogTrace(Demod.output, Demod.len, time_start, time_stop, NULL, false);
+                    DemodReset();
+                    uart_reset();
+                } else {
+                    time_start = GetCountSspClk() - time_0;
+                }
+                TagIsActive = (Demod.state != DEMOD_UNSYNCD);
+            }
+            tag_byte = 0;
+            foo = 0;
+            div = 0;
+        }
+    } // end main loop
 
-	if (MF_DBGLEVEL >= 1) {
-		DbpString("[+] Sniff statistics:");
-		Dbhexdump(ICLASS_DMA_BUFFER_SIZE, data, false);
-		}
+    if (MF_DBGLEVEL >= 1) {
+        DbpString("[+] Sniff statistics:");
+        Dbhexdump(ICLASS_DMA_BUFFER_SIZE, data, false);
+        }
 
-	switch_off();
+    switch_off();
 }
 
 void rotateCSN(uint8_t* originalCSN, uint8_t* rotatedCSN) {
-	int i;
-	for(i = 0; i < 8; i++)
-		rotatedCSN[i] = (originalCSN[i] >> 3) | (originalCSN[(i+1)%8] << 5);
+    int i;
+    for(i = 0; i < 8; i++)
+        rotatedCSN[i] = (originalCSN[i] >> 3) | (originalCSN[(i+1)%8] << 5);
 }
 
 //-----------------------------------------------------------------------------
@@ -981,142 +981,142 @@ static bool GetIClassCommandFromReader(uint8_t *received, int *len, int maxLen)
     // only, since we are receiving, not transmitting).
     // Signal field is off with the appropriate LED
     LED_D_OFF();
-	uart_init(received);
+    uart_init(received);
 
     FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_TAGSIM_LISTEN);
-	// clear RXRDY:
+    // clear RXRDY:
     uint8_t b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
 
-	while (!BUTTON_PRESS()) {
+    while (!BUTTON_PRESS()) {
         WDT_HIT();
 
-		 // keep tx buffer in a defined state anyway.
+         // keep tx buffer in a defined state anyway.
         if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY))
             AT91C_BASE_SSC->SSC_THR = 0x00;
 
-		// wait for byte to become available in rx holding register
+        // wait for byte to become available in rx holding register
         if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
             b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
 
             uart_samples(b);
             if (Uart.frame_done) {
                 *len = Uart.len;
-				return true;
-			}
+                return true;
+            }
         }
     }
-	return false;
+    return false;
 }
 
 static uint8_t encode4Bits(const uint8_t b) {
-	// OTA, the least significant bits first
-	// Manchester encoding added
-	//         The columns are
-	//               1 - Bit value to send
-	//               2 - Reversed (big-endian)
-	//               3 - Machester Encoded
-	//               4 - Hex values
+    // OTA, the least significant bits first
+    // Manchester encoding added
+    //         The columns are
+    //               1 - Bit value to send
+    //               2 - Reversed (big-endian)
+    //               3 - Machester Encoded
+    //               4 - Hex values
 
-	uint8_t c = b & 0xF;
-	switch (c) {
-							//  1       2         3         4
-	  case 15: return 0x55; // 1111 -> 1111 -> 01010101 -> 0x55
-	  case 14: return 0x95; // 1110 -> 0111 -> 10010101 -> 0x95
-	  case 13: return 0x65; // 1101 -> 1011 -> 01100101 -> 0x65
-	  case 12: return 0xa5; // 1100 -> 0011 -> 10100101 -> 0xa5
-	  case 11: return 0x59; // 1011 -> 1101 -> 01011001 -> 0x59
-	  case 10: return 0x99; // 1010 -> 0101 -> 10011001 -> 0x99
-	  case 9:  return 0x69; // 1001 -> 1001 -> 01101001 -> 0x69
-	  case 8:  return 0xa9; // 1000 -> 0001 -> 10101001 -> 0xa9
-	  case 7:  return 0x56; // 0111 -> 1110 -> 01010110 -> 0x56
-	  case 6:  return 0x96; // 0110 -> 0110 -> 10010110 -> 0x96
-	  case 5:  return 0x66; // 0101 -> 1010 -> 01100110 -> 0x66
-	  case 4:  return 0xa6; // 0100 -> 0010 -> 10100110 -> 0xa6
-	  case 3:  return 0x5a; // 0011 -> 1100 -> 01011010 -> 0x5a
-	  case 2:  return 0x9a; // 0010 -> 0100 -> 10011010 -> 0x9a
-	  case 1:  return 0x6a; // 0001 -> 1000 -> 01101010 -> 0x6a
-	  default: return 0xaa; // 0000 -> 0000 -> 10101010 -> 0xaa
-	}
+    uint8_t c = b & 0xF;
+    switch (c) {
+                            //  1       2         3         4
+      case 15: return 0x55; // 1111 -> 1111 -> 01010101 -> 0x55
+      case 14: return 0x95; // 1110 -> 0111 -> 10010101 -> 0x95
+      case 13: return 0x65; // 1101 -> 1011 -> 01100101 -> 0x65
+      case 12: return 0xa5; // 1100 -> 0011 -> 10100101 -> 0xa5
+      case 11: return 0x59; // 1011 -> 1101 -> 01011001 -> 0x59
+      case 10: return 0x99; // 1010 -> 0101 -> 10011001 -> 0x99
+      case 9:  return 0x69; // 1001 -> 1001 -> 01101001 -> 0x69
+      case 8:  return 0xa9; // 1000 -> 0001 -> 10101001 -> 0xa9
+      case 7:  return 0x56; // 0111 -> 1110 -> 01010110 -> 0x56
+      case 6:  return 0x96; // 0110 -> 0110 -> 10010110 -> 0x96
+      case 5:  return 0x66; // 0101 -> 1010 -> 01100110 -> 0x66
+      case 4:  return 0xa6; // 0100 -> 0010 -> 10100110 -> 0xa6
+      case 3:  return 0x5a; // 0011 -> 1100 -> 01011010 -> 0x5a
+      case 2:  return 0x9a; // 0010 -> 0100 -> 10011010 -> 0x9a
+      case 1:  return 0x6a; // 0001 -> 1000 -> 01101010 -> 0x6a
+      default: return 0xaa; // 0000 -> 0000 -> 10101010 -> 0xaa
+    }
 }
 
 //-----------------------------------------------------------------------------
 // Prepare tag messages
 //-----------------------------------------------------------------------------
 static void CodeIClassTagAnswer(const uint8_t *cmd, int len) {
-	/*
-	 * SOF comprises 3 parts;
-	 * * An unmodulated time of 56.64 us
-	 * * 24 pulses of 423.75 KHz (fc/32)
-	 * * A logic 1, which starts with an unmodulated time of 18.88us
-	 *   followed by 8 pulses of 423.75kHz (fc/32)
-	 *
-	 *
-	 * EOF comprises 3 parts:
-	 * - A logic 0 (which starts with 8 pulses of fc/32 followed by an unmodulated
-	 *   time of 18.88us.
-	 * - 24 pulses of fc/32
-	 * - An unmodulated time of 56.64 us
-	 *
-	 *
-	 * A logic 0 starts with 8 pulses of fc/32
-	 * followed by an unmodulated time of 256/fc (~18,88us).
-	 *
-	 * A logic 0 starts with unmodulated time of 256/fc (~18,88us) followed by
-	 * 8 pulses of fc/32 (also 18.88us)
-	 *
-	 * The mode FPGA_HF_SIMULATOR_MODULATE_424K_8BIT which we use to simulate tag,
-	 * works like this.
-	 * - A 1-bit input to the FPGA becomes 8 pulses on 423.5kHz (fc/32) (18.88us).
-	 * - A 0-bit input to the FPGA becomes an unmodulated time of 18.88us
-	 *
-	 * In this mode
-	 * SOF can be written as 00011101 = 0x1D
-	 * EOF can be written as 10111000 = 0xb8
-	 * logic 1 be written as 01 = 0x1
-	 * logic 0 be written as 10 = 0x2
-	 *
-	 * */
-	ToSendReset();
+    /*
+     * SOF comprises 3 parts;
+     * * An unmodulated time of 56.64 us
+     * * 24 pulses of 423.75 KHz (fc/32)
+     * * A logic 1, which starts with an unmodulated time of 18.88us
+     *   followed by 8 pulses of 423.75kHz (fc/32)
+     *
+     *
+     * EOF comprises 3 parts:
+     * - A logic 0 (which starts with 8 pulses of fc/32 followed by an unmodulated
+     *   time of 18.88us.
+     * - 24 pulses of fc/32
+     * - An unmodulated time of 56.64 us
+     *
+     *
+     * A logic 0 starts with 8 pulses of fc/32
+     * followed by an unmodulated time of 256/fc (~18,88us).
+     *
+     * A logic 0 starts with unmodulated time of 256/fc (~18,88us) followed by
+     * 8 pulses of fc/32 (also 18.88us)
+     *
+     * The mode FPGA_HF_SIMULATOR_MODULATE_424K_8BIT which we use to simulate tag,
+     * works like this.
+     * - A 1-bit input to the FPGA becomes 8 pulses on 423.5kHz (fc/32) (18.88us).
+     * - A 0-bit input to the FPGA becomes an unmodulated time of 18.88us
+     *
+     * In this mode
+     * SOF can be written as 00011101 = 0x1D
+     * EOF can be written as 10111000 = 0xb8
+     * logic 1 be written as 01 = 0x1
+     * logic 0 be written as 10 = 0x2
+     *
+     * */
+    ToSendReset();
 
-	// Send SOF
-	ToSend[++ToSendMax] = 0x1D;
+    // Send SOF
+    ToSend[++ToSendMax] = 0x1D;
 
-	int i;
-	for(i = 0; i < len; i++) {
-		uint8_t b = cmd[i];
-		ToSend[++ToSendMax] = encode4Bits(b & 0xF); 		// least significant half
-		ToSend[++ToSendMax] = encode4Bits((b >> 4) & 0xF);	// most significant half
-	}
+    int i;
+    for(i = 0; i < len; i++) {
+        uint8_t b = cmd[i];
+        ToSend[++ToSendMax] = encode4Bits(b & 0xF); // least significant half
+        ToSend[++ToSendMax] = encode4Bits((b >> 4) & 0xF); // most significant half
+    }
 
-	// Send EOF
-	ToSend[++ToSendMax] = 0xB8;
-	//lastProxToAirDuration  = 8*ToSendMax - 3*8 - 3*8;//Not counting zeroes in the beginning or end
-	// Convert from last byte pos to length
-	ToSendMax++;
+    // Send EOF
+    ToSend[++ToSendMax] = 0xB8;
+    //lastProxToAirDuration  = 8*ToSendMax - 3*8 - 3*8;//Not counting zeroes in the beginning or end
+    // Convert from last byte pos to length
+    ToSendMax++;
 }
 
 // Only SOF
 static void CodeIClassTagSOF() {
-	//So far a dummy implementation, not used
-	//int lastProxToAirDuration =0;
+    //So far a dummy implementation, not used
+    //int lastProxToAirDuration =0;
 
-	ToSendReset();
-	// Send SOF
-	ToSend[++ToSendMax] = 0x1D;
-	//	lastProxToAirDuration  = 8*ToSendMax - 3*8;//Not counting zeroes in the beginning
+    ToSendReset();
+    // Send SOF
+    ToSend[++ToSendMax] = 0x1D;
+    // lastProxToAirDuration  = 8*ToSendMax - 3*8;//Not counting zeroes in the beginning
 
-	// Convert from last byte pos to length
-	ToSendMax++;
+    // Convert from last byte pos to length
+    ToSendMax++;
 }
 
 /**
  * @brief SimulateIClass simulates an iClass card.
  * @param arg0 type of simulation
- *			- 0 uses the first 8 bytes in usb data as CSN
- *			- 2 "dismantling iclass"-attack. This mode iterates through all CSN's specified
- *			in the usb data. This mode collects MAC from the reader, in order to do an offline
- *			attack on the keys. For more info, see "dismantling iclass" and proxclone.com.
- *			- Other : Uses the default CSN (031fec8af7ff12e0)
+ *          - 0 uses the first 8 bytes in usb data as CSN
+ *          - 2 "dismantling iclass"-attack. This mode iterates through all CSN's specified
+ *          in the usb data. This mode collects MAC from the reader, in order to do an offline
+ *          attack on the keys. For more info, see "dismantling iclass" and proxclone.com.
+ *          - Other : Uses the default CSN (031fec8af7ff12e0)
  * @param arg1 - number of CSN's contained in datain (applicable for mode 2 only)
  * @param arg2
  * @param datain
@@ -1124,107 +1124,107 @@ static void CodeIClassTagSOF() {
 // turn off afterwards
 void SimulateIClass(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain) {
 
-	if (MF_DBGLEVEL > 3) Dbprintf("[+] iClass_simulate Enter");
+    if (MF_DBGLEVEL > 3) Dbprintf("[+] iClass_simulate Enter");
 
-	LEDsoff();
+    LEDsoff();
 
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	// this will clear out bigbuf memory,  the eload command must select this before!
-	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-	FpgaSetupSsc();
-	SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    // this will clear out bigbuf memory,  the eload command must select this before!
+    FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
+    FpgaSetupSsc();
+    SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
 
-	// Enable and clear the trace
-	clear_trace();
-	set_tracing(true);
+    // Enable and clear the trace
+    clear_trace();
+    set_tracing(true);
 
-	uint32_t simType = arg0;
-	uint32_t numberOfCSNS = arg1;
+    uint32_t simType = arg0;
+    uint32_t numberOfCSNS = arg1;
 
-	//Use the emulator memory for SIM
-	uint8_t *emulator = BigBuf_get_EM_addr();
-	uint8_t mac_responses[USB_CMD_DATA_SIZE] = { 0 };
+    //Use the emulator memory for SIM
+    uint8_t *emulator = BigBuf_get_EM_addr();
+    uint8_t mac_responses[USB_CMD_DATA_SIZE] = { 0 };
 
-	if (simType == 0) {
-		// Use the CSN from commandline
-		memcpy(emulator, datain, 8);
-		doIClassSimulation(MODE_SIM_CSN, NULL);
-	} else if (simType == 1) {
-		//Default CSN
-		uint8_t csn_crc[] = { 0x03, 0x1f, 0xec, 0x8a, 0xf7, 0xff, 0x12, 0xe0, 0x00, 0x00 };
-		// Use the CSN from commandline
-		memcpy(emulator, csn_crc, 8);
-		doIClassSimulation(MODE_SIM_CSN, NULL);
-	} else if (simType == 2) {
+    if (simType == 0) {
+        // Use the CSN from commandline
+        memcpy(emulator, datain, 8);
+        doIClassSimulation(MODE_SIM_CSN, NULL);
+    } else if (simType == 1) {
+        //Default CSN
+        uint8_t csn_crc[] = { 0x03, 0x1f, 0xec, 0x8a, 0xf7, 0xff, 0x12, 0xe0, 0x00, 0x00 };
+        // Use the CSN from commandline
+        memcpy(emulator, csn_crc, 8);
+        doIClassSimulation(MODE_SIM_CSN, NULL);
+    } else if (simType == 2) {
 
-		Dbprintf("[+] going into attack mode, %d CSNS sent", numberOfCSNS);
-		// In this mode, a number of csns are within datain. We'll simulate each one, one at a time
-		// in order to collect MAC's from the reader. This can later be used in an offlne-attack
-		// in order to obtain the keys, as in the "dismantling iclass"-paper.
-		#define EPURSE_MAC_SIZE 16
-		int i = 0;
-		for (; i < numberOfCSNS && i * EPURSE_MAC_SIZE + 8 < USB_CMD_DATA_SIZE; i++) {
-			// The usb data is 512 bytes, fitting 65 8-byte CSNs in there.
+        Dbprintf("[+] going into attack mode, %d CSNS sent", numberOfCSNS);
+        // In this mode, a number of csns are within datain. We'll simulate each one, one at a time
+        // in order to collect MAC's from the reader. This can later be used in an offlne-attack
+        // in order to obtain the keys, as in the "dismantling iclass"-paper.
+        #define EPURSE_MAC_SIZE 16
+        int i = 0;
+        for (; i < numberOfCSNS && i * EPURSE_MAC_SIZE + 8 < USB_CMD_DATA_SIZE; i++) {
+            // The usb data is 512 bytes, fitting 65 8-byte CSNs in there.
 
-			memcpy(emulator, datain + (i*8), 8);
+            memcpy(emulator, datain + (i*8), 8);
 
-			if (doIClassSimulation(MODE_EXIT_AFTER_MAC, mac_responses+i * EPURSE_MAC_SIZE)) {
-				// Button pressed
-				cmd_send(CMD_ACK, CMD_SIMULATE_TAG_ICLASS, i, 0, mac_responses, i * EPURSE_MAC_SIZE);
-				goto out;
-			}
-		}
-		cmd_send(CMD_ACK, CMD_SIMULATE_TAG_ICLASS, i, 0, mac_responses, i * EPURSE_MAC_SIZE);
+            if (doIClassSimulation(MODE_EXIT_AFTER_MAC, mac_responses+i * EPURSE_MAC_SIZE)) {
+                // Button pressed
+                cmd_send(CMD_ACK, CMD_SIMULATE_TAG_ICLASS, i, 0, mac_responses, i * EPURSE_MAC_SIZE);
+                goto out;
+            }
+        }
+        cmd_send(CMD_ACK, CMD_SIMULATE_TAG_ICLASS, i, 0, mac_responses, i * EPURSE_MAC_SIZE);
 
-	} else if (simType == 3){
-		//This is 'full sim' mode, where we use the emulator storage for data.
-		//ie:  BigBuf_get_EM_addr should be previously filled with data from the "eload" command
-		doIClassSimulation(MODE_FULLSIM, NULL);
-	} else if (simType == 4){
+    } else if (simType == 3){
+        //This is 'full sim' mode, where we use the emulator storage for data.
+        //ie:  BigBuf_get_EM_addr should be previously filled with data from the "eload" command
+        doIClassSimulation(MODE_FULLSIM, NULL);
+    } else if (simType == 4){
 
-		// This is the KEYROLL version of sim 2.
-		// the collected data (mac_response) is doubled out since we are trying to collect both keys in the keyroll process.
-		// Keyroll iceman  9 csns * 8 * 2 = 144
-		// keyroll CARL55  15csns * 8 * 2 = 15 * 8 * 2 = 240
-		Dbprintf("[+] going into attack keyroll mode, %d CSNS sent", numberOfCSNS);
-		// In this mode, a number of csns are within datain. We'll simulate each one, one at a time
-		// in order to collect MAC's from the reader. This can later be used in an offlne-attack
-		// in order to obtain the keys, as in the "dismantling iclass"-paper.
+        // This is the KEYROLL version of sim 2.
+        // the collected data (mac_response) is doubled out since we are trying to collect both keys in the keyroll process.
+        // Keyroll iceman  9 csns * 8 * 2 = 144
+        // keyroll CARL55  15csns * 8 * 2 = 15 * 8 * 2 = 240
+        Dbprintf("[+] going into attack keyroll mode, %d CSNS sent", numberOfCSNS);
+        // In this mode, a number of csns are within datain. We'll simulate each one, one at a time
+        // in order to collect MAC's from the reader. This can later be used in an offlne-attack
+        // in order to obtain the keys, as in the "dismantling iclass"-paper.
 
-		// keyroll mode,   reader swaps between old key and new key alternatively when fail a authentication.
-		// attack below is same as SIM 2, but we run the CSN twice to collected the mac for both keys.
-		int i = 0;
-		// The usb data is 512 bytes, fitting 65 8-byte CSNs in there.  iceman fork uses 9 CSNS
-		for (; i < numberOfCSNS && i * EPURSE_MAC_SIZE + 8 < USB_CMD_DATA_SIZE; i++) {
+        // keyroll mode,   reader swaps between old key and new key alternatively when fail a authentication.
+        // attack below is same as SIM 2, but we run the CSN twice to collected the mac for both keys.
+        int i = 0;
+        // The usb data is 512 bytes, fitting 65 8-byte CSNs in there.  iceman fork uses 9 CSNS
+        for (; i < numberOfCSNS && i * EPURSE_MAC_SIZE + 8 < USB_CMD_DATA_SIZE; i++) {
 
-			memcpy(emulator, datain + (i*8), 8);
+            memcpy(emulator, datain + (i*8), 8);
 
-			// keyroll 1
-			if (doIClassSimulation(MODE_EXIT_AFTER_MAC, mac_responses + i * EPURSE_MAC_SIZE )) {
-				cmd_send(CMD_ACK, CMD_SIMULATE_TAG_ICLASS, i*2, 0, mac_responses, i * EPURSE_MAC_SIZE * 2);
-				// Button pressed
-				goto out;
-			}
+            // keyroll 1
+            if (doIClassSimulation(MODE_EXIT_AFTER_MAC, mac_responses + i * EPURSE_MAC_SIZE )) {
+                cmd_send(CMD_ACK, CMD_SIMULATE_TAG_ICLASS, i*2, 0, mac_responses, i * EPURSE_MAC_SIZE * 2);
+                // Button pressed
+                goto out;
+            }
 
-			// keyroll 2
-			if (doIClassSimulation(MODE_EXIT_AFTER_MAC, mac_responses + (i + numberOfCSNS) * EPURSE_MAC_SIZE )) {
-				cmd_send(CMD_ACK, CMD_SIMULATE_TAG_ICLASS, i*2, 0, mac_responses, i * EPURSE_MAC_SIZE* 2);
-				// Button pressed
-				goto out;
-			}
-		}
-		// double the amount of collected data.
-		cmd_send(CMD_ACK, CMD_SIMULATE_TAG_ICLASS, i*2, 0, mac_responses, i * EPURSE_MAC_SIZE * 2 );
+            // keyroll 2
+            if (doIClassSimulation(MODE_EXIT_AFTER_MAC, mac_responses + (i + numberOfCSNS) * EPURSE_MAC_SIZE )) {
+                cmd_send(CMD_ACK, CMD_SIMULATE_TAG_ICLASS, i*2, 0, mac_responses, i * EPURSE_MAC_SIZE* 2);
+                // Button pressed
+                goto out;
+            }
+        }
+        // double the amount of collected data.
+        cmd_send(CMD_ACK, CMD_SIMULATE_TAG_ICLASS, i*2, 0, mac_responses, i * EPURSE_MAC_SIZE * 2 );
 
-	} else {
-		// We may want a mode here where we hardcode the csns to use (from proxclone).
-		// That will speed things up a little, but not required just yet.
-		DbpString("[-] the mode is not implemented, reserved for future use");
-	}
+    } else {
+        // We may want a mode here where we hardcode the csns to use (from proxclone).
+        // That will speed things up a little, but not required just yet.
+        DbpString("[-] the mode is not implemented, reserved for future use");
+    }
 
 out:
-	switch_off();
-	BigBuf_free_keep_EM();
+    switch_off();
+    BigBuf_free_keep_EM();
 }
 
 /**
@@ -1234,344 +1234,344 @@ out:
  */
 int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf) {
 
-	// free eventually allocated BigBuf memory
-	BigBuf_free_keep_EM();
+    // free eventually allocated BigBuf memory
+    BigBuf_free_keep_EM();
 
-	State cipher_state;
+    State cipher_state;
 
-	uint8_t *csn = BigBuf_get_EM_addr();
-	uint8_t *emulator = csn;
-	uint8_t sof_data[] = { 0x0F} ;
+    uint8_t *csn = BigBuf_get_EM_addr();
+    uint8_t *emulator = csn;
+    uint8_t sof_data[] = { 0x0F} ;
 
-	// CSN followed by two CRC bytes
-	uint8_t anticoll_data[10] = { 0 };
-	uint8_t csn_data[10] = { 0 };
-	memcpy(csn_data, csn, sizeof(csn_data));
+    // CSN followed by two CRC bytes
+    uint8_t anticoll_data[10] = { 0 };
+    uint8_t csn_data[10] = { 0 };
+    memcpy(csn_data, csn, sizeof(csn_data));
 
-	// Construct anticollision-CSN
-	rotateCSN(csn_data, anticoll_data);
+    // Construct anticollision-CSN
+    rotateCSN(csn_data, anticoll_data);
 
-	// Compute CRC on both CSNs
-	AddCrc(anticoll_data, 8);
-	AddCrc(csn_data, 8);
+    // Compute CRC on both CSNs
+    AddCrc(anticoll_data, 8);
+    AddCrc(csn_data, 8);
 
-	uint8_t diversified_key[8] = { 0 };
-	// e-Purse
-	uint8_t card_challenge_data[8] = { 0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff };
-	//uint8_t card_challenge_data[8] = { 0 };
-	if (simulationMode == MODE_FULLSIM) {
-		//The diversified key should be stored on block 3
-		//Get the diversified key from emulator memory
-		memcpy(diversified_key, emulator+(8*3),8);
+    uint8_t diversified_key[8] = { 0 };
+    // e-Purse
+    uint8_t card_challenge_data[8] = { 0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff };
+    //uint8_t card_challenge_data[8] = { 0 };
+    if (simulationMode == MODE_FULLSIM) {
+        //The diversified key should be stored on block 3
+        //Get the diversified key from emulator memory
+        memcpy(diversified_key, emulator+(8*3),8);
 
-		//Card challenge, a.k.a e-purse is on block 2
-		memcpy(card_challenge_data, emulator + (8 * 2) ,8);
-		//Precalculate the cipher state, feeding it the CC
-		cipher_state = opt_doTagMAC_1(card_challenge_data, diversified_key);
-	}
-	// set epurse of sim2,4 attack
-	if (reader_mac_buf != NULL)	{
-		memcpy(reader_mac_buf, card_challenge_data, 8);
-	}
+        //Card challenge, a.k.a e-purse is on block 2
+        memcpy(card_challenge_data, emulator + (8 * 2) ,8);
+        //Precalculate the cipher state, feeding it the CC
+        cipher_state = opt_doTagMAC_1(card_challenge_data, diversified_key);
+    }
+    // set epurse of sim2,4 attack
+    if (reader_mac_buf != NULL) {
+        memcpy(reader_mac_buf, card_challenge_data, 8);
+    }
 
-	int exitLoop = 0;
-	// Reader 0a
-	// Tag    0f
-	// Reader 0c
-	// Tag    anticoll. CSN
-	// Reader 81 anticoll. CSN
-	// Tag    CSN
+    int exitLoop = 0;
+    // Reader 0a
+    // Tag    0f
+    // Reader 0c
+    // Tag    anticoll. CSN
+    // Reader 81 anticoll. CSN
+    // Tag    CSN
 
-	uint8_t *modulated_response;
-	int modulated_response_size = 0;
-	uint8_t* trace_data = NULL;
-	int trace_data_size = 0;
+    uint8_t *modulated_response;
+    int modulated_response_size = 0;
+    uint8_t* trace_data = NULL;
+    int trace_data_size = 0;
 
-	// Respond SOF -- takes 1 bytes
-	uint8_t *resp_sof = BigBuf_malloc(2);
-	int resp_sof_Len;
+    // Respond SOF -- takes 1 bytes
+    uint8_t *resp_sof = BigBuf_malloc(2);
+    int resp_sof_Len;
 
-	// Anticollision CSN (rotated CSN)
-	// 22: Takes 2 bytes for SOF/EOF and 10 * 2 = 20 bytes (2 bytes/byte)
-	uint8_t *resp_anticoll = BigBuf_malloc(28);
-	int resp_anticoll_len;
+    // Anticollision CSN (rotated CSN)
+    // 22: Takes 2 bytes for SOF/EOF and 10 * 2 = 20 bytes (2 bytes/byte)
+    uint8_t *resp_anticoll = BigBuf_malloc(28);
+    int resp_anticoll_len;
 
-	// CSN
-	// 22: Takes 2 bytes for SOF/EOF and 10 * 2 = 20 bytes (2 bytes/byte)
-	uint8_t *resp_csn = BigBuf_malloc(28);
-	int resp_csn_len;
+    // CSN
+    // 22: Takes 2 bytes for SOF/EOF and 10 * 2 = 20 bytes (2 bytes/byte)
+    uint8_t *resp_csn = BigBuf_malloc(28);
+    int resp_csn_len;
 
-	// configuration  picopass 2ks
-	uint8_t *resp_conf = BigBuf_malloc(28);
-	int resp_conf_len;
-	uint8_t conf_data[10] = {0x12,0xFF,0xFF,0xFF,0x7F,0x1F,0xFF,0x3C,0x00,0x00};
-	AddCrc(conf_data, 8);
+    // configuration  picopass 2ks
+    uint8_t *resp_conf = BigBuf_malloc(28);
+    int resp_conf_len;
+    uint8_t conf_data[10] = {0x12,0xFF,0xFF,0xFF,0x7F,0x1F,0xFF,0x3C,0x00,0x00};
+    AddCrc(conf_data, 8);
 
-	// e-Purse
-	// 18: Takes 2 bytes for SOF/EOF and 8 * 2 = 16 bytes (2 bytes/bit)
-	uint8_t *resp_cc = BigBuf_malloc(28);
-	int resp_cc_len;
+    // e-Purse
+    // 18: Takes 2 bytes for SOF/EOF and 8 * 2 = 16 bytes (2 bytes/bit)
+    uint8_t *resp_cc = BigBuf_malloc(28);
+    int resp_cc_len;
 
-	// Application Issuer Area
-	uint8_t *resp_aia = BigBuf_malloc(28);
-	int resp_aia_len;
-	uint8_t aia_data[10] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x00,0x00};
-	AddCrc(aia_data, 8);
+    // Application Issuer Area
+    uint8_t *resp_aia = BigBuf_malloc(28);
+    int resp_aia_len;
+    uint8_t aia_data[10] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x00,0x00};
+    AddCrc(aia_data, 8);
 
-	// receive command
-	uint8_t *receivedCmd = BigBuf_malloc(MAX_FRAME_SIZE);
-	int len = 0;
+    // receive command
+    uint8_t *receivedCmd = BigBuf_malloc(MAX_FRAME_SIZE);
+    int len = 0;
 
-	// Prepare card messages
-	ToSendMax = 0;
+    // Prepare card messages
+    ToSendMax = 0;
 
-	// First card answer: SOF
-	CodeIClassTagSOF();
-	memcpy(resp_sof, ToSend, ToSendMax); resp_sof_Len = ToSendMax;
+    // First card answer: SOF
+    CodeIClassTagSOF();
+    memcpy(resp_sof, ToSend, ToSendMax); resp_sof_Len = ToSendMax;
 
-	// Anticollision CSN
-	CodeIClassTagAnswer(anticoll_data, sizeof(anticoll_data));
-	memcpy(resp_anticoll, ToSend, ToSendMax); resp_anticoll_len = ToSendMax;
+    // Anticollision CSN
+    CodeIClassTagAnswer(anticoll_data, sizeof(anticoll_data));
+    memcpy(resp_anticoll, ToSend, ToSendMax); resp_anticoll_len = ToSendMax;
 
-	// CSN
-	CodeIClassTagAnswer(csn_data, sizeof(csn_data));
-	memcpy(resp_csn, ToSend, ToSendMax); resp_csn_len = ToSendMax;
+    // CSN
+    CodeIClassTagAnswer(csn_data, sizeof(csn_data));
+    memcpy(resp_csn, ToSend, ToSendMax); resp_csn_len = ToSendMax;
 
-	// Configuration
-	CodeIClassTagAnswer(conf_data, sizeof(conf_data));
-	memcpy(resp_conf, ToSend, ToSendMax); resp_conf_len = ToSendMax;
+    // Configuration
+    CodeIClassTagAnswer(conf_data, sizeof(conf_data));
+    memcpy(resp_conf, ToSend, ToSendMax); resp_conf_len = ToSendMax;
 
-	// e-Purse
-	CodeIClassTagAnswer(card_challenge_data, sizeof(card_challenge_data));
-	memcpy(resp_cc, ToSend, ToSendMax); resp_cc_len = ToSendMax;
+    // e-Purse
+    CodeIClassTagAnswer(card_challenge_data, sizeof(card_challenge_data));
+    memcpy(resp_cc, ToSend, ToSendMax); resp_cc_len = ToSendMax;
 
-	// Application Issuer Area
-	CodeIClassTagAnswer(aia_data, sizeof(aia_data));
-	memcpy(resp_aia, ToSend, ToSendMax); resp_aia_len = ToSendMax;
+    // Application Issuer Area
+    CodeIClassTagAnswer(aia_data, sizeof(aia_data));
+    memcpy(resp_aia, ToSend, ToSendMax); resp_aia_len = ToSendMax;
 
-	//This is used for responding to READ-block commands or other data which is dynamically generated
-	//First the 'trace'-data, not encoded for FPGA
-	uint8_t *data_generic_trace = BigBuf_malloc(8 + 2);//8 bytes data + 2byte CRC is max tag answer
+    //This is used for responding to READ-block commands or other data which is dynamically generated
+    //First the 'trace'-data, not encoded for FPGA
+    uint8_t *data_generic_trace = BigBuf_malloc(8 + 2);//8 bytes data + 2byte CRC is max tag answer
 
-	//Then storage for the modulated data
-	//Each bit is doubled when modulated for FPGA, and we also have SOF and EOF (2 bytes)
-	uint8_t *data_response = BigBuf_malloc( (8+2) * 2 + 2);
+    //Then storage for the modulated data
+    //Each bit is doubled when modulated for FPGA, and we also have SOF and EOF (2 bytes)
+    uint8_t *data_response = BigBuf_malloc( (8+2) * 2 + 2);
 
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_TAGSIM_LISTEN);
-	SpinDelay(100);
-	StartCountSspClk();
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_TAGSIM_LISTEN);
+    SpinDelay(100);
+    StartCountSspClk();
 
-	// To control where we are in the protocol
-	uint32_t time_0 = GetCountSspClk();
-	uint32_t t2r_stime = 0, t2r_etime = 0;
-	uint32_t r2t_stime = 0, r2t_etime = 0;
+    // To control where we are in the protocol
+    uint32_t time_0 = GetCountSspClk();
+    uint32_t t2r_stime = 0, t2r_etime = 0;
+    uint32_t r2t_stime = 0, r2t_etime = 0;
 
-	LED_A_ON();
-	bool buttonPressed = false;
+    LED_A_ON();
+    bool buttonPressed = false;
 
-	while (!exitLoop) {
-		WDT_HIT();
+    while (!exitLoop) {
+        WDT_HIT();
 
-		//Signal tracer, can be used to get a trigger for an oscilloscope..
-		LED_B_OFF(); LED_C_OFF();
+        //Signal tracer, can be used to get a trigger for an oscilloscope..
+        LED_B_OFF(); LED_C_OFF();
 
-		r2t_stime = (GetCountSspClk() - time_0) << 4;
-		if (!GetIClassCommandFromReader(receivedCmd, &len, 0)) {
-			buttonPressed = true;
-			exitLoop = true;
-			continue;
-		}
-		r2t_etime = ((GetCountSspClk() - time_0) << 4 ) - r2t_stime;
+        r2t_stime = (GetCountSspClk() - time_0) << 4;
+        if (!GetIClassCommandFromReader(receivedCmd, &len, 0)) {
+            buttonPressed = true;
+            exitLoop = true;
+            continue;
+        }
+        r2t_etime = ((GetCountSspClk() - time_0) << 4 ) - r2t_stime;
 
-		// 330us normal wait,  adjusted for our execution
+        // 330us normal wait,  adjusted for our execution
 
-		LED_C_ON();	//Signal tracer
+        LED_C_ON(); //Signal tracer
 
-		if (receivedCmd[0] == ICLASS_CMD_ACTALL ) {  // 0x0A
-			// Reader in anticollission phase
-			modulated_response = resp_sof; modulated_response_size = resp_sof_Len; //order = 1;
-			trace_data = sof_data;
-			trace_data_size = sizeof(sof_data);
-			// adjusted for 330 + (160*num of slot)
-			goto send;
-		} else if (receivedCmd[0] == ICLASS_CMD_READ_OR_IDENTIFY) { // 0x0C
-			if (len == 1) {
-				// Reader asks for anticollission CSN
-				modulated_response = resp_anticoll; modulated_response_size = resp_anticoll_len; //order = 2;
-				trace_data = anticoll_data;
-				trace_data_size = sizeof(anticoll_data);
-				goto send;
-			}
-			if (len == 4){
-				// block0,1,2,5 is always readable.
-				switch (receivedCmd[1]){
-					case 0:	// csn (0c 00)
-						modulated_response = resp_csn; modulated_response_size = resp_csn_len;
-						trace_data = csn_data;
-						trace_data_size = sizeof(csn_data);
-						break;
-					case 1:	// configuration (0c 01)
-						modulated_response = resp_conf; modulated_response_size = resp_conf_len;
-						trace_data = conf_data;
-						trace_data_size = sizeof(conf_data);
-						break;
-					case 2: // e-purse (0c 02)
-						modulated_response = resp_cc; modulated_response_size = resp_cc_len;
-						trace_data = card_challenge_data;
-						trace_data_size = sizeof(card_challenge_data);
-						// set epurse of sim2,4 attack
-						if (reader_mac_buf != NULL)	{
-							memcpy(reader_mac_buf, card_challenge_data, 8);
-						}
-						break;
-					case 5:// Application Issuer Area (0c 05)
-						modulated_response = resp_aia; modulated_response_size = resp_aia_len;
-						trace_data = aia_data;
-						trace_data_size = sizeof(aia_data);
-						break;
-					default: break;
-				}
-				goto send;
-			}
+        if (receivedCmd[0] == ICLASS_CMD_ACTALL ) {  // 0x0A
+            // Reader in anticollission phase
+            modulated_response = resp_sof; modulated_response_size = resp_sof_Len; //order = 1;
+            trace_data = sof_data;
+            trace_data_size = sizeof(sof_data);
+            // adjusted for 330 + (160*num of slot)
+            goto send;
+        } else if (receivedCmd[0] == ICLASS_CMD_READ_OR_IDENTIFY) { // 0x0C
+            if (len == 1) {
+                // Reader asks for anticollission CSN
+                modulated_response = resp_anticoll; modulated_response_size = resp_anticoll_len; //order = 2;
+                trace_data = anticoll_data;
+                trace_data_size = sizeof(anticoll_data);
+                goto send;
+            }
+            if (len == 4){
+                // block0,1,2,5 is always readable.
+                switch (receivedCmd[1]){
+                    case 0: // csn (0c 00)
+                        modulated_response = resp_csn; modulated_response_size = resp_csn_len;
+                        trace_data = csn_data;
+                        trace_data_size = sizeof(csn_data);
+                        break;
+                    case 1: // configuration (0c 01)
+                        modulated_response = resp_conf; modulated_response_size = resp_conf_len;
+                        trace_data = conf_data;
+                        trace_data_size = sizeof(conf_data);
+                        break;
+                    case 2: // e-purse (0c 02)
+                        modulated_response = resp_cc; modulated_response_size = resp_cc_len;
+                        trace_data = card_challenge_data;
+                        trace_data_size = sizeof(card_challenge_data);
+                        // set epurse of sim2,4 attack
+                        if (reader_mac_buf != NULL) {
+                            memcpy(reader_mac_buf, card_challenge_data, 8);
+                        }
+                        break;
+                    case 5:// Application Issuer Area (0c 05)
+                        modulated_response = resp_aia; modulated_response_size = resp_aia_len;
+                        trace_data = aia_data;
+                        trace_data_size = sizeof(aia_data);
+                        break;
+                    default: break;
+                }
+                goto send;
+            }
 
-		} else if (receivedCmd[0] == ICLASS_CMD_SELECT) { // 0x81
-			// Reader selects anticollission CSN.
-			// Tag sends the corresponding real CSN
-			modulated_response = resp_csn; modulated_response_size = resp_csn_len; //order = 3;
-			trace_data = csn_data;
-			trace_data_size = sizeof(csn_data);
-			goto send;
-		} else if (receivedCmd[0] == ICLASS_CMD_READCHECK_KD) { // 0x88
-			// Read e-purse (88 02)
-			modulated_response = resp_cc; modulated_response_size = resp_cc_len; //order = 4;
-			trace_data = card_challenge_data;
-			trace_data_size = sizeof(card_challenge_data);
-			LED_B_ON();
-			goto send;
-		} else if (receivedCmd[0] == ICLASS_CMD_READCHECK_KC) { // 0x18
-			// Read e-purse (18 02)
-			modulated_response = resp_cc; modulated_response_size = resp_cc_len; //order = 4;
-			trace_data = card_challenge_data;
-			trace_data_size = sizeof(card_challenge_data);
-			LED_B_ON();
-			goto send;
-		} else if (receivedCmd[0] == ICLASS_CMD_CHECK) { // 0x05
-			// Reader random and reader MAC!!!
-			if (simulationMode == MODE_FULLSIM) {
-				// NR, from reader, is in receivedCmd +1
-				opt_doTagMAC_2(cipher_state, receivedCmd+1, data_generic_trace, diversified_key);
+        } else if (receivedCmd[0] == ICLASS_CMD_SELECT) { // 0x81
+            // Reader selects anticollission CSN.
+            // Tag sends the corresponding real CSN
+            modulated_response = resp_csn; modulated_response_size = resp_csn_len; //order = 3;
+            trace_data = csn_data;
+            trace_data_size = sizeof(csn_data);
+            goto send;
+        } else if (receivedCmd[0] == ICLASS_CMD_READCHECK_KD) { // 0x88
+            // Read e-purse (88 02)
+            modulated_response = resp_cc; modulated_response_size = resp_cc_len; //order = 4;
+            trace_data = card_challenge_data;
+            trace_data_size = sizeof(card_challenge_data);
+            LED_B_ON();
+            goto send;
+        } else if (receivedCmd[0] == ICLASS_CMD_READCHECK_KC) { // 0x18
+            // Read e-purse (18 02)
+            modulated_response = resp_cc; modulated_response_size = resp_cc_len; //order = 4;
+            trace_data = card_challenge_data;
+            trace_data_size = sizeof(card_challenge_data);
+            LED_B_ON();
+            goto send;
+        } else if (receivedCmd[0] == ICLASS_CMD_CHECK) { // 0x05
+            // Reader random and reader MAC!!!
+            if (simulationMode == MODE_FULLSIM) {
+                // NR, from reader, is in receivedCmd +1
+                opt_doTagMAC_2(cipher_state, receivedCmd+1, data_generic_trace, diversified_key);
 
-				trace_data = data_generic_trace;
-				trace_data_size = 4;
-				CodeIClassTagAnswer(trace_data , trace_data_size);
-				memcpy(data_response, ToSend, ToSendMax);
-				modulated_response = data_response;
-				modulated_response_size = ToSendMax;
-			} else {
-				// Not fullsim, we don't respond
-				// We do not know what to answer, so lets keep quiet
-				modulated_response = resp_sof; modulated_response_size = 0;
-				trace_data = NULL;
-				trace_data_size = 0;
+                trace_data = data_generic_trace;
+                trace_data_size = 4;
+                CodeIClassTagAnswer(trace_data , trace_data_size);
+                memcpy(data_response, ToSend, ToSendMax);
+                modulated_response = data_response;
+                modulated_response_size = ToSendMax;
+            } else {
+                // Not fullsim, we don't respond
+                // We do not know what to answer, so lets keep quiet
+                modulated_response = resp_sof; modulated_response_size = 0;
+                trace_data = NULL;
+                trace_data_size = 0;
 
-				if (simulationMode == MODE_EXIT_AFTER_MAC) {
+                if (simulationMode == MODE_EXIT_AFTER_MAC) {
 
-					if ( MF_DBGLEVEL ==  MF_DBG_EXTENDED) {
-						Dbprintf("[+] CSN: %02x %02x %02x %02x %02x %02x %02x %02x", csn[0], csn[1], csn[2], csn[3], csn[4], csn[5], csn[6], csn[7]);
-						Dbprintf("[+] RDR:  (len=%02d): %02x %02x %02x %02x %02x %02x %02x %02x %02x", len,
-							receivedCmd[0], receivedCmd[1], receivedCmd[2],
-							receivedCmd[3], receivedCmd[4], receivedCmd[5],
-							receivedCmd[6], receivedCmd[7], receivedCmd[8]);
-					} else {
-						Dbprintf("[+] CSN: %02x .... %02x OK", csn[0], csn[7]);
-					}
-					if (reader_mac_buf != NULL)	{
-						memcpy(reader_mac_buf + 8, receivedCmd+1, 8);
-					}
-					exitLoop = true;
-				}
-			}
-			goto send;
-		} else if (receivedCmd[0] == ICLASS_CMD_HALT && len == 1) {
-			// Reader ends the session
-			modulated_response = resp_sof; modulated_response_size = 0; //order = 0;
-			trace_data = NULL;
-			trace_data_size = 0;
-			goto send;
-		} else if (simulationMode == MODE_FULLSIM && receivedCmd[0] == ICLASS_CMD_READ_OR_IDENTIFY && len == 4){ // 0x0C
-			//Read block
-			uint16_t blk = receivedCmd[1];
-			//Take the data...
-			memcpy(data_generic_trace, emulator+(blk << 3),8);
-			AddCrc(data_generic_trace, 8);
-			trace_data = data_generic_trace;
-			trace_data_size = 10;
-			CodeIClassTagAnswer(trace_data , trace_data_size);
-			memcpy(data_response, ToSend, ToSendMax);
-			modulated_response = data_response;
-			modulated_response_size = ToSendMax;
-			goto send;
-		} else if (simulationMode == MODE_FULLSIM && receivedCmd[0] == ICLASS_CMD_UPDATE) {
+                    if ( MF_DBGLEVEL ==  MF_DBG_EXTENDED) {
+                        Dbprintf("[+] CSN: %02x %02x %02x %02x %02x %02x %02x %02x", csn[0], csn[1], csn[2], csn[3], csn[4], csn[5], csn[6], csn[7]);
+                        Dbprintf("[+] RDR:  (len=%02d): %02x %02x %02x %02x %02x %02x %02x %02x %02x", len,
+                            receivedCmd[0], receivedCmd[1], receivedCmd[2],
+                            receivedCmd[3], receivedCmd[4], receivedCmd[5],
+                            receivedCmd[6], receivedCmd[7], receivedCmd[8]);
+                    } else {
+                        Dbprintf("[+] CSN: %02x .... %02x OK", csn[0], csn[7]);
+                    }
+                    if (reader_mac_buf != NULL) {
+                        memcpy(reader_mac_buf + 8, receivedCmd+1, 8);
+                    }
+                    exitLoop = true;
+                }
+            }
+            goto send;
+        } else if (receivedCmd[0] == ICLASS_CMD_HALT && len == 1) {
+            // Reader ends the session
+            modulated_response = resp_sof; modulated_response_size = 0; //order = 0;
+            trace_data = NULL;
+            trace_data_size = 0;
+            goto send;
+        } else if (simulationMode == MODE_FULLSIM && receivedCmd[0] == ICLASS_CMD_READ_OR_IDENTIFY && len == 4){ // 0x0C
+            //Read block
+            uint16_t blk = receivedCmd[1];
+            //Take the data...
+            memcpy(data_generic_trace, emulator+(blk << 3),8);
+            AddCrc(data_generic_trace, 8);
+            trace_data = data_generic_trace;
+            trace_data_size = 10;
+            CodeIClassTagAnswer(trace_data , trace_data_size);
+            memcpy(data_response, ToSend, ToSendMax);
+            modulated_response = data_response;
+            modulated_response_size = ToSendMax;
+            goto send;
+        } else if (simulationMode == MODE_FULLSIM && receivedCmd[0] == ICLASS_CMD_UPDATE) {
 
-			//Probably the reader wants to update the nonce. Let's just ignore that for now.
-			// OBS! If this is implemented, don't forget to regenerate the cipher_state
-			//We're expected to respond with the data+crc, exactly what's already in the receivedcmd
-			//receivedcmd is now UPDATE 1b | ADDRESS 1b| DATA 8b| Signature 4b or CRC 2b|
+            //Probably the reader wants to update the nonce. Let's just ignore that for now.
+            // OBS! If this is implemented, don't forget to regenerate the cipher_state
+            //We're expected to respond with the data+crc, exactly what's already in the receivedcmd
+            //receivedcmd is now UPDATE 1b | ADDRESS 1b| DATA 8b| Signature 4b or CRC 2b|
 
-			//Take the data...
-			memcpy(data_generic_trace, receivedCmd+2, 8);
-			AddCrc(data_generic_trace, 8);
-			trace_data = data_generic_trace;
-			trace_data_size = 10;
-			CodeIClassTagAnswer(trace_data, trace_data_size);
+            //Take the data...
+            memcpy(data_generic_trace, receivedCmd+2, 8);
+            AddCrc(data_generic_trace, 8);
+            trace_data = data_generic_trace;
+            trace_data_size = 10;
+            CodeIClassTagAnswer(trace_data, trace_data_size);
 
-			memcpy(data_response, ToSend, ToSendMax);
-			modulated_response = data_response;
-			modulated_response_size = ToSendMax;
-//			response_delay = 4600 * 1.5;  // tPROG 4-15ms
-			goto send;
-//		} else if(receivedCmd[0] == ICLASS_CMD_PAGESEL)	{  // 0x84
-			//Pagesel
-			//Pagesel enables to select a page in the selected chip memory and return its configuration block
-			//Chips with a single page will not answer to this command
-			// It appears we're fine ignoring this.
-			//Otherwise, we should answer 8bytes (block) + 2bytes CRC
-//		} else if(receivedCmd[0] == ICLASS_CMD_DETECT)	{  // 0x0F
-		} else {
-			//#db# Unknown command received from reader (len=5): 26 1 0 f6 a 44 44 44 44
-			// Never seen this command before
-			if ( MF_DBGLEVEL ==  MF_DBG_EXTENDED)
-				print_result("[-] Unhandled command received ", receivedCmd, len);
+            memcpy(data_response, ToSend, ToSendMax);
+            modulated_response = data_response;
+            modulated_response_size = ToSendMax;
+//            response_delay = 4600 * 1.5;  // tPROG 4-15ms
+            goto send;
+//            } else if(receivedCmd[0] == ICLASS_CMD_PAGESEL) {  // 0x84
+            //Pagesel
+            //Pagesel enables to select a page in the selected chip memory and return its configuration block
+            //Chips with a single page will not answer to this command
+            // It appears we're fine ignoring this.
+            //Otherwise, we should answer 8bytes (block) + 2bytes CRC
+//            } else if(receivedCmd[0] == ICLASS_CMD_DETECT) {  // 0x0F
+        } else {
+            //#db# Unknown command received from reader (len=5): 26 1 0 f6 a 44 44 44 44
+            // Never seen this command before
+            if ( MF_DBGLEVEL ==  MF_DBG_EXTENDED)
+                print_result("[-] Unhandled command received ", receivedCmd, len);
 
-			// Do not respond
-			modulated_response = resp_sof;
-			modulated_response_size = 0; //order = 0;
-			trace_data = NULL;
-			trace_data_size = 0;
-		}
+            // Do not respond
+            modulated_response = resp_sof;
+            modulated_response_size = 0; //order = 0;
+            trace_data = NULL;
+            trace_data_size = 0;
+        }
 
 send:
-		/**
-		A legit tag has about 330us delay between reader EOT and tag SOF.
-		**/
-		if (modulated_response_size > 0) {
-			t2r_stime = (GetCountSspClk() - time_0) << 4;
-			SendIClassAnswer(modulated_response, modulated_response_size, 0);
-			t2r_etime = ((GetCountSspClk() - time_0) << 4 ) - t2r_stime;
-		}
+        /**
+        A legit tag has about 330us delay between reader EOT and tag SOF.
+        **/
+        if (modulated_response_size > 0) {
+            t2r_stime = (GetCountSspClk() - time_0) << 4;
+            SendIClassAnswer(modulated_response, modulated_response_size, 0);
+            t2r_etime = ((GetCountSspClk() - time_0) << 4 ) - t2r_stime;
+        }
 
-		LogTrace(receivedCmd, len, r2t_stime, r2t_etime, NULL, true);
+        LogTrace(receivedCmd, len, r2t_stime, r2t_etime, NULL, true);
 
-		if (trace_data != NULL)
-			LogTrace(trace_data, trace_data_size, t2r_stime, t2r_etime, NULL, false);
-	}
+        if (trace_data != NULL)
+            LogTrace(trace_data, trace_data_size, t2r_stime, t2r_etime, NULL, false);
+    }
 
-	LEDsoff();
+    LEDsoff();
 
-	if (buttonPressed)
-		DbpString("[+] button pressed");
+    if (buttonPressed)
+        DbpString("[+] button pressed");
 
-	return buttonPressed;
+    return buttonPressed;
 }
 
 /**
@@ -1581,35 +1581,35 @@ send:
  * @param delay
  */
 static int SendIClassAnswer(uint8_t *resp, int respLen, uint16_t delay) {
-	int i = 0;
-	volatile uint8_t b = 0;
+    int i = 0;
+    volatile uint8_t b = 0;
 
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_SIMULATOR | FPGA_HF_SIMULATOR_MODULATE_424K_8BIT);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_SIMULATOR | FPGA_HF_SIMULATOR_MODULATE_424K_8BIT);
 
-	AT91C_BASE_SSC->SSC_THR = 0x00;
+    AT91C_BASE_SSC->SSC_THR = 0x00;
 
-	while (!BUTTON_PRESS()) {
+    while (!BUTTON_PRESS()) {
 
-		// Prevent rx holding register from overflowing
-		if ( (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY)){
-			b = AT91C_BASE_SSC->SSC_RHR; (void) b;
-		}
+        // Prevent rx holding register from overflowing
+        if ( (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY)){
+            b = AT91C_BASE_SSC->SSC_RHR; (void) b;
+        }
 
-		// Put byte into tx holding register as soon as it is ready
-		if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)){
-			b = 0x00;
-			if ( i < respLen){
-				b = resp[i];
-				//Hack
-				//b = 0xAC;
-			}
-			i++;
-			AT91C_BASE_SSC->SSC_THR = b;
-		}
-//		if (i > respLen + 4) break;
-		if (i > respLen + 1) break;
-	}
-	return 0;
+        // Put byte into tx holding register as soon as it is ready
+        if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)){
+            b = 0x00;
+            if ( i < respLen){
+                b = resp[i];
+                //Hack
+                //b = 0xAC;
+            }
+            i++;
+            AT91C_BASE_SSC->SSC_THR = b;
+        }
+// if (i > respLen + 4) break;
+        if (i > respLen + 1) break;
+    }
+    return 0;
 }
 
 /// THE READER CODE
@@ -1619,114 +1619,114 @@ static int SendIClassAnswer(uint8_t *resp, int respLen, uint16_t delay) {
 //-----------------------------------------------------------------------------
 static void TransmitIClassCommand(const uint8_t *cmd, int len, int *samples, int *wait) {
 
-	int c = 0;
-	volatile uint32_t b;
-	bool firstpart = true;
-	uint8_t sendbyte;
+    int c = 0;
+    volatile uint32_t b;
+    bool firstpart = true;
+    uint8_t sendbyte;
 
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD);
-	AT91C_BASE_SSC->SSC_THR = 0x00;
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD);
+    AT91C_BASE_SSC->SSC_THR = 0x00;
 
-	 // make sure we timeout previous comms.
-	if ( *wait )
-		SpinDelayUs(*wait);
+     // make sure we timeout previous comms.
+    if ( *wait )
+        SpinDelayUs(*wait);
 
-	for (;;) {
+    for (;;) {
 
-		WDT_HIT();
+        WDT_HIT();
 
-		// Put byte into tx holding register as soon as it is ready
-		if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
+        // Put byte into tx holding register as soon as it is ready
+        if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
 
-			// DOUBLE THE SAMPLES!
-			if (firstpart) {
-				sendbyte = (cmd[c] & 0xf0) | (cmd[c] >> 4);
-			} else {
-				sendbyte = (cmd[c] & 0x0f) | (cmd[c] << 4);
-				c++;
-			}
+            // DOUBLE THE SAMPLES!
+            if (firstpart) {
+                sendbyte = (cmd[c] & 0xf0) | (cmd[c] >> 4);
+            } else {
+                sendbyte = (cmd[c] & 0x0f) | (cmd[c] << 4);
+                c++;
+            }
 
-			if (sendbyte == 0xff)
-				sendbyte = 0xfe;
+            if (sendbyte == 0xff)
+                sendbyte = 0xfe;
 
-			AT91C_BASE_SSC->SSC_THR = sendbyte;
-			firstpart = !firstpart;
+            AT91C_BASE_SSC->SSC_THR = sendbyte;
+            firstpart = !firstpart;
 
-			if (c >= len) break;
-		}
+            if (c >= len) break;
+        }
 
-		// Prevent rx holding register from overflowing
-		if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
-			b = AT91C_BASE_SSC->SSC_RHR; (void)b;
-		}
-	}
+        // Prevent rx holding register from overflowing
+        if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
+            b = AT91C_BASE_SSC->SSC_RHR; (void)b;
+        }
+    }
 
-	if (samples) {
-		if (wait)
-			*samples = (c + *wait) << 3;
-		else
-			*samples = c << 3;
-	}
+    if (samples) {
+        if (wait)
+            *samples = (c + *wait) << 3;
+        else
+            *samples = c << 3;
+    }
 }
 
 //-----------------------------------------------------------------------------
 // Prepare iClass reader command to send to FPGA
 //-----------------------------------------------------------------------------
 void CodeIClassCommand(const uint8_t* cmd, int len) {
-	int i, j, k;
-	uint8_t b;
+    int i, j, k;
+    uint8_t b;
 
-	ToSendReset();
+    ToSendReset();
 
-	// (SOC) Start of Communication: 1 out of 4
-	ToSend[++ToSendMax] = 0xf0;
-	ToSend[++ToSendMax] = 0x00;
-	ToSend[++ToSendMax] = 0x0f;
-	ToSend[++ToSendMax] = 0x00;
+    // (SOC) Start of Communication: 1 out of 4
+    ToSend[++ToSendMax] = 0xf0;
+    ToSend[++ToSendMax] = 0x00;
+    ToSend[++ToSendMax] = 0x0f;
+    ToSend[++ToSendMax] = 0x00;
 
-	// Modulate the bytes
-	for (i = 0; i < len; i++) {
-		b = cmd[i];
-		for (j = 0; j < 4; j++) {
-			for (k = 0; k < 4; k++) {
+    // Modulate the bytes
+    for (i = 0; i < len; i++) {
+        b = cmd[i];
+        for (j = 0; j < 4; j++) {
+            for (k = 0; k < 4; k++) {
 
-				if (k == (b & 3))
-					ToSend[++ToSendMax] = 0xf0;
-				else
-					ToSend[++ToSendMax] = 0x00;
-			}
-			b >>= 2;
-		}
-	}
+                if (k == (b & 3))
+                    ToSend[++ToSendMax] = 0xf0;
+                else
+                    ToSend[++ToSendMax] = 0x00;
+            }
+            b >>= 2;
+        }
+    }
 
-	// (EOC) End of Communication
-	ToSend[++ToSendMax] = 0x00;
-	ToSend[++ToSendMax] = 0x00;
-	ToSend[++ToSendMax] = 0xf0;
-	ToSend[++ToSendMax] = 0x00;
+    // (EOC) End of Communication
+    ToSend[++ToSendMax] = 0x00;
+    ToSend[++ToSendMax] = 0x00;
+    ToSend[++ToSendMax] = 0xf0;
+    ToSend[++ToSendMax] = 0x00;
 
-	// Convert from last character reference to length
-	ToSendMax++;
+    // Convert from last character reference to length
+    ToSendMax++;
 }
 
 void ReaderTransmitIClass_ext(uint8_t* frame, int len, int wait) {
 
-	int samples = 0;
+    int samples = 0;
 
-	// This is tied to other size changes
-	CodeIClassCommand(frame, len);
+    // This is tied to other size changes
+    CodeIClassCommand(frame, len);
 
-	// Select the card
-	TransmitIClassCommand(ToSend, ToSendMax, &samples, &wait);
-	if (trigger)
-		LED_A_ON();
+    // Select the card
+    TransmitIClassCommand(ToSend, ToSendMax, &samples, &wait);
+    if (trigger)
+        LED_A_ON();
 
-	rsamples += samples;
+    rsamples += samples;
 
-	LogTrace(frame, len, rsamples, rsamples, NULL, true);
+    LogTrace(frame, len, rsamples, rsamples, NULL, true);
 }
 void ReaderTransmitIClass(uint8_t* frame, int len) {
-	ReaderTransmitIClass_ext(frame, len, 330);
+    ReaderTransmitIClass_ext(frame, len, 330);
 }
 
 //-----------------------------------------------------------------------------
@@ -1735,75 +1735,75 @@ void ReaderTransmitIClass(uint8_t* frame, int len) {
 //  If it takes too long return FALSE
 //-----------------------------------------------------------------------------
 static int GetIClassAnswer(uint8_t* receivedResponse, int maxLen, int *samples, int *elapsed) {
-	// buffer needs to be 512 bytes
-	// maxLen is not used...
+    // buffer needs to be 512 bytes
+    // maxLen is not used...
 
-	int c = 0;
-	bool skip = false;
+    int c = 0;
+    bool skip = false;
 
-	// Setup UART/DEMOD to receive
-	DemodInit(receivedResponse);
+    // Setup UART/DEMOD to receive
+    DemodInit(receivedResponse);
 
-	if (elapsed) *elapsed = 0;
+    if (elapsed) *elapsed = 0;
 
-	// Set FPGA mode to "reader listen mode", no modulation (listen
-	// only, since we are receiving, not transmitting).
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_LISTEN);
-	SpinDelayUs(320);  //310 Tout= 330us (iso15603-2)   (330/21.3) take consideration for clock increments.
+    // Set FPGA mode to "reader listen mode", no modulation (listen
+    // only, since we are receiving, not transmitting).
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_LISTEN);
+    SpinDelayUs(320);  //310 Tout= 330us (iso15603-2)   (330/21.3) take consideration for clock increments.
 
-	// clear RXRDY:
+    // clear RXRDY:
     uint8_t b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
 
-	while (!BUTTON_PRESS()) {
-		WDT_HIT();
+    while (!BUTTON_PRESS()) {
+        WDT_HIT();
 
-		 // keep tx buffer in a defined state anyway.
-		if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
-			AT91C_BASE_SSC->SSC_THR = 0x00;
-			// To make use of exact timing of next command from reader!!
-			if (elapsed) (*elapsed)++;
-		}
+         // keep tx buffer in a defined state anyway.
+        if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
+            AT91C_BASE_SSC->SSC_THR = 0x00;
+            // To make use of exact timing of next command from reader!!
+            if (elapsed) (*elapsed)++;
+        }
 
-		// Wait for byte be become available in rx holding register
-		if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
-			if (c >= timeout) return false;
+        // Wait for byte be become available in rx holding register
+        if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
+            if (c >= timeout) return false;
 
-			c++;
+            c++;
 
-			b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
+            b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
 
-			skip = !skip;
-			if (skip) continue;
+            skip = !skip;
+            if (skip) continue;
 
-			if (ManchesterDecoding_iclass(b & 0x0f)) {
-				if (samples)
-					*samples = c << 3;
-				return true;
-			}
-		}
-	}
-	return false;
+            if (ManchesterDecoding_iclass(b & 0x0f)) {
+                if (samples)
+                    *samples = c << 3;
+                return true;
+            }
+        }
+    }
+    return false;
 }
 
 int ReaderReceiveIClass(uint8_t* receivedAnswer) {
-	int samples = 0;
+    int samples = 0;
 
-	if (!GetIClassAnswer(receivedAnswer, 0, &samples, NULL))
-		return false;
+    if (!GetIClassAnswer(receivedAnswer, 0, &samples, NULL))
+        return false;
 
-	rsamples += samples;
+    rsamples += samples;
 
-	LogTrace(receivedAnswer, Demod.len, rsamples, rsamples, NULL, false);
+    LogTrace(receivedAnswer, Demod.len, rsamples, rsamples, NULL, false);
 
-	if (samples == 0)
-		return false;
+    if (samples == 0)
+        return false;
 
-	return Demod.len;
+    return Demod.len;
 }
 
 void setupIclassReader() {
 
-	LEDsoff();
+    LEDsoff();
 
     // Start from off (no field generated)
     // Signal field is off with the appropriate LED
@@ -1815,39 +1815,39 @@ void setupIclassReader() {
 
     SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
 
-	clear_trace();
-	set_tracing(true);
+    clear_trace();
+    set_tracing(true);
 
     // Now give it time to spin up.
     // Signal field is on with the appropriate LED
     FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD);
     SpinDelay(300);
 
-	StartCountSspClk();
+    StartCountSspClk();
 
     LED_A_ON();
 }
 
 bool sendCmdGetResponseWithRetries(uint8_t* command, size_t cmdsize, uint8_t* resp, uint8_t expected_size, uint8_t retries) {
-	uint8_t got_n = 0;
-	while (retries-- > 0) {
+    uint8_t got_n = 0;
+    while (retries-- > 0) {
 
-		ReaderTransmitIClass(command, cmdsize);
+        ReaderTransmitIClass(command, cmdsize);
 
-		//iceman - if received size is bigger than expected, we smash the stack here
-		//		since its called with fixed sized arrays
-		got_n = ReaderReceiveIClass(resp);
+        //iceman - if received size is bigger than expected, we smash the stack here
+        // since its called with fixed sized arrays
+        got_n = ReaderReceiveIClass(resp);
 
-		// 0xBB is the internal debug separator byte..
-		if ( expected_size != got_n|| (resp[0] == 0xBB || resp[7] == 0xBB || resp[2] == 0xBB)) {
-			//try again
-			continue;
-		}
+        // 0xBB is the internal debug separator byte..
+        if ( expected_size != got_n|| (resp[0] == 0xBB || resp[7] == 0xBB || resp[2] == 0xBB)) {
+            //try again
+            continue;
+        }
 
-		if (got_n == expected_size)
-			return true;
-	}
-	return false;
+        if (got_n == expected_size)
+            return true;
+    }
+    return false;
 }
 
 /**
@@ -1859,357 +1859,357 @@ bool sendCmdGetResponseWithRetries(uint8_t* command, size_t cmdsize, uint8_t* re
  */
 uint8_t handshakeIclassTag_ext(uint8_t *card_data, bool use_credit_key) {
 
-	// act_all...
-	static uint8_t act_all[]      = { ICLASS_CMD_ACTALL };
-	static uint8_t identify[]     = { ICLASS_CMD_READ_OR_IDENTIFY, 0x00, 0x73, 0x33 };
-	static uint8_t select[]       = { ICLASS_CMD_SELECT, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
-	uint8_t readcheck_cc[] = { ICLASS_CMD_READCHECK_KD, 0x02 };
+    // act_all...
+    static uint8_t act_all[]      = { ICLASS_CMD_ACTALL };
+    static uint8_t identify[]     = { ICLASS_CMD_READ_OR_IDENTIFY, 0x00, 0x73, 0x33 };
+    static uint8_t select[]       = { ICLASS_CMD_SELECT, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+    uint8_t readcheck_cc[] = { ICLASS_CMD_READCHECK_KD, 0x02 };
 
-	if (use_credit_key)
-		readcheck_cc[0] = ICLASS_CMD_READCHECK_KC;
+    if (use_credit_key)
+        readcheck_cc[0] = ICLASS_CMD_READCHECK_KC;
 
-	uint8_t resp[ICLASS_BUFFER_SIZE] = {0};
-	uint8_t read_status = 0;
+    uint8_t resp[ICLASS_BUFFER_SIZE] = {0};
+    uint8_t read_status = 0;
 
-	// Send act_all
-	ReaderTransmitIClass_ext(act_all, 1, 330+160);
-	// Card present?
-	if (!ReaderReceiveIClass(resp)) return read_status;//Fail
+    // Send act_all
+    ReaderTransmitIClass_ext(act_all, 1, 330+160);
+    // Card present?
+    if (!ReaderReceiveIClass(resp)) return read_status;//Fail
 
-	//Send Identify
-	ReaderTransmitIClass(identify, 1);
+    //Send Identify
+    ReaderTransmitIClass(identify, 1);
 
-	//We expect a 10-byte response here, 8 byte anticollision-CSN and 2 byte CRC
-	uint8_t len = ReaderReceiveIClass(resp);
-	if (len != 10) return read_status;//Fail
+    //We expect a 10-byte response here, 8 byte anticollision-CSN and 2 byte CRC
+    uint8_t len = ReaderReceiveIClass(resp);
+    if (len != 10) return read_status;//Fail
 
-	//Copy the Anti-collision CSN to our select-packet
-	memcpy(&select[1], resp, 8);
+    //Copy the Anti-collision CSN to our select-packet
+    memcpy(&select[1], resp, 8);
 
-	//Select the card
-	ReaderTransmitIClass(select, sizeof(select));
+    //Select the card
+    ReaderTransmitIClass(select, sizeof(select));
 
-	//We expect a 10-byte response here, 8 byte CSN and 2 byte CRC
-	len = ReaderReceiveIClass(resp);
-	if (len != 10) return read_status;//Fail
+    //We expect a 10-byte response here, 8 byte CSN and 2 byte CRC
+    len = ReaderReceiveIClass(resp);
+    if (len != 10) return read_status;//Fail
 
-	//Success - level 1, we got CSN
-	//Save CSN in response data
-	memcpy(card_data, resp, 8);
+    //Success - level 1, we got CSN
+    //Save CSN in response data
+    memcpy(card_data, resp, 8);
 
-	//Flag that we got to at least stage 1, read CSN
-	read_status = 1;
+    //Flag that we got to at least stage 1, read CSN
+    read_status = 1;
 
-	// Card selected, now read e-purse (cc) (block2) (only 8 bytes no CRC)
-	//	ReaderTransmitIClass(readcheck_cc, sizeof(readcheck_cc));
-	// if (ReaderReceiveIClass(resp) == 8) {
-		// //Save CC (e-purse) in response data
-		// memcpy(card_data+8, resp, 8);
-		// read_status++;
-	// }
+    // Card selected, now read e-purse (cc) (block2) (only 8 bytes no CRC)
+    // ReaderTransmitIClass(readcheck_cc, sizeof(readcheck_cc));
+    // if (ReaderReceiveIClass(resp) == 8) {
+        // //Save CC (e-purse) in response data
+        // memcpy(card_data+8, resp, 8);
+        // read_status++;
+    // }
 
-	bool isOK = sendCmdGetResponseWithRetries(readcheck_cc, sizeof(readcheck_cc), resp, 8, 3);
-	if (!isOK) return read_status;
+    bool isOK = sendCmdGetResponseWithRetries(readcheck_cc, sizeof(readcheck_cc), resp, 8, 3);
+    if (!isOK) return read_status;
 
-	//Save CC (e-purse) in response data
-	memcpy(card_data+8, resp, 8);
-	read_status++;
-	return read_status;
+    //Save CC (e-purse) in response data
+    memcpy(card_data+8, resp, 8);
+    read_status++;
+    return read_status;
 }
 uint8_t handshakeIclassTag(uint8_t *card_data){
-	return handshakeIclassTag_ext(card_data, false);
+    return handshakeIclassTag_ext(card_data, false);
 }
 
 // Reader iClass Anticollission
 // turn off afterwards
 void ReaderIClass(uint8_t arg0) {
 
-	uint8_t card_data[6 * 8] = {0};
-	uint8_t last_csn[8] = {0,0,0,0,0,0,0,0};
-	uint8_t resp[ICLASS_BUFFER_SIZE];
+    uint8_t card_data[6 * 8] = {0};
+    uint8_t last_csn[8] = {0,0,0,0,0,0,0,0};
+    uint8_t resp[ICLASS_BUFFER_SIZE];
 
-	memset(card_data, 0xFF, sizeof(card_data));
-	memset(resp, 0xFF, sizeof(resp));
+    memset(card_data, 0xFF, sizeof(card_data));
+    memset(resp, 0xFF, sizeof(resp));
 
-	//Read conf block CRC(0x01) => 0xfa 0x22
-	uint8_t readConf[] = { ICLASS_CMD_READ_OR_IDENTIFY, 0x01, 0xfa, 0x22};
+    //Read conf block CRC(0x01) => 0xfa 0x22
+    uint8_t readConf[] = { ICLASS_CMD_READ_OR_IDENTIFY, 0x01, 0xfa, 0x22};
 
-	//Read App Issuer Area block CRC(0x05) => 0xde  0x64
-	uint8_t readAA[] = { ICLASS_CMD_READ_OR_IDENTIFY, 0x05, 0xde, 0x64};
+    //Read App Issuer Area block CRC(0x05) => 0xde  0x64
+    uint8_t readAA[] = { ICLASS_CMD_READ_OR_IDENTIFY, 0x05, 0xde, 0x64};
 
     int read_status = 0;
-	uint16_t tryCnt = 0;
-	uint8_t result_status = 0;
+    uint16_t tryCnt = 0;
+    uint8_t result_status = 0;
 
-    bool abort_after_read = arg0 & FLAG_ICLASS_READER_ONLY_ONCE;		// flag to read until one tag is found successfully
-	bool try_once = arg0 & FLAG_ICLASS_READER_ONE_TRY;					// flag to not to loop continuously, looking for tag
-	bool use_credit_key = arg0 & FLAG_ICLASS_READER_CEDITKEY;			// flag to use credit key
-	bool flagReadConfig = arg0 & FLAG_ICLASS_READER_CONF;				// flag to read block1, configuration
-	bool flagReadCC = arg0 & FLAG_ICLASS_READER_CC;						// flag to read block2, e-purse
-	bool flagReadAIA = arg0 & FLAG_ICLASS_READER_AIA;					// flag to read block5, application issuer area
+    bool abort_after_read = arg0 & FLAG_ICLASS_READER_ONLY_ONCE;  // flag to read until one tag is found successfully
+    bool try_once = arg0 & FLAG_ICLASS_READER_ONE_TRY;            // flag to not to loop continuously, looking for tag
+    bool use_credit_key = arg0 & FLAG_ICLASS_READER_CEDITKEY;     // flag to use credit key
+    bool flagReadConfig = arg0 & FLAG_ICLASS_READER_CONF;         // flag to read block1, configuration
+    bool flagReadCC = arg0 & FLAG_ICLASS_READER_CC;               // flag to read block2, e-purse
+    bool flagReadAIA = arg0 & FLAG_ICLASS_READER_AIA;             // flag to read block5, application issuer area
 
-	setupIclassReader();
+    setupIclassReader();
 
-	bool userCancelled = BUTTON_PRESS() || usb_poll_validate_length();
-	while (!userCancelled) {
+    bool userCancelled = BUTTON_PRESS() || usb_poll_validate_length();
+    while (!userCancelled) {
 
-		WDT_HIT();
+        WDT_HIT();
 
-		// if only looking for one card try 2 times if we missed it the first time
-		if (try_once && tryCnt > 2) {
-			if (MF_DBGLEVEL > 1) DbpString("Failed to find a tag");
-			break;
-		}
+        // if only looking for one card try 2 times if we missed it the first time
+        if (try_once && tryCnt > 2) {
+            if (MF_DBGLEVEL > 1) DbpString("Failed to find a tag");
+            break;
+        }
 
-		tryCnt++;
-		result_status = 0;
+        tryCnt++;
+        result_status = 0;
 
-		read_status = handshakeIclassTag_ext(card_data, use_credit_key);
+        read_status = handshakeIclassTag_ext(card_data, use_credit_key);
 
-		if (read_status == 0) continue;
-		if (read_status == 1) result_status = FLAG_ICLASS_READER_CSN;
-		if (read_status == 2) result_status = FLAG_ICLASS_READER_CSN | FLAG_ICLASS_READER_CC;
+        if (read_status == 0) continue;
+        if (read_status == 1) result_status = FLAG_ICLASS_READER_CSN;
+        if (read_status == 2) result_status = FLAG_ICLASS_READER_CSN | FLAG_ICLASS_READER_CC;
 
-		// handshakeIclass returns CSN|CC, but the actual block
-		// layout is CSN|CONFIG|CC, so here we reorder the data,
-		// moving CC forward 8 bytes
-		memcpy(card_data+16, card_data+8, 8);
+        // handshakeIclass returns CSN|CC, but the actual block
+        // layout is CSN|CONFIG|CC, so here we reorder the data,
+        // moving CC forward 8 bytes
+        memcpy(card_data+16, card_data+8, 8);
 
-		//Read block 1, config
-		if (flagReadConfig) {
-			if (sendCmdGetResponseWithRetries(readConf, sizeof(readConf), resp, 10, 5)) {
-				result_status |= FLAG_ICLASS_READER_CONF;
-				memcpy(card_data+8, resp, 8);
-			} else {
-				if (MF_DBGLEVEL > 1) DbpString("Failed to dump config block");
-			}
-		}
+        //Read block 1, config
+        if (flagReadConfig) {
+            if (sendCmdGetResponseWithRetries(readConf, sizeof(readConf), resp, 10, 5)) {
+                result_status |= FLAG_ICLASS_READER_CONF;
+                memcpy(card_data+8, resp, 8);
+            } else {
+                if (MF_DBGLEVEL > 1) DbpString("Failed to dump config block");
+            }
+        }
 
-		//Read block 5, AIA
-		if (flagReadAIA) {
-			if (sendCmdGetResponseWithRetries(readAA, sizeof(readAA), resp, 10, 5)) {
-				result_status |= FLAG_ICLASS_READER_AIA;
-				memcpy(card_data+(8*5), resp, 8);
-			} else {
-				if (MF_DBGLEVEL > 1) DbpString("Failed to dump AA block");
-			}
-		}
+        //Read block 5, AIA
+        if (flagReadAIA) {
+            if (sendCmdGetResponseWithRetries(readAA, sizeof(readAA), resp, 10, 5)) {
+                result_status |= FLAG_ICLASS_READER_AIA;
+                memcpy(card_data+(8*5), resp, 8);
+            } else {
+                if (MF_DBGLEVEL > 1) DbpString("Failed to dump AA block");
+            }
+        }
 
-		// 0 : CSN
-		// 1 : Configuration
-		// 2 : e-purse
-		// 3 : kd / debit / aa2 (write-only)
-		// 4 : kc / credit / aa1 (write-only)
-		// 5 : AIA, Application issuer area
-		//
-		//Then we can 'ship' back the 6 * 8 bytes of data,
-		// with 0xFF:s in block 3 and 4.
+        // 0 : CSN
+        // 1 : Configuration
+        // 2 : e-purse
+        // 3 : kd / debit / aa2 (write-only)
+        // 4 : kc / credit / aa1 (write-only)
+        // 5 : AIA, Application issuer area
+        //
+        //Then we can 'ship' back the 6 * 8 bytes of data,
+        // with 0xFF:s in block 3 and 4.
 
-		LED_B_ON();
-		//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)
-		if (memcmp(last_csn, card_data, 8) != 0) {
-			// If caller requires that we get Conf, CC, AA, continue until we got it
-			if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
-				Dbprintf("STATUS %02X | CSN %c | CONF %c | CC %c | AIA %c | ONCE %c | 1TRY %c",
-					result_status,
-					(result_status & FLAG_ICLASS_READER_CSN) ? 'Y':'N',
-					(result_status & FLAG_ICLASS_READER_CONF)? 'Y':'N',
-					(result_status & FLAG_ICLASS_READER_CC)  ? 'Y':'N',
-					(result_status & FLAG_ICLASS_READER_AIA) ? 'Y':'N'
-				);
-				Dbprintf(" aar %c | to %c, | uc %c | frc %c | fra %c | cc %c",
-					abort_after_read  ? 'Y':'N',
-					try_once ? 'Y':'N',
-					use_credit_key ? 'Y':'N',
-					flagReadConfig ? 'Y':'N',
-					flagReadAIA ? 'Y':'N',
-					flagReadCC ? 'Y':'N'
-					);
-			}
+        LED_B_ON();
+        //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)
+        if (memcmp(last_csn, card_data, 8) != 0) {
+            // If caller requires that we get Conf, CC, AA, continue until we got it
+            if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
+                Dbprintf("STATUS %02X | CSN %c | CONF %c | CC %c | AIA %c | ONCE %c | 1TRY %c",
+                    result_status,
+                    (result_status & FLAG_ICLASS_READER_CSN) ? 'Y':'N',
+                    (result_status & FLAG_ICLASS_READER_CONF)? 'Y':'N',
+                    (result_status & FLAG_ICLASS_READER_CC)  ? 'Y':'N',
+                    (result_status & FLAG_ICLASS_READER_AIA) ? 'Y':'N'
+                );
+                Dbprintf(" aar %c | to %c, | uc %c | frc %c | fra %c | cc %c",
+                    abort_after_read  ? 'Y':'N',
+                    try_once ? 'Y':'N',
+                    use_credit_key ? 'Y':'N',
+                    flagReadConfig ? 'Y':'N',
+                    flagReadAIA ? 'Y':'N',
+                    flagReadCC ? 'Y':'N'
+                    );
+            }
 
-			bool send = (result_status & FLAG_ICLASS_READER_CSN );
-			if (flagReadCC)
-				send |= (result_status & FLAG_ICLASS_READER_CC );
-			if (flagReadAIA)
-				send |= (result_status & FLAG_ICLASS_READER_AIA );
-			if (flagReadConfig)
-				send |= (result_status & FLAG_ICLASS_READER_CONF );
+            bool send = (result_status & FLAG_ICLASS_READER_CSN );
+            if (flagReadCC)
+                send |= (result_status & FLAG_ICLASS_READER_CC );
+            if (flagReadAIA)
+                send |= (result_status & FLAG_ICLASS_READER_AIA );
+            if (flagReadConfig)
+                send |= (result_status & FLAG_ICLASS_READER_CONF );
 
-			if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("SEND %c",  send?'y':'n');
+            if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("SEND %c",  send?'y':'n');
 
-			if ( send ) {
-				cmd_send(CMD_ACK, result_status, 0, 0, card_data, sizeof(card_data) );
-				if (abort_after_read) {
-					LED_B_OFF();
-					return;
-				}
-				//Save that we already sent this....
-				memcpy(last_csn, card_data, 8);
-			}
-		}
-		LED_B_OFF();
-		userCancelled = BUTTON_PRESS() || usb_poll_validate_length();
-	}
+            if ( send ) {
+                cmd_send(CMD_ACK, result_status, 0, 0, card_data, sizeof(card_data) );
+                if (abort_after_read) {
+                    LED_B_OFF();
+                    return;
+                }
+                //Save that we already sent this....
+                memcpy(last_csn, card_data, 8);
+            }
+        }
+        LED_B_OFF();
+        userCancelled = BUTTON_PRESS() || usb_poll_validate_length();
+    }
 
-	if (userCancelled) {
-		cmd_send(CMD_ACK, 0xFF, 0, 0, card_data, 0);
-		switch_off();
-	} else {
-		cmd_send(CMD_ACK, 0, 0, 0, card_data, 0);
-	}
+    if (userCancelled) {
+        cmd_send(CMD_ACK, 0xFF, 0, 0, card_data, 0);
+        switch_off();
+    } else {
+        cmd_send(CMD_ACK, 0, 0, 0, card_data, 0);
+    }
 }
 
 // turn off afterwards
 void ReaderIClass_Replay(uint8_t arg0, uint8_t *MAC) {
 
-	uint8_t cardsize = 0;
-	uint8_t mem = 0;
-	uint8_t check[] = { 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
-	uint8_t read[]  = { 0x0c, 0x00, 0x00, 0x00 };
-	uint8_t card_data[USB_CMD_DATA_SIZE] = {0};
-	uint8_t resp[ICLASS_BUFFER_SIZE] = {0};
+    uint8_t cardsize = 0;
+    uint8_t mem = 0;
+    uint8_t check[] = { 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+    uint8_t read[]  = { 0x0c, 0x00, 0x00, 0x00 };
+    uint8_t card_data[USB_CMD_DATA_SIZE] = {0};
+    uint8_t resp[ICLASS_BUFFER_SIZE] = {0};
 
-	static struct memory_t{
-	  int k16;
-	  int book;
-	  int k2;
-	  int lockauth;
-	  int keyaccess;
-	} memory;
+    static struct memory_t{
+      int k16;
+      int book;
+      int k2;
+      int lockauth;
+      int keyaccess;
+    } memory;
 
     setupIclassReader();
 
-	while (!BUTTON_PRESS()) {
+    while (!BUTTON_PRESS()) {
 
-		WDT_HIT();
+        WDT_HIT();
 
-		uint8_t read_status = handshakeIclassTag(card_data);
-		if (read_status < 2) continue;
+        uint8_t read_status = handshakeIclassTag(card_data);
+        if (read_status < 2) continue;
 
-		//for now replay captured auth (as cc not updated)
-		memcpy(check+5, MAC, 4);
+        //for now replay captured auth (as cc not updated)
+        memcpy(check+5, MAC, 4);
 
-		if (!sendCmdGetResponseWithRetries(check, sizeof(check), resp, 4, 5)) {
-			DbpString("Error: Authentication Fail!");
-			continue;
-		}
+        if (!sendCmdGetResponseWithRetries(check, sizeof(check), resp, 4, 5)) {
+            DbpString("Error: Authentication Fail!");
+            continue;
+        }
 
-		//first get configuration block (block 1)
-		read[1] = 1;
-		AddCrc( read+1, 1 );
+        //first get configuration block (block 1)
+        read[1] = 1;
+        AddCrc( read+1, 1 );
 
-		if (!sendCmdGetResponseWithRetries(read, sizeof(read), resp, 10, 5)) {
-			DbpString("Dump config (block 1) failed");
-			continue;
-		}
+        if (!sendCmdGetResponseWithRetries(read, sizeof(read), resp, 10, 5)) {
+            DbpString("Dump config (block 1) failed");
+            continue;
+        }
 
-		mem = resp[5];
-		memory.k16 = (mem & 0x80);
-		memory.book = (mem & 0x20);
-		memory.k2 = (mem & 0x8);
-		memory.lockauth = (mem & 0x2);
-		memory.keyaccess = (mem & 0x1);
+        mem = resp[5];
+        memory.k16 = (mem & 0x80);
+        memory.book = (mem & 0x20);
+        memory.k2 = (mem & 0x8);
+        memory.lockauth = (mem & 0x2);
+        memory.keyaccess = (mem & 0x1);
 
-		cardsize = memory.k16 ? 255 : 32;
+        cardsize = memory.k16 ? 255 : 32;
 
-		WDT_HIT();
-		//Set card_data to all zeroes, we'll fill it with data
-		memset(card_data, 0x0, USB_CMD_DATA_SIZE);
-		uint8_t failedRead = 0;
-		uint32_t stored_data_length = 0;
+        WDT_HIT();
+        //Set card_data to all zeroes, we'll fill it with data
+        memset(card_data, 0x0, USB_CMD_DATA_SIZE);
+        uint8_t failedRead = 0;
+        uint32_t stored_data_length = 0;
 
-		//then loop around remaining blocks
-		for ( uint16_t block=0; block < cardsize; block++) {
+        //then loop around remaining blocks
+        for ( uint16_t block=0; block < cardsize; block++) {
 
-			read[1] = block;
-			AddCrc( read+1, 1 );
+            read[1] = block;
+            AddCrc( read+1, 1 );
 
-			if (sendCmdGetResponseWithRetries(read, sizeof(read), resp, 10, 5)) {
-				Dbprintf("     %02x: %02x %02x %02x %02x %02x %02x %02x %02x",
-					block, resp[0], resp[1], resp[2],
-					resp[3], resp[4], resp[5],
-					resp[6], resp[7]
-				);
+            if (sendCmdGetResponseWithRetries(read, sizeof(read), resp, 10, 5)) {
+                Dbprintf("     %02x: %02x %02x %02x %02x %02x %02x %02x %02x",
+                    block, resp[0], resp[1], resp[2],
+                    resp[3], resp[4], resp[5],
+                    resp[6], resp[7]
+                );
 
-				//Fill up the buffer
-				memcpy(card_data + stored_data_length, resp, 8);
-				stored_data_length += 8;
-				if (stored_data_length + 8 > USB_CMD_DATA_SIZE) {
-					//Time to send this off and start afresh
-					cmd_send(CMD_ACK,
-							 stored_data_length,//data length
-							 failedRead,//Failed blocks?
-							 0,//Not used ATM
-							 card_data,
-							 stored_data_length
-					);
-					//reset
-					stored_data_length = 0;
-					failedRead = 0;
-				}
-			} else {
-				failedRead = 1;
-				stored_data_length += 8;//Otherwise, data becomes misaligned
-				Dbprintf("Failed to dump block %d", block);
-			}
-		}
+                //Fill up the buffer
+                memcpy(card_data + stored_data_length, resp, 8);
+                stored_data_length += 8;
+                if (stored_data_length + 8 > USB_CMD_DATA_SIZE) {
+                    //Time to send this off and start afresh
+                    cmd_send(CMD_ACK,
+                             stored_data_length,//data length
+                             failedRead,//Failed blocks?
+                             0,//Not used ATM
+                             card_data,
+                             stored_data_length
+                    );
+                    //reset
+                    stored_data_length = 0;
+                    failedRead = 0;
+                }
+            } else {
+                failedRead = 1;
+                stored_data_length += 8;//Otherwise, data becomes misaligned
+                Dbprintf("Failed to dump block %d", block);
+            }
+        }
 
-		//Send off any remaining data
-		if (stored_data_length > 0) {
-			cmd_send(CMD_ACK,
-					 stored_data_length,//data length
-					 failedRead,//Failed blocks?
-					 0,//Not used ATM
-					 card_data,
-					 stored_data_length
-			);
-		}
-		//If we got here, let's break
-		break;
-	}
-	//Signal end of transmission
-	cmd_send(CMD_ACK,
-			 0,//data length
-			 0,//Failed blocks?
-			 0,//Not used ATM
-			 card_data,
-			 0
-	);
-	switch_off();
+        //Send off any remaining data
+        if (stored_data_length > 0) {
+            cmd_send(CMD_ACK,
+                     stored_data_length,//data length
+                     failedRead,//Failed blocks?
+                     0,//Not used ATM
+                     card_data,
+                     stored_data_length
+            );
+        }
+        //If we got here, let's break
+        break;
+    }
+    //Signal end of transmission
+    cmd_send(CMD_ACK,
+             0,//data length
+             0,//Failed blocks?
+             0,//Not used ATM
+             card_data,
+             0
+    );
+    switch_off();
 }
 
 // not used. ?!? ( CMD_ICLASS_READCHECK)
 // turn off afterwards
 void iClass_ReadCheck(uint8_t blockNo, uint8_t keyType) {
-	uint8_t readcheck[] = { keyType, blockNo };
-	uint8_t resp[] = {0,0,0,0,0,0,0,0};
-	size_t isOK = 0;
-	isOK = sendCmdGetResponseWithRetries(readcheck, sizeof(readcheck), resp, sizeof(resp), 6);
-	cmd_send(CMD_ACK,isOK,0,0,0,0);
-	switch_off();
+    uint8_t readcheck[] = { keyType, blockNo };
+    uint8_t resp[] = {0,0,0,0,0,0,0,0};
+    size_t isOK = 0;
+    isOK = sendCmdGetResponseWithRetries(readcheck, sizeof(readcheck), resp, sizeof(resp), 6);
+    cmd_send(CMD_ACK,isOK,0,0,0,0);
+    switch_off();
 }
 
 // used with function select_and_auth (cmdhficlass.c)
 // which needs to authenticate before doing more things like read/write
 void iClass_Authentication(uint8_t *mac) {
-	uint8_t check[] = { ICLASS_CMD_CHECK, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
-	uint8_t resp[ICLASS_BUFFER_SIZE];
+    uint8_t check[] = { ICLASS_CMD_CHECK, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+    uint8_t resp[ICLASS_BUFFER_SIZE];
 
-	// copy MAC to check command (readersignature)
-	check[5] = mac[0];
-	check[6] = mac[1];
-	check[7] = mac[2];
-	check[8] = mac[3];
-	//memcpy(check+5, mac, 4);
+    // copy MAC to check command (readersignature)
+    check[5] = mac[0];
+    check[6] = mac[1];
+    check[7] = mac[2];
+    check[8] = mac[3];
+    //memcpy(check+5, mac, 4);
 
-	// 6 retries
-	bool isOK = sendCmdGetResponseWithRetries(check, sizeof(check), resp, 4, 6);
-	cmd_send(CMD_ACK,isOK,0,0,0,0);
+    // 6 retries
+    bool isOK = sendCmdGetResponseWithRetries(check, sizeof(check), resp, 4, 6);
+    cmd_send(CMD_ACK,isOK,0,0,0,0);
 }
 
 typedef struct iclass_premac {
-	uint8_t mac[4];
+    uint8_t mac[4];
 } iclass_premac_t;
 
 /* this function works on the following assumptions.
@@ -2220,194 +2220,194 @@ typedef struct iclass_premac {
 *   to cover debit and credit key. (AA1/AA2)
 */
 void iClass_Authentication_fast(uint64_t arg0, uint64_t arg1, uint8_t *datain) {
-	uint8_t i = 0, isOK = 0;
-	uint8_t lastChunk = ((arg0 >> 8) & 0xFF);
-	bool use_credit_key =((arg0 >> 16) & 0xFF);
-	uint8_t keyCount = arg1 & 0xFF;
-	uint8_t check[] = { ICLASS_CMD_CHECK, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
-	uint8_t resp[ICLASS_BUFFER_SIZE];
-	uint8_t readcheck_cc[] = { ICLASS_CMD_READCHECK_KD, 0x02 };
+    uint8_t i = 0, isOK = 0;
+    uint8_t lastChunk = ((arg0 >> 8) & 0xFF);
+    bool use_credit_key =((arg0 >> 16) & 0xFF);
+    uint8_t keyCount = arg1 & 0xFF;
+    uint8_t check[] = { ICLASS_CMD_CHECK, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+    uint8_t resp[ICLASS_BUFFER_SIZE];
+    uint8_t readcheck_cc[] = { ICLASS_CMD_READCHECK_KD, 0x02 };
 
-	if  (use_credit_key)
-		readcheck_cc[0] = ICLASS_CMD_READCHECK_KC;
+    if  (use_credit_key)
+        readcheck_cc[0] = ICLASS_CMD_READCHECK_KC;
 
-	// select card / e-purse
-	uint8_t card_data[6 * 8] = {0};
+    // select card / e-purse
+    uint8_t card_data[6 * 8] = {0};
 
-	iclass_premac_t *keys = (iclass_premac_t *)datain;
+    iclass_premac_t *keys = (iclass_premac_t *)datain;
 
-	LED_A_ON();
+    LED_A_ON();
 
-	switch_off();
-	SpinDelay(20);
+    switch_off();
+    SpinDelay(20);
 
-	setupIclassReader();
+    setupIclassReader();
 
-	int read_status = 0;
-	uint8_t startup_limit = 10;
-	while ( read_status != 2) {
+    int read_status = 0;
+    uint8_t startup_limit = 10;
+    while ( read_status != 2) {
 
-		if (BUTTON_PRESS() && !usb_poll_validate_length()) goto out;
+        if (BUTTON_PRESS() && !usb_poll_validate_length()) goto out;
 
-		read_status = handshakeIclassTag_ext(card_data, use_credit_key);
-		if ( startup_limit-- == 0 ) {
-			Dbprintf("[-] Handshake status | %d (fail 10)", read_status);
-			isOK = 99;
-			goto out;
-		}
-	};
-	// since handshakeIclassTag_ext call sends s readcheck,  we start with sending first response.
+        read_status = handshakeIclassTag_ext(card_data, use_credit_key);
+        if ( startup_limit-- == 0 ) {
+            Dbprintf("[-] Handshake status | %d (fail 10)", read_status);
+            isOK = 99;
+            goto out;
+        }
+    };
+    // since handshakeIclassTag_ext call sends s readcheck,  we start with sending first response.
 
-	// Keychunk loop
-	for (i = 0; i < keyCount; i++) {
+    // Keychunk loop
+    for (i = 0; i < keyCount; i++) {
 
-		// Allow button press / usb cmd to interrupt device
-		if (BUTTON_PRESS() && !usb_poll_validate_length()) break;
+        // Allow button press / usb cmd to interrupt device
+        if (BUTTON_PRESS() && !usb_poll_validate_length()) break;
 
-		WDT_HIT();
-		LED_B_ON();
+        WDT_HIT();
+        LED_B_ON();
 
-		// copy MAC to check command (readersignature)
-		check[5] = keys[i].mac[0];
-		check[6] = keys[i].mac[1];
-		check[7] = keys[i].mac[2];
-		check[8] = keys[i].mac[3];
+        // copy MAC to check command (readersignature)
+        check[5] = keys[i].mac[0];
+        check[6] = keys[i].mac[1];
+        check[7] = keys[i].mac[2];
+        check[8] = keys[i].mac[3];
 
-		// expect 4bytes, 3 retries times..
-		isOK = sendCmdGetResponseWithRetries(check, sizeof(check), resp, 4, 3);
-		if ( isOK )
-			goto out;
+        // expect 4bytes, 3 retries times..
+        isOK = sendCmdGetResponseWithRetries(check, sizeof(check), resp, 4, 3);
+        if ( isOK )
+            goto out;
 
-		SpinDelayUs(400);  //iClass (iso15693-2) should timeout after 330us.
+        SpinDelayUs(400);  //iClass (iso15693-2) should timeout after 330us.
 
-		// Auth Sequence MUST begin with reading e-purse. (block2)
-		// Card selected, now read e-purse (cc) (block2) (only 8 bytes no CRC)
-		ReaderTransmitIClass(readcheck_cc, sizeof(readcheck_cc));
+        // Auth Sequence MUST begin with reading e-purse. (block2)
+        // Card selected, now read e-purse (cc) (block2) (only 8 bytes no CRC)
+        ReaderTransmitIClass(readcheck_cc, sizeof(readcheck_cc));
 
-		LED_B_OFF();
-	}
+        LED_B_OFF();
+    }
 
 out:
-	// send keyindex.
-	cmd_send(CMD_ACK, isOK, i, 0, 0, 0);
+    // send keyindex.
+    cmd_send(CMD_ACK, isOK, i, 0, 0, 0);
 
-	if ( isOK >= 1 || lastChunk ) {
-		switch_off();
-		LED_A_OFF();
-	}
+    if ( isOK >= 1 || lastChunk ) {
+        switch_off();
+        LED_A_OFF();
+    }
 
-	LED_B_OFF();
-	LED_C_OFF();
+    LED_B_OFF();
+    LED_C_OFF();
 }
 
 // Tries to read block.
 // retries 10times.
 bool iClass_ReadBlock(uint8_t blockNo, uint8_t *data, uint8_t len) {
-	uint8_t resp[10];
-	uint8_t cmd[] = {ICLASS_CMD_READ_OR_IDENTIFY, blockNo, 0x00, 0x00};
-	AddCrc( cmd+1, 1 );
-	// expect size 10,  retry 5times
-	bool isOK = sendCmdGetResponseWithRetries(cmd, sizeof(cmd), resp, 10, 5);
-	memcpy(data, resp, len);
-	return isOK;
+    uint8_t resp[10];
+    uint8_t cmd[] = {ICLASS_CMD_READ_OR_IDENTIFY, blockNo, 0x00, 0x00};
+    AddCrc( cmd+1, 1 );
+    // expect size 10,  retry 5times
+    bool isOK = sendCmdGetResponseWithRetries(cmd, sizeof(cmd), resp, 10, 5);
+    memcpy(data, resp, len);
+    return isOK;
 }
 
 // turn off afterwards
 // readblock 8 + 2.  only want 8.
 void iClass_ReadBlk(uint8_t blockno) {
-	uint8_t data[] = {0,0,0,0,0,0,0,0,0,0};
-	bool isOK = iClass_ReadBlock(blockno, data, sizeof(data));
-	cmd_send(CMD_ACK, isOK, 0, 0, data, sizeof(data));
-	switch_off();
+    uint8_t data[] = {0,0,0,0,0,0,0,0,0,0};
+    bool isOK = iClass_ReadBlock(blockno, data, sizeof(data));
+    cmd_send(CMD_ACK, isOK, 0, 0, data, sizeof(data));
+    switch_off();
 }
 
 // turn off afterwards
 void iClass_Dump(uint8_t blockno, uint8_t numblks) {
-	uint8_t blockdata[] = {0,0,0,0,0,0,0,0,0,0};
-	bool isOK = false;
-	uint8_t blkCnt = 0;
+    uint8_t blockdata[] = {0,0,0,0,0,0,0,0,0,0};
+    bool isOK = false;
+    uint8_t blkCnt = 0;
 
-	BigBuf_free();
-	uint8_t *dataout = BigBuf_malloc(255*8);
-	if (dataout == NULL){
-		DbpString("[!] out of memory");
-		OnError(1);
-		return;
-	}
-	// fill mem with 0xFF
-	memset(dataout, 0xFF, 255*8);
+    BigBuf_free();
+    uint8_t *dataout = BigBuf_malloc(255*8);
+    if (dataout == NULL){
+        DbpString("[!] out of memory");
+        OnError(1);
+        return;
+    }
+    // fill mem with 0xFF
+    memset(dataout, 0xFF, 255*8);
 
-	for (;blkCnt < numblks; blkCnt++) {
-		isOK = iClass_ReadBlock(blockno + blkCnt, blockdata, sizeof(blockdata));
+    for (;blkCnt < numblks; blkCnt++) {
+        isOK = iClass_ReadBlock(blockno + blkCnt, blockdata, sizeof(blockdata));
 
-		// 0xBB is the internal debug separator byte..
-		if (!isOK || (blockdata[0] == 0xBB || blockdata[7] == 0xBB || blockdata[2] == 0xBB)) { //try again
-			isOK = iClass_ReadBlock(blockno + blkCnt, blockdata, sizeof(blockdata));
-			if (!isOK) {
-				Dbprintf("[!] block %02X failed to read", blkCnt + blockno);
-				break;
-			}
-		}
-		memcpy(dataout + (blkCnt * 8), blockdata, 8);
-	}
-	//return pointer to dump memory in arg3
-	cmd_send(CMD_ACK, isOK, blkCnt, BigBuf_max_traceLen(), 0, 0);
-	switch_off();
-	BigBuf_free();
+        // 0xBB is the internal debug separator byte..
+        if (!isOK || (blockdata[0] == 0xBB || blockdata[7] == 0xBB || blockdata[2] == 0xBB)) { //try again
+            isOK = iClass_ReadBlock(blockno + blkCnt, blockdata, sizeof(blockdata));
+            if (!isOK) {
+                Dbprintf("[!] block %02X failed to read", blkCnt + blockno);
+                break;
+            }
+        }
+        memcpy(dataout + (blkCnt * 8), blockdata, 8);
+    }
+    //return pointer to dump memory in arg3
+    cmd_send(CMD_ACK, isOK, blkCnt, BigBuf_max_traceLen(), 0, 0);
+    switch_off();
+    BigBuf_free();
 }
 
 bool iClass_WriteBlock_ext(uint8_t blockNo, uint8_t *data) {
 
-	uint8_t resp[] = {0,0,0,0,0,0,0,0,0,0};
-	uint8_t write[] = { ICLASS_CMD_UPDATE, blockNo, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
-	memcpy(write+2, data, 12); // data + mac
-	AddCrc(write+1, 13);
+    uint8_t resp[] = {0,0,0,0,0,0,0,0,0,0};
+    uint8_t write[] = { ICLASS_CMD_UPDATE, blockNo, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+    memcpy(write+2, data, 12); // data + mac
+    AddCrc(write+1, 13);
 
-	bool isOK = sendCmdGetResponseWithRetries(write, sizeof(write), resp, sizeof(resp), 5);
-	if (isOK) { //if reader responded correctly
+    bool isOK = sendCmdGetResponseWithRetries(write, sizeof(write), resp, sizeof(resp), 5);
+    if (isOK) { //if reader responded correctly
 
-		//if response is not equal to write values
-		if (memcmp(write + 2, resp, 8)) {
+        //if response is not equal to write values
+        if (memcmp(write + 2, resp, 8)) {
 
-			//if not programming key areas (note key blocks don't get programmed with actual key data it is xor data)
-			if (blockNo != 3 && blockNo != 4) {
-				isOK = sendCmdGetResponseWithRetries(write, sizeof(write), resp, sizeof(resp), 5);
-			}
-		}
-	}
-	return isOK;
+            //if not programming key areas (note key blocks don't get programmed with actual key data it is xor data)
+            if (blockNo != 3 && blockNo != 4) {
+                isOK = sendCmdGetResponseWithRetries(write, sizeof(write), resp, sizeof(resp), 5);
+            }
+        }
+    }
+    return isOK;
 }
 
 // turn off afterwards
 void iClass_WriteBlock(uint8_t blockNo, uint8_t *data) {
-	bool isOK = iClass_WriteBlock_ext(blockNo, data);
-	cmd_send(CMD_ACK,isOK,0,0,0,0);
-	switch_off();
+    bool isOK = iClass_WriteBlock_ext(blockNo, data);
+    cmd_send(CMD_ACK,isOK,0,0,0,0);
+    switch_off();
 }
 
 // turn off afterwards
 void iClass_Clone(uint8_t startblock, uint8_t endblock, uint8_t *data) {
-	int i, written = 0;
-	int total_block = (endblock - startblock) + 1;
-	for (i = 0; i < total_block; i++){
-		// block number
-		if (iClass_WriteBlock_ext(i + startblock, data + ( i*12 ) )){
-			Dbprintf("Write block [%02x] successful", i + startblock);
-			written++;
-		} else {
-			if (iClass_WriteBlock_ext(i + startblock, data + ( i*12 ) )){
-				Dbprintf("Write block [%02x] successful", i + startblock);
-				written++;
-			} else {
-				Dbprintf("Write block [%02x] failed", i + startblock);
-			}
-		}
-	}
-	if (written == total_block)
-		DbpString("Clone complete");
-	else
-		DbpString("Clone incomplete");
+    int i, written = 0;
+    int total_block = (endblock - startblock) + 1;
+    for (i = 0; i < total_block; i++){
+        // block number
+        if (iClass_WriteBlock_ext(i + startblock, data + ( i*12 ) )){
+            Dbprintf("Write block [%02x] successful", i + startblock);
+            written++;
+        } else {
+            if (iClass_WriteBlock_ext(i + startblock, data + ( i*12 ) )){
+                Dbprintf("Write block [%02x] successful", i + startblock);
+                written++;
+            } else {
+                Dbprintf("Write block [%02x] failed", i + startblock);
+            }
+        }
+    }
+    if (written == total_block)
+        DbpString("Clone complete");
+    else
+        DbpString("Clone incomplete");
 
-	cmd_send(CMD_ACK,1,0,0,0,0);
-	switch_off();
+    cmd_send(CMD_ACK,1,0,0,0,0);
+    switch_off();
 }
\ No newline at end of file
diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 9e415fcdb..e44af5fe3 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -112,49 +112,49 @@ static uint32_t LastProxToAirDuration;
 // Sequence X: 00001100 drop after half a period
 // Sequence Y: 00000000 no drop
 // Sequence Z: 11000000 drop at start
-#define	SEC_D 0xf0
-#define	SEC_E 0x0f
-#define	SEC_F 0x00
+#define SEC_D 0xf0
+#define SEC_E 0x0f
+#define SEC_F 0x00
 #define SEC_COLL 0xff
-#define	SEC_X 0x0c
-#define	SEC_Y 0x00
-#define	SEC_Z 0xc0
+#define SEC_X 0x0c
+#define SEC_Y 0x00
+#define SEC_Z 0xc0
 
 void iso14a_set_trigger(bool enable) {
-	trigger = enable;
+    trigger = enable;
 }
 
 void iso14a_set_timeout(uint32_t timeout) {
-	iso14a_timeout = timeout + (DELAY_AIR2ARM_AS_READER + DELAY_ARM2AIR_AS_READER)/(16*8) + 2;
+    iso14a_timeout = timeout + (DELAY_AIR2ARM_AS_READER + DELAY_ARM2AIR_AS_READER)/(16*8) + 2;
 }
 
 uint32_t iso14a_get_timeout(void) {
-	return iso14a_timeout - (DELAY_AIR2ARM_AS_READER + DELAY_ARM2AIR_AS_READER)/(16*8) - 2;
+    return iso14a_timeout - (DELAY_AIR2ARM_AS_READER + DELAY_ARM2AIR_AS_READER)/(16*8) - 2;
 }
 
 //-----------------------------------------------------------------------------
 // Generate the parity value for a byte sequence
 //-----------------------------------------------------------------------------
 void GetParity(const uint8_t *pbtCmd, uint16_t iLen, uint8_t *par) {
-	uint16_t paritybit_cnt = 0;
-	uint16_t paritybyte_cnt = 0;
-	uint8_t parityBits = 0;
+    uint16_t paritybit_cnt = 0;
+    uint16_t paritybyte_cnt = 0;
+    uint8_t parityBits = 0;
 
-	for (uint16_t i = 0; i < iLen; i++) {
-		// Generate the parity bits
-		parityBits |= ((oddparity8(pbtCmd[i])) << (7-paritybit_cnt));
-		if (paritybit_cnt == 7) {
-			par[paritybyte_cnt] = parityBits;	// save 8 Bits parity
-			parityBits = 0;						// and advance to next Parity Byte
-			paritybyte_cnt++;
-			paritybit_cnt = 0;
-		} else {
-			paritybit_cnt++;
-		}
-	}
+    for (uint16_t i = 0; i < iLen; i++) {
+        // Generate the parity bits
+        parityBits |= ((oddparity8(pbtCmd[i])) << (7-paritybit_cnt));
+        if (paritybit_cnt == 7) {
+            par[paritybyte_cnt] = parityBits; // save 8 Bits parity
+            parityBits = 0;                   // and advance to next Parity Byte
+            paritybyte_cnt++;
+            paritybit_cnt = 0;
+        } else {
+            paritybit_cnt++;
+        }
+    }
 
-	// save remaining parity bits
-	par[paritybyte_cnt] = parityBits;
+    // save remaining parity bits
+    par[paritybyte_cnt] = parityBits;
 }
 
 
@@ -168,9 +168,9 @@ void GetParity(const uint8_t *pbtCmd, uint16_t iLen, uint8_t *par) {
 // The FPGA does a comparison with a threshold and would deliver e.g.:
 // ........  1 1 1 1 1 1 0 0 1 1 1 1 1 1 1 1 1 1 0 0 1 1 1 1 1 1 1 1 1 1  .......
 // The Miller decoder needs to identify the following sequences:
-// 2 (or 3) ticks pause followed by 6 (or 5) ticks unmodulated: 	pause at beginning - Sequence Z ("start of communication" or a "0")
-// 8 ticks without a modulation: 									no pause - Sequence Y (a "0" or "end of communication" or "no information")
-// 4 ticks unmodulated followed by 2 (or 3) ticks pause:			pause in second half - Sequence X (a "1")
+// 2 (or 3) ticks pause followed by 6 (or 5) ticks unmodulated: pause at beginning - Sequence Z ("start of communication" or a "0")
+// 8 ticks without a modulation:                                no pause - Sequence Y (a "0" or "end of communication" or "no information")
+// 4 ticks unmodulated followed by 2 (or 3) ticks pause:        pause in second half - Sequence X (a "1")
 // Note 1: the bitstream may start at any time. We therefore need to sync.
 // Note 2: the interpretation of Sequence Y and Z depends on the preceding sequence.
 //-----------------------------------------------------------------------------
@@ -183,155 +183,155 @@ static tUart Uart;
 // 0111  -   a 2 tick wide pause shifted left
 // 1001  -   a 2 tick wide pause shifted right
 const bool Mod_Miller_LUT[] = {
-	false,  true, false, true,  false, false, false, true,
-	false,  true, false, false, false, false, false, false
+    false,  true, false, true,  false, false, false, true,
+    false,  true, false, false, false, false, false, false
 };
 #define IsMillerModulationNibble1(b) (Mod_Miller_LUT[(b & 0x000000F0) >> 4])
 #define IsMillerModulationNibble2(b) (Mod_Miller_LUT[(b & 0x0000000F)])
 
 tUart* GetUart() {
-	return &Uart;
+    return &Uart;
 }
 
 void UartReset(void) {
-	Uart.state = STATE_UNSYNCD;
-	Uart.bitCount = 0;
-	Uart.len = 0;						// number of decoded data bytes
-	Uart.parityLen = 0;					// number of decoded parity bytes
-	Uart.shiftReg = 0;					// shiftreg to hold decoded data bits
-	Uart.parityBits = 0;				// holds 8 parity bits
-	Uart.startTime = 0;
-	Uart.endTime = 0;
-	Uart.fourBits = 0x00000000;			// clear the buffer for 4 Bits
-	Uart.posCnt = 0;
-	Uart.syncBit = 9999;
+    Uart.state = STATE_UNSYNCD;
+    Uart.bitCount = 0;
+    Uart.len = 0;                       // number of decoded data bytes
+    Uart.parityLen = 0;                 // number of decoded parity bytes
+    Uart.shiftReg = 0;                  // shiftreg to hold decoded data bits
+    Uart.parityBits = 0;                // holds 8 parity bits
+    Uart.startTime = 0;
+    Uart.endTime = 0;
+    Uart.fourBits = 0x00000000;         // clear the buffer for 4 Bits
+    Uart.posCnt = 0;
+    Uart.syncBit = 9999;
 }
 
 void UartInit(uint8_t *data, uint8_t *parity) {
-	Uart.output = data;
-	Uart.parity = parity;
-	UartReset();
+    Uart.output = data;
+    Uart.parity = parity;
+    UartReset();
 }
 
 // use parameter non_real_time to provide a timestamp. Set to 0 if the decoder should measure real time
 RAMFUNC bool MillerDecoding(uint8_t bit, uint32_t non_real_time) {
-	Uart.fourBits = (Uart.fourBits << 8) | bit;
+    Uart.fourBits = (Uart.fourBits << 8) | bit;
 
-	if (Uart.state == STATE_UNSYNCD) {											// not yet synced
-			Uart.syncBit = 9999; 												// not set
+    if (Uart.state == STATE_UNSYNCD) {                                           // not yet synced
+            Uart.syncBit = 9999;                                                 // not set
 
-		// 00x11111 2|3 ticks pause followed by 6|5 ticks unmodulated	 	Sequence Z (a "0" or "start of communication")
-		// 11111111 8 ticks unmodulation									Sequence Y (a "0" or "end of communication" or "no information")
-		// 111100x1 4 ticks unmodulated followed by 2|3 ticks pause			Sequence X (a "1")
+        // 00x11111 2|3 ticks pause followed by 6|5 ticks unmodulated         Sequence Z (a "0" or "start of communication")
+        // 11111111 8 ticks unmodulation                                      Sequence Y (a "0" or "end of communication" or "no information")
+        // 111100x1 4 ticks unmodulated followed by 2|3 ticks pause           Sequence X (a "1")
 
-		// The start bit is one ore more Sequence Y followed by a Sequence Z (... 11111111 00x11111). We need to distinguish from
-		// Sequence X followed by Sequence Y followed by Sequence Z     (111100x1 11111111 00x11111)
-		// we therefore look for a ...xx1111 11111111 00x11111xxxxxx... pattern
-		// (12 '1's followed by 2 '0's, eventually followed by another '0', followed by 5 '1's)
-		#define ISO14443A_STARTBIT_MASK		0x07FFEF80							// mask is    00000111 11111111 11101111 10000000
-		#define ISO14443A_STARTBIT_PATTERN	0x07FF8F80							// pattern is 00000111 11111111 10001111 10000000
-		if		((Uart.fourBits & (ISO14443A_STARTBIT_MASK >> 0)) == ISO14443A_STARTBIT_PATTERN >> 0) Uart.syncBit = 7;
-		else if ((Uart.fourBits & (ISO14443A_STARTBIT_MASK >> 1)) == ISO14443A_STARTBIT_PATTERN >> 1) Uart.syncBit = 6;
-		else if ((Uart.fourBits & (ISO14443A_STARTBIT_MASK >> 2)) == ISO14443A_STARTBIT_PATTERN >> 2) Uart.syncBit = 5;
-		else if ((Uart.fourBits & (ISO14443A_STARTBIT_MASK >> 3)) == ISO14443A_STARTBIT_PATTERN >> 3) Uart.syncBit = 4;
-		else if ((Uart.fourBits & (ISO14443A_STARTBIT_MASK >> 4)) == ISO14443A_STARTBIT_PATTERN >> 4) Uart.syncBit = 3;
-		else if ((Uart.fourBits & (ISO14443A_STARTBIT_MASK >> 5)) == ISO14443A_STARTBIT_PATTERN >> 5) Uart.syncBit = 2;
-		else if ((Uart.fourBits & (ISO14443A_STARTBIT_MASK >> 6)) == ISO14443A_STARTBIT_PATTERN >> 6) Uart.syncBit = 1;
-		else if ((Uart.fourBits & (ISO14443A_STARTBIT_MASK >> 7)) == ISO14443A_STARTBIT_PATTERN >> 7) Uart.syncBit = 0;
+        // The start bit is one ore more Sequence Y followed by a Sequence Z (... 11111111 00x11111). We need to distinguish from
+        // Sequence X followed by Sequence Y followed by Sequence Z     (111100x1 11111111 00x11111)
+        // we therefore look for a ...xx1111 11111111 00x11111xxxxxx... pattern
+        // (12 '1's followed by 2 '0's, eventually followed by another '0', followed by 5 '1's)
+        #define ISO14443A_STARTBIT_MASK       0x07FFEF80                            // mask is    00000111 11111111 11101111 10000000
+        #define ISO14443A_STARTBIT_PATTERN    0x07FF8F80                            // pattern is 00000111 11111111 10001111 10000000
+        if      ((Uart.fourBits & (ISO14443A_STARTBIT_MASK >> 0)) == ISO14443A_STARTBIT_PATTERN >> 0) Uart.syncBit = 7;
+        else if ((Uart.fourBits & (ISO14443A_STARTBIT_MASK >> 1)) == ISO14443A_STARTBIT_PATTERN >> 1) Uart.syncBit = 6;
+        else if ((Uart.fourBits & (ISO14443A_STARTBIT_MASK >> 2)) == ISO14443A_STARTBIT_PATTERN >> 2) Uart.syncBit = 5;
+        else if ((Uart.fourBits & (ISO14443A_STARTBIT_MASK >> 3)) == ISO14443A_STARTBIT_PATTERN >> 3) Uart.syncBit = 4;
+        else if ((Uart.fourBits & (ISO14443A_STARTBIT_MASK >> 4)) == ISO14443A_STARTBIT_PATTERN >> 4) Uart.syncBit = 3;
+        else if ((Uart.fourBits & (ISO14443A_STARTBIT_MASK >> 5)) == ISO14443A_STARTBIT_PATTERN >> 5) Uart.syncBit = 2;
+        else if ((Uart.fourBits & (ISO14443A_STARTBIT_MASK >> 6)) == ISO14443A_STARTBIT_PATTERN >> 6) Uart.syncBit = 1;
+        else if ((Uart.fourBits & (ISO14443A_STARTBIT_MASK >> 7)) == ISO14443A_STARTBIT_PATTERN >> 7) Uart.syncBit = 0;
 
-		if (Uart.syncBit != 9999) {												// found a sync bit
-			Uart.startTime = non_real_time ? non_real_time : (GetCountSspClk() & 0xfffffff8);
-			Uart.startTime -= Uart.syncBit;
-			Uart.endTime = Uart.startTime;
-			Uart.state = STATE_START_OF_COMMUNICATION;
-		}
-	} else {
+        if (Uart.syncBit != 9999) {                                              // found a sync bit
+            Uart.startTime = non_real_time ? non_real_time : (GetCountSspClk() & 0xfffffff8);
+            Uart.startTime -= Uart.syncBit;
+            Uart.endTime = Uart.startTime;
+            Uart.state = STATE_START_OF_COMMUNICATION;
+        }
+    } else {
 
-		if (IsMillerModulationNibble1(Uart.fourBits >> Uart.syncBit)) {
-			if (IsMillerModulationNibble2(Uart.fourBits >> Uart.syncBit)) {		// Modulation in both halves - error
-				UartReset();
-			} else {															// Modulation in first half = Sequence Z = logic "0"
-				if (Uart.state == STATE_MILLER_X) {								// error - must not follow after X
-					UartReset();
-				} else {
-					Uart.bitCount++;
-					Uart.shiftReg = (Uart.shiftReg >> 1);						// add a 0 to the shiftreg
-					Uart.state = STATE_MILLER_Z;
-					Uart.endTime = Uart.startTime + 8 * (9 * Uart.len + Uart.bitCount + 1) - 6;
-					if (Uart.bitCount >= 9) {									// if we decoded a full byte (including parity)
-						Uart.output[Uart.len++] = (Uart.shiftReg & 0xff);
-						Uart.parityBits <<= 1;									// make room for the parity bit
-						Uart.parityBits |= ((Uart.shiftReg >> 8) & 0x01);		// store parity bit
-						Uart.bitCount = 0;
-						Uart.shiftReg = 0;
-						if ((Uart.len & 0x0007) == 0) {							// every 8 data bytes
-							Uart.parity[Uart.parityLen++] = Uart.parityBits;	// store 8 parity bits
-							Uart.parityBits = 0;
-						}
-					}
-				}
-			}
-		} else {
-			if (IsMillerModulationNibble2(Uart.fourBits >> Uart.syncBit)) {		// Modulation second half = Sequence X = logic "1"
-				Uart.bitCount++;
-				Uart.shiftReg = (Uart.shiftReg >> 1) | 0x100;					// add a 1 to the shiftreg
-				Uart.state = STATE_MILLER_X;
-				Uart.endTime = Uart.startTime + 8 * (9 * Uart.len + Uart.bitCount + 1) - 2;
-				if (Uart.bitCount >= 9) {										// if we decoded a full byte (including parity)
-					Uart.output[Uart.len++] = (Uart.shiftReg & 0xff);
-					Uart.parityBits <<= 1;										// make room for the new parity bit
-					Uart.parityBits |= ((Uart.shiftReg >> 8) & 0x01); 			// store parity bit
-					Uart.bitCount = 0;
-					Uart.shiftReg = 0;
-					if ((Uart.len & 0x0007) == 0) {								// every 8 data bytes
-						Uart.parity[Uart.parityLen++] = Uart.parityBits;		// store 8 parity bits
-						Uart.parityBits = 0;
-					}
-				}
-			} else {															// no modulation in both halves - Sequence Y
-				if (Uart.state == STATE_MILLER_Z || Uart.state == STATE_MILLER_Y) {	// Y after logic "0" - End of Communication
-					Uart.state = STATE_UNSYNCD;
-					Uart.bitCount--;											// last "0" was part of EOC sequence
-					Uart.shiftReg <<= 1;										// drop it
-					if (Uart.bitCount > 0) {										// if we decoded some bits
-						Uart.shiftReg >>= (9 - Uart.bitCount);					// right align them
-						Uart.output[Uart.len++] = (Uart.shiftReg & 0xff);		// add last byte to the output
-						Uart.parityBits <<= 1;									// add a (void) parity bit
-						Uart.parityBits <<= (8 - (Uart.len&0x0007));			// left align parity bits
-						Uart.parity[Uart.parityLen++] = Uart.parityBits;		// and store it
-						return true;
-					} else if (Uart.len & 0x0007) {								// there are some parity bits to store
-						Uart.parityBits <<= (8 - (Uart.len&0x0007));			// left align remaining parity bits
-						Uart.parity[Uart.parityLen++] = Uart.parityBits;		// and store them
-					}
-					if (Uart.len) {
-						return true;											// we are finished with decoding the raw data sequence
-					} else {
-						UartReset();											// Nothing received - start over
-					}
-				}
-				if (Uart.state == STATE_START_OF_COMMUNICATION) {				// error - must not follow directly after SOC
-					UartReset();
-				} else {														// a logic "0"
-					Uart.bitCount++;
-					Uart.shiftReg = (Uart.shiftReg >> 1);						// add a 0 to the shiftreg
-					Uart.state = STATE_MILLER_Y;
-					if (Uart.bitCount >= 9) {									// if we decoded a full byte (including parity)
-						Uart.output[Uart.len++] = (Uart.shiftReg & 0xff);
-						Uart.parityBits <<= 1;									// make room for the parity bit
-						Uart.parityBits |= ((Uart.shiftReg >> 8) & 0x01); 		// store parity bit
-						Uart.bitCount = 0;
-						Uart.shiftReg = 0;
-						if ((Uart.len & 0x0007) == 0) {							// every 8 data bytes
-							Uart.parity[Uart.parityLen++] = Uart.parityBits;	// store 8 parity bits
-							Uart.parityBits = 0;
-						}
-					}
-				}
-			}
-		}
-	}
-    return false;	// not finished yet, need more data
+        if (IsMillerModulationNibble1(Uart.fourBits >> Uart.syncBit)) {
+            if (IsMillerModulationNibble2(Uart.fourBits >> Uart.syncBit)) {      // Modulation in both halves - error
+                UartReset();
+            } else {                                                             // Modulation in first half = Sequence Z = logic "0"
+                if (Uart.state == STATE_MILLER_X) {                              // error - must not follow after X
+                    UartReset();
+                } else {
+                    Uart.bitCount++;
+                    Uart.shiftReg = (Uart.shiftReg >> 1);                        // add a 0 to the shiftreg
+                    Uart.state = STATE_MILLER_Z;
+                    Uart.endTime = Uart.startTime + 8 * (9 * Uart.len + Uart.bitCount + 1) - 6;
+                    if (Uart.bitCount >= 9) {                                    // if we decoded a full byte (including parity)
+                        Uart.output[Uart.len++] = (Uart.shiftReg & 0xff);
+                        Uart.parityBits <<= 1;                                   // make room for the parity bit
+                        Uart.parityBits |= ((Uart.shiftReg >> 8) & 0x01);        // store parity bit
+                        Uart.bitCount = 0;
+                        Uart.shiftReg = 0;
+                        if ((Uart.len & 0x0007) == 0) {                          // every 8 data bytes
+                            Uart.parity[Uart.parityLen++] = Uart.parityBits;     // store 8 parity bits
+                            Uart.parityBits = 0;
+                        }
+                    }
+                }
+            }
+        } else {
+            if (IsMillerModulationNibble2(Uart.fourBits >> Uart.syncBit)) {      // Modulation second half = Sequence X = logic "1"
+                Uart.bitCount++;
+                Uart.shiftReg = (Uart.shiftReg >> 1) | 0x100;                    // add a 1 to the shiftreg
+                Uart.state = STATE_MILLER_X;
+                Uart.endTime = Uart.startTime + 8 * (9 * Uart.len + Uart.bitCount + 1) - 2;
+                if (Uart.bitCount >= 9) {                                        // if we decoded a full byte (including parity)
+                    Uart.output[Uart.len++] = (Uart.shiftReg & 0xff);
+                    Uart.parityBits <<= 1;                                       // make room for the new parity bit
+                    Uart.parityBits |= ((Uart.shiftReg >> 8) & 0x01);            // store parity bit
+                    Uart.bitCount = 0;
+                    Uart.shiftReg = 0;
+                    if ((Uart.len & 0x0007) == 0) {                              // every 8 data bytes
+                        Uart.parity[Uart.parityLen++] = Uart.parityBits;         // store 8 parity bits
+                        Uart.parityBits = 0;
+                    }
+                }
+            } else {                                                             // no modulation in both halves - Sequence Y
+                if (Uart.state == STATE_MILLER_Z || Uart.state == STATE_MILLER_Y) {    // Y after logic "0" - End of Communication
+                    Uart.state = STATE_UNSYNCD;
+                    Uart.bitCount--;                                             // last "0" was part of EOC sequence
+                    Uart.shiftReg <<= 1;                                         // drop it
+                    if (Uart.bitCount > 0) {                                     // if we decoded some bits
+                        Uart.shiftReg >>= (9 - Uart.bitCount);                   // right align them
+                        Uart.output[Uart.len++] = (Uart.shiftReg & 0xff);        // add last byte to the output
+                        Uart.parityBits <<= 1;                                   // add a (void) parity bit
+                        Uart.parityBits <<= (8 - (Uart.len&0x0007));             // left align parity bits
+                        Uart.parity[Uart.parityLen++] = Uart.parityBits;         // and store it
+                        return true;
+                    } else if (Uart.len & 0x0007) {                              // there are some parity bits to store
+                        Uart.parityBits <<= (8 - (Uart.len&0x0007));             // left align remaining parity bits
+                        Uart.parity[Uart.parityLen++] = Uart.parityBits;         // and store them
+                    }
+                    if (Uart.len) {
+                        return true;                                             // we are finished with decoding the raw data sequence
+                    } else {
+                        UartReset();                                             // Nothing received - start over
+                    }
+                }
+                if (Uart.state == STATE_START_OF_COMMUNICATION) {                // error - must not follow directly after SOC
+                    UartReset();
+                } else {                                                         // a logic "0"
+                    Uart.bitCount++;
+                    Uart.shiftReg = (Uart.shiftReg >> 1);                        // add a 0 to the shiftreg
+                    Uart.state = STATE_MILLER_Y;
+                    if (Uart.bitCount >= 9) {                                    // if we decoded a full byte (including parity)
+                        Uart.output[Uart.len++] = (Uart.shiftReg & 0xff);
+                        Uart.parityBits <<= 1;                                   // make room for the parity bit
+                        Uart.parityBits |= ((Uart.shiftReg >> 8) & 0x01);        // store parity bit
+                        Uart.bitCount = 0;
+                        Uart.shiftReg = 0;
+                        if ((Uart.len & 0x0007) == 0) {                          // every 8 data bytes
+                            Uart.parity[Uart.parityLen++] = Uart.parityBits;     // store 8 parity bits
+                            Uart.parityBits = 0;
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return false;    // not finished yet, need more data
 }
 
 //=============================================================================
@@ -343,10 +343,10 @@ RAMFUNC bool MillerDecoding(uint8_t bit, uint32_t non_real_time) {
 // at the reader antenna will be modulated as well. The FPGA detects the modulation for us and would deliver e.g. the following:
 // ........ 0 0 1 1 1 1 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .......
 // The Manchester decoder needs to identify the following sequences:
-// 4 ticks modulated followed by 4 ticks unmodulated: 	Sequence D = 1 (also used as "start of communication")
-// 4 ticks unmodulated followed by 4 ticks modulated: 	Sequence E = 0
-// 8 ticks unmodulated:									Sequence F = end of communication
-// 8 ticks modulated:									A collision. Save the collision position and treat as Sequence D
+// 4 ticks modulated followed by 4 ticks unmodulated:     Sequence D = 1 (also used as "start of communication")
+// 4 ticks unmodulated followed by 4 ticks modulated:     Sequence E = 0
+// 8 ticks unmodulated:                                   Sequence F = end of communication
+// 8 ticks modulated:                                     A collision. Save the collision position and treat as Sequence D
 // Note 1: the bitstream may start at any time. We therefore need to sync.
 // Note 2: parameter offset is used to determine the position of the parity bits (required for the anticollision command only)
 tDemod Demod;
@@ -354,126 +354,126 @@ tDemod Demod;
 // Lookup-Table to decide if 4 raw bits are a modulation.
 // We accept three or four "1" in any position
 const bool Mod_Manchester_LUT[] = {
-	false, false, false, false, false, false, false, true,
-	false, false, false, true,  false, true,  true,  true
+    false, false, false, false, false, false, false, true,
+    false, false, false, true,  false, true,  true,  true
 };
 
 #define IsManchesterModulationNibble1(b) (Mod_Manchester_LUT[(b & 0x00F0) >> 4])
 #define IsManchesterModulationNibble2(b) (Mod_Manchester_LUT[(b & 0x000F)])
 
 tDemod* GetDemod() {
-	return &Demod;
+    return &Demod;
 }
 void DemodReset(void) {
-	Demod.state = DEMOD_UNSYNCD;
-	Demod.len = 0;						// number of decoded data bytes
-	Demod.parityLen = 0;
-	Demod.shiftReg = 0;					// shiftreg to hold decoded data bits
-	Demod.parityBits = 0;				//
-	Demod.collisionPos = 0;				// Position of collision bit
-	Demod.twoBits = 0xFFFF;				// buffer for 2 Bits
-	Demod.highCnt = 0;
-	Demod.startTime = 0;
-	Demod.endTime = 0;
-	Demod.bitCount = 0;
-	Demod.syncBit = 0xFFFF;
-	Demod.samples = 0;
+    Demod.state = DEMOD_UNSYNCD;
+    Demod.len = 0;                       // number of decoded data bytes
+    Demod.parityLen = 0;
+    Demod.shiftReg = 0;                  // shiftreg to hold decoded data bits
+    Demod.parityBits = 0;                //
+    Demod.collisionPos = 0;              // Position of collision bit
+    Demod.twoBits = 0xFFFF;              // buffer for 2 Bits
+    Demod.highCnt = 0;
+    Demod.startTime = 0;
+    Demod.endTime = 0;
+    Demod.bitCount = 0;
+    Demod.syncBit = 0xFFFF;
+    Demod.samples = 0;
 }
 
 void DemodInit(uint8_t *data, uint8_t *parity) {
-	Demod.output = data;
-	Demod.parity = parity;
-	DemodReset();
+    Demod.output = data;
+    Demod.parity = parity;
+    DemodReset();
 }
 
 // use parameter non_real_time to provide a timestamp. Set to 0 if the decoder should measure real time
 RAMFUNC int ManchesterDecoding(uint8_t bit, uint16_t offset, uint32_t non_real_time) {
-	Demod.twoBits = (Demod.twoBits << 8) | bit;
+    Demod.twoBits = (Demod.twoBits << 8) | bit;
 
-	if (Demod.state == DEMOD_UNSYNCD) {
+    if (Demod.state == DEMOD_UNSYNCD) {
 
-		if (Demod.highCnt < 2) {											// wait for a stable unmodulated signal
-			if (Demod.twoBits == 0x0000) {
-				Demod.highCnt++;
-			} else {
-				Demod.highCnt = 0;
-			}
-		} else {
-			Demod.syncBit = 0xFFFF;			// not set
-			if 		((Demod.twoBits & 0x7700) == 0x7000) Demod.syncBit = 7;
-			else if ((Demod.twoBits & 0x3B80) == 0x3800) Demod.syncBit = 6;
-			else if ((Demod.twoBits & 0x1DC0) == 0x1C00) Demod.syncBit = 5;
-			else if ((Demod.twoBits & 0x0EE0) == 0x0E00) Demod.syncBit = 4;
-			else if ((Demod.twoBits & 0x0770) == 0x0700) Demod.syncBit = 3;
-			else if ((Demod.twoBits & 0x03B8) == 0x0380) Demod.syncBit = 2;
-			else if ((Demod.twoBits & 0x01DC) == 0x01C0) Demod.syncBit = 1;
-			else if ((Demod.twoBits & 0x00EE) == 0x00E0) Demod.syncBit = 0;
-			if (Demod.syncBit != 0xFFFF) {
-				Demod.startTime = non_real_time ? non_real_time : (GetCountSspClk() & 0xfffffff8);
-				Demod.startTime -= Demod.syncBit;
-				Demod.bitCount = offset;			// number of decoded data bits
-				Demod.state = DEMOD_MANCHESTER_DATA;
-			}
-		}
-	} else {
+        if (Demod.highCnt < 2) {                                            // wait for a stable unmodulated signal
+            if (Demod.twoBits == 0x0000) {
+                Demod.highCnt++;
+            } else {
+                Demod.highCnt = 0;
+            }
+        } else {
+            Demod.syncBit = 0xFFFF;            // not set
+            if         ((Demod.twoBits & 0x7700) == 0x7000) Demod.syncBit = 7;
+            else if ((Demod.twoBits & 0x3B80) == 0x3800) Demod.syncBit = 6;
+            else if ((Demod.twoBits & 0x1DC0) == 0x1C00) Demod.syncBit = 5;
+            else if ((Demod.twoBits & 0x0EE0) == 0x0E00) Demod.syncBit = 4;
+            else if ((Demod.twoBits & 0x0770) == 0x0700) Demod.syncBit = 3;
+            else if ((Demod.twoBits & 0x03B8) == 0x0380) Demod.syncBit = 2;
+            else if ((Demod.twoBits & 0x01DC) == 0x01C0) Demod.syncBit = 1;
+            else if ((Demod.twoBits & 0x00EE) == 0x00E0) Demod.syncBit = 0;
+            if (Demod.syncBit != 0xFFFF) {
+                Demod.startTime = non_real_time ? non_real_time : (GetCountSspClk() & 0xfffffff8);
+                Demod.startTime -= Demod.syncBit;
+                Demod.bitCount = offset;            // number of decoded data bits
+                Demod.state = DEMOD_MANCHESTER_DATA;
+            }
+        }
+    } else {
 
-		if (IsManchesterModulationNibble1(Demod.twoBits >> Demod.syncBit)) {		// modulation in first half
-			if (IsManchesterModulationNibble2(Demod.twoBits >> Demod.syncBit)) {	// ... and in second half = collision
-				if (!Demod.collisionPos) {
-					Demod.collisionPos = (Demod.len << 3) + Demod.bitCount;
-				}
-			}															// modulation in first half only - Sequence D = 1
-			Demod.bitCount++;
-			Demod.shiftReg = (Demod.shiftReg >> 1) | 0x100;				// in both cases, add a 1 to the shiftreg
-			if (Demod.bitCount == 9) {									// if we decoded a full byte (including parity)
-				Demod.output[Demod.len++] = (Demod.shiftReg & 0xff);
-				Demod.parityBits <<= 1;									// make room for the parity bit
-				Demod.parityBits |= ((Demod.shiftReg >> 8) & 0x01); 	// store parity bit
-				Demod.bitCount = 0;
-				Demod.shiftReg = 0;
-				if ((Demod.len & 0x0007) == 0) {							// every 8 data bytes
-					Demod.parity[Demod.parityLen++] = Demod.parityBits;	// store 8 parity bits
-					Demod.parityBits = 0;
-				}
-			}
-			Demod.endTime = Demod.startTime + 8 * (9 * Demod.len + Demod.bitCount + 1) - 4;
-		} else {														// no modulation in first half
-			if (IsManchesterModulationNibble2(Demod.twoBits >> Demod.syncBit)) {	// and modulation in second half = Sequence E = 0
-				Demod.bitCount++;
-				Demod.shiftReg = (Demod.shiftReg >> 1);					// add a 0 to the shiftreg
-				if (Demod.bitCount >= 9) {								// if we decoded a full byte (including parity)
-					Demod.output[Demod.len++] = (Demod.shiftReg & 0xff);
-					Demod.parityBits <<= 1;								// make room for the new parity bit
-					Demod.parityBits |= ((Demod.shiftReg >> 8) & 0x01); // store parity bit
-					Demod.bitCount = 0;
-					Demod.shiftReg = 0;
-					if ((Demod.len & 0x0007) == 0) {						// every 8 data bytes
-						Demod.parity[Demod.parityLen++] = Demod.parityBits;	// store 8 parity bits1
-						Demod.parityBits = 0;
-					}
-				}
-				Demod.endTime = Demod.startTime + 8 * (9 * Demod.len + Demod.bitCount + 1);
-			} else {													// no modulation in both halves - End of communication
-				if(Demod.bitCount > 0) {								// there are some remaining data bits
-					Demod.shiftReg >>= (9 - Demod.bitCount);			// right align the decoded bits
-					Demod.output[Demod.len++] = Demod.shiftReg & 0xff;	// and add them to the output
-					Demod.parityBits <<= 1;								// add a (void) parity bit
-					Demod.parityBits <<= (8 - (Demod.len&0x0007));		// left align remaining parity bits
-					Demod.parity[Demod.parityLen++] = Demod.parityBits;	// and store them
-					return true;
-				} else if (Demod.len & 0x0007) {						// there are some parity bits to store
-					Demod.parityBits <<= (8 - (Demod.len&0x0007));		// left align remaining parity bits
-					Demod.parity[Demod.parityLen++] = Demod.parityBits;	// and store them
-				}
-				if (Demod.len) {
-					return true;										// we are finished with decoding the raw data sequence
-				} else { 												// nothing received. Start over
-					DemodReset();
-				}
-			}
-		}
-	}
-    return false;	// not finished yet, need more data
+        if (IsManchesterModulationNibble1(Demod.twoBits >> Demod.syncBit)) {      // modulation in first half
+            if (IsManchesterModulationNibble2(Demod.twoBits >> Demod.syncBit)) {  // ... and in second half = collision
+                if (!Demod.collisionPos) {
+                    Demod.collisionPos = (Demod.len << 3) + Demod.bitCount;
+                }
+            }                                                           // modulation in first half only - Sequence D = 1
+            Demod.bitCount++;
+            Demod.shiftReg = (Demod.shiftReg >> 1) | 0x100;             // in both cases, add a 1 to the shiftreg
+            if (Demod.bitCount == 9) {                                  // if we decoded a full byte (including parity)
+                Demod.output[Demod.len++] = (Demod.shiftReg & 0xff);
+                Demod.parityBits <<= 1;                                 // make room for the parity bit
+                Demod.parityBits |= ((Demod.shiftReg >> 8) & 0x01);     // store parity bit
+                Demod.bitCount = 0;
+                Demod.shiftReg = 0;
+                if ((Demod.len & 0x0007) == 0) {                        // every 8 data bytes
+                    Demod.parity[Demod.parityLen++] = Demod.parityBits; // store 8 parity bits
+                    Demod.parityBits = 0;
+                }
+            }
+            Demod.endTime = Demod.startTime + 8 * (9 * Demod.len + Demod.bitCount + 1) - 4;
+        } else {                                                        // no modulation in first half
+            if (IsManchesterModulationNibble2(Demod.twoBits >> Demod.syncBit)) {    // and modulation in second half = Sequence E = 0
+                Demod.bitCount++;
+                Demod.shiftReg = (Demod.shiftReg >> 1);                 // add a 0 to the shiftreg
+                if (Demod.bitCount >= 9) {                              // if we decoded a full byte (including parity)
+                    Demod.output[Demod.len++] = (Demod.shiftReg & 0xff);
+                    Demod.parityBits <<= 1;                             // make room for the new parity bit
+                    Demod.parityBits |= ((Demod.shiftReg >> 8) & 0x01); // store parity bit
+                    Demod.bitCount = 0;
+                    Demod.shiftReg = 0;
+                    if ((Demod.len & 0x0007) == 0) {                    // every 8 data bytes
+                        Demod.parity[Demod.parityLen++] = Demod.parityBits;    // store 8 parity bits1
+                        Demod.parityBits = 0;
+                    }
+                }
+                Demod.endTime = Demod.startTime + 8 * (9 * Demod.len + Demod.bitCount + 1);
+            } else {                                                    // no modulation in both halves - End of communication
+                if(Demod.bitCount > 0) {                                // there are some remaining data bits
+                    Demod.shiftReg >>= (9 - Demod.bitCount);            // right align the decoded bits
+                    Demod.output[Demod.len++] = Demod.shiftReg & 0xff;  // and add them to the output
+                    Demod.parityBits <<= 1;                             // add a (void) parity bit
+                    Demod.parityBits <<= (8 - (Demod.len&0x0007));      // left align remaining parity bits
+                    Demod.parity[Demod.parityLen++] = Demod.parityBits; // and store them
+                    return true;
+                } else if (Demod.len & 0x0007) {                        // there are some parity bits to store
+                    Demod.parityBits <<= (8 - (Demod.len&0x0007));      // left align remaining parity bits
+                    Demod.parity[Demod.parityLen++] = Demod.parityBits; // and store them
+                }
+                if (Demod.len) {
+                    return true;                                        // we are finished with decoding the raw data sequence
+                } else {                                                // nothing received. Start over
+                    DemodReset();
+                }
+            }
+        }
+    }
+    return false;    // not finished yet, need more data
 }
 
 //=============================================================================
@@ -488,162 +488,162 @@ RAMFUNC int ManchesterDecoding(uint8_t bit, uint16_t offset, uint32_t non_real_t
 // "hf 14a sniff"
 //-----------------------------------------------------------------------------
 void RAMFUNC SniffIso14443a(uint8_t param) {
-	LEDsoff();
-	// param:
-	// bit 0 - trigger from first card answer
-	// bit 1 - trigger from first reader 7-bit request
-	iso14443a_setup(FPGA_HF_ISO14443A_SNIFFER);
+    LEDsoff();
+    // param:
+    // bit 0 - trigger from first card answer
+    // bit 1 - trigger from first reader 7-bit request
+    iso14443a_setup(FPGA_HF_ISO14443A_SNIFFER);
 
-	// Allocate memory from BigBuf for some buffers
-	// free all previous allocations first
-	BigBuf_free(); BigBuf_Clear_ext(false);
-	clear_trace();
-	set_tracing(true);
+    // Allocate memory from BigBuf for some buffers
+    // free all previous allocations first
+    BigBuf_free(); BigBuf_Clear_ext(false);
+    clear_trace();
+    set_tracing(true);
 
-	// The command (reader -> tag) that we're receiving.
-	uint8_t *receivedCmd = BigBuf_malloc(MAX_FRAME_SIZE);
-	uint8_t *receivedCmdPar = BigBuf_malloc(MAX_PARITY_SIZE);
+    // The command (reader -> tag) that we're receiving.
+    uint8_t *receivedCmd = BigBuf_malloc(MAX_FRAME_SIZE);
+    uint8_t *receivedCmdPar = BigBuf_malloc(MAX_PARITY_SIZE);
 
-	// The response (tag -> reader) that we're receiving.
-	uint8_t *receivedResp = BigBuf_malloc(MAX_FRAME_SIZE);
-	uint8_t *receivedRespPar = BigBuf_malloc(MAX_PARITY_SIZE);
+    // The response (tag -> reader) that we're receiving.
+    uint8_t *receivedResp = BigBuf_malloc(MAX_FRAME_SIZE);
+    uint8_t *receivedRespPar = BigBuf_malloc(MAX_PARITY_SIZE);
 
-	// The DMA buffer, used to stream samples from the FPGA
-	uint8_t *dmaBuf = BigBuf_malloc(DMA_BUFFER_SIZE);
-	uint8_t *data = dmaBuf;
+    // The DMA buffer, used to stream samples from the FPGA
+    uint8_t *dmaBuf = BigBuf_malloc(DMA_BUFFER_SIZE);
+    uint8_t *data = dmaBuf;
 
-	uint8_t previous_data = 0;
-	int maxDataLen = 0;
-	int dataLen = 0;
-	bool TagIsActive = false;
-	bool ReaderIsActive = false;
+    uint8_t previous_data = 0;
+    int maxDataLen = 0;
+    int dataLen = 0;
+    bool TagIsActive = false;
+    bool ReaderIsActive = false;
 
-	// Set up the demodulator for tag -> reader responses.
-	DemodInit(receivedResp, receivedRespPar);
+    // Set up the demodulator for tag -> reader responses.
+    DemodInit(receivedResp, receivedRespPar);
 
-	// Set up the demodulator for the reader -> tag commands
-	UartInit(receivedCmd, receivedCmdPar);
+    // Set up the demodulator for the reader -> tag commands
+    UartInit(receivedCmd, receivedCmdPar);
 
-	// Setup and start DMA.
-	if ( !FpgaSetupSscDma((uint8_t*) dmaBuf, DMA_BUFFER_SIZE) ){
-		if (MF_DBGLEVEL > 1) Dbprintf("FpgaSetupSscDma failed. Exiting");
-		return;
-	}
+    // Setup and start DMA.
+    if ( !FpgaSetupSscDma((uint8_t*) dmaBuf, DMA_BUFFER_SIZE) ){
+        if (MF_DBGLEVEL > 1) Dbprintf("FpgaSetupSscDma failed. Exiting");
+        return;
+    }
 
-	// We won't start recording the frames that we acquire until we trigger;
-	// a good trigger condition to get started is probably when we see a
-	// response from the tag.
-	// triggered == false -- to wait first for card
-	bool triggered = !(param & 0x03);
+    // We won't start recording the frames that we acquire until we trigger;
+    // a good trigger condition to get started is probably when we see a
+    // response from the tag.
+    // triggered == false -- to wait first for card
+    bool triggered = !(param & 0x03);
 
-	uint32_t rsamples = 0;
+    uint32_t rsamples = 0;
 
-	DbpString("Starting to sniff");
+    DbpString("Starting to sniff");
 
-	// loop and listen
-	while (!BUTTON_PRESS()) {
+    // loop and listen
+    while (!BUTTON_PRESS()) {
         WDT_HIT();
         LED_A_ON();
 
-		int register readBufDataP = data - dmaBuf;
-		int register dmaBufDataP = DMA_BUFFER_SIZE - AT91C_BASE_PDC_SSC->PDC_RCR;
-		if (readBufDataP <= dmaBufDataP)
-			dataLen = dmaBufDataP - readBufDataP;
-		else
-			dataLen = DMA_BUFFER_SIZE - readBufDataP + dmaBufDataP;
+        int register readBufDataP = data - dmaBuf;
+        int register dmaBufDataP = DMA_BUFFER_SIZE - AT91C_BASE_PDC_SSC->PDC_RCR;
+        if (readBufDataP <= dmaBufDataP)
+            dataLen = dmaBufDataP - readBufDataP;
+        else
+            dataLen = DMA_BUFFER_SIZE - readBufDataP + dmaBufDataP;
 
-		// test for length of buffer
-		if (dataLen > maxDataLen) {
-			maxDataLen = dataLen;
-			if (dataLen > (9 * DMA_BUFFER_SIZE / 10)) {
-				Dbprintf("[!] blew circular buffer! | datalen %u", dataLen);
-				break;
-			}
-		}
-		if (dataLen < 1) continue;
+        // test for length of buffer
+        if (dataLen > maxDataLen) {
+            maxDataLen = dataLen;
+            if (dataLen > (9 * DMA_BUFFER_SIZE / 10)) {
+                Dbprintf("[!] blew circular buffer! | datalen %u", dataLen);
+                break;
+            }
+        }
+        if (dataLen < 1) continue;
 
-		// primary buffer was stopped( <-- we lost data!
-		if (!AT91C_BASE_PDC_SSC->PDC_RCR) {
-			AT91C_BASE_PDC_SSC->PDC_RPR = (uint32_t) dmaBuf;
-			AT91C_BASE_PDC_SSC->PDC_RCR = DMA_BUFFER_SIZE;
-			Dbprintf("[-] RxEmpty ERROR | data length %d", dataLen); // temporary
-		}
-		// secondary buffer sets as primary, secondary buffer was stopped
-		if (!AT91C_BASE_PDC_SSC->PDC_RNCR) {
-			AT91C_BASE_PDC_SSC->PDC_RNPR = (uint32_t) dmaBuf;
-			AT91C_BASE_PDC_SSC->PDC_RNCR = DMA_BUFFER_SIZE;
-		}
+        // primary buffer was stopped( <-- we lost data!
+        if (!AT91C_BASE_PDC_SSC->PDC_RCR) {
+            AT91C_BASE_PDC_SSC->PDC_RPR = (uint32_t) dmaBuf;
+            AT91C_BASE_PDC_SSC->PDC_RCR = DMA_BUFFER_SIZE;
+            Dbprintf("[-] RxEmpty ERROR | data length %d", dataLen); // temporary
+        }
+        // secondary buffer sets as primary, secondary buffer was stopped
+        if (!AT91C_BASE_PDC_SSC->PDC_RNCR) {
+            AT91C_BASE_PDC_SSC->PDC_RNPR = (uint32_t) dmaBuf;
+            AT91C_BASE_PDC_SSC->PDC_RNCR = DMA_BUFFER_SIZE;
+        }
 
-		LED_A_OFF();
+        LED_A_OFF();
 
-		// Need two samples to feed Miller and Manchester-Decoder
-		if (rsamples & 0x01) {
+        // Need two samples to feed Miller and Manchester-Decoder
+        if (rsamples & 0x01) {
 
-			if (!TagIsActive) {		// no need to try decoding reader data if the tag is sending
-				uint8_t readerdata = (previous_data & 0xF0) | (*data >> 4);
-				if (MillerDecoding(readerdata, (rsamples-1)*4)) {
-					LED_C_ON();
+            if (!TagIsActive) {        // no need to try decoding reader data if the tag is sending
+                uint8_t readerdata = (previous_data & 0xF0) | (*data >> 4);
+                if (MillerDecoding(readerdata, (rsamples-1)*4)) {
+                    LED_C_ON();
 
-					// check - if there is a short 7bit request from reader
-					if ((!triggered) && (param & 0x02) && (Uart.len == 1) && (Uart.bitCount == 7)) triggered = true;
+                    // check - if there is a short 7bit request from reader
+                    if ((!triggered) && (param & 0x02) && (Uart.len == 1) && (Uart.bitCount == 7)) triggered = true;
 
-					if (triggered) {
-						if (!LogTrace(receivedCmd,
-										Uart.len,
-										Uart.startTime*16 - DELAY_READER_AIR2ARM_AS_SNIFFER,
-										Uart.endTime*16 - DELAY_READER_AIR2ARM_AS_SNIFFER,
-										Uart.parity,
-										true)) break;
-					}
-					/* ready to receive another command. */
-					UartReset();
-					/* reset the demod code, which might have been */
-					/* false-triggered by the commands from the reader. */
-					DemodReset();
-					LED_B_OFF();
-				}
-				ReaderIsActive = (Uart.state != STATE_UNSYNCD);
-			}
+                    if (triggered) {
+                        if (!LogTrace(receivedCmd,
+                                        Uart.len,
+                                        Uart.startTime*16 - DELAY_READER_AIR2ARM_AS_SNIFFER,
+                                        Uart.endTime*16 - DELAY_READER_AIR2ARM_AS_SNIFFER,
+                                        Uart.parity,
+                                        true)) break;
+                    }
+                    /* ready to receive another command. */
+                    UartReset();
+                    /* reset the demod code, which might have been */
+                    /* false-triggered by the commands from the reader. */
+                    DemodReset();
+                    LED_B_OFF();
+                }
+                ReaderIsActive = (Uart.state != STATE_UNSYNCD);
+            }
 
-			// no need to try decoding tag data if the reader is sending - and we cannot afford the time
-			if (!ReaderIsActive) {
-				uint8_t tagdata = (previous_data << 4) | (*data & 0x0F);
-				if (ManchesterDecoding(tagdata, 0, (rsamples-1)*4)) {
-					LED_B_ON();
+            // no need to try decoding tag data if the reader is sending - and we cannot afford the time
+            if (!ReaderIsActive) {
+                uint8_t tagdata = (previous_data << 4) | (*data & 0x0F);
+                if (ManchesterDecoding(tagdata, 0, (rsamples-1)*4)) {
+                    LED_B_ON();
 
-					if (!LogTrace(receivedResp,
-									Demod.len,
-									Demod.startTime*16 - DELAY_TAG_AIR2ARM_AS_SNIFFER,
-									Demod.endTime*16 - DELAY_TAG_AIR2ARM_AS_SNIFFER,
-									Demod.parity,
-									false)) break;
+                    if (!LogTrace(receivedResp,
+                                    Demod.len,
+                                    Demod.startTime*16 - DELAY_TAG_AIR2ARM_AS_SNIFFER,
+                                    Demod.endTime*16 - DELAY_TAG_AIR2ARM_AS_SNIFFER,
+                                    Demod.parity,
+                                    false)) break;
 
-					if ((!triggered) && (param & 0x01)) triggered = true;
+                    if ((!triggered) && (param & 0x01)) triggered = true;
 
-					// ready to receive another response.
-					DemodReset();
-					// reset the Miller decoder including its (now outdated) input buffer
-					UartReset();
-					//UartInit(receivedCmd, receivedCmdPar);
-					LED_C_OFF();
-				}
-				TagIsActive = (Demod.state != DEMOD_UNSYNCD);
-			}
-		}
+                    // ready to receive another response.
+                    DemodReset();
+                    // reset the Miller decoder including its (now outdated) input buffer
+                    UartReset();
+                    //UartInit(receivedCmd, receivedCmdPar);
+                    LED_C_OFF();
+                }
+                TagIsActive = (Demod.state != DEMOD_UNSYNCD);
+            }
+        }
 
-		previous_data = *data;
-		rsamples++;
-		data++;
-		if (data == dmaBuf + DMA_BUFFER_SIZE) {
-			data = dmaBuf;
-		}
-	} // end main loop
+        previous_data = *data;
+        rsamples++;
+        data++;
+        if (data == dmaBuf + DMA_BUFFER_SIZE) {
+            data = dmaBuf;
+        }
+    } // end main loop
 
-	if (MF_DBGLEVEL >= 1) {
-		Dbprintf("maxDataLen=%d, Uart.state=%x, Uart.len=%d", maxDataLen, Uart.state, Uart.len);
-		Dbprintf("traceLen=%d, Uart.output[0]=%08x", BigBuf_get_traceLen(), (uint32_t)Uart.output[0]);
-	}
-	switch_off();
+    if (MF_DBGLEVEL >= 1) {
+        Dbprintf("maxDataLen=%d, Uart.state=%x, Uart.len=%d", maxDataLen, Uart.state, Uart.len);
+        Dbprintf("traceLen=%d, Uart.output[0]=%08x", BigBuf_get_traceLen(), (uint32_t)Uart.output[0]);
+    }
+    switch_off();
 }
 
 //-----------------------------------------------------------------------------
@@ -651,107 +651,107 @@ void RAMFUNC SniffIso14443a(uint8_t param) {
 //-----------------------------------------------------------------------------
 static void CodeIso14443aAsTagPar(const uint8_t *cmd, uint16_t len, uint8_t *parity, bool collision) {
 
-	//uint8_t localCol = 0;
-	ToSendReset();
+    //uint8_t localCol = 0;
+    ToSendReset();
 
-	// Correction bit, might be removed when not needed
-	ToSendStuffBit(0);
-	ToSendStuffBit(0);
-	ToSendStuffBit(0);
-	ToSendStuffBit(0);
-	ToSendStuffBit(1);  // <-----
-	ToSendStuffBit(0);
-	ToSendStuffBit(0);
-	ToSendStuffBit(0);
+    // Correction bit, might be removed when not needed
+    ToSendStuffBit(0);
+    ToSendStuffBit(0);
+    ToSendStuffBit(0);
+    ToSendStuffBit(0);
+    ToSendStuffBit(1);  // <-----
+    ToSendStuffBit(0);
+    ToSendStuffBit(0);
+    ToSendStuffBit(0);
 
-	// Send startbit
-	ToSend[++ToSendMax] = SEC_D;
-	LastProxToAirDuration = 8 * ToSendMax - 4;
+    // Send startbit
+    ToSend[++ToSendMax] = SEC_D;
+    LastProxToAirDuration = 8 * ToSendMax - 4;
 
-	for(uint16_t i = 0; i < len; i++) {
-		uint8_t b = cmd[i];
+    for(uint16_t i = 0; i < len; i++) {
+        uint8_t b = cmd[i];
 
-		// Data bits
-		for(uint16_t j = 0; j < 8; j++) {
-			//if (collision && (localCol >= colpos)){
-			if (collision) {
-				ToSend[++ToSendMax] = SEC_COLL;
-				//localCol++;
+        // Data bits
+        for(uint16_t j = 0; j < 8; j++) {
+            //if (collision && (localCol >= colpos)){
+            if (collision) {
+                ToSend[++ToSendMax] = SEC_COLL;
+                //localCol++;
             } else {
-				if (b & 1) {
-					ToSend[++ToSendMax] = SEC_D;
-				} else {
-					ToSend[++ToSendMax] = SEC_E;
-				}
-				b >>= 1;
-			}
-		}
+                if (b & 1) {
+                    ToSend[++ToSendMax] = SEC_D;
+                } else {
+                    ToSend[++ToSendMax] = SEC_E;
+                }
+                b >>= 1;
+            }
+        }
 
-		if (collision) {
-			ToSend[++ToSendMax] = SEC_COLL;
-			LastProxToAirDuration = 8 * ToSendMax;
-		} else {
-			// Get the parity bit
-			if (parity[i>>3] & (0x80>>(i&0x0007))) {
-				ToSend[++ToSendMax] = SEC_D;
-				LastProxToAirDuration = 8 * ToSendMax - 4;
-			} else {
-				ToSend[++ToSendMax] = SEC_E;
-				LastProxToAirDuration = 8 * ToSendMax;
-			}
-		}
-	}
+        if (collision) {
+            ToSend[++ToSendMax] = SEC_COLL;
+            LastProxToAirDuration = 8 * ToSendMax;
+        } else {
+            // Get the parity bit
+            if (parity[i>>3] & (0x80>>(i&0x0007))) {
+                ToSend[++ToSendMax] = SEC_D;
+                LastProxToAirDuration = 8 * ToSendMax - 4;
+            } else {
+                ToSend[++ToSendMax] = SEC_E;
+                LastProxToAirDuration = 8 * ToSendMax;
+            }
+        }
+    }
 
-	// Send stopbit
-	ToSend[++ToSendMax] = SEC_F;
+    // Send stopbit
+    ToSend[++ToSendMax] = SEC_F;
 
-	// Convert from last byte pos to length
-	ToSendMax++;
+    // Convert from last byte pos to length
+    ToSendMax++;
 }
 
 static void CodeIso14443aAsTagEx(const uint8_t *cmd, uint16_t len, bool collision) {
-	uint8_t par[MAX_PARITY_SIZE] = {0};
-	GetParity(cmd, len, par);
-	CodeIso14443aAsTagPar(cmd, len, par, collision);
+    uint8_t par[MAX_PARITY_SIZE] = {0};
+    GetParity(cmd, len, par);
+    CodeIso14443aAsTagPar(cmd, len, par, collision);
 }
 static void CodeIso14443aAsTag(const uint8_t *cmd, uint16_t len) {
-	CodeIso14443aAsTagEx(cmd, len, false);
+    CodeIso14443aAsTagEx(cmd, len, false);
 }
 
 static void Code4bitAnswerAsTag(uint8_t cmd) {
-	uint8_t b = cmd;
+    uint8_t b = cmd;
 
-	ToSendReset();
+    ToSendReset();
 
-	// Correction bit, might be removed when not needed
-	ToSendStuffBit(0);
-	ToSendStuffBit(0);
-	ToSendStuffBit(0);
-	ToSendStuffBit(0);
-	ToSendStuffBit(1);  // 1
-	ToSendStuffBit(0);
-	ToSendStuffBit(0);
-	ToSendStuffBit(0);
+    // Correction bit, might be removed when not needed
+    ToSendStuffBit(0);
+    ToSendStuffBit(0);
+    ToSendStuffBit(0);
+    ToSendStuffBit(0);
+    ToSendStuffBit(1);  // 1
+    ToSendStuffBit(0);
+    ToSendStuffBit(0);
+    ToSendStuffBit(0);
 
-	// Send startbit
-	ToSend[++ToSendMax] = SEC_D;
+    // Send startbit
+    ToSend[++ToSendMax] = SEC_D;
 
-	for(uint8_t i = 0; i < 4; i++) {
-		if(b & 1) {
-			ToSend[++ToSendMax] = SEC_D;
-			LastProxToAirDuration = 8 * ToSendMax - 4;
-		} else {
-			ToSend[++ToSendMax] = SEC_E;
-			LastProxToAirDuration = 8 * ToSendMax;
-		}
-		b >>= 1;
-	}
+    for(uint8_t i = 0; i < 4; i++) {
+        if(b & 1) {
+            ToSend[++ToSendMax] = SEC_D;
+            LastProxToAirDuration = 8 * ToSendMax - 4;
+        } else {
+            ToSend[++ToSendMax] = SEC_E;
+            LastProxToAirDuration = 8 * ToSendMax;
+        }
+        b >>= 1;
+    }
 
-	// Send stopbit
-	ToSend[++ToSendMax] = SEC_F;
+    // Send stopbit
+    ToSend[++ToSendMax] = SEC_F;
 
-	// Convert from last byte pos to length
-	ToSendMax++;
+    // Convert from last byte pos to length
+    ToSendMax++;
 }
 
 //-----------------------------------------------------------------------------
@@ -767,9 +767,9 @@ int GetIso14443aCommandFromReader(uint8_t *received, uint8_t *parity, int *len)
     FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_TAGSIM_LISTEN);
 
     // Now run a `software UART` on the stream of incoming samples.
-	UartInit(received, parity);
+    UartInit(received, parity);
 
-	// clear RXRDY:
+    // clear RXRDY:
     uint8_t b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
 
     while (!BUTTON_PRESS()) {
@@ -777,43 +777,43 @@ int GetIso14443aCommandFromReader(uint8_t *received, uint8_t *parity, int *len)
 
         if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
             b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
-			if (MillerDecoding(b, 0)) {
-				*len = Uart.len;
-				return true;
-			}
- 		}
+            if (MillerDecoding(b, 0)) {
+                *len = Uart.len;
+                return true;
+            }
+         }
     }
-	return false;
+    return false;
 }
 
 bool prepare_tag_modulation(tag_response_info_t* response_info, size_t max_buffer_size) {
-	// Example response, answer to MIFARE Classic read block will be 16 bytes + 2 CRC = 18 bytes
-	// This will need the following byte array for a modulation sequence
-	//    144        data bits (18 * 8)
-	//     18        parity bits
-	//      2        Start and stop
-	//      1        Correction bit (Answer in 1172 or 1236 periods, see FPGA)
-	//      1        just for the case
-	// ----------- +
-	//    166 bytes, since every bit that needs to be send costs us a byte
-	//
-	// Prepare the tag modulation bits from the message
-	CodeIso14443aAsTag(response_info->response,response_info->response_n);
+    // Example response, answer to MIFARE Classic read block will be 16 bytes + 2 CRC = 18 bytes
+    // This will need the following byte array for a modulation sequence
+    //    144        data bits (18 * 8)
+    //     18        parity bits
+    //      2        Start and stop
+    //      1        Correction bit (Answer in 1172 or 1236 periods, see FPGA)
+    //      1        just for the case
+    // ----------- +
+    //    166 bytes, since every bit that needs to be send costs us a byte
+    //
+    // Prepare the tag modulation bits from the message
+    CodeIso14443aAsTag(response_info->response,response_info->response_n);
 
-	// Make sure we do not exceed the free buffer space
-	if (ToSendMax > max_buffer_size) {
-		Dbprintf("Out of memory, when modulating bits for tag answer:");
-		Dbhexdump(response_info->response_n, response_info->response, false);
-		return false;
-	}
+    // Make sure we do not exceed the free buffer space
+    if (ToSendMax > max_buffer_size) {
+        Dbprintf("Out of memory, when modulating bits for tag answer:");
+        Dbhexdump(response_info->response_n, response_info->response, false);
+        return false;
+    }
 
-	// Copy the byte array, used for this modulation to the buffer position
-	memcpy(response_info->modulation, ToSend, ToSendMax);
+    // Copy the byte array, used for this modulation to the buffer position
+    memcpy(response_info->modulation, ToSend, ToSendMax);
 
-	// Store the number of bytes that were used for encoding/modulation and the time needed to transfer them
-	response_info->modulation_n = ToSendMax;
-	response_info->ProxToAirDuration = LastProxToAirDuration;
-	return true;
+    // Store the number of bytes that were used for encoding/modulation and the time needed to transfer them
+    response_info->modulation_n = ToSendMax;
+    response_info->ProxToAirDuration = LastProxToAirDuration;
+    return true;
 }
 
 // "precompile" responses. There are 7 predefined responses with a total of 28 bytes data to transmit.
@@ -825,20 +825,20 @@ bool prepare_tag_modulation(tag_response_info_t* response_info, size_t max_buffe
 #define ALLOCATED_TAG_MODULATION_BUFFER_SIZE 453
 
 bool prepare_allocated_tag_modulation(tag_response_info_t* response_info) {
-	// Retrieve and store the current buffer index
-	response_info->modulation = free_buffer_pointer;
+    // Retrieve and store the current buffer index
+    response_info->modulation = free_buffer_pointer;
 
-	// Determine the maximum size we can use from our buffer
-	size_t max_buffer_size = ALLOCATED_TAG_MODULATION_BUFFER_SIZE;
+    // Determine the maximum size we can use from our buffer
+    size_t max_buffer_size = ALLOCATED_TAG_MODULATION_BUFFER_SIZE;
 
-	// Forward the prepare tag modulation function to the inner function
-	if (prepare_tag_modulation(response_info, max_buffer_size)) {
-		// Update the free buffer offset
-		free_buffer_pointer += ToSendMax;
-		return true;
-	} else {
-		return false;
-	}
+    // Forward the prepare tag modulation function to the inner function
+    if (prepare_tag_modulation(response_info, max_buffer_size)) {
+        // Update the free buffer offset
+        free_buffer_pointer += ToSendMax;
+        return true;
+    } else {
+        return false;
+    }
 }
 
 //-----------------------------------------------------------------------------
@@ -848,699 +848,699 @@ bool prepare_allocated_tag_modulation(tag_response_info_t* response_info) {
 //-----------------------------------------------------------------------------
 void SimulateIso14443aTag(int tagType, int flags, uint8_t* data) {
 
-	#define ATTACK_KEY_COUNT 8 // keep same as define in cmdhfmf.c -> readerAttack()
+    #define ATTACK_KEY_COUNT 8 // keep same as define in cmdhfmf.c -> readerAttack()
 
-	uint8_t sak = 0;
-	uint32_t cuid = 0;
-	uint32_t nonce = 0;
+    uint8_t sak = 0;
+    uint32_t cuid = 0;
+    uint32_t nonce = 0;
 
-	// PACK response to PWD AUTH for EV1/NTAG
-	uint8_t response8[4] = {0,0,0,0};
-	// Counter for EV1/NTAG
-	uint32_t counters[] = {0,0,0};
+    // PACK response to PWD AUTH for EV1/NTAG
+    uint8_t response8[4] = {0,0,0,0};
+    // Counter for EV1/NTAG
+    uint32_t counters[] = {0,0,0};
 
-	// The first response contains the ATQA (note: bytes are transmitted in reverse order).
-	uint8_t response1[] = {0,0};
+    // The first response contains the ATQA (note: bytes are transmitted in reverse order).
+    uint8_t response1[] = {0,0};
 
-	// Here, we collect CUID, block1, keytype1, NT1, NR1, AR1, CUID, block2, keytyp2, NT2, NR2, AR2
-	// it should also collect block, keytype.
-	uint8_t cardAUTHSC = 0;
-	uint8_t cardAUTHKEY = 0xff;  // no authentication
-	// allow collecting up to 8 sets of nonces to allow recovery of up to 8 keys
+    // Here, we collect CUID, block1, keytype1, NT1, NR1, AR1, CUID, block2, keytyp2, NT2, NR2, AR2
+    // it should also collect block, keytype.
+    uint8_t cardAUTHSC = 0;
+    uint8_t cardAUTHKEY = 0xff;  // no authentication
+    // allow collecting up to 8 sets of nonces to allow recovery of up to 8 keys
 
-	nonces_t ar_nr_nonces[ATTACK_KEY_COUNT]; // for attack types moebius
-	memset(ar_nr_nonces, 0x00, sizeof(ar_nr_nonces));
-	uint8_t	moebius_count = 0;
+    nonces_t ar_nr_nonces[ATTACK_KEY_COUNT]; // for attack types moebius
+    memset(ar_nr_nonces, 0x00, sizeof(ar_nr_nonces));
+    uint8_t    moebius_count = 0;
 
-	switch (tagType) {
-		case 1: { // MIFARE Classic 1k
-			response1[0] = 0x04;
-			sak = 0x08;
-		} break;
-		case 2: { // MIFARE Ultralight
-			response1[0] = 0x44;
-			sak = 0x00;
-		} break;
-		case 3: { // MIFARE DESFire
-			response1[0] = 0x04;
-			response1[1] = 0x03;
-			sak = 0x20;
-		} break;
-		case 4: { // ISO/IEC 14443-4 - javacard (JCOP)
-			response1[0] = 0x04;
-			sak = 0x28;
-		} break;
-		case 5: { // MIFARE TNP3XXX
-			response1[0] = 0x01;
-			response1[1] = 0x0f;
-			sak = 0x01;
-		} break;
-		case 6: { // MIFARE Mini 320b
-			response1[0] = 0x44;
-			sak = 0x09;
-		} break;
-		case 7: { // NTAG
-			response1[0] = 0x44;
-			sak = 0x00;
-			// PACK
-			response8[0] = 0x80;
-			response8[1] = 0x80;
-			compute_crc(CRC_14443_A, response8, 2, &response8[2], &response8[3]);
-			// uid not supplied then get from emulator memory
-			if (data[0]==0) {
-				uint16_t start = 4 * (0+12);
-				uint8_t emdata[8];
-				emlGetMemBt( emdata, start, sizeof(emdata));
-				memcpy(data, emdata, 3); // uid bytes 0-2
-				memcpy(data+3, emdata+4, 4); // uid bytes 3-7
-				flags |= FLAG_7B_UID_IN_DATA;
-			}
-		} break;
-		case 8: { // MIFARE Classic 4k
-			response1[0] = 0x02;
-			sak = 0x18;
-		} break;
-		case 9 : { // FM11RF005SH (Shanghai Metro)
-			response1[0] = 0x03;
-			response1[1] = 0x00;
-			sak = 0x0A;
-		}
-		default: {
-			Dbprintf("Error: unkown tagtype (%d)",tagType);
-			return;
-		} break;
-	}
+    switch (tagType) {
+        case 1: { // MIFARE Classic 1k
+            response1[0] = 0x04;
+            sak = 0x08;
+        } break;
+        case 2: { // MIFARE Ultralight
+            response1[0] = 0x44;
+            sak = 0x00;
+        } break;
+        case 3: { // MIFARE DESFire
+            response1[0] = 0x04;
+            response1[1] = 0x03;
+            sak = 0x20;
+        } break;
+        case 4: { // ISO/IEC 14443-4 - javacard (JCOP)
+            response1[0] = 0x04;
+            sak = 0x28;
+        } break;
+        case 5: { // MIFARE TNP3XXX
+            response1[0] = 0x01;
+            response1[1] = 0x0f;
+            sak = 0x01;
+        } break;
+        case 6: { // MIFARE Mini 320b
+            response1[0] = 0x44;
+            sak = 0x09;
+        } break;
+        case 7: { // NTAG
+            response1[0] = 0x44;
+            sak = 0x00;
+            // PACK
+            response8[0] = 0x80;
+            response8[1] = 0x80;
+            compute_crc(CRC_14443_A, response8, 2, &response8[2], &response8[3]);
+            // uid not supplied then get from emulator memory
+            if (data[0]==0) {
+                uint16_t start = 4 * (0+12);
+                uint8_t emdata[8];
+                emlGetMemBt( emdata, start, sizeof(emdata));
+                memcpy(data, emdata, 3); // uid bytes 0-2
+                memcpy(data+3, emdata+4, 4); // uid bytes 3-7
+                flags |= FLAG_7B_UID_IN_DATA;
+            }
+        } break;
+        case 8: { // MIFARE Classic 4k
+            response1[0] = 0x02;
+            sak = 0x18;
+        } break;
+        case 9 : { // FM11RF005SH (Shanghai Metro)
+            response1[0] = 0x03;
+            response1[1] = 0x00;
+            sak = 0x0A;
+        }
+        default: {
+            Dbprintf("Error: unkown tagtype (%d)",tagType);
+            return;
+        } break;
+    }
 
-	// The second response contains the (mandatory) first 24 bits of the UID
-	uint8_t response2[5] = {0x00};
+    // The second response contains the (mandatory) first 24 bits of the UID
+    uint8_t response2[5] = {0x00};
 
-	// For UID size 7,
-	uint8_t response2a[5] = {0x00};
+    // For UID size 7,
+    uint8_t response2a[5] = {0x00};
 
-	if ( (flags & FLAG_7B_UID_IN_DATA) == FLAG_7B_UID_IN_DATA ) {
-		response2[0] = 0x88;  // Cascade Tag marker
-		response2[1] = data[0];
-		response2[2] = data[1];
-		response2[3] = data[2];
+    if ( (flags & FLAG_7B_UID_IN_DATA) == FLAG_7B_UID_IN_DATA ) {
+        response2[0] = 0x88;  // Cascade Tag marker
+        response2[1] = data[0];
+        response2[2] = data[1];
+        response2[3] = data[2];
 
-		response2a[0] = data[3];
-		response2a[1] = data[4];
-		response2a[2] = data[5];
-		response2a[3] = data[6]; //??
-		response2a[4] = response2a[0] ^ response2a[1] ^ response2a[2] ^ response2a[3];
+        response2a[0] = data[3];
+        response2a[1] = data[4];
+        response2a[2] = data[5];
+        response2a[3] = data[6]; //??
+        response2a[4] = response2a[0] ^ response2a[1] ^ response2a[2] ^ response2a[3];
 
-		// Configure the ATQA and SAK accordingly
-		response1[0] |= 0x40;
-		sak |= 0x04;
+        // Configure the ATQA and SAK accordingly
+        response1[0] |= 0x40;
+        sak |= 0x04;
 
-		cuid = bytes_to_num(data+3, 4);
-	} else {
-		memcpy(response2, data, 4);
-		// Configure the ATQA and SAK accordingly
-		response1[0] &= 0xBF;
-		sak &= 0xFB;
-		cuid = bytes_to_num(data, 4);
-	}
+        cuid = bytes_to_num(data+3, 4);
+    } else {
+        memcpy(response2, data, 4);
+        // Configure the ATQA and SAK accordingly
+        response1[0] &= 0xBF;
+        sak &= 0xFB;
+        cuid = bytes_to_num(data, 4);
+    }
 
-	// Calculate the BitCountCheck (BCC) for the first 4 bytes of the UID.
-	response2[4] = response2[0] ^ response2[1] ^ response2[2] ^ response2[3];
+    // Calculate the BitCountCheck (BCC) for the first 4 bytes of the UID.
+    response2[4] = response2[0] ^ response2[1] ^ response2[2] ^ response2[3];
 
-	// Prepare the mandatory SAK (for 4 and 7 byte UID)
-	uint8_t response3[3]  = {sak, 0x00, 0x00};
-	compute_crc(CRC_14443_A, response3, 1, &response3[1], &response3[2]);
+    // Prepare the mandatory SAK (for 4 and 7 byte UID)
+    uint8_t response3[3]  = {sak, 0x00, 0x00};
+    compute_crc(CRC_14443_A, response3, 1, &response3[1], &response3[2]);
 
-	// Prepare the optional second SAK (for 7 byte UID), drop the cascade bit
-	uint8_t response3a[3]  = {0x00};
-	response3a[0] = sak & 0xFB;
-	compute_crc(CRC_14443_A, response3a, 1, &response3a[1], &response3a[2]);
+    // Prepare the optional second SAK (for 7 byte UID), drop the cascade bit
+    uint8_t response3a[3]  = {0x00};
+    response3a[0] = sak & 0xFB;
+    compute_crc(CRC_14443_A, response3a, 1, &response3a[1], &response3a[2]);
 
-	// Tag NONCE.
-	uint8_t response5[4];
+    // Tag NONCE.
+    uint8_t response5[4];
 
-	uint8_t response6[] = { 0x04, 0x58, 0x80, 0x02, 0x00, 0x00 }; 	// dummy ATS (pseudo-ATR), answer to RATS:
+    uint8_t response6[] = { 0x04, 0x58, 0x80, 0x02, 0x00, 0x00 };     // dummy ATS (pseudo-ATR), answer to RATS:
 
-	// Format byte = 0x58: FSCI=0x08 (FSC=256), TA(1) and TC(1) present,
-	// TA(1) = 0x80: different divisors not supported, DR = 1, DS = 1
-	// TB(1) = not present. Defaults: FWI = 4 (FWT = 256 * 16 * 2^4 * 1/fc = 4833us), SFGI = 0 (SFG = 256 * 16 * 2^0 * 1/fc = 302us)
-	// TC(1) = 0x02: CID supported, NAD not supported
-	compute_crc(CRC_14443_A, response6, 4, &response6[4], &response6[5]);
+    // Format byte = 0x58: FSCI=0x08 (FSC=256), TA(1) and TC(1) present,
+    // TA(1) = 0x80: different divisors not supported, DR = 1, DS = 1
+    // TB(1) = not present. Defaults: FWI = 4 (FWT = 256 * 16 * 2^4 * 1/fc = 4833us), SFGI = 0 (SFG = 256 * 16 * 2^0 * 1/fc = 302us)
+    // TC(1) = 0x02: CID supported, NAD not supported
+    compute_crc(CRC_14443_A, response6, 4, &response6[4], &response6[5]);
 
-	// Prepare GET_VERSION (different for UL EV-1 / NTAG)
-	// uint8_t response7_EV1[] = {0x00, 0x04, 0x03, 0x01, 0x01, 0x00, 0x0b, 0x03, 0xfd, 0xf7};  //EV1 48bytes VERSION.
-	// uint8_t response7_NTAG[] = {0x00, 0x04, 0x04, 0x02, 0x01, 0x00, 0x11, 0x03, 0x01, 0x9e}; //NTAG 215
-	// Prepare CHK_TEARING
-	// uint8_t response9[] =  {0xBD,0x90,0x3f};
+    // Prepare GET_VERSION (different for UL EV-1 / NTAG)
+    // uint8_t response7_EV1[] = {0x00, 0x04, 0x03, 0x01, 0x01, 0x00, 0x0b, 0x03, 0xfd, 0xf7};  //EV1 48bytes VERSION.
+    // uint8_t response7_NTAG[] = {0x00, 0x04, 0x04, 0x02, 0x01, 0x00, 0x11, 0x03, 0x01, 0x9e}; //NTAG 215
+    // Prepare CHK_TEARING
+    // uint8_t response9[] =  {0xBD,0x90,0x3f};
 
-	#define TAG_RESPONSE_COUNT 10
-	tag_response_info_t responses[TAG_RESPONSE_COUNT] = {
-		{ .response = response1,  .response_n = sizeof(response1)  },  // Answer to request - respond with card type
-		{ .response = response2,  .response_n = sizeof(response2)  },  // Anticollision cascade1 - respond with uid
-		{ .response = response2a, .response_n = sizeof(response2a) },  // Anticollision cascade2 - respond with 2nd half of uid if asked
-		{ .response = response3,  .response_n = sizeof(response3)  },  // Acknowledge select - cascade 1
-		{ .response = response3a, .response_n = sizeof(response3a) },  // Acknowledge select - cascade 2
-		{ .response = response5,  .response_n = sizeof(response5)  },  // Authentication answer (random nonce)
-		{ .response = response6,  .response_n = sizeof(response6)  },  // dummy ATS (pseudo-ATR), answer to RATS
+    #define TAG_RESPONSE_COUNT 10
+    tag_response_info_t responses[TAG_RESPONSE_COUNT] = {
+        { .response = response1,  .response_n = sizeof(response1)  },  // Answer to request - respond with card type
+        { .response = response2,  .response_n = sizeof(response2)  },  // Anticollision cascade1 - respond with uid
+        { .response = response2a, .response_n = sizeof(response2a) },  // Anticollision cascade2 - respond with 2nd half of uid if asked
+        { .response = response3,  .response_n = sizeof(response3)  },  // Acknowledge select - cascade 1
+        { .response = response3a, .response_n = sizeof(response3a) },  // Acknowledge select - cascade 2
+        { .response = response5,  .response_n = sizeof(response5)  },  // Authentication answer (random nonce)
+        { .response = response6,  .response_n = sizeof(response6)  },  // dummy ATS (pseudo-ATR), answer to RATS
 
-		{ .response = response8,   .response_n = sizeof(response8) }  // EV1/NTAG PACK response
-	};
-		// { .response = response7_NTAG, .response_n = sizeof(response7_NTAG)}, // EV1/NTAG GET_VERSION response
-		// { .response = response9,      .response_n = sizeof(response9)     }  // EV1/NTAG CHK_TEAR response
+        { .response = response8,   .response_n = sizeof(response8) }  // EV1/NTAG PACK response
+    };
+        // { .response = response7_NTAG, .response_n = sizeof(response7_NTAG)}, // EV1/NTAG GET_VERSION response
+        // { .response = response9,      .response_n = sizeof(response9)     }  // EV1/NTAG CHK_TEAR response
 
 
-	// Allocate 512 bytes for the dynamic modulation, created when the reader queries for it
-	// Such a response is less time critical, so we can prepare them on the fly
-	#define DYNAMIC_RESPONSE_BUFFER_SIZE 64
-	#define DYNAMIC_MODULATION_BUFFER_SIZE 512
-	uint8_t dynamic_response_buffer[DYNAMIC_RESPONSE_BUFFER_SIZE];
-	uint8_t dynamic_modulation_buffer[DYNAMIC_MODULATION_BUFFER_SIZE];
-	tag_response_info_t dynamic_response_info = {
-		.response = dynamic_response_buffer,
-		.response_n = 0,
-		.modulation = dynamic_modulation_buffer,
-		.modulation_n = 0
-	};
+    // Allocate 512 bytes for the dynamic modulation, created when the reader queries for it
+    // Such a response is less time critical, so we can prepare them on the fly
+    #define DYNAMIC_RESPONSE_BUFFER_SIZE 64
+    #define DYNAMIC_MODULATION_BUFFER_SIZE 512
+    uint8_t dynamic_response_buffer[DYNAMIC_RESPONSE_BUFFER_SIZE];
+    uint8_t dynamic_modulation_buffer[DYNAMIC_MODULATION_BUFFER_SIZE];
+    tag_response_info_t dynamic_response_info = {
+        .response = dynamic_response_buffer,
+        .response_n = 0,
+        .modulation = dynamic_modulation_buffer,
+        .modulation_n = 0
+    };
 
-	// We need to listen to the high-frequency, peak-detected path.
-	iso14443a_setup(FPGA_HF_ISO14443A_TAGSIM_LISTEN);
+    // We need to listen to the high-frequency, peak-detected path.
+    iso14443a_setup(FPGA_HF_ISO14443A_TAGSIM_LISTEN);
 
-	BigBuf_free_keep_EM();
-	clear_trace();
-	set_tracing(true);
+    BigBuf_free_keep_EM();
+    clear_trace();
+    set_tracing(true);
 
-	// allocate buffers:
-	uint8_t *receivedCmd = BigBuf_malloc(MAX_FRAME_SIZE);
-	uint8_t *receivedCmdPar = BigBuf_malloc(MAX_PARITY_SIZE);
-	free_buffer_pointer = BigBuf_malloc(ALLOCATED_TAG_MODULATION_BUFFER_SIZE);
+    // allocate buffers:
+    uint8_t *receivedCmd = BigBuf_malloc(MAX_FRAME_SIZE);
+    uint8_t *receivedCmdPar = BigBuf_malloc(MAX_PARITY_SIZE);
+    free_buffer_pointer = BigBuf_malloc(ALLOCATED_TAG_MODULATION_BUFFER_SIZE);
 
-	// Prepare the responses of the anticollision phase
-	// there will be not enough time to do this at the moment the reader sends it REQA
-	for (size_t i=0; i<TAG_RESPONSE_COUNT; i++)
-		prepare_allocated_tag_modulation(&responses[i]);
+    // Prepare the responses of the anticollision phase
+    // there will be not enough time to do this at the moment the reader sends it REQA
+    for (size_t i=0; i<TAG_RESPONSE_COUNT; i++)
+        prepare_allocated_tag_modulation(&responses[i]);
 
-	int len = 0;
+    int len = 0;
 
-	// To control where we are in the protocol
-	int order = 0;
-	int lastorder;
+    // To control where we are in the protocol
+    int order = 0;
+    int lastorder;
 
-	// Just to allow some checks
-	int happened = 0;
-	int happened2 = 0;
-	int cmdsRecvd = 0;
-	tag_response_info_t* p_response;
+    // Just to allow some checks
+    int happened = 0;
+    int happened2 = 0;
+    int cmdsRecvd = 0;
+    tag_response_info_t* p_response;
 
-	LED_A_ON();
-	for (;;) {
-		WDT_HIT();
+    LED_A_ON();
+    for (;;) {
+        WDT_HIT();
 
-		// Clean receive command buffer
-		if (!GetIso14443aCommandFromReader(receivedCmd, receivedCmdPar, &len)) {
-			Dbprintf("Emulator stopped.  Trace length: %d ", BigBuf_get_traceLen());
-			break;
-		}
-		p_response = NULL;
+        // Clean receive command buffer
+        if (!GetIso14443aCommandFromReader(receivedCmd, receivedCmdPar, &len)) {
+            Dbprintf("Emulator stopped.  Trace length: %d ", BigBuf_get_traceLen());
+            break;
+        }
+        p_response = NULL;
 
-		// Okay, look at the command now.
-		lastorder = order;
-		if (receivedCmd[0] == ISO14443A_CMD_REQA) { // Received a REQUEST
-			p_response = &responses[0]; order = 1;
-		} else if (receivedCmd[0] == ISO14443A_CMD_WUPA) { // Received a WAKEUP
-			p_response = &responses[0]; order = 6;
-		} else if (receivedCmd[1] == 0x20 && receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT) {	// Received request for UID (cascade 1)
-			p_response = &responses[1]; order = 2;
-		} else if (receivedCmd[1] == 0x20 && receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2) { 	// Received request for UID (cascade 2)
-			p_response = &responses[2]; order = 20;
-		} else if (receivedCmd[1] == 0x70 && receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT) {	// Received a SELECT (cascade 1)
-			p_response = &responses[3]; order = 3;
-		} else if (receivedCmd[1] == 0x70 && receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2) {	// Received a SELECT (cascade 2)
-			p_response = &responses[4]; order = 30;
-		} else if (receivedCmd[0] == ISO14443A_CMD_READBLOCK) {	// Received a (plain) READ
-			uint8_t block = receivedCmd[1];
-			// if Ultralight or NTAG (4 byte blocks)
-			if ( tagType == 7 || tagType == 2 ) {
-				// first 12 blocks of emu are [getversion answer - check tearing - pack - 0x00 - signature]
-				uint16_t start = 4 * (block+12);
-				uint8_t emdata[MAX_MIFARE_FRAME_SIZE];
-				emlGetMemBt( emdata, start, 16);
-				AddCrc14A(emdata, 16);
-				EmSendCmd(emdata, sizeof(emdata));
-				// We already responded, do not send anything with the EmSendCmd14443aRaw() that is called below
-				p_response = NULL;
-			} else if ( tagType == 9 && block == 1 ) {
-				// FM11005SH.   16blocks,  4bytes / block.
-				//   block0 = 2byte Customer ID (CID), 2byte Manufacture ID (MID)
-				//   block1 = 4byte UID.
-				p_response = &responses[1];
-			} else { // all other tags (16 byte block tags)
-				uint8_t emdata[MAX_MIFARE_FRAME_SIZE];
-				emlGetMemBt( emdata, block, 16);
-				AddCrc14A(emdata, 16);
-				EmSendCmd(emdata, sizeof(emdata));
-				// EmSendCmd(data+(4*receivedCmd[1]),16);
-				// Dbprintf("Read request from reader: %x %x",receivedCmd[0],receivedCmd[1]);
-				// We already responded, do not send anything with the EmSendCmd14443aRaw() that is called below
-				p_response = NULL;
-			}
-		} else if (receivedCmd[0] == MIFARE_ULEV1_FASTREAD) {	// Received a FAST READ (ranged read)
-			uint8_t emdata[MAX_FRAME_SIZE];
-			// first 12 blocks of emu are [getversion answer - check tearing - pack - 0x00 - signature]
-			int start =  (receivedCmd[1]+12) * 4;
-			int len   = (receivedCmd[2] - receivedCmd[1] + 1) * 4;
-			emlGetMemBt( emdata, start, len);
-			AddCrc14A(emdata, len);
-			EmSendCmd(emdata, len+2);
-			p_response = NULL;
-		} else if (receivedCmd[0] == MIFARE_ULEV1_READSIG && tagType == 7) {	// Received a READ SIGNATURE --
-			// first 12 blocks of emu are [getversion answer - check tearing - pack - 0x00 - signature]
-			uint16_t start = 4 * 4;
-			uint8_t emdata[34];
-			emlGetMemBt( emdata, start, 32);
-			AddCrc14A(emdata, 32);
-			EmSendCmd(emdata, sizeof(emdata));
-			p_response = NULL;
-		} else if (receivedCmd[0] == MIFARE_ULEV1_READ_CNT && tagType == 7) {	// Received a READ COUNTER --
-			uint8_t index = receivedCmd[1];
-			if (index > 2) {
-				// send NACK 0x0 == invalid argument
-				uint8_t nack[] = {0x00};
-				EmSendCmd(nack,sizeof(nack));
-			} else {
-			uint8_t cmd[] =  {0x00,0x00,0x00,0x14,0xa5};
-				num_to_bytes(counters[index], 3, cmd);
-				AddCrc14A(cmd, sizeof(cmd)-2);
-			EmSendCmd(cmd,sizeof(cmd));
-			}
-			p_response = NULL;
-		} else if (receivedCmd[0] == MIFARE_ULEV1_INCR_CNT && tagType == 7) {	// Received a INC COUNTER --
-			uint8_t index = receivedCmd[1];
-			if ( index > 2) {
-	   			// send NACK 0x0 == invalid argument
-				uint8_t nack[] = {0x00};
-				EmSendCmd(nack,sizeof(nack));
-			} else {
+        // Okay, look at the command now.
+        lastorder = order;
+        if (receivedCmd[0] == ISO14443A_CMD_REQA) { // Received a REQUEST
+            p_response = &responses[0]; order = 1;
+        } else if (receivedCmd[0] == ISO14443A_CMD_WUPA) { // Received a WAKEUP
+            p_response = &responses[0]; order = 6;
+        } else if (receivedCmd[1] == 0x20 && receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT) {    // Received request for UID (cascade 1)
+            p_response = &responses[1]; order = 2;
+        } else if (receivedCmd[1] == 0x20 && receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2) {  // Received request for UID (cascade 2)
+            p_response = &responses[2]; order = 20;
+        } else if (receivedCmd[1] == 0x70 && receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT) {    // Received a SELECT (cascade 1)
+            p_response = &responses[3]; order = 3;
+        } else if (receivedCmd[1] == 0x70 && receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2) {  // Received a SELECT (cascade 2)
+            p_response = &responses[4]; order = 30;
+        } else if (receivedCmd[0] == ISO14443A_CMD_READBLOCK) {    // Received a (plain) READ
+            uint8_t block = receivedCmd[1];
+            // if Ultralight or NTAG (4 byte blocks)
+            if ( tagType == 7 || tagType == 2 ) {
+                // first 12 blocks of emu are [getversion answer - check tearing - pack - 0x00 - signature]
+                uint16_t start = 4 * (block+12);
+                uint8_t emdata[MAX_MIFARE_FRAME_SIZE];
+                emlGetMemBt( emdata, start, 16);
+                AddCrc14A(emdata, 16);
+                EmSendCmd(emdata, sizeof(emdata));
+                // We already responded, do not send anything with the EmSendCmd14443aRaw() that is called below
+                p_response = NULL;
+            } else if ( tagType == 9 && block == 1 ) {
+                // FM11005SH.   16blocks,  4bytes / block.
+                //   block0 = 2byte Customer ID (CID), 2byte Manufacture ID (MID)
+                //   block1 = 4byte UID.
+                p_response = &responses[1];
+            } else { // all other tags (16 byte block tags)
+                uint8_t emdata[MAX_MIFARE_FRAME_SIZE];
+                emlGetMemBt( emdata, block, 16);
+                AddCrc14A(emdata, 16);
+                EmSendCmd(emdata, sizeof(emdata));
+                // EmSendCmd(data+(4*receivedCmd[1]),16);
+                // Dbprintf("Read request from reader: %x %x",receivedCmd[0],receivedCmd[1]);
+                // We already responded, do not send anything with the EmSendCmd14443aRaw() that is called below
+                p_response = NULL;
+            }
+        } else if (receivedCmd[0] == MIFARE_ULEV1_FASTREAD) {    // Received a FAST READ (ranged read)
+            uint8_t emdata[MAX_FRAME_SIZE];
+            // first 12 blocks of emu are [getversion answer - check tearing - pack - 0x00 - signature]
+            int start =  (receivedCmd[1]+12) * 4;
+            int len   = (receivedCmd[2] - receivedCmd[1] + 1) * 4;
+            emlGetMemBt( emdata, start, len);
+            AddCrc14A(emdata, len);
+            EmSendCmd(emdata, len+2);
+            p_response = NULL;
+        } else if (receivedCmd[0] == MIFARE_ULEV1_READSIG && tagType == 7) {    // Received a READ SIGNATURE --
+            // first 12 blocks of emu are [getversion answer - check tearing - pack - 0x00 - signature]
+            uint16_t start = 4 * 4;
+            uint8_t emdata[34];
+            emlGetMemBt( emdata, start, 32);
+            AddCrc14A(emdata, 32);
+            EmSendCmd(emdata, sizeof(emdata));
+            p_response = NULL;
+        } else if (receivedCmd[0] == MIFARE_ULEV1_READ_CNT && tagType == 7) {    // Received a READ COUNTER --
+            uint8_t index = receivedCmd[1];
+            if (index > 2) {
+                // send NACK 0x0 == invalid argument
+                uint8_t nack[] = {0x00};
+                EmSendCmd(nack,sizeof(nack));
+            } else {
+            uint8_t cmd[] =  {0x00,0x00,0x00,0x14,0xa5};
+                num_to_bytes(counters[index], 3, cmd);
+                AddCrc14A(cmd, sizeof(cmd)-2);
+            EmSendCmd(cmd,sizeof(cmd));
+            }
+            p_response = NULL;
+        } else if (receivedCmd[0] == MIFARE_ULEV1_INCR_CNT && tagType == 7) {    // Received a INC COUNTER --
+            uint8_t index = receivedCmd[1];
+            if ( index > 2) {
+                   // send NACK 0x0 == invalid argument
+                uint8_t nack[] = {0x00};
+                EmSendCmd(nack,sizeof(nack));
+            } else {
 
-			uint32_t val = bytes_to_num(receivedCmd+2,4);
+            uint32_t val = bytes_to_num(receivedCmd+2,4);
 
-				// if new value + old value is bigger 24bits,  fail
-				if ( val + counters[index] > 0xFFFFFF ) {
-					// send NACK 0x4 == counter overflow
-					uint8_t nack[] = {0x04};
-					EmSendCmd(nack,sizeof(nack));
-				} else {
-					counters[index] = val;
-			// send ACK
-			uint8_t ack[] = {0x0a};
-			EmSendCmd(ack,sizeof(ack));
-				}
-			}
-			p_response = NULL;
-		} else if (receivedCmd[0] == MIFARE_ULEV1_CHECKTEAR && tagType == 7) {	// Received a CHECK_TEARING_EVENT --
-			// first 12 blocks of emu are [getversion answer - check tearing - pack - 0x00 - signature]
-			uint8_t emdata[3];
-			uint8_t index = receivedCmd[1];
-			if ( index > 2) {
-	   			// send NACK 0x0 == invalid argument
-				uint8_t nack[] = {0x00};
-				EmSendCmd(nack,sizeof(nack));
-			} else {
-				emlGetMemBt( emdata, 10+index, 1);
-			AddCrc14A(emdata, sizeof(emdata)-2);
-			EmSendCmd(emdata, sizeof(emdata));
-			}
-			p_response = NULL;
-		} else if (receivedCmd[0] == ISO14443A_CMD_HALT) {	// Received a HALT
-			LogTrace(receivedCmd, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
-			p_response = NULL;
-		} else if (receivedCmd[0] == MIFARE_AUTH_KEYA || receivedCmd[0] == MIFARE_AUTH_KEYB) {	// Received an authentication request
-			if ( tagType == 7 ) {   // IF NTAG /EV1  0x60 == GET_VERSION, not a authentication request.
-				uint8_t emdata[10];
-				emlGetMemBt( emdata, 0, 8 );
-				AddCrc14A(emdata, sizeof(emdata)-2);
-				EmSendCmd(emdata, sizeof(emdata));
-				p_response = NULL;
-			} else {
+                // if new value + old value is bigger 24bits,  fail
+                if ( val + counters[index] > 0xFFFFFF ) {
+                    // send NACK 0x4 == counter overflow
+                    uint8_t nack[] = {0x04};
+                    EmSendCmd(nack,sizeof(nack));
+                } else {
+                    counters[index] = val;
+            // send ACK
+            uint8_t ack[] = {0x0a};
+            EmSendCmd(ack,sizeof(ack));
+                }
+            }
+            p_response = NULL;
+        } else if (receivedCmd[0] == MIFARE_ULEV1_CHECKTEAR && tagType == 7) {    // Received a CHECK_TEARING_EVENT --
+            // first 12 blocks of emu are [getversion answer - check tearing - pack - 0x00 - signature]
+            uint8_t emdata[3];
+            uint8_t index = receivedCmd[1];
+            if ( index > 2) {
+                   // send NACK 0x0 == invalid argument
+                uint8_t nack[] = {0x00};
+                EmSendCmd(nack,sizeof(nack));
+            } else {
+                emlGetMemBt( emdata, 10+index, 1);
+            AddCrc14A(emdata, sizeof(emdata)-2);
+            EmSendCmd(emdata, sizeof(emdata));
+            }
+            p_response = NULL;
+        } else if (receivedCmd[0] == ISO14443A_CMD_HALT) {    // Received a HALT
+            LogTrace(receivedCmd, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+            p_response = NULL;
+        } else if (receivedCmd[0] == MIFARE_AUTH_KEYA || receivedCmd[0] == MIFARE_AUTH_KEYB) {    // Received an authentication request
+            if ( tagType == 7 ) {   // IF NTAG /EV1  0x60 == GET_VERSION, not a authentication request.
+                uint8_t emdata[10];
+                emlGetMemBt( emdata, 0, 8 );
+                AddCrc14A(emdata, sizeof(emdata)-2);
+                EmSendCmd(emdata, sizeof(emdata));
+                p_response = NULL;
+            } else {
 
-				cardAUTHKEY = receivedCmd[0] - 0x60;
-				cardAUTHSC = receivedCmd[1] / 4; // received block num
+                cardAUTHKEY = receivedCmd[0] - 0x60;
+                cardAUTHSC = receivedCmd[1] / 4; // received block num
 
-				// incease nonce at AUTH requests. this is time consuming.
-				nonce = prng_successor( GetTickCount(), 32 );
-				//num_to_bytes(nonce, 4, response5);
-				num_to_bytes(nonce, 4, dynamic_response_info.response);
-				dynamic_response_info.response_n = 4;
+                // incease nonce at AUTH requests. this is time consuming.
+                nonce = prng_successor( GetTickCount(), 32 );
+                //num_to_bytes(nonce, 4, response5);
+                num_to_bytes(nonce, 4, dynamic_response_info.response);
+                dynamic_response_info.response_n = 4;
 
-				//prepare_tag_modulation(&responses[5], DYNAMIC_MODULATION_BUFFER_SIZE);
-				prepare_tag_modulation(&dynamic_response_info, DYNAMIC_MODULATION_BUFFER_SIZE);
-				p_response = &dynamic_response_info;
-				//p_response = &responses[5];
-				order = 7;
-			}
-		} else if (receivedCmd[0] == ISO14443A_CMD_RATS) {	// Received a RATS request
-			if (tagType == 1 || tagType == 2) {	// RATS not supported
-				EmSend4bit(CARD_NACK_NA);
-				p_response = NULL;
-			} else {
-				p_response = &responses[6]; order = 70;
-			}
-		} else if (order == 7 && len == 8) { // Received {nr] and {ar} (part of authentication)
-			LogTrace(receivedCmd, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
-			uint32_t nr = bytes_to_num(receivedCmd,4);
-			uint32_t ar = bytes_to_num(receivedCmd+4,4);
+                //prepare_tag_modulation(&responses[5], DYNAMIC_MODULATION_BUFFER_SIZE);
+                prepare_tag_modulation(&dynamic_response_info, DYNAMIC_MODULATION_BUFFER_SIZE);
+                p_response = &dynamic_response_info;
+                //p_response = &responses[5];
+                order = 7;
+            }
+        } else if (receivedCmd[0] == ISO14443A_CMD_RATS) {    // Received a RATS request
+            if (tagType == 1 || tagType == 2) {    // RATS not supported
+                EmSend4bit(CARD_NACK_NA);
+                p_response = NULL;
+            } else {
+                p_response = &responses[6]; order = 70;
+            }
+        } else if (order == 7 && len == 8) { // Received {nr] and {ar} (part of authentication)
+            LogTrace(receivedCmd, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+            uint32_t nr = bytes_to_num(receivedCmd,4);
+            uint32_t ar = bytes_to_num(receivedCmd+4,4);
 
-			// Collect AR/NR per keytype & sector
-			if ( (flags & FLAG_NR_AR_ATTACK) == FLAG_NR_AR_ATTACK ) {
+            // Collect AR/NR per keytype & sector
+            if ( (flags & FLAG_NR_AR_ATTACK) == FLAG_NR_AR_ATTACK ) {
 
-				int8_t index = -1;
-				int8_t empty = -1;
-				for (uint8_t i = 0; i < ATTACK_KEY_COUNT; i++) {
-					// find which index to use
-					if ( (cardAUTHSC == ar_nr_nonces[i].sector) &&  (cardAUTHKEY == ar_nr_nonces[i].keytype))
-						index = i;
+                int8_t index = -1;
+                int8_t empty = -1;
+                for (uint8_t i = 0; i < ATTACK_KEY_COUNT; i++) {
+                    // find which index to use
+                    if ( (cardAUTHSC == ar_nr_nonces[i].sector) &&  (cardAUTHKEY == ar_nr_nonces[i].keytype))
+                        index = i;
 
-					// keep track of empty slots.
-					if ( ar_nr_nonces[i].state == EMPTY)
-						empty = i;
-				}
-				// if no empty slots.  Choose first and overwrite.
-				if ( index == -1 ) {
-					if ( empty == -1 ) {
-						index = 0;
-						ar_nr_nonces[index].state = EMPTY;
-					} else {
-						index = empty;
-					}
-				}
+                    // keep track of empty slots.
+                    if ( ar_nr_nonces[i].state == EMPTY)
+                        empty = i;
+                }
+                // if no empty slots.  Choose first and overwrite.
+                if ( index == -1 ) {
+                    if ( empty == -1 ) {
+                        index = 0;
+                        ar_nr_nonces[index].state = EMPTY;
+                    } else {
+                        index = empty;
+                    }
+                }
 
-				switch(ar_nr_nonces[index].state) {
-					case EMPTY: {
-						// first nonce collect
-						ar_nr_nonces[index].cuid = cuid;
-						ar_nr_nonces[index].sector = cardAUTHSC;
-						ar_nr_nonces[index].keytype = cardAUTHKEY;
-						ar_nr_nonces[index].nonce = nonce;
-						ar_nr_nonces[index].nr = nr;
-						ar_nr_nonces[index].ar = ar;
-						ar_nr_nonces[index].state = FIRST;
-						break;
-					}
-					case FIRST : {
-						// second nonce collect
-						ar_nr_nonces[index].nonce2 = nonce;
-						ar_nr_nonces[index].nr2 = nr;
-						ar_nr_nonces[index].ar2 = ar;
-						ar_nr_nonces[index].state = SECOND;
+                switch(ar_nr_nonces[index].state) {
+                    case EMPTY: {
+                        // first nonce collect
+                        ar_nr_nonces[index].cuid = cuid;
+                        ar_nr_nonces[index].sector = cardAUTHSC;
+                        ar_nr_nonces[index].keytype = cardAUTHKEY;
+                        ar_nr_nonces[index].nonce = nonce;
+                        ar_nr_nonces[index].nr = nr;
+                        ar_nr_nonces[index].ar = ar;
+                        ar_nr_nonces[index].state = FIRST;
+                        break;
+                    }
+                    case FIRST : {
+                        // second nonce collect
+                        ar_nr_nonces[index].nonce2 = nonce;
+                        ar_nr_nonces[index].nr2 = nr;
+                        ar_nr_nonces[index].ar2 = ar;
+                        ar_nr_nonces[index].state = SECOND;
 
-						// send to client
-						cmd_send(CMD_ACK, CMD_SIMULATE_MIFARE_CARD, 0, 0, &ar_nr_nonces[index], sizeof(nonces_t));
+                        // send to client
+                        cmd_send(CMD_ACK, CMD_SIMULATE_MIFARE_CARD, 0, 0, &ar_nr_nonces[index], sizeof(nonces_t));
 
-						ar_nr_nonces[index].state = EMPTY;
-						ar_nr_nonces[index].sector = 0;
-						ar_nr_nonces[index].keytype = 0;
+                        ar_nr_nonces[index].state = EMPTY;
+                        ar_nr_nonces[index].sector = 0;
+                        ar_nr_nonces[index].keytype = 0;
 
-						moebius_count++;
-						break;
-					}
-					default: break;
-				}
-			}
-			p_response = NULL;
+                        moebius_count++;
+                        break;
+                    }
+                    default: break;
+                }
+            }
+            p_response = NULL;
 
-		} else if (receivedCmd[0] == MIFARE_ULC_AUTH_1 ) { // ULC authentication, or Desfire Authentication
-		} else if (receivedCmd[0] == MIFARE_ULEV1_AUTH) { // NTAG / EV-1 authentication
-			if ( tagType == 7 ) {
-				uint16_t start = 13; // first 4 blocks of emu are [getversion answer - check tearing - pack - 0x00]
-				uint8_t emdata[4];
-				emlGetMemBt( emdata, start, 2);
-				AddCrc14A(emdata, 2);
-				EmSendCmd(emdata, sizeof(emdata));
-				p_response = NULL;
-				uint32_t pwd = bytes_to_num(receivedCmd+1,4);
+        } else if (receivedCmd[0] == MIFARE_ULC_AUTH_1 ) { // ULC authentication, or Desfire Authentication
+        } else if (receivedCmd[0] == MIFARE_ULEV1_AUTH) { // NTAG / EV-1 authentication
+            if ( tagType == 7 ) {
+                uint16_t start = 13; // first 4 blocks of emu are [getversion answer - check tearing - pack - 0x00]
+                uint8_t emdata[4];
+                emlGetMemBt( emdata, start, 2);
+                AddCrc14A(emdata, 2);
+                EmSendCmd(emdata, sizeof(emdata));
+                p_response = NULL;
+                uint32_t pwd = bytes_to_num(receivedCmd+1,4);
 
-				if ( MF_DBGLEVEL >= 3) Dbprintf("Auth attempt: %08x", pwd);
-			}
-		} else {
-			// Check for ISO 14443A-4 compliant commands, look at left nibble
-			switch (receivedCmd[0]) {
-				case 0x02:
-				case 0x03: {  // IBlock (command no CID)
-					dynamic_response_info.response[0] = receivedCmd[0];
-					dynamic_response_info.response[1] = 0x90;
-					dynamic_response_info.response[2] = 0x00;
-					dynamic_response_info.response_n = 3;
-				} break;
-				case 0x0B:
-				case 0x0A: { // IBlock (command CID)
-				  dynamic_response_info.response[0] = receivedCmd[0];
-				  dynamic_response_info.response[1] = 0x00;
-				  dynamic_response_info.response[2] = 0x90;
-				  dynamic_response_info.response[3] = 0x00;
-				  dynamic_response_info.response_n = 4;
-				} break;
+                if ( MF_DBGLEVEL >= 3) Dbprintf("Auth attempt: %08x", pwd);
+            }
+        } else {
+            // Check for ISO 14443A-4 compliant commands, look at left nibble
+            switch (receivedCmd[0]) {
+                case 0x02:
+                case 0x03: {  // IBlock (command no CID)
+                    dynamic_response_info.response[0] = receivedCmd[0];
+                    dynamic_response_info.response[1] = 0x90;
+                    dynamic_response_info.response[2] = 0x00;
+                    dynamic_response_info.response_n = 3;
+                } break;
+                case 0x0B:
+                case 0x0A: { // IBlock (command CID)
+                  dynamic_response_info.response[0] = receivedCmd[0];
+                  dynamic_response_info.response[1] = 0x00;
+                  dynamic_response_info.response[2] = 0x90;
+                  dynamic_response_info.response[3] = 0x00;
+                  dynamic_response_info.response_n = 4;
+                } break;
 
-				case 0x1A:
-				case 0x1B: { // Chaining command
-				  dynamic_response_info.response[0] = 0xaa | ((receivedCmd[0]) & 1);
-				  dynamic_response_info.response_n = 2;
-				} break;
+                case 0x1A:
+                case 0x1B: { // Chaining command
+                  dynamic_response_info.response[0] = 0xaa | ((receivedCmd[0]) & 1);
+                  dynamic_response_info.response_n = 2;
+                } break;
 
-				case 0xAA:
-				case 0xBB: {
-				  dynamic_response_info.response[0] = receivedCmd[0] ^ 0x11;
-				  dynamic_response_info.response_n = 2;
-				} break;
+                case 0xAA:
+                case 0xBB: {
+                  dynamic_response_info.response[0] = receivedCmd[0] ^ 0x11;
+                  dynamic_response_info.response_n = 2;
+                } break;
 
-				case 0xBA: { // ping / pong
-					dynamic_response_info.response[0] = 0xAB;
-					dynamic_response_info.response[1] = 0x00;
-					dynamic_response_info.response_n = 2;
-				} break;
+                case 0xBA: { // ping / pong
+                    dynamic_response_info.response[0] = 0xAB;
+                    dynamic_response_info.response[1] = 0x00;
+                    dynamic_response_info.response_n = 2;
+                } break;
 
-				case 0xCA:
-				case 0xC2: { // Readers sends deselect command
-					dynamic_response_info.response[0] = 0xCA;
-					dynamic_response_info.response[1] = 0x00;
-					dynamic_response_info.response_n = 2;
-				} break;
+                case 0xCA:
+                case 0xC2: { // Readers sends deselect command
+                    dynamic_response_info.response[0] = 0xCA;
+                    dynamic_response_info.response[1] = 0x00;
+                    dynamic_response_info.response_n = 2;
+                } break;
 
-				default: {
-					// Never seen this command before
-					LogTrace(receivedCmd, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
-					Dbprintf("Received unknown command (len=%d):",len);
-					Dbhexdump(len,receivedCmd,false);
-					// Do not respond
-					dynamic_response_info.response_n = 0;
-				} break;
-			}
+                default: {
+                    // Never seen this command before
+                    LogTrace(receivedCmd, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                    Dbprintf("Received unknown command (len=%d):",len);
+                    Dbhexdump(len,receivedCmd,false);
+                    // Do not respond
+                    dynamic_response_info.response_n = 0;
+                } break;
+            }
 
-			if (dynamic_response_info.response_n > 0) {
-				// Copy the CID from the reader query
-				dynamic_response_info.response[1] = receivedCmd[1];
+            if (dynamic_response_info.response_n > 0) {
+                // Copy the CID from the reader query
+                dynamic_response_info.response[1] = receivedCmd[1];
 
-				// Add CRC bytes, always used in ISO 14443A-4 compliant cards
-				AddCrc14A(dynamic_response_info.response, dynamic_response_info.response_n);
-				dynamic_response_info.response_n += 2;
+                // Add CRC bytes, always used in ISO 14443A-4 compliant cards
+                AddCrc14A(dynamic_response_info.response, dynamic_response_info.response_n);
+                dynamic_response_info.response_n += 2;
 
-				if (prepare_tag_modulation(&dynamic_response_info,DYNAMIC_MODULATION_BUFFER_SIZE) == false) {
-					DbpString("Error preparing tag response");
-					LogTrace(receivedCmd, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
-					break;
-				}
-				p_response = &dynamic_response_info;
-			}
-		}
+                if (prepare_tag_modulation(&dynamic_response_info,DYNAMIC_MODULATION_BUFFER_SIZE) == false) {
+                    DbpString("Error preparing tag response");
+                    LogTrace(receivedCmd, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                    break;
+                }
+                p_response = &dynamic_response_info;
+            }
+        }
 
-		// Count number of wakeups received after a halt
-		if (order == 6 && lastorder == 5) { happened++; }
+        // Count number of wakeups received after a halt
+        if (order == 6 && lastorder == 5) { happened++; }
 
-		// Count number of other messages after a halt
-		if (order != 6 && lastorder == 5) { happened2++; }
+        // Count number of other messages after a halt
+        if (order != 6 && lastorder == 5) { happened2++; }
 
-		cmdsRecvd++;
+        cmdsRecvd++;
 
-		if (p_response != NULL) {
-			EmSendCmd14443aRaw(p_response->modulation, p_response->modulation_n);
-			// do the tracing for the previous reader request and this tag answer:
-			uint8_t par[MAX_PARITY_SIZE] = {0x00};
-			GetParity(p_response->response, p_response->response_n, par);
+        if (p_response != NULL) {
+            EmSendCmd14443aRaw(p_response->modulation, p_response->modulation_n);
+            // do the tracing for the previous reader request and this tag answer:
+            uint8_t par[MAX_PARITY_SIZE] = {0x00};
+            GetParity(p_response->response, p_response->response_n, par);
 
-			EmLogTrace(Uart.output,
-						Uart.len,
-						Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG,
-						Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG,
-						Uart.parity,
-						p_response->response,
-						p_response->response_n,
-						LastTimeProxToAirStart*16 + DELAY_ARM2AIR_AS_TAG,
-						(LastTimeProxToAirStart + p_response->ProxToAirDuration)*16 + DELAY_ARM2AIR_AS_TAG,
-						par);
-		}
-	}
+            EmLogTrace(Uart.output,
+                        Uart.len,
+                        Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG,
+                        Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG,
+                        Uart.parity,
+                        p_response->response,
+                        p_response->response_n,
+                        LastTimeProxToAirStart*16 + DELAY_ARM2AIR_AS_TAG,
+                        (LastTimeProxToAirStart + p_response->ProxToAirDuration)*16 + DELAY_ARM2AIR_AS_TAG,
+                        par);
+        }
+    }
 
-	cmd_send(CMD_ACK,1,0,0,0,0);
-	switch_off();
+    cmd_send(CMD_ACK,1,0,0,0,0);
+    switch_off();
 
-	BigBuf_free_keep_EM();
+    BigBuf_free_keep_EM();
 
-	if (MF_DBGLEVEL >= 4){
-		Dbprintf("-[ Wake ups after halt  [%d]", happened);
-		Dbprintf("-[ Messages after halt  [%d]", happened2);
-		Dbprintf("-[ Num of received cmd  [%d]", cmdsRecvd);
-		Dbprintf("-[ Num of moebius tries [%d]", moebius_count);
-	}
+    if (MF_DBGLEVEL >= 4){
+        Dbprintf("-[ Wake ups after halt  [%d]", happened);
+        Dbprintf("-[ Messages after halt  [%d]", happened2);
+        Dbprintf("-[ Num of received cmd  [%d]", cmdsRecvd);
+        Dbprintf("-[ Num of moebius tries [%d]", moebius_count);
+    }
 }
 
 // prepare a delayed transfer. This simply shifts ToSend[] by a number
 // of bits specified in the delay parameter.
 void PrepareDelayedTransfer(uint16_t delay) {
-	delay &= 0x07;
-	if (!delay) return;
+    delay &= 0x07;
+    if (!delay) return;
 
-	uint8_t bitmask = 0;
-	uint8_t bits_to_shift = 0;
-	uint8_t bits_shifted = 0;
-	uint16_t i = 0;
+    uint8_t bitmask = 0;
+    uint8_t bits_to_shift = 0;
+    uint8_t bits_shifted = 0;
+    uint16_t i = 0;
 
-	for (i = 0; i < delay; i++)
-		bitmask |= (0x01 << i);
+    for (i = 0; i < delay; i++)
+        bitmask |= (0x01 << i);
 
-	ToSend[ToSendMax++] = 0x00;
+    ToSend[ToSendMax++] = 0x00;
 
-	for (i = 0; i < ToSendMax; i++) {
-			bits_to_shift = ToSend[i] & bitmask;
-			ToSend[i] = ToSend[i] >> delay;
-			ToSend[i] = ToSend[i] | (bits_shifted << (8 - delay));
-			bits_shifted = bits_to_shift;
-		}
-	}
+    for (i = 0; i < ToSendMax; i++) {
+            bits_to_shift = ToSend[i] & bitmask;
+            ToSend[i] = ToSend[i] >> delay;
+            ToSend[i] = ToSend[i] | (bits_shifted << (8 - delay));
+            bits_shifted = bits_to_shift;
+        }
+    }
 
 
 //-------------------------------------------------------------------------------------
 // Transmit the command (to the tag) that was placed in ToSend[].
 // Parameter timing:
 // if NULL: transfer at next possible time, taking into account
-// 			request guard time and frame delay time
-// if == 0:	transfer immediately and return time of transfer
+//             request guard time and frame delay time
+// if == 0:    transfer immediately and return time of transfer
 // if != 0: delay transfer until time specified
 //-------------------------------------------------------------------------------------
 static void TransmitFor14443a(const uint8_t *cmd, uint16_t len, uint32_t *timing) {
 
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD);
 
-	if (timing) {
-		if (*timing == 0)										// Measure time
-			*timing = (GetCountSspClk() + 8) & 0xfffffff8;
-		else
-			PrepareDelayedTransfer(*timing & 0x00000007);		// Delay transfer (fine tuning - up to 7 MF clock ticks)
+    if (timing) {
+        if (*timing == 0)                                        // Measure time
+            *timing = (GetCountSspClk() + 8) & 0xfffffff8;
+        else
+            PrepareDelayedTransfer(*timing & 0x00000007);        // Delay transfer (fine tuning - up to 7 MF clock ticks)
 
-		if(MF_DBGLEVEL >= 4 && GetCountSspClk() >= (*timing & 0xfffffff8))
-			Dbprintf("TransmitFor14443a: Missed timing");
-		while (GetCountSspClk() < (*timing & 0xfffffff8)) {};		// Delay transfer (multiple of 8 MF clock ticks)
-		LastTimeProxToAirStart = *timing;
-	} else {
+        if(MF_DBGLEVEL >= 4 && GetCountSspClk() >= (*timing & 0xfffffff8))
+            Dbprintf("TransmitFor14443a: Missed timing");
+        while (GetCountSspClk() < (*timing & 0xfffffff8)) {};    // Delay transfer (multiple of 8 MF clock ticks)
+        LastTimeProxToAirStart = *timing;
+    } else {
 
-		uint32_t ThisTransferTime = 0;
-		ThisTransferTime = ((MAX(NextTransferTime, GetCountSspClk()) & 0xfffffff8) + 8);
+        uint32_t ThisTransferTime = 0;
+        ThisTransferTime = ((MAX(NextTransferTime, GetCountSspClk()) & 0xfffffff8) + 8);
 
-		while (GetCountSspClk() < ThisTransferTime) {};
+        while (GetCountSspClk() < ThisTransferTime) {};
 
-		LastTimeProxToAirStart = ThisTransferTime;
-	}
+        LastTimeProxToAirStart = ThisTransferTime;
+    }
 
-	// clear TXRDY
-	AT91C_BASE_SSC->SSC_THR = SEC_Y;
+    // clear TXRDY
+    AT91C_BASE_SSC->SSC_THR = SEC_Y;
 
-	volatile uint8_t b;
-	uint16_t c = 0;
-	while (c < len) {
-		if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
-			AT91C_BASE_SSC->SSC_THR = cmd[c++];
-		}
-		//iceman test
-		if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
-			b = (uint16_t)(AT91C_BASE_SSC->SSC_RHR); (void)b;
-		}
-	}
+    volatile uint8_t b;
+    uint16_t c = 0;
+    while (c < len) {
+        if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
+            AT91C_BASE_SSC->SSC_THR = cmd[c++];
+        }
+        //iceman test
+        if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
+            b = (uint16_t)(AT91C_BASE_SSC->SSC_RHR); (void)b;
+        }
+    }
 
-	NextTransferTime = MAX(NextTransferTime, LastTimeProxToAirStart + REQUEST_GUARD_TIME);
+    NextTransferTime = MAX(NextTransferTime, LastTimeProxToAirStart + REQUEST_GUARD_TIME);
 }
 
 //-----------------------------------------------------------------------------
 // Prepare reader command (in bits, support short frames) to send to FPGA
 //-----------------------------------------------------------------------------
 void CodeIso14443aBitsAsReaderPar(const uint8_t *cmd, uint16_t bits, const uint8_t *parity) {
-	int i, j;
-	int last = 0;
-	uint8_t b;
+    int i, j;
+    int last = 0;
+    uint8_t b;
 
-	ToSendReset();
+    ToSendReset();
 
-	// Start of Communication (Seq. Z)
-	ToSend[++ToSendMax] = SEC_Z;
-	LastProxToAirDuration = 8 * (ToSendMax+1) - 6;
+    // Start of Communication (Seq. Z)
+    ToSend[++ToSendMax] = SEC_Z;
+    LastProxToAirDuration = 8 * (ToSendMax+1) - 6;
 
-	size_t bytecount = nbytes(bits);
-	// Generate send structure for the data bits
-	for (i = 0; i < bytecount; i++) {
-		// Get the current byte to send
-		b = cmd[i];
-		size_t bitsleft = MIN((bits-(i*8)),8);
+    size_t bytecount = nbytes(bits);
+    // Generate send structure for the data bits
+    for (i = 0; i < bytecount; i++) {
+        // Get the current byte to send
+        b = cmd[i];
+        size_t bitsleft = MIN((bits-(i*8)),8);
 
-		for (j = 0; j < bitsleft; j++) {
-			if (b & 1) {
-				// Sequence X
-				ToSend[++ToSendMax] = SEC_X;
-				LastProxToAirDuration = 8 * (ToSendMax+1) - 2;
-				last = 1;
-			} else {
-				if (last == 0) {
-				// Sequence Z
-				ToSend[++ToSendMax] = SEC_Z;
-				LastProxToAirDuration = 8 * (ToSendMax+1) - 6;
-				} else {
-					// Sequence Y
-					ToSend[++ToSendMax] = SEC_Y;
-					last = 0;
-				}
-			}
-			b >>= 1;
-		}
+        for (j = 0; j < bitsleft; j++) {
+            if (b & 1) {
+                // Sequence X
+                ToSend[++ToSendMax] = SEC_X;
+                LastProxToAirDuration = 8 * (ToSendMax+1) - 2;
+                last = 1;
+            } else {
+                if (last == 0) {
+                // Sequence Z
+                ToSend[++ToSendMax] = SEC_Z;
+                LastProxToAirDuration = 8 * (ToSendMax+1) - 6;
+                } else {
+                    // Sequence Y
+                    ToSend[++ToSendMax] = SEC_Y;
+                    last = 0;
+                }
+            }
+            b >>= 1;
+        }
 
-		// Only transmit parity bit if we transmitted a complete byte
-		if (j == 8 && parity != NULL) {
-			// Get the parity bit
-			if (parity[i>>3] & (0x80 >> (i&0x0007))) {
-				// Sequence X
-				ToSend[++ToSendMax] = SEC_X;
-				LastProxToAirDuration = 8 * (ToSendMax+1) - 2;
-				last = 1;
-			} else {
-				if (last == 0) {
-					// Sequence Z
-					ToSend[++ToSendMax] = SEC_Z;
-					LastProxToAirDuration = 8 * (ToSendMax+1) - 6;
-				} else {
-					// Sequence Y
-					ToSend[++ToSendMax] = SEC_Y;
-					last = 0;
-				}
-			}
-		}
-	}
+        // Only transmit parity bit if we transmitted a complete byte
+        if (j == 8 && parity != NULL) {
+            // Get the parity bit
+            if (parity[i>>3] & (0x80 >> (i&0x0007))) {
+                // Sequence X
+                ToSend[++ToSendMax] = SEC_X;
+                LastProxToAirDuration = 8 * (ToSendMax+1) - 2;
+                last = 1;
+            } else {
+                if (last == 0) {
+                    // Sequence Z
+                    ToSend[++ToSendMax] = SEC_Z;
+                    LastProxToAirDuration = 8 * (ToSendMax+1) - 6;
+                } else {
+                    // Sequence Y
+                    ToSend[++ToSendMax] = SEC_Y;
+                    last = 0;
+                }
+            }
+        }
+    }
 
-	// End of Communication: Logic 0 followed by Sequence Y
-	if (last == 0) {
-		// Sequence Z
-		ToSend[++ToSendMax] = SEC_Z;
-		LastProxToAirDuration = 8 * (ToSendMax+1) - 6;
-	} else {
-		// Sequence Y
-		ToSend[++ToSendMax] = SEC_Y;
-		last = 0;
-	}
-	ToSend[++ToSendMax] = SEC_Y;
+    // End of Communication: Logic 0 followed by Sequence Y
+    if (last == 0) {
+        // Sequence Z
+        ToSend[++ToSendMax] = SEC_Z;
+        LastProxToAirDuration = 8 * (ToSendMax+1) - 6;
+    } else {
+        // Sequence Y
+        ToSend[++ToSendMax] = SEC_Y;
+        last = 0;
+    }
+    ToSend[++ToSendMax] = SEC_Y;
 
-	// Convert to length of command:
-	ToSendMax++;
+    // Convert to length of command:
+    ToSendMax++;
 }
 
 //-----------------------------------------------------------------------------
@@ -1556,196 +1556,196 @@ void CodeIso14443aAsReaderPar(const uint8_t *cmd, uint16_t len, const uint8_t *p
 // Or return 0 when command is captured
 //-----------------------------------------------------------------------------
 int EmGetCmd(uint8_t *received, uint16_t *len, uint8_t *parity) {
-	*len = 0;
+    *len = 0;
 
-	uint32_t timer = 0, vtime = 0;
-	int analogCnt = 0;
-	int analogAVG = 0;
+    uint32_t timer = 0, vtime = 0;
+    int analogCnt = 0;
+    int analogAVG = 0;
 
-	// Set FPGA mode to "simulated ISO 14443 tag", no modulation (listen
-	// only, since we are receiving, not transmitting).
-	// Signal field is off with the appropriate LED
-	LED_D_OFF();
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_TAGSIM_LISTEN);
+    // Set FPGA mode to "simulated ISO 14443 tag", no modulation (listen
+    // only, since we are receiving, not transmitting).
+    // Signal field is off with the appropriate LED
+    LED_D_OFF();
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_TAGSIM_LISTEN);
 
-	// Set ADC to read field strength
-	AT91C_BASE_ADC->ADC_CR = AT91C_ADC_SWRST;
-	AT91C_BASE_ADC->ADC_MR =
-				ADC_MODE_PRESCALE(63) |
-				ADC_MODE_STARTUP_TIME(1) |
-				ADC_MODE_SAMPLE_HOLD_TIME(15);
-	AT91C_BASE_ADC->ADC_CHER = ADC_CHANNEL(ADC_CHAN_HF);
-	// start ADC
-	AT91C_BASE_ADC->ADC_CR = AT91C_ADC_START;
+    // Set ADC to read field strength
+    AT91C_BASE_ADC->ADC_CR = AT91C_ADC_SWRST;
+    AT91C_BASE_ADC->ADC_MR =
+                ADC_MODE_PRESCALE(63) |
+                ADC_MODE_STARTUP_TIME(1) |
+                ADC_MODE_SAMPLE_HOLD_TIME(15);
+    AT91C_BASE_ADC->ADC_CHER = ADC_CHANNEL(ADC_CHAN_HF);
+    // start ADC
+    AT91C_BASE_ADC->ADC_CR = AT91C_ADC_START;
 
-	// Now run a 'software UART' on the stream of incoming samples.
-	UartInit(received, parity);
+    // Now run a 'software UART' on the stream of incoming samples.
+    UartInit(received, parity);
 
-	// Clear RXRDY:
+    // Clear RXRDY:
     uint8_t b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
 
-	for(;;) {
-		WDT_HIT();
+    for(;;) {
+        WDT_HIT();
 
-		if (BUTTON_PRESS()) return 1;
+        if (BUTTON_PRESS()) return 1;
 
-		// test if the field exists
-		if (AT91C_BASE_ADC->ADC_SR & ADC_END_OF_CONVERSION(ADC_CHAN_HF)) {
-			analogCnt++;
-			analogAVG += AT91C_BASE_ADC->ADC_CDR[ADC_CHAN_HF];
-			AT91C_BASE_ADC->ADC_CR = AT91C_ADC_START;
-			if (analogCnt >= 32) {
-				if ((MAX_ADC_HF_VOLTAGE * (analogAVG / analogCnt) >> 10) < MF_MINFIELDV) {
-					vtime = GetTickCount();
-					if (!timer) timer = vtime;
-					// 50ms no field --> card to idle state
-					if (vtime - timer > 50) return 2;
-				} else
-					if (timer) timer = 0;
-				analogCnt = 0;
-				analogAVG = 0;
-			}
-		}
+        // test if the field exists
+        if (AT91C_BASE_ADC->ADC_SR & ADC_END_OF_CONVERSION(ADC_CHAN_HF)) {
+            analogCnt++;
+            analogAVG += AT91C_BASE_ADC->ADC_CDR[ADC_CHAN_HF];
+            AT91C_BASE_ADC->ADC_CR = AT91C_ADC_START;
+            if (analogCnt >= 32) {
+                if ((MAX_ADC_HF_VOLTAGE * (analogAVG / analogCnt) >> 10) < MF_MINFIELDV) {
+                    vtime = GetTickCount();
+                    if (!timer) timer = vtime;
+                    // 50ms no field --> card to idle state
+                    if (vtime - timer > 50) return 2;
+                } else
+                    if (timer) timer = 0;
+                analogCnt = 0;
+                analogAVG = 0;
+            }
+        }
 
-		// receive and test the miller decoding
+        // receive and test the miller decoding
         if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
             b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
-			if(MillerDecoding(b, 0)) {
-				*len = Uart.len;
-				return 0;
-			}
+            if(MillerDecoding(b, 0)) {
+                *len = Uart.len;
+                return 0;
+            }
         }
-	}
+    }
 }
 
 int EmSendCmd14443aRaw(uint8_t *resp, uint16_t respLen) {
-	volatile uint8_t b;
-	uint16_t i = 0;
-	uint32_t ThisTransferTime;
-	bool correctionNeeded;
+    volatile uint8_t b;
+    uint16_t i = 0;
+    uint32_t ThisTransferTime;
+    bool correctionNeeded;
 
-	// Modulate Manchester
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_TAGSIM_MOD);
+    // Modulate Manchester
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_TAGSIM_MOD);
 
-	// Include correction bit if necessary
-	if (Uart.bitCount == 7)
-	{
-		// Short tags (7 bits) don't have parity, determine the correct value from MSB
-		correctionNeeded = Uart.output[0] & 0x40;
-	}
-	else
-	{
-		// The parity bits are left-aligned
-		correctionNeeded = Uart.parity[(Uart.len-1)/8] & (0x80 >> ((Uart.len-1) & 7));
-	}
-	// 1236, so correction bit needed
-	i = (correctionNeeded) ? 0 : 1;
+    // Include correction bit if necessary
+    if (Uart.bitCount == 7)
+    {
+        // Short tags (7 bits) don't have parity, determine the correct value from MSB
+        correctionNeeded = Uart.output[0] & 0x40;
+    }
+    else
+    {
+        // The parity bits are left-aligned
+        correctionNeeded = Uart.parity[(Uart.len-1)/8] & (0x80 >> ((Uart.len-1) & 7));
+    }
+    // 1236, so correction bit needed
+    i = (correctionNeeded) ? 0 : 1;
 
- 	// clear receiving shift register and holding register
-	while(!(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY));
-	b = AT91C_BASE_SSC->SSC_RHR; (void) b;
-	while(!(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY));
-	b = AT91C_BASE_SSC->SSC_RHR; (void) b;
+     // clear receiving shift register and holding register
+    while(!(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY));
+    b = AT91C_BASE_SSC->SSC_RHR; (void) b;
+    while(!(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY));
+    b = AT91C_BASE_SSC->SSC_RHR; (void) b;
 
-	// wait for the FPGA to signal fdt_indicator == 1 (the FPGA is ready to queue new data in its delay line)
-	for (uint8_t j = 0; j < 5; j++) {	// allow timeout - better late than never
-		while(!(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY));
-		if (AT91C_BASE_SSC->SSC_RHR) break;
-	}
+    // wait for the FPGA to signal fdt_indicator == 1 (the FPGA is ready to queue new data in its delay line)
+    for (uint8_t j = 0; j < 5; j++) {    // allow timeout - better late than never
+        while(!(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY));
+        if (AT91C_BASE_SSC->SSC_RHR) break;
+    }
 
-	while ((ThisTransferTime = GetCountSspClk()) & 0x00000007);
+    while ((ThisTransferTime = GetCountSspClk()) & 0x00000007);
 
-	// Clear TXRDY:
-	AT91C_BASE_SSC->SSC_THR = SEC_F;
+    // Clear TXRDY:
+    AT91C_BASE_SSC->SSC_THR = SEC_F;
 
-	// send cycle
-	for(; i < respLen; ) {
-		if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
-			AT91C_BASE_SSC->SSC_THR = resp[i++];
-			FpgaSendQueueDelay = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
-		}
+    // send cycle
+    for(; i < respLen; ) {
+        if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
+            AT91C_BASE_SSC->SSC_THR = resp[i++];
+            FpgaSendQueueDelay = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
+        }
 
-		if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
-			b = (uint16_t)(AT91C_BASE_SSC->SSC_RHR); (void)b;
-		}
-		if(BUTTON_PRESS()) break;
-	}
+        if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
+            b = (uint16_t)(AT91C_BASE_SSC->SSC_RHR); (void)b;
+        }
+        if(BUTTON_PRESS()) break;
+    }
 
-	// Ensure that the FPGA Delay Queue is empty before we switch to TAGSIM_LISTEN again:
-	uint8_t fpga_queued_bits = FpgaSendQueueDelay >> 3;
-	for (i = 0; i <= fpga_queued_bits/8 + 1; ) {
-		if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
-			AT91C_BASE_SSC->SSC_THR = SEC_F;
-			FpgaSendQueueDelay = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
-			i++;
-		}
-	}
-	LastTimeProxToAirStart = ThisTransferTime + (correctionNeeded ? 8 : 0);
-	return 0;
+    // Ensure that the FPGA Delay Queue is empty before we switch to TAGSIM_LISTEN again:
+    uint8_t fpga_queued_bits = FpgaSendQueueDelay >> 3;
+    for (i = 0; i <= fpga_queued_bits/8 + 1; ) {
+        if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
+            AT91C_BASE_SSC->SSC_THR = SEC_F;
+            FpgaSendQueueDelay = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
+            i++;
+        }
+    }
+    LastTimeProxToAirStart = ThisTransferTime + (correctionNeeded ? 8 : 0);
+    return 0;
 }
 
 int EmSend4bit(uint8_t resp){
-	Code4bitAnswerAsTag(resp);
-	int res = EmSendCmd14443aRaw(ToSend, ToSendMax);
-	// do the tracing for the previous reader request and this tag answer:
-	uint8_t par[1] = {0x00};
-	GetParity(&resp, 1, par);
-	EmLogTrace(Uart.output,
-				Uart.len,
-				Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG,
-				Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG,
-				Uart.parity,
-				&resp,
-				1,
-				LastTimeProxToAirStart*16 + DELAY_ARM2AIR_AS_TAG,
-				(LastTimeProxToAirStart + LastProxToAirDuration)*16 + DELAY_ARM2AIR_AS_TAG,
-				par);
-	return res;
+    Code4bitAnswerAsTag(resp);
+    int res = EmSendCmd14443aRaw(ToSend, ToSendMax);
+    // do the tracing for the previous reader request and this tag answer:
+    uint8_t par[1] = {0x00};
+    GetParity(&resp, 1, par);
+    EmLogTrace(Uart.output,
+                Uart.len,
+                Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG,
+                Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG,
+                Uart.parity,
+                &resp,
+                1,
+                LastTimeProxToAirStart*16 + DELAY_ARM2AIR_AS_TAG,
+                (LastTimeProxToAirStart + LastProxToAirDuration)*16 + DELAY_ARM2AIR_AS_TAG,
+                par);
+    return res;
 }
 int EmSendCmdPar(uint8_t *resp, uint16_t respLen, uint8_t *par) {
-	return EmSendCmdParEx(resp, respLen, par, false);
+    return EmSendCmdParEx(resp, respLen, par, false);
 }
 int EmSendCmdParEx(uint8_t *resp, uint16_t respLen, uint8_t *par, bool collision){
-	CodeIso14443aAsTagPar(resp, respLen, par, collision);
-	int res = EmSendCmd14443aRaw(ToSend, ToSendMax);
-	// do the tracing for the previous reader request and this tag answer:
-	EmLogTrace(Uart.output,
-				Uart.len,
-				Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG,
-				Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG,
-				Uart.parity,
-				resp,
-				respLen,
-				LastTimeProxToAirStart*16 + DELAY_ARM2AIR_AS_TAG,
-				(LastTimeProxToAirStart + LastProxToAirDuration)*16 + DELAY_ARM2AIR_AS_TAG,
-				par);
-	return res;
+    CodeIso14443aAsTagPar(resp, respLen, par, collision);
+    int res = EmSendCmd14443aRaw(ToSend, ToSendMax);
+    // do the tracing for the previous reader request and this tag answer:
+    EmLogTrace(Uart.output,
+                Uart.len,
+                Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG,
+                Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG,
+                Uart.parity,
+                resp,
+                respLen,
+                LastTimeProxToAirStart*16 + DELAY_ARM2AIR_AS_TAG,
+                (LastTimeProxToAirStart + LastProxToAirDuration)*16 + DELAY_ARM2AIR_AS_TAG,
+                par);
+    return res;
 }
 int EmSendCmd(uint8_t *resp, uint16_t respLen){
-	return EmSendCmdEx(resp, respLen, false);
+    return EmSendCmdEx(resp, respLen, false);
 }
 int EmSendCmdEx(uint8_t *resp, uint16_t respLen, bool collision){
-	uint8_t par[MAX_PARITY_SIZE] = {0x00};
-	GetParity(resp, respLen, par);
-	return EmSendCmdParEx(resp, respLen, par, collision);
+    uint8_t par[MAX_PARITY_SIZE] = {0x00};
+    GetParity(resp, respLen, par);
+    return EmSendCmdParEx(resp, respLen, par, collision);
 }
 
 bool EmLogTrace(uint8_t *reader_data, uint16_t reader_len, uint32_t reader_StartTime, uint32_t reader_EndTime, uint8_t *reader_Parity,
-				 uint8_t *tag_data, uint16_t tag_len, uint32_t tag_StartTime, uint32_t tag_EndTime, uint8_t *tag_Parity)
+                 uint8_t *tag_data, uint16_t tag_len, uint32_t tag_StartTime, uint32_t tag_EndTime, uint8_t *tag_Parity)
 {
-	// we cannot exactly measure the end and start of a received command from reader. However we know that the delay from
-	// end of the received command to start of the tag's (simulated by us) answer is n*128+20 or n*128+84 resp.
-	// with n >= 9. The start of the tags answer can be measured and therefore the end of the received command be calculated:
-	uint16_t reader_modlen = reader_EndTime - reader_StartTime;
-	uint16_t approx_fdt = tag_StartTime - reader_EndTime;
-	uint16_t exact_fdt = (approx_fdt - 20 + 32)/64 * 64 + 20;
-	reader_EndTime = tag_StartTime - exact_fdt;
-	reader_StartTime = reader_EndTime - reader_modlen;
+    // we cannot exactly measure the end and start of a received command from reader. However we know that the delay from
+    // end of the received command to start of the tag's (simulated by us) answer is n*128+20 or n*128+84 resp.
+    // with n >= 9. The start of the tags answer can be measured and therefore the end of the received command be calculated:
+    uint16_t reader_modlen = reader_EndTime - reader_StartTime;
+    uint16_t approx_fdt = tag_StartTime - reader_EndTime;
+    uint16_t exact_fdt = (approx_fdt - 20 + 32)/64 * 64 + 20;
+    reader_EndTime = tag_StartTime - exact_fdt;
+    reader_StartTime = reader_EndTime - reader_modlen;
 
-	if (!LogTrace(reader_data, reader_len, reader_StartTime, reader_EndTime, reader_Parity, true))
-		return false;
-	else
-		return(!LogTrace(tag_data, tag_len, tag_StartTime, tag_EndTime, tag_Parity, false));
+    if (!LogTrace(reader_data, reader_len, reader_StartTime, reader_EndTime, reader_Parity, true))
+        return false;
+    else
+        return(!LogTrace(tag_data, tag_len, tag_StartTime, tag_EndTime, tag_Parity, false));
 
 }
 
@@ -1755,44 +1755,44 @@ bool EmLogTrace(uint8_t *reader_data, uint16_t reader_len, uint32_t reader_Start
 //  If it takes too long return FALSE
 //-----------------------------------------------------------------------------
 static int GetIso14443aAnswerFromTag(uint8_t *receivedResponse, uint8_t *receivedResponsePar, uint16_t offset) {
-	uint32_t c = 0;
+    uint32_t c = 0;
 
-	// Set FPGA mode to "reader listen mode", no modulation (listen
-	// only, since we are receiving, not transmitting).
-	// Signal field is on with the appropriate LED
-	LED_D_ON();
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_LISTEN);
+    // Set FPGA mode to "reader listen mode", no modulation (listen
+    // only, since we are receiving, not transmitting).
+    // Signal field is on with the appropriate LED
+    LED_D_ON();
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_LISTEN);
 
-	// Now get the answer from the card
-	DemodInit(receivedResponse, receivedResponsePar);
+    // Now get the answer from the card
+    DemodInit(receivedResponse, receivedResponsePar);
 
-	// clear RXRDY:
+    // clear RXRDY:
     uint8_t b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
 
-	uint32_t timeout = iso14a_get_timeout();
-	for(;;) {
-		WDT_HIT();
+    uint32_t timeout = iso14a_get_timeout();
+    for(;;) {
+        WDT_HIT();
 
-		if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
-			b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
-			if (ManchesterDecoding(b, offset, 0)) {
-				NextTransferTime = MAX(NextTransferTime, Demod.endTime - (DELAY_AIR2ARM_AS_READER + DELAY_ARM2AIR_AS_READER)/16 + FRAME_DELAY_TIME_PICC_TO_PCD);
-				return true;
-			} else if (c++ > timeout && Demod.state == DEMOD_UNSYNCD) {
-				return false;
-			}
-		}
-	}
+        if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
+            b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
+            if (ManchesterDecoding(b, offset, 0)) {
+                NextTransferTime = MAX(NextTransferTime, Demod.endTime - (DELAY_AIR2ARM_AS_READER + DELAY_ARM2AIR_AS_READER)/16 + FRAME_DELAY_TIME_PICC_TO_PCD);
+                return true;
+            } else if (c++ > timeout && Demod.state == DEMOD_UNSYNCD) {
+                return false;
+            }
+        }
+    }
 }
 
 void ReaderTransmitBitsPar(uint8_t* frame, uint16_t bits, uint8_t *par, uint32_t *timing) {
 
-	CodeIso14443aBitsAsReaderPar(frame, bits, par);
-	// Send command to tag
-	TransmitFor14443a(ToSend, ToSendMax, timing);
-	if(trigger) LED_A_ON();
+    CodeIso14443aBitsAsReaderPar(frame, bits, par);
+    // Send command to tag
+    TransmitFor14443a(ToSend, ToSendMax, timing);
+    if(trigger) LED_A_ON();
 
-	LogTrace(frame, nbytes(bits), (LastTimeProxToAirStart<<4) + DELAY_ARM2AIR_AS_READER, ((LastTimeProxToAirStart + LastProxToAirDuration)<<4) + DELAY_ARM2AIR_AS_READER, par, true);
+    LogTrace(frame, nbytes(bits), (LastTimeProxToAirStart<<4) + DELAY_ARM2AIR_AS_READER, ((LastTimeProxToAirStart + LastProxToAirDuration)<<4) + DELAY_ARM2AIR_AS_READER, par, true);
 }
 
 void ReaderTransmitPar(uint8_t* frame, uint16_t len, uint8_t *par, uint32_t *timing) {
@@ -1800,31 +1800,31 @@ void ReaderTransmitPar(uint8_t* frame, uint16_t len, uint8_t *par, uint32_t *tim
 }
 
 void ReaderTransmitBits(uint8_t* frame, uint16_t len, uint32_t *timing) {
-	// Generate parity and redirect
-	uint8_t par[MAX_PARITY_SIZE] = {0x00};
-	GetParity(frame, len/8, par);
-	ReaderTransmitBitsPar(frame, len, par, timing);
+    // Generate parity and redirect
+    uint8_t par[MAX_PARITY_SIZE] = {0x00};
+    GetParity(frame, len/8, par);
+    ReaderTransmitBitsPar(frame, len, par, timing);
 }
 
 void ReaderTransmit(uint8_t* frame, uint16_t len, uint32_t *timing) {
-	// Generate parity and redirect
-	uint8_t par[MAX_PARITY_SIZE] = {0x00};
-	GetParity(frame, len, par);
-	ReaderTransmitBitsPar(frame, len*8, par, timing);
+    // Generate parity and redirect
+    uint8_t par[MAX_PARITY_SIZE] = {0x00};
+    GetParity(frame, len, par);
+    ReaderTransmitBitsPar(frame, len*8, par, timing);
 }
 
 int ReaderReceiveOffset(uint8_t* receivedAnswer, uint16_t offset, uint8_t *parity) {
-	if (!GetIso14443aAnswerFromTag(receivedAnswer, parity, offset))
-		return false;
-	LogTrace(receivedAnswer, Demod.len, Demod.startTime*16 - DELAY_AIR2ARM_AS_READER, Demod.endTime*16 - DELAY_AIR2ARM_AS_READER, parity, false);
-	return Demod.len;
+    if (!GetIso14443aAnswerFromTag(receivedAnswer, parity, offset))
+        return false;
+    LogTrace(receivedAnswer, Demod.len, Demod.startTime*16 - DELAY_AIR2ARM_AS_READER, Demod.endTime*16 - DELAY_AIR2ARM_AS_READER, parity, false);
+    return Demod.len;
 }
 
 int ReaderReceive(uint8_t *receivedAnswer, uint8_t *parity) {
-	if (!GetIso14443aAnswerFromTag(receivedAnswer, parity, 0))
-		return false;
-	LogTrace(receivedAnswer, Demod.len, Demod.startTime*16 - DELAY_AIR2ARM_AS_READER, Demod.endTime*16 - DELAY_AIR2ARM_AS_READER, parity, false);
-	return Demod.len;
+    if (!GetIso14443aAnswerFromTag(receivedAnswer, parity, 0))
+        return false;
+    LogTrace(receivedAnswer, Demod.len, Demod.startTime*16 - DELAY_AIR2ARM_AS_READER, Demod.endTime*16 - DELAY_AIR2ARM_AS_READER, parity, false);
+    return Demod.len;
 }
 
 // This function misstreats the ISO 14443a anticollision procedure.
@@ -1832,125 +1832,125 @@ int ReaderReceive(uint8_t *receivedAnswer, uint8_t *parity) {
 // increase the uid bytes.   The might be an overflow, DoS will occure.
 void iso14443a_antifuzz(uint32_t flags){
 
-	// We need to listen to the high-frequency, peak-detected path.
-	iso14443a_setup(FPGA_HF_ISO14443A_TAGSIM_LISTEN);
+    // We need to listen to the high-frequency, peak-detected path.
+    iso14443a_setup(FPGA_HF_ISO14443A_TAGSIM_LISTEN);
 
-	BigBuf_free_keep_EM();
-	clear_trace();
-	set_tracing(true);
+    BigBuf_free_keep_EM();
+    clear_trace();
+    set_tracing(true);
 
-	int len = 0;
+    int len = 0;
 
-	// allocate buffers:
-	uint8_t *received = BigBuf_malloc(MAX_FRAME_SIZE);
-	uint8_t *receivedPar = BigBuf_malloc(MAX_PARITY_SIZE);
-	uint8_t *resp = BigBuf_malloc(20);
+    // allocate buffers:
+    uint8_t *received = BigBuf_malloc(MAX_FRAME_SIZE);
+    uint8_t *receivedPar = BigBuf_malloc(MAX_PARITY_SIZE);
+    uint8_t *resp = BigBuf_malloc(20);
 
-	memset(resp, 0xFF , 20);
+    memset(resp, 0xFF , 20);
 
-	LED_A_ON();
-	for (;;) {
-		WDT_HIT();
+    LED_A_ON();
+    for (;;) {
+        WDT_HIT();
 
-		// Clean receive command buffer
-		if (!GetIso14443aCommandFromReader(received, receivedPar, &len)) {
-			Dbprintf("Anti-fuzz stopped. Trace length: %d ", BigBuf_get_traceLen());
-			break;
-		}
-		if ( received[0] == ISO14443A_CMD_WUPA || received[0] == ISO14443A_CMD_REQA) {
-				resp[0] = 0x04;
-				resp[1] = 0x00;
+        // Clean receive command buffer
+        if (!GetIso14443aCommandFromReader(received, receivedPar, &len)) {
+            Dbprintf("Anti-fuzz stopped. Trace length: %d ", BigBuf_get_traceLen());
+            break;
+        }
+        if ( received[0] == ISO14443A_CMD_WUPA || received[0] == ISO14443A_CMD_REQA) {
+                resp[0] = 0x04;
+                resp[1] = 0x00;
 
-				if ( (flags & FLAG_7B_UID_IN_DATA) == FLAG_7B_UID_IN_DATA ) {
-					resp[0] = 0x44;
-				}
+                if ( (flags & FLAG_7B_UID_IN_DATA) == FLAG_7B_UID_IN_DATA ) {
+                    resp[0] = 0x44;
+                }
 
-				EmSendCmd(resp, 2);
-				continue;
-		}
+                EmSendCmd(resp, 2);
+                continue;
+        }
 
-		// Received request for UID (cascade 1)
-		//if (received[1] >= 0x20 && received[1] <= 0x57 && received[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT) {
-		if (received[1] >= 0x20 && received[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT) {
-			resp[0] = 0xFF;
-			resp[1] = 0xFF;
-			resp[2] = 0xFF;
-			resp[3] = 0xFF;
-			resp[4] =  resp[0] ^ resp[1] ^ resp[2] ^ resp[3];
-			colpos = 0;
+        // Received request for UID (cascade 1)
+        //if (received[1] >= 0x20 && received[1] <= 0x57 && received[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT) {
+        if (received[1] >= 0x20 && received[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT) {
+            resp[0] = 0xFF;
+            resp[1] = 0xFF;
+            resp[2] = 0xFF;
+            resp[3] = 0xFF;
+            resp[4] =  resp[0] ^ resp[1] ^ resp[2] ^ resp[3];
+            colpos = 0;
 
-			if ( (flags & FLAG_7B_UID_IN_DATA) == FLAG_7B_UID_IN_DATA ) {
-				resp[0] = 0x88;
-				colpos = 8;
-			}
+            if ( (flags & FLAG_7B_UID_IN_DATA) == FLAG_7B_UID_IN_DATA ) {
+                resp[0] = 0x88;
+                colpos = 8;
+            }
 
-			EmSendCmdEx(resp, 5, true);
-			if (MF_DBGLEVEL >= 4) Dbprintf("ANTICOLL or SELECT %x", received[1]);
-			LED_D_INV();
+            EmSendCmdEx(resp, 5, true);
+            if (MF_DBGLEVEL >= 4) Dbprintf("ANTICOLL or SELECT %x", received[1]);
+            LED_D_INV();
 
-			continue;
-		} else if (received[1] == 0x20 && received[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2) { 	// Received request for UID (cascade 2)
-			if (MF_DBGLEVEL >= 4) Dbprintf("ANTICOLL or SELECT_2");
-		} else if (received[1] == 0x70 && received[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT) {	// Received a SELECT (cascade 1)
-		} else if (received[1] == 0x70 && received[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2) {	// Received a SELECT (cascade 2)
-		} else {
-			Dbprintf("unknown command %x", received[0]);
-		}
-	}
+            continue;
+        } else if (received[1] == 0x20 && received[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2) {  // Received request for UID (cascade 2)
+            if (MF_DBGLEVEL >= 4) Dbprintf("ANTICOLL or SELECT_2");
+        } else if (received[1] == 0x70 && received[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT) {    // Received a SELECT (cascade 1)
+        } else if (received[1] == 0x70 && received[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2) {  // Received a SELECT (cascade 2)
+        } else {
+            Dbprintf("unknown command %x", received[0]);
+        }
+    }
 
-	cmd_send(CMD_ACK,1,0,0,0,0);
-	switch_off();
-	BigBuf_free_keep_EM();
+    cmd_send(CMD_ACK,1,0,0,0,0);
+    switch_off();
+    BigBuf_free_keep_EM();
 }
 
 static void iso14a_set_ATS_times(uint8_t *ats) {
 
-	uint8_t tb1;
-	uint8_t fwi, sfgi;
-	uint32_t fwt, sfgt;
+    uint8_t tb1;
+    uint8_t fwi, sfgi;
+    uint32_t fwt, sfgt;
 
-	if (ats[0] > 1) {							// there is a format byte T0
-		if ((ats[1] & 0x20) == 0x20) {			// there is an interface byte TB(1)
-			if ((ats[1] & 0x10) == 0x10) {		// there is an interface byte TA(1) preceding TB(1)
-				tb1 = ats[3];
-			} else {
-				tb1 = ats[2];
-			}
-			fwi = (tb1 & 0xf0) >> 4;			// frame waiting time integer (FWI)
-			if (fwi != 15) {
-				fwt = 256 * 16 * (1 << fwi);	// frame waiting time (FWT) in 1/fc
-				iso14a_set_timeout(fwt/(8*16));
-			}
-			sfgi = tb1 & 0x0f;					// startup frame guard time integer (SFGI)
-			if (sfgi != 0 && sfgi != 15) {
-				sfgt = 256 * 16 * (1 << sfgi);	// startup frame guard time (SFGT) in 1/fc
-				NextTransferTime = MAX(NextTransferTime, Demod.endTime + (sfgt - DELAY_AIR2ARM_AS_READER - DELAY_ARM2AIR_AS_READER)/16);
-			}
-		}
-	}
+    if (ats[0] > 1) {                           // there is a format byte T0
+        if ((ats[1] & 0x20) == 0x20) {          // there is an interface byte TB(1)
+            if ((ats[1] & 0x10) == 0x10) {      // there is an interface byte TA(1) preceding TB(1)
+                tb1 = ats[3];
+            } else {
+                tb1 = ats[2];
+            }
+            fwi = (tb1 & 0xf0) >> 4;            // frame waiting time integer (FWI)
+            if (fwi != 15) {
+                fwt = 256 * 16 * (1 << fwi);    // frame waiting time (FWT) in 1/fc
+                iso14a_set_timeout(fwt/(8*16));
+            }
+            sfgi = tb1 & 0x0f;                  // startup frame guard time integer (SFGI)
+            if (sfgi != 0 && sfgi != 15) {
+                sfgt = 256 * 16 * (1 << sfgi);  // startup frame guard time (SFGT) in 1/fc
+                NextTransferTime = MAX(NextTransferTime, Demod.endTime + (sfgt - DELAY_AIR2ARM_AS_READER - DELAY_ARM2AIR_AS_READER)/16);
+            }
+        }
+    }
 }
 
 static int GetATQA(uint8_t *resp, uint8_t *resp_par) {
 
-#define WUPA_RETRY_TIMEOUT	10	// 10ms
-	uint8_t wupa[]       = { ISO14443A_CMD_WUPA };  // 0x26 - REQA  0x52 - WAKE-UP
+#define WUPA_RETRY_TIMEOUT 10    // 10ms
+    uint8_t wupa[] = { ISO14443A_CMD_WUPA };  // 0x26 - REQA  0x52 - WAKE-UP
 
-	uint32_t save_iso14a_timeout = iso14a_get_timeout();
-	iso14a_set_timeout(1236/(16*8)+1);		// response to WUPA is expected at exactly 1236/fc. No need to wait longer.
+    uint32_t save_iso14a_timeout = iso14a_get_timeout();
+    iso14a_set_timeout(1236/(16*8)+1);        // response to WUPA is expected at exactly 1236/fc. No need to wait longer.
 
-	uint32_t start_time = GetTickCount();
-	int len;
+    uint32_t start_time = GetTickCount();
+    int len;
 
-	// we may need several tries if we did send an unknown command or a wrong authentication before...
-	do {
-		// Broadcast for a card, WUPA (0x52) will force response from all cards in the field
-		ReaderTransmitBitsPar(wupa, 7, NULL, NULL);
-		// Receive the ATQA
-		len = ReaderReceive(resp, resp_par);
-	} while (len == 0 && GetTickCount() <= start_time + WUPA_RETRY_TIMEOUT);
+    // we may need several tries if we did send an unknown command or a wrong authentication before...
+    do {
+        // Broadcast for a card, WUPA (0x52) will force response from all cards in the field
+        ReaderTransmitBitsPar(wupa, 7, NULL, NULL);
+        // Receive the ATQA
+        len = ReaderReceive(resp, resp_par);
+    } while (len == 0 && GetTickCount() <= start_time + WUPA_RETRY_TIMEOUT);
 
-	iso14a_set_timeout(save_iso14a_timeout);
-	return len;
+    iso14a_set_timeout(save_iso14a_timeout);
+    return len;
 }
 
 // performs iso14443a anticollision (optional) and card select procedure
@@ -1961,238 +1961,238 @@ static int GetATQA(uint8_t *resp, uint8_t *resp_par) {
 // requests ATS unless no_rats is true
 int iso14443a_select_card(byte_t *uid_ptr, iso14a_card_select_t *p_card, uint32_t *cuid_ptr, bool anticollision, uint8_t num_cascades, bool no_rats) {
 
-	uint8_t sel_all[]    = { ISO14443A_CMD_ANTICOLL_OR_SELECT,0x20 };
-	uint8_t sel_uid[]    = { ISO14443A_CMD_ANTICOLL_OR_SELECT,0x70,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-	uint8_t rats[]       = { ISO14443A_CMD_RATS,0x80,0x00,0x00 }; // FSD=256, FSDI=8, CID=0
-	uint8_t resp[MAX_FRAME_SIZE] = {0}; // theoretically. A usual RATS will be much smaller
-	uint8_t resp_par[MAX_PARITY_SIZE] = {0};
-	uint8_t uid_resp[4] = {0};
-	size_t uid_resp_len = 0;
+    uint8_t sel_all[]    = { ISO14443A_CMD_ANTICOLL_OR_SELECT,0x20 };
+    uint8_t sel_uid[]    = { ISO14443A_CMD_ANTICOLL_OR_SELECT,0x70,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+    uint8_t rats[]       = { ISO14443A_CMD_RATS,0x80,0x00,0x00 }; // FSD=256, FSDI=8, CID=0
+    uint8_t resp[MAX_FRAME_SIZE] = {0}; // theoretically. A usual RATS will be much smaller
+    uint8_t resp_par[MAX_PARITY_SIZE] = {0};
+    uint8_t uid_resp[4] = {0};
+    size_t uid_resp_len = 0;
 
-	uint8_t sak = 0x04; // cascade uid
-	int cascade_level = 0;
-	int len;
+    uint8_t sak = 0x04; // cascade uid
+    int cascade_level = 0;
+    int len;
 
-	if (p_card) {
-		p_card->uidlen = 0;
-		memset(p_card->uid, 0, 10);
-		p_card->ats_len = 0;
-	}
+    if (p_card) {
+        p_card->uidlen = 0;
+        memset(p_card->uid, 0, 10);
+        p_card->ats_len = 0;
+    }
 
-	if (!GetATQA(resp, resp_par)) {
-		return 0;
-	}
+    if (!GetATQA(resp, resp_par)) {
+        return 0;
+    }
 
-	if (p_card) {
-		p_card->atqa[0] = resp[0];
-		p_card->atqa[1] = resp[1];
-	}
+    if (p_card) {
+        p_card->atqa[0] = resp[0];
+        p_card->atqa[1] = resp[1];
+    }
 
-	if (anticollision) {
-		// clear uid
-		if (uid_ptr)
-			memset(uid_ptr, 0, 10);
-	}
+    if (anticollision) {
+        // clear uid
+        if (uid_ptr)
+            memset(uid_ptr, 0, 10);
+    }
 
-	// check for proprietary anticollision:
-	if ((resp[0] & 0x1F) == 0) return 3;
+    // check for proprietary anticollision:
+    if ((resp[0] & 0x1F) == 0) return 3;
 
-	// OK we will select at least at cascade 1, lets see if first byte of UID was 0x88 in
-	// which case we need to make a cascade 2 request and select - this is a long UID
-	// While the UID is not complete, the 3nd bit (from the right) is set in the SAK.
-	for(; sak & 0x04; cascade_level++) {
-		// SELECT_* (L1: 0x93, L2: 0x95, L3: 0x97)
-		sel_uid[0] = sel_all[0] = 0x93 + cascade_level * 2;
+    // OK we will select at least at cascade 1, lets see if first byte of UID was 0x88 in
+    // which case we need to make a cascade 2 request and select - this is a long UID
+    // While the UID is not complete, the 3nd bit (from the right) is set in the SAK.
+    for(; sak & 0x04; cascade_level++) {
+        // SELECT_* (L1: 0x93, L2: 0x95, L3: 0x97)
+        sel_uid[0] = sel_all[0] = 0x93 + cascade_level * 2;
 
-		if (anticollision) {
-		// SELECT_ALL
-			ReaderTransmit(sel_all, sizeof(sel_all), NULL);
-			if (!ReaderReceive(resp, resp_par)) return 0;
+        if (anticollision) {
+        // SELECT_ALL
+            ReaderTransmit(sel_all, sizeof(sel_all), NULL);
+            if (!ReaderReceive(resp, resp_par)) return 0;
 
-			if (Demod.collisionPos) {			// we had a collision and need to construct the UID bit by bit
-				memset(uid_resp, 0, 4);
-				uint16_t uid_resp_bits = 0;
-				uint16_t collision_answer_offset = 0;
-				// anti-collision-loop:
-				while (Demod.collisionPos) {
-					Dbprintf("Multiple tags detected. Collision after Bit %d", Demod.collisionPos);
-					for (uint16_t i = collision_answer_offset; i < Demod.collisionPos; i++, uid_resp_bits++) {	// add valid UID bits before collision point
-						uint16_t UIDbit = (resp[i/8] >> (i % 8)) & 0x01;
-						uid_resp[uid_resp_bits / 8] |= UIDbit << (uid_resp_bits % 8);
-					}
-					uid_resp[uid_resp_bits/8] |= 1 << (uid_resp_bits % 8);					// next time select the card(s) with a 1 in the collision position
-					uid_resp_bits++;
-					// construct anticollosion command:
-					sel_uid[1] = ((2 + uid_resp_bits/8) << 4) | (uid_resp_bits & 0x07);  	// length of data in bytes and bits
-					for (uint16_t i = 0; i <= uid_resp_bits/8; i++) {
-						sel_uid[2+i] = uid_resp[i];
-					}
-					collision_answer_offset = uid_resp_bits%8;
-					ReaderTransmitBits(sel_uid, 16 + uid_resp_bits, NULL);
-					if (!ReaderReceiveOffset(resp, collision_answer_offset, resp_par)) return 0;
-				}
-				// finally, add the last bits and BCC of the UID
-				for (uint16_t i = collision_answer_offset; i < (Demod.len-1)*8; i++, uid_resp_bits++) {
-					uint16_t UIDbit = (resp[i/8] >> (i%8)) & 0x01;
-					uid_resp[uid_resp_bits/8] |= UIDbit << (uid_resp_bits % 8);
-				}
+            if (Demod.collisionPos) {            // we had a collision and need to construct the UID bit by bit
+                memset(uid_resp, 0, 4);
+                uint16_t uid_resp_bits = 0;
+                uint16_t collision_answer_offset = 0;
+                // anti-collision-loop:
+                while (Demod.collisionPos) {
+                    Dbprintf("Multiple tags detected. Collision after Bit %d", Demod.collisionPos);
+                    for (uint16_t i = collision_answer_offset; i < Demod.collisionPos; i++, uid_resp_bits++) {    // add valid UID bits before collision point
+                        uint16_t UIDbit = (resp[i/8] >> (i % 8)) & 0x01;
+                        uid_resp[uid_resp_bits / 8] |= UIDbit << (uid_resp_bits % 8);
+                    }
+                    uid_resp[uid_resp_bits/8] |= 1 << (uid_resp_bits % 8);                    // next time select the card(s) with a 1 in the collision position
+                    uid_resp_bits++;
+                    // construct anticollosion command:
+                    sel_uid[1] = ((2 + uid_resp_bits/8) << 4) | (uid_resp_bits & 0x07);       // length of data in bytes and bits
+                    for (uint16_t i = 0; i <= uid_resp_bits/8; i++) {
+                        sel_uid[2+i] = uid_resp[i];
+                    }
+                    collision_answer_offset = uid_resp_bits%8;
+                    ReaderTransmitBits(sel_uid, 16 + uid_resp_bits, NULL);
+                    if (!ReaderReceiveOffset(resp, collision_answer_offset, resp_par)) return 0;
+                }
+                // finally, add the last bits and BCC of the UID
+                for (uint16_t i = collision_answer_offset; i < (Demod.len-1)*8; i++, uid_resp_bits++) {
+                    uint16_t UIDbit = (resp[i/8] >> (i%8)) & 0x01;
+                    uid_resp[uid_resp_bits/8] |= UIDbit << (uid_resp_bits % 8);
+                }
 
-			} else {		// no collision, use the response to SELECT_ALL as current uid
-				memcpy(uid_resp, resp, 4);
-			}
+            } else {        // no collision, use the response to SELECT_ALL as current uid
+                memcpy(uid_resp, resp, 4);
+            }
 
-		} else {
-			if (cascade_level < num_cascades - 1) {
-				uid_resp[0] = 0x88;
-				memcpy(uid_resp+1, uid_ptr+cascade_level*3, 3);
-			} else {
-				memcpy(uid_resp, uid_ptr+cascade_level*3, 4);
-			}
-		}
-		uid_resp_len = 4;
+        } else {
+            if (cascade_level < num_cascades - 1) {
+                uid_resp[0] = 0x88;
+                memcpy(uid_resp+1, uid_ptr+cascade_level*3, 3);
+            } else {
+                memcpy(uid_resp, uid_ptr+cascade_level*3, 4);
+            }
+        }
+        uid_resp_len = 4;
 
-		// calculate crypto UID. Always use last 4 Bytes.
-		if(cuid_ptr)
-			*cuid_ptr = bytes_to_num(uid_resp, 4);
+        // calculate crypto UID. Always use last 4 Bytes.
+        if(cuid_ptr)
+            *cuid_ptr = bytes_to_num(uid_resp, 4);
 
-		// Construct SELECT UID command
-		sel_uid[1] = 0x70;													// transmitting a full UID (1 Byte cmd, 1 Byte NVB, 4 Byte UID, 1 Byte BCC, 2 Bytes CRC)
-		memcpy(sel_uid+2, uid_resp, 4);										// the UID received during anticollision, or the provided UID
-		sel_uid[6] = sel_uid[2] ^ sel_uid[3] ^ sel_uid[4] ^ sel_uid[5];  	// calculate and add BCC
-		AddCrc14A(sel_uid, 7);										// calculate and add CRC
-		ReaderTransmit(sel_uid, sizeof(sel_uid), NULL);
+        // Construct SELECT UID command
+        sel_uid[1] = 0x70;                                              // transmitting a full UID (1 Byte cmd, 1 Byte NVB, 4 Byte UID, 1 Byte BCC, 2 Bytes CRC)
+        memcpy(sel_uid+2, uid_resp, 4);                                 // the UID received during anticollision, or the provided UID
+        sel_uid[6] = sel_uid[2] ^ sel_uid[3] ^ sel_uid[4] ^ sel_uid[5]; // calculate and add BCC
+        AddCrc14A(sel_uid, 7);                                          // calculate and add CRC
+        ReaderTransmit(sel_uid, sizeof(sel_uid), NULL);
 
-		// Receive the SAK
-		if (!ReaderReceive(resp, resp_par)) return 0;
+        // Receive the SAK
+        if (!ReaderReceive(resp, resp_par)) return 0;
 
-		sak = resp[0];
+        sak = resp[0];
 
-		// Test if more parts of the uid are coming
-		if ((sak & 0x04) /* && uid_resp[0] == 0x88 */) {
-			// Remove first byte, 0x88 is not an UID byte, it CT, see page 3 of:
-			// http://www.nxp.com/documents/application_note/AN10927.pdf
-			uid_resp[0] = uid_resp[1];
-			uid_resp[1] = uid_resp[2];
-			uid_resp[2] = uid_resp[3];
-			uid_resp_len = 3;
-		}
+        // Test if more parts of the uid are coming
+        if ((sak & 0x04) /* && uid_resp[0] == 0x88 */) {
+            // Remove first byte, 0x88 is not an UID byte, it CT, see page 3 of:
+            // http://www.nxp.com/documents/application_note/AN10927.pdf
+            uid_resp[0] = uid_resp[1];
+            uid_resp[1] = uid_resp[2];
+            uid_resp[2] = uid_resp[3];
+            uid_resp_len = 3;
+        }
 
-		if(uid_ptr && anticollision)
-			memcpy(uid_ptr + (cascade_level*3), uid_resp, uid_resp_len);
+        if(uid_ptr && anticollision)
+            memcpy(uid_ptr + (cascade_level*3), uid_resp, uid_resp_len);
 
-		if(p_card) {
-			memcpy(p_card->uid + (cascade_level*3), uid_resp, uid_resp_len);
-			p_card->uidlen += uid_resp_len;
-		}
-	}
+        if(p_card) {
+            memcpy(p_card->uid + (cascade_level*3), uid_resp, uid_resp_len);
+            p_card->uidlen += uid_resp_len;
+        }
+    }
 
-	if (p_card) {
-		p_card->sak = sak;
-	}
+    if (p_card) {
+        p_card->sak = sak;
+    }
 
-	// PICC compilant with iso14443a-4 ---> (SAK & 0x20 != 0)
-	if( (sak & 0x20) == 0) return 2;
+    // PICC compilant with iso14443a-4 ---> (SAK & 0x20 != 0)
+    if( (sak & 0x20) == 0) return 2;
 
-	// RATS, Request for answer to select
-	if ( !no_rats ) {
+    // RATS, Request for answer to select
+    if ( !no_rats ) {
 
-		AddCrc14A(rats, 2);
-		ReaderTransmit(rats, sizeof(rats), NULL);
-		len = ReaderReceive(resp, resp_par);
+        AddCrc14A(rats, 2);
+        ReaderTransmit(rats, sizeof(rats), NULL);
+        len = ReaderReceive(resp, resp_par);
 
-		if (!len) return 0;
+        if (!len) return 0;
 
-		if (p_card) {
-			memcpy(p_card->ats, resp, sizeof(p_card->ats));
-			p_card->ats_len = len;
-		}
+        if (p_card) {
+            memcpy(p_card->ats, resp, sizeof(p_card->ats));
+            p_card->ats_len = len;
+        }
 
-		// reset the PCB block number
-		iso14_pcb_blocknum = 0;
+        // reset the PCB block number
+        iso14_pcb_blocknum = 0;
 
-		// set default timeout and delay next transfer based on ATS
-		iso14a_set_ATS_times(resp);
-	}
-	return 1;
+        // set default timeout and delay next transfer based on ATS
+        iso14a_set_ATS_times(resp);
+    }
+    return 1;
 }
 
 int iso14443a_fast_select_card(uint8_t *uid_ptr, uint8_t num_cascades) {
-	uint8_t sel_all[]    = { ISO14443A_CMD_ANTICOLL_OR_SELECT,0x20 };
-	uint8_t sel_uid[]    = { ISO14443A_CMD_ANTICOLL_OR_SELECT,0x70,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-	uint8_t resp[5] = {0}; // theoretically. A usual RATS will be much smaller
-	uint8_t resp_par[1] = {0};
-	uint8_t uid_resp[4] = {0};
+    uint8_t sel_all[]    = { ISO14443A_CMD_ANTICOLL_OR_SELECT,0x20 };
+    uint8_t sel_uid[]    = { ISO14443A_CMD_ANTICOLL_OR_SELECT,0x70,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+    uint8_t resp[5] = {0}; // theoretically. A usual RATS will be much smaller
+    uint8_t resp_par[1] = {0};
+    uint8_t uid_resp[4] = {0};
 
-	uint8_t sak = 0x04; // cascade uid
-	int cascade_level = 0;
+    uint8_t sak = 0x04; // cascade uid
+    int cascade_level = 0;
 
-	if (!GetATQA(resp, resp_par)) {
-		return 0;
-	}
+    if (!GetATQA(resp, resp_par)) {
+        return 0;
+    }
 
-	// OK we will select at least at cascade 1, lets see if first byte of UID was 0x88 in
-	// which case we need to make a cascade 2 request and select - this is a long UID
-	// While the UID is not complete, the 3nd bit (from the right) is set in the SAK.
-	for(; sak & 0x04; cascade_level++) {
-		// SELECT_* (L1: 0x93, L2: 0x95, L3: 0x97)
-		sel_uid[0] = sel_all[0] = 0x93 + cascade_level * 2;
+    // OK we will select at least at cascade 1, lets see if first byte of UID was 0x88 in
+    // which case we need to make a cascade 2 request and select - this is a long UID
+    // While the UID is not complete, the 3nd bit (from the right) is set in the SAK.
+    for(; sak & 0x04; cascade_level++) {
+        // SELECT_* (L1: 0x93, L2: 0x95, L3: 0x97)
+        sel_uid[0] = sel_all[0] = 0x93 + cascade_level * 2;
 
-		if (cascade_level < num_cascades - 1) {
-			uid_resp[0] = 0x88;
-			memcpy(uid_resp+1, uid_ptr+cascade_level*3, 3);
-		} else {
-			memcpy(uid_resp, uid_ptr+cascade_level*3, 4);
-		}
+        if (cascade_level < num_cascades - 1) {
+            uid_resp[0] = 0x88;
+            memcpy(uid_resp+1, uid_ptr+cascade_level*3, 3);
+        } else {
+            memcpy(uid_resp, uid_ptr+cascade_level*3, 4);
+        }
 
-		// Construct SELECT UID command
-		//sel_uid[1] = 0x70;													// transmitting a full UID (1 Byte cmd, 1 Byte NVB, 4 Byte UID, 1 Byte BCC, 2 Bytes CRC)
-		memcpy(sel_uid+2, uid_resp, 4);										// the UID received during anticollision, or the provided UID
-		sel_uid[6] = sel_uid[2] ^ sel_uid[3] ^ sel_uid[4] ^ sel_uid[5];  	// calculate and add BCC
-		AddCrc14A(sel_uid, 7);										// calculate and add CRC
-		ReaderTransmit(sel_uid, sizeof(sel_uid), NULL);
+        // Construct SELECT UID command
+        //sel_uid[1] = 0x70;                                            // transmitting a full UID (1 Byte cmd, 1 Byte NVB, 4 Byte UID, 1 Byte BCC, 2 Bytes CRC)
+        memcpy(sel_uid+2, uid_resp, 4);                                 // the UID received during anticollision, or the provided UID
+        sel_uid[6] = sel_uid[2] ^ sel_uid[3] ^ sel_uid[4] ^ sel_uid[5]; // calculate and add BCC
+        AddCrc14A(sel_uid, 7);                                          // calculate and add CRC
+        ReaderTransmit(sel_uid, sizeof(sel_uid), NULL);
 
-		// Receive the SAK
-		if (!ReaderReceive(resp, resp_par)) return 0;
+        // Receive the SAK
+        if (!ReaderReceive(resp, resp_par)) return 0;
 
-		sak = resp[0];
+        sak = resp[0];
 
-		// Test if more parts of the uid are coming
-		if ((sak & 0x04) /* && uid_resp[0] == 0x88 */) {
-			// Remove first byte, 0x88 is not an UID byte, it CT, see page 3 of:
-			// http://www.nxp.com/documents/application_note/AN10927.pdf
-			uid_resp[0] = uid_resp[1];
-			uid_resp[1] = uid_resp[2];
-			uid_resp[2] = uid_resp[3];
-		}
-	}
-	return 1;
+        // Test if more parts of the uid are coming
+        if ((sak & 0x04) /* && uid_resp[0] == 0x88 */) {
+            // Remove first byte, 0x88 is not an UID byte, it CT, see page 3 of:
+            // http://www.nxp.com/documents/application_note/AN10927.pdf
+            uid_resp[0] = uid_resp[1];
+            uid_resp[1] = uid_resp[2];
+            uid_resp[2] = uid_resp[3];
+        }
+    }
+    return 1;
 }
 
 void iso14443a_setup(uint8_t fpga_minor_mode) {
 
-	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-	// Set up the synchronous serial port
-	FpgaSetupSsc();
-	// connect Demodulated Signal to ADC:
-	SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
+    FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
+    // Set up the synchronous serial port
+    FpgaSetupSsc();
+    // connect Demodulated Signal to ADC:
+    SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
 
-	LED_D_OFF();
-	// Signal field is on with the appropriate LED
-	if (fpga_minor_mode == FPGA_HF_ISO14443A_READER_MOD ||
-		fpga_minor_mode == FPGA_HF_ISO14443A_READER_LISTEN)
-		LED_D_ON();
+    LED_D_OFF();
+    // Signal field is on with the appropriate LED
+    if (fpga_minor_mode == FPGA_HF_ISO14443A_READER_MOD ||
+        fpga_minor_mode == FPGA_HF_ISO14443A_READER_LISTEN)
+        LED_D_ON();
 
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | fpga_minor_mode);
-	SpinDelay(100);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | fpga_minor_mode);
+    SpinDelay(100);
 
-	// Start the timer
-	StartCountSspClk();
+    // Start the timer
+    StartCountSspClk();
 
-	// Prepare the demodulation functions
-	DemodReset();
-	UartReset();
-	NextTransferTime = 2 * DELAY_ARM2AIR_AS_READER;
-	iso14a_set_timeout(1060); // 106 * 10ms default
+    // Prepare the demodulation functions
+    DemodReset();
+    UartReset();
+    NextTransferTime = 2 * DELAY_ARM2AIR_AS_READER;
+    iso14a_set_timeout(1060); // 106 * 10ms default
 }
 
 /* Peter Fillmore 2015
@@ -2220,187 +2220,187 @@ b5,b6 = 00 - DESELECT
         11 - WTX
 */
 int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, bool send_chaining, void *data, uint8_t *res) {
-	uint8_t parity[MAX_PARITY_SIZE] = {0x00};
-	uint8_t real_cmd[cmd_len + 4];
+    uint8_t parity[MAX_PARITY_SIZE] = {0x00};
+    uint8_t real_cmd[cmd_len + 4];
 
-	if (cmd_len) {
-		// ISO 14443 APDU frame: PCB [CID] [NAD] APDU CRC PCB=0x02
-		real_cmd[0] = 0x02; // bnr,nad,cid,chn=0; i-block(0x00)
-		if (send_chaining) {
-			real_cmd[0] |= 0x10;
-		}
-		// put block number into the PCB
-		real_cmd[0] |= iso14_pcb_blocknum;
-		memcpy(real_cmd + 1, cmd, cmd_len);
-	} else {
-		// R-block. ACK
-		real_cmd[0] = 0xA2; // r-block + ACK
-		real_cmd[0] |= iso14_pcb_blocknum;
-	}
-	AddCrc14A(real_cmd, cmd_len + 1);
+    if (cmd_len) {
+        // ISO 14443 APDU frame: PCB [CID] [NAD] APDU CRC PCB=0x02
+        real_cmd[0] = 0x02; // bnr,nad,cid,chn=0; i-block(0x00)
+        if (send_chaining) {
+            real_cmd[0] |= 0x10;
+        }
+        // put block number into the PCB
+        real_cmd[0] |= iso14_pcb_blocknum;
+        memcpy(real_cmd + 1, cmd, cmd_len);
+    } else {
+        // R-block. ACK
+        real_cmd[0] = 0xA2; // r-block + ACK
+        real_cmd[0] |= iso14_pcb_blocknum;
+    }
+    AddCrc14A(real_cmd, cmd_len + 1);
 
-	ReaderTransmit(real_cmd, cmd_len + 3, NULL);
+    ReaderTransmit(real_cmd, cmd_len + 3, NULL);
 
-	size_t len = ReaderReceive(data, parity);
-	uint8_t *data_bytes = (uint8_t *) data;
+    size_t len = ReaderReceive(data, parity);
+    uint8_t *data_bytes = (uint8_t *) data;
 
-	if (!len) {
-		return 0; //DATA LINK ERROR
-	} else{
-		// S-Block WTX
-		while(len && ((data_bytes[0] & 0xF2) == 0xF2)) {
-			uint32_t save_iso14a_timeout = iso14a_get_timeout();
-			// temporarily increase timeout
-			iso14a_set_timeout( MAX((data_bytes[1] & 0x3f) * save_iso14a_timeout, MAX_ISO14A_TIMEOUT) );
-			// Transmit WTX back
-			// byte1 - WTXM [1..59]. command FWT=FWT*WTXM
-			data_bytes[1] = data_bytes[1] & 0x3f; // 2 high bits mandatory set to 0b
-			// now need to fix CRC.
-			AddCrc14A(data_bytes, len - 2);
-			// transmit S-Block
-			ReaderTransmit(data_bytes, len, NULL);
-			// retrieve the result again (with increased timeout)
-			len = ReaderReceive(data, parity);
-			data_bytes = data;
-			// restore timeout
-			iso14a_set_timeout(save_iso14a_timeout);
-		}
+    if (!len) {
+        return 0; //DATA LINK ERROR
+    } else{
+        // S-Block WTX
+        while(len && ((data_bytes[0] & 0xF2) == 0xF2)) {
+            uint32_t save_iso14a_timeout = iso14a_get_timeout();
+            // temporarily increase timeout
+            iso14a_set_timeout( MAX((data_bytes[1] & 0x3f) * save_iso14a_timeout, MAX_ISO14A_TIMEOUT) );
+            // Transmit WTX back
+            // byte1 - WTXM [1..59]. command FWT=FWT*WTXM
+            data_bytes[1] = data_bytes[1] & 0x3f; // 2 high bits mandatory set to 0b
+            // now need to fix CRC.
+            AddCrc14A(data_bytes, len - 2);
+            // transmit S-Block
+            ReaderTransmit(data_bytes, len, NULL);
+            // retrieve the result again (with increased timeout)
+            len = ReaderReceive(data, parity);
+            data_bytes = data;
+            // restore timeout
+            iso14a_set_timeout(save_iso14a_timeout);
+        }
 
-		// if we received an I- or R(ACK)-Block with a block number equal to the
-		// current block number, toggle the current block number
-		if (len >= 3 // PCB+CRC = 3 bytes
-	         && ((data_bytes[0] & 0xC0) == 0 // I-Block
-	             || (data_bytes[0] & 0xD0) == 0x80) // R-Block with ACK bit set to 0
-	         && (data_bytes[0] & 0x01) == iso14_pcb_blocknum) // equal block numbers
-		{
-			iso14_pcb_blocknum ^= 1;
-		}
+        // if we received an I- or R(ACK)-Block with a block number equal to the
+        // current block number, toggle the current block number
+        if (len >= 3 // PCB+CRC = 3 bytes
+             && ((data_bytes[0] & 0xC0) == 0 // I-Block
+                 || (data_bytes[0] & 0xD0) == 0x80) // R-Block with ACK bit set to 0
+             && (data_bytes[0] & 0x01) == iso14_pcb_blocknum) // equal block numbers
+        {
+            iso14_pcb_blocknum ^= 1;
+        }
 
-		// if we received I-block with chaining we need to send ACK and receive another block of data
-		if (res)
-			*res = data_bytes[0];
+        // if we received I-block with chaining we need to send ACK and receive another block of data
+        if (res)
+            *res = data_bytes[0];
 
-		// crc check
-		if (len >= 3 && !check_crc(CRC_14443_A, data_bytes, len)) {
-			return -1;
-		}
+        // crc check
+        if (len >= 3 && !check_crc(CRC_14443_A, data_bytes, len)) {
+            return -1;
+        }
 
-	}
+    }
 
-	if (len) {
-		// cut frame byte
-		len -= 1;
-		// memmove(data_bytes, data_bytes + 1, len);
-		for (int i = 0; i < len; i++)
-			data_bytes[i] = data_bytes[i + 1];
-	}
+    if (len) {
+        // cut frame byte
+        len -= 1;
+        // memmove(data_bytes, data_bytes + 1, len);
+        for (int i = 0; i < len; i++)
+            data_bytes[i] = data_bytes[i + 1];
+    }
 
-	return len;
+    return len;
 }
 
 //-----------------------------------------------------------------------------
 // Read an ISO 14443a tag. Send out commands and store answers.
 //-----------------------------------------------------------------------------
-// arg0		 iso_14a flags
-// arg1		 high ::  number of bits, if you want to send 7bits etc
-//			 low  ::  len of commandbytes
-// arg2		 timeout
+// arg0         iso_14a flags
+// arg1         high ::  number of bits, if you want to send 7bits etc
+//             low  ::  len of commandbytes
+// arg2         timeout
 // d.asBytes command bytes to send
 void ReaderIso14443a(UsbCommand *c) {
-	iso14a_command_t param = c->arg[0];
-	size_t len = c->arg[1] & 0xffff;
-	size_t lenbits = c->arg[1] >> 16;
-	uint32_t timeout = c->arg[2];
-	uint8_t *cmd = c->d.asBytes;
-	uint32_t arg0 = 0;
-	uint8_t buf[USB_CMD_DATA_SIZE] = {0x00};
-	uint8_t par[MAX_PARITY_SIZE] = {0x00};
+    iso14a_command_t param = c->arg[0];
+    size_t len = c->arg[1] & 0xffff;
+    size_t lenbits = c->arg[1] >> 16;
+    uint32_t timeout = c->arg[2];
+    uint8_t *cmd = c->d.asBytes;
+    uint32_t arg0 = 0;
+    uint8_t buf[USB_CMD_DATA_SIZE] = {0x00};
+    uint8_t par[MAX_PARITY_SIZE] = {0x00};
 
-	if ((param & ISO14A_CONNECT))
-		clear_trace();
+    if ((param & ISO14A_CONNECT))
+        clear_trace();
 
-	set_tracing(true);
+    set_tracing(true);
 
-	if ((param & ISO14A_REQUEST_TRIGGER))
-		iso14a_set_trigger(true);
+    if ((param & ISO14A_REQUEST_TRIGGER))
+        iso14a_set_trigger(true);
 
-	if ((param & ISO14A_CONNECT)) {
-		iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+    if ((param & ISO14A_CONNECT)) {
+        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
 
-		// notify client selecting status.
-		// if failed selecting, turn off antenna and quite.
-		if( !(param & ISO14A_NO_SELECT) ) {
-			iso14a_card_select_t *card = (iso14a_card_select_t*)buf;
-			arg0 = iso14443a_select_card(NULL, card, NULL, true, 0, param & ISO14A_NO_RATS );
-			cmd_send(CMD_ACK, arg0, card->uidlen, 0, buf, sizeof(iso14a_card_select_t));
-			if ( arg0 == 0 )
-				goto OUT;
-		}
-	}
+        // notify client selecting status.
+        // if failed selecting, turn off antenna and quite.
+        if( !(param & ISO14A_NO_SELECT) ) {
+            iso14a_card_select_t *card = (iso14a_card_select_t*)buf;
+            arg0 = iso14443a_select_card(NULL, card, NULL, true, 0, param & ISO14A_NO_RATS );
+            cmd_send(CMD_ACK, arg0, card->uidlen, 0, buf, sizeof(iso14a_card_select_t));
+            if ( arg0 == 0 )
+                goto OUT;
+        }
+    }
 
-	if ((param & ISO14A_SET_TIMEOUT))
-		iso14a_set_timeout(timeout);
+    if ((param & ISO14A_SET_TIMEOUT))
+        iso14a_set_timeout(timeout);
 
-	if ((param & ISO14A_APDU)) {
-		uint8_t res;
-		arg0 = iso14_apdu(cmd, len, (param & ISO14A_SEND_CHAINING), buf, &res);
-		cmd_send(CMD_ACK, arg0, res, 0, buf, sizeof(buf));
-	}
+    if ((param & ISO14A_APDU)) {
+        uint8_t res;
+        arg0 = iso14_apdu(cmd, len, (param & ISO14A_SEND_CHAINING), buf, &res);
+        cmd_send(CMD_ACK, arg0, res, 0, buf, sizeof(buf));
+    }
 
-	if ((param & ISO14A_RAW)) {
+    if ((param & ISO14A_RAW)) {
 
-		if ((param & ISO14A_APPEND_CRC)) {
-			// Don't append crc on empty bytearray...
-			if ( len > 0 ) {
-				if ((param & ISO14A_TOPAZMODE))
-					AddCrc14B(cmd, len);
-				else
-					AddCrc14A(cmd, len);
+        if ((param & ISO14A_APPEND_CRC)) {
+            // Don't append crc on empty bytearray...
+            if ( len > 0 ) {
+                if ((param & ISO14A_TOPAZMODE))
+                    AddCrc14B(cmd, len);
+                else
+                    AddCrc14A(cmd, len);
 
-				len += 2;
-				if (lenbits) lenbits += 16;
-			}
-		}
+                len += 2;
+                if (lenbits) lenbits += 16;
+            }
+        }
 
-		if (lenbits > 0) {				// want to send a specific number of bits (e.g. short commands)
-			if ((param & ISO14A_TOPAZMODE)) {
-				int bits_to_send = lenbits;
-				uint16_t i = 0;
-				ReaderTransmitBitsPar(&cmd[i++], MIN(bits_to_send, 7), NULL, NULL);		// first byte is always short (7bits) and no parity
-				bits_to_send -= 7;
-				while (bits_to_send > 0) {
-					ReaderTransmitBitsPar(&cmd[i++], MIN(bits_to_send, 8), NULL, NULL);	// following bytes are 8 bit and no parity
-					bits_to_send -= 8;
-				}
-			} else {
-				GetParity(cmd, lenbits/8, par);
-				ReaderTransmitBitsPar(cmd, lenbits, par, NULL);							// bytes are 8 bit with odd parity
-			}
-		} else {					// want to send complete bytes only
-			if ((param & ISO14A_TOPAZMODE)) {
-				uint16_t i = 0;
-				ReaderTransmitBitsPar(&cmd[i++], 7, NULL, NULL);						// first byte: 7 bits, no paritiy
-				while (i < len) {
-					ReaderTransmitBitsPar(&cmd[i++], 8, NULL, NULL);					// following bytes: 8 bits, no paritiy
-				}
-			} else {
-				ReaderTransmit(cmd, len, NULL);											// 8 bits, odd parity
-			}
-		}
-		arg0 = ReaderReceive(buf, par);
-		cmd_send(CMD_ACK, arg0, 0, 0, buf, sizeof(buf));
-	}
+        if (lenbits > 0) {                // want to send a specific number of bits (e.g. short commands)
+            if ((param & ISO14A_TOPAZMODE)) {
+                int bits_to_send = lenbits;
+                uint16_t i = 0;
+                ReaderTransmitBitsPar(&cmd[i++], MIN(bits_to_send, 7), NULL, NULL);     // first byte is always short (7bits) and no parity
+                bits_to_send -= 7;
+                while (bits_to_send > 0) {
+                    ReaderTransmitBitsPar(&cmd[i++], MIN(bits_to_send, 8), NULL, NULL); // following bytes are 8 bit and no parity
+                    bits_to_send -= 8;
+                }
+            } else {
+                GetParity(cmd, lenbits/8, par);
+                ReaderTransmitBitsPar(cmd, lenbits, par, NULL);                         // bytes are 8 bit with odd parity
+            }
+        } else {                    // want to send complete bytes only
+            if ((param & ISO14A_TOPAZMODE)) {
+                uint16_t i = 0;
+                ReaderTransmitBitsPar(&cmd[i++], 7, NULL, NULL);                        // first byte: 7 bits, no paritiy
+                while (i < len) {
+                    ReaderTransmitBitsPar(&cmd[i++], 8, NULL, NULL);                    // following bytes: 8 bits, no paritiy
+                }
+            } else {
+                ReaderTransmit(cmd, len, NULL);                                         // 8 bits, odd parity
+            }
+        }
+        arg0 = ReaderReceive(buf, par);
+        cmd_send(CMD_ACK, arg0, 0, 0, buf, sizeof(buf));
+    }
 
-	if ((param & ISO14A_REQUEST_TRIGGER))
-		iso14a_set_trigger(false);
+    if ((param & ISO14A_REQUEST_TRIGGER))
+        iso14a_set_trigger(false);
 
-	if ((param & ISO14A_NO_DISCONNECT))
-		return;
+    if ((param & ISO14A_NO_DISCONNECT))
+        return;
 
 OUT:
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	set_tracing(false);
-	LEDsoff();
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    set_tracing(false);
+    LEDsoff();
 }
 
 // Determine the distance between two nonces.
@@ -2408,26 +2408,26 @@ OUT:
 // Therefore try in alternating directions.
 int32_t dist_nt(uint32_t nt1, uint32_t nt2) {
 
-	if (nt1 == nt2) return 0;
+    if (nt1 == nt2) return 0;
 
-	uint32_t nttmp1 = nt1;
-	uint32_t nttmp2 = nt2;
+    uint32_t nttmp1 = nt1;
+    uint32_t nttmp2 = nt2;
 
-	for (uint16_t i = 1; i < 32768; i++) {
-		nttmp1 = prng_successor(nttmp1, 1);
-		if (nttmp1 == nt2) return i;
+    for (uint16_t i = 1; i < 32768; i++) {
+        nttmp1 = prng_successor(nttmp1, 1);
+        if (nttmp1 == nt2) return i;
 
-		nttmp2 = prng_successor(nttmp2, 1);
-		if (nttmp2 == nt1) return -i;
-	}
+        nttmp2 = prng_successor(nttmp2, 1);
+        if (nttmp2 == nt1) return -i;
+    }
 
-	return(-99999); // either nt1 or nt2 are invalid nonces
+    return(-99999); // either nt1 or nt2 are invalid nonces
 }
 
 
-#define PRNG_SEQUENCE_LENGTH	(1 << 16)
-#define MAX_UNEXPECTED_RANDOM	4		// maximum number of unexpected (i.e. real) random numbers when trying to sync. Then give up.
-#define MAX_SYNC_TRIES		32
+#define PRNG_SEQUENCE_LENGTH    (1 << 16)
+#define MAX_UNEXPECTED_RANDOM    4        // maximum number of unexpected (i.e. real) random numbers when trying to sync. Then give up.
+#define MAX_SYNC_TRIES        32
 
 //-----------------------------------------------------------------------------
 // Recover several bits of the cypher stream. This implements (first stages of)
@@ -2437,259 +2437,259 @@ int32_t dist_nt(uint32_t nt1, uint32_t nt2) {
 //-----------------------------------------------------------------------------
 void ReaderMifare(bool first_try, uint8_t block, uint8_t keytype ) {
 
-	iso14443a_setup(FPGA_HF_ISO14443A_READER_MOD);
+    iso14443a_setup(FPGA_HF_ISO14443A_READER_MOD);
 
-	BigBuf_free(); BigBuf_Clear_ext(false);
-	clear_trace();
-	set_tracing(true);
+    BigBuf_free(); BigBuf_Clear_ext(false);
+    clear_trace();
+    set_tracing(true);
 
-	uint8_t mf_auth[] 	= { keytype, block, 0x00, 0x00 };
-	uint8_t mf_nr_ar[]	= {0,0,0,0,0,0,0,0};
-	uint8_t uid[10]		= {0,0,0,0,0,0,0,0,0,0};
-	uint8_t par_list[8]	= {0,0,0,0,0,0,0,0};
-	uint8_t ks_list[8]	= {0,0,0,0,0,0,0,0};
-	uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};
-	uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0x00};
-	uint8_t par[1] = {0};	// maximum 8 Bytes to be sent here, 1 byte parity is therefore enough
-	uint8_t nt_diff = 0;
+    uint8_t mf_auth[]     = { keytype, block, 0x00, 0x00 };
+    uint8_t mf_nr_ar[]    = {0,0,0,0,0,0,0,0};
+    uint8_t uid[10]       = {0,0,0,0,0,0,0,0,0,0};
+    uint8_t par_list[8]   = {0,0,0,0,0,0,0,0};
+    uint8_t ks_list[8]    = {0,0,0,0,0,0,0,0};
+    uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};
+    uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0x00};
+    uint8_t par[1] = {0};    // maximum 8 Bytes to be sent here, 1 byte parity is therefore enough
+    uint8_t nt_diff = 0;
 
-	uint32_t nt = 0, previous_nt = 0, cuid = 0;
-	uint32_t sync_time = GetCountSspClk() & 0xfffffff8;
+    uint32_t nt = 0, previous_nt = 0, cuid = 0;
+    uint32_t sync_time = GetCountSspClk() & 0xfffffff8;
 
-	int32_t catch_up_cycles = 0;
-	int32_t last_catch_up = 0;
-	int32_t isOK = 0;
+    int32_t catch_up_cycles = 0;
+    int32_t last_catch_up = 0;
+    int32_t isOK = 0;
 
-	uint16_t elapsed_prng_sequences = 1;
-	uint16_t consecutive_resyncs = 0;
-	uint16_t unexpected_random = 0;
-	uint16_t sync_tries = 0;
+    uint16_t elapsed_prng_sequences = 1;
+    uint16_t consecutive_resyncs = 0;
+    uint16_t unexpected_random = 0;
+    uint16_t sync_tries = 0;
 
-	bool have_uid = false;
-	bool received_nack;
-	uint8_t cascade_levels = 0;
+    bool have_uid = false;
+    bool received_nack;
+    uint8_t cascade_levels = 0;
 
-	// static variables here, is re-used in the next call
-	static uint32_t nt_attacked = 0;
-	static int32_t sync_cycles = 0;
-	static uint8_t par_low = 0;
-	static uint8_t mf_nr_ar3 = 0;
+    // static variables here, is re-used in the next call
+    static uint32_t nt_attacked = 0;
+    static int32_t sync_cycles = 0;
+    static uint8_t par_low = 0;
+    static uint8_t mf_nr_ar3 = 0;
 
-	AddCrc14A(mf_auth, 2);
+    AddCrc14A(mf_auth, 2);
 
-	if (first_try) {
-		sync_cycles = PRNG_SEQUENCE_LENGTH; // Mifare Classic's random generator repeats every 2^16 cycles (and so do the nonces).
-		nt_attacked = 0;
-		mf_nr_ar3 = 0;
-		par_low = 0;
-	} else {
-		// we were unsuccessful on a previous call.
-		// Try another READER nonce (first 3 parity bits remain the same)
-		mf_nr_ar3++;
-		mf_nr_ar[3] = mf_nr_ar3;
-		par[0] = par_low;
-	}
+    if (first_try) {
+        sync_cycles = PRNG_SEQUENCE_LENGTH; // Mifare Classic's random generator repeats every 2^16 cycles (and so do the nonces).
+        nt_attacked = 0;
+        mf_nr_ar3 = 0;
+        par_low = 0;
+    } else {
+        // we were unsuccessful on a previous call.
+        // Try another READER nonce (first 3 parity bits remain the same)
+        mf_nr_ar3++;
+        mf_nr_ar[3] = mf_nr_ar3;
+        par[0] = par_low;
+    }
 
-	LED_C_ON();
-	uint16_t i;
-	for (i = 0; true; ++i) {
+    LED_C_ON();
+    uint16_t i;
+    for (i = 0; true; ++i) {
 
-		received_nack = false;
+        received_nack = false;
 
-		WDT_HIT();
+        WDT_HIT();
 
-		// Test if the action was cancelled
-		if (BUTTON_PRESS()) {
-			isOK = -1;
-			break;
-		}
+        // Test if the action was cancelled
+        if (BUTTON_PRESS()) {
+            isOK = -1;
+            break;
+        }
 
-		// this part is from Piwi's faster nonce collecting part in Hardnested.
-		if (!have_uid) { // need a full select cycle to get the uid first
-			iso14a_card_select_t card_info;
-			if (!iso14443a_select_card(uid, &card_info, &cuid, true, 0, true)) {
-				if (MF_DBGLEVEL >= 1)	Dbprintf("Mifare: Can't select card (ALL)");
-				continue;
-			}
-			switch (card_info.uidlen) {
-				case 4 : cascade_levels = 1; break;
-				case 7 : cascade_levels = 2; break;
-				case 10: cascade_levels = 3; break;
-				default: break;
-			}
-			have_uid = true;
-		} else { // no need for anticollision. We can directly select the card
-			if (!iso14443a_fast_select_card(uid, cascade_levels)) {
-				if (MF_DBGLEVEL >= 1)	Dbprintf("Mifare: Can't select card (UID)");
-				continue;
-			}
-		}
+        // this part is from Piwi's faster nonce collecting part in Hardnested.
+        if (!have_uid) { // need a full select cycle to get the uid first
+            iso14a_card_select_t card_info;
+            if (!iso14443a_select_card(uid, &card_info, &cuid, true, 0, true)) {
+                if (MF_DBGLEVEL >= 1)    Dbprintf("Mifare: Can't select card (ALL)");
+                continue;
+            }
+            switch (card_info.uidlen) {
+                case 4 : cascade_levels = 1; break;
+                case 7 : cascade_levels = 2; break;
+                case 10: cascade_levels = 3; break;
+                default: break;
+            }
+            have_uid = true;
+        } else { // no need for anticollision. We can directly select the card
+            if (!iso14443a_fast_select_card(uid, cascade_levels)) {
+                if (MF_DBGLEVEL >= 1)    Dbprintf("Mifare: Can't select card (UID)");
+                continue;
+            }
+        }
 
-		elapsed_prng_sequences = 1;
+        elapsed_prng_sequences = 1;
 
-		// Sending timeslot of ISO14443a frame
-		sync_time = (sync_time & 0xfffffff8 ) + sync_cycles + catch_up_cycles;
-		catch_up_cycles = 0;
+        // Sending timeslot of ISO14443a frame
+        sync_time = (sync_time & 0xfffffff8 ) + sync_cycles + catch_up_cycles;
+        catch_up_cycles = 0;
 
-		#define SYNC_TIME_BUFFER		16		// if there is only SYNC_TIME_BUFFER left before next planned sync, wait for next PRNG cycle
+        #define SYNC_TIME_BUFFER        16        // if there is only SYNC_TIME_BUFFER left before next planned sync, wait for next PRNG cycle
 
-		// if we missed the sync time already or are about to miss it, advance to the next nonce repeat
-		while ( sync_time < GetCountSspClk() + SYNC_TIME_BUFFER) {
-			++elapsed_prng_sequences;
-			sync_time = (sync_time & 0xfffffff8 ) + sync_cycles;
-		}
+        // if we missed the sync time already or are about to miss it, advance to the next nonce repeat
+        while ( sync_time < GetCountSspClk() + SYNC_TIME_BUFFER) {
+            ++elapsed_prng_sequences;
+            sync_time = (sync_time & 0xfffffff8 ) + sync_cycles;
+        }
 
-		// Transmit MIFARE_CLASSIC_AUTH at synctime. Should result in returning the same tag nonce (== nt_attacked)
-		ReaderTransmit(mf_auth, sizeof(mf_auth), &sync_time);
+        // Transmit MIFARE_CLASSIC_AUTH at synctime. Should result in returning the same tag nonce (== nt_attacked)
+        ReaderTransmit(mf_auth, sizeof(mf_auth), &sync_time);
 
-		// Receive the (4 Byte) "random" TAG nonce
-		if (!ReaderReceive(receivedAnswer, receivedAnswerPar))
-			continue;
+        // Receive the (4 Byte) "random" TAG nonce
+        if (!ReaderReceive(receivedAnswer, receivedAnswerPar))
+            continue;
 
-		previous_nt = nt;
-		nt = bytes_to_num(receivedAnswer, 4);
+        previous_nt = nt;
+        nt = bytes_to_num(receivedAnswer, 4);
 
-		// Transmit reader nonce with fake par
-		ReaderTransmitPar(mf_nr_ar, sizeof(mf_nr_ar), par, NULL);
+        // Transmit reader nonce with fake par
+        ReaderTransmitPar(mf_nr_ar, sizeof(mf_nr_ar), par, NULL);
 
-		// Receive answer. This will be a 4 Bit NACK when the 8 parity bits are OK after decoding
-		if (ReaderReceive(receivedAnswer, receivedAnswerPar))
-			received_nack = true;
+        // Receive answer. This will be a 4 Bit NACK when the 8 parity bits are OK after decoding
+        if (ReaderReceive(receivedAnswer, receivedAnswerPar))
+            received_nack = true;
 
-		// we didn't calibrate our clock yet,
-		// iceman: has to be calibrated every time.
-		if (previous_nt && !nt_attacked) {
+        // we didn't calibrate our clock yet,
+        // iceman: has to be calibrated every time.
+        if (previous_nt && !nt_attacked) {
 
-			int nt_distance = dist_nt(previous_nt, nt);
+            int nt_distance = dist_nt(previous_nt, nt);
 
-			// if no distance between,  then we are in sync.
-			if (nt_distance == 0) {
-				nt_attacked = nt;
-			} else {
-				if (nt_distance == -99999) { // invalid nonce received
-					unexpected_random++;
-					if (unexpected_random > MAX_UNEXPECTED_RANDOM) {
-						isOK = -3;		// Card has an unpredictable PRNG. Give up
-						break;
-					} else {
-						continue;		// continue trying...
-					}
-				}
+            // if no distance between,  then we are in sync.
+            if (nt_distance == 0) {
+                nt_attacked = nt;
+            } else {
+                if (nt_distance == -99999) { // invalid nonce received
+                    unexpected_random++;
+                    if (unexpected_random > MAX_UNEXPECTED_RANDOM) {
+                        isOK = -3;        // Card has an unpredictable PRNG. Give up
+                        break;
+                    } else {
+                        continue;        // continue trying...
+                    }
+                }
 
-				if (++sync_tries > MAX_SYNC_TRIES) {
-					isOK = -4; 			// Card's PRNG runs at an unexpected frequency or resets unexpectedly
-					break;
-				}
+                if (++sync_tries > MAX_SYNC_TRIES) {
+                    isOK = -4;             // Card's PRNG runs at an unexpected frequency or resets unexpectedly
+                    break;
+                }
 
-				sync_cycles = (sync_cycles - nt_distance)/elapsed_prng_sequences;
+                sync_cycles = (sync_cycles - nt_distance)/elapsed_prng_sequences;
 
-				// no negative sync_cycles
-				if (sync_cycles <= 0) sync_cycles += PRNG_SEQUENCE_LENGTH;
+                // no negative sync_cycles
+                if (sync_cycles <= 0) sync_cycles += PRNG_SEQUENCE_LENGTH;
 
-				// reset sync_cycles
-				if (sync_cycles > PRNG_SEQUENCE_LENGTH * 2 ) {
-					sync_cycles = PRNG_SEQUENCE_LENGTH;
-					sync_time = GetCountSspClk() & 0xfffffff8;
-				}
+                // reset sync_cycles
+                if (sync_cycles > PRNG_SEQUENCE_LENGTH * 2 ) {
+                    sync_cycles = PRNG_SEQUENCE_LENGTH;
+                    sync_time = GetCountSspClk() & 0xfffffff8;
+                }
 
-				if (MF_DBGLEVEL >= 4)
-					Dbprintf("calibrating in cycle %d. nt_distance=%d, elapsed_prng_sequences=%d, new sync_cycles: %d\n", i, nt_distance, elapsed_prng_sequences, sync_cycles);
+                if (MF_DBGLEVEL >= 4)
+                    Dbprintf("calibrating in cycle %d. nt_distance=%d, elapsed_prng_sequences=%d, new sync_cycles: %d\n", i, nt_distance, elapsed_prng_sequences, sync_cycles);
 
-				LED_B_OFF();
-				continue;
-			}
-		}
-		LED_B_OFF();
+                LED_B_OFF();
+                continue;
+            }
+        }
+        LED_B_OFF();
 
-		if ( (nt != nt_attacked) && nt_attacked) { 	// we somehow lost sync. Try to catch up again...
+        if ( (nt != nt_attacked) && nt_attacked) {     // we somehow lost sync. Try to catch up again...
 
-			catch_up_cycles = -dist_nt(nt_attacked, nt);
-			if (catch_up_cycles == 99999) {			// invalid nonce received. Don't resync on that one.
-				catch_up_cycles = 0;
-				continue;
-			}
-			// average?
-			catch_up_cycles /= elapsed_prng_sequences;
+            catch_up_cycles = -dist_nt(nt_attacked, nt);
+            if (catch_up_cycles == 99999) {            // invalid nonce received. Don't resync on that one.
+                catch_up_cycles = 0;
+                continue;
+            }
+            // average?
+            catch_up_cycles /= elapsed_prng_sequences;
 
-			if (catch_up_cycles == last_catch_up) {
-				consecutive_resyncs++;
-			} else {
-				last_catch_up = catch_up_cycles;
-			    consecutive_resyncs = 0;
-			}
+            if (catch_up_cycles == last_catch_up) {
+                consecutive_resyncs++;
+            } else {
+                last_catch_up = catch_up_cycles;
+                consecutive_resyncs = 0;
+            }
 
-			if (consecutive_resyncs < 3) {
-				if (MF_DBGLEVEL >= 4) {
-					Dbprintf("Lost sync in cycle %d. nt_distance=%d. Consecutive Resyncs = %d. Trying one time catch up...\n", i, catch_up_cycles, consecutive_resyncs);
-				}
-			} else {
-				sync_cycles += catch_up_cycles;
+            if (consecutive_resyncs < 3) {
+                if (MF_DBGLEVEL >= 4) {
+                    Dbprintf("Lost sync in cycle %d. nt_distance=%d. Consecutive Resyncs = %d. Trying one time catch up...\n", i, catch_up_cycles, consecutive_resyncs);
+                }
+            } else {
+                sync_cycles += catch_up_cycles;
 
-				if (MF_DBGLEVEL >= 4)
-					Dbprintf("Lost sync in cycle %d for the fourth time consecutively (nt_distance = %d). Adjusting sync_cycles to %d.\n", i, catch_up_cycles, sync_cycles);
+                if (MF_DBGLEVEL >= 4)
+                    Dbprintf("Lost sync in cycle %d for the fourth time consecutively (nt_distance = %d). Adjusting sync_cycles to %d.\n", i, catch_up_cycles, sync_cycles);
 
-				last_catch_up = 0;
-				catch_up_cycles = 0;
-				consecutive_resyncs = 0;
-			}
-			continue;
-		}
+                last_catch_up = 0;
+                catch_up_cycles = 0;
+                consecutive_resyncs = 0;
+            }
+            continue;
+        }
 
-		// Receive answer. This will be a 4 Bit NACK when the 8 parity bits are OK after decoding
-		if (received_nack) {
-			catch_up_cycles = 8; 	// the PRNG is delayed by 8 cycles due to the NAC (4Bits = 0x05 encrypted) transfer
+        // Receive answer. This will be a 4 Bit NACK when the 8 parity bits are OK after decoding
+        if (received_nack) {
+            catch_up_cycles = 8;     // the PRNG is delayed by 8 cycles due to the NAC (4Bits = 0x05 encrypted) transfer
 
-			if (nt_diff == 0)
-				par_low = par[0] & 0xE0; // there is no need to check all parities for other nt_diff. Parity Bits for mf_nr_ar[0..2] won't change
+            if (nt_diff == 0)
+                par_low = par[0] & 0xE0; // there is no need to check all parities for other nt_diff. Parity Bits for mf_nr_ar[0..2] won't change
 
-			par_list[nt_diff] = reflect8(par[0]);
-			ks_list[nt_diff] = receivedAnswer[0] ^ 0x05;  // xor with NACK value to get keystream
+            par_list[nt_diff] = reflect8(par[0]);
+            ks_list[nt_diff] = receivedAnswer[0] ^ 0x05;  // xor with NACK value to get keystream
 
-			// Test if the information is complete
-			if (nt_diff == 0x07) {
-				isOK = 1;
-				break;
-			}
+            // Test if the information is complete
+            if (nt_diff == 0x07) {
+                isOK = 1;
+                break;
+            }
 
-			nt_diff = (nt_diff + 1) & 0x07;
-			mf_nr_ar[3] = (mf_nr_ar[3] & 0x1F) | (nt_diff << 5);
-			par[0] = par_low;
+            nt_diff = (nt_diff + 1) & 0x07;
+            mf_nr_ar[3] = (mf_nr_ar[3] & 0x1F) | (nt_diff << 5);
+            par[0] = par_low;
 
-		} else {
-			// No NACK.
-			if (nt_diff == 0 && first_try) {
-				par[0]++;
-				if (par[0] == 0) {	// tried all 256 possible parities without success. Card doesn't send NACK.
-					isOK = -2;
-					break;
-				}
-			} else {
-				// Why this?
-				par[0] = ((par[0] & 0x1F) + 1) | par_low;
-			}
-		}
+        } else {
+            // No NACK.
+            if (nt_diff == 0 && first_try) {
+                par[0]++;
+                if (par[0] == 0) {    // tried all 256 possible parities without success. Card doesn't send NACK.
+                    isOK = -2;
+                    break;
+                }
+            } else {
+                // Why this?
+                par[0] = ((par[0] & 0x1F) + 1) | par_low;
+            }
+        }
 
-		// reset the resyncs since we got a complete transaction on right time.
-		consecutive_resyncs = 0;
-	} // end for loop
+        // reset the resyncs since we got a complete transaction on right time.
+        consecutive_resyncs = 0;
+    } // end for loop
 
-	mf_nr_ar[3] &= 0x1F;
+    mf_nr_ar[3] &= 0x1F;
 
-	if (MF_DBGLEVEL >= 4) Dbprintf("Number of sent auth requestes: %u", i);
+    if (MF_DBGLEVEL >= 4) Dbprintf("Number of sent auth requestes: %u", i);
 
-	uint8_t buf[32] = {0x00};
-	memset(buf, 0x00, sizeof(buf));
-	num_to_bytes(cuid, 4, buf);
-	num_to_bytes(nt, 4, buf + 4);
-	memcpy(buf + 8,  par_list, 8);
-	memcpy(buf + 16, ks_list, 8);
-	memcpy(buf + 24, mf_nr_ar, 8);
+    uint8_t buf[32] = {0x00};
+    memset(buf, 0x00, sizeof(buf));
+    num_to_bytes(cuid, 4, buf);
+    num_to_bytes(nt, 4, buf + 4);
+    memcpy(buf + 8,  par_list, 8);
+    memcpy(buf + 16, ks_list, 8);
+    memcpy(buf + 24, mf_nr_ar, 8);
 
-	cmd_send(CMD_ACK, isOK, 0, 0, buf, sizeof(buf) );
+    cmd_send(CMD_ACK, isOK, 0, 0, buf, sizeof(buf) );
 
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	LEDsoff();
-	set_tracing(false);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    LEDsoff();
+    set_tracing(false);
 }
 
 /*
@@ -2697,819 +2697,820 @@ void ReaderMifare(bool first_try, uint8_t block, uint8_t keytype ) {
 *  Thanks to @doegox for the feedback and new approaches.
 */
 void DetectNACKbug() {
-	uint8_t mf_auth[] 	= {0x60, 0x00, 0xF5, 0x7B};
-	uint8_t mf_nr_ar[]	= {0,0,0,0,0,0,0,0};
-	uint8_t uid[10]		= {0,0,0,0,0,0,0,0,0,0};
-	uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};
-	uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0x00};
-	uint8_t par[1] = {0};	// maximum 8 Bytes to be sent here, 1 byte parity is therefore enough
+    uint8_t mf_auth[]     = {0x60, 0x00, 0xF5, 0x7B};
+    uint8_t mf_nr_ar[]    = {0,0,0,0,0,0,0,0};
+    uint8_t uid[10]       = {0,0,0,0,0,0,0,0,0,0};
+    uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};
+    uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0x00};
+    uint8_t par[1] = {0};    // maximum 8 Bytes to be sent here, 1 byte parity is therefore enough
 
-	uint32_t nt = 0, previous_nt = 0, nt_attacked = 0, cuid = 0;
-	int32_t isOK = 0, catch_up_cycles = 0, last_catch_up = 0;
-	uint8_t cascade_levels = 0, num_nacks = 0;
-	uint16_t elapsed_prng_sequences = 1;
-	uint16_t consecutive_resyncs = 0;
-	uint16_t unexpected_random = 0;
-	uint16_t sync_tries = 0;
-	uint32_t sync_time = 0;
-	bool have_uid = false;
-	bool received_nack;
+    uint32_t nt = 0, previous_nt = 0, nt_attacked = 0, cuid = 0;
+    int32_t isOK = 0, catch_up_cycles = 0, last_catch_up = 0;
+    uint8_t cascade_levels = 0, num_nacks = 0;
+    uint16_t elapsed_prng_sequences = 1;
+    uint16_t consecutive_resyncs = 0;
+    uint16_t unexpected_random = 0;
+    uint16_t sync_tries = 0;
+    uint32_t sync_time = 0;
+    bool have_uid = false;
+    bool received_nack;
 
-	// Mifare Classic's random generator repeats every 2^16 cycles (and so do the nonces).
-	uint32_t sync_cycles = PRNG_SEQUENCE_LENGTH;
+    // Mifare Classic's random generator repeats every 2^16 cycles (and so do the nonces).
+    uint32_t sync_cycles = PRNG_SEQUENCE_LENGTH;
 
-	BigBuf_free(); BigBuf_Clear_ext(false);
-	clear_trace();
-	set_tracing(true);
-	iso14443a_setup(FPGA_HF_ISO14443A_READER_MOD);
+    BigBuf_free(); BigBuf_Clear_ext(false);
+    clear_trace();
+    set_tracing(true);
+    iso14443a_setup(FPGA_HF_ISO14443A_READER_MOD);
 
-	sync_time = GetCountSspClk() & 0xfffffff8;
+    sync_time = GetCountSspClk() & 0xfffffff8;
 
-	LED_C_ON();
-	uint16_t i;
-	for (i = 1; true; ++i) {
+    LED_C_ON();
+    uint16_t i;
+    for (i = 1; true; ++i) {
 
-		received_nack = false;
+        received_nack = false;
 
-		// Cards always leaks a NACK, no matter the parity
-		if ((i==10) && (num_nacks == i-1)) {
-			isOK = 2;
-			break;
-		}
+        // Cards always leaks a NACK, no matter the parity
+        if ((i==10) && (num_nacks == i-1)) {
+            isOK = 2;
+            break;
+        }
 
-		WDT_HIT();
+        WDT_HIT();
 
-		// Test if the action was cancelled
-		if (BUTTON_PRESS()) {
-			isOK = 99;
-			break;
-		}
+        // Test if the action was cancelled
+        if (BUTTON_PRESS()) {
+            isOK = 99;
+            break;
+        }
 
-		// this part is from Piwi's faster nonce collecting part in Hardnested.
-		if (!have_uid) { // need a full select cycle to get the uid first
-			iso14a_card_select_t card_info;
-			if (!iso14443a_select_card(uid, &card_info, &cuid, true, 0, true)) {
-				if (MF_DBGLEVEL >= 1)	Dbprintf("Mifare: Can't select card (ALL)");
-				continue;
-			}
-			switch (card_info.uidlen) {
-				case 4 : cascade_levels = 1; break;
-				case 7 : cascade_levels = 2; break;
-				case 10: cascade_levels = 3; break;
-				default: break;
-			}
-			have_uid = true;
-		} else { // no need for anticollision. We can directly select the card
-			if (!iso14443a_fast_select_card(uid, cascade_levels)) {
-				if (MF_DBGLEVEL >= 1)	Dbprintf("Mifare: Can't select card (UID)");
-				continue;
-			}
-		}
+        // this part is from Piwi's faster nonce collecting part in Hardnested.
+        if (!have_uid) { // need a full select cycle to get the uid first
+            iso14a_card_select_t card_info;
+            if (!iso14443a_select_card(uid, &card_info, &cuid, true, 0, true)) {
+                if (MF_DBGLEVEL >= 1)    Dbprintf("Mifare: Can't select card (ALL)");
+                continue;
+            }
+            switch (card_info.uidlen) {
+                case 4 : cascade_levels = 1; break;
+                case 7 : cascade_levels = 2; break;
+                case 10: cascade_levels = 3; break;
+                default: break;
+            }
+            have_uid = true;
+        } else { // no need for anticollision. We can directly select the card
+            if (!iso14443a_fast_select_card(uid, cascade_levels)) {
+                if (MF_DBGLEVEL >= 1)    Dbprintf("Mifare: Can't select card (UID)");
+                continue;
+            }
+        }
 
-		elapsed_prng_sequences = 1;
+        elapsed_prng_sequences = 1;
 
-		// Sending timeslot of ISO14443a frame
-		sync_time = (sync_time & 0xfffffff8 ) + sync_cycles + catch_up_cycles;
-		catch_up_cycles = 0;
+        // Sending timeslot of ISO14443a frame
+        sync_time = (sync_time & 0xfffffff8 ) + sync_cycles + catch_up_cycles;
+        catch_up_cycles = 0;
 
-		// if we missed the sync time already, advance to the next nonce repeat
-		while ( GetCountSspClk() > sync_time) {
-			++elapsed_prng_sequences;
-			sync_time = (sync_time & 0xfffffff8 ) + sync_cycles;
-		}
+        // if we missed the sync time already, advance to the next nonce repeat
+        while ( GetCountSspClk() > sync_time) {
+            ++elapsed_prng_sequences;
+            sync_time = (sync_time & 0xfffffff8 ) + sync_cycles;
+        }
 
-		// Transmit MIFARE_CLASSIC_AUTH at synctime. Should result in returning the same tag nonce (== nt_attacked)
-		ReaderTransmit(mf_auth, sizeof(mf_auth), &sync_time);
+        // Transmit MIFARE_CLASSIC_AUTH at synctime. Should result in returning the same tag nonce (== nt_attacked)
+        ReaderTransmit(mf_auth, sizeof(mf_auth), &sync_time);
 
-		// Receive the (4 Byte) "random" TAG nonce
-		if (!ReaderReceive(receivedAnswer, receivedAnswerPar))
-			continue;
+        // Receive the (4 Byte) "random" TAG nonce
+        if (!ReaderReceive(receivedAnswer, receivedAnswerPar))
+            continue;
 
-		previous_nt = nt;
-		nt = bytes_to_num(receivedAnswer, 4);
+        previous_nt = nt;
+        nt = bytes_to_num(receivedAnswer, 4);
 
-		// Transmit reader nonce with fake par
-		ReaderTransmitPar(mf_nr_ar, sizeof(mf_nr_ar), par, NULL);
+        // Transmit reader nonce with fake par
+        ReaderTransmitPar(mf_nr_ar, sizeof(mf_nr_ar), par, NULL);
 
-		if (ReaderReceive(receivedAnswer, receivedAnswerPar)) {
-			received_nack = true;
-			num_nacks++;
-			// ALWAYS leak Detection.
-			if ( i == num_nacks ) {
-				continue;
-			}
-		}
+        if (ReaderReceive(receivedAnswer, receivedAnswerPar)) {
+            received_nack = true;
+            num_nacks++;
+            // ALWAYS leak Detection.
+            if ( i == num_nacks ) {
+                continue;
+            }
+        }
 
-		// we didn't calibrate our clock yet,
-		// iceman: has to be calibrated every time.
-		if (previous_nt && !nt_attacked) {
+        // we didn't calibrate our clock yet,
+        // iceman: has to be calibrated every time.
+        if (previous_nt && !nt_attacked) {
 
-			int nt_distance = dist_nt(previous_nt, nt);
+            int nt_distance = dist_nt(previous_nt, nt);
 
-			// if no distance between,  then we are in sync.
-			if (nt_distance == 0) {
-				nt_attacked = nt;
-			} else {
-				if (nt_distance == -99999) { // invalid nonce received
-					unexpected_random++;
-					if (unexpected_random > MAX_UNEXPECTED_RANDOM ) {
-						// Card has an unpredictable PRNG. Give up
-						isOK = 98;
-						break;
-					} else {
-						if (sync_cycles <= 0) {
-							sync_cycles += PRNG_SEQUENCE_LENGTH;
-						}
-						continue;
-					}
-				}
+            // if no distance between,  then we are in sync.
+            if (nt_distance == 0) {
+                nt_attacked = nt;
+            } else {
+                if (nt_distance == -99999) { // invalid nonce received
+                    unexpected_random++;
+                    if (unexpected_random > MAX_UNEXPECTED_RANDOM ) {
+                        // Card has an unpredictable PRNG. Give up
+                        isOK = 98;
+                        break;
+                    } else {
+                        if (sync_cycles <= 0) {
+                            sync_cycles += PRNG_SEQUENCE_LENGTH;
+                        }
+                        continue;
+                    }
+                }
 
-				if (++sync_tries > MAX_SYNC_TRIES) {
-					isOK = 97; 			// Card's PRNG runs at an unexpected frequency or resets unexpectedly
-					break;
-				}
+                if (++sync_tries > MAX_SYNC_TRIES) {
+                    isOK = 97;             // Card's PRNG runs at an unexpected frequency or resets unexpectedly
+                    break;
+                }
 
-				sync_cycles = (sync_cycles - nt_distance)/elapsed_prng_sequences;
+                sync_cycles = (sync_cycles - nt_distance)/elapsed_prng_sequences;
 
-				if (sync_cycles <= 0)
-					sync_cycles += PRNG_SEQUENCE_LENGTH;
+                if (sync_cycles <= 0)
+                    sync_cycles += PRNG_SEQUENCE_LENGTH;
 
-				if (sync_cycles > PRNG_SEQUENCE_LENGTH * 2 ) {
-					isOK = 96; 			// Card's PRNG runs at an unexpected frequency or resets unexpectedly
-					break;
-				}
+                if (sync_cycles > PRNG_SEQUENCE_LENGTH * 2 ) {
+                    isOK = 96;             // Card's PRNG runs at an unexpected frequency or resets unexpectedly
+                    break;
+                }
 
-				if (MF_DBGLEVEL >= 4)
-					Dbprintf("calibrating in cycle %d. nt_distance=%d, elapsed_prng_sequences=%d, new sync_cycles: %d\n", i, nt_distance, elapsed_prng_sequences, sync_cycles);
+                if (MF_DBGLEVEL >= 4)
+                    Dbprintf("calibrating in cycle %d. nt_distance=%d, elapsed_prng_sequences=%d, new sync_cycles: %d\n", i, nt_distance, elapsed_prng_sequences, sync_cycles);
 
-				continue;
-			}
-		}
+                continue;
+            }
+        }
 
-		if ( (nt != nt_attacked) && nt_attacked) {
-			// we somehow lost sync. Try to catch up again...
-			catch_up_cycles = -dist_nt(nt_attacked, nt);
+        if ( (nt != nt_attacked) && nt_attacked) {
+            // we somehow lost sync. Try to catch up again...
+            catch_up_cycles = -dist_nt(nt_attacked, nt);
 
-			if (catch_up_cycles == 99999) {
-				// invalid nonce received. Don't resync on that one.
-				catch_up_cycles = 0;
-				continue;
-			}
-			// average?
-			catch_up_cycles /= elapsed_prng_sequences;
+            if (catch_up_cycles == 99999) {
+                // invalid nonce received. Don't resync on that one.
+                catch_up_cycles = 0;
+                continue;
+            }
+            // average?
+            catch_up_cycles /= elapsed_prng_sequences;
 
-			if (catch_up_cycles == last_catch_up) {
-				consecutive_resyncs++;
-			} else {
-				last_catch_up = catch_up_cycles;
-			    consecutive_resyncs = 0;
-			}
+            if (catch_up_cycles == last_catch_up) {
+                consecutive_resyncs++;
+            } else {
+                last_catch_up = catch_up_cycles;
+                consecutive_resyncs = 0;
+            }
 
-			if (consecutive_resyncs < 3) {
-				if (MF_DBGLEVEL >= 4) {
-					Dbprintf("Lost sync in cycle %d. nt_distance=%d. Consecutive Resyncs = %d. Trying one time catch up...\n", i, catch_up_cycles, consecutive_resyncs);
-				}
-			} else {
-				sync_cycles += catch_up_cycles;
+            if (consecutive_resyncs < 3) {
+                if (MF_DBGLEVEL >= 4) {
+                    Dbprintf("Lost sync in cycle %d. nt_distance=%d. Consecutive Resyncs = %d. Trying one time catch up...\n", i, catch_up_cycles, consecutive_resyncs);
+                }
+            } else {
+                sync_cycles += catch_up_cycles;
 
-				if (MF_DBGLEVEL >= 4) {
-					Dbprintf("Lost sync in cycle %d for the fourth time consecutively (nt_distance = %d). Adjusting sync_cycles to %d.\n", i, catch_up_cycles, sync_cycles);
-					Dbprintf("nt [%08x] attacted [%08x]", nt, nt_attacked );
-				}
-				last_catch_up = 0;
-				catch_up_cycles = 0;
-				consecutive_resyncs = 0;
-			}
-			continue;
-		}
+                if (MF_DBGLEVEL >= 4) {
+                    Dbprintf("Lost sync in cycle %d for the fourth time consecutively (nt_distance = %d). Adjusting sync_cycles to %d.\n", i, catch_up_cycles, sync_cycles);
+                    Dbprintf("nt [%08x] attacted [%08x]", nt, nt_attacked );
+                }
+                last_catch_up = 0;
+                catch_up_cycles = 0;
+                consecutive_resyncs = 0;
+            }
+            continue;
+        }
 
-		// Receive answer. This will be a 4 Bit NACK when the 8 parity bits are OK after decoding
-		if (received_nack)
-			catch_up_cycles = 8; 	// the PRNG is delayed by 8 cycles due to the NAC (4Bits = 0x05 encrypted) transfer
+        // Receive answer. This will be a 4 Bit NACK when the 8 parity bits are OK after decoding
+        if (received_nack)
+            catch_up_cycles = 8;     // the PRNG is delayed by 8 cycles due to the NAC (4Bits = 0x05 encrypted) transfer
 
-		// we are testing all 256 possibilities.
-		par[0]++;
+        // we are testing all 256 possibilities.
+        par[0]++;
 
-		// tried all 256 possible parities without success.
-		if (par[0] == 0) {
-			if ( num_nacks == 1 )
-				isOK = 1;
-			break;
-		}
+        // tried all 256 possible parities without success.
+        if (par[0] == 0) {
+            if ( num_nacks == 1 )
+                isOK = 1;
+            break;
+        }
 
-		// reset the resyncs since we got a complete transaction on right time.
-		consecutive_resyncs = 0;
-	} // end for loop
+        // reset the resyncs since we got a complete transaction on right time.
+        consecutive_resyncs = 0;
+    } // end for loop
 
-	// num_nacks = number of nacks recieved. should be only 1. if not its a clone card which always sends NACK (parity == 0) ?
-	// i  =  number of authentications sent.  Not always 256, since we are trying to sync but close to it.
-	cmd_send(CMD_ACK, isOK, num_nacks, i, 0, 0 );
+    // num_nacks = number of nacks recieved. should be only 1. if not its a clone card which always sends NACK (parity == 0) ?
+    // i  =  number of authentications sent.  Not always 256, since we are trying to sync but close to it.
+    cmd_send(CMD_ACK, isOK, num_nacks, i, 0, 0 );
 
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	LEDsoff();
-	set_tracing(false);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    LEDsoff();
+    set_tracing(false);
 }
 
 /**
   *MIFARE 1K simulate.
   *
   *@param flags :
-  *	FLAG_INTERACTIVE		- In interactive mode, we are expected to finish the operation with an ACK
-  * FLAG_4B_UID_IN_DATA		- use 4-byte UID in the data-section
-  * FLAG_7B_UID_IN_DATA		- use 7-byte UID in the data-section
-  * FLAG_10B_UID_IN_DATA	- use 10-byte UID in the data-section
-  * FLAG_UID_IN_EMUL 		- use 4-byte UID from emulator memory
-  *	FLAG_NR_AR_ATTACK  		- collect NR_AR responses for bruteforcing later
+  * FLAG_INTERACTIVE           - In interactive mode, we are expected to finish the operation with an ACK
+  * FLAG_4B_UID_IN_DATA        - use 4-byte UID in the data-section
+  * FLAG_7B_UID_IN_DATA        - use 7-byte UID in the data-section
+  * FLAG_10B_UID_IN_DATA       - use 10-byte UID in the data-section
+  * FLAG_UID_IN_EMUL           - use 4-byte UID from emulator memory
+  * FLAG_NR_AR_ATTACK          - collect NR_AR responses for bruteforcing later
   *@param exitAfterNReads, exit simulation after n blocks have been read, 0 is inifite
 * (unless reader attack mode enabled then it runs util it gets enough nonces to recover all keys attmpted)
   */
 void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *datain) {
 
-	int cardSTATE = MFEMUL_NOFIELD;
-	int _UID_LEN = 0;  // 4, 7, 10
-	int vHf = 0;	// in mV
-	int res = 0;
-	uint32_t selTimer = 0;
-	uint32_t authTimer = 0;
-	uint16_t len = 0;
-	uint8_t cardWRBL = 0;
-	uint8_t cardAUTHSC = 0;
-	uint8_t cardAUTHKEY = 0xff;  // no authentication
-	uint32_t cuid = 0;
-	uint32_t ans = 0;
-	uint32_t cardINTREG = 0;
-	uint8_t cardINTBLOCK = 0;
-	struct Crypto1State mpcs = {0, 0};
-	struct Crypto1State *pcs;
-	pcs = &mpcs;
-	uint32_t numReads = 0;	// Counts numer of times reader read a block
-	uint8_t receivedCmd[MAX_MIFARE_FRAME_SIZE] = {0x00};
-	uint8_t receivedCmd_par[MAX_MIFARE_PARITY_SIZE] = {0x00};
-	uint8_t response[MAX_MIFARE_FRAME_SIZE] = {0x00};
-	uint8_t response_par[MAX_MIFARE_PARITY_SIZE] = {0x00};
+    int cardSTATE = MFEMUL_NOFIELD;
+    int _UID_LEN = 0;  // 4, 7, 10
+    int vHf = 0;    // in mV
+    int res = 0;
+    uint32_t selTimer = 0;
+    uint32_t authTimer = 0;
+    uint16_t len = 0;
+    uint8_t cardWRBL = 0;
+    uint8_t cardAUTHSC = 0;
+    uint8_t cardAUTHKEY = 0xff;  // no authentication
+    uint32_t cuid = 0;
+    uint32_t ans = 0;
+    uint32_t cardINTREG = 0;
+    uint8_t cardINTBLOCK = 0;
+    struct Crypto1State mpcs = {0, 0};
+    struct Crypto1State *pcs;
+    pcs = &mpcs;
+    uint32_t numReads = 0;    // Counts numer of times reader read a block
+    uint8_t receivedCmd[MAX_MIFARE_FRAME_SIZE] = {0x00};
+    uint8_t receivedCmd_par[MAX_MIFARE_PARITY_SIZE] = {0x00};
+    uint8_t response[MAX_MIFARE_FRAME_SIZE] = {0x00};
+    uint8_t response_par[MAX_MIFARE_PARITY_SIZE] = {0x00};
 
-	uint8_t atqa[]   = {0x04, 0x00}; // Mifare classic 1k
-	uint8_t sak_4[]  = {0x0C, 0x00, 0x00}; // CL1 - 4b uid
-	uint8_t sak_7[]  = {0x0C, 0x00, 0x00}; // CL2 - 7b uid
-	uint8_t sak_10[] = {0x0C, 0x00, 0x00}; // CL3 - 10b uid
-	// uint8_t sak[] = {0x09, 0x3f, 0xcc };  // Mifare Mini
+    uint8_t atqa[]   = {0x04, 0x00}; // Mifare classic 1k
+    uint8_t sak_4[]  = {0x0C, 0x00, 0x00}; // CL1 - 4b uid
+    uint8_t sak_7[]  = {0x0C, 0x00, 0x00}; // CL2 - 7b uid
+    uint8_t sak_10[] = {0x0C, 0x00, 0x00}; // CL3 - 10b uid
+    // uint8_t sak[] = {0x09, 0x3f, 0xcc };  // Mifare Mini
 
-	uint8_t rUIDBCC1[] = {0xde, 0xad, 0xbe, 0xaf, 0x62};
-	uint8_t rUIDBCC2[] = {0xde, 0xad, 0xbe, 0xaf, 0x62};
-	uint8_t rUIDBCC3[] = {0xde, 0xad, 0xbe, 0xaf, 0x62};
+    uint8_t rUIDBCC1[] = {0xde, 0xad, 0xbe, 0xaf, 0x62};
+    uint8_t rUIDBCC2[] = {0xde, 0xad, 0xbe, 0xaf, 0x62};
+    uint8_t rUIDBCC3[] = {0xde, 0xad, 0xbe, 0xaf, 0x62};
 
-	// TAG Nonce - Authenticate response
-	uint8_t rAUTH_NT[4];
-	uint32_t nonce = prng_successor( GetTickCount(), 32 );
-	num_to_bytes(nonce, 4, rAUTH_NT);
+    // TAG Nonce - Authenticate response
+    uint8_t rAUTH_NT[4];
+    uint32_t nonce = prng_successor( GetTickCount(), 32 );
+    num_to_bytes(nonce, 4, rAUTH_NT);
 
-	// uint8_t rAUTH_NT[] = {0x55, 0x41, 0x49, 0x92};// nonce from nested? why this?
-	uint8_t rAUTH_AT[] = {0x00, 0x00, 0x00, 0x00};
+    // uint8_t rAUTH_NT[] = {0x55, 0x41, 0x49, 0x92};// nonce from nested? why this?
+    uint8_t rAUTH_AT[] = {0x00, 0x00, 0x00, 0x00};
 
-	// Here, we collect CUID, NT, NR, AR, CUID2, NT2, NR2, AR2
-	// This can be used in a reader-only attack.
-	nonces_t ar_nr_nonces[ATTACK_KEY_COUNT];
-	memset(ar_nr_nonces, 0x00, sizeof(ar_nr_nonces));
+    // Here, we collect CUID, NT, NR, AR, CUID2, NT2, NR2, AR2
+    // This can be used in a reader-only attack.
+    nonces_t ar_nr_nonces[ATTACK_KEY_COUNT];
+    memset(ar_nr_nonces, 0x00, sizeof(ar_nr_nonces));
 
-	// -- Determine the UID
-	// Can be set from emulator memory or incoming data
-	// Length: 4,7,or 10 bytes
-	if ( (flags & FLAG_UID_IN_EMUL) == FLAG_UID_IN_EMUL)
-		emlGetMemBt(datain, 0, 10);  // load 10bytes from EMUL to the datain pointer. to be used below.
+    // -- Determine the UID
+    // Can be set from emulator memory or incoming data
+    // Length: 4,7,or 10 bytes
+    if ( (flags & FLAG_UID_IN_EMUL) == FLAG_UID_IN_EMUL)
+        emlGetMemBt(datain, 0, 10);  // load 10bytes from EMUL to the datain pointer. to be used below.
 
-	if ( (flags & FLAG_4B_UID_IN_DATA) == FLAG_4B_UID_IN_DATA) {
-		memcpy(rUIDBCC1, datain, 4);
-		_UID_LEN = 4;
-	} else if ( (flags & FLAG_7B_UID_IN_DATA) == FLAG_7B_UID_IN_DATA) {
-		memcpy(&rUIDBCC1[1], datain,   3);
-		memcpy( rUIDBCC2,    datain+3, 4);
-		_UID_LEN = 7;
-	} else if ( (flags & FLAG_10B_UID_IN_DATA) == FLAG_10B_UID_IN_DATA) {
-		memcpy(&rUIDBCC1[1], datain,   3);
-		memcpy(&rUIDBCC2[1], datain+3, 3);
-		memcpy( rUIDBCC3,    datain+6, 4);
-		_UID_LEN = 10;
-	}
+    if ( (flags & FLAG_4B_UID_IN_DATA) == FLAG_4B_UID_IN_DATA) {
+        memcpy(rUIDBCC1, datain, 4);
+        _UID_LEN = 4;
+    } else if ( (flags & FLAG_7B_UID_IN_DATA) == FLAG_7B_UID_IN_DATA) {
+        memcpy(&rUIDBCC1[1], datain,   3);
+        memcpy( rUIDBCC2,    datain+3, 4);
+        _UID_LEN = 7;
+    } else if ( (flags & FLAG_10B_UID_IN_DATA) == FLAG_10B_UID_IN_DATA) {
+        memcpy(&rUIDBCC1[1], datain,   3);
+        memcpy(&rUIDBCC2[1], datain+3, 3);
+        memcpy( rUIDBCC3,    datain+6, 4);
+        _UID_LEN = 10;
+    }
 
-	switch (_UID_LEN) {
-		case 4:
-			sak_4[0] &= 0xFB;
-			// save CUID
-			cuid = bytes_to_num(rUIDBCC1, 4);
-			// BCC
-			rUIDBCC1[4] = rUIDBCC1[0] ^ rUIDBCC1[1] ^ rUIDBCC1[2] ^ rUIDBCC1[3];
-			if (MF_DBGLEVEL >= 2)	{
-				Dbprintf("4B UID: %02x%02x%02x%02x",
-					rUIDBCC1[0],
-					rUIDBCC1[1],
-					rUIDBCC1[2],
-					rUIDBCC1[3]
-				);
-			}
-			break;
-		case 7:
-			atqa[0] |= 0x40;
-			sak_7[0] &= 0xFB;
-			// save CUID
-			cuid = bytes_to_num(rUIDBCC2, 4);
-			 // CascadeTag, CT
-			rUIDBCC1[0] = 0x88;
-			// BCC
-			rUIDBCC1[4] = rUIDBCC1[0] ^ rUIDBCC1[1] ^ rUIDBCC1[2] ^ rUIDBCC1[3];
-			rUIDBCC2[4] = rUIDBCC2[0] ^ rUIDBCC2[1] ^ rUIDBCC2[2] ^ rUIDBCC2[3];
-			if (MF_DBGLEVEL >= 2)	{
-				Dbprintf("7B UID: %02x %02x %02x %02x %02x %02x %02x",
-					rUIDBCC1[1],
-					rUIDBCC1[2],
-					rUIDBCC1[3],
-					rUIDBCC2[0],
-					rUIDBCC2[1],
-					rUIDBCC2[2],
-					rUIDBCC2[3]
-				);
-			}
-			break;
-		case 10:
-			atqa[0] |= 0x80;
-			sak_10[0] &= 0xFB;
-			// save CUID
-			cuid = bytes_to_num(rUIDBCC3, 4);
-			 // CascadeTag, CT
-			rUIDBCC1[0] = 0x88;
-			rUIDBCC2[0] = 0x88;
-			// BCC
-			rUIDBCC1[4] = rUIDBCC1[0] ^ rUIDBCC1[1] ^ rUIDBCC1[2] ^ rUIDBCC1[3];
-			rUIDBCC2[4] = rUIDBCC2[0] ^ rUIDBCC2[1] ^ rUIDBCC2[2] ^ rUIDBCC2[3];
-			rUIDBCC3[4] = rUIDBCC3[0] ^ rUIDBCC3[1] ^ rUIDBCC3[2] ^ rUIDBCC3[3];
+    switch (_UID_LEN) {
+        case 4:
+            sak_4[0] &= 0xFB;
+            // save CUID
+            cuid = bytes_to_num(rUIDBCC1, 4);
+            // BCC
+            rUIDBCC1[4] = rUIDBCC1[0] ^ rUIDBCC1[1] ^ rUIDBCC1[2] ^ rUIDBCC1[3];
+            if (MF_DBGLEVEL >= 2)    {
+                Dbprintf("4B UID: %02x%02x%02x%02x",
+                    rUIDBCC1[0],
+                    rUIDBCC1[1],
+                    rUIDBCC1[2],
+                    rUIDBCC1[3]
+                );
+            }
+            break;
+        case 7:
+            atqa[0] |= 0x40;
+            sak_7[0] &= 0xFB;
+            // save CUID
+            cuid = bytes_to_num(rUIDBCC2, 4);
+             // CascadeTag, CT
+            rUIDBCC1[0] = 0x88;
+            // BCC
+            rUIDBCC1[4] = rUIDBCC1[0] ^ rUIDBCC1[1] ^ rUIDBCC1[2] ^ rUIDBCC1[3];
+            rUIDBCC2[4] = rUIDBCC2[0] ^ rUIDBCC2[1] ^ rUIDBCC2[2] ^ rUIDBCC2[3];
+            if (MF_DBGLEVEL >= 2)    {
+                Dbprintf("7B UID: %02x %02x %02x %02x %02x %02x %02x",
+                    rUIDBCC1[1],
+                    rUIDBCC1[2],
+                    rUIDBCC1[3],
+                    rUIDBCC2[0],
+                    rUIDBCC2[1],
+                    rUIDBCC2[2],
+                    rUIDBCC2[3]
+                );
+            }
+            break;
+        case 10:
+            atqa[0] |= 0x80;
+            sak_10[0] &= 0xFB;
+            // save CUID
+            cuid = bytes_to_num(rUIDBCC3, 4);
+             // CascadeTag, CT
+            rUIDBCC1[0] = 0x88;
+            rUIDBCC2[0] = 0x88;
+            // BCC
+            rUIDBCC1[4] = rUIDBCC1[0] ^ rUIDBCC1[1] ^ rUIDBCC1[2] ^ rUIDBCC1[3];
+            rUIDBCC2[4] = rUIDBCC2[0] ^ rUIDBCC2[1] ^ rUIDBCC2[2] ^ rUIDBCC2[3];
+            rUIDBCC3[4] = rUIDBCC3[0] ^ rUIDBCC3[1] ^ rUIDBCC3[2] ^ rUIDBCC3[3];
 
-			if (MF_DBGLEVEL >= 2)	{
-				Dbprintf("10B UID: %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x",
-					rUIDBCC1[1],
-					rUIDBCC1[2],
-					rUIDBCC1[3],
-					rUIDBCC2[1],
-					rUIDBCC2[2],
-					rUIDBCC2[3],
-					rUIDBCC3[0],
-					rUIDBCC3[1],
-					rUIDBCC3[2],
-					rUIDBCC3[3]
-				);
-			}
-			break;
-		default:
-			break;
-	}
-	// calc some crcs
-	compute_crc(CRC_14443_A, sak_4, 1, &sak_4[1], &sak_4[2]);
-	compute_crc(CRC_14443_A, sak_7, 1, &sak_7[1], &sak_7[2]);
-	compute_crc(CRC_14443_A, sak_10, 1, &sak_10[1], &sak_10[2]);
+            if (MF_DBGLEVEL >= 2)    {
+                Dbprintf("10B UID: %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x",
+                    rUIDBCC1[1],
+                    rUIDBCC1[2],
+                    rUIDBCC1[3],
+                    rUIDBCC2[1],
+                    rUIDBCC2[2],
+                    rUIDBCC2[3],
+                    rUIDBCC3[0],
+                    rUIDBCC3[1],
+                    rUIDBCC3[2],
+                    rUIDBCC3[3]
+                );
+            }
+            break;
+        default:
+            break;
+    }
+    // calc some crcs
+    compute_crc(CRC_14443_A, sak_4, 1, &sak_4[1], &sak_4[2]);
+    compute_crc(CRC_14443_A, sak_7, 1, &sak_7[1], &sak_7[2]);
+    compute_crc(CRC_14443_A, sak_10, 1, &sak_10[1], &sak_10[2]);
 
-	// We need to listen to the high-frequency, peak-detected path.
-	iso14443a_setup(FPGA_HF_ISO14443A_TAGSIM_LISTEN);
+    // We need to listen to the high-frequency, peak-detected path.
+    iso14443a_setup(FPGA_HF_ISO14443A_TAGSIM_LISTEN);
 
-	// free eventually allocated BigBuf memory but keep Emulator Memory
-	BigBuf_free_keep_EM();
-	clear_trace();
-	set_tracing(true);
-	LED_D_ON();
+    // free eventually allocated BigBuf memory but keep Emulator Memory
+    BigBuf_free_keep_EM();
+    clear_trace();
+    set_tracing(true);
+    LED_D_ON();
 
-	bool finished = false;
-	while (!BUTTON_PRESS() && !finished && !usb_poll_validate_length()) {
-		WDT_HIT();
+    bool finished = false;
+    while (!BUTTON_PRESS() && !finished && !usb_poll_validate_length()) {
+        WDT_HIT();
 
-		// find reader field
-		if (cardSTATE == MFEMUL_NOFIELD) {
+        // find reader field
+        if (cardSTATE == MFEMUL_NOFIELD) {
 
-			vHf = (MAX_ADC_HF_VOLTAGE * AvgAdc(ADC_CHAN_HF)) >> 10;
-			if (vHf > MF_MINFIELDV) {
-				cardSTATE_TO_IDLE();
-				LED_A_ON();
-			}
-		}
-		if (cardSTATE == MFEMUL_NOFIELD) continue;
+            vHf = (MAX_ADC_HF_VOLTAGE * AvgAdc(ADC_CHAN_HF)) >> 10;
+            if (vHf > MF_MINFIELDV) {
+                cardSTATE_TO_IDLE();
+                LED_A_ON();
+            }
+        }
+        if (cardSTATE == MFEMUL_NOFIELD) continue;
 
-		// Now, get data
-		res = EmGetCmd(receivedCmd, &len, receivedCmd_par);
-		if (res == 2) { //Field is off!
-			cardSTATE = MFEMUL_NOFIELD;
-			LEDsoff();
-			continue;
-		} else if (res == 1) {
-			break; 	// return value 1 means button press
-		}
+        // Now, get data
+        res = EmGetCmd(receivedCmd, &len, receivedCmd_par);
+        if (res == 2) { //Field is off!
+            cardSTATE = MFEMUL_NOFIELD;
+            LEDsoff();
+            continue;
+        } else if (res == 1) {
+            break;     // return value 1 means button press
+        }
 
-		// REQ or WUP request in ANY state and WUP in HALTED state
-		// this if-statement doesn't match the specification above. (iceman)
-		if (len == 1 && ((receivedCmd[0] == ISO14443A_CMD_REQA && cardSTATE != MFEMUL_HALTED) || receivedCmd[0] == ISO14443A_CMD_WUPA)) {
-			selTimer = GetTickCount();
-			EmSendCmd(atqa, sizeof(atqa));
-			cardSTATE = MFEMUL_SELECT1;
-			crypto1_destroy(pcs);
-			cardAUTHKEY = 0xff;
-			nonce = prng_successor(selTimer, 32);
-			continue;
-		}
+        // REQ or WUP request in ANY state and WUP in HALTED state
+        // this if-statement doesn't match the specification above. (iceman)
+        if (len == 1 && ((receivedCmd[0] == ISO14443A_CMD_REQA && cardSTATE != MFEMUL_HALTED) || receivedCmd[0] == ISO14443A_CMD_WUPA)) {
+            selTimer = GetTickCount();
+            EmSendCmd(atqa, sizeof(atqa));
+            cardSTATE = MFEMUL_SELECT1;
+            crypto1_destroy(pcs);
+            cardAUTHKEY = 0xff;
+            nonce = prng_successor(selTimer, 32);
+            continue;
+        }
 
-		switch (cardSTATE) {
-			case MFEMUL_NOFIELD:
-			case MFEMUL_HALTED:
-			case MFEMUL_IDLE:{
-				LogTrace(Uart.output, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
-				break;
-			}
-			case MFEMUL_SELECT1:{
-				if (len == 2 && (receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT && receivedCmd[1] == 0x20)) {
-					if (MF_DBGLEVEL >= 4)	Dbprintf("SELECT ALL received");
-					EmSendCmd(rUIDBCC1, sizeof(rUIDBCC1));
-					break;
-				}
-				// select card
-				if (len == 9 &&
-						( receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT &&
-						  receivedCmd[1] == 0x70 &&
-						  memcmp(&receivedCmd[2], rUIDBCC1, 4) == 0)) {
+        switch (cardSTATE) {
+            case MFEMUL_NOFIELD:
+            case MFEMUL_HALTED:
+            case MFEMUL_IDLE:{
+                LogTrace(Uart.output, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                break;
+            }
+            case MFEMUL_SELECT1:{
+                if (len == 2 && (receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT && receivedCmd[1] == 0x20)) {
+                    if (MF_DBGLEVEL >= 4)    Dbprintf("SELECT ALL received");
+                    EmSendCmd(rUIDBCC1, sizeof(rUIDBCC1));
+                    break;
+                }
+                // select card
+                if (len == 9 &&
+                        ( receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT &&
+                          receivedCmd[1] == 0x70 &&
+                          memcmp(&receivedCmd[2], rUIDBCC1, 4) == 0)) {
 
-					// SAK 4b
-					EmSendCmd(sak_4, sizeof(sak_4));
-					switch(_UID_LEN){
-						case 4:
-							cardSTATE = MFEMUL_WORK;
-							LED_B_ON();
-							if (MF_DBGLEVEL >= 4)	Dbprintf("--> WORK. anticol1 time: %d", GetTickCount() - selTimer);
-							continue;
-						case 7:
-						case 10:
-							cardSTATE = MFEMUL_SELECT2;
-							continue;
-						default:break;
-					}
-				} else {
-					cardSTATE_TO_IDLE();
-				}
-				break;
-			}
-			case MFEMUL_SELECT2:{
-				if (!len) {
-					LogTrace(Uart.output, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
-					break;
-				}
-				if (len == 2 && (receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2 && receivedCmd[1] == 0x20)) {
-					EmSendCmd(rUIDBCC2, sizeof(rUIDBCC2));
-					break;
-				}
-				if (len == 9 &&
-						(receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2 &&
-						 receivedCmd[1] == 0x70 &&
-						 memcmp(&receivedCmd[2], rUIDBCC2, 4) == 0) ) {
+                    // SAK 4b
+                    EmSendCmd(sak_4, sizeof(sak_4));
+                    switch(_UID_LEN){
+                        case 4:
+                            cardSTATE = MFEMUL_WORK;
+                            LED_B_ON();
+                            if (MF_DBGLEVEL >= 4)    Dbprintf("--> WORK. anticol1 time: %d", GetTickCount() - selTimer);
+                            continue;
+                        case 7:
+                        case 10:
+                            cardSTATE = MFEMUL_SELECT2;
+                            continue;
+                        default:break;
+                    }
+                } else {
+                    cardSTATE_TO_IDLE();
+                }
+                break;
+            }
+            case MFEMUL_SELECT2:{
+                if (!len) {
+                    LogTrace(Uart.output, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                    break;
+                }
+                if (len == 2 && (receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2 && receivedCmd[1] == 0x20)) {
+                    EmSendCmd(rUIDBCC2, sizeof(rUIDBCC2));
+                    break;
+                }
+                if (len == 9 &&
+                        (receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2 &&
+                         receivedCmd[1] == 0x70 &&
+                         memcmp(&receivedCmd[2], rUIDBCC2, 4) == 0) ) {
 
-					EmSendCmd(sak_7, sizeof(sak_7));
-					switch(_UID_LEN){
-						case 7:
-							cardSTATE = MFEMUL_WORK;
-							LED_B_ON();
-							if (MF_DBGLEVEL >= 4)	Dbprintf("--> WORK. anticol2 time: %d", GetTickCount() - selTimer);
-							continue;
-						case 10:
-							cardSTATE = MFEMUL_SELECT3;
-							continue;
-						default:break;
-					}
-				}
-				cardSTATE_TO_IDLE();
-				break;
-			}
-			case MFEMUL_SELECT3:{
-				if (!len) {
-					LogTrace(Uart.output, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
-					break;
-				}
-				if (len == 2 && (receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_3 && receivedCmd[1] == 0x20)) {
-					EmSendCmd(rUIDBCC3, sizeof(rUIDBCC3));
-					break;
-				}
-				if (len == 9 &&
-						(receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_3 &&
-						 receivedCmd[1] == 0x70 &&
-						 memcmp(&receivedCmd[2], rUIDBCC3, 4) == 0) ) {
+                    EmSendCmd(sak_7, sizeof(sak_7));
+                    switch(_UID_LEN){
+                        case 7:
+                            cardSTATE = MFEMUL_WORK;
+                            LED_B_ON();
+                            if (MF_DBGLEVEL >= 4)    Dbprintf("--> WORK. anticol2 time: %d", GetTickCount() - selTimer);
+                            continue;
+                        case 10:
+                            cardSTATE = MFEMUL_SELECT3;
+                            continue;
+                        default:break;
+                    }
+                }
+                cardSTATE_TO_IDLE();
+                break;
+            }
+            case MFEMUL_SELECT3:{
+                if (!len) {
+                    LogTrace(Uart.output, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                    break;
+                }
+                if (len == 2 && (receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_3 && receivedCmd[1] == 0x20)) {
+                    EmSendCmd(rUIDBCC3, sizeof(rUIDBCC3));
+                    break;
+                }
+                if (len == 9 &&
+                        (receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_3 &&
+                         receivedCmd[1] == 0x70 &&
+                         memcmp(&receivedCmd[2], rUIDBCC3, 4) == 0) ) {
 
-					EmSendCmd(sak_10, sizeof(sak_10));
-					cardSTATE = MFEMUL_WORK;
-					LED_B_ON();
-					if (MF_DBGLEVEL >= 4)	Dbprintf("--> WORK. anticol3 time: %d", GetTickCount() - selTimer);
-					break;
-				}
-				cardSTATE_TO_IDLE();
-				break;
-			}
-			case MFEMUL_AUTH1:{
-				if( len != 8) {
-					cardSTATE_TO_IDLE();
-					LogTrace(Uart.output, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
-					break;
-				}
+                    EmSendCmd(sak_10, sizeof(sak_10));
+                    cardSTATE = MFEMUL_WORK;
+                    LED_B_ON();
+                    if (MF_DBGLEVEL >= 4)    Dbprintf("--> WORK. anticol3 time: %d", GetTickCount() - selTimer);
+                    break;
+                }
+                cardSTATE_TO_IDLE();
+                break;
+            }
+            case MFEMUL_AUTH1:{
+                if( len != 8) {
+                    cardSTATE_TO_IDLE();
+                    LogTrace(Uart.output, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                    break;
+                }
 
-				uint32_t nr = bytes_to_num(receivedCmd, 4);
-				uint32_t ar = bytes_to_num(&receivedCmd[4], 4);
+                uint32_t nr = bytes_to_num(receivedCmd, 4);
+                uint32_t ar = bytes_to_num(&receivedCmd[4], 4);
 
-				// Collect AR/NR per keytype & sector
-				if ( (flags & FLAG_NR_AR_ATTACK) == FLAG_NR_AR_ATTACK ) {
+                // Collect AR/NR per keytype & sector
+                if ( (flags & FLAG_NR_AR_ATTACK) == FLAG_NR_AR_ATTACK ) {
 
-					int8_t index = -1;
-					int8_t empty = -1;
-					for (uint8_t i = 0; i < ATTACK_KEY_COUNT; i++) {
-						// find which index to use
-						if ( (cardAUTHSC == ar_nr_nonces[i].sector) &&  (cardAUTHKEY == ar_nr_nonces[i].keytype))
-							index = i;
+                    int8_t index = -1;
+                    int8_t empty = -1;
+                    for (uint8_t i = 0; i < ATTACK_KEY_COUNT; i++) {
+                        // find which index to use
+                        if ( (cardAUTHSC == ar_nr_nonces[i].sector) &&  (cardAUTHKEY == ar_nr_nonces[i].keytype))
+                            index = i;
 
-						// keep track of empty slots.
-						if ( ar_nr_nonces[i].state == EMPTY)
-							empty = i;
-					}
-					// if no empty slots.  Choose first and overwrite.
-					if ( index == -1 ) {
-						if ( empty == -1 ) {
-							index = 0;
-							ar_nr_nonces[index].state = EMPTY;
-						} else {
-							index = empty;
-						}
-					}
+                        // keep track of empty slots.
+                        if ( ar_nr_nonces[i].state == EMPTY)
+                            empty = i;
+                    }
+                    // if no empty slots.  Choose first and overwrite.
+                    if ( index == -1 ) {
+                        if ( empty == -1 ) {
+                            index = 0;
+                            ar_nr_nonces[index].state = EMPTY;
+                        } else {
+                            index = empty;
+                        }
+                    }
 
-					switch(ar_nr_nonces[index].state) {
-						case EMPTY: {
-							// first nonce collect
-							ar_nr_nonces[index].cuid = cuid;
-							ar_nr_nonces[index].sector = cardAUTHSC;
-							ar_nr_nonces[index].keytype = cardAUTHKEY;
-							ar_nr_nonces[index].nonce = nonce;
-							ar_nr_nonces[index].nr = nr;
-							ar_nr_nonces[index].ar = ar;
-							ar_nr_nonces[index].state = FIRST;
-							break;
-						}
-						case FIRST : {
-							// second nonce collect
-							ar_nr_nonces[index].nonce2 = nonce;
-							ar_nr_nonces[index].nr2 = nr;
-							ar_nr_nonces[index].ar2 = ar;
-							ar_nr_nonces[index].state = SECOND;
+                    switch(ar_nr_nonces[index].state) {
+                        case EMPTY: {
+                            // first nonce collect
+                            ar_nr_nonces[index].cuid = cuid;
+                            ar_nr_nonces[index].sector = cardAUTHSC;
+                            ar_nr_nonces[index].keytype = cardAUTHKEY;
+                            ar_nr_nonces[index].nonce = nonce;
+                            ar_nr_nonces[index].nr = nr;
+                            ar_nr_nonces[index].ar = ar;
+                            ar_nr_nonces[index].state = FIRST;
+                            break;
+                        }
+                        case FIRST : {
+                            // second nonce collect
+                            ar_nr_nonces[index].nonce2 = nonce;
+                            ar_nr_nonces[index].nr2 = nr;
+                            ar_nr_nonces[index].ar2 = ar;
+                            ar_nr_nonces[index].state = SECOND;
 
-							// send to client
-							cmd_send(CMD_ACK, CMD_SIMULATE_MIFARE_CARD, 0, 0, &ar_nr_nonces[index], sizeof(nonces_t));
+                            // send to client
+                            cmd_send(CMD_ACK, CMD_SIMULATE_MIFARE_CARD, 0, 0, &ar_nr_nonces[index], sizeof(nonces_t));
 
-							ar_nr_nonces[index].state = EMPTY;
-							ar_nr_nonces[index].sector = 0;
-							ar_nr_nonces[index].keytype = 0;
-							break;
-						}
-						default: break;
-					}
-				}
+                            ar_nr_nonces[index].state = EMPTY;
+                            ar_nr_nonces[index].sector = 0;
+                            ar_nr_nonces[index].keytype = 0;
+                            break;
+                        }
+                        default: break;
+                    }
+                }
 
-				crypto1_word(pcs, nr , 1);
-				uint32_t cardRr = ar ^ crypto1_word(pcs, 0, 0);
+                crypto1_word(pcs, nr , 1);
+                uint32_t cardRr = ar ^ crypto1_word(pcs, 0, 0);
 
-				//test if auth OK
-				if (cardRr != prng_successor(nonce, 64)){
+                //test if auth OK
+                if (cardRr != prng_successor(nonce, 64)){
 
-					if (MF_DBGLEVEL >= 3) {
-						Dbprintf("AUTH FAILED for sector %d with key %c. [nr=%08x  cardRr=%08x] [nt=%08x succ=%08x]"
-							, cardAUTHSC
-							, (cardAUTHKEY == 0) ? 'A' : 'B'
-							, nr
-							, cardRr
-							, nonce // nt
-							, prng_successor(nonce, 64)
-						);
-					}
-					// Shouldn't we respond anything here?
-					// Right now, we don't nack or anything, which causes the
-					// reader to do a WUPA after a while. /Martin
-					// -- which is the correct response. /piwi
-					cardSTATE_TO_IDLE();
-					LogTrace(Uart.output, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
-					break;
-				}
+                    if (MF_DBGLEVEL >= 3) {
+                        Dbprintf("AUTH FAILED for sector %d with key %c. [nr=%08x  cardRr=%08x] [nt=%08x succ=%08x]"
+                            , cardAUTHSC
+                            , (cardAUTHKEY == 0) ? 'A' : 'B'
+                            , nr
+                            , cardRr
+                            , nonce // nt
+                            , prng_successor(nonce, 64)
+                        );
+                    }
+                    // Shouldn't we respond anything here?
+                    // Right now, we don't nack or anything, which causes the
+                    // reader to do a WUPA after a while. /Martin
+                    // -- which is the correct response. /piwi
+                    cardSTATE_TO_IDLE();
+                    LogTrace(Uart.output, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                    break;
+                }
 
-				ans = prng_successor(nonce, 96) ^ crypto1_word(pcs, 0, 0);
-				num_to_bytes(ans, 4, rAUTH_AT);
-				EmSendCmd(rAUTH_AT, sizeof(rAUTH_AT));
-				LED_C_ON();
+                ans = prng_successor(nonce, 96) ^ crypto1_word(pcs, 0, 0);
+                num_to_bytes(ans, 4, rAUTH_AT);
+                EmSendCmd(rAUTH_AT, sizeof(rAUTH_AT));
+                LED_C_ON();
 
-				if (MF_DBGLEVEL >= 3) {
-					Dbprintf("AUTH COMPLETED for sector %d with key %c. time=%d",
-						cardAUTHSC,
-						cardAUTHKEY == 0 ? 'A' : 'B',
-						GetTickCount() - authTimer
-					);
-				}
-				cardSTATE = MFEMUL_WORK;
-				break;
-			}
-			case MFEMUL_WORK:{
-				if (len == 0) {
-					LogTrace(Uart.output, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
-					break;
-				}
-				bool encrypted_data = (cardAUTHKEY != 0xFF) ;
+                if (MF_DBGLEVEL >= 3) {
+                    Dbprintf("AUTH COMPLETED for sector %d with key %c. time=%d",
+                        cardAUTHSC,
+                        cardAUTHKEY == 0 ? 'A' : 'B',
+                        GetTickCount() - authTimer
+                    );
+                }
+                cardSTATE = MFEMUL_WORK;
+                break;
+            }
+            case MFEMUL_WORK:{
+                if (len == 0) {
+                    LogTrace(Uart.output, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                    break;
+                }
+                bool encrypted_data = (cardAUTHKEY != 0xFF) ;
 
-				if(encrypted_data)
-					mf_crypto1_decrypt(pcs, receivedCmd, len);
+                if(encrypted_data)
+                    mf_crypto1_decrypt(pcs, receivedCmd, len);
 
-				if (len == 4 && (receivedCmd[0] == MIFARE_AUTH_KEYA ||
-				                 receivedCmd[0] == MIFARE_AUTH_KEYB)  ) {
+                if (len == 4 && (receivedCmd[0] == MIFARE_AUTH_KEYA ||
+                                 receivedCmd[0] == MIFARE_AUTH_KEYB)  ) {
 
-					authTimer = GetTickCount();
-					cardAUTHSC = receivedCmd[1] / 4;  // received block -> sector
-					cardAUTHKEY = receivedCmd[0] & 0x1;
-					crypto1_destroy(pcs);
+                    authTimer = GetTickCount();
+                    cardAUTHSC = receivedCmd[1] / 4;  // received block -> sector
+                    cardAUTHKEY = receivedCmd[0] & 0x1;
+                    crypto1_destroy(pcs);
 
-					// load key into crypto
-					crypto1_create(pcs, emlGetKey(cardAUTHSC, cardAUTHKEY));
+                    // load key into crypto
+                    crypto1_create(pcs, emlGetKey(cardAUTHSC, cardAUTHKEY));
 
-					if (!encrypted_data) {
-						// first authentication
-						// Update crypto state init  (UID ^ NONCE)
-						crypto1_word(pcs, cuid ^ nonce, 0);
-						num_to_bytes(nonce, 4, rAUTH_AT);
-					} else {
-						// nested authentication
-						ans = nonce ^ crypto1_word(pcs, cuid ^ nonce, 0);
-						num_to_bytes(ans, 4, rAUTH_AT);
+                    if (!encrypted_data) {
+                        // first authentication
+                        // Update crypto state init  (UID ^ NONCE)
+                        crypto1_word(pcs, cuid ^ nonce, 0);
+                        num_to_bytes(nonce, 4, rAUTH_AT);
+                    } else {
+                        // nested authentication
+                        ans = nonce ^ crypto1_word(pcs, cuid ^ nonce, 0);
+                        num_to_bytes(ans, 4, rAUTH_AT);
 
-						if (MF_DBGLEVEL >= 3) Dbprintf("Reader doing nested authentication for block %d (0x%02x) with key %c", receivedCmd[1], receivedCmd[1], 	cardAUTHKEY == 0 ? 'A' : 'B');
-					}
+                        if (MF_DBGLEVEL >= 3) Dbprintf("Reader doing nested authentication for block %d (0x%02x) with key %c", receivedCmd[1], receivedCmd[1],     cardAUTHKEY == 0 ? 'A' : 'B');
+                    }
 
-					EmSendCmd(rAUTH_AT, sizeof(rAUTH_AT));
-					cardSTATE = MFEMUL_AUTH1;
-					break;
-				}
+                    EmSendCmd(rAUTH_AT, sizeof(rAUTH_AT));
+                    cardSTATE = MFEMUL_AUTH1;
+                    break;
+                }
 
-				// rule 13 of 7.5.3. in ISO 14443-4. chaining shall be continued
-				// BUT... ACK --> NACK
-				if (len == 1 && receivedCmd[0] == CARD_ACK) {
-					EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
-					break;
-				}
+                // rule 13 of 7.5.3. in ISO 14443-4. chaining shall be continued
+                // BUT... ACK --> NACK
+                if (len == 1 && receivedCmd[0] == CARD_ACK) {
+                    EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
+                    break;
+                }
 
-				// rule 12 of 7.5.3. in ISO 14443-4. R(NAK) --> R(ACK)
-				if (len == 1 && receivedCmd[0] == CARD_NACK_NA) {
-					EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_ACK));
-					break;
-				}
+                // rule 12 of 7.5.3. in ISO 14443-4. R(NAK) --> R(ACK)
+                if (len == 1 && receivedCmd[0] == CARD_NACK_NA) {
+                    EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_ACK));
+                    break;
+                }
 
-				if(len != 4) {
-					LogTrace(Uart.output, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
-					break;
-				}
+                if(len != 4) {
+                    LogTrace(Uart.output, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                    break;
+                }
 
-				if ( receivedCmd[0] == ISO14443A_CMD_READBLOCK ||
-					 receivedCmd[0] == ISO14443A_CMD_WRITEBLOCK ||
-					 receivedCmd[0] == MIFARE_CMD_INC ||
-					 receivedCmd[0] == MIFARE_CMD_DEC ||
-					 receivedCmd[0] == MIFARE_CMD_RESTORE ||
-					 receivedCmd[0] == MIFARE_CMD_TRANSFER ) {
+                if ( receivedCmd[0] == ISO14443A_CMD_READBLOCK ||
+                     receivedCmd[0] == ISO14443A_CMD_WRITEBLOCK ||
+                     receivedCmd[0] == MIFARE_CMD_INC ||
+                     receivedCmd[0] == MIFARE_CMD_DEC ||
+                     receivedCmd[0] == MIFARE_CMD_RESTORE ||
+                     receivedCmd[0] == MIFARE_CMD_TRANSFER ) {
 
-					if (receivedCmd[1] >= 16 * 4) {
-						EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
-						if (MF_DBGLEVEL >= 4) Dbprintf("Reader tried to operate (0x%02) on out of range block: %d (0x%02x), nacking",receivedCmd[0],receivedCmd[1],receivedCmd[1]);
-						break;
-					}
+                    if (receivedCmd[1] >= 16 * 4) {
+                        EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
+                        if (MF_DBGLEVEL >= 4) Dbprintf("Reader tried to operate (0x%02) on out of range block: %d (0x%02x), nacking",receivedCmd[0],receivedCmd[1],receivedCmd[1]);
+                        break;
+                    }
 
-					if (receivedCmd[1] / 4 != cardAUTHSC) {
-						EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
-						if (MF_DBGLEVEL >= 4) Dbprintf("Reader tried to operate (0x%02) on block (0x%02x) not authenticated for (0x%02x), nacking",receivedCmd[0],receivedCmd[1],cardAUTHSC);
-						break;
-					}
-				}
-				// read block
-				if (receivedCmd[0] == ISO14443A_CMD_READBLOCK) {
-					if (MF_DBGLEVEL >= 4) Dbprintf("Reader reading block %d (0x%02x)", receivedCmd[1], receivedCmd[1]);
+                    if (receivedCmd[1] / 4 != cardAUTHSC) {
+                        EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
+                        if (MF_DBGLEVEL >= 4) Dbprintf("Reader tried to operate (0x%02) on block (0x%02x) not authenticated for (0x%02x), nacking",receivedCmd[0],receivedCmd[1],cardAUTHSC);
+                        break;
+                    }
+                }
+                // read block
+                if (receivedCmd[0] == ISO14443A_CMD_READBLOCK) {
+                    if (MF_DBGLEVEL >= 4) Dbprintf("Reader reading block %d (0x%02x)", receivedCmd[1], receivedCmd[1]);
 
-					emlGetMem(response, receivedCmd[1], 1);
-					AddCrc14A(response, 16);
-					mf_crypto1_encrypt(pcs, response, 18, response_par);
-					EmSendCmdPar(response, 18, response_par);
-					numReads++;
-					if(exitAfterNReads > 0 && numReads >= exitAfterNReads) {
-						Dbprintf("%d reads done, exiting", numReads);
-						finished = true;
-					}
-					break;
-				}
-				// write block
-				if (receivedCmd[0] == ISO14443A_CMD_WRITEBLOCK) {
-					if (MF_DBGLEVEL >= 4) Dbprintf("RECV 0xA0 write block %d (%02x)", receivedCmd[1], receivedCmd[1]);
-					EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_ACK));
-					cardSTATE = MFEMUL_WRITEBL2;
-					cardWRBL = receivedCmd[1];
-					break;
-				}
-				// increment, decrement, restore
-				if ( receivedCmd[0] == MIFARE_CMD_INC ||
-				     receivedCmd[0] == MIFARE_CMD_DEC ||
-					 receivedCmd[0] == MIFARE_CMD_RESTORE) {
+                    emlGetMem(response, receivedCmd[1], 1);
+                    AddCrc14A(response, 16);
+                    mf_crypto1_encrypt(pcs, response, 18, response_par);
+                    EmSendCmdPar(response, 18, response_par);
+                    numReads++;
+                    if(exitAfterNReads > 0 && numReads >= exitAfterNReads) {
+                        Dbprintf("%d reads done, exiting", numReads);
+                        finished = true;
+                    }
+                    break;
+                }
+                // write block
+                if (receivedCmd[0] == ISO14443A_CMD_WRITEBLOCK) {
+                    if (MF_DBGLEVEL >= 4) Dbprintf("RECV 0xA0 write block %d (%02x)", receivedCmd[1], receivedCmd[1]);
+                    EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_ACK));
+                    cardSTATE = MFEMUL_WRITEBL2;
+                    cardWRBL = receivedCmd[1];
+                    break;
+                }
+                // increment, decrement, restore
+                if ( receivedCmd[0] == MIFARE_CMD_INC ||
+                     receivedCmd[0] == MIFARE_CMD_DEC ||
+                     receivedCmd[0] == MIFARE_CMD_RESTORE) {
 
-					 if (MF_DBGLEVEL >= 4) Dbprintf("RECV 0x%02x inc(0xC1)/dec(0xC0)/restore(0xC2) block %d (%02x)",receivedCmd[0], receivedCmd[1], receivedCmd[1]);
+                     if (MF_DBGLEVEL >= 4) Dbprintf("RECV 0x%02x inc(0xC1)/dec(0xC0)/restore(0xC2) block %d (%02x)",receivedCmd[0], receivedCmd[1], receivedCmd[1]);
 
-					if (emlCheckValBl(receivedCmd[1])) {
-						if (MF_DBGLEVEL >= 4) Dbprintf("Reader tried to operate on block, but emlCheckValBl failed, nacking");
-						EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
-						break;
-					}
-					EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_ACK));
-					if (receivedCmd[0] == MIFARE_CMD_INC)		cardSTATE = MFEMUL_INTREG_INC;
-					if (receivedCmd[0] == MIFARE_CMD_DEC)		cardSTATE = MFEMUL_INTREG_DEC;
-					if (receivedCmd[0] == MIFARE_CMD_RESTORE)	cardSTATE = MFEMUL_INTREG_REST;
-					cardWRBL = receivedCmd[1];
-					break;
-				}
-				// transfer
-				if (receivedCmd[0] == MIFARE_CMD_TRANSFER) {
-					if (MF_DBGLEVEL >= 4) Dbprintf("RECV 0x%02x transfer block %d (%02x)", receivedCmd[0], receivedCmd[1], receivedCmd[1]);
-					if (emlSetValBl(cardINTREG, cardINTBLOCK, receivedCmd[1]))
-						EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
-					else
-						EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_ACK));
-					break;
-				}
-				// halt
-				if (receivedCmd[0] == ISO14443A_CMD_HALT && receivedCmd[1] == 0x00) {
-					LED_B_OFF();
-					LED_C_OFF();
-					cardSTATE = MFEMUL_HALTED;
-					if (MF_DBGLEVEL >= 4)	Dbprintf("--> HALTED. Selected time: %d ms",  GetTickCount() - selTimer);
-					LogTrace(Uart.output, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
-					break;
-				}
-				// RATS
-				if (receivedCmd[0] == ISO14443A_CMD_RATS) {
-					EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
-					break;
-				}
-				// command not allowed
-				if (MF_DBGLEVEL >= 4)	Dbprintf("Received command not allowed, nacking");
-				EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
-				break;
-			}
-			case MFEMUL_WRITEBL2:{
-				if (len == 18) {
-					mf_crypto1_decrypt(pcs, receivedCmd, len);
-					emlSetMem(receivedCmd, cardWRBL, 1);
-					EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_ACK));
-					cardSTATE = MFEMUL_WORK;
-				} else {
-					cardSTATE_TO_IDLE();
-					LogTrace(Uart.output, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
-				}
-				break;
-			}
-			case MFEMUL_INTREG_INC:{
-				mf_crypto1_decrypt(pcs, receivedCmd, len);
-				memcpy(&ans, receivedCmd, 4);
-				if (emlGetValBl(&cardINTREG, &cardINTBLOCK, cardWRBL)) {
-					EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
-					cardSTATE_TO_IDLE();
-					break;
-				}
-				LogTrace(Uart.output, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
-				cardINTREG = cardINTREG + ans;
-				cardSTATE = MFEMUL_WORK;
-				break;
-			}
-			case MFEMUL_INTREG_DEC:{
-				mf_crypto1_decrypt(pcs, receivedCmd, len);
-				memcpy(&ans, receivedCmd, 4);
-				if (emlGetValBl(&cardINTREG, &cardINTBLOCK, cardWRBL)) {
-					EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
-					cardSTATE_TO_IDLE();
-					break;
-				}
-				LogTrace(Uart.output, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
-				cardINTREG = cardINTREG - ans;
-				cardSTATE = MFEMUL_WORK;
-				break;
-			}
-			case MFEMUL_INTREG_REST:{
-				mf_crypto1_decrypt(pcs, receivedCmd, len);
-				memcpy(&ans, receivedCmd, 4);
-				if (emlGetValBl(&cardINTREG, &cardINTBLOCK, cardWRBL)) {
-					EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
-					cardSTATE_TO_IDLE();
-					break;
-				}
-				LogTrace(Uart.output, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
-				cardSTATE = MFEMUL_WORK;
-				break;
-			}
-		}
-	}
+                    if (emlCheckValBl(receivedCmd[1])) {
+                        if (MF_DBGLEVEL >= 4) Dbprintf("Reader tried to operate on block, but emlCheckValBl failed, nacking");
+                        EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
+                        break;
+                    }
+                    EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_ACK));
+                    if (receivedCmd[0] == MIFARE_CMD_INC)        cardSTATE = MFEMUL_INTREG_INC;
+                    if (receivedCmd[0] == MIFARE_CMD_DEC)        cardSTATE = MFEMUL_INTREG_DEC;
+                    if (receivedCmd[0] == MIFARE_CMD_RESTORE)    cardSTATE = MFEMUL_INTREG_REST;
+                    cardWRBL = receivedCmd[1];
+                    break;
+                }
+                // transfer
+                if (receivedCmd[0] == MIFARE_CMD_TRANSFER) {
+                    if (MF_DBGLEVEL >= 4) Dbprintf("RECV 0x%02x transfer block %d (%02x)", receivedCmd[0], receivedCmd[1], receivedCmd[1]);
+                    if (emlSetValBl(cardINTREG, cardINTBLOCK, receivedCmd[1]))
+                        EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
+                    else
+                        EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_ACK));
+                    break;
+                }
+                // halt
+                if (receivedCmd[0] == ISO14443A_CMD_HALT && receivedCmd[1] == 0x00) {
+                    LED_B_OFF();
+                    LED_C_OFF();
+                    cardSTATE = MFEMUL_HALTED;
+                    if (MF_DBGLEVEL >= 4)    Dbprintf("--> HALTED. Selected time: %d ms",  GetTickCount() - selTimer);
+                    LogTrace(Uart.output, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                    break;
+                }
+                // RATS
+                if (receivedCmd[0] == ISO14443A_CMD_RATS) {
+                    EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
+                    break;
+                }
+                // command not allowed
+                if (MF_DBGLEVEL >= 4)    Dbprintf("Received command not allowed, nacking");
+                EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
+                break;
+            }
+            case MFEMUL_WRITEBL2:{
+                if (len == 18) {
+                    mf_crypto1_decrypt(pcs, receivedCmd, len);
+                    emlSetMem(receivedCmd, cardWRBL, 1);
+                    EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_ACK));
+                    cardSTATE = MFEMUL_WORK;
+                } else {
+                    cardSTATE_TO_IDLE();
+                    LogTrace(Uart.output, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                }
+                break;
+            }
+            case MFEMUL_INTREG_INC:{
+                mf_crypto1_decrypt(pcs, receivedCmd, len);
+                memcpy(&ans, receivedCmd, 4);
+                if (emlGetValBl(&cardINTREG, &cardINTBLOCK, cardWRBL)) {
+                    EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
+                    cardSTATE_TO_IDLE();
+                    break;
+                }
+                LogTrace(Uart.output, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                cardINTREG = cardINTREG + ans;
+                cardSTATE = MFEMUL_WORK;
+                break;
+            }
+            case MFEMUL_INTREG_DEC:{
+                mf_crypto1_decrypt(pcs, receivedCmd, len);
+                memcpy(&ans, receivedCmd, 4);
+                if (emlGetValBl(&cardINTREG, &cardINTBLOCK, cardWRBL)) {
+                    EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
+                    cardSTATE_TO_IDLE();
+                    break;
+                }
+                LogTrace(Uart.output, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                cardINTREG = cardINTREG - ans;
+                cardSTATE = MFEMUL_WORK;
+                break;
+            }
+            case MFEMUL_INTREG_REST:{
+                mf_crypto1_decrypt(pcs, receivedCmd, len);
+                memcpy(&ans, receivedCmd, 4);
+                if (emlGetValBl(&cardINTREG, &cardINTBLOCK, cardWRBL)) {
+                    EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
+                    cardSTATE_TO_IDLE();
+                    break;
+                }
+                LogTrace(Uart.output, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                cardSTATE = MFEMUL_WORK;
+                break;
+            }
+        }
+    }
 
-	if (MF_DBGLEVEL >= 1)
-		Dbprintf("Emulator stopped. Trace length: %d ", BigBuf_get_traceLen());
+    if (MF_DBGLEVEL >= 1)
+        Dbprintf("Emulator stopped. Trace length: %d ", BigBuf_get_traceLen());
 
-	cmd_send(CMD_ACK,1,0,0,0,0);	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	LEDsoff();
-	set_tracing(false);
+    cmd_send(CMD_ACK,1,0,0,0,0);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    LEDsoff();
+    set_tracing(false);
 }
diff --git a/armsrc/iso14443a.h b/armsrc/iso14443a.h
index c5e1e62f1..38d0b99e1 100644
--- a/armsrc/iso14443a.h
+++ b/armsrc/iso14443a.h
@@ -31,66 +31,66 @@ extern "C" {
 #include "mifare.h"  // structs
 
 typedef struct {
-	enum {
-		DEMOD_UNSYNCD,
-		// DEMOD_HALF_SYNCD,
-		// DEMOD_MOD_FIRST_HALF,
-		// DEMOD_NOMOD_FIRST_HALF,
-		DEMOD_MANCHESTER_DATA
-	} state;
-	uint16_t twoBits;
-	uint16_t highCnt;
-	uint16_t bitCount;
-	uint16_t collisionPos;
-	uint16_t syncBit;
-	uint8_t  parityBits;
-	uint8_t  parityLen;
-	uint16_t shiftReg;
-	uint16_t samples;
-	uint16_t len;
-	uint32_t startTime, endTime;
-	uint8_t  *output;
-	uint8_t  *parity;
+    enum {
+        DEMOD_UNSYNCD,
+        // DEMOD_HALF_SYNCD,
+        // DEMOD_MOD_FIRST_HALF,
+        // DEMOD_NOMOD_FIRST_HALF,
+        DEMOD_MANCHESTER_DATA
+    } state;
+    uint16_t twoBits;
+    uint16_t highCnt;
+    uint16_t bitCount;
+    uint16_t collisionPos;
+    uint16_t syncBit;
+    uint8_t  parityBits;
+    uint8_t  parityLen;
+    uint16_t shiftReg;
+    uint16_t samples;
+    uint16_t len;
+    uint32_t startTime, endTime;
+    uint8_t  *output;
+    uint8_t  *parity;
 } tDemod;
 /*
 typedef enum {
-	MOD_NOMOD = 0,
-	MOD_SECOND_HALF,
-	MOD_FIRST_HALF,
-	MOD_BOTH_HALVES
-	} Modulation_t;
+    MOD_NOMOD = 0,
+    MOD_SECOND_HALF,
+    MOD_FIRST_HALF,
+    MOD_BOTH_HALVES
+    } Modulation_t;
 */
 
 typedef struct {
-	enum {
-		STATE_UNSYNCD,
-		STATE_START_OF_COMMUNICATION,
-		STATE_MILLER_X,
-		STATE_MILLER_Y,
-		STATE_MILLER_Z,
-		// DROP_NONE,
-		// DROP_FIRST_HALF,
-		} state;
-	uint16_t shiftReg;
-	int16_t	 bitCount;
-	uint16_t len;
-	//uint16_t byteCntMax;
-	uint16_t posCnt;
-	uint16_t syncBit;
-	uint8_t  parityBits;
-	uint8_t  parityLen;
-	uint32_t fourBits;
-	uint32_t startTime, endTime;
+    enum {
+        STATE_UNSYNCD,
+        STATE_START_OF_COMMUNICATION,
+        STATE_MILLER_X,
+        STATE_MILLER_Y,
+        STATE_MILLER_Z,
+        // DROP_NONE,
+        // DROP_FIRST_HALF,
+        } state;
+    uint16_t shiftReg;
+    int16_t bitCount;
+    uint16_t len;
+    //uint16_t byteCntMax;
+    uint16_t posCnt;
+    uint16_t syncBit;
+    uint8_t  parityBits;
+    uint8_t  parityLen;
+    uint32_t fourBits;
+    uint32_t startTime, endTime;
     uint8_t *output;
-	uint8_t *parity;
+    uint8_t *parity;
 } tUart;
 
 #ifndef AddCrc14A
-# define	AddCrc14A(data, len)	compute_crc(CRC_14443_A, (data), (len), (data)+(len), (data)+(len)+1)
+# define AddCrc14A(data, len) compute_crc(CRC_14443_A, (data), (len), (data)+(len), (data)+(len)+1)
 #endif
 
 #ifndef AddCrc14B
-# define	AddCrc14B(data, len)	compute_crc(CRC_14443_B, (data), (len), (data)+(len), (data)+(len)+1)
+# define AddCrc14B(data, len) compute_crc(CRC_14443_B, (data), (len), (data)+(len), (data)+(len)+1)
 #endif
 
 extern void GetParity(const uint8_t *pbtCmd, uint16_t len, uint8_t *par);
@@ -129,7 +129,7 @@ extern int EmSendCmdParEx(uint8_t *resp, uint16_t respLen, uint8_t *par, bool co
 extern int EmSendPrecompiledCmd(tag_response_info_t *response_info);
 
 bool EmLogTrace(uint8_t *reader_data, uint16_t reader_len, uint32_t reader_StartTime, uint32_t reader_EndTime, uint8_t *reader_Parity,
-				uint8_t *tag_data, uint16_t tag_len, uint32_t tag_StartTime, uint32_t tag_EndTime, uint8_t *tag_Parity);
+                uint8_t *tag_data, uint16_t tag_len, uint32_t tag_StartTime, uint32_t tag_EndTime, uint8_t *tag_Parity);
 
 //extern bool prepare_allocated_tag_modulation(tag_response_info_t *response_info, uint8_t **buffer, size_t *buffer_size);
 
diff --git a/armsrc/iso14443b.c b/armsrc/iso14443b.c
index f093fb1a7..2e2aec7cd 100644
--- a/armsrc/iso14443b.c
+++ b/armsrc/iso14443b.c
@@ -40,7 +40,7 @@
 //#define SEND4STUFFBIT(x) ToSendStuffBit(x);
  // iceman, this threshold value,  what makes 8 a good amplitude for this IQ values?
 #ifndef SUBCARRIER_DETECT_THRESHOLD
-# define SUBCARRIER_DETECT_THRESHOLD	8
+# define SUBCARRIER_DETECT_THRESHOLD 8
 #endif
 
 static void iso14b_set_timeout(uint32_t timeout);
@@ -63,80 +63,80 @@ static uint32_t iso14b_timeout = FWT_TIMEOUT_14B;
 // The software UART that receives commands from the reader, and its state variables.
 //-----------------------------------------------------------------------------
 static struct {
-	enum {
-		STATE_UNSYNCD,
-		STATE_GOT_FALLING_EDGE_OF_SOF,
-		STATE_AWAITING_START_BIT,
-		STATE_RECEIVING_DATA
-	}       state;
-	uint16_t shiftReg;
-	int      bitCnt;
-	int      byteCnt;
-	int      byteCntMax;
-	int      posCnt;
-	uint8_t  *output;
+    enum {
+        STATE_UNSYNCD,
+        STATE_GOT_FALLING_EDGE_OF_SOF,
+        STATE_AWAITING_START_BIT,
+        STATE_RECEIVING_DATA
+    }       state;
+    uint16_t shiftReg;
+    int      bitCnt;
+    int      byteCnt;
+    int      byteCntMax;
+    int      posCnt;
+    uint8_t  *output;
 } Uart;
 
 static void UartReset() {
-	Uart.state = STATE_UNSYNCD;
-	Uart.shiftReg = 0;
-	Uart.bitCnt = 0;
-	Uart.byteCnt = 0;
-	Uart.byteCntMax = MAX_FRAME_SIZE;
-	Uart.posCnt = 0;
+    Uart.state = STATE_UNSYNCD;
+    Uart.shiftReg = 0;
+    Uart.bitCnt = 0;
+    Uart.byteCnt = 0;
+    Uart.byteCntMax = MAX_FRAME_SIZE;
+    Uart.posCnt = 0;
 }
 
 static void UartInit(uint8_t *data) {
-	Uart.output = data;
-	UartReset();
-//		memset(Uart.output, 0x00, MAX_FRAME_SIZE);
+    Uart.output = data;
+    UartReset();
+// memset(Uart.output, 0x00, MAX_FRAME_SIZE);
 }
 
 //-----------------------------------------------------------------------------
 // The software Demod that receives commands from the tag, and its state variables.
 //-----------------------------------------------------------------------------
 static struct {
-	enum {
-		DEMOD_UNSYNCD,
-		DEMOD_PHASE_REF_TRAINING,
-		DEMOD_AWAITING_FALLING_EDGE_OF_SOF,
-		DEMOD_GOT_FALLING_EDGE_OF_SOF,
-		DEMOD_AWAITING_START_BIT,
-		DEMOD_RECEIVING_DATA
-	}       state;
-	uint16_t bitCount;
-	int      posCount;
-	int      thisBit;
+    enum {
+        DEMOD_UNSYNCD,
+        DEMOD_PHASE_REF_TRAINING,
+        DEMOD_AWAITING_FALLING_EDGE_OF_SOF,
+        DEMOD_GOT_FALLING_EDGE_OF_SOF,
+        DEMOD_AWAITING_START_BIT,
+        DEMOD_RECEIVING_DATA
+    }       state;
+    uint16_t bitCount;
+    int      posCount;
+    int      thisBit;
 /* this had been used to add RSSI (Received Signal Strength Indication) to traces. Currently not implemented.
-	int     metric;
-	int     metricN;
+    int     metric;
+    int     metricN;
 */
-	uint16_t shiftReg;
-	uint8_t  *output;
-	uint16_t len;
-	int      sumI;
-	int      sumQ;
-	uint32_t startTime, endTime;
+    uint16_t shiftReg;
+    uint8_t  *output;
+    uint16_t len;
+    int      sumI;
+    int      sumQ;
+    uint32_t startTime, endTime;
 } Demod;
 
 // Clear out the state of the "UART" that receives from the tag.
 static void DemodReset() {
-	Demod.state = DEMOD_UNSYNCD;
-	Demod.bitCount = 0;
-	Demod.posCount = 0;
-	Demod.thisBit = 0;
-	Demod.shiftReg = 0;
-	Demod.len = 0;
-	Demod.sumI = 0;
-	Demod.sumQ = 0;
-	Demod.startTime = 0;
-	Demod.endTime = 0;
+    Demod.state = DEMOD_UNSYNCD;
+    Demod.bitCount = 0;
+    Demod.posCount = 0;
+    Demod.thisBit = 0;
+    Demod.shiftReg = 0;
+    Demod.len = 0;
+    Demod.sumI = 0;
+    Demod.sumQ = 0;
+    Demod.startTime = 0;
+    Demod.endTime = 0;
 }
 
 static void DemodInit(uint8_t *data) {
-	Demod.output = data;
-	DemodReset();
-	//	memset(Demod.output, 0x00, MAX_FRAME_SIZE);
+    Demod.output = data;
+    DemodReset();
+    // memset(Demod.output, 0x00, MAX_FRAME_SIZE);
 }
 
 
@@ -154,19 +154,19 @@ static void DemodInit(uint8_t *data) {
 * @param timeout is in frame wait time, fwt, measured in ETUs
 */
 static void iso14b_set_timeout(uint32_t timeout) {
-	#define MAX_TIMEOUT 40542464 	// 13560000Hz * 1000ms / (2^32-1) * (8*16)
-	if(timeout > MAX_TIMEOUT)
-		timeout = MAX_TIMEOUT;
+    #define MAX_TIMEOUT 40542464  // 13560000Hz * 1000ms / (2^32-1) * (8*16)
+    if(timeout > MAX_TIMEOUT)
+        timeout = MAX_TIMEOUT;
 
-	iso14b_timeout = timeout;
-	if(MF_DBGLEVEL >= 3) Dbprintf("ISO14443B Timeout set to %ld fwt", iso14b_timeout);
+    iso14b_timeout = timeout;
+    if(MF_DBGLEVEL >= 3) Dbprintf("ISO14443B Timeout set to %ld fwt", iso14b_timeout);
 }
 static void iso14b_set_maxframesize(uint16_t size) {
-	if (size > 256)
-		size = MAX_FRAME_SIZE;
+    if (size > 256)
+        size = MAX_FRAME_SIZE;
 
-	Uart.byteCntMax = size;
-	if(MF_DBGLEVEL >= 3) Dbprintf("ISO14443B Max frame size set to %d bytes", Uart.byteCntMax);
+    Uart.byteCntMax = size;
+    if(MF_DBGLEVEL >= 3) Dbprintf("ISO14443B Max frame size set to %d bytes", Uart.byteCntMax);
 }
 
 //-----------------------------------------------------------------------------
@@ -175,132 +175,132 @@ static void iso14b_set_maxframesize(uint16_t size) {
 // them yet, just leaves them ready to send in ToSend[].
 //-----------------------------------------------------------------------------
 static void CodeIso14443bAsTag(const uint8_t *cmd, int len) {
-	/* ISO 14443 B
-	*
-	* Reader to card | ASK  - Amplitude Shift Keying Modulation (PCD to PICC for Type B) (NRZ-L encodig)
-	* Card to reader | BPSK - Binary Phase Shift Keying Modulation, (PICC to PCD for Type B)
-	*
-	* fc - carrier frequency 13.56mHz
-	* TR0 - Guard Time per 14443-2
-	* TR1 - Synchronization Time per 14443-2
-	* TR2 - PICC to PCD Frame Delay Time (per 14443-3 Amendment 1)
-	*
-	* Elementary Time Unit (ETU) is
-	* - 128 Carrier Cycles (9.4395 µS) = 8 Subcarrier Units
-	* - 1 ETU = 1 bit
-	* - 10 ETU = 1 startbit, 8 databits, 1 stopbit (10bits length)
-	* - startbit is a 0
-	* - stopbit is a 1
-	*
-	* Start of frame (SOF) is
-	* - [10-11] ETU of ZEROS, unmodulated time
-	* - [2-3] ETU of ONES,
-	*
-	* End of frame (EOF) is
-	* - [10-11] ETU of ZEROS, unmodulated time
-	*
-	*  -TO VERIFY THIS BELOW-
-	* The mode FPGA_MAJOR_MODE_HF_SIMULATOR | FPGA_HF_SIMULATOR_MODULATE_BPSK which we use to simulate tag
-	* works like this:
-	* - A 1-bit input to the FPGA becomes 8 pulses at 847.5kHz (1.18µS / pulse) == 9.44us
-	* - A 0-bit input to the FPGA becomes an unmodulated time of 1.18µS  or does it become 8 nonpulses for 9.44us
-	*
-	* FPGA doesn't seem to work with ETU.  It seems to work with pulse / duration instead.
-	*
-	* Card sends data ub 847.e kHz subcarrier
-	* subcar |duration| FC division
-	* -------+--------+------------
-	* 106kHz | 9.44µS | FC/128
-	* 212kHz | 4.72µS | FC/64
-	* 424kHz | 2.36µS | FC/32
-	* 848kHz | 1.18µS | FC/16
-	* -------+--------+------------
-	*
-	*  Reader data transmission:
-	*   - no modulation ONES
-	*   - SOF
-	*   - Command, data and CRC_B
-	*   - EOF
-	*   - no modulation ONES
-	*
-	*  Card data transmission
-	*   - TR1
-	*   - SOF
-	*   - data  (each bytes is:  1startbit, 8bits, 1stopbit)
-	*   - CRC_B
-	*   - EOF
-	*
-	* FPGA implementation :
-	* At this point only Type A is implemented. This means that we are using a
-	* bit rate of 106 kbit/s, or fc/128. Oversample by 4, which ought to make
-	* things practical for the ARM (fc/32, 423.8 kbits/s, ~50 kbytes/s)
-	*
-	*/
+    /* ISO 14443 B
+    *
+    * Reader to card | ASK  - Amplitude Shift Keying Modulation (PCD to PICC for Type B) (NRZ-L encodig)
+    * Card to reader | BPSK - Binary Phase Shift Keying Modulation, (PICC to PCD for Type B)
+    *
+    * fc - carrier frequency 13.56mHz
+    * TR0 - Guard Time per 14443-2
+    * TR1 - Synchronization Time per 14443-2
+    * TR2 - PICC to PCD Frame Delay Time (per 14443-3 Amendment 1)
+    *
+    * Elementary Time Unit (ETU) is
+    * - 128 Carrier Cycles (9.4395 µS) = 8 Subcarrier Units
+    * - 1 ETU = 1 bit
+    * - 10 ETU = 1 startbit, 8 databits, 1 stopbit (10bits length)
+    * - startbit is a 0
+    * - stopbit is a 1
+    *
+    * Start of frame (SOF) is
+    * - [10-11] ETU of ZEROS, unmodulated time
+    * - [2-3] ETU of ONES,
+    *
+    * End of frame (EOF) is
+    * - [10-11] ETU of ZEROS, unmodulated time
+    *
+    *  -TO VERIFY THIS BELOW-
+    * The mode FPGA_MAJOR_MODE_HF_SIMULATOR | FPGA_HF_SIMULATOR_MODULATE_BPSK which we use to simulate tag
+    * works like this:
+    * - A 1-bit input to the FPGA becomes 8 pulses at 847.5kHz (1.18µS / pulse) == 9.44us
+    * - A 0-bit input to the FPGA becomes an unmodulated time of 1.18µS  or does it become 8 nonpulses for 9.44us
+    *
+    * FPGA doesn't seem to work with ETU.  It seems to work with pulse / duration instead.
+    *
+    * Card sends data ub 847.e kHz subcarrier
+    * subcar |duration| FC division
+    * -------+--------+------------
+    * 106kHz | 9.44µS | FC/128
+    * 212kHz | 4.72µS | FC/64
+    * 424kHz | 2.36µS | FC/32
+    * 848kHz | 1.18µS | FC/16
+    * -------+--------+------------
+    *
+    *  Reader data transmission:
+    *   - no modulation ONES
+    *   - SOF
+    *   - Command, data and CRC_B
+    *   - EOF
+    *   - no modulation ONES
+    *
+    *  Card data transmission
+    *   - TR1
+    *   - SOF
+    *   - data  (each bytes is:  1startbit, 8bits, 1stopbit)
+    *   - CRC_B
+    *   - EOF
+    *
+    * FPGA implementation :
+    * At this point only Type A is implemented. This means that we are using a
+    * bit rate of 106 kbit/s, or fc/128. Oversample by 4, which ought to make
+    * things practical for the ARM (fc/32, 423.8 kbits/s, ~50 kbytes/s)
+    *
+    */
 
-	int i,j;
-	uint8_t b;
+    int i,j;
+    uint8_t b;
 
-	ToSendReset();
+    ToSendReset();
 
-	// Transmit a burst of ones, as the initial thing that lets the
-	// reader get phase sync.
-	// This loop is TR1, per specification
-	// TR1 minimum must be > 80/fs
-	// TR1 maximum 200/fs
-	// 80/fs < TR1 < 200/fs
-	// 10 ETU < TR1 < 24 ETU
+    // Transmit a burst of ones, as the initial thing that lets the
+    // reader get phase sync.
+    // This loop is TR1, per specification
+    // TR1 minimum must be > 80/fs
+    // TR1 maximum 200/fs
+    // 80/fs < TR1 < 200/fs
+    // 10 ETU < TR1 < 24 ETU
 
-	// Send SOF.
-	// 10-11 ETU * 4times samples ZEROS
-	for(i = 0; i < 10; i++) { SEND4STUFFBIT(0); }
-	//for(i = 0; i < 10; i++) { ToSendStuffBit(0); }
+    // Send SOF.
+    // 10-11 ETU * 4times samples ZEROS
+    for(i = 0; i < 10; i++) { SEND4STUFFBIT(0); }
+    //for(i = 0; i < 10; i++) { ToSendStuffBit(0); }
 
-	// 2-3 ETU * 4times samples ONES
-	for(i = 0; i < 3; i++)  { SEND4STUFFBIT(1); }
-	//for(i = 0; i < 3; i++)  { ToSendStuffBit(1); }
+    // 2-3 ETU * 4times samples ONES
+    for(i = 0; i < 3; i++)  { SEND4STUFFBIT(1); }
+    //for(i = 0; i < 3; i++)  { ToSendStuffBit(1); }
 
-	// data
-	for(i = 0; i < len; ++i) {
+    // data
+    for(i = 0; i < len; ++i) {
 
-		// Start bit
-		SEND4STUFFBIT(0);
-		//ToSendStuffBit(0);
+        // Start bit
+        SEND4STUFFBIT(0);
+        //ToSendStuffBit(0);
 
-		// Data bits
-		b = cmd[i];
-		for(j = 0; j < 8; ++j) {
-			// if(b & 1) {
-				// SEND4STUFFBIT(1);
-				// //ToSendStuffBit(1);
-			// } else {
-				// SEND4STUFFBIT(0);
-				// //ToSendStuffBit(0);
-			// }
-			SEND4STUFFBIT( b & 1 );
-			b >>= 1;
-		}
+        // Data bits
+        b = cmd[i];
+        for(j = 0; j < 8; ++j) {
+            // if(b & 1) {
+                // SEND4STUFFBIT(1);
+                // //ToSendStuffBit(1);
+            // } else {
+                // SEND4STUFFBIT(0);
+                // //ToSendStuffBit(0);
+            // }
+            SEND4STUFFBIT( b & 1 );
+            b >>= 1;
+        }
 
-		// Stop bit
-		SEND4STUFFBIT(1);
-		//ToSendStuffBit(1);
+        // Stop bit
+        SEND4STUFFBIT(1);
+        //ToSendStuffBit(1);
 
-		// Extra Guard bit
-		// For PICC it ranges 0-18us (1etu = 9us)
-		SEND4STUFFBIT(1);
-		//ToSendStuffBit(1);
-	}
+        // Extra Guard bit
+        // For PICC it ranges 0-18us (1etu = 9us)
+        SEND4STUFFBIT(1);
+        //ToSendStuffBit(1);
+    }
 
-	// Send EOF.
-	// 10-11 ETU * 4 sample rate = ZEROS
-	for(i = 0; i < 10; i++) { SEND4STUFFBIT(0); }
-	//for(i = 0; i < 10; i++) { ToSendStuffBit(0); }
+    // Send EOF.
+    // 10-11 ETU * 4 sample rate = ZEROS
+    for(i = 0; i < 10; i++) { SEND4STUFFBIT(0); }
+    //for(i = 0; i < 10; i++) { ToSendStuffBit(0); }
 
-	// why this?
-	for(i = 0; i < 40; i++) { SEND4STUFFBIT(1); }
-	//for(i = 0; i < 40; i++) { ToSendStuffBit(1); }
+    // why this?
+    for(i = 0; i < 40; i++) { SEND4STUFFBIT(1); }
+    //for(i = 0; i < 40; i++) { ToSendStuffBit(1); }
 
-	// Convert from last byte pos to length
-	++ToSendMax;
+    // Convert from last byte pos to length
+    ++ToSendMax;
 }
 
 
@@ -317,111 +317,111 @@ static void CodeIso14443bAsTag(const uint8_t *cmd, int len) {
  *          false if we are still waiting for some more
  */
 static RAMFUNC int Handle14443bReaderUartBit(uint8_t bit) {
-	switch (Uart.state) {
-		case STATE_UNSYNCD:
-			if (!bit) {
-				// we went low, so this could be the beginning of an SOF
-				Uart.state = STATE_GOT_FALLING_EDGE_OF_SOF;
-				Uart.posCnt = 0;
-				Uart.bitCnt = 0;
-			}
-			break;
+    switch (Uart.state) {
+        case STATE_UNSYNCD:
+            if (!bit) {
+                // we went low, so this could be the beginning of an SOF
+                Uart.state = STATE_GOT_FALLING_EDGE_OF_SOF;
+                Uart.posCnt = 0;
+                Uart.bitCnt = 0;
+            }
+            break;
 
-		case STATE_GOT_FALLING_EDGE_OF_SOF:
-			Uart.posCnt++;
-			if (Uart.posCnt == 2) {	// sample every 4 1/fs in the middle of a bit
-				if (bit) {
-					if (Uart.bitCnt > 9) {
-						// we've seen enough consecutive
-						// zeros that it's a valid SOF
-						Uart.posCnt = 0;
-						Uart.byteCnt = 0;
-						Uart.state = STATE_AWAITING_START_BIT;
-						LED_A_ON(); // Indicate we got a valid SOF
-					} else {
-						// didn't stay down long enough before going high, error
-						Uart.state = STATE_UNSYNCD;
-					}
-				} else {
-					// do nothing, keep waiting
-				}
-				Uart.bitCnt++;
-			}
-			if (Uart.posCnt >= 4) Uart.posCnt = 0;
-			if (Uart.bitCnt > 12) {
-				// Give up if we see too many zeros without a one, too.
-				LED_A_OFF();
-				Uart.state = STATE_UNSYNCD;
-			}
-			break;
+        case STATE_GOT_FALLING_EDGE_OF_SOF:
+            Uart.posCnt++;
+            if (Uart.posCnt == 2) { // sample every 4 1/fs in the middle of a bit
+                if (bit) {
+                    if (Uart.bitCnt > 9) {
+                        // we've seen enough consecutive
+                        // zeros that it's a valid SOF
+                        Uart.posCnt = 0;
+                        Uart.byteCnt = 0;
+                        Uart.state = STATE_AWAITING_START_BIT;
+                        LED_A_ON(); // Indicate we got a valid SOF
+                    } else {
+                        // didn't stay down long enough before going high, error
+                        Uart.state = STATE_UNSYNCD;
+                    }
+                } else {
+                    // do nothing, keep waiting
+                }
+                Uart.bitCnt++;
+            }
+            if (Uart.posCnt >= 4) Uart.posCnt = 0;
+            if (Uart.bitCnt > 12) {
+                // Give up if we see too many zeros without a one, too.
+                LED_A_OFF();
+                Uart.state = STATE_UNSYNCD;
+            }
+            break;
 
-		case STATE_AWAITING_START_BIT:
-			Uart.posCnt++;
-			if (bit) {
-				if (Uart.posCnt > 50/2) {	// max 57us between characters = 49 1/fs, max 3 etus after low phase of SOF = 24 1/fs
-					// stayed high for too long between characters, error
-					Uart.state = STATE_UNSYNCD;
-				}
-			} else {
-				// falling edge, this starts the data byte
-				Uart.posCnt = 0;
-				Uart.bitCnt = 0;
-				Uart.shiftReg = 0;
-				Uart.state = STATE_RECEIVING_DATA;
-			}
-			break;
+        case STATE_AWAITING_START_BIT:
+            Uart.posCnt++;
+            if (bit) {
+                if (Uart.posCnt > 50/2) { // max 57us between characters = 49 1/fs, max 3 etus after low phase of SOF = 24 1/fs
+                    // stayed high for too long between characters, error
+                    Uart.state = STATE_UNSYNCD;
+                }
+            } else {
+                // falling edge, this starts the data byte
+                Uart.posCnt = 0;
+                Uart.bitCnt = 0;
+                Uart.shiftReg = 0;
+                Uart.state = STATE_RECEIVING_DATA;
+            }
+            break;
 
-		case STATE_RECEIVING_DATA:
-			Uart.posCnt++;
-			if (Uart.posCnt == 2) {
-				// time to sample a bit
-				Uart.shiftReg >>= 1;
-				if (bit) {
-					Uart.shiftReg |= 0x200;
-				}
-				Uart.bitCnt++;
-			}
-			if (Uart.posCnt >= 4) {
-				Uart.posCnt = 0;
-			}
-			if (Uart.bitCnt == 10) {
-				if ((Uart.shiftReg & 0x200) && !(Uart.shiftReg & 0x001))
-				{
-					// this is a data byte, with correct
-					// start and stop bits
-					Uart.output[Uart.byteCnt] = (Uart.shiftReg >> 1) & 0xff;
-					Uart.byteCnt++;
+        case STATE_RECEIVING_DATA:
+            Uart.posCnt++;
+            if (Uart.posCnt == 2) {
+                // time to sample a bit
+                Uart.shiftReg >>= 1;
+                if (bit) {
+                    Uart.shiftReg |= 0x200;
+                }
+                Uart.bitCnt++;
+            }
+            if (Uart.posCnt >= 4) {
+                Uart.posCnt = 0;
+            }
+            if (Uart.bitCnt == 10) {
+                if ((Uart.shiftReg & 0x200) && !(Uart.shiftReg & 0x001))
+                {
+                    // this is a data byte, with correct
+                    // start and stop bits
+                    Uart.output[Uart.byteCnt] = (Uart.shiftReg >> 1) & 0xff;
+                    Uart.byteCnt++;
 
-					if (Uart.byteCnt >= Uart.byteCntMax) {
-						// Buffer overflowed, give up
-						LED_A_OFF();
-						Uart.state = STATE_UNSYNCD;
-					} else {
-						// so get the next byte now
-						Uart.posCnt = 0;
-						Uart.state = STATE_AWAITING_START_BIT;
-					}
-				} else if (Uart.shiftReg == 0x000) {
-					// this is an EOF byte
-					LED_A_OFF(); // Finished receiving
-					Uart.state = STATE_UNSYNCD;
-					if (Uart.byteCnt != 0)
-						return true;
+                    if (Uart.byteCnt >= Uart.byteCntMax) {
+                        // Buffer overflowed, give up
+                        LED_A_OFF();
+                        Uart.state = STATE_UNSYNCD;
+                    } else {
+                        // so get the next byte now
+                        Uart.posCnt = 0;
+                        Uart.state = STATE_AWAITING_START_BIT;
+                    }
+                } else if (Uart.shiftReg == 0x000) {
+                    // this is an EOF byte
+                    LED_A_OFF(); // Finished receiving
+                    Uart.state = STATE_UNSYNCD;
+                    if (Uart.byteCnt != 0)
+                        return true;
 
-				} else {
-					// this is an error
-					LED_A_OFF();
-					Uart.state = STATE_UNSYNCD;
-				}
-			}
-			break;
+                } else {
+                    // this is an error
+                    LED_A_OFF();
+                    Uart.state = STATE_UNSYNCD;
+                }
+            }
+            break;
 
-		default:
-			LED_A_OFF();
-			Uart.state = STATE_UNSYNCD;
-			break;
-	}
-	return false;
+        default:
+            LED_A_OFF();
+            Uart.state = STATE_UNSYNCD;
+            break;
+    }
+    return false;
 }
 
 //-----------------------------------------------------------------------------
@@ -434,123 +434,123 @@ static RAMFUNC int Handle14443bReaderUartBit(uint8_t bit) {
 // correctly.
 //-----------------------------------------------------------------------------
 static int GetIso14443bCommandFromReader(uint8_t *received, uint16_t *len) {
-	// Set FPGA mode to "simulated ISO 14443B tag", no modulation (listen
-	// only, since we are receiving, not transmitting).
-	// Signal field is off with the appropriate LED
-	LED_D_OFF();
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_SIMULATOR | FPGA_HF_SIMULATOR_NO_MODULATION);
+    // Set FPGA mode to "simulated ISO 14443B tag", no modulation (listen
+    // only, since we are receiving, not transmitting).
+    // Signal field is off with the appropriate LED
+    LED_D_OFF();
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_SIMULATOR | FPGA_HF_SIMULATOR_NO_MODULATION);
 
-	StartCountSspClk();
+    StartCountSspClk();
 
-	volatile uint8_t b = 0;
+    volatile uint8_t b = 0;
 
-	// clear receiving shift register and holding register
-	// What does this loop do? Is it TR1?
-	// loop is a wait/delay  ?
+    // clear receiving shift register and holding register
+    // What does this loop do? Is it TR1?
+    // loop is a wait/delay  ?
 /*
-	for(uint8_t c = 0; c < 10;) {
+    for(uint8_t c = 0; c < 10;) {
 
-		// keep tx buffer in a defined state anyway.
-		if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
-			AT91C_BASE_SSC->SSC_THR = 0xFF;
-			++c;
-		}
-	}
-	*/
-	// Now run a `software UART' on the stream of incoming samples.
-	UartInit(received);
+        // keep tx buffer in a defined state anyway.
+        if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
+            AT91C_BASE_SSC->SSC_THR = 0xFF;
+            ++c;
+        }
+    }
+    */
+    // Now run a `software UART' on the stream of incoming samples.
+    UartInit(received);
 
-	uint8_t mask;
-	while( !BUTTON_PRESS() ) {
-		WDT_HIT();
+    uint8_t mask;
+    while( !BUTTON_PRESS() ) {
+        WDT_HIT();
 
-		// keep tx buffer in a defined state anyway.
-		if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
-			AT91C_BASE_SSC->SSC_THR = 0x00;
-		}
+        // keep tx buffer in a defined state anyway.
+        if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
+            AT91C_BASE_SSC->SSC_THR = 0x00;
+        }
 
-		// Wait for byte be become available in rx holding register
-		if ( AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY ) {
+        // Wait for byte be become available in rx holding register
+        if ( AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY ) {
 
-			b = (uint8_t) AT91C_BASE_SSC->SSC_RHR;
+            b = (uint8_t) AT91C_BASE_SSC->SSC_RHR;
 
-			for ( mask = 0x80; mask != 0; mask >>= 1) {
-				if ( Handle14443bReaderUartBit(b & mask)) {
-					*len = Uart.byteCnt;
-					return true;
-				}
-			}
-		}
-	}
-	return false;
+            for ( mask = 0x80; mask != 0; mask >>= 1) {
+                if ( Handle14443bReaderUartBit(b & mask)) {
+                    *len = Uart.byteCnt;
+                    return true;
+                }
+            }
+        }
+    }
+    return false;
 }
 
 void ClearFpgaShiftingRegisters(void){
 
-	volatile uint8_t b;
+    volatile uint8_t b;
 
-	// clear receiving shift register and holding register
-	while(!(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY)) {};
+    // clear receiving shift register and holding register
+    while(!(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY)) {};
 
-	b = AT91C_BASE_SSC->SSC_RHR; (void) b;
+    b = AT91C_BASE_SSC->SSC_RHR; (void) b;
 
-	while(!(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY)) {};
+    while(!(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY)) {};
 
-	b = AT91C_BASE_SSC->SSC_RHR; (void) b;
+    b = AT91C_BASE_SSC->SSC_RHR; (void) b;
 
-	// wait for the FPGA to signal fdt_indicator == 1 (the FPGA is ready to queue new data in its delay line)
-	for (uint8_t j = 0; j < 5; j++) {	// allow timeout - better late than never
-		while (!(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY)) {};
-		if (AT91C_BASE_SSC->SSC_RHR) break;
-	}
+    // wait for the FPGA to signal fdt_indicator == 1 (the FPGA is ready to queue new data in its delay line)
+    for (uint8_t j = 0; j < 5; j++) { // allow timeout - better late than never
+        while (!(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY)) {};
+        if (AT91C_BASE_SSC->SSC_RHR) break;
+    }
 
-	// Clear TXRDY:
-	//AT91C_BASE_SSC->SSC_THR = 0xFF;
+    // Clear TXRDY:
+    //AT91C_BASE_SSC->SSC_THR = 0xFF;
 }
 
 void WaitForFpgaDelayQueueIsEmpty( uint16_t delay ){
-	// Ensure that the FPGA Delay Queue is empty before we switch to TAGSIM_LISTEN again:
-	uint8_t fpga_queued_bits = delay >> 3;  // twich /8 ??   >>3,
-	for (uint8_t i = 0; i <= fpga_queued_bits/8 + 1; ) {
-		if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
-			AT91C_BASE_SSC->SSC_THR = 0xFF;
-			i++;
-		}
-	}
+    // Ensure that the FPGA Delay Queue is empty before we switch to TAGSIM_LISTEN again:
+    uint8_t fpga_queued_bits = delay >> 3;  // twich /8 ??   >>3,
+    for (uint8_t i = 0; i <= fpga_queued_bits/8 + 1; ) {
+        if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
+            AT91C_BASE_SSC->SSC_THR = 0xFF;
+            i++;
+        }
+    }
 }
 
 static void TransmitFor14443b_AsTag( uint8_t *response, uint16_t len) {
 
-	volatile uint32_t b;
+    volatile uint32_t b;
 
-	// Signal field is off with the appropriate LED
-	LED_D_OFF();
-	//uint16_t fpgasendQueueDelay = 0;
+    // Signal field is off with the appropriate LED
+    LED_D_OFF();
+    //uint16_t fpgasendQueueDelay = 0;
 
-	// Modulate BPSK
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_SIMULATOR | FPGA_HF_SIMULATOR_MODULATE_BPSK);
-	SpinDelay(40);
+    // Modulate BPSK
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_SIMULATOR | FPGA_HF_SIMULATOR_MODULATE_BPSK);
+    SpinDelay(40);
 
-	ClearFpgaShiftingRegisters();
+    ClearFpgaShiftingRegisters();
 
-	FpgaSetupSsc();
+    FpgaSetupSsc();
 
-	// Transmit the response.
-	for(uint16_t i = 0; i < len;) {
+    // Transmit the response.
+    for(uint16_t i = 0; i < len;) {
 
-		 // Put byte into tx holding register as soon as it is ready
-		if(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_TXRDY) {
-			AT91C_BASE_SSC->SSC_THR = response[++i];
-		}
+         // Put byte into tx holding register as soon as it is ready
+        if(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_TXRDY) {
+            AT91C_BASE_SSC->SSC_THR = response[++i];
+        }
 
-		// Prevent rx holding register from overflowing
-		if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
-			b = AT91C_BASE_SSC->SSC_RHR;(void)b;
-		}
-	}
+        // Prevent rx holding register from overflowing
+        if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
+            b = AT91C_BASE_SSC->SSC_RHR;(void)b;
+        }
+    }
 
-	//WaitForFpgaDelayQueueIsEmpty(fpgasendQueueDelay);
-	AT91C_BASE_SSC->SSC_THR = 0xFF;
+    //WaitForFpgaDelayQueueIsEmpty(fpgasendQueueDelay);
+    AT91C_BASE_SSC->SSC_THR = 0xFF;
 }
 //-----------------------------------------------------------------------------
 // Main loop of simulated tag: receive commands from reader, decide what
@@ -558,160 +558,160 @@ static void TransmitFor14443b_AsTag( uint8_t *response, uint16_t len) {
 //-----------------------------------------------------------------------------
 void SimulateIso14443bTag(uint32_t pupi) {
 
-	// setup device.
-	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-	// connect Demodulated Signal to ADC:
-	SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
-	// Set up the synchronous serial port
-	FpgaSetupSsc();
+    // setup device.
+    FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
+    // connect Demodulated Signal to ADC:
+    SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
+    // Set up the synchronous serial port
+    FpgaSetupSsc();
 
-	// allocate command receive buffer
-	BigBuf_free(); BigBuf_Clear_ext(false);
+    // allocate command receive buffer
+    BigBuf_free(); BigBuf_Clear_ext(false);
 
-	clear_trace(); //sim
-	set_tracing(true);
+    clear_trace(); //sim
+    set_tracing(true);
 
-	uint16_t len, cmdsReceived = 0;
-	int cardSTATE = SIM_NOFIELD;
-	int vHf = 0;	// in mV
-	// uint32_t time_0 = 0;
-	// uint32_t t2r_time = 0;
-	// uint32_t r2t_time = 0;
-	uint8_t *receivedCmd = BigBuf_malloc(MAX_FRAME_SIZE);
+    uint16_t len, cmdsReceived = 0;
+    int cardSTATE = SIM_NOFIELD;
+    int vHf = 0; // in mV
+    // uint32_t time_0 = 0;
+    // uint32_t t2r_time = 0;
+    // uint32_t r2t_time = 0;
+    uint8_t *receivedCmd = BigBuf_malloc(MAX_FRAME_SIZE);
 
-	// the only commands we understand is WUPB, AFI=0, Select All, N=1:
-//	static const uint8_t cmdWUPB[] = { ISO14443B_REQB, 0x00, 0x08, 0x39, 0x73 }; // WUPB
-	// ... and REQB, AFI=0, Normal Request, N=1:
-//	static const uint8_t cmdREQB[] = { ISO14443B_REQB, 0x00, 0x00, 0x71, 0xFF }; // REQB
-	// ... and ATTRIB
-//	static const uint8_t cmdATTRIB[] = { ISO14443B_ATTRIB, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; // ATTRIB
+    // the only commands we understand is WUPB, AFI=0, Select All, N=1:
+// static const uint8_t cmdWUPB[] = { ISO14443B_REQB, 0x00, 0x08, 0x39, 0x73 }; // WUPB
+    // ... and REQB, AFI=0, Normal Request, N=1:
+// static const uint8_t cmdREQB[] = { ISO14443B_REQB, 0x00, 0x00, 0x71, 0xFF }; // REQB
+    // ... and ATTRIB
+// static const uint8_t cmdATTRIB[] = { ISO14443B_ATTRIB, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; // ATTRIB
 
-	// ... if not PUPI/UID is supplied we always respond with ATQB, PUPI = 820de174, Application Data = 0x20381922,
-	// supports only 106kBit/s in both directions, max frame size = 32Bytes,
-	// supports ISO14443-4, FWI=8 (77ms), NAD supported, CID not supported:
-	uint8_t respATQB[] = { 	0x50, 0x82, 0x0d, 0xe1, 0x74, 0x20, 0x38, 0x19,
-							0x22, 0x00, 0x21, 0x85, 0x5e, 0xd7 };
+    // ... if not PUPI/UID is supplied we always respond with ATQB, PUPI = 820de174, Application Data = 0x20381922,
+    // supports only 106kBit/s in both directions, max frame size = 32Bytes,
+    // supports ISO14443-4, FWI=8 (77ms), NAD supported, CID not supported:
+    uint8_t respATQB[] = {  0x50, 0x82, 0x0d, 0xe1, 0x74, 0x20, 0x38, 0x19,
+                            0x22, 0x00, 0x21, 0x85, 0x5e, 0xd7 };
 
-	// response to HLTB and ATTRIB
-	static const uint8_t respOK[] = {0x00, 0x78, 0xF0};
+    // response to HLTB and ATTRIB
+    static const uint8_t respOK[] = {0x00, 0x78, 0xF0};
 
-	// ...PUPI/UID supplied from user. Adjust ATQB response accordingly
-	if ( pupi > 0 ) {
-		num_to_bytes(pupi, 4, respATQB+1);
-		AddCrc14B(respATQB, 12);
-	}
+    // ...PUPI/UID supplied from user. Adjust ATQB response accordingly
+    if ( pupi > 0 ) {
+        num_to_bytes(pupi, 4, respATQB+1);
+        AddCrc14B(respATQB, 12);
+    }
 
-	// prepare "ATQB" tag answer (encoded):
-	CodeIso14443bAsTag(respATQB, sizeof(respATQB));
-	uint8_t *encodedATQB = BigBuf_malloc(ToSendMax);
-	uint16_t encodedATQBLen = ToSendMax;
-	memcpy(encodedATQB, ToSend, ToSendMax);
+    // prepare "ATQB" tag answer (encoded):
+    CodeIso14443bAsTag(respATQB, sizeof(respATQB));
+    uint8_t *encodedATQB = BigBuf_malloc(ToSendMax);
+    uint16_t encodedATQBLen = ToSendMax;
+    memcpy(encodedATQB, ToSend, ToSendMax);
 
 
-	// prepare "OK" tag answer (encoded):
-	CodeIso14443bAsTag(respOK, sizeof(respOK));
-	uint8_t *encodedOK = BigBuf_malloc(ToSendMax);
-	uint16_t encodedOKLen = ToSendMax;
-	memcpy(encodedOK, ToSend, ToSendMax);
+    // prepare "OK" tag answer (encoded):
+    CodeIso14443bAsTag(respOK, sizeof(respOK));
+    uint8_t *encodedOK = BigBuf_malloc(ToSendMax);
+    uint16_t encodedOKLen = ToSendMax;
+    memcpy(encodedOK, ToSend, ToSendMax);
 
-	// Simulation loop
-	while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
-		WDT_HIT();
+    // Simulation loop
+    while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
+        WDT_HIT();
 
-		// find reader field
-		if (cardSTATE == SIM_NOFIELD) {
-			vHf = (MAX_ADC_HF_VOLTAGE * AvgAdc(ADC_CHAN_HF)) >> 10;
-			if ( vHf > MF_MINFIELDV ) {
-				cardSTATE = SIM_IDLE;
-				LED_A_ON();
-			}
-		}
-		if (cardSTATE == SIM_NOFIELD) continue;
+        // find reader field
+        if (cardSTATE == SIM_NOFIELD) {
+            vHf = (MAX_ADC_HF_VOLTAGE * AvgAdc(ADC_CHAN_HF)) >> 10;
+            if ( vHf > MF_MINFIELDV ) {
+                cardSTATE = SIM_IDLE;
+                LED_A_ON();
+            }
+        }
+        if (cardSTATE == SIM_NOFIELD) continue;
 
-		// Get reader command
-		if (!GetIso14443bCommandFromReader(receivedCmd, &len)) {
-			Dbprintf("button pressed, received %d commands", cmdsReceived);
-			break;
-		}
+        // Get reader command
+        if (!GetIso14443bCommandFromReader(receivedCmd, &len)) {
+            Dbprintf("button pressed, received %d commands", cmdsReceived);
+            break;
+        }
 
-		// ISO14443-B protocol states:
-		// REQ or WUP request in ANY state
-		// WUP in HALTED state
-		if (len == 5 ) {
-				if ( (receivedCmd[0] == ISO14443B_REQB && (receivedCmd[2] & 0x8)== 0x8 && cardSTATE == SIM_HALTED) ||
-            	      receivedCmd[0] == ISO14443B_REQB ){
-				LogTrace(receivedCmd, len, 0, 0, NULL, true);
-				cardSTATE = SIM_SELECTING;
-			}
-		}
+        // ISO14443-B protocol states:
+        // REQ or WUP request in ANY state
+        // WUP in HALTED state
+        if (len == 5 ) {
+                if ( (receivedCmd[0] == ISO14443B_REQB && (receivedCmd[2] & 0x8)== 0x8 && cardSTATE == SIM_HALTED) ||
+                      receivedCmd[0] == ISO14443B_REQB ){
+                LogTrace(receivedCmd, len, 0, 0, NULL, true);
+                cardSTATE = SIM_SELECTING;
+            }
+        }
 
-		/*
-		* How should this flow go?
-		*  REQB or WUPB
-		*   send response  ( waiting for Attrib)
-		*  ATTRIB
-		*   send response  ( waiting for commands 7816)
-		*  HALT
-		    send halt response ( waiting for wupb )
-		*/
+        /*
+        * How should this flow go?
+        *  REQB or WUPB
+        *   send response  ( waiting for Attrib)
+        *  ATTRIB
+        *   send response  ( waiting for commands 7816)
+        *  HALT
+            send halt response ( waiting for wupb )
+        */
 
-		switch (cardSTATE) {
-			//case SIM_NOFIELD:
-			case SIM_HALTED:
-			case SIM_IDLE: {
-				LogTrace(receivedCmd, len, 0, 0, NULL, true);
-				break;
-			}
-			case SIM_SELECTING: {
-				TransmitFor14443b_AsTag( encodedATQB, encodedATQBLen );
-				LogTrace(respATQB, sizeof(respATQB), 0, 0, NULL, false);
-				cardSTATE = SIM_WORK;
-				break;
-			}
-			case SIM_HALTING: {
-				TransmitFor14443b_AsTag( encodedOK, encodedOKLen );
-				LogTrace(respOK, sizeof(respOK), 0, 0, NULL, false);
-				cardSTATE = SIM_HALTED;
-				break;
-			}
-			case SIM_ACKNOWLEDGE: {
-				TransmitFor14443b_AsTag( encodedOK, encodedOKLen );
-				LogTrace(respOK, sizeof(respOK), 0, 0, NULL, false);
-				cardSTATE = SIM_IDLE;
-				break;
-			}
-			case SIM_WORK: {
-				if ( len == 7 && receivedCmd[0] == ISO14443B_HALT ) {
-					cardSTATE = SIM_HALTED;
-				} else if ( len == 11 && receivedCmd[0] == ISO14443B_ATTRIB ) {
-					cardSTATE = SIM_ACKNOWLEDGE;
-				} else {
-					// Todo:
-					// - SLOT MARKER
-					// - ISO7816
-					// - emulate with a memory dump
-					Dbprintf("new cmd from reader: len=%d, cmdsRecvd=%d", len, cmdsReceived);
+        switch (cardSTATE) {
+            //case SIM_NOFIELD:
+            case SIM_HALTED:
+            case SIM_IDLE: {
+                LogTrace(receivedCmd, len, 0, 0, NULL, true);
+                break;
+            }
+            case SIM_SELECTING: {
+                TransmitFor14443b_AsTag( encodedATQB, encodedATQBLen );
+                LogTrace(respATQB, sizeof(respATQB), 0, 0, NULL, false);
+                cardSTATE = SIM_WORK;
+                break;
+            }
+            case SIM_HALTING: {
+                TransmitFor14443b_AsTag( encodedOK, encodedOKLen );
+                LogTrace(respOK, sizeof(respOK), 0, 0, NULL, false);
+                cardSTATE = SIM_HALTED;
+                break;
+            }
+            case SIM_ACKNOWLEDGE: {
+                TransmitFor14443b_AsTag( encodedOK, encodedOKLen );
+                LogTrace(respOK, sizeof(respOK), 0, 0, NULL, false);
+                cardSTATE = SIM_IDLE;
+                break;
+            }
+            case SIM_WORK: {
+                if ( len == 7 && receivedCmd[0] == ISO14443B_HALT ) {
+                    cardSTATE = SIM_HALTED;
+                } else if ( len == 11 && receivedCmd[0] == ISO14443B_ATTRIB ) {
+                    cardSTATE = SIM_ACKNOWLEDGE;
+                } else {
+                    // Todo:
+                    // - SLOT MARKER
+                    // - ISO7816
+                    // - emulate with a memory dump
+                    Dbprintf("new cmd from reader: len=%d, cmdsRecvd=%d", len, cmdsReceived);
 
-					// CRC Check
-					if (len >= 3){ // if crc exists
+                    // CRC Check
+                    if (len >= 3){ // if crc exists
 
-						if (!check_crc(CRC_14443_B, receivedCmd, len))
-							DbpString("+++CRC fail");
-						else
-							DbpString("CRC passes");
-					}
-					cardSTATE = SIM_IDLE;
-				}
-				break;
-			}
-			default: break;
-		}
+                        if (!check_crc(CRC_14443_B, receivedCmd, len))
+                            DbpString("+++CRC fail");
+                        else
+                            DbpString("CRC passes");
+                    }
+                    cardSTATE = SIM_IDLE;
+                }
+                break;
+            }
+            default: break;
+        }
 
-		++cmdsReceived;
-	}
-	if (MF_DBGLEVEL >= 2)
-		Dbprintf("Emulator stopped. Trace length: %d ", BigBuf_get_traceLen());
-	switch_off(); //simulate
+        ++cmdsReceived;
+    }
+    if (MF_DBGLEVEL >= 2)
+        Dbprintf("Emulator stopped. Trace length: %d ", BigBuf_get_traceLen());
+    switch_off(); //simulate
 }
 
 //=============================================================================
@@ -736,202 +736,202 @@ void SimulateIso14443bTag(uint32_t pupi) {
  *
  */
 static RAMFUNC int Handle14443bTagSamplesDemod(int ci, int cq) {
-	int v = 0, myI = ABS(ci), myQ = ABS(cq);
+    int v = 0, myI = ABS(ci), myQ = ABS(cq);
 
 // The soft decision on the bit uses an estimate of just the
 // quadrant of the reference angle, not the exact angle.
 #define MAKE_SOFT_DECISION() { \
-		if (Demod.sumI > 0) { \
-			v = ci; \
-		} else { \
-			v = -ci; \
-		} \
-		if (Demod.sumQ > 0) { \
-			v += cq; \
-		} else { \
-			v -= cq; \
-		} \
-	}
+        if (Demod.sumI > 0) { \
+            v = ci; \
+        } else { \
+            v = -ci; \
+        } \
+        if (Demod.sumQ > 0) { \
+            v += cq; \
+        } else { \
+            v -= cq; \
+        } \
+    }
 
 // Subcarrier amplitude v = sqrt(ci^2 + cq^2), approximated here by abs(ci) + abs(cq)
 // Subcarrier amplitude v = sqrt(ci^2 + cq^2), approximated here by max(abs(ci),abs(cq)) + 1/2*min(abs(ci),abs(cq)))
 #define CHECK_FOR_SUBCARRIER_old() { \
-		if (ci < 0) { \
-			if (cq < 0) { /* ci < 0, cq < 0 */ \
-				if (cq < ci) { \
-					v = -cq - (ci >> 1); \
-				} else { \
-					v = -ci - (cq >> 1); \
-				} \
-			} else {	/* ci < 0, cq >= 0 */ \
-				if (cq < -ci) { \
-					v = -ci + (cq >> 1); \
-				} else { \
-					v = cq - (ci >> 1); \
-				} \
-			} \
-		} else { \
-			if (cq < 0) { /* ci >= 0, cq < 0 */ \
-				if (-cq < ci) { \
-					v = ci - (cq >> 1); \
-				} else { \
-					v = -cq + (ci >> 1); \
-				} \
-			} else {	/* ci >= 0, cq >= 0 */ \
-				if (cq < ci) { \
-					v = ci + (cq >> 1); \
-				} else { \
-					v = cq + (ci >> 1); \
-				} \
-			} \
-		} \
-	}
+        if (ci < 0) { \
+            if (cq < 0) { /* ci < 0, cq < 0 */ \
+                if (cq < ci) { \
+                    v = -cq - (ci >> 1); \
+                } else { \
+                    v = -ci - (cq >> 1); \
+                } \
+            } else { /* ci < 0, cq >= 0 */ \
+                if (cq < -ci) { \
+                    v = -ci + (cq >> 1); \
+                } else { \
+                    v = cq - (ci >> 1); \
+                } \
+            } \
+        } else { \
+            if (cq < 0) { /* ci >= 0, cq < 0 */ \
+                if (-cq < ci) { \
+                    v = ci - (cq >> 1); \
+                } else { \
+                    v = -cq + (ci >> 1); \
+                } \
+            } else { /* ci >= 0, cq >= 0 */ \
+                if (cq < ci) { \
+                    v = ci + (cq >> 1); \
+                } else { \
+                    v = cq + (ci >> 1); \
+                } \
+            } \
+        } \
+    }
 
 //note: couldn't we just use MAX(ABS(ci),ABS(cq)) + (MIN(ABS(ci),ABS(cq))/2) from common.h - marshmellow
 #define CHECK_FOR_SUBCARRIER() { v = MAX(myI, myQ) + (MIN(myI, myQ) >> 1); }
 
-	switch(Demod.state) {
-		case DEMOD_UNSYNCD:
+    switch(Demod.state) {
+        case DEMOD_UNSYNCD:
 
-			CHECK_FOR_SUBCARRIER();
+            CHECK_FOR_SUBCARRIER();
 
-			// subcarrier detected
+            // subcarrier detected
 
-			if (v > SUBCARRIER_DETECT_THRESHOLD) {
-				Demod.state = DEMOD_PHASE_REF_TRAINING;
-				Demod.sumI = ci;
-				Demod.sumQ = cq;
-				Demod.posCount = 1;
-			}
-			break;
+            if (v > SUBCARRIER_DETECT_THRESHOLD) {
+                Demod.state = DEMOD_PHASE_REF_TRAINING;
+                Demod.sumI = ci;
+                Demod.sumQ = cq;
+                Demod.posCount = 1;
+            }
+            break;
 
-		case DEMOD_PHASE_REF_TRAINING:
-			if (Demod.posCount < 8) {
+        case DEMOD_PHASE_REF_TRAINING:
+            if (Demod.posCount < 8) {
 
-				CHECK_FOR_SUBCARRIER();
+                CHECK_FOR_SUBCARRIER();
 
-				if (v > SUBCARRIER_DETECT_THRESHOLD) {
-					// set the reference phase (will code a logic '1') by averaging over 32 1/fs.
-					// note: synchronization time > 80 1/fs
-					Demod.sumI += ci;
-					Demod.sumQ += cq;
-					Demod.posCount++;
-				} else {
-					// subcarrier lost
-					Demod.state = DEMOD_UNSYNCD;
-				}
-			} else {
-				Demod.state = DEMOD_AWAITING_FALLING_EDGE_OF_SOF;
-			}
-			break;
+                if (v > SUBCARRIER_DETECT_THRESHOLD) {
+                    // set the reference phase (will code a logic '1') by averaging over 32 1/fs.
+                    // note: synchronization time > 80 1/fs
+                    Demod.sumI += ci;
+                    Demod.sumQ += cq;
+                    Demod.posCount++;
+                } else {
+                    // subcarrier lost
+                    Demod.state = DEMOD_UNSYNCD;
+                }
+            } else {
+                Demod.state = DEMOD_AWAITING_FALLING_EDGE_OF_SOF;
+            }
+            break;
 
-		case DEMOD_AWAITING_FALLING_EDGE_OF_SOF:
+        case DEMOD_AWAITING_FALLING_EDGE_OF_SOF:
 
-			MAKE_SOFT_DECISION();
+            MAKE_SOFT_DECISION();
 
-			if (v < 0) {	// logic '0' detected
-				Demod.state = DEMOD_GOT_FALLING_EDGE_OF_SOF;
-				Demod.posCount = 0;	// start of SOF sequence
-			} else {
-				// maximum length of TR1 = 200 1/fs
-				if (Demod.posCount > 200/4) Demod.state = DEMOD_UNSYNCD;
-			}
-			Demod.posCount++;
-			break;
+            if (v < 0) { // logic '0' detected
+                Demod.state = DEMOD_GOT_FALLING_EDGE_OF_SOF;
+                Demod.posCount = 0; // start of SOF sequence
+            } else {
+                // maximum length of TR1 = 200 1/fs
+                if (Demod.posCount > 200/4) Demod.state = DEMOD_UNSYNCD;
+            }
+            Demod.posCount++;
+            break;
 
-		case DEMOD_GOT_FALLING_EDGE_OF_SOF:
-			Demod.posCount++;
+        case DEMOD_GOT_FALLING_EDGE_OF_SOF:
+            Demod.posCount++;
 
-			MAKE_SOFT_DECISION();
+            MAKE_SOFT_DECISION();
 
-			if (v > 0) {
-				// low phase of SOF too short (< 9 etu). Note: spec is >= 10, but FPGA tends to "smear" edges
-				if (Demod.posCount < 9*2) {
-					Demod.state = DEMOD_UNSYNCD;
-				} else {
-					LED_C_ON(); // Got SOF
-					Demod.state = DEMOD_AWAITING_START_BIT;
-					Demod.posCount = 0;
-					Demod.len = 0;
-				}
-			} else {
-				// low phase of SOF too long (> 12 etu)
-				if (Demod.posCount > 14*2) {
-					Demod.state = DEMOD_UNSYNCD;
-					LED_C_OFF();
-				}
-			}
-			break;
+            if (v > 0) {
+                // low phase of SOF too short (< 9 etu). Note: spec is >= 10, but FPGA tends to "smear" edges
+                if (Demod.posCount < 9*2) {
+                    Demod.state = DEMOD_UNSYNCD;
+                } else {
+                    LED_C_ON(); // Got SOF
+                    Demod.state = DEMOD_AWAITING_START_BIT;
+                    Demod.posCount = 0;
+                    Demod.len = 0;
+                }
+            } else {
+                // low phase of SOF too long (> 12 etu)
+                if (Demod.posCount > 14*2) {
+                    Demod.state = DEMOD_UNSYNCD;
+                    LED_C_OFF();
+                }
+            }
+            break;
 
-		case DEMOD_AWAITING_START_BIT:
-			Demod.posCount++;
+        case DEMOD_AWAITING_START_BIT:
+            Demod.posCount++;
 
-			MAKE_SOFT_DECISION();
+            MAKE_SOFT_DECISION();
 
-			if (v > 0) {
-				if (Demod.posCount > 6*2) { 		// max 19us between characters = 16 1/fs, max 3 etu after low phase of SOF = 24 1/fs
-					Demod.state = DEMOD_UNSYNCD;
-					LED_C_OFF();
-				}
-			} else {							// start bit detected
-				Demod.bitCount = 0;
-				Demod.posCount = 1;				// this was the first half
-				Demod.thisBit = v;
-				Demod.shiftReg = 0;
-				Demod.state = DEMOD_RECEIVING_DATA;
-			}
-			break;
+            if (v > 0) {
+                if (Demod.posCount > 6*2) {     // max 19us between characters = 16 1/fs, max 3 etu after low phase of SOF = 24 1/fs
+                    Demod.state = DEMOD_UNSYNCD;
+                    LED_C_OFF();
+                }
+            } else {                            // start bit detected
+                Demod.bitCount = 0;
+                Demod.posCount = 1;             // this was the first half
+                Demod.thisBit = v;
+                Demod.shiftReg = 0;
+                Demod.state = DEMOD_RECEIVING_DATA;
+            }
+            break;
 
-		case DEMOD_RECEIVING_DATA:
+        case DEMOD_RECEIVING_DATA:
 
-			MAKE_SOFT_DECISION();
+            MAKE_SOFT_DECISION();
 
-			if (Demod.posCount == 0) {
-				// first half of bit
-				Demod.thisBit = v;
-				Demod.posCount = 1;
-			} else {
-				// second half of bit
-				Demod.thisBit += v;
-				Demod.shiftReg >>= 1;
+            if (Demod.posCount == 0) {
+                // first half of bit
+                Demod.thisBit = v;
+                Demod.posCount = 1;
+            } else {
+                // second half of bit
+                Demod.thisBit += v;
+                Demod.shiftReg >>= 1;
 
-				// OR in a logic '1'
-				if (Demod.thisBit > 0)
-					Demod.shiftReg |= 0x200;
+                // OR in a logic '1'
+                if (Demod.thisBit > 0)
+                    Demod.shiftReg |= 0x200;
 
-				Demod.bitCount++;
+                Demod.bitCount++;
 
-				// 1 start 8 data 1 stop = 10
-				if (Demod.bitCount == 10) {
+                // 1 start 8 data 1 stop = 10
+                if (Demod.bitCount == 10) {
 
-					uint16_t s = Demod.shiftReg;
+                    uint16_t s = Demod.shiftReg;
 
-					// stop bit == '1', start bit == '0'
-					if ((s & 0x200) && (s & 0x001) == 0 ) {
-						// left shift to drop the startbit
-						uint8_t b = (s >> 1);
-						Demod.output[Demod.len] = b;
-						++Demod.len;
-						Demod.state = DEMOD_AWAITING_START_BIT;
-					} else {
-						// this one is a bit hard,  either its a correc byte or its unsynced.
-						Demod.state = DEMOD_UNSYNCD;
-						LED_C_OFF();
+                    // stop bit == '1', start bit == '0'
+                    if ((s & 0x200) && (s & 0x001) == 0 ) {
+                        // left shift to drop the startbit
+                        uint8_t b = (s >> 1);
+                        Demod.output[Demod.len] = b;
+                        ++Demod.len;
+                        Demod.state = DEMOD_AWAITING_START_BIT;
+                    } else {
+                        // this one is a bit hard,  either its a correc byte or its unsynced.
+                        Demod.state = DEMOD_UNSYNCD;
+                        LED_C_OFF();
 
-						// This is EOF (start, stop and all data bits == '0'
-						if (s == 0) return true;
-					}
-				}
-				Demod.posCount = 0;
-			}
-			break;
+                        // This is EOF (start, stop and all data bits == '0'
+                        if (s == 0) return true;
+                    }
+                }
+                Demod.posCount = 0;
+            }
+            break;
 
-		default:
-			Demod.state = DEMOD_UNSYNCD;
-			LED_C_OFF();
-			break;
-	}
-	return false;
+        default:
+            Demod.state = DEMOD_UNSYNCD;
+            LED_C_OFF();
+            break;
+    }
+    return false;
 }
 
 
@@ -940,99 +940,99 @@ static RAMFUNC int Handle14443bTagSamplesDemod(int ci, int cq) {
  *  quiet: set to 'TRUE' to disable debug output
  */
 static void GetTagSamplesFor14443bDemod() {
-	bool gotFrame = false, finished = false;
-	int lastRxCounter = ISO14443B_DMA_BUFFER_SIZE;
-	int ci = 0, cq = 0;
-	uint32_t time_0 = 0, time_stop = 0;
+    bool gotFrame = false, finished = false;
+    int lastRxCounter = ISO14443B_DMA_BUFFER_SIZE;
+    int ci = 0, cq = 0;
+    uint32_t time_0 = 0, time_stop = 0;
 
-	BigBuf_free();
+    BigBuf_free();
 
-	// Set up the demodulator for tag -> reader responses.
-	DemodInit(BigBuf_malloc(MAX_FRAME_SIZE));
+    // Set up the demodulator for tag -> reader responses.
+    DemodInit(BigBuf_malloc(MAX_FRAME_SIZE));
 
-	// The DMA buffer, used to stream samples from the FPGA
-	int8_t *dmaBuf = (int8_t*) BigBuf_malloc(ISO14443B_DMA_BUFFER_SIZE);
-	int8_t *upTo = dmaBuf;
+    // The DMA buffer, used to stream samples from the FPGA
+    int8_t *dmaBuf = (int8_t*) BigBuf_malloc(ISO14443B_DMA_BUFFER_SIZE);
+    int8_t *upTo = dmaBuf;
 
-	// Setup and start DMA.
-	if ( !FpgaSetupSscDma((uint8_t*) dmaBuf, ISO14443B_DMA_BUFFER_SIZE) ){
-		if (MF_DBGLEVEL > 1) Dbprintf("FpgaSetupSscDma failed. Exiting");
-		return;
-	}
+    // Setup and start DMA.
+    if ( !FpgaSetupSscDma((uint8_t*) dmaBuf, ISO14443B_DMA_BUFFER_SIZE) ){
+        if (MF_DBGLEVEL > 1) Dbprintf("FpgaSetupSscDma failed. Exiting");
+        return;
+    }
 
-	// And put the FPGA in the appropriate mode
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR | FPGA_HF_READER_RX_XCORR_848_KHZ);
+    // And put the FPGA in the appropriate mode
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR | FPGA_HF_READER_RX_XCORR_848_KHZ);
 
-	// get current clock
-	time_0 = GetCountSspClk();
+    // get current clock
+    time_0 = GetCountSspClk();
 
-	// rx counter - dma counter? (how much?) & (mod) mask > 2. (since 2bytes at the time is read)
-	while ( !finished ) {
+    // rx counter - dma counter? (how much?) & (mod) mask > 2. (since 2bytes at the time is read)
+    while ( !finished ) {
 
-		LED_A_INV();
-		WDT_HIT();
+        LED_A_INV();
+        WDT_HIT();
 
-		// LSB is a fpga signal bit.
-		ci = upTo[0];
-		cq = upTo[1];
-		upTo += 2;
-		lastRxCounter -= 2;
+        // LSB is a fpga signal bit.
+        ci = upTo[0];
+        cq = upTo[1];
+        upTo += 2;
+        lastRxCounter -= 2;
 
-		// restart DMA buffer to receive again.
-		if(upTo >= dmaBuf + ISO14443B_DMA_BUFFER_SIZE) {
-			upTo = dmaBuf;
-			lastRxCounter = ISO14443B_DMA_BUFFER_SIZE;
-			AT91C_BASE_PDC_SSC->PDC_RNPR = (uint32_t) upTo;
-			AT91C_BASE_PDC_SSC->PDC_RNCR = ISO14443B_DMA_BUFFER_SIZE;
-		}
+        // restart DMA buffer to receive again.
+        if(upTo >= dmaBuf + ISO14443B_DMA_BUFFER_SIZE) {
+            upTo = dmaBuf;
+            lastRxCounter = ISO14443B_DMA_BUFFER_SIZE;
+            AT91C_BASE_PDC_SSC->PDC_RNPR = (uint32_t) upTo;
+            AT91C_BASE_PDC_SSC->PDC_RNCR = ISO14443B_DMA_BUFFER_SIZE;
+        }
 
-		// https://github.com/Proxmark/proxmark3/issues/103
-		gotFrame =  Handle14443bTagSamplesDemod(ci, cq);
-		time_stop = GetCountSspClk() - time_0;
+        // https://github.com/Proxmark/proxmark3/issues/103
+        gotFrame =  Handle14443bTagSamplesDemod(ci, cq);
+        time_stop = GetCountSspClk() - time_0;
 
-		finished = (time_stop > iso14b_timeout || gotFrame);
-	}
+        finished = (time_stop > iso14b_timeout || gotFrame);
+    }
 
-	FpgaDisableSscDma();
+    FpgaDisableSscDma();
 
-	if ( upTo )
-		upTo = NULL;
+    if ( upTo )
+        upTo = NULL;
 
-	if ( Demod.len > 0 )
-		LogTrace(Demod.output, Demod.len, time_0, time_stop, NULL, false);
+    if ( Demod.len > 0 )
+        LogTrace(Demod.output, Demod.len, time_0, time_stop, NULL, false);
 }
 
 //-----------------------------------------------------------------------------
 // Transmit the command (to the tag) that was placed in ToSend[].
 //-----------------------------------------------------------------------------
 static void TransmitFor14443b_AsReader(void) {
-	int c;
+    int c;
 
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_TX | FPGA_HF_READER_TX_SHALLOW_MOD);
-	SpinDelay(60);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_TX | FPGA_HF_READER_TX_SHALLOW_MOD);
+    SpinDelay(60);
 
-	// What does this loop do? Is it TR1?
-	// 0xFF = 8 bits of 1.    1 bit == 1Etu,..
-	// loop 10 * 8 = 80 ETU of delay, with a non modulated signal.  why?
-	// 80*9 = 720us.
+    // What does this loop do? Is it TR1?
+    // 0xFF = 8 bits of 1.    1 bit == 1Etu,..
+    // loop 10 * 8 = 80 ETU of delay, with a non modulated signal.  why?
+    // 80*9 = 720us.
 
-   	for(c = 0; c < 50;) {
+    for(c = 0; c < 50;) {
 
-		if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
-			AT91C_BASE_SSC->SSC_THR = 0xFF;
-			c++;
-		}
-	}
+        if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
+            AT91C_BASE_SSC->SSC_THR = 0xFF;
+            c++;
+        }
+    }
 
-	// Send frame loop
-	for(c = 0; c < ToSendMax;) {
+    // Send frame loop
+    for(c = 0; c < ToSendMax;) {
 
-		// Put byte into tx holding register as soon as it is ready
-		if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
-			AT91C_BASE_SSC->SSC_THR = ToSend[c++];
-		}
-	}
-	WDT_HIT();
+        // Put byte into tx holding register as soon as it is ready
+        if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
+            AT91C_BASE_SSC->SSC_THR = ToSend[c++];
+        }
+    }
+    WDT_HIT();
 }
 
 //-----------------------------------------------------------------------------
@@ -1040,81 +1040,81 @@ static void TransmitFor14443b_AsReader(void) {
 // so that it is ready to transmit to the tag using TransmitFor14443b().
 //-----------------------------------------------------------------------------
 static void CodeIso14443bAsReader(const uint8_t *cmd, int len) {
-	/*
-	*  Reader data transmission:
-	*   - no modulation ONES
-	*   - SOF
-	*   - Command, data and CRC_B
-	*   - EOF
-	*   - no modulation ONES
-	*
-	* 	1 ETU == 1 BIT!
-	*   TR0 - 8 ETUS minimum.
-	*
-	*   QUESTION:  how long is a 1 or 0 in pulses in the xcorr_848 mode?
-	*              1 "stuffbit" = 1ETU (9us)
-	*/
-	int i;
-	uint8_t b;
+    /*
+    *  Reader data transmission:
+    *   - no modulation ONES
+    *   - SOF
+    *   - Command, data and CRC_B
+    *   - EOF
+    *   - no modulation ONES
+    *
+    *   1 ETU == 1 BIT!
+    *   TR0 - 8 ETUS minimum.
+    *
+    *   QUESTION:  how long is a 1 or 0 in pulses in the xcorr_848 mode?
+    *              1 "stuffbit" = 1ETU (9us)
+    */
+    int i;
+    uint8_t b;
 
-	ToSendReset();
+    ToSendReset();
 
-	// Send SOF
-	// 10-11 ETUs of ZERO
-	for(i = 0; i < 10; ++i) ToSendStuffBit(0);
+    // Send SOF
+    // 10-11 ETUs of ZERO
+    for(i = 0; i < 10; ++i) ToSendStuffBit(0);
 
-	// 2-3 ETUs of ONE
-	ToSendStuffBit(1);
-	ToSendStuffBit(1);
-//	ToSendStuffBit(1);
+    // 2-3 ETUs of ONE
+    ToSendStuffBit(1);
+    ToSendStuffBit(1);
+//  ToSendStuffBit(1);
 
-	// Sending cmd, LSB
-	// from here we add BITS
-	for(i = 0; i < len; ++i) {
-	    // Start bit
-		ToSendStuffBit(0);
-		// Data bits
-		b = cmd[i];
-		// if (  b & 1 )    ToSendStuffBit(1); else ToSendStuffBit(0);
-		// if ( (b>>1) & 1) ToSendStuffBit(1); else ToSendStuffBit(0);
-		// if ( (b>>2) & 1) ToSendStuffBit(1); else ToSendStuffBit(0);
-		// if ( (b>>3) & 1) ToSendStuffBit(1); else ToSendStuffBit(0);
-		// if ( (b>>4) & 1) ToSendStuffBit(1); else ToSendStuffBit(0);
-		// if ( (b>>5) & 1) ToSendStuffBit(1); else ToSendStuffBit(0);
-		// if ( (b>>6) & 1) ToSendStuffBit(1); else ToSendStuffBit(0);
-		// if ( (b>>7) & 1) ToSendStuffBit(1); else ToSendStuffBit(0);
+    // Sending cmd, LSB
+    // from here we add BITS
+    for(i = 0; i < len; ++i) {
+        // Start bit
+        ToSendStuffBit(0);
+        // Data bits
+        b = cmd[i];
+        // if (  b & 1 )    ToSendStuffBit(1); else ToSendStuffBit(0);
+        // if ( (b>>1) & 1) ToSendStuffBit(1); else ToSendStuffBit(0);
+        // if ( (b>>2) & 1) ToSendStuffBit(1); else ToSendStuffBit(0);
+        // if ( (b>>3) & 1) ToSendStuffBit(1); else ToSendStuffBit(0);
+        // if ( (b>>4) & 1) ToSendStuffBit(1); else ToSendStuffBit(0);
+        // if ( (b>>5) & 1) ToSendStuffBit(1); else ToSendStuffBit(0);
+        // if ( (b>>6) & 1) ToSendStuffBit(1); else ToSendStuffBit(0);
+        // if ( (b>>7) & 1) ToSendStuffBit(1); else ToSendStuffBit(0);
 
-		ToSendStuffBit(  b & 1);
-		ToSendStuffBit( (b>>1) & 1);
-		ToSendStuffBit( (b>>2) & 1);
-		ToSendStuffBit( (b>>3) & 1);
-		ToSendStuffBit( (b>>4) & 1);
-		ToSendStuffBit( (b>>5) & 1);
-		ToSendStuffBit( (b>>6) & 1);
-		ToSendStuffBit( (b>>7) & 1);
+        ToSendStuffBit(  b & 1);
+        ToSendStuffBit( (b>>1) & 1);
+        ToSendStuffBit( (b>>2) & 1);
+        ToSendStuffBit( (b>>3) & 1);
+        ToSendStuffBit( (b>>4) & 1);
+        ToSendStuffBit( (b>>5) & 1);
+        ToSendStuffBit( (b>>6) & 1);
+        ToSendStuffBit( (b>>7) & 1);
 
-		// Stop bit
-		ToSendStuffBit(1);
-		// EGT extra guard time
-		// For PCD it ranges 0-57us (1etu = 9us)
-		ToSendStuffBit(1);
-		ToSendStuffBit(1);
-		ToSendStuffBit(1);
-	}
+        // Stop bit
+        ToSendStuffBit(1);
+        // EGT extra guard time
+        // For PCD it ranges 0-57us (1etu = 9us)
+        ToSendStuffBit(1);
+        ToSendStuffBit(1);
+        ToSendStuffBit(1);
+    }
 
-	// Send EOF
-	// 10-11 ETUs of ZERO
-	for(i = 0; i < 10; ++i) ToSendStuffBit(0);
+    // Send EOF
+    // 10-11 ETUs of ZERO
+    for(i = 0; i < 10; ++i) ToSendStuffBit(0);
 
-	// Transition time. TR0 - guard time
-	// 8ETUS minum?
-	// Per specification, Subcarrier must be stopped no later than 2 ETUs after EOF.
-	// I'm guessing this is for the FPGA to be able to send all bits before we switch to listening mode
-	for(i = 0; i < 24 ; ++i) ToSendStuffBit(1);
+    // Transition time. TR0 - guard time
+    // 8ETUS minum?
+    // Per specification, Subcarrier must be stopped no later than 2 ETUs after EOF.
+    // I'm guessing this is for the FPGA to be able to send all bits before we switch to listening mode
+    for(i = 0; i < 24 ; ++i) ToSendStuffBit(1);
 
-	// TR1 - Synchronization time
-	// Convert from last character reference to length
-	ToSendMax++;
+    // TR1 - Synchronization time
+    // Convert from last character reference to length
+    ToSendMax++;
 }
 
 /*
@@ -1122,15 +1122,15 @@ static void CodeIso14443bAsReader(const uint8_t *cmd, int len) {
 */
 static void CodeAndTransmit14443bAsReader(const uint8_t *cmd, int len) {
 
-	uint32_t time_start = GetCountSspClk();
+    uint32_t time_start = GetCountSspClk();
 
-	CodeIso14443bAsReader(cmd, len);
+    CodeIso14443bAsReader(cmd, len);
 
-	TransmitFor14443b_AsReader();
+    TransmitFor14443b_AsReader();
 
-	if(trigger) LED_A_ON();
+    if(trigger) LED_A_ON();
 
-	LogTrace(cmd, len, time_start, GetCountSspClk()-time_start, NULL, true);
+    LogTrace(cmd, len, time_start, GetCountSspClk()-time_start, NULL, true);
 }
 
 /* Sends an APDU to the tag
@@ -1138,91 +1138,91 @@ static void CodeAndTransmit14443bAsReader(const uint8_t *cmd, int len) {
  */
 uint8_t iso14443b_apdu(uint8_t const *message, size_t message_length, uint8_t *response) {
 
-	uint8_t message_frame[message_length + 4];
-	// PCB
-	message_frame[0] = 0x0A | pcb_blocknum;
-	pcb_blocknum ^= 1;
-	// CID
-	message_frame[1] = 0;
-	// INF
-	memcpy(message_frame + 2, message, message_length);
-	// EDC (CRC)
-	AddCrc14B(message_frame, message_length + 2);
-	// send
-	CodeAndTransmit14443bAsReader(message_frame, message_length + 4); //no
-	// get response
-	GetTagSamplesFor14443bDemod(); //no
-	if(Demod.len < 3)
-		return 0;
+    uint8_t message_frame[message_length + 4];
+    // PCB
+    message_frame[0] = 0x0A | pcb_blocknum;
+    pcb_blocknum ^= 1;
+    // CID
+    message_frame[1] = 0;
+    // INF
+    memcpy(message_frame + 2, message, message_length);
+    // EDC (CRC)
+    AddCrc14B(message_frame, message_length + 2);
+    // send
+    CodeAndTransmit14443bAsReader(message_frame, message_length + 4); //no
+    // get response
+    GetTagSamplesFor14443bDemod(); //no
+    if(Demod.len < 3)
+        return 0;
 
-	// VALIDATE CRC
-	if (!check_crc(CRC_14443_B, Demod.output, Demod.len)){
-		if (MF_DBGLEVEL > 3) Dbprintf("crc fail ICE");
-		return 0;
-	}
-	// copy response contents
-	if(response != NULL)
-		memcpy(response, Demod.output, Demod.len);
+    // VALIDATE CRC
+    if (!check_crc(CRC_14443_B, Demod.output, Demod.len)){
+        if (MF_DBGLEVEL > 3) Dbprintf("crc fail ICE");
+        return 0;
+    }
+    // copy response contents
+    if(response != NULL)
+        memcpy(response, Demod.output, Demod.len);
 
-	return Demod.len;
+    return Demod.len;
 }
 
 /**
 * SRx Initialise.
 */
 uint8_t iso14443b_select_srx_card(iso14b_card_select_t *card ) {
-	// INITIATE command: wake up the tag using the INITIATE
-	static const uint8_t init_srx[] = { ISO14443B_INITIATE, 0x00, 0x97, 0x5b };
-	// SELECT command (with space for CRC)
-	uint8_t select_srx[] = { ISO14443B_SELECT, 0x00, 0x00, 0x00};
+    // INITIATE command: wake up the tag using the INITIATE
+    static const uint8_t init_srx[] = { ISO14443B_INITIATE, 0x00, 0x97, 0x5b };
+    // SELECT command (with space for CRC)
+    uint8_t select_srx[] = { ISO14443B_SELECT, 0x00, 0x00, 0x00};
 
-	CodeAndTransmit14443bAsReader(init_srx, sizeof(init_srx));
-	GetTagSamplesFor14443bDemod(); //no
+    CodeAndTransmit14443bAsReader(init_srx, sizeof(init_srx));
+    GetTagSamplesFor14443bDemod(); //no
 
-	if (Demod.len == 0)
-		return 2;
+    if (Demod.len == 0)
+        return 2;
 
-	// Randomly generated Chip ID
-	if (card) card->chipid = Demod.output[0];
+    // Randomly generated Chip ID
+    if (card) card->chipid = Demod.output[0];
 
-	select_srx[1] = Demod.output[0];
+    select_srx[1] = Demod.output[0];
 
-	AddCrc14B(select_srx, 2);
+    AddCrc14B(select_srx, 2);
 
-	CodeAndTransmit14443bAsReader(select_srx, sizeof(select_srx));
-	GetTagSamplesFor14443bDemod(); //no
+    CodeAndTransmit14443bAsReader(select_srx, sizeof(select_srx));
+    GetTagSamplesFor14443bDemod(); //no
 
-	if (Demod.len != 3)
-		return 2;
+    if (Demod.len != 3)
+        return 2;
 
-	// Check the CRC of the answer:
-	if (!check_crc(CRC_14443_B, Demod.output, Demod.len))
-		return 3;
+    // Check the CRC of the answer:
+    if (!check_crc(CRC_14443_B, Demod.output, Demod.len))
+        return 3;
 
-	// Check response from the tag: should be the same UID as the command we just sent:
-	if (select_srx[1] != Demod.output[0])
-		return 1;
+    // Check response from the tag: should be the same UID as the command we just sent:
+    if (select_srx[1] != Demod.output[0])
+        return 1;
 
-	// First get the tag's UID:
-	select_srx[0] = ISO14443B_GET_UID;
+    // First get the tag's UID:
+    select_srx[0] = ISO14443B_GET_UID;
 
-	AddCrc14B(select_srx, 1);
-	CodeAndTransmit14443bAsReader(select_srx, 3); // Only first three bytes for this one
-	GetTagSamplesFor14443bDemod(); //no
+    AddCrc14B(select_srx, 1);
+    CodeAndTransmit14443bAsReader(select_srx, 3); // Only first three bytes for this one
+    GetTagSamplesFor14443bDemod(); //no
 
-	if (Demod.len != 10)
-		return 2;
+    if (Demod.len != 10)
+        return 2;
 
-	// The check the CRC of the answer
-	if (!check_crc(CRC_14443_B, Demod.output, Demod.len))
-		return 3;
+    // The check the CRC of the answer
+    if (!check_crc(CRC_14443_B, Demod.output, Demod.len))
+        return 3;
 
-	if (card) {
-		card->uidlen = 8;
-		memcpy(card->uid, Demod.output, 8);
-	}
+    if (card) {
+        card->uidlen = 8;
+        memcpy(card->uid, Demod.output, 8);
+    }
 
-	return 0;
+    return 0;
 }
 /* Perform the ISO 14443 B Card Selection procedure
  * Currently does NOT do any collision handling.
@@ -1231,29 +1231,29 @@ uint8_t iso14443b_select_srx_card(iso14b_card_select_t *card ) {
  * TODO: Verify CRC checksums
  */
 uint8_t iso14443b_select_card(iso14b_card_select_t *card ) {
-	// WUPB command (including CRC)
-	// Note: WUPB wakes up all tags, REQB doesn't wake up tags in HALT state
-	static const uint8_t wupb[] = { ISO14443B_REQB, 0x00, 0x08, 0x39, 0x73 };
-	// ATTRIB command (with space for CRC)
-	uint8_t attrib[] = { ISO14443B_ATTRIB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00};
+    // WUPB command (including CRC)
+    // Note: WUPB wakes up all tags, REQB doesn't wake up tags in HALT state
+    static const uint8_t wupb[] = { ISO14443B_REQB, 0x00, 0x08, 0x39, 0x73 };
+    // ATTRIB command (with space for CRC)
+    uint8_t attrib[] = { ISO14443B_ATTRIB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00};
 
-	// first, wake up the tag
-	CodeAndTransmit14443bAsReader(wupb, sizeof(wupb));
-	GetTagSamplesFor14443bDemod(); //select_card
+    // first, wake up the tag
+    CodeAndTransmit14443bAsReader(wupb, sizeof(wupb));
+    GetTagSamplesFor14443bDemod(); //select_card
 
-	// ATQB too short?
-	if (Demod.len < 14)
-		return 2;
+    // ATQB too short?
+    if (Demod.len < 14)
+        return 2;
 
-	// VALIDATE CRC
-	if (!check_crc(CRC_14443_B, Demod.output, Demod.len))
-		return 3;
+    // VALIDATE CRC
+    if (!check_crc(CRC_14443_B, Demod.output, Demod.len))
+        return 3;
 
-	if (card) {
-		card->uidlen = 4;
-		memcpy(card->uid, Demod.output+1, 4);
-		memcpy(card->atqb, Demod.output+5, 7);
-	}
+    if (card) {
+        card->uidlen = 4;
+        memcpy(card->uid, Demod.output+1, 4);
+        memcpy(card->atqb, Demod.output+5, 7);
+    }
 
     // copy the PUPI to ATTRIB  ( PUPI == UID )
     memcpy(attrib + 1, Demod.output + 1, 4);
@@ -1267,63 +1267,63 @@ uint8_t iso14443b_select_card(iso14b_card_select_t *card ) {
 
     // Answer to ATTRIB too short?
     if(Demod.len < 3)
-		return 2;
+        return 2;
 
-	// VALIDATE CRC
-	if (!check_crc(CRC_14443_B, Demod.output, Demod.len) )
-		return 3;
+    // VALIDATE CRC
+    if (!check_crc(CRC_14443_B, Demod.output, Demod.len) )
+        return 3;
 
-	if (card) {
+    if (card) {
 
-		// CID
-		card->cid = Demod.output[0];
+        // CID
+        card->cid = Demod.output[0];
 
-		// MAX FRAME
-		uint16_t maxFrame = card->atqb[5] >> 4;
-		if (maxFrame < 5) 		maxFrame = 8 * maxFrame + 16;
-		else if (maxFrame == 5)	maxFrame = 64;
-		else if (maxFrame == 6)	maxFrame = 96;
-		else if (maxFrame == 7)	maxFrame = 128;
-		else if (maxFrame == 8)	maxFrame = 256;
-		else maxFrame = 257;
-		iso14b_set_maxframesize(maxFrame);
+        // MAX FRAME
+        uint16_t maxFrame = card->atqb[5] >> 4;
+        if (maxFrame < 5)       maxFrame = 8 * maxFrame + 16;
+        else if (maxFrame == 5) maxFrame = 64;
+        else if (maxFrame == 6) maxFrame = 96;
+        else if (maxFrame == 7) maxFrame = 128;
+        else if (maxFrame == 8) maxFrame = 256;
+        else maxFrame = 257;
+        iso14b_set_maxframesize(maxFrame);
 
-		// FWT
-		uint8_t fwt = card->atqb[6] >> 4;
-		if ( fwt < 16 ){
-			uint32_t fwt_time = (302 << fwt);
-			iso14b_set_timeout( fwt_time);
-		}
-	}
-	// reset PCB block number
-	pcb_blocknum = 0;
-	return 0;
+        // FWT
+        uint8_t fwt = card->atqb[6] >> 4;
+        if ( fwt < 16 ){
+            uint32_t fwt_time = (302 << fwt);
+            iso14b_set_timeout( fwt_time);
+        }
+    }
+    // reset PCB block number
+    pcb_blocknum = 0;
+    return 0;
 }
 
 // Set up ISO 14443 Type B communication (similar to iso14443a_setup)
 // field is setup for "Sending as Reader"
 void iso14443b_setup() {
-	LEDsoff();
-	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
+    LEDsoff();
+    FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
 
-	// Initialize Demod and Uart structs
-	DemodInit(BigBuf_malloc(MAX_FRAME_SIZE));
-	UartInit(BigBuf_malloc(MAX_FRAME_SIZE));
+    // Initialize Demod and Uart structs
+    DemodInit(BigBuf_malloc(MAX_FRAME_SIZE));
+    UartInit(BigBuf_malloc(MAX_FRAME_SIZE));
 
-	// connect Demodulated Signal to ADC:
-	SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
+    // connect Demodulated Signal to ADC:
+    SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
 
-	// Set up the synchronous serial port
-	FpgaSetupSsc();
+    // Set up the synchronous serial port
+    FpgaSetupSsc();
 
-	// Signal field is on with the appropriate LED
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_TX | FPGA_HF_READER_TX_SHALLOW_MOD);
-	SpinDelay(100);
+    // Signal field is on with the appropriate LED
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_TX | FPGA_HF_READER_TX_SHALLOW_MOD);
+    SpinDelay(100);
 
-	// Start the timer
-	StartCountSspClk();
+    // Start the timer
+    StartCountSspClk();
 
-	LED_D_ON();
+    LED_D_ON();
 }
 
 //-----------------------------------------------------------------------------
@@ -1336,106 +1336,106 @@ void iso14443b_setup() {
 // I tried to be systematic and check every answer of the tag, every CRC, etc...
 //-----------------------------------------------------------------------------
 static bool ReadSTBlock(uint8_t block) {
-	uint8_t cmd[] = {ISO14443B_READ_BLK, block, 0x00, 0x00};
-	AddCrc14B(cmd, 2);
-	CodeAndTransmit14443bAsReader(cmd, sizeof(cmd));
-	GetTagSamplesFor14443bDemod();
+    uint8_t cmd[] = {ISO14443B_READ_BLK, block, 0x00, 0x00};
+    AddCrc14B(cmd, 2);
+    CodeAndTransmit14443bAsReader(cmd, sizeof(cmd));
+    GetTagSamplesFor14443bDemod();
 
-	// Check if we got an answer from the tag
-	if (Demod.len != 6) {
-		DbpString("[!] expected 6 bytes from tag, got less...");
-		return false;
-	}
-	// The check the CRC of the answer
-	if (!check_crc(CRC_14443_B, Demod.output, Demod.len)) {
-		DbpString("[!] CRC Error block!");
-		return false;
-	}
-	return true;
+    // Check if we got an answer from the tag
+    if (Demod.len != 6) {
+        DbpString("[!] expected 6 bytes from tag, got less...");
+        return false;
+    }
+    // The check the CRC of the answer
+    if (!check_crc(CRC_14443_B, Demod.output, Demod.len)) {
+        DbpString("[!] CRC Error block!");
+        return false;
+    }
+    return true;
 }
 void ReadSTMemoryIso14443b(uint8_t numofblocks) {
-	// Make sure that we start from off, since the tags are stateful;
-	// confusing things will happen if we don't reset them between reads.
-	//switch_off();
+    // Make sure that we start from off, since the tags are stateful;
+    // confusing things will happen if we don't reset them between reads.
+    //switch_off();
 
-	uint8_t i = 0x00;
-	uint8_t *buf = BigBuf_malloc(sizeof(iso14b_card_select_t));
+    uint8_t i = 0x00;
+    uint8_t *buf = BigBuf_malloc(sizeof(iso14b_card_select_t));
 
-	iso14443b_setup();
+    iso14443b_setup();
 
-	iso14b_card_select_t *card = (iso14b_card_select_t*)buf;
-	uint8_t res = iso14443b_select_srx_card(card);
+    iso14b_card_select_t *card = (iso14b_card_select_t*)buf;
+    uint8_t res = iso14443b_select_srx_card(card);
 
-	// 0: OK 2: attrib fail, 3:crc fail,
-	if ( res > 0 ) goto out;
+    // 0: OK 2: attrib fail, 3:crc fail,
+    if ( res > 0 ) goto out;
 
-	Dbprintf("[+] Tag memory dump, block 0 to %d", numofblocks);
+    Dbprintf("[+] Tag memory dump, block 0 to %d", numofblocks);
 
-	++numofblocks;
+    ++numofblocks;
 
-	for (;;) {
-		if (i == numofblocks) {
-			DbpString("System area block (0xFF):");
-			i = 0xff;
-		}
+    for (;;) {
+        if (i == numofblocks) {
+            DbpString("System area block (0xFF):");
+            i = 0xff;
+        }
 
-		uint8_t retries = 3;
-		do {
-			res = ReadSTBlock(i);
-		} while (!res && --retries);
+        uint8_t retries = 3;
+        do {
+            res = ReadSTBlock(i);
+        } while (!res && --retries);
 
-		if (!res && !retries) {
-			goto out;
-		}
+        if (!res && !retries) {
+            goto out;
+        }
 
-		// Now print out the memory location:
-		Dbprintf("Address=%02x, Contents=%08x, CRC=%04x", i,
-				(Demod.output[3]<<24) + (Demod.output[2]<<16) + (Demod.output[1]<<8) + Demod.output[0],
-				(Demod.output[4]<<8)+Demod.output[5]);
+        // Now print out the memory location:
+        Dbprintf("Address=%02x, Contents=%08x, CRC=%04x", i,
+                (Demod.output[3]<<24) + (Demod.output[2]<<16) + (Demod.output[1]<<8) + Demod.output[0],
+                (Demod.output[4]<<8)+Demod.output[5]);
 
-		if (i == 0xff) break;
-		++i;
-	}
+        if (i == 0xff) break;
+        ++i;
+    }
 
 out:
-	switch_off(); // disconnect raw
-	SpinDelay(20);
+    switch_off(); // disconnect raw
+    SpinDelay(20);
 }
 
 static void iso1444b_setup_sniff(void){
 
-	LEDsoff();
-	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-	BigBuf_free();
-	BigBuf_Clear_ext(false);
-	clear_trace();//setup snoop
-	set_tracing(true);
+    LEDsoff();
+    FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
+    BigBuf_free();
+    BigBuf_Clear_ext(false);
+    clear_trace();//setup snoop
+    set_tracing(true);
 
-	// Initialize Demod and Uart structs
-	DemodInit(BigBuf_malloc(MAX_FRAME_SIZE));
-	UartInit(BigBuf_malloc(MAX_FRAME_SIZE));
+    // Initialize Demod and Uart structs
+    DemodInit(BigBuf_malloc(MAX_FRAME_SIZE));
+    UartInit(BigBuf_malloc(MAX_FRAME_SIZE));
 
-	if (MF_DBGLEVEL > 1) {
-		// Print debug information about the buffer sizes
-		Dbprintf("[+] Sniff buffers initialized:");
-		Dbprintf("[+]   trace: %i bytes", BigBuf_max_traceLen());
-		Dbprintf("[+]   reader -> tag: %i bytes", MAX_FRAME_SIZE);
-		Dbprintf("[+]   tag -> reader: %i bytes", MAX_FRAME_SIZE);
-		Dbprintf("[+]   DMA: %i bytes", ISO14443B_DMA_BUFFER_SIZE);
-	}
+    if (MF_DBGLEVEL > 1) {
+        // Print debug information about the buffer sizes
+        Dbprintf("[+] Sniff buffers initialized:");
+        Dbprintf("[+]   trace: %i bytes", BigBuf_max_traceLen());
+        Dbprintf("[+]   reader -> tag: %i bytes", MAX_FRAME_SIZE);
+        Dbprintf("[+]   tag -> reader: %i bytes", MAX_FRAME_SIZE);
+        Dbprintf("[+]   DMA: %i bytes", ISO14443B_DMA_BUFFER_SIZE);
+    }
 
-	// connect Demodulated Signal to ADC:
-	SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
+    // connect Demodulated Signal to ADC:
+    SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
 
-	// Setup for the DMA.
-	FpgaSetupSsc();
+    // Setup for the DMA.
+    FpgaSetupSsc();
 
-	// Set FPGA in the appropriate mode
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR | FPGA_HF_READER_RX_XCORR_848_KHZ | FPGA_HF_READER_RX_XCORR_SNOOP);
-	SpinDelay(20);
+    // Set FPGA in the appropriate mode
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR | FPGA_HF_READER_RX_XCORR_848_KHZ | FPGA_HF_READER_RX_XCORR_SNOOP);
+    SpinDelay(20);
 
-	// Start the SSP timer
-	StartCountSspClk();
+    // Start the SSP timer
+    StartCountSspClk();
 }
 
 //=============================================================================
@@ -1457,98 +1457,98 @@ static void iso1444b_setup_sniff(void){
  */
 void RAMFUNC SniffIso14443b(void) {
 
-	uint32_t time_0 = 0, time_start = 0, time_stop = 0;
-	int ci = 0, cq = 0;
+    uint32_t time_0 = 0, time_start = 0, time_stop = 0;
+    int ci = 0, cq = 0;
 
-	// We won't start recording the frames that we acquire until we trigger;
-	// a good trigger condition to get started is probably when we see a
-	// response from the tag.
-	bool TagIsActive = false;
-	bool ReaderIsActive = false;
+    // We won't start recording the frames that we acquire until we trigger;
+    // a good trigger condition to get started is probably when we see a
+    // response from the tag.
+    bool TagIsActive = false;
+    bool ReaderIsActive = false;
 
-	iso1444b_setup_sniff();
+    iso1444b_setup_sniff();
 
-	// The DMA buffer, used to stream samples from the FPGA
-	int8_t *dmaBuf = (int8_t*) BigBuf_malloc(ISO14443B_DMA_BUFFER_SIZE);
-	int8_t *data = dmaBuf;
+    // The DMA buffer, used to stream samples from the FPGA
+    int8_t *dmaBuf = (int8_t*) BigBuf_malloc(ISO14443B_DMA_BUFFER_SIZE);
+    int8_t *data = dmaBuf;
 
-	// Setup and start DMA.
-	if ( !FpgaSetupSscDma((uint8_t*) dmaBuf, ISO14443B_DMA_BUFFER_SIZE) ){
-		if (MF_DBGLEVEL > 1) Dbprintf("[!] FpgaSetupSscDma failed. Exiting");
-		BigBuf_free();
-		return;
-	}
+    // Setup and start DMA.
+    if ( !FpgaSetupSscDma((uint8_t*) dmaBuf, ISO14443B_DMA_BUFFER_SIZE) ){
+        if (MF_DBGLEVEL > 1) Dbprintf("[!] FpgaSetupSscDma failed. Exiting");
+        BigBuf_free();
+        return;
+    }
 
-	// time ZERO, the point from which it all is calculated.
-	time_0 = GetCountSspClk();
+    // time ZERO, the point from which it all is calculated.
+    time_0 = GetCountSspClk();
 
     // loop and listen
-	while (!BUTTON_PRESS()) {
-		WDT_HIT();
+    while (!BUTTON_PRESS()) {
+        WDT_HIT();
 
-		ci = data[0];
-		cq = data[1];
-		data += 2;
+        ci = data[0];
+        cq = data[1];
+        data += 2;
 
-		if (data >= dmaBuf + ISO14443B_DMA_BUFFER_SIZE) {
-			data = dmaBuf;
-			AT91C_BASE_PDC_SSC->PDC_RNPR = (uint32_t) dmaBuf;
-			AT91C_BASE_PDC_SSC->PDC_RNCR = ISO14443B_DMA_BUFFER_SIZE;
-		}
+        if (data >= dmaBuf + ISO14443B_DMA_BUFFER_SIZE) {
+            data = dmaBuf;
+            AT91C_BASE_PDC_SSC->PDC_RNPR = (uint32_t) dmaBuf;
+            AT91C_BASE_PDC_SSC->PDC_RNCR = ISO14443B_DMA_BUFFER_SIZE;
+        }
 
-		// no need to try decoding reader data if the tag is sending
-		if (!TagIsActive) {
+        // no need to try decoding reader data if the tag is sending
+        if (!TagIsActive) {
 
-			LED_A_INV();
+            LED_A_INV();
 
-			if (Handle14443bReaderUartBit(ci & 0x01)) {
-				time_stop = GetCountSspClk() - time_0;
-				LogTrace(Uart.output, Uart.byteCnt, time_start, time_stop, NULL, true);
-				UartReset();
-				DemodReset();
-			} else {
-				time_start = GetCountSspClk() - time_0;
-			}
+            if (Handle14443bReaderUartBit(ci & 0x01)) {
+                time_stop = GetCountSspClk() - time_0;
+                LogTrace(Uart.output, Uart.byteCnt, time_start, time_stop, NULL, true);
+                UartReset();
+                DemodReset();
+            } else {
+                time_start = GetCountSspClk() - time_0;
+            }
 
-			if (Handle14443bReaderUartBit(cq & 0x01)) {
-				time_stop = GetCountSspClk() - time_0;
-				LogTrace(Uart.output, Uart.byteCnt, time_start, time_stop, NULL, true);
-				UartReset();
-				DemodReset();
-			} else {
-				time_start = GetCountSspClk() - time_0;
-			}
-			ReaderIsActive = (Uart.state > STATE_GOT_FALLING_EDGE_OF_SOF);
-		}
+            if (Handle14443bReaderUartBit(cq & 0x01)) {
+                time_stop = GetCountSspClk() - time_0;
+                LogTrace(Uart.output, Uart.byteCnt, time_start, time_stop, NULL, true);
+                UartReset();
+                DemodReset();
+            } else {
+                time_start = GetCountSspClk() - time_0;
+            }
+            ReaderIsActive = (Uart.state > STATE_GOT_FALLING_EDGE_OF_SOF);
+        }
 
-		// no need to try decoding tag data if the reader is sending - and we cannot afford the time
-		if (!ReaderIsActive) {
+        // no need to try decoding tag data if the reader is sending - and we cannot afford the time
+        if (!ReaderIsActive) {
 
-			// is this | 0x01 the error?   & 0xfe  in https://github.com/Proxmark/proxmark3/issues/103
-			// LSB is a fpga signal bit.
-			if (Handle14443bTagSamplesDemod(ci, cq)) {
-				time_stop = GetCountSspClk() - time_0;
-				LogTrace(Demod.output, Demod.len, time_start, time_stop, NULL, false);
-				UartReset();
-				DemodReset();
-			} else {
-				time_start = GetCountSspClk() - time_0;
-			}
-			TagIsActive = (Demod.state > DEMOD_GOT_FALLING_EDGE_OF_SOF);
-		}
-	}
+            // is this | 0x01 the error?   & 0xfe  in https://github.com/Proxmark/proxmark3/issues/103
+            // LSB is a fpga signal bit.
+            if (Handle14443bTagSamplesDemod(ci, cq)) {
+                time_stop = GetCountSspClk() - time_0;
+                LogTrace(Demod.output, Demod.len, time_start, time_stop, NULL, false);
+                UartReset();
+                DemodReset();
+            } else {
+                time_start = GetCountSspClk() - time_0;
+            }
+            TagIsActive = (Demod.state > DEMOD_GOT_FALLING_EDGE_OF_SOF);
+        }
+    }
 
-	if (MF_DBGLEVEL >= 2) {
-		DbpString("[+] Sniff statistics:");
-		Dbprintf("[+]  uart State: %x  ByteCount: %i  ByteCountMax: %i", Uart.state,  Uart.byteCnt,  Uart.byteCntMax);
-		Dbprintf("[+]  trace length: %i", BigBuf_get_traceLen());
-	}
+    if (MF_DBGLEVEL >= 2) {
+        DbpString("[+] Sniff statistics:");
+        Dbprintf("[+]  uart State: %x  ByteCount: %i  ByteCountMax: %i", Uart.state,  Uart.byteCnt,  Uart.byteCntMax);
+        Dbprintf("[+]  trace length: %i", BigBuf_get_traceLen());
+    }
 
-	switch_off();
+    switch_off();
 }
 
 void iso14b_set_trigger(bool enable) {
-	trigger = enable;
+    trigger = enable;
 }
 
 /*
@@ -1563,70 +1563,70 @@ void iso14b_set_trigger(bool enable) {
  *
  */
 void SendRawCommand14443B_Ex(UsbCommand *c) {
-	iso14b_command_t param = c->arg[0];
-	size_t len = c->arg[1] & 0xffff;
-	uint8_t *cmd = c->d.asBytes;
-	uint8_t status = 0;
-	uint32_t sendlen = sizeof(iso14b_card_select_t);
-	uint8_t buf[USB_CMD_DATA_SIZE] = {0x00};
+    iso14b_command_t param = c->arg[0];
+    size_t len = c->arg[1] & 0xffff;
+    uint8_t *cmd = c->d.asBytes;
+    uint8_t status = 0;
+    uint32_t sendlen = sizeof(iso14b_card_select_t);
+    uint8_t buf[USB_CMD_DATA_SIZE] = {0x00};
 
-	if (MF_DBGLEVEL > 3) Dbprintf("14b raw: param, %04x", param );
+    if (MF_DBGLEVEL > 3) Dbprintf("14b raw: param, %04x", param );
 
-	// turn on trigger (LED_A)
-	if ((param & ISO14B_REQUEST_TRIGGER) == ISO14B_REQUEST_TRIGGER)
-		iso14b_set_trigger(true);
+    // turn on trigger (LED_A)
+    if ((param & ISO14B_REQUEST_TRIGGER) == ISO14B_REQUEST_TRIGGER)
+        iso14b_set_trigger(true);
 
-	if ((param & ISO14B_CONNECT) == ISO14B_CONNECT) {
-		iso14443b_setup();
-		clear_trace();
-	}
+    if ((param & ISO14B_CONNECT) == ISO14B_CONNECT) {
+        iso14443b_setup();
+        clear_trace();
+    }
 
-	set_tracing(true);
+    set_tracing(true);
 
-	if ((param & ISO14B_SELECT_STD) == ISO14B_SELECT_STD) {
-		iso14b_card_select_t *card = (iso14b_card_select_t*)buf;
-		status = iso14443b_select_card(card);
-		cmd_send(CMD_ACK, status, sendlen, 0, buf, sendlen);
-		// 0: OK 2: attrib fail, 3:crc fail,
-		if ( status > 0 ) goto out;
-	}
+    if ((param & ISO14B_SELECT_STD) == ISO14B_SELECT_STD) {
+        iso14b_card_select_t *card = (iso14b_card_select_t*)buf;
+        status = iso14443b_select_card(card);
+        cmd_send(CMD_ACK, status, sendlen, 0, buf, sendlen);
+        // 0: OK 2: attrib fail, 3:crc fail,
+        if ( status > 0 ) goto out;
+    }
 
-	if ((param & ISO14B_SELECT_SR) == ISO14B_SELECT_SR) {
-		iso14b_card_select_t *card = (iso14b_card_select_t*)buf;
-		status = iso14443b_select_srx_card(card);
-		cmd_send(CMD_ACK, status, sendlen, 0, buf, sendlen);
-		// 0: OK 2: demod fail, 3:crc fail,
-		if ( status > 0 ) goto out;
-	}
+    if ((param & ISO14B_SELECT_SR) == ISO14B_SELECT_SR) {
+        iso14b_card_select_t *card = (iso14b_card_select_t*)buf;
+        status = iso14443b_select_srx_card(card);
+        cmd_send(CMD_ACK, status, sendlen, 0, buf, sendlen);
+        // 0: OK 2: demod fail, 3:crc fail,
+        if ( status > 0 ) goto out;
+    }
 
-	if ((param & ISO14B_APDU) == ISO14B_APDU) {
-		status = iso14443b_apdu(cmd, len, buf);
-		cmd_send(CMD_ACK, status, status, 0, buf, status);
-	}
+    if ((param & ISO14B_APDU) == ISO14B_APDU) {
+        status = iso14443b_apdu(cmd, len, buf);
+        cmd_send(CMD_ACK, status, status, 0, buf, status);
+    }
 
-	if ((param & ISO14B_RAW) == ISO14B_RAW) {
-		if((param & ISO14B_APPEND_CRC) == ISO14B_APPEND_CRC) {
-			AddCrc14B(cmd, len);
-			len += 2;
-		}
+    if ((param & ISO14B_RAW) == ISO14B_RAW) {
+        if((param & ISO14B_APPEND_CRC) == ISO14B_APPEND_CRC) {
+            AddCrc14B(cmd, len);
+            len += 2;
+        }
 
-		CodeAndTransmit14443bAsReader(cmd, len); // raw
-		GetTagSamplesFor14443bDemod(); // raw
+        CodeAndTransmit14443bAsReader(cmd, len); // raw
+        GetTagSamplesFor14443bDemod(); // raw
 
-		sendlen = MIN(Demod.len, USB_CMD_DATA_SIZE);
-		status =  (Demod.len > 0) ? 0 : 1;
-		cmd_send(CMD_ACK, status, sendlen, 0, Demod.output, sendlen);
-	}
+        sendlen = MIN(Demod.len, USB_CMD_DATA_SIZE);
+        status =  (Demod.len > 0) ? 0 : 1;
+        cmd_send(CMD_ACK, status, sendlen, 0, Demod.output, sendlen);
+    }
 
 out:
-	// turn off trigger (LED_A)
-	if ((param & ISO14B_REQUEST_TRIGGER) == ISO14B_REQUEST_TRIGGER)
-		iso14b_set_trigger(false);
+    // turn off trigger (LED_A)
+    if ((param & ISO14B_REQUEST_TRIGGER) == ISO14B_REQUEST_TRIGGER)
+        iso14b_set_trigger(false);
 
-	// turn off antenna et al
-	// we don't send a HALT command.
-	if ((param & ISO14B_DISCONNECT) == ISO14B_DISCONNECT) {
-		switch_off(); // disconnect raw
-		SpinDelay(20);
-	}
+    // turn off antenna et al
+    // we don't send a HALT command.
+    if ((param & ISO14B_DISCONNECT) == ISO14B_DISCONNECT) {
+        switch_off(); // disconnect raw
+        SpinDelay(20);
+    }
 }
\ No newline at end of file
diff --git a/armsrc/iso14443b.h b/armsrc/iso14443b.h
index 84765537a..c7e98f182 100644
--- a/armsrc/iso14443b.h
+++ b/armsrc/iso14443b.h
@@ -18,7 +18,7 @@ extern "C" {
 #endif
 
 #include "proxmark3.h"
-#include "common.h"  	// access to global variable: MF_DBGLEVEL
+#include "common.h"  // access to global variable: MF_DBGLEVEL
 #include "apps.h"
 #include "util.h"
 #include "string.h"
@@ -27,11 +27,11 @@ extern "C" {
 #include "protocols.h"
 
 #ifndef AddCrc14A
-# define	AddCrc14A(data, len)	compute_crc(CRC_14443_A, (data), (len), (data)+(len), (data)+(len)+1)
+# define AddCrc14A(data, len) compute_crc(CRC_14443_A, (data), (len), (data)+(len), (data)+(len)+1)
 #endif
 
 #ifndef AddCrc14B
-# define	AddCrc14B(data, len)	compute_crc(CRC_14443_B, (data), (len), (data)+(len), (data)+(len)+1)
+# define AddCrc14B(data, len) compute_crc(CRC_14443_B, (data), (len), (data)+(len), (data)+(len)+1)
 #endif
 
 extern void SendRawCommand14443B_Ex(UsbCommand *c);
@@ -45,13 +45,13 @@ extern void WaitForFpgaDelayQueueIsEmpty( uint16_t delay );
 extern void ClearFpgaShiftingRegisters(void);
 
 // States for 14B SIM command
-#define SIM_NOFIELD		0
-#define SIM_IDLE		1
-#define SIM_HALTED		2
-#define SIM_SELECTING	3
-#define SIM_HALTING		4
+#define SIM_NOFIELD     0
+#define SIM_IDLE        1
+#define SIM_HALTED      2
+#define SIM_SELECTING   3
+#define SIM_HALTING     4
 #define SIM_ACKNOWLEDGE 5
-#define SIM_WORK		6
+#define SIM_WORK        6
 
 #ifdef __cplusplus
 }
diff --git a/armsrc/iso15693.c b/armsrc/iso15693.c
index 61e0e1130..1afaac95f 100644
--- a/armsrc/iso15693.c
+++ b/armsrc/iso15693.c
@@ -24,21 +24,21 @@
 //
 // VCD (reader) -> VICC (tag)
 // 1 out of 256:
-// 	data rate: 1,66 kbit/s (fc/8192)
-// 	used for long range
+//  data rate: 1,66 kbit/s (fc/8192)
+//  used for long range
 // 1 out of 4:
-// 	data rate: 26,48 kbit/s (fc/512)
-//	used for short range, high speed
+//  data rate: 26,48 kbit/s (fc/512)
+//  used for short range, high speed
 //
 // VICC (tag) -> VCD (reader)
 // Modulation:
-//		ASK / one subcarrier (423,75 khz)
-//		FSK / two subcarriers (423,75 khz && 484,28 khz)
+//    ASK / one subcarrier (423,75 khz)
+//    FSK / two subcarriers (423,75 khz && 484,28 khz)
 // Data Rates / Modes:
-// 	low ASK: 6,62 kbit/s
-// 	low FSK: 6.67 kbit/s
-// 	high ASK: 26,48 kbit/s
-// 	high FSK: 26,69 kbit/s
+//  low ASK: 6,62 kbit/s
+//  low FSK: 6.67 kbit/s
+//  high ASK: 26,48 kbit/s
+//  high FSK: 26,69 kbit/s
 //-----------------------------------------------------------------------------
 // added "1 out of 256" mode (for VCD->PICC) - atrox 20100911
 
@@ -54,8 +54,8 @@
 // *) add anti-collission support for inventory-commands
 // *) read security status of a block
 // *) sniffing and simulation do only support one transmission mode. need to support
-//		all 8 transmission combinations
-//	*) remove or refactor code under "depricated"
+//    all 8 transmission combinations
+// *) remove or refactor code under "depricated"
 // *) document all the functions
 
 #include "proxmark3.h"
@@ -71,21 +71,21 @@
 ///////////////////////////////////////////////////////////////////////
 
 // 32 + 2 crc + 1
-#define ISO15_MAX_FRAME		35
-#define CMD_ID_RESP			5
-#define CMD_READ_RESP		13
-#define CMD_INV_RESP		12
+#define ISO15_MAX_FRAME 35
+#define CMD_ID_RESP     5
+#define CMD_READ_RESP   13
+#define CMD_INV_RESP    12
 
 #define FrameSOF              Iso15693FrameSOF
 #define Logic0                Iso15693Logic0
 #define Logic1                Iso15693Logic1
 #define FrameEOF              Iso15693FrameEOF
 
-#define Crc(data, len)			crc(CRC_15693, (data), (len))
-#define CheckCrc(data, len)		check_crc(CRC_15693, (data), (len))
-#define AddCrc(data, len)		compute_crc(CRC_15693, (data), (len), (data)+(len), (data)+(len)+1)
+#define Crc(data, len)        crc(CRC_15693, (data), (len))
+#define CheckCrc(data, len)   check_crc(CRC_15693, (data), (len))
+#define AddCrc(data, len)     compute_crc(CRC_15693, (data), (len), (data)+(len), (data)+(len)+1)
 
-#define sprintUID(target,uid)	Iso15693sprintUID((target), (uid))
+#define sprintUID(target,uid) Iso15693sprintUID((target), (uid))
 
 static void BuildIdentifyRequest(uint8_t *cmdout);
 //static void BuildReadBlockRequest(uint8_t *cmdout, uint8_t *uid, uint8_t blockNumber );
@@ -100,156 +100,156 @@ static void BuildInventoryResponse(uint8_t *cmdout, uint8_t *uid);
 // cmd ... data
 // n ... length of data
 static void CodeIso15693AsReader(uint8_t *cmd, int n) {
-	int i, j;
+    int i, j;
 
-	ToSendReset();
+    ToSendReset();
 
-	// Give it a bit of slack at the beginning
-	for(i = 0; i < 24; i++)
-		ToSendStuffBit(1);
+    // Give it a bit of slack at the beginning
+    for(i = 0; i < 24; i++)
+        ToSendStuffBit(1);
 
-	// SOF for 1of4
-	ToSendStuffBit(0);
-	ToSendStuffBit(1);
-	ToSendStuffBit(1);
-	ToSendStuffBit(1);
-	ToSendStuffBit(1);
-	ToSendStuffBit(0);
-	ToSendStuffBit(1);
-	ToSendStuffBit(1);
-	for(i = 0; i < n; i++) {
-		for(j = 0; j < 8; j += 2) {
-			int these = (cmd[i] >> j) & 3;
-			switch(these) {
-				case 0:
-					ToSendStuffBit(1);
-					ToSendStuffBit(0);
-					ToSendStuffBit(1);
-					ToSendStuffBit(1);
-					ToSendStuffBit(1);
-					ToSendStuffBit(1);
-					ToSendStuffBit(1);
-					ToSendStuffBit(1);
-					break;
-				case 1:
-					ToSendStuffBit(1);
-					ToSendStuffBit(1);
-					ToSendStuffBit(1);
-					ToSendStuffBit(0);
-					ToSendStuffBit(1);
-					ToSendStuffBit(1);
-					ToSendStuffBit(1);
-					ToSendStuffBit(1);
-					break;
-				case 2:
-					ToSendStuffBit(1);
-					ToSendStuffBit(1);
-					ToSendStuffBit(1);
-					ToSendStuffBit(1);
-					ToSendStuffBit(1);
-					ToSendStuffBit(0);
-					ToSendStuffBit(1);
-					ToSendStuffBit(1);
-					break;
-				case 3:
-					ToSendStuffBit(1);
-					ToSendStuffBit(1);
-					ToSendStuffBit(1);
-					ToSendStuffBit(1);
-					ToSendStuffBit(1);
-					ToSendStuffBit(1);
-					ToSendStuffBit(1);
-					ToSendStuffBit(0);
-					break;
-			}
-		}
-	}
-	// EOF
-	ToSendStuffBit(1);
-	ToSendStuffBit(1);
-	ToSendStuffBit(0);
-	ToSendStuffBit(1);
+    // SOF for 1of4
+    ToSendStuffBit(0);
+    ToSendStuffBit(1);
+    ToSendStuffBit(1);
+    ToSendStuffBit(1);
+    ToSendStuffBit(1);
+    ToSendStuffBit(0);
+    ToSendStuffBit(1);
+    ToSendStuffBit(1);
+    for(i = 0; i < n; i++) {
+        for(j = 0; j < 8; j += 2) {
+            int these = (cmd[i] >> j) & 3;
+            switch(these) {
+                case 0:
+                    ToSendStuffBit(1);
+                    ToSendStuffBit(0);
+                    ToSendStuffBit(1);
+                    ToSendStuffBit(1);
+                    ToSendStuffBit(1);
+                    ToSendStuffBit(1);
+                    ToSendStuffBit(1);
+                    ToSendStuffBit(1);
+                    break;
+                case 1:
+                    ToSendStuffBit(1);
+                    ToSendStuffBit(1);
+                    ToSendStuffBit(1);
+                    ToSendStuffBit(0);
+                    ToSendStuffBit(1);
+                    ToSendStuffBit(1);
+                    ToSendStuffBit(1);
+                    ToSendStuffBit(1);
+                    break;
+                case 2:
+                    ToSendStuffBit(1);
+                    ToSendStuffBit(1);
+                    ToSendStuffBit(1);
+                    ToSendStuffBit(1);
+                    ToSendStuffBit(1);
+                    ToSendStuffBit(0);
+                    ToSendStuffBit(1);
+                    ToSendStuffBit(1);
+                    break;
+                case 3:
+                    ToSendStuffBit(1);
+                    ToSendStuffBit(1);
+                    ToSendStuffBit(1);
+                    ToSendStuffBit(1);
+                    ToSendStuffBit(1);
+                    ToSendStuffBit(1);
+                    ToSendStuffBit(1);
+                    ToSendStuffBit(0);
+                    break;
+            }
+        }
+    }
+    // EOF
+    ToSendStuffBit(1);
+    ToSendStuffBit(1);
+    ToSendStuffBit(0);
+    ToSendStuffBit(1);
 
-	// And slack at the end, too.
-	for(i = 0; i < 24; i++)
-		ToSendStuffBit(1);
+    // And slack at the end, too.
+    for(i = 0; i < 24; i++)
+        ToSendStuffBit(1);
 }
 
 // encode data using "1 out of 256" sheme
 // data rate is 1,66 kbit/s (fc/8192)
 // is designed for more robust communication over longer distances
 static void CodeIso15693AsReader256(uint8_t *cmd, int n) {
-	int i, j;
+    int i, j;
 
-	ToSendReset();
+    ToSendReset();
 
-	// Give it a bit of slack at the beginning
-	for(i = 0; i < 24; i++)
-		ToSendStuffBit(1);
+    // Give it a bit of slack at the beginning
+    for(i = 0; i < 24; i++)
+        ToSendStuffBit(1);
 
-	// SOF for 1of256
-	ToSendStuffBit(0);
-	ToSendStuffBit(1);
-	ToSendStuffBit(1);
-	ToSendStuffBit(1);
-	ToSendStuffBit(1);
-	ToSendStuffBit(1);
-	ToSendStuffBit(1);
-	ToSendStuffBit(0);
+    // SOF for 1of256
+    ToSendStuffBit(0);
+    ToSendStuffBit(1);
+    ToSendStuffBit(1);
+    ToSendStuffBit(1);
+    ToSendStuffBit(1);
+    ToSendStuffBit(1);
+    ToSendStuffBit(1);
+    ToSendStuffBit(0);
 
-	for(i = 0; i < n; i++) {
-		for (j = 0; j <= 255; j++) {
-			if (cmd[i] == j) {
-				ToSendStuffBit(1);
-				ToSendStuffBit(0);
-			} else {
-				ToSendStuffBit(1);
-				ToSendStuffBit(1);
-			}
-		}
-	}
-	// EOF
-	ToSendStuffBit(1);
-	ToSendStuffBit(1);
-	ToSendStuffBit(0);
-	ToSendStuffBit(1);
+    for(i = 0; i < n; i++) {
+        for (j = 0; j <= 255; j++) {
+            if (cmd[i] == j) {
+                ToSendStuffBit(1);
+                ToSendStuffBit(0);
+            } else {
+                ToSendStuffBit(1);
+                ToSendStuffBit(1);
+            }
+        }
+    }
+    // EOF
+    ToSendStuffBit(1);
+    ToSendStuffBit(1);
+    ToSendStuffBit(0);
+    ToSendStuffBit(1);
 
-	// And slack at the end, too.
-	for(i = 0; i < 24; i++)
-		ToSendStuffBit(1);
+    // And slack at the end, too.
+    for(i = 0; i < 24; i++)
+        ToSendStuffBit(1);
 }
 
 // Transmit the command (to the tag) that was placed in ToSend[].
 static void TransmitTo15693Tag(const uint8_t *cmd, int len, int *samples, int *wait) {
 
     int c;
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_TX);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_TX);
 
-	if (wait) {
-		for (c = 0; c < *wait;) {
-			if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
-				AT91C_BASE_SSC->SSC_THR = 0x00;		// For exact timing!
-				++c;
-			}
-			WDT_HIT();
-		}
-	}
+    if (wait) {
+        for (c = 0; c < *wait;) {
+            if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
+                AT91C_BASE_SSC->SSC_THR = 0x00; // For exact timing!
+                ++c;
+            }
+            WDT_HIT();
+        }
+    }
 
     c = 0;
     for(;;) {
-		if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
+        if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
             AT91C_BASE_SSC->SSC_THR = cmd[c];
             if( ++c >= len) break;
         }
         WDT_HIT();
     }
 
-	if (samples) {
-		if (wait)
-			*samples = (c + *wait) << 3;
-		else
-			*samples = c << 3;
-	}
+    if (samples) {
+        if (wait)
+            *samples = (c + *wait) << 3;
+        else
+            *samples = c << 3;
+    }
 }
 
 //-----------------------------------------------------------------------------
@@ -257,32 +257,32 @@ static void TransmitTo15693Tag(const uint8_t *cmd, int len, int *samples, int *w
 //-----------------------------------------------------------------------------
 static void TransmitTo15693Reader(const uint8_t *cmd, int len, int *samples, int *wait) {
     int c = 0;
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_SIMULATOR | FPGA_HF_SIMULATOR_MODULATE_424K);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_SIMULATOR | FPGA_HF_SIMULATOR_MODULATE_424K);
 
-	if (wait) {
-		for (c = 0; c < *wait;) {
-			if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
-				AT91C_BASE_SSC->SSC_THR = 0x00;		// For exact timing!
-				++c;
-			}
-			WDT_HIT();
-		}
-	}
+    if (wait) {
+        for (c = 0; c < *wait;) {
+            if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
+                AT91C_BASE_SSC->SSC_THR = 0x00; // For exact timing!
+                ++c;
+            }
+            WDT_HIT();
+        }
+    }
 
     c = 0;
     for(;;) {
-		if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
+        if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
             AT91C_BASE_SSC->SSC_THR = cmd[c];
             if( ++c >= len) break;
         }
         WDT_HIT();
     }
-	if (samples) {
-		if (wait)
-			*samples = (c + *wait) << 3;
-		else
-			*samples = c << 3;
-	}
+    if (samples) {
+        if (wait)
+            *samples = (c + *wait) << 3;
+        else
+            *samples = c << 3;
+    }
 }
 
 //-----------------------------------------------------------------------------
@@ -290,146 +290,146 @@ static void TransmitTo15693Reader(const uint8_t *cmd, int len, int *samples, int
 //-----------------------------------------------------------------------------
 static int DemodAnswer(uint8_t *received, uint8_t *dest, uint16_t samplecount) {
 
-	int i, j;
-	int max = 0, maxPos = 0, skip = 4;
-	int k = 0; // this will be our return value
+    int i, j;
+    int max = 0, maxPos = 0, skip = 4;
+    int k = 0; // this will be our return value
 
-	// First, correlate for SOF
-	for (i = 0; i < samplecount; i++) {
-		int corr = 0;
-		for ( j = 0; j < ARRAYLEN(FrameSOF); j += skip) {
-			corr += FrameSOF[j] * dest[i+(j/skip)];
-		}
-		if (corr > max) {
-			max = corr;
-			maxPos = i;
-		}
-	}
-	//	DbpString("SOF at %d, correlation %d", maxPos,max/(ARRAYLEN(FrameSOF)/skip));
+    // First, correlate for SOF
+    for (i = 0; i < samplecount; i++) {
+        int corr = 0;
+        for ( j = 0; j < ARRAYLEN(FrameSOF); j += skip) {
+            corr += FrameSOF[j] * dest[i+(j/skip)];
+        }
+        if (corr > max) {
+            max = corr;
+            maxPos = i;
+        }
+    }
+    // DbpString("SOF at %d, correlation %d", maxPos,max/(ARRAYLEN(FrameSOF)/skip));
 
-	// greg - If correlation is less than 1 then there's little point in continuing
-	if ((max / (ARRAYLEN(FrameSOF)/skip) ) < 1)
-		return k;
+    // greg - If correlation is less than 1 then there's little point in continuing
+    if ((max / (ARRAYLEN(FrameSOF)/skip) ) < 1)
+        return k;
 
-	i = maxPos + ARRAYLEN(FrameSOF) / skip;
+    i = maxPos + ARRAYLEN(FrameSOF) / skip;
 
-	uint8_t outBuf[ISO15_MAX_FRAME];
-	memset(outBuf, 0, sizeof(outBuf));
-	uint8_t mask = 0x01;
-	for(;;) {
-		int corr0 = 0, corr1 = 0, corrEOF = 0;
-		for (j = 0; j < ARRAYLEN(Logic0); j += skip) {
-			corr0 += Logic0[j] * dest[i+(j/skip)];
-		}
-		for (j = 0; j < ARRAYLEN(Logic1); j += skip) {
-			corr1 += Logic1[j] * dest[i+(j/skip)];
-		}
-		for (j = 0; j < ARRAYLEN(FrameEOF); j += skip) {
-			corrEOF += FrameEOF[j] * dest[i+(j/skip)];
-		}
-		// Even things out by the length of the target waveform.
-		corr0 *= 4;
-		corr1 *= 4;
-		// if (MF_DBGLEVEL >= MF_DBG_EXTENDED)
-			// Dbprintf("Corr1 %d, Corr0 %d, CorrEOF %d", corr1, corr0, corrEOF);
+    uint8_t outBuf[ISO15_MAX_FRAME];
+    memset(outBuf, 0, sizeof(outBuf));
+    uint8_t mask = 0x01;
+    for(;;) {
+        int corr0 = 0, corr1 = 0, corrEOF = 0;
+        for (j = 0; j < ARRAYLEN(Logic0); j += skip) {
+            corr0 += Logic0[j] * dest[i+(j/skip)];
+        }
+        for (j = 0; j < ARRAYLEN(Logic1); j += skip) {
+            corr1 += Logic1[j] * dest[i+(j/skip)];
+        }
+        for (j = 0; j < ARRAYLEN(FrameEOF); j += skip) {
+            corrEOF += FrameEOF[j] * dest[i+(j/skip)];
+        }
+        // Even things out by the length of the target waveform.
+        corr0 *= 4;
+        corr1 *= 4;
+        // if (MF_DBGLEVEL >= MF_DBG_EXTENDED)
+            // Dbprintf("Corr1 %d, Corr0 %d, CorrEOF %d", corr1, corr0, corrEOF);
 
-		if (corrEOF > corr1 && corrEOF > corr0)
-			break;
+        if (corrEOF > corr1 && corrEOF > corr0)
+            break;
 
-		if (corr1 > corr0) {
-			i += ARRAYLEN(Logic1) / skip;
-			outBuf[k] |= mask;
-		} else {
-			i += ARRAYLEN(Logic0) / skip;
-		}
+        if (corr1 > corr0) {
+            i += ARRAYLEN(Logic1) / skip;
+            outBuf[k] |= mask;
+        } else {
+            i += ARRAYLEN(Logic0) / skip;
+        }
 
-		mask <<= 1;
+        mask <<= 1;
 
-		if (mask == 0) {
-			k++;
-			mask = 0x01;
-		}
+        if (mask == 0) {
+            k++;
+            mask = 0x01;
+        }
 
-		if ( ( i + (int)ARRAYLEN(FrameEOF)) >= samplecount-1) {
-			//Dbprintf("[!] ran off end!  %d | %d",( i + (int)ARRAYLEN(FrameEOF)), samplecount-1);
-			break;
-		}
-	}
+        if ( ( i + (int)ARRAYLEN(FrameEOF)) >= samplecount-1) {
+            //Dbprintf("[!] ran off end!  %d | %d",( i + (int)ARRAYLEN(FrameEOF)), samplecount-1);
+            break;
+        }
+    }
 
-	if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("ice: demod bytes %u", k);
+    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("ice: demod bytes %u", k);
 
-	if (mask != 0x01) { // this happens, when we miss the EOF
+    if (mask != 0x01) { // this happens, when we miss the EOF
 
-		// TODO: for some reason this happens quite often
-		if (MF_DBGLEVEL >= MF_DBG_ERROR && k != 0) Dbprintf("[!] error, uneven octet! (extra bits!) mask %02x", mask);
-		//if (mask < 0x08) k--; // discard the last uneven octet;
-		// 0x08 is an assumption - but works quite often
-	}
+        // TODO: for some reason this happens quite often
+        if (MF_DBGLEVEL >= MF_DBG_ERROR && k != 0) Dbprintf("[!] error, uneven octet! (extra bits!) mask %02x", mask);
+        //if (mask < 0x08) k--; // discard the last uneven octet;
+        // 0x08 is an assumption - but works quite often
+    }
 
-	for(i = 0; i < k; i++)
-		received[i] = outBuf[i];
+    for(i = 0; i < k; i++)
+        received[i] = outBuf[i];
 
-	// return the number of bytes demodulated
-	return k;
+    // return the number of bytes demodulated
+    return k;
 }
 
 // Read from Tag
 // Parameters:
-//		received
-//		samples
-//		elapsed
+//  received
+//  samples
+//  elapsed
 // returns:
-//		number of decoded bytes
+//  number of decoded bytes
 // logging enabled
 static int GetIso15693AnswerFromTag(uint8_t *received, int *elapsed) {
 
 #define SIGNAL_BUFF_SIZE 15000
-	// get current clock
-	uint32_t time_0 = GetCountSspClk();
-	uint32_t time_stop = 0;
-	bool getNext = false;
-	int counter = 0, ci = 0, cq = 0;
-	uint8_t *buf = BigBuf_malloc(SIGNAL_BUFF_SIZE);
+    // get current clock
+    uint32_t time_0 = GetCountSspClk();
+    uint32_t time_stop = 0;
+    bool getNext = false;
+    int counter = 0, ci = 0, cq = 0;
+    uint8_t *buf = BigBuf_malloc(SIGNAL_BUFF_SIZE);
 
-	if (elapsed) *elapsed = 0;
+    if (elapsed) *elapsed = 0;
 
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
 
-	for(;;) {
-		WDT_HIT();
+    for(;;) {
+        WDT_HIT();
 
-		if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
-			AT91C_BASE_SSC->SSC_THR = 0x00; //0x43;
-			// To make use of exact timing of next command from reader!!
-			if (elapsed) (*elapsed)++;
-		}
-		if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
+        if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
+            AT91C_BASE_SSC->SSC_THR = 0x00; //0x43;
+            // To make use of exact timing of next command from reader!!
+            if (elapsed) (*elapsed)++;
+        }
+        if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
 
-			ci = (int8_t)AT91C_BASE_SSC->SSC_RHR;
-			ci = ABS(ci);
+            ci = (int8_t)AT91C_BASE_SSC->SSC_RHR;
+            ci = ABS(ci);
 
-			// The samples are correlations against I and Q versions of the
-			// tone that the tag AM-modulates, so every other sample is I,
-			// every other is Q. We just want power, so abs(I) + abs(Q) is
-			// close to what we want.
-			// iceman 2016, amplitude sqrt(abs(i) + abs(q))
-			if (getNext) {
+            // The samples are correlations against I and Q versions of the
+            // tone that the tag AM-modulates, so every other sample is I,
+            // every other is Q. We just want power, so abs(I) + abs(Q) is
+            // close to what we want.
+            // iceman 2016, amplitude sqrt(abs(i) + abs(q))
+            if (getNext) {
 
-				buf[counter++] = (uint8_t)(MAX(ci,cq) + (MIN(ci, cq) >> 1));
+                buf[counter++] = (uint8_t)(MAX(ci,cq) + (MIN(ci, cq) >> 1));
 
-				if (counter >= SIGNAL_BUFF_SIZE)
-					break;
-			} else {
-				cq = ci;
-			}
-			getNext = !getNext;
-		}
-	}
-	time_stop = GetCountSspClk() - time_0 ;
-	int len = DemodAnswer(received, buf, counter);
-	LogTrace(received, len, time_0 << 4, time_stop << 4, NULL, false);
-	BigBuf_free();
-	return len;
+                if (counter >= SIGNAL_BUFF_SIZE)
+                    break;
+            } else {
+                cq = ci;
+            }
+            getNext = !getNext;
+        }
+    }
+    time_stop = GetCountSspClk() - time_0 ;
+    int len = DemodAnswer(received, buf, counter);
+    LogTrace(received, len, time_0 << 4, time_stop << 4, NULL, false);
+    BigBuf_free();
+    return len;
 }
 
 
@@ -437,45 +437,45 @@ static int GetIso15693AnswerFromTag(uint8_t *received, int *elapsed) {
 // logging enable,
 static int GetIso15693AnswerFromSniff(uint8_t *received, int *samples, int *elapsed) {
 
-	bool getNext = false;
-	int counter = 0, ci = 0, cq = 0;
-	uint32_t time_0 = 0, time_stop = 0;
-	uint8_t *buf = BigBuf_get_addr();
+    bool getNext = false;
+    int counter = 0, ci = 0, cq = 0;
+    uint32_t time_0 = 0, time_stop = 0;
+    uint8_t *buf = BigBuf_get_addr();
 
-	// get current clock
-	time_0 = GetCountSspClk();
+    // get current clock
+    time_0 = GetCountSspClk();
 
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
 
-	for(;;) {
-		WDT_HIT();
+    for(;;) {
+        WDT_HIT();
 
-		if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
+        if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
 
-			ci = (int8_t)AT91C_BASE_SSC->SSC_RHR;
-			ci = ABS(ci);
+            ci = (int8_t)AT91C_BASE_SSC->SSC_RHR;
+            ci = ABS(ci);
 
-			// The samples are correlations against I and Q versions of the
-			// tone that the tag AM-modulates, so every other sample is I,
-			// every other is Q. We just want power, so abs(I) + abs(Q) is
-			// close to what we want.
-			if (getNext) {
+            // The samples are correlations against I and Q versions of the
+            // tone that the tag AM-modulates, so every other sample is I,
+            // every other is Q. We just want power, so abs(I) + abs(Q) is
+            // close to what we want.
+            if (getNext) {
 
-				buf[counter++] = (uint8_t)(MAX(ci,cq) + (MIN(ci, cq) >> 1));
+                buf[counter++] = (uint8_t)(MAX(ci,cq) + (MIN(ci, cq) >> 1));
 
-				if(counter >= 20000)
-					break;
-			} else {
-				 cq = ci;
-			}
-			getNext = !getNext;
-		}
-	}
+                if(counter >= 20000)
+                    break;
+            } else {
+                 cq = ci;
+            }
+            getNext = !getNext;
+        }
+    }
 
-	time_stop = GetCountSspClk() - time_0;
-	int k = DemodAnswer(received, buf, counter);
-	LogTrace(received, k, time_0 << 4, time_stop << 4, NULL, false);
-	return k;
+    time_stop = GetCountSspClk() - time_0;
+    int k = DemodAnswer(received, buf, counter);
+    LogTrace(received, k, time_0 << 4, time_stop << 4, NULL, false);
+    return k;
 }
 
 //-----------------------------------------------------------------------------
@@ -484,134 +484,134 @@ static int GetIso15693AnswerFromSniff(uint8_t *received, int *samples, int *elap
 // so that it can be downloaded to a PC and processed there.
 //-----------------------------------------------------------------------------
 void AcquireRawAdcSamplesIso15693(void) {
-	int c = 0, getNext = false;
-	int ci = 0, cq = 0;
+    int c = 0, getNext = false;
+    int ci = 0, cq = 0;
 
-	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-	SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
-	FpgaSetupSsc();
+    FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
+    SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
+    FpgaSetupSsc();
 
-	// Now send the command
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_TX);
-	SpinDelay(200);
+    // Now send the command
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_TX);
+    SpinDelay(200);
 
-	uint8_t *buf = BigBuf_get_addr();
+    uint8_t *buf = BigBuf_get_addr();
 
-	uint32_t time_start = GetCountSspClk();
-	uint8_t cmd[CMD_ID_RESP] = {0};
-	BuildIdentifyRequest(cmd);
+    uint32_t time_start = GetCountSspClk();
+    uint8_t cmd[CMD_ID_RESP] = {0};
+    BuildIdentifyRequest(cmd);
 
-	// sending command
-	c = 0;
-	for(;;) {
-		WDT_HIT();
+    // sending command
+    c = 0;
+    for(;;) {
+        WDT_HIT();
 
-		if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
-			AT91C_BASE_SSC->SSC_THR = ToSend[c];
-			c++;
-			if(c == ToSendMax + 3) {
-				break;
-			}
-		}
-	}
+        if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
+            AT91C_BASE_SSC->SSC_THR = ToSend[c];
+            c++;
+            if(c == ToSendMax + 3) {
+                break;
+            }
+        }
+    }
 
 
-	LogTrace(cmd, CMD_ID_RESP, time_start << 4, (GetCountSspClk() - time_start) << 4, NULL, true);
+    LogTrace(cmd, CMD_ID_RESP, time_start << 4, (GetCountSspClk() - time_start) << 4, NULL, true);
 
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
 
-	c = 0;
-	for(;;) {
-		WDT_HIT();
+    c = 0;
+    for(;;) {
+        WDT_HIT();
 
-		if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
+        if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
 
-			ci = (int8_t)AT91C_BASE_SSC->SSC_RHR;
-			ci = ABS(ci);
+            ci = (int8_t)AT91C_BASE_SSC->SSC_RHR;
+            ci = ABS(ci);
 
-			// The samples are correlations against I and Q versions of the
-			// tone that the tag AM-modulates, so every other sample is I,
-			// every other is Q. We just want power, so abs(I) + abs(Q) is
-			// close to what we want.
-			// iceman 2016, amplitude sqrt(abs(i) + abs(q))
-			if (getNext) {
+            // The samples are correlations against I and Q versions of the
+            // tone that the tag AM-modulates, so every other sample is I,
+            // every other is Q. We just want power, so abs(I) + abs(Q) is
+            // close to what we want.
+            // iceman 2016, amplitude sqrt(abs(i) + abs(q))
+            if (getNext) {
 
-				buf[c++] = (uint8_t)(MAX(ci,cq) + (MIN(ci, cq) >> 1));
+                buf[c++] = (uint8_t)(MAX(ci,cq) + (MIN(ci, cq) >> 1));
 
-				if (c >= 7000) break;
+                if (c >= 7000) break;
 
-			} else {
-				cq = ci;
-			}
-			getNext = !getNext;
-		}
-	}
+            } else {
+                cq = ci;
+            }
+            getNext = !getNext;
+        }
+    }
 }
 
 // switch_off,  initreader, no logging
 void RecordRawAdcSamplesIso15693(void) {
 
-	int c = 0, getNext = false;
-	int ci = 0, cq = 0;
+    int c = 0, getNext = false;
+    int ci = 0, cq = 0;
 
-	Iso15693InitReader();
+    Iso15693InitReader();
 
-	uint8_t *buf = BigBuf_get_addr();
+    uint8_t *buf = BigBuf_get_addr();
 
-	for(;;) {
-		WDT_HIT();
+    for(;;) {
+        WDT_HIT();
 
-		if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
+        if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
 
-			ci = (int8_t)AT91C_BASE_SSC->SSC_RHR;
-			ci = ABS(ci);
-			// The samples are correlations against I and Q versions of the
-			// tone that the tag AM-modulates, so every other sample is I,
-			// every other is Q. We just want power, so abs(I) + abs(Q) is
-			// close to what we want.
-			if (getNext) {
+            ci = (int8_t)AT91C_BASE_SSC->SSC_RHR;
+            ci = ABS(ci);
+            // The samples are correlations against I and Q versions of the
+            // tone that the tag AM-modulates, so every other sample is I,
+            // every other is Q. We just want power, so abs(I) + abs(Q) is
+            // close to what we want.
+            if (getNext) {
 
-				buf[c++] = (uint8_t)(MAX(ci,cq) + (MIN(ci, cq) >> 1));
+                buf[c++] = (uint8_t)(MAX(ci,cq) + (MIN(ci, cq) >> 1));
 
-				if(c >= 7000)
-					break;
-			} else {
-				cq = ci;
-			}
+                if(c >= 7000)
+                    break;
+            } else {
+                cq = ci;
+            }
 
-			getNext = !getNext;
-		}
-	}
+            getNext = !getNext;
+        }
+    }
 
-	Dbprintf("done");
-	switch_off();
+    Dbprintf("done");
+    switch_off();
 }
 
 // Initialize the proxmark as iso15k reader
 // (this might produces glitches that confuse some tags
 void Iso15693InitReader(void) {
-	LEDsoff();
-	clear_trace();
-	set_tracing(true);
+    LEDsoff();
+    clear_trace();
+    set_tracing(true);
 
-	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
+    FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
 
-	// Start from off (no field generated)
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	SpinDelay(10);
+    // Start from off (no field generated)
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    SpinDelay(10);
 
-	SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
+    SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
 
-	FpgaSetupSsc();
+    FpgaSetupSsc();
 
-	// Give the tags time to energize
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
-	SpinDelay(200);
+    // Give the tags time to energize
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
+    SpinDelay(200);
 
-	// Start the timer
-	StartCountSspClk();
+    // Start the timer
+    StartCountSspClk();
 
-	LED_A_ON();
+    LED_A_ON();
 }
 
 ///////////////////////////////////////////////////////////////////////
@@ -623,109 +623,109 @@ void Iso15693InitReader(void) {
 // thing that you must send to a tag to get a response.
 static void BuildIdentifyRequest(uint8_t *out) {
 
-	uint8_t cmd[CMD_ID_RESP] = {0, ISO15_CMD_INVENTORY, 0, 0, 0};
-	// flags
-	cmd[0] = ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | ISO15_REQ_INVENTORY | ISO15_REQINV_SLOT1;
-	// no mask
-	cmd[2] = 0x00;
-	// CRC
-	AddCrc(cmd, 3);
-	// coding as high speed (1 out of 4)
-	CodeIso15693AsReader(cmd, CMD_ID_RESP);
-	memcpy(out, cmd, CMD_ID_RESP);
+    uint8_t cmd[CMD_ID_RESP] = {0, ISO15_CMD_INVENTORY, 0, 0, 0};
+    // flags
+    cmd[0] = ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | ISO15_REQ_INVENTORY | ISO15_REQINV_SLOT1;
+    // no mask
+    cmd[2] = 0x00;
+    // CRC
+    AddCrc(cmd, 3);
+    // coding as high speed (1 out of 4)
+    CodeIso15693AsReader(cmd, CMD_ID_RESP);
+    memcpy(out, cmd, CMD_ID_RESP);
 }
 
 // uid is in transmission order (which is reverse of display order)
 /*
 static void BuildReadBlockRequest(uint8_t **out, uint8_t *uid, uint8_t blockNumber ) {
-	uint8_t cmd[CMD_READ_RESP] = {0,0,0,0,0,0,0,0,0,0,0,0,0};
-	// If we set the Option_Flag in this request, the VICC will respond with the secuirty status of the block
-	// followed by teh block data
-	// one sub-carrier, inventory, 1 slot, fast rate
-	cmd[0] = (1 << 6)| (1 << 5) | (1 << 1); // no SELECT bit, ADDR bit, OPTION bit
-	// READ BLOCK command code
-	cmd[1] = 0x20;
-	// UID may be optionally specified here
-	// 64-bit UID
-	cmd[2] = uid[0];
-	cmd[3] = uid[1];
-	cmd[4] = uid[2];
-	cmd[5] = uid[3];
-	cmd[6] = uid[4];
-	cmd[7] = uid[5];
-	cmd[8] = uid[6];
-	cmd[9] = uid[7]; // 0xe0; // always e0 (not exactly unique)
-	// Block number to read
-	cmd[10] = blockNumber;//0x00;
-	// CRC
-	AddCrc(cmd, 11);
-	CodeIso15693AsReader(cmd, CMD_READ_RESP);
-	memcpy(out, cmd, CMD_ID_RESP);
+    uint8_t cmd[CMD_READ_RESP] = {0,0,0,0,0,0,0,0,0,0,0,0,0};
+    // If we set the Option_Flag in this request, the VICC will respond with the secuirty status of the block
+    // followed by teh block data
+    // one sub-carrier, inventory, 1 slot, fast rate
+    cmd[0] = (1 << 6)| (1 << 5) | (1 << 1); // no SELECT bit, ADDR bit, OPTION bit
+    // READ BLOCK command code
+    cmd[1] = 0x20;
+    // UID may be optionally specified here
+    // 64-bit UID
+    cmd[2] = uid[0];
+    cmd[3] = uid[1];
+    cmd[4] = uid[2];
+    cmd[5] = uid[3];
+    cmd[6] = uid[4];
+    cmd[7] = uid[5];
+    cmd[8] = uid[6];
+    cmd[9] = uid[7]; // 0xe0; // always e0 (not exactly unique)
+    // Block number to read
+    cmd[10] = blockNumber;//0x00;
+    // CRC
+    AddCrc(cmd, 11);
+    CodeIso15693AsReader(cmd, CMD_READ_RESP);
+    memcpy(out, cmd, CMD_ID_RESP);
 }
 */
 
 // Now the VICC>VCD responses when we are simulating a tag
 static void BuildInventoryResponse(uint8_t *out, uint8_t *uid) {
 
-	uint8_t cmd[CMD_INV_RESP] = {0,0,0,0,0,0,0,0,0,0,0,0};
+    uint8_t cmd[CMD_INV_RESP] = {0,0,0,0,0,0,0,0,0,0,0,0};
 
-	// one sub-carrier, inventory, 1 slot, fast rate
-	// AFI is at bit 5 (1<<4) when doing an INVENTORY
+    // one sub-carrier, inventory, 1 slot, fast rate
+    // AFI is at bit 5 (1<<4) when doing an INVENTORY
     //(1 << 2) | (1 << 5) | (1 << 1);
-	cmd[0] = 0; //
-	cmd[1] = 0; // DSFID (data storage format identifier).  0x00 = not supported
-	// 64-bit UID
-	cmd[2] = uid[7]; //0x32;
-	cmd[3] = uid[6]; //0x4b;
-	cmd[4] = uid[5]; //0x03;
-	cmd[5] = uid[4]; //0x01;
-	cmd[6] = uid[3]; //0x00;
-	cmd[7] = uid[2]; //0x10;
-	cmd[8] = uid[1]; //0x05;
-	cmd[9] = uid[0]; //0xe0;
-	// CRC
-	AddCrc(cmd, 10);
-	CodeIso15693AsReader(cmd, CMD_INV_RESP);
-	memcpy(out, cmd, CMD_ID_RESP);
+    cmd[0] = 0; //
+    cmd[1] = 0; // DSFID (data storage format identifier).  0x00 = not supported
+    // 64-bit UID
+    cmd[2] = uid[7]; //0x32;
+    cmd[3] = uid[6]; //0x4b;
+    cmd[4] = uid[5]; //0x03;
+    cmd[5] = uid[4]; //0x01;
+    cmd[6] = uid[3]; //0x00;
+    cmd[7] = uid[2]; //0x10;
+    cmd[8] = uid[1]; //0x05;
+    cmd[9] = uid[0]; //0xe0;
+    // CRC
+    AddCrc(cmd, 10);
+    CodeIso15693AsReader(cmd, CMD_INV_RESP);
+    memcpy(out, cmd, CMD_ID_RESP);
 }
 
 // Universal Method for sending to and recv bytes from a tag
-// 	init ... should we initialize the reader?
-// 	speed ... 0 low speed, 1 hi speed
-// 	**recv will return you a pointer to the received data
-// 	If you do not need the answer use NULL for *recv[]
-//	return: lenght of received data
+//  init ... should we initialize the reader?
+//  speed ... 0 low speed, 1 hi speed
+//  **recv will return you a pointer to the received data
+//  If you do not need the answer use NULL for *recv[]
+//  return: lenght of received data
 // logging enabled
 int SendDataTag(uint8_t *send, int sendlen, bool init, int speed, uint8_t *outdata) {
 
-	int t_samples = 0, wait = 0, elapsed = 0, answer_len = 0;
+    int t_samples = 0, wait = 0, elapsed = 0, answer_len = 0;
 
-	LEDsoff();
+    LEDsoff();
 
-	if (init) Iso15693InitReader();
+    if (init) Iso15693InitReader();
 
-	LED_A_ON();
+    LED_A_ON();
 
-	if (!speed)
-		CodeIso15693AsReader256(send, sendlen); // low speed (1 out of 256)
-	else
-		CodeIso15693AsReader(send, sendlen);	// high speed (1 out of 4)
+    if (!speed)
+        CodeIso15693AsReader256(send, sendlen); // low speed (1 out of 256)
+    else
+        CodeIso15693AsReader(send, sendlen); // high speed (1 out of 4)
 
-	LED_A_INV();
+    LED_A_INV();
 
-	uint32_t time_start = GetCountSspClk();
+    uint32_t time_start = GetCountSspClk();
 
-	TransmitTo15693Tag(ToSend, ToSendMax, &t_samples, &wait);
-	LogTrace(send, sendlen, time_start << 4, (GetCountSspClk() - time_start) << 4, NULL, true);
+    TransmitTo15693Tag(ToSend, ToSendMax, &t_samples, &wait);
+    LogTrace(send, sendlen, time_start << 4, (GetCountSspClk() - time_start) << 4, NULL, true);
 
-	// Now wait for a response
-	if (outdata != NULL) {
-		LED_B_INV();
-		answer_len = GetIso15693AnswerFromTag(outdata, &elapsed);
-	}
+    // Now wait for a response
+    if (outdata != NULL) {
+        LED_B_INV();
+        answer_len = GetIso15693AnswerFromTag(outdata, &elapsed);
+    }
 
-	LEDsoff();
-	return answer_len;
+    LEDsoff();
+    return answer_len;
 }
 
 // --------------------------------------------------------------------
@@ -735,57 +735,57 @@ int SendDataTag(uint8_t *send, int sendlen, bool init, int speed, uint8_t *outda
 // Decodes a message from a tag and displays its metadata and content
 #define DBD15STATLEN 48
 void DbdecodeIso15693Answer(int len, uint8_t *d) {
-	char status[DBD15STATLEN+1] = {0};
+    char status[DBD15STATLEN+1] = {0};
 
-	if (len > 3) {
-		if (d[0] & ( 1 << 3 ))
-			strncat(status, "ProtExt ", DBD15STATLEN);
-		if (d[0] & 1) {
-			// error
-			strncat(status, "Error ", DBD15STATLEN);
-			switch (d[1]) {
-				case 0x01:
-					strncat(status, "01: not supported", DBD15STATLEN);
-					break;
-				case 0x02:
-					strncat(status, "02: not recognized", DBD15STATLEN);
-					break;
-				case 0x03:
-					strncat(status, "03: opt not supported", DBD15STATLEN);
-					break;
-				case 0x0f:
-					strncat(status, "0F: no info", DBD15STATLEN);
-					break;
-				case 0x10:
-					strncat(status, "10: dont exist", DBD15STATLEN);
-					break;
-				case 0x11:
-					strncat(status, "11: lock again", DBD15STATLEN);
-					break;
-				case 0x12:
-					strncat(status, "12: locked", DBD15STATLEN);
-					break;
-				case 0x13:
-					strncat(status, "13: program error", DBD15STATLEN);
-					break;
-				case 0x14:
-					strncat(status, "14: lock error", DBD15STATLEN);
-					break;
-				default:
-					strncat(status, "unknown error", DBD15STATLEN);
-			}
-			strncat(status ," " ,DBD15STATLEN);
-		} else {
-			strncat(status ,"No error ", DBD15STATLEN);
-		}
+    if (len > 3) {
+        if (d[0] & ( 1 << 3 ))
+            strncat(status, "ProtExt ", DBD15STATLEN);
+        if (d[0] & 1) {
+            // error
+            strncat(status, "Error ", DBD15STATLEN);
+            switch (d[1]) {
+                case 0x01:
+                    strncat(status, "01: not supported", DBD15STATLEN);
+                    break;
+                case 0x02:
+                    strncat(status, "02: not recognized", DBD15STATLEN);
+                    break;
+                case 0x03:
+                    strncat(status, "03: opt not supported", DBD15STATLEN);
+                    break;
+                case 0x0f:
+                    strncat(status, "0F: no info", DBD15STATLEN);
+                    break;
+                case 0x10:
+                    strncat(status, "10: dont exist", DBD15STATLEN);
+                    break;
+                case 0x11:
+                    strncat(status, "11: lock again", DBD15STATLEN);
+                    break;
+                case 0x12:
+                    strncat(status, "12: locked", DBD15STATLEN);
+                    break;
+                case 0x13:
+                    strncat(status, "13: program error", DBD15STATLEN);
+                    break;
+                case 0x14:
+                    strncat(status, "14: lock error", DBD15STATLEN);
+                    break;
+                default:
+                    strncat(status, "unknown error", DBD15STATLEN);
+            }
+            strncat(status ," " ,DBD15STATLEN);
+        } else {
+            strncat(status ,"No error ", DBD15STATLEN);
+        }
 
-		if (CheckCrc(d, len))
-			strncat(status, "[+] crc OK", DBD15STATLEN);
-		else
-			strncat(status, "[!] crc fail", DBD15STATLEN);
+        if (CheckCrc(d, len))
+            strncat(status, "[+] crc OK", DBD15STATLEN);
+        else
+            strncat(status, "[!] crc fail", DBD15STATLEN);
 
-		if ( MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("%s", status);
-	}
+        if ( MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("%s", status);
+    }
 }
 
 ///////////////////////////////////////////////////////////////////////
@@ -799,204 +799,204 @@ void DbdecodeIso15693Answer(int len, uint8_t *d) {
 // ok
 // parameter is unused !?!
 void ReaderIso15693(uint32_t parameter) {
-	int answerLen1 = 0;
-	int tsamples = 0, wait = 0, elapsed = 0;
+    int answerLen1 = 0;
+    int tsamples = 0, wait = 0, elapsed = 0;
 
-	uint8_t uid[8] = {0,0,0,0,0,0,0,0};
+    uint8_t uid[8] = {0,0,0,0,0,0,0,0};
 
-	// set up device/fpga
-	Iso15693InitReader();
+    // set up device/fpga
+    Iso15693InitReader();
 
-	uint8_t *answer1 = BigBuf_malloc(50);
-	uint8_t *answer2 = BigBuf_malloc(50);
+    uint8_t *answer1 = BigBuf_malloc(50);
+    uint8_t *answer2 = BigBuf_malloc(50);
 
-	// Blank arrays
-	memset(answer1, 0x00, 50);
-	memset(answer2, 0x00, 50);
+    // Blank arrays
+    memset(answer1, 0x00, 50);
+    memset(answer2, 0x00, 50);
 
-	// Now send the IDENTIFY command
-	// FIRST WE RUN AN INVENTORY TO GET THE TAG UID
-	// THIS MEANS WE CAN PRE-BUILD REQUESTS TO SAVE CPU TIME
-	uint32_t time_start = GetCountSspClk();
-	uint8_t cmd[CMD_ID_RESP] = {0};
-	BuildIdentifyRequest( cmd );
-	TransmitTo15693Tag(ToSend, ToSendMax, &tsamples, &wait);
-	LogTrace(cmd, CMD_ID_RESP, time_start << 4, (GetCountSspClk() - time_start) << 4, NULL, true);
+    // Now send the IDENTIFY command
+    // FIRST WE RUN AN INVENTORY TO GET THE TAG UID
+    // THIS MEANS WE CAN PRE-BUILD REQUESTS TO SAVE CPU TIME
+    uint32_t time_start = GetCountSspClk();
+    uint8_t cmd[CMD_ID_RESP] = {0};
+    BuildIdentifyRequest( cmd );
+    TransmitTo15693Tag(ToSend, ToSendMax, &tsamples, &wait);
+    LogTrace(cmd, CMD_ID_RESP, time_start << 4, (GetCountSspClk() - time_start) << 4, NULL, true);
 
-	// Now wait for a response
-	answerLen1 = GetIso15693AnswerFromTag(answer1, &elapsed) ;
+    // Now wait for a response
+    answerLen1 = GetIso15693AnswerFromTag(answer1, &elapsed) ;
 
-	// we should do a better check than this
-	if (answerLen1 >= 12) {
-		uid[0] = answer1[9]; // always E0
-		uid[1] = answer1[8]; // IC Manufacturer code
-		uid[2] = answer1[7];
-		uid[3] = answer1[6];
-		uid[4] = answer1[5];
-		uid[5] = answer1[4];
-		uid[6] = answer1[3];
-		uid[7] = answer1[2];
+    // we should do a better check than this
+    if (answerLen1 >= 12) {
+        uid[0] = answer1[9]; // always E0
+        uid[1] = answer1[8]; // IC Manufacturer code
+        uid[2] = answer1[7];
+        uid[3] = answer1[6];
+        uid[4] = answer1[5];
+        uid[5] = answer1[4];
+        uid[6] = answer1[3];
+        uid[7] = answer1[2];
 
-		if ( MF_DBGLEVEL >= MF_DBG_EXTENDED) {
-			Dbprintf("[+] UID = %02X%02X%02X%02X%02X%02X%02X%02X",
-				uid[0], uid[1], uid[2], uid[3],
-				uid[4], uid[5], uid[5], uid[6]
-			);
-		}
-		// send UID back to client.
-		// arg0 = 1 = OK
-		// arg1 = len of response (12 bytes)
-		// arg2 = rtf
-		// asbytes = uid.
-		cmd_send(CMD_ACK, 1, sizeof(uid), 0, uid, sizeof(uid));
-	}
+        if ( MF_DBGLEVEL >= MF_DBG_EXTENDED) {
+            Dbprintf("[+] UID = %02X%02X%02X%02X%02X%02X%02X%02X",
+                uid[0], uid[1], uid[2], uid[3],
+                uid[4], uid[5], uid[5], uid[6]
+            );
+        }
+        // send UID back to client.
+        // arg0 = 1 = OK
+        // arg1 = len of response (12 bytes)
+        // arg2 = rtf
+        // asbytes = uid.
+        cmd_send(CMD_ACK, 1, sizeof(uid), 0, uid, sizeof(uid));
+    }
 
-	if ( MF_DBGLEVEL >= MF_DBG_EXTENDED) {
-		Dbprintf("[+] %d octets read from IDENTIFY request:", answerLen1);
-		DbdecodeIso15693Answer(answerLen1, answer1);
-		Dbhexdump(answerLen1, answer1, true);
-	}
+    if ( MF_DBGLEVEL >= MF_DBG_EXTENDED) {
+        Dbprintf("[+] %d octets read from IDENTIFY request:", answerLen1);
+        DbdecodeIso15693Answer(answerLen1, answer1);
+        Dbhexdump(answerLen1, answer1, true);
+    }
 
-	switch_off();
+    switch_off();
 }
 
 // Simulate an ISO15693 TAG, perform anti-collision and then print any reader commands
 // all demodulation performed in arm rather than host. - greg
 void SimTagIso15693(uint32_t parameter, uint8_t *uid) {
 
-	LEDsoff();
-	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-	SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
-	FpgaSetupSsc();
-	// Start from off (no field generated)
+    LEDsoff();
+    FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
+    SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
+    FpgaSetupSsc();
+    // Start from off (no field generated)
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	SpinDelay(200);
+    SpinDelay(200);
 
-	LED_A_ON();
+    LED_A_ON();
 
-	uint32_t time_start = 0;
-	int ans = 0, samples = 0, tsamples = 0;
-	int wait = 0, elapsed = 0;
+    uint32_t time_start = 0;
+    int ans = 0, samples = 0, tsamples = 0;
+    int wait = 0, elapsed = 0;
 
-	Dbprintf("ISO-15963 Simulating uid: %02X%02X%02X%02X%02X%02X%02X%02X", uid[0], uid[1], uid[2], uid[3], uid[4], uid[5], uid[6], uid[7]);
+    Dbprintf("ISO-15963 Simulating uid: %02X%02X%02X%02X%02X%02X%02X%02X", uid[0], uid[1], uid[2], uid[3], uid[4], uid[5], uid[6], uid[7]);
 
-	uint8_t buf[ISO15_MAX_FRAME];
-	memset(buf, 0x00, sizeof(buf));
+    uint8_t buf[ISO15_MAX_FRAME];
+    memset(buf, 0x00, sizeof(buf));
 
-	LED_C_ON();
+    LED_C_ON();
 
-	// Build a suitable reponse to the reader INVENTORY cocmmand
-	// not so obsvious, but in the call to BuildInventoryResponse,  the command is copied to the global ToSend buffer used below.
-	uint8_t cmd[CMD_INV_RESP] = {0};
-	BuildInventoryResponse(cmd, uid);
+    // Build a suitable reponse to the reader INVENTORY cocmmand
+    // not so obsvious, but in the call to BuildInventoryResponse,  the command is copied to the global ToSend buffer used below.
+    uint8_t cmd[CMD_INV_RESP] = {0};
+    BuildInventoryResponse(cmd, uid);
 
-	while (!BUTTON_PRESS() && !usb_poll_validate_length() ) {
-		WDT_HIT();
+    while (!BUTTON_PRESS() && !usb_poll_validate_length() ) {
+        WDT_HIT();
 
-		// Listen to reader
-		ans = GetIso15693AnswerFromSniff(buf, &samples, &elapsed) ;
+        // Listen to reader
+        ans = GetIso15693AnswerFromSniff(buf, &samples, &elapsed) ;
 
-		// we should do a better check than this
-		if (ans >= 1 ) {
+        // we should do a better check than this
+        if (ans >= 1 ) {
 
-			time_start = GetCountSspClk();
-			TransmitTo15693Reader(ToSend, ToSendMax, &tsamples, &wait);
-			LogTrace(cmd, CMD_INV_RESP, time_start << 4, (GetCountSspClk() - time_start) << 4, NULL, true);
+            time_start = GetCountSspClk();
+            TransmitTo15693Reader(ToSend, ToSendMax, &tsamples, &wait);
+            LogTrace(cmd, CMD_INV_RESP, time_start << 4, (GetCountSspClk() - time_start) << 4, NULL, true);
 
-			if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
-				Dbprintf("[+] %d octets read from reader command: %x %x %x %x %x %x %x %x", ans,
-					buf[0], buf[1], buf[2],	buf[3],
-					buf[4], buf[5],	buf[6], buf[7]
-				);
-			}
-		}
-	}
-	switch_off();
+            if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
+                Dbprintf("[+] %d octets read from reader command: %x %x %x %x %x %x %x %x", ans,
+                    buf[0], buf[1], buf[2], buf[3],
+                    buf[4], buf[5], buf[6], buf[7]
+                );
+            }
+        }
+    }
+    switch_off();
 }
 
 // Since there is no standardized way of reading the AFI out of a tag, we will brute force it
 // (some manufactures offer a way to read the AFI, though)
 void BruteforceIso15693Afi(uint32_t speed) {
 
-	uint8_t data[7] = {0,0,0,0,0,0,0};
-	uint8_t buf[ISO15_MAX_FRAME];
-	memset(buf, 0x00, sizeof(buf));
-	int datalen = 0, recvlen = 0;
+    uint8_t data[7] = {0,0,0,0,0,0,0};
+    uint8_t buf[ISO15_MAX_FRAME];
+    memset(buf, 0x00, sizeof(buf));
+    int datalen = 0, recvlen = 0;
 
-	Iso15693InitReader();
+    Iso15693InitReader();
 
-	// first without AFI
-	// Tags should respond wihtout AFI and with AFI=0 even when AFI is active
+    // first without AFI
+    // Tags should respond wihtout AFI and with AFI=0 even when AFI is active
 
-	data[0] = ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | ISO15_REQ_INVENTORY | ISO15_REQINV_SLOT1;
-	data[1] = ISO15_CMD_INVENTORY;
-	data[2] = 0; // mask length
-	AddCrc(data, 3);
-	datalen += 2;
+    data[0] = ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | ISO15_REQ_INVENTORY | ISO15_REQINV_SLOT1;
+    data[1] = ISO15_CMD_INVENTORY;
+    data[2] = 0; // mask length
+    AddCrc(data, 3);
+    datalen += 2;
 
-	recvlen = SendDataTag(data, datalen, false, speed, buf);
+    recvlen = SendDataTag(data, datalen, false, speed, buf);
 
-	WDT_HIT();
+    WDT_HIT();
 
-	if (recvlen >= 12) {
-		Dbprintf("NoAFI UID = %s", sprintUID(NULL, buf + 2) );
-	}
+    if (recvlen >= 12) {
+        Dbprintf("NoAFI UID = %s", sprintUID(NULL, buf + 2) );
+    }
 
-	// now with AFI
-	data[0] |= ISO15_REQINV_AFI;
-	//data[1] = ISO15_CMD_INVENTORY;
-	data[2] = 0; // AFI
-	data[3] = 0; // mask length
+    // now with AFI
+    data[0] |= ISO15_REQINV_AFI;
+    //data[1] = ISO15_CMD_INVENTORY;
+    data[2] = 0; // AFI
+    data[3] = 0; // mask length
 
-	for (uint16_t i = 0; i < 256; i++) {
-		data[2] = i & 0xFF;
-		AddCrc(data, 4);
-		datalen += 2;
-		recvlen = SendDataTag(data, datalen, false, speed, buf);
-		WDT_HIT();
-		if (recvlen >= 12) {
-			Dbprintf("AFI = %i  UID = %s", i, sprintUID(NULL, buf + 2) );
-		}
+    for (uint16_t i = 0; i < 256; i++) {
+        data[2] = i & 0xFF;
+        AddCrc(data, 4);
+        datalen += 2;
+        recvlen = SendDataTag(data, datalen, false, speed, buf);
+        WDT_HIT();
+        if (recvlen >= 12) {
+            Dbprintf("AFI = %i  UID = %s", i, sprintUID(NULL, buf + 2) );
+        }
 
-		if (BUTTON_PRESS()) {
-			DbpString("button pressed, aborting..");
-			break;
-		}
-	}
+        if (BUTTON_PRESS()) {
+            DbpString("button pressed, aborting..");
+            break;
+        }
+    }
 
-	DbpString("AFI Bruteforcing done.");
-	switch_off();
+    DbpString("AFI Bruteforcing done.");
+    switch_off();
 }
 
 // Allows to directly send commands to the tag via the client
 // Has to increase dialog between device and client.
 void DirectTag15693Command(uint32_t datalen, uint32_t speed, uint32_t recv, uint8_t *data) {
 
-	bool init = true;
-	int buflen = 0;
-	uint8_t buf[ISO15_MAX_FRAME];
-	memset(buf, 0x00, sizeof(buf));
+    bool init = true;
+    int buflen = 0;
+    uint8_t buf[ISO15_MAX_FRAME];
+    memset(buf, 0x00, sizeof(buf));
 
-	if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
-		DbpString("[+] SEND");
-		Dbhexdump(datalen, data, true);
-	}
+    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
+        DbpString("[+] SEND");
+        Dbhexdump(datalen, data, true);
+    }
 
-	buflen = SendDataTag(data, datalen, init, speed, (recv ? buf : NULL));
+    buflen = SendDataTag(data, datalen, init, speed, (recv ? buf : NULL));
 
-	if (recv) {
-		buflen = (buflen > ISO15_MAX_FRAME) ? ISO15_MAX_FRAME : buflen;
+    if (recv) {
+        buflen = (buflen > ISO15_MAX_FRAME) ? ISO15_MAX_FRAME : buflen;
 
-		LED_B_ON();
-		cmd_send(CMD_ACK, buflen, 0, 0, buf, buflen);
-		LED_B_OFF();
+        LED_B_ON();
+        cmd_send(CMD_ACK, buflen, 0, 0, buf, buflen);
+        LED_B_OFF();
 
-		if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
-			DbpString("[+] RECV");
-			DbdecodeIso15693Answer(buflen, buf);
-			Dbhexdump(buflen, buf, true);
-		}
-	} else {
-		cmd_send(CMD_ACK,1,0,0,0,0);
-	}
+        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
+            DbpString("[+] RECV");
+            DbdecodeIso15693Answer(buflen, buf);
+            Dbhexdump(buflen, buf, true);
+        }
+    } else {
+        cmd_send(CMD_ACK,1,0,0,0,0);
+    }
 }
\ No newline at end of file
diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index 3296aff8c..bd34e46df 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -22,10 +22,10 @@
 #include "flashmem.h" // persistence on mem
 
 #ifndef SHORT_COIL
-# define SHORT_COIL()	LOW(GPIO_SSC_DOUT)
+# define SHORT_COIL() LOW(GPIO_SSC_DOUT)
 #endif
 #ifndef OPEN_COIL
-# define OPEN_COIL()	HIGH(GPIO_SSC_DOUT)
+# define OPEN_COIL()  HIGH(GPIO_SSC_DOUT)
 #endif
 
 //#define START_GAP 31*8 // was 250 // SPEC:  1*8 to 50*8 - typ 15*8 (15fc)
@@ -53,99 +53,99 @@
 // 1fc = 8us = 12ticks
 /*
 Default LF T55xx config is set to:
-	startgap = 31*8
-	writegap = 17*8
-	write_0 = 15*8
-	write_1 = 47*8
-	read_gap = 15*8
+    startgap = 31*8
+    writegap = 17*8
+    write_0 = 15*8
+    write_1 = 47*8
+    read_gap = 15*8
 */
 t55xx_config t_config = { 29*8, 17*8, 15*8, 47*8, 15*8 } ;
 
 void printT55xxConfig(void) {
-	Dbprintf("LF T55XX config");
-	Dbprintf("  [a] startgap............%d*8 (%d)", t_config.start_gap/8, t_config.start_gap);
-	Dbprintf("  [b] writegap............%d*8 (%d)", t_config.write_gap/8, t_config.write_gap);
-	Dbprintf("  [c] write_0.............%d*8 (%d)", t_config.write_0/8,   t_config.write_0);
-	Dbprintf("  [d] write_1.............%d*8 (%d)", t_config.write_1/8,   t_config.write_1);
-	Dbprintf("  [e] readgap.............%d*8 (%d)", t_config.read_gap/8,  t_config.read_gap);
+    Dbprintf("LF T55XX config");
+    Dbprintf("  [a] startgap............%d*8 (%d)", t_config.start_gap/8, t_config.start_gap);
+    Dbprintf("  [b] writegap............%d*8 (%d)", t_config.write_gap/8, t_config.write_gap);
+    Dbprintf("  [c] write_0.............%d*8 (%d)", t_config.write_0/8,   t_config.write_0);
+    Dbprintf("  [d] write_1.............%d*8 (%d)", t_config.write_1/8,   t_config.write_1);
+    Dbprintf("  [e] readgap.............%d*8 (%d)", t_config.read_gap/8,  t_config.read_gap);
 }
 
 void setT55xxConfig(uint8_t arg0, t55xx_config *c) {
 
-	if (c->start_gap != 0) t_config.start_gap = c->start_gap;
-	if (c->write_gap != 0) t_config.write_gap = c->write_gap;
-	if (c->write_0   != 0) t_config.write_0 = c->write_0;
-	if (c->write_1   != 0) t_config.write_1 = c->write_1;
-	if (c->read_gap  != 0) t_config.read_gap = c->read_gap;
+    if (c->start_gap != 0) t_config.start_gap = c->start_gap;
+    if (c->write_gap != 0) t_config.write_gap = c->write_gap;
+    if (c->write_0   != 0) t_config.write_0 = c->write_0;
+    if (c->write_1   != 0) t_config.write_1 = c->write_1;
+    if (c->read_gap  != 0) t_config.read_gap = c->read_gap;
 
-	printT55xxConfig();
+    printT55xxConfig();
 
 #ifdef WITH_FLASH
-	// shall persist to flashmem
-	if (arg0 == 0) {
-		return;
-	}
+    // shall persist to flashmem
+    if (arg0 == 0) {
+        return;
+    }
 
     if (!FlashInit()) {
         return;
-	}
+    }
 
-	uint8_t *buf = BigBuf_malloc(T55XX_CONFIG_LEN);
-	Flash_CheckBusy(BUSY_TIMEOUT);
-	uint16_t res = Flash_ReadDataCont(T55XX_CONFIG_OFFSET, buf, T55XX_CONFIG_LEN);
-	if ( res == 0) {
-		FlashStop();
-		BigBuf_free();
-		return;
-	}
+    uint8_t *buf = BigBuf_malloc(T55XX_CONFIG_LEN);
+    Flash_CheckBusy(BUSY_TIMEOUT);
+    uint16_t res = Flash_ReadDataCont(T55XX_CONFIG_OFFSET, buf, T55XX_CONFIG_LEN);
+    if ( res == 0) {
+        FlashStop();
+        BigBuf_free();
+        return;
+    }
 
-	memcpy(buf, &t_config, T55XX_CONFIG_LEN);
+    memcpy(buf, &t_config, T55XX_CONFIG_LEN);
 
-	Flash_CheckBusy(BUSY_TIMEOUT);
+    Flash_CheckBusy(BUSY_TIMEOUT);
     Flash_WriteEnable();
-	Flash_Erase4k(3, 0xD);
-	res = Flash_Write(T55XX_CONFIG_OFFSET, buf, T55XX_CONFIG_LEN);
+    Flash_Erase4k(3, 0xD);
+    res = Flash_Write(T55XX_CONFIG_OFFSET, buf, T55XX_CONFIG_LEN);
 
-	if ( res == T55XX_CONFIG_LEN && MF_DBGLEVEL > 1) {
-		DbpString("T55XX Config save success");
-	}
+    if ( res == T55XX_CONFIG_LEN && MF_DBGLEVEL > 1) {
+        DbpString("T55XX Config save success");
+    }
 
-	BigBuf_free();
+    BigBuf_free();
 #endif
 }
 
 t55xx_config* getT55xxConfig(void) {
-	return &t_config;
+    return &t_config;
 }
 
 void loadT55xxConfig(void) {
 #ifdef WITH_FLASH
     if (!FlashInit()) {
         return;
-	}
+    }
 
-	uint8_t *buf = BigBuf_malloc(T55XX_CONFIG_LEN);
+    uint8_t *buf = BigBuf_malloc(T55XX_CONFIG_LEN);
 
-	Flash_CheckBusy(BUSY_TIMEOUT);
-	uint16_t isok = Flash_ReadDataCont(T55XX_CONFIG_OFFSET, buf, T55XX_CONFIG_LEN);
-	FlashStop();
+    Flash_CheckBusy(BUSY_TIMEOUT);
+    uint16_t isok = Flash_ReadDataCont(T55XX_CONFIG_OFFSET, buf, T55XX_CONFIG_LEN);
+    FlashStop();
 
-	// verify read mem is actual data.
-	uint8_t cntA = T55XX_CONFIG_LEN, cntB = T55XX_CONFIG_LEN;
-	for (int i=0; i< T55XX_CONFIG_LEN; i++) {
-		if ( buf[i] == 0xFF) cntA--;
-		if ( buf[i] == 0x00) cntB--;
-	}
-	if ( !cntA || !cntB ) {
-		BigBuf_free();
-		return;
-	}
+    // verify read mem is actual data.
+    uint8_t cntA = T55XX_CONFIG_LEN, cntB = T55XX_CONFIG_LEN;
+    for (int i=0; i< T55XX_CONFIG_LEN; i++) {
+        if ( buf[i] == 0xFF) cntA--;
+        if ( buf[i] == 0x00) cntB--;
+    }
+    if ( !cntA || !cntB ) {
+        BigBuf_free();
+        return;
+    }
 
-	memcpy((uint8_t *)&t_config, buf, T55XX_CONFIG_LEN);
+    memcpy((uint8_t *)&t_config, buf, T55XX_CONFIG_LEN);
 
-	if ( isok == T55XX_CONFIG_LEN) {
-		if (MF_DBGLEVEL > 1) DbpString("T55XX Config load success");
-	}
+    if ( isok == T55XX_CONFIG_LEN) {
+        if (MF_DBGLEVEL > 1) DbpString("T55XX Config load success");
+    }
 #endif
 }
 
@@ -158,98 +158,98 @@ void loadT55xxConfig(void) {
  */
 void ModThenAcquireRawAdcSamples125k(uint32_t delay_off, uint32_t period_0, uint32_t period_1, uint8_t *command) {
 
-	// start timer
-	StartTicks();
+    // start timer
+    StartTicks();
 
-	// use lf config settings
-	sample_config *sc = getSamplingConfig();
+    // use lf config settings
+    sample_config *sc = getSamplingConfig();
 
-	// Make sure the tag is reset
-	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	WaitMS(500);
+    // Make sure the tag is reset
+    FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    WaitMS(500);
 
-	// clear read buffer
-	BigBuf_Clear_keep_EM();
+    // clear read buffer
+    BigBuf_Clear_keep_EM();
 
-	LFSetupFPGAForADC(sc->divisor, 1);
+    LFSetupFPGAForADC(sc->divisor, 1);
 
-	// little more time for the tag to fully power up
-	WaitMS(200);
+    // little more time for the tag to fully power up
+    WaitMS(200);
 
-	// if delay_off = 0 then just bitbang 1 = antenna on 0 = off for respective periods.
-	bool bitbang = delay_off == 0;
-	// now modulate the reader field
-	if (bitbang) {
-		// HACK it appears the loop and if statements take up about 7us so adjust waits accordingly...
-		uint8_t hack_cnt = 7;
-		if (period_0 < hack_cnt || period_1 < hack_cnt) {
-			DbpString("[!] Warning periods cannot be less than 7us in bit bang mode");
-			FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-			LED_D_OFF();
-			return;
-		}
+    // if delay_off = 0 then just bitbang 1 = antenna on 0 = off for respective periods.
+    bool bitbang = delay_off == 0;
+    // now modulate the reader field
+    if (bitbang) {
+        // HACK it appears the loop and if statements take up about 7us so adjust waits accordingly...
+        uint8_t hack_cnt = 7;
+        if (period_0 < hack_cnt || period_1 < hack_cnt) {
+            DbpString("[!] Warning periods cannot be less than 7us in bit bang mode");
+            FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+            LED_D_OFF();
+            return;
+        }
 
-		// hack2 needed---  it appears to take about 8-16us to turn the antenna back on
-		// leading to ~ 1 to 2 125khz samples extra in every off period
-		// so we should test for last 0 before next 1 and reduce period_0 by this extra amount...
-		// but is this time different for every antenna or other hw builds???  more testing needed
+        // hack2 needed---  it appears to take about 8-16us to turn the antenna back on
+        // leading to ~ 1 to 2 125khz samples extra in every off period
+        // so we should test for last 0 before next 1 and reduce period_0 by this extra amount...
+        // but is this time different for every antenna or other hw builds???  more testing needed
 
-		// prime cmd_len to save time comparing strings while modulating
-		int cmd_len = 0;
-		while(command[cmd_len] != '\0' && command[cmd_len] != ' ')
-			cmd_len++;
+        // prime cmd_len to save time comparing strings while modulating
+        int cmd_len = 0;
+        while(command[cmd_len] != '\0' && command[cmd_len] != ' ')
+            cmd_len++;
 
-		int counter = 0;
-		bool off = false;
-		for (counter = 0; counter < cmd_len; counter++) {
-			// if cmd = 0 then turn field off
-			if (command[counter] == '0') {
-				// if field already off leave alone (affects timing otherwise)
-				if (off == false) {
-					FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-					LED_D_OFF();
-					off = true;
-				}
-				// note we appear to take about 7us to switch over (or run the if statements/loop...)
-				WaitUS(period_0 - hack_cnt);
-			// else if cmd = 1 then turn field on
-			} else {
-				// if field already on leave alone (affects timing otherwise)
-				if (off) {
-					FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | FPGA_LF_ADC_READER_FIELD);
-					LED_D_ON();
-					off = false;
-				}
-				// note we appear to take about 7us to switch over (or run the if statements/loop...)
-				WaitUS(period_1 - hack_cnt);
-			}
-		}
-	} else { // old mode of cmd read using delay as off period
-		while(*command != '\0' && *command != ' ') {
-			LED_D_ON();
-			if (*(command++) == '0')
-				TurnReadLFOn(period_0);
-			else
-				TurnReadLFOn(period_1);
+        int counter = 0;
+        bool off = false;
+        for (counter = 0; counter < cmd_len; counter++) {
+            // if cmd = 0 then turn field off
+            if (command[counter] == '0') {
+                // if field already off leave alone (affects timing otherwise)
+                if (off == false) {
+                    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+                    LED_D_OFF();
+                    off = true;
+                }
+                // note we appear to take about 7us to switch over (or run the if statements/loop...)
+                WaitUS(period_0 - hack_cnt);
+            // else if cmd = 1 then turn field on
+            } else {
+                // if field already on leave alone (affects timing otherwise)
+                if (off) {
+                    FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | FPGA_LF_ADC_READER_FIELD);
+                    LED_D_ON();
+                    off = false;
+                }
+                // note we appear to take about 7us to switch over (or run the if statements/loop...)
+                WaitUS(period_1 - hack_cnt);
+            }
+        }
+    } else { // old mode of cmd read using delay as off period
+        while(*command != '\0' && *command != ' ') {
+            LED_D_ON();
+            if (*(command++) == '0')
+                TurnReadLFOn(period_0);
+            else
+                TurnReadLFOn(period_1);
 
-			LED_D_OFF();
-			FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-			WaitUS(delay_off);
-		}
+            LED_D_OFF();
+            FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+            WaitUS(delay_off);
+        }
 
-		FpgaSendCommand(FPGA_CMD_SET_DIVISOR, sc->divisor);
-	}
+        FpgaSendCommand(FPGA_CMD_SET_DIVISOR, sc->divisor);
+    }
 
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | FPGA_LF_ADC_READER_FIELD);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | FPGA_LF_ADC_READER_FIELD);
 
-	// now do the read
-	DoAcquisition_config(false, 0);
+    // now do the read
+    DoAcquisition_config(false, 0);
 
-	// Turn off antenna
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	// tell client we are done
-	cmd_send(CMD_ACK,0,0,0,0,0);
+    // Turn off antenna
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    // tell client we are done
+    cmd_send(CMD_ACK,0,0,0,0,0);
 }
 
 /* blank r/w tag data stream
@@ -263,238 +263,238 @@ void ModThenAcquireRawAdcSamples125k(uint32_t delay_off, uint32_t period_0, uint
 */
 void ReadTItag(void)
 {
-	StartTicks();
-	// some hardcoded initial params
-	// when we read a TI tag we sample the zerocross line at 2Mhz
-	// TI tags modulate a 1 as 16 cycles of 123.2Khz
-	// TI tags modulate a 0 as 16 cycles of 134.2Khz
-	#define FSAMPLE 2000000
-	#define FREQLO 123200
-	#define FREQHI 134200
+    StartTicks();
+    // some hardcoded initial params
+    // when we read a TI tag we sample the zerocross line at 2Mhz
+    // TI tags modulate a 1 as 16 cycles of 123.2Khz
+    // TI tags modulate a 0 as 16 cycles of 134.2Khz
+    #define FSAMPLE 2000000
+    #define FREQLO 123200
+    #define FREQHI 134200
 
-	signed char *dest = (signed char *)BigBuf_get_addr();
-	uint16_t n = BigBuf_max_traceLen();
-	// 128 bit shift register [shift3:shift2:shift1:shift0]
-	uint32_t shift3 = 0, shift2 = 0, shift1 = 0, shift0 = 0;
+    signed char *dest = (signed char *)BigBuf_get_addr();
+    uint16_t n = BigBuf_max_traceLen();
+    // 128 bit shift register [shift3:shift2:shift1:shift0]
+    uint32_t shift3 = 0, shift2 = 0, shift1 = 0, shift0 = 0;
 
-	int i, cycles=0, samples=0;
-	// how many sample points fit in 16 cycles of each frequency
-	uint32_t sampleslo = (FSAMPLE<<4)/FREQLO, sampleshi = (FSAMPLE<<4)/FREQHI;
-	// when to tell if we're close enough to one freq or another
-	uint32_t threshold = (sampleslo - sampleshi + 1)>>1;
+    int i, cycles=0, samples=0;
+    // how many sample points fit in 16 cycles of each frequency
+    uint32_t sampleslo = (FSAMPLE<<4)/FREQLO, sampleshi = (FSAMPLE<<4)/FREQHI;
+    // when to tell if we're close enough to one freq or another
+    uint32_t threshold = (sampleslo - sampleshi + 1)>>1;
 
-	// TI tags charge at 134.2Khz
-	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-	FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 88); //134.8Khz
+    // TI tags charge at 134.2Khz
+    FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
+    FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 88); //134.8Khz
 
-	// Place FPGA in passthrough mode, in this mode the CROSS_LO line
-	// connects to SSP_DIN and the SSP_DOUT logic level controls
-	// whether we're modulating the antenna (high)
-	// or listening to the antenna (low)
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_PASSTHRU);
+    // Place FPGA in passthrough mode, in this mode the CROSS_LO line
+    // connects to SSP_DIN and the SSP_DOUT logic level controls
+    // whether we're modulating the antenna (high)
+    // or listening to the antenna (low)
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_PASSTHRU);
 
-	// get TI tag data into the buffer
-	AcquireTiType();
+    // get TI tag data into the buffer
+    AcquireTiType();
 
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 
-	for (i=0; i<n-1; i++) {
-		// count cycles by looking for lo to hi zero crossings
-		if ( (dest[i]<0) && (dest[i+1]>0) ) {
-			cycles++;
-			// after 16 cycles, measure the frequency
-			if (cycles>15) {
-				cycles=0;
-				samples=i-samples; // number of samples in these 16 cycles
+    for (i=0; i<n-1; i++) {
+        // count cycles by looking for lo to hi zero crossings
+        if ( (dest[i]<0) && (dest[i+1]>0) ) {
+            cycles++;
+            // after 16 cycles, measure the frequency
+            if (cycles>15) {
+                cycles=0;
+                samples=i-samples; // number of samples in these 16 cycles
 
-				// TI bits are coming to us lsb first so shift them
-				// right through our 128 bit right shift register
-				shift0 = (shift0>>1) | (shift1 << 31);
-				shift1 = (shift1>>1) | (shift2 << 31);
-				shift2 = (shift2>>1) | (shift3 << 31);
-				shift3 >>= 1;
+                // TI bits are coming to us lsb first so shift them
+                // right through our 128 bit right shift register
+                shift0 = (shift0>>1) | (shift1 << 31);
+                shift1 = (shift1>>1) | (shift2 << 31);
+                shift2 = (shift2>>1) | (shift3 << 31);
+                shift3 >>= 1;
 
-				// check if the cycles fall close to the number
-				// expected for either the low or high frequency
-				if ( (samples>(sampleslo-threshold)) && (samples<(sampleslo+threshold)) ) {
-					// low frequency represents a 1
-					shift3 |= (1<<31);
-				} else if ( (samples>(sampleshi-threshold)) && (samples<(sampleshi+threshold)) ) {
-					// high frequency represents a 0
-				} else {
-					// probably detected a gay waveform or noise
-					// use this as gaydar or discard shift register and start again
-					shift3 = shift2 = shift1 = shift0 = 0;
-				}
-				samples = i;
+                // check if the cycles fall close to the number
+                // expected for either the low or high frequency
+                if ( (samples>(sampleslo-threshold)) && (samples<(sampleslo+threshold)) ) {
+                    // low frequency represents a 1
+                    shift3 |= (1<<31);
+                } else if ( (samples>(sampleshi-threshold)) && (samples<(sampleshi+threshold)) ) {
+                    // high frequency represents a 0
+                } else {
+                    // probably detected a gay waveform or noise
+                    // use this as gaydar or discard shift register and start again
+                    shift3 = shift2 = shift1 = shift0 = 0;
+                }
+                samples = i;
 
-				// for each bit we receive, test if we've detected a valid tag
+                // for each bit we receive, test if we've detected a valid tag
 
-				// if we see 17 zeroes followed by 6 ones, we might have a tag
-				// remember the bits are backwards
-				if ( ((shift0 & 0x7fffff) == 0x7e0000) ) {
-					// if start and end bytes match, we have a tag so break out of the loop
-					if ( ((shift0>>16)&0xff) == ((shift3>>8)&0xff) ) {
-						cycles = 0xF0B; //use this as a flag (ugly but whatever)
-						break;
-					}
-				}
-			}
-		}
-	}
+                // if we see 17 zeroes followed by 6 ones, we might have a tag
+                // remember the bits are backwards
+                if ( ((shift0 & 0x7fffff) == 0x7e0000) ) {
+                    // if start and end bytes match, we have a tag so break out of the loop
+                    if ( ((shift0>>16)&0xff) == ((shift3>>8)&0xff) ) {
+                        cycles = 0xF0B; //use this as a flag (ugly but whatever)
+                        break;
+                    }
+                }
+            }
+        }
+    }
 
-	// if flag is set we have a tag
-	if (cycles!=0xF0B) {
-		DbpString("Info: No valid tag detected.");
-	} else {
-		// put 64 bit data into shift1 and shift0
-		shift0 = (shift0>>24) | (shift1 << 8);
-		shift1 = (shift1>>24) | (shift2 << 8);
+    // if flag is set we have a tag
+    if (cycles!=0xF0B) {
+        DbpString("Info: No valid tag detected.");
+    } else {
+        // put 64 bit data into shift1 and shift0
+        shift0 = (shift0>>24) | (shift1 << 8);
+        shift1 = (shift1>>24) | (shift2 << 8);
 
-		// align 16 bit crc into lower half of shift2
-		shift2 = ((shift2>>24) | (shift3 << 8)) & 0x0ffff;
+        // align 16 bit crc into lower half of shift2
+        shift2 = ((shift2>>24) | (shift3 << 8)) & 0x0ffff;
 
-		// if r/w tag, check ident match
-		if (shift3 & (1<<15) ) {
-			DbpString("Info: TI tag is rewriteable");
-			// only 15 bits compare, last bit of ident is not valid
-			if (((shift3 >> 16) ^ shift0) & 0x7fff ) {
-				DbpString("Error: Ident mismatch!");
-			} else {
-				DbpString("Info: TI tag ident is valid");
-			}
-		} else {
-			DbpString("Info: TI tag is readonly");
-		}
+        // if r/w tag, check ident match
+        if (shift3 & (1<<15) ) {
+            DbpString("Info: TI tag is rewriteable");
+            // only 15 bits compare, last bit of ident is not valid
+            if (((shift3 >> 16) ^ shift0) & 0x7fff ) {
+                DbpString("Error: Ident mismatch!");
+            } else {
+                DbpString("Info: TI tag ident is valid");
+            }
+        } else {
+            DbpString("Info: TI tag is readonly");
+        }
 
-		// WARNING the order of the bytes in which we calc crc below needs checking
-		// i'm 99% sure the crc algorithm is correct, but it may need to eat the
-		// bytes in reverse or something
-		// calculate CRC
-		uint32_t crc=0;
+        // WARNING the order of the bytes in which we calc crc below needs checking
+        // i'm 99% sure the crc algorithm is correct, but it may need to eat the
+        // bytes in reverse or something
+        // calculate CRC
+        uint32_t crc=0;
 
-		crc = update_crc16(crc, (shift0)&0xff);
-		crc = update_crc16(crc, (shift0>>8)&0xff);
-		crc = update_crc16(crc, (shift0>>16)&0xff);
-		crc = update_crc16(crc, (shift0>>24)&0xff);
-		crc = update_crc16(crc, (shift1)&0xff);
-		crc = update_crc16(crc, (shift1>>8)&0xff);
-		crc = update_crc16(crc, (shift1>>16)&0xff);
-		crc = update_crc16(crc, (shift1>>24)&0xff);
+        crc = update_crc16(crc, (shift0)&0xff);
+        crc = update_crc16(crc, (shift0>>8)&0xff);
+        crc = update_crc16(crc, (shift0>>16)&0xff);
+        crc = update_crc16(crc, (shift0>>24)&0xff);
+        crc = update_crc16(crc, (shift1)&0xff);
+        crc = update_crc16(crc, (shift1>>8)&0xff);
+        crc = update_crc16(crc, (shift1>>16)&0xff);
+        crc = update_crc16(crc, (shift1>>24)&0xff);
 
-		Dbprintf("Info: Tag data: %x%08x, crc=%x", (unsigned int)shift1, (unsigned int)shift0, (unsigned int)shift2 & 0xFFFF);
-		if (crc != (shift2&0xffff)) {
-			Dbprintf("Error: CRC mismatch, expected %x", (unsigned int)crc);
-		} else {
-			DbpString("Info: CRC is good");
-		}
-	}
-	StopTicks();
+        Dbprintf("Info: Tag data: %x%08x, crc=%x", (unsigned int)shift1, (unsigned int)shift0, (unsigned int)shift2 & 0xFFFF);
+        if (crc != (shift2&0xffff)) {
+            Dbprintf("Error: CRC mismatch, expected %x", (unsigned int)crc);
+        } else {
+            DbpString("Info: CRC is good");
+        }
+    }
+    StopTicks();
 }
 
 void WriteTIbyte(uint8_t b)
 {
-	int i = 0;
+    int i = 0;
 
-	// modulate 8 bits out to the antenna
-	for (i=0; i<8; i++)
-	{
-		if ( b & ( 1 << i ) ) {
-			// stop modulating antenna 1ms
-			LOW(GPIO_SSC_DOUT);
-			WaitUS(1000);
-			// modulate antenna 1ms
-			HIGH(GPIO_SSC_DOUT);
-			WaitUS(1000);
-		} else {
-			// stop modulating antenna 0.3ms
-			LOW(GPIO_SSC_DOUT);
-			WaitUS(300);
-			// modulate antenna 1.7ms
-			HIGH(GPIO_SSC_DOUT);
-			WaitUS(1700);
-		}
-	}
+    // modulate 8 bits out to the antenna
+    for (i=0; i<8; i++)
+    {
+        if ( b & ( 1 << i ) ) {
+            // stop modulating antenna 1ms
+            LOW(GPIO_SSC_DOUT);
+            WaitUS(1000);
+            // modulate antenna 1ms
+            HIGH(GPIO_SSC_DOUT);
+            WaitUS(1000);
+        } else {
+            // stop modulating antenna 0.3ms
+            LOW(GPIO_SSC_DOUT);
+            WaitUS(300);
+            // modulate antenna 1.7ms
+            HIGH(GPIO_SSC_DOUT);
+            WaitUS(1700);
+        }
+    }
 }
 
 void AcquireTiType(void)
 {
-	int i, j, n;
-	// tag transmission is <20ms, sampling at 2M gives us 40K samples max
-	// each sample is 1 bit stuffed into a uint32_t so we need 1250 uint32_t
-	#define TIBUFLEN 1250
+    int i, j, n;
+    // tag transmission is <20ms, sampling at 2M gives us 40K samples max
+    // each sample is 1 bit stuffed into a uint32_t so we need 1250 uint32_t
+    #define TIBUFLEN 1250
 
-	// clear buffer
-	uint32_t *buf = (uint32_t *)BigBuf_get_addr();
+    // clear buffer
+    uint32_t *buf = (uint32_t *)BigBuf_get_addr();
 
-	//clear buffer now so it does not interfere with timing later
-	BigBuf_Clear_ext(false);
+    //clear buffer now so it does not interfere with timing later
+    BigBuf_Clear_ext(false);
 
-	// Set up the synchronous serial port
-	AT91C_BASE_PIOA->PIO_PDR = GPIO_SSC_DIN;
-	AT91C_BASE_PIOA->PIO_ASR = GPIO_SSC_DIN;
+    // Set up the synchronous serial port
+    AT91C_BASE_PIOA->PIO_PDR = GPIO_SSC_DIN;
+    AT91C_BASE_PIOA->PIO_ASR = GPIO_SSC_DIN;
 
-	// steal this pin from the SSP and use it to control the modulation
-	AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
-	AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
+    // steal this pin from the SSP and use it to control the modulation
+    AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
+    AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
 
-	AT91C_BASE_SSC->SSC_CR = AT91C_SSC_SWRST;
-	AT91C_BASE_SSC->SSC_CR = AT91C_SSC_RXEN | AT91C_SSC_TXEN;
+    AT91C_BASE_SSC->SSC_CR = AT91C_SSC_SWRST;
+    AT91C_BASE_SSC->SSC_CR = AT91C_SSC_RXEN | AT91C_SSC_TXEN;
 
-	// Sample at 2 Mbit/s, so TI tags are 16.2 vs. 14.9 clocks long
-	// 48/2 = 24 MHz clock must be divided by 12
-	AT91C_BASE_SSC->SSC_CMR = 12;
+    // Sample at 2 Mbit/s, so TI tags are 16.2 vs. 14.9 clocks long
+    // 48/2 = 24 MHz clock must be divided by 12
+    AT91C_BASE_SSC->SSC_CMR = 12;
 
-	AT91C_BASE_SSC->SSC_RCMR = SSC_CLOCK_MODE_SELECT(0);
-	AT91C_BASE_SSC->SSC_RFMR = SSC_FRAME_MODE_BITS_IN_WORD(32) | AT91C_SSC_MSBF;
-	// Transmit Clock Mode Register
-	AT91C_BASE_SSC->SSC_TCMR = 0;
-	// Transmit Frame Mode Register
-	AT91C_BASE_SSC->SSC_TFMR = 0;
-	// iceman, FpgaSetupSsc() ?? the code above? can it be replaced?
-	LED_D_ON();
+    AT91C_BASE_SSC->SSC_RCMR = SSC_CLOCK_MODE_SELECT(0);
+    AT91C_BASE_SSC->SSC_RFMR = SSC_FRAME_MODE_BITS_IN_WORD(32) | AT91C_SSC_MSBF;
+    // Transmit Clock Mode Register
+    AT91C_BASE_SSC->SSC_TCMR = 0;
+    // Transmit Frame Mode Register
+    AT91C_BASE_SSC->SSC_TFMR = 0;
+    // iceman, FpgaSetupSsc() ?? the code above? can it be replaced?
+    LED_D_ON();
 
-	// modulate antenna
-	HIGH(GPIO_SSC_DOUT);
+    // modulate antenna
+    HIGH(GPIO_SSC_DOUT);
 
-	// Charge TI tag for 50ms.
-	WaitMS(50);
+    // Charge TI tag for 50ms.
+    WaitMS(50);
 
-	// stop modulating antenna and listen
-	LOW(GPIO_SSC_DOUT);
+    // stop modulating antenna and listen
+    LOW(GPIO_SSC_DOUT);
 
-	LED_D_OFF();
+    LED_D_OFF();
 
-	i = 0;
-	for (;;) {
-		if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
-			buf[i] = AT91C_BASE_SSC->SSC_RHR;	// store 32 bit values in buffer
-			i++;
-			if (i >= TIBUFLEN) break;
-		}
-		WDT_HIT();
-	}
+    i = 0;
+    for (;;) {
+        if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
+            buf[i] = AT91C_BASE_SSC->SSC_RHR; // store 32 bit values in buffer
+            i++;
+            if (i >= TIBUFLEN) break;
+        }
+        WDT_HIT();
+    }
 
-	// return stolen pin to SSP
-	AT91C_BASE_PIOA->PIO_PDR = GPIO_SSC_DOUT;
-	AT91C_BASE_PIOA->PIO_ASR = GPIO_SSC_DIN | GPIO_SSC_DOUT;
+    // return stolen pin to SSP
+    AT91C_BASE_PIOA->PIO_PDR = GPIO_SSC_DOUT;
+    AT91C_BASE_PIOA->PIO_ASR = GPIO_SSC_DIN | GPIO_SSC_DOUT;
 
-	char *dest = (char *)BigBuf_get_addr();
-	n = TIBUFLEN * 32;
+    char *dest = (char *)BigBuf_get_addr();
+    n = TIBUFLEN * 32;
 
-	// unpack buffer
-	for (i = TIBUFLEN-1; i >= 0; i--) {
-		for (j = 0; j < 32; j++) {
-			if(buf[i] & (1 << j)) {
-				dest[--n] = 1;
-			} else {
-				dest[--n] = -1;
-			}
-		}
-	}
+    // unpack buffer
+    for (i = TIBUFLEN-1; i >= 0; i--) {
+        for (j = 0; j < 32; j++) {
+            if(buf[i] & (1 << j)) {
+                dest[--n] = 1;
+            } else {
+                dest[--n] = -1;
+            }
+        }
+    }
 
-	// reset SSC
-	FpgaSetupSsc();
+    // reset SSC
+    FpgaSetupSsc();
 }
 
 // arguments: 64bit data split into 32bit idhi:idlo and optional 16bit crc
@@ -502,162 +502,163 @@ void AcquireTiType(void)
 // if not provided a valid crc will be computed from the data and written.
 void WriteTItag(uint32_t idhi, uint32_t idlo, uint16_t crc)
 {
-	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-	if(crc == 0) {
-		crc = update_crc16(crc, (idlo)&0xff);
-		crc = update_crc16(crc, (idlo>>8)&0xff);
-		crc = update_crc16(crc, (idlo>>16)&0xff);
-		crc = update_crc16(crc, (idlo>>24)&0xff);
-		crc = update_crc16(crc, (idhi)&0xff);
-		crc = update_crc16(crc, (idhi>>8)&0xff);
-		crc = update_crc16(crc, (idhi>>16)&0xff);
-		crc = update_crc16(crc, (idhi>>24)&0xff);
-	}
-	Dbprintf("Writing to tag: %x%08x, crc=%x",	idhi, idlo, crc);
+    FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
+    if(crc == 0) {
+        crc = update_crc16(crc, (idlo)&0xff);
+        crc = update_crc16(crc, (idlo>>8)&0xff);
+        crc = update_crc16(crc, (idlo>>16)&0xff);
+        crc = update_crc16(crc, (idlo>>24)&0xff);
+        crc = update_crc16(crc, (idhi)&0xff);
+        crc = update_crc16(crc, (idhi>>8)&0xff);
+        crc = update_crc16(crc, (idhi>>16)&0xff);
+        crc = update_crc16(crc, (idhi>>24)&0xff);
+    }
+    Dbprintf("Writing to tag: %x%08x, crc=%x", idhi, idlo, crc);
 
-	// TI tags charge at 134.2Khz
-	FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 88); //134.8Khz
-	// Place FPGA in passthrough mode, in this mode the CROSS_LO line
-	// connects to SSP_DIN and the SSP_DOUT logic level controls
-	// whether we're modulating the antenna (high)
-	// or listening to the antenna (low)
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_PASSTHRU);
-	StartTicks();
+    // TI tags charge at 134.2Khz
+    FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 88); //134.8Khz
+    // Place FPGA in passthrough mode, in this mode the CROSS_LO line
+    // connects to SSP_DIN and the SSP_DOUT logic level controls
+    // whether we're modulating the antenna (high)
+    // or listening to the antenna (low)
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_PASSTHRU);
+    StartTicks();
 
-	LED_A_ON();
+    LED_A_ON();
 
-	// steal this pin from the SSP and use it to control the modulation
-	AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
-	AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
+    // steal this pin from the SSP and use it to control the modulation
+    AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
+    AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
 
-	// writing algorithm:
-	// a high bit consists of a field off for 1ms and field on for 1ms
-	// a low bit consists of a field off for 0.3ms and field on for 1.7ms
-	// initiate a charge time of 50ms (field on) then immediately start writing bits
-	// start by writing 0xBB (keyword) and 0xEB (password)
-	// then write 80 bits of data (or 64 bit data + 16 bit crc if you prefer)
-	// finally end with 0x0300 (write frame)
-	// all data is sent lsb first
-	// finish with 50ms programming time
+    // writing algorithm:
+    // a high bit consists of a field off for 1ms and field on for 1ms
+    // a low bit consists of a field off for 0.3ms and field on for 1.7ms
+    // initiate a charge time of 50ms (field on) then immediately start writing bits
+    // start by writing 0xBB (keyword) and 0xEB (password)
+    // then write 80 bits of data (or 64 bit data + 16 bit crc if you prefer)
+    // finally end with 0x0300 (write frame)
+    // all data is sent lsb first
+    // finish with 50ms programming time
 
-	// modulate antenna
-	HIGH(GPIO_SSC_DOUT);
-	WaitMS(50);	// charge time
+    // modulate antenna
+    HIGH(GPIO_SSC_DOUT);
+    WaitMS(50); // charge time
 
-	WriteTIbyte(0xbb); // keyword
-	WriteTIbyte(0xeb); // password
-	WriteTIbyte( (idlo    )&0xff );
-	WriteTIbyte( (idlo>>8 )&0xff );
-	WriteTIbyte( (idlo>>16)&0xff );
-	WriteTIbyte( (idlo>>24)&0xff );
-	WriteTIbyte( (idhi    )&0xff );
-	WriteTIbyte( (idhi>>8 )&0xff );
-	WriteTIbyte( (idhi>>16)&0xff );
-	WriteTIbyte( (idhi>>24)&0xff ); // data hi to lo
-	WriteTIbyte( (crc     )&0xff ); // crc lo
-	WriteTIbyte( (crc>>8  )&0xff ); // crc hi
-	WriteTIbyte(0x00); // write frame lo
-	WriteTIbyte(0x03); // write frame hi
-	HIGH(GPIO_SSC_DOUT);
-	WaitMS(50);	// programming time
+    WriteTIbyte(0xbb); // keyword
+    WriteTIbyte(0xeb); // password
+    WriteTIbyte( (idlo    )&0xff );
+    WriteTIbyte( (idlo>>8 )&0xff );
+    WriteTIbyte( (idlo>>16)&0xff );
+    WriteTIbyte( (idlo>>24)&0xff );
+    WriteTIbyte( (idhi    )&0xff );
+    WriteTIbyte( (idhi>>8 )&0xff );
+    WriteTIbyte( (idhi>>16)&0xff );
+    WriteTIbyte( (idhi>>24)&0xff ); // data hi to lo
+    WriteTIbyte( (crc     )&0xff ); // crc lo
+    WriteTIbyte( (crc>>8  )&0xff ); // crc hi
+    WriteTIbyte(0x00); // write frame lo
+    WriteTIbyte(0x03); // write frame hi
+    HIGH(GPIO_SSC_DOUT);
+    WaitMS(50); // programming time
 
-	LED_A_OFF();
+    LED_A_OFF();
 
-	// get TI tag data into the buffer
-	AcquireTiType();
+    // get TI tag data into the buffer
+    AcquireTiType();
 
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	DbpString("Now use `lf ti read` to check");
-	StopTicks();
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    DbpString("Now use `lf ti read` to check");
+    StopTicks();
 }
 
 // note:   a call to FpgaDownloadAndGo(FPGA_BITSTREAM_LF) must be done before, but
 //  this may destroy the bigbuf so be sure this is called before calling SimulateTagLowFrequencyEx
 void SimulateTagLowFrequencyEx(int period, int gap, int ledcontrol, int numcycles) {
 
-	// start us timer
-	StartTicks();
+    // start us timer
+    StartTicks();
 
-	//FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_TOGGLE_MODE );
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT);
-	WaitMS(20);
+    //FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_TOGGLE_MODE );
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT);
+    WaitMS(20);
 
-	int i = 0, x = 0;
-	uint8_t *buf = BigBuf_get_addr();
+    int i = 0, x = 0;
+    uint8_t *buf = BigBuf_get_addr();
 
-	// set frequency,  get values from 'lf config' command
-	sample_config *sc = getSamplingConfig();
+    // set frequency,  get values from 'lf config' command
+    sample_config *sc = getSamplingConfig();
 
-	if ( (sc->divisor == 1) || (sc->divisor < 0) || (sc->divisor > 255) )
-		FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 88); //134.8Khz
-	else if (sc->divisor == 0)
-		FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
-	else
-		FpgaSendCommand(FPGA_CMD_SET_DIVISOR, sc->divisor);
+    if ( (sc->divisor == 1) || (sc->divisor < 0) || (sc->divisor > 255) )
+        FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 88); //134.8Khz
+    else if (sc->divisor == 0)
+        FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
+    else
+        FpgaSendCommand(FPGA_CMD_SET_DIVISOR, sc->divisor);
 
-	AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT | GPIO_SSC_CLK;
-	AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
-	AT91C_BASE_PIOA->PIO_ODR = GPIO_SSC_CLK;
+    AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT | GPIO_SSC_CLK;
+    AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
+    AT91C_BASE_PIOA->PIO_ODR = GPIO_SSC_CLK;
 
-	uint8_t check = 1;
+    uint8_t check = 1;
 
-	for(;;) {
+    for(;;) {
 
-		if ( numcycles > -1 ) {
-			if ( x != numcycles ) {
-				++x;
-			} else {
-				// exit without turning of field
-				return;
-			}
-		}
+        if ( numcycles > -1 ) {
+            if ( x != numcycles ) {
+                ++x;
+            } else {
+                // exit without turning of field
+                return;
+            }
+        }
 
-		if (ledcontrol) LED_D_ON();
+        if (ledcontrol) LED_D_ON();
 
-		// wait until SSC_CLK goes HIGH
-		// used as a simple detection of a reader field?
-		while (!(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_CLK)) {
-			WDT_HIT();
-			if ( !check ) {
-				if ( usb_poll_validate_length() || BUTTON_PRESS() )
-					goto OUT;
-			}
-			++check;		}
+        // wait until SSC_CLK goes HIGH
+        // used as a simple detection of a reader field?
+        while (!(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_CLK)) {
+            WDT_HIT();
+            if ( !check ) {
+                if ( usb_poll_validate_length() || BUTTON_PRESS() )
+                    goto OUT;
+            }
+            ++check;
+        }
 
-		if (buf[i])
-			OPEN_COIL();
-		else
-			SHORT_COIL();
+        if (buf[i])
+            OPEN_COIL();
+        else
+            SHORT_COIL();
 
-		//wait until SSC_CLK goes LOW
-		while (AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_CLK) {
-			WDT_HIT();
-			if ( !check ) {
-				if ( usb_poll_validate_length() || BUTTON_PRESS() )
-					goto OUT;
-			}
-			++check;
-		}
+        //wait until SSC_CLK goes LOW
+        while (AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_CLK) {
+            WDT_HIT();
+            if ( !check ) {
+                if ( usb_poll_validate_length() || BUTTON_PRESS() )
+                    goto OUT;
+            }
+            ++check;
+        }
 
-		i++;
-		if (i == period) {
-			i = 0;
-			if (gap) {
-				SHORT_COIL();
-				WaitUS(gap);
-			}
-		}
+        i++;
+        if (i == period) {
+            i = 0;
+            if (gap) {
+                SHORT_COIL();
+                WaitUS(gap);
+            }
+        }
 
-		if (ledcontrol) LED_D_OFF();
-	}
+        if (ledcontrol) LED_D_OFF();
+    }
 OUT:
-	StopTicks();
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	LED_D_OFF();
+    StopTicks();
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    LED_D_OFF();
 }
 
 void SimulateTagLowFrequency(int period, int gap, int ledcontrol) {
-	SimulateTagLowFrequencyEx(period, gap, ledcontrol, -1);
+    SimulateTagLowFrequencyEx(period, gap, ledcontrol, -1);
 }
 
 
@@ -671,680 +672,680 @@ void SimulateTagLowFrequencyBidir(int divisor, int t0)
 // also manchester,
 static void fc(int c, int *n)
 {
-	uint8_t *dest = BigBuf_get_addr();
-	int idx;
+    uint8_t *dest = BigBuf_get_addr();
+    int idx;
 
-	// for when we want an fc8 pattern every 4 logical bits
-	if (c == 0) {
-		dest[((*n)++)] = 1;
-		dest[((*n)++)] = 1;
-		dest[((*n)++)] = 1;
-		dest[((*n)++)] = 1;
-		dest[((*n)++)] = 0;
-		dest[((*n)++)] = 0;
-		dest[((*n)++)] = 0;
-		dest[((*n)++)] = 0;
-	}
+    // for when we want an fc8 pattern every 4 logical bits
+    if (c == 0) {
+        dest[((*n)++)] = 1;
+        dest[((*n)++)] = 1;
+        dest[((*n)++)] = 1;
+        dest[((*n)++)] = 1;
+        dest[((*n)++)] = 0;
+        dest[((*n)++)] = 0;
+        dest[((*n)++)] = 0;
+        dest[((*n)++)] = 0;
+    }
 
-	//	an fc/8  encoded bit is a bit pattern of  11110000  x6 = 48 samples
-	if (c == 8) {
-		for (idx=0; idx < 6; idx++) {
-			dest[((*n)++)] = 1;
-			dest[((*n)++)] = 1;
-			dest[((*n)++)] = 1;
-			dest[((*n)++)] = 1;
-			dest[((*n)++)] = 0;
-			dest[((*n)++)] = 0;
-			dest[((*n)++)] = 0;
-			dest[((*n)++)] = 0;
-		}
-	}
+    // an fc/8  encoded bit is a bit pattern of  11110000  x6 = 48 samples
+    if (c == 8) {
+        for (idx=0; idx < 6; idx++) {
+            dest[((*n)++)] = 1;
+            dest[((*n)++)] = 1;
+            dest[((*n)++)] = 1;
+            dest[((*n)++)] = 1;
+            dest[((*n)++)] = 0;
+            dest[((*n)++)] = 0;
+            dest[((*n)++)] = 0;
+            dest[((*n)++)] = 0;
+        }
+    }
 
-	//	an fc/10 encoded bit is a bit pattern of 1111100000 x5 = 50 samples
-	if (c == 10) {
-		for (idx = 0; idx < 5; idx++) {
-			dest[((*n)++)] = 1;
-			dest[((*n)++)] = 1;
-			dest[((*n)++)] = 1;
-			dest[((*n)++)] = 1;
-			dest[((*n)++)] = 1;
-			dest[((*n)++)] = 0;
-			dest[((*n)++)] = 0;
-			dest[((*n)++)] = 0;
-			dest[((*n)++)] = 0;
-			dest[((*n)++)] = 0;
-		}
-	}
+    // an fc/10 encoded bit is a bit pattern of 1111100000 x5 = 50 samples
+    if (c == 10) {
+        for (idx = 0; idx < 5; idx++) {
+            dest[((*n)++)] = 1;
+            dest[((*n)++)] = 1;
+            dest[((*n)++)] = 1;
+            dest[((*n)++)] = 1;
+            dest[((*n)++)] = 1;
+            dest[((*n)++)] = 0;
+            dest[((*n)++)] = 0;
+            dest[((*n)++)] = 0;
+            dest[((*n)++)] = 0;
+            dest[((*n)++)] = 0;
+        }
+    }
 }
 
 // special start of frame marker containing invalid bit sequences
 // this one is focused on HID,  with manchester encoding.
 static void fcSTT(int *n) {
-	fc(8,  n);	fc(8,  n); // invalid
-	fc(8,  n);	fc(10, n); // logical 0
-	fc(10, n);	fc(10, n); // invalid
-	fc(8,  n);	fc(10, n); // logical 0
+    fc(8,  n); fc(8,  n); // invalid
+    fc(8,  n); fc(10, n); // logical 0
+    fc(10, n); fc(10, n); // invalid
+    fc(8,  n); fc(10, n); // logical 0
 }
 
 // compose fc/X fc/Y waveform (FSKx)
 static void fcAll(uint8_t fc, int *n, uint8_t clock, uint16_t *modCnt)
 {
-	uint8_t *dest = BigBuf_get_addr();
-	uint8_t halfFC = fc >> 1;
-	uint8_t wavesPerClock = clock/fc;
-	uint8_t mod = clock % fc;    //modifier
-	uint8_t modAdj = fc/mod;     //how often to apply modifier
-	bool modAdjOk = !(fc % mod); //if (fc % mod==0) modAdjOk = true;
+    uint8_t *dest = BigBuf_get_addr();
+    uint8_t halfFC = fc >> 1;
+    uint8_t wavesPerClock = clock/fc;
+    uint8_t mod = clock % fc;    //modifier
+    uint8_t modAdj = fc/mod;     //how often to apply modifier
+    bool modAdjOk = !(fc % mod); //if (fc % mod==0) modAdjOk = true;
 
-	// loop through clock - step field clock
-	for (uint8_t idx=0; idx < wavesPerClock; idx++){
-		// put 1/2 FC length 1's and 1/2 0's per field clock wave (to create the wave)
-		memset(dest + (*n), 0, fc - halfFC);  //in case of odd number use extra here
-		memset(dest + (*n) + (fc - halfFC), 1, halfFC);
-		*n += fc;
-	}
-	if (mod > 0) (*modCnt)++;
+    // loop through clock - step field clock
+    for (uint8_t idx=0; idx < wavesPerClock; idx++){
+        // put 1/2 FC length 1's and 1/2 0's per field clock wave (to create the wave)
+        memset(dest + (*n), 0, fc - halfFC);  //in case of odd number use extra here
+        memset(dest + (*n) + (fc - halfFC), 1, halfFC);
+        *n += fc;
+    }
+    if (mod > 0) (*modCnt)++;
 
-	if ((mod > 0) && modAdjOk){  //fsk2
-		if ((*modCnt % modAdj) == 0){ //if 4th 8 length wave in a rf/50 add extra 8 length wave
-			memset(dest + (*n), 0, fc - halfFC);
-			memset(dest + (*n) + ( fc - halfFC), 1, halfFC);
-			*n += fc;
-		}
-	}
-	if (mod > 0 && !modAdjOk){  //fsk1
-		memset(dest + (*n), 0, mod - (mod >> 1));
-		memset(dest + (*n) + (mod - (mod >> 1)), 1, mod >> 1);
-		*n += mod;
-	}
+    if ((mod > 0) && modAdjOk){  //fsk2
+        if ((*modCnt % modAdj) == 0){ //if 4th 8 length wave in a rf/50 add extra 8 length wave
+            memset(dest + (*n), 0, fc - halfFC);
+            memset(dest + (*n) + ( fc - halfFC), 1, halfFC);
+            *n += fc;
+        }
+    }
+    if (mod > 0 && !modAdjOk){  //fsk1
+        memset(dest + (*n), 0, mod - (mod >> 1));
+        memset(dest + (*n) + (mod - (mod >> 1)), 1, mod >> 1);
+        *n += mod;
+    }
 }
 
 // prepare a waveform pattern in the buffer based on the ID given then
 // simulate a HID tag until the button is pressed
 void CmdHIDsimTAGEx( uint32_t hi, uint32_t lo, int ledcontrol, int numcycles) {
 
-	if (hi > 0xFFF) {
-		DbpString("[!] tags can only have 44 bits. - USE lf simfsk for larger tags");
-		return;
-	}
+    if (hi > 0xFFF) {
+        DbpString("[!] tags can only have 44 bits. - USE lf simfsk for larger tags");
+        return;
+    }
 
-	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-	set_tracing(false);
+    FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
+    set_tracing(false);
 
-	int n = 0, i = 0;
-	/*
-	 HID tag bitstream format
-	 The tag contains a 44bit unique code. This is sent out MSB first in sets of 4 bits
-	 A 1 bit is represented as 6 fc8 and 5 fc10 patterns  (manchester 10) during 2 clock periods. (1bit = 1clock period)
-	 A 0 bit is represented as 5 fc10 and 6 fc8 patterns  (manchester 01)
-	 A fc8 is inserted before every 4 bits
-	 A special start of frame pattern is used consisting a0b0 where a and b are neither 0
-	 nor 1 bits, they are special patterns (a = set of 12 fc8 and b = set of 10 fc10)
+    int n = 0, i = 0;
+    /*
+     HID tag bitstream format
+     The tag contains a 44bit unique code. This is sent out MSB first in sets of 4 bits
+     A 1 bit is represented as 6 fc8 and 5 fc10 patterns  (manchester 10) during 2 clock periods. (1bit = 1clock period)
+     A 0 bit is represented as 5 fc10 and 6 fc8 patterns  (manchester 01)
+     A fc8 is inserted before every 4 bits
+     A special start of frame pattern is used consisting a0b0 where a and b are neither 0
+     nor 1 bits, they are special patterns (a = set of 12 fc8 and b = set of 10 fc10)
 
-	 FSK2a
-	 bit 1 = fc10
-	 bit 0 = fc8
-	*/
+     FSK2a
+     bit 1 = fc10
+     bit 0 = fc8
+    */
 
-	fc(0, &n);
+    fc(0, &n);
 
-	// special start of frame marker containing invalid bit sequences
-	fcSTT(&n);
+    // special start of frame marker containing invalid bit sequences
+    fcSTT(&n);
 
-	// manchester encode bits 43 to 32
-	for (i = 11; i >= 0; i--) {
+    // manchester encode bits 43 to 32
+    for (i = 11; i >= 0; i--) {
 
-		if ((i % 4) == 3) fc(0, &n);
+        if ((i % 4) == 3) fc(0, &n);
 
-		if ((hi >> i) & 1) {
-			fc(10, &n); fc(8,  &n);		// low-high transition
-		} else {
-			fc(8,  &n); fc(10, &n);		// high-low transition
-		}
-	}
+        if ((hi >> i) & 1) {
+            fc(10, &n); fc(8,  &n); // low-high transition
+        } else {
+            fc(8,  &n); fc(10, &n); // high-low transition
+        }
+    }
 
-	// manchester encode bits 31 to 0
-	for (i = 31; i >= 0; i--) {
+    // manchester encode bits 31 to 0
+    for (i = 31; i >= 0; i--) {
 
-		if ((i % 4) == 3) fc(0, &n);
+        if ((i % 4) == 3) fc(0, &n);
 
-		if (( lo >> i ) & 1) {
-			fc(10, &n); fc(8,  &n);		// low-high transition
-		} else {
-			fc(8,  &n); fc(10, &n);		// high-low transition
-		}
-	}
+        if (( lo >> i ) & 1) {
+            fc(10, &n); fc(8,  &n); // low-high transition
+        } else {
+            fc(8,  &n); fc(10, &n); // high-low transition
+        }
+    }
 
-	if (ledcontrol)	LED_A_ON();
-	SimulateTagLowFrequencyEx(n, 0, ledcontrol, numcycles);
-	if (ledcontrol)	LED_A_OFF();
+    if (ledcontrol) LED_A_ON();
+    SimulateTagLowFrequencyEx(n, 0, ledcontrol, numcycles);
+    if (ledcontrol) LED_A_OFF();
 }
 
 void CmdHIDsimTAG( uint32_t hi, uint32_t lo, int ledcontrol) {
-	CmdHIDsimTAGEx( hi, lo, ledcontrol, -1);
-	DbpString("[!] simulation finished");
+    CmdHIDsimTAGEx( hi, lo, ledcontrol, -1);
+    DbpString("[!] simulation finished");
 }
 
 // prepare a waveform pattern in the buffer based on the ID given then
 // simulate a FSK tag until the button is pressed
 // arg1 contains fcHigh and fcLow, arg2 contains STT marker and clock
 void CmdFSKsimTAG(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *bits) {
-	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
+    FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
 
-	// free eventually allocated BigBuf memory
-	BigBuf_free(); BigBuf_Clear_ext(false);
-	clear_trace();
-	set_tracing(false);
+    // free eventually allocated BigBuf memory
+    BigBuf_free(); BigBuf_Clear_ext(false);
+    clear_trace();
+    set_tracing(false);
 
-	int ledcontrol = 1, n = 0, i = 0;
-	uint8_t fcHigh = arg1 >> 8;
-	uint8_t fcLow = arg1 & 0xFF;
-	uint16_t modCnt = 0;
-	uint8_t clk = arg2 & 0xFF;
-	uint8_t stt = (arg2 >> 8) & 1;
+    int ledcontrol = 1, n = 0, i = 0;
+    uint8_t fcHigh = arg1 >> 8;
+    uint8_t fcLow = arg1 & 0xFF;
+    uint16_t modCnt = 0;
+    uint8_t clk = arg2 & 0xFF;
+    uint8_t stt = (arg2 >> 8) & 1;
 
-	if ( stt ) {
-		//int fsktype = ( fcHigh == 8 && fcLow == 5) ? 1 : 2;
-		//fcSTT(&n);
-	}
+    if ( stt ) {
+        //int fsktype = ( fcHigh == 8 && fcLow == 5) ? 1 : 2;
+        //fcSTT(&n);
+    }
 
-	for (i=0; i<size; i++){
-		if (bits[i])
-			fcAll(fcLow, &n, clk, &modCnt);
-		else
-			fcAll(fcHigh, &n, clk, &modCnt);
-	}
+    for (i=0; i<size; i++){
+        if (bits[i])
+            fcAll(fcLow, &n, clk, &modCnt);
+        else
+            fcAll(fcHigh, &n, clk, &modCnt);
+    }
 
-	WDT_HIT();
+    WDT_HIT();
 
-	Dbprintf("Simulating with fcHigh: %d, fcLow: %d, clk: %d, STT: %d, n: %d", fcHigh, fcLow, clk, stt, n);
+    Dbprintf("Simulating with fcHigh: %d, fcLow: %d, clk: %d, STT: %d, n: %d", fcHigh, fcLow, clk, stt, n);
 
-	if (ledcontrol)	LED_A_ON();
-	SimulateTagLowFrequency(n, 0, ledcontrol);
-	if (ledcontrol)	LED_A_OFF();
+    if (ledcontrol) LED_A_ON();
+    SimulateTagLowFrequency(n, 0, ledcontrol);
+    if (ledcontrol) LED_A_OFF();
 }
 
 // compose ask waveform for one bit(ASK)
 static void askSimBit(uint8_t c, int *n, uint8_t clock, uint8_t manchester)
 {
-	uint8_t *dest = BigBuf_get_addr();
-	uint8_t halfClk = clock/2;
-	// c = current bit 1 or 0
-	if (manchester==1){
-		memset(dest+(*n), c, halfClk);
-		memset(dest+(*n) + halfClk, c^1, halfClk);
-	} else {
-		memset(dest+(*n), c, clock);
-	}
-	*n += clock;
+    uint8_t *dest = BigBuf_get_addr();
+    uint8_t halfClk = clock/2;
+    // c = current bit 1 or 0
+    if (manchester==1){
+        memset(dest+(*n), c, halfClk);
+        memset(dest+(*n) + halfClk, c^1, halfClk);
+    } else {
+        memset(dest+(*n), c, clock);
+    }
+    *n += clock;
 }
 
 static void biphaseSimBit(uint8_t c, int *n, uint8_t clock, uint8_t *phase)
 {
-	uint8_t *dest = BigBuf_get_addr();
-	uint8_t halfClk = clock/2;
-	if (c){
-		memset(dest+(*n), c ^ 1 ^ *phase, halfClk);
-		memset(dest+(*n) + halfClk, c ^ *phase, halfClk);
-	} else {
-		memset(dest+(*n), c ^ *phase, clock);
-		*phase ^= 1;
-	}
-	*n += clock;
+    uint8_t *dest = BigBuf_get_addr();
+    uint8_t halfClk = clock/2;
+    if (c){
+        memset(dest+(*n), c ^ 1 ^ *phase, halfClk);
+        memset(dest+(*n) + halfClk, c ^ *phase, halfClk);
+    } else {
+        memset(dest+(*n), c ^ *phase, clock);
+        *phase ^= 1;
+    }
+    *n += clock;
 }
 
 static void stAskSimBit(int *n, uint8_t clock) {
-	uint8_t *dest = BigBuf_get_addr();
-	uint8_t halfClk = clock/2;
-	//ST = .5 high .5 low 1.5 high .5 low 1 high
-	memset(dest+(*n), 1, halfClk);
-	memset(dest+(*n) + halfClk, 0, halfClk);
-	memset(dest+(*n) + clock, 1, clock + halfClk);
-	memset(dest+(*n) + clock*2 + halfClk, 0, halfClk);
-	memset(dest+(*n) + clock*3, 1, clock);
-	*n += clock*4;
+    uint8_t *dest = BigBuf_get_addr();
+    uint8_t halfClk = clock/2;
+    //ST = .5 high .5 low 1.5 high .5 low 1 high
+    memset(dest+(*n), 1, halfClk);
+    memset(dest+(*n) + halfClk, 0, halfClk);
+    memset(dest+(*n) + clock, 1, clock + halfClk);
+    memset(dest+(*n) + clock*2 + halfClk, 0, halfClk);
+    memset(dest+(*n) + clock*3, 1, clock);
+    *n += clock*4;
 }
 
 // args clock, ask/man or askraw, invert, transmission separator
 void CmdASKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream)
 {
-	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-	set_tracing(false);
+    FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
+    set_tracing(false);
 
-	int ledcontrol = 1, n = 0, i = 0;
-	uint8_t clk = (arg1 >> 8) & 0xFF;
-	uint8_t encoding = arg1 & 0xFF;
-	uint8_t separator = arg2 & 1;
-	uint8_t invert = (arg2 >> 8) & 1;
+    int ledcontrol = 1, n = 0, i = 0;
+    uint8_t clk = (arg1 >> 8) & 0xFF;
+    uint8_t encoding = arg1 & 0xFF;
+    uint8_t separator = arg2 & 1;
+    uint8_t invert = (arg2 >> 8) & 1;
 
-	if (encoding == 2){  //biphase
-		uint8_t phase = 0;
-		for (i=0; i<size; i++){
-			biphaseSimBit(BitStream[i]^invert, &n, clk, &phase);
-		}
-		if (phase == 1) { //run a second set inverted to keep phase in check
-			for (i=0; i<size; i++){
-				biphaseSimBit(BitStream[i]^invert, &n, clk, &phase);
-			}
-		}
-	} else {  // ask/manchester || ask/raw
-		for (i=0; i<size; i++){
-			askSimBit(BitStream[i]^invert, &n, clk, encoding);
-		}
-		if (encoding==0 && BitStream[0]==BitStream[size-1]){ //run a second set inverted (for ask/raw || biphase phase)
-			for (i=0; i<size; i++){
-				askSimBit(BitStream[i]^invert^1, &n, clk, encoding);
-			}
-		}
-	}
-	if (separator==1 && encoding == 1)
-		stAskSimBit(&n, clk);
-	else if (separator==1)
-		Dbprintf("sorry but separator option not yet available");
+    if (encoding == 2){  //biphase
+        uint8_t phase = 0;
+        for (i=0; i<size; i++){
+            biphaseSimBit(BitStream[i]^invert, &n, clk, &phase);
+        }
+        if (phase == 1) { //run a second set inverted to keep phase in check
+            for (i=0; i<size; i++){
+                biphaseSimBit(BitStream[i]^invert, &n, clk, &phase);
+            }
+        }
+    } else {  // ask/manchester || ask/raw
+        for (i=0; i<size; i++){
+            askSimBit(BitStream[i]^invert, &n, clk, encoding);
+        }
+        if (encoding==0 && BitStream[0]==BitStream[size-1]){ //run a second set inverted (for ask/raw || biphase phase)
+            for (i=0; i<size; i++){
+                askSimBit(BitStream[i]^invert^1, &n, clk, encoding);
+            }
+        }
+    }
+    if (separator==1 && encoding == 1)
+        stAskSimBit(&n, clk);
+    else if (separator==1)
+        Dbprintf("sorry but separator option not yet available");
 
-	WDT_HIT();
+    WDT_HIT();
 
-	Dbprintf("Simulating with clk: %d, invert: %d, encoding: %d, separator: %d, n: %d",clk, invert, encoding, separator, n);
+    Dbprintf("Simulating with clk: %d, invert: %d, encoding: %d, separator: %d, n: %d",clk, invert, encoding, separator, n);
 
-	if (ledcontrol)	LED_A_ON();
-	SimulateTagLowFrequency(n, 0, ledcontrol);
-	if (ledcontrol)	LED_A_OFF();
+    if (ledcontrol) LED_A_ON();
+    SimulateTagLowFrequency(n, 0, ledcontrol);
+    if (ledcontrol) LED_A_OFF();
 }
 
 //carrier can be 2,4 or 8
 static void pskSimBit(uint8_t waveLen, int *n, uint8_t clk, uint8_t *curPhase, bool phaseChg)
 {
-	uint8_t *dest = BigBuf_get_addr();
-	uint8_t halfWave = waveLen/2;
-	//uint8_t idx;
-	int i = 0;
-	if (phaseChg){
-		// write phase change
-		memset(dest+(*n), *curPhase^1, halfWave);
-		memset(dest+(*n) + halfWave, *curPhase, halfWave);
-		*n += waveLen;
-		*curPhase ^= 1;
-		i += waveLen;
-	}
-	//write each normal clock wave for the clock duration
-	for (; i < clk; i+=waveLen){
-		memset(dest+(*n), *curPhase, halfWave);
-		memset(dest+(*n) + halfWave, *curPhase^1, halfWave);
-		*n += waveLen;
-	}
+    uint8_t *dest = BigBuf_get_addr();
+    uint8_t halfWave = waveLen/2;
+    //uint8_t idx;
+    int i = 0;
+    if (phaseChg){
+        // write phase change
+        memset(dest+(*n), *curPhase^1, halfWave);
+        memset(dest+(*n) + halfWave, *curPhase, halfWave);
+        *n += waveLen;
+        *curPhase ^= 1;
+        i += waveLen;
+    }
+    //write each normal clock wave for the clock duration
+    for (; i < clk; i+=waveLen){
+        memset(dest+(*n), *curPhase, halfWave);
+        memset(dest+(*n) + halfWave, *curPhase^1, halfWave);
+        *n += waveLen;
+    }
 }
 
 // args clock, carrier, invert,
 void CmdPSKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream)
 {
-	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-	set_tracing(false);
+    FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
+    set_tracing(false);
 
-	int ledcontrol = 1, n = 0, i = 0;
-	uint8_t clk = arg1 >> 8;
-	uint8_t carrier = arg1 & 0xFF;
-	uint8_t invert = arg2 & 0xFF;
-	uint8_t curPhase = 0;
-	for (i=0; i<size; i++){
-		if (BitStream[i] == curPhase){
-			pskSimBit(carrier, &n, clk, &curPhase, false);
-		} else {
-			pskSimBit(carrier, &n, clk, &curPhase, true);
-		}
-	}
+    int ledcontrol = 1, n = 0, i = 0;
+    uint8_t clk = arg1 >> 8;
+    uint8_t carrier = arg1 & 0xFF;
+    uint8_t invert = arg2 & 0xFF;
+    uint8_t curPhase = 0;
+    for (i=0; i<size; i++){
+        if (BitStream[i] == curPhase){
+            pskSimBit(carrier, &n, clk, &curPhase, false);
+        } else {
+            pskSimBit(carrier, &n, clk, &curPhase, true);
+        }
+    }
 
-	WDT_HIT();
+    WDT_HIT();
 
-	Dbprintf("Simulating with Carrier: %d, clk: %d, invert: %d, n: %d",carrier, clk, invert, n);
+    Dbprintf("Simulating with Carrier: %d, clk: %d, invert: %d, n: %d",carrier, clk, invert, n);
 
-	if (ledcontrol)	LED_A_ON();
-	SimulateTagLowFrequency(n, 0, ledcontrol);
-	if (ledcontrol)	LED_A_OFF();
+    if (ledcontrol) LED_A_ON();
+    SimulateTagLowFrequency(n, 0, ledcontrol);
+    if (ledcontrol) LED_A_OFF();
 }
 
 // loop to get raw HID waveform then FSK demodulate the TAG ID from it
 void CmdHIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol) {
-	uint8_t *dest = BigBuf_get_addr();
-	size_t size = 0;
-	uint32_t hi2 = 0, hi = 0, lo = 0;
-	int idx = 0;
-	int dummyIdx = 0;
-	// Configure to go in 125Khz listen mode
-	LFSetupFPGAForADC(95, true);
+    uint8_t *dest = BigBuf_get_addr();
+    size_t size = 0;
+    uint32_t hi2 = 0, hi = 0, lo = 0;
+    int idx = 0;
+    int dummyIdx = 0;
+    // Configure to go in 125Khz listen mode
+    LFSetupFPGAForADC(95, true);
 
-	//clear read buffer
-	BigBuf_Clear_keep_EM();
+    //clear read buffer
+    BigBuf_Clear_keep_EM();
 
-	while( !BUTTON_PRESS() && !usb_poll_validate_length()) {
+    while( !BUTTON_PRESS() && !usb_poll_validate_length()) {
 
-		WDT_HIT();
-		if (ledcontrol) LED_A_ON();
+        WDT_HIT();
+        if (ledcontrol) LED_A_ON();
 
-		DoAcquisition_default(-1, true);
-		// FSK demodulator
-		size = 50*128*2; //big enough to catch 2 sequences of largest format
-		idx = HIDdemodFSK(dest, &size, &hi2, &hi, &lo, &dummyIdx);
-		if ( idx < 0 ) continue;
+        DoAcquisition_default(-1, true);
+        // FSK demodulator
+        size = 50*128*2; //big enough to catch 2 sequences of largest format
+        idx = HIDdemodFSK(dest, &size, &hi2, &hi, &lo, &dummyIdx);
+        if ( idx < 0 ) continue;
 
-		if (idx > 0 && lo > 0 && (size == 96 || size == 192)){
-			// go over previously decoded manchester data and decode into usable tag ID
-			if (hi2 != 0){ //extra large HID tags  88/192 bits
-				Dbprintf("TAG ID: %x%08x%08x (%d)",
-					hi2,
-					hi,
-					lo,
-					(lo >> 1) & 0xFFFF
-				);
-			} else {  //standard HID tags 44/96 bits
-				uint8_t bitlen = 0;
-				uint32_t fc = 0;
-				uint32_t cardnum = 0;
+        if (idx > 0 && lo > 0 && (size == 96 || size == 192)){
+            // go over previously decoded manchester data and decode into usable tag ID
+            if (hi2 != 0){ //extra large HID tags  88/192 bits
+                Dbprintf("TAG ID: %x%08x%08x (%d)",
+                    hi2,
+                    hi,
+                    lo,
+                    (lo >> 1) & 0xFFFF
+                );
+            } else {  //standard HID tags 44/96 bits
+                uint8_t bitlen = 0;
+                uint32_t fc = 0;
+                uint32_t cardnum = 0;
 
-				if (((hi >> 5) & 1) == 1){//if bit 38 is set then < 37 bit format is used
-					uint32_t lo2 = 0;
-					lo2=(((hi & 31) << 12) | (lo>>20)); //get bits 21-37 to check for format len bit
-					uint8_t idx3 = 1;
-					while (lo2 > 1){ //find last bit set to 1 (format len bit)
-						lo2 >>= 1;
-						idx3++;
-					}
-					bitlen = idx3 + 19;
-					fc = 0;
-					cardnum = 0;
-					if (bitlen == 26){
-						cardnum = (lo >> 1) & 0xFFFF;
-						fc = (lo >> 17) & 0xFF;
-					}
-					if (bitlen == 37){
-						cardnum = (lo >> 1 ) & 0x7FFFF;
-						fc = ((hi & 0xF) << 12) | (lo >> 20);
-					}
-					if (bitlen == 34){
-						cardnum = (lo >> 1) & 0xFFFF;
-						fc = ((hi & 1) << 15) | (lo >> 17);
-					}
-					if (bitlen == 35){
-						cardnum = (lo >> 1) & 0xFFFFF;
-						fc = ((hi & 1) << 11)|(lo >> 21);
-					}
-				}
-				else { //if bit 38 is not set then 37 bit format is used
-					bitlen= 37;
-					fc = 0;
-					cardnum = 0;
-					if (bitlen == 37){
-						cardnum = (lo >> 1) & 0x7FFFF;
-						fc = ((hi & 0xF) << 12) | (lo >> 20);
-					}
-				}
-				Dbprintf("TAG ID: %x%08x (%d) - Format Len: %dbit - FC: %d - Card: %d",
-						 hi,
-						 lo,
-						 (lo >> 1) & 0xFFFF,
-						 bitlen,
-						 fc,
-						 cardnum
-					);
-			}
-			if (findone){
-				*high = hi;
-				*low = lo;
-				break;
-			}
-			// reset
-		}
-		hi2 = hi = lo = idx = 0;
-	}
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	DbpString("Stopped");
-	if (ledcontrol) LED_A_OFF();
+                if (((hi >> 5) & 1) == 1){//if bit 38 is set then < 37 bit format is used
+                    uint32_t lo2 = 0;
+                    lo2=(((hi & 31) << 12) | (lo>>20)); //get bits 21-37 to check for format len bit
+                    uint8_t idx3 = 1;
+                    while (lo2 > 1){ //find last bit set to 1 (format len bit)
+                        lo2 >>= 1;
+                        idx3++;
+                    }
+                    bitlen = idx3 + 19;
+                    fc = 0;
+                    cardnum = 0;
+                    if (bitlen == 26){
+                        cardnum = (lo >> 1) & 0xFFFF;
+                        fc = (lo >> 17) & 0xFF;
+                    }
+                    if (bitlen == 37){
+                        cardnum = (lo >> 1 ) & 0x7FFFF;
+                        fc = ((hi & 0xF) << 12) | (lo >> 20);
+                    }
+                    if (bitlen == 34){
+                        cardnum = (lo >> 1) & 0xFFFF;
+                        fc = ((hi & 1) << 15) | (lo >> 17);
+                    }
+                    if (bitlen == 35){
+                        cardnum = (lo >> 1) & 0xFFFFF;
+                        fc = ((hi & 1) << 11)|(lo >> 21);
+                    }
+                }
+                else { //if bit 38 is not set then 37 bit format is used
+                    bitlen= 37;
+                    fc = 0;
+                    cardnum = 0;
+                    if (bitlen == 37){
+                        cardnum = (lo >> 1) & 0x7FFFF;
+                        fc = ((hi & 0xF) << 12) | (lo >> 20);
+                    }
+                }
+                Dbprintf("TAG ID: %x%08x (%d) - Format Len: %dbit - FC: %d - Card: %d",
+                         hi,
+                         lo,
+                         (lo >> 1) & 0xFFFF,
+                         bitlen,
+                         fc,
+                         cardnum
+                    );
+            }
+            if (findone){
+                *high = hi;
+                *low = lo;
+                break;
+            }
+            // reset
+        }
+        hi2 = hi = lo = idx = 0;
+    }
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    DbpString("Stopped");
+    if (ledcontrol) LED_A_OFF();
 }
 
 // loop to get raw HID waveform then FSK demodulate the TAG ID from it
 void CmdAWIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol) {
 
-	uint8_t *dest = BigBuf_get_addr();
+    uint8_t *dest = BigBuf_get_addr();
 
-	//big enough to catch 2 sequences of largest format
-	size_t size = 12800; //50 * 128 * 2;
+    //big enough to catch 2 sequences of largest format
+    size_t size = 12800; //50 * 128 * 2;
 
-	int idx = 0, dummyIdx = 0;
+    int idx = 0, dummyIdx = 0;
 
-	BigBuf_Clear_keep_EM();
+    BigBuf_Clear_keep_EM();
 
-	LFSetupFPGAForADC(95, true);
+    LFSetupFPGAForADC(95, true);
 
-	while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
+    while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
 
-		WDT_HIT();
-		if (ledcontrol) LED_A_ON();
+        WDT_HIT();
+        if (ledcontrol) LED_A_ON();
 
-		DoAcquisition_default(-1, true);
-		// FSK demodulator
+        DoAcquisition_default(-1, true);
+        // FSK demodulator
 
-		idx = detectAWID(dest, &size, &dummyIdx);
+        idx = detectAWID(dest, &size, &dummyIdx);
 
-		if (idx <= 0 || size != 96) continue;
-		// Index map
-		// 0            10            20            30              40            50              60
-		// |            |             |             |               |             |               |
-		// 01234567 890 1 234 5 678 9 012 3 456 7 890 1 234 5 678 9 012 3 456 7 890 1 234 5 678 9 012 3 - to 96
-		// -----------------------------------------------------------------------------
-		// 00000001 000 1 110 1 101 1 011 1 101 1 010 0 000 1 000 1 010 0 001 0 110 1 100 0 000 1 000 1
-		// premable bbb o bbb o bbw o fff o fff o ffc o ccc o ccc o ccc o ccc o ccc o wxx o xxx o xxx o - to 96
-		//          |---26 bit---|    |-----117----||-------------142-------------|
-		// b = format bit len, o = odd parity of last 3 bits
-		// f = facility code, c = card number
-		// w = wiegand parity
-		// (26 bit format shown)
+        if (idx <= 0 || size != 96) continue;
+        // Index map
+        // 0            10            20            30              40            50              60
+        // |            |             |             |               |             |               |
+        // 01234567 890 1 234 5 678 9 012 3 456 7 890 1 234 5 678 9 012 3 456 7 890 1 234 5 678 9 012 3 - to 96
+        // -----------------------------------------------------------------------------
+        // 00000001 000 1 110 1 101 1 011 1 101 1 010 0 000 1 000 1 010 0 001 0 110 1 100 0 000 1 000 1
+        // premable bbb o bbb o bbw o fff o fff o ffc o ccc o ccc o ccc o ccc o ccc o wxx o xxx o xxx o - to 96
+        //          |---26 bit---|    |-----117----||-------------142-------------|
+        // b = format bit len, o = odd parity of last 3 bits
+        // f = facility code, c = card number
+        // w = wiegand parity
+        // (26 bit format shown)
 
-		//get raw ID before removing parities
-		uint32_t rawLo = bytebits_to_byte(dest+idx+64, 32);
-		uint32_t rawHi = bytebits_to_byte(dest+idx+32, 32);
-		uint32_t rawHi2 = bytebits_to_byte(dest+idx, 32);
+        //get raw ID before removing parities
+        uint32_t rawLo = bytebits_to_byte(dest+idx+64, 32);
+        uint32_t rawHi = bytebits_to_byte(dest+idx+32, 32);
+        uint32_t rawHi2 = bytebits_to_byte(dest+idx, 32);
 
-		size = removeParity(dest, idx+8, 4, 1, 88);
-		if (size != 66) continue;
-		// ok valid card found!
+        size = removeParity(dest, idx+8, 4, 1, 88);
+        if (size != 66) continue;
+        // ok valid card found!
 
-		// Index map
-		// 0           10         20        30          40        50        60
-		// |           |          |         |           |         |         |
-		// 01234567 8 90123456 7890123456789012 3 456789012345678901234567890123456
-		// -----------------------------------------------------------------------------
-		// 00011010 1 01110101 0000000010001110 1 000000000000000000000000000000000
-		// bbbbbbbb w ffffffff cccccccccccccccc w xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-		// |26 bit|   |-117--| |-----142------|
-		// b = format bit len, o = odd parity of last 3 bits
-		// f = facility code, c = card number
-		// w = wiegand parity
-		// (26 bit format shown)
+        // Index map
+        // 0           10         20        30          40        50        60
+        // |           |          |         |           |         |         |
+        // 01234567 8 90123456 7890123456789012 3 456789012345678901234567890123456
+        // -----------------------------------------------------------------------------
+        // 00011010 1 01110101 0000000010001110 1 000000000000000000000000000000000
+        // bbbbbbbb w ffffffff cccccccccccccccc w xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+        // |26 bit|   |-117--| |-----142------|
+        // b = format bit len, o = odd parity of last 3 bits
+        // f = facility code, c = card number
+        // w = wiegand parity
+        // (26 bit format shown)
 
-		uint32_t fc = 0;
-		uint32_t cardnum = 0;
-		uint32_t code1 = 0;
-		uint32_t code2 = 0;
-		uint8_t fmtLen = bytebits_to_byte(dest, 8);
-		if (fmtLen == 26){
-			fc = bytebits_to_byte(dest+9, 8);
-			cardnum = bytebits_to_byte(dest+17, 16);
-			code1 = bytebits_to_byte(dest+8, fmtLen);
-			Dbprintf("AWID Found - BitLength: %d, FC: %d, Card: %d - Wiegand: %x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, rawHi2, rawHi, rawLo);
-		} else {
-			cardnum = bytebits_to_byte(dest+8+(fmtLen-17), 16);
-			if (fmtLen > 32){
-				code1 = bytebits_to_byte(dest+8, fmtLen-32);
-				code2 = bytebits_to_byte(dest+8+(fmtLen-32), 32);
-				Dbprintf("AWID Found - BitLength: %d -unknown BitLength- (%d) - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, cardnum, code1, code2, rawHi2, rawHi, rawLo);
-			} else{
-				code1 = bytebits_to_byte(dest+8, fmtLen);
-				Dbprintf("AWID Found - BitLength: %d -unknown BitLength- (%d) - Wiegand: %x, Raw: %08x%08x%08x", fmtLen, cardnum, code1, rawHi2, rawHi, rawLo);
-			}
-		}
-		if (findone){
-			if (ledcontrol)	LED_A_OFF();
-			*high = rawHi;
-			*low = rawLo;
-			break;
-		}
-		// reset
-		idx = 0;
-		WDT_HIT();
-	}
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	DbpString("Stopped");
-	if (ledcontrol) LED_A_OFF();
+        uint32_t fc = 0;
+        uint32_t cardnum = 0;
+        uint32_t code1 = 0;
+        uint32_t code2 = 0;
+        uint8_t fmtLen = bytebits_to_byte(dest, 8);
+        if (fmtLen == 26){
+            fc = bytebits_to_byte(dest+9, 8);
+            cardnum = bytebits_to_byte(dest+17, 16);
+            code1 = bytebits_to_byte(dest+8, fmtLen);
+            Dbprintf("AWID Found - BitLength: %d, FC: %d, Card: %d - Wiegand: %x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, rawHi2, rawHi, rawLo);
+        } else {
+            cardnum = bytebits_to_byte(dest+8+(fmtLen-17), 16);
+            if (fmtLen > 32){
+                code1 = bytebits_to_byte(dest+8, fmtLen-32);
+                code2 = bytebits_to_byte(dest+8+(fmtLen-32), 32);
+                Dbprintf("AWID Found - BitLength: %d -unknown BitLength- (%d) - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, cardnum, code1, code2, rawHi2, rawHi, rawLo);
+            } else{
+                code1 = bytebits_to_byte(dest+8, fmtLen);
+                Dbprintf("AWID Found - BitLength: %d -unknown BitLength- (%d) - Wiegand: %x, Raw: %08x%08x%08x", fmtLen, cardnum, code1, rawHi2, rawHi, rawLo);
+            }
+        }
+        if (findone){
+            if (ledcontrol) LED_A_OFF();
+            *high = rawHi;
+            *low = rawLo;
+            break;
+        }
+        // reset
+        idx = 0;
+        WDT_HIT();
+    }
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    DbpString("Stopped");
+    if (ledcontrol) LED_A_OFF();
 }
 
 void CmdEM410xdemod(int findone, uint32_t *high, uint64_t *low, int ledcontrol) {
-	uint8_t *dest = BigBuf_get_addr();
+    uint8_t *dest = BigBuf_get_addr();
 
-	size_t size = 0, idx = 0;
-	int clk = 0, invert = 0, errCnt = 0, maxErr = 20;
-	uint32_t hi = 0;
-	uint64_t lo = 0;
+    size_t size = 0, idx = 0;
+    int clk = 0, invert = 0, errCnt = 0, maxErr = 20;
+    uint32_t hi = 0;
+    uint64_t lo = 0;
 
-	BigBuf_Clear_keep_EM();
+    BigBuf_Clear_keep_EM();
 
-	LFSetupFPGAForADC(95, true);
+    LFSetupFPGAForADC(95, true);
 
-	while(!BUTTON_PRESS() && !usb_poll_validate_length()) {
+    while(!BUTTON_PRESS() && !usb_poll_validate_length()) {
 
-		WDT_HIT();
-		if (ledcontrol) LED_A_ON();
+        WDT_HIT();
+        if (ledcontrol) LED_A_ON();
 
-		DoAcquisition_default(-1, true);
+        DoAcquisition_default(-1, true);
 
-		size  = BigBuf_max_traceLen();
-		//askdemod and manchester decode
-		if (size > 16385) size = 16385; //big enough to catch 2 sequences of largest format
-		errCnt = askdemod(dest, &size, &clk, &invert, maxErr, 0, 1);
-		WDT_HIT();
+        size  = BigBuf_max_traceLen();
+        //askdemod and manchester decode
+        if (size > 16385) size = 16385; //big enough to catch 2 sequences of largest format
+        errCnt = askdemod(dest, &size, &clk, &invert, maxErr, 0, 1);
+        WDT_HIT();
 
-		if (errCnt < 0) continue;
+        if (errCnt < 0) continue;
 
-			errCnt = Em410xDecode(dest, &size, &idx, &hi, &lo);
-			if (errCnt == 1){
-				if (size == 128){
-					Dbprintf("EM XL TAG ID: %06x%08x%08x - (%05d_%03d_%08d)",
-					  hi,
-					  (uint32_t)(lo >> 32),
-					  (uint32_t)lo,
-					  (uint32_t)(lo & 0xFFFF),
-					  (uint32_t)((lo >> 16LL) & 0xFF),
-					  (uint32_t)(lo & 0xFFFFFF));
-				} else {
-					Dbprintf("EM TAG ID: %02x%08x - (%05d_%03d_%08d)",
-					  (uint32_t)(lo >> 32),
-					  (uint32_t)lo,
-					  (uint32_t)(lo & 0xFFFF),
-					  (uint32_t)((lo >> 16LL) & 0xFF),
-					  (uint32_t)(lo & 0xFFFFFF));
-				}
+            errCnt = Em410xDecode(dest, &size, &idx, &hi, &lo);
+            if (errCnt == 1){
+                if (size == 128){
+                    Dbprintf("EM XL TAG ID: %06x%08x%08x - (%05d_%03d_%08d)",
+                      hi,
+                      (uint32_t)(lo >> 32),
+                      (uint32_t)lo,
+                      (uint32_t)(lo & 0xFFFF),
+                      (uint32_t)((lo >> 16LL) & 0xFF),
+                      (uint32_t)(lo & 0xFFFFFF));
+                } else {
+                    Dbprintf("EM TAG ID: %02x%08x - (%05d_%03d_%08d)",
+                      (uint32_t)(lo >> 32),
+                      (uint32_t)lo,
+                      (uint32_t)(lo & 0xFFFF),
+                      (uint32_t)((lo >> 16LL) & 0xFF),
+                      (uint32_t)(lo & 0xFFFFFF));
+                }
 
-			if (findone){
-				if (ledcontrol) LED_A_OFF();
-				*high = hi;
-				*low = lo;
-				break;
-			}
-		}
-		WDT_HIT();
-		hi = lo = size = idx = 0;
-		clk = invert = errCnt = 0;
-	}
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	DbpString("Stopped");
-	if (ledcontrol) LED_A_OFF();
+            if (findone){
+                if (ledcontrol) LED_A_OFF();
+                *high = hi;
+                *low = lo;
+                break;
+            }
+        }
+        WDT_HIT();
+        hi = lo = size = idx = 0;
+        clk = invert = errCnt = 0;
+    }
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    DbpString("Stopped");
+    if (ledcontrol) LED_A_OFF();
 }
 
 void CmdIOdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol) {
 
-	uint8_t *dest = BigBuf_get_addr();
+    uint8_t *dest = BigBuf_get_addr();
 
-	int dummyIdx = 0, idx = 0;
-	uint32_t code = 0, code2 = 0;
-	uint8_t version = 0, facilitycode = 0, crc = 0;
-	uint16_t number = 0, calccrc = 0;
+    int dummyIdx = 0, idx = 0;
+    uint32_t code = 0, code2 = 0;
+    uint8_t version = 0, facilitycode = 0, crc = 0;
+    uint16_t number = 0, calccrc = 0;
 
-	size_t size = BigBuf_max_traceLen();
+    size_t size = BigBuf_max_traceLen();
 
-	BigBuf_Clear_keep_EM();
+    BigBuf_Clear_keep_EM();
 
-	// Configure to go in 125Khz listen mode
-	LFSetupFPGAForADC(95, true);
+    // Configure to go in 125Khz listen mode
+    LFSetupFPGAForADC(95, true);
 
-	while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
-		WDT_HIT();
-		if (ledcontrol) LED_A_ON();
+    while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
+        WDT_HIT();
+        if (ledcontrol) LED_A_ON();
 
-		DoAcquisition_default(-1, true);
+        DoAcquisition_default(-1, true);
 
-		//fskdemod and get start index
-		WDT_HIT();
-		idx = detectIOProx(dest, &size, &dummyIdx);
-		if (idx < 0) continue;
-			//valid tag found
+        //fskdemod and get start index
+        WDT_HIT();
+        idx = detectIOProx(dest, &size, &dummyIdx);
+        if (idx < 0) continue;
+            //valid tag found
 
-			//Index map
-			//0           10          20          30          40          50          60
-			//|           |           |           |           |           |           |
-			//01234567 8 90123456 7 89012345 6 78901234 5 67890123 4 56789012 3 45678901 23
-			//-----------------------------------------------------------------------------
+            //Index map
+            //0           10          20          30          40          50          60
+            //|           |           |           |           |           |           |
+            //01234567 8 90123456 7 89012345 6 78901234 5 67890123 4 56789012 3 45678901 23
+            //-----------------------------------------------------------------------------
             //00000000 0 11110000 1 facility 1 version* 1 code*one 1 code*two 1 checksum 11
-			//
-			//Checksum:
-			//00000000 0 11110000 1 11100000 1 00000001 1 00000011 1 10110110 1 01110101 11
-			//preamble      F0         E0         01         03         B6         75
-			// How to calc checksum,
-			// http://www.proxmark.org/forum/viewtopic.php?id=364&p=6
-			//   F0 + E0 + 01 + 03 + B6 = 28A
-			//   28A & FF = 8A
-			//   FF - 8A = 75
-			// Checksum: 0x75
-			//XSF(version)facility:codeone+codetwo
-			//Handle the data
-			// if(findone){ //only print binary if we are doing one
-				// Dbprintf("%d%d%d%d%d%d%d%d %d",dest[idx],   dest[idx+1],   dest[idx+2],dest[idx+3],dest[idx+4],dest[idx+5],dest[idx+6],dest[idx+7],dest[idx+8]);
-				// Dbprintf("%d%d%d%d%d%d%d%d %d",dest[idx+9], dest[idx+10],dest[idx+11],dest[idx+12],dest[idx+13],dest[idx+14],dest[idx+15],dest[idx+16],dest[idx+17]);
-				// Dbprintf("%d%d%d%d%d%d%d%d %d",dest[idx+18],dest[idx+19],dest[idx+20],dest[idx+21],dest[idx+22],dest[idx+23],dest[idx+24],dest[idx+25],dest[idx+26]);
-				// Dbprintf("%d%d%d%d%d%d%d%d %d",dest[idx+27],dest[idx+28],dest[idx+29],dest[idx+30],dest[idx+31],dest[idx+32],dest[idx+33],dest[idx+34],dest[idx+35]);
-				// Dbprintf("%d%d%d%d%d%d%d%d %d",dest[idx+36],dest[idx+37],dest[idx+38],dest[idx+39],dest[idx+40],dest[idx+41],dest[idx+42],dest[idx+43],dest[idx+44]);
-				// Dbprintf("%d%d%d%d%d%d%d%d %d",dest[idx+45],dest[idx+46],dest[idx+47],dest[idx+48],dest[idx+49],dest[idx+50],dest[idx+51],dest[idx+52],dest[idx+53]);
-				// Dbprintf("%d%d%d%d%d%d%d%d %d%d",dest[idx+54],dest[idx+55],dest[idx+56],dest[idx+57],dest[idx+58],dest[idx+59],dest[idx+60],dest[idx+61],dest[idx+62],dest[idx+63]);
-			// }
-			code = bytebits_to_byte(dest+idx, 32);
-			code2 = bytebits_to_byte(dest+idx+32, 32);
-			version = bytebits_to_byte(dest+idx+27, 8); //14,4
-			facilitycode = bytebits_to_byte(dest+idx+18, 8);
-			number = (bytebits_to_byte(dest+idx+36, 8) << 8) | (bytebits_to_byte(dest+idx+45, 8)); //36,9
+            //
+            //Checksum:
+            //00000000 0 11110000 1 11100000 1 00000001 1 00000011 1 10110110 1 01110101 11
+            //preamble      F0         E0         01         03         B6         75
+            // How to calc checksum,
+            // http://www.proxmark.org/forum/viewtopic.php?id=364&p=6
+            //   F0 + E0 + 01 + 03 + B6 = 28A
+            //   28A & FF = 8A
+            //   FF - 8A = 75
+            // Checksum: 0x75
+            //XSF(version)facility:codeone+codetwo
+            //Handle the data
+            // if(findone){ //only print binary if we are doing one
+                // Dbprintf("%d%d%d%d%d%d%d%d %d",dest[idx],   dest[idx+1],   dest[idx+2],dest[idx+3],dest[idx+4],dest[idx+5],dest[idx+6],dest[idx+7],dest[idx+8]);
+                // Dbprintf("%d%d%d%d%d%d%d%d %d",dest[idx+9], dest[idx+10],dest[idx+11],dest[idx+12],dest[idx+13],dest[idx+14],dest[idx+15],dest[idx+16],dest[idx+17]);
+                // Dbprintf("%d%d%d%d%d%d%d%d %d",dest[idx+18],dest[idx+19],dest[idx+20],dest[idx+21],dest[idx+22],dest[idx+23],dest[idx+24],dest[idx+25],dest[idx+26]);
+                // Dbprintf("%d%d%d%d%d%d%d%d %d",dest[idx+27],dest[idx+28],dest[idx+29],dest[idx+30],dest[idx+31],dest[idx+32],dest[idx+33],dest[idx+34],dest[idx+35]);
+                // Dbprintf("%d%d%d%d%d%d%d%d %d",dest[idx+36],dest[idx+37],dest[idx+38],dest[idx+39],dest[idx+40],dest[idx+41],dest[idx+42],dest[idx+43],dest[idx+44]);
+                // Dbprintf("%d%d%d%d%d%d%d%d %d",dest[idx+45],dest[idx+46],dest[idx+47],dest[idx+48],dest[idx+49],dest[idx+50],dest[idx+51],dest[idx+52],dest[idx+53]);
+                // Dbprintf("%d%d%d%d%d%d%d%d %d%d",dest[idx+54],dest[idx+55],dest[idx+56],dest[idx+57],dest[idx+58],dest[idx+59],dest[idx+60],dest[idx+61],dest[idx+62],dest[idx+63]);
+            // }
+            code = bytebits_to_byte(dest+idx, 32);
+            code2 = bytebits_to_byte(dest+idx+32, 32);
+            version = bytebits_to_byte(dest+idx+27, 8); //14,4
+            facilitycode = bytebits_to_byte(dest+idx+18, 8);
+            number = (bytebits_to_byte(dest+idx+36, 8) << 8) | (bytebits_to_byte(dest+idx+45, 8)); //36,9
 
-			crc = bytebits_to_byte(dest+idx+54, 8);
-			for (uint8_t i=1; i<6; ++i)
-				calccrc += bytebits_to_byte(dest+idx+9*i, 8);
-			calccrc &= 0xff;
-			calccrc = 0xff - calccrc;
+            crc = bytebits_to_byte(dest+idx+54, 8);
+            for (uint8_t i=1; i<6; ++i)
+                calccrc += bytebits_to_byte(dest+idx+9*i, 8);
+            calccrc &= 0xff;
+            calccrc = 0xff - calccrc;
 
-			char *crcStr = (crc == calccrc) ? "ok" : "!crc";
+            char *crcStr = (crc == calccrc) ? "ok" : "!crc";
 
             Dbprintf("IO Prox XSF(%02d)%02x:%05d (%08x%08x)  [%02x %s]", version, facilitycode, number, code, code2, crc, crcStr);
-			// if we're only looking for one tag
-			if (findone){
-				if (ledcontrol)	LED_A_OFF();
-				*high = code;
-				*low = code2;
-				break;
-			}
-			code = code2 = 0;
-			version = facilitycode = 0;
-			number = 0;
-			idx = 0;
+            // if we're only looking for one tag
+            if (findone){
+                if (ledcontrol) LED_A_OFF();
+                *high = code;
+                *low = code2;
+                break;
+            }
+            code = code2 = 0;
+            version = facilitycode = 0;
+            number = 0;
+            idx = 0;
 
-		WDT_HIT();
-	}
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	DbpString("Stopped");
-	if (ledcontrol) LED_A_OFF();
+        WDT_HIT();
+    }
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    DbpString("Stopped");
+    if (ledcontrol) LED_A_OFF();
 }
 
 /*------------------------------
@@ -1359,521 +1360,521 @@ void CmdIOdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol) {
  */
 
 void TurnReadLFOn(uint32_t delay) {
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | FPGA_LF_ADC_READER_FIELD);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | FPGA_LF_ADC_READER_FIELD);
 
-	// measure antenna strength.
-	//int adcval = ((MAX_ADC_LF_VOLTAGE * AvgAdc(ADC_CHAN_LF)) >> 10);
-	WaitUS(delay);
+    // measure antenna strength.
+    //int adcval = ((MAX_ADC_LF_VOLTAGE * AvgAdc(ADC_CHAN_LF)) >> 10);
+    WaitUS(delay);
 }
 void TurnReadLF_off(uint32_t delay) {
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	WaitUS(delay);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    WaitUS(delay);
 }
 
 // Write one bit to card
 void T55xxWriteBit(int bit) {
-	if (!bit)
-		TurnReadLFOn(t_config.write_0);
-	else
-		TurnReadLFOn(t_config.write_1);
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	WaitUS(t_config.write_gap);
+    if (!bit)
+        TurnReadLFOn(t_config.write_0);
+    else
+        TurnReadLFOn(t_config.write_1);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    WaitUS(t_config.write_gap);
 }
 
 // Send T5577 reset command then read stream (see if we can identify the start of the stream)
 void T55xxResetRead(void) {
-	LED_A_ON();
-	//clear buffer now so it does not interfere with timing later
-	BigBuf_Clear_keep_EM();
+    LED_A_ON();
+    //clear buffer now so it does not interfere with timing later
+    BigBuf_Clear_keep_EM();
 
-	StartTicks();
+    StartTicks();
 
-	// Set up FPGA, 125kHz
-	LFSetupFPGAForADC(95, true);
-	// make sure tag is fully powered up...
-	WaitMS(4);
+    // Set up FPGA, 125kHz
+    LFSetupFPGAForADC(95, true);
+    // make sure tag is fully powered up...
+    WaitMS(4);
 
-	// Trigger T55x7 in mode.
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	WaitUS(t_config.start_gap);
+    // Trigger T55x7 in mode.
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    WaitUS(t_config.start_gap);
 
-	// reset tag - op code 00
-	T55xxWriteBit(0);
-	T55xxWriteBit(0);
+    // reset tag - op code 00
+    T55xxWriteBit(0);
+    T55xxWriteBit(0);
 
-	TurnReadLFOn(t_config.read_gap);
+    TurnReadLFOn(t_config.read_gap);
 
-	// Acquisition
-	DoPartialAcquisition(0, true, BigBuf_max_traceLen(), 0);
+    // Acquisition
+    DoPartialAcquisition(0, true, BigBuf_max_traceLen(), 0);
 
-	// Turn the field off
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); // field off
-	cmd_send(CMD_ACK,0,0,0,0,0);
-	LED_A_OFF();
+    // Turn the field off
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); // field off
+    cmd_send(CMD_ACK,0,0,0,0,0);
+    LED_A_OFF();
 }
 
 // Write one card block in page 0, no lock
 void T55xxWriteBlockExt(uint32_t Data, uint8_t Block, uint32_t Pwd, uint8_t arg) {
-	LED_A_ON();
-	bool PwdMode = arg & 0x1;
-	uint8_t Page = (arg & 0x2)>>1;
-	bool testMode = arg & 0x4;
-	uint32_t i = 0;
+    LED_A_ON();
+    bool PwdMode = arg & 0x1;
+    uint8_t Page = (arg & 0x2)>>1;
+    bool testMode = arg & 0x4;
+    uint32_t i = 0;
 
-	StartTicks();
+    StartTicks();
 
-	// Set up FPGA, 125kHz
-	LFSetupFPGAForADC(95, true);
+    // Set up FPGA, 125kHz
+    LFSetupFPGAForADC(95, true);
 
-	// make sure tag is fully powered up...
-	WaitMS(4);
-	// Trigger T55x7 in mode.
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	WaitUS(t_config.start_gap);
+    // make sure tag is fully powered up...
+    WaitMS(4);
+    // Trigger T55x7 in mode.
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    WaitUS(t_config.start_gap);
 
-	if (testMode) Dbprintf("TestMODE");
-	// Std Opcode 10
-	T55xxWriteBit(testMode ? 0 : 1);
-	T55xxWriteBit(testMode ? 1 : Page); //Page 0
+    if (testMode) Dbprintf("TestMODE");
+    // Std Opcode 10
+    T55xxWriteBit(testMode ? 0 : 1);
+    T55xxWriteBit(testMode ? 1 : Page); //Page 0
 
-	if (PwdMode){
-		// Send Pwd
-		for (i = 0x80000000; i != 0; i >>= 1)
-			T55xxWriteBit(Pwd & i);
-	}
-	// Send Lock bit
-	T55xxWriteBit(0);
+    if (PwdMode){
+        // Send Pwd
+        for (i = 0x80000000; i != 0; i >>= 1)
+            T55xxWriteBit(Pwd & i);
+    }
+    // Send Lock bit
+    T55xxWriteBit(0);
 
-	// Send Data
-	for (i = 0x80000000; i != 0; i >>= 1)
-		T55xxWriteBit(Data & i);
+    // Send Data
+    for (i = 0x80000000; i != 0; i >>= 1)
+        T55xxWriteBit(Data & i);
 
-	// Send Block number
-	for (i = 0x04; i != 0; i >>= 1)
-		T55xxWriteBit(Block & i);
+    // Send Block number
+    for (i = 0x04; i != 0; i >>= 1)
+        T55xxWriteBit(Block & i);
 
-	// Perform write (nominal is 5.6 ms for T55x7 and 18ms for E5550,
-	// so wait a little more)
+    // Perform write (nominal is 5.6 ms for T55x7 and 18ms for E5550,
+    // so wait a little more)
 
-	// "there is a clock delay before programming"
-	//  - programming takes ~5.6ms for t5577 ~18ms for E5550 or t5567
-	//  so we should wait 1 clock + 5.6ms then read response?
-	//  but we need to know we are dealing with t5577 vs t5567 vs e5550 (or q5) marshmellow...
-	if (testMode) {
-		//TESTMODE TIMING TESTS:
-		// <566us does nothing
-		// 566-568 switches between wiping to 0s and doing nothing
-		// 5184 wipes and allows 1 block to be programmed.
-		// indefinite power on wipes and then programs all blocks with bitshifted data sent.
-		TurnReadLFOn(5184);
+    // "there is a clock delay before programming"
+    //  - programming takes ~5.6ms for t5577 ~18ms for E5550 or t5567
+    //  so we should wait 1 clock + 5.6ms then read response?
+    //  but we need to know we are dealing with t5577 vs t5567 vs e5550 (or q5) marshmellow...
+    if (testMode) {
+        //TESTMODE TIMING TESTS:
+        // <566us does nothing
+        // 566-568 switches between wiping to 0s and doing nothing
+        // 5184 wipes and allows 1 block to be programmed.
+        // indefinite power on wipes and then programs all blocks with bitshifted data sent.
+        TurnReadLFOn(5184);
 
-	} else {
-		TurnReadLFOn(20 * 1000);
+    } else {
+        TurnReadLFOn(20 * 1000);
 
-		//could attempt to do a read to confirm write took
-		// as the tag should repeat back the new block
-		// until it is reset, but to confirm it we would
-		// need to know the current block 0 config mode for
-		// modulation clock an other details to demod the response...
-		// response should be (for t55x7) a 0 bit then (ST if on)
-		// block data written in on repeat until reset.
+        //could attempt to do a read to confirm write took
+        // as the tag should repeat back the new block
+        // until it is reset, but to confirm it we would
+        // need to know the current block 0 config mode for
+        // modulation clock an other details to demod the response...
+        // response should be (for t55x7) a 0 bit then (ST if on)
+        // block data written in on repeat until reset.
 
-		//DoPartialAcquisition(20, true, 12000);
-	}
+        //DoPartialAcquisition(20, true, 12000);
+    }
 
-	// turn field off
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	LED_A_OFF();
+    // turn field off
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    LED_A_OFF();
 }
 
 // Write one card block in page 0, no lock
 void T55xxWriteBlock(uint32_t Data, uint8_t Block, uint32_t Pwd, uint8_t arg) {
-	T55xxWriteBlockExt(Data, Block, Pwd, arg);
-	cmd_send(CMD_ACK,0,0,0,0,0);
+    T55xxWriteBlockExt(Data, Block, Pwd, arg);
+    cmd_send(CMD_ACK,0,0,0,0,0);
 }
 
 // Read one card block in page [page]
 void T55xxReadBlock(uint16_t arg0, uint8_t Block, uint32_t Pwd) {
-	LED_A_ON();
-	bool PwdMode =    arg0 & 0x1;
-	uint8_t Page =  ( arg0 & 0x2 ) >> 1;
-	bool brute_mem =  arg0 & 0x4;
+    LED_A_ON();
+    bool PwdMode =    arg0 & 0x1;
+    uint8_t Page =  ( arg0 & 0x2 ) >> 1;
+    bool brute_mem =  arg0 & 0x4;
 
-	uint32_t i = 0;
+    uint32_t i = 0;
 
-	// regular read mode
-	bool RegReadMode = (Block == 0xFF);
+    // regular read mode
+    bool RegReadMode = (Block == 0xFF);
 
-	uint8_t start_wait = 4;
-	size_t samples = 12000;
-	if ( brute_mem ) {
-		start_wait = 0;
-		samples = 1024;
-	}
+    uint8_t start_wait = 4;
+    size_t samples = 12000;
+    if ( brute_mem ) {
+        start_wait = 0;
+        samples = 1024;
+    }
 
-	//clear buffer now so it does not interfere with timing later
-	BigBuf_Clear_keep_EM();
+    //clear buffer now so it does not interfere with timing later
+    BigBuf_Clear_keep_EM();
 
-	//make sure block is at max 7
-	Block &= 0x7;
+    //make sure block is at max 7
+    Block &= 0x7;
 
-	StartTicks();
+    StartTicks();
 
-	// Set up FPGA, 125kHz to power up the tag
-	LFSetupFPGAForADC(95, true);
-	// make sure tag is fully powered up...
-	WaitMS(start_wait);
+    // Set up FPGA, 125kHz to power up the tag
+    LFSetupFPGAForADC(95, true);
+    // make sure tag is fully powered up...
+    WaitMS(start_wait);
 
-	// Trigger T55x7 Direct Access Mode with start gap
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	WaitUS(t_config.start_gap);
+    // Trigger T55x7 Direct Access Mode with start gap
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    WaitUS(t_config.start_gap);
 
-	// Opcode 1[page]
-	T55xxWriteBit(1);
-	T55xxWriteBit(Page); //Page 0
+    // Opcode 1[page]
+    T55xxWriteBit(1);
+    T55xxWriteBit(Page); //Page 0
 
-	if (PwdMode){
-		// Send Pwd
-		for (i = 0x80000000; i != 0; i >>= 1)
-			T55xxWriteBit(Pwd & i);
-	}
-	// Send a zero bit separation
-	T55xxWriteBit(0);
+    if (PwdMode){
+        // Send Pwd
+        for (i = 0x80000000; i != 0; i >>= 1)
+            T55xxWriteBit(Pwd & i);
+    }
+    // Send a zero bit separation
+    T55xxWriteBit(0);
 
-	// Send Block number (if direct access mode)
-	if (!RegReadMode)
-		for (i = 0x04; i != 0; i >>= 1)
-			T55xxWriteBit(Block & i);
+    // Send Block number (if direct access mode)
+    if (!RegReadMode)
+        for (i = 0x04; i != 0; i >>= 1)
+            T55xxWriteBit(Block & i);
 
-	// Turn field on to read the response
-	// 137*8 seems to get to the start of data pretty well...
-	// but we want to go past the start and let the repeating data settle in...
-	TurnReadLFOn(200*8);
+    // Turn field on to read the response
+    // 137*8 seems to get to the start of data pretty well...
+    // but we want to go past the start and let the repeating data settle in...
+    TurnReadLFOn(200*8);
 
-	// Acquisition
-	// Now do the acquisition
-	DoPartialAcquisition(0, true, samples, 0);
+    // Acquisition
+    // Now do the acquisition
+    DoPartialAcquisition(0, true, samples, 0);
 
-	// Turn the field off
-	if ( !brute_mem ) {
-		FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-		cmd_send(CMD_ACK,0,0,0,0,0);
-		LED_A_OFF();
-	}
+    // Turn the field off
+    if ( !brute_mem ) {
+        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+        cmd_send(CMD_ACK,0,0,0,0,0);
+        LED_A_OFF();
+    }
 }
 
 void T55xx_ChkPwds() {
 
-	DbpString("[+] T55XX Check pwds using flashmemory starting");
+    DbpString("[+] T55XX Check pwds using flashmemory starting");
 
-	uint8_t ret = 0;
-	// First get baseline and setup LF mode.
-	// tends to mess up BigBuf
-	uint8_t *buf = BigBuf_get_addr();
+    uint8_t ret = 0;
+    // First get baseline and setup LF mode.
+    // tends to mess up BigBuf
+    uint8_t *buf = BigBuf_get_addr();
 
-	uint32_t b1, baseline = 0;
+    uint32_t b1, baseline = 0;
 
-	// collect baseline for failed attempt
-	uint8_t x = 32;
-	while (x--) {
-		b1 = 0;
-		T55xxReadBlock(4, 1, 0);
-		for (uint16_t j=0; j < 1024; ++j)
-			b1 += buf[j];
+    // collect baseline for failed attempt
+    uint8_t x = 32;
+    while (x--) {
+        b1 = 0;
+        T55xxReadBlock(4, 1, 0);
+        for (uint16_t j=0; j < 1024; ++j)
+            b1 += buf[j];
 
-		b1 *= b1;
-		b1 >>= 8;
-		baseline += b1;
-	}
+        b1 *= b1;
+        b1 >>= 8;
+        baseline += b1;
+    }
 
-	baseline >>= 5;
-	Dbprintf("[=] Baseline determined [%u]", baseline);
+    baseline >>= 5;
+    Dbprintf("[=] Baseline determined [%u]", baseline);
 
 
-	uint8_t *pwds = BigBuf_get_EM_addr();
-	uint16_t pwdCount = 0;
-	uint32_t candidate = 0;
+    uint8_t *pwds = BigBuf_get_EM_addr();
+    uint16_t pwdCount = 0;
+    uint32_t candidate = 0;
 
 #ifdef WITH_FLASH
-	bool use_flashmem = true;
-	if ( use_flashmem ) {
-		BigBuf_Clear_EM();
-		uint16_t isok = 0;
-		uint8_t counter[2] = {0x00, 0x00};
-		isok = Flash_ReadData(DEFAULT_T55XX_KEYS_OFFSET, counter, sizeof(counter) );
-		if ( isok != sizeof(counter) )
-			goto OUT;
+    bool use_flashmem = true;
+    if ( use_flashmem ) {
+        BigBuf_Clear_EM();
+        uint16_t isok = 0;
+        uint8_t counter[2] = {0x00, 0x00};
+        isok = Flash_ReadData(DEFAULT_T55XX_KEYS_OFFSET, counter, sizeof(counter) );
+        if ( isok != sizeof(counter) )
+            goto OUT;
 
-		pwdCount = counter[1] << 8 | counter[0];
+        pwdCount = counter[1] << 8 | counter[0];
 
-		if ( pwdCount == 0 && pwdCount == 0xFFFF)
-			goto OUT;
+        if ( pwdCount == 0 && pwdCount == 0xFFFF)
+            goto OUT;
 
-		isok = Flash_ReadData(DEFAULT_T55XX_KEYS_OFFSET+2, pwds, pwdCount * 4);
-		if ( isok != pwdCount * 4 )
-			goto OUT;
+        isok = Flash_ReadData(DEFAULT_T55XX_KEYS_OFFSET+2, pwds, pwdCount * 4);
+        if ( isok != pwdCount * 4 )
+            goto OUT;
 
-		Dbprintf("[=] Password dictionary count %d ", pwdCount);
-	}
+        Dbprintf("[=] Password dictionary count %d ", pwdCount);
+    }
 #endif
 
-	uint32_t pwd = 0, curr = 0, prev = 0;
-	for (uint16_t i =0; i< pwdCount; ++i) {
+    uint32_t pwd = 0, curr = 0, prev = 0;
+    for (uint16_t i =0; i< pwdCount; ++i) {
 
-		if (BUTTON_PRESS() && !usb_poll_validate_length()) {
-			goto OUT;
-		}
+        if (BUTTON_PRESS() && !usb_poll_validate_length()) {
+            goto OUT;
+        }
 
-		pwd = bytes_to_num(pwds + i * 4, 4);
+        pwd = bytes_to_num(pwds + i * 4, 4);
 
 
-		T55xxReadBlock(5, 0, pwd);
+        T55xxReadBlock(5, 0, pwd);
 
-		// calc mean of BigBuf 1024 samples.
-		uint32_t sum = 0;
-		for (uint16_t j=0; j<1024; ++j) {
-			sum += buf[j];
-		}
+        // calc mean of BigBuf 1024 samples.
+        uint32_t sum = 0;
+        for (uint16_t j=0; j<1024; ++j) {
+            sum += buf[j];
+        }
 
-		sum *= sum;
-		sum >>= 8;
+        sum *= sum;
+        sum >>= 8;
 
-		int32_t tmp = (sum - baseline);
-		curr = ABS(tmp);
+        int32_t tmp = (sum - baseline);
+        curr = ABS(tmp);
 
-		Dbprintf("[=] Pwd %08X  | ABS %u", pwd, curr );
+        Dbprintf("[=] Pwd %08X  | ABS %u", pwd, curr );
 
-		if ( curr > prev ) {
+        if ( curr > prev ) {
 
 
-			Dbprintf("[=]  --> ABS %u  Candidate %08X <--", curr, pwd );
-			candidate = pwd;
-			prev = curr;
-		}
-	}
+            Dbprintf("[=]  --> ABS %u  Candidate %08X <--", curr, pwd );
+            candidate = pwd;
+            prev = curr;
+        }
+    }
 
-	if ( candidate )
-		ret = 1;
+    if ( candidate )
+        ret = 1;
 
 OUT:
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	cmd_send(CMD_ACK,ret,candidate,0,0,0);
-	LEDsoff();
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    cmd_send(CMD_ACK,ret,candidate,0,0,0);
+    LEDsoff();
 }
 
 void T55xxWakeUp(uint32_t Pwd){
-	LED_B_ON();
-	uint32_t i = 0;
+    LED_B_ON();
+    uint32_t i = 0;
 
-	StartTicks();
+    StartTicks();
 
-	// Set up FPGA, 125kHz
-	LFSetupFPGAForADC(95, true);
-	// make sure tag is fully powered up...
-	WaitMS(4);
+    // Set up FPGA, 125kHz
+    LFSetupFPGAForADC(95, true);
+    // make sure tag is fully powered up...
+    WaitMS(4);
 
-	// Trigger T55x7 Direct Access Mode
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	WaitUS(t_config.start_gap);
+    // Trigger T55x7 Direct Access Mode
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    WaitUS(t_config.start_gap);
 
-	// Opcode 10
-	T55xxWriteBit(1);
-	T55xxWriteBit(0); //Page 0
+    // Opcode 10
+    T55xxWriteBit(1);
+    T55xxWriteBit(0); //Page 0
 
-	// Send Pwd
-	for (i = 0x80000000; i != 0; i >>= 1)
-		T55xxWriteBit(Pwd & i);
+    // Send Pwd
+    for (i = 0x80000000; i != 0; i >>= 1)
+        T55xxWriteBit(Pwd & i);
 
-	// Turn and leave field on to let the begin repeating transmission
-	TurnReadLFOn(20*1000);
+    // Turn and leave field on to let the begin repeating transmission
+    TurnReadLFOn(20*1000);
 }
 
 /*-------------- Cloning routines -----------*/
 void WriteT55xx(uint32_t *blockdata, uint8_t startblock, uint8_t numblocks) {
-	// write last block first and config block last (if included)
-	for (uint8_t i = numblocks+startblock; i > startblock; i--)
-		T55xxWriteBlockExt(blockdata[i-1], i-1, 0, 0);
+    // write last block first and config block last (if included)
+    for (uint8_t i = numblocks+startblock; i > startblock; i--)
+        T55xxWriteBlockExt(blockdata[i-1], i-1, 0, 0);
 }
 
 // Copy HID id to card and setup block 0 config
 void CopyHIDtoT55x7(uint32_t hi2, uint32_t hi, uint32_t lo, uint8_t longFMT) {
-	uint32_t data[] = {0,0,0,0,0,0,0};
-	uint8_t last_block = 0;
+    uint32_t data[] = {0,0,0,0,0,0,0};
+    uint8_t last_block = 0;
 
-	if (longFMT){
-		// Ensure no more than 84 bits supplied
-		if (hi2 > 0xFFFFF) {
-			DbpString("Tags can only have 84 bits.");
-			return;
-		}
-		// Build the 6 data blocks for supplied 84bit ID
-		last_block = 6;
-		// load preamble (1D) & long format identifier (9E manchester encoded)
-		data[1] = 0x1D96A900 | (manchesterEncode2Bytes((hi2 >> 16) & 0xF) & 0xFF);
-		// load raw id from hi2, hi, lo to data blocks (manchester encoded)
-		data[2] = manchesterEncode2Bytes(hi2 & 0xFFFF);
-		data[3] = manchesterEncode2Bytes(hi >> 16);
-		data[4] = manchesterEncode2Bytes(hi & 0xFFFF);
-		data[5] = manchesterEncode2Bytes(lo >> 16);
-		data[6] = manchesterEncode2Bytes(lo & 0xFFFF);
-	} else {
-		// Ensure no more than 44 bits supplied
-		if (hi > 0xFFF) {
-			DbpString("Tags can only have 44 bits.");
-			return;
-		}
-		// Build the 3 data blocks for supplied 44bit ID
-		last_block = 3;
-		// load preamble
-		data[1] = 0x1D000000 | (manchesterEncode2Bytes(hi) & 0xFFFFFF);
-		data[2] = manchesterEncode2Bytes(lo >> 16);
-		data[3] = manchesterEncode2Bytes(lo & 0xFFFF);
-	}
-	// load chip config block
-	data[0] = T55x7_BITRATE_RF_50 | T55x7_MODULATION_FSK2a | last_block << T55x7_MAXBLOCK_SHIFT;
+    if (longFMT){
+        // Ensure no more than 84 bits supplied
+        if (hi2 > 0xFFFFF) {
+            DbpString("Tags can only have 84 bits.");
+            return;
+        }
+        // Build the 6 data blocks for supplied 84bit ID
+        last_block = 6;
+        // load preamble (1D) & long format identifier (9E manchester encoded)
+        data[1] = 0x1D96A900 | (manchesterEncode2Bytes((hi2 >> 16) & 0xF) & 0xFF);
+        // load raw id from hi2, hi, lo to data blocks (manchester encoded)
+        data[2] = manchesterEncode2Bytes(hi2 & 0xFFFF);
+        data[3] = manchesterEncode2Bytes(hi >> 16);
+        data[4] = manchesterEncode2Bytes(hi & 0xFFFF);
+        data[5] = manchesterEncode2Bytes(lo >> 16);
+        data[6] = manchesterEncode2Bytes(lo & 0xFFFF);
+    } else {
+        // Ensure no more than 44 bits supplied
+        if (hi > 0xFFF) {
+            DbpString("Tags can only have 44 bits.");
+            return;
+        }
+        // Build the 3 data blocks for supplied 44bit ID
+        last_block = 3;
+        // load preamble
+        data[1] = 0x1D000000 | (manchesterEncode2Bytes(hi) & 0xFFFFFF);
+        data[2] = manchesterEncode2Bytes(lo >> 16);
+        data[3] = manchesterEncode2Bytes(lo & 0xFFFF);
+    }
+    // load chip config block
+    data[0] = T55x7_BITRATE_RF_50 | T55x7_MODULATION_FSK2a | last_block << T55x7_MAXBLOCK_SHIFT;
 
-	//TODO add selection of chip for Q5 or T55x7
-	// data[0] = T5555_SET_BITRATE(50) | T5555_MODULATION_FSK2 | T5555_INVERT_OUTPUT | last_block << T5555_MAXBLOCK_SHIFT;
+    //TODO add selection of chip for Q5 or T55x7
+    // data[0] = T5555_SET_BITRATE(50) | T5555_MODULATION_FSK2 | T5555_INVERT_OUTPUT | last_block << T5555_MAXBLOCK_SHIFT;
 
-	LED_D_ON();
-	WriteT55xx(data, 0, last_block+1);
-	LED_D_OFF();
+    LED_D_ON();
+    WriteT55xx(data, 0, last_block+1);
+    LED_D_OFF();
 }
 
 void CopyIOtoT55x7(uint32_t hi, uint32_t lo) {
-	uint32_t data[] = {T55x7_BITRATE_RF_64 | T55x7_MODULATION_FSK2a | (2 << T55x7_MAXBLOCK_SHIFT), hi, lo};
-	//TODO add selection of chip for Q5 or T55x7
-	// data[0] = T5555_SET_BITRATE(64) | T5555_MODULATION_FSK2 | T5555_INVERT_OUTPUT | 2 << T5555_MAXBLOCK_SHIFT;
+    uint32_t data[] = {T55x7_BITRATE_RF_64 | T55x7_MODULATION_FSK2a | (2 << T55x7_MAXBLOCK_SHIFT), hi, lo};
+    //TODO add selection of chip for Q5 or T55x7
+    // data[0] = T5555_SET_BITRATE(64) | T5555_MODULATION_FSK2 | T5555_INVERT_OUTPUT | 2 << T5555_MAXBLOCK_SHIFT;
 
-	LED_D_ON();
-	// Program the data blocks for supplied ID
-	// and the block 0 config
-	WriteT55xx(data, 0, 3);
-	LED_D_OFF();
+    LED_D_ON();
+    // Program the data blocks for supplied ID
+    // and the block 0 config
+    WriteT55xx(data, 0, 3);
+    LED_D_OFF();
 }
 
 // Clone Indala 64-bit tag by UID to T55x7
 void CopyIndala64toT55x7(uint32_t hi, uint32_t lo) {
-	//Program the 2 data blocks for supplied 64bit UID
-	// and the Config for Indala 64 format (RF/32;PSK2 with RF/2;Maxblock=2)
-	uint32_t data[] = { T55x7_BITRATE_RF_32 | T55x7_MODULATION_PSK2 | (2 << T55x7_MAXBLOCK_SHIFT), hi, lo};
-	//TODO add selection of chip for Q5 or T55x7
-	// data[0] = T5555_SET_BITRATE(32 | T5555_MODULATION_PSK2 | 2 << T5555_MAXBLOCK_SHIFT;
+    //Program the 2 data blocks for supplied 64bit UID
+    // and the Config for Indala 64 format (RF/32;PSK2 with RF/2;Maxblock=2)
+    uint32_t data[] = { T55x7_BITRATE_RF_32 | T55x7_MODULATION_PSK2 | (2 << T55x7_MAXBLOCK_SHIFT), hi, lo};
+    //TODO add selection of chip for Q5 or T55x7
+    // data[0] = T5555_SET_BITRATE(32 | T5555_MODULATION_PSK2 | 2 << T5555_MAXBLOCK_SHIFT;
 
-	WriteT55xx(data, 0, 3);
-	//Alternative config for Indala (Extended mode;RF/32;PSK2 with RF/2;Maxblock=2;Inverse data)
-	//	T5567WriteBlock(0x603E1042,0);
+    WriteT55xx(data, 0, 3);
+    //Alternative config for Indala (Extended mode;RF/32;PSK2 with RF/2;Maxblock=2;Inverse data)
+    // T5567WriteBlock(0x603E1042,0);
 }
 // Clone Indala 224-bit tag by UID to T55x7
 void CopyIndala224toT55x7(uint32_t uid1, uint32_t uid2, uint32_t uid3, uint32_t uid4, uint32_t uid5, uint32_t uid6, uint32_t uid7) {
-	//Program the 7 data blocks for supplied 224bit UID
-	uint32_t data[] = {0, uid1, uid2, uid3, uid4, uid5, uid6, uid7};
-	// and the block 0 for Indala224 format
-	//Config for Indala (RF/32;PSK2 with RF/2;Maxblock=7)
-	data[0] = T55x7_BITRATE_RF_32 | T55x7_MODULATION_PSK2 | (7 << T55x7_MAXBLOCK_SHIFT);
-	//TODO add selection of chip for Q5 or T55x7
-	// data[0] =  T5555_SET_BITRATE(32 | T5555_MODULATION_PSK2 | 7 << T5555_MAXBLOCK_SHIFT;
-	WriteT55xx(data, 0, 8);
-	//Alternative config for Indala (Extended mode;RF/32;PSK2 with RF/2;Maxblock=7;Inverse data)
-	//	T5567WriteBlock(0x603E10E2,0);
+    //Program the 7 data blocks for supplied 224bit UID
+    uint32_t data[] = {0, uid1, uid2, uid3, uid4, uid5, uid6, uid7};
+    // and the block 0 for Indala224 format
+    //Config for Indala (RF/32;PSK2 with RF/2;Maxblock=7)
+    data[0] = T55x7_BITRATE_RF_32 | T55x7_MODULATION_PSK2 | (7 << T55x7_MAXBLOCK_SHIFT);
+    //TODO add selection of chip for Q5 or T55x7
+    // data[0] =  T5555_SET_BITRATE(32 | T5555_MODULATION_PSK2 | 7 << T5555_MAXBLOCK_SHIFT;
+    WriteT55xx(data, 0, 8);
+    //Alternative config for Indala (Extended mode;RF/32;PSK2 with RF/2;Maxblock=7;Inverse data)
+    // T5567WriteBlock(0x603E10E2,0);
 }
 // clone viking tag to T55xx
 void CopyVikingtoT55xx(uint32_t block1, uint32_t block2, uint8_t Q5) {
-	uint32_t data[] = {T55x7_BITRATE_RF_32 | T55x7_MODULATION_MANCHESTER | (2 << T55x7_MAXBLOCK_SHIFT), block1, block2};
-	if (Q5) data[0] = T5555_SET_BITRATE(32) | T5555_MODULATION_MANCHESTER | 2 << T5555_MAXBLOCK_SHIFT;
-	// Program the data blocks for supplied ID and the block 0 config
-	WriteT55xx(data, 0, 3);
-	LED_D_OFF();
-	cmd_send(CMD_ACK,0,0,0,0,0);
+    uint32_t data[] = {T55x7_BITRATE_RF_32 | T55x7_MODULATION_MANCHESTER | (2 << T55x7_MAXBLOCK_SHIFT), block1, block2};
+    if (Q5) data[0] = T5555_SET_BITRATE(32) | T5555_MODULATION_MANCHESTER | 2 << T5555_MAXBLOCK_SHIFT;
+    // Program the data blocks for supplied ID and the block 0 config
+    WriteT55xx(data, 0, 3);
+    LED_D_OFF();
+    cmd_send(CMD_ACK,0,0,0,0,0);
 }
 
 // Define 9bit header for EM410x tags
-#define EM410X_HEADER		0x1FF
-#define EM410X_ID_LENGTH	40
+#define EM410X_HEADER    0x1FF
+#define EM410X_ID_LENGTH 40
 
 void WriteEM410x(uint32_t card, uint32_t id_hi, uint32_t id_lo) {
-	int i, id_bit;
-	uint64_t id = EM410X_HEADER;
-	uint64_t rev_id = 0;	// reversed ID
-	int c_parity[4];	// column parity
-	int r_parity = 0;	// row parity
-	uint32_t clock = 0;
+    int i, id_bit;
+    uint64_t id = EM410X_HEADER;
+    uint64_t rev_id = 0; // reversed ID
+    int c_parity[4];     // column parity
+    int r_parity = 0;    // row parity
+    uint32_t clock = 0;
 
-	// Reverse ID bits given as parameter (for simpler operations)
-	for (i = 0; i < EM410X_ID_LENGTH; ++i) {
-		if (i < 32) {
-			rev_id = (rev_id << 1) | (id_lo & 1);
-			id_lo >>= 1;
-		} else {
-			rev_id = (rev_id << 1) | (id_hi & 1);
-			id_hi >>= 1;
-		}
-	}
+    // Reverse ID bits given as parameter (for simpler operations)
+    for (i = 0; i < EM410X_ID_LENGTH; ++i) {
+        if (i < 32) {
+            rev_id = (rev_id << 1) | (id_lo & 1);
+            id_lo >>= 1;
+        } else {
+            rev_id = (rev_id << 1) | (id_hi & 1);
+            id_hi >>= 1;
+        }
+    }
 
-	for (i = 0; i < EM410X_ID_LENGTH; ++i) {
-		id_bit = rev_id & 1;
+    for (i = 0; i < EM410X_ID_LENGTH; ++i) {
+        id_bit = rev_id & 1;
 
-		if (i % 4 == 0) {
-			// Don't write row parity bit at start of parsing
-			if (i)
-				id = (id << 1) | r_parity;
-			// Start counting parity for new row
-			r_parity = id_bit;
-		} else {
-			// Count row parity
-			r_parity ^= id_bit;
-		}
+        if (i % 4 == 0) {
+            // Don't write row parity bit at start of parsing
+            if (i)
+                id = (id << 1) | r_parity;
+            // Start counting parity for new row
+            r_parity = id_bit;
+        } else {
+            // Count row parity
+            r_parity ^= id_bit;
+        }
 
-		// First elements in column?
-		if (i < 4)
-			// Fill out first elements
-			c_parity[i] = id_bit;
-		else
-			// Count column parity
-			c_parity[i % 4] ^= id_bit;
+        // First elements in column?
+        if (i < 4)
+            // Fill out first elements
+            c_parity[i] = id_bit;
+        else
+            // Count column parity
+            c_parity[i % 4] ^= id_bit;
 
-		// Insert ID bit
-		id = (id << 1) | id_bit;
-		rev_id >>= 1;
-	}
+        // Insert ID bit
+        id = (id << 1) | id_bit;
+        rev_id >>= 1;
+    }
 
-	// Insert parity bit of last row
-	id = (id << 1) | r_parity;
+    // Insert parity bit of last row
+    id = (id << 1) | r_parity;
 
-	// Fill out column parity at the end of tag
-	for (i = 0; i < 4; ++i)
-		id = (id << 1) | c_parity[i];
+    // Fill out column parity at the end of tag
+    for (i = 0; i < 4; ++i)
+        id = (id << 1) | c_parity[i];
 
-	// Add stop bit
-	id <<= 1;
+    // Add stop bit
+    id <<= 1;
 
-	Dbprintf("Started writing %s tag ...", card ? "T55x7":"T5555");
-	LED_D_ON();
+    Dbprintf("Started writing %s tag ...", card ? "T55x7":"T5555");
+    LED_D_ON();
 
-	// Write EM410x ID
-	uint32_t data[] = {0, (uint32_t)(id>>32), (uint32_t)(id & 0xFFFFFFFF)};
+    // Write EM410x ID
+    uint32_t data[] = {0, (uint32_t)(id>>32), (uint32_t)(id & 0xFFFFFFFF)};
 
-	clock = (card & 0xFF00) >> 8;
-	clock = (clock == 0) ? 64 : clock;
-	Dbprintf("Clock rate: %d", clock);
-	if (card & 0xFF) { //t55x7
-		clock = GetT55xxClockBit(clock);
-		if (clock == 0) {
-			Dbprintf("Invalid clock rate: %d", clock);
-			return;
-		}
-		data[0] = clock | T55x7_MODULATION_MANCHESTER | (2 << T55x7_MAXBLOCK_SHIFT);
-	} else { //t5555 (Q5)
-		data[0] = T5555_SET_BITRATE(clock) | T5555_MODULATION_MANCHESTER | (2 << T5555_MAXBLOCK_SHIFT);
-	}
+    clock = (card & 0xFF00) >> 8;
+    clock = (clock == 0) ? 64 : clock;
+    Dbprintf("Clock rate: %d", clock);
+    if (card & 0xFF) { //t55x7
+        clock = GetT55xxClockBit(clock);
+        if (clock == 0) {
+            Dbprintf("Invalid clock rate: %d", clock);
+            return;
+        }
+        data[0] = clock | T55x7_MODULATION_MANCHESTER | (2 << T55x7_MAXBLOCK_SHIFT);
+    } else { //t5555 (Q5)
+        data[0] = T5555_SET_BITRATE(clock) | T5555_MODULATION_MANCHESTER | (2 << T5555_MAXBLOCK_SHIFT);
+    }
 
-	WriteT55xx(data, 0, 3);
+    WriteT55xx(data, 0, 3);
 
-	LED_D_OFF();
-	Dbprintf("Tag %s written with 0x%08x%08x\n",
-			card ? "T55x7":"T5555",
-			(uint32_t)(id >> 32),
-			(uint32_t)id);
+    LED_D_OFF();
+    Dbprintf("Tag %s written with 0x%08x%08x\n",
+            card ? "T55x7":"T5555",
+            (uint32_t)(id >> 32),
+            (uint32_t)id);
 }
 
 //-----------------------------------
@@ -1906,18 +1907,18 @@ uint8_t * fwd_write_ptr; //forwardlink bit pointer
 
 uint8_t Prepare_Cmd( uint8_t cmd ) {
 
-	*forward_ptr++ = 0; //start bit
-	*forward_ptr++ = 0; //second pause for 4050 code
+    *forward_ptr++ = 0; //start bit
+    *forward_ptr++ = 0; //second pause for 4050 code
 
-	*forward_ptr++ = cmd;
-	cmd >>= 1;
-	*forward_ptr++ = cmd;
-	cmd >>= 1;
-	*forward_ptr++ = cmd;
-	cmd >>= 1;
-	*forward_ptr++ = cmd;
+    *forward_ptr++ = cmd;
+    cmd >>= 1;
+    *forward_ptr++ = cmd;
+    cmd >>= 1;
+    *forward_ptr++ = cmd;
+    cmd >>= 1;
+    *forward_ptr++ = cmd;
 
-	return 6; //return number of emited bits
+    return 6; //return number of emited bits
 }
 
 //====================================================================
@@ -1926,19 +1927,19 @@ uint8_t Prepare_Cmd( uint8_t cmd ) {
 //====================================================================
 uint8_t Prepare_Addr( uint8_t addr ) {
 
-	register uint8_t line_parity;
+    register uint8_t line_parity;
 
-	uint8_t i;
-	line_parity = 0;
-	for( i=0; i<6; i++ ) {
-		*forward_ptr++ = addr;
-		line_parity ^= addr;
-		addr >>= 1;
-	}
+    uint8_t i;
+    line_parity = 0;
+    for( i=0; i<6; i++ ) {
+        *forward_ptr++ = addr;
+        line_parity ^= addr;
+        addr >>= 1;
+    }
 
-	*forward_ptr++ = (line_parity & 1);
+    *forward_ptr++ = (line_parity & 1);
 
-	return 7; //return number of emited bits
+    return 7; //return number of emited bits
 }
 
 //====================================================================
@@ -1947,34 +1948,34 @@ uint8_t Prepare_Addr( uint8_t addr ) {
 //====================================================================
 uint8_t Prepare_Data( uint16_t data_low, uint16_t data_hi) {
 
-	register uint8_t line_parity;
-	register uint8_t column_parity;
-	register uint8_t i, j;
-	register uint16_t data;
+    register uint8_t line_parity;
+    register uint8_t column_parity;
+    register uint8_t i, j;
+    register uint16_t data;
 
-	data = data_low;
-	column_parity = 0;
+    data = data_low;
+    column_parity = 0;
 
-	for(i=0; i<4; i++) {
-		line_parity = 0;
-		for(j=0; j<8; j++) {
-			line_parity ^= data;
-			column_parity ^= (data & 1) << j;
-			*forward_ptr++ = data;
-			data >>= 1;
-		}
-		*forward_ptr++ = line_parity;
-		if(i == 1)
-			data = data_hi;
-	}
+    for(i=0; i<4; i++) {
+        line_parity = 0;
+        for(j=0; j<8; j++) {
+            line_parity ^= data;
+            column_parity ^= (data & 1) << j;
+            *forward_ptr++ = data;
+            data >>= 1;
+        }
+        *forward_ptr++ = line_parity;
+        if(i == 1)
+            data = data_hi;
+    }
 
-	for(j=0; j<8; j++) {
-		*forward_ptr++ = column_parity;
-		column_parity >>= 1;
-	}
-	*forward_ptr = 0;
+    for(j=0; j<8; j++) {
+        *forward_ptr++ = column_parity;
+        column_parity >>= 1;
+    }
+    *forward_ptr = 0;
 
-	return 45; //return number of emited bits
+    return 45; //return number of emited bits
 }
 
 //====================================================================
@@ -1992,108 +1993,108 @@ void SendForward(uint8_t fwd_bit_count) {
 #define EM_START_GAP 55*8
 #endif
 
-	fwd_write_ptr = forwardLink_data;
-	fwd_bit_sz = fwd_bit_count;
+    fwd_write_ptr = forwardLink_data;
+    fwd_bit_sz = fwd_bit_count;
 
-	// Set up FPGA, 125kHz or 95 divisor
-	LFSetupFPGAForADC(95, true);
+    // Set up FPGA, 125kHz or 95 divisor
+    LFSetupFPGAForADC(95, true);
 
-	// force 1st mod pulse (start gap must be longer for 4305)
-	fwd_bit_sz--; //prepare next bit modulation
-	fwd_write_ptr++;
+    // force 1st mod pulse (start gap must be longer for 4305)
+    fwd_bit_sz--; //prepare next bit modulation
+    fwd_write_ptr++;
 
-	TurnReadLF_off(EM_START_GAP);
-	TurnReadLFOn(18*8);
+    TurnReadLF_off(EM_START_GAP);
+    TurnReadLFOn(18*8);
 
-	// now start writting with bitbanging the antenna.
-	while(fwd_bit_sz-- > 0) { //prepare next bit modulation
-		if(((*fwd_write_ptr++) & 1) == 1) {
-			WaitUS(32*8);
-		} else {
-			TurnReadLF_off(23*8);
-			TurnReadLFOn(18*8);
-		}
-	}
+    // now start writting with bitbanging the antenna.
+    while(fwd_bit_sz-- > 0) { //prepare next bit modulation
+        if(((*fwd_write_ptr++) & 1) == 1) {
+            WaitUS(32*8);
+        } else {
+            TurnReadLF_off(23*8);
+            TurnReadLFOn(18*8);
+        }
+    }
 }
 
 void EM4xLogin(uint32_t pwd) {
-	uint8_t len;
-	forward_ptr = forwardLink_data;
-	len = Prepare_Cmd( FWD_CMD_LOGIN );
-	len += Prepare_Data( pwd & 0xFFFF, pwd >> 16 );
-	SendForward(len);
-	//WaitUS(20); // no wait for login command.
-	// should receive
-	// 0000 1010 ok.
-	// 0000 0001 fail
+    uint8_t len;
+    forward_ptr = forwardLink_data;
+    len = Prepare_Cmd( FWD_CMD_LOGIN );
+    len += Prepare_Data( pwd & 0xFFFF, pwd >> 16 );
+    SendForward(len);
+    //WaitUS(20); // no wait for login command.
+    // should receive
+    // 0000 1010 ok.
+    // 0000 0001 fail
 }
 
 void EM4xReadWord(uint8_t addr, uint32_t pwd, uint8_t usepwd) {
 
-	LED_A_ON();
-	uint8_t len;
+    LED_A_ON();
+    uint8_t len;
 
-	//clear buffer now so it does not interfere with timing later
-	BigBuf_Clear_ext(false);
+    //clear buffer now so it does not interfere with timing later
+    BigBuf_Clear_ext(false);
 
-	StartTicks();
-	/* should we read answer from Logincommand?
-	*
-	* should receive
-	* 0000 1010 ok.
-	* 0000 0001 fail
-	**/
-	if (usepwd) EM4xLogin(pwd);
+    StartTicks();
+    /* should we read answer from Logincommand?
+    *
+    * should receive
+    * 0000 1010 ok.
+    * 0000 0001 fail
+    **/
+    if (usepwd) EM4xLogin(pwd);
 
-	forward_ptr = forwardLink_data;
-	len = Prepare_Cmd( FWD_CMD_READ );
-	len += Prepare_Addr( addr );
+    forward_ptr = forwardLink_data;
+    len = Prepare_Cmd( FWD_CMD_READ );
+    len += Prepare_Addr( addr );
 
-	SendForward(len);
+    SendForward(len);
 
-	WaitUS(400);
+    WaitUS(400);
 
-	DoPartialAcquisition(20, true, 6000, 1000);
+    DoPartialAcquisition(20, true, 6000, 1000);
 
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	cmd_send(CMD_ACK,0,0,0,0,0);
-	LED_A_OFF();
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    cmd_send(CMD_ACK,0,0,0,0,0);
+    LED_A_OFF();
 }
 
 void EM4xWriteWord(uint32_t flag, uint32_t data, uint32_t pwd) {
 
-	LED_A_ON();
+    LED_A_ON();
 
-	bool usePwd = (flag & 0xF);
-	uint8_t addr = (flag >> 8) & 0xFF;
-	uint8_t len;
+    bool usePwd = (flag & 0xF);
+    uint8_t addr = (flag >> 8) & 0xFF;
+    uint8_t len;
 
-	//clear buffer now so it does not interfere with timing later
-	BigBuf_Clear_ext(false);
-	StartTicks();
-	/* should we read answer from Logincommand?
-	*
-	* should receive
-	* 0000 1010 ok.
-	* 0000 0001 fail
-	**/
-	if (usePwd) EM4xLogin(pwd);
+    //clear buffer now so it does not interfere with timing later
+    BigBuf_Clear_ext(false);
+    StartTicks();
+    /* should we read answer from Logincommand?
+    *
+    * should receive
+    * 0000 1010 ok.
+    * 0000 0001 fail
+    **/
+    if (usePwd) EM4xLogin(pwd);
 
-	forward_ptr = forwardLink_data;
-	len = Prepare_Cmd( FWD_CMD_WRITE );
-	len += Prepare_Addr( addr );
-	len += Prepare_Data( data & 0xFFFF, data >> 16 );
+    forward_ptr = forwardLink_data;
+    len = Prepare_Cmd( FWD_CMD_WRITE );
+    len += Prepare_Addr( addr );
+    len += Prepare_Data( data & 0xFFFF, data >> 16 );
 
-	SendForward(len);
+    SendForward(len);
 
-	//Wait 20ms for write to complete?
-	WaitMS(7);
+    //Wait 20ms for write to complete?
+    WaitMS(7);
 
-	DoPartialAcquisition(20, true, 6000, 1000);
+    DoPartialAcquisition(20, true, 6000, 1000);
 
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	cmd_send(CMD_ACK,0,0,0,0,0);
-	LED_A_OFF();
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    cmd_send(CMD_ACK,0,0,0,0,0);
+    LED_A_OFF();
 }
 
 /*
@@ -2112,36 +2113,36 @@ This triggers a COTAG tag to response
 */
 void Cotag(uint32_t arg0) {
 #ifndef OFF
-# define OFF(x) 	{ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); WaitUS((x)); }
+# define OFF(x)  { FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); WaitUS((x)); }
 #endif
 #ifndef ON
 # define ON(x)   { FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | FPGA_LF_ADC_READER_FIELD); WaitUS((x)); }
 #endif
-	uint8_t rawsignal = arg0 & 0xF;
+    uint8_t rawsignal = arg0 & 0xF;
 
-	LED_A_ON();
+    LED_A_ON();
 
-	LFSetupFPGAForADC(89, true);
+    LFSetupFPGAForADC(89, true);
 
-	//clear buffer now so it does not interfere with timing later
-	BigBuf_Clear_ext(false);
+    //clear buffer now so it does not interfere with timing later
+    BigBuf_Clear_ext(false);
 
-	//send COTAG start pulse
-	ON(740)  OFF(2035)
-	ON(3330) OFF(2035)
-	ON(740)  OFF(2035)
-	ON(1000)
+    //send COTAG start pulse
+    ON(740)  OFF(2035)
+    ON(3330) OFF(2035)
+    ON(740)  OFF(2035)
+    ON(1000)
 
-	switch(rawsignal) {
-		case 0: doCotagAcquisition(50000); break;
-		case 1: doCotagAcquisitionManchester(); break;
-		case 2: DoAcquisition_config(true, 0); break;
-	}
+    switch(rawsignal) {
+        case 0: doCotagAcquisition(50000); break;
+        case 1: doCotagAcquisitionManchester(); break;
+        case 2: DoAcquisition_config(true, 0); break;
+    }
 
-	// Turn the field off
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); // field off
-	cmd_send(CMD_ACK,0,0,0,0,0);
-	LEDsoff();
+    // Turn the field off
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); // field off
+    cmd_send(CMD_ACK,0,0,0,0,0);
+    LEDsoff();
 }
 
 /*
diff --git a/armsrc/lfsampling.c b/armsrc/lfsampling.c
index 80d95bb4a..93ba535b6 100644
--- a/armsrc/lfsampling.c
+++ b/armsrc/lfsampling.c
@@ -10,21 +10,21 @@
 
 /*
 Default LF config is set to:
-	decimation = 1  (we keep 1 out of 1 samples)
-	bits_per_sample = 8
-	averaging = YES
-	divisor = 95 (125khz)
-	trigger_threshold = 0
-	*/
+    decimation = 1  (we keep 1 out of 1 samples)
+    bits_per_sample = 8
+    averaging = YES
+    divisor = 95 (125khz)
+    trigger_threshold = 0
+    */
 sample_config config = { 1, 8, 1, 95, 0 } ;
 
 void printConfig() {
-	Dbprintf("LF Sampling config");
-	Dbprintf("  [q] divisor.............%d (%d KHz)", config.divisor, 12000 / (config.divisor+1));
-	Dbprintf("  [b] bps.................%d", config.bits_per_sample);
-	Dbprintf("  [d] decimation..........%d", config.decimation);
-	Dbprintf("  [a] averaging...........%s", (config.averaging) ? "Yes" : "No");
-	Dbprintf("  [t] trigger threshold...%d", config.trigger_threshold);
+    Dbprintf("LF Sampling config");
+    Dbprintf("  [q] divisor.............%d (%d KHz)", config.divisor, 12000 / (config.divisor+1));
+    Dbprintf("  [b] bps.................%d", config.bits_per_sample);
+    Dbprintf("  [d] decimation..........%d", config.decimation);
+    Dbprintf("  [a] averaging...........%s", (config.averaging) ? "Yes" : "No");
+    Dbprintf("  [t] trigger threshold...%d", config.trigger_threshold);
 }
 
 /**
@@ -39,25 +39,25 @@ void printConfig() {
  * @param sc
  */
 void setSamplingConfig(sample_config *sc) {
-	if(sc->divisor != 0) config.divisor = sc->divisor;
-	if(sc->bits_per_sample != 0) config.bits_per_sample = sc->bits_per_sample;
-	if(sc->trigger_threshold != -1) config.trigger_threshold = sc->trigger_threshold;
+    if(sc->divisor != 0) config.divisor = sc->divisor;
+    if(sc->bits_per_sample != 0) config.bits_per_sample = sc->bits_per_sample;
+    if(sc->trigger_threshold != -1) config.trigger_threshold = sc->trigger_threshold;
 
-	config.decimation = (sc->decimation != 0) ? sc->decimation : 1;
-	config.averaging = sc->averaging;
-	if(config.bits_per_sample > 8)	config.bits_per_sample = 8;
+    config.decimation = (sc->decimation != 0) ? sc->decimation : 1;
+    config.averaging = sc->averaging;
+    if(config.bits_per_sample > 8) config.bits_per_sample = 8;
 
-	printConfig();
+    printConfig();
 }
 
 sample_config* getSamplingConfig() {
-	return &config;
+    return &config;
 }
 
 struct BitstreamOut {
-	uint8_t * buffer;
-	uint32_t numbits;
-	uint32_t position;
+    uint8_t * buffer;
+    uint32_t numbits;
+    uint32_t position;
 };
 
 /**
@@ -66,39 +66,39 @@ struct BitstreamOut {
  * @param bit
  */
 void pushBit( BitstreamOut* stream, uint8_t bit) {
-	int bytepos = stream->position >> 3; // divide by 8
-	int bitpos = stream->position & 7;
-	*(stream->buffer+bytepos) |= (bit > 0) <<  (7 - bitpos);
-	stream->position++;
-	stream->numbits++;
+    int bytepos = stream->position >> 3; // divide by 8
+    int bitpos = stream->position & 7;
+    *(stream->buffer+bytepos) |= (bit > 0) <<  (7 - bitpos);
+    stream->position++;
+    stream->numbits++;
 }
 
 /**
 * Setup the FPGA to listen for samples. This method downloads the FPGA bitstream
 * if not already loaded, sets divisor and starts up the antenna.
 * @param divisor : 1, 88> 255 or negative ==> 134.8 KHz
-* 				   0 or 95 ==> 125 KHz
+*                  0 or 95 ==> 125 KHz
 *
 **/
 void LFSetupFPGAForADC(int divisor, bool lf_field) {
-	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-	if ( (divisor == 1) || (divisor < 0) || (divisor > 255) )
-		FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 88); //134.8Khz
-	else if (divisor == 0)
-		FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
-	else
-		FpgaSendCommand(FPGA_CMD_SET_DIVISOR, divisor);
+    FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
+    if ( (divisor == 1) || (divisor < 0) || (divisor > 255) )
+        FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 88); //134.8Khz
+    else if (divisor == 0)
+        FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
+    else
+        FpgaSendCommand(FPGA_CMD_SET_DIVISOR, divisor);
 
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | (lf_field ? FPGA_LF_ADC_READER_FIELD : 0));
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | (lf_field ? FPGA_LF_ADC_READER_FIELD : 0));
 
-	// Connect the A/D to the peak-detected low-frequency path.
-	SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
-	// 50ms for the resonant antenna to settle.
-	SpinDelay(50);
-	// Now set up the SSC to get the ADC samples that are now streaming at us.
-	FpgaSetupSsc();
-	// start a 1.5ticks is 1us
-	StartTicks();
+    // Connect the A/D to the peak-detected low-frequency path.
+    SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
+    // 50ms for the resonant antenna to settle.
+    SpinDelay(50);
+    // Now set up the SSC to get the ADC samples that are now streaming at us.
+    FpgaSetupSsc();
+    // start a 1.5ticks is 1us
+    StartTicks();
 }
 
 /**
@@ -118,97 +118,97 @@ void LFSetupFPGAForADC(int divisor, bool lf_field) {
  */
 uint32_t DoAcquisition(uint8_t decimation, uint32_t bits_per_sample, bool averaging, int trigger_threshold, bool silent, int bufsize, uint32_t cancel_after) {
 
-	uint8_t *dest = BigBuf_get_addr();
+    uint8_t *dest = BigBuf_get_addr();
     bufsize = (bufsize > 0 && bufsize < BigBuf_max_traceLen()) ? bufsize : BigBuf_max_traceLen();
 
-	if (bits_per_sample < 1) bits_per_sample = 1;
-	if (bits_per_sample > 8) bits_per_sample = 8;
+    if (bits_per_sample < 1) bits_per_sample = 1;
+    if (bits_per_sample > 8) bits_per_sample = 8;
 
-	if (decimation < 1) decimation = 1;
+    if (decimation < 1) decimation = 1;
 
-	// use a bit stream to handle the output
-	BitstreamOut data = { dest , 0, 0};
-	int sample_counter = 0;
-	uint8_t sample = 0;
+    // use a bit stream to handle the output
+    BitstreamOut data = { dest , 0, 0};
+    int sample_counter = 0;
+    uint8_t sample = 0;
 
-	// if we want to do averaging
-	uint32_t sample_sum =0 ;
-	uint32_t sample_total_numbers = 0;
-	uint32_t sample_total_saved = 0;
-	uint32_t cancel_counter = 0;
+    // if we want to do averaging
+    uint32_t sample_sum =0 ;
+    uint32_t sample_total_numbers = 0;
+    uint32_t sample_total_saved = 0;
+    uint32_t cancel_counter = 0;
 
-	while (!BUTTON_PRESS() && !usb_poll_validate_length() ) {
-		WDT_HIT();
+    while (!BUTTON_PRESS() && !usb_poll_validate_length() ) {
+        WDT_HIT();
 
-		if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
-			sample = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
+        if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
+            sample = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
 
-			// Testpoint 8 (TP8) can be used to trigger oscilliscope
-			LED_D_OFF();
+            // Testpoint 8 (TP8) can be used to trigger oscilliscope
+            LED_D_OFF();
 
-			// threshold either high or low values 128 = center 0.  if trigger = 178
-			if ((trigger_threshold > 0) && (sample < (trigger_threshold + 128)) && (sample > (128 - trigger_threshold))) {
-				if (cancel_after > 0) {
-					cancel_counter++;
-					if (cancel_after == cancel_counter)
-						break;
-				}
-				continue;
-			}
+            // threshold either high or low values 128 = center 0.  if trigger = 178
+            if ((trigger_threshold > 0) && (sample < (trigger_threshold + 128)) && (sample > (128 - trigger_threshold))) {
+                if (cancel_after > 0) {
+                    cancel_counter++;
+                    if (cancel_after == cancel_counter)
+                        break;
+                }
+                continue;
+            }
 
-			trigger_threshold = 0;
-			sample_total_numbers++;
+            trigger_threshold = 0;
+            sample_total_numbers++;
 
-			if (averaging)
-				sample_sum += sample;
+            if (averaging)
+                sample_sum += sample;
 
-			// check decimation
-			if (decimation > 1)	{
-				sample_counter++;
-				if (sample_counter < decimation) continue;
-				sample_counter = 0;
-			}
+            // check decimation
+            if (decimation > 1) {
+                sample_counter++;
+                if (sample_counter < decimation) continue;
+                sample_counter = 0;
+            }
 
-			// averaging
-			if (averaging && decimation > 1) {
-				sample = sample_sum / decimation;
-				sample_sum =0;
-			}
+            // averaging
+            if (averaging && decimation > 1) {
+                sample = sample_sum / decimation;
+                sample_sum =0;
+            }
 
-			// store the sample
-			sample_total_saved ++;
-			if (bits_per_sample == 8) {
-				dest[sample_total_saved-1] = sample;
+            // store the sample
+            sample_total_saved ++;
+            if (bits_per_sample == 8) {
+                dest[sample_total_saved-1] = sample;
 
-				// Get the return value correct
-				data.numbits = sample_total_saved << 3;
-				if (sample_total_saved >= bufsize) break;
+                // Get the return value correct
+                data.numbits = sample_total_saved << 3;
+                if (sample_total_saved >= bufsize) break;
 
-			} else {
-				pushBit(&data, sample & 0x80);
-				if (bits_per_sample > 1)	pushBit(&data, sample & 0x40);
-				if (bits_per_sample > 2)	pushBit(&data, sample & 0x20);
-				if (bits_per_sample > 3)	pushBit(&data, sample & 0x10);
-				if (bits_per_sample > 4)	pushBit(&data, sample & 0x08);
-				if (bits_per_sample > 5)	pushBit(&data, sample & 0x04);
-				if (bits_per_sample > 6)	pushBit(&data, sample & 0x02);
+            } else {
+                pushBit(&data, sample & 0x80);
+                if (bits_per_sample > 1) pushBit(&data, sample & 0x40);
+                if (bits_per_sample > 2) pushBit(&data, sample & 0x20);
+                if (bits_per_sample > 3) pushBit(&data, sample & 0x10);
+                if (bits_per_sample > 4) pushBit(&data, sample & 0x08);
+                if (bits_per_sample > 5) pushBit(&data, sample & 0x04);
+                if (bits_per_sample > 6) pushBit(&data, sample & 0x02);
 
-				if ((data.numbits >> 3) + 1 >= bufsize) break;
-			}
-		}
-	}
+                if ((data.numbits >> 3) + 1 >= bufsize) break;
+            }
+        }
+    }
 
-	if (!silent) {
-		Dbprintf("Done, saved %d out of %d seen samples at %d bits/sample", sample_total_saved, sample_total_numbers, bits_per_sample);
-		Dbprintf("buffer samples: %02x %02x %02x %02x %02x %02x %02x %02x ...",
-					dest[0], dest[1], dest[2], dest[3], dest[4], dest[5], dest[6], dest[7]);
-	}
+    if (!silent) {
+        Dbprintf("Done, saved %d out of %d seen samples at %d bits/sample", sample_total_saved, sample_total_numbers, bits_per_sample);
+        Dbprintf("buffer samples: %02x %02x %02x %02x %02x %02x %02x %02x ...",
+                    dest[0], dest[1], dest[2], dest[3], dest[4], dest[5], dest[6], dest[7]);
+    }
 
-	// Ensure that DC offset removal and noise check is performed for any device-side processing
-	removeSignalOffset(dest, bufsize);
-	computeSignalProperties(dest, bufsize);
+    // Ensure that DC offset removal and noise check is performed for any device-side processing
+    removeSignalOffset(dest, bufsize);
+    computeSignalProperties(dest, bufsize);
 
-	return data.numbits;
+    return data.numbits;
 }
 /**
  * @brief Does sample acquisition, ignoring the config values set in the sample_config.
@@ -219,27 +219,27 @@ uint32_t DoAcquisition(uint8_t decimation, uint32_t bits_per_sample, bool averag
  * @return number of bits sampled
  */
 uint32_t DoAcquisition_default(int trigger_threshold, bool silent) {
-	return DoAcquisition(1, 8, 0,trigger_threshold, silent, 0, 0);
+    return DoAcquisition(1, 8, 0,trigger_threshold, silent, 0, 0);
 }
 uint32_t DoAcquisition_config( bool silent, int sample_size) {
-	return DoAcquisition(config.decimation
-				  ,config.bits_per_sample
-				  ,config.averaging
-				  ,config.trigger_threshold
-				  ,silent
-				  ,sample_size
-				  ,0);
+    return DoAcquisition(config.decimation
+                  ,config.bits_per_sample
+                  ,config.averaging
+                  ,config.trigger_threshold
+                  ,silent
+                  ,sample_size
+                  ,0);
 }
 
 uint32_t DoPartialAcquisition(int trigger_threshold, bool silent, int sample_size, uint32_t cancel_after) {
-	return DoAcquisition(1, 8, 0, trigger_threshold, silent, sample_size, cancel_after);
+    return DoAcquisition(1, 8, 0, trigger_threshold, silent, sample_size, cancel_after);
 }
 
 uint32_t ReadLF(bool activeField, bool silent, int sample_size) {
-	if (!silent)
-		printConfig();
-	LFSetupFPGAForADC(config.divisor, activeField);
-	return DoAcquisition_config(silent, sample_size);
+    if (!silent)
+        printConfig();
+    LFSetupFPGAForADC(config.divisor, activeField);
+    return DoAcquisition_config(silent, sample_size);
 }
 
 /**
@@ -247,20 +247,20 @@ uint32_t ReadLF(bool activeField, bool silent, int sample_size) {
 * @return number of bits sampled
 **/
 uint32_t SampleLF(bool printCfg, int sample_size) {
-	BigBuf_Clear_ext(false);
-	uint32_t ret = ReadLF(true, printCfg, sample_size);
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	return ret;
+    BigBuf_Clear_ext(false);
+    uint32_t ret = ReadLF(true, printCfg, sample_size);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    return ret;
 }
 /**
 * Initializes the FPGA for snoop-mode (field off), and acquires the samples.
 * @return number of bits sampled
 **/
 uint32_t SnoopLF() {
-	BigBuf_Clear_ext(false);
-	uint32_t ret = ReadLF(false, true, 0);
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	return ret;
+    BigBuf_Clear_ext(false);
+    uint32_t ret = ReadLF(false, true, 0);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    return ret;
 }
 
 /**
@@ -269,61 +269,61 @@ uint32_t SnoopLF() {
 **/
 void doT55x7Acquisition(size_t sample_size) {
 
-	#define T55xx_READ_UPPER_THRESHOLD 128+60  // 60 grph
-	#define T55xx_READ_LOWER_THRESHOLD 128-60  // -60 grph
-	#define T55xx_READ_TOL   5
+    #define T55xx_READ_UPPER_THRESHOLD 128+60  // 60 grph
+    #define T55xx_READ_LOWER_THRESHOLD 128-60  // -60 grph
+    #define T55xx_READ_TOL   5
 
-	uint8_t *dest = BigBuf_get_addr();
-	uint16_t bufsize = BigBuf_max_traceLen();
+    uint8_t *dest = BigBuf_get_addr();
+    uint16_t bufsize = BigBuf_max_traceLen();
 
-	if ( bufsize > sample_size )
-		bufsize = sample_size;
+    if ( bufsize > sample_size )
+        bufsize = sample_size;
 
-	uint8_t curSample = 0, lastSample = 0;
-	uint16_t i = 0, skipCnt = 0;
-	bool startFound = false;
-	bool highFound = false;
-	bool lowFound = false;
+    uint8_t curSample = 0, lastSample = 0;
+    uint16_t i = 0, skipCnt = 0;
+    bool startFound = false;
+    bool highFound = false;
+    bool lowFound = false;
 
-	while(!BUTTON_PRESS() && !usb_poll_validate_length() && skipCnt < 1000 && (i < bufsize) ) {
-		WDT_HIT();
+    while(!BUTTON_PRESS() && !usb_poll_validate_length() && skipCnt < 1000 && (i < bufsize) ) {
+        WDT_HIT();
 
 
-		if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
-			curSample = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
-			LED_D_OFF();
+        if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
+            curSample = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
+            LED_D_OFF();
 
-			// skip until the first high sample above threshold
-			if (!startFound && curSample > T55xx_READ_UPPER_THRESHOLD) {
-				//if (curSample > lastSample)
-				//	lastSample = curSample;
-				highFound = true;
-			} else if (!highFound) {
-				skipCnt++;
-				continue;
-			}
-			// skip until the first low sample below threshold
-			if (!startFound && curSample < T55xx_READ_LOWER_THRESHOLD) {
-				//if (curSample > lastSample)
-				lastSample = curSample;
-				lowFound = true;
-			} else if (!lowFound) {
-				skipCnt++;
-				continue;
-			}
+            // skip until the first high sample above threshold
+            if (!startFound && curSample > T55xx_READ_UPPER_THRESHOLD) {
+                //if (curSample > lastSample)
+                // lastSample = curSample;
+                highFound = true;
+            } else if (!highFound) {
+                skipCnt++;
+                continue;
+            }
+            // skip until the first low sample below threshold
+            if (!startFound && curSample < T55xx_READ_LOWER_THRESHOLD) {
+                //if (curSample > lastSample)
+                lastSample = curSample;
+                lowFound = true;
+            } else if (!lowFound) {
+                skipCnt++;
+                continue;
+            }
 
-			// skip until first high samples begin to change
-			if (startFound || curSample > T55xx_READ_LOWER_THRESHOLD + T55xx_READ_TOL){
-				// if just found start - recover last sample
-				if (!startFound) {
-					dest[i++] = lastSample;
-					startFound = true;
-				}
-				// collect samples
-				dest[i++] = curSample;
-			}
-		}
-	}
+            // skip until first high samples begin to change
+            if (startFound || curSample > T55xx_READ_LOWER_THRESHOLD + T55xx_READ_TOL){
+                // if just found start - recover last sample
+                if (!startFound) {
+                    dest[i++] = lastSample;
+                    startFound = true;
+                }
+                // collect samples
+                dest[i++] = curSample;
+            }
+        }
+    }
 }
 /**
 * acquisition of Cotag LF signal. Similart to other LF,  since the Cotag has such long datarate RF/384
@@ -339,117 +339,117 @@ void doT55x7Acquisition(size_t sample_size) {
 #endif
 void doCotagAcquisition(size_t sample_size) {
 
-	uint8_t *dest = BigBuf_get_addr();
-	uint16_t bufsize = BigBuf_max_traceLen();
+    uint8_t *dest = BigBuf_get_addr();
+    uint16_t bufsize = BigBuf_max_traceLen();
 
-	if ( bufsize > sample_size )
-		bufsize = sample_size;
+    if ( bufsize > sample_size )
+        bufsize = sample_size;
 
-	dest[0] = 0;
-	uint8_t sample = 0, firsthigh = 0, firstlow = 0;
-	uint16_t i = 0;
-	uint16_t noise_counter = 0;
+    dest[0] = 0;
+    uint8_t sample = 0, firsthigh = 0, firstlow = 0;
+    uint16_t i = 0;
+    uint16_t noise_counter = 0;
 
-	while (!BUTTON_PRESS() && !usb_poll_validate_length() && (i < bufsize) && (noise_counter < (COTAG_T1 << 1)) ) {
-		WDT_HIT();
+    while (!BUTTON_PRESS() && !usb_poll_validate_length() && (i < bufsize) && (noise_counter < (COTAG_T1 << 1)) ) {
+        WDT_HIT();
 
-		if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
-			sample = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
-			LED_D_OFF();
+        if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
+            sample = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
+            LED_D_OFF();
 
-			// find first peak
-			if ( !firsthigh ) {
-				if (sample < COTAG_ONE_THRESHOLD) {
-					noise_counter++;
-					continue;
-				}
-				noise_counter = 0;
-				firsthigh = 1;
-			}
-			if ( !firstlow ){
-				if (sample > COTAG_ZERO_THRESHOLD ) {
-					noise_counter++;
-					continue;
-				}
-				noise_counter = 0;
-				firstlow = 1;
-			}
+            // find first peak
+            if ( !firsthigh ) {
+                if (sample < COTAG_ONE_THRESHOLD) {
+                    noise_counter++;
+                    continue;
+                }
+                noise_counter = 0;
+                firsthigh = 1;
+            }
+            if ( !firstlow ){
+                if (sample > COTAG_ZERO_THRESHOLD ) {
+                    noise_counter++;
+                    continue;
+                }
+                noise_counter = 0;
+                firstlow = 1;
+            }
 
-			++i;
+            ++i;
 
-			if ( sample > COTAG_ONE_THRESHOLD)
-				dest[i] = 255;
-			else if ( sample < COTAG_ZERO_THRESHOLD)
-				dest[i] = 0;
-			else
-				dest[i] = dest[i-1];
-		}
-	}
+            if ( sample > COTAG_ONE_THRESHOLD)
+                dest[i] = 255;
+            else if ( sample < COTAG_ZERO_THRESHOLD)
+                dest[i] = 0;
+            else
+                dest[i] = dest[i-1];
+        }
+    }
 }
 
 uint32_t doCotagAcquisitionManchester() {
 
-	uint8_t *dest = BigBuf_get_addr();
-	uint16_t bufsize = BigBuf_max_traceLen();
+    uint8_t *dest = BigBuf_get_addr();
+    uint16_t bufsize = BigBuf_max_traceLen();
 
-	if ( bufsize > COTAG_BITS )
-		bufsize = COTAG_BITS;
+    if ( bufsize > COTAG_BITS )
+        bufsize = COTAG_BITS;
 
-	dest[0] = 0;
-	uint8_t sample = 0, firsthigh = 0, firstlow = 0;
-	uint16_t sample_counter = 0, period = 0;
-	uint8_t curr = 0, prev = 0;
-	uint16_t noise_counter = 0;
+    dest[0] = 0;
+    uint8_t sample = 0, firsthigh = 0, firstlow = 0;
+    uint16_t sample_counter = 0, period = 0;
+    uint8_t curr = 0, prev = 0;
+    uint16_t noise_counter = 0;
 
-	while (!BUTTON_PRESS() && !usb_poll_validate_length() && (sample_counter < bufsize)  && (noise_counter < (COTAG_T1 << 1)) ) {
-		WDT_HIT();
+    while (!BUTTON_PRESS() && !usb_poll_validate_length() && (sample_counter < bufsize)  && (noise_counter < (COTAG_T1 << 1)) ) {
+        WDT_HIT();
 
-		if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
-			sample = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
-			LED_D_OFF();
+        if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
+            sample = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
+            LED_D_OFF();
 
-			// find first peak
-			if ( !firsthigh ) {
-				if (sample < COTAG_ONE_THRESHOLD) {
-					noise_counter++;
-					continue;
-				}
-				noise_counter = 0;
-				firsthigh = 1;
-			}
+            // find first peak
+            if ( !firsthigh ) {
+                if (sample < COTAG_ONE_THRESHOLD) {
+                    noise_counter++;
+                    continue;
+                }
+                noise_counter = 0;
+                firsthigh = 1;
+            }
 
-			if ( !firstlow ){
-				if (sample > COTAG_ZERO_THRESHOLD ) {
-					noise_counter++;
-					continue;
-				}
-				noise_counter = 0;
-				firstlow = 1;
-			}
+            if ( !firstlow ){
+                if (sample > COTAG_ZERO_THRESHOLD ) {
+                    noise_counter++;
+                    continue;
+                }
+                noise_counter = 0;
+                firstlow = 1;
+            }
 
-			// set sample 255, 0,  or previous
-			if ( sample > COTAG_ONE_THRESHOLD){
-				prev = curr;
-				curr = 1;
-			}
-			else if ( sample < COTAG_ZERO_THRESHOLD) {
-				prev = curr;
-				curr = 0;
-			}
-			else {
-				curr = prev;
-			}
+            // set sample 255, 0,  or previous
+            if ( sample > COTAG_ONE_THRESHOLD){
+                prev = curr;
+                curr = 1;
+            }
+            else if ( sample < COTAG_ZERO_THRESHOLD) {
+                prev = curr;
+                curr = 0;
+            }
+            else {
+                curr = prev;
+            }
 
-			// full T1 periods,
-			if ( period > 0 ) {
-				--period;
-				continue;
-			}
+            // full T1 periods,
+            if ( period > 0 ) {
+                --period;
+                continue;
+            }
 
-			dest[sample_counter] = curr;
-			++sample_counter;
-			period = COTAG_T1;
-		}
-	}
-	return sample_counter;
+            dest[sample_counter] = curr;
+            ++sample_counter;
+            period = COTAG_T1;
+        }
+    }
+    return sample_counter;
 }
diff --git a/armsrc/lfsampling.h b/armsrc/lfsampling.h
index aadf0a822..15510198a 100644
--- a/armsrc/lfsampling.h
+++ b/armsrc/lfsampling.h
@@ -5,8 +5,8 @@
 #include "apps.h"
 #include "util.h"
 #include "string.h"
-#include "usb_cdc.h"	// for usb_poll_validate_length
-#include "ticks.h"		// for StartTicks
+#include "usb_cdc.h" // for usb_poll_validate_length
+#include "ticks.h"   // for StartTicks
 
 typedef struct BitstreamOut BitstreamOut;
 
@@ -60,7 +60,7 @@ uint32_t DoAcquisition_config(bool silent, int sample_size);
 * Setup the FPGA to listen for samples. This method downloads the FPGA bitstream
 * if not already loaded, sets divisor and starts up the antenna.
 * @param divisor : 1, 88> 255 or negative ==> 134.8 KHz
-* 				   0 or 95 ==> 125 KHz
+*                  0 or 95 ==> 125 KHz
 *
 **/
 void LFSetupFPGAForADC(int divisor, bool lf_field);
diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index a10925da7..4889afce0 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -17,18 +17,18 @@
 #include <inttypes.h>
 
 #ifndef HARDNESTED_AUTHENTICATION_TIMEOUT
-# define HARDNESTED_AUTHENTICATION_TIMEOUT  848			// card times out 1ms after wrong authentication (according to NXP documentation)
+# define HARDNESTED_AUTHENTICATION_TIMEOUT  848     // card times out 1ms after wrong authentication (according to NXP documentation)
 #endif
 #ifndef HARDNESTED_PRE_AUTHENTICATION_LEADTIME
-# define HARDNESTED_PRE_AUTHENTICATION_LEADTIME 400		// some (non standard) cards need a pause after select before they are ready for first authentication
+# define HARDNESTED_PRE_AUTHENTICATION_LEADTIME 400 // some (non standard) cards need a pause after select before they are ready for first authentication
 #endif
 
 // send an incomplete dummy response in order to trigger the card's authentication failure timeout
 #ifndef CHK_TIMEOUT
 # define CHK_TIMEOUT() { \
-	ReaderTransmit(&dummy_answer, 1, NULL); \
-	uint32_t timeout = GetCountSspClk() + HARDNESTED_AUTHENTICATION_TIMEOUT; \
-	while (GetCountSspClk() < timeout) {}; \
+    ReaderTransmit(&dummy_answer, 1, NULL); \
+    uint32_t timeout = GetCountSspClk() + HARDNESTED_AUTHENTICATION_TIMEOUT; \
+    while (GetCountSspClk() < timeout) {}; \
  }
 #endif
 
@@ -41,94 +41,94 @@ static uint8_t dummy_answer = 0;
 void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
 {
   // params
-	uint8_t blockNo = arg0;
-	uint8_t keyType = arg1;
-	uint64_t ui64Key = 0;
-	ui64Key = bytes_to_num(datain, 6);
+    uint8_t blockNo = arg0;
+    uint8_t keyType = arg1;
+    uint64_t ui64Key = 0;
+    ui64Key = bytes_to_num(datain, 6);
 
-	// variables
-	byte_t isOK = 0;
-	byte_t dataoutbuf[16] = {0x00};
-	uint8_t uid[10] = {0x00};
-	uint32_t cuid = 0;
-	struct Crypto1State mpcs = {0, 0};
-	struct Crypto1State *pcs;
-	pcs = &mpcs;
+    // variables
+    byte_t isOK = 0;
+    byte_t dataoutbuf[16] = {0x00};
+    uint8_t uid[10] = {0x00};
+    uint32_t cuid = 0;
+    struct Crypto1State mpcs = {0, 0};
+    struct Crypto1State *pcs;
+    pcs = &mpcs;
 
-	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+    iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
 
-	clear_trace();
-	set_tracing(true);
+    clear_trace();
+    set_tracing(true);
 
-	LED_A_ON();
-	LED_B_OFF();
-	LED_C_OFF();
+    LED_A_ON();
+    LED_B_OFF();
+    LED_C_OFF();
 
-	while (true) {
-		if(!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
-			if (MF_DBGLEVEL >= 1)	Dbprintf("Can't select card");
-			break;
-		};
+    while (true) {
+        if(!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
+            if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
+            break;
+        };
 
-		if(mifare_classic_auth(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST)) {
-			if (MF_DBGLEVEL >= 1)	Dbprintf("Auth error");
-			break;
-		};
+        if(mifare_classic_auth(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST)) {
+            if (MF_DBGLEVEL >= 1) Dbprintf("Auth error");
+            break;
+        };
 
-		if(mifare_classic_readblock(pcs, cuid, blockNo, dataoutbuf)) {
-			if (MF_DBGLEVEL >= 1)	Dbprintf("Read block error");
-			break;
-		};
+        if(mifare_classic_readblock(pcs, cuid, blockNo, dataoutbuf)) {
+            if (MF_DBGLEVEL >= 1) Dbprintf("Read block error");
+            break;
+        };
 
-		if(mifare_classic_halt(pcs, cuid)) {
-			if (MF_DBGLEVEL >= 1)	Dbprintf("Halt error");
-			break;
-		};
+        if(mifare_classic_halt(pcs, cuid)) {
+            if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
+            break;
+        };
 
-		isOK = 1;
-		break;
-	}
+        isOK = 1;
+        break;
+    }
 
-	crypto1_destroy(pcs);
+    crypto1_destroy(pcs);
 
-	if (MF_DBGLEVEL >= 2)	DbpString("READ BLOCK FINISHED");
+    if (MF_DBGLEVEL >= 2) DbpString("READ BLOCK FINISHED");
 
-	LED_B_ON();
-	cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,16);
-	LED_B_OFF();
+    LED_B_ON();
+    cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,16);
+    LED_B_OFF();
 
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	LEDsoff();
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    LEDsoff();
 }
 
 void MifareUC_Auth(uint8_t arg0, uint8_t *keybytes){
 
-	bool turnOffField = (arg0 == 1);
+    bool turnOffField = (arg0 == 1);
 
-	LED_A_ON(); LED_B_OFF(); LED_C_OFF();
+    LED_A_ON(); LED_B_OFF(); LED_C_OFF();
 
-	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+    iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
 
-	clear_trace();
-	set_tracing(true);
+    clear_trace();
+    set_tracing(true);
 
-	if(!iso14443a_select_card(NULL, NULL, NULL, true, 0, true)) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card");
-		OnError(0);
-		return;
-	};
+    if(!iso14443a_select_card(NULL, NULL, NULL, true, 0, true)) {
+        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card");
+        OnError(0);
+        return;
+    };
 
-	if(!mifare_ultra_auth(keybytes)){
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication failed");
-		OnError(1);
-		return;
-	}
+    if(!mifare_ultra_auth(keybytes)){
+        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication failed");
+        OnError(1);
+        return;
+    }
 
-	if (turnOffField) {
-		FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-		LEDsoff();
-	}
-	cmd_send(CMD_ACK,1,0,0,0,0);
+    if (turnOffField) {
+        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+        LEDsoff();
+    }
+    cmd_send(CMD_ACK,1,0,0,0,0);
 }
 
 // Arg0 = BlockNo,
@@ -136,62 +136,62 @@ void MifareUC_Auth(uint8_t arg0, uint8_t *keybytes){
 // datain = PWD bytes,
 void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)
 {
-	uint8_t blockNo = arg0;
-	byte_t dataout[16] = {0x00};
-	bool useKey = (arg1 == 1); //UL_C
-	bool usePwd = (arg1 == 2); //UL_EV1/NTAG
+    uint8_t blockNo = arg0;
+    byte_t dataout[16] = {0x00};
+    bool useKey = (arg1 == 1); //UL_C
+    bool usePwd = (arg1 == 2); //UL_EV1/NTAG
 
-	LEDsoff();
-	LED_A_ON();
-	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+    LEDsoff();
+    LED_A_ON();
+    iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
 
-	clear_trace();
-	set_tracing(true);
+    clear_trace();
+    set_tracing(true);
 
-	int len = iso14443a_select_card(NULL, NULL, NULL, true, 0, true);
-	if(!len) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card (RC:%02X)",len);
-		OnError(1);
-		return;
-	}
+    int len = iso14443a_select_card(NULL, NULL, NULL, true, 0, true);
+    if(!len) {
+        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card (RC:%02X)",len);
+        OnError(1);
+        return;
+    }
 
-	// UL-C authentication
-	if ( useKey ) {
-		uint8_t key[16] = {0x00};
-		memcpy(key, datain, sizeof(key) );
+    // UL-C authentication
+    if ( useKey ) {
+        uint8_t key[16] = {0x00};
+        memcpy(key, datain, sizeof(key) );
 
-		if ( !mifare_ultra_auth(key) ) {
-			OnError(1);
-			return;
-		}
-	}
+        if ( !mifare_ultra_auth(key) ) {
+            OnError(1);
+            return;
+        }
+    }
 
-	// UL-EV1 / NTAG authentication
-	if ( usePwd ) {
-		uint8_t pwd[4] = {0x00};
-		memcpy(pwd, datain, 4);
-		uint8_t pack[4] = {0,0,0,0};
-		if (!mifare_ul_ev1_auth(pwd, pack)) {
-			OnError(1);
-			return;
-		}
-	}
+    // UL-EV1 / NTAG authentication
+    if ( usePwd ) {
+        uint8_t pwd[4] = {0x00};
+        memcpy(pwd, datain, 4);
+        uint8_t pack[4] = {0,0,0,0};
+        if (!mifare_ul_ev1_auth(pwd, pack)) {
+            OnError(1);
+            return;
+        }
+    }
 
-	if( mifare_ultra_readblock(blockNo, dataout) ) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Read block error");
-		OnError(2);
-		return;
-	}
+    if( mifare_ultra_readblock(blockNo, dataout) ) {
+        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Read block error");
+        OnError(2);
+        return;
+    }
 
-	if( mifare_ultra_halt() ) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Halt error");
-		OnError(3);
-		return;
-	}
+    if( mifare_ultra_halt() ) {
+        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Halt error");
+        OnError(3);
+        return;
+    }
 
     cmd_send(CMD_ACK,1,0,0,dataout,16);
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	LEDsoff();
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    LEDsoff();
 }
 
 //-----------------------------------------------------------------------------
@@ -201,64 +201,64 @@ void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)
 void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
 {
   // params
-	uint8_t sectorNo = arg0;
-	uint8_t keyType = arg1;
-	uint64_t ui64Key = 0;
-	ui64Key = bytes_to_num(datain, 6);
+    uint8_t sectorNo = arg0;
+    uint8_t keyType = arg1;
+    uint64_t ui64Key = 0;
+    ui64Key = bytes_to_num(datain, 6);
 
-	// variables
-	byte_t isOK = 0;
-	byte_t dataoutbuf[16 * 16];
-	uint8_t uid[10] = {0x00};
-	uint32_t cuid = 0;
-	struct Crypto1State mpcs = {0, 0};
-	struct Crypto1State *pcs;
-	pcs = &mpcs;
+    // variables
+    byte_t isOK = 0;
+    byte_t dataoutbuf[16 * 16];
+    uint8_t uid[10] = {0x00};
+    uint32_t cuid = 0;
+    struct Crypto1State mpcs = {0, 0};
+    struct Crypto1State *pcs;
+    pcs = &mpcs;
 
-	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+    iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
 
-	clear_trace();
-	set_tracing(true);
+    clear_trace();
+    set_tracing(true);
 
-	LED_A_ON();
-	LED_B_OFF();
-	LED_C_OFF();
+    LED_A_ON();
+    LED_B_OFF();
+    LED_C_OFF();
 
-	isOK = 1;
-	if(!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
-		isOK = 0;
-		if (MF_DBGLEVEL >= 1)	Dbprintf("Can't select card");
-	}
+    isOK = 1;
+    if(!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
+        isOK = 0;
+        if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
+    }
 
 
-	if(isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_FIRST)) {
-		isOK = 0;
-		if (MF_DBGLEVEL >= 1)	Dbprintf("Auth error");
-	}
+    if(isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_FIRST)) {
+        isOK = 0;
+        if (MF_DBGLEVEL >= 1) Dbprintf("Auth error");
+    }
 
-	for (uint8_t blockNo = 0; isOK && blockNo < NumBlocksPerSector(sectorNo); blockNo++) {
-		if(mifare_classic_readblock(pcs, cuid, FirstBlockOfSector(sectorNo) + blockNo, dataoutbuf + 16 * blockNo)) {
-			isOK = 0;
-			if (MF_DBGLEVEL >= 1)	Dbprintf("Read sector %2d block %2d error", sectorNo, blockNo);
-			break;
-		}
-	}
+    for (uint8_t blockNo = 0; isOK && blockNo < NumBlocksPerSector(sectorNo); blockNo++) {
+        if(mifare_classic_readblock(pcs, cuid, FirstBlockOfSector(sectorNo) + blockNo, dataoutbuf + 16 * blockNo)) {
+            isOK = 0;
+            if (MF_DBGLEVEL >= 1) Dbprintf("Read sector %2d block %2d error", sectorNo, blockNo);
+            break;
+        }
+    }
 
-	if(mifare_classic_halt(pcs, cuid)) {
-		if (MF_DBGLEVEL >= 1)	Dbprintf("Halt error");
-	}
+    if(mifare_classic_halt(pcs, cuid)) {
+        if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
+    }
 
-	if (MF_DBGLEVEL >= 2) DbpString("READ SECTOR FINISHED");
+    if (MF_DBGLEVEL >= 2) DbpString("READ SECTOR FINISHED");
 
-	crypto1_destroy(pcs);
+    crypto1_destroy(pcs);
 
-	LED_B_ON();
-	cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,16*NumBlocksPerSector(sectorNo));
-	LED_B_OFF();
+    LED_B_ON();
+    cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,16*NumBlocksPerSector(sectorNo));
+    LED_B_OFF();
 
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	LEDsoff();
-	set_tracing(false);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    LEDsoff();
+    set_tracing(false);
 }
 
 // arg0 = blockNo (start)
@@ -267,97 +267,97 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
 // datain = KEY bytes
 void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
 {
-	LEDsoff();
-	LED_A_ON();
-	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+    LEDsoff();
+    LED_A_ON();
+    iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
 
-	// free eventually allocated BigBuf memory
-	BigBuf_free(); BigBuf_Clear_ext(false);
-	clear_trace();
-	set_tracing(true);
+    // free eventually allocated BigBuf memory
+    BigBuf_free(); BigBuf_Clear_ext(false);
+    clear_trace();
+    set_tracing(true);
 
-	// params
-	uint8_t blockNo = arg0;
-	uint16_t blocks = arg1;
-	bool useKey = (arg2 == 1); //UL_C
-	bool usePwd = (arg2 == 2); //UL_EV1/NTAG
-	uint32_t countblocks = 0;
-	uint8_t *dataout = BigBuf_malloc(CARD_MEMORY_SIZE);
-	if (dataout == NULL){
-		Dbprintf("out of memory");
-		OnError(1);
-		return;
-	}
+    // params
+    uint8_t blockNo = arg0;
+    uint16_t blocks = arg1;
+    bool useKey = (arg2 == 1); //UL_C
+    bool usePwd = (arg2 == 2); //UL_EV1/NTAG
+    uint32_t countblocks = 0;
+    uint8_t *dataout = BigBuf_malloc(CARD_MEMORY_SIZE);
+    if (dataout == NULL){
+        Dbprintf("out of memory");
+        OnError(1);
+        return;
+    }
 
-	int len = iso14443a_select_card(NULL, NULL, NULL, true, 0, true);
-	if (!len) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card (RC:%d)",len);
-		OnError(1);
-		return;
-	}
+    int len = iso14443a_select_card(NULL, NULL, NULL, true, 0, true);
+    if (!len) {
+        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card (RC:%d)",len);
+        OnError(1);
+        return;
+    }
 
-	// UL-C authentication
-	if ( useKey ) {
-		uint8_t key[16] = {0x00};
-		memcpy(key, datain, sizeof(key) );
+    // UL-C authentication
+    if ( useKey ) {
+        uint8_t key[16] = {0x00};
+        memcpy(key, datain, sizeof(key) );
 
-		if ( !mifare_ultra_auth(key) ) {
-			OnError(1);
-			return;
-		}
-	}
+        if ( !mifare_ultra_auth(key) ) {
+            OnError(1);
+            return;
+        }
+    }
 
-	// UL-EV1 / NTAG authentication
-	if (usePwd) {
-		uint8_t pwd[4] = {0x00};
-		memcpy(pwd, datain, sizeof(pwd));
-		uint8_t pack[4] = {0,0,0,0};
+    // UL-EV1 / NTAG authentication
+    if (usePwd) {
+        uint8_t pwd[4] = {0x00};
+        memcpy(pwd, datain, sizeof(pwd));
+        uint8_t pack[4] = {0,0,0,0};
 
-		if (!mifare_ul_ev1_auth(pwd, pack)){
-			OnError(1);
-			return;
-		}
-	}
+        if (!mifare_ul_ev1_auth(pwd, pack)){
+            OnError(1);
+            return;
+        }
+    }
 
-	for (int i = 0; i < blocks; i++){
-		if ((i*4) + 4 >= CARD_MEMORY_SIZE) {
-			Dbprintf("Data exceeds buffer!!");
-			break;
-		}
+    for (int i = 0; i < blocks; i++){
+        if ((i*4) + 4 >= CARD_MEMORY_SIZE) {
+            Dbprintf("Data exceeds buffer!!");
+            break;
+        }
 
-		len = mifare_ultra_readblock(blockNo + i, dataout + 4 * i);
+        len = mifare_ultra_readblock(blockNo + i, dataout + 4 * i);
 
-		if (len) {
-			if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Read block %d error",i);
-			// if no blocks read - error out
-			if (i == 0) {
-				OnError(2);
-				return;
-			} else {
-				//stop at last successful read block and return what we got
-				break;
-			}
-		} else {
-			countblocks++;
-		}
-	}
+        if (len) {
+            if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Read block %d error",i);
+            // if no blocks read - error out
+            if (i == 0) {
+                OnError(2);
+                return;
+            } else {
+                //stop at last successful read block and return what we got
+                break;
+            }
+        } else {
+            countblocks++;
+        }
+    }
 
-	len = mifare_ultra_halt();
-	if (len) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Halt error");
-		OnError(3);
-		return;
-	}
+    len = mifare_ultra_halt();
+    if (len) {
+        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Halt error");
+        OnError(3);
+        return;
+    }
 
-	if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Blocks read %d", countblocks);
+    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Blocks read %d", countblocks);
 
-	countblocks *= 4;
+    countblocks *= 4;
 
-	cmd_send(CMD_ACK, 1, countblocks, BigBuf_max_traceLen(), 0, 0);
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	LEDsoff();
-	BigBuf_free();
-	set_tracing(false);
+    cmd_send(CMD_ACK, 1, countblocks, BigBuf_max_traceLen(), 0, 0);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    LEDsoff();
+    BigBuf_free();
+    set_tracing(false);
 }
 
 //-----------------------------------------------------------------------------
@@ -366,106 +366,106 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
 //-----------------------------------------------------------------------------
 void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
 {
-	// params
-	uint8_t blockNo = arg0;
-	uint8_t keyType = arg1;
-	uint64_t ui64Key = 0;
-	byte_t blockdata[16] = {0x00};
+    // params
+    uint8_t blockNo = arg0;
+    uint8_t keyType = arg1;
+    uint64_t ui64Key = 0;
+    byte_t blockdata[16] = {0x00};
 
-	ui64Key = bytes_to_num(datain, 6);
-	memcpy(blockdata, datain + 10, 16);
+    ui64Key = bytes_to_num(datain, 6);
+    memcpy(blockdata, datain + 10, 16);
 
-	// variables
-	byte_t isOK = 0;
-	uint8_t uid[10] = {0x00};
-	uint32_t cuid = 0;
-	struct Crypto1State mpcs = {0, 0};
-	struct Crypto1State *pcs;
-	pcs = &mpcs;
+    // variables
+    byte_t isOK = 0;
+    uint8_t uid[10] = {0x00};
+    uint32_t cuid = 0;
+    struct Crypto1State mpcs = {0, 0};
+    struct Crypto1State *pcs;
+    pcs = &mpcs;
 
-	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+    iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
 
-	clear_trace();
-	set_tracing(true);
+    clear_trace();
+    set_tracing(true);
 
-	LED_A_ON();
-	LED_B_OFF();
-	LED_C_OFF();
+    LED_A_ON();
+    LED_B_OFF();
+    LED_C_OFF();
 
-	while (true) {
-		if(!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
-			if (MF_DBGLEVEL >= 1)	Dbprintf("Can't select card");
-			break;
-		};
+    while (true) {
+        if(!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
+            if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
+            break;
+        };
 
-		if(mifare_classic_auth(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST)) {
-			if (MF_DBGLEVEL >= 1)	Dbprintf("Auth error");
-			break;
-		};
+        if(mifare_classic_auth(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST)) {
+            if (MF_DBGLEVEL >= 1) Dbprintf("Auth error");
+            break;
+        };
 
-		if(mifare_classic_writeblock(pcs, cuid, blockNo, blockdata)) {
-			if (MF_DBGLEVEL >= 1)	Dbprintf("Write block error");
-			break;
-		};
+        if(mifare_classic_writeblock(pcs, cuid, blockNo, blockdata)) {
+            if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
+            break;
+        };
 
-		if(mifare_classic_halt(pcs, cuid)) {
-			if (MF_DBGLEVEL >= 1)	Dbprintf("Halt error");
-			break;
-		};
+        if(mifare_classic_halt(pcs, cuid)) {
+            if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
+            break;
+        };
 
-		isOK = 1;
-		break;
-	}
+        isOK = 1;
+        break;
+    }
 
-	crypto1_destroy(pcs);
+    crypto1_destroy(pcs);
 
-	if (MF_DBGLEVEL >= 2)	DbpString("WRITE BLOCK FINISHED");
+    if (MF_DBGLEVEL >= 2) DbpString("WRITE BLOCK FINISHED");
 
-	cmd_send(CMD_ACK,isOK,0,0,0,0);
+    cmd_send(CMD_ACK,isOK,0,0,0,0);
 
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	LEDsoff();
-	set_tracing(false);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    LEDsoff();
+    set_tracing(false);
 }
 
 /* // Command not needed but left for future testing
 void MifareUWriteBlockCompat(uint8_t arg0, uint8_t *datain)
 {
-	uint8_t blockNo = arg0;
-	byte_t blockdata[16] = {0x00};
+    uint8_t blockNo = arg0;
+    byte_t blockdata[16] = {0x00};
 
-	memcpy(blockdata, datain, 16);
+    memcpy(blockdata, datain, 16);
 
-	uint8_t uid[10] = {0x00};
+    uint8_t uid[10] = {0x00};
 
-	LED_A_ON(); LED_B_OFF(); LED_C_OFF();
+    LED_A_ON(); LED_B_OFF(); LED_C_OFF();
 
-	clear_trace();
-	set_tracing(true);
-	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+    clear_trace();
+    set_tracing(true);
+    iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
 
-	if(!iso14443a_select_card(uid, NULL, NULL, true, 0, true)) {
-		if (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");
-		OnError(0);
-		return;
-	};
+    if(!iso14443a_select_card(uid, NULL, NULL, true, 0, true)) {
+        if (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");
+        OnError(0);
+        return;
+    };
 
-	if(mifare_ultra_writeblock_compat(blockNo, blockdata)) {
-		if (MF_DBGLEVEL >= 1)   Dbprintf("Write block error");
-		OnError(0);
-		return;	};
+    if(mifare_ultra_writeblock_compat(blockNo, blockdata)) {
+        if (MF_DBGLEVEL >= 1)   Dbprintf("Write block error");
+        OnError(0);
+        return; };
 
-	if(mifare_ultra_halt()) {
-		if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");
-		OnError(0);
-		return;
-	};
+    if(mifare_ultra_halt()) {
+        if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");
+        OnError(0);
+        return;
+    };
 
-	if (MF_DBGLEVEL >= 2)   DbpString("WRITE BLOCK FINISHED");
+    if (MF_DBGLEVEL >= 2)   DbpString("WRITE BLOCK FINISHED");
 
-	cmd_send(CMD_ACK,1,0,0,0,0);
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	LEDsoff();
+    cmd_send(CMD_ACK,1,0,0,0,0);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    LEDsoff();
 }
 */
 
@@ -477,238 +477,238 @@ void MifareUWriteBlockCompat(uint8_t arg0, uint8_t *datain)
 //        : 4/16 next bytes is authentication key.
 void MifareUWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)
 {
-	uint8_t blockNo = arg0;
-	bool useKey = (arg1 == 1); //UL_C
-	bool usePwd = (arg1 == 2); //UL_EV1/NTAG
-	byte_t blockdata[4] = {0x00};
+    uint8_t blockNo = arg0;
+    bool useKey = (arg1 == 1); //UL_C
+    bool usePwd = (arg1 == 2); //UL_EV1/NTAG
+    byte_t blockdata[4] = {0x00};
 
-	memcpy(blockdata, datain, 4);
+    memcpy(blockdata, datain, 4);
 
-	LEDsoff();
-	LED_A_ON();
-	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+    LEDsoff();
+    LED_A_ON();
+    iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
 
-	clear_trace();
-	set_tracing(true);
+    clear_trace();
+    set_tracing(true);
 
-	if (!iso14443a_select_card(NULL, NULL, NULL, true, 0, true)) {
-		if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
-		OnError(0);
-		return;
-	};
+    if (!iso14443a_select_card(NULL, NULL, NULL, true, 0, true)) {
+        if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
+        OnError(0);
+        return;
+    };
 
-	// UL-C authentication
-	if ( useKey ) {
-		uint8_t key[16] = {0x00};
-		memcpy(key, datain+4, sizeof(key) );
+    // UL-C authentication
+    if ( useKey ) {
+        uint8_t key[16] = {0x00};
+        memcpy(key, datain+4, sizeof(key) );
 
-		if ( !mifare_ultra_auth(key) ) {
-			OnError(1);
-			return;
-		}
-	}
+        if ( !mifare_ultra_auth(key) ) {
+            OnError(1);
+            return;
+        }
+    }
 
-	// UL-EV1 / NTAG authentication
-	if (usePwd) {
-		uint8_t pwd[4] = {0x00};
-		memcpy(pwd, datain+4, 4);
-		uint8_t pack[4] = {0,0,0,0};
-		if (!mifare_ul_ev1_auth(pwd, pack)) {
-			OnError(1);
-			return;
-		}
-	}
+    // UL-EV1 / NTAG authentication
+    if (usePwd) {
+        uint8_t pwd[4] = {0x00};
+        memcpy(pwd, datain+4, 4);
+        uint8_t pack[4] = {0,0,0,0};
+        if (!mifare_ul_ev1_auth(pwd, pack)) {
+            OnError(1);
+            return;
+        }
+    }
 
-	if (mifare_ultra_writeblock(blockNo, blockdata)) {
-		if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
-		OnError(0);
-		return;
-	};
+    if (mifare_ultra_writeblock(blockNo, blockdata)) {
+        if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
+        OnError(0);
+        return;
+    };
 
-	if (mifare_ultra_halt()) {
-		if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
-		OnError(0);
-		return;
-	};
+    if (mifare_ultra_halt()) {
+        if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
+        OnError(0);
+        return;
+    };
 
-	if (MF_DBGLEVEL >= 2) DbpString("WRITE BLOCK FINISHED");
+    if (MF_DBGLEVEL >= 2) DbpString("WRITE BLOCK FINISHED");
 
-	cmd_send(CMD_ACK,1,0,0,0,0);
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	LEDsoff();
-	set_tracing(false);
+    cmd_send(CMD_ACK,1,0,0,0,0);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    LEDsoff();
+    set_tracing(false);
 }
 
 void MifareUSetPwd(uint8_t arg0, uint8_t *datain){
 
-	uint8_t pwd[16] = {0x00};
-	byte_t blockdata[4] = {0x00};
+    uint8_t pwd[16] = {0x00};
+    byte_t blockdata[4] = {0x00};
 
-	memcpy(pwd, datain, 16);
+    memcpy(pwd, datain, 16);
 
-	LED_A_ON(); LED_B_OFF(); LED_C_OFF();
-	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+    LED_A_ON(); LED_B_OFF(); LED_C_OFF();
+    iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
 
-	clear_trace();
-	set_tracing(true);
+    clear_trace();
+    set_tracing(true);
 
-	if (!iso14443a_select_card(NULL, NULL, NULL, true, 0, true)) {
-		if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
-		OnError(0);
-		return;
-	};
+    if (!iso14443a_select_card(NULL, NULL, NULL, true, 0, true)) {
+        if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
+        OnError(0);
+        return;
+    };
 
-	blockdata[0] = pwd[7];
-	blockdata[1] = pwd[6];
-	blockdata[2] = pwd[5];
-	blockdata[3] = pwd[4];
-	if (mifare_ultra_writeblock( 44, blockdata)) {
-		if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
-		OnError(44);
-		return;
-	};
+    blockdata[0] = pwd[7];
+    blockdata[1] = pwd[6];
+    blockdata[2] = pwd[5];
+    blockdata[3] = pwd[4];
+    if (mifare_ultra_writeblock( 44, blockdata)) {
+        if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
+        OnError(44);
+        return;
+    };
 
-	blockdata[0] = pwd[3];
-	blockdata[1] = pwd[2];
-	blockdata[2] = pwd[1];
-	blockdata[3] = pwd[0];
-	if (mifare_ultra_writeblock( 45, blockdata)) {
-		if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
-		OnError(45);
-		return;
-	};
+    blockdata[0] = pwd[3];
+    blockdata[1] = pwd[2];
+    blockdata[2] = pwd[1];
+    blockdata[3] = pwd[0];
+    if (mifare_ultra_writeblock( 45, blockdata)) {
+        if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
+        OnError(45);
+        return;
+    };
 
-	blockdata[0] = pwd[15];
-	blockdata[1] = pwd[14];
-	blockdata[2] = pwd[13];
-	blockdata[3] = pwd[12];
-	if (mifare_ultra_writeblock( 46, blockdata)) {
-		if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
-		OnError(46);
-		return;
-	};
+    blockdata[0] = pwd[15];
+    blockdata[1] = pwd[14];
+    blockdata[2] = pwd[13];
+    blockdata[3] = pwd[12];
+    if (mifare_ultra_writeblock( 46, blockdata)) {
+        if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
+        OnError(46);
+        return;
+    };
 
-	blockdata[0] = pwd[11];
-	blockdata[1] = pwd[10];
-	blockdata[2] = pwd[9];
-	blockdata[3] = pwd[8];
-	if (mifare_ultra_writeblock( 47, blockdata)) {
-		if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
-		OnError(47);
-		return;
-	};
+    blockdata[0] = pwd[11];
+    blockdata[1] = pwd[10];
+    blockdata[2] = pwd[9];
+    blockdata[3] = pwd[8];
+    if (mifare_ultra_writeblock( 47, blockdata)) {
+        if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
+        OnError(47);
+        return;
+    };
 
-	if (mifare_ultra_halt()) {
-		if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
-		OnError(0);
-		return;
-	};
+    if (mifare_ultra_halt()) {
+        if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
+        OnError(0);
+        return;
+    };
 
-	cmd_send(CMD_ACK,1,0,0,0,0);
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	LEDsoff();
-	set_tracing(false);
+    cmd_send(CMD_ACK,1,0,0,0,0);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    LEDsoff();
+    set_tracing(false);
 }
 
 // Return 1 if the nonce is invalid else return 0
 int valid_nonce(uint32_t Nt, uint32_t NtEnc, uint32_t Ks1, uint8_t *parity) {
-	return ((oddparity8((Nt >> 24) & 0xFF) == ((parity[0]) ^ oddparity8((NtEnc >> 24) & 0xFF) ^ BIT(Ks1,16))) & \
-	(oddparity8((Nt >> 16) & 0xFF) == ((parity[1]) ^ oddparity8((NtEnc >> 16) & 0xFF) ^ BIT(Ks1,8))) & \
-	(oddparity8((Nt >> 8) & 0xFF) == ((parity[2]) ^ oddparity8((NtEnc >> 8) & 0xFF) ^ BIT(Ks1,0)))) ? 1 : 0;
+    return ((oddparity8((Nt >> 24) & 0xFF) == ((parity[0]) ^ oddparity8((NtEnc >> 24) & 0xFF) ^ BIT(Ks1,16))) & \
+    (oddparity8((Nt >> 16) & 0xFF) == ((parity[1]) ^ oddparity8((NtEnc >> 16) & 0xFF) ^ BIT(Ks1,8))) & \
+    (oddparity8((Nt >> 8) & 0xFF) == ((parity[2]) ^ oddparity8((NtEnc >> 8) & 0xFF) ^ BIT(Ks1,0)))) ? 1 : 0;
 }
 
 void MifareAcquireNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *datain) {
 
-	uint8_t uid[10] = {0x00};
-	uint8_t answer[MAX_MIFARE_FRAME_SIZE] = {0x00};
-	uint8_t par[1] = {0x00};
-	uint8_t buf[USB_CMD_DATA_SIZE] = {0x00};
-	uint32_t cuid = 0;
-	int16_t isOK = 0;
-	uint16_t num_nonces = 0;
-	uint8_t cascade_levels = 0;
-	uint8_t blockNo = arg0 & 0xff;
-	uint8_t keyType = (arg0 >> 8) & 0xff;
-	bool initialize = flags & 0x0001;
-	bool field_off = flags & 0x0004;
-	bool have_uid = false;
+    uint8_t uid[10] = {0x00};
+    uint8_t answer[MAX_MIFARE_FRAME_SIZE] = {0x00};
+    uint8_t par[1] = {0x00};
+    uint8_t buf[USB_CMD_DATA_SIZE] = {0x00};
+    uint32_t cuid = 0;
+    int16_t isOK = 0;
+    uint16_t num_nonces = 0;
+    uint8_t cascade_levels = 0;
+    uint8_t blockNo = arg0 & 0xff;
+    uint8_t keyType = (arg0 >> 8) & 0xff;
+    bool initialize = flags & 0x0001;
+    bool field_off = flags & 0x0004;
+    bool have_uid = false;
 
-	LED_A_ON();
-	LED_C_OFF();
+    LED_A_ON();
+    LED_C_OFF();
 
-	BigBuf_free(); BigBuf_Clear_ext(false);
-	clear_trace();
-	set_tracing(true);
+    BigBuf_free(); BigBuf_Clear_ext(false);
+    clear_trace();
+    set_tracing(true);
 
-	if (initialize)
-		iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+    if (initialize)
+        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
 
-	LED_C_ON();
+    LED_C_ON();
 
-	for (uint16_t i = 0; i <= USB_CMD_DATA_SIZE-4; i += 4 ) {
+    for (uint16_t i = 0; i <= USB_CMD_DATA_SIZE-4; i += 4 ) {
 
-		// Test if the action was cancelled
-		if (BUTTON_PRESS()) {
-			isOK = 2;
-			field_off = true;
-			break;
-		}
+        // Test if the action was cancelled
+        if (BUTTON_PRESS()) {
+            isOK = 2;
+            field_off = true;
+            break;
+        }
 
-		if (!have_uid) { // need a full select cycle to get the uid first
-			iso14a_card_select_t card_info;
-			if (!iso14443a_select_card(uid, &card_info, &cuid, true, 0, true)) {
-				if (MF_DBGLEVEL >= 1)	Dbprintf("AcquireNonces: Can't select card (ALL)");
-				continue;
-			}
-			switch (card_info.uidlen) {
-				case 4 : cascade_levels = 1; break;
-				case 7 : cascade_levels = 2; break;
-				case 10: cascade_levels = 3; break;
-				default: break;
-			}
-			have_uid = true;
-		} else { // no need for anticollision. We can directly select the card
-			if (!iso14443a_fast_select_card(uid, cascade_levels)) {
-				if (MF_DBGLEVEL >= 1)	Dbprintf("AcquireNonces: Can't select card (UID)");
-				continue;
-			}
-		}
+        if (!have_uid) { // need a full select cycle to get the uid first
+            iso14a_card_select_t card_info;
+            if (!iso14443a_select_card(uid, &card_info, &cuid, true, 0, true)) {
+                if (MF_DBGLEVEL >= 1) Dbprintf("AcquireNonces: Can't select card (ALL)");
+                continue;
+            }
+            switch (card_info.uidlen) {
+                case 4 : cascade_levels = 1; break;
+                case 7 : cascade_levels = 2; break;
+                case 10: cascade_levels = 3; break;
+                default: break;
+            }
+            have_uid = true;
+        } else { // no need for anticollision. We can directly select the card
+            if (!iso14443a_fast_select_card(uid, cascade_levels)) {
+                if (MF_DBGLEVEL >= 1) Dbprintf("AcquireNonces: Can't select card (UID)");
+                continue;
+            }
+        }
 
-		// Transmit MIFARE_CLASSIC_AUTH
-		uint8_t dcmd[4] = {0x60 + (keyType & 0x01), blockNo, 0x00, 0x00};
-		AddCrc14A(dcmd, 2);
-		ReaderTransmit(dcmd, sizeof(dcmd), NULL);
-		int len = ReaderReceive(answer, par);
+        // Transmit MIFARE_CLASSIC_AUTH
+        uint8_t dcmd[4] = {0x60 + (keyType & 0x01), blockNo, 0x00, 0x00};
+        AddCrc14A(dcmd, 2);
+        ReaderTransmit(dcmd, sizeof(dcmd), NULL);
+        int len = ReaderReceive(answer, par);
 
-		// wait for the card to become ready again
-		CHK_TIMEOUT();
+        // wait for the card to become ready again
+        CHK_TIMEOUT();
 
-		if (len != 4) {
-			if (MF_DBGLEVEL >= 2)	Dbprintf("AcquireNonces: Auth1 error");
-			continue;
-		}
+        if (len != 4) {
+            if (MF_DBGLEVEL >= 2) Dbprintf("AcquireNonces: Auth1 error");
+            continue;
+        }
 
-		num_nonces++;
+        num_nonces++;
 
-		// Save the tag nonce (nt)
-		buf[i]   = answer[0];
-		buf[i+1] = answer[1];
-		buf[i+2] = answer[2];
-		buf[i+3] = answer[3];
-	}
+        // Save the tag nonce (nt)
+        buf[i]   = answer[0];
+        buf[i+1] = answer[1];
+        buf[i+2] = answer[2];
+        buf[i+3] = answer[3];
+    }
 
-	LED_C_OFF();
-	LED_B_ON();
-	cmd_send(CMD_ACK, isOK, cuid, num_nonces-1, buf, sizeof(buf));
-	LED_B_OFF();
+    LED_C_OFF();
+    LED_B_ON();
+    cmd_send(CMD_ACK, isOK, cuid, num_nonces-1, buf, sizeof(buf));
+    LED_B_OFF();
 
-	if (MF_DBGLEVEL >= 3)	DbpString("AcquireNonces finished");
+    if (MF_DBGLEVEL >= 3) DbpString("AcquireNonces finished");
 
-	if (field_off) {
-		FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-		LEDsoff();
-		set_tracing(false);
-	}
+    if (field_off) {
+        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+        LEDsoff();
+        set_tracing(false);
+    }
 }
 
 //-----------------------------------------------------------------------------
@@ -719,116 +719,116 @@ void MifareAcquireNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *
 //-----------------------------------------------------------------------------
 void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *datain) {
 
-	struct Crypto1State mpcs = {0, 0};
-	struct Crypto1State *pcs;
-	pcs = &mpcs;
+    struct Crypto1State mpcs = {0, 0};
+    struct Crypto1State *pcs;
+    pcs = &mpcs;
 
-	uint8_t uid[10] = {0x00};
-	uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};
-	uint8_t par_enc[1] = {0x00};
-	uint8_t buf[USB_CMD_DATA_SIZE] = {0x00};
+    uint8_t uid[10] = {0x00};
+    uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};
+    uint8_t par_enc[1] = {0x00};
+    uint8_t buf[USB_CMD_DATA_SIZE] = {0x00};
 
-	uint64_t ui64Key = bytes_to_num(datain, 6);
-	uint32_t cuid = 0;
-	int16_t isOK = 0;
-	uint16_t num_nonces = 0;
-	uint8_t nt_par_enc = 0;
-	uint8_t cascade_levels = 0;
-	uint8_t blockNo = arg0 & 0xff;
-	uint8_t keyType = (arg0 >> 8) & 0xff;
-	uint8_t targetBlockNo = arg1 & 0xff;
-	uint8_t targetKeyType = (arg1 >> 8) & 0xff;
-	bool initialize = flags & 0x0001;
-	bool slow = flags & 0x0002;
-	bool field_off = flags & 0x0004;
-	bool have_uid = false;
+    uint64_t ui64Key = bytes_to_num(datain, 6);
+    uint32_t cuid = 0;
+    int16_t isOK = 0;
+    uint16_t num_nonces = 0;
+    uint8_t nt_par_enc = 0;
+    uint8_t cascade_levels = 0;
+    uint8_t blockNo = arg0 & 0xff;
+    uint8_t keyType = (arg0 >> 8) & 0xff;
+    uint8_t targetBlockNo = arg1 & 0xff;
+    uint8_t targetKeyType = (arg1 >> 8) & 0xff;
+    bool initialize = flags & 0x0001;
+    bool slow = flags & 0x0002;
+    bool field_off = flags & 0x0004;
+    bool have_uid = false;
 
-	LED_A_ON();
-	LED_C_OFF();
+    LED_A_ON();
+    LED_C_OFF();
 
-	BigBuf_free(); BigBuf_Clear_ext(false);
-	clear_trace();
-	set_tracing(false);
+    BigBuf_free(); BigBuf_Clear_ext(false);
+    clear_trace();
+    set_tracing(false);
 
-	if (initialize)
-		iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+    if (initialize)
+        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
 
-	LED_C_ON();
+    LED_C_ON();
 
-	for (uint16_t i = 0; i <= USB_CMD_DATA_SIZE - 9; ) {
+    for (uint16_t i = 0; i <= USB_CMD_DATA_SIZE - 9; ) {
 
-		// Test if the action was cancelled
-		if(BUTTON_PRESS()) {
-			isOK = 2;
-			field_off = true;
-			break;
-		}
+        // Test if the action was cancelled
+        if(BUTTON_PRESS()) {
+            isOK = 2;
+            field_off = true;
+            break;
+        }
 
-		if (!have_uid) { // need a full select cycle to get the uid first
-			iso14a_card_select_t card_info;
-			if(!iso14443a_select_card(uid, &card_info, &cuid, true, 0, true)) {
-				if (MF_DBGLEVEL >= 1)	Dbprintf("AcquireNonces: Can't select card (ALL)");
-				continue;
-			}
-			switch (card_info.uidlen) {
-				case 4 : cascade_levels = 1; break;
-				case 7 : cascade_levels = 2; break;
-				case 10: cascade_levels = 3; break;
-				default: break;
-			}
-			have_uid = true;
-		} else { // no need for anticollision. We can directly select the card
-			if (!iso14443a_fast_select_card(uid, cascade_levels)) {
-				if (MF_DBGLEVEL >= 1)	Dbprintf("AcquireNonces: Can't select card (UID)");
-				continue;
-			}
-		}
+        if (!have_uid) { // need a full select cycle to get the uid first
+            iso14a_card_select_t card_info;
+            if(!iso14443a_select_card(uid, &card_info, &cuid, true, 0, true)) {
+                if (MF_DBGLEVEL >= 1) Dbprintf("AcquireNonces: Can't select card (ALL)");
+                continue;
+            }
+            switch (card_info.uidlen) {
+                case 4 : cascade_levels = 1; break;
+                case 7 : cascade_levels = 2; break;
+                case 10: cascade_levels = 3; break;
+                default: break;
+            }
+            have_uid = true;
+        } else { // no need for anticollision. We can directly select the card
+            if (!iso14443a_fast_select_card(uid, cascade_levels)) {
+                if (MF_DBGLEVEL >= 1) Dbprintf("AcquireNonces: Can't select card (UID)");
+                continue;
+            }
+        }
 
-		if (slow)
-			SpinDelayUs(HARDNESTED_PRE_AUTHENTICATION_LEADTIME);
+        if (slow)
+            SpinDelayUs(HARDNESTED_PRE_AUTHENTICATION_LEADTIME);
 
-		uint32_t nt1;
-		if (mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1, NULL)) {
-			if (MF_DBGLEVEL >= 1)	Dbprintf("AcquireNonces: Auth1 error");
-			continue;
-		}
+        uint32_t nt1;
+        if (mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1, NULL)) {
+            if (MF_DBGLEVEL >= 1) Dbprintf("AcquireNonces: Auth1 error");
+            continue;
+        }
 
-		// nested authentication
-		uint16_t len = mifare_sendcmd_short(pcs, AUTH_NESTED, 0x60 + (targetKeyType & 0x01), targetBlockNo, receivedAnswer, par_enc, NULL);
+        // nested authentication
+        uint16_t len = mifare_sendcmd_short(pcs, AUTH_NESTED, 0x60 + (targetKeyType & 0x01), targetBlockNo, receivedAnswer, par_enc, NULL);
 
-		// wait for the card to become ready again
-		CHK_TIMEOUT();
+        // wait for the card to become ready again
+        CHK_TIMEOUT();
 
-		if (len != 4) {
-			if (MF_DBGLEVEL >= 1)	Dbprintf("AcquireNonces: Auth2 error len=%d", len);
-			continue;
-		}
+        if (len != 4) {
+            if (MF_DBGLEVEL >= 1) Dbprintf("AcquireNonces: Auth2 error len=%d", len);
+            continue;
+        }
 
-		num_nonces++;
-		if (num_nonces % 2) {
-			memcpy(buf+i, receivedAnswer, 4);
-			nt_par_enc = par_enc[0] & 0xf0;
-		} else {
-			nt_par_enc |= par_enc[0]  >> 4;
-			memcpy(buf+i+4, receivedAnswer, 4);
-			memcpy(buf+i+8, &nt_par_enc, 1);
-			i += 9;
-		}
-	}
+        num_nonces++;
+        if (num_nonces % 2) {
+            memcpy(buf+i, receivedAnswer, 4);
+            nt_par_enc = par_enc[0] & 0xf0;
+        } else {
+            nt_par_enc |= par_enc[0]  >> 4;
+            memcpy(buf+i+4, receivedAnswer, 4);
+            memcpy(buf+i+8, &nt_par_enc, 1);
+            i += 9;
+        }
+    }
 
-	LED_C_OFF();
-	crypto1_destroy(pcs);
-	LED_B_ON();
-	cmd_send(CMD_ACK, isOK, cuid, num_nonces, buf, sizeof(buf));
-	LED_B_OFF();
+    LED_C_OFF();
+    crypto1_destroy(pcs);
+    LED_B_ON();
+    cmd_send(CMD_ACK, isOK, cuid, num_nonces, buf, sizeof(buf));
+    LED_B_OFF();
 
-	if (MF_DBGLEVEL >= 3)	DbpString("AcquireEncryptedNonces finished");
+    if (MF_DBGLEVEL >= 3) DbpString("AcquireEncryptedNonces finished");
 
-	if (field_off) {
-		FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-		LEDsoff();
-		set_tracing(false);
-	}
+    if (field_off) {
+        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+        LEDsoff();
+        set_tracing(false);
+    }
 }
 
 
@@ -838,215 +838,215 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
 //-----------------------------------------------------------------------------
 void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *datain)
 {
-	// params
-	uint8_t blockNo = arg0 & 0xff;
-	uint8_t keyType = (arg0 >> 8) & 0xff;
-	uint8_t targetBlockNo = arg1 & 0xff;
-	uint8_t targetKeyType = (arg1 >> 8) & 0xff;
-	uint64_t ui64Key = 0;
+    // params
+    uint8_t blockNo = arg0 & 0xff;
+    uint8_t keyType = (arg0 >> 8) & 0xff;
+    uint8_t targetBlockNo = arg1 & 0xff;
+    uint8_t targetKeyType = (arg1 >> 8) & 0xff;
+    uint64_t ui64Key = 0;
 
-	ui64Key = bytes_to_num(datain, 6);
+    ui64Key = bytes_to_num(datain, 6);
 
-	// variables
-	uint16_t rtr, i, j, len;
-	uint16_t davg = 0;
-	static uint16_t dmin, dmax;
-	uint8_t uid[10] = {0x00};
-	uint32_t cuid = 0, nt1, nt2, nttmp, nttest, ks1;
-	uint8_t par[1] = {0x00};
-	uint32_t target_nt[2] = {0x00}, target_ks[2] = {0x00};
+    // variables
+    uint16_t rtr, i, j, len;
+    uint16_t davg = 0;
+    static uint16_t dmin, dmax;
+    uint8_t uid[10] = {0x00};
+    uint32_t cuid = 0, nt1, nt2, nttmp, nttest, ks1;
+    uint8_t par[1] = {0x00};
+    uint32_t target_nt[2] = {0x00}, target_ks[2] = {0x00};
 
-	uint8_t par_array[4] = {0x00};
-	uint16_t ncount = 0;
-	struct Crypto1State mpcs = {0, 0};
-	struct Crypto1State *pcs;
-	pcs = &mpcs;
-	uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};
+    uint8_t par_array[4] = {0x00};
+    uint16_t ncount = 0;
+    struct Crypto1State mpcs = {0, 0};
+    struct Crypto1State *pcs;
+    pcs = &mpcs;
+    uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};
 
-	uint32_t auth1_time, auth2_time;
-	static uint16_t delta_time = 0;
+    uint32_t auth1_time, auth2_time;
+    static uint16_t delta_time = 0;
 
-	LED_A_ON();
-	LED_C_OFF();
-	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+    LED_A_ON();
+    LED_C_OFF();
+    iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
 
-	// free eventually allocated BigBuf memory
-	BigBuf_free(); BigBuf_Clear_ext(false);
+    // free eventually allocated BigBuf memory
+    BigBuf_free(); BigBuf_Clear_ext(false);
 
-	if (calibrate) clear_trace();
-	set_tracing(true);
+    if (calibrate) clear_trace();
+    set_tracing(true);
 
-	// statistics on nonce distance
-	int16_t isOK = 0;
-	#define NESTED_MAX_TRIES 12
-	uint16_t unsuccessfull_tries = 0;
-	if (calibrate) {	// for first call only. Otherwise reuse previous calibration
-		LED_B_ON();
-		WDT_HIT();
+    // statistics on nonce distance
+    int16_t isOK = 0;
+    #define NESTED_MAX_TRIES 12
+    uint16_t unsuccessfull_tries = 0;
+    if (calibrate) { // for first call only. Otherwise reuse previous calibration
+        LED_B_ON();
+        WDT_HIT();
 
-		davg = dmax = 0;
-		dmin = 2000;
-		delta_time = 0;
+        davg = dmax = 0;
+        dmin = 2000;
+        delta_time = 0;
 
-		for (rtr = 0; rtr < 17; rtr++) {
+        for (rtr = 0; rtr < 17; rtr++) {
 
-			// Test if the action was cancelled
-			if(BUTTON_PRESS()) {
-				isOK = -2;
-				break;
-			}
+            // Test if the action was cancelled
+            if(BUTTON_PRESS()) {
+                isOK = -2;
+                break;
+            }
 
-			// prepare next select. No need to power down the card.
-			if(mifare_classic_halt(pcs, cuid)) {
-				if (MF_DBGLEVEL >= 2)	Dbprintf("Nested: Halt error");
-				rtr--;
-				continue;
-			}
+            // prepare next select. No need to power down the card.
+            if(mifare_classic_halt(pcs, cuid)) {
+                if (MF_DBGLEVEL >= 2) Dbprintf("Nested: Halt error");
+                rtr--;
+                continue;
+            }
 
-			if(!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
-				if (MF_DBGLEVEL >= 2)	Dbprintf("Nested: Can't select card");
-				rtr--;
-				continue;
-			};
+            if(!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
+                if (MF_DBGLEVEL >= 2) Dbprintf("Nested: Can't select card");
+                rtr--;
+                continue;
+            };
 
-			auth1_time = 0;
-			if(mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1, &auth1_time)) {
-				if (MF_DBGLEVEL >= 2)	Dbprintf("Nested: Auth1 error");
-				rtr--;
-				continue;
-			};
-			auth2_time = (delta_time) ? auth1_time + delta_time : 0;
+            auth1_time = 0;
+            if(mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1, &auth1_time)) {
+                if (MF_DBGLEVEL >= 2) Dbprintf("Nested: Auth1 error");
+                rtr--;
+                continue;
+            };
+            auth2_time = (delta_time) ? auth1_time + delta_time : 0;
 
-			if(mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_NESTED, &nt2, &auth2_time)) {
-				if (MF_DBGLEVEL >= 2)	Dbprintf("Nested: Auth2 error");
-				rtr--;
-				continue;
-			};
+            if(mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_NESTED, &nt2, &auth2_time)) {
+                if (MF_DBGLEVEL >= 2) Dbprintf("Nested: Auth2 error");
+                rtr--;
+                continue;
+            };
 
-			nttmp = prng_successor(nt1, 100);				//NXP Mifare is typical around 840,but for some unlicensed/compatible mifare card this can be 160
-			for (i = 101; i < 1200; i++) {
-				nttmp = prng_successor(nttmp, 1);
-				if (nttmp == nt2) break;
-			}
+            nttmp = prng_successor(nt1, 100); //NXP Mifare is typical around 840,but for some unlicensed/compatible mifare card this can be 160
+            for (i = 101; i < 1200; i++) {
+                nttmp = prng_successor(nttmp, 1);
+                if (nttmp == nt2) break;
+            }
 
-			if (i != 1200) {
-				if (rtr != 0) {
-					davg += i;
-					dmin = MIN(dmin, i);
-					dmax = MAX(dmax, i);
-				}
-				else {
-					delta_time = auth2_time - auth1_time + 32;  // allow some slack for proper timing
-				}
-				if (MF_DBGLEVEL >= 3) Dbprintf("Nested: calibrating... ntdist=%d", i);
-			} else {
-				unsuccessfull_tries++;
-				if (unsuccessfull_tries > NESTED_MAX_TRIES) {	// card isn't vulnerable to nested attack (random numbers are not predictable)
-					isOK = -3;
-				}
-			}
-		}
+            if (i != 1200) {
+                if (rtr != 0) {
+                    davg += i;
+                    dmin = MIN(dmin, i);
+                    dmax = MAX(dmax, i);
+                }
+                else {
+                    delta_time = auth2_time - auth1_time + 32;  // allow some slack for proper timing
+                }
+                if (MF_DBGLEVEL >= 3) Dbprintf("Nested: calibrating... ntdist=%d", i);
+            } else {
+                unsuccessfull_tries++;
+                if (unsuccessfull_tries > NESTED_MAX_TRIES) { // card isn't vulnerable to nested attack (random numbers are not predictable)
+                    isOK = -3;
+                }
+            }
+        }
 
-		davg = (davg + (rtr - 1)/2) / (rtr - 1);
+        davg = (davg + (rtr - 1)/2) / (rtr - 1);
 
-		if (MF_DBGLEVEL >= 3) Dbprintf("rtr=%d isOK=%d min=%d max=%d avg=%d, delta_time=%d", rtr, isOK, dmin, dmax, davg, delta_time);
+        if (MF_DBGLEVEL >= 3) Dbprintf("rtr=%d isOK=%d min=%d max=%d avg=%d, delta_time=%d", rtr, isOK, dmin, dmax, davg, delta_time);
 
-		dmin = davg - 2;
-		dmax = davg + 2;
+        dmin = davg - 2;
+        dmax = davg + 2;
 
-		LED_B_OFF();
-	}
+        LED_B_OFF();
+    }
 //  -------------------------------------------------------------------------------------------------
 
-	LED_C_ON();
+    LED_C_ON();
 
-	//  get crypted nonces for target sector
-	for(i=0; i < 2 && !isOK; i++) { // look for exactly two different nonces
+    //  get crypted nonces for target sector
+    for(i=0; i < 2 && !isOK; i++) { // look for exactly two different nonces
 
-		target_nt[i] = 0;
-		while(target_nt[i] == 0) { // continue until we have an unambiguous nonce
+        target_nt[i] = 0;
+        while(target_nt[i] == 0) { // continue until we have an unambiguous nonce
 
-			// prepare next select. No need to power down the card.
-			if(mifare_classic_halt(pcs, cuid)) {
-				if (MF_DBGLEVEL >= 2)	Dbprintf("Nested: Halt error");
-				continue;
-			}
+            // prepare next select. No need to power down the card.
+            if(mifare_classic_halt(pcs, cuid)) {
+                if (MF_DBGLEVEL >= 2) Dbprintf("Nested: Halt error");
+                continue;
+            }
 
-			if(!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
-				if (MF_DBGLEVEL >= 2)	Dbprintf("Nested: Can't select card");
-				continue;
-			};
+            if(!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
+                if (MF_DBGLEVEL >= 2) Dbprintf("Nested: Can't select card");
+                continue;
+            };
 
-			auth1_time = 0;
-			if(mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1, &auth1_time)) {
-				if (MF_DBGLEVEL >= 2)	Dbprintf("Nested: Auth1 error");
-				continue;
-			};
+            auth1_time = 0;
+            if(mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1, &auth1_time)) {
+                if (MF_DBGLEVEL >= 2) Dbprintf("Nested: Auth1 error");
+                continue;
+            };
 
-			// nested authentication
-			auth2_time = auth1_time + delta_time;
+            // nested authentication
+            auth2_time = auth1_time + delta_time;
 
-			len = mifare_sendcmd_short(pcs, AUTH_NESTED, 0x60 + (targetKeyType & 0x01), targetBlockNo, receivedAnswer, par, &auth2_time);
-			if (len != 4) {
-				if (MF_DBGLEVEL >= 2)	Dbprintf("Nested: Auth2 error len=%d", len);
-				continue;
-			};
+            len = mifare_sendcmd_short(pcs, AUTH_NESTED, 0x60 + (targetKeyType & 0x01), targetBlockNo, receivedAnswer, par, &auth2_time);
+            if (len != 4) {
+                if (MF_DBGLEVEL >= 2) Dbprintf("Nested: Auth2 error len=%d", len);
+                continue;
+            };
 
-			nt2 = bytes_to_num(receivedAnswer, 4);
-			if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: Testing nt1=%08x nt2enc=%08x nt2par=%02x", i+1, nt1, nt2, par[0]);
+            nt2 = bytes_to_num(receivedAnswer, 4);
+            if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: Testing nt1=%08x nt2enc=%08x nt2par=%02x", i+1, nt1, nt2, par[0]);
 
-			// Parity validity check
-			for (j = 0; j < 4; j++) {
-				par_array[j] = (oddparity8(receivedAnswer[j]) != ((par[0] >> (7-j)) & 0x01));
-			}
+            // Parity validity check
+            for (j = 0; j < 4; j++) {
+                par_array[j] = (oddparity8(receivedAnswer[j]) != ((par[0] >> (7-j)) & 0x01));
+            }
 
-			ncount = 0;
-			nttest = prng_successor(nt1, dmin - 1);
-			for (j = dmin; j < dmax + 1; j++) {
-				nttest = prng_successor(nttest, 1);
-				ks1 = nt2 ^ nttest;
+            ncount = 0;
+            nttest = prng_successor(nt1, dmin - 1);
+            for (j = dmin; j < dmax + 1; j++) {
+                nttest = prng_successor(nttest, 1);
+                ks1 = nt2 ^ nttest;
 
-				if (valid_nonce(nttest, nt2, ks1, par_array)){
-					if (ncount > 0) { 		// we are only interested in disambiguous nonces, try again
-						if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: dismissed (ambigous), ntdist=%d", i+1, j);
-						target_nt[i] = 0;
-						break;
-					}
-					target_nt[i] = nttest;
-					target_ks[i] = ks1;
-					ncount++;
-					if (i == 1 && target_nt[1] == target_nt[0]) { // we need two different nonces
-						target_nt[i] = 0;
-						if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#2: dismissed (= nonce#1), ntdist=%d", j);
-						break;
-					}
-					if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: valid, ntdist=%d", i+1, j);
-				}
-			}
-			if (target_nt[i] == 0 && j == dmax+1 && MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: dismissed (all invalid)", i+1);
-		}
-	}
+                if (valid_nonce(nttest, nt2, ks1, par_array)){
+                    if (ncount > 0) { // we are only interested in disambiguous nonces, try again
+                        if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: dismissed (ambigous), ntdist=%d", i+1, j);
+                        target_nt[i] = 0;
+                        break;
+                    }
+                    target_nt[i] = nttest;
+                    target_ks[i] = ks1;
+                    ncount++;
+                    if (i == 1 && target_nt[1] == target_nt[0]) { // we need two different nonces
+                        target_nt[i] = 0;
+                        if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#2: dismissed (= nonce#1), ntdist=%d", j);
+                        break;
+                    }
+                    if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: valid, ntdist=%d", i+1, j);
+                }
+            }
+            if (target_nt[i] == 0 && j == dmax+1 && MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: dismissed (all invalid)", i+1);
+        }
+    }
 
-	LED_C_OFF();
+    LED_C_OFF();
 
-	crypto1_destroy(pcs);
+    crypto1_destroy(pcs);
 
-	uint8_t buf[4 + 4 * 4] = {0};
-	memcpy(buf, &cuid, 4);
-	memcpy(buf+4, &target_nt[0], 4);
-	memcpy(buf+8, &target_ks[0], 4);
-	memcpy(buf+12, &target_nt[1], 4);
-	memcpy(buf+16, &target_ks[1], 4);
+    uint8_t buf[4 + 4 * 4] = {0};
+    memcpy(buf, &cuid, 4);
+    memcpy(buf+4, &target_nt[0], 4);
+    memcpy(buf+8, &target_ks[0], 4);
+    memcpy(buf+12, &target_nt[1], 4);
+    memcpy(buf+16, &target_ks[1], 4);
 
-	LED_B_ON();
-	cmd_send(CMD_ACK, isOK, 0, targetBlockNo + (targetKeyType * 0x100), buf, sizeof(buf));
-	LED_B_OFF();
+    LED_B_ON();
+    cmd_send(CMD_ACK, isOK, 0, targetBlockNo + (targetKeyType * 0x100), buf, sizeof(buf));
+    LED_B_OFF();
 
-	if (MF_DBGLEVEL >= 3)	DbpString("NESTED FINISHED");
+    if (MF_DBGLEVEL >= 3) DbpString("NESTED FINISHED");
 
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	LEDsoff();
-	set_tracing(false);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    LEDsoff();
+    set_tracing(false);
 }
 
 //-----------------------------------------------------------------------------
@@ -1054,18 +1054,18 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
 //
 //-----------------------------------------------------------------------------
 typedef struct sector_t {
-	uint8_t keyA[6];
-	uint8_t keyB[6];
+    uint8_t keyA[6];
+    uint8_t keyB[6];
 } sector_t;
 
 typedef struct chk_t {
-	uint64_t key;
-	uint32_t cuid;
-	uint8_t cl;
-	uint8_t block;
-	uint8_t keyType;
-	uint8_t *uid;
-	struct Crypto1State *pcs;
+    uint64_t key;
+    uint32_t cuid;
+    uint8_t cl;
+    uint8_t block;
+    uint8_t keyType;
+    uint8_t *uid;
+    struct Crypto1State *pcs;
 } chk_t;
 
 // checks one key.
@@ -1076,117 +1076,117 @@ typedef struct chk_t {
 //  1 = wrong key
 //  0 = correct key
 uint8_t chkKey( struct chk_t *c ) {
-	uint8_t i = 0, res = 2;
-	while( i < 5 ) {
-		// this part is from Piwi's faster nonce collecting part in Hardnested.
-		// assume: fast select
-		if (!iso14443a_fast_select_card(c->uid, c->cl)) {
-			++i;
-			continue;
-		}
-		res = mifare_classic_authex(c->pcs, c->cuid, c->block, c->keyType, c->key, AUTH_FIRST, NULL, NULL);
+    uint8_t i = 0, res = 2;
+    while( i < 5 ) {
+        // this part is from Piwi's faster nonce collecting part in Hardnested.
+        // assume: fast select
+        if (!iso14443a_fast_select_card(c->uid, c->cl)) {
+            ++i;
+            continue;
+        }
+        res = mifare_classic_authex(c->pcs, c->cuid, c->block, c->keyType, c->key, AUTH_FIRST, NULL, NULL);
 
-		CHK_TIMEOUT();
+        CHK_TIMEOUT();
 
-		// if successfull auth, send HALT
-		// if ( !res )
-			// mifare_classic_halt_ex(c->pcs);
-		break;
-	}
-	return res;
+        // if successfull auth, send HALT
+        // if ( !res )
+            // mifare_classic_halt_ex(c->pcs);
+        break;
+    }
+    return res;
 }
 
 uint8_t chkKey_readb(struct chk_t *c, uint8_t *keyb) {
 
-	if (!iso14443a_fast_select_card(c->uid, c->cl))
-		return 2;
+    if (!iso14443a_fast_select_card(c->uid, c->cl))
+        return 2;
 
-	if ( mifare_classic_authex(c->pcs, c->cuid, c->block, 0, c->key, AUTH_FIRST, NULL, NULL) )
-		return 1;
+    if ( mifare_classic_authex(c->pcs, c->cuid, c->block, 0, c->key, AUTH_FIRST, NULL, NULL) )
+        return 1;
 
-	uint8_t data[16] = {0x00};
-	uint8_t res = mifare_classic_readblock(c->pcs, c->cuid, c->block, data);
+    uint8_t data[16] = {0x00};
+    uint8_t res = mifare_classic_readblock(c->pcs, c->cuid, c->block, data);
 
-	// successful read
-	if ( !res ) {
-		// data was something else than zeros.
-		if ( memcmp(data+10, "\x00\x00\x00\x00\x00\x00", 6) != 0) {
-			memcpy(keyb, data+10, 6);
-			res = 0;
-		} else {
-			res = 3;
-		}
-		mifare_classic_halt_ex(c->pcs);
-	}
-	return res;
+    // successful read
+    if ( !res ) {
+        // data was something else than zeros.
+        if ( memcmp(data+10, "\x00\x00\x00\x00\x00\x00", 6) != 0) {
+            memcpy(keyb, data+10, 6);
+            res = 0;
+        } else {
+            res = 3;
+        }
+        mifare_classic_halt_ex(c->pcs);
+    }
+    return res;
 }
 
 void chkKey_scanA(struct chk_t *c, struct sector_t *k_sector, uint8_t *found, uint8_t *sectorcnt, uint8_t *foundkeys) {
-	for (uint8_t s = 0; s < *sectorcnt; s++) {
+    for (uint8_t s = 0; s < *sectorcnt; s++) {
 
-		// skip already found A keys
-		if ( found[(s*2)] )
-			continue;
+        // skip already found A keys
+        if ( found[(s*2)] )
+            continue;
 
-		c->block = FirstBlockOfSector( s );
-		if ( chkKey( c ) == 0 ) {
-			num_to_bytes(c->key, 6, k_sector[s].keyA);
-			found[(s*2)] = 1;
-			++*foundkeys;
+        c->block = FirstBlockOfSector( s );
+        if ( chkKey( c ) == 0 ) {
+            num_to_bytes(c->key, 6, k_sector[s].keyA);
+            found[(s*2)] = 1;
+            ++*foundkeys;
 
-			if (MF_DBGLEVEL >= 3) Dbprintf("ChkKeys_fast: Scan A found (%d)", c->block);
-		}
-	}
+            if (MF_DBGLEVEL >= 3) Dbprintf("ChkKeys_fast: Scan A found (%d)", c->block);
+        }
+    }
 }
 
 void chkKey_scanB(struct chk_t *c, struct sector_t *k_sector, uint8_t *found, uint8_t *sectorcnt, uint8_t *foundkeys) {
-	for (uint8_t s = 0; s < *sectorcnt; s++) {
+    for (uint8_t s = 0; s < *sectorcnt; s++) {
 
-		// skip already found B keys
-		if ( found[(s*2)+1] )
-			continue;
+        // skip already found B keys
+        if ( found[(s*2)+1] )
+            continue;
 
-		c->block = FirstBlockOfSector( s );
-		if ( chkKey( c ) == 0 ) {
-			num_to_bytes(c->key, 6, k_sector[s].keyB);
-			found[(s*2)+1] = 1;
-			++*foundkeys;
+        c->block = FirstBlockOfSector( s );
+        if ( chkKey( c ) == 0 ) {
+            num_to_bytes(c->key, 6, k_sector[s].keyB);
+            found[(s*2)+1] = 1;
+            ++*foundkeys;
 
-			if (MF_DBGLEVEL >= 3) Dbprintf("ChkKeys_fast: Scan B found (%d)", c->block);
-		}
-	}
+            if (MF_DBGLEVEL >= 3) Dbprintf("ChkKeys_fast: Scan B found (%d)", c->block);
+        }
+    }
 }
 
 // loop all A keys,
 // when A is found but not B,  try to read B.
 void chkKey_loopBonly(struct chk_t *c, struct sector_t *k_sector, uint8_t *found, uint8_t *sectorcnt, uint8_t *foundkeys) {
 
-	// read Block B, if A is found.
-	for (uint8_t s = 0; s < *sectorcnt; ++s) {
+    // read Block B, if A is found.
+    for (uint8_t s = 0; s < *sectorcnt; ++s) {
 
-		if ( found[(s*2)] && found[(s*2)+1] )
-			continue;
+        if ( found[(s*2)] && found[(s*2)+1] )
+            continue;
 
-		c->block = (FirstBlockOfSector( s ) + NumBlocksPerSector( s ) - 1);
+        c->block = (FirstBlockOfSector( s ) + NumBlocksPerSector( s ) - 1);
 
-		// A but not B
-		if ( found[(s*2)]  &&  !found[(s*2)+1] ){
-			c->key = bytes_to_num(k_sector[s].keyA, 6);
-			uint8_t status = chkKey_readb(c, k_sector[s].keyB);
-			if ( status == 0 ){
-				found[(s*2)+1] = 1;
-				++*foundkeys;
+        // A but not B
+        if ( found[(s*2)]  &&  !found[(s*2)+1] ){
+            c->key = bytes_to_num(k_sector[s].keyA, 6);
+            uint8_t status = chkKey_readb(c, k_sector[s].keyB);
+            if ( status == 0 ){
+                found[(s*2)+1] = 1;
+                ++*foundkeys;
 
-				if (MF_DBGLEVEL >= 3) Dbprintf("ChkKeys_fast: Reading B found (%d)", c->block);
+                if (MF_DBGLEVEL >= 3) Dbprintf("ChkKeys_fast: Reading B found (%d)", c->block);
 
-				// try quick find all B?
-				// assume: keys comes in groups. Find one B, test against all B.
-				c->key = bytes_to_num( k_sector[s].keyB, 6);
-				c->keyType = 1;
-				chkKey_scanB(c, k_sector, found, sectorcnt, foundkeys);
-			}
-		}
-	}
+                // try quick find all B?
+                // assume: keys comes in groups. Find one B, test against all B.
+                c->key = bytes_to_num( k_sector[s].keyB, 6);
+                c->keyType = 1;
+                chkKey_scanB(c, k_sector, found, sectorcnt, foundkeys);
+            }
+        }
+    }
 }
 
 
@@ -1199,376 +1199,376 @@ void chkKey_loopBonly(struct chk_t *c, struct sector_t *k_sector, uint8_t *found
 // datain = keys as array
 void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain) {
 
-	// first call or
-	uint8_t sectorcnt = arg0 & 0xFF; // 16;
-	uint8_t firstchunk = (arg0 >> 8) & 0xF;
-	uint8_t lastchunk = (arg0 >> 12) & 0xF;
-	uint8_t strategy = arg1 & 0xFF;
-	uint8_t use_flashmem = (arg1 >> 8) & 0xFF;
-	uint16_t keyCount = arg2 & 0xFF;
-	uint8_t status = 0;
+    // first call or
+    uint8_t sectorcnt = arg0 & 0xFF; // 16;
+    uint8_t firstchunk = (arg0 >> 8) & 0xF;
+    uint8_t lastchunk = (arg0 >> 12) & 0xF;
+    uint8_t strategy = arg1 & 0xFF;
+    uint8_t use_flashmem = (arg1 >> 8) & 0xFF;
+    uint16_t keyCount = arg2 & 0xFF;
+    uint8_t status = 0;
 
-	struct Crypto1State mpcs = {0, 0};
-	struct Crypto1State *pcs;
-	pcs = &mpcs;
-	struct chk_t chk_data;
+    struct Crypto1State mpcs = {0, 0};
+    struct Crypto1State *pcs;
+    pcs = &mpcs;
+    struct chk_t chk_data;
 
-	uint8_t allkeys = sectorcnt << 1;
+    uint8_t allkeys = sectorcnt << 1;
 
-	static uint32_t cuid = 0;
-	static uint8_t cascade_levels = 0;
-	static uint8_t foundkeys = 0;
-	static sector_t k_sector[80];
-	static uint8_t found[80];
-	static uint8_t *uid;
+    static uint32_t cuid = 0;
+    static uint8_t cascade_levels = 0;
+    static uint8_t foundkeys = 0;
+    static sector_t k_sector[80];
+    static uint8_t found[80];
+    static uint8_t *uid;
 
 #ifdef WITH_FLASH
-	if ( use_flashmem ) {
-		BigBuf_free();
-		uint16_t isok = 0;
-		uint8_t size[2] = {0x00, 0x00};
-		isok = Flash_ReadData(DEFAULT_MF_KEYS_OFFSET, size, 2);
-		if ( isok != 2 )
-			goto OUT;
+    if ( use_flashmem ) {
+        BigBuf_free();
+        uint16_t isok = 0;
+        uint8_t size[2] = {0x00, 0x00};
+        isok = Flash_ReadData(DEFAULT_MF_KEYS_OFFSET, size, 2);
+        if ( isok != 2 )
+            goto OUT;
 
-		keyCount = size[1] << 8 | size[0];
+        keyCount = size[1] << 8 | size[0];
 
-		if ( keyCount == 0 && keyCount == 0xFFFF)
-			goto OUT;
+        if ( keyCount == 0 && keyCount == 0xFFFF)
+            goto OUT;
 
-		datain = BigBuf_malloc( keyCount * 6);
-		if (datain == NULL )
-			goto OUT;
+        datain = BigBuf_malloc( keyCount * 6);
+        if (datain == NULL )
+            goto OUT;
 
-		isok = Flash_ReadData(DEFAULT_MF_KEYS_OFFSET+2, datain, keyCount * 6);
-		if ( isok != keyCount * 6 )
-			goto OUT;
+        isok = Flash_ReadData(DEFAULT_MF_KEYS_OFFSET+2, datain, keyCount * 6);
+        if ( isok != keyCount * 6 )
+            goto OUT;
 
-	}
+    }
 #endif
 
-	if (uid == NULL || firstchunk) {
-		uid = BigBuf_malloc(10);
-		if (uid == NULL )
-			goto OUT;
-	}
+    if (uid == NULL || firstchunk) {
+        uid = BigBuf_malloc(10);
+        if (uid == NULL )
+            goto OUT;
+    }
 
-	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+    iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
 
-	LEDsoff();
-	LED_A_ON();
+    LEDsoff();
+    LED_A_ON();
 
-	if ( firstchunk ) {
-		clear_trace();
-		set_tracing(false);
+    if ( firstchunk ) {
+        clear_trace();
+        set_tracing(false);
 
-		memset(k_sector, 0x00, 480+10);
-		memset(found, 0x00, sizeof(found));
-		foundkeys = 0;
+        memset(k_sector, 0x00, 480+10);
+        memset(found, 0x00, sizeof(found));
+        foundkeys = 0;
 
-		iso14a_card_select_t card_info;
-		if ( !iso14443a_select_card(uid, &card_info, &cuid, true, 0, true)) {
-			if (MF_DBGLEVEL >= 1) Dbprintf("ChkKeys_fast: Can't select card (ALL)");
-			goto OUT;
-		}
+        iso14a_card_select_t card_info;
+        if ( !iso14443a_select_card(uid, &card_info, &cuid, true, 0, true)) {
+            if (MF_DBGLEVEL >= 1) Dbprintf("ChkKeys_fast: Can't select card (ALL)");
+            goto OUT;
+        }
 
-		switch (card_info.uidlen) {
-			case 4 : cascade_levels = 1; break;
-			case 7 : cascade_levels = 2; break;
-			case 10: cascade_levels = 3; break;
-			default: break;
-		}
+        switch (card_info.uidlen) {
+            case 4 : cascade_levels = 1; break;
+            case 7 : cascade_levels = 2; break;
+            case 10: cascade_levels = 3; break;
+            default: break;
+        }
 
-		CHK_TIMEOUT();
-	}
+        CHK_TIMEOUT();
+    }
 
-	// set check struct.
-	chk_data.uid = uid;
-	chk_data.cuid = cuid;
-	chk_data.cl = cascade_levels;
-	chk_data.pcs = pcs;
-	chk_data.block = 0;
+    // set check struct.
+    chk_data.uid = uid;
+    chk_data.cuid = cuid;
+    chk_data.cl = cascade_levels;
+    chk_data.pcs = pcs;
+    chk_data.block = 0;
 
-	// keychunk loop - depth first one sector.
-	if ( strategy == 1 || use_flashmem) {
+    // keychunk loop - depth first one sector.
+    if ( strategy == 1 || use_flashmem) {
 
-		uint8_t newfound = foundkeys;
+        uint8_t newfound = foundkeys;
 
-		uint16_t lastpos = 0;
-		uint16_t s_point = 0;
-		// Sector main loop
-		// keep track of how many sectors on card.
-		for (uint8_t s = 0; s < sectorcnt; ++s) {
+        uint16_t lastpos = 0;
+        uint16_t s_point = 0;
+        // Sector main loop
+        // keep track of how many sectors on card.
+        for (uint8_t s = 0; s < sectorcnt; ++s) {
 
-			if ( found[(s*2)] && found[(s*2)+1] )
-				continue;
+            if ( found[(s*2)] && found[(s*2)+1] )
+                continue;
 
-			for (uint16_t i = s_point; i < keyCount; ++i) {
+            for (uint16_t i = s_point; i < keyCount; ++i) {
 
-				//if ( i % 100 == 0) Dbprintf("ChkKeys_fast: sector %d | checking %d | %d found | s_point %d", s, i, foundkeys, s_point);
+                //if ( i % 100 == 0) Dbprintf("ChkKeys_fast: sector %d | checking %d | %d found | s_point %d", s, i, foundkeys, s_point);
 
-				// Allow button press / usb cmd to interrupt device
-				if (BUTTON_PRESS() && !usb_poll_validate_length()) {
-					goto OUT;
-				}
+                // Allow button press / usb cmd to interrupt device
+                if (BUTTON_PRESS() && !usb_poll_validate_length()) {
+                    goto OUT;
+                }
 
-				// found all keys?
-				if ( foundkeys == allkeys )
-					goto OUT;
+                // found all keys?
+                if ( foundkeys == allkeys )
+                    goto OUT;
 
-				WDT_HIT();
+                WDT_HIT();
 
-				// assume: block0,1,2 has more read rights in accessbits than the sectortrailer. authenticating against block0 in each sector
-				chk_data.block = FirstBlockOfSector( s );
+                // assume: block0,1,2 has more read rights in accessbits than the sectortrailer. authenticating against block0 in each sector
+                chk_data.block = FirstBlockOfSector( s );
 
-				// new key
-				chk_data.key = bytes_to_num(datain + i * 6, 6);
+                // new key
+                chk_data.key = bytes_to_num(datain + i * 6, 6);
 
-				// skip already found A keys
-				if( !found[(s*2)] ) {
-					chk_data.keyType = 0;
-					status = chkKey( &chk_data);
-					if ( status == 0 ) {
-						memcpy(k_sector[s].keyA, datain + i * 6, 6);
-						found[(s*2)] = 1;
-						++foundkeys;
+                // skip already found A keys
+                if( !found[(s*2)] ) {
+                    chk_data.keyType = 0;
+                    status = chkKey( &chk_data);
+                    if ( status == 0 ) {
+                        memcpy(k_sector[s].keyA, datain + i * 6, 6);
+                        found[(s*2)] = 1;
+                        ++foundkeys;
 
-						chkKey_scanA(&chk_data, k_sector, found, &sectorcnt, &foundkeys);
+                        chkKey_scanA(&chk_data, k_sector, found, &sectorcnt, &foundkeys);
 
-						// read Block B, if A is found.
-						chkKey_loopBonly( &chk_data, k_sector, found, &sectorcnt, &foundkeys);
+                        // read Block B, if A is found.
+                        chkKey_loopBonly( &chk_data, k_sector, found, &sectorcnt, &foundkeys);
 
-						chk_data.keyType = 1;
-						chkKey_scanB(&chk_data, k_sector, found, &sectorcnt, &foundkeys);
+                        chk_data.keyType = 1;
+                        chkKey_scanB(&chk_data, k_sector, found, &sectorcnt, &foundkeys);
 
-						chk_data.keyType = 0;
-						chk_data.block = FirstBlockOfSector( s );
+                        chk_data.keyType = 0;
+                        chk_data.block = FirstBlockOfSector( s );
 
-						if ( use_flashmem ) {
-							if ( lastpos != i && lastpos != 0) {
-								if ( i - lastpos < 0xF) {
-									s_point = i & 0xFFF0;
-								}
-							} else {
-								lastpos = i;
-							}
-						}
-					}
-				}
+                        if ( use_flashmem ) {
+                            if ( lastpos != i && lastpos != 0) {
+                                if ( i - lastpos < 0xF) {
+                                    s_point = i & 0xFFF0;
+                                }
+                            } else {
+                                lastpos = i;
+                            }
+                        }
+                    }
+                }
 
-				// skip already found B keys
-				if( !found[(s*2)+1] ) {
-					chk_data.keyType = 1;
-					status = chkKey( &chk_data);
-					if ( status == 0 ) {
-						memcpy(k_sector[s].keyB, datain + i * 6, 6);
-						found[(s*2)+1] = 1;
-						++foundkeys;
+                // skip already found B keys
+                if( !found[(s*2)+1] ) {
+                    chk_data.keyType = 1;
+                    status = chkKey( &chk_data);
+                    if ( status == 0 ) {
+                        memcpy(k_sector[s].keyB, datain + i * 6, 6);
+                        found[(s*2)+1] = 1;
+                        ++foundkeys;
 
-						chkKey_scanB(&chk_data, k_sector, found, &sectorcnt, &foundkeys);
+                        chkKey_scanB(&chk_data, k_sector, found, &sectorcnt, &foundkeys);
 
-						if ( use_flashmem ) {
-							if ( lastpos != i && lastpos != 0) {
+                        if ( use_flashmem ) {
+                            if ( lastpos != i && lastpos != 0) {
 
-								if ( i - lastpos < 0xF)
-									s_point = i & 0xFFF0;
-							} else {
-								lastpos = i;
-							}
-						}
-					}
-				}
+                                if ( i - lastpos < 0xF)
+                                    s_point = i & 0xFFF0;
+                            } else {
+                                lastpos = i;
+                            }
+                        }
+                    }
+                }
 
-				if ( found[(s*2)] && found[(s*2)+1] )
-					break;
+                if ( found[(s*2)] && found[(s*2)+1] )
+                    break;
 
-			} // end keys test loop - depth first
+            } // end keys test loop - depth first
 
-			// assume1. if no keys found in first sector, get next keychunk from client
-			if ( !use_flashmem && (newfound-foundkeys == 0) )
-				goto OUT;
+            // assume1. if no keys found in first sector, get next keychunk from client
+            if ( !use_flashmem && (newfound-foundkeys == 0) )
+                goto OUT;
 
-		} // end loop - sector
-	} // end strategy 1
+        } // end loop - sector
+    } // end strategy 1
 
-	if ( foundkeys == allkeys )
-		goto OUT;
+    if ( foundkeys == allkeys )
+        goto OUT;
 
-	if ( strategy == 2 || use_flashmem ) {
+    if ( strategy == 2 || use_flashmem ) {
 
-		// Keychunk loop
-		for (uint16_t i = 0; i < keyCount; i++) {
+        // Keychunk loop
+        for (uint16_t i = 0; i < keyCount; i++) {
 
-			// Allow button press / usb cmd to interrupt device
-			if (BUTTON_PRESS() && !usb_poll_validate_length()) break;
+            // Allow button press / usb cmd to interrupt device
+            if (BUTTON_PRESS() && !usb_poll_validate_length()) break;
 
-			// found all keys?
-			if ( foundkeys == allkeys )
-				goto OUT;
+            // found all keys?
+            if ( foundkeys == allkeys )
+                goto OUT;
 
-			WDT_HIT();
+            WDT_HIT();
 
-			// new key
-			chk_data.key = bytes_to_num(datain + i * 6, 6);
+            // new key
+            chk_data.key = bytes_to_num(datain + i * 6, 6);
 
-			// Sector main loop
-			// keep track of how many sectors on card.
-			for (uint8_t s = 0; s < sectorcnt; ++s) {
+            // Sector main loop
+            // keep track of how many sectors on card.
+            for (uint8_t s = 0; s < sectorcnt; ++s) {
 
-				if ( found[(s*2)] && found[(s*2)+1] ) continue;
+                if ( found[(s*2)] && found[(s*2)+1] ) continue;
 
-				// found all keys?
-				if ( foundkeys == allkeys )
-					goto OUT;
+                // found all keys?
+                if ( foundkeys == allkeys )
+                    goto OUT;
 
-				// assume: block0,1,2 has more read rights in accessbits than the sectortrailer. authenticating against block0 in each sector
-				chk_data.block = FirstBlockOfSector( s );
+                // assume: block0,1,2 has more read rights in accessbits than the sectortrailer. authenticating against block0 in each sector
+                chk_data.block = FirstBlockOfSector( s );
 
-				// skip already found A keys
-				if( !found[(s*2)] ) {
-					chk_data.keyType = 0;
-					status = chkKey( &chk_data);
-					if ( status == 0 ) {
-						memcpy(k_sector[s].keyA, datain + i * 6, 6);
-						found[(s*2)] = 1;
-						++foundkeys;
+                // skip already found A keys
+                if( !found[(s*2)] ) {
+                    chk_data.keyType = 0;
+                    status = chkKey( &chk_data);
+                    if ( status == 0 ) {
+                        memcpy(k_sector[s].keyA, datain + i * 6, 6);
+                        found[(s*2)] = 1;
+                        ++foundkeys;
 
-						chkKey_scanA( &chk_data, k_sector, found, &sectorcnt, &foundkeys);
+                        chkKey_scanA( &chk_data, k_sector, found, &sectorcnt, &foundkeys);
 
-						// read Block B, if A is found.
-						chkKey_loopBonly( &chk_data, k_sector, found, &sectorcnt, &foundkeys);
+                        // read Block B, if A is found.
+                        chkKey_loopBonly( &chk_data, k_sector, found, &sectorcnt, &foundkeys);
 
-						chk_data.block = FirstBlockOfSector( s );
-					}
-				}
+                        chk_data.block = FirstBlockOfSector( s );
+                    }
+                }
 
-				// skip already found B keys
-				if( !found[(s*2)+1] ) {
-					chk_data.keyType = 1;
-					status = chkKey( &chk_data);
-					if ( status == 0 ) {
-						memcpy(k_sector[s].keyB, datain + i * 6, 6);
-						found[(s*2)+1] = 1;
-						++foundkeys;
+                // skip already found B keys
+                if( !found[(s*2)+1] ) {
+                    chk_data.keyType = 1;
+                    status = chkKey( &chk_data);
+                    if ( status == 0 ) {
+                        memcpy(k_sector[s].keyB, datain + i * 6, 6);
+                        found[(s*2)+1] = 1;
+                        ++foundkeys;
 
-						chkKey_scanB(&chk_data, k_sector, found, &sectorcnt, &foundkeys);
-					}
-				}
-			} // end loop sectors
-		} // end loop keys
-	} // end loop strategy 2
+                        chkKey_scanB(&chk_data, k_sector, found, &sectorcnt, &foundkeys);
+                    }
+                }
+            } // end loop sectors
+        } // end loop keys
+    } // end loop strategy 2
 OUT:
-	LEDsoff();
+    LEDsoff();
 
-	crypto1_destroy(pcs);
+    crypto1_destroy(pcs);
 
-	// All keys found, send to client, or last keychunk from client
-	if (foundkeys == allkeys || lastchunk ) {
+    // All keys found, send to client, or last keychunk from client
+    if (foundkeys == allkeys || lastchunk ) {
 
-		uint64_t foo = 0;
-		for (uint8_t m = 0; m < 64; m++) {
-			foo |= ((uint64_t)(found[m] & 1) << m);
-		}
+        uint64_t foo = 0;
+        for (uint8_t m = 0; m < 64; m++) {
+            foo |= ((uint64_t)(found[m] & 1) << m);
+        }
 
-		uint16_t bar = 0;
-		uint8_t j = 0;
-		for (uint8_t m=64; m < sizeof(found); m++) {
-			bar |= ((uint16_t)(found[m] & 1) << j++);
-		}
+        uint16_t bar = 0;
+        uint8_t j = 0;
+        for (uint8_t m=64; m < sizeof(found); m++) {
+            bar |= ((uint16_t)(found[m] & 1) << j++);
+        }
 
-		uint8_t *tmp =  BigBuf_malloc(480+10);
-		memcpy(tmp, k_sector, sectorcnt * sizeof(sector_t) );
-		num_to_bytes(foo, 8, tmp+480);
-		tmp[488] = bar & 0xFF;
-		tmp[489] = bar >> 8 & 0xFF;
+        uint8_t *tmp =  BigBuf_malloc(480+10);
+        memcpy(tmp, k_sector, sectorcnt * sizeof(sector_t) );
+        num_to_bytes(foo, 8, tmp+480);
+        tmp[488] = bar & 0xFF;
+        tmp[489] = bar >> 8 & 0xFF;
 
-		cmd_send(CMD_ACK, foundkeys, 0, 0, tmp, 480+10);
+        cmd_send(CMD_ACK, foundkeys, 0, 0, tmp, 480+10);
 
-		set_tracing(false);
-		FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-		BigBuf_free(); BigBuf_Clear_ext(false);
-	} else {
-		// partial/none keys found
-		cmd_send(CMD_ACK, foundkeys, 0, 0, 0, 0);
-	}
+        set_tracing(false);
+        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+        BigBuf_free(); BigBuf_Clear_ext(false);
+    } else {
+        // partial/none keys found
+        cmd_send(CMD_ACK, foundkeys, 0, 0, 0, 0);
+    }
 }
 
 void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) {
 
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 
-	struct Crypto1State mpcs = {0, 0};
-	struct Crypto1State *pcs;
-	pcs = &mpcs;
+    struct Crypto1State mpcs = {0, 0};
+    struct Crypto1State *pcs;
+    pcs = &mpcs;
 
-	uint8_t uid[10] = {0x00};
+    uint8_t uid[10] = {0x00};
 
-	uint64_t key = 0;
-	uint32_t cuid = 0;
-	int i, res;
-	uint8_t blockNo = arg0 & 0xFF;
-	uint8_t keyType = (arg0 >> 8) & 0xFF;
-	uint8_t keyCount = arg2;
-	uint8_t cascade_levels = 0;
-	uint8_t isOK = 0;
-	bool have_uid = false;
-	bool clearTrace = arg1 & 0xFF;
+    uint64_t key = 0;
+    uint32_t cuid = 0;
+    int i, res;
+    uint8_t blockNo = arg0 & 0xFF;
+    uint8_t keyType = (arg0 >> 8) & 0xFF;
+    uint8_t keyCount = arg2;
+    uint8_t cascade_levels = 0;
+    uint8_t isOK = 0;
+    bool have_uid = false;
+    bool clearTrace = arg1 & 0xFF;
 
-	LEDsoff();
-	LED_A_ON();
+    LEDsoff();
+    LED_A_ON();
 
-	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+    iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
 
-	if (clearTrace)
-		clear_trace();
+    if (clearTrace)
+        clear_trace();
 
-	set_tracing(true);
+    set_tracing(true);
 
-	for (i = 0; i < keyCount; i++) {
+    for (i = 0; i < keyCount; i++) {
 
-		// Iceman: use piwi's faster nonce collecting part in hardnested.
-		if (!have_uid) { // need a full select cycle to get the uid first
-			iso14a_card_select_t card_info;
-			if (!iso14443a_select_card(uid, &card_info, &cuid, true, 0, true)) {
-				if (MF_DBGLEVEL >= 1)	Dbprintf("ChkKeys: Can't select card (ALL)");
-				--i; // try same key once again
-				continue;
-			}
-			switch (card_info.uidlen) {
-				case 4 : cascade_levels = 1; break;
-				case 7 : cascade_levels = 2; break;
-				case 10: cascade_levels = 3; break;
-				default: break;
-			}
-			have_uid = true;
-		} else { // no need for anticollision. We can directly select the card
-			if (!iso14443a_select_card(uid, NULL, NULL, false, cascade_levels, true)) {
-				if (MF_DBGLEVEL >= 1)	Dbprintf("ChkKeys: Can't select card (UID)");
-				--i; // try same key once again
-				continue;
-			}
-		}
+        // Iceman: use piwi's faster nonce collecting part in hardnested.
+        if (!have_uid) { // need a full select cycle to get the uid first
+            iso14a_card_select_t card_info;
+            if (!iso14443a_select_card(uid, &card_info, &cuid, true, 0, true)) {
+                if (MF_DBGLEVEL >= 1) Dbprintf("ChkKeys: Can't select card (ALL)");
+                --i; // try same key once again
+                continue;
+            }
+            switch (card_info.uidlen) {
+                case 4 : cascade_levels = 1; break;
+                case 7 : cascade_levels = 2; break;
+                case 10: cascade_levels = 3; break;
+                default: break;
+            }
+            have_uid = true;
+        } else { // no need for anticollision. We can directly select the card
+            if (!iso14443a_select_card(uid, NULL, NULL, false, cascade_levels, true)) {
+                if (MF_DBGLEVEL >= 1) Dbprintf("ChkKeys: Can't select card (UID)");
+                --i; // try same key once again
+                continue;
+            }
+        }
 
-		key = bytes_to_num(datain + i * 6, 6);
-		res = mifare_classic_auth(pcs, cuid, blockNo, keyType, key, AUTH_FIRST);
+        key = bytes_to_num(datain + i * 6, 6);
+        res = mifare_classic_auth(pcs, cuid, blockNo, keyType, key, AUTH_FIRST);
 
-		CHK_TIMEOUT();
+        CHK_TIMEOUT();
 
-		if (res)
-			continue;
+        if (res)
+            continue;
 
-		isOK = 1;
-		break;
-	}
+        isOK = 1;
+        break;
+    }
 
-	LED_B_ON();
+    LED_B_ON();
     cmd_send(CMD_ACK, isOK, 0, 0, datain + i * 6, 6);
 
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	LEDsoff();
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    LEDsoff();
 
-	set_tracing(false);
-	crypto1_destroy(pcs);
+    set_tracing(false);
+    crypto1_destroy(pcs);
 }
 
 //-----------------------------------------------------------------------------
@@ -1576,8 +1576,8 @@ void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) {
 //
 //-----------------------------------------------------------------------------
 void MifareSetDbgLvl(uint16_t arg0){
-	MF_DBGLEVEL = arg0;
-	Dbprintf("Debug level: %d", MF_DBGLEVEL);
+    MF_DBGLEVEL = arg0;
+    Dbprintf("Debug level: %d", MF_DBGLEVEL);
 }
 
 //-----------------------------------------------------------------------------
@@ -1589,24 +1589,24 @@ void MifareSetDbgLvl(uint16_t arg0){
 //-----------------------------------------------------------------------------
 
 void MifareEMemClr(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){
-	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-	emlClearMem();
+    FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
+    emlClearMem();
 }
 
 void MifareEMemSet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){
-	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-	if (arg2==0) arg2 = 16; // backwards compat... default bytewidth
-	emlSetMem_xt(datain, arg0, arg1, arg2); // data, block num, blocks count, block byte width
+    FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
+    if (arg2==0) arg2 = 16; // backwards compat... default bytewidth
+    emlSetMem_xt(datain, arg0, arg1, arg2); // data, block num, blocks count, block byte width
 }
 
 void MifareEMemGet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){
-	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-	byte_t buf[USB_CMD_DATA_SIZE] = {0x00};
-	emlGetMem(buf, arg0, arg1); // data, block num, blocks count (max 4)
+    FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
+    byte_t buf[USB_CMD_DATA_SIZE] = {0x00};
+    emlGetMem(buf, arg0, arg1); // data, block num, blocks count (max 4)
 
-	LED_B_ON();
-	cmd_send(CMD_ACK,arg0,arg1,0,buf,USB_CMD_DATA_SIZE);
-	LED_B_OFF();
+    LED_B_ON();
+    cmd_send(CMD_ACK,arg0,arg1,0,buf,USB_CMD_DATA_SIZE);
+    LED_B_OFF();
 }
 
 //-----------------------------------------------------------------------------
@@ -1614,82 +1614,82 @@ void MifareEMemGet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)
 //
 //-----------------------------------------------------------------------------
 void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){
-	uint8_t numSectors = arg0;
-	uint8_t keyType = arg1;
-	uint64_t ui64Key = 0;
-	uint32_t cuid = 0;
-	struct Crypto1State mpcs = {0, 0};
-	struct Crypto1State *pcs;
-	pcs = &mpcs;
+    uint8_t numSectors = arg0;
+    uint8_t keyType = arg1;
+    uint64_t ui64Key = 0;
+    uint32_t cuid = 0;
+    struct Crypto1State mpcs = {0, 0};
+    struct Crypto1State *pcs;
+    pcs = &mpcs;
 
-	// variables
-	byte_t dataoutbuf[16] = {0x00};
-	byte_t dataoutbuf2[16] = {0x00};
-	uint8_t uid[10] = {0x00};
+    // variables
+    byte_t dataoutbuf[16] = {0x00};
+    byte_t dataoutbuf2[16] = {0x00};
+    uint8_t uid[10] = {0x00};
 
-	LED_A_ON();
-	LED_B_OFF();
-	LED_C_OFF();
-	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+    LED_A_ON();
+    LED_B_OFF();
+    LED_C_OFF();
+    iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
 
-	clear_trace();
-	set_tracing(true);
+    clear_trace();
+    set_tracing(true);
 
-	bool isOK = true;
+    bool isOK = true;
 
-	if(!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
-		isOK = false;
-		if (MF_DBGLEVEL >= 1)	Dbprintf("Can't select card");
-	}
+    if(!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
+        isOK = false;
+        if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
+    }
 
-	for (uint8_t sectorNo = 0; isOK && sectorNo < numSectors; sectorNo++) {
-		ui64Key = emlGetKey(sectorNo, keyType);
-		if (sectorNo == 0){
-			if(isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_FIRST)) {
-				isOK = false;
-				if (MF_DBGLEVEL >= 1)	Dbprintf("Sector[%2d]. Auth error", sectorNo);
-				break;
-			}
-		} else {
-			if(isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_NESTED)) {
-				isOK = false;
-				if (MF_DBGLEVEL >= 1)	Dbprintf("Sector[%2d]. Auth nested error", sectorNo);
-				break;
-			}
-		}
+    for (uint8_t sectorNo = 0; isOK && sectorNo < numSectors; sectorNo++) {
+        ui64Key = emlGetKey(sectorNo, keyType);
+        if (sectorNo == 0){
+            if(isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_FIRST)) {
+                isOK = false;
+                if (MF_DBGLEVEL >= 1) Dbprintf("Sector[%2d]. Auth error", sectorNo);
+                break;
+            }
+        } else {
+            if(isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_NESTED)) {
+                isOK = false;
+                if (MF_DBGLEVEL >= 1) Dbprintf("Sector[%2d]. Auth nested error", sectorNo);
+                break;
+            }
+        }
 
-		for (uint8_t blockNo = 0; isOK && blockNo < NumBlocksPerSector(sectorNo); blockNo++) {
-			if(isOK && mifare_classic_readblock(pcs, cuid, FirstBlockOfSector(sectorNo) + blockNo, dataoutbuf)) {
-				isOK = false;
-				if (MF_DBGLEVEL >= 1)	Dbprintf("Error reading sector %2d block %2d", sectorNo, blockNo);
-				break;
-			}
-			if (isOK) {
-				if (blockNo < NumBlocksPerSector(sectorNo) - 1) {
-					emlSetMem(dataoutbuf, FirstBlockOfSector(sectorNo) + blockNo, 1);
-				} else {	// sector trailer, keep the keys, set only the AC
-					emlGetMem(dataoutbuf2, FirstBlockOfSector(sectorNo) + blockNo, 1);
-					memcpy(&dataoutbuf2[6], &dataoutbuf[6], 4);
-					emlSetMem(dataoutbuf2,  FirstBlockOfSector(sectorNo) + blockNo, 1);
-				}
-			}
-		}
+        for (uint8_t blockNo = 0; isOK && blockNo < NumBlocksPerSector(sectorNo); blockNo++) {
+            if(isOK && mifare_classic_readblock(pcs, cuid, FirstBlockOfSector(sectorNo) + blockNo, dataoutbuf)) {
+                isOK = false;
+                if (MF_DBGLEVEL >= 1) Dbprintf("Error reading sector %2d block %2d", sectorNo, blockNo);
+                break;
+            }
+            if (isOK) {
+                if (blockNo < NumBlocksPerSector(sectorNo) - 1) {
+                    emlSetMem(dataoutbuf, FirstBlockOfSector(sectorNo) + blockNo, 1);
+                } else { // sector trailer, keep the keys, set only the AC
+                    emlGetMem(dataoutbuf2, FirstBlockOfSector(sectorNo) + blockNo, 1);
+                    memcpy(&dataoutbuf2[6], &dataoutbuf[6], 4);
+                    emlSetMem(dataoutbuf2,  FirstBlockOfSector(sectorNo) + blockNo, 1);
+                }
+            }
+        }
 
-	}
+    }
 
-	if(mifare_classic_halt(pcs, cuid))
-		if (MF_DBGLEVEL >= 1)
-			Dbprintf("Halt error");
+    if(mifare_classic_halt(pcs, cuid))
+        if (MF_DBGLEVEL >= 1)
+            Dbprintf("Halt error");
 
-	//  ----------------------------- crypto1 destroy
-	crypto1_destroy(pcs);
+    //  ----------------------------- crypto1 destroy
+    crypto1_destroy(pcs);
 
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	LEDsoff();
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    LEDsoff();
 
-	if (MF_DBGLEVEL >= 2) DbpString("EMUL FILL SECTORS FINISHED");
+    if (MF_DBGLEVEL >= 2) DbpString("EMUL FILL SECTORS FINISHED");
 
-	set_tracing(false);
+    set_tracing(false);
 }
 
 
@@ -1712,359 +1712,359 @@ uint8_t wipeC[] = { MIFARE_MAGICWIPEC };
 
 void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){
 
-	// params
-	uint8_t workFlags = arg0;
-	uint8_t blockNo = arg1;
+    // params
+    uint8_t workFlags = arg0;
+    uint8_t blockNo = arg1;
 
-	// detect 1a/1b
-	bool is1b = false;
+    // detect 1a/1b
+    bool is1b = false;
 
-	// variables
-	bool isOK = false; //assume we will get an error
-	uint8_t errormsg = 0x00;
-	uint8_t uid[10] = {0x00};
-	uint8_t data[18] = {0x00};
-	uint32_t cuid = 0;
+    // variables
+    bool isOK = false; //assume we will get an error
+    uint8_t errormsg = 0x00;
+    uint8_t uid[10] = {0x00};
+    uint8_t data[18] = {0x00};
+    uint32_t cuid = 0;
 
-	uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};
-	uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0x00};
+    uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};
+    uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0x00};
 
-	if (workFlags & MAGIC_INIT) {
-		LED_A_ON();
-		LED_B_OFF();
-		iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
-		clear_trace();
-		set_tracing(true);
-	}
+    if (workFlags & MAGIC_INIT) {
+        LED_A_ON();
+        LED_B_OFF();
+        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+        clear_trace();
+        set_tracing(true);
+    }
 
-	//loop doesn't loop just breaks out if error
-	while (true) {
-		// read UID and return to client with write
-		if (workFlags & MAGIC_UID) {
-			if(!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
-				if (MF_DBGLEVEL >= MF_DBG_ERROR)	Dbprintf("Can't select card");
-				errormsg = MAGIC_UID;
-			}
-			mifare_classic_halt_ex(NULL);
-			break;
-		}
+    //loop doesn't loop just breaks out if error
+    while (true) {
+        // read UID and return to client with write
+        if (workFlags & MAGIC_UID) {
+            if(!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
+                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card");
+                errormsg = MAGIC_UID;
+            }
+            mifare_classic_halt_ex(NULL);
+            break;
+        }
 
-		// wipe tag, fill it with zeros
-		if (workFlags & MAGIC_WIPE){
-			ReaderTransmitBitsPar(wupC1, 7, NULL, NULL);
-			if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
-				if (MF_DBGLEVEL >= MF_DBG_ERROR)	Dbprintf("wupC1 error");
-				errormsg = MAGIC_WIPE;
-				break;
-			}
+        // wipe tag, fill it with zeros
+        if (workFlags & MAGIC_WIPE){
+            ReaderTransmitBitsPar(wupC1, 7, NULL, NULL);
+            if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
+                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("wupC1 error");
+                errormsg = MAGIC_WIPE;
+                break;
+            }
 
-			ReaderTransmit(wipeC, sizeof(wipeC), NULL);
-			if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
-				if (MF_DBGLEVEL >= MF_DBG_ERROR)	Dbprintf("wipeC error");
-				errormsg = MAGIC_WIPE;
-				break;
-			}
+            ReaderTransmit(wipeC, sizeof(wipeC), NULL);
+            if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
+                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("wipeC error");
+                errormsg = MAGIC_WIPE;
+                break;
+            }
 
-			mifare_classic_halt_ex(NULL);
-		}
+            mifare_classic_halt_ex(NULL);
+        }
 
-		// write block
-		if (workFlags & MAGIC_WUPC) {
-			ReaderTransmitBitsPar(wupC1, 7, NULL, NULL);
-			if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
-				if (MF_DBGLEVEL >= MF_DBG_ERROR)	Dbprintf("wupC1 error");
-				errormsg = MAGIC_WUPC;
-				break;
-			}
+        // write block
+        if (workFlags & MAGIC_WUPC) {
+            ReaderTransmitBitsPar(wupC1, 7, NULL, NULL);
+            if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
+                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("wupC1 error");
+                errormsg = MAGIC_WUPC;
+                break;
+            }
 
-			if ( !is1b ) {
-				ReaderTransmit(wupC2, sizeof(wupC2), NULL);
-				if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
-					if (MF_DBGLEVEL >= MF_DBG_ALL) Dbprintf("Assuming Magic Gen 1B tag. [wupC2 failed]");
-					is1b = true;
-					continue;
-				}
-			}
-		}
+            if ( !is1b ) {
+                ReaderTransmit(wupC2, sizeof(wupC2), NULL);
+                if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
+                    if (MF_DBGLEVEL >= MF_DBG_ALL) Dbprintf("Assuming Magic Gen 1B tag. [wupC2 failed]");
+                    is1b = true;
+                    continue;
+                }
+            }
+        }
 
-		if ((mifare_sendcmd_short(NULL, 0, ISO14443A_CMD_WRITEBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL) != 1) || (receivedAnswer[0] != 0x0a)) {
-			if (MF_DBGLEVEL >= MF_DBG_ERROR)	Dbprintf("write block send command error");
-			errormsg = 4;
-			break;
-		}
+        if ((mifare_sendcmd_short(NULL, 0, ISO14443A_CMD_WRITEBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL) != 1) || (receivedAnswer[0] != 0x0a)) {
+            if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("write block send command error");
+            errormsg = 4;
+            break;
+        }
 
-		memcpy(data, datain, 16);
-		AddCrc14A(data, 16);
+        memcpy(data, datain, 16);
+        AddCrc14A(data, 16);
 
-		ReaderTransmit(data, sizeof(data), NULL);
-		if ((ReaderReceive(receivedAnswer, receivedAnswerPar) != 1) || (receivedAnswer[0] != 0x0a)) {
-			if (MF_DBGLEVEL >= MF_DBG_ERROR)	Dbprintf("write block send data error");
-			errormsg = 0;
-			break;
-		}
+        ReaderTransmit(data, sizeof(data), NULL);
+        if ((ReaderReceive(receivedAnswer, receivedAnswerPar) != 1) || (receivedAnswer[0] != 0x0a)) {
+            if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("write block send data error");
+            errormsg = 0;
+            break;
+        }
 
-		if (workFlags & MAGIC_HALT)
-			mifare_classic_halt_ex(NULL);
+        if (workFlags & MAGIC_HALT)
+            mifare_classic_halt_ex(NULL);
 
-		isOK = true;
-		break;
+        isOK = true;
+        break;
 
-	} // end while
+    } // end while
 
-	if (isOK )
-		cmd_send(CMD_ACK,1,0,0,uid,sizeof(uid));
-	else
-		OnErrorMagic(errormsg);
+    if (isOK )
+        cmd_send(CMD_ACK,1,0,0,uid,sizeof(uid));
+    else
+        OnErrorMagic(errormsg);
 
-	if (workFlags & MAGIC_OFF)
-		OnSuccessMagic();
+    if (workFlags & MAGIC_OFF)
+        OnSuccessMagic();
 }
 
 void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){
 
-	uint8_t workFlags = arg0;
-	uint8_t blockNo = arg1;
-	uint8_t errormsg = 0x00;
-	bool isOK = false; //assume we will get an error
+    uint8_t workFlags = arg0;
+    uint8_t blockNo = arg1;
+    uint8_t errormsg = 0x00;
+    bool isOK = false; //assume we will get an error
 
-	// detect 1a/1b
-	bool is1b = false;
+    // detect 1a/1b
+    bool is1b = false;
 
-	// variables
-	uint8_t data[MAX_MIFARE_FRAME_SIZE];
-	uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};
-	uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0x00};
+    // variables
+    uint8_t data[MAX_MIFARE_FRAME_SIZE];
+    uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};
+    uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0x00};
 
-	memset(data, 0x00, sizeof(data));
+    memset(data, 0x00, sizeof(data));
 
-	if (workFlags & MAGIC_INIT) {
-		LED_A_ON();
-		LED_B_OFF();
-		iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
-		clear_trace();
-		set_tracing(true);
-	}
+    if (workFlags & MAGIC_INIT) {
+        LED_A_ON();
+        LED_B_OFF();
+        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+        clear_trace();
+        set_tracing(true);
+    }
 
-	//loop doesn't loop just breaks out if error or done
-	while (true) {
-		if (workFlags & MAGIC_WUPC) {
-			ReaderTransmitBitsPar(wupC1, 7, NULL, NULL);
-			if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
-				if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("wupC1 error");
-				errormsg = MAGIC_WUPC;
-				break;
-			}
+    //loop doesn't loop just breaks out if error or done
+    while (true) {
+        if (workFlags & MAGIC_WUPC) {
+            ReaderTransmitBitsPar(wupC1, 7, NULL, NULL);
+            if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
+                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("wupC1 error");
+                errormsg = MAGIC_WUPC;
+                break;
+            }
 
-			if ( !is1b )  {
-				ReaderTransmit(wupC2, sizeof(wupC2), NULL);
-				if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
-					if (MF_DBGLEVEL >= MF_DBG_ALL) Dbprintf("Assuming Magic Gen 1B tag. [wupC2 failed]");
-					is1b = true;
-					continue;
-				}
-			}
-		}
+            if ( !is1b )  {
+                ReaderTransmit(wupC2, sizeof(wupC2), NULL);
+                if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
+                    if (MF_DBGLEVEL >= MF_DBG_ALL) Dbprintf("Assuming Magic Gen 1B tag. [wupC2 failed]");
+                    is1b = true;
+                    continue;
+                }
+            }
+        }
 
-		// read block
-		if ((mifare_sendcmd_short(NULL, 0, ISO14443A_CMD_READBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL) != 18)) {
-			if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("read block send command error");
-			errormsg = 0;
-			break;
-		}
+        // read block
+        if ((mifare_sendcmd_short(NULL, 0, ISO14443A_CMD_READBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL) != 18)) {
+            if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("read block send command error");
+            errormsg = 0;
+            break;
+        }
 
-		memcpy(data, receivedAnswer, sizeof(data));
+        memcpy(data, receivedAnswer, sizeof(data));
 
-		// send HALT
-		if (workFlags & MAGIC_HALT)
-			mifare_classic_halt_ex(NULL);
+        // send HALT
+        if (workFlags & MAGIC_HALT)
+            mifare_classic_halt_ex(NULL);
 
-		isOK = true;
-		break;
-	}
-	// if MAGIC_DATAIN, the data stays on device side.
-	if (workFlags & MAGIC_DATAIN) {
-		if (isOK)
-			memcpy(datain, data, sizeof(data));
-	} else {
-		if (isOK)
-			cmd_send(CMD_ACK,1,0,0,data,sizeof(data));
-		else
-			OnErrorMagic(errormsg);
-	}
+        isOK = true;
+        break;
+    }
+    // if MAGIC_DATAIN, the data stays on device side.
+    if (workFlags & MAGIC_DATAIN) {
+        if (isOK)
+            memcpy(datain, data, sizeof(data));
+    } else {
+        if (isOK)
+            cmd_send(CMD_ACK,1,0,0,data,sizeof(data));
+        else
+            OnErrorMagic(errormsg);
+    }
 
-	if (workFlags & MAGIC_OFF)
-		OnSuccessMagic();
+    if (workFlags & MAGIC_OFF)
+        OnSuccessMagic();
 }
 
 void MifareCIdent(){
-	#define GEN_1A 1
-	#define GEN_1B 2
-	#define GEN_2  4
-	// variables
-	uint8_t isGen = 0;
-	uint8_t rec[1] = {0x00};
-	uint8_t recpar[1] = {0x00};
+    #define GEN_1A 1
+    #define GEN_1B 2
+    #define GEN_2  4
+    // variables
+    uint8_t isGen = 0;
+    uint8_t rec[1] = {0x00};
+    uint8_t recpar[1] = {0x00};
 
-	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+    iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
 
-	// Generation 1 test
-	ReaderTransmitBitsPar(wupC1, 7, NULL, NULL);
-	if(!ReaderReceive(rec, recpar) || (rec[0] != 0x0a)) {
-		goto TEST2;
-	};
-	isGen = GEN_1B;
+    // Generation 1 test
+    ReaderTransmitBitsPar(wupC1, 7, NULL, NULL);
+    if(!ReaderReceive(rec, recpar) || (rec[0] != 0x0a)) {
+        goto TEST2;
+    };
+    isGen = GEN_1B;
 
-	ReaderTransmit(wupC2, sizeof(wupC2), NULL);
-	if(!ReaderReceive(rec, recpar) || (rec[0] != 0x0a)) {
-		goto OUT;
-	};
-	isGen = GEN_1A;
-	goto OUT;
+    ReaderTransmit(wupC2, sizeof(wupC2), NULL);
+    if(!ReaderReceive(rec, recpar) || (rec[0] != 0x0a)) {
+        goto OUT;
+    };
+    isGen = GEN_1A;
+    goto OUT;
 
 TEST2:;
 /*
-	// Generation 2 test
+    // Generation 2 test
 
-	// halt previous.
-	mifare_classic_halt(NULL, 0);
+    // halt previous.
+    mifare_classic_halt(NULL, 0);
 
-	//select
-	if (!iso14443a_select_card(NULL, NULL, NULL, true, 0, true)) {
-		goto OUT;
-	};
+    //select
+    if (!iso14443a_select_card(NULL, NULL, NULL, true, 0, true)) {
+        goto OUT;
+    };
 
-	// MIFARE_CLASSIC_WRITEBLOCK 0xA0
-	// ACK 0x0a
-	uint16_t len = mifare_sendcmd_short(null, 1, 0xA0, 0, rec, recpar, NULL);
-	if ((len != 1) || (rec[0] != 0x0A)) {
-		isGen = GEN_2;
-	};
-	*/
+    // MIFARE_CLASSIC_WRITEBLOCK 0xA0
+    // ACK 0x0a
+    uint16_t len = mifare_sendcmd_short(null, 1, 0xA0, 0, rec, recpar, NULL);
+    if ((len != 1) || (rec[0] != 0x0A)) {
+        isGen = GEN_2;
+    };
+    */
 OUT:;
-	// removed the if,  since some magic tags misbehavies and send an answer to it.
-	mifare_classic_halt_ex(NULL);
-	cmd_send(CMD_ACK, isGen, 0, 0, 0, 0);
-	// turns off
-	OnSuccessMagic();
+    // removed the if,  since some magic tags misbehavies and send an answer to it.
+    mifare_classic_halt_ex(NULL);
+    cmd_send(CMD_ACK, isGen, 0, 0, 0, 0);
+    // turns off
+    OnSuccessMagic();
 }
 
 void OnSuccessMagic(){
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	LEDsoff();
-	set_tracing(false);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    LEDsoff();
+    set_tracing(false);
 }
 void OnErrorMagic(uint8_t reason){
-	//          ACK, ISOK, reason,0,0,0
-	cmd_send(CMD_ACK,0,reason,0,0,0);
-	OnSuccessMagic();
+    //          ACK, ISOK, reason,0,0,0
+    cmd_send(CMD_ACK,0,reason,0,0,0);
+    OnSuccessMagic();
 }
 
 void MifareSetMod(uint8_t mod, uint8_t *key) {
-	uint64_t ui64Key = bytes_to_num(key, 6);
+    uint64_t ui64Key = bytes_to_num(key, 6);
 
-	// variables
-	uint8_t isOK = 0;
-	uint8_t uid[10] = {0};
-	uint32_t cuid = 0;
-	struct Crypto1State mpcs = {0, 0};
-	struct Crypto1State *pcs = &mpcs;
-	int respLen = 0;
-	uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0};
-	uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0};
+    // variables
+    uint8_t isOK = 0;
+    uint8_t uid[10] = {0};
+    uint32_t cuid = 0;
+    struct Crypto1State mpcs = {0, 0};
+    struct Crypto1State *pcs = &mpcs;
+    int respLen = 0;
+    uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0};
+    uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0};
 
-	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+    iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
 
-	clear_trace();
-	set_tracing(true);
+    clear_trace();
+    set_tracing(true);
 
-	LED_A_ON();
-	LED_B_OFF();
-	LED_C_OFF();
+    LED_A_ON();
+    LED_B_OFF();
+    LED_C_OFF();
 
-	while (true) {
-		if(!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
-			if (MF_DBGLEVEL >= 1)	Dbprintf("Can't select card");
-			break;
-		}
+    while (true) {
+        if(!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
+            if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
+            break;
+        }
 
-		if(mifare_classic_auth(pcs, cuid, 0, 0, ui64Key, AUTH_FIRST)) {
-			if (MF_DBGLEVEL >= 1)	Dbprintf("Auth error");
-			break;
-		}
+        if(mifare_classic_auth(pcs, cuid, 0, 0, ui64Key, AUTH_FIRST)) {
+            if (MF_DBGLEVEL >= 1) Dbprintf("Auth error");
+            break;
+        }
 
-		if (((respLen = mifare_sendcmd_short(pcs, 1, 0x43, mod, receivedAnswer, receivedAnswerPar, NULL)) != 1) || (receivedAnswer[0] != 0x0a)) {
-			if (MF_DBGLEVEL >= 1)	Dbprintf("SetMod error; response[0]: %hhX, len: %d", receivedAnswer[0], respLen);
-			break;
-		}
+        if (((respLen = mifare_sendcmd_short(pcs, 1, 0x43, mod, receivedAnswer, receivedAnswerPar, NULL)) != 1) || (receivedAnswer[0] != 0x0a)) {
+            if (MF_DBGLEVEL >= 1) Dbprintf("SetMod error; response[0]: %hhX, len: %d", receivedAnswer[0], respLen);
+            break;
+        }
 
-		if(mifare_classic_halt(pcs, cuid)) {
-			if (MF_DBGLEVEL >= 1)	Dbprintf("Halt error");
-			break;
-		}
+        if(mifare_classic_halt(pcs, cuid)) {
+            if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
+            break;
+        }
 
-		isOK = 1;
-		break;
-	}
+        isOK = 1;
+        break;
+    }
 
-	crypto1_destroy(pcs);
+    crypto1_destroy(pcs);
 
-	LED_B_ON();
-	cmd_send(CMD_ACK, isOK, 0, 0, 0, 0);
-	LED_B_OFF();
+    LED_B_ON();
+    cmd_send(CMD_ACK, isOK, 0, 0, 0, 0);
+    LED_B_OFF();
 
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	LEDsoff();
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    LEDsoff();
 }
 
 //
 // DESFIRE
 //
 void Mifare_DES_Auth1(uint8_t arg0, uint8_t *datain){
-	byte_t dataout[12] = {0x00};
-	uint8_t uid[10] = {0x00};
-	uint32_t cuid = 0;
+    byte_t dataout[12] = {0x00};
+    uint8_t uid[10] = {0x00};
+    uint32_t cuid = 0;
 
-	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
-	clear_trace();
-	set_tracing(true);
+    iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+    clear_trace();
+    set_tracing(true);
 
-	int len = iso14443a_select_card(uid, NULL, &cuid, true, 0, false);
-	if(!len) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card");
-		OnError(1);
-		return;
-	};
+    int len = iso14443a_select_card(uid, NULL, &cuid, true, 0, false);
+    if(!len) {
+        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card");
+        OnError(1);
+        return;
+    };
 
-	if(mifare_desfire_des_auth1(cuid, dataout)){
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication part1: Fail.");
-		OnError(4);
-		return;
-	}
+    if(mifare_desfire_des_auth1(cuid, dataout)){
+        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication part1: Fail.");
+        OnError(4);
+        return;
+    }
 
-	if (MF_DBGLEVEL >= MF_DBG_EXTENDED) DbpString("AUTH 1 FINISHED");
+    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) DbpString("AUTH 1 FINISHED");
     cmd_send(CMD_ACK, 1, cuid, 0, dataout, sizeof(dataout));
 }
 
 void Mifare_DES_Auth2(uint32_t arg0, uint8_t *datain){
-	uint32_t cuid = arg0;
-	uint8_t key[16] = {0x00};
-	byte_t dataout[12] = {0x00};
-	byte_t isOK = 0;
+    uint32_t cuid = arg0;
+    uint8_t key[16] = {0x00};
+    byte_t dataout[12] = {0x00};
+    byte_t isOK = 0;
 
-	memcpy(key, datain, 16);
+    memcpy(key, datain, 16);
 
-	isOK = mifare_desfire_des_auth2(cuid, key, dataout);
+    isOK = mifare_desfire_des_auth2(cuid, key, dataout);
 
-	if( isOK) {
-	    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Authentication part2: Failed");
-		OnError(4);
-		return;
-	}
+    if( isOK) {
+        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Authentication part2: Failed");
+        OnError(4);
+        return;
+    }
 
-	if (MF_DBGLEVEL >= MF_DBG_EXTENDED) DbpString("AUTH 2 FINISHED");
+    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) DbpString("AUTH 2 FINISHED");
 
-	cmd_send(CMD_ACK, isOK, 0, 0, dataout, sizeof(dataout));
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	LEDsoff();
-	set_tracing(false);
+    cmd_send(CMD_ACK, isOK, 0, 0, dataout, sizeof(dataout));
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    LEDsoff();
+    set_tracing(false);
 }
\ No newline at end of file
diff --git a/armsrc/mifaredesfire.c b/armsrc/mifaredesfire.c
index 4cafca16c..e53ac0f59 100644
--- a/armsrc/mifaredesfire.c
+++ b/armsrc/mifaredesfire.c
@@ -18,189 +18,189 @@ static  uint8_t deselect_cmd[] = {0xc2,0xe0,0xb4};
 
 bool InitDesfireCard(){
 
-	iso14a_card_select_t card;
+    iso14a_card_select_t card;
 
-	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
-	set_tracing(true);
+    iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+    set_tracing(true);
 
-	if (!iso14443a_select_card(NULL, &card, NULL, true, 0, false)) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) DbpString("Can't select card");
-		OnError(1);
-		return false;
-	}
-	return true;
+    if (!iso14443a_select_card(NULL, &card, NULL, true, 0, false)) {
+        if (MF_DBGLEVEL >= MF_DBG_ERROR) DbpString("Can't select card");
+        OnError(1);
+        return false;
+    }
+    return true;
 }
 
 // ARG0 flag enums
 enum  {
- NONE		= 	0x00,
- INIT 		=	0x01,
- DISCONNECT =	0x02,
- CLEARTRACE	= 	0x04,
- BAR		= 	0x08,
+ NONE       = 0x00,
+ INIT       = 0x01,
+ DISCONNECT = 0x02,
+ CLEARTRACE = 0x04,
+ BAR        = 0x08,
 } CmdOptions ;
 
 void MifareSendCommand(uint8_t arg0, uint8_t arg1, uint8_t *datain){
 
-	/* ARG0 contains flags.
-		0x01 = init card.
-		0x02 = Disconnect
-		0x03
-	*/
-	uint8_t flags = arg0;
-	size_t datalen = arg1;
-	uint8_t resp[RECEIVE_SIZE];
-	memset(resp,0,sizeof(resp));
+    /* ARG0 contains flags.
+        0x01 = init card.
+        0x02 = Disconnect
+        0x03
+    */
+    uint8_t flags = arg0;
+    size_t datalen = arg1;
+    uint8_t resp[RECEIVE_SIZE];
+    memset(resp,0,sizeof(resp));
 
-	if (MF_DBGLEVEL >= 4) {
-		Dbprintf(" flags : %02X", flags);
-		Dbprintf(" len   : %02X", datalen);
-		print_result(" RX    : ", datain, datalen);
-	}
+    if (MF_DBGLEVEL >= 4) {
+        Dbprintf(" flags : %02X", flags);
+        Dbprintf(" len   : %02X", datalen);
+        print_result(" RX    : ", datain, datalen);
+    }
 
-	if ( flags & CLEARTRACE )
-		clear_trace();
+    if ( flags & CLEARTRACE )
+        clear_trace();
 
-	if ( flags & INIT ){
-		if ( !InitDesfireCard() )
-			return;
-	}
+    if ( flags & INIT ){
+        if ( !InitDesfireCard() )
+            return;
+    }
 
-	int len = DesfireAPDU(datain, datalen, resp);
-	if (MF_DBGLEVEL >= 4)
-		print_result("ERR <--: ", resp, len);
+    int len = DesfireAPDU(datain, datalen, resp);
+    if (MF_DBGLEVEL >= 4)
+        print_result("ERR <--: ", resp, len);
 
-	if ( !len ) {
-		OnError(2);
-		return;
-	}
+    if ( !len ) {
+        OnError(2);
+        return;
+    }
 
-	// reset the pcb_blocknum,
-	pcb_blocknum = 0;
+    // reset the pcb_blocknum,
+    pcb_blocknum = 0;
 
-	if ( flags & DISCONNECT )
-		OnSuccess();
+    if ( flags & DISCONNECT )
+        OnSuccess();
 
-	cmd_send(CMD_ACK,1,len,0,resp,len);
+    cmd_send(CMD_ACK,1,len,0,resp,len);
 }
 
 void MifareDesfireGetInformation(){
 
-	int len = 0;
-	iso14a_card_select_t card;
-	uint8_t resp[USB_CMD_DATA_SIZE] = {0x00};
-	uint8_t dataout[USB_CMD_DATA_SIZE] = {0x00};
+    int len = 0;
+    iso14a_card_select_t card;
+    uint8_t resp[USB_CMD_DATA_SIZE] = {0x00};
+    uint8_t dataout[USB_CMD_DATA_SIZE] = {0x00};
 
-	/*
-		1 = PCB					1
-		2 = cid					2
-		3 = desfire command		3
-		4-5 = crc				4  key
-								5-6 crc
-		PCB == 0x0A because sending CID byte.
-		CID == 0x00 first card?
-	*/
-	clear_trace();
-	set_tracing(true);
-	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+    /*
+        1 = PCB                 1
+        2 = cid                 2
+        3 = desfire command     3
+        4-5 = crc               4  key
+                                5-6 crc
+        PCB == 0x0A because sending CID byte.
+        CID == 0x00 first card?
+    */
+    clear_trace();
+    set_tracing(true);
+    iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
 
-	// card select - information
-	if ( !iso14443a_select_card(NULL, &card, NULL, true, 0, false) ) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) DbpString("Can't select card");
-		OnError(1);
-		return;
-	}
+    // card select - information
+    if ( !iso14443a_select_card(NULL, &card, NULL, true, 0, false) ) {
+        if (MF_DBGLEVEL >= MF_DBG_ERROR) DbpString("Can't select card");
+        OnError(1);
+        return;
+    }
 
-	if ( card.uidlen != 7 ) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Wrong UID size. Expected 7byte got %d", card.uidlen);
-		OnError(2);
-		return;
-	}
+    if ( card.uidlen != 7 ) {
+        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Wrong UID size. Expected 7byte got %d", card.uidlen);
+        OnError(2);
+        return;
+    }
 
-	memcpy(dataout, card.uid, 7);
+    memcpy(dataout, card.uid, 7);
 
-	LED_A_ON();
-	LED_B_OFF();
-	LED_C_OFF();
+    LED_A_ON();
+    LED_B_OFF();
+    LED_C_OFF();
 
-	uint8_t cmd[] = {GET_VERSION};
-	size_t cmd_len = sizeof(cmd);
+    uint8_t cmd[] = {GET_VERSION};
+    size_t cmd_len = sizeof(cmd);
 
-	len =  DesfireAPDU(cmd, cmd_len, resp);
-	if ( !len ) {
-		print_result("ERROR <--: ", resp, len);
-		OnError(3);
-		return;
-	}
+    len =  DesfireAPDU(cmd, cmd_len, resp);
+    if ( !len ) {
+        print_result("ERROR <--: ", resp, len);
+        OnError(3);
+        return;
+    }
 
-	LED_A_OFF();
-	LED_B_ON();
-	memcpy(dataout+7,resp+3,7);
+    LED_A_OFF();
+    LED_B_ON();
+    memcpy(dataout+7,resp+3,7);
 
-	// ADDITION_FRAME 1
-	cmd[0] = ADDITIONAL_FRAME;
-	len =  DesfireAPDU(cmd, cmd_len, resp);
-	if ( !len ) {
-		print_result("ERROR <--: ", resp, len);
-		OnError(3);
-		return;
-	}
+    // ADDITION_FRAME 1
+    cmd[0] = ADDITIONAL_FRAME;
+    len =  DesfireAPDU(cmd, cmd_len, resp);
+    if ( !len ) {
+        print_result("ERROR <--: ", resp, len);
+        OnError(3);
+        return;
+    }
 
-	LED_B_OFF();
-	LED_C_ON();
-	memcpy(dataout+7+7,resp+3,7);
+    LED_B_OFF();
+    LED_C_ON();
+    memcpy(dataout+7+7,resp+3,7);
 
-	// ADDITION_FRAME 2
-	len =  DesfireAPDU(cmd, cmd_len, resp);
-	if ( !len ) {
-		print_result("ERROR <--: ", resp, len);
-		OnError(3);
-		return;
-	}
+    // ADDITION_FRAME 2
+    len =  DesfireAPDU(cmd, cmd_len, resp);
+    if ( !len ) {
+        print_result("ERROR <--: ", resp, len);
+        OnError(3);
+        return;
+    }
 
-	memcpy(dataout+7+7+7,resp+3,14);
+    memcpy(dataout+7+7+7,resp+3,14);
 
-	cmd_send(CMD_ACK,1,0,0,dataout,sizeof(dataout));
+    cmd_send(CMD_ACK,1,0,0,dataout,sizeof(dataout));
 
-	// reset the pcb_blocknum,
-	pcb_blocknum = 0;
-	OnSuccess();
+    // reset the pcb_blocknum,
+    pcb_blocknum = 0;
+    OnSuccess();
 }
 
 void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain){
 
-	int len = 0;
-	//uint8_t PICC_MASTER_KEY8[8] = { 0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47};
-	uint8_t PICC_MASTER_KEY16[16] = { 0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4a,0x4b,0x4c,0x4d,0x4e,0x4f };
-	uint8_t null_key_data8[8] = {0x00};
-	//uint8_t null_key_data16[16] = {0x00};
-	//uint8_t new_key_data8[8]  = { 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77};
-	//uint8_t new_key_data16[16]  = { 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x88,0x99,0xAA,0xBB,0xCC,0xDD,0xEE,0xFF};
+    int len = 0;
+    //uint8_t PICC_MASTER_KEY8[8] = { 0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47};
+    uint8_t PICC_MASTER_KEY16[16] = { 0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4a,0x4b,0x4c,0x4d,0x4e,0x4f };
+    uint8_t null_key_data8[8] = {0x00};
+    //uint8_t null_key_data16[16] = {0x00};
+    //uint8_t new_key_data8[8]  = { 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77};
+    //uint8_t new_key_data16[16]  = { 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x88,0x99,0xAA,0xBB,0xCC,0xDD,0xEE,0xFF};
 
-	uint8_t resp[256] = {0x00};
-	uint8_t IV[16] = {0x00};
+    uint8_t resp[256] = {0x00};
+    uint8_t IV[16] = {0x00};
 
-	size_t datalen = datain[0];
+    size_t datalen = datain[0];
 
-	uint8_t cmd[40] = {0x00};
-	uint8_t encRndB[16] = {0x00};
-	uint8_t decRndB[16] = {0x00};
-	uint8_t nonce[16] = {0x00};
-	uint8_t both[32] = {0x00};
-	uint8_t encBoth[32] = {0x00};
+    uint8_t cmd[40] = {0x00};
+    uint8_t encRndB[16] = {0x00};
+    uint8_t decRndB[16] = {0x00};
+    uint8_t nonce[16] = {0x00};
+    uint8_t both[32] = {0x00};
+    uint8_t encBoth[32] = {0x00};
 
-	InitDesfireCard();
+    InitDesfireCard();
 
-	LED_A_ON();
-	LED_B_OFF();
-	LED_C_OFF();
+    LED_A_ON();
+    LED_B_OFF();
+    LED_C_OFF();
 
-	// 3 olika s�tt att authenticera.   AUTH (CRC16) , AUTH_ISO (CRC32) , AUTH_AES (CRC32)
-	// 4 olika crypto algo   DES, 3DES, 3K3DES, AES
-	// 3 olika kommunikations s�tt,   PLAIN,MAC,CRYPTO
+    // 3 olika s�tt att authenticera.   AUTH (CRC16) , AUTH_ISO (CRC32) , AUTH_AES (CRC32)
+    // 4 olika crypto algo   DES, 3DES, 3K3DES, AES
+    // 3 olika kommunikations s�tt,   PLAIN,MAC,CRYPTO
 
-	// des, nyckel 0,
-	switch (mode){
+    // des, nyckel 0,
+    switch (mode){
         case 1:{
             uint8_t keybytes[16];
             uint8_t RndA[8] = {0x00};
@@ -416,83 +416,83 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
                 return;
             }
             }
-			break;
-		case 2:
-			//SendDesfireCommand(AUTHENTICATE_ISO, &keyno, resp);
-			break;
-		case 3:{
+            break;
+        case 2:
+            //SendDesfireCommand(AUTHENTICATE_ISO, &keyno, resp);
+            break;
+        case 3:{
 
-			//defaultkey
-			uint8_t keybytes[16] = {0x00};
-			if (datain[1] == 0xff){
-				memcpy(keybytes,PICC_MASTER_KEY16,16);
-			} else{
-				memcpy(keybytes, datain+1, datalen);
-			}
+            //defaultkey
+            uint8_t keybytes[16] = {0x00};
+            if (datain[1] == 0xff){
+                memcpy(keybytes,PICC_MASTER_KEY16,16);
+            } else{
+                memcpy(keybytes, datain+1, datalen);
+            }
 
-			struct desfire_key defaultkey = {0x00};
-			desfirekey_t key = &defaultkey;
-			Desfire_aes_key_new( keybytes, key);
+            struct desfire_key defaultkey = {0x00};
+            desfirekey_t key = &defaultkey;
+            Desfire_aes_key_new( keybytes, key);
 
-			AesCtx ctx;
-			if ( AesCtxIni(&ctx, IV, key->data, KEY128, CBC) < 0 ){
-				if( MF_DBGLEVEL >= 4) {
-					DbpString("AES context failed to init");
-				}
-				OnError(7);
-				return;
-			}
+            AesCtx ctx;
+            if ( AesCtxIni(&ctx, IV, key->data, KEY128, CBC) < 0 ){
+                if( MF_DBGLEVEL >= 4) {
+                    DbpString("AES context failed to init");
+                }
+                OnError(7);
+                return;
+            }
 
-			cmd[0] = AUTHENTICATE_AES;
-			cmd[1] = 0x00;  //keynumber
-			len = DesfireAPDU(cmd, 2, resp);
-			if ( !len ) {
-				if (MF_DBGLEVEL >= MF_DBG_ERROR) {
-					DbpString("Authentication failed. Card timeout.");
-				}
-				OnError(3);
-				return;
-			}
-
-			memcpy( encRndB, resp+3, 16);
-
-			// dekryptera tagnonce.
-			AesDecrypt(&ctx, encRndB, decRndB, 16);
-			rol(decRndB,16);
-			memcpy(both, nonce,16);
-			memcpy(both+16, decRndB ,16 );
-			AesEncrypt(&ctx, both, encBoth, 32 );
-
-			cmd[0] = ADDITIONAL_FRAME;
-			memcpy(cmd+1, encBoth, 32 );
-
-			len = DesfireAPDU(cmd, 33, resp);  // 1 + 32 == 33
-			if ( !len ) {
-				if (MF_DBGLEVEL >= MF_DBG_ERROR) {
-					DbpString("Authentication failed. Card timeout.");
-				}
+            cmd[0] = AUTHENTICATE_AES;
+            cmd[1] = 0x00;  //keynumber
+            len = DesfireAPDU(cmd, 2, resp);
+            if ( !len ) {
+                if (MF_DBGLEVEL >= MF_DBG_ERROR) {
+                    DbpString("Authentication failed. Card timeout.");
+                }
                 OnError(3);
-				return;
-			}
+                return;
+            }
 
-			if ( resp[2] == 0x00 ){
-				// Create AES Session key
-				struct desfire_key sessionKey = {0};
-				desfirekey_t skey = &sessionKey;
-				Desfire_session_key_new( nonce, decRndB , key, skey );
-				print_result("SESSION : ", skey->data, 16);
-			} else {
-				DbpString("Authentication failed.");
-				OnError(7);
-				return;
-			}
+            memcpy( encRndB, resp+3, 16);
 
-			break;
-		}
-	}
+            // dekryptera tagnonce.
+            AesDecrypt(&ctx, encRndB, decRndB, 16);
+            rol(decRndB,16);
+            memcpy(both, nonce,16);
+            memcpy(both+16, decRndB ,16 );
+            AesEncrypt(&ctx, both, encBoth, 32 );
 
-	OnSuccess();
-	cmd_send(CMD_ACK,1,len,0,resp,len);
+            cmd[0] = ADDITIONAL_FRAME;
+            memcpy(cmd+1, encBoth, 32 );
+
+            len = DesfireAPDU(cmd, 33, resp);  // 1 + 32 == 33
+            if ( !len ) {
+                if (MF_DBGLEVEL >= MF_DBG_ERROR) {
+                    DbpString("Authentication failed. Card timeout.");
+                }
+                OnError(3);
+                return;
+            }
+
+            if ( resp[2] == 0x00 ){
+                // Create AES Session key
+                struct desfire_key sessionKey = {0};
+                desfirekey_t skey = &sessionKey;
+                Desfire_session_key_new( nonce, decRndB , key, skey );
+                print_result("SESSION : ", skey->data, 16);
+            } else {
+                DbpString("Authentication failed.");
+                OnError(7);
+                return;
+            }
+
+            break;
+        }
+    }
+
+    OnSuccess();
+    cmd_send(CMD_ACK,1,len,0,resp,len);
 }
 
 // 3 olika ISO s�tt att skicka data till DESFIRE (direkt, inkapslat, inkapslat ISO)
@@ -501,71 +501,71 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
 // dataout = pointer to response data array
 int DesfireAPDU(uint8_t *cmd, size_t cmd_len, uint8_t *dataout){
 
-	size_t len = 0;
-	size_t wrappedLen = 0;
-	uint8_t wCmd[USB_CMD_DATA_SIZE] = {0x00};
-	uint8_t resp[MAX_FRAME_SIZE];
+    size_t len = 0;
+    size_t wrappedLen = 0;
+    uint8_t wCmd[USB_CMD_DATA_SIZE] = {0x00};
+    uint8_t resp[MAX_FRAME_SIZE];
     uint8_t par[MAX_PARITY_SIZE];
 
-	wrappedLen = CreateAPDU( cmd, cmd_len, wCmd);
+    wrappedLen = CreateAPDU( cmd, cmd_len, wCmd);
 
-	if (MF_DBGLEVEL >= 4)
-		print_result("WCMD <--: ", wCmd, wrappedLen);
+    if (MF_DBGLEVEL >= 4)
+        print_result("WCMD <--: ", wCmd, wrappedLen);
 
-	ReaderTransmit( wCmd, wrappedLen, NULL);
+    ReaderTransmit( wCmd, wrappedLen, NULL);
 
-	len = ReaderReceive(resp, par);
-	if ( !len ) {
-		if (MF_DBGLEVEL >= 4) Dbprintf("fukked");
-		return false; //DATA LINK ERROR
-	}
-	// if we received an I- or R(ACK)-Block with a block number equal to the
-	// current block number, toggle the current block number
-	else if (len >= 4 // PCB+CID+CRC = 4 bytes
-	         && ((resp[0] & 0xC0) == 0 // I-Block
-	             || (resp[0] & 0xD0) == 0x80) // R-Block with ACK bit set to 0
-	         && (resp[0] & 0x01) == pcb_blocknum) // equal block numbers
-	{
-		pcb_blocknum ^= 1;  //toggle next block
-	}
+    len = ReaderReceive(resp, par);
+    if ( !len ) {
+        if (MF_DBGLEVEL >= 4) Dbprintf("fukked");
+        return false; //DATA LINK ERROR
+    }
+    // if we received an I- or R(ACK)-Block with a block number equal to the
+    // current block number, toggle the current block number
+    else if (len >= 4 // PCB+CID+CRC = 4 bytes
+             && ((resp[0] & 0xC0) == 0 // I-Block
+                 || (resp[0] & 0xD0) == 0x80) // R-Block with ACK bit set to 0
+             && (resp[0] & 0x01) == pcb_blocknum) // equal block numbers
+    {
+        pcb_blocknum ^= 1;  //toggle next block
+    }
 
-	memcpy(dataout, resp, len);
-	return len;
+    memcpy(dataout, resp, len);
+    return len;
 }
 
 // CreateAPDU
 size_t CreateAPDU( uint8_t *datain, size_t len, uint8_t *dataout){
 
-	size_t cmdlen = MIN(len+4, USB_CMD_DATA_SIZE-1);
+    size_t cmdlen = MIN(len+4, USB_CMD_DATA_SIZE-1);
 
-	uint8_t cmd[cmdlen];
-	memset(cmd, 0, cmdlen);
+    uint8_t cmd[cmdlen];
+    memset(cmd, 0, cmdlen);
 
-	cmd[0] = 0x0A;  //  0x0A = skicka cid,  0x02 = ingen cid. S�rskilda bitar //
-	cmd[0] |= pcb_blocknum; // OR the block number into the PCB
-	cmd[1] = 0x00;  //  CID: 0x00 //TODO: allow multiple selected cards
+    cmd[0] = 0x0A;  //  0x0A = skicka cid,  0x02 = ingen cid. S�rskilda bitar //
+    cmd[0] |= pcb_blocknum; // OR the block number into the PCB
+    cmd[1] = 0x00;  //  CID: 0x00 //TODO: allow multiple selected cards
 
-	memcpy(cmd+2, datain, len);
-	AddCrc14A(cmd, len+2);
+    memcpy(cmd+2, datain, len);
+    AddCrc14A(cmd, len+2);
 
-	memcpy(dataout, cmd, cmdlen);
+    memcpy(dataout, cmd, cmdlen);
 
-	return cmdlen;
+    return cmdlen;
 }
 
-	// crc_update(&desfire_crc32, 0, 1); /* CMD_WRITE */
-	// crc_update(&desfire_crc32, addr, addr_sz);
-	// crc_update(&desfire_crc32, byte, 8);
-	// uint32_t crc = crc_finish(&desfire_crc32);
+    // crc_update(&desfire_crc32, 0, 1); /* CMD_WRITE */
+    // crc_update(&desfire_crc32, addr, addr_sz);
+    // crc_update(&desfire_crc32, byte, 8);
+    // uint32_t crc = crc_finish(&desfire_crc32);
 
 void OnSuccess(){
-	pcb_blocknum = 0;
-	ReaderTransmit(deselect_cmd, 3 , NULL);
-	mifare_ultra_halt();
-	switch_off();
+    pcb_blocknum = 0;
+    ReaderTransmit(deselect_cmd, 3 , NULL);
+    mifare_ultra_halt();
+    switch_off();
 }
 
 void OnError(uint8_t reason){
-	cmd_send(CMD_ACK,0,reason,0,0,0);
-	OnSuccess();
+    cmd_send(CMD_ACK,0,reason,0,0,0);
+    OnSuccess();
 }
diff --git a/armsrc/mifaresniff.c b/armsrc/mifaresniff.c
index 43e416086..cbdf3a99d 100644
--- a/armsrc/mifaresniff.c
+++ b/armsrc/mifaresniff.c
@@ -25,300 +25,300 @@ static uint32_t timerData = 0;
 //-----------------------------------------------------------------------------
 // "hf mf sniff"
 void RAMFUNC SniffMifare(uint8_t param) {
-	// param:
-	// bit 0 - trigger from first card answer
-	// bit 1 - trigger from first reader 7-bit request
+    // param:
+    // bit 0 - trigger from first card answer
+    // bit 1 - trigger from first reader 7-bit request
 
-	// C(red) A(yellow) B(green)
-	LEDsoff();
-	iso14443a_setup(FPGA_HF_ISO14443A_SNIFFER);
+    // C(red) A(yellow) B(green)
+    LEDsoff();
+    iso14443a_setup(FPGA_HF_ISO14443A_SNIFFER);
 
-	// Allocate memory from BigBuf for some buffers
-	// free all previous allocations first
-	BigBuf_free(); BigBuf_Clear_ext(false);
-	clear_trace();
-	set_tracing(true);
+    // Allocate memory from BigBuf for some buffers
+    // free all previous allocations first
+    BigBuf_free(); BigBuf_Clear_ext(false);
+    clear_trace();
+    set_tracing(true);
 
-	// The command (reader -> tag) that we're receiving.
-	uint8_t receivedCmd[MAX_MIFARE_FRAME_SIZE] = {0x00};
-	uint8_t receivedCmdPar[MAX_MIFARE_PARITY_SIZE] = {0x00};
+    // The command (reader -> tag) that we're receiving.
+    uint8_t receivedCmd[MAX_MIFARE_FRAME_SIZE] = {0x00};
+    uint8_t receivedCmdPar[MAX_MIFARE_PARITY_SIZE] = {0x00};
 
-	// The response (tag -> reader) that we're receiving.
-	uint8_t receivedResp[MAX_MIFARE_FRAME_SIZE] = {0x00};
-	uint8_t receivedRespPar[MAX_MIFARE_PARITY_SIZE] = {0x00};
+    // The response (tag -> reader) that we're receiving.
+    uint8_t receivedResp[MAX_MIFARE_FRAME_SIZE] = {0x00};
+    uint8_t receivedRespPar[MAX_MIFARE_PARITY_SIZE] = {0x00};
 
-	// allocate the DMA buffer, used to stream samples from the FPGA
-	uint8_t *dmaBuf = BigBuf_malloc(DMA_BUFFER_SIZE);
-	uint8_t *data = dmaBuf;
-	uint8_t previous_data = 0;
-	int maxDataLen = 0;
-	int dataLen = 0;
-	bool ReaderIsActive = false;
-	bool TagIsActive = false;
+    // allocate the DMA buffer, used to stream samples from the FPGA
+    uint8_t *dmaBuf = BigBuf_malloc(DMA_BUFFER_SIZE);
+    uint8_t *data = dmaBuf;
+    uint8_t previous_data = 0;
+    int maxDataLen = 0;
+    int dataLen = 0;
+    bool ReaderIsActive = false;
+    bool TagIsActive = false;
 
-	// We won't start recording the frames that we acquire until we trigger;
-	// a good trigger condition to get started is probably when we see a
-	// response from the tag.
-	// triggered == false -- to wait first for card
-	//bool triggered = !(param & 0x03);
+    // We won't start recording the frames that we acquire until we trigger;
+    // a good trigger condition to get started is probably when we see a
+    // response from the tag.
+    // triggered == false -- to wait first for card
+    //bool triggered = !(param & 0x03);
 
 
-	// Set up the demodulator for tag -> reader responses.
-	DemodInit(receivedResp, receivedRespPar);
+    // Set up the demodulator for tag -> reader responses.
+    DemodInit(receivedResp, receivedRespPar);
 
-	// Set up the demodulator for the reader -> tag commands
-	UartInit(receivedCmd, receivedCmdPar);
+    // Set up the demodulator for the reader -> tag commands
+    UartInit(receivedCmd, receivedCmdPar);
 
-	// Setup and start DMA.
-	// set transfer address and number of bytes. Start transfer.
-	if ( !FpgaSetupSscDma(dmaBuf, DMA_BUFFER_SIZE) ){
-		if (MF_DBGLEVEL > 1) Dbprintf("[!] FpgaSetupSscDma failed. Exiting");
-		return;
-	}
+    // Setup and start DMA.
+    // set transfer address and number of bytes. Start transfer.
+    if ( !FpgaSetupSscDma(dmaBuf, DMA_BUFFER_SIZE) ){
+        if (MF_DBGLEVEL > 1) Dbprintf("[!] FpgaSetupSscDma failed. Exiting");
+        return;
+    }
 
-	tUart* uart = GetUart();
-	tDemod* demod = GetDemod();
+    tUart* uart = GetUart();
+    tDemod* demod = GetDemod();
 
-	MfSniffInit();
+    MfSniffInit();
 
-	uint32_t sniffCounter = 0;
+    uint32_t sniffCounter = 0;
     // loop and listen
-	while (!BUTTON_PRESS()) {
-		WDT_HIT();
-		LED_A_ON();
+    while (!BUTTON_PRESS()) {
+        WDT_HIT();
+        LED_A_ON();
 /*
- 		if ((sniffCounter & 0x0000FFFF) == 0) {	// from time to time
-			// check if a transaction is completed (timeout after 2000ms).
-			// if yes, stop the DMA transfer and send what we have so far to the client
-			if (BigBuf_get_traceLen()) {
-				MfSniffSend();
-				// Reset everything - we missed some sniffed data anyway while the DMA was stopped
-				sniffCounter = 0;
-				dmaBuf = BigBuf_malloc(DMA_BUFFER_SIZE);
-				data = dmaBuf;
-				maxDataLen = 0;
-				ReaderIsActive = false;
-				TagIsActive = false;
-				FpgaSetupSscDma((uint8_t *)dmaBuf, DMA_BUFFER_SIZE); // set transfer address and number of bytes. Start transfer.
-			}
-		}
-		*/
+        if ((sniffCounter & 0x0000FFFF) == 0) { // from time to time
+            // check if a transaction is completed (timeout after 2000ms).
+            // if yes, stop the DMA transfer and send what we have so far to the client
+            if (BigBuf_get_traceLen()) {
+                MfSniffSend();
+                // Reset everything - we missed some sniffed data anyway while the DMA was stopped
+                sniffCounter = 0;
+                dmaBuf = BigBuf_malloc(DMA_BUFFER_SIZE);
+                data = dmaBuf;
+                maxDataLen = 0;
+                ReaderIsActive = false;
+                TagIsActive = false;
+                FpgaSetupSscDma((uint8_t *)dmaBuf, DMA_BUFFER_SIZE); // set transfer address and number of bytes. Start transfer.
+            }
+        }
+        */
 
-		// number of bytes we have processed so far
-		int register readBufDataP = data - dmaBuf;
-		// number of bytes already transferred
-		int register dmaBufDataP = DMA_BUFFER_SIZE - AT91C_BASE_PDC_SSC->PDC_RCR;
-		if (readBufDataP <= dmaBufDataP)			// we are processing the same block of data which is currently being transferred
-			dataLen = dmaBufDataP - readBufDataP;	// number of bytes still to be processed
-		else
-			dataLen = DMA_BUFFER_SIZE - readBufDataP + dmaBufDataP; // number of bytes still to be processed
+        // number of bytes we have processed so far
+        int register readBufDataP = data - dmaBuf;
+        // number of bytes already transferred
+        int register dmaBufDataP = DMA_BUFFER_SIZE - AT91C_BASE_PDC_SSC->PDC_RCR;
+        if (readBufDataP <= dmaBufDataP)            // we are processing the same block of data which is currently being transferred
+            dataLen = dmaBufDataP - readBufDataP;   // number of bytes still to be processed
+        else
+            dataLen = DMA_BUFFER_SIZE - readBufDataP + dmaBufDataP; // number of bytes still to be processed
 
-		// test for length of buffer
-		if (dataLen > maxDataLen) {					// we are more behind than ever...
-			maxDataLen = dataLen;
-			if (dataLen > (9 * DMA_BUFFER_SIZE / 10)) {
-				Dbprintf("[!] blew circular buffer! | datalen %u", dataLen);
-				break;
-			}
-		}
-		if (dataLen < 1) continue;
+        // test for length of buffer
+        if (dataLen > maxDataLen) {                 // we are more behind than ever...
+            maxDataLen = dataLen;
+            if (dataLen > (9 * DMA_BUFFER_SIZE / 10)) {
+                Dbprintf("[!] blew circular buffer! | datalen %u", dataLen);
+                break;
+            }
+        }
+        if (dataLen < 1) continue;
 
-		// primary buffer was stopped ( <-- we lost data!
-		if (!AT91C_BASE_PDC_SSC->PDC_RCR) {
-			AT91C_BASE_PDC_SSC->PDC_RPR = (uint32_t)dmaBuf;
-			AT91C_BASE_PDC_SSC->PDC_RCR = DMA_BUFFER_SIZE;
-			Dbprintf("[-] RxEmpty ERROR | data length %d", dataLen); // temporary
-		}
-		// secondary buffer sets as primary, secondary buffer was stopped
-		if (!AT91C_BASE_PDC_SSC->PDC_RNCR) {
-			AT91C_BASE_PDC_SSC->PDC_RNPR = (uint32_t)dmaBuf;
-			AT91C_BASE_PDC_SSC->PDC_RNCR = DMA_BUFFER_SIZE;
-		}
+        // primary buffer was stopped ( <-- we lost data!
+        if (!AT91C_BASE_PDC_SSC->PDC_RCR) {
+            AT91C_BASE_PDC_SSC->PDC_RPR = (uint32_t)dmaBuf;
+            AT91C_BASE_PDC_SSC->PDC_RCR = DMA_BUFFER_SIZE;
+            Dbprintf("[-] RxEmpty ERROR | data length %d", dataLen); // temporary
+        }
+        // secondary buffer sets as primary, secondary buffer was stopped
+        if (!AT91C_BASE_PDC_SSC->PDC_RNCR) {
+            AT91C_BASE_PDC_SSC->PDC_RNPR = (uint32_t)dmaBuf;
+            AT91C_BASE_PDC_SSC->PDC_RNCR = DMA_BUFFER_SIZE;
+        }
 
-		LED_A_OFF();
+        LED_A_OFF();
 
-		// Need two samples to feed Miller and Manchester-Decoder
-		if (sniffCounter & 0x01) {
+        // Need two samples to feed Miller and Manchester-Decoder
+        if (sniffCounter & 0x01) {
 
-			// no need to try decoding tag data if the reader is sending
-			if (!TagIsActive) {
-				uint8_t readerbyte = (previous_data & 0xF0) | (*data >> 4);
-				if (MillerDecoding(readerbyte, (sniffCounter-1)*4)) {
-					LogTrace(receivedCmd, uart->len, 0, 0, NULL, true);
-					DemodReset();
-					UartReset();
-				}
-				ReaderIsActive = (uart->state != STATE_UNSYNCD);
-			}
+            // no need to try decoding tag data if the reader is sending
+            if (!TagIsActive) {
+                uint8_t readerbyte = (previous_data & 0xF0) | (*data >> 4);
+                if (MillerDecoding(readerbyte, (sniffCounter-1)*4)) {
+                    LogTrace(receivedCmd, uart->len, 0, 0, NULL, true);
+                    DemodReset();
+                    UartReset();
+                }
+                ReaderIsActive = (uart->state != STATE_UNSYNCD);
+            }
 
-			// no need to try decoding tag data if the reader is sending
-			if (!ReaderIsActive) {
-				uint8_t tagbyte = (previous_data << 4) | (*data & 0x0F);
-				if (ManchesterDecoding(tagbyte, 0, (sniffCounter-1)*4)) {
-					LogTrace(receivedResp,  demod->len, 0, 0, NULL, false);
-					DemodReset();
-					UartReset();
-				}
-				TagIsActive = (demod->state != DEMOD_UNSYNCD);
-			}
-		}
-		previous_data = *data;
-		sniffCounter++;
-		data++;
+            // no need to try decoding tag data if the reader is sending
+            if (!ReaderIsActive) {
+                uint8_t tagbyte = (previous_data << 4) | (*data & 0x0F);
+                if (ManchesterDecoding(tagbyte, 0, (sniffCounter-1)*4)) {
+                    LogTrace(receivedResp,  demod->len, 0, 0, NULL, false);
+                    DemodReset();
+                    UartReset();
+                }
+                TagIsActive = (demod->state != DEMOD_UNSYNCD);
+            }
+        }
+        previous_data = *data;
+        sniffCounter++;
+        data++;
 
-		if (data == dmaBuf + DMA_BUFFER_SIZE)
-			data = dmaBuf;
+        if (data == dmaBuf + DMA_BUFFER_SIZE)
+            data = dmaBuf;
 
-	} // main cycle
+    } // main cycle
 
-	MfSniffEnd();
-	switch_off();
+    MfSniffEnd();
+    switch_off();
 }
 
 void MfSniffInit(void){
-	memset(sniffUID, 0x00, sizeof(sniffUID));
-	memset(sniffATQA, 0x00, sizeof(sniffATQA));
-	memset(sniffBuf, 0x00, sizeof(sniffBuf));
-	sniffSAK = 0;
-	sniffUIDType = SNF_UID_4;
-	timerData = 0;
+    memset(sniffUID, 0x00, sizeof(sniffUID));
+    memset(sniffATQA, 0x00, sizeof(sniffATQA));
+    memset(sniffBuf, 0x00, sizeof(sniffBuf));
+    sniffSAK = 0;
+    sniffUIDType = SNF_UID_4;
+    timerData = 0;
 }
 
 void MfSniffEnd(void){
-	LED_B_ON();
-	cmd_send(CMD_ACK,0,0,0,0,0);
-	LED_B_OFF();
+    LED_B_ON();
+    cmd_send(CMD_ACK,0,0,0,0,0);
+    LED_B_OFF();
 }
 
 /*
 bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint8_t *parity, uint16_t bitCnt, bool reader) {
 
-	// reset on 7-Bit commands from reader
-	if (reader && (len == 1) && (bitCnt == 7)) {
-		sniffState = SNF_INIT;
-	}
+    // reset on 7-Bit commands from reader
+    if (reader && (len == 1) && (bitCnt == 7)) {
+        sniffState = SNF_INIT;
+    }
 
 
 
-	switch (sniffState) {
-		case SNF_INIT:{
-			// REQA,WUPA or MAGICWUP from reader
-			if ((len == 1) && (reader) && (bitCnt == 7) ) {
-				MfSniffInit();
-				sniffState = (data[0] == MIFARE_MAGICWUPC1) ? SNF_MAGIC_WUPC2 : SNF_ATQA;
-			}
-			break;
-		}
-		case SNF_MAGIC_WUPC2: {
-			if ((len == 1) && (reader) && (data[0] == MIFARE_MAGICWUPC2) ) {
-				sniffState = SNF_CARD_IDLE;
-			}
-			break;
-		}
-		case SNF_ATQA:{
-			// ATQA from tag
-			if ((!reader) && (len == 2)) {
-				sniffATQA[0] = data[0];
-				sniffATQA[1] = data[1];
-				sniffState = SNF_UID;
-			}
-			break;
-		}
-		case SNF_UID: {
+    switch (sniffState) {
+        case SNF_INIT:{
+            // REQA,WUPA or MAGICWUP from reader
+            if ((len == 1) && (reader) && (bitCnt == 7) ) {
+                MfSniffInit();
+                sniffState = (data[0] == MIFARE_MAGICWUPC1) ? SNF_MAGIC_WUPC2 : SNF_ATQA;
+            }
+            break;
+        }
+        case SNF_MAGIC_WUPC2: {
+            if ((len == 1) && (reader) && (data[0] == MIFARE_MAGICWUPC2) ) {
+                sniffState = SNF_CARD_IDLE;
+            }
+            break;
+        }
+        case SNF_ATQA:{
+            // ATQA from tag
+            if ((!reader) && (len == 2)) {
+                sniffATQA[0] = data[0];
+                sniffATQA[1] = data[1];
+                sniffState = SNF_UID;
+            }
+            break;
+        }
+        case SNF_UID: {
 
-			if ( !reader ) break;
-			if ( len != 9 ) break;
-			if ( !CheckCrc14443(CRC_14443_A, data, 9)) break;
-			if ( data[1] != 0x70 ) break;
+            if ( !reader ) break;
+            if ( len != 9 ) break;
+            if ( !CheckCrc14443(CRC_14443_A, data, 9)) break;
+            if ( data[1] != 0x70 ) break;
 
-			Dbprintf("[!] UID | %x", data[0]);
+            Dbprintf("[!] UID | %x", data[0]);
 
-			if ((data[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT)) {
-				// UID_4 - select 4 Byte UID from reader
-				memcpy(sniffUID, data+2, 4);
-				sniffUIDType = SNF_UID_4;
-				sniffState = SNF_SAK;
-			} else if ((data[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2)) {
-				// UID_7 - Select 2nd part of 7 Byte UID
+            if ((data[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT)) {
+                // UID_4 - select 4 Byte UID from reader
+                memcpy(sniffUID, data+2, 4);
+                sniffUIDType = SNF_UID_4;
+                sniffState = SNF_SAK;
+            } else if ((data[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2)) {
+                // UID_7 - Select 2nd part of 7 Byte UID
 
-				// get rid of 0x88
-				sniffUID[0] = sniffUID[1];
-				sniffUID[1] = sniffUID[2];
-				sniffUID[2] = sniffUID[3];
-				//new uid bytes
-				memcpy(sniffUID+3, data+2, 4);
-				sniffUIDType = SNF_UID_7;
-				sniffState = SNF_SAK;
-			} else if ((data[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_3)) {
-				// UID_10 - Select 3nd part of 10 Byte UID
-				// 3+3+4 = 10.
-				// get ride of previous 0x88
-				sniffUID[3] = sniffUID[4];
-				sniffUID[4] = sniffUID[5];
-				sniffUID[5] = sniffUID[6];
-				// new uid bytes
-				memcpy(sniffUID+6, data+2, 4);
-				sniffUIDType = SNF_UID_10;
-				sniffState = SNF_SAK;
-			}
-			break;
-		}
-		case SNF_SAK:{
-			// SAK from card?
-			if ((!reader) && (len == 3) && (CheckCrc14443(CRC_14443_A, data, 3))) {
-				sniffSAK = data[0];
-				// CL2 UID part to be expected
-				if (( sniffSAK == 0x04) && (sniffUIDType == SNF_UID_4)) {
-					sniffState = SNF_UID;
-				// CL3 UID part to be expected
-				} else if ((sniffSAK == 0x04) && (sniffUIDType == SNF_UID_7)) {
-					sniffState = SNF_UID;
-				} else {
-					// select completed
-					sniffState = SNF_CARD_IDLE;
-				}
-			}
-			break;
-		}
-		case SNF_CARD_IDLE:{	// trace the card select sequence
-			sniffBuf[0] = 0xFF;
-			sniffBuf[1] = 0xFF;
-			memcpy(sniffBuf + 2, sniffUID, sizeof(sniffUID));
-			memcpy(sniffBuf + 12, sniffATQA, sizeof(sniffATQA));
-			sniffBuf[14] = sniffSAK;
-			sniffBuf[15] = 0xFF;
-			sniffBuf[16] = 0xFF;
-			LogTrace(sniffBuf, sizeof(sniffBuf), 0, 0, NULL, true);
-			sniffState = SNF_CARD_CMD;
-		}	// intentionally no break;
-		case SNF_CARD_CMD:{
-			LogTrace(data, len, 0, 0, NULL, reader);
-			timerData = GetTickCount();
-			break;
-		}
-		default:
-			sniffState = SNF_INIT;
-		break;
-	}
-	return false;
+                // get rid of 0x88
+                sniffUID[0] = sniffUID[1];
+                sniffUID[1] = sniffUID[2];
+                sniffUID[2] = sniffUID[3];
+                //new uid bytes
+                memcpy(sniffUID+3, data+2, 4);
+                sniffUIDType = SNF_UID_7;
+                sniffState = SNF_SAK;
+            } else if ((data[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_3)) {
+                // UID_10 - Select 3nd part of 10 Byte UID
+                // 3+3+4 = 10.
+                // get ride of previous 0x88
+                sniffUID[3] = sniffUID[4];
+                sniffUID[4] = sniffUID[5];
+                sniffUID[5] = sniffUID[6];
+                // new uid bytes
+                memcpy(sniffUID+6, data+2, 4);
+                sniffUIDType = SNF_UID_10;
+                sniffState = SNF_SAK;
+            }
+            break;
+        }
+        case SNF_SAK:{
+            // SAK from card?
+            if ((!reader) && (len == 3) && (CheckCrc14443(CRC_14443_A, data, 3))) {
+                sniffSAK = data[0];
+                // CL2 UID part to be expected
+                if (( sniffSAK == 0x04) && (sniffUIDType == SNF_UID_4)) {
+                    sniffState = SNF_UID;
+                // CL3 UID part to be expected
+                } else if ((sniffSAK == 0x04) && (sniffUIDType == SNF_UID_7)) {
+                    sniffState = SNF_UID;
+                } else {
+                    // select completed
+                    sniffState = SNF_CARD_IDLE;
+                }
+            }
+            break;
+        }
+        case SNF_CARD_IDLE:{ // trace the card select sequence
+            sniffBuf[0] = 0xFF;
+            sniffBuf[1] = 0xFF;
+            memcpy(sniffBuf + 2, sniffUID, sizeof(sniffUID));
+            memcpy(sniffBuf + 12, sniffATQA, sizeof(sniffATQA));
+            sniffBuf[14] = sniffSAK;
+            sniffBuf[15] = 0xFF;
+            sniffBuf[16] = 0xFF;
+            LogTrace(sniffBuf, sizeof(sniffBuf), 0, 0, NULL, true);
+            sniffState = SNF_CARD_CMD;
+        } // intentionally no break;
+        case SNF_CARD_CMD:{
+            LogTrace(data, len, 0, 0, NULL, reader);
+            timerData = GetTickCount();
+            break;
+        }
+        default:
+            sniffState = SNF_INIT;
+        break;
+    }
+    return false;
 }
 */
 
 void RAMFUNC MfSniffSend() {
-	uint16_t tracelen = BigBuf_get_traceLen();
-	uint16_t chunksize = 0;
-	int packlen = tracelen;	// total number of bytes to send
-	uint8_t *data = BigBuf_get_addr();
+    uint16_t tracelen = BigBuf_get_traceLen();
+    uint16_t chunksize = 0;
+    int packlen = tracelen; // total number of bytes to send
+    uint8_t *data = BigBuf_get_addr();
 
-	while (packlen > 0) {
-		LED_B_ON();
-		chunksize = MIN(USB_CMD_DATA_SIZE, packlen); // chunk size 512
-		cmd_send(CMD_ACK, 1, tracelen, chunksize, data + tracelen - packlen, chunksize);
-		packlen -= chunksize;
-		LED_B_OFF();
-	}
+    while (packlen > 0) {
+        LED_B_ON();
+        chunksize = MIN(USB_CMD_DATA_SIZE, packlen); // chunk size 512
+        cmd_send(CMD_ACK, 1, tracelen, chunksize, data + tracelen - packlen, chunksize);
+        packlen -= chunksize;
+        LED_B_OFF();
+    }
 
-	LED_B_ON();
-	cmd_send(CMD_ACK, 2, 0, 0, 0, 0);  // 2 == data transfer finished.
-	LED_B_OFF();
+    LED_B_ON();
+    cmd_send(CMD_ACK, 2, 0, 0, 0, 0);  // 2 == data transfer finished.
+    LED_B_OFF();
 }
\ No newline at end of file
diff --git a/armsrc/mifaresniff.h b/armsrc/mifaresniff.h
index efd34fdeb..debfd5a09 100644
--- a/armsrc/mifaresniff.h
+++ b/armsrc/mifaresniff.h
@@ -21,18 +21,18 @@
 #include "mifareutil.h"
 #include "common.h"
 
-#define SNF_INIT			0
-#define SNF_NO_FIELD		1
-#define SNF_ATQA			2
-#define SNF_UID				3
-#define SNF_SAK				4
-#define SNF_CARD_IDLE		5
-#define SNF_CARD_CMD		6
-#define SNF_MAGIC_WUPC2		7
+#define SNF_INIT        0
+#define SNF_NO_FIELD    1
+#define SNF_ATQA        2
+#define SNF_UID         3
+#define SNF_SAK         4
+#define SNF_CARD_IDLE   5
+#define SNF_CARD_CMD    6
+#define SNF_MAGIC_WUPC2 7
 
-#define SNF_UID_4			0
-#define SNF_UID_7			0
-#define SNF_UID_10			0
+#define SNF_UID_4       0
+#define SNF_UID_7       0
+#define SNF_UID_10      0
 
 void MfSniffInit(void);
 bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint8_t *parity, uint16_t bitCnt, bool reader);
diff --git a/armsrc/mifareutil.c b/armsrc/mifareutil.c
index 86048ae88..f15d13dec 100644
--- a/armsrc/mifareutil.c
+++ b/armsrc/mifareutil.c
@@ -14,676 +14,676 @@ int MF_DBGLEVEL = MF_DBG_ERROR;
 
 // crypto1 helpers
 void mf_crypto1_decryptEx(struct Crypto1State *pcs, uint8_t *data_in, int len, uint8_t *data_out){
-	uint8_t	bt = 0;
-	int i;
+    uint8_t bt = 0;
+    int i;
 
-	if (len != 1) {
-		for (i = 0; i < len; i++)
-			data_out[i] = crypto1_byte(pcs, 0x00, 0) ^ data_in[i];
-	} else {
-		bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data_in[0], 0)) << 0;
-		bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data_in[0], 1)) << 1;
-		bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data_in[0], 2)) << 2;
-		bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data_in[0], 3)) << 3;
-		data_out[0] = bt;
-	}
-	return;
+    if (len != 1) {
+        for (i = 0; i < len; i++)
+            data_out[i] = crypto1_byte(pcs, 0x00, 0) ^ data_in[i];
+    } else {
+        bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data_in[0], 0)) << 0;
+        bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data_in[0], 1)) << 1;
+        bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data_in[0], 2)) << 2;
+        bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data_in[0], 3)) << 3;
+        data_out[0] = bt;
+    }
+    return;
 }
 
 void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len){
-	mf_crypto1_decryptEx(pcs, data, len, data);
+    mf_crypto1_decryptEx(pcs, data, len, data);
 }
 
 void mf_crypto1_encrypt(struct Crypto1State *pcs, uint8_t *data, uint16_t len, uint8_t *par) {
-	uint8_t bt = 0;
-	int i;
-	par[0] = 0;
+    uint8_t bt = 0;
+    int i;
+    par[0] = 0;
 
-	for (i = 0; i < len; i++) {
-		bt = data[i];
-		data[i] = crypto1_byte(pcs, 0x00, 0) ^ data[i];
-		if ( ( i & 0x0007 ) == 0)
-			par[ i >> 3 ] = 0;
-		par[ i >> 3 ] |= (((filter(pcs->odd) ^ oddparity8(bt)) & 0x01)<<(7-(i&0x0007)));
-	}
+    for (i = 0; i < len; i++) {
+        bt = data[i];
+        data[i] = crypto1_byte(pcs, 0x00, 0) ^ data[i];
+        if ( ( i & 0x0007 ) == 0)
+            par[ i >> 3 ] = 0;
+        par[ i >> 3 ] |= (((filter(pcs->odd) ^ oddparity8(bt)) & 0x01)<<(7-(i&0x0007)));
+    }
 }
 
 uint8_t mf_crypto1_encrypt4bit(struct Crypto1State *pcs, uint8_t data) {
-	uint8_t bt = 0;
-	bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data, 0)) << 0;
-	bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data, 1)) << 1;
-	bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data, 2)) << 2;
-	bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data, 3)) << 3;
-	return bt;
+    uint8_t bt = 0;
+    bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data, 0)) << 0;
+    bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data, 1)) << 1;
+    bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data, 2)) << 2;
+    bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data, 3)) << 3;
+    return bt;
 }
 
 // send X byte basic commands
 int mifare_sendcmd(uint8_t cmd, uint8_t* data, uint8_t data_size, uint8_t* answer, uint8_t *answer_parity, uint32_t *timing) {
-	uint8_t dcmd[data_size+3];
+    uint8_t dcmd[data_size+3];
     dcmd[0] = cmd;
-	memcpy(dcmd+1, data, data_size);
-	AddCrc14A(dcmd, data_size+1);
-	ReaderTransmit(dcmd, sizeof(dcmd), timing);
-	int len = ReaderReceive(answer, answer_parity);
-	if(!len) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("%02X Cmd failed. Card timeout.", cmd);
-		len = ReaderReceive(answer,answer_parity);
+    memcpy(dcmd+1, data, data_size);
+    AddCrc14A(dcmd, data_size+1);
+    ReaderTransmit(dcmd, sizeof(dcmd), timing);
+    int len = ReaderReceive(answer, answer_parity);
+    if(!len) {
+        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("%02X Cmd failed. Card timeout.", cmd);
+        len = ReaderReceive(answer,answer_parity);
     }
-	return len;
+    return len;
 }
 
 // send 2 byte commands
 int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t data, uint8_t *answer, uint8_t *answer_parity, uint32_t *timing) {
-	uint16_t pos, res;
-	uint8_t dcmd[4] = {cmd, data, 0x00, 0x00};
-	uint8_t	ecmd[4] = {0x00, 0x00, 0x00, 0x00};
-	uint8_t par[1] = {0x00};			// 1 Byte parity is enough here
-	AddCrc14A(dcmd, 2);
-	memcpy(ecmd, dcmd, sizeof(dcmd));
+    uint16_t pos, res;
+    uint8_t dcmd[4] = {cmd, data, 0x00, 0x00};
+    uint8_t ecmd[4] = {0x00, 0x00, 0x00, 0x00};
+    uint8_t par[1] = {0x00}; // 1 Byte parity is enough here
+    AddCrc14A(dcmd, 2);
+    memcpy(ecmd, dcmd, sizeof(dcmd));
 
-	if (crypted) {
-		par[0] = 0;
-		for (pos = 0; pos < 4; pos++) {
-			ecmd[pos] = crypto1_byte(pcs, 0x00, 0) ^ dcmd[pos];
-			par[0] |= (((filter(pcs->odd) ^ oddparity8(dcmd[pos])) & 0x01) << (7-pos));
-		}
-		ReaderTransmitPar(ecmd, sizeof(ecmd), par, timing);
-	} else {
-		ReaderTransmit(dcmd, sizeof(dcmd), timing);
-	}
+    if (crypted) {
+        par[0] = 0;
+        for (pos = 0; pos < 4; pos++) {
+            ecmd[pos] = crypto1_byte(pcs, 0x00, 0) ^ dcmd[pos];
+            par[0] |= (((filter(pcs->odd) ^ oddparity8(dcmd[pos])) & 0x01) << (7-pos));
+        }
+        ReaderTransmitPar(ecmd, sizeof(ecmd), par, timing);
+    } else {
+        ReaderTransmit(dcmd, sizeof(dcmd), timing);
+    }
 
-	int len = ReaderReceive(answer, par);
+    int len = ReaderReceive(answer, par);
 
-	if (answer_parity) *answer_parity = par[0];
+    if (answer_parity) *answer_parity = par[0];
 
-	if (crypted == CRYPT_ALL) {
-		if (len == 1) {
-			res = 0;
-			res |= (crypto1_bit(pcs, 0, 0) ^ BIT(answer[0], 0)) << 0;
-			res |= (crypto1_bit(pcs, 0, 0) ^ BIT(answer[0], 1)) << 1;
-			res |= (crypto1_bit(pcs, 0, 0) ^ BIT(answer[0], 2)) << 2;
-			res |= (crypto1_bit(pcs, 0, 0) ^ BIT(answer[0], 3)) << 3;
-			answer[0] = res;
-		} else {
-			for (pos = 0; pos < len; pos++)
-				answer[pos] = crypto1_byte(pcs, 0x00, 0) ^ answer[pos];
-		}
-	}
-	return len;
+    if (crypted == CRYPT_ALL) {
+        if (len == 1) {
+            res = 0;
+            res |= (crypto1_bit(pcs, 0, 0) ^ BIT(answer[0], 0)) << 0;
+            res |= (crypto1_bit(pcs, 0, 0) ^ BIT(answer[0], 1)) << 1;
+            res |= (crypto1_bit(pcs, 0, 0) ^ BIT(answer[0], 2)) << 2;
+            res |= (crypto1_bit(pcs, 0, 0) ^ BIT(answer[0], 3)) << 3;
+            answer[0] = res;
+        } else {
+            for (pos = 0; pos < len; pos++)
+                answer[pos] = crypto1_byte(pcs, 0x00, 0) ^ answer[pos];
+        }
+    }
+    return len;
 }
 
 // mifare classic commands
 int mifare_classic_auth(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint8_t isNested) {
-	return mifare_classic_authex(pcs, uid, blockNo, keyType, ui64Key, isNested, NULL, NULL);
+    return mifare_classic_authex(pcs, uid, blockNo, keyType, ui64Key, isNested, NULL, NULL);
 }
 
 int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint8_t isNested, uint32_t *ntptr, uint32_t *timing) {
-	int len;
-	uint32_t pos, nt, ntpp; // Supplied tag nonce
-	uint8_t par[1] = {0x00};
-	uint8_t nr[4];
-	uint8_t mf_nr_ar[] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 };
-	uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};
-	uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0x00};
+    int len;
+    uint32_t pos, nt, ntpp; // Supplied tag nonce
+    uint8_t par[1] = {0x00};
+    uint8_t nr[4];
+    uint8_t mf_nr_ar[] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 };
+    uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};
+    uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0x00};
 
-	// "random" reader nonce:
-	num_to_bytes( prng_successor( GetTickCount(), 32), 4, nr);
+    // "random" reader nonce:
+    num_to_bytes( prng_successor( GetTickCount(), 32), 4, nr);
 
-	// Transmit MIFARE_CLASSIC_AUTH
-	len = mifare_sendcmd_short(pcs, isNested, 0x60 + (keyType & 0x01), blockNo, receivedAnswer, receivedAnswerPar, timing);
-	if (len != 4) return 1;
+    // Transmit MIFARE_CLASSIC_AUTH
+    len = mifare_sendcmd_short(pcs, isNested, 0x60 + (keyType & 0x01), blockNo, receivedAnswer, receivedAnswerPar, timing);
+    if (len != 4) return 1;
 
-	// Save the tag nonce (nt)
-	nt = bytes_to_num(receivedAnswer, 4);
+    // Save the tag nonce (nt)
+    nt = bytes_to_num(receivedAnswer, 4);
 
-	//  ----------------------------- crypto1 create
-	if (isNested)
-		crypto1_destroy(pcs);
+    //  ----------------------------- crypto1 create
+    if (isNested)
+        crypto1_destroy(pcs);
 
-	// Init cipher with key
-	crypto1_create(pcs, ui64Key);
+    // Init cipher with key
+    crypto1_create(pcs, ui64Key);
 
-	if (isNested == AUTH_NESTED) {
-		// decrypt nt with help of new key
-		nt = crypto1_word(pcs, nt ^ uid, 1) ^ nt;
-	} else {
-		// Load (plain) uid^nt into the cipher
-		crypto1_word(pcs, nt ^ uid, 0);
-	}
+    if (isNested == AUTH_NESTED) {
+        // decrypt nt with help of new key
+        nt = crypto1_word(pcs, nt ^ uid, 1) ^ nt;
+    } else {
+        // Load (plain) uid^nt into the cipher
+        crypto1_word(pcs, nt ^ uid, 0);
+    }
 
-	// some statistic
-	if (!ntptr && (MF_DBGLEVEL >= MF_DBG_EXTENDED))
-		Dbprintf("auth uid: %08x | nr: %08x | nt: %08x", uid, nr, nt);
+    // some statistic
+    if (!ntptr && (MF_DBGLEVEL >= MF_DBG_EXTENDED))
+        Dbprintf("auth uid: %08x | nr: %08x | nt: %08x", uid, nr, nt);
 
-	// save Nt
-	if (ntptr)
-		*ntptr = nt;
+    // save Nt
+    if (ntptr)
+        *ntptr = nt;
 
-	// Generate (encrypted) nr+parity by loading it into the cipher (Nr)
-	par[0] = 0;
-	for (pos = 0; pos < 4; pos++) {
-		mf_nr_ar[pos] = crypto1_byte(pcs, nr[pos], 0) ^ nr[pos];
-		par[0] |= (((filter(pcs->odd) ^ oddparity8(nr[pos])) & 0x01) << (7-pos));
-	}
+    // Generate (encrypted) nr+parity by loading it into the cipher (Nr)
+    par[0] = 0;
+    for (pos = 0; pos < 4; pos++) {
+        mf_nr_ar[pos] = crypto1_byte(pcs, nr[pos], 0) ^ nr[pos];
+        par[0] |= (((filter(pcs->odd) ^ oddparity8(nr[pos])) & 0x01) << (7-pos));
+    }
 
-	// Skip 32 bits in pseudo random generator
-	nt = prng_successor(nt, 32);
+    // Skip 32 bits in pseudo random generator
+    nt = prng_successor(nt, 32);
 
-	//  ar+parity
-	for (pos = 4; pos < 8; pos++) {
-		nt = prng_successor(nt,8);
-		mf_nr_ar[pos] = crypto1_byte(pcs,0x00,0) ^ (nt & 0xff);
-		par[0] |= (((filter(pcs->odd) ^ oddparity8(nt & 0xff)) & 0x01) << (7-pos));
-	}
+    //  ar+parity
+    for (pos = 4; pos < 8; pos++) {
+        nt = prng_successor(nt,8);
+        mf_nr_ar[pos] = crypto1_byte(pcs,0x00,0) ^ (nt & 0xff);
+        par[0] |= (((filter(pcs->odd) ^ oddparity8(nt & 0xff)) & 0x01) << (7-pos));
+    }
 
-	// Transmit reader nonce and reader answer
-	ReaderTransmitPar(mf_nr_ar, sizeof(mf_nr_ar), par, NULL);
+    // Transmit reader nonce and reader answer
+    ReaderTransmitPar(mf_nr_ar, sizeof(mf_nr_ar), par, NULL);
 
-	// Receive 4 byte tag answer
-	len = ReaderReceive(receivedAnswer, receivedAnswerPar);
-	if (!len) {
-		if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Authentication failed. Card timeout.");
-		return 2;
-	}
+    // Receive 4 byte tag answer
+    len = ReaderReceive(receivedAnswer, receivedAnswerPar);
+    if (!len) {
+        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Authentication failed. Card timeout.");
+        return 2;
+    }
 
-	ntpp = prng_successor(nt, 32) ^ crypto1_word(pcs, 0,0);
+    ntpp = prng_successor(nt, 32) ^ crypto1_word(pcs, 0,0);
 
-	if (ntpp != bytes_to_num(receivedAnswer, 4)) {
-		if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("Authentication failed. Error card response.");
-		return 3;
-	}
-	return 0;
+    if (ntpp != bytes_to_num(receivedAnswer, 4)) {
+        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Authentication failed. Error card response.");
+        return 3;
+    }
+    return 0;
 }
 
 int mifare_classic_readblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData) {
 
-	int len;
-	uint8_t	bt[2] = {0x00, 0x00};
-	uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};
-	uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0x00};
+    int len;
+    uint8_t bt[2] = {0x00, 0x00};
+    uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};
+    uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0x00};
 
-	len = mifare_sendcmd_short(pcs, 1, ISO14443A_CMD_READBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL);
-	if (len == 1) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", receivedAnswer[0]);
-		return 1;
-	}
-	if (len != 18) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: wrong response len: %x  (expected 18)", len);
-		return 2;
-	}
+    len = mifare_sendcmd_short(pcs, 1, ISO14443A_CMD_READBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL);
+    if (len == 1) {
+        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", receivedAnswer[0]);
+        return 1;
+    }
+    if (len != 18) {
+        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: wrong response len: %x  (expected 18)", len);
+        return 2;
+    }
 
-	memcpy(bt, receivedAnswer + 16, 2);
-	AddCrc14A(receivedAnswer, 16);
-	if (bt[0] != receivedAnswer[16] || bt[1] != receivedAnswer[17]) {
-		if (MF_DBGLEVEL >= MF_DBG_ALL) Dbprintf("Cmd CRC response error.");
-		return 3;
-	}
+    memcpy(bt, receivedAnswer + 16, 2);
+    AddCrc14A(receivedAnswer, 16);
+    if (bt[0] != receivedAnswer[16] || bt[1] != receivedAnswer[17]) {
+        if (MF_DBGLEVEL >= MF_DBG_ALL) Dbprintf("Cmd CRC response error.");
+        return 3;
+    }
 
-	memcpy(blockData, receivedAnswer, 16);
-	return 0;
+    memcpy(blockData, receivedAnswer, 16);
+    return 0;
 }
 
 // mifare ultralight commands
 int mifare_ul_ev1_auth(uint8_t *keybytes, uint8_t *pack){
 
-	uint16_t len = 0;
-	uint8_t resp[4] = {0x00, 0x00, 0x00, 0x00};
-	uint8_t respPar[1] = {0x00};
-	uint8_t key[4] = {0x00, 0x00, 0x00, 0x00};
-	memcpy(key, keybytes, 4);
+    uint16_t len = 0;
+    uint8_t resp[4] = {0x00, 0x00, 0x00, 0x00};
+    uint8_t respPar[1] = {0x00};
+    uint8_t key[4] = {0x00, 0x00, 0x00, 0x00};
+    memcpy(key, keybytes, 4);
 
-	if (MF_DBGLEVEL >= MF_DBG_EXTENDED)
-		Dbprintf("EV1 Auth : %02x%02x%02x%02x",	key[0], key[1], key[2], key[3]);
+    if (MF_DBGLEVEL >= MF_DBG_EXTENDED)
+        Dbprintf("EV1 Auth : %02x%02x%02x%02x", key[0], key[1], key[2], key[3]);
 
-	len = mifare_sendcmd(MIFARE_ULEV1_AUTH, key, sizeof(key), resp, respPar, NULL);
+    len = mifare_sendcmd(MIFARE_ULEV1_AUTH, key, sizeof(key), resp, respPar, NULL);
 
-	if (len != 4) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x %u", resp[0], len);
-		return 0;
-	}
+    if (len != 4) {
+        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x %u", resp[0], len);
+        return 0;
+    }
 
-	if (MF_DBGLEVEL >= MF_DBG_EXTENDED)
-		Dbprintf("Auth Resp: %02x%02x%02x%02x", resp[0],resp[1],resp[2],resp[3]);
+    if (MF_DBGLEVEL >= MF_DBG_EXTENDED)
+        Dbprintf("Auth Resp: %02x%02x%02x%02x", resp[0],resp[1],resp[2],resp[3]);
 
-	memcpy(pack, resp, 4);
-	return 1;
+    memcpy(pack, resp, 4);
+    return 1;
 }
 
 int mifare_ultra_auth(uint8_t *keybytes){
 
-	/// 3des2k
-	uint8_t random_a[8] = {1,1,1,1,1,1,1,1};
-	uint8_t random_b[8] = {0x00};
-	uint8_t enc_random_b[8] = {0x00};
-	uint8_t rnd_ab[16] = {0x00};
-	uint8_t IV[8] = {0x00};
-	uint8_t key[16] = {0x00};
-	memcpy(key, keybytes, 16);
+    /// 3des2k
+    uint8_t random_a[8] = {1,1,1,1,1,1,1,1};
+    uint8_t random_b[8] = {0x00};
+    uint8_t enc_random_b[8] = {0x00};
+    uint8_t rnd_ab[16] = {0x00};
+    uint8_t IV[8] = {0x00};
+    uint8_t key[16] = {0x00};
+    memcpy(key, keybytes, 16);
 
-	uint16_t len = 0;
-	uint8_t resp[19] = {0x00};
-	uint8_t respPar[3] = {0,0,0};
+    uint16_t len = 0;
+    uint8_t resp[19] = {0x00};
+    uint8_t respPar[3] = {0,0,0};
 
-	// REQUEST AUTHENTICATION
-	len = mifare_sendcmd_short(NULL, 1, MIFARE_ULC_AUTH_1, 0x00, resp, respPar ,NULL);
-	if (len != 11) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", resp[0]);
-		return 0;
-	}
+    // REQUEST AUTHENTICATION
+    len = mifare_sendcmd_short(NULL, 1, MIFARE_ULC_AUTH_1, 0x00, resp, respPar ,NULL);
+    if (len != 11) {
+        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", resp[0]);
+        return 0;
+    }
 
-	// tag nonce.
-	memcpy(enc_random_b,resp+1,8);
+    // tag nonce.
+    memcpy(enc_random_b,resp+1,8);
 
-	// decrypt nonce.
-	tdes_2key_dec((void*)random_b, (void*)enc_random_b, sizeof(random_b), (const void*)key, IV );
-	rol(random_b,8);
-	memcpy(rnd_ab  ,random_a,8);
-	memcpy(rnd_ab+8,random_b,8);
+    // decrypt nonce.
+    tdes_2key_dec((void*)random_b, (void*)enc_random_b, sizeof(random_b), (const void*)key, IV );
+    rol(random_b,8);
+    memcpy(rnd_ab  ,random_a,8);
+    memcpy(rnd_ab+8,random_b,8);
 
-	if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
-		Dbprintf("enc_B: %02x %02x %02x %02x %02x %02x %02x %02x",
-			enc_random_b[0],enc_random_b[1],enc_random_b[2],enc_random_b[3],enc_random_b[4],enc_random_b[5],enc_random_b[6],enc_random_b[7]);
+    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
+        Dbprintf("enc_B: %02x %02x %02x %02x %02x %02x %02x %02x",
+            enc_random_b[0],enc_random_b[1],enc_random_b[2],enc_random_b[3],enc_random_b[4],enc_random_b[5],enc_random_b[6],enc_random_b[7]);
 
-		Dbprintf("    B: %02x %02x %02x %02x %02x %02x %02x %02x",
-			random_b[0],random_b[1],random_b[2],random_b[3],random_b[4],random_b[5],random_b[6],random_b[7]);
+        Dbprintf("    B: %02x %02x %02x %02x %02x %02x %02x %02x",
+            random_b[0],random_b[1],random_b[2],random_b[3],random_b[4],random_b[5],random_b[6],random_b[7]);
 
-		Dbprintf("rnd_ab: %02x %02x %02x %02x %02x %02x %02x %02x",
-				rnd_ab[0],rnd_ab[1],rnd_ab[2],rnd_ab[3],rnd_ab[4],rnd_ab[5],rnd_ab[6],rnd_ab[7]);
+        Dbprintf("rnd_ab: %02x %02x %02x %02x %02x %02x %02x %02x",
+                rnd_ab[0],rnd_ab[1],rnd_ab[2],rnd_ab[3],rnd_ab[4],rnd_ab[5],rnd_ab[6],rnd_ab[7]);
 
-		Dbprintf("rnd_ab: %02x %02x %02x %02x %02x %02x %02x %02x",
-				rnd_ab[8],rnd_ab[9],rnd_ab[10],rnd_ab[11],rnd_ab[12],rnd_ab[13],rnd_ab[14],rnd_ab[15] );
-	}
+        Dbprintf("rnd_ab: %02x %02x %02x %02x %02x %02x %02x %02x",
+                rnd_ab[8],rnd_ab[9],rnd_ab[10],rnd_ab[11],rnd_ab[12],rnd_ab[13],rnd_ab[14],rnd_ab[15] );
+    }
 
-	// encrypt    out, in, length, key, iv
-	tdes_2key_enc(rnd_ab, rnd_ab, sizeof(rnd_ab), key, enc_random_b);
+    // encrypt    out, in, length, key, iv
+    tdes_2key_enc(rnd_ab, rnd_ab, sizeof(rnd_ab), key, enc_random_b);
 
-	len = mifare_sendcmd(MIFARE_ULC_AUTH_2, rnd_ab, sizeof(rnd_ab), resp, respPar, NULL);
-	if (len != 11) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", resp[0]);
-		return 0;
-	}
+    len = mifare_sendcmd(MIFARE_ULC_AUTH_2, rnd_ab, sizeof(rnd_ab), resp, respPar, NULL);
+    if (len != 11) {
+        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", resp[0]);
+        return 0;
+    }
 
-	uint8_t enc_resp[8] = { 0,0,0,0,0,0,0,0 };
-	uint8_t resp_random_a[8] = { 0,0,0,0,0,0,0,0 };
-	memcpy(enc_resp, resp+1, 8);
+    uint8_t enc_resp[8] = { 0,0,0,0,0,0,0,0 };
+    uint8_t resp_random_a[8] = { 0,0,0,0,0,0,0,0 };
+    memcpy(enc_resp, resp+1, 8);
 
-	// decrypt    out, in, length, key, iv
-	tdes_2key_dec(resp_random_a, enc_resp, 8, key, enc_random_b);
-	if ( memcmp(resp_random_a, random_a, 8) != 0 ) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("failed authentication");
-		return 0;
-	}
+    // decrypt    out, in, length, key, iv
+    tdes_2key_dec(resp_random_a, enc_resp, 8, key, enc_random_b);
+    if ( memcmp(resp_random_a, random_a, 8) != 0 ) {
+        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("failed authentication");
+        return 0;
+    }
 
-	if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
-		Dbprintf("e_AB: %02x %02x %02x %02x %02x %02x %02x %02x",
-				rnd_ab[0],rnd_ab[1],rnd_ab[2],rnd_ab[3],
-				rnd_ab[4],rnd_ab[5],rnd_ab[6],rnd_ab[7]);
+    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
+        Dbprintf("e_AB: %02x %02x %02x %02x %02x %02x %02x %02x",
+                rnd_ab[0],rnd_ab[1],rnd_ab[2],rnd_ab[3],
+                rnd_ab[4],rnd_ab[5],rnd_ab[6],rnd_ab[7]);
 
-		Dbprintf("e_AB: %02x %02x %02x %02x %02x %02x %02x %02x",
-				rnd_ab[8],rnd_ab[9],rnd_ab[10],rnd_ab[11],
-				rnd_ab[12],rnd_ab[13],rnd_ab[14],rnd_ab[15]);
+        Dbprintf("e_AB: %02x %02x %02x %02x %02x %02x %02x %02x",
+                rnd_ab[8],rnd_ab[9],rnd_ab[10],rnd_ab[11],
+                rnd_ab[12],rnd_ab[13],rnd_ab[14],rnd_ab[15]);
 
-		Dbprintf("a: %02x %02x %02x %02x %02x %02x %02x %02x",
-				random_a[0],random_a[1],random_a[2],random_a[3],
-				random_a[4],random_a[5],random_a[6],random_a[7]);
+        Dbprintf("a: %02x %02x %02x %02x %02x %02x %02x %02x",
+                random_a[0],random_a[1],random_a[2],random_a[3],
+                random_a[4],random_a[5],random_a[6],random_a[7]);
 
-		Dbprintf("b: %02x %02x %02x %02x %02x %02x %02x %02x",
-				resp_random_a[0],resp_random_a[1],resp_random_a[2],resp_random_a[3],
-				resp_random_a[4],resp_random_a[5],resp_random_a[6],resp_random_a[7]);
-	}
-	return 1;
+        Dbprintf("b: %02x %02x %02x %02x %02x %02x %02x %02x",
+                resp_random_a[0],resp_random_a[1],resp_random_a[2],resp_random_a[3],
+                resp_random_a[4],resp_random_a[5],resp_random_a[6],resp_random_a[7]);
+    }
+    return 1;
 }
 
 int mifare_ultra_readblockEx(uint8_t blockNo, uint8_t *blockData) {
-	uint16_t len = 0;
-	uint8_t	bt[2] = {0x00, 0x00};
-	uint8_t receivedAnswer[MAX_FRAME_SIZE] = {0x00};
-	uint8_t receivedAnswerPar[MAX_PARITY_SIZE] = {0x00};
+    uint16_t len = 0;
+    uint8_t bt[2] = {0x00, 0x00};
+    uint8_t receivedAnswer[MAX_FRAME_SIZE] = {0x00};
+    uint8_t receivedAnswerPar[MAX_PARITY_SIZE] = {0x00};
 
-	len = mifare_sendcmd_short(NULL, 1, ISO14443A_CMD_READBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL);
-	if (len == 1) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", receivedAnswer[0]);
-		return 1;
-	}
-	if (len != 18) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: card timeout. len: %x", len);
-		return 2;
-	}
+    len = mifare_sendcmd_short(NULL, 1, ISO14443A_CMD_READBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL);
+    if (len == 1) {
+        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", receivedAnswer[0]);
+        return 1;
+    }
+    if (len != 18) {
+        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: card timeout. len: %x", len);
+        return 2;
+    }
 
-	memcpy(bt, receivedAnswer + 16, 2);
-	AddCrc14A(receivedAnswer, 16);
-	if (bt[0] != receivedAnswer[16] || bt[1] != receivedAnswer[17]) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd CRC response error.");
-		return 3;
-	}
+    memcpy(bt, receivedAnswer + 16, 2);
+    AddCrc14A(receivedAnswer, 16);
+    if (bt[0] != receivedAnswer[16] || bt[1] != receivedAnswer[17]) {
+        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd CRC response error.");
+        return 3;
+    }
 
-	memcpy(blockData, receivedAnswer, 14);
-	return 0;
+    memcpy(blockData, receivedAnswer, 14);
+    return 0;
 }
 int mifare_ultra_readblock(uint8_t blockNo, uint8_t *blockData) {
-	#define MFU_MAX_RETRIES 5
-	uint8_t res;
+    #define MFU_MAX_RETRIES 5
+    uint8_t res;
 
-	for (uint8_t retries = 0; retries < MFU_MAX_RETRIES; ++retries) {
-		res = mifare_ultra_readblockEx(blockNo, blockData);
+    for (uint8_t retries = 0; retries < MFU_MAX_RETRIES; ++retries) {
+        res = mifare_ultra_readblockEx(blockNo, blockData);
 
-		// break if OK,  or NACK.
-		switch ( res ) {
-			case 0:
-			case 1:
-				return res;
-			default:
-				continue;
-		}
-	}
-	return res;
+        // break if OK,  or NACK.
+        switch ( res ) {
+            case 0:
+            case 1:
+                return res;
+            default:
+                continue;
+        }
+    }
+    return res;
 }
 
 int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData) {
-	// variables
-	uint16_t len = 0;
-	uint32_t pos = 0;
-	uint8_t par[3] = {0x00, 0x00, 0x00}; // enough for 18 Bytes to send
-	byte_t res = 0;
+    // variables
+    uint16_t len = 0;
+    uint32_t pos = 0;
+    uint8_t par[3] = {0x00, 0x00, 0x00}; // enough for 18 Bytes to send
+    byte_t res = 0;
 
-	uint8_t d_block[18], d_block_enc[18];
-	uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};
-	uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0x00};
+    uint8_t d_block[18], d_block_enc[18];
+    uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};
+    uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0x00};
 
-	// command MIFARE_CLASSIC_WRITEBLOCK
-	len = mifare_sendcmd_short(pcs, 1, ISO14443A_CMD_WRITEBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL);
+    // command MIFARE_CLASSIC_WRITEBLOCK
+    len = mifare_sendcmd_short(pcs, 1, ISO14443A_CMD_WRITEBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL);
 
-	if ((len != 1) || (receivedAnswer[0] != 0x0A)) {   //  0x0a - ACK
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", receivedAnswer[0]);
-		return 1;
-	}
+    if ((len != 1) || (receivedAnswer[0] != 0x0A)) {   //  0x0a - ACK
+        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", receivedAnswer[0]);
+        return 1;
+    }
 
-	memcpy(d_block, blockData, 16);
-	AddCrc14A(d_block, 16);
+    memcpy(d_block, blockData, 16);
+    AddCrc14A(d_block, 16);
 
-	// crypto
-	for (pos = 0; pos < 18; pos++) {
-		d_block_enc[pos] = crypto1_byte(pcs, 0x00, 0) ^ d_block[pos];
-		par[pos>>3] |= (((filter(pcs->odd) ^ oddparity8(d_block[pos])) & 0x01) << (7 - (pos&0x0007)));
-	}
+    // crypto
+    for (pos = 0; pos < 18; pos++) {
+        d_block_enc[pos] = crypto1_byte(pcs, 0x00, 0) ^ d_block[pos];
+        par[pos>>3] |= (((filter(pcs->odd) ^ oddparity8(d_block[pos])) & 0x01) << (7 - (pos&0x0007)));
+    }
 
-	ReaderTransmitPar(d_block_enc, sizeof(d_block_enc), par, NULL);
+    ReaderTransmitPar(d_block_enc, sizeof(d_block_enc), par, NULL);
 
-	// Receive the response
-	len = ReaderReceive(receivedAnswer, receivedAnswerPar);
+    // Receive the response
+    len = ReaderReceive(receivedAnswer, receivedAnswerPar);
 
-	res = 0;
-	res |= (crypto1_bit(pcs, 0, 0) ^ BIT(receivedAnswer[0], 0)) << 0;
-	res |= (crypto1_bit(pcs, 0, 0) ^ BIT(receivedAnswer[0], 1)) << 1;
-	res |= (crypto1_bit(pcs, 0, 0) ^ BIT(receivedAnswer[0], 2)) << 2;
-	res |= (crypto1_bit(pcs, 0, 0) ^ BIT(receivedAnswer[0], 3)) << 3;
+    res = 0;
+    res |= (crypto1_bit(pcs, 0, 0) ^ BIT(receivedAnswer[0], 0)) << 0;
+    res |= (crypto1_bit(pcs, 0, 0) ^ BIT(receivedAnswer[0], 1)) << 1;
+    res |= (crypto1_bit(pcs, 0, 0) ^ BIT(receivedAnswer[0], 2)) << 2;
+    res |= (crypto1_bit(pcs, 0, 0) ^ BIT(receivedAnswer[0], 3)) << 3;
 
-	if ((len != 1) || (res != 0x0A)) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd send data2 Error: %02x", res);
-		return 2;
-	}
-	return 0;
+    if ((len != 1) || (res != 0x0A)) {
+        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd send data2 Error: %02x", res);
+        return 2;
+    }
+    return 0;
 }
 
 /* // command not needed, but left for future testing
 int mifare_ultra_writeblock_compat(uint8_t blockNo, uint8_t *blockData) {
-	uint16_t len;
+    uint16_t len;
     uint8_t par[3] = {0};  // enough for 18 parity bits
-	uint8_t d_block[18] = {0x00};
-	uint8_t receivedAnswer[MAX_FRAME_SIZE];
-	uint8_t receivedAnswerPar[MAX_PARITY_SIZE];
+    uint8_t d_block[18] = {0x00};
+    uint8_t receivedAnswer[MAX_FRAME_SIZE];
+    uint8_t receivedAnswerPar[MAX_PARITY_SIZE];
 
     len = mifare_sendcmd_short(NULL, true, ISO14443A_CMD_WRITEBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL);
 
     if ((len != 1) || (receivedAnswer[0] != 0x0A)) {   //  0x0a - ACK
-		if (MF_DBGLEVEL >= MF_DBG_ERROR)
-			Dbprintf("Cmd Addr Error: %02x", receivedAnswer[0]);
+        if (MF_DBGLEVEL >= MF_DBG_ERROR)
+            Dbprintf("Cmd Addr Error: %02x", receivedAnswer[0]);
         return 1;
     }
 
-	memcpy(d_block, blockData, 16);
+    memcpy(d_block, blockData, 16);
     AddCrc14A(d_block, 16);
 
-	ReaderTransmitPar(d_block, sizeof(d_block), par, NULL);
+    ReaderTransmitPar(d_block, sizeof(d_block), par, NULL);
 
-	len = ReaderReceive(receivedAnswer, receivedAnswerPar);
+    len = ReaderReceive(receivedAnswer, receivedAnswerPar);
 
-	if ((len != 1) || (receivedAnswer[0] != 0x0A)) {   //  0x0a - ACK
-		if (MF_DBGLEVEL >= MF_DBG_ERROR)
-			Dbprintf("Cmd Data Error: %02x %d", receivedAnswer[0],len);
+    if ((len != 1) || (receivedAnswer[0] != 0x0A)) {   //  0x0a - ACK
+        if (MF_DBGLEVEL >= MF_DBG_ERROR)
+            Dbprintf("Cmd Data Error: %02x %d", receivedAnswer[0],len);
         return 2;
-	}
+    }
     return 0;
 }
 */
 
 int mifare_ultra_writeblock(uint8_t blockNo, uint8_t *blockData) {
     uint16_t len = 0;
-	uint8_t block[5] = {blockNo, 0x00, 0x00, 0x00, 0x00 };
-	uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};
-	uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0x00};
+    uint8_t block[5] = {blockNo, 0x00, 0x00, 0x00, 0x00 };
+    uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};
+    uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0x00};
 
     // command MIFARE_CLASSIC_WRITEBLOCK
-	memcpy(block+1, blockData, 4);
+    memcpy(block+1, blockData, 4);
 
-	len = mifare_sendcmd( MIFARE_ULC_WRITE, block, sizeof(block), receivedAnswer, receivedAnswerPar, NULL);
+    len = mifare_sendcmd( MIFARE_ULC_WRITE, block, sizeof(block), receivedAnswer, receivedAnswerPar, NULL);
 
     if (receivedAnswer[0] != 0x0A) {   //  0x0a - ACK
-		if (MF_DBGLEVEL >= MF_DBG_ERROR)
-			Dbprintf("Cmd Send Error: %02x %d", receivedAnswer[0],len);
+        if (MF_DBGLEVEL >= MF_DBG_ERROR)
+            Dbprintf("Cmd Send Error: %02x %d", receivedAnswer[0],len);
         return 1;
     }
     return 0;
 }
 int mifare_classic_halt_ex(struct Crypto1State *pcs) {
-	uint8_t receivedAnswer[4] = {0x00, 0x00, 0x00, 0x00};
-	uint16_t len = mifare_sendcmd_short(pcs, (pcs == NULL) ? CRYPT_NONE : CRYPT_ALL, ISO14443A_CMD_HALT, 0x00, receivedAnswer, NULL, NULL);
-	if (len != 0) {
-		if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("halt warning. response len: %x", len);
-		return 1;
-	}
-	return 0;
+    uint8_t receivedAnswer[4] = {0x00, 0x00, 0x00, 0x00};
+    uint16_t len = mifare_sendcmd_short(pcs, (pcs == NULL) ? CRYPT_NONE : CRYPT_ALL, ISO14443A_CMD_HALT, 0x00, receivedAnswer, NULL, NULL);
+    if (len != 0) {
+        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("halt warning. response len: %x", len);
+        return 1;
+    }
+    return 0;
 }
 int mifare_classic_halt(struct Crypto1State *pcs, uint32_t uid) {
-	return mifare_classic_halt_ex(pcs);
+    return mifare_classic_halt_ex(pcs);
 }
 
 int mifare_ultra_halt() {
-	uint16_t len = 0;
-	uint8_t receivedAnswer[4] = {0x00, 0x00, 0x00, 0x00};
- 	len = mifare_sendcmd_short(NULL, CRYPT_NONE, ISO14443A_CMD_HALT, 0x00, receivedAnswer, NULL, NULL);
-	if (len != 0) {
-		if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("halt warning. response len: %x", len);
-		return 1;
-	}
-	return 0;
+    uint16_t len = 0;
+    uint8_t receivedAnswer[4] = {0x00, 0x00, 0x00, 0x00};
+    len = mifare_sendcmd_short(NULL, CRYPT_NONE, ISO14443A_CMD_HALT, 0x00, receivedAnswer, NULL, NULL);
+    if (len != 0) {
+        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("halt warning. response len: %x", len);
+        return 1;
+    }
+    return 0;
 }
 
 
 // Mifare Memory Structure: up to 32 Sectors with 4 blocks each (1k and 2k cards),
 // plus evtl. 8 sectors with 16 blocks each (4k cards)
 uint8_t NumBlocksPerSector(uint8_t sectorNo) {
-	return (sectorNo < 32) ? 4 : 16;
+    return (sectorNo < 32) ? 4 : 16;
 }
 
 uint8_t FirstBlockOfSector(uint8_t sectorNo) {
-	if (sectorNo < 32)
-		return sectorNo * 4;
-	else
-		return 32*4 + (sectorNo - 32) * 16;
+    if (sectorNo < 32)
+        return sectorNo * 4;
+    else
+        return 32*4 + (sectorNo - 32) * 16;
 
 }
 
 // work with emulator memory
 void emlSetMem(uint8_t *data, int blockNum, int blocksCount) {
-	emlSetMem_xt(data, blockNum, blocksCount, 16);
+    emlSetMem_xt(data, blockNum, blocksCount, 16);
 }
 
 void emlSetMem_xt(uint8_t *data, int blockNum, int blocksCount, int blockBtWidth) {
-	uint8_t* emCARD = BigBuf_get_EM_addr();
-	memcpy(emCARD + blockNum * blockBtWidth, data, blocksCount * blockBtWidth);
+    uint8_t* emCARD = BigBuf_get_EM_addr();
+    memcpy(emCARD + blockNum * blockBtWidth, data, blocksCount * blockBtWidth);
 }
 
 void emlGetMem(uint8_t *data, int blockNum, int blocksCount) {
-	uint8_t* emCARD = BigBuf_get_EM_addr();
-	memcpy(data, emCARD + blockNum * 16, blocksCount * 16);
+    uint8_t* emCARD = BigBuf_get_EM_addr();
+    memcpy(data, emCARD + blockNum * 16, blocksCount * 16);
 }
 
 void emlGetMemBt(uint8_t *data, int bytePtr, int byteCount) {
-	uint8_t* emCARD = BigBuf_get_EM_addr();
-	memcpy(data, emCARD + bytePtr, byteCount);
+    uint8_t* emCARD = BigBuf_get_EM_addr();
+    memcpy(data, emCARD + bytePtr, byteCount);
 }
 
 int emlCheckValBl(int blockNum) {
-	uint8_t* emCARD = BigBuf_get_EM_addr();
-	uint8_t* data = emCARD + blockNum * 16;
+    uint8_t* emCARD = BigBuf_get_EM_addr();
+    uint8_t* data = emCARD + blockNum * 16;
 
-	if ((data[0] != (data[4] ^ 0xff)) || (data[0] != data[8]) ||
-			(data[1] != (data[5] ^ 0xff)) || (data[1] != data[9]) ||
-			(data[2] != (data[6] ^ 0xff)) || (data[2] != data[10]) ||
-			(data[3] != (data[7] ^ 0xff)) || (data[3] != data[11]) ||
-			(data[12] != (data[13] ^ 0xff)) || (data[12] != data[14]) ||
-			(data[12] != (data[15] ^ 0xff))
-		 )
-		return 1;
-	return 0;
+    if ((data[0] != (data[4] ^ 0xff)) || (data[0] != data[8]) ||
+            (data[1] != (data[5] ^ 0xff)) || (data[1] != data[9]) ||
+            (data[2] != (data[6] ^ 0xff)) || (data[2] != data[10]) ||
+            (data[3] != (data[7] ^ 0xff)) || (data[3] != data[11]) ||
+            (data[12] != (data[13] ^ 0xff)) || (data[12] != data[14]) ||
+            (data[12] != (data[15] ^ 0xff))
+         )
+        return 1;
+    return 0;
 }
 
 int emlGetValBl(uint32_t *blReg, uint8_t *blBlock, int blockNum) {
-	uint8_t* emCARD = BigBuf_get_EM_addr();
-	uint8_t* data = emCARD + blockNum * 16;
+    uint8_t* emCARD = BigBuf_get_EM_addr();
+    uint8_t* data = emCARD + blockNum * 16;
 
-	if (emlCheckValBl(blockNum))
-		return 1;
+    if (emlCheckValBl(blockNum))
+        return 1;
 
-	memcpy(blReg, data, 4);
-	*blBlock = data[12];
-	return 0;
+    memcpy(blReg, data, 4);
+    *blBlock = data[12];
+    return 0;
 }
 
 int emlSetValBl(uint32_t blReg, uint8_t blBlock, int blockNum) {
-	uint8_t* emCARD = BigBuf_get_EM_addr();
-	uint8_t* data = emCARD + blockNum * 16;
+    uint8_t* emCARD = BigBuf_get_EM_addr();
+    uint8_t* data = emCARD + blockNum * 16;
 
-	memcpy(data + 0, &blReg, 4);
-	memcpy(data + 8, &blReg, 4);
-	blReg = blReg ^ 0xffffffff;
-	memcpy(data + 4, &blReg, 4);
+    memcpy(data + 0, &blReg, 4);
+    memcpy(data + 8, &blReg, 4);
+    blReg = blReg ^ 0xffffffff;
+    memcpy(data + 4, &blReg, 4);
 
-	data[12] = blBlock;
-	data[13] = blBlock ^ 0xff;
-	data[14] = blBlock;
-	data[15] = blBlock ^ 0xff;
+    data[12] = blBlock;
+    data[13] = blBlock ^ 0xff;
+    data[14] = blBlock;
+    data[15] = blBlock ^ 0xff;
 
-	return 0;
+    return 0;
 }
 
 uint64_t emlGetKey(int sectorNum, int keyType) {
-	uint8_t key[6] = {0x00};
-	uint8_t* emCARD = BigBuf_get_EM_addr();
-	memcpy(key, emCARD + 16 * (FirstBlockOfSector(sectorNum) + NumBlocksPerSector(sectorNum) - 1) + keyType * 10, 6);
-	return bytes_to_num(key, 6);
+    uint8_t key[6] = {0x00};
+    uint8_t* emCARD = BigBuf_get_EM_addr();
+    memcpy(key, emCARD + 16 * (FirstBlockOfSector(sectorNum) + NumBlocksPerSector(sectorNum) - 1) + keyType * 10, 6);
+    return bytes_to_num(key, 6);
 }
 
 void emlClearMem(void) {
-	const uint8_t trailer[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0x80, 0x69, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
-	const uint8_t uid[]   =   {0xe6, 0x84, 0x87, 0xf3, 0x16, 0x88, 0x04, 0x00, 0x46, 0x8e, 0x45, 0x55, 0x4d, 0x70, 0x41, 0x04};
-	uint8_t* emCARD = BigBuf_get_EM_addr();
-	memset(emCARD, 0, CARD_MEMORY_SIZE);
+    const uint8_t trailer[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0x80, 0x69, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
+    const uint8_t uid[]   =   {0xe6, 0x84, 0x87, 0xf3, 0x16, 0x88, 0x04, 0x00, 0x46, 0x8e, 0x45, 0x55, 0x4d, 0x70, 0x41, 0x04};
+    uint8_t* emCARD = BigBuf_get_EM_addr();
+    memset(emCARD, 0, CARD_MEMORY_SIZE);
 
-	// fill sectors trailer data
-	for(uint16_t b = 3; b < 256; ((b < 127) ? (b += 4) : (b += 16)))
-		emlSetMem((uint8_t *)trailer, b, 1);
+    // fill sectors trailer data
+    for(uint16_t b = 3; b < 256; ((b < 127) ? (b += 4) : (b += 16)))
+        emlSetMem((uint8_t *)trailer, b, 1);
 
-	// uid
-	emlSetMem((uint8_t *)uid, 0, 1);
-	return;
+    // uid
+    emlSetMem((uint8_t *)uid, 0, 1);
+    return;
 }
 
 
 // Mifare desfire commands
 int mifare_sendcmd_special(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t* data, uint8_t* answer, uint8_t *answer_parity, uint32_t *timing) {
     uint8_t dcmd[5] = {cmd, data[0], data[1], 0x00, 0x00};
-	AddCrc14A(dcmd, 3);
+    AddCrc14A(dcmd, 3);
 
-	ReaderTransmit(dcmd, sizeof(dcmd), NULL);
-	int len = ReaderReceive(answer, answer_parity);
-	if(!len) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication failed. Card timeout.");
-		return 1;
+    ReaderTransmit(dcmd, sizeof(dcmd), NULL);
+    int len = ReaderReceive(answer, answer_parity);
+    if(!len) {
+        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication failed. Card timeout.");
+        return 1;
     }
-	return len;
+    return len;
 }
 
 int mifare_sendcmd_special2(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t* data, uint8_t* answer,uint8_t *answer_parity, uint32_t *timing) {
     uint8_t dcmd[20] = {0x00};
     dcmd[0] = cmd;
     memcpy(dcmd+1,data,17);
-	AddCrc14A(dcmd, 18);
+    AddCrc14A(dcmd, 18);
 
-	ReaderTransmit(dcmd, sizeof(dcmd), NULL);
-	int len = ReaderReceive(answer, answer_parity);
-	if(!len){
+    ReaderTransmit(dcmd, sizeof(dcmd), NULL);
+    int len = ReaderReceive(answer, answer_parity);
+    if(!len){
         if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication failed. Card timeout.");
-		return 1;
+        return 1;
     }
-	return len;
+    return len;
 }
 
 int mifare_desfire_des_auth1(uint32_t uid, uint8_t *blockData){
 
-	int len;
-	// load key, keynumber
-	uint8_t data[2]={MFDES_AUTHENTICATE, 0x00};
-	uint8_t receivedAnswer[MAX_FRAME_SIZE] = {0x00};
-	uint8_t receivedAnswerPar[MAX_PARITY_SIZE] = {0x00};
+    int len;
+    // load key, keynumber
+    uint8_t data[2]={MFDES_AUTHENTICATE, 0x00};
+    uint8_t receivedAnswer[MAX_FRAME_SIZE] = {0x00};
+    uint8_t receivedAnswerPar[MAX_PARITY_SIZE] = {0x00};
 
-	len = mifare_sendcmd_special(NULL, 1, 0x02, data, receivedAnswer,receivedAnswerPar,NULL);
-	if (len == 1) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR)
-			Dbprintf("Cmd Error: %02x", receivedAnswer[0]);
-		return 1;
-	}
+    len = mifare_sendcmd_special(NULL, 1, 0x02, data, receivedAnswer,receivedAnswerPar,NULL);
+    if (len == 1) {
+        if (MF_DBGLEVEL >= MF_DBG_ERROR)
+            Dbprintf("Cmd Error: %02x", receivedAnswer[0]);
+        return 1;
+    }
 
-	if (len == 12) {
-		if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	{
-			Dbprintf("Auth1 Resp: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
-				receivedAnswer[0],receivedAnswer[1],receivedAnswer[2],receivedAnswer[3],receivedAnswer[4],
-				receivedAnswer[5],receivedAnswer[6],receivedAnswer[7],receivedAnswer[8],receivedAnswer[9],
-				receivedAnswer[10],receivedAnswer[11]);
-			}
-			memcpy(blockData, receivedAnswer, 12);
-	        return 0;
-	}
-	return 1;
+    if (len == 12) {
+        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
+            Dbprintf("Auth1 Resp: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
+                receivedAnswer[0],receivedAnswer[1],receivedAnswer[2],receivedAnswer[3],receivedAnswer[4],
+                receivedAnswer[5],receivedAnswer[6],receivedAnswer[7],receivedAnswer[8],receivedAnswer[9],
+                receivedAnswer[10],receivedAnswer[11]);
+            }
+            memcpy(blockData, receivedAnswer, 12);
+            return 0;
+    }
+    return 1;
 }
 
 int mifare_desfire_des_auth2(uint32_t uid, uint8_t *key, uint8_t *blockData){
 
-	int len;
-	uint8_t data[17] = {MFDES_AUTHENTICATION_FRAME};
-	memcpy(data+1,key,16);
+    int len;
+    uint8_t data[17] = {MFDES_AUTHENTICATION_FRAME};
+    memcpy(data+1,key,16);
 
-	uint8_t receivedAnswer[MAX_FRAME_SIZE] = {0x00};
-	uint8_t receivedAnswerPar[MAX_PARITY_SIZE] = {0x00};
+    uint8_t receivedAnswer[MAX_FRAME_SIZE] = {0x00};
+    uint8_t receivedAnswerPar[MAX_PARITY_SIZE] = {0x00};
 
-	len = mifare_sendcmd_special2(NULL, 1, 0x03, data, receivedAnswer, receivedAnswerPar ,NULL);
+    len = mifare_sendcmd_special2(NULL, 1, 0x03, data, receivedAnswer, receivedAnswerPar ,NULL);
 
-	if ((receivedAnswer[0] == 0x03) && (receivedAnswer[1] == 0xae)) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR)
-			Dbprintf("Auth Error: %02x %02x", receivedAnswer[0], receivedAnswer[1]);
-		return 1;
-	}
+    if ((receivedAnswer[0] == 0x03) && (receivedAnswer[1] == 0xae)) {
+        if (MF_DBGLEVEL >= MF_DBG_ERROR)
+            Dbprintf("Auth Error: %02x %02x", receivedAnswer[0], receivedAnswer[1]);
+        return 1;
+    }
 
-	if (len == 12){
-		if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
-			Dbprintf("Auth2 Resp: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
-				receivedAnswer[0],receivedAnswer[1],receivedAnswer[2],receivedAnswer[3],receivedAnswer[4],
-				receivedAnswer[5],receivedAnswer[6],receivedAnswer[7],receivedAnswer[8],receivedAnswer[9],
-				receivedAnswer[10],receivedAnswer[11]);
-			}
-		memcpy(blockData, receivedAnswer, 12);
-		return 0;
-	}
-	return 1;
+    if (len == 12){
+        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
+            Dbprintf("Auth2 Resp: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
+                receivedAnswer[0],receivedAnswer[1],receivedAnswer[2],receivedAnswer[3],receivedAnswer[4],
+                receivedAnswer[5],receivedAnswer[6],receivedAnswer[7],receivedAnswer[8],receivedAnswer[9],
+                receivedAnswer[10],receivedAnswer[11]);
+            }
+        memcpy(blockData, receivedAnswer, 12);
+        return 0;
+    }
+    return 1;
 }
diff --git a/armsrc/mifareutil.h b/armsrc/mifareutil.h
index 594b7ca80..ad01a7078 100644
--- a/armsrc/mifareutil.h
+++ b/armsrc/mifareutil.h
@@ -21,7 +21,7 @@
 #include "iso14443a.h"
 #include "crapto1/crapto1.h"
 #include "des.h"
-#include "random.h"			// fast_prand, prand
+#include "random.h" // fast_prand, prand
 
 // mifare authentication
 #define CRYPT_NONE    0
@@ -30,8 +30,8 @@
 #define AUTH_FIRST    0
 #define AUTH_NESTED   2
 
-#define AUTHENTICATION_TIMEOUT 848			// card times out 1ms after wrong authentication (according to NXP documentation)
-#define PRE_AUTHENTICATION_LEADTIME 400		// some (non standard) cards need a pause after select before they are ready for first authentication
+#define AUTHENTICATION_TIMEOUT 848      // card times out 1ms after wrong authentication (according to NXP documentation)
+#define PRE_AUTHENTICATION_LEADTIME 400 // some (non standard) cards need a pause after select before they are ready for first authentication
 
 // mifare 4bit card answers
 #define CARD_ACK      0x0A  // 1010 - ACK
@@ -48,7 +48,7 @@
 #define MFEMUL_SELECT3      4
 #define MFEMUL_AUTH1        5
 #define MFEMUL_AUTH2        6
-#define MFEMUL_WORK	        7
+#define MFEMUL_WORK         7
 #define MFEMUL_WRITEBL2     8
 #define MFEMUL_INTREG_INC   9
 #define MFEMUL_INTREG_DEC   10
diff --git a/armsrc/optimized_cipher.c b/armsrc/optimized_cipher.c
index 98ab88041..f8ddc19d2 100644
--- a/armsrc/optimized_cipher.c
+++ b/armsrc/optimized_cipher.c
@@ -41,8 +41,8 @@
   This file contains an optimized version of the MAC-calculation algorithm. Some measurements on
   a std laptop showed it runs in about 1/3 of the time:
 
-	Std: 0.428962
-	Opt: 0.151609
+    Std: 0.428962
+    Opt: 0.151609
 
   Additionally, it is self-reliant, not requiring e.g. bitstreams from the cipherutils, thus can
   be easily dropped into a code base.
@@ -67,162 +67,162 @@
 #define opt_B(s) (((s->b >> 6) ^ (s->b >> 5) ^ (s->b >> 4) ^ (s->b)) & 0x1)
 
 #define opt__select(x,y,r)  (4 & (((r & (r << 2)) >> 5) ^ ((r & ~(r << 2)) >> 4) ^ ( (r | r << 2) >> 3)))\
-	|(2 & (((r | r << 2) >> 6) ^ ( (r | r << 2) >> 1) ^ (r >> 5) ^ r ^ ((x^y) << 1)))\
-	|(1 & (((r & ~(r << 2)) >> 4) ^ ((r & (r << 2)) >> 3) ^ r ^ x))
+    |(2 & (((r | r << 2) >> 6) ^ ( (r | r << 2) >> 1) ^ (r >> 5) ^ r ^ ((x^y) << 1)))\
+    |(1 & (((r & ~(r << 2)) >> 4) ^ ((r & (r << 2)) >> 3) ^ r ^ x))
 
 /*
  * Some background on the expression above can be found here...
 uint8_t xopt__select(bool x, bool y, uint8_t r)
 {
-	uint8_t r_ls2 = r << 2;
-	uint8_t r_and_ls2 = r & r_ls2;
-	uint8_t r_or_ls2  = r | r_ls2;
+    uint8_t r_ls2 = r << 2;
+    uint8_t r_and_ls2 = r & r_ls2;
+    uint8_t r_or_ls2  = r | r_ls2;
 
-	//r:      r0 r1 r2 r3 r4 r5 r6 r7
-	//r_ls2:  r2 r3 r4 r5 r6 r7  0  0
-	//                       z0
-	//                          z1
+    //r:      r0 r1 r2 r3 r4 r5 r6 r7
+    //r_ls2:  r2 r3 r4 r5 r6 r7  0  0
+    //                       z0
+    //                          z1
 
-//	uint8_t z0 = (r0 & r2) ^ (r1 & ~r3) ^ (r2 | r4); // <-- original
-	uint8_t z0 = (r_and_ls2 >> 5) ^ ((r & ~r_ls2) >> 4) ^ ( r_or_ls2 >> 3);
+//  uint8_t z0 = (r0 & r2) ^ (r1 & ~r3) ^ (r2 | r4); // <-- original
+    uint8_t z0 = (r_and_ls2 >> 5) ^ ((r & ~r_ls2) >> 4) ^ ( r_or_ls2 >> 3);
 
-//	uint8_t z1 = (r0 | r2) ^ ( r5 | r7) ^ r1 ^ r6 ^ x ^ y;  // <-- original
-	uint8_t z1 = (r_or_ls2 >> 6) ^ ( r_or_ls2 >> 1) ^ (r >> 5) ^ r ^ ((x^y) << 1);
+//  uint8_t z1 = (r0 | r2) ^ ( r5 | r7) ^ r1 ^ r6 ^ x ^ y;  // <-- original
+    uint8_t z1 = (r_or_ls2 >> 6) ^ ( r_or_ls2 >> 1) ^ (r >> 5) ^ r ^ ((x^y) << 1);
 
-//	uint8_t z2 = (r3 & ~r5) ^ (r4 & r6 ) ^ r7 ^ x;  // <-- original
-	uint8_t z2 = ((r & ~r_ls2) >> 4) ^ (r_and_ls2 >> 3) ^ r ^ x;
+//  uint8_t z2 = (r3 & ~r5) ^ (r4 & r6 ) ^ r7 ^ x;  // <-- original
+    uint8_t z2 = ((r & ~r_ls2) >> 4) ^ (r_and_ls2 >> 3) ^ r ^ x;
 
-	return (z0 & 4) | (z1 & 2) | (z2 & 1);
+    return (z0 & 4) | (z1 & 2) | (z2 & 1);
 }
 */
 
 void opt_successor(const uint8_t* k, State *s, bool y, State* successor) {
-	uint8_t Tt = 1 & opt_T(s);
+    uint8_t Tt = 1 & opt_T(s);
 
-	successor->t = (s->t >> 1);
-	successor->t |= (Tt ^ (s->r >> 7 & 0x1) ^ (s->r >> 3 & 0x1)) << 15;
+    successor->t = (s->t >> 1);
+    successor->t |= (Tt ^ (s->r >> 7 & 0x1) ^ (s->r >> 3 & 0x1)) << 15;
 
-	successor->b = s->b >> 1;
-	successor->b |= (opt_B(s) ^ (s->r & 0x1)) << 7;
+    successor->b = s->b >> 1;
+    successor->b |= (opt_B(s) ^ (s->r & 0x1)) << 7;
 
-	successor->r = (k[opt__select(Tt,y,s->r)] ^ successor->b) + s->l ;
-	successor->l = successor->r+s->r;
+    successor->r = (k[opt__select(Tt,y,s->r)] ^ successor->b) + s->l ;
+    successor->l = successor->r+s->r;
 }
 
 void opt_suc(const uint8_t* k,State* s, uint8_t *in, uint8_t length, bool add32Zeroes) {
-	State x2;
-	int i;
-	uint8_t head = 0;
-	for (i = 0; i < length; i++) {
-		head = 1 & (in[i] >> 7);
-		opt_successor(k, s, head, &x2);
+    State x2;
+    int i;
+    uint8_t head = 0;
+    for (i = 0; i < length; i++) {
+        head = 1 & (in[i] >> 7);
+        opt_successor(k, s, head, &x2);
 
-		head = 1 & (in[i] >> 6);
-		opt_successor(k, &x2, head, s);
+        head = 1 & (in[i] >> 6);
+        opt_successor(k, &x2, head, s);
 
-		head = 1 & (in[i] >> 5);
-		opt_successor(k, s, head, &x2);
+        head = 1 & (in[i] >> 5);
+        opt_successor(k, s, head, &x2);
 
-		head = 1 & (in[i] >> 4);
-		opt_successor(k, &x2, head, s);
+        head = 1 & (in[i] >> 4);
+        opt_successor(k, &x2, head, s);
 
-		head = 1 & (in[i] >> 3);
-		opt_successor(k, s, head, &x2);
+        head = 1 & (in[i] >> 3);
+        opt_successor(k, s, head, &x2);
 
-		head = 1 & (in[i] >> 2);
-		opt_successor(k, &x2, head, s);
+        head = 1 & (in[i] >> 2);
+        opt_successor(k, &x2, head, s);
 
-		head = 1 & (in[i] >> 1);
-		opt_successor(k, s, head, &x2);
+        head = 1 & (in[i] >> 1);
+        opt_successor(k, s, head, &x2);
 
-		head = 1 & in[i];
-		opt_successor(k, &x2, head, s);
-	}
+        head = 1 & in[i];
+        opt_successor(k, &x2, head, s);
+    }
 
-	//For tag MAC, an additional 32 zeroes
-	if (add32Zeroes) {
-		for (i = 0; i < 16; i++) {
-			opt_successor(k, s, 0, &x2);
-			opt_successor(k, &x2, 0, s);
-		}
-	}
+    //For tag MAC, an additional 32 zeroes
+    if (add32Zeroes) {
+        for (i = 0; i < 16; i++) {
+            opt_successor(k, s, 0, &x2);
+            opt_successor(k, &x2, 0, s);
+        }
+    }
 }
 
 void opt_output(const uint8_t* k,State* s,  uint8_t *buffer) {
-	uint8_t times = 0;
-	uint8_t bout = 0;
-	State temp = {0,0,0,0};
-	for ( ; times < 4; times++) {
-		bout =0;
-		bout |= (s->r & 0x4) << 5;
-		opt_successor(k, s, 0, &temp);
-		bout |= (temp.r & 0x4) << 4;
-		opt_successor(k, &temp, 0, s);
-		bout |= (s->r & 0x4) << 3;
-		opt_successor(k, s, 0, &temp);
-		bout |= (temp.r & 0x4) << 2;
-		opt_successor(k, &temp, 0, s);
-		bout |= (s->r & 0x4) << 1;
-		opt_successor(k, s, 0, &temp);
-		bout |= (temp.r & 0x4) ;
-		opt_successor(k, &temp, 0, s);
-		bout |= (s->r & 0x4) >> 1;
-		opt_successor(k, s, 0, &temp);
-		bout |= (temp.r & 0x4) >> 2;
-		opt_successor(k, &temp, 0, s);
-		buffer[times] = bout;
-	}
+    uint8_t times = 0;
+    uint8_t bout = 0;
+    State temp = {0,0,0,0};
+    for ( ; times < 4; times++) {
+        bout =0;
+        bout |= (s->r & 0x4) << 5;
+        opt_successor(k, s, 0, &temp);
+        bout |= (temp.r & 0x4) << 4;
+        opt_successor(k, &temp, 0, s);
+        bout |= (s->r & 0x4) << 3;
+        opt_successor(k, s, 0, &temp);
+        bout |= (temp.r & 0x4) << 2;
+        opt_successor(k, &temp, 0, s);
+        bout |= (s->r & 0x4) << 1;
+        opt_successor(k, s, 0, &temp);
+        bout |= (temp.r & 0x4) ;
+        opt_successor(k, &temp, 0, s);
+        bout |= (s->r & 0x4) >> 1;
+        opt_successor(k, s, 0, &temp);
+        bout |= (temp.r & 0x4) >> 2;
+        opt_successor(k, &temp, 0, s);
+        buffer[times] = bout;
+    }
 }
 
 void opt_MAC(uint8_t* k, uint8_t* input, uint8_t* out) {
-	State _init  =  {
-			((k[0] ^ 0x4c) + 0xEC) & 0xFF,// l
-			((k[0] ^ 0x4c) + 0x21) & 0xFF,// r
-			0x4c, // b
-			0xE012 // t
-			};
+    State _init  =  {
+            ((k[0] ^ 0x4c) + 0xEC) & 0xFF,// l
+            ((k[0] ^ 0x4c) + 0x21) & 0xFF,// r
+            0x4c, // b
+            0xE012 // t
+            };
 
-	opt_suc(k,&_init,input,12, false);
-	opt_output(k,&_init, out);
+    opt_suc(k,&_init,input,12, false);
+    opt_output(k,&_init, out);
 }
 
 uint8_t rev_byte(uint8_t b) {
-	b = (b & 0xF0) >> 4 | (b & 0x0F) << 4;
-	b = (b & 0xCC) >> 2 | (b & 0x33) << 2;
-	b = (b & 0xAA) >> 1 | (b & 0x55) << 1;
+    b = (b & 0xF0) >> 4 | (b & 0x0F) << 4;
+    b = (b & 0xCC) >> 2 | (b & 0x33) << 2;
+    b = (b & 0xAA) >> 1 | (b & 0x55) << 1;
    return b;
 }
 
 void opt_reverse_arraybytecpy(uint8_t* dest, uint8_t *src, size_t len) {
-	uint8_t i;
-	for ( i =0; i< len ; i++)
-		dest[i] = rev_byte(src[i]);
+    uint8_t i;
+    for ( i =0; i< len ; i++)
+        dest[i] = rev_byte(src[i]);
 }
 
 void opt_doReaderMAC(uint8_t *cc_nr_p, uint8_t *div_key_p, uint8_t mac[4]) {
-	static uint8_t cc_nr[12];
-	opt_reverse_arraybytecpy(cc_nr, cc_nr_p, 12);
-	uint8_t dest [] = {0,0,0,0,0,0,0,0};
-	opt_MAC(div_key_p, cc_nr, dest);
-	//The output MAC must also be reversed
-	opt_reverse_arraybytecpy(mac, dest, 4);
-	return;
+    static uint8_t cc_nr[12];
+    opt_reverse_arraybytecpy(cc_nr, cc_nr_p, 12);
+    uint8_t dest [] = {0,0,0,0,0,0,0,0};
+    opt_MAC(div_key_p, cc_nr, dest);
+    //The output MAC must also be reversed
+    opt_reverse_arraybytecpy(mac, dest, 4);
+    return;
 }
 void opt_doTagMAC(uint8_t *cc_p, const uint8_t *div_key_p, uint8_t mac[4]) {
-	static uint8_t cc_nr[8+4+4];
-	opt_reverse_arraybytecpy(cc_nr, cc_p, 12);
-	State _init  =  {
-			((div_key_p[0] ^ 0x4c) + 0xEC) & 0xFF,// l
-			((div_key_p[0] ^ 0x4c) + 0x21) & 0xFF,// r
-			0x4c, // b
-			0xE012 // t
-			};
-	opt_suc(div_key_p, &_init, cc_nr, 12, true);
-	uint8_t dest [] = {0,0,0,0};
-	opt_output(div_key_p, &_init, dest);
-	//The output MAC must also be reversed
-	opt_reverse_arraybytecpy(mac, dest,4);
-	return;
+    static uint8_t cc_nr[8+4+4];
+    opt_reverse_arraybytecpy(cc_nr, cc_p, 12);
+    State _init  =  {
+            ((div_key_p[0] ^ 0x4c) + 0xEC) & 0xFF,// l
+            ((div_key_p[0] ^ 0x4c) + 0x21) & 0xFF,// r
+            0x4c, // b
+            0xE012 // t
+            };
+    opt_suc(div_key_p, &_init, cc_nr, 12, true);
+    uint8_t dest [] = {0,0,0,0};
+    opt_output(div_key_p, &_init, dest);
+    //The output MAC must also be reversed
+    opt_reverse_arraybytecpy(mac, dest,4);
+    return;
 
 }
 /**
@@ -234,16 +234,16 @@ void opt_doTagMAC(uint8_t *cc_p, const uint8_t *div_key_p, uint8_t mac[4]) {
  * @return the cipher state
  */
 State opt_doTagMAC_1(uint8_t *cc_p, const uint8_t *div_key_p) {
-	static uint8_t cc_nr[8];
-	opt_reverse_arraybytecpy(cc_nr, cc_p, 8);
-	State _init  =  {
-			((div_key_p[0] ^ 0x4c) + 0xEC) & 0xFF,// l
-			((div_key_p[0] ^ 0x4c) + 0x21) & 0xFF,// r
-			0x4c, // b
-			0xE012 // t
-			};
-	opt_suc(div_key_p, &_init, cc_nr, 8, false);
-	return _init;
+    static uint8_t cc_nr[8];
+    opt_reverse_arraybytecpy(cc_nr, cc_p, 8);
+    State _init  =  {
+            ((div_key_p[0] ^ 0x4c) + 0xEC) & 0xFF,// l
+            ((div_key_p[0] ^ 0x4c) + 0x21) & 0xFF,// r
+            0x4c, // b
+            0xE012 // t
+            };
+    opt_suc(div_key_p, &_init, cc_nr, 8, false);
+    return _init;
 }
 /**
  * The second part of the tag MAC calculation, since the CC is already calculated into the state,
@@ -255,13 +255,13 @@ State opt_doTagMAC_1(uint8_t *cc_p, const uint8_t *div_key_p) {
  * @param div_key_p - the key to use
  */
 void opt_doTagMAC_2(State _init,  uint8_t* nr, uint8_t mac[4], const uint8_t* div_key_p) {
-	static uint8_t _nr[4];
-	opt_reverse_arraybytecpy(_nr, nr, 4);
-	opt_suc(div_key_p, &_init,_nr, 4, true);
+    static uint8_t _nr[4];
+    opt_reverse_arraybytecpy(_nr, nr, 4);
+    opt_suc(div_key_p, &_init,_nr, 4, true);
 
-	uint8_t dest [] = {0,0,0,0};
-	opt_output(div_key_p, &_init, dest);
-	//The output MAC must also be reversed
-	opt_reverse_arraybytecpy(mac, dest,4);
-	return;
+    uint8_t dest [] = {0,0,0,0};
+    opt_output(div_key_p, &_init, dest);
+    //The output MAC must also be reversed
+    opt_reverse_arraybytecpy(mac, dest,4);
+    return;
 }
diff --git a/armsrc/optimized_cipher.h b/armsrc/optimized_cipher.h
index 7398069f0..ad4649d3f 100644
--- a/armsrc/optimized_cipher.h
+++ b/armsrc/optimized_cipher.h
@@ -8,16 +8,16 @@
 /**
 * Definition 1 (Cipher state). A cipher state of iClass s is an element of F 40/2
 * consisting of the following four components:
-* 	1. the left register l = (l 0 . . . l 7 ) ∈ F 8/2 ;
-* 	2. the right register r = (r 0 . . . r 7 ) ∈ F 8/2 ;
-* 	3. the top register t = (t 0 . . . t 15 ) ∈ F 16/2 .
-* 	4. the bottom register b = (b 0 . . . b 7 ) ∈ F 8/2 .
+*   1. the left register l = (l 0 . . . l 7 ) ∈ F 8/2 ;
+*   2. the right register r = (r 0 . . . r 7 ) ∈ F 8/2 ;
+*   3. the top register t = (t 0 . . . t 15 ) ∈ F 16/2 .
+*   4. the bottom register b = (b 0 . . . b 7 ) ∈ F 8/2 .
 **/
 typedef struct {
-	uint8_t l;
-	uint8_t r;
-	uint8_t b;
-	uint16_t t;
+    uint8_t l;
+    uint8_t r;
+    uint8_t b;
+    uint16_t t;
 } State;
 
 /** The reader MAC is MAC(key, CC * NR )
diff --git a/armsrc/pcf7931.c b/armsrc/pcf7931.c
index 4c8259ea5..be56bc37f 100644
--- a/armsrc/pcf7931.c
+++ b/armsrc/pcf7931.c
@@ -5,384 +5,384 @@
 
 size_t DemodPCF7931(uint8_t **outBlocks) {
     uint8_t bits[256] = {0x00};
-	uint8_t blocks[8][16];
+    uint8_t blocks[8][16];
     uint8_t *dest = BigBuf_get_addr();
 
-	int GraphTraceLen = BigBuf_max_traceLen();
-	if (  GraphTraceLen > 18000 )
-		GraphTraceLen = 18000;
+    int GraphTraceLen = BigBuf_max_traceLen();
+    if (  GraphTraceLen > 18000 )
+        GraphTraceLen = 18000;
 
-	int i, j, lastval, bitidx, half_switch;
-	int clock = 64;
-	int tolerance = clock / 8;
-	int pmc, block_done;
-	int lc, warnings = 0;
-	size_t num_blocks = 0;
-	int lmin=128, lmax=128;
-	uint8_t dir;
-	//clear read buffer
-	BigBuf_Clear_keep_EM();
+    int i, j, lastval, bitidx, half_switch;
+    int clock = 64;
+    int tolerance = clock / 8;
+    int pmc, block_done;
+    int lc, warnings = 0;
+    size_t num_blocks = 0;
+    int lmin=128, lmax=128;
+    uint8_t dir;
+    //clear read buffer
+    BigBuf_Clear_keep_EM();
 
-	LFSetupFPGAForADC(95, true);
-	DoAcquisition_default(0, true);
+    LFSetupFPGAForADC(95, true);
+    DoAcquisition_default(0, true);
 
-	lmin = 64;
-	lmax = 192;
+    lmin = 64;
+    lmax = 192;
 
-	i = 2;
+    i = 2;
 
-	/* Find first local max/min */
+    /* Find first local max/min */
     if(dest[1] > dest[0]) {
-		while(i < GraphTraceLen) {
+        while(i < GraphTraceLen) {
             if( !(dest[i] > dest[i-1]) && dest[i] > lmax)
-				break;
-			i++;
-		}
-		dir = 0;
-	} else {
-		while(i < GraphTraceLen) {
+                break;
+            i++;
+        }
+        dir = 0;
+    } else {
+        while(i < GraphTraceLen) {
             if( !(dest[i] < dest[i-1]) && dest[i] < lmin)
-				break;
-			i++;
-		}
-		dir = 1;
-	}
+                break;
+            i++;
+        }
+        dir = 1;
+    }
 
-	lastval = i++;
-	half_switch = 0;
-	pmc = 0;
-	block_done = 0;
+    lastval = i++;
+    half_switch = 0;
+    pmc = 0;
+    block_done = 0;
 
-	for (bitidx = 0; i < GraphTraceLen; i++) {
-		if ((dest[i-1] > dest[i] && dir == 1 && dest[i] > lmax) || (dest[i-1] < dest[i] && dir == 0 && dest[i] < lmin)) {
-			lc = i - lastval;
-			lastval = i;
+    for (bitidx = 0; i < GraphTraceLen; i++) {
+        if ((dest[i-1] > dest[i] && dir == 1 && dest[i] > lmax) || (dest[i-1] < dest[i] && dir == 0 && dest[i] < lmin)) {
+            lc = i - lastval;
+            lastval = i;
 
-			// Switch depending on lc length:
-			// Tolerance is 1/8 of clock rate (arbitrary)
-			if (ABS(lc-clock/4) < tolerance) {
-				// 16T0
-				if((i - pmc) == lc) { /* 16T0 was previous one */
-					/* It's a PMC ! */
-					i += (128+127+16+32+33+16)-1;
-					lastval = i;
-					pmc = 0;
-					block_done = 1;
-				} else {
-					pmc = i;
-				}
-			} else if (ABS(lc-clock/2) < tolerance) {
-				// 32TO
-				if((i - pmc) == lc) { /* 16T0 was previous one */
-					/* It's a PMC ! */
-					i += (128+127+16+32+33)-1;
-					lastval = i;
-					pmc = 0;
-					block_done = 1;
-				} else if(half_switch == 1) {
+            // Switch depending on lc length:
+            // Tolerance is 1/8 of clock rate (arbitrary)
+            if (ABS(lc-clock/4) < tolerance) {
+                // 16T0
+                if((i - pmc) == lc) { /* 16T0 was previous one */
+                    /* It's a PMC ! */
+                    i += (128+127+16+32+33+16)-1;
+                    lastval = i;
+                    pmc = 0;
+                    block_done = 1;
+                } else {
+                    pmc = i;
+                }
+            } else if (ABS(lc-clock/2) < tolerance) {
+                // 32TO
+                if((i - pmc) == lc) { /* 16T0 was previous one */
+                    /* It's a PMC ! */
+                    i += (128+127+16+32+33)-1;
+                    lastval = i;
+                    pmc = 0;
+                    block_done = 1;
+                } else if(half_switch == 1) {
                     bits[bitidx++] = 0;
-					half_switch = 0;
-				}
-				else
-					half_switch++;
-			} else if (ABS(lc-clock) < tolerance) {
-				// 64TO
+                    half_switch = 0;
+                }
+                else
+                    half_switch++;
+            } else if (ABS(lc-clock) < tolerance) {
+                // 64TO
                 bits[bitidx++] = 1;
-			} else {
-				// Error
-				if (++warnings > 10) {
-					Dbprintf("Error: too many detection errors, aborting.");
-					return 0;
-				}
-			}
+            } else {
+                // Error
+                if (++warnings > 10) {
+                    Dbprintf("Error: too many detection errors, aborting.");
+                    return 0;
+                }
+            }
 
-			if(block_done == 1) {
-				if(bitidx == 128) {
-					for(j = 0; j < 16; ++j) {
-						blocks[num_blocks][j] =
-							128 * bits[j*8 + 7]+
+            if(block_done == 1) {
+                if(bitidx == 128) {
+                    for(j = 0; j < 16; ++j) {
+                        blocks[num_blocks][j] =
+                            128 * bits[j*8 + 7]+
                                 64*bits[j*8+6]+
                                 32*bits[j*8+5]+
                                 16*bits[j*8+4]+
                                 8*bits[j*8+3]+
                                 4*bits[j*8+2]+
                                 2*bits[j*8+1]+
-							bits[j*8]
-						;
-					}
-					num_blocks++;
-				}
-				bitidx = 0;
-				block_done = 0;
-				half_switch = 0;
-			}
-			if(i < GraphTraceLen)
+                            bits[j*8]
+                        ;
+                    }
+                    num_blocks++;
+                }
+                bitidx = 0;
+                block_done = 0;
+                half_switch = 0;
+            }
+            if(i < GraphTraceLen)
                 dir =(dest[i-1] > dest[i]) ? 0 : 1;
-		}
-		if(bitidx==255)
-			bitidx=0;
-		warnings = 0;
-		if(num_blocks == 4) break;
-	}
+        }
+        if(bitidx==255)
+            bitidx=0;
+        warnings = 0;
+        if(num_blocks == 4) break;
+    }
     memcpy(outBlocks, blocks, 16*num_blocks);
-	return num_blocks;
+    return num_blocks;
 }
 
 bool IsBlock0PCF7931(uint8_t *block) {
-	// assuming all RFU bits are set to 0
-	// if PAC is enabled password is set to 0
-	if (block[7] == 0x01)
-	{
-		if (!memcmp(block, "\x00\x00\x00\x00\x00\x00\x00", 7) && !memcmp(block+9, "\x00\x00\x00\x00\x00\x00\x00", 7))
-			return true;
-	}
-	else if (block[7] == 0x00)
-	{
-		if (!memcmp(block+9, "\x00\x00\x00\x00\x00\x00\x00", 7))
-			return true;
-	}
-	return false;
+    // assuming all RFU bits are set to 0
+    // if PAC is enabled password is set to 0
+    if (block[7] == 0x01)
+    {
+        if (!memcmp(block, "\x00\x00\x00\x00\x00\x00\x00", 7) && !memcmp(block+9, "\x00\x00\x00\x00\x00\x00\x00", 7))
+            return true;
+    }
+    else if (block[7] == 0x00)
+    {
+        if (!memcmp(block+9, "\x00\x00\x00\x00\x00\x00\x00", 7))
+            return true;
+    }
+    return false;
 }
 
 bool IsBlock1PCF7931(uint8_t *block) {
-	// assuming all RFU bits are set to 0
-	if (block[10] == 0 && block[11] == 0 && block[12] == 0 && block[13] == 0)
-		if((block[14] & 0x7f) <= 9 && block[15] <= 9)
-			return true;
+    // assuming all RFU bits are set to 0
+    if (block[10] == 0 && block[11] == 0 && block[12] == 0 && block[13] == 0)
+        if((block[14] & 0x7f) <= 9 && block[15] <= 9)
+            return true;
 
-	return false;
+    return false;
 }
 
 void ReadPCF7931() {
-	int found_blocks = 0; // successfully read blocks
-	int max_blocks = 8;	// readable blocks
-	uint8_t memory_blocks[8][17]; // PCF content
+    int found_blocks = 0; // successfully read blocks
+    int max_blocks = 8;   // readable blocks
+    uint8_t memory_blocks[8][17]; // PCF content
 
-	uint8_t single_blocks[8][17]; // PFC blocks with unknown position
-	int single_blocks_cnt = 0;
+    uint8_t single_blocks[8][17]; // PFC blocks with unknown position
+    int single_blocks_cnt = 0;
 
-	size_t n = 0; // transmitted blocks
-	uint8_t tmp_blocks[4][16]; // temporary read buffer
+    size_t n = 0; // transmitted blocks
+    uint8_t tmp_blocks[4][16]; // temporary read buffer
 
-	uint8_t found_0_1 = 0; // flag: blocks 0 and 1 were found
-	int errors = 0; // error counter
-	int tries = 0; // tries counter
+    uint8_t found_0_1 = 0; // flag: blocks 0 and 1 were found
+    int errors = 0; // error counter
+    int tries = 0; // tries counter
 
-	memset(memory_blocks, 0, 8*17*sizeof(uint8_t));
-	memset(single_blocks, 0, 8*17*sizeof(uint8_t));
+    memset(memory_blocks, 0, 8*17*sizeof(uint8_t));
+    memset(single_blocks, 0, 8*17*sizeof(uint8_t));
 
-	int i = 0, j = 0;
+    int i = 0, j = 0;
 
-	do {
-		i = 0;
+    do {
+        i = 0;
 
-		memset(tmp_blocks, 0, 4*16*sizeof(uint8_t));
-		n = DemodPCF7931((uint8_t**)tmp_blocks);
-		if(!n)
-			++errors;
+        memset(tmp_blocks, 0, 4*16*sizeof(uint8_t));
+        n = DemodPCF7931((uint8_t**)tmp_blocks);
+        if(!n)
+            ++errors;
 
-		// exit if no block is received
-		if (errors >= 10 && found_blocks == 0 && single_blocks_cnt == 0) {
-			Dbprintf("Error, no tag or bad tag");
-			return;
-		}
-		// exit if too many errors during reading
-		if (tries > 50 && (2*errors > tries)) {
-			Dbprintf("Error reading the tag");
-			Dbprintf("Here is the partial content");
-			goto end;
-		}
+        // exit if no block is received
+        if (errors >= 10 && found_blocks == 0 && single_blocks_cnt == 0) {
+            Dbprintf("Error, no tag or bad tag");
+            return;
+        }
+        // exit if too many errors during reading
+        if (tries > 50 && (2*errors > tries)) {
+            Dbprintf("Error reading the tag");
+            Dbprintf("Here is the partial content");
+            goto end;
+        }
 
-		// our logic breaks if we don't get at least two blocks
-		if (n < 2) {
-			if (n == 0 || !memcmp(tmp_blocks[0], "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", 16))
-				continue;
+        // our logic breaks if we don't get at least two blocks
+        if (n < 2) {
+            if (n == 0 || !memcmp(tmp_blocks[0], "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", 16))
+                continue;
 
-			if (single_blocks_cnt < max_blocks) {
-				for (i = 0; i < single_blocks_cnt; ++i) {
-					if (!memcmp(single_blocks[i], tmp_blocks[0], 16)) {
-						j = 1;
-						break;
-					}
-				}
-				if (j != 1) {
-					memcpy(single_blocks[single_blocks_cnt], tmp_blocks[0], 16);
-					single_blocks_cnt++;
-				}
-				j = 0;
-			}
-			++tries;
-			continue;
-	 	}
+            if (single_blocks_cnt < max_blocks) {
+                for (i = 0; i < single_blocks_cnt; ++i) {
+                    if (!memcmp(single_blocks[i], tmp_blocks[0], 16)) {
+                        j = 1;
+                        break;
+                    }
+                }
+                if (j != 1) {
+                    memcpy(single_blocks[single_blocks_cnt], tmp_blocks[0], 16);
+                    single_blocks_cnt++;
+                }
+                j = 0;
+            }
+            ++tries;
+            continue;
+        }
 
-	 	Dbprintf("(dbg) got %d blocks (%d/%d found) (%d tries, %d errors)", n, found_blocks, (max_blocks == 0 ? found_blocks : max_blocks), tries, errors);
+        Dbprintf("(dbg) got %d blocks (%d/%d found) (%d tries, %d errors)", n, found_blocks, (max_blocks == 0 ? found_blocks : max_blocks), tries, errors);
 
-		i = 0;
-		if(!found_0_1) {
-			while (i < n - 1) {
-				if (IsBlock0PCF7931(tmp_blocks[i]) && IsBlock1PCF7931(tmp_blocks[i+1])) {
-					found_0_1 = 1;
-					memcpy(memory_blocks[0], tmp_blocks[i], 16);
-					memcpy(memory_blocks[1], tmp_blocks[i+1], 16);
-					memory_blocks[0][ALLOC] = memory_blocks[1][ALLOC] = 1;
-					// block 1 tells how many blocks are going to be sent
-					max_blocks = MAX((memory_blocks[1][14] & 0x7f), memory_blocks[1][15]) + 1;
-					found_blocks = 2;
+        i = 0;
+        if(!found_0_1) {
+            while (i < n - 1) {
+                if (IsBlock0PCF7931(tmp_blocks[i]) && IsBlock1PCF7931(tmp_blocks[i+1])) {
+                    found_0_1 = 1;
+                    memcpy(memory_blocks[0], tmp_blocks[i], 16);
+                    memcpy(memory_blocks[1], tmp_blocks[i+1], 16);
+                    memory_blocks[0][ALLOC] = memory_blocks[1][ALLOC] = 1;
+                    // block 1 tells how many blocks are going to be sent
+                    max_blocks = MAX((memory_blocks[1][14] & 0x7f), memory_blocks[1][15]) + 1;
+                    found_blocks = 2;
 
-					Dbprintf("Found blocks 0 and 1. PCF is transmitting %d blocks.", max_blocks);
+                    Dbprintf("Found blocks 0 and 1. PCF is transmitting %d blocks.", max_blocks);
 
-					// handle the following blocks
-					for (j = i + 2; j < n; ++j) {
-						memcpy(memory_blocks[found_blocks], tmp_blocks[j], 16);
-						memory_blocks[found_blocks][ALLOC] = 1;
-						++found_blocks;
-					}
-					break;
-				}
-				++i;
-			}
-		} else {
-			// Trying to re-order blocks
-			// Look for identical block in memory blocks
-			while (i < n-1) {
-				// skip all zeroes blocks
-				if (memcmp(tmp_blocks[i], "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", 16)) {
-					for (j = 1; j < max_blocks - 1; ++j) {
-						if (!memcmp(tmp_blocks[i], memory_blocks[j], 16) && !memory_blocks[j+1][ALLOC]) {
-							memcpy(memory_blocks[j+1], tmp_blocks[i+1], 16);
-							memory_blocks[j+1][ALLOC] = 1;
-							if (++found_blocks >= max_blocks) goto end;
-						}
-					}
-				}
-				if (memcmp(tmp_blocks[i+1], "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", 16)) {
-					for (j = 0; j < max_blocks; ++j) {
-						if (!memcmp(tmp_blocks[i+1], memory_blocks[j], 16) && !memory_blocks[(j == 0 ? max_blocks : j) -1][ALLOC]) {
-							if (j == 0) {
-								memcpy(memory_blocks[max_blocks - 1], tmp_blocks[i], 16);
-								memory_blocks[max_blocks - 1][ALLOC] = 1;
-							} else {
-								memcpy(memory_blocks[j-1], tmp_blocks[i], 16);
-								memory_blocks[j-1][ALLOC] = 1;
-							}
-							if (++found_blocks >= max_blocks) goto end;
-						}
-					}
-				}
-				++i;
-			}
-		}
-		++tries;
-		if (BUTTON_PRESS()) {
-			Dbprintf("Button pressed, stopping.");
-			goto end;
-		}
-	}
-	while (found_blocks != max_blocks);
+                    // handle the following blocks
+                    for (j = i + 2; j < n; ++j) {
+                        memcpy(memory_blocks[found_blocks], tmp_blocks[j], 16);
+                        memory_blocks[found_blocks][ALLOC] = 1;
+                        ++found_blocks;
+                    }
+                    break;
+                }
+                ++i;
+            }
+        } else {
+            // Trying to re-order blocks
+            // Look for identical block in memory blocks
+            while (i < n-1) {
+                // skip all zeroes blocks
+                if (memcmp(tmp_blocks[i], "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", 16)) {
+                    for (j = 1; j < max_blocks - 1; ++j) {
+                        if (!memcmp(tmp_blocks[i], memory_blocks[j], 16) && !memory_blocks[j+1][ALLOC]) {
+                            memcpy(memory_blocks[j+1], tmp_blocks[i+1], 16);
+                            memory_blocks[j+1][ALLOC] = 1;
+                            if (++found_blocks >= max_blocks) goto end;
+                        }
+                    }
+                }
+                if (memcmp(tmp_blocks[i+1], "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", 16)) {
+                    for (j = 0; j < max_blocks; ++j) {
+                        if (!memcmp(tmp_blocks[i+1], memory_blocks[j], 16) && !memory_blocks[(j == 0 ? max_blocks : j) -1][ALLOC]) {
+                            if (j == 0) {
+                                memcpy(memory_blocks[max_blocks - 1], tmp_blocks[i], 16);
+                                memory_blocks[max_blocks - 1][ALLOC] = 1;
+                            } else {
+                                memcpy(memory_blocks[j-1], tmp_blocks[i], 16);
+                                memory_blocks[j-1][ALLOC] = 1;
+                            }
+                            if (++found_blocks >= max_blocks) goto end;
+                        }
+                    }
+                }
+                ++i;
+            }
+        }
+        ++tries;
+        if (BUTTON_PRESS()) {
+            Dbprintf("Button pressed, stopping.");
+            goto end;
+        }
+    }
+    while (found_blocks != max_blocks);
 
  end:
-	Dbprintf("-----------------------------------------");
-	Dbprintf("Memory content:");
-	Dbprintf("-----------------------------------------");
-	for (i = 0; i < max_blocks; ++i) {
-		if (memory_blocks[i][ALLOC])
-			print_result("Block", memory_blocks[i], 16);
-		else
-			Dbprintf("<missing block %d>", i);
-	}
-	Dbprintf("-----------------------------------------");
+    Dbprintf("-----------------------------------------");
+    Dbprintf("Memory content:");
+    Dbprintf("-----------------------------------------");
+    for (i = 0; i < max_blocks; ++i) {
+        if (memory_blocks[i][ALLOC])
+            print_result("Block", memory_blocks[i], 16);
+        else
+            Dbprintf("<missing block %d>", i);
+    }
+    Dbprintf("-----------------------------------------");
 
-	if (found_blocks < max_blocks) {
-		Dbprintf("-----------------------------------------");
-		Dbprintf("Blocks with unknown position:");
-		Dbprintf("-----------------------------------------");
-		for (i = 0; i < single_blocks_cnt; ++i)
-			print_result("Block", single_blocks[i], 16);
+    if (found_blocks < max_blocks) {
+        Dbprintf("-----------------------------------------");
+        Dbprintf("Blocks with unknown position:");
+        Dbprintf("-----------------------------------------");
+        for (i = 0; i < single_blocks_cnt; ++i)
+            print_result("Block", single_blocks[i], 16);
 
-		Dbprintf("-----------------------------------------");
-	}
-	cmd_send(CMD_ACK,0,0,0,0,0);
+        Dbprintf("-----------------------------------------");
+    }
+    cmd_send(CMD_ACK,0,0,0,0,0);
 }
 
 static void RealWritePCF7931(uint8_t *pass, uint16_t init_delay, int32_t l, int32_t p, uint8_t address, uint8_t byte, uint8_t data) {
-	uint32_t tab[1024] = {0}; // data times frame
-	uint32_t u = 0;
-	uint8_t parity = 0;
-	bool comp = 0;
+    uint32_t tab[1024] = {0}; // data times frame
+    uint32_t u = 0;
+    uint8_t parity = 0;
+    bool comp = 0;
 
-	//BUILD OF THE DATA FRAME
-	//alimentation of the tag (time for initializing)
-	AddPatternPCF7931(init_delay, 0, 8192/2*T0_PCF, tab);
-	AddPatternPCF7931(8192/2*T0_PCF + 319*T0_PCF+70, 3*T0_PCF, 29*T0_PCF, tab);
-	//password indication bit
-	AddBitPCF7931(1, tab, l, p);
-	//password (on 56 bits)
-	AddBytePCF7931(pass[0], tab, l, p);
-	AddBytePCF7931(pass[1], tab, l, p);
-	AddBytePCF7931(pass[2], tab, l, p);
-	AddBytePCF7931(pass[3], tab, l, p);
-	AddBytePCF7931(pass[4], tab, l, p);
-	AddBytePCF7931(pass[5], tab, l, p);
-	AddBytePCF7931(pass[6], tab, l, p);
-	//programming mode (0 or 1)
-	AddBitPCF7931(0, tab, l, p);
+    //BUILD OF THE DATA FRAME
+    //alimentation of the tag (time for initializing)
+    AddPatternPCF7931(init_delay, 0, 8192/2*T0_PCF, tab);
+    AddPatternPCF7931(8192/2*T0_PCF + 319*T0_PCF+70, 3*T0_PCF, 29*T0_PCF, tab);
+    //password indication bit
+    AddBitPCF7931(1, tab, l, p);
+    //password (on 56 bits)
+    AddBytePCF7931(pass[0], tab, l, p);
+    AddBytePCF7931(pass[1], tab, l, p);
+    AddBytePCF7931(pass[2], tab, l, p);
+    AddBytePCF7931(pass[3], tab, l, p);
+    AddBytePCF7931(pass[4], tab, l, p);
+    AddBytePCF7931(pass[5], tab, l, p);
+    AddBytePCF7931(pass[6], tab, l, p);
+    //programming mode (0 or 1)
+    AddBitPCF7931(0, tab, l, p);
 
-	//block adress on 6 bits
-	for (u = 0; u < 6; ++u) {
-		if (address&(1<<u)) {	// bit 1
-			 ++parity;
-			 AddBitPCF7931(1, tab, l, p);
-		} else{					// bit 0
-			 AddBitPCF7931(0, tab, l, p);
-		}
-	}
+    //block adress on 6 bits
+    for (u = 0; u < 6; ++u) {
+        if (address&(1<<u)) { // bit 1
+             ++parity;
+             AddBitPCF7931(1, tab, l, p);
+        } else{               // bit 0
+             AddBitPCF7931(0, tab, l, p);
+        }
+    }
 
-	//byte address on 4 bits
-	for (u = 0; u < 4; ++u)
-	{
-		if (byte&(1<<u)) {	// bit 1
-			 parity++;
-			 AddBitPCF7931(1, tab, l, p);
-		}
-		else				// bit 0
-			 AddBitPCF7931(0, tab, l, p);
-	}
+    //byte address on 4 bits
+    for (u = 0; u < 4; ++u)
+    {
+        if (byte&(1<<u)) {    // bit 1
+             parity++;
+             AddBitPCF7931(1, tab, l, p);
+        }
+        else                  // bit 0
+             AddBitPCF7931(0, tab, l, p);
+    }
 
-	//data on 8 bits
-	for (u=0; u<8; u++)
-	{
-		if (data&(1<<u)) {	// bit 1
-			 parity++;
-			 AddBitPCF7931(1, tab, l, p);
-		}
-		else				//bit 0
-			 AddBitPCF7931(0, tab, l, p);
-		}
+    //data on 8 bits
+    for (u=0; u<8; u++)
+    {
+        if (data&(1<<u)) {    // bit 1
+             parity++;
+             AddBitPCF7931(1, tab, l, p);
+        }
+        else                  //bit 0
+             AddBitPCF7931(0, tab, l, p);
+        }
 
-	//parity bit
-	if ((parity % 2) == 0)
-	 	AddBitPCF7931(0, tab, l, p); //even parity
-	else
-		AddBitPCF7931(1, tab, l, p);//odd parity
+    //parity bit
+    if ((parity % 2) == 0)
+        AddBitPCF7931(0, tab, l, p); //even parity
+    else
+        AddBitPCF7931(1, tab, l, p);//odd parity
 
-	//time access memory
-	AddPatternPCF7931(5120+2680, 0, 0, tab);
+    //time access memory
+    AddPatternPCF7931(5120+2680, 0, 0, tab);
 
-	//conversion of the scale time
-	for (u = 0; u < 500; ++u)
-		tab[u]=(tab[u] * 3)/2;
+    //conversion of the scale time
+    for (u = 0; u < 500; ++u)
+        tab[u]=(tab[u] * 3)/2;
 
-	//compensation of the counter reload
-	while (!comp){
-		comp = 1;
-		for (u = 0; tab[u] != 0; ++u)
-			if(tab[u] > 0xFFFF){
-			  tab[u] -= 0xFFFF;
-			  comp = 0;
-			}
-		}
+    //compensation of the counter reload
+    while (!comp){
+        comp = 1;
+        for (u = 0; tab[u] != 0; ++u)
+            if(tab[u] > 0xFFFF){
+              tab[u] -= 0xFFFF;
+              comp = 0;
+            }
+        }
 
-	SendCmdPCF7931(tab);
+    SendCmdPCF7931(tab);
 }
 
 /* Write on a byte of a PCF7931 tag
@@ -391,16 +391,16 @@ static void RealWritePCF7931(uint8_t *pass, uint16_t init_delay, int32_t l, int3
     @param data : data to write
  */
 void WritePCF7931(uint8_t pass1, uint8_t pass2, uint8_t pass3, uint8_t pass4, uint8_t pass5, uint8_t pass6, uint8_t pass7, uint16_t init_delay, int32_t l, int32_t p, uint8_t address, uint8_t byte, uint8_t data) {
-	Dbprintf("Initialization delay : %d us", init_delay);
-	Dbprintf("Offsets : %d us on the low pulses width, %d us on the low pulses positions", l, p);
-	Dbprintf("Password (LSB first on each byte): %02x %02x %02x %02x %02x %02x %02x", pass1, pass2, pass3, pass4, pass5, pass6, pass7);
-	Dbprintf("Block address : %02x", address);
-	Dbprintf("Byte address : %02x", byte);
-	Dbprintf("Data : %02x", data);
+    Dbprintf("Initialization delay : %d us", init_delay);
+    Dbprintf("Offsets : %d us on the low pulses width, %d us on the low pulses positions", l, p);
+    Dbprintf("Password (LSB first on each byte): %02x %02x %02x %02x %02x %02x %02x", pass1, pass2, pass3, pass4, pass5, pass6, pass7);
+    Dbprintf("Block address : %02x", address);
+    Dbprintf("Byte address : %02x", byte);
+    Dbprintf("Data : %02x", data);
 
-	uint8_t password[7] = {pass1, pass2, pass3, pass4, pass5, pass6, pass7};
+    uint8_t password[7] = {pass1, pass2, pass3, pass4, pass5, pass6, pass7};
 
-	RealWritePCF7931 (password, init_delay, l, p, address, byte, data);
+    RealWritePCF7931 (password, init_delay, l, p, address, byte, data);
 }
 
 
@@ -409,52 +409,52 @@ void WritePCF7931(uint8_t pass1, uint8_t pass2, uint8_t pass3, uint8_t pass4, ui
  */
 
 void SendCmdPCF7931(uint32_t * tab){
-	uint16_t u=0, tempo=0;
+    uint16_t u=0, tempo=0;
 
-	Dbprintf("Sending data frame...");
+    Dbprintf("Sending data frame...");
 
-	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-	FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_PASSTHRU );
+    FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
+    FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_PASSTHRU );
 
-	LED_A_ON();
+    LED_A_ON();
 
-	// steal this pin from the SSP and use it to control the modulation
-	AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
-	AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
+    // steal this pin from the SSP and use it to control the modulation
+    AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
+    AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
 
-	//initialization of the timer
-	AT91C_BASE_PMC->PMC_PCER |= (0x1 << AT91C_ID_TC0);
-	AT91C_BASE_TCB->TCB_BMR = AT91C_TCB_TC0XC0S_NONE | AT91C_TCB_TC1XC1S_TIOA0 | AT91C_TCB_TC2XC2S_NONE;
-	AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS; // timer disable
-	AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV3_CLOCK;  //clock at 48/32 MHz
-	AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN;
-	AT91C_BASE_TCB->TCB_BCR = 1;
+    //initialization of the timer
+    AT91C_BASE_PMC->PMC_PCER |= (0x1 << AT91C_ID_TC0);
+    AT91C_BASE_TCB->TCB_BMR = AT91C_TCB_TC0XC0S_NONE | AT91C_TCB_TC1XC1S_TIOA0 | AT91C_TCB_TC2XC2S_NONE;
+    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS; // timer disable
+    AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV3_CLOCK;  //clock at 48/32 MHz
+    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN;
+    AT91C_BASE_TCB->TCB_BCR = 1;
 
-	tempo = AT91C_BASE_TC0->TC_CV;
-	for( u = 0; tab[u] != 0; u += 3){
-		// modulate antenna
-		HIGH(GPIO_SSC_DOUT);
-		while (tempo !=  tab[u])
-			tempo = AT91C_BASE_TC0->TC_CV;
+    tempo = AT91C_BASE_TC0->TC_CV;
+    for( u = 0; tab[u] != 0; u += 3){
+        // modulate antenna
+        HIGH(GPIO_SSC_DOUT);
+        while (tempo !=  tab[u])
+            tempo = AT91C_BASE_TC0->TC_CV;
 
-		// stop modulating antenna
-		LOW(GPIO_SSC_DOUT);
-		while (tempo !=  tab[u+1])
-			tempo = AT91C_BASE_TC0->TC_CV;
+        // stop modulating antenna
+        LOW(GPIO_SSC_DOUT);
+        while (tempo !=  tab[u+1])
+            tempo = AT91C_BASE_TC0->TC_CV;
 
-		// modulate antenna
-		HIGH(GPIO_SSC_DOUT);
-		while (tempo !=  tab[u+2])
-			tempo = AT91C_BASE_TC0->TC_CV;
-	}
+        // modulate antenna
+        HIGH(GPIO_SSC_DOUT);
+        while (tempo !=  tab[u+2])
+            tempo = AT91C_BASE_TC0->TC_CV;
+    }
 
-	LED_A_OFF();
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	SpinDelay(200);
+    LED_A_OFF();
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    SpinDelay(200);
 
-	AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS; // timer disable
-	LED(0xFFFF, 1000);
+    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS; // timer disable
+    LED(0xFFFF, 1000);
 }
 
 
@@ -465,16 +465,16 @@ void SendCmdPCF7931(uint32_t * tab){
  * @param p : offset on low pulse positioning
  */
 bool AddBytePCF7931(uint8_t byte, uint32_t * tab, int32_t l, int32_t p){
-	uint32_t u;
-	for (u = 0; u < 8; ++u) {
-		if (byte & (1 << u)) {	//bit is 1
-			if( AddBitPCF7931(1, tab, l, p)==1) return 1;
-		} else { //bit is 0
-			if (AddBitPCF7931(0, tab, l, p)==1) return 1;
-		}
-	}
+    uint32_t u;
+    for (u = 0; u < 8; ++u) {
+        if (byte & (1 << u)) { //bit is 1
+            if( AddBitPCF7931(1, tab, l, p)==1) return 1;
+        } else { //bit is 0
+            if (AddBitPCF7931(0, tab, l, p)==1) return 1;
+        }
+    }
 
-	return 0;
+    return 0;
 }
 
 /* Add a bits for building the data frame of PCF7931 tags
@@ -484,32 +484,32 @@ bool AddBytePCF7931(uint8_t byte, uint32_t * tab, int32_t l, int32_t p){
  * @param p : offset on low pulse positioning
  */
 bool AddBitPCF7931(bool b, uint32_t * tab, int32_t l, int32_t p){
-	uint8_t u = 0;
+    uint8_t u = 0;
 
-	//we put the cursor at the last value of the array
-	for ( u = 0; tab[u] != 0; u += 3 ) { }
+    //we put the cursor at the last value of the array
+    for ( u = 0; tab[u] != 0; u += 3 ) { }
 
-	if ( b == 1 ) {	//add a bit 1
-		if ( u == 0 )
-			tab[u] = 34 * T0_PCF + p;
-		else
-			tab[u] = 34 * T0_PCF + tab[u-1] + p;
+    if ( b == 1 ) { //add a bit 1
+        if ( u == 0 )
+            tab[u] = 34 * T0_PCF + p;
+        else
+            tab[u] = 34 * T0_PCF + tab[u-1] + p;
 
-		tab[u+1] =  6 * T0_PCF + tab[u] + l;
-		tab[u+2] = 88 * T0_PCF + tab[u+1] - l - p;
-		return 0;
-	} else { 		//add a bit 0
+        tab[u+1] =  6 * T0_PCF + tab[u] + l;
+        tab[u+2] = 88 * T0_PCF + tab[u+1] - l - p;
+        return 0;
+    } else { //add a bit 0
 
-		if ( u == 0 )
-			tab[u] = 98 * T0_PCF + p;
-		else
-			tab[u] = 98 * T0_PCF + tab[u-1] + p;
+        if ( u == 0 )
+            tab[u] = 98 * T0_PCF + p;
+        else
+            tab[u] = 98 * T0_PCF + tab[u-1] + p;
 
-		tab[u+1] =  6 * T0_PCF + tab[u] + l;
-		tab[u+2] = 24 * T0_PCF + tab[u+1] - l - p;
-		return 0;
-	}
-	return 1;
+        tab[u+1] =  6 * T0_PCF + tab[u] + l;
+        tab[u+2] = 24 * T0_PCF + tab[u+1] - l - p;
+        return 0;
+    }
+    return 1;
 }
 
 /* Add a custom pattern in the data frame
@@ -519,12 +519,12 @@ bool AddBitPCF7931(bool b, uint32_t * tab, int32_t l, int32_t p){
  * @param tab : array of the data frame
  */
 bool AddPatternPCF7931(uint32_t a, uint32_t b, uint32_t c, uint32_t * tab){
-	uint32_t u = 0;
-	for(u = 0; tab[u] != 0; u += 3){} //we put the cursor at the last value of the array
+    uint32_t u = 0;
+    for(u = 0; tab[u] != 0; u += 3){} //we put the cursor at the last value of the array
 
-	tab[u]   = (u == 0) ? a : a + tab[u-1];
-	tab[u+1] = b + tab[u];
-	tab[u+2] = c + tab[u+1];
+    tab[u]   = (u == 0) ? a : a + tab[u-1];
+    tab[u+1] = b + tab[u];
+    tab[u+2] = c + tab[u+1];
 
-	return 0;
+    return 0;
 }
\ No newline at end of file
diff --git a/armsrc/printf.c b/armsrc/printf.c
index c148bc9fd..ff48dec1c 100644
--- a/armsrc/printf.c
+++ b/armsrc/printf.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 1986, 1988, 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
+ * The Regents of the University of California.  All rights reserved.
  * (c) UNIX System Laboratories, Inc.
  * All or some portions of this file are derived from material licensed
  * to the University of California by American Telephone and Telegraph
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)subr_prf.c	8.3 (Berkeley) 1/21/94
+ * @(#)subr_prf.c 8.3 (Berkeley) 1/21/94
  */
 #include "printf.h"
 
@@ -50,7 +50,7 @@ char const hex2ascii_data[] = "0123456789abcdefghijklmnopqrstuvwxyz";
 #define toupper(c)      ((c) - 0x20 * (((c) >= 'a') && ((c) <= 'z')))
 
 /* Max number conversion buffer length: a u_quad_t in base 2, plus NUL byte. */
-#define MAXNBUF	(sizeof(intmax_t) * NBBY + 1)
+#define MAXNBUF (sizeof(intmax_t) * NBBY + 1)
 
 /*
  * Put a NUL-terminated ASCII number (base <= 36) in a buffer in reverse
@@ -61,17 +61,17 @@ char const hex2ascii_data[] = "0123456789abcdefghijklmnopqrstuvwxyz";
 static char *
 ksprintn(char *nbuf, uintmax_t num, int base, int *lenp, int upper)
 {
-	char *p, c;
+    char *p, c;
 
-	p = nbuf;
-	*p = '\0';
-	do {
-		c = hex2ascii(num % base);
-		*++p = upper ? toupper(c) : c;
-	} while (num /= base);
-	if (lenp)
-		*lenp = p - nbuf;
-	return (p);
+    p = nbuf;
+    *p = '\0';
+    do {
+        c = hex2ascii(num % base);
+        *++p = upper ? toupper(c) : c;
+    } while (num /= base);
+    if (lenp)
+        *lenp = p - nbuf;
+    return (p);
 }
 
 /*
@@ -82,7 +82,7 @@ ksprintn(char *nbuf, uintmax_t num, int base, int *lenp, int upper)
  * The format %b is supported to decode error registers.
  * Its usage is:
  *
- *	printf("reg=%b\n", regval, "*");
+ * printf("reg=%b\n", regval, "*");
  *
  * where  is the output base expressed as a control character, e.g.
  * \10 gives octal; \20 gives hex.  Each arg is a sequence of characters,
@@ -90,340 +90,340 @@ ksprintn(char *nbuf, uintmax_t num, int base, int *lenp, int upper)
  * the next characters (up to a control character, i.e. a character <= 32),
  * give the name of the register.  Thus:
  *
- *	kvprintf("reg=%b\n", 3, "\10\2BITTWO\1BITONE\n");
+ * kvprintf("reg=%b\n", 3, "\10\2BITTWO\1BITONE\n");
  *
  * would produce output:
  *
- *	reg=3
+ * reg=3
  *
  * XXX:  %D  -- Hexdump, takes pointer and separator string:
- *		("%6D", ptr, ":")   -> XX:XX:XX:XX:XX:XX
- *		("%*D", len, ptr, " " -> XX XX XX XX ...
+ *  ("%6D", ptr, ":")   -> XX:XX:XX:XX:XX:XX
+ *  ("%*D", len, ptr, " " -> XX XX XX XX ...
  */
 int
 kvsprintf(char const *fmt, void *arg, int radix, va_list ap)
 {
 #define PCHAR(c) {int cc=(c); *d++ = cc; retval++; }
-	char nbuf[MAXNBUF];
-	char *d;
-	const char *p, *percent, *q;
-	u_char *up;
-	int ch, n;
-	uintmax_t num;
-	int base, lflag, qflag, tmp, width, ladjust, sharpflag, neg, sign, dot;
-	int cflag, hflag, jflag, tflag, zflag;
-	int dwidth, upper;
-	char padc;
-	int stop = 0, retval = 0;
+    char nbuf[MAXNBUF];
+    char *d;
+    const char *p, *percent, *q;
+    u_char *up;
+    int ch, n;
+    uintmax_t num;
+    int base, lflag, qflag, tmp, width, ladjust, sharpflag, neg, sign, dot;
+    int cflag, hflag, jflag, tflag, zflag;
+    int dwidth, upper;
+    char padc;
+    int stop = 0, retval = 0;
 
-	num = 0;
-	d = (char *) arg;
+    num = 0;
+    d = (char *) arg;
 
-	if (fmt == NULL)
-		fmt = "(fmt null)\n";
+    if (fmt == NULL)
+        fmt = "(fmt null)\n";
 
-	if (radix < 2 || radix > 36)
-		radix = 10;
+    if (radix < 2 || radix > 36)
+        radix = 10;
 
-	for (;;) {
-		padc = ' ';
-		width = 0;
-		while ((ch = (u_char)*fmt++) != '%' || stop) {
-			PCHAR(ch);
-			if (ch == '\0')
-				return (retval);
-		}
-		percent = fmt - 1;
-		qflag = 0; lflag = 0; ladjust = 0; sharpflag = 0; neg = 0;
-		sign = 0; dot = 0; dwidth = 0; upper = 0;
-		cflag = 0; hflag = 0; jflag = 0; tflag = 0; zflag = 0;
-reswitch:	switch (ch = (u_char)*fmt++) {
-		case '.':
-			dot = 1;
-			goto reswitch;
-		case '#':
-			sharpflag = 1;
-			goto reswitch;
-		case '+':
-			sign = 1;
-			goto reswitch;
-		case '-':
-			ladjust = 1;
-			goto reswitch;
-		case '%':
-			PCHAR(ch);
-			break;
-		case '*':
-			if (!dot) {
-				width = va_arg(ap, int);
-				if (width < 0) {
-					ladjust = !ladjust;
-					width = -width;
-				}
-			} else {
-				dwidth = va_arg(ap, int);
-			}
-			goto reswitch;
-		case '0':
-			if (!dot) {
-				padc = '0';
-				goto reswitch;
-			}
-		case '1': case '2': case '3': case '4':
-		case '5': case '6': case '7': case '8': case '9':
-				for (n = 0;; ++fmt) {
-					n = n * 10 + ch - '0';
-					ch = *fmt;
-					if (ch < '0' || ch > '9')
-						break;
-				}
-			if (dot)
-				dwidth = n;
-			else
-				width = n;
-			goto reswitch;
-		case 'b':
-			num = (u_int)va_arg(ap, int);
-			p = va_arg(ap, char *);
-			for (q = ksprintn(nbuf, num, *p++, NULL, 0); *q;)
-				PCHAR(*q--);
+    for (;;) {
+        padc = ' ';
+        width = 0;
+        while ((ch = (u_char)*fmt++) != '%' || stop) {
+            PCHAR(ch);
+            if (ch == '\0')
+                return (retval);
+        }
+        percent = fmt - 1;
+        qflag = 0; lflag = 0; ladjust = 0; sharpflag = 0; neg = 0;
+        sign = 0; dot = 0; dwidth = 0; upper = 0;
+        cflag = 0; hflag = 0; jflag = 0; tflag = 0; zflag = 0;
+reswitch: switch (ch = (u_char)*fmt++) {
+        case '.':
+            dot = 1;
+            goto reswitch;
+        case '#':
+            sharpflag = 1;
+            goto reswitch;
+        case '+':
+            sign = 1;
+            goto reswitch;
+        case '-':
+            ladjust = 1;
+            goto reswitch;
+        case '%':
+            PCHAR(ch);
+            break;
+        case '*':
+            if (!dot) {
+                width = va_arg(ap, int);
+                if (width < 0) {
+                    ladjust = !ladjust;
+                    width = -width;
+                }
+            } else {
+                dwidth = va_arg(ap, int);
+            }
+            goto reswitch;
+        case '0':
+            if (!dot) {
+                padc = '0';
+                goto reswitch;
+            }
+        case '1': case '2': case '3': case '4':
+        case '5': case '6': case '7': case '8': case '9':
+                for (n = 0;; ++fmt) {
+                    n = n * 10 + ch - '0';
+                    ch = *fmt;
+                    if (ch < '0' || ch > '9')
+                        break;
+                }
+            if (dot)
+                dwidth = n;
+            else
+                width = n;
+            goto reswitch;
+        case 'b':
+            num = (u_int)va_arg(ap, int);
+            p = va_arg(ap, char *);
+            for (q = ksprintn(nbuf, num, *p++, NULL, 0); *q;)
+                PCHAR(*q--);
 
-			if (num == 0)
-				break;
+            if (num == 0)
+                break;
 
-			for (tmp = 0; *p;) {
-				n = *p++;
-				if (num & (1 << (n - 1))) {
-					PCHAR(tmp ? ',' : '<');
-					for (; (n = *p) > ' '; ++p)
-						PCHAR(n);
-					tmp = 1;
-				} else
-					for (; *p > ' '; ++p)
-						continue;
-			}
-			if (tmp)
-				PCHAR('>');
-			break;
-		case 'c':
-			PCHAR(va_arg(ap, int));
-			break;
-		case 'D':
-			up = va_arg(ap, u_char *);
-			p = va_arg(ap, char *);
-			if (!width)
-				width = 16;
-			while(width--) {
-				PCHAR(hex2ascii(*up >> 4));
-				PCHAR(hex2ascii(*up & 0x0f));
-				up++;
-				if (width)
-					for (q=p;*q;q++)
-						PCHAR(*q);
-			}
-			break;
-		case 'd':
-		case 'i':
-			base = 10;
-			sign = 1;
-			goto handle_sign;
-		case 'h':
-			if (hflag) {
-				hflag = 0;
-				cflag = 1;
-			} else
-				hflag = 1;
-			goto reswitch;
-		case 'j':
-			jflag = 1;
-			goto reswitch;
-		case 'l':
-			if (lflag) {
-				lflag = 0;
-				qflag = 1;
-			} else
-				lflag = 1;
-			goto reswitch;
-		case 'n':
-			if (jflag)
-				*(va_arg(ap, intmax_t *)) = retval;
-			else if (qflag)
-				*(va_arg(ap, quad_t *)) = retval;
-			else if (lflag)
-				*(va_arg(ap, long *)) = retval;
-			else if (zflag)
-				*(va_arg(ap, size_t *)) = retval;
-			else if (hflag)
-				*(va_arg(ap, short *)) = retval;
-			else if (cflag)
-				*(va_arg(ap, char *)) = retval;
-			else
-				*(va_arg(ap, int *)) = retval;
-			break;
-		case 'o':
-			base = 8;
-			goto handle_nosign;
-		case 'p':
-			base = 16;
-			sharpflag = (width == 0);
-			sign = 0;
-			num = (uintptr_t)va_arg(ap, void *);
-			goto number;
-		case 'q':
-			qflag = 1;
-			goto reswitch;
-		case 'r':
-			base = radix;
-			if (sign)
-				goto handle_sign;
-			goto handle_nosign;
-		case 's':
-			p = va_arg(ap, char *);
-			if (p == NULL)
-				p = "(null)";
-			if (!dot)
-				n = strlen (p);
-			else
-				for (n = 0; n < dwidth && p[n]; n++)
-					continue;
+            for (tmp = 0; *p;) {
+                n = *p++;
+                if (num & (1 << (n - 1))) {
+                    PCHAR(tmp ? ',' : '<');
+                    for (; (n = *p) > ' '; ++p)
+                        PCHAR(n);
+                    tmp = 1;
+                } else
+                    for (; *p > ' '; ++p)
+                        continue;
+            }
+            if (tmp)
+                PCHAR('>');
+            break;
+        case 'c':
+            PCHAR(va_arg(ap, int));
+            break;
+        case 'D':
+            up = va_arg(ap, u_char *);
+            p = va_arg(ap, char *);
+            if (!width)
+                width = 16;
+            while(width--) {
+                PCHAR(hex2ascii(*up >> 4));
+                PCHAR(hex2ascii(*up & 0x0f));
+                up++;
+                if (width)
+                    for (q=p;*q;q++)
+                        PCHAR(*q);
+            }
+            break;
+        case 'd':
+        case 'i':
+            base = 10;
+            sign = 1;
+            goto handle_sign;
+        case 'h':
+            if (hflag) {
+                hflag = 0;
+                cflag = 1;
+            } else
+                hflag = 1;
+            goto reswitch;
+        case 'j':
+            jflag = 1;
+            goto reswitch;
+        case 'l':
+            if (lflag) {
+                lflag = 0;
+                qflag = 1;
+            } else
+                lflag = 1;
+            goto reswitch;
+        case 'n':
+            if (jflag)
+                *(va_arg(ap, intmax_t *)) = retval;
+            else if (qflag)
+                *(va_arg(ap, quad_t *)) = retval;
+            else if (lflag)
+                *(va_arg(ap, long *)) = retval;
+            else if (zflag)
+                *(va_arg(ap, size_t *)) = retval;
+            else if (hflag)
+                *(va_arg(ap, short *)) = retval;
+            else if (cflag)
+                *(va_arg(ap, char *)) = retval;
+            else
+                *(va_arg(ap, int *)) = retval;
+            break;
+        case 'o':
+            base = 8;
+            goto handle_nosign;
+        case 'p':
+            base = 16;
+            sharpflag = (width == 0);
+            sign = 0;
+            num = (uintptr_t)va_arg(ap, void *);
+            goto number;
+        case 'q':
+            qflag = 1;
+            goto reswitch;
+        case 'r':
+            base = radix;
+            if (sign)
+                goto handle_sign;
+            goto handle_nosign;
+        case 's':
+            p = va_arg(ap, char *);
+            if (p == NULL)
+                p = "(null)";
+            if (!dot)
+                n = strlen (p);
+            else
+                for (n = 0; n < dwidth && p[n]; n++)
+                    continue;
 
-			width -= n;
+            width -= n;
 
-			if (!ladjust && width > 0)
-				while (width--)
-					PCHAR(padc);
-			while (n--)
-				PCHAR(*p++);
-			if (ladjust && width > 0)
-				while (width--)
-					PCHAR(padc);
-			break;
-		case 't':
-			tflag = 1;
-			goto reswitch;
-		case 'u':
-			base = 10;
-			goto handle_nosign;
-		case 'X':
-			upper = 1;
-		case 'x':
-			base = 16;
-			goto handle_nosign;
-		case 'y':
-			base = 16;
-			sign = 1;
-			goto handle_sign;
-		case 'z':
-			zflag = 1;
-			goto reswitch;
+            if (!ladjust && width > 0)
+                while (width--)
+                    PCHAR(padc);
+            while (n--)
+                PCHAR(*p++);
+            if (ladjust && width > 0)
+                while (width--)
+                    PCHAR(padc);
+            break;
+        case 't':
+            tflag = 1;
+            goto reswitch;
+        case 'u':
+            base = 10;
+            goto handle_nosign;
+        case 'X':
+            upper = 1;
+        case 'x':
+            base = 16;
+            goto handle_nosign;
+        case 'y':
+            base = 16;
+            sign = 1;
+            goto handle_sign;
+        case 'z':
+            zflag = 1;
+            goto reswitch;
 handle_nosign:
-			sign = 0;
-			if (jflag)
-				num = va_arg(ap, uintmax_t);
-			else if (qflag)
-				num = va_arg(ap, u_quad_t);
-			else if (tflag)
-				num = va_arg(ap, ptrdiff_t);
-			else if (lflag)
-				num = va_arg(ap, u_long);
-			else if (zflag)
-				num = va_arg(ap, size_t);
-			else if (hflag)
-				num = (u_short)va_arg(ap, int);
-			else if (cflag)
-				num = (u_char)va_arg(ap, int);
-			else
-				num = va_arg(ap, u_int);
-			goto number;
+            sign = 0;
+            if (jflag)
+                num = va_arg(ap, uintmax_t);
+            else if (qflag)
+                num = va_arg(ap, u_quad_t);
+            else if (tflag)
+                num = va_arg(ap, ptrdiff_t);
+            else if (lflag)
+                num = va_arg(ap, u_long);
+            else if (zflag)
+                num = va_arg(ap, size_t);
+            else if (hflag)
+                num = (u_short)va_arg(ap, int);
+            else if (cflag)
+                num = (u_char)va_arg(ap, int);
+            else
+                num = va_arg(ap, u_int);
+            goto number;
 handle_sign:
-			if (jflag)
-				num = va_arg(ap, intmax_t);
-			else if (qflag)
-				num = va_arg(ap, quad_t);
-			else if (tflag)
-				num = va_arg(ap, ptrdiff_t);
-			else if (lflag)
-				num = va_arg(ap, long);
-			else if (zflag)
-				num = va_arg(ap, ssize_t);
-			else if (hflag)
-				num = (short)va_arg(ap, int);
-			else if (cflag)
-				num = (char)va_arg(ap, int);
-			else
-				num = va_arg(ap, int);
+            if (jflag)
+                num = va_arg(ap, intmax_t);
+            else if (qflag)
+                num = va_arg(ap, quad_t);
+            else if (tflag)
+                num = va_arg(ap, ptrdiff_t);
+            else if (lflag)
+                num = va_arg(ap, long);
+            else if (zflag)
+                num = va_arg(ap, ssize_t);
+            else if (hflag)
+                num = (short)va_arg(ap, int);
+            else if (cflag)
+                num = (char)va_arg(ap, int);
+            else
+                num = va_arg(ap, int);
 number:
-			if (sign && (intmax_t)num < 0) {
-				neg = 1;
-				num = -(intmax_t)num;
-			}
-			p = ksprintn(nbuf, num, base, &tmp, upper);
-			if (sharpflag && num != 0) {
-				if (base == 8)
-					tmp++;
-				else if (base == 16)
-					tmp += 2;
-			}
-			if (neg)
-				tmp++;
+            if (sign && (intmax_t)num < 0) {
+                neg = 1;
+                num = -(intmax_t)num;
+            }
+            p = ksprintn(nbuf, num, base, &tmp, upper);
+            if (sharpflag && num != 0) {
+                if (base == 8)
+                    tmp++;
+                else if (base == 16)
+                    tmp += 2;
+            }
+            if (neg)
+                tmp++;
 
-			if (!ladjust && padc != '0' && width
-			    && (width -= tmp) > 0)
-				while (width--)
-					PCHAR(padc);
-			if (neg)
-				PCHAR('-');
-			if (sharpflag && num != 0) {
-				if (base == 8) {
-					PCHAR('0');
-				} else if (base == 16) {
-					PCHAR('0');
-					PCHAR('x');
-				}
-			}
-			if (!ladjust && width && (width -= tmp) > 0)
-				while (width--)
-					PCHAR(padc);
+            if (!ladjust && padc != '0' && width
+                && (width -= tmp) > 0)
+                while (width--)
+                    PCHAR(padc);
+            if (neg)
+                PCHAR('-');
+            if (sharpflag && num != 0) {
+                if (base == 8) {
+                    PCHAR('0');
+                } else if (base == 16) {
+                    PCHAR('0');
+                    PCHAR('x');
+                }
+            }
+            if (!ladjust && width && (width -= tmp) > 0)
+                while (width--)
+                    PCHAR(padc);
 
-			while (*p)
-				PCHAR(*p--);
+            while (*p)
+                PCHAR(*p--);
 
-			if (ladjust && width && (width -= tmp) > 0)
-				while (width--)
-					PCHAR(padc);
+            if (ladjust && width && (width -= tmp) > 0)
+                while (width--)
+                    PCHAR(padc);
 
-			break;
-		default:
-			while (percent < fmt)
-				PCHAR(*percent++);
-			/*
-			 * Since we ignore an formatting argument it is no
-			 * longer safe to obey the remaining formatting
-			 * arguments as the arguments will no longer match
-			 * the format specs.
-			 */
-			stop = 1;
-			break;
-		}
-	}
-	PCHAR(0);
-	return retval;
+            break;
+        default:
+            while (percent < fmt)
+                PCHAR(*percent++);
+            /*
+             * Since we ignore an formatting argument it is no
+             * longer safe to obey the remaining formatting
+             * arguments as the arguments will no longer match
+             * the format specs.
+             */
+            stop = 1;
+            break;
+        }
+    }
+    PCHAR(0);
+    return retval;
 #undef PCHAR
 }
 
 int vsprintf(char *dest, const char *fmt, va_list ap)
 {
-	return kvsprintf(fmt, dest, 10, ap);
+    return kvsprintf(fmt, dest, 10, ap);
 }
 
 int
 sprintf(char *dest, const char *fmt, ...)
 {
-	/* http://www.pagetable.com/?p=298 */
-	int retval;
-	va_list ap;
-	va_start(ap, fmt);
-	retval = kvsprintf(fmt, dest, 10, ap);
-	va_end(ap);
-	return retval;
+    /* http://www.pagetable.com/?p=298 */
+    int retval;
+    va_list ap;
+    va_start(ap, fmt);
+    retval = kvsprintf(fmt, dest, 10, ap);
+    va_end(ap);
+    return retval;
 }
diff --git a/armsrc/start.c b/armsrc/start.c
index 5d55f24e0..dcec6f59a 100644
--- a/armsrc/start.c
+++ b/armsrc/start.c
@@ -23,62 +23,62 @@ extern char __data_src_start__, __data_start__, __data_end__, __bss_start__, __b
 
 static voidpf inflate_malloc(voidpf opaque, uInt items, uInt size)
 {
-	uint8_t *allocated_memory;
+    uint8_t *allocated_memory;
 
-	allocated_memory = next_free_memory;
-	next_free_memory += items*size;
-	return allocated_memory;
+    allocated_memory = next_free_memory;
+    next_free_memory += items*size;
+    return allocated_memory;
 }
 
 static void inflate_free(voidpf opaque, voidpf address)
 {
-	// nothing to do
+    // nothing to do
 }
 
 static void uncompress_data_section(void)
 {
-	z_stream data_section;
+    z_stream data_section;
 
-	next_free_memory = BigBuf_get_addr();
+    next_free_memory = BigBuf_get_addr();
 
-	// initialize zstream structure
-	data_section.next_in = (uint8_t *) &__data_src_start__;
-	data_section.avail_in = &__data_end__ - &__data_start__;  // uncompressed size. Wrong but doesn't matter.
-	data_section.next_out = (uint8_t *) &__data_start__;
-	data_section.avail_out = &__data_end__ - &__data_start__;  // uncompressed size. Correct.
-	data_section.zalloc = &inflate_malloc;
-	data_section.zfree = &inflate_free;
-	data_section.opaque = NULL;
+    // initialize zstream structure
+    data_section.next_in = (uint8_t *) &__data_src_start__;
+    data_section.avail_in = &__data_end__ - &__data_start__;  // uncompressed size. Wrong but doesn't matter.
+    data_section.next_out = (uint8_t *) &__data_start__;
+    data_section.avail_out = &__data_end__ - &__data_start__;  // uncompressed size. Correct.
+    data_section.zalloc = &inflate_malloc;
+    data_section.zfree = &inflate_free;
+    data_section.opaque = NULL;
 
-	// initialize zlib for inflate
-	inflateInit2(&data_section, 15);
+    // initialize zlib for inflate
+    inflateInit2(&data_section, 15);
 
-	// uncompress data segment to RAM
-	inflate(&data_section, Z_FINISH);
+    // uncompress data segment to RAM
+    inflate(&data_section, Z_FINISH);
 
-	// save the size of the compressed data section
-	common_area.arg1 = data_section.total_in;
+    // save the size of the compressed data section
+    common_area.arg1 = data_section.total_in;
 }
 
 void __attribute__((section(".startos"))) Vector(void)
 {
-	/* Stack should have been set up by the bootloader */
-	// char *src;
-	char *dst, *end;
+    /* Stack should have been set up by the bootloader */
+    // char *src;
+    char *dst, *end;
 
-	uncompress_data_section();
+    uncompress_data_section();
 
-	/* Set up (that is: clear) BSS. */
-	dst = &__bss_start__;
-	end = &__bss_end__;
-	while(dst < end) *dst++ = 0;
+    /* Set up (that is: clear) BSS. */
+    dst = &__bss_start__;
+    end = &__bss_end__;
+    while(dst < end) *dst++ = 0;
 
-	// Set up data segment: Copy from flash to ram
-	// src = &__data_src_start__;
-	// dst = &__data_start__;
-	// end = &__data_end__;
-	// while(dst < end) *dst++ = *src++;
+    // Set up data segment: Copy from flash to ram
+    // src = &__data_src_start__;
+    // dst = &__data_start__;
+    // end = &__data_end__;
+    // while(dst < end) *dst++ = *src++;
 
-	AppMain();
+    AppMain();
 }
 #endif
\ No newline at end of file
diff --git a/armsrc/string.c b/armsrc/string.c
index 6552ce1c9..e63ba4b05 100644
--- a/armsrc/string.c
+++ b/armsrc/string.c
@@ -11,39 +11,39 @@
 
 void *memcpy(void *dest, const void *src, int len)
 {
-	uint8_t *d = dest;
-	const uint8_t *s = src;
-	while((len--) > 0) {
-		*d = *s;
-		d++;
-		s++;
-	}
-	return dest;
+    uint8_t *d = dest;
+    const uint8_t *s = src;
+    while((len--) > 0) {
+        *d = *s;
+        d++;
+        s++;
+    }
+    return dest;
 }
 
 void *memset(void *dest, int c, int len)
 {
-	uint8_t *d = dest;
-	while((len--) > 0) {
-		*d = c;
-		d++;
-	}
-	return dest;
+    uint8_t *d = dest;
+    while((len--) > 0) {
+        *d = c;
+        d++;
+    }
+    return dest;
 }
 
 int memcmp(const void *av, const void *bv, int len)
 {
-	const uint8_t *a = av;
-	const uint8_t *b = bv;
+    const uint8_t *a = av;
+    const uint8_t *b = bv;
 
-	while((len--) > 0) {
-		if(*a != *b) {
-			return *a - *b;
-		}
-		a++;
-		b++;
-	}
-	return 0;
+    while((len--) > 0) {
+        if(*a != *b) {
+            return *a - *b;
+        }
+        a++;
+        b++;
+    }
+    return 0;
 }
 
 void memxor(uint8_t * dest, uint8_t * src, size_t len) {
@@ -53,36 +53,36 @@ void memxor(uint8_t * dest, uint8_t * src, size_t len) {
 
 int strlen(const char *str)
 {
-	int l = 0;
-	while(*str) {
-		l++;
-		str++;
-	}
-	return l;
+    int l = 0;
+    while(*str) {
+        l++;
+        str++;
+    }
+    return l;
 }
 
 char* strncat(char *dest, const char *src, unsigned int n)
 {
-	unsigned int dest_len = strlen(dest);
-	unsigned int i;
+    unsigned int dest_len = strlen(dest);
+    unsigned int i;
 
-	for (i = 0 ; i < n && src[i] != '\0' ; i++)
-		dest[dest_len + i] = src[i];
-	dest[dest_len + i] = '\0';
+    for (i = 0 ; i < n && src[i] != '\0' ; i++)
+        dest[dest_len + i] = src[i];
+    dest[dest_len + i] = '\0';
 
-	return dest;
+    return dest;
 }
 
 char* strcat(char *dest, const char *src)
 {
-	unsigned int dest_len = strlen(dest);
-	unsigned int i;
+    unsigned int dest_len = strlen(dest);
+    unsigned int i;
 
-	for (i = 0 ; src[i] != '\0' ; i++)
-		dest[dest_len + i] = src[i];
-	dest[dest_len + i] = '\0';
+    for (i = 0 ; src[i] != '\0' ; i++)
+        dest[dest_len + i] = src[i];
+    dest[dest_len + i] = '\0';
 
-	return dest;
+    return dest;
 }
 ////////////////////////////////////////// code to do 'itoa'
 
diff --git a/armsrc/ticks.c b/armsrc/ticks.c
index cfa36d12f..7445781bf 100644
--- a/armsrc/ticks.c
+++ b/armsrc/ticks.c
@@ -12,160 +12,160 @@
 // attempt at high resolution microsecond timer
 // beware: timer counts in 21.3uS increments (1024/48Mhz)
 void SpinDelayUs(int us) {
-	int ticks = (48 * us) >> 10;
+    int ticks = (48 * us) >> 10;
 
-	// Borrow a PWM unit for my real-time clock
-	AT91C_BASE_PWMC->PWMC_ENA = PWM_CHANNEL(0);
+    // Borrow a PWM unit for my real-time clock
+    AT91C_BASE_PWMC->PWMC_ENA = PWM_CHANNEL(0);
 
-	// 48 MHz / 1024 gives 46.875 kHz
-	AT91C_BASE_PWMC_CH0->PWMC_CMR = PWM_CH_MODE_PRESCALER(10);		// Channel Mode Register
-	AT91C_BASE_PWMC_CH0->PWMC_CDTYR = 0;							// Channel Duty Cycle Register
-	AT91C_BASE_PWMC_CH0->PWMC_CPRDR = 0xffff;						// Channel Period Register
+    // 48 MHz / 1024 gives 46.875 kHz
+    AT91C_BASE_PWMC_CH0->PWMC_CMR = PWM_CH_MODE_PRESCALER(10);      // Channel Mode Register
+    AT91C_BASE_PWMC_CH0->PWMC_CDTYR = 0;                            // Channel Duty Cycle Register
+    AT91C_BASE_PWMC_CH0->PWMC_CPRDR = 0xffff;                       // Channel Period Register
 
-	uint16_t start = AT91C_BASE_PWMC_CH0->PWMC_CCNTR;
+    uint16_t start = AT91C_BASE_PWMC_CH0->PWMC_CCNTR;
 
-	for(;;) {
-		uint16_t now = AT91C_BASE_PWMC_CH0->PWMC_CCNTR;
-		if (now == (uint16_t)(start + ticks))
-			return;
+    for(;;) {
+        uint16_t now = AT91C_BASE_PWMC_CH0->PWMC_CCNTR;
+        if (now == (uint16_t)(start + ticks))
+            return;
 
-		WDT_HIT();
-	}
+        WDT_HIT();
+    }
 }
 
 void SpinDelay(int ms) {
   // convert to uS and call microsecond delay function
-	SpinDelayUs(ms*1000);
+    SpinDelayUs(ms*1000);
 }
 //  -------------------------------------------------------------------------
 //  timer lib
 //  -------------------------------------------------------------------------
 //  test procedure:
 //
-//	ti = GetTickCount();
-//	SpinDelay(1000);
-//	ti = GetTickCount() - ti;
-//	Dbprintf("timer(1s): %d t=%d", ti, GetTickCount());
+//    ti = GetTickCount();
+//    SpinDelay(1000);
+//    ti = GetTickCount() - ti;
+//    Dbprintf("timer(1s): %d t=%d", ti, GetTickCount());
 void StartTickCount(void) {
-	// This timer is based on the slow clock. The slow clock frequency is between 22kHz and 40kHz.
-	// We can determine the actual slow clock frequency by looking at the Main Clock Frequency Register.
-    uint16_t mainf = AT91C_BASE_PMC->PMC_MCFR & 0xffff;		// = 16 * main clock frequency (16MHz) / slow clock frequency
-	// set RealTimeCounter divider to count at 1kHz:
-	AT91C_BASE_RTTC->RTTC_RTMR = AT91C_RTTC_RTTRST | ((256000 + (mainf/2)) / mainf);
-	// note: worst case precision is approx 2.5%
+    // This timer is based on the slow clock. The slow clock frequency is between 22kHz and 40kHz.
+    // We can determine the actual slow clock frequency by looking at the Main Clock Frequency Register.
+    uint16_t mainf = AT91C_BASE_PMC->PMC_MCFR & 0xffff;        // = 16 * main clock frequency (16MHz) / slow clock frequency
+    // set RealTimeCounter divider to count at 1kHz:
+    AT91C_BASE_RTTC->RTTC_RTMR = AT91C_RTTC_RTTRST | ((256000 + (mainf/2)) / mainf);
+    // note: worst case precision is approx 2.5%
 }
 
 /*
 * Get the current count.
 */
 uint32_t RAMFUNC GetTickCount(void){
-	return AT91C_BASE_RTTC->RTTC_RTVR;// was * 2;
+    return AT91C_BASE_RTTC->RTTC_RTVR;// was * 2;
 }
 
 //  -------------------------------------------------------------------------
 //  microseconds timer
 //  -------------------------------------------------------------------------
 void StartCountUS(void) {
-	AT91C_BASE_PMC->PMC_PCER |= (1 << AT91C_ID_TC0) | (1 << AT91C_ID_TC1);
-	AT91C_BASE_TCB->TCB_BMR = AT91C_TCB_TC0XC0S_NONE | AT91C_TCB_TC1XC1S_TIOA0 | AT91C_TCB_TC2XC2S_NONE;
+    AT91C_BASE_PMC->PMC_PCER |= (1 << AT91C_ID_TC0) | (1 << AT91C_ID_TC1);
+    AT91C_BASE_TCB->TCB_BMR = AT91C_TCB_TC0XC0S_NONE | AT91C_TCB_TC1XC1S_TIOA0 | AT91C_TCB_TC2XC2S_NONE;
 
-	// fast clock
-	// tick=1.5mks
-	AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS; // timer disable
-	AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV3_CLOCK | // MCK(48MHz) / 32
-								AT91C_TC_WAVE | AT91C_TC_WAVESEL_UP_AUTO | AT91C_TC_ACPA_CLEAR |
-								AT91C_TC_ACPC_SET | AT91C_TC_ASWTRG_SET;
-	AT91C_BASE_TC0->TC_RA = 1;
-	AT91C_BASE_TC0->TC_RC = 0xBFFF + 1; // 0xC000
+    // fast clock
+    // tick=1.5mks
+    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS; // timer disable
+    AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV3_CLOCK | // MCK(48MHz) / 32
+                                AT91C_TC_WAVE | AT91C_TC_WAVESEL_UP_AUTO | AT91C_TC_ACPA_CLEAR |
+                                AT91C_TC_ACPC_SET | AT91C_TC_ASWTRG_SET;
+    AT91C_BASE_TC0->TC_RA = 1;
+    AT91C_BASE_TC0->TC_RC = 0xBFFF + 1; // 0xC000
 
-	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS; // timer disable
-	AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_XC1; // from timer 0
+    AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS; // timer disable
+    AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_XC1; // from timer 0
 
-	AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
-	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
-	AT91C_BASE_TCB->TCB_BCR = 1;
+    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
+    AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
+    AT91C_BASE_TCB->TCB_BCR = 1;
 
-	while (AT91C_BASE_TC1->TC_CV > 0);
+    while (AT91C_BASE_TC1->TC_CV > 0);
 }
 
 uint32_t RAMFUNC GetCountUS(void){
-	//return (AT91C_BASE_TC1->TC_CV * 0x8000) + ((AT91C_BASE_TC0->TC_CV / 15) * 10);
-	//  By suggestion from PwPiwi, http://www.proxmark.org/forum/viewtopic.php?pid=17548#p17548
-	return ((uint32_t)AT91C_BASE_TC1->TC_CV) * 0x8000 + (((uint32_t)AT91C_BASE_TC0->TC_CV) * 2) / 3;
+    //return (AT91C_BASE_TC1->TC_CV * 0x8000) + ((AT91C_BASE_TC0->TC_CV / 15) * 10);
+    //  By suggestion from PwPiwi, http://www.proxmark.org/forum/viewtopic.php?pid=17548#p17548
+    return ((uint32_t)AT91C_BASE_TC1->TC_CV) * 0x8000 + (((uint32_t)AT91C_BASE_TC0->TC_CV) * 2) / 3;
 }
 
 //  -------------------------------------------------------------------------
 //  Timer for iso14443 commands. Uses ssp_clk from FPGA
 //  -------------------------------------------------------------------------
 void StartCountSspClk(void) {
-	AT91C_BASE_PMC->PMC_PCER |= (1 << AT91C_ID_TC0) | (1 << AT91C_ID_TC1) | (1 << AT91C_ID_TC2);  // Enable Clock to all timers
-	AT91C_BASE_TCB->TCB_BMR = AT91C_TCB_TC0XC0S_TIOA1 		// XC0 Clock = TIOA1
-							| AT91C_TCB_TC1XC1S_NONE 		// XC1 Clock = none
-							| AT91C_TCB_TC2XC2S_TIOA0;		// XC2 Clock = TIOA0
+    AT91C_BASE_PMC->PMC_PCER |= (1 << AT91C_ID_TC0) | (1 << AT91C_ID_TC1) | (1 << AT91C_ID_TC2);  // Enable Clock to all timers
+    AT91C_BASE_TCB->TCB_BMR = AT91C_TCB_TC0XC0S_TIOA1       // XC0 Clock = TIOA1
+                            | AT91C_TCB_TC1XC1S_NONE        // XC1 Clock = none
+                            | AT91C_TCB_TC2XC2S_TIOA0;      // XC2 Clock = TIOA0
 
-	// configure TC1 to create a short pulse on TIOA1 when a rising edge on TIOB1 (= ssp_clk from FPGA) occurs:
-	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS; 				// disable TC1
-	AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK // TC1 Clock = MCK(48MHz)/2 = 24MHz
-							| AT91C_TC_CPCSTOP				// Stop clock on RC compare
-							| AT91C_TC_EEVTEDG_RISING		// Trigger on rising edge of Event
-							| AT91C_TC_EEVT_TIOB			// Event-Source: TIOB1 (= ssp_clk from FPGA = 13,56MHz/16)
-							| AT91C_TC_ENETRG				// Enable external trigger event
-							| AT91C_TC_WAVESEL_UP	 		// Upmode without automatic trigger on RC compare
-							| AT91C_TC_WAVE 				// Waveform Mode
-							| AT91C_TC_AEEVT_SET 			// Set TIOA1 on external event
-							| AT91C_TC_ACPC_CLEAR; 			// Clear TIOA1 on RC Compare
-	AT91C_BASE_TC1->TC_RC = 0x04; 							// RC Compare value = 0x04
+    // configure TC1 to create a short pulse on TIOA1 when a rising edge on TIOB1 (= ssp_clk from FPGA) occurs:
+    AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;               // disable TC1
+    AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK // TC1 Clock = MCK(48MHz)/2 = 24MHz
+                            | AT91C_TC_CPCSTOP              // Stop clock on RC compare
+                            | AT91C_TC_EEVTEDG_RISING       // Trigger on rising edge of Event
+                            | AT91C_TC_EEVT_TIOB            // Event-Source: TIOB1 (= ssp_clk from FPGA = 13,56MHz/16)
+                            | AT91C_TC_ENETRG               // Enable external trigger event
+                            | AT91C_TC_WAVESEL_UP           // Upmode without automatic trigger on RC compare
+                            | AT91C_TC_WAVE                 // Waveform Mode
+                            | AT91C_TC_AEEVT_SET            // Set TIOA1 on external event
+                            | AT91C_TC_ACPC_CLEAR;          // Clear TIOA1 on RC Compare
+    AT91C_BASE_TC1->TC_RC = 0x04;                           // RC Compare value = 0x04
 
-	// use TC0 to count TIOA1 pulses
-	AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;				// disable TC0
-	AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_XC0	 			// TC0 clock = XC0 clock = TIOA1
-							| AT91C_TC_WAVE 				// Waveform Mode
-							| AT91C_TC_WAVESEL_UP	 		// just count
-							| AT91C_TC_ACPA_CLEAR 			// Clear TIOA0 on RA Compare
-							| AT91C_TC_ACPC_SET; 			// Set TIOA0 on RC Compare
-	AT91C_BASE_TC0->TC_RA = 1;								// RA Compare value = 1; pulse width to TC2
-	AT91C_BASE_TC0->TC_RC = 0; 								// RC Compare value = 0; increment TC2 on overflow
+    // use TC0 to count TIOA1 pulses
+    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;               // disable TC0
+    AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_XC0              // TC0 clock = XC0 clock = TIOA1
+                            | AT91C_TC_WAVE                 // Waveform Mode
+                            | AT91C_TC_WAVESEL_UP           // just count
+                            | AT91C_TC_ACPA_CLEAR           // Clear TIOA0 on RA Compare
+                            | AT91C_TC_ACPC_SET;            // Set TIOA0 on RC Compare
+    AT91C_BASE_TC0->TC_RA = 1;                              // RA Compare value = 1; pulse width to TC2
+    AT91C_BASE_TC0->TC_RC = 0;                              // RC Compare value = 0; increment TC2 on overflow
 
-	// use TC2 to count TIOA0 pulses (giving us a 32bit counter (TC0/TC2) clocked by ssp_clk)
-	AT91C_BASE_TC2->TC_CCR = AT91C_TC_CLKDIS; 				// disable TC2
-	AT91C_BASE_TC2->TC_CMR = AT91C_TC_CLKS_XC2	 			// TC2 clock = XC2 clock = TIOA0
-							| AT91C_TC_WAVE 				// Waveform Mode
-							| AT91C_TC_WAVESEL_UP;	 		// just count
+    // use TC2 to count TIOA0 pulses (giving us a 32bit counter (TC0/TC2) clocked by ssp_clk)
+    AT91C_BASE_TC2->TC_CCR = AT91C_TC_CLKDIS;               // disable TC2
+    AT91C_BASE_TC2->TC_CMR = AT91C_TC_CLKS_XC2              // TC2 clock = XC2 clock = TIOA0
+                            | AT91C_TC_WAVE                 // Waveform Mode
+                            | AT91C_TC_WAVESEL_UP;          // just count
 
-	AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;				// enable and reset TC0
-	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;				// enable and reset TC1
-	AT91C_BASE_TC2->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;				// enable and reset TC2
+    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;                // enable and reset TC0
+    AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;                // enable and reset TC1
+    AT91C_BASE_TC2->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;                // enable and reset TC2
 
-	// synchronize the counter with the ssp_frame signal.
-	// Note: FPGA must be in any iso14443 mode, otherwise the frame signal would not be present
-	while(!(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_FRAME)); 	// wait for ssp_frame to go high (start of frame)
-	while(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_FRAME); 		// wait for ssp_frame to be low
-	while(!(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_CLK)); 	// wait for ssp_clk to go high
+    // synchronize the counter with the ssp_frame signal.
+    // Note: FPGA must be in any iso14443 mode, otherwise the frame signal would not be present
+    while(!(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_FRAME));   // wait for ssp_frame to go high (start of frame)
+    while(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_FRAME);      // wait for ssp_frame to be low
+    while(!(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_CLK));     // wait for ssp_clk to go high
 
-	// note: up to now two ssp_clk rising edges have passed since the rising edge of ssp_frame
-	// it is now safe to assert a sync signal. This sets all timers to 0 on next active clock edge
-	AT91C_BASE_TCB->TCB_BCR = 1;							// assert Sync (set all timers to 0 on next active clock edge)
-	// at the next (3rd) ssp_clk rising edge, TC1 will be reset (and not generate a clock signal to TC0)
-	// at the next (4th) ssp_clk rising edge, TC0 (the low word of our counter) will be reset. From now on,
-	// whenever the last three bits of our counter go 0, we can be sure to be in the middle of a frame transfer.
-	// (just started with the transfer of the 4th Bit).
+    // note: up to now two ssp_clk rising edges have passed since the rising edge of ssp_frame
+    // it is now safe to assert a sync signal. This sets all timers to 0 on next active clock edge
+    AT91C_BASE_TCB->TCB_BCR = 1;                            // assert Sync (set all timers to 0 on next active clock edge)
+    // at the next (3rd) ssp_clk rising edge, TC1 will be reset (and not generate a clock signal to TC0)
+    // at the next (4th) ssp_clk rising edge, TC0 (the low word of our counter) will be reset. From now on,
+    // whenever the last three bits of our counter go 0, we can be sure to be in the middle of a frame transfer.
+    // (just started with the transfer of the 4th Bit).
 
-	// The high word of the counter (TC2) will not reset until the low word (TC0) overflows.
-	// Therefore need to wait quite some time before we can use the counter.
-	while (AT91C_BASE_TC2->TC_CV > 0);
+    // The high word of the counter (TC2) will not reset until the low word (TC0) overflows.
+    // Therefore need to wait quite some time before we can use the counter.
+    while (AT91C_BASE_TC2->TC_CV > 0);
 }
 void ResetSspClk(void) {
-	//enable clock of timer and software trigger
-	AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
-	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
-	AT91C_BASE_TC2->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
-	while (AT91C_BASE_TC2->TC_CV > 0);
+    //enable clock of timer and software trigger
+    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
+    AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
+    AT91C_BASE_TC2->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
+    while (AT91C_BASE_TC2->TC_CV > 0);
 }
 uint32_t RAMFUNC GetCountSspClk(void) {
-	uint32_t tmp_count = (AT91C_BASE_TC2->TC_CV << 16) | AT91C_BASE_TC0->TC_CV;
-	if ((tmp_count & 0x0000ffff) == 0)  //small chance that we may have missed an increment in TC2
-		return (AT91C_BASE_TC2->TC_CV << 16);
-	return tmp_count;
+    uint32_t tmp_count = (AT91C_BASE_TC2->TC_CV << 16) | AT91C_BASE_TC0->TC_CV;
+    if ((tmp_count & 0x0000ffff) == 0)  //small chance that we may have missed an increment in TC2
+        return (AT91C_BASE_TC2->TC_CV << 16);
+    return tmp_count;
 }
 
 //  -------------------------------------------------------------------------
@@ -173,68 +173,68 @@ uint32_t RAMFUNC GetCountSspClk(void) {
 //  1us = 1.5ticks
 //  -------------------------------------------------------------------------
 void StartTicks(void){
-	// initialization of the timer
-	AT91C_BASE_PMC->PMC_PCER |= (1 << AT91C_ID_TC0) | (1 << AT91C_ID_TC1);
-	AT91C_BASE_TCB->TCB_BMR   = AT91C_TCB_TC0XC0S_NONE | AT91C_TCB_TC1XC1S_TIOA0 | AT91C_TCB_TC2XC2S_NONE;
+    // initialization of the timer
+    AT91C_BASE_PMC->PMC_PCER |= (1 << AT91C_ID_TC0) | (1 << AT91C_ID_TC1);
+    AT91C_BASE_TCB->TCB_BMR   = AT91C_TCB_TC0XC0S_NONE | AT91C_TCB_TC1XC1S_TIOA0 | AT91C_TCB_TC2XC2S_NONE;
 
-	// disable TC0 and TC1 for re-configuration
-	AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
-	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
+    // disable TC0 and TC1 for re-configuration
+    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
+    AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 
-	// first configure TC1 (higher, 0xFFFF0000) 16 bit counter
-	AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_XC1; // just connect to TIOA0 from TC0
-	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG; // re-enable timer and wait for TC0
+    // first configure TC1 (higher, 0xFFFF0000) 16 bit counter
+    AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_XC1; // just connect to TIOA0 from TC0
+    AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG; // re-enable timer and wait for TC0
 
-	// second configure TC0 (lower, 0x0000FFFF) 16 bit counter
-	AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV3_CLOCK | // MCK(48MHz) / 32
-	                         AT91C_TC_WAVE | AT91C_TC_WAVESEL_UP_AUTO |
-	                         AT91C_TC_ACPA_CLEAR | // RA comperator clears TIOA (carry bit)
-	                         AT91C_TC_ACPC_SET |   // RC comperator sets TIOA (carry bit)
-	                         AT91C_TC_ASWTRG_SET;  // SWTriger sets TIOA (carry bit)
-	AT91C_BASE_TC0->TC_RC  = 0; // set TIOA (carry bit) on overflow, return to zero
-	AT91C_BASE_TC0->TC_RA  = 1; // clear carry bit on next clock cycle
-	AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG; // reset and re-enable timer
+    // second configure TC0 (lower, 0x0000FFFF) 16 bit counter
+    AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV3_CLOCK | // MCK(48MHz) / 32
+                             AT91C_TC_WAVE | AT91C_TC_WAVESEL_UP_AUTO |
+                             AT91C_TC_ACPA_CLEAR | // RA comperator clears TIOA (carry bit)
+                             AT91C_TC_ACPC_SET |   // RC comperator sets TIOA (carry bit)
+                             AT91C_TC_ASWTRG_SET;  // SWTriger sets TIOA (carry bit)
+    AT91C_BASE_TC0->TC_RC  = 0; // set TIOA (carry bit) on overflow, return to zero
+    AT91C_BASE_TC0->TC_RA  = 1; // clear carry bit on next clock cycle
+    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG; // reset and re-enable timer
 
-	// synchronized startup procedure
-	while (AT91C_BASE_TC0->TC_CV > 0); // wait until TC0 returned to zero
-	while (AT91C_BASE_TC0->TC_CV < 2); // and has started (TC_CV > TC_RA, now TC1 is cleared)
+    // synchronized startup procedure
+    while (AT91C_BASE_TC0->TC_CV > 0); // wait until TC0 returned to zero
+    while (AT91C_BASE_TC0->TC_CV < 2); // and has started (TC_CV > TC_RA, now TC1 is cleared)
 
-	// return to zero
-	AT91C_BASE_TC1->TC_CCR = AT91C_TC_SWTRG;
-	AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;
-	while (AT91C_BASE_TC0->TC_CV > 0);
+    // return to zero
+    AT91C_BASE_TC1->TC_CCR = AT91C_TC_SWTRG;
+    AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;
+    while (AT91C_BASE_TC0->TC_CV > 0);
 }
 
 uint32_t GetTicks(void) {
-	uint32_t hi, lo;
+    uint32_t hi, lo;
 
-	do {
-		hi = AT91C_BASE_TC1->TC_CV;
-		lo = AT91C_BASE_TC0->TC_CV;
-	} while(hi != AT91C_BASE_TC1->TC_CV);
+    do {
+        hi = AT91C_BASE_TC1->TC_CV;
+        lo = AT91C_BASE_TC0->TC_CV;
+    } while(hi != AT91C_BASE_TC1->TC_CV);
 
-	return (hi << 16) | lo;
+    return (hi << 16) | lo;
 }
 
 // Wait - Spindelay in ticks.
 // if called with a high number, this will trigger the WDT...
 void WaitTicks(uint32_t ticks){
-	if ( ticks == 0 ) return;
-	ticks += GetTicks();
-	while (GetTicks() < ticks);
+    if ( ticks == 0 ) return;
+    ticks += GetTicks();
+    while (GetTicks() < ticks);
 }
 
 // Wait / Spindelay in us (microseconds)
 // 1us = 1.5ticks.
 void WaitUS(uint16_t us){
-	WaitTicks( (uint32_t)us * 3/2 );
+    WaitTicks( (uint32_t)us * 3/2 );
 }
 void WaitMS(uint16_t ms){
-	WaitTicks( (uint32_t)ms * 1500 );
+    WaitTicks( (uint32_t)ms * 1500 );
 }
 
 // stop clock
 void StopTicks(void){
-	AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
-	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
+    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
+    AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 }
diff --git a/armsrc/util.c b/armsrc/util.c
index 04cf1fc33..e3027c997 100644
--- a/armsrc/util.c
+++ b/armsrc/util.c
@@ -10,7 +10,7 @@
 #include "util.h"
 
 size_t nbytes(size_t nbits) {
-	return (nbits >> 3)+((nbits % 8) > 0);
+    return (nbits >> 3)+((nbits % 8) > 0);
 }
 
 /*
@@ -19,19 +19,19 @@ size_t nbytes(size_t nbits) {
  Example: reflect(0x3e23L,3) == 0x3e26
 */
 uint32_t reflect(uint32_t v, int b) {
-	uint32_t t = v;
-	for ( int i = 0; i < b; ++i) {
-		if (t & 1)
-			v |=  BITMASK((b-1)-i);
-		else
-			v &= ~BITMASK((b-1)-i);
-		t>>=1;
-	}
-	return v;
+    uint32_t t = v;
+    for ( int i = 0; i < b; ++i) {
+        if (t & 1)
+            v |=  BITMASK((b-1)-i);
+        else
+            v &= ~BITMASK((b-1)-i);
+        t>>=1;
+    }
+    return v;
 }
 
 uint8_t reflect8(uint8_t b) {
-	return ((b * 0x80200802ULL) & 0x0884422110ULL) * 0x0101010101ULL >> 32;
+    return ((b * 0x80200802ULL) & 0x0884422110ULL) * 0x0101010101ULL >> 32;
 }
 uint16_t reflect16(uint16_t b) {
     uint16_t v = 0;
@@ -56,19 +56,19 @@ uint16_t reflect16(uint16_t b) {
 }
 
 void num_to_bytes(uint64_t n, size_t len, uint8_t* dest) {
-	while (len--) {
-		dest[len] = (uint8_t) n;
-		n >>= 8;
-	}
+    while (len--) {
+        dest[len] = (uint8_t) n;
+        n >>= 8;
+    }
 }
 
 uint64_t bytes_to_num(uint8_t* src, size_t len) {
-	uint64_t num = 0;
-	while (len--) {
-		num = (num << 8) | (*src);
-		src++;
-	}
-	return num;
+    uint64_t num = 0;
+    while (len--) {
+        num = (num << 8) | (*src);
+        src++;
+    }
+    return num;
 }
 
 // RotateLeft - Ultralight, Desfire
@@ -107,11 +107,11 @@ uint8_t hex2int(char hexchar){
         case 'a':
         case 'A': return 10; break;
         case 'b':
-		case 'B': return 11; break;
+        case 'B': return 11; break;
         case 'c':
         case 'C': return 12; break;
         case 'd':
-		case 'D': return 13; break;
+        case 'D': return 13; break;
         case 'e':
         case 'E': return 14; break;
         case 'f':
@@ -122,36 +122,36 @@ uint8_t hex2int(char hexchar){
 }
 
 void LEDsoff() {
-	LED_A_OFF();
-	LED_B_OFF();
-	LED_C_OFF();
-	LED_D_OFF();
+    LED_A_OFF();
+    LED_B_OFF();
+    LED_C_OFF();
+    LED_D_OFF();
 }
 
 // LEDs: R(C) O(A) G(B) -- R(D) [1, 2, 4 and 8]
 void LED(int led, int ms) {
-	if (led & LED_RED)
-		LED_C_ON();
-	if (led & LED_ORANGE)
-		LED_A_ON();
-	if (led & LED_GREEN)
-		LED_B_ON();
-	if (led & LED_RED2)
-		LED_D_ON();
+    if (led & LED_RED)
+        LED_C_ON();
+    if (led & LED_ORANGE)
+        LED_A_ON();
+    if (led & LED_GREEN)
+        LED_B_ON();
+    if (led & LED_RED2)
+        LED_D_ON();
 
-	if (!ms)
-		return;
+    if (!ms)
+        return;
 
-	SpinDelay(ms);
+    SpinDelay(ms);
 
-	if (led & LED_RED)
-		LED_C_OFF();
-	if (led & LED_ORANGE)
-		LED_A_OFF();
-	if (led & LED_GREEN)
-		LED_B_OFF();
-	if (led & LED_RED2)
-		LED_D_OFF();
+    if (led & LED_RED)
+        LED_C_OFF();
+    if (led & LED_ORANGE)
+        LED_A_OFF();
+    if (led & LED_GREEN)
+        LED_B_OFF();
+    if (led & LED_RED2)
+        LED_D_OFF();
 }
 
 void SpinOff(uint32_t pause) {
@@ -166,7 +166,7 @@ void SpinOff(uint32_t pause) {
 void SpinErr(uint8_t led, uint32_t speed, uint8_t times) {
     SpinOff(speed);
     NTIME(times)
-	{
+    {
         switch (led) {
         case 0:
             LED_A_INV();
@@ -223,102 +223,102 @@ void SpinUp(uint32_t speed) {
 // In general, don't use this function unless you expect a
 // double click, otherwise it will waste 500ms -- use BUTTON_HELD instead
 int BUTTON_CLICKED(int ms) {
-	// Up to 500ms in between clicks to mean a double click
-	int ticks = (48000 * (ms ? ms : 1000)) >> 10;
+    // Up to 500ms in between clicks to mean a double click
+    int ticks = (48000 * (ms ? ms : 1000)) >> 10;
 
-	// If we're not even pressed, forget about it!
-	if (!BUTTON_PRESS())
-		return BUTTON_NO_CLICK;
+    // If we're not even pressed, forget about it!
+    if (!BUTTON_PRESS())
+        return BUTTON_NO_CLICK;
 
-	// Borrow a PWM unit for my real-time clock
-	AT91C_BASE_PWMC->PWMC_ENA = PWM_CHANNEL(0);
-	// 48 MHz / 1024 gives 46.875 kHz
-	AT91C_BASE_PWMC_CH0->PWMC_CMR = PWM_CH_MODE_PRESCALER(10);
-	AT91C_BASE_PWMC_CH0->PWMC_CDTYR = 0;
-	AT91C_BASE_PWMC_CH0->PWMC_CPRDR = 0xffff;
+    // Borrow a PWM unit for my real-time clock
+    AT91C_BASE_PWMC->PWMC_ENA = PWM_CHANNEL(0);
+    // 48 MHz / 1024 gives 46.875 kHz
+    AT91C_BASE_PWMC_CH0->PWMC_CMR = PWM_CH_MODE_PRESCALER(10);
+    AT91C_BASE_PWMC_CH0->PWMC_CDTYR = 0;
+    AT91C_BASE_PWMC_CH0->PWMC_CPRDR = 0xffff;
 
-	uint16_t start = AT91C_BASE_PWMC_CH0->PWMC_CCNTR;
+    uint16_t start = AT91C_BASE_PWMC_CH0->PWMC_CCNTR;
 
-	int letoff = 0;
-	for(;;)
-	{
-		uint16_t now = AT91C_BASE_PWMC_CH0->PWMC_CCNTR;
+    int letoff = 0;
+    for(;;)
+    {
+        uint16_t now = AT91C_BASE_PWMC_CH0->PWMC_CCNTR;
 
-		// We haven't let off the button yet
-		if (!letoff)
-		{
-			// We just let it off!
-			if (!BUTTON_PRESS())
-			{
-				letoff = 1;
+        // We haven't let off the button yet
+        if (!letoff)
+        {
+            // We just let it off!
+            if (!BUTTON_PRESS())
+            {
+                letoff = 1;
 
-				// reset our timer for 500ms
-				start = AT91C_BASE_PWMC_CH0->PWMC_CCNTR;
-				ticks = (48000 * (500)) >> 10;
-			}
+                // reset our timer for 500ms
+                start = AT91C_BASE_PWMC_CH0->PWMC_CCNTR;
+                ticks = (48000 * (500)) >> 10;
+            }
 
-			// Still haven't let it off
-			else
-				// Have we held down a full second?
-				if (now == (uint16_t)(start + ticks))
-					return BUTTON_HOLD;
-		}
+            // Still haven't let it off
+            else
+                // Have we held down a full second?
+                if (now == (uint16_t)(start + ticks))
+                    return BUTTON_HOLD;
+        }
 
-		// We already let off, did we click again?
-		else
-			// Sweet, double click!
-			if (BUTTON_PRESS())
-				return BUTTON_DOUBLE_CLICK;
+        // We already let off, did we click again?
+        else
+            // Sweet, double click!
+            if (BUTTON_PRESS())
+                return BUTTON_DOUBLE_CLICK;
 
-			// Have we ran out of time to double click?
-			else
-				if (now == (uint16_t)(start + ticks))
-					// At least we did a single click
-					return BUTTON_SINGLE_CLICK;
+            // Have we ran out of time to double click?
+            else
+                if (now == (uint16_t)(start + ticks))
+                    // At least we did a single click
+                    return BUTTON_SINGLE_CLICK;
 
-		WDT_HIT();
-	}
+        WDT_HIT();
+    }
 
-	// We should never get here
-	return BUTTON_ERROR;
+    // We should never get here
+    return BUTTON_ERROR;
 }
 
 // Determine if a button is held down
 int BUTTON_HELD(int ms) {
-	// If button is held for one second
-	int ticks = (48000 * (ms ? ms : 1000)) >> 10;
+    // If button is held for one second
+    int ticks = (48000 * (ms ? ms : 1000)) >> 10;
 
-	// If we're not even pressed, forget about it!
-	if (!BUTTON_PRESS())
-		return BUTTON_NO_CLICK;
+    // If we're not even pressed, forget about it!
+    if (!BUTTON_PRESS())
+        return BUTTON_NO_CLICK;
 
-	// Borrow a PWM unit for my real-time clock
-	AT91C_BASE_PWMC->PWMC_ENA = PWM_CHANNEL(0);
-	// 48 MHz / 1024 gives 46.875 kHz
-	AT91C_BASE_PWMC_CH0->PWMC_CMR = PWM_CH_MODE_PRESCALER(10);
-	AT91C_BASE_PWMC_CH0->PWMC_CDTYR = 0;
-	AT91C_BASE_PWMC_CH0->PWMC_CPRDR = 0xffff;
+    // Borrow a PWM unit for my real-time clock
+    AT91C_BASE_PWMC->PWMC_ENA = PWM_CHANNEL(0);
+    // 48 MHz / 1024 gives 46.875 kHz
+    AT91C_BASE_PWMC_CH0->PWMC_CMR = PWM_CH_MODE_PRESCALER(10);
+    AT91C_BASE_PWMC_CH0->PWMC_CDTYR = 0;
+    AT91C_BASE_PWMC_CH0->PWMC_CPRDR = 0xffff;
 
-	uint16_t start = AT91C_BASE_PWMC_CH0->PWMC_CCNTR;
+    uint16_t start = AT91C_BASE_PWMC_CH0->PWMC_CCNTR;
 
-	for(;;)
-	{
-		uint16_t now = AT91C_BASE_PWMC_CH0->PWMC_CCNTR;
+    for(;;)
+    {
+        uint16_t now = AT91C_BASE_PWMC_CH0->PWMC_CCNTR;
 
-		// As soon as our button let go, we didn't hold long enough
-		if (!BUTTON_PRESS())
-			return BUTTON_SINGLE_CLICK;
+        // As soon as our button let go, we didn't hold long enough
+        if (!BUTTON_PRESS())
+            return BUTTON_SINGLE_CLICK;
 
-		// Have we waited the full second?
-		else
-			if (now == (uint16_t)(start + ticks))
-				return BUTTON_HOLD;
+        // Have we waited the full second?
+        else
+            if (now == (uint16_t)(start + ticks))
+                return BUTTON_HOLD;
 
-		WDT_HIT();
-	}
+        WDT_HIT();
+    }
 
-	// We should never get here
-	return BUTTON_ERROR;
+    // We should never get here
+    return BUTTON_ERROR;
 }
 
 /* Similar to FpgaGatherVersion this formats stored version information
@@ -327,30 +327,30 @@ int BUTTON_HELD(int ms) {
  * prefix in dst.
  */
 void FormatVersionInformation(char *dst, int len, const char *prefix, void *version_information) {
-	struct version_information *v = (struct version_information*)version_information;
-	dst[0] = 0;
-	strncat(dst, prefix, len-1);
-	if (v->magic != VERSION_INFORMATION_MAGIC) {
-		strncat(dst, "Missing/Invalid version information\n", len - strlen(dst) - 1);
-		return;
-	}
-	if (v->versionversion != 1) {
-		strncat(dst, "Version information not understood\n", len - strlen(dst) - 1);
-		return;
-	}
-	if (!v->present) {
-		strncat(dst, "Version information not available\n", len - strlen(dst) - 1);
-		return;
-	}
+    struct version_information *v = (struct version_information*)version_information;
+    dst[0] = 0;
+    strncat(dst, prefix, len-1);
+    if (v->magic != VERSION_INFORMATION_MAGIC) {
+        strncat(dst, "Missing/Invalid version information\n", len - strlen(dst) - 1);
+        return;
+    }
+    if (v->versionversion != 1) {
+        strncat(dst, "Version information not understood\n", len - strlen(dst) - 1);
+        return;
+    }
+    if (!v->present) {
+        strncat(dst, "Version information not available\n", len - strlen(dst) - 1);
+        return;
+    }
 
-	strncat(dst, v->gitversion, len - strlen(dst) - 1);
-	if (v->clean == 0) {
-		strncat(dst, "-unclean", len - strlen(dst) - 1);
-	} else if (v->clean == 2) {
-		strncat(dst, "-suspect", len - strlen(dst) - 1);
-	}
+    strncat(dst, v->gitversion, len - strlen(dst) - 1);
+    if (v->clean == 0) {
+        strncat(dst, "-unclean", len - strlen(dst) - 1);
+    } else if (v->clean == 2) {
+        strncat(dst, "-suspect", len - strlen(dst) - 1);
+    }
 
-	strncat(dst, " ", len - strlen(dst) - 1);
-	strncat(dst, v->buildtime, len - strlen(dst) - 1);
-	strncat(dst, "\n", len - strlen(dst) - 1);
+    strncat(dst, " ", len - strlen(dst) - 1);
+    strncat(dst, v->buildtime, len - strlen(dst) - 1);
+    strncat(dst, "\n", len - strlen(dst) - 1);
 }
diff --git a/armsrc/util.h b/armsrc/util.h
index cc613b273..bca073273 100644
--- a/armsrc/util.h
+++ b/armsrc/util.h
@@ -46,8 +46,8 @@
 size_t nbytes(size_t nbits);
 
 extern uint32_t reflect(uint32_t v, int b); // used in crc.c ...
-extern uint8_t reflect8(uint8_t b);		// dedicated 8bit reversal
-extern uint16_t reflect16(uint16_t b);	// dedicated 16bit reversal
+extern uint8_t reflect8(uint8_t b);         // dedicated 8bit reversal
+extern uint16_t reflect16(uint16_t b);      // dedicated 16bit reversal
 
 void num_to_bytes(uint64_t n, size_t len, uint8_t* dest);
 uint64_t bytes_to_num(uint8_t* src, size_t len);

From e8d15d0c1847b5fd40c439ba3e70e6b5cc49193c Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 9 Mar 2019 20:47:57 +0100
Subject: [PATCH 0710/1938] FIX: 'data load' - now loads large files again
 (TITEST.txt)

---
 client/cmddata.c | 12 +++++++-----
 client/graph.c   |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/client/cmddata.c b/client/cmddata.c
index 6d83a4e0b..45bce9c9c 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -1600,19 +1600,23 @@ int CmdLoad(const char *Cmd) {
 	len = strlen(Cmd);
 	if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
 	memcpy(filename, Cmd, len);
-
+	
 	FILE *f = fopen(filename, "r");
 	if (!f) {
 		PrintAndLogEx(WARNING, "couldn't open '%s'", filename);
 		return 0;
 	}
-
+        
 	GraphTraceLen = 0;
 	char line[80];
 	while (fgets(line, sizeof (line), f)) {
 		GraphBuffer[GraphTraceLen] = atoi(line);
 		GraphTraceLen++;
+    
+        if ( GraphTraceLen >= MAX_GRAPH_TRACE_LEN )
+            break;
 	}
+    
 	if (f)
 		fclose(f);
 
@@ -1620,11 +1624,9 @@ int CmdLoad(const char *Cmd) {
 
 	uint8_t bits[GraphTraceLen];
 	size_t size = getFromGraphBuf(bits);
-	// set signal properties low/high/mean/amplitude and is_noise detection
+    
 	removeSignalOffset(bits, size);
-	// push it back to graph
 	setGraphBuf(bits, size);
-	// set signal properties low/high/mean/amplitude and is_noise detection
 	computeSignalProperties(bits, size);
 
 	setClockGrid(0,0);
diff --git a/client/graph.c b/client/graph.c
index c3f6a2b99..2df0d8202 100644
--- a/client/graph.c
+++ b/client/graph.c
@@ -67,7 +67,7 @@ void setGraphBuf(uint8_t *buf, size_t size) {
 	if ( size > MAX_GRAPH_TRACE_LEN )
 		size = MAX_GRAPH_TRACE_LEN;
 
-	for (uint16_t i = 0; i < size; ++i)
+	for (uint32_t i = 0; i < size; ++i)
 		GraphBuffer[i] = buf[i] - 128;
 
 	GraphTraceLen = size;

From 902a5f06ffa4e94b4f0214ebd981aba6f07f392b Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 9 Mar 2019 21:42:40 +0100
Subject: [PATCH 0711/1938] chg: 'lf search' - added TI detection

---
 client/cmdlf.c   |   4 +-
 client/cmdlfti.c | 135 +++++++++++++++++++++++++----------------------
 2 files changed, 75 insertions(+), 64 deletions(-)

diff --git a/client/cmdlf.c b/client/cmdlf.c
index 71c429f00..b877f8f3b 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -912,9 +912,9 @@ int CmdLFfind(const char *Cmd) {
 	if (CmdSecurakeyDemod(""))	{ PrintAndLogEx(SUCCESS, "\nValid Securakey ID Found!"); goto out;}
 	if (CmdVikingDemod(""))		{ PrintAndLogEx(SUCCESS, "\nValid Viking ID Found!"); goto out;}
 	if (CmdVisa2kDemod(""))		{ PrintAndLogEx(SUCCESS, "\nValid Visa2000 ID Found!"); goto out;}
-
+    if (CmdTIDemod(""))     	{ PrintAndLogEx(SUCCESS, "\nValid Texas Instrument ID Found!"); goto out;}
 	//if (CmdFermaxDemod(""))		{ PrintAndLogEx(SUCCESS, "\nValid Fermax ID Found!"); goto out;}
-	// TIdemod?  flexdemod?
+	// flexdemod?
 
 	PrintAndLogEx(FAILED, "\nNo known 125/134 KHz tags Found!\n");
 
diff --git a/client/cmdlfti.c b/client/cmdlfti.c
index 9928faf27..1eb649ca5 100644
--- a/client/cmdlfti.c
+++ b/client/cmdlfti.c
@@ -21,8 +21,7 @@
 
 static int CmdHelp(const char *Cmd);
 
-int CmdTIDemod(const char *Cmd)
-{
+int CmdTIDemod(const char *Cmd) {
   /* MATLAB as follows:
     f_s = 2000000;  % sampling frequency
     f_l = 123200;   % low FSK tone
@@ -77,14 +76,18 @@ int CmdTIDemod(const char *Cmd)
     1, 1, 1, 1, 1, 1, 1,      -1, -1, -1, -1, -1, -1, -1,
     1, 1, 1, 1, 1, 1, 1, 1
   };
-	int lowLen = sizeof(LowTone) / sizeof(int);
-	int highLen = sizeof(HighTone) / sizeof(int);
-	int convLen = (highLen > lowLen) ? highLen : lowLen;
-	uint16_t crc;
-	int i, j, TagType;
-	int lowSum = 0, highSum = 0;;
-	int lowTot = 0, highTot = 0;
 
+    save_restoreGB(GRAPH_SAVE);
+
+    int lowLen = sizeof(LowTone) / sizeof(int);
+    int highLen = sizeof(HighTone) / sizeof(int);
+    int convLen = (highLen > lowLen) ? highLen : lowLen;
+    uint16_t crc;
+    int i, j, TagType;
+    int lowSum = 0, highSum = 0;;
+    int lowTot = 0, highTot = 0;
+    int retval = 0;     
+    
 	for (i = 0; i < GraphTraceLen - convLen; i++) {
 		lowSum = 0;
 		highSum = 0;;
@@ -95,10 +98,10 @@ int CmdTIDemod(const char *Cmd)
 		for (j = 0; j < highLen; j++) {
 			highSum += HighTone[j] * GraphBuffer[i+j];
 		}
-		lowSum = abs((100*lowSum) / lowLen);
-		highSum = abs((100*highSum) / highLen);
-		lowSum = (lowSum<0) ? -lowSum : lowSum;
-		highSum = (highSum<0) ? -highSum : highSum;
+		lowSum = abs((100 * lowSum) / lowLen);
+		highSum = abs((100 * highSum) / highLen);
+		lowSum = (lowSum < 0) ? -lowSum : lowSum;
+		highSum = (highSum < 0) ? -highSum : highSum;
 
 		GraphBuffer[i] = (highSum << 16) | lowSum;
 	}
@@ -157,17 +160,16 @@ int CmdTIDemod(const char *Cmd)
 	GraphBuffer[maxPos+1] = -800;
 
 	// advance pointer to start of actual data stream (after 16 pre and 8 start bits)
-	maxPos += 17*lowLen;
-	maxPos += 6*highLen;
+	maxPos += 17 * lowLen;
+	maxPos +=  6 * highLen;
 
 	// place a marker in the buffer to visually aid location
 	// of the end of sync
 	GraphBuffer[maxPos] = 800;
 	GraphBuffer[maxPos+1] = -800;
 
-	PrintAndLogEx(NORMAL, "actual data bits start at sample %d", maxPos);
-
-	PrintAndLogEx(NORMAL, "length %d/%d", highLen, lowLen);
+	PrintAndLogEx(DEBUG, "actual data bits start at sample %d", maxPos);
+	PrintAndLogEx(DEBUG, "length %d/%d", highLen, lowLen);
 
 	uint8_t bits[1+64+16+8+16];
 	bits[sizeof(bits)-1] = '\0';
@@ -208,67 +210,75 @@ int CmdTIDemod(const char *Cmd)
 
 	RepaintGraphWindow();
 
-	PrintAndLogEx(INFO, "INFO: raw tag bits = %s", bits);
+	PrintAndLogEx(INFO, "raw tag bits = %s", bits);
 
-	TagType = (shift3>>8)&0xff;
-	if ( TagType != ((shift0>>16)&0xff) ) {
+	TagType = (shift3 >> 8) & 0xFF;
+	if ( TagType != ((shift0 >> 16) & 0xFF) ) {
 		PrintAndLogEx(WARNING, "Error: start and stop bits do not match!");
-		return 0;
+        goto out;
 	}
-	else if (TagType == 0x7e) {
-		PrintAndLogEx(INFO, "INFO: Readonly TI tag detected.");
-		return 0;
+	else if (TagType == 0x7E) {
+		PrintAndLogEx(INFO, "Readonly TI tag detected.");
+		retval = 1;
+        goto out;
 	}
-	else if (TagType == 0xfe) {
-		PrintAndLogEx(INFO, "INFO: Rewriteable TI tag detected.");
+	else if (TagType == 0xFE) {
+		PrintAndLogEx(INFO, "Rewriteable TI tag detected.");
 
 		// put 64 bit data into shift1 and shift0
-		shift0 = (shift0>>24) | (shift1 << 8);
-		shift1 = (shift1>>24) | (shift2 << 8);
+		shift0 = (shift0 >> 24) | (shift1 << 8);
+		shift1 = (shift1 >> 24) | (shift2 << 8);
 
 		// align 16 bit crc into lower half of shift2
-		shift2 = ((shift2>>24) | (shift3 << 8)) & 0x0ffff;
+		shift2 = ((shift2 >> 24) | (shift3 << 8)) & 0x0FFFF;
 
 		// align 16 bit "end bits" or "ident" into lower half of shift3
 		shift3 >>= 16;
 
 		// only 15 bits compare, last bit of ident is not valid
-		if ( (shift3^shift0)&0x7fff ) {
+		if ( (shift3 ^ shift0) & 0x7FFF ) {
 		  PrintAndLogEx(WARNING, "Error: Ident mismatch!");
 		}
 		// WARNING the order of the bytes in which we calc crc below needs checking
 		// i'm 99% sure the crc algorithm is correct, but it may need to eat the
 		// bytes in reverse or something
 		// calculate CRC
-		crc=0;
-		crc = update_crc16(crc, (shift0)&0xff);
-		crc = update_crc16(crc, (shift0>>8)&0xff);
-		crc = update_crc16(crc, (shift0>>16)&0xff);
-		crc = update_crc16(crc, (shift0>>24)&0xff);
-		crc = update_crc16(crc, (shift1)&0xff);
-		crc = update_crc16(crc, (shift1>>8)&0xff);
-		crc = update_crc16(crc, (shift1>>16)&0xff);
-		crc = update_crc16(crc, (shift1>>24)&0xff);
+		crc = 0;
+		crc = update_crc16(crc, (shift0 >>  0) & 0xFF);
+		crc = update_crc16(crc, (shift0 >>  8) & 0xFF);
+		crc = update_crc16(crc, (shift0 >> 16) & 0xFF);
+		crc = update_crc16(crc, (shift0 >> 24) & 0xFF);
+        
+		crc = update_crc16(crc, (shift1 >>  0) & 0xFF);
+		crc = update_crc16(crc, (shift1 >>  8) & 0xFF);
+		crc = update_crc16(crc, (shift1 >> 16) & 0xFF);
+		crc = update_crc16(crc, (shift1 >> 24) & 0xFF);
 
 		//crc =  crc16_ccitt(message, sizeof(message);
 
-		char *crcStr = (crc == (shift2&0xffff) ) ? "Passed" : "Failed";
+		char *crcStr = (crc == (shift2 & 0xFFFF) ) ? "Passed" : "Failed";
 
-		PrintAndLogEx(NORMAL, "Tag data = %08X%08X  [Crc %04X %s]", shift1, shift0, crc, crcStr );
-
-		if (crc != (shift2&0xffff))
-			PrintAndLogEx(WARNING, "Error: CRC mismatch, calculated %04X, got %04X", crc, shift2&0xffff);
+		PrintAndLogEx(INFO, "Tag data = %08X%08X  [Crc %04X %s]", shift1, shift0, crc, crcStr );
 
+		if (crc != (shift2 & 0xFFFF))
+			PrintAndLogEx(WARNING, "Error: CRC mismatch, calculated %04X, got %04X", crc, shift2 & 0xFFFF);
+        
+        retval = 1;
+        goto out;
 	}
 	else {
 		PrintAndLogEx(WARNING, "Unknown tag type.");
 	}
-	return 0;
+    
+out:
+    if ( retval == 0)
+        save_restoreGB(GRAPH_RESTORE);
+    
+	return retval;
 }
 
 // read a TI tag and return its ID
-int CmdTIRead(const char *Cmd)
-{
+int CmdTIRead(const char *Cmd) {
 	UsbCommand c = {CMD_READ_TI_TYPE};
 	clearCommandBuffer();
 	SendCommand(&c);
@@ -276,15 +286,16 @@ int CmdTIRead(const char *Cmd)
 }
 
 // write new data to a r/w TI tag
-int CmdTIWrite(const char *Cmd)
-{
+int CmdTIWrite(const char *Cmd) {
 	int res = 0;
 	UsbCommand c = {CMD_WRITE_TI_TYPE};
 	res = sscanf(Cmd, "%012" SCNx64 " %012" SCNx64 " %012" SCNx64 "", &c.arg[0], &c.arg[1], &c.arg[2]);
 
-	if (res == 2) c.arg[2]=0;
+	if (res == 2) 
+        c.arg[2] = 0;
+    
 	if (res < 2) {
-		PrintAndLogEx(NORMAL, "Please specify the data as two hex strings, optionally the CRC as a third");
+		PrintAndLogEx(WARNING, "Please specify the data as two hex strings, optionally the CRC as a third");
 		return 1;
 	}
 	clearCommandBuffer();
@@ -293,20 +304,20 @@ int CmdTIWrite(const char *Cmd)
 }
 
 static command_t CommandTable[] = {
-  {"help",      CmdHelp,        1, "This help"},
-  {"demod",     CmdTIDemod,     1, "Demodulate raw bits for TI-type LF tag from the GraphBuffer"},
-  {"read",      CmdTIRead,      0, "Read and decode a TI 134 kHz tag"},
-  {"write",     CmdTIWrite,     0, "Write new data to a r/w TI 134 kHz tag"},
-  {NULL, NULL, 0, NULL}
+    {"help",      CmdHelp,        1, "This help"},
+    {"demod",     CmdTIDemod,     1, "Demodulate raw bits for TI-type LF tag from the GraphBuffer"},
+    {"read",      CmdTIRead,      0, "Read and decode a TI 134 kHz tag"},
+    {"write",     CmdTIWrite,     0, "Write new data to a r/w TI 134 kHz tag"},
+    {NULL, NULL, 0, NULL}
 };
 
 int CmdLFTI(const char *Cmd){
-	clearCommandBuffer();
-	CmdsParse(CommandTable, Cmd);
-	return 0;
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
+    return 0;
 }
 
 int CmdHelp(const char *Cmd){
-	CmdsHelp(CommandTable);
-	return 0;
+    CmdsHelp(CommandTable);
+    return 0;
 }

From 38503b55d57c5271224c49fddde1e44124831da7 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 9 Mar 2019 21:43:03 +0100
Subject: [PATCH 0712/1938] chg: cleanup

---
 client/cmdlfparadox.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/client/cmdlfparadox.c b/client/cmdlfparadox.c
index 238d7bc00..80088c85c 100644
--- a/client/cmdlfparadox.c
+++ b/client/cmdlfparadox.c
@@ -79,15 +79,15 @@ int detectParadox(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint
 //print full Paradox Prox ID and some bit format details if found
 int CmdParadoxDemod(const char *Cmd) {
 	//raw fsk demod no manchester decoding no start bit finding just get binary from wave
-	uint8_t bits[MAX_GRAPH_TRACE_LEN]={0};
+	uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
 	size_t size = getFromGraphBuf(bits);
 	if (size == 0) {
 		PrintAndLogEx(DEBUG, "DEBUG: Error - Paradox not enough samples");
 		return 0;
 	}
 
-	uint32_t hi2=0, hi=0, lo=0;
-	int waveIdx=0;
+	uint32_t hi2 = 0, hi = 0, lo = 0;
+	int waveIdx = 0;
 	//get binary from fsk wave
 	int idx = detectParadox(bits, &size, &hi2, &hi, &lo, &waveIdx);
 	if (idx < 0){
@@ -109,24 +109,24 @@ int CmdParadoxDemod(const char *Cmd) {
 	}
 
 	setDemodBuf(bits, size, idx);
-	setClockGrid(50, waveIdx + (idx*50));
+	setClockGrid(50, waveIdx + (idx * 50));
 
-	if (hi2==0 && hi==0 && lo==0){
-		if (g_debugMode) PrintAndLogEx(DEBUG, "DEBUG: Error - Paradox no value found");
+	if (hi2 == 0 && hi == 0 && lo == 0){
+		PrintAndLogEx(DEBUG, "DEBUG: Error - Paradox no value found");
 		return 0;
 	}
 
-	uint32_t fc = ((hi & 0x3)<<6) | (lo>>26);
-	uint32_t cardnum = (lo>>10) & 0xFFFF;
+	uint32_t fc = ((hi & 0x3) << 6) | (lo >> 26);
+	uint32_t cardnum = (lo >> 10) & 0xFFFF;
 	uint32_t rawLo = bytebits_to_byte(bits + idx + 64, 32);
 	uint32_t rawHi = bytebits_to_byte(bits + idx + 32, 32);
 	uint32_t rawHi2 = bytebits_to_byte(bits + idx, 32);
 
 	PrintAndLogEx(NORMAL, "Paradox TAG ID: %x%08x - FC: %d - Card: %d - Checksum: %02x - RAW: %08x%08x%08x",
 		hi >> 10,
-		(hi & 0x3)<<26 | (lo>>10),
+		(hi & 0x3) << 26 | (lo >> 10),
 		fc, cardnum,
-		(lo>>2) & 0xFF,
+		(lo >> 2) & 0xFF,
 		rawHi2,
 		rawHi,
 		rawLo
@@ -193,6 +193,7 @@ static command_t CommandTable[] = {
 };
 
 int CmdLFParadox(const char *Cmd) {
+    clearCommandBuffer();    
 	CmdsParse(CommandTable, Cmd);
 	return 0;
 }

From 112411042fe3691d7cdcbb08fad893fca2ce1688 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 9 Mar 2019 21:59:00 +0100
Subject: [PATCH 0713/1938] cleaning up

---
 client/cmdhficlass.c | 112 +++++++++++++------------------------------
 1 file changed, 34 insertions(+), 78 deletions(-)

diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index e21de76ab..bf8976e8a 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -574,16 +574,16 @@ int HFiClassReader(const char *Cmd, bool loop, bool verbose) {
 }
 
 int CmdHFiClassReader(const char *Cmd) {
-	char cmdp = param_getchar(Cmd, 0);
-	if (cmdp == 'h' || cmdp == 'H') return usage_hf_iclass_reader();
+	char cmdp = tolower(param_getchar(Cmd, 0));
+	if (cmdp == 'h') return usage_hf_iclass_reader();
 	bool findone = (cmdp == '1') ? false : true;
 	return HFiClassReader(Cmd, findone, true);
 }
 
 int CmdHFiClassReader_Replay(const char *Cmd) {
 
-	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd)<1 || cmdp == 'H' || cmdp == 'h') return usage_hf_iclass_replay();
+	char cmdp = tolower(param_getchar(Cmd, 0));
+	if (strlen(Cmd)<1 || cmdp == 'h') return usage_hf_iclass_replay();
 
 	uint8_t readerType = 0;
 	uint8_t MAC[4] = {0x00, 0x00, 0x00, 0x00};
@@ -610,13 +610,12 @@ int iclassEmlSetMem(uint8_t *data, int blockNum, int blocksCount) {
 
 int CmdHFiClassELoad(const char *Cmd) {
 
-	char ctmp = param_getchar(Cmd, 0);
-	if (strlen(Cmd)< 1 || ctmp == 'h' || ctmp == 'H') return usage_hf_iclass_eload();
+	char ctmp = tolower(param_getchar(Cmd, 0));
+	if (strlen(Cmd)< 1 || ctmp == 'h') return usage_hf_iclass_eload();
 
-	if ( ctmp != 'f' && ctmp != 'F') return usage_hf_iclass_eload();
+	if ( ctmp != 'f' ) return usage_hf_iclass_eload();
 
 	//File handling and reading
-	FILE *f;
 	char filename[FILE_PATH_SIZE];
 
 	if ( param_getstr(Cmd, 1, filename, FILE_PATH_SIZE) >= FILE_PATH_SIZE ) {
@@ -624,7 +623,7 @@ int CmdHFiClassELoad(const char *Cmd) {
 		return 1;
 	}
 
-	f = fopen(filename, "rb");
+	FILE *f = fopen(filename, "rb");
 	if ( !f ){
 		PrintAndLogEx(FAILED, "File: " _YELLOW_(%s) ": not found or locked.", filename);
 		return 1;
@@ -703,8 +702,8 @@ static int readKeyfile(const char *filename, size_t len, uint8_t* buffer) {
 
 int CmdHFiClassDecrypt(const char *Cmd) {
 
-	char opt = param_getchar(Cmd, 0);
-	if (strlen(Cmd)<1 || opt == 'h' || opt == 'H') return usage_hf_iclass_decrypt();
+	char opt = tolower(param_getchar(Cmd, 0));
+	if (strlen(Cmd)<1 || opt == 'h') return usage_hf_iclass_decrypt();
 
 	uint8_t key[16] = { 0 };
 	if (readKeyfile("iclass_decryptionkey.bin", 16, key)) return usage_hf_iclass_decrypt();
@@ -807,8 +806,8 @@ static int iClassEncryptBlkData(uint8_t *blkData) {
 
 int CmdHFiClassEncryptBlk(const char *Cmd) {
 	uint8_t blkData[8] = {0};
-	char opt = param_getchar(Cmd, 0);
-	if (strlen(Cmd)<1 || opt == 'h' || opt == 'H') return usage_hf_iclass_encrypt();
+	char opt = tolower(param_getchar(Cmd, 0));
+	if (strlen(Cmd)<1 || opt == 'h') return usage_hf_iclass_encrypt();
 
 	//get the bytes to encrypt
 	if (param_gethex(Cmd, 0, blkData, 16)) {
@@ -924,12 +923,10 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
 	uint8_t cmdp = 0;
 
 	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch (param_getchar(Cmd, cmdp)) {
+		switch (tolower(param_getchar(Cmd, cmdp))) {
 		case 'h':
-		case 'H':
 			return usage_hf_iclass_dump();
 		case 'c':
-		case 'C':
 			have_credit_key = true;
 			dataLen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
 			if (dataLen == 16) {
@@ -949,12 +946,10 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
 			cmdp += 2;
 			break;
 		case 'e':
-		case 'E':
 			elite = true;
 			cmdp++;
 			break;
 		case 'f':
-		case 'F':
 			fileNameLen = param_getstr(Cmd, cmdp+1, filename, sizeof(filename));
 			if (fileNameLen < 1) {
 				PrintAndLogEx(WARNING, "no filename found after f");
@@ -963,7 +958,6 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
 			cmdp += 2;
 			break;
 		case 'k':
-		case 'K':
 			have_debit_key = true;
 			dataLen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
 			if (dataLen == 16) {
@@ -983,12 +977,10 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
 			cmdp += 2;
 			break;
 		case 'r':
-		case 'R':
 			rawkey = true;
 			cmdp++;
 			break;
 		case 'v':
-		case 'V':
 			verbose = true;
 			cmdp++;
 			break;
@@ -1198,13 +1190,11 @@ int CmdHFiClass_WriteBlock(const char *Cmd) {
 	bool errors = false;
 	bool verbose = false;
 	uint8_t cmdp = 0;
-	while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch(param_getchar(Cmd, cmdp)) {
+	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+		switch (tolower(param_getchar(Cmd, cmdp))) {
 		case 'h':
-		case 'H':
 			return usage_hf_iclass_writeblock();
 		case 'b':
-		case 'B':
 			if (param_gethex(Cmd, cmdp+1, &blockno, 2)) {
 				PrintAndLogEx(WARNING, "Block No must include 2 HEX symbols\n");
 				errors = true;
@@ -1212,12 +1202,10 @@ int CmdHFiClass_WriteBlock(const char *Cmd) {
 			cmdp += 2;
 			break;
 		case 'c':
-		case 'C':
 			use_credit_key = true;
 			cmdp++;
 			break;
 		case 'd':
-		case 'D':
 			if (param_gethex(Cmd, cmdp+1, bldata, 16)) {
 				PrintAndLogEx(WARNING, "Data must include 16 HEX symbols\n");
 				errors = true;
@@ -1225,12 +1213,10 @@ int CmdHFiClass_WriteBlock(const char *Cmd) {
 			cmdp += 2;
 			break;
 		case 'e':
-		case 'E':
 			elite = true;
 			cmdp++;
 			break;
 		case 'k':
-		case 'K':
 			dataLen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
 			if (dataLen == 16) {
 				errors = param_gethex(tempStr, 0, KEY, dataLen);
@@ -1249,12 +1235,10 @@ int CmdHFiClass_WriteBlock(const char *Cmd) {
 			cmdp += 2;
 			break;
 		case 'r':
-		case 'R':
 			rawkey = true;
 			cmdp++;
 			break;
 		case 'v':
-		case 'V':
 			verbose = true;
 			cmdp++;
 			break;
@@ -1286,13 +1270,11 @@ int CmdHFiClassCloneTag(const char *Cmd) {
 	bool errors = false;
 	bool verbose = false;
 	uint8_t cmdp = 0;
-	while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch(param_getchar(Cmd, cmdp)) {
+	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+		switch (tolower(param_getchar(Cmd, cmdp))) {
 		case 'h':
-		case 'H':
 			return usage_hf_iclass_clone();
 		case 'b':
-		case 'B':
 			if (param_gethex(Cmd, cmdp+1, &startblock, 2)) {
 				PrintAndLogEx(WARNING, "start block No must include 2 HEX symbols\n");
 				errors = true;
@@ -1300,17 +1282,14 @@ int CmdHFiClassCloneTag(const char *Cmd) {
 			cmdp += 2;
 			break;
 		case 'c':
-		case 'C':
 			use_credit_key = true;
 			cmdp++;
 			break;
 		case 'e':
-		case 'E':
 			elite = true;
 			cmdp++;
 			break;
 		case 'f':
-		case 'F':
 			fileNameLen = param_getstr(Cmd, cmdp+1, filename, sizeof(filename));
 			if (fileNameLen < 1) {
 				PrintAndLogEx(WARNING, "No filename found after f");
@@ -1319,7 +1298,6 @@ int CmdHFiClassCloneTag(const char *Cmd) {
 			cmdp += 2;
 			break;
 		case 'k':
-		case 'K':
 			dataLen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
 			if (dataLen == 16) {
 				errors = param_gethex(tempStr, 0, KEY, dataLen);
@@ -1338,7 +1316,6 @@ int CmdHFiClassCloneTag(const char *Cmd) {
 			cmdp += 2;
 			break;
 		case 'l':
-		case 'L':
 			if (param_gethex(Cmd, cmdp+1, &endblock, 2)) {
 				PrintAndLogEx(WARNING, "start Block No must include 2 HEX symbols\n");
 				errors = true;
@@ -1346,12 +1323,10 @@ int CmdHFiClassCloneTag(const char *Cmd) {
 			cmdp += 2;
 			break;
 		case 'r':
-		case 'R':
 			rawkey = true;
 			cmdp++;
 			break;
 		case 'v':
-		case 'V':
 			verbose = true;
 			cmdp++;
 			break;
@@ -1368,17 +1343,17 @@ int CmdHFiClassCloneTag(const char *Cmd) {
 
 	iclass_block_t tag_data[USB_CMD_DATA_SIZE/12];
 
-	if ((endblock-startblock+1)*12 > USB_CMD_DATA_SIZE) {
+	if ((endblock - startblock + 1) * 12 > USB_CMD_DATA_SIZE) {
 		PrintAndLogEx(NORMAL, "Trying to write too many blocks at once.  Max: %d", USB_CMD_DATA_SIZE/8);
 	}
 	// file handling and reading
-	f = fopen(filename,"rb");
+	f = fopen(filename, "rb");
 	if(!f) {
 		PrintAndLogEx(WARNING, "failed to read file '%s'", filename);
 		return 1;
 	}
 
-	if (startblock<5) {
+	if (startblock < 5) {
 		PrintAndLogEx(WARNING, "you cannot write key blocks this way. yet... make your start block > 4");
 		fclose(f);
 		return 0;
@@ -1480,12 +1455,10 @@ int CmdHFiClass_ReadBlock(const char *Cmd) {
 	bool verbose = false;
 	uint8_t cmdp = 0;
 	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch (param_getchar(Cmd, cmdp)) {
+		switch (tolower(param_getchar(Cmd, cmdp))) {
 		case 'h':
-		case 'H':
 			return usage_hf_iclass_readblock();
 		case 'b':
-		case 'B':
 			if (param_gethex(Cmd, cmdp+1, &blockno, 2)) {
 				PrintAndLogEx(WARNING, "Block No must include 2 HEX symbols\n");
 				errors = true;
@@ -1493,17 +1466,14 @@ int CmdHFiClass_ReadBlock(const char *Cmd) {
 			cmdp += 2;
 			break;
 		case 'c':
-		case 'C':
 			keyType = 0x18;
 			cmdp++;
 			break;
 		case 'e':
-		case 'E':
 			elite = true;
 			cmdp++;
 			break;
 		case 'k':
-		case 'K':
 			auth = true;
 			dataLen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
 			if (dataLen == 16) {
@@ -1523,12 +1493,10 @@ int CmdHFiClass_ReadBlock(const char *Cmd) {
 			cmdp += 2;
 			break;
 		case 'r':
-		case 'R':
 			rawkey = true;
 			cmdp++;
 			break;
 		case 'v':
-		case 'V':
 			verbose = true;
 			cmdp++;
 			break;
@@ -1546,7 +1514,7 @@ int CmdHFiClass_ReadBlock(const char *Cmd) {
 }
 
 int CmdHFiClass_loclass(const char *Cmd) {
-	char opt = param_getchar(Cmd, 0);
+	char opt = tolower(param_getchar(Cmd, 0));
 
 	if (strlen(Cmd)<1 || opt == 'h')
 		usage_hf_iclass_loclass();
@@ -1617,15 +1585,15 @@ int CmdHFiClassReadTagFile(const char *Cmd) {
 	if (param_getstr(Cmd, 1, tempnum, sizeof(tempnum)) < 1)
 		startblock = 0;
 	else
-		sscanf(tempnum,"%d",&startblock);
+		sscanf(tempnum, "%d", &startblock);
 
 	if (param_getstr(Cmd,2, tempnum, sizeof(tempnum)) < 1)
 		endblock = 0;
 	else
-		sscanf(tempnum,"%d",&endblock);
+		sscanf(tempnum, "%d", &endblock);
 
 	// file handling and reading
-	f = fopen(filename,"rb");
+	f = fopen(filename, "rb");
 	if(!f) {
 		PrintAndLogEx(WARNING, "Failed to read from file '%s'", filename);
 		return 1;
@@ -1711,13 +1679,11 @@ int CmdHFiClassCalcNewKey(const char *Cmd) {
 	bool elite = false;
 	bool errors = false;
 	uint8_t cmdp = 0;
-	while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch(param_getchar(Cmd, cmdp)) {
+	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+		switch (tolower(param_getchar(Cmd, cmdp))) {
 		case 'h':
-		case 'H':
 			return usage_hf_iclass_calc_newkey();
 		case 'e':
-		case 'E':
 			dataLen = param_getstr(Cmd, cmdp, tempStr, sizeof(tempStr));
 			if (dataLen==2)
 				oldElite = true;
@@ -1725,7 +1691,6 @@ int CmdHFiClassCalcNewKey(const char *Cmd) {
 			cmdp++;
 			break;
 		case 'n':
-		case 'N':
 			dataLen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
 			if (dataLen == 16) {
 				errors = param_gethex(tempStr, 0, NEWKEY, dataLen);
@@ -1744,7 +1709,6 @@ int CmdHFiClassCalcNewKey(const char *Cmd) {
 			cmdp += 2;
 			break;
 		case 'o':
-		case 'O':
 			dataLen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
 			if (dataLen == 16) {
 				errors = param_gethex(tempStr, 0, OLDKEY, dataLen);
@@ -1763,7 +1727,6 @@ int CmdHFiClassCalcNewKey(const char *Cmd) {
 			cmdp += 2;
 			break;
 		case 's':
-		case 'S':
 			givenCSN = true;
 			if (param_gethex(Cmd, cmdp+1, CSN, 16))
 				return usage_hf_iclass_calc_newkey();
@@ -1787,7 +1750,7 @@ int CmdHFiClassCalcNewKey(const char *Cmd) {
 
 static int loadKeys(char *filename) {
 	FILE *f;
-	f = fopen(filename,"rb");
+	f = fopen(filename, "rb");
 	if(!f) {
 		PrintAndLogEx(WARNING, "Failed to read from file '%s'", filename);
 		return 0;
@@ -1826,7 +1789,7 @@ static int loadKeys(char *filename) {
 
 static int saveKeys(char *filename) {
 	FILE *f;
-	f = fopen(filename,"wb");
+	f = fopen(filename, "wb");
 	if (!f) {
 		PrintAndLogEx(NORMAL, "[!] error opening file %s\n",filename);
 		return 0;
@@ -1860,13 +1823,11 @@ int CmdHFiClassManageKeys(const char *Cmd) {
 	char tempStr[20];
 	uint8_t cmdp = 0;
 
-	while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch(param_getchar(Cmd, cmdp)) {
+	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+		switch (tolower(param_getchar(Cmd, cmdp))) {
 		case 'h':
-		case 'H':
 			return usage_hf_iclass_managekeys();
 		case 'f':
-		case 'F':
 			fileNameLen = param_getstr(Cmd, cmdp+1, filename, sizeof(filename));
 			if (fileNameLen < 1) {
 				PrintAndLogEx(WARNING, "No filename found after f");
@@ -1875,7 +1836,6 @@ int CmdHFiClassManageKeys(const char *Cmd) {
 			cmdp += 2;
 			break;
 		case 'n':
-		case 'N':
 			keyNbr = param_get8(Cmd, cmdp+1);
 			if (keyNbr >= ICLASS_KEYS_MAX) {
 				PrintAndLogEx(WARNING, "Invalid block number");
@@ -1884,7 +1844,6 @@ int CmdHFiClassManageKeys(const char *Cmd) {
 			cmdp += 2;
 			break;
 		case 'k':
-		case 'K':
 			operation += 3; //set key
 			dataLen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
 			if (dataLen == 16) { //ul-c or ev1/ntag key length
@@ -1896,17 +1855,14 @@ int CmdHFiClassManageKeys(const char *Cmd) {
 			cmdp += 2;
 			break;
 		case 'p':
-		case 'P':
 			operation += 4; //print keys in memory
 			cmdp++;
 			break;
 		case 'l':
-		case 'L':
 			operation += 5; //load keys from file
 			cmdp++;
 			break;
 		case 's':
-		case 'S':
 			operation += 6; //save keys to file
 			cmdp++;
 			break;
@@ -2491,10 +2447,10 @@ int CmdHFiClassPermuteKey(const char *Cmd) {
 	uint8_t data[16] = {0};
 	bool isReverse = false;
 	int len = 0;
-	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) == 0|| cmdp == 'h' || cmdp == 'H') return usage_hf_iclass_permutekey();
+	char cmdp = tolower(param_getchar(Cmd, 0));
+	if (strlen(Cmd) == 0|| cmdp == 'h') return usage_hf_iclass_permutekey();
 
-	isReverse = ( cmdp == 'r' || cmdp == 'R' );
+	isReverse = ( cmdp == 'r' );
 
 	param_gethex_ex(Cmd, 1, data, &len);
 	if ( len%2 ) return usage_hf_iclass_permutekey();

From 0d9223a5472dc90e225be6fefc7c2fd591994c00 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 9 Mar 2019 23:35:06 +0100
Subject: [PATCH 0714/1938] client: fix mix of spaces & tabs

---
 Makefile                                     |    2 +-
 client/amiitool/amiibo.c                     |  226 +-
 client/amiitool/amiibo.h                     |    4 +-
 client/amiitool/amiitool.c                   |  274 +-
 client/amiitool/drbg.c                       |   90 +-
 client/amiitool/drbg.h                       |   14 +-
 client/amiitool/keygen.c                     |   56 +-
 client/amiitool/keygen.h                     |   18 +-
 client/cliparser/argtable3.c                 | 1768 +++---
 client/cliparser/cliparser.c                 |  262 +-
 client/cliparser/getopt.h                    |   44 +-
 client/cmdanalyse.c                          | 1262 ++--
 client/cmdanalyse.h                          |   10 +-
 client/cmdcrc.c                              |  736 +--
 client/cmddata.c                             | 3076 +++++-----
 client/cmddata.h                             |    2 +-
 client/cmdflashmem.c                         |  858 +--
 client/cmdflashmem.h                         |   14 +-
 client/cmdhf.c                               |  196 +-
 client/cmdhf.h                               |   26 +-
 client/cmdhf14a.c                            | 1988 +++----
 client/cmdhf14a.h                            |    6 +-
 client/cmdhf14b.c                            | 1490 ++---
 client/cmdhf14b.h                            |    4 +-
 client/cmdhf15.c                             | 1900 +++---
 client/cmdhf15.h                             |    6 +-
 client/cmdhfepa.c                            |  272 +-
 client/cmdhffelica.c                         |  704 +--
 client/cmdhffelica.h                         |    6 +-
 client/cmdhffido.c                           | 1428 ++---
 client/cmdhficlass.c                         | 4112 ++++++-------
 client/cmdhficlass.h                         |   10 +-
 client/cmdhflegic.c                          | 2036 +++----
 client/cmdhflist.c                           | 1400 ++---
 client/cmdhflist.h                           |   50 +-
 client/cmdhfmf.c                             | 5546 +++++++++---------
 client/cmdhfmf.h                             |   16 +-
 client/cmdhfmfdes.c                          | 1000 ++--
 client/cmdhfmfdes.h                          |  190 +-
 client/cmdhfmfdesfire.c                      |   24 +-
 client/cmdhfmfhard.c                         | 3478 +++++------
 client/cmdhfmfhard.h                         |   34 +-
 client/cmdhfmfp.c                            | 1316 ++---
 client/cmdhfmfu.c                            | 4000 ++++++-------
 client/cmdhfmfu.h                            |   76 +-
 client/cmdhftopaz.c                          |  714 +--
 client/cmdhw.c                               |  462 +-
 client/cmdlf.c                               | 1594 ++---
 client/cmdlf.h                               |   66 +-
 client/cmdlfawid.c                           |  904 +--
 client/cmdlfawid.h                           |    4 +-
 client/cmdlfcotag.c                          |  144 +-
 client/cmdlfcotag.h                          |    6 +-
 client/cmdlfem4x.c                           | 2148 +++----
 client/cmdlffdx.c                            |  536 +-
 client/cmdlffdx.h                            |    8 +-
 client/cmdlfguard.c                          |  506 +-
 client/cmdlfhid.c                            |  888 +--
 client/cmdlfhid.h                            |    4 +-
 client/cmdlfhitag.c                          |  648 +-
 client/cmdlfindala.c                         |  764 +--
 client/cmdlfindala.h                         |    2 +-
 client/cmdlfio.c                             |  506 +-
 client/cmdlfjablotron.c                      |  320 +-
 client/cmdlfkeri.c                           |  318 +-
 client/cmdlfnedap.c                          |  428 +-
 client/cmdlfnexwatch.c                       |  132 +-
 client/cmdlfnoralsy.c                        |  352 +-
 client/cmdlfpac.c                            |  100 +-
 client/cmdlfparadox.c                        |  258 +-
 client/cmdlfpcf7931.c                        |  192 +-
 client/cmdlfpcf7931.h                        |   10 +-
 client/cmdlfpresco.c                         |  358 +-
 client/cmdlfpyramid.c                        |  514 +-
 client/cmdlfsecurakey.c                      |  176 +-
 client/cmdlft55xx.c                          | 3278 +++++------
 client/cmdlft55xx.h                          |  150 +-
 client/cmdlfti.c                             |  356 +-
 client/cmdlfviking.c                         |  216 +-
 client/cmdlfvisa2000.c                       |  296 +-
 client/cmdmain.c                             |   62 +-
 client/cmdmain.h                             |    6 +-
 client/cmdparser.c                           |  178 +-
 client/cmdscript.c                           |   72 +-
 client/cmdsmartcard.c                        | 1708 +++---
 client/cmdsmartcard.h                        |   10 +-
 client/cmdtrace.c                            |  934 +--
 client/cmdtrace.h                            |   16 +-
 client/comms.c                               |  590 +-
 client/comms.h                               |   16 +-
 client/crypto/asn1dump.c                     |  520 +-
 client/crypto/asn1utils.c                    |   98 +-
 client/crypto/libpcrypto.c                   |  482 +-
 client/elf.h                                 |   44 +-
 client/emv/apduinfo.c                        |  570 +-
 client/emv/apduinfo.h                        |   16 +-
 client/emv/cmdemv.c                          | 3298 +++++------
 client/emv/crypto.c                          |  136 +-
 client/emv/crypto.h                          |    8 +-
 client/emv/crypto_backend.h                  |   30 +-
 client/emv/crypto_polarssl.c                 |  386 +-
 client/emv/dol.c                             |  156 +-
 client/emv/dump.c                            |   48 +-
 client/emv/emv_pk.c                          |  680 +--
 client/emv/emv_pk.h                          |   26 +-
 client/emv/emv_pki.c                         |  804 +--
 client/emv/emv_pki.h                         |   18 +-
 client/emv/emv_pki_priv.c                    |  364 +-
 client/emv/emv_pki_priv.h                    |    4 +-
 client/emv/emv_roca.c                        |  188 +-
 client/emv/emv_roca.h                        |    2 +-
 client/emv/emv_tags.c                        | 1340 ++---
 client/emv/emvcore.c                         | 1612 ++---
 client/emv/emvcore.h                         |   38 +-
 client/emv/emvjson.c                         |  492 +-
 client/emv/emvjson.h                         |    4 +-
 client/emv/test/cda_test.c                   |  618 +-
 client/emv/test/crypto_test.c                |  460 +-
 client/emv/test/cryptotest.c                 |   92 +-
 client/emv/test/dda_test.c                   |  538 +-
 client/emv/test/sda_test.c                   |  364 +-
 client/emv/tlv.c                             |  690 +--
 client/emv/tlv.h                             |    6 +-
 client/fido/additional_ca.c                  |   46 +-
 client/fido/cbortools.c                      |  680 +--
 client/fido/cose.c                           |  334 +-
 client/fido/fidocore.c                       | 1236 ++--
 client/fido/fidocore.h                       |   22 +-
 client/flash.c                               |  714 +--
 client/flash.h                               |   14 +-
 client/flasher.c                             |  136 +-
 client/fpga_compress.c                       |  700 +--
 client/graph.c                               |  330 +-
 client/guidummy.cpp                          |   10 +-
 client/hardnested/hardnested_bf_core.c       |  558 +-
 client/hardnested/hardnested_bf_core.h       |   16 +-
 client/hardnested/hardnested_bitarray_core.c |  502 +-
 client/hardnested/hardnested_bruteforce.c    |  576 +-
 client/hardnested/hardnested_bruteforce.h    |    6 +-
 client/hardnested/hardnested_tables.c        |  860 +--
 client/hid-flasher/elf.h                     |   44 +-
 client/hid-flasher/flash.c                   |  704 +--
 client/hid-flasher/flash.h                   |   14 +-
 client/hid-flasher/flasher.c                 |  112 +-
 client/hid-flasher/proxendian.h              |    4 +-
 client/hid-flasher/proxusb.c                 |  114 +-
 client/hid-flasher/usb_cmd.h                 |  104 +-
 client/jansson/error.c                       |    2 +-
 client/jansson/jansson.h                     |    8 +-
 client/loclass/cipher.c                      |  296 +-
 client/loclass/cipherutils.c                 |  250 +-
 client/loclass/cipherutils.h                 |   12 +-
 client/loclass/elite_crack.c                 |  648 +-
 client/loclass/elite_crack.h                 |   26 +-
 client/loclass/fileutils.c                   |  716 +--
 client/loclass/fileutils.h                   |    8 +-
 client/loclass/ikeys.c                       | 1046 ++--
 client/loclass/ikeys.h                       |    6 +-
 client/loclass/main.c                        |  112 +-
 client/mifare/mad.c                          |  364 +-
 client/mifare/mad.h                          |    4 +-
 client/mifare/mfkey.c                        |  238 +-
 client/mifare/mifare4.c                      |  634 +-
 client/mifare/mifare4.h                      |   36 +-
 client/mifare/mifaredefault.h                |   46 +-
 client/mifare/mifarehost.c                   | 1478 ++---
 client/mifare/mifarehost.h                   |   62 +-
 client/mifare/ndef.c                         |  524 +-
 client/mifare/ndef.h                         |   60 +-
 client/pm3_binlib.c                          |  134 +-
 client/pm3_bitlib.c                          |   10 +-
 client/proxendian.h                          |    4 +-
 client/proxgui.cpp                           |   42 +-
 client/proxguiqt.cpp                         |  912 +--
 client/proxguiqt.h                           |  166 +-
 client/proxmark3.c                           |  520 +-
 client/reveng/bmpbit.c                       |   58 +-
 client/reveng/cli.c                          | 1004 ++--
 client/reveng/config.h                       |    8 +-
 client/reveng/getopt.c                       |   62 +-
 client/reveng/model.c                        |  326 +-
 client/reveng/poly.c                         | 1746 +++---
 client/reveng/preset.c                       | 1352 ++---
 client/reveng/reveng.c                       |  760 +--
 client/reveng/reveng.h                       |   20 +-
 client/scandir.c                             |  100 +-
 client/scripting.c                           |  590 +-
 client/scripting.h                           |    6 +-
 client/ui.c                                  |  298 +-
 client/usb_cmd_h2lua.awk                     |   14 +-
 client/util.c                                |  796 +--
 client/util.h                                |  128 +-
 client/util_darwin.m                         |   26 +-
 client/util_posix.c                          |  148 +-
 client/util_posix.h                          |    4 +-
 client/whereami.c                            |    2 +-
 common/protocols.h                           |    6 +-
 197 files changed, 49383 insertions(+), 49383 deletions(-)

diff --git a/Makefile b/Makefile
index 93ee2d19c..bf298e652 100644
--- a/Makefile
+++ b/Makefile
@@ -89,7 +89,7 @@ endif
 print-%: ; @echo $* = $($*) 
 
 style:
-	find . \( -name "*.[ch]" -or -name "*.cpp" \) -exec perl -pi -e 's/[ \t\r]+$$//' {} \;
+	find . \( -name "*.[ch]" -or -name "*.cpp" -or -name "*.lua" \) -exec perl -pi -e 's/[ \t\r]+$$//' {} \;
 
 # Dummy target to test for GNU make availability
 _test:
diff --git a/client/amiitool/amiibo.c b/client/amiitool/amiibo.c
index 85b7b226a..24a9f158d 100644
--- a/client/amiitool/amiibo.c
+++ b/client/amiitool/amiibo.c
@@ -13,168 +13,168 @@
 #define HMAC_POS_TAG 0x1B4
 
 void nfc3d_amiibo_calc_seed(const uint8_t * dump, uint8_t * key) {
-	memcpy(key + 0x00, dump + 0x029, 0x02);
-	memset(key + 0x02, 0x00, 0x0E);
-	memcpy(key + 0x10, dump + 0x1D4, 0x08);
-	memcpy(key + 0x18, dump + 0x1D4, 0x08);
-	memcpy(key + 0x20, dump + 0x1E8, 0x20);
+    memcpy(key + 0x00, dump + 0x029, 0x02);
+    memset(key + 0x02, 0x00, 0x0E);
+    memcpy(key + 0x10, dump + 0x1D4, 0x08);
+    memcpy(key + 0x18, dump + 0x1D4, 0x08);
+    memcpy(key + 0x20, dump + 0x1E8, 0x20);
 }
 
 void nfc3d_amiibo_keygen(const nfc3d_keygen_masterkeys * masterKeys, const uint8_t * dump, nfc3d_keygen_derivedkeys * derivedKeys) {
-	uint8_t seed[NFC3D_KEYGEN_SEED_SIZE];
+    uint8_t seed[NFC3D_KEYGEN_SEED_SIZE];
 
-	nfc3d_amiibo_calc_seed(dump, seed);
-	nfc3d_keygen(masterKeys, seed, derivedKeys);
+    nfc3d_amiibo_calc_seed(dump, seed);
+    nfc3d_keygen(masterKeys, seed, derivedKeys);
 }
 
 void nfc3d_amiibo_cipher(const nfc3d_keygen_derivedkeys * keys, const uint8_t * in, uint8_t * out) {
-	mbedtls_aes_context aes;
-	size_t nc_off = 0;
-	unsigned char nonce_counter[16];
-	unsigned char stream_block[16];
+    mbedtls_aes_context aes;
+    size_t nc_off = 0;
+    unsigned char nonce_counter[16];
+    unsigned char stream_block[16];
 
-	mbedtls_aes_setkey_enc( &aes, keys->aesKey, 128 );
-	memset(nonce_counter, 0, sizeof(nonce_counter));
-	memset(stream_block, 0, sizeof(stream_block));
-	memcpy(nonce_counter, keys->aesIV, sizeof(nonce_counter));
-	mbedtls_aes_crypt_ctr( &aes, 0x188, &nc_off, nonce_counter, stream_block, in + 0x02C, out + 0x02C );
+    mbedtls_aes_setkey_enc( &aes, keys->aesKey, 128 );
+    memset(nonce_counter, 0, sizeof(nonce_counter));
+    memset(stream_block, 0, sizeof(stream_block));
+    memcpy(nonce_counter, keys->aesIV, sizeof(nonce_counter));
+    mbedtls_aes_crypt_ctr( &aes, 0x188, &nc_off, nonce_counter, stream_block, in + 0x02C, out + 0x02C );
 
-	memcpy(out + 0x000, in + 0x000, 0x008);
-	// Data signature NOT copied
-	memcpy(out + 0x028, in + 0x028, 0x004);
-	// Tag signature NOT copied
-	memcpy(out + 0x1D4, in + 0x1D4, 0x034);
+    memcpy(out + 0x000, in + 0x000, 0x008);
+    // Data signature NOT copied
+    memcpy(out + 0x028, in + 0x028, 0x004);
+    // Tag signature NOT copied
+    memcpy(out + 0x1D4, in + 0x1D4, 0x034);
 }
 
 void nfc3d_amiibo_tag_to_internal(const uint8_t * tag, uint8_t * intl) {
-	memcpy(intl + 0x000, tag + 0x008, 0x008);
-	memcpy(intl + 0x008, tag + 0x080, 0x020);
-	memcpy(intl + 0x028, tag + 0x010, 0x024);
-	memcpy(intl + 0x04C, tag + 0x0A0, 0x168);
-	memcpy(intl + 0x1B4, tag + 0x034, 0x020);
-	memcpy(intl + 0x1D4, tag + 0x000, 0x008);
-	memcpy(intl + 0x1DC, tag + 0x054, 0x02C);
+    memcpy(intl + 0x000, tag + 0x008, 0x008);
+    memcpy(intl + 0x008, tag + 0x080, 0x020);
+    memcpy(intl + 0x028, tag + 0x010, 0x024);
+    memcpy(intl + 0x04C, tag + 0x0A0, 0x168);
+    memcpy(intl + 0x1B4, tag + 0x034, 0x020);
+    memcpy(intl + 0x1D4, tag + 0x000, 0x008);
+    memcpy(intl + 0x1DC, tag + 0x054, 0x02C);
 }
 
 void nfc3d_amiibo_internal_to_tag(const uint8_t * intl, uint8_t * tag) {
-	memcpy(tag + 0x008, intl + 0x000, 0x008);
-	memcpy(tag + 0x080, intl + 0x008, 0x020);
-	memcpy(tag + 0x010, intl + 0x028, 0x024);
-	memcpy(tag + 0x0A0, intl + 0x04C, 0x168);
-	memcpy(tag + 0x034, intl + 0x1B4, 0x020);
-	memcpy(tag + 0x000, intl + 0x1D4, 0x008);
-	memcpy(tag + 0x054, intl + 0x1DC, 0x02C);
+    memcpy(tag + 0x008, intl + 0x000, 0x008);
+    memcpy(tag + 0x080, intl + 0x008, 0x020);
+    memcpy(tag + 0x010, intl + 0x028, 0x024);
+    memcpy(tag + 0x0A0, intl + 0x04C, 0x168);
+    memcpy(tag + 0x034, intl + 0x1B4, 0x020);
+    memcpy(tag + 0x000, intl + 0x1D4, 0x008);
+    memcpy(tag + 0x054, intl + 0x1DC, 0x02C);
 }
 
 bool nfc3d_amiibo_unpack(const nfc3d_amiibo_keys * amiiboKeys, const uint8_t * tag, uint8_t * plain) {
-	uint8_t internal[NFC3D_AMIIBO_SIZE];
-	nfc3d_keygen_derivedkeys dataKeys;
-	nfc3d_keygen_derivedkeys tagKeys;
+    uint8_t internal[NFC3D_AMIIBO_SIZE];
+    nfc3d_keygen_derivedkeys dataKeys;
+    nfc3d_keygen_derivedkeys tagKeys;
 
-	// Convert format
-	nfc3d_amiibo_tag_to_internal(tag, internal);
+    // Convert format
+    nfc3d_amiibo_tag_to_internal(tag, internal);
 
-	// Generate keys
-	nfc3d_amiibo_keygen(&amiiboKeys->data, internal, &dataKeys);
-	nfc3d_amiibo_keygen(&amiiboKeys->tag, internal, &tagKeys);
+    // Generate keys
+    nfc3d_amiibo_keygen(&amiiboKeys->data, internal, &dataKeys);
+    nfc3d_amiibo_keygen(&amiiboKeys->tag, internal, &tagKeys);
 
-	// Decrypt
-	nfc3d_amiibo_cipher(&dataKeys, internal, plain);
+    // Decrypt
+    nfc3d_amiibo_cipher(&dataKeys, internal, plain);
 
-	// Regenerate tag HMAC. Note: order matters, data HMAC depends on tag HMAC!
-	mbedtls_md_hmac( mbedtls_md_info_from_type(MBEDTLS_MD_SHA256), tagKeys.hmacKey, sizeof(tagKeys.hmacKey),
-			 plain + 0x1D4, 0x34, plain + HMAC_POS_TAG );
+    // Regenerate tag HMAC. Note: order matters, data HMAC depends on tag HMAC!
+    mbedtls_md_hmac( mbedtls_md_info_from_type(MBEDTLS_MD_SHA256), tagKeys.hmacKey, sizeof(tagKeys.hmacKey),
+             plain + 0x1D4, 0x34, plain + HMAC_POS_TAG );
 
-	// Regenerate data HMAC
-	mbedtls_md_hmac( mbedtls_md_info_from_type(MBEDTLS_MD_SHA256), dataKeys.hmacKey, sizeof(dataKeys.hmacKey),
-			 plain + 0x029, 0x1DF, plain + HMAC_POS_DATA );
+    // Regenerate data HMAC
+    mbedtls_md_hmac( mbedtls_md_info_from_type(MBEDTLS_MD_SHA256), dataKeys.hmacKey, sizeof(dataKeys.hmacKey),
+             plain + 0x029, 0x1DF, plain + HMAC_POS_DATA );
 
-	return
-			memcmp(plain + HMAC_POS_DATA, internal + HMAC_POS_DATA, 32) == 0 &&
-			memcmp(plain + HMAC_POS_TAG, internal + HMAC_POS_TAG, 32) == 0;
+    return
+            memcmp(plain + HMAC_POS_DATA, internal + HMAC_POS_DATA, 32) == 0 &&
+            memcmp(plain + HMAC_POS_TAG, internal + HMAC_POS_TAG, 32) == 0;
 }
 
 void nfc3d_amiibo_pack(const nfc3d_amiibo_keys * amiiboKeys, const uint8_t * plain, uint8_t * tag) {
-	uint8_t cipher[NFC3D_AMIIBO_SIZE];
-	nfc3d_keygen_derivedkeys tagKeys;
-	nfc3d_keygen_derivedkeys dataKeys;
+    uint8_t cipher[NFC3D_AMIIBO_SIZE];
+    nfc3d_keygen_derivedkeys tagKeys;
+    nfc3d_keygen_derivedkeys dataKeys;
 
-	// Generate keys
-	nfc3d_amiibo_keygen(&amiiboKeys->tag, plain, &tagKeys);
-	nfc3d_amiibo_keygen(&amiiboKeys->data, plain, &dataKeys);
+    // Generate keys
+    nfc3d_amiibo_keygen(&amiiboKeys->tag, plain, &tagKeys);
+    nfc3d_amiibo_keygen(&amiiboKeys->data, plain, &dataKeys);
 
-	// Generate tag HMAC
-	mbedtls_md_hmac( mbedtls_md_info_from_type(MBEDTLS_MD_SHA256), tagKeys.hmacKey, sizeof(tagKeys.hmacKey),
-			 plain + 0x1D4, 0x34, cipher + HMAC_POS_TAG );
+    // Generate tag HMAC
+    mbedtls_md_hmac( mbedtls_md_info_from_type(MBEDTLS_MD_SHA256), tagKeys.hmacKey, sizeof(tagKeys.hmacKey),
+             plain + 0x1D4, 0x34, cipher + HMAC_POS_TAG );
 
-	// Init mbedtls HMAC context
-	mbedtls_md_context_t ctx;
-	mbedtls_md_init( &ctx );
-	mbedtls_md_setup( &ctx, mbedtls_md_info_from_type(MBEDTLS_MD_SHA256), 1 );
+    // Init mbedtls HMAC context
+    mbedtls_md_context_t ctx;
+    mbedtls_md_init( &ctx );
+    mbedtls_md_setup( &ctx, mbedtls_md_info_from_type(MBEDTLS_MD_SHA256), 1 );
 
-	// Generate data HMAC
-	mbedtls_md_hmac_starts( &ctx, dataKeys.hmacKey, sizeof(dataKeys.hmacKey) );
-	mbedtls_md_hmac_update( &ctx, plain + 0x029, 0x18B ); // Data
-	mbedtls_md_hmac_update( &ctx, cipher + HMAC_POS_TAG, 0x20 ); // Tag HMAC
-	mbedtls_md_hmac_update( &ctx, plain + 0x1D4, 0x34 ); // Here be dragons
+    // Generate data HMAC
+    mbedtls_md_hmac_starts( &ctx, dataKeys.hmacKey, sizeof(dataKeys.hmacKey) );
+    mbedtls_md_hmac_update( &ctx, plain + 0x029, 0x18B ); // Data
+    mbedtls_md_hmac_update( &ctx, cipher + HMAC_POS_TAG, 0x20 ); // Tag HMAC
+    mbedtls_md_hmac_update( &ctx, plain + 0x1D4, 0x34 ); // Here be dragons
 
-	mbedtls_md_hmac_finish( &ctx, cipher + HMAC_POS_DATA );
+    mbedtls_md_hmac_finish( &ctx, cipher + HMAC_POS_DATA );
 
-	// HMAC cleanup
-	mbedtls_md_free( &ctx );
+    // HMAC cleanup
+    mbedtls_md_free( &ctx );
 
-	// Encrypt
-	nfc3d_amiibo_cipher(&dataKeys, plain, cipher);
+    // Encrypt
+    nfc3d_amiibo_cipher(&dataKeys, plain, cipher);
 
-	// Convert back to hardware
-	nfc3d_amiibo_internal_to_tag(cipher, tag);
+    // Convert back to hardware
+    nfc3d_amiibo_internal_to_tag(cipher, tag);
 }
 
 bool nfc3d_amiibo_load_keys(nfc3d_amiibo_keys * amiiboKeys, const char * path) {
-	FILE * f = fopen(path, "rb");
-	if (!f) {
-		return false;
-	}
+    FILE * f = fopen(path, "rb");
+    if (!f) {
+        return false;
+    }
 
-	if (!fread(amiiboKeys, sizeof(*amiiboKeys), 1, f)) {
-		fclose(f);
-		return false;
-	}
-	fclose(f);
+    if (!fread(amiiboKeys, sizeof(*amiiboKeys), 1, f)) {
+        fclose(f);
+        return false;
+    }
+    fclose(f);
 
-	if (
-		(amiiboKeys->data.magicBytesSize > 16) ||
-		(amiiboKeys->tag.magicBytesSize > 16)
-	) {
-		return false;
-	}
+    if (
+        (amiiboKeys->data.magicBytesSize > 16) ||
+        (amiiboKeys->tag.magicBytesSize > 16)
+    ) {
+        return false;
+    }
 
-	return true;
+    return true;
 }
 
 void nfc3d_amiibo_copy_app_data(const uint8_t * src, uint8_t * dst) {
 
 
-	//uint16_t *ami_nb_wr = (uint16_t*)(dst + 0x29);
-	//uint16_t *cfg_nb_wr = (uint16_t*)(dst + 0xB4);
+    //uint16_t *ami_nb_wr = (uint16_t*)(dst + 0x29);
+    //uint16_t *cfg_nb_wr = (uint16_t*)(dst + 0xB4);
 
-	/* increment write counters */
-	//*ami_nb_wr = htobe16(be16toh(*ami_nb_wr) + 1);
-	//*cfg_nb_wr = htobe16(be16toh(*cfg_nb_wr) + 1);
+    /* increment write counters */
+    //*ami_nb_wr = htobe16(be16toh(*ami_nb_wr) + 1);
+    //*cfg_nb_wr = htobe16(be16toh(*cfg_nb_wr) + 1);
 
-	uint16_t ami_nb_wr =  ((uint16_t)bytes_to_num(dst + 0x29, 2)) + 1;
-	uint16_t cfg_nb_wr =  ((uint16_t)bytes_to_num(dst + 0xB4, 2)) + 1;
+    uint16_t ami_nb_wr =  ((uint16_t)bytes_to_num(dst + 0x29, 2)) + 1;
+    uint16_t cfg_nb_wr =  ((uint16_t)bytes_to_num(dst + 0xB4, 2)) + 1;
 
-	num_to_bytes(ami_nb_wr, 2, dst + 0x29);
-	num_to_bytes(cfg_nb_wr, 2, dst + 0xB4);
+    num_to_bytes(ami_nb_wr, 2, dst + 0x29);
+    num_to_bytes(cfg_nb_wr, 2, dst + 0xB4);
 
-	/* copy flags */
-	dst[0x2C] = src[0x2C];
-	/* copy programID */
-	memcpy(dst + 0xAC, src + 0xAC, 8);
-	/* copy AppID */
-	memcpy(dst + 0xB6, src + 0xB6, 4);
-	/* copy AppData */
-	memcpy(dst + 0xDC, src + 0xDC, 216);
+    /* copy flags */
+    dst[0x2C] = src[0x2C];
+    /* copy programID */
+    memcpy(dst + 0xAC, src + 0xAC, 8);
+    /* copy AppID */
+    memcpy(dst + 0xB6, src + 0xB6, 4);
+    /* copy AppData */
+    memcpy(dst + 0xDC, src + 0xDC, 216);
 }
 
diff --git a/client/amiitool/amiibo.h b/client/amiitool/amiibo.h
index 3c7dccc70..5b45e9b98 100644
--- a/client/amiitool/amiibo.h
+++ b/client/amiitool/amiibo.h
@@ -19,8 +19,8 @@
 
 #pragma pack(1)
 typedef struct {
-	nfc3d_keygen_masterkeys data;
-	nfc3d_keygen_masterkeys tag;
+    nfc3d_keygen_masterkeys data;
+    nfc3d_keygen_masterkeys tag;
 } nfc3d_amiibo_keys;
 #pragma pack()
 
diff --git a/client/amiitool/amiitool.c b/client/amiitool/amiitool.c
index 163e6529c..2643ffa36 100644
--- a/client/amiitool/amiitool.c
+++ b/client/amiitool/amiitool.c
@@ -15,161 +15,161 @@
 static char * self;
 
 void amiitool_usage() {
-	fprintf(stderr,
-		"amiitool build %i (commit %s-%08x)\n"
-		"by Marcos Del Sol Vives <marcos@dracon.es>\n"
-		"\n"
-		"Usage: %s (-e|-d|-c) -k keyfile [-i input] [-s input2] [-o output]\n"
-		"   -e encrypt and sign amiibo\n"
-		"   -d decrypt and test amiibo\n"
-		"   -c decrypt, copy AppData and encrypt amiibo\n"
-		"   -k key set file. For retail amiibo, use \"retail unfixed\" key set\n"
-		"   -i input file. If not specified, stdin will be used.\n"
-		"   -s input save file, save from this file will replace input file ones.\n"
-		"   -o output file. If not specified, stdout will be used.\n"
-		"   -l decrypt files with invalid signatures.\n",
-		, self
-	);
+    fprintf(stderr,
+        "amiitool build %i (commit %s-%08x)\n"
+        "by Marcos Del Sol Vives <marcos@dracon.es>\n"
+        "\n"
+        "Usage: %s (-e|-d|-c) -k keyfile [-i input] [-s input2] [-o output]\n"
+        "   -e encrypt and sign amiibo\n"
+        "   -d decrypt and test amiibo\n"
+        "   -c decrypt, copy AppData and encrypt amiibo\n"
+        "   -k key set file. For retail amiibo, use \"retail unfixed\" key set\n"
+        "   -i input file. If not specified, stdin will be used.\n"
+        "   -s input save file, save from this file will replace input file ones.\n"
+        "   -o output file. If not specified, stdout will be used.\n"
+        "   -l decrypt files with invalid signatures.\n",
+        , self
+    );
 }
 
 static bool LoadAmiikey(nfc3d_amiibo_keys keys, char* keyfile) {
 
-	if (!nfc3d_amiibo_load_keys(&keys, keyfile)) {
-		PrintAndLogEx(ERR, "Could not load keys from '%s'", keyfile);
-		return false;
-	}
-	return true;
+    if (!nfc3d_amiibo_load_keys(&keys, keyfile)) {
+        PrintAndLogEx(ERR, "Could not load keys from '%s'", keyfile);
+        return false;
+    }
+    return true;
 }
 
 int main(int argc, char ** argv) {
-	self = argv[0];
+    self = argv[0];
 
-	char * infile = NULL;
-	char * savefile = NULL;
-	char * outfile = NULL;
-	char * keyfile = NULL;
-	char op = '\0';
-	bool lenient = false;
+    char * infile = NULL;
+    char * savefile = NULL;
+    char * outfile = NULL;
+    char * keyfile = NULL;
+    char op = '\0';
+    bool lenient = false;
 
-	char c;
-	while ((c = getopt(argc, argv, "edci:s:o:k:l")) != -1) {
-		switch (c) {
-			case 'e':
-			case 'd':
-			case 'c':
-				op = c;
-				break;
-			case 'i':
-				infile = optarg;
-				break;
-			case 's':
-				savefile = optarg;
-				break;
-			case 'o':
-				outfile = optarg;
-				break;
-			case 'l':
-				lenient = true;
-				break;
-			default:
-				amiitool_usage();
-				return 2;
-		}
-	}
+    char c;
+    while ((c = getopt(argc, argv, "edci:s:o:k:l")) != -1) {
+        switch (c) {
+            case 'e':
+            case 'd':
+            case 'c':
+                op = c;
+                break;
+            case 'i':
+                infile = optarg;
+                break;
+            case 's':
+                savefile = optarg;
+                break;
+            case 'o':
+                outfile = optarg;
+                break;
+            case 'l':
+                lenient = true;
+                break;
+            default:
+                amiitool_usage();
+                return 2;
+        }
+    }
 
-	if (op == '\0' || keyfile == NULL) {
-		amiitool_usage();
-		return 1;
-	}
+    if (op == '\0' || keyfile == NULL) {
+        amiitool_usage();
+        return 1;
+    }
 
-	nfc3d_amiibo_keys amiiboKeys;
+    nfc3d_amiibo_keys amiiboKeys;
 
 
-	uint8_t original[NTAG215_SIZE];
-	uint8_t modified[NFC3D_AMIIBO_SIZE];
+    uint8_t original[NTAG215_SIZE];
+    uint8_t modified[NFC3D_AMIIBO_SIZE];
 
-	FILE * f = stdin;
-	if (infile) {
-		f = fopen(infile, "rb");
-		if (!f) {
-			fprintf(stderr, "Could not open input file\n");
-			return 3;
-		}
-	}
-	size_t readPages = fread(original, 4, NTAG215_SIZE / 4, f);
-	if (readPages < NFC3D_AMIIBO_SIZE / 4) {
-		fprintf(stderr, "Could not read from input\n");
-		fclose(f);
-		return 3;
-	}
-	fclose(f);
+    FILE * f = stdin;
+    if (infile) {
+        f = fopen(infile, "rb");
+        if (!f) {
+            fprintf(stderr, "Could not open input file\n");
+            return 3;
+        }
+    }
+    size_t readPages = fread(original, 4, NTAG215_SIZE / 4, f);
+    if (readPages < NFC3D_AMIIBO_SIZE / 4) {
+        fprintf(stderr, "Could not read from input\n");
+        fclose(f);
+        return 3;
+    }
+    fclose(f);
 
 
-	if (op == 'e') {
-		nfc3d_amiibo_pack(&amiiboKeys, original, modified);
-	} else if (op == 'd') {
-		if (!nfc3d_amiibo_unpack(&amiiboKeys, original, modified)) {
-			fprintf(stderr, "!!! WARNING !!!: Tag signature was NOT valid\n");
-			if (!lenient) {
-				return 6;
-			}
-		}
-	} else { /* copy */
-		uint8_t plain_base[NFC3D_AMIIBO_SIZE];
-		uint8_t plain_save[NFC3D_AMIIBO_SIZE];
+    if (op == 'e') {
+        nfc3d_amiibo_pack(&amiiboKeys, original, modified);
+    } else if (op == 'd') {
+        if (!nfc3d_amiibo_unpack(&amiiboKeys, original, modified)) {
+            fprintf(stderr, "!!! WARNING !!!: Tag signature was NOT valid\n");
+            if (!lenient) {
+                return 6;
+            }
+        }
+    } else { /* copy */
+        uint8_t plain_base[NFC3D_AMIIBO_SIZE];
+        uint8_t plain_save[NFC3D_AMIIBO_SIZE];
 
-		if (!nfc3d_amiibo_unpack(&amiiboKeys, original, plain_base)) {
-			fprintf(stderr, "!!! WARNING !!!: Tag signature was NOT valid\n");
-			if (!lenient) {
-				return 6;
-			}
-		}
-		if (savefile) {
-			f = fopen(savefile, "rb");
-			if (!f) {
-				fprintf(stderr, "Could not open save file\n");
-				return 3;
-			}
-		}
-		size_t readPages = fread(original, 4, NTAG215_SIZE / 4, f);
-		if (readPages < NFC3D_AMIIBO_SIZE / 4) {
-			fprintf(stderr, "Could not read from save\n");
-			fclose(f);
-			return 3;
-		}
-		fclose(f);
+        if (!nfc3d_amiibo_unpack(&amiiboKeys, original, plain_base)) {
+            fprintf(stderr, "!!! WARNING !!!: Tag signature was NOT valid\n");
+            if (!lenient) {
+                return 6;
+            }
+        }
+        if (savefile) {
+            f = fopen(savefile, "rb");
+            if (!f) {
+                fprintf(stderr, "Could not open save file\n");
+                return 3;
+            }
+        }
+        size_t readPages = fread(original, 4, NTAG215_SIZE / 4, f);
+        if (readPages < NFC3D_AMIIBO_SIZE / 4) {
+            fprintf(stderr, "Could not read from save\n");
+            fclose(f);
+            return 3;
+        }
+        fclose(f);
 
-		if (!nfc3d_amiibo_unpack(&amiiboKeys, original, plain_save)) {
-			fprintf(stderr, "!!! WARNING !!!: Tag signature was NOT valid\n");
-			if (!lenient) {
-				return 6;
-			}
-		}
+        if (!nfc3d_amiibo_unpack(&amiiboKeys, original, plain_save)) {
+            fprintf(stderr, "!!! WARNING !!!: Tag signature was NOT valid\n");
+            if (!lenient) {
+                return 6;
+            }
+        }
 
-		nfc3d_amiibo_copy_app_data(plain_save, plain_base);
-		nfc3d_amiibo_pack(&amiiboKeys, plain_base, modified);
-	}
+        nfc3d_amiibo_copy_app_data(plain_save, plain_base);
+        nfc3d_amiibo_pack(&amiiboKeys, plain_base, modified);
+    }
 
-	f = stdout;
-	if (outfile) {
-		f = fopen(outfile, "wb");
-		if (!f) {
-			fprintf(stderr, "Could not open output file\n");
-			return 4;
-		}
-	}
-	if (fwrite(modified, NFC3D_AMIIBO_SIZE, 1, f) != 1) {
-		fprintf(stderr, "Could not write to output\n");
-		fclose(f);
-		return 4;
-	}
-	if (readPages > NFC3D_AMIIBO_SIZE / 4) {
-		if (fwrite(original + NFC3D_AMIIBO_SIZE, readPages * 4 - NFC3D_AMIIBO_SIZE, 1, f) != 1) {
-			fprintf(stderr, "Could not write to output:\n");
-			fclose(f);
-			return 4;
-		}
-	}
-	fclose(f);
-	return 0;
+    f = stdout;
+    if (outfile) {
+        f = fopen(outfile, "wb");
+        if (!f) {
+            fprintf(stderr, "Could not open output file\n");
+            return 4;
+        }
+    }
+    if (fwrite(modified, NFC3D_AMIIBO_SIZE, 1, f) != 1) {
+        fprintf(stderr, "Could not write to output\n");
+        fclose(f);
+        return 4;
+    }
+    if (readPages > NFC3D_AMIIBO_SIZE / 4) {
+        if (fwrite(original + NFC3D_AMIIBO_SIZE, readPages * 4 - NFC3D_AMIIBO_SIZE, 1, f) != 1) {
+            fprintf(stderr, "Could not write to output:\n");
+            fclose(f);
+            return 4;
+        }
+    }
+    fclose(f);
+    return 0;
 }
diff --git a/client/amiitool/drbg.c b/client/amiitool/drbg.c
index d56366077..aaf0acef5 100644
--- a/client/amiitool/drbg.c
+++ b/client/amiitool/drbg.c
@@ -11,68 +11,68 @@
 #include <mbedtls/md.h>
 
 void nfc3d_drbg_init(nfc3d_drbg_ctx * ctx, const uint8_t * hmacKey, size_t hmacKeySize, const uint8_t * seed, size_t seedSize) {
-	assert(ctx != NULL);
-	assert(hmacKey != NULL);
-	assert(seed != NULL);
-	assert(seedSize <= NFC3D_DRBG_MAX_SEED_SIZE);
+    assert(ctx != NULL);
+    assert(hmacKey != NULL);
+    assert(seed != NULL);
+    assert(seedSize <= NFC3D_DRBG_MAX_SEED_SIZE);
 
-	// Initialize primitives
-	ctx->used = false;
-	ctx->iteration = 0;
-	ctx->bufferSize = sizeof(ctx->iteration) + seedSize;
+    // Initialize primitives
+    ctx->used = false;
+    ctx->iteration = 0;
+    ctx->bufferSize = sizeof(ctx->iteration) + seedSize;
 
-	// The 16-bit counter is prepended to the seed when hashing, so we'll leave 2 bytes at the start
-	memcpy(ctx->buffer + sizeof(uint16_t), seed, seedSize);
+    // The 16-bit counter is prepended to the seed when hashing, so we'll leave 2 bytes at the start
+    memcpy(ctx->buffer + sizeof(uint16_t), seed, seedSize);
 
-	// Initialize underlying HMAC context
-	mbedtls_md_init(&ctx->hmacCtx);
-	mbedtls_md_setup(&ctx->hmacCtx, mbedtls_md_info_from_type(MBEDTLS_MD_SHA256), 1);
-	mbedtls_md_hmac_starts(&ctx->hmacCtx, hmacKey, hmacKeySize);
+    // Initialize underlying HMAC context
+    mbedtls_md_init(&ctx->hmacCtx);
+    mbedtls_md_setup(&ctx->hmacCtx, mbedtls_md_info_from_type(MBEDTLS_MD_SHA256), 1);
+    mbedtls_md_hmac_starts(&ctx->hmacCtx, hmacKey, hmacKeySize);
 }
 
 void nfc3d_drbg_step(nfc3d_drbg_ctx * ctx, uint8_t * output) {
-	assert(ctx != NULL);
-	assert(output != NULL);
+    assert(ctx != NULL);
+    assert(output != NULL);
 
-	if (ctx->used) {
-		// If used at least once, reinitialize the HMAC
-		mbedtls_md_hmac_reset(&ctx->hmacCtx);
-	} else {
-		ctx->used = true;
-	}
+    if (ctx->used) {
+        // If used at least once, reinitialize the HMAC
+        mbedtls_md_hmac_reset(&ctx->hmacCtx);
+    } else {
+        ctx->used = true;
+    }
 
-	// Store counter in big endian, and increment it
-	ctx->buffer[0] = ctx->iteration >> 8;
-	ctx->buffer[1] = ctx->iteration >> 0;
-	ctx->iteration++;
+    // Store counter in big endian, and increment it
+    ctx->buffer[0] = ctx->iteration >> 8;
+    ctx->buffer[1] = ctx->iteration >> 0;
+    ctx->iteration++;
 
-	// Do HMAC magic
-	mbedtls_md_hmac_update(&ctx->hmacCtx, ctx->buffer, ctx->bufferSize);
-	mbedtls_md_hmac_finish(&ctx->hmacCtx, output);
+    // Do HMAC magic
+    mbedtls_md_hmac_update(&ctx->hmacCtx, ctx->buffer, ctx->bufferSize);
+    mbedtls_md_hmac_finish(&ctx->hmacCtx, output);
 }
 
 void nfc3d_drbg_cleanup(nfc3d_drbg_ctx * ctx) {
-	assert(ctx != NULL);
-	mbedtls_md_free(&ctx->hmacCtx);
+    assert(ctx != NULL);
+    mbedtls_md_free(&ctx->hmacCtx);
 }
 
 void nfc3d_drbg_generate_bytes(const uint8_t * hmacKey, size_t hmacKeySize, const uint8_t * seed, size_t seedSize, uint8_t * output, size_t outputSize) {
-	uint8_t temp[NFC3D_DRBG_OUTPUT_SIZE];
+    uint8_t temp[NFC3D_DRBG_OUTPUT_SIZE];
 
-	nfc3d_drbg_ctx rngCtx;
-	nfc3d_drbg_init(&rngCtx, hmacKey, hmacKeySize, seed, seedSize);
+    nfc3d_drbg_ctx rngCtx;
+    nfc3d_drbg_init(&rngCtx, hmacKey, hmacKeySize, seed, seedSize);
 
-	while (outputSize > 0) {
-		if (outputSize < NFC3D_DRBG_OUTPUT_SIZE) {
-			nfc3d_drbg_step(&rngCtx, temp);
-			memcpy(output, temp, outputSize);
-			break;
-		}
+    while (outputSize > 0) {
+        if (outputSize < NFC3D_DRBG_OUTPUT_SIZE) {
+            nfc3d_drbg_step(&rngCtx, temp);
+            memcpy(output, temp, outputSize);
+            break;
+        }
 
-		nfc3d_drbg_step(&rngCtx, output);
-		output += NFC3D_DRBG_OUTPUT_SIZE;
-		outputSize -= NFC3D_DRBG_OUTPUT_SIZE;
-	}
+        nfc3d_drbg_step(&rngCtx, output);
+        output += NFC3D_DRBG_OUTPUT_SIZE;
+        outputSize -= NFC3D_DRBG_OUTPUT_SIZE;
+    }
 
-	nfc3d_drbg_cleanup(&rngCtx);
+    nfc3d_drbg_cleanup(&rngCtx);
 }
diff --git a/client/amiitool/drbg.h b/client/amiitool/drbg.h
index 0e93abfc0..7b5bddc86 100644
--- a/client/amiitool/drbg.h
+++ b/client/amiitool/drbg.h
@@ -12,16 +12,16 @@
 #include <stdint.h>
 #include "mbedtls/md.h"
 
-#define NFC3D_DRBG_MAX_SEED_SIZE	480	/* Hardcoded max size in 3DS NFC module */
-#define NFC3D_DRBG_OUTPUT_SIZE		32	/* Every iteration generates 32 bytes */
+#define NFC3D_DRBG_MAX_SEED_SIZE 480 /* Hardcoded max size in 3DS NFC module */
+#define NFC3D_DRBG_OUTPUT_SIZE   32  /* Every iteration generates 32 bytes */
 
 typedef struct {
-	mbedtls_md_context_t hmacCtx;
-	bool used;
-	uint16_t iteration;
+    mbedtls_md_context_t hmacCtx;
+    bool used;
+    uint16_t iteration;
 
-	uint8_t buffer[sizeof(uint16_t) + NFC3D_DRBG_MAX_SEED_SIZE];
-	size_t bufferSize;
+    uint8_t buffer[sizeof(uint16_t) + NFC3D_DRBG_MAX_SEED_SIZE];
+    size_t bufferSize;
 } nfc3d_drbg_ctx;
 
 void nfc3d_drbg_init(nfc3d_drbg_ctx * ctx, const uint8_t * hmacKey, size_t hmacKeySize, const uint8_t * seed, size_t seedSize);
diff --git a/client/amiitool/keygen.c b/client/amiitool/keygen.c
index c82e3abee..1c0a91344 100644
--- a/client/amiitool/keygen.c
+++ b/client/amiitool/keygen.c
@@ -11,43 +11,43 @@
 #include <string.h>
 
 void nfc3d_keygen_prepare_seed(const nfc3d_keygen_masterkeys * baseKeys, const uint8_t * baseSeed, uint8_t * output, size_t * outputSize) {
-	assert(baseKeys != NULL);
-	assert(baseSeed != NULL);
-	assert(output != NULL);
-	assert(outputSize != NULL);
+    assert(baseKeys != NULL);
+    assert(baseSeed != NULL);
+    assert(output != NULL);
+    assert(outputSize != NULL);
 
-	uint8_t * start = output;
+    uint8_t * start = output;
 
-	// 1: Copy whole type string
-	output = memccpy(output, baseKeys->typeString, '\0', sizeof(baseKeys->typeString));
+    // 1: Copy whole type string
+    output = memccpy(output, baseKeys->typeString, '\0', sizeof(baseKeys->typeString));
 
-	// 2: Append (16 - magicBytesSize) from the input seed
-	size_t leadingSeedBytes = 16 - baseKeys->magicBytesSize;
-	memcpy(output, baseSeed, leadingSeedBytes);
-	output += leadingSeedBytes;
+    // 2: Append (16 - magicBytesSize) from the input seed
+    size_t leadingSeedBytes = 16 - baseKeys->magicBytesSize;
+    memcpy(output, baseSeed, leadingSeedBytes);
+    output += leadingSeedBytes;
 
-	// 3: Append all bytes from magicBytes
-	memcpy(output, baseKeys->magicBytes, baseKeys->magicBytesSize);
-	output += baseKeys->magicBytesSize;
+    // 3: Append all bytes from magicBytes
+    memcpy(output, baseKeys->magicBytes, baseKeys->magicBytesSize);
+    output += baseKeys->magicBytesSize;
 
-	// 4: Append bytes 0x10-0x1F from input seed
-	memcpy(output, baseSeed + 0x10, 16);
-	output += 16;
+    // 4: Append bytes 0x10-0x1F from input seed
+    memcpy(output, baseSeed + 0x10, 16);
+    output += 16;
 
-	// 5: Xor last bytes 0x20-0x3F of input seed with AES XOR pad and append them
-	unsigned int i;
-	for (i = 0; i < 32; i++) {
-		output[i] = baseSeed[i + 32] ^ baseKeys->xorPad[i];
-	}
-	output += 32;
+    // 5: Xor last bytes 0x20-0x3F of input seed with AES XOR pad and append them
+    unsigned int i;
+    for (i = 0; i < 32; i++) {
+        output[i] = baseSeed[i + 32] ^ baseKeys->xorPad[i];
+    }
+    output += 32;
 
-	*outputSize = output - start;
+    *outputSize = output - start;
 }
 
 void nfc3d_keygen(const nfc3d_keygen_masterkeys * baseKeys, const uint8_t * baseSeed, nfc3d_keygen_derivedkeys * derivedKeys) {
-	uint8_t preparedSeed[NFC3D_DRBG_MAX_SEED_SIZE];
-	size_t preparedSeedSize;
+    uint8_t preparedSeed[NFC3D_DRBG_MAX_SEED_SIZE];
+    size_t preparedSeedSize;
 
-	nfc3d_keygen_prepare_seed(baseKeys, baseSeed, preparedSeed, &preparedSeedSize);
-	nfc3d_drbg_generate_bytes(baseKeys->hmacKey, sizeof(baseKeys->hmacKey), preparedSeed, preparedSeedSize, (uint8_t *) derivedKeys, sizeof(*derivedKeys));
+    nfc3d_keygen_prepare_seed(baseKeys, baseSeed, preparedSeed, &preparedSeedSize);
+    nfc3d_drbg_generate_bytes(baseKeys->hmacKey, sizeof(baseKeys->hmacKey), preparedSeed, preparedSeedSize, (uint8_t *) derivedKeys, sizeof(*derivedKeys));
 }
diff --git a/client/amiitool/keygen.h b/client/amiitool/keygen.h
index 35595e3ef..5e371074e 100644
--- a/client/amiitool/keygen.h
+++ b/client/amiitool/keygen.h
@@ -14,18 +14,18 @@
 
 #pragma pack(1)
 typedef struct {
-	uint8_t hmacKey[16];
-	char typeString[14];
-	uint8_t rfu;
-	uint8_t magicBytesSize;
-	uint8_t magicBytes[16];
-	uint8_t xorPad[32];
+    uint8_t hmacKey[16];
+    char typeString[14];
+    uint8_t rfu;
+    uint8_t magicBytesSize;
+    uint8_t magicBytes[16];
+    uint8_t xorPad[32];
 } nfc3d_keygen_masterkeys;
 
 typedef struct {
-	const uint8_t aesKey[16];
-	const uint8_t aesIV[16];
-	const uint8_t hmacKey[16];
+    const uint8_t aesKey[16];
+    const uint8_t aesIV[16];
+    const uint8_t hmacKey[16];
 } nfc3d_keygen_derivedkeys;
 #pragma pack()
 
diff --git a/client/cliparser/argtable3.c b/client/cliparser/argtable3.c
index 7e3461b37..63e847be1 100644
--- a/client/cliparser/argtable3.c
+++ b/client/cliparser/argtable3.c
@@ -168,9 +168,9 @@ void dbg_printf(const char *fmt, ...)
 
 #include "getopt.h"
 
-/*	$Id: getopt_long.c,v 1.1 2009/10/16 19:50:28 rodney Exp rodney $	*/
-/*	$OpenBSD: getopt_long.c,v 1.23 2007/10/31 12:34:57 chl Exp $	*/
-/*	$NetBSD: getopt_long.c,v 1.15 2002/01/31 22:43:40 tv Exp $	*/
+/* $Id: getopt_long.c,v 1.1 2009/10/16 19:50:28 rodney Exp rodney $ */
+/* $OpenBSD: getopt_long.c,v 1.23 2007/10/31 12:34:57 chl Exp $     */
+/* $NetBSD: getopt_long.c,v 1.15 2002/01/31 22:43:40 tv Exp $       */
 
 /*
  * Copyright (c) 2002 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -231,33 +231,33 @@ void dbg_printf(const char *fmt, ...)
 #include <string.h>
 
 
-#define	REPLACE_GETOPT		/* use this getopt as the system getopt(3) */
+#define REPLACE_GETOPT  /* use this getopt as the system getopt(3) */
 
 #ifdef REPLACE_GETOPT
-int	opterr = 1;		/* if error message should be printed */
-int	optind = 1;		/* index into parent argv vector */
-int	optopt = '?';		/* character checked for validity */
-int	optreset;		/* reset getopt */
-char    *optarg;		/* argument associated with option */
+int opterr = 1;         /* if error message should be printed */
+int optind = 1;         /* index into parent argv vector */
+int optopt = '?';       /* character checked for validity */
+int optreset;           /* reset getopt */
+char *optarg;           /* argument associated with option */
 #endif
 
-#define PRINT_ERROR	((opterr) && (*options != ':'))
+#define PRINT_ERROR     ((opterr) && (*options != ':'))
 
-#define FLAG_PERMUTE	0x01	/* permute non-options to the end of argv */
-#define FLAG_ALLARGS	0x02	/* treat non-options as args to option "-1" */
-#define FLAG_LONGONLY	0x04	/* operate as getopt_long_only */
+#define FLAG_PERMUTE    0x01 /* permute non-options to the end of argv */
+#define FLAG_ALLARGS    0x02 /* treat non-options as args to option "-1" */
+#define FLAG_LONGONLY   0x04 /* operate as getopt_long_only */
 
 /* return values */
-#define	BADCH		(int)'?'
-#define	BADARG		((*options == ':') ? (int)':' : (int)'?')
-#define	INORDER 	(int)1
+#define BADCH           (int)'?'
+#define BADARG          ((*options == ':') ? (int)':' : (int)'?')
+#define INORDER         (int)1
 
-#define	EMSG		""
+#define EMSG            ""
 
 static int getopt_internal(int, char * const *, const char *,
-			   const struct option *, int *, int);
+               const struct option *, int *, int);
 static int parse_long_options(char * const *, const char *,
-			      const struct option *, int *, int);
+                  const struct option *, int *, int);
 static int gcd(int, int);
 static void permute_args(int, int, int, char * const *);
 
@@ -296,22 +296,22 @@ char opterrmsg[MAX_OPTER_MSG_SIZE]; /* buffer for the last error message */
 
 static void warnx(const char *fmt, ...)
 {
-	va_list ap;
-	va_start(ap, fmt);
+    va_list ap;
+    va_start(ap, fmt);
     /*
     Make sure opterrmsg is always zero-terminated despite the _vsnprintf()
     implementation specifics and manually suppress the warning.
     */
     memset(opterrmsg, 0, sizeof opterrmsg);
-	if (fmt != NULL)
+    if (fmt != NULL)
 #ifdef __STDC_WANT_SECURE_LIB__
         _vsnprintf_s(opterrmsg, MAX_OPTER_MSG_SIZE, sizeof(opterrmsg) - 1, fmt, ap);
 #else
         _vsnprintf(opterrmsg, sizeof(opterrmsg) - 1, fmt, ap);
 #endif
-	va_end(ap);
+    va_end(ap);
 
-	fprintf(stderr, "%s\n", opterrmsg);
+    fprintf(stderr, "%s\n", opterrmsg);
 }
 
 #else
@@ -325,16 +325,16 @@ static void warnx(const char *fmt, ...)
 static int
 gcd(int a, int b)
 {
-	int c;
+    int c;
 
-	c = a % b;
-	while (c != 0) {
-		a = b;
-		b = c;
-		c = a % b;
-	}
+    c = a % b;
+    while (c != 0) {
+        a = b;
+        b = c;
+        c = a % b;
+    }
 
-	return (b);
+    return (b);
 }
 
 /*
@@ -344,179 +344,179 @@ gcd(int a, int b)
  */
 static void
 permute_args(int panonopt_start, int panonopt_end, int opt_end,
-	char * const *nargv)
+    char * const *nargv)
 {
-	int cstart, cyclelen, i, j, ncycle, nnonopts, nopts, pos;
-	char *swap;
+    int cstart, cyclelen, i, j, ncycle, nnonopts, nopts, pos;
+    char *swap;
 
-	/*
-	 * compute lengths of blocks and number and size of cycles
-	 */
-	nnonopts = panonopt_end - panonopt_start;
-	nopts = opt_end - panonopt_end;
-	ncycle = gcd(nnonopts, nopts);
-	cyclelen = (opt_end - panonopt_start) / ncycle;
+    /*
+     * compute lengths of blocks and number and size of cycles
+     */
+    nnonopts = panonopt_end - panonopt_start;
+    nopts = opt_end - panonopt_end;
+    ncycle = gcd(nnonopts, nopts);
+    cyclelen = (opt_end - panonopt_start) / ncycle;
 
-	for (i = 0; i < ncycle; i++) {
-		cstart = panonopt_end+i;
-		pos = cstart;
-		for (j = 0; j < cyclelen; j++) {
-			if (pos >= panonopt_end)
-				pos -= nnonopts;
-			else
-				pos += nopts;
-			swap = nargv[pos];
-			/* LINTED const cast */
-			((char **) nargv)[pos] = nargv[cstart];
-			/* LINTED const cast */
-			((char **)nargv)[cstart] = swap;
-		}
-	}
+    for (i = 0; i < ncycle; i++) {
+        cstart = panonopt_end+i;
+        pos = cstart;
+        for (j = 0; j < cyclelen; j++) {
+            if (pos >= panonopt_end)
+                pos -= nnonopts;
+            else
+                pos += nopts;
+            swap = nargv[pos];
+            /* LINTED const cast */
+            ((char **) nargv)[pos] = nargv[cstart];
+            /* LINTED const cast */
+            ((char **)nargv)[cstart] = swap;
+        }
+    }
 }
 
 /*
  * parse_long_options --
- *	Parse long options in argc/argv argument vector.
+ * Parse long options in argc/argv argument vector.
  * Returns -1 if short_too is set and the option does not match long_options.
  */
 static int
 parse_long_options(char * const *nargv, const char *options,
-	const struct option *long_options, int *idx, int short_too)
+    const struct option *long_options, int *idx, int short_too)
 {
-	char *current_argv, *has_equal;
-	size_t current_argv_len;
-	int i, match;
+    char *current_argv, *has_equal;
+    size_t current_argv_len;
+    int i, match;
 
-	current_argv = place;
-	match = -1;
+    current_argv = place;
+    match = -1;
 
-	optind++;
+    optind++;
 
-	if ((has_equal = strchr(current_argv, '=')) != NULL) {
-		/* argument found (--option=arg) */
-		current_argv_len = has_equal - current_argv;
-		has_equal++;
-	} else
-		current_argv_len = strlen(current_argv);
+    if ((has_equal = strchr(current_argv, '=')) != NULL) {
+        /* argument found (--option=arg) */
+        current_argv_len = has_equal - current_argv;
+        has_equal++;
+    } else
+        current_argv_len = strlen(current_argv);
 
-	for (i = 0; long_options[i].name; i++) {
-		/* find matching long option */
-		if (strncmp(current_argv, long_options[i].name,
-		    current_argv_len))
-			continue;
+    for (i = 0; long_options[i].name; i++) {
+        /* find matching long option */
+        if (strncmp(current_argv, long_options[i].name,
+            current_argv_len))
+            continue;
 
-		if (strlen(long_options[i].name) == current_argv_len) {
-			/* exact match */
-			match = i;
-			break;
-		}
-		/*
-		 * If this is a known short option, don't allow
-		 * a partial match of a single character.
-		 */
-		if (short_too && current_argv_len == 1)
-			continue;
+        if (strlen(long_options[i].name) == current_argv_len) {
+            /* exact match */
+            match = i;
+            break;
+        }
+        /*
+         * If this is a known short option, don't allow
+         * a partial match of a single character.
+         */
+        if (short_too && current_argv_len == 1)
+            continue;
 
-		if (match == -1)	/* partial match */
-			match = i;
-		else {
-			/* ambiguous abbreviation */
-			if (PRINT_ERROR)
-				warnx(ambig, (int)current_argv_len,
-				     current_argv);
-			optopt = 0;
-			return (BADCH);
-		}
-	}
-	if (match != -1) {		/* option found */
-		if (long_options[match].has_arg == no_argument
-		    && has_equal) {
-			if (PRINT_ERROR)
-				warnx(noarg, (int)current_argv_len,
-				     current_argv);
-			/*
-			 * XXX: GNU sets optopt to val regardless of flag
-			 */
-			if (long_options[match].flag == NULL)
-				optopt = long_options[match].val;
-			else
-				optopt = 0;
-			return (BADARG);
-		}
-		if (long_options[match].has_arg == required_argument ||
-		    long_options[match].has_arg == optional_argument) {
-			if (has_equal)
-				optarg = has_equal;
-			else if (long_options[match].has_arg ==
-			    required_argument) {
-				/*
-				 * optional argument doesn't use next nargv
-				 */
-				optarg = nargv[optind++];
-			}
-		}
-		if ((long_options[match].has_arg == required_argument)
-		    && (optarg == NULL)) {
-			/*
-			 * Missing argument; leading ':' indicates no error
-			 * should be generated.
-			 */
-			if (PRINT_ERROR)
-				warnx(recargstring,
-				    current_argv);
-			/*
-			 * XXX: GNU sets optopt to val regardless of flag
-			 */
-			if (long_options[match].flag == NULL)
-				optopt = long_options[match].val;
-			else
-				optopt = 0;
-			--optind;
-			return (BADARG);
-		}
-	} else {			/* unknown option */
-		if (short_too) {
-			--optind;
-			return (-1);
-		}
-		if (PRINT_ERROR)
-			warnx(illoptstring, current_argv);
-		optopt = 0;
-		return (BADCH);
-	}
-	if (idx)
-		*idx = match;
-	if (long_options[match].flag) {
-		*long_options[match].flag = long_options[match].val;
-		return (0);
-	} else
-		return (long_options[match].val);
+        if (match == -1) /* partial match */
+            match = i;
+        else {
+            /* ambiguous abbreviation */
+            if (PRINT_ERROR)
+                warnx(ambig, (int)current_argv_len,
+                     current_argv);
+            optopt = 0;
+            return (BADCH);
+        }
+    }
+    if (match != -1) { /* option found */
+        if (long_options[match].has_arg == no_argument
+            && has_equal) {
+            if (PRINT_ERROR)
+                warnx(noarg, (int)current_argv_len,
+                     current_argv);
+            /*
+             * XXX: GNU sets optopt to val regardless of flag
+             */
+            if (long_options[match].flag == NULL)
+                optopt = long_options[match].val;
+            else
+                optopt = 0;
+            return (BADARG);
+        }
+        if (long_options[match].has_arg == required_argument ||
+            long_options[match].has_arg == optional_argument) {
+            if (has_equal)
+                optarg = has_equal;
+            else if (long_options[match].has_arg ==
+                required_argument) {
+                /*
+                 * optional argument doesn't use next nargv
+                 */
+                optarg = nargv[optind++];
+            }
+        }
+        if ((long_options[match].has_arg == required_argument)
+            && (optarg == NULL)) {
+            /*
+             * Missing argument; leading ':' indicates no error
+             * should be generated.
+             */
+            if (PRINT_ERROR)
+                warnx(recargstring,
+                    current_argv);
+            /*
+             * XXX: GNU sets optopt to val regardless of flag
+             */
+            if (long_options[match].flag == NULL)
+                optopt = long_options[match].val;
+            else
+                optopt = 0;
+            --optind;
+            return (BADARG);
+        }
+    } else { /* unknown option */
+        if (short_too) {
+            --optind;
+            return (-1);
+        }
+        if (PRINT_ERROR)
+            warnx(illoptstring, current_argv);
+        optopt = 0;
+        return (BADCH);
+    }
+    if (idx)
+        *idx = match;
+    if (long_options[match].flag) {
+        *long_options[match].flag = long_options[match].val;
+        return (0);
+    } else
+        return (long_options[match].val);
 }
 
 /*
  * getopt_internal --
- *	Parse argc/argv argument vector.  Called by user level routines.
+ * Parse argc/argv argument vector.  Called by user level routines.
  */
 static int
 getopt_internal(int nargc, char * const *nargv, const char *options,
-	const struct option *long_options, int *idx, int flags)
+    const struct option *long_options, int *idx, int flags)
 {
-	char *oli;				/* option letter list index */
-	int optchar, short_too;
-	static int posixly_correct = -1;
+    char *oli; /* option letter list index */
+    int optchar, short_too;
+    static int posixly_correct = -1;
 #ifdef __STDC_WANT_SECURE_LIB__
     char* buffer = NULL;
     size_t buffer_size = 0;
     errno_t err = 0;
 #endif
 
-	if (options == NULL)
-		return (-1);
+    if (options == NULL)
+        return (-1);
 
-	/*
-	 * Disable GNU extensions if POSIXLY_CORRECT is set or options
-	 * string begins with a '+'.
-	 */
+    /*
+     * Disable GNU extensions if POSIXLY_CORRECT is set or options
+     * string begins with a '+'.
+     */
 
 #ifdef __STDC_WANT_SECURE_LIB__
     if (posixly_correct == -1) {
@@ -530,183 +530,183 @@ getopt_internal(int nargc, char * const *nargv, const char *options,
     if (posixly_correct == -1)
         posixly_correct = (getenv("POSIXLY_CORRECT") != NULL);
 #endif
-	if (posixly_correct || *options == '+')
-		flags &= ~FLAG_PERMUTE;
-	else if (*options == '-')
-		flags |= FLAG_ALLARGS;
-	if (*options == '+' || *options == '-')
-		options++;
+    if (posixly_correct || *options == '+')
+        flags &= ~FLAG_PERMUTE;
+    else if (*options == '-')
+        flags |= FLAG_ALLARGS;
+    if (*options == '+' || *options == '-')
+        options++;
 
-	/*
-	 * XXX Some GNU programs (like cvs) set optind to 0 instead of
-	 * XXX using optreset.  Work around this braindamage.
-	 */
-	if (optind == 0)
-		optind = optreset = 1;
+    /*
+     * XXX Some GNU programs (like cvs) set optind to 0 instead of
+     * XXX using optreset.  Work around this braindamage.
+     */
+    if (optind == 0)
+        optind = optreset = 1;
 
-	optarg = NULL;
-	if (optreset)
-		nonopt_start = nonopt_end = -1;
+    optarg = NULL;
+    if (optreset)
+        nonopt_start = nonopt_end = -1;
 start:
-	if (optreset || !*place) {		/* update scanning pointer */
-		optreset = 0;
-		if (optind >= nargc) {          /* end of argument vector */
-			place = EMSG;
-			if (nonopt_end != -1) {
-				/* do permutation, if we have to */
-				permute_args(nonopt_start, nonopt_end,
-				    optind, nargv);
-				optind -= nonopt_end - nonopt_start;
-			}
-			else if (nonopt_start != -1) {
-				/*
-				 * If we skipped non-options, set optind
-				 * to the first of them.
-				 */
-				optind = nonopt_start;
-			}
-			nonopt_start = nonopt_end = -1;
-			return (-1);
-		}
-		if (*(place = nargv[optind]) != '-' ||
-		    (place[1] == '\0' && strchr(options, '-') == NULL)) {
-			place = EMSG;		/* found non-option */
-			if (flags & FLAG_ALLARGS) {
-				/*
-				 * GNU extension:
-				 * return non-option as argument to option 1
-				 */
-				optarg = nargv[optind++];
-				return (INORDER);
-			}
-			if (!(flags & FLAG_PERMUTE)) {
-				/*
-				 * If no permutation wanted, stop parsing
-				 * at first non-option.
-				 */
-				return (-1);
-			}
-			/* do permutation */
-			if (nonopt_start == -1)
-				nonopt_start = optind;
-			else if (nonopt_end != -1) {
-				permute_args(nonopt_start, nonopt_end,
-				    optind, nargv);
-				nonopt_start = optind -
-				    (nonopt_end - nonopt_start);
-				nonopt_end = -1;
-			}
-			optind++;
-			/* process next argument */
-			goto start;
-		}
-		if (nonopt_start != -1 && nonopt_end == -1)
-			nonopt_end = optind;
+    if (optreset || !*place) { /* update scanning pointer */
+        optreset = 0;
+        if (optind >= nargc) { /* end of argument vector */
+            place = EMSG;
+            if (nonopt_end != -1) {
+                /* do permutation, if we have to */
+                permute_args(nonopt_start, nonopt_end,
+                    optind, nargv);
+                optind -= nonopt_end - nonopt_start;
+            }
+            else if (nonopt_start != -1) {
+                /*
+                 * If we skipped non-options, set optind
+                 * to the first of them.
+                 */
+                optind = nonopt_start;
+            }
+            nonopt_start = nonopt_end = -1;
+            return (-1);
+        }
+        if (*(place = nargv[optind]) != '-' ||
+            (place[1] == '\0' && strchr(options, '-') == NULL)) {
+            place = EMSG; /* found non-option */
+            if (flags & FLAG_ALLARGS) {
+                /*
+                 * GNU extension:
+                 * return non-option as argument to option 1
+                 */
+                optarg = nargv[optind++];
+                return (INORDER);
+            }
+            if (!(flags & FLAG_PERMUTE)) {
+                /*
+                 * If no permutation wanted, stop parsing
+                 * at first non-option.
+                 */
+                return (-1);
+            }
+            /* do permutation */
+            if (nonopt_start == -1)
+                nonopt_start = optind;
+            else if (nonopt_end != -1) {
+                permute_args(nonopt_start, nonopt_end,
+                    optind, nargv);
+                nonopt_start = optind -
+                    (nonopt_end - nonopt_start);
+                nonopt_end = -1;
+            }
+            optind++;
+            /* process next argument */
+            goto start;
+        }
+        if (nonopt_start != -1 && nonopt_end == -1)
+            nonopt_end = optind;
 
-		/*
-		 * If we have "-" do nothing, if "--" we are done.
-		 */
-		if (place[1] != '\0' && *++place == '-' && place[1] == '\0') {
-			optind++;
-			place = EMSG;
-			/*
-			 * We found an option (--), so if we skipped
-			 * non-options, we have to permute.
-			 */
-			if (nonopt_end != -1) {
-				permute_args(nonopt_start, nonopt_end,
-				    optind, nargv);
-				optind -= nonopt_end - nonopt_start;
-			}
-			nonopt_start = nonopt_end = -1;
-			return (-1);
-		}
-	}
+        /*
+         * If we have "-" do nothing, if "--" we are done.
+         */
+        if (place[1] != '\0' && *++place == '-' && place[1] == '\0') {
+            optind++;
+            place = EMSG;
+            /*
+             * We found an option (--), so if we skipped
+             * non-options, we have to permute.
+             */
+            if (nonopt_end != -1) {
+                permute_args(nonopt_start, nonopt_end,
+                    optind, nargv);
+                optind -= nonopt_end - nonopt_start;
+            }
+            nonopt_start = nonopt_end = -1;
+            return (-1);
+        }
+    }
 
-	/*
-	 * Check long options if:
-	 *  1) we were passed some
-	 *  2) the arg is not just "-"
-	 *  3) either the arg starts with -- we are getopt_long_only()
-	 */
-	if (long_options != NULL && place != nargv[optind] &&
-	    (*place == '-' || (flags & FLAG_LONGONLY))) {
-		short_too = 0;
-		if (*place == '-')
-			place++;		/* --foo long option */
-		else if (*place != ':' && strchr(options, *place) != NULL)
-			short_too = 1;		/* could be short option too */
+    /*
+     * Check long options if:
+     *  1) we were passed some
+     *  2) the arg is not just "-"
+     *  3) either the arg starts with -- we are getopt_long_only()
+     */
+    if (long_options != NULL && place != nargv[optind] &&
+        (*place == '-' || (flags & FLAG_LONGONLY))) {
+        short_too = 0;
+        if (*place == '-')
+            place++; /* --foo long option */
+        else if (*place != ':' && strchr(options, *place) != NULL)
+            short_too = 1; /* could be short option too */
 
-		optchar = parse_long_options(nargv, options, long_options,
-		    idx, short_too);
-		if (optchar != -1) {
-			place = EMSG;
-			return (optchar);
-		}
-	}
+        optchar = parse_long_options(nargv, options, long_options,
+            idx, short_too);
+        if (optchar != -1) {
+            place = EMSG;
+            return (optchar);
+        }
+    }
 
-	if ((optchar = (int)*place++) == (int)':' ||
-	    (optchar == (int)'-' && *place != '\0') ||
-	    (oli = strchr(options, optchar)) == NULL) {
-		/*
-		 * If the user specified "-" and  '-' isn't listed in
-		 * options, return -1 (non-option) as per POSIX.
-		 * Otherwise, it is an unknown option character (or ':').
-		 */
-		if (optchar == (int)'-' && *place == '\0')
-			return (-1);
-		if (!*place)
-			++optind;
-		if (PRINT_ERROR)
-			warnx(illoptchar, optchar);
-		optopt = optchar;
-		return (BADCH);
-	}
-	if (long_options != NULL && optchar == 'W' && oli[1] == ';') {
-		/* -W long-option */
-		if (*place)			/* no space */
-			/* NOTHING */;
-		else if (++optind >= nargc) {	/* no arg */
-			place = EMSG;
-			if (PRINT_ERROR)
-				warnx(recargchar, optchar);
-			optopt = optchar;
-			return (BADARG);
-		} else				/* white space */
-			place = nargv[optind];
-		optchar = parse_long_options(nargv, options, long_options,
-		    idx, 0);
-		place = EMSG;
-		return (optchar);
-	}
-	if (*++oli != ':') {			/* doesn't take argument */
-		if (!*place)
-			++optind;
-	} else {				/* takes (optional) argument */
-		optarg = NULL;
-		if (*place)			/* no white space */
-			optarg = place;
-		else if (oli[1] != ':') {	/* arg not optional */
-			if (++optind >= nargc) {	/* no arg */
-				place = EMSG;
-				if (PRINT_ERROR)
-					warnx(recargchar, optchar);
-				optopt = optchar;
-				return (BADARG);
-			} else
-				optarg = nargv[optind];
-		}
-		place = EMSG;
-		++optind;
-	}
-	/* dump back option letter */
-	return (optchar);
+    if ((optchar = (int)*place++) == (int)':' ||
+        (optchar == (int)'-' && *place != '\0') ||
+        (oli = strchr(options, optchar)) == NULL) {
+        /*
+         * If the user specified "-" and  '-' isn't listed in
+         * options, return -1 (non-option) as per POSIX.
+         * Otherwise, it is an unknown option character (or ':').
+         */
+        if (optchar == (int)'-' && *place == '\0')
+            return (-1);
+        if (!*place)
+            ++optind;
+        if (PRINT_ERROR)
+            warnx(illoptchar, optchar);
+        optopt = optchar;
+        return (BADCH);
+    }
+    if (long_options != NULL && optchar == 'W' && oli[1] == ';') {
+        /* -W long-option */
+        if (*place)                   /* no space */
+            /* NOTHING */;
+        else if (++optind >= nargc) { /* no arg */
+            place = EMSG;
+            if (PRINT_ERROR)
+                warnx(recargchar, optchar);
+            optopt = optchar;
+            return (BADARG);
+        } else                        /* white space */
+            place = nargv[optind];
+        optchar = parse_long_options(nargv, options, long_options,
+            idx, 0);
+        place = EMSG;
+        return (optchar);
+    }
+    if (*++oli != ':') {              /* doesn't take argument */
+        if (!*place)
+            ++optind;
+    } else {                          /* takes (optional) argument */
+        optarg = NULL;
+        if (*place)                   /* no white space */
+            optarg = place;
+        else if (oli[1] != ':') {     /* arg not optional */
+            if (++optind >= nargc) {  /* no arg */
+                place = EMSG;
+                if (PRINT_ERROR)
+                    warnx(recargchar, optchar);
+                optopt = optchar;
+                return (BADARG);
+            } else
+                optarg = nargv[optind];
+        }
+        place = EMSG;
+        ++optind;
+    }
+    /* dump back option letter */
+    return (optchar);
 }
 
 #ifdef REPLACE_GETOPT
 /*
  * getopt --
- *	Parse argc/argv argument vector.
+ * Parse argc/argv argument vector.
  *
  * [eventually this will replace the BSD getopt]
  */
@@ -714,42 +714,42 @@ int
 getopt(int nargc, char * const *nargv, const char *options)
 {
 
-	/*
-	 * We don't pass FLAG_PERMUTE to getopt_internal() since
-	 * the BSD getopt(3) (unlike GNU) has never done this.
-	 *
-	 * Furthermore, since many privileged programs call getopt()
-	 * before dropping privileges it makes sense to keep things
-	 * as simple (and bug-free) as possible.
-	 */
-	return (getopt_internal(nargc, nargv, options, NULL, NULL, 0));
+    /*
+     * We don't pass FLAG_PERMUTE to getopt_internal() since
+     * the BSD getopt(3) (unlike GNU) has never done this.
+     *
+     * Furthermore, since many privileged programs call getopt()
+     * before dropping privileges it makes sense to keep things
+     * as simple (and bug-free) as possible.
+     */
+    return (getopt_internal(nargc, nargv, options, NULL, NULL, 0));
 }
 #endif /* REPLACE_GETOPT */
 
 /*
  * getopt_long --
- *	Parse argc/argv argument vector.
+ * Parse argc/argv argument vector.
  */
 int
 getopt_long(int nargc, char * const *nargv, const char *options,
     const struct option *long_options, int *idx)
 {
 
-	return (getopt_internal(nargc, nargv, options, long_options, idx,
-	    FLAG_PERMUTE));
+    return (getopt_internal(nargc, nargv, options, long_options, idx,
+        FLAG_PERMUTE));
 }
 
 /*
  * getopt_long_only --
- *	Parse argc/argv argument vector.
+ * Parse argc/argv argument vector.
  */
 int
 getopt_long_only(int nargc, char * const *nargv, const char *options,
     const struct option *long_options, int *idx)
 {
 
-	return (getopt_internal(nargc, nargv, options, long_options, idx,
-	    FLAG_PERMUTE|FLAG_LONGONLY));
+    return (getopt_internal(nargc, nargv, options, long_options, idx,
+        FLAG_PERMUTE|FLAG_LONGONLY));
 }
 /*******************************************************************************
  * This file is part of the argtable3 library.
@@ -2573,29 +2573,29 @@ struct arg_rem *arg_rem(const char *datatype, const char *glossary)
 #ifndef _TREX_H_
 #define _TREX_H_
 /***************************************************************
-	T-Rex a tiny regular expression library
+    T-Rex a tiny regular expression library
 
-	Copyright (C) 2003-2006 Alberto Demichelis
+    Copyright (C) 2003-2006 Alberto Demichelis
 
-	This software is provided 'as-is', without any express
-	or implied warranty. In no event will the authors be held
-	liable for any damages arising from the use of this software.
+    This software is provided 'as-is', without any express
+    or implied warranty. In no event will the authors be held
+    liable for any damages arising from the use of this software.
 
-	Permission is granted to anyone to use this software for
-	any purpose, including commercial applications, and to alter
-	it and redistribute it freely, subject to the following restrictions:
+    Permission is granted to anyone to use this software for
+    any purpose, including commercial applications, and to alter
+    it and redistribute it freely, subject to the following restrictions:
 
-		1. The origin of this software must not be misrepresented;
-		you must not claim that you wrote the original software.
-		If you use this software in a product, an acknowledgment
-		in the product documentation would be appreciated but
-		is not required.
+        1. The origin of this software must not be misrepresented;
+        you must not claim that you wrote the original software.
+        If you use this software in a product, an acknowledgment
+        in the product documentation would be appreciated but
+        is not required.
 
-		2. Altered source versions must be plainly marked as such,
-		and must not be misrepresented as being the original software.
+        2. Altered source versions must be plainly marked as such,
+        and must not be misrepresented as being the original software.
 
-		3. This notice may not be removed or altered from any
-		source distribution.
+        3. This notice may not be removed or altered from any
+        source distribution.
 
 ****************************************************************/
 
@@ -2630,8 +2630,8 @@ typedef unsigned int TRexBool;
 typedef struct TRex TRex;
 
 typedef struct {
-	const TRexChar *begin;
-	int len;
+    const TRexChar *begin;
+    int len;
 } TRexMatch;
 
 TREX_API TRex *trex_compile(const TRexChar *pattern, const TRexChar **error, int flags);
@@ -2899,26 +2899,26 @@ struct arg_rex * arg_rexn(const char * shortopts,
 
 static const TRexChar *g_nnames[] =
 {
-	_SC("NONE"),_SC("OP_GREEDY"),	_SC("OP_OR"),
-	_SC("OP_EXPR"),_SC("OP_NOCAPEXPR"),_SC("OP_DOT"),	_SC("OP_CLASS"),
-	_SC("OP_CCLASS"),_SC("OP_NCLASS"),_SC("OP_RANGE"),_SC("OP_CHAR"),
-	_SC("OP_EOL"),_SC("OP_BOL"),_SC("OP_WB")
+    _SC("NONE"),_SC("OP_GREEDY"), _SC("OP_OR"),
+    _SC("OP_EXPR"),_SC("OP_NOCAPEXPR"),_SC("OP_DOT"), _SC("OP_CLASS"),
+    _SC("OP_CCLASS"),_SC("OP_NCLASS"),_SC("OP_RANGE"),_SC("OP_CHAR"),
+    _SC("OP_EOL"),_SC("OP_BOL"),_SC("OP_WB")
 };
 
 #endif
-#define OP_GREEDY		(MAX_CHAR+1) // * + ? {n}
-#define OP_OR			(MAX_CHAR+2)
-#define OP_EXPR			(MAX_CHAR+3) //parentesis ()
-#define OP_NOCAPEXPR	(MAX_CHAR+4) //parentesis (?:)
-#define OP_DOT			(MAX_CHAR+5)
-#define OP_CLASS		(MAX_CHAR+6)
-#define OP_CCLASS		(MAX_CHAR+7)
-#define OP_NCLASS		(MAX_CHAR+8) //negates class the [^
-#define OP_RANGE		(MAX_CHAR+9)
-#define OP_CHAR			(MAX_CHAR+10)
-#define OP_EOL			(MAX_CHAR+11)
-#define OP_BOL			(MAX_CHAR+12)
-#define OP_WB			(MAX_CHAR+13)
+#define OP_GREEDY       (MAX_CHAR+1) // * + ? {n}
+#define OP_OR           (MAX_CHAR+2)
+#define OP_EXPR         (MAX_CHAR+3) //parentesis ()
+#define OP_NOCAPEXPR    (MAX_CHAR+4) //parentesis (?:)
+#define OP_DOT          (MAX_CHAR+5)
+#define OP_CLASS        (MAX_CHAR+6)
+#define OP_CCLASS       (MAX_CHAR+7)
+#define OP_NCLASS       (MAX_CHAR+8) //negates class the [^
+#define OP_RANGE        (MAX_CHAR+9)
+#define OP_CHAR         (MAX_CHAR+10)
+#define OP_EOL          (MAX_CHAR+11)
+#define OP_BOL          (MAX_CHAR+12)
+#define OP_WB           (MAX_CHAR+13)
 
 #define TREX_SYMBOL_ANY_CHAR ('.')
 #define TREX_SYMBOL_GREEDY_ONE_OR_MORE ('+')
@@ -2933,610 +2933,610 @@ static const TRexChar *g_nnames[] =
 typedef int TRexNodeType;
 
 typedef struct tagTRexNode{
-	TRexNodeType type;
-	int left;
-	int right;
-	int next;
+    TRexNodeType type;
+    int left;
+    int right;
+    int next;
 }TRexNode;
 
 struct TRex{
-	const TRexChar *_eol;
-	const TRexChar *_bol;
-	const TRexChar *_p;
-	int _first;
-	int _op;
-	TRexNode *_nodes;
-	int _nallocated;
-	int _nsize;
-	int _nsubexpr;
-	TRexMatch *_matches;
-	int _currsubexp;
-	void *_jmpbuf;
-	const TRexChar **_error;
-	int _flags;
+    const TRexChar *_eol;
+    const TRexChar *_bol;
+    const TRexChar *_p;
+    int _first;
+    int _op;
+    TRexNode *_nodes;
+    int _nallocated;
+    int _nsize;
+    int _nsubexpr;
+    TRexMatch *_matches;
+    int _currsubexp;
+    void *_jmpbuf;
+    const TRexChar **_error;
+    int _flags;
 };
 
 static int trex_list(TRex *exp);
 
 static int trex_newnode(TRex *exp, TRexNodeType type)
 {
-	TRexNode n;
-	int newid;
-	n.type = type;
-	n.next = n.right = n.left = -1;
-	if(type == OP_EXPR)
-		n.right = exp->_nsubexpr++;
-	if(exp->_nallocated < (exp->_nsize + 1)) {
-		exp->_nallocated *= 2;
-		exp->_nodes = (TRexNode *)realloc(exp->_nodes, exp->_nallocated * sizeof(TRexNode));
-	}
-	exp->_nodes[exp->_nsize++] = n;
-	newid = exp->_nsize - 1;
-	return (int)newid;
+    TRexNode n;
+    int newid;
+    n.type = type;
+    n.next = n.right = n.left = -1;
+    if(type == OP_EXPR)
+        n.right = exp->_nsubexpr++;
+    if(exp->_nallocated < (exp->_nsize + 1)) {
+        exp->_nallocated *= 2;
+        exp->_nodes = (TRexNode *)realloc(exp->_nodes, exp->_nallocated * sizeof(TRexNode));
+    }
+    exp->_nodes[exp->_nsize++] = n;
+    newid = exp->_nsize - 1;
+    return (int)newid;
 }
 
 static void trex_error(TRex *exp,const TRexChar *error)
 {
-	if(exp->_error) *exp->_error = error;
-	longjmp(*((jmp_buf*)exp->_jmpbuf),-1);
+    if(exp->_error) *exp->_error = error;
+    longjmp(*((jmp_buf*)exp->_jmpbuf),-1);
 }
 
 static void trex_expect(TRex *exp, int n){
-	if((*exp->_p) != n)
-		trex_error(exp, _SC("expected paren"));
-	exp->_p++;
+    if((*exp->_p) != n)
+        trex_error(exp, _SC("expected paren"));
+    exp->_p++;
 }
 
 static TRexChar trex_escapechar(TRex *exp)
 {
-	if(*exp->_p == TREX_SYMBOL_ESCAPE_CHAR){
-		exp->_p++;
-		switch(*exp->_p) {
-		case 'v': exp->_p++; return '\v';
-		case 'n': exp->_p++; return '\n';
-		case 't': exp->_p++; return '\t';
-		case 'r': exp->_p++; return '\r';
-		case 'f': exp->_p++; return '\f';
-		default: return (*exp->_p++);
-		}
-	} else if(!scisprint(*exp->_p)) trex_error(exp,_SC("letter expected"));
-	return (*exp->_p++);
+    if(*exp->_p == TREX_SYMBOL_ESCAPE_CHAR){
+        exp->_p++;
+        switch(*exp->_p) {
+        case 'v': exp->_p++; return '\v';
+        case 'n': exp->_p++; return '\n';
+        case 't': exp->_p++; return '\t';
+        case 'r': exp->_p++; return '\r';
+        case 'f': exp->_p++; return '\f';
+        default: return (*exp->_p++);
+        }
+    } else if(!scisprint(*exp->_p)) trex_error(exp,_SC("letter expected"));
+    return (*exp->_p++);
 }
 
 static int trex_charclass(TRex *exp,int classid)
 {
-	int n = trex_newnode(exp,OP_CCLASS);
-	exp->_nodes[n].left = classid;
-	return n;
+    int n = trex_newnode(exp,OP_CCLASS);
+    exp->_nodes[n].left = classid;
+    return n;
 }
 
 static int trex_charnode(TRex *exp,TRexBool isclass)
 {
-	TRexChar t;
-	if(*exp->_p == TREX_SYMBOL_ESCAPE_CHAR) {
-		exp->_p++;
-		switch(*exp->_p) {
-			case 'n': exp->_p++; return trex_newnode(exp,'\n');
-			case 't': exp->_p++; return trex_newnode(exp,'\t');
-			case 'r': exp->_p++; return trex_newnode(exp,'\r');
-			case 'f': exp->_p++; return trex_newnode(exp,'\f');
-			case 'v': exp->_p++; return trex_newnode(exp,'\v');
-			case 'a': case 'A': case 'w': case 'W': case 's': case 'S':
-			case 'd': case 'D': case 'x': case 'X': case 'c': case 'C':
-			case 'p': case 'P': case 'l': case 'u':
-				{
-				t = *exp->_p; exp->_p++;
-				return trex_charclass(exp,t);
-				}
-			case 'b':
-			case 'B':
-				if(!isclass) {
-					int node = trex_newnode(exp,OP_WB);
-					exp->_nodes[node].left = *exp->_p;
-					exp->_p++;
-					return node;
-				} //else default
-			default:
-				t = *exp->_p; exp->_p++;
-				return trex_newnode(exp,t);
-		}
-	}
-	else if(!scisprint(*exp->_p)) {
+    TRexChar t;
+    if(*exp->_p == TREX_SYMBOL_ESCAPE_CHAR) {
+        exp->_p++;
+        switch(*exp->_p) {
+            case 'n': exp->_p++; return trex_newnode(exp,'\n');
+            case 't': exp->_p++; return trex_newnode(exp,'\t');
+            case 'r': exp->_p++; return trex_newnode(exp,'\r');
+            case 'f': exp->_p++; return trex_newnode(exp,'\f');
+            case 'v': exp->_p++; return trex_newnode(exp,'\v');
+            case 'a': case 'A': case 'w': case 'W': case 's': case 'S':
+            case 'd': case 'D': case 'x': case 'X': case 'c': case 'C':
+            case 'p': case 'P': case 'l': case 'u':
+                {
+                t = *exp->_p; exp->_p++;
+                return trex_charclass(exp,t);
+                }
+            case 'b':
+            case 'B':
+                if(!isclass) {
+                    int node = trex_newnode(exp,OP_WB);
+                    exp->_nodes[node].left = *exp->_p;
+                    exp->_p++;
+                    return node;
+                } //else default
+            default:
+                t = *exp->_p; exp->_p++;
+                return trex_newnode(exp,t);
+        }
+    }
+    else if(!scisprint(*exp->_p)) {
 
-		trex_error(exp,_SC("letter expected"));
-	}
-	t = *exp->_p; exp->_p++;
-	return trex_newnode(exp,t);
+        trex_error(exp,_SC("letter expected"));
+    }
+    t = *exp->_p; exp->_p++;
+    return trex_newnode(exp,t);
 }
 static int trex_class(TRex *exp)
 {
-	int ret = -1;
-	int first = -1,chain;
-	if(*exp->_p == TREX_SYMBOL_BEGINNING_OF_STRING){
-		ret = trex_newnode(exp,OP_NCLASS);
-		exp->_p++;
-	}else ret = trex_newnode(exp,OP_CLASS);
+    int ret = -1;
+    int first = -1,chain;
+    if(*exp->_p == TREX_SYMBOL_BEGINNING_OF_STRING){
+        ret = trex_newnode(exp,OP_NCLASS);
+        exp->_p++;
+    }else ret = trex_newnode(exp,OP_CLASS);
 
-	if(*exp->_p == ']') trex_error(exp,_SC("empty class"));
-	chain = ret;
-	while(*exp->_p != ']' && exp->_p != exp->_eol) {
-		if(*exp->_p == '-' && first != -1){
-			int r,t;
-			if(*exp->_p++ == ']') trex_error(exp,_SC("unfinished range"));
-			r = trex_newnode(exp,OP_RANGE);
-			if(first>*exp->_p) trex_error(exp,_SC("invalid range"));
-			if(exp->_nodes[first].type == OP_CCLASS) trex_error(exp,_SC("cannot use character classes in ranges"));
-			exp->_nodes[r].left = exp->_nodes[first].type;
-			t = trex_escapechar(exp);
-			exp->_nodes[r].right = t;
+    if(*exp->_p == ']') trex_error(exp,_SC("empty class"));
+    chain = ret;
+    while(*exp->_p != ']' && exp->_p != exp->_eol) {
+        if(*exp->_p == '-' && first != -1){
+            int r,t;
+            if(*exp->_p++ == ']') trex_error(exp,_SC("unfinished range"));
+            r = trex_newnode(exp,OP_RANGE);
+            if(first>*exp->_p) trex_error(exp,_SC("invalid range"));
+            if(exp->_nodes[first].type == OP_CCLASS) trex_error(exp,_SC("cannot use character classes in ranges"));
+            exp->_nodes[r].left = exp->_nodes[first].type;
+            t = trex_escapechar(exp);
+            exp->_nodes[r].right = t;
             exp->_nodes[chain].next = r;
-			chain = r;
-			first = -1;
-		}
-		else{
-			if(first!=-1){
-				int c = first;
-				exp->_nodes[chain].next = c;
-				chain = c;
-				first = trex_charnode(exp,TRex_True);
-			}
-			else{
-				first = trex_charnode(exp,TRex_True);
-			}
-		}
-	}
-	if(first!=-1){
-		int c = first;
-		exp->_nodes[chain].next = c;
-		chain = c;
-		first = -1;
-	}
-	/* hack? */
-	exp->_nodes[ret].left = exp->_nodes[ret].next;
-	exp->_nodes[ret].next = -1;
-	return ret;
+            chain = r;
+            first = -1;
+        }
+        else{
+            if(first!=-1){
+                int c = first;
+                exp->_nodes[chain].next = c;
+                chain = c;
+                first = trex_charnode(exp,TRex_True);
+            }
+            else{
+                first = trex_charnode(exp,TRex_True);
+            }
+        }
+    }
+    if(first!=-1){
+        int c = first;
+        exp->_nodes[chain].next = c;
+        chain = c;
+        first = -1;
+    }
+    /* hack? */
+    exp->_nodes[ret].left = exp->_nodes[ret].next;
+    exp->_nodes[ret].next = -1;
+    return ret;
 }
 
 static int trex_parsenumber(TRex *exp)
 {
-	int ret = *exp->_p-'0';
-	int positions = 10;
-	exp->_p++;
-	while(isdigit(*exp->_p)) {
-		ret = ret*10+(*exp->_p++-'0');
-		if(positions==1000000000) trex_error(exp,_SC("overflow in numeric constant"));
-		positions *= 10;
-	};
-	return ret;
+    int ret = *exp->_p-'0';
+    int positions = 10;
+    exp->_p++;
+    while(isdigit(*exp->_p)) {
+        ret = ret*10+(*exp->_p++-'0');
+        if(positions==1000000000) trex_error(exp,_SC("overflow in numeric constant"));
+        positions *= 10;
+    };
+    return ret;
 }
 
 static int trex_element(TRex *exp)
 {
-	int ret = -1;
-	switch(*exp->_p)
-	{
-	case '(': {
-		int expr,newn;
-		exp->_p++;
+    int ret = -1;
+    switch(*exp->_p)
+    {
+    case '(': {
+        int expr,newn;
+        exp->_p++;
 
 
-		if(*exp->_p =='?') {
-			exp->_p++;
-			trex_expect(exp,':');
-			expr = trex_newnode(exp,OP_NOCAPEXPR);
-		}
-		else
-			expr = trex_newnode(exp,OP_EXPR);
-		newn = trex_list(exp);
-		exp->_nodes[expr].left = newn;
-		ret = expr;
-		trex_expect(exp,')');
-			  }
-			  break;
-	case '[':
-		exp->_p++;
-		ret = trex_class(exp);
-		trex_expect(exp,']');
-		break;
-	case TREX_SYMBOL_END_OF_STRING: exp->_p++; ret = trex_newnode(exp,OP_EOL);break;
-	case TREX_SYMBOL_ANY_CHAR: exp->_p++; ret = trex_newnode(exp,OP_DOT);break;
-	default:
-		ret = trex_charnode(exp,TRex_False);
-		break;
-	}
+        if(*exp->_p =='?') {
+            exp->_p++;
+            trex_expect(exp,':');
+            expr = trex_newnode(exp,OP_NOCAPEXPR);
+        }
+        else
+            expr = trex_newnode(exp,OP_EXPR);
+        newn = trex_list(exp);
+        exp->_nodes[expr].left = newn;
+        ret = expr;
+        trex_expect(exp,')');
+              }
+              break;
+    case '[':
+        exp->_p++;
+        ret = trex_class(exp);
+        trex_expect(exp,']');
+        break;
+    case TREX_SYMBOL_END_OF_STRING: exp->_p++; ret = trex_newnode(exp,OP_EOL);break;
+    case TREX_SYMBOL_ANY_CHAR: exp->_p++; ret = trex_newnode(exp,OP_DOT);break;
+    default:
+        ret = trex_charnode(exp,TRex_False);
+        break;
+    }
 
-	{
-		TRexBool isgreedy = TRex_False;
-		unsigned short p0 = 0, p1 = 0;
-		switch(*exp->_p){
-			case TREX_SYMBOL_GREEDY_ZERO_OR_MORE: p0 = 0; p1 = 0xFFFF; exp->_p++; isgreedy = TRex_True; break;
-			case TREX_SYMBOL_GREEDY_ONE_OR_MORE: p0 = 1; p1 = 0xFFFF; exp->_p++; isgreedy = TRex_True; break;
-			case TREX_SYMBOL_GREEDY_ZERO_OR_ONE: p0 = 0; p1 = 1; exp->_p++; isgreedy = TRex_True; break;
-			case '{':
-				exp->_p++;
-				if(!isdigit(*exp->_p)) trex_error(exp,_SC("number expected"));
-				p0 = (unsigned short)trex_parsenumber(exp);
-				/*******************************/
-				switch(*exp->_p) {
-			case '}':
-				p1 = p0; exp->_p++;
-				break;
-			case ',':
-				exp->_p++;
-				p1 = 0xFFFF;
-				if(isdigit(*exp->_p)){
-					p1 = (unsigned short)trex_parsenumber(exp);
-				}
-				trex_expect(exp,'}');
-				break;
-			default:
-				trex_error(exp,_SC(", or } expected"));
-		}
-		/*******************************/
-		isgreedy = TRex_True;
-		break;
+    {
+        TRexBool isgreedy = TRex_False;
+        unsigned short p0 = 0, p1 = 0;
+        switch(*exp->_p){
+            case TREX_SYMBOL_GREEDY_ZERO_OR_MORE: p0 = 0; p1 = 0xFFFF; exp->_p++; isgreedy = TRex_True; break;
+            case TREX_SYMBOL_GREEDY_ONE_OR_MORE: p0 = 1; p1 = 0xFFFF; exp->_p++; isgreedy = TRex_True; break;
+            case TREX_SYMBOL_GREEDY_ZERO_OR_ONE: p0 = 0; p1 = 1; exp->_p++; isgreedy = TRex_True; break;
+            case '{':
+                exp->_p++;
+                if(!isdigit(*exp->_p)) trex_error(exp,_SC("number expected"));
+                p0 = (unsigned short)trex_parsenumber(exp);
+                /*******************************/
+                switch(*exp->_p) {
+            case '}':
+                p1 = p0; exp->_p++;
+                break;
+            case ',':
+                exp->_p++;
+                p1 = 0xFFFF;
+                if(isdigit(*exp->_p)){
+                    p1 = (unsigned short)trex_parsenumber(exp);
+                }
+                trex_expect(exp,'}');
+                break;
+            default:
+                trex_error(exp,_SC(", or } expected"));
+        }
+        /*******************************/
+        isgreedy = TRex_True;
+        break;
 
-		}
-		if(isgreedy) {
-			int nnode = trex_newnode(exp,OP_GREEDY);
-			exp->_nodes[nnode].left = ret;
-			exp->_nodes[nnode].right = ((p0)<<16)|p1;
-			ret = nnode;
-		}
-	}
-	if((*exp->_p != TREX_SYMBOL_BRANCH) && (*exp->_p != ')') && (*exp->_p != TREX_SYMBOL_GREEDY_ZERO_OR_MORE) && (*exp->_p != TREX_SYMBOL_GREEDY_ONE_OR_MORE) && (*exp->_p != '\0')) {
-		int nnode = trex_element(exp);
-		exp->_nodes[ret].next = nnode;
-	}
+        }
+        if(isgreedy) {
+            int nnode = trex_newnode(exp,OP_GREEDY);
+            exp->_nodes[nnode].left = ret;
+            exp->_nodes[nnode].right = ((p0)<<16)|p1;
+            ret = nnode;
+        }
+    }
+    if((*exp->_p != TREX_SYMBOL_BRANCH) && (*exp->_p != ')') && (*exp->_p != TREX_SYMBOL_GREEDY_ZERO_OR_MORE) && (*exp->_p != TREX_SYMBOL_GREEDY_ONE_OR_MORE) && (*exp->_p != '\0')) {
+        int nnode = trex_element(exp);
+        exp->_nodes[ret].next = nnode;
+    }
 
-	return ret;
+    return ret;
 }
 
 static int trex_list(TRex *exp)
 {
-	int ret=-1,e;
-	if(*exp->_p == TREX_SYMBOL_BEGINNING_OF_STRING) {
-		exp->_p++;
-		ret = trex_newnode(exp,OP_BOL);
-	}
-	e = trex_element(exp);
-	if(ret != -1) {
-		exp->_nodes[ret].next = e;
-	}
-	else ret = e;
+    int ret=-1,e;
+    if(*exp->_p == TREX_SYMBOL_BEGINNING_OF_STRING) {
+        exp->_p++;
+        ret = trex_newnode(exp,OP_BOL);
+    }
+    e = trex_element(exp);
+    if(ret != -1) {
+        exp->_nodes[ret].next = e;
+    }
+    else ret = e;
 
-	if(*exp->_p == TREX_SYMBOL_BRANCH) {
-		int temp,tright;
-		exp->_p++;
-		temp = trex_newnode(exp,OP_OR);
-		exp->_nodes[temp].left = ret;
-		tright = trex_list(exp);
-		exp->_nodes[temp].right = tright;
-		ret = temp;
-	}
-	return ret;
+    if(*exp->_p == TREX_SYMBOL_BRANCH) {
+        int temp,tright;
+        exp->_p++;
+        temp = trex_newnode(exp,OP_OR);
+        exp->_nodes[temp].left = ret;
+        tright = trex_list(exp);
+        exp->_nodes[temp].right = tright;
+        ret = temp;
+    }
+    return ret;
 }
 
 static TRexBool trex_matchcclass(int cclass,TRexChar c)
 {
-	switch(cclass) {
-	case 'a': return isalpha(c)?TRex_True:TRex_False;
-	case 'A': return !isalpha(c)?TRex_True:TRex_False;
-	case 'w': return (isalnum(c) || c == '_')?TRex_True:TRex_False;
-	case 'W': return (!isalnum(c) && c != '_')?TRex_True:TRex_False;
-	case 's': return ISSPACE(c)?TRex_True:TRex_False;
-	case 'S': return !ISSPACE(c)?TRex_True:TRex_False;
-	case 'd': return isdigit(c)?TRex_True:TRex_False;
-	case 'D': return !isdigit(c)?TRex_True:TRex_False;
-	case 'x': return isxdigit(c)?TRex_True:TRex_False;
-	case 'X': return !isxdigit(c)?TRex_True:TRex_False;
-	case 'c': return iscntrl(c)?TRex_True:TRex_False;
-	case 'C': return !iscntrl(c)?TRex_True:TRex_False;
-	case 'p': return ispunct(c)?TRex_True:TRex_False;
-	case 'P': return !ispunct(c)?TRex_True:TRex_False;
-	case 'l': return islower(c)?TRex_True:TRex_False;
-	case 'u': return isupper(c)?TRex_True:TRex_False;
-	}
-	return TRex_False; /*cannot happen*/
+    switch(cclass) {
+    case 'a': return isalpha(c)?TRex_True:TRex_False;
+    case 'A': return !isalpha(c)?TRex_True:TRex_False;
+    case 'w': return (isalnum(c) || c == '_')?TRex_True:TRex_False;
+    case 'W': return (!isalnum(c) && c != '_')?TRex_True:TRex_False;
+    case 's': return ISSPACE(c)?TRex_True:TRex_False;
+    case 'S': return !ISSPACE(c)?TRex_True:TRex_False;
+    case 'd': return isdigit(c)?TRex_True:TRex_False;
+    case 'D': return !isdigit(c)?TRex_True:TRex_False;
+    case 'x': return isxdigit(c)?TRex_True:TRex_False;
+    case 'X': return !isxdigit(c)?TRex_True:TRex_False;
+    case 'c': return iscntrl(c)?TRex_True:TRex_False;
+    case 'C': return !iscntrl(c)?TRex_True:TRex_False;
+    case 'p': return ispunct(c)?TRex_True:TRex_False;
+    case 'P': return !ispunct(c)?TRex_True:TRex_False;
+    case 'l': return islower(c)?TRex_True:TRex_False;
+    case 'u': return isupper(c)?TRex_True:TRex_False;
+    }
+    return TRex_False; /*cannot happen*/
 }
 
 static TRexBool trex_matchclass(TRex* exp,TRexNode *node,TRexChar c)
 {
-	do {
-		switch(node->type) {
-			case OP_RANGE:
-				if (exp->_flags & TREX_ICASE)
-				{
-					if(c >= toupper(node->left) && c <= toupper(node->right)) return TRex_True;
-					if(c >= tolower(node->left) && c <= tolower(node->right)) return TRex_True;
-				}
-				else
-				{
-					if(c >= node->left && c <= node->right) return TRex_True;
-				}
-				break;
-			case OP_CCLASS:
-				if(trex_matchcclass(node->left,c)) return TRex_True;
-				break;
-			default:
-				if (exp->_flags & TREX_ICASE)
-				{
-					if (c == tolower(node->type) || c == toupper(node->type)) return TRex_True;
-				}
-				else
-				{
-					if(c == node->type)return TRex_True;
-				}
+    do {
+        switch(node->type) {
+            case OP_RANGE:
+                if (exp->_flags & TREX_ICASE)
+                {
+                    if(c >= toupper(node->left) && c <= toupper(node->right)) return TRex_True;
+                    if(c >= tolower(node->left) && c <= tolower(node->right)) return TRex_True;
+                }
+                else
+                {
+                    if(c >= node->left && c <= node->right) return TRex_True;
+                }
+                break;
+            case OP_CCLASS:
+                if(trex_matchcclass(node->left,c)) return TRex_True;
+                break;
+            default:
+                if (exp->_flags & TREX_ICASE)
+                {
+                    if (c == tolower(node->type) || c == toupper(node->type)) return TRex_True;
+                }
+                else
+                {
+                    if(c == node->type)return TRex_True;
+                }
 
-		}
-	} while((node->next != -1) && (node = &exp->_nodes[node->next]));
-	return TRex_False;
+        }
+    } while((node->next != -1) && (node = &exp->_nodes[node->next]));
+    return TRex_False;
 }
 
 static const TRexChar *trex_matchnode(TRex* exp,TRexNode *node,const TRexChar *str,TRexNode *next)
 {
 
-	TRexNodeType type = node->type;
-	switch(type) {
-	case OP_GREEDY: {
-		//TRexNode *greedystop = (node->next != -1) ? &exp->_nodes[node->next] : NULL;
-		TRexNode *greedystop = NULL;
-		int p0 = (node->right >> 16)&0x0000FFFF, p1 = node->right&0x0000FFFF, nmaches = 0;
-		const TRexChar *s=str, *good = str;
+    TRexNodeType type = node->type;
+    switch(type) {
+    case OP_GREEDY: {
+        //TRexNode *greedystop = (node->next != -1) ? &exp->_nodes[node->next] : NULL;
+        TRexNode *greedystop = NULL;
+        int p0 = (node->right >> 16)&0x0000FFFF, p1 = node->right&0x0000FFFF, nmaches = 0;
+        const TRexChar *s=str, *good = str;
 
-		if(node->next != -1) {
-			greedystop = &exp->_nodes[node->next];
-		}
-		else {
-			greedystop = next;
-		}
+        if(node->next != -1) {
+            greedystop = &exp->_nodes[node->next];
+        }
+        else {
+            greedystop = next;
+        }
 
-		while((nmaches == 0xFFFF || nmaches < p1)) {
+        while((nmaches == 0xFFFF || nmaches < p1)) {
 
-			const TRexChar *stop;
-			if(!(s = trex_matchnode(exp,&exp->_nodes[node->left],s,greedystop)))
-				break;
-			nmaches++;
-			good=s;
-			if(greedystop) {
-				//checks that 0 matches satisfy the expression(if so skips)
-				//if not would always stop(for instance if is a '?')
-				if(greedystop->type != OP_GREEDY ||
-				(greedystop->type == OP_GREEDY && ((greedystop->right >> 16)&0x0000FFFF) != 0))
-				{
-					TRexNode *gnext = NULL;
-					if(greedystop->next != -1) {
-						gnext = &exp->_nodes[greedystop->next];
-					}else if(next && next->next != -1){
-						gnext = &exp->_nodes[next->next];
-					}
-					stop = trex_matchnode(exp,greedystop,s,gnext);
-					if(stop) {
-						//if satisfied stop it
-						if(p0 == p1 && p0 == nmaches) break;
-						else if(nmaches >= p0 && p1 == 0xFFFF) break;
-						else if(nmaches >= p0 && nmaches <= p1) break;
-					}
-				}
-			}
+            const TRexChar *stop;
+            if(!(s = trex_matchnode(exp,&exp->_nodes[node->left],s,greedystop)))
+                break;
+            nmaches++;
+            good=s;
+            if(greedystop) {
+                //checks that 0 matches satisfy the expression(if so skips)
+                //if not would always stop(for instance if is a '?')
+                if(greedystop->type != OP_GREEDY ||
+                (greedystop->type == OP_GREEDY && ((greedystop->right >> 16)&0x0000FFFF) != 0))
+                {
+                    TRexNode *gnext = NULL;
+                    if(greedystop->next != -1) {
+                        gnext = &exp->_nodes[greedystop->next];
+                    }else if(next && next->next != -1){
+                        gnext = &exp->_nodes[next->next];
+                    }
+                    stop = trex_matchnode(exp,greedystop,s,gnext);
+                    if(stop) {
+                        //if satisfied stop it
+                        if(p0 == p1 && p0 == nmaches) break;
+                        else if(nmaches >= p0 && p1 == 0xFFFF) break;
+                        else if(nmaches >= p0 && nmaches <= p1) break;
+                    }
+                }
+            }
 
-			if(s >= exp->_eol)
-				break;
-		}
-		if(p0 == p1 && p0 == nmaches) return good;
-		else if(nmaches >= p0 && p1 == 0xFFFF) return good;
-		else if(nmaches >= p0 && nmaches <= p1) return good;
-		return NULL;
-	}
-	case OP_OR: {
-			const TRexChar *asd = str;
-			TRexNode *temp=&exp->_nodes[node->left];
-			while( (asd = trex_matchnode(exp,temp,asd,NULL)) ) {
-				if(temp->next != -1)
-					temp = &exp->_nodes[temp->next];
-				else
-					return asd;
-			}
-			asd = str;
-			temp = &exp->_nodes[node->right];
-			while( (asd = trex_matchnode(exp,temp,asd,NULL)) ) {
-				if(temp->next != -1)
-					temp = &exp->_nodes[temp->next];
-				else
-					return asd;
-			}
-			return NULL;
-			break;
-	}
-	case OP_EXPR:
-	case OP_NOCAPEXPR:{
-			TRexNode *n = &exp->_nodes[node->left];
-			const TRexChar *cur = str;
-			int capture = -1;
-			if(node->type != OP_NOCAPEXPR && node->right == exp->_currsubexp) {
-				capture = exp->_currsubexp;
-				exp->_matches[capture].begin = cur;
-				exp->_currsubexp++;
-			}
+            if(s >= exp->_eol)
+                break;
+        }
+        if(p0 == p1 && p0 == nmaches) return good;
+        else if(nmaches >= p0 && p1 == 0xFFFF) return good;
+        else if(nmaches >= p0 && nmaches <= p1) return good;
+        return NULL;
+    }
+    case OP_OR: {
+            const TRexChar *asd = str;
+            TRexNode *temp=&exp->_nodes[node->left];
+            while( (asd = trex_matchnode(exp,temp,asd,NULL)) ) {
+                if(temp->next != -1)
+                    temp = &exp->_nodes[temp->next];
+                else
+                    return asd;
+            }
+            asd = str;
+            temp = &exp->_nodes[node->right];
+            while( (asd = trex_matchnode(exp,temp,asd,NULL)) ) {
+                if(temp->next != -1)
+                    temp = &exp->_nodes[temp->next];
+                else
+                    return asd;
+            }
+            return NULL;
+            break;
+    }
+    case OP_EXPR:
+    case OP_NOCAPEXPR:{
+            TRexNode *n = &exp->_nodes[node->left];
+            const TRexChar *cur = str;
+            int capture = -1;
+            if(node->type != OP_NOCAPEXPR && node->right == exp->_currsubexp) {
+                capture = exp->_currsubexp;
+                exp->_matches[capture].begin = cur;
+                exp->_currsubexp++;
+            }
 
-			do {
-				TRexNode *subnext = NULL;
-				if(n->next != -1) {
-					subnext = &exp->_nodes[n->next];
-				}else {
-					subnext = next;
-				}
-				if(!(cur = trex_matchnode(exp,n,cur,subnext))) {
-					if(capture != -1){
-						exp->_matches[capture].begin = 0;
-						exp->_matches[capture].len = 0;
-					}
-					return NULL;
-				}
-			} while((n->next != -1) && (n = &exp->_nodes[n->next]));
+            do {
+                TRexNode *subnext = NULL;
+                if(n->next != -1) {
+                    subnext = &exp->_nodes[n->next];
+                }else {
+                    subnext = next;
+                }
+                if(!(cur = trex_matchnode(exp,n,cur,subnext))) {
+                    if(capture != -1){
+                        exp->_matches[capture].begin = 0;
+                        exp->_matches[capture].len = 0;
+                    }
+                    return NULL;
+                }
+            } while((n->next != -1) && (n = &exp->_nodes[n->next]));
 
-			if(capture != -1)
-				exp->_matches[capture].len = (int)(cur - exp->_matches[capture].begin);
-			return cur;
-	}
-	case OP_WB:
-		if((str == exp->_bol && !ISSPACE(*str))
-		 || ((str == exp->_eol && !ISSPACE(*(str-1))))
-		 || ((!ISSPACE(*str) && ISSPACE(*(str+1))))
-		 || ((ISSPACE(*str) && !ISSPACE(*(str+1)))) ) {
-			return (node->left == 'b')?str:NULL;
-		}
-		return (node->left == 'b')?NULL:str;
-	case OP_BOL:
-		if(str == exp->_bol) return str;
-		return NULL;
-	case OP_EOL:
-		if(str == exp->_eol) return str;
-		return NULL;
-	case OP_DOT:
-		str++;
-		return str;
-	case OP_NCLASS:
-	case OP_CLASS:
-		if(trex_matchclass(exp,&exp->_nodes[node->left],*str)?(type == OP_CLASS?TRex_True:TRex_False):(type == OP_NCLASS?TRex_True:TRex_False)) {
+            if(capture != -1)
+                exp->_matches[capture].len = (int)(cur - exp->_matches[capture].begin);
+            return cur;
+    }
+    case OP_WB:
+        if((str == exp->_bol && !ISSPACE(*str))
+         || ((str == exp->_eol && !ISSPACE(*(str-1))))
+         || ((!ISSPACE(*str) && ISSPACE(*(str+1))))
+         || ((ISSPACE(*str) && !ISSPACE(*(str+1)))) ) {
+            return (node->left == 'b')?str:NULL;
+        }
+        return (node->left == 'b')?NULL:str;
+    case OP_BOL:
+        if(str == exp->_bol) return str;
+        return NULL;
+    case OP_EOL:
+        if(str == exp->_eol) return str;
+        return NULL;
+    case OP_DOT:
+        str++;
+        return str;
+    case OP_NCLASS:
+    case OP_CLASS:
+        if(trex_matchclass(exp,&exp->_nodes[node->left],*str)?(type == OP_CLASS?TRex_True:TRex_False):(type == OP_NCLASS?TRex_True:TRex_False)) {
                         str++;
-			return str;
-		}
-		return NULL;
-	case OP_CCLASS:
-		if(trex_matchcclass(node->left,*str)) {
+            return str;
+        }
+        return NULL;
+    case OP_CCLASS:
+        if(trex_matchcclass(node->left,*str)) {
                         str++;
-			return str;
-		}
-		return NULL;
-	default: /* char */
-		if (exp->_flags & TREX_ICASE)
-		{
-			if(*str != tolower(node->type) && *str != toupper(node->type)) return NULL;
-		}
-		else
-		{
-			if (*str != node->type) return NULL;
-		}
-		str++;
-		return str;
-	}
-	return NULL;
+            return str;
+        }
+        return NULL;
+    default: /* char */
+        if (exp->_flags & TREX_ICASE)
+        {
+            if(*str != tolower(node->type) && *str != toupper(node->type)) return NULL;
+        }
+        else
+        {
+            if (*str != node->type) return NULL;
+        }
+        str++;
+        return str;
+    }
+    return NULL;
 }
 
 /* public api */
 TRex *trex_compile(const TRexChar *pattern,const TRexChar **error,int flags)
 {
-	TRex *exp = (TRex *)malloc(sizeof(TRex));
-	exp->_eol = exp->_bol = NULL;
-	exp->_p = pattern;
-	exp->_nallocated = (int)scstrlen(pattern) * sizeof(TRexChar);
-	exp->_nodes = (TRexNode *)malloc(exp->_nallocated * sizeof(TRexNode));
-	exp->_nsize = 0;
-	exp->_matches = 0;
-	exp->_nsubexpr = 0;
-	exp->_first = trex_newnode(exp,OP_EXPR);
-	exp->_error = error;
-	exp->_jmpbuf = malloc(sizeof(jmp_buf));
-	exp->_flags = flags;
-	if(setjmp(*((jmp_buf*)exp->_jmpbuf)) == 0) {
-		int res = trex_list(exp);
-		exp->_nodes[exp->_first].left = res;
-		if(*exp->_p!='\0')
-			trex_error(exp,_SC("unexpected character"));
+    TRex *exp = (TRex *)malloc(sizeof(TRex));
+    exp->_eol = exp->_bol = NULL;
+    exp->_p = pattern;
+    exp->_nallocated = (int)scstrlen(pattern) * sizeof(TRexChar);
+    exp->_nodes = (TRexNode *)malloc(exp->_nallocated * sizeof(TRexNode));
+    exp->_nsize = 0;
+    exp->_matches = 0;
+    exp->_nsubexpr = 0;
+    exp->_first = trex_newnode(exp,OP_EXPR);
+    exp->_error = error;
+    exp->_jmpbuf = malloc(sizeof(jmp_buf));
+    exp->_flags = flags;
+    if(setjmp(*((jmp_buf*)exp->_jmpbuf)) == 0) {
+        int res = trex_list(exp);
+        exp->_nodes[exp->_first].left = res;
+        if(*exp->_p!='\0')
+            trex_error(exp,_SC("unexpected character"));
 #ifdef _DEBUG
-		{
-			int nsize,i;
-			TRexNode *t;
-			nsize = exp->_nsize;
-			t = &exp->_nodes[0];
-			scprintf(_SC("\n"));
-			for(i = 0;i < nsize; i++) {
-				if(exp->_nodes[i].type>MAX_CHAR)
-					scprintf(_SC("[%02d] %10s "),i,g_nnames[exp->_nodes[i].type-MAX_CHAR]);
-				else
-					scprintf(_SC("[%02d] %10c "),i,exp->_nodes[i].type);
-				scprintf(_SC("left %02d right %02d next %02d\n"),exp->_nodes[i].left,exp->_nodes[i].right,exp->_nodes[i].next);
-			}
-			scprintf(_SC("\n"));
-		}
+        {
+            int nsize,i;
+            TRexNode *t;
+            nsize = exp->_nsize;
+            t = &exp->_nodes[0];
+            scprintf(_SC("\n"));
+            for(i = 0;i < nsize; i++) {
+                if(exp->_nodes[i].type>MAX_CHAR)
+                    scprintf(_SC("[%02d] %10s "),i,g_nnames[exp->_nodes[i].type-MAX_CHAR]);
+                else
+                    scprintf(_SC("[%02d] %10c "),i,exp->_nodes[i].type);
+                scprintf(_SC("left %02d right %02d next %02d\n"),exp->_nodes[i].left,exp->_nodes[i].right,exp->_nodes[i].next);
+            }
+            scprintf(_SC("\n"));
+        }
 #endif
-		exp->_matches = (TRexMatch *) malloc(exp->_nsubexpr * sizeof(TRexMatch));
-		memset(exp->_matches,0,exp->_nsubexpr * sizeof(TRexMatch));
-	}
-	else{
-		trex_free(exp);
-		return NULL;
-	}
-	return exp;
+        exp->_matches = (TRexMatch *) malloc(exp->_nsubexpr * sizeof(TRexMatch));
+        memset(exp->_matches,0,exp->_nsubexpr * sizeof(TRexMatch));
+    }
+    else{
+        trex_free(exp);
+        return NULL;
+    }
+    return exp;
 }
 
 void trex_free(TRex *exp)
 {
-	if(exp)	{
-		if(exp->_nodes) free(exp->_nodes);
-		if(exp->_jmpbuf) free(exp->_jmpbuf);
-		if(exp->_matches) free(exp->_matches);
-		free(exp);
-	}
+    if(exp) {
+        if(exp->_nodes) free(exp->_nodes);
+        if(exp->_jmpbuf) free(exp->_jmpbuf);
+        if(exp->_matches) free(exp->_matches);
+        free(exp);
+    }
 }
 
 TRexBool trex_match(TRex* exp,const TRexChar* text)
 {
-	const TRexChar* res = NULL;
-	exp->_bol = text;
-	exp->_eol = text + scstrlen(text);
-	exp->_currsubexp = 0;
-	res = trex_matchnode(exp,exp->_nodes,text,NULL);
-	if(res == NULL || res != exp->_eol)
-		return TRex_False;
-	return TRex_True;
+    const TRexChar* res = NULL;
+    exp->_bol = text;
+    exp->_eol = text + scstrlen(text);
+    exp->_currsubexp = 0;
+    res = trex_matchnode(exp,exp->_nodes,text,NULL);
+    if(res == NULL || res != exp->_eol)
+        return TRex_False;
+    return TRex_True;
 }
 
 TRexBool trex_searchrange(TRex* exp,const TRexChar* text_begin,const TRexChar* text_end,const TRexChar** out_begin, const TRexChar** out_end)
 {
-	const TRexChar *cur = NULL;
-	int node = exp->_first;
-	if(text_begin >= text_end) return TRex_False;
-	exp->_bol = text_begin;
-	exp->_eol = text_end;
-	do {
-		cur = text_begin;
-		while(node != -1) {
-			exp->_currsubexp = 0;
-			cur = trex_matchnode(exp,&exp->_nodes[node],cur,NULL);
-			if(!cur)
-				break;
-			node = exp->_nodes[node].next;
-		}
-		text_begin++;
-	} while(cur == NULL && text_begin != text_end);
+    const TRexChar *cur = NULL;
+    int node = exp->_first;
+    if(text_begin >= text_end) return TRex_False;
+    exp->_bol = text_begin;
+    exp->_eol = text_end;
+    do {
+        cur = text_begin;
+        while(node != -1) {
+            exp->_currsubexp = 0;
+            cur = trex_matchnode(exp,&exp->_nodes[node],cur,NULL);
+            if(!cur)
+                break;
+            node = exp->_nodes[node].next;
+        }
+        text_begin++;
+    } while(cur == NULL && text_begin != text_end);
 
-	if(cur == NULL)
-		return TRex_False;
+    if(cur == NULL)
+        return TRex_False;
 
-	--text_begin;
+    --text_begin;
 
-	if(out_begin) *out_begin = text_begin;
-	if(out_end) *out_end = cur;
-	return TRex_True;
+    if(out_begin) *out_begin = text_begin;
+    if(out_end) *out_end = cur;
+    return TRex_True;
 }
 
 TRexBool trex_search(TRex* exp,const TRexChar* text, const TRexChar** out_begin, const TRexChar** out_end)
 {
-	return trex_searchrange(exp,text,text + scstrlen(text),out_begin,out_end);
+    return trex_searchrange(exp,text,text + scstrlen(text),out_begin,out_end);
 }
 
 int trex_getsubexpcount(TRex* exp)
 {
-	return exp->_nsubexpr;
+    return exp->_nsubexpr;
 }
 
 TRexBool trex_getsubexp(TRex* exp, int n, TRexMatch *subexp)
 {
-	if( n<0 || n >= exp->_nsubexpr) return TRex_False;
-	*subexp = exp->_matches[n];
-	return TRex_True;
+    if( n<0 || n >= exp->_nsubexpr) return TRex_False;
+    *subexp = exp->_matches[n];
+    return TRex_True;
 }
 /*******************************************************************************
  * This file is part of the argtable3 library.
diff --git a/client/cliparser/cliparser.c b/client/cliparser/cliparser.c
index f1f2e3b1e..e0c853d23 100644
--- a/client/cliparser/cliparser.c
+++ b/client/cliparser/cliparser.c
@@ -20,186 +20,186 @@ char *programHelp = NULL;
 char buf[500] = {0};
 
 int CLIParserInit(char *vprogramName, char *vprogramHint, char *vprogramHelp) {
-	argtable = NULL;
-	argtableLen = 0;
-	programName = vprogramName;
-	programHint = vprogramHint;
-	programHelp = vprogramHelp;
-	memset(buf, 0x00, 500);
+    argtable = NULL;
+    argtableLen = 0;
+    programName = vprogramName;
+    programHint = vprogramHint;
+    programHelp = vprogramHelp;
+    memset(buf, 0x00, 500);
 
-	return 0;
+    return 0;
 }
 
 int CLIParserParseArg(int argc, char **argv, void* vargtable[], size_t vargtableLen, bool allowEmptyExec) {
-	int nerrors;
+    int nerrors;
 
-	argtable = vargtable;
-	argtableLen = vargtableLen;
+    argtable = vargtable;
+    argtableLen = vargtableLen;
 
-	/* verify the argtable[] entries were allocated sucessfully */
-	if (arg_nullcheck(argtable) != 0) {
-		/* NULL entries were detected, some allocations must have failed */
-		printf("ERROR: Insufficient memory\n");
-		return 2;
-	}
-	/* Parse the command line as defined by argtable[] */
-	nerrors = arg_parse(argc, argv, argtable);
+    /* verify the argtable[] entries were allocated sucessfully */
+    if (arg_nullcheck(argtable) != 0) {
+        /* NULL entries were detected, some allocations must have failed */
+        printf("ERROR: Insufficient memory\n");
+        return 2;
+    }
+    /* Parse the command line as defined by argtable[] */
+    nerrors = arg_parse(argc, argv, argtable);
 
-	/* special case: '--help' takes precedence over error reporting */
-	if ((argc < 2 && !allowEmptyExec) ||((struct arg_lit *)argtable[0])->count > 0) { // help must be the first record
-		printf("Usage: %s", programName);
-		arg_print_syntaxv(stdout, argtable, "\n");
-		if (programHint)
-			printf("%s\n\n", programHint);
-		arg_print_glossary(stdout, argtable, "    %-20s %s\n");
-		printf("\n");
-		if (programHelp)
-			printf("%s \n", programHelp);
+    /* special case: '--help' takes precedence over error reporting */
+    if ((argc < 2 && !allowEmptyExec) ||((struct arg_lit *)argtable[0])->count > 0) { // help must be the first record
+        printf("Usage: %s", programName);
+        arg_print_syntaxv(stdout, argtable, "\n");
+        if (programHint)
+            printf("%s\n\n", programHint);
+        arg_print_glossary(stdout, argtable, "    %-20s %s\n");
+        printf("\n");
+        if (programHelp)
+            printf("%s \n", programHelp);
 
-		return 1;
-	}
+        return 1;
+    }
 
-	/* If the parser returned any errors then display them and exit */
-	if (nerrors > 0) {
-		/* Display the error details contained in the arg_end struct.*/
-		arg_print_errors(stdout, ((struct arg_end *)argtable[vargtableLen - 1]), programName);
-		printf("Try '%s --help' for more information.\n", programName);
+    /* If the parser returned any errors then display them and exit */
+    if (nerrors > 0) {
+        /* Display the error details contained in the arg_end struct.*/
+        arg_print_errors(stdout, ((struct arg_end *)argtable[vargtableLen - 1]), programName);
+        printf("Try '%s --help' for more information.\n", programName);
 
-		return 3;
-	}
+        return 3;
+    }
 
-	return 0;
+    return 0;
 }
 
 enum ParserState {
-	PS_FIRST,
-	PS_ARGUMENT,
-	PS_OPTION,
+    PS_FIRST,
+    PS_ARGUMENT,
+    PS_OPTION,
 };
 
 #define isSpace(c)(c == ' ' || c == '\t')
 
 int CLIParserParseString(const char* str, void* vargtable[], size_t vargtableLen, bool allowEmptyExec) {
-	return CLIParserParseStringEx(str, vargtable, vargtableLen, allowEmptyExec, false);
+    return CLIParserParseStringEx(str, vargtable, vargtableLen, allowEmptyExec, false);
 }
 
 int CLIParserParseStringEx(const char* str, void* vargtable[], size_t vargtableLen, bool allowEmptyExec, bool clueData) {
-	int argc = 0;
-	char *argv[200] = {NULL};
+    int argc = 0;
+    char *argv[200] = {NULL};
 
-	int len = strlen(str);
-	char *bufptr = buf;
-	char *spaceptr = NULL;
-	enum ParserState state = PS_FIRST;
+    int len = strlen(str);
+    char *bufptr = buf;
+    char *spaceptr = NULL;
+    enum ParserState state = PS_FIRST;
 
-	argv[argc++] = bufptr;
-	// param0 = program name
-	memcpy(buf, programName, strlen(programName) + 1); // with 0x00
-	bufptr += strlen(programName) + 1;
-	if (len)
-		argv[argc++] = bufptr;
+    argv[argc++] = bufptr;
+    // param0 = program name
+    memcpy(buf, programName, strlen(programName) + 1); // with 0x00
+    bufptr += strlen(programName) + 1;
+    if (len)
+        argv[argc++] = bufptr;
 
-	// parse params
-	for (int i = 0; i < len; i++) {
-		switch(state){
-			case PS_FIRST: // first char
-				if (!clueData || str[i] == '-'){ // first char before space is '-' - next element - option OR not "clueData" for not-option fields
-					state = PS_OPTION;
+    // parse params
+    for (int i = 0; i < len; i++) {
+        switch(state){
+            case PS_FIRST: // first char
+                if (!clueData || str[i] == '-'){ // first char before space is '-' - next element - option OR not "clueData" for not-option fields
+                    state = PS_OPTION;
 
-					if (spaceptr) {
-						bufptr = spaceptr;
-						*bufptr = 0x00;
-						bufptr++;
-						argv[argc++] = bufptr;
-					}
-				}
-				spaceptr = NULL;
-			case PS_ARGUMENT:
-				if (state == PS_FIRST)
-					state = PS_ARGUMENT;
-				if (isSpace(str[i])) {
-					spaceptr = bufptr;
-					state = PS_FIRST;
-				}
-				*bufptr = str[i];
-				bufptr++;
-				break;
-			case PS_OPTION:
-				if (isSpace(str[i])){
-					state = PS_FIRST;
+                    if (spaceptr) {
+                        bufptr = spaceptr;
+                        *bufptr = 0x00;
+                        bufptr++;
+                        argv[argc++] = bufptr;
+                    }
+                }
+                spaceptr = NULL;
+            case PS_ARGUMENT:
+                if (state == PS_FIRST)
+                    state = PS_ARGUMENT;
+                if (isSpace(str[i])) {
+                    spaceptr = bufptr;
+                    state = PS_FIRST;
+                }
+                *bufptr = str[i];
+                bufptr++;
+                break;
+            case PS_OPTION:
+                if (isSpace(str[i])){
+                    state = PS_FIRST;
 
-					*bufptr = 0x00;
-					bufptr++;
-					argv[argc++] = bufptr;
-					break;
-				}
+                    *bufptr = 0x00;
+                    bufptr++;
+                    argv[argc++] = bufptr;
+                    break;
+                }
 
-				*bufptr = str[i];
-				bufptr++;
-				break;
-		}
-	}
+                *bufptr = str[i];
+                bufptr++;
+                break;
+        }
+    }
 
-	return CLIParserParseArg(argc, argv, vargtable, vargtableLen, allowEmptyExec);
+    return CLIParserParseArg(argc, argv, vargtable, vargtableLen, allowEmptyExec);
 }
 
 void CLIParserFree() {
-	arg_freetable(argtable, argtableLen);
-	argtable = NULL;
+    arg_freetable(argtable, argtableLen);
+    argtable = NULL;
 
-	return;
+    return;
 }
 
 // convertors
 int CLIParamHexToBuf(struct arg_str *argstr, uint8_t *data, int maxdatalen, int *datalen) {
-	*datalen = 0;
+    *datalen = 0;
 
-	int ibuf = 0;
-	uint8_t buf[256] = {0};
-	int res = CLIParamStrToBuf(argstr, buf, maxdatalen * 2, &ibuf); // *2 because here HEX
-	if (res || !ibuf)
-		return res;
+    int ibuf = 0;
+    uint8_t buf[256] = {0};
+    int res = CLIParamStrToBuf(argstr, buf, maxdatalen * 2, &ibuf); // *2 because here HEX
+    if (res || !ibuf)
+        return res;
 
-	switch(param_gethex_to_eol((char *)buf, 0, data, maxdatalen, datalen)) {
-	case 1:
-		printf("Parameter error: Invalid HEX value.\n");
-		return 1;
-	case 2:
-		printf("Parameter error: parameter too large.\n");
-		return 2;
-	case 3:
-		printf("Parameter error: Hex string must have even number of digits.\n");
-		return 3;
-	}
+    switch(param_gethex_to_eol((char *)buf, 0, data, maxdatalen, datalen)) {
+    case 1:
+        printf("Parameter error: Invalid HEX value.\n");
+        return 1;
+    case 2:
+        printf("Parameter error: parameter too large.\n");
+        return 2;
+    case 3:
+        printf("Parameter error: Hex string must have even number of digits.\n");
+        return 3;
+    }
 
-	return 0;
+    return 0;
 }
 
 int CLIParamStrToBuf(struct arg_str *argstr, uint8_t *data, int maxdatalen, int *datalen) {
-	*datalen = 0;
-	if (!argstr->count)
-		return 0;
+    *datalen = 0;
+    if (!argstr->count)
+        return 0;
 
-	uint8_t buf[256] = {0};
-	int ibuf = 0;
+    uint8_t buf[256] = {0};
+    int ibuf = 0;
 
-	for (int i = 0; i < argstr->count; i++) {
-		int len = strlen(argstr->sval[i]);
-		memcpy(&buf[ibuf], argstr->sval[i], len);
-		ibuf += len;
-	}
-	buf[ibuf] = 0;
+    for (int i = 0; i < argstr->count; i++) {
+        int len = strlen(argstr->sval[i]);
+        memcpy(&buf[ibuf], argstr->sval[i], len);
+        ibuf += len;
+    }
+    buf[ibuf] = 0;
 
-	if (!ibuf)
-		return 0;
+    if (!ibuf)
+        return 0;
 
-	if (ibuf > maxdatalen)
-		return 2;
+    if (ibuf > maxdatalen)
+        return 2;
 
-	memcpy(data, buf, ibuf);
-	*datalen = ibuf;
+    memcpy(data, buf, ibuf);
+    *datalen = ibuf;
 
-	return 0;
+    return 0;
 }
 
 
diff --git a/client/cliparser/getopt.h b/client/cliparser/getopt.h
index 09ff126b4..c036ff686 100644
--- a/client/cliparser/getopt.h
+++ b/client/cliparser/getopt.h
@@ -1,5 +1,5 @@
-/*	$NetBSD: getopt.h,v 1.4 2000/07/07 10:43:54 ad Exp $	*/
-/*	$FreeBSD$ */
+/* $NetBSD: getopt.h,v 1.4 2000/07/07 10:43:54 ad Exp $ */
+/* $FreeBSD$ */
 
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-NetBSD
@@ -46,34 +46,34 @@
 #define optional_argument  2
 
 struct option {
-	/* name of long option */
-	const char *name;
-	/*
-	 * one of no_argument, required_argument, and optional_argument:
-	 * whether option takes an argument
-	 */
-	int has_arg;
-	/* if not NULL, set *flag to val when option found */
-	int *flag;
-	/* if flag not NULL, value to set *flag to; else return value */
-	int val;
+    /* name of long option */
+    const char *name;
+    /*
+     * one of no_argument, required_argument, and optional_argument:
+     * whether option takes an argument
+     */
+    int has_arg;
+    /* if not NULL, set *flag to val when option found */
+    int *flag;
+    /* if flag not NULL, value to set *flag to; else return value */
+    int val;
 };
 
 __BEGIN_DECLS
-int	getopt_long(int, char * const *, const char *,
-	const struct option *, int *);
-int	getopt_long_only(int, char * const *, const char *,
-	const struct option *, int *);
+int getopt_long(int, char * const *, const char *,
+    const struct option *, int *);
+int getopt_long_only(int, char * const *, const char *,
+    const struct option *, int *);
 #ifndef _GETOPT_DECLARED
-#define	_GETOPT_DECLARED
-int	 getopt(int, char * const [], const char *);
+#define _GETOPT_DECLARED
+int getopt(int, char * const [], const char *);
 
-extern char *optarg;			/* getopt(3) external variables */
+extern char *optarg; /* getopt(3) external variables */
 extern int optind, opterr, optopt;
 #endif
 #ifndef _OPTRESET_DECLARED
-#define	_OPTRESET_DECLARED
-extern int optreset;			/* getopt(3) external variable */
+#define _OPTRESET_DECLARED
+extern int optreset; /* getopt(3) external variable */
 #endif
 __END_DECLS
 
diff --git a/client/cmdanalyse.c b/client/cmdanalyse.c
index 94411f8b5..c0e455fe2 100644
--- a/client/cmdanalyse.c
+++ b/client/cmdanalyse.c
@@ -12,70 +12,70 @@
 static int CmdHelp(const char *Cmd);
 
 int usage_analyse_lcr(void) {
-	PrintAndLogEx(NORMAL, "Specifying the bytes of a UID with a known LRC will find the last byte value");
-	PrintAndLogEx(NORMAL, "needed to generate that LRC with a rolling XOR. All bytes should be specified in HEX.");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  analyse lcr [h] <bytes>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "           h          This help");
-	PrintAndLogEx(NORMAL, "           <bytes>    bytes to calc missing XOR in a LCR");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      analyse lcr 04008064BA");
-	PrintAndLogEx(NORMAL, "expected output: Target (BA) requires final LRC XOR byte value: 5A");
-	return 0;
+    PrintAndLogEx(NORMAL, "Specifying the bytes of a UID with a known LRC will find the last byte value");
+    PrintAndLogEx(NORMAL, "needed to generate that LRC with a rolling XOR. All bytes should be specified in HEX.");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  analyse lcr [h] <bytes>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "           h          This help");
+    PrintAndLogEx(NORMAL, "           <bytes>    bytes to calc missing XOR in a LCR");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      analyse lcr 04008064BA");
+    PrintAndLogEx(NORMAL, "expected output: Target (BA) requires final LRC XOR byte value: 5A");
+    return 0;
 }
 int usage_analyse_checksum(void) {
-	PrintAndLogEx(NORMAL, "The bytes will be added with eachother and than limited with the applied mask");
-	PrintAndLogEx(NORMAL, "Finally compute ones' complement of the least significant bytes");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  analyse chksum [h] [v] b <bytes> m <mask>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "           h          This help");
-	PrintAndLogEx(NORMAL, "           v          supress header");
-	PrintAndLogEx(NORMAL, "           b <bytes>  bytes to calc missing XOR in a LCR");
-	PrintAndLogEx(NORMAL, "           m <mask>   bit mask to limit the outpuyt");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      analyse chksum b 137AF00A0A0D m FF");
-	PrintAndLogEx(NORMAL, "expected output: 0x61");
-	return 0;
+    PrintAndLogEx(NORMAL, "The bytes will be added with eachother and than limited with the applied mask");
+    PrintAndLogEx(NORMAL, "Finally compute ones' complement of the least significant bytes");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  analyse chksum [h] [v] b <bytes> m <mask>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "           h          This help");
+    PrintAndLogEx(NORMAL, "           v          supress header");
+    PrintAndLogEx(NORMAL, "           b <bytes>  bytes to calc missing XOR in a LCR");
+    PrintAndLogEx(NORMAL, "           m <mask>   bit mask to limit the outpuyt");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      analyse chksum b 137AF00A0A0D m FF");
+    PrintAndLogEx(NORMAL, "expected output: 0x61");
+    return 0;
 }
 int usage_analyse_crc(void){
-	PrintAndLogEx(NORMAL, "A stub method to test different crc implementations inside the PM3 sourcecode. Just because you figured out the poly, doesn't mean you get the desired output");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  analyse crc [h] <bytes>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "           h          This help");
-	PrintAndLogEx(NORMAL, "           <bytes>    bytes to calc crc");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      analyse crc 137AF00A0A0D");
-	return 0;
+    PrintAndLogEx(NORMAL, "A stub method to test different crc implementations inside the PM3 sourcecode. Just because you figured out the poly, doesn't mean you get the desired output");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  analyse crc [h] <bytes>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "           h          This help");
+    PrintAndLogEx(NORMAL, "           <bytes>    bytes to calc crc");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      analyse crc 137AF00A0A0D");
+    return 0;
 }
 int usage_analyse_nuid(void){
-	PrintAndLogEx(NORMAL, "Generate 4byte NUID from 7byte UID");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  analyse hid [h] <bytes>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "           h          This help");
-	PrintAndLogEx(NORMAL, "           <bytes>  input bytes (14 hexsymbols)");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      analyse nuid 11223344556677");
-	return 0;
+    PrintAndLogEx(NORMAL, "Generate 4byte NUID from 7byte UID");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  analyse hid [h] <bytes>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "           h          This help");
+    PrintAndLogEx(NORMAL, "           <bytes>  input bytes (14 hexsymbols)");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      analyse nuid 11223344556677");
+    return 0;
 }
 int usage_analyse_a(void) {
-	PrintAndLogEx(NORMAL, "Iceman's personal garbage test command");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  analyse a [h] d <bytes>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "           h          This help");
-	PrintAndLogEx(NORMAL, "           d <bytes>  bytes to send to device");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      analyse a d 137AF00A0A0D");
-	return 0;
+    PrintAndLogEx(NORMAL, "Iceman's personal garbage test command");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  analyse a [h] d <bytes>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "           h          This help");
+    PrintAndLogEx(NORMAL, "           d <bytes>  bytes to send to device");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      analyse a d 137AF00A0A0D");
+    return 0;
 }
 
 static uint8_t calculateLRC( uint8_t* bytes, uint8_t len) {
@@ -94,129 +94,129 @@ static uint16_t matrixadd ( uint8_t* bytes, uint8_t len){
  -----------------
         C32F 9d74
 
-	return 0;
+    return 0;
 }
 */
 /*
 static uint16_t shiftadd ( uint8_t* bytes, uint8_t len){
-	return 0;
+    return 0;
 }
 */
 static uint16_t calcSumCrumbAdd( uint8_t* bytes, uint8_t len, uint32_t mask) {
     uint16_t sum = 0;
     for (uint8_t i = 0; i < len; i++) {
         sum += CRUMB(bytes[i], 0);
-		sum += CRUMB(bytes[i], 2);
-		sum += CRUMB(bytes[i], 4);
-		sum += CRUMB(bytes[i], 6);
-	}
-	sum &= mask;
+        sum += CRUMB(bytes[i], 2);
+        sum += CRUMB(bytes[i], 4);
+        sum += CRUMB(bytes[i], 6);
+    }
+    sum &= mask;
     return sum;
 }
 static uint16_t calcSumCrumbAddOnes( uint8_t* bytes, uint8_t len, uint32_t mask) {
-	return (~calcSumCrumbAdd(bytes, len, mask) & mask);
+    return (~calcSumCrumbAdd(bytes, len, mask) & mask);
 }
 static uint16_t calcSumNibbleAdd( uint8_t* bytes, uint8_t len, uint32_t mask) {
     uint16_t sum = 0;
     for (uint8_t i = 0; i < len; i++) {
         sum += NIBBLE_LOW(bytes[i]);
-		sum += NIBBLE_HIGH(bytes[i]);
-	}
-	sum &= mask;
+        sum += NIBBLE_HIGH(bytes[i]);
+    }
+    sum &= mask;
     return sum;
 }
 static uint16_t calcSumNibbleAddOnes( uint8_t* bytes, uint8_t len, uint32_t mask){
-	return (~calcSumNibbleAdd(bytes, len, mask) & mask);
+    return (~calcSumNibbleAdd(bytes, len, mask) & mask);
 }
 static uint16_t calcSumCrumbXor(  uint8_t* bytes, uint8_t len, uint32_t mask) {
     uint16_t sum = 0;
     for (uint8_t i = 0; i < len; i++) {
         sum ^= CRUMB(bytes[i], 0);
-		sum ^= CRUMB(bytes[i], 2);
-		sum ^= CRUMB(bytes[i], 4);
-		sum ^= CRUMB(bytes[i], 6);
-	}
-	sum &= mask;
+        sum ^= CRUMB(bytes[i], 2);
+        sum ^= CRUMB(bytes[i], 4);
+        sum ^= CRUMB(bytes[i], 6);
+    }
+    sum &= mask;
     return sum;
 }
 static uint16_t calcSumNibbleXor( uint8_t* bytes, uint8_t len, uint32_t mask) {
     uint16_t sum = 0;
     for (uint8_t i = 0; i < len; i++) {
         sum ^= NIBBLE_LOW(bytes[i]);
-		sum ^= NIBBLE_HIGH(bytes[i]);
-	}
-	sum &= mask;
+        sum ^= NIBBLE_HIGH(bytes[i]);
+    }
+    sum &= mask;
     return sum;
 }
 static uint16_t calcSumByteXor( uint8_t* bytes, uint8_t len, uint32_t mask) {
     uint16_t sum = 0;
     for (uint8_t i = 0; i < len; i++) {
-		sum ^= bytes[i];
-	}
-	sum &= mask;
+        sum ^= bytes[i];
+    }
+    sum &= mask;
     return sum;
 }
 static uint16_t calcSumByteAdd( uint8_t* bytes, uint8_t len, uint32_t mask) {
     uint16_t sum = 0;
     for (uint8_t i = 0; i < len; i++) {
-		sum += bytes[i];
-	}
-	sum &= mask;
+        sum += bytes[i];
+    }
+    sum &= mask;
     return sum;
 }
 // Ones complement
 static uint16_t calcSumByteAddOnes( uint8_t* bytes, uint8_t len, uint32_t mask) {
-	return (~calcSumByteAdd(bytes, len, mask) & mask);
+    return (~calcSumByteAdd(bytes, len, mask) & mask);
 }
 
 static uint16_t calcSumByteSub( uint8_t* bytes, uint8_t len, uint32_t mask) {
     uint8_t sum = 0;
     for (uint8_t i = 0; i < len; i++) {
-		sum -= bytes[i];
-	}
-	sum &= mask;
+        sum -= bytes[i];
+    }
+    sum &= mask;
     return sum;
 }
 static uint16_t calcSumByteSubOnes( uint8_t* bytes, uint8_t len, uint32_t mask){
-	return (~calcSumByteSub(bytes, len, mask) & mask);
+    return (~calcSumByteSub(bytes, len, mask) & mask);
 }
 static uint16_t calcSumNibbleSub( uint8_t* bytes, uint8_t len, uint32_t mask) {
     uint8_t sum = 0;
     for (uint8_t i = 0; i < len; i++) {
         sum -= NIBBLE_LOW(bytes[i]);
-		sum -= NIBBLE_HIGH(bytes[i]);
-	}
-	sum &= mask;
+        sum -= NIBBLE_HIGH(bytes[i]);
+    }
+    sum &= mask;
     return sum;
 }
 static uint16_t calcSumNibbleSubOnes( uint8_t* bytes, uint8_t len, uint32_t mask) {
-	return (~calcSumNibbleSub(bytes, len, mask) & mask);
+    return (~calcSumNibbleSub(bytes, len, mask) & mask);
 }
 
 // BSD shift checksum 8bit version
 static uint16_t calcBSDchecksum8( uint8_t* bytes, uint8_t len, uint32_t mask){
-	uint16_t sum = 0;
-	for(uint8_t i = 0; i < len; i++){
-		sum = ((sum & 0xFF) >> 1) | ((sum & 0x1) << 7);   // rotate accumulator
-		sum += bytes[i];  // add next byte
-		sum &= 0xFF;  //
-	}
-	sum &= mask;
-	return sum;
+    uint16_t sum = 0;
+    for(uint8_t i = 0; i < len; i++){
+        sum = ((sum & 0xFF) >> 1) | ((sum & 0x1) << 7);   // rotate accumulator
+        sum += bytes[i];  // add next byte
+        sum &= 0xFF;  //
+    }
+    sum &= mask;
+    return sum;
 }
 // BSD shift checksum 4bit version
 static uint16_t calcBSDchecksum4( uint8_t* bytes, uint8_t len, uint32_t mask){
-	uint16_t sum = 0;
-	for(uint8_t i = 0; i < len; i++){
-		sum = ((sum & 0xF) >> 1) | ((sum & 0x1) << 3);   // rotate accumulator
-		sum += NIBBLE_HIGH(bytes[i]);  // add high nibble
-		sum &= 0xF;  //
-		sum = ((sum & 0xF) >> 1) | ((sum & 0x1) << 3);   // rotate accumulator
-		sum += NIBBLE_LOW(bytes[i]);  // add low nibble
-		sum &= 0xF;  //
-	}
-	sum &= mask;
-	return sum;
+    uint16_t sum = 0;
+    for(uint8_t i = 0; i < len; i++){
+        sum = ((sum & 0xF) >> 1) | ((sum & 0x1) << 3);   // rotate accumulator
+        sum += NIBBLE_HIGH(bytes[i]);  // add high nibble
+        sum &= 0xF;  //
+        sum = ((sum & 0xF) >> 1) | ((sum & 0x1) << 3);   // rotate accumulator
+        sum += NIBBLE_LOW(bytes[i]);  // add low nibble
+        sum &= 0xF;  //
+    }
+    sum &= mask;
+    return sum;
 }
 
 // measuring LFSR maximum length
@@ -226,334 +226,334 @@ int CmdAnalyseLfsr(const char *Cmd){
     uint16_t lfsr = start_state;
     //uint32_t period = 0;
 
-	uint8_t iv = param_get8ex(Cmd, 0, 0, 16);
-	uint8_t find = param_get8ex(Cmd, 1, 0, 16);
+    uint8_t iv = param_get8ex(Cmd, 0, 0, 16);
+    uint8_t find = param_get8ex(Cmd, 1, 0, 16);
 
-	PrintAndLogEx(NORMAL, "LEGIC LFSR IV 0x%02X: \n", iv);
-	PrintAndLogEx(NORMAL, " bit# | lfsr | ^0x40 |  0x%02X ^ lfsr \n",find);
+    PrintAndLogEx(NORMAL, "LEGIC LFSR IV 0x%02X: \n", iv);
+    PrintAndLogEx(NORMAL, " bit# | lfsr | ^0x40 |  0x%02X ^ lfsr \n",find);
 
-	for (uint8_t i = 0x01; i < 0x30; i += 1) {
-		//period = 0;
-		legic_prng_init(iv);
-		legic_prng_forward(i);
-		lfsr = legic_prng_get_bits(12);
+    for (uint8_t i = 0x01; i < 0x30; i += 1) {
+        //period = 0;
+        legic_prng_init(iv);
+        legic_prng_forward(i);
+        lfsr = legic_prng_get_bits(12);
 
-		PrintAndLogEx(NORMAL, " %02X | %03X | %03X | %03X \n",i, lfsr, 0x40 ^ lfsr, find ^ lfsr);
-	}
-	return 0;
+        PrintAndLogEx(NORMAL, " %02X | %03X | %03X | %03X \n",i, lfsr, 0x40 ^ lfsr, find ^ lfsr);
+    }
+    return 0;
 }
 int CmdAnalyseLCR(const char *Cmd) {
-	uint8_t data[50];
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if (strlen(Cmd) == 0|| cmdp == 'h') return usage_analyse_lcr();
+    uint8_t data[50];
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) == 0|| cmdp == 'h') return usage_analyse_lcr();
 
-	int len = 0;
-	switch (param_gethex_to_eol(Cmd, 0, data, sizeof(data), &len)) {
-	case 1:
-		PrintAndLogEx(WARNING, "Invalid HEX value.");
-		return 1;
-	case 2:
-		PrintAndLogEx(WARNING, "Too many bytes.  Max %d bytes", sizeof(data));
-		return 1;
-	case 3:
-		PrintAndLogEx(WARNING, "Hex must have even number of digits.");
-		return 1;
-	}
-	uint8_t finalXor = calculateLRC(data, len);
-	PrintAndLogEx(NORMAL, "Target [%02X] requires final LRC XOR byte value: 0x%02X",data[len-1] ,finalXor);
-	return 0;
+    int len = 0;
+    switch (param_gethex_to_eol(Cmd, 0, data, sizeof(data), &len)) {
+    case 1:
+        PrintAndLogEx(WARNING, "Invalid HEX value.");
+        return 1;
+    case 2:
+        PrintAndLogEx(WARNING, "Too many bytes.  Max %d bytes", sizeof(data));
+        return 1;
+    case 3:
+        PrintAndLogEx(WARNING, "Hex must have even number of digits.");
+        return 1;
+    }
+    uint8_t finalXor = calculateLRC(data, len);
+    PrintAndLogEx(NORMAL, "Target [%02X] requires final LRC XOR byte value: 0x%02X",data[len-1] ,finalXor);
+    return 0;
 }
 int CmdAnalyseCRC(const char *Cmd) {
 
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if (strlen(Cmd) == 0 || cmdp == 'h') return usage_analyse_crc();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) == 0 || cmdp == 'h') return usage_analyse_crc();
 
-	int len = strlen(Cmd);
-	if ( len & 1 ) return usage_analyse_crc();
+    int len = strlen(Cmd);
+    if ( len & 1 ) return usage_analyse_crc();
 
-	// add 1 for null terminator.
-	uint8_t *data = calloc(len+1,  sizeof(uint8_t));
-	if ( !data ) return 1;
+    // add 1 for null terminator.
+    uint8_t *data = calloc(len+1,  sizeof(uint8_t));
+    if ( !data ) return 1;
 
-	if ( param_gethex(Cmd, 0, data, len)) {
-		free(data);
-		return usage_analyse_crc();
-	}
-	len >>= 1;
+    if ( param_gethex(Cmd, 0, data, len)) {
+        free(data);
+        return usage_analyse_crc();
+    }
+    len >>= 1;
 
-	PrintAndLogEx(NORMAL, "\nTests with (%d) | %s",len, sprint_hex(data, len));
+    PrintAndLogEx(NORMAL, "\nTests with (%d) | %s",len, sprint_hex(data, len));
 
-	// 51  f5  7a  d6
-	uint8_t uid[] = {0x51, 0xf5, 0x7a, 0xd6}; //12 34 56
-	init_table(CRC_LEGIC);
-	uint8_t legic8 = CRC8Legic(uid, sizeof(uid));
-	PrintAndLogEx(NORMAL, "Legic 16 | %X (EF6F expected) [legic8 = %02x]", crc16_legic(data, len, legic8), legic8);
-	init_table(CRC_FELICA);
-	PrintAndLogEx(NORMAL, "FeliCa | %X ", crc16_xmodem(data, len));
+    // 51  f5  7a  d6
+    uint8_t uid[] = {0x51, 0xf5, 0x7a, 0xd6}; //12 34 56
+    init_table(CRC_LEGIC);
+    uint8_t legic8 = CRC8Legic(uid, sizeof(uid));
+    PrintAndLogEx(NORMAL, "Legic 16 | %X (EF6F expected) [legic8 = %02x]", crc16_legic(data, len, legic8), legic8);
+    init_table(CRC_FELICA);
+    PrintAndLogEx(NORMAL, "FeliCa | %X ", crc16_xmodem(data, len));
 
-	PrintAndLogEx(NORMAL, "\nTests of reflection. Current methods in source code");
-	PrintAndLogEx(NORMAL, "   reflect(0x3e23L,3) is %04X == 0x3e26", reflect(0x3e23L,3) );
-	PrintAndLogEx(NORMAL, "       reflect8(0x80) is %02X == 0x01", reflect8(0x80));
-	PrintAndLogEx(NORMAL, "    reflect16(0x8000) is %04X == 0x0001", reflect16(0xc6c6));
+    PrintAndLogEx(NORMAL, "\nTests of reflection. Current methods in source code");
+    PrintAndLogEx(NORMAL, "   reflect(0x3e23L,3) is %04X == 0x3e26", reflect(0x3e23L,3) );
+    PrintAndLogEx(NORMAL, "       reflect8(0x80) is %02X == 0x01", reflect8(0x80));
+    PrintAndLogEx(NORMAL, "    reflect16(0x8000) is %04X == 0x0001", reflect16(0xc6c6));
 
-	uint8_t b1, b2;
-	// ISO14443 crc B
-	compute_crc(CRC_14443_B, data, len, &b1, &b2);
-	uint16_t crcBB_1 = b1 << 8 | b2;
-	uint16_t bbb = crc(CRC_14443_B, data, len);
-	PrintAndLogEx(NORMAL, "ISO14443 crc B  | %04x == %04x \n", crcBB_1, bbb );
+    uint8_t b1, b2;
+    // ISO14443 crc B
+    compute_crc(CRC_14443_B, data, len, &b1, &b2);
+    uint16_t crcBB_1 = b1 << 8 | b2;
+    uint16_t bbb = crc(CRC_14443_B, data, len);
+    PrintAndLogEx(NORMAL, "ISO14443 crc B  | %04x == %04x \n", crcBB_1, bbb );
 
 
-	// Test of CRC16,  '123456789' string.
-	//
+    // Test of CRC16,  '123456789' string.
+    //
 
-	PrintAndLogEx(NORMAL, "\n\nStandard test with 31 32 33 34 35 36 37 38 39  '123456789'\n\n");
-	uint8_t dataStr[] = { 0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39 };
-	legic8 = CRC8Legic(dataStr, sizeof(dataStr));
+    PrintAndLogEx(NORMAL, "\n\nStandard test with 31 32 33 34 35 36 37 38 39  '123456789'\n\n");
+    uint8_t dataStr[] = { 0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39 };
+    legic8 = CRC8Legic(dataStr, sizeof(dataStr));
 
-	//these below has been tested OK.
-	PrintAndLogEx(NORMAL, "Confirmed CRC Implementations");
-	PrintAndLogEx(NORMAL, "-------------------------------------\n");
-	PrintAndLogEx(NORMAL, "CRC 8 based\n\n");
-	PrintAndLogEx(NORMAL, "LEGIC: CRC8 : %X (C6 expected)", legic8);
-	PrintAndLogEx(NORMAL, "MAXIM: CRC8 : %X (A1 expected)", CRC8Maxim(dataStr, sizeof(dataStr)));
-	PrintAndLogEx(NORMAL, "-------------------------------------\n");
-	PrintAndLogEx(NORMAL, "CRC16 based\n\n");
+    //these below has been tested OK.
+    PrintAndLogEx(NORMAL, "Confirmed CRC Implementations");
+    PrintAndLogEx(NORMAL, "-------------------------------------\n");
+    PrintAndLogEx(NORMAL, "CRC 8 based\n\n");
+    PrintAndLogEx(NORMAL, "LEGIC: CRC8 : %X (C6 expected)", legic8);
+    PrintAndLogEx(NORMAL, "MAXIM: CRC8 : %X (A1 expected)", CRC8Maxim(dataStr, sizeof(dataStr)));
+    PrintAndLogEx(NORMAL, "-------------------------------------\n");
+    PrintAndLogEx(NORMAL, "CRC16 based\n\n");
 
-	// input from commandline
-	PrintAndLogEx(NORMAL, "CCITT  | %X (29B1 expected)", crc(CRC_CCITT, dataStr, sizeof(dataStr)));
+    // input from commandline
+    PrintAndLogEx(NORMAL, "CCITT  | %X (29B1 expected)", crc(CRC_CCITT, dataStr, sizeof(dataStr)));
 
-	uint8_t poll[] = {0xb2,0x4d,0x12,0x01,0x01,0x2e,0x3d,0x17,0x26,0x47,0x80, 0x95,0x00,0xf1,0x00,0x00,0x00,0x01,0x43,0x00,0xb3,0x7f};
-	PrintAndLogEx(NORMAL, "FeliCa | %04X (B37F expected)", crc(CRC_FELICA, poll+2, sizeof(poll)-4));
-	PrintAndLogEx(NORMAL, "FeliCa | %04X (0000 expected)", crc(CRC_FELICA, poll+2, sizeof(poll)-2));
+    uint8_t poll[] = {0xb2,0x4d,0x12,0x01,0x01,0x2e,0x3d,0x17,0x26,0x47,0x80, 0x95,0x00,0xf1,0x00,0x00,0x00,0x01,0x43,0x00,0xb3,0x7f};
+    PrintAndLogEx(NORMAL, "FeliCa | %04X (B37F expected)", crc(CRC_FELICA, poll+2, sizeof(poll)-4));
+    PrintAndLogEx(NORMAL, "FeliCa | %04X (0000 expected)", crc(CRC_FELICA, poll+2, sizeof(poll)-2));
 
-	uint8_t sel_corr[] = { 0x40, 0xe1, 0xe1, 0xff, 0xfe, 0x5f, 0x02, 0x3c, 0x43, 0x01};
-	PrintAndLogEx(NORMAL, "iCLASS | %04x (0143 expected)", crc(CRC_ICLASS, sel_corr, sizeof(sel_corr)-2));
-	PrintAndLogEx(NORMAL, "---------------------------------------------------------------\n\n\n");
+    uint8_t sel_corr[] = { 0x40, 0xe1, 0xe1, 0xff, 0xfe, 0x5f, 0x02, 0x3c, 0x43, 0x01};
+    PrintAndLogEx(NORMAL, "iCLASS | %04x (0143 expected)", crc(CRC_ICLASS, sel_corr, sizeof(sel_corr)-2));
+    PrintAndLogEx(NORMAL, "---------------------------------------------------------------\n\n\n");
 
-	// ISO14443 crc A
-	compute_crc(CRC_14443_A, dataStr, sizeof(dataStr), &b1, &b2);
-	uint16_t crcAA = b1 << 8 | b2;
-	PrintAndLogEx(NORMAL, "ISO14443 crc A  | %04x or %04x (BF05 expected)\n", crcAA, crc(CRC_14443_A, dataStr, sizeof(dataStr)) );
+    // ISO14443 crc A
+    compute_crc(CRC_14443_A, dataStr, sizeof(dataStr), &b1, &b2);
+    uint16_t crcAA = b1 << 8 | b2;
+    PrintAndLogEx(NORMAL, "ISO14443 crc A  | %04x or %04x (BF05 expected)\n", crcAA, crc(CRC_14443_A, dataStr, sizeof(dataStr)) );
 
-	// ISO14443 crc B
-	compute_crc(CRC_14443_B, dataStr, sizeof(dataStr), &b1, &b2);
-	uint16_t crcBB = b1 << 8 | b2;
-	PrintAndLogEx(NORMAL, "ISO14443 crc B  | %04x or %04x (906E expected)\n", crcBB, crc(CRC_14443_B, dataStr, sizeof(dataStr)) );
+    // ISO14443 crc B
+    compute_crc(CRC_14443_B, dataStr, sizeof(dataStr), &b1, &b2);
+    uint16_t crcBB = b1 << 8 | b2;
+    PrintAndLogEx(NORMAL, "ISO14443 crc B  | %04x or %04x (906E expected)\n", crcBB, crc(CRC_14443_B, dataStr, sizeof(dataStr)) );
 
-	// ISO15693 crc  (x.25)
-	compute_crc(CRC_15693, dataStr, sizeof(dataStr), &b1, &b2);
-	uint16_t crcCC = b1 << 8 | b2;
-	PrintAndLogEx(NORMAL, "ISO15693 crc X25| %04x or %04x (906E expected)\n", crcCC, crc(CRC_15693, dataStr, sizeof(dataStr)) );
+    // ISO15693 crc  (x.25)
+    compute_crc(CRC_15693, dataStr, sizeof(dataStr), &b1, &b2);
+    uint16_t crcCC = b1 << 8 | b2;
+    PrintAndLogEx(NORMAL, "ISO15693 crc X25| %04x or %04x (906E expected)\n", crcCC, crc(CRC_15693, dataStr, sizeof(dataStr)) );
 
-	// ICLASS
-	compute_crc(CRC_ICLASS, dataStr, sizeof(dataStr), &b1, &b2);
-	uint16_t crcDD = b1 << 8 | b2;
-	PrintAndLogEx(NORMAL, "ICLASS crc      | %04x or %04x\n", crcDD, crc(CRC_ICLASS, dataStr, sizeof(dataStr)) );
+    // ICLASS
+    compute_crc(CRC_ICLASS, dataStr, sizeof(dataStr), &b1, &b2);
+    uint16_t crcDD = b1 << 8 | b2;
+    PrintAndLogEx(NORMAL, "ICLASS crc      | %04x or %04x\n", crcDD, crc(CRC_ICLASS, dataStr, sizeof(dataStr)) );
 
-	// FeliCa
-	compute_crc(CRC_FELICA, dataStr, sizeof(dataStr), &b1, &b2);
-	uint16_t crcEE = b1 << 8 | b2;
-	PrintAndLogEx(NORMAL, "FeliCa          | %04x or %04x (31C3 expected)\n", crcEE, crc(CRC_FELICA, dataStr, sizeof(dataStr)));
+    // FeliCa
+    compute_crc(CRC_FELICA, dataStr, sizeof(dataStr), &b1, &b2);
+    uint16_t crcEE = b1 << 8 | b2;
+    PrintAndLogEx(NORMAL, "FeliCa          | %04x or %04x (31C3 expected)\n", crcEE, crc(CRC_FELICA, dataStr, sizeof(dataStr)));
 
-	free(data);
-	return 0;
+    free(data);
+    return 0;
 }
 int CmdAnalyseCHKSUM(const char *Cmd){
 
-	uint8_t data[50];
-	uint8_t cmdp = 0;
-	uint32_t mask = 0xFFFF;
-	bool errors = false;
-	bool useHeader = false;
-	int len = 0;
-	memset(data, 0x0, sizeof(data));
+    uint8_t data[50];
+    uint8_t cmdp = 0;
+    uint32_t mask = 0xFFFF;
+    bool errors = false;
+    bool useHeader = false;
+    int len = 0;
+    memset(data, 0x0, sizeof(data));
 
-	while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch(param_getchar(Cmd, cmdp)) {
-		case 'b':
-		case 'B':
-			param_gethex_ex(Cmd, cmdp+1, data, &len);
-			if ( len%2 ) errors = true;
-			len >>= 1;
-			cmdp += 2;
-			break;
-		case 'm':
-		case 'M':
-			mask = param_get32ex(Cmd, cmdp+1, 0, 16);
-			cmdp += 2;
-			break;
-		case 'v':
-		case 'V':
-			useHeader = true;
-			cmdp++;
-			break;
-		case 'h':
-		case 'H':
-			return usage_analyse_checksum();
-		default:
-			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-			errors = true;
-			break;
-		}
-	}
-	//Validations
-	if (errors || cmdp == 0 ) return usage_analyse_checksum();
+    while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch(param_getchar(Cmd, cmdp)) {
+        case 'b':
+        case 'B':
+            param_gethex_ex(Cmd, cmdp+1, data, &len);
+            if ( len%2 ) errors = true;
+            len >>= 1;
+            cmdp += 2;
+            break;
+        case 'm':
+        case 'M':
+            mask = param_get32ex(Cmd, cmdp+1, 0, 16);
+            cmdp += 2;
+            break;
+        case 'v':
+        case 'V':
+            useHeader = true;
+            cmdp++;
+            break;
+        case 'h':
+        case 'H':
+            return usage_analyse_checksum();
+        default:
+            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+            errors = true;
+            break;
+        }
+    }
+    //Validations
+    if (errors || cmdp == 0 ) return usage_analyse_checksum();
 
-	if (useHeader) {
-		PrintAndLogEx(NORMAL, "     add          | sub         | add 1's compl    | sub 1's compl   | xor");
-		PrintAndLogEx(NORMAL, "byte nibble crumb | byte nibble | byte nibble cumb | byte nibble     | byte nibble cumb |  BSD       |");
-		PrintAndLogEx(NORMAL, "------------------+-------------+------------------+-----------------+--------------------");
-	}
-	PrintAndLogEx(NORMAL, "0x%X 0x%X   0x%X  | 0x%X 0x%X   | 0x%X 0x%X   0x%X | 0x%X 0x%X       | 0x%X 0x%X   0x%X  | 0x%X  0x%X |\n",
-				  calcSumByteAdd(data, len, mask)
-				, calcSumNibbleAdd(data, len, mask)
-				, calcSumCrumbAdd(data, len, mask)
-				, calcSumByteSub(data, len, mask)
-				, calcSumNibbleSub(data, len, mask)
-				, calcSumByteAddOnes(data, len, mask)
-				, calcSumNibbleAddOnes(data, len, mask)
-				, calcSumCrumbAddOnes(data, len, mask)
-				, calcSumByteSubOnes(data, len, mask)
-				, calcSumNibbleSubOnes(data, len, mask)
-				, calcSumByteXor(data, len, mask)
-				, calcSumNibbleXor(data, len, mask)
-				, calcSumCrumbXor(data, len, mask)
-				, calcBSDchecksum8(data, len, mask)
-				, calcBSDchecksum4(data, len, mask)
-			);
-	return 0;
+    if (useHeader) {
+        PrintAndLogEx(NORMAL, "     add          | sub         | add 1's compl    | sub 1's compl   | xor");
+        PrintAndLogEx(NORMAL, "byte nibble crumb | byte nibble | byte nibble cumb | byte nibble     | byte nibble cumb |  BSD       |");
+        PrintAndLogEx(NORMAL, "------------------+-------------+------------------+-----------------+--------------------");
+    }
+    PrintAndLogEx(NORMAL, "0x%X 0x%X   0x%X  | 0x%X 0x%X   | 0x%X 0x%X   0x%X | 0x%X 0x%X       | 0x%X 0x%X   0x%X  | 0x%X  0x%X |\n",
+                  calcSumByteAdd(data, len, mask)
+                , calcSumNibbleAdd(data, len, mask)
+                , calcSumCrumbAdd(data, len, mask)
+                , calcSumByteSub(data, len, mask)
+                , calcSumNibbleSub(data, len, mask)
+                , calcSumByteAddOnes(data, len, mask)
+                , calcSumNibbleAddOnes(data, len, mask)
+                , calcSumCrumbAddOnes(data, len, mask)
+                , calcSumByteSubOnes(data, len, mask)
+                , calcSumNibbleSubOnes(data, len, mask)
+                , calcSumByteXor(data, len, mask)
+                , calcSumNibbleXor(data, len, mask)
+                , calcSumCrumbXor(data, len, mask)
+                , calcBSDchecksum8(data, len, mask)
+                , calcBSDchecksum4(data, len, mask)
+            );
+    return 0;
 }
 
 int CmdAnalyseDates(const char *Cmd){
-	// look for datestamps in a given array of bytes
-	PrintAndLogEx(NORMAL, "To be implemented. Feel free to contribute!");
-	return 0;
+    // look for datestamps in a given array of bytes
+    PrintAndLogEx(NORMAL, "To be implemented. Feel free to contribute!");
+    return 0;
 }
 int CmdAnalyseTEASelfTest(const char *Cmd){
 
-	uint8_t v[8], v_le[8];
-	memset(v, 0x00, sizeof(v));
-	memset(v_le, 0x00, sizeof(v_le));
-	uint8_t* v_ptr = v_le;
+    uint8_t v[8], v_le[8];
+    memset(v, 0x00, sizeof(v));
+    memset(v_le, 0x00, sizeof(v_le));
+    uint8_t* v_ptr = v_le;
 
-	uint8_t cmdlen = strlen(Cmd);
-	cmdlen = ( sizeof(v)<<2 < cmdlen ) ? sizeof(v)<<2 : cmdlen;
+    uint8_t cmdlen = strlen(Cmd);
+    cmdlen = ( sizeof(v)<<2 < cmdlen ) ? sizeof(v)<<2 : cmdlen;
 
-	if ( param_gethex(Cmd, 0, v, cmdlen) > 0 ){
-		PrintAndLogEx(WARNING, "Can't read hex chars, uneven? :: %u", cmdlen);
-		return 1;
-	}
+    if ( param_gethex(Cmd, 0, v, cmdlen) > 0 ){
+        PrintAndLogEx(WARNING, "Can't read hex chars, uneven? :: %u", cmdlen);
+        return 1;
+    }
 
-	SwapEndian64ex(v , 8, 4, v_ptr);
+    SwapEndian64ex(v , 8, 4, v_ptr);
 
-	// ENCRYPTION KEY:
-	uint8_t key[16] = {0x55,0xFE,0xF6,0x30,0x62,0xBF,0x0B,0xC1,0xC9,0xB3,0x7C,0x34,0x97,0x3E,0x29,0xFB };
-	uint8_t keyle[16];
-	uint8_t* key_ptr = keyle;
-	SwapEndian64ex(key , sizeof(key), 4, key_ptr);
+    // ENCRYPTION KEY:
+    uint8_t key[16] = {0x55,0xFE,0xF6,0x30,0x62,0xBF,0x0B,0xC1,0xC9,0xB3,0x7C,0x34,0x97,0x3E,0x29,0xFB };
+    uint8_t keyle[16];
+    uint8_t* key_ptr = keyle;
+    SwapEndian64ex(key , sizeof(key), 4, key_ptr);
 
-	PrintAndLogEx(NORMAL, "TEST LE enc| %s", sprint_hex(v_ptr, 8));
+    PrintAndLogEx(NORMAL, "TEST LE enc| %s", sprint_hex(v_ptr, 8));
 
-	tea_decrypt(v_ptr, key_ptr);
-	PrintAndLogEx(NORMAL, "TEST LE dec | %s", sprint_hex_ascii(v_ptr, 8));
+    tea_decrypt(v_ptr, key_ptr);
+    PrintAndLogEx(NORMAL, "TEST LE dec | %s", sprint_hex_ascii(v_ptr, 8));
 
-	tea_encrypt(v_ptr, key_ptr);
-	tea_encrypt(v_ptr, key_ptr);
-	PrintAndLogEx(NORMAL, "TEST enc2 | %s", sprint_hex_ascii(v_ptr, 8));
+    tea_encrypt(v_ptr, key_ptr);
+    tea_encrypt(v_ptr, key_ptr);
+    PrintAndLogEx(NORMAL, "TEST enc2 | %s", sprint_hex_ascii(v_ptr, 8));
 
-	return 0;
+    return 0;
 }
 
 char* pb(uint32_t b) {
-	static char buf1[33] = {0};
-	static char buf2[33] = {0};
-	static char *s;
+    static char buf1[33] = {0};
+    static char buf2[33] = {0};
+    static char *s;
 
-	if (s != buf1)
-		s = buf1;
-	else
-		s = buf2;
+    if (s != buf1)
+        s = buf1;
+    else
+        s = buf2;
 
-	memset(s, 0, sizeof(buf1));
+    memset(s, 0, sizeof(buf1));
 
-	uint32_t mask = 0x80000000;
-	for (uint8_t i=0; i<32;i++) {
-		s[i] = (mask & b)?'1':'0';
-		mask >>= 1;
-	}
-	return s;
+    uint32_t mask = 0x80000000;
+    for (uint8_t i=0; i<32;i++) {
+        s[i] = (mask & b)?'1':'0';
+        mask >>= 1;
+    }
+    return s;
 }
 
 int CmdAnalyseA(const char *Cmd){
 
-	int hexlen = 0;
-	uint8_t cmdp = 0;
-	bool errors = false;
-	uint8_t data[USB_CMD_DATA_SIZE] = {0x00};
+    int hexlen = 0;
+    uint8_t cmdp = 0;
+    bool errors = false;
+    uint8_t data[USB_CMD_DATA_SIZE] = {0x00};
 
-	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch (tolower(param_getchar(Cmd, cmdp))) {
-		case 'd':
-			param_gethex_ex(Cmd, cmdp+1, data, &hexlen);
-			hexlen >>= 1;
-			if ( hexlen != sizeof(data) ) {
-				PrintAndLogEx(WARNING, "Read %d bytes of %u", hexlen, sizeof(data) );
-			}
-			cmdp += 2;
-			break;
-		case 'h':
-			return usage_analyse_a();
-		default:
-			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-			errors = true;
-			break;
-		}
-	}
-	//Validations
-	if (errors || cmdp == 0 ) return usage_analyse_a();
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+        case 'd':
+            param_gethex_ex(Cmd, cmdp+1, data, &hexlen);
+            hexlen >>= 1;
+            if ( hexlen != sizeof(data) ) {
+                PrintAndLogEx(WARNING, "Read %d bytes of %u", hexlen, sizeof(data) );
+            }
+            cmdp += 2;
+            break;
+        case 'h':
+            return usage_analyse_a();
+        default:
+            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+            errors = true;
+            break;
+        }
+    }
+    //Validations
+    if (errors || cmdp == 0 ) return usage_analyse_a();
 
 
-	UsbCommand c = {CMD_FPC_SEND, {0, 0, 0}};
-	memcpy(c.d.asBytes, data, USB_CMD_DATA_SIZE);
-	clearCommandBuffer();
-	SendCommand(&c);
+    UsbCommand c = {CMD_FPC_SEND, {0, 0, 0}};
+    memcpy(c.d.asBytes, data, USB_CMD_DATA_SIZE);
+    clearCommandBuffer();
+    SendCommand(&c);
 
-	UsbCommand resp;
-	if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
-		return 1;
-	}
-	PrintAndLogEx(NORMAL, "got ack.  Status %d", resp.arg[0]);
-	return 0;
+    UsbCommand resp;
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
+        return 1;
+    }
+    PrintAndLogEx(NORMAL, "got ack.  Status %d", resp.arg[0]);
+    return 0;
 
-	PrintAndLogEx(NORMAL, "-- " _BLUE_(its my message) "\n");
-	PrintAndLogEx(NORMAL, "-- " _RED_(its my message) "\n");
-	PrintAndLogEx(NORMAL, "-- " _YELLOW_(its my message) "\n");
-	PrintAndLogEx(NORMAL, "-- " _GREEN_(its my message) "\n");
+    PrintAndLogEx(NORMAL, "-- " _BLUE_(its my message) "\n");
+    PrintAndLogEx(NORMAL, "-- " _RED_(its my message) "\n");
+    PrintAndLogEx(NORMAL, "-- " _YELLOW_(its my message) "\n");
+    PrintAndLogEx(NORMAL, "-- " _GREEN_(its my message) "\n");
 
-	//uint8_t syncBit = 99;
-	// The start bit is one ore more Sequence Y followed by a Sequence Z (... 11111111 00x11111). We need to distinguish from
-	// Sequence X followed by Sequence Y followed by Sequence Z     (111100x1 11111111 00x11111)
-	// we therefore look for a ...xx1111 11111111 00x11111xxxxxx... pattern
-	// (12 '1's followed by 2 '0's, eventually followed by another '0', followed by 5 '1's)
-	# define SYNC_16BIT 0xB24D
-	uint32_t shiftReg = param_get32ex(Cmd, 0, 0xb24d, 16);
-	uint8_t bt = param_get8ex(Cmd, 1, 0xBB, 16);
-	uint8_t byte_offset = 99;
-	// reverse byte
-	uint8_t rev =  reflect8(bt);
-	PrintAndLogEx(NORMAL, "input  %02x | %02x \n", bt, rev);
-	// add byte to shift register
-	shiftReg = shiftReg << 8 | rev;
+    //uint8_t syncBit = 99;
+    // The start bit is one ore more Sequence Y followed by a Sequence Z (... 11111111 00x11111). We need to distinguish from
+    // Sequence X followed by Sequence Y followed by Sequence Z     (111100x1 11111111 00x11111)
+    // we therefore look for a ...xx1111 11111111 00x11111xxxxxx... pattern
+    // (12 '1's followed by 2 '0's, eventually followed by another '0', followed by 5 '1's)
+    # define SYNC_16BIT 0xB24D
+    uint32_t shiftReg = param_get32ex(Cmd, 0, 0xb24d, 16);
+    uint8_t bt = param_get8ex(Cmd, 1, 0xBB, 16);
+    uint8_t byte_offset = 99;
+    // reverse byte
+    uint8_t rev =  reflect8(bt);
+    PrintAndLogEx(NORMAL, "input  %02x | %02x \n", bt, rev);
+    // add byte to shift register
+    shiftReg = shiftReg << 8 | rev;
 
-	PrintAndLogEx(NORMAL, "shiftreg after %08x | pattern %08x \n", shiftReg, SYNC_16BIT);
+    PrintAndLogEx(NORMAL, "shiftreg after %08x | pattern %08x \n", shiftReg, SYNC_16BIT);
 
-	uint8_t n0 = 0, n1 = 0;
+    uint8_t n0 = 0, n1 = 0;
 
-	n0 = (rev & (uint8_t)(~(0xFF >> (8-4)))) >> 4;
-	n1 = (n1 << 4) | (rev & (uint8_t)(~(0xFF << 4)));
+    n0 = (rev & (uint8_t)(~(0xFF >> (8-4)))) >> 4;
+    n1 = (n1 << 4) | (rev & (uint8_t)(~(0xFF << 4)));
 
-	PrintAndLogEx(NORMAL, "rev %02X | %02X %s | %02X %s |\n", rev, n0, pb(n0), n1, pb(n1) );
+    PrintAndLogEx(NORMAL, "rev %02X | %02X %s | %02X %s |\n", rev, n0, pb(n0), n1, pb(n1) );
 
 /*
 hex(0xb24d shr 0) 0xB24D 0b1011001001001101
@@ -562,111 +562,111 @@ hex(0xb24d shr 2) 0x2C93
 */
 
 for ( int i =0; i< 16; i++) {
-	PrintAndLogEx(NORMAL, " (shiftReg >> %d) & 0xFFFF ==  %08x ---", i, (( shiftReg >> i) & 0xFFFF ));
+    PrintAndLogEx(NORMAL, " (shiftReg >> %d) & 0xFFFF ==  %08x ---", i, (( shiftReg >> i) & 0xFFFF ));
 
-	// kolla om SYNC_PATTERN finns.
-	if ((( shiftReg >> 7) & 0xFFFF ) == SYNC_16BIT) byte_offset = 7;
-	else if ((( shiftReg >> 6) & 0xFFFF ) == SYNC_16BIT) byte_offset = 6;
-	else if ((( shiftReg >> 5) & 0xFFFF ) == SYNC_16BIT) byte_offset = 5;
-	else if ((( shiftReg >> 4) & 0xFFFF ) == SYNC_16BIT) byte_offset = 4;
-	else if ((( shiftReg >> 3) & 0xFFFF ) == SYNC_16BIT) byte_offset = 3;
-	else if ((( shiftReg >> 2) & 0xFFFF ) == SYNC_16BIT) byte_offset = 2;
-	else if ((( shiftReg >> 1) & 0xFFFF ) == SYNC_16BIT) byte_offset = 1;
-	else if ((( shiftReg >> 0) & 0xFFFF ) == SYNC_16BIT) byte_offset = 0;
+    // kolla om SYNC_PATTERN finns.
+    if ((( shiftReg >> 7) & 0xFFFF ) == SYNC_16BIT) byte_offset = 7;
+    else if ((( shiftReg >> 6) & 0xFFFF ) == SYNC_16BIT) byte_offset = 6;
+    else if ((( shiftReg >> 5) & 0xFFFF ) == SYNC_16BIT) byte_offset = 5;
+    else if ((( shiftReg >> 4) & 0xFFFF ) == SYNC_16BIT) byte_offset = 4;
+    else if ((( shiftReg >> 3) & 0xFFFF ) == SYNC_16BIT) byte_offset = 3;
+    else if ((( shiftReg >> 2) & 0xFFFF ) == SYNC_16BIT) byte_offset = 2;
+    else if ((( shiftReg >> 1) & 0xFFFF ) == SYNC_16BIT) byte_offset = 1;
+    else if ((( shiftReg >> 0) & 0xFFFF ) == SYNC_16BIT) byte_offset = 0;
 
-	PrintAndLogEx(NORMAL, "Offset  %u \n", byte_offset);
-	if ( byte_offset != 99 )
-		break;
+    PrintAndLogEx(NORMAL, "Offset  %u \n", byte_offset);
+    if ( byte_offset != 99 )
+        break;
 
-	shiftReg >>=1;
+    shiftReg >>=1;
 }
 
-	uint8_t p1 = (rev & (uint8_t)(~(0xFF << byte_offset)));
-	PrintAndLogEx(NORMAL, "Offset  %u  | leftovers  %02x  %s \n", byte_offset, p1, pb(p1) );
+    uint8_t p1 = (rev & (uint8_t)(~(0xFF << byte_offset)));
+    PrintAndLogEx(NORMAL, "Offset  %u  | leftovers  %02x  %s \n", byte_offset, p1, pb(p1) );
 
 
 
-	/*
+    /*
 pm3 --> da hex2bin 4db2     0100110110110010
 */
-	return 0;
+    return 0;
 /*
-	// split byte into two parts.
-	uint8_t offset = 3, n0 = 0, n1 = 0;
-	rev = 0xB2;
-	for (uint8_t m=0; m<8; m++) {
-		offset = m;
-		n0 = (rev & (uint8_t)(~(0xFF >> (8-offset)))) >> offset;
-		n1 = (n1 << offset) | (rev & (uint8_t)(~(0xFF << offset)));
+    // split byte into two parts.
+    uint8_t offset = 3, n0 = 0, n1 = 0;
+    rev = 0xB2;
+    for (uint8_t m=0; m<8; m++) {
+        offset = m;
+        n0 = (rev & (uint8_t)(~(0xFF >> (8-offset)))) >> offset;
+        n1 = (n1 << offset) | (rev & (uint8_t)(~(0xFF << offset)));
 
-		PrintAndLogEx(NORMAL, "rev %02X | %02X %s | %02X %s |\n", rev, n0, pb(n0), n1, pb(n1) );
-		n0 = 0, n1 = 0;
-		// PrintAndLogEx(NORMAL, " (0xFF >> offset) == %s |\n", pb( (0xFF >> offset)) );
-		//PrintAndLogEx(NORMAL, "~(0xFF >> (8-offset)) == %s |\n", pb(  (uint8_t)(~(0xFF >> (8-offset))) ) );
-		//PrintAndLogEx(NORMAL, " rev & xxx == %s\n\n", pb( (rev & (uint8_t)(~(0xFF << offset))) ));
-	}
+        PrintAndLogEx(NORMAL, "rev %02X | %02X %s | %02X %s |\n", rev, n0, pb(n0), n1, pb(n1) );
+        n0 = 0, n1 = 0;
+        // PrintAndLogEx(NORMAL, " (0xFF >> offset) == %s |\n", pb( (0xFF >> offset)) );
+        //PrintAndLogEx(NORMAL, "~(0xFF >> (8-offset)) == %s |\n", pb(  (uint8_t)(~(0xFF >> (8-offset))) ) );
+        //PrintAndLogEx(NORMAL, " rev & xxx == %s\n\n", pb( (rev & (uint8_t)(~(0xFF << offset))) ));
+    }
 return 0;
-	// from A  -- x bits into B and the rest into C.
+    // from A  -- x bits into B and the rest into C.
 
-	for ( uint8_t i=0; i<8; i++){
-		PrintAndLogEx(NORMAL, "%u | %02X %s | %02X %s |\n", i, a, pb(a), b, pb(b) );
-		b = a & (a & (0xFF >> (8-i)));
-		a >>=1;
-	}
+    for ( uint8_t i=0; i<8; i++){
+        PrintAndLogEx(NORMAL, "%u | %02X %s | %02X %s |\n", i, a, pb(a), b, pb(b) );
+        b = a & (a & (0xFF >> (8-i)));
+        a >>=1;
+    }
 
-	*/
-	return 0;
+    */
+    return 0;
 
-	// 14443-A
-	uint8_t u14_c[] = {0x09, 0x78, 0x00, 0x92, 0x02, 0x54, 0x13, 0x02, 0x04, 0x2d, 0xe8 }; // atqs w crc
-	uint8_t u14_w[] = {0x09, 0x78, 0x00, 0x92, 0x02, 0x54, 0x13, 0x02, 0x04, 0x2d, 0xe7 }; // atqs w crc
-	PrintAndLogEx(FAILED, "14a check wrong crc      | %s\n", (check_crc(CRC_14443_A, u14_w, sizeof(u14_w))) ? "YES": "NO" );
-	PrintAndLogEx(SUCCESS, "14a check correct crc    | %s\n", (check_crc(CRC_14443_A, u14_c, sizeof(u14_c))) ? "YES": "NO" );
+    // 14443-A
+    uint8_t u14_c[] = {0x09, 0x78, 0x00, 0x92, 0x02, 0x54, 0x13, 0x02, 0x04, 0x2d, 0xe8 }; // atqs w crc
+    uint8_t u14_w[] = {0x09, 0x78, 0x00, 0x92, 0x02, 0x54, 0x13, 0x02, 0x04, 0x2d, 0xe7 }; // atqs w crc
+    PrintAndLogEx(FAILED, "14a check wrong crc      | %s\n", (check_crc(CRC_14443_A, u14_w, sizeof(u14_w))) ? "YES": "NO" );
+    PrintAndLogEx(SUCCESS, "14a check correct crc    | %s\n", (check_crc(CRC_14443_A, u14_c, sizeof(u14_c))) ? "YES": "NO" );
 
-	// 14443-B
-	uint8_t u14b[] = {0x05,0x00,0x08,0x39,0x73};
-	PrintAndLogEx(NORMAL, "14b check crc            | %s\n", (check_crc(CRC_14443_B, u14b, sizeof(u14b))) ? "YES": "NO");
+    // 14443-B
+    uint8_t u14b[] = {0x05,0x00,0x08,0x39,0x73};
+    PrintAndLogEx(NORMAL, "14b check crc            | %s\n", (check_crc(CRC_14443_B, u14b, sizeof(u14b))) ? "YES": "NO");
 
-	// 15693 test
-	uint8_t u15_c[] = {0x05,0x00,0x08,0x39,0x73}; // correct
-	uint8_t u15_w[] = {0x05,0x00,0x08,0x39,0x72};	// wrong
-	PrintAndLogEx(FAILED, "15 check wrong crc       | %s\n", (check_crc(CRC_15693, u15_w, sizeof(u15_w))) ? "YES": "NO");
-	PrintAndLogEx(SUCCESS, "15 check correct crc     | %s\n", (check_crc(CRC_15693, u15_c, sizeof(u15_c))) ? "YES": "NO");
+    // 15693 test
+    uint8_t u15_c[] = {0x05,0x00,0x08,0x39,0x73}; // correct
+    uint8_t u15_w[] = {0x05,0x00,0x08,0x39,0x72}; // wrong
+    PrintAndLogEx(FAILED, "15 check wrong crc       | %s\n", (check_crc(CRC_15693, u15_w, sizeof(u15_w))) ? "YES": "NO");
+    PrintAndLogEx(SUCCESS, "15 check correct crc     | %s\n", (check_crc(CRC_15693, u15_c, sizeof(u15_c))) ? "YES": "NO");
 
-	// iCLASS test - wrong crc , swapped bytes.
-	uint8_t iclass_w[] = { 0x40, 0xe1, 0xe1, 0xff, 0xfe, 0x5f, 0x02, 0x3c, 0x01, 0x43};
-	uint8_t iclass_c[] = { 0x40, 0xe1, 0xe1, 0xff, 0xfe, 0x5f, 0x02, 0x3c, 0x43, 0x01};
-	PrintAndLogEx(FAILED, "iCLASS check wrong crc   | %s\n", (check_crc(CRC_ICLASS, iclass_w, sizeof(iclass_w))) ? "YES": "NO");
-	PrintAndLogEx(SUCCESS, "iCLASS check correct crc | %s\n", (check_crc(CRC_ICLASS, iclass_c, sizeof(iclass_c))) ? "YES": "NO");
+    // iCLASS test - wrong crc , swapped bytes.
+    uint8_t iclass_w[] = { 0x40, 0xe1, 0xe1, 0xff, 0xfe, 0x5f, 0x02, 0x3c, 0x01, 0x43};
+    uint8_t iclass_c[] = { 0x40, 0xe1, 0xe1, 0xff, 0xfe, 0x5f, 0x02, 0x3c, 0x43, 0x01};
+    PrintAndLogEx(FAILED, "iCLASS check wrong crc   | %s\n", (check_crc(CRC_ICLASS, iclass_w, sizeof(iclass_w))) ? "YES": "NO");
+    PrintAndLogEx(SUCCESS, "iCLASS check correct crc | %s\n", (check_crc(CRC_ICLASS, iclass_c, sizeof(iclass_c))) ? "YES": "NO");
 
-	// FeliCa test
-	uint8_t felica_w[] = {0x12,0x01,0x01,0x2e,0x3d,0x17,0x26,0x47,0x80, 0x95,0x00,0xf1,0x00,0x00,0x00,0x01,0x43,0x00,0xb3,0x7e};
-	uint8_t felica_c[] = {0x12,0x01,0x01,0x2e,0x3d,0x17,0x26,0x47,0x80, 0x95,0x00,0xf1,0x00,0x00,0x00,0x01,0x43,0x00,0xb3,0x7f};
-	PrintAndLogEx(FAILED, "FeliCa check wrong crc   | %s\n", (check_crc(CRC_FELICA, felica_w, sizeof(felica_w))) ? "YES": "NO");
-	PrintAndLogEx(SUCCESS, "FeliCa check correct crc | %s\n", (check_crc(CRC_FELICA, felica_c, sizeof(felica_c))) ? "YES": "NO");
+    // FeliCa test
+    uint8_t felica_w[] = {0x12,0x01,0x01,0x2e,0x3d,0x17,0x26,0x47,0x80, 0x95,0x00,0xf1,0x00,0x00,0x00,0x01,0x43,0x00,0xb3,0x7e};
+    uint8_t felica_c[] = {0x12,0x01,0x01,0x2e,0x3d,0x17,0x26,0x47,0x80, 0x95,0x00,0xf1,0x00,0x00,0x00,0x01,0x43,0x00,0xb3,0x7f};
+    PrintAndLogEx(FAILED, "FeliCa check wrong crc   | %s\n", (check_crc(CRC_FELICA, felica_w, sizeof(felica_w))) ? "YES": "NO");
+    PrintAndLogEx(SUCCESS, "FeliCa check correct crc | %s\n", (check_crc(CRC_FELICA, felica_c, sizeof(felica_c))) ? "YES": "NO");
 
-	PrintAndLogEx(NORMAL, "\n\n");
+    PrintAndLogEx(NORMAL, "\n\n");
 
-	return 0;
-	/*
-	bool term = !isatty(STDIN_FILENO);
-	if (!term) {
-		char star[4];
-		star[0] = '-';
-		star[1] = '\\';
-		star[2] = '|';
-		star[3] = '/';
+    return 0;
+    /*
+    bool term = !isatty(STDIN_FILENO);
+    if (!term) {
+        char star[4];
+        star[0] = '-';
+        star[1] = '\\';
+        star[2] = '|';
+        star[3] = '/';
 
-		for (uint8_t k=0; k<4; k = (k+1) % 4 ) {
-			PrintAndLogEx(NORMAL, "\e[s%c\e[u", star[k]);
-			fflush(stdout);
-			if (ukbhit()) {
-				int gc = getchar(); (void)gc;
-				break;
-			}
-		}
-	}
-	*/
+        for (uint8_t k=0; k<4; k = (k+1) % 4 ) {
+            PrintAndLogEx(NORMAL, "\e[s%c\e[u", star[k]);
+            fflush(stdout);
+            if (ukbhit()) {
+                int gc = getchar(); (void)gc;
+                break;
+            }
+        }
+    }
+    */
 
 //piwi
 // uid(2e086b1a) nt(230736f6) ks(0b0008000804000e) nr(000000000)
@@ -691,225 +691,225 @@ return 0;
 uid(3e172b29) nt(039b7bd2) ks(0c0e0f0505080800) nr(00000001)
 uid(3e172b29) nt(039b7bd2) ks(0e06090d03000b0f) nr(00000002)
 */
-	uint64_t *keylistA = NULL, *keylistB = NULL;
-	uint32_t keycountA = 0, keycountB = 0;
-//	uint64_t d1[] = {0x3e172b29, 0x039b7bd2, 0x0000001, 0, 0x0c0e0f0505080800};
-//	uint64_t d2[] = {0x3e172b29, 0x039b7bd2, 0x0000002, 0, 0x0e06090d03000b0f};
+    uint64_t *keylistA = NULL, *keylistB = NULL;
+    uint32_t keycountA = 0, keycountB = 0;
+//  uint64_t d1[] = {0x3e172b29, 0x039b7bd2, 0x0000001, 0, 0x0c0e0f0505080800};
+//  uint64_t d2[] = {0x3e172b29, 0x039b7bd2, 0x0000002, 0, 0x0e06090d03000b0f};
 uint64_t d1[] = {0x6e442129, 0x8f699195, 0x0000001, 0, 0x090d0b0305020f02};
 uint64_t d2[] = {0x6e442129, 0x8f699195, 0x0000004, 0, 0x00040f0f0305030e};
 
-	keycountA = nonce2key(d1[0], d1[1], d1[2], 0, d1[3], d1[4] ,&keylistA);
-	keycountB = nonce2key(d2[0], d2[1], d2[2], 0, d2[3], d2[4], &keylistB);
+    keycountA = nonce2key(d1[0], d1[1], d1[2], 0, d1[3], d1[4] ,&keylistA);
+    keycountB = nonce2key(d2[0], d2[1], d2[2], 0, d2[3], d2[4], &keylistB);
 
-	switch (keycountA) {
-		case 0: PrintAndLogEx(FAILED, "Key test A failed\n"); break;
-		case 1: PrintAndLogEx(SUCCESS, "KEY A | %012" PRIX64 " ", keylistA[0]); break;
-	}
-	switch (keycountB) {
-		case 0: PrintAndLogEx(FAILED, "Key test B failed\n"); break;
-		case 1: PrintAndLogEx(SUCCESS, "KEY B | %012" PRIX64 " ", keylistB[0]); break;
-	}
+    switch (keycountA) {
+        case 0: PrintAndLogEx(FAILED, "Key test A failed\n"); break;
+        case 1: PrintAndLogEx(SUCCESS, "KEY A | %012" PRIX64 " ", keylistA[0]); break;
+    }
+    switch (keycountB) {
+        case 0: PrintAndLogEx(FAILED, "Key test B failed\n"); break;
+        case 1: PrintAndLogEx(SUCCESS, "KEY B | %012" PRIX64 " ", keylistB[0]); break;
+    }
 
-	free(keylistA);
-	free(keylistB);
+    free(keylistA);
+    free(keylistB);
 
-//	qsort(keylist, keycount, sizeof(*keylist), compare_uint64);
-//	keycount = intersection(last_keylist, keylist);
+//  qsort(keylist, keycount, sizeof(*keylist), compare_uint64);
+//  keycount = intersection(last_keylist, keylist);
 
-	/*
-	uint64_t keys[] = {
-		0x7b5b8144a32f, 0x76b46ccc461e, 0x03c3c36ea7a2, 0x171414d31961,
-		0xe2bfc7153eea, 0x48023d1d1985, 0xff7e1a410953, 0x49a3110249d3,
-		0xe3515546d015, 0x667c2ac86f85, 0x5774a8d5d6a9, 0xe401c2ca602c,
-		0x3be7e5020a7e, 0x66dbec3cf90b, 0x4e13f1534605, 0x5c172e1e78c9,
-		0xeafe51411fbf, 0xc579f0fcdd8f, 0x2146a0d745c3, 0xab31ca60171a,
-		0x3169130a5035, 0xde5e11ea4923, 0x96fe2aeb9924, 0x828b61e6fcba,
-		0x8211b0607367, 0xe2936b320f76, 0xaff501e84378, 0x82b31cedb21b,
-		0xb725d31d4cd3, 0x3b984145b2f1, 0x3b4adb3e82ba, 0x8779075210fe
-	};
+    /*
+    uint64_t keys[] = {
+        0x7b5b8144a32f, 0x76b46ccc461e, 0x03c3c36ea7a2, 0x171414d31961,
+        0xe2bfc7153eea, 0x48023d1d1985, 0xff7e1a410953, 0x49a3110249d3,
+        0xe3515546d015, 0x667c2ac86f85, 0x5774a8d5d6a9, 0xe401c2ca602c,
+        0x3be7e5020a7e, 0x66dbec3cf90b, 0x4e13f1534605, 0x5c172e1e78c9,
+        0xeafe51411fbf, 0xc579f0fcdd8f, 0x2146a0d745c3, 0xab31ca60171a,
+        0x3169130a5035, 0xde5e11ea4923, 0x96fe2aeb9924, 0x828b61e6fcba,
+        0x8211b0607367, 0xe2936b320f76, 0xaff501e84378, 0x82b31cedb21b,
+        0xb725d31d4cd3, 0x3b984145b2f1, 0x3b4adb3e82ba, 0x8779075210fe
+    };
 
-	uint64_t keya[] = {
-		0x7b5b8144a32f, 0x76b46ccc461e, 0x03c3c36ea7a2, 0x171414d31961,
-		0xe2bfc7153eea, 0x48023d1d1985, 0xff7e1a410953, 0x49a3110249d3,
-		0xe3515546d015, 0x667c2ac86f85, 0x5774a8d5d6a9, 0xe401c2ca602c,
-		0x3be7e5020a7e, 0x66dbec3cf90b, 0x4e13f1534605, 0x5c172e1e78c9
-	};
-	uint64_t keyb[] = {
-		0xeafe51411fbf, 0xc579f0fcdd8f, 0x2146a0d745c3, 0xab31ca60171a,
-		0x3169130a5035, 0xde5e11ea4923, 0x96fe2aeb9924, 0x828b61e6fcba,
-		0x8211b0607367, 0xe2936b320f76, 0xaff501e84378, 0x82b31cedb21b,
-		0xb725d31d4cd3, 0x3b984145b2f1, 0x3b4adb3e82ba, 0x8779075210fe
-	};
+    uint64_t keya[] = {
+        0x7b5b8144a32f, 0x76b46ccc461e, 0x03c3c36ea7a2, 0x171414d31961,
+        0xe2bfc7153eea, 0x48023d1d1985, 0xff7e1a410953, 0x49a3110249d3,
+        0xe3515546d015, 0x667c2ac86f85, 0x5774a8d5d6a9, 0xe401c2ca602c,
+        0x3be7e5020a7e, 0x66dbec3cf90b, 0x4e13f1534605, 0x5c172e1e78c9
+    };
+    uint64_t keyb[] = {
+        0xeafe51411fbf, 0xc579f0fcdd8f, 0x2146a0d745c3, 0xab31ca60171a,
+        0x3169130a5035, 0xde5e11ea4923, 0x96fe2aeb9924, 0x828b61e6fcba,
+        0x8211b0607367, 0xe2936b320f76, 0xaff501e84378, 0x82b31cedb21b,
+        0xb725d31d4cd3, 0x3b984145b2f1, 0x3b4adb3e82ba, 0x8779075210fe
+    };
 
-	*/
+    */
 
-	/*
-	uint64_t xor[] = {
-		0x0DEFED88E531,	0x7577AFA2E1BC,	0x14D7D7BDBEC3,	0xF5ABD3C6278B,
-		0xAABDFA08276F,	0xB77C275C10D6,	0xB6DD0B434080,	0xAAF2444499C6,
-		0x852D7F8EBF90,	0x3108821DB92C,	0xB3756A1FB685,	0xDFE627C86A52,
-		0x5D3C093EF375,	0x28C81D6FBF0E,	0x1204DF4D3ECC, 0xB6E97F5F6776,
-		0x2F87A1BDC230, 0xE43F502B984C,	0x8A776AB752D9,	0x9A58D96A472F,
-		0xEF3702E01916, 0x48A03B01D007, 0x14754B0D659E, 0x009AD1868FDD,
-		0x6082DB527C11, 0x4D666ADA4C0E, 0x2D461D05F163, 0x3596CFF0FEC8,
-		0x8CBD9258FE22, 0x00D29A7B304B, 0xBC33DC6C9244
-	};
+    /*
+    uint64_t xor[] = {
+        0x0DEFED88E531, 0x7577AFA2E1BC, 0x14D7D7BDBEC3, 0xF5ABD3C6278B,
+        0xAABDFA08276F, 0xB77C275C10D6, 0xB6DD0B434080, 0xAAF2444499C6,
+        0x852D7F8EBF90, 0x3108821DB92C, 0xB3756A1FB685, 0xDFE627C86A52,
+        0x5D3C093EF375, 0x28C81D6FBF0E, 0x1204DF4D3ECC, 0xB6E97F5F6776,
+        0x2F87A1BDC230, 0xE43F502B984C, 0x8A776AB752D9, 0x9A58D96A472F,
+        0xEF3702E01916, 0x48A03B01D007, 0x14754B0D659E, 0x009AD1868FDD,
+        0x6082DB527C11, 0x4D666ADA4C0E, 0x2D461D05F163, 0x3596CFF0FEC8,
+        0x8CBD9258FE22, 0x00D29A7B304B, 0xBC33DC6C9244
+    };
 
 
-	uint64_t xorA[] = {
-		0x0DEFED88E531,	0x7577AFA2E1BC,	0x14D7D7BDBEC3,	0xF5ABD3C6278B,
-		0xAABDFA08276F,	0xB77C275C10D6,	0xB6DD0B434080,	0xAAF2444499C6,
-		0x852D7F8EBF90,	0x3108821DB92C,	0xB3756A1FB685,	0xDFE627C86A52,
-		0x5D3C093EF375,	0x28C81D6FBF0E,	0x1204DF4D3ECC
-	};
-	uint64_t xorB[] = {
-		0x2F87A1BDC230, 0xE43F502B984C,	0x8A776AB752D9,	0x9A58D96A472F,
-		0xEF3702E01916, 0x48A03B01D007, 0x14754B0D659E, 0x009AD1868FDD,
-		0x6082DB527C11, 0x4D666ADA4C0E, 0x2D461D05F163, 0x3596CFF0FEC8,
-		0x8CBD9258FE22, 0x00D29A7B304B, 0xBC33DC6C9244
-	};
-	*/
-	/*
-	// xor key A      | xor key B
-	1  | 0DEFED88E531 | 2F87A1BDC230
-	2  | 7577AFA2E1BC | E43F502B984C
-	3  | 14D7D7BDBEC3 | 8A776AB752D9
-	4  | F5ABD3C6278B | 9A58D96A472F
-	5  | AABDFA08276F | EF3702E01916
-	6  | B77C275C10D6 | 48A03B01D007
-	7  | B6DD0B434080 | 14754B0D659E
-	8  | AAF2444499C6 | 009AD1868FDD
-	9  | 852D7F8EBF90 | 6082DB527C11
-	10 | 3108821DB92C | 4D666ADA4C0E
-	11 | B3756A1FB685 | 2D461D05F163
-	12 | DFE627C86A52 | 3596CFF0FEC8
-	13 | 5D3C093EF375 | 8CBD9258FE22
-	14 | 28C81D6FBF0E | 00D29A7B304B
-	15 | 1204DF4D3ECC | BC33DC6C9244
-	*/
+    uint64_t xorA[] = {
+        0x0DEFED88E531, 0x7577AFA2E1BC, 0x14D7D7BDBEC3, 0xF5ABD3C6278B,
+        0xAABDFA08276F, 0xB77C275C10D6, 0xB6DD0B434080, 0xAAF2444499C6,
+        0x852D7F8EBF90, 0x3108821DB92C, 0xB3756A1FB685, 0xDFE627C86A52,
+        0x5D3C093EF375, 0x28C81D6FBF0E, 0x1204DF4D3ECC
+    };
+    uint64_t xorB[] = {
+        0x2F87A1BDC230, 0xE43F502B984C, 0x8A776AB752D9, 0x9A58D96A472F,
+        0xEF3702E01916, 0x48A03B01D007, 0x14754B0D659E, 0x009AD1868FDD,
+        0x6082DB527C11, 0x4D666ADA4C0E, 0x2D461D05F163, 0x3596CFF0FEC8,
+        0x8CBD9258FE22, 0x00D29A7B304B, 0xBC33DC6C9244
+    };
+    */
+    /*
+    // xor key A      | xor key B
+    1  | 0DEFED88E531 | 2F87A1BDC230
+    2  | 7577AFA2E1BC | E43F502B984C
+    3  | 14D7D7BDBEC3 | 8A776AB752D9
+    4  | F5ABD3C6278B | 9A58D96A472F
+    5  | AABDFA08276F | EF3702E01916
+    6  | B77C275C10D6 | 48A03B01D007
+    7  | B6DD0B434080 | 14754B0D659E
+    8  | AAF2444499C6 | 009AD1868FDD
+    9  | 852D7F8EBF90 | 6082DB527C11
+    10 | 3108821DB92C | 4D666ADA4C0E
+    11 | B3756A1FB685 | 2D461D05F163
+    12 | DFE627C86A52 | 3596CFF0FEC8
+    13 | 5D3C093EF375 | 8CBD9258FE22
+    14 | 28C81D6FBF0E | 00D29A7B304B
+    15 | 1204DF4D3ECC | BC33DC6C9244
+    */
 
-	// generate xor table :)
-	/*
-	for (uint8_t i=0; i<31; i++){
-		uint64_t a = keys[i] ^ keys[i+1];
-		PrintAndLogEx(NORMAL, "%u | %012" PRIX64 " | \n", i, a);
-	}
-	*/
+    // generate xor table :)
+    /*
+    for (uint8_t i=0; i<31; i++){
+        uint64_t a = keys[i] ^ keys[i+1];
+        PrintAndLogEx(NORMAL, "%u | %012" PRIX64 " | \n", i, a);
+    }
+    */
 
-	/*
-	uint32_t id = param_get32ex(Cmd, 0, 0x93290142, 16);
-	uint8_t uid[6] = {0};
-	num_to_bytes(id,4,uid);
+    /*
+    uint32_t id = param_get32ex(Cmd, 0, 0x93290142, 16);
+    uint8_t uid[6] = {0};
+    num_to_bytes(id,4,uid);
 
-	uint8_t key_s0a[] = {
-		uid[1] ^ uid[2] ^ uid[3] ^ 0x11,
-		uid[1] ^ 0x72,
-		uid[2] ^ 0x80,
-		(uid[0] + uid[1] + uid[2] + uid[3] ) ^ uid[3] ^ 0x19,
-		0xA3,
-		0x2F
-	};
+    uint8_t key_s0a[] = {
+        uid[1] ^ uid[2] ^ uid[3] ^ 0x11,
+        uid[1] ^ 0x72,
+        uid[2] ^ 0x80,
+        (uid[0] + uid[1] + uid[2] + uid[3] ) ^ uid[3] ^ 0x19,
+        0xA3,
+        0x2F
+    };
 
-	PrintAndLogEx(NORMAL, "UID   | %s\n", sprint_hex(uid,4 ));
-	PrintAndLogEx(NORMAL, "KEY A | %s\n", sprint_hex(key_s0a, 6));
+    PrintAndLogEx(NORMAL, "UID   | %s\n", sprint_hex(uid,4 ));
+    PrintAndLogEx(NORMAL, "KEY A | %s\n", sprint_hex(key_s0a, 6));
 
-	// arrays w all keys
-	uint64_t foo[32] = {0};
+    // arrays w all keys
+    uint64_t foo[32] = {0};
 
-	//A
-	foo[0] = bytes_to_num(key_s0a, 6);
-	//B
-	//foo[16] = 0xcafe71411fbf;
-	foo[16] = 0xeafe51411fbf;
+    //A
+    foo[0] = bytes_to_num(key_s0a, 6);
+    //B
+    //foo[16] = 0xcafe71411fbf;
+    foo[16] = 0xeafe51411fbf;
 
-	for (uint8_t i=0; i<15; i++){
-		foo[i+1] = foo[i] ^ xorA[i];
-		foo[i+16+1] = foo[i+16] ^ xorB[i];
+    for (uint8_t i=0; i<15; i++){
+        foo[i+1] = foo[i] ^ xorA[i];
+        foo[i+16+1] = foo[i+16] ^ xorB[i];
 
-	}
-	for (uint8_t i=0; i<15; i++){
-		uint64_t a = foo[i];
-		uint64_t b = foo[i+16];
+    }
+    for (uint8_t i=0; i<15; i++){
+        uint64_t a = foo[i];
+        uint64_t b = foo[i+16];
 
-		PrintAndLogEx(NORMAL, "%02u | %012" PRIX64 " %s | %012" PRIX64 " %s\n",
-			i,
-			a,
-			( a == keya[i])?"ok":"err",
-			b,
-			( b == keyb[i])?"ok":"err"
-		);
-	}
-	*/
-	return 0;
+        PrintAndLogEx(NORMAL, "%02u | %012" PRIX64 " %s | %012" PRIX64 " %s\n",
+            i,
+            a,
+            ( a == keya[i])?"ok":"err",
+            b,
+            ( b == keyb[i])?"ok":"err"
+        );
+    }
+    */
+    return 0;
 }
 
 void generate4bNUID(uint8_t *uid, uint8_t *nuid){
-	uint16_t crc;
-	uint8_t b1, b2;
+    uint16_t crc;
+    uint8_t b1, b2;
 
-	compute_crc(CRC_14443_A, uid, 3, &b1, &b2);
-	nuid[0] = (b2 & 0xE0) | 0xF;
-	nuid[1] = b1;
-	crc = b1;
-	crc |= b2 << 8;
-	crc = crc16_fast(&uid[3], 4, reflect16(crc), true, true);
-	nuid[2] = (crc >> 8) & 0xFF ;
-	nuid[3] = crc & 0xFF;
+    compute_crc(CRC_14443_A, uid, 3, &b1, &b2);
+    nuid[0] = (b2 & 0xE0) | 0xF;
+    nuid[1] = b1;
+    crc = b1;
+    crc |= b2 << 8;
+    crc = crc16_fast(&uid[3], 4, reflect16(crc), true, true);
+    nuid[2] = (crc >> 8) & 0xFF ;
+    nuid[3] = crc & 0xFF;
 }
 
 int CmdAnalyseNuid(const char *Cmd){
-	uint8_t nuid[4] = {0};
-	uint8_t uid[7] = {0};
-	int len = 0;
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if (strlen(Cmd) == 0|| cmdp == 'h') return usage_analyse_nuid();
+    uint8_t nuid[4] = {0};
+    uint8_t uid[7] = {0};
+    int len = 0;
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) == 0|| cmdp == 'h') return usage_analyse_nuid();
 
-	/* src: https://www.nxp.com/docs/en/application-note/AN10927.pdf */
-	/* selftest1  UID 040D681AB52281  -> NUID 8F430FEF */
-	/* selftest2  UID 04183F09321B85  -> NUID 4F505D7D */
-	if (cmdp == 't') {
-		memcpy(uid, "\x04\x0d\x68\x1a\xb5\x22\x81", 7);
-		generate4bNUID(uid, nuid);
+    /* src: https://www.nxp.com/docs/en/application-note/AN10927.pdf */
+    /* selftest1  UID 040D681AB52281  -> NUID 8F430FEF */
+    /* selftest2  UID 04183F09321B85  -> NUID 4F505D7D */
+    if (cmdp == 't') {
+        memcpy(uid, "\x04\x0d\x68\x1a\xb5\x22\x81", 7);
+        generate4bNUID(uid, nuid);
 
-		bool test1 = (0 == memcmp(nuid, "\x8f\x43\x0f\xef", 4));
-		PrintAndLogEx(SUCCESS, "Selftest1 %s\n",  test1 ? _GREEN_(OK): _RED_(Fail));
+        bool test1 = (0 == memcmp(nuid, "\x8f\x43\x0f\xef", 4));
+        PrintAndLogEx(SUCCESS, "Selftest1 %s\n",  test1 ? _GREEN_(OK): _RED_(Fail));
 
-		memcpy(uid, "\x04\x18\x3f\x09\x32\x1b\x85", 7);
-		generate4bNUID(uid, nuid);
-		bool test2 = (0 == memcmp(nuid, "\x4f\x50\x5d\x7d", 4));
-		PrintAndLogEx(SUCCESS, "Selftest2 %s\n", test2 ? _GREEN_(OK) : _RED_(Fail));
-		return 0;
-	}
+        memcpy(uid, "\x04\x18\x3f\x09\x32\x1b\x85", 7);
+        generate4bNUID(uid, nuid);
+        bool test2 = (0 == memcmp(nuid, "\x4f\x50\x5d\x7d", 4));
+        PrintAndLogEx(SUCCESS, "Selftest2 %s\n", test2 ? _GREEN_(OK) : _RED_(Fail));
+        return 0;
+    }
 
-	param_gethex_ex(Cmd, 0, uid, &len);
-	if ( len%2  || len != 14) return usage_analyse_nuid();
+    param_gethex_ex(Cmd, 0, uid, &len);
+    if ( len%2  || len != 14) return usage_analyse_nuid();
 
-	generate4bNUID(uid, nuid);
+    generate4bNUID(uid, nuid);
 
-	PrintAndLogEx(NORMAL, "UID  | %s \n", sprint_hex(uid, 7));
-	PrintAndLogEx(NORMAL, "NUID | %s \n", sprint_hex(nuid, 4));
-	return 0;
+    PrintAndLogEx(NORMAL, "UID  | %s \n", sprint_hex(uid, 7));
+    PrintAndLogEx(NORMAL, "NUID | %s \n", sprint_hex(nuid, 4));
+    return 0;
 }
 static command_t CommandTable[] = {
-	{"help",	CmdHelp,            1, "This help"},
-	{"lcr",		CmdAnalyseLCR,		1, "Generate final byte for XOR LRC"},
-	{"crc",		CmdAnalyseCRC,		1, "Stub method for CRC evaluations"},
-	{"chksum",	CmdAnalyseCHKSUM,	1, "Checksum with adding, masking and one's complement"},
-	{"dates",	CmdAnalyseDates,	1, "Look for datestamps in a given array of bytes"},
-	{"tea",   	CmdAnalyseTEASelfTest,	1, "Crypto TEA test"},
-	{"lfsr",	CmdAnalyseLfsr,		1,	"LFSR tests"},
-	{"a",		CmdAnalyseA,		1,	"num bits test"},
-	{"nuid",	CmdAnalyseNuid,		1,	"create NUID from 7byte UID"},
-	{NULL, NULL, 0, NULL}
+    {"help",    CmdHelp,            1, "This help"},
+    {"lcr",     CmdAnalyseLCR,      1, "Generate final byte for XOR LRC"},
+    {"crc",     CmdAnalyseCRC,      1, "Stub method for CRC evaluations"},
+    {"chksum",  CmdAnalyseCHKSUM,   1, "Checksum with adding, masking and one's complement"},
+    {"dates",   CmdAnalyseDates,    1, "Look for datestamps in a given array of bytes"},
+    {"tea",     CmdAnalyseTEASelfTest, 1, "Crypto TEA test"},
+    {"lfsr",    CmdAnalyseLfsr,     1, "LFSR tests"},
+    {"a",       CmdAnalyseA,        1, "num bits test"},
+    {"nuid",    CmdAnalyseNuid,     1, "create NUID from 7byte UID"},
+    {NULL, NULL, 0, NULL}
 };
 
 int CmdAnalyse(const char *Cmd) {
-	clearCommandBuffer();
-	CmdsParse(CommandTable, Cmd);
-	return 0;
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
+    return 0;
 }
 
 int CmdHelp(const char *Cmd) {
-	CmdsHelp(CommandTable);
-	return 0;
+    CmdsHelp(CommandTable);
+    return 0;
 }
diff --git a/client/cmdanalyse.h b/client/cmdanalyse.h
index c362744c0..131fe0d11 100644
--- a/client/cmdanalyse.h
+++ b/client/cmdanalyse.h
@@ -11,20 +11,20 @@
 #ifndef CMDANALYSE_H__
 #define CMDANALYSE_H__
 
-#include <stdlib.h>  //size_t
+#include <stdlib.h>       // size_t
 #include <string.h>
 #include <unistd.h>
 #include "cmdmain.h"
 #include "proxmark3.h"
-#include "ui.h"				// PrintAndLog
+#include "ui.h"           // PrintAndLog
 #include "util.h"
 #include "crc.h"
-#include "crc16.h"			// crc16 ccitt
+#include "crc16.h"        // crc16 ccitt
 #include "tea.h"
 #include "legic_prng.h"
 #include "loclass/elite_crack.h"
-#include "mifare/mfkey.h"	//nonce2key
-#include "util_posix.h" 	// msclock
+#include "mifare/mfkey.h" // nonce2key
+#include "util_posix.h"   // msclock
 
 
 int usage_analyse_lcr(void);
diff --git a/client/cmdcrc.c b/client/cmdcrc.c
index a54653d3e..38d5a2005 100644
--- a/client/cmdcrc.c
+++ b/client/cmdcrc.c
@@ -23,7 +23,7 @@ int split(char *str, char *arr[MAX_ARGS]){
         }
         if(str[beginIndex] == '\0') {
             break;
-		}
+        }
         endIndex = beginIndex;
         while (str[endIndex] && !isspace(str[endIndex])) {
             ++endIndex;
@@ -40,202 +40,202 @@ int split(char *str, char *arr[MAX_ARGS]){
 }
 
 int CmdCrc(const char *Cmd) {
-	char name[] = {"reveng "};
-	char Cmd2[100 + 7];
-	memcpy(Cmd2, name, 7);
-	memcpy(Cmd2 + 7, Cmd, 100);
-	char *argv[MAX_ARGS];
-	int argc = split(Cmd2, argv);
+    char name[] = {"reveng "};
+    char Cmd2[100 + 7];
+    memcpy(Cmd2, name, 7);
+    memcpy(Cmd2 + 7, Cmd, 100);
+    char *argv[MAX_ARGS];
+    int argc = split(Cmd2, argv);
 
-	if (argc == 3 && memcmp(argv[1], "-g", 2) == 0) {
-		CmdrevengSearch(argv[2]);
-	} else {
-		reveng_main(argc, argv);
-	}
-	for(int i = 0; i < argc; ++i) {
-		free(argv[i]);
-	}
-	return 0;
+    if (argc == 3 && memcmp(argv[1], "-g", 2) == 0) {
+        CmdrevengSearch(argv[2]);
+    } else {
+        reveng_main(argc, argv);
+    }
+    for(int i = 0; i < argc; ++i) {
+        free(argv[i]);
+    }
+    return 0;
 }
 
 //returns array of model names and the count of models returning
 //  as well as a width array for the width of each model
 int GetModels(char *Models[], int *count, uint8_t *width){
-	/* default values */
-	static model_t model = MZERO;
+    /* default values */
+    static model_t model = MZERO;
 
-	int ibperhx = 8;//, obperhx = 8;
-	int rflags = 0, uflags = 0; /* search and UI flags */
-	poly_t apoly, crc, qpoly = PZERO, *apolys = NULL, *pptr = NULL, *qptr = NULL;
-	model_t pset = model, *candmods, *mptr;
+    int ibperhx = 8;//, obperhx = 8;
+    int rflags = 0, uflags = 0; /* search and UI flags */
+    poly_t apoly, crc, qpoly = PZERO, *apolys = NULL, *pptr = NULL, *qptr = NULL;
+    model_t pset = model, *candmods, *mptr;
 
-	/* stdin must be binary */
-	#ifdef _WIN32
-		_setmode(STDIN_FILENO, _O_BINARY);
-	#endif /* _WIN32 */
+    /* stdin must be binary */
+    #ifdef _WIN32
+        _setmode(STDIN_FILENO, _O_BINARY);
+    #endif /* _WIN32 */
 
-	SETBMP();
+    SETBMP();
 
-	int args = 0, psets, pass;
-	int Cnt = 0;
-	if (width[0] == 0) { //reveng -D
-		*count = mcount();
-		if (!*count){
-			PrintAndLogEx(WARNING, "no preset models available");
-			return 0;
-		}
-		for (int mode = 0; mode < *count; ++mode) {
-			mbynum(&model, mode);
-			mcanon(&model);
-			size_t size = (model.name && *model.name) ? strlen(model.name) : 7;
-			char *tmp = calloc(size+1, sizeof(char));
-			if (tmp==NULL){
-				PrintAndLogEx(WARNING, "out of memory?");
-				return 0;
-			}
-			memcpy(tmp, model.name, size);
-			Models[mode] = tmp;
-			width[mode] = plen(model.spoly);
-		}
-		mfree(&model);
-	} else { //reveng -s
+    int args = 0, psets, pass;
+    int Cnt = 0;
+    if (width[0] == 0) { //reveng -D
+        *count = mcount();
+        if (!*count){
+            PrintAndLogEx(WARNING, "no preset models available");
+            return 0;
+        }
+        for (int mode = 0; mode < *count; ++mode) {
+            mbynum(&model, mode);
+            mcanon(&model);
+            size_t size = (model.name && *model.name) ? strlen(model.name) : 7;
+            char *tmp = calloc(size+1, sizeof(char));
+            if (tmp==NULL){
+                PrintAndLogEx(WARNING, "out of memory?");
+                return 0;
+            }
+            memcpy(tmp, model.name, size);
+            Models[mode] = tmp;
+            width[mode] = plen(model.spoly);
+        }
+        mfree(&model);
+    } else { //reveng -s
 
-		if (~model.flags & P_MULXN){
-			 PrintAndLogEx(WARNING, "cannot search for non-Williams compliant models");
-			 return 0;
-		}
-		praloc(&model.spoly, (unsigned long)width[0]);
-		praloc(&model.init, (unsigned long)width[0]);
-		praloc(&model.xorout, (unsigned long)width[0]);
+        if (~model.flags & P_MULXN){
+             PrintAndLogEx(WARNING, "cannot search for non-Williams compliant models");
+             return 0;
+        }
+        praloc(&model.spoly, (unsigned long)width[0]);
+        praloc(&model.init, (unsigned long)width[0]);
+        praloc(&model.xorout, (unsigned long)width[0]);
 
-		if (!plen(model.spoly))
-			palloc(&model.spoly, (unsigned long)width[0]);
-		else
-			width[0] = (uint8_t)plen(model.spoly);
+        if (!plen(model.spoly))
+            palloc(&model.spoly, (unsigned long)width[0]);
+        else
+            width[0] = (uint8_t)plen(model.spoly);
 
-		/* special case if qpoly is zero, search to end of range */
-		if (!ptst(qpoly))
-			rflags &= ~R_HAVEQ;
+        /* special case if qpoly is zero, search to end of range */
+        if (!ptst(qpoly))
+            rflags &= ~R_HAVEQ;
 
-		/* if endianness not specified, try
-		 * little-endian then big-endian.
-		 * NB: crossed-endian algorithms will not be
-		 * searched.
-		 */
-		/* scan against preset models */
-		if (~uflags & C_NOPCK) {
-			pass = 0;
-			Cnt = 0;
-			do {
-				psets = mcount();
+        /* if endianness not specified, try
+         * little-endian then big-endian.
+         * NB: crossed-endian algorithms will not be
+         * searched.
+         */
+        /* scan against preset models */
+        if (~uflags & C_NOPCK) {
+            pass = 0;
+            Cnt = 0;
+            do {
+                psets = mcount();
 
-				while (psets) {
-					mbynum(&pset, --psets);
+                while (psets) {
+                    mbynum(&pset, --psets);
 
-					/* skip if different width, or refin or refout don't match */
-					if( plen(pset.spoly) != width[0] || (model.flags ^ pset.flags) & (P_REFIN | P_REFOUT))
-						continue;
-					/* skip if the preset doesn't match specified parameters */
-					if (rflags & R_HAVEP && pcmp(&model.spoly, &pset.spoly))
-						continue;
-					if (rflags & R_HAVEI && psncmp(&model.init, &pset.init))
-						continue;
-					if (rflags & R_HAVEX && psncmp(&model.xorout, &pset.xorout))
-						continue;
+                    /* skip if different width, or refin or refout don't match */
+                    if( plen(pset.spoly) != width[0] || (model.flags ^ pset.flags) & (P_REFIN | P_REFOUT))
+                        continue;
+                    /* skip if the preset doesn't match specified parameters */
+                    if (rflags & R_HAVEP && pcmp(&model.spoly, &pset.spoly))
+                        continue;
+                    if (rflags & R_HAVEI && psncmp(&model.init, &pset.init))
+                        continue;
+                    if (rflags & R_HAVEX && psncmp(&model.xorout, &pset.xorout))
+                        continue;
 
-					//for additional args (not used yet, maybe future?)
-					apoly = pclone(pset.xorout);
+                    //for additional args (not used yet, maybe future?)
+                    apoly = pclone(pset.xorout);
 
-					if (pset.flags & P_REFOUT)
-						prev(&apoly);
+                    if (pset.flags & P_REFOUT)
+                        prev(&apoly);
 
 
-					for (qptr = apolys; qptr < pptr; ++qptr) {
-						crc = pcrc(*qptr, pset.spoly, pset.init, apoly, 0);
-						if (ptst(crc)) {
-							pfree(&crc);
-							break;
-						}
-						pfree(&crc);
-					}
-					pfree(&apoly);
+                    for (qptr = apolys; qptr < pptr; ++qptr) {
+                        crc = pcrc(*qptr, pset.spoly, pset.init, apoly, 0);
+                        if (ptst(crc)) {
+                            pfree(&crc);
+                            break;
+                        }
+                        pfree(&crc);
+                    }
+                    pfree(&apoly);
 
-					if (qptr == pptr) {
+                    if (qptr == pptr) {
 
-						/* the selected model solved all arguments */
-						mcanon(&pset);
+                        /* the selected model solved all arguments */
+                        mcanon(&pset);
 
-						size_t size = (pset.name && *pset.name) ? strlen(pset.name) : 7;
-						//PrintAndLogEx(NORMAL, "Size: %d, %s, count: %d",size,pset.name, Cnt);
-						char *tmp = calloc(size+1, sizeof(char));
-						if (tmp == NULL){
-							PrintAndLogEx(WARNING, "out of memory?");
-							return 0;
-						}
-						width[Cnt] = width[0];
-						memcpy(tmp, pset.name, size);
-						Models[Cnt++] = tmp;
-						*count = Cnt;
-						uflags |= C_RESULT;
-					}
-				}
-				mfree(&pset);
+                        size_t size = (pset.name && *pset.name) ? strlen(pset.name) : 7;
+                        //PrintAndLogEx(NORMAL, "Size: %d, %s, count: %d",size,pset.name, Cnt);
+                        char *tmp = calloc(size+1, sizeof(char));
+                        if (tmp == NULL){
+                            PrintAndLogEx(WARNING, "out of memory?");
+                            return 0;
+                        }
+                        width[Cnt] = width[0];
+                        memcpy(tmp, pset.name, size);
+                        Models[Cnt++] = tmp;
+                        *count = Cnt;
+                        uflags |= C_RESULT;
+                    }
+                }
+                mfree(&pset);
 
-				/* toggle refIn/refOut and reflect arguments */
-				if (~rflags & R_HAVERI) {
-					model.flags ^= P_REFIN | P_REFOUT;
-					for (qptr = apolys; qptr < pptr; ++qptr) {
-						prevch(qptr, ibperhx);
-					}
-				}
-			} while (~rflags & R_HAVERI && ++pass < 2);
-		}
-		//got everything now free the memory...
+                /* toggle refIn/refOut and reflect arguments */
+                if (~rflags & R_HAVERI) {
+                    model.flags ^= P_REFIN | P_REFOUT;
+                    for (qptr = apolys; qptr < pptr; ++qptr) {
+                        prevch(qptr, ibperhx);
+                    }
+                }
+            } while (~rflags & R_HAVERI && ++pass < 2);
+        }
+        //got everything now free the memory...
 
-		if (uflags & C_RESULT) {
-			for (qptr = apolys; qptr < pptr; ++qptr) {
-				pfree(qptr);
-			}
-		}
-		if(uflags & C_NOBFS && ~rflags & R_HAVEP) {
-			PrintAndLogEx(WARNING, "no models found");
-			return 0;
-		}
+        if (uflags & C_RESULT) {
+            for (qptr = apolys; qptr < pptr; ++qptr) {
+                pfree(qptr);
+            }
+        }
+        if(uflags & C_NOBFS && ~rflags & R_HAVEP) {
+            PrintAndLogEx(WARNING, "no models found");
+            return 0;
+        }
 
-		if (!(model.flags & P_REFIN) != !(model.flags & P_REFOUT)){
-			PrintAndLogEx(WARNING, "cannot search for crossed-endian models");
-			return 0;
-		}
-		pass = 0;
-		do {
-			mptr = candmods = reveng(&model, qpoly, rflags, args, apolys);
-			if (mptr && plen(mptr->spoly)) {
-				uflags |= C_RESULT;
-			}
-			while (mptr && plen(mptr->spoly)) {
-				mfree(mptr++);
-			}
-			free(candmods);
-			if (~rflags & R_HAVERI) {
-				model.flags ^= P_REFIN | P_REFOUT;
-				for (qptr = apolys; qptr < pptr; ++qptr) {
-					prevch(qptr, ibperhx);
-				}
-			}
-		} while (~rflags & R_HAVERI && ++pass < 2);
+        if (!(model.flags & P_REFIN) != !(model.flags & P_REFOUT)){
+            PrintAndLogEx(WARNING, "cannot search for crossed-endian models");
+            return 0;
+        }
+        pass = 0;
+        do {
+            mptr = candmods = reveng(&model, qpoly, rflags, args, apolys);
+            if (mptr && plen(mptr->spoly)) {
+                uflags |= C_RESULT;
+            }
+            while (mptr && plen(mptr->spoly)) {
+                mfree(mptr++);
+            }
+            free(candmods);
+            if (~rflags & R_HAVERI) {
+                model.flags ^= P_REFIN | P_REFOUT;
+                for (qptr = apolys; qptr < pptr; ++qptr) {
+                    prevch(qptr, ibperhx);
+                }
+            }
+        } while (~rflags & R_HAVERI && ++pass < 2);
 
-		for (qptr = apolys; qptr < pptr; ++qptr) {
-			pfree(qptr);
-		}
-		free(apolys);
-		mfree(&model);
+        for (qptr = apolys; qptr < pptr; ++qptr) {
+            pfree(qptr);
+        }
+        free(apolys);
+        mfree(&model);
 
-		if (~uflags & C_RESULT){
-			PrintAndLogEx(WARNING, "no models found");
-			return 0;
-		}
-	}
-	return 1;
+        if (~uflags & C_RESULT){
+            PrintAndLogEx(WARNING, "no models found");
+            return 0;
+        }
+    }
+    return 1;
 }
 
 //-c || -v
@@ -246,156 +246,156 @@ int GetModels(char *Models[], int *count, uint8_t *width){
 //          l = little endian input and output, L = little endian output only, t = left justified}
 //result = calculated crc hex string
 int RunModel(char *inModel, char *inHexStr, bool reverse, char endian, char *result){
-	/* default values */
-	static model_t model = MZERO;
+    /* default values */
+    static model_t model = MZERO;
 
-	int ibperhx = 8, obperhx = 8;
-	int rflags = 0; // search flags
-	int c;
-	poly_t apoly, crc;
+    int ibperhx = 8, obperhx = 8;
+    int rflags = 0; // search flags
+    int c;
+    poly_t apoly, crc;
 
-	char *string;
+    char *string;
 
-	// stdin must be binary
-	#ifdef _WIN32
-		_setmode(STDIN_FILENO, _O_BINARY);
-	#endif /* _WIN32 */
+    // stdin must be binary
+    #ifdef _WIN32
+        _setmode(STDIN_FILENO, _O_BINARY);
+    #endif /* _WIN32 */
 
-	SETBMP();
-	//set model
-	c = mbynam(&model, inModel);
-	if (!c) {
-		PrintAndLogEx(WARNING, "error: preset model '%s' not found.  Use reveng -D to list presets. [%d]", inModel, c);
-		return 0;
-	}
-	if (c < 0){
-		PrintAndLogEx(WARNING, "no preset models available");
-		return 0;
-	}
-	rflags |= R_HAVEP | R_HAVEI | R_HAVERI | R_HAVERO | R_HAVEX;
+    SETBMP();
+    //set model
+    c = mbynam(&model, inModel);
+    if (!c) {
+        PrintAndLogEx(WARNING, "error: preset model '%s' not found.  Use reveng -D to list presets. [%d]", inModel, c);
+        return 0;
+    }
+    if (c < 0){
+        PrintAndLogEx(WARNING, "no preset models available");
+        return 0;
+    }
+    rflags |= R_HAVEP | R_HAVEI | R_HAVERI | R_HAVERO | R_HAVEX;
 
-	//set flags
-	switch (endian) {
-		case 'b': /* b  big-endian (RefIn = false, RefOut = false ) */
-			model.flags &= ~P_REFIN;
-			rflags |= R_HAVERI;
-			/* fall through: */
-		case 'B': /* B  big-endian output (RefOut = false) */
-			model.flags &= ~P_REFOUT;
-			rflags |= R_HAVERO;
-			mnovel(&model);
-			/* fall through: */
-		case 'r': /* r  right-justified */
-			model.flags |= P_RTJUST;
-			break;
-		case 'l': /* l  little-endian input and output */
-			model.flags |= P_REFIN;
-			rflags |= R_HAVERI;
-			/* fall through: */
-		case 'L': /* L  little-endian output */
-			model.flags |= P_REFOUT;
-			rflags |= R_HAVERO;
-			mnovel(&model);
-			/* fall through: */
-		case 't': /* t  left-justified */
-			model.flags &= ~P_RTJUST;
-			break;
-	}
-	/* canonicalise the model, so the one we dump is the one we
-	 * calculate with (not with -s, spoly may be blank which will
-	 * normalise to zero and clear init and xorout.)
-	 */
-	mcanon(&model);
+    //set flags
+    switch (endian) {
+        case 'b': /* b  big-endian (RefIn = false, RefOut = false ) */
+            model.flags &= ~P_REFIN;
+            rflags |= R_HAVERI;
+            /* fall through: */
+        case 'B': /* B  big-endian output (RefOut = false) */
+            model.flags &= ~P_REFOUT;
+            rflags |= R_HAVERO;
+            mnovel(&model);
+            /* fall through: */
+        case 'r': /* r  right-justified */
+            model.flags |= P_RTJUST;
+            break;
+        case 'l': /* l  little-endian input and output */
+            model.flags |= P_REFIN;
+            rflags |= R_HAVERI;
+            /* fall through: */
+        case 'L': /* L  little-endian output */
+            model.flags |= P_REFOUT;
+            rflags |= R_HAVERO;
+            mnovel(&model);
+            /* fall through: */
+        case 't': /* t  left-justified */
+            model.flags &= ~P_RTJUST;
+            break;
+    }
+    /* canonicalise the model, so the one we dump is the one we
+     * calculate with (not with -s, spoly may be blank which will
+     * normalise to zero and clear init and xorout.)
+     */
+    mcanon(&model);
 
 
-	if (reverse) {
-		// v  calculate reversed CRC
-		/* Distinct from the -V switch as this causes
-		 * the arguments and output to be reversed as well.
-		 */
-		// reciprocate Poly
-		prcp(&model.spoly);
+    if (reverse) {
+        // v  calculate reversed CRC
+        /* Distinct from the -V switch as this causes
+         * the arguments and output to be reversed as well.
+         */
+        // reciprocate Poly
+        prcp(&model.spoly);
 
-		/* mrev() does:
-		 *   if(refout) prev(init); else prev(xorout);
-		 * but here the entire argument polynomial is
-		 * reflected, not just the characters, so RefIn
-		 * and RefOut are not inverted as with -V.
-		 * Consequently Init is the mirror image of the
-		 * one resulting from -V, and so we have:
-		 */
-		if (~model.flags & P_REFOUT) {
-			prev(&model.init);
-			prev(&model.xorout);
-		}
+        /* mrev() does:
+         *   if(refout) prev(init); else prev(xorout);
+         * but here the entire argument polynomial is
+         * reflected, not just the characters, so RefIn
+         * and RefOut are not inverted as with -V.
+         * Consequently Init is the mirror image of the
+         * one resulting from -V, and so we have:
+         */
+        if (~model.flags & P_REFOUT) {
+            prev(&model.init);
+            prev(&model.xorout);
+        }
 
-		// swap init and xorout
-		apoly = model.init;
-		model.init = model.xorout;
-		model.xorout = apoly;
-	}
-	// c  calculate CRC
+        // swap init and xorout
+        apoly = model.init;
+        model.init = model.xorout;
+        model.xorout = apoly;
+    }
+    // c  calculate CRC
 
-	/* in the Williams model, xorout is applied after the refout stage.
-	 * as refout is part of ptostr(), we reverse xorout here.
-	 */
-	if (model.flags & P_REFOUT)
-		prev(&model.xorout);
+    /* in the Williams model, xorout is applied after the refout stage.
+     * as refout is part of ptostr(), we reverse xorout here.
+     */
+    if (model.flags & P_REFOUT)
+        prev(&model.xorout);
 
-	apoly = strtop(inHexStr, model.flags, ibperhx);
+    apoly = strtop(inHexStr, model.flags, ibperhx);
 
-	if (reverse)
-		prev(&apoly);
+    if (reverse)
+        prev(&apoly);
 
-	crc = pcrc(apoly, model.spoly, model.init, model.xorout, model.flags);
+    crc = pcrc(apoly, model.spoly, model.init, model.xorout, model.flags);
 
-	if (reverse)
-		prev(&crc);
+    if (reverse)
+        prev(&crc);
 
-	string = ptostr(crc, model.flags, obperhx);
-	for (int i = 0; i < 50; i++){
-		result[i] = string[i];
-		if (result[i]==0) break;
-	}
-	free(string);
-	pfree(&crc);
-	pfree(&apoly);
-	return 1;
+    string = ptostr(crc, model.flags, obperhx);
+    for (int i = 0; i < 50; i++){
+        result[i] = string[i];
+        if (result[i]==0) break;
+    }
+    free(string);
+    pfree(&crc);
+    pfree(&apoly);
+    return 1;
 }
 
 //test call to RunModel
 int CmdrevengTestC(const char *Cmd){
-	int cmdp = 0;
-	char inModel[30] = {0x00};
-	char inHexStr[30] = {0x00};
-	char result[30];
-	int dataLen;
-	char endian = 0;
-	dataLen = param_getstr(Cmd, cmdp++, inModel, sizeof(inModel));
-	if (dataLen < 4) return 0;
-	dataLen = param_getstr(Cmd, cmdp++, inHexStr, sizeof(inHexStr));
-	if (dataLen < 4) return 0;
-	bool reverse = (param_get8(Cmd, cmdp++)) ? true : false;
-	endian = param_getchar(Cmd, cmdp++);
+    int cmdp = 0;
+    char inModel[30] = {0x00};
+    char inHexStr[30] = {0x00};
+    char result[30];
+    int dataLen;
+    char endian = 0;
+    dataLen = param_getstr(Cmd, cmdp++, inModel, sizeof(inModel));
+    if (dataLen < 4) return 0;
+    dataLen = param_getstr(Cmd, cmdp++, inHexStr, sizeof(inHexStr));
+    if (dataLen < 4) return 0;
+    bool reverse = (param_get8(Cmd, cmdp++)) ? true : false;
+    endian = param_getchar(Cmd, cmdp++);
 
-	//PrintAndLogEx(NORMAL, "mod: %s, hex: %s, rev %d", inModel, inHexStr, reverse);
-	int ans = RunModel(inModel, inHexStr, reverse, endian, result);
-	if (!ans) return 0;
+    //PrintAndLogEx(NORMAL, "mod: %s, hex: %s, rev %d", inModel, inHexStr, reverse);
+    int ans = RunModel(inModel, inHexStr, reverse, endian, result);
+    if (!ans) return 0;
 
-	PrintAndLogEx(SUCCESS, "result: %s",result);
-	return 1;
+    PrintAndLogEx(SUCCESS, "result: %s",result);
+    return 1;
 }
 
 //returns a calloced string (needs to be freed)
 char *SwapEndianStr(const char *inStr, const size_t len, const uint8_t blockSize){
-	char *tmp = calloc(len+1, sizeof(char));
-	for (uint8_t block=0; block < (uint8_t)(len/blockSize); block++){
-		for (size_t i = 0; i < blockSize; i+=2){
-			tmp[i+(blockSize*block)] = inStr[(blockSize-1-i-1)+(blockSize*block)];
-			tmp[i+(blockSize*block)+1] = inStr[(blockSize-1-i)+(blockSize*block)];
-		}
-	}
-	return tmp;
+    char *tmp = calloc(len+1, sizeof(char));
+    for (uint8_t block=0; block < (uint8_t)(len/blockSize); block++){
+        for (size_t i = 0; i < blockSize; i+=2){
+            tmp[i+(blockSize*block)] = inStr[(blockSize-1-i-1)+(blockSize*block)];
+            tmp[i+(blockSize*block)+1] = inStr[(blockSize-1-i)+(blockSize*block)];
+        }
+    }
+    return tmp;
 }
 
 // takes hex string in and searches for a matching result (hex string must include checksum)
@@ -403,84 +403,84 @@ int CmdrevengSearch(const char *Cmd){
 
 #define NMODELS 105
 
-	char inHexStr[100] = {0x00};
-	int dataLen = param_getstr(Cmd, 0, inHexStr, sizeof(inHexStr));
-	if (dataLen < 4) return 0;
+    char inHexStr[100] = {0x00};
+    int dataLen = param_getstr(Cmd, 0, inHexStr, sizeof(inHexStr));
+    if (dataLen < 4) return 0;
 
-	// these two arrays, must match preset size.
-	char *Models[NMODELS];
-	uint8_t width[NMODELS] = {0};
-	int count = 0;
+    // these two arrays, must match preset size.
+    char *Models[NMODELS];
+    uint8_t width[NMODELS] = {0};
+    int count = 0;
 
-	uint8_t crcChars = 0;
-	char result[30];
-	char revResult[30];
-	int ans = GetModels(Models, &count, width);
-	bool found = false;
-	if (!ans) return 0;
+    uint8_t crcChars = 0;
+    char result[30];
+    char revResult[30];
+    int ans = GetModels(Models, &count, width);
+    bool found = false;
+    if (!ans) return 0;
 
-	// try each model and get result
-	for (int i = 0; i < count; i++){
-		/*if (found) {
-			free(Models[i]);
-			continue;
-		}*/
-		// round up to # of characters in this model's crc
-		crcChars = ((width[i]+7)/8)*2;
-		// can't test a model that has more crc digits than our data
-		if (crcChars >= dataLen)
-			continue;
-		memset(result, 0, 30);
-		char *inCRC = calloc(crcChars+1, sizeof(char));
-		memcpy(inCRC, inHexStr+(dataLen-crcChars), crcChars);
+    // try each model and get result
+    for (int i = 0; i < count; i++){
+        /*if (found) {
+            free(Models[i]);
+            continue;
+        }*/
+        // round up to # of characters in this model's crc
+        crcChars = ((width[i]+7)/8)*2;
+        // can't test a model that has more crc digits than our data
+        if (crcChars >= dataLen)
+            continue;
+        memset(result, 0, 30);
+        char *inCRC = calloc(crcChars+1, sizeof(char));
+        memcpy(inCRC, inHexStr+(dataLen-crcChars), crcChars);
 
-		char *outHex = calloc(dataLen-crcChars+1, sizeof(char));
-		memcpy(outHex, inHexStr, dataLen-crcChars);
+        char *outHex = calloc(dataLen-crcChars+1, sizeof(char));
+        memcpy(outHex, inHexStr, dataLen-crcChars);
 
-		PrintAndLogEx(DEBUG, "DEBUG: dataLen: %d, crcChars: %d, Model: %s, CRC: %s, width: %d, outHex: %s",dataLen, crcChars, Models[i], inCRC, width[i], outHex);
-		ans = RunModel(Models[i], outHex, false, 0, result);
-		if (ans) {
-			// test for match
-			if (memcmp(result, inCRC, crcChars) == 0){
-				PrintAndLogEx(SUCCESS, "\nfound possible match\nmodel: %s | value: %s\n", Models[i], result);
-				//optional - stop searching if found...
-				found = true;
-			} else {
-				if (crcChars > 2){
-					char *swapEndian = SwapEndianStr(result, crcChars, crcChars);
-					if (memcmp(swapEndian, inCRC, crcChars) == 0){
-						PrintAndLogEx(SUCCESS, "\nfound possible match\nmodel: %s | value endian swapped: %s\n", Models[i], swapEndian);
-						// optional - stop searching if found...
-						found = true;
-					}
-					free(swapEndian);
-				}
-			}
-		}
-		ans = RunModel(Models[i], outHex, true, 0, revResult);
-		if (ans) {
-			// test for match
-			if (memcmp(revResult, inCRC, crcChars) == 0){
-				PrintAndLogEx(SUCCESS, "\nfound possible match\nmodel reversed: %s | value: %s\n", Models[i], revResult);
-				// optional - stop searching if found...
-				found = true;
-			} else {
-				if (crcChars > 2){
-					char *swapEndian = SwapEndianStr(revResult, crcChars, crcChars);
-					if (memcmp(swapEndian, inCRC, crcChars) == 0){
-						PrintAndLogEx(SUCCESS, "\nfound possible match\nmodel reversed: %s | value endian swapped: %s\n", Models[i], swapEndian);
-						// optional - stop searching if found...
-						found = true;
-					}
-					free(swapEndian);
-				}
-			}
-		}
-		free(inCRC);
-		free(outHex);
-		free(Models[i]);
-	}
+        PrintAndLogEx(DEBUG, "DEBUG: dataLen: %d, crcChars: %d, Model: %s, CRC: %s, width: %d, outHex: %s",dataLen, crcChars, Models[i], inCRC, width[i], outHex);
+        ans = RunModel(Models[i], outHex, false, 0, result);
+        if (ans) {
+            // test for match
+            if (memcmp(result, inCRC, crcChars) == 0){
+                PrintAndLogEx(SUCCESS, "\nfound possible match\nmodel: %s | value: %s\n", Models[i], result);
+                //optional - stop searching if found...
+                found = true;
+            } else {
+                if (crcChars > 2){
+                    char *swapEndian = SwapEndianStr(result, crcChars, crcChars);
+                    if (memcmp(swapEndian, inCRC, crcChars) == 0){
+                        PrintAndLogEx(SUCCESS, "\nfound possible match\nmodel: %s | value endian swapped: %s\n", Models[i], swapEndian);
+                        // optional - stop searching if found...
+                        found = true;
+                    }
+                    free(swapEndian);
+                }
+            }
+        }
+        ans = RunModel(Models[i], outHex, true, 0, revResult);
+        if (ans) {
+            // test for match
+            if (memcmp(revResult, inCRC, crcChars) == 0){
+                PrintAndLogEx(SUCCESS, "\nfound possible match\nmodel reversed: %s | value: %s\n", Models[i], revResult);
+                // optional - stop searching if found...
+                found = true;
+            } else {
+                if (crcChars > 2){
+                    char *swapEndian = SwapEndianStr(revResult, crcChars, crcChars);
+                    if (memcmp(swapEndian, inCRC, crcChars) == 0){
+                        PrintAndLogEx(SUCCESS, "\nfound possible match\nmodel reversed: %s | value endian swapped: %s\n", Models[i], swapEndian);
+                        // optional - stop searching if found...
+                        found = true;
+                    }
+                    free(swapEndian);
+                }
+            }
+        }
+        free(inCRC);
+        free(outHex);
+        free(Models[i]);
+    }
 
-	if (!found) PrintAndLogEx(FAILED, "\nno matches found\n");
-	return 1;
+    if (!found) PrintAndLogEx(FAILED, "\nno matches found\n");
+    return 1;
 }
\ No newline at end of file
diff --git a/client/cmddata.c b/client/cmddata.c
index 45bce9c9c..9753701e5 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -18,267 +18,267 @@ int g_DemodClock = 0;
 static int CmdHelp(const char *Cmd);
 
 int usage_data_printdemodbuf(void){
-	PrintAndLogEx(NORMAL, "Usage: data printdemodbuffer x o <offset> l <length>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h          This help");
-	PrintAndLogEx(NORMAL, "       x          output in hex (omit for binary output)");
-	PrintAndLogEx(NORMAL, "       o <offset> enter offset in # of bits");
-	PrintAndLogEx(NORMAL, "       l <length> enter length to print in # of bits or hex characters respectively");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage: data printdemodbuffer x o <offset> l <length>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h          This help");
+    PrintAndLogEx(NORMAL, "       x          output in hex (omit for binary output)");
+    PrintAndLogEx(NORMAL, "       o <offset> enter offset in # of bits");
+    PrintAndLogEx(NORMAL, "       l <length> enter length to print in # of bits or hex characters respectively");
+    return 0;
 }
 int usage_data_manrawdecode(void){
-	PrintAndLogEx(NORMAL, "Usage:  data manrawdecode [invert] [maxErr]");
-	PrintAndLogEx(NORMAL, "     Takes 10 and 01 and converts to 0 and 1 respectively");
-	PrintAndLogEx(NORMAL, "     --must have binary sequence in demodbuffer (run data askrawdemod first)");
-	PrintAndLogEx(NORMAL, "  [invert]  invert output");
-	PrintAndLogEx(NORMAL, "  [maxErr]  set number of errors allowed (default = 20)");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "   Example: data manrawdecode   = decode manchester bitstream from the demodbuffer");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage:  data manrawdecode [invert] [maxErr]");
+    PrintAndLogEx(NORMAL, "     Takes 10 and 01 and converts to 0 and 1 respectively");
+    PrintAndLogEx(NORMAL, "     --must have binary sequence in demodbuffer (run data askrawdemod first)");
+    PrintAndLogEx(NORMAL, "  [invert]  invert output");
+    PrintAndLogEx(NORMAL, "  [maxErr]  set number of errors allowed (default = 20)");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "   Example: data manrawdecode   = decode manchester bitstream from the demodbuffer");
+    return 0;
 }
 int usage_data_biphaserawdecode(void){
-	PrintAndLogEx(NORMAL, "Usage:  data biphaserawdecode [offset] [invert] [maxErr]");
-	PrintAndLogEx(NORMAL, "     Converts 10 or 01 to 1 and 11 or 00 to 0");
-	PrintAndLogEx(NORMAL, "     --must have binary sequence in demodbuffer (run data askrawdemod first)");
-	PrintAndLogEx(NORMAL, "     --invert for Conditional Dephase Encoding (CDP) AKA Differential Manchester");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "     [offset <0|1>], set to 0 not to adjust start position or to 1 to adjust decode start position");
-	PrintAndLogEx(NORMAL, "     [invert <0|1>], set to 1 to invert output");
-	PrintAndLogEx(NORMAL, "     [maxErr int],   set max errors tolerated - default=20");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "   Example: data biphaserawdecode     = decode biphase bitstream from the demodbuffer");
-	PrintAndLogEx(NORMAL, "   Example: data biphaserawdecode 1 1 = decode biphase bitstream from the demodbuffer, set offset, and invert output");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage:  data biphaserawdecode [offset] [invert] [maxErr]");
+    PrintAndLogEx(NORMAL, "     Converts 10 or 01 to 1 and 11 or 00 to 0");
+    PrintAndLogEx(NORMAL, "     --must have binary sequence in demodbuffer (run data askrawdemod first)");
+    PrintAndLogEx(NORMAL, "     --invert for Conditional Dephase Encoding (CDP) AKA Differential Manchester");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "     [offset <0|1>], set to 0 not to adjust start position or to 1 to adjust decode start position");
+    PrintAndLogEx(NORMAL, "     [invert <0|1>], set to 1 to invert output");
+    PrintAndLogEx(NORMAL, "     [maxErr int],   set max errors tolerated - default=20");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "   Example: data biphaserawdecode     = decode biphase bitstream from the demodbuffer");
+    PrintAndLogEx(NORMAL, "   Example: data biphaserawdecode 1 1 = decode biphase bitstream from the demodbuffer, set offset, and invert output");
+    return 0;
 }
 int usage_data_rawdemod(void){
-	PrintAndLogEx(NORMAL, "Usage:  data rawdemod [modulation] <help>|<options>");
-	PrintAndLogEx(NORMAL, "   [modulation] as 2 char, 'ab' for ask/biphase, 'am' for ask/manchester, 'ar' for ask/raw, 'fs' for fsk, ...");
-	PrintAndLogEx(NORMAL, "         'nr' for nrz/direct, 'p1' for psk1, 'p2' for psk2");
-	PrintAndLogEx(NORMAL, "   <help> as 'h', prints the help for the specific modulation");
-	PrintAndLogEx(NORMAL, "   <options> see specific modulation help for optional parameters");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "   Example: data rawdemod fs h         = print help specific to fsk demod");
-	PrintAndLogEx(NORMAL, "          : data rawdemod fs           = demod GraphBuffer using: fsk - autodetect");
-	PrintAndLogEx(NORMAL, "          : data rawdemod ab           = demod GraphBuffer using: ask/biphase - autodetect");
-	PrintAndLogEx(NORMAL, "          : data rawdemod am           = demod GraphBuffer using: ask/manchester - autodetect");
-	PrintAndLogEx(NORMAL, "          : data rawdemod ar           = demod GraphBuffer using: ask/raw - autodetect");
-	PrintAndLogEx(NORMAL, "          : data rawdemod nr           = demod GraphBuffer using: nrz/direct - autodetect");
-	PrintAndLogEx(NORMAL, "          : data rawdemod p1           = demod GraphBuffer using: psk1 - autodetect");
-	PrintAndLogEx(NORMAL, "          : data rawdemod p2           = demod GraphBuffer using: psk2 - autodetect");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage:  data rawdemod [modulation] <help>|<options>");
+    PrintAndLogEx(NORMAL, "   [modulation] as 2 char, 'ab' for ask/biphase, 'am' for ask/manchester, 'ar' for ask/raw, 'fs' for fsk, ...");
+    PrintAndLogEx(NORMAL, "         'nr' for nrz/direct, 'p1' for psk1, 'p2' for psk2");
+    PrintAndLogEx(NORMAL, "   <help> as 'h', prints the help for the specific modulation");
+    PrintAndLogEx(NORMAL, "   <options> see specific modulation help for optional parameters");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "   Example: data rawdemod fs h         = print help specific to fsk demod");
+    PrintAndLogEx(NORMAL, "          : data rawdemod fs           = demod GraphBuffer using: fsk - autodetect");
+    PrintAndLogEx(NORMAL, "          : data rawdemod ab           = demod GraphBuffer using: ask/biphase - autodetect");
+    PrintAndLogEx(NORMAL, "          : data rawdemod am           = demod GraphBuffer using: ask/manchester - autodetect");
+    PrintAndLogEx(NORMAL, "          : data rawdemod ar           = demod GraphBuffer using: ask/raw - autodetect");
+    PrintAndLogEx(NORMAL, "          : data rawdemod nr           = demod GraphBuffer using: nrz/direct - autodetect");
+    PrintAndLogEx(NORMAL, "          : data rawdemod p1           = demod GraphBuffer using: psk1 - autodetect");
+    PrintAndLogEx(NORMAL, "          : data rawdemod p2           = demod GraphBuffer using: psk2 - autodetect");
+    return 0;
 }
 int usage_data_rawdemod_am(void){
-	PrintAndLogEx(NORMAL, "Usage:  data rawdemod am <s> [clock] <invert> [maxError] [maxLen] [amplify]");
-	PrintAndLogEx(NORMAL, "     ['s'] optional, check for Sequence Terminator");
-	PrintAndLogEx(NORMAL, "     [set clock as integer] optional, if not set, autodetect");
-	PrintAndLogEx(NORMAL, "     <invert>, 1 to invert output");
-	PrintAndLogEx(NORMAL, "     [set maximum allowed errors], default = 100");
-	PrintAndLogEx(NORMAL, "     [set maximum Samples to read], default = 32768 (512 bits at rf/64)");
-	PrintAndLogEx(NORMAL, "     <amplify>, 'a' to attempt demod with ask amplification, default = no amp");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "   Example: data rawdemod am        = demod an ask/manchester tag from GraphBuffer");
-	PrintAndLogEx(NORMAL, "          : data rawdemod am 32     = demod an ask/manchester tag from GraphBuffer using a clock of RF/32");
-	PrintAndLogEx(NORMAL, "          : data rawdemod am 32 1   = demod an ask/manchester tag from GraphBuffer using a clock of RF/32 and inverting data");
-	PrintAndLogEx(NORMAL, "          : data rawdemod am 1      = demod an ask/manchester tag from GraphBuffer while inverting data");
-	PrintAndLogEx(NORMAL, "          : data rawdemod am 64 1 0 = demod an ask/manchester tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage:  data rawdemod am <s> [clock] <invert> [maxError] [maxLen] [amplify]");
+    PrintAndLogEx(NORMAL, "     ['s'] optional, check for Sequence Terminator");
+    PrintAndLogEx(NORMAL, "     [set clock as integer] optional, if not set, autodetect");
+    PrintAndLogEx(NORMAL, "     <invert>, 1 to invert output");
+    PrintAndLogEx(NORMAL, "     [set maximum allowed errors], default = 100");
+    PrintAndLogEx(NORMAL, "     [set maximum Samples to read], default = 32768 (512 bits at rf/64)");
+    PrintAndLogEx(NORMAL, "     <amplify>, 'a' to attempt demod with ask amplification, default = no amp");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "   Example: data rawdemod am        = demod an ask/manchester tag from GraphBuffer");
+    PrintAndLogEx(NORMAL, "          : data rawdemod am 32     = demod an ask/manchester tag from GraphBuffer using a clock of RF/32");
+    PrintAndLogEx(NORMAL, "          : data rawdemod am 32 1   = demod an ask/manchester tag from GraphBuffer using a clock of RF/32 and inverting data");
+    PrintAndLogEx(NORMAL, "          : data rawdemod am 1      = demod an ask/manchester tag from GraphBuffer while inverting data");
+    PrintAndLogEx(NORMAL, "          : data rawdemod am 64 1 0 = demod an ask/manchester tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors");
+    return 0;
 }
 int usage_data_rawdemod_ab(void){
-	PrintAndLogEx(NORMAL, "Usage:  data rawdemod ab [offset] [clock] <invert> [maxError] [maxLen] <amplify>");
-	PrintAndLogEx(NORMAL, "     [offset], offset to begin biphase, default=0");
-	PrintAndLogEx(NORMAL, "     [set clock as integer] optional, if not set, autodetect");
-	PrintAndLogEx(NORMAL, "     <invert>, 1 to invert output");
-	PrintAndLogEx(NORMAL, "     [set maximum allowed errors], default = 100");
-	PrintAndLogEx(NORMAL, "     [set maximum Samples to read], default = 32768 (512 bits at rf/64)");
-	PrintAndLogEx(NORMAL, "     <amplify>, 'a' to attempt demod with ask amplification, default = no amp");
-	PrintAndLogEx(NORMAL, "     NOTE: <invert>  can be entered as second or third argument");
-	PrintAndLogEx(NORMAL, "     NOTE: <amplify> can be entered as first, second or last argument");
-	PrintAndLogEx(NORMAL, "     NOTE: any other arg must have previous args set to work");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "     NOTE: --invert for Conditional Dephase Encoding (CDP) AKA Differential Manchester");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "   Example: data rawdemod ab              = demod an ask/biph tag from GraphBuffer");
-	PrintAndLogEx(NORMAL, "          : data rawdemod ab 0 a          = demod an ask/biph tag from GraphBuffer, amplified");
-	PrintAndLogEx(NORMAL, "          : data rawdemod ab 1 32         = demod an ask/biph tag from GraphBuffer using an offset of 1 and a clock of RF/32");
-	PrintAndLogEx(NORMAL, "          : data rawdemod ab 0 32 1       = demod an ask/biph tag from GraphBuffer using a clock of RF/32 and inverting data");
-	PrintAndLogEx(NORMAL, "          : data rawdemod ab 0 1          = demod an ask/biph tag from GraphBuffer while inverting data");
-	PrintAndLogEx(NORMAL, "          : data rawdemod ab 0 64 1 0     = demod an ask/biph tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors");
-	PrintAndLogEx(NORMAL, "          : data rawdemod ab 0 64 1 0 0 a = demod an ask/biph tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors, and amp");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage:  data rawdemod ab [offset] [clock] <invert> [maxError] [maxLen] <amplify>");
+    PrintAndLogEx(NORMAL, "     [offset], offset to begin biphase, default=0");
+    PrintAndLogEx(NORMAL, "     [set clock as integer] optional, if not set, autodetect");
+    PrintAndLogEx(NORMAL, "     <invert>, 1 to invert output");
+    PrintAndLogEx(NORMAL, "     [set maximum allowed errors], default = 100");
+    PrintAndLogEx(NORMAL, "     [set maximum Samples to read], default = 32768 (512 bits at rf/64)");
+    PrintAndLogEx(NORMAL, "     <amplify>, 'a' to attempt demod with ask amplification, default = no amp");
+    PrintAndLogEx(NORMAL, "     NOTE: <invert>  can be entered as second or third argument");
+    PrintAndLogEx(NORMAL, "     NOTE: <amplify> can be entered as first, second or last argument");
+    PrintAndLogEx(NORMAL, "     NOTE: any other arg must have previous args set to work");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "     NOTE: --invert for Conditional Dephase Encoding (CDP) AKA Differential Manchester");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "   Example: data rawdemod ab              = demod an ask/biph tag from GraphBuffer");
+    PrintAndLogEx(NORMAL, "          : data rawdemod ab 0 a          = demod an ask/biph tag from GraphBuffer, amplified");
+    PrintAndLogEx(NORMAL, "          : data rawdemod ab 1 32         = demod an ask/biph tag from GraphBuffer using an offset of 1 and a clock of RF/32");
+    PrintAndLogEx(NORMAL, "          : data rawdemod ab 0 32 1       = demod an ask/biph tag from GraphBuffer using a clock of RF/32 and inverting data");
+    PrintAndLogEx(NORMAL, "          : data rawdemod ab 0 1          = demod an ask/biph tag from GraphBuffer while inverting data");
+    PrintAndLogEx(NORMAL, "          : data rawdemod ab 0 64 1 0     = demod an ask/biph tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors");
+    PrintAndLogEx(NORMAL, "          : data rawdemod ab 0 64 1 0 0 a = demod an ask/biph tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors, and amp");
+    return 0;
 }
 int usage_data_rawdemod_ar(void){
-	PrintAndLogEx(NORMAL, "Usage:  data rawdemod ar [clock] <invert> [maxError] [maxLen] [amplify]");
-	PrintAndLogEx(NORMAL, "     [set clock as integer] optional, if not set, autodetect");
-	PrintAndLogEx(NORMAL, "     <invert>, 1 to invert output");
-	PrintAndLogEx(NORMAL, "     [set maximum allowed errors], default = 100");
-	PrintAndLogEx(NORMAL, "     [set maximum Samples to read], default = 32768 (1024 bits at rf/64)");
-	PrintAndLogEx(NORMAL, "     <amplify>, 'a' to attempt demod with ask amplification, default = no amp");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "   Example: data rawdemod ar            = demod an ask tag from GraphBuffer");
-	PrintAndLogEx(NORMAL, "          : data rawdemod ar a          = demod an ask tag from GraphBuffer, amplified");
-	PrintAndLogEx(NORMAL, "          : data rawdemod ar 32         = demod an ask tag from GraphBuffer using a clock of RF/32");
-	PrintAndLogEx(NORMAL, "          : data rawdemod ar 32 1       = demod an ask tag from GraphBuffer using a clock of RF/32 and inverting data");
-	PrintAndLogEx(NORMAL, "          : data rawdemod ar 1          = demod an ask tag from GraphBuffer while inverting data");
-	PrintAndLogEx(NORMAL, "          : data rawdemod ar 64 1 0     = demod an ask tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors");
-	PrintAndLogEx(NORMAL, "          : data rawdemod ar 64 1 0 0 a = demod an ask tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors, and amp");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage:  data rawdemod ar [clock] <invert> [maxError] [maxLen] [amplify]");
+    PrintAndLogEx(NORMAL, "     [set clock as integer] optional, if not set, autodetect");
+    PrintAndLogEx(NORMAL, "     <invert>, 1 to invert output");
+    PrintAndLogEx(NORMAL, "     [set maximum allowed errors], default = 100");
+    PrintAndLogEx(NORMAL, "     [set maximum Samples to read], default = 32768 (1024 bits at rf/64)");
+    PrintAndLogEx(NORMAL, "     <amplify>, 'a' to attempt demod with ask amplification, default = no amp");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "   Example: data rawdemod ar            = demod an ask tag from GraphBuffer");
+    PrintAndLogEx(NORMAL, "          : data rawdemod ar a          = demod an ask tag from GraphBuffer, amplified");
+    PrintAndLogEx(NORMAL, "          : data rawdemod ar 32         = demod an ask tag from GraphBuffer using a clock of RF/32");
+    PrintAndLogEx(NORMAL, "          : data rawdemod ar 32 1       = demod an ask tag from GraphBuffer using a clock of RF/32 and inverting data");
+    PrintAndLogEx(NORMAL, "          : data rawdemod ar 1          = demod an ask tag from GraphBuffer while inverting data");
+    PrintAndLogEx(NORMAL, "          : data rawdemod ar 64 1 0     = demod an ask tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors");
+    PrintAndLogEx(NORMAL, "          : data rawdemod ar 64 1 0 0 a = demod an ask tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors, and amp");
+    return 0;
 }
 int usage_data_rawdemod_fs(void){
-	PrintAndLogEx(NORMAL, "Usage:  data rawdemod fs [clock] <invert> [fchigh] [fclow]");
-	PrintAndLogEx(NORMAL, "     [set clock as integer] optional, omit for autodetect.");
-	PrintAndLogEx(NORMAL, "     <invert>, 1 for invert output, can be used even if the clock is omitted");
-	PrintAndLogEx(NORMAL, "     [fchigh], larger field clock length, omit for autodetect");
-	PrintAndLogEx(NORMAL, "     [fclow], small field clock length, omit for autodetect");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "   Example: data rawdemod fs           = demod an fsk tag from GraphBuffer using autodetect");
-	PrintAndLogEx(NORMAL, "          : data rawdemod fs 32        = demod an fsk tag from GraphBuffer using a clock of RF/32, autodetect fc");
-	PrintAndLogEx(NORMAL, "          : data rawdemod fs 1         = demod an fsk tag from GraphBuffer using autodetect, invert output");
-	PrintAndLogEx(NORMAL, "          : data rawdemod fs 32 1      = demod an fsk tag from GraphBuffer using a clock of RF/32, invert output, autodetect fc");
-	PrintAndLogEx(NORMAL, "          : data rawdemod fs 64 0 8 5  = demod an fsk1 RF/64 tag from GraphBuffer");
-	PrintAndLogEx(NORMAL, "          : data rawdemod fs 50 0 10 8 = demod an fsk2 RF/50 tag from GraphBuffer");
-	PrintAndLogEx(NORMAL, "          : data rawdemod fs 50 1 10 8 = demod an fsk2a RF/50 tag from GraphBuffer");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage:  data rawdemod fs [clock] <invert> [fchigh] [fclow]");
+    PrintAndLogEx(NORMAL, "     [set clock as integer] optional, omit for autodetect.");
+    PrintAndLogEx(NORMAL, "     <invert>, 1 for invert output, can be used even if the clock is omitted");
+    PrintAndLogEx(NORMAL, "     [fchigh], larger field clock length, omit for autodetect");
+    PrintAndLogEx(NORMAL, "     [fclow], small field clock length, omit for autodetect");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "   Example: data rawdemod fs           = demod an fsk tag from GraphBuffer using autodetect");
+    PrintAndLogEx(NORMAL, "          : data rawdemod fs 32        = demod an fsk tag from GraphBuffer using a clock of RF/32, autodetect fc");
+    PrintAndLogEx(NORMAL, "          : data rawdemod fs 1         = demod an fsk tag from GraphBuffer using autodetect, invert output");
+    PrintAndLogEx(NORMAL, "          : data rawdemod fs 32 1      = demod an fsk tag from GraphBuffer using a clock of RF/32, invert output, autodetect fc");
+    PrintAndLogEx(NORMAL, "          : data rawdemod fs 64 0 8 5  = demod an fsk1 RF/64 tag from GraphBuffer");
+    PrintAndLogEx(NORMAL, "          : data rawdemod fs 50 0 10 8 = demod an fsk2 RF/50 tag from GraphBuffer");
+    PrintAndLogEx(NORMAL, "          : data rawdemod fs 50 1 10 8 = demod an fsk2a RF/50 tag from GraphBuffer");
+    return 0;
 }
 int usage_data_rawdemod_nr(void){
-	PrintAndLogEx(NORMAL, "Usage:  data rawdemod nr [clock] <0|1> [maxError]");
-	PrintAndLogEx(NORMAL, "     [set clock as integer] optional, if not set, autodetect.");
-	PrintAndLogEx(NORMAL, "     <invert>, 1 for invert output");
-	PrintAndLogEx(NORMAL, "     [set maximum allowed errors], default = 100.");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "   Example: data rawdemod nr        = demod a nrz/direct tag from GraphBuffer");
-	PrintAndLogEx(NORMAL, "          : data rawdemod nr 32     = demod a nrz/direct tag from GraphBuffer using a clock of RF/32");
-	PrintAndLogEx(NORMAL, "          : data rawdemod nr 32 1   = demod a nrz/direct tag from GraphBuffer using a clock of RF/32 and inverting data");
-	PrintAndLogEx(NORMAL, "          : data rawdemod nr 1      = demod a nrz/direct tag from GraphBuffer while inverting data");
-	PrintAndLogEx(NORMAL, "          : data rawdemod nr 64 1 0 = demod a nrz/direct tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage:  data rawdemod nr [clock] <0|1> [maxError]");
+    PrintAndLogEx(NORMAL, "     [set clock as integer] optional, if not set, autodetect.");
+    PrintAndLogEx(NORMAL, "     <invert>, 1 for invert output");
+    PrintAndLogEx(NORMAL, "     [set maximum allowed errors], default = 100.");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "   Example: data rawdemod nr        = demod a nrz/direct tag from GraphBuffer");
+    PrintAndLogEx(NORMAL, "          : data rawdemod nr 32     = demod a nrz/direct tag from GraphBuffer using a clock of RF/32");
+    PrintAndLogEx(NORMAL, "          : data rawdemod nr 32 1   = demod a nrz/direct tag from GraphBuffer using a clock of RF/32 and inverting data");
+    PrintAndLogEx(NORMAL, "          : data rawdemod nr 1      = demod a nrz/direct tag from GraphBuffer while inverting data");
+    PrintAndLogEx(NORMAL, "          : data rawdemod nr 64 1 0 = demod a nrz/direct tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors");
+    return 0;
 }
 int usage_data_rawdemod_p1(void){
-	PrintAndLogEx(NORMAL, "Usage:  data rawdemod p1 [clock] <0|1> [maxError]");
-	PrintAndLogEx(NORMAL, "     [set clock as integer] optional, if not set, autodetect.");
-	PrintAndLogEx(NORMAL, "     <invert>, 1 for invert output");
-	PrintAndLogEx(NORMAL, "     [set maximum allowed errors], default = 100.");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "   Example: data rawdemod p1        = demod a psk1 tag from GraphBuffer");
-	PrintAndLogEx(NORMAL, "          : data rawdemod p1 32     = demod a psk1 tag from GraphBuffer using a clock of RF/32");
-	PrintAndLogEx(NORMAL, "          : data rawdemod p1 32 1   = demod a psk1 tag from GraphBuffer using a clock of RF/32 and inverting data");
-	PrintAndLogEx(NORMAL, "          : data rawdemod p1 1      = demod a psk1 tag from GraphBuffer while inverting data");
-	PrintAndLogEx(NORMAL, "          : data rawdemod p1 64 1 0 = demod a psk1 tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage:  data rawdemod p1 [clock] <0|1> [maxError]");
+    PrintAndLogEx(NORMAL, "     [set clock as integer] optional, if not set, autodetect.");
+    PrintAndLogEx(NORMAL, "     <invert>, 1 for invert output");
+    PrintAndLogEx(NORMAL, "     [set maximum allowed errors], default = 100.");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "   Example: data rawdemod p1        = demod a psk1 tag from GraphBuffer");
+    PrintAndLogEx(NORMAL, "          : data rawdemod p1 32     = demod a psk1 tag from GraphBuffer using a clock of RF/32");
+    PrintAndLogEx(NORMAL, "          : data rawdemod p1 32 1   = demod a psk1 tag from GraphBuffer using a clock of RF/32 and inverting data");
+    PrintAndLogEx(NORMAL, "          : data rawdemod p1 1      = demod a psk1 tag from GraphBuffer while inverting data");
+    PrintAndLogEx(NORMAL, "          : data rawdemod p1 64 1 0 = demod a psk1 tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors");
+    return 0;
 }
 int usage_data_rawdemod_p2(void){
-	PrintAndLogEx(NORMAL, "Usage:  data rawdemod p2 [clock] <0|1> [maxError]");
-	PrintAndLogEx(NORMAL, "     [set clock as integer] optional, if not set, autodetect.");
-	PrintAndLogEx(NORMAL, "     <invert>, 1 for invert output");
-	PrintAndLogEx(NORMAL, "     [set maximum allowed errors], default = 100.");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "   Example: data rawdemod p2         = demod a psk2 tag from GraphBuffer, autodetect clock");
-	PrintAndLogEx(NORMAL, "          : data rawdemod p2 32      = demod a psk2 tag from GraphBuffer using a clock of RF/32");
-	PrintAndLogEx(NORMAL, "          : data rawdemod p2 32 1    = demod a psk2 tag from GraphBuffer using a clock of RF/32 and inverting output");
-	PrintAndLogEx(NORMAL, "          : data rawdemod p2 1       = demod a psk2 tag from GraphBuffer, autodetect clock and invert output");
-	PrintAndLogEx(NORMAL, "          : data rawdemod p2 64 1 0  = demod a psk2 tag from GraphBuffer using a clock of RF/64, inverting output and allowing 0 demod errors");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage:  data rawdemod p2 [clock] <0|1> [maxError]");
+    PrintAndLogEx(NORMAL, "     [set clock as integer] optional, if not set, autodetect.");
+    PrintAndLogEx(NORMAL, "     <invert>, 1 for invert output");
+    PrintAndLogEx(NORMAL, "     [set maximum allowed errors], default = 100.");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "   Example: data rawdemod p2         = demod a psk2 tag from GraphBuffer, autodetect clock");
+    PrintAndLogEx(NORMAL, "          : data rawdemod p2 32      = demod a psk2 tag from GraphBuffer using a clock of RF/32");
+    PrintAndLogEx(NORMAL, "          : data rawdemod p2 32 1    = demod a psk2 tag from GraphBuffer using a clock of RF/32 and inverting output");
+    PrintAndLogEx(NORMAL, "          : data rawdemod p2 1       = demod a psk2 tag from GraphBuffer, autodetect clock and invert output");
+    PrintAndLogEx(NORMAL, "          : data rawdemod p2 64 1 0  = demod a psk2 tag from GraphBuffer using a clock of RF/64, inverting output and allowing 0 demod errors");
+    return 0;
 }
 int usage_data_autocorr(void) {
-	PrintAndLogEx(NORMAL, "Autocorrelate is used to detect repeating sequences. We use it as detection of length in bits a message inside the signal is");
-	PrintAndLogEx(NORMAL, "Usage: data autocorr w <window> [g]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h              This help");
-	PrintAndLogEx(NORMAL, "       w <window>     window length for correlation - default = 4000");
-	PrintAndLogEx(NORMAL, "       g              save back to GraphBuffer (overwrite)");
-	return 0;
+    PrintAndLogEx(NORMAL, "Autocorrelate is used to detect repeating sequences. We use it as detection of length in bits a message inside the signal is");
+    PrintAndLogEx(NORMAL, "Usage: data autocorr w <window> [g]");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h              This help");
+    PrintAndLogEx(NORMAL, "       w <window>     window length for correlation - default = 4000");
+    PrintAndLogEx(NORMAL, "       g              save back to GraphBuffer (overwrite)");
+    return 0;
 }
 int usage_data_undecimate(void){
-	PrintAndLogEx(NORMAL, "Usage: data undec [factor]");
-	PrintAndLogEx(NORMAL, "This function performs un-decimation, by repeating each sample N times");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h            This help");
-	PrintAndLogEx(NORMAL, "       factor       The number of times to repeat each sample.[default:2]");
-	PrintAndLogEx(NORMAL, "Example: 'data undec 3'");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage: data undec [factor]");
+    PrintAndLogEx(NORMAL, "This function performs un-decimation, by repeating each sample N times");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h            This help");
+    PrintAndLogEx(NORMAL, "       factor       The number of times to repeat each sample.[default:2]");
+    PrintAndLogEx(NORMAL, "Example: 'data undec 3'");
+    return 0;
 }
 int usage_data_detectclock(void){
-	PrintAndLogEx(NORMAL, "Usage:  data detectclock [modulation] <clock>");
-	PrintAndLogEx(NORMAL, "     [modulation as char], specify the modulation type you want to detect the clock of");
-	PrintAndLogEx(NORMAL, "     <clock>             , specify the clock (optional - to get best start position only)");
-	PrintAndLogEx(NORMAL, "       'a' = ask, 'f' = fsk, 'n' = nrz/direct, 'p' = psk");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "   Example: data detectclock a    = detect the clock of an ask modulated wave in the GraphBuffer");
-	PrintAndLogEx(NORMAL, "            data detectclock f    = detect the clock of an fsk modulated wave in the GraphBuffer");
-	PrintAndLogEx(NORMAL, "            data detectclock p    = detect the clock of an psk modulated wave in the GraphBuffer");
-	PrintAndLogEx(NORMAL, "            data detectclock n    = detect the clock of an nrz/direct modulated wave in the GraphBuffer");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage:  data detectclock [modulation] <clock>");
+    PrintAndLogEx(NORMAL, "     [modulation as char], specify the modulation type you want to detect the clock of");
+    PrintAndLogEx(NORMAL, "     <clock>             , specify the clock (optional - to get best start position only)");
+    PrintAndLogEx(NORMAL, "       'a' = ask, 'f' = fsk, 'n' = nrz/direct, 'p' = psk");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "   Example: data detectclock a    = detect the clock of an ask modulated wave in the GraphBuffer");
+    PrintAndLogEx(NORMAL, "            data detectclock f    = detect the clock of an fsk modulated wave in the GraphBuffer");
+    PrintAndLogEx(NORMAL, "            data detectclock p    = detect the clock of an psk modulated wave in the GraphBuffer");
+    PrintAndLogEx(NORMAL, "            data detectclock n    = detect the clock of an nrz/direct modulated wave in the GraphBuffer");
+    return 0;
 }
 int usage_data_hex2bin(void){
-	PrintAndLogEx(NORMAL, "Usage: data hex2bin <hex_digits>");
-	PrintAndLogEx(NORMAL, "       This function will ignore all non-hexadecimal characters (but stop reading on whitespace)");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage: data hex2bin <hex_digits>");
+    PrintAndLogEx(NORMAL, "       This function will ignore all non-hexadecimal characters (but stop reading on whitespace)");
+    return 0;
 }
 int usage_data_bin2hex(void){
-	PrintAndLogEx(NORMAL, "Usage: data bin2hex <binary_digits>");
-	PrintAndLogEx(NORMAL, "       This function will ignore all characters not 1 or 0 (but stop reading on whitespace)");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage: data bin2hex <binary_digits>");
+    PrintAndLogEx(NORMAL, "       This function will ignore all characters not 1 or 0 (but stop reading on whitespace)");
+    return 0;
 }
 int usage_data_buffclear(void){
-	PrintAndLogEx(NORMAL, "This function clears the bigbuff on deviceside");
-	PrintAndLogEx(NORMAL, "Usage: data buffclear [h]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h              This help");
-	return 0;
+    PrintAndLogEx(NORMAL, "This function clears the bigbuff on deviceside");
+    PrintAndLogEx(NORMAL, "Usage: data buffclear [h]");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h              This help");
+    return 0;
 }
 int usage_data_fsktonrz() {
-		PrintAndLogEx(NORMAL, "Usage: data fsktonrz c <clock> l <fc_low> f <fc_high>");
-		PrintAndLogEx(NORMAL, "Options:");
-		PrintAndLogEx(NORMAL, "       h            This help");
-		PrintAndLogEx(NORMAL, "       c <clock>    enter the a clock (omit to autodetect)");
-		PrintAndLogEx(NORMAL, "       l <fc_low>   enter a field clock (omit to autodetect)");
-		PrintAndLogEx(NORMAL, "       f <fc_high>  enter a field clock (omit to autodetect)");
-		return 0;
+        PrintAndLogEx(NORMAL, "Usage: data fsktonrz c <clock> l <fc_low> f <fc_high>");
+        PrintAndLogEx(NORMAL, "Options:");
+        PrintAndLogEx(NORMAL, "       h            This help");
+        PrintAndLogEx(NORMAL, "       c <clock>    enter the a clock (omit to autodetect)");
+        PrintAndLogEx(NORMAL, "       l <fc_low>   enter a field clock (omit to autodetect)");
+        PrintAndLogEx(NORMAL, "       f <fc_high>  enter a field clock (omit to autodetect)");
+        return 0;
 }
 
 //set the demod buffer with given array of binary (one bit per byte)
 //by marshmellow
 void setDemodBuf(uint8_t *buf, size_t size, size_t start_idx) {
-	if (buf == NULL) return;
+    if (buf == NULL) return;
 
-	if ( size > MAX_DEMOD_BUF_LEN - start_idx)
-		size = MAX_DEMOD_BUF_LEN - start_idx;
+    if ( size > MAX_DEMOD_BUF_LEN - start_idx)
+        size = MAX_DEMOD_BUF_LEN - start_idx;
 
-	for (size_t i = 0; i < size; i++)
-		DemodBuffer[i] = buf[start_idx++];
+    for (size_t i = 0; i < size; i++)
+        DemodBuffer[i] = buf[start_idx++];
 
-	DemodBufferLen = size;
+    DemodBufferLen = size;
 }
 
 bool getDemodBuf(uint8_t *buf, size_t *size) {
-	if (buf == NULL) return false;
-	if (size == NULL) return false;
-	if (*size == 0) return false;
+    if (buf == NULL) return false;
+    if (size == NULL) return false;
+    if (*size == 0) return false;
 
-	*size = (*size > DemodBufferLen) ? DemodBufferLen : *size;
+    *size = (*size > DemodBufferLen) ? DemodBufferLen : *size;
 
-	memcpy(buf, DemodBuffer, *size);
-	return true;
+    memcpy(buf, DemodBuffer, *size);
+    return true;
 }
 
 // include <math.h>
 // Root mean square
 double rms(double *v, size_t n) {
-	double sum = 0.0;
-	for(size_t i = 0; i < n; i++)
-		sum += v[i] * v[i];
-	return sqrt(sum / n);
+    double sum = 0.0;
+    for(size_t i = 0; i < n; i++)
+        sum += v[i] * v[i];
+    return sqrt(sum / n);
 }
 int cmp_int( const void *a, const void *b) {
     if (*(const int *)a < *(const int *)b)
-		return -1;
+        return -1;
     else
-		return *(const int *)a > *(const int *)b;
+        return *(const int *)a > *(const int *)b;
 }
 int cmp_uint8( const void *a, const void *b) {
     if (*(const uint8_t *)a < *(const uint8_t *)b)
-		return -1;
+        return -1;
     else
-		return *(const uint8_t *)a > *(const uint8_t *)b;
+        return *(const uint8_t *)a > *(const uint8_t *)b;
 }
 // Median of a array of values
 double median_int( int *src, size_t size ) {
@@ -291,23 +291,23 @@ double median_uint8( uint8_t *src, size_t size ) {
 }
 // function to compute mean for a series
 static double compute_mean(const int *data, size_t n) {
-	double mean = 0.0;
-	for (size_t i=0; i < n; i++)
-		mean += data[i];
-	mean /= n;
-	return mean;
+    double mean = 0.0;
+    for (size_t i=0; i < n; i++)
+        mean += data[i];
+    mean /= n;
+    return mean;
 }
 
 //  function to compute variance for a series
 static double compute_variance(const int *data, size_t n) {
-	double variance = 0.0;
-	double mean = compute_mean(data, n);
+    double variance = 0.0;
+    double mean = compute_mean(data, n);
 
-	for (size_t i=0; i < n; i++)
-		variance += pow(( data[i] - mean), 2.0);
+    for (size_t i=0; i < n; i++)
+        variance += pow(( data[i] - mean), 2.0);
 
-	variance /= n;
-	return variance;
+    variance /= n;
+    return variance;
 }
 
 // Function to compute autocorrelation for a series
@@ -315,133 +315,133 @@ static double compute_variance(const int *data, size_t n) {
 //  - Corrected divide by n to divide (n - lag) from Tobias Mueller
 /*
 static double compute_autoc(const int *data, size_t n, int lag) {
-	double autocv = 0.0;	// Autocovariance value
-	double ac_value;		// Computed autocorrelation value to be returned
-	double variance; 		// Computed variance
-	double mean;
+    double autocv = 0.0;    // Autocovariance value
+    double ac_value;        // Computed autocorrelation value to be returned
+    double variance;        // Computed variance
+    double mean;
 
-	mean = compute_mean(data, n);
-	variance = compute_variance(data, n);
+    mean = compute_mean(data, n);
+    variance = compute_variance(data, n);
 
-	for (size_t i=0; i < (n - lag); i++)
-		autocv += (data[i] - mean) * (data[i+lag] - mean);
+    for (size_t i=0; i < (n - lag); i++)
+        autocv += (data[i] - mean) * (data[i+lag] - mean);
 
-	autocv = (1.0 / (n - lag)) * autocv;
+    autocv = (1.0 / (n - lag)) * autocv;
 
-	// Autocorrelation is autocovariance divided by variance
-	ac_value = autocv / variance;
-	return ac_value;
+    // Autocorrelation is autocovariance divided by variance
+    ac_value = autocv / variance;
+    return ac_value;
 }
 */
 
 // option '1' to save DemodBuffer any other to restore
 void save_restoreDB(uint8_t saveOpt) {
-	static uint8_t SavedDB[MAX_DEMOD_BUF_LEN];
-	static size_t SavedDBlen;
-	static bool DB_Saved = false;
-	static size_t savedDemodStartIdx = 0;
-	static int savedDemodClock = 0;
+    static uint8_t SavedDB[MAX_DEMOD_BUF_LEN];
+    static size_t SavedDBlen;
+    static bool DB_Saved = false;
+    static size_t savedDemodStartIdx = 0;
+    static int savedDemodClock = 0;
 
-	if (saveOpt == GRAPH_SAVE) { //save
+    if (saveOpt == GRAPH_SAVE) { //save
 
-		memcpy(SavedDB, DemodBuffer, sizeof(DemodBuffer));
-		SavedDBlen = DemodBufferLen;
-		DB_Saved = true;
-		savedDemodStartIdx = g_DemodStartIdx;
-		savedDemodClock = g_DemodClock;
-	} else if (DB_Saved) { //restore
+        memcpy(SavedDB, DemodBuffer, sizeof(DemodBuffer));
+        SavedDBlen = DemodBufferLen;
+        DB_Saved = true;
+        savedDemodStartIdx = g_DemodStartIdx;
+        savedDemodClock = g_DemodClock;
+    } else if (DB_Saved) { //restore
 
-		memcpy(DemodBuffer, SavedDB, sizeof(DemodBuffer));
-		DemodBufferLen = SavedDBlen;
-		g_DemodClock = savedDemodClock;
-		g_DemodStartIdx = savedDemodStartIdx;
-	}
+        memcpy(DemodBuffer, SavedDB, sizeof(DemodBuffer));
+        DemodBufferLen = SavedDBlen;
+        g_DemodClock = savedDemodClock;
+        g_DemodStartIdx = savedDemodStartIdx;
+    }
 }
 
 int CmdSetDebugMode(const char *Cmd) {
-	int demod = 0;
-	sscanf(Cmd, "%i", &demod);
-	g_debugMode = (uint8_t)demod;
-	return 1;
+    int demod = 0;
+    sscanf(Cmd, "%i", &demod);
+    g_debugMode = (uint8_t)demod;
+    return 1;
 }
 
 //by marshmellow
 // max output to 512 bits if we have more - should be plenty
 void printDemodBuff(void) {
-	int len = DemodBufferLen;
-	if (len < 1) {
-		PrintAndLogEx(NORMAL, "(printDemodBuff) no bits found in demod buffer");
-		return;
-	}
-	if (len > 512) len = 512;
+    int len = DemodBufferLen;
+    if (len < 1) {
+        PrintAndLogEx(NORMAL, "(printDemodBuff) no bits found in demod buffer");
+        return;
+    }
+    if (len > 512) len = 512;
 
-	PrintAndLogEx(NORMAL, "%s", sprint_bin_break(DemodBuffer, len, 16) );
+    PrintAndLogEx(NORMAL, "%s", sprint_bin_break(DemodBuffer, len, 16) );
 }
 
 int CmdPrintDemodBuff(const char *Cmd) {
-	char hex[512] = {0x00};
-	bool hexMode = false;
-	bool errors = false;
-	uint32_t offset = 0;
-	uint32_t length = 512;
-	char cmdp = 0;
-	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch (tolower(param_getchar(Cmd, cmdp))) {
-		case 'h':
-			return usage_data_printdemodbuf();
-		case 'x':
-			hexMode = true;
-			cmdp++;
-			break;
-		case 'o':
-			offset = param_get32ex(Cmd, cmdp+1, 0, 10);
-			if (!offset) errors = true;
-			cmdp += 2;
-			break;
-		case 'l':
-			length = param_get32ex(Cmd, cmdp+1, 512, 10);
-			if (!length) errors = true;
-			cmdp += 2;
-			break;
-		default:
-			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-			errors = true;
-			break;
-		}
-	}
-	//Validations
-	if (errors) return usage_data_printdemodbuf();
+    char hex[512] = {0x00};
+    bool hexMode = false;
+    bool errors = false;
+    uint32_t offset = 0;
+    uint32_t length = 512;
+    char cmdp = 0;
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+        case 'h':
+            return usage_data_printdemodbuf();
+        case 'x':
+            hexMode = true;
+            cmdp++;
+            break;
+        case 'o':
+            offset = param_get32ex(Cmd, cmdp+1, 0, 10);
+            if (!offset) errors = true;
+            cmdp += 2;
+            break;
+        case 'l':
+            length = param_get32ex(Cmd, cmdp+1, 512, 10);
+            if (!length) errors = true;
+            cmdp += 2;
+            break;
+        default:
+            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+            errors = true;
+            break;
+        }
+    }
+    //Validations
+    if (errors) return usage_data_printdemodbuf();
 
-	if (DemodBufferLen == 0) {
-		PrintAndLogEx(NORMAL, "Demodbuffer is empty");
-		return 0;
-	}
-	length = (length > (DemodBufferLen-offset)) ? DemodBufferLen-offset : length;
-	int numBits = (length) & 0x00FFC; //make sure we don't exceed our string
+    if (DemodBufferLen == 0) {
+        PrintAndLogEx(NORMAL, "Demodbuffer is empty");
+        return 0;
+    }
+    length = (length > (DemodBufferLen-offset)) ? DemodBufferLen-offset : length;
+    int numBits = (length) & 0x00FFC; //make sure we don't exceed our string
 
-	if (hexMode){
-		char *buf = (char *) (DemodBuffer + offset);
-		numBits = (numBits > sizeof(hex)) ? sizeof(hex) : numBits;
-		numBits = binarraytohex(hex, buf, numBits);
-		if (numBits == 0) {
-			return 0;
-		}
-		PrintAndLogEx(NORMAL, "DemodBuffer: %s", hex);
-	} else {
-		PrintAndLogEx(NORMAL, "DemodBuffer:\n%s", sprint_bin_break(DemodBuffer+offset, numBits, 16));
-	}
-	return 1;
+    if (hexMode){
+        char *buf = (char *) (DemodBuffer + offset);
+        numBits = (numBits > sizeof(hex)) ? sizeof(hex) : numBits;
+        numBits = binarraytohex(hex, buf, numBits);
+        if (numBits == 0) {
+            return 0;
+        }
+        PrintAndLogEx(NORMAL, "DemodBuffer: %s", hex);
+    } else {
+        PrintAndLogEx(NORMAL, "DemodBuffer:\n%s", sprint_bin_break(DemodBuffer+offset, numBits, 16));
+    }
+    return 1;
 }
 
 //by marshmellow
 //this function strictly converts >1 to 1 and <1 to 0 for each sample in the graphbuffer
 int CmdGetBitStream(const char *Cmd) {
-	CmdHpf(Cmd);
-	for (uint32_t i = 0; i < GraphTraceLen; i++)
-		GraphBuffer[i] = (GraphBuffer[i] >= 1) ? 1 : 0;
+    CmdHpf(Cmd);
+    for (uint32_t i = 0; i < GraphTraceLen; i++)
+        GraphBuffer[i] = (GraphBuffer[i] >= 1) ? 1 : 0;
 
-	RepaintGraphWindow();
-	return 0;
+    RepaintGraphWindow();
+    return 0;
 }
 
 //by marshmellow
@@ -451,94 +451,94 @@ int CmdGetBitStream(const char *Cmd) {
 //emSearch will auto search for EM410x format in bitstream
 //askType switches decode: ask/raw = 0, ask/manchester = 1
 int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType, bool *stCheck) {
-	int invert = 0;
-	int clk = 0;
-	int maxErr = 100;
-	int maxLen = 0;
-	uint8_t askamp = 0;
-	char amp = tolower(param_getchar(Cmd, 0));
-	uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
+    int invert = 0;
+    int clk = 0;
+    int maxErr = 100;
+    int maxLen = 0;
+    uint8_t askamp = 0;
+    char amp = tolower(param_getchar(Cmd, 0));
+    uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
 
-	sscanf(Cmd, "%i %i %i %i %c", &clk, &invert, &maxErr, &maxLen, &amp);
+    sscanf(Cmd, "%i %i %i %i %c", &clk, &invert, &maxErr, &maxLen, &amp);
 
-	if (!maxLen) maxLen = BIGBUF_SIZE;
+    if (!maxLen) maxLen = BIGBUF_SIZE;
 
-	if (invert != 0 && invert != 1) {
-		PrintAndLogEx(WARNING, "Invalid argument: %s", Cmd);
-		return 0;
-	}
+    if (invert != 0 && invert != 1) {
+        PrintAndLogEx(WARNING, "Invalid argument: %s", Cmd);
+        return 0;
+    }
 
-	if (clk == 1) {
-		invert = 1;
-		clk = 0;
-	}
+    if (clk == 1) {
+        invert = 1;
+        clk = 0;
+    }
 
-	size_t BitLen = getFromGraphBuf(bits);
+    size_t BitLen = getFromGraphBuf(bits);
 
-	PrintAndLogEx(DEBUG, "DEBUG: (ASKDemod_ext) Bitlen from grphbuff: %d", BitLen);
+    PrintAndLogEx(DEBUG, "DEBUG: (ASKDemod_ext) Bitlen from grphbuff: %d", BitLen);
 
-	if (BitLen < 255) return 0;
+    if (BitLen < 255) return 0;
 
-	if (maxLen < BitLen && maxLen != 0) BitLen = maxLen;
+    if (maxLen < BitLen && maxLen != 0) BitLen = maxLen;
 
-	int foundclk = 0;
-	//amp before ST check
-	if (amp == 'a')
-		askAmp(bits, BitLen);
+    int foundclk = 0;
+    //amp before ST check
+    if (amp == 'a')
+        askAmp(bits, BitLen);
 
-	bool st = false;
-	size_t ststart = 0, stend = 0;
-	if (*stCheck)
-		st = DetectST(bits, &BitLen, &foundclk, &ststart, &stend);
+    bool st = false;
+    size_t ststart = 0, stend = 0;
+    if (*stCheck)
+        st = DetectST(bits, &BitLen, &foundclk, &ststart, &stend);
 
-	if (st) {
-		*stCheck = st;
-		clk = (clk == 0) ? foundclk : clk;
-		CursorCPos = ststart;
-		CursorDPos = stend;
-		if (verbose || g_debugMode)
-			PrintAndLogEx(NORMAL, "Found Sequence Terminator - First one is shown by orange and blue graph markers");
-	}
+    if (st) {
+        *stCheck = st;
+        clk = (clk == 0) ? foundclk : clk;
+        CursorCPos = ststart;
+        CursorDPos = stend;
+        if (verbose || g_debugMode)
+            PrintAndLogEx(NORMAL, "Found Sequence Terminator - First one is shown by orange and blue graph markers");
+    }
 
-	int startIdx = 0;
-	int errCnt = askdemod_ext(bits, &BitLen, &clk, &invert, maxErr, askamp, askType, &startIdx);
+    int startIdx = 0;
+    int errCnt = askdemod_ext(bits, &BitLen, &clk, &invert, maxErr, askamp, askType, &startIdx);
 
-	if (errCnt < 0 || BitLen < 16){  //if fatal error (or -1)
-		PrintAndLogEx(DEBUG, "DEBUG: (ASKDemod_ext) No data found errors:%d, invert:%c, bitlen:%d, clock:%d", errCnt, (invert)?'Y':'N', BitLen, clk);
-		return 0;
-	}
+    if (errCnt < 0 || BitLen < 16){  //if fatal error (or -1)
+        PrintAndLogEx(DEBUG, "DEBUG: (ASKDemod_ext) No data found errors:%d, invert:%c, bitlen:%d, clock:%d", errCnt, (invert)?'Y':'N', BitLen, clk);
+        return 0;
+    }
 
-	if (errCnt > maxErr){
-		PrintAndLogEx(DEBUG, "DEBUG: (ASKDemod_ext) Too many errors found, errors:%d, bits:%d, clock:%d", errCnt, BitLen, clk);
-		return 0;
-	}
+    if (errCnt > maxErr){
+        PrintAndLogEx(DEBUG, "DEBUG: (ASKDemod_ext) Too many errors found, errors:%d, bits:%d, clock:%d", errCnt, BitLen, clk);
+        return 0;
+    }
 
-	if (verbose || g_debugMode) PrintAndLogEx(DEBUG, "DEBUG: (ASKDemod_ext) Using clock:%d, invert:%d, bits found:%d", clk, invert, BitLen);
+    if (verbose || g_debugMode) PrintAndLogEx(DEBUG, "DEBUG: (ASKDemod_ext) Using clock:%d, invert:%d, bits found:%d", clk, invert, BitLen);
 
-	//output
-	setDemodBuf(bits, BitLen, 0);
-	setClockGrid(clk, startIdx);
+    //output
+    setDemodBuf(bits, BitLen, 0);
+    setClockGrid(clk, startIdx);
 
-	if (verbose || g_debugMode){
-		if (errCnt > 0)
-			PrintAndLogEx(NORMAL, "# Errors during Demoding (shown as 7 in bit stream): %d",errCnt);
-		if (askType)
-			PrintAndLogEx(NORMAL, "ASK/Manchester - Clock: %d - Decoded bitstream:",clk);
-		else
-			PrintAndLogEx(NORMAL, "ASK/Raw - Clock: %d - Decoded bitstream:",clk);
-		// Now output the bitstream to the scrollback by line of 16 bits
-		printDemodBuff();
-	}
-	uint64_t lo = 0;
-	uint32_t hi = 0;
-	if (emSearch)
-		AskEm410xDecode(true, &hi, &lo);
+    if (verbose || g_debugMode){
+        if (errCnt > 0)
+            PrintAndLogEx(NORMAL, "# Errors during Demoding (shown as 7 in bit stream): %d",errCnt);
+        if (askType)
+            PrintAndLogEx(NORMAL, "ASK/Manchester - Clock: %d - Decoded bitstream:",clk);
+        else
+            PrintAndLogEx(NORMAL, "ASK/Raw - Clock: %d - Decoded bitstream:",clk);
+        // Now output the bitstream to the scrollback by line of 16 bits
+        printDemodBuff();
+    }
+    uint64_t lo = 0;
+    uint32_t hi = 0;
+    if (emSearch)
+        AskEm410xDecode(true, &hi, &lo);
 
-	return 1;
+    return 1;
 }
 int ASKDemod(const char *Cmd, bool verbose, bool emSearch, uint8_t askType) {
-	bool st = false;
-	return ASKDemod_ext(Cmd, verbose, emSearch, askType, &st);
+    bool st = false;
+    return ASKDemod_ext(Cmd, verbose, emSearch, askType, &st);
 }
 
 //by marshmellow
@@ -547,68 +547,68 @@ int ASKDemod(const char *Cmd, bool verbose, bool emSearch, uint8_t askType) {
 //prints binary found and saves in graphbuffer for further commands
 int Cmdaskmandemod(const char *Cmd)
 {
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if (strlen(Cmd) > 45 || cmdp == 'h') return usage_data_rawdemod_am();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) > 45 || cmdp == 'h') return usage_data_rawdemod_am();
 
-	bool st = true;
-	if (Cmd[0] == 's')
-		return ASKDemod_ext(Cmd++, true, true, 1, &st);
-	else if (Cmd[1] == 's')
-		return ASKDemod_ext(Cmd += 2, true, true, 1, &st);
+    bool st = true;
+    if (Cmd[0] == 's')
+        return ASKDemod_ext(Cmd++, true, true, 1, &st);
+    else if (Cmd[1] == 's')
+        return ASKDemod_ext(Cmd += 2, true, true, 1, &st);
 
-	return ASKDemod(Cmd, true, true, 1);
+    return ASKDemod(Cmd, true, true, 1);
 }
 
 //by marshmellow
 //manchester decode
 //stricktly take 10 and 01 and convert to 0 and 1
 int Cmdmandecoderaw(const char *Cmd) {
-	size_t size = 0;
-	int high = 0, low = 0;
-	int i = 0, errCnt = 0, invert = 0, maxErr = 20;
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if (strlen(Cmd) > 5 || cmdp == 'h') return usage_data_manrawdecode();
+    size_t size = 0;
+    int high = 0, low = 0;
+    int i = 0, errCnt = 0, invert = 0, maxErr = 20;
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) > 5 || cmdp == 'h') return usage_data_manrawdecode();
 
-	if (DemodBufferLen == 0) return 0;
+    if (DemodBufferLen == 0) return 0;
 
-	uint8_t bits[MAX_DEMOD_BUF_LEN] = {0};
+    uint8_t bits[MAX_DEMOD_BUF_LEN] = {0};
 
-	for (; i < DemodBufferLen; ++i){
-		if (DemodBuffer[i] > high)
-			high = DemodBuffer[i];
-		else if(DemodBuffer[i] < low)
-			low = DemodBuffer[i];
-		bits[i] = DemodBuffer[i];
-	}
+    for (; i < DemodBufferLen; ++i){
+        if (DemodBuffer[i] > high)
+            high = DemodBuffer[i];
+        else if(DemodBuffer[i] < low)
+            low = DemodBuffer[i];
+        bits[i] = DemodBuffer[i];
+    }
 
-	if (high > 7 || low < 0 ){
-		PrintAndLogEx(WARNING, "Error: please raw demod the wave first then manchester raw decode");
-		return 0;
-	}
+    if (high > 7 || low < 0 ){
+        PrintAndLogEx(WARNING, "Error: please raw demod the wave first then manchester raw decode");
+        return 0;
+    }
 
-	sscanf(Cmd, "%i %i", &invert, &maxErr);
-	size = i;
-	uint8_t alignPos = 0;
-	errCnt = manrawdecode(bits, &size, invert, &alignPos);
-	if (errCnt >= maxErr){
-		PrintAndLogEx(WARNING, "Too many errors: %d",errCnt);
-		return 0;
-	}
+    sscanf(Cmd, "%i %i", &invert, &maxErr);
+    size = i;
+    uint8_t alignPos = 0;
+    errCnt = manrawdecode(bits, &size, invert, &alignPos);
+    if (errCnt >= maxErr){
+        PrintAndLogEx(WARNING, "Too many errors: %d",errCnt);
+        return 0;
+    }
 
-	PrintAndLogEx(NORMAL, "Manchester Decoded - # errors:%d - data:",errCnt);
-	PrintAndLogEx(NORMAL, "%s", sprint_bin_break(bits, size, 16));
+    PrintAndLogEx(NORMAL, "Manchester Decoded - # errors:%d - data:",errCnt);
+    PrintAndLogEx(NORMAL, "%s", sprint_bin_break(bits, size, 16));
 
-	if (errCnt == 0){
-		uint64_t id = 0;
-		uint32_t hi = 0;
-		size_t idx = 0;
-		if (Em410xDecode(bits, &size, &idx, &hi, &id) == 1){
-			//need to adjust to set bitstream back to manchester encoded data
-			//setDemodBuf(bits, size, idx);
-			printEM410x(hi, id);
-		}
-	}
-	return 1;
+    if (errCnt == 0){
+        uint64_t id = 0;
+        uint32_t hi = 0;
+        size_t idx = 0;
+        if (Em410xDecode(bits, &size, &idx, &hi, &id) == 1){
+            //need to adjust to set bitstream back to manchester encoded data
+            //setDemodBuf(bits, size, idx);
+            printEM410x(hi, id);
+        }
+    }
+    return 1;
 }
 
 //by marshmellow
@@ -618,269 +618,269 @@ int Cmdmandecoderaw(const char *Cmd) {
 // and "invert" default = 0 if 1 it will invert output
 //  the argument offset allows us to manually shift if the output is incorrect - [EDIT: now auto detects]
 int CmdBiphaseDecodeRaw(const char *Cmd) {
-	size_t size = 0;
-	int offset = 0, invert = 0, maxErr = 20, errCnt = 0;
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if (strlen(Cmd) > 3 || cmdp == 'h') return usage_data_biphaserawdecode();
+    size_t size = 0;
+    int offset = 0, invert = 0, maxErr = 20, errCnt = 0;
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) > 3 || cmdp == 'h') return usage_data_biphaserawdecode();
 
-	sscanf(Cmd, "%i %i %i", &offset, &invert, &maxErr);
-	if (DemodBufferLen == 0){
-		PrintAndLogEx(NORMAL, "DemodBuffer Empty - run 'data rawdemod ar' first");
-		return 0;
-	}
+    sscanf(Cmd, "%i %i %i", &offset, &invert, &maxErr);
+    if (DemodBufferLen == 0){
+        PrintAndLogEx(NORMAL, "DemodBuffer Empty - run 'data rawdemod ar' first");
+        return 0;
+    }
 
-	uint8_t bits[MAX_DEMOD_BUF_LEN] = {0};
-	size = sizeof(bits);
-	if ( !getDemodBuf(bits, &size) ) return 0;
+    uint8_t bits[MAX_DEMOD_BUF_LEN] = {0};
+    size = sizeof(bits);
+    if ( !getDemodBuf(bits, &size) ) return 0;
 
-	errCnt = BiphaseRawDecode(bits, &size, &offset, invert);
-	if (errCnt < 0){
-		PrintAndLogEx(WARNING, "Error during decode:%d", errCnt);
-		return 0;
-	}
-	if (errCnt > maxErr){
-		PrintAndLogEx(WARNING, "Too many errors attempting to decode: %d",errCnt);
-		return 0;
-	}
+    errCnt = BiphaseRawDecode(bits, &size, &offset, invert);
+    if (errCnt < 0){
+        PrintAndLogEx(WARNING, "Error during decode:%d", errCnt);
+        return 0;
+    }
+    if (errCnt > maxErr){
+        PrintAndLogEx(WARNING, "Too many errors attempting to decode: %d",errCnt);
+        return 0;
+    }
 
-	if (errCnt > 0)
-		PrintAndLogEx(WARNING, "# Errors found during Demod (shown as 7 in bit stream): %d",errCnt);
+    if (errCnt > 0)
+        PrintAndLogEx(WARNING, "# Errors found during Demod (shown as 7 in bit stream): %d",errCnt);
 
-	PrintAndLogEx(NORMAL, "Biphase Decoded using offset: %d - # invert:%d - data:",offset,invert);
-	PrintAndLogEx(NORMAL, "%s", sprint_bin_break(bits, size, 16));
+    PrintAndLogEx(NORMAL, "Biphase Decoded using offset: %d - # invert:%d - data:",offset,invert);
+    PrintAndLogEx(NORMAL, "%s", sprint_bin_break(bits, size, 16));
 
-	//remove first bit from raw demod
-	if (offset)
-		setDemodBuf(DemodBuffer,DemodBufferLen-offset, offset);
+    //remove first bit from raw demod
+    if (offset)
+        setDemodBuf(DemodBuffer,DemodBufferLen-offset, offset);
 
-	setClockGrid(g_DemodClock, g_DemodStartIdx + g_DemodClock*offset/2);
-	return 1;
+    setClockGrid(g_DemodClock, g_DemodStartIdx + g_DemodClock*offset/2);
+    return 1;
 }
 
 //by marshmellow
 // - ASK Demod then Biphase decode GraphBuffer samples
 int ASKbiphaseDemod(const char *Cmd, bool verbose)
 {
-	//ask raw demod GraphBuffer first
-	int offset=0, clk=0, invert=0, maxErr=0;
-	sscanf(Cmd, "%i %i %i %i", &offset, &clk, &invert, &maxErr);
+    //ask raw demod GraphBuffer first
+    int offset=0, clk=0, invert=0, maxErr=0;
+    sscanf(Cmd, "%i %i %i %i", &offset, &clk, &invert, &maxErr);
 
-	uint8_t BitStream[MAX_DEMOD_BUF_LEN];
-	size_t size = getFromGraphBuf(BitStream);
-	if (size == 0 ) {
-		PrintAndLogEx(DEBUG, "DEBUG: no data in graphbuf");
-		return 0;
-	}
-	int startIdx = 0;
-	//invert here inverts the ask raw demoded bits which has no effect on the demod, but we need the pointer
-	int errCnt = askdemod_ext(BitStream, &size, &clk, &invert, maxErr, 0, 0, &startIdx);
-	if ( errCnt < 0 || errCnt > maxErr ) {
-		PrintAndLogEx(DEBUG, "DEBUG: no data or error found %d, clock: %d", errCnt, clk);
-		return 0;
-	}
+    uint8_t BitStream[MAX_DEMOD_BUF_LEN];
+    size_t size = getFromGraphBuf(BitStream);
+    if (size == 0 ) {
+        PrintAndLogEx(DEBUG, "DEBUG: no data in graphbuf");
+        return 0;
+    }
+    int startIdx = 0;
+    //invert here inverts the ask raw demoded bits which has no effect on the demod, but we need the pointer
+    int errCnt = askdemod_ext(BitStream, &size, &clk, &invert, maxErr, 0, 0, &startIdx);
+    if ( errCnt < 0 || errCnt > maxErr ) {
+        PrintAndLogEx(DEBUG, "DEBUG: no data or error found %d, clock: %d", errCnt, clk);
+        return 0;
+    }
 
-	//attempt to Biphase decode BitStream
-	errCnt = BiphaseRawDecode(BitStream, &size, &offset, invert);
-	if (errCnt < 0){
-		if (g_debugMode || verbose) PrintAndLogEx(DEBUG, "DEBUG: Error BiphaseRawDecode: %d", errCnt);
-		return 0;
-	}
-	if (errCnt > maxErr) {
-		if (g_debugMode || verbose) PrintAndLogEx(DEBUG, "DEBUG: Error BiphaseRawDecode too many errors: %d", errCnt);
-		return 0;
-	}
-	//success set DemodBuffer and return
-	setDemodBuf(BitStream, size, 0);
-	setClockGrid(clk, startIdx + clk*offset/2);
-	if (g_debugMode || verbose){
-		PrintAndLogEx(NORMAL, "Biphase Decoded using offset: %d - clock: %d - # errors:%d - data:",offset,clk,errCnt);
-		printDemodBuff();
-	}
-	return 1;
+    //attempt to Biphase decode BitStream
+    errCnt = BiphaseRawDecode(BitStream, &size, &offset, invert);
+    if (errCnt < 0){
+        if (g_debugMode || verbose) PrintAndLogEx(DEBUG, "DEBUG: Error BiphaseRawDecode: %d", errCnt);
+        return 0;
+    }
+    if (errCnt > maxErr) {
+        if (g_debugMode || verbose) PrintAndLogEx(DEBUG, "DEBUG: Error BiphaseRawDecode too many errors: %d", errCnt);
+        return 0;
+    }
+    //success set DemodBuffer and return
+    setDemodBuf(BitStream, size, 0);
+    setClockGrid(clk, startIdx + clk*offset/2);
+    if (g_debugMode || verbose){
+        PrintAndLogEx(NORMAL, "Biphase Decoded using offset: %d - clock: %d - # errors:%d - data:",offset,clk,errCnt);
+        printDemodBuff();
+    }
+    return 1;
 }
 //by marshmellow - see ASKbiphaseDemod
 int Cmdaskbiphdemod(const char *Cmd)
 {
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if (strlen(Cmd) > 25 || cmdp == 'h') return usage_data_rawdemod_ab();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) > 25 || cmdp == 'h') return usage_data_rawdemod_ab();
 
-	return ASKbiphaseDemod(Cmd, true);
+    return ASKbiphaseDemod(Cmd, true);
 }
 
 //by marshmellow - see ASKDemod
 int Cmdaskrawdemod(const char *Cmd)
 {
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if (strlen(Cmd) > 25 || cmdp == 'h') return usage_data_rawdemod_ar();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) > 25 || cmdp == 'h') return usage_data_rawdemod_ar();
 
-	return ASKDemod(Cmd, true, false, 0);
+    return ASKDemod(Cmd, true, false, 0);
 }
 
 int AutoCorrelate(const int *in, int *out, size_t len, int window, bool SaveGrph, bool verbose) {
-	// sanity check
-	if ( window > len ) window = len;
+    // sanity check
+    if ( window > len ) window = len;
 
-	if (verbose) PrintAndLogEx(INFO, "performing %d correlations", GraphTraceLen - window);
+    if (verbose) PrintAndLogEx(INFO, "performing %d correlations", GraphTraceLen - window);
 
-	//test
-	double autocv = 0.0;	// Autocovariance value
-	double ac_value;		// Computed autocorrelation value to be returned
-	double variance; 		// Computed variance
-	double mean;
-	size_t correlation = 0;
-	int lastmax = 0;
+    //test
+    double autocv = 0.0;    // Autocovariance value
+    double ac_value;        // Computed autocorrelation value to be returned
+    double variance;        // Computed variance
+    double mean;
+    size_t correlation = 0;
+    int lastmax = 0;
 
-	// in, len, 4000
-	mean = compute_mean(in, len);
-	variance = compute_variance(in, len);
+    // in, len, 4000
+    mean = compute_mean(in, len);
+    variance = compute_variance(in, len);
 
-	static int CorrelBuffer[MAX_GRAPH_TRACE_LEN];
+    static int CorrelBuffer[MAX_GRAPH_TRACE_LEN];
 
-	for (int i = 0; i < len - window; ++i) {
+    for (int i = 0; i < len - window; ++i) {
 
-		for (size_t j=0; j < (len - i); j++) {
-			autocv += (in[j] - mean) * (in[j+i] - mean);
-		}
-		autocv = (1.0 / (len - i)) * autocv;
+        for (size_t j=0; j < (len - i); j++) {
+            autocv += (in[j] - mean) * (in[j+i] - mean);
+        }
+        autocv = (1.0 / (len - i)) * autocv;
 
-		CorrelBuffer[i] = autocv;
+        CorrelBuffer[i] = autocv;
 
-		// Autocorrelation is autocovariance divided by variance
-		ac_value = autocv / variance;
+        // Autocorrelation is autocovariance divided by variance
+        ac_value = autocv / variance;
 
-		// keep track of which distance is repeating.
-		if ( ac_value > 1) {
-			correlation = i-lastmax;
-			lastmax = i;
-		}
-	}
+        // keep track of which distance is repeating.
+        if ( ac_value > 1) {
+            correlation = i-lastmax;
+            lastmax = i;
+        }
+    }
 
-	//
-	int hi = 0, idx = 0;
-	int distance = 0, hi_1 = 0, idx_1 = 0;
-	for (int i = 0; i <= len; ++i){
-		if ( CorrelBuffer[i] > hi) {
-			hi = CorrelBuffer[i];
-			idx = i;
-		}
-	}
+    //
+    int hi = 0, idx = 0;
+    int distance = 0, hi_1 = 0, idx_1 = 0;
+    for (int i = 0; i <= len; ++i){
+        if ( CorrelBuffer[i] > hi) {
+            hi = CorrelBuffer[i];
+            idx = i;
+        }
+    }
 
-	for (int i = idx+1; i <= window; ++i){
-		if ( CorrelBuffer[i] > hi_1 ) {
-			hi_1 = CorrelBuffer[i];
-			idx_1 = i;
-		}
-	}
+    for (int i = idx+1; i <= window; ++i){
+        if ( CorrelBuffer[i] > hi_1 ) {
+            hi_1 = CorrelBuffer[i];
+            idx_1 = i;
+        }
+    }
 
-	int foo = ABS(hi-hi_1);
-	int bar = (int)((int)((hi+hi_1) / 2) * 0.03);
-	if ( verbose && foo < bar ) {
-		distance = idx_1 - idx;
-		PrintAndLogEx(SUCCESS, "possible 3% visible correlation %4d samples", distance);
-	} else if (verbose && ( correlation > 1 ) ) {
-		PrintAndLogEx(SUCCESS, "possible correlation %4d samples", correlation);
-	} else {
-		PrintAndLogEx(FAILED, "no repeating pattern found, try increasing window size");
-	}
+    int foo = ABS(hi-hi_1);
+    int bar = (int)((int)((hi+hi_1) / 2) * 0.03);
+    if ( verbose && foo < bar ) {
+        distance = idx_1 - idx;
+        PrintAndLogEx(SUCCESS, "possible 3% visible correlation %4d samples", distance);
+    } else if (verbose && ( correlation > 1 ) ) {
+        PrintAndLogEx(SUCCESS, "possible correlation %4d samples", correlation);
+    } else {
+        PrintAndLogEx(FAILED, "no repeating pattern found, try increasing window size");
+    }
 
-	int retval = correlation;
-	if (SaveGrph) {
-		//GraphTraceLen = GraphTraceLen - window;
-		memcpy(out, CorrelBuffer, len * sizeof(int));
-		if ( distance > 0) {
-			setClockGrid(distance, idx);
-			retval = distance;
-		}
-		else
-			setClockGrid(correlation, idx);
+    int retval = correlation;
+    if (SaveGrph) {
+        //GraphTraceLen = GraphTraceLen - window;
+        memcpy(out, CorrelBuffer, len * sizeof(int));
+        if ( distance > 0) {
+            setClockGrid(distance, idx);
+            retval = distance;
+        }
+        else
+            setClockGrid(correlation, idx);
 
-		CursorCPos = idx_1;
-		CursorDPos = idx_1+retval;
-		DemodBufferLen = 0;
-		RepaintGraphWindow();
-	}
+        CursorCPos = idx_1;
+        CursorDPos = idx_1+retval;
+        DemodBufferLen = 0;
+        RepaintGraphWindow();
+    }
 
-	return retval;
+    return retval;
 }
 
 int CmdAutoCorr(const char *Cmd) {
 
-	uint32_t window = 4000;
-	uint8_t cmdp = 0;
-	bool updateGrph = false;
-	bool errors = false;
+    uint32_t window = 4000;
+    uint8_t cmdp = 0;
+    bool updateGrph = false;
+    bool errors = false;
 
-	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch (tolower(param_getchar(Cmd, cmdp))) {
-			case 'h':
-				return usage_data_autocorr();
-			case 'g':
-				updateGrph = true;
-				cmdp++;
-				break;
-			case 'w':
-				window = param_get32ex(Cmd, cmdp+1, 4000, 10);
-				if (window >= GraphTraceLen) {
-					PrintAndLogEx(WARNING, "window must be smaller than trace (%d samples)", GraphTraceLen);
-					errors = true;
-				}
-				cmdp += 2;
-				break;
-			default:
-				PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-				errors = true;
-				break;
-		}
-	}
-	//Validations
-	if (errors || cmdp == 0 ) return usage_data_autocorr();
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+            case 'h':
+                return usage_data_autocorr();
+            case 'g':
+                updateGrph = true;
+                cmdp++;
+                break;
+            case 'w':
+                window = param_get32ex(Cmd, cmdp+1, 4000, 10);
+                if (window >= GraphTraceLen) {
+                    PrintAndLogEx(WARNING, "window must be smaller than trace (%d samples)", GraphTraceLen);
+                    errors = true;
+                }
+                cmdp += 2;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                errors = true;
+                break;
+        }
+    }
+    //Validations
+    if (errors || cmdp == 0 ) return usage_data_autocorr();
 
-	return AutoCorrelate(GraphBuffer, GraphBuffer, GraphTraceLen, window, updateGrph, true);
+    return AutoCorrelate(GraphBuffer, GraphBuffer, GraphTraceLen, window, updateGrph, true);
 }
 
 int CmdBitsamples(const char *Cmd)
 {
-	int cnt = 0;
-	uint8_t got[12288];
+    int cnt = 0;
+    uint8_t got[12288];
 
-	if (!GetFromDevice(BIG_BUF, got, sizeof(got), 0, NULL, 2500 , false)) {
-		PrintAndLogEx(WARNING, "command execution time out");
-		return false;
-	}
+    if (!GetFromDevice(BIG_BUF, got, sizeof(got), 0, NULL, 2500 , false)) {
+        PrintAndLogEx(WARNING, "command execution time out");
+        return false;
+    }
 
-	for (int j = 0; j < sizeof(got); j++) {
-		for (int k = 0; k < 8; k++) {
-			if(got[j] & (1 << (7 - k)))
-				GraphBuffer[cnt++] = 1;
-			else
-				GraphBuffer[cnt++] = 0;
-		}
-	}
-	GraphTraceLen = cnt;
-	RepaintGraphWindow();
-	return 0;
+    for (int j = 0; j < sizeof(got); j++) {
+        for (int k = 0; k < 8; k++) {
+            if(got[j] & (1 << (7 - k)))
+                GraphBuffer[cnt++] = 1;
+            else
+                GraphBuffer[cnt++] = 0;
+        }
+    }
+    GraphTraceLen = cnt;
+    RepaintGraphWindow();
+    return 0;
 }
 
 int CmdBuffClear(const char *Cmd)
 {
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if (cmdp == 'h') return usage_data_buffclear();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (cmdp == 'h') return usage_data_buffclear();
 
-	UsbCommand c = {CMD_BUFF_CLEAR, {0,0,0}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	ClearGraph(true);
-	return 0;
+    UsbCommand c = {CMD_BUFF_CLEAR, {0,0,0}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    ClearGraph(true);
+    return 0;
 }
 
 int CmdDec(const char *Cmd)
 {
-	for (int i = 0; i < (GraphTraceLen / 2); ++i)
-		GraphBuffer[i] = GraphBuffer[i * 2];
-	GraphTraceLen /= 2;
-	PrintAndLogEx(NORMAL, "decimated by 2");
-	RepaintGraphWindow();
-	return 0;
+    for (int i = 0; i < (GraphTraceLen / 2); ++i)
+        GraphBuffer[i] = GraphBuffer[i * 2];
+    GraphTraceLen /= 2;
+    PrintAndLogEx(NORMAL, "decimated by 2");
+    RepaintGraphWindow();
+    return 0;
 }
 /**
  * Undecimate - I'd call it 'interpolate', but we'll save that
@@ -891,62 +891,62 @@ int CmdDec(const char *Cmd)
  */
 int CmdUndec(const char *Cmd)
 {
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if (cmdp == 'h') return usage_data_undecimate();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (cmdp == 'h') return usage_data_undecimate();
 
-	uint8_t factor = param_get8ex(Cmd, 0, 2, 10);
+    uint8_t factor = param_get8ex(Cmd, 0, 2, 10);
 
-	//We have memory, don't we?
-	int swap[MAX_GRAPH_TRACE_LEN] = {0};
-	uint32_t g_index = 0, s_index = 0;
-	while(g_index < GraphTraceLen && s_index + factor < MAX_GRAPH_TRACE_LEN)
-	{
-		int count = 0;
-		for (count = 0; count < factor && s_index + count < MAX_GRAPH_TRACE_LEN; count++)
-			swap[s_index+count] = GraphBuffer[g_index];
-		s_index += count;
-		g_index++;
-	}
+    //We have memory, don't we?
+    int swap[MAX_GRAPH_TRACE_LEN] = {0};
+    uint32_t g_index = 0, s_index = 0;
+    while(g_index < GraphTraceLen && s_index + factor < MAX_GRAPH_TRACE_LEN)
+    {
+        int count = 0;
+        for (count = 0; count < factor && s_index + count < MAX_GRAPH_TRACE_LEN; count++)
+            swap[s_index+count] = GraphBuffer[g_index];
+        s_index += count;
+        g_index++;
+    }
 
-	memcpy(GraphBuffer, swap, s_index * sizeof(int));
-	GraphTraceLen = s_index;
-	RepaintGraphWindow();
-	return 0;
+    memcpy(GraphBuffer, swap, s_index * sizeof(int));
+    GraphTraceLen = s_index;
+    RepaintGraphWindow();
+    return 0;
 }
 
 //by marshmellow
 //shift graph zero up or down based on input + or -
 int CmdGraphShiftZero(const char *Cmd) {
-	int shift = 0, shiftedVal = 0;
-	//set options from parameters entered with the command
-	sscanf(Cmd, "%i", &shift);
+    int shift = 0, shiftedVal = 0;
+    //set options from parameters entered with the command
+    sscanf(Cmd, "%i", &shift);
 
-	for(int i = 0; i < GraphTraceLen; i++){
-		if ( i+shift >= GraphTraceLen)
-			shiftedVal = GraphBuffer[i];
-		else
-			shiftedVal = GraphBuffer[i] + shift;
+    for(int i = 0; i < GraphTraceLen; i++){
+        if ( i+shift >= GraphTraceLen)
+            shiftedVal = GraphBuffer[i];
+        else
+            shiftedVal = GraphBuffer[i] + shift;
 
-		if (shiftedVal > 127)
-			shiftedVal = 127;
-		else if (shiftedVal < -127)
-			shiftedVal = -127;
-		GraphBuffer[i] = shiftedVal;
-	}
-	CmdNorm("");
-	return 0;
+        if (shiftedVal > 127)
+            shiftedVal = 127;
+        else if (shiftedVal < -127)
+            shiftedVal = -127;
+        GraphBuffer[i] = shiftedVal;
+    }
+    CmdNorm("");
+    return 0;
 }
 
 int AskEdgeDetect(const int *in, int *out, int len, int threshold) {
-	int last = 0;
-	for(int i = 1; i<len; i++) {
-		if (in[i] - in[i-1] >= threshold) //large jump up
-			last = 127;
-		else if (in[i] - in[i-1] <= -1 * threshold) //large jump down
-			last = -127;
-		out[i-1] = last;
-	}
-	return 0;
+    int last = 0;
+    for(int i = 1; i<len; i++) {
+        if (in[i] - in[i-1] >= threshold) //large jump up
+            last = 127;
+        else if (in[i] - in[i-1] <= -1 * threshold) //large jump down
+            last = -127;
+        out[i-1] = last;
+    }
+    return 0;
 }
 
 //by marshmellow
@@ -954,69 +954,69 @@ int AskEdgeDetect(const int *in, int *out, int len, int threshold) {
 //similar to dirtheshold, threshold commands
 //takes a threshold length which is the measured length between two samples then determines an edge
 int CmdAskEdgeDetect(const char *Cmd) {
-	int thresLen = 25;
-	int ans = 0;
-	sscanf(Cmd, "%i", &thresLen);
+    int thresLen = 25;
+    int ans = 0;
+    sscanf(Cmd, "%i", &thresLen);
 
-	ans = AskEdgeDetect(GraphBuffer, GraphBuffer, GraphTraceLen, thresLen);
-	RepaintGraphWindow();
-	return ans;
+    ans = AskEdgeDetect(GraphBuffer, GraphBuffer, GraphTraceLen, thresLen);
+    RepaintGraphWindow();
+    return ans;
 }
 
 /* Print our clock rate */
 // uses data from graphbuffer
 // adjusted to take char parameter for type of modulation to find the clock - by marshmellow.
 int CmdDetectClockRate(const char *Cmd) {
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if (strlen(Cmd) > 6 || strlen(Cmd) == 0 || cmdp == 'h')
-		return usage_data_detectclock();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) > 6 || strlen(Cmd) == 0 || cmdp == 'h')
+        return usage_data_detectclock();
 
-	int clock = 0;
-	switch ( cmdp ) {
-		case 'a' :
-			clock = GetAskClock(Cmd+1, true);
-			break;
-		case 'f' :
-			clock = GetFskClock("", true);
-			break;
-		case 'n' :
-			clock = GetNrzClock("", true);
-			break;
-		case 'p' :
-			clock = GetPskClock("", true);
-			break;
-		default :
-			PrintAndLogEx(NORMAL, "Please specify a valid modulation to detect the clock of - see option h for help");
-			break;
-	}
-	RepaintGraphWindow();
-	return clock;
+    int clock = 0;
+    switch ( cmdp ) {
+        case 'a' :
+            clock = GetAskClock(Cmd+1, true);
+            break;
+        case 'f' :
+            clock = GetFskClock("", true);
+            break;
+        case 'n' :
+            clock = GetNrzClock("", true);
+            break;
+        case 'p' :
+            clock = GetPskClock("", true);
+            break;
+        default :
+            PrintAndLogEx(NORMAL, "Please specify a valid modulation to detect the clock of - see option h for help");
+            break;
+    }
+    RepaintGraphWindow();
+    return clock;
 }
 
 char *GetFSKType(uint8_t fchigh, uint8_t fclow, uint8_t invert)
 {
-	static char fType[8];
-	memset(fType, 0x00, 8);
-	char *fskType = fType;
+    static char fType[8];
+    memset(fType, 0x00, 8);
+    char *fskType = fType;
 
-	if (fchigh == 10 && fclow == 8){
+    if (fchigh == 10 && fclow == 8){
 
-		if (invert)
-			memcpy(fskType, "FSK2a", 5);
-		else
-			memcpy(fskType, "FSK2", 4);
+        if (invert)
+            memcpy(fskType, "FSK2a", 5);
+        else
+            memcpy(fskType, "FSK2", 4);
 
-	} else if (fchigh == 8 && fclow == 5) {
+    } else if (fchigh == 8 && fclow == 5) {
 
-		if (invert)
-			memcpy(fskType, "FSK1", 4);
-		else
-			memcpy(fskType, "FSK1a", 5);
+        if (invert)
+            memcpy(fskType, "FSK1", 4);
+        else
+            memcpy(fskType, "FSK1a", 5);
 
-	} else {
-		memcpy(fskType, "FSK??", 5);
-	}
-	return fskType;
+    } else {
+        memcpy(fskType, "FSK??", 5);
+    }
+    return fskType;
 }
 
 //by marshmellow
@@ -1024,65 +1024,65 @@ char *GetFSKType(uint8_t fchigh, uint8_t fclow, uint8_t invert)
 //takes 4 arguments - Clock, invert, fchigh, fclow
 //defaults: clock = 50, invert=1, fchigh=10, fclow=8 (RF/10 RF/8 (fsk2a))
 int FSKrawDemod(const char *Cmd, bool verbose) {
-	//raw fsk demod  no manchester decoding no start bit finding just get binary from wave
-	uint8_t rfLen, invert, fchigh, fclow;
+    //raw fsk demod  no manchester decoding no start bit finding just get binary from wave
+    uint8_t rfLen, invert, fchigh, fclow;
 
-	//set defaults
-	//set options from parameters entered with the command
-	rfLen = param_get8(Cmd, 0);
-	invert = param_get8(Cmd, 1);
-	fchigh = param_get8(Cmd, 2);
-	fclow = param_get8(Cmd, 3);
+    //set defaults
+    //set options from parameters entered with the command
+    rfLen = param_get8(Cmd, 0);
+    invert = param_get8(Cmd, 1);
+    fchigh = param_get8(Cmd, 2);
+    fclow = param_get8(Cmd, 3);
 
-	if (strlen(Cmd) > 0 && strlen(Cmd) <= 2) {
-		if (rfLen == 1) {
-			invert = 1;   //if invert option only is used
-			rfLen = 0;
-		}
-	}
+    if (strlen(Cmd) > 0 && strlen(Cmd) <= 2) {
+        if (rfLen == 1) {
+            invert = 1;   //if invert option only is used
+            rfLen = 0;
+        }
+    }
 
     if (getSignalProperties()->isnoise)
         return 0;
-    
-	uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
-	size_t BitLen = getFromGraphBuf(bits);
-	if (BitLen == 0) return 0;
 
-	//get field clock lengths
-	uint16_t fcs = 0;
-	if (!fchigh || !fclow) {
-		fcs = countFC(bits, BitLen, true);
-		if (!fcs) {
-			fchigh = 10;
-			fclow = 8;
-		} else {
-			fchigh = (fcs >> 8) & 0x00FF;
-			fclow = fcs & 0x00FF;
-		}
-	}
-	//get bit clock length
-	if (!rfLen) {
-		int firstClockEdge = 0; //todo - align grid on graph with this...
-		rfLen = detectFSKClk(bits, BitLen, fchigh, fclow, &firstClockEdge);
-		if (!rfLen) rfLen = 50;
-	}
-	int startIdx = 0;
-	int size = fskdemod(bits, BitLen, rfLen, invert, fchigh, fclow, &startIdx);
-	if (size > 0) {
-		setDemodBuf(bits, size, 0);
-		setClockGrid(rfLen, startIdx);
+    uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
+    size_t BitLen = getFromGraphBuf(bits);
+    if (BitLen == 0) return 0;
 
-		// Now output the bitstream to the scrollback by line of 16 bits
-		if (verbose || g_debugMode) {
-			PrintAndLogEx(DEBUG, "DEBUG: (FSKrawDemod) Using Clock:%u, invert:%u, fchigh:%u, fclow:%u", rfLen, invert, fchigh, fclow);
-			PrintAndLogEx(NORMAL, "%s decoded bitstream:", GetFSKType(fchigh, fclow, invert));
-			printDemodBuff();
-		}
-		return 1;
-	} else {
-		if (g_debugMode) PrintAndLogEx(NORMAL, "no FSK data found");
-	}
-	return 0;
+    //get field clock lengths
+    uint16_t fcs = 0;
+    if (!fchigh || !fclow) {
+        fcs = countFC(bits, BitLen, true);
+        if (!fcs) {
+            fchigh = 10;
+            fclow = 8;
+        } else {
+            fchigh = (fcs >> 8) & 0x00FF;
+            fclow = fcs & 0x00FF;
+        }
+    }
+    //get bit clock length
+    if (!rfLen) {
+        int firstClockEdge = 0; //todo - align grid on graph with this...
+        rfLen = detectFSKClk(bits, BitLen, fchigh, fclow, &firstClockEdge);
+        if (!rfLen) rfLen = 50;
+    }
+    int startIdx = 0;
+    int size = fskdemod(bits, BitLen, rfLen, invert, fchigh, fclow, &startIdx);
+    if (size > 0) {
+        setDemodBuf(bits, size, 0);
+        setClockGrid(rfLen, startIdx);
+
+        // Now output the bitstream to the scrollback by line of 16 bits
+        if (verbose || g_debugMode) {
+            PrintAndLogEx(DEBUG, "DEBUG: (FSKrawDemod) Using Clock:%u, invert:%u, fchigh:%u, fclow:%u", rfLen, invert, fchigh, fclow);
+            PrintAndLogEx(NORMAL, "%s decoded bitstream:", GetFSKType(fchigh, fclow, invert));
+            printDemodBuff();
+        }
+        return 1;
+    } else {
+        if (g_debugMode) PrintAndLogEx(NORMAL, "no FSK data found");
+    }
+    return 0;
 }
 
 //by marshmellow
@@ -1090,113 +1090,113 @@ int FSKrawDemod(const char *Cmd, bool verbose) {
 //takes 4 arguments - Clock, invert, fchigh, fclow
 //defaults: clock = 50, invert=1, fchigh=10, fclow=8 (RF/10 RF/8 (fsk2a))
 int CmdFSKrawdemod(const char *Cmd) {
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if (strlen(Cmd) > 20 || cmdp == 'h') return usage_data_rawdemod_fs();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) > 20 || cmdp == 'h') return usage_data_rawdemod_fs();
 
-	return FSKrawDemod(Cmd, true);
+    return FSKrawDemod(Cmd, true);
 }
 
 //by marshmellow
 //attempt to psk1 demod graph buffer
 int PSKDemod(const char *Cmd, bool verbose) {
-	int invert = 0, clk = 0, maxErr = 100;
-	sscanf(Cmd, "%i %i %i", &clk, &invert, &maxErr);
-	if (clk == 1) {
-		invert = 1;
-		clk = 0;
-	}
-	if (invert != 0 && invert != 1) {
-		if (g_debugMode || verbose) PrintAndLogEx(WARNING, "Invalid argument: %s", Cmd);
-		return 0;
-	}
-        
+    int invert = 0, clk = 0, maxErr = 100;
+    sscanf(Cmd, "%i %i %i", &clk, &invert, &maxErr);
+    if (clk == 1) {
+        invert = 1;
+        clk = 0;
+    }
+    if (invert != 0 && invert != 1) {
+        if (g_debugMode || verbose) PrintAndLogEx(WARNING, "Invalid argument: %s", Cmd);
+        return 0;
+    }
+
     if (getSignalProperties()->isnoise)
         return 0;
-    
-	uint8_t BitStream[MAX_GRAPH_TRACE_LEN] = {0};
-	size_t BitLen = getFromGraphBuf(BitStream);
-	if (BitLen == 0) return 0;
-	int errCnt = 0;
-	int startIdx = 0;
-	errCnt = pskRawDemod_ext(BitStream, &BitLen, &clk, &invert, &startIdx);
-	if (errCnt > maxErr){
-		if (g_debugMode || verbose) PrintAndLogEx(DEBUG, "DEBUG: (PSKdemod) Too many errors found, clk: %d, invert: %d, numbits: %d, errCnt: %d", clk, invert, BitLen, errCnt);
-		return 0;
-	}
-	if (errCnt < 0|| BitLen < 16){  //throw away static - allow 1 and -1 (in case of threshold command first)
-		if (g_debugMode || verbose) PrintAndLogEx(DEBUG, "DEBUG: (PSKdemod) no data found, clk: %d, invert: %d, numbits: %d, errCnt: %d", clk, invert, BitLen, errCnt);
-		return 0;
-	}
-	if (verbose || g_debugMode){
-		PrintAndLogEx(DEBUG, "DEBUG: (PSKdemod) Using Clock:%d, invert:%d, Bits Found:%d",clk, invert, BitLen);
-		if (errCnt > 0){
-			PrintAndLogEx(DEBUG, "DEBUG: (PSKdemod) errors during Demoding (shown as 7 in bit stream): %d", errCnt);
-		}
-	}
-	//prime demod buffer for output
-	setDemodBuf(BitStream, BitLen, 0);
-	setClockGrid(clk, startIdx);
-	return 1;
+
+    uint8_t BitStream[MAX_GRAPH_TRACE_LEN] = {0};
+    size_t BitLen = getFromGraphBuf(BitStream);
+    if (BitLen == 0) return 0;
+    int errCnt = 0;
+    int startIdx = 0;
+    errCnt = pskRawDemod_ext(BitStream, &BitLen, &clk, &invert, &startIdx);
+    if (errCnt > maxErr){
+        if (g_debugMode || verbose) PrintAndLogEx(DEBUG, "DEBUG: (PSKdemod) Too many errors found, clk: %d, invert: %d, numbits: %d, errCnt: %d", clk, invert, BitLen, errCnt);
+        return 0;
+    }
+    if (errCnt < 0|| BitLen < 16){  //throw away static - allow 1 and -1 (in case of threshold command first)
+        if (g_debugMode || verbose) PrintAndLogEx(DEBUG, "DEBUG: (PSKdemod) no data found, clk: %d, invert: %d, numbits: %d, errCnt: %d", clk, invert, BitLen, errCnt);
+        return 0;
+    }
+    if (verbose || g_debugMode){
+        PrintAndLogEx(DEBUG, "DEBUG: (PSKdemod) Using Clock:%d, invert:%d, Bits Found:%d",clk, invert, BitLen);
+        if (errCnt > 0){
+            PrintAndLogEx(DEBUG, "DEBUG: (PSKdemod) errors during Demoding (shown as 7 in bit stream): %d", errCnt);
+        }
+    }
+    //prime demod buffer for output
+    setDemodBuf(BitStream, BitLen, 0);
+    setClockGrid(clk, startIdx);
+    return 1;
 }
 
 int CmdPSKIdteck(const char *Cmd) {
 
-	if (!PSKDemod("", false)) {
-		PrintAndLogEx(DEBUG, "DEBUG: Error - Idteck PSKDemod failed");
-		return 0;
-	}
-	size_t size = DemodBufferLen;
+    if (!PSKDemod("", false)) {
+        PrintAndLogEx(DEBUG, "DEBUG: Error - Idteck PSKDemod failed");
+        return 0;
+    }
+    size_t size = DemodBufferLen;
 
-	//get binary from PSK1 wave
-	int idx = detectIdteck(DemodBuffer, &size);
-	if (idx < 0){
+    //get binary from PSK1 wave
+    int idx = detectIdteck(DemodBuffer, &size);
+    if (idx < 0){
 
-		if (idx == -1)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - Idteck: not enough samples");
-		else if (idx == -2)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - Idteck: just noise");
-		else if (idx == -3)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - Idteck: preamble not found");
-		else if (idx == -4)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - Idteck: size not correct: %d", size);
-		else
-			PrintAndLogEx(DEBUG, "DEBUG: Error - Idteck: idx: %d",idx);
+        if (idx == -1)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - Idteck: not enough samples");
+        else if (idx == -2)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - Idteck: just noise");
+        else if (idx == -3)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - Idteck: preamble not found");
+        else if (idx == -4)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - Idteck: size not correct: %d", size);
+        else
+            PrintAndLogEx(DEBUG, "DEBUG: Error - Idteck: idx: %d",idx);
 
-		// if didn't find preamble try again inverting
-		if (!PSKDemod("1", false)) {
-			PrintAndLogEx(DEBUG, "DEBUG: Error - Idteck PSKDemod failed");
-			return 0;
-		}
-		idx = detectIdteck(DemodBuffer, &size);
-		if (idx < 0){
+        // if didn't find preamble try again inverting
+        if (!PSKDemod("1", false)) {
+            PrintAndLogEx(DEBUG, "DEBUG: Error - Idteck PSKDemod failed");
+            return 0;
+        }
+        idx = detectIdteck(DemodBuffer, &size);
+        if (idx < 0){
 
-			if (idx == -1)
-				PrintAndLogEx(DEBUG, "DEBUG: Error - Idteck: not enough samples");
-			else if (idx == -2)
-				PrintAndLogEx(DEBUG, "DEBUG: Error - Idteck: just noise");
-			else if (idx == -3)
-				PrintAndLogEx(DEBUG, "DEBUG: Error - Idteck: preamble not found");
-			else if (idx == -4)
-				PrintAndLogEx(DEBUG, "DEBUG: Error - Idteck: size not correct: %d", size);
-			else
-				PrintAndLogEx(DEBUG, "DEBUG: Error - Idteck: idx: %d",idx);
+            if (idx == -1)
+                PrintAndLogEx(DEBUG, "DEBUG: Error - Idteck: not enough samples");
+            else if (idx == -2)
+                PrintAndLogEx(DEBUG, "DEBUG: Error - Idteck: just noise");
+            else if (idx == -3)
+                PrintAndLogEx(DEBUG, "DEBUG: Error - Idteck: preamble not found");
+            else if (idx == -4)
+                PrintAndLogEx(DEBUG, "DEBUG: Error - Idteck: size not correct: %d", size);
+            else
+                PrintAndLogEx(DEBUG, "DEBUG: Error - Idteck: idx: %d",idx);
 
-			return 0;
-		}
-	}
-	setDemodBuf(DemodBuffer, 64, idx);
+            return 0;
+        }
+    }
+    setDemodBuf(DemodBuffer, 64, idx);
 
-	//got a good demod
-	uint32_t id = 0;
-	uint32_t raw1 = bytebits_to_byte(DemodBuffer, 32);
-	uint32_t raw2 = bytebits_to_byte(DemodBuffer+32, 32);
+    //got a good demod
+    uint32_t id = 0;
+    uint32_t raw1 = bytebits_to_byte(DemodBuffer, 32);
+    uint32_t raw2 = bytebits_to_byte(DemodBuffer+32, 32);
 
-	//parity check (TBD)
-	//checksum check (TBD)
+    //parity check (TBD)
+    //checksum check (TBD)
 
-	//output
-	PrintAndLogEx(SUCCESS, "IDTECK Tag Found: Card ID %u ,  Raw: %08X%08X", id, raw1, raw2);
-	return 1;
+    //output
+    PrintAndLogEx(SUCCESS, "IDTECK Tag Found: Card ID %u ,  Raw: %08X%08X", id, raw1, raw2);
+    return 1;
 }
 
 // by marshmellow
@@ -1205,56 +1205,56 @@ int CmdPSKIdteck(const char *Cmd) {
 // prints binary found and saves in demodbuffer for further commands
 int NRZrawDemod(const char *Cmd, bool verbose) {
 
-	int errCnt = 0, clkStartIdx = 0;
-	int invert = 0, clk = 0, maxErr = 100;
-	sscanf(Cmd, "%i %i %i", &clk, &invert, &maxErr);
-	if (clk == 1){
-		invert = 1;
-		clk = 0;
-	}
+    int errCnt = 0, clkStartIdx = 0;
+    int invert = 0, clk = 0, maxErr = 100;
+    sscanf(Cmd, "%i %i %i", &clk, &invert, &maxErr);
+    if (clk == 1){
+        invert = 1;
+        clk = 0;
+    }
+
+    if (invert != 0 && invert != 1) {
+        PrintAndLogEx(WARNING, "(NRZrawDemod) Invalid argument: %s", Cmd);
+        return 0;
+    }
 
-	if (invert != 0 && invert != 1) {
-		PrintAndLogEx(WARNING, "(NRZrawDemod) Invalid argument: %s", Cmd);
-		return 0;
-	}
-        
     if (getSignalProperties()->isnoise)
         return 0;
 
-	uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
-	size_t BitLen = getFromGraphBuf(bits);
+    uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
+    size_t BitLen = getFromGraphBuf(bits);
 
-	if (BitLen == 0) return 0;
+    if (BitLen == 0) return 0;
 
-	errCnt = nrzRawDemod(bits, &BitLen, &clk, &invert, &clkStartIdx);
-	if (errCnt > maxErr){
-		PrintAndLogEx(DEBUG, "DEBUG: (NRZrawDemod) Too many errors found, clk: %d, invert: %d, numbits: %d, errCnt: %d",clk,invert,BitLen,errCnt);
-		return 0;
-	}
-	if (errCnt < 0 || BitLen < 16){  //throw away static - allow 1 and -1 (in case of threshold command first)
-		PrintAndLogEx(DEBUG, "DEBUG: (NRZrawDemod) no data found, clk: %d, invert: %d, numbits: %d, errCnt: %d", clk, invert, BitLen, errCnt);
-		return 0;
-	}
-	if (verbose || g_debugMode) PrintAndLogEx(DEBUG, "DEBUG: (NRZrawDemod) Tried NRZ Demod using Clock: %d - invert: %d - Bits Found: %d", clk, invert, BitLen);
-	//prime demod buffer for output
-	setDemodBuf(bits, BitLen, 0);
-	setClockGrid(clk, clkStartIdx);
+    errCnt = nrzRawDemod(bits, &BitLen, &clk, &invert, &clkStartIdx);
+    if (errCnt > maxErr){
+        PrintAndLogEx(DEBUG, "DEBUG: (NRZrawDemod) Too many errors found, clk: %d, invert: %d, numbits: %d, errCnt: %d",clk,invert,BitLen,errCnt);
+        return 0;
+    }
+    if (errCnt < 0 || BitLen < 16){  //throw away static - allow 1 and -1 (in case of threshold command first)
+        PrintAndLogEx(DEBUG, "DEBUG: (NRZrawDemod) no data found, clk: %d, invert: %d, numbits: %d, errCnt: %d", clk, invert, BitLen, errCnt);
+        return 0;
+    }
+    if (verbose || g_debugMode) PrintAndLogEx(DEBUG, "DEBUG: (NRZrawDemod) Tried NRZ Demod using Clock: %d - invert: %d - Bits Found: %d", clk, invert, BitLen);
+    //prime demod buffer for output
+    setDemodBuf(bits, BitLen, 0);
+    setClockGrid(clk, clkStartIdx);
 
 
-	if (errCnt > 0 && (verbose || g_debugMode)) PrintAndLogEx(DEBUG, "DEBUG: (NRZrawDemod) Errors during Demoding (shown as 7 in bit stream): %d", errCnt);
-	if (verbose || g_debugMode) {
-		PrintAndLogEx(NORMAL, "NRZ demoded bitstream:");
-		// Now output the bitstream to the scrollback by line of 16 bits
-		printDemodBuff();
-	}
-	return 1;
+    if (errCnt > 0 && (verbose || g_debugMode)) PrintAndLogEx(DEBUG, "DEBUG: (NRZrawDemod) Errors during Demoding (shown as 7 in bit stream): %d", errCnt);
+    if (verbose || g_debugMode) {
+        PrintAndLogEx(NORMAL, "NRZ demoded bitstream:");
+        // Now output the bitstream to the scrollback by line of 16 bits
+        printDemodBuff();
+    }
+    return 1;
 }
 
 int CmdNRZrawDemod(const char *Cmd) {
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if (strlen(Cmd) > 16 || cmdp == 'h') return usage_data_rawdemod_nr();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) > 16 || cmdp == 'h') return usage_data_rawdemod_nr();
 
-	return NRZrawDemod(Cmd, true);
+    return NRZrawDemod(Cmd, true);
 }
 
 // by marshmellow
@@ -1262,569 +1262,569 @@ int CmdNRZrawDemod(const char *Cmd) {
 // attempts to demodulate psk only
 // prints binary found and saves in demodbuffer for further commands
 int CmdPSK1rawDemod(const char *Cmd) {
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if (strlen(Cmd) > 16 || cmdp == 'h') return usage_data_rawdemod_p1();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) > 16 || cmdp == 'h') return usage_data_rawdemod_p1();
 
-	int ans = PSKDemod(Cmd, true);
-	//output
-	if (!ans){
-		if (g_debugMode) PrintAndLogEx(WARNING, "Error demoding: %d",ans);
-		return 0;
-	}
-	PrintAndLogEx(NORMAL, "PSK1 demoded bitstream:");
-	// Now output the bitstream to the scrollback by line of 16 bits
-	printDemodBuff();
-	return 1;
+    int ans = PSKDemod(Cmd, true);
+    //output
+    if (!ans){
+        if (g_debugMode) PrintAndLogEx(WARNING, "Error demoding: %d",ans);
+        return 0;
+    }
+    PrintAndLogEx(NORMAL, "PSK1 demoded bitstream:");
+    // Now output the bitstream to the scrollback by line of 16 bits
+    printDemodBuff();
+    return 1;
 }
 
 // by marshmellow
 // takes same args as cmdpsk1rawdemod
 int CmdPSK2rawDemod(const char *Cmd) {
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if (strlen(Cmd) > 16 || cmdp == 'h') return usage_data_rawdemod_p2();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) > 16 || cmdp == 'h') return usage_data_rawdemod_p2();
 
-	int ans = PSKDemod(Cmd, true);
-	if (!ans){
-		if (g_debugMode) PrintAndLogEx(WARNING, "Error demoding: %d",ans);
-		return 0;
-	}
-	psk1TOpsk2(DemodBuffer, DemodBufferLen);
-	PrintAndLogEx(NORMAL, "PSK2 demoded bitstream:");
-	// Now output the bitstream to the scrollback by line of 16 bits
-	printDemodBuff();
-	return 1;
+    int ans = PSKDemod(Cmd, true);
+    if (!ans){
+        if (g_debugMode) PrintAndLogEx(WARNING, "Error demoding: %d",ans);
+        return 0;
+    }
+    psk1TOpsk2(DemodBuffer, DemodBufferLen);
+    PrintAndLogEx(NORMAL, "PSK2 demoded bitstream:");
+    // Now output the bitstream to the scrollback by line of 16 bits
+    printDemodBuff();
+    return 1;
 }
 
 // by marshmellow - combines all raw demod functions into one menu command
 int CmdRawDemod(const char *Cmd) {
-	int ans = 0;
+    int ans = 0;
 
-	if (strlen(Cmd) > 35 || strlen(Cmd) < 2)
-		return usage_data_rawdemod();
+    if (strlen(Cmd) > 35 || strlen(Cmd) < 2)
+        return usage_data_rawdemod();
 
-	str_lower( (char *)Cmd);
+    str_lower( (char *)Cmd);
 
-	if (str_startswith(Cmd, "fs")) 	   ans = CmdFSKrawdemod(Cmd+2);
-	else if(str_startswith(Cmd, "ab")) ans = Cmdaskbiphdemod(Cmd+2);
-	else if(str_startswith(Cmd, "am")) ans = Cmdaskmandemod(Cmd+2);
-	else if(str_startswith(Cmd, "ar")) ans = Cmdaskrawdemod(Cmd+2);
-	else if(str_startswith(Cmd, "nr")) ans = CmdNRZrawDemod(Cmd+2);
-	else if(str_startswith(Cmd, "p1")) ans = CmdPSK1rawDemod(Cmd+2);
-	else if(str_startswith(Cmd, "p2")) ans = CmdPSK2rawDemod(Cmd+2);
-	else PrintAndLogEx(WARNING, "Unknown modulation entered - see help ('h') for parameter structure");
+    if (str_startswith(Cmd, "fs"))     ans = CmdFSKrawdemod(Cmd+2);
+    else if(str_startswith(Cmd, "ab")) ans = Cmdaskbiphdemod(Cmd+2);
+    else if(str_startswith(Cmd, "am")) ans = Cmdaskmandemod(Cmd+2);
+    else if(str_startswith(Cmd, "ar")) ans = Cmdaskrawdemod(Cmd+2);
+    else if(str_startswith(Cmd, "nr")) ans = CmdNRZrawDemod(Cmd+2);
+    else if(str_startswith(Cmd, "p1")) ans = CmdPSK1rawDemod(Cmd+2);
+    else if(str_startswith(Cmd, "p2")) ans = CmdPSK2rawDemod(Cmd+2);
+    else PrintAndLogEx(WARNING, "Unknown modulation entered - see help ('h') for parameter structure");
 
-	return ans;
+    return ans;
 }
 
 void setClockGrid(int clk, int offset) {
-	g_DemodStartIdx = offset;
-	g_DemodClock = clk;
-	PrintAndLogEx(DEBUG, "DEBUG: (setClockGrid) demodoffset %d, clk %d", offset, clk);
+    g_DemodStartIdx = offset;
+    g_DemodClock = clk;
+    PrintAndLogEx(DEBUG, "DEBUG: (setClockGrid) demodoffset %d, clk %d", offset, clk);
 
-	if (offset > clk) offset %= clk;
-	if (offset < 0) offset += clk;
+    if (offset > clk) offset %= clk;
+    if (offset < 0) offset += clk;
 
-	if (offset > GraphTraceLen || offset < 0) return;
-	if (clk < 8 || clk > GraphTraceLen) {
-		GridLocked = false;
-		GridOffset = 0;
-		PlotGridX = 0;
-		PlotGridXdefault = 0;
-		RepaintGraphWindow();
-	} else {
-		GridLocked = true;
-		GridOffset = offset;
-		PlotGridX = clk;
-		PlotGridXdefault = clk;
-		RepaintGraphWindow();
-	}
+    if (offset > GraphTraceLen || offset < 0) return;
+    if (clk < 8 || clk > GraphTraceLen) {
+        GridLocked = false;
+        GridOffset = 0;
+        PlotGridX = 0;
+        PlotGridXdefault = 0;
+        RepaintGraphWindow();
+    } else {
+        GridLocked = true;
+        GridOffset = offset;
+        PlotGridX = clk;
+        PlotGridXdefault = clk;
+        RepaintGraphWindow();
+    }
 }
 
 int CmdGrid(const char *Cmd) {
-	sscanf(Cmd, "%i %i", &PlotGridX, &PlotGridY);
-	PlotGridXdefault = PlotGridX;
-	PlotGridYdefault = PlotGridY;
-	RepaintGraphWindow();
-	return 0;
+    sscanf(Cmd, "%i %i", &PlotGridX, &PlotGridY);
+    PlotGridXdefault = PlotGridX;
+    PlotGridYdefault = PlotGridY;
+    RepaintGraphWindow();
+    return 0;
 }
 
 int CmdSetGraphMarkers(const char *Cmd) {
-	sscanf(Cmd, "%i %i", &CursorCPos, &CursorDPos);
-	RepaintGraphWindow();
-	return 0;
+    sscanf(Cmd, "%i %i", &CursorCPos, &CursorDPos);
+    RepaintGraphWindow();
+    return 0;
 }
 
 int CmdHexsamples(const char *Cmd) {
-	int i, j, requested = 0, offset = 0;
-	char string_buf[25];
-	char* string_ptr = string_buf;
-	uint8_t got[BIGBUF_SIZE];
+    int i, j, requested = 0, offset = 0;
+    char string_buf[25];
+    char* string_ptr = string_buf;
+    uint8_t got[BIGBUF_SIZE];
 
-	sscanf(Cmd, "%i %i", &requested, &offset);
+    sscanf(Cmd, "%i %i", &requested, &offset);
 
-	/* if no args send something */
-	if (requested == 0)
-		requested = 8;
+    /* if no args send something */
+    if (requested == 0)
+        requested = 8;
 
-	if (offset + requested > sizeof(got)) {
-		PrintAndLogEx(NORMAL, "Tried to read past end of buffer, <bytes> + <offset> > %d", BIGBUF_SIZE);
-		return 0;
-	}
+    if (offset + requested > sizeof(got)) {
+        PrintAndLogEx(NORMAL, "Tried to read past end of buffer, <bytes> + <offset> > %d", BIGBUF_SIZE);
+        return 0;
+    }
 
-	if ( !GetFromDevice(BIG_BUF, got, requested, offset, NULL, 2500, false)) {
-		PrintAndLogEx(WARNING, "command execution time out");
-		return false;
-	}
+    if ( !GetFromDevice(BIG_BUF, got, requested, offset, NULL, 2500, false)) {
+        PrintAndLogEx(WARNING, "command execution time out");
+        return false;
+    }
 
-	i = 0;
-	for (j = 0; j < requested; j++) {
-		i++;
-		string_ptr += sprintf(string_ptr, "%02x ", got[j]);
-		if (i == 8) {
-			*(string_ptr - 1) = '\0';    // remove the trailing space
-			PrintAndLogEx(NORMAL, "%s", string_buf);
-			string_buf[0] = '\0';
-			string_ptr = string_buf;
-			i = 0;
-		}
-		if (j == requested - 1 && string_buf[0] != '\0') { // print any remaining bytes
-			*(string_ptr - 1) = '\0';
-			PrintAndLogEx(NORMAL, "%s", string_buf);
-			string_buf[0] = '\0';
-		}
-	}
-	return 0;
+    i = 0;
+    for (j = 0; j < requested; j++) {
+        i++;
+        string_ptr += sprintf(string_ptr, "%02x ", got[j]);
+        if (i == 8) {
+            *(string_ptr - 1) = '\0';    // remove the trailing space
+            PrintAndLogEx(NORMAL, "%s", string_buf);
+            string_buf[0] = '\0';
+            string_ptr = string_buf;
+            i = 0;
+        }
+        if (j == requested - 1 && string_buf[0] != '\0') { // print any remaining bytes
+            *(string_ptr - 1) = '\0';
+            PrintAndLogEx(NORMAL, "%s", string_buf);
+            string_buf[0] = '\0';
+        }
+    }
+    return 0;
 }
 
 int CmdHide(const char *Cmd) {
-	HideGraphWindow();
-	return 0;
+    HideGraphWindow();
+    return 0;
 }
 
 //zero mean GraphBuffer
 int CmdHpf(const char *Cmd) {
-	uint8_t bits[GraphTraceLen];
-	size_t size = getFromGraphBuf(bits);
-	removeSignalOffset(bits, size);
-	// push it back to graph
-	setGraphBuf(bits, size);
-	// set signal properties low/high/mean/amplitude and is_noise detection
-	computeSignalProperties(bits, size);
+    uint8_t bits[GraphTraceLen];
+    size_t size = getFromGraphBuf(bits);
+    removeSignalOffset(bits, size);
+    // push it back to graph
+    setGraphBuf(bits, size);
+    // set signal properties low/high/mean/amplitude and is_noise detection
+    computeSignalProperties(bits, size);
 
-	RepaintGraphWindow();
-	return 0;
+    RepaintGraphWindow();
+    return 0;
 }
 
 bool _headBit( BitstreamOut *stream) {
-	int bytepos = stream->position >> 3; // divide by 8
-	int bitpos = (stream->position++) & 7; // mask out 00000111
-	return (*(stream->buffer + bytepos) >> (7-bitpos)) & 1;
+    int bytepos = stream->position >> 3; // divide by 8
+    int bitpos = (stream->position++) & 7; // mask out 00000111
+    return (*(stream->buffer + bytepos) >> (7-bitpos)) & 1;
 }
 
 uint8_t getByte(uint8_t bits_per_sample, BitstreamOut* b) {
-	uint8_t val = 0;
-	for(int i = 0 ; i < bits_per_sample; i++)
-		val |= (_headBit(b) << (7-i));
+    uint8_t val = 0;
+    for(int i = 0 ; i < bits_per_sample; i++)
+        val |= (_headBit(b) << (7-i));
 
-	return val;
+    return val;
 }
 
 int getSamples(int n, bool silent) {
-	//If we get all but the last byte in bigbuf,
-	// we don't have to worry about remaining trash
-	// in the last byte in case the bits-per-sample
-	// does not line up on byte boundaries
-	uint8_t got[BIGBUF_SIZE-1] = { 0 };
+    //If we get all but the last byte in bigbuf,
+    // we don't have to worry about remaining trash
+    // in the last byte in case the bits-per-sample
+    // does not line up on byte boundaries
+    uint8_t got[BIGBUF_SIZE-1] = { 0 };
 
-	if ( n == 0 || n > sizeof(got))
-		n = sizeof(got);
+    if ( n == 0 || n > sizeof(got))
+        n = sizeof(got);
 
-	if (!silent) PrintAndLogEx(NORMAL, "Reading %d bytes from device memory\n", n);
+    if (!silent) PrintAndLogEx(NORMAL, "Reading %d bytes from device memory\n", n);
 
-	UsbCommand response;
-	if ( !GetFromDevice(BIG_BUF, got, n, 0, &response, 10000, true) ) {
+    UsbCommand response;
+    if ( !GetFromDevice(BIG_BUF, got, n, 0, &response, 10000, true) ) {
         PrintAndLogEx(WARNING, "timeout while waiting for reply.");
-		return 1;
+        return 1;
     }
 
-	if (!silent) PrintAndLogEx(NORMAL, "Data fetched");
+    if (!silent) PrintAndLogEx(NORMAL, "Data fetched");
 
-	uint8_t bits_per_sample = 8;
+    uint8_t bits_per_sample = 8;
 
-	//Old devices without this feature would send 0 at arg[0]
-	if (response.arg[0] > 0) {
-		sample_config *sc = (sample_config *) response.d.asBytes;
-		if (!silent) PrintAndLogEx(NORMAL, "Samples @ %d bits/smpl, decimation 1:%d ", sc->bits_per_sample, sc->decimation);
-		bits_per_sample = sc->bits_per_sample;
-	}
+    //Old devices without this feature would send 0 at arg[0]
+    if (response.arg[0] > 0) {
+        sample_config *sc = (sample_config *) response.d.asBytes;
+        if (!silent) PrintAndLogEx(NORMAL, "Samples @ %d bits/smpl, decimation 1:%d ", sc->bits_per_sample, sc->decimation);
+        bits_per_sample = sc->bits_per_sample;
+    }
 
-	if (bits_per_sample < 8) {
+    if (bits_per_sample < 8) {
 
-		if (!silent) PrintAndLogEx(NORMAL, "Unpacking...");
+        if (!silent) PrintAndLogEx(NORMAL, "Unpacking...");
 
-		BitstreamOut bout = { got, bits_per_sample * n,  0};
-		int j =0;
-		for (j = 0; j * bits_per_sample < n * 8 && j < n; j++) {
-			uint8_t sample = getByte(bits_per_sample, &bout);
-			GraphBuffer[j] = ((int) sample )- 128;
-		}
-		GraphTraceLen = j;
+        BitstreamOut bout = { got, bits_per_sample * n,  0};
+        int j =0;
+        for (j = 0; j * bits_per_sample < n * 8 && j < n; j++) {
+            uint8_t sample = getByte(bits_per_sample, &bout);
+            GraphBuffer[j] = ((int) sample )- 128;
+        }
+        GraphTraceLen = j;
 
-		if (!silent) PrintAndLogEx(NORMAL, "Unpacked %d samples" , j );
+        if (!silent) PrintAndLogEx(NORMAL, "Unpacked %d samples" , j );
 
-	} else {
-		for (int j = 0; j < n; j++) {
-			GraphBuffer[j] = ((int)got[j]) - 128;
-		}
-		GraphTraceLen = n;
-	}
+    } else {
+        for (int j = 0; j < n; j++) {
+            GraphBuffer[j] = ((int)got[j]) - 128;
+        }
+        GraphTraceLen = n;
+    }
 
-	uint8_t bits[GraphTraceLen];
-	size_t size = getFromGraphBuf(bits);
-	// set signal properties low/high/mean/amplitude and is_noise detection
-	computeSignalProperties(bits, size);
+    uint8_t bits[GraphTraceLen];
+    size_t size = getFromGraphBuf(bits);
+    // set signal properties low/high/mean/amplitude and is_noise detection
+    computeSignalProperties(bits, size);
 
-	setClockGrid(0, 0);
-	DemodBufferLen = 0;
-	RepaintGraphWindow();
-	return 0;
+    setClockGrid(0, 0);
+    DemodBufferLen = 0;
+    RepaintGraphWindow();
+    return 0;
 }
 
 int CmdSamples(const char *Cmd) {
-	int n = strtol(Cmd, NULL, 0);
-	return getSamples(n, false);
+    int n = strtol(Cmd, NULL, 0);
+    return getSamples(n, false);
 }
 
 int CmdTuneSamples(const char *Cmd) {
-#define NON_VOLTAGE		1000
-#define LF_UNUSABLE_V	2000
-#define LF_MARGINAL_V	10000
-#define HF_UNUSABLE_V	3000
-#define HF_MARGINAL_V	5000
-#define ANTENNA_ERROR	1.03	// current algo has 3% error margin.
+#define NON_VOLTAGE     1000
+#define LF_UNUSABLE_V   2000
+#define LF_MARGINAL_V   10000
+#define HF_UNUSABLE_V   3000
+#define HF_MARGINAL_V   5000
+#define ANTENNA_ERROR   1.03 // current algo has 3% error margin.
 
-	// hide demod plot line
-	DemodBufferLen = 0;
-	setClockGrid(0, 0);
-	RepaintGraphWindow();
+    // hide demod plot line
+    DemodBufferLen = 0;
+    setClockGrid(0, 0);
+    RepaintGraphWindow();
 
 
-	int timeout = 0;
-	PrintAndLogEx(INFO, "\nmeasuring antenna characteristics, please wait...");
+    int timeout = 0;
+    PrintAndLogEx(INFO, "\nmeasuring antenna characteristics, please wait...");
 
-	UsbCommand c = {CMD_MEASURE_ANTENNA_TUNING, {0,0,0}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	UsbCommand resp;
-	while (!WaitForResponseTimeout(CMD_MEASURED_ANTENNA_TUNING, &resp, 2000)) {
-		timeout++;
-		printf("."); fflush(stdout);
-		if (timeout > 7) {
-			PrintAndLogEx(WARNING, "\nno response from Proxmark. Aborting...");
-			return 1;
-		}
-	}
-	PrintAndLogEx(NORMAL, "\n");
+    UsbCommand c = {CMD_MEASURE_ANTENNA_TUNING, {0,0,0}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    UsbCommand resp;
+    while (!WaitForResponseTimeout(CMD_MEASURED_ANTENNA_TUNING, &resp, 2000)) {
+        timeout++;
+        printf("."); fflush(stdout);
+        if (timeout > 7) {
+            PrintAndLogEx(WARNING, "\nno response from Proxmark. Aborting...");
+            return 1;
+        }
+    }
+    PrintAndLogEx(NORMAL, "\n");
 
-	uint32_t v_lf125 = resp.arg[0];
-	uint32_t v_lf134 = resp.arg[0] >> 32;
+    uint32_t v_lf125 = resp.arg[0];
+    uint32_t v_lf134 = resp.arg[0] >> 32;
 
-	uint32_t v_hf = resp.arg[1];
-	uint32_t peakf = resp.arg[2];
-	uint32_t peakv = resp.arg[2] >> 32;
+    uint32_t v_hf = resp.arg[1];
+    uint32_t peakf = resp.arg[2];
+    uint32_t peakv = resp.arg[2] >> 32;
 
-	if ( v_lf125 > NON_VOLTAGE )
-		PrintAndLogEx(SUCCESS, "LF antenna: %5.2f V - 125.00 kHz", (v_lf125 * ANTENNA_ERROR)/1000.0);
-	if ( v_lf134 > NON_VOLTAGE )
-		PrintAndLogEx(SUCCESS, "LF antenna: %5.2f V - 134.00 kHz", (v_lf134 * ANTENNA_ERROR)/1000.0);
-	if ( peakv > NON_VOLTAGE && peakf > 0 )
-		PrintAndLogEx(SUCCESS, "LF optimal: %5.2f V - %6.2f kHz", (peakv * ANTENNA_ERROR)/1000.0, 12000.0/(peakf+1));
+    if ( v_lf125 > NON_VOLTAGE )
+        PrintAndLogEx(SUCCESS, "LF antenna: %5.2f V - 125.00 kHz", (v_lf125 * ANTENNA_ERROR)/1000.0);
+    if ( v_lf134 > NON_VOLTAGE )
+        PrintAndLogEx(SUCCESS, "LF antenna: %5.2f V - 134.00 kHz", (v_lf134 * ANTENNA_ERROR)/1000.0);
+    if ( peakv > NON_VOLTAGE && peakf > 0 )
+        PrintAndLogEx(SUCCESS, "LF optimal: %5.2f V - %6.2f kHz", (peakv * ANTENNA_ERROR)/1000.0, 12000.0/(peakf+1));
 
-	char judgement[20];
-	memset(judgement, 0, sizeof(judgement));
-	// LF evaluation
-	if (peakv < LF_UNUSABLE_V)
-		sprintf(judgement, _RED_(UNUSABLE) );
-	else if (peakv < LF_MARGINAL_V)
-		sprintf(judgement, _YELLOW_(MARGINAL) );
-	else
-		sprintf(judgement, _GREEN_(OK) );
+    char judgement[20];
+    memset(judgement, 0, sizeof(judgement));
+    // LF evaluation
+    if (peakv < LF_UNUSABLE_V)
+        sprintf(judgement, _RED_(UNUSABLE) );
+    else if (peakv < LF_MARGINAL_V)
+        sprintf(judgement, _YELLOW_(MARGINAL) );
+    else
+        sprintf(judgement, _GREEN_(OK) );
 
-	PrintAndLogEx(NORMAL, "%sLF antenna is %s \n"
-			, (peakv < LF_UNUSABLE_V) ? _CYAN_([!]) : _GREEN_([+])
-			, judgement
-			);
+    PrintAndLogEx(NORMAL, "%sLF antenna is %s \n"
+            , (peakv < LF_UNUSABLE_V) ? _CYAN_([!]) : _GREEN_([+])
+            , judgement
+            );
 
-	// HF evaluation
-	if ( v_hf > NON_VOLTAGE )
-		PrintAndLogEx(SUCCESS, "HF antenna: %5.2f V - 13.56 MHz", (v_hf * ANTENNA_ERROR)/1000.0);
+    // HF evaluation
+    if ( v_hf > NON_VOLTAGE )
+        PrintAndLogEx(SUCCESS, "HF antenna: %5.2f V - 13.56 MHz", (v_hf * ANTENNA_ERROR)/1000.0);
 
-	memset(judgement, 0, sizeof(judgement));
+    memset(judgement, 0, sizeof(judgement));
 
-	if (v_hf < HF_UNUSABLE_V)
-		sprintf(judgement, _RED_(UNUSABLE) );
-	else if (v_hf < HF_MARGINAL_V)
-		sprintf(judgement, _YELLOW_(MARGINAL) );
-	else
-		sprintf(judgement, _GREEN_(OK) );
+    if (v_hf < HF_UNUSABLE_V)
+        sprintf(judgement, _RED_(UNUSABLE) );
+    else if (v_hf < HF_MARGINAL_V)
+        sprintf(judgement, _YELLOW_(MARGINAL) );
+    else
+        sprintf(judgement, _GREEN_(OK) );
 
-	PrintAndLogEx(NORMAL, "%sHF antenna is %s"
-			, (v_hf < HF_UNUSABLE_V) ? _CYAN_([!]) : _GREEN_([+])
-			, judgement
-			);
+    PrintAndLogEx(NORMAL, "%sHF antenna is %s"
+            , (v_hf < HF_UNUSABLE_V) ? _CYAN_([!]) : _GREEN_([+])
+            , judgement
+            );
 
-	// graph LF measurements
-	// even here, these values has 3% error.
-	uint16_t test = 0;
-	for (int i = 0; i < 256; i++) {
-		GraphBuffer[i] = resp.d.asBytes[i] - 128;
-		test += resp.d.asBytes[i];
-	}
-	if ( test > 0 ) {
-		PrintAndLogEx(SUCCESS, "\nDisplaying LF tuning graph. Divisor 89 is 134khz, 95 is 125khz.\n\n");
-		GraphTraceLen = 256;
-		ShowGraphWindow();
-		RepaintGraphWindow();
-	} else {
+    // graph LF measurements
+    // even here, these values has 3% error.
+    uint16_t test = 0;
+    for (int i = 0; i < 256; i++) {
+        GraphBuffer[i] = resp.d.asBytes[i] - 128;
+        test += resp.d.asBytes[i];
+    }
+    if ( test > 0 ) {
+        PrintAndLogEx(SUCCESS, "\nDisplaying LF tuning graph. Divisor 89 is 134khz, 95 is 125khz.\n\n");
+        GraphTraceLen = 256;
+        ShowGraphWindow();
+        RepaintGraphWindow();
+    } else {
 
-		PrintAndLogEx(FAILED, "\nNot showing LF tuning graph since all values is zero.\n\n");
-	}
+        PrintAndLogEx(FAILED, "\nNot showing LF tuning graph since all values is zero.\n\n");
+    }
 
-	return 0;
+    return 0;
 }
 
 int CmdLoad(const char *Cmd) {
-	char filename[FILE_PATH_SIZE] = {0x00};
-	int len = 0;
+    char filename[FILE_PATH_SIZE] = {0x00};
+    int len = 0;
+
+    len = strlen(Cmd);
+    if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
+    memcpy(filename, Cmd, len);
+
+    FILE *f = fopen(filename, "r");
+    if (!f) {
+        PrintAndLogEx(WARNING, "couldn't open '%s'", filename);
+        return 0;
+    }
+
+    GraphTraceLen = 0;
+    char line[80];
+    while (fgets(line, sizeof (line), f)) {
+        GraphBuffer[GraphTraceLen] = atoi(line);
+        GraphTraceLen++;
 
-	len = strlen(Cmd);
-	if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
-	memcpy(filename, Cmd, len);
-	
-	FILE *f = fopen(filename, "r");
-	if (!f) {
-		PrintAndLogEx(WARNING, "couldn't open '%s'", filename);
-		return 0;
-	}
-        
-	GraphTraceLen = 0;
-	char line[80];
-	while (fgets(line, sizeof (line), f)) {
-		GraphBuffer[GraphTraceLen] = atoi(line);
-		GraphTraceLen++;
-    
         if ( GraphTraceLen >= MAX_GRAPH_TRACE_LEN )
             break;
-	}
-    
-	if (f)
-		fclose(f);
+    }
 
-	PrintAndLogEx(SUCCESS, "loaded %d samples", GraphTraceLen);
+    if (f)
+        fclose(f);
 
-	uint8_t bits[GraphTraceLen];
-	size_t size = getFromGraphBuf(bits);
-    
-	removeSignalOffset(bits, size);
-	setGraphBuf(bits, size);
-	computeSignalProperties(bits, size);
+    PrintAndLogEx(SUCCESS, "loaded %d samples", GraphTraceLen);
 
-	setClockGrid(0,0);
-	DemodBufferLen = 0;
-	RepaintGraphWindow();
-	return 0;
+    uint8_t bits[GraphTraceLen];
+    size_t size = getFromGraphBuf(bits);
+
+    removeSignalOffset(bits, size);
+    setGraphBuf(bits, size);
+    computeSignalProperties(bits, size);
+
+    setClockGrid(0,0);
+    DemodBufferLen = 0;
+    RepaintGraphWindow();
+    return 0;
 }
 
 // trim graph from the end
 int CmdLtrim(const char *Cmd) {
-	// sanitycheck
-	if (GraphTraceLen <= 0) return 1;
+    // sanitycheck
+    if (GraphTraceLen <= 0) return 1;
 
-	int ds = atoi(Cmd);
-	for (int i = ds; i < GraphTraceLen; ++i)
-		GraphBuffer[i-ds] = GraphBuffer[i];
+    int ds = atoi(Cmd);
+    for (int i = ds; i < GraphTraceLen; ++i)
+        GraphBuffer[i-ds] = GraphBuffer[i];
 
-	GraphTraceLen -= ds;
-	RepaintGraphWindow();
-	return 0;
+    GraphTraceLen -= ds;
+    RepaintGraphWindow();
+    return 0;
 }
 
 // trim graph from the beginning
 int CmdRtrim(const char *Cmd) {
 
-	int ds = atoi(Cmd);
+    int ds = atoi(Cmd);
 
-	// sanitycheck
-	if (GraphTraceLen <= ds) return 1;
+    // sanitycheck
+    if (GraphTraceLen <= ds) return 1;
 
-	GraphTraceLen = ds;
-	RepaintGraphWindow();
-	return 0;
+    GraphTraceLen = ds;
+    RepaintGraphWindow();
+    return 0;
 }
 
 // trim graph (middle) piece
 int CmdMtrim(const char *Cmd) {
-	int start = 0, stop = 0;
-	sscanf(Cmd, "%i %i", &start, &stop);
+    int start = 0, stop = 0;
+    sscanf(Cmd, "%i %i", &start, &stop);
 
-	if (start > GraphTraceLen || stop > GraphTraceLen || start > stop) return 1;
+    if (start > GraphTraceLen || stop > GraphTraceLen || start > stop) return 1;
 
-	// leave start position sample
-	start++;
+    // leave start position sample
+    start++;
 
-	GraphTraceLen = stop - start;
-	for (int i = 0; i < GraphTraceLen; i++)
-		GraphBuffer[i] = GraphBuffer[start+i];
+    GraphTraceLen = stop - start;
+    for (int i = 0; i < GraphTraceLen; i++)
+        GraphBuffer[i] = GraphBuffer[start+i];
 
-	return 0;
+    return 0;
 }
 
 int CmdNorm(const char *Cmd) {
-	int i;
-	int max = INT_MIN, min = INT_MAX;
+    int i;
+    int max = INT_MIN, min = INT_MAX;
 
-	// Find local min, max
-	for (i = 10; i < GraphTraceLen; ++i) {
-		if (GraphBuffer[i] > max) max = GraphBuffer[i];
-		if (GraphBuffer[i] < min) min = GraphBuffer[i];
-	}
+    // Find local min, max
+    for (i = 10; i < GraphTraceLen; ++i) {
+        if (GraphBuffer[i] > max) max = GraphBuffer[i];
+        if (GraphBuffer[i] < min) min = GraphBuffer[i];
+    }
 
-	if (max != min) {
-		for (i = 0; i < GraphTraceLen; ++i) {
-			GraphBuffer[i] = ((long)(GraphBuffer[i] - ((max + min) / 2)) * 256) / (max - min);
-			//marshmelow: adjusted *1000 to *256 to make +/- 128 so demod commands still work
-		}
-	}
+    if (max != min) {
+        for (i = 0; i < GraphTraceLen; ++i) {
+            GraphBuffer[i] = ((long)(GraphBuffer[i] - ((max + min) / 2)) * 256) / (max - min);
+            //marshmelow: adjusted *1000 to *256 to make +/- 128 so demod commands still work
+        }
+    }
 
-	uint8_t bits[GraphTraceLen];
-	size_t size = getFromGraphBuf(bits);
-	// set signal properties low/high/mean/amplitude and is_noise detection
-	computeSignalProperties(bits, size);
+    uint8_t bits[GraphTraceLen];
+    size_t size = getFromGraphBuf(bits);
+    // set signal properties low/high/mean/amplitude and is_noise detection
+    computeSignalProperties(bits, size);
 
-	RepaintGraphWindow();
-	return 0;
+    RepaintGraphWindow();
+    return 0;
 }
 
 int CmdPlot(const char *Cmd) {
-	ShowGraphWindow();
-	return 0;
+    ShowGraphWindow();
+    return 0;
 }
 
 int CmdSave(const char *Cmd) {
 
-	int len = 0;
-	char filename[FILE_PATH_SIZE] = {0x00};
+    int len = 0;
+    char filename[FILE_PATH_SIZE] = {0x00};
 
-	len = strlen(Cmd);
-	if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
-	memcpy(filename, Cmd, len);
+    len = strlen(Cmd);
+    if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
+    memcpy(filename, Cmd, len);
 
-	FILE *f = fopen(filename, "w");
-	if(!f) {
-		PrintAndLogEx(WARNING, "couldn't open '%s'", filename);
-		return 0;
-	}
+    FILE *f = fopen(filename, "w");
+    if(!f) {
+        PrintAndLogEx(WARNING, "couldn't open '%s'", filename);
+        return 0;
+    }
 
-	for (int i = 0; i < GraphTraceLen; i++)
-		fprintf(f, "%d\n", GraphBuffer[i]);
+    for (int i = 0; i < GraphTraceLen; i++)
+        fprintf(f, "%d\n", GraphBuffer[i]);
 
-	if (f)
-		fclose(f);
+    if (f)
+        fclose(f);
 
-	PrintAndLogEx(SUCCESS, "saved to '%s'", Cmd);
-	return 0;
+    PrintAndLogEx(SUCCESS, "saved to '%s'", Cmd);
+    return 0;
 }
 
 int CmdScale(const char *Cmd) {
-	CursorScaleFactor = atoi(Cmd);
-	if (CursorScaleFactor == 0) {
-		PrintAndLogEx(FAILED, "bad, can't have zero scale");
-		CursorScaleFactor = 1;
-	}
-	RepaintGraphWindow();
-	return 0;
+    CursorScaleFactor = atoi(Cmd);
+    if (CursorScaleFactor == 0) {
+        PrintAndLogEx(FAILED, "bad, can't have zero scale");
+        CursorScaleFactor = 1;
+    }
+    RepaintGraphWindow();
+    return 0;
 }
 
 int directionalThreshold(const int* in, int *out, size_t len, int8_t up, int8_t down) {
 
-	int lastValue = in[0];
+    int lastValue = in[0];
 
-	// Will be changed at the end, but init 0 as we adjust to last samples
-	// value if no threshold kicks in.
-	out[0] = 0;
+    // Will be changed at the end, but init 0 as we adjust to last samples
+    // value if no threshold kicks in.
+    out[0] = 0;
 
-	for (size_t i = 1; i < len; ++i) {
-		// Apply first threshold to samples heading up
-		if (in[i] >= up && in[i] > lastValue)
-		{
-			lastValue = out[i]; // Buffer last value as we overwrite it.
-			out[i] = 1;
-		}
-		// Apply second threshold to samples heading down
-		else if (in[i] <= down && in[i] < lastValue)
-		{
-			lastValue = out[i]; // Buffer last value as we overwrite it.
-			out[i] = -1;
-		}
-		else
-		{
-			lastValue = out[i]; // Buffer last value as we overwrite it.
-			out[i] = out[i-1];
-		}
-	}
+    for (size_t i = 1; i < len; ++i) {
+        // Apply first threshold to samples heading up
+        if (in[i] >= up && in[i] > lastValue)
+        {
+            lastValue = out[i]; // Buffer last value as we overwrite it.
+            out[i] = 1;
+        }
+        // Apply second threshold to samples heading down
+        else if (in[i] <= down && in[i] < lastValue)
+        {
+            lastValue = out[i]; // Buffer last value as we overwrite it.
+            out[i] = -1;
+        }
+        else
+        {
+            lastValue = out[i]; // Buffer last value as we overwrite it.
+            out[i] = out[i-1];
+        }
+    }
 
-	// Align with first edited sample.
-	out[0] = out[1];
-	return 0;
+    // Align with first edited sample.
+    out[0] = out[1];
+    return 0;
 }
 
 int CmdDirectionalThreshold(const char *Cmd) {
-	int8_t up = param_get8(Cmd, 0);
-	int8_t down = param_get8(Cmd, 1);
+    int8_t up = param_get8(Cmd, 0);
+    int8_t down = param_get8(Cmd, 1);
 
-	PrintAndLogEx(INFO, "Applying Up Threshold: %d, Down Threshold: %d\n", up, down);
+    PrintAndLogEx(INFO, "Applying Up Threshold: %d, Down Threshold: %d\n", up, down);
 
-	directionalThreshold(GraphBuffer, GraphBuffer, GraphTraceLen, up, down);
+    directionalThreshold(GraphBuffer, GraphBuffer, GraphTraceLen, up, down);
 
-	// set signal properties low/high/mean/amplitude and isnoice detection
-	uint8_t bits[GraphTraceLen];
-	size_t size = getFromGraphBuf(bits);
-	// set signal properties low/high/mean/amplitude and is_noice detection
-	computeSignalProperties(bits, size);
+    // set signal properties low/high/mean/amplitude and isnoice detection
+    uint8_t bits[GraphTraceLen];
+    size_t size = getFromGraphBuf(bits);
+    // set signal properties low/high/mean/amplitude and is_noice detection
+    computeSignalProperties(bits, size);
 
-	RepaintGraphWindow();
-	return 0;
+    RepaintGraphWindow();
+    return 0;
 }
 
 int CmdZerocrossings(const char *Cmd) {
-	// Zero-crossings aren't meaningful unless the signal is zero-mean.
-	CmdHpf("");
+    // Zero-crossings aren't meaningful unless the signal is zero-mean.
+    CmdHpf("");
 
-	int sign = 1, zc = 0, lastZc = 0;
+    int sign = 1, zc = 0, lastZc = 0;
 
-	for (int i = 0; i < GraphTraceLen; ++i) {
-		if (GraphBuffer[i] * sign >= 0) {
-			// No change in sign, reproduce the previous sample count.
-			zc++;
-			GraphBuffer[i] = lastZc;
-		} else {
-			// Change in sign, reset the sample count.
-			sign = -sign;
-			GraphBuffer[i] = lastZc;
-			if (sign > 0) {
-				lastZc = zc;
-				zc = 0;
-			}
-		}
-	}
+    for (int i = 0; i < GraphTraceLen; ++i) {
+        if (GraphBuffer[i] * sign >= 0) {
+            // No change in sign, reproduce the previous sample count.
+            zc++;
+            GraphBuffer[i] = lastZc;
+        } else {
+            // Change in sign, reset the sample count.
+            sign = -sign;
+            GraphBuffer[i] = lastZc;
+            if (sign > 0) {
+                lastZc = zc;
+                zc = 0;
+            }
+        }
+    }
 
-	uint8_t bits[GraphTraceLen];
-	size_t size = getFromGraphBuf(bits);
-	// set signal properties low/high/mean/amplitude and is_noise detection
-	computeSignalProperties(bits, size);
+    uint8_t bits[GraphTraceLen];
+    size_t size = getFromGraphBuf(bits);
+    // set signal properties low/high/mean/amplitude and is_noise detection
+    computeSignalProperties(bits, size);
 
-	RepaintGraphWindow();
-	return 0;
+    RepaintGraphWindow();
+    return 0;
 }
 
 /**
@@ -1833,304 +1833,304 @@ int CmdZerocrossings(const char *Cmd) {
  * @return
  */
 int Cmdbin2hex(const char *Cmd) {
-	int bg = 0, en = 0;
-	if (param_getptr(Cmd, &bg, &en, 0))
-		return usage_data_bin2hex();
+    int bg = 0, en = 0;
+    if (param_getptr(Cmd, &bg, &en, 0))
+        return usage_data_bin2hex();
 
-	//Number of digits supplied as argument
-	size_t length = en - bg + 1;
-	size_t bytelen = (length+7) / 8;
-	uint8_t* arr = (uint8_t *) calloc(bytelen, sizeof(uint8_t));
-	memset(arr, 0, bytelen);
-	BitstreamOut bout = { arr, 0, 0 };
+    //Number of digits supplied as argument
+    size_t length = en - bg + 1;
+    size_t bytelen = (length+7) / 8;
+    uint8_t* arr = (uint8_t *) calloc(bytelen, sizeof(uint8_t));
+    memset(arr, 0, bytelen);
+    BitstreamOut bout = { arr, 0, 0 };
 
-	for (; bg <= en; bg++) {
-		char c = Cmd[bg];
-		if( c == '1')
-			pushBit(&bout, 1);
-		else if( c == '0')
-			pushBit(&bout, 0);
-		else
-			PrintAndLogEx(NORMAL, "Ignoring '%c'", c);
-	}
+    for (; bg <= en; bg++) {
+        char c = Cmd[bg];
+        if( c == '1')
+            pushBit(&bout, 1);
+        else if( c == '0')
+            pushBit(&bout, 0);
+        else
+            PrintAndLogEx(NORMAL, "Ignoring '%c'", c);
+    }
 
-	if (bout.numbits % 8 != 0)
-		PrintAndLogEx(NORMAL, "[padded with %d zeroes]", 8 - (bout.numbits % 8));
+    if (bout.numbits % 8 != 0)
+        PrintAndLogEx(NORMAL, "[padded with %d zeroes]", 8 - (bout.numbits % 8));
 
-	PrintAndLogEx(NORMAL, "%s", sprint_hex(arr, bytelen));
-	free(arr);
-	return 0;
+    PrintAndLogEx(NORMAL, "%s", sprint_hex(arr, bytelen));
+    free(arr);
+    return 0;
 }
 
 int Cmdhex2bin(const char *Cmd) {
-	int bg = 0, en = 0;
-	if (param_getptr(Cmd, &bg, &en, 0)) return usage_data_hex2bin();
+    int bg = 0, en = 0;
+    if (param_getptr(Cmd, &bg, &en, 0)) return usage_data_hex2bin();
 
-	while (bg <= en ) {
-		char x = Cmd[bg++];
-		// capitalize
-		if (x >= 'a' && x <= 'f')
-			x -= 32;
-		// convert to numeric value
-		if (x >= '0' && x <= '9')
-			x -= '0';
-		else if (x >= 'A' && x <= 'F')
-			x -= 'A' - 10;
-		else
-			continue;
+    while (bg <= en ) {
+        char x = Cmd[bg++];
+        // capitalize
+        if (x >= 'a' && x <= 'f')
+            x -= 32;
+        // convert to numeric value
+        if (x >= '0' && x <= '9')
+            x -= '0';
+        else if (x >= 'A' && x <= 'F')
+            x -= 'A' - 10;
+        else
+            continue;
 
-		//Uses printf instead of PrintAndLog since the latter
-		// adds linebreaks to each printout - this way was more convenient since we don't have to
-		// allocate a string and write to that first...
-		for(int i = 0 ; i < 4 ; ++i)
-			PrintAndLogEx(NORMAL, "%d",(x >> (3 - i)) & 1);
-	}
-	PrintAndLogEx(NORMAL, "\n");
-	return 0;
+        //Uses printf instead of PrintAndLog since the latter
+        // adds linebreaks to each printout - this way was more convenient since we don't have to
+        // allocate a string and write to that first...
+        for(int i = 0 ; i < 4 ; ++i)
+            PrintAndLogEx(NORMAL, "%d",(x >> (3 - i)) & 1);
+    }
+    PrintAndLogEx(NORMAL, "\n");
+    return 0;
 }
 
-	/* // example of FSK2 RF/50 Tones
-	static const int LowTone[]  = {
-	1,  1,  1,  1,  1, -1, -1, -1, -1, -1,
-	1,  1,  1,  1,  1, -1, -1, -1, -1, -1,
-	1,  1,  1,  1,  1, -1, -1, -1, -1, -1,
-	1,  1,  1,  1,  1, -1, -1, -1, -1, -1,
-	1,  1,  1,  1,  1, -1, -1, -1, -1, -1
-	};
-	static const int HighTone[] = {
-	1,  1,  1,  1,  1,     -1, -1, -1, -1, // note one extra 1 to padd due to 50/8 remainder (1/2 the remainder)
-	1,  1,  1,  1,         -1, -1, -1, -1,
-	1,  1,  1,  1,         -1, -1, -1, -1,
-	1,  1,  1,  1,         -1, -1, -1, -1,
-	1,  1,  1,  1,         -1, -1, -1, -1,
-	1,  1,  1,  1,     -1, -1, -1, -1, -1, // note one extra -1 to padd due to 50/8 remainder
-	};
-	*/
+    /* // example of FSK2 RF/50 Tones
+    static const int LowTone[]  = {
+    1,  1,  1,  1,  1, -1, -1, -1, -1, -1,
+    1,  1,  1,  1,  1, -1, -1, -1, -1, -1,
+    1,  1,  1,  1,  1, -1, -1, -1, -1, -1,
+    1,  1,  1,  1,  1, -1, -1, -1, -1, -1,
+    1,  1,  1,  1,  1, -1, -1, -1, -1, -1
+    };
+    static const int HighTone[] = {
+    1,  1,  1,  1,  1,     -1, -1, -1, -1, // note one extra 1 to padd due to 50/8 remainder (1/2 the remainder)
+    1,  1,  1,  1,         -1, -1, -1, -1,
+    1,  1,  1,  1,         -1, -1, -1, -1,
+    1,  1,  1,  1,         -1, -1, -1, -1,
+    1,  1,  1,  1,         -1, -1, -1, -1,
+    1,  1,  1,  1,     -1, -1, -1, -1, -1, // note one extra -1 to padd due to 50/8 remainder
+    };
+    */
 void GetHiLoTone(int *LowTone, int *HighTone, int clk, int LowToneFC, int HighToneFC) {
-	int i,j=0;
-	int Left_Modifier = ((clk % LowToneFC) % 2) + ((clk % LowToneFC)/2);
-	int Right_Modifier = (clk % LowToneFC) / 2;
-	//int HighToneMod = clk mod HighToneFC;
-	int LeftHalfFCCnt = (LowToneFC % 2) + (LowToneFC/2); //truncate
-	int FCs_per_clk = clk / LowToneFC;
+    int i,j=0;
+    int Left_Modifier = ((clk % LowToneFC) % 2) + ((clk % LowToneFC)/2);
+    int Right_Modifier = (clk % LowToneFC) / 2;
+    //int HighToneMod = clk mod HighToneFC;
+    int LeftHalfFCCnt = (LowToneFC % 2) + (LowToneFC/2); //truncate
+    int FCs_per_clk = clk / LowToneFC;
 
-	// need to correctly split up the clock to field clocks.
-	// First attempt uses modifiers on each end to make up for when FCs don't evenly divide into Clk
+    // need to correctly split up the clock to field clocks.
+    // First attempt uses modifiers on each end to make up for when FCs don't evenly divide into Clk
 
-	// start with LowTone
-	// set extra 1 modifiers to make up for when FC doesn't divide evenly into Clk
-	for (i = 0; i < Left_Modifier; i++) {
-		LowTone[i] = 1;
-	}
+    // start with LowTone
+    // set extra 1 modifiers to make up for when FC doesn't divide evenly into Clk
+    for (i = 0; i < Left_Modifier; i++) {
+        LowTone[i] = 1;
+    }
 
-	// loop # of field clocks inside the main clock
-	for (i = 0; i < (FCs_per_clk); i++) {
-		// loop # of samples per field clock
-		for (j = 0; j < LowToneFC; j++) {
-			LowTone[ (i * LowToneFC) + Left_Modifier + j] = ( j < LeftHalfFCCnt ) ? 1 : -1;
-		}
-	}
+    // loop # of field clocks inside the main clock
+    for (i = 0; i < (FCs_per_clk); i++) {
+        // loop # of samples per field clock
+        for (j = 0; j < LowToneFC; j++) {
+            LowTone[ (i * LowToneFC) + Left_Modifier + j] = ( j < LeftHalfFCCnt ) ? 1 : -1;
+        }
+    }
 
-	int k;
-	// add last -1 modifiers
-	for (k = 0; k < Right_Modifier; k++) {
-		LowTone[ ( (i-1) * LowToneFC) + Left_Modifier + j + k] = -1;
-	}
+    int k;
+    // add last -1 modifiers
+    for (k = 0; k < Right_Modifier; k++) {
+        LowTone[ ( (i-1) * LowToneFC) + Left_Modifier + j + k] = -1;
+    }
 
-	// now do hightone
-	Left_Modifier = ((clk % HighToneFC) % 2) + ((clk % HighToneFC)/2);
-	Right_Modifier = (clk % HighToneFC) / 2;
-	LeftHalfFCCnt = (HighToneFC % 2) + (HighToneFC/2); //truncate
-	FCs_per_clk = clk/HighToneFC;
+    // now do hightone
+    Left_Modifier = ((clk % HighToneFC) % 2) + ((clk % HighToneFC)/2);
+    Right_Modifier = (clk % HighToneFC) / 2;
+    LeftHalfFCCnt = (HighToneFC % 2) + (HighToneFC/2); //truncate
+    FCs_per_clk = clk/HighToneFC;
 
-	for (i = 0; i < Left_Modifier; i++) {
-		HighTone[i] = 1;
-	}
+    for (i = 0; i < Left_Modifier; i++) {
+        HighTone[i] = 1;
+    }
 
-	// loop # of field clocks inside the main clock
-	for (i = 0; i < (FCs_per_clk); i++) {
-		// loop # of samples per field clock
-		for (j = 0; j < HighToneFC; j++) {
-			HighTone[(i * HighToneFC) + Left_Modifier + j] = ( j < LeftHalfFCCnt ) ? 1 : -1;
-		}
-	}
+    // loop # of field clocks inside the main clock
+    for (i = 0; i < (FCs_per_clk); i++) {
+        // loop # of samples per field clock
+        for (j = 0; j < HighToneFC; j++) {
+            HighTone[(i * HighToneFC) + Left_Modifier + j] = ( j < LeftHalfFCCnt ) ? 1 : -1;
+        }
+    }
 
-	// add last -1 modifiers
-	for (k = 0; k < Right_Modifier; k++) {
-		PrintAndLogEx(NORMAL, "(i-1)*HighToneFC+lm+j+k %i", ((i-1) * HighToneFC) + Left_Modifier + j + k);
-		HighTone[ ( (i-1) * HighToneFC) + Left_Modifier + j + k] = -1;
-	}
-	if (g_debugMode == 2) {
-		for ( i = 0; i < clk; i++) {
-			PrintAndLogEx(NORMAL, "Low: %i,  High: %i", LowTone[i], HighTone[i]);
-		}
-	}
+    // add last -1 modifiers
+    for (k = 0; k < Right_Modifier; k++) {
+        PrintAndLogEx(NORMAL, "(i-1)*HighToneFC+lm+j+k %i", ((i-1) * HighToneFC) + Left_Modifier + j + k);
+        HighTone[ ( (i-1) * HighToneFC) + Left_Modifier + j + k] = -1;
+    }
+    if (g_debugMode == 2) {
+        for ( i = 0; i < clk; i++) {
+            PrintAndLogEx(NORMAL, "Low: %i,  High: %i", LowTone[i], HighTone[i]);
+        }
+    }
 }
 
 //old CmdFSKdemod adapted by marshmellow
 //converts FSK to clear NRZ style wave.  (or demodulates)
 int FSKToNRZ(int *data, int *dataLen, int clk, int LowToneFC, int HighToneFC) {
-	uint8_t ans = 0;
-	if (clk == 0 || LowToneFC == 0 || HighToneFC == 0) {
-		int firstClockEdge=0;
-		ans = fskClocks((uint8_t *) &LowToneFC, (uint8_t *) &HighToneFC, (uint8_t *) &clk, &firstClockEdge);
-		if (g_debugMode	> 1) {
-			PrintAndLog	("DEBUG FSKtoNRZ: detected clocks: fc_low %i, fc_high %i, clk %i, firstClockEdge %i, ans %u", LowToneFC, HighToneFC, clk, firstClockEdge, ans);
-		}
-	}
-	// currently only know fsk modulations with field clocks < 10 samples and > 4 samples. filter out to remove false positives (and possibly destroying ask/psk modulated waves...)
-	if (ans == 0 || clk == 0 || LowToneFC == 0 || HighToneFC == 0 || LowToneFC > 10 || HighToneFC < 4) {
-		if (g_debugMode	> 1) {
-			PrintAndLog	("DEBUG FSKtoNRZ: no fsk clocks found");
-		}
-		return 0;
-	}
+    uint8_t ans = 0;
+    if (clk == 0 || LowToneFC == 0 || HighToneFC == 0) {
+        int firstClockEdge=0;
+        ans = fskClocks((uint8_t *) &LowToneFC, (uint8_t *) &HighToneFC, (uint8_t *) &clk, &firstClockEdge);
+        if (g_debugMode > 1) {
+            PrintAndLog ("DEBUG FSKtoNRZ: detected clocks: fc_low %i, fc_high %i, clk %i, firstClockEdge %i, ans %u", LowToneFC, HighToneFC, clk, firstClockEdge, ans);
+        }
+    }
+    // currently only know fsk modulations with field clocks < 10 samples and > 4 samples. filter out to remove false positives (and possibly destroying ask/psk modulated waves...)
+    if (ans == 0 || clk == 0 || LowToneFC == 0 || HighToneFC == 0 || LowToneFC > 10 || HighToneFC < 4) {
+        if (g_debugMode > 1) {
+            PrintAndLog ("DEBUG FSKtoNRZ: no fsk clocks found");
+        }
+        return 0;
+    }
 
-	int i, j;
-	int LowTone[clk];
-	int HighTone[clk];
-	GetHiLoTone(LowTone, HighTone, clk, LowToneFC, HighToneFC);
+    int i, j;
+    int LowTone[clk];
+    int HighTone[clk];
+    GetHiLoTone(LowTone, HighTone, clk, LowToneFC, HighToneFC);
 
-	// loop through ([all samples] - clk)
-	for (i = 0; i < *dataLen - clk; ++i) {
-		int lowSum = 0, highSum = 0;
+    // loop through ([all samples] - clk)
+    for (i = 0; i < *dataLen - clk; ++i) {
+        int lowSum = 0, highSum = 0;
 
-		// sum all samples together starting from this sample for [clk] samples for each tone (multiply tone value with sample data)
-		for (j = 0; j < clk; ++j) {
-			lowSum += LowTone[j] * data[i + j];
-			highSum += HighTone[j] * data[i + j];
-		}
-		// get abs( [average sample value per clk] * 100 )  (or a rolling average of sorts)
-		lowSum = abs(100 * lowSum / clk);
-		highSum = abs(100 * highSum / clk);
-		// save these back to buffer for later use
-		data[i] = (highSum << 16) | lowSum;
-	}
+        // sum all samples together starting from this sample for [clk] samples for each tone (multiply tone value with sample data)
+        for (j = 0; j < clk; ++j) {
+            lowSum += LowTone[j] * data[i + j];
+            highSum += HighTone[j] * data[i + j];
+        }
+        // get abs( [average sample value per clk] * 100 )  (or a rolling average of sorts)
+        lowSum = abs(100 * lowSum / clk);
+        highSum = abs(100 * highSum / clk);
+        // save these back to buffer for later use
+        data[i] = (highSum << 16) | lowSum;
+    }
 
-	// now we have the abs( [average sample value per clk] * 100 ) for each tone
-	//   loop through again [all samples] - clk - 16
-	//                  note why 16???  is 16 the largest FC? changed to LowToneFC as that should be the > fc
-	for(i = 0; i < *dataLen - clk - LowToneFC; ++i) {
-		int lowTot = 0, highTot = 0;
+    // now we have the abs( [average sample value per clk] * 100 ) for each tone
+    //   loop through again [all samples] - clk - 16
+    //                  note why 16???  is 16 the largest FC? changed to LowToneFC as that should be the > fc
+    for(i = 0; i < *dataLen - clk - LowToneFC; ++i) {
+        int lowTot = 0, highTot = 0;
 
-		// sum a field clock width of abs( [average sample values per clk] * 100) for each tone
-		for (j = 0; j < LowToneFC; ++j) {  //10 for fsk2
-		  lowTot += (data[i + j] & 0xffff);
-		}
-		for (j = 0; j < HighToneFC; j++) {  //8 for fsk2
-		  highTot += (data[i + j] >> 16);
-		}
+        // sum a field clock width of abs( [average sample values per clk] * 100) for each tone
+        for (j = 0; j < LowToneFC; ++j) {  //10 for fsk2
+          lowTot += (data[i + j] & 0xffff);
+        }
+        for (j = 0; j < HighToneFC; j++) {  //8 for fsk2
+          highTot += (data[i + j] >> 16);
+        }
 
-		// subtract the sum of lowTone averages by the sum of highTone averages as it
-		//   and write back the new graph value
-		data[i] = lowTot - highTot;
-	}
-	// update dataLen to what we put back to the data sample buffer
-	*dataLen -= (clk + LowToneFC);
-	return 0;
+        // subtract the sum of lowTone averages by the sum of highTone averages as it
+        //   and write back the new graph value
+        data[i] = lowTot - highTot;
+    }
+    // update dataLen to what we put back to the data sample buffer
+    *dataLen -= (clk + LowToneFC);
+    return 0;
 }
 
 int CmdFSKToNRZ(const char *Cmd) {
-	// take clk, fc_low, fc_high
-	//   blank = auto;
-	bool errors = false;
-	char cmdp = 0;
-	int  clk = 0, fc_low = 10, fc_high = 8;
-	while (param_getchar(Cmd, cmdp) != 0x00) {
-		switch (tolower(param_getchar(Cmd, cmdp))) {
-		case 'h':
-			return usage_data_fsktonrz();
-		case 'c':
-			clk = param_get32ex(Cmd, cmdp+1, 0, 10);
-			cmdp += 2;
-			break;
-		case 'f':
-			fc_high = param_get32ex(Cmd, cmdp+1, 0, 10);
-			cmdp += 2;
-			break;
-		case 'l':
-			fc_low = param_get32ex(Cmd, cmdp+1, 0, 10);
-			cmdp += 2;
-			break;
-		default:
-			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-			errors = true;
-			break;
-		}
-		if(errors) break;
-	}
-	//Validations
-	if (errors) return usage_data_fsktonrz();
+    // take clk, fc_low, fc_high
+    //   blank = auto;
+    bool errors = false;
+    char cmdp = 0;
+    int  clk = 0, fc_low = 10, fc_high = 8;
+    while (param_getchar(Cmd, cmdp) != 0x00) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+        case 'h':
+            return usage_data_fsktonrz();
+        case 'c':
+            clk = param_get32ex(Cmd, cmdp+1, 0, 10);
+            cmdp += 2;
+            break;
+        case 'f':
+            fc_high = param_get32ex(Cmd, cmdp+1, 0, 10);
+            cmdp += 2;
+            break;
+        case 'l':
+            fc_low = param_get32ex(Cmd, cmdp+1, 0, 10);
+            cmdp += 2;
+            break;
+        default:
+            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+            errors = true;
+            break;
+        }
+        if(errors) break;
+    }
+    //Validations
+    if (errors) return usage_data_fsktonrz();
 
-	setClockGrid(0, 0);
-	DemodBufferLen = 0;
-	int ans = FSKToNRZ(GraphBuffer, &GraphTraceLen, clk, fc_low, fc_high);
-	CmdNorm("");
-	RepaintGraphWindow();
-	return ans;
+    setClockGrid(0, 0);
+    DemodBufferLen = 0;
+    int ans = FSKToNRZ(GraphBuffer, &GraphTraceLen, clk, fc_low, fc_high);
+    CmdNorm("");
+    RepaintGraphWindow();
+    return ans;
 }
 
 int CmdDataIIR(const char *Cmd){
-	uint8_t k = param_get8(Cmd, 0);
-	//iceIIR_Butterworth(GraphBuffer, GraphTraceLen);
-	iceSimple_Filter(GraphBuffer, GraphTraceLen, k);
+    uint8_t k = param_get8(Cmd, 0);
+    //iceIIR_Butterworth(GraphBuffer, GraphTraceLen);
+    iceSimple_Filter(GraphBuffer, GraphTraceLen, k);
 
-	uint8_t bits[GraphTraceLen];
-	size_t size = getFromGraphBuf(bits);
-	// set signal properties low/high/mean/amplitude and is_noise detection
-	computeSignalProperties(bits, size);
-	RepaintGraphWindow();
-	return 0;
+    uint8_t bits[GraphTraceLen];
+    size_t size = getFromGraphBuf(bits);
+    // set signal properties low/high/mean/amplitude and is_noise detection
+    computeSignalProperties(bits, size);
+    RepaintGraphWindow();
+    return 0;
 }
 
 static command_t CommandTable[] = {
-	{"help",            CmdHelp,            1, "This help"},
-	{"askedgedetect",   CmdAskEdgeDetect,   1, "[threshold] Adjust Graph for manual ASK demod using the length of sample differences to detect the edge of a wave (use 20-45, def:25)"},
-	{"autocorr",        CmdAutoCorr,        1, "[window length] [g] -- Autocorrelation over window - g to save back to GraphBuffer (overwrite)"},
-	{"biphaserawdecode",CmdBiphaseDecodeRaw,1, "[offset] [invert<0|1>] [maxErr] -- Biphase decode bin stream in DemodBuffer (offset = 0|1 bits to shift the decode start)"},
-	{"bin2hex",         Cmdbin2hex,         1, "<digits> -- Converts binary to hexadecimal"},
-	{"bitsamples",      CmdBitsamples,      0, "Get raw samples as bitstring"},
-	{"buffclear",       CmdBuffClear,       1, "Clears bigbuff on deviceside and graph window"},
-	{"dec",             CmdDec,             1, "Decimate samples"},
-	{"detectclock",     CmdDetectClockRate, 1, "[<a|f|n|p>] Detect ASK, FSK, NRZ, PSK clock rate of wave in GraphBuffer"},
-	{"fsktonrz",        CmdFSKToNRZ,        1, "Convert fsk2 to nrz wave for alternate fsk demodulating (for weak fsk)"},
+    {"help",            CmdHelp,            1, "This help"},
+    {"askedgedetect",   CmdAskEdgeDetect,   1, "[threshold] Adjust Graph for manual ASK demod using the length of sample differences to detect the edge of a wave (use 20-45, def:25)"},
+    {"autocorr",        CmdAutoCorr,        1, "[window length] [g] -- Autocorrelation over window - g to save back to GraphBuffer (overwrite)"},
+    {"biphaserawdecode",CmdBiphaseDecodeRaw,1, "[offset] [invert<0|1>] [maxErr] -- Biphase decode bin stream in DemodBuffer (offset = 0|1 bits to shift the decode start)"},
+    {"bin2hex",         Cmdbin2hex,         1, "<digits> -- Converts binary to hexadecimal"},
+    {"bitsamples",      CmdBitsamples,      0, "Get raw samples as bitstring"},
+    {"buffclear",       CmdBuffClear,       1, "Clears bigbuff on deviceside and graph window"},
+    {"dec",             CmdDec,             1, "Decimate samples"},
+    {"detectclock",     CmdDetectClockRate, 1, "[<a|f|n|p>] Detect ASK, FSK, NRZ, PSK clock rate of wave in GraphBuffer"},
+    {"fsktonrz",        CmdFSKToNRZ,        1, "Convert fsk2 to nrz wave for alternate fsk demodulating (for weak fsk)"},
 
-	{"getbitstream",    CmdGetBitStream,    1, "Convert GraphBuffer's >=1 values to 1 and <1 to 0"},
-	{"grid",            CmdGrid,            1, "<x> <y> -- overlay grid on graph window, use zero value to turn off either"},
-	{"hexsamples",      CmdHexsamples,      0, "<bytes> [<offset>] -- Dump big buffer as hex bytes"},
-	{"hex2bin",         Cmdhex2bin,         1, "<hexadecimal> -- Converts hexadecimal to binary"},
-	{"hide",            CmdHide,            1, "Hide graph window"},
-	{"hpf",             CmdHpf,             1, "Remove DC offset from trace"},
-	{"load",            CmdLoad,            1, "<filename> -- Load trace (to graph window"},
-	{"ltrim",           CmdLtrim,           1, "<samples> -- Trim samples from left of trace"},
-	{"rtrim",           CmdRtrim,           1, "<location to end trace> -- Trim samples from right of trace"},
-	{"mtrim",           CmdMtrim,           1, "<start> <stop> -- Trim out samples from the specified start to the specified stop"},
-	{"manrawdecode",    Cmdmandecoderaw,    1, "[invert] [maxErr] -- Manchester decode binary stream in DemodBuffer"},
-	{"norm",            CmdNorm,            1, "Normalize max/min to +/-128"},
-	{"plot",            CmdPlot,            1, "Show graph window (hit 'h' in window for keystroke help)"},
-	{"printdemodbuffer",CmdPrintDemodBuff,  1, "[x] [o] <offset> [l] <length> -- print the data in the DemodBuffer - 'x' for hex output"},
-	{"rawdemod",        CmdRawDemod,        1, "[modulation] ... <options> -see help (h option) -- Demodulate the data in the GraphBuffer and output binary"},
-	{"samples",         CmdSamples,         0, "[512 - 40000] -- Get raw samples for graph window (GraphBuffer)"},
-	{"save",            CmdSave,            1, "<filename> -- Save trace (from graph window)"},
-	{"setgraphmarkers", CmdSetGraphMarkers, 1, "[orange_marker] [blue_marker] (in graph window)"},
-	{"scale",           CmdScale,           1, "<int> -- Set cursor display scale"},
-	{"setdebugmode",    CmdSetDebugMode,    1, "<0|1|2> -- Turn on or off Debugging Level for lf demods"},
-	{"shiftgraphzero",  CmdGraphShiftZero,  1, "<shift> -- Shift 0 for Graphed wave + or - shift value"},
-	{"dirthreshold",    CmdDirectionalThreshold,   1, "<thres up> <thres down> -- Max rising higher up-thres/ Min falling lower down-thres, keep rest as prev."},
-	{"tune",            CmdTuneSamples,     0, "Get hw tune samples for graph window"},
-	{"undec",           CmdUndec,           1, "Un-decimate samples by 2"},
-	{"zerocrossings",   CmdZerocrossings,   1, "Count time between zero-crossings"},
-	{"iir",				CmdDataIIR,			0, "apply IIR buttersworth filter on plotdata"},
-	{NULL, NULL, 0, NULL}
+    {"getbitstream",    CmdGetBitStream,    1, "Convert GraphBuffer's >=1 values to 1 and <1 to 0"},
+    {"grid",            CmdGrid,            1, "<x> <y> -- overlay grid on graph window, use zero value to turn off either"},
+    {"hexsamples",      CmdHexsamples,      0, "<bytes> [<offset>] -- Dump big buffer as hex bytes"},
+    {"hex2bin",         Cmdhex2bin,         1, "<hexadecimal> -- Converts hexadecimal to binary"},
+    {"hide",            CmdHide,            1, "Hide graph window"},
+    {"hpf",             CmdHpf,             1, "Remove DC offset from trace"},
+    {"load",            CmdLoad,            1, "<filename> -- Load trace (to graph window"},
+    {"ltrim",           CmdLtrim,           1, "<samples> -- Trim samples from left of trace"},
+    {"rtrim",           CmdRtrim,           1, "<location to end trace> -- Trim samples from right of trace"},
+    {"mtrim",           CmdMtrim,           1, "<start> <stop> -- Trim out samples from the specified start to the specified stop"},
+    {"manrawdecode",    Cmdmandecoderaw,    1, "[invert] [maxErr] -- Manchester decode binary stream in DemodBuffer"},
+    {"norm",            CmdNorm,            1, "Normalize max/min to +/-128"},
+    {"plot",            CmdPlot,            1, "Show graph window (hit 'h' in window for keystroke help)"},
+    {"printdemodbuffer",CmdPrintDemodBuff,  1, "[x] [o] <offset> [l] <length> -- print the data in the DemodBuffer - 'x' for hex output"},
+    {"rawdemod",        CmdRawDemod,        1, "[modulation] ... <options> -see help (h option) -- Demodulate the data in the GraphBuffer and output binary"},
+    {"samples",         CmdSamples,         0, "[512 - 40000] -- Get raw samples for graph window (GraphBuffer)"},
+    {"save",            CmdSave,            1, "<filename> -- Save trace (from graph window)"},
+    {"setgraphmarkers", CmdSetGraphMarkers, 1, "[orange_marker] [blue_marker] (in graph window)"},
+    {"scale",           CmdScale,           1, "<int> -- Set cursor display scale"},
+    {"setdebugmode",    CmdSetDebugMode,    1, "<0|1|2> -- Turn on or off Debugging Level for lf demods"},
+    {"shiftgraphzero",  CmdGraphShiftZero,  1, "<shift> -- Shift 0 for Graphed wave + or - shift value"},
+    {"dirthreshold",    CmdDirectionalThreshold,   1, "<thres up> <thres down> -- Max rising higher up-thres/ Min falling lower down-thres, keep rest as prev."},
+    {"tune",            CmdTuneSamples,     0, "Get hw tune samples for graph window"},
+    {"undec",           CmdUndec,           1, "Un-decimate samples by 2"},
+    {"zerocrossings",   CmdZerocrossings,   1, "Count time between zero-crossings"},
+    {"iir",             CmdDataIIR,         0, "apply IIR buttersworth filter on plotdata"},
+    {NULL, NULL, 0, NULL}
 };
 
 int CmdData(const char *Cmd) {
-	clearCommandBuffer();
-	CmdsParse(CommandTable, Cmd);
-	return 0;
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
+    return 0;
 }
 
 int CmdHelp(const char *Cmd) {
-	CmdsHelp(CommandTable);
-	return 0;
+    CmdsHelp(CommandTable);
+    return 0;
 }
diff --git a/client/cmddata.h b/client/cmddata.h
index 27c446ecb..605bc3298 100644
--- a/client/cmddata.h
+++ b/client/cmddata.h
@@ -22,7 +22,7 @@
 #include <limits.h>   // for CmdNorm INT_MIN && INT_MAX
 #include "util.h"
 #include "cmdmain.h"
-#include "proxmark3.h"	// sendcommand
+#include "proxmark3.h"// sendcommand
 #include "ui.h"       // for show graph controls
 #include "graph.h"    // for graph data
 #include "comms.h"
diff --git a/client/cmdflashmem.c b/client/cmdflashmem.c
index b576f43f7..f6a6e8518 100644
--- a/client/cmdflashmem.c
+++ b/client/cmdflashmem.c
@@ -27,435 +27,435 @@
 static int CmdHelp(const char *Cmd);
 
 int usage_flashmem_spibaud(void){
-	PrintAndLogEx(NORMAL, "Usage:  mem spibaud [h] <baudrate>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "           h    this help");
-	PrintAndLogEx(NORMAL, "      <baudrate>    SPI baudrate in MHz [24|48]");
-	PrintAndLogEx(NORMAL, "           ");
-	PrintAndLogEx(NORMAL, "           If >= 24Mhz, FASTREADS instead of READS instruction will be used.");
-	PrintAndLogEx(NORMAL, "           Reading Flash ID will virtually always fail under 48Mhz setting");
-	PrintAndLogEx(NORMAL, "           Unless you know what you are doing, please stay at 24Mhz");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "           mem spibaud 48");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage:  mem spibaud [h] <baudrate>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "           h    this help");
+    PrintAndLogEx(NORMAL, "      <baudrate>    SPI baudrate in MHz [24|48]");
+    PrintAndLogEx(NORMAL, "           ");
+    PrintAndLogEx(NORMAL, "           If >= 24Mhz, FASTREADS instead of READS instruction will be used.");
+    PrintAndLogEx(NORMAL, "           Reading Flash ID will virtually always fail under 48Mhz setting");
+    PrintAndLogEx(NORMAL, "           Unless you know what you are doing, please stay at 24Mhz");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "           mem spibaud 48");
+    return 0;
 }
 
 int usage_flashmem_read(void){
-	PrintAndLogEx(NORMAL, "Read flash memory on device");
-	PrintAndLogEx(NORMAL, "Usage:  mem read o <offset> l <len>");
-	PrintAndLogEx(NORMAL, "  o <offset>    :      offset in memory");
-	PrintAndLogEx(NORMAL, "  l <len>       :      length");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        mem read o 0 l 32");		// read 32 bytes starting at offset 0
-	PrintAndLogEx(NORMAL, "        mem read o 1024 l 10");	// read 10 bytes starting at offset 1024
-	return 0;
+    PrintAndLogEx(NORMAL, "Read flash memory on device");
+    PrintAndLogEx(NORMAL, "Usage:  mem read o <offset> l <len>");
+    PrintAndLogEx(NORMAL, "  o <offset>    :      offset in memory");
+    PrintAndLogEx(NORMAL, "  l <len>       :      length");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "        mem read o 0 l 32");    // read 32 bytes starting at offset 0
+    PrintAndLogEx(NORMAL, "        mem read o 1024 l 10"); // read 10 bytes starting at offset 1024
+    return 0;
 }
 int usage_flashmem_load(void){
-	PrintAndLogEx(NORMAL, "Loads binary file into flash memory on device");
-	PrintAndLogEx(NORMAL, "Usage:  mem load o <offset> f <file name> m t i");
-	PrintAndLogEx(NORMAL, "  o <offset>    :      offset in memory");
-	PrintAndLogEx(NORMAL, "  f <filename>  :      file name");
-	PrintAndLogEx(NORMAL, "  m             :      upload 6 bytes keys (mifare key dictionary)");
-	PrintAndLogEx(NORMAL, "  i             :      upload 8 bytes keys (iClass key dictionary)");
-	PrintAndLogEx(NORMAL, "  t             :      upload 4 bytes keys (pwd dictionary)");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        mem load f myfile");			// upload file myfile at default offset 0
-	PrintAndLogEx(NORMAL, "        mem load f myfile o 1024");	// upload file myfile at offset 1024
-	PrintAndLogEx(NORMAL, "        mem load f default_keys m");
-	PrintAndLogEx(NORMAL, "        mem load f default_pwd t");
-	PrintAndLogEx(NORMAL, "        mem load f default_iclass_keys i");
-	return 0;
+    PrintAndLogEx(NORMAL, "Loads binary file into flash memory on device");
+    PrintAndLogEx(NORMAL, "Usage:  mem load o <offset> f <file name> m t i");
+    PrintAndLogEx(NORMAL, "  o <offset>    :      offset in memory");
+    PrintAndLogEx(NORMAL, "  f <filename>  :      file name");
+    PrintAndLogEx(NORMAL, "  m             :      upload 6 bytes keys (mifare key dictionary)");
+    PrintAndLogEx(NORMAL, "  i             :      upload 8 bytes keys (iClass key dictionary)");
+    PrintAndLogEx(NORMAL, "  t             :      upload 4 bytes keys (pwd dictionary)");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "        mem load f myfile");         // upload file myfile at default offset 0
+    PrintAndLogEx(NORMAL, "        mem load f myfile o 1024");  // upload file myfile at offset 1024
+    PrintAndLogEx(NORMAL, "        mem load f default_keys m");
+    PrintAndLogEx(NORMAL, "        mem load f default_pwd t");
+    PrintAndLogEx(NORMAL, "        mem load f default_iclass_keys i");
+    return 0;
 }
 int usage_flashmem_save(void){
-	PrintAndLogEx(NORMAL, "Saves flash memory on device into the file");
-	PrintAndLogEx(NORMAL, " Usage:  mem save o <offset> l <length> f <file name>");
-	PrintAndLogEx(NORMAL, "  o <offset>    :      offset in memory");
-	PrintAndLogEx(NORMAL, "  l <length>    :      length");
-	PrintAndLogEx(NORMAL, "  f <filename>  :      file name");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        mem save f myfile");					// download whole flashmem to file myfile
-	PrintAndLogEx(NORMAL, "        mem save f myfile l 4096");			// download 4096 bytes from default offset 0 to file myfile
-	PrintAndLogEx(NORMAL, "        mem save f myfile o 1024 l 4096");		// downlowd 4096 bytes from offset 1024 to file myfile
-	return 0;
+    PrintAndLogEx(NORMAL, "Saves flash memory on device into the file");
+    PrintAndLogEx(NORMAL, " Usage:  mem save o <offset> l <length> f <file name>");
+    PrintAndLogEx(NORMAL, "  o <offset>    :      offset in memory");
+    PrintAndLogEx(NORMAL, "  l <length>    :      length");
+    PrintAndLogEx(NORMAL, "  f <filename>  :      file name");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "        mem save f myfile");                 // download whole flashmem to file myfile
+    PrintAndLogEx(NORMAL, "        mem save f myfile l 4096");          // download 4096 bytes from default offset 0 to file myfile
+    PrintAndLogEx(NORMAL, "        mem save f myfile o 1024 l 4096");   // downlowd 4096 bytes from offset 1024 to file myfile
+    return 0;
 }
 int usage_flashmem_wipe(void){
 
-	PrintAndLogEx(WARNING, "[OBS] use with caution.");
-	PrintAndLogEx(NORMAL, "Wipe flash memory on device, which fills memory with 0xFF\n");
+    PrintAndLogEx(WARNING, "[OBS] use with caution.");
+    PrintAndLogEx(NORMAL, "Wipe flash memory on device, which fills memory with 0xFF\n");
 
-	PrintAndLogEx(NORMAL, " Usage:  mem wipe p <page>");
-	PrintAndLogEx(NORMAL, "  p <page>    :      0,1,2 page memory");
-//	PrintAndLogEx(NORMAL, "  i			 :      inital total wipe");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        mem wipe ");		// wipe page 0,1,2
-	PrintAndLogEx(NORMAL, "        mem wipe p 0");  // wipes first page.
-	return 0;
+    PrintAndLogEx(NORMAL, " Usage:  mem wipe p <page>");
+    PrintAndLogEx(NORMAL, "  p <page>    :      0,1,2 page memory");
+//  PrintAndLogEx(NORMAL, "  i           :      inital total wipe");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "        mem wipe ");     // wipe page 0,1,2
+    PrintAndLogEx(NORMAL, "        mem wipe p 0");  // wipes first page.
+    return 0;
 }
 int usage_flashmem_info(void){
-	PrintAndLogEx(NORMAL, "Collect signature and verify it from flash memory\n");
-	PrintAndLogEx(NORMAL, " Usage:  mem info [h|s|w]");
-	PrintAndLogEx(NORMAL, "  s    :      create a signature");
-	PrintAndLogEx(NORMAL, "  w    :      write signature to flash memory");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        mem info");
-	PrintAndLogEx(NORMAL, "        mem info s");
-	return 0;
+    PrintAndLogEx(NORMAL, "Collect signature and verify it from flash memory\n");
+    PrintAndLogEx(NORMAL, " Usage:  mem info [h|s|w]");
+    PrintAndLogEx(NORMAL, "  s    :      create a signature");
+    PrintAndLogEx(NORMAL, "  w    :      write signature to flash memory");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "        mem info");
+    PrintAndLogEx(NORMAL, "        mem info s");
+    return 0;
 }
 
 int CmdFlashMemRead(const char *Cmd) {
 
-	uint8_t cmdp = 0;
-	bool errors = false;
-	uint32_t start_index = 0, len  = 0;
+    uint8_t cmdp = 0;
+    bool errors = false;
+    uint32_t start_index = 0, len  = 0;
 
-	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch (tolower(param_getchar(Cmd, cmdp))) {
-		case 'o':
-			start_index = param_get32ex(Cmd, cmdp+1, 0, 10);
-			cmdp += 2;
-			break;
-		case 'l':
-			len = param_get32ex(Cmd, cmdp+1, 0, 10);
-			cmdp += 2;
-			break;
-		case 'h':
-			return usage_flashmem_read();
-		default:
-			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-			errors = true;
-			break;
-		}
-	}
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+        case 'o':
+            start_index = param_get32ex(Cmd, cmdp+1, 0, 10);
+            cmdp += 2;
+            break;
+        case 'l':
+            len = param_get32ex(Cmd, cmdp+1, 0, 10);
+            cmdp += 2;
+            break;
+        case 'h':
+            return usage_flashmem_read();
+        default:
+            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+            errors = true;
+            break;
+        }
+    }
 
-	//Validations
-	if (errors || cmdp == 0 ) return usage_flashmem_read();
+    //Validations
+    if (errors || cmdp == 0 ) return usage_flashmem_read();
 
-	if (start_index + len > FLASH_MEM_MAX_SIZE) {
-		PrintAndLogDevice(WARNING, "error, start_index + length is larger than available memory");
-		return 1;
-	}
+    if (start_index + len > FLASH_MEM_MAX_SIZE) {
+        PrintAndLogDevice(WARNING, "error, start_index + length is larger than available memory");
+        return 1;
+    }
 
-	UsbCommand c = {CMD_FLASHMEM_READ, {start_index, len, 0}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+    UsbCommand c = {CMD_FLASHMEM_READ, {start_index, len, 0}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 
 int CmdFlashmemSpiBaudrate(const char *Cmd) {
 
-	char ctmp = tolower(param_getchar(Cmd, 0));
-	if (strlen(Cmd) < 1 || ctmp == 'h') return usage_flashmem_spibaud();
-	uint32_t baudrate = param_get32ex(Cmd, 0, 0, 10);
-	baudrate = baudrate * 1000000;
-	if (baudrate != FLASH_BAUD && baudrate != FLASH_MINBAUD ) return usage_flashmem_spibaud();
-	UsbCommand c = {CMD_FLASHMEM_SET_SPIBAUDRATE, {baudrate, 0, 0}};
-	SendCommand(&c);
-	return 0;
+    char ctmp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) < 1 || ctmp == 'h') return usage_flashmem_spibaud();
+    uint32_t baudrate = param_get32ex(Cmd, 0, 0, 10);
+    baudrate = baudrate * 1000000;
+    if (baudrate != FLASH_BAUD && baudrate != FLASH_MINBAUD ) return usage_flashmem_spibaud();
+    UsbCommand c = {CMD_FLASHMEM_SET_SPIBAUDRATE, {baudrate, 0, 0}};
+    SendCommand(&c);
+    return 0;
 }
 
 int CmdFlashMemLoad(const char *Cmd){
 
-	uint32_t start_index = 0;
-	char filename[FILE_PATH_SIZE] = {0};
-	bool errors = false;
-	uint8_t cmdp = 0;
-	Dictionary_t d = DICTIONARY_NONE;
+    uint32_t start_index = 0;
+    char filename[FILE_PATH_SIZE] = {0};
+    bool errors = false;
+    uint8_t cmdp = 0;
+    Dictionary_t d = DICTIONARY_NONE;
 
-	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch (tolower(param_getchar(Cmd, cmdp))) {
-		case 'h':
-			return usage_flashmem_load();
-		case 'f':
-			if ( param_getstr(Cmd, cmdp+1, filename, FILE_PATH_SIZE) >= FILE_PATH_SIZE ) {
-				PrintAndLogEx(FAILED, "Filename too long");
-				errors = true;
-				break;
-			}
-			cmdp += 2;
-			break;
-		case 'o':
-			start_index = param_get32ex(Cmd, cmdp+1, 0, 10);
-			cmdp += 2;
-			break;
-		case 'm':
-			d = DICTIONARY_MIFARE;
-			cmdp++;
-			break;
-		case 't':
-			d = DICTIONARY_T55XX;
-			cmdp++;
-			break;
-		case 'i':
-			d = DICTIONARY_ICLASS;
-			cmdp++;
-			break;
-		default:
-			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-			errors = true;
-			break;
-		}
-	}
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+        case 'h':
+            return usage_flashmem_load();
+        case 'f':
+            if ( param_getstr(Cmd, cmdp+1, filename, FILE_PATH_SIZE) >= FILE_PATH_SIZE ) {
+                PrintAndLogEx(FAILED, "Filename too long");
+                errors = true;
+                break;
+            }
+            cmdp += 2;
+            break;
+        case 'o':
+            start_index = param_get32ex(Cmd, cmdp+1, 0, 10);
+            cmdp += 2;
+            break;
+        case 'm':
+            d = DICTIONARY_MIFARE;
+            cmdp++;
+            break;
+        case 't':
+            d = DICTIONARY_T55XX;
+            cmdp++;
+            break;
+        case 'i':
+            d = DICTIONARY_ICLASS;
+            cmdp++;
+            break;
+        default:
+            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+            errors = true;
+            break;
+        }
+    }
 
-	//Validations
-	if (errors || cmdp == 0 ) return usage_flashmem_load();
+    //Validations
+    if (errors || cmdp == 0 ) return usage_flashmem_load();
 
-	size_t datalen = 0;
-	uint16_t keycount = 0;
-	int res = 0;
-	uint8_t *data = calloc(FLASH_MEM_MAX_SIZE, sizeof(uint8_t));
+    size_t datalen = 0;
+    uint16_t keycount = 0;
+    int res = 0;
+    uint8_t *data = calloc(FLASH_MEM_MAX_SIZE, sizeof(uint8_t));
 
-	switch (d) {
-		case DICTIONARY_MIFARE:
-			start_index = DEFAULT_MF_KEYS_OFFSET;
-			res = loadFileDICTIONARY(filename, "dic", data+2, &datalen, 6, &keycount );
-			if ( res || !keycount) {
-				free(data);
-				return 1;
-			}
-			data[0] = (keycount >> 0) & 0xFF;
-			data[1] = (keycount >> 8) & 0xFF;
-			datalen += 2;
-			break;
-		case DICTIONARY_T55XX:
-			start_index = DEFAULT_T55XX_KEYS_OFFSET;
-			res = loadFileDICTIONARY(filename, "dic", data+2, &datalen, 4, &keycount );
-			if ( res || !keycount) {
-				free(data);
-				return 1;
-			}
-			data[0] = (keycount >> 0) & 0xFF;
-			data[1] = (keycount >> 8) & 0xFF;
-			datalen += 2;
-			break;
-		case DICTIONARY_ICLASS:
-			start_index = DEFAULT_ICLASS_KEYS_OFFSET;
-			res = loadFileDICTIONARY(filename, "dic", data+2, &datalen, 8, &keycount );
-			if ( res || !keycount) {
-				free(data);
-				return 1;
-			}
-			data[0] = (keycount >> 0) & 0xFF;
-			data[1] = (keycount >> 8) & 0xFF;
-			datalen += 2;
-			break;
-		default:
+    switch (d) {
+        case DICTIONARY_MIFARE:
+            start_index = DEFAULT_MF_KEYS_OFFSET;
+            res = loadFileDICTIONARY(filename, "dic", data+2, &datalen, 6, &keycount );
+            if ( res || !keycount) {
+                free(data);
+                return 1;
+            }
+            data[0] = (keycount >> 0) & 0xFF;
+            data[1] = (keycount >> 8) & 0xFF;
+            datalen += 2;
+            break;
+        case DICTIONARY_T55XX:
+            start_index = DEFAULT_T55XX_KEYS_OFFSET;
+            res = loadFileDICTIONARY(filename, "dic", data+2, &datalen, 4, &keycount );
+            if ( res || !keycount) {
+                free(data);
+                return 1;
+            }
+            data[0] = (keycount >> 0) & 0xFF;
+            data[1] = (keycount >> 8) & 0xFF;
+            datalen += 2;
+            break;
+        case DICTIONARY_ICLASS:
+            start_index = DEFAULT_ICLASS_KEYS_OFFSET;
+            res = loadFileDICTIONARY(filename, "dic", data+2, &datalen, 8, &keycount );
+            if ( res || !keycount) {
+                free(data);
+                return 1;
+            }
+            data[0] = (keycount >> 0) & 0xFF;
+            data[1] = (keycount >> 8) & 0xFF;
+            datalen += 2;
+            break;
+        default:
 
-			res = loadFile(filename, "bin", data, &datalen);
-			//int res = loadFileEML( filename, "eml", data, &datalen);
-			if ( res ) {
-				free(data);
-				return 1;
-			}
+            res = loadFile(filename, "bin", data, &datalen);
+            //int res = loadFileEML( filename, "eml", data, &datalen);
+            if ( res ) {
+                free(data);
+                return 1;
+            }
 
-			if (datalen > FLASH_MEM_MAX_SIZE) {
-				PrintAndLogDevice(WARNING, "error, filesize is larger than available memory");
-				free(data);
-				return 1;
-			}
-			break;
-	}
+            if (datalen > FLASH_MEM_MAX_SIZE) {
+                PrintAndLogDevice(WARNING, "error, filesize is larger than available memory");
+                free(data);
+                return 1;
+            }
+            break;
+    }
 
-	data = realloc(data, datalen);
+    data = realloc(data, datalen);
 
-	//Send to device
-	uint32_t bytes_sent = 0;
-	uint32_t bytes_remaining = datalen;
+    //Send to device
+    uint32_t bytes_sent = 0;
+    uint32_t bytes_remaining = datalen;
 
-	while (bytes_remaining > 0){
-		uint32_t bytes_in_packet = MIN(FLASH_MEM_BLOCK_SIZE, bytes_remaining);
+    while (bytes_remaining > 0){
+        uint32_t bytes_in_packet = MIN(FLASH_MEM_BLOCK_SIZE, bytes_remaining);
 
-		UsbCommand c = {CMD_FLASHMEM_WRITE, {start_index + bytes_sent, bytes_in_packet, 0}};
+        UsbCommand c = {CMD_FLASHMEM_WRITE, {start_index + bytes_sent, bytes_in_packet, 0}};
 
-		memcpy(c.d.asBytes, data + bytes_sent, bytes_in_packet);
-		clearCommandBuffer();
-		SendCommand(&c);
+        memcpy(c.d.asBytes, data + bytes_sent, bytes_in_packet);
+        clearCommandBuffer();
+        SendCommand(&c);
 
-		bytes_remaining -= bytes_in_packet;
-		bytes_sent += bytes_in_packet;
+        bytes_remaining -= bytes_in_packet;
+        bytes_sent += bytes_in_packet;
 
-		UsbCommand resp;
-		if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
-			PrintAndLogEx(WARNING, "timeout while waiting for reply.");
-			free(data);
-			return 1;
-		}
+        UsbCommand resp;
+        if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
+            PrintAndLogEx(WARNING, "timeout while waiting for reply.");
+            free(data);
+            return 1;
+        }
 
-		uint8_t isok  = resp.arg[0] & 0xFF;
-		if (!isok)
-			PrintAndLogEx(FAILED, "Flash write fail [offset %u]", bytes_sent);
+        uint8_t isok  = resp.arg[0] & 0xFF;
+        if (!isok)
+            PrintAndLogEx(FAILED, "Flash write fail [offset %u]", bytes_sent);
 
-	}
-	free(data);
+    }
+    free(data);
 
-	PrintAndLogEx(SUCCESS, "Wrote %u bytes to offset %u", datalen, start_index);
-	return 0;
+    PrintAndLogEx(SUCCESS, "Wrote %u bytes to offset %u", datalen, start_index);
+    return 0;
 }
 int CmdFlashMemSave(const char *Cmd){
 
-	char filename[FILE_PATH_SIZE] = {0};
-	uint8_t cmdp = 0;
-	bool errors = false;
-	uint32_t start_index = 0, len = FLASH_MEM_MAX_SIZE;
+    char filename[FILE_PATH_SIZE] = {0};
+    uint8_t cmdp = 0;
+    bool errors = false;
+    uint32_t start_index = 0, len = FLASH_MEM_MAX_SIZE;
 
-	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch (tolower(param_getchar(Cmd, cmdp))) {
-		case 'h': return usage_flashmem_save();
-		case 'l':
-			len = param_get32ex(Cmd, cmdp+1, FLASH_MEM_MAX_SIZE, 10);
-			cmdp += 2;
-			break;
-		case 'o':
-			start_index = param_get32ex(Cmd, cmdp+1, 0, 10);
-			cmdp += 2;
-			break;
-		case 'f':
-			//File handling
-			if ( param_getstr(Cmd, cmdp+1, filename, FILE_PATH_SIZE) >= FILE_PATH_SIZE ) {
-				PrintAndLogEx(FAILED, "Filename too long");
-				errors = true;
-				break;
-			}
-			cmdp += 2;
-			break;
-		default:
-			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-			errors = true;
-			break;
-		}
-	}
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+        case 'h': return usage_flashmem_save();
+        case 'l':
+            len = param_get32ex(Cmd, cmdp+1, FLASH_MEM_MAX_SIZE, 10);
+            cmdp += 2;
+            break;
+        case 'o':
+            start_index = param_get32ex(Cmd, cmdp+1, 0, 10);
+            cmdp += 2;
+            break;
+        case 'f':
+            //File handling
+            if ( param_getstr(Cmd, cmdp+1, filename, FILE_PATH_SIZE) >= FILE_PATH_SIZE ) {
+                PrintAndLogEx(FAILED, "Filename too long");
+                errors = true;
+                break;
+            }
+            cmdp += 2;
+            break;
+        default:
+            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+            errors = true;
+            break;
+        }
+    }
 
-	//Validations
-	if (errors || cmdp == 0 ) return usage_flashmem_save();
+    //Validations
+    if (errors || cmdp == 0 ) return usage_flashmem_save();
 
-	uint8_t* dump = calloc(len, sizeof(uint8_t));
-	if (!dump) {
-		PrintAndLogDevice(WARNING, "error, cannot allocate memory ");
-		return 1;
-	}
+    uint8_t* dump = calloc(len, sizeof(uint8_t));
+    if (!dump) {
+        PrintAndLogDevice(WARNING, "error, cannot allocate memory ");
+        return 1;
+    }
 
-	PrintAndLogEx(NORMAL, "downloading %u bytes from flashmem", len);
-	if ( !GetFromDevice(FLASH_MEM, dump, len, start_index, NULL, -1, true) ) {
-		PrintAndLogEx(FAILED, "ERROR; downloading flashmem");
-		free(dump);
-		return 1;
-	}
+    PrintAndLogEx(NORMAL, "downloading %u bytes from flashmem", len);
+    if ( !GetFromDevice(FLASH_MEM, dump, len, start_index, NULL, -1, true) ) {
+        PrintAndLogEx(FAILED, "ERROR; downloading flashmem");
+        free(dump);
+        return 1;
+    }
 
-	saveFile(filename, "bin", dump, len);
-	saveFileEML(filename, "eml", dump, len, 16);
-	free(dump);
-	return 0;
+    saveFile(filename, "bin", dump, len);
+    saveFileEML(filename, "eml", dump, len, 16);
+    free(dump);
+    return 0;
 }
 int CmdFlashMemWipe(const char *Cmd){
 
-	uint8_t cmdp = 0;
-	bool errors = false;
-	bool initalwipe = false;
-	uint8_t page = 0;
-	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch (tolower(param_getchar(Cmd, cmdp))) {
-		case 'h': return usage_flashmem_wipe();
-		case 'p':
-			page = param_get8ex(Cmd, cmdp+1, 0, 10);
-			if ( page > 2 ) {
-				PrintAndLogEx(WARNING, "page must be 0, 1 or 2");
-				errors = true;
-				break;
-			}
-			cmdp += 2;
-			break;
-		case 'i':
-			initalwipe = true;
-			cmdp++;
-			break;
-		default:
-			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-			errors = true;
-			break;
-		}
-	}
+    uint8_t cmdp = 0;
+    bool errors = false;
+    bool initalwipe = false;
+    uint8_t page = 0;
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+        case 'h': return usage_flashmem_wipe();
+        case 'p':
+            page = param_get8ex(Cmd, cmdp+1, 0, 10);
+            if ( page > 2 ) {
+                PrintAndLogEx(WARNING, "page must be 0, 1 or 2");
+                errors = true;
+                break;
+            }
+            cmdp += 2;
+            break;
+        case 'i':
+            initalwipe = true;
+            cmdp++;
+            break;
+        default:
+            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+            errors = true;
+            break;
+        }
+    }
 
-	//Validations
-	if (errors || cmdp == 0 ) return usage_flashmem_wipe();
+    //Validations
+    if (errors || cmdp == 0 ) return usage_flashmem_wipe();
 
-	UsbCommand c = {CMD_FLASHMEM_WIPE, {page, initalwipe, 0}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	UsbCommand resp;
-	if ( !WaitForResponseTimeout(CMD_ACK, &resp, 8000) ) {
-		PrintAndLogEx(WARNING, "timeout while waiting for reply.");
-		return 1;
-	}
-	uint8_t isok  = resp.arg[0] & 0xFF;
-	if (isok)
-		PrintAndLogEx(SUCCESS, "Flash WIPE ok");
-	else
-		PrintAndLogEx(FAILED, "Flash WIPE failed");
+    UsbCommand c = {CMD_FLASHMEM_WIPE, {page, initalwipe, 0}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    UsbCommand resp;
+    if ( !WaitForResponseTimeout(CMD_ACK, &resp, 8000) ) {
+        PrintAndLogEx(WARNING, "timeout while waiting for reply.");
+        return 1;
+    }
+    uint8_t isok  = resp.arg[0] & 0xFF;
+    if (isok)
+        PrintAndLogEx(SUCCESS, "Flash WIPE ok");
+    else
+        PrintAndLogEx(FAILED, "Flash WIPE failed");
 
-	return 0;
+    return 0;
 }
 int CmdFlashMemInfo(const char *Cmd){
 
-	uint8_t sha_hash[20] = {0};
-	mbedtls_rsa_context rsa;
+    uint8_t sha_hash[20] = {0};
+    mbedtls_rsa_context rsa;
 
-	uint8_t cmdp = 0;
-	bool errors = false,  shall_write = false, shall_sign = false;
-	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch (tolower(param_getchar(Cmd, cmdp))) {
-		case 'h': return usage_flashmem_info();
-		case 's': {
-			shall_sign = true;
-			cmdp++;
-			break;
-		}
-		case 'w':
-			shall_write = true;
-			cmdp++;
-			break;
-		default:
-			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-			errors = true;
-			break;
-		}
-	}
+    uint8_t cmdp = 0;
+    bool errors = false,  shall_write = false, shall_sign = false;
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+        case 'h': return usage_flashmem_info();
+        case 's': {
+            shall_sign = true;
+            cmdp++;
+            break;
+        }
+        case 'w':
+            shall_write = true;
+            cmdp++;
+            break;
+        default:
+            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+            errors = true;
+            break;
+        }
+    }
 
-	//Validations
-	if (errors ) return usage_flashmem_info();
+    //Validations
+    if (errors ) return usage_flashmem_info();
 
-	UsbCommand c = {CMD_FLASHMEM_INFO, {0, 0, 0}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	UsbCommand resp;
-	if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2500) ) {
-		PrintAndLogEx(WARNING, "timeout while waiting for reply.");
-		return 1;
-	}
+    UsbCommand c = {CMD_FLASHMEM_INFO, {0, 0, 0}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    UsbCommand resp;
+    if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2500) ) {
+        PrintAndLogEx(WARNING, "timeout while waiting for reply.");
+        return 1;
+    }
 
-	uint8_t isok = resp.arg[0] & 0xFF;
-	if (!isok) {
-		PrintAndLogEx(FAILED, "failed");
-		return 1;
-	}
+    uint8_t isok = resp.arg[0] & 0xFF;
+    if (!isok) {
+        PrintAndLogEx(FAILED, "failed");
+        return 1;
+    }
 
-	// validate signature here
-	rdv40_validation_t mem;
-	memcpy(&mem, (rdv40_validation_t *)resp.d.asBytes, sizeof(rdv40_validation_t));
+    // validate signature here
+    rdv40_validation_t mem;
+    memcpy(&mem, (rdv40_validation_t *)resp.d.asBytes, sizeof(rdv40_validation_t));
 
-	// Flash ID hash (sha1)
-	mbedtls_sha1( mem.flashid, sizeof(mem.flashid), sha_hash );
+    // Flash ID hash (sha1)
+    mbedtls_sha1( mem.flashid, sizeof(mem.flashid), sha_hash );
 
-	// print header
-	PrintAndLogEx(INFO, "\n--- Flash memory Information ---------");
-	PrintAndLogEx(INFO, "-------------------------------------------------------------");
-	PrintAndLogEx(INFO, "ID            | %s", sprint_hex(mem.flashid, sizeof(mem.flashid) ));
-	PrintAndLogEx(INFO, "SHA1          | %s", sprint_hex(sha_hash, sizeof(sha_hash)));
-	PrintAndLogEx(INFO, "RSA SIGNATURE |");
-	print_hex_break( mem.signature, sizeof(mem.signature), 32);
+    // print header
+    PrintAndLogEx(INFO, "\n--- Flash memory Information ---------");
+    PrintAndLogEx(INFO, "-------------------------------------------------------------");
+    PrintAndLogEx(INFO, "ID            | %s", sprint_hex(mem.flashid, sizeof(mem.flashid) ));
+    PrintAndLogEx(INFO, "SHA1          | %s", sprint_hex(sha_hash, sizeof(sha_hash)));
+    PrintAndLogEx(INFO, "RSA SIGNATURE |");
+    print_hex_break( mem.signature, sizeof(mem.signature), 32);
 
 //-------------------------------------------------------------------------------
 // Example RSA-1024 keypair, for test purposes  (from common/polarssl/rsa.c)
@@ -514,98 +514,98 @@ int CmdFlashMemInfo(const char *Cmd){
 
 #define KEY_LEN 128
 
-	mbedtls_rsa_init(&rsa, MBEDTLS_RSA_PKCS_V15, 0);
+    mbedtls_rsa_init(&rsa, MBEDTLS_RSA_PKCS_V15, 0);
 
-	rsa.len = KEY_LEN;
+    rsa.len = KEY_LEN;
 
-	mbedtls_mpi_read_string( &rsa.N , 16, RSA_N  );
-	mbedtls_mpi_read_string( &rsa.E , 16, RSA_E  );
-	mbedtls_mpi_read_string( &rsa.D , 16, RSA_D  );
-	mbedtls_mpi_read_string( &rsa.P , 16, RSA_P  );
-	mbedtls_mpi_read_string( &rsa.Q , 16, RSA_Q  );
-	mbedtls_mpi_read_string( &rsa.DP, 16, RSA_DP );
-	mbedtls_mpi_read_string( &rsa.DQ, 16, RSA_DQ );
-	mbedtls_mpi_read_string( &rsa.QP, 16, RSA_QP );
+    mbedtls_mpi_read_string( &rsa.N , 16, RSA_N  );
+    mbedtls_mpi_read_string( &rsa.E , 16, RSA_E  );
+    mbedtls_mpi_read_string( &rsa.D , 16, RSA_D  );
+    mbedtls_mpi_read_string( &rsa.P , 16, RSA_P  );
+    mbedtls_mpi_read_string( &rsa.Q , 16, RSA_Q  );
+    mbedtls_mpi_read_string( &rsa.DP, 16, RSA_DP );
+    mbedtls_mpi_read_string( &rsa.DQ, 16, RSA_DQ );
+    mbedtls_mpi_read_string( &rsa.QP, 16, RSA_QP );
 
-	PrintAndLogEx(INFO, "KEY length   | %d", KEY_LEN);
+    PrintAndLogEx(INFO, "KEY length   | %d", KEY_LEN);
 
-	bool is_keyok = ( mbedtls_rsa_check_pubkey(  &rsa ) == 0 || mbedtls_rsa_check_privkey( &rsa ) == 0 );
-	if (is_keyok)
-		PrintAndLogEx(SUCCESS, "RSA key validation ok");
-	else
-		PrintAndLogEx(FAILED, "RSA key validation failed");
+    bool is_keyok = ( mbedtls_rsa_check_pubkey(  &rsa ) == 0 || mbedtls_rsa_check_privkey( &rsa ) == 0 );
+    if (is_keyok)
+        PrintAndLogEx(SUCCESS, "RSA key validation ok");
+    else
+        PrintAndLogEx(FAILED, "RSA key validation failed");
 
-	//
-	uint8_t from_device[KEY_LEN];
-	uint8_t sign[KEY_LEN];
+    //
+    uint8_t from_device[KEY_LEN];
+    uint8_t sign[KEY_LEN];
 
-	// to be verified
-	memcpy(from_device, mem.signature, KEY_LEN);
+    // to be verified
+    memcpy(from_device, mem.signature, KEY_LEN);
 
-	// to be signed (all zeros
-	memset(sign, 0, KEY_LEN);
+    // to be signed (all zeros
+    memset(sign, 0, KEY_LEN);
 
-	// Signing (private key)
-	if (shall_sign) {
+    // Signing (private key)
+    if (shall_sign) {
 
-		int is_signed = mbedtls_rsa_pkcs1_sign( &rsa, NULL, NULL, MBEDTLS_RSA_PRIVATE, MBEDTLS_MD_SHA1, 20, sha_hash, sign );
-		if (is_signed == 0)
-			PrintAndLogEx(SUCCESS, "RSA Signing ok");
-		else
-			PrintAndLogEx(FAILED, "RSA Signing failed");
+        int is_signed = mbedtls_rsa_pkcs1_sign( &rsa, NULL, NULL, MBEDTLS_RSA_PRIVATE, MBEDTLS_MD_SHA1, 20, sha_hash, sign );
+        if (is_signed == 0)
+            PrintAndLogEx(SUCCESS, "RSA Signing ok");
+        else
+            PrintAndLogEx(FAILED, "RSA Signing failed");
 
-		if (shall_write) {
-			// save to mem
-			c = (UsbCommand){CMD_FLASHMEM_WRITE, {FLASH_MEM_SIGNATURE_OFFSET, FLASH_MEM_SIGNATURE_LEN, 0}};
-			memcpy(c.d.asBytes, sign, sizeof(sign));
-			clearCommandBuffer();
-			SendCommand(&c);
-			if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
-				PrintAndLogEx(WARNING, "timeout while waiting for reply.");
-			} else {
+        if (shall_write) {
+            // save to mem
+            c = (UsbCommand){CMD_FLASHMEM_WRITE, {FLASH_MEM_SIGNATURE_OFFSET, FLASH_MEM_SIGNATURE_LEN, 0}};
+            memcpy(c.d.asBytes, sign, sizeof(sign));
+            clearCommandBuffer();
+            SendCommand(&c);
+            if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
+                PrintAndLogEx(WARNING, "timeout while waiting for reply.");
+            } else {
 
-				if (!resp.arg[0])
-					PrintAndLogEx(FAILED, "Writing signature failed");
-				else
-					PrintAndLogEx(SUCCESS, "Writing signature ok [offset: %u]", FLASH_MEM_SIGNATURE_OFFSET);
+                if (!resp.arg[0])
+                    PrintAndLogEx(FAILED, "Writing signature failed");
+                else
+                    PrintAndLogEx(SUCCESS, "Writing signature ok [offset: %u]", FLASH_MEM_SIGNATURE_OFFSET);
 
-			}
-		}
-		PrintAndLogEx(INFO, "Signed   | ");
-		print_hex_break( sign, sizeof(sign), 32);
-	}
+            }
+        }
+        PrintAndLogEx(INFO, "Signed   | ");
+        print_hex_break( sign, sizeof(sign), 32);
+    }
 
-	// Verify (public key)
-	int is_verified = mbedtls_rsa_pkcs1_verify( &rsa, NULL, NULL, MBEDTLS_RSA_PUBLIC, MBEDTLS_MD_SHA1, 20, sha_hash, from_device );
-	if (is_verified == 0)
-		PrintAndLogEx(SUCCESS, "RSA Verification ok");
-	else
-		PrintAndLogEx(FAILED, "RSA Verification failed");
+    // Verify (public key)
+    int is_verified = mbedtls_rsa_pkcs1_verify( &rsa, NULL, NULL, MBEDTLS_RSA_PUBLIC, MBEDTLS_MD_SHA1, 20, sha_hash, from_device );
+    if (is_verified == 0)
+        PrintAndLogEx(SUCCESS, "RSA Verification ok");
+    else
+        PrintAndLogEx(FAILED, "RSA Verification failed");
 
-	mbedtls_rsa_free(&rsa);
-	return 0;
+    mbedtls_rsa_free(&rsa);
+    return 0;
 }
 
 static command_t CommandTable[] = {
-	{"help",	CmdHelp,            1, "This help"},
-	{"spibaud", CmdFlashmemSpiBaudrate,	1, "Set Flash memory Spi baudrate [rdv40]"},
-	{"read",	CmdFlashMemRead,	1, "Read Flash memory [rdv40]"},
-	{"info",	CmdFlashMemInfo,	1, "Flash memory information [rdv40]"},
-	{"load",	CmdFlashMemLoad,	1, "Load data into flash memory [rdv40]"},
-	{"save",	CmdFlashMemSave,	1, "Save data from flash memory [rdv40]"},
-	{"wipe",	CmdFlashMemWipe,	1, "Wipe data from flash memory [rdv40]"},
-	{NULL, NULL, 0, NULL}
+    {"help",    CmdHelp,            1, "This help"},
+    {"spibaud", CmdFlashmemSpiBaudrate, 1, "Set Flash memory Spi baudrate [rdv40]"},
+    {"read",    CmdFlashMemRead,    1, "Read Flash memory [rdv40]"},
+    {"info",    CmdFlashMemInfo,    1, "Flash memory information [rdv40]"},
+    {"load",    CmdFlashMemLoad,    1, "Load data into flash memory [rdv40]"},
+    {"save",    CmdFlashMemSave,    1, "Save data from flash memory [rdv40]"},
+    {"wipe",    CmdFlashMemWipe,    1, "Wipe data from flash memory [rdv40]"},
+    {NULL, NULL, 0, NULL}
 };
 
 int CmdFlashMem(const char *Cmd) {
-	clearCommandBuffer();
-	CmdsParse(CommandTable, Cmd);
-	return 0;
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
+    return 0;
 }
 
 int CmdHelp(const char *Cmd) {
-	CmdsHelp(CommandTable);
-	return 0;
+    CmdsHelp(CommandTable);
+    return 0;
 }
 
 #endif
diff --git a/client/cmdflashmem.h b/client/cmdflashmem.h
index ee661bf18..c7c6f8979 100644
--- a/client/cmdflashmem.h
+++ b/client/cmdflashmem.h
@@ -22,15 +22,15 @@
 #include "cmdparser.h"
 #include "common.h"
 #include "util.h"
-#include "util_posix.h"			// msclock
-#include "loclass/fileutils.h"	//saveFile
-#include "comms.h"			//getfromdevice
+#include "util_posix.h"         // msclock
+#include "loclass/fileutils.h"  //saveFile
+#include "comms.h"              //getfromdevice
 
 typedef enum {
-	DICTIONARY_NONE = 0,
-	DICTIONARY_MIFARE,
-	DICTIONARY_T55XX,
-	DICTIONARY_ICLASS
+    DICTIONARY_NONE = 0,
+    DICTIONARY_MIFARE,
+    DICTIONARY_T55XX,
+    DICTIONARY_ICLASS
 } Dictionary_t;
 
 extern int CmdFlashMem(const char *Cmd);
diff --git a/client/cmdhf.c b/client/cmdhf.c
index 6931f5c14..475a2659d 100644
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -13,128 +13,128 @@
 static int CmdHelp(const char *Cmd);
 
 int usage_hf_search(){
-	PrintAndLogEx(NORMAL, "Usage: hf search");
-	PrintAndLogEx(NORMAL, "Will try to find a HF read out of the unknown tag. Stops when found.");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h	- This help");
-	PrintAndLogEx(NORMAL, "");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage: hf search");
+    PrintAndLogEx(NORMAL, "Will try to find a HF read out of the unknown tag. Stops when found.");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h - This help");
+    PrintAndLogEx(NORMAL, "");
+    return 0;
 }
 int usage_hf_snoop(){
-	PrintAndLogEx(NORMAL, "Usage: hf snoop <skip pairs> <skip triggers>");
-	PrintAndLogEx(NORMAL, "The high frequence snoop will assign all available memory on device for snooped data");
-	PrintAndLogEx(NORMAL, "User the 'data samples' command to download from device,  and 'data plot' to look at it");
-	PrintAndLogEx(NORMAL, "Press button to quit the snooping.");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h				- This help");
-	PrintAndLogEx(NORMAL, "       <skip pairs>	- skip sample pairs");
-	PrintAndLogEx(NORMAL, "       <skip triggers>	- skip number of triggers");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "           hf snoop");
-	PrintAndLogEx(NORMAL, "           hf snoop 1000 0");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage: hf snoop <skip pairs> <skip triggers>");
+    PrintAndLogEx(NORMAL, "The high frequence snoop will assign all available memory on device for snooped data");
+    PrintAndLogEx(NORMAL, "User the 'data samples' command to download from device,  and 'data plot' to look at it");
+    PrintAndLogEx(NORMAL, "Press button to quit the snooping.");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h               - This help");
+    PrintAndLogEx(NORMAL, "       <skip pairs>    - skip sample pairs");
+    PrintAndLogEx(NORMAL, "       <skip triggers> - skip number of triggers");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "           hf snoop");
+    PrintAndLogEx(NORMAL, "           hf snoop 1000 0");
+    return 0;
 }
 
 int CmdHFSearch(const char *Cmd){
 
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if (cmdp == 'h') return usage_hf_search();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (cmdp == 'h') return usage_hf_search();
 
-	int ans = CmdHF14AInfo("s");
-	if (ans > 0) {
-		PrintAndLogEx(SUCCESS, "\nValid ISO14443-A Tag Found\n");
-		return ans;
-	}
-	ans = HF15Reader("", false);
-	if (ans) {
-		PrintAndLogEx(SUCCESS, "\nValid ISO15693 Tag Found\n");
-		return ans;
-	}
-	ans = HFLegicReader("", false);
-	if ( ans == 0) {
-		PrintAndLogEx(SUCCESS, "\nValid LEGIC Tag Found\n");
-		return 1;
-	}
-	ans = CmdHFTopazReader("s");
-	if (ans == 0) {
-		PrintAndLogEx(SUCCESS, "\nValid Topaz Tag Found\n");
-		return 1;
-	}
-	// 14b and iclass is the longest test (put last)
-	ans = HF14BReader(false); //CmdHF14BReader("s");
-	if (ans) {
-		PrintAndLogEx(SUCCESS, "\nValid ISO14443-B Tag Found\n");
-		return ans;
-	}
-	ans = HFiClassReader("", false, false);
-	if (ans) {
-		PrintAndLogEx(SUCCESS, "\nValid iClass Tag (or PicoPass Tag) Found\n");
-		return ans;
-	}
+    int ans = CmdHF14AInfo("s");
+    if (ans > 0) {
+        PrintAndLogEx(SUCCESS, "\nValid ISO14443-A Tag Found\n");
+        return ans;
+    }
+    ans = HF15Reader("", false);
+    if (ans) {
+        PrintAndLogEx(SUCCESS, "\nValid ISO15693 Tag Found\n");
+        return ans;
+    }
+    ans = HFLegicReader("", false);
+    if ( ans == 0) {
+        PrintAndLogEx(SUCCESS, "\nValid LEGIC Tag Found\n");
+        return 1;
+    }
+    ans = CmdHFTopazReader("s");
+    if (ans == 0) {
+        PrintAndLogEx(SUCCESS, "\nValid Topaz Tag Found\n");
+        return 1;
+    }
+    // 14b and iclass is the longest test (put last)
+    ans = HF14BReader(false); //CmdHF14BReader("s");
+    if (ans) {
+        PrintAndLogEx(SUCCESS, "\nValid ISO14443-B Tag Found\n");
+        return ans;
+    }
+    ans = HFiClassReader("", false, false);
+    if (ans) {
+        PrintAndLogEx(SUCCESS, "\nValid iClass Tag (or PicoPass Tag) Found\n");
+        return ans;
+    }
 
-	/*
-	ans = CmdHFFelicaReader("s");
-	if (ans) {
-		PrintAndLogEx(NORMAL, "\nValid ISO18092 / FeliCa Found\n");
-		return ans;
-	}
-	*/
+    /*
+    ans = CmdHFFelicaReader("s");
+    if (ans) {
+        PrintAndLogEx(NORMAL, "\nValid ISO18092 / FeliCa Found\n");
+        return ans;
+    }
+    */
 
-	PrintAndLogEx(FAILED, "\nno known/supported 13.56 MHz tags found\n");
-	return 0;
+    PrintAndLogEx(FAILED, "\nno known/supported 13.56 MHz tags found\n");
+    return 0;
 }
 
 int CmdHFTune(const char *Cmd) {
-	PrintAndLogEx(SUCCESS, "Measuring HF antenna, press button to exit");
-	UsbCommand c = {CMD_MEASURE_ANTENNA_TUNING_HF};
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+    PrintAndLogEx(SUCCESS, "Measuring HF antenna, press button to exit");
+    UsbCommand c = {CMD_MEASURE_ANTENNA_TUNING_HF};
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 
 int CmdHFSnoop(const char *Cmd) {
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if (cmdp == 'h') return usage_hf_snoop();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (cmdp == 'h') return usage_hf_snoop();
 
-	int skippairs =  param_get32ex(Cmd, 0, 0, 10);
-	int skiptriggers =  param_get32ex(Cmd, 1, 0, 10);
+    int skippairs =  param_get32ex(Cmd, 0, 0, 10);
+    int skiptriggers =  param_get32ex(Cmd, 1, 0, 10);
 
-	UsbCommand c = {CMD_HF_SNIFFER, {skippairs, skiptriggers, 0}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+    UsbCommand c = {CMD_HF_SNIFFER, {skippairs, skiptriggers, 0}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 
 static command_t CommandTable[] = {
-	{"help",        CmdHelp,          1, "This help"},
-	{"14a",         CmdHF14A,         1, "{ ISO14443A RFIDs...               }"},
-	{"14b",         CmdHF14B,         1, "{ ISO14443B RFIDs...               }"},
-	{"15",          CmdHF15,          1, "{ ISO15693 RFIDs...                }"},
-	{"epa",         CmdHFEPA,         1, "{ German Identification Card...    }"},
-	{"felica",      CmdHFFelica,      1, "{ ISO18092 / Felica RFIDs...       }"},
-	{"legic",       CmdHFLegic,       1, "{ LEGIC RFIDs...                   }"},
-	{"iclass",      CmdHFiClass,      1, "{ ICLASS RFIDs...                  }"},
-	{"mf",      	CmdHFMF,		  1, "{ MIFARE RFIDs...                  }"},
-	{"mfp",			CmdHFMFP,		  1, "{ MIFARE Plus RFIDs...             }"},
-	{"mfu",         CmdHFMFUltra,     1, "{ MIFARE Ultralight RFIDs...       }"},
-	{"mfdes",		CmdHFMFDes,		  1, "{ MIFARE Desfire RFIDs...          }"},
-	{"topaz",		CmdHFTopaz,		  1, "{ TOPAZ (NFC Type 1) RFIDs...      }"},
-	{"fido",		CmdHFFido,		  1, "{ FIDO and FIDO2 authenticators... }"},
-	{"list", 		CmdTraceList,	  0, "List protocol data in trace buffer"},
-	{"tune",		CmdHFTune,	      0, "Continuously measure HF antenna tuning"},
-	{"search",      CmdHFSearch,      1, "Search for known HF tags [preliminary]"},
-	{"snoop",       CmdHFSnoop,       0, "<samples to skip (10000)> <triggers to skip (1)> Generic HF Snoop"},
-	{NULL, NULL, 0, NULL}
+    {"help",        CmdHelp,          1, "This help"},
+    {"14a",         CmdHF14A,         1, "{ ISO14443A RFIDs...               }"},
+    {"14b",         CmdHF14B,         1, "{ ISO14443B RFIDs...               }"},
+    {"15",          CmdHF15,          1, "{ ISO15693 RFIDs...                }"},
+    {"epa",         CmdHFEPA,         1, "{ German Identification Card...    }"},
+    {"felica",      CmdHFFelica,      1, "{ ISO18092 / Felica RFIDs...       }"},
+    {"legic",       CmdHFLegic,       1, "{ LEGIC RFIDs...                   }"},
+    {"iclass",      CmdHFiClass,      1, "{ ICLASS RFIDs...                  }"},
+    {"mf",          CmdHFMF,          1, "{ MIFARE RFIDs...                  }"},
+    {"mfp",         CmdHFMFP,         1, "{ MIFARE Plus RFIDs...             }"},
+    {"mfu",         CmdHFMFUltra,     1, "{ MIFARE Ultralight RFIDs...       }"},
+    {"mfdes",       CmdHFMFDes,       1, "{ MIFARE Desfire RFIDs...          }"},
+    {"topaz",       CmdHFTopaz,       1, "{ TOPAZ (NFC Type 1) RFIDs...      }"},
+    {"fido",        CmdHFFido,        1, "{ FIDO and FIDO2 authenticators... }"},
+    {"list",        CmdTraceList,     0, "List protocol data in trace buffer"},
+    {"tune",        CmdHFTune,        0, "Continuously measure HF antenna tuning"},
+    {"search",      CmdHFSearch,      1, "Search for known HF tags [preliminary]"},
+    {"snoop",       CmdHFSnoop,       0, "<samples to skip (10000)> <triggers to skip (1)> Generic HF Snoop"},
+    {NULL, NULL, 0, NULL}
 };
 
 int CmdHF(const char *Cmd) {
-	clearCommandBuffer();
-	CmdsParse(CommandTable, Cmd);
-	return 0;
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
+    return 0;
 }
 
 int CmdHelp(const char *Cmd) {
-	CmdsHelp(CommandTable);
-	return 0;
+    CmdsHelp(CommandTable);
+    return 0;
 }
diff --git a/client/cmdhf.h b/client/cmdhf.h
index b2dcc10f1..6511cc2b8 100644
--- a/client/cmdhf.h
+++ b/client/cmdhf.h
@@ -18,20 +18,20 @@
 #include "graph.h"
 #include "ui.h"
 #include "cmdparser.h"
-#include "cmdhf14a.h"		// ISO14443-A
-#include "cmdhf14b.h"		// ISO14443-B
-#include "cmdhf15.h"		// ISO15693
+#include "cmdhf14a.h"       // ISO14443-A
+#include "cmdhf14b.h"       // ISO14443-B
+#include "cmdhf15.h"        // ISO15693
 #include "cmdhfepa.h"
-#include "cmdhflegic.h"		// LEGIC
-#include "cmdhficlass.h"	// ICLASS
-#include "cmdhfmf.h"		// CLASSIC
-#include "cmdhfmfu.h"		// ULTRALIGHT/NTAG etc
-#include "cmdhfmfp.h"		// Mifare Plus
-#include "cmdhfmfdes.h"		// DESFIRE
-#include "cmdhftopaz.h"		// TOPAZ
-#include "cmdhffelica.h"	// ISO18092 / FeliCa
-#include "cmdhffido.h"		// FIDO authenticators
-#include "cmdtrace.h"		// trace list
+#include "cmdhflegic.h"     // LEGIC
+#include "cmdhficlass.h"    // ICLASS
+#include "cmdhfmf.h"        // CLASSIC
+#include "cmdhfmfu.h"       // ULTRALIGHT/NTAG etc
+#include "cmdhfmfp.h"       // Mifare Plus
+#include "cmdhfmfdes.h"     // DESFIRE
+#include "cmdhftopaz.h"     // TOPAZ
+#include "cmdhffelica.h"    // ISO18092 / FeliCa
+#include "cmdhffido.h"      // FIDO authenticators
+#include "cmdtrace.h"       // trace list
 
 extern int CmdHF(const char *Cmd);
 extern int CmdHFTune(const char *Cmd);
diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 98a6168b2..d88746e3f 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -18,135 +18,135 @@ static int CmdHelp(const char *Cmd);
 static int waitCmd(uint8_t iLen);
 
 static const manufactureName manufactureMapping[] = {
-	// ID,  "Vendor Country"
-	{ 0x01, "Motorola UK" },
-	{ 0x02, "ST Microelectronics SA France" },
-	{ 0x03, "Hitachi, Ltd Japan" },
-	{ 0x04, "NXP Semiconductors Germany" },
-	{ 0x05, "Infineon Technologies AG Germany" },
-	{ 0x06, "Cylink USA" },
-	{ 0x07, "Texas Instrument France" },
-	{ 0x08, "Fujitsu Limited Japan" },
-	{ 0x09, "Matsushita Electronics Corporation, Semiconductor Company Japan" },
-	{ 0x0A, "NEC Japan" },
-	{ 0x0B, "Oki Electric Industry Co. Ltd Japan" },
-	{ 0x0C, "Toshiba Corp. Japan" },
-	{ 0x0D, "Mitsubishi Electric Corp. Japan" },
-	{ 0x0E, "Samsung Electronics Co. Ltd Korea" },
-	{ 0x0F, "Hynix / Hyundai, Korea" },
-	{ 0x10, "LG-Semiconductors Co. Ltd Korea" },
-	{ 0x11, "Emosyn-EM Microelectronics USA" },
-	{ 0x12, "INSIDE Technology France" },
-	{ 0x13, "ORGA Kartensysteme GmbH Germany" },
-	{ 0x14, "SHARP Corporation Japan" },
-	{ 0x15, "ATMEL France" },
-	{ 0x16, "EM Microelectronic-Marin SA Switzerland" },
-	{ 0x17, "KSW Microtec GmbH Germany" },
-	{ 0x18, "ZMD AG Germany" },
-	{ 0x19, "XICOR, Inc. USA" },
-	{ 0x1A, "Sony Corporation Japan" },
-	{ 0x1B, "Malaysia Microelectronic Solutions Sdn. Bhd Malaysia" },
-	{ 0x1C, "Emosyn USA" },
-	{ 0x1D, "Shanghai Fudan Microelectronics Co. Ltd. P.R. China" },
-	{ 0x1E, "Magellan Technology Pty Limited Australia" },
-	{ 0x1F, "Melexis NV BO Switzerland" },
-	{ 0x20, "Renesas Technology Corp. Japan" },
-	{ 0x21, "TAGSYS France" },
-	{ 0x22, "Transcore USA" },
-	{ 0x23, "Shanghai belling corp., ltd. China" },
-	{ 0x24, "Masktech Germany Gmbh Germany" },
-	{ 0x25, "Innovision Research and Technology Plc UK" },
-	{ 0x26, "Hitachi ULSI Systems Co., Ltd. Japan" },
-	{ 0x27, "Cypak AB Sweden" },
-	{ 0x28, "Ricoh Japan" },
-	{ 0x29, "ASK France" },
-	{ 0x2A, "Unicore Microsystems, LLC Russian Federation" },
-	{ 0x2B, "Dallas Semiconductor/Maxim USA" },
-	{ 0x2C, "Impinj, Inc. USA" },
-	{ 0x2D, "RightPlug Alliance USA" },
-	{ 0x2E, "Broadcom Corporation USA" },
-	{ 0x2F, "MStar Semiconductor, Inc Taiwan, ROC" },
-	{ 0x30, "BeeDar Technology Inc. USA" },
-	{ 0x31, "RFIDsec Denmark" },
-	{ 0x32, "Schweizer Electronic AG Germany" },
-	{ 0x33, "AMIC Technology Corp Taiwan" },
-	{ 0x34, "Mikron JSC Russia" },
-	{ 0x35, "Fraunhofer Institute for Photonic Microsystems Germany" },
-	{ 0x36, "IDS Microchip AG Switzerland" },
-	{ 0x37, "Kovio USA" },
-	{ 0x38, "HMT Microelectronic Ltd Switzerland" },
-	{ 0x39, "Silicon Craft Technology Thailand" },
-	{ 0x3A, "Advanced Film Device Inc. Japan" },
-	{ 0x3B, "Nitecrest Ltd UK" },
-	{ 0x3C, "Verayo Inc. USA" },
-	{ 0x3D, "HID Global USA" },
-	{ 0x3E, "Productivity Engineering Gmbh Germany" },
-	{ 0x3F, "Austriamicrosystems AG (reserved) Austria" },
-	{ 0x40, "Gemalto SA France" },
-	{ 0x41, "Renesas Electronics Corporation Japan" },
-	{ 0x42, "3Alogics Inc Korea" },
-	{ 0x43, "Top TroniQ Asia Limited Hong Kong" },
-	{ 0x44, "Gentag Inc. USA" },
-	{ 0x45, "Invengo Information Technology Co.Ltd China" },
-	{ 0x46, "Guangzhou Sysur Microelectronics, Inc China" },
-	{ 0x47, "CEITEC S.A. Brazil" },
-	{ 0x48, "Shanghai Quanray Electronics Co. Ltd. China" },
-	{ 0x49, "MediaTek Inc Taiwan" },
-	{ 0x4A, "Angstrem PJSC Russia" },
-	{ 0x4B, "Celisic Semiconductor (Hong Kong) Limited China" },
-	{ 0x4C, "LEGIC Identsystems AG Switzerland" },
-	{ 0x4D, "Balluff GmbH Germany" },
-	{ 0x4E, "Oberthur Technologies France" },
-	{ 0x4F, "Silterra Malaysia Sdn. Bhd. Malaysia" },
-	{ 0x50, "DELTA Danish Electronics, Light & Acoustics Denmark" },
-	{ 0x51, "Giesecke & Devrient GmbH Germany" },
-	{ 0x52, "Shenzhen China Vision Microelectronics Co., Ltd. China" },
-	{ 0x53, "Shanghai Feiju Microelectronics Co. Ltd. China" },
-	{ 0x54, "Intel Corporation USA" },
-	{ 0x55, "Microsensys GmbH Germany" },
-	{ 0x56, "Sonix Technology Co., Ltd. Taiwan" },
-	{ 0x57, "Qualcomm Technologies Inc USA" },
-	{ 0x58, "Realtek Semiconductor Corp Taiwan" },
-	{ 0x59, "Freevision Technologies Co. Ltd China" },
-	{ 0x5A, "Giantec Semiconductor Inc. China" },
-	{ 0x5B, "JSC Angstrem-T Russia" },
-	{ 0x5C, "STARCHIP France" },
-	{ 0x5D, "SPIRTECH France" },
-	{ 0x5E, "GANTNER Electronic GmbH Austria" },
-	{ 0x5F, "Nordic Semiconductor Norway" },
-	{ 0x60, "Verisiti Inc USA" },
-	{ 0x61, "Wearlinks Technology Inc. China" },
-	{ 0x62, "Userstar Information Systems Co., Ltd Taiwan" },
-	{ 0x63, "Pragmatic Printing Ltd. UK" },
-	{ 0x64, "Associacao do Laboratorio de Sistemas Integraveis Tecnologico – LSI-TEC Brazil" },
-	{ 0x65, "Tendyron Corporation China" },
-	{ 0x66, "MUTO Smart Co., Ltd. Korea" },
-	{ 0x67, "ON Semiconductor USA" },
-	{ 0x68, "TUBITAK BILGEM Turkey" },
-	{ 0x69, "Huada Semiconductor Co., Ltd China" },
-	{ 0x6A, "SEVENEY France" },
-	{ 0x6B, "ISSM France" },
-	{ 0x6C, "Wisesec Ltd Israel" },
-	{ 0x7C, "DB HiTek Co Ltd Korea" },
-	{ 0x7D, "SATO Vicinity Australia" },
-	{ 0x7E, "Holtek Taiwan" },
-	{ 0x00, "no tag-info available" } // must be the last entry
+    // ID,  "Vendor Country"
+    { 0x01, "Motorola UK" },
+    { 0x02, "ST Microelectronics SA France" },
+    { 0x03, "Hitachi, Ltd Japan" },
+    { 0x04, "NXP Semiconductors Germany" },
+    { 0x05, "Infineon Technologies AG Germany" },
+    { 0x06, "Cylink USA" },
+    { 0x07, "Texas Instrument France" },
+    { 0x08, "Fujitsu Limited Japan" },
+    { 0x09, "Matsushita Electronics Corporation, Semiconductor Company Japan" },
+    { 0x0A, "NEC Japan" },
+    { 0x0B, "Oki Electric Industry Co. Ltd Japan" },
+    { 0x0C, "Toshiba Corp. Japan" },
+    { 0x0D, "Mitsubishi Electric Corp. Japan" },
+    { 0x0E, "Samsung Electronics Co. Ltd Korea" },
+    { 0x0F, "Hynix / Hyundai, Korea" },
+    { 0x10, "LG-Semiconductors Co. Ltd Korea" },
+    { 0x11, "Emosyn-EM Microelectronics USA" },
+    { 0x12, "INSIDE Technology France" },
+    { 0x13, "ORGA Kartensysteme GmbH Germany" },
+    { 0x14, "SHARP Corporation Japan" },
+    { 0x15, "ATMEL France" },
+    { 0x16, "EM Microelectronic-Marin SA Switzerland" },
+    { 0x17, "KSW Microtec GmbH Germany" },
+    { 0x18, "ZMD AG Germany" },
+    { 0x19, "XICOR, Inc. USA" },
+    { 0x1A, "Sony Corporation Japan" },
+    { 0x1B, "Malaysia Microelectronic Solutions Sdn. Bhd Malaysia" },
+    { 0x1C, "Emosyn USA" },
+    { 0x1D, "Shanghai Fudan Microelectronics Co. Ltd. P.R. China" },
+    { 0x1E, "Magellan Technology Pty Limited Australia" },
+    { 0x1F, "Melexis NV BO Switzerland" },
+    { 0x20, "Renesas Technology Corp. Japan" },
+    { 0x21, "TAGSYS France" },
+    { 0x22, "Transcore USA" },
+    { 0x23, "Shanghai belling corp., ltd. China" },
+    { 0x24, "Masktech Germany Gmbh Germany" },
+    { 0x25, "Innovision Research and Technology Plc UK" },
+    { 0x26, "Hitachi ULSI Systems Co., Ltd. Japan" },
+    { 0x27, "Cypak AB Sweden" },
+    { 0x28, "Ricoh Japan" },
+    { 0x29, "ASK France" },
+    { 0x2A, "Unicore Microsystems, LLC Russian Federation" },
+    { 0x2B, "Dallas Semiconductor/Maxim USA" },
+    { 0x2C, "Impinj, Inc. USA" },
+    { 0x2D, "RightPlug Alliance USA" },
+    { 0x2E, "Broadcom Corporation USA" },
+    { 0x2F, "MStar Semiconductor, Inc Taiwan, ROC" },
+    { 0x30, "BeeDar Technology Inc. USA" },
+    { 0x31, "RFIDsec Denmark" },
+    { 0x32, "Schweizer Electronic AG Germany" },
+    { 0x33, "AMIC Technology Corp Taiwan" },
+    { 0x34, "Mikron JSC Russia" },
+    { 0x35, "Fraunhofer Institute for Photonic Microsystems Germany" },
+    { 0x36, "IDS Microchip AG Switzerland" },
+    { 0x37, "Kovio USA" },
+    { 0x38, "HMT Microelectronic Ltd Switzerland" },
+    { 0x39, "Silicon Craft Technology Thailand" },
+    { 0x3A, "Advanced Film Device Inc. Japan" },
+    { 0x3B, "Nitecrest Ltd UK" },
+    { 0x3C, "Verayo Inc. USA" },
+    { 0x3D, "HID Global USA" },
+    { 0x3E, "Productivity Engineering Gmbh Germany" },
+    { 0x3F, "Austriamicrosystems AG (reserved) Austria" },
+    { 0x40, "Gemalto SA France" },
+    { 0x41, "Renesas Electronics Corporation Japan" },
+    { 0x42, "3Alogics Inc Korea" },
+    { 0x43, "Top TroniQ Asia Limited Hong Kong" },
+    { 0x44, "Gentag Inc. USA" },
+    { 0x45, "Invengo Information Technology Co.Ltd China" },
+    { 0x46, "Guangzhou Sysur Microelectronics, Inc China" },
+    { 0x47, "CEITEC S.A. Brazil" },
+    { 0x48, "Shanghai Quanray Electronics Co. Ltd. China" },
+    { 0x49, "MediaTek Inc Taiwan" },
+    { 0x4A, "Angstrem PJSC Russia" },
+    { 0x4B, "Celisic Semiconductor (Hong Kong) Limited China" },
+    { 0x4C, "LEGIC Identsystems AG Switzerland" },
+    { 0x4D, "Balluff GmbH Germany" },
+    { 0x4E, "Oberthur Technologies France" },
+    { 0x4F, "Silterra Malaysia Sdn. Bhd. Malaysia" },
+    { 0x50, "DELTA Danish Electronics, Light & Acoustics Denmark" },
+    { 0x51, "Giesecke & Devrient GmbH Germany" },
+    { 0x52, "Shenzhen China Vision Microelectronics Co., Ltd. China" },
+    { 0x53, "Shanghai Feiju Microelectronics Co. Ltd. China" },
+    { 0x54, "Intel Corporation USA" },
+    { 0x55, "Microsensys GmbH Germany" },
+    { 0x56, "Sonix Technology Co., Ltd. Taiwan" },
+    { 0x57, "Qualcomm Technologies Inc USA" },
+    { 0x58, "Realtek Semiconductor Corp Taiwan" },
+    { 0x59, "Freevision Technologies Co. Ltd China" },
+    { 0x5A, "Giantec Semiconductor Inc. China" },
+    { 0x5B, "JSC Angstrem-T Russia" },
+    { 0x5C, "STARCHIP France" },
+    { 0x5D, "SPIRTECH France" },
+    { 0x5E, "GANTNER Electronic GmbH Austria" },
+    { 0x5F, "Nordic Semiconductor Norway" },
+    { 0x60, "Verisiti Inc USA" },
+    { 0x61, "Wearlinks Technology Inc. China" },
+    { 0x62, "Userstar Information Systems Co., Ltd Taiwan" },
+    { 0x63, "Pragmatic Printing Ltd. UK" },
+    { 0x64, "Associacao do Laboratorio de Sistemas Integraveis Tecnologico – LSI-TEC Brazil" },
+    { 0x65, "Tendyron Corporation China" },
+    { 0x66, "MUTO Smart Co., Ltd. Korea" },
+    { 0x67, "ON Semiconductor USA" },
+    { 0x68, "TUBITAK BILGEM Turkey" },
+    { 0x69, "Huada Semiconductor Co., Ltd China" },
+    { 0x6A, "SEVENEY France" },
+    { 0x6B, "ISSM France" },
+    { 0x6C, "Wisesec Ltd Israel" },
+    { 0x7C, "DB HiTek Co Ltd Korea" },
+    { 0x7D, "SATO Vicinity Australia" },
+    { 0x7E, "Holtek Taiwan" },
+    { 0x00, "no tag-info available" } // must be the last entry
 };
 
 // get a product description based on the UID
-//		uid[8] 	tag uid
+//  uid[8] tag uid
 // returns description of the best match
 char* getTagInfo(uint8_t uid) {
 
-	int i;
-	int len = sizeof(manufactureMapping) / sizeof(manufactureName);
+    int i;
+    int len = sizeof(manufactureMapping) / sizeof(manufactureName);
 
-	for ( i = 0; i < len; ++i )
-		if ( uid == manufactureMapping[i].uid)
-			return manufactureMapping[i].desc;
+    for ( i = 0; i < len; ++i )
+        if ( uid == manufactureMapping[i].uid)
+            return manufactureMapping[i].desc;
 
-	//No match, return default
-	return manufactureMapping[len-1].desc;
+    //No match, return default
+    return manufactureMapping[len-1].desc;
 }
 
 // iso14a apdu input frame length
@@ -154,647 +154,647 @@ static uint16_t frameLength = 0;
 uint16_t atsFSC[] = {16, 24, 32, 40, 48, 64, 96, 128, 256};
 
 int usage_hf_14a_sim(void) {
-//	PrintAndLogEx(NORMAL, "\n Emulating ISO/IEC 14443 type A tag with 4,7 or 10 byte UID\n");
-	PrintAndLogEx(NORMAL, "\n Emulating ISO/IEC 14443 type A tag with 4,7 byte UID\n");
-	PrintAndLogEx(NORMAL, "Usage: hf 14a sim [h] t <type> u <uid> [x] [e] [v]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "    h     : This help");
-	PrintAndLogEx(NORMAL, "    t     : 1 = MIFARE Classic 1k");
-	PrintAndLogEx(NORMAL, "            2 = MIFARE Ultralight");
-	PrintAndLogEx(NORMAL, "            3 = MIFARE Desfire");
-	PrintAndLogEx(NORMAL, "            4 = ISO/IEC 14443-4");
-	PrintAndLogEx(NORMAL, "            5 = MIFARE Tnp3xxx");
-	PrintAndLogEx(NORMAL, "            6 = MIFARE Mini");
-	PrintAndLogEx(NORMAL, "            7 = AMIIBO (NTAG 215),  pack 0x8080");
-	PrintAndLogEx(NORMAL, "            8 = MIFARE Classic 4k");
-	PrintAndLogEx(NORMAL, "            9 = FM11RF005SH Shanghai Metro");
-//	PrintAndLogEx(NORMAL, "    u     : 4, 7 or 10 byte UID");
-	PrintAndLogEx(NORMAL, "    u     : 4, 7 byte UID");
-	PrintAndLogEx(NORMAL, "    x     : (Optional) Performs the 'reader attack', nr/ar attack against a reader");
-	PrintAndLogEx(NORMAL, "    e     : (Optional) Fill simulator keys from found keys");
-	PrintAndLogEx(NORMAL, "    v     : (Optional) Verbose");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "          hf 14a sim t 1 u 11223344 x");
-	PrintAndLogEx(NORMAL, "          hf 14a sim t 1 u 11223344");
-	PrintAndLogEx(NORMAL, "          hf 14a sim t 1 u 11223344556677");
-//	PrintAndLogEx(NORMAL, "          hf 14a sim t 1 u 11223445566778899AA\n");
-	return 0;
+//  PrintAndLogEx(NORMAL, "\n Emulating ISO/IEC 14443 type A tag with 4,7 or 10 byte UID\n");
+    PrintAndLogEx(NORMAL, "\n Emulating ISO/IEC 14443 type A tag with 4,7 byte UID\n");
+    PrintAndLogEx(NORMAL, "Usage: hf 14a sim [h] t <type> u <uid> [x] [e] [v]");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "    h     : This help");
+    PrintAndLogEx(NORMAL, "    t     : 1 = MIFARE Classic 1k");
+    PrintAndLogEx(NORMAL, "            2 = MIFARE Ultralight");
+    PrintAndLogEx(NORMAL, "            3 = MIFARE Desfire");
+    PrintAndLogEx(NORMAL, "            4 = ISO/IEC 14443-4");
+    PrintAndLogEx(NORMAL, "            5 = MIFARE Tnp3xxx");
+    PrintAndLogEx(NORMAL, "            6 = MIFARE Mini");
+    PrintAndLogEx(NORMAL, "            7 = AMIIBO (NTAG 215),  pack 0x8080");
+    PrintAndLogEx(NORMAL, "            8 = MIFARE Classic 4k");
+    PrintAndLogEx(NORMAL, "            9 = FM11RF005SH Shanghai Metro");
+//  PrintAndLogEx(NORMAL, "    u     : 4, 7 or 10 byte UID");
+    PrintAndLogEx(NORMAL, "    u     : 4, 7 byte UID");
+    PrintAndLogEx(NORMAL, "    x     : (Optional) Performs the 'reader attack', nr/ar attack against a reader");
+    PrintAndLogEx(NORMAL, "    e     : (Optional) Fill simulator keys from found keys");
+    PrintAndLogEx(NORMAL, "    v     : (Optional) Verbose");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "          hf 14a sim t 1 u 11223344 x");
+    PrintAndLogEx(NORMAL, "          hf 14a sim t 1 u 11223344");
+    PrintAndLogEx(NORMAL, "          hf 14a sim t 1 u 11223344556677");
+//  PrintAndLogEx(NORMAL, "          hf 14a sim t 1 u 11223445566778899AA\n");
+    return 0;
 }
 int usage_hf_14a_sniff(void) {
-	PrintAndLogEx(NORMAL, "It get data from the field and saves it into command buffer.");
-	PrintAndLogEx(NORMAL, "Buffer accessible from command 'hf list 14a'");
-	PrintAndLogEx(NORMAL, "Usage:  hf 14a sniff [c][r]");
-	PrintAndLogEx(NORMAL, "c - triggered by first data from card");
-	PrintAndLogEx(NORMAL, "r - triggered by first 7-bit request from reader (REQ,WUP,...)");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        hf 14a sniff c r");
-	return 0;
+    PrintAndLogEx(NORMAL, "It get data from the field and saves it into command buffer.");
+    PrintAndLogEx(NORMAL, "Buffer accessible from command 'hf list 14a'");
+    PrintAndLogEx(NORMAL, "Usage:  hf 14a sniff [c][r]");
+    PrintAndLogEx(NORMAL, "c - triggered by first data from card");
+    PrintAndLogEx(NORMAL, "r - triggered by first 7-bit request from reader (REQ,WUP,...)");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "        hf 14a sniff c r");
+    return 0;
 }
 int usage_hf_14a_raw(void) {
-	PrintAndLogEx(NORMAL, "Usage: hf 14a raw [-h] [-r] [-c] [-p] [-a] [-T] [-t] <milliseconds> [-b] <number of bits>  <0A 0B 0C ... hex>");
-	PrintAndLogEx(NORMAL, "       -h    this help");
-	PrintAndLogEx(NORMAL, "       -r    do not read response");
-	PrintAndLogEx(NORMAL, "       -c    calculate and append CRC");
-	PrintAndLogEx(NORMAL, "       -p    leave the signal field ON after receive");
-	PrintAndLogEx(NORMAL, "       -a    active signal field ON without select");
-	PrintAndLogEx(NORMAL, "       -s    active signal field ON with select");
-	PrintAndLogEx(NORMAL, "       -b    number of bits to send. Useful for send partial byte");
-	PrintAndLogEx(NORMAL, "       -t    timeout in ms");
-	PrintAndLogEx(NORMAL, "       -T    use Topaz protocol to send command");
-	PrintAndLogEx(NORMAL, "       -3    ISO14443-3 select only (skip RATS)");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage: hf 14a raw [-h] [-r] [-c] [-p] [-a] [-T] [-t] <milliseconds> [-b] <number of bits>  <0A 0B 0C ... hex>");
+    PrintAndLogEx(NORMAL, "       -h    this help");
+    PrintAndLogEx(NORMAL, "       -r    do not read response");
+    PrintAndLogEx(NORMAL, "       -c    calculate and append CRC");
+    PrintAndLogEx(NORMAL, "       -p    leave the signal field ON after receive");
+    PrintAndLogEx(NORMAL, "       -a    active signal field ON without select");
+    PrintAndLogEx(NORMAL, "       -s    active signal field ON with select");
+    PrintAndLogEx(NORMAL, "       -b    number of bits to send. Useful for send partial byte");
+    PrintAndLogEx(NORMAL, "       -t    timeout in ms");
+    PrintAndLogEx(NORMAL, "       -T    use Topaz protocol to send command");
+    PrintAndLogEx(NORMAL, "       -3    ISO14443-3 select only (skip RATS)");
+    return 0;
 }
 int usage_hf_14a_reader(void) {
-	PrintAndLogEx(NORMAL, "Usage: hf 14a reader [k|s|x] [3]");
-	PrintAndLogEx(NORMAL, "       k    keep the field active after command executed");
-	PrintAndLogEx(NORMAL, "       s    silent (no messages)");
-	PrintAndLogEx(NORMAL, "       x    just drop the signal field");
-	PrintAndLogEx(NORMAL, "       3    ISO14443-3 select only (skip RATS)");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage: hf 14a reader [k|s|x] [3]");
+    PrintAndLogEx(NORMAL, "       k    keep the field active after command executed");
+    PrintAndLogEx(NORMAL, "       s    silent (no messages)");
+    PrintAndLogEx(NORMAL, "       x    just drop the signal field");
+    PrintAndLogEx(NORMAL, "       3    ISO14443-3 select only (skip RATS)");
+    return 0;
 }
 int usage_hf_14a_info(void){
-	PrintAndLogEx(NORMAL, "This command makes more extensive tests against a ISO14443a tag in order to collect information");
-	PrintAndLogEx(NORMAL, "Usage: hf 14a info [h|s]");
-	PrintAndLogEx(NORMAL, "       s    silent (no messages)");
-	PrintAndLogEx(NORMAL, "       n    test for nack bug");
-	return 0;
+    PrintAndLogEx(NORMAL, "This command makes more extensive tests against a ISO14443a tag in order to collect information");
+    PrintAndLogEx(NORMAL, "Usage: hf 14a info [h|s]");
+    PrintAndLogEx(NORMAL, "       s    silent (no messages)");
+    PrintAndLogEx(NORMAL, "       n    test for nack bug");
+    return 0;
 }
 
 int CmdHF14AList(const char *Cmd) {
-	//PrintAndLogEx(NORMAL, "Deprecated command, use 'hf list 14a' instead");
-	CmdTraceList("14a");
-	return 0;
+    //PrintAndLogEx(NORMAL, "Deprecated command, use 'hf list 14a' instead");
+    CmdTraceList("14a");
+    return 0;
 }
 
 int Hf14443_4aGetCardData(iso14a_card_select_t * card) {
-	UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT, 0, 0}};
-	SendCommand(&c);
+    UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT, 0, 0}};
+    SendCommand(&c);
 
-	UsbCommand resp;
-	WaitForResponse(CMD_ACK,&resp);
+    UsbCommand resp;
+    WaitForResponse(CMD_ACK,&resp);
 
-	memcpy(card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
+    memcpy(card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
 
-	uint64_t select_status = resp.arg[0];		// 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
+    uint64_t select_status = resp.arg[0]; // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
 
-	if(select_status == 0) {
-		PrintAndLog("E->iso14443a card select failed");
-		return 1;
-	}
+    if(select_status == 0) {
+        PrintAndLog("E->iso14443a card select failed");
+        return 1;
+    }
 
-	if(select_status == 2) {
-		PrintAndLog("E->Card doesn't support iso14443-4 mode");
-		return 1;
-	}
+    if(select_status == 2) {
+        PrintAndLog("E->Card doesn't support iso14443-4 mode");
+        return 1;
+    }
 
-	if(select_status == 3) {
-		PrintAndLog("E->Card doesn't support standard iso14443-3 anticollision");
-		PrintAndLog("\tATQA : %02x %02x", card->atqa[1], card->atqa[0]);
-		return 1;
-	}
+    if(select_status == 3) {
+        PrintAndLog("E->Card doesn't support standard iso14443-3 anticollision");
+        PrintAndLog("\tATQA : %02x %02x", card->atqa[1], card->atqa[0]);
+        return 1;
+    }
 
-	PrintAndLog(" UID: %s", sprint_hex(card->uid, card->uidlen));
-	PrintAndLog("ATQA: %02x %02x", card->atqa[1], card->atqa[0]);
-	PrintAndLog(" SAK: %02x [%" PRIu64 "]", card->sak, resp.arg[0]);
-	if(card->ats_len < 3) {			// a valid ATS consists of at least the length byte (TL) and 2 CRC bytes
-		PrintAndLog("E-> Error ATS length(%d) : %s", card->ats_len, sprint_hex(card->ats, card->ats_len));
-		return 1;
-	}
-	PrintAndLog(" ATS: %s", sprint_hex(card->ats, card->ats_len));
+    PrintAndLog(" UID: %s", sprint_hex(card->uid, card->uidlen));
+    PrintAndLog("ATQA: %02x %02x", card->atqa[1], card->atqa[0]);
+    PrintAndLog(" SAK: %02x [%" PRIu64 "]", card->sak, resp.arg[0]);
+    if(card->ats_len < 3) { // a valid ATS consists of at least the length byte (TL) and 2 CRC bytes
+        PrintAndLog("E-> Error ATS length(%d) : %s", card->ats_len, sprint_hex(card->ats, card->ats_len));
+        return 1;
+    }
+    PrintAndLog(" ATS: %s", sprint_hex(card->ats, card->ats_len));
 
-	return 0;
+    return 0;
 }
 
 int CmdHF14AReader(const char *Cmd) {
 
-	uint32_t cm = ISO14A_CONNECT;
-	bool disconnectAfter = true, silent = false;
-	int cmdp = 0;
+    uint32_t cm = ISO14A_CONNECT;
+    bool disconnectAfter = true, silent = false;
+    int cmdp = 0;
 
-	while (param_getchar(Cmd, cmdp) != 0x00) {
-		switch (tolower(param_getchar(Cmd, cmdp))) {
-		case 'h':
-			return usage_hf_14a_reader();
-		case '3':
-			cm |= ISO14A_NO_RATS;
-			break;
-		case 'k':
-			disconnectAfter = false;
-			break;
-		case 's':
-			silent = true;
-			break;
-		case 'x':
-			cm &= ~ISO14A_CONNECT;
-			break;
-		default:
-			PrintAndLogEx(WARNING, "Unknown command.");
-			return 1;
-		}
-		cmdp++;
-	}
+    while (param_getchar(Cmd, cmdp) != 0x00) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+        case 'h':
+            return usage_hf_14a_reader();
+        case '3':
+            cm |= ISO14A_NO_RATS;
+            break;
+        case 'k':
+            disconnectAfter = false;
+            break;
+        case 's':
+            silent = true;
+            break;
+        case 'x':
+            cm &= ~ISO14A_CONNECT;
+            break;
+        default:
+            PrintAndLogEx(WARNING, "Unknown command.");
+            return 1;
+        }
+        cmdp++;
+    }
 
-	if (!disconnectAfter)
-		cm |= ISO14A_NO_DISCONNECT;
+    if (!disconnectAfter)
+        cm |= ISO14A_NO_DISCONNECT;
 
-	UsbCommand c = {CMD_READER_ISO_14443a, {cm, 0, 0}};
-	clearCommandBuffer();
-	SendCommand(&c);
+    UsbCommand c = {CMD_READER_ISO_14443a, {cm, 0, 0}};
+    clearCommandBuffer();
+    SendCommand(&c);
 
-	if (ISO14A_CONNECT & cm) {
-		UsbCommand resp;
-		if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
-			if (!silent) PrintAndLogEx(WARNING, "iso14443a card select failed");
-			DropField();
-			return 1;
-		}
+    if (ISO14A_CONNECT & cm) {
+        UsbCommand resp;
+        if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
+            if (!silent) PrintAndLogEx(WARNING, "iso14443a card select failed");
+            DropField();
+            return 1;
+        }
 
-		iso14a_card_select_t card;
-		memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
+        iso14a_card_select_t card;
+        memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
 
-		/*
-			0: couldn't read
-			1: OK, with ATS
-			2: OK, no ATS
-			3: proprietary Anticollision
-		*/
-		uint64_t select_status = resp.arg[0];
+        /*
+            0: couldn't read
+            1: OK, with ATS
+            2: OK, no ATS
+            3: proprietary Anticollision
+        */
+        uint64_t select_status = resp.arg[0];
 
-		if (select_status == 0) {
-			if (!silent) PrintAndLogEx(WARNING, "iso14443a card select failed");
-			DropField();
-			return 1;
-		}
+        if (select_status == 0) {
+            if (!silent) PrintAndLogEx(WARNING, "iso14443a card select failed");
+            DropField();
+            return 1;
+        }
 
-		if (select_status == 3) {
-			PrintAndLogEx(NORMAL, "Card doesn't support standard iso14443-3 anticollision");
-			PrintAndLogEx(NORMAL, "ATQA : %02x %02x", card.atqa[1], card.atqa[0]);
-			DropField();
-			return 1;
-		}
+        if (select_status == 3) {
+            PrintAndLogEx(NORMAL, "Card doesn't support standard iso14443-3 anticollision");
+            PrintAndLogEx(NORMAL, "ATQA : %02x %02x", card.atqa[1], card.atqa[0]);
+            DropField();
+            return 1;
+        }
 
-		PrintAndLogEx(NORMAL, " UID : %s", sprint_hex(card.uid, card.uidlen));
-		PrintAndLogEx(NORMAL, "ATQA : %02x %02x", card.atqa[1], card.atqa[0]);
-		PrintAndLogEx(NORMAL, " SAK : %02x [%" PRIu64 "]", card.sak, resp.arg[0]);
+        PrintAndLogEx(NORMAL, " UID : %s", sprint_hex(card.uid, card.uidlen));
+        PrintAndLogEx(NORMAL, "ATQA : %02x %02x", card.atqa[1], card.atqa[0]);
+        PrintAndLogEx(NORMAL, " SAK : %02x [%" PRIu64 "]", card.sak, resp.arg[0]);
 
-		if(card.ats_len >= 3) {			// a valid ATS consists of at least the length byte (TL) and 2 CRC bytes
-			PrintAndLogEx(NORMAL, " ATS : %s", sprint_hex(card.ats, card.ats_len));
-		}
+        if(card.ats_len >= 3) { // a valid ATS consists of at least the length byte (TL) and 2 CRC bytes
+            PrintAndLogEx(NORMAL, " ATS : %s", sprint_hex(card.ats, card.ats_len));
+        }
 
-		if (!disconnectAfter) {
-			if (!silent) PrintAndLogEx(SUCCESS, "Card is selected. You can now start sending commands");
-		}
-	}
+        if (!disconnectAfter) {
+            if (!silent) PrintAndLogEx(SUCCESS, "Card is selected. You can now start sending commands");
+        }
+    }
 
-	if (disconnectAfter) {
-		if (!silent) PrintAndLogEx(SUCCESS, "field dropped.");
-	}
+    if (disconnectAfter) {
+        if (!silent) PrintAndLogEx(SUCCESS, "field dropped.");
+    }
 
-	return 0;
+    return 0;
 }
 
 int CmdHF14AInfo(const char *Cmd) {
 
-	if (Cmd[0] == 'h' || Cmd[0] ==  'H') return usage_hf_14a_info();
+    if (Cmd[0] == 'h' || Cmd[0] ==  'H') return usage_hf_14a_info();
 
-	bool silent = (Cmd[0] == 's' || Cmd[0] ==  'S');
-	bool do_nack_test = (Cmd[0] == 'n' || Cmd[0] ==  'N');
+    bool silent = (Cmd[0] == 's' || Cmd[0] ==  'S');
+    bool do_nack_test = (Cmd[0] == 'n' || Cmd[0] ==  'N');
 
-	UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	UsbCommand resp;
-	if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
-		if (!silent) PrintAndLogEx(WARNING, "iso14443a card select failed");
-		DropField();
-		return 0;
-	}
+    UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    UsbCommand resp;
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
+        if (!silent) PrintAndLogEx(WARNING, "iso14443a card select failed");
+        DropField();
+        return 0;
+    }
 
-	iso14a_card_select_t card;
-	memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
+    iso14a_card_select_t card;
+    memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
 
-	/*
-		0: couldn't read
-		1: OK, with ATS
-		2: OK, no ATS
-		3: proprietary Anticollision
-	*/
-	uint64_t select_status = resp.arg[0];
+    /*
+        0: couldn't read
+        1: OK, with ATS
+        2: OK, no ATS
+        3: proprietary Anticollision
+    */
+    uint64_t select_status = resp.arg[0];
 
-	if (select_status == 0) {
-		if (!silent) PrintAndLogEx(WARNING, "iso14443a card select failed");
-		DropField();
-		return 0;
-	}
+    if (select_status == 0) {
+        if (!silent) PrintAndLogEx(WARNING, "iso14443a card select failed");
+        DropField();
+        return 0;
+    }
 
-	if (select_status == 3) {
-		PrintAndLogEx(NORMAL, "Card doesn't support standard iso14443-3 anticollision");
-		PrintAndLogEx(NORMAL, "ATQA : %02x %02x", card.atqa[1], card.atqa[0]);
-		DropField();
-		return select_status;
-	}
+    if (select_status == 3) {
+        PrintAndLogEx(NORMAL, "Card doesn't support standard iso14443-3 anticollision");
+        PrintAndLogEx(NORMAL, "ATQA : %02x %02x", card.atqa[1], card.atqa[0]);
+        DropField();
+        return select_status;
+    }
 
-	PrintAndLogEx(NORMAL, " UID : %s", sprint_hex(card.uid, card.uidlen));
-	PrintAndLogEx(NORMAL, "ATQA : %02x %02x", card.atqa[1], card.atqa[0]);
-	PrintAndLogEx(NORMAL, " SAK : %02x [%" PRIu64 "]", card.sak, resp.arg[0]);
+    PrintAndLogEx(NORMAL, " UID : %s", sprint_hex(card.uid, card.uidlen));
+    PrintAndLogEx(NORMAL, "ATQA : %02x %02x", card.atqa[1], card.atqa[0]);
+    PrintAndLogEx(NORMAL, " SAK : %02x [%" PRIu64 "]", card.sak, resp.arg[0]);
 
-	bool isMifareClassic = true;
-	switch (card.sak) {
-		case 0x00:
-			isMifareClassic = false;
+    bool isMifareClassic = true;
+    switch (card.sak) {
+        case 0x00:
+            isMifareClassic = false;
 
-			// ******** is card of the MFU type (UL/ULC/NTAG/ etc etc)
-			DropField();
+            // ******** is card of the MFU type (UL/ULC/NTAG/ etc etc)
+            DropField();
 
-			uint32_t tagT = GetHF14AMfU_Type();
-			if (tagT != UL_ERROR)
-				ul_print_type(tagT, 0);
-			else
-				PrintAndLogEx(NORMAL, "TYPE: Possible AZTEK (iso14443a compliant)");
+            uint32_t tagT = GetHF14AMfU_Type();
+            if (tagT != UL_ERROR)
+                ul_print_type(tagT, 0);
+            else
+                PrintAndLogEx(NORMAL, "TYPE: Possible AZTEK (iso14443a compliant)");
 
-			// reconnect for further tests
-			c.arg[0] = ISO14A_CONNECT | ISO14A_NO_DISCONNECT;
-			c.arg[1] = 0;
-			c.arg[2] = 0;
-			clearCommandBuffer();
-			SendCommand(&c);
-			UsbCommand resp;
-			WaitForResponse(CMD_ACK, &resp);
+            // reconnect for further tests
+            c.arg[0] = ISO14A_CONNECT | ISO14A_NO_DISCONNECT;
+            c.arg[1] = 0;
+            c.arg[2] = 0;
+            clearCommandBuffer();
+            SendCommand(&c);
+            UsbCommand resp;
+            WaitForResponse(CMD_ACK, &resp);
 
-			memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
+            memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
 
-			select_status = resp.arg[0];		// 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS
+            select_status = resp.arg[0]; // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS
 
-			if(select_status == 0) {
-				DropField();
-				return 0;
-			}
-			break;
-		case 0x01: PrintAndLogEx(NORMAL, "TYPE : NXP TNP3xxx Activision Game Appliance"); break;
-		case 0x04: PrintAndLogEx(NORMAL, "TYPE : NXP MIFARE (various !DESFire !DESFire EV1)"); isMifareClassic = false; break;
-		case 0x08: PrintAndLogEx(NORMAL, "TYPE : NXP MIFARE CLASSIC 1k | Plus 2k SL1 | 1k Ev1"); break;
-		case 0x09: PrintAndLogEx(NORMAL, "TYPE : NXP MIFARE Mini 0.3k"); break;
-		case 0x0A: PrintAndLogEx(NORMAL, "TYPE : FM11RF005SH (Shanghai Metro)"); break;
-		case 0x10: PrintAndLogEx(NORMAL, "TYPE : NXP MIFARE Plus 2k SL2"); break;
-		case 0x11: PrintAndLogEx(NORMAL, "TYPE : NXP MIFARE Plus 4k SL2"); break;
-		case 0x18: PrintAndLogEx(NORMAL, "TYPE : NXP MIFARE Classic 4k | Plus 4k SL1 | 4k Ev1"); break;
-		case 0x20: PrintAndLogEx(NORMAL, "TYPE : NXP MIFARE DESFire 4k | DESFire EV1 2k/4k/8k | Plus 2k/4k SL3 | JCOP 31/41"); isMifareClassic = false; break;
-		case 0x24: PrintAndLogEx(NORMAL, "TYPE : NXP MIFARE DESFire | DESFire EV1"); isMifareClassic = false; break;
-		case 0x28: PrintAndLogEx(NORMAL, "TYPE : JCOP31 or JCOP41 v2.3.1"); break;
-		case 0x38: PrintAndLogEx(NORMAL, "TYPE : Nokia 6212 or 6131 MIFARE CLASSIC 4K"); break;
-		case 0x88: PrintAndLogEx(NORMAL, "TYPE : Infineon MIFARE CLASSIC 1K"); break;
-		case 0x98: PrintAndLogEx(NORMAL, "TYPE : Gemplus MPCOS"); break;
-		default: ;
-	}
+            if(select_status == 0) {
+                DropField();
+                return 0;
+            }
+            break;
+        case 0x01: PrintAndLogEx(NORMAL, "TYPE : NXP TNP3xxx Activision Game Appliance"); break;
+        case 0x04: PrintAndLogEx(NORMAL, "TYPE : NXP MIFARE (various !DESFire !DESFire EV1)"); isMifareClassic = false; break;
+        case 0x08: PrintAndLogEx(NORMAL, "TYPE : NXP MIFARE CLASSIC 1k | Plus 2k SL1 | 1k Ev1"); break;
+        case 0x09: PrintAndLogEx(NORMAL, "TYPE : NXP MIFARE Mini 0.3k"); break;
+        case 0x0A: PrintAndLogEx(NORMAL, "TYPE : FM11RF005SH (Shanghai Metro)"); break;
+        case 0x10: PrintAndLogEx(NORMAL, "TYPE : NXP MIFARE Plus 2k SL2"); break;
+        case 0x11: PrintAndLogEx(NORMAL, "TYPE : NXP MIFARE Plus 4k SL2"); break;
+        case 0x18: PrintAndLogEx(NORMAL, "TYPE : NXP MIFARE Classic 4k | Plus 4k SL1 | 4k Ev1"); break;
+        case 0x20: PrintAndLogEx(NORMAL, "TYPE : NXP MIFARE DESFire 4k | DESFire EV1 2k/4k/8k | Plus 2k/4k SL3 | JCOP 31/41"); isMifareClassic = false; break;
+        case 0x24: PrintAndLogEx(NORMAL, "TYPE : NXP MIFARE DESFire | DESFire EV1"); isMifareClassic = false; break;
+        case 0x28: PrintAndLogEx(NORMAL, "TYPE : JCOP31 or JCOP41 v2.3.1"); break;
+        case 0x38: PrintAndLogEx(NORMAL, "TYPE : Nokia 6212 or 6131 MIFARE CLASSIC 4K"); break;
+        case 0x88: PrintAndLogEx(NORMAL, "TYPE : Infineon MIFARE CLASSIC 1K"); break;
+        case 0x98: PrintAndLogEx(NORMAL, "TYPE : Gemplus MPCOS"); break;
+        default: ;
+    }
 
-	// Double & triple sized UID, can be mapped to a manufacturer.
-	if ( card.uidlen > 4 ) {
-		PrintAndLogEx(NORMAL, "MANUFACTURER : %s", getTagInfo(card.uid[0]));
-	}
+    // Double & triple sized UID, can be mapped to a manufacturer.
+    if ( card.uidlen > 4 ) {
+        PrintAndLogEx(NORMAL, "MANUFACTURER : %s", getTagInfo(card.uid[0]));
+    }
 
-	// try to request ATS even if tag claims not to support it
-	if (select_status == 2) {
-		uint8_t rats[] = { 0xE0, 0x80 }; // FSDI=8 (FSD=256), CID=0
-		c.arg[0] = ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT;
-		c.arg[1] = 2;
-		c.arg[2] = 0;
-		memcpy(c.d.asBytes, rats, 2);
-		clearCommandBuffer();
-		SendCommand(&c);
-		WaitForResponse(CMD_ACK,&resp);
+    // try to request ATS even if tag claims not to support it
+    if (select_status == 2) {
+        uint8_t rats[] = { 0xE0, 0x80 }; // FSDI=8 (FSD=256), CID=0
+        c.arg[0] = ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT;
+        c.arg[1] = 2;
+        c.arg[2] = 0;
+        memcpy(c.d.asBytes, rats, 2);
+        clearCommandBuffer();
+        SendCommand(&c);
+        WaitForResponse(CMD_ACK,&resp);
 
-	    memcpy(card.ats, resp.d.asBytes, resp.arg[0]);
-		card.ats_len = resp.arg[0];				// note: ats_len includes CRC Bytes
-	}
+        memcpy(card.ats, resp.d.asBytes, resp.arg[0]);
+        card.ats_len = resp.arg[0]; // note: ats_len includes CRC Bytes
+    }
 
-	if(card.ats_len >= 3) {			// a valid ATS consists of at least the length byte (TL) and 2 CRC bytes
-		bool ta1 = 0, tb1 = 0, tc1 = 0;
-		int pos;
+    if(card.ats_len >= 3) {         // a valid ATS consists of at least the length byte (TL) and 2 CRC bytes
+        bool ta1 = 0, tb1 = 0, tc1 = 0;
+        int pos;
 
-		if (select_status == 2) {
-			PrintAndLogEx(NORMAL, "SAK incorrectly claims that card doesn't support RATS");
-		}
-		PrintAndLogEx(NORMAL, " ATS : %s", sprint_hex(card.ats, card.ats_len));
-		PrintAndLogEx(NORMAL, "       -  TL : length is %d bytes", card.ats[0]);
-		if (card.ats[0] != card.ats_len - 2) {
-			PrintAndLogEx(NORMAL, "ATS may be corrupted. Length of ATS (%d bytes incl. 2 Bytes CRC) doesn't match TL", card.ats_len);
-		}
+        if (select_status == 2) {
+            PrintAndLogEx(NORMAL, "SAK incorrectly claims that card doesn't support RATS");
+        }
+        PrintAndLogEx(NORMAL, " ATS : %s", sprint_hex(card.ats, card.ats_len));
+        PrintAndLogEx(NORMAL, "       -  TL : length is %d bytes", card.ats[0]);
+        if (card.ats[0] != card.ats_len - 2) {
+            PrintAndLogEx(NORMAL, "ATS may be corrupted. Length of ATS (%d bytes incl. 2 Bytes CRC) doesn't match TL", card.ats_len);
+        }
 
-		if (card.ats[0] > 1) {		// there is a format byte (T0)
-			ta1 = (card.ats[1] & 0x10) == 0x10;
-			tb1 = (card.ats[1] & 0x20) == 0x20;
-			tc1 = (card.ats[1] & 0x40) == 0x40;
-			int16_t fsci = card.ats[1] & 0x0f;
+        if (card.ats[0] > 1) { // there is a format byte (T0)
+            ta1 = (card.ats[1] & 0x10) == 0x10;
+            tb1 = (card.ats[1] & 0x20) == 0x20;
+            tc1 = (card.ats[1] & 0x40) == 0x40;
+            int16_t fsci = card.ats[1] & 0x0f;
 
-			PrintAndLogEx(NORMAL, "       -  T0 : TA1 is%s present, TB1 is%s present, "
-					"TC1 is%s present, FSCI is %d (FSC = %ld)",
-				(ta1 ? "" : " NOT"),
-				(tb1 ? "" : " NOT"),
-				(tc1 ? "" : " NOT"),
-				fsci,
-				fsci < sizeof(atsFSC) ? atsFSC[fsci] : -1
-				);
-		}
-		pos = 2;
-		if (ta1) {
-			char dr[16], ds[16];
-			dr[0] = ds[0] = '\0';
-			if (card.ats[pos] & 0x10) strcat(ds, "2, ");
-			if (card.ats[pos] & 0x20) strcat(ds, "4, ");
-			if (card.ats[pos] & 0x40) strcat(ds, "8, ");
-			if (card.ats[pos] & 0x01) strcat(dr, "2, ");
-			if (card.ats[pos] & 0x02) strcat(dr, "4, ");
-			if (card.ats[pos] & 0x04) strcat(dr, "8, ");
-			if (strlen(ds) != 0) ds[strlen(ds) - 2] = '\0';
-			if (strlen(dr) != 0) dr[strlen(dr) - 2] = '\0';
-			PrintAndLogEx(NORMAL, "       - TA1 : different divisors are%s supported, "
-					"DR: [%s], DS: [%s]",
-					(card.ats[pos] & 0x80 ? " NOT" : ""), dr, ds);
-			pos++;
-		}
-		if (tb1) {
-			uint32_t sfgi = card.ats[pos] & 0x0F;
-			uint32_t fwi = card.ats[pos] >> 4;
-			PrintAndLogEx(NORMAL, "       - TB1 : SFGI = %d (SFGT = %s%ld/fc), FWI = %d (FWT = %ld/fc)",
-					(sfgi),
-					sfgi ? "" : "(not needed) ",
-					sfgi ? (1 << 12) << sfgi : 0,
-					fwi,
-					(1 << 12) << fwi
-					);
-			pos++;
-		}
-		if (tc1) {
-			PrintAndLogEx(NORMAL, "       - TC1 : NAD is%s supported, CID is%s supported",
-					(card.ats[pos] & 0x01) ? "" : " NOT",
-					(card.ats[pos] & 0x02) ? "" : " NOT");
-			pos++;
-		}
-		if (card.ats[0] > pos && card.ats[0] <  card.ats_len - 2 ) {
-			char *tip = "";
-			if (card.ats[0] - pos >= 7) {
-				if (memcmp(card.ats + pos, "\xC1\x05\x2F\x2F\x01\xBC\xD6", 7) == 0) {
-					tip = "-> MIFARE Plus X 2K or 4K";
-				} else if (memcmp(card.ats + pos, "\xC1\x05\x2F\x2F\x00\x35\xC7", 7) == 0) {
-					tip = "-> MIFARE Plus S 2K or 4K";
-				}
-			}
-			PrintAndLogEx(NORMAL, "       -  HB : %s%s", sprint_hex(card.ats + pos, card.ats[0] - pos), tip);
-			if (card.ats[pos] == 0xC1) {
-				PrintAndLogEx(NORMAL, "               c1 -> Mifare or (multiple) virtual cards of various type");
-				PrintAndLogEx(NORMAL, "                  %02x -> Length is %d bytes", card.ats[pos + 1], card.ats[pos + 1]);
-				switch (card.ats[pos + 2] & 0xf0) {
-					case 0x10: PrintAndLogEx(NORMAL, "                     1x -> MIFARE DESFire"); break;
-					case 0x20: PrintAndLogEx(NORMAL, "                     2x -> MIFARE Plus"); break;
-				}
-				switch (card.ats[pos + 2] & 0x0f) {
-					case 0x00: PrintAndLogEx(NORMAL, "                     x0 -> <1 kByte"); break;
-					case 0x01: PrintAndLogEx(NORMAL, "                     x1 -> 1 kByte"); break;
-					case 0x02: PrintAndLogEx(NORMAL, "                     x2 -> 2 kByte"); break;
-					case 0x03: PrintAndLogEx(NORMAL, "                     x3 -> 4 kByte"); break;
-					case 0x04: PrintAndLogEx(NORMAL, "                     x4 -> 8 kByte"); break;
-				}
-				switch (card.ats[pos + 3] & 0xf0) {
-					case 0x00: PrintAndLogEx(NORMAL, "                        0x -> Engineering sample"); break;
-					case 0x20: PrintAndLogEx(NORMAL, "                        2x -> Released"); break;
-				}
-				switch (card.ats[pos + 3] & 0x0f) {
-					case 0x00: PrintAndLogEx(NORMAL, "                        x0 -> Generation 1"); break;
-					case 0x01: PrintAndLogEx(NORMAL, "                        x1 -> Generation 2"); break;
-					case 0x02: PrintAndLogEx(NORMAL, "                        x2 -> Generation 3"); break;
-				}
-				switch (card.ats[pos + 4] & 0x0f) {
-					case 0x00: PrintAndLogEx(NORMAL, "                           x0 -> Only VCSL supported");	break;
-					case 0x01: PrintAndLogEx(NORMAL, "                           x1 -> VCS, VCSL, and SVC supported"); break;
-					case 0x0E: PrintAndLogEx(NORMAL, "                           xE -> no VCS command supported"); break;
-				}
-			}
-		}
-	} else {
-		PrintAndLogEx(INFO, "proprietary non iso14443-4 card found, RATS not supported");
-	}
+            PrintAndLogEx(NORMAL, "       -  T0 : TA1 is%s present, TB1 is%s present, "
+                    "TC1 is%s present, FSCI is %d (FSC = %ld)",
+                (ta1 ? "" : " NOT"),
+                (tb1 ? "" : " NOT"),
+                (tc1 ? "" : " NOT"),
+                fsci,
+                fsci < sizeof(atsFSC) ? atsFSC[fsci] : -1
+                );
+        }
+        pos = 2;
+        if (ta1) {
+            char dr[16], ds[16];
+            dr[0] = ds[0] = '\0';
+            if (card.ats[pos] & 0x10) strcat(ds, "2, ");
+            if (card.ats[pos] & 0x20) strcat(ds, "4, ");
+            if (card.ats[pos] & 0x40) strcat(ds, "8, ");
+            if (card.ats[pos] & 0x01) strcat(dr, "2, ");
+            if (card.ats[pos] & 0x02) strcat(dr, "4, ");
+            if (card.ats[pos] & 0x04) strcat(dr, "8, ");
+            if (strlen(ds) != 0) ds[strlen(ds) - 2] = '\0';
+            if (strlen(dr) != 0) dr[strlen(dr) - 2] = '\0';
+            PrintAndLogEx(NORMAL, "       - TA1 : different divisors are%s supported, "
+                    "DR: [%s], DS: [%s]",
+                    (card.ats[pos] & 0x80 ? " NOT" : ""), dr, ds);
+            pos++;
+        }
+        if (tb1) {
+            uint32_t sfgi = card.ats[pos] & 0x0F;
+            uint32_t fwi = card.ats[pos] >> 4;
+            PrintAndLogEx(NORMAL, "       - TB1 : SFGI = %d (SFGT = %s%ld/fc), FWI = %d (FWT = %ld/fc)",
+                    (sfgi),
+                    sfgi ? "" : "(not needed) ",
+                    sfgi ? (1 << 12) << sfgi : 0,
+                    fwi,
+                    (1 << 12) << fwi
+                    );
+            pos++;
+        }
+        if (tc1) {
+            PrintAndLogEx(NORMAL, "       - TC1 : NAD is%s supported, CID is%s supported",
+                    (card.ats[pos] & 0x01) ? "" : " NOT",
+                    (card.ats[pos] & 0x02) ? "" : " NOT");
+            pos++;
+        }
+        if (card.ats[0] > pos && card.ats[0] <  card.ats_len - 2 ) {
+            char *tip = "";
+            if (card.ats[0] - pos >= 7) {
+                if (memcmp(card.ats + pos, "\xC1\x05\x2F\x2F\x01\xBC\xD6", 7) == 0) {
+                    tip = "-> MIFARE Plus X 2K or 4K";
+                } else if (memcmp(card.ats + pos, "\xC1\x05\x2F\x2F\x00\x35\xC7", 7) == 0) {
+                    tip = "-> MIFARE Plus S 2K or 4K";
+                }
+            }
+            PrintAndLogEx(NORMAL, "       -  HB : %s%s", sprint_hex(card.ats + pos, card.ats[0] - pos), tip);
+            if (card.ats[pos] == 0xC1) {
+                PrintAndLogEx(NORMAL, "               c1 -> Mifare or (multiple) virtual cards of various type");
+                PrintAndLogEx(NORMAL, "                  %02x -> Length is %d bytes", card.ats[pos + 1], card.ats[pos + 1]);
+                switch (card.ats[pos + 2] & 0xf0) {
+                    case 0x10: PrintAndLogEx(NORMAL, "                     1x -> MIFARE DESFire"); break;
+                    case 0x20: PrintAndLogEx(NORMAL, "                     2x -> MIFARE Plus"); break;
+                }
+                switch (card.ats[pos + 2] & 0x0f) {
+                    case 0x00: PrintAndLogEx(NORMAL, "                     x0 -> <1 kByte"); break;
+                    case 0x01: PrintAndLogEx(NORMAL, "                     x1 -> 1 kByte"); break;
+                    case 0x02: PrintAndLogEx(NORMAL, "                     x2 -> 2 kByte"); break;
+                    case 0x03: PrintAndLogEx(NORMAL, "                     x3 -> 4 kByte"); break;
+                    case 0x04: PrintAndLogEx(NORMAL, "                     x4 -> 8 kByte"); break;
+                }
+                switch (card.ats[pos + 3] & 0xf0) {
+                    case 0x00: PrintAndLogEx(NORMAL, "                        0x -> Engineering sample"); break;
+                    case 0x20: PrintAndLogEx(NORMAL, "                        2x -> Released"); break;
+                }
+                switch (card.ats[pos + 3] & 0x0f) {
+                    case 0x00: PrintAndLogEx(NORMAL, "                        x0 -> Generation 1"); break;
+                    case 0x01: PrintAndLogEx(NORMAL, "                        x1 -> Generation 2"); break;
+                    case 0x02: PrintAndLogEx(NORMAL, "                        x2 -> Generation 3"); break;
+                }
+                switch (card.ats[pos + 4] & 0x0f) {
+                    case 0x00: PrintAndLogEx(NORMAL, "                           x0 -> Only VCSL supported"); break;
+                    case 0x01: PrintAndLogEx(NORMAL, "                           x1 -> VCS, VCSL, and SVC supported"); break;
+                    case 0x0E: PrintAndLogEx(NORMAL, "                           xE -> no VCS command supported"); break;
+                }
+            }
+        }
+    } else {
+        PrintAndLogEx(INFO, "proprietary non iso14443-4 card found, RATS not supported");
+    }
 
-	detect_classic_magic();
+    detect_classic_magic();
 
-	if (isMifareClassic) {
-		int res = detect_classic_prng();
-		if ( res == 1 )
-			PrintAndLogEx(SUCCESS, "Prng detection: " _GREEN_(WEAK));
-		else if (res == 0 )
-			PrintAndLogEx(SUCCESS, "Prng detection: " _YELLOW_(HARD));
-		else
-			PrintAndLogEx(FAILED, "prng detection:  " _RED_(failed));
+    if (isMifareClassic) {
+        int res = detect_classic_prng();
+        if ( res == 1 )
+            PrintAndLogEx(SUCCESS, "Prng detection: " _GREEN_(WEAK));
+        else if (res == 0 )
+            PrintAndLogEx(SUCCESS, "Prng detection: " _YELLOW_(HARD));
+        else
+            PrintAndLogEx(FAILED, "prng detection:  " _RED_(failed));
 
-		if ( do_nack_test )
-			detect_classic_nackbug(silent);
-	}
+        if ( do_nack_test )
+            detect_classic_nackbug(silent);
+    }
 
-	return select_status;
+    return select_status;
 }
 
 // Collect ISO14443 Type A UIDs
 int CmdHF14ACUIDs(const char *Cmd) {
-	// requested number of UIDs
-	int n = atoi(Cmd);
-	// collect at least 1 (e.g. if no parameter was given)
-	n = n > 0 ? n : 1;
+    // requested number of UIDs
+    int n = atoi(Cmd);
+    // collect at least 1 (e.g. if no parameter was given)
+    n = n > 0 ? n : 1;
 
-	uint64_t t1 =  msclock();
-	PrintAndLogEx(SUCCESS, "collecting %d UIDs", n);
+    uint64_t t1 =  msclock();
+    PrintAndLogEx(SUCCESS, "collecting %d UIDs", n);
 
-	// repeat n times
-	for (int i = 0; i < n; i++) {
+    // repeat n times
+    for (int i = 0; i < n; i++) {
 
-		if (ukbhit()) {
-			int gc = getchar(); (void)gc;
-			PrintAndLogEx(WARNING, "\n[!] aborted via keyboard!\n");
-			break;
-		}
+        if (ukbhit()) {
+            int gc = getchar(); (void)gc;
+            PrintAndLogEx(WARNING, "\n[!] aborted via keyboard!\n");
+            break;
+        }
 
-		// execute anticollision procedure
-		UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0}};
-		SendCommand(&c);
+        // execute anticollision procedure
+        UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0}};
+        SendCommand(&c);
 
-		UsbCommand resp;
-		WaitForResponse(CMD_ACK,&resp);
+        UsbCommand resp;
+        WaitForResponse(CMD_ACK,&resp);
 
-		iso14a_card_select_t *card = (iso14a_card_select_t *) resp.d.asBytes;
+        iso14a_card_select_t *card = (iso14a_card_select_t *) resp.d.asBytes;
 
-		// check if command failed
-		if (resp.arg[0] == 0) {
-			PrintAndLogEx(WARNING, "card select failed.");
-		} else {
-			char uid_string[20];
-			for (uint16_t i = 0; i < card->uidlen; i++) {
-				sprintf(&uid_string[2*i], "%02X", card->uid[i]);
-			}
-			PrintAndLogEx(NORMAL, "%s", uid_string);
-		}
-	}
-	PrintAndLogEx(SUCCESS, "end: %" PRIu64 " seconds", (msclock()-t1)/1000);
-	return 1;
+        // check if command failed
+        if (resp.arg[0] == 0) {
+            PrintAndLogEx(WARNING, "card select failed.");
+        } else {
+            char uid_string[20];
+            for (uint16_t i = 0; i < card->uidlen; i++) {
+                sprintf(&uid_string[2*i], "%02X", card->uid[i]);
+            }
+            PrintAndLogEx(NORMAL, "%s", uid_string);
+        }
+    }
+    PrintAndLogEx(SUCCESS, "end: %" PRIu64 " seconds", (msclock()-t1)/1000);
+    return 1;
 }
 
 // ## simulate iso14443a tag
 int CmdHF14ASim(const char *Cmd) {
-	bool errors = false;
-	uint8_t flags = 0;
-	uint8_t tagtype = 1;
-	uint8_t cmdp = 0;
-	uint8_t uid[10] = {0,0,0,0,0,0,0,0,0,0};
-	int uidlen = 0;
-	bool useUIDfromEML = true;
-	bool setEmulatorMem = false;
-	bool verbose = false;
-	nonces_t data[1];
+    bool errors = false;
+    uint8_t flags = 0;
+    uint8_t tagtype = 1;
+    uint8_t cmdp = 0;
+    uint8_t uid[10] = {0,0,0,0,0,0,0,0,0,0};
+    int uidlen = 0;
+    bool useUIDfromEML = true;
+    bool setEmulatorMem = false;
+    bool verbose = false;
+    nonces_t data[1];
 
-	while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch(param_getchar(Cmd, cmdp)) {
-			case 'h':
-			case 'H':
-				return usage_hf_14a_sim();
-			case 't':
-			case 'T':
-				// Retrieve the tag type
-				tagtype = param_get8ex(Cmd, cmdp+1, 0, 10);
-				if (tagtype == 0)
-					errors = true;
-				cmdp += 2;
-				break;
-			case 'u':
-			case 'U':
-				// Retrieve the full 4,7,10 byte long uid
-				param_gethex_ex(Cmd, cmdp+1, uid, &uidlen);
-				switch(uidlen) {
-					//case 20: flags |= FLAG_10B_UID_IN_DATA; break;
-					case 14: flags |= FLAG_7B_UID_IN_DATA; break;
-					case  8: flags |= FLAG_4B_UID_IN_DATA; break;
-					default: errors = true;	break;
-				}
-				if (!errors) {
-					PrintAndLogEx(SUCCESS, "Emulating ISO/IEC 14443 type A tag with %d byte UID (%s)", uidlen>>1, sprint_hex(uid, uidlen>>1));
-					useUIDfromEML = false;
-				}
-				cmdp += 2;
-				break;
-			case 'v':
-			case 'V':
-				verbose = true;
-				cmdp++;
-				break;
-			case 'x':
-			case 'X':
-				flags |= FLAG_NR_AR_ATTACK;
-				cmdp++;
-				break;
-			case 'e':
-			case 'E':
-				setEmulatorMem = true;
-				cmdp++;
-				break;
-			default:
-				PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-				errors = true;
-				break;
-			}
-	}
+    while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch(param_getchar(Cmd, cmdp)) {
+            case 'h':
+            case 'H':
+                return usage_hf_14a_sim();
+            case 't':
+            case 'T':
+                // Retrieve the tag type
+                tagtype = param_get8ex(Cmd, cmdp+1, 0, 10);
+                if (tagtype == 0)
+                    errors = true;
+                cmdp += 2;
+                break;
+            case 'u':
+            case 'U':
+                // Retrieve the full 4,7,10 byte long uid
+                param_gethex_ex(Cmd, cmdp+1, uid, &uidlen);
+                switch(uidlen) {
+                    //case 20: flags |= FLAG_10B_UID_IN_DATA; break;
+                    case 14: flags |= FLAG_7B_UID_IN_DATA; break;
+                    case  8: flags |= FLAG_4B_UID_IN_DATA; break;
+                    default: errors = true; break;
+                }
+                if (!errors) {
+                    PrintAndLogEx(SUCCESS, "Emulating ISO/IEC 14443 type A tag with %d byte UID (%s)", uidlen>>1, sprint_hex(uid, uidlen>>1));
+                    useUIDfromEML = false;
+                }
+                cmdp += 2;
+                break;
+            case 'v':
+            case 'V':
+                verbose = true;
+                cmdp++;
+                break;
+            case 'x':
+            case 'X':
+                flags |= FLAG_NR_AR_ATTACK;
+                cmdp++;
+                break;
+            case 'e':
+            case 'E':
+                setEmulatorMem = true;
+                cmdp++;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                errors = true;
+                break;
+            }
+    }
 
-	//Validations
-	if (errors || cmdp == 0) return usage_hf_14a_sim();
+    //Validations
+    if (errors || cmdp == 0) return usage_hf_14a_sim();
 
-	if ( useUIDfromEML )
-		flags |= FLAG_UID_IN_EMUL;
+    if ( useUIDfromEML )
+        flags |= FLAG_UID_IN_EMUL;
 
-	UsbCommand c = {CMD_SIMULATE_TAG_ISO_14443a,{ tagtype, flags, 0 }};
-	memcpy(c.d.asBytes, uid, uidlen>>1);
-	clearCommandBuffer();
-	SendCommand(&c);
-	UsbCommand resp;
+    UsbCommand c = {CMD_SIMULATE_TAG_ISO_14443a,{ tagtype, flags, 0 }};
+    memcpy(c.d.asBytes, uid, uidlen>>1);
+    clearCommandBuffer();
+    SendCommand(&c);
+    UsbCommand resp;
 
-	PrintAndLogEx(SUCCESS, "press pm3-button to abort simulation");
+    PrintAndLogEx(SUCCESS, "press pm3-button to abort simulation");
 
-	while( !ukbhit() ){
-		if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500) ) continue;
-		if ( !(flags & FLAG_NR_AR_ATTACK) ) break;
-		if ( (resp.arg[0] & 0xffff) != CMD_SIMULATE_MIFARE_CARD ) break;
+    while( !ukbhit() ){
+        if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500) ) continue;
+        if ( !(flags & FLAG_NR_AR_ATTACK) ) break;
+        if ( (resp.arg[0] & 0xffff) != CMD_SIMULATE_MIFARE_CARD ) break;
 
-		memcpy(data, resp.d.asBytes, sizeof(data) );
-		readerAttack(data[0], setEmulatorMem, verbose);
-	}
-	showSectorTable();
-	return 0;
+        memcpy(data, resp.d.asBytes, sizeof(data) );
+        readerAttack(data[0], setEmulatorMem, verbose);
+    }
+    showSectorTable();
+    return 0;
 }
 
 int CmdHF14ASniff(const char *Cmd) {
-	int param = 0;
-	uint8_t ctmp;
-	for (int i = 0; i < 2; i++) {
-		ctmp = tolower(param_getchar(Cmd, i));
-		if (ctmp == 'h') return usage_hf_14a_sniff();
-		if (ctmp == 'c') param |= 0x01;
-		if (ctmp == 'r') param |= 0x02;
-	}
-	UsbCommand c = {CMD_SNOOP_ISO_14443a, {param, 0, 0}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+    int param = 0;
+    uint8_t ctmp;
+    for (int i = 0; i < 2; i++) {
+        ctmp = tolower(param_getchar(Cmd, i));
+        if (ctmp == 'h') return usage_hf_14a_sniff();
+        if (ctmp == 'c') param |= 0x01;
+        if (ctmp == 'r') param |= 0x02;
+    }
+    UsbCommand c = {CMD_SNOOP_ISO_14443a, {param, 0, 0}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 
 int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
-	static bool responseNum = false;
-	uint16_t cmdc = 0;
-	*dataoutlen = 0;
+    static bool responseNum = false;
+    uint16_t cmdc = 0;
+    *dataoutlen = 0;
 
-	if (activateField) {
-		responseNum = false;
-		UsbCommand resp;
+    if (activateField) {
+        responseNum = false;
+        UsbCommand resp;
 
-		// Anticollision + SELECT card
-		UsbCommand ca = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};
-		SendCommand(&ca);
-		if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-			PrintAndLogEx(ERR, "Proxmark connection timeout.");
-			return 1;
-		}
+        // Anticollision + SELECT card
+        UsbCommand ca = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};
+        SendCommand(&ca);
+        if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
+            PrintAndLogEx(ERR, "Proxmark connection timeout.");
+            return 1;
+        }
 
-		// check result
-		if (resp.arg[0] == 0) {
-			PrintAndLogEx(ERR, "No card in field.");
-			return 1;
-		}
+        // check result
+        if (resp.arg[0] == 0) {
+            PrintAndLogEx(ERR, "No card in field.");
+            return 1;
+        }
 
-		if (resp.arg[0] != 1 && resp.arg[0] != 2) {
-			PrintAndLogEx(ERR, "Card not in iso14443-4. res=%d.", resp.arg[0]);
-			return 1;
-		}
+        if (resp.arg[0] != 1 && resp.arg[0] != 2) {
+            PrintAndLogEx(ERR, "Card not in iso14443-4. res=%d.", resp.arg[0]);
+            return 1;
+        }
 
-		if (resp.arg[0] == 2) {		// 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
-			// get ATS
-			UsbCommand cr = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT, 2, 0}};
-			uint8_t rats[] = { 0xE0, 0x80 }; // FSDI=8 (FSD=256), CID=0
-			memcpy(cr.d.asBytes, rats, 2);
-			SendCommand(&cr);
-			if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-				PrintAndLogEx(ERR, "Proxmark connection timeout.");
-				return 1;
-			}
+        if (resp.arg[0] == 2) { // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
+            // get ATS
+            UsbCommand cr = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT, 2, 0}};
+            uint8_t rats[] = { 0xE0, 0x80 }; // FSDI=8 (FSD=256), CID=0
+            memcpy(cr.d.asBytes, rats, 2);
+            SendCommand(&cr);
+            if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
+                PrintAndLogEx(ERR, "Proxmark connection timeout.");
+                return 1;
+            }
 
-			if (resp.arg[0] <= 0) { // ats_len
-				PrintAndLogEx(ERR, "Can't get ATS.");
-				return 1;
-			}
-		}
-	}
+            if (resp.arg[0] <= 0) { // ats_len
+                PrintAndLogEx(ERR, "Can't get ATS.");
+                return 1;
+            }
+        }
+    }
 
-	if (leaveSignalON)
-		cmdc |= ISO14A_NO_DISCONNECT;
+    if (leaveSignalON)
+        cmdc |= ISO14A_NO_DISCONNECT;
 
-	UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_APPEND_CRC | cmdc, (datainlen & 0xFFFF) + 2, 0}};
-	uint8_t header[] = {0x0a | responseNum, 0x00};
-	responseNum ^= 1;
-	memcpy(c.d.asBytes, header, 2);
-	memcpy(&c.d.asBytes[2], datain, datainlen);
-	SendCommand(&c);
+    UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_APPEND_CRC | cmdc, (datainlen & 0xFFFF) + 2, 0}};
+    uint8_t header[] = {0x0a | responseNum, 0x00};
+    responseNum ^= 1;
+    memcpy(c.d.asBytes, header, 2);
+    memcpy(&c.d.asBytes[2], datain, datainlen);
+    SendCommand(&c);
 
     uint8_t *recv;
     UsbCommand resp;
@@ -804,132 +804,132 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
         int iLen = resp.arg[0];
 
         if(!iLen) {
-			PrintAndLogEx(ERR, "No card response.");
+            PrintAndLogEx(ERR, "No card response.");
             return 1;
-		}
+        }
 
-		*dataoutlen = iLen - 2;
-		if (*dataoutlen < 0)
-			*dataoutlen = 0;
+        *dataoutlen = iLen - 2;
+        if (*dataoutlen < 0)
+            *dataoutlen = 0;
 
-		if (maxdataoutlen && *dataoutlen > maxdataoutlen) {
-			PrintAndLogEx(ERR, "Buffer too small(%d). Needs %d bytes", *dataoutlen, maxdataoutlen);
-			return 2;
-		}
+        if (maxdataoutlen && *dataoutlen > maxdataoutlen) {
+            PrintAndLogEx(ERR, "Buffer too small(%d). Needs %d bytes", *dataoutlen, maxdataoutlen);
+            return 2;
+        }
 
-		if (recv[0] != header[0]) {
-			PrintAndLogEx(ERR, "iso14443-4 framing error. Card send %2x must be %2x", dataout[0], header[0]);
-			return 2;
-		}
+        if (recv[0] != header[0]) {
+            PrintAndLogEx(ERR, "iso14443-4 framing error. Card send %2x must be %2x", dataout[0], header[0]);
+            return 2;
+        }
 
-		memcpy(dataout, &recv[2], *dataoutlen);
+        memcpy(dataout, &recv[2], *dataoutlen);
 
-		// CRC Check
-		if (iLen == -1) {
-			PrintAndLogEx(ERR, "ISO 14443A CRC error.");
-			return 3;
-		}
+        // CRC Check
+        if (iLen == -1) {
+            PrintAndLogEx(ERR, "ISO 14443A CRC error.");
+            return 3;
+        }
 
 
     } else {
         PrintAndLogEx(ERR, "Reply timeout.");
-		return 4;
+        return 4;
     }
 
-	return 0;
+    return 0;
 }
 
 int SelectCard14443_4(bool disconnect, iso14a_card_select_t *card) {
     UsbCommand resp;
 
-	frameLength = 0;
+    frameLength = 0;
 
-	if (card)
-		memset(card, 0, sizeof(iso14a_card_select_t));
+    if (card)
+        memset(card, 0, sizeof(iso14a_card_select_t));
 
-	DropField();
+    DropField();
 
-	// Anticollision + SELECT card
-	UsbCommand ca = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};
-	SendCommand(&ca);
-	if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-		PrintAndLogEx(ERR, "Proxmark connection timeout.");
-		return 1;
-	}
+    // Anticollision + SELECT card
+    UsbCommand ca = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};
+    SendCommand(&ca);
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
+        PrintAndLogEx(ERR, "Proxmark connection timeout.");
+        return 1;
+    }
 
-	// check result
-	if (resp.arg[0] == 0) {
-		PrintAndLogEx(ERR, "No card in field.");
-		return 1;
-	}
+    // check result
+    if (resp.arg[0] == 0) {
+        PrintAndLogEx(ERR, "No card in field.");
+        return 1;
+    }
 
-	if (resp.arg[0] != 1 && resp.arg[0] != 2) {
-		PrintAndLogEx(ERR, "Card not in iso14443-4. res=%d.", resp.arg[0]);
-		return 1;
-	}
+    if (resp.arg[0] != 1 && resp.arg[0] != 2) {
+        PrintAndLogEx(ERR, "Card not in iso14443-4. res=%d.", resp.arg[0]);
+        return 1;
+    }
 
-	if (resp.arg[0] == 2) {		// 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
-		// get ATS
-		UsbCommand cr = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT, 2, 0}};
-		uint8_t rats[] = { 0xE0, 0x80 }; // FSDI=8 (FSD=256), CID=0
-		memcpy(cr.d.asBytes, rats, 2);
-		SendCommand(&cr);
-		if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-			PrintAndLogEx(ERR, "Proxmark connection timeout.");
-			return 1;
-		}
+    if (resp.arg[0] == 2) { // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
+        // get ATS
+        UsbCommand cr = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT, 2, 0}};
+        uint8_t rats[] = { 0xE0, 0x80 }; // FSDI=8 (FSD=256), CID=0
+        memcpy(cr.d.asBytes, rats, 2);
+        SendCommand(&cr);
+        if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
+            PrintAndLogEx(ERR, "Proxmark connection timeout.");
+            return 1;
+        }
 
-		if (resp.arg[0] <= 0) { // ats_len
-			PrintAndLogEx(ERR, "Can't get ATS.");
-			return 1;
-		}
+        if (resp.arg[0] <= 0) { // ats_len
+            PrintAndLogEx(ERR, "Can't get ATS.");
+            return 1;
+        }
 
-		// get frame length from ATS in data field
-		if (resp.arg[0] > 1) {
-			uint8_t fsci = resp.d.asBytes[1] & 0x0f;
-			if (fsci < sizeof(atsFSC))
-				frameLength = atsFSC[fsci];
-		}
-	} else {
-		// get frame length from ATS in card data structure
-		iso14a_card_select_t *vcard = (iso14a_card_select_t *) resp.d.asBytes;
-		if (vcard->ats_len > 1) {
-			uint8_t fsci = vcard->ats[1] & 0x0f;
-			if (fsci < sizeof(atsFSC))
-				frameLength = atsFSC[fsci];
-		}
+        // get frame length from ATS in data field
+        if (resp.arg[0] > 1) {
+            uint8_t fsci = resp.d.asBytes[1] & 0x0f;
+            if (fsci < sizeof(atsFSC))
+                frameLength = atsFSC[fsci];
+        }
+    } else {
+        // get frame length from ATS in card data structure
+        iso14a_card_select_t *vcard = (iso14a_card_select_t *) resp.d.asBytes;
+        if (vcard->ats_len > 1) {
+            uint8_t fsci = vcard->ats[1] & 0x0f;
+            if (fsci < sizeof(atsFSC))
+                frameLength = atsFSC[fsci];
+        }
 
-		if (card)
-			memcpy(card, vcard, sizeof(iso14a_card_select_t));
-	}
+        if (card)
+            memcpy(card, vcard, sizeof(iso14a_card_select_t));
+    }
 
-	if (disconnect)
-		DropField();
+    if (disconnect)
+        DropField();
 
-	return 0;
+    return 0;
 }
 
 int CmdExchangeAPDU(bool chainingin, uint8_t *datain, int datainlen, bool activateField, uint8_t *dataout, int maxdataoutlen, int *dataoutlen, bool *chainingout) {
-	*chainingout = false;
+    *chainingout = false;
 
-	if (activateField) {
-		// select with no disconnect and set frameLength
-		int selres = SelectCard14443_4(false, NULL);
-		if (selres)
-			return selres;
-	}
+    if (activateField) {
+        // select with no disconnect and set frameLength
+        int selres = SelectCard14443_4(false, NULL);
+        if (selres)
+            return selres;
+    }
 
-	uint16_t cmdc = 0;
-	if (chainingin)
-		cmdc = ISO14A_SEND_CHAINING;
+    uint16_t cmdc = 0;
+    if (chainingin)
+        cmdc = ISO14A_SEND_CHAINING;
 
-	// "Command APDU" length should be 5+255+1, but javacard's APDU buffer might be smaller - 133 bytes
-	// https://stackoverflow.com/questions/32994936/safe-max-java-card-apdu-data-command-and-respond-size
-	// here length USB_CMD_DATA_SIZE=512
-	// timeout must be authomatically set by "get ATS"
-	UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_APDU | ISO14A_NO_DISCONNECT | cmdc, (datainlen & 0xFFFF), 0}};
-	memcpy(c.d.asBytes, datain, datainlen);
-	SendCommand(&c);
+    // "Command APDU" length should be 5+255+1, but javacard's APDU buffer might be smaller - 133 bytes
+    // https://stackoverflow.com/questions/32994936/safe-max-java-card-apdu-data-command-and-respond-size
+    // here length USB_CMD_DATA_SIZE=512
+    // timeout must be authomatically set by "get ATS"
+    UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_APDU | ISO14A_NO_DISCONNECT | cmdc, (datainlen & 0xFFFF), 0}};
+    memcpy(c.d.asBytes, datain, datainlen);
+    SendCommand(&c);
 
     uint8_t *recv;
     UsbCommand resp;
@@ -937,177 +937,177 @@ int CmdExchangeAPDU(bool chainingin, uint8_t *datain, int datainlen, bool activa
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         recv = resp.d.asBytes;
         int iLen = resp.arg[0];
-		uint8_t res = resp.arg[1];
+        uint8_t res = resp.arg[1];
 
-		int dlen = iLen - 2;
-		if (dlen < 0)
-			dlen = 0;
-		*dataoutlen += dlen;
+        int dlen = iLen - 2;
+        if (dlen < 0)
+            dlen = 0;
+        *dataoutlen += dlen;
 
-		if (maxdataoutlen && *dataoutlen > maxdataoutlen) {
-			PrintAndLogEx(ERR, "APDU: Buffer too small(%d). Needs %d bytes", *dataoutlen, maxdataoutlen);
-			return 2;
-		}
+        if (maxdataoutlen && *dataoutlen > maxdataoutlen) {
+            PrintAndLogEx(ERR, "APDU: Buffer too small(%d). Needs %d bytes", *dataoutlen, maxdataoutlen);
+            return 2;
+        }
 
-		// I-block ACK
-		if ((res & 0xf2) == 0xa2) {
-			*dataoutlen = 0;
-			*chainingout = true;
-			return 0;
-		}
+        // I-block ACK
+        if ((res & 0xf2) == 0xa2) {
+            *dataoutlen = 0;
+            *chainingout = true;
+            return 0;
+        }
 
         if(!iLen) {
-			PrintAndLogEx(ERR, "APDU: No APDU response.");
+            PrintAndLogEx(ERR, "APDU: No APDU response.");
             return 1;
-		}
+        }
 
-		// check apdu length
-		if (iLen < 2 && iLen >= 0) {
-			PrintAndLogEx(ERR, "APDU: Small APDU response. Len=%d", iLen);
-			return 2;
-		}
+        // check apdu length
+        if (iLen < 2 && iLen >= 0) {
+            PrintAndLogEx(ERR, "APDU: Small APDU response. Len=%d", iLen);
+            return 2;
+        }
 
-		// check block TODO
-		if (iLen == -2) {
-			PrintAndLogEx(ERR, "APDU: Block type mismatch.");
-			return 2;
-		}
+        // check block TODO
+        if (iLen == -2) {
+            PrintAndLogEx(ERR, "APDU: Block type mismatch.");
+            return 2;
+        }
 
-		memcpy(dataout, recv, dlen);
+        memcpy(dataout, recv, dlen);
 
-		// chaining
-		if ((res & 0x10) != 0) {
-			*chainingout = true;
-		}
+        // chaining
+        if ((res & 0x10) != 0) {
+            *chainingout = true;
+        }
 
-		// CRC Check
-		if (iLen == -1) {
-			PrintAndLogEx(ERR, "APDU: ISO 14443A CRC error.");
-			return 3;
-		}
+        // CRC Check
+        if (iLen == -1) {
+            PrintAndLogEx(ERR, "APDU: ISO 14443A CRC error.");
+            return 3;
+        }
     } else {
         PrintAndLogEx(ERR, "APDU: Reply timeout.");
-		return 4;
+        return 4;
     }
 
-	return 0;
+    return 0;
 }
 
 int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
-	*dataoutlen = 0;
-	bool chaining = false;
-	int res;
+    *dataoutlen = 0;
+    bool chaining = false;
+    int res;
 
-	// 3 byte here - 1b framing header, 2b crc16
-	if (APDUInFramingEnable &&
-		( (frameLength && (datainlen > frameLength - 3)) || (datainlen > USB_CMD_DATA_SIZE - 3)) ) {
-		int clen = 0;
+    // 3 byte here - 1b framing header, 2b crc16
+    if (APDUInFramingEnable &&
+        ( (frameLength && (datainlen > frameLength - 3)) || (datainlen > USB_CMD_DATA_SIZE - 3)) ) {
+        int clen = 0;
 
-		bool vActivateField = activateField;
+        bool vActivateField = activateField;
 
-		do {
-			int vlen = MIN(frameLength - 3, datainlen - clen);
-			bool chainBlockNotLast = ((clen + vlen) < datainlen);
+        do {
+            int vlen = MIN(frameLength - 3, datainlen - clen);
+            bool chainBlockNotLast = ((clen + vlen) < datainlen);
 
-			*dataoutlen = 0;
-			res = CmdExchangeAPDU(chainBlockNotLast, &datain[clen], vlen, vActivateField, dataout, maxdataoutlen, dataoutlen, &chaining);
-			if (res) {
-				if (!leaveSignalON)
-					DropField();
+            *dataoutlen = 0;
+            res = CmdExchangeAPDU(chainBlockNotLast, &datain[clen], vlen, vActivateField, dataout, maxdataoutlen, dataoutlen, &chaining);
+            if (res) {
+                if (!leaveSignalON)
+                    DropField();
 
-				return 200;
-			}
+                return 200;
+            }
 
-			// check R-block ACK
-			if ((*dataoutlen == 0) && (*dataoutlen != 0 || chaining != chainBlockNotLast)) {
-				if (!leaveSignalON)
-					DropField();
+            // check R-block ACK
+            if ((*dataoutlen == 0) && (*dataoutlen != 0 || chaining != chainBlockNotLast)) {
+                if (!leaveSignalON)
+                    DropField();
 
-				return 201;
-			}
+                return 201;
+            }
 
-			clen += vlen;
-			vActivateField = false;
-			if (*dataoutlen) {
-				if (clen != datainlen)
-					PrintAndLogEx(WARNING, "APDU: I-block/R-block sequence error. Data len=%d, Sent=%d, Last packet len=%d", datainlen, clen, *dataoutlen);
-				break;
-			}
-		} while (clen < datainlen);
-	} else {
-		res = CmdExchangeAPDU(false, datain, datainlen, activateField, dataout, maxdataoutlen, dataoutlen, &chaining);
-		if (res) {
-			if (!leaveSignalON)
-				DropField();
+            clen += vlen;
+            vActivateField = false;
+            if (*dataoutlen) {
+                if (clen != datainlen)
+                    PrintAndLogEx(WARNING, "APDU: I-block/R-block sequence error. Data len=%d, Sent=%d, Last packet len=%d", datainlen, clen, *dataoutlen);
+                break;
+            }
+        } while (clen < datainlen);
+    } else {
+        res = CmdExchangeAPDU(false, datain, datainlen, activateField, dataout, maxdataoutlen, dataoutlen, &chaining);
+        if (res) {
+            if (!leaveSignalON)
+                DropField();
 
-			return res;
-		}
-	}
+            return res;
+        }
+    }
 
-	while (chaining) {
-		// I-block with chaining
-		res = CmdExchangeAPDU(false, NULL, 0, false, &dataout[*dataoutlen], maxdataoutlen, dataoutlen, &chaining);
+    while (chaining) {
+        // I-block with chaining
+        res = CmdExchangeAPDU(false, NULL, 0, false, &dataout[*dataoutlen], maxdataoutlen, dataoutlen, &chaining);
 
-		if (res) {
-			if (!leaveSignalON)
-				DropField();
+        if (res) {
+            if (!leaveSignalON)
+                DropField();
 
-			return 100;
-		}
-	}
+            return 100;
+        }
+    }
 
-	if (!leaveSignalON)
-		DropField();
+    if (!leaveSignalON)
+        DropField();
 
-	return 0;
+    return 0;
 }
 
 // ISO14443-4. 7. Half-duplex block transmission protocol
 int CmdHF14AAPDU(const char *cmd) {
-	uint8_t data[USB_CMD_DATA_SIZE];
-	int datalen = 0;
-	bool activateField = false;
-	bool leaveSignalON = false;
-	bool decodeTLV = false;
+    uint8_t data[USB_CMD_DATA_SIZE];
+    int datalen = 0;
+    bool activateField = false;
+    bool leaveSignalON = false;
+    bool decodeTLV = false;
 
-	CLIParserInit("hf 14a apdu",
-		"Sends an ISO 7816-4 APDU via ISO 14443-4 block transmission protocol (T=CL)",
-		"Sample:\n\thf 14a apdu -st 00A404000E325041592E5359532E444446303100\n");
+    CLIParserInit("hf 14a apdu",
+        "Sends an ISO 7816-4 APDU via ISO 14443-4 block transmission protocol (T=CL)",
+        "Sample:\n\thf 14a apdu -st 00A404000E325041592E5359532E444446303100\n");
 
-	void* argtable[] = {
-		arg_param_begin,
-		arg_lit0("sS",  "select",  "activate field and select card"),
-		arg_lit0("kK",  "keep",    "leave the signal field ON after receive response"),
-		arg_lit0("tT",  "tlv",     "executes TLV decoder if it possible"),
-		arg_strx1(NULL, NULL,      "<APDU (hex)>", NULL),
-		arg_param_end
-	};
-	CLIExecWithReturn(cmd, argtable, false);
+    void* argtable[] = {
+        arg_param_begin,
+        arg_lit0("sS",  "select",  "activate field and select card"),
+        arg_lit0("kK",  "keep",    "leave the signal field ON after receive response"),
+        arg_lit0("tT",  "tlv",     "executes TLV decoder if it possible"),
+        arg_strx1(NULL, NULL,      "<APDU (hex)>", NULL),
+        arg_param_end
+    };
+    CLIExecWithReturn(cmd, argtable, false);
 
-	activateField = arg_get_lit(1);
-	leaveSignalON = arg_get_lit(2);
-	decodeTLV = arg_get_lit(3);
-			// len = data + PCB(1b) + CRC(2b)
-	CLIGetHexBLessWithReturn(4, data, &datalen, 1 + 2);
+    activateField = arg_get_lit(1);
+    leaveSignalON = arg_get_lit(2);
+    decodeTLV = arg_get_lit(3);
+            // len = data + PCB(1b) + CRC(2b)
+    CLIGetHexBLessWithReturn(4, data, &datalen, 1 + 2);
 
 CLIParserFree();
-	PrintAndLogEx(NORMAL, ">>>>[%s%s%s] %s", activateField ? "sel ": "", leaveSignalON ? "keep ": "", decodeTLV ? "TLV": "", sprint_hex(data, datalen));
+    PrintAndLogEx(NORMAL, ">>>>[%s%s%s] %s", activateField ? "sel ": "", leaveSignalON ? "keep ": "", decodeTLV ? "TLV": "", sprint_hex(data, datalen));
 
-	int res = ExchangeAPDU14a(data, datalen, activateField, leaveSignalON, data, USB_CMD_DATA_SIZE, &datalen);
+    int res = ExchangeAPDU14a(data, datalen, activateField, leaveSignalON, data, USB_CMD_DATA_SIZE, &datalen);
 
-	if (res)
-		return res;
+    if (res)
+        return res;
 
-	PrintAndLogEx(NORMAL, "<<<< %s", sprint_hex(data, datalen));
+    PrintAndLogEx(NORMAL, "<<<< %s", sprint_hex(data, datalen));
 
-	PrintAndLogEx(SUCCESS, "APDU response: %02x %02x - %s", data[datalen - 2], data[datalen - 1], GetAPDUCodeDescription(data[datalen - 2], data[datalen - 1]));
+    PrintAndLogEx(SUCCESS, "APDU response: %02x %02x - %s", data[datalen - 2], data[datalen - 1], GetAPDUCodeDescription(data[datalen - 2], data[datalen - 1]));
 
-	// TLV decoder
-	if (decodeTLV && datalen > 4) {
-		TLVPrintFromBuffer(data, datalen - 2);
-	}
+    // TLV decoder
+    if (decodeTLV && datalen > 4) {
+        TLVPrintFromBuffer(data, datalen - 2);
+    }
 
-	return 0;
+    return 0;
 }
 
 int CmdHF14ACmdRaw(const char *cmd) {
@@ -1117,16 +1117,16 @@ int CmdHF14ACmdRaw(const char *cmd) {
     bool power = false;
     bool active = false;
     bool active_select = false;
-	bool no_rats = false;
+    bool no_rats = false;
     uint16_t numbits = 0;
-	bool bTimeout = false;
-	uint32_t timeout = 0;
-	bool topazmode = false;
+    bool bTimeout = false;
+    uint32_t timeout = 0;
+    bool topazmode = false;
     char buf[5]="";
     int i = 0;
     uint8_t data[USB_CMD_DATA_SIZE];
-	uint16_t datalen = 0;
-	uint32_t temp;
+    uint16_t datalen = 0;
+    uint32_t temp;
 
     if (strlen(cmd) < 2) return usage_hf_14a_raw();
 
@@ -1137,9 +1137,9 @@ int CmdHF14ACmdRaw(const char *cmd) {
         if (cmd[i]==' ' || cmd[i]=='\t') { i++; continue; }
         if (cmd[i]=='-') {
             switch (cmd[i+1]) {
-				case 'H':
-				case 'h':
-					return usage_hf_14a_raw();
+                case 'H':
+                case 'h':
+                    return usage_hf_14a_raw();
                 case 'r':
                     reply = false;
                     break;
@@ -1162,20 +1162,20 @@ int CmdHF14ACmdRaw(const char *cmd) {
                     while(cmd[i]!=' ' && cmd[i]!='\0') { i++; }
                     i-=2;
                     break;
-				case 't':
-					bTimeout = true;
-					sscanf(cmd+i+2, "%d", &temp);
-					timeout = temp;
-					i+=3;
-					while(cmd[i]!=' ' && cmd[i]!='\0') { i++; }
-					i-=2;
-					break;
+                case 't':
+                    bTimeout = true;
+                    sscanf(cmd+i+2, "%d", &temp);
+                    timeout = temp;
+                    i+=3;
+                    while(cmd[i]!=' ' && cmd[i]!='\0') { i++; }
+                    i-=2;
+                    break;
                 case 'T':
-					topazmode = true;
-					break;
-				case '3':
-					no_rats = true;
-					break;
+                    topazmode = true;
+                    break;
+                case '3':
+                    no_rats = true;
+                    break;
                 default:
                     return usage_hf_14a_raw();
             }
@@ -1193,11 +1193,11 @@ int CmdHF14ACmdRaw(const char *cmd) {
                 sscanf(buf, "%x", &temp);
                 data[datalen] = (uint8_t)(temp & 0xff);
                 *buf = 0;
-				if (++datalen >= sizeof(data)){
-					if (crc)
-						PrintAndLogEx(NORMAL, "Buffer is full, we can't add CRC to your data");
-					break;
-				}
+                if (++datalen >= sizeof(data)){
+                    if (crc)
+                        PrintAndLogEx(NORMAL, "Buffer is full, we can't add CRC to your data");
+                    break;
+                }
             }
             continue;
         }
@@ -1207,11 +1207,11 @@ int CmdHF14ACmdRaw(const char *cmd) {
 
     if (crc && datalen > 0 && datalen < sizeof(data)-2) {
         uint8_t first, second;
-		if (topazmode) {
-			compute_crc(CRC_14443_B, data, datalen, &first, &second);
-		} else {
-			compute_crc(CRC_14443_A, data, datalen, &first, &second);
-		}
+        if (topazmode) {
+            compute_crc(CRC_14443_B, data, datalen, &first, &second);
+        } else {
+            compute_crc(CRC_14443_A, data, datalen, &first, &second);
+        }
         data[datalen++] = first;
         data[datalen++] = second;
     }
@@ -1222,45 +1222,45 @@ int CmdHF14ACmdRaw(const char *cmd) {
             c.arg[0] |= ISO14A_NO_SELECT;
     }
 
-	if (bTimeout){
-	    #define MAX_TIMEOUT 40542464 	// = (2^32-1) * (8*16) / 13560000Hz * 1000ms/s
+    if (bTimeout){
+        #define MAX_TIMEOUT 40542464 // = (2^32-1) * (8*16) / 13560000Hz * 1000ms/s
         c.arg[0] |= ISO14A_SET_TIMEOUT;
         if(timeout > MAX_TIMEOUT) {
             timeout = MAX_TIMEOUT;
             PrintAndLogEx(NORMAL, "Set timeout to 40542 seconds (11.26 hours). The max we can wait for response");
         }
-		c.arg[2] = 13560000 / 1000 / (8*16) * timeout; // timeout in ETUs (time to transfer 1 bit, approx. 9.4 us)
-	}
+        c.arg[2] = 13560000 / 1000 / (8*16) * timeout; // timeout in ETUs (time to transfer 1 bit, approx. 9.4 us)
+    }
 
     if (power) {
         c.arg[0] |= ISO14A_NO_DISCONNECT;
-	}
+    }
 
     if (datalen > 0) {
         c.arg[0] |= ISO14A_RAW;
-	}
+    }
 
-	if (topazmode) {
-		c.arg[0] |= ISO14A_TOPAZMODE;
-	}
-	if (no_rats) {
-		c.arg[0] |= ISO14A_NO_RATS;
-	}
+    if (topazmode) {
+        c.arg[0] |= ISO14A_TOPAZMODE;
+    }
+    if (no_rats) {
+        c.arg[0] |= ISO14A_NO_RATS;
+    }
 
-	// Max buffer is USB_CMD_DATA_SIZE
-	datalen = (datalen > USB_CMD_DATA_SIZE) ? USB_CMD_DATA_SIZE : datalen;
+    // Max buffer is USB_CMD_DATA_SIZE
+    datalen = (datalen > USB_CMD_DATA_SIZE) ? USB_CMD_DATA_SIZE : datalen;
 
     c.arg[1] = (datalen & 0xFFFF) | ((uint32_t)(numbits << 16));
     memcpy(c.d.asBytes, data, datalen);
 
-	clearCommandBuffer();
+    clearCommandBuffer();
     SendCommand(&c);
 
     if (reply) {
-		int res = 0;
+        int res = 0;
         if (active_select)
-			res = waitCmd(1);
-		if (!res && datalen > 0)
+            res = waitCmd(1);
+        if (!res && datalen > 0)
             waitCmd(0);
     }
     return 0;
@@ -1271,108 +1271,108 @@ static int waitCmd(uint8_t iSelect) {
     uint16_t len = 0;
 
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-		len = (resp.arg[0] & 0xFFFF);
-		if (iSelect){
-			len = (resp.arg[1] & 0xFFFF);
-			if (len){
-				PrintAndLogEx(NORMAL, "Card selected. UID[%i]:", len);
-			} else {
-				PrintAndLogEx(WARNING, "Can't select card.");
-			}
-		} else {
-			PrintAndLogEx(NORMAL, "received %i bytes", len);
-		}
+        len = (resp.arg[0] & 0xFFFF);
+        if (iSelect){
+            len = (resp.arg[1] & 0xFFFF);
+            if (len){
+                PrintAndLogEx(NORMAL, "Card selected. UID[%i]:", len);
+            } else {
+                PrintAndLogEx(WARNING, "Can't select card.");
+            }
+        } else {
+            PrintAndLogEx(NORMAL, "received %i bytes", len);
+        }
 
         if (!len)
             return 1;
 
-		PrintAndLogEx(NORMAL, "%s", sprint_hex(resp.d.asBytes, len) );
+        PrintAndLogEx(NORMAL, "%s", sprint_hex(resp.d.asBytes, len) );
     } else {
         PrintAndLogEx(WARNING, "timeout while waiting for reply.");
-		return 3;
+        return 3;
     }
-	return 0;
+    return 0;
 }
 
 int CmdHF14AAntiFuzz(const char *cmd) {
 
-	CLIParserInit("hf 14a antifuzz",
-		"Tries to fuzz the ISO14443a anticollision phase",
-		"Usage:\n"
-		"\thf 14a antifuzz -4\n");
+    CLIParserInit("hf 14a antifuzz",
+        "Tries to fuzz the ISO14443a anticollision phase",
+        "Usage:\n"
+        "\thf 14a antifuzz -4\n");
 
-	void* argtable[] = {
-		arg_param_begin,
-		arg_lit0("4",   NULL,  "4 byte uid"),
-		arg_lit0("7",   NULL,  "7 byte uid"),
-		arg_lit0(NULL,  "10",  "10 byte uid"),
-		arg_param_end
-	};
-	CLIExecWithReturn(cmd, argtable, false);
+    void* argtable[] = {
+        arg_param_begin,
+        arg_lit0("4",   NULL,  "4 byte uid"),
+        arg_lit0("7",   NULL,  "7 byte uid"),
+        arg_lit0(NULL,  "10",  "10 byte uid"),
+        arg_param_end
+    };
+    CLIExecWithReturn(cmd, argtable, false);
 
-	uint8_t arg0 = FLAG_4B_UID_IN_DATA;
-	if (arg_get_lit(2))
-		arg0 = FLAG_7B_UID_IN_DATA;
-	if (arg_get_lit(3))
-		arg0 = FLAG_10B_UID_IN_DATA;
+    uint8_t arg0 = FLAG_4B_UID_IN_DATA;
+    if (arg_get_lit(2))
+        arg0 = FLAG_7B_UID_IN_DATA;
+    if (arg_get_lit(3))
+        arg0 = FLAG_10B_UID_IN_DATA;
 
-	CLIParserFree();
-	UsbCommand c = {CMD_ANTIFUZZ_ISO_14443a, {arg0, 0, 0}};
-	clearCommandBuffer();
+    CLIParserFree();
+    UsbCommand c = {CMD_ANTIFUZZ_ISO_14443a, {arg0, 0, 0}};
+    clearCommandBuffer();
     SendCommand(&c);
-	return 0;
+    return 0;
 }
 
 int CmdHF14AChaining(const char *cmd) {
 
-	CLIParserInit("hf 14a chaining",
-		"Enable/Disable ISO14443a input chaining. Maximum input length goes from ATS.",
-		"Usage:\n"
-		"\thf 14a chaining disable -> disable chaining\n"
-		"\thf 14a chaining         -> show chaining enable/disable state\n");
+    CLIParserInit("hf 14a chaining",
+        "Enable/Disable ISO14443a input chaining. Maximum input length goes from ATS.",
+        "Usage:\n"
+        "\thf 14a chaining disable -> disable chaining\n"
+        "\thf 14a chaining         -> show chaining enable/disable state\n");
 
-	void* argtable[] = {
-		arg_param_begin,
-		arg_str0(NULL, NULL,      "<enable/disable or 0/1>", NULL),
-		arg_param_end
-	};
-	CLIExecWithReturn(cmd, argtable, true);
+    void* argtable[] = {
+        arg_param_begin,
+        arg_str0(NULL, NULL,      "<enable/disable or 0/1>", NULL),
+        arg_param_end
+    };
+    CLIExecWithReturn(cmd, argtable, true);
 
-	struct arg_str *str = arg_get_str(1);
-	int len = arg_get_str_len(1);
+    struct arg_str *str = arg_get_str(1);
+    int len = arg_get_str_len(1);
 
-	if (len && (!strcmp(str->sval[0], "enable") || !strcmp(str->sval[0], "1")))
-		APDUInFramingEnable = true;
+    if (len && (!strcmp(str->sval[0], "enable") || !strcmp(str->sval[0], "1")))
+        APDUInFramingEnable = true;
 
-	if (len && (!strcmp(str->sval[0], "disable") || !strcmp(str->sval[0], "0")))
-		APDUInFramingEnable = false;
+    if (len && (!strcmp(str->sval[0], "disable") || !strcmp(str->sval[0], "0")))
+        APDUInFramingEnable = false;
 
-	CLIParserFree();
+    CLIParserFree();
 
-	PrintAndLogEx(INFO, "\nISO 14443-4 input chaining %s.\n", APDUInFramingEnable ? "enabled" : "disabled");
+    PrintAndLogEx(INFO, "\nISO 14443-4 input chaining %s.\n", APDUInFramingEnable ? "enabled" : "disabled");
 
-	return 0;
+    return 0;
 }
 
 static command_t CommandTable[] = {
-	{"help",		CmdHelp,              1, "This help"},
-	{"list",		CmdHF14AList,         0, "[Deprecated] List ISO 14443-a history"},
-	{"info",		CmdHF14AInfo,         0, "Tag information"},
-	{"reader",		CmdHF14AReader,       0, "Act like an ISO14443-a reader"},
-	{"cuids",		CmdHF14ACUIDs,        0, "<n> Collect n>0 ISO14443-a UIDs in one go"},
-	{"sim",			CmdHF14ASim,          0, "<UID> -- Simulate ISO 14443-a tag"},
-	{"sniff",		CmdHF14ASniff,        0, "sniff ISO 14443-a traffic"},
-	{"apdu",		CmdHF14AAPDU,         0, "Send ISO 14443-4 APDU to tag"},
-	{"chaining",	CmdHF14AChaining,     0, "Control ISO 14443-4 input chaining"},
-	{"raw",			CmdHF14ACmdRaw,       0, "Send raw hex data to tag"},
-	{"antifuzz",	CmdHF14AAntiFuzz,     0, "Fuzzing the anticollision phase.  Warning! Readers may react strange"},
-	{NULL, NULL, 0, NULL}
+    {"help",        CmdHelp,              1, "This help"},
+    {"list",        CmdHF14AList,         0, "[Deprecated] List ISO 14443-a history"},
+    {"info",        CmdHF14AInfo,         0, "Tag information"},
+    {"reader",      CmdHF14AReader,       0, "Act like an ISO14443-a reader"},
+    {"cuids",       CmdHF14ACUIDs,        0, "<n> Collect n>0 ISO14443-a UIDs in one go"},
+    {"sim",         CmdHF14ASim,          0, "<UID> -- Simulate ISO 14443-a tag"},
+    {"sniff",       CmdHF14ASniff,        0, "sniff ISO 14443-a traffic"},
+    {"apdu",        CmdHF14AAPDU,         0, "Send ISO 14443-4 APDU to tag"},
+    {"chaining",    CmdHF14AChaining,     0, "Control ISO 14443-4 input chaining"},
+    {"raw",         CmdHF14ACmdRaw,       0, "Send raw hex data to tag"},
+    {"antifuzz",    CmdHF14AAntiFuzz,     0, "Fuzzing the anticollision phase.  Warning! Readers may react strange"},
+    {NULL, NULL, 0, NULL}
 };
 
 int CmdHF14A(const char *Cmd) {
-	clearCommandBuffer();
-	CmdsParse(CommandTable, Cmd);
-	return 0;
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
+    return 0;
 }
 
 int CmdHelp(const char *Cmd) {
diff --git a/client/cmdhf14a.h b/client/cmdhf14a.h
index 4396c4b79..73cbd069c 100644
--- a/client/cmdhf14a.h
+++ b/client/cmdhf14a.h
@@ -28,15 +28,15 @@
 #include "mifare.h"
 #include "cmdhfmf.h"
 #include "cmdhfmfu.h"
-#include "cmdhf.h"		// list cmd
+#include "cmdhf.h"  // list cmd
 #include "mifare/mifarehost.h"
 #include "emv/apduinfo.h"
 #include "emv/emvcore.h"
 
 // structure and database for uid -> tagtype lookups
 typedef struct {
-	uint8_t uid;
-	char* desc;
+    uint8_t uid;
+    char* desc;
 } manufactureName;
 
 extern int CmdHF14A(const char *Cmd);
diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c
index f74ca9a34..c3962a17f 100644
--- a/client/cmdhf14b.c
+++ b/client/cmdhf14b.c
@@ -15,152 +15,152 @@
 static int CmdHelp(const char *Cmd);
 
 int usage_hf_14b_info(void){
-	PrintAndLogEx(NORMAL, "Usage: hf 14b info [h] [s]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h    this help");
-	PrintAndLogEx(NORMAL, "       s    silently");
-	PrintAndLogEx(NORMAL, "Example:");
-	PrintAndLogEx(NORMAL, "       hf 14b info");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage: hf 14b info [h] [s]");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h    this help");
+    PrintAndLogEx(NORMAL, "       s    silently");
+    PrintAndLogEx(NORMAL, "Example:");
+    PrintAndLogEx(NORMAL, "       hf 14b info");
+    return 0;
 }
 int usage_hf_14b_reader(void){
-	PrintAndLogEx(NORMAL, "Usage: hf 14b reader [h] [s]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h    this help");
-	PrintAndLogEx(NORMAL, "       s    silently");
-	PrintAndLogEx(NORMAL, "Example:");
-	PrintAndLogEx(NORMAL, "       hf 14b reader");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage: hf 14b reader [h] [s]");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h    this help");
+    PrintAndLogEx(NORMAL, "       s    silently");
+    PrintAndLogEx(NORMAL, "Example:");
+    PrintAndLogEx(NORMAL, "       hf 14b reader");
+    return 0;
 }
 int usage_hf_14b_raw(void){
-	PrintAndLogEx(NORMAL, "Usage: hf 14b raw [-h] [-r] [-c] [-p] [-s || -ss] <0A 0B 0C ... hex>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       -h    this help");
-	PrintAndLogEx(NORMAL, "       -r    do not read response");
-	PrintAndLogEx(NORMAL, "       -c    calculate and append CRC");
-	PrintAndLogEx(NORMAL, "       -p    leave the field on after receive");
-	PrintAndLogEx(NORMAL, "       -s    active signal field ON with select");
-	PrintAndLogEx(NORMAL, "       -ss   active signal field ON with select for SRx ST Microelectronics tags");
-	PrintAndLogEx(NORMAL, "Example:");
-	PrintAndLogEx(NORMAL, "       hf 14b raw -s -c -p 0200a40400");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage: hf 14b raw [-h] [-r] [-c] [-p] [-s || -ss] <0A 0B 0C ... hex>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       -h    this help");
+    PrintAndLogEx(NORMAL, "       -r    do not read response");
+    PrintAndLogEx(NORMAL, "       -c    calculate and append CRC");
+    PrintAndLogEx(NORMAL, "       -p    leave the field on after receive");
+    PrintAndLogEx(NORMAL, "       -s    active signal field ON with select");
+    PrintAndLogEx(NORMAL, "       -ss   active signal field ON with select for SRx ST Microelectronics tags");
+    PrintAndLogEx(NORMAL, "Example:");
+    PrintAndLogEx(NORMAL, "       hf 14b raw -s -c -p 0200a40400");
+    return 0;
 }
 int usage_hf_14b_sniff(void){
-	PrintAndLogEx(NORMAL, "It get data from the field and saves it into command buffer.");
-	PrintAndLogEx(NORMAL, "Buffer accessible from command 'hf list 14b'");
-	PrintAndLogEx(NORMAL, "Usage: hf 14b sniff [h]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h    this help");
-	PrintAndLogEx(NORMAL, "Example:");
-	PrintAndLogEx(NORMAL, "       hf 14b sniff");
-	return 0;
+    PrintAndLogEx(NORMAL, "It get data from the field and saves it into command buffer.");
+    PrintAndLogEx(NORMAL, "Buffer accessible from command 'hf list 14b'");
+    PrintAndLogEx(NORMAL, "Usage: hf 14b sniff [h]");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h    this help");
+    PrintAndLogEx(NORMAL, "Example:");
+    PrintAndLogEx(NORMAL, "       hf 14b sniff");
+    return 0;
 }
 int usage_hf_14b_sim(void){
-	PrintAndLogEx(NORMAL, "Emulating ISO/IEC 14443 type B tag with 4 UID / PUPI");
-	PrintAndLogEx(NORMAL, "Usage: hf 14b sim [h] u <uid>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h    this help");
-	PrintAndLogEx(NORMAL, "       u    4byte UID/PUPI");
-	PrintAndLogEx(NORMAL, "Example:");
-	PrintAndLogEx(NORMAL, "       hf 14b sim");
-	PrintAndLogEx(NORMAL, "       hf 14b sim u 11223344");
-	return 0;
+    PrintAndLogEx(NORMAL, "Emulating ISO/IEC 14443 type B tag with 4 UID / PUPI");
+    PrintAndLogEx(NORMAL, "Usage: hf 14b sim [h] u <uid>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h    this help");
+    PrintAndLogEx(NORMAL, "       u    4byte UID/PUPI");
+    PrintAndLogEx(NORMAL, "Example:");
+    PrintAndLogEx(NORMAL, "       hf 14b sim");
+    PrintAndLogEx(NORMAL, "       hf 14b sim u 11223344");
+    return 0;
 }
 int usage_hf_14b_read_srx(void){
-	PrintAndLogEx(NORMAL, "Usage:  hf 14b sriread [h] <1|2>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h        this help");
-	PrintAndLogEx(NORMAL, "       <1|2>    1 = SRIX4K , 2 = SRI512");
-	PrintAndLogEx(NORMAL, "Example:");
-	PrintAndLogEx(NORMAL, "       hf 14b sriread 1");
-	PrintAndLogEx(NORMAL, "       hf 14b sriread 2");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage:  hf 14b sriread [h] <1|2>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h        this help");
+    PrintAndLogEx(NORMAL, "       <1|2>    1 = SRIX4K , 2 = SRI512");
+    PrintAndLogEx(NORMAL, "Example:");
+    PrintAndLogEx(NORMAL, "       hf 14b sriread 1");
+    PrintAndLogEx(NORMAL, "       hf 14b sriread 2");
+    return 0;
 }
 int usage_hf_14b_write_srx(void){
-	PrintAndLogEx(NORMAL, "Usage:  hf 14b [h] sriwrite <1|2> <BLOCK> <DATA>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h        this help");
-	PrintAndLogEx(NORMAL, "       <1|2>    1 = SRIX4K , 2 = SRI512");
-	PrintAndLogEx(NORMAL, "       <block>  BLOCK number depends on tag, special block == FF");
-	PrintAndLogEx(NORMAL, "       <data>   hex bytes of data to be written");
-	PrintAndLogEx(NORMAL, "Example:");
-	PrintAndLogEx(NORMAL, "       hf 14b sriwrite 1 7F 11223344");
-	PrintAndLogEx(NORMAL, "       hf 14b sriwrite 1 FF 11223344");
-	PrintAndLogEx(NORMAL, "       hf 14b sriwrite 2 15 11223344");
-	PrintAndLogEx(NORMAL, "       hf 14b sriwrite 2 FF 11223344");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage:  hf 14b [h] sriwrite <1|2> <BLOCK> <DATA>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h        this help");
+    PrintAndLogEx(NORMAL, "       <1|2>    1 = SRIX4K , 2 = SRI512");
+    PrintAndLogEx(NORMAL, "       <block>  BLOCK number depends on tag, special block == FF");
+    PrintAndLogEx(NORMAL, "       <data>   hex bytes of data to be written");
+    PrintAndLogEx(NORMAL, "Example:");
+    PrintAndLogEx(NORMAL, "       hf 14b sriwrite 1 7F 11223344");
+    PrintAndLogEx(NORMAL, "       hf 14b sriwrite 1 FF 11223344");
+    PrintAndLogEx(NORMAL, "       hf 14b sriwrite 2 15 11223344");
+    PrintAndLogEx(NORMAL, "       hf 14b sriwrite 2 FF 11223344");
+    return 0;
 }
 int usage_hf_14b_dump(void){
-	PrintAndLogEx(NORMAL, "This command dumps the contents of a ISO-14443-B tag and save it to file\n"
-	                      "\n"
-	                      "Usage: hf 14b dump [h] [card memory] <f filname> \n"
-	                      "Options:\n"
-	                      "\th             this help\n"
-						  "\t[card memory] 1 = SRIX4K (default), 2 = SRI512"
-	                      "\tf <name>      filename,  if no <name> UID will be used as filename\n"
-	                      "\n"
-	                      "Example:\n"
-	                      "\thf 14b dump f\n"
-	                      "\thf 14b dump 2 f mydump");
-	return 0;
+    PrintAndLogEx(NORMAL, "This command dumps the contents of a ISO-14443-B tag and save it to file\n"
+                          "\n"
+                          "Usage: hf 14b dump [h] [card memory] <f filname> \n"
+                          "Options:\n"
+                          "\th             this help\n"
+                          "\t[card memory] 1 = SRIX4K (default), 2 = SRI512"
+                          "\tf <name>      filename,  if no <name> UID will be used as filename\n"
+                          "\n"
+                          "Example:\n"
+                          "\thf 14b dump f\n"
+                          "\thf 14b dump 2 f mydump");
+    return 0;
 }
 
 /*
 static void switch_on_field_14b(void) {
-	UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT, 0, 0}};
-	clearCommandBuffer();
-	SendCommand(&c);
+    UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT, 0, 0}};
+    clearCommandBuffer();
+    SendCommand(&c);
 }
 */
 
 static int switch_off_field_14b(void) {
-	UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_DISCONNECT, 0, 0}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+    UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_DISCONNECT, 0, 0}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 
 int CmdHF14BList(const char *Cmd) {
-	CmdTraceList("14b");
-	return 0;
+    CmdTraceList("14b");
+    return 0;
 }
 
 int CmdHF14BSim(const char *Cmd) {
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if (cmdp == 'h') return usage_hf_14b_sim();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (cmdp == 'h') return usage_hf_14b_sim();
 
-	uint32_t pupi = 0;
-	if (cmdp == 'u') {
-		pupi = param_get32ex(Cmd, 1, 0, 16);
-	}
+    uint32_t pupi = 0;
+    if (cmdp == 'u') {
+        pupi = param_get32ex(Cmd, 1, 0, 16);
+    }
 
-	UsbCommand c = {CMD_SIMULATE_TAG_ISO_14443B, {pupi, 0, 0}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+    UsbCommand c = {CMD_SIMULATE_TAG_ISO_14443B, {pupi, 0, 0}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 
 int CmdHF14BSniff(const char *Cmd) {
 
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if (cmdp == 'h') return usage_hf_14b_sniff();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (cmdp == 'h') return usage_hf_14b_sniff();
 
-	UsbCommand c = {CMD_SNOOP_ISO_14443B, {0, 0, 0}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+    UsbCommand c = {CMD_SNOOP_ISO_14443B, {0, 0, 0}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 
 int CmdHF14BCmdRaw (const char *Cmd) {
-	bool reply = true, power = false, select = false;
-	char buf[5] = "";
-	int i = 0;
-	uint8_t data[USB_CMD_DATA_SIZE] = {0x00};
-	uint16_t datalen = 0;
-	uint32_t flags = ISO14B_CONNECT;
-	uint32_t temp = 0;
+    bool reply = true, power = false, select = false;
+    char buf[5] = "";
+    int i = 0;
+    uint8_t data[USB_CMD_DATA_SIZE] = {0x00};
+    uint16_t datalen = 0;
+    uint32_t flags = ISO14B_CONNECT;
+    uint32_t temp = 0;
 
-	if ( strlen(Cmd) < 3 ) return usage_hf_14b_raw();
+    if ( strlen(Cmd) < 3 ) return usage_hf_14b_raw();
 
     // strip
     while (*Cmd==' ' || *Cmd=='\t') ++Cmd;
@@ -169,8 +169,8 @@ int CmdHF14BCmdRaw (const char *Cmd) {
         if (Cmd[i]==' ' || Cmd[i]=='\t') { ++i; continue; }
         if (Cmd[i]=='-') {
             switch (tolower(Cmd[i+1])) {
-				case 'h':
-					return usage_hf_14b_raw();
+                case 'h':
+                    return usage_hf_14b_raw();
                 case 'r':
                     reply = false;
                     break;
@@ -178,17 +178,17 @@ int CmdHF14BCmdRaw (const char *Cmd) {
                     flags |= ISO14B_APPEND_CRC;
                     break;
                 case 'p':
-					power = true;
+                    power = true;
+                    break;
+                case 's':
+                    select = true;
+                    if (tolower(Cmd[i+2]) == 's') {
+                        flags |= ISO14B_SELECT_SR;
+                        ++i;
+                    } else {
+                        flags |= ISO14B_SELECT_STD;
+                    }
                     break;
-				case 's':
-					select = true;
-					if (tolower(Cmd[i+2]) == 's') {
-						flags |= ISO14B_SELECT_SR;
-						++i;
-					} else {
-						flags |= ISO14B_SELECT_STD;
-					}
-					break;
                 default:
                     return usage_hf_14b_raw();
             }
@@ -206,87 +206,87 @@ int CmdHF14BCmdRaw (const char *Cmd) {
                 sscanf(buf,"%x",&temp);
                 data[datalen++] = (uint8_t)(temp & 0xff);
                 *buf=0;
-				memset(buf, 0x00, sizeof(buf));
+                memset(buf, 0x00, sizeof(buf));
             }
             continue;
         }
         PrintAndLogEx(WARNING, "unknown parameter '%c'\n", param_getchar(Cmd, i));
-		return 0;
+        return 0;
     }
 
-	if (!power)
+    if (!power)
         flags |= ISO14B_DISCONNECT;
 
     if (datalen > 0)
-		flags |= ISO14B_RAW;
+        flags |= ISO14B_RAW;
 
-	// Max buffer is USB_CMD_DATA_SIZE
-	datalen = (datalen > USB_CMD_DATA_SIZE) ? USB_CMD_DATA_SIZE : datalen;
+    // Max buffer is USB_CMD_DATA_SIZE
+    datalen = (datalen > USB_CMD_DATA_SIZE) ? USB_CMD_DATA_SIZE : datalen;
 
-	UsbCommand c = {CMD_ISO_14443B_COMMAND, {flags, datalen, 0}};
-	memcpy(c.d.asBytes, data, datalen);
-	clearCommandBuffer();
-	SendCommand(&c);
+    UsbCommand c = {CMD_ISO_14443B_COMMAND, {flags, datalen, 0}};
+    memcpy(c.d.asBytes, data, datalen);
+    clearCommandBuffer();
+    SendCommand(&c);
 
-	if (!reply) return 1;
+    if (!reply) return 1;
 
-	bool success = true;
-	// get back iso14b_card_select_t, don't print it.
-	if (select)
-		success = waitCmd14b(false);
+    bool success = true;
+    // get back iso14b_card_select_t, don't print it.
+    if (select)
+        success = waitCmd14b(false);
 
-	// get back response from the raw bytes you sent.
-	if (success && datalen>0) waitCmd14b(true);
+    // get back response from the raw bytes you sent.
+    if (success && datalen>0) waitCmd14b(true);
 
     return 1;
 }
 
 static bool get_14b_UID(iso14b_card_select_t *card) {
 
-	if (!card)
-		return false;
+    if (!card)
+        return false;
 
-	int8_t retry = 3;
-	UsbCommand resp;
-	UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_SR | ISO14B_DISCONNECT, 0, 0}};
+    int8_t retry = 3;
+    UsbCommand resp;
+    UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_SR | ISO14B_DISCONNECT, 0, 0}};
 
-	// test for 14b SR
-	while (retry--) {
+    // test for 14b SR
+    while (retry--) {
 
-		clearCommandBuffer();
-		SendCommand(&c);
-		if (WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
+        clearCommandBuffer();
+        SendCommand(&c);
+        if (WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
 
-			uint8_t status = resp.arg[0];
-			if ( status == 0) {
-				memcpy(card, (iso14b_card_select_t *)resp.d.asBytes, sizeof(iso14b_card_select_t));
-				return true;
-			}
-		}
-	} // retry
+            uint8_t status = resp.arg[0];
+            if ( status == 0) {
+                memcpy(card, (iso14b_card_select_t *)resp.d.asBytes, sizeof(iso14b_card_select_t));
+                return true;
+            }
+        }
+    } // retry
 
-	// test 14b standard
-	c.arg[0] = ISO14B_CONNECT | ISO14B_SELECT_STD | ISO14B_DISCONNECT;
-	retry = 3;
-	while (retry--) {
+    // test 14b standard
+    c.arg[0] = ISO14B_CONNECT | ISO14B_SELECT_STD | ISO14B_DISCONNECT;
+    retry = 3;
+    while (retry--) {
 
 
-		clearCommandBuffer();
-		SendCommand(&c);
-		if (WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
+        clearCommandBuffer();
+        SendCommand(&c);
+        if (WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
 
-			uint8_t status = resp.arg[0];
-			if ( status == 0) {
-				memcpy(card, (iso14b_card_select_t *)resp.d.asBytes, sizeof(iso14b_card_select_t));
-				return true;
-			}
-		}
-	} // retry
+            uint8_t status = resp.arg[0];
+            if ( status == 0) {
+                memcpy(card, (iso14b_card_select_t *)resp.d.asBytes, sizeof(iso14b_card_select_t));
+                return true;
+            }
+        }
+    } // retry
 
-	if ( retry <= 0 )
-		PrintAndLogEx(WARNING, "timeout while waiting for reply.");
+    if ( retry <= 0 )
+        PrintAndLogEx(WARNING, "timeout while waiting for reply.");
 
-	return false;
+    return false;
 }
 
 // print full atqb info
@@ -296,122 +296,122 @@ static bool get_14b_UID(iso14b_card_select_t *card) {
 // 5       = max frame size / -4 info
 // 6       = FWI / Coding options
 static void print_atqb_resp(uint8_t *data, uint8_t cid){
-	//PrintAndLogEx(NORMAL, "           UID: %s", sprint_hex(data+1,4));
-	PrintAndLogEx(NORMAL, "      App Data: %s", sprint_hex(data,4));
-	PrintAndLogEx(NORMAL, "      Protocol: %s", sprint_hex(data+4,3));
-	uint8_t BitRate = data[4];
-	if (!BitRate) PrintAndLogEx(NORMAL, "      Bit Rate: 106 kbit/s only PICC <-> PCD");
-	if (BitRate & 0x10)	PrintAndLogEx(NORMAL, "      Bit Rate: 212 kbit/s PICC -> PCD supported");
-	if (BitRate & 0x20)	PrintAndLogEx(NORMAL, "      Bit Rate: 424 kbit/s PICC -> PCD supported");
-	if (BitRate & 0x40)	PrintAndLogEx(NORMAL, "      Bit Rate: 847 kbit/s PICC -> PCD supported");
-	if (BitRate & 0x01)	PrintAndLogEx(NORMAL, "      Bit Rate: 212 kbit/s PICC <- PCD supported");
-	if (BitRate & 0x02)	PrintAndLogEx(NORMAL, "      Bit Rate: 424 kbit/s PICC <- PCD supported");
-	if (BitRate & 0x04)	PrintAndLogEx(NORMAL, "      Bit Rate: 847 kbit/s PICC <- PCD supported");
-	if (BitRate & 0x80)	PrintAndLogEx(NORMAL, "                Same bit rate <-> required");
+    //PrintAndLogEx(NORMAL, "           UID: %s", sprint_hex(data+1,4));
+    PrintAndLogEx(NORMAL, "      App Data: %s", sprint_hex(data,4));
+    PrintAndLogEx(NORMAL, "      Protocol: %s", sprint_hex(data+4,3));
+    uint8_t BitRate = data[4];
+    if (!BitRate) PrintAndLogEx(NORMAL, "      Bit Rate: 106 kbit/s only PICC <-> PCD");
+    if (BitRate & 0x10) PrintAndLogEx(NORMAL, "      Bit Rate: 212 kbit/s PICC -> PCD supported");
+    if (BitRate & 0x20) PrintAndLogEx(NORMAL, "      Bit Rate: 424 kbit/s PICC -> PCD supported");
+    if (BitRate & 0x40) PrintAndLogEx(NORMAL, "      Bit Rate: 847 kbit/s PICC -> PCD supported");
+    if (BitRate & 0x01) PrintAndLogEx(NORMAL, "      Bit Rate: 212 kbit/s PICC <- PCD supported");
+    if (BitRate & 0x02) PrintAndLogEx(NORMAL, "      Bit Rate: 424 kbit/s PICC <- PCD supported");
+    if (BitRate & 0x04) PrintAndLogEx(NORMAL, "      Bit Rate: 847 kbit/s PICC <- PCD supported");
+    if (BitRate & 0x80) PrintAndLogEx(NORMAL, "                Same bit rate <-> required");
 
-	uint16_t maxFrame = data[5] >> 4;
-	if (maxFrame < 5) 		maxFrame = 8 * maxFrame + 16;
-	else if (maxFrame == 5)	maxFrame = 64;
-	else if (maxFrame == 6)	maxFrame = 96;
-	else if (maxFrame == 7)	maxFrame = 128;
-	else if (maxFrame == 8)	maxFrame = 256;
-	else maxFrame = 257;
+    uint16_t maxFrame = data[5] >> 4;
+    if (maxFrame < 5)       maxFrame = 8 * maxFrame + 16;
+    else if (maxFrame == 5) maxFrame = 64;
+    else if (maxFrame == 6) maxFrame = 96;
+    else if (maxFrame == 7) maxFrame = 128;
+    else if (maxFrame == 8) maxFrame = 256;
+    else maxFrame = 257;
 
-	PrintAndLogEx(NORMAL, "Max Frame Size: %u%s bytes", maxFrame, (maxFrame == 257) ? "+ RFU" : "");
+    PrintAndLogEx(NORMAL, "Max Frame Size: %u%s bytes", maxFrame, (maxFrame == 257) ? "+ RFU" : "");
 
-	uint8_t protocolT = data[5] & 0xF;
-	PrintAndLogEx(NORMAL, " Protocol Type: Protocol is %scompliant with ISO/IEC 14443-4",(protocolT) ? "" : "not " );
+    uint8_t protocolT = data[5] & 0xF;
+    PrintAndLogEx(NORMAL, " Protocol Type: Protocol is %scompliant with ISO/IEC 14443-4",(protocolT) ? "" : "not " );
 
-	uint8_t fwt = data[6]>>4;
-	if ( fwt < 16 ){
-		uint32_t etus = (32 << fwt);
-		uint32_t fwt_time = (302 << fwt);
-		PrintAndLogEx(NORMAL, "Frame Wait Integer: %u - %u ETUs | %u us", fwt, etus, fwt_time);
-	} else {
-		PrintAndLogEx(NORMAL, "Frame Wait Integer: %u - RFU", fwt);
-	}
+    uint8_t fwt = data[6]>>4;
+    if ( fwt < 16 ){
+        uint32_t etus = (32 << fwt);
+        uint32_t fwt_time = (302 << fwt);
+        PrintAndLogEx(NORMAL, "Frame Wait Integer: %u - %u ETUs | %u us", fwt, etus, fwt_time);
+    } else {
+        PrintAndLogEx(NORMAL, "Frame Wait Integer: %u - RFU", fwt);
+    }
 
-	PrintAndLogEx(NORMAL, " App Data Code: Application is %s",(data[6]&4) ? "Standard" : "Proprietary");
-	PrintAndLogEx(NORMAL, " Frame Options: NAD is %ssupported",(data[6]&2) ? "" : "not ");
-	PrintAndLogEx(NORMAL, " Frame Options: CID is %ssupported",(data[6]&1) ? "" : "not ");
-	PrintAndLogEx(NORMAL, "Tag :");
-	PrintAndLogEx(NORMAL, "  Max Buf Length: %u (MBLI) %s", cid>>4, (cid & 0xF0) ? "" : "chained frames not supported");
-	PrintAndLogEx(NORMAL, "  CID : %u", cid & 0x0f);
-	return;
+    PrintAndLogEx(NORMAL, " App Data Code: Application is %s",(data[6]&4) ? "Standard" : "Proprietary");
+    PrintAndLogEx(NORMAL, " Frame Options: NAD is %ssupported",(data[6]&2) ? "" : "not ");
+    PrintAndLogEx(NORMAL, " Frame Options: CID is %ssupported",(data[6]&1) ? "" : "not ");
+    PrintAndLogEx(NORMAL, "Tag :");
+    PrintAndLogEx(NORMAL, "  Max Buf Length: %u (MBLI) %s", cid>>4, (cid & 0xF0) ? "" : "chained frames not supported");
+    PrintAndLogEx(NORMAL, "  CID : %u", cid & 0x0f);
+    return;
 }
 
 // get SRx chip model (from UID) // from ST Microelectronics
 char *get_ST_Chip_Model(uint8_t data){
-	static char model[20];
-	char *retStr = model;
-	memset(model,0, sizeof(model));
+    static char model[20];
+    char *retStr = model;
+    memset(model,0, sizeof(model));
 
-	switch (data) {
-		case 0x0: sprintf(retStr, "SRIX4K (Special)"); break;
-		case 0x2: sprintf(retStr, "SR176"); break;
-		case 0x3: sprintf(retStr, "SRIX4K"); break;
-		case 0x4: sprintf(retStr, "SRIX512"); break;
-		case 0x6: sprintf(retStr, "SRI512"); break;
-		case 0x7: sprintf(retStr, "SRI4K"); break;
-		case 0xC: sprintf(retStr, "SRT512"); break;
-		default : sprintf(retStr, "Unknown"); break;
-	}
-	return retStr;
+    switch (data) {
+        case 0x0: sprintf(retStr, "SRIX4K (Special)"); break;
+        case 0x2: sprintf(retStr, "SR176"); break;
+        case 0x3: sprintf(retStr, "SRIX4K"); break;
+        case 0x4: sprintf(retStr, "SRIX512"); break;
+        case 0x6: sprintf(retStr, "SRI512"); break;
+        case 0x7: sprintf(retStr, "SRI4K"); break;
+        case 0xC: sprintf(retStr, "SRT512"); break;
+        default : sprintf(retStr, "Unknown"); break;
+    }
+    return retStr;
 }
 
 // REMAKE:
 int print_ST_Lock_info(uint8_t model){
 
-	// PrintAndLogEx(NORMAL, "Chip Write Protection Bits:");
-	// // now interpret the data
-	// switch (model){
-		// case 0x0: //fall through (SRIX4K special)
-		// case 0x3: //fall through (SRIx4K)
-		// case 0x7: //             (SRI4K)
-			// //only need data[3]
-			// blk1 = 9;
-			// PrintAndLogEx(NORMAL, "   raw: %s", sprint_bin(data+3, 1));
-			// PrintAndLogEx(NORMAL, " 07/08:%slocked", (data[3] & 1) ? " not " : " " );
-			// for (uint8_t i = 1; i<8; i++){
-				// PrintAndLogEx(NORMAL, "    %02u:%slocked", blk1, (data[3] & (1 << i)) ? " not " : " " );
-				// blk1++;
-			// }
-			// break;
-		// case 0x4: //fall through (SRIX512)
-		// case 0x6: //fall through (SRI512)
-		// case 0xC: //             (SRT512)
-			// //need data[2] and data[3]
-			// blk1 = 0;
-			// PrintAndLogEx(NORMAL, "   raw: %s", sprint_bin(data+2, 2));
-			// for (uint8_t b=2; b<4; b++){
-				// for (uint8_t i=0; i<8; i++){
-					// PrintAndLogEx(NORMAL, "    %02u:%slocked", blk1, (data[b] & (1 << i)) ? " not " : " " );
-					// blk1++;
-				// }
-			// }
-			// break;
-		// case 0x2: //             (SR176)
-			// //need data[2]
-			// blk1 = 0;
-			// PrintAndLogEx(NORMAL, "   raw: %s", sprint_bin(data+2, 1));
-			// for (uint8_t i = 0; i<8; i++){
-				// PrintAndLogEx(NORMAL, " %02u/%02u:%slocked", blk1, blk1+1, (data[2] & (1 << i)) ? " " : " not " );
-				// blk1+=2;
-			// }
-			// break;
-		// default:
-			// return rawClose();
-	// }
-	return 1;
+    // PrintAndLogEx(NORMAL, "Chip Write Protection Bits:");
+    // // now interpret the data
+    // switch (model){
+        // case 0x0: //fall through (SRIX4K special)
+        // case 0x3: //fall through (SRIx4K)
+        // case 0x7: //             (SRI4K)
+            // //only need data[3]
+            // blk1 = 9;
+            // PrintAndLogEx(NORMAL, "   raw: %s", sprint_bin(data+3, 1));
+            // PrintAndLogEx(NORMAL, " 07/08:%slocked", (data[3] & 1) ? " not " : " " );
+            // for (uint8_t i = 1; i<8; i++){
+                // PrintAndLogEx(NORMAL, "    %02u:%slocked", blk1, (data[3] & (1 << i)) ? " not " : " " );
+                // blk1++;
+            // }
+            // break;
+        // case 0x4: //fall through (SRIX512)
+        // case 0x6: //fall through (SRI512)
+        // case 0xC: //             (SRT512)
+            // //need data[2] and data[3]
+            // blk1 = 0;
+            // PrintAndLogEx(NORMAL, "   raw: %s", sprint_bin(data+2, 2));
+            // for (uint8_t b=2; b<4; b++){
+                // for (uint8_t i=0; i<8; i++){
+                    // PrintAndLogEx(NORMAL, "    %02u:%slocked", blk1, (data[b] & (1 << i)) ? " not " : " " );
+                    // blk1++;
+                // }
+            // }
+            // break;
+        // case 0x2: //             (SR176)
+            // //need data[2]
+            // blk1 = 0;
+            // PrintAndLogEx(NORMAL, "   raw: %s", sprint_bin(data+2, 1));
+            // for (uint8_t i = 0; i<8; i++){
+                // PrintAndLogEx(NORMAL, " %02u/%02u:%slocked", blk1, blk1+1, (data[2] & (1 << i)) ? " " : " not " );
+                // blk1+=2;
+            // }
+            // break;
+        // default:
+            // return rawClose();
+    // }
+    return 1;
 }
 
 // print UID info from SRx chips (ST Microelectronics)
 static void print_st_general_info(uint8_t *data, uint8_t len){
-	//uid = first 8 bytes in data
-	PrintAndLogEx(NORMAL, " UID: %s", sprint_hex(SwapEndian64(data,8,8), len));
-	PrintAndLogEx(NORMAL, " MFG: %02X, %s", data[6], getTagInfo(data[6]));
-	PrintAndLogEx(NORMAL, "Chip: %02X, %s", data[5]>>2, get_ST_Chip_Model(data[5]>>2));
-	return;
+    //uid = first 8 bytes in data
+    PrintAndLogEx(NORMAL, " UID: %s", sprint_hex(SwapEndian64(data,8,8), len));
+    PrintAndLogEx(NORMAL, " MFG: %02X, %s", data[6], getTagInfo(data[6]));
+    PrintAndLogEx(NORMAL, "Chip: %02X, %s", data[5]>>2, get_ST_Chip_Model(data[5]>>2));
+    return;
 }
 
 //05 00 00 = find one tag in field
@@ -435,281 +435,281 @@ static void print_st_general_info(uint8_t *data, uint8_t len){
 // 14b get and print Full Info (as much as we know)
 bool HF14B_Std_Info(bool verbose){
 
-	bool isSuccess = false;
+    bool isSuccess = false;
 
-	// 14b get and print UID only (general info)
-	UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_STD | ISO14B_DISCONNECT, 0, 0}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	UsbCommand resp;
+    // 14b get and print UID only (general info)
+    UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_STD | ISO14B_DISCONNECT, 0, 0}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    UsbCommand resp;
 
-	if (!WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
-		if (verbose) PrintAndLogEx(WARNING, "command execution timeout");
-		switch_off_field_14b();
-	return false;
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
+        if (verbose) PrintAndLogEx(WARNING, "command execution timeout");
+        switch_off_field_14b();
+    return false;
     }
 
-	iso14b_card_select_t card;
-	memcpy(&card, (iso14b_card_select_t *)resp.d.asBytes, sizeof(iso14b_card_select_t));
+    iso14b_card_select_t card;
+    memcpy(&card, (iso14b_card_select_t *)resp.d.asBytes, sizeof(iso14b_card_select_t));
 
-	uint64_t status = resp.arg[0];
+    uint64_t status = resp.arg[0];
 
-	switch( status ){
-		case 0:
-			PrintAndLogEx(NORMAL, " UID    : %s", sprint_hex(card.uid, card.uidlen));
-			PrintAndLogEx(NORMAL, " ATQB   : %s", sprint_hex(card.atqb, sizeof(card.atqb)));
-			PrintAndLogEx(NORMAL, " CHIPID : %02X", card.chipid);
-			print_atqb_resp(card.atqb, card.cid);
-			isSuccess = true;
-			break;
-		case 2:
-			if (verbose) PrintAndLogEx(FAILED, "ISO 14443-3 ATTRIB fail");
-			break;
-		case 3:
-			if (verbose) PrintAndLogEx(FAILED, "ISO 14443-3 CRC fail");
-			break;
-		default:
-			if (verbose) PrintAndLogEx(FAILED, "ISO 14443-b card select failed");
-			break;
-	}
+    switch( status ){
+        case 0:
+            PrintAndLogEx(NORMAL, " UID    : %s", sprint_hex(card.uid, card.uidlen));
+            PrintAndLogEx(NORMAL, " ATQB   : %s", sprint_hex(card.atqb, sizeof(card.atqb)));
+            PrintAndLogEx(NORMAL, " CHIPID : %02X", card.chipid);
+            print_atqb_resp(card.atqb, card.cid);
+            isSuccess = true;
+            break;
+        case 2:
+            if (verbose) PrintAndLogEx(FAILED, "ISO 14443-3 ATTRIB fail");
+            break;
+        case 3:
+            if (verbose) PrintAndLogEx(FAILED, "ISO 14443-3 CRC fail");
+            break;
+        default:
+            if (verbose) PrintAndLogEx(FAILED, "ISO 14443-b card select failed");
+            break;
+    }
 
-	return isSuccess;
+    return isSuccess;
 }
 
 // SRx get and print full info (needs more info...)
 bool HF14B_ST_Info(bool verbose){
 
-	UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_SR | ISO14B_DISCONNECT, 0, 0}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	UsbCommand resp;
+    UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_SR | ISO14B_DISCONNECT, 0, 0}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    UsbCommand resp;
 
-	if (!WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
-		if (verbose) PrintAndLogEx(WARNING, "command execution timeout");
-		return false;
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
+        if (verbose) PrintAndLogEx(WARNING, "command execution timeout");
+        return false;
     }
 
-	iso14b_card_select_t card;
-	memcpy(&card, (iso14b_card_select_t *)resp.d.asBytes, sizeof(iso14b_card_select_t));
+    iso14b_card_select_t card;
+    memcpy(&card, (iso14b_card_select_t *)resp.d.asBytes, sizeof(iso14b_card_select_t));
 
-	uint64_t status = resp.arg[0];
-	if ( status > 0 )
-		return false;
+    uint64_t status = resp.arg[0];
+    if ( status > 0 )
+        return false;
 
-	print_st_general_info(card.uid, card.uidlen);
+    print_st_general_info(card.uid, card.uidlen);
 
-	//add locking bit information here. uint8_t data[16] = {0x00};
-	// uint8_t datalen = 2;
-	// uint8_t resplen;
-	// uint8_t	blk1;
-	// data[0] = 0x08;
+    //add locking bit information here. uint8_t data[16] = {0x00};
+    // uint8_t datalen = 2;
+    // uint8_t resplen;
+    // uint8_t blk1;
+    // data[0] = 0x08;
 
-	//
-	// if (model == 0x2) { //SR176 has special command:
-		// data[1] = 0xf;
-		// resplen = 4;
-	// } else {
-		// data[1] = 0xff;
-		// resplen = 6;
-	// }
+    //
+    // if (model == 0x2) { //SR176 has special command:
+        // data[1] = 0xf;
+        // resplen = 4;
+    // } else {
+        // data[1] = 0xff;
+        // resplen = 6;
+    // }
 
-	// //std read cmd
-	// if (HF14BCmdRaw(true, true, data, &datalen, false)==0)
-		// return rawClose();
+    // //std read cmd
+    // if (HF14BCmdRaw(true, true, data, &datalen, false)==0)
+        // return rawClose();
 
-	// if (datalen != resplen || !crc) return rawClose();
-	//print_ST_Lock_info(data[5]>>2);
-	return true;
+    // if (datalen != resplen || !crc) return rawClose();
+    //print_ST_Lock_info(data[5]>>2);
+    return true;
 }
 
 // get and print all info known about any known 14b tag
 bool HF14BInfo(bool verbose){
 
-	// try std 14b (atqb)
-	if (HF14B_Std_Info(verbose)) return true;
+    // try std 14b (atqb)
+    if (HF14B_Std_Info(verbose)) return true;
 
-	// try ST 14b
-	if (HF14B_ST_Info(verbose)) return true;
+    // try ST 14b
+    if (HF14B_ST_Info(verbose)) return true;
 
-	// try unknown 14b read commands (to be identified later)
-	//   could be read of calypso, CEPAS, moneo, or pico pass.
-	if (verbose) PrintAndLogEx(FAILED, "no 14443-B tag found");
-	return false;
+    // try unknown 14b read commands (to be identified later)
+    //   could be read of calypso, CEPAS, moneo, or pico pass.
+    if (verbose) PrintAndLogEx(FAILED, "no 14443-B tag found");
+    return false;
 }
 
 // menu command to get and print all info known about any known 14b tag
 int CmdHF14Binfo(const char *Cmd){
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if (cmdp == 'h') return usage_hf_14b_info();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (cmdp == 'h') return usage_hf_14b_info();
 
-	bool verbose = !(cmdp == 's');
-	return HF14BInfo(verbose);
+    bool verbose = !(cmdp == 's');
+    return HF14BInfo(verbose);
 }
 
 bool HF14B_ST_Reader(bool verbose){
 
-	bool isSuccess = false;
+    bool isSuccess = false;
 
-	// SRx get and print general info about SRx chip from UID
-	UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_SR | ISO14B_DISCONNECT, 0, 0}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	UsbCommand resp;
-	if (!WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
-		if (verbose) PrintAndLogEx(WARNING, "command execution timeout");
-		return false;
+    // SRx get and print general info about SRx chip from UID
+    UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_SR | ISO14B_DISCONNECT, 0, 0}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    UsbCommand resp;
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
+        if (verbose) PrintAndLogEx(WARNING, "command execution timeout");
+        return false;
     }
 
-	iso14b_card_select_t card;
-	memcpy(&card, (iso14b_card_select_t *)resp.d.asBytes, sizeof(iso14b_card_select_t));
+    iso14b_card_select_t card;
+    memcpy(&card, (iso14b_card_select_t *)resp.d.asBytes, sizeof(iso14b_card_select_t));
 
-	uint64_t status = resp.arg[0];
+    uint64_t status = resp.arg[0];
 
-	switch( status ){
-		case 0:
-			print_st_general_info(card.uid, card.uidlen);
-			isSuccess = true;
-			break;
-		case 1:
-			if (verbose) PrintAndLogEx(FAILED, "ISO 14443-3 random chip id fail");
-			break;
-		case 2:
-			if (verbose) PrintAndLogEx(FAILED, "ISO 14443-3 ATTRIB fail");
-			break;
-		case 3:
-			if (verbose) PrintAndLogEx(FAILED, "ISO 14443-3 CRC fail");
-			break;
-		default:
-			if (verbose) PrintAndLogEx(FAILED, "ISO 14443-b card select SRx failed");
-			break;
-	}
-	return isSuccess;
+    switch( status ){
+        case 0:
+            print_st_general_info(card.uid, card.uidlen);
+            isSuccess = true;
+            break;
+        case 1:
+            if (verbose) PrintAndLogEx(FAILED, "ISO 14443-3 random chip id fail");
+            break;
+        case 2:
+            if (verbose) PrintAndLogEx(FAILED, "ISO 14443-3 ATTRIB fail");
+            break;
+        case 3:
+            if (verbose) PrintAndLogEx(FAILED, "ISO 14443-3 CRC fail");
+            break;
+        default:
+            if (verbose) PrintAndLogEx(FAILED, "ISO 14443-b card select SRx failed");
+            break;
+    }
+    return isSuccess;
 }
 
 bool HF14B_Std_Reader(bool verbose){
 
-	bool isSuccess = false;
+    bool isSuccess = false;
 
-	// 14b get and print UID only (general info)
-	UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_STD | ISO14B_DISCONNECT, 0, 0}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	UsbCommand resp;
+    // 14b get and print UID only (general info)
+    UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_STD | ISO14B_DISCONNECT, 0, 0}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    UsbCommand resp;
 
-	if (!WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
-		if (verbose) PrintAndLogEx(WARNING, "command execution timeout");
-		return false;
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
+        if (verbose) PrintAndLogEx(WARNING, "command execution timeout");
+        return false;
     }
 
-	iso14b_card_select_t card;
-	memcpy(&card, (iso14b_card_select_t *)resp.d.asBytes, sizeof(iso14b_card_select_t));
+    iso14b_card_select_t card;
+    memcpy(&card, (iso14b_card_select_t *)resp.d.asBytes, sizeof(iso14b_card_select_t));
 
-	uint64_t status = resp.arg[0];
+    uint64_t status = resp.arg[0];
 
-	switch( status ){
-		case 0:
-			PrintAndLogEx(NORMAL, " UID    : %s", sprint_hex(card.uid, card.uidlen));
-			PrintAndLogEx(NORMAL, " ATQB   : %s", sprint_hex(card.atqb, sizeof(card.atqb)));
-			PrintAndLogEx(NORMAL, " CHIPID : %02X", card.chipid);
-			print_atqb_resp(card.atqb, card.cid);
-			isSuccess = true;
-			break;
-		case 2:
-			if (verbose) PrintAndLogEx(FAILED, "ISO 14443-3 ATTRIB fail");
-			break;
-		case 3:
-			if (verbose) PrintAndLogEx(FAILED, "ISO 14443-3 CRC fail");
-			break;
-		default:
-			if (verbose) PrintAndLogEx(FAILED, "ISO 14443-b card select failed");
-			break;
-	}
-	return isSuccess;
+    switch( status ){
+        case 0:
+            PrintAndLogEx(NORMAL, " UID    : %s", sprint_hex(card.uid, card.uidlen));
+            PrintAndLogEx(NORMAL, " ATQB   : %s", sprint_hex(card.atqb, sizeof(card.atqb)));
+            PrintAndLogEx(NORMAL, " CHIPID : %02X", card.chipid);
+            print_atqb_resp(card.atqb, card.cid);
+            isSuccess = true;
+            break;
+        case 2:
+            if (verbose) PrintAndLogEx(FAILED, "ISO 14443-3 ATTRIB fail");
+            break;
+        case 3:
+            if (verbose) PrintAndLogEx(FAILED, "ISO 14443-3 CRC fail");
+            break;
+        default:
+            if (verbose) PrintAndLogEx(FAILED, "ISO 14443-b card select failed");
+            break;
+    }
+    return isSuccess;
 }
 
 // test for other 14b type tags (mimic another reader - don't have tags to identify)
 bool HF14B_Other_Reader(){
 
-	// uint8_t data[] = {0x00, 0x0b, 0x3f, 0x80};
-	// uint8_t datalen = 4;
+    // uint8_t data[] = {0x00, 0x0b, 0x3f, 0x80};
+    // uint8_t datalen = 4;
 
-	// // 14b get and print UID only (general info)
-	// uint32_t flags = ISO14B_CONNECT | ISO14B_SELECT_STD | ISO14B_RAW | ISO14B_APPEND_CRC;
+    // // 14b get and print UID only (general info)
+    // uint32_t flags = ISO14B_CONNECT | ISO14B_SELECT_STD | ISO14B_RAW | ISO14B_APPEND_CRC;
 
-	// UsbCommand c = {CMD_ISO_14443B_COMMAND, {flags, datalen, 0}};
-	// memcpy(c.d.asBytes, data, datalen);
+    // UsbCommand c = {CMD_ISO_14443B_COMMAND, {flags, datalen, 0}};
+    // memcpy(c.d.asBytes, data, datalen);
 
-	// clearCommandBuffer();
-	// SendCommand(&c);
-	// UsbCommand resp;
-	// WaitForResponse(CMD_ACK,&resp);
+    // clearCommandBuffer();
+    // SendCommand(&c);
+    // UsbCommand resp;
+    // WaitForResponse(CMD_ACK,&resp);
 
-	// if (datalen > 2 ) {
-		// PrintAndLogEx(NORMAL, "\n14443-3b tag found:");
-		// PrintAndLogEx(NORMAL, "unknown tag type answered to a 0x000b3f80 command ans:");
-		// //PrintAndLogEx(NORMAL, "%s", sprint_hex(data, datalen));
-		// rawclose();
-		// return true;
-	// }
+    // if (datalen > 2 ) {
+        // PrintAndLogEx(NORMAL, "\n14443-3b tag found:");
+        // PrintAndLogEx(NORMAL, "unknown tag type answered to a 0x000b3f80 command ans:");
+        // //PrintAndLogEx(NORMAL, "%s", sprint_hex(data, datalen));
+        // rawclose();
+        // return true;
+    // }
 
-	// c.arg1 = 1;
-	// c.d.asBytes[0] = ISO14443B_AUTHENTICATE;
-	// clearCommandBuffer();
-	// SendCommand(&c);
-	// UsbCommand resp;
-	// WaitForResponse(CMD_ACK, &resp);
+    // c.arg1 = 1;
+    // c.d.asBytes[0] = ISO14443B_AUTHENTICATE;
+    // clearCommandBuffer();
+    // SendCommand(&c);
+    // UsbCommand resp;
+    // WaitForResponse(CMD_ACK, &resp);
 
-	// if (datalen > 0) {
-		// PrintAndLogEx(NORMAL, "\n14443-3b tag found:");
-		// PrintAndLogEx(NORMAL, "Unknown tag type answered to a 0x0A command ans:");
-		// // PrintAndLogEx(NORMAL, "%s", sprint_hex(data, datalen));
-		// rawClose();
-		// return true;
-	// }
+    // if (datalen > 0) {
+        // PrintAndLogEx(NORMAL, "\n14443-3b tag found:");
+        // PrintAndLogEx(NORMAL, "Unknown tag type answered to a 0x0A command ans:");
+        // // PrintAndLogEx(NORMAL, "%s", sprint_hex(data, datalen));
+        // rawClose();
+        // return true;
+    // }
 
-	// c.arg1 = 1;
-	// c.d.asBytes[0] = ISO14443B_RESET;
-	// clearCommandBuffer();
-	// SendCommand(&c);
-	// UsbCommand resp;
-	// WaitForResponse(CMD_ACK, &resp);
+    // c.arg1 = 1;
+    // c.d.asBytes[0] = ISO14443B_RESET;
+    // clearCommandBuffer();
+    // SendCommand(&c);
+    // UsbCommand resp;
+    // WaitForResponse(CMD_ACK, &resp);
 
-	// if (datalen > 0) {
-		// PrintAndLogEx(NORMAL, "\n14443-3b tag found:");
-		// PrintAndLogEx(NORMAL, "Unknown tag type answered to a 0x0C command ans:");
-		// PrintAndLogEx(NORMAL, "%s", sprint_hex(data, datalen));
-		// rawClose();
-		// return true;
-	// }
+    // if (datalen > 0) {
+        // PrintAndLogEx(NORMAL, "\n14443-3b tag found:");
+        // PrintAndLogEx(NORMAL, "Unknown tag type answered to a 0x0C command ans:");
+        // PrintAndLogEx(NORMAL, "%s", sprint_hex(data, datalen));
+        // rawClose();
+        // return true;
+    // }
 
-	// rawClose();
-	return false;
+    // rawClose();
+    return false;
 }
 
 // get and print general info about all known 14b chips
 bool HF14BReader(bool verbose){
 
-	// try std 14b (atqb)
-	if (HF14B_Std_Reader(verbose)) return true;
+    // try std 14b (atqb)
+    if (HF14B_Std_Reader(verbose)) return true;
 
-	// try ST Microelectronics 14b
-	if (HF14B_ST_Reader(verbose)) return true;
+    // try ST Microelectronics 14b
+    if (HF14B_ST_Reader(verbose)) return true;
 
-	// try unknown 14b read commands (to be identified later)
-	// could be read of calypso, CEPAS, moneo, or pico pass.
-	if (HF14B_Other_Reader()) return true;
+    // try unknown 14b read commands (to be identified later)
+    // could be read of calypso, CEPAS, moneo, or pico pass.
+    if (HF14B_Other_Reader()) return true;
 
-	if (verbose) PrintAndLogEx(FAILED, "no 14443-B tag found");
-	return false;
+    if (verbose) PrintAndLogEx(FAILED, "no 14443-B tag found");
+    return false;
 }
 
 // menu command to get and print general info about all known 14b chips
 int CmdHF14BReader(const char *Cmd){
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if (cmdp == 'h') return usage_hf_14b_reader();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (cmdp == 'h') return usage_hf_14b_reader();
 
-	bool verbose = !(cmdp == 's');
-	return HF14BReader(verbose);
+    bool verbose = !(cmdp == 's');
+    return HF14BReader(verbose);
 }
 
 /* New command to read the contents of a SRI512|SRIX4K tag
@@ -717,16 +717,16 @@ int CmdHF14BReader(const char *Cmd){
  * this command just dumps the contents of the memory/
  */
 int CmdHF14BReadSri(const char *Cmd){
- 	char cmdp = tolower(param_getchar(Cmd, 0));
-	if (strlen(Cmd) < 1 || cmdp == 'h') return usage_hf_14b_read_srx();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) < 1 || cmdp == 'h') return usage_hf_14b_read_srx();
 
-	uint8_t tagtype = param_get8(Cmd, 0);
-	uint8_t blocks = (tagtype == 1) ? 0x7F : 0x0F;
+    uint8_t tagtype = param_get8(Cmd, 0);
+    uint8_t blocks = (tagtype == 1) ? 0x7F : 0x0F;
 
-	UsbCommand c = {CMD_READ_SRI_TAG, {blocks, 0, 0}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+    UsbCommand c = {CMD_READ_SRI_TAG, {blocks, 0, 0}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 // New command to write a SRI512/SRIX4K tag.
 int CmdHF14BWriteSri(const char *Cmd){
@@ -740,215 +740,215 @@ int CmdHF14BWriteSri(const char *Cmd){
  * Special block FF =  otp_lock_reg block.
  * Data len 4 bytes-
  */
- 	char cmdp = tolower(param_getchar(Cmd, 0));
-	uint8_t blockno = -1;
-	uint8_t data[4] = {0x00};
-	bool isSrix4k = true;
-	char str[30];
-	memset(str, 0x00, sizeof(str));
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    uint8_t blockno = -1;
+    uint8_t data[4] = {0x00};
+    bool isSrix4k = true;
+    char str[30];
+    memset(str, 0x00, sizeof(str));
 
-	if (strlen(Cmd) < 1 || cmdp == 'h') return usage_hf_14b_write_srx();
+    if (strlen(Cmd) < 1 || cmdp == 'h') return usage_hf_14b_write_srx();
 
-	if ( cmdp == '2' )
-		isSrix4k = false;
+    if ( cmdp == '2' )
+        isSrix4k = false;
 
-	//blockno = param_get8(Cmd, 1);
+    //blockno = param_get8(Cmd, 1);
 
-	if ( param_gethex(Cmd, 1, &blockno, 2) ) {
-		PrintAndLogEx(WARNING, "block number must include 2 HEX symbols");
-		return 0;
-	}
+    if ( param_gethex(Cmd, 1, &blockno, 2) ) {
+        PrintAndLogEx(WARNING, "block number must include 2 HEX symbols");
+        return 0;
+    }
 
-	if ( isSrix4k ){
-		if ( blockno > 0x7f && blockno != 0xff ){
-			PrintAndLogEx(FAILED, "block number out of range");
-			return 0;
-		}
-	} else {
-		if ( blockno > 0x0f && blockno != 0xff ){
-			PrintAndLogEx(FAILED, "block number out of range");
-			return 0;
-		}
-	}
+    if ( isSrix4k ){
+        if ( blockno > 0x7f && blockno != 0xff ){
+            PrintAndLogEx(FAILED, "block number out of range");
+            return 0;
+        }
+    } else {
+        if ( blockno > 0x0f && blockno != 0xff ){
+            PrintAndLogEx(FAILED, "block number out of range");
+            return 0;
+        }
+    }
 
-	if (param_gethex(Cmd, 2, data, 8)) {
-		PrintAndLogEx(WARNING, "data must include 8 HEX symbols");
-		return 0;
-	}
+    if (param_gethex(Cmd, 2, data, 8)) {
+        PrintAndLogEx(WARNING, "data must include 8 HEX symbols");
+        return 0;
+    }
 
-	if ( blockno == 0xff) {
-		PrintAndLogEx(SUCCESS, "[%s] Write special block %02X [ %s ]",
-			(isSrix4k) ? "SRIX4K":"SRI512",
-			blockno,
-			sprint_hex(data,4)
-		);
-	} else {
-		PrintAndLogEx(SUCCESS, "[%s] Write block %02X [ %s ]",
-			(isSrix4k) ? "SRIX4K":"SRI512",
-			blockno,
-			sprint_hex(data,4)
-		);
-	}
+    if ( blockno == 0xff) {
+        PrintAndLogEx(SUCCESS, "[%s] Write special block %02X [ %s ]",
+            (isSrix4k) ? "SRIX4K":"SRI512",
+            blockno,
+            sprint_hex(data,4)
+        );
+    } else {
+        PrintAndLogEx(SUCCESS, "[%s] Write block %02X [ %s ]",
+            (isSrix4k) ? "SRIX4K":"SRI512",
+            blockno,
+            sprint_hex(data,4)
+        );
+    }
 
-	sprintf(str, "-ss -c %02x %02x %02x %02x %02x %02x", ISO14443B_WRITE_BLK, blockno, data[0], data[1], data[2], data[3]);
-	CmdHF14BCmdRaw(str);
-	return 0;
+    sprintf(str, "-ss -c %02x %02x %02x %02x %02x %02x", ISO14443B_WRITE_BLK, blockno, data[0], data[1], data[2], data[3]);
+    CmdHF14BCmdRaw(str);
+    return 0;
 }
 
 // need to write to file
 int CmdHF14BDump(const char*Cmd) {
 
-	uint8_t fileNameLen = 0;
-	char filename[FILE_PATH_SIZE] = {0};
-	char * fptr = filename;
-	bool errors = false;
-	uint8_t cmdp = 0, cardtype = 1;
-	uint16_t cardsize = 0;
-	uint8_t blocks = 0;
-	iso14b_card_select_t card;
+    uint8_t fileNameLen = 0;
+    char filename[FILE_PATH_SIZE] = {0};
+    char * fptr = filename;
+    bool errors = false;
+    uint8_t cmdp = 0, cardtype = 1;
+    uint16_t cardsize = 0;
+    uint8_t blocks = 0;
+    iso14b_card_select_t card;
 
-	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch (tolower(param_getchar(Cmd, cmdp))) {
-		case 'h':
-			return usage_hf_14b_dump();
-		case 'f':
-			fileNameLen = param_getstr(Cmd, cmdp+1, filename, FILE_PATH_SIZE);
-			cmdp += 2;
-			break;
-		default:
-			if (cmdp == 0) {
-				cardtype = param_get8ex(Cmd, cmdp, 1, 10);
-				cmdp++;
-			} else {
-				PrintAndLogEx(WARNING, "Unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
-				errors = true;
-				break;
-			}
-		}
-	}
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+        case 'h':
+            return usage_hf_14b_dump();
+        case 'f':
+            fileNameLen = param_getstr(Cmd, cmdp+1, filename, FILE_PATH_SIZE);
+            cmdp += 2;
+            break;
+        default:
+            if (cmdp == 0) {
+                cardtype = param_get8ex(Cmd, cmdp, 1, 10);
+                cmdp++;
+            } else {
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
+                errors = true;
+                break;
+            }
+        }
+    }
 
-	//Validations
-	if (errors) return usage_hf_14b_dump();
+    //Validations
+    if (errors) return usage_hf_14b_dump();
 
-	switch (cardtype){
-		case 2:
-			cardsize = (512/8) + 4;
-			blocks = 0x0F;
-			break;
-		case 1:
-		default:
-			cardsize = (4096/8) + 4;
-			blocks = 0x7F;
-			break;
-	}
+    switch (cardtype){
+        case 2:
+            cardsize = (512/8) + 4;
+            blocks = 0x0F;
+            break;
+        case 1:
+        default:
+            cardsize = (4096/8) + 4;
+            blocks = 0x7F;
+            break;
+    }
 
-	if (!get_14b_UID(&card)) {
-		PrintAndLogEx(WARNING, "No tag found.");
-		return 1;
-	}
+    if (!get_14b_UID(&card)) {
+        PrintAndLogEx(WARNING, "No tag found.");
+        return 1;
+    }
 
-	if (fileNameLen < 1) {
-		PrintAndLogEx(INFO, "Using UID as filename");
-		fptr += sprintf(fptr, "hf-14b-");
-		FillFileNameByUID(fptr, card.uid, "-dump", card.uidlen);
-	}
+    if (fileNameLen < 1) {
+        PrintAndLogEx(INFO, "Using UID as filename");
+        fptr += sprintf(fptr, "hf-14b-");
+        FillFileNameByUID(fptr, card.uid, "-dump", card.uidlen);
+    }
 
-	// detect blocksize from card :)
-	PrintAndLogEx(NORMAL, "Reading memory from tag UID %s", sprint_hex(card.uid, card.uidlen));
+    // detect blocksize from card :)
+    PrintAndLogEx(NORMAL, "Reading memory from tag UID %s", sprint_hex(card.uid, card.uidlen));
 
-	uint8_t data[cardsize];
-	memset(data, 0, sizeof(data));
+    uint8_t data[cardsize];
+    memset(data, 0, sizeof(data));
 
-	int blocknum = 0;
-	uint8_t *recv = NULL;
+    int blocknum = 0;
+    uint8_t *recv = NULL;
 
-	UsbCommand resp;
-	UsbCommand c = {CMD_ISO_14443B_COMMAND, { ISO14B_CONNECT | ISO14B_SELECT_SR, 0, 0}};
-	clearCommandBuffer();
-	SendCommand(&c);
+    UsbCommand resp;
+    UsbCommand c = {CMD_ISO_14443B_COMMAND, { ISO14B_CONNECT | ISO14B_SELECT_SR, 0, 0}};
+    clearCommandBuffer();
+    SendCommand(&c);
 
-	//select
-	if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
-		if (resp.arg[0]) {
-			PrintAndLogEx(INFO, "failed to select %d | %d", resp.arg[0], resp.arg[1]);
-			goto out;
-		}
-	}
+    //select
+    if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
+        if (resp.arg[0]) {
+            PrintAndLogEx(INFO, "failed to select %d | %d", resp.arg[0], resp.arg[1]);
+            goto out;
+        }
+    }
 
-	c.arg[0] = ISO14B_APPEND_CRC | ISO14B_RAW;
-	c.arg[1] = 2;
+    c.arg[0] = ISO14B_APPEND_CRC | ISO14B_RAW;
+    c.arg[1] = 2;
 
-	uint8_t *req = c.d.asBytes;
-	req[0] = ISO14443B_READ_BLK;
+    uint8_t *req = c.d.asBytes;
+    req[0] = ISO14443B_READ_BLK;
 
-	for (int retry = 0; retry < 5; retry++) {
+    for (int retry = 0; retry < 5; retry++) {
 
-		req[1] = blocknum;
+        req[1] = blocknum;
 
-		clearCommandBuffer();
-		SendCommand(&c);
+        clearCommandBuffer();
+        SendCommand(&c);
 
-		if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
+        if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
 
-			uint8_t status = resp.arg[0] & 0xFF;
-			if ( status > 0 ) {
-				continue;
-			}
+            uint8_t status = resp.arg[0] & 0xFF;
+            if ( status > 0 ) {
+                continue;
+            }
 
-			uint16_t len = (resp.arg[1] & 0xFFFF);
-			recv = resp.d.asBytes;
+            uint16_t len = (resp.arg[1] & 0xFFFF);
+            recv = resp.d.asBytes;
 
-			if ( !check_crc(CRC_14443_B, recv, len) ) {
-				PrintAndLogEx(FAILED, "crc fail, retrying one more time");
-				continue;
-			}
+            if ( !check_crc(CRC_14443_B, recv, len) ) {
+                PrintAndLogEx(FAILED, "crc fail, retrying one more time");
+                continue;
+            }
 
-			memcpy(data + (blocknum * 4), resp.d.asBytes, 4);
+            memcpy(data + (blocknum * 4), resp.d.asBytes, 4);
 
-			if ( blocknum == 0xFF) {
-				//last read.
-				break;
-			}
+            if ( blocknum == 0xFF) {
+                //last read.
+                break;
+            }
 
 
-			retry = 0;
-			blocknum++;
-			if ( blocknum > blocks ) {
-				// read config block
-				blocknum = 0xFF;
-			}
+            retry = 0;
+            blocknum++;
+            if ( blocknum > blocks ) {
+                // read config block
+                blocknum = 0xFF;
+            }
 
-			printf("."); fflush(stdout);
-		}
-	}
+            printf("."); fflush(stdout);
+        }
+    }
 
-	if ( blocknum != 0xFF) {
-		PrintAndLogEx(NORMAL, "\n Dump failed");
-		goto out;
-	}
+    if ( blocknum != 0xFF) {
+        PrintAndLogEx(NORMAL, "\n Dump failed");
+        goto out;
+    }
 
-	PrintAndLogEx(NORMAL, "\n");
-	PrintAndLogEx(NORMAL, "block#   | data         | ascii");
-	PrintAndLogEx(NORMAL, "---------+--------------+----------");
+    PrintAndLogEx(NORMAL, "\n");
+    PrintAndLogEx(NORMAL, "block#   | data         | ascii");
+    PrintAndLogEx(NORMAL, "---------+--------------+----------");
 
-	for (int i = 0; i <= blocks; i++) {
-		PrintAndLogEx(NORMAL,
-			"%3d/0x%02X | %s | %s",
-			i,
-			i,
-			sprint_hex(data + (i*4), 4 ),
-			sprint_ascii(data + (i*4), 4)
-		);
-	}
+    for (int i = 0; i <= blocks; i++) {
+        PrintAndLogEx(NORMAL,
+            "%3d/0x%02X | %s | %s",
+            i,
+            i,
+            sprint_hex(data + (i*4), 4 ),
+            sprint_ascii(data + (i*4), 4)
+        );
+    }
 
-	PrintAndLogEx(NORMAL, "\n");
+    PrintAndLogEx(NORMAL, "\n");
 
 
-	size_t datalen = (blocks+1) * 4;
-	saveFileEML(filename, "eml", data, datalen, 4);
-	saveFile(filename, "bin", data, datalen);
+    size_t datalen = (blocks+1) * 4;
+    saveFileEML(filename, "eml", data, datalen, 4);
+    saveFile(filename, "bin", data, datalen);
 out:
-	return switch_off_field_14b();
+    return switch_off_field_14b();
 }
 
 uint32_t srix4kEncode(uint32_t value) {
@@ -956,162 +956,162 @@ uint32_t srix4kEncode(uint32_t value) {
 // vv = value
 // pp = position
 //                vv vv vv pp
-4 bytes			: 00 1A 20 01
+4 bytes         : 00 1A 20 01
 */
-	// only the lower crumbs.
-	uint8_t block = (value & 0xFF);
-	uint8_t i = 0;
-	uint8_t valuebytes[] = {0,0,0};
+    // only the lower crumbs.
+    uint8_t block = (value & 0xFF);
+    uint8_t i = 0;
+    uint8_t valuebytes[] = {0,0,0};
 
-	num_to_bytes(value, 3, valuebytes);
+    num_to_bytes(value, 3, valuebytes);
 
-	// Scrambled part
-	// Crumb swapping of value.
-	uint8_t temp[] = {0,0};
-	temp[0] = (CRUMB(value, 22) << 4 | CRUMB(value, 14 ) << 2 | CRUMB(value, 6)) << 4;
-	temp[0] |= CRUMB(value, 20) << 4 | CRUMB(value, 12 ) << 2 | CRUMB(value, 4);
-	temp[1] = (CRUMB(value, 18) << 4 | CRUMB(value, 10 ) << 2 | CRUMB(value, 2)) << 4;
-	temp[1] |= CRUMB(value, 16) << 4 | CRUMB(value, 8  ) << 2 | CRUMB(value, 0);
+    // Scrambled part
+    // Crumb swapping of value.
+    uint8_t temp[] = {0,0};
+    temp[0] = (CRUMB(value, 22) << 4 | CRUMB(value, 14 ) << 2 | CRUMB(value, 6)) << 4;
+    temp[0] |= CRUMB(value, 20) << 4 | CRUMB(value, 12 ) << 2 | CRUMB(value, 4);
+    temp[1] = (CRUMB(value, 18) << 4 | CRUMB(value, 10 ) << 2 | CRUMB(value, 2)) << 4;
+    temp[1] |= CRUMB(value, 16) << 4 | CRUMB(value, 8  ) << 2 | CRUMB(value, 0);
 
-	// chksum part
-	uint32_t chksum = 0xFF - block;
+    // chksum part
+    uint32_t chksum = 0xFF - block;
 
-	// chksum is reduced by each nibbles of value.
-	for (i = 0; i < 3; ++i){
-		chksum -= NIBBLE_HIGH(valuebytes[i]);
-		chksum -= NIBBLE_LOW(valuebytes[i]);
-	}
-
-	// base4 conversion and left shift twice
-	i = 3;
-	uint8_t base4[] = {0,0,0,0};
-	while( chksum !=0 ){
-        base4[i--] = (chksum % 4 << 2);
-		chksum /= 4;
+    // chksum is reduced by each nibbles of value.
+    for (i = 0; i < 3; ++i){
+        chksum -= NIBBLE_HIGH(valuebytes[i]);
+        chksum -= NIBBLE_LOW(valuebytes[i]);
     }
 
-	// merge scambled and chksum parts
-	uint32_t encvalue =
-		( NIBBLE_LOW ( base4[0]) << 28 ) |
-		( NIBBLE_HIGH( temp[0])  << 24 ) |
+    // base4 conversion and left shift twice
+    i = 3;
+    uint8_t base4[] = {0,0,0,0};
+    while( chksum !=0 ){
+        base4[i--] = (chksum % 4 << 2);
+        chksum /= 4;
+    }
 
-		( NIBBLE_LOW ( base4[1]) << 20 ) |
-		( NIBBLE_LOW ( temp[0])  << 16 ) |
+    // merge scambled and chksum parts
+    uint32_t encvalue =
+        ( NIBBLE_LOW ( base4[0]) << 28 ) |
+        ( NIBBLE_HIGH( temp[0])  << 24 ) |
 
-		( NIBBLE_LOW ( base4[2]) << 12 ) |
-		( NIBBLE_HIGH( temp[1])  << 8 ) |
+        ( NIBBLE_LOW ( base4[1]) << 20 ) |
+        ( NIBBLE_LOW ( temp[0])  << 16 ) |
 
-		( NIBBLE_LOW ( base4[3]) << 4 ) |
-		  NIBBLE_LOW ( temp[1] );
+        ( NIBBLE_LOW ( base4[2]) << 12 ) |
+        ( NIBBLE_HIGH( temp[1])  << 8 ) |
 
-	PrintAndLogEx(NORMAL, "ICE encoded | %08X -> %08X", value, encvalue);
-	return encvalue;
+        ( NIBBLE_LOW ( base4[3]) << 4 ) |
+          NIBBLE_LOW ( temp[1] );
+
+    PrintAndLogEx(NORMAL, "ICE encoded | %08X -> %08X", value, encvalue);
+    return encvalue;
 }
 uint32_t srix4kDecode(uint32_t value) {
-	switch(value) {
-		case 0xC04F42C5: return 0x003139;
-		case 0xC1484807: return 0x002943;
-		case 0xC0C60848: return 0x001A20;
-	}
-	return 0;
+    switch(value) {
+        case 0xC04F42C5: return 0x003139;
+        case 0xC1484807: return 0x002943;
+        case 0xC0C60848: return 0x001A20;
+    }
+    return 0;
 }
 uint32_t srix4kDecodeCounter(uint32_t num) {
-	uint32_t value = ~num;
-	++value;
-	return value;
+    uint32_t value = ~num;
+    ++value;
+    return value;
 }
 
 uint32_t srix4kGetMagicbytes( uint64_t uid, uint32_t block6, uint32_t block18, uint32_t block19 ){
 #define MASK 0xFFFFFFFF;
-	uint32_t uid32 = uid & MASK;
-	uint32_t counter = srix4kDecodeCounter(block6);
-	uint32_t decodedBlock18 = srix4kDecode(block18);
-	uint32_t decodedBlock19 = srix4kDecode(block19);
-	uint32_t doubleBlock = (decodedBlock18 << 16 | decodedBlock19) + 1;
+    uint32_t uid32 = uid & MASK;
+    uint32_t counter = srix4kDecodeCounter(block6);
+    uint32_t decodedBlock18 = srix4kDecode(block18);
+    uint32_t decodedBlock19 = srix4kDecode(block19);
+    uint32_t doubleBlock = (decodedBlock18 << 16 | decodedBlock19) + 1;
 
-	uint32_t result = (uid32 * doubleBlock * counter) & MASK;
-	PrintAndLogEx(SUCCESS, "Magic bytes | %08X", result);
-	return result;
+    uint32_t result = (uid32 * doubleBlock * counter) & MASK;
+    PrintAndLogEx(SUCCESS, "Magic bytes | %08X", result);
+    return result;
 }
 int srix4kValid(const char *Cmd){
 
-	uint64_t uid = 0xD00202501A4532F9;
-	uint32_t block6 = 0xFFFFFFFF;
-	uint32_t block18 = 0xC04F42C5;
-	uint32_t block19 = 0xC1484807;
-	uint32_t block21 = 0xD1BCABA4;
+    uint64_t uid = 0xD00202501A4532F9;
+    uint32_t block6 = 0xFFFFFFFF;
+    uint32_t block18 = 0xC04F42C5;
+    uint32_t block19 = 0xC1484807;
+    uint32_t block21 = 0xD1BCABA4;
 
-	uint32_t test_b18 = 0x00313918;
-	uint32_t test_b18_enc = srix4kEncode(test_b18);
-	//uint32_t test_b18_dec = srix4kDecode(test_b18_enc);
-	PrintAndLogEx(SUCCESS, "ENCODE & CHECKSUM |  %08X -> %08X (%s)", test_b18, test_b18_enc , "");
+    uint32_t test_b18 = 0x00313918;
+    uint32_t test_b18_enc = srix4kEncode(test_b18);
+    //uint32_t test_b18_dec = srix4kDecode(test_b18_enc);
+    PrintAndLogEx(SUCCESS, "ENCODE & CHECKSUM |  %08X -> %08X (%s)", test_b18, test_b18_enc , "");
 
-	uint32_t magic = srix4kGetMagicbytes(uid, block6, block18, block19);
-	PrintAndLogEx(SUCCESS, "BLOCK 21 |  %08X -> %08X (no XOR)", block21, magic ^ block21);
-	return 0;
+    uint32_t magic = srix4kGetMagicbytes(uid, block6, block18, block19);
+    PrintAndLogEx(SUCCESS, "BLOCK 21 |  %08X -> %08X (no XOR)", block21, magic ^ block21);
+    return 0;
 }
 
 bool waitCmd14b(bool verbose) {
 
-	bool crc = false;
-	uint8_t data[USB_CMD_DATA_SIZE] = {0x00};
-	uint8_t status = 0;
-	uint16_t len = 0;
+    bool crc = false;
+    uint8_t data[USB_CMD_DATA_SIZE] = {0x00};
+    uint8_t status = 0;
+    uint16_t len = 0;
     UsbCommand resp;
 
     if (WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
 
-		status = (resp.arg[0] & 0xFF);
-		if ( status > 0 ) return false;
+        status = (resp.arg[0] & 0xFF);
+        if ( status > 0 ) return false;
 
-		len = (resp.arg[1] & 0xFFFF);
+        len = (resp.arg[1] & 0xFFFF);
 
-		memcpy(data, resp.d.asBytes, len);
+        memcpy(data, resp.d.asBytes, len);
 
-		if (verbose) {
-			if ( len >= 3 ) {
-				crc = check_crc(CRC_14443_B, data, len);
+        if (verbose) {
+            if ( len >= 3 ) {
+                crc = check_crc(CRC_14443_B, data, len);
 
-				PrintAndLogEx(NORMAL, "[LEN %u] %s[%02X %02X] %s",
-					len,
-					sprint_hex(data, len-2),
-					data[len-2],
-					data[len-1],
-					(crc) ? "OK" : "FAIL"
-				);
-			} else {
-				PrintAndLogEx(NORMAL, "[LEN %u] %s", len,	sprint_hex(data, len) );
-			}
-		}
-		return true;
+                PrintAndLogEx(NORMAL, "[LEN %u] %s[%02X %02X] %s",
+                    len,
+                    sprint_hex(data, len-2),
+                    data[len-2],
+                    data[len-1],
+                    (crc) ? "OK" : "FAIL"
+                );
+            } else {
+                PrintAndLogEx(NORMAL, "[LEN %u] %s", len, sprint_hex(data, len) );
+            }
+        }
+        return true;
     } else {
         PrintAndLogEx(WARNING, "command execution timeout");
-		return false;
+        return false;
     }
 }
 
 static command_t CommandTable[] = {
-	{"help",        CmdHelp,        1, "This help"},
-	{"dump",		CmdHF14BDump,	0, "Read all memory pages of an ISO14443-B tag, save to file"},
-	{"info",        CmdHF14Binfo,   0, "Tag information"},
-	{"list",        CmdHF14BList,   0, "[Deprecated] List ISO 14443B history"},
-	{"raw",         CmdHF14BCmdRaw, 0, "Send raw hex data to tag"},
-	{"reader",      CmdHF14BReader, 0, "Act as a 14443B reader to identify a tag"},
-	{"sim",         CmdHF14BSim,    0, "Fake ISO 14443B tag"},
-	{"sniff",       CmdHF14BSniff,  0, "Eavesdrop ISO 14443B"},
-	{"sriread",		CmdHF14BReadSri,  0, "Read contents of a SRI512 | SRIX4K tag"},
-	{"sriwrite",    CmdHF14BWriteSri, 0, "Write data to a SRI512 | SRIX4K tag"},
-	//{"valid",   	srix4kValid,	1, "srix4k checksum test"},
-	{NULL, NULL, 0, NULL}
+    {"help",        CmdHelp,        1, "This help"},
+    {"dump",        CmdHF14BDump,   0, "Read all memory pages of an ISO14443-B tag, save to file"},
+    {"info",        CmdHF14Binfo,   0, "Tag information"},
+    {"list",        CmdHF14BList,   0, "[Deprecated] List ISO 14443B history"},
+    {"raw",         CmdHF14BCmdRaw, 0, "Send raw hex data to tag"},
+    {"reader",      CmdHF14BReader, 0, "Act as a 14443B reader to identify a tag"},
+    {"sim",         CmdHF14BSim,    0, "Fake ISO 14443B tag"},
+    {"sniff",       CmdHF14BSniff,  0, "Eavesdrop ISO 14443B"},
+    {"sriread",     CmdHF14BReadSri,  0, "Read contents of a SRI512 | SRIX4K tag"},
+    {"sriwrite",    CmdHF14BWriteSri, 0, "Write data to a SRI512 | SRIX4K tag"},
+    //{"valid",     srix4kValid,    1, "srix4k checksum test"},
+    {NULL, NULL, 0, NULL}
 };
 
 int CmdHF14B(const char *Cmd) {
-	clearCommandBuffer();
-	CmdsParse(CommandTable, Cmd);
-	return 0;
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
+    return 0;
 }
 
 int CmdHelp(const char *Cmd) {
-	CmdsHelp(CommandTable);
-	return 0;
+    CmdsHelp(CommandTable);
+    return 0;
 }
diff --git a/client/cmdhf14b.h b/client/cmdhf14b.h
index 74b279620..f77658c19 100644
--- a/client/cmdhf14b.h
+++ b/client/cmdhf14b.h
@@ -26,8 +26,8 @@
 #include "cmdhf.h"
 #include "prng.h"
 #include "mbedtls/sha1.h"
-#include "mifare.h"		// structs/enum for ISO14B
-#include "protocols.h"	// definitions of ISO14B protocol
+#include "mifare.h"     // structs/enum for ISO14B
+#include "protocols.h"  // definitions of ISO14B protocol
 
 int usage_hf_14b_info(void);
 int usage_hf_14b_reader(void);
diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index bdec7c339..9164ac70e 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -24,313 +24,313 @@
 // variant, but offers the possibility to analyze the waveforms directly.
 #include "cmdhf15.h"
 
-#define FrameSOF				Iso15693FrameSOF
-#define Logic0					Iso15693Logic0
-#define Logic1					Iso15693Logic1
-#define FrameEOF				Iso15693FrameEOF
+#define FrameSOF                Iso15693FrameSOF
+#define Logic0                  Iso15693Logic0
+#define Logic1                  Iso15693Logic1
+#define FrameEOF                Iso15693FrameEOF
 
-#define Crc(data, len)			crc(CRC_15693, (data), (len))
-#define CheckCrc(data, len)		check_crc(CRC_15693, (data), (len))
-#define AddCrc(data, len)		compute_crc(CRC_15693, (data), (len), (data)+(len), (data)+(len)+1)
+#define Crc(data, len)          crc(CRC_15693, (data), (len))
+#define CheckCrc(data, len)     check_crc(CRC_15693, (data), (len))
+#define AddCrc(data, len)       compute_crc(CRC_15693, (data), (len), (data)+(len), (data)+(len)+1)
 
-#define sprintUID(target, uid)	Iso15693sprintUID((target), (uid))
+#define sprintUID(target, uid)  Iso15693sprintUID((target), (uid))
 
 // structure and database for uid -> tagtype lookups
 typedef struct {
-	uint64_t uid;
-	int mask; // how many MSB bits used
-	char* desc;
+    uint64_t uid;
+    int mask; // how many MSB bits used
+    char* desc;
 } productName;
 
 const productName uidmapping[] = {
 
-	// UID, #significant Bits, "Vendor(+Product)"
-	{ 0xE001000000000000LL, 16, "Motorola UK" },
+    // UID, #significant Bits, "Vendor(+Product)"
+    { 0xE001000000000000LL, 16, "Motorola UK" },
 
-	// E0 02 xx
-	//   02 = ST Microelectronics
-	//   XX = IC id (Chip ID Family)
-	{ 0xE002000000000000LL, 16, "ST Microelectronics SA France" },
-	{ 0xE002050000000000LL, 24, "ST Microelectronics; LRI64   [IC id = 05]"},
-	{ 0xE002080000000000LL, 24, "ST Microelectronics; LRI2K   [IC id = 08]"},
-	{ 0xE0020A0000000000LL, 24, "ST Microelectronics; LRIS2K  [IC id = 10]"},
-	{ 0xE002440000000000LL, 24, "ST Microelectronics; LRIS64K [IC id = 68]"},
+    // E0 02 xx
+    //   02 = ST Microelectronics
+    //   XX = IC id (Chip ID Family)
+    { 0xE002000000000000LL, 16, "ST Microelectronics SA France" },
+    { 0xE002050000000000LL, 24, "ST Microelectronics; LRI64   [IC id = 05]"},
+    { 0xE002080000000000LL, 24, "ST Microelectronics; LRI2K   [IC id = 08]"},
+    { 0xE0020A0000000000LL, 24, "ST Microelectronics; LRIS2K  [IC id = 10]"},
+    { 0xE002440000000000LL, 24, "ST Microelectronics; LRIS64K [IC id = 68]"},
 
-	{ 0xE003000000000000LL, 16, "Hitachi, Ltd Japan" },
+    { 0xE003000000000000LL, 16, "Hitachi, Ltd Japan" },
 
-	// E0 04 xx
-	//   04 = Manufacturer code (Philips/NXP)
-	//   XX = IC id (Chip ID Family)
-	//I-Code SLI SL2 ICS20 [IC id = 01]
-	//I-Code SLI-S         [IC id = 02]
-	//I-Code SLI-L         [IC id = 03]
-	//I-Code SLIX          [IC id = 01 + bit36 set to 1 (starting from bit0 - different from normal SLI)]
-	//I-Code SLIX-S        [IC id = 02 + bit36 set to 1]
-	//I-Code SLIX-L        [IC id = 03 + bit36 set to 1]
-	{ 0xE004000000000000LL, 16, "NXP Semiconductors Germany (Philips)" },
-	{ 0xE004010000000000LL, 24, "NXP(Philips); IC SL2 ICS20/ICS21(SLI) ICS2002/ICS2102(SLIX)" },
-	{ 0xE004020000000000LL, 24, "NXP(Philips); IC SL2 ICS53/ICS54(SLI-S) ICS5302/ICS5402(SLIX-S)" },
-	{ 0xE004030000000000LL, 24, "NXP(Philips); IC SL2 ICS50/ICS51(SLI-L) ICS5002/ICS5102(SLIX-L)" },
+    // E0 04 xx
+    //   04 = Manufacturer code (Philips/NXP)
+    //   XX = IC id (Chip ID Family)
+    //I-Code SLI SL2 ICS20 [IC id = 01]
+    //I-Code SLI-S         [IC id = 02]
+    //I-Code SLI-L         [IC id = 03]
+    //I-Code SLIX          [IC id = 01 + bit36 set to 1 (starting from bit0 - different from normal SLI)]
+    //I-Code SLIX-S        [IC id = 02 + bit36 set to 1]
+    //I-Code SLIX-L        [IC id = 03 + bit36 set to 1]
+    { 0xE004000000000000LL, 16, "NXP Semiconductors Germany (Philips)" },
+    { 0xE004010000000000LL, 24, "NXP(Philips); IC SL2 ICS20/ICS21(SLI) ICS2002/ICS2102(SLIX)" },
+    { 0xE004020000000000LL, 24, "NXP(Philips); IC SL2 ICS53/ICS54(SLI-S) ICS5302/ICS5402(SLIX-S)" },
+    { 0xE004030000000000LL, 24, "NXP(Philips); IC SL2 ICS50/ICS51(SLI-L) ICS5002/ICS5102(SLIX-L)" },
 
-	// E0 05 XX .. .. ..
-	//   05 = Manufacturer code (Infineon)
-	//   XX = IC id (Chip ID Family)
-	{ 0xE005000000000000LL, 16, "Infineon Technologies AG Germany" },
-	{ 0xE005A10000000000LL, 24, "Infineon; SRF55V01P [IC id = 161] plain mode 1kBit"},
-	{ 0xE005A80000000000LL, 24, "Infineon; SRF55V01P [IC id = 168] pilot series 1kBit"},
-	{ 0xE005400000000000LL, 24, "Infineon; SRF55V02P [IC id = 64]  plain mode 2kBit"},
-	{ 0xE005000000000000LL, 24, "Infineon; SRF55V10P [IC id = 00]  plain mode 10KBit"},
-	{ 0xE005500000000000LL, 24, "Infineon; SRF55V02S [IC id = 80]  secure mode 2kBit"},
-	{ 0xE005100000000000LL, 24, "Infineon; SRF55V10S [IC id = 16]  secure mode 10KBit"},
-	{ 0xE0051E0000000000LL, 23, "Infineon; SLE66r01P [IC id = 3x = My-d Move or My-d move NFC]"},
-	{ 0xE005200000000000LL, 21, "Infineon; SLE66r01P [IC id = 3x = My-d Move or My-d move NFC]"},
+    // E0 05 XX .. .. ..
+    //   05 = Manufacturer code (Infineon)
+    //   XX = IC id (Chip ID Family)
+    { 0xE005000000000000LL, 16, "Infineon Technologies AG Germany" },
+    { 0xE005A10000000000LL, 24, "Infineon; SRF55V01P [IC id = 161] plain mode 1kBit"},
+    { 0xE005A80000000000LL, 24, "Infineon; SRF55V01P [IC id = 168] pilot series 1kBit"},
+    { 0xE005400000000000LL, 24, "Infineon; SRF55V02P [IC id = 64]  plain mode 2kBit"},
+    { 0xE005000000000000LL, 24, "Infineon; SRF55V10P [IC id = 00]  plain mode 10KBit"},
+    { 0xE005500000000000LL, 24, "Infineon; SRF55V02S [IC id = 80]  secure mode 2kBit"},
+    { 0xE005100000000000LL, 24, "Infineon; SRF55V10S [IC id = 16]  secure mode 10KBit"},
+    { 0xE0051E0000000000LL, 23, "Infineon; SLE66r01P [IC id = 3x = My-d Move or My-d move NFC]"},
+    { 0xE005200000000000LL, 21, "Infineon; SLE66r01P [IC id = 3x = My-d Move or My-d move NFC]"},
 
-	{ 0xE006000000000000LL, 16, "Cylink USA" },
+    { 0xE006000000000000LL, 16, "Cylink USA" },
 
 
-	// E0 07 xx
-	//   07 = Texas Instruments
-	//   XX = from bit 41 to bit 43 = product configuration - from bit 44 to bit 47 IC id (Chip ID Family)
-	//Tag IT RFIDType-I Plus, 2kBit, TI Inlay
-	//Tag-it HF-I Plus Inlay             [IC id = 00] -> b'0000 000 2kBit
-	//Tag-it HF-I Plus Chip              [IC id = 64] -> b'1000 000 2kBit
-	//Tag-it HF-I Standard Chip / Inlays [IC id = 96] -> b'1100 000 256Bit
-	//Tag-it HF-I Pro Chip / Inlays      [IC id = 98] -> b'1100 010 256Bit, Password protection
-	{ 0xE007000000000000LL, 16, "Texas Instrument France" },
-	{ 0xE007000000000000LL, 20, "Texas Instrument; Tag-it HF-I Plus Inlay; 64x32bit" },
-	{ 0xE007100000000000LL, 20, "Texas Instrument; Tag-it HF-I Plus Chip; 64x32bit" },
-	{ 0xE007800000000000LL, 23, "Texas Instrument; Tag-it HF-I Plus (RF-HDT-DVBB tag or Third Party Products)" },
-	{ 0xE007C00000000000LL, 23, "Texas Instrument; Tag-it HF-I Standard; 8x32bit" },
-	{ 0xE007C40000000000LL, 23, "Texas Instrument; Tag-it HF-I Pro; 8x23bit; password" },
+    // E0 07 xx
+    //   07 = Texas Instruments
+    //   XX = from bit 41 to bit 43 = product configuration - from bit 44 to bit 47 IC id (Chip ID Family)
+    //Tag IT RFIDType-I Plus, 2kBit, TI Inlay
+    //Tag-it HF-I Plus Inlay             [IC id = 00] -> b'0000 000 2kBit
+    //Tag-it HF-I Plus Chip              [IC id = 64] -> b'1000 000 2kBit
+    //Tag-it HF-I Standard Chip / Inlays [IC id = 96] -> b'1100 000 256Bit
+    //Tag-it HF-I Pro Chip / Inlays      [IC id = 98] -> b'1100 010 256Bit, Password protection
+    { 0xE007000000000000LL, 16, "Texas Instrument France" },
+    { 0xE007000000000000LL, 20, "Texas Instrument; Tag-it HF-I Plus Inlay; 64x32bit" },
+    { 0xE007100000000000LL, 20, "Texas Instrument; Tag-it HF-I Plus Chip; 64x32bit" },
+    { 0xE007800000000000LL, 23, "Texas Instrument; Tag-it HF-I Plus (RF-HDT-DVBB tag or Third Party Products)" },
+    { 0xE007C00000000000LL, 23, "Texas Instrument; Tag-it HF-I Standard; 8x32bit" },
+    { 0xE007C40000000000LL, 23, "Texas Instrument; Tag-it HF-I Pro; 8x23bit; password" },
 
-	{ 0xE008000000000000LL, 16, "Fujitsu Limited Japan" },
-	{ 0xE009000000000000LL, 16, "Matsushita Electronics Corporation, Semiconductor Company Japan" },
-	{ 0xE00A000000000000LL, 16, "NEC Japan" },
-	{ 0xE00B000000000000LL, 16, "Oki Electric Industry Co. Ltd Japan" },
-	{ 0xE00C000000000000LL, 16, "Toshiba Corp. Japan" },
-	{ 0xE00D000000000000LL, 16, "Mitsubishi Electric Corp. Japan" },
-	{ 0xE00E000000000000LL, 16, "Samsung Electronics Co. Ltd Korea" },
-	{ 0xE00F000000000000LL, 16, "Hynix / Hyundai, Korea" },
-	{ 0xE010000000000000LL, 16, "LG-Semiconductors Co. Ltd Korea" },
-	{ 0xE011000000000000LL, 16, "Emosyn-EM Microelectronics USA" },
+    { 0xE008000000000000LL, 16, "Fujitsu Limited Japan" },
+    { 0xE009000000000000LL, 16, "Matsushita Electronics Corporation, Semiconductor Company Japan" },
+    { 0xE00A000000000000LL, 16, "NEC Japan" },
+    { 0xE00B000000000000LL, 16, "Oki Electric Industry Co. Ltd Japan" },
+    { 0xE00C000000000000LL, 16, "Toshiba Corp. Japan" },
+    { 0xE00D000000000000LL, 16, "Mitsubishi Electric Corp. Japan" },
+    { 0xE00E000000000000LL, 16, "Samsung Electronics Co. Ltd Korea" },
+    { 0xE00F000000000000LL, 16, "Hynix / Hyundai, Korea" },
+    { 0xE010000000000000LL, 16, "LG-Semiconductors Co. Ltd Korea" },
+    { 0xE011000000000000LL, 16, "Emosyn-EM Microelectronics USA" },
 
-	{ 0xE012000000000000LL, 16, "HID Corporation" },
-	{ 0xE012000000000000LL, 16, "INSIDE Technology France" },
-	{ 0xE013000000000000LL, 16, "ORGA Kartensysteme GmbH Germany" },
-	{ 0xE014000000000000LL, 16, "SHARP Corporation Japan" },
-	{ 0xE015000000000000LL, 16, "ATMEL France" },
+    { 0xE012000000000000LL, 16, "HID Corporation" },
+    { 0xE012000000000000LL, 16, "INSIDE Technology France" },
+    { 0xE013000000000000LL, 16, "ORGA Kartensysteme GmbH Germany" },
+    { 0xE014000000000000LL, 16, "SHARP Corporation Japan" },
+    { 0xE015000000000000LL, 16, "ATMEL France" },
 
-	{ 0xE016000000000000LL, 16, "EM Microelectronic-Marin SA Switzerland (Skidata)"},
-	{ 0xE016040000000000LL, 24, "EM-Marin SA (Skidata Keycard-eco); EM4034 [IC id = 01] (Read/Write - no AFI)"},
-	{ 0xE0160C0000000000LL, 24, "EM-Marin SA (Skidata); EM4035 [IC id = 03] (Read/Write - replaced by 4233)"},
-	{ 0xE016100000000000LL, 24, "EM-Marin SA (Skidata); EM4135 [IC id = 04] (Read/Write - replaced by 4233) 36x64bit start page 13"},
-	{ 0xE016140000000000LL, 24, "EM-Marin SA (Skidata); EM4036 [IC id = 05] 28pF"},
-	{ 0xE016180000000000LL, 24, "EM-Marin SA (Skidata); EM4006 [IC id = 06] (Read Only)"},
-	{ 0xE0161C0000000000LL, 24, "EM-Marin SA (Skidata); EM4133 [IC id = 07] 23,5pF (Read/Write)"},
-	{ 0xE016200000000000LL, 24, "EM-Marin SA (Skidata); EM4033 [IC id = 08] 23,5pF (Read Only - no AFI / no DSFID / no security blocks)"},
-	{ 0xE016240000000000LL, 24, "EM-Marin SA (Skidata); EM4233 [IC id = 09] 23,5pF CustomerID-102"},
-	{ 0xE016280000000000LL, 24, "EM-Marin SA (Skidata); EM4233 SLIC [IC id = 10] 23,5pF (1Kb flash memory - not provide High Security mode and QuietStorage feature)" },
-	{ 0xE0163C0000000000LL, 24, "EM-Marin SA (Skidata); EM4237 [IC id = 15] 23,5pF"},
-	{ 0xE0167C0000000000LL, 24, "EM-Marin SA (Skidata); EM4233 [IC id = 31] 95pF"},
-	{ 0xE016940000000000LL, 24, "EM-Marin SA (Skidata); EM4036 [IC id = 37] 95pF  51x64bit "},
-	{ 0xE0169c0000000000LL, 24, "EM-Marin SA (Skidata); EM4133 [IC id = 39] 95pF (Read/Write)" },
-	{ 0xE016A80000000000LL, 24, "EM-Marin SA (Skidata); EM4233 SLIC [IC id = 42] 97pF" },
-	{ 0xE016BC0000000000LL, 24, "EM-Marin SA (Skidata); EM4237 [IC id = 47] 97pF" },
+    { 0xE016000000000000LL, 16, "EM Microelectronic-Marin SA Switzerland (Skidata)"},
+    { 0xE016040000000000LL, 24, "EM-Marin SA (Skidata Keycard-eco); EM4034 [IC id = 01] (Read/Write - no AFI)"},
+    { 0xE0160C0000000000LL, 24, "EM-Marin SA (Skidata); EM4035 [IC id = 03] (Read/Write - replaced by 4233)"},
+    { 0xE016100000000000LL, 24, "EM-Marin SA (Skidata); EM4135 [IC id = 04] (Read/Write - replaced by 4233) 36x64bit start page 13"},
+    { 0xE016140000000000LL, 24, "EM-Marin SA (Skidata); EM4036 [IC id = 05] 28pF"},
+    { 0xE016180000000000LL, 24, "EM-Marin SA (Skidata); EM4006 [IC id = 06] (Read Only)"},
+    { 0xE0161C0000000000LL, 24, "EM-Marin SA (Skidata); EM4133 [IC id = 07] 23,5pF (Read/Write)"},
+    { 0xE016200000000000LL, 24, "EM-Marin SA (Skidata); EM4033 [IC id = 08] 23,5pF (Read Only - no AFI / no DSFID / no security blocks)"},
+    { 0xE016240000000000LL, 24, "EM-Marin SA (Skidata); EM4233 [IC id = 09] 23,5pF CustomerID-102"},
+    { 0xE016280000000000LL, 24, "EM-Marin SA (Skidata); EM4233 SLIC [IC id = 10] 23,5pF (1Kb flash memory - not provide High Security mode and QuietStorage feature)" },
+    { 0xE0163C0000000000LL, 24, "EM-Marin SA (Skidata); EM4237 [IC id = 15] 23,5pF"},
+    { 0xE0167C0000000000LL, 24, "EM-Marin SA (Skidata); EM4233 [IC id = 31] 95pF"},
+    { 0xE016940000000000LL, 24, "EM-Marin SA (Skidata); EM4036 [IC id = 37] 95pF  51x64bit "},
+    { 0xE0169c0000000000LL, 24, "EM-Marin SA (Skidata); EM4133 [IC id = 39] 95pF (Read/Write)" },
+    { 0xE016A80000000000LL, 24, "EM-Marin SA (Skidata); EM4233 SLIC [IC id = 42] 97pF" },
+    { 0xE016BC0000000000LL, 24, "EM-Marin SA (Skidata); EM4237 [IC id = 47] 97pF" },
 
-	{ 0xE017000000000000LL, 16, "KSW Microtec GmbH Germany" },
-	{ 0xE018000000000000LL, 16, "ZMD AG Germany" },
-	{ 0xE019000000000000LL, 16, "XICOR, Inc. USA" },
-	{ 0xE01A000000000000LL, 16, "Sony Corporation Japan Identifier Company Country" },
-	{ 0xE01B000000000000LL, 16, "Malaysia Microelectronic Solutions Sdn. Bhd Malaysia" },
-	{ 0xE01C000000000000LL, 16, "Emosyn USA" },
-	{ 0xE01D000000000000LL, 16, "Shanghai Fudan Microelectronics Co. Ltd. P.R. China" },
-	{ 0xE01E000000000000LL, 16, "Magellan Technology Pty Limited Australia" },
-	{ 0xE01F000000000000LL, 16, "Melexis NV BO Switzerland" },
-	{ 0xE020000000000000LL, 16, "Renesas Technology Corp. Japan" },
-	{ 0xE021000000000000LL, 16, "TAGSYS France" },
-	{ 0xE022000000000000LL, 16, "Transcore USA" },
-	{ 0xE023000000000000LL, 16, "Shanghai belling corp., ltd. China" },
-	{ 0xE024000000000000LL, 16, "Masktech Germany Gmbh Germany" },
-	{ 0xE025000000000000LL, 16, "Innovision Research and Technology Plc UK" },
-	{ 0xE026000000000000LL, 16, "Hitachi ULSI Systems Co., Ltd. Japan" },
-	{ 0xE027000000000000LL, 16, "Cypak AB Sweden" },
-	{ 0xE028000000000000LL, 16, "Ricoh Japan" },
-	{ 0xE029000000000000LL, 16, "ASK France" },
-	{ 0xE02A000000000000LL, 16, "Unicore Microsystems, LLC Russian Federation" },
-	{ 0xE02B000000000000LL, 16, "Dallas Semiconductor/Maxim USA" },
-	{ 0xE02C000000000000LL, 16, "Impinj, Inc. USA" },
-	{ 0xE02D000000000000LL, 16, "RightPlug Alliance USA" },
-	{ 0xE02E000000000000LL, 16, "Broadcom Corporation USA" },
-	{ 0xE02F000000000000LL, 16, "MStar Semiconductor, Inc Taiwan, ROC" },
-	{ 0xE030000000000000LL, 16, "BeeDar Technology Inc. USA" },
-	{ 0xE031000000000000LL, 16, "RFIDsec Denmark" },
-	{ 0xE032000000000000LL, 16, "Schweizer Electronic AG Germany" },
-	{ 0xE033000000000000LL, 16, "AMIC Technology Corp Taiwan" },
-	{ 0xE034000000000000LL, 16, "Mikron JSC Russia" },
-	{ 0xE035000000000000LL, 16, "Fraunhofer Institute for Photonic Microsystems Germany" },
-	{ 0xE036000000000000LL, 16, "IDS Microchip AG Switzerland" },
-	{ 0xE037000000000000LL, 16, "Kovio USA" },
-	{ 0xE038000000000000LL, 16, "HMT Microelectronic Ltd Switzerland Identifier Company Country" },
-	{ 0xE039000000000000LL, 16, "Silicon Craft Technology Thailand" },
-	{ 0xE03A000000000000LL, 16, "Advanced Film Device Inc. Japan" },
-	{ 0xE03B000000000000LL, 16, "Nitecrest Ltd UK" },
-	{ 0xE03C000000000000LL, 16, "Verayo Inc. USA" },
-	{ 0xE03D000000000000LL, 16, "HID Global USA" },
-	{ 0xE03E000000000000LL, 16, "Productivity Engineering Gmbh Germany" },
-	{ 0xE03F000000000000LL, 16, "Austriamicrosystems AG (reserved) Austria" },
-	{ 0xE040000000000000LL, 16, "Gemalto SA France" },
-	{ 0xE041000000000000LL, 16, "Renesas Electronics Corporation Japan" },
-	{ 0xE042000000000000LL, 16, "3Alogics Inc Korea" },
-	{ 0xE043000000000000LL, 16, "Top TroniQ Asia Limited Hong Kong" },
-	{ 0xE044000000000000LL, 16, "Gentag Inc (USA) USA" },
-	{ 0,0,"no tag-info available" } // must be the last entry
+    { 0xE017000000000000LL, 16, "KSW Microtec GmbH Germany" },
+    { 0xE018000000000000LL, 16, "ZMD AG Germany" },
+    { 0xE019000000000000LL, 16, "XICOR, Inc. USA" },
+    { 0xE01A000000000000LL, 16, "Sony Corporation Japan Identifier Company Country" },
+    { 0xE01B000000000000LL, 16, "Malaysia Microelectronic Solutions Sdn. Bhd Malaysia" },
+    { 0xE01C000000000000LL, 16, "Emosyn USA" },
+    { 0xE01D000000000000LL, 16, "Shanghai Fudan Microelectronics Co. Ltd. P.R. China" },
+    { 0xE01E000000000000LL, 16, "Magellan Technology Pty Limited Australia" },
+    { 0xE01F000000000000LL, 16, "Melexis NV BO Switzerland" },
+    { 0xE020000000000000LL, 16, "Renesas Technology Corp. Japan" },
+    { 0xE021000000000000LL, 16, "TAGSYS France" },
+    { 0xE022000000000000LL, 16, "Transcore USA" },
+    { 0xE023000000000000LL, 16, "Shanghai belling corp., ltd. China" },
+    { 0xE024000000000000LL, 16, "Masktech Germany Gmbh Germany" },
+    { 0xE025000000000000LL, 16, "Innovision Research and Technology Plc UK" },
+    { 0xE026000000000000LL, 16, "Hitachi ULSI Systems Co., Ltd. Japan" },
+    { 0xE027000000000000LL, 16, "Cypak AB Sweden" },
+    { 0xE028000000000000LL, 16, "Ricoh Japan" },
+    { 0xE029000000000000LL, 16, "ASK France" },
+    { 0xE02A000000000000LL, 16, "Unicore Microsystems, LLC Russian Federation" },
+    { 0xE02B000000000000LL, 16, "Dallas Semiconductor/Maxim USA" },
+    { 0xE02C000000000000LL, 16, "Impinj, Inc. USA" },
+    { 0xE02D000000000000LL, 16, "RightPlug Alliance USA" },
+    { 0xE02E000000000000LL, 16, "Broadcom Corporation USA" },
+    { 0xE02F000000000000LL, 16, "MStar Semiconductor, Inc Taiwan, ROC" },
+    { 0xE030000000000000LL, 16, "BeeDar Technology Inc. USA" },
+    { 0xE031000000000000LL, 16, "RFIDsec Denmark" },
+    { 0xE032000000000000LL, 16, "Schweizer Electronic AG Germany" },
+    { 0xE033000000000000LL, 16, "AMIC Technology Corp Taiwan" },
+    { 0xE034000000000000LL, 16, "Mikron JSC Russia" },
+    { 0xE035000000000000LL, 16, "Fraunhofer Institute for Photonic Microsystems Germany" },
+    { 0xE036000000000000LL, 16, "IDS Microchip AG Switzerland" },
+    { 0xE037000000000000LL, 16, "Kovio USA" },
+    { 0xE038000000000000LL, 16, "HMT Microelectronic Ltd Switzerland Identifier Company Country" },
+    { 0xE039000000000000LL, 16, "Silicon Craft Technology Thailand" },
+    { 0xE03A000000000000LL, 16, "Advanced Film Device Inc. Japan" },
+    { 0xE03B000000000000LL, 16, "Nitecrest Ltd UK" },
+    { 0xE03C000000000000LL, 16, "Verayo Inc. USA" },
+    { 0xE03D000000000000LL, 16, "HID Global USA" },
+    { 0xE03E000000000000LL, 16, "Productivity Engineering Gmbh Germany" },
+    { 0xE03F000000000000LL, 16, "Austriamicrosystems AG (reserved) Austria" },
+    { 0xE040000000000000LL, 16, "Gemalto SA France" },
+    { 0xE041000000000000LL, 16, "Renesas Electronics Corporation Japan" },
+    { 0xE042000000000000LL, 16, "3Alogics Inc Korea" },
+    { 0xE043000000000000LL, 16, "Top TroniQ Asia Limited Hong Kong" },
+    { 0xE044000000000000LL, 16, "Gentag Inc (USA) USA" },
+    { 0,0,"no tag-info available" } // must be the last entry
 };
 
 // fast method to just read the UID of a tag (collission detection not supported)
-//		*buf	should be large enough to fit the 64bit uid
+//  *buf should be large enough to fit the 64bit uid
 // returns 1 if suceeded
 int getUID(uint8_t *buf) {
 
-	UsbCommand resp;
-	UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}}; // len,speed,recv?
+    UsbCommand resp;
+    UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}}; // len,speed,recv?
 
-	c.d.asBytes[0] = ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | ISO15_REQ_INVENTORY | ISO15_REQINV_SLOT1;
-	c.d.asBytes[1] = ISO15_CMD_INVENTORY;
-	c.d.asBytes[2] = 0; // mask length
+    c.d.asBytes[0] = ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | ISO15_REQ_INVENTORY | ISO15_REQINV_SLOT1;
+    c.d.asBytes[1] = ISO15_CMD_INVENTORY;
+    c.d.asBytes[2] = 0; // mask length
 
-	AddCrc(c.d.asBytes, 3);
-	c.arg[0] = 5; // len
+    AddCrc(c.d.asBytes, 3);
+    c.arg[0] = 5; // len
 
-	uint8_t retry;
+    uint8_t retry;
 
-	// don't give up the at the first try
-	for (retry = 0; retry < 3; retry++) {
+    // don't give up the at the first try
+    for (retry = 0; retry < 3; retry++) {
 
-		clearCommandBuffer();
-		SendCommand(&c);
+        clearCommandBuffer();
+        SendCommand(&c);
 
-		if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
+        if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
 
-			uint8_t resplen = resp.arg[0];
-			if (resplen >= 12 && CheckCrc(resp.d.asBytes, 12)) {
-			   memcpy(buf, resp.d.asBytes + 2, 8);
-			   return 1;
-			}
-		}
-	} // retry
+            uint8_t resplen = resp.arg[0];
+            if (resplen >= 12 && CheckCrc(resp.d.asBytes, 12)) {
+               memcpy(buf, resp.d.asBytes + 2, 8);
+               return 1;
+            }
+        }
+    } // retry
 
-	if ( retry >= 3 )
-		PrintAndLogEx(WARNING, "timeout while waiting for reply.");
+    if ( retry >= 3 )
+        PrintAndLogEx(WARNING, "timeout while waiting for reply.");
 
-	return 0;
+    return 0;
 }
 
 // get a product description based on the UID
-//		uid[8] 	tag uid
+// uid[8] tag uid
 // returns description of the best match
 static char* getTagInfo_15(uint8_t *uid) {
-	uint64_t myuid, mask;
-	int i = 0, best = -1;
-	memcpy(&myuid, uid, sizeof(uint64_t));
-	while (uidmapping[i].mask > 0) {
-		mask = (~0LL) << (64-uidmapping[i].mask);
-		if ((myuid & mask) == uidmapping[i].uid) {
-			if (best == -1) {
-				best = i;
-			} else {
-				if (uidmapping[i].mask > uidmapping[best].mask) {
-					best=i;
-				}
-			}
-		}
-		i++;
-	}
+    uint64_t myuid, mask;
+    int i = 0, best = -1;
+    memcpy(&myuid, uid, sizeof(uint64_t));
+    while (uidmapping[i].mask > 0) {
+        mask = (~0LL) << (64-uidmapping[i].mask);
+        if ((myuid & mask) == uidmapping[i].uid) {
+            if (best == -1) {
+                best = i;
+            } else {
+                if (uidmapping[i].mask > uidmapping[best].mask) {
+                    best=i;
+                }
+            }
+        }
+        i++;
+    }
 
-	if (best >= 0)
-		return uidmapping[best].desc;
-	return uidmapping[i].desc;
+    if (best >= 0)
+        return uidmapping[best].desc;
+    return uidmapping[i].desc;
 }
 
 // return a clear-text message to an errorcode
 static char* TagErrorStr(uint8_t error) {
-	switch (error) {
-		case 0x01: return "The command is not supported";
-		case 0x02: return "The command is not recognised";
-		case 0x03: return "The option is not supported.";
-		case 0x0f: return "Unknown error.";
-		case 0x10: return "The specified block is not available (doesn't exist).";
-		case 0x11: return "The specified block is already -locked and thus cannot be locked again";
-		case 0x12: return "The specified block is locked and its content cannot be changed.";
-		case 0x13: return "The specified block was not successfully programmed.";
-		case 0x14: return "The specified block was not successfully locked.";
-		default: return "Reserved for Future Use or Custom command error.";
-	}
+    switch (error) {
+        case 0x01: return "The command is not supported";
+        case 0x02: return "The command is not recognised";
+        case 0x03: return "The option is not supported.";
+        case 0x0f: return "Unknown error.";
+        case 0x10: return "The specified block is not available (doesn't exist).";
+        case 0x11: return "The specified block is already -locked and thus cannot be locked again";
+        case 0x12: return "The specified block is locked and its content cannot be changed.";
+        case 0x13: return "The specified block was not successfully programmed.";
+        case 0x14: return "The specified block was not successfully locked.";
+        default: return "Reserved for Future Use or Custom command error.";
+    }
 }
 
 int usage_15_demod(void){
-	PrintAndLogEx(NORMAL, "Tries to demodulate / decode ISO15693, from downloaded samples.\n"
-	                      "Gather samples with 'hf 15 read' / 'hf 15 record'");
-	return 0;
+    PrintAndLogEx(NORMAL, "Tries to demodulate / decode ISO15693, from downloaded samples.\n"
+                          "Gather samples with 'hf 15 read' / 'hf 15 record'");
+    return 0;
 }
 int usage_15_samples(void){
-	PrintAndLogEx(NORMAL, "Acquire samples as Reader (enables carrier, send inquiry\n"
-	                      "and download it to graphbuffer.  Try 'hf 15 demod'  to try to demodulate/decode signal");
-	return 0;
+    PrintAndLogEx(NORMAL, "Acquire samples as Reader (enables carrier, send inquiry\n"
+                          "and download it to graphbuffer.  Try 'hf 15 demod'  to try to demodulate/decode signal");
+    return 0;
 }
 int usage_15_info(void){
-	PrintAndLogEx(NORMAL, "Uses the optional command 'get_systeminfo' 0x2B to try and extract information\n"
-	                      "command may fail, depending on tag.\n"
-	                      "defaults to '1 out of 4' mode\n"
-	                      "\n"
-	                      "Usage:  hf 15 info    [options] <uid|s|u|*>\n"
-	                      "Options:\n"
-	                      "\t-2        use slower '1 out of 256' mode\n"
-	                      "\tuid (either): \n"
-	                      "\t  <8B hex>  full UID eg E011223344556677\n"
-	                      "\t  u         unaddressed mode\n"
-	                      "\t  *         scan for tag\n"
-	                      "Examples:\n"
-	                      "\thf 15 info u");
-	return 0;
+    PrintAndLogEx(NORMAL, "Uses the optional command 'get_systeminfo' 0x2B to try and extract information\n"
+                          "command may fail, depending on tag.\n"
+                          "defaults to '1 out of 4' mode\n"
+                          "\n"
+                          "Usage:  hf 15 info    [options] <uid|s|u|*>\n"
+                          "Options:\n"
+                          "\t-2        use slower '1 out of 256' mode\n"
+                          "\tuid (either): \n"
+                          "\t  <8B hex>  full UID eg E011223344556677\n"
+                          "\t  u         unaddressed mode\n"
+                          "\t  *         scan for tag\n"
+                          "Examples:\n"
+                          "\thf 15 info u");
+    return 0;
 }
 int usage_15_record(void){
-	PrintAndLogEx(NORMAL, "Record activity without enableing carrier");
-	return 0;
+    PrintAndLogEx(NORMAL, "Record activity without enableing carrier");
+    return 0;
 }
 int usage_15_reader(void){
-	PrintAndLogEx(NORMAL, "This command identifies a ISO 15693 tag\n"
-	                      "\n"
-	                      "Usage: hf 15 reader [h]\n"
-	                      "Options:\n"
-	                      "\th             this help\n"
-	                      "\n"
-	                      "Example:\n"
-	                      "\thf 15 reader");
-	return 0;
+    PrintAndLogEx(NORMAL, "This command identifies a ISO 15693 tag\n"
+                          "\n"
+                          "Usage: hf 15 reader [h]\n"
+                          "Options:\n"
+                          "\th             this help\n"
+                          "\n"
+                          "Example:\n"
+                          "\thf 15 reader");
+    return 0;
 }
 int usage_15_sim(void){
-	PrintAndLogEx(NORMAL, "Usage:  hf 15 sim <UID>\n"
-	                      "\n"
-	                      "Example:\n"
-	                      "\thf 15 sim E016240000000000");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage:  hf 15 sim <UID>\n"
+                          "\n"
+                          "Example:\n"
+                          "\thf 15 sim E016240000000000");
+    return 0;
 }
 int usage_15_findafi(void){
-	PrintAndLogEx(NORMAL, "'hf 15 finafi' This command needs a helptext. Feel free to add one!");
-	return 0;
+    PrintAndLogEx(NORMAL, "'hf 15 finafi' This command needs a helptext. Feel free to add one!");
+    return 0;
 }
 int usage_15_dump(void){
-	PrintAndLogEx(NORMAL, "This command dumps the contents of a ISO-15693 tag and save it to file\n"
-	                      "\n"
-	                      "Usage: hf 15 dump [h] <f filname> \n"
-	                      "Options:\n"
-	                      "\th             this help\n"
-	                      "\tf <name>      filename,  if no <name> UID will be used as filename\n"
-	                      "\n"
-	                      "Example:\n"
-	                      "\thf 15 dump f\n"
-	                      "\thf 15 dump f mydump");
-	return 0;
+    PrintAndLogEx(NORMAL, "This command dumps the contents of a ISO-15693 tag and save it to file\n"
+                          "\n"
+                          "Usage: hf 15 dump [h] <f filname> \n"
+                          "Options:\n"
+                          "\th             this help\n"
+                          "\tf <name>      filename,  if no <name> UID will be used as filename\n"
+                          "\n"
+                          "Example:\n"
+                          "\thf 15 dump f\n"
+                          "\thf 15 dump f mydump");
+    return 0;
 }
 int usage_15_restore(void){
     char *options[][2]={
@@ -358,133 +358,133 @@ int usage_15_raw(void){
     return 0;
 }
 int usage_15_read(void){
-	PrintAndLogEx(NORMAL, "Usage:  hf 15 read    [options] <uid|s|u|*> <page#>\n"
-	                      "Options:\n"
-	                      "\t-2        use slower '1 out of 256' mode\n"
-	                      "\tuid (either): \n"
-	                      "\t   <8B hex>  full UID eg E011223344556677\n"
-	                      "\t   u         unaddressed mode\n"
-	                      "\t   *         scan for tag\n"
-	                      "\tpage#:        page number 0-255");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage:  hf 15 read    [options] <uid|s|u|*> <page#>\n"
+                          "Options:\n"
+                          "\t-2        use slower '1 out of 256' mode\n"
+                          "\tuid (either): \n"
+                          "\t   <8B hex>  full UID eg E011223344556677\n"
+                          "\t   u         unaddressed mode\n"
+                          "\t   *         scan for tag\n"
+                          "\tpage#:        page number 0-255");
+    return 0;
 }
 int usage_15_write(void){
-	PrintAndLogEx(NORMAL, "Usage:  hf 15 write    [options] <uid|s|u|*> <page#> <hexdata>\n"
-	                      "Options:\n"
-	                      "\t-2        use slower '1 out of 256' mode\n"
-	                      "\t-o        set OPTION Flag (needed for TI)\n"
-	                      "\tuid (either): \n"
-	                      "\t   <8B hex>  full UID eg E011223344556677\n"
-	                      "\t   u         unaddressed mode\n"
-	                      "\t   *         scan for tag\n"
-	                      "\tpage#:        page number 0-255\n"
-	                      "\thexdata:      data to be written eg AA BB CC DD");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage:  hf 15 write    [options] <uid|s|u|*> <page#> <hexdata>\n"
+                          "Options:\n"
+                          "\t-2        use slower '1 out of 256' mode\n"
+                          "\t-o        set OPTION Flag (needed for TI)\n"
+                          "\tuid (either): \n"
+                          "\t   <8B hex>  full UID eg E011223344556677\n"
+                          "\t   u         unaddressed mode\n"
+                          "\t   *         scan for tag\n"
+                          "\tpage#:        page number 0-255\n"
+                          "\thexdata:      data to be written eg AA BB CC DD");
+    return 0;
 }
 int usage_15_readmulti(void){
-	PrintAndLogEx(NORMAL, "Usage:  hf 15 readmulti  [options] <uid|s|u|*> <start#> <count#>\n"
-	                      "Options:\n"
-	                      "\t-2        use slower '1 out of 256' mode\n"
-	                      "\tuid (either): \n"
-	                      "\t   <8B hex>  full UID eg E011223344556677\n"
-	                      "\t   u         unaddressed mode\n"
-	                      "\t   *         scan for tag\n"
-	                      "\tstart#:       page number to start 0-255\n"
-	                      "\tcount#:       number of pages");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage:  hf 15 readmulti  [options] <uid|s|u|*> <start#> <count#>\n"
+                          "Options:\n"
+                          "\t-2        use slower '1 out of 256' mode\n"
+                          "\tuid (either): \n"
+                          "\t   <8B hex>  full UID eg E011223344556677\n"
+                          "\t   u         unaddressed mode\n"
+                          "\t   *         scan for tag\n"
+                          "\tstart#:       page number to start 0-255\n"
+                          "\tcount#:       number of pages");
+    return 0;
 }
 // Mode 3
 //helptext
 int CmdHF15Demod(const char *Cmd) {
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if (cmdp == 'h') return usage_15_demod();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (cmdp == 'h') return usage_15_demod();
 
-	// The sampling rate is 106.353 ksps/s, for T = 18.8 us
-	int i, j;
-	int max = 0, maxPos = 0;
-	int skip = 4;
+    // 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) return 0;
+    if (GraphTraceLen < 1000) return 0;
 
-	// First, correlate for SOF
-	for (i = 0; i < 1000; i++) {
-		int corr = 0;
-		for (j = 0; j < ARRAYLEN(FrameSOF); j += skip) {
-			corr += FrameSOF[j] * GraphBuffer[i + (j / skip)];
-		}
-		if (corr > max) {
-			max = corr;
-			maxPos = i;
-		}
-	}
+    // First, correlate for SOF
+    for (i = 0; i < 1000; i++) {
+        int corr = 0;
+        for (j = 0; j < ARRAYLEN(FrameSOF); j += skip) {
+            corr += FrameSOF[j] * GraphBuffer[i + (j / skip)];
+        }
+        if (corr > max) {
+            max = corr;
+            maxPos = i;
+        }
+    }
 
-	PrintAndLogEx(NORMAL, "SOF at %d, correlation %d", maxPos, max / (ARRAYLEN(FrameSOF) / skip));
+    PrintAndLogEx(NORMAL, "SOF at %d, correlation %d", maxPos, max / (ARRAYLEN(FrameSOF) / skip));
 
-	i = maxPos + ARRAYLEN(FrameSOF) / skip;
-	int k = 0;
-	uint8_t outBuf[20];
-	memset(outBuf, 0, sizeof(outBuf));
-	uint8_t mask = 0x01;
-	for (;;) {
-		int corr0 = 0, corr1 = 0, corrEOF = 0;
-		for (j = 0; j < ARRAYLEN(Logic0); j += skip) {
-			corr0 += Logic0[j] * GraphBuffer[i + (j / skip)];
-		}
-		for (j = 0; j < ARRAYLEN(Logic1); j += skip) {
-			corr1 += Logic1[j] * GraphBuffer[i + (j / skip)];
-		}
-		for (j = 0; j < ARRAYLEN(FrameEOF); j += skip) {
-			corrEOF += FrameEOF[j] * GraphBuffer[i + (j / skip)];
-		}
-		// Even things out by the length of the target waveform.
-		corr0 *= 4;
-		corr1 *= 4;
+    i = maxPos + ARRAYLEN(FrameSOF) / skip;
+    int k = 0;
+    uint8_t outBuf[20];
+    memset(outBuf, 0, sizeof(outBuf));
+    uint8_t mask = 0x01;
+    for (;;) {
+        int corr0 = 0, corr1 = 0, corrEOF = 0;
+        for (j = 0; j < ARRAYLEN(Logic0); j += skip) {
+            corr0 += Logic0[j] * GraphBuffer[i + (j / skip)];
+        }
+        for (j = 0; j < ARRAYLEN(Logic1); j += skip) {
+            corr1 += Logic1[j] * GraphBuffer[i + (j / skip)];
+        }
+        for (j = 0; j < ARRAYLEN(FrameEOF); j += skip) {
+            corrEOF += FrameEOF[j] * GraphBuffer[i + (j / skip)];
+        }
+        // Even things out by the length of the target waveform.
+        corr0 *= 4;
+        corr1 *= 4;
 
-		if (corrEOF > corr1 && corrEOF > corr0) {
-			PrintAndLogEx(NORMAL, "EOF at %d", i);
-			break;
-		} else if (corr1 > corr0) {
-			i += ARRAYLEN(Logic1) / skip;
-			outBuf[k] |= mask;
-		} else {
-			i += ARRAYLEN(Logic0) / skip;
-		}
-		mask <<= 1;
-		if (mask == 0) {
-			k++;
-			mask = 0x01;
-		}
-		if ((i + (int)ARRAYLEN(FrameEOF)) >= GraphTraceLen) {
-			PrintAndLogEx(NORMAL, "ran off end!");
-			break;
-		}
-	}
+        if (corrEOF > corr1 && corrEOF > corr0) {
+            PrintAndLogEx(NORMAL, "EOF at %d", i);
+            break;
+        } else if (corr1 > corr0) {
+            i += ARRAYLEN(Logic1) / skip;
+            outBuf[k] |= mask;
+        } else {
+            i += ARRAYLEN(Logic0) / skip;
+        }
+        mask <<= 1;
+        if (mask == 0) {
+            k++;
+            mask = 0x01;
+        }
+        if ((i + (int)ARRAYLEN(FrameEOF)) >= GraphTraceLen) {
+            PrintAndLogEx(NORMAL, "ran off end!");
+            break;
+        }
+    }
 
-	if (mask != 0x01) {
-		PrintAndLogEx(WARNING, "Error, uneven octet! (discard extra bits!)");
-		PrintAndLogEx(NORMAL, "   mask = %02x", mask);
-	}
-	PrintAndLogEx(NORMAL, "%d octets", k);
+    if (mask != 0x01) {
+        PrintAndLogEx(WARNING, "Error, uneven octet! (discard extra bits!)");
+        PrintAndLogEx(NORMAL, "   mask = %02x", mask);
+    }
+    PrintAndLogEx(NORMAL, "%d octets", k);
 
-	for (i = 0; i < k; i++)
-		PrintAndLogEx(NORMAL, "# %2d: %02x ", i, outBuf[i]);
+    for (i = 0; i < k; i++)
+        PrintAndLogEx(NORMAL, "# %2d: %02x ", i, outBuf[i]);
 
-	PrintAndLogEx(NORMAL, "CRC %04x", Crc(outBuf, k - 2));
-	return 0;
+    PrintAndLogEx(NORMAL, "CRC %04x", Crc(outBuf, k - 2));
+    return 0;
 }
 
 // * Acquire Samples as Reader (enables carrier, sends inquiry)
 //helptext
 int CmdHF15Samples(const char *Cmd) {
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if (cmdp == 'h') return usage_15_samples();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (cmdp == 'h') return usage_15_samples();
 
-	UsbCommand c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_15693, {0,0,0}};
-	clearCommandBuffer();
-	SendCommand(&c);
+    UsbCommand c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_15693, {0,0,0}};
+    clearCommandBuffer();
+    SendCommand(&c);
 
-	getSamples(0, false);
-	return 0;
+    getSamples(0, false);
+    return 0;
 }
 
 /**
@@ -493,552 +493,552 @@ int CmdHF15Samples(const char *Cmd) {
  */
 int CmdHF15Info(const char *Cmd) {
 
-	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd)<1 || cmdp == 'h' || cmdp == 'H') return usage_15_info();
+    char cmdp = param_getchar(Cmd, 0);
+    if (strlen(Cmd)<1 || cmdp == 'h' || cmdp == 'H') return usage_15_info();
 
-	UsbCommand resp;
-	uint8_t *recv;
-	UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}}; // len,speed,recv?
-	uint8_t *req = c.d.asBytes;
-	char cmdbuf[100];
-	char *cmd = cmdbuf;
-	memset(cmdbuf, 0, sizeof(cmdbuf));
+    UsbCommand resp;
+    uint8_t *recv;
+    UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}}; // len,speed,recv?
+    uint8_t *req = c.d.asBytes;
+    char cmdbuf[100];
+    char *cmd = cmdbuf;
+    memset(cmdbuf, 0, sizeof(cmdbuf));
 
-	strncpy(cmd, Cmd, 99);
+    strncpy(cmd, Cmd, 99);
 
-	if ( !prepareHF15Cmd(&cmd, &c, ISO15_CMD_SYSINFO) )
-		return 0;
+    if ( !prepareHF15Cmd(&cmd, &c, ISO15_CMD_SYSINFO) )
+        return 0;
 
-	AddCrc(req,  c.arg[0]);
-	c.arg[0] += 2;
+    AddCrc(req,  c.arg[0]);
+    c.arg[0] += 2;
 
-	//PrintAndLogEx(NORMAL, "cmd %s", sprint_hex(c.d.asBytes, reqlen) );
+    //PrintAndLogEx(NORMAL, "cmd %s", sprint_hex(c.d.asBytes, reqlen) );
 
-	clearCommandBuffer();
-	SendCommand(&c);
+    clearCommandBuffer();
+    SendCommand(&c);
 
-	if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
-		PrintAndLogEx(WARNING, "iso15693 card select failed");
-		return 1;
-	}
+    if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
+        PrintAndLogEx(WARNING, "iso15693 card select failed");
+        return 1;
+    }
 
-	uint32_t status = resp.arg[0];
+    uint32_t status = resp.arg[0];
 
-	if ( status < 2 ) {
-		PrintAndLogEx(WARNING, "iso15693 card doesn't answer to systeminfo command");
-		return 1;
-	}
+    if ( status < 2 ) {
+        PrintAndLogEx(WARNING, "iso15693 card doesn't answer to systeminfo command");
+        return 1;
+    }
 
-	recv = resp.d.asBytes;
+    recv = resp.d.asBytes;
 
-	if ( recv[0] & ISO15_RES_ERROR ) {
-		PrintAndLogEx(WARNING, "iso15693 card returned error %i: %s", recv[0], TagErrorStr(recv[0]));
-		return 3;
-	}
+    if ( recv[0] & ISO15_RES_ERROR ) {
+        PrintAndLogEx(WARNING, "iso15693 card returned error %i: %s", recv[0], TagErrorStr(recv[0]));
+        return 3;
+    }
 
-	PrintAndLogEx(NORMAL, "  UID  : %s", sprintUID(NULL, recv+2));
-	PrintAndLogEx(NORMAL, "  TYPE : %s", getTagInfo_15(recv+2));
-	PrintAndLogEx(NORMAL, "  SYSINFO : %s", sprint_hex(recv, status-2));
+    PrintAndLogEx(NORMAL, "  UID  : %s", sprintUID(NULL, recv+2));
+    PrintAndLogEx(NORMAL, "  TYPE : %s", getTagInfo_15(recv+2));
+    PrintAndLogEx(NORMAL, "  SYSINFO : %s", sprint_hex(recv, status-2));
 
-	// DSFID
-	if (recv[1] & 0x01)
-		PrintAndLogEx(NORMAL, "     - DSFID supported        [0x%02X]", recv[10]);
-	else
-		PrintAndLogEx(NORMAL, "     - DSFID not supported");
+    // DSFID
+    if (recv[1] & 0x01)
+        PrintAndLogEx(NORMAL, "     - DSFID supported        [0x%02X]", recv[10]);
+    else
+        PrintAndLogEx(NORMAL, "     - DSFID not supported");
 
-	// AFI
-	if (recv[1] & 0x02)
-		PrintAndLogEx(NORMAL, "     - AFI   supported        [0x%02X]", recv[11]);
-	else
-		PrintAndLogEx(NORMAL, "     - AFI   not supported");
+    // AFI
+    if (recv[1] & 0x02)
+        PrintAndLogEx(NORMAL, "     - AFI   supported        [0x%02X]", recv[11]);
+    else
+        PrintAndLogEx(NORMAL, "     - AFI   not supported");
 
-	// IC reference
-	if (recv[1] & 0x08)
-		PrintAndLogEx(NORMAL, "     - IC reference supported [0x%02X]", recv[14]);
-	else
-		PrintAndLogEx(NORMAL, "     - IC reference not supported");
+    // IC reference
+    if (recv[1] & 0x08)
+        PrintAndLogEx(NORMAL, "     - IC reference supported [0x%02X]", recv[14]);
+    else
+        PrintAndLogEx(NORMAL, "     - IC reference not supported");
 
-	// memory
-	if (recv[1] & 0x04) {
-		PrintAndLogEx(NORMAL, "     - Tag provides info on memory layout (vendor dependent)");
-		uint8_t blocks = recv[12]+1;
-		uint8_t size = (recv[13] & 0x1F);
-		PrintAndLogEx(NORMAL, "           %u (or %u) bytes/blocks x %u blocks", size+1, size, blocks );
-	} else {
-		PrintAndLogEx(NORMAL, "     - Tag does not provide information on memory layout");
-	}
-	PrintAndLogEx(NORMAL, "\n");
-	return 0;
+    // memory
+    if (recv[1] & 0x04) {
+        PrintAndLogEx(NORMAL, "     - Tag provides info on memory layout (vendor dependent)");
+        uint8_t blocks = recv[12]+1;
+        uint8_t size = (recv[13] & 0x1F);
+        PrintAndLogEx(NORMAL, "           %u (or %u) bytes/blocks x %u blocks", size+1, size, blocks );
+    } else {
+        PrintAndLogEx(NORMAL, "     - Tag does not provide information on memory layout");
+    }
+    PrintAndLogEx(NORMAL, "\n");
+    return 0;
 }
 
 // Record Activity without enabeling carrier
 //helptext
 int CmdHF15Record(const char *Cmd) {
-	char cmdp =  tolower(param_getchar(Cmd, 0));
-	if (cmdp == 'h') return usage_15_record();
+    char cmdp =  tolower(param_getchar(Cmd, 0));
+    if (cmdp == 'h') return usage_15_record();
 
-	UsbCommand c = {CMD_RECORD_RAW_ADC_SAMPLES_ISO_15693, {0,0,0}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+    UsbCommand c = {CMD_RECORD_RAW_ADC_SAMPLES_ISO_15693, {0,0,0}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 
 // used with 'hf search'
 int HF15Reader(const char *Cmd, bool verbose) {
-	uint8_t uid[8] = {0,0,0,0,0,0,0,0};
-	if (!getUID(uid)) {
-		if (verbose) PrintAndLogEx(WARNING, "No tag found.");
-		return 0;
-	}
+    uint8_t uid[8] = {0,0,0,0,0,0,0,0};
+    if (!getUID(uid)) {
+        if (verbose) PrintAndLogEx(WARNING, "No tag found.");
+        return 0;
+    }
 
-	PrintAndLogEx(NORMAL, " UID  : %s", sprintUID(NULL, uid));
-	PrintAndLogEx(NORMAL, " TYPE : %s", getTagInfo_15(uid));
-	return 1;
+    PrintAndLogEx(NORMAL, " UID  : %s", sprintUID(NULL, uid));
+    PrintAndLogEx(NORMAL, " TYPE : %s", getTagInfo_15(uid));
+    return 1;
 }
 
 int CmdHF15Reader(const char *Cmd) {
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if (cmdp == 'h') return usage_15_reader();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (cmdp == 'h') return usage_15_reader();
 
-	HF15Reader(Cmd, true);
-	return 0;
+    HF15Reader(Cmd, true);
+    return 0;
 }
 
 // Simulation is still not working very good
 // helptext
 int CmdHF15Sim(const char *Cmd) {
-	char cmdp =tolower(param_getchar(Cmd, 0));
-	if (strlen(Cmd) < 1 || cmdp == 'h') return usage_15_sim();
+    char cmdp =tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) < 1 || cmdp == 'h') return usage_15_sim();
 
-	uint8_t uid[8] = {0,0,0,0,0,0,0,0};
-	if (param_gethex(Cmd, 0, uid, 16)) {
-		PrintAndLogEx(WARNING, "UID must include 16 HEX symbols");
-		return 0;
-	}
+    uint8_t uid[8] = {0,0,0,0,0,0,0,0};
+    if (param_gethex(Cmd, 0, uid, 16)) {
+        PrintAndLogEx(WARNING, "UID must include 16 HEX symbols");
+        return 0;
+    }
 
-	PrintAndLogEx(SUCCESS, "Starting simulating UID %s", sprint_hex(uid, sizeof(uid)) );
+    PrintAndLogEx(SUCCESS, "Starting simulating UID %s", sprint_hex(uid, sizeof(uid)) );
 
-	UsbCommand c = {CMD_SIMTAG_ISO_15693, {0, 0, 0}};
-	memcpy(c.d.asBytes, uid, 8);
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+    UsbCommand c = {CMD_SIMTAG_ISO_15693, {0, 0, 0}};
+    memcpy(c.d.asBytes, uid, 8);
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 
 // finds the AFI (Application Family Idendifier) of a card, by trying all values
 // (There is no standard way of reading the AFI, allthough some tags support this)
 // helptext
 int CmdHF15Afi(const char *Cmd) {
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if (cmdp == 'h') return usage_15_findafi();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (cmdp == 'h') return usage_15_findafi();
 
-	PrintAndLogEx(SUCCESS, "press pm3-button to cancel");
+    PrintAndLogEx(SUCCESS, "press pm3-button to cancel");
 
-	UsbCommand c = {CMD_ISO_15693_FIND_AFI, {strtol(Cmd, NULL, 0), 0, 0}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+    UsbCommand c = {CMD_ISO_15693_FIND_AFI, {strtol(Cmd, NULL, 0), 0, 0}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 
 typedef struct {
-	uint8_t lock;
-	uint8_t block[4];
+    uint8_t lock;
+    uint8_t block[4];
 } t15memory;
 
 // Reads all memory pages
 // need to write to file
 int CmdHF15Dump(const char*Cmd) {
 
-	uint8_t fileNameLen = 0;
-	char filename[FILE_PATH_SIZE] = {0};
-	char * fptr = filename;
-	bool errors = false;
-	uint8_t cmdp = 0;
-	uint8_t uid[8] = {0,0,0,0,0,0,0,0};
+    uint8_t fileNameLen = 0;
+    char filename[FILE_PATH_SIZE] = {0};
+    char * fptr = filename;
+    bool errors = false;
+    uint8_t cmdp = 0;
+    uint8_t uid[8] = {0,0,0,0,0,0,0,0};
 
-	while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch (tolower(param_getchar(Cmd, cmdp))) {
-		case 'h':
-			return usage_15_dump();
-		case 'f':
-			fileNameLen = param_getstr(Cmd, cmdp+1, filename, FILE_PATH_SIZE);
-			cmdp += 2;
-			break;
-		default:
-			PrintAndLogEx(WARNING, "Unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
-			errors = true;
-			break;
-		}
-	}
+    while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+        case 'h':
+            return usage_15_dump();
+        case 'f':
+            fileNameLen = param_getstr(Cmd, cmdp+1, filename, FILE_PATH_SIZE);
+            cmdp += 2;
+            break;
+        default:
+            PrintAndLogEx(WARNING, "Unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
+            errors = true;
+            break;
+        }
+    }
 
-	//Validations
-	if (errors) return usage_15_dump();
+    //Validations
+    if (errors) return usage_15_dump();
 
-	if (fileNameLen < 1) {
+    if (fileNameLen < 1) {
 
-		PrintAndLogEx(INFO, "Using UID as filename");
+        PrintAndLogEx(INFO, "Using UID as filename");
 
-		if (!getUID(uid)) {
-			PrintAndLogEx(WARNING, "No tag found.");
-			return 1;
-		}
+        if (!getUID(uid)) {
+            PrintAndLogEx(WARNING, "No tag found.");
+            return 1;
+        }
 
-		fptr += sprintf(fptr, "hf-15-");
-		FillFileNameByUID(fptr,uid,"-dump",sizeof(uid));
-	}
-	// detect blocksize from card :)
+        fptr += sprintf(fptr, "hf-15-");
+        FillFileNameByUID(fptr,uid,"-dump",sizeof(uid));
+    }
+    // detect blocksize from card :)
 
-	PrintAndLogEx(NORMAL, "Reading memory from tag UID " _YELLOW_(%s), sprintUID(NULL, uid));
+    PrintAndLogEx(NORMAL, "Reading memory from tag UID " _YELLOW_(%s), sprintUID(NULL, uid));
 
-	int blocknum = 0;
-	uint8_t *recv = NULL;
+    int blocknum = 0;
+    uint8_t *recv = NULL;
 
-	// memory.
-	t15memory mem[256];
+    // memory.
+    t15memory mem[256];
 
-	uint8_t data[256*4] = {0};
-	memset(data, 0, sizeof(data));
+    uint8_t data[256*4] = {0};
+    memset(data, 0, sizeof(data));
 
-	UsbCommand resp;
-	UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}}; // len,speed,recv?
-	uint8_t *req = c.d.asBytes;
-	req[0] = ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | ISO15_REQ_NONINVENTORY | ISO15_REQ_ADDRESS;
-	req[1] = ISO15_CMD_READ;
+    UsbCommand resp;
+    UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}}; // len,speed,recv?
+    uint8_t *req = c.d.asBytes;
+    req[0] = ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | ISO15_REQ_NONINVENTORY | ISO15_REQ_ADDRESS;
+    req[1] = ISO15_CMD_READ;
 
-	// copy uid to read command
-	memcpy(req+2, uid, sizeof(uid));
+    // copy uid to read command
+    memcpy(req+2, uid, sizeof(uid));
 
-	for (int retry = 0; retry < 5; retry++) {
+    for (int retry = 0; retry < 5; retry++) {
 
-		req[10] = blocknum;
-		AddCrc(req, 11);
-		c.arg[0] = 13;
+        req[10] = blocknum;
+        AddCrc(req, 11);
+        c.arg[0] = 13;
 
-		clearCommandBuffer();
-		SendCommand(&c);
+        clearCommandBuffer();
+        SendCommand(&c);
 
-		if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
+        if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
 
-			uint8_t len = resp.arg[0];
-			if ( len < 2 ) {
-				PrintAndLogEx(FAILED, "iso15693 card select failed");
-				continue;
-			}
+            uint8_t len = resp.arg[0];
+            if ( len < 2 ) {
+                PrintAndLogEx(FAILED, "iso15693 card select failed");
+                continue;
+            }
 
-			recv = resp.d.asBytes;
+            recv = resp.d.asBytes;
 
-			if ( !CheckCrc(recv, len) ) {
-				PrintAndLogEx(FAILED, "crc fail");
-				continue;
-			}
+            if ( !CheckCrc(recv, len) ) {
+                PrintAndLogEx(FAILED, "crc fail");
+                continue;
+            }
 
-			if (recv[0] & ISO15_RES_ERROR) {
-				PrintAndLogEx(FAILED, "Tag returned Error %i: %s", recv[1], TagErrorStr(recv[1]) );
-				break;
-			}
+            if (recv[0] & ISO15_RES_ERROR) {
+                PrintAndLogEx(FAILED, "Tag returned Error %i: %s", recv[1], TagErrorStr(recv[1]) );
+                break;
+            }
 
-			mem[blocknum].lock = resp.d.asBytes[0];
-			memcpy(mem[blocknum].block, resp.d.asBytes + 1, 4);
-			memcpy(data + (blocknum * 4), resp.d.asBytes + 1, 4);
+            mem[blocknum].lock = resp.d.asBytes[0];
+            memcpy(mem[blocknum].block, resp.d.asBytes + 1, 4);
+            memcpy(data + (blocknum * 4), resp.d.asBytes + 1, 4);
 
-			retry = 0;
-			blocknum++;
+            retry = 0;
+            blocknum++;
 
-			printf("."); fflush(stdout);
-		}
-	}
-	PrintAndLogEx(NORMAL, "\n");
+            printf("."); fflush(stdout);
+        }
+    }
+    PrintAndLogEx(NORMAL, "\n");
 
-	PrintAndLogEx(NORMAL, "block#   | data         |lck| ascii");
-	PrintAndLogEx(NORMAL, "---------+--------------+---+----------");
-	for (int i = 0; i < blocknum; i++) {
-		PrintAndLogEx(NORMAL, "%3d/0x%02X | %s | %d | %s", i, i, sprint_hex(mem[i].block, 4 ), mem[i].lock, sprint_ascii(mem[i].block, 4) );
-	}
-	PrintAndLogEx(NORMAL, "\n");
+    PrintAndLogEx(NORMAL, "block#   | data         |lck| ascii");
+    PrintAndLogEx(NORMAL, "---------+--------------+---+----------");
+    for (int i = 0; i < blocknum; i++) {
+        PrintAndLogEx(NORMAL, "%3d/0x%02X | %s | %d | %s", i, i, sprint_hex(mem[i].block, 4 ), mem[i].lock, sprint_ascii(mem[i].block, 4) );
+    }
+    PrintAndLogEx(NORMAL, "\n");
 
-	size_t datalen = blocknum * 4;
-	saveFileEML(filename, "eml", data, datalen, 4);
-	saveFile(filename, "bin", data, datalen);
-	return 0;
+    size_t datalen = blocknum * 4;
+    saveFileEML(filename, "eml", data, datalen, 4);
+    saveFile(filename, "bin", data, datalen);
+    return 0;
 }
 
 int CmdHF15Restore(const char*Cmd) {
-	FILE *f;
+    FILE *f;
 
-	uint8_t uid[8]={0x00};
-	char filename[FILE_PATH_SIZE] = {0x00};
-	char buff[255] = {0x00};
-	size_t blocksize=4;
-	uint8_t cmdp = 0;
-	char newCmdPrefix[255] = {0x00}, tmpCmd[255] = {0x00};
-	char param[FILE_PATH_SIZE]="";
-	char hex[255]="";
-	uint8_t retries = 3, tried = 0, i = 0;
-	int retval=0;
-	size_t bytes_read;
+    uint8_t uid[8]={0x00};
+    char filename[FILE_PATH_SIZE] = {0x00};
+    char buff[255] = {0x00};
+    size_t blocksize=4;
+    uint8_t cmdp = 0;
+    char newCmdPrefix[255] = {0x00}, tmpCmd[255] = {0x00};
+    char param[FILE_PATH_SIZE]="";
+    char hex[255]="";
+    uint8_t retries = 3, tried = 0, i = 0;
+    int retval=0;
+    size_t bytes_read;
 
-		while(param_getchar(Cmd, cmdp) != 0x00) {
-		switch(tolower(param_getchar(Cmd, cmdp))) {
-			case '-':
-				param_getstr(Cmd, cmdp, param, sizeof(param));
-				switch(param[1])
-				{
-					case '2':
-					case 'o':
-						strncpy(newCmdPrefix, " ", sizeof(newCmdPrefix)-1);
-						strncat(newCmdPrefix, param, sizeof(newCmdPrefix)-1);
-								break;
-					default:
-						PrintAndLogEx(WARNING, "Unknown parameter '%s'", param);
-						return usage_15_restore();
-				}
-				break;
-			case 'f':
-				param_getstr(Cmd, cmdp+1, filename, FILE_PATH_SIZE);
-				cmdp++;
-				break;
-			case 'r':
-				retries=param_get8ex(Cmd, cmdp+1, 3, 10);
-				cmdp++;
-				break;
-			case 'b':
-				blocksize=param_get8ex(Cmd, cmdp+1, 4, 10);
-				cmdp++;
-				break;
-			case 'u':
-				param_getstr(Cmd, cmdp+1, buff, FILE_PATH_SIZE);
-				cmdp++;
-				snprintf(filename,sizeof(filename),"hf-15-dump-%s-bin",buff);
-				break;
-			case 'h':
-				return usage_15_restore();
-			default:
-				PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-				return usage_15_restore();
-		}
-		cmdp++;
-	}
+        while(param_getchar(Cmd, cmdp) != 0x00) {
+        switch(tolower(param_getchar(Cmd, cmdp))) {
+            case '-':
+                param_getstr(Cmd, cmdp, param, sizeof(param));
+                switch(param[1])
+                {
+                    case '2':
+                    case 'o':
+                        strncpy(newCmdPrefix, " ", sizeof(newCmdPrefix)-1);
+                        strncat(newCmdPrefix, param, sizeof(newCmdPrefix)-1);
+                                break;
+                    default:
+                        PrintAndLogEx(WARNING, "Unknown parameter '%s'", param);
+                        return usage_15_restore();
+                }
+                break;
+            case 'f':
+                param_getstr(Cmd, cmdp+1, filename, FILE_PATH_SIZE);
+                cmdp++;
+                break;
+            case 'r':
+                retries=param_get8ex(Cmd, cmdp+1, 3, 10);
+                cmdp++;
+                break;
+            case 'b':
+                blocksize=param_get8ex(Cmd, cmdp+1, 4, 10);
+                cmdp++;
+                break;
+            case 'u':
+                param_getstr(Cmd, cmdp+1, buff, FILE_PATH_SIZE);
+                cmdp++;
+                snprintf(filename,sizeof(filename),"hf-15-dump-%s-bin",buff);
+                break;
+            case 'h':
+                return usage_15_restore();
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                return usage_15_restore();
+        }
+        cmdp++;
+    }
 
-	PrintAndLogEx(INFO,"Blocksize: %u",blocksize);
+    PrintAndLogEx(INFO,"Blocksize: %u",blocksize);
 
-	if ( !strlen(filename)) {
-		PrintAndLogEx(WARNING,"Please provide a filename");
-		return usage_15_restore();
-	}
+    if ( !strlen(filename)) {
+        PrintAndLogEx(WARNING,"Please provide a filename");
+        return usage_15_restore();
+    }
 
-	if ((f = fopen(filename, "rb")) == NULL) {
-		PrintAndLogEx(WARNING, "Could not find file %s", filename);
-		return 2;
-	}
+    if ((f = fopen(filename, "rb")) == NULL) {
+        PrintAndLogEx(WARNING, "Could not find file %s", filename);
+        return 2;
+    }
 
-	if (!getUID(uid)) {
-		PrintAndLogEx(WARNING, "No tag found");
-		fclose(f);
-		return 3;
-	}
+    if (!getUID(uid)) {
+        PrintAndLogEx(WARNING, "No tag found");
+        fclose(f);
+        return 3;
+    }
 
-	while (1) {
-		tried = 0;
-		hex[0] = 0x00;
-		tmpCmd[0] = 0x00;
+    while (1) {
+        tried = 0;
+        hex[0] = 0x00;
+        tmpCmd[0] = 0x00;
 
-		bytes_read = fread( buff, 1, blocksize, f );
-		if ( bytes_read == 0) {
-			PrintAndLogEx(SUCCESS, "File reading done `%s`", filename);
-			fclose(f);
-			return 0;
-		} else if ( bytes_read != blocksize) {
-			PrintAndLogEx(WARNING, "File reading error (%s), %u bytes read instead of %u bytes.", filename, bytes_read, blocksize);
-			fclose(f);
-			return 2;
-		}
+        bytes_read = fread( buff, 1, blocksize, f );
+        if ( bytes_read == 0) {
+            PrintAndLogEx(SUCCESS, "File reading done `%s`", filename);
+            fclose(f);
+            return 0;
+        } else if ( bytes_read != blocksize) {
+            PrintAndLogEx(WARNING, "File reading error (%s), %u bytes read instead of %u bytes.", filename, bytes_read, blocksize);
+            fclose(f);
+            return 2;
+        }
 
-		for(int j=0; j < blocksize; j++)
-			snprintf(hex+j*2, 3, "%02X", buff[j]);
+        for(int j=0; j < blocksize; j++)
+            snprintf(hex+j*2, 3, "%02X", buff[j]);
 
-		for(int j=0; j < sizeof(uid)/sizeof(uid[0]); j++)
-			snprintf(buff+j*2,3,"%02X", uid[j]);
+        for(int j=0; j < sizeof(uid)/sizeof(uid[0]); j++)
+            snprintf(buff+j*2,3,"%02X", uid[j]);
 
-		//TODO: Addressed mode currently not work
-		//snprintf(tmpCmd, sizeof(tmpCmd), "%s %s %d %s", newCmdPrefix, buff, i, hex);
-		snprintf(tmpCmd, sizeof(tmpCmd), "%s u %u %s", newCmdPrefix, i, hex);
-		PrintAndLogEx(DEBUG, "Command to be sent| %s", tmpCmd);
+        //TODO: Addressed mode currently not work
+        //snprintf(tmpCmd, sizeof(tmpCmd), "%s %s %d %s", newCmdPrefix, buff, i, hex);
+        snprintf(tmpCmd, sizeof(tmpCmd), "%s u %u %s", newCmdPrefix, i, hex);
+        PrintAndLogEx(DEBUG, "Command to be sent| %s", tmpCmd);
 
-		for(tried=0; tried < retries; tried++)
-			if(!(retval = CmdHF15Write(tmpCmd)))
-				break;
-		if(tried >= retries)
-			return retval;
+        for(tried=0; tried < retries; tried++)
+            if(!(retval = CmdHF15Write(tmpCmd)))
+                break;
+        if(tried >= retries)
+            return retval;
 
-		i++;
-	}
-	fclose(f);
+        i++;
+    }
+    fclose(f);
 }
 
 int CmdHF15List(const char *Cmd) {
-	//PrintAndLogEx(WARNING, "Deprecated command, use 'hf list 15' instead");
-	CmdTraceList("15");
-	return 0;
+    //PrintAndLogEx(WARNING, "Deprecated command, use 'hf list 15' instead");
+    CmdTraceList("15");
+    return 0;
 }
 
 int CmdHF15Raw(const char *Cmd) {
 
-	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd)<3 || cmdp == 'h' || cmdp == 'H') return usage_15_raw();
+    char cmdp = param_getchar(Cmd, 0);
+    if (strlen(Cmd)<3 || cmdp == 'h' || cmdp == 'H') return usage_15_raw();
 
-	UsbCommand resp;
-	UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}}; // len,speed,recv?
-	int reply = 1, fast = 1, i = 0;
-	bool crc = false;
-	char buf[5] = "";
-	uint8_t data[100];
-	uint32_t datalen = 0, temp;
+    UsbCommand resp;
+    UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}}; // len,speed,recv?
+    int reply = 1, fast = 1, i = 0;
+    bool crc = false;
+    char buf[5] = "";
+    uint8_t data[100];
+    uint32_t datalen = 0, temp;
 
-	// strip
-	while (*Cmd==' ' || *Cmd=='\t') Cmd++;
+    // strip
+    while (*Cmd==' ' || *Cmd=='\t') Cmd++;
 
-	while (Cmd[i]!='\0') {
-		if (Cmd[i]==' ' || Cmd[i]=='\t') { i++; continue; }
-		if (Cmd[i]=='-') {
-			switch (Cmd[i+1]) {
-				case 'r':
-				case 'R':
-					reply = 0;
-					break;
-				case '2':
-					fast = 0;
-					break;
-				case 'c':
-				case 'C':
-					crc = true;
-					break;
-				default:
-					PrintAndLogEx(WARNING, "Invalid option");
-					return 0;
-			}
-			i+=2;
-			continue;
-		}
-		if ((Cmd[i]>='0' && Cmd[i]<='9') ||
-		    (Cmd[i]>='a' && Cmd[i]<='f') ||
-		    (Cmd[i]>='A' && Cmd[i]<='F') ) {
-		    buf[strlen(buf)+1] = 0;
-		    buf[strlen(buf)] = Cmd[i];
-		    i++;
+    while (Cmd[i]!='\0') {
+        if (Cmd[i]==' ' || Cmd[i]=='\t') { i++; continue; }
+        if (Cmd[i]=='-') {
+            switch (Cmd[i+1]) {
+                case 'r':
+                case 'R':
+                    reply = 0;
+                    break;
+                case '2':
+                    fast = 0;
+                    break;
+                case 'c':
+                case 'C':
+                    crc = true;
+                    break;
+                default:
+                    PrintAndLogEx(WARNING, "Invalid option");
+                    return 0;
+            }
+            i+=2;
+            continue;
+        }
+        if ((Cmd[i]>='0' && Cmd[i]<='9') ||
+            (Cmd[i]>='a' && Cmd[i]<='f') ||
+            (Cmd[i]>='A' && Cmd[i]<='F') ) {
+            buf[strlen(buf)+1] = 0;
+            buf[strlen(buf)] = Cmd[i];
+            i++;
 
-		    if (strlen(buf) >= 2) {
-		    	sscanf(buf, "%x", &temp);
-		    	data[datalen] = (uint8_t)(temp & 0xff);
-		    	datalen++;
-		    	*buf = 0;
-		    }
-		    continue;
-		}
-		PrintAndLogEx(WARNING, "Invalid char on input");
-		return 0;
-	}
+            if (strlen(buf) >= 2) {
+                sscanf(buf, "%x", &temp);
+                data[datalen] = (uint8_t)(temp & 0xff);
+                datalen++;
+                *buf = 0;
+            }
+            continue;
+        }
+        PrintAndLogEx(WARNING, "Invalid char on input");
+        return 0;
+    }
 
-	if (crc) {
-		AddCrc(data, datalen);
-		datalen += 2;
-	}
+    if (crc) {
+        AddCrc(data, datalen);
+        datalen += 2;
+    }
 
-	c.arg[0] = datalen;
-	c.arg[1] = fast;
-	c.arg[2] = reply;
-	memcpy(c.d.asBytes, data, datalen);
+    c.arg[0] = datalen;
+    c.arg[1] = fast;
+    c.arg[2] = reply;
+    memcpy(c.d.asBytes, data, datalen);
 
-	clearCommandBuffer();
-	SendCommand(&c);
+    clearCommandBuffer();
+    SendCommand(&c);
 
-	if (reply) {
-		if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
-			uint8_t len = resp.arg[0];
-			PrintAndLogEx(NORMAL, "received %i octets", len);
-			PrintAndLogEx(NORMAL, "%s", sprint_hex(resp.d.asBytes, len) );
-		} else {
-			PrintAndLogEx(WARNING, "timeout while waiting for reply.");
-		}
-	}
-	return 0;
+    if (reply) {
+        if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
+            uint8_t len = resp.arg[0];
+            PrintAndLogEx(NORMAL, "received %i octets", len);
+            PrintAndLogEx(NORMAL, "%s", sprint_hex(resp.d.asBytes, len) );
+        } else {
+            PrintAndLogEx(WARNING, "timeout while waiting for reply.");
+        }
+    }
+    return 0;
 }
 
 /**
  * parses common HF 15 CMD parameters and prepares some data structures
  * Parameters:
- *  **cmd   	command line
+ *  **cmd   command line
  */
 int prepareHF15Cmd(char **cmd, UsbCommand *c, uint8_t iso15cmd) {
-	int temp;
-	uint8_t *req = c->d.asBytes;
-	uint8_t uid[8] = {0x00};
-	uint32_t reqlen = 0;
+    int temp;
+    uint8_t *req = c->d.asBytes;
+    uint8_t uid[8] = {0x00};
+    uint32_t reqlen = 0;
 
-	// strip
-	while (**cmd==' ' || **cmd=='\t') (*cmd)++;
+    // strip
+    while (**cmd==' ' || **cmd=='\t') (*cmd)++;
 
-	if (strstr(*cmd, "-2") == *cmd) {
-	 	c->arg[1] = 0; // use 1of256
-	 	(*cmd) += 2;
-	}
+    if (strstr(*cmd, "-2") == *cmd) {
+        c->arg[1] = 0; // use 1of256
+        (*cmd) += 2;
+    }
 
-	// strip
-	while (**cmd==' ' || **cmd=='\t') (*cmd)++;
+    // strip
+    while (**cmd==' ' || **cmd=='\t') (*cmd)++;
 
-	if (strstr(*cmd, "-o") == *cmd) {
-	 	req[reqlen] = ISO15_REQ_OPTION;
-	 	(*cmd) += 2;
-	}
+    if (strstr(*cmd, "-o") == *cmd) {
+        req[reqlen] = ISO15_REQ_OPTION;
+        (*cmd) += 2;
+    }
 
-	// strip
-	while (**cmd == ' ' || **cmd == '\t') (*cmd)++;
+    // strip
+    while (**cmd == ' ' || **cmd == '\t') (*cmd)++;
 
-	switch (**cmd) {
-		case 0:
-			PrintAndLogEx(WARNING, "missing addr");
-			return 0;
-			break;
-		case 'u':
-		case 'U':
-			// unaddressed mode may not be supported by all vendors
-			req[reqlen++] |= ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | ISO15_REQ_NONINVENTORY;
-			req[reqlen++] = iso15cmd;
-			break;
-		case '*':
-			// we scan for the UID ourself
-			req[reqlen++] |= ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | ISO15_REQ_NONINVENTORY | ISO15_REQ_ADDRESS;
-			req[reqlen++] = iso15cmd;
+    switch (**cmd) {
+        case 0:
+            PrintAndLogEx(WARNING, "missing addr");
+            return 0;
+            break;
+        case 'u':
+        case 'U':
+            // unaddressed mode may not be supported by all vendors
+            req[reqlen++] |= ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | ISO15_REQ_NONINVENTORY;
+            req[reqlen++] = iso15cmd;
+            break;
+        case '*':
+            // we scan for the UID ourself
+            req[reqlen++] |= ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | ISO15_REQ_NONINVENTORY | ISO15_REQ_ADDRESS;
+            req[reqlen++] = iso15cmd;
 
-			if (!getUID(uid)) {
-				PrintAndLogEx(WARNING, "No tag found");
-				return 0;
-			}
-			memcpy(&req[reqlen], uid, sizeof(uid));
-			PrintAndLogEx(NORMAL, "Detected UID %s", sprintUID(NULL, uid));
-			reqlen += sizeof(uid);
-			break;
-		default:
-			req[reqlen++] |= ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | ISO15_REQ_NONINVENTORY | ISO15_REQ_ADDRESS;
-			req[reqlen++] = iso15cmd;
+            if (!getUID(uid)) {
+                PrintAndLogEx(WARNING, "No tag found");
+                return 0;
+            }
+            memcpy(&req[reqlen], uid, sizeof(uid));
+            PrintAndLogEx(NORMAL, "Detected UID %s", sprintUID(NULL, uid));
+            reqlen += sizeof(uid);
+            break;
+        default:
+            req[reqlen++] |= ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | ISO15_REQ_NONINVENTORY | ISO15_REQ_ADDRESS;
+            req[reqlen++] = iso15cmd;
 
-		    // parse UID
-			for (int i=0; i<8 && (*cmd)[i*2] && (*cmd)[i*2+1]; i++) {
-				sscanf((char[]){(*cmd)[i*2], (*cmd)[i*2+1],0}, "%X", &temp);
-				uid[7-i] = temp & 0xff;
-			}
+            // parse UID
+            for (int i=0; i<8 && (*cmd)[i*2] && (*cmd)[i*2+1]; i++) {
+                sscanf((char[]){(*cmd)[i*2], (*cmd)[i*2+1],0}, "%X", &temp);
+                uid[7-i] = temp & 0xff;
+            }
 
-			PrintAndLogEx(NORMAL, "Using UID %s", sprintUID(NULL, uid));
-			memcpy(&req[reqlen], uid, sizeof(uid));
-			reqlen +=  sizeof(uid);
-			break;
-	}
-	// skip to next space
-	while (**cmd!=' ' && **cmd!='\t') (*cmd)++;
-	// skip over the space
-	while (**cmd==' ' || **cmd=='\t') (*cmd)++;
+            PrintAndLogEx(NORMAL, "Using UID %s", sprintUID(NULL, uid));
+            memcpy(&req[reqlen], uid, sizeof(uid));
+            reqlen +=  sizeof(uid);
+            break;
+    }
+    // skip to next space
+    while (**cmd!=' ' && **cmd!='\t') (*cmd)++;
+    // skip over the space
+    while (**cmd==' ' || **cmd=='\t') (*cmd)++;
 
-	c->arg[0] = reqlen;
-	return 1;
+    c->arg[0] = reqlen;
+    return 1;
 }
 
 /**
@@ -1047,81 +1047,81 @@ int prepareHF15Cmd(char **cmd, UsbCommand *c, uint8_t iso15cmd) {
  */
 int CmdHF15Readmulti(const char *Cmd) {
 
-	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd)<3 || cmdp == 'h' || cmdp == 'H') return usage_15_readmulti();
+    char cmdp = param_getchar(Cmd, 0);
+    if (strlen(Cmd)<3 || cmdp == 'h' || cmdp == 'H') return usage_15_readmulti();
 
-	UsbCommand resp;
-	uint8_t *recv;
-	UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}}; // len,speed,recv?
-	uint8_t *req = c.d.asBytes;
-	int reqlen = 0;
-	uint8_t pagenum, pagecount;
-	char cmdbuf[100];
-	char *cmd = cmdbuf;
-	strncpy(cmd, Cmd, 99);
+    UsbCommand resp;
+    uint8_t *recv;
+    UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}}; // len,speed,recv?
+    uint8_t *req = c.d.asBytes;
+    int reqlen = 0;
+    uint8_t pagenum, pagecount;
+    char cmdbuf[100];
+    char *cmd = cmdbuf;
+    strncpy(cmd, Cmd, 99);
 
-	if ( !prepareHF15Cmd(&cmd, &c, ISO15_CMD_READMULTI) )
-		return 0;
+    if ( !prepareHF15Cmd(&cmd, &c, ISO15_CMD_READMULTI) )
+        return 0;
 
-	// add OPTION flag, in order to get lock-info
-	req[0] |= ISO15_REQ_OPTION;
+    // add OPTION flag, in order to get lock-info
+    req[0] |= ISO15_REQ_OPTION;
 
-	reqlen = c.arg[0];
+    reqlen = c.arg[0];
 
-	// decimal
-	pagenum = param_get8ex(cmd, 0, 0, 10);
-	pagecount = param_get8ex(cmd, 1, 0, 10);
+    // decimal
+    pagenum = param_get8ex(cmd, 0, 0, 10);
+    pagecount = param_get8ex(cmd, 1, 0, 10);
 
-	//PrintAndLogEx(NORMAL, "ice %d %d\n", pagenum, pagecount);
+    //PrintAndLogEx(NORMAL, "ice %d %d\n", pagenum, pagecount);
 
-	// 0 means 1 page,
-	// 1 means 2 pages, ...
-	if (pagecount > 0) pagecount--;
+    // 0 means 1 page,
+    // 1 means 2 pages, ...
+    if (pagecount > 0) pagecount--;
 
-	req[reqlen++] = pagenum;
-	req[reqlen++] = pagecount;
-	AddCrc(req, reqlen);
-	c.arg[0] = reqlen+2;
+    req[reqlen++] = pagenum;
+    req[reqlen++] = pagecount;
+    AddCrc(req, reqlen);
+    c.arg[0] = reqlen+2;
 
-	clearCommandBuffer();
-	SendCommand(&c);
+    clearCommandBuffer();
+    SendCommand(&c);
 
-	if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
-		PrintAndLogEx(FAILED, "iso15693 card select failed");
-		return 1;
-	}
+    if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
+        PrintAndLogEx(FAILED, "iso15693 card select failed");
+        return 1;
+    }
 
-	uint32_t status = resp.arg[0];
-	if ( status < 2 ) {
-		PrintAndLogEx(FAILED, "iso15693 card select failed");
-		return 1;
-	}
+    uint32_t status = resp.arg[0];
+    if ( status < 2 ) {
+        PrintAndLogEx(FAILED, "iso15693 card select failed");
+        return 1;
+    }
 
-	recv = resp.d.asBytes;
+    recv = resp.d.asBytes;
 
-	if (!CheckCrc(recv, status)) {
-		PrintAndLogEx(FAILED, "CRC failed");
-		return 2;
-	}
+    if (!CheckCrc(recv, status)) {
+        PrintAndLogEx(FAILED, "CRC failed");
+        return 2;
+    }
 
-	if ( recv[0] & ISO15_RES_ERROR ) {
-		PrintAndLogEx(FAILED, "iso15693 card returned error %i: %s", recv[0], TagErrorStr(recv[0]));
-		return 3;
-	}
+    if ( recv[0] & ISO15_RES_ERROR ) {
+        PrintAndLogEx(FAILED, "iso15693 card returned error %i: %s", recv[0], TagErrorStr(recv[0]));
+        return 3;
+    }
 
-	int start = 1;  // skip status byte
-	int stop = (pagecount+1) * 5;
-	int currblock = pagenum;
-	// print response
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "block#   | data         |lck| ascii");
-	PrintAndLogEx(NORMAL, "---------+--------------+---+----------");
-	for (int i = start; i < stop; i += 5) {
-		PrintAndLogEx(NORMAL, "%3d/0x%02X | %s | %d | %s", currblock, currblock, sprint_hex(recv+i+1, 4 ), recv[i], sprint_ascii(recv+i+1, 4) );
-		currblock++;
-	}
+    int start = 1;  // skip status byte
+    int stop = (pagecount+1) * 5;
+    int currblock = pagenum;
+    // print response
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "block#   | data         |lck| ascii");
+    PrintAndLogEx(NORMAL, "---------+--------------+---+----------");
+    for (int i = start; i < stop; i += 5) {
+        PrintAndLogEx(NORMAL, "%3d/0x%02X | %s | %d | %s", currblock, currblock, sprint_hex(recv+i+1, 4 ), recv[i], sprint_ascii(recv+i+1, 4) );
+        currblock++;
+    }
 
-	return 0;
+    return 0;
 }
 
 /**
@@ -1130,72 +1130,72 @@ int CmdHF15Readmulti(const char *Cmd) {
  */
 int CmdHF15Read(const char *Cmd) {
 
-	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd)<3 || cmdp == 'h' || cmdp == 'H')  return usage_15_read();
+    char cmdp = param_getchar(Cmd, 0);
+    if (strlen(Cmd)<3 || cmdp == 'h' || cmdp == 'H')  return usage_15_read();
 
-	UsbCommand resp;
-	uint8_t *recv;
+    UsbCommand resp;
+    uint8_t *recv;
 
-	// UsbCommand arg: len, speed, recv?
-	// arg0 (datalen,  cmd len?  .arg0 == crc?)
-	// arg1	(speed == 0 == 1 of 256,  == 1 == 1 of 4 )
-	// arg2 (recv == 1 == expect a response)
-	UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}};
-	uint8_t *req = c.d.asBytes;
-	int reqlen = 0, blocknum;
-	char cmdbuf[100];
-	char *cmd = cmdbuf;
-	strncpy(cmd, Cmd, 99);
+    // UsbCommand arg: len, speed, recv?
+    // arg0 (datalen,  cmd len?  .arg0 == crc?)
+    // arg1 (speed == 0 == 1 of 256,  == 1 == 1 of 4 )
+    // arg2 (recv == 1 == expect a response)
+    UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}};
+    uint8_t *req = c.d.asBytes;
+    int reqlen = 0, blocknum;
+    char cmdbuf[100];
+    char *cmd = cmdbuf;
+    strncpy(cmd, Cmd, 99);
 
-	if ( !prepareHF15Cmd(&cmd, &c, ISO15_CMD_READ) )
-		return 0;
+    if ( !prepareHF15Cmd(&cmd, &c, ISO15_CMD_READ) )
+        return 0;
 
-	// add OPTION flag, in order to get lock-info
-	req[0] |= ISO15_REQ_OPTION;
+    // add OPTION flag, in order to get lock-info
+    req[0] |= ISO15_REQ_OPTION;
 
-	reqlen = c.arg[0];
+    reqlen = c.arg[0];
 
-	blocknum = strtol(cmd, NULL, 0);
+    blocknum = strtol(cmd, NULL, 0);
 
-	req[reqlen++] = (uint8_t)blocknum;
+    req[reqlen++] = (uint8_t)blocknum;
 
-	AddCrc(req, reqlen);
+    AddCrc(req, reqlen);
 
-	c.arg[0] = reqlen+2;
+    c.arg[0] = reqlen+2;
 
-	clearCommandBuffer();
-	SendCommand(&c);
+    clearCommandBuffer();
+    SendCommand(&c);
 
-	if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
-		PrintAndLogEx(NORMAL, "iso15693 card select failed");
-		return 1;
-	}
+    if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
+        PrintAndLogEx(NORMAL, "iso15693 card select failed");
+        return 1;
+    }
 
-	uint32_t status = resp.arg[0];
-	if ( status < 2 ) {
-		PrintAndLogEx(NORMAL, "iso15693 card select failed");
-		return 1;
-	}
+    uint32_t status = resp.arg[0];
+    if ( status < 2 ) {
+        PrintAndLogEx(NORMAL, "iso15693 card select failed");
+        return 1;
+    }
 
-	recv = resp.d.asBytes;
+    recv = resp.d.asBytes;
 
-	if ( !CheckCrc(recv, status) ) {
-		PrintAndLogEx(NORMAL, "CRC failed");
-		return 2;
-	}
+    if ( !CheckCrc(recv, status) ) {
+        PrintAndLogEx(NORMAL, "CRC failed");
+        return 2;
+    }
 
-	if ( recv[0] & ISO15_RES_ERROR ) {
-		PrintAndLogEx(WARNING, "iso15693 card returned error %i: %s", recv[0], TagErrorStr(recv[0]));
-		return 3;
-	}
+    if ( recv[0] & ISO15_RES_ERROR ) {
+        PrintAndLogEx(WARNING, "iso15693 card returned error %i: %s", recv[0], TagErrorStr(recv[0]));
+        return 3;
+    }
 
-	// print response
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "block #%3d  |lck| ascii", blocknum );
-	PrintAndLogEx(NORMAL, "------------+---+------" );
-	PrintAndLogEx(NORMAL, "%s| %d | %s", sprint_hex(recv+2, status-4), recv[1], sprint_ascii(recv+2, status-4) );
-	PrintAndLogEx(NORMAL, "");
-	return 0;
+    // print response
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "block #%3d  |lck| ascii", blocknum );
+    PrintAndLogEx(NORMAL, "------------+---+------" );
+    PrintAndLogEx(NORMAL, "%s| %d | %s", sprint_hex(recv+2, status-4), recv[1], sprint_ascii(recv+2, status-4) );
+    PrintAndLogEx(NORMAL, "");
+    return 0;
 }
 
 /**
@@ -1204,105 +1204,105 @@ int CmdHF15Read(const char *Cmd) {
  */
 int CmdHF15Write(const char *Cmd) {
 
-	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd)<3 || cmdp == 'h' || cmdp == 'H') return usage_15_write();
+    char cmdp = param_getchar(Cmd, 0);
+    if (strlen(Cmd)<3 || cmdp == 'h' || cmdp == 'H') return usage_15_write();
 
-	UsbCommand resp;
-	uint8_t *recv;
-	UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}}; // len,speed,recv?
-	uint8_t *req = c.d.asBytes;
-	int reqlen = 0, pagenum, temp;
-	char cmdbuf[100];
-	char *cmd = cmdbuf;
-	char *cmd2;
+    UsbCommand resp;
+    uint8_t *recv;
+    UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}}; // len,speed,recv?
+    uint8_t *req = c.d.asBytes;
+    int reqlen = 0, pagenum, temp;
+    char cmdbuf[100];
+    char *cmd = cmdbuf;
+    char *cmd2;
 
-	strncpy(cmd, Cmd, 99);
+    strncpy(cmd, Cmd, 99);
 
-	if ( !prepareHF15Cmd(&cmd, &c, ISO15_CMD_WRITE) )
-		return 0;
+    if ( !prepareHF15Cmd(&cmd, &c, ISO15_CMD_WRITE) )
+        return 0;
 
-	reqlen = c.arg[0];
+    reqlen = c.arg[0];
 
-	// *cmd -> page num ; *cmd2 -> data
-	cmd2=cmd;
-	while (*cmd2!=' ' && *cmd2!='\t' && *cmd2) cmd2++;
-	*cmd2 = 0;
-	cmd2++;
+    // *cmd -> page num ; *cmd2 -> data
+    cmd2=cmd;
+    while (*cmd2!=' ' && *cmd2!='\t' && *cmd2) cmd2++;
+    *cmd2 = 0;
+    cmd2++;
 
-	pagenum = strtol(cmd, NULL, 0);
+    pagenum = strtol(cmd, NULL, 0);
 
-	req[reqlen++] = (uint8_t)pagenum;
+    req[reqlen++] = (uint8_t)pagenum;
 
-	while (cmd2[0] && cmd2[1]) { // hexdata, read by 2 hexchars
-		if (*cmd2==' ') {
-			cmd2++;
-			continue;
-		}
-		sscanf((char[]){cmd2[0],cmd2[1],0},"%X",&temp);
-		req[reqlen++]=temp & 0xff;
-		cmd2+=2;
-	}
-	AddCrc(req, reqlen);
-	c.arg[0] = reqlen+2;
+    while (cmd2[0] && cmd2[1]) { // hexdata, read by 2 hexchars
+        if (*cmd2==' ') {
+            cmd2++;
+            continue;
+        }
+        sscanf((char[]){cmd2[0],cmd2[1],0},"%X",&temp);
+        req[reqlen++]=temp & 0xff;
+        cmd2+=2;
+    }
+    AddCrc(req, reqlen);
+    c.arg[0] = reqlen+2;
 
-	PrintAndLogEx(NORMAL, "iso15693 writing to page %02d (0x%02X) | data ", pagenum, pagenum);
+    PrintAndLogEx(NORMAL, "iso15693 writing to page %02d (0x%02X) | data ", pagenum, pagenum);
 
-	clearCommandBuffer();
-	SendCommand(&c);
+    clearCommandBuffer();
+    SendCommand(&c);
 
-	if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
-		PrintAndLogEx(FAILED, "iso15693 card timeout, data may be written anyway");
-		return 1;
-	}
+    if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
+        PrintAndLogEx(FAILED, "iso15693 card timeout, data may be written anyway");
+        return 1;
+    }
 
-	uint32_t status = resp.arg[0];
-	if ( status < 2 ) {
-		PrintAndLogEx(FAILED, "iso15693 card select failed");
-		return 1;
-	}
+    uint32_t status = resp.arg[0];
+    if ( status < 2 ) {
+        PrintAndLogEx(FAILED, "iso15693 card select failed");
+        return 1;
+    }
 
-	recv = resp.d.asBytes;
+    recv = resp.d.asBytes;
 
-	if ( !CheckCrc(recv, status) ) {
-		PrintAndLogEx(FAILED, "CRC failed");
-		return 2;
-	}
+    if ( !CheckCrc(recv, status) ) {
+        PrintAndLogEx(FAILED, "CRC failed");
+        return 2;
+    }
 
-	if ( recv[0] & ISO15_RES_ERROR ) {
-		PrintAndLogEx(NORMAL, "iso15693 card returned error %i: %s", recv[0], TagErrorStr(recv[0]));
-		return 3;
-	}
+    if ( recv[0] & ISO15_RES_ERROR ) {
+        PrintAndLogEx(NORMAL, "iso15693 card returned error %i: %s", recv[0], TagErrorStr(recv[0]));
+        return 3;
+    }
 
-	PrintAndLogEx(NORMAL, "OK");
-	return 0;
+    PrintAndLogEx(NORMAL, "OK");
+    return 0;
 }
 
 static command_t CommandTable15[] = {
-	{"help",		CmdHF15Help,    	1, "This help"},
-	{"demod",		CmdHF15Demod,   	1, "Demodulate ISO15693 from tag"},
-	{"dump",		CmdHF15Dump,		0, "Read all memory pages of an ISO15693 tag, save to file"},
-	{"findafi",		CmdHF15Afi,     	0, "Brute force AFI of an ISO15693 tag"},
-	{"info",		CmdHF15Info,		0, "Tag information"},
-	{"list",		CmdHF15List,    	0, "[Deprecated] List ISO15693 history"},
-	{"raw",			CmdHF15Raw,			0, "Send raw hex data to tag"},
-	{"reader",		CmdHF15Reader,  	0, "Act like an ISO15693 reader"},
-	{"record",		CmdHF15Record,  	0, "Record Samples (ISO15693)"},
-	{"restore",		CmdHF15Restore,		0, "Restore from file to all memory pages of an ISO15693 tag"},
-	{"sim",			CmdHF15Sim,     	0, "Fake an ISO15693 tag"},
-	{"samples",		CmdHF15Samples,		0, "Acquire Samples as Reader (enables carrier, sends inquiry)"},
-	{"read",		CmdHF15Read,		0, "Read a block"},
-	{"write",		CmdHF15Write,		0, "Write a block"},
-	{"readmulti",	CmdHF15Readmulti,	0, "Reads multiple Blocks"},
-	{NULL, NULL, 0, NULL}
+    {"help",        CmdHF15Help,        1, "This help"},
+    {"demod",       CmdHF15Demod,       1, "Demodulate ISO15693 from tag"},
+    {"dump",        CmdHF15Dump,        0, "Read all memory pages of an ISO15693 tag, save to file"},
+    {"findafi",     CmdHF15Afi,         0, "Brute force AFI of an ISO15693 tag"},
+    {"info",        CmdHF15Info,        0, "Tag information"},
+    {"list",        CmdHF15List,        0, "[Deprecated] List ISO15693 history"},
+    {"raw",         CmdHF15Raw,         0, "Send raw hex data to tag"},
+    {"reader",      CmdHF15Reader,      0, "Act like an ISO15693 reader"},
+    {"record",      CmdHF15Record,      0, "Record Samples (ISO15693)"},
+    {"restore",     CmdHF15Restore,     0, "Restore from file to all memory pages of an ISO15693 tag"},
+    {"sim",         CmdHF15Sim,         0, "Fake an ISO15693 tag"},
+    {"samples",     CmdHF15Samples,     0, "Acquire Samples as Reader (enables carrier, sends inquiry)"},
+    {"read",        CmdHF15Read,        0, "Read a block"},
+    {"write",       CmdHF15Write,       0, "Write a block"},
+    {"readmulti",   CmdHF15Readmulti,   0, "Reads multiple Blocks"},
+    {NULL, NULL, 0, NULL}
 };
 
 int CmdHF15(const char *Cmd) {
-	clearCommandBuffer();
-	CmdsParse(CommandTable15, Cmd);
-	return 0;
+    clearCommandBuffer();
+    CmdsParse(CommandTable15, Cmd);
+    return 0;
 }
 
 int CmdHF15Help(const char *Cmd) {
-	CmdsHelp(CommandTable15);
-	return 0;
+    CmdsHelp(CommandTable15);
+    return 0;
 }
\ No newline at end of file
diff --git a/client/cmdhf15.h b/client/cmdhf15.h
index 2908a9aab..38f4b7801 100644
--- a/client/cmdhf15.h
+++ b/client/cmdhf15.h
@@ -21,10 +21,10 @@
 #include "ui.h"
 #include "util.h"
 #include "cmdparser.h"
-#include "crc16.h"	// iso15 crc
+#include "crc16.h"             // iso15 crc
 #include "cmdmain.h"
-#include "cmddata.h"		// getsamples
-#include "loclass/fileutils.h" 		// savefileEML
+#include "cmddata.h"           // getsamples
+#include "loclass/fileutils.h" // savefileEML
 
 int CmdHF15(const char *Cmd);
 
diff --git a/client/cmdhfepa.c b/client/cmdhfepa.c
index 4e7510fe0..be8771b86 100644
--- a/client/cmdhfepa.c
+++ b/client/cmdhfepa.c
@@ -14,168 +14,168 @@ static int CmdHelp(const char *Cmd);
 // Perform (part of) the PACE protocol
 int CmdHFEPACollectPACENonces(const char *Cmd)
 {
-	// requested nonce size
-	uint32_t m = 0;
-	// requested number of Nonces
-	uint32_t n = 0;
-	// delay between requests
-	uint32_t d = 0;
+    // requested nonce size
+    uint32_t m = 0;
+    // requested number of Nonces
+    uint32_t n = 0;
+    // delay between requests
+    uint32_t d = 0;
 
-	sscanf(Cmd, "%u %u %u", &m, &n, &d);
+    sscanf(Cmd, "%u %u %u", &m, &n, &d);
 
-	// values are expected to be > 0
-	m = m > 0 ? m : 1;
-	n = n > 0 ? n : 1;
+    // values are expected to be > 0
+    m = m > 0 ? m : 1;
+    n = n > 0 ? n : 1;
 
-	PrintAndLogEx(NORMAL, "Collecting %u %u byte nonces", n, m);
-	PrintAndLogEx(NORMAL, "Start: %" PRIu64, msclock()/1000);
-	// repeat n times
-	for (uint32_t i = 0; i < n; i++) {
-		// execute PACE
-		UsbCommand c = {CMD_EPA_PACE_COLLECT_NONCE, {(int)m, 0, 0}};
-		clearCommandBuffer();
-		SendCommand(&c);
-		UsbCommand resp;
-		WaitForResponse(CMD_ACK,&resp);
+    PrintAndLogEx(NORMAL, "Collecting %u %u byte nonces", n, m);
+    PrintAndLogEx(NORMAL, "Start: %" PRIu64, msclock()/1000);
+    // repeat n times
+    for (uint32_t i = 0; i < n; i++) {
+        // execute PACE
+        UsbCommand c = {CMD_EPA_PACE_COLLECT_NONCE, {(int)m, 0, 0}};
+        clearCommandBuffer();
+        SendCommand(&c);
+        UsbCommand resp;
+        WaitForResponse(CMD_ACK,&resp);
 
-		// check if command failed
-		if (resp.arg[0] != 0) {
-			PrintAndLogEx(FAILED, "Error in step %d, Return code: %d",resp.arg[0],(int)resp.arg[1]);
-		} else {
-			size_t nonce_length = resp.arg[1];
-			char *nonce = (char *) calloc(2 * nonce_length + 1, sizeof(uint8_t));
-			for(int j = 0; j < nonce_length; j++) {
-				sprintf(nonce + (2 * j), "%02X", resp.d.asBytes[j]);
-			}
-			// print nonce
-			PrintAndLogEx(NORMAL, "Length: %d, Nonce: %s", nonce_length, nonce);
-			free(nonce);
-		}
-		if (i < n - 1) {
-			sleep(d);
-		}
-	}
-	PrintAndLogEx(NORMAL, "End: %" PRIu64, msclock()/1000);
-	return 1;
+        // check if command failed
+        if (resp.arg[0] != 0) {
+            PrintAndLogEx(FAILED, "Error in step %d, Return code: %d",resp.arg[0],(int)resp.arg[1]);
+        } else {
+            size_t nonce_length = resp.arg[1];
+            char *nonce = (char *) calloc(2 * nonce_length + 1, sizeof(uint8_t));
+            for(int j = 0; j < nonce_length; j++) {
+                sprintf(nonce + (2 * j), "%02X", resp.d.asBytes[j]);
+            }
+            // print nonce
+            PrintAndLogEx(NORMAL, "Length: %d, Nonce: %s", nonce_length, nonce);
+            free(nonce);
+        }
+        if (i < n - 1) {
+            sleep(d);
+        }
+    }
+    PrintAndLogEx(NORMAL, "End: %" PRIu64, msclock()/1000);
+    return 1;
 }
 
 // perform the PACE protocol by replaying APDUs
 int CmdHFEPAPACEReplay(const char *Cmd)
 {
-	// the 4 APDUs which are replayed + their lengths
-	uint8_t msesa_apdu[41], gn_apdu[8], map_apdu[75];
-	uint8_t pka_apdu[75], ma_apdu[18], apdu_lengths[5] = {0};
-	// pointers to the arrays to be able to iterate
-	uint8_t *apdus[] = {msesa_apdu, gn_apdu, map_apdu, pka_apdu, ma_apdu};
+    // the 4 APDUs which are replayed + their lengths
+    uint8_t msesa_apdu[41], gn_apdu[8], map_apdu[75];
+    uint8_t pka_apdu[75], ma_apdu[18], apdu_lengths[5] = {0};
+    // pointers to the arrays to be able to iterate
+    uint8_t *apdus[] = {msesa_apdu, gn_apdu, map_apdu, pka_apdu, ma_apdu};
 
-	// usage message
-	static const char *usage_msg =
-		"Please specify 5 APDUs separated by spaces. "
-		"Example:\n preplay 0022C1A4 1068000000 1086000002 1234ABCDEF 1A2B3C4D";
+    // usage message
+    static const char *usage_msg =
+        "Please specify 5 APDUs separated by spaces. "
+        "Example:\n preplay 0022C1A4 1068000000 1086000002 1234ABCDEF 1A2B3C4D";
 
-	// Proxmark response
-	UsbCommand resp;
+    // Proxmark response
+    UsbCommand resp;
 
-	int skip = 0, skip_add = 0, scan_return = 0;
-	// for each APDU
-	for (int i = 0; i < sizeof(apdu_lengths); i++) {
-		// scan to next space or end of string
-		while (Cmd[skip] != ' ' && Cmd[skip] != '\0') {
-			// convert
-			scan_return = sscanf(Cmd + skip, "%2X%n",
-			                     (unsigned int *) (apdus[i] + apdu_lengths[i]),
-			                     &skip_add);
-			if (scan_return < 1) {
-				PrintAndLogEx(NORMAL, (char *)usage_msg);
-				PrintAndLogEx(WARNING, "Not enough APDUs! Try again!");
-				return 0;
-			}
-			skip += skip_add;
+    int skip = 0, skip_add = 0, scan_return = 0;
+    // for each APDU
+    for (int i = 0; i < sizeof(apdu_lengths); i++) {
+        // scan to next space or end of string
+        while (Cmd[skip] != ' ' && Cmd[skip] != '\0') {
+            // convert
+            scan_return = sscanf(Cmd + skip, "%2X%n",
+                                 (unsigned int *) (apdus[i] + apdu_lengths[i]),
+                                 &skip_add);
+            if (scan_return < 1) {
+                PrintAndLogEx(NORMAL, (char *)usage_msg);
+                PrintAndLogEx(WARNING, "Not enough APDUs! Try again!");
+                return 0;
+            }
+            skip += skip_add;
             apdu_lengths[i]++;
-		}
+        }
 
-		// break on EOF
-		if (Cmd[skip] == '\0') {
-			if (i < sizeof(apdu_lengths) - 1) {
+        // break on EOF
+        if (Cmd[skip] == '\0') {
+            if (i < sizeof(apdu_lengths) - 1) {
 
-				PrintAndLogEx(NORMAL, (char *)usage_msg);
-				return 0;
-			}
-			break;
-		}
-		// skip the space
-		skip++;
-	}
+                PrintAndLogEx(NORMAL, (char *)usage_msg);
+                return 0;
+            }
+            break;
+        }
+        // skip the space
+        skip++;
+    }
 
-	// transfer the APDUs to the Proxmark
-	UsbCommand usb_cmd;
-	usb_cmd.cmd = CMD_EPA_PACE_REPLAY;
-	for (int i = 0; i < sizeof(apdu_lengths); i++) {
-		// APDU number
-		usb_cmd.arg[0] = i + 1;
-		// transfer the APDU in several parts if necessary
-		for (int j = 0; j * sizeof(usb_cmd.d.asBytes) < apdu_lengths[i]; j++) {
-			// offset into the APDU
-			usb_cmd.arg[1] = j * sizeof(usb_cmd.d.asBytes);
-			// amount of data in this packet
-			int packet_length = apdu_lengths[i] - (j * sizeof(usb_cmd.d.asBytes));
-			if (packet_length > sizeof(usb_cmd.d.asBytes)) {
-				packet_length = sizeof(usb_cmd.d.asBytes);
-			}
-			usb_cmd.arg[2] = packet_length;
+    // transfer the APDUs to the Proxmark
+    UsbCommand usb_cmd;
+    usb_cmd.cmd = CMD_EPA_PACE_REPLAY;
+    for (int i = 0; i < sizeof(apdu_lengths); i++) {
+        // APDU number
+        usb_cmd.arg[0] = i + 1;
+        // transfer the APDU in several parts if necessary
+        for (int j = 0; j * sizeof(usb_cmd.d.asBytes) < apdu_lengths[i]; j++) {
+            // offset into the APDU
+            usb_cmd.arg[1] = j * sizeof(usb_cmd.d.asBytes);
+            // amount of data in this packet
+            int packet_length = apdu_lengths[i] - (j * sizeof(usb_cmd.d.asBytes));
+            if (packet_length > sizeof(usb_cmd.d.asBytes)) {
+                packet_length = sizeof(usb_cmd.d.asBytes);
+            }
+            usb_cmd.arg[2] = packet_length;
 
-			memcpy(usb_cmd.d.asBytes, // + (j * sizeof(usb_cmd.d.asBytes)),
-			       apdus[i] + (j * sizeof(usb_cmd.d.asBytes)),
-			       packet_length);
+            memcpy(usb_cmd.d.asBytes, // + (j * sizeof(usb_cmd.d.asBytes)),
+                   apdus[i] + (j * sizeof(usb_cmd.d.asBytes)),
+                   packet_length);
 
-			clearCommandBuffer();
-			SendCommand(&usb_cmd);
-			WaitForResponse(CMD_ACK, &resp);
-			if (resp.arg[0] != 0) {
-				PrintAndLogEx(WARNING, "Transfer of APDU #%d Part %d failed!", i, j);
-				return 0;
-			}
-		}
-	}
+            clearCommandBuffer();
+            SendCommand(&usb_cmd);
+            WaitForResponse(CMD_ACK, &resp);
+            if (resp.arg[0] != 0) {
+                PrintAndLogEx(WARNING, "Transfer of APDU #%d Part %d failed!", i, j);
+                return 0;
+            }
+        }
+    }
 
-	// now perform the replay
-	usb_cmd.arg[0] = 0;
-	clearCommandBuffer();
-	SendCommand(&usb_cmd);
-	WaitForResponse(CMD_ACK, &resp);
-	if (resp.arg[0] != 0) {
-		PrintAndLogEx(NORMAL, "\nPACE replay failed in step %u!", (uint32_t)resp.arg[0]);
-		PrintAndLogEx(NORMAL, "Measured times:");
-		PrintAndLogEx(NORMAL, "MSE Set AT: %u us", resp.d.asDwords[0]);
-		PrintAndLogEx(NORMAL, "GA Get Nonce: %u us", resp.d.asDwords[1]);
-		PrintAndLogEx(NORMAL, "GA Map Nonce: %u us", resp.d.asDwords[2]);
-		PrintAndLogEx(NORMAL, "GA Perform Key Agreement: %u us", resp.d.asDwords[3]);
-		PrintAndLogEx(NORMAL, "GA Mutual Authenticate: %u us", resp.d.asDwords[4]);
-	} else {
-		PrintAndLogEx(NORMAL, "PACE replay successfull!");
-		PrintAndLogEx(NORMAL, "MSE Set AT: %u us", resp.d.asDwords[0]);
-		PrintAndLogEx(NORMAL, "GA Get Nonce: %u us", resp.d.asDwords[1]);
-		PrintAndLogEx(NORMAL, "GA Map Nonce: %u us", resp.d.asDwords[2]);
-		PrintAndLogEx(NORMAL, "GA Perform Key Agreement: %u us", resp.d.asDwords[3]);
-		PrintAndLogEx(NORMAL, "GA Mutual Authenticate: %u us", resp.d.asDwords[4]);
-	}
-	return 1;
+    // now perform the replay
+    usb_cmd.arg[0] = 0;
+    clearCommandBuffer();
+    SendCommand(&usb_cmd);
+    WaitForResponse(CMD_ACK, &resp);
+    if (resp.arg[0] != 0) {
+        PrintAndLogEx(NORMAL, "\nPACE replay failed in step %u!", (uint32_t)resp.arg[0]);
+        PrintAndLogEx(NORMAL, "Measured times:");
+        PrintAndLogEx(NORMAL, "MSE Set AT: %u us", resp.d.asDwords[0]);
+        PrintAndLogEx(NORMAL, "GA Get Nonce: %u us", resp.d.asDwords[1]);
+        PrintAndLogEx(NORMAL, "GA Map Nonce: %u us", resp.d.asDwords[2]);
+        PrintAndLogEx(NORMAL, "GA Perform Key Agreement: %u us", resp.d.asDwords[3]);
+        PrintAndLogEx(NORMAL, "GA Mutual Authenticate: %u us", resp.d.asDwords[4]);
+    } else {
+        PrintAndLogEx(NORMAL, "PACE replay successfull!");
+        PrintAndLogEx(NORMAL, "MSE Set AT: %u us", resp.d.asDwords[0]);
+        PrintAndLogEx(NORMAL, "GA Get Nonce: %u us", resp.d.asDwords[1]);
+        PrintAndLogEx(NORMAL, "GA Map Nonce: %u us", resp.d.asDwords[2]);
+        PrintAndLogEx(NORMAL, "GA Perform Key Agreement: %u us", resp.d.asDwords[3]);
+        PrintAndLogEx(NORMAL, "GA Mutual Authenticate: %u us", resp.d.asDwords[4]);
+    }
+    return 1;
 }
 
 static command_t CommandTable[] = {
-	{"help",    CmdHelp,                   1, "This help"},
-	{"cnonces", CmdHFEPACollectPACENonces, 0, "<m> <n> <d> Acquire n>0 encrypted PACE nonces of size m>0 with d sec pauses"},
-	{"preplay", CmdHFEPAPACEReplay,        0, "<mse> <get> <map> <pka> <ma> Perform PACE protocol by replaying given APDUs"},
- 	{NULL, NULL, 0, NULL}
+    {"help",    CmdHelp,                   1, "This help"},
+    {"cnonces", CmdHFEPACollectPACENonces, 0, "<m> <n> <d> Acquire n>0 encrypted PACE nonces of size m>0 with d sec pauses"},
+    {"preplay", CmdHFEPAPACEReplay,        0, "<mse> <get> <map> <pka> <ma> Perform PACE protocol by replaying given APDUs"},
+    {NULL, NULL, 0, NULL}
 };
 
 int CmdHelp(const char *Cmd) {
- 	CmdsHelp(CommandTable);
-	return 0;
+    CmdsHelp(CommandTable);
+    return 0;
 }
 
 int CmdHFEPA(const char *Cmd) {
-	clearCommandBuffer();
-	CmdsParse(CommandTable, Cmd);
-	return 0;
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
+    return 0;
 }
\ No newline at end of file
diff --git a/client/cmdhffelica.c b/client/cmdhffelica.c
index 7a00c2490..615f51049 100644
--- a/client/cmdhffelica.c
+++ b/client/cmdhffelica.c
@@ -12,406 +12,406 @@
 static int CmdHelp(const char *Cmd);
 
 int usage_hf_felica_sim(void) {
-	PrintAndLogEx(NORMAL, "\n Emulating ISO/18092 FeliCa tag \n");
-	PrintAndLogEx(NORMAL, "Usage: hf felica sim [h] t <type> [v]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "    h     : This help");
-	PrintAndLogEx(NORMAL, "    t     : 1 = FeliCa");
-	PrintAndLogEx(NORMAL, "          : 2 = FeliCaLiteS");
-	PrintAndLogEx(NORMAL, "    v     : (Optional) Verbose");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "          hf felica sim t 1 ");
-	return 0;
+    PrintAndLogEx(NORMAL, "\n Emulating ISO/18092 FeliCa tag \n");
+    PrintAndLogEx(NORMAL, "Usage: hf felica sim [h] t <type> [v]");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "    h     : This help");
+    PrintAndLogEx(NORMAL, "    t     : 1 = FeliCa");
+    PrintAndLogEx(NORMAL, "          : 2 = FeliCaLiteS");
+    PrintAndLogEx(NORMAL, "    v     : (Optional) Verbose");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "          hf felica sim t 1 ");
+    return 0;
 }
 int usage_hf_felica_sniff(void){
-	PrintAndLogEx(NORMAL, "It get data from the field and saves it into command buffer.");
-	PrintAndLogEx(NORMAL, "Buffer accessible from command 'hf list felica'");
-	PrintAndLogEx(NORMAL, "Usage:  hf felica sniff <s > <t>");
-	PrintAndLogEx(NORMAL, "      s       samples to skip (decimal)");
-	PrintAndLogEx(NORMAL, "      t       triggers to skip (decimal)");
- 	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "          hf felica sniff s 1000");
-	return 0;
+    PrintAndLogEx(NORMAL, "It get data from the field and saves it into command buffer.");
+    PrintAndLogEx(NORMAL, "Buffer accessible from command 'hf list felica'");
+    PrintAndLogEx(NORMAL, "Usage:  hf felica sniff <s > <t>");
+    PrintAndLogEx(NORMAL, "      s       samples to skip (decimal)");
+    PrintAndLogEx(NORMAL, "      t       triggers to skip (decimal)");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "          hf felica sniff s 1000");
+    return 0;
 }
 int usage_hf_felica_simlite(void) {
-	PrintAndLogEx(NORMAL, "\n Emulating ISO/18092 FeliCa Lite tag \n");
-	PrintAndLogEx(NORMAL, "Usage: hf felica litesim [h] u <uid>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "    h     : This help");
-	PrintAndLogEx(NORMAL, "    uid   : UID in hexsymbol");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "          hf felica litesim 11223344556677");
-	return 0;
+    PrintAndLogEx(NORMAL, "\n Emulating ISO/18092 FeliCa Lite tag \n");
+    PrintAndLogEx(NORMAL, "Usage: hf felica litesim [h] u <uid>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "    h     : This help");
+    PrintAndLogEx(NORMAL, "    uid   : UID in hexsymbol");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "          hf felica litesim 11223344556677");
+    return 0;
 }
 int usage_hf_felica_dumplite(void) {
-	PrintAndLogEx(NORMAL, "\n Dump ISO/18092 FeliCa Lite tag \n");
-	PrintAndLogEx(NORMAL, "press button to abort run, otherwise it will loop for 200sec.");
-	PrintAndLogEx(NORMAL, "Usage: hf felica litedump [h]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "    h     : This help");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "          hf felica litedump");
-	return 0;
+    PrintAndLogEx(NORMAL, "\n Dump ISO/18092 FeliCa Lite tag \n");
+    PrintAndLogEx(NORMAL, "press button to abort run, otherwise it will loop for 200sec.");
+    PrintAndLogEx(NORMAL, "Usage: hf felica litedump [h]");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "    h     : This help");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "          hf felica litedump");
+    return 0;
 }
 int usage_hf_felica_raw(void){
-	PrintAndLogEx(NORMAL, "Usage: hf felica raw [-h] [-r] [-c] [-p] [-a] <0A 0B 0C ... hex>");
-	PrintAndLogEx(NORMAL, "       -h    this help");
-	PrintAndLogEx(NORMAL, "       -r    do not read response");
-	PrintAndLogEx(NORMAL, "       -c    calculate and append CRC");
-	PrintAndLogEx(NORMAL, "       -p    leave the signal field ON after receive");
-	PrintAndLogEx(NORMAL, "       -a    active signal field ON without select");
-	PrintAndLogEx(NORMAL, "       -s    active signal field ON with select");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage: hf felica raw [-h] [-r] [-c] [-p] [-a] <0A 0B 0C ... hex>");
+    PrintAndLogEx(NORMAL, "       -h    this help");
+    PrintAndLogEx(NORMAL, "       -r    do not read response");
+    PrintAndLogEx(NORMAL, "       -c    calculate and append CRC");
+    PrintAndLogEx(NORMAL, "       -p    leave the signal field ON after receive");
+    PrintAndLogEx(NORMAL, "       -a    active signal field ON without select");
+    PrintAndLogEx(NORMAL, "       -s    active signal field ON with select");
+    return 0;
 }
 
 int CmdHFFelicaList(const char *Cmd) {
-	//PrintAndLogEx(NORMAL, "Deprecated command, use 'hf list felica' instead");
-	CmdTraceList("felica");
-	return 0;
+    //PrintAndLogEx(NORMAL, "Deprecated command, use 'hf list felica' instead");
+    CmdTraceList("felica");
+    return 0;
 }
 
 int CmdHFFelicaReader(const char *Cmd) {
-	bool silent = (Cmd[0] == 's' || Cmd[0] ==  'S');
-	//UsbCommand cDisconnect = {CMD_FELICA_COMMAND, {0,0,0}};
-	UsbCommand c = {CMD_FELICA_COMMAND, {FELICA_CONNECT, 0, 0}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	UsbCommand resp;
-	if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
-		if (!silent) PrintAndLogEx(WARNING, "FeliCa card select failed");
-		//SendCommand(&cDisconnect);
-		return 0;
-	}
+    bool silent = (Cmd[0] == 's' || Cmd[0] ==  'S');
+    //UsbCommand cDisconnect = {CMD_FELICA_COMMAND, {0,0,0}};
+    UsbCommand c = {CMD_FELICA_COMMAND, {FELICA_CONNECT, 0, 0}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    UsbCommand resp;
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
+        if (!silent) PrintAndLogEx(WARNING, "FeliCa card select failed");
+        //SendCommand(&cDisconnect);
+        return 0;
+    }
 
-	felica_card_select_t card;
-	memcpy(&card, (felica_card_select_t *)resp.d.asBytes, sizeof(felica_card_select_t));
-	uint64_t status = resp.arg[0];
+    felica_card_select_t card;
+    memcpy(&card, (felica_card_select_t *)resp.d.asBytes, sizeof(felica_card_select_t));
+    uint64_t status = resp.arg[0];
 
-	switch(status) {
-		case 1: {
-			if (!silent)
-				PrintAndLogEx(WARNING, "card timeout");
-			break;
-		}
-		case 2: {
-			if (!silent)
-				PrintAndLogEx(WARNING, "card answered wrong");
-			break;
-		}
-		case 3: {
-			if (!silent)
-				PrintAndLogEx(WARNING, "CRC check failed");
-			break;
-		}
-		case 0: {
-			PrintAndLogEx(SUCCESS, "FeliCa tag info");
+    switch(status) {
+        case 1: {
+            if (!silent)
+                PrintAndLogEx(WARNING, "card timeout");
+            break;
+        }
+        case 2: {
+            if (!silent)
+                PrintAndLogEx(WARNING, "card answered wrong");
+            break;
+        }
+        case 3: {
+            if (!silent)
+                PrintAndLogEx(WARNING, "CRC check failed");
+            break;
+        }
+        case 0: {
+            PrintAndLogEx(SUCCESS, "FeliCa tag info");
 
-			PrintAndLogEx(NORMAL, "IDm  %s", sprint_hex(card.IDm, sizeof(card.IDm)));
-			PrintAndLogEx(NORMAL, "  - CODE    %s", sprint_hex(card.code, sizeof(card.code)));
-			PrintAndLogEx(NORMAL, "  - NFCID2  %s", sprint_hex(card.uid, sizeof(card.uid)));
+            PrintAndLogEx(NORMAL, "IDm  %s", sprint_hex(card.IDm, sizeof(card.IDm)));
+            PrintAndLogEx(NORMAL, "  - CODE    %s", sprint_hex(card.code, sizeof(card.code)));
+            PrintAndLogEx(NORMAL, "  - NFCID2  %s", sprint_hex(card.uid, sizeof(card.uid)));
 
-			PrintAndLogEx(NORMAL, "Parameter (PAD) | %s", sprint_hex(card.PMm, sizeof(card.PMm)));
-			PrintAndLogEx(NORMAL, "  - IC CODE %s", sprint_hex(card.iccode, sizeof(card.iccode)));
-			PrintAndLogEx(NORMAL, "  - MRT     %s", sprint_hex(card.mrt, sizeof(card.mrt)));
+            PrintAndLogEx(NORMAL, "Parameter (PAD) | %s", sprint_hex(card.PMm, sizeof(card.PMm)));
+            PrintAndLogEx(NORMAL, "  - IC CODE %s", sprint_hex(card.iccode, sizeof(card.iccode)));
+            PrintAndLogEx(NORMAL, "  - MRT     %s", sprint_hex(card.mrt, sizeof(card.mrt)));
 
-			PrintAndLogEx(NORMAL, "SERVICE CODE %s", sprint_hex(card.servicecode, sizeof(card.servicecode)));
-			break;
-		}
-	}
-	return status;
+            PrintAndLogEx(NORMAL, "SERVICE CODE %s", sprint_hex(card.servicecode, sizeof(card.servicecode)));
+            break;
+        }
+    }
+    return status;
 }
 
 // simulate iso18092 / FeliCa tag
 int CmdHFFelicaSim(const char *Cmd) {
-	bool errors = false;
-	uint8_t flags = 0;
-	uint8_t tagtype = 1;
-	uint8_t cmdp = 0;
-	uint8_t uid[10] = {0,0,0,0,0,0,0,0,0,0};
-	int uidlen = 0;
-	bool verbose =  false;
+    bool errors = false;
+    uint8_t flags = 0;
+    uint8_t tagtype = 1;
+    uint8_t cmdp = 0;
+    uint8_t uid[10] = {0,0,0,0,0,0,0,0,0,0};
+    int uidlen = 0;
+    bool verbose =  false;
 
-	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch (param_getchar(Cmd, cmdp)) {
-			case 'h':
-			case 'H':
-				return usage_hf_felica_sim();
-			case 't':
-			case 'T':
-				// Retrieve the tag type
-				tagtype = param_get8ex(Cmd, cmdp+1, 0, 10);
-				if (tagtype == 0)
-					errors = true;
-				cmdp += 2;
-				break;
-			case 'u':
-			case 'U':
-				// Retrieve the full 4,7,10 byte long uid
-				param_gethex_ex(Cmd, cmdp+1, uid, &uidlen);
-				if (!errors) {
-					PrintAndLogEx(NORMAL, "Emulating ISO18092/FeliCa tag with %d byte UID (%s)", uidlen>>1, sprint_hex(uid, uidlen>>1));
-				}
-				cmdp += 2;
-				break;
-			case 'v':
-			case 'V':
-				verbose = true;
-				cmdp++;
-				break;
-			case 'e':
-			case 'E':
-				cmdp++;
-				break;
-			default:
-				PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-				errors = true;
-				break;
-			}
-	}
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (param_getchar(Cmd, cmdp)) {
+            case 'h':
+            case 'H':
+                return usage_hf_felica_sim();
+            case 't':
+            case 'T':
+                // Retrieve the tag type
+                tagtype = param_get8ex(Cmd, cmdp+1, 0, 10);
+                if (tagtype == 0)
+                    errors = true;
+                cmdp += 2;
+                break;
+            case 'u':
+            case 'U':
+                // Retrieve the full 4,7,10 byte long uid
+                param_gethex_ex(Cmd, cmdp+1, uid, &uidlen);
+                if (!errors) {
+                    PrintAndLogEx(NORMAL, "Emulating ISO18092/FeliCa tag with %d byte UID (%s)", uidlen>>1, sprint_hex(uid, uidlen>>1));
+                }
+                cmdp += 2;
+                break;
+            case 'v':
+            case 'V':
+                verbose = true;
+                cmdp++;
+                break;
+            case 'e':
+            case 'E':
+                cmdp++;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                errors = true;
+                break;
+            }
+    }
 
-	//Validations
-	if (errors || cmdp == 0) return usage_hf_felica_sim();
+    //Validations
+    if (errors || cmdp == 0) return usage_hf_felica_sim();
 
-	UsbCommand c = {CMD_FELICA_SIMULATE_TAG,{ tagtype, flags, 0 }};
-	memcpy(c.d.asBytes, uid, uidlen>>1);
-	clearCommandBuffer();
-	SendCommand(&c);
-	UsbCommand resp;
+    UsbCommand c = {CMD_FELICA_SIMULATE_TAG,{ tagtype, flags, 0 }};
+    memcpy(c.d.asBytes, uid, uidlen>>1);
+    clearCommandBuffer();
+    SendCommand(&c);
+    UsbCommand resp;
 
-	if ( verbose )
-		PrintAndLogEx(NORMAL, "Press pm3-button to abort simulation");
+    if ( verbose )
+        PrintAndLogEx(NORMAL, "Press pm3-button to abort simulation");
 
-	while( !ukbhit() ){
-		if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500) ) continue;
-	}
-	return 0;
+    while( !ukbhit() ){
+        if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500) ) continue;
+    }
+    return 0;
 }
 
 int CmdHFFelicaSniff(const char *Cmd) {
 
-	uint8_t cmdp = 0;
-	uint64_t samples2skip = 0;
-	uint64_t triggers2skip = 0;
-	bool errors = false;
+    uint8_t cmdp = 0;
+    uint64_t samples2skip = 0;
+    uint64_t triggers2skip = 0;
+    bool errors = false;
 
-	while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch(param_getchar(Cmd, cmdp)) {
-		case 'h':
-		case 'H':
-			return usage_hf_felica_sniff();
-		case 's':
-		case 'S':
-			samples2skip = param_get32ex(Cmd, cmdp+1, 0, 10);
-			cmdp += 2;
-			break;
-		case 't':
-		case 'T':
-			triggers2skip = param_get32ex(Cmd, cmdp+1, 0, 10);
-			cmdp += 2;
-			break;
-		default:
-			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-			errors = true;
-			break;
-		}
-	}
-	//Validations
-	if (errors || cmdp == 0) return usage_hf_felica_sniff();
+    while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch(param_getchar(Cmd, cmdp)) {
+        case 'h':
+        case 'H':
+            return usage_hf_felica_sniff();
+        case 's':
+        case 'S':
+            samples2skip = param_get32ex(Cmd, cmdp+1, 0, 10);
+            cmdp += 2;
+            break;
+        case 't':
+        case 'T':
+            triggers2skip = param_get32ex(Cmd, cmdp+1, 0, 10);
+            cmdp += 2;
+            break;
+        default:
+            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+            errors = true;
+            break;
+        }
+    }
+    //Validations
+    if (errors || cmdp == 0) return usage_hf_felica_sniff();
 
-	UsbCommand c = {CMD_FELICA_SNOOP, {samples2skip, triggers2skip, 0}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+    UsbCommand c = {CMD_FELICA_SNOOP, {samples2skip, triggers2skip, 0}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 
 // uid  hex
 int CmdHFFelicaSimLite(const char *Cmd) {
 
-	uint64_t uid = param_get64ex(Cmd, 0, 0, 16);
+    uint64_t uid = param_get64ex(Cmd, 0, 0, 16);
 
     if (!uid)
-		return usage_hf_felica_simlite();
+        return usage_hf_felica_simlite();
 
-	UsbCommand c = {CMD_FELICA_LITE_SIM, {uid, 0, 0} };
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+    UsbCommand c = {CMD_FELICA_LITE_SIM, {uid, 0, 0} };
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 
 static void printSep() {
-	PrintAndLogEx(NORMAL, "------------------------------------------------------------------------------------");
+    PrintAndLogEx(NORMAL, "------------------------------------------------------------------------------------");
 }
 
 uint16_t PrintFliteBlock(uint16_t tracepos, uint8_t *trace, uint16_t tracelen) {
-	if (tracepos+19 >= tracelen)
-		return tracelen;
+    if (tracepos+19 >= tracelen)
+        return tracelen;
 
-	trace += tracepos;
-	uint8_t blocknum = trace[0];
-	uint8_t status1 = trace[1];
-	uint8_t status2 = trace[2];
+    trace += tracepos;
+    uint8_t blocknum = trace[0];
+    uint8_t status1 = trace[1];
+    uint8_t status2 = trace[2];
 
-	char line[110] = {0};
-	for (int j = 0; j < 16; j++) {
-		snprintf(line + (j * 4), sizeof(line) - 1 - (j*4) , "%02x  ", trace[j+3]);
-	}
+    char line[110] = {0};
+    for (int j = 0; j < 16; j++) {
+        snprintf(line + (j * 4), sizeof(line) - 1 - (j*4) , "%02x  ", trace[j+3]);
+    }
 
-	PrintAndLogEx(NORMAL, "block number %02x, status: %02x %02x",blocknum,status1, status2);
-	switch (blocknum) {
-		case 0x00: PrintAndLogEx(NORMAL,  "S_PAD0: %s",line);break;
-		case 0x01: PrintAndLogEx(NORMAL,  "S_PAD1: %s",line);break;
-		case 0x02: PrintAndLogEx(NORMAL,  "S_PAD2: %s",line);break;
-		case 0x03: PrintAndLogEx(NORMAL,  "S_PAD3: %s",line);break;
-		case 0x04: PrintAndLogEx(NORMAL,  "S_PAD4: %s",line);break;
-		case 0x05: PrintAndLogEx(NORMAL,  "S_PAD5: %s",line);break;
-		case 0x06: PrintAndLogEx(NORMAL,  "S_PAD6: %s",line);break;
-		case 0x07: PrintAndLogEx(NORMAL,  "S_PAD7: %s",line);break;
-		case 0x08: PrintAndLogEx(NORMAL,  "S_PAD8: %s",line);break;
-		case 0x09: PrintAndLogEx(NORMAL,  "S_PAD9: %s",line);break;
-		case 0x0a: PrintAndLogEx(NORMAL,  "S_PAD10: %s",line);break;
-		case 0x0b: PrintAndLogEx(NORMAL,  "S_PAD11: %s",line);break;
-		case 0x0c: PrintAndLogEx(NORMAL,  "S_PAD12: %s",line);break;
-		case 0x0d: PrintAndLogEx(NORMAL,  "S_PAD13: %s",line);break;
-		case 0x0E: {
-			uint32_t regA = trace[3] | trace[4] << 8 | trace[5] << 16 | trace[ 6] << 24;
-			uint32_t regB = trace[7] | trace[8] << 8 | trace[9] << 16 | trace[10] << 24;
-			line[0] = 0;
-			for (int j = 0; j < 8; j++)
-				snprintf(line + (j*2), sizeof(line)-1-(j*2), "%02x", trace[j+11]);
+    PrintAndLogEx(NORMAL, "block number %02x, status: %02x %02x",blocknum,status1, status2);
+    switch (blocknum) {
+        case 0x00: PrintAndLogEx(NORMAL,  "S_PAD0: %s",line);break;
+        case 0x01: PrintAndLogEx(NORMAL,  "S_PAD1: %s",line);break;
+        case 0x02: PrintAndLogEx(NORMAL,  "S_PAD2: %s",line);break;
+        case 0x03: PrintAndLogEx(NORMAL,  "S_PAD3: %s",line);break;
+        case 0x04: PrintAndLogEx(NORMAL,  "S_PAD4: %s",line);break;
+        case 0x05: PrintAndLogEx(NORMAL,  "S_PAD5: %s",line);break;
+        case 0x06: PrintAndLogEx(NORMAL,  "S_PAD6: %s",line);break;
+        case 0x07: PrintAndLogEx(NORMAL,  "S_PAD7: %s",line);break;
+        case 0x08: PrintAndLogEx(NORMAL,  "S_PAD8: %s",line);break;
+        case 0x09: PrintAndLogEx(NORMAL,  "S_PAD9: %s",line);break;
+        case 0x0a: PrintAndLogEx(NORMAL,  "S_PAD10: %s",line);break;
+        case 0x0b: PrintAndLogEx(NORMAL,  "S_PAD11: %s",line);break;
+        case 0x0c: PrintAndLogEx(NORMAL,  "S_PAD12: %s",line);break;
+        case 0x0d: PrintAndLogEx(NORMAL,  "S_PAD13: %s",line);break;
+        case 0x0E: {
+            uint32_t regA = trace[3] | trace[4] << 8 | trace[5] << 16 | trace[ 6] << 24;
+            uint32_t regB = trace[7] | trace[8] << 8 | trace[9] << 16 | trace[10] << 24;
+            line[0] = 0;
+            for (int j = 0; j < 8; j++)
+                snprintf(line + (j*2), sizeof(line)-1-(j*2), "%02x", trace[j+11]);
 
-			PrintAndLogEx(NORMAL,  "REG: regA: %d regB: %d regC: %s ", regA, regB, line);
-			}
-		break;
-		case 0x80: PrintAndLogEx(NORMAL,  "Random Challenge, WO:  %s ", line); break;
-		case 0x81: PrintAndLogEx(NORMAL,  "MAC, only set on dual read:  %s ", line); break;
-		case 0x82: {
-			char idd[20];
-			char idm[20];
-			for (int j = 0; j < 8; j++)
-				snprintf(idd + (j*2), sizeof(idd)-1-(j*2), "%02x", trace[j+3]);
+            PrintAndLogEx(NORMAL,  "REG: regA: %d regB: %d regC: %s ", regA, regB, line);
+            }
+        break;
+        case 0x80: PrintAndLogEx(NORMAL,  "Random Challenge, WO:  %s ", line); break;
+        case 0x81: PrintAndLogEx(NORMAL,  "MAC, only set on dual read:  %s ", line); break;
+        case 0x82: {
+            char idd[20];
+            char idm[20];
+            for (int j = 0; j < 8; j++)
+                snprintf(idd + (j*2), sizeof(idd)-1-(j*2), "%02x", trace[j+3]);
 
-			for (int j = 0; j < 6; j++)
-				snprintf(idm + (j*2), sizeof(idm)-1-(j*2), "%02x", trace[j+13]);
+            for (int j = 0; j < 6; j++)
+                snprintf(idm + (j*2), sizeof(idm)-1-(j*2), "%02x", trace[j+13]);
 
-			PrintAndLogEx(NORMAL,  "ID Block, IDd: 0x%s DFC: 0x%02x%02x Arb: %s ", idd, trace[11], trace [12], idm);
-			}
-		break;
-		case 0x83: {
-			char idm[20];
-			char pmm[20];
-			for (int j = 0; j < 8; j++)
-				snprintf(idm + (j*2), sizeof(idm)-1-(j*2), "%02x", trace[j+3]);
+            PrintAndLogEx(NORMAL,  "ID Block, IDd: 0x%s DFC: 0x%02x%02x Arb: %s ", idd, trace[11], trace [12], idm);
+            }
+        break;
+        case 0x83: {
+            char idm[20];
+            char pmm[20];
+            for (int j = 0; j < 8; j++)
+                snprintf(idm + (j*2), sizeof(idm)-1-(j*2), "%02x", trace[j+3]);
 
-			for (int j = 0; j < 8; j++)
-				snprintf(pmm + (j*2), sizeof(pmm)-1-(j*2), "%02x", trace[j+11]);
+            for (int j = 0; j < 8; j++)
+                snprintf(pmm + (j*2), sizeof(pmm)-1-(j*2), "%02x", trace[j+11]);
 
-			PrintAndLogEx(NORMAL,  "DeviceId:  IDm: 0x%s PMm: 0x%s ", idm, pmm);
-			}
-		break;
-		case 0x84: PrintAndLogEx(NORMAL,  "SER_C: 0x%02x%02x ", trace[3], trace[4]); break;
-		case 0x85: PrintAndLogEx(NORMAL,  "SYS_Cl 0x%02x%02x ", trace[3], trace[4]); break;
-		case 0x86: PrintAndLogEx(NORMAL,  "CKV (key version): 0x%02x%02x ", trace[3], trace[4]); break;
-		case 0x87: PrintAndLogEx(NORMAL,  "CK (card key), WO:   %s ", line); break;
-		case 0x88: {
-			PrintAndLogEx(NORMAL,  "Memory Configuration (MC):");
-			PrintAndLogEx(NORMAL,  "MAC needed to write state: %s", trace[3+12]? "on" : "off");
-			//order might be off here...
-			PrintAndLogEx(NORMAL,  "Write with MAC for S_PAD  : %s ", sprint_bin(trace+3+10, 2) );
-			PrintAndLogEx(NORMAL,  "Write with AUTH for S_PAD : %s ", sprint_bin(trace+3+8, 2) );
-			PrintAndLogEx(NORMAL,  "Read after AUTH for S_PAD : %s ", sprint_bin(trace+3+6, 2) );
-			PrintAndLogEx(NORMAL,  "MAC needed to write CK and CKV: %s", trace[3+5] ? "on" : "off");
-			PrintAndLogEx(NORMAL,  "RF parameter: %02x", (trace[3+4] & 0x7) );
-			PrintAndLogEx(NORMAL,  "Compatible with NDEF: %s", trace[3+3] ? "yes" : "no");
-			PrintAndLogEx(NORMAL,  "Memory config writable : %s", (trace[3+2] == 0xff) ? "yes" : "no");
-			PrintAndLogEx(NORMAL,  "RW access for S_PAD : %s ", sprint_bin(trace+3, 2) );
-			}
-		break;
-		case 0x90: {
+            PrintAndLogEx(NORMAL,  "DeviceId:  IDm: 0x%s PMm: 0x%s ", idm, pmm);
+            }
+        break;
+        case 0x84: PrintAndLogEx(NORMAL,  "SER_C: 0x%02x%02x ", trace[3], trace[4]); break;
+        case 0x85: PrintAndLogEx(NORMAL,  "SYS_Cl 0x%02x%02x ", trace[3], trace[4]); break;
+        case 0x86: PrintAndLogEx(NORMAL,  "CKV (key version): 0x%02x%02x ", trace[3], trace[4]); break;
+        case 0x87: PrintAndLogEx(NORMAL,  "CK (card key), WO:   %s ", line); break;
+        case 0x88: {
+            PrintAndLogEx(NORMAL,  "Memory Configuration (MC):");
+            PrintAndLogEx(NORMAL,  "MAC needed to write state: %s", trace[3+12]? "on" : "off");
+            //order might be off here...
+            PrintAndLogEx(NORMAL,  "Write with MAC for S_PAD  : %s ", sprint_bin(trace+3+10, 2) );
+            PrintAndLogEx(NORMAL,  "Write with AUTH for S_PAD : %s ", sprint_bin(trace+3+8, 2) );
+            PrintAndLogEx(NORMAL,  "Read after AUTH for S_PAD : %s ", sprint_bin(trace+3+6, 2) );
+            PrintAndLogEx(NORMAL,  "MAC needed to write CK and CKV: %s", trace[3+5] ? "on" : "off");
+            PrintAndLogEx(NORMAL,  "RF parameter: %02x", (trace[3+4] & 0x7) );
+            PrintAndLogEx(NORMAL,  "Compatible with NDEF: %s", trace[3+3] ? "yes" : "no");
+            PrintAndLogEx(NORMAL,  "Memory config writable : %s", (trace[3+2] == 0xff) ? "yes" : "no");
+            PrintAndLogEx(NORMAL,  "RW access for S_PAD : %s ", sprint_bin(trace+3, 2) );
+            }
+        break;
+        case 0x90: {
             PrintAndLogEx(NORMAL,  "Write count, RO:   %02x %02x %02x ", trace[3], trace[4], trace[5]);
-			}
-		break;
-		case 0x91: {
+            }
+        break;
+        case 0x91: {
             PrintAndLogEx(NORMAL,  "MAC_A, RW (auth):   %s ", line);
            }
-		break;
-		case 0x92:
+        break;
+        case 0x92:
             PrintAndLogEx(NORMAL,  "State:");
             PrintAndLogEx(NORMAL,  "Polling disabled: %s", trace[3+8] ? "yes" : "no");
             PrintAndLogEx(NORMAL,  "Authenticated: %s", trace[3] ? "yes" : "no");
-			break;
-		case 0xa0:
+            break;
+        case 0xa0:
             PrintAndLogEx(NORMAL,  "CRC of all bloacks match : %s", (trace[3+2]==0xff) ? "no" : "yes");
-			break;
-		default:
-			PrintAndLogEx(WARNING,  "INVALID %d: %s", blocknum, line);
-		break;
-	}
-	return tracepos+19;
+            break;
+        default:
+            PrintAndLogEx(WARNING,  "INVALID %d: %s", blocknum, line);
+        break;
+    }
+    return tracepos+19;
 }
 
 int CmdHFFelicaDumpLite(const char *Cmd) {
 
-	char ctmp = tolower(param_getchar(Cmd, 0));
-	if ( ctmp == 'h') return usage_hf_felica_dumplite();
+    char ctmp = tolower(param_getchar(Cmd, 0));
+    if ( ctmp == 'h') return usage_hf_felica_dumplite();
 
-	PrintAndLogEx(SUCCESS, "FeliCa lite - dump started");
-	PrintAndLogEx(SUCCESS, "press pm3-button to cancel");
-	UsbCommand c = {CMD_FELICA_LITE_DUMP, {0,0,0}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	UsbCommand resp;
+    PrintAndLogEx(SUCCESS, "FeliCa lite - dump started");
+    PrintAndLogEx(SUCCESS, "press pm3-button to cancel");
+    UsbCommand c = {CMD_FELICA_LITE_DUMP, {0,0,0}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    UsbCommand resp;
 
-	uint8_t timeout = 0;
-	while ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
-		timeout++;
-		printf("."); fflush(stdout);
-		if (ukbhit()) {
-			int gc = getchar(); (void)gc;
-			PrintAndLogEx(WARNING, "\n[!] aborted via keyboard!\n");
-			DropField();
-			return 1;
-		}
-		if (timeout > 100) {
-			PrintAndLogEx(WARNING, "timeout while waiting for reply.");
-			DropField();
-			return 1;
-		}
-	}
-	if (resp.arg[0] == 0) {
-		PrintAndLogEx(WARNING, "\nButton pressed. Aborted.");
-		return 1;
-	}
+    uint8_t timeout = 0;
+    while ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
+        timeout++;
+        printf("."); fflush(stdout);
+        if (ukbhit()) {
+            int gc = getchar(); (void)gc;
+            PrintAndLogEx(WARNING, "\n[!] aborted via keyboard!\n");
+            DropField();
+            return 1;
+        }
+        if (timeout > 100) {
+            PrintAndLogEx(WARNING, "timeout while waiting for reply.");
+            DropField();
+            return 1;
+        }
+    }
+    if (resp.arg[0] == 0) {
+        PrintAndLogEx(WARNING, "\nButton pressed. Aborted.");
+        return 1;
+    }
 
-	uint64_t tracelen = resp.arg[1];
-	uint8_t *trace = calloc(tracelen, sizeof(uint8_t));
-	if ( trace == NULL ) {
-		PrintAndLogEx(WARNING, "Cannot allocate memory for trace");
-		return 1;
-	}
+    uint64_t tracelen = resp.arg[1];
+    uint8_t *trace = calloc(tracelen, sizeof(uint8_t));
+    if ( trace == NULL ) {
+        PrintAndLogEx(WARNING, "Cannot allocate memory for trace");
+        return 1;
+    }
 
-	// only download data if there is any.
-	if ( tracelen > 0 ) {
+    // only download data if there is any.
+    if ( tracelen > 0 ) {
 
-		if ( !GetFromDevice(BIG_BUF, trace, tracelen, 0, NULL, 2500, false) ){
-			PrintAndLogEx(WARNING, "command execution time out");
-			free(trace);
-			return 0;
-		}
+        if ( !GetFromDevice(BIG_BUF, trace, tracelen, 0, NULL, 2500, false) ){
+            PrintAndLogEx(WARNING, "command execution time out");
+            free(trace);
+            return 0;
+        }
 
-		PrintAndLogEx(SUCCESS, "Recorded Activity (trace len = %d bytes)", tracelen);
+        PrintAndLogEx(SUCCESS, "Recorded Activity (trace len = %d bytes)", tracelen);
 
-		print_hex_break(trace, tracelen, 32);
+        print_hex_break(trace, tracelen, 32);
 
-		printSep();
-		uint16_t tracepos = 0;
-		while (tracepos < tracelen)
-			tracepos = PrintFliteBlock(tracepos, trace, tracelen);
+        printSep();
+        uint16_t tracepos = 0;
+        while (tracepos < tracelen)
+            tracepos = PrintFliteBlock(tracepos, trace, tracelen);
 
-		printSep();
-	}
+        printSep();
+    }
 
     free(trace);
-	return 0;
+    return 0;
 }
 
 int CmdHFFelicaCmdRaw(const char *cmd) {
@@ -425,8 +425,8 @@ int CmdHFFelicaCmdRaw(const char *cmd) {
     char buf[5]="";
     int i = 0;
     uint8_t data[USB_CMD_DATA_SIZE];
-	uint16_t datalen = 0;
-	uint32_t temp;
+    uint16_t datalen = 0;
+    uint32_t temp;
 
     if (strlen(cmd) < 2) return usage_hf_felica_raw();
 
@@ -437,9 +437,9 @@ int CmdHFFelicaCmdRaw(const char *cmd) {
         if (cmd[i]==' ' || cmd[i]=='\t') { i++; continue; }
         if (cmd[i]=='-') {
             switch (cmd[i+1]) {
-				case 'H':
-				case 'h':
-					return usage_hf_felica_raw();
+                case 'H':
+                case 'h':
+                    return usage_hf_felica_raw();
                 case 'r':
                     reply = false;
                     break;
@@ -479,11 +479,11 @@ int CmdHFFelicaCmdRaw(const char *cmd) {
                 sscanf(buf,"%x",&temp);
                 data[datalen]=(uint8_t)(temp & 0xff);
                 *buf=0;
-				if (++datalen >= sizeof(data)){
-					if (crc)
-						PrintAndLogEx(NORMAL, "Buffer is full, we can't add CRC to your data");
-					break;
-				}
+                if (++datalen >= sizeof(data)){
+                    if (crc)
+                        PrintAndLogEx(NORMAL, "Buffer is full, we can't add CRC to your data");
+                    break;
+                }
             }
             continue;
         }
@@ -493,7 +493,7 @@ int CmdHFFelicaCmdRaw(const char *cmd) {
 
     if (crc && datalen>0 && datalen < sizeof(data)-2) {
         uint8_t b1, b2;
-		compute_crc(CRC_FELICA, data, datalen, &b1, &b2);
+        compute_crc(CRC_FELICA, data, datalen, &b1, &b2);
         data[datalen++] = b1;
         data[datalen++] = b2;
     }
@@ -506,19 +506,19 @@ int CmdHFFelicaCmdRaw(const char *cmd) {
 
     if (power) {
         c.arg[0] |= FELICA_NO_DISCONNECT;
-	}
+    }
 
     if (datalen > 0) {
         c.arg[0] |= FELICA_RAW;
-	}
+    }
 
-	// Max buffer is USB_CMD_DATA_SIZE
-	datalen = (datalen > USB_CMD_DATA_SIZE) ? USB_CMD_DATA_SIZE : datalen;
+    // Max buffer is USB_CMD_DATA_SIZE
+    datalen = (datalen > USB_CMD_DATA_SIZE) ? USB_CMD_DATA_SIZE : datalen;
 
     c.arg[1] = (datalen & 0xFFFF) | (uint32_t)(numbits << 16);
     memcpy(c.d.asBytes, data, datalen);
 
-	clearCommandBuffer();
+    clearCommandBuffer();
     SendCommand(&c);
 
     if (reply) {
@@ -539,32 +539,32 @@ void waitCmdFelica(uint8_t iSelect) {
         PrintAndLogEx(NORMAL, "received %i octets", len);
         if(!len)
             return;
-		PrintAndLogEx(NORMAL, "%s", sprint_hex(resp.d.asBytes, len) );
+        PrintAndLogEx(NORMAL, "%s", sprint_hex(resp.d.asBytes, len) );
     } else {
         PrintAndLogEx(WARNING, "timeout while waiting for reply.");
     }
 }
 
 static command_t CommandTable[] = {
-  {"help",   	CmdHelp,              1, "This help"},
-  {"list",   	CmdHFFelicaList,      0, "[Deprecated] List ISO 18092/FeliCa history"},
-  {"reader", 	CmdHFFelicaReader,    0, "Act like an ISO18092/FeliCa reader"},
-  {"sim",    	CmdHFFelicaSim,       0, "<UID> -- Simulate ISO 18092/FeliCa tag"},
-  {"sniff",  	CmdHFFelicaSniff,     0, "sniff ISO 18092/Felica traffic"},
-  {"raw",    	CmdHFFelicaCmdRaw,    0, "Send raw hex data to tag"},
+  {"help",      CmdHelp,              1, "This help"},
+  {"list",      CmdHFFelicaList,      0, "[Deprecated] List ISO 18092/FeliCa history"},
+  {"reader",    CmdHFFelicaReader,    0, "Act like an ISO18092/FeliCa reader"},
+  {"sim",       CmdHFFelicaSim,       0, "<UID> -- Simulate ISO 18092/FeliCa tag"},
+  {"sniff",     CmdHFFelicaSniff,     0, "sniff ISO 18092/Felica traffic"},
+  {"raw",       CmdHFFelicaCmdRaw,    0, "Send raw hex data to tag"},
 
-  {"litesim",	CmdHFFelicaSimLite,   0, "<NDEF2> - only reply to poll request"},
-  {"litedump", 	CmdHFFelicaDumpLite,  0, "Wait for and try dumping FelicaLite"},
+  {"litesim",   CmdHFFelicaSimLite,   0, "<NDEF2> - only reply to poll request"},
+  {"litedump",  CmdHFFelicaDumpLite,  0, "Wait for and try dumping FelicaLite"},
   {NULL, NULL, 0, NULL}
 };
 
 int CmdHFFelica(const char *Cmd) {
-	clearCommandBuffer();
-	CmdsParse(CommandTable, Cmd);
-	return 0;
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
+    return 0;
 }
 
 int CmdHelp(const char *Cmd) {
-	CmdsHelp(CommandTable);
-	return 0;
+    CmdsHelp(CommandTable);
+    return 0;
 }
\ No newline at end of file
diff --git a/client/cmdhffelica.h b/client/cmdhffelica.h
index bcec38a0b..80a09f7d3 100644
--- a/client/cmdhffelica.h
+++ b/client/cmdhffelica.h
@@ -21,10 +21,10 @@
 #include "ui.h"
 #include "util.h"
 #include "cmdparser.h"
-#include "comms.h"		// getfromdevice
+#include "comms.h"      // getfromdevice
 #include "iso14443crc.h"
-#include "cmdhf.h"		// list cmd
-#include "mifare.h" 	// felica_card_select_t struct
+#include "cmdhf.h"      // list cmd
+#include "mifare.h"     // felica_card_select_t struct
 
 extern int CmdHFFelica(const char *Cmd);
 extern int CmdHFFelicaList(const char *Cmd);
diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index ea5d55c66..588c3b037 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -51,872 +51,872 @@ static int CmdHelp(const char *Cmd);
 
 int CmdHFFidoInfo(const char *cmd) {
 
-	if (cmd && strlen(cmd) > 0)
-		PrintAndLog("WARNING: command don't have any parameters.\n");
+    if (cmd && strlen(cmd) > 0)
+        PrintAndLog("WARNING: command don't have any parameters.\n");
 
-	// info about 14a part
-	CmdHF14AInfo("");
+    // info about 14a part
+    CmdHF14AInfo("");
 
-	// FIDO info
-	PrintAndLog("--------------------------------------------");
-	SetAPDULogging(false);
+    // FIDO info
+    PrintAndLog("--------------------------------------------");
+    SetAPDULogging(false);
 
-	uint8_t buf[APDU_RES_LEN] = {0};
-	size_t len = 0;
-	uint16_t sw = 0;
-	int res = FIDOSelect(true, true, buf, sizeof(buf), &len, &sw);
+    uint8_t buf[APDU_RES_LEN] = {0};
+    size_t len = 0;
+    uint16_t sw = 0;
+    int res = FIDOSelect(true, true, buf, sizeof(buf), &len, &sw);
 
-	if (res) {
-		DropField();
-		return res;
-	}
+    if (res) {
+        DropField();
+        return res;
+    }
 
-	if (sw != 0x9000) {
-		if (sw)
-			PrintAndLog("Not a FIDO card! APDU response: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
-		else
-			PrintAndLog("APDU exchange error. Card returns 0x0000.");
+    if (sw != 0x9000) {
+        if (sw)
+            PrintAndLog("Not a FIDO card! APDU response: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
+        else
+            PrintAndLog("APDU exchange error. Card returns 0x0000.");
 
-		DropField();
-		return 0;
-	}
+        DropField();
+        return 0;
+    }
 
-	if (!strncmp((char *)buf, "U2F_V2", 7)) {
-		if (!strncmp((char *)buf, "FIDO_2_0", 8)) {
-			PrintAndLog("FIDO2 authenricator detected. Version: %.*s", len, buf);
-		} else {
-			PrintAndLog("FIDO authenricator detected (not standard U2F).");
-			PrintAndLog("Non U2F authenticator version:");
-			dump_buffer((const unsigned char *)buf, len, NULL, 0);
-		}
-	} else {
-		PrintAndLog("FIDO U2F authenricator detected. Version: %.*s", len, buf);
-	}
+    if (!strncmp((char *)buf, "U2F_V2", 7)) {
+        if (!strncmp((char *)buf, "FIDO_2_0", 8)) {
+            PrintAndLog("FIDO2 authenricator detected. Version: %.*s", len, buf);
+        } else {
+            PrintAndLog("FIDO authenricator detected (not standard U2F).");
+            PrintAndLog("Non U2F authenticator version:");
+            dump_buffer((const unsigned char *)buf, len, NULL, 0);
+        }
+    } else {
+        PrintAndLog("FIDO U2F authenricator detected. Version: %.*s", len, buf);
+    }
 
-	res = FIDO2GetInfo(buf, sizeof(buf), &len, &sw);
-	DropField();
-	if (res) {
-		return res;
-	}
-	if (sw != 0x9000) {
-		PrintAndLog("FIDO2 version not exists (%04x - %s).", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
+    res = FIDO2GetInfo(buf, sizeof(buf), &len, &sw);
+    DropField();
+    if (res) {
+        return res;
+    }
+    if (sw != 0x9000) {
+        PrintAndLog("FIDO2 version not exists (%04x - %s).", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
 
-		return 0;
-	}
+        return 0;
+    }
 
-	if(buf[0]) {
-		PrintAndLog("FIDO2 ger version error: %d - %s", buf[0], fido2GetCmdErrorDescription(buf[0]));
-		return 0;
-	}
+    if(buf[0]) {
+        PrintAndLog("FIDO2 ger version error: %d - %s", buf[0], fido2GetCmdErrorDescription(buf[0]));
+        return 0;
+    }
 
-	if (len > 1) {
-//		if (false) {
-//			PrintAndLog("FIDO2 version: (len=%d)", len);
-//			dump_buffer((const unsigned char *)buf, len, NULL, 0);
-//		}
+    if (len > 1) {
+//      if (false) {
+//          PrintAndLog("FIDO2 version: (len=%d)", len);
+//          dump_buffer((const unsigned char *)buf, len, NULL, 0);
+//      }
 
-		PrintAndLog("FIDO2 version CBOR decoded:");
-		TinyCborPrintFIDOPackage(fido2CmdGetInfo, true, &buf[1], len - 1);
-	} else {
-		PrintAndLog("FIDO2 version length error");
-	}
+        PrintAndLog("FIDO2 version CBOR decoded:");
+        TinyCborPrintFIDOPackage(fido2CmdGetInfo, true, &buf[1], len - 1);
+    } else {
+        PrintAndLog("FIDO2 version length error");
+    }
 
-	return 0;
+    return 0;
 }
 
 json_t *OpenJson(int paramnum, char *fname, void* argtable[], bool *err) {
-	json_t *root = NULL;
-	json_error_t error;
-	*err = false;
+    json_t *root = NULL;
+    json_error_t error;
+    *err = false;
 
-	uint8_t jsonname[250] ={0};
-	char *cjsonname = (char *)jsonname;
-	int jsonnamelen = 0;
+    uint8_t jsonname[250] ={0};
+    char *cjsonname = (char *)jsonname;
+    int jsonnamelen = 0;
 
-	// CLIGetStrWithReturn(paramnum, jsonname, &jsonnamelen);
-	if (CLIParamStrToBuf(arg_get_str(paramnum), jsonname, sizeof(jsonname), &jsonnamelen))  {
-		CLIParserFree();
-		return NULL;
-	}
+    // CLIGetStrWithReturn(paramnum, jsonname, &jsonnamelen);
+    if (CLIParamStrToBuf(arg_get_str(paramnum), jsonname, sizeof(jsonname), &jsonnamelen))  {
+        CLIParserFree();
+        return NULL;
+    }
 
-	// current path + file name
-	if (!strstr(cjsonname, ".json"))
-		strcat(cjsonname, ".json");
+    // current path + file name
+    if (!strstr(cjsonname, ".json"))
+        strcat(cjsonname, ".json");
 
-	if (jsonnamelen) {
-		strcpy(fname, get_my_executable_directory());
-		strcat(fname, cjsonname);
-		if (access(fname, F_OK) != -1) {
-			root = json_load_file(fname, 0, &error);
-			if (!root) {
-				PrintAndLog("ERROR: json error on line %d: %s", error.line, error.text);
-				*err = true;
-				return NULL;
-			}
+    if (jsonnamelen) {
+        strcpy(fname, get_my_executable_directory());
+        strcat(fname, cjsonname);
+        if (access(fname, F_OK) != -1) {
+            root = json_load_file(fname, 0, &error);
+            if (!root) {
+                PrintAndLog("ERROR: json error on line %d: %s", error.line, error.text);
+                *err = true;
+                return NULL;
+            }
 
-			if (!json_is_object(root)) {
-				PrintAndLog("ERROR: Invalid json format. root must be an object.");
-				json_decref(root);
-				*err = true;
-				return NULL;
-			}
+            if (!json_is_object(root)) {
+                PrintAndLog("ERROR: Invalid json format. root must be an object.");
+                json_decref(root);
+                *err = true;
+                return NULL;
+            }
 
-		} else {
-			root = json_object();
-		}
-	}
-	return root;
+        } else {
+            root = json_object();
+        }
+    }
+    return root;
 }
 
 int CmdHFFidoRegister(const char *cmd) {
-	uint8_t data[64] = {0};
-	int chlen = 0;
-	uint8_t cdata[250] = {0};
-	int applen = 0;
-	uint8_t adata[250] = {0};
-	json_t *root = NULL;
+    uint8_t data[64] = {0};
+    int chlen = 0;
+    uint8_t cdata[250] = {0};
+    int applen = 0;
+    uint8_t adata[250] = {0};
+    json_t *root = NULL;
 
-	CLIParserInit("hf fido reg",
-		"Initiate a U2F token registration. Needs two 32-byte hash number. \nchallenge parameter (32b) and application parameter (32b).",
-		"Usage:\n\thf fido reg -> execute command with 2 parameters, filled 0x00\n"
-			"\thf fido reg 000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f 000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f -> execute command with parameters"
-			"\thf fido reg -p s0 s1 -> execute command with plain parameters");
+    CLIParserInit("hf fido reg",
+        "Initiate a U2F token registration. Needs two 32-byte hash number. \nchallenge parameter (32b) and application parameter (32b).",
+        "Usage:\n\thf fido reg -> execute command with 2 parameters, filled 0x00\n"
+            "\thf fido reg 000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f 000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f -> execute command with parameters"
+            "\thf fido reg -p s0 s1 -> execute command with plain parameters");
 
-	void* argtable[] = {
-		arg_param_begin,
-		arg_lit0("aA",  "apdu",     "show APDU reqests and responses"),
-		arg_litn("vV",  "verbose",  0, 2, "show technical data. vv - show full certificates data"),
-		arg_lit0("pP",  "plain",    "send plain ASCII to challenge and application parameters instead of HEX"),
-		arg_lit0("tT",  "tlv",      "Show DER certificate contents in TLV representation"),
-		arg_str0("jJ",  "json",		"fido.json", "JSON input / output file name for parameters."),
-		arg_str0(NULL,  NULL,       "<HEX/ASCII challenge parameter (32b HEX/1..16 chars)>", NULL),
-		arg_str0(NULL,  NULL,       "<HEX/ASCII application parameter (32b HEX/1..16 chars)>", NULL),
-		arg_param_end
-	};
-	CLIExecWithReturn(cmd, argtable, true);
+    void* argtable[] = {
+        arg_param_begin,
+        arg_lit0("aA",  "apdu",     "show APDU reqests and responses"),
+        arg_litn("vV",  "verbose",  0, 2, "show technical data. vv - show full certificates data"),
+        arg_lit0("pP",  "plain",    "send plain ASCII to challenge and application parameters instead of HEX"),
+        arg_lit0("tT",  "tlv",      "Show DER certificate contents in TLV representation"),
+        arg_str0("jJ",  "json",     "fido.json", "JSON input / output file name for parameters."),
+        arg_str0(NULL,  NULL,       "<HEX/ASCII challenge parameter (32b HEX/1..16 chars)>", NULL),
+        arg_str0(NULL,  NULL,       "<HEX/ASCII application parameter (32b HEX/1..16 chars)>", NULL),
+        arg_param_end
+    };
+    CLIExecWithReturn(cmd, argtable, true);
 
-	bool APDULogging = arg_get_lit(1);
-	bool verbose = arg_get_lit(2);
-	bool verbose2 = arg_get_lit(2) > 1;
-	bool paramsPlain = arg_get_lit(3);
-	bool showDERTLV = arg_get_lit(4);
+    bool APDULogging = arg_get_lit(1);
+    bool verbose = arg_get_lit(2);
+    bool verbose2 = arg_get_lit(2) > 1;
+    bool paramsPlain = arg_get_lit(3);
+    bool showDERTLV = arg_get_lit(4);
 
-	char fname[250] = {0};
-	bool err;
-	root = OpenJson(5, fname, argtable, &err);
-	if(err)
-		return 1;
-	if (root) {
-		size_t jlen;
-		JsonLoadBufAsHex(root, "$.ChallengeParam", data, 32, &jlen);
-		JsonLoadBufAsHex(root, "$.ApplicationParam", &data[32], 32, &jlen);
-	}
+    char fname[250] = {0};
+    bool err;
+    root = OpenJson(5, fname, argtable, &err);
+    if(err)
+        return 1;
+    if (root) {
+        size_t jlen;
+        JsonLoadBufAsHex(root, "$.ChallengeParam", data, 32, &jlen);
+        JsonLoadBufAsHex(root, "$.ApplicationParam", &data[32], 32, &jlen);
+    }
 
-	if (paramsPlain) {
-		memset(cdata, 0x00, 32);
-		CLIGetStrWithReturn(6, cdata, &chlen);
-		if (chlen && chlen > 16) {
-			PrintAndLog("ERROR: challenge parameter length in ASCII mode must be less than 16 chars instead of: %d", chlen);
-			return 1;
-		}
-	} else {
-		CLIGetHexWithReturn(6, cdata, &chlen);
-		if (chlen && chlen != 32) {
-			PrintAndLog("ERROR: challenge parameter length must be 32 bytes only.");
-			return 1;
-		}
-	}
-	if (chlen)
-		memmove(data, cdata, 32);
+    if (paramsPlain) {
+        memset(cdata, 0x00, 32);
+        CLIGetStrWithReturn(6, cdata, &chlen);
+        if (chlen && chlen > 16) {
+            PrintAndLog("ERROR: challenge parameter length in ASCII mode must be less than 16 chars instead of: %d", chlen);
+            return 1;
+        }
+    } else {
+        CLIGetHexWithReturn(6, cdata, &chlen);
+        if (chlen && chlen != 32) {
+            PrintAndLog("ERROR: challenge parameter length must be 32 bytes only.");
+            return 1;
+        }
+    }
+    if (chlen)
+        memmove(data, cdata, 32);
 
 
-	if (paramsPlain) {
-		memset(adata, 0x00, 32);
-		CLIGetStrWithReturn(7, adata, &applen);
-		if (applen && applen > 16) {
-			PrintAndLog("ERROR: application parameter length in ASCII mode must be less than 16 chars instead of: %d", applen);
-			return 1;
-		}
-	} else {
-		CLIGetHexWithReturn(7, adata, &applen);
-		if (applen && applen != 32) {
-			PrintAndLog("ERROR: application parameter length must be 32 bytes only.");
-			return 1;
-		}
-	}
-	if (applen)
-		memmove(&data[32], adata, 32);
+    if (paramsPlain) {
+        memset(adata, 0x00, 32);
+        CLIGetStrWithReturn(7, adata, &applen);
+        if (applen && applen > 16) {
+            PrintAndLog("ERROR: application parameter length in ASCII mode must be less than 16 chars instead of: %d", applen);
+            return 1;
+        }
+    } else {
+        CLIGetHexWithReturn(7, adata, &applen);
+        if (applen && applen != 32) {
+            PrintAndLog("ERROR: application parameter length must be 32 bytes only.");
+            return 1;
+        }
+    }
+    if (applen)
+        memmove(&data[32], adata, 32);
 
-	CLIParserFree();
+    CLIParserFree();
 
-	SetAPDULogging(APDULogging);
+    SetAPDULogging(APDULogging);
 
-	// challenge parameter [32 bytes] - The challenge parameter is the SHA-256 hash of the Client Data, a stringified JSON data structure that the FIDO Client prepares
-	// application parameter [32 bytes] - The application parameter is the SHA-256 hash of the UTF-8 encoding of the application identity
+    // challenge parameter [32 bytes] - The challenge parameter is the SHA-256 hash of the Client Data, a stringified JSON data structure that the FIDO Client prepares
+    // application parameter [32 bytes] - The application parameter is the SHA-256 hash of the UTF-8 encoding of the application identity
 
-	uint8_t buf[2048] = {0};
-	size_t len = 0;
-	uint16_t sw = 0;
+    uint8_t buf[2048] = {0};
+    size_t len = 0;
+    uint16_t sw = 0;
 
-	DropField();
-	int res = FIDOSelect(true, true, buf, sizeof(buf), &len, &sw);
+    DropField();
+    int res = FIDOSelect(true, true, buf, sizeof(buf), &len, &sw);
 
-	if (res) {
-		PrintAndLog("Can't select authenticator. res=%x. Exit...", res);
-		DropField();
-		return res;
-	}
+    if (res) {
+        PrintAndLog("Can't select authenticator. res=%x. Exit...", res);
+        DropField();
+        return res;
+    }
 
-	if (sw != 0x9000) {
-		PrintAndLog("Can't select FIDO application. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
-		DropField();
-		return 2;
-	}
+    if (sw != 0x9000) {
+        PrintAndLog("Can't select FIDO application. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
+        DropField();
+        return 2;
+    }
 
-	res = FIDORegister(data, buf,  sizeof(buf), &len, &sw);
-	DropField();
-	if (res) {
-		PrintAndLog("Can't execute register command. res=%x. Exit...", res);
-		return res;
-	}
+    res = FIDORegister(data, buf,  sizeof(buf), &len, &sw);
+    DropField();
+    if (res) {
+        PrintAndLog("Can't execute register command. res=%x. Exit...", res);
+        return res;
+    }
 
-	if (sw != 0x9000) {
-		PrintAndLog("ERROR execute register command. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
-		return 3;
-	}
+    if (sw != 0x9000) {
+        PrintAndLog("ERROR execute register command. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
+        return 3;
+    }
 
-	PrintAndLog("");
-	if (APDULogging)
-		PrintAndLog("---------------------------------------------------------------");
-	PrintAndLog("data len: %d", len);
-	if (verbose2) {
-		PrintAndLog("--------------data----------------------");
-		dump_buffer((const unsigned char *)buf, len, NULL, 0);
-		PrintAndLog("--------------data----------------------");
-	}
+    PrintAndLog("");
+    if (APDULogging)
+        PrintAndLog("---------------------------------------------------------------");
+    PrintAndLog("data len: %d", len);
+    if (verbose2) {
+        PrintAndLog("--------------data----------------------");
+        dump_buffer((const unsigned char *)buf, len, NULL, 0);
+        PrintAndLog("--------------data----------------------");
+    }
 
-	if (buf[0] != 0x05) {
-		PrintAndLog("ERROR: First byte must be 0x05, but it %2x", buf[0]);
-		return 5;
-	}
-	PrintAndLog("User public key: %s", sprint_hex(&buf[1], 65));
+    if (buf[0] != 0x05) {
+        PrintAndLog("ERROR: First byte must be 0x05, but it %2x", buf[0]);
+        return 5;
+    }
+    PrintAndLog("User public key: %s", sprint_hex(&buf[1], 65));
 
-	uint8_t keyHandleLen = buf[66];
-	PrintAndLog("Key handle[%d]: %s", keyHandleLen, sprint_hex(&buf[67], keyHandleLen));
+    uint8_t keyHandleLen = buf[66];
+    PrintAndLog("Key handle[%d]: %s", keyHandleLen, sprint_hex(&buf[67], keyHandleLen));
 
-	int derp = 67 + keyHandleLen;
-	int derLen = (buf[derp + 2] << 8) + buf[derp + 3] + 4;
-	if (verbose2) {
-		PrintAndLog("DER certificate[%d]:\n------------------DER-------------------", derLen);
-		dump_buffer_simple((const unsigned char *)&buf[derp], derLen, NULL);
-		PrintAndLog("\n----------------DER---------------------");
-	} else {
-		if (verbose)
-			PrintAndLog("------------------DER-------------------");
-		PrintAndLog("DER certificate[%d]: %s...", derLen, sprint_hex(&buf[derp], 20));
-	}
+    int derp = 67 + keyHandleLen;
+    int derLen = (buf[derp + 2] << 8) + buf[derp + 3] + 4;
+    if (verbose2) {
+        PrintAndLog("DER certificate[%d]:\n------------------DER-------------------", derLen);
+        dump_buffer_simple((const unsigned char *)&buf[derp], derLen, NULL);
+        PrintAndLog("\n----------------DER---------------------");
+    } else {
+        if (verbose)
+            PrintAndLog("------------------DER-------------------");
+        PrintAndLog("DER certificate[%d]: %s...", derLen, sprint_hex(&buf[derp], 20));
+    }
 
-	// check and print DER certificate
-	uint8_t public_key[65] = {0};
+    // check and print DER certificate
+    uint8_t public_key[65] = {0};
 
-	// print DER certificate in TLV view
-	if (showDERTLV) {
-		PrintAndLog("----------------DER TLV-----------------");
-		asn1_print(&buf[derp], derLen, "  ");
-		PrintAndLog("----------------DER TLV-----------------");
-	}
+    // print DER certificate in TLV view
+    if (showDERTLV) {
+        PrintAndLog("----------------DER TLV-----------------");
+        asn1_print(&buf[derp], derLen, "  ");
+        PrintAndLog("----------------DER TLV-----------------");
+    }
 
     FIDOCheckDERAndGetKey(&buf[derp], derLen, verbose, public_key, sizeof(public_key));
 
-	// get hash
-	int hashp = 1 + 65 + 1 + keyHandleLen + derLen;
-	PrintAndLog("Hash[%d]: %s", len - hashp, sprint_hex(&buf[hashp], len - hashp));
+    // get hash
+    int hashp = 1 + 65 + 1 + keyHandleLen + derLen;
+    PrintAndLog("Hash[%d]: %s", len - hashp, sprint_hex(&buf[hashp], len - hashp));
 
-	// check ANSI X9.62 format ECDSA signature (on P-256)
-	uint8_t rval[300] = {0};
-	uint8_t sval[300] = {0};
-	res = ecdsa_asn1_get_signature(&buf[hashp], len - hashp, rval, sval);
-	if (!res) {
-		if (verbose) {
-			PrintAndLog("  r: %s", sprint_hex(rval, 32));
-			PrintAndLog("  s: %s", sprint_hex(sval, 32));
-		}
+    // check ANSI X9.62 format ECDSA signature (on P-256)
+    uint8_t rval[300] = {0};
+    uint8_t sval[300] = {0};
+    res = ecdsa_asn1_get_signature(&buf[hashp], len - hashp, rval, sval);
+    if (!res) {
+        if (verbose) {
+            PrintAndLog("  r: %s", sprint_hex(rval, 32));
+            PrintAndLog("  s: %s", sprint_hex(sval, 32));
+        }
 
-		uint8_t xbuf[4096] = {0};
-		size_t xbuflen = 0;
-		res = FillBuffer(xbuf, sizeof(xbuf), &xbuflen,
-			"\x00", 1,
-			&data[32], 32,           // application parameter
-			&data[0], 32,            // challenge parameter
-			&buf[67], keyHandleLen,  // keyHandle
-			&buf[1], 65,             // user public key
-			NULL, 0);
-		//PrintAndLog("--xbuf(%d)[%d]: %s", res, xbuflen, sprint_hex(xbuf, xbuflen));
-		res = ecdsa_signature_verify(public_key, xbuf, xbuflen, &buf[hashp], len - hashp);
-		if (res) {
-			if (res == -0x4e00) {
-				PrintAndLog("Signature is NOT VALID.");
-			} else {
-				PrintAndLog("Other signature check error: %x %s", (res<0)?-res:res, ecdsa_get_error(res));
-			}
-		} else {
-			PrintAndLog("Signature is OK.");
-		}
+        uint8_t xbuf[4096] = {0};
+        size_t xbuflen = 0;
+        res = FillBuffer(xbuf, sizeof(xbuf), &xbuflen,
+            "\x00", 1,
+            &data[32], 32,           // application parameter
+            &data[0], 32,            // challenge parameter
+            &buf[67], keyHandleLen,  // keyHandle
+            &buf[1], 65,             // user public key
+            NULL, 0);
+        //PrintAndLog("--xbuf(%d)[%d]: %s", res, xbuflen, sprint_hex(xbuf, xbuflen));
+        res = ecdsa_signature_verify(public_key, xbuf, xbuflen, &buf[hashp], len - hashp);
+        if (res) {
+            if (res == -0x4e00) {
+                PrintAndLog("Signature is NOT VALID.");
+            } else {
+                PrintAndLog("Other signature check error: %x %s", (res<0)?-res:res, ecdsa_get_error(res));
+            }
+        } else {
+            PrintAndLog("Signature is OK.");
+        }
 
-	} else {
-		PrintAndLog("Invalid signature. res=%d.", res);
-	}
+    } else {
+        PrintAndLog("Invalid signature. res=%d.", res);
+    }
 
-	PrintAndLog("\nauth command: ");
-	printf("hf fido auth %s%s", paramsPlain?"-p ":"", sprint_hex_inrow(&buf[67], keyHandleLen));
-	if(chlen || applen)
-		printf(" %s", paramsPlain?(char *)cdata:sprint_hex_inrow(cdata, 32));
-	if(applen)
-		printf(" %s", paramsPlain?(char *)adata:sprint_hex_inrow(adata, 32));
-	printf("\n");
+    PrintAndLog("\nauth command: ");
+    printf("hf fido auth %s%s", paramsPlain?"-p ":"", sprint_hex_inrow(&buf[67], keyHandleLen));
+    if(chlen || applen)
+        printf(" %s", paramsPlain?(char *)cdata:sprint_hex_inrow(cdata, 32));
+    if(applen)
+        printf(" %s", paramsPlain?(char *)adata:sprint_hex_inrow(adata, 32));
+    printf("\n");
 
-	if (root) {
-		JsonSaveBufAsHex(root, "ChallengeParam", data, 32);
-		JsonSaveBufAsHex(root, "ApplicationParam", &data[32], 32);
-		JsonSaveBufAsHexCompact(root, "PublicKey", &buf[1], 65);
-		JsonSaveInt(root, "KeyHandleLen", keyHandleLen);
-		JsonSaveBufAsHexCompact(root, "KeyHandle", &buf[67], keyHandleLen);
-		JsonSaveBufAsHexCompact(root, "DER", &buf[67 + keyHandleLen], derLen);
+    if (root) {
+        JsonSaveBufAsHex(root, "ChallengeParam", data, 32);
+        JsonSaveBufAsHex(root, "ApplicationParam", &data[32], 32);
+        JsonSaveBufAsHexCompact(root, "PublicKey", &buf[1], 65);
+        JsonSaveInt(root, "KeyHandleLen", keyHandleLen);
+        JsonSaveBufAsHexCompact(root, "KeyHandle", &buf[67], keyHandleLen);
+        JsonSaveBufAsHexCompact(root, "DER", &buf[67 + keyHandleLen], derLen);
 
-		res = json_dump_file(root, fname, JSON_INDENT(2));
-		if (res) {
-			PrintAndLog("ERROR: can't save the file: %s", fname);
-			return 200;
-		}
-		PrintAndLog("File `%s` saved.", fname);
+        res = json_dump_file(root, fname, JSON_INDENT(2));
+        if (res) {
+            PrintAndLog("ERROR: can't save the file: %s", fname);
+            return 200;
+        }
+        PrintAndLog("File `%s` saved.", fname);
 
-		// free json object
-		json_decref(root);
-	}
+        // free json object
+        json_decref(root);
+    }
 
-	return 0;
+    return 0;
 };
 
 int CmdHFFidoAuthenticate(const char *cmd) {
-	uint8_t data[512] = {0};
-	uint8_t hdata[250] = {0};
-	bool public_key_loaded = false;
-	uint8_t public_key[65] = {0};
-	int hdatalen = 0;
-	uint8_t keyHandleLen = 0;
-	json_t *root = NULL;
+    uint8_t data[512] = {0};
+    uint8_t hdata[250] = {0};
+    bool public_key_loaded = false;
+    uint8_t public_key[65] = {0};
+    int hdatalen = 0;
+    uint8_t keyHandleLen = 0;
+    json_t *root = NULL;
 
-	CLIParserInit("hf fido auth",
-		"Initiate a U2F token authentication. Needs key handle and two 32-byte hash number. \nkey handle(var 0..255), challenge parameter (32b) and application parameter (32b).",
-		"Usage:\n\thf fido auth 000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f -> execute command with 2 parameters, filled 0x00 and key handle\n"
-			"\thf fido auth 000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f "
-				"000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f 000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f -> execute command with parameters");
+    CLIParserInit("hf fido auth",
+        "Initiate a U2F token authentication. Needs key handle and two 32-byte hash number. \nkey handle(var 0..255), challenge parameter (32b) and application parameter (32b).",
+        "Usage:\n\thf fido auth 000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f -> execute command with 2 parameters, filled 0x00 and key handle\n"
+            "\thf fido auth 000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f "
+                "000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f 000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f -> execute command with parameters");
 
-	void* argtable[] = {
-		arg_param_begin,
-		arg_lit0("aA",  "apdu",     "show APDU reqests and responses"),
-		arg_lit0("vV",  "verbose",  "show technical data"),
-		arg_lit0("pP",  "plain",    "send plain ASCII to challenge and application parameters instead of HEX"),
-		arg_rem("default mode:",    "dont-enforce-user-presence-and-sign"),
-		arg_lit0("uU",  "user",     "mode: enforce-user-presence-and-sign"),
-		arg_lit0("cC",  "check",    "mode: check-only"),
-		arg_str0("jJ",  "json",		"fido.json", "JSON input / output file name for parameters."),
-		arg_str0("kK",  "key",		"public key to verify signature", NULL),
-		arg_str0(NULL,  NULL,       "<HEX key handle (var 0..255b)>", NULL),
-		arg_str0(NULL,  NULL,       "<HEX/ASCII challenge parameter (32b HEX/1..16 chars)>", NULL),
-		arg_str0(NULL,  NULL,       "<HEX/ASCII application parameter (32b HEX/1..16 chars)>", NULL),
-		arg_param_end
-	};
-	CLIExecWithReturn(cmd, argtable, true);
+    void* argtable[] = {
+        arg_param_begin,
+        arg_lit0("aA",  "apdu",     "show APDU reqests and responses"),
+        arg_lit0("vV",  "verbose",  "show technical data"),
+        arg_lit0("pP",  "plain",    "send plain ASCII to challenge and application parameters instead of HEX"),
+        arg_rem("default mode:",    "dont-enforce-user-presence-and-sign"),
+        arg_lit0("uU",  "user",     "mode: enforce-user-presence-and-sign"),
+        arg_lit0("cC",  "check",    "mode: check-only"),
+        arg_str0("jJ",  "json",     "fido.json", "JSON input / output file name for parameters."),
+        arg_str0("kK",  "key",      "public key to verify signature", NULL),
+        arg_str0(NULL,  NULL,       "<HEX key handle (var 0..255b)>", NULL),
+        arg_str0(NULL,  NULL,       "<HEX/ASCII challenge parameter (32b HEX/1..16 chars)>", NULL),
+        arg_str0(NULL,  NULL,       "<HEX/ASCII application parameter (32b HEX/1..16 chars)>", NULL),
+        arg_param_end
+    };
+    CLIExecWithReturn(cmd, argtable, true);
 
-	bool APDULogging = arg_get_lit(1);
-	bool verbose = arg_get_lit(2);
-	bool paramsPlain = arg_get_lit(3);
-	uint8_t controlByte = 0x08;
-	if (arg_get_lit(5))
-		controlByte = 0x03;
-	if (arg_get_lit(6))
-		controlByte = 0x07;
+    bool APDULogging = arg_get_lit(1);
+    bool verbose = arg_get_lit(2);
+    bool paramsPlain = arg_get_lit(3);
+    uint8_t controlByte = 0x08;
+    if (arg_get_lit(5))
+        controlByte = 0x03;
+    if (arg_get_lit(6))
+        controlByte = 0x07;
 
-	char fname[250] = {0};
-	bool err;
-	root = OpenJson(7, fname, argtable, &err);
-	if(err)
-		return 1;
-	if (root) {
-		size_t jlen;
-		JsonLoadBufAsHex(root, "$.ChallengeParam", data, 32, &jlen);
-		JsonLoadBufAsHex(root, "$.ApplicationParam", &data[32], 32, &jlen);
-		JsonLoadBufAsHex(root, "$.KeyHandle", &data[65], 512 - 67, &jlen);
-		keyHandleLen = jlen & 0xff;
-		data[64] = keyHandleLen;
-		JsonLoadBufAsHex(root, "$.PublicKey", public_key, 65, &jlen);
-		public_key_loaded = (jlen > 0);
-	}
+    char fname[250] = {0};
+    bool err;
+    root = OpenJson(7, fname, argtable, &err);
+    if(err)
+        return 1;
+    if (root) {
+        size_t jlen;
+        JsonLoadBufAsHex(root, "$.ChallengeParam", data, 32, &jlen);
+        JsonLoadBufAsHex(root, "$.ApplicationParam", &data[32], 32, &jlen);
+        JsonLoadBufAsHex(root, "$.KeyHandle", &data[65], 512 - 67, &jlen);
+        keyHandleLen = jlen & 0xff;
+        data[64] = keyHandleLen;
+        JsonLoadBufAsHex(root, "$.PublicKey", public_key, 65, &jlen);
+        public_key_loaded = (jlen > 0);
+    }
 
-	// public key
-	CLIGetHexWithReturn(8, hdata, &hdatalen);
-	if (hdatalen && hdatalen != 65) {
-		PrintAndLog("ERROR: public key length must be 65 bytes only.");
-		return 1;
-	}
-	if (hdatalen) {
-		memmove(public_key, hdata, hdatalen);
-		public_key_loaded = true;
-	}
+    // public key
+    CLIGetHexWithReturn(8, hdata, &hdatalen);
+    if (hdatalen && hdatalen != 65) {
+        PrintAndLog("ERROR: public key length must be 65 bytes only.");
+        return 1;
+    }
+    if (hdatalen) {
+        memmove(public_key, hdata, hdatalen);
+        public_key_loaded = true;
+    }
 
-	CLIGetHexWithReturn(9, hdata, &hdatalen);
-	if (hdatalen > 255) {
-		PrintAndLog("ERROR: application parameter length must be less than 255.");
-		return 1;
-	}
-	if (hdatalen) {
-		keyHandleLen = hdatalen;
-		data[64] = keyHandleLen;
-		memmove(&data[65], hdata, keyHandleLen);
-	}
+    CLIGetHexWithReturn(9, hdata, &hdatalen);
+    if (hdatalen > 255) {
+        PrintAndLog("ERROR: application parameter length must be less than 255.");
+        return 1;
+    }
+    if (hdatalen) {
+        keyHandleLen = hdatalen;
+        data[64] = keyHandleLen;
+        memmove(&data[65], hdata, keyHandleLen);
+    }
 
-	if (paramsPlain) {
-		memset(hdata, 0x00, 32);
-		CLIGetStrWithReturn(9, hdata, &hdatalen);
-		if (hdatalen && hdatalen > 16) {
-			PrintAndLog("ERROR: challenge parameter length in ASCII mode must be less than 16 chars instead of: %d", hdatalen);
-			return 1;
-		}
-	} else {
-		CLIGetHexWithReturn(10, hdata, &hdatalen);
-		if (hdatalen && hdatalen != 32) {
-			PrintAndLog("ERROR: challenge parameter length must be 32 bytes only.");
-			return 1;
-		}
-	}
-	if (hdatalen)
-		memmove(data, hdata, 32);
+    if (paramsPlain) {
+        memset(hdata, 0x00, 32);
+        CLIGetStrWithReturn(9, hdata, &hdatalen);
+        if (hdatalen && hdatalen > 16) {
+            PrintAndLog("ERROR: challenge parameter length in ASCII mode must be less than 16 chars instead of: %d", hdatalen);
+            return 1;
+        }
+    } else {
+        CLIGetHexWithReturn(10, hdata, &hdatalen);
+        if (hdatalen && hdatalen != 32) {
+            PrintAndLog("ERROR: challenge parameter length must be 32 bytes only.");
+            return 1;
+        }
+    }
+    if (hdatalen)
+        memmove(data, hdata, 32);
 
-	if (paramsPlain) {
-		memset(hdata, 0x00, 32);
-		CLIGetStrWithReturn(11, hdata, &hdatalen);
-		if (hdatalen && hdatalen > 16) {
-			PrintAndLog("ERROR: application parameter length in ASCII mode must be less than 16 chars instead of: %d", hdatalen);
-			return 1;
-		}
-	} else {
-		CLIGetHexWithReturn(10, hdata, &hdatalen);
-		if (hdatalen && hdatalen != 32) {
-			PrintAndLog("ERROR: application parameter length must be 32 bytes only.");
-			return 1;
-		}
-	}
-	if (hdatalen)
-		memmove(&data[32], hdata, 32);
+    if (paramsPlain) {
+        memset(hdata, 0x00, 32);
+        CLIGetStrWithReturn(11, hdata, &hdatalen);
+        if (hdatalen && hdatalen > 16) {
+            PrintAndLog("ERROR: application parameter length in ASCII mode must be less than 16 chars instead of: %d", hdatalen);
+            return 1;
+        }
+    } else {
+        CLIGetHexWithReturn(10, hdata, &hdatalen);
+        if (hdatalen && hdatalen != 32) {
+            PrintAndLog("ERROR: application parameter length must be 32 bytes only.");
+            return 1;
+        }
+    }
+    if (hdatalen)
+        memmove(&data[32], hdata, 32);
 
-	CLIParserFree();
+    CLIParserFree();
 
-	SetAPDULogging(APDULogging);
+    SetAPDULogging(APDULogging);
 
-	// (in parameter) conrtol byte 0x07 - check only, 0x03 - user presense + cign. 0x08 - sign only
- 	// challenge parameter [32 bytes]
-	// application parameter [32 bytes]
-	// key handle length [1b] = N
-	// key handle [N]
+    // (in parameter) conrtol byte 0x07 - check only, 0x03 - user presense + cign. 0x08 - sign only
+    // challenge parameter [32 bytes]
+    // application parameter [32 bytes]
+    // key handle length [1b] = N
+    // key handle [N]
 
-	uint8_t datalen = 32 + 32 + 1 + keyHandleLen;
+    uint8_t datalen = 32 + 32 + 1 + keyHandleLen;
 
-	uint8_t buf[2048] = {0};
-	size_t len = 0;
-	uint16_t sw = 0;
+    uint8_t buf[2048] = {0};
+    size_t len = 0;
+    uint16_t sw = 0;
 
-	DropField();
-	int res = FIDOSelect(true, true, buf, sizeof(buf), &len, &sw);
+    DropField();
+    int res = FIDOSelect(true, true, buf, sizeof(buf), &len, &sw);
 
-	if (res) {
-		PrintAndLog("Can't select authenticator. res=%x. Exit...", res);
-		DropField();
-		return res;
-	}
+    if (res) {
+        PrintAndLog("Can't select authenticator. res=%x. Exit...", res);
+        DropField();
+        return res;
+    }
 
-	if (sw != 0x9000) {
-		PrintAndLog("Can't select FIDO application. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
-		DropField();
-		return 2;
-	}
+    if (sw != 0x9000) {
+        PrintAndLog("Can't select FIDO application. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
+        DropField();
+        return 2;
+    }
 
-	res = FIDOAuthentication(data, datalen, controlByte,  buf,  sizeof(buf), &len, &sw);
-	DropField();
-	if (res) {
-		PrintAndLog("Can't execute authentication command. res=%x. Exit...", res);
-		return res;
-	}
+    res = FIDOAuthentication(data, datalen, controlByte,  buf,  sizeof(buf), &len, &sw);
+    DropField();
+    if (res) {
+        PrintAndLog("Can't execute authentication command. res=%x. Exit...", res);
+        return res;
+    }
 
-	if (sw != 0x9000) {
-		PrintAndLog("ERROR execute authentication command. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
-		return 3;
-	}
+    if (sw != 0x9000) {
+        PrintAndLog("ERROR execute authentication command. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
+        return 3;
+    }
 
-	PrintAndLog("---------------------------------------------------------------");
-	PrintAndLog("User presence: %s", (buf[0]?"verified":"not verified"));
-	uint32_t cntr =  (uint32_t)bytes_to_num(&buf[1], 4);
-	PrintAndLog("Counter: %d", cntr);
-	PrintAndLog("Hash[%d]: %s", len - 5, sprint_hex(&buf[5], len - 5));
+    PrintAndLog("---------------------------------------------------------------");
+    PrintAndLog("User presence: %s", (buf[0]?"verified":"not verified"));
+    uint32_t cntr =  (uint32_t)bytes_to_num(&buf[1], 4);
+    PrintAndLog("Counter: %d", cntr);
+    PrintAndLog("Hash[%d]: %s", len - 5, sprint_hex(&buf[5], len - 5));
 
-	// check ANSI X9.62 format ECDSA signature (on P-256)
-	uint8_t rval[300] = {0};
-	uint8_t sval[300] = {0};
-	res = ecdsa_asn1_get_signature(&buf[5], len - 5, rval, sval);
-	if (!res) {
-		if (verbose) {
-			PrintAndLog("  r: %s", sprint_hex(rval, 32));
-			PrintAndLog("  s: %s", sprint_hex(sval, 32));
-		}
-		if (public_key_loaded) {
-			uint8_t xbuf[4096] = {0};
-			size_t xbuflen = 0;
-			res = FillBuffer(xbuf, sizeof(xbuf), &xbuflen,
-				&data[32], 32, // application parameter
-				&buf[0], 1,    // user presence
-				&buf[1], 4,    // counter
-				data, 32,      // challenge parameter
-				NULL, 0);
-			//PrintAndLog("--xbuf(%d)[%d]: %s", res, xbuflen, sprint_hex(xbuf, xbuflen));
-			res = ecdsa_signature_verify(public_key, xbuf, xbuflen, &buf[5], len - 5);
-			if (res) {
-				if (res == -0x4e00) {
-					PrintAndLog("Signature is NOT VALID.");
-				} else {
-					PrintAndLog("Other signature check error: %x %s", (res<0)?-res:res, ecdsa_get_error(res));
-				}
-			} else {
-				PrintAndLog("Signature is OK.");
-			}
-		} else {
-			PrintAndLog("No public key provided. can't check signature.");
-		}
-	} else {
-		PrintAndLog("Invalid signature. res=%d.", res);
-	}
+    // check ANSI X9.62 format ECDSA signature (on P-256)
+    uint8_t rval[300] = {0};
+    uint8_t sval[300] = {0};
+    res = ecdsa_asn1_get_signature(&buf[5], len - 5, rval, sval);
+    if (!res) {
+        if (verbose) {
+            PrintAndLog("  r: %s", sprint_hex(rval, 32));
+            PrintAndLog("  s: %s", sprint_hex(sval, 32));
+        }
+        if (public_key_loaded) {
+            uint8_t xbuf[4096] = {0};
+            size_t xbuflen = 0;
+            res = FillBuffer(xbuf, sizeof(xbuf), &xbuflen,
+                &data[32], 32, // application parameter
+                &buf[0], 1,    // user presence
+                &buf[1], 4,    // counter
+                data, 32,      // challenge parameter
+                NULL, 0);
+            //PrintAndLog("--xbuf(%d)[%d]: %s", res, xbuflen, sprint_hex(xbuf, xbuflen));
+            res = ecdsa_signature_verify(public_key, xbuf, xbuflen, &buf[5], len - 5);
+            if (res) {
+                if (res == -0x4e00) {
+                    PrintAndLog("Signature is NOT VALID.");
+                } else {
+                    PrintAndLog("Other signature check error: %x %s", (res<0)?-res:res, ecdsa_get_error(res));
+                }
+            } else {
+                PrintAndLog("Signature is OK.");
+            }
+        } else {
+            PrintAndLog("No public key provided. can't check signature.");
+        }
+    } else {
+        PrintAndLog("Invalid signature. res=%d.", res);
+    }
 
-	if (root) {
-		JsonSaveBufAsHex(root, "ChallengeParam", data, 32);
-		JsonSaveBufAsHex(root, "ApplicationParam", &data[32], 32);
-		JsonSaveInt(root, "KeyHandleLen", keyHandleLen);
-		JsonSaveBufAsHexCompact(root, "KeyHandle", &data[65], keyHandleLen);
-		JsonSaveInt(root, "Counter", cntr);
+    if (root) {
+        JsonSaveBufAsHex(root, "ChallengeParam", data, 32);
+        JsonSaveBufAsHex(root, "ApplicationParam", &data[32], 32);
+        JsonSaveInt(root, "KeyHandleLen", keyHandleLen);
+        JsonSaveBufAsHexCompact(root, "KeyHandle", &data[65], keyHandleLen);
+        JsonSaveInt(root, "Counter", cntr);
 
-		res = json_dump_file(root, fname, JSON_INDENT(2));
-		if (res) {
-			PrintAndLog("ERROR: can't save the file: %s", fname);
-			return 200;
-		}
-		PrintAndLog("File `%s` saved.", fname);
+        res = json_dump_file(root, fname, JSON_INDENT(2));
+        if (res) {
+            PrintAndLog("ERROR: can't save the file: %s", fname);
+            return 200;
+        }
+        PrintAndLog("File `%s` saved.", fname);
 
-		// free json object
-		json_decref(root);
-	}
-	return 0;
+        // free json object
+        json_decref(root);
+    }
+    return 0;
 };
 
 void CheckSlash(char *fileName) {
-	if ((fileName[strlen(fileName) - 1] != '/') &&
-		(fileName[strlen(fileName) - 1] != '\\'))
-		strcat(fileName, "/");
+    if ((fileName[strlen(fileName) - 1] != '/') &&
+        (fileName[strlen(fileName) - 1] != '\\'))
+        strcat(fileName, "/");
 }
 
 int GetExistsFileNameJson(char *prefixDir, char *reqestedFileName, char *fileName) {
-	fileName[0] = 0x00;
-	strcpy(fileName, get_my_executable_directory());
-	CheckSlash(fileName);
+    fileName[0] = 0x00;
+    strcpy(fileName, get_my_executable_directory());
+    CheckSlash(fileName);
 
-	strcat(fileName, prefixDir);
-	CheckSlash(fileName);
+    strcat(fileName, prefixDir);
+    CheckSlash(fileName);
 
-	strcat(fileName, reqestedFileName);
-	if (!strstr(fileName, ".json"))
-		strcat(fileName, ".json");
+    strcat(fileName, reqestedFileName);
+    if (!strstr(fileName, ".json"))
+        strcat(fileName, ".json");
 
-	if (access(fileName, F_OK) < 0) {
-		strcpy(fileName, get_my_executable_directory());
-		CheckSlash(fileName);
+    if (access(fileName, F_OK) < 0) {
+        strcpy(fileName, get_my_executable_directory());
+        CheckSlash(fileName);
 
-		strcat(fileName, reqestedFileName);
-		if (!strstr(fileName, ".json"))
-			strcat(fileName, ".json");
+        strcat(fileName, reqestedFileName);
+        if (!strstr(fileName, ".json"))
+            strcat(fileName, ".json");
 
-		if (access(fileName, F_OK) < 0) {
-			return 1; // file not found
-		}
-	}
-	return 0;
+        if (access(fileName, F_OK) < 0) {
+            return 1; // file not found
+        }
+    }
+    return 0;
 }
 
 int CmdHFFido2MakeCredential(const char *cmd) {
-	json_error_t error;
-	json_t *root = NULL;
-	char fname[300] = {0};
+    json_error_t error;
+    json_t *root = NULL;
+    char fname[300] = {0};
 
-	CLIParserInit("hf fido make",
-		"Execute a FIDO2 Make Credentional command. Needs json file with parameters. Sample file `fido2.json`. File can be placed in proxmark directory or in `proxmark/fido` directory.",
-		"Usage:\n\thf fido make -> execute command default parameters file `fido2.json`\n"
-			"\thf fido make test.json -> execute command with parameters file `text.json`");
+    CLIParserInit("hf fido make",
+        "Execute a FIDO2 Make Credentional command. Needs json file with parameters. Sample file `fido2.json`. File can be placed in proxmark directory or in `proxmark/fido` directory.",
+        "Usage:\n\thf fido make -> execute command default parameters file `fido2.json`\n"
+            "\thf fido make test.json -> execute command with parameters file `text.json`");
 
-	void* argtable[] = {
-		arg_param_begin,
-		arg_lit0("aA",  "apdu",     "show APDU reqests and responses"),
-		arg_litn("vV",  "verbose",  0, 2, "show technical data. vv - show full certificates data"),
-		arg_lit0("tT",  "tlv",      "Show DER certificate contents in TLV representation"),
-		arg_lit0("cC",  "cbor",     "show CBOR decoded data"),
-		arg_str0(NULL,  NULL,		"<json file name>", "JSON input / output file name for parameters. Default `fido2.json`"),
-		arg_param_end
-	};
-	CLIExecWithReturn(cmd, argtable, true);
+    void* argtable[] = {
+        arg_param_begin,
+        arg_lit0("aA",  "apdu",     "show APDU reqests and responses"),
+        arg_litn("vV",  "verbose",  0, 2, "show technical data. vv - show full certificates data"),
+        arg_lit0("tT",  "tlv",      "Show DER certificate contents in TLV representation"),
+        arg_lit0("cC",  "cbor",     "show CBOR decoded data"),
+        arg_str0(NULL,  NULL,       "<json file name>", "JSON input / output file name for parameters. Default `fido2.json`"),
+        arg_param_end
+    };
+    CLIExecWithReturn(cmd, argtable, true);
 
-	bool APDULogging = arg_get_lit(1);
-	bool verbose = arg_get_lit(2);
-	bool verbose2 = arg_get_lit(2) > 1;
-	bool showDERTLV = arg_get_lit(3);
-	bool showCBOR = arg_get_lit(4);
+    bool APDULogging = arg_get_lit(1);
+    bool verbose = arg_get_lit(2);
+    bool verbose2 = arg_get_lit(2) > 1;
+    bool showDERTLV = arg_get_lit(3);
+    bool showCBOR = arg_get_lit(4);
 
-	uint8_t jsonname[250] ={0};
-	char *cjsonname = (char *)jsonname;
-	int jsonnamelen = 0;
-	CLIGetStrWithReturn(5, jsonname, &jsonnamelen);
+    uint8_t jsonname[250] ={0};
+    char *cjsonname = (char *)jsonname;
+    int jsonnamelen = 0;
+    CLIGetStrWithReturn(5, jsonname, &jsonnamelen);
 
-	if (!jsonnamelen) {
-		strcat(cjsonname, "fido2");
-		jsonnamelen = strlen(cjsonname);
-	}
+    if (!jsonnamelen) {
+        strcat(cjsonname, "fido2");
+        jsonnamelen = strlen(cjsonname);
+    }
 
-	CLIParserFree();
+    CLIParserFree();
 
-	SetAPDULogging(APDULogging);
+    SetAPDULogging(APDULogging);
 
-	int res = GetExistsFileNameJson("fido", cjsonname, fname);
-	if(res) {
-		PrintAndLog("ERROR: Can't found the json file.");
-		return res;
-	}
-	PrintAndLog("fname: %s\n", fname);
-	root = json_load_file(fname, 0, &error);
-	if (!root) {
-		PrintAndLog("ERROR: json error on line %d: %s", error.line, error.text);
-		return 1;
-	}
+    int res = GetExistsFileNameJson("fido", cjsonname, fname);
+    if(res) {
+        PrintAndLog("ERROR: Can't found the json file.");
+        return res;
+    }
+    PrintAndLog("fname: %s\n", fname);
+    root = json_load_file(fname, 0, &error);
+    if (!root) {
+        PrintAndLog("ERROR: json error on line %d: %s", error.line, error.text);
+        return 1;
+    }
 
-	uint8_t data[2048] = {0};
-	size_t datalen = 0;
-	uint8_t buf[2048] = {0};
-	size_t len = 0;
-	uint16_t sw = 0;
+    uint8_t data[2048] = {0};
+    size_t datalen = 0;
+    uint8_t buf[2048] = {0};
+    size_t len = 0;
+    uint16_t sw = 0;
 
-	DropField();
-	res = FIDOSelect(true, true, buf, sizeof(buf), &len, &sw);
+    DropField();
+    res = FIDOSelect(true, true, buf, sizeof(buf), &len, &sw);
 
-	if (res) {
-		PrintAndLog("Can't select authenticator. res=%x. Exit...", res);
-		DropField();
-		return res;
-	}
+    if (res) {
+        PrintAndLog("Can't select authenticator. res=%x. Exit...", res);
+        DropField();
+        return res;
+    }
 
-	if (sw != 0x9000) {
-		PrintAndLog("Can't select FIDO application. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
-		DropField();
-		return 2;
-	}
+    if (sw != 0x9000) {
+        PrintAndLog("Can't select FIDO application. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
+        DropField();
+        return 2;
+    }
 
-	res = FIDO2CreateMakeCredentionalReq(root, data, sizeof(data), &datalen);
-	if (res)
-		return res;
+    res = FIDO2CreateMakeCredentionalReq(root, data, sizeof(data), &datalen);
+    if (res)
+        return res;
 
-	if (showCBOR) {
-		PrintAndLog("CBOR make credentional request:");
-		PrintAndLog("---------------- CBOR ------------------");
-		TinyCborPrintFIDOPackage(fido2CmdMakeCredential, false, data, datalen);
-		PrintAndLog("---------------- CBOR ------------------");
-	}
+    if (showCBOR) {
+        PrintAndLog("CBOR make credentional request:");
+        PrintAndLog("---------------- CBOR ------------------");
+        TinyCborPrintFIDOPackage(fido2CmdMakeCredential, false, data, datalen);
+        PrintAndLog("---------------- CBOR ------------------");
+    }
 
-	res = FIDO2MakeCredential(data, datalen, buf,  sizeof(buf), &len, &sw);
-	DropField();
-	if (res) {
-		PrintAndLog("Can't execute make credential command. res=%x. Exit...", res);
-		return res;
-	}
+    res = FIDO2MakeCredential(data, datalen, buf,  sizeof(buf), &len, &sw);
+    DropField();
+    if (res) {
+        PrintAndLog("Can't execute make credential command. res=%x. Exit...", res);
+        return res;
+    }
 
-	if (sw != 0x9000) {
-		PrintAndLog("ERROR execute make credential command. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
-		return 3;
-	}
+    if (sw != 0x9000) {
+        PrintAndLog("ERROR execute make credential command. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
+        return 3;
+    }
 
-	if(buf[0]) {
-		PrintAndLog("FIDO2 make credential error: %d - %s", buf[0], fido2GetCmdErrorDescription(buf[0]));
-		return 0;
-	}
+    if(buf[0]) {
+        PrintAndLog("FIDO2 make credential error: %d - %s", buf[0], fido2GetCmdErrorDescription(buf[0]));
+        return 0;
+    }
 
-	PrintAndLog("MakeCredential result (%d b) OK.", len);
-	if (showCBOR) {
-		PrintAndLog("CBOR make credentional response:");
-		PrintAndLog("---------------- CBOR ------------------");
-		TinyCborPrintFIDOPackage(fido2CmdMakeCredential, true, &buf[1], len - 1);
-		PrintAndLog("---------------- CBOR ------------------");
-	}
+    PrintAndLog("MakeCredential result (%d b) OK.", len);
+    if (showCBOR) {
+        PrintAndLog("CBOR make credentional response:");
+        PrintAndLog("---------------- CBOR ------------------");
+        TinyCborPrintFIDOPackage(fido2CmdMakeCredential, true, &buf[1], len - 1);
+        PrintAndLog("---------------- CBOR ------------------");
+    }
 
-	// parse returned cbor
-	FIDO2MakeCredentionalParseRes(root, &buf[1], len - 1, verbose, verbose2, showCBOR, showDERTLV);
+    // parse returned cbor
+    FIDO2MakeCredentionalParseRes(root, &buf[1], len - 1, verbose, verbose2, showCBOR, showDERTLV);
 
-	if (root) {
-		res = json_dump_file(root, fname, JSON_INDENT(2));
-		if (res) {
-			PrintAndLog("ERROR: can't save the file: %s", fname);
-			return 200;
-		}
-		PrintAndLog("File `%s` saved.", fname);
-	}
+    if (root) {
+        res = json_dump_file(root, fname, JSON_INDENT(2));
+        if (res) {
+            PrintAndLog("ERROR: can't save the file: %s", fname);
+            return 200;
+        }
+        PrintAndLog("File `%s` saved.", fname);
+    }
 
-	json_decref(root);
+    json_decref(root);
 
-	return 0;
+    return 0;
 };
 
 int CmdHFFido2GetAssertion(const char *cmd) {
-	json_error_t error;
-	json_t *root = NULL;
-	char fname[300] = {0};
+    json_error_t error;
+    json_t *root = NULL;
+    char fname[300] = {0};
 
-	CLIParserInit("hf fido assert",
-		"Execute a FIDO2 Get Assertion command. Needs json file with parameters. Sample file `fido2.json`. File can be placed in proxmark directory or in `proxmark/fido` directory.",
-		"Usage:\n\thf fido assert -> execute command default parameters file `fido2.json`\n"
-			"\thf fido assert test.json -l -> execute command with parameters file `text.json` and add to request CredentialId");
+    CLIParserInit("hf fido assert",
+        "Execute a FIDO2 Get Assertion command. Needs json file with parameters. Sample file `fido2.json`. File can be placed in proxmark directory or in `proxmark/fido` directory.",
+        "Usage:\n\thf fido assert -> execute command default parameters file `fido2.json`\n"
+            "\thf fido assert test.json -l -> execute command with parameters file `text.json` and add to request CredentialId");
 
-	void* argtable[] = {
-		arg_param_begin,
-		arg_lit0("aA",  "apdu",     "show APDU reqests and responses"),
-		arg_litn("vV",  "verbose",  0, 2, "show technical data. vv - show full certificates data"),
-		arg_lit0("cC",  "cbor",     "show CBOR decoded data"),
-		arg_lit0("lL",  "list",     "add CredentialId from json to allowList. Needs if `rk` option is `false` (authenticator don't store credential to its memory)"),
-		arg_str0(NULL,  NULL,		"<json file name>", "JSON input / output file name for parameters. Default `fido2.json`"),
-		arg_param_end
-	};
-	CLIExecWithReturn(cmd, argtable, true);
+    void* argtable[] = {
+        arg_param_begin,
+        arg_lit0("aA",  "apdu",     "show APDU reqests and responses"),
+        arg_litn("vV",  "verbose",  0, 2, "show technical data. vv - show full certificates data"),
+        arg_lit0("cC",  "cbor",     "show CBOR decoded data"),
+        arg_lit0("lL",  "list",     "add CredentialId from json to allowList. Needs if `rk` option is `false` (authenticator don't store credential to its memory)"),
+        arg_str0(NULL,  NULL,       "<json file name>", "JSON input / output file name for parameters. Default `fido2.json`"),
+        arg_param_end
+    };
+    CLIExecWithReturn(cmd, argtable, true);
 
-	bool APDULogging = arg_get_lit(1);
-	bool verbose = arg_get_lit(2);
-	bool verbose2 = arg_get_lit(2) > 1;
-	bool showCBOR = arg_get_lit(3);
-	bool createAllowList = arg_get_lit(4);
+    bool APDULogging = arg_get_lit(1);
+    bool verbose = arg_get_lit(2);
+    bool verbose2 = arg_get_lit(2) > 1;
+    bool showCBOR = arg_get_lit(3);
+    bool createAllowList = arg_get_lit(4);
 
-	uint8_t jsonname[250] ={0};
-	char *cjsonname = (char *)jsonname;
-	int jsonnamelen = 0;
-	CLIGetStrWithReturn(5, jsonname, &jsonnamelen);
+    uint8_t jsonname[250] ={0};
+    char *cjsonname = (char *)jsonname;
+    int jsonnamelen = 0;
+    CLIGetStrWithReturn(5, jsonname, &jsonnamelen);
 
-	if (!jsonnamelen) {
-		strcat(cjsonname, "fido2");
-		jsonnamelen = strlen(cjsonname);
-	}
+    if (!jsonnamelen) {
+        strcat(cjsonname, "fido2");
+        jsonnamelen = strlen(cjsonname);
+    }
 
-	CLIParserFree();
+    CLIParserFree();
 
-	SetAPDULogging(APDULogging);
+    SetAPDULogging(APDULogging);
 
-	int res = GetExistsFileNameJson("fido", "fido2", fname);
-	if(res) {
-		PrintAndLog("ERROR: Can't found the json file.");
-		return res;
-	}
-	PrintAndLog("fname: %s\n", fname);
-	root = json_load_file(fname, 0, &error);
-	if (!root) {
-		PrintAndLog("ERROR: json error on line %d: %s", error.line, error.text);
-		return 1;
-	}
+    int res = GetExistsFileNameJson("fido", "fido2", fname);
+    if(res) {
+        PrintAndLog("ERROR: Can't found the json file.");
+        return res;
+    }
+    PrintAndLog("fname: %s\n", fname);
+    root = json_load_file(fname, 0, &error);
+    if (!root) {
+        PrintAndLog("ERROR: json error on line %d: %s", error.line, error.text);
+        return 1;
+    }
 
-	uint8_t data[2048] = {0};
-	size_t datalen = 0;
-	uint8_t buf[2048] = {0};
-	size_t len = 0;
-	uint16_t sw = 0;
+    uint8_t data[2048] = {0};
+    size_t datalen = 0;
+    uint8_t buf[2048] = {0};
+    size_t len = 0;
+    uint16_t sw = 0;
 
-	DropField();
-	res = FIDOSelect(true, true, buf, sizeof(buf), &len, &sw);
+    DropField();
+    res = FIDOSelect(true, true, buf, sizeof(buf), &len, &sw);
 
-	if (res) {
-		PrintAndLog("Can't select authenticator. res=%x. Exit...", res);
-		DropField();
-		return res;
-	}
+    if (res) {
+        PrintAndLog("Can't select authenticator. res=%x. Exit...", res);
+        DropField();
+        return res;
+    }
 
-	if (sw != 0x9000) {
-		PrintAndLog("Can't select FIDO application. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
-		DropField();
-		return 2;
-	}
+    if (sw != 0x9000) {
+        PrintAndLog("Can't select FIDO application. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
+        DropField();
+        return 2;
+    }
 
-	res = FIDO2CreateGetAssertionReq(root, data, sizeof(data), &datalen, createAllowList);
-	if (res)
-		return res;
+    res = FIDO2CreateGetAssertionReq(root, data, sizeof(data), &datalen, createAllowList);
+    if (res)
+        return res;
 
-	if (showCBOR) {
-		PrintAndLog("CBOR get assertion request:");
-		PrintAndLog("---------------- CBOR ------------------");
-		TinyCborPrintFIDOPackage(fido2CmdGetAssertion, false, data, datalen);
-		PrintAndLog("---------------- CBOR ------------------");
-	}
+    if (showCBOR) {
+        PrintAndLog("CBOR get assertion request:");
+        PrintAndLog("---------------- CBOR ------------------");
+        TinyCborPrintFIDOPackage(fido2CmdGetAssertion, false, data, datalen);
+        PrintAndLog("---------------- CBOR ------------------");
+    }
 
-	res = FIDO2GetAssertion(data, datalen, buf,  sizeof(buf), &len, &sw);
-	DropField();
-	if (res) {
-		PrintAndLog("Can't execute get assertion command. res=%x. Exit...", res);
-		return res;
-	}
+    res = FIDO2GetAssertion(data, datalen, buf,  sizeof(buf), &len, &sw);
+    DropField();
+    if (res) {
+        PrintAndLog("Can't execute get assertion command. res=%x. Exit...", res);
+        return res;
+    }
 
-	if (sw != 0x9000) {
-		PrintAndLog("ERROR execute get assertion command. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
-		return 3;
-	}
+    if (sw != 0x9000) {
+        PrintAndLog("ERROR execute get assertion command. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
+        return 3;
+    }
 
-	if(buf[0]) {
-		PrintAndLog("FIDO2 get assertion error: %d - %s", buf[0], fido2GetCmdErrorDescription(buf[0]));
-		return 0;
-	}
+    if(buf[0]) {
+        PrintAndLog("FIDO2 get assertion error: %d - %s", buf[0], fido2GetCmdErrorDescription(buf[0]));
+        return 0;
+    }
 
-	PrintAndLog("GetAssertion result (%d b) OK.", len);
-	if (showCBOR) {
-		PrintAndLog("CBOR get assertion response:");
-		PrintAndLog("---------------- CBOR ------------------");
-		TinyCborPrintFIDOPackage(fido2CmdGetAssertion, true, &buf[1], len - 1);
-		PrintAndLog("---------------- CBOR ------------------");
-	}
+    PrintAndLog("GetAssertion result (%d b) OK.", len);
+    if (showCBOR) {
+        PrintAndLog("CBOR get assertion response:");
+        PrintAndLog("---------------- CBOR ------------------");
+        TinyCborPrintFIDOPackage(fido2CmdGetAssertion, true, &buf[1], len - 1);
+        PrintAndLog("---------------- CBOR ------------------");
+    }
 
-	// parse returned cbor
-	FIDO2GetAssertionParseRes(root, &buf[1], len - 1, verbose, verbose2, showCBOR);
+    // parse returned cbor
+    FIDO2GetAssertionParseRes(root, &buf[1], len - 1, verbose, verbose2, showCBOR);
 
-	if (root) {
-		res = json_dump_file(root, fname, JSON_INDENT(2));
-		if (res) {
-			PrintAndLog("ERROR: can't save the file: %s", fname);
-			return 200;
-		}
-		PrintAndLog("File `%s` saved.", fname);
-	}
+    if (root) {
+        res = json_dump_file(root, fname, JSON_INDENT(2));
+        if (res) {
+            PrintAndLog("ERROR: can't save the file: %s", fname);
+            return 200;
+        }
+        PrintAndLog("File `%s` saved.", fname);
+    }
 
-	json_decref(root);
+    json_decref(root);
 
-	return 0;
+    return 0;
 };
 
 static command_t CommandTable[] =
 {
-  {"help",             CmdHelp,						1, "This help."},
-  {"info",  	       CmdHFFidoInfo,				0, "Info about FIDO tag."},
-  {"reg",  	  	 	   CmdHFFidoRegister,			0, "FIDO U2F Registration Message."},
-  {"auth",  	       CmdHFFidoAuthenticate,		0, "FIDO U2F Authentication Message."},
-  {"make",  	       CmdHFFido2MakeCredential,	0, "FIDO2 MakeCredential command."},
-  {"assert",  	       CmdHFFido2GetAssertion,		0, "FIDO2 GetAssertion command."},
-  {NULL,               NULL,						0, NULL}
+  {"help",             CmdHelp,                    1, "This help."},
+  {"info",             CmdHFFidoInfo,              0, "Info about FIDO tag."},
+  {"reg",              CmdHFFidoRegister,          0, "FIDO U2F Registration Message."},
+  {"auth",             CmdHFFidoAuthenticate,      0, "FIDO U2F Authentication Message."},
+  {"make",             CmdHFFido2MakeCredential,   0, "FIDO2 MakeCredential command."},
+  {"assert",           CmdHFFido2GetAssertion,     0, "FIDO2 GetAssertion command."},
+  {NULL,               NULL,                       0, NULL}
 };
 
 int CmdHFFido(const char *Cmd) {
-	(void)WaitForResponseTimeout(CMD_ACK, NULL, 100);
-	CmdsParse(CommandTable, Cmd);
-	return 0;
+    (void)WaitForResponseTimeout(CMD_ACK, NULL, 100);
+    CmdsParse(CommandTable, Cmd);
+    return 0;
 }
 
 int CmdHelp(const char *Cmd) {
diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index bf8976e8a..20bcfdf33 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -19,346 +19,346 @@
 static int CmdHelp(const char *Cmd);
 
 static uint8_t iClass_Key_Table[ICLASS_KEYS_MAX][8] = {
-		{ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },
-		{ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },
-		{ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },
-		{ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },
-		{ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },
-		{ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },
-		{ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },
-		{ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }
+        { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },
+        { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },
+        { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },
+        { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },
+        { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },
+        { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },
+        { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },
+        { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }
 };
 
 int usage_hf_iclass_sim(void) {
-	PrintAndLogEx(NORMAL, "Usage:  hf iclass sim <option> [CSN]");
-	PrintAndLogEx(NORMAL, "        options");
-	PrintAndLogEx(NORMAL, "                0 <CSN> simulate the given CSN");
-	PrintAndLogEx(NORMAL, "                1       simulate default CSN");
-	PrintAndLogEx(NORMAL, "                2       Reader-attack, gather reader responses to extract elite key");
-	PrintAndLogEx(NORMAL, "                3       Full simulation using emulator memory (see 'hf iclass eload')");
-	PrintAndLogEx(NORMAL, "                4       Reader-attack, adapted for KeyRoll mode, gather reader responses to extract elite key");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        hf iclass sim 0 031FEC8AF7FF12E0");
-	PrintAndLogEx(NORMAL, "        hf iclass sim 2");
-	PrintAndLogEx(NORMAL, "        hf iclass eload 'tagdump.bin'");
-	PrintAndLogEx(NORMAL, "        hf iclass sim 3");
-	PrintAndLogEx(NORMAL, "        hf iclass sim 4");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage:  hf iclass sim <option> [CSN]");
+    PrintAndLogEx(NORMAL, "        options");
+    PrintAndLogEx(NORMAL, "                0 <CSN> simulate the given CSN");
+    PrintAndLogEx(NORMAL, "                1       simulate default CSN");
+    PrintAndLogEx(NORMAL, "                2       Reader-attack, gather reader responses to extract elite key");
+    PrintAndLogEx(NORMAL, "                3       Full simulation using emulator memory (see 'hf iclass eload')");
+    PrintAndLogEx(NORMAL, "                4       Reader-attack, adapted for KeyRoll mode, gather reader responses to extract elite key");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "        hf iclass sim 0 031FEC8AF7FF12E0");
+    PrintAndLogEx(NORMAL, "        hf iclass sim 2");
+    PrintAndLogEx(NORMAL, "        hf iclass eload 'tagdump.bin'");
+    PrintAndLogEx(NORMAL, "        hf iclass sim 3");
+    PrintAndLogEx(NORMAL, "        hf iclass sim 4");
+    return 0;
 }
 int usage_hf_iclass_eload(void) {
-	PrintAndLogEx(NORMAL, "Loads iclass tag-dump into emulator memory on device");
-	PrintAndLogEx(NORMAL, "Usage:  hf iclass eload f <filename>");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        hf iclass eload f iclass_tagdump-aa162d30f8ff12f1.bin");
-	return 0;
+    PrintAndLogEx(NORMAL, "Loads iclass tag-dump into emulator memory on device");
+    PrintAndLogEx(NORMAL, "Usage:  hf iclass eload f <filename>");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "        hf iclass eload f iclass_tagdump-aa162d30f8ff12f1.bin");
+    return 0;
 }
 int usage_hf_iclass_decrypt(void) {
-	PrintAndLogEx(NORMAL, "This is simple implementation, it tries to decrypt every block after block 6.");
-	PrintAndLogEx(NORMAL, "Correct behaviour would be to decrypt only the application areas where the key is valid,");
-	PrintAndLogEx(NORMAL, "which is defined by the configuration block.");
-	PrintAndLogEx(NORMAL, "OBS! In order to use this function, the file 'iclass_decryptionkey.bin' must reside");
-	PrintAndLogEx(NORMAL, "in the working directory. The file should be 16 bytes binary data");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage: hf iclass decrypt f <tagdump>");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "S       hf iclass decrypt f tagdump_12312342343.bin");
-	return 0;
+    PrintAndLogEx(NORMAL, "This is simple implementation, it tries to decrypt every block after block 6.");
+    PrintAndLogEx(NORMAL, "Correct behaviour would be to decrypt only the application areas where the key is valid,");
+    PrintAndLogEx(NORMAL, "which is defined by the configuration block.");
+    PrintAndLogEx(NORMAL, "OBS! In order to use this function, the file 'iclass_decryptionkey.bin' must reside");
+    PrintAndLogEx(NORMAL, "in the working directory. The file should be 16 bytes binary data");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage: hf iclass decrypt f <tagdump>");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "S       hf iclass decrypt f tagdump_12312342343.bin");
+    return 0;
 }
 int usage_hf_iclass_encrypt(void) {
-	PrintAndLogEx(NORMAL, "OBS! In order to use this function, the file 'iclass_decryptionkey.bin' must reside");
-	PrintAndLogEx(NORMAL, "in the working directory. The file should be 16 bytes binary data");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage: hf iclass encrypt <BlockData>");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        hf iclass encrypt 0102030405060708");
-	PrintAndLogEx(NORMAL, "");
-	return 0;
+    PrintAndLogEx(NORMAL, "OBS! In order to use this function, the file 'iclass_decryptionkey.bin' must reside");
+    PrintAndLogEx(NORMAL, "in the working directory. The file should be 16 bytes binary data");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage: hf iclass encrypt <BlockData>");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "        hf iclass encrypt 0102030405060708");
+    PrintAndLogEx(NORMAL, "");
+    return 0;
 }
 int usage_hf_iclass_dump(void) {
-	PrintAndLogEx(NORMAL, "Usage:  hf iclass dump f <fileName> k <key> c <creditkey> [e|r|v]\n");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "  f <filename> : specify a filename to save dump to");
-	PrintAndLogEx(NORMAL, "  k <key>      : <required> access Key as 16 hex symbols or 1 hex to select key from memory");
-	PrintAndLogEx(NORMAL, "  c <creditkey>: credit key as 16 hex symbols or 1 hex to select key from memory");
-	PrintAndLogEx(NORMAL, "  e            : elite computations applied to key");
-	PrintAndLogEx(NORMAL, "  r            : raw, the key is interpreted as raw block 3/4");
-	PrintAndLogEx(NORMAL, "  v            : verbose output");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        hf iclass dump k 001122334455667B");
-	PrintAndLogEx(NORMAL, "        hf iclass dump k AAAAAAAAAAAAAAAA c 001122334455667B");
-	PrintAndLogEx(NORMAL, "        hf iclass dump k AAAAAAAAAAAAAAAA e");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage:  hf iclass dump f <fileName> k <key> c <creditkey> [e|r|v]\n");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "  f <filename> : specify a filename to save dump to");
+    PrintAndLogEx(NORMAL, "  k <key>      : <required> access Key as 16 hex symbols or 1 hex to select key from memory");
+    PrintAndLogEx(NORMAL, "  c <creditkey>: credit key as 16 hex symbols or 1 hex to select key from memory");
+    PrintAndLogEx(NORMAL, "  e            : elite computations applied to key");
+    PrintAndLogEx(NORMAL, "  r            : raw, the key is interpreted as raw block 3/4");
+    PrintAndLogEx(NORMAL, "  v            : verbose output");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "        hf iclass dump k 001122334455667B");
+    PrintAndLogEx(NORMAL, "        hf iclass dump k AAAAAAAAAAAAAAAA c 001122334455667B");
+    PrintAndLogEx(NORMAL, "        hf iclass dump k AAAAAAAAAAAAAAAA e");
+    return 0;
 }
 int usage_hf_iclass_clone(void) {
-	PrintAndLogEx(NORMAL, "Usage:  hf iclass clone f <tagfile.bin> b <first block> l <last block> k <KEY> c e|r");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "  f <filename>: specify a filename to clone from");
-	PrintAndLogEx(NORMAL, "  b <Block>   : The first block to clone as 2 hex symbols");
-	PrintAndLogEx(NORMAL, "  l <Last Blk>: Set the Data to write as 16 hex symbols");
-	PrintAndLogEx(NORMAL, "  k <Key>     : Access Key as 16 hex symbols or 1 hex to select key from memory");
-	PrintAndLogEx(NORMAL, "  c           : If 'c' is specified, the key set is assumed to be the credit key\n");
-	PrintAndLogEx(NORMAL, "  e           : If 'e' is specified, elite computations applied to key");
-	PrintAndLogEx(NORMAL, "  r           : If 'r' is specified, no computations applied to key");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "       hf iclass clone f iclass_tagdump-121345.bin b 06 l 1A k 1122334455667788 e");
-	PrintAndLogEx(NORMAL, "       hf iclass clone f iclass_tagdump-121345.bin b 05 l 19 k 0");
-	PrintAndLogEx(NORMAL, "       hf iclass clone f iclass_tagdump-121345.bin b 06 l 19 k 0 e");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage:  hf iclass clone f <tagfile.bin> b <first block> l <last block> k <KEY> c e|r");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "  f <filename>: specify a filename to clone from");
+    PrintAndLogEx(NORMAL, "  b <Block>   : The first block to clone as 2 hex symbols");
+    PrintAndLogEx(NORMAL, "  l <Last Blk>: Set the Data to write as 16 hex symbols");
+    PrintAndLogEx(NORMAL, "  k <Key>     : Access Key as 16 hex symbols or 1 hex to select key from memory");
+    PrintAndLogEx(NORMAL, "  c           : If 'c' is specified, the key set is assumed to be the credit key\n");
+    PrintAndLogEx(NORMAL, "  e           : If 'e' is specified, elite computations applied to key");
+    PrintAndLogEx(NORMAL, "  r           : If 'r' is specified, no computations applied to key");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "       hf iclass clone f iclass_tagdump-121345.bin b 06 l 1A k 1122334455667788 e");
+    PrintAndLogEx(NORMAL, "       hf iclass clone f iclass_tagdump-121345.bin b 05 l 19 k 0");
+    PrintAndLogEx(NORMAL, "       hf iclass clone f iclass_tagdump-121345.bin b 06 l 19 k 0 e");
+    return 0;
 }
 int usage_hf_iclass_writeblock(void) {
-	PrintAndLogEx(NORMAL, "Usage:  hf iclass writeblk b <block> d <data> k <key> [c|e|r|v]\n");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "  b <Block> : The block number as 2 hex symbols");
-	PrintAndLogEx(NORMAL, "  d <data>  : set the Data to write as 16 hex symbols");
-	PrintAndLogEx(NORMAL, "  k <Key>   : access Key as 16 hex symbols or 1 hex to select key from memory");
-	PrintAndLogEx(NORMAL, "  c         : credit key assumed\n");
-	PrintAndLogEx(NORMAL, "  e         : elite computations applied to key");
-	PrintAndLogEx(NORMAL, "  r         : raw, no computations applied to key");
-	PrintAndLogEx(NORMAL, "  v         : verbose output");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        hf iclass writeblk b 0A d AAAAAAAAAAAAAAAA k 001122334455667B");
-	PrintAndLogEx(NORMAL, "        hf iclass writeblk b 1B d AAAAAAAAAAAAAAAA k 001122334455667B c");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage:  hf iclass writeblk b <block> d <data> k <key> [c|e|r|v]\n");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "  b <Block> : The block number as 2 hex symbols");
+    PrintAndLogEx(NORMAL, "  d <data>  : set the Data to write as 16 hex symbols");
+    PrintAndLogEx(NORMAL, "  k <Key>   : access Key as 16 hex symbols or 1 hex to select key from memory");
+    PrintAndLogEx(NORMAL, "  c         : credit key assumed\n");
+    PrintAndLogEx(NORMAL, "  e         : elite computations applied to key");
+    PrintAndLogEx(NORMAL, "  r         : raw, no computations applied to key");
+    PrintAndLogEx(NORMAL, "  v         : verbose output");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "        hf iclass writeblk b 0A d AAAAAAAAAAAAAAAA k 001122334455667B");
+    PrintAndLogEx(NORMAL, "        hf iclass writeblk b 1B d AAAAAAAAAAAAAAAA k 001122334455667B c");
+    return 0;
 }
 int usage_hf_iclass_readblock(void) {
-	PrintAndLogEx(NORMAL, "Usage:  hf iclass readblk b <block> k <key> [c|e|r|v]\n");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "  b <block> : The block number as 2 hex symbols");
-	PrintAndLogEx(NORMAL, "  k <key>   : Access Key as 16 hex symbols or 1 hex to select key from memory");
-	PrintAndLogEx(NORMAL, "  c         : credit key assumed\n");
-	PrintAndLogEx(NORMAL, "  e         : elite computations applied to key");
-	PrintAndLogEx(NORMAL, "  r         : raw, no computations applied to key");
-	PrintAndLogEx(NORMAL, "  v         : verbose output");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        hf iclass readblk b 06 k 0011223344556677");
-	PrintAndLogEx(NORMAL, "        hf iclass readblk b 1B k 0011223344556677 c");
-	PrintAndLogEx(NORMAL, "        hf iclass readblk b 0A k 0");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage:  hf iclass readblk b <block> k <key> [c|e|r|v]\n");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "  b <block> : The block number as 2 hex symbols");
+    PrintAndLogEx(NORMAL, "  k <key>   : Access Key as 16 hex symbols or 1 hex to select key from memory");
+    PrintAndLogEx(NORMAL, "  c         : credit key assumed\n");
+    PrintAndLogEx(NORMAL, "  e         : elite computations applied to key");
+    PrintAndLogEx(NORMAL, "  r         : raw, no computations applied to key");
+    PrintAndLogEx(NORMAL, "  v         : verbose output");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "        hf iclass readblk b 06 k 0011223344556677");
+    PrintAndLogEx(NORMAL, "        hf iclass readblk b 1B k 0011223344556677 c");
+    PrintAndLogEx(NORMAL, "        hf iclass readblk b 0A k 0");
+    return 0;
 }
 int usage_hf_iclass_readtagfile() {
-	PrintAndLogEx(NORMAL, "Usage: hf iclass readtagfile <filename> [startblock] [endblock]");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage: hf iclass readtagfile <filename> [startblock] [endblock]");
+    return 0;
 }
 int usage_hf_iclass_calc_newkey(void) {
-	PrintAndLogEx(NORMAL, "Calculate new key for updating\n");
-	PrintAndLogEx(NORMAL, "Usage:  hf iclass calc_newkey o <Old key> n <New key> s [csn] e");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "  o <oldkey> : *specify a key as 16 hex symbols or a key number as 1 symbol");
-	PrintAndLogEx(NORMAL, "  n <newkey> : *specify a key as 16 hex symbols or a key number as 1 symbol");
-	PrintAndLogEx(NORMAL, "  s <csn>    : specify a card Serial number to diversify the key (if omitted will attempt to read a csn)");
-	PrintAndLogEx(NORMAL, "  e          : specify new key as elite calc");
-	PrintAndLogEx(NORMAL, "  ee         : specify old and new key as elite calc");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, " e key to e key given csn  : hf iclass calcnewkey o 1122334455667788 n 2233445566778899 s deadbeafdeadbeaf ee");
-	PrintAndLogEx(NORMAL, " std key to e key read csn : hf iclass calcnewkey o 1122334455667788 n 2233445566778899 e");
-	PrintAndLogEx(NORMAL, " std to std read csn       : hf iclass calcnewkey o 1122334455667788 n 2233445566778899");
-	PrintAndLogEx(NORMAL, "\nNOTE: * = required\n");
-	return 0;
+    PrintAndLogEx(NORMAL, "Calculate new key for updating\n");
+    PrintAndLogEx(NORMAL, "Usage:  hf iclass calc_newkey o <Old key> n <New key> s [csn] e");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "  o <oldkey> : *specify a key as 16 hex symbols or a key number as 1 symbol");
+    PrintAndLogEx(NORMAL, "  n <newkey> : *specify a key as 16 hex symbols or a key number as 1 symbol");
+    PrintAndLogEx(NORMAL, "  s <csn>    : specify a card Serial number to diversify the key (if omitted will attempt to read a csn)");
+    PrintAndLogEx(NORMAL, "  e          : specify new key as elite calc");
+    PrintAndLogEx(NORMAL, "  ee         : specify old and new key as elite calc");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, " e key to e key given csn  : hf iclass calcnewkey o 1122334455667788 n 2233445566778899 s deadbeafdeadbeaf ee");
+    PrintAndLogEx(NORMAL, " std key to e key read csn : hf iclass calcnewkey o 1122334455667788 n 2233445566778899 e");
+    PrintAndLogEx(NORMAL, " std to std read csn       : hf iclass calcnewkey o 1122334455667788 n 2233445566778899");
+    PrintAndLogEx(NORMAL, "\nNOTE: * = required\n");
+    return 0;
 }
 int usage_hf_iclass_managekeys(void) {
-	PrintAndLogEx(NORMAL, "HELP :  Manage iClass Keys in client memory:\n");
-	PrintAndLogEx(NORMAL, "Usage:  hf iclass managekeys n [keynbr] k [key] f [filename] s l p\n");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "  n <keynbr>  : specify the keyNbr to set in memory");
-	PrintAndLogEx(NORMAL, "  k <key>     : set a key in memory");
-	PrintAndLogEx(NORMAL, "  f <filename>: specify a filename to use with load or save operations");
-	PrintAndLogEx(NORMAL, "  s           : save keys in memory to file specified by filename");
-	PrintAndLogEx(NORMAL, "  l           : load keys to memory from file specified by filename");
-	PrintAndLogEx(NORMAL, "  p           : print keys loaded into memory\n");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, " set key      : hf iclass managekeys n 0 k 1122334455667788");
-	PrintAndLogEx(NORMAL, " save key file: hf iclass managekeys f mykeys.bin s");
-	PrintAndLogEx(NORMAL, " load key file: hf iclass managekeys f mykeys.bin l");
-	PrintAndLogEx(NORMAL, " print keys   : hf iclass managekeys p\n");
-	return 0;
+    PrintAndLogEx(NORMAL, "HELP :  Manage iClass Keys in client memory:\n");
+    PrintAndLogEx(NORMAL, "Usage:  hf iclass managekeys n [keynbr] k [key] f [filename] s l p\n");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "  n <keynbr>  : specify the keyNbr to set in memory");
+    PrintAndLogEx(NORMAL, "  k <key>     : set a key in memory");
+    PrintAndLogEx(NORMAL, "  f <filename>: specify a filename to use with load or save operations");
+    PrintAndLogEx(NORMAL, "  s           : save keys in memory to file specified by filename");
+    PrintAndLogEx(NORMAL, "  l           : load keys to memory from file specified by filename");
+    PrintAndLogEx(NORMAL, "  p           : print keys loaded into memory\n");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, " set key      : hf iclass managekeys n 0 k 1122334455667788");
+    PrintAndLogEx(NORMAL, " save key file: hf iclass managekeys f mykeys.bin s");
+    PrintAndLogEx(NORMAL, " load key file: hf iclass managekeys f mykeys.bin l");
+    PrintAndLogEx(NORMAL, " print keys   : hf iclass managekeys p\n");
+    return 0;
 }
 int usage_hf_iclass_reader(void) {
-	PrintAndLogEx(NORMAL, "Act as a Iclass reader.  Look for iClass tags until a key or the pm3 button is pressed\n");
-	PrintAndLogEx(NORMAL, "Usage:  hf iclass reader [h] [1]\n");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "    h   This help text");
-	PrintAndLogEx(NORMAL, "    1   read only 1 tag");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        hf iclass reader 1");
-	return 0;
+    PrintAndLogEx(NORMAL, "Act as a Iclass reader.  Look for iClass tags until a key or the pm3 button is pressed\n");
+    PrintAndLogEx(NORMAL, "Usage:  hf iclass reader [h] [1]\n");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "    h   This help text");
+    PrintAndLogEx(NORMAL, "    1   read only 1 tag");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "        hf iclass reader 1");
+    return 0;
 }
 int usage_hf_iclass_replay(void) {
-	PrintAndLogEx(NORMAL, "Replay a collected mac message");
-	PrintAndLogEx(NORMAL, "Usage:  hf iclass replay [h] <mac>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "    h       This help text");
-	PrintAndLogEx(NORMAL, "    <mac>   Mac bytes to replay (8 hexsymbols)");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        hf iclass replay 00112233");
-	return 0;
+    PrintAndLogEx(NORMAL, "Replay a collected mac message");
+    PrintAndLogEx(NORMAL, "Usage:  hf iclass replay [h] <mac>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "    h       This help text");
+    PrintAndLogEx(NORMAL, "    <mac>   Mac bytes to replay (8 hexsymbols)");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "        hf iclass replay 00112233");
+    return 0;
 }
 int usage_hf_iclass_sniff(void) {
-	PrintAndLogEx(NORMAL, "Sniff the communication between reader and tag");
-	PrintAndLogEx(NORMAL, "Usage:  hf iclass sniff [h]");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "		 hf iclass sniff");
-	return 0;
+    PrintAndLogEx(NORMAL, "Sniff the communication between reader and tag");
+    PrintAndLogEx(NORMAL, "Usage:  hf iclass sniff [h]");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "         hf iclass sniff");
+    return 0;
 }
 int usage_hf_iclass_loclass(void) {
-	PrintAndLogEx(NORMAL, "Usage: hf iclass loclass [options]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "h             Show this help");
-	PrintAndLogEx(NORMAL, "t             Perform self-test");
-	PrintAndLogEx(NORMAL, "f <filename>  Bruteforce iclass dumpfile");
-	PrintAndLogEx(NORMAL, "                   An iclass dumpfile is assumed to consist of an arbitrary number of");
-	PrintAndLogEx(NORMAL, "                   malicious CSNs, and their protocol responses");
-	PrintAndLogEx(NORMAL, "                   The binary format of the file is expected to be as follows: ");
-	PrintAndLogEx(NORMAL, "                   <8 byte CSN><8 byte CC><4 byte NR><4 byte MAC>");
-	PrintAndLogEx(NORMAL, "                   <8 byte CSN><8 byte CC><4 byte NR><4 byte MAC>");
-	PrintAndLogEx(NORMAL, "                   <8 byte CSN><8 byte CC><4 byte NR><4 byte MAC>");
-	PrintAndLogEx(NORMAL, "                  ... totalling N*24 bytes");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage: hf iclass loclass [options]");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "h             Show this help");
+    PrintAndLogEx(NORMAL, "t             Perform self-test");
+    PrintAndLogEx(NORMAL, "f <filename>  Bruteforce iclass dumpfile");
+    PrintAndLogEx(NORMAL, "                   An iclass dumpfile is assumed to consist of an arbitrary number of");
+    PrintAndLogEx(NORMAL, "                   malicious CSNs, and their protocol responses");
+    PrintAndLogEx(NORMAL, "                   The binary format of the file is expected to be as follows: ");
+    PrintAndLogEx(NORMAL, "                   <8 byte CSN><8 byte CC><4 byte NR><4 byte MAC>");
+    PrintAndLogEx(NORMAL, "                   <8 byte CSN><8 byte CC><4 byte NR><4 byte MAC>");
+    PrintAndLogEx(NORMAL, "                   <8 byte CSN><8 byte CC><4 byte NR><4 byte MAC>");
+    PrintAndLogEx(NORMAL, "                  ... totalling N*24 bytes");
+    return 0;
 }
 int usage_hf_iclass_chk(void) {
-	PrintAndLogEx(NORMAL, "Checkkeys loads a dictionary text file with 8byte hex keys to test authenticating against a iClass tag");
-	PrintAndLogEx(NORMAL, "Usage: hf iclass chk [h|e|r] [f  (*.dic)]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h             Show this help");
-	PrintAndLogEx(NORMAL, "      f <filename>  Dictionary file with default iclass keys");
-	PrintAndLogEx(NORMAL, "      r             raw");
-	PrintAndLogEx(NORMAL, "      e             elite");
-	PrintAndLogEx(NORMAL, "      c             credit key  (if not use, default is debit)");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "		 hf iclass chk f default_iclass_keys.dic");
-	PrintAndLogEx(NORMAL, "		 hf iclass chk f default_iclass_keys.dic e");
-	return 0;
+    PrintAndLogEx(NORMAL, "Checkkeys loads a dictionary text file with 8byte hex keys to test authenticating against a iClass tag");
+    PrintAndLogEx(NORMAL, "Usage: hf iclass chk [h|e|r] [f  (*.dic)]");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "      h             Show this help");
+    PrintAndLogEx(NORMAL, "      f <filename>  Dictionary file with default iclass keys");
+    PrintAndLogEx(NORMAL, "      r             raw");
+    PrintAndLogEx(NORMAL, "      e             elite");
+    PrintAndLogEx(NORMAL, "      c             credit key  (if not use, default is debit)");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "         hf iclass chk f default_iclass_keys.dic");
+    PrintAndLogEx(NORMAL, "         hf iclass chk f default_iclass_keys.dic e");
+    return 0;
 }
 int usage_hf_iclass_lookup(void) {
-	PrintAndLogEx(NORMAL, "Lookup keys takes some sniffed trace data and tries to verify what key was used against a dictionary file");
-	PrintAndLogEx(NORMAL, "Usage: hf iclass lookup [h|e|r] [f  (*.dic)] [u <csn>] [p <epurse>] [m <macs>]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h             Show this help");
-	PrintAndLogEx(NORMAL, "      f <filename>  Dictionary file with default iclass keys");
-	PrintAndLogEx(NORMAL, "      u             CSN");
-	PrintAndLogEx(NORMAL, "      p             EPURSE");
-	PrintAndLogEx(NORMAL, "      m             macs");
-	PrintAndLogEx(NORMAL, "      r             raw");
-	PrintAndLogEx(NORMAL, "      e             elite");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        hf iclass lookup u 9655a400f8ff12e0 p f0ffffffffffffff m 0000000089cb984b f default_iclass_keys.dic");
-	PrintAndLogEx(NORMAL, "        hf iclass lookup u 9655a400f8ff12e0 p f0ffffffffffffff m 0000000089cb984b f default_iclass_keys.dic e");
-	return 0;
+    PrintAndLogEx(NORMAL, "Lookup keys takes some sniffed trace data and tries to verify what key was used against a dictionary file");
+    PrintAndLogEx(NORMAL, "Usage: hf iclass lookup [h|e|r] [f  (*.dic)] [u <csn>] [p <epurse>] [m <macs>]");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "      h             Show this help");
+    PrintAndLogEx(NORMAL, "      f <filename>  Dictionary file with default iclass keys");
+    PrintAndLogEx(NORMAL, "      u             CSN");
+    PrintAndLogEx(NORMAL, "      p             EPURSE");
+    PrintAndLogEx(NORMAL, "      m             macs");
+    PrintAndLogEx(NORMAL, "      r             raw");
+    PrintAndLogEx(NORMAL, "      e             elite");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "        hf iclass lookup u 9655a400f8ff12e0 p f0ffffffffffffff m 0000000089cb984b f default_iclass_keys.dic");
+    PrintAndLogEx(NORMAL, "        hf iclass lookup u 9655a400f8ff12e0 p f0ffffffffffffff m 0000000089cb984b f default_iclass_keys.dic e");
+    return 0;
 }
 int usage_hf_iclass_permutekey(void){
-	PrintAndLogEx(NORMAL, "Permute function from 'heart of darkness' paper.");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  hf iclass permute [h] <r|f> <bytes>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "           h          This help");
-	PrintAndLogEx(NORMAL, "           r          reverse permuted key");
-	PrintAndLogEx(NORMAL, "           f          permute key");
-	PrintAndLogEx(NORMAL, "           <bytes>    input bytes");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      hf iclass permute r 0123456789abcdef");
-	return 0;
+    PrintAndLogEx(NORMAL, "Permute function from 'heart of darkness' paper.");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  hf iclass permute [h] <r|f> <bytes>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "           h          This help");
+    PrintAndLogEx(NORMAL, "           r          reverse permuted key");
+    PrintAndLogEx(NORMAL, "           f          permute key");
+    PrintAndLogEx(NORMAL, "           <bytes>    input bytes");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      hf iclass permute r 0123456789abcdef");
+    return 0;
 }
 
 int xorbits_8(uint8_t val) {
-	uint8_t res = val ^ (val >> 1); //1st pass
-	res = res ^ (res >> 1); 		// 2nd pass
-	res = res ^ (res >> 2); 		// 3rd pass
-	res = res ^ (res >> 4); 			// 4th pass
-	return res & 1;
+    uint8_t res = val ^ (val >> 1); //1st pass
+    res = res ^ (res >> 1);         // 2nd pass
+    res = res ^ (res >> 2);         // 3rd pass
+    res = res ^ (res >> 4);         // 4th pass
+    return res & 1;
 }
 
 int CmdHFiClassList(const char *Cmd) {
-	//PrintAndLogEx(NORMAL, "Deprecated command, use 'hf list iclass' instead");
-	CmdTraceList("iclass");
-	return 0;
+    //PrintAndLogEx(NORMAL, "Deprecated command, use 'hf list iclass' instead");
+    CmdTraceList("iclass");
+    return 0;
 }
 
 int CmdHFiClassSniff(const char *Cmd) {
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if (cmdp == 'h' ) return usage_hf_iclass_sniff();
-	UsbCommand c = {CMD_SNOOP_ICLASS};
-	SendCommand(&c);
-	return 0;
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (cmdp == 'h' ) return usage_hf_iclass_sniff();
+    UsbCommand c = {CMD_SNOOP_ICLASS};
+    SendCommand(&c);
+    return 0;
 }
 
 int CmdHFiClassSim(const char *Cmd) {
 
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if (strlen(Cmd) < 1 || cmdp == 'h') return usage_hf_iclass_sim();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) < 1 || cmdp == 'h') return usage_hf_iclass_sim();
 
-	uint8_t simType = 0;
-	uint8_t CSN[8] = {0, 0, 0, 0, 0, 0, 0, 0};
+    uint8_t simType = 0;
+    uint8_t CSN[8] = {0, 0, 0, 0, 0, 0, 0, 0};
 
-	simType = param_get8ex(Cmd, 0, 0, 10);
+    simType = param_get8ex(Cmd, 0, 0, 10);
 
-	if (simType == 0) {
-		if (param_gethex(Cmd, 1, CSN, 16)) {
-			PrintAndLogEx(WARNING, "A CSN should consist of 16 HEX symbols");
-			return usage_hf_iclass_sim();
-		}
-		PrintAndLogEx(NORMAL, "--simtype:%02x csn:%s", simType, sprint_hex(CSN, 8));
-	}
+    if (simType == 0) {
+        if (param_gethex(Cmd, 1, CSN, 16)) {
+            PrintAndLogEx(WARNING, "A CSN should consist of 16 HEX symbols");
+            return usage_hf_iclass_sim();
+        }
+        PrintAndLogEx(NORMAL, "--simtype:%02x csn:%s", simType, sprint_hex(CSN, 8));
+    }
 
-	if (simType > 4) {
-		PrintAndLogEx(WARNING, "Undefined simptype %d", simType);
-		return usage_hf_iclass_sim();
-	}
+    if (simType > 4) {
+        PrintAndLogEx(WARNING, "Undefined simptype %d", simType);
+        return usage_hf_iclass_sim();
+    }
 
-	uint8_t numberOfCSNs = 0;
+    uint8_t numberOfCSNs = 0;
 
 /*
-		// pre-defined 8 CSN by Holiman
-		uint8_t csns[8*NUM_CSNS] = {
-			0x00, 0x0B, 0x0F, 0xFF, 0xF7, 0xFF, 0x12, 0xE0,
-			0x00, 0x13, 0x94, 0x7E, 0x76, 0xFF, 0x12, 0xE0,
-			0x2A, 0x99, 0xAC, 0x79, 0xEC, 0xFF, 0x12, 0xE0,
-			0x17, 0x12, 0x01, 0xFD, 0xF7, 0xFF, 0x12, 0xE0,
-			0xCD, 0x56, 0x01, 0x7C, 0x6F, 0xFF, 0x12, 0xE0,
-			0x4B, 0x5E, 0x0B, 0x72, 0xEF, 0xFF, 0x12, 0xE0,
-			0x00, 0x73, 0xD8, 0x75, 0x58, 0xFF, 0x12, 0xE0,
-			0x0C, 0x90, 0x32, 0xF3, 0x5D, 0xFF, 0x12, 0xE0
-		};
+        // pre-defined 8 CSN by Holiman
+        uint8_t csns[8*NUM_CSNS] = {
+            0x00, 0x0B, 0x0F, 0xFF, 0xF7, 0xFF, 0x12, 0xE0,
+            0x00, 0x13, 0x94, 0x7E, 0x76, 0xFF, 0x12, 0xE0,
+            0x2A, 0x99, 0xAC, 0x79, 0xEC, 0xFF, 0x12, 0xE0,
+            0x17, 0x12, 0x01, 0xFD, 0xF7, 0xFF, 0x12, 0xE0,
+            0xCD, 0x56, 0x01, 0x7C, 0x6F, 0xFF, 0x12, 0xE0,
+            0x4B, 0x5E, 0x0B, 0x72, 0xEF, 0xFF, 0x12, 0xE0,
+            0x00, 0x73, 0xD8, 0x75, 0x58, 0xFF, 0x12, 0xE0,
+            0x0C, 0x90, 0x32, 0xF3, 0x5D, 0xFF, 0x12, 0xE0
+        };
 */
 /*
-		pre-defined 9 CSN by iceman
-		only one csn depend on several others.
-		six depends only on the first csn,  (0,1, 0x45)
+        pre-defined 9 CSN by iceman
+        only one csn depend on several others.
+        six depends only on the first csn,  (0,1, 0x45)
 */
-		uint8_t csns[8*NUM_CSNS] = {
-			0x01, 0x0A, 0x0F, 0xFF, 0xF7, 0xFF, 0x12, 0xE0,
-			0x0C, 0x06, 0x0C, 0xFE, 0xF7, 0xFF, 0x12, 0xE0,
-			0x10, 0x97, 0x83, 0x7B, 0xF7, 0xFF, 0x12, 0xE0,
-			0x13, 0x97, 0x82, 0x7A, 0xF7, 0xFF, 0x12, 0xE0,
-			0x07, 0x0E, 0x0D, 0xF9, 0xF7, 0xFF, 0x12, 0xE0,
-			0x14, 0x96, 0x84, 0x76, 0xF7, 0xFF, 0x12, 0xE0,
-			0x17, 0x96, 0x85, 0x71, 0xF7, 0xFF, 0x12, 0xE0,
-			0xCE, 0xC5, 0x0F, 0x77, 0xF7, 0xFF, 0x12, 0xE0,
-			0xD2, 0x5A, 0x82, 0xF8, 0xF7, 0xFF, 0x12, 0xE0
-			//0x04, 0x08, 0x9F, 0x78, 0x6E, 0xFF, 0x12, 0xE0
-		};
+        uint8_t csns[8*NUM_CSNS] = {
+            0x01, 0x0A, 0x0F, 0xFF, 0xF7, 0xFF, 0x12, 0xE0,
+            0x0C, 0x06, 0x0C, 0xFE, 0xF7, 0xFF, 0x12, 0xE0,
+            0x10, 0x97, 0x83, 0x7B, 0xF7, 0xFF, 0x12, 0xE0,
+            0x13, 0x97, 0x82, 0x7A, 0xF7, 0xFF, 0x12, 0xE0,
+            0x07, 0x0E, 0x0D, 0xF9, 0xF7, 0xFF, 0x12, 0xE0,
+            0x14, 0x96, 0x84, 0x76, 0xF7, 0xFF, 0x12, 0xE0,
+            0x17, 0x96, 0x85, 0x71, 0xF7, 0xFF, 0x12, 0xE0,
+            0xCE, 0xC5, 0x0F, 0x77, 0xF7, 0xFF, 0x12, 0xE0,
+            0xD2, 0x5A, 0x82, 0xF8, 0xF7, 0xFF, 0x12, 0xE0
+            //0x04, 0x08, 0x9F, 0x78, 0x6E, 0xFF, 0x12, 0xE0
+        };
 /*
-		// pre-defined 15 CSN by Carl55
-		// remember to change the define NUM_CSNS to match.
-		uint8_t csns[8*NUM_CSNS] = {
-			0x00, 0x0B, 0x0F, 0xFF, 0xF7, 0xFF, 0x12, 0xE0,
-			0x00, 0x04, 0x0E, 0x08, 0xF7, 0xFF, 0x12, 0xE0,
-			0x00, 0x09, 0x0D, 0x05, 0xF7, 0xFF, 0x12, 0xE0,
-			0x00, 0x0A, 0x0C, 0x06, 0xF7, 0xFF, 0x12, 0xE0,
-			0x00, 0x0F, 0x0B, 0x03, 0xF7, 0xFF, 0x12, 0xE0,
-			0x00, 0x08, 0x0A, 0x0C, 0xF7, 0xFF, 0x12, 0xE0,
-			0x00, 0x0D, 0x09, 0x09, 0xF7, 0xFF, 0x12, 0xE0,
-			0x00, 0x0E, 0x08, 0x0A, 0xF7, 0xFF, 0x12, 0xE0,
-			0x00, 0x03, 0x07, 0x17, 0xF7, 0xFF, 0x12, 0xE0,
-			0x00, 0x3C, 0x06, 0xE0, 0xF7, 0xFF, 0x12, 0xE0,
-			0x00, 0x01, 0x05, 0x1D, 0xF7, 0xFF, 0x12, 0xE0,
-			0x00, 0x02, 0x04, 0x1E, 0xF7, 0xFF, 0x12, 0xE0,
-			0x00, 0x07, 0x03, 0x1B, 0xF7, 0xFF, 0x12, 0xE0,
-			0x00, 0x00, 0x02, 0x24, 0xF7, 0xFF, 0x12, 0xE0,
-			0x00, 0x05, 0x01, 0x21, 0xF7, 0xFF, 0x12, 0xE0
-		};
+        // pre-defined 15 CSN by Carl55
+        // remember to change the define NUM_CSNS to match.
+        uint8_t csns[8*NUM_CSNS] = {
+            0x00, 0x0B, 0x0F, 0xFF, 0xF7, 0xFF, 0x12, 0xE0,
+            0x00, 0x04, 0x0E, 0x08, 0xF7, 0xFF, 0x12, 0xE0,
+            0x00, 0x09, 0x0D, 0x05, 0xF7, 0xFF, 0x12, 0xE0,
+            0x00, 0x0A, 0x0C, 0x06, 0xF7, 0xFF, 0x12, 0xE0,
+            0x00, 0x0F, 0x0B, 0x03, 0xF7, 0xFF, 0x12, 0xE0,
+            0x00, 0x08, 0x0A, 0x0C, 0xF7, 0xFF, 0x12, 0xE0,
+            0x00, 0x0D, 0x09, 0x09, 0xF7, 0xFF, 0x12, 0xE0,
+            0x00, 0x0E, 0x08, 0x0A, 0xF7, 0xFF, 0x12, 0xE0,
+            0x00, 0x03, 0x07, 0x17, 0xF7, 0xFF, 0x12, 0xE0,
+            0x00, 0x3C, 0x06, 0xE0, 0xF7, 0xFF, 0x12, 0xE0,
+            0x00, 0x01, 0x05, 0x1D, 0xF7, 0xFF, 0x12, 0xE0,
+            0x00, 0x02, 0x04, 0x1E, 0xF7, 0xFF, 0x12, 0xE0,
+            0x00, 0x07, 0x03, 0x1B, 0xF7, 0xFF, 0x12, 0xE0,
+            0x00, 0x00, 0x02, 0x24, 0xF7, 0xFF, 0x12, 0xE0,
+            0x00, 0x05, 0x01, 0x21, 0xF7, 0xFF, 0x12, 0xE0
+        };
 */
 
 /* DUMPFILE FORMAT:
@@ -371,2138 +371,2138 @@ int CmdHFiClassSim(const char *Cmd) {
  * <4 byte NR><4 byte MAC>
  * CC are all zeroes, CSN is the same as was sent in
  **/
-	uint8_t tries = 0;
+    uint8_t tries = 0;
 
-	switch(simType) {
+    switch(simType) {
 
-		case 2: {
-			PrintAndLogEx(INFO, "Starting iCLASS sim 2 attack (elite mode)");
-			PrintAndLogEx(INFO, "press keyboard to cancel");
-			UsbCommand c = {CMD_SIMULATE_TAG_ICLASS, {simType, NUM_CSNS}};
-			UsbCommand resp = {0};
-			memcpy(c.d.asBytes, csns, 8 * NUM_CSNS);
-			clearCommandBuffer();
-			SendCommand(&c);
+        case 2: {
+            PrintAndLogEx(INFO, "Starting iCLASS sim 2 attack (elite mode)");
+            PrintAndLogEx(INFO, "press keyboard to cancel");
+            UsbCommand c = {CMD_SIMULATE_TAG_ICLASS, {simType, NUM_CSNS}};
+            UsbCommand resp = {0};
+            memcpy(c.d.asBytes, csns, 8 * NUM_CSNS);
+            clearCommandBuffer();
+            SendCommand(&c);
 
-			while ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
-				tries++;
-				if (ukbhit()) {
-					int gc = getchar(); (void)gc;
-					PrintAndLogEx(WARNING, "\naborted via keyboard.");
-					return 0;
-				}
-				if ( tries > 20) {
-					PrintAndLogEx(WARNING, "\ntimeout while waiting for reply.");
-					return 0;
-				}
-			}
-			uint8_t num_mac  = resp.arg[1];
-			bool success = ( NUM_CSNS == num_mac );
-			PrintAndLogEx(NORMAL, "[%c] %d out of %d MAC obtained [%s]", (success) ? '+':'!', num_mac, NUM_CSNS, (success) ? "OK" : "FAIL");
+            while ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
+                tries++;
+                if (ukbhit()) {
+                    int gc = getchar(); (void)gc;
+                    PrintAndLogEx(WARNING, "\naborted via keyboard.");
+                    return 0;
+                }
+                if ( tries > 20) {
+                    PrintAndLogEx(WARNING, "\ntimeout while waiting for reply.");
+                    return 0;
+                }
+            }
+            uint8_t num_mac  = resp.arg[1];
+            bool success = ( NUM_CSNS == num_mac );
+            PrintAndLogEx(NORMAL, "[%c] %d out of %d MAC obtained [%s]", (success) ? '+':'!', num_mac, NUM_CSNS, (success) ? "OK" : "FAIL");
 
-			if ( num_mac == 0 )
-				break;
+            if ( num_mac == 0 )
+                break;
 
-			size_t datalen = NUM_CSNS * 24;
-			void* dump = calloc(datalen, sizeof(uint8_t));
-			if ( !dump ) {
-				PrintAndLogEx(WARNING, "Failed to allocate memory");
-				return 2;
-			}
+            size_t datalen = NUM_CSNS * 24;
+            void* dump = calloc(datalen, sizeof(uint8_t));
+            if ( !dump ) {
+                PrintAndLogEx(WARNING, "Failed to allocate memory");
+                return 2;
+            }
 
-			memset(dump, 0, datalen);//<-- Need zeroes for the EPURSE - field (offical)
+            memset(dump, 0, datalen);//<-- Need zeroes for the EPURSE - field (offical)
 
-			uint8_t i = 0;
-			for (i = 0 ; i < NUM_CSNS ; i++) {
-				//copy CSN
-				memcpy(dump + i*24, csns + i*8, 8);
-				//copy epurse
-				memcpy(dump + i*24 + 8, resp.d.asBytes + i*16, 8);
-				// NR_MAC (eight bytes from the response)  ( 8b csn + 8b epurse == 16)
-				memcpy(dump + i*24 + 16, resp.d.asBytes + i*16 + 8, 8);
-			}
-			/** Now, save to dumpfile **/
-			saveFile("iclass_mac_attack", "bin", dump, datalen);
-			free(dump);
-			break;
-		}
-		case 4: {
-			// reader in key roll mode,  when it has two keys it alternates when trying to verify.
-			PrintAndLogEx(INFO, "Starting iCLASS sim 4 attack (elite mode, reader in key roll mode)");
-			PrintAndLogEx(INFO, "press keyboard to cancel");
-			UsbCommand c = {CMD_SIMULATE_TAG_ICLASS, {simType, NUM_CSNS}};
-			UsbCommand resp = {0};
-			memcpy(c.d.asBytes, csns, 8*NUM_CSNS);
-			clearCommandBuffer();
-			SendCommand(&c);
+            uint8_t i = 0;
+            for (i = 0 ; i < NUM_CSNS ; i++) {
+                //copy CSN
+                memcpy(dump + i*24, csns + i*8, 8);
+                //copy epurse
+                memcpy(dump + i*24 + 8, resp.d.asBytes + i*16, 8);
+                // NR_MAC (eight bytes from the response)  ( 8b csn + 8b epurse == 16)
+                memcpy(dump + i*24 + 16, resp.d.asBytes + i*16 + 8, 8);
+            }
+            /** Now, save to dumpfile **/
+            saveFile("iclass_mac_attack", "bin", dump, datalen);
+            free(dump);
+            break;
+        }
+        case 4: {
+            // reader in key roll mode,  when it has two keys it alternates when trying to verify.
+            PrintAndLogEx(INFO, "Starting iCLASS sim 4 attack (elite mode, reader in key roll mode)");
+            PrintAndLogEx(INFO, "press keyboard to cancel");
+            UsbCommand c = {CMD_SIMULATE_TAG_ICLASS, {simType, NUM_CSNS}};
+            UsbCommand resp = {0};
+            memcpy(c.d.asBytes, csns, 8*NUM_CSNS);
+            clearCommandBuffer();
+            SendCommand(&c);
 
-			while ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
-				tries++;
-				if (ukbhit()) {
-					int gc = getchar(); (void)gc;
-					PrintAndLogEx(WARNING, "\naborted via keyboard.");
-					return 0;
-				}
-				if ( tries > 20) {
-					PrintAndLogEx(WARNING, "\ntimeout while waiting for reply.");
-					return 0;
-				}
-			}
-			uint8_t num_mac = resp.arg[1];
-			bool success = ( (NUM_CSNS * 2) == num_mac );
-			PrintAndLogEx(NORMAL, "[%c] %d out of %d MAC obtained [%s]", (success) ? '+':'!', num_mac, NUM_CSNS*2, (success) ? "OK" : "FAIL");
+            while ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
+                tries++;
+                if (ukbhit()) {
+                    int gc = getchar(); (void)gc;
+                    PrintAndLogEx(WARNING, "\naborted via keyboard.");
+                    return 0;
+                }
+                if ( tries > 20) {
+                    PrintAndLogEx(WARNING, "\ntimeout while waiting for reply.");
+                    return 0;
+                }
+            }
+            uint8_t num_mac = resp.arg[1];
+            bool success = ( (NUM_CSNS * 2) == num_mac );
+            PrintAndLogEx(NORMAL, "[%c] %d out of %d MAC obtained [%s]", (success) ? '+':'!', num_mac, NUM_CSNS*2, (success) ? "OK" : "FAIL");
 
-			if ( num_mac == 0 )
-				break;
+            if ( num_mac == 0 )
+                break;
 
-			size_t datalen = NUM_CSNS * 24;
-			void* dump = calloc(datalen, sizeof(uint8_t));
-			if ( !dump ) {
-				PrintAndLogEx(WARNING, "Failed to allocate memory");
-				return 2;
-			}
+            size_t datalen = NUM_CSNS * 24;
+            void* dump = calloc(datalen, sizeof(uint8_t));
+            if ( !dump ) {
+                PrintAndLogEx(WARNING, "Failed to allocate memory");
+                return 2;
+            }
 
-			#define MAC_ITEM_SIZE 24
+            #define MAC_ITEM_SIZE 24
 
-			//KEYROLL 1
-			//Need zeroes for the CC-field
-			memset(dump, 0, datalen);
-			for (uint8_t i = 0; i < NUM_CSNS ; i++) {
-				// copy CSN
-				memcpy(dump + i*MAC_ITEM_SIZE, csns + i*8, 8); //CSN
-				// copy EPURSE
-				memcpy(dump + i*MAC_ITEM_SIZE + 8, resp.d.asBytes + i * 16, 8);
-				// copy NR_MAC (eight bytes from the response)  ( 8b csn + 8b epurse == 16)
-				memcpy(dump + i*MAC_ITEM_SIZE + 16, resp.d.asBytes + i * 16 + 8, 8);
-			}
-			saveFile("iclass_mac_attack_keyroll_A", "bin", dump, datalen);
+            //KEYROLL 1
+            //Need zeroes for the CC-field
+            memset(dump, 0, datalen);
+            for (uint8_t i = 0; i < NUM_CSNS ; i++) {
+                // copy CSN
+                memcpy(dump + i*MAC_ITEM_SIZE, csns + i*8, 8); //CSN
+                // copy EPURSE
+                memcpy(dump + i*MAC_ITEM_SIZE + 8, resp.d.asBytes + i * 16, 8);
+                // copy NR_MAC (eight bytes from the response)  ( 8b csn + 8b epurse == 16)
+                memcpy(dump + i*MAC_ITEM_SIZE + 16, resp.d.asBytes + i * 16 + 8, 8);
+            }
+            saveFile("iclass_mac_attack_keyroll_A", "bin", dump, datalen);
 
-			//KEYROLL 2
-			memset(dump, 0, datalen);
-			uint8_t resp_index = 0;
-			for (uint8_t i = 0; i < NUM_CSNS; i++) {
-				resp_index =  (i + NUM_CSNS) * 16;
-				// Copy CSN
-				memcpy(dump + i*MAC_ITEM_SIZE, csns + i*8, 8);
-				// copy EPURSE
-				memcpy(dump + i*MAC_ITEM_SIZE + 8, resp.d.asBytes + resp_index, 8);
-				// copy NR_MAC (eight bytes from the response)  ( 8b csn + 8 epurse == 16)
-				memcpy(dump + i*MAC_ITEM_SIZE + 16, resp.d.asBytes + resp_index + 8, 8);
-				resp_index++;
-			}
-			saveFile("iclass_mac_attack_keyroll_B", "bin", dump, datalen);
-			free(dump);
-			break;
-		}
-		case 1:
-		case 3:
-		default: {
-			UsbCommand c = {CMD_SIMULATE_TAG_ICLASS, {simType, numberOfCSNs}};
-			memcpy(c.d.asBytes, CSN, 8);
-			clearCommandBuffer();
-			SendCommand(&c);
-			break;
-		}
-	}
-	return 0;
+            //KEYROLL 2
+            memset(dump, 0, datalen);
+            uint8_t resp_index = 0;
+            for (uint8_t i = 0; i < NUM_CSNS; i++) {
+                resp_index =  (i + NUM_CSNS) * 16;
+                // Copy CSN
+                memcpy(dump + i*MAC_ITEM_SIZE, csns + i*8, 8);
+                // copy EPURSE
+                memcpy(dump + i*MAC_ITEM_SIZE + 8, resp.d.asBytes + resp_index, 8);
+                // copy NR_MAC (eight bytes from the response)  ( 8b csn + 8 epurse == 16)
+                memcpy(dump + i*MAC_ITEM_SIZE + 16, resp.d.asBytes + resp_index + 8, 8);
+                resp_index++;
+            }
+            saveFile("iclass_mac_attack_keyroll_B", "bin", dump, datalen);
+            free(dump);
+            break;
+        }
+        case 1:
+        case 3:
+        default: {
+            UsbCommand c = {CMD_SIMULATE_TAG_ICLASS, {simType, numberOfCSNs}};
+            memcpy(c.d.asBytes, CSN, 8);
+            clearCommandBuffer();
+            SendCommand(&c);
+            break;
+        }
+    }
+    return 0;
 }
 
 int HFiClassReader(const char *Cmd, bool loop, bool verbose) {
-	bool tagFound = false;
+    bool tagFound = false;
 
-	uint32_t flags = FLAG_ICLASS_READER_CSN | FLAG_ICLASS_READER_CC |  FLAG_ICLASS_READER_AIA |
-					FLAG_ICLASS_READER_CONF | FLAG_ICLASS_READER_ONLY_ONCE |
-					FLAG_ICLASS_READER_ONE_TRY;
+    uint32_t flags = FLAG_ICLASS_READER_CSN | FLAG_ICLASS_READER_CC |  FLAG_ICLASS_READER_AIA |
+                    FLAG_ICLASS_READER_CONF | FLAG_ICLASS_READER_ONLY_ONCE |
+                    FLAG_ICLASS_READER_ONE_TRY;
 
-	UsbCommand c = {CMD_READER_ICLASS, {flags, 0, 0}};
-	// loop in client not device - else on windows have a communication error
-	UsbCommand resp;
-	while (!ukbhit()){
+    UsbCommand c = {CMD_READER_ICLASS, {flags, 0, 0}};
+    // loop in client not device - else on windows have a communication error
+    UsbCommand resp;
+    while (!ukbhit()){
 
-		clearCommandBuffer();
-		SendCommand(&c);
-		if (WaitForResponseTimeout(CMD_ACK,&resp, 4500)) {
-			uint8_t readStatus = resp.arg[0] & 0xff;
-			uint8_t *data = resp.d.asBytes;
+        clearCommandBuffer();
+        SendCommand(&c);
+        if (WaitForResponseTimeout(CMD_ACK,&resp, 4500)) {
+            uint8_t readStatus = resp.arg[0] & 0xff;
+            uint8_t *data = resp.d.asBytes;
 
-			if (verbose) PrintAndLogEx(NORMAL, "Readstatus:%02x", readStatus);
-			// no tag found or button pressed
-			if ( (readStatus == 0 && !loop) || readStatus == 0xFF) {
-				// abort
-				if (verbose) {
-					PrintAndLogEx(FAILED, "Quitting...");
-					DropField();
-					return 0;
-				}
-			}
-			if( readStatus & FLAG_ICLASS_READER_CSN){
-				PrintAndLogEx(NORMAL, "   CSN: %s", sprint_hex(data, 8));
-				tagFound = true;
-			}
-			if (readStatus & FLAG_ICLASS_READER_CC) {
-				PrintAndLogEx(NORMAL, "    CC: %s", sprint_hex(data+16, 8));
-			}
-			if (readStatus & FLAG_ICLASS_READER_CONF) {
-				printIclassDumpInfo(data);
-			}
-			if (readStatus & FLAG_ICLASS_READER_AIA) {
-				bool legacy = ( memcmp( (uint8_t *)(data + 8*5), "\xff\xff\xff\xff\xff\xff\xff\xff", 8) == 0 );
+            if (verbose) PrintAndLogEx(NORMAL, "Readstatus:%02x", readStatus);
+            // no tag found or button pressed
+            if ( (readStatus == 0 && !loop) || readStatus == 0xFF) {
+                // abort
+                if (verbose) {
+                    PrintAndLogEx(FAILED, "Quitting...");
+                    DropField();
+                    return 0;
+                }
+            }
+            if( readStatus & FLAG_ICLASS_READER_CSN){
+                PrintAndLogEx(NORMAL, "   CSN: %s", sprint_hex(data, 8));
+                tagFound = true;
+            }
+            if (readStatus & FLAG_ICLASS_READER_CC) {
+                PrintAndLogEx(NORMAL, "    CC: %s", sprint_hex(data+16, 8));
+            }
+            if (readStatus & FLAG_ICLASS_READER_CONF) {
+                printIclassDumpInfo(data);
+            }
+            if (readStatus & FLAG_ICLASS_READER_AIA) {
+                bool legacy = ( memcmp( (uint8_t *)(data + 8*5), "\xff\xff\xff\xff\xff\xff\xff\xff", 8) == 0 );
 
-				bool se_enabled = ( memcmp( (uint8_t *)(data + 8*5), "\xff\xff\xff\x00\x06\xff\xff\xff", 8) == 0 );
+                bool se_enabled = ( memcmp( (uint8_t *)(data + 8*5), "\xff\xff\xff\x00\x06\xff\xff\xff", 8) == 0 );
 
-				PrintAndLogEx(NORMAL, " App IA: %s", sprint_hex(data+8*5, 8));
-				if ( legacy )
-					PrintAndLogEx(SUCCESS, "      : Possible iClass (legacy credential tag)");
-				else if( se_enabled )
-					PrintAndLogEx(SUCCESS, "      : Possible iClass (SE credential tag)");
-				else
-					PrintAndLogEx(WARNING, "      : Possible iClass (NOT legacy tag)");
-			}
+                PrintAndLogEx(NORMAL, " App IA: %s", sprint_hex(data+8*5, 8));
+                if ( legacy )
+                    PrintAndLogEx(SUCCESS, "      : Possible iClass (legacy credential tag)");
+                else if( se_enabled )
+                    PrintAndLogEx(SUCCESS, "      : Possible iClass (SE credential tag)");
+                else
+                    PrintAndLogEx(WARNING, "      : Possible iClass (NOT legacy tag)");
+            }
 
-			if (tagFound && !loop) {
-				DropField();
-				return 1;
-			}
-		} else {
-			if (verbose)
-				PrintAndLogEx(WARNING, "command execute timeout");
-		}
-		if (!loop) break;
-	}
-	DropField();
-	return 0;
+            if (tagFound && !loop) {
+                DropField();
+                return 1;
+            }
+        } else {
+            if (verbose)
+                PrintAndLogEx(WARNING, "command execute timeout");
+        }
+        if (!loop) break;
+    }
+    DropField();
+    return 0;
 }
 
 int CmdHFiClassReader(const char *Cmd) {
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if (cmdp == 'h') return usage_hf_iclass_reader();
-	bool findone = (cmdp == '1') ? false : true;
-	return HFiClassReader(Cmd, findone, true);
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (cmdp == 'h') return usage_hf_iclass_reader();
+    bool findone = (cmdp == '1') ? false : true;
+    return HFiClassReader(Cmd, findone, true);
 }
 
 int CmdHFiClassReader_Replay(const char *Cmd) {
 
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if (strlen(Cmd)<1 || cmdp == 'h') return usage_hf_iclass_replay();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd)<1 || cmdp == 'h') return usage_hf_iclass_replay();
 
-	uint8_t readerType = 0;
-	uint8_t MAC[4] = {0x00, 0x00, 0x00, 0x00};
+    uint8_t readerType = 0;
+    uint8_t MAC[4] = {0x00, 0x00, 0x00, 0x00};
 
-	if (param_gethex(Cmd, 0, MAC, 8)) {
-		PrintAndLogEx(FAILED, "MAC must include 8 HEX symbols");
-		return 1;
-	}
+    if (param_gethex(Cmd, 0, MAC, 8)) {
+        PrintAndLogEx(FAILED, "MAC must include 8 HEX symbols");
+        return 1;
+    }
 
-	UsbCommand c = {CMD_READER_ICLASS_REPLAY, {readerType}};
-	memcpy(c.d.asBytes, MAC, 4);
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+    UsbCommand c = {CMD_READER_ICLASS_REPLAY, {readerType}};
+    memcpy(c.d.asBytes, MAC, 4);
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 
 int iclassEmlSetMem(uint8_t *data, int blockNum, int blocksCount) {
-	UsbCommand c = {CMD_MIFARE_EML_MEMSET, {blockNum, blocksCount, 0}};
-	memcpy(c.d.asBytes, data, blocksCount * 16);
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+    UsbCommand c = {CMD_MIFARE_EML_MEMSET, {blockNum, blocksCount, 0}};
+    memcpy(c.d.asBytes, data, blocksCount * 16);
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 
 int CmdHFiClassELoad(const char *Cmd) {
 
-	char ctmp = tolower(param_getchar(Cmd, 0));
-	if (strlen(Cmd)< 1 || ctmp == 'h') return usage_hf_iclass_eload();
+    char ctmp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd)< 1 || ctmp == 'h') return usage_hf_iclass_eload();
 
-	if ( ctmp != 'f' ) return usage_hf_iclass_eload();
+    if ( ctmp != 'f' ) return usage_hf_iclass_eload();
 
-	//File handling and reading
-	char filename[FILE_PATH_SIZE];
+    //File handling and reading
+    char filename[FILE_PATH_SIZE];
 
-	if ( param_getstr(Cmd, 1, filename, FILE_PATH_SIZE) >= FILE_PATH_SIZE ) {
-		PrintAndLogEx(FAILED, "Filename too long");
-		return 1;
-	}
+    if ( param_getstr(Cmd, 1, filename, FILE_PATH_SIZE) >= FILE_PATH_SIZE ) {
+        PrintAndLogEx(FAILED, "Filename too long");
+        return 1;
+    }
 
-	FILE *f = fopen(filename, "rb");
-	if ( !f ){
-		PrintAndLogEx(FAILED, "File: " _YELLOW_(%s) ": not found or locked.", filename);
-		return 1;
-	}
+    FILE *f = fopen(filename, "rb");
+    if ( !f ){
+        PrintAndLogEx(FAILED, "File: " _YELLOW_(%s) ": not found or locked.", filename);
+        return 1;
+    }
 
-	// get filesize in order to malloc memory
-	fseek(f, 0, SEEK_END);
-	long fsize = ftell(f);
-	fseek(f, 0, SEEK_SET);
+    // get filesize in order to malloc memory
+    fseek(f, 0, SEEK_END);
+    long fsize = ftell(f);
+    fseek(f, 0, SEEK_SET);
 
-	if (fsize < 0) 	{
-		PrintAndLogDevice(WARNING, "error, when getting filesize");
-		fclose(f);
-		return 1;
-	}
+    if (fsize < 0) {
+        PrintAndLogDevice(WARNING, "error, when getting filesize");
+        fclose(f);
+        return 1;
+    }
 
-	uint8_t *dump = calloc(fsize, sizeof(uint8_t));
-	if (!dump) {
-		PrintAndLogDevice(WARNING, "error, cannot allocate memory ");
-		fclose(f);
-		return 1;
-	}
+    uint8_t *dump = calloc(fsize, sizeof(uint8_t));
+    if (!dump) {
+        PrintAndLogDevice(WARNING, "error, cannot allocate memory ");
+        fclose(f);
+        return 1;
+    }
 
-	size_t bytes_read = fread(dump, 1, fsize, f);
-	fclose(f);
+    size_t bytes_read = fread(dump, 1, fsize, f);
+    fclose(f);
 
-	printIclassDumpInfo(dump);
-	//Validate
+    printIclassDumpInfo(dump);
+    //Validate
 
-	if (bytes_read < fsize)	{
-		PrintAndLogDevice(WARNING, "error, could only read %d bytes (should be %d)", bytes_read, fsize );
-		free(dump);
-		return 1;
-	}
-	//Send to device
-	uint32_t bytes_sent = 0;
-	uint32_t bytes_remaining  = bytes_read;
+    if (bytes_read < fsize) {
+        PrintAndLogDevice(WARNING, "error, could only read %d bytes (should be %d)", bytes_read, fsize );
+        free(dump);
+        return 1;
+    }
+    //Send to device
+    uint32_t bytes_sent = 0;
+    uint32_t bytes_remaining  = bytes_read;
 
-	while (bytes_remaining > 0){
-		uint32_t bytes_in_packet = MIN(USB_CMD_DATA_SIZE, bytes_remaining);
-		UsbCommand c = {CMD_ICLASS_EML_MEMSET, {bytes_sent, bytes_in_packet, 0}};
-		memcpy(c.d.asBytes, dump + bytes_sent, bytes_in_packet);
-		clearCommandBuffer();
-		SendCommand(&c);
-		bytes_remaining -= bytes_in_packet;
-		bytes_sent += bytes_in_packet;
-	}
-	free(dump);
-	PrintAndLogEx(SUCCESS, "sent %d bytes of data to device emulator memory", bytes_sent);
-	return 0;
+    while (bytes_remaining > 0){
+        uint32_t bytes_in_packet = MIN(USB_CMD_DATA_SIZE, bytes_remaining);
+        UsbCommand c = {CMD_ICLASS_EML_MEMSET, {bytes_sent, bytes_in_packet, 0}};
+        memcpy(c.d.asBytes, dump + bytes_sent, bytes_in_packet);
+        clearCommandBuffer();
+        SendCommand(&c);
+        bytes_remaining -= bytes_in_packet;
+        bytes_sent += bytes_in_packet;
+    }
+    free(dump);
+    PrintAndLogEx(SUCCESS, "sent %d bytes of data to device emulator memory", bytes_sent);
+    return 0;
 }
 
 static int readKeyfile(const char *filename, size_t len, uint8_t* buffer) {
-	FILE *f = fopen(filename, "rb");
-	if (!f) {
-		PrintAndLogEx(WARNING, "Failed to read from file '%s'", filename);
-		return 1;
-	}
-	fseek(f, 0, SEEK_END);
-	long fsize = ftell(f);
-	fseek(f, 0, SEEK_SET);
-	size_t bytes_read = fread(buffer, 1, len, f);
-	fclose(f);
+    FILE *f = fopen(filename, "rb");
+    if (!f) {
+        PrintAndLogEx(WARNING, "Failed to read from file '%s'", filename);
+        return 1;
+    }
+    fseek(f, 0, SEEK_END);
+    long fsize = ftell(f);
+    fseek(f, 0, SEEK_SET);
+    size_t bytes_read = fread(buffer, 1, len, f);
+    fclose(f);
 
-	if (fsize != len) {
-		PrintAndLogEx(WARNING, "Warning, file size is %d, expected %d", fsize, len);
-		return 1;
-	}
+    if (fsize != len) {
+        PrintAndLogEx(WARNING, "Warning, file size is %d, expected %d", fsize, len);
+        return 1;
+    }
 
-	if (bytes_read != len) {
-		PrintAndLogEx(WARNING, "Warning, could only read %d bytes, expected %d" ,bytes_read, len);
-		return 1;
-	}
-	return 0;
+    if (bytes_read != len) {
+        PrintAndLogEx(WARNING, "Warning, could only read %d bytes, expected %d" ,bytes_read, len);
+        return 1;
+    }
+    return 0;
 }
 
 int CmdHFiClassDecrypt(const char *Cmd) {
 
-	char opt = tolower(param_getchar(Cmd, 0));
-	if (strlen(Cmd)<1 || opt == 'h') return usage_hf_iclass_decrypt();
+    char opt = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd)<1 || opt == 'h') return usage_hf_iclass_decrypt();
 
-	uint8_t key[16] = { 0 };
-	if (readKeyfile("iclass_decryptionkey.bin", 16, key)) return usage_hf_iclass_decrypt();
+    uint8_t key[16] = { 0 };
+    if (readKeyfile("iclass_decryptionkey.bin", 16, key)) return usage_hf_iclass_decrypt();
 
-	PrintAndLogEx(SUCCESS, "decryption key loaded from file");
+    PrintAndLogEx(SUCCESS, "decryption key loaded from file");
 
-	//Open the tagdump-file
-	FILE *f;
-	char filename[FILE_PATH_SIZE];
-	if(opt == 'f' && param_getstr(Cmd, 1, filename, sizeof(filename)) > 0) {
-		f = fopen(filename, "rb");
-		if (!f) {
-			PrintAndLogEx(WARNING, "could not find file %s", filename);
-			return 1;
-		}
-	} else {
-		return usage_hf_iclass_decrypt();
-	}
+    //Open the tagdump-file
+    FILE *f;
+    char filename[FILE_PATH_SIZE];
+    if(opt == 'f' && param_getstr(Cmd, 1, filename, sizeof(filename)) > 0) {
+        f = fopen(filename, "rb");
+        if (!f) {
+            PrintAndLogEx(WARNING, "could not find file %s", filename);
+            return 1;
+        }
+    } else {
+        return usage_hf_iclass_decrypt();
+    }
 
-	fseek(f, 0, SEEK_END);
-	long fsize = ftell(f);
-	fseek(f, 0, SEEK_SET);
+    fseek(f, 0, SEEK_END);
+    long fsize = ftell(f);
+    fseek(f, 0, SEEK_SET);
 
-	if ( fsize < 0 ) {
-		PrintAndLogEx(WARNING, "error, when getting filesize");
-		fclose(f);
-		return 2;
-	}
+    if ( fsize < 0 ) {
+        PrintAndLogEx(WARNING, "error, when getting filesize");
+        fclose(f);
+        return 2;
+    }
 
-	uint8_t *decrypted = calloc(fsize, sizeof(uint8_t));
-	if ( !decrypted ) {
-		PrintAndLogEx(WARNING, "Failed to allocate memory");
-		fclose(f);
-		return 1;
-	}
+    uint8_t *decrypted = calloc(fsize, sizeof(uint8_t));
+    if ( !decrypted ) {
+        PrintAndLogEx(WARNING, "Failed to allocate memory");
+        fclose(f);
+        return 1;
+    }
 
-	size_t bytes_read = fread(decrypted, 1, fsize, f);
-	fclose(f);
-	if ( bytes_read == 0) {
-		PrintAndLogEx(WARNING, "file reading error");
-		free(decrypted);
-		return 3;
-	}
+    size_t bytes_read = fread(decrypted, 1, fsize, f);
+    fclose(f);
+    if ( bytes_read == 0) {
+        PrintAndLogEx(WARNING, "file reading error");
+        free(decrypted);
+        return 3;
+    }
 
-	picopass_hdr *hdr = (picopass_hdr *)decrypted;
+    picopass_hdr *hdr = (picopass_hdr *)decrypted;
 
-	uint8_t mem = hdr->conf.mem_config;
-	uint8_t chip = hdr->conf.chip_config;
-	uint8_t applimit = hdr->conf.app_limit;
-	uint8_t kb = 2;
-	uint8_t app_areas = 2;
-	uint8_t max_blk = 31;
-	getMemConfig(mem, chip, &max_blk, &app_areas, &kb);
+    uint8_t mem = hdr->conf.mem_config;
+    uint8_t chip = hdr->conf.chip_config;
+    uint8_t applimit = hdr->conf.app_limit;
+    uint8_t kb = 2;
+    uint8_t app_areas = 2;
+    uint8_t max_blk = 31;
+    getMemConfig(mem, chip, &max_blk, &app_areas, &kb);
 
-	//Use the first block (CSN) for filename
-	char outfilename[FILE_PATH_SIZE] = {0};
-	snprintf(outfilename, FILE_PATH_SIZE, "iclass_tagdump-%02x%02x%02x%02x%02x%02x%02x%02x-decrypted",
-			 hdr->csn[0],hdr->csn[1],hdr->csn[2],hdr->csn[3],
-			 hdr->csn[4],hdr->csn[5],hdr->csn[6],hdr->csn[7]);
+    //Use the first block (CSN) for filename
+    char outfilename[FILE_PATH_SIZE] = {0};
+    snprintf(outfilename, FILE_PATH_SIZE, "iclass_tagdump-%02x%02x%02x%02x%02x%02x%02x%02x-decrypted",
+             hdr->csn[0],hdr->csn[1],hdr->csn[2],hdr->csn[3],
+             hdr->csn[4],hdr->csn[5],hdr->csn[6],hdr->csn[7]);
 
-	// tripledes
-	mbedtls_des3_context ctx;
-	mbedtls_des3_set2key_dec( &ctx, key);
+    // tripledes
+    mbedtls_des3_context ctx;
+    mbedtls_des3_set2key_dec( &ctx, key);
 
-	uint8_t enc_dump[8] = {0};
-	uint8_t empty[8] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};
-	for(uint16_t blocknum=0; blocknum < applimit; ++blocknum) {
+    uint8_t enc_dump[8] = {0};
+    uint8_t empty[8] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};
+    for(uint16_t blocknum=0; blocknum < applimit; ++blocknum) {
 
-		uint8_t idx = blocknum*8;
-		memcpy(enc_dump, decrypted + idx, 8);
+        uint8_t idx = blocknum*8;
+        memcpy(enc_dump, decrypted + idx, 8);
 
-		// block 7 or higher,  and not empty 0xFF
-		if(blocknum > 6 &&  memcmp(enc_dump, empty, 8) != 0 ) {
-			mbedtls_des3_crypt_ecb(&ctx, enc_dump, decrypted + idx );
-		}
-	}
+        // block 7 or higher,  and not empty 0xFF
+        if(blocknum > 6 &&  memcmp(enc_dump, empty, 8) != 0 ) {
+            mbedtls_des3_crypt_ecb(&ctx, enc_dump, decrypted + idx );
+        }
+    }
 
-	saveFile(outfilename, "bin", decrypted, fsize);
-	free(decrypted);
-	printIclassDumpContents(decrypted, 1, (fsize/8), fsize);
-	return 0;
+    saveFile(outfilename, "bin", decrypted, fsize);
+    free(decrypted);
+    printIclassDumpContents(decrypted, 1, (fsize/8), fsize);
+    return 0;
 }
 
 static int iClassEncryptBlkData(uint8_t *blkData) {
-	uint8_t key[16] = { 0 };
-	if (readKeyfile("iclass_decryptionkey.bin", 16, key)) {
-		usage_hf_iclass_encrypt();
-		return 1;
-	}
-	PrintAndLogEx(SUCCESS, "decryption file found");
-	uint8_t encryptedData[16];
-	uint8_t *encrypted = encryptedData;
-	mbedtls_des3_context ctx;
-	mbedtls_des3_set2key_enc( &ctx, key);
+    uint8_t key[16] = { 0 };
+    if (readKeyfile("iclass_decryptionkey.bin", 16, key)) {
+        usage_hf_iclass_encrypt();
+        return 1;
+    }
+    PrintAndLogEx(SUCCESS, "decryption file found");
+    uint8_t encryptedData[16];
+    uint8_t *encrypted = encryptedData;
+    mbedtls_des3_context ctx;
+    mbedtls_des3_set2key_enc( &ctx, key);
 
-	mbedtls_des3_crypt_ecb(&ctx, blkData,encrypted);
-	memcpy(blkData,encrypted,8);
-	return 1;
+    mbedtls_des3_crypt_ecb(&ctx, blkData,encrypted);
+    memcpy(blkData,encrypted,8);
+    return 1;
 }
 
 int CmdHFiClassEncryptBlk(const char *Cmd) {
-	uint8_t blkData[8] = {0};
-	char opt = tolower(param_getchar(Cmd, 0));
-	if (strlen(Cmd)<1 || opt == 'h') return usage_hf_iclass_encrypt();
+    uint8_t blkData[8] = {0};
+    char opt = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd)<1 || opt == 'h') return usage_hf_iclass_encrypt();
 
-	//get the bytes to encrypt
-	if (param_gethex(Cmd, 0, blkData, 16)) {
-		PrintAndLogEx(NORMAL, "BlockData must include 16 HEX symbols");
-		return 0;
-	}
-	if (!iClassEncryptBlkData(blkData)) return 0;
+    //get the bytes to encrypt
+    if (param_gethex(Cmd, 0, blkData, 16)) {
+        PrintAndLogEx(NORMAL, "BlockData must include 16 HEX symbols");
+        return 0;
+    }
+    if (!iClassEncryptBlkData(blkData)) return 0;
 
-	printvar("encrypted block", blkData, 8);
-	return 1;
+    printvar("encrypted block", blkData, 8);
+    return 1;
 }
 
 void Calc_wb_mac(uint8_t blockno, uint8_t *data, uint8_t *div_key, uint8_t MAC[4]) {
-	uint8_t wb[9];
-	wb[0] = blockno;
-	memcpy(wb + 1,data,8);
-	doMAC_N(wb, sizeof(wb), div_key, MAC);
+    uint8_t wb[9];
+    wb[0] = blockno;
+    memcpy(wb + 1,data,8);
+    doMAC_N(wb, sizeof(wb), div_key, MAC);
 }
 
 static bool select_only(uint8_t *CSN, uint8_t *CCNR, bool use_credit_key, bool verbose) {
-	UsbCommand resp;
-	UsbCommand c = {CMD_READER_ICLASS, {0}};
-	c.arg[0] = FLAG_ICLASS_READER_ONLY_ONCE | FLAG_ICLASS_READER_CC | FLAG_ICLASS_READER_ONE_TRY;
+    UsbCommand resp;
+    UsbCommand c = {CMD_READER_ICLASS, {0}};
+    c.arg[0] = FLAG_ICLASS_READER_ONLY_ONCE | FLAG_ICLASS_READER_CC | FLAG_ICLASS_READER_ONE_TRY;
 
-	if (use_credit_key)
-		c.arg[0] |= FLAG_ICLASS_READER_CEDITKEY;
+    if (use_credit_key)
+        c.arg[0] |= FLAG_ICLASS_READER_CEDITKEY;
 
-	clearCommandBuffer();
-	SendCommand(&c);
-	if (!WaitForResponseTimeout(CMD_ACK, &resp, 4000)) {
-		PrintAndLogEx(WARNING, "command execute timeout");
-		return false;
-	}
+    clearCommandBuffer();
+    SendCommand(&c);
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 4000)) {
+        PrintAndLogEx(WARNING, "command execute timeout");
+        return false;
+    }
 
-	uint8_t isOK = resp.arg[0] & 0xff;
-	uint8_t *data = resp.d.asBytes;
+    uint8_t isOK = resp.arg[0] & 0xff;
+    uint8_t *data = resp.d.asBytes;
 
-	memcpy(CSN, data, 8);
+    memcpy(CSN, data, 8);
 
-	if (CCNR != NULL)
-		memcpy(CCNR, data+16, 8);
+    if (CCNR != NULL)
+        memcpy(CCNR, data+16, 8);
 
-	if (isOK > 0 && verbose) {
-		PrintAndLogEx(SUCCESS, "CSN  | %s", sprint_hex(CSN, 8));
-		PrintAndLogEx(SUCCESS, "CCNR | %s", sprint_hex(CCNR, 8));
-	}
+    if (isOK > 0 && verbose) {
+        PrintAndLogEx(SUCCESS, "CSN  | %s", sprint_hex(CSN, 8));
+        PrintAndLogEx(SUCCESS, "CCNR | %s", sprint_hex(CCNR, 8));
+    }
 
-	if (isOK <= 1){
-		PrintAndLogEx(FAILED, "failed to obtain CC! Tag-select is aborting...  (%d)", isOK);
-		return false;
-	}
-	return true;
+    if (isOK <= 1){
+        PrintAndLogEx(FAILED, "failed to obtain CC! Tag-select is aborting...  (%d)", isOK);
+        return false;
+    }
+    return true;
 }
 
 static bool select_and_auth(uint8_t *KEY, uint8_t *MAC, uint8_t *div_key, bool use_credit_key, bool elite, bool rawkey, bool verbose) {
-	uint8_t CSN[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-	uint8_t CCNR[12] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+    uint8_t CSN[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+    uint8_t CCNR[12] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
 
-	if (!select_only(CSN, CCNR, use_credit_key, verbose)) {
-		if (verbose) PrintAndLogEx(FAILED, "selecting tag failed");
-		return false;
-	}
-	//get div_key
-	if (rawkey)
-		memcpy(div_key, KEY, 8);
-	else
-		HFiClassCalcDivKey(CSN, KEY, div_key, elite);
+    if (!select_only(CSN, CCNR, use_credit_key, verbose)) {
+        if (verbose) PrintAndLogEx(FAILED, "selecting tag failed");
+        return false;
+    }
+    //get div_key
+    if (rawkey)
+        memcpy(div_key, KEY, 8);
+    else
+        HFiClassCalcDivKey(CSN, KEY, div_key, elite);
 
-	if (verbose) PrintAndLogEx(SUCCESS, "authing with %s: %s", rawkey ? "raw key" : "diversified key", sprint_hex(div_key, 8) );
+    if (verbose) PrintAndLogEx(SUCCESS, "authing with %s: %s", rawkey ? "raw key" : "diversified key", sprint_hex(div_key, 8) );
 
-	doMAC(CCNR, div_key, MAC);
-	UsbCommand resp;
-	UsbCommand d = {CMD_ICLASS_AUTHENTICATION, {0,0,0}};
-	memcpy(d.d.asBytes, MAC, 4);
-	clearCommandBuffer();
-	SendCommand(&d);
-	if (!WaitForResponseTimeout(CMD_ACK, &resp, 4000)) {
-		if (verbose) PrintAndLogEx(FAILED, "auth command execute timeout");
-		return false;
-	}
-	uint8_t isOK = resp.arg[0] & 0xFF;
-	if (!isOK) {
-		if (verbose) PrintAndLogEx(FAILED, "authentication error");
-		return false;
-	}
-	return true;
+    doMAC(CCNR, div_key, MAC);
+    UsbCommand resp;
+    UsbCommand d = {CMD_ICLASS_AUTHENTICATION, {0,0,0}};
+    memcpy(d.d.asBytes, MAC, 4);
+    clearCommandBuffer();
+    SendCommand(&d);
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 4000)) {
+        if (verbose) PrintAndLogEx(FAILED, "auth command execute timeout");
+        return false;
+    }
+    uint8_t isOK = resp.arg[0] & 0xFF;
+    if (!isOK) {
+        if (verbose) PrintAndLogEx(FAILED, "authentication error");
+        return false;
+    }
+    return true;
 }
 
 int CmdHFiClassReader_Dump(const char *Cmd) {
 
-	uint8_t MAC[4] = {0x00,0x00,0x00,0x00};
-	uint8_t div_key[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-	uint8_t c_div_key[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-	uint8_t blockno = 0;
-	uint8_t numblks = 0;
-	uint8_t maxBlk = 31;
-	uint8_t app_areas = 1;
-	uint8_t kb = 2;
-	uint8_t KEY[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-	uint8_t CreditKEY[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-	uint8_t keyNbr = 0;
-	uint8_t dataLen = 0;
-	uint8_t fileNameLen = 0;
-	char filename[FILE_PATH_SIZE] = {0};
-	char tempStr[50] = {0};
-	bool have_debit_key = false;
-	bool have_credit_key = false;
-	bool use_credit_key = false;
-	bool elite = false;
-	bool rawkey = false;
-	bool errors = false;
-	bool verbose = false;
-	uint8_t cmdp = 0;
+    uint8_t MAC[4] = {0x00,0x00,0x00,0x00};
+    uint8_t div_key[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+    uint8_t c_div_key[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+    uint8_t blockno = 0;
+    uint8_t numblks = 0;
+    uint8_t maxBlk = 31;
+    uint8_t app_areas = 1;
+    uint8_t kb = 2;
+    uint8_t KEY[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+    uint8_t CreditKEY[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+    uint8_t keyNbr = 0;
+    uint8_t dataLen = 0;
+    uint8_t fileNameLen = 0;
+    char filename[FILE_PATH_SIZE] = {0};
+    char tempStr[50] = {0};
+    bool have_debit_key = false;
+    bool have_credit_key = false;
+    bool use_credit_key = false;
+    bool elite = false;
+    bool rawkey = false;
+    bool errors = false;
+    bool verbose = false;
+    uint8_t cmdp = 0;
 
-	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch (tolower(param_getchar(Cmd, cmdp))) {
-		case 'h':
-			return usage_hf_iclass_dump();
-		case 'c':
-			have_credit_key = true;
-			dataLen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
-			if (dataLen == 16) {
-				errors = param_gethex(tempStr, 0, CreditKEY, dataLen);
-			} else if (dataLen == 1) {
-				keyNbr = param_get8(Cmd, cmdp+1);
-				if (keyNbr < ICLASS_KEYS_MAX) {
-					memcpy(CreditKEY, iClass_Key_Table[keyNbr], 8);
-				} else {
-					PrintAndLogEx(WARNING, "\nERROR: Credit KeyNbr is invalid\n");
-					errors = true;
-				}
-			} else {
-				PrintAndLogEx(WARNING, "\nERROR: Credit Key is incorrect length\n");
-				errors = true;
-			}
-			cmdp += 2;
-			break;
-		case 'e':
-			elite = true;
-			cmdp++;
-			break;
-		case 'f':
-			fileNameLen = param_getstr(Cmd, cmdp+1, filename, sizeof(filename));
-			if (fileNameLen < 1) {
-				PrintAndLogEx(WARNING, "no filename found after f");
-				errors = true;
-			}
-			cmdp += 2;
-			break;
-		case 'k':
-			have_debit_key = true;
-			dataLen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
-			if (dataLen == 16) {
-				errors = param_gethex(tempStr, 0, KEY, dataLen);
-			} else if (dataLen == 1) {
-				keyNbr = param_get8(Cmd, cmdp+1);
-				if (keyNbr < ICLASS_KEYS_MAX) {
-					memcpy(KEY, iClass_Key_Table[keyNbr], 8);
-				} else {
-					PrintAndLogEx(WARNING, "\nERROR: Credit KeyNbr is invalid\n");
-					errors = true;
-				}
-			} else {
-				PrintAndLogEx(WARNING, "\nERROR: Credit Key is incorrect length\n");
-				errors = true;
-			}
-			cmdp += 2;
-			break;
-		case 'r':
-			rawkey = true;
-			cmdp++;
-			break;
-		case 'v':
-			verbose = true;
-			cmdp++;
-			break;
-		default:
-			PrintAndLogEx(WARNING, "Unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
-			errors = true;
-			break;
-		}
-	}
-	if (errors || cmdp < 2) return usage_hf_iclass_dump();
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+        case 'h':
+            return usage_hf_iclass_dump();
+        case 'c':
+            have_credit_key = true;
+            dataLen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
+            if (dataLen == 16) {
+                errors = param_gethex(tempStr, 0, CreditKEY, dataLen);
+            } else if (dataLen == 1) {
+                keyNbr = param_get8(Cmd, cmdp+1);
+                if (keyNbr < ICLASS_KEYS_MAX) {
+                    memcpy(CreditKEY, iClass_Key_Table[keyNbr], 8);
+                } else {
+                    PrintAndLogEx(WARNING, "\nERROR: Credit KeyNbr is invalid\n");
+                    errors = true;
+                }
+            } else {
+                PrintAndLogEx(WARNING, "\nERROR: Credit Key is incorrect length\n");
+                errors = true;
+            }
+            cmdp += 2;
+            break;
+        case 'e':
+            elite = true;
+            cmdp++;
+            break;
+        case 'f':
+            fileNameLen = param_getstr(Cmd, cmdp+1, filename, sizeof(filename));
+            if (fileNameLen < 1) {
+                PrintAndLogEx(WARNING, "no filename found after f");
+                errors = true;
+            }
+            cmdp += 2;
+            break;
+        case 'k':
+            have_debit_key = true;
+            dataLen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
+            if (dataLen == 16) {
+                errors = param_gethex(tempStr, 0, KEY, dataLen);
+            } else if (dataLen == 1) {
+                keyNbr = param_get8(Cmd, cmdp+1);
+                if (keyNbr < ICLASS_KEYS_MAX) {
+                    memcpy(KEY, iClass_Key_Table[keyNbr], 8);
+                } else {
+                    PrintAndLogEx(WARNING, "\nERROR: Credit KeyNbr is invalid\n");
+                    errors = true;
+                }
+            } else {
+                PrintAndLogEx(WARNING, "\nERROR: Credit Key is incorrect length\n");
+                errors = true;
+            }
+            cmdp += 2;
+            break;
+        case 'r':
+            rawkey = true;
+            cmdp++;
+            break;
+        case 'v':
+            verbose = true;
+            cmdp++;
+            break;
+        default:
+            PrintAndLogEx(WARNING, "Unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
+            errors = true;
+            break;
+        }
+    }
+    if (errors || cmdp < 2) return usage_hf_iclass_dump();
 
-	// if no debit key given try credit key on AA1 (not for iclass but for some picopass this will work)
-	if (!have_debit_key && have_credit_key) use_credit_key = true;
+    // if no debit key given try credit key on AA1 (not for iclass but for some picopass this will work)
+    if (!have_debit_key && have_credit_key) use_credit_key = true;
 
-	uint32_t flags = FLAG_ICLASS_READER_CSN | FLAG_ICLASS_READER_CC |
-					FLAG_ICLASS_READER_CONF | FLAG_ICLASS_READER_ONLY_ONCE |
-					FLAG_ICLASS_READER_ONE_TRY;
+    uint32_t flags = FLAG_ICLASS_READER_CSN | FLAG_ICLASS_READER_CC |
+                    FLAG_ICLASS_READER_CONF | FLAG_ICLASS_READER_ONLY_ONCE |
+                    FLAG_ICLASS_READER_ONE_TRY;
 
-	//get config and first 3 blocks
-	UsbCommand c = {CMD_READER_ICLASS, {flags, 0, 0}};
-	UsbCommand resp;
-	uint8_t tag_data[255*8];
+    //get config and first 3 blocks
+    UsbCommand c = {CMD_READER_ICLASS, {flags, 0, 0}};
+    UsbCommand resp;
+    uint8_t tag_data[255*8];
 
-	clearCommandBuffer();
-	SendCommand(&c);
-	if (!WaitForResponseTimeout(CMD_ACK, &resp, 4500)) {
-		PrintAndLogEx(WARNING, "command execute timeout");
-		DropField();
-		return 0;
-	}
-	DropField();
+    clearCommandBuffer();
+    SendCommand(&c);
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 4500)) {
+        PrintAndLogEx(WARNING, "command execute timeout");
+        DropField();
+        return 0;
+    }
+    DropField();
 
-	uint8_t readStatus = resp.arg[0] & 0xff;
-	uint8_t *data  = resp.d.asBytes;
+    uint8_t readStatus = resp.arg[0] & 0xff;
+    uint8_t *data  = resp.d.asBytes;
 
-	if (readStatus == 0){
-		PrintAndLogEx(FAILED, "no tag found");
-		return 0;
-	}
+    if (readStatus == 0){
+        PrintAndLogEx(FAILED, "no tag found");
+        return 0;
+    }
 
-	if( readStatus & (FLAG_ICLASS_READER_CSN | FLAG_ICLASS_READER_CONF | FLAG_ICLASS_READER_CC)){
-		memcpy(tag_data, data, 8*3);
-		blockno += 2; // 2 to force re-read of block 2 later. (seems to respond differently..)
-		numblks = data[8];
-		getMemConfig(data[13], data[12], &maxBlk, &app_areas, &kb);
-		// large memory - not able to dump pages currently
-		if (numblks > maxBlk) numblks = maxBlk;
-	}
+    if( readStatus & (FLAG_ICLASS_READER_CSN | FLAG_ICLASS_READER_CONF | FLAG_ICLASS_READER_CC)){
+        memcpy(tag_data, data, 8*3);
+        blockno += 2; // 2 to force re-read of block 2 later. (seems to respond differently..)
+        numblks = data[8];
+        getMemConfig(data[13], data[12], &maxBlk, &app_areas, &kb);
+        // large memory - not able to dump pages currently
+        if (numblks > maxBlk) numblks = maxBlk;
+    }
 
-	// authenticate debit key and get div_key - later store in dump block 3
-	if (!select_and_auth(KEY, MAC, div_key, use_credit_key, elite, rawkey, verbose)){
-		//try twice - for some reason it sometimes fails the first time...
-		PrintAndLogEx(SUCCESS, "retry to select card");
-		if (!select_and_auth(KEY, MAC, div_key, use_credit_key, elite, rawkey, verbose)){
-			PrintAndLogEx(WARNING, "failed authenticating with debit key");
-			DropField();
-			return 0;
-		}
-	}
+    // authenticate debit key and get div_key - later store in dump block 3
+    if (!select_and_auth(KEY, MAC, div_key, use_credit_key, elite, rawkey, verbose)){
+        //try twice - for some reason it sometimes fails the first time...
+        PrintAndLogEx(SUCCESS, "retry to select card");
+        if (!select_and_auth(KEY, MAC, div_key, use_credit_key, elite, rawkey, verbose)){
+            PrintAndLogEx(WARNING, "failed authenticating with debit key");
+            DropField();
+            return 0;
+        }
+    }
 
-	// begin dump
-	UsbCommand w = {CMD_ICLASS_DUMP, {blockno, numblks-blockno+1}};
-	clearCommandBuffer();
-	SendCommand(&w);
-	while (true) {
-		printf("."); fflush(stdout);
-		if (ukbhit()) {
-			int gc = getchar(); (void)gc;
-			PrintAndLogEx(WARNING, "\n[!] aborted via keyboard!\n");
-			DropField();
-			return 0;
-		}
+    // begin dump
+    UsbCommand w = {CMD_ICLASS_DUMP, {blockno, numblks-blockno+1}};
+    clearCommandBuffer();
+    SendCommand(&w);
+    while (true) {
+        printf("."); fflush(stdout);
+        if (ukbhit()) {
+            int gc = getchar(); (void)gc;
+            PrintAndLogEx(WARNING, "\n[!] aborted via keyboard!\n");
+            DropField();
+            return 0;
+        }
 
-		if (WaitForResponseTimeout(CMD_ACK, &resp, 2000) )
-			break;
-	}
-	// dump cmd switch off at device when finised.
+        if (WaitForResponseTimeout(CMD_ACK, &resp, 2000) )
+            break;
+    }
+    // dump cmd switch off at device when finised.
 
-	uint32_t blocksRead = resp.arg[1];
-	uint8_t isOK = resp.arg[0] & 0xff;
-	if (!isOK && !blocksRead) {
-		PrintAndLogEx(WARNING, "read block failed");
-		return 0;
-	}
+    uint32_t blocksRead = resp.arg[1];
+    uint8_t isOK = resp.arg[0] & 0xff;
+    if (!isOK && !blocksRead) {
+        PrintAndLogEx(WARNING, "read block failed");
+        return 0;
+    }
 
-	uint32_t startindex = resp.arg[2];
-	if (blocksRead*8 > sizeof(tag_data) - (blockno*8)) {
-		PrintAndLogEx(FAILED, "data exceeded buffer size!");
-		blocksRead = (sizeof(tag_data)/8) - blockno;
-	}
+    uint32_t startindex = resp.arg[2];
+    if (blocksRead*8 > sizeof(tag_data) - (blockno*8)) {
+        PrintAndLogEx(FAILED, "data exceeded buffer size!");
+        blocksRead = (sizeof(tag_data)/8) - blockno;
+    }
 
-	// response ok - now get bigbuf content of the dump
-	if ( !GetFromDevice(BIG_BUF, tag_data+(blockno*8), blocksRead*8, startindex, NULL, 2500, false) ) {
-		PrintAndLogEx(WARNING, "command execution time out");
-		return 0;
-	}
+    // response ok - now get bigbuf content of the dump
+    if ( !GetFromDevice(BIG_BUF, tag_data+(blockno*8), blocksRead*8, startindex, NULL, 2500, false) ) {
+        PrintAndLogEx(WARNING, "command execution time out");
+        return 0;
+    }
 
-	size_t gotBytes = blocksRead*8 + blockno*8;
+    size_t gotBytes = blocksRead*8 + blockno*8;
 
-	// try AA2
-	if (have_credit_key) {
-		//turn off hf field before authenticating with different key
-		DropField();
-		memset(MAC,0,4);
-		// AA2 authenticate credit key and git c_div_key - later store in dump block 4
-		if (!select_and_auth(CreditKEY, MAC, c_div_key, true, elite, rawkey, verbose)){
-			//try twice - for some reason it sometimes fails the first time...
-			if (!select_and_auth(CreditKEY, MAC, c_div_key, true, elite, rawkey, verbose)){
-				PrintAndLogEx(WARNING, "failed authenticating with credit key");
-				DropField();
-				return 0;
-			}
-		}
-		// do we still need to read more block?  (aa2 enabled?)
-		if (maxBlk > blockno+numblks+1) {
-			// setup dump and start
-			w.arg[0] = blockno + blocksRead;
-			w.arg[1] = maxBlk - (blockno + blocksRead);
-			clearCommandBuffer();
-			SendCommand(&w);
-			if (!WaitForResponseTimeout(CMD_ACK, &resp, 4500)) {
-				PrintAndLogEx(WARNING, "command execute timeout 2");
-				return 0;
-			}
-			uint8_t isOK = resp.arg[0] & 0xff;
-			blocksRead = resp.arg[1];
-			if (!isOK && !blocksRead) {
-				PrintAndLogEx(WARNING, "read block failed 2");
-				return 0;
-			}
+    // try AA2
+    if (have_credit_key) {
+        //turn off hf field before authenticating with different key
+        DropField();
+        memset(MAC,0,4);
+        // AA2 authenticate credit key and git c_div_key - later store in dump block 4
+        if (!select_and_auth(CreditKEY, MAC, c_div_key, true, elite, rawkey, verbose)){
+            //try twice - for some reason it sometimes fails the first time...
+            if (!select_and_auth(CreditKEY, MAC, c_div_key, true, elite, rawkey, verbose)){
+                PrintAndLogEx(WARNING, "failed authenticating with credit key");
+                DropField();
+                return 0;
+            }
+        }
+        // do we still need to read more block?  (aa2 enabled?)
+        if (maxBlk > blockno+numblks+1) {
+            // setup dump and start
+            w.arg[0] = blockno + blocksRead;
+            w.arg[1] = maxBlk - (blockno + blocksRead);
+            clearCommandBuffer();
+            SendCommand(&w);
+            if (!WaitForResponseTimeout(CMD_ACK, &resp, 4500)) {
+                PrintAndLogEx(WARNING, "command execute timeout 2");
+                return 0;
+            }
+            uint8_t isOK = resp.arg[0] & 0xff;
+            blocksRead = resp.arg[1];
+            if (!isOK && !blocksRead) {
+                PrintAndLogEx(WARNING, "read block failed 2");
+                return 0;
+            }
 
-			startindex = resp.arg[2];
-			if (blocksRead * 8 > sizeof(tag_data) - gotBytes) {
-				PrintAndLogEx(FAILED, "data exceeded buffer size!");
-				blocksRead = (sizeof(tag_data) - gotBytes)/8;
-			}
-			// get dumped data from bigbuf
-			if ( !GetFromDevice(BIG_BUF, tag_data + gotBytes, blocksRead * 8, startindex, NULL, 2500, false)) {
-				PrintAndLogEx(WARNING, "command execution time out");
-				return 0;
-			}
+            startindex = resp.arg[2];
+            if (blocksRead * 8 > sizeof(tag_data) - gotBytes) {
+                PrintAndLogEx(FAILED, "data exceeded buffer size!");
+                blocksRead = (sizeof(tag_data) - gotBytes)/8;
+            }
+            // get dumped data from bigbuf
+            if ( !GetFromDevice(BIG_BUF, tag_data + gotBytes, blocksRead * 8, startindex, NULL, 2500, false)) {
+                PrintAndLogEx(WARNING, "command execution time out");
+                return 0;
+            }
 
-			gotBytes += blocksRead * 8;
-		}
-	}
+            gotBytes += blocksRead * 8;
+        }
+    }
 
-	DropField();
+    DropField();
 
-	// add diversified keys to dump
-	if (have_debit_key) memcpy(tag_data+(3*8),div_key,8);
-	if (have_credit_key) memcpy(tag_data+(4*8),c_div_key,8);
+    // add diversified keys to dump
+    if (have_debit_key) memcpy(tag_data+(3*8),div_key,8);
+    if (have_credit_key) memcpy(tag_data+(4*8),c_div_key,8);
 
-	// print the dump
-	PrintAndLogEx(NORMAL, "------+--+-------------------------+\n");
-	PrintAndLogEx(NORMAL, "CSN   |00| %s|\n", sprint_hex(tag_data, 8));
-	printIclassDumpContents(tag_data, 1, (gotBytes/8), gotBytes);
+    // print the dump
+    PrintAndLogEx(NORMAL, "------+--+-------------------------+\n");
+    PrintAndLogEx(NORMAL, "CSN   |00| %s|\n", sprint_hex(tag_data, 8));
+    printIclassDumpContents(tag_data, 1, (gotBytes/8), gotBytes);
 
-	if (filename[0] == 0){
-		snprintf(filename, FILE_PATH_SIZE,"iclass_tagdump-%02x%02x%02x%02x%02x%02x%02x%02x",
-		    tag_data[0],tag_data[1],tag_data[2],tag_data[3],
-		    tag_data[4],tag_data[5],tag_data[6],tag_data[7]);
-	}
+    if (filename[0] == 0){
+        snprintf(filename, FILE_PATH_SIZE,"iclass_tagdump-%02x%02x%02x%02x%02x%02x%02x%02x",
+            tag_data[0],tag_data[1],tag_data[2],tag_data[3],
+            tag_data[4],tag_data[5],tag_data[6],tag_data[7]);
+    }
 
-	// save the dump to .bin file
-	PrintAndLogEx(SUCCESS, "saving dump file - %d blocks read", gotBytes/8);
-	saveFile(filename, "bin", tag_data, gotBytes);
-	return 1;
+    // save the dump to .bin file
+    PrintAndLogEx(SUCCESS, "saving dump file - %d blocks read", gotBytes/8);
+    saveFile(filename, "bin", tag_data, gotBytes);
+    return 1;
 }
 
 static int WriteBlock(uint8_t blockno, uint8_t *bldata, uint8_t *KEY, bool use_credit_key, bool elite, bool rawkey, bool verbose) {
-	uint8_t MAC[4] = {0x00,0x00,0x00,0x00};
-	uint8_t div_key[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-	if (!select_and_auth(KEY, MAC, div_key, use_credit_key, elite, rawkey, verbose))
-		return 0;
+    uint8_t MAC[4] = {0x00,0x00,0x00,0x00};
+    uint8_t div_key[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+    if (!select_and_auth(KEY, MAC, div_key, use_credit_key, elite, rawkey, verbose))
+        return 0;
 
-	UsbCommand resp;
+    UsbCommand resp;
 
-	Calc_wb_mac(blockno,bldata,div_key,MAC);
-	UsbCommand w = {CMD_ICLASS_WRITEBLOCK, {blockno}};
-	memcpy(w.d.asBytes, bldata, 8);
-	memcpy(w.d.asBytes + 8, MAC, 4);
+    Calc_wb_mac(blockno,bldata,div_key,MAC);
+    UsbCommand w = {CMD_ICLASS_WRITEBLOCK, {blockno}};
+    memcpy(w.d.asBytes, bldata, 8);
+    memcpy(w.d.asBytes + 8, MAC, 4);
 
-	clearCommandBuffer();
-	SendCommand(&w);
-	if (!WaitForResponseTimeout(CMD_ACK, &resp, 4500)) {
-		if ( verbose ) PrintAndLogEx(WARNING, "Write Command execute timeout");
-		return 0;
-	}
-	uint8_t isOK = resp.arg[0] & 0xff;
-	if (isOK)
-		PrintAndLogEx(SUCCESS, "Write block successful");
-	else
-		PrintAndLogEx(WARNING, "Write block failed");
-	return isOK;
+    clearCommandBuffer();
+    SendCommand(&w);
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 4500)) {
+        if ( verbose ) PrintAndLogEx(WARNING, "Write Command execute timeout");
+        return 0;
+    }
+    uint8_t isOK = resp.arg[0] & 0xff;
+    if (isOK)
+        PrintAndLogEx(SUCCESS, "Write block successful");
+    else
+        PrintAndLogEx(WARNING, "Write block failed");
+    return isOK;
 }
 
 int CmdHFiClass_WriteBlock(const char *Cmd) {
-	uint8_t blockno = 0;
-	uint8_t bldata[8] = {0,0,0,0,0,0,0,0};
-	uint8_t KEY[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-	uint8_t keyNbr = 0;
-	uint8_t dataLen = 0;
-	char tempStr[50] = {0};
-	bool use_credit_key = false;
-	bool elite = false;
-	bool rawkey = false;
-	bool errors = false;
-	bool verbose = false;
-	uint8_t cmdp = 0;
-	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch (tolower(param_getchar(Cmd, cmdp))) {
-		case 'h':
-			return usage_hf_iclass_writeblock();
-		case 'b':
-			if (param_gethex(Cmd, cmdp+1, &blockno, 2)) {
-				PrintAndLogEx(WARNING, "Block No must include 2 HEX symbols\n");
-				errors = true;
-			}
-			cmdp += 2;
-			break;
-		case 'c':
-			use_credit_key = true;
-			cmdp++;
-			break;
-		case 'd':
-			if (param_gethex(Cmd, cmdp+1, bldata, 16)) {
-				PrintAndLogEx(WARNING, "Data must include 16 HEX symbols\n");
-				errors = true;
-			}
-			cmdp += 2;
-			break;
-		case 'e':
-			elite = true;
-			cmdp++;
-			break;
-		case 'k':
-			dataLen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
-			if (dataLen == 16) {
-				errors = param_gethex(tempStr, 0, KEY, dataLen);
-			} else if (dataLen == 1) {
-				keyNbr = param_get8(Cmd, cmdp+1);
-				if (keyNbr < ICLASS_KEYS_MAX) {
-					memcpy(KEY, iClass_Key_Table[keyNbr], 8);
-				} else {
-					PrintAndLogEx(WARNING, "\nERROR: Credit KeyNbr is invalid\n");
-					errors = true;
-				}
-			} else {
-				PrintAndLogEx(WARNING, "\nERROR: Credit Key is incorrect length\n");
-				errors = true;
-			}
-			cmdp += 2;
-			break;
-		case 'r':
-			rawkey = true;
-			cmdp++;
-			break;
-		case 'v':
-			verbose = true;
-			cmdp++;
-			break;
-		default:
-			PrintAndLogEx(WARNING, "unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
-			errors = true;
-			break;
-		}
-	}
-	if (errors || cmdp < 6) return usage_hf_iclass_writeblock();
+    uint8_t blockno = 0;
+    uint8_t bldata[8] = {0,0,0,0,0,0,0,0};
+    uint8_t KEY[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+    uint8_t keyNbr = 0;
+    uint8_t dataLen = 0;
+    char tempStr[50] = {0};
+    bool use_credit_key = false;
+    bool elite = false;
+    bool rawkey = false;
+    bool errors = false;
+    bool verbose = false;
+    uint8_t cmdp = 0;
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+        case 'h':
+            return usage_hf_iclass_writeblock();
+        case 'b':
+            if (param_gethex(Cmd, cmdp+1, &blockno, 2)) {
+                PrintAndLogEx(WARNING, "Block No must include 2 HEX symbols\n");
+                errors = true;
+            }
+            cmdp += 2;
+            break;
+        case 'c':
+            use_credit_key = true;
+            cmdp++;
+            break;
+        case 'd':
+            if (param_gethex(Cmd, cmdp+1, bldata, 16)) {
+                PrintAndLogEx(WARNING, "Data must include 16 HEX symbols\n");
+                errors = true;
+            }
+            cmdp += 2;
+            break;
+        case 'e':
+            elite = true;
+            cmdp++;
+            break;
+        case 'k':
+            dataLen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
+            if (dataLen == 16) {
+                errors = param_gethex(tempStr, 0, KEY, dataLen);
+            } else if (dataLen == 1) {
+                keyNbr = param_get8(Cmd, cmdp+1);
+                if (keyNbr < ICLASS_KEYS_MAX) {
+                    memcpy(KEY, iClass_Key_Table[keyNbr], 8);
+                } else {
+                    PrintAndLogEx(WARNING, "\nERROR: Credit KeyNbr is invalid\n");
+                    errors = true;
+                }
+            } else {
+                PrintAndLogEx(WARNING, "\nERROR: Credit Key is incorrect length\n");
+                errors = true;
+            }
+            cmdp += 2;
+            break;
+        case 'r':
+            rawkey = true;
+            cmdp++;
+            break;
+        case 'v':
+            verbose = true;
+            cmdp++;
+            break;
+        default:
+            PrintAndLogEx(WARNING, "unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
+            errors = true;
+            break;
+        }
+    }
+    if (errors || cmdp < 6) return usage_hf_iclass_writeblock();
 
-	int ans = WriteBlock(blockno, bldata, KEY, use_credit_key, elite, rawkey, verbose);
-	DropField();
-	return ans;
+    int ans = WriteBlock(blockno, bldata, KEY, use_credit_key, elite, rawkey, verbose);
+    DropField();
+    return ans;
 }
 
 int CmdHFiClassCloneTag(const char *Cmd) {
-	char filename[FILE_PATH_SIZE] = { 0x00 };
-	char tempStr[50] = {0};
-	uint8_t KEY[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-	uint8_t keyNbr = 0;
-	uint8_t fileNameLen = 0;
-	uint8_t startblock = 0;
-	uint8_t endblock = 0;
-	uint8_t dataLen = 0;
-	bool use_credit_key = false;
-	bool elite = false;
-	bool rawkey = false;
-	bool errors = false;
-	bool verbose = false;
-	uint8_t cmdp = 0;
-	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch (tolower(param_getchar(Cmd, cmdp))) {
-		case 'h':
-			return usage_hf_iclass_clone();
-		case 'b':
-			if (param_gethex(Cmd, cmdp+1, &startblock, 2)) {
-				PrintAndLogEx(WARNING, "start block No must include 2 HEX symbols\n");
-				errors = true;
-			}
-			cmdp += 2;
-			break;
-		case 'c':
-			use_credit_key = true;
-			cmdp++;
-			break;
-		case 'e':
-			elite = true;
-			cmdp++;
-			break;
-		case 'f':
-			fileNameLen = param_getstr(Cmd, cmdp+1, filename, sizeof(filename));
-			if (fileNameLen < 1) {
-				PrintAndLogEx(WARNING, "No filename found after f");
-				errors = true;
-			}
-			cmdp += 2;
-			break;
-		case 'k':
-			dataLen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
-			if (dataLen == 16) {
-				errors = param_gethex(tempStr, 0, KEY, dataLen);
-			} else if (dataLen == 1) {
-				keyNbr = param_get8(Cmd, cmdp+1);
-				if (keyNbr < ICLASS_KEYS_MAX) {
-					memcpy(KEY, iClass_Key_Table[keyNbr], 8);
-				} else {
-					PrintAndLogEx(WARNING, "\nERROR: Credit KeyNbr is invalid\n");
-					errors = true;
-				}
-			} else {
-				PrintAndLogEx(WARNING, "\nERROR: Credit Key is incorrect length\n");
-				errors = true;
-			}
-			cmdp += 2;
-			break;
-		case 'l':
-			if (param_gethex(Cmd, cmdp+1, &endblock, 2)) {
-				PrintAndLogEx(WARNING, "start Block No must include 2 HEX symbols\n");
-				errors = true;
-			}
-			cmdp += 2;
-			break;
-		case 'r':
-			rawkey = true;
-			cmdp++;
-			break;
-		case 'v':
-			verbose = true;
-			cmdp++;
-			break;
-		default:
-			PrintAndLogEx(WARNING, "unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
-			errors = true;
-			break;
-		}
-	}
+    char filename[FILE_PATH_SIZE] = { 0x00 };
+    char tempStr[50] = {0};
+    uint8_t KEY[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+    uint8_t keyNbr = 0;
+    uint8_t fileNameLen = 0;
+    uint8_t startblock = 0;
+    uint8_t endblock = 0;
+    uint8_t dataLen = 0;
+    bool use_credit_key = false;
+    bool elite = false;
+    bool rawkey = false;
+    bool errors = false;
+    bool verbose = false;
+    uint8_t cmdp = 0;
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+        case 'h':
+            return usage_hf_iclass_clone();
+        case 'b':
+            if (param_gethex(Cmd, cmdp+1, &startblock, 2)) {
+                PrintAndLogEx(WARNING, "start block No must include 2 HEX symbols\n");
+                errors = true;
+            }
+            cmdp += 2;
+            break;
+        case 'c':
+            use_credit_key = true;
+            cmdp++;
+            break;
+        case 'e':
+            elite = true;
+            cmdp++;
+            break;
+        case 'f':
+            fileNameLen = param_getstr(Cmd, cmdp+1, filename, sizeof(filename));
+            if (fileNameLen < 1) {
+                PrintAndLogEx(WARNING, "No filename found after f");
+                errors = true;
+            }
+            cmdp += 2;
+            break;
+        case 'k':
+            dataLen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
+            if (dataLen == 16) {
+                errors = param_gethex(tempStr, 0, KEY, dataLen);
+            } else if (dataLen == 1) {
+                keyNbr = param_get8(Cmd, cmdp+1);
+                if (keyNbr < ICLASS_KEYS_MAX) {
+                    memcpy(KEY, iClass_Key_Table[keyNbr], 8);
+                } else {
+                    PrintAndLogEx(WARNING, "\nERROR: Credit KeyNbr is invalid\n");
+                    errors = true;
+                }
+            } else {
+                PrintAndLogEx(WARNING, "\nERROR: Credit Key is incorrect length\n");
+                errors = true;
+            }
+            cmdp += 2;
+            break;
+        case 'l':
+            if (param_gethex(Cmd, cmdp+1, &endblock, 2)) {
+                PrintAndLogEx(WARNING, "start Block No must include 2 HEX symbols\n");
+                errors = true;
+            }
+            cmdp += 2;
+            break;
+        case 'r':
+            rawkey = true;
+            cmdp++;
+            break;
+        case 'v':
+            verbose = true;
+            cmdp++;
+            break;
+        default:
+            PrintAndLogEx(WARNING, "unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
+            errors = true;
+            break;
+        }
+    }
 
-	if (errors || cmdp < 8) return usage_hf_iclass_clone();
+    if (errors || cmdp < 8) return usage_hf_iclass_clone();
 
-	FILE *f;
+    FILE *f;
 
-	iclass_block_t tag_data[USB_CMD_DATA_SIZE/12];
+    iclass_block_t tag_data[USB_CMD_DATA_SIZE/12];
 
-	if ((endblock - startblock + 1) * 12 > USB_CMD_DATA_SIZE) {
-		PrintAndLogEx(NORMAL, "Trying to write too many blocks at once.  Max: %d", USB_CMD_DATA_SIZE/8);
-	}
-	// file handling and reading
-	f = fopen(filename, "rb");
-	if(!f) {
-		PrintAndLogEx(WARNING, "failed to read file '%s'", filename);
-		return 1;
-	}
+    if ((endblock - startblock + 1) * 12 > USB_CMD_DATA_SIZE) {
+        PrintAndLogEx(NORMAL, "Trying to write too many blocks at once.  Max: %d", USB_CMD_DATA_SIZE/8);
+    }
+    // file handling and reading
+    f = fopen(filename, "rb");
+    if(!f) {
+        PrintAndLogEx(WARNING, "failed to read file '%s'", filename);
+        return 1;
+    }
 
-	if (startblock < 5) {
-		PrintAndLogEx(WARNING, "you cannot write key blocks this way. yet... make your start block > 4");
-		fclose(f);
-		return 0;
-	}
-	// now read data from the file from block 6 --- 19
-	// ok we will use this struct [data 8 bytes][MAC 4 bytes] for each block calculate all mac number for each data
-	// then copy to usbcommand->asbytes; the max is 32 - 6 = 24 block 12 bytes each block 288 bytes then we can only accept to clone 21 blocks at the time,
-	// else we have to create a share memory
-	int i;
-	fseek(f, startblock*8, SEEK_SET);
-	size_t bytes_read = fread(tag_data, sizeof(iclass_block_t),endblock - startblock + 1, f);
-	if ( bytes_read == 0){
-		PrintAndLogEx(WARNING, "file reading error.");
-		fclose(f);
-		return 2;
-	}
+    if (startblock < 5) {
+        PrintAndLogEx(WARNING, "you cannot write key blocks this way. yet... make your start block > 4");
+        fclose(f);
+        return 0;
+    }
+    // now read data from the file from block 6 --- 19
+    // ok we will use this struct [data 8 bytes][MAC 4 bytes] for each block calculate all mac number for each data
+    // then copy to usbcommand->asbytes; the max is 32 - 6 = 24 block 12 bytes each block 288 bytes then we can only accept to clone 21 blocks at the time,
+    // else we have to create a share memory
+    int i;
+    fseek(f, startblock*8, SEEK_SET);
+    size_t bytes_read = fread(tag_data, sizeof(iclass_block_t),endblock - startblock + 1, f);
+    if ( bytes_read == 0){
+        PrintAndLogEx(WARNING, "file reading error.");
+        fclose(f);
+        return 2;
+    }
 
-	uint8_t MAC[4] = {0x00,0x00,0x00,0x00};
-	uint8_t div_key[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+    uint8_t MAC[4] = {0x00,0x00,0x00,0x00};
+    uint8_t div_key[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
 
-	if (!select_and_auth(KEY, MAC, div_key, use_credit_key, elite, rawkey, verbose))
-		return 0;
+    if (!select_and_auth(KEY, MAC, div_key, use_credit_key, elite, rawkey, verbose))
+        return 0;
 
-	UsbCommand w = {CMD_ICLASS_CLONE,{startblock,endblock}};
-	uint8_t *ptr;
-	// calculate all mac for every the block we will write
-	for (i = startblock; i <= endblock; i++){
-	    Calc_wb_mac(i,tag_data[i - startblock].d,div_key,MAC);
-	    // usb command d start pointer = d + (i - 6) * 12
-	    // memcpy(pointer,tag_data[i - 6],8) 8 bytes
-	    // memcpy(pointer + 8,mac,sizoof(mac) 4 bytes;
-	    // next one
-	    ptr = w.d.asBytes + (i - startblock) * 12;
-	    memcpy(ptr, &(tag_data[i - startblock].d[0]), 8);
-	    memcpy(ptr + 8,MAC, 4);
-	}
-	uint8_t p[12];
-	for (i = 0; i <= endblock - startblock;i++){
-	    memcpy(p,w.d.asBytes + (i * 12),12);
-	    PrintAndLogEx(NORMAL, "Block |%02x|",i + startblock);
-	    PrintAndLogEx(NORMAL, " %02x%02x%02x%02x%02x%02x%02x%02x |",p[0],p[1],p[2],p[3],p[4],p[5],p[6],p[7]);
-	    PrintAndLogEx(NORMAL, " MAC |%02x%02x%02x%02x|\n",p[8],p[9],p[10],p[11]);
-	}
-	UsbCommand resp;
-	clearCommandBuffer();
-	SendCommand(&w);
-	if (!WaitForResponseTimeout(CMD_ACK, &resp, 4500)) {
-		PrintAndLogEx(WARNING, "command execute timeout");
-		return 0;
-	}
-	return 1;
+    UsbCommand w = {CMD_ICLASS_CLONE,{startblock,endblock}};
+    uint8_t *ptr;
+    // calculate all mac for every the block we will write
+    for (i = startblock; i <= endblock; i++){
+        Calc_wb_mac(i,tag_data[i - startblock].d,div_key,MAC);
+        // usb command d start pointer = d + (i - 6) * 12
+        // memcpy(pointer,tag_data[i - 6],8) 8 bytes
+        // memcpy(pointer + 8,mac,sizoof(mac) 4 bytes;
+        // next one
+        ptr = w.d.asBytes + (i - startblock) * 12;
+        memcpy(ptr, &(tag_data[i - startblock].d[0]), 8);
+        memcpy(ptr + 8,MAC, 4);
+    }
+    uint8_t p[12];
+    for (i = 0; i <= endblock - startblock;i++){
+        memcpy(p,w.d.asBytes + (i * 12),12);
+        PrintAndLogEx(NORMAL, "Block |%02x|",i + startblock);
+        PrintAndLogEx(NORMAL, " %02x%02x%02x%02x%02x%02x%02x%02x |",p[0],p[1],p[2],p[3],p[4],p[5],p[6],p[7]);
+        PrintAndLogEx(NORMAL, " MAC |%02x%02x%02x%02x|\n",p[8],p[9],p[10],p[11]);
+    }
+    UsbCommand resp;
+    clearCommandBuffer();
+    SendCommand(&w);
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 4500)) {
+        PrintAndLogEx(WARNING, "command execute timeout");
+        return 0;
+    }
+    return 1;
 }
 
 static int ReadBlock(uint8_t *KEY, uint8_t blockno, uint8_t keyType, bool elite, bool rawkey, bool verbose, bool auth) {
-	uint8_t MAC[4] = {0x00,0x00,0x00,0x00};
-	uint8_t div_key[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+    uint8_t MAC[4] = {0x00,0x00,0x00,0x00};
+    uint8_t div_key[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
 
-	// block 0,1 should always be able to read,  and block 5 on some cards.
-	if (auth || blockno >= 2) {
-		if (!select_and_auth(KEY, MAC, div_key, (keyType == 0x18), elite, rawkey, verbose))
-			return 0;
-	} else {
-		uint8_t CSN[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-		uint8_t CCNR[12] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-		if (!select_only(CSN, CCNR, (keyType == 0x18), verbose))
-			return 0;
-	}
+    // block 0,1 should always be able to read,  and block 5 on some cards.
+    if (auth || blockno >= 2) {
+        if (!select_and_auth(KEY, MAC, div_key, (keyType == 0x18), elite, rawkey, verbose))
+            return 0;
+    } else {
+        uint8_t CSN[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+        uint8_t CCNR[12] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+        if (!select_only(CSN, CCNR, (keyType == 0x18), verbose))
+            return 0;
+    }
 
-	UsbCommand resp;
-	UsbCommand c = {CMD_ICLASS_READBLOCK, {blockno}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	if (!WaitForResponseTimeout(CMD_ACK, &resp, 4500)) {
-		PrintAndLogEx(WARNING, "Command execute timeout");
-		return 0;
-	}
+    UsbCommand resp;
+    UsbCommand c = {CMD_ICLASS_READBLOCK, {blockno}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 4500)) {
+        PrintAndLogEx(WARNING, "Command execute timeout");
+        return 0;
+    }
 
-	uint8_t isOK = resp.arg[0] & 0xff;
-	if (!isOK) {
-		PrintAndLogEx(WARNING, "read block failed");
-		return 0;
-	}
-	//data read is stored in: resp.d.asBytes[0-15]
-	PrintAndLogEx(NORMAL, "block %02X: %s\n", blockno, sprint_hex(resp.d.asBytes, 8));
-	return 1;
+    uint8_t isOK = resp.arg[0] & 0xff;
+    if (!isOK) {
+        PrintAndLogEx(WARNING, "read block failed");
+        return 0;
+    }
+    //data read is stored in: resp.d.asBytes[0-15]
+    PrintAndLogEx(NORMAL, "block %02X: %s\n", blockno, sprint_hex(resp.d.asBytes, 8));
+    return 1;
 }
 
 int CmdHFiClass_ReadBlock(const char *Cmd) {
-	uint8_t blockno = 0;
-	uint8_t keyType = 0x88; //debit key
-	uint8_t KEY[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-	uint8_t keyNbr = 0;
-	uint8_t dataLen = 0;
-	char tempStr[50] = {0};
-	bool elite = false;
-	bool rawkey = false;
-	bool errors = false;
-	bool auth = false;
-	bool verbose = false;
-	uint8_t cmdp = 0;
-	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch (tolower(param_getchar(Cmd, cmdp))) {
-		case 'h':
-			return usage_hf_iclass_readblock();
-		case 'b':
-			if (param_gethex(Cmd, cmdp+1, &blockno, 2)) {
-				PrintAndLogEx(WARNING, "Block No must include 2 HEX symbols\n");
-				errors = true;
-			}
-			cmdp += 2;
-			break;
-		case 'c':
-			keyType = 0x18;
-			cmdp++;
-			break;
-		case 'e':
-			elite = true;
-			cmdp++;
-			break;
-		case 'k':
-			auth = true;
-			dataLen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
-			if (dataLen == 16) {
-				errors = param_gethex(tempStr, 0, KEY, dataLen);
-			} else if (dataLen == 1) {
-				keyNbr = param_get8(Cmd, cmdp+1);
-				if (keyNbr < ICLASS_KEYS_MAX) {
-					memcpy(KEY, iClass_Key_Table[keyNbr], 8);
-				} else {
-					PrintAndLogEx(WARNING, "\nERROR: Credit KeyNbr is invalid\n");
-					errors = true;
-				}
-			} else {
-				PrintAndLogEx(WARNING, "\nERROR: Credit Key is incorrect length\n");
-				errors = true;
-			}
-			cmdp += 2;
-			break;
-		case 'r':
-			rawkey = true;
-			cmdp++;
-			break;
-		case 'v':
-			verbose = true;
-			cmdp++;
-			break;
-		default:
-			PrintAndLogEx(WARNING, "unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
-			errors = true;
-			break;
-		}
-	}
-	if (errors || cmdp < 4) return usage_hf_iclass_readblock();
+    uint8_t blockno = 0;
+    uint8_t keyType = 0x88; //debit key
+    uint8_t KEY[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+    uint8_t keyNbr = 0;
+    uint8_t dataLen = 0;
+    char tempStr[50] = {0};
+    bool elite = false;
+    bool rawkey = false;
+    bool errors = false;
+    bool auth = false;
+    bool verbose = false;
+    uint8_t cmdp = 0;
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+        case 'h':
+            return usage_hf_iclass_readblock();
+        case 'b':
+            if (param_gethex(Cmd, cmdp+1, &blockno, 2)) {
+                PrintAndLogEx(WARNING, "Block No must include 2 HEX symbols\n");
+                errors = true;
+            }
+            cmdp += 2;
+            break;
+        case 'c':
+            keyType = 0x18;
+            cmdp++;
+            break;
+        case 'e':
+            elite = true;
+            cmdp++;
+            break;
+        case 'k':
+            auth = true;
+            dataLen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
+            if (dataLen == 16) {
+                errors = param_gethex(tempStr, 0, KEY, dataLen);
+            } else if (dataLen == 1) {
+                keyNbr = param_get8(Cmd, cmdp+1);
+                if (keyNbr < ICLASS_KEYS_MAX) {
+                    memcpy(KEY, iClass_Key_Table[keyNbr], 8);
+                } else {
+                    PrintAndLogEx(WARNING, "\nERROR: Credit KeyNbr is invalid\n");
+                    errors = true;
+                }
+            } else {
+                PrintAndLogEx(WARNING, "\nERROR: Credit Key is incorrect length\n");
+                errors = true;
+            }
+            cmdp += 2;
+            break;
+        case 'r':
+            rawkey = true;
+            cmdp++;
+            break;
+        case 'v':
+            verbose = true;
+            cmdp++;
+            break;
+        default:
+            PrintAndLogEx(WARNING, "unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
+            errors = true;
+            break;
+        }
+    }
+    if (errors || cmdp < 4) return usage_hf_iclass_readblock();
 
-	if (!auth)
-		PrintAndLogEx(FAILED, "warning: no authentication used with read, only a few specific blocks can be read accurately without authentication.");
-	return ReadBlock(KEY, blockno, keyType, elite, rawkey, verbose, auth);
+    if (!auth)
+        PrintAndLogEx(FAILED, "warning: no authentication used with read, only a few specific blocks can be read accurately without authentication.");
+    return ReadBlock(KEY, blockno, keyType, elite, rawkey, verbose, auth);
 }
 
 int CmdHFiClass_loclass(const char *Cmd) {
-	char opt = tolower(param_getchar(Cmd, 0));
+    char opt = tolower(param_getchar(Cmd, 0));
 
-	if (strlen(Cmd)<1 || opt == 'h')
-		usage_hf_iclass_loclass();
+    if (strlen(Cmd)<1 || opt == 'h')
+        usage_hf_iclass_loclass();
 
-	char fileName[FILE_PATH_SIZE] = {0};
-	if (opt == 'f') {
-		if (param_getstr(Cmd, 1, fileName, sizeof(fileName)) > 0) {
-			return bruteforceFileNoKeys(fileName);
-		} else {
-			PrintAndLogEx(WARNING, "You must specify a filename");
-			return 0;
-		}
-	}
-	else if (opt == 't') {
-		int errors = testCipherUtils();
-		errors += testMAC();
-		errors += doKeyTests(0);
-		errors += testElite();
-		if (errors) PrintAndLogDevice(WARNING, "There were errors!!!");
-		return errors;
-	}
-	return 0;
+    char fileName[FILE_PATH_SIZE] = {0};
+    if (opt == 'f') {
+        if (param_getstr(Cmd, 1, fileName, sizeof(fileName)) > 0) {
+            return bruteforceFileNoKeys(fileName);
+        } else {
+            PrintAndLogEx(WARNING, "You must specify a filename");
+            return 0;
+        }
+    }
+    else if (opt == 't') {
+        int errors = testCipherUtils();
+        errors += testMAC();
+        errors += doKeyTests(0);
+        errors += testElite();
+        if (errors) PrintAndLogDevice(WARNING, "There were errors!!!");
+        return errors;
+    }
+    return 0;
 }
 
 void printIclassDumpContents(uint8_t *iclass_dump, uint8_t startblock, uint8_t endblock, size_t filesize) {
-	uint8_t mem_config;
-	memcpy(&mem_config, iclass_dump + 13,1);
-	uint8_t maxmemcount;
+    uint8_t mem_config;
+    memcpy(&mem_config, iclass_dump + 13,1);
+    uint8_t maxmemcount;
 
-	uint8_t filemaxblock = filesize / 8;
+    uint8_t filemaxblock = filesize / 8;
 
-	if (mem_config & 0x80)
-		maxmemcount = 255;
-	else
-		maxmemcount = 31;
+    if (mem_config & 0x80)
+        maxmemcount = 255;
+    else
+        maxmemcount = 31;
 
-	if (startblock == 0)
-		startblock = 6;
+    if (startblock == 0)
+        startblock = 6;
 
-	if ((endblock > maxmemcount) || (endblock == 0))
-		endblock = maxmemcount;
+    if ((endblock > maxmemcount) || (endblock == 0))
+        endblock = maxmemcount;
 
-	// remember endblock needs to relate to zero-index arrays.
-	if (endblock > filemaxblock-1)
-		endblock = filemaxblock-1;
+    // remember endblock needs to relate to zero-index arrays.
+    if (endblock > filemaxblock-1)
+        endblock = filemaxblock-1;
 
-	//PrintAndLog	("startblock: %d, endblock: %d, filesize: %d, maxmemcount: %d, filemaxblock: %d",startblock, endblock,filesize, maxmemcount, filemaxblock);
+    //PrintAndLog ("startblock: %d, endblock: %d, filesize: %d, maxmemcount: %d, filemaxblock: %d",startblock, endblock,filesize, maxmemcount, filemaxblock);
 
-	int i = startblock;
-	PrintAndLogEx(NORMAL, "------+--+-------------------------+\n");
-	while (i <= endblock){
-		uint8_t *blk = iclass_dump + (i * 8);
-		PrintAndLogEx(NORMAL, "      |%02X| %s\n", i, sprint_hex_ascii(blk, 8) );
-		i++;
-	}
-	PrintAndLogEx(NORMAL, "------+--+-------------------------+\n");
+    int i = startblock;
+    PrintAndLogEx(NORMAL, "------+--+-------------------------+\n");
+    while (i <= endblock){
+        uint8_t *blk = iclass_dump + (i * 8);
+        PrintAndLogEx(NORMAL, "      |%02X| %s\n", i, sprint_hex_ascii(blk, 8) );
+        i++;
+    }
+    PrintAndLogEx(NORMAL, "------+--+-------------------------+\n");
 }
 
 int CmdHFiClassReadTagFile(const char *Cmd) {
-	int startblock = 0;
-	int endblock = 0;
-	char tempnum[5];
-	FILE *f;
-	char filename[FILE_PATH_SIZE];
-	if (param_getstr(Cmd, 0, filename, sizeof(filename)) < 1)
-		return usage_hf_iclass_readtagfile();
+    int startblock = 0;
+    int endblock = 0;
+    char tempnum[5];
+    FILE *f;
+    char filename[FILE_PATH_SIZE];
+    if (param_getstr(Cmd, 0, filename, sizeof(filename)) < 1)
+        return usage_hf_iclass_readtagfile();
 
-	if (param_getstr(Cmd, 1, tempnum, sizeof(tempnum)) < 1)
-		startblock = 0;
-	else
-		sscanf(tempnum, "%d", &startblock);
+    if (param_getstr(Cmd, 1, tempnum, sizeof(tempnum)) < 1)
+        startblock = 0;
+    else
+        sscanf(tempnum, "%d", &startblock);
 
-	if (param_getstr(Cmd,2, tempnum, sizeof(tempnum)) < 1)
-		endblock = 0;
-	else
-		sscanf(tempnum, "%d", &endblock);
+    if (param_getstr(Cmd,2, tempnum, sizeof(tempnum)) < 1)
+        endblock = 0;
+    else
+        sscanf(tempnum, "%d", &endblock);
 
-	// file handling and reading
-	f = fopen(filename, "rb");
-	if(!f) {
-		PrintAndLogEx(WARNING, "Failed to read from file '%s'", filename);
-		return 1;
-	}
-	fseek(f, 0, SEEK_END);
-	long fsize = ftell(f);
-	fseek(f, 0, SEEK_SET);
+    // file handling and reading
+    f = fopen(filename, "rb");
+    if(!f) {
+        PrintAndLogEx(WARNING, "Failed to read from file '%s'", filename);
+        return 1;
+    }
+    fseek(f, 0, SEEK_END);
+    long fsize = ftell(f);
+    fseek(f, 0, SEEK_SET);
 
-	if ( fsize < 0 ) {
-		PrintAndLogEx(WARNING, "Error, when getting filesize");
-		fclose(f);
-		return 1;
-	}
+    if ( fsize < 0 ) {
+        PrintAndLogEx(WARNING, "Error, when getting filesize");
+        fclose(f);
+        return 1;
+    }
 
-	uint8_t *dump = calloc(fsize, sizeof(uint8_t));
-	if ( !dump ) {
-		PrintAndLogEx(WARNING, "Failed to allocate memory");
-		fclose(f);
-		return 1;
-	}
-	size_t bytes_read = fread(dump, 1, fsize, f);
-	fclose(f);
+    uint8_t *dump = calloc(fsize, sizeof(uint8_t));
+    if ( !dump ) {
+        PrintAndLogEx(WARNING, "Failed to allocate memory");
+        fclose(f);
+        return 1;
+    }
+    size_t bytes_read = fread(dump, 1, fsize, f);
+    fclose(f);
 
-	uint8_t *csn = dump;
-	PrintAndLogEx(NORMAL, "------+--+-------------------------+\n");
-	PrintAndLogEx(NORMAL, "CSN   |00| %s|\n", sprint_hex(csn, 8) );
-	printIclassDumpContents(dump, startblock, endblock, bytes_read);
-	free(dump);
-	return 0;
+    uint8_t *csn = dump;
+    PrintAndLogEx(NORMAL, "------+--+-------------------------+\n");
+    PrintAndLogEx(NORMAL, "CSN   |00| %s|\n", sprint_hex(csn, 8) );
+    printIclassDumpContents(dump, startblock, endblock, bytes_read);
+    free(dump);
+    return 0;
 }
 
-void HFiClassCalcDivKey(uint8_t	*CSN, uint8_t *KEY, uint8_t *div_key, bool elite){
-	uint8_t keytable[128] = {0};
-	uint8_t key_index[8] = {0};
-	if (elite) {
-		uint8_t key_sel[8] = { 0 };
-		uint8_t key_sel_p[8] = { 0 };
-		hash2(KEY, keytable);
-		hash1(CSN, key_index);
-		for(uint8_t i = 0; i < 8 ; i++)
-			key_sel[i] = keytable[key_index[i]] & 0xFF;
+void HFiClassCalcDivKey(uint8_t *CSN, uint8_t *KEY, uint8_t *div_key, bool elite){
+    uint8_t keytable[128] = {0};
+    uint8_t key_index[8] = {0};
+    if (elite) {
+        uint8_t key_sel[8] = { 0 };
+        uint8_t key_sel_p[8] = { 0 };
+        hash2(KEY, keytable);
+        hash1(CSN, key_index);
+        for(uint8_t i = 0; i < 8 ; i++)
+            key_sel[i] = keytable[key_index[i]] & 0xFF;
 
-		//Permute from iclass format to standard format
-		permutekey_rev(key_sel, key_sel_p);
-		diversifyKey(CSN, key_sel_p, div_key);
-	} else {
-		diversifyKey(CSN, KEY, div_key);
-	}
+        //Permute from iclass format to standard format
+        permutekey_rev(key_sel, key_sel_p);
+        diversifyKey(CSN, key_sel_p, div_key);
+    } else {
+        diversifyKey(CSN, KEY, div_key);
+    }
 }
 
 //when told CSN, oldkey, newkey, if new key is elite (elite), and if old key was elite (oldElite)
 //calculate and return xor_div_key (ready for a key write command)
 //print all div_keys if verbose
 static void HFiClassCalcNewKey(uint8_t *CSN, uint8_t *OLDKEY, uint8_t *NEWKEY, uint8_t *xor_div_key, bool elite, bool oldElite, bool verbose){
-	uint8_t old_div_key[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-	uint8_t new_div_key[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-	//get old div key
-	HFiClassCalcDivKey(CSN, OLDKEY, old_div_key, oldElite);
-	//get new div key
-	HFiClassCalcDivKey(CSN, NEWKEY, new_div_key, elite);
+    uint8_t old_div_key[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+    uint8_t new_div_key[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+    //get old div key
+    HFiClassCalcDivKey(CSN, OLDKEY, old_div_key, oldElite);
+    //get new div key
+    HFiClassCalcDivKey(CSN, NEWKEY, new_div_key, elite);
 
-	for (uint8_t i = 0; i < sizeof(old_div_key); i++){
-		xor_div_key[i] = old_div_key[i] ^ new_div_key[i];
-	}
-	if (verbose) {
-		PrintAndLogEx(SUCCESS, "Old div key : %s\n",sprint_hex(old_div_key,8));
-		PrintAndLogEx(SUCCESS, "New div key : %s\n",sprint_hex(new_div_key,8));
-		PrintAndLogEx(SUCCESS, "Xor div key : %s\n",sprint_hex(xor_div_key,8));
-	}
+    for (uint8_t i = 0; i < sizeof(old_div_key); i++){
+        xor_div_key[i] = old_div_key[i] ^ new_div_key[i];
+    }
+    if (verbose) {
+        PrintAndLogEx(SUCCESS, "Old div key : %s\n",sprint_hex(old_div_key,8));
+        PrintAndLogEx(SUCCESS, "New div key : %s\n",sprint_hex(new_div_key,8));
+        PrintAndLogEx(SUCCESS, "Xor div key : %s\n",sprint_hex(xor_div_key,8));
+    }
 }
 
 int CmdHFiClassCalcNewKey(const char *Cmd) {
-	uint8_t OLDKEY[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-	uint8_t NEWKEY[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-	uint8_t xor_div_key[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-	uint8_t CSN[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-	uint8_t CCNR[12] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-	uint8_t keyNbr = 0;
-	uint8_t dataLen = 0;
-	char tempStr[50] = {0};
-	bool givenCSN = false;
-	bool oldElite = false;
-	bool elite = false;
-	bool errors = false;
-	uint8_t cmdp = 0;
-	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch (tolower(param_getchar(Cmd, cmdp))) {
-		case 'h':
-			return usage_hf_iclass_calc_newkey();
-		case 'e':
-			dataLen = param_getstr(Cmd, cmdp, tempStr, sizeof(tempStr));
-			if (dataLen==2)
-				oldElite = true;
-			elite = true;
-			cmdp++;
-			break;
-		case 'n':
-			dataLen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
-			if (dataLen == 16) {
-				errors = param_gethex(tempStr, 0, NEWKEY, dataLen);
-			} else if (dataLen == 1) {
-				keyNbr = param_get8(Cmd, cmdp+1);
-				if (keyNbr < ICLASS_KEYS_MAX) {
-					memcpy(NEWKEY, iClass_Key_Table[keyNbr], 8);
-				} else {
-					PrintAndLogEx(WARNING, "\nERROR: NewKey Nbr is invalid\n");
-					errors = true;
-				}
-			} else {
-				PrintAndLogEx(WARNING, "\nERROR: NewKey is incorrect length\n");
-				errors = true;
-			}
-			cmdp += 2;
-			break;
-		case 'o':
-			dataLen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
-			if (dataLen == 16) {
-				errors = param_gethex(tempStr, 0, OLDKEY, dataLen);
-			} else if (dataLen == 1) {
-				keyNbr = param_get8(Cmd, cmdp+1);
-				if (keyNbr < ICLASS_KEYS_MAX) {
-					memcpy(OLDKEY, iClass_Key_Table[keyNbr], 8);
-				} else {
-					PrintAndLogEx(WARNING, "\nERROR: Credit KeyNbr is invalid\n");
-					errors = true;
-				}
-			} else {
-				PrintAndLogEx(WARNING, "\nERROR: Credit Key is incorrect length\n");
-				errors = true;
-			}
-			cmdp += 2;
-			break;
-		case 's':
-			givenCSN = true;
-			if (param_gethex(Cmd, cmdp+1, CSN, 16))
-				return usage_hf_iclass_calc_newkey();
-			cmdp += 2;
-			break;
-		default:
-			PrintAndLogEx(WARNING, "unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
-			errors = true;
-			break;
-		}
-	}
-	if (errors || cmdp < 4) return usage_hf_iclass_calc_newkey();
+    uint8_t OLDKEY[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+    uint8_t NEWKEY[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+    uint8_t xor_div_key[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+    uint8_t CSN[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+    uint8_t CCNR[12] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+    uint8_t keyNbr = 0;
+    uint8_t dataLen = 0;
+    char tempStr[50] = {0};
+    bool givenCSN = false;
+    bool oldElite = false;
+    bool elite = false;
+    bool errors = false;
+    uint8_t cmdp = 0;
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+        case 'h':
+            return usage_hf_iclass_calc_newkey();
+        case 'e':
+            dataLen = param_getstr(Cmd, cmdp, tempStr, sizeof(tempStr));
+            if (dataLen==2)
+                oldElite = true;
+            elite = true;
+            cmdp++;
+            break;
+        case 'n':
+            dataLen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
+            if (dataLen == 16) {
+                errors = param_gethex(tempStr, 0, NEWKEY, dataLen);
+            } else if (dataLen == 1) {
+                keyNbr = param_get8(Cmd, cmdp+1);
+                if (keyNbr < ICLASS_KEYS_MAX) {
+                    memcpy(NEWKEY, iClass_Key_Table[keyNbr], 8);
+                } else {
+                    PrintAndLogEx(WARNING, "\nERROR: NewKey Nbr is invalid\n");
+                    errors = true;
+                }
+            } else {
+                PrintAndLogEx(WARNING, "\nERROR: NewKey is incorrect length\n");
+                errors = true;
+            }
+            cmdp += 2;
+            break;
+        case 'o':
+            dataLen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
+            if (dataLen == 16) {
+                errors = param_gethex(tempStr, 0, OLDKEY, dataLen);
+            } else if (dataLen == 1) {
+                keyNbr = param_get8(Cmd, cmdp+1);
+                if (keyNbr < ICLASS_KEYS_MAX) {
+                    memcpy(OLDKEY, iClass_Key_Table[keyNbr], 8);
+                } else {
+                    PrintAndLogEx(WARNING, "\nERROR: Credit KeyNbr is invalid\n");
+                    errors = true;
+                }
+            } else {
+                PrintAndLogEx(WARNING, "\nERROR: Credit Key is incorrect length\n");
+                errors = true;
+            }
+            cmdp += 2;
+            break;
+        case 's':
+            givenCSN = true;
+            if (param_gethex(Cmd, cmdp+1, CSN, 16))
+                return usage_hf_iclass_calc_newkey();
+            cmdp += 2;
+            break;
+        default:
+            PrintAndLogEx(WARNING, "unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
+            errors = true;
+            break;
+        }
+    }
+    if (errors || cmdp < 4) return usage_hf_iclass_calc_newkey();
 
-	if (!givenCSN)
-		if (!select_only(CSN, CCNR, false, true))
-			return 0;
+    if (!givenCSN)
+        if (!select_only(CSN, CCNR, false, true))
+            return 0;
 
-	HFiClassCalcNewKey(CSN, OLDKEY, NEWKEY, xor_div_key, elite, oldElite, true);
-	return 0;
+    HFiClassCalcNewKey(CSN, OLDKEY, NEWKEY, xor_div_key, elite, oldElite, true);
+    return 0;
 }
 
 static int loadKeys(char *filename) {
-	FILE *f;
-	f = fopen(filename, "rb");
-	if(!f) {
-		PrintAndLogEx(WARNING, "Failed to read from file '%s'", filename);
-		return 0;
-	}
-	fseek(f, 0, SEEK_END);
-	long fsize = ftell(f);
-	fseek(f, 0, SEEK_SET);
+    FILE *f;
+    f = fopen(filename, "rb");
+    if(!f) {
+        PrintAndLogEx(WARNING, "Failed to read from file '%s'", filename);
+        return 0;
+    }
+    fseek(f, 0, SEEK_END);
+    long fsize = ftell(f);
+    fseek(f, 0, SEEK_SET);
 
-	if ( fsize < 0 ) {
-		PrintAndLogEx(WARNING, "Error, when getting filesize");
-		fclose(f);
-		return 1;
-	}
+    if ( fsize < 0 ) {
+        PrintAndLogEx(WARNING, "Error, when getting filesize");
+        fclose(f);
+        return 1;
+    }
 
-	uint8_t *dump = calloc(fsize, sizeof(uint8_t));
-	if ( !dump ) {
-		PrintAndLogEx(WARNING, "Failed to allocate memory");
-		fclose(f);
-		return 1;
-	}
-	size_t bytes_read = fread(dump, 1, fsize, f);
-	fclose(f);
-	if (bytes_read > ICLASS_KEYS_MAX * 8){
-		PrintAndLogEx(WARNING, "File is too long to load - bytes: %u", bytes_read);
-		free(dump);
-		return 0;
-	}
-	uint8_t i = 0;
-	for (; i < bytes_read/8; i++)
-		memcpy(iClass_Key_Table[i],dump+(i*8),8);
+    uint8_t *dump = calloc(fsize, sizeof(uint8_t));
+    if ( !dump ) {
+        PrintAndLogEx(WARNING, "Failed to allocate memory");
+        fclose(f);
+        return 1;
+    }
+    size_t bytes_read = fread(dump, 1, fsize, f);
+    fclose(f);
+    if (bytes_read > ICLASS_KEYS_MAX * 8){
+        PrintAndLogEx(WARNING, "File is too long to load - bytes: %u", bytes_read);
+        free(dump);
+        return 0;
+    }
+    uint8_t i = 0;
+    for (; i < bytes_read/8; i++)
+        memcpy(iClass_Key_Table[i],dump+(i*8),8);
 
-	free(dump);
-	PrintAndLogEx(SUCCESS, "%u keys loaded", i);
-	return 1;
+    free(dump);
+    PrintAndLogEx(SUCCESS, "%u keys loaded", i);
+    return 1;
 }
 
 static int saveKeys(char *filename) {
-	FILE *f;
-	f = fopen(filename, "wb");
-	if (!f) {
-		PrintAndLogEx(NORMAL, "[!] error opening file %s\n",filename);
-		return 0;
-	}
-	for (uint8_t i = 0; i < ICLASS_KEYS_MAX; i++){
-		if (fwrite(iClass_Key_Table[i],8,1,f) != 1){
-			PrintAndLogEx(WARNING, "save key failed to write to file: %s", filename);
-			break;
-		}
-	}
-	fclose(f);
-	return 0;
+    FILE *f;
+    f = fopen(filename, "wb");
+    if (!f) {
+        PrintAndLogEx(NORMAL, "[!] error opening file %s\n",filename);
+        return 0;
+    }
+    for (uint8_t i = 0; i < ICLASS_KEYS_MAX; i++){
+        if (fwrite(iClass_Key_Table[i],8,1,f) != 1){
+            PrintAndLogEx(WARNING, "save key failed to write to file: %s", filename);
+            break;
+        }
+    }
+    fclose(f);
+    return 0;
 }
 
 static int printKeys(void) {
-	PrintAndLogEx(NORMAL, "");
-	for (uint8_t i = 0; i < ICLASS_KEYS_MAX; i++)
-		PrintAndLogEx(NORMAL, "%u: %s", i, sprint_hex(iClass_Key_Table[i],8));
-	PrintAndLogEx(NORMAL, "");
-	return 0;
+    PrintAndLogEx(NORMAL, "");
+    for (uint8_t i = 0; i < ICLASS_KEYS_MAX; i++)
+        PrintAndLogEx(NORMAL, "%u: %s", i, sprint_hex(iClass_Key_Table[i],8));
+    PrintAndLogEx(NORMAL, "");
+    return 0;
 }
 
 int CmdHFiClassManageKeys(const char *Cmd) {
-	uint8_t keyNbr = 0;
-	uint8_t dataLen = 0;
-	uint8_t KEY[8] = {0};
-	char filename[FILE_PATH_SIZE];
-	uint8_t fileNameLen = 0;
-	bool errors = false;
-	uint8_t operation = 0;
-	char tempStr[20];
-	uint8_t cmdp = 0;
+    uint8_t keyNbr = 0;
+    uint8_t dataLen = 0;
+    uint8_t KEY[8] = {0};
+    char filename[FILE_PATH_SIZE];
+    uint8_t fileNameLen = 0;
+    bool errors = false;
+    uint8_t operation = 0;
+    char tempStr[20];
+    uint8_t cmdp = 0;
 
-	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch (tolower(param_getchar(Cmd, cmdp))) {
-		case 'h':
-			return usage_hf_iclass_managekeys();
-		case 'f':
-			fileNameLen = param_getstr(Cmd, cmdp+1, filename, sizeof(filename));
-			if (fileNameLen < 1) {
-				PrintAndLogEx(WARNING, "No filename found after f");
-				errors = true;
-			}
-			cmdp += 2;
-			break;
-		case 'n':
-			keyNbr = param_get8(Cmd, cmdp+1);
-			if (keyNbr >= ICLASS_KEYS_MAX) {
-				PrintAndLogEx(WARNING, "Invalid block number");
-				errors = true;
-			}
-			cmdp += 2;
-			break;
-		case 'k':
-			operation += 3; //set key
-			dataLen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
-			if (dataLen == 16) { //ul-c or ev1/ntag key length
-				errors = param_gethex(tempStr, 0, KEY, dataLen);
-			} else {
-				PrintAndLogEx(WARNING, "\nERROR: Key is incorrect length\n");
-				errors = true;
-			}
-			cmdp += 2;
-			break;
-		case 'p':
-			operation += 4; //print keys in memory
-			cmdp++;
-			break;
-		case 'l':
-			operation += 5; //load keys from file
-			cmdp++;
-			break;
-		case 's':
-			operation += 6; //save keys to file
-			cmdp++;
-			break;
-		default:
-			PrintAndLogEx(WARNING, "unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
-			errors = true;
-			break;
-		}
-	}
-	if (errors) return usage_hf_iclass_managekeys();
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+        case 'h':
+            return usage_hf_iclass_managekeys();
+        case 'f':
+            fileNameLen = param_getstr(Cmd, cmdp+1, filename, sizeof(filename));
+            if (fileNameLen < 1) {
+                PrintAndLogEx(WARNING, "No filename found after f");
+                errors = true;
+            }
+            cmdp += 2;
+            break;
+        case 'n':
+            keyNbr = param_get8(Cmd, cmdp+1);
+            if (keyNbr >= ICLASS_KEYS_MAX) {
+                PrintAndLogEx(WARNING, "Invalid block number");
+                errors = true;
+            }
+            cmdp += 2;
+            break;
+        case 'k':
+            operation += 3; //set key
+            dataLen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
+            if (dataLen == 16) { //ul-c or ev1/ntag key length
+                errors = param_gethex(tempStr, 0, KEY, dataLen);
+            } else {
+                PrintAndLogEx(WARNING, "\nERROR: Key is incorrect length\n");
+                errors = true;
+            }
+            cmdp += 2;
+            break;
+        case 'p':
+            operation += 4; //print keys in memory
+            cmdp++;
+            break;
+        case 'l':
+            operation += 5; //load keys from file
+            cmdp++;
+            break;
+        case 's':
+            operation += 6; //save keys to file
+            cmdp++;
+            break;
+        default:
+            PrintAndLogEx(WARNING, "unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
+            errors = true;
+            break;
+        }
+    }
+    if (errors) return usage_hf_iclass_managekeys();
 
-	if (operation == 0){
-		PrintAndLogEx(WARNING, "no operation specified (load, save, or print)\n");
-		return usage_hf_iclass_managekeys();
-	}
-	if (operation > 6){
-		PrintAndLogEx(WARNING, "Too many operations specified\n");
-		return usage_hf_iclass_managekeys();
-	}
-	if (operation > 4 && fileNameLen == 0){
-		PrintAndLogEx(WARNING, "You must enter a filename when loading or saving\n");
-		return usage_hf_iclass_managekeys();
-	}
+    if (operation == 0){
+        PrintAndLogEx(WARNING, "no operation specified (load, save, or print)\n");
+        return usage_hf_iclass_managekeys();
+    }
+    if (operation > 6){
+        PrintAndLogEx(WARNING, "Too many operations specified\n");
+        return usage_hf_iclass_managekeys();
+    }
+    if (operation > 4 && fileNameLen == 0){
+        PrintAndLogEx(WARNING, "You must enter a filename when loading or saving\n");
+        return usage_hf_iclass_managekeys();
+    }
 
-	switch (operation){
-		case 3: memcpy(iClass_Key_Table[keyNbr], KEY, 8); return 1;
-		case 4: return printKeys();
-		case 5: return loadKeys(filename);
-		case 6: return saveKeys(filename);
-		break;
-	}
-	return 0;
+    switch (operation){
+        case 3: memcpy(iClass_Key_Table[keyNbr], KEY, 8); return 1;
+        case 4: return printKeys();
+        case 5: return loadKeys(filename);
+        case 6: return saveKeys(filename);
+        break;
+    }
+    return 0;
 }
 
 int CmdHFiClassCheckKeys(const char *Cmd) {
 
-	// empty string
-	if (strlen(Cmd) == 0) return usage_hf_iclass_chk();
+    // empty string
+    if (strlen(Cmd) == 0) return usage_hf_iclass_chk();
 
-	uint8_t CSN[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-	uint8_t CCNR[12] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+    uint8_t CSN[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+    uint8_t CCNR[12] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
 
-	// elite key,  raw key, standard key
-	bool use_elite = false;
-	bool use_raw = false;
-	bool use_credit_key	= false;
-	bool found_debit = false;
-	//bool found_credit = false;
-	bool got_csn = false;
-	bool errors = false;
-	uint8_t cmdp = 0x00;
+    // elite key,  raw key, standard key
+    bool use_elite = false;
+    bool use_raw = false;
+    bool use_credit_key = false;
+    bool found_debit = false;
+    //bool found_credit = false;
+    bool got_csn = false;
+    bool errors = false;
+    uint8_t cmdp = 0x00;
 
-	char filename[FILE_PATH_SIZE] = {0};
-	uint8_t fileNameLen = 0;
+    char filename[FILE_PATH_SIZE] = {0};
+    uint8_t fileNameLen = 0;
 
-	uint8_t *keyBlock = NULL;
-	iclass_premac_t *pre = NULL;
-	int keycnt = 0;
+    uint8_t *keyBlock = NULL;
+    iclass_premac_t *pre = NULL;
+    int keycnt = 0;
 
-	// time
-	uint64_t t1 = msclock();
+    // time
+    uint64_t t1 = msclock();
 
-	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch ( tolower(param_getchar(Cmd, cmdp))) {
-		case 'h':
-			return usage_hf_iclass_chk();
-		case 'f':
-			fileNameLen = param_getstr(Cmd, cmdp+1, filename, sizeof(filename));
-			if (fileNameLen < 1) {
-				PrintAndLogEx(WARNING, "no filename found after f");
-				errors = true;
-			}
-			cmdp += 2;
-			break;
-		case 'e':
-			use_elite = true;
-			cmdp++;
-			break;
-		case 'c':
-			use_credit_key = true;
-			cmdp++;
-			break;
-		case 'r':
-			use_raw = true;
-			cmdp++;
-			break;
-		default:
-			PrintAndLogEx(WARNING, "unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
-			errors = true;
-			break;
-		}
-	}
-	if (errors) return usage_hf_iclass_chk();
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch ( tolower(param_getchar(Cmd, cmdp))) {
+        case 'h':
+            return usage_hf_iclass_chk();
+        case 'f':
+            fileNameLen = param_getstr(Cmd, cmdp+1, filename, sizeof(filename));
+            if (fileNameLen < 1) {
+                PrintAndLogEx(WARNING, "no filename found after f");
+                errors = true;
+            }
+            cmdp += 2;
+            break;
+        case 'e':
+            use_elite = true;
+            cmdp++;
+            break;
+        case 'c':
+            use_credit_key = true;
+            cmdp++;
+            break;
+        case 'r':
+            use_raw = true;
+            cmdp++;
+            break;
+        default:
+            PrintAndLogEx(WARNING, "unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
+            errors = true;
+            break;
+        }
+    }
+    if (errors) return usage_hf_iclass_chk();
 
 
-	// Get CSN / UID and CCNR
-	PrintAndLogEx(SUCCESS, "Reading tag CSN");
-	for (uint8_t i=0; i<10 && !got_csn; i++) {
-		if (select_only(CSN, CCNR, false, false)) {
-			got_csn = true;
-		} else {
-			PrintAndLogEx(WARNING, "one more try\n");
-		}
-	}
+    // Get CSN / UID and CCNR
+    PrintAndLogEx(SUCCESS, "Reading tag CSN");
+    for (uint8_t i=0; i<10 && !got_csn; i++) {
+        if (select_only(CSN, CCNR, false, false)) {
+            got_csn = true;
+        } else {
+            PrintAndLogEx(WARNING, "one more try\n");
+        }
+    }
 
-	if ( !got_csn ) {
-		PrintAndLogEx(WARNING, "can't select card, aborting...");
-		return 1;
-	}
+    if ( !got_csn ) {
+        PrintAndLogEx(WARNING, "can't select card, aborting...");
+        return 1;
+    }
 
-	// load keys into keyblock
-	int res = LoadDictionaryKeyFile( filename, &keyBlock, &keycnt);
-	if ( res > 0) {
-		free(keyBlock);
-		return 1;
-	}
+    // load keys into keyblock
+    int res = LoadDictionaryKeyFile( filename, &keyBlock, &keycnt);
+    if ( res > 0) {
+        free(keyBlock);
+        return 1;
+    }
 
-	pre = calloc(keycnt, sizeof(iclass_premac_t));
-	if ( !pre ) {
-		free(keyBlock);
-		return 1;
-	}
+    pre = calloc(keycnt, sizeof(iclass_premac_t));
+    if ( !pre ) {
+        free(keyBlock);
+        return 1;
+    }
 
-	PrintAndLogEx(SUCCESS, "Generating diversified keys, MAC");
-	if (use_elite)
-		PrintAndLogEx(SUCCESS, "Using elite algo");
-	if (use_raw)
-		PrintAndLogEx(SUCCESS, "Using raw mode");
+    PrintAndLogEx(SUCCESS, "Generating diversified keys, MAC");
+    if (use_elite)
+        PrintAndLogEx(SUCCESS, "Using elite algo");
+    if (use_raw)
+        PrintAndLogEx(SUCCESS, "Using raw mode");
 
-	PrintAndLogEx(SUCCESS, "Searching for %s key", (use_credit_key) ? "CREDIT" : "DEBIT");
-	PrintAndLogEx(SUCCESS,"Tag info");
-	PrintAndLogEx(SUCCESS, "CSN     | %s", sprint_hex( CSN, sizeof(CSN) ));
-	PrintAndLogEx(SUCCESS, "CCNR    | %s", sprint_hex( CCNR, sizeof(CCNR) ));
-	res = GenerateMacFromKeyFile( CSN, CCNR, use_raw, use_elite, keyBlock, keycnt, pre );
-	if ( res > 0) {
-		free(keyBlock);
-		free(pre);
-		return 1;
-	}
+    PrintAndLogEx(SUCCESS, "Searching for %s key", (use_credit_key) ? "CREDIT" : "DEBIT");
+    PrintAndLogEx(SUCCESS,"Tag info");
+    PrintAndLogEx(SUCCESS, "CSN     | %s", sprint_hex( CSN, sizeof(CSN) ));
+    PrintAndLogEx(SUCCESS, "CCNR    | %s", sprint_hex( CCNR, sizeof(CCNR) ));
+    res = GenerateMacFromKeyFile( CSN, CCNR, use_raw, use_elite, keyBlock, keycnt, pre );
+    if ( res > 0) {
+        free(keyBlock);
+        free(pre);
+        return 1;
+    }
 
-	//PrintPreCalcMac(keyBlock, keycnt, pre);
+    //PrintPreCalcMac(keyBlock, keycnt, pre);
 
-	// max 42 keys inside USB_COMMAND.  512/4 = 103 mac
-	uint32_t chunksize = keycnt > (USB_CMD_DATA_SIZE/4) ? (USB_CMD_DATA_SIZE/4) : keycnt;
-	bool lastChunk = false;
+    // max 42 keys inside USB_COMMAND.  512/4 = 103 mac
+    uint32_t chunksize = keycnt > (USB_CMD_DATA_SIZE/4) ? (USB_CMD_DATA_SIZE/4) : keycnt;
+    bool lastChunk = false;
 
-	// main keychunk loop
-	for (uint32_t i = 0; i < keycnt; i += chunksize) {
+    // main keychunk loop
+    for (uint32_t i = 0; i < keycnt; i += chunksize) {
 
-		uint64_t t2 = msclock();
-		uint8_t timeout = 0;
+        uint64_t t2 = msclock();
+        uint8_t timeout = 0;
 
-		if (ukbhit()) {
-			int gc = getchar(); (void)gc;
-			PrintAndLogEx(WARNING, "\n[!] Aborted via keyboard!\n");
-			goto out;
-		}
+        if (ukbhit()) {
+            int gc = getchar(); (void)gc;
+            PrintAndLogEx(WARNING, "\n[!] Aborted via keyboard!\n");
+            goto out;
+        }
 
-		uint32_t keys = ((keycnt - i)  > chunksize) ? chunksize : keycnt - i;
+        uint32_t keys = ((keycnt - i)  > chunksize) ? chunksize : keycnt - i;
 
-		// last chunk?
-		if ( keys == keycnt - i)
-			lastChunk = true;
+        // last chunk?
+        if ( keys == keycnt - i)
+            lastChunk = true;
 
-		UsbCommand c = {CMD_ICLASS_CHECK_KEYS, { (lastChunk << 8), keys, 0}};
+        UsbCommand c = {CMD_ICLASS_CHECK_KEYS, { (lastChunk << 8), keys, 0}};
 
-		// bit 16
-		//   - 1 indicates credit key
-		//   - 0 indicates debit key (default)
-		c.arg[0] |= (use_credit_key << 16);
+        // bit 16
+        //   - 1 indicates credit key
+        //   - 0 indicates debit key (default)
+        c.arg[0] |= (use_credit_key << 16);
 
-		memcpy(c.d.asBytes, pre + i, 4 * keys);
-		clearCommandBuffer();
-		SendCommand(&c);
-		UsbCommand resp;
+        memcpy(c.d.asBytes, pre + i, 4 * keys);
+        clearCommandBuffer();
+        SendCommand(&c);
+        UsbCommand resp;
 
-		while ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
-			timeout++;
-			printf("."); fflush(stdout);
-			if (timeout > 120) {
-				PrintAndLogEx(WARNING, "\nNo response from Proxmark. Aborting...");
-				goto out;
-			}
-		}
+        while ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
+            timeout++;
+            printf("."); fflush(stdout);
+            if (timeout > 120) {
+                PrintAndLogEx(WARNING, "\nNo response from Proxmark. Aborting...");
+                goto out;
+            }
+        }
 
-		uint8_t found = resp.arg[1] & 0xFF;
-		uint8_t isOK = resp.arg[0] & 0xFF;
+        uint8_t found = resp.arg[1] & 0xFF;
+        uint8_t isOK = resp.arg[0] & 0xFF;
 
-		t2 = msclock() - t2;
-		switch ( isOK ) {
-			case 1: {
-				found_debit = true;
+        t2 = msclock() - t2;
+        switch ( isOK ) {
+            case 1: {
+                found_debit = true;
 
-				PrintAndLogEx(NORMAL, "\n[-] Chunk [%d/%d]: %.1fs [%s]  found key  %s (index %u)"
-						, i
-						, keycnt
-						, (float)(t2/1000.0)
-						, (use_credit_key) ? "credit" : "debit"
-						, sprint_hex(keyBlock + (i+found)*8, 8)
-						, found
-					);
-				break;
-			}
-			case 0: {
-				PrintAndLogEx(NORMAL, "\n[-] Chunk [%d/%d] : %.1fs [%s]"
-						, i
-						, keycnt
-						, (float)(t2/1000.0)
-						, (use_credit_key) ? "credit" : "debit"
-					);
-				break;
-			}
-			case 99: {
-			}
-			default: break;
-		}
+                PrintAndLogEx(NORMAL, "\n[-] Chunk [%d/%d]: %.1fs [%s]  found key  %s (index %u)"
+                        , i
+                        , keycnt
+                        , (float)(t2/1000.0)
+                        , (use_credit_key) ? "credit" : "debit"
+                        , sprint_hex(keyBlock + (i+found)*8, 8)
+                        , found
+                    );
+                break;
+            }
+            case 0: {
+                PrintAndLogEx(NORMAL, "\n[-] Chunk [%d/%d] : %.1fs [%s]"
+                        , i
+                        , keycnt
+                        , (float)(t2/1000.0)
+                        , (use_credit_key) ? "credit" : "debit"
+                    );
+                break;
+            }
+            case 99: {
+            }
+            default: break;
+        }
 
-		// both keys found.
-		if ( found_debit ) {
-			PrintAndLogEx(SUCCESS, "All keys found, exiting");
-			break;
-		}
+        // both keys found.
+        if ( found_debit ) {
+            PrintAndLogEx(SUCCESS, "All keys found, exiting");
+            break;
+        }
 
-	} // end chunks of keys
+    } // end chunks of keys
 
 out:
-	t1 = msclock() - t1;
+    t1 = msclock() - t1;
 
-	PrintAndLogEx(SUCCESS, "\nTime in iclass checkkeys: %.0f seconds\n", (float)t1/1000.0);
+    PrintAndLogEx(SUCCESS, "\nTime in iclass checkkeys: %.0f seconds\n", (float)t1/1000.0);
 
-	DropField();
-	free(pre);
-	free(keyBlock);
-	return 0;
+    DropField();
+    free(pre);
+    free(keyBlock);
+    return 0;
 }
 
 static int cmp_uint32( const void *a, const void *b) {
 
-	const iclass_prekey_t* x = (const iclass_prekey_t *)a;
-	const iclass_prekey_t* y = (const iclass_prekey_t *)b;
+    const iclass_prekey_t* x = (const iclass_prekey_t *)a;
+    const iclass_prekey_t* y = (const iclass_prekey_t *)b;
 
-	uint32_t mx = bytes_to_num( (uint8_t*)x->mac, 4);
-	uint32_t my = bytes_to_num( (uint8_t*)y->mac, 4);
+    uint32_t mx = bytes_to_num( (uint8_t*)x->mac, 4);
+    uint32_t my = bytes_to_num( (uint8_t*)y->mac, 4);
 
     if (mx < my)
-		return -1;
+        return -1;
     else
-		return mx > my;
+        return mx > my;
 }
 
 // this method tries to identify in which configuration mode a iClass / iClass SE reader is in.
 // Standard or Elite / HighSecurity mode.  It uses a default key dictionary list in order to work.
 int CmdHFiClassLookUp(const char *Cmd) {
 
-	uint8_t CSN[8];
-	uint8_t EPURSE[8] = { 0,0,0,0,0,0,0,0 };
-	uint8_t MACS[8]= { 0,0,0,0,0,0,0,0 };
-	uint8_t CCNR[12];
-	uint8_t MAC_TAG[4] = { 0,0,0,0 };
+    uint8_t CSN[8];
+    uint8_t EPURSE[8] = { 0,0,0,0,0,0,0,0 };
+    uint8_t MACS[8]= { 0,0,0,0,0,0,0,0 };
+    uint8_t CCNR[12];
+    uint8_t MAC_TAG[4] = { 0,0,0,0 };
 
-	// elite key,  raw key, standard key
-	bool use_elite = false;
-	bool use_raw = false;
-	bool errors = false;
-	uint8_t cmdp = 0x00;
+    // elite key,  raw key, standard key
+    bool use_elite = false;
+    bool use_raw = false;
+    bool errors = false;
+    uint8_t cmdp = 0x00;
 
-	char filename[FILE_PATH_SIZE] = {0};
-	uint8_t fileNameLen = 0;
+    char filename[FILE_PATH_SIZE] = {0};
+    uint8_t fileNameLen = 0;
 
-	uint8_t *keyBlock = NULL;
-	iclass_prekey_t *prekey = NULL;
-	int keycnt = 0, len = 0;
+    uint8_t *keyBlock = NULL;
+    iclass_prekey_t *prekey = NULL;
+    int keycnt = 0, len = 0;
 
-	// if empty string
-	if (strlen(Cmd) == 0) errors = true;
-	// time
-	uint64_t t1 = msclock();
+    // if empty string
+    if (strlen(Cmd) == 0) errors = true;
+    // time
+    uint64_t t1 = msclock();
 
-	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch (tolower(param_getchar(Cmd, cmdp))) {
-		case 'h':
-			return usage_hf_iclass_lookup();
-		case 'f':
-			fileNameLen = param_getstr(Cmd, cmdp+1, filename, sizeof(filename));
-			if (fileNameLen < 1) {
-				PrintAndLogEx(WARNING, "No filename found after f");
-				errors = true;
-			}
-			cmdp += 2;
-			break;
-		case 'u':
-			param_gethex_ex(Cmd, cmdp+1, CSN, &len);
-			if ( len>>1 != sizeof(CSN) ) {
-				PrintAndLogEx(WARNING, "Wrong CSN length, expected %d got [%d]", sizeof(CSN), len>>1);
-				errors = true;
-			}
-			cmdp += 2;
-			break;
-		case 'm':
-			param_gethex_ex(Cmd, cmdp+1, MACS, &len);
-			if ( len>>1 != sizeof(MACS) ) {
-				PrintAndLogEx(WARNING, "Wrong MACS length, expected %d got [%d]  ", sizeof(MACS), len>>1);
-				errors = true;
-			} else {
-				memcpy(MAC_TAG, MACS+4, 4);
-			}
-			cmdp += 2;
-			break;
-		case 'p':
-			param_gethex_ex(Cmd, cmdp+1, EPURSE, &len);
-			if ( len>>1 != sizeof(EPURSE) ) {
-				PrintAndLogEx(WARNING, "Wrong EPURSE length, expected %d got [%d]  ", sizeof(EPURSE), len>>1);
-				errors = true;
-			}
-			cmdp += 2;
-			break;
-		break;
-		case 'e':
-			use_elite = true;
-			cmdp++;
-			break;
-		case 'r':
-			use_raw = true;
-			cmdp++;
-			break;
-		default:
-			PrintAndLogEx(WARNING, "unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
-			errors = true;
-			break;
-		}
-	}
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+        case 'h':
+            return usage_hf_iclass_lookup();
+        case 'f':
+            fileNameLen = param_getstr(Cmd, cmdp+1, filename, sizeof(filename));
+            if (fileNameLen < 1) {
+                PrintAndLogEx(WARNING, "No filename found after f");
+                errors = true;
+            }
+            cmdp += 2;
+            break;
+        case 'u':
+            param_gethex_ex(Cmd, cmdp+1, CSN, &len);
+            if ( len>>1 != sizeof(CSN) ) {
+                PrintAndLogEx(WARNING, "Wrong CSN length, expected %d got [%d]", sizeof(CSN), len>>1);
+                errors = true;
+            }
+            cmdp += 2;
+            break;
+        case 'm':
+            param_gethex_ex(Cmd, cmdp+1, MACS, &len);
+            if ( len>>1 != sizeof(MACS) ) {
+                PrintAndLogEx(WARNING, "Wrong MACS length, expected %d got [%d]  ", sizeof(MACS), len>>1);
+                errors = true;
+            } else {
+                memcpy(MAC_TAG, MACS+4, 4);
+            }
+            cmdp += 2;
+            break;
+        case 'p':
+            param_gethex_ex(Cmd, cmdp+1, EPURSE, &len);
+            if ( len>>1 != sizeof(EPURSE) ) {
+                PrintAndLogEx(WARNING, "Wrong EPURSE length, expected %d got [%d]  ", sizeof(EPURSE), len>>1);
+                errors = true;
+            }
+            cmdp += 2;
+            break;
+        break;
+        case 'e':
+            use_elite = true;
+            cmdp++;
+            break;
+        case 'r':
+            use_raw = true;
+            cmdp++;
+            break;
+        default:
+            PrintAndLogEx(WARNING, "unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
+            errors = true;
+            break;
+        }
+    }
 
-	if (errors) return usage_hf_iclass_lookup();
+    if (errors) return usage_hf_iclass_lookup();
 
-	// stupid copy.. CCNR is a combo of epurse and reader nonce
-	memcpy(CCNR, EPURSE, 8);
-	memcpy(CCNR+8, MACS, 4);
+    // stupid copy.. CCNR is a combo of epurse and reader nonce
+    memcpy(CCNR, EPURSE, 8);
+    memcpy(CCNR+8, MACS, 4);
 
-	PrintAndLogEx(SUCCESS, "CSN     | %s", sprint_hex( CSN, sizeof(CSN) ));
-	PrintAndLogEx(SUCCESS, "Epurse  | %s", sprint_hex( EPURSE, sizeof(EPURSE) ));
-	PrintAndLogEx(SUCCESS, "MACS    | %s", sprint_hex( MACS, sizeof(MACS) ));
-	PrintAndLogEx(SUCCESS, "CCNR    | %s", sprint_hex( CCNR, sizeof(CCNR) ));
-	PrintAndLogEx(SUCCESS, "MAC_TAG | %s", sprint_hex( MAC_TAG, sizeof(MAC_TAG) ));
+    PrintAndLogEx(SUCCESS, "CSN     | %s", sprint_hex( CSN, sizeof(CSN) ));
+    PrintAndLogEx(SUCCESS, "Epurse  | %s", sprint_hex( EPURSE, sizeof(EPURSE) ));
+    PrintAndLogEx(SUCCESS, "MACS    | %s", sprint_hex( MACS, sizeof(MACS) ));
+    PrintAndLogEx(SUCCESS, "CCNR    | %s", sprint_hex( CCNR, sizeof(CCNR) ));
+    PrintAndLogEx(SUCCESS, "MAC_TAG | %s", sprint_hex( MAC_TAG, sizeof(MAC_TAG) ));
 
-	int res = LoadDictionaryKeyFile( filename, &keyBlock, &keycnt);
-	if ( res > 0) {
-		free(keyBlock);
-		return 1;
-	}
-	//iclass_prekey_t
-	prekey = calloc(keycnt, sizeof(iclass_prekey_t));
-	if ( !prekey ) {
-		free(keyBlock);
-		return 1;
-	}
+    int res = LoadDictionaryKeyFile( filename, &keyBlock, &keycnt);
+    if ( res > 0) {
+        free(keyBlock);
+        return 1;
+    }
+    //iclass_prekey_t
+    prekey = calloc(keycnt, sizeof(iclass_prekey_t));
+    if ( !prekey ) {
+        free(keyBlock);
+        return 1;
+    }
 
-	PrintAndLogEx(FAILED, "Generating diversified keys and MAC");
-	res = GenerateFromKeyFile( CSN, CCNR, use_raw, use_elite, keyBlock, keycnt, prekey );
-	if ( res > 0) {
-		free(keyBlock);
-		free(prekey);
-		return 1;
-	}
+    PrintAndLogEx(FAILED, "Generating diversified keys and MAC");
+    res = GenerateFromKeyFile( CSN, CCNR, use_raw, use_elite, keyBlock, keycnt, prekey );
+    if ( res > 0) {
+        free(keyBlock);
+        free(prekey);
+        return 1;
+    }
 
-	PrintAndLogEx(FAILED, "Sorting");
+    PrintAndLogEx(FAILED, "Sorting");
 
-	// sort mac list.
-	qsort( prekey, keycnt, sizeof(iclass_prekey_t), cmp_uint32);
+    // sort mac list.
+    qsort( prekey, keycnt, sizeof(iclass_prekey_t), cmp_uint32);
 
-	//PrintPreCalc(prekey, keycnt);
+    //PrintPreCalc(prekey, keycnt);
 
-	PrintAndLogEx(FAILED, "Searching");
-	iclass_prekey_t *item;
-	iclass_prekey_t lookup;
-	memcpy(lookup.mac, MAC_TAG, 4);
+    PrintAndLogEx(FAILED, "Searching");
+    iclass_prekey_t *item;
+    iclass_prekey_t lookup;
+    memcpy(lookup.mac, MAC_TAG, 4);
 
-	// binsearch
-	item = (iclass_prekey_t*) bsearch(&lookup, prekey, keycnt, sizeof(iclass_prekey_t), cmp_uint32);
-	if( item != NULL )
-		PrintAndLogEx(SUCCESS, "\n[debit] found key %s", sprint_hex(item->key, 8));
+    // binsearch
+    item = (iclass_prekey_t*) bsearch(&lookup, prekey, keycnt, sizeof(iclass_prekey_t), cmp_uint32);
+    if( item != NULL )
+        PrintAndLogEx(SUCCESS, "\n[debit] found key %s", sprint_hex(item->key, 8));
 
-	t1 = msclock() - t1;
-	PrintAndLogEx(NORMAL, "\nTime in iclass : %.0f seconds\n", (float)t1/1000.0);
-	free(prekey);
-	free(keyBlock);
-	PrintAndLogEx(NORMAL, "");
-	return 0;
+    t1 = msclock() - t1;
+    PrintAndLogEx(NORMAL, "\nTime in iclass : %.0f seconds\n", (float)t1/1000.0);
+    free(prekey);
+    free(keyBlock);
+    PrintAndLogEx(NORMAL, "");
+    return 0;
 }
 
 int LoadDictionaryKeyFile( char* filename, uint8_t **keys, int *keycnt) {
 
-	char buf[17];
-	FILE * f;
-	uint8_t *p;
-	int keyitems = 0;
+    char buf[17];
+    FILE * f;
+    uint8_t *p;
+    int keyitems = 0;
 
-	if ( !(f = fopen( filename , "r")) ) {
-		PrintAndLogEx(FAILED, "File: " _YELLOW_(%s) ": not found or locked.", filename);
-		return 1;
-	}
+    if ( !(f = fopen( filename , "r")) ) {
+        PrintAndLogEx(FAILED, "File: " _YELLOW_(%s) ": not found or locked.", filename);
+        return 1;
+    }
 
-	while( fgets(buf, sizeof(buf), f) ){
-		if (strlen(buf) < 16 || buf[15] == '\n')
-			continue;
+    while( fgets(buf, sizeof(buf), f) ){
+        if (strlen(buf) < 16 || buf[15] == '\n')
+            continue;
 
-		//goto next line
-		while (fgetc(f) != '\n' && !feof(f)) {};
+        //goto next line
+        while (fgetc(f) != '\n' && !feof(f)) {};
 
-		//The line start with # is comment, skip
-		if( buf[0]=='#' )
-			continue;
+        //The line start with # is comment, skip
+        if( buf[0]=='#' )
+            continue;
 
-		// doesn't this only test first char only?
-		if (!isxdigit(buf[0])){
-			PrintAndLogEx(ERR, "file content error. '%s' must include 16 HEX symbols", buf);
-			continue;
-		}
+        // doesn't this only test first char only?
+        if (!isxdigit(buf[0])){
+            PrintAndLogEx(ERR, "file content error. '%s' must include 16 HEX symbols", buf);
+            continue;
+        }
 
-		// null terminator (skip the rest of the line)
-		buf[16] = 0;
+        // null terminator (skip the rest of the line)
+        buf[16] = 0;
 
-		p = realloc(*keys, 8 * (keyitems += 64));
-		if (!p) {
-			PrintAndLogEx(ERR, "cannot allocate memory for default keys");
-			fclose(f);
-			return 2;
-		}
-		*keys = p;
+        p = realloc(*keys, 8 * (keyitems += 64));
+        if (!p) {
+            PrintAndLogEx(ERR, "cannot allocate memory for default keys");
+            fclose(f);
+            return 2;
+        }
+        *keys = p;
 
-		memset(*keys + 8 * (*keycnt), 0, 8);
-		num_to_bytes(strtoull(buf, NULL, 16), 8, *keys + 8 * (*keycnt));
-		(*keycnt)++;
-		memset(buf, 0, sizeof(buf));
-	}
-	fclose(f);
-	PrintAndLogEx(SUCCESS, "Loaded " _GREEN_(%2d) " keys from %s", *keycnt, filename);
-	return 0;
+        memset(*keys + 8 * (*keycnt), 0, 8);
+        num_to_bytes(strtoull(buf, NULL, 16), 8, *keys + 8 * (*keycnt));
+        (*keycnt)++;
+        memset(buf, 0, sizeof(buf));
+    }
+    fclose(f);
+    PrintAndLogEx(SUCCESS, "Loaded " _GREEN_(%2d) " keys from %s", *keycnt, filename);
+    return 0;
 }
 
 // precalc diversified keys and their MAC
 int GenerateMacFromKeyFile( uint8_t* CSN, uint8_t* CCNR, bool use_raw, bool use_elite, uint8_t* keys, int keycnt, iclass_premac_t* list ) {
-	uint8_t key[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-	uint8_t div_key[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+    uint8_t key[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+    uint8_t div_key[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
 
-	for ( int i=0; i < keycnt; i++) {
+    for ( int i=0; i < keycnt; i++) {
 
-		memcpy(key, keys + 8 * i , 8);
+        memcpy(key, keys + 8 * i , 8);
 
-		if (use_raw)
-			memcpy(div_key, key, 8);
-		else
-			HFiClassCalcDivKey(CSN, key, div_key, use_elite);
+        if (use_raw)
+            memcpy(div_key, key, 8);
+        else
+            HFiClassCalcDivKey(CSN, key, div_key, use_elite);
 
-		doMAC(CCNR, div_key, list[i].mac);
-	}
-	return 0;
+        doMAC(CCNR, div_key, list[i].mac);
+    }
+    return 0;
 }
 
 int GenerateFromKeyFile( uint8_t* CSN, uint8_t* CCNR, bool use_raw, bool use_elite, uint8_t* keys, int keycnt, iclass_prekey_t* list ) {
 
-	uint8_t div_key[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+    uint8_t div_key[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
 
-	for ( int i=0; i < keycnt; i++) {
+    for ( int i=0; i < keycnt; i++) {
 
-		memcpy(list[i].key, keys + 8 * i , 8);
+        memcpy(list[i].key, keys + 8 * i , 8);
 
-		// generate diversifed key
-		if (use_raw)
-			memcpy(div_key, list[i].key, 8);
-		else
-			HFiClassCalcDivKey(CSN, list[i].key, div_key, use_elite);
+        // generate diversifed key
+        if (use_raw)
+            memcpy(div_key, list[i].key, 8);
+        else
+            HFiClassCalcDivKey(CSN, list[i].key, div_key, use_elite);
 
-		// generate MAC
-		doMAC(CCNR, div_key, list[i].mac);
-	}
-	return 0;
+        // generate MAC
+        doMAC(CCNR, div_key, list[i].mac);
+    }
+    return 0;
 }
 
 // print diversified keys
 void PrintPreCalcMac(uint8_t* keys, int keycnt, iclass_premac_t* pre_list) {
 
-	iclass_prekey_t* b =  calloc(keycnt, sizeof(iclass_prekey_t));
-	if ( !b )
-		return;
+    iclass_prekey_t* b =  calloc(keycnt, sizeof(iclass_prekey_t));
+    if ( !b )
+        return;
 
-	for ( int i=0; i < keycnt; i++) {
-		memcpy(b[i].key, keys + 8 * i , 8);
-		memcpy(b[i].mac, pre_list[i].mac, 4);
-	}
-	PrintPreCalc(b, keycnt);
-	free(b);
+    for ( int i=0; i < keycnt; i++) {
+        memcpy(b[i].key, keys + 8 * i , 8);
+        memcpy(b[i].mac, pre_list[i].mac, 4);
+    }
+    PrintPreCalc(b, keycnt);
+    free(b);
 }
 
 void PrintPreCalc(iclass_prekey_t* list, int itemcnt) {
-	PrintAndLogEx(NORMAL, "-----+------------------+---------");
-	PrintAndLogEx(NORMAL, "#key | key              | mac");
-	PrintAndLogEx(NORMAL, "-----+------------------+---------");
-	for ( int i=0; i < itemcnt; i++) {
+    PrintAndLogEx(NORMAL, "-----+------------------+---------");
+    PrintAndLogEx(NORMAL, "#key | key              | mac");
+    PrintAndLogEx(NORMAL, "-----+------------------+---------");
+    for ( int i=0; i < itemcnt; i++) {
 
-		if (i < 10 ) {
-			PrintAndLogEx(NORMAL, "[%2d] | %016" PRIx64 " | %08" PRIx32, i, bytes_to_num(list[i].key, 8), bytes_to_num( list[i].mac, 4) );
-		} else if ( i == 10 ) {
-			PrintAndLogEx(SUCCESS, "... skip printing the rest");
-		}
-	}
+        if (i < 10 ) {
+            PrintAndLogEx(NORMAL, "[%2d] | %016" PRIx64 " | %08" PRIx32, i, bytes_to_num(list[i].key, 8), bytes_to_num( list[i].mac, 4) );
+        } else if ( i == 10 ) {
+            PrintAndLogEx(SUCCESS, "... skip printing the rest");
+        }
+    }
 }
 
 static void permute(uint8_t *data, uint8_t len, uint8_t *output){
 #define KEY_SIZE 8
 
-	if ( len > KEY_SIZE ) {
-		for(uint8_t m = 0; m < len; m += KEY_SIZE){
-			permute(data+m, KEY_SIZE, output+m);
-		}
-		return;
-	}
-	if ( len != KEY_SIZE ) {
-		PrintAndLogEx(NORMAL, "[!] wrong key size\n");
-		return;
-	}
-	uint8_t i,j,p, mask;
-	for( i=0; i < KEY_SIZE; ++i){
-		p = 0;
-		mask = 0x80 >> i;
-		for( j=0; j < KEY_SIZE; ++j){
-			p >>= 1;
-			if (data[j] & mask)
-				p |= 0x80;
-		}
-		output[i] = p;
-	}
+    if ( len > KEY_SIZE ) {
+        for(uint8_t m = 0; m < len; m += KEY_SIZE){
+            permute(data+m, KEY_SIZE, output+m);
+        }
+        return;
+    }
+    if ( len != KEY_SIZE ) {
+        PrintAndLogEx(NORMAL, "[!] wrong key size\n");
+        return;
+    }
+    uint8_t i,j,p, mask;
+    for( i=0; i < KEY_SIZE; ++i){
+        p = 0;
+        mask = 0x80 >> i;
+        for( j=0; j < KEY_SIZE; ++j){
+            p >>= 1;
+            if (data[j] & mask)
+                p |= 0x80;
+        }
+        output[i] = p;
+    }
 }
 static void permute_rev(uint8_t *data, uint8_t len, uint8_t *output){
-	permute(data, len, output);
-	permute(output, len, data);
-	permute(data, len, output);
+    permute(data, len, output);
+    permute(output, len, data);
+    permute(data, len, output);
 }
 static void simple_crc(uint8_t *data, uint8_t len, uint8_t *output){
-	uint8_t crc = 0;
-	for( uint8_t i=0; i < len; ++i){
-		// seventh byte contains the crc.
-		if ( (i & 0x7) == 0x7 ) {
-			output[i] = crc ^ 0xFF;
-			crc = 0;
-		} else {
-			output[i] = data[i];
-			crc ^= data[i];
-		}
-	}
+    uint8_t crc = 0;
+    for( uint8_t i=0; i < len; ++i){
+        // seventh byte contains the crc.
+        if ( (i & 0x7) == 0x7 ) {
+            output[i] = crc ^ 0xFF;
+            crc = 0;
+        } else {
+            output[i] = data[i];
+            crc ^= data[i];
+        }
+    }
 }
 // DES doesn't use the MSB.
 static void shave(uint8_t *data, uint8_t len){
-	for (uint8_t i=0; i<len; ++i)
-		data[i] &= 0xFE;
+    for (uint8_t i=0; i<len; ++i)
+        data[i] &= 0xFE;
 }
 static void generate_rev(uint8_t *data, uint8_t len) {
-	uint8_t *key = calloc(len, sizeof(uint8_t));
-	PrintAndLogEx(SUCCESS, "input permuted key | %s \n", sprint_hex(data, len));
-	permute_rev(data, len, key);
-	PrintAndLogEx(SUCCESS, "    unpermuted key | %s \n", sprint_hex(key, len));
-	shave(key, len);
-	PrintAndLogEx(SUCCESS, "               key | %s \n", sprint_hex(key, len));
-	free(key);
+    uint8_t *key = calloc(len, sizeof(uint8_t));
+    PrintAndLogEx(SUCCESS, "input permuted key | %s \n", sprint_hex(data, len));
+    permute_rev(data, len, key);
+    PrintAndLogEx(SUCCESS, "    unpermuted key | %s \n", sprint_hex(key, len));
+    shave(key, len);
+    PrintAndLogEx(SUCCESS, "               key | %s \n", sprint_hex(key, len));
+    free(key);
 }
 static void generate(uint8_t *data, uint8_t len) {
-	uint8_t *key = calloc(len, sizeof(uint8_t));
-	uint8_t *pkey = calloc(len, sizeof(uint8_t));
-	PrintAndLogEx(SUCCESS, "   input key | %s \n", sprint_hex(data, len));
-	permute(data, len, pkey);
-	PrintAndLogEx(SUCCESS, "permuted key | %s \n", sprint_hex(pkey, len));
-	simple_crc(pkey, len, key );
-	PrintAndLogEx(SUCCESS, "  CRC'ed key | %s \n", sprint_hex(key, len));
-	free(key);
-	free(pkey);
+    uint8_t *key = calloc(len, sizeof(uint8_t));
+    uint8_t *pkey = calloc(len, sizeof(uint8_t));
+    PrintAndLogEx(SUCCESS, "   input key | %s \n", sprint_hex(data, len));
+    permute(data, len, pkey);
+    PrintAndLogEx(SUCCESS, "permuted key | %s \n", sprint_hex(pkey, len));
+    simple_crc(pkey, len, key );
+    PrintAndLogEx(SUCCESS, "  CRC'ed key | %s \n", sprint_hex(key, len));
+    free(key);
+    free(pkey);
 }
 
 int CmdHFiClassPermuteKey(const char *Cmd) {
 
-	uint8_t key[8] = {0};
-	uint8_t key_std_format[8] = {0};
-	uint8_t key_iclass_format[8] = {0};
-	uint8_t data[16] = {0};
-	bool isReverse = false;
-	int len = 0;
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if (strlen(Cmd) == 0|| cmdp == 'h') return usage_hf_iclass_permutekey();
+    uint8_t key[8] = {0};
+    uint8_t key_std_format[8] = {0};
+    uint8_t key_iclass_format[8] = {0};
+    uint8_t data[16] = {0};
+    bool isReverse = false;
+    int len = 0;
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) == 0|| cmdp == 'h') return usage_hf_iclass_permutekey();
 
-	isReverse = ( cmdp == 'r' );
+    isReverse = ( cmdp == 'r' );
 
-	param_gethex_ex(Cmd, 1, data, &len);
-	if ( len%2 ) return usage_hf_iclass_permutekey();
+    param_gethex_ex(Cmd, 1, data, &len);
+    if ( len%2 ) return usage_hf_iclass_permutekey();
 
-	len >>= 1;
+    len >>= 1;
 
-	memcpy(key, data, 8);
+    memcpy(key, data, 8);
 
-	if ( isReverse ) {
-		generate_rev(data, len);
-		permutekey_rev(key, key_std_format);
-		PrintAndLogEx(SUCCESS, "holiman iclass key | %s \n", sprint_hex(key_std_format, 8));
-	}
-	else {
-		generate(data, len);
-		permutekey(key, key_iclass_format);
-		PrintAndLogEx(SUCCESS, "holiman std key | %s \n", sprint_hex(key_iclass_format, 8));
-	}
-	return 0;
+    if ( isReverse ) {
+        generate_rev(data, len);
+        permutekey_rev(key, key_std_format);
+        PrintAndLogEx(SUCCESS, "holiman iclass key | %s \n", sprint_hex(key_std_format, 8));
+    }
+    else {
+        generate(data, len);
+        permutekey(key, key_iclass_format);
+        PrintAndLogEx(SUCCESS, "holiman std key | %s \n", sprint_hex(key_iclass_format, 8));
+    }
+    return 0;
 }
 
 static command_t CommandTable[] = {
-	{"help",		CmdHelp,					1,	"This help"},
-	{"calcnewkey",  CmdHFiClassCalcNewKey,     	1,	"[options..] Calc Diversified keys (blocks 3 & 4) to write new keys"},
-	{"chk",         CmdHFiClassCheckKeys,      	1,	"            Check keys"},
-	{"clone",       CmdHFiClassCloneTag,       	0,	"[options..] Authenticate and Clone from iClass bin file"},
-	{"decrypt",     CmdHFiClassDecrypt,        	1,	"[f <fname>] Decrypt tagdump" },
-	{"dump",        CmdHFiClassReader_Dump,    	0,	"[options..] Authenticate and Dump iClass tag's AA1"},
-	{"eload",       CmdHFiClassELoad,          	0,	"[f <fname>] (experimental) Load data into iClass emulator memory"},
-	{"encryptblk",  CmdHFiClassEncryptBlk,     	1,	"<BlockData> Encrypt given block data"},
-	{"list",        CmdHFiClassList,           	0,	"            (Deprecated) List iClass history"},
-	{"loclass",     CmdHFiClass_loclass,       	1,	"[options..] Use loclass to perform bruteforce of reader attack dump"},
-	{"lookup",		CmdHFiClassLookUp,     		1,	"[options..] Uses authentication trace to check for key in dictionary file"},
-	{"managekeys",  CmdHFiClassManageKeys,     	1,	"[options..] Manage the keys to use with iClass"},
-	{"permutekey",  CmdHFiClassPermuteKey,		0,	"            Permute function from 'heart of darkness' paper"},
-	{"readblk",     CmdHFiClass_ReadBlock,      0,	"[options..] Authenticate and Read iClass block"},
-	{"reader",		CmdHFiClassReader,			0,	"            Act like an iClass reader"},
-	{"readtagfile", CmdHFiClassReadTagFile,     1,	"[options..] Display Content from tagfile"},
-	{"replay",      CmdHFiClassReader_Replay,   0,	"<mac>       Read an iClass tag via Reply Attack"},
-	{"sim",         CmdHFiClassSim,             0,	"[options..] Simulate iClass tag"},
-	{"sniff",       CmdHFiClassSniff,           0,	"            Eavesdrop iClass communication"},
-	{"writeblk",    CmdHFiClass_WriteBlock,     0,	"[options..] Authenticate and Write iClass block"},
-	{NULL, NULL, 0, NULL}
+    {"help",        CmdHelp,                    1, "This help"},
+    {"calcnewkey",  CmdHFiClassCalcNewKey,      1, "[options..] Calc Diversified keys (blocks 3 & 4) to write new keys"},
+    {"chk",         CmdHFiClassCheckKeys,       1, "            Check keys"},
+    {"clone",       CmdHFiClassCloneTag,        0, "[options..] Authenticate and Clone from iClass bin file"},
+    {"decrypt",     CmdHFiClassDecrypt,         1, "[f <fname>] Decrypt tagdump" },
+    {"dump",        CmdHFiClassReader_Dump,     0, "[options..] Authenticate and Dump iClass tag's AA1"},
+    {"eload",       CmdHFiClassELoad,           0, "[f <fname>] (experimental) Load data into iClass emulator memory"},
+    {"encryptblk",  CmdHFiClassEncryptBlk,      1, "<BlockData> Encrypt given block data"},
+    {"list",        CmdHFiClassList,            0, "            (Deprecated) List iClass history"},
+    {"loclass",     CmdHFiClass_loclass,        1, "[options..] Use loclass to perform bruteforce of reader attack dump"},
+    {"lookup",      CmdHFiClassLookUp,          1, "[options..] Uses authentication trace to check for key in dictionary file"},
+    {"managekeys",  CmdHFiClassManageKeys,      1, "[options..] Manage the keys to use with iClass"},
+    {"permutekey",  CmdHFiClassPermuteKey,      0, "            Permute function from 'heart of darkness' paper"},
+    {"readblk",     CmdHFiClass_ReadBlock,      0, "[options..] Authenticate and Read iClass block"},
+    {"reader",      CmdHFiClassReader,          0, "            Act like an iClass reader"},
+    {"readtagfile", CmdHFiClassReadTagFile,     1, "[options..] Display Content from tagfile"},
+    {"replay",      CmdHFiClassReader_Replay,   0, "<mac>       Read an iClass tag via Reply Attack"},
+    {"sim",         CmdHFiClassSim,             0, "[options..] Simulate iClass tag"},
+    {"sniff",       CmdHFiClassSniff,           0, "            Eavesdrop iClass communication"},
+    {"writeblk",    CmdHFiClass_WriteBlock,     0, "[options..] Authenticate and Write iClass block"},
+    {NULL, NULL, 0, NULL}
 };
 
 int CmdHFiClass(const char *Cmd) {
-	clearCommandBuffer();
-	CmdsParse(CommandTable, Cmd);
-	return 0;
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
+    return 0;
 }
 
 int CmdHelp(const char *Cmd) {
-	CmdsHelp(CommandTable);
-	return 0;
+    CmdsHelp(CommandTable);
+    return 0;
 }
diff --git a/client/cmdhficlass.h b/client/cmdhficlass.h
index f9353ed1f..1d49f029a 100644
--- a/client/cmdhficlass.h
+++ b/client/cmdhficlass.h
@@ -32,7 +32,7 @@
 #include "usb_cmd.h"
 #include "cmdhfmfu.h"
 #include "cmdhf.h"
-#include "protocols.h"	// picopass structs,
+#include "protocols.h" // picopass structs,
 #include "usb_cdc.h" // for usb_poll_validate_length
 
 
@@ -42,12 +42,12 @@ typedef struct iclass_block {
 } iclass_block_t;
 
 typedef struct iclass_premac {
-	uint8_t mac[4];
+    uint8_t mac[4];
 } iclass_premac_t;
 
 typedef struct iclass_prekey {
-	uint8_t mac[4];
-	uint8_t key[8];
+    uint8_t mac[4];
+    uint8_t key[8];
 } iclass_prekey_t;
 
 int CmdHFiClass(const char *Cmd);
@@ -77,7 +77,7 @@ extern int CmdHFiClassLookUp(const char *Cmd);
 extern int CmdHFiClassPermuteKey(const char *Cmd);
 
 void printIclassDumpContents(uint8_t *iclass_dump, uint8_t startblock, uint8_t endblock, size_t filesize);
-void HFiClassCalcDivKey(uint8_t	*CSN, uint8_t	*KEY, uint8_t *div_key, bool elite);
+void HFiClassCalcDivKey(uint8_t *CSN, uint8_t *KEY, uint8_t *div_key, bool elite);
 
 int LoadDictionaryKeyFile( char* filename, uint8_t **keys, int *keycnt);
 int GenerateMacFromKeyFile( uint8_t* CSN, uint8_t* CCNR, bool use_raw, bool use_elite, uint8_t* keys, int keycnt, iclass_premac_t* list );
diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index bf61b570a..c55b8f54b 100644
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -14,146 +14,146 @@ static int CmdHelp(const char *Cmd);
 #define MAX_LENGTH 1024
 
 int usage_legic_calccrc(void){
-	PrintAndLogEx(NORMAL, "Calculates the legic crc8/crc16 on the given data.");
-	PrintAndLogEx(NORMAL, "There must be an even number of hexsymbols as input.");
-	PrintAndLogEx(NORMAL, "Usage:  hf legic crc [h] d <data> u <uidcrc> c <8|16>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h             : this help");
-	PrintAndLogEx(NORMAL, "      d <data>      : (hex symbols) bytes to calculate crc over");
-	PrintAndLogEx(NORMAL, "      u <uidcrc>    : MCC hexbyte");
-	PrintAndLogEx(NORMAL, "      c <8|16>      : Crc type");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      hf legic crc d deadbeef1122");
-	PrintAndLogEx(NORMAL, "      hf legic crc d deadbeef1122 u 9A c 16");
-	return 0;
+    PrintAndLogEx(NORMAL, "Calculates the legic crc8/crc16 on the given data.");
+    PrintAndLogEx(NORMAL, "There must be an even number of hexsymbols as input.");
+    PrintAndLogEx(NORMAL, "Usage:  hf legic crc [h] d <data> u <uidcrc> c <8|16>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "      h             : this help");
+    PrintAndLogEx(NORMAL, "      d <data>      : (hex symbols) bytes to calculate crc over");
+    PrintAndLogEx(NORMAL, "      u <uidcrc>    : MCC hexbyte");
+    PrintAndLogEx(NORMAL, "      c <8|16>      : Crc type");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      hf legic crc d deadbeef1122");
+    PrintAndLogEx(NORMAL, "      hf legic crc d deadbeef1122 u 9A c 16");
+    return 0;
 }
 int usage_legic_rdmem(void){
-	PrintAndLogEx(NORMAL, "Read data from a legic tag.");
-	PrintAndLogEx(NORMAL, "Usage:  hf legic rdmem [h] <offset> <length> <IV>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h             : this help");
-	PrintAndLogEx(NORMAL, "      <offset>      : (hex) offset in data array to start download from");
-	PrintAndLogEx(NORMAL, "      <length>      : (hex) number of bytes to read");
-	PrintAndLogEx(NORMAL, "      <IV>          : (hex) (optional) Initialization vector to use. Must be odd and 7bits max");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      hf legic rdmem 0 16        - reads from byte[0] 0x16 bytes(system header)");
-	PrintAndLogEx(NORMAL, "      hf legic rdmem 0 4 55      - reads from byte[0] 0x4 bytes with IV 0x55");
-	PrintAndLogEx(NORMAL, "      hf legic rdmem 0 100 55    - reads 0x100 bytes with IV 0x55");
-	return 0;
+    PrintAndLogEx(NORMAL, "Read data from a legic tag.");
+    PrintAndLogEx(NORMAL, "Usage:  hf legic rdmem [h] <offset> <length> <IV>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "      h             : this help");
+    PrintAndLogEx(NORMAL, "      <offset>      : (hex) offset in data array to start download from");
+    PrintAndLogEx(NORMAL, "      <length>      : (hex) number of bytes to read");
+    PrintAndLogEx(NORMAL, "      <IV>          : (hex) (optional) Initialization vector to use. Must be odd and 7bits max");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      hf legic rdmem 0 16        - reads from byte[0] 0x16 bytes(system header)");
+    PrintAndLogEx(NORMAL, "      hf legic rdmem 0 4 55      - reads from byte[0] 0x4 bytes with IV 0x55");
+    PrintAndLogEx(NORMAL, "      hf legic rdmem 0 100 55    - reads 0x100 bytes with IV 0x55");
+    return 0;
 }
 int usage_legic_sim(void){
-	PrintAndLogEx(NORMAL, "Simulates a LEGIC Prime tag. MIM22, MIM256, MIM1024 types can be emulated");
-	PrintAndLogEx(NORMAL, "Use ELOAD/ESAVE to upload a dump into emulator memory");
-	PrintAndLogEx(NORMAL, "Usage:  hf legic sim [h] <tagtype>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h             : this help");
-	PrintAndLogEx(NORMAL, "      <tagtype>     : 0 = MIM22");
-	PrintAndLogEx(NORMAL, "                    : 1 = MIM256 (default)");
-	PrintAndLogEx(NORMAL, "                    : 2 = MIM1024");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      hf legic sim 2");
-	return 0;
+    PrintAndLogEx(NORMAL, "Simulates a LEGIC Prime tag. MIM22, MIM256, MIM1024 types can be emulated");
+    PrintAndLogEx(NORMAL, "Use ELOAD/ESAVE to upload a dump into emulator memory");
+    PrintAndLogEx(NORMAL, "Usage:  hf legic sim [h] <tagtype>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "      h             : this help");
+    PrintAndLogEx(NORMAL, "      <tagtype>     : 0 = MIM22");
+    PrintAndLogEx(NORMAL, "                    : 1 = MIM256 (default)");
+    PrintAndLogEx(NORMAL, "                    : 2 = MIM1024");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      hf legic sim 2");
+    return 0;
 }
 int usage_legic_write(void){
-	PrintAndLogEx(NORMAL, "Write data to a LEGIC Prime tag. It autodetects tagsize to make sure size");
-	PrintAndLogEx(NORMAL, "Usage:  hf legic write [h] o <offset> d <data (hex symbols)>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h             : this help");
-	PrintAndLogEx(NORMAL, "      o <offset>    : (hex) offset in data array to start writing");
-	//PrintAndLogEx(NORMAL, "  <IV>          : (optional) Initialization vector to use (ODD and 7bits)");
-	PrintAndLogEx(NORMAL, "      d <data>      : (hex symbols) bytes to write ");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      hf legic write o 10 d 11223344    - Write 0x11223344 starting from offset 0x10");
-	return 0;
+    PrintAndLogEx(NORMAL, "Write data to a LEGIC Prime tag. It autodetects tagsize to make sure size");
+    PrintAndLogEx(NORMAL, "Usage:  hf legic write [h] o <offset> d <data (hex symbols)>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "      h             : this help");
+    PrintAndLogEx(NORMAL, "      o <offset>    : (hex) offset in data array to start writing");
+    //PrintAndLogEx(NORMAL, "  <IV>          : (optional) Initialization vector to use (ODD and 7bits)");
+    PrintAndLogEx(NORMAL, "      d <data>      : (hex symbols) bytes to write ");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      hf legic write o 10 d 11223344    - Write 0x11223344 starting from offset 0x10");
+    return 0;
 }
 int usage_legic_reader(void){
-	PrintAndLogEx(NORMAL, "Read UID and type information from a legic tag.");
-	PrintAndLogEx(NORMAL, "Usage:  hf legic reader [h]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h             : this help");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      hf legic reader");
-	return 0;
+    PrintAndLogEx(NORMAL, "Read UID and type information from a legic tag.");
+    PrintAndLogEx(NORMAL, "Usage:  hf legic reader [h]");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "      h             : this help");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      hf legic reader");
+    return 0;
 }
 int usage_legic_info(void){
-	PrintAndLogEx(NORMAL, "Reads information from a legic prime tag.");
-	PrintAndLogEx(NORMAL, "Shows systemarea, user areas etc");
-	PrintAndLogEx(NORMAL, "Usage:  hf legic info [h]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h             : this help");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      hf legic info");
-	return 0;
+    PrintAndLogEx(NORMAL, "Reads information from a legic prime tag.");
+    PrintAndLogEx(NORMAL, "Shows systemarea, user areas etc");
+    PrintAndLogEx(NORMAL, "Usage:  hf legic info [h]");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "      h             : this help");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      hf legic info");
+    return 0;
 }
 int usage_legic_dump(void){
-	PrintAndLogEx(NORMAL, "Reads all pages from LEGIC Prime MIM22, MIM256, MIM1024");
-	PrintAndLogEx(NORMAL, "and saves binary dump into the file `filename.bin` or `cardUID.bin`");
-	PrintAndLogEx(NORMAL, "It autodetects card type.\n");
-	PrintAndLogEx(NORMAL, "Usage:  hf legic dump [h] o <filename w/o .bin>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h             : this help");
-	PrintAndLogEx(NORMAL, "      o <filename>  : filename w/o '.bin' to dump bytes");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      hf legic dump");
-	PrintAndLogEx(NORMAL, "      hf legic dump o myfile");
-	return 0;
+    PrintAndLogEx(NORMAL, "Reads all pages from LEGIC Prime MIM22, MIM256, MIM1024");
+    PrintAndLogEx(NORMAL, "and saves binary dump into the file `filename.bin` or `cardUID.bin`");
+    PrintAndLogEx(NORMAL, "It autodetects card type.\n");
+    PrintAndLogEx(NORMAL, "Usage:  hf legic dump [h] o <filename w/o .bin>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "      h             : this help");
+    PrintAndLogEx(NORMAL, "      o <filename>  : filename w/o '.bin' to dump bytes");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      hf legic dump");
+    PrintAndLogEx(NORMAL, "      hf legic dump o myfile");
+    return 0;
 }
 int usage_legic_restore(void){
-	PrintAndLogEx(NORMAL, "Reads binary file and it autodetects card type and verifies that the file has the same size");
-	PrintAndLogEx(NORMAL, "Then write the data back to card. All bytes except the first 7bytes [UID(4) MCC(1) DCF(2)]\n");
-	PrintAndLogEx(NORMAL, "Usage:   hf legic restore [h] i <filename w/o .bin>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h             : this help");
-	PrintAndLogEx(NORMAL, "      i <filename>  : filename w/o '.bin' to restore bytes on to card from");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      hf legic restore i myfile");
-	return 0;
+    PrintAndLogEx(NORMAL, "Reads binary file and it autodetects card type and verifies that the file has the same size");
+    PrintAndLogEx(NORMAL, "Then write the data back to card. All bytes except the first 7bytes [UID(4) MCC(1) DCF(2)]\n");
+    PrintAndLogEx(NORMAL, "Usage:   hf legic restore [h] i <filename w/o .bin>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "      h             : this help");
+    PrintAndLogEx(NORMAL, "      i <filename>  : filename w/o '.bin' to restore bytes on to card from");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      hf legic restore i myfile");
+    return 0;
 }
 int usage_legic_eload(void){
-	PrintAndLogEx(NORMAL, "It loads binary dump from the file `filename.bin`");
-	PrintAndLogEx(NORMAL, "Usage:  hf legic eload [h] [card memory] <file name w/o `.bin`>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h             : this help");
-	PrintAndLogEx(NORMAL, "      [card memory] : 0 = MIM22");
-	PrintAndLogEx(NORMAL, "                    : 1 = MIM256 (default)");
-	PrintAndLogEx(NORMAL, "                    : 2 = MIM1024");
-	PrintAndLogEx(NORMAL, "      <filename>    : filename w/o .bin to load");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      hf legic eload 2 myfile");
-	return 0;
+    PrintAndLogEx(NORMAL, "It loads binary dump from the file `filename.bin`");
+    PrintAndLogEx(NORMAL, "Usage:  hf legic eload [h] [card memory] <file name w/o `.bin`>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "      h             : this help");
+    PrintAndLogEx(NORMAL, "      [card memory] : 0 = MIM22");
+    PrintAndLogEx(NORMAL, "                    : 1 = MIM256 (default)");
+    PrintAndLogEx(NORMAL, "                    : 2 = MIM1024");
+    PrintAndLogEx(NORMAL, "      <filename>    : filename w/o .bin to load");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      hf legic eload 2 myfile");
+    return 0;
 }
 int usage_legic_esave(void){
-	PrintAndLogEx(NORMAL, "It saves binary dump into the file `filename.bin` or `cardID.bin`");
-	PrintAndLogEx(NORMAL, " Usage:  hf legic esave [h] [card memory] [file name w/o `.bin`]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h             : this help");
-	PrintAndLogEx(NORMAL, "      [card memory] : 0 = MIM22");
-	PrintAndLogEx(NORMAL, "                    : 1 = MIM256 (default)");
-	PrintAndLogEx(NORMAL, "                    : 2 = MIM1024");
-	PrintAndLogEx(NORMAL, "      <filename>    : filename w/o .bin to load");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      hf legic esave 2 myfile");
-	return 0;
+    PrintAndLogEx(NORMAL, "It saves binary dump into the file `filename.bin` or `cardID.bin`");
+    PrintAndLogEx(NORMAL, " Usage:  hf legic esave [h] [card memory] [file name w/o `.bin`]");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "      h             : this help");
+    PrintAndLogEx(NORMAL, "      [card memory] : 0 = MIM22");
+    PrintAndLogEx(NORMAL, "                    : 1 = MIM256 (default)");
+    PrintAndLogEx(NORMAL, "                    : 2 = MIM1024");
+    PrintAndLogEx(NORMAL, "      <filename>    : filename w/o .bin to load");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      hf legic esave 2 myfile");
+    return 0;
 }
 int usage_legic_wipe(void){
-	PrintAndLogEx(NORMAL, "Fills a legic tag memory with zeros. From byte7 and to the end.");
-	PrintAndLogEx(NORMAL, " Usage:  hf legic wipe [h]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h             : this help");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      hf legic wipe");
-	return 0;
+    PrintAndLogEx(NORMAL, "Fills a legic tag memory with zeros. From byte7 and to the end.");
+    PrintAndLogEx(NORMAL, " Usage:  hf legic wipe [h]");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "      h             : this help");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      hf legic wipe");
+    return 0;
 }
 /*
  *  Output BigBuf and deobfuscate LEGIC RF tag data.
@@ -162,309 +162,309 @@ int usage_legic_wipe(void){
  */
 int CmdLegicInfo(const char *Cmd) {
 
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if ( cmdp == 'h' ) return usage_legic_info();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if ( cmdp == 'h' ) return usage_legic_info();
 
-	int i = 0, k = 0, segmentNum = 0, segment_len = 0, segment_flag = 0;
-	int crc = 0, wrp = 0, wrc = 0;
-	uint8_t stamp_len = 0;
-	uint16_t datalen = 0;
-	char token_type[5] = {0,0,0,0,0};
-	int dcf = 0;
-	int bIsSegmented = 0;
+    int i = 0, k = 0, segmentNum = 0, segment_len = 0, segment_flag = 0;
+    int crc = 0, wrp = 0, wrc = 0;
+    uint8_t stamp_len = 0;
+    uint16_t datalen = 0;
+    char token_type[5] = {0,0,0,0,0};
+    int dcf = 0;
+    int bIsSegmented = 0;
 
-	// tagtype
-	legic_card_select_t card;
-	if (legic_get_type(&card)) {
-		PrintAndLogEx(WARNING, "Failed to identify tagtype");
-		return 1;
-	}
+    // tagtype
+    legic_card_select_t card;
+    if (legic_get_type(&card)) {
+        PrintAndLogEx(WARNING, "Failed to identify tagtype");
+        return 1;
+    }
 
-	PrintAndLogEx(SUCCESS, "Reading tag memory %d b...", card.cardsize);
+    PrintAndLogEx(SUCCESS, "Reading tag memory %d b...", card.cardsize);
 
-	// allocate receiver buffer
-	uint8_t *data = calloc(card.cardsize, sizeof(uint8_t));
-	 if (!data) {
-		PrintAndLogEx(WARNING, "Cannot allocate memory");
-		return 2;
-	}
+    // allocate receiver buffer
+    uint8_t *data = calloc(card.cardsize, sizeof(uint8_t));
+     if (!data) {
+        PrintAndLogEx(WARNING, "Cannot allocate memory");
+        return 2;
+    }
 
-	int status = legic_read_mem(0, card.cardsize, 0x55, data, &datalen);
-	if ( status > 0 ) {
-		PrintAndLogEx(WARNING, "Failed reading memory");
-		free(data);
-		return 3;
-	}
+    int status = legic_read_mem(0, card.cardsize, 0x55, data, &datalen);
+    if ( status > 0 ) {
+        PrintAndLogEx(WARNING, "Failed reading memory");
+        free(data);
+        return 3;
+    }
 
-	// Output CDF System area (9 bytes) plus remaining header area (12 bytes)
-	crc = data[4];
-	uint32_t calc_crc =  CRC8Legic(data, 4);
+    // Output CDF System area (9 bytes) plus remaining header area (12 bytes)
+    crc = data[4];
+    uint32_t calc_crc =  CRC8Legic(data, 4);
 
-	PrintAndLogEx(NORMAL, "\nCDF: System Area");
-	PrintAndLogEx(NORMAL, "------------------------------------------------------");
-	PrintAndLogEx(NORMAL, "MCD: %02x, MSN: %02x %02x %02x, MCC: %02x %s",
-		data[0],
-		data[1],
-		data[2],
-		data[3],
-		data[4],
-		(calc_crc == crc) ? "OK":"Fail"
-	);
+    PrintAndLogEx(NORMAL, "\nCDF: System Area");
+    PrintAndLogEx(NORMAL, "------------------------------------------------------");
+    PrintAndLogEx(NORMAL, "MCD: %02x, MSN: %02x %02x %02x, MCC: %02x %s",
+        data[0],
+        data[1],
+        data[2],
+        data[3],
+        data[4],
+        (calc_crc == crc) ? "OK":"Fail"
+    );
 
-	// MCD = Manufacturer ID (should be list meaning something?)
+    // MCD = Manufacturer ID (should be list meaning something?)
 
-	token_type[0] = 0;
-	dcf = ((int)data[6] << 8) | (int)data[5];
+    token_type[0] = 0;
+    dcf = ((int)data[6] << 8) | (int)data[5];
 
-	// New unwritten media?
-	if (dcf == 0xFFFF) {
+    // New unwritten media?
+    if (dcf == 0xFFFF) {
 
-		PrintAndLogEx(NORMAL, "DCF: %d (%02x %02x), Token Type=NM (New Media)",
-			dcf,
-			data[5],
-			data[6]
-		);
+        PrintAndLogEx(NORMAL, "DCF: %d (%02x %02x), Token Type=NM (New Media)",
+            dcf,
+            data[5],
+            data[6]
+        );
 
-	} else if (dcf > 60000) {		// Master token?
+    } else if (dcf > 60000) { // Master token?
 
-		int fl = 0;
+        int fl = 0;
 
-		if (data[6] == 0xec) {
-			strncpy(token_type, "XAM", sizeof(token_type));
-			fl = 1;
-			stamp_len = 0x0c - (data[5] >> 4);
-		} else {
-			switch (data[5] & 0x7f) {
-			case 0x00 ... 0x2f:
-				strncpy(token_type, "IAM", sizeof(token_type));
-				fl = (0x2f - (data[5] & 0x7f)) + 1;
-				break;
-			case 0x30 ... 0x6f:
-				strncpy(token_type, "SAM", sizeof(token_type));
-				fl = (0x6f - (data[5] & 0x7f)) + 1;
-				break;
-			case 0x70 ... 0x7f:
-				strncpy(token_type, "GAM", sizeof(token_type));
-				fl = (0x7f - (data[5] & 0x7f)) + 1;
-				break;
-			}
+        if (data[6] == 0xec) {
+            strncpy(token_type, "XAM", sizeof(token_type));
+            fl = 1;
+            stamp_len = 0x0c - (data[5] >> 4);
+        } else {
+            switch (data[5] & 0x7f) {
+            case 0x00 ... 0x2f:
+                strncpy(token_type, "IAM", sizeof(token_type));
+                fl = (0x2f - (data[5] & 0x7f)) + 1;
+                break;
+            case 0x30 ... 0x6f:
+                strncpy(token_type, "SAM", sizeof(token_type));
+                fl = (0x6f - (data[5] & 0x7f)) + 1;
+                break;
+            case 0x70 ... 0x7f:
+                strncpy(token_type, "GAM", sizeof(token_type));
+                fl = (0x7f - (data[5] & 0x7f)) + 1;
+                break;
+            }
 
-			stamp_len = 0xfc - data[6];
-		}
+            stamp_len = 0xfc - data[6];
+        }
 
-		PrintAndLogEx(NORMAL, "DCF: %d (%02x %02x), Token Type=%s (OLE=%01u), OL=%02u, FL=%02u",
-			dcf,
-			data[5],
-			data[6],
-			token_type,
-			(data[5] & 0x80 )>> 7,
-			stamp_len,
-			fl
-		);
+        PrintAndLogEx(NORMAL, "DCF: %d (%02x %02x), Token Type=%s (OLE=%01u), OL=%02u, FL=%02u",
+            dcf,
+            data[5],
+            data[6],
+            token_type,
+            (data[5] & 0x80 )>> 7,
+            stamp_len,
+            fl
+        );
 
-	} else {	// Is IM(-S) type of card...
+    } else { // Is IM(-S) type of card...
 
-		if (data[7] == 0x9F && data[8] == 0xFF) {
-			bIsSegmented = 1;
-			strncpy(token_type, "IM-S", sizeof(token_type));
-		} else {
-			strncpy(token_type, "IM", sizeof(token_type));
-		}
+        if (data[7] == 0x9F && data[8] == 0xFF) {
+            bIsSegmented = 1;
+            strncpy(token_type, "IM-S", sizeof(token_type));
+        } else {
+            strncpy(token_type, "IM", sizeof(token_type));
+        }
 
-		PrintAndLogEx(NORMAL, "DCF: %d (%02x %02x), Token Type=%s (OLE=%01u)",
-			dcf,
-			data[5],
-			data[6],
-			token_type,
-			(data[5]&0x80) >> 7
-		);
-	}
+        PrintAndLogEx(NORMAL, "DCF: %d (%02x %02x), Token Type=%s (OLE=%01u)",
+            dcf,
+            data[5],
+            data[6],
+            token_type,
+            (data[5]&0x80) >> 7
+        );
+    }
 
-	// Makes no sence to show this on blank media...
-	if (dcf != 0xFFFF) {
+    // Makes no sence to show this on blank media...
+    if (dcf != 0xFFFF) {
 
-		if (bIsSegmented) {
-			PrintAndLogEx(NORMAL, "WRP=%02u, WRC=%01u, RD=%01u, SSC=%02x",
-				data[7] & 0x0f,
-				(data[7] & 0x70) >> 4,
-				(data[7] & 0x80) >> 7,
-				data[8]
-			);
-		}
+        if (bIsSegmented) {
+            PrintAndLogEx(NORMAL, "WRP=%02u, WRC=%01u, RD=%01u, SSC=%02x",
+                data[7] & 0x0f,
+                (data[7] & 0x70) >> 4,
+                (data[7] & 0x80) >> 7,
+                data[8]
+            );
+        }
 
-		// Header area is only available on IM-S cards, on master tokens this data is the master token data itself
-		if (bIsSegmented || dcf > 60000) {
-			if (dcf > 60000) {
-				PrintAndLogEx(NORMAL, "Master token data");
-				PrintAndLogEx(NORMAL, "%s", sprint_hex(data+8, 14));
-			} else {
-				PrintAndLogEx(NORMAL, "Remaining Header Area");
-				PrintAndLogEx(NORMAL, "%s", sprint_hex(data+9, 13));
-			}
-		}
-	}
+        // Header area is only available on IM-S cards, on master tokens this data is the master token data itself
+        if (bIsSegmented || dcf > 60000) {
+            if (dcf > 60000) {
+                PrintAndLogEx(NORMAL, "Master token data");
+                PrintAndLogEx(NORMAL, "%s", sprint_hex(data+8, 14));
+            } else {
+                PrintAndLogEx(NORMAL, "Remaining Header Area");
+                PrintAndLogEx(NORMAL, "%s", sprint_hex(data+9, 13));
+            }
+        }
+    }
 
-	uint8_t segCrcBytes[8] = {0,0,0,0,0,0,0,0};
-	uint32_t segCalcCRC = 0;
-	uint32_t segCRC = 0;
+    uint8_t segCrcBytes[8] = {0,0,0,0,0,0,0,0};
+    uint32_t segCalcCRC = 0;
+    uint32_t segCRC = 0;
 
-	// Not Data card?
-	if (dcf > 60000)
-		goto out;
+    // Not Data card?
+    if (dcf > 60000)
+        goto out;
 
-	PrintAndLogEx(NORMAL, "\nADF: User Area");
-	PrintAndLogEx(NORMAL, "------------------------------------------------------");
+    PrintAndLogEx(NORMAL, "\nADF: User Area");
+    PrintAndLogEx(NORMAL, "------------------------------------------------------");
 
-	if(bIsSegmented) {
+    if(bIsSegmented) {
 
-		// Data start point on segmented cards
-		i = 22;
+        // Data start point on segmented cards
+        i = 22;
 
-		// decode segments
-		for (segmentNum=1; segmentNum < 128; segmentNum++ )
-		{
-			segment_len = ((data[i+1] ^ crc) & 0x0f) * 256 + (data[i] ^ crc);
-			segment_flag = ((data[i+1] ^ crc) & 0xf0) >> 4;
-			wrp = (data[i+2] ^ crc);
-			wrc = ((data[i+3] ^ crc) & 0x70) >> 4;
+        // decode segments
+        for (segmentNum=1; segmentNum < 128; segmentNum++ )
+        {
+            segment_len = ((data[i+1] ^ crc) & 0x0f) * 256 + (data[i] ^ crc);
+            segment_flag = ((data[i+1] ^ crc) & 0xf0) >> 4;
+            wrp = (data[i+2] ^ crc);
+            wrc = ((data[i+3] ^ crc) & 0x70) >> 4;
 
-			bool hasWRC = (wrc > 0);
-			bool hasWRP = (wrp > wrc);
-			int wrp_len = (wrp - wrc);
-			int remain_seg_payload_len = (segment_len - wrp - 5);
+            bool hasWRC = (wrc > 0);
+            bool hasWRP = (wrp > wrc);
+            int wrp_len = (wrp - wrc);
+            int remain_seg_payload_len = (segment_len - wrp - 5);
 
-			// validate segment-crc
-			segCrcBytes[0]=data[0];			//uid0
-			segCrcBytes[1]=data[1];			//uid1
-			segCrcBytes[2]=data[2];			//uid2
-			segCrcBytes[3]=data[3];			//uid3
-			segCrcBytes[4]=(data[i] ^ crc);   //hdr0
-			segCrcBytes[5]=(data[i+1] ^ crc); //hdr1
-			segCrcBytes[6]=(data[i+2] ^ crc); //hdr2
-			segCrcBytes[7]=(data[i+3] ^ crc); //hdr3
+            // validate segment-crc
+            segCrcBytes[0]=data[0];           //uid0
+            segCrcBytes[1]=data[1];           //uid1
+            segCrcBytes[2]=data[2];           //uid2
+            segCrcBytes[3]=data[3];           //uid3
+            segCrcBytes[4]=(data[i] ^ crc);   //hdr0
+            segCrcBytes[5]=(data[i+1] ^ crc); //hdr1
+            segCrcBytes[6]=(data[i+2] ^ crc); //hdr2
+            segCrcBytes[7]=(data[i+3] ^ crc); //hdr3
 
-			segCalcCRC = CRC8Legic(segCrcBytes, 8);
-			segCRC = data[i+4] ^ crc;
+            segCalcCRC = CRC8Legic(segCrcBytes, 8);
+            segCRC = data[i+4] ^ crc;
 
-			PrintAndLogEx(NORMAL, "Segment %02u \nraw header | 0x%02X 0x%02X 0x%02X 0x%02X \nSegment len: %u,  Flag: 0x%X (valid:%01u, last:%01u), WRP: %02u, WRC: %02u, RD: %01u, CRC: 0x%02X (%s)",
-				segmentNum,
-				data[i] ^ crc,
-				data[i+1] ^ crc,
-				data[i+2] ^ crc,
-				data[i+3] ^ crc,
-				segment_len,
-				segment_flag,
-				(segment_flag & 0x4) >> 2,
-				(segment_flag & 0x8) >> 3,
-				wrp,
-				wrc,
-				((data[i+3]^crc) & 0x80) >> 7,
-				segCRC,
-				( segCRC == segCalcCRC ) ? "OK" : "fail"
-			);
+            PrintAndLogEx(NORMAL, "Segment %02u \nraw header | 0x%02X 0x%02X 0x%02X 0x%02X \nSegment len: %u,  Flag: 0x%X (valid:%01u, last:%01u), WRP: %02u, WRC: %02u, RD: %01u, CRC: 0x%02X (%s)",
+                segmentNum,
+                data[i] ^ crc,
+                data[i+1] ^ crc,
+                data[i+2] ^ crc,
+                data[i+3] ^ crc,
+                segment_len,
+                segment_flag,
+                (segment_flag & 0x4) >> 2,
+                (segment_flag & 0x8) >> 3,
+                wrp,
+                wrc,
+                ((data[i+3]^crc) & 0x80) >> 7,
+                segCRC,
+                ( segCRC == segCalcCRC ) ? "OK" : "fail"
+            );
 
-			i += 5;
+            i += 5;
 
-			if ( hasWRC ) {
-				PrintAndLogEx(NORMAL, "WRC protected area:   (I %d | K %d| WRC %d)", i, k, wrc);
-				PrintAndLogEx(NORMAL, "\nrow  | data");
-				PrintAndLogEx(NORMAL, "-----+------------------------------------------------");
+            if ( hasWRC ) {
+                PrintAndLogEx(NORMAL, "WRC protected area:   (I %d | K %d| WRC %d)", i, k, wrc);
+                PrintAndLogEx(NORMAL, "\nrow  | data");
+                PrintAndLogEx(NORMAL, "-----+------------------------------------------------");
 
-				for ( k=i; k < (i + wrc); ++k)
-					data[k] ^= crc;
+                for ( k=i; k < (i + wrc); ++k)
+                    data[k] ^= crc;
 
-				print_hex_break( data+i, wrc, 16);
+                print_hex_break( data+i, wrc, 16);
 
-				i += wrc;
-			}
+                i += wrc;
+            }
 
-			if ( hasWRP ) {
-				PrintAndLogEx(NORMAL, "Remaining write protected area:  (I %d | K %d | WRC %d | WRP %d  WRP_LEN %d)",i, k, wrc, wrp, wrp_len);
-				PrintAndLogEx(NORMAL, "\nrow  | data");
-				PrintAndLogEx(NORMAL, "-----+------------------------------------------------");
+            if ( hasWRP ) {
+                PrintAndLogEx(NORMAL, "Remaining write protected area:  (I %d | K %d | WRC %d | WRP %d  WRP_LEN %d)",i, k, wrc, wrp, wrp_len);
+                PrintAndLogEx(NORMAL, "\nrow  | data");
+                PrintAndLogEx(NORMAL, "-----+------------------------------------------------");
 
-				for (k=i; k < (i+wrp_len); ++k)
-					data[k] ^= crc;
+                for (k=i; k < (i+wrp_len); ++k)
+                    data[k] ^= crc;
 
-				print_hex_break( data+i, wrp_len, 16);
+                print_hex_break( data+i, wrp_len, 16);
 
-				i += wrp_len;
+                i += wrp_len;
 
-				// does this one work? (Answer: Only if KGH/BGH is used with BCD encoded card number! So maybe this will show just garbage...)
-				if( wrp_len == 8 )
-					PrintAndLogEx(NORMAL, "Card ID: %2X%02X%02X", data[i-4]^crc, data[i-3]^crc, data[i-2]^crc);
-			}
+                // does this one work? (Answer: Only if KGH/BGH is used with BCD encoded card number! So maybe this will show just garbage...)
+                if( wrp_len == 8 )
+                    PrintAndLogEx(NORMAL, "Card ID: %2X%02X%02X", data[i-4]^crc, data[i-3]^crc, data[i-2]^crc);
+            }
 
-			PrintAndLogEx(NORMAL, "Remaining segment payload:  (I %d | K %d | Remain LEN %d)", i, k, remain_seg_payload_len);
-			PrintAndLogEx(NORMAL, "\nrow  | data");
-			PrintAndLogEx(NORMAL, "-----+------------------------------------------------");
+            PrintAndLogEx(NORMAL, "Remaining segment payload:  (I %d | K %d | Remain LEN %d)", i, k, remain_seg_payload_len);
+            PrintAndLogEx(NORMAL, "\nrow  | data");
+            PrintAndLogEx(NORMAL, "-----+------------------------------------------------");
 
-			for ( k=i; k < (i+remain_seg_payload_len); ++k)
-				data[k] ^= crc;
+            for ( k=i; k < (i+remain_seg_payload_len); ++k)
+                data[k] ^= crc;
 
-			print_hex_break( data+i, remain_seg_payload_len, 16);
+            print_hex_break( data+i, remain_seg_payload_len, 16);
 
-			i += remain_seg_payload_len;
+            i += remain_seg_payload_len;
 
-			PrintAndLogEx(NORMAL, "-----+------------------------------------------------\n");
+            PrintAndLogEx(NORMAL, "-----+------------------------------------------------\n");
 
-			// end with last segment
-			if (segment_flag & 0x8)
-				goto out;
+            // end with last segment
+            if (segment_flag & 0x8)
+                goto out;
 
-		} // end for loop
+        } // end for loop
 
-	} else {
+    } else {
 
-		// Data start point on unsegmented cards
-		i = 8;
+        // Data start point on unsegmented cards
+        i = 8;
 
-		wrp = data[7] & 0x0F;
-		wrc = (data[7] & 0x70) >> 4;
+        wrp = data[7] & 0x0F;
+        wrc = (data[7] & 0x70) >> 4;
 
-		bool hasWRC = (wrc > 0);
-		bool hasWRP = (wrp > wrc);
-		int wrp_len = (wrp - wrc);
-		int remain_seg_payload_len = (1024 - 22 - wrp);	// Any chance to get physical card size here!?
+        bool hasWRC = (wrc > 0);
+        bool hasWRP = (wrp > wrc);
+        int wrp_len = (wrp - wrc);
+        int remain_seg_payload_len = (1024 - 22 - wrp); // Any chance to get physical card size here!?
 
-		PrintAndLogEx(NORMAL, "Unsegmented card - WRP: %02u, WRC: %02u, RD: %01u",
-			wrp,
-			wrc,
-			(data[7] & 0x80) >> 7
-		);
+        PrintAndLogEx(NORMAL, "Unsegmented card - WRP: %02u, WRC: %02u, RD: %01u",
+            wrp,
+            wrc,
+            (data[7] & 0x80) >> 7
+        );
 
-		if ( hasWRC ) {
-			PrintAndLogEx(NORMAL, "WRC protected area:   (I %d | WRC %d)", i, wrc);
-			PrintAndLogEx(NORMAL, "\nrow  | data");
-			PrintAndLogEx(NORMAL, "-----+------------------------------------------------");
-			print_hex_break( data+i, wrc, 16);
-			i += wrc;
-		}
+        if ( hasWRC ) {
+            PrintAndLogEx(NORMAL, "WRC protected area:   (I %d | WRC %d)", i, wrc);
+            PrintAndLogEx(NORMAL, "\nrow  | data");
+            PrintAndLogEx(NORMAL, "-----+------------------------------------------------");
+            print_hex_break( data+i, wrc, 16);
+            i += wrc;
+        }
 
-		if ( hasWRP ) {
-			PrintAndLogEx(NORMAL, "Remaining write protected area:  (I %d | WRC %d | WRP %d | WRP_LEN %d)", i, wrc, wrp, wrp_len);
-			PrintAndLogEx(NORMAL, "\nrow  | data");
-			PrintAndLogEx(NORMAL, "-----+------------------------------------------------");
-			print_hex_break( data + i, wrp_len, 16);
-			i += wrp_len;
+        if ( hasWRP ) {
+            PrintAndLogEx(NORMAL, "Remaining write protected area:  (I %d | WRC %d | WRP %d | WRP_LEN %d)", i, wrc, wrp, wrp_len);
+            PrintAndLogEx(NORMAL, "\nrow  | data");
+            PrintAndLogEx(NORMAL, "-----+------------------------------------------------");
+            print_hex_break( data + i, wrp_len, 16);
+            i += wrp_len;
 
-			// does this one work? (Answer: Only if KGH/BGH is used with BCD encoded card number! So maybe this will show just garbage...)
-			if( wrp_len == 8 )
-				PrintAndLogEx(NORMAL, "Card ID: %2X%02X%02X", data[i-4], data[i-3], data[i-2]);
-		}
+            // does this one work? (Answer: Only if KGH/BGH is used with BCD encoded card number! So maybe this will show just garbage...)
+            if( wrp_len == 8 )
+                PrintAndLogEx(NORMAL, "Card ID: %2X%02X%02X", data[i-4], data[i-3], data[i-2]);
+        }
 
-		PrintAndLogEx(NORMAL, "Remaining segment payload:  (I %d | Remain LEN %d)", i, remain_seg_payload_len);
-		PrintAndLogEx(NORMAL, "\nrow  | data");
-		PrintAndLogEx(NORMAL, "-----+------------------------------------------------");
-		print_hex_break( data + i, remain_seg_payload_len, 16);
-		i += remain_seg_payload_len;
+        PrintAndLogEx(NORMAL, "Remaining segment payload:  (I %d | Remain LEN %d)", i, remain_seg_payload_len);
+        PrintAndLogEx(NORMAL, "\nrow  | data");
+        PrintAndLogEx(NORMAL, "-----+------------------------------------------------");
+        print_hex_break( data + i, remain_seg_payload_len, 16);
+        i += remain_seg_payload_len;
 
-		PrintAndLogEx(NORMAL, "-----+------------------------------------------------\n");
-	}
+        PrintAndLogEx(NORMAL, "-----+------------------------------------------------\n");
+    }
 
 out:
-	free(data);
-	return 0;
+    free(data);
+    return 0;
 }
 
 // params:
@@ -472,825 +472,825 @@ out:
 // number of bytes to read
 int CmdLegicRdmem(const char *Cmd) {
 
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if ( cmdp == 'h' ) return usage_legic_rdmem();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if ( cmdp == 'h' ) return usage_legic_rdmem();
 
-	uint32_t offset = 0, len = 0, iv = 1;
-	uint16_t datalen = 0;
-	sscanf(Cmd, "%x %x %x", &offset, &len, &iv);
+    uint32_t offset = 0, len = 0, iv = 1;
+    uint16_t datalen = 0;
+    sscanf(Cmd, "%x %x %x", &offset, &len, &iv);
 
-	// sanity checks
-	if ( len + offset >= MAX_LENGTH ) {
-		PrintAndLogEx(WARNING, "Out-of-bounds, Cardsize = %d, [offset+len = %d ]", MAX_LENGTH, len + offset);
-		return -1;
-	}
+    // sanity checks
+    if ( len + offset >= MAX_LENGTH ) {
+        PrintAndLogEx(WARNING, "Out-of-bounds, Cardsize = %d, [offset+len = %d ]", MAX_LENGTH, len + offset);
+        return -1;
+    }
 
-	PrintAndLogEx(SUCCESS, "Reading %d bytes, from offset %d", len, offset);
+    PrintAndLogEx(SUCCESS, "Reading %d bytes, from offset %d", len, offset);
 
-	// allocate receiver buffer
-	uint8_t *data = calloc(len, sizeof(uint8_t));
-	if ( !data ){
-		PrintAndLogEx(WARNING, "Cannot allocate memory");
-		return -2;
-	}
+    // allocate receiver buffer
+    uint8_t *data = calloc(len, sizeof(uint8_t));
+    if ( !data ){
+        PrintAndLogEx(WARNING, "Cannot allocate memory");
+        return -2;
+    }
 
-	int status = legic_read_mem(offset, len, iv, data, &datalen);
-	if ( status == 0 ) {
-	PrintAndLogEx(NORMAL, "\n ##  |  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F");
-	PrintAndLogEx(NORMAL, "-----+------------------------------------------------------------------------------------------------");
-		print_hex_break(data, datalen, 32);
-	}
-	free(data);
-	return status;
+    int status = legic_read_mem(offset, len, iv, data, &datalen);
+    if ( status == 0 ) {
+    PrintAndLogEx(NORMAL, "\n ##  |  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F");
+    PrintAndLogEx(NORMAL, "-----+------------------------------------------------------------------------------------------------");
+        print_hex_break(data, datalen, 32);
+    }
+    free(data);
+    return status;
 }
 
 int CmdLegicRfSim(const char *Cmd) {
 
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if ( strlen(Cmd) == 0 || cmdp == 'h' ) return usage_legic_sim();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if ( strlen(Cmd) == 0 || cmdp == 'h' ) return usage_legic_sim();
 
-	UsbCommand c = {CMD_SIMULATE_TAG_LEGIC_RF, {1}};
-	sscanf(Cmd, " %" SCNi64, &c.arg[0]);
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+    UsbCommand c = {CMD_SIMULATE_TAG_LEGIC_RF, {1}};
+    sscanf(Cmd, " %" SCNi64, &c.arg[0]);
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 
 int CmdLegicRfWrite(const char *Cmd) {
 
-	uint8_t *data = NULL;
-	uint8_t cmdp = 0;
-	bool errors = false;
-	int len = 0, bg, en;
-	uint32_t offset = 0, IV = 0x55;
+    uint8_t *data = NULL;
+    uint8_t cmdp = 0;
+    bool errors = false;
+    int len = 0, bg, en;
+    uint32_t offset = 0, IV = 0x55;
 
-	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch (tolower(param_getchar(Cmd, cmdp))) {
-		case 'd':
-			// peek at length of the input string so we can
-			// figure out how many elements to malloc in "data"
-			bg=en=0;
-			if (param_getptr(Cmd, &bg, &en, cmdp+1)) {
-				errors = true;
-				break;
-			}
-			len = (en - bg + 1);
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+        case 'd':
+            // peek at length of the input string so we can
+            // figure out how many elements to malloc in "data"
+            bg=en=0;
+            if (param_getptr(Cmd, &bg, &en, cmdp+1)) {
+                errors = true;
+                break;
+            }
+            len = (en - bg + 1);
 
-			// check that user entered even number of characters
-			// for hex data string
-			if (len & 1) {
-				errors = true;
-				break;
-			}
+            // check that user entered even number of characters
+            // for hex data string
+            if (len & 1) {
+                errors = true;
+                break;
+            }
 
-			// limit number of bytes to write. This is not a 'restore' command.
-			if ( (len >> 1) > 100 ){
-				PrintAndLogEx(WARNING, "Max bound on 100bytes to write a one time.");
-				PrintAndLogEx(WARNING, "Use the 'hf legic restore' command if you want to write the whole tag at once");
-				errors = true;
-			}
+            // limit number of bytes to write. This is not a 'restore' command.
+            if ( (len >> 1) > 100 ){
+                PrintAndLogEx(WARNING, "Max bound on 100bytes to write a one time.");
+                PrintAndLogEx(WARNING, "Use the 'hf legic restore' command if you want to write the whole tag at once");
+                errors = true;
+            }
 
-			// it's possible for user to accidentally enter "b" parameter
-			// more than once - we have to clean previous malloc
-			if (data)
-				free(data);
+            // it's possible for user to accidentally enter "b" parameter
+            // more than once - we have to clean previous malloc
+            if (data)
+                free(data);
 
-			data = calloc(len >> 1, sizeof(uint8_t));
-			if ( data == NULL ) {
-				PrintAndLogEx(WARNING, "Can't allocate memory. exiting");
-				errors = true;
-				break;
-			}
+            data = calloc(len >> 1, sizeof(uint8_t));
+            if ( data == NULL ) {
+                PrintAndLogEx(WARNING, "Can't allocate memory. exiting");
+                errors = true;
+                break;
+            }
 
-			if (param_gethex(Cmd, cmdp+1, data, len)) {
-				errors = true;
-				break;
-			}
+            if (param_gethex(Cmd, cmdp+1, data, len)) {
+                errors = true;
+                break;
+            }
 
-			len >>= 1;
-			cmdp += 2;
-			break;
-		case 'o':
-			offset = param_get32ex(Cmd, cmdp+1, 4, 16);
-			cmdp += 2;
-			break;
-		case 'h':
-			errors = true;
-			break;
-		default:
-			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-			errors = true;
-			break;
-		}
-	}
-	//Validations
-	if (errors || cmdp == 0){
-		if (data)
-			free(data);
-		return usage_legic_write();
-	}
+            len >>= 1;
+            cmdp += 2;
+            break;
+        case 'o':
+            offset = param_get32ex(Cmd, cmdp+1, 4, 16);
+            cmdp += 2;
+            break;
+        case 'h':
+            errors = true;
+            break;
+        default:
+            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+            errors = true;
+            break;
+        }
+    }
+    //Validations
+    if (errors || cmdp == 0){
+        if (data)
+            free(data);
+        return usage_legic_write();
+    }
 
-	// tagtype
-	legic_card_select_t card;
-	if (legic_get_type(&card)) {
-		PrintAndLogEx(WARNING, "Failed to identify tagtype");
-		return -1;
-	}
+    // tagtype
+    legic_card_select_t card;
+    if (legic_get_type(&card)) {
+        PrintAndLogEx(WARNING, "Failed to identify tagtype");
+        return -1;
+    }
 
-	legic_print_type(card.cardsize, 0);
+    legic_print_type(card.cardsize, 0);
 
-	// OUT-OF-BOUNDS checks
-	// UID 4+1 bytes can't be written to.
-	if ( offset < 5 ) {
-		PrintAndLogEx(WARNING, "Out-of-bounds, bytes 0-1-2-3-4 can't be written to. Offset = %d", offset);
-		return -2;
-	}
+    // OUT-OF-BOUNDS checks
+    // UID 4+1 bytes can't be written to.
+    if ( offset < 5 ) {
+        PrintAndLogEx(WARNING, "Out-of-bounds, bytes 0-1-2-3-4 can't be written to. Offset = %d", offset);
+        return -2;
+    }
 
-	if ( len + offset >= card.cardsize ) {
-		PrintAndLogEx(WARNING, "Out-of-bounds, Cardsize = %d, [offset+len = %d ]", card.cardsize, len + offset);
-		return -2;
-	}
+    if ( len + offset >= card.cardsize ) {
+        PrintAndLogEx(WARNING, "Out-of-bounds, Cardsize = %d, [offset+len = %d ]", card.cardsize, len + offset);
+        return -2;
+    }
 
-	if (offset == 5 || offset == 6) {
-		PrintAndLogEx(NORMAL, "############# DANGER ################");
-		PrintAndLogEx(NORMAL, "# changing the DCF is irreversible  #");
-		PrintAndLogEx(NORMAL, "#####################################");
-		char *answer = NULL;
-		answer = readline("do you really want to continue? y(es) n(o) : ");
-		bool overwrite = (answer[0] == 'y' || answer[0] == 'Y');
-		if (!overwrite){
-			PrintAndLogEx(NORMAL, "command cancelled");
-			return 0;
-		}
-	}
+    if (offset == 5 || offset == 6) {
+        PrintAndLogEx(NORMAL, "############# DANGER ################");
+        PrintAndLogEx(NORMAL, "# changing the DCF is irreversible  #");
+        PrintAndLogEx(NORMAL, "#####################################");
+        char *answer = NULL;
+        answer = readline("do you really want to continue? y(es) n(o) : ");
+        bool overwrite = (answer[0] == 'y' || answer[0] == 'Y');
+        if (!overwrite){
+            PrintAndLogEx(NORMAL, "command cancelled");
+            return 0;
+        }
+    }
 
-	legic_chk_iv(&IV);
+    legic_chk_iv(&IV);
 
-	PrintAndLogEx(SUCCESS, "Writing to tag");
+    PrintAndLogEx(SUCCESS, "Writing to tag");
 
-	UsbCommand c = {CMD_WRITER_LEGIC_RF, {offset, len, IV}};
-	memcpy(c.d.asBytes, data, len);
-	UsbCommand resp;
-	clearCommandBuffer();
-	SendCommand(&c);
+    UsbCommand c = {CMD_WRITER_LEGIC_RF, {offset, len, IV}};
+    memcpy(c.d.asBytes, data, len);
+    UsbCommand resp;
+    clearCommandBuffer();
+    SendCommand(&c);
 
 
-	uint8_t timeout = 0;
-	while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
-		++timeout;
-		printf("."); fflush(stdout);
-		if (timeout > 7) {
-			PrintAndLogEx(WARNING, "\ncommand execution time out");
-			return 1;
-		}
-	}
-	PrintAndLogEx(NORMAL, "\n");
+    uint8_t timeout = 0;
+    while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
+        ++timeout;
+        printf("."); fflush(stdout);
+        if (timeout > 7) {
+            PrintAndLogEx(WARNING, "\ncommand execution time out");
+            return 1;
+        }
+    }
+    PrintAndLogEx(NORMAL, "\n");
 
-	uint8_t isOK = resp.arg[0] & 0xFF;
-	if ( !isOK ) {
-		PrintAndLogEx(WARNING, "Failed writing tag");
-		return 1;
-	}
+    uint8_t isOK = resp.arg[0] & 0xFF;
+    if ( !isOK ) {
+        PrintAndLogEx(WARNING, "Failed writing tag");
+        return 1;
+    }
 
     return 0;
 }
 
 int CmdLegicCalcCrc(const char *Cmd){
 
-	uint8_t *data = NULL;
-	uint8_t cmdp = 0, uidcrc = 0, type=0;
-	bool errors = false;
-	int len = 0;
-	int bg, en;
+    uint8_t *data = NULL;
+    uint8_t cmdp = 0, uidcrc = 0, type=0;
+    bool errors = false;
+    int len = 0;
+    int bg, en;
 
-	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch (tolower(param_getchar(Cmd, cmdp))) {
-		case 'd':
-			// peek at length of the input string so we can
-			// figure out how many elements to malloc in "data"
-			bg=en=0;
-			if (param_getptr(Cmd, &bg, &en, cmdp+1)) {
-				errors = true;
-				break;
-			}
-			len = (en - bg + 1);
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+        case 'd':
+            // peek at length of the input string so we can
+            // figure out how many elements to malloc in "data"
+            bg=en=0;
+            if (param_getptr(Cmd, &bg, &en, cmdp+1)) {
+                errors = true;
+                break;
+            }
+            len = (en - bg + 1);
 
-			// check that user entered even number of characters
-			// for hex data string
-			if (len & 1) {
-				errors = true;
-				break;
-			}
+            // check that user entered even number of characters
+            // for hex data string
+            if (len & 1) {
+                errors = true;
+                break;
+            }
 
-			// it's possible for user to accidentally enter "b" parameter
-			// more than once - we have to clean previous malloc
-			if (data) free(data);
-			data = calloc(len >> 1,  sizeof(uint8_t) );
-			if ( data == NULL ) {
-				PrintAndLogEx(WARNING, "Can't allocate memory. exiting");
-				errors = true;
-				break;
-			}
+            // it's possible for user to accidentally enter "b" parameter
+            // more than once - we have to clean previous malloc
+            if (data) free(data);
+            data = calloc(len >> 1,  sizeof(uint8_t) );
+            if ( data == NULL ) {
+                PrintAndLogEx(WARNING, "Can't allocate memory. exiting");
+                errors = true;
+                break;
+            }
 
-			if (param_gethex(Cmd, cmdp+1, data, len)) {
-				errors = true;
-				break;
-			}
+            if (param_gethex(Cmd, cmdp+1, data, len)) {
+                errors = true;
+                break;
+            }
 
-			len >>= 1;
-			cmdp += 2;
-			break;
-		case 'u':
-			uidcrc = param_get8ex(Cmd, cmdp+1, 0, 16);
-			cmdp += 2;
-			break;
-		case 'c':
-			type = param_get8ex(Cmd, cmdp+1, 0, 10);
-			cmdp += 2;
-			break;
-		case 'h':
-			errors = true;
-			break;
-		default:
-			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-			errors = true;
-			break;
-		}
-	}
-	//Validations
-	if (errors || cmdp == 0){
-		if (data) free(data);
-		return usage_legic_calccrc();
-	}
+            len >>= 1;
+            cmdp += 2;
+            break;
+        case 'u':
+            uidcrc = param_get8ex(Cmd, cmdp+1, 0, 16);
+            cmdp += 2;
+            break;
+        case 'c':
+            type = param_get8ex(Cmd, cmdp+1, 0, 10);
+            cmdp += 2;
+            break;
+        case 'h':
+            errors = true;
+            break;
+        default:
+            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+            errors = true;
+            break;
+        }
+    }
+    //Validations
+    if (errors || cmdp == 0){
+        if (data) free(data);
+        return usage_legic_calccrc();
+    }
 
-	switch (type){
-		case 16:
-			init_table(CRC_LEGIC);
-			PrintAndLogEx(SUCCESS, "Legic crc16: %X", crc16_legic(data, len, uidcrc));
-			break;
-		default:
-			PrintAndLogEx(SUCCESS, "Legic crc8: %X",  CRC8Legic(data, len) );
-			break;
-	}
+    switch (type){
+        case 16:
+            init_table(CRC_LEGIC);
+            PrintAndLogEx(SUCCESS, "Legic crc16: %X", crc16_legic(data, len, uidcrc));
+            break;
+        default:
+            PrintAndLogEx(SUCCESS, "Legic crc8: %X",  CRC8Legic(data, len) );
+            break;
+    }
 
-	if (data) free(data);
-	return 0;
+    if (data) free(data);
+    return 0;
 }
 
 int legic_read_mem(uint32_t offset, uint32_t len, uint32_t iv, uint8_t *out, uint16_t *outlen) {
 
-	legic_chk_iv(&iv);
+    legic_chk_iv(&iv);
 
-	UsbCommand c = {CMD_READER_LEGIC_RF, {offset, len, iv}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	UsbCommand resp;
+    UsbCommand c = {CMD_READER_LEGIC_RF, {offset, len, iv}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    UsbCommand resp;
 
-	uint8_t timeout = 0;
-	while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
-		++timeout;
-		printf("."); fflush(stdout);
-		if (timeout > 7) {
-			PrintAndLogEx(WARNING, "\ncommand execution time out");
-			return 1;
-		}
-	}
-	PrintAndLogEx(NORMAL, "\n");
+    uint8_t timeout = 0;
+    while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
+        ++timeout;
+        printf("."); fflush(stdout);
+        if (timeout > 7) {
+            PrintAndLogEx(WARNING, "\ncommand execution time out");
+            return 1;
+        }
+    }
+    PrintAndLogEx(NORMAL, "\n");
 
-	uint8_t isOK = resp.arg[0] & 0xFF;
-	*outlen = resp.arg[1];
-	if ( !isOK ) {
-		PrintAndLogEx(WARNING, "Failed reading tag");
-		return 2;
-	}
+    uint8_t isOK = resp.arg[0] & 0xFF;
+    *outlen = resp.arg[1];
+    if ( !isOK ) {
+        PrintAndLogEx(WARNING, "Failed reading tag");
+        return 2;
+    }
 
-	if ( *outlen != len )
-		PrintAndLogEx(WARNING, "Fail, only managed to read %u bytes", *outlen);
+    if ( *outlen != len )
+        PrintAndLogEx(WARNING, "Fail, only managed to read %u bytes", *outlen);
 
-	// copy data from device
-	if ( !GetFromDevice( BIG_BUF_EML, out, *outlen, 0, NULL, 2500, false) ) {
-		PrintAndLogEx(WARNING, "Fail, transfer from device time-out");
-		return 4;
-	}
-	return 0;
+    // copy data from device
+    if ( !GetFromDevice( BIG_BUF_EML, out, *outlen, 0, NULL, 2500, false) ) {
+        PrintAndLogEx(WARNING, "Fail, transfer from device time-out");
+        return 4;
+    }
+    return 0;
 }
 
 int legic_print_type(uint32_t tagtype, uint8_t spaces){
-	char spc[11] = "          ";
-	spc[10]=0x00;
-	char *spacer = spc + (10-spaces);
+    char spc[11] = "          ";
+    spc[10]=0x00;
+    char *spacer = spc + (10-spaces);
 
-	if ( tagtype == 22 )
-		PrintAndLogEx(SUCCESS, "%sTYPE : MIM%d card (outdated)", spacer, tagtype);
-	else if ( tagtype == 256 )
-		PrintAndLogEx(SUCCESS, "%sTYPE : MIM%d card (234 bytes)", spacer, tagtype);
-	else if ( tagtype == 1024 )
-		PrintAndLogEx(SUCCESS, "%sTYPE : MIM%d card (1002 bytes)", spacer, tagtype);
-	else
-		PrintAndLogEx(INFO, "%sTYPE : Unknown %06x", spacer, tagtype);
-	return 0;
+    if ( tagtype == 22 )
+        PrintAndLogEx(SUCCESS, "%sTYPE : MIM%d card (outdated)", spacer, tagtype);
+    else if ( tagtype == 256 )
+        PrintAndLogEx(SUCCESS, "%sTYPE : MIM%d card (234 bytes)", spacer, tagtype);
+    else if ( tagtype == 1024 )
+        PrintAndLogEx(SUCCESS, "%sTYPE : MIM%d card (1002 bytes)", spacer, tagtype);
+    else
+        PrintAndLogEx(INFO, "%sTYPE : Unknown %06x", spacer, tagtype);
+    return 0;
 }
 int legic_get_type(legic_card_select_t *card){
 
-	if ( card == NULL ) return 1;
+    if ( card == NULL ) return 1;
 
-	UsbCommand c = {CMD_LEGIC_INFO, {0,0,0}};
-	clearCommandBuffer();
+    UsbCommand c = {CMD_LEGIC_INFO, {0,0,0}};
+    clearCommandBuffer();
     SendCommand(&c);
-	UsbCommand resp;
-	if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500))
-		return 2;
+    UsbCommand resp;
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500))
+        return 2;
 
-	uint8_t isOK = resp.arg[0] & 0xFF;
-	if ( !isOK )
-		return 3;
+    uint8_t isOK = resp.arg[0] & 0xFF;
+    if ( !isOK )
+        return 3;
 
-	memcpy(card, (legic_card_select_t *)resp.d.asBytes, sizeof(legic_card_select_t));
-	return 0;
+    memcpy(card, (legic_card_select_t *)resp.d.asBytes, sizeof(legic_card_select_t));
+    return 0;
 }
 void legic_chk_iv(uint32_t *iv){
-	if ( (*iv & 0x7F) != *iv ){
-		*iv &= 0x7F;
-		PrintAndLogEx(INFO, "Truncating IV to 7bits, %u", *iv);
-	}
-	// IV must be odd
-	if ( (*iv & 1) == 0 ){
-		*iv |= 0x01;
-		PrintAndLogEx(INFO, "LSB of IV must be SET %u", *iv);
-	}
+    if ( (*iv & 0x7F) != *iv ){
+        *iv &= 0x7F;
+        PrintAndLogEx(INFO, "Truncating IV to 7bits, %u", *iv);
+    }
+    // IV must be odd
+    if ( (*iv & 1) == 0 ){
+        *iv |= 0x01;
+        PrintAndLogEx(INFO, "LSB of IV must be SET %u", *iv);
+    }
 }
 void legic_seteml(uint8_t *src, uint32_t offset, uint32_t numofbytes) {
-	size_t len = 0;
+    size_t len = 0;
 
-	UsbCommand c = {CMD_LEGIC_ESET, {0, 0, 0}};
-	for(size_t i = offset; i < numofbytes; i += USB_CMD_DATA_SIZE) {
+    UsbCommand c = {CMD_LEGIC_ESET, {0, 0, 0}};
+    for(size_t i = offset; i < numofbytes; i += USB_CMD_DATA_SIZE) {
 
-		len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);
-		c.arg[0] = i; // offset
-		c.arg[1] = len; // number of bytes
-		memcpy(c.d.asBytes, src+i, len);
-		clearCommandBuffer();
-		SendCommand(&c);
-	}
+        len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);
+        c.arg[0] = i; // offset
+        c.arg[1] = len; // number of bytes
+        memcpy(c.d.asBytes, src+i, len);
+        clearCommandBuffer();
+        SendCommand(&c);
+    }
 }
 
 int HFLegicReader(const char *Cmd, bool verbose) {
 
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if ( cmdp == 'h' ) return usage_legic_reader();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if ( cmdp == 'h' ) return usage_legic_reader();
 
-	legic_card_select_t card;
-	switch (legic_get_type(&card)){
-		case 1:
-			return 2;
-		case 2:
-			if ( verbose ) PrintAndLogEx(WARNING, "command execution time out");
-			return 1;
-		case 3:
-			if ( verbose ) PrintAndLogEx(WARNING, "legic card select failed");
-			return 2;
-		default: break;
-	}
-	PrintAndLogEx(SUCCESS, " UID : %s", sprint_hex(card.uid, sizeof(card.uid)));
-	legic_print_type(card.cardsize, 0);
-	return 0;
+    legic_card_select_t card;
+    switch (legic_get_type(&card)){
+        case 1:
+            return 2;
+        case 2:
+            if ( verbose ) PrintAndLogEx(WARNING, "command execution time out");
+            return 1;
+        case 3:
+            if ( verbose ) PrintAndLogEx(WARNING, "legic card select failed");
+            return 2;
+        default: break;
+    }
+    PrintAndLogEx(SUCCESS, " UID : %s", sprint_hex(card.uid, sizeof(card.uid)));
+    legic_print_type(card.cardsize, 0);
+    return 0;
 }
 int CmdLegicReader(const char *Cmd){
-	return HFLegicReader(Cmd, true);
+    return HFLegicReader(Cmd, true);
 }
 
 int CmdLegicDump(const char *Cmd){
 
-	FILE *f;
-	char filename[FILE_PATH_SIZE] = {0x00};
-	char *fnameptr = filename;
-	size_t fileNlen = 0;
-	bool errors = false;
-	uint16_t dumplen;
-	uint8_t cmdp = 0;
+    FILE *f;
+    char filename[FILE_PATH_SIZE] = {0x00};
+    char *fnameptr = filename;
+    size_t fileNlen = 0;
+    bool errors = false;
+    uint16_t dumplen;
+    uint8_t cmdp = 0;
 
-	memset(filename, 0, sizeof(filename));
+    memset(filename, 0, sizeof(filename));
 
-	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch (tolower(param_getchar(Cmd, cmdp))) {
-			case 'h':
-				return usage_legic_dump();
-			case 'o':
-				fileNlen = param_getstr(Cmd, cmdp+1, filename, FILE_PATH_SIZE);
-				if (!fileNlen)
-					errors = true;
-				if (fileNlen > FILE_PATH_SIZE-5)
-					fileNlen = FILE_PATH_SIZE-5;
-				cmdp += 2;
-				break;
-			default:
-				PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-				errors = true;
-				break;
-		}
-	}
-	//Validations
-	if (errors) return usage_legic_dump();
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+            case 'h':
+                return usage_legic_dump();
+            case 'o':
+                fileNlen = param_getstr(Cmd, cmdp+1, filename, FILE_PATH_SIZE);
+                if (!fileNlen)
+                    errors = true;
+                if (fileNlen > FILE_PATH_SIZE-5)
+                    fileNlen = FILE_PATH_SIZE-5;
+                cmdp += 2;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                errors = true;
+                break;
+        }
+    }
+    //Validations
+    if (errors) return usage_legic_dump();
 
-	// tagtype
-	legic_card_select_t card;
-	if (legic_get_type(&card)) {
-		PrintAndLogEx(WARNING, "Failed to identify tagtype");
-		return -1;
-	}
-	dumplen = card.cardsize;
+    // tagtype
+    legic_card_select_t card;
+    if (legic_get_type(&card)) {
+        PrintAndLogEx(WARNING, "Failed to identify tagtype");
+        return -1;
+    }
+    dumplen = card.cardsize;
 
-	legic_print_type(dumplen, 0);
-	PrintAndLogEx(SUCCESS, "Reading tag memory %d b...", dumplen);
+    legic_print_type(dumplen, 0);
+    PrintAndLogEx(SUCCESS, "Reading tag memory %d b...", dumplen);
 
-	UsbCommand c = {CMD_READER_LEGIC_RF, {0x00, dumplen, 0x55}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	UsbCommand resp;
+    UsbCommand c = {CMD_READER_LEGIC_RF, {0x00, dumplen, 0x55}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    UsbCommand resp;
 
-	uint8_t timeout = 0;
-	while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
-		++timeout;
-		printf("."); fflush(stdout);
-		if (timeout > 7) {
-			PrintAndLogEx(WARNING, "\ncommand execution time out");
-			return 1;
-		}
-	}
-	PrintAndLogEx(NORMAL, "\n");
+    uint8_t timeout = 0;
+    while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
+        ++timeout;
+        printf("."); fflush(stdout);
+        if (timeout > 7) {
+            PrintAndLogEx(WARNING, "\ncommand execution time out");
+            return 1;
+        }
+    }
+    PrintAndLogEx(NORMAL, "\n");
 
-	uint8_t isOK = resp.arg[0] & 0xFF;
-	if ( !isOK ) {
-		PrintAndLogEx(WARNING, "Failed dumping tag data");
-		return 2;
-	}
+    uint8_t isOK = resp.arg[0] & 0xFF;
+    if ( !isOK ) {
+        PrintAndLogEx(WARNING, "Failed dumping tag data");
+        return 2;
+    }
 
-	uint16_t readlen = resp.arg[1];
-	uint8_t *data = calloc(readlen, sizeof(uint8_t));
-	if (!data) {
-		PrintAndLogEx(WARNING, "Fail, cannot allocate memory");
-		return 3;
-	}
+    uint16_t readlen = resp.arg[1];
+    uint8_t *data = calloc(readlen, sizeof(uint8_t));
+    if (!data) {
+        PrintAndLogEx(WARNING, "Fail, cannot allocate memory");
+        return 3;
+    }
 
-	if ( readlen != dumplen )
-		PrintAndLogEx(WARNING, "Fail, only managed to read 0x%02X bytes of 0x%02X", readlen, dumplen);
+    if ( readlen != dumplen )
+        PrintAndLogEx(WARNING, "Fail, only managed to read 0x%02X bytes of 0x%02X", readlen, dumplen);
 
-	// copy data from device
-	if (!GetFromDevice( BIG_BUF_EML, data, readlen, 0, NULL, 2500, false) ) {
-		PrintAndLogEx(WARNING, "Fail, transfer from device time-out");
-		free(data);
-		return 4;
-	}
+    // copy data from device
+    if (!GetFromDevice( BIG_BUF_EML, data, readlen, 0, NULL, 2500, false) ) {
+        PrintAndLogEx(WARNING, "Fail, transfer from device time-out");
+        free(data);
+        return 4;
+    }
 
-	// user supplied filename?
-	if (fileNlen < 1)
-		sprintf(fnameptr,"%02X%02X%02X%02X.bin", data[0], data[1], data[2], data[3]);
-	else
-		sprintf(fnameptr + fileNlen,".bin");
+    // user supplied filename?
+    if (fileNlen < 1)
+        sprintf(fnameptr,"%02X%02X%02X%02X.bin", data[0], data[1], data[2], data[3]);
+    else
+        sprintf(fnameptr + fileNlen,".bin");
 
-	f = fopen(filename, "wb");
-	if (!f) {
-		PrintAndLogEx(WARNING, "Could not create file name %s", filename);
-		if (data)
-			free(data);
-		return 5;
-	}
-	fwrite(data, 1, readlen, f);
-	fflush(f);
-	fclose(f);
-	free(data);
-	PrintAndLogEx(SUCCESS, "Wrote %d bytes to %s", readlen, filename);
-	return 0;
+    f = fopen(filename, "wb");
+    if (!f) {
+        PrintAndLogEx(WARNING, "Could not create file name %s", filename);
+        if (data)
+            free(data);
+        return 5;
+    }
+    fwrite(data, 1, readlen, f);
+    fflush(f);
+    fclose(f);
+    free(data);
+    PrintAndLogEx(SUCCESS, "Wrote %d bytes to %s", readlen, filename);
+    return 0;
 }
 
 int CmdLegicRestore(const char *Cmd){
 
-	FILE *f;
-	char filename[FILE_PATH_SIZE] = {0x00};
-	char *fnameptr = filename;
-	size_t fileNlen = 0;
-	bool errors = false;
-	uint16_t numofbytes;
-	uint8_t cmdp = 0;
+    FILE *f;
+    char filename[FILE_PATH_SIZE] = {0x00};
+    char *fnameptr = filename;
+    size_t fileNlen = 0;
+    bool errors = false;
+    uint16_t numofbytes;
+    uint8_t cmdp = 0;
 
-	memset(filename, 0, sizeof(filename));
+    memset(filename, 0, sizeof(filename));
 
-	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch (tolower(param_getchar(Cmd, cmdp))) {
-			case 'h':
-				errors = true;
-				break;
-			case 'i':
-				fileNlen = param_getstr(Cmd, cmdp+1, filename, FILE_PATH_SIZE);
-				if (!fileNlen)
-					errors = true;
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+            case 'h':
+                errors = true;
+                break;
+            case 'i':
+                fileNlen = param_getstr(Cmd, cmdp+1, filename, FILE_PATH_SIZE);
+                if (!fileNlen)
+                    errors = true;
 
-				if (fileNlen > FILE_PATH_SIZE-5)
-					fileNlen = FILE_PATH_SIZE-5;
-				cmdp += 2;
-				break;
-			default:
-				PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-				errors = true;
-				break;
-		}
-	}
-	//Validations
-	if (errors || cmdp == 0) return usage_legic_restore();
+                if (fileNlen > FILE_PATH_SIZE-5)
+                    fileNlen = FILE_PATH_SIZE-5;
+                cmdp += 2;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                errors = true;
+                break;
+        }
+    }
+    //Validations
+    if (errors || cmdp == 0) return usage_legic_restore();
 
-	// tagtype
-	legic_card_select_t card;
-	if (legic_get_type(&card)) {
-		PrintAndLogEx(WARNING, "Failed to identify tagtype");
-		return 1;
-	}
-	numofbytes = card.cardsize;
+    // tagtype
+    legic_card_select_t card;
+    if (legic_get_type(&card)) {
+        PrintAndLogEx(WARNING, "Failed to identify tagtype");
+        return 1;
+    }
+    numofbytes = card.cardsize;
 
-	// set up buffer
-	uint8_t *data = calloc(numofbytes, sizeof(uint8_t) );
-	if (!data) {
-		PrintAndLogEx(WARNING, "Fail, cannot allocate memory");
-		return 2;
-	}
+    // set up buffer
+    uint8_t *data = calloc(numofbytes, sizeof(uint8_t) );
+    if (!data) {
+        PrintAndLogEx(WARNING, "Fail, cannot allocate memory");
+        return 2;
+    }
 
-	legic_print_type(numofbytes, 0);
+    legic_print_type(numofbytes, 0);
 
-	// set up file
-	fnameptr += fileNlen;
-	sprintf(fnameptr, ".bin");
+    // set up file
+    fnameptr += fileNlen;
+    sprintf(fnameptr, ".bin");
 
-	f = fopen(filename,"rb");
-	if (!f) {
-		PrintAndLogEx(WARNING, "File %s not found or locked", filename);
-		free(data);
-		return 3;
-	}
+    f = fopen(filename,"rb");
+    if (!f) {
+        PrintAndLogEx(WARNING, "File %s not found or locked", filename);
+        free(data);
+        return 3;
+    }
 
-	// verify size of dumpfile is the same as card.
-	fseek(f, 0, SEEK_END); // seek to end of file
-	size_t filesize = ftell(f); // get current file pointer
-	fseek(f, 0, SEEK_SET); // seek back to beginning of file
+    // verify size of dumpfile is the same as card.
+    fseek(f, 0, SEEK_END); // seek to end of file
+    size_t filesize = ftell(f); // get current file pointer
+    fseek(f, 0, SEEK_SET); // seek back to beginning of file
 
-	if ( filesize != numofbytes) {
-		PrintAndLogEx(WARNING, "Fail, filesize and cardsize is not equal. [%u != %u]", filesize, numofbytes);
-		free(data);
-		fclose(f);
-		return 4;
-	}
+    if ( filesize != numofbytes) {
+        PrintAndLogEx(WARNING, "Fail, filesize and cardsize is not equal. [%u != %u]", filesize, numofbytes);
+        free(data);
+        fclose(f);
+        return 4;
+    }
 
-	// load file
-	size_t bytes_read = fread(data, 1, numofbytes, f);
-	fclose(f);
+    // load file
+    size_t bytes_read = fread(data, 1, numofbytes, f);
+    fclose(f);
 
-	if ( bytes_read == 0){
-		PrintAndLogEx(WARNING, "File reading error");
-		free(data);
-		return 2;
-	}
+    if ( bytes_read == 0){
+        PrintAndLogEx(WARNING, "File reading error");
+        free(data);
+        return 2;
+    }
 
-	PrintAndLogEx(SUCCESS, "Restoring to card");
+    PrintAndLogEx(SUCCESS, "Restoring to card");
 
-	// transfer to device
-	size_t len = 0;
-	UsbCommand c = {CMD_WRITER_LEGIC_RF, {0, 0, 0x55}};
-	UsbCommand resp;
-	for(size_t i = 7; i < numofbytes; i += USB_CMD_DATA_SIZE) {
+    // transfer to device
+    size_t len = 0;
+    UsbCommand c = {CMD_WRITER_LEGIC_RF, {0, 0, 0x55}};
+    UsbCommand resp;
+    for(size_t i = 7; i < numofbytes; i += USB_CMD_DATA_SIZE) {
 
-		len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);
-		c.arg[0] = i; // offset
-		c.arg[1] = len; // number of bytes
-		memcpy(c.d.asBytes, data+i, len);
-		clearCommandBuffer();
-		SendCommand(&c);
+        len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);
+        c.arg[0] = i; // offset
+        c.arg[1] = len; // number of bytes
+        memcpy(c.d.asBytes, data+i, len);
+        clearCommandBuffer();
+        SendCommand(&c);
 
-		uint8_t timeout = 0;
-		while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
-			++timeout;
-			printf("."); fflush(stdout);
-			if (timeout > 7) {
-				PrintAndLogEx(WARNING, "\ncommand execution time out");
-				free(data);
-				return 1;
-			}
-		}
-		PrintAndLogEx(NORMAL, "\n");
+        uint8_t timeout = 0;
+        while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
+            ++timeout;
+            printf("."); fflush(stdout);
+            if (timeout > 7) {
+                PrintAndLogEx(WARNING, "\ncommand execution time out");
+                free(data);
+                return 1;
+            }
+        }
+        PrintAndLogEx(NORMAL, "\n");
 
-		uint8_t isOK = resp.arg[0] & 0xFF;
-		if ( !isOK ) {
-			PrintAndLogEx(WARNING, "Failed writing tag [msg = %u]", resp.arg[1] & 0xFF);
-			free(data);
-			return 1;
-		}
-		PrintAndLogEx(SUCCESS, "Wrote chunk [offset %d | len %d | total %d", i, len, i+len);
-	}
+        uint8_t isOK = resp.arg[0] & 0xFF;
+        if ( !isOK ) {
+            PrintAndLogEx(WARNING, "Failed writing tag [msg = %u]", resp.arg[1] & 0xFF);
+            free(data);
+            return 1;
+        }
+        PrintAndLogEx(SUCCESS, "Wrote chunk [offset %d | len %d | total %d", i, len, i+len);
+    }
 
-	free(data);
-	PrintAndLogEx(SUCCESS, "\nWrote %d bytes to card from file %s", numofbytes, filename);
-	return 0;
+    free(data);
+    PrintAndLogEx(SUCCESS, "\nWrote %d bytes to card from file %s", numofbytes, filename);
+    return 0;
 }
 
 int CmdLegicELoad(const char *Cmd) {
-	FILE * f;
-	char filename[FILE_PATH_SIZE];
-	char *fnameptr = filename;
-	int len, numofbytes;
-	int nameParamNo = 1;
+    FILE * f;
+    char filename[FILE_PATH_SIZE];
+    char *fnameptr = filename;
+    int len, numofbytes;
+    int nameParamNo = 1;
 
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if ( cmdp == 'h' || cmdp == 0x00)
-		return usage_legic_eload();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if ( cmdp == 'h' || cmdp == 0x00)
+        return usage_legic_eload();
 
-	switch (cmdp) {
-		case '0' : numofbytes = 22; break;
-		case '1' :
-		case '\0': numofbytes = 256; break;
-		case '2' : numofbytes = 1024; break;
-		default  : numofbytes = 256;  nameParamNo = 0;break;
-	}
+    switch (cmdp) {
+        case '0' : numofbytes = 22; break;
+        case '1' :
+        case '\0': numofbytes = 256; break;
+        case '2' : numofbytes = 1024; break;
+        default  : numofbytes = 256;  nameParamNo = 0;break;
+    }
 
-	// set up buffer
-	uint8_t *data = calloc(numofbytes, sizeof(uint8_t));
-	if (!data) {
-		PrintAndLogEx(WARNING, "Fail, cannot allocate memory");
-		return 3;
-	}
+    // set up buffer
+    uint8_t *data = calloc(numofbytes, sizeof(uint8_t));
+    if (!data) {
+        PrintAndLogEx(WARNING, "Fail, cannot allocate memory");
+        return 3;
+    }
 
-	// set up file
-	len = param_getstr(Cmd, nameParamNo, filename, FILE_PATH_SIZE);
-	if (len > FILE_PATH_SIZE - 5)
-		len = FILE_PATH_SIZE - 5;
-	fnameptr += len;
-	sprintf(fnameptr, ".bin");
+    // set up file
+    len = param_getstr(Cmd, nameParamNo, filename, FILE_PATH_SIZE);
+    if (len > FILE_PATH_SIZE - 5)
+        len = FILE_PATH_SIZE - 5;
+    fnameptr += len;
+    sprintf(fnameptr, ".bin");
 
-	// open file
-	f = fopen(filename,"rb");
-	if (!f) {
-		PrintAndLogEx(WARNING, "File %s not found or locked", filename);
-		free(data);
-		return 1;
-	}
+    // open file
+    f = fopen(filename,"rb");
+    if (!f) {
+        PrintAndLogEx(WARNING, "File %s not found or locked", filename);
+        free(data);
+        return 1;
+    }
 
-	// load file
-	size_t bytes_read = fread(data, 1, numofbytes, f);
-	if ( bytes_read == 0){
-		PrintAndLogEx(WARNING, "File reading error");
-		free(data);
-		fclose(f);
-		f = NULL;
-		return 2;
-	}
-	fclose(f);
-	f = NULL;
+    // load file
+    size_t bytes_read = fread(data, 1, numofbytes, f);
+    if ( bytes_read == 0){
+        PrintAndLogEx(WARNING, "File reading error");
+        free(data);
+        fclose(f);
+        f = NULL;
+        return 2;
+    }
+    fclose(f);
+    f = NULL;
 
-	// transfer to device
-	legic_seteml(data, 0, numofbytes);
+    // transfer to device
+    legic_seteml(data, 0, numofbytes);
 
-	free(data);
-	PrintAndLogEx(SUCCESS, "\nLoaded %d bytes from file: %s  to emulator memory", numofbytes, filename);
-	return 0;
+    free(data);
+    PrintAndLogEx(SUCCESS, "\nLoaded %d bytes from file: %s  to emulator memory", numofbytes, filename);
+    return 0;
 }
 
 int CmdLegicESave(const char *Cmd) {
 
-	char filename[FILE_PATH_SIZE];
-	char *fnameptr = filename;
-	int fileNlen, numofbytes, nameParamNo = 1;
+    char filename[FILE_PATH_SIZE];
+    char *fnameptr = filename;
+    int fileNlen, numofbytes, nameParamNo = 1;
 
-	memset(filename, 0, sizeof(filename));
+    memset(filename, 0, sizeof(filename));
 
-	char cmdp = tolower(param_getchar(Cmd, 0));
+    char cmdp = tolower(param_getchar(Cmd, 0));
 
-	if ( cmdp == 'h' || cmdp == 0x00)
-		return usage_legic_esave();
+    if ( cmdp == 'h' || cmdp == 0x00)
+        return usage_legic_esave();
 
-	switch (cmdp) {
-		case '0' : numofbytes = 22; break;
-		case '1' :
-		case '\0': numofbytes = 256; break;
-		case '2' : numofbytes = 1024; break;
-		default  : numofbytes = 256; nameParamNo = 0; break;
-	}
+    switch (cmdp) {
+        case '0' : numofbytes = 22; break;
+        case '1' :
+        case '\0': numofbytes = 256; break;
+        case '2' : numofbytes = 1024; break;
+        default  : numofbytes = 256; nameParamNo = 0; break;
+    }
 
-	fileNlen = param_getstr(Cmd, nameParamNo, filename, FILE_PATH_SIZE);
+    fileNlen = param_getstr(Cmd, nameParamNo, filename, FILE_PATH_SIZE);
 
-	if (fileNlen > FILE_PATH_SIZE - 5)
-		fileNlen = FILE_PATH_SIZE - 5;
+    if (fileNlen > FILE_PATH_SIZE - 5)
+        fileNlen = FILE_PATH_SIZE - 5;
 
-	// set up buffer
-	uint8_t *data = calloc(numofbytes, sizeof(uint8_t));
-	if (!data) {
-		PrintAndLogEx(WARNING, "Fail, cannot allocate memory");
-		return 3;
-	}
+    // set up buffer
+    uint8_t *data = calloc(numofbytes, sizeof(uint8_t));
+    if (!data) {
+        PrintAndLogEx(WARNING, "Fail, cannot allocate memory");
+        return 3;
+    }
 
-	// download emulator memory
-	PrintAndLogEx(SUCCESS, "Reading emulator memory...");
-	if (!GetFromDevice( BIG_BUF_EML, data, numofbytes, 0, NULL, 2500, false)) {
-		PrintAndLogEx(WARNING, "Fail, transfer from device time-out");
-		free(data);
-		return 4;
-	}
-	// user supplied filename?
-	if (fileNlen < 1)
-		sprintf(fnameptr,"%02X%02X%02X%02X.bin", data[0], data[1], data[2], data[3]);
-	else
-		sprintf(fnameptr + fileNlen,".bin");
+    // download emulator memory
+    PrintAndLogEx(SUCCESS, "Reading emulator memory...");
+    if (!GetFromDevice( BIG_BUF_EML, data, numofbytes, 0, NULL, 2500, false)) {
+        PrintAndLogEx(WARNING, "Fail, transfer from device time-out");
+        free(data);
+        return 4;
+    }
+    // user supplied filename?
+    if (fileNlen < 1)
+        sprintf(fnameptr,"%02X%02X%02X%02X.bin", data[0], data[1], data[2], data[3]);
+    else
+        sprintf(fnameptr + fileNlen,".bin");
 
-	saveFileEML(filename, "eml", data, numofbytes, 8);
-	saveFile(filename, "bin", data, numofbytes);
-	return 0;
+    saveFileEML(filename, "eml", data, numofbytes, 8);
+    saveFile(filename, "bin", data, numofbytes);
+    return 0;
 }
 
 int CmdLegicWipe(const char *Cmd){
 
-	char cmdp = tolower(param_getchar(Cmd, 0));
+    char cmdp = tolower(param_getchar(Cmd, 0));
 
-	if ( cmdp == 'h') return usage_legic_wipe();
+    if ( cmdp == 'h') return usage_legic_wipe();
 
-	// tagtype
-	legic_card_select_t card;
-	if (legic_get_type(&card)) {
-		PrintAndLogEx(WARNING, "Failed to identify tagtype");
-		return 1;
-	}
+    // tagtype
+    legic_card_select_t card;
+    if (legic_get_type(&card)) {
+        PrintAndLogEx(WARNING, "Failed to identify tagtype");
+        return 1;
+    }
 
-	// set up buffer
-	uint8_t *data = calloc(card.cardsize, sizeof(uint8_t));
-	if (!data) {
-		PrintAndLogEx(WARNING, "Fail, cannot allocate memory");
-		return 2;
-	}
+    // set up buffer
+    uint8_t *data = calloc(card.cardsize, sizeof(uint8_t));
+    if (!data) {
+        PrintAndLogEx(WARNING, "Fail, cannot allocate memory");
+        return 2;
+    }
 
-	legic_print_type(card.cardsize, 0);
+    legic_print_type(card.cardsize, 0);
 
-	PrintAndLogEx(SUCCESS, "Erasing");
+    PrintAndLogEx(SUCCESS, "Erasing");
 
-	// transfer to device
-	size_t len = 0;
-	UsbCommand c = {CMD_WRITER_LEGIC_RF, {0, 0, 0x55}};
-	UsbCommand resp;
-	for(size_t i = 7; i < card.cardsize; i += USB_CMD_DATA_SIZE) {
+    // transfer to device
+    size_t len = 0;
+    UsbCommand c = {CMD_WRITER_LEGIC_RF, {0, 0, 0x55}};
+    UsbCommand resp;
+    for(size_t i = 7; i < card.cardsize; i += USB_CMD_DATA_SIZE) {
 
-		printf("."); fflush(stdout);
-		len = MIN((card.cardsize - i), USB_CMD_DATA_SIZE);
-		c.arg[0] = i; // offset
-		c.arg[1] = len; // number of bytes
-		memcpy(c.d.asBytes, data+i, len);
-		clearCommandBuffer();
-		SendCommand(&c);
+        printf("."); fflush(stdout);
+        len = MIN((card.cardsize - i), USB_CMD_DATA_SIZE);
+        c.arg[0] = i; // offset
+        c.arg[1] = len; // number of bytes
+        memcpy(c.d.asBytes, data+i, len);
+        clearCommandBuffer();
+        SendCommand(&c);
 
-		uint8_t timeout = 0;
-		while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
-			++timeout;
-			printf("."); fflush(stdout);
-			if (timeout > 7) {
-				PrintAndLogEx(WARNING, "\ncommand execution time out");
-				free(data);
-				return 3;
-			}
-		}
-		PrintAndLogEx(NORMAL, "\n");
+        uint8_t timeout = 0;
+        while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
+            ++timeout;
+            printf("."); fflush(stdout);
+            if (timeout > 7) {
+                PrintAndLogEx(WARNING, "\ncommand execution time out");
+                free(data);
+                return 3;
+            }
+        }
+        PrintAndLogEx(NORMAL, "\n");
 
-		uint8_t isOK = resp.arg[0] & 0xFF;
-		if ( !isOK ) {
-			PrintAndLogEx(WARNING, "Failed writing tag [msg = %u]", resp.arg[1] & 0xFF);
-			free(data);
-			return 4;
-		}
-	}
-	PrintAndLogEx(SUCCESS, "ok\n");
-	return 0;
+        uint8_t isOK = resp.arg[0] & 0xFF;
+        if ( !isOK ) {
+            PrintAndLogEx(WARNING, "Failed writing tag [msg = %u]", resp.arg[1] & 0xFF);
+            free(data);
+            return 4;
+        }
+    }
+    PrintAndLogEx(SUCCESS, "ok\n");
+    return 0;
 }
 
 int CmdLegicList(const char *Cmd) {
-	CmdTraceList("legic");
-	return 0;
+    CmdTraceList("legic");
+    return 0;
 }
 
 static command_t CommandTable[] =  {
-	{"help",	CmdHelp,			1, "This help"},
-	{"reader",	CmdLegicReader,		1, "LEGIC Prime Reader UID and tag info"},
-	{"info",	CmdLegicInfo,		0, "Display deobfuscated and decoded LEGIC Prime tag data"},
-	{"dump",	CmdLegicDump,		0, "Dump LEGIC Prime tag to binary file"},
-	{"restore", CmdLegicRestore,	0, "Restore a dump file onto a LEGIC Prime tag"},
-	{"rdmem",	CmdLegicRdmem,		0, "Read bytes from a LEGIC Prime tag"},
-	{"sim",		CmdLegicRfSim,		0, "Start tag simulator"},
-	{"write",	CmdLegicRfWrite,	0, "Write data to a LEGIC Prime tag"},
-	{"crc",		CmdLegicCalcCrc,	1, "Calculate Legic CRC over given bytes"},
-	{"eload",	CmdLegicELoad,		1, "Load binary dump to emulator memory"},
-	{"esave",	CmdLegicESave,		1, "Save emulator memory to binary file"},
-	{"list",	CmdLegicList,		1, "[Deprecated] List LEGIC history"},
-	{"wipe",	CmdLegicWipe,		1, "Wipe a LEGIC Prime tag"},
-	{NULL, NULL, 0, NULL}
+    {"help",    CmdHelp,          1, "This help"},
+    {"reader",  CmdLegicReader,   1, "LEGIC Prime Reader UID and tag info"},
+    {"info",    CmdLegicInfo,     0, "Display deobfuscated and decoded LEGIC Prime tag data"},
+    {"dump",    CmdLegicDump,     0, "Dump LEGIC Prime tag to binary file"},
+    {"restore", CmdLegicRestore,  0, "Restore a dump file onto a LEGIC Prime tag"},
+    {"rdmem",   CmdLegicRdmem,    0, "Read bytes from a LEGIC Prime tag"},
+    {"sim",     CmdLegicRfSim,    0, "Start tag simulator"},
+    {"write",   CmdLegicRfWrite,  0, "Write data to a LEGIC Prime tag"},
+    {"crc",     CmdLegicCalcCrc,  1, "Calculate Legic CRC over given bytes"},
+    {"eload",   CmdLegicELoad,    1, "Load binary dump to emulator memory"},
+    {"esave",   CmdLegicESave,    1, "Save emulator memory to binary file"},
+    {"list",    CmdLegicList,     1, "[Deprecated] List LEGIC history"},
+    {"wipe",    CmdLegicWipe,     1, "Wipe a LEGIC Prime tag"},
+    {NULL, NULL, 0, NULL}
 };
 
 int CmdHFLegic(const char *Cmd) {
-	clearCommandBuffer();
-	CmdsParse(CommandTable, Cmd);
-	return 0;
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
+    return 0;
 }
 
 int CmdHelp(const char *Cmd) {
-	CmdsHelp(CommandTable);
-	return 0;
+    CmdsHelp(CommandTable);
+    return 0;
 }
\ No newline at end of file
diff --git a/client/cmdhflist.c b/client/cmdhflist.c
index f605008c5..1dc6777b9 100644
--- a/client/cmdhflist.c
+++ b/client/cmdhflist.c
@@ -12,24 +12,24 @@
 #include "cmdhflist.h"
 
 enum MifareAuthSeq {
-	masNone,
-	masNt,
-	masNrAr,
-	masAt,
-	masAuthComplete,
-	masFirstData,
-	masData,
-	masError,
+    masNone,
+    masNt,
+    masNrAr,
+    masAt,
+    masAuthComplete,
+    masFirstData,
+    masData,
+    masError,
 };
 static enum MifareAuthSeq MifareAuthState;
 static TAuthData AuthData;
 
 void ClearAuthData() {
-	AuthData.uid = 0;
-	AuthData.nt = 0;
-	AuthData.first_auth = true;
-	AuthData.ks2 = 0;
-	AuthData.ks3 = 0;
+    AuthData.uid = 0;
+    AuthData.nt = 0;
+    AuthData.first_auth = true;
+    AuthData.ks2 = 0;
+    AuthData.ks3 = 0;
 }
 
 /**
@@ -43,19 +43,19 @@ void ClearAuthData() {
  */
 
 uint8_t iso14443A_CRC_check(bool isResponse, uint8_t* d, uint8_t n) {
-	if (n < 3) return 2;
-	if (isResponse & (n < 6)) return 2;
-	return check_crc(CRC_14443_A, d, n);
+    if (n < 3) return 2;
+    if (isResponse & (n < 6)) return 2;
+    return check_crc(CRC_14443_A, d, n);
 }
 
 uint8_t mifare_CRC_check(bool isResponse, uint8_t* data, uint8_t len) {
-	switch(MifareAuthState) {
-		case masNone:
-		case masError:
-			return iso14443A_CRC_check(isResponse, data, len);
-		default:
-			return 2;
-	}
+    switch(MifareAuthState) {
+        case masNone:
+        case masError:
+            return iso14443A_CRC_check(isResponse, data, len);
+        default:
+            return 2;
+    }
 }
 
 /**
@@ -67,11 +67,11 @@ uint8_t mifare_CRC_check(bool isResponse, uint8_t* data, uint8_t len) {
  *          2 : Not crc-command
  */
 uint8_t iso14443B_CRC_check(uint8_t* d, uint8_t n) {
-	return check_crc(CRC_14443_B, d, n);
+    return check_crc(CRC_14443_B, d, n);
 }
 
 uint8_t iso15693_CRC_check(uint8_t* d, uint8_t n) {
-	return check_crc(CRC_15693, d, n);
+    return check_crc(CRC_15693, d, n);
 }
 
 /**
@@ -80,361 +80,361 @@ uint8_t iso15693_CRC_check(uint8_t* d, uint8_t n) {
  * @param data
  * @param len
  * @return  0 : CRC-command, CRC not ok
- *	        1 : CRC-command, CRC ok
+ *          1 : CRC-command, CRC ok
  *          2 : Not crc-command
  */
 uint8_t iclass_CRC_check(bool isResponse, uint8_t* d, uint8_t n) {
-	//CRC commands (and responses) are all at least 4 bytes
-	if (n < 4) return 2;
+    //CRC commands (and responses) are all at least 4 bytes
+    if (n < 4) return 2;
 
-	//Commands to tag
-	//Don't include the command byte
-	if (!isResponse) {
-		/**
-		  These commands should have CRC. Total length leftmost
-		  4	READ
-		  4 READ4
-		  12 UPDATE - unsecured, ends with CRC16
-		  14 UPDATE - secured, ends with signature instead
-		  4 PAGESEL
-		  **/
-		//Covers three of them
-		if (n == 4 || n == 12) {
-			return check_crc( CRC_ICLASS, d+1, n-1);
-		}
-		return 2;
-	}
-	/**
-	These tag responses should have CRC. Total length leftmost
+    //Commands to tag
+    //Don't include the command byte
+    if (!isResponse) {
+        /**
+          These commands should have CRC. Total length leftmost
+          4 READ
+          4 READ4
+          12 UPDATE - unsecured, ends with CRC16
+          14 UPDATE - secured, ends with signature instead
+          4 PAGESEL
+          **/
+        //Covers three of them
+        if (n == 4 || n == 12) {
+            return check_crc( CRC_ICLASS, d+1, n-1);
+        }
+        return 2;
+    }
+    /**
+    These tag responses should have CRC. Total length leftmost
 
-	10  READ		data[8] crc[2]
-	34  READ4		data[32]crc[2]
-	10  UPDATE	data[8] crc[2]
-	10 SELECT	csn[8] crc[2]
-	10  IDENTIFY  asnb[8] crc[2]
-	10  PAGESEL   block1[8] crc[2]
-	10  DETECT    csn[8] crc[2]
+    10  READ      data[8] crc[2]
+    34  READ4     data[32]crc[2]
+    10  UPDATE    data[8] crc[2]
+    10 SELECT     csn[8] crc[2]
+    10  IDENTIFY  asnb[8] crc[2]
+    10  PAGESEL   block1[8] crc[2]
+    10  DETECT    csn[8] crc[2]
 
-	These should not
+    These should not
 
-	4  CHECK		chip_response[4]
-	8  READCHECK data[8]
-	1  ACTALL    sof[1]
-	1  ACT	     sof[1]
+    4  CHECK      chip_response[4]
+    8  READCHECK  data[8]
+    1  ACTALL     sof[1]
+    1  ACT        sof[1]
 
-	In conclusion, without looking at the command; any response
-	of length 10 or 34 should have CRC
-	  **/
-	if (n != 10 && n != 34) return true;
+    In conclusion, without looking at the command; any response
+    of length 10 or 34 should have CRC
+      **/
+    if (n != 10 && n != 34) return true;
 
-	return check_crc( CRC_ICLASS, d, n);
+    return check_crc( CRC_ICLASS, d, n);
 }
 
 int applyIso14443a(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize) {
-	switch ( cmd[0] ){
-		case ISO14443A_CMD_WUPA:        snprintf(exp,size,"WUPA"); break;
-		case ISO14443A_CMD_ANTICOLL_OR_SELECT:{
-			// 93 20 = Anticollision (usage: 9320 - answer: 4bytes UID+1byte UID-bytes-xor)
-			// 93 70 = Select (usage: 9370+5bytes 9320 answer - answer: 1byte SAK)
-			if(cmd[1] == 0x70)
-				snprintf(exp,size,"SELECT_UID");
-			else
-				snprintf(exp,size,"ANTICOLL");
-			break;
-		}
-		case ISO14443A_CMD_ANTICOLL_OR_SELECT_2:{
-			//95 20 = Anticollision of cascade level2
-			//95 70 = Select of cascade level2
-			if(cmd[2] == 0x70)
-				snprintf(exp,size,"SELECT_UID-2");
-			else
-				snprintf(exp,size,"ANTICOLL-2");
-			break;
-		}
-		case ISO14443A_CMD_REQA:		snprintf(exp,size,"REQA"); break;
-		case ISO14443A_CMD_READBLOCK:	snprintf(exp,size,"READBLOCK(%d)",cmd[1]); break;
-		case ISO14443A_CMD_WRITEBLOCK:	snprintf(exp,size,"WRITEBLOCK(%d)",cmd[1]); break;
-		case ISO14443A_CMD_HALT:
-			snprintf(exp,size,"HALT");
-			MifareAuthState = masNone;
-			break;
-		case ISO14443A_CMD_RATS:		snprintf(exp,size,"RATS"); break;
-		case ISO14443A_CMD_OPTS:        snprintf(exp,size,"OPTIONAL TIMESLOT"); break;
-		case MIFARE_CMD_INC:			snprintf(exp,size,"INC(%d)",cmd[1]); break;
-		case MIFARE_CMD_DEC:			snprintf(exp,size,"DEC(%d)",cmd[1]); break;
-		case MIFARE_CMD_RESTORE:		snprintf(exp,size,"RESTORE(%d)",cmd[1]); break;
-		case MIFARE_CMD_TRANSFER:		snprintf(exp,size,"TRANSFER(%d)",cmd[1]); break;
-		case MIFARE_AUTH_KEYA:{
-			if ( cmdsize > 3) {
-				snprintf(exp,size,"AUTH-A(%d)",cmd[1]);
-				MifareAuthState = masNt;
-			} else {
-				//	case MIFARE_ULEV1_VERSION :  both 0x60.
-				snprintf(exp,size,"EV1 VERSION");
-			}
-			break;
-		}
-		case MIFARE_AUTH_KEYB: {
-			MifareAuthState = masNt;
-			snprintf(exp,size,"AUTH-B(%d)",cmd[1]);
-			break;
-		}
-		case MIFARE_MAGICWUPC1:			snprintf(exp,size,"MAGIC WUPC1"); break;
-		case MIFARE_MAGICWUPC2:			snprintf(exp,size,"MAGIC WUPC2"); break;
-		case MIFARE_MAGICWIPEC:			snprintf(exp,size,"MAGIC WIPEC"); break;
-		case MIFARE_ULC_AUTH_1 :		snprintf(exp,size,"AUTH "); break;
-		case MIFARE_ULC_AUTH_2 : 		snprintf(exp,size,"AUTH_ANSW"); break;
-		case MIFARE_ULEV1_AUTH :
-			if ( cmdsize == 7 )
-				snprintf(exp,size,"PWD-AUTH KEY: 0x%02x%02x%02x%02x", cmd[1], cmd[2], cmd[3], cmd[4] );
-			else
-				snprintf(exp,size,"PWD-AUTH");
-			break;
-		case MIFARE_ULEV1_FASTREAD : {
-			if ( cmdsize >=3 && cmd[2] <= 0xE6)
-				snprintf(exp,size,"READ RANGE (%d-%d)",cmd[1],cmd[2]);
-			else
-				// outside limits, useful for some tags...
-				snprintf(exp,size,"READ RANGE (%d-%d) (?)",cmd[1], cmd[2]);
-			break;
-		}
-		case MIFARE_ULC_WRITE : {
-			if ( cmd[1] < 0x21 )
-				snprintf(exp,size,"WRITEBLOCK(%d)",cmd[1]);
-			else
-				// outside limits, useful for some tags...
-				snprintf(exp, size, "WRITEBLOCK(%d) (?)", cmd[1]);
-			break;
-		}
-		case MIFARE_ULEV1_READ_CNT :{
-			if ( cmd[1] < 5 )
-				snprintf(exp,size,"READ CNT(%d)",cmd[1]);
-			else
-				snprintf(exp,size,"?");
-			break;
-		}
-		case MIFARE_ULEV1_INCR_CNT : {
-			if ( cmd[1] < 5 )
-				snprintf(exp,size,"INCR(%d)",cmd[1]);
-			else
-				snprintf(exp,size,"?");
-			break;
-		}
-		case MIFARE_ULEV1_READSIG :		snprintf(exp,size,"READ_SIG"); break;
-		case MIFARE_ULEV1_CHECKTEAR : 	snprintf(exp,size,"CHK_TEARING(%d)",cmd[1]); break;
-		case MIFARE_ULEV1_VCSL :		snprintf(exp,size,"VCSL"); break;
-		default:						return 0;
-	}
-	return 1;
+    switch ( cmd[0] ){
+        case ISO14443A_CMD_WUPA:        snprintf(exp,size,"WUPA"); break;
+        case ISO14443A_CMD_ANTICOLL_OR_SELECT:{
+            // 93 20 = Anticollision (usage: 9320 - answer: 4bytes UID+1byte UID-bytes-xor)
+            // 93 70 = Select (usage: 9370+5bytes 9320 answer - answer: 1byte SAK)
+            if(cmd[1] == 0x70)
+                snprintf(exp,size,"SELECT_UID");
+            else
+                snprintf(exp,size,"ANTICOLL");
+            break;
+        }
+        case ISO14443A_CMD_ANTICOLL_OR_SELECT_2:{
+            //95 20 = Anticollision of cascade level2
+            //95 70 = Select of cascade level2
+            if(cmd[2] == 0x70)
+                snprintf(exp,size,"SELECT_UID-2");
+            else
+                snprintf(exp,size,"ANTICOLL-2");
+            break;
+        }
+        case ISO14443A_CMD_REQA:        snprintf(exp,size,"REQA"); break;
+        case ISO14443A_CMD_READBLOCK:   snprintf(exp,size,"READBLOCK(%d)",cmd[1]); break;
+        case ISO14443A_CMD_WRITEBLOCK:  snprintf(exp,size,"WRITEBLOCK(%d)",cmd[1]); break;
+        case ISO14443A_CMD_HALT:
+            snprintf(exp,size,"HALT");
+            MifareAuthState = masNone;
+            break;
+        case ISO14443A_CMD_RATS:        snprintf(exp,size,"RATS"); break;
+        case ISO14443A_CMD_OPTS:        snprintf(exp,size,"OPTIONAL TIMESLOT"); break;
+        case MIFARE_CMD_INC:            snprintf(exp,size,"INC(%d)",cmd[1]); break;
+        case MIFARE_CMD_DEC:            snprintf(exp,size,"DEC(%d)",cmd[1]); break;
+        case MIFARE_CMD_RESTORE:        snprintf(exp,size,"RESTORE(%d)",cmd[1]); break;
+        case MIFARE_CMD_TRANSFER:       snprintf(exp,size,"TRANSFER(%d)",cmd[1]); break;
+        case MIFARE_AUTH_KEYA:{
+            if ( cmdsize > 3) {
+                snprintf(exp,size,"AUTH-A(%d)",cmd[1]);
+                MifareAuthState = masNt;
+            } else {
+                // case MIFARE_ULEV1_VERSION :  both 0x60.
+                snprintf(exp,size,"EV1 VERSION");
+            }
+            break;
+        }
+        case MIFARE_AUTH_KEYB: {
+            MifareAuthState = masNt;
+            snprintf(exp,size,"AUTH-B(%d)",cmd[1]);
+            break;
+        }
+        case MIFARE_MAGICWUPC1:         snprintf(exp,size,"MAGIC WUPC1"); break;
+        case MIFARE_MAGICWUPC2:         snprintf(exp,size,"MAGIC WUPC2"); break;
+        case MIFARE_MAGICWIPEC:         snprintf(exp,size,"MAGIC WIPEC"); break;
+        case MIFARE_ULC_AUTH_1:         snprintf(exp,size,"AUTH "); break;
+        case MIFARE_ULC_AUTH_2:         snprintf(exp,size,"AUTH_ANSW"); break;
+        case MIFARE_ULEV1_AUTH:
+            if ( cmdsize == 7 )
+                snprintf(exp,size,"PWD-AUTH KEY: 0x%02x%02x%02x%02x", cmd[1], cmd[2], cmd[3], cmd[4] );
+            else
+                snprintf(exp,size,"PWD-AUTH");
+            break;
+        case MIFARE_ULEV1_FASTREAD : {
+            if ( cmdsize >=3 && cmd[2] <= 0xE6)
+                snprintf(exp,size,"READ RANGE (%d-%d)",cmd[1],cmd[2]);
+            else
+                // outside limits, useful for some tags...
+                snprintf(exp,size,"READ RANGE (%d-%d) (?)",cmd[1], cmd[2]);
+            break;
+        }
+        case MIFARE_ULC_WRITE : {
+            if ( cmd[1] < 0x21 )
+                snprintf(exp,size,"WRITEBLOCK(%d)",cmd[1]);
+            else
+                // outside limits, useful for some tags...
+                snprintf(exp, size, "WRITEBLOCK(%d) (?)", cmd[1]);
+            break;
+        }
+        case MIFARE_ULEV1_READ_CNT :{
+            if ( cmd[1] < 5 )
+                snprintf(exp,size,"READ CNT(%d)",cmd[1]);
+            else
+                snprintf(exp,size,"?");
+            break;
+        }
+        case MIFARE_ULEV1_INCR_CNT : {
+            if ( cmd[1] < 5 )
+                snprintf(exp,size,"INCR(%d)",cmd[1]);
+            else
+                snprintf(exp,size,"?");
+            break;
+        }
+        case MIFARE_ULEV1_READSIG:      snprintf(exp,size,"READ_SIG"); break;
+        case MIFARE_ULEV1_CHECKTEAR:    snprintf(exp,size,"CHK_TEARING(%d)",cmd[1]); break;
+        case MIFARE_ULEV1_VCSL:         snprintf(exp,size,"VCSL"); break;
+        default:                        return 0;
+    }
+    return 1;
 }
 
 void annotateIso14443a(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize) {
-	applyIso14443a(exp, size, cmd, cmdsize);
+    applyIso14443a(exp, size, cmd, cmdsize);
 }
 
 void annotateIclass(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize) {
-	switch (cmd[0]) {
-		case ICLASS_CMD_ACTALL:      snprintf(exp,size,"ACTALL"); break;
-		case ICLASS_CMD_READ_OR_IDENTIFY:{
-			if(cmdsize > 1){
-				snprintf(exp,size,"READ(%d)",cmd[1]);
-			}else{
-				snprintf(exp,size,"IDENTIFY");
-			}
-			break;
-		}
-		case ICLASS_CMD_SELECT:      snprintf(exp,size,"SELECT"); break;
-		case ICLASS_CMD_PAGESEL:     snprintf(exp,size,"PAGESEL(%d)", cmd[1]); break;
-		case ICLASS_CMD_READCHECK_KC:snprintf(exp,size,"READCHECK[Kc](%d)", cmd[1]); break;
-		case ICLASS_CMD_READCHECK_KD:snprintf(exp,size,"READCHECK[Kd](%d)", cmd[1]); break;
-		case ICLASS_CMD_CHECK:       snprintf(exp,size,"CHECK"); break;
-		case ICLASS_CMD_DETECT:      snprintf(exp,size,"DETECT"); break;
-		case ICLASS_CMD_HALT:        snprintf(exp,size,"HALT"); break;
-		case ICLASS_CMD_UPDATE:      snprintf(exp,size,"UPDATE(%d)",cmd[1]); break;
-		case ICLASS_CMD_ACT:         snprintf(exp,size,"ACT"); break;
-		case ICLASS_CMD_READ4:       snprintf(exp,size,"READ4(%d)",cmd[1]); break;
-		default:                     snprintf(exp,size,"?"); break;
-	}
-	return;
+    switch (cmd[0]) {
+        case ICLASS_CMD_ACTALL:      snprintf(exp,size,"ACTALL"); break;
+        case ICLASS_CMD_READ_OR_IDENTIFY:{
+            if(cmdsize > 1){
+                snprintf(exp,size,"READ(%d)",cmd[1]);
+            }else{
+                snprintf(exp,size,"IDENTIFY");
+            }
+            break;
+        }
+        case ICLASS_CMD_SELECT:         snprintf(exp,size,"SELECT"); break;
+        case ICLASS_CMD_PAGESEL:        snprintf(exp,size,"PAGESEL(%d)", cmd[1]); break;
+        case ICLASS_CMD_READCHECK_KC:   snprintf(exp,size,"READCHECK[Kc](%d)", cmd[1]); break;
+        case ICLASS_CMD_READCHECK_KD:   snprintf(exp,size,"READCHECK[Kd](%d)", cmd[1]); break;
+        case ICLASS_CMD_CHECK:          snprintf(exp,size,"CHECK"); break;
+        case ICLASS_CMD_DETECT:         snprintf(exp,size,"DETECT"); break;
+        case ICLASS_CMD_HALT:           snprintf(exp,size,"HALT"); break;
+        case ICLASS_CMD_UPDATE:         snprintf(exp,size,"UPDATE(%d)",cmd[1]); break;
+        case ICLASS_CMD_ACT:            snprintf(exp,size,"ACT"); break;
+        case ICLASS_CMD_READ4:          snprintf(exp,size,"READ4(%d)",cmd[1]); break;
+        default:                        snprintf(exp,size,"?"); break;
+    }
+    return;
 }
 
 void annotateIso15693(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize) {
 
-	switch(cmd[1]){
-		case ISO15693_INVENTORY				:snprintf(exp, size, "INVENTORY");return;
-		case ISO15693_STAYQUIET				:snprintf(exp, size, "STAY_QUIET");return;
-		case ISO15693_READBLOCK				:snprintf(exp, size, "READBLOCK");return;
-		case ISO15693_WRITEBLOCK			:snprintf(exp, size, "WRITEBLOCK");return;
-		case ISO15693_LOCKBLOCK				:snprintf(exp, size, "LOCKBLOCK");return;
-		case ISO15693_READ_MULTI_BLOCK		:snprintf(exp, size, "READ_MULTI_BLOCK");return;
-		case ISO15693_SELECT				:snprintf(exp, size, "SELECT");return;
-		case ISO15693_RESET_TO_READY		:snprintf(exp, size, "RESET_TO_READY");return;
-		case ISO15693_WRITE_AFI				:snprintf(exp, size, "WRITE_AFI");return;
-		case ISO15693_LOCK_AFI				:snprintf(exp, size, "LOCK_AFI");return;
-		case ISO15693_WRITE_DSFID			:snprintf(exp, size, "WRITE_DSFID");return;
-		case ISO15693_LOCK_DSFID			:snprintf(exp, size, "LOCK_DSFID");return;
-		case ISO15693_GET_SYSTEM_INFO		:snprintf(exp, size, "GET_SYSTEM_INFO");return;
-		case ISO15693_READ_MULTI_SECSTATUS	:snprintf(exp, size, "READ_MULTI_SECSTATUS");return;
-		default: break;
-	}
+    switch(cmd[1]){
+        case ISO15693_INVENTORY:            snprintf(exp, size, "INVENTORY");return;
+        case ISO15693_STAYQUIET:            snprintf(exp, size, "STAY_QUIET");return;
+        case ISO15693_READBLOCK:            snprintf(exp, size, "READBLOCK");return;
+        case ISO15693_WRITEBLOCK:           snprintf(exp, size, "WRITEBLOCK");return;
+        case ISO15693_LOCKBLOCK:            snprintf(exp, size, "LOCKBLOCK");return;
+        case ISO15693_READ_MULTI_BLOCK:     snprintf(exp, size, "READ_MULTI_BLOCK");return;
+        case ISO15693_SELECT:               snprintf(exp, size, "SELECT");return;
+        case ISO15693_RESET_TO_READY:       snprintf(exp, size, "RESET_TO_READY");return;
+        case ISO15693_WRITE_AFI:            snprintf(exp, size, "WRITE_AFI");return;
+        case ISO15693_LOCK_AFI:             snprintf(exp, size, "LOCK_AFI");return;
+        case ISO15693_WRITE_DSFID:          snprintf(exp, size, "WRITE_DSFID");return;
+        case ISO15693_LOCK_DSFID:           snprintf(exp, size, "LOCK_DSFID");return;
+        case ISO15693_GET_SYSTEM_INFO:      snprintf(exp, size, "GET_SYSTEM_INFO");return;
+        case ISO15693_READ_MULTI_SECSTATUS: snprintf(exp, size, "READ_MULTI_SECSTATUS");return;
+        default:                            break;
+    }
 
-	if ( cmd[1] >= 0x2D && cmd[1] <= 0x9F ) snprintf(exp, size, "Optional RFU");
-	else if ( cmd[1] >= 0xA0 && cmd[1] <= 0xDF ) snprintf(exp, size, "Cust IC MFG dependent");
-	else if ( cmd[1] >= 0xE0 && cmd[1] <= 0xFF ) snprintf(exp, size, "Proprietary IC MFG dependent");
-	else
-		snprintf(exp, size, "?");
+    if ( cmd[1] >= 0x2D && cmd[1] <= 0x9F ) snprintf(exp, size, "Optional RFU");
+    else if ( cmd[1] >= 0xA0 && cmd[1] <= 0xDF ) snprintf(exp, size, "Cust IC MFG dependent");
+    else if ( cmd[1] >= 0xE0 && cmd[1] <= 0xFF ) snprintf(exp, size, "Proprietary IC MFG dependent");
+    else
+        snprintf(exp, size, "?");
 }
 
 void annotateTopaz(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
-	switch(cmd[0]) {
-		case TOPAZ_REQA						:snprintf(exp, size, "REQA");break;
-		case TOPAZ_WUPA						:snprintf(exp, size, "WUPA");break;
-		case TOPAZ_RID						:snprintf(exp, size, "RID");break;
-		case TOPAZ_RALL						:snprintf(exp, size, "RALL");break;
-		case TOPAZ_READ						:snprintf(exp, size, "READ");break;
-		case TOPAZ_WRITE_E					:snprintf(exp, size, "WRITE-E");break;
-		case TOPAZ_WRITE_NE					:snprintf(exp, size, "WRITE-NE");break;
-		case TOPAZ_RSEG						:snprintf(exp, size, "RSEG");break;
-		case TOPAZ_READ8					:snprintf(exp, size, "READ8");break;
-		case TOPAZ_WRITE_E8					:snprintf(exp, size, "WRITE-E8");break;
-		case TOPAZ_WRITE_NE8				:snprintf(exp, size, "WRITE-NE8");break;
-		default								:snprintf(exp,size,"?"); break;
-	}
+    switch(cmd[0]) {
+        case TOPAZ_REQA:                    snprintf(exp, size, "REQA");break;
+        case TOPAZ_WUPA:                    snprintf(exp, size, "WUPA");break;
+        case TOPAZ_RID:                     snprintf(exp, size, "RID");break;
+        case TOPAZ_RALL:                    snprintf(exp, size, "RALL");break;
+        case TOPAZ_READ:                    snprintf(exp, size, "READ");break;
+        case TOPAZ_WRITE_E:                 snprintf(exp, size, "WRITE-E");break;
+        case TOPAZ_WRITE_NE:                snprintf(exp, size, "WRITE-NE");break;
+        case TOPAZ_RSEG:                    snprintf(exp, size, "RSEG");break;
+        case TOPAZ_READ8:                   snprintf(exp, size, "READ8");break;
+        case TOPAZ_WRITE_E8:                snprintf(exp, size, "WRITE-E8");break;
+        case TOPAZ_WRITE_NE8:               snprintf(exp, size, "WRITE-NE8");break;
+        default:                            snprintf(exp,size,"?"); break;
+    }
 }
 
 // iso 7816-3
 void annotateIso7816(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
-	// S-block
-	if ( (cmd[0] & 0xC0) && (cmdsize == 3) ) {
-		switch ( (cmd[0] & 0x3f)  ) {
-			case 0x00 	: snprintf(exp, size, "S-block RESYNCH req"); break;
-			case 0x20 	: snprintf(exp, size, "S-block RESYNCH resp"); break;
-			case 0x01 	: snprintf(exp, size, "S-block IFS req"); break;
-			case 0x21 	: snprintf(exp, size, "S-block IFS resp"); break;
-			case 0x02	: snprintf(exp, size, "S-block ABORT req"); break;
-			case 0x22	: snprintf(exp, size, "S-block ABORT resp"); break;
-			case 0x03	: snprintf(exp, size, "S-block WTX reqt"); break;
-			case 0x23	: snprintf(exp, size, "S-block WTX resp"); break;
-			default		: snprintf(exp, size, "S-block"); break;
-		}
-	}
-	// R-block (ack)
-	else if ( ((cmd[0] & 0xD0) == 0x80) && ( cmdsize > 2) ) {
-		if ( (cmd[0] & 0x10) == 0 )
-			snprintf(exp, size, "R-block ACK");
-		else
-			snprintf(exp, size, "R-block NACK");
-	}
-	// I-block
-	else {
-		int pos = 0;
-		switch ( cmd[0] ) {
-			case 2:
-			case 3:
-				pos = 2;
-				break;
-			case 0:
-				pos = 1;
-				break;
-			default:
-				pos = 3;
-				break;
-		}
-		switch ( cmd[pos] ){
-			case ISO7816_READ_BINARY				:snprintf(exp, size, "READ BIN");break;
-			case ISO7816_WRITE_BINARY				:snprintf(exp, size, "WRITE BIN");break;
-			case ISO7816_UPDATE_BINARY				:snprintf(exp, size, "UPDATE BIN");break;
-			case ISO7816_ERASE_BINARY				:snprintf(exp, size, "ERASE BIN");break;
-			case ISO7816_READ_RECORDS				:snprintf(exp, size, "READ RECORDS");break;
-			case ISO7816_WRITE_RECORDS				:snprintf(exp, size, "WRITE RECORDS");break;
-			case ISO7816_APPEND_RECORD				:snprintf(exp, size, "APPEND RECORD");break;
-			case ISO7816_UPDATE_RECORD				:snprintf(exp, size, "UPDATE RECORD");break;
-			case ISO7816_GET_DATA					:snprintf(exp, size, "GET DATA");break;
-			case ISO7816_PUT_DATA					:snprintf(exp, size, "PUT DATA");break;
-			case ISO7816_SELECT_FILE				:snprintf(exp, size, "SELECT FILE");break;
-			case ISO7816_VERIFY						:snprintf(exp, size, "VERIFY");break;
-			case ISO7816_INTERNAL_AUTHENTICATION 	:snprintf(exp, size, "INTERNAL AUTH");break;
-			case ISO7816_EXTERNAL_AUTHENTICATION 	:snprintf(exp, size, "EXTERNAL AUTH");break;
-			case ISO7816_GET_CHALLENGE				:snprintf(exp, size, "GET CHALLENGE");break;
-			case ISO7816_MANAGE_CHANNEL				:snprintf(exp, size, "MANAGE CHANNEL");break;
-			case ISO7816_GET_RESPONSE				:snprintf(exp, size, "GET RESPONSE");break;
-			default									:snprintf(exp,size,"?"); break;
-		}
-	}
+    // S-block
+    if ( (cmd[0] & 0xC0) && (cmdsize == 3) ) {
+        switch ( (cmd[0] & 0x3f)  ) {
+            case 0x00   : snprintf(exp, size, "S-block RESYNCH req"); break;
+            case 0x20   : snprintf(exp, size, "S-block RESYNCH resp"); break;
+            case 0x01   : snprintf(exp, size, "S-block IFS req"); break;
+            case 0x21   : snprintf(exp, size, "S-block IFS resp"); break;
+            case 0x02   : snprintf(exp, size, "S-block ABORT req"); break;
+            case 0x22   : snprintf(exp, size, "S-block ABORT resp"); break;
+            case 0x03   : snprintf(exp, size, "S-block WTX reqt"); break;
+            case 0x23   : snprintf(exp, size, "S-block WTX resp"); break;
+            default     : snprintf(exp, size, "S-block"); break;
+        }
+    }
+    // R-block (ack)
+    else if ( ((cmd[0] & 0xD0) == 0x80) && ( cmdsize > 2) ) {
+        if ( (cmd[0] & 0x10) == 0 )
+            snprintf(exp, size, "R-block ACK");
+        else
+            snprintf(exp, size, "R-block NACK");
+    }
+    // I-block
+    else {
+        int pos = 0;
+        switch ( cmd[0] ) {
+            case 2:
+            case 3:
+                pos = 2;
+                break;
+            case 0:
+                pos = 1;
+                break;
+            default:
+                pos = 3;
+                break;
+        }
+        switch ( cmd[pos] ){
+            case ISO7816_READ_BINARY:              snprintf(exp, size, "READ BIN");break;
+            case ISO7816_WRITE_BINARY:             snprintf(exp, size, "WRITE BIN");break;
+            case ISO7816_UPDATE_BINARY:            snprintf(exp, size, "UPDATE BIN");break;
+            case ISO7816_ERASE_BINARY:             snprintf(exp, size, "ERASE BIN");break;
+            case ISO7816_READ_RECORDS:             snprintf(exp, size, "READ RECORDS");break;
+            case ISO7816_WRITE_RECORDS:            snprintf(exp, size, "WRITE RECORDS");break;
+            case ISO7816_APPEND_RECORD:            snprintf(exp, size, "APPEND RECORD");break;
+            case ISO7816_UPDATE_RECORD:            snprintf(exp, size, "UPDATE RECORD");break;
+            case ISO7816_GET_DATA:                 snprintf(exp, size, "GET DATA");break;
+            case ISO7816_PUT_DATA:                 snprintf(exp, size, "PUT DATA");break;
+            case ISO7816_SELECT_FILE:              snprintf(exp, size, "SELECT FILE");break;
+            case ISO7816_VERIFY:                   snprintf(exp, size, "VERIFY");break;
+            case ISO7816_INTERNAL_AUTHENTICATION:  snprintf(exp, size, "INTERNAL AUTH");break;
+            case ISO7816_EXTERNAL_AUTHENTICATION:  snprintf(exp, size, "EXTERNAL AUTH");break;
+            case ISO7816_GET_CHALLENGE:            snprintf(exp, size, "GET CHALLENGE");break;
+            case ISO7816_MANAGE_CHANNEL:           snprintf(exp, size, "MANAGE CHANNEL");break;
+            case ISO7816_GET_RESPONSE:             snprintf(exp, size, "GET RESPONSE");break;
+            default:                               snprintf(exp,size,"?"); break;
+        }
+    }
 }
 
 // MIFARE DESFire
 void annotateMfDesfire(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
 
-	// it's basically a ISO14443a tag, so try annotation from there
-	if (!applyIso14443a(exp, size, cmd, cmdsize)){
-		// S-block 11xxx010
-		if ( (cmd[0] & 0xC0) && (cmdsize == 3) ) {
-			switch ( (cmd[0] & 0x30)  ) {
-				case 0x30	: snprintf(exp, size, "S-block DESELECT"); break;
-				case 0x00	: snprintf(exp, size, "S-block WTX"); break;
-				default		: snprintf(exp, size, "S-block"); break;
-			}
-		}
-		// R-block (ack) 101xx01x
-		else if ( ((cmd[0] & 0xB0) == 0xA0) && ( cmdsize > 2) ) {
-			if ( (cmd[0] & 0x10) == 0 )
-				snprintf(exp, size, "R-block ACK(%d)", (cmd[0] & 0x01));
-			else
-				snprintf(exp, size, "R-block NACK(%d)", (cmd[0] & 0x01));
-		}
-		// I-block 000xCN1x
-		else if ( (cmd[0] & 0xC0) == 0x00){
-			// PCB [CID] [NAD] [INF] CRC CRC
-			int pos = 1;
-			if ( (cmd[0] & 0x08) == 0x08) // cid byte following
-				pos = pos + 1;
-			if ( (cmd[0] & 0x04) == 0x04) // nad byte following
-				pos = pos + 1;
-			switch ( cmd[pos] ){
-				case MFDES_CREATE_APPLICATION			:snprintf(exp, size, "CREATE APPLICATION");break;
-				case MFDES_DELETE_APPLICATION			:snprintf(exp, size, "DELETE APPLICATION");break;
-				case MFDES_GET_APPLICATION_IDS			:snprintf(exp, size, "GET APPLICATION IDS");break;
-				case MFDES_SELECT_APPLICATION			:snprintf(exp, size, "SELECT APPLICATION");break;
-				case MFDES_FORMAT_PICC					:snprintf(exp, size, "FORMAT PICC");break;
-				case MFDES_GET_VERSION					:snprintf(exp, size, "GET VERSION");break;
-				case MFDES_READ_DATA					:snprintf(exp, size, "READ DATA");break;
-				case MFDES_WRITE_DATA					:snprintf(exp, size, "WRITE DATA");break;
-				case MFDES_GET_VALUE					:snprintf(exp, size, "GET VALUE");break;
-				case MFDES_CREDIT						:snprintf(exp, size, "CREDIT");break;
-				case MFDES_DEBIT						:snprintf(exp, size, "DEBIT");break;
-				case MFDES_LIMITED_CREDIT				:snprintf(exp, size, "LIMITED CREDIT");break;
-				case MFDES_WRITE_RECORD					:snprintf(exp, size, "WRITE RECORD");break;
-				case MFDES_READ_RECORDS					:snprintf(exp, size, "READ RECORDS");break;
-				case MFDES_CLEAR_RECORD_FILE			:snprintf(exp, size, "CLEAR RECORD FILE");break;
-				case MFDES_COMMIT_TRANSACTION			:snprintf(exp, size, "COMMIT TRANSACTION");break;
-				case MFDES_ABORT_TRANSACTION			:snprintf(exp, size, "ABORT TRANSACTION");break;
-				case MFDES_GET_FREE_MEMORY				:snprintf(exp, size, "GET FREE MEMORY");break;
-				case MFDES_GET_FILE_IDS					:snprintf(exp, size, "GET FILE IDS");break;
-				case MFDES_GET_ISOFILE_IDS				:snprintf(exp, size, "GET ISOFILE IDS");break;
-				case MFDES_GET_FILE_SETTINGS			:snprintf(exp, size, "GET FILE SETTINGS");break;
-				case MFDES_CHANGE_FILE_SETTINGS			:snprintf(exp, size, "CHANGE FILE SETTINGS");break;
-				case MFDES_CREATE_STD_DATA_FILE			:snprintf(exp, size, "CREATE STD DATA FILE");break;
-				case MFDES_CREATE_BACKUP_DATA_FILE		:snprintf(exp, size, "CREATE BACKUP DATA FILE");break;
-				case MFDES_CREATE_VALUE_FILE			:snprintf(exp, size, "CREATE VALUE FILE");break;
-				case MFDES_CREATE_LINEAR_RECORD_FILE	:snprintf(exp, size, "CREATE LINEAR RECORD FILE");break;
-				case MFDES_CREATE_CYCLIC_RECORD_FILE	:snprintf(exp, size, "CREATE CYCLIC RECORD FILE");break;
-				case MFDES_DELETE_FILE					:snprintf(exp, size, "DELETE FILE");break;
-				case MFDES_AUTHENTICATE					:snprintf(exp, size, "AUTH NATIVE (keyNo %d)", cmd[pos+1]);break;  // AUTHENTICATE_NATIVE
-				case MFDES_AUTHENTICATE_ISO				:snprintf(exp, size, "AUTH ISO (keyNo %d)", cmd[pos+1]);break;  // AUTHENTICATE_STANDARD
-				case MFDES_AUTHENTICATE_AES				:snprintf(exp, size, "AUTH AES (keyNo %d)", cmd[pos+1]);break;
-				case MFDES_CHANGE_KEY_SETTINGS			:snprintf(exp, size, "CHANGE KEY SETTINGS");break;
-				case MFDES_GET_KEY_SETTINGS				:snprintf(exp, size, "GET KEY SETTINGS");break;
-				case MFDES_CHANGE_KEY					:snprintf(exp, size, "CHANGE KEY");break;
-				case MFDES_GET_KEY_VERSION				:snprintf(exp, size, "GET KEY VERSION");break;
-				case MFDES_AUTHENTICATION_FRAME			:snprintf(exp, size, "AUTH FRAME / NEXT FRAME");break;
-				default									:break;
-			}
-		}else{
-			// anything else
-			snprintf(exp,size,"?");
-		}
-	}
+    // it's basically a ISO14443a tag, so try annotation from there
+    if (!applyIso14443a(exp, size, cmd, cmdsize)){
+        // S-block 11xxx010
+        if ( (cmd[0] & 0xC0) && (cmdsize == 3) ) {
+            switch ( (cmd[0] & 0x30)  ) {
+                case 0x30:                         snprintf(exp, size, "S-block DESELECT"); break;
+                case 0x00:                         snprintf(exp, size, "S-block WTX"); break;
+                default:                           snprintf(exp, size, "S-block"); break;
+            }
+        }
+        // R-block (ack) 101xx01x
+        else if ( ((cmd[0] & 0xB0) == 0xA0) && ( cmdsize > 2) ) {
+            if ( (cmd[0] & 0x10) == 0 )
+                snprintf(exp, size, "R-block ACK(%d)", (cmd[0] & 0x01));
+            else
+                snprintf(exp, size, "R-block NACK(%d)", (cmd[0] & 0x01));
+        }
+        // I-block 000xCN1x
+        else if ( (cmd[0] & 0xC0) == 0x00){
+            // PCB [CID] [NAD] [INF] CRC CRC
+            int pos = 1;
+            if ( (cmd[0] & 0x08) == 0x08) // cid byte following
+                pos = pos + 1;
+            if ( (cmd[0] & 0x04) == 0x04) // nad byte following
+                pos = pos + 1;
+            switch ( cmd[pos] ){
+                case MFDES_CREATE_APPLICATION:        snprintf(exp, size, "CREATE APPLICATION");break;
+                case MFDES_DELETE_APPLICATION:        snprintf(exp, size, "DELETE APPLICATION");break;
+                case MFDES_GET_APPLICATION_IDS:       snprintf(exp, size, "GET APPLICATION IDS");break;
+                case MFDES_SELECT_APPLICATION:        snprintf(exp, size, "SELECT APPLICATION");break;
+                case MFDES_FORMAT_PICC:               snprintf(exp, size, "FORMAT PICC");break;
+                case MFDES_GET_VERSION:               snprintf(exp, size, "GET VERSION");break;
+                case MFDES_READ_DATA:                 snprintf(exp, size, "READ DATA");break;
+                case MFDES_WRITE_DATA:                snprintf(exp, size, "WRITE DATA");break;
+                case MFDES_GET_VALUE:                 snprintf(exp, size, "GET VALUE");break;
+                case MFDES_CREDIT:                    snprintf(exp, size, "CREDIT");break;
+                case MFDES_DEBIT:                     snprintf(exp, size, "DEBIT");break;
+                case MFDES_LIMITED_CREDIT:            snprintf(exp, size, "LIMITED CREDIT");break;
+                case MFDES_WRITE_RECORD:              snprintf(exp, size, "WRITE RECORD");break;
+                case MFDES_READ_RECORDS:              snprintf(exp, size, "READ RECORDS");break;
+                case MFDES_CLEAR_RECORD_FILE:         snprintf(exp, size, "CLEAR RECORD FILE");break;
+                case MFDES_COMMIT_TRANSACTION:        snprintf(exp, size, "COMMIT TRANSACTION");break;
+                case MFDES_ABORT_TRANSACTION:         snprintf(exp, size, "ABORT TRANSACTION");break;
+                case MFDES_GET_FREE_MEMORY:           snprintf(exp, size, "GET FREE MEMORY");break;
+                case MFDES_GET_FILE_IDS:              snprintf(exp, size, "GET FILE IDS");break;
+                case MFDES_GET_ISOFILE_IDS:           snprintf(exp, size, "GET ISOFILE IDS");break;
+                case MFDES_GET_FILE_SETTINGS:         snprintf(exp, size, "GET FILE SETTINGS");break;
+                case MFDES_CHANGE_FILE_SETTINGS:      snprintf(exp, size, "CHANGE FILE SETTINGS");break;
+                case MFDES_CREATE_STD_DATA_FILE:      snprintf(exp, size, "CREATE STD DATA FILE");break;
+                case MFDES_CREATE_BACKUP_DATA_FILE:   snprintf(exp, size, "CREATE BACKUP DATA FILE");break;
+                case MFDES_CREATE_VALUE_FILE:         snprintf(exp, size, "CREATE VALUE FILE");break;
+                case MFDES_CREATE_LINEAR_RECORD_FILE: snprintf(exp, size, "CREATE LINEAR RECORD FILE");break;
+                case MFDES_CREATE_CYCLIC_RECORD_FILE: snprintf(exp, size, "CREATE CYCLIC RECORD FILE");break;
+                case MFDES_DELETE_FILE:               snprintf(exp, size, "DELETE FILE");break;
+                case MFDES_AUTHENTICATE:              snprintf(exp, size, "AUTH NATIVE (keyNo %d)", cmd[pos+1]);break;  // AUTHENTICATE_NATIVE
+                case MFDES_AUTHENTICATE_ISO:          snprintf(exp, size, "AUTH ISO (keyNo %d)", cmd[pos+1]);break;  // AUTHENTICATE_STANDARD
+                case MFDES_AUTHENTICATE_AES:          snprintf(exp, size, "AUTH AES (keyNo %d)", cmd[pos+1]);break;
+                case MFDES_CHANGE_KEY_SETTINGS:       snprintf(exp, size, "CHANGE KEY SETTINGS");break;
+                case MFDES_GET_KEY_SETTINGS:          snprintf(exp, size, "GET KEY SETTINGS");break;
+                case MFDES_CHANGE_KEY:                snprintf(exp, size, "CHANGE KEY");break;
+                case MFDES_GET_KEY_VERSION:           snprintf(exp, size, "GET KEY VERSION");break;
+                case MFDES_AUTHENTICATION_FRAME:      snprintf(exp, size, "AUTH FRAME / NEXT FRAME");break;
+                default:                              break;
+            }
+        }else{
+            // anything else
+            snprintf(exp,size,"?");
+        }
+    }
 }
 
 /**
@@ -448,36 +448,36 @@ void annotateMfDesfire(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
 0A 11 22 33 44 55 66 = Authenticate (11 22 33 44 55 66 = data to authenticate)
 **/
 void annotateIso14443b(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize) {
-	switch(cmd[0]){
-		case ISO14443B_REQB   		: {
+    switch(cmd[0]){
+        case ISO14443B_REQB           : {
 
-			switch ( cmd[2] & 0x07 ) {
-				case 0: snprintf(exp, size,"1 slot ");break;
-				case 1: snprintf(exp, size,"2 slots ");break;
-				case 2: snprintf(exp, size,"4 slots ");break;
-				case 3: snprintf(exp, size,"8 slots ");break;
-				default: snprintf(exp, size,"16 slots ");break;
-			}
-			if ( (cmd[2] & 0x8) )
-				snprintf(exp, size,"WUPB");
-			else
-				snprintf(exp, size,"REQB");
-			break;
-		}
-		case ISO14443B_ATTRIB 		: snprintf(exp,size,"ATTRIB");break;
-		case ISO14443B_HALT   		: snprintf(exp,size,"HALT");break;
-		case ISO14443B_INITIATE     : snprintf(exp,size,"INITIATE");break;
-		case ISO14443B_SELECT       : snprintf(exp,size,"SELECT(%d)",cmd[1]);break;
-		case ISO14443B_GET_UID      : snprintf(exp,size,"GET UID");break;
-		case ISO14443B_READ_BLK     : snprintf(exp,size,"READ_BLK(%d)", cmd[1]);break;
-		case ISO14443B_WRITE_BLK    : snprintf(exp,size,"WRITE_BLK(%d)",cmd[1]);break;
-		case ISO14443B_RESET        : snprintf(exp,size,"RESET");break;
-		case ISO14443B_COMPLETION   : snprintf(exp,size,"COMPLETION");break;
-		case ISO14443B_AUTHENTICATE : snprintf(exp,size,"AUTHENTICATE");break;
-		case ISO14443B_PING			: snprintf(exp,size,"PING");break;
-		case ISO14443B_PONG			: snprintf(exp,size,"PONG");break;
-		default                     : snprintf(exp,size ,"?");break;
-	}
+            switch ( cmd[2] & 0x07 ) {
+                case 0:  snprintf(exp, size,"1 slot ");break;
+                case 1:  snprintf(exp, size,"2 slots ");break;
+                case 2:  snprintf(exp, size,"4 slots ");break;
+                case 3:  snprintf(exp, size,"8 slots ");break;
+                default: snprintf(exp, size,"16 slots ");break;
+            }
+            if ( (cmd[2] & 0x8) )
+                snprintf(exp, size,"WUPB");
+            else
+                snprintf(exp, size,"REQB");
+            break;
+        }
+        case ISO14443B_ATTRIB:       snprintf(exp,size,"ATTRIB");break;
+        case ISO14443B_HALT:         snprintf(exp,size,"HALT");break;
+        case ISO14443B_INITIATE:     snprintf(exp,size,"INITIATE");break;
+        case ISO14443B_SELECT:       snprintf(exp,size,"SELECT(%d)",cmd[1]);break;
+        case ISO14443B_GET_UID:      snprintf(exp,size,"GET UID");break;
+        case ISO14443B_READ_BLK:     snprintf(exp,size,"READ_BLK(%d)", cmd[1]);break;
+        case ISO14443B_WRITE_BLK:    snprintf(exp,size,"WRITE_BLK(%d)",cmd[1]);break;
+        case ISO14443B_RESET:        snprintf(exp,size,"RESET");break;
+        case ISO14443B_COMPLETION:   snprintf(exp,size,"COMPLETION");break;
+        case ISO14443B_AUTHENTICATE: snprintf(exp,size,"AUTHENTICATE");break;
+        case ISO14443B_PING:         snprintf(exp,size,"PING");break;
+        case ISO14443B_PONG:         snprintf(exp,size,"PONG");break;
+        default:                     snprintf(exp,size ,"?");break;
+    }
 }
 
 // LEGIC
@@ -485,395 +485,395 @@ void annotateIso14443b(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize) {
 // 0 = write
 // Quite simpel tag
 void annotateLegic(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
-	uint8_t bitsend = cmd[0];
-	uint8_t cmdBit = (cmd[1] & 1);
-	switch (bitsend){
-		case 7:
-			snprintf(exp, size, "IV 0x%02X", cmd[1]);
-			break;
-		case 6: {
-			switch ( cmd[1] ) {
-				case LEGIC_MIM_22:	 snprintf(exp, size, "MIM22"); break;
-				case LEGIC_MIM_256:	 snprintf(exp, size, "MIM256"); break;
-				case LEGIC_MIM_1024: snprintf(exp, size, "MIM1024"); break;
-				case LEGIC_ACK_22:	 snprintf(exp, size, "ACK 22"); break;
-				case LEGIC_ACK_256:	 snprintf(exp, size, "ACK 256/1024"); break;
-			}
-			break;
-		}
-		case 9:
-		case 11: {
+    uint8_t bitsend = cmd[0];
+    uint8_t cmdBit = (cmd[1] & 1);
+    switch (bitsend){
+        case 7:
+            snprintf(exp, size, "IV 0x%02X", cmd[1]);
+            break;
+        case 6: {
+            switch ( cmd[1] ) {
+                case LEGIC_MIM_22:     snprintf(exp, size, "MIM22"); break;
+                case LEGIC_MIM_256:     snprintf(exp, size, "MIM256"); break;
+                case LEGIC_MIM_1024: snprintf(exp, size, "MIM1024"); break;
+                case LEGIC_ACK_22:     snprintf(exp, size, "ACK 22"); break;
+                case LEGIC_ACK_256:     snprintf(exp, size, "ACK 256/1024"); break;
+            }
+            break;
+        }
+        case 9:
+        case 11: {
 
-			uint16_t address = (cmd[2] << 7) | cmd[1] >> 1;
+            uint16_t address = (cmd[2] << 7) | cmd[1] >> 1;
 
-			if (cmdBit == LEGIC_READ)
-				snprintf(exp, size, "READ Byte(%d)", address);
+            if (cmdBit == LEGIC_READ)
+                snprintf(exp, size, "READ Byte(%d)", address);
 
-			if (cmdBit == LEGIC_WRITE )
-				snprintf(exp, size, "WRITE Byte(%d)", address);
-			break;
-		}
-		case 21: {
-			if (cmdBit == LEGIC_WRITE ) {
-				uint16_t address = ((cmd[2] << 7) | cmd[1] >> 1) & 0xFF;
-				uint8_t val = (cmd[3] & 1 ) << 7 | cmd[2] >> 1;
-				snprintf(exp, size, "WRITE Byte(%d) %02X", address, val);
-			}
-			break;
-		}
-		case 23: {
-			if (cmdBit == LEGIC_WRITE ) {
-				uint16_t address = ((cmd[2] << 7) | cmd[1] >> 1) & 0x3FF;
-				uint8_t val = (cmd[3] & 0x7 ) << 5 | cmd[2] >> 3;
-				snprintf(exp, size, "WRITE Byte(%d) %02X", address, val);
-			}
-			break;
-		}
-		case 12:
-		default:
-			break;
-	}
+            if (cmdBit == LEGIC_WRITE )
+                snprintf(exp, size, "WRITE Byte(%d)", address);
+            break;
+        }
+        case 21: {
+            if (cmdBit == LEGIC_WRITE ) {
+                uint16_t address = ((cmd[2] << 7) | cmd[1] >> 1) & 0xFF;
+                uint8_t val = (cmd[3] & 1 ) << 7 | cmd[2] >> 1;
+                snprintf(exp, size, "WRITE Byte(%d) %02X", address, val);
+            }
+            break;
+        }
+        case 23: {
+            if (cmdBit == LEGIC_WRITE ) {
+                uint16_t address = ((cmd[2] << 7) | cmd[1] >> 1) & 0x3FF;
+                uint8_t val = (cmd[3] & 0x7 ) << 5 | cmd[2] >> 3;
+                snprintf(exp, size, "WRITE Byte(%d) %02X", address, val);
+            }
+            break;
+        }
+        case 12:
+        default:
+            break;
+    }
 }
 
 void annotateFelica(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
 
-	switch(cmd[0]){
-		case FELICA_POLL_REQ: snprintf(exp,size ,"POLLING");break;
-		case FELICA_POLL_ACK: snprintf(exp,size ,"POLL ACK");break;
-		case FELICA_REQSRV_REQ: snprintf(exp,size ,"REQUEST SERVICE");break;
-		case FELICA_REQSRV_ACK: snprintf(exp,size ,"REQ SERV ACK");break;
-		case FELICA_REQRESP_REQ: snprintf(exp,size ,"REQUEST RESPONSE");break;
-		case FELICA_REQRESP_ACK: snprintf(exp,size ,"REQ RESP ACK");break;
-		case FELICA_RDBLK_REQ: snprintf(exp,size ,"READ BLK");break;
-		case FELICA_RDBLK_ACK: snprintf(exp,size ,"READ BLK ACK");break;
-		case FELICA_WRTBLK_REQ:	snprintf(exp,size ,"WRITE BLK");break;
-		case FELICA_WRTBLK_ACK: snprintf(exp,size ,"WRITE BLK ACK");break;
-		case FELICA_SRCHSYSCODE_REQ: snprintf(exp,size ,"SEARCH SERVICE CODE");break;
-		case FELICA_SRCHSYSCODE_ACK: snprintf(exp,size ,"SSC ACK");break;
-		case FELICA_REQSYSCODE_REQ: snprintf(exp,size ,"REQUEST SYSTEM CODE");break;
-		case FELICA_REQSYSCODE_ACK: snprintf(exp,size ,"RSC ACK");break;
-		case FELICA_AUTH1_REQ: snprintf(exp,size ,"AUTH 1");break;
-		case FELICA_AUTH1_ACK: snprintf(exp,size ,"AUTH 1 ACK");break;
-		case FELICA_AUTH2_REQ: snprintf(exp,size ,"AUTH 2");break;
-		case FELICA_AUTH2_ACK: snprintf(exp,size ,"AUTH 2 ACK");break;
-		case FELICA_RDSEC_REQ: snprintf(exp,size ,"READ");break;
-		case FELICA_RDSEC_ACK: snprintf(exp,size ,"READ ACK");break;
-		case FELICA_WRTSEC_REQ: snprintf(exp,size ,"WRITE");break;
-		case FELICA_WRTSEC_ACK: snprintf(exp,size ,"WRITE ACK");break;
-		case FELICA_REQSRV2_REQ: snprintf(exp,size ,"REQUEST SERVICE v2");break;
-		case FELICA_REQSRV2_ACK: snprintf(exp,size ,"REQ SERV v2 ACK");break;
-		case FELICA_GETSTATUS_REQ: snprintf(exp,size ,"GET STATUS");break;
-		case FELICA_GETSTATUS_ACK: snprintf(exp,size ,"GET STATUS ACK");break;
-		case FELICA_OSVER_REQ: snprintf(exp,size ,"REQUEST SPECIFIC VERSION");break;
-		case FELICA_OSVER_ACK: snprintf(exp,size ,"RSV ACK");break;
-		case FELICA_RESET_MODE_REQ: snprintf(exp,size ,"RESET MODE");break;
-		case FELICA_RESET_MODE_ACK: snprintf(exp,size ,"RESET MODE ACK");break;
-		case FELICA_AUTH1V2_REQ: snprintf(exp,size ,"AUTH 1 v2");break;
-		case FELICA_AUTH1V2_ACK: snprintf(exp,size ,"AUTH 1 v2 ACK");break;
-		case FELICA_AUTH2V2_REQ: snprintf(exp,size ,"AUTH 2 v2");break;
-		case FELICA_AUTH2V2_ACK: snprintf(exp,size ,"AUTH 2 v2 ACK");break;
-		case FELICA_RDSECV2_REQ: snprintf(exp,size ,"READ v2");break;
-		case FELICA_RDSECV2_ACK: snprintf(exp,size ,"READ v2 ACK");break;
-		case FELICA_WRTSECV2_REQ: snprintf(exp,size ,"WRITE v2");break;
-		case FELICA_WRTSECV2_ACK: snprintf(exp,size ,"WRITE v2 ACK");break;
-		case FELICA_UPDATE_RNDID_REQ: snprintf(exp,size ,"UPDATE RANDOM ID");break;
-		case FELICA_UPDATE_RNDID_ACK: snprintf(exp,size ,"URI ACK");break;
-		default                     : snprintf(exp,size ,"?");break;
-	}
+    switch(cmd[0]){
+        case FELICA_POLL_REQ: snprintf(exp,size ,"POLLING");break;
+        case FELICA_POLL_ACK: snprintf(exp,size ,"POLL ACK");break;
+        case FELICA_REQSRV_REQ: snprintf(exp,size ,"REQUEST SERVICE");break;
+        case FELICA_REQSRV_ACK: snprintf(exp,size ,"REQ SERV ACK");break;
+        case FELICA_REQRESP_REQ: snprintf(exp,size ,"REQUEST RESPONSE");break;
+        case FELICA_REQRESP_ACK: snprintf(exp,size ,"REQ RESP ACK");break;
+        case FELICA_RDBLK_REQ: snprintf(exp,size ,"READ BLK");break;
+        case FELICA_RDBLK_ACK: snprintf(exp,size ,"READ BLK ACK");break;
+        case FELICA_WRTBLK_REQ:    snprintf(exp,size ,"WRITE BLK");break;
+        case FELICA_WRTBLK_ACK: snprintf(exp,size ,"WRITE BLK ACK");break;
+        case FELICA_SRCHSYSCODE_REQ: snprintf(exp,size ,"SEARCH SERVICE CODE");break;
+        case FELICA_SRCHSYSCODE_ACK: snprintf(exp,size ,"SSC ACK");break;
+        case FELICA_REQSYSCODE_REQ: snprintf(exp,size ,"REQUEST SYSTEM CODE");break;
+        case FELICA_REQSYSCODE_ACK: snprintf(exp,size ,"RSC ACK");break;
+        case FELICA_AUTH1_REQ: snprintf(exp,size ,"AUTH 1");break;
+        case FELICA_AUTH1_ACK: snprintf(exp,size ,"AUTH 1 ACK");break;
+        case FELICA_AUTH2_REQ: snprintf(exp,size ,"AUTH 2");break;
+        case FELICA_AUTH2_ACK: snprintf(exp,size ,"AUTH 2 ACK");break;
+        case FELICA_RDSEC_REQ: snprintf(exp,size ,"READ");break;
+        case FELICA_RDSEC_ACK: snprintf(exp,size ,"READ ACK");break;
+        case FELICA_WRTSEC_REQ: snprintf(exp,size ,"WRITE");break;
+        case FELICA_WRTSEC_ACK: snprintf(exp,size ,"WRITE ACK");break;
+        case FELICA_REQSRV2_REQ: snprintf(exp,size ,"REQUEST SERVICE v2");break;
+        case FELICA_REQSRV2_ACK: snprintf(exp,size ,"REQ SERV v2 ACK");break;
+        case FELICA_GETSTATUS_REQ: snprintf(exp,size ,"GET STATUS");break;
+        case FELICA_GETSTATUS_ACK: snprintf(exp,size ,"GET STATUS ACK");break;
+        case FELICA_OSVER_REQ: snprintf(exp,size ,"REQUEST SPECIFIC VERSION");break;
+        case FELICA_OSVER_ACK: snprintf(exp,size ,"RSV ACK");break;
+        case FELICA_RESET_MODE_REQ: snprintf(exp,size ,"RESET MODE");break;
+        case FELICA_RESET_MODE_ACK: snprintf(exp,size ,"RESET MODE ACK");break;
+        case FELICA_AUTH1V2_REQ: snprintf(exp,size ,"AUTH 1 v2");break;
+        case FELICA_AUTH1V2_ACK: snprintf(exp,size ,"AUTH 1 v2 ACK");break;
+        case FELICA_AUTH2V2_REQ: snprintf(exp,size ,"AUTH 2 v2");break;
+        case FELICA_AUTH2V2_ACK: snprintf(exp,size ,"AUTH 2 v2 ACK");break;
+        case FELICA_RDSECV2_REQ: snprintf(exp,size ,"READ v2");break;
+        case FELICA_RDSECV2_ACK: snprintf(exp,size ,"READ v2 ACK");break;
+        case FELICA_WRTSECV2_REQ: snprintf(exp,size ,"WRITE v2");break;
+        case FELICA_WRTSECV2_ACK: snprintf(exp,size ,"WRITE v2 ACK");break;
+        case FELICA_UPDATE_RNDID_REQ: snprintf(exp,size ,"UPDATE RANDOM ID");break;
+        case FELICA_UPDATE_RNDID_ACK: snprintf(exp,size ,"URI ACK");break;
+        default                     : snprintf(exp,size ,"?");break;
+    }
 }
 
 void annotateMifare(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize, uint8_t* parity, uint8_t paritysize, bool isResponse) {
-	if (!isResponse && cmdsize == 1) {
-		switch(cmd[0]) {
-			case ISO14443A_CMD_WUPA:
-			case ISO14443A_CMD_REQA:
-				MifareAuthState = masNone;
-				break;
-			default:
-				break;
-		}
-	}
+    if (!isResponse && cmdsize == 1) {
+        switch(cmd[0]) {
+            case ISO14443A_CMD_WUPA:
+            case ISO14443A_CMD_REQA:
+                MifareAuthState = masNone;
+                break;
+            default:
+                break;
+        }
+    }
 
-	// get UID
-	if (MifareAuthState == masNone) {
-		if (cmdsize == 9 && cmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT && cmd[1] == 0x70) {
-			ClearAuthData();
-			AuthData.uid = bytes_to_num(&cmd[2], 4);
-		}
-		if (cmdsize == 9 && cmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2 && cmd[1] == 0x70) {
-			ClearAuthData();
-			AuthData.uid = bytes_to_num(&cmd[2], 4);
-		}
-		if (cmdsize == 9 && cmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_3 && cmd[1] == 0x70) {
-			ClearAuthData();
-			AuthData.uid = bytes_to_num(&cmd[2], 4);
-		}
-	}
+    // get UID
+    if (MifareAuthState == masNone) {
+        if (cmdsize == 9 && cmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT && cmd[1] == 0x70) {
+            ClearAuthData();
+            AuthData.uid = bytes_to_num(&cmd[2], 4);
+        }
+        if (cmdsize == 9 && cmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2 && cmd[1] == 0x70) {
+            ClearAuthData();
+            AuthData.uid = bytes_to_num(&cmd[2], 4);
+        }
+        if (cmdsize == 9 && cmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_3 && cmd[1] == 0x70) {
+            ClearAuthData();
+            AuthData.uid = bytes_to_num(&cmd[2], 4);
+        }
+    }
 
-	switch(MifareAuthState) {
-		case masNt:
-			if (cmdsize == 4 && isResponse) {
-				snprintf(exp, size, "AUTH: nt %s", (AuthData.first_auth) ? "" : "(enc)");
-				MifareAuthState = masNrAr;
-				if (AuthData.first_auth) {
-					AuthData.nt = bytes_to_num(cmd, 4);
-				} else {
-					AuthData.nt_enc = bytes_to_num(cmd, 4);
-					AuthData.nt_enc_par = parity[0];
-				}
-				return;
-			} else {
-				MifareAuthState = masError;
-			}
-			break;
-		case masNrAr:
-			if (cmdsize == 8 && !isResponse) {
-				snprintf(exp, size, "AUTH: nr ar (enc)");
-				MifareAuthState = masAt;
-				AuthData.nr_enc = bytes_to_num(cmd, 4);
-				AuthData.ar_enc = bytes_to_num(&cmd[4], 4);
-				AuthData.ar_enc_par = parity[0] << 4;
-				return;
-			} else {
-				MifareAuthState = masError;
-			}
-			break;
-		case masAt:
-			if (cmdsize == 4 && isResponse) {
-				snprintf(exp, size, "AUTH: at (enc)");
-				MifareAuthState = masAuthComplete;
-				AuthData.at_enc = bytes_to_num(cmd, 4);
-				AuthData.at_enc_par = parity[0];
-				return;
-			} else {
-				MifareAuthState = masError;
-			}
-			break;
-		default:
-			break;
-	}
+    switch(MifareAuthState) {
+        case masNt:
+            if (cmdsize == 4 && isResponse) {
+                snprintf(exp, size, "AUTH: nt %s", (AuthData.first_auth) ? "" : "(enc)");
+                MifareAuthState = masNrAr;
+                if (AuthData.first_auth) {
+                    AuthData.nt = bytes_to_num(cmd, 4);
+                } else {
+                    AuthData.nt_enc = bytes_to_num(cmd, 4);
+                    AuthData.nt_enc_par = parity[0];
+                }
+                return;
+            } else {
+                MifareAuthState = masError;
+            }
+            break;
+        case masNrAr:
+            if (cmdsize == 8 && !isResponse) {
+                snprintf(exp, size, "AUTH: nr ar (enc)");
+                MifareAuthState = masAt;
+                AuthData.nr_enc = bytes_to_num(cmd, 4);
+                AuthData.ar_enc = bytes_to_num(&cmd[4], 4);
+                AuthData.ar_enc_par = parity[0] << 4;
+                return;
+            } else {
+                MifareAuthState = masError;
+            }
+            break;
+        case masAt:
+            if (cmdsize == 4 && isResponse) {
+                snprintf(exp, size, "AUTH: at (enc)");
+                MifareAuthState = masAuthComplete;
+                AuthData.at_enc = bytes_to_num(cmd, 4);
+                AuthData.at_enc_par = parity[0];
+                return;
+            } else {
+                MifareAuthState = masError;
+            }
+            break;
+        default:
+            break;
+    }
 
-	if (!isResponse && ((MifareAuthState == masNone) || (MifareAuthState == masError)))
-		annotateIso14443a(exp, size, cmd, cmdsize);
+    if (!isResponse && ((MifareAuthState == masNone) || (MifareAuthState == masError)))
+        annotateIso14443a(exp, size, cmd, cmdsize);
 
 }
 
 bool DecodeMifareData(uint8_t *cmd, uint8_t cmdsize, uint8_t *parity, bool isResponse, uint8_t *mfData, size_t *mfDataLen) {
-	static struct Crypto1State *traceCrypto1;
-	static uint64_t mfLastKey;
+    static struct Crypto1State *traceCrypto1;
+    static uint64_t mfLastKey;
 
-	*mfDataLen = 0;
+    *mfDataLen = 0;
 
-	if (MifareAuthState == masAuthComplete) {
-		if (traceCrypto1) {
-			crypto1_destroy(traceCrypto1);
-			traceCrypto1 = NULL;
-		}
+    if (MifareAuthState == masAuthComplete) {
+        if (traceCrypto1) {
+            crypto1_destroy(traceCrypto1);
+            traceCrypto1 = NULL;
+        }
 
-		MifareAuthState = masFirstData;
-		return false;
-	}
+        MifareAuthState = masFirstData;
+        return false;
+    }
 
-	if (cmdsize > 32)
-		return false;
+    if (cmdsize > 32)
+        return false;
 
-	if (MifareAuthState == masFirstData) {
-		if (AuthData.first_auth) {
-			AuthData.ks2 = AuthData.ar_enc ^ prng_successor(AuthData.nt, 64);
-			AuthData.ks3 = AuthData.at_enc ^ prng_successor(AuthData.nt, 96);
+    if (MifareAuthState == masFirstData) {
+        if (AuthData.first_auth) {
+            AuthData.ks2 = AuthData.ar_enc ^ prng_successor(AuthData.nt, 64);
+            AuthData.ks3 = AuthData.at_enc ^ prng_successor(AuthData.nt, 96);
 
-			mfLastKey = GetCrypto1ProbableKey(&AuthData);
-			PrintAndLogEx(NORMAL, "            |            |  *  |%49s %012"PRIx64" prng %s |     |",
-				"key",
-				mfLastKey,
-				validate_prng_nonce(AuthData.nt) ? _GREEN_(WEAK): _YELLOW_(HARD));
+            mfLastKey = GetCrypto1ProbableKey(&AuthData);
+            PrintAndLogEx(NORMAL, "            |            |  *  |%49s %012"PRIx64" prng %s |     |",
+                "key",
+                mfLastKey,
+                validate_prng_nonce(AuthData.nt) ? _GREEN_(WEAK): _YELLOW_(HARD));
 
-			AuthData.first_auth = false;
+            AuthData.first_auth = false;
 
-			traceCrypto1 = lfsr_recovery64(AuthData.ks2, AuthData.ks3);
-		} else {
-			if (traceCrypto1) {
-				crypto1_destroy(traceCrypto1);
-				traceCrypto1 = NULL;
-			}
+            traceCrypto1 = lfsr_recovery64(AuthData.ks2, AuthData.ks3);
+        } else {
+            if (traceCrypto1) {
+                crypto1_destroy(traceCrypto1);
+                traceCrypto1 = NULL;
+            }
 
-			// check last used key
-			if (mfLastKey) {
-				if (NestedCheckKey(mfLastKey, &AuthData, cmd, cmdsize, parity)) {
-					PrintAndLogEx(NORMAL, "            |            |  *  |%60s %012"PRIx64"|     |", "last used key", mfLastKey);
-					traceCrypto1 = lfsr_recovery64(AuthData.ks2, AuthData.ks3);
-				};
-			}
+            // check last used key
+            if (mfLastKey) {
+                if (NestedCheckKey(mfLastKey, &AuthData, cmd, cmdsize, parity)) {
+                    PrintAndLogEx(NORMAL, "            |            |  *  |%60s %012"PRIx64"|     |", "last used key", mfLastKey);
+                    traceCrypto1 = lfsr_recovery64(AuthData.ks2, AuthData.ks3);
+                };
+            }
 
-			// check default keys
-			if (!traceCrypto1) {
-				for (int i = 0; i < MIFARE_DEFAULTKEYS_SIZE; i++){
-					if (NestedCheckKey(g_mifare_default_keys[i], &AuthData, cmd, cmdsize, parity)) {
-						PrintAndLogEx(NORMAL, "            |            |  *  |%61s %012"PRIx64"|     |", "key", g_mifare_default_keys[i]);
+            // check default keys
+            if (!traceCrypto1) {
+                for (int i = 0; i < MIFARE_DEFAULTKEYS_SIZE; i++){
+                    if (NestedCheckKey(g_mifare_default_keys[i], &AuthData, cmd, cmdsize, parity)) {
+                        PrintAndLogEx(NORMAL, "            |            |  *  |%61s %012"PRIx64"|     |", "key", g_mifare_default_keys[i]);
 
-						mfLastKey = g_mifare_default_keys[i];
-						traceCrypto1 = lfsr_recovery64(AuthData.ks2, AuthData.ks3);
-						break;
-					};
-				}
-			}
+                        mfLastKey = g_mifare_default_keys[i];
+                        traceCrypto1 = lfsr_recovery64(AuthData.ks2, AuthData.ks3);
+                        break;
+                    };
+                }
+            }
 
-			// nested
-			if (!traceCrypto1 && validate_prng_nonce(AuthData.nt)) {
-				uint32_t ntx = prng_successor(AuthData.nt, 90);
-				for (int i = 0; i < 16383; i++) {
-					ntx = prng_successor(ntx, 1);
-					if (NTParityChk(&AuthData, ntx)){
+            // nested
+            if (!traceCrypto1 && validate_prng_nonce(AuthData.nt)) {
+                uint32_t ntx = prng_successor(AuthData.nt, 90);
+                for (int i = 0; i < 16383; i++) {
+                    ntx = prng_successor(ntx, 1);
+                    if (NTParityChk(&AuthData, ntx)){
 
-						uint32_t ks2 = AuthData.ar_enc ^ prng_successor(ntx, 64);
-						uint32_t ks3 = AuthData.at_enc ^ prng_successor(ntx, 96);
-						struct Crypto1State *pcs = lfsr_recovery64(ks2, ks3);
-						memcpy(mfData, cmd, cmdsize);
-						mf_crypto1_decrypt(pcs, mfData, cmdsize, 0);
-						crypto1_destroy(pcs);
+                        uint32_t ks2 = AuthData.ar_enc ^ prng_successor(ntx, 64);
+                        uint32_t ks3 = AuthData.at_enc ^ prng_successor(ntx, 96);
+                        struct Crypto1State *pcs = lfsr_recovery64(ks2, ks3);
+                        memcpy(mfData, cmd, cmdsize);
+                        mf_crypto1_decrypt(pcs, mfData, cmdsize, 0);
+                        crypto1_destroy(pcs);
 
-						if (CheckCrypto1Parity(cmd, cmdsize, mfData, parity) && check_crc(CRC_14443_A, mfData, cmdsize)) {
-							AuthData.ks2 = ks2;
-							AuthData.ks3 = ks3;
-							AuthData.nt = ntx;
-							mfLastKey = GetCrypto1ProbableKey(&AuthData);
-							PrintAndLogEx(NORMAL, "            |            |  *  | nested probable key:%012"PRIx64"      ks2:%08x ks3:%08x |     |",
-								mfLastKey,
-								AuthData.ks2,
-								AuthData.ks3);
+                        if (CheckCrypto1Parity(cmd, cmdsize, mfData, parity) && check_crc(CRC_14443_A, mfData, cmdsize)) {
+                            AuthData.ks2 = ks2;
+                            AuthData.ks3 = ks3;
+                            AuthData.nt = ntx;
+                            mfLastKey = GetCrypto1ProbableKey(&AuthData);
+                            PrintAndLogEx(NORMAL, "            |            |  *  | nested probable key:%012"PRIx64"      ks2:%08x ks3:%08x |     |",
+                                mfLastKey,
+                                AuthData.ks2,
+                                AuthData.ks3);
 
-							traceCrypto1 = lfsr_recovery64(AuthData.ks2, AuthData.ks3);
-							break;
-						}
-					}
-				}
-			}
+                            traceCrypto1 = lfsr_recovery64(AuthData.ks2, AuthData.ks3);
+                            break;
+                        }
+                    }
+                }
+            }
 
-			//hardnested
-			if (!traceCrypto1) {
-				PrintAndLogEx(NORMAL, "hardnested not implemented. uid:%x nt:%x ar_enc:%x at_enc:%x\n", AuthData.uid, AuthData.nt, AuthData.ar_enc, AuthData.at_enc);
-				MifareAuthState = masError;
+            //hardnested
+            if (!traceCrypto1) {
+                PrintAndLogEx(NORMAL, "hardnested not implemented. uid:%x nt:%x ar_enc:%x at_enc:%x\n", AuthData.uid, AuthData.nt, AuthData.ar_enc, AuthData.at_enc);
+                MifareAuthState = masError;
 
-				/* TOO SLOW( needs to have more strong filter. with this filter - aprox 4 mln tests
-				uint32_t t = msclock();
-				uint32_t t1 = t;
-				int n = 0;
-				for (uint32_t i = 0; i < 0xFFFFFFFF; i++) {
-					if (NTParityChk(&AuthData, i)){
+                /* TOO SLOW( needs to have more strong filter. with this filter - aprox 4 mln tests
+                uint32_t t = msclock();
+                uint32_t t1 = t;
+                int n = 0;
+                for (uint32_t i = 0; i < 0xFFFFFFFF; i++) {
+                    if (NTParityChk(&AuthData, i)){
 
-						uint32_t ks2 = AuthData.ar_enc ^ prng_successor(i, 64);
-						uint32_t ks3 = AuthData.at_enc ^ prng_successor(i, 96);
-						struct Crypto1State *pcs = lfsr_recovery64(ks2, ks3);
+                        uint32_t ks2 = AuthData.ar_enc ^ prng_successor(i, 64);
+                        uint32_t ks3 = AuthData.at_enc ^ prng_successor(i, 96);
+                        struct Crypto1State *pcs = lfsr_recovery64(ks2, ks3);
 
-						n++;
+                        n++;
 
-						if (!(n % 100000)) {
-							PrintAndLogEx(NORMAL, "delta=%d n=%d ks2=%x ks3=%x \n", msclock() - t1 , n, ks2, ks3);
-							t1 = msclock();
-						}
+                        if (!(n % 100000)) {
+                            PrintAndLogEx(NORMAL, "delta=%d n=%d ks2=%x ks3=%x \n", msclock() - t1 , n, ks2, ks3);
+                            t1 = msclock();
+                        }
 
-					}
-				}
-				PrintAndLogEx(NORMAL, "delta=%d n=%d\n", msclock() - t, n);
-				*/
-			}
-		}
-		MifareAuthState = masData;
-	}
+                    }
+                }
+                PrintAndLogEx(NORMAL, "delta=%d n=%d\n", msclock() - t, n);
+                */
+            }
+        }
+        MifareAuthState = masData;
+    }
 
-	if (MifareAuthState == masData && traceCrypto1) {
-		memcpy(mfData, cmd, cmdsize);
-		mf_crypto1_decrypt(traceCrypto1, mfData, cmdsize, 0);
-		*mfDataLen = cmdsize;
-	}
+    if (MifareAuthState == masData && traceCrypto1) {
+        memcpy(mfData, cmd, cmdsize);
+        mf_crypto1_decrypt(traceCrypto1, mfData, cmdsize, 0);
+        *mfDataLen = cmdsize;
+    }
 
-	return *mfDataLen > 0;
+    return *mfDataLen > 0;
 }
 
 bool NTParityChk(TAuthData *ad, uint32_t ntx) {
-	if (
-		(oddparity8(ntx >> 8 & 0xff) ^ (ntx & 0x01) ^ ((ad->nt_enc_par >> 5) & 0x01) ^ (ad->nt_enc & 0x01)) ||
-		(oddparity8(ntx >> 16 & 0xff) ^ (ntx >> 8 & 0x01) ^ ((ad->nt_enc_par >> 6) & 0x01) ^ (ad->nt_enc >> 8 & 0x01)) ||
-		(oddparity8(ntx >> 24 & 0xff) ^ (ntx >> 16 & 0x01) ^ ((ad->nt_enc_par >> 7) & 0x01) ^ (ad->nt_enc >> 16 & 0x01))
-		)
-		return false;
+    if (
+        (oddparity8(ntx >> 8 & 0xff) ^ (ntx & 0x01) ^ ((ad->nt_enc_par >> 5) & 0x01) ^ (ad->nt_enc & 0x01)) ||
+        (oddparity8(ntx >> 16 & 0xff) ^ (ntx >> 8 & 0x01) ^ ((ad->nt_enc_par >> 6) & 0x01) ^ (ad->nt_enc >> 8 & 0x01)) ||
+        (oddparity8(ntx >> 24 & 0xff) ^ (ntx >> 16 & 0x01) ^ ((ad->nt_enc_par >> 7) & 0x01) ^ (ad->nt_enc >> 16 & 0x01))
+        )
+        return false;
 
-	uint32_t ar = prng_successor(ntx, 64);
-	if (
-		(oddparity8(ar >> 8 & 0xff) ^ (ar & 0x01) ^ ((ad->ar_enc_par >> 5) & 0x01) ^ (ad->ar_enc & 0x01)) ||
-		(oddparity8(ar >> 16 & 0xff) ^ (ar >> 8 & 0x01) ^ ((ad->ar_enc_par >> 6) & 0x01) ^ (ad->ar_enc >> 8 & 0x01)) ||
-		(oddparity8(ar >> 24 & 0xff) ^ (ar >> 16 & 0x01) ^ ((ad->ar_enc_par >> 7) & 0x01) ^ (ad->ar_enc >> 16 & 0x01))
-		)
-		return false;
+    uint32_t ar = prng_successor(ntx, 64);
+    if (
+        (oddparity8(ar >> 8 & 0xff) ^ (ar & 0x01) ^ ((ad->ar_enc_par >> 5) & 0x01) ^ (ad->ar_enc & 0x01)) ||
+        (oddparity8(ar >> 16 & 0xff) ^ (ar >> 8 & 0x01) ^ ((ad->ar_enc_par >> 6) & 0x01) ^ (ad->ar_enc >> 8 & 0x01)) ||
+        (oddparity8(ar >> 24 & 0xff) ^ (ar >> 16 & 0x01) ^ ((ad->ar_enc_par >> 7) & 0x01) ^ (ad->ar_enc >> 16 & 0x01))
+        )
+        return false;
 
-	uint32_t at = prng_successor(ntx, 96);
-	if (
-		(oddparity8(ar & 0xff) ^ (at >> 24 & 0x01) ^ ((ad->ar_enc_par >> 4) & 0x01) ^ (ad->at_enc >> 24 & 0x01)) ||
-		(oddparity8(at >> 8 & 0xff) ^ (at & 0x01) ^ ((ad->at_enc_par >> 5) & 0x01) ^ (ad->at_enc & 0x01)) ||
-		(oddparity8(at >> 16 & 0xff) ^ (at >> 8 & 0x01) ^ ((ad->at_enc_par >> 6) & 0x01) ^ (ad->at_enc >> 8 & 0x01)) ||
-		(oddparity8(at >> 24 & 0xff) ^ (at >> 16 & 0x01) ^ ((ad->at_enc_par >> 7) & 0x01) ^ (ad->at_enc >> 16 & 0x01))
-		)
-		return false;
+    uint32_t at = prng_successor(ntx, 96);
+    if (
+        (oddparity8(ar & 0xff) ^ (at >> 24 & 0x01) ^ ((ad->ar_enc_par >> 4) & 0x01) ^ (ad->at_enc >> 24 & 0x01)) ||
+        (oddparity8(at >> 8 & 0xff) ^ (at & 0x01) ^ ((ad->at_enc_par >> 5) & 0x01) ^ (ad->at_enc & 0x01)) ||
+        (oddparity8(at >> 16 & 0xff) ^ (at >> 8 & 0x01) ^ ((ad->at_enc_par >> 6) & 0x01) ^ (ad->at_enc >> 8 & 0x01)) ||
+        (oddparity8(at >> 24 & 0xff) ^ (at >> 16 & 0x01) ^ ((ad->at_enc_par >> 7) & 0x01) ^ (ad->at_enc >> 16 & 0x01))
+        )
+        return false;
 
-	return true;
+    return true;
 }
 
 bool NestedCheckKey(uint64_t key, TAuthData *ad, uint8_t *cmd, uint8_t cmdsize, uint8_t *parity) {
-	uint8_t buf[32] = {0};
-	struct Crypto1State *pcs;
+    uint8_t buf[32] = {0};
+    struct Crypto1State *pcs;
 
-	AuthData.ks2 = 0;
-	AuthData.ks3 = 0;
+    AuthData.ks2 = 0;
+    AuthData.ks3 = 0;
 
-	pcs = crypto1_create(key);
-	uint32_t nt1 = crypto1_word(pcs, ad->nt_enc ^ ad->uid, 1) ^ ad->nt_enc;
-	uint32_t ar = prng_successor(nt1, 64);
-	uint32_t at = prng_successor(nt1, 96);
+    pcs = crypto1_create(key);
+    uint32_t nt1 = crypto1_word(pcs, ad->nt_enc ^ ad->uid, 1) ^ ad->nt_enc;
+    uint32_t ar = prng_successor(nt1, 64);
+    uint32_t at = prng_successor(nt1, 96);
 
-	crypto1_word(pcs, ad->nr_enc, 1);
-//	uint32_t nr1 = crypto1_word(pcs, ad->nr_enc, 1) ^ ad->nr_enc;  // if needs deciphered nr
-	uint32_t ar1 = crypto1_word(pcs, 0, 0) ^ ad->ar_enc;
-	uint32_t at1 = crypto1_word(pcs, 0, 0) ^ ad->at_enc;
+    crypto1_word(pcs, ad->nr_enc, 1);
+//   uint32_t nr1 = crypto1_word(pcs, ad->nr_enc, 1) ^ ad->nr_enc;  // if needs deciphered nr
+    uint32_t ar1 = crypto1_word(pcs, 0, 0) ^ ad->ar_enc;
+    uint32_t at1 = crypto1_word(pcs, 0, 0) ^ ad->at_enc;
 
-	if (!(ar == ar1 && at == at1 && NTParityChk(ad, nt1))) {
-		crypto1_destroy(pcs);
-		return false;
-	}
+    if (!(ar == ar1 && at == at1 && NTParityChk(ad, nt1))) {
+        crypto1_destroy(pcs);
+        return false;
+    }
 
-	memcpy(buf, cmd, cmdsize);
-	mf_crypto1_decrypt(pcs, buf, cmdsize, 0);
-	crypto1_destroy(pcs);
+    memcpy(buf, cmd, cmdsize);
+    mf_crypto1_decrypt(pcs, buf, cmdsize, 0);
+    crypto1_destroy(pcs);
 
-	if (!CheckCrypto1Parity(cmd, cmdsize, buf, parity))
-		return false;
+    if (!CheckCrypto1Parity(cmd, cmdsize, buf, parity))
+        return false;
 
-	if (!check_crc(CRC_14443_A, buf, cmdsize))
-		return false;
+    if (!check_crc(CRC_14443_A, buf, cmdsize))
+        return false;
 
-	AuthData.nt = nt1;
-	AuthData.ks2 = AuthData.ar_enc ^ ar;
-	AuthData.ks3 = AuthData.at_enc ^ at;
-	return true;
+    AuthData.nt = nt1;
+    AuthData.ks2 = AuthData.ar_enc ^ ar;
+    AuthData.ks3 = AuthData.at_enc ^ at;
+    return true;
 }
 
 bool CheckCrypto1Parity(uint8_t *cmd_enc, uint8_t cmdsize, uint8_t *cmd, uint8_t *parity_enc) {
-	for (int i = 0; i < cmdsize - 1; i++) {
-		if (oddparity8(cmd[i]) ^ (cmd[i + 1] & 0x01) ^ ((parity_enc[i / 8] >> (7 - i % 8)) & 0x01) ^ (cmd_enc[i + 1] & 0x01))
-			return false;
-	}
-	return true;
+    for (int i = 0; i < cmdsize - 1; i++) {
+        if (oddparity8(cmd[i]) ^ (cmd[i + 1] & 0x01) ^ ((parity_enc[i / 8] >> (7 - i % 8)) & 0x01) ^ (cmd_enc[i + 1] & 0x01))
+            return false;
+    }
+    return true;
 }
 
 // Another implementation of mfkey64 attack,  more "valid" than "probable"
 //
 uint64_t GetCrypto1ProbableKey(TAuthData *ad) {
-	struct Crypto1State *revstate = lfsr_recovery64(ad->ks2, ad->ks3);
-	lfsr_rollback_word(revstate, 0, 0);
-	lfsr_rollback_word(revstate, 0, 0);
-	lfsr_rollback_word(revstate, ad->nr_enc, 1);
-	lfsr_rollback_word(revstate, ad->uid ^ ad->nt, 0);
-	uint64_t key = 0;
-	crypto1_get_lfsr(revstate, &key);
-	crypto1_destroy(revstate);
-	return key;
+    struct Crypto1State *revstate = lfsr_recovery64(ad->ks2, ad->ks3);
+    lfsr_rollback_word(revstate, 0, 0);
+    lfsr_rollback_word(revstate, 0, 0);
+    lfsr_rollback_word(revstate, ad->nr_enc, 1);
+    lfsr_rollback_word(revstate, ad->uid ^ ad->nt, 0);
+    uint64_t key = 0;
+    crypto1_get_lfsr(revstate, &key);
+    crypto1_destroy(revstate);
+    return key;
 }
\ No newline at end of file
diff --git a/client/cmdhflist.h b/client/cmdhflist.h
index 60a0a0dfd..81e5af51b 100644
--- a/client/cmdhflist.h
+++ b/client/cmdhflist.h
@@ -17,39 +17,39 @@
 #include <string.h>
 #include "util.h"
 #include "ui.h"
-#include "cmdhf14a.h"		// ISO14443-A
-#include "cmdhf14b.h"		// ISO14443-B
-#include "cmdhf15.h"		// ISO15693
+#include "cmdhf14a.h"       // ISO14443-A
+#include "cmdhf14b.h"       // ISO14443-B
+#include "cmdhf15.h"        // ISO15693
 #include "cmdhfepa.h"
-#include "cmdhflegic.h"		// LEGIC
-#include "cmdhficlass.h"	// ICLASS
-#include "cmdhfmf.h"		// CLASSIC
-#include "cmdhfmfu.h"		// ULTRALIGHT/NTAG etc
-#include "cmdhfmfdes.h"		// DESFIRE
-#include "cmdhftopaz.h"		// TOPAZ
-#include "cmdhffelica.h"	// ISO18092 / FeliCa
-#include "emv/cmdemv.h"		// EMV
+#include "cmdhflegic.h"     // LEGIC
+#include "cmdhficlass.h"    // ICLASS
+#include "cmdhfmf.h"        // CLASSIC
+#include "cmdhfmfu.h"       // ULTRALIGHT/NTAG etc
+#include "cmdhfmfdes.h"     // DESFIRE
+#include "cmdhftopaz.h"     // TOPAZ
+#include "cmdhffelica.h"    // ISO18092 / FeliCa
+#include "emv/cmdemv.h"     // EMV
 #include "protocols.h"
 #include "crapto1/crapto1.h"
 #include "mifare/mifarehost.h"
 #include "mifare/mifaredefault.h"
-#include "parity.h"			// oddparity
-#include "iso15693tools.h"	// ISO15693 crc
+#include "parity.h"         // oddparity
+#include "iso15693tools.h"  // ISO15693 crc
 
 
 typedef struct {
-	uint32_t uid;       // UID
-	uint32_t nt;        // tag challenge
-	uint32_t nt_enc;    // encrypted tag challenge
-	uint8_t nt_enc_par; // encrypted tag challenge parity
-	uint32_t nr_enc;    // encrypted reader challenge
-	uint32_t ar_enc;    // encrypted reader response
-	uint8_t ar_enc_par; // encrypted reader response parity
-	uint32_t at_enc;    // encrypted tag response
-	uint8_t at_enc_par; // encrypted tag response parity
-	bool first_auth;    // is first authentication
-	uint32_t ks2;		// ar ^ ar_enc
-	uint32_t ks3;       // at ^ at_enc
+    uint32_t uid;       // UID
+    uint32_t nt;        // tag challenge
+    uint32_t nt_enc;    // encrypted tag challenge
+    uint8_t nt_enc_par; // encrypted tag challenge parity
+    uint32_t nr_enc;    // encrypted reader challenge
+    uint32_t ar_enc;    // encrypted reader response
+    uint8_t ar_enc_par; // encrypted reader response parity
+    uint32_t at_enc;    // encrypted tag response
+    uint8_t at_enc_par; // encrypted tag response parity
+    bool first_auth;    // is first authentication
+    uint32_t ks2;       // ar ^ ar_enc
+    uint32_t ks3;       // at ^ at_enc
 } TAuthData;
 extern void ClearAuthData();
 
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index fa1f13102..a15b79bc5 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -29,3444 +29,3444 @@
 static int CmdHelp(const char *Cmd);
 
 int usage_hf14_ice(void){
-		PrintAndLogEx(NORMAL, "Usage:   hf mf ice [l] <limit> [f] <name>");
-		PrintAndLogEx(NORMAL, "  h            this help");
-		PrintAndLogEx(NORMAL, "  l <limit>    nonces to be collected");
-		PrintAndLogEx(NORMAL, "  f <name>     save nonces to <name> instead of hf-mf-<UID>-nonces.bin");
-		PrintAndLogEx(NORMAL, "");
-		PrintAndLogEx(NORMAL, "Examples:");
-		PrintAndLogEx(NORMAL, "         hf mf ice");
-		PrintAndLogEx(NORMAL, "         hf mf ice f nonces.bin");
-		return 0;
+        PrintAndLogEx(NORMAL, "Usage:   hf mf ice [l] <limit> [f] <name>");
+        PrintAndLogEx(NORMAL, "  h            this help");
+        PrintAndLogEx(NORMAL, "  l <limit>    nonces to be collected");
+        PrintAndLogEx(NORMAL, "  f <name>     save nonces to <name> instead of hf-mf-<UID>-nonces.bin");
+        PrintAndLogEx(NORMAL, "");
+        PrintAndLogEx(NORMAL, "Examples:");
+        PrintAndLogEx(NORMAL, "         hf mf ice");
+        PrintAndLogEx(NORMAL, "         hf mf ice f nonces.bin");
+        return 0;
 }
 
 int usage_hf14_dump(void){
-		PrintAndLogEx(NORMAL, "Usage:   hf mf dump [card memory] k <name> f <name>");
-		PrintAndLogEx(NORMAL, "  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");
-		PrintAndLogEx(NORMAL, "  k <name>     : key filename, if no <name> given, UID will be used as filename");
-		PrintAndLogEx(NORMAL, "  f <name>     : data filename, if no <name> given, UID will be used as filename");
-		PrintAndLogEx(NORMAL, "");
-		PrintAndLogEx(NORMAL, "Examples:");
-		PrintAndLogEx(NORMAL, "         hf mf dump");
-		PrintAndLogEx(NORMAL, "         hf mf dump 4");
-		return 0;
+        PrintAndLogEx(NORMAL, "Usage:   hf mf dump [card memory] k <name> f <name>");
+        PrintAndLogEx(NORMAL, "  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");
+        PrintAndLogEx(NORMAL, "  k <name>     : key filename, if no <name> given, UID will be used as filename");
+        PrintAndLogEx(NORMAL, "  f <name>     : data filename, if no <name> given, UID will be used as filename");
+        PrintAndLogEx(NORMAL, "");
+        PrintAndLogEx(NORMAL, "Examples:");
+        PrintAndLogEx(NORMAL, "         hf mf dump");
+        PrintAndLogEx(NORMAL, "         hf mf dump 4");
+        return 0;
 }
 
 int usage_hf14_mifare(void){
-	PrintAndLogEx(NORMAL, "Usage:  hf mf darkside [h] <block number> <A|B>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h               this help");
-	PrintAndLogEx(NORMAL, "      <block number>  (Optional) target other block");
-	PrintAndLogEx(NORMAL, "      <A|B>           (optional) target key type");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "           hf mf darkside");
-	PrintAndLogEx(NORMAL, "           hf mf darkside 16");
-	PrintAndLogEx(NORMAL, "           hf mf darkside 16 B");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage:  hf mf darkside [h] <block number> <A|B>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "      h               this help");
+    PrintAndLogEx(NORMAL, "      <block number>  (Optional) target other block");
+    PrintAndLogEx(NORMAL, "      <A|B>           (optional) target key type");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "           hf mf darkside");
+    PrintAndLogEx(NORMAL, "           hf mf darkside 16");
+    PrintAndLogEx(NORMAL, "           hf mf darkside 16 B");
+    return 0;
 }
 int usage_hf14_mf1ksim(void){
-	PrintAndLogEx(NORMAL, "Usage:  hf mf sim [h] u <uid> n <numreads> [i] [x] [e] [v]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h    this help");
-	PrintAndLogEx(NORMAL, "      u    (Optional) UID 4,7 or 10bytes. If not specified, the UID 4b from emulator memory will be used");
-	PrintAndLogEx(NORMAL, "      n    (Optional) Automatically exit simulation after <numreads> blocks have been read by reader. 0 = infinite");
-	PrintAndLogEx(NORMAL, "      i    (Optional) Interactive, means that console will not be returned until simulation finishes or is aborted");
-	PrintAndLogEx(NORMAL, "      x    (Optional) Crack, performs the 'reader attack', nr/ar attack against a reader");
-	PrintAndLogEx(NORMAL, "      e    (Optional) Fill simulator keys from found keys");
-	PrintAndLogEx(NORMAL, "      v    (Optional) Verbose");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "           hf mf sim u 0a0a0a0a");
-	PrintAndLogEx(NORMAL, "           hf mf sim u 11223344556677");
-	PrintAndLogEx(NORMAL, "           hf mf sim u 112233445566778899AA");
-	PrintAndLogEx(NORMAL, "           hf mf sim u 11223344 i x");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage:  hf mf sim [h] u <uid> n <numreads> [i] [x] [e] [v]");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "      h    this help");
+    PrintAndLogEx(NORMAL, "      u    (Optional) UID 4,7 or 10bytes. If not specified, the UID 4b from emulator memory will be used");
+    PrintAndLogEx(NORMAL, "      n    (Optional) Automatically exit simulation after <numreads> blocks have been read by reader. 0 = infinite");
+    PrintAndLogEx(NORMAL, "      i    (Optional) Interactive, means that console will not be returned until simulation finishes or is aborted");
+    PrintAndLogEx(NORMAL, "      x    (Optional) Crack, performs the 'reader attack', nr/ar attack against a reader");
+    PrintAndLogEx(NORMAL, "      e    (Optional) Fill simulator keys from found keys");
+    PrintAndLogEx(NORMAL, "      v    (Optional) Verbose");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "           hf mf sim u 0a0a0a0a");
+    PrintAndLogEx(NORMAL, "           hf mf sim u 11223344556677");
+    PrintAndLogEx(NORMAL, "           hf mf sim u 112233445566778899AA");
+    PrintAndLogEx(NORMAL, "           hf mf sim u 11223344 i x");
+    return 0;
 }
 int usage_hf14_dbg(void){
-	PrintAndLogEx(NORMAL, "Usage:  hf mf dbg [h] <debug level>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "           h    this help");
-	PrintAndLogEx(NORMAL, "       <debug level>  (Optional) see list for valid levels");
-	PrintAndLogEx(NORMAL, "           0 - no debug messages");
-	PrintAndLogEx(NORMAL, "           1 - error messages");
-	PrintAndLogEx(NORMAL, "           2 - plus information messages");
-	PrintAndLogEx(NORMAL, "           3 - plus debug messages");
-	PrintAndLogEx(NORMAL, "           4 - print even debug messages in timing critical functions");
-	PrintAndLogEx(NORMAL, "               Note: this option therefore may cause malfunction itself");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "           hf mf dbg 3");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage:  hf mf dbg [h] <debug level>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "           h    this help");
+    PrintAndLogEx(NORMAL, "       <debug level>  (Optional) see list for valid levels");
+    PrintAndLogEx(NORMAL, "           0 - no debug messages");
+    PrintAndLogEx(NORMAL, "           1 - error messages");
+    PrintAndLogEx(NORMAL, "           2 - plus information messages");
+    PrintAndLogEx(NORMAL, "           3 - plus debug messages");
+    PrintAndLogEx(NORMAL, "           4 - print even debug messages in timing critical functions");
+    PrintAndLogEx(NORMAL, "               Note: this option therefore may cause malfunction itself");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "           hf mf dbg 3");
+    return 0;
 }
 int usage_hf14_sniff(void){
-	PrintAndLogEx(NORMAL, "It continuously gets data from the field and saves it to: log, emulator, emulator file.");
-	PrintAndLogEx(NORMAL, "Usage:  hf mf sniff [h] [l] [d] [f]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h    this help");
-	PrintAndLogEx(NORMAL, "      l    save encrypted sequence to logfile `uid.log`");
-	PrintAndLogEx(NORMAL, "      d    decrypt sequence and put it to log file `uid.log`");
-//	PrintAndLogEx(NORMAL, " n/a  e     decrypt sequence, collect read and write commands and save the result of the sequence to emulator memory");
-	PrintAndLogEx(NORMAL, "      f    decrypt sequence, collect read and write commands and save the result of the sequence to emulator dump file `uid.eml`");
-	PrintAndLogEx(NORMAL, "Example:");
-	PrintAndLogEx(NORMAL, "           hf mf sniff l d f");
-	return 0;
+    PrintAndLogEx(NORMAL, "It continuously gets data from the field and saves it to: log, emulator, emulator file.");
+    PrintAndLogEx(NORMAL, "Usage:  hf mf sniff [h] [l] [d] [f]");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "      h    this help");
+    PrintAndLogEx(NORMAL, "      l    save encrypted sequence to logfile `uid.log`");
+    PrintAndLogEx(NORMAL, "      d    decrypt sequence and put it to log file `uid.log`");
+//  PrintAndLogEx(NORMAL, " n/a  e     decrypt sequence, collect read and write commands and save the result of the sequence to emulator memory");
+    PrintAndLogEx(NORMAL, "      f    decrypt sequence, collect read and write commands and save the result of the sequence to emulator dump file `uid.eml`");
+    PrintAndLogEx(NORMAL, "Example:");
+    PrintAndLogEx(NORMAL, "           hf mf sniff l d f");
+    return 0;
 }
 int usage_hf14_nested(void){
-	PrintAndLogEx(NORMAL, "Usage:");
-	PrintAndLogEx(NORMAL, " all sectors:  hf mf nested  <card memory> <block number> <key A/B> <key (12 hex symbols)> [t,d]");
-	PrintAndLogEx(NORMAL, " one sector:   hf mf nested  o <block number> <key A/B> <key (12 hex symbols)>");
-	PrintAndLogEx(NORMAL, "               <target block number> <target key A/B> [t]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h    this help");
-	PrintAndLogEx(NORMAL, "      card memory - 0 - MINI(320 bytes), 1 - 1K, 2 - 2K, 4 - 4K, <other> - 1K");
-	PrintAndLogEx(NORMAL, "      t    transfer keys into emulator memory");
-	PrintAndLogEx(NORMAL, "      d    write keys to binary file `hf-mf-<UID>-key.bin`");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      hf mf nested 1 0 A FFFFFFFFFFFF ");
-	PrintAndLogEx(NORMAL, "      hf mf nested 1 0 A FFFFFFFFFFFF t ");
-	PrintAndLogEx(NORMAL, "      hf mf nested 1 0 A FFFFFFFFFFFF d ");
-	PrintAndLogEx(NORMAL, "      hf mf nested o 0 A FFFFFFFFFFFF 4 A");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage:");
+    PrintAndLogEx(NORMAL, " all sectors:  hf mf nested  <card memory> <block number> <key A/B> <key (12 hex symbols)> [t,d]");
+    PrintAndLogEx(NORMAL, " one sector:   hf mf nested  o <block number> <key A/B> <key (12 hex symbols)>");
+    PrintAndLogEx(NORMAL, "               <target block number> <target key A/B> [t]");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "      h    this help");
+    PrintAndLogEx(NORMAL, "      card memory - 0 - MINI(320 bytes), 1 - 1K, 2 - 2K, 4 - 4K, <other> - 1K");
+    PrintAndLogEx(NORMAL, "      t    transfer keys into emulator memory");
+    PrintAndLogEx(NORMAL, "      d    write keys to binary file `hf-mf-<UID>-key.bin`");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      hf mf nested 1 0 A FFFFFFFFFFFF ");
+    PrintAndLogEx(NORMAL, "      hf mf nested 1 0 A FFFFFFFFFFFF t ");
+    PrintAndLogEx(NORMAL, "      hf mf nested 1 0 A FFFFFFFFFFFF d ");
+    PrintAndLogEx(NORMAL, "      hf mf nested o 0 A FFFFFFFFFFFF 4 A");
+    return 0;
 }
 int usage_hf14_hardnested(void){
-	PrintAndLogEx(NORMAL, "Usage:");
-	PrintAndLogEx(NORMAL, "      hf mf hardnested <block number> <key A|B> <key (12 hex symbols)>");
-	PrintAndLogEx(NORMAL, "                       <target block number> <target key A|B> [known target key (12 hex symbols)] [w] [s]");
-	PrintAndLogEx(NORMAL, "  or  hf mf hardnested r [known target key]");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h         this help");
-	PrintAndLogEx(NORMAL, "      w         acquire nonces and UID, and write them to binary file with default name hf-mf-<UID>-nonces.bin");
-	PrintAndLogEx(NORMAL, "      s         slower acquisition (required by some non standard cards)");
-	PrintAndLogEx(NORMAL, "      r         read hf-mf-<UID>-nonces.bin if tag present, otherwise read nonces.bin, then start attack");
-	PrintAndLogEx(NORMAL, "      u <UID>   read/write hf-mf-<UID>-nonces.bin instead of default name");
-	PrintAndLogEx(NORMAL, "      f <name>  read/write <name> instead of default name");
-	PrintAndLogEx(NORMAL, "      t         tests?");
-	PrintAndLogEx(NORMAL, "      i <X>     set type of SIMD instructions. Without this flag programs autodetect it.");
-	PrintAndLogEx(NORMAL, "        i 5   = AVX512");
-	PrintAndLogEx(NORMAL, "        i 2   = AVX2");
-	PrintAndLogEx(NORMAL, "        i a   = AVX");
-	PrintAndLogEx(NORMAL, "        i s   = SSE2");
-	PrintAndLogEx(NORMAL, "        i m   = MMX");
-	PrintAndLogEx(NORMAL, "        i n   = none (use CPU regular instruction set)");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      hf mf hardnested 0 A FFFFFFFFFFFF 4 A");
-	PrintAndLogEx(NORMAL, "      hf mf hardnested 0 A FFFFFFFFFFFF 4 A w");
-	PrintAndLogEx(NORMAL, "      hf mf hardnested 0 A FFFFFFFFFFFF 4 A f nonces.bin w s");
-	PrintAndLogEx(NORMAL, "      hf mf hardnested r");
-	PrintAndLogEx(NORMAL, "      hf mf hardnested r a0a1a2a3a4a5");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Add the known target key to check if it is present in the remaining key space:");
-	PrintAndLogEx(NORMAL, "      hf mf hardnested 0 A A0A1A2A3A4A5 4 A FFFFFFFFFFFF");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage:");
+    PrintAndLogEx(NORMAL, "      hf mf hardnested <block number> <key A|B> <key (12 hex symbols)>");
+    PrintAndLogEx(NORMAL, "                       <target block number> <target key A|B> [known target key (12 hex symbols)] [w] [s]");
+    PrintAndLogEx(NORMAL, "  or  hf mf hardnested r [known target key]");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "      h         this help");
+    PrintAndLogEx(NORMAL, "      w         acquire nonces and UID, and write them to binary file with default name hf-mf-<UID>-nonces.bin");
+    PrintAndLogEx(NORMAL, "      s         slower acquisition (required by some non standard cards)");
+    PrintAndLogEx(NORMAL, "      r         read hf-mf-<UID>-nonces.bin if tag present, otherwise read nonces.bin, then start attack");
+    PrintAndLogEx(NORMAL, "      u <UID>   read/write hf-mf-<UID>-nonces.bin instead of default name");
+    PrintAndLogEx(NORMAL, "      f <name>  read/write <name> instead of default name");
+    PrintAndLogEx(NORMAL, "      t         tests?");
+    PrintAndLogEx(NORMAL, "      i <X>     set type of SIMD instructions. Without this flag programs autodetect it.");
+    PrintAndLogEx(NORMAL, "        i 5   = AVX512");
+    PrintAndLogEx(NORMAL, "        i 2   = AVX2");
+    PrintAndLogEx(NORMAL, "        i a   = AVX");
+    PrintAndLogEx(NORMAL, "        i s   = SSE2");
+    PrintAndLogEx(NORMAL, "        i m   = MMX");
+    PrintAndLogEx(NORMAL, "        i n   = none (use CPU regular instruction set)");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      hf mf hardnested 0 A FFFFFFFFFFFF 4 A");
+    PrintAndLogEx(NORMAL, "      hf mf hardnested 0 A FFFFFFFFFFFF 4 A w");
+    PrintAndLogEx(NORMAL, "      hf mf hardnested 0 A FFFFFFFFFFFF 4 A f nonces.bin w s");
+    PrintAndLogEx(NORMAL, "      hf mf hardnested r");
+    PrintAndLogEx(NORMAL, "      hf mf hardnested r a0a1a2a3a4a5");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Add the known target key to check if it is present in the remaining key space:");
+    PrintAndLogEx(NORMAL, "      hf mf hardnested 0 A A0A1A2A3A4A5 4 A FFFFFFFFFFFF");
+    return 0;
 }
 int usage_hf14_chk(void){
-	PrintAndLogEx(NORMAL, "Usage:  hf mf chk [h] <block number>|<*card memory> <key type (A/B/?)> [t|d] [<key (12 hex symbols)>] [<dic (*.dic)>]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h    this help");
-	PrintAndLogEx(NORMAL, "      *    all sectors based on card memory, other values then below defaults to 1k");
-	PrintAndLogEx(NORMAL, "      			0 - MINI(320 bytes)");
-	PrintAndLogEx(NORMAL, "      			1 - 1K");
-	PrintAndLogEx(NORMAL, "      			2 - 2K");
-	PrintAndLogEx(NORMAL, "      			4 - 4K");
-	PrintAndLogEx(NORMAL, "      d    write keys to binary file");
-	PrintAndLogEx(NORMAL, "      t    write keys to emulator memory\n");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      hf mf chk 0 A 1234567890ab keys.dic     -- target block 0, Key A");
-	PrintAndLogEx(NORMAL, "      hf mf chk *1 ? t                        -- target all blocks, all keys, 1K, write to emul");
-	PrintAndLogEx(NORMAL, "      hf mf chk *1 ? d                        -- target all blocks, all keys, 1K, write to file");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage:  hf mf chk [h] <block number>|<*card memory> <key type (A/B/?)> [t|d] [<key (12 hex symbols)>] [<dic (*.dic)>]");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "      h    this help");
+    PrintAndLogEx(NORMAL, "      *    all sectors based on card memory, other values then below defaults to 1k");
+    PrintAndLogEx(NORMAL, "                0 - MINI(320 bytes)");
+    PrintAndLogEx(NORMAL, "                1 - 1K");
+    PrintAndLogEx(NORMAL, "                2 - 2K");
+    PrintAndLogEx(NORMAL, "                4 - 4K");
+    PrintAndLogEx(NORMAL, "      d    write keys to binary file");
+    PrintAndLogEx(NORMAL, "      t    write keys to emulator memory\n");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      hf mf chk 0 A 1234567890ab keys.dic     -- target block 0, Key A");
+    PrintAndLogEx(NORMAL, "      hf mf chk *1 ? t                        -- target all blocks, all keys, 1K, write to emul");
+    PrintAndLogEx(NORMAL, "      hf mf chk *1 ? d                        -- target all blocks, all keys, 1K, write to file");
+    return 0;
 }
 int usage_hf14_chk_fast(void){
-	PrintAndLogEx(NORMAL, "This is a improved checkkeys method speedwise. It checks Mifare Classic tags sector keys against a dictionary file with keys");
-	PrintAndLogEx(NORMAL, "Usage:  hf mf fchk [h] <card memory> [t|d|f] [<key (12 hex symbols)>] [<dic (*.dic)>]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h    this help");
-	PrintAndLogEx(NORMAL, "      <cardmem> all sectors based on card memory, other values than below defaults to 1k");
-	PrintAndLogEx(NORMAL, "      			 0 - MINI(320 bytes)");
-	PrintAndLogEx(NORMAL, "      			 1 - 1K   <default>");
-	PrintAndLogEx(NORMAL, "      			 2 - 2K");
-	PrintAndLogEx(NORMAL, "      			 4 - 4K");
-	PrintAndLogEx(NORMAL, "      d    write keys to binary file");
-	PrintAndLogEx(NORMAL, "      t    write keys to emulator memory");
-	PrintAndLogEx(NORMAL, "      m    use dictionary from flashmemory\n");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      hf mf fchk 1 1234567890ab keys.dic    -- target 1K using key 1234567890ab, using dictionary file");
-	PrintAndLogEx(NORMAL, "      hf mf fchk 1 t                        -- target 1K, write to emulator memory");
-	PrintAndLogEx(NORMAL, "      hf mf fchk 1 d                        -- target 1K, write to file");
+    PrintAndLogEx(NORMAL, "This is a improved checkkeys method speedwise. It checks Mifare Classic tags sector keys against a dictionary file with keys");
+    PrintAndLogEx(NORMAL, "Usage:  hf mf fchk [h] <card memory> [t|d|f] [<key (12 hex symbols)>] [<dic (*.dic)>]");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "      h    this help");
+    PrintAndLogEx(NORMAL, "      <cardmem> all sectors based on card memory, other values than below defaults to 1k");
+    PrintAndLogEx(NORMAL, "                 0 - MINI(320 bytes)");
+    PrintAndLogEx(NORMAL, "                 1 - 1K   <default>");
+    PrintAndLogEx(NORMAL, "                 2 - 2K");
+    PrintAndLogEx(NORMAL, "                 4 - 4K");
+    PrintAndLogEx(NORMAL, "      d    write keys to binary file");
+    PrintAndLogEx(NORMAL, "      t    write keys to emulator memory");
+    PrintAndLogEx(NORMAL, "      m    use dictionary from flashmemory\n");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      hf mf fchk 1 1234567890ab keys.dic    -- target 1K using key 1234567890ab, using dictionary file");
+    PrintAndLogEx(NORMAL, "      hf mf fchk 1 t                        -- target 1K, write to emulator memory");
+    PrintAndLogEx(NORMAL, "      hf mf fchk 1 d                        -- target 1K, write to file");
 #ifdef WITH_FLASH
-	PrintAndLogEx(NORMAL, "      hf mf fchk 1 m                        -- target 1K, use dictionary from flashmemory");
+    PrintAndLogEx(NORMAL, "      hf mf fchk 1 m                        -- target 1K, use dictionary from flashmemory");
 #endif
-	return 0;
+    return 0;
 }
 int usage_hf14_keybrute(void){
-	PrintAndLogEx(NORMAL, "J_Run's 2nd phase of multiple sector nested authentication key recovery");
-	PrintAndLogEx(NORMAL, "You have a known 4 last bytes of a key recovered with mf_nonce_brute tool.");
-	PrintAndLogEx(NORMAL, "First 2 bytes of key will be bruteforced");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, " ---[ This attack is obsolete,  try hardnested instead ]---");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  hf mf keybrute [h] <block number> <A|B> <key>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h               this help");
-	PrintAndLogEx(NORMAL, "      <block number>  target block number");
-	PrintAndLogEx(NORMAL, "      <A|B>           target key type");
-	PrintAndLogEx(NORMAL, "      <key>           candidate key from mf_nonce_brute tool");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "           hf mf keybrute 1 A 000011223344");
-	return 0;
+    PrintAndLogEx(NORMAL, "J_Run's 2nd phase of multiple sector nested authentication key recovery");
+    PrintAndLogEx(NORMAL, "You have a known 4 last bytes of a key recovered with mf_nonce_brute tool.");
+    PrintAndLogEx(NORMAL, "First 2 bytes of key will be bruteforced");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, " ---[ This attack is obsolete,  try hardnested instead ]---");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  hf mf keybrute [h] <block number> <A|B> <key>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "      h               this help");
+    PrintAndLogEx(NORMAL, "      <block number>  target block number");
+    PrintAndLogEx(NORMAL, "      <A|B>           target key type");
+    PrintAndLogEx(NORMAL, "      <key>           candidate key from mf_nonce_brute tool");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "           hf mf keybrute 1 A 000011223344");
+    return 0;
 }
 int usage_hf14_restore(void){
-	PrintAndLogEx(NORMAL, "Usage:   hf mf restore [card memory] u <UID> k <name> f <name>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");
-	PrintAndLogEx(NORMAL, "  u <UID>      : uid, try to restore from hf-mf-<UID>-key.bin and hf-mf-<UID>-data.bin");
-	PrintAndLogEx(NORMAL, "  k <name>     : key filename, specific the full filename of key file");
-	PrintAndLogEx(NORMAL, "  f <name>     : data filename, specific the full filename of data file");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "         hf mf restore                            -- read the UID from tag first, then restore from hf-mf-<UID>-key.bin and and hf-mf-<UID>-data.bin");
-	PrintAndLogEx(NORMAL, "         hf mf restore 1 u 12345678               -- restore from hf-mf-12345678-key.bin and hf-mf-12345678-data.bin");
-	PrintAndLogEx(NORMAL, "         hf mf restore 1 u 12345678 k dumpkey.bin -- restore from dumpkey.bin and hf-mf-12345678-data.bin");
-	PrintAndLogEx(NORMAL, "         hf mf restore 4                          -- read the UID from tag with 4K memory first, then restore from hf-mf-<UID>-key.bin and and hf-mf-<UID>-data.bin");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage:   hf mf restore [card memory] u <UID> k <name> f <name>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");
+    PrintAndLogEx(NORMAL, "  u <UID>      : uid, try to restore from hf-mf-<UID>-key.bin and hf-mf-<UID>-data.bin");
+    PrintAndLogEx(NORMAL, "  k <name>     : key filename, specific the full filename of key file");
+    PrintAndLogEx(NORMAL, "  f <name>     : data filename, specific the full filename of data file");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "         hf mf restore                            -- read the UID from tag first, then restore from hf-mf-<UID>-key.bin and and hf-mf-<UID>-data.bin");
+    PrintAndLogEx(NORMAL, "         hf mf restore 1 u 12345678               -- restore from hf-mf-12345678-key.bin and hf-mf-12345678-data.bin");
+    PrintAndLogEx(NORMAL, "         hf mf restore 1 u 12345678 k dumpkey.bin -- restore from dumpkey.bin and hf-mf-12345678-data.bin");
+    PrintAndLogEx(NORMAL, "         hf mf restore 4                          -- read the UID from tag with 4K memory first, then restore from hf-mf-<UID>-key.bin and and hf-mf-<UID>-data.bin");
+    return 0;
 }
 int usage_hf14_decryptbytes(void){
-	PrintAndLogEx(NORMAL, "Decrypt Crypto-1 encrypted bytes given some known state of crypto. See tracelog to gather needed values\n");
-	PrintAndLogEx(NORMAL, "Usage:   hf mf decrypt [h] <nt> <ar_enc> <at_enc> <data>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h            this help");
-	PrintAndLogEx(NORMAL, "      <nt>         reader nonce");
-	PrintAndLogEx(NORMAL, "      <ar_enc>     encrypted reader response");
-	PrintAndLogEx(NORMAL, "      <at_enc>     encrypted tag response");
-	PrintAndLogEx(NORMAL, "      <data>       encrypted data, taken directly after at_enc and forward");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "         hf mf decrypt b830049b 9248314a 9280e203 41e586f9\n");
-	PrintAndLogEx(NORMAL, "  this sample decrypts 41e586f9 -> 3003999a  Annotated: 30 03 [99 9a]  auth block 3 [crc]");
-	return 0;
+    PrintAndLogEx(NORMAL, "Decrypt Crypto-1 encrypted bytes given some known state of crypto. See tracelog to gather needed values\n");
+    PrintAndLogEx(NORMAL, "Usage:   hf mf decrypt [h] <nt> <ar_enc> <at_enc> <data>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "      h            this help");
+    PrintAndLogEx(NORMAL, "      <nt>         reader nonce");
+    PrintAndLogEx(NORMAL, "      <ar_enc>     encrypted reader response");
+    PrintAndLogEx(NORMAL, "      <at_enc>     encrypted tag response");
+    PrintAndLogEx(NORMAL, "      <data>       encrypted data, taken directly after at_enc and forward");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "         hf mf decrypt b830049b 9248314a 9280e203 41e586f9\n");
+    PrintAndLogEx(NORMAL, "  this sample decrypts 41e586f9 -> 3003999a  Annotated: 30 03 [99 9a]  auth block 3 [crc]");
+    return 0;
 }
 
 int usage_hf14_eget(void){
-	PrintAndLogEx(NORMAL, "Usage:  hf mf eget <block number>");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        hf mf eget 0 ");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage:  hf mf eget <block number>");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "        hf mf eget 0 ");
+    return 0;
 }
 int usage_hf14_eclr(void){
-	PrintAndLogEx(NORMAL, "It set card emulator memory to empty data blocks and key A/B FFFFFFFFFFFF \n");
-	PrintAndLogEx(NORMAL, "Usage:  hf mf eclr");
-	return 0;
+    PrintAndLogEx(NORMAL, "It set card emulator memory to empty data blocks and key A/B FFFFFFFFFFFF \n");
+    PrintAndLogEx(NORMAL, "Usage:  hf mf eclr");
+    return 0;
 }
 int usage_hf14_eset(void){
-	PrintAndLogEx(NORMAL, "Usage:  hf mf eset <block number> <block data (32 hex symbols)>");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        hf mf eset 1 000102030405060708090a0b0c0d0e0f ");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage:  hf mf eset <block number> <block data (32 hex symbols)>");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "        hf mf eset 1 000102030405060708090a0b0c0d0e0f ");
+    return 0;
 }
 int usage_hf14_eload(void){
-	PrintAndLogEx(NORMAL, "It loads emul dump from the file `filename.eml`");
-	PrintAndLogEx(NORMAL, "Usage:  hf mf eload [card memory] <file name w/o `.eml`> [numblocks]");
-	PrintAndLogEx(NORMAL, "  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K, u = UL");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        hf mf eload filename");
-	PrintAndLogEx(NORMAL, "        hf mf eload 4 filename");
-	return 0;
+    PrintAndLogEx(NORMAL, "It loads emul dump from the file `filename.eml`");
+    PrintAndLogEx(NORMAL, "Usage:  hf mf eload [card memory] <file name w/o `.eml`> [numblocks]");
+    PrintAndLogEx(NORMAL, "  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K, u = UL");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "        hf mf eload filename");
+    PrintAndLogEx(NORMAL, "        hf mf eload 4 filename");
+    return 0;
 }
 int usage_hf14_esave(void){
-	PrintAndLogEx(NORMAL, "It saves emul dump into the file `filename.eml` or `cardID.eml`");
-	PrintAndLogEx(NORMAL, " Usage:  hf mf esave [card memory] [file name w/o `.eml`]");
-	PrintAndLogEx(NORMAL, "  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        hf mf esave ");
-	PrintAndLogEx(NORMAL, "        hf mf esave 4");
-	PrintAndLogEx(NORMAL, "        hf mf esave 4 filename");
-	return 0;
+    PrintAndLogEx(NORMAL, "It saves emul dump into the file `filename.eml` or `cardID.eml`");
+    PrintAndLogEx(NORMAL, " Usage:  hf mf esave [card memory] [file name w/o `.eml`]");
+    PrintAndLogEx(NORMAL, "  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "        hf mf esave ");
+    PrintAndLogEx(NORMAL, "        hf mf esave 4");
+    PrintAndLogEx(NORMAL, "        hf mf esave 4 filename");
+    return 0;
 }
 int usage_hf14_ecfill(void){
-	PrintAndLogEx(NORMAL, "Read card and transfer its data to emulator memory.");
-	PrintAndLogEx(NORMAL, "Keys must be laid in the emulator memory. \n");
-	PrintAndLogEx(NORMAL, "Usage:  hf mf ecfill <key A/B> [card memory]");
-	PrintAndLogEx(NORMAL, "  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        hf mf ecfill A");
-	PrintAndLogEx(NORMAL, "        hf mf ecfill A 4");
-	return 0;
+    PrintAndLogEx(NORMAL, "Read card and transfer its data to emulator memory.");
+    PrintAndLogEx(NORMAL, "Keys must be laid in the emulator memory. \n");
+    PrintAndLogEx(NORMAL, "Usage:  hf mf ecfill <key A/B> [card memory]");
+    PrintAndLogEx(NORMAL, "  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "        hf mf ecfill A");
+    PrintAndLogEx(NORMAL, "        hf mf ecfill A 4");
+    return 0;
 }
 int usage_hf14_ekeyprn(void){
-	PrintAndLogEx(NORMAL, "It prints the keys loaded in the emulator memory");
-	PrintAndLogEx(NORMAL, "Usage:  hf mf ekeyprn [card memory]");
-	PrintAndLogEx(NORMAL, "  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        hf mf ekeyprn 1");
-	return 0;
+    PrintAndLogEx(NORMAL, "It prints the keys loaded in the emulator memory");
+    PrintAndLogEx(NORMAL, "Usage:  hf mf ekeyprn [card memory]");
+    PrintAndLogEx(NORMAL, "  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "        hf mf ekeyprn 1");
+    return 0;
 }
 
 int usage_hf14_csetuid(void){
-	PrintAndLogEx(NORMAL, "Set UID, ATQA, and SAK for magic Chinese card. Only works with magic cards");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  hf mf csetuid [h] <UID 8 hex symbols> [ATQA 4 hex symbols] [SAK 2 hex symbols] [w]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h        this help");
-	PrintAndLogEx(NORMAL, "       w        wipe card before writing");
-	PrintAndLogEx(NORMAL, "       <uid>    UID 8 hex symbols");
-	PrintAndLogEx(NORMAL, "       <atqa>   ATQA 4 hex symbols");
-	PrintAndLogEx(NORMAL, "       <sak>    SAK 2 hex symbols");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      hf mf csetuid 01020304");
-	PrintAndLogEx(NORMAL, "      hf mf csetuid 01020304 0004 08 w");
-	return 0;
+    PrintAndLogEx(NORMAL, "Set UID, ATQA, and SAK for magic Chinese card. Only works with magic cards");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  hf mf csetuid [h] <UID 8 hex symbols> [ATQA 4 hex symbols] [SAK 2 hex symbols] [w]");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h        this help");
+    PrintAndLogEx(NORMAL, "       w        wipe card before writing");
+    PrintAndLogEx(NORMAL, "       <uid>    UID 8 hex symbols");
+    PrintAndLogEx(NORMAL, "       <atqa>   ATQA 4 hex symbols");
+    PrintAndLogEx(NORMAL, "       <sak>    SAK 2 hex symbols");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      hf mf csetuid 01020304");
+    PrintAndLogEx(NORMAL, "      hf mf csetuid 01020304 0004 08 w");
+    return 0;
 }
 int usage_hf14_csetblk(void){
-	PrintAndLogEx(NORMAL, "Set block data for magic Chinese card. Only works with magic cards");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  hf mf csetblk [h] <block number> <block data (32 hex symbols)> [w]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h         this help");
-	PrintAndLogEx(NORMAL, "       w         wipe card before writing");
-	PrintAndLogEx(NORMAL, "       <block>   block number");
-	PrintAndLogEx(NORMAL, "       <data>    block data to write (32 hex symbols)");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "       hf mf csetblk 1 01020304050607080910111213141516");
-	PrintAndLogEx(NORMAL, "       hf mf csetblk 1 01020304050607080910111213141516 w");
-	return 0;
+    PrintAndLogEx(NORMAL, "Set block data for magic Chinese card. Only works with magic cards");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  hf mf csetblk [h] <block number> <block data (32 hex symbols)> [w]");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h         this help");
+    PrintAndLogEx(NORMAL, "       w         wipe card before writing");
+    PrintAndLogEx(NORMAL, "       <block>   block number");
+    PrintAndLogEx(NORMAL, "       <data>    block data to write (32 hex symbols)");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "       hf mf csetblk 1 01020304050607080910111213141516");
+    PrintAndLogEx(NORMAL, "       hf mf csetblk 1 01020304050607080910111213141516 w");
+    return 0;
 }
 int usage_hf14_cload(void){
-	PrintAndLogEx(NORMAL, "It loads magic Chinese card from the file `filename.eml`");
-	PrintAndLogEx(NORMAL, "or from emulator memory");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  hf mf cload [h] [e] <file name w/o `.eml`>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h            this help");
-	PrintAndLogEx(NORMAL, "       e            load card with data from emulator memory");
-	PrintAndLogEx(NORMAL, "       j <filename> load card with data from json file");
-	PrintAndLogEx(NORMAL, "       b <filename> load card with data from binary file");
-	PrintAndLogEx(NORMAL, "       <filename>   load card with data from eml file");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "       hf mf cload mydump");
-	PrintAndLogEx(NORMAL, "       hf mf cload e");
-	return 0;
+    PrintAndLogEx(NORMAL, "It loads magic Chinese card from the file `filename.eml`");
+    PrintAndLogEx(NORMAL, "or from emulator memory");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  hf mf cload [h] [e] <file name w/o `.eml`>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h            this help");
+    PrintAndLogEx(NORMAL, "       e            load card with data from emulator memory");
+    PrintAndLogEx(NORMAL, "       j <filename> load card with data from json file");
+    PrintAndLogEx(NORMAL, "       b <filename> load card with data from binary file");
+    PrintAndLogEx(NORMAL, "       <filename>   load card with data from eml file");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "       hf mf cload mydump");
+    PrintAndLogEx(NORMAL, "       hf mf cload e");
+    return 0;
 }
 int usage_hf14_cgetblk(void){
-	PrintAndLogEx(NORMAL, "Get block data from magic Chinese card. Only works with magic cards\n");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  hf mf cgetblk [h] <block number>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h         this help");
-	PrintAndLogEx(NORMAL, "      <block>   block number");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      hf mf cgetblk 1");
-	return 0;
+    PrintAndLogEx(NORMAL, "Get block data from magic Chinese card. Only works with magic cards\n");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  hf mf cgetblk [h] <block number>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "      h         this help");
+    PrintAndLogEx(NORMAL, "      <block>   block number");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      hf mf cgetblk 1");
+    return 0;
 }
 int usage_hf14_cgetsc(void){
-	PrintAndLogEx(NORMAL, "Get sector data from magic Chinese card. Only works with magic cards\n");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  hf mf cgetsc [h] <sector number>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h          this help");
-	PrintAndLogEx(NORMAL, "      <sector>   sector number");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      hf mf cgetsc 0");
-	return 0;
+    PrintAndLogEx(NORMAL, "Get sector data from magic Chinese card. Only works with magic cards\n");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  hf mf cgetsc [h] <sector number>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "      h          this help");
+    PrintAndLogEx(NORMAL, "      <sector>   sector number");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      hf mf cgetsc 0");
+    return 0;
 }
 int usage_hf14_csave(void){
-	PrintAndLogEx(NORMAL, "It saves `magic Chinese` card dump into the file `filename.eml` or `cardID.eml`");
-	PrintAndLogEx(NORMAL, "or into emulator memory");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  hf mf csave [h] [e] [u] [card memory] i <file name w/o `.eml`>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h             this help");
-	PrintAndLogEx(NORMAL, "       e             save data to emulator memory");
-	PrintAndLogEx(NORMAL, "       u             save data to file, use carduid as filename");
-	PrintAndLogEx(NORMAL, "       card memory   0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");
-	PrintAndLogEx(NORMAL, "       o <filename>  save data to file");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "       hf mf csave u 1");
-	PrintAndLogEx(NORMAL, "       hf mf csave e 1");
-	PrintAndLogEx(NORMAL, "       hf mf csave 4 o filename");
-	return 0;
+    PrintAndLogEx(NORMAL, "It saves `magic Chinese` card dump into the file `filename.eml` or `cardID.eml`");
+    PrintAndLogEx(NORMAL, "or into emulator memory");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  hf mf csave [h] [e] [u] [card memory] i <file name w/o `.eml`>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h             this help");
+    PrintAndLogEx(NORMAL, "       e             save data to emulator memory");
+    PrintAndLogEx(NORMAL, "       u             save data to file, use carduid as filename");
+    PrintAndLogEx(NORMAL, "       card memory   0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");
+    PrintAndLogEx(NORMAL, "       o <filename>  save data to file");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "       hf mf csave u 1");
+    PrintAndLogEx(NORMAL, "       hf mf csave e 1");
+    PrintAndLogEx(NORMAL, "       hf mf csave 4 o filename");
+    return 0;
 }
 int usage_hf14_nack(void) {
-	PrintAndLogEx(NORMAL, "Test a mifare classic based card for the NACK bug.");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  hf mf nack [h] [v]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h             this help");
-	PrintAndLogEx(NORMAL, "       v             verbose");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "       hf mf nack");
-	return 0;
+    PrintAndLogEx(NORMAL, "Test a mifare classic based card for the NACK bug.");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  hf mf nack [h] [v]");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h             this help");
+    PrintAndLogEx(NORMAL, "       v             verbose");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "       hf mf nack");
+    return 0;
 }
 
 int GetHFMF14AUID(uint8_t *uid, int *uidlen) {
-	UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT, 0, 0}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	UsbCommand resp;
-	if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
-		PrintAndLogEx(WARNING, "iso14443a card select failed");
-		DropField();
-		return 0;
-	}
+    UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT, 0, 0}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    UsbCommand resp;
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
+        PrintAndLogEx(WARNING, "iso14443a card select failed");
+        DropField();
+        return 0;
+    }
 
-	iso14a_card_select_t card;
-	memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
-	memcpy(uid, card.uid, card.uidlen * sizeof(uint8_t));
-	*uidlen = card.uidlen;
-	return 1;
+    iso14a_card_select_t card;
+    memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
+    memcpy(uid, card.uid, card.uidlen * sizeof(uint8_t));
+    *uidlen = card.uidlen;
+    return 1;
 }
 
 char * GenerateFilename(const char *prefix, const char *suffix){
-	uint8_t uid[10] = {0,0,0,0,0,0,0,0,0,0};
-	int uidlen=0;
-	char * fptr = calloc (sizeof (char) * (strlen(prefix) + strlen(suffix)) + sizeof(uid)*2 + 1,  sizeof(uint8_t));
+    uint8_t uid[10] = {0,0,0,0,0,0,0,0,0,0};
+    int uidlen=0;
+    char * fptr = calloc (sizeof (char) * (strlen(prefix) + strlen(suffix)) + sizeof(uid)*2 + 1,  sizeof(uint8_t));
 
-	GetHFMF14AUID(uid, &uidlen);
-	if (!uidlen) {
-		PrintAndLogEx(WARNING, "No tag found.");
-		free(fptr);
-		return NULL;
-	}
+    GetHFMF14AUID(uid, &uidlen);
+    if (!uidlen) {
+        PrintAndLogEx(WARNING, "No tag found.");
+        free(fptr);
+        return NULL;
+    }
 
-	strcpy(fptr, prefix);
-	FillFileNameByUID(fptr, uid, suffix, uidlen);
-	return fptr;
+    strcpy(fptr, prefix);
+    FillFileNameByUID(fptr, uid, suffix, uidlen);
+    return fptr;
 }
 
 int CmdHF14AMfDarkside(const char *Cmd) {
-	uint8_t blockno = 0, key_type = MIFARE_AUTH_KEYA;
-	uint64_t key = 0;
+    uint8_t blockno = 0, key_type = MIFARE_AUTH_KEYA;
+    uint64_t key = 0;
 
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if ( cmdp == 'h' ) return usage_hf14_mifare();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if ( cmdp == 'h' ) return usage_hf14_mifare();
 
-	blockno = param_get8(Cmd, 0);
+    blockno = param_get8(Cmd, 0);
 
-	cmdp = tolower(param_getchar(Cmd, 1));
-	if (cmdp == 'b')
-		key_type = MIFARE_AUTH_KEYB;
+    cmdp = tolower(param_getchar(Cmd, 1));
+    if (cmdp == 'b')
+        key_type = MIFARE_AUTH_KEYB;
 
-	int isOK = mfDarkside(blockno, key_type, &key);
-	PrintAndLogEx(NORMAL, "");
-	switch (isOK) {
-		case -1 : PrintAndLogEx(WARNING, "button pressed. Aborted."); return 1;
-		case -2 : PrintAndLogEx(FAILED, "card is not vulnerable to Darkside attack (doesn't send NACK on authentication requests)."); return 1;
-		case -3 : PrintAndLogEx(FAILED, "card is not vulnerable to Darkside attack (its random number generator is not predictable)."); return 1;
-		case -4 : PrintAndLogEx(FAILED, "card is not vulnerable to Darkside attack (its random number generator seems to be based on the wellknown");
-				  PrintAndLogEx(FAILED, "generating polynomial with 16 effective bits only, but shows unexpected behaviour."); return 1;
-		case -5 : PrintAndLogEx(WARNING, "aborted via keyboard.");  return 1;
-		default : PrintAndLogEx(SUCCESS, "found valid key: %012" PRIx64 "\n", key); break;
-	}
-	PrintAndLogEx(NORMAL, "");
-	return 0;
+    int isOK = mfDarkside(blockno, key_type, &key);
+    PrintAndLogEx(NORMAL, "");
+    switch (isOK) {
+        case -1 : PrintAndLogEx(WARNING, "button pressed. Aborted."); return 1;
+        case -2 : PrintAndLogEx(FAILED, "card is not vulnerable to Darkside attack (doesn't send NACK on authentication requests)."); return 1;
+        case -3 : PrintAndLogEx(FAILED, "card is not vulnerable to Darkside attack (its random number generator is not predictable)."); return 1;
+        case -4 : PrintAndLogEx(FAILED, "card is not vulnerable to Darkside attack (its random number generator seems to be based on the wellknown");
+                  PrintAndLogEx(FAILED, "generating polynomial with 16 effective bits only, but shows unexpected behaviour."); return 1;
+        case -5 : PrintAndLogEx(WARNING, "aborted via keyboard.");  return 1;
+        default : PrintAndLogEx(SUCCESS, "found valid key: %012" PRIx64 "\n", key); break;
+    }
+    PrintAndLogEx(NORMAL, "");
+    return 0;
 }
 
 int CmdHF14AMfWrBl(const char *Cmd) {
-	uint8_t blockNo = 0;
-	uint8_t keyType = 0;
-	uint8_t key[6] = {0, 0, 0, 0, 0, 0};
-	uint8_t bldata[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-	char cmdp	= 0x00;
+    uint8_t blockNo = 0;
+    uint8_t keyType = 0;
+    uint8_t key[6] = {0, 0, 0, 0, 0, 0};
+    uint8_t bldata[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+    char cmdp = 0x00;
 
-	if (strlen(Cmd) < 3) {
-		PrintAndLogEx(NORMAL, "Usage:  hf mf wrbl    <block number> <key A/B> <key (12 hex symbols)> <block data (32 hex symbols)>");
-		PrintAndLogEx(NORMAL, "Examples:");
-		PrintAndLogEx(NORMAL, "        hf mf wrbl 0 A FFFFFFFFFFFF 000102030405060708090A0B0C0D0E0F");
-		return 0;
-	}
+    if (strlen(Cmd) < 3) {
+        PrintAndLogEx(NORMAL, "Usage:  hf mf wrbl    <block number> <key A/B> <key (12 hex symbols)> <block data (32 hex symbols)>");
+        PrintAndLogEx(NORMAL, "Examples:");
+        PrintAndLogEx(NORMAL, "        hf mf wrbl 0 A FFFFFFFFFFFF 000102030405060708090A0B0C0D0E0F");
+        return 0;
+    }
 
-	blockNo = param_get8(Cmd, 0);
-	cmdp = tolower(param_getchar(Cmd, 1));
-	if (cmdp == 0x00) {
-		PrintAndLogEx(NORMAL, "Key type must be A or B");
-		return 1;
-	}
+    blockNo = param_get8(Cmd, 0);
+    cmdp = tolower(param_getchar(Cmd, 1));
+    if (cmdp == 0x00) {
+        PrintAndLogEx(NORMAL, "Key type must be A or B");
+        return 1;
+    }
 
-	if (cmdp != 'a')
-		keyType = 1;
+    if (cmdp != 'a')
+        keyType = 1;
 
-	if (param_gethex(Cmd, 2, key, 12)) {
-		PrintAndLogEx(NORMAL, "Key must include 12 HEX symbols");
-		return 1;
-	}
+    if (param_gethex(Cmd, 2, key, 12)) {
+        PrintAndLogEx(NORMAL, "Key must include 12 HEX symbols");
+        return 1;
+    }
 
-	if (param_gethex(Cmd, 3, bldata, 32)) {
-		PrintAndLogEx(NORMAL, "Block data must include 32 HEX symbols");
-		return 1;
-	}
+    if (param_gethex(Cmd, 3, bldata, 32)) {
+        PrintAndLogEx(NORMAL, "Block data must include 32 HEX symbols");
+        return 1;
+    }
 
-	PrintAndLogEx(NORMAL, "--block no:%d, key type:%c, key:%s", blockNo, keyType?'B':'A', sprint_hex(key, 6));
-	PrintAndLogEx(NORMAL, "--data: %s", sprint_hex(bldata, 16));
+    PrintAndLogEx(NORMAL, "--block no:%d, key type:%c, key:%s", blockNo, keyType?'B':'A', sprint_hex(key, 6));
+    PrintAndLogEx(NORMAL, "--data: %s", sprint_hex(bldata, 16));
 
-	UsbCommand c = {CMD_MIFARE_WRITEBL, {blockNo, keyType, 0}};
-	memcpy(c.d.asBytes, key, 6);
-	memcpy(c.d.asBytes + 10, bldata, 16);
-	clearCommandBuffer();
-	SendCommand(&c);
+    UsbCommand c = {CMD_MIFARE_WRITEBL, {blockNo, keyType, 0}};
+    memcpy(c.d.asBytes, key, 6);
+    memcpy(c.d.asBytes + 10, bldata, 16);
+    clearCommandBuffer();
+    SendCommand(&c);
 
-	UsbCommand resp;
-	if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-		uint8_t isOK  = resp.arg[0] & 0xff;
-		PrintAndLogEx(NORMAL, "isOk:%02x", isOK);
-	} else {
-		PrintAndLogEx(NORMAL, "Command execute timeout");
-	}
+    UsbCommand resp;
+    if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
+        uint8_t isOK  = resp.arg[0] & 0xff;
+        PrintAndLogEx(NORMAL, "isOk:%02x", isOK);
+    } else {
+        PrintAndLogEx(NORMAL, "Command execute timeout");
+    }
 
-	return 0;
+    return 0;
 }
 
 int CmdHF14AMfRdBl(const char *Cmd) {
-	uint8_t blockNo = 0;
-	uint8_t keyType = 0;
-	uint8_t key[6] = {0, 0, 0, 0, 0, 0};
-	char cmdp = 0x00;
+    uint8_t blockNo = 0;
+    uint8_t keyType = 0;
+    uint8_t key[6] = {0, 0, 0, 0, 0, 0};
+    char cmdp = 0x00;
 
-	if (strlen(Cmd)<3) {
-		PrintAndLogEx(NORMAL, "Usage:  hf mf rdbl    <block number> <key A/B> <key (12 hex symbols)>");
-		PrintAndLogEx(NORMAL, "Examples:");
-		PrintAndLogEx(NORMAL, "        hf mf rdbl 0 A FFFFFFFFFFFF ");
-		return 0;
-	}
+    if (strlen(Cmd)<3) {
+        PrintAndLogEx(NORMAL, "Usage:  hf mf rdbl    <block number> <key A/B> <key (12 hex symbols)>");
+        PrintAndLogEx(NORMAL, "Examples:");
+        PrintAndLogEx(NORMAL, "        hf mf rdbl 0 A FFFFFFFFFFFF ");
+        return 0;
+    }
 
-	blockNo = param_get8(Cmd, 0);
-	cmdp = tolower(param_getchar(Cmd, 1));
-	if (cmdp == 0x00) {
-		PrintAndLogEx(NORMAL, "Key type must be A or B");
-		return 1;
-	}
+    blockNo = param_get8(Cmd, 0);
+    cmdp = tolower(param_getchar(Cmd, 1));
+    if (cmdp == 0x00) {
+        PrintAndLogEx(NORMAL, "Key type must be A or B");
+        return 1;
+    }
 
-	if (cmdp != 'a')
-		keyType = 1;
+    if (cmdp != 'a')
+        keyType = 1;
 
-	if (param_gethex(Cmd, 2, key, 12)) {
-		PrintAndLogEx(NORMAL, "Key must include 12 HEX symbols");
-		return 1;
-	}
-	PrintAndLogEx(NORMAL, "--block no:%d, key type:%c, key:%s ", blockNo, keyType?'B':'A', sprint_hex(key, 6));
+    if (param_gethex(Cmd, 2, key, 12)) {
+        PrintAndLogEx(NORMAL, "Key must include 12 HEX symbols");
+        return 1;
+    }
+    PrintAndLogEx(NORMAL, "--block no:%d, key type:%c, key:%s ", blockNo, keyType?'B':'A', sprint_hex(key, 6));
 
-	UsbCommand c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}};
-	memcpy(c.d.asBytes, key, 6);
-	clearCommandBuffer();
-	SendCommand(&c);
+    UsbCommand c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}};
+    memcpy(c.d.asBytes, key, 6);
+    clearCommandBuffer();
+    SendCommand(&c);
 
-	UsbCommand resp;
-	if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-		uint8_t isOK  = resp.arg[0] & 0xff;
-		uint8_t *data = resp.d.asBytes;
+    UsbCommand resp;
+    if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
+        uint8_t isOK  = resp.arg[0] & 0xff;
+        uint8_t *data = resp.d.asBytes;
 
-		if (isOK) {
-			PrintAndLogEx(NORMAL, "isOk:%02x data:%s", isOK, sprint_hex(data, 16));
-		} else {
-			PrintAndLogEx(NORMAL, "isOk:%02x", isOK);
-			return 1;
-		}
+        if (isOK) {
+            PrintAndLogEx(NORMAL, "isOk:%02x data:%s", isOK, sprint_hex(data, 16));
+        } else {
+            PrintAndLogEx(NORMAL, "isOk:%02x", isOK);
+            return 1;
+        }
 
-		if (mfIsSectorTrailer(blockNo) && (data[6] || data[7] || data[8])) {
-			PrintAndLogEx(NORMAL, "Trailer decoded:");
-			int bln = mfFirstBlockOfSector(mfSectorNum(blockNo));
-			int blinc = (mfNumBlocksPerSector(mfSectorNum(blockNo)) > 4) ? 5 : 1;
-			for (int i = 0; i < 4; i++) {
-				PrintAndLogEx(NORMAL, "Access block %d%s: %s", bln, ((blinc > 1) && (i < 3) ? "+" : "") , mfGetAccessConditionsDesc(i, &data[6]));
-				bln += blinc;
-			}
-			PrintAndLogEx(NORMAL, "UserData: %s", sprint_hex_inrow(&data[9], 1));
-		}
-	} else {
-		PrintAndLogEx(WARNING, "Command execute timeout");
-		return 2;
-	}
+        if (mfIsSectorTrailer(blockNo) && (data[6] || data[7] || data[8])) {
+            PrintAndLogEx(NORMAL, "Trailer decoded:");
+            int bln = mfFirstBlockOfSector(mfSectorNum(blockNo));
+            int blinc = (mfNumBlocksPerSector(mfSectorNum(blockNo)) > 4) ? 5 : 1;
+            for (int i = 0; i < 4; i++) {
+                PrintAndLogEx(NORMAL, "Access block %d%s: %s", bln, ((blinc > 1) && (i < 3) ? "+" : "") , mfGetAccessConditionsDesc(i, &data[6]));
+                bln += blinc;
+            }
+            PrintAndLogEx(NORMAL, "UserData: %s", sprint_hex_inrow(&data[9], 1));
+        }
+    } else {
+        PrintAndLogEx(WARNING, "Command execute timeout");
+        return 2;
+    }
 
   return 0;
 }
 
 int CmdHF14AMfRdSc(const char *Cmd) {
-	int i;
-	uint8_t sectorNo = 0;
-	uint8_t keyType = 0;
-	uint8_t key[6] = {0, 0, 0, 0, 0, 0};
-	uint8_t isOK  = 0;
-	uint8_t *data  = NULL;
-	char cmdp	= 0x00;
+    int i;
+    uint8_t sectorNo = 0;
+    uint8_t keyType = 0;
+    uint8_t key[6] = {0, 0, 0, 0, 0, 0};
+    uint8_t isOK  = 0;
+    uint8_t *data  = NULL;
+    char cmdp = 0x00;
 
-	if (strlen(Cmd) < 3) {
-		PrintAndLogEx(NORMAL, "Usage:  hf mf rdsc    <sector number> <key A/B> <key (12 hex symbols)>");
-		PrintAndLogEx(NORMAL, "Examples:");
-		PrintAndLogEx(NORMAL, "        hf mf rdsc 0 A FFFFFFFFFFFF ");
-		return 0;
-	}
+    if (strlen(Cmd) < 3) {
+        PrintAndLogEx(NORMAL, "Usage:  hf mf rdsc    <sector number> <key A/B> <key (12 hex symbols)>");
+        PrintAndLogEx(NORMAL, "Examples:");
+        PrintAndLogEx(NORMAL, "        hf mf rdsc 0 A FFFFFFFFFFFF ");
+        return 0;
+    }
 
-	sectorNo = param_get8(Cmd, 0);
-	if (sectorNo > MIFARE_4K_MAXSECTOR ) {
-		PrintAndLogEx(NORMAL, "Sector number must be less than 40");
-		return 1;
-	}
+    sectorNo = param_get8(Cmd, 0);
+    if (sectorNo > MIFARE_4K_MAXSECTOR ) {
+        PrintAndLogEx(NORMAL, "Sector number must be less than 40");
+        return 1;
+    }
 
-	cmdp = tolower(param_getchar(Cmd, 1));
-	if (cmdp != 'a' && cmdp != 'b') {
-		PrintAndLogEx(NORMAL, "Key type must be A or B");
-		return 1;
-	}
+    cmdp = tolower(param_getchar(Cmd, 1));
+    if (cmdp != 'a' && cmdp != 'b') {
+        PrintAndLogEx(NORMAL, "Key type must be A or B");
+        return 1;
+    }
 
-	if (cmdp != 'a')
-		keyType = 1;
+    if (cmdp != 'a')
+        keyType = 1;
 
-	if (param_gethex(Cmd, 2, key, 12)) {
-		PrintAndLogEx(NORMAL, "Key must include 12 HEX symbols");
-		return 1;
-	}
-	PrintAndLogEx(NORMAL, "--sector no:%d key type:%c key:%s ", sectorNo, keyType?'B':'A', sprint_hex(key, 6));
+    if (param_gethex(Cmd, 2, key, 12)) {
+        PrintAndLogEx(NORMAL, "Key must include 12 HEX symbols");
+        return 1;
+    }
+    PrintAndLogEx(NORMAL, "--sector no:%d key type:%c key:%s ", sectorNo, keyType?'B':'A', sprint_hex(key, 6));
 
-	UsbCommand c = {CMD_MIFARE_READSC, {sectorNo, keyType, 0}};
-	memcpy(c.d.asBytes, key, 6);
-	clearCommandBuffer();
-	SendCommand(&c);
-	PrintAndLogEx(NORMAL, "");
+    UsbCommand c = {CMD_MIFARE_READSC, {sectorNo, keyType, 0}};
+    memcpy(c.d.asBytes, key, 6);
+    clearCommandBuffer();
+    SendCommand(&c);
+    PrintAndLogEx(NORMAL, "");
 
-	UsbCommand resp;
-	if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-		isOK  = resp.arg[0] & 0xff;
-		data  = resp.d.asBytes;
+    UsbCommand resp;
+    if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
+        isOK  = resp.arg[0] & 0xff;
+        data  = resp.d.asBytes;
 
-		PrintAndLogEx(NORMAL, "isOk:%02x", isOK);
-		if (isOK) {
-			for (i = 0; i < (sectorNo<32?3:15); i++) {
-				PrintAndLogEx(NORMAL, "data   : %s", sprint_hex(data + i * 16, 16));
-			}
-			PrintAndLogEx(NORMAL, "trailer: %s", sprint_hex(data + (sectorNo<32?3:15) * 16, 16));
+        PrintAndLogEx(NORMAL, "isOk:%02x", isOK);
+        if (isOK) {
+            for (i = 0; i < (sectorNo<32?3:15); i++) {
+                PrintAndLogEx(NORMAL, "data   : %s", sprint_hex(data + i * 16, 16));
+            }
+            PrintAndLogEx(NORMAL, "trailer: %s", sprint_hex(data + (sectorNo<32?3:15) * 16, 16));
 
-			PrintAndLogEx(NORMAL, "Trailer decoded:");
+            PrintAndLogEx(NORMAL, "Trailer decoded:");
             int bln = mfFirstBlockOfSector(sectorNo);
-			int blinc = (mfNumBlocksPerSector(sectorNo) > 4) ? 5 : 1;
+            int blinc = (mfNumBlocksPerSector(sectorNo) > 4) ? 5 : 1;
             for (i = 0; i < 4; i++) {
                 PrintAndLogEx(NORMAL, "Access block %d%s: %s", bln, ((blinc > 1) && (i < 3) ? "+" : "") , mfGetAccessConditionsDesc(i, &(data + (sectorNo<32?3:15) * 16)[6]));
                 bln += blinc;
             }
             PrintAndLogEx(NORMAL, "UserData: %s", sprint_hex_inrow(&(data + (sectorNo<32?3:15) * 16)[9], 1));
-		}
-	} else {
-		PrintAndLogEx(WARNING, "Command execute timeout");
-	}
+        }
+    } else {
+        PrintAndLogEx(WARNING, "Command execute timeout");
+    }
 
   return 0;
 }
 
 uint16_t NumOfBlocks(char card){
-	switch(card){
-		case '0' : return MIFARE_MINI_MAXBLOCK;
-		case '1' : return MIFARE_1K_MAXBLOCK;
-		case '2' : return MIFARE_2K_MAXBLOCK;
-		case '4' : return MIFARE_4K_MAXBLOCK;
-		default  : return MIFARE_1K_MAXBLOCK;
-	}
+    switch(card){
+        case '0' : return MIFARE_MINI_MAXBLOCK;
+        case '1' : return MIFARE_1K_MAXBLOCK;
+        case '2' : return MIFARE_2K_MAXBLOCK;
+        case '4' : return MIFARE_4K_MAXBLOCK;
+        default  : return MIFARE_1K_MAXBLOCK;
+    }
 }
 uint8_t NumOfSectors(char card){
-	switch(card){
-		case '0' : return MIFARE_MINI_MAXSECTOR;
-		case '1' : return MIFARE_1K_MAXSECTOR;
-		case '2' : return MIFARE_2K_MAXSECTOR;
-		case '4' : return MIFARE_4K_MAXSECTOR;
-		default  : return MIFARE_1K_MAXSECTOR;
-	}
+    switch(card){
+        case '0' : return MIFARE_MINI_MAXSECTOR;
+        case '1' : return MIFARE_1K_MAXSECTOR;
+        case '2' : return MIFARE_2K_MAXSECTOR;
+        case '4' : return MIFARE_4K_MAXSECTOR;
+        default  : return MIFARE_1K_MAXSECTOR;
+    }
 }
 
 uint8_t FirstBlockOfSector(uint8_t sectorNo) {
-	if (sectorNo < 32) {
-		return sectorNo * 4;
-	} else {
-		return 32 * 4 + (sectorNo - 32) * 16;
-	}
+    if (sectorNo < 32) {
+        return sectorNo * 4;
+    } else {
+        return 32 * 4 + (sectorNo - 32) * 16;
+    }
 }
 
 uint8_t NumBlocksPerSector(uint8_t sectorNo) {
-	if (sectorNo < 32) {
-		return 4;
-	} else {
-		return 16;
-	}
+    if (sectorNo < 32) {
+        return 4;
+    } else {
+        return 16;
+    }
 }
 
 int CmdHF14AMfDump(const char *Cmd) {
 
-	uint8_t sectorNo, blockNo;
-	uint8_t keyA[40][6];
-	uint8_t keyB[40][6];
-	uint8_t rights[40][4];
-	uint8_t carddata[256][16];
-	uint8_t numSectors = 16;
-	uint8_t cmdp = 0;
+    uint8_t sectorNo, blockNo;
+    uint8_t keyA[40][6];
+    uint8_t keyB[40][6];
+    uint8_t rights[40][4];
+    uint8_t carddata[256][16];
+    uint8_t numSectors = 16;
+    uint8_t cmdp = 0;
 
-	char keyFilename[FILE_PATH_SIZE] = {0};
-	char dataFilename[FILE_PATH_SIZE];
-	char * fptr;
+    char keyFilename[FILE_PATH_SIZE] = {0};
+    char dataFilename[FILE_PATH_SIZE];
+    char * fptr;
 
-	memset(keyFilename, 0, sizeof(keyFilename));
-	memset(dataFilename, 0, sizeof(dataFilename));
+    memset(keyFilename, 0, sizeof(keyFilename));
+    memset(dataFilename, 0, sizeof(dataFilename));
 
-	FILE *f;
-	UsbCommand resp;
+    FILE *f;
+    UsbCommand resp;
 
-	while(param_getchar(Cmd, cmdp) != 0x00) {
-		switch (tolower(param_getchar(Cmd, cmdp))) {
-		case 'h':
-			return usage_hf14_dump();
-		case 'k':
-			param_getstr(Cmd, cmdp+1, keyFilename, FILE_PATH_SIZE);
-			cmdp += 2;
-			break;
-		case 'f':
-			param_getstr(Cmd, cmdp+1, dataFilename, FILE_PATH_SIZE);
-			cmdp += 2;
-			break;
-		default:
-			if (cmdp == 0) {
-				numSectors = NumOfSectors(param_getchar(Cmd, cmdp));
-				cmdp++;
-			} else {
-				PrintAndLogEx(WARNING, "Unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
-				return usage_hf14_dump();
-			}
-		}
-	}
+    while(param_getchar(Cmd, cmdp) != 0x00) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+        case 'h':
+            return usage_hf14_dump();
+        case 'k':
+            param_getstr(Cmd, cmdp+1, keyFilename, FILE_PATH_SIZE);
+            cmdp += 2;
+            break;
+        case 'f':
+            param_getstr(Cmd, cmdp+1, dataFilename, FILE_PATH_SIZE);
+            cmdp += 2;
+            break;
+        default:
+            if (cmdp == 0) {
+                numSectors = NumOfSectors(param_getchar(Cmd, cmdp));
+                cmdp++;
+            } else {
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
+                return usage_hf14_dump();
+            }
+        }
+    }
 
-	if ( keyFilename[0] == 0x00 ) {
-		fptr = GenerateFilename("hf-mf-", "-key.bin");
-		if (fptr == NULL)
-			return 1;
+    if ( keyFilename[0] == 0x00 ) {
+        fptr = GenerateFilename("hf-mf-", "-key.bin");
+        if (fptr == NULL)
+            return 1;
 
-		strcpy(keyFilename, fptr);
-	}
+        strcpy(keyFilename, fptr);
+    }
 
-	if ((f = fopen(keyFilename, "rb")) == NULL) {
-		PrintAndLogEx(WARNING, "Could not find file " _YELLOW_(%s), keyFilename);
-		return 1;
-	}
+    if ((f = fopen(keyFilename, "rb")) == NULL) {
+        PrintAndLogEx(WARNING, "Could not find file " _YELLOW_(%s), keyFilename);
+        return 1;
+    }
 
-	// Read keys A from file
-	size_t bytes_read;
-	for (sectorNo=0; sectorNo<numSectors; sectorNo++) {
-		bytes_read = fread( keyA[sectorNo], 1, 6, f );
-		if ( bytes_read != 6) {
-			PrintAndLogEx(WARNING, "File reading error.");
-			fclose(f);
-			return 2;
-		}
-	}
+    // Read keys A from file
+    size_t bytes_read;
+    for (sectorNo=0; sectorNo<numSectors; sectorNo++) {
+        bytes_read = fread( keyA[sectorNo], 1, 6, f );
+        if ( bytes_read != 6) {
+            PrintAndLogEx(WARNING, "File reading error.");
+            fclose(f);
+            return 2;
+        }
+    }
 
-	// Read keys B from file
-	for (sectorNo=0; sectorNo<numSectors; sectorNo++) {
-		bytes_read = fread( keyB[sectorNo], 1, 6, f );
-		if ( bytes_read != 6) {
-			PrintAndLogEx(WARNING, "File reading error.");
-			fclose(f);
-			return 2;
-		}
-	}
+    // Read keys B from file
+    for (sectorNo=0; sectorNo<numSectors; sectorNo++) {
+        bytes_read = fread( keyB[sectorNo], 1, 6, f );
+        if ( bytes_read != 6) {
+            PrintAndLogEx(WARNING, "File reading error.");
+            fclose(f);
+            return 2;
+        }
+    }
 
-	fclose(f);
+    fclose(f);
 
 
-	PrintAndLogEx(INFO, "Reading sector access bits...");
+    PrintAndLogEx(INFO, "Reading sector access bits...");
 
-	uint8_t tries = 0;
-	for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
-		for (tries = 0; tries < MIFARE_SECTOR_RETRY; tries++) {
+    uint8_t tries = 0;
+    for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
+        for (tries = 0; tries < MIFARE_SECTOR_RETRY; tries++) {
 
-			UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 0, 0}};
-			memcpy(c.d.asBytes, keyA[sectorNo], 6);
-			clearCommandBuffer();
-			SendCommand(&c);
+            UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 0, 0}};
+            memcpy(c.d.asBytes, keyA[sectorNo], 6);
+            clearCommandBuffer();
+            SendCommand(&c);
 
-			if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-				uint8_t isOK = resp.arg[0] & 0xff;
-				uint8_t *data = resp.d.asBytes;
-				if (isOK){
-					rights[sectorNo][0] = ((data[7] & 0x10) >> 2) | ((data[8] & 0x1) << 1) | ((data[8] & 0x10) >> 4); // C1C2C3 for data area 0
-					rights[sectorNo][1] = ((data[7] & 0x20) >> 3) | ((data[8] & 0x2) << 0) | ((data[8] & 0x20) >> 5); // C1C2C3 for data area 1
-					rights[sectorNo][2] = ((data[7] & 0x40) >> 4) | ((data[8] & 0x4) >> 1) | ((data[8] & 0x40) >> 6); // C1C2C3 for data area 2
-					rights[sectorNo][3] = ((data[7] & 0x80) >> 5) | ((data[8] & 0x8) >> 2) | ((data[8] & 0x80) >> 7); // C1C2C3 for sector trailer
-					break;
-				} else if (tries == 2) { // on last try set defaults
-					PrintAndLogEx(FAILED, "could not get access rights for sector %2d. Trying with defaults...", sectorNo);
-					rights[sectorNo][0] = rights[sectorNo][1] = rights[sectorNo][2] = 0x00;
-					rights[sectorNo][3] = 0x01;
-				}
-			} else {
-				PrintAndLogEx(FAILED, "command execute timeout when trying to read access rights for sector %2d. Trying with defaults...", sectorNo);
-				rights[sectorNo][0] = rights[sectorNo][1] = rights[sectorNo][2] = 0x00;
-				rights[sectorNo][3] = 0x01;
-			}
-		}
-	}
+            if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
+                uint8_t isOK = resp.arg[0] & 0xff;
+                uint8_t *data = resp.d.asBytes;
+                if (isOK){
+                    rights[sectorNo][0] = ((data[7] & 0x10) >> 2) | ((data[8] & 0x1) << 1) | ((data[8] & 0x10) >> 4); // C1C2C3 for data area 0
+                    rights[sectorNo][1] = ((data[7] & 0x20) >> 3) | ((data[8] & 0x2) << 0) | ((data[8] & 0x20) >> 5); // C1C2C3 for data area 1
+                    rights[sectorNo][2] = ((data[7] & 0x40) >> 4) | ((data[8] & 0x4) >> 1) | ((data[8] & 0x40) >> 6); // C1C2C3 for data area 2
+                    rights[sectorNo][3] = ((data[7] & 0x80) >> 5) | ((data[8] & 0x8) >> 2) | ((data[8] & 0x80) >> 7); // C1C2C3 for sector trailer
+                    break;
+                } else if (tries == 2) { // on last try set defaults
+                    PrintAndLogEx(FAILED, "could not get access rights for sector %2d. Trying with defaults...", sectorNo);
+                    rights[sectorNo][0] = rights[sectorNo][1] = rights[sectorNo][2] = 0x00;
+                    rights[sectorNo][3] = 0x01;
+                }
+            } else {
+                PrintAndLogEx(FAILED, "command execute timeout when trying to read access rights for sector %2d. Trying with defaults...", sectorNo);
+                rights[sectorNo][0] = rights[sectorNo][1] = rights[sectorNo][2] = 0x00;
+                rights[sectorNo][3] = 0x01;
+            }
+        }
+    }
 
-	PrintAndLogEx(SUCCESS, "Finished reading sector access bits");
-	PrintAndLogEx(INFO, "Dumping all blocks from card...");
+    PrintAndLogEx(SUCCESS, "Finished reading sector access bits");
+    PrintAndLogEx(INFO, "Dumping all blocks from card...");
 
-	bool isOK = true;
-	for (sectorNo = 0; isOK && sectorNo < numSectors; sectorNo++) {
-		for (blockNo = 0; isOK && blockNo < NumBlocksPerSector(sectorNo); blockNo++) {
-			bool received = false;
+    bool isOK = true;
+    for (sectorNo = 0; isOK && sectorNo < numSectors; sectorNo++) {
+        for (blockNo = 0; isOK && blockNo < NumBlocksPerSector(sectorNo); blockNo++) {
+            bool received = false;
 
-			for (tries = 0; tries < MIFARE_SECTOR_RETRY; tries++) {
-				if (blockNo == NumBlocksPerSector(sectorNo) - 1) {		// sector trailer. At least the Access Conditions can always be read with key A.
-					UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}};
-					memcpy(c.d.asBytes, keyA[sectorNo], 6);
-					clearCommandBuffer();
-					SendCommand(&c);
-					received = WaitForResponseTimeout(CMD_ACK, &resp, 1500);
-				} else {												// data block. Check if it can be read with key A or key B
-					uint8_t data_area = (sectorNo < 32) ? blockNo : blockNo/5;
-					if ((rights[sectorNo][data_area] == 0x03) || (rights[sectorNo][data_area] == 0x05)) {	// only key B would work
-						UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 1, 0}};
-						memcpy(c.d.asBytes, keyB[sectorNo], 6);
-						SendCommand(&c);
-						received = WaitForResponseTimeout(CMD_ACK, &resp, 1500);
-					} else if (rights[sectorNo][data_area] == 0x07) {										// no key would work
-						isOK = false;
-						PrintAndLogEx(WARNING, "access rights do not allow reading of sector %2d block %3d", sectorNo, blockNo);
-						tries = MIFARE_SECTOR_RETRY;
-					} else {																				// key A would work
-						UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}};
-						memcpy(c.d.asBytes, keyA[sectorNo], 6);
-						clearCommandBuffer();
-						SendCommand(&c);
-						received = WaitForResponseTimeout(CMD_ACK, &resp, 1500);
-					}
-				}
-				if (received) {
-					isOK  = resp.arg[0] & 0xff;
-					if (isOK) break;
-				}
-			}
+            for (tries = 0; tries < MIFARE_SECTOR_RETRY; tries++) {
+                if (blockNo == NumBlocksPerSector(sectorNo) - 1) { // sector trailer. At least the Access Conditions can always be read with key A.
+                    UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}};
+                    memcpy(c.d.asBytes, keyA[sectorNo], 6);
+                    clearCommandBuffer();
+                    SendCommand(&c);
+                    received = WaitForResponseTimeout(CMD_ACK, &resp, 1500);
+                } else {                                           // data block. Check if it can be read with key A or key B
+                    uint8_t data_area = (sectorNo < 32) ? blockNo : blockNo/5;
+                    if ((rights[sectorNo][data_area] == 0x03) || (rights[sectorNo][data_area] == 0x05)) { // only key B would work
+                        UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 1, 0}};
+                        memcpy(c.d.asBytes, keyB[sectorNo], 6);
+                        SendCommand(&c);
+                        received = WaitForResponseTimeout(CMD_ACK, &resp, 1500);
+                    } else if (rights[sectorNo][data_area] == 0x07) {                                     // no key would work
+                        isOK = false;
+                        PrintAndLogEx(WARNING, "access rights do not allow reading of sector %2d block %3d", sectorNo, blockNo);
+                        tries = MIFARE_SECTOR_RETRY;
+                    } else {                                                                              // key A would work
+                        UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}};
+                        memcpy(c.d.asBytes, keyA[sectorNo], 6);
+                        clearCommandBuffer();
+                        SendCommand(&c);
+                        received = WaitForResponseTimeout(CMD_ACK, &resp, 1500);
+                    }
+                }
+                if (received) {
+                    isOK  = resp.arg[0] & 0xff;
+                    if (isOK) break;
+                }
+            }
 
-			if (received) {
-				isOK  = resp.arg[0] & 0xff;
-				uint8_t *data  = resp.d.asBytes;
-				if (blockNo == NumBlocksPerSector(sectorNo) - 1) {		// sector trailer. Fill in the keys.
-					data[0]  = (keyA[sectorNo][0]);
-					data[1]  = (keyA[sectorNo][1]);
-					data[2]  = (keyA[sectorNo][2]);
-					data[3]  = (keyA[sectorNo][3]);
-					data[4]  = (keyA[sectorNo][4]);
-					data[5]  = (keyA[sectorNo][5]);
-					data[10] = (keyB[sectorNo][0]);
-					data[11] = (keyB[sectorNo][1]);
-					data[12] = (keyB[sectorNo][2]);
-					data[13] = (keyB[sectorNo][3]);
-					data[14] = (keyB[sectorNo][4]);
-					data[15] = (keyB[sectorNo][5]);
-				}
-				if (isOK) {
-					memcpy(carddata[FirstBlockOfSector(sectorNo) + blockNo], data, 16);
+            if (received) {
+                isOK  = resp.arg[0] & 0xff;
+                uint8_t *data  = resp.d.asBytes;
+                if (blockNo == NumBlocksPerSector(sectorNo) - 1) { // sector trailer. Fill in the keys.
+                    data[0]  = (keyA[sectorNo][0]);
+                    data[1]  = (keyA[sectorNo][1]);
+                    data[2]  = (keyA[sectorNo][2]);
+                    data[3]  = (keyA[sectorNo][3]);
+                    data[4]  = (keyA[sectorNo][4]);
+                    data[5]  = (keyA[sectorNo][5]);
+                    data[10] = (keyB[sectorNo][0]);
+                    data[11] = (keyB[sectorNo][1]);
+                    data[12] = (keyB[sectorNo][2]);
+                    data[13] = (keyB[sectorNo][3]);
+                    data[14] = (keyB[sectorNo][4]);
+                    data[15] = (keyB[sectorNo][5]);
+                }
+                if (isOK) {
+                    memcpy(carddata[FirstBlockOfSector(sectorNo) + blockNo], data, 16);
                     PrintAndLogEx(SUCCESS, "successfully read block %2d of sector %2d.", blockNo, sectorNo);
-				} else {
-					PrintAndLogEx(FAILED, "could not read block %2d of sector %2d", blockNo, sectorNo);
-					break;
-				}
-			}
-			else {
-				isOK = false;
-				PrintAndLogEx(WARNING, "command execute timeout when trying to read block %2d of sector %2d.", blockNo, sectorNo);
-				break;
-			}
-		}
-	}
+                } else {
+                    PrintAndLogEx(FAILED, "could not read block %2d of sector %2d", blockNo, sectorNo);
+                    break;
+                }
+            }
+            else {
+                isOK = false;
+                PrintAndLogEx(WARNING, "command execute timeout when trying to read block %2d of sector %2d.", blockNo, sectorNo);
+                break;
+            }
+        }
+    }
 
-	if (isOK == 0) {
-		PrintAndLogEx(FAILED, "Something went wrong");
-		return 0;
-	}
+    if (isOK == 0) {
+        PrintAndLogEx(FAILED, "Something went wrong");
+        return 0;
+    }
 
-	PrintAndLogEx(SUCCESS, "\nSuccedded in dumping all blocks");
+    PrintAndLogEx(SUCCESS, "\nSuccedded in dumping all blocks");
 
-	if ( strlen(dataFilename) < 1 ) {
-		fptr = dataFilename;
-		fptr += sprintf(fptr, "hf-mf-");
-		FillFileNameByUID(fptr, (uint8_t *)carddata, "-data", 4);
-	}
+    if ( strlen(dataFilename) < 1 ) {
+        fptr = dataFilename;
+        fptr += sprintf(fptr, "hf-mf-");
+        FillFileNameByUID(fptr, (uint8_t *)carddata, "-data", 4);
+    }
 
-	uint16_t bytes = 16*(FirstBlockOfSector(numSectors - 1) + NumBlocksPerSector(numSectors - 1));
+    uint16_t bytes = 16*(FirstBlockOfSector(numSectors - 1) + NumBlocksPerSector(numSectors - 1));
 
-	saveFile(dataFilename, "bin", (uint8_t *)carddata, bytes);
-	saveFileEML(dataFilename, "eml", (uint8_t *)carddata, bytes, MFBLOCK_SIZE);
-	saveFileJSON(dataFilename, "json", jsfCardMemory, (uint8_t *)carddata, bytes);
-	return 0;
+    saveFile(dataFilename, "bin", (uint8_t *)carddata, bytes);
+    saveFileEML(dataFilename, "eml", (uint8_t *)carddata, bytes, MFBLOCK_SIZE);
+    saveFileJSON(dataFilename, "json", jsfCardMemory, (uint8_t *)carddata, bytes);
+    return 0;
 }
 
 int CmdHF14AMfRestore(const char *Cmd) {
-	uint8_t sectorNo,blockNo;
-	uint8_t keyType = 0;
-	uint8_t key[6] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};
-	uint8_t bldata[16] = {0x00};
-	uint8_t keyA[40][6];
-	uint8_t keyB[40][6];
-	uint8_t numSectors = 16;
-	uint8_t cmdp = 0;
-	char keyFilename[FILE_PATH_SIZE] = "";
-	char dataFilename[FILE_PATH_SIZE] = "";
-	char szTemp[FILE_PATH_SIZE-20] = "";
-	char *fptr;
-	FILE *fdump, *fkeys;
+    uint8_t sectorNo,blockNo;
+    uint8_t keyType = 0;
+    uint8_t key[6] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};
+    uint8_t bldata[16] = {0x00};
+    uint8_t keyA[40][6];
+    uint8_t keyB[40][6];
+    uint8_t numSectors = 16;
+    uint8_t cmdp = 0;
+    char keyFilename[FILE_PATH_SIZE] = "";
+    char dataFilename[FILE_PATH_SIZE] = "";
+    char szTemp[FILE_PATH_SIZE-20] = "";
+    char *fptr;
+    FILE *fdump, *fkeys;
 
-	while(param_getchar(Cmd, cmdp) != 0x00) {
-		switch(tolower(param_getchar(Cmd, cmdp))) {
-		case 'h':
-			return usage_hf14_restore();
-		case 'u':
-			param_getstr(Cmd, cmdp+1, szTemp, FILE_PATH_SIZE-20);
-			if(keyFilename[0]==0x00)
-				snprintf(keyFilename, FILE_PATH_SIZE, "hf-mf-%s-key.bin", szTemp);
-			if(dataFilename[0]==0x00)
-				snprintf(dataFilename, FILE_PATH_SIZE, "hf-mf-%s-data.bin", szTemp);
-			cmdp+=2;
-			break;
-		case 'k':
-			param_getstr(Cmd, cmdp+1, keyFilename, FILE_PATH_SIZE);
-			cmdp += 2;
-			break;
-		case 'f':
-			param_getstr(Cmd, cmdp+1, dataFilename, FILE_PATH_SIZE);
-			cmdp += 2;
-			break;
-		default:
-			if ( cmdp == 0 ) {
-				numSectors = NumOfSectors(param_getchar(Cmd, cmdp));
-				cmdp++;
-			} else {
-				PrintAndLogEx(WARNING, "Unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
-				return usage_hf14_restore();
-			}
-		}
-	}
+    while(param_getchar(Cmd, cmdp) != 0x00) {
+        switch(tolower(param_getchar(Cmd, cmdp))) {
+        case 'h':
+            return usage_hf14_restore();
+        case 'u':
+            param_getstr(Cmd, cmdp+1, szTemp, FILE_PATH_SIZE-20);
+            if(keyFilename[0]==0x00)
+                snprintf(keyFilename, FILE_PATH_SIZE, "hf-mf-%s-key.bin", szTemp);
+            if(dataFilename[0]==0x00)
+                snprintf(dataFilename, FILE_PATH_SIZE, "hf-mf-%s-data.bin", szTemp);
+            cmdp+=2;
+            break;
+        case 'k':
+            param_getstr(Cmd, cmdp+1, keyFilename, FILE_PATH_SIZE);
+            cmdp += 2;
+            break;
+        case 'f':
+            param_getstr(Cmd, cmdp+1, dataFilename, FILE_PATH_SIZE);
+            cmdp += 2;
+            break;
+        default:
+            if ( cmdp == 0 ) {
+                numSectors = NumOfSectors(param_getchar(Cmd, cmdp));
+                cmdp++;
+            } else {
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
+                return usage_hf14_restore();
+            }
+        }
+    }
 
-	if ( keyFilename[0] == 0x00 ) {
-		fptr = GenerateFilename("hf-mf-", "-key.bin");
-		if (fptr == NULL)
-			return 1;
+    if ( keyFilename[0] == 0x00 ) {
+        fptr = GenerateFilename("hf-mf-", "-key.bin");
+        if (fptr == NULL)
+            return 1;
 
-		strcpy(keyFilename, fptr);
-	}
+        strcpy(keyFilename, fptr);
+    }
 
-	if ((fkeys = fopen(keyFilename, "rb")) == NULL) {
-		PrintAndLogEx(WARNING, "Could not find file " _YELLOW_(%s), keyFilename);
-		return 1;
-	}
+    if ((fkeys = fopen(keyFilename, "rb")) == NULL) {
+        PrintAndLogEx(WARNING, "Could not find file " _YELLOW_(%s), keyFilename);
+        return 1;
+    }
 
-	size_t bytes_read;
-	for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
-		bytes_read = fread( keyA[sectorNo], 1, 6, fkeys );
-		if ( bytes_read != 6 ) {
-			PrintAndLogEx(WARNING, "File reading error  " _YELLOW_(%s), keyFilename);
-			fclose(fkeys);
-			return 2;
-		}
-	}
+    size_t bytes_read;
+    for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
+        bytes_read = fread( keyA[sectorNo], 1, 6, fkeys );
+        if ( bytes_read != 6 ) {
+            PrintAndLogEx(WARNING, "File reading error  " _YELLOW_(%s), keyFilename);
+            fclose(fkeys);
+            return 2;
+        }
+    }
 
-	for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
-		bytes_read = fread( keyB[sectorNo], 1, 6, fkeys );
-		if ( bytes_read != 6 ) {
-			PrintAndLogEx(WARNING, "File reading error " _YELLOW_(%s), keyFilename);
-			fclose(fkeys);
-			return 2;
-		}
-	}
+    for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
+        bytes_read = fread( keyB[sectorNo], 1, 6, fkeys );
+        if ( bytes_read != 6 ) {
+            PrintAndLogEx(WARNING, "File reading error " _YELLOW_(%s), keyFilename);
+            fclose(fkeys);
+            return 2;
+        }
+    }
 
-	fclose(fkeys);
+    fclose(fkeys);
 
-	if ( dataFilename[0] == 0x00 ) {
-		fptr = GenerateFilename("hf-mf-", "-data.bin");
-		if (fptr == NULL)
-			return 1;
+    if ( dataFilename[0] == 0x00 ) {
+        fptr = GenerateFilename("hf-mf-", "-data.bin");
+        if (fptr == NULL)
+            return 1;
 
-		strcpy(dataFilename,fptr);
-	}
+        strcpy(dataFilename,fptr);
+    }
 
-	if ((fdump = fopen(dataFilename, "rb")) == NULL) {
-		PrintAndLogEx(WARNING, "Could not find file " _YELLOW_(%s), dataFilename);
-		return 1;
-	}
-	PrintAndLogEx(INFO, "Restoring " _YELLOW_(%s)" to card", dataFilename);
+    if ((fdump = fopen(dataFilename, "rb")) == NULL) {
+        PrintAndLogEx(WARNING, "Could not find file " _YELLOW_(%s), dataFilename);
+        return 1;
+    }
+    PrintAndLogEx(INFO, "Restoring " _YELLOW_(%s)" to card", dataFilename);
 
-	for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
-		for (blockNo = 0; blockNo < NumBlocksPerSector(sectorNo); blockNo++) {
-			UsbCommand c = {CMD_MIFARE_WRITEBL, {FirstBlockOfSector(sectorNo) + blockNo, keyType, 0}};
-			memcpy(c.d.asBytes, key, 6);
-			bytes_read = fread(bldata, 1, 16, fdump);
-			if ( bytes_read != 16) {
-				PrintAndLogEx(WARNING, "File reading error " _YELLOW_(%s), dataFilename);
-				fclose(fdump);
-				fdump = NULL;
-				return 2;
-			}
+    for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
+        for (blockNo = 0; blockNo < NumBlocksPerSector(sectorNo); blockNo++) {
+            UsbCommand c = {CMD_MIFARE_WRITEBL, {FirstBlockOfSector(sectorNo) + blockNo, keyType, 0}};
+            memcpy(c.d.asBytes, key, 6);
+            bytes_read = fread(bldata, 1, 16, fdump);
+            if ( bytes_read != 16) {
+                PrintAndLogEx(WARNING, "File reading error " _YELLOW_(%s), dataFilename);
+                fclose(fdump);
+                fdump = NULL;
+                return 2;
+            }
 
-			if (blockNo == NumBlocksPerSector(sectorNo) - 1) {	// sector trailer
-				bldata[0]  = (keyA[sectorNo][0]);
-				bldata[1]  = (keyA[sectorNo][1]);
-				bldata[2]  = (keyA[sectorNo][2]);
-				bldata[3]  = (keyA[sectorNo][3]);
-				bldata[4]  = (keyA[sectorNo][4]);
-				bldata[5]  = (keyA[sectorNo][5]);
-				bldata[10] = (keyB[sectorNo][0]);
-				bldata[11] = (keyB[sectorNo][1]);
-				bldata[12] = (keyB[sectorNo][2]);
-				bldata[13] = (keyB[sectorNo][3]);
-				bldata[14] = (keyB[sectorNo][4]);
-				bldata[15] = (keyB[sectorNo][5]);
-			}
+            if (blockNo == NumBlocksPerSector(sectorNo) - 1) { // sector trailer
+                bldata[0]  = (keyA[sectorNo][0]);
+                bldata[1]  = (keyA[sectorNo][1]);
+                bldata[2]  = (keyA[sectorNo][2]);
+                bldata[3]  = (keyA[sectorNo][3]);
+                bldata[4]  = (keyA[sectorNo][4]);
+                bldata[5]  = (keyA[sectorNo][5]);
+                bldata[10] = (keyB[sectorNo][0]);
+                bldata[11] = (keyB[sectorNo][1]);
+                bldata[12] = (keyB[sectorNo][2]);
+                bldata[13] = (keyB[sectorNo][3]);
+                bldata[14] = (keyB[sectorNo][4]);
+                bldata[15] = (keyB[sectorNo][5]);
+            }
 
-			PrintAndLogEx(NORMAL, "Writing to block %3d: %s", FirstBlockOfSector(sectorNo) + blockNo, sprint_hex(bldata, 16));
+            PrintAndLogEx(NORMAL, "Writing to block %3d: %s", FirstBlockOfSector(sectorNo) + blockNo, sprint_hex(bldata, 16));
 
-			memcpy(c.d.asBytes + 10, bldata, 16);
-			clearCommandBuffer();
-			SendCommand(&c);
+            memcpy(c.d.asBytes + 10, bldata, 16);
+            clearCommandBuffer();
+            SendCommand(&c);
 
-			UsbCommand resp;
-			if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
-				uint8_t isOK  = resp.arg[0] & 0xff;
-				PrintAndLogEx(SUCCESS, "isOk:%02x", isOK);
-			} else {
-				PrintAndLogEx(WARNING, "Command execute timeout");
-			}
-		}
-	}
+            UsbCommand resp;
+            if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
+                uint8_t isOK  = resp.arg[0] & 0xff;
+                PrintAndLogEx(SUCCESS, "isOk:%02x", isOK);
+            } else {
+                PrintAndLogEx(WARNING, "Command execute timeout");
+            }
+        }
+    }
 
-	fclose(fdump);
-	return 0;
+    fclose(fdump);
+    return 0;
 }
 
 int CmdHF14AMfNested(const char *Cmd) {
-	int i, res, iterations;
-	sector_t *e_sector = NULL;
-	uint8_t blockNo = 0;
-	uint8_t keyType = 0;
-	uint8_t trgBlockNo = 0;
-	uint8_t trgKeyType = 0;
-	uint8_t SectorsCnt = 0;
-	uint8_t key[6] = {0, 0, 0, 0, 0, 0};
-	uint8_t keyBlock[(MIFARE_DEFAULTKEYS_SIZE + 1) *6];
-	uint64_t key64 = 0;
-	bool transferToEml = false;
-	bool createDumpFile = false;
-	FILE *fkeys;
-	uint8_t standart[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
-	uint8_t tempkey[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
-	char *fptr;
+    int i, res, iterations;
+    sector_t *e_sector = NULL;
+    uint8_t blockNo = 0;
+    uint8_t keyType = 0;
+    uint8_t trgBlockNo = 0;
+    uint8_t trgKeyType = 0;
+    uint8_t SectorsCnt = 0;
+    uint8_t key[6] = {0, 0, 0, 0, 0, 0};
+    uint8_t keyBlock[(MIFARE_DEFAULTKEYS_SIZE + 1) *6];
+    uint64_t key64 = 0;
+    bool transferToEml = false;
+    bool createDumpFile = false;
+    FILE *fkeys;
+    uint8_t standart[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
+    uint8_t tempkey[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
+    char *fptr;
 
-	if (strlen(Cmd) < 3) return usage_hf14_nested();
+    if (strlen(Cmd) < 3) return usage_hf14_nested();
 
-	char cmdp, ctmp;
-	cmdp = tolower(param_getchar(Cmd, 0));
-	blockNo = param_get8(Cmd, 1);
-	ctmp = tolower(param_getchar(Cmd, 2));
+    char cmdp, ctmp;
+    cmdp = tolower(param_getchar(Cmd, 0));
+    blockNo = param_get8(Cmd, 1);
+    ctmp = tolower(param_getchar(Cmd, 2));
 
-	if (ctmp != 'a' && ctmp != 'b') {
-		PrintAndLogEx(WARNING, "key type must be A or B");
-		return 1;
-	}
+    if (ctmp != 'a' && ctmp != 'b') {
+        PrintAndLogEx(WARNING, "key type must be A or B");
+        return 1;
+    }
 
-	if (ctmp != 'a')
-		keyType = 1;
+    if (ctmp != 'a')
+        keyType = 1;
 
-	if (param_gethex(Cmd, 3, key, 12)) {
-		PrintAndLogEx(WARNING, "key must include 12 HEX symbols");
-		return 1;
-	}
+    if (param_gethex(Cmd, 3, key, 12)) {
+        PrintAndLogEx(WARNING, "key must include 12 HEX symbols");
+        return 1;
+    }
 
-	if (cmdp == 'o') {
-		trgBlockNo = param_get8(Cmd, 4);
-		ctmp = tolower(param_getchar(Cmd, 5));
-		if (ctmp != 'a' && ctmp != 'b') {
-			PrintAndLogEx(WARNING, "target key type must be A or B");
-			return 1;
-		}
-		if (ctmp != 'a') {
-			trgKeyType = 1;
-		}
-	} else {
-		SectorsCnt = NumOfSectors(cmdp);
-	}
+    if (cmdp == 'o') {
+        trgBlockNo = param_get8(Cmd, 4);
+        ctmp = tolower(param_getchar(Cmd, 5));
+        if (ctmp != 'a' && ctmp != 'b') {
+            PrintAndLogEx(WARNING, "target key type must be A or B");
+            return 1;
+        }
+        if (ctmp != 'a') {
+            trgKeyType = 1;
+        }
+    } else {
+        SectorsCnt = NumOfSectors(cmdp);
+    }
 
-	uint8_t j = 4;
-	while ( ctmp != 0x00 ) {
+    uint8_t j = 4;
+    while ( ctmp != 0x00 ) {
 
-		ctmp = tolower(param_getchar(Cmd, j));
-		transferToEml |= (ctmp == 't');
-		createDumpFile |= (ctmp == 'd');
+        ctmp = tolower(param_getchar(Cmd, j));
+        transferToEml |= (ctmp == 't');
+        createDumpFile |= (ctmp == 'd');
 
-		j++;
-	}
+        j++;
+    }
 
-	// check if we can authenticate to sector
-	res = mfCheckKeys(blockNo, keyType, true, 1, key, &key64);
-	if (res) {
-		PrintAndLogEx(WARNING, "Wrong key. Can't authenticate to block:%3d key type:%c", blockNo, keyType ? 'B' : 'A');
-		return 3;
-	}
+    // check if we can authenticate to sector
+    res = mfCheckKeys(blockNo, keyType, true, 1, key, &key64);
+    if (res) {
+        PrintAndLogEx(WARNING, "Wrong key. Can't authenticate to block:%3d key type:%c", blockNo, keyType ? 'B' : 'A');
+        return 3;
+    }
 
-	if (cmdp == 'o') {
-		int16_t isOK = mfnested(blockNo, keyType, key, trgBlockNo, trgKeyType, keyBlock, true);
-		switch (isOK) {
-			case -1 : PrintAndLogEx(WARNING, "Error: No response from Proxmark.\n"); break;
-			case -2 : PrintAndLogEx(WARNING, "Button pressed. Aborted.\n"); break;
-			case -3 : PrintAndLogEx(FAILED, "Tag isn't vulnerable to Nested Attack (PRNG is not predictable).\n"); break;
-			case -4 : PrintAndLogEx(FAILED, "No valid key found"); break;
-			case -5 :
-				key64 = bytes_to_num(keyBlock, 6);
+    if (cmdp == 'o') {
+        int16_t isOK = mfnested(blockNo, keyType, key, trgBlockNo, trgKeyType, keyBlock, true);
+        switch (isOK) {
+            case -1 : PrintAndLogEx(WARNING, "Error: No response from Proxmark.\n"); break;
+            case -2 : PrintAndLogEx(WARNING, "Button pressed. Aborted.\n"); break;
+            case -3 : PrintAndLogEx(FAILED, "Tag isn't vulnerable to Nested Attack (PRNG is not predictable).\n"); break;
+            case -4 : PrintAndLogEx(FAILED, "No valid key found"); break;
+            case -5 :
+                key64 = bytes_to_num(keyBlock, 6);
 
-				// transfer key to the emulator
-				if (transferToEml) {
-					uint8_t sectortrailer;
-					if (trgBlockNo < 32*4) { 	// 4 block sector
-					sectortrailer = trgBlockNo | 0x03;
-					} else {					// 16 block sector
-					sectortrailer = trgBlockNo | 0x0f;
-					}
-					mfEmlGetMem(keyBlock, sectortrailer, 1);
+                // transfer key to the emulator
+                if (transferToEml) {
+                    uint8_t sectortrailer;
+                    if (trgBlockNo < 32*4) {    // 4 block sector
+                    sectortrailer = trgBlockNo | 0x03;
+                    } else {                    // 16 block sector
+                    sectortrailer = trgBlockNo | 0x0f;
+                    }
+                    mfEmlGetMem(keyBlock, sectortrailer, 1);
 
-					if (!trgKeyType)
-						num_to_bytes(key64, 6, keyBlock);
-					else
-						num_to_bytes(key64, 6, &keyBlock[10]);
-					mfEmlSetMem(keyBlock, sectortrailer, 1);
-					PrintAndLogEx(SUCCESS, "Key transferred to emulator memory.");
-				}
-				return 0;
-			default : PrintAndLogEx(WARNING, "Unknown Error.\n");
-		}
-		return 2;
-	}
-	else { // ------------------------------------  multiple sectors working
-		uint64_t t1 = msclock();
+                    if (!trgKeyType)
+                        num_to_bytes(key64, 6, keyBlock);
+                    else
+                        num_to_bytes(key64, 6, &keyBlock[10]);
+                    mfEmlSetMem(keyBlock, sectortrailer, 1);
+                    PrintAndLogEx(SUCCESS, "Key transferred to emulator memory.");
+                }
+                return 0;
+            default : PrintAndLogEx(WARNING, "Unknown Error.\n");
+        }
+        return 2;
+    }
+    else { // ------------------------------------  multiple sectors working
+        uint64_t t1 = msclock();
 
-		e_sector = calloc(SectorsCnt, sizeof(sector_t));
-		if (e_sector == NULL) return 1;
+        e_sector = calloc(SectorsCnt, sizeof(sector_t));
+        if (e_sector == NULL) return 1;
 
-		//test current key and additional standard keys first
-		// add parameter key
-		memcpy( keyBlock + (MIFARE_DEFAULTKEYS_SIZE * 6), key, 6 );
+        //test current key and additional standard keys first
+        // add parameter key
+        memcpy( keyBlock + (MIFARE_DEFAULTKEYS_SIZE * 6), key, 6 );
 
-		for (int cnt = 0; cnt < MIFARE_DEFAULTKEYS_SIZE; cnt++){
-			num_to_bytes(g_mifare_default_keys[cnt], 6, (uint8_t*)(keyBlock + cnt * 6));
-		}
+        for (int cnt = 0; cnt < MIFARE_DEFAULTKEYS_SIZE; cnt++){
+            num_to_bytes(g_mifare_default_keys[cnt], 6, (uint8_t*)(keyBlock + cnt * 6));
+        }
 
-		PrintAndLogEx(SUCCESS, "Testing known keys. Sector count=%d", SectorsCnt);
-		res = mfCheckKeys_fast( SectorsCnt, true, true, 1, MIFARE_DEFAULTKEYS_SIZE + 1, keyBlock, e_sector, false);
+        PrintAndLogEx(SUCCESS, "Testing known keys. Sector count=%d", SectorsCnt);
+        res = mfCheckKeys_fast( SectorsCnt, true, true, 1, MIFARE_DEFAULTKEYS_SIZE + 1, keyBlock, e_sector, false);
 
-		uint64_t t2 = msclock() - t1;
-		PrintAndLogEx(SUCCESS, "Time to check %d known keys: %.0f seconds\n", MIFARE_DEFAULTKEYS_SIZE, (float)t2/1000.0 );
-		PrintAndLogEx(SUCCESS, "enter nested attack");
+        uint64_t t2 = msclock() - t1;
+        PrintAndLogEx(SUCCESS, "Time to check %d known keys: %.0f seconds\n", MIFARE_DEFAULTKEYS_SIZE, (float)t2/1000.0 );
+        PrintAndLogEx(SUCCESS, "enter nested attack");
 
-		// nested sectors
-		iterations = 0;
-		bool calibrate = true;
+        // nested sectors
+        iterations = 0;
+        bool calibrate = true;
 
-		for (i = 0; i < MIFARE_SECTOR_RETRY; i++) {
-			for (uint8_t sectorNo = 0; sectorNo < SectorsCnt; ++sectorNo) {
-				for (trgKeyType = 0; trgKeyType < 2; ++trgKeyType) {
+        for (i = 0; i < MIFARE_SECTOR_RETRY; i++) {
+            for (uint8_t sectorNo = 0; sectorNo < SectorsCnt; ++sectorNo) {
+                for (trgKeyType = 0; trgKeyType < 2; ++trgKeyType) {
 
-					if (e_sector[sectorNo].foundKey[trgKeyType]) continue;
+                    if (e_sector[sectorNo].foundKey[trgKeyType]) continue;
 
-					int16_t isOK = mfnested(blockNo, keyType, key, FirstBlockOfSector(sectorNo), trgKeyType, keyBlock, calibrate);
-					switch (isOK) {
-						case -1 : PrintAndLogEx(WARNING, "error: No response from Proxmark.\n"); break;
-						case -2 : PrintAndLogEx(WARNING, "button pressed. Aborted.\n"); break;
-						case -3 : PrintAndLogEx(FAILED, "Tag isn't vulnerable to Nested Attack (PRNG is not predictable).\n"); break;
-						case -4 : //key not found
-							calibrate = false;
-							iterations++;
-							continue;
-						case -5 :
-							calibrate = false;
-							iterations++;
-							e_sector[sectorNo].foundKey[trgKeyType] = 1;
-							e_sector[sectorNo].Key[trgKeyType] = bytes_to_num(keyBlock, 6);
+                    int16_t isOK = mfnested(blockNo, keyType, key, FirstBlockOfSector(sectorNo), trgKeyType, keyBlock, calibrate);
+                    switch (isOK) {
+                        case -1 : PrintAndLogEx(WARNING, "error: No response from Proxmark.\n"); break;
+                        case -2 : PrintAndLogEx(WARNING, "button pressed. Aborted.\n"); break;
+                        case -3 : PrintAndLogEx(FAILED, "Tag isn't vulnerable to Nested Attack (PRNG is not predictable).\n"); break;
+                        case -4 : //key not found
+                            calibrate = false;
+                            iterations++;
+                            continue;
+                        case -5 :
+                            calibrate = false;
+                            iterations++;
+                            e_sector[sectorNo].foundKey[trgKeyType] = 1;
+                            e_sector[sectorNo].Key[trgKeyType] = bytes_to_num(keyBlock, 6);
 
-							res = mfCheckKeys_fast( SectorsCnt, true, true, 2, 1, keyBlock, e_sector, false);
-							continue;
+                            res = mfCheckKeys_fast( SectorsCnt, true, true, 2, 1, keyBlock, e_sector, false);
+                            continue;
 
-						default : PrintAndLogEx(WARNING, "unknown Error.\n");
-					}
-					free(e_sector);
-					return 2;
-				}
-			}
-		}
+                        default : PrintAndLogEx(WARNING, "unknown Error.\n");
+                    }
+                    free(e_sector);
+                    return 2;
+                }
+            }
+        }
 
-		t1 = msclock() - t1;
-		PrintAndLogEx(SUCCESS, "time in nested: %.0f seconds\n", (float)t1/1000.0);
+        t1 = msclock() - t1;
+        PrintAndLogEx(SUCCESS, "time in nested: %.0f seconds\n", (float)t1/1000.0);
 
 
-		// 20160116 If Sector A is found, but not Sector B,  try just reading it of the tag?
-		PrintAndLogEx(INFO, "trying to read key B...");
-		for (i = 0; i < SectorsCnt; i++) {
-			// KEY A  but not KEY B
-			if ( e_sector[i].foundKey[0] && !e_sector[i].foundKey[1] ) {
+        // 20160116 If Sector A is found, but not Sector B,  try just reading it of the tag?
+        PrintAndLogEx(INFO, "trying to read key B...");
+        for (i = 0; i < SectorsCnt; i++) {
+            // KEY A  but not KEY B
+            if ( e_sector[i].foundKey[0] && !e_sector[i].foundKey[1] ) {
 
-				uint8_t sectrail = (FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1);
+                uint8_t sectrail = (FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1);
 
-				PrintAndLogEx(SUCCESS, "reading block %d", sectrail);
+                PrintAndLogEx(SUCCESS, "reading block %d", sectrail);
 
-				UsbCommand c = {CMD_MIFARE_READBL, {sectrail, 0, 0}};
-				num_to_bytes(e_sector[i].Key[0], 6, c.d.asBytes); // KEY A
-				clearCommandBuffer();
-				SendCommand(&c);
+                UsbCommand c = {CMD_MIFARE_READBL, {sectrail, 0, 0}};
+                num_to_bytes(e_sector[i].Key[0], 6, c.d.asBytes); // KEY A
+                clearCommandBuffer();
+                SendCommand(&c);
 
-				UsbCommand resp;
-				if ( !WaitForResponseTimeout(CMD_ACK,&resp,1500)) continue;
+                UsbCommand resp;
+                if ( !WaitForResponseTimeout(CMD_ACK,&resp,1500)) continue;
 
-				uint8_t isOK  = resp.arg[0] & 0xff;
-				if (!isOK) continue;
+                uint8_t isOK  = resp.arg[0] & 0xff;
+                if (!isOK) continue;
 
-				uint8_t *data = resp.d.asBytes;
-				key64 = bytes_to_num(data+10, 6);
-				if (key64) {
-					PrintAndLogEx(SUCCESS, "data: %s", sprint_hex(data+10, 6));
-					e_sector[i].foundKey[1] = true;
-					e_sector[i].Key[1] = key64;
-				}
-			}
-		}
+                uint8_t *data = resp.d.asBytes;
+                key64 = bytes_to_num(data+10, 6);
+                if (key64) {
+                    PrintAndLogEx(SUCCESS, "data: %s", sprint_hex(data+10, 6));
+                    e_sector[i].foundKey[1] = true;
+                    e_sector[i].Key[1] = key64;
+                }
+            }
+        }
 
 
-		//print them
-		printKeyTable( SectorsCnt, e_sector );
+        //print them
+        printKeyTable( SectorsCnt, e_sector );
 
-		// transfer them to the emulator
-		if (transferToEml) {
-			for (i = 0; i < SectorsCnt; i++) {
-				mfEmlGetMem(keyBlock, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
-				if (e_sector[i].foundKey[0])
-					num_to_bytes(e_sector[i].Key[0], 6, keyBlock);
-				if (e_sector[i].foundKey[1])
-					num_to_bytes(e_sector[i].Key[1], 6, &keyBlock[10]);
-				mfEmlSetMem(keyBlock, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
-			}
-			PrintAndLogEx(SUCCESS, "keys transferred to emulator memory.");
-		}
+        // transfer them to the emulator
+        if (transferToEml) {
+            for (i = 0; i < SectorsCnt; i++) {
+                mfEmlGetMem(keyBlock, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
+                if (e_sector[i].foundKey[0])
+                    num_to_bytes(e_sector[i].Key[0], 6, keyBlock);
+                if (e_sector[i].foundKey[1])
+                    num_to_bytes(e_sector[i].Key[1], 6, &keyBlock[10]);
+                mfEmlSetMem(keyBlock, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
+            }
+            PrintAndLogEx(SUCCESS, "keys transferred to emulator memory.");
+        }
 
-		// Create dump file
-		if (createDumpFile) {
-			fptr = GenerateFilename("hf-mf-", "-key.bin");
-			if (fptr == NULL) {
-				free(e_sector);
-				return 1;
-			}
+        // Create dump file
+        if (createDumpFile) {
+            fptr = GenerateFilename("hf-mf-", "-key.bin");
+            if (fptr == NULL) {
+                free(e_sector);
+                return 1;
+            }
 
-			if ((fkeys = fopen(fptr, "wb")) == NULL) {
-				PrintAndLogEx(WARNING, "could not create file " _YELLOW_(%s), fptr);
-				free(e_sector);
-				return 1;
-			}
+            if ((fkeys = fopen(fptr, "wb")) == NULL) {
+                PrintAndLogEx(WARNING, "could not create file " _YELLOW_(%s), fptr);
+                free(e_sector);
+                return 1;
+            }
 
-			PrintAndLogEx(SUCCESS, "saving keys to binary file " _YELLOW_(%s), fptr);
-			for (i=0; i<SectorsCnt; i++) {
-				if (e_sector[i].foundKey[0]){
-					num_to_bytes(e_sector[i].Key[0], 6, tempkey);
-					fwrite ( tempkey, 1, 6, fkeys );
-				} else {
-					fwrite ( &standart, 1, 6, fkeys );
-				}
-			}
-			for( i=0; i<SectorsCnt; i++) {
-				if (e_sector[i].foundKey[1]){
-					num_to_bytes(e_sector[i].Key[1], 6, tempkey);
-					fwrite ( tempkey, 1, 6, fkeys );
-				} else {
-					fwrite ( &standart, 1, 6, fkeys );
-				}
-			}
-			fflush(fkeys);
-			fclose(fkeys);
-		}
-		free(e_sector);
-	}
+            PrintAndLogEx(SUCCESS, "saving keys to binary file " _YELLOW_(%s), fptr);
+            for (i=0; i<SectorsCnt; i++) {
+                if (e_sector[i].foundKey[0]){
+                    num_to_bytes(e_sector[i].Key[0], 6, tempkey);
+                    fwrite ( tempkey, 1, 6, fkeys );
+                } else {
+                    fwrite ( &standart, 1, 6, fkeys );
+                }
+            }
+            for( i=0; i<SectorsCnt; i++) {
+                if (e_sector[i].foundKey[1]){
+                    num_to_bytes(e_sector[i].Key[1], 6, tempkey);
+                    fwrite ( tempkey, 1, 6, fkeys );
+                } else {
+                    fwrite ( &standart, 1, 6, fkeys );
+                }
+            }
+            fflush(fkeys);
+            fclose(fkeys);
+        }
+        free(e_sector);
+    }
 
-	free(e_sector);
-	return 0;
+    free(e_sector);
+    return 0;
 }
 
 int CmdHF14AMfNestedHard(const char *Cmd) {
-	uint8_t blockNo = 0;
-	uint8_t keyType = 0;
-	uint8_t trgBlockNo = 0;
-	uint8_t trgKeyType = 0;
-	uint8_t key[6] = {0, 0, 0, 0, 0, 0};
-	uint8_t trgkey[6] = {0, 0, 0, 0, 0, 0};
-	uint8_t cmdp=0;
-	char filename[FILE_PATH_SIZE], *fptr;
-	char szTemp[FILE_PATH_SIZE-20];
-	char ctmp;
+    uint8_t blockNo = 0;
+    uint8_t keyType = 0;
+    uint8_t trgBlockNo = 0;
+    uint8_t trgKeyType = 0;
+    uint8_t key[6] = {0, 0, 0, 0, 0, 0};
+    uint8_t trgkey[6] = {0, 0, 0, 0, 0, 0};
+    uint8_t cmdp=0;
+    char filename[FILE_PATH_SIZE], *fptr;
+    char szTemp[FILE_PATH_SIZE-20];
+    char ctmp;
 
-	bool know_target_key = false;
-	bool nonce_file_read = false;
-	bool nonce_file_write = false;
-	bool slow = false;
-	int tests = 0;
+    bool know_target_key = false;
+    bool nonce_file_read = false;
+    bool nonce_file_write = false;
+    bool slow = false;
+    int tests = 0;
 
-	switch(tolower(param_getchar(Cmd, cmdp))) {
-		case 'h': return usage_hf14_hardnested();
-		case 'r':
-			fptr = GenerateFilename("hf-mf-","-nonces.bin");
-			if (fptr == NULL)
-				strncpy(filename, "nonces.bin", FILE_PATH_SIZE);
-			else
-				strncpy(filename, fptr, FILE_PATH_SIZE-1);
+    switch(tolower(param_getchar(Cmd, cmdp))) {
+        case 'h': return usage_hf14_hardnested();
+        case 'r':
+            fptr = GenerateFilename("hf-mf-","-nonces.bin");
+            if (fptr == NULL)
+                strncpy(filename, "nonces.bin", FILE_PATH_SIZE);
+            else
+                strncpy(filename, fptr, FILE_PATH_SIZE-1);
 
-			nonce_file_read = true;
-			if (!param_gethex(Cmd, cmdp+1, trgkey, 12)) {
-				know_target_key = true;
-			}
-			cmdp++;
-			break;
-		case 't':
-			tests = param_get32ex(Cmd, cmdp+1, 100, 10);
-			if (!param_gethex(Cmd, cmdp+2, trgkey, 12)) {
-				know_target_key = true;
-			}
-			cmdp += 2;
-			break;
-		default:
-			if (param_getchar(Cmd, cmdp) == 0x00)
-			{
-				PrintAndLogEx(WARNING, "Block number is missing");
-				return 1;
+            nonce_file_read = true;
+            if (!param_gethex(Cmd, cmdp+1, trgkey, 12)) {
+                know_target_key = true;
+            }
+            cmdp++;
+            break;
+        case 't':
+            tests = param_get32ex(Cmd, cmdp+1, 100, 10);
+            if (!param_gethex(Cmd, cmdp+2, trgkey, 12)) {
+                know_target_key = true;
+            }
+            cmdp += 2;
+            break;
+        default:
+            if (param_getchar(Cmd, cmdp) == 0x00)
+            {
+                PrintAndLogEx(WARNING, "Block number is missing");
+                return 1;
 
-			}
-			blockNo = param_get8(Cmd, cmdp);
-			ctmp = tolower(param_getchar(Cmd, cmdp+1));
-			if (ctmp != 'a' && ctmp != 'b') {
-				PrintAndLogEx(WARNING, "Key type must be A or B");
-				return 1;
-			}
+            }
+            blockNo = param_get8(Cmd, cmdp);
+            ctmp = tolower(param_getchar(Cmd, cmdp+1));
+            if (ctmp != 'a' && ctmp != 'b') {
+                PrintAndLogEx(WARNING, "Key type must be A or B");
+                return 1;
+            }
 
-			if (ctmp != 'a') {
-				keyType = 1;
-			}
+            if (ctmp != 'a') {
+                keyType = 1;
+            }
 
-			if (param_gethex(Cmd, cmdp+2, key, 12)) {
-				PrintAndLogEx(WARNING, "Key must include 12 HEX symbols");
-				return 1;
-			}
+            if (param_gethex(Cmd, cmdp+2, key, 12)) {
+                PrintAndLogEx(WARNING, "Key must include 12 HEX symbols");
+                return 1;
+            }
 
-			if (param_getchar(Cmd, cmdp+3) == 0x00)
-			{
-				PrintAndLogEx(WARNING, "Target block number is missing");
-				return 1;
-			}
+            if (param_getchar(Cmd, cmdp+3) == 0x00)
+            {
+                PrintAndLogEx(WARNING, "Target block number is missing");
+                return 1;
+            }
 
-			trgBlockNo = param_get8(Cmd, cmdp+3);
+            trgBlockNo = param_get8(Cmd, cmdp+3);
 
-			ctmp = tolower(param_getchar(Cmd, cmdp+4));
-			if (ctmp != 'a' && ctmp != 'b') {
-				PrintAndLogEx(WARNING, "Target key type must be A or B");
-				return 1;
-			}
-			if (ctmp != 'a') {
-				trgKeyType = 1;
-			}
-			cmdp += 5;
-	}
-	if (!param_gethex(Cmd, cmdp, trgkey, 12)) {
-		know_target_key = true;
-		cmdp++;
-	}
+            ctmp = tolower(param_getchar(Cmd, cmdp+4));
+            if (ctmp != 'a' && ctmp != 'b') {
+                PrintAndLogEx(WARNING, "Target key type must be A or B");
+                return 1;
+            }
+            if (ctmp != 'a') {
+                trgKeyType = 1;
+            }
+            cmdp += 5;
+    }
+    if (!param_gethex(Cmd, cmdp, trgkey, 12)) {
+        know_target_key = true;
+        cmdp++;
+    }
 
-	while ((ctmp = param_getchar(Cmd, cmdp))) {
-		switch(tolower(ctmp)) {
-		case 's':
-			slow = true;
-			break;
-		case 'w':
-			nonce_file_write = true;
-			fptr = GenerateFilename("hf-mf-","-nonces.bin");
-			if (fptr == NULL)
-				return 1;
-			strncpy(filename, fptr, FILE_PATH_SIZE-1);
-			break;
-		case 'u':
-			param_getstr(Cmd, cmdp+1, szTemp, FILE_PATH_SIZE-20);
-			snprintf(filename, FILE_PATH_SIZE, "hf-mf-%s-nonces.bin", szTemp);
-			cmdp++;
-			break;
-		case 'f':
-			param_getstr(Cmd, cmdp+1, szTemp, FILE_PATH_SIZE-20);
-			strncpy(filename, szTemp, FILE_PATH_SIZE-20);
-			cmdp++;
-			break;
-		case 'i':
-			SetSIMDInstr(SIMD_AUTO);
-			ctmp = tolower(param_getchar(Cmd, cmdp+1));
-			switch (ctmp) {
-				case '5':
-					SetSIMDInstr(SIMD_AVX512);
-					break;
-				case '2':
-					SetSIMDInstr(SIMD_AVX2);
-					break;
-				case 'a':
-					SetSIMDInstr(SIMD_AVX);
-					break;
-				case 's':
-					SetSIMDInstr(SIMD_SSE2);
-					break;
-				case 'm':
-					SetSIMDInstr(SIMD_MMX);
-					break;
-				case 'n':
-					SetSIMDInstr(SIMD_NONE);
-					break;
-				default:
-					PrintAndLogEx(WARNING, "Unknown SIMD type. %c", ctmp);
-					return 1;
-			}
-			cmdp += 2;
-			break;
-		default:
-			PrintAndLogEx(WARNING, "Unknown parameter '%c'\n", ctmp);
-			usage_hf14_hardnested();
-			return 1;
-		}
-		cmdp++;
-	}
+    while ((ctmp = param_getchar(Cmd, cmdp))) {
+        switch(tolower(ctmp)) {
+        case 's':
+            slow = true;
+            break;
+        case 'w':
+            nonce_file_write = true;
+            fptr = GenerateFilename("hf-mf-","-nonces.bin");
+            if (fptr == NULL)
+                return 1;
+            strncpy(filename, fptr, FILE_PATH_SIZE-1);
+            break;
+        case 'u':
+            param_getstr(Cmd, cmdp+1, szTemp, FILE_PATH_SIZE-20);
+            snprintf(filename, FILE_PATH_SIZE, "hf-mf-%s-nonces.bin", szTemp);
+            cmdp++;
+            break;
+        case 'f':
+            param_getstr(Cmd, cmdp+1, szTemp, FILE_PATH_SIZE-20);
+            strncpy(filename, szTemp, FILE_PATH_SIZE-20);
+            cmdp++;
+            break;
+        case 'i':
+            SetSIMDInstr(SIMD_AUTO);
+            ctmp = tolower(param_getchar(Cmd, cmdp+1));
+            switch (ctmp) {
+                case '5':
+                    SetSIMDInstr(SIMD_AVX512);
+                    break;
+                case '2':
+                    SetSIMDInstr(SIMD_AVX2);
+                    break;
+                case 'a':
+                    SetSIMDInstr(SIMD_AVX);
+                    break;
+                case 's':
+                    SetSIMDInstr(SIMD_SSE2);
+                    break;
+                case 'm':
+                    SetSIMDInstr(SIMD_MMX);
+                    break;
+                case 'n':
+                    SetSIMDInstr(SIMD_NONE);
+                    break;
+                default:
+                    PrintAndLogEx(WARNING, "Unknown SIMD type. %c", ctmp);
+                    return 1;
+            }
+            cmdp += 2;
+            break;
+        default:
+            PrintAndLogEx(WARNING, "Unknown parameter '%c'\n", ctmp);
+            usage_hf14_hardnested();
+            return 1;
+        }
+        cmdp++;
+    }
 
-	if ( !know_target_key ) {
-		uint64_t key64 = 0;
-		// check if we can authenticate to sector
-		int res = mfCheckKeys(blockNo, keyType, true, 1, key, &key64);
-		if (res) {
-			PrintAndLogEx(WARNING, "Key is wrong. Can't authenticate to block:%3d key type:%c", blockNo, keyType ? 'B' : 'A');
-			return 3;
-		}
-	}
+    if ( !know_target_key ) {
+        uint64_t key64 = 0;
+        // check if we can authenticate to sector
+        int res = mfCheckKeys(blockNo, keyType, true, 1, key, &key64);
+        if (res) {
+            PrintAndLogEx(WARNING, "Key is wrong. Can't authenticate to block:%3d key type:%c", blockNo, keyType ? 'B' : 'A');
+            return 3;
+        }
+    }
 
-	PrintAndLogEx(NORMAL, "--target block no:%3d, target key type:%c, known target key: 0x%02x%02x%02x%02x%02x%02x%s, file action: %s, Slow: %s, Tests: %d ",
-			trgBlockNo,
-			trgKeyType?'B':'A',
-			trgkey[0], trgkey[1], trgkey[2], trgkey[3], trgkey[4], trgkey[5],
-			know_target_key ? "" : " (not set)",
-			nonce_file_write ? "write": nonce_file_read ? "read" : "none",
-			slow ? "Yes" : "No",
-			tests);
+    PrintAndLogEx(NORMAL, "--target block no:%3d, target key type:%c, known target key: 0x%02x%02x%02x%02x%02x%02x%s, file action: %s, Slow: %s, Tests: %d ",
+            trgBlockNo,
+            trgKeyType?'B':'A',
+            trgkey[0], trgkey[1], trgkey[2], trgkey[3], trgkey[4], trgkey[5],
+            know_target_key ? "" : " (not set)",
+            nonce_file_write ? "write": nonce_file_read ? "read" : "none",
+            slow ? "Yes" : "No",
+            tests);
 
-	uint64_t foundkey = 0;
-	int16_t isOK = mfnestedhard(blockNo, keyType, key, trgBlockNo, trgKeyType, know_target_key ? trgkey : NULL, nonce_file_read, nonce_file_write, slow, tests, &foundkey, filename);
+    uint64_t foundkey = 0;
+    int16_t isOK = mfnestedhard(blockNo, keyType, key, trgBlockNo, trgKeyType, know_target_key ? trgkey : NULL, nonce_file_read, nonce_file_write, slow, tests, &foundkey, filename);
 
-	DropField();
-	if (isOK) {
-		switch (isOK) {
-			case 1 : PrintAndLogEx(WARNING, "Error: No response from Proxmark.\n"); break;
-			case 2 : PrintAndLogEx(NORMAL, "Button pressed. Aborted.\n"); break;
-			default : break;
-		}
-		return 2;
-	}
-	return 0;
+    DropField();
+    if (isOK) {
+        switch (isOK) {
+            case 1 : PrintAndLogEx(WARNING, "Error: No response from Proxmark.\n"); break;
+            case 2 : PrintAndLogEx(NORMAL, "Button pressed. Aborted.\n"); break;
+            default : break;
+        }
+        return 2;
+    }
+    return 0;
 }
 
 int randInRange(int min, int max) {
-	return min + (int) (rand() / (double) (RAND_MAX) * (max - min + 1));
+    return min + (int) (rand() / (double) (RAND_MAX) * (max - min + 1));
 }
 
 //Fisher–Yates shuffle
 void shuffle( uint8_t *array, uint16_t len) {
-	uint8_t tmp[6];
-	uint16_t x;
-	time_t t;
-	srand((unsigned) time(&t));
-	while (len) {
-		x = randInRange(0, (len -= 6) ) | 0; // 0 = i < n
-		x %= 6;
-		memcpy(tmp, array + x, 6);
-		memcpy(array + x, array + len, 6);
-		memcpy(array + len, tmp, 6);
-	}
+    uint8_t tmp[6];
+    uint16_t x;
+    time_t t;
+    srand((unsigned) time(&t));
+    while (len) {
+        x = randInRange(0, (len -= 6) ) | 0; // 0 = i < n
+        x %= 6;
+        memcpy(tmp, array + x, 6);
+        memcpy(array + x, array + len, 6);
+        memcpy(array + len, tmp, 6);
+    }
 }
 
 int CmdHF14AMfChk_fast(const char *Cmd) {
 
-	char ctmp = 0x00;
-	ctmp = tolower(param_getchar(Cmd, 0));
-	if (strlen(Cmd) < 1 || ctmp == 'h') return usage_hf14_chk_fast();
+    char ctmp = 0x00;
+    ctmp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) < 1 || ctmp == 'h') return usage_hf14_chk_fast();
 
-	FILE * f;
-	char filename[FILE_PATH_SIZE]={0};
-	char buf[13];
-	char *fptr;
-	uint8_t tempkey[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
-	uint8_t *keyBlock = NULL, *p;
-	uint8_t sectorsCnt = 1;
-	int i, keycnt = 0;
-	int clen = 0;
-	int transferToEml = 0, createDumpFile = 0;
-	uint32_t keyitems = MIFARE_DEFAULTKEYS_SIZE;
-	bool use_flashmemory = false;
+    FILE * f;
+    char filename[FILE_PATH_SIZE]={0};
+    char buf[13];
+    char *fptr;
+    uint8_t tempkey[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
+    uint8_t *keyBlock = NULL, *p;
+    uint8_t sectorsCnt = 1;
+    int i, keycnt = 0;
+    int clen = 0;
+    int transferToEml = 0, createDumpFile = 0;
+    uint32_t keyitems = MIFARE_DEFAULTKEYS_SIZE;
+    bool use_flashmemory = false;
 
-	sector_t *e_sector = NULL;
+    sector_t *e_sector = NULL;
 
-	keyBlock = calloc(MIFARE_DEFAULTKEYS_SIZE, 6);
-	if (keyBlock == NULL) return 1;
+    keyBlock = calloc(MIFARE_DEFAULTKEYS_SIZE, 6);
+    if (keyBlock == NULL) return 1;
 
-	for (int cnt = 0; cnt < MIFARE_DEFAULTKEYS_SIZE; cnt++)
-		num_to_bytes(g_mifare_default_keys[cnt], 6, keyBlock + cnt * 6);
+    for (int cnt = 0; cnt < MIFARE_DEFAULTKEYS_SIZE; cnt++)
+        num_to_bytes(g_mifare_default_keys[cnt], 6, keyBlock + cnt * 6);
 
-	// sectors
-	switch(ctmp) {
-		case '0': sectorsCnt =  MIFARE_MINI_MAXSECTOR; break;
-		case '1': sectorsCnt = MIFARE_1K_MAXSECTOR; break;
-		case '2': sectorsCnt = MIFARE_2K_MAXSECTOR; break;
-		case '4': sectorsCnt = MIFARE_4K_MAXSECTOR; break;
-		default:  sectorsCnt = MIFARE_1K_MAXSECTOR;
-	}
+    // sectors
+    switch(ctmp) {
+        case '0': sectorsCnt =  MIFARE_MINI_MAXSECTOR; break;
+        case '1': sectorsCnt = MIFARE_1K_MAXSECTOR; break;
+        case '2': sectorsCnt = MIFARE_2K_MAXSECTOR; break;
+        case '4': sectorsCnt = MIFARE_4K_MAXSECTOR; break;
+        default:  sectorsCnt = MIFARE_1K_MAXSECTOR;
+    }
 
-	for (i = 1; param_getchar(Cmd, i); i++) {
+    for (i = 1; param_getchar(Cmd, i); i++) {
 
-		ctmp = tolower(param_getchar(Cmd, i));
-		clen = param_getlength(Cmd, i);
+        ctmp = tolower(param_getchar(Cmd, i));
+        clen = param_getlength(Cmd, i);
 
-		if (clen == 12) {
+        if (clen == 12) {
 
-			if ( param_gethex(Cmd, i, keyBlock + 6 * keycnt, 12) ){
-				PrintAndLogEx(FAILED, "not hex, skipping");
-				continue;
-			}
+            if ( param_gethex(Cmd, i, keyBlock + 6 * keycnt, 12) ){
+                PrintAndLogEx(FAILED, "not hex, skipping");
+                continue;
+            }
 
-			if ( keyitems - keycnt < 2) {
-				p = realloc(keyBlock, 6 * (keyitems += 64));
-				if (!p) {
-					PrintAndLogEx(FAILED, "Cannot allocate memory for Keys");
-					free(keyBlock);
-					return 2;
-				}
-				keyBlock = p;
-			}
-			PrintAndLogEx(NORMAL, "[%2d] key %s", keycnt, sprint_hex( (keyBlock + 6*keycnt), 6 ) );
-			keycnt++;
-		} else if ( clen == 1) {
-			if (ctmp == 't' ) { transferToEml = 1; continue; }
-			if (ctmp == 'd' ) { createDumpFile = 1; continue; }
+            if ( keyitems - keycnt < 2) {
+                p = realloc(keyBlock, 6 * (keyitems += 64));
+                if (!p) {
+                    PrintAndLogEx(FAILED, "Cannot allocate memory for Keys");
+                    free(keyBlock);
+                    return 2;
+                }
+                keyBlock = p;
+            }
+            PrintAndLogEx(NORMAL, "[%2d] key %s", keycnt, sprint_hex( (keyBlock + 6*keycnt), 6 ) );
+            keycnt++;
+        } else if ( clen == 1) {
+            if (ctmp == 't' ) { transferToEml = 1; continue; }
+            if (ctmp == 'd' ) { createDumpFile = 1; continue; }
 #ifdef WITH_FLASH
-			if (ctmp == 'm' ) { use_flashmemory = true; continue; }
+            if (ctmp == 'm' ) { use_flashmemory = true; continue; }
 #endif
-		} else {
-			// May be a dic file
-			if ( param_getstr(Cmd, i, filename, FILE_PATH_SIZE) >= FILE_PATH_SIZE ) {
-				PrintAndLogEx(FAILED, "Filename too long");
-				continue;
-			}
+        } else {
+            // May be a dic file
+            if ( param_getstr(Cmd, i, filename, FILE_PATH_SIZE) >= FILE_PATH_SIZE ) {
+                PrintAndLogEx(FAILED, "Filename too long");
+                continue;
+            }
 
-			f = fopen( filename, "r");
-			if ( !f ){
-				PrintAndLogEx(FAILED, "File: " _YELLOW_(%s) ": not found or locked.", filename);
-				continue;
-			}
+            f = fopen( filename, "r");
+            if ( !f ){
+                PrintAndLogEx(FAILED, "File: " _YELLOW_(%s) ": not found or locked.", filename);
+                continue;
+            }
 
-			// read file
-			while( fgets(buf, sizeof(buf), f) ){
-				if (strlen(buf) < 12 || buf[11] == '\n')
-					continue;
+            // read file
+            while( fgets(buf, sizeof(buf), f) ){
+                if (strlen(buf) < 12 || buf[11] == '\n')
+                    continue;
 
-				while (fgetc(f) != '\n' && !feof(f)) ;  //goto next line
+                while (fgetc(f) != '\n' && !feof(f)) ;  //goto next line
 
-				if( buf[0]=='#' ) continue;	//The line start with # is comment, skip
+                if( buf[0]=='#' ) continue; //The line start with # is comment, skip
 
-				if (!isxdigit(buf[0])){
-					PrintAndLogEx(FAILED, "File content error. '" _YELLOW_(%s)"' must include 12 HEX symbols", buf);
-					continue;
-				}
+                if (!isxdigit(buf[0])){
+                    PrintAndLogEx(FAILED, "File content error. '" _YELLOW_(%s)"' must include 12 HEX symbols", buf);
+                    continue;
+                }
 
-				buf[12] = 0;
-				if ( keyitems - keycnt < 2) {
-					p = realloc(keyBlock, 6 * (keyitems += 64));
-					if (!p) {
-						PrintAndLogEx(FAILED, "Cannot allocate memory for default keys");
-						free(keyBlock);
-						fclose(f);
-						return 2;
-					}
-					keyBlock = p;
-				}
-				int pos = 6 * keycnt;
-				memset(keyBlock + pos, 0, 6);
-				num_to_bytes(strtoll(buf, NULL, 16), 6, keyBlock + pos);
-				keycnt++;
-				memset(buf, 0, sizeof(buf));
-			}
-			fclose(f);
-			PrintAndLogEx(SUCCESS, "Loaded %2d keys from " _YELLOW_(%s), keycnt, filename);
-		}
-	}
+                buf[12] = 0;
+                if ( keyitems - keycnt < 2) {
+                    p = realloc(keyBlock, 6 * (keyitems += 64));
+                    if (!p) {
+                        PrintAndLogEx(FAILED, "Cannot allocate memory for default keys");
+                        free(keyBlock);
+                        fclose(f);
+                        return 2;
+                    }
+                    keyBlock = p;
+                }
+                int pos = 6 * keycnt;
+                memset(keyBlock + pos, 0, 6);
+                num_to_bytes(strtoll(buf, NULL, 16), 6, keyBlock + pos);
+                keycnt++;
+                memset(buf, 0, sizeof(buf));
+            }
+            fclose(f);
+            PrintAndLogEx(SUCCESS, "Loaded %2d keys from " _YELLOW_(%s), keycnt, filename);
+        }
+    }
 
-	if (keycnt == 0 && !use_flashmemory) {
-		PrintAndLogEx(SUCCESS, "No key specified, trying default keys");
-		for (;keycnt < MIFARE_DEFAULTKEYS_SIZE; keycnt++)
-			PrintAndLogEx(NORMAL, "[%2d] %02x%02x%02x%02x%02x%02x", keycnt,
-				(keyBlock + 6*keycnt)[0],(keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2],
-				(keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4],	(keyBlock + 6*keycnt)[5]);
-	}
+    if (keycnt == 0 && !use_flashmemory) {
+        PrintAndLogEx(SUCCESS, "No key specified, trying default keys");
+        for (;keycnt < MIFARE_DEFAULTKEYS_SIZE; keycnt++)
+            PrintAndLogEx(NORMAL, "[%2d] %02x%02x%02x%02x%02x%02x", keycnt,
+                (keyBlock + 6*keycnt)[0],(keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2],
+                (keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4], (keyBlock + 6*keycnt)[5]);
+    }
 
-	// // initialize storage for found keys
-	e_sector = calloc(sectorsCnt, sizeof(sector_t));
-	if (e_sector == NULL) {
-		free(keyBlock);
-		return 1;
-	}
+    // // initialize storage for found keys
+    e_sector = calloc(sectorsCnt, sizeof(sector_t));
+    if (e_sector == NULL) {
+        free(keyBlock);
+        return 1;
+    }
 
-	uint32_t chunksize = keycnt > (USB_CMD_DATA_SIZE/6) ? (USB_CMD_DATA_SIZE/6) : keycnt;
-	bool firstChunk = true, lastChunk = false;
+    uint32_t chunksize = keycnt > (USB_CMD_DATA_SIZE/6) ? (USB_CMD_DATA_SIZE/6) : keycnt;
+    bool firstChunk = true, lastChunk = false;
 
-	// time
-	uint64_t t1 = msclock();
+    // time
+    uint64_t t1 = msclock();
 
-	if ( use_flashmemory ) {
-		PrintAndLogEx(SUCCESS, "Using dictionary in flash memory");
-		mfCheckKeys_fast( sectorsCnt, true, true, 1, 0, keyBlock, e_sector, use_flashmemory);
-	} else {
+    if ( use_flashmemory ) {
+        PrintAndLogEx(SUCCESS, "Using dictionary in flash memory");
+        mfCheckKeys_fast( sectorsCnt, true, true, 1, 0, keyBlock, e_sector, use_flashmemory);
+    } else {
 
-		// strategys. 1= deep first on sector 0 AB,  2= width first on all sectors
-		for (uint8_t strategy = 1; strategy < 3; strategy++) {
-			PrintAndLogEx(SUCCESS, "Running strategy %u", strategy);
+        // strategys. 1= deep first on sector 0 AB,  2= width first on all sectors
+        for (uint8_t strategy = 1; strategy < 3; strategy++) {
+            PrintAndLogEx(SUCCESS, "Running strategy %u", strategy);
 
-				// main keychunk loop
-				for (uint32_t i = 0; i < keycnt; i += chunksize) {
+                // main keychunk loop
+                for (uint32_t i = 0; i < keycnt; i += chunksize) {
 
-					if (ukbhit()) {
-						int gc = getchar(); (void)gc;
-						PrintAndLogEx(WARNING, "\naborted via keyboard!\n");
-						goto out;
-					}
+                    if (ukbhit()) {
+                        int gc = getchar(); (void)gc;
+                        PrintAndLogEx(WARNING, "\naborted via keyboard!\n");
+                        goto out;
+                    }
 
-					uint32_t size = ((keycnt - i)  > chunksize) ? chunksize : keycnt - i;
+                    uint32_t size = ((keycnt - i)  > chunksize) ? chunksize : keycnt - i;
 
-					// last chunk?
-					if ( size == keycnt - i)
-						lastChunk = true;
+                    // last chunk?
+                    if ( size == keycnt - i)
+                        lastChunk = true;
 
-					int res = mfCheckKeys_fast( sectorsCnt, firstChunk, lastChunk, strategy, size, keyBlock + (i * 6), e_sector, false);
+                    int res = mfCheckKeys_fast( sectorsCnt, firstChunk, lastChunk, strategy, size, keyBlock + (i * 6), e_sector, false);
 
-					if ( firstChunk )
-						firstChunk = false;
+                    if ( firstChunk )
+                        firstChunk = false;
 
-					// all keys,  aborted
-					if ( res == 0 || res == 2 )
-						goto out;
-				} // end chunks of keys
-			firstChunk = true;
-			lastChunk = false;
-		} // end strategy
-	}
+                    // all keys,  aborted
+                    if ( res == 0 || res == 2 )
+                        goto out;
+                } // end chunks of keys
+            firstChunk = true;
+            lastChunk = false;
+        } // end strategy
+    }
 out:
-	t1 = msclock() - t1;
-	PrintAndLogEx(SUCCESS, "Time in checkkeys (fast):  %.1fs\n", (float)(t1/1000.0));
+    t1 = msclock() - t1;
+    PrintAndLogEx(SUCCESS, "Time in checkkeys (fast):  %.1fs\n", (float)(t1/1000.0));
 
-	// check..
-	uint8_t found_keys = 0;
-	for (uint8_t i = 0; i < sectorsCnt; ++i) {
+    // check..
+    uint8_t found_keys = 0;
+    for (uint8_t i = 0; i < sectorsCnt; ++i) {
 
-		if ( e_sector[i].foundKey[0] )
-			found_keys++;
+        if ( e_sector[i].foundKey[0] )
+            found_keys++;
 
-		if ( e_sector[i].foundKey[1] )
-			found_keys++;
-	}
+        if ( e_sector[i].foundKey[1] )
+            found_keys++;
+    }
 
-	if ( found_keys == 0 ) {
-		PrintAndLogEx(WARNING, "No keys found");
-	} else {
+    if ( found_keys == 0 ) {
+        PrintAndLogEx(WARNING, "No keys found");
+    } else {
 
-		printKeyTable( sectorsCnt, e_sector );
+        printKeyTable( sectorsCnt, e_sector );
 
-		if (transferToEml) {
-			uint8_t block[16] = {0x00};
-			for (uint8_t i = 0; i < sectorsCnt; ++i ) {
-				mfEmlGetMem(block, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
-				if (e_sector[i].foundKey[0])
-					num_to_bytes(e_sector[i].Key[0], 6, block);
-				if (e_sector[i].foundKey[1])
-					num_to_bytes(e_sector[i].Key[1], 6, block+10);
-				mfEmlSetMem(block, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
-			}
-			PrintAndLogEx(SUCCESS, "Found keys have been transferred to the emulator memory");
-		}
+        if (transferToEml) {
+            uint8_t block[16] = {0x00};
+            for (uint8_t i = 0; i < sectorsCnt; ++i ) {
+                mfEmlGetMem(block, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
+                if (e_sector[i].foundKey[0])
+                    num_to_bytes(e_sector[i].Key[0], 6, block);
+                if (e_sector[i].foundKey[1])
+                    num_to_bytes(e_sector[i].Key[1], 6, block+10);
+                mfEmlSetMem(block, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
+            }
+            PrintAndLogEx(SUCCESS, "Found keys have been transferred to the emulator memory");
+        }
 
-		if (createDumpFile) {
-			fptr = GenerateFilename("hf-mf-", "-key.bin");
-			if (fptr == NULL)
-				return 1;
+        if (createDumpFile) {
+            fptr = GenerateFilename("hf-mf-", "-key.bin");
+            if (fptr == NULL)
+                return 1;
 
-			FILE *fkeys = fopen(fptr, "wb");
-			if (fkeys == NULL) {
-				PrintAndLogEx(WARNING, "Could not create file " _YELLOW_(%s), fptr);
-				free(keyBlock);
-				free(e_sector);
-				return 1;
-			}
-			PrintAndLogEx(SUCCESS, "Printing keys to binary file " _YELLOW_(%s)"...", fptr);
+            FILE *fkeys = fopen(fptr, "wb");
+            if (fkeys == NULL) {
+                PrintAndLogEx(WARNING, "Could not create file " _YELLOW_(%s), fptr);
+                free(keyBlock);
+                free(e_sector);
+                return 1;
+            }
+            PrintAndLogEx(SUCCESS, "Printing keys to binary file " _YELLOW_(%s)"...", fptr);
 
-			for (i=0; i<sectorsCnt; i++) {
-				num_to_bytes(e_sector[i].Key[0], 6, tempkey);
-				fwrite (tempkey, 1, 6, fkeys);
-			}
+            for (i=0; i<sectorsCnt; i++) {
+                num_to_bytes(e_sector[i].Key[0], 6, tempkey);
+                fwrite (tempkey, 1, 6, fkeys);
+            }
 
-			for (i=0; i<sectorsCnt; i++) {
-				num_to_bytes(e_sector[i].Key[1], 6, tempkey);
-				fwrite (tempkey, 1, 6, fkeys );
-			}
+            for (i=0; i<sectorsCnt; i++) {
+                num_to_bytes(e_sector[i].Key[1], 6, tempkey);
+                fwrite (tempkey, 1, 6, fkeys );
+            }
 
-			fclose(fkeys);
-			PrintAndLogEx(SUCCESS, "Found keys have been dumped to " _YELLOW_(%s)" --> 0xffffffffffff has been inserted for unknown keys.", fptr);
-		}
-	}
+            fclose(fkeys);
+            PrintAndLogEx(SUCCESS, "Found keys have been dumped to " _YELLOW_(%s)" --> 0xffffffffffff has been inserted for unknown keys.", fptr);
+        }
+    }
 
-	free(keyBlock);
-	free(e_sector);
-	PrintAndLogEx(NORMAL, "");
-	return 0;
+    free(keyBlock);
+    free(e_sector);
+    PrintAndLogEx(NORMAL, "");
+    return 0;
 }
 
 int CmdHF14AMfChk(const char *Cmd) {
 
-	char ctmp = tolower(param_getchar(Cmd, 0));
-	if (strlen(Cmd) < 3 || ctmp == 'h') return usage_hf14_chk();
+    char ctmp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) < 3 || ctmp == 'h') return usage_hf14_chk();
 
-	FILE * f;
-	char filename[FILE_PATH_SIZE] = {0};
-	char buf[13];
-	uint8_t *keyBlock = NULL, *p;
-	sector_t *e_sector = NULL;
+    FILE * f;
+    char filename[FILE_PATH_SIZE] = {0};
+    char buf[13];
+    uint8_t *keyBlock = NULL, *p;
+    sector_t *e_sector = NULL;
 
-	uint8_t blockNo = 0;
-	uint8_t SectorsCnt = 1;
-	uint8_t keyType = 0;
-	uint32_t keyitems = MIFARE_DEFAULTKEYS_SIZE;
-	uint64_t key64 = 0;
-	uint8_t tempkey[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
-	char *fptr;
-	int clen = 0;
-	int transferToEml = 0;
-	int createDumpFile = 0;
-	int i, res, keycnt = 0;
+    uint8_t blockNo = 0;
+    uint8_t SectorsCnt = 1;
+    uint8_t keyType = 0;
+    uint32_t keyitems = MIFARE_DEFAULTKEYS_SIZE;
+    uint64_t key64 = 0;
+    uint8_t tempkey[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
+    char *fptr;
+    int clen = 0;
+    int transferToEml = 0;
+    int createDumpFile = 0;
+    int i, res, keycnt = 0;
 
-	keyBlock = calloc(MIFARE_DEFAULTKEYS_SIZE, 6);
-	if (keyBlock == NULL) return 1;
+    keyBlock = calloc(MIFARE_DEFAULTKEYS_SIZE, 6);
+    if (keyBlock == NULL) return 1;
 
-	for (int cnt = 0; cnt < MIFARE_DEFAULTKEYS_SIZE; cnt++)
-		num_to_bytes(g_mifare_default_keys[cnt], 6, (uint8_t*)(keyBlock + cnt * 6));
+    for (int cnt = 0; cnt < MIFARE_DEFAULTKEYS_SIZE; cnt++)
+        num_to_bytes(g_mifare_default_keys[cnt], 6, (uint8_t*)(keyBlock + cnt * 6));
 
-	if (param_getchar(Cmd, 0)=='*') {
-		blockNo = 3;
-		SectorsCnt = NumOfSectors( param_getchar(Cmd+1, 0) );
-	} else {
-		blockNo = param_get8(Cmd, 0);
-	}
+    if (param_getchar(Cmd, 0)=='*') {
+        blockNo = 3;
+        SectorsCnt = NumOfSectors( param_getchar(Cmd+1, 0) );
+    } else {
+        blockNo = param_get8(Cmd, 0);
+    }
 
-	ctmp = tolower(param_getchar(Cmd, 1));
-	clen = param_getlength(Cmd, 1);
-	if (clen == 1) {
-		switch (ctmp) {
-		case 'a':
-			keyType = 0;
-			break;
-		case 'b':
-			keyType = 1;
-			break;
-		case '?':
-			keyType = 2;
-			break;
-		default:
-			PrintAndLogEx(FAILED, "Key type must be A , B or ?");
-			free(keyBlock);
-			return 1;
-		};
-	}
+    ctmp = tolower(param_getchar(Cmd, 1));
+    clen = param_getlength(Cmd, 1);
+    if (clen == 1) {
+        switch (ctmp) {
+        case 'a':
+            keyType = 0;
+            break;
+        case 'b':
+            keyType = 1;
+            break;
+        case '?':
+            keyType = 2;
+            break;
+        default:
+            PrintAndLogEx(FAILED, "Key type must be A , B or ?");
+            free(keyBlock);
+            return 1;
+        };
+    }
 
-	for (i = 2; param_getchar(Cmd, i); i++) {
+    for (i = 2; param_getchar(Cmd, i); i++) {
 
-		ctmp = tolower(param_getchar(Cmd, i));
-		clen = param_getlength(Cmd, i);
+        ctmp = tolower(param_getchar(Cmd, i));
+        clen = param_getlength(Cmd, i);
 
-		if (clen == 12) {
+        if (clen == 12) {
 
-			if ( param_gethex(Cmd, i, keyBlock + 6 * keycnt, 12) ){
-				PrintAndLogEx(FAILED, "not hex, skipping");
-				continue;
-			}
+            if ( param_gethex(Cmd, i, keyBlock + 6 * keycnt, 12) ){
+                PrintAndLogEx(FAILED, "not hex, skipping");
+                continue;
+            }
 
-			if ( keyitems - keycnt < 2) {
-				p = realloc(keyBlock, 6 * (keyitems += 64));
-				if (!p) {
-					PrintAndLogEx(FAILED, "cannot allocate memory for Keys");
-					free(keyBlock);
-					return 2;
-				}
-				keyBlock = p;
-			}
-			PrintAndLogEx(NORMAL, "[%2d] key %s", keycnt, sprint_hex( (keyBlock + 6*keycnt), 6 ) );;
-			keycnt++;
-		} else if ( clen == 1 ) {
-			if (ctmp == 't' ) { transferToEml = 1; continue; }
-			if (ctmp == 'd' ) { createDumpFile = 1; continue; }
-		} else {
-			// May be a dic file
-			if ( param_getstr(Cmd, i, filename, sizeof(filename)) >= FILE_PATH_SIZE ) {
-				PrintAndLogEx(FAILED, "File name too long");
-				continue;
-			}
+            if ( keyitems - keycnt < 2) {
+                p = realloc(keyBlock, 6 * (keyitems += 64));
+                if (!p) {
+                    PrintAndLogEx(FAILED, "cannot allocate memory for Keys");
+                    free(keyBlock);
+                    return 2;
+                }
+                keyBlock = p;
+            }
+            PrintAndLogEx(NORMAL, "[%2d] key %s", keycnt, sprint_hex( (keyBlock + 6*keycnt), 6 ) );;
+            keycnt++;
+        } else if ( clen == 1 ) {
+            if (ctmp == 't' ) { transferToEml = 1; continue; }
+            if (ctmp == 'd' ) { createDumpFile = 1; continue; }
+        } else {
+            // May be a dic file
+            if ( param_getstr(Cmd, i, filename, sizeof(filename)) >= FILE_PATH_SIZE ) {
+                PrintAndLogEx(FAILED, "File name too long");
+                continue;
+            }
 
-			f = fopen( filename , "r");
-			if ( !f ) {
-				PrintAndLogEx(FAILED, "File: " _YELLOW_(%s) ": not found or locked.", filename);
-				continue;
-			}
+            f = fopen( filename , "r");
+            if ( !f ) {
+                PrintAndLogEx(FAILED, "File: " _YELLOW_(%s) ": not found or locked.", filename);
+                continue;
+            }
 
-			// load keys from dictionary file
-			while( fgets(buf, sizeof(buf), f) ){
-				if (strlen(buf) < 12 || buf[11] == '\n')
-					continue;
+            // load keys from dictionary file
+            while( fgets(buf, sizeof(buf), f) ){
+                if (strlen(buf) < 12 || buf[11] == '\n')
+                    continue;
 
-				while (fgetc(f) != '\n' && !feof(f)) ;  //goto next line
+                while (fgetc(f) != '\n' && !feof(f)) ;  //goto next line
 
-				if( buf[0]=='#' ) continue;	//The line start with # is comment, skip
+                if( buf[0]=='#' ) continue; //The line start with # is comment, skip
 
-				// codesmell, only checks first char?
-				if (!isxdigit(buf[0])){
-					PrintAndLogEx(FAILED, "File content error. '" _YELLOW_(%s)"' must include 12 HEX symbols",buf);
-					continue;
-				}
+                // codesmell, only checks first char?
+                if (!isxdigit(buf[0])){
+                    PrintAndLogEx(FAILED, "File content error. '" _YELLOW_(%s)"' must include 12 HEX symbols",buf);
+                    continue;
+                }
 
-				buf[12] = 0;
+                buf[12] = 0;
 
-				if ( keyitems - keycnt < 2) {
-					p = realloc(keyBlock, 6 * (keyitems += 64));
-					if (!p) {
-						PrintAndLogEx(FAILED, "Cannot allocate memory for defKeys");
-						free(keyBlock);
-						fclose(f);
-						return 2;
-					}
-					keyBlock = p;
-				}
-				memset(keyBlock + 6 * keycnt, 0, 6);
-				num_to_bytes(strtoll(buf, NULL, 16), 6, keyBlock + 6*keycnt);
-				//PrintAndLogEx(NORMAL, "check key[%2d] %012" PRIx64, keycnt, bytes_to_num(keyBlock + 6*keycnt, 6));
-				keycnt++;
-				memset(buf, 0, sizeof(buf));
-			}
-			fclose(f);
-			PrintAndLogEx(SUCCESS, "Loaded %2d keys from " _YELLOW_(%s), keycnt, filename);
-		}
-	}
+                if ( keyitems - keycnt < 2) {
+                    p = realloc(keyBlock, 6 * (keyitems += 64));
+                    if (!p) {
+                        PrintAndLogEx(FAILED, "Cannot allocate memory for defKeys");
+                        free(keyBlock);
+                        fclose(f);
+                        return 2;
+                    }
+                    keyBlock = p;
+                }
+                memset(keyBlock + 6 * keycnt, 0, 6);
+                num_to_bytes(strtoll(buf, NULL, 16), 6, keyBlock + 6*keycnt);
+                //PrintAndLogEx(NORMAL, "check key[%2d] %012" PRIx64, keycnt, bytes_to_num(keyBlock + 6*keycnt, 6));
+                keycnt++;
+                memset(buf, 0, sizeof(buf));
+            }
+            fclose(f);
+            PrintAndLogEx(SUCCESS, "Loaded %2d keys from " _YELLOW_(%s), keycnt, filename);
+        }
+    }
 
-	if (keycnt == 0) {
-		PrintAndLogEx(INFO, "No key specified, trying default keys");
-		for (;keycnt < MIFARE_DEFAULTKEYS_SIZE; keycnt++)
-			PrintAndLogEx(NORMAL, "[%2d] %02x%02x%02x%02x%02x%02x", keycnt,
-				(keyBlock + 6*keycnt)[0],(keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2],
-				(keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4],	(keyBlock + 6*keycnt)[5], 6);
-	}
+    if (keycnt == 0) {
+        PrintAndLogEx(INFO, "No key specified, trying default keys");
+        for (;keycnt < MIFARE_DEFAULTKEYS_SIZE; keycnt++)
+            PrintAndLogEx(NORMAL, "[%2d] %02x%02x%02x%02x%02x%02x", keycnt,
+                (keyBlock + 6*keycnt)[0],(keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2],
+                (keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4], (keyBlock + 6*keycnt)[5], 6);
+    }
 
-	// initialize storage for found keys
-	e_sector = calloc(SectorsCnt, sizeof(sector_t));
-	if (e_sector == NULL) {
-		free(keyBlock);
-		return 1;
-	}
+    // initialize storage for found keys
+    e_sector = calloc(SectorsCnt, sizeof(sector_t));
+    if (e_sector == NULL) {
+        free(keyBlock);
+        return 1;
+    }
 
-	// empty e_sector
-	for(int i = 0; i < SectorsCnt; ++i){
-		e_sector[i].Key[0] = 0xffffffffffff;
-		e_sector[i].Key[1] = 0xffffffffffff;
-		e_sector[i].foundKey[0] = false;
-		e_sector[i].foundKey[1] = false;
-	}
+    // empty e_sector
+    for(int i = 0; i < SectorsCnt; ++i){
+        e_sector[i].Key[0] = 0xffffffffffff;
+        e_sector[i].Key[1] = 0xffffffffffff;
+        e_sector[i].foundKey[0] = false;
+        e_sector[i].foundKey[1] = false;
+    }
 
 
-	uint8_t trgKeyType = 0;
-	uint32_t max_keys = keycnt > (USB_CMD_DATA_SIZE/6) ? (USB_CMD_DATA_SIZE/6) : keycnt;
+    uint8_t trgKeyType = 0;
+    uint32_t max_keys = keycnt > (USB_CMD_DATA_SIZE/6) ? (USB_CMD_DATA_SIZE/6) : keycnt;
 
-	// time
-	uint64_t t1 = msclock();
+    // time
+    uint64_t t1 = msclock();
 
 
-	// check keys.
-	for (trgKeyType = (keyType==2)?0:keyType; trgKeyType < 2; (keyType==2) ? (++trgKeyType) : (trgKeyType=2) ) {
+    // check keys.
+    for (trgKeyType = (keyType==2)?0:keyType; trgKeyType < 2; (keyType==2) ? (++trgKeyType) : (trgKeyType=2) ) {
 
-		int b = blockNo;
-		for (int i = 0; i < SectorsCnt; ++i) {
+        int b = blockNo;
+        for (int i = 0; i < SectorsCnt; ++i) {
 
-			// skip already found keys.
-			if (e_sector[i].foundKey[trgKeyType]) continue;
+            // skip already found keys.
+            if (e_sector[i].foundKey[trgKeyType]) continue;
 
-			for (uint32_t c = 0; c < keycnt; c += max_keys) {
+            for (uint32_t c = 0; c < keycnt; c += max_keys) {
 
-				printf("."); fflush(stdout);
-				if (ukbhit()) {
-					int gc = getchar();	(void)gc;
-					PrintAndLogEx(INFO, "\naborted via keyboard!\n");
-					goto out;
-				}
+                printf("."); fflush(stdout);
+                if (ukbhit()) {
+                    int gc = getchar(); (void)gc;
+                    PrintAndLogEx(INFO, "\naborted via keyboard!\n");
+                    goto out;
+                }
 
-				uint32_t size = keycnt-c > max_keys ? max_keys : keycnt-c;
+                uint32_t size = keycnt-c > max_keys ? max_keys : keycnt-c;
 
-				res = mfCheckKeys(b, trgKeyType, true, size, &keyBlock[6*c], &key64);
-				if (!res) {
-					e_sector[i].Key[trgKeyType] = key64;
-					e_sector[i].foundKey[trgKeyType] = true;
-					break;
-				}
+                res = mfCheckKeys(b, trgKeyType, true, size, &keyBlock[6*c], &key64);
+                if (!res) {
+                    e_sector[i].Key[trgKeyType] = key64;
+                    e_sector[i].foundKey[trgKeyType] = true;
+                    break;
+                }
 
 
-			}
-			b < 127 ? ( b +=4 ) : ( b += 16 );
-		}
-	}
-	t1 = msclock() - t1;
-	PrintAndLogEx(SUCCESS, "\nTime in checkkeys: %.0f seconds\n", (float)t1/1000.0);
+            }
+            b < 127 ? ( b +=4 ) : ( b += 16 );
+        }
+    }
+    t1 = msclock() - t1;
+    PrintAndLogEx(SUCCESS, "\nTime in checkkeys: %.0f seconds\n", (float)t1/1000.0);
 
 
-	// 20160116 If Sector A is found, but not Sector B,  try just reading it of the tag?
-	if ( keyType != 1 ) {
-		PrintAndLogEx(INFO, "testing to read key B...");
-		for (i = 0; i < SectorsCnt; i++) {
-			// KEY A  but not KEY B
-			if ( e_sector[i].foundKey[0] && !e_sector[i].foundKey[1] ) {
+    // 20160116 If Sector A is found, but not Sector B,  try just reading it of the tag?
+    if ( keyType != 1 ) {
+        PrintAndLogEx(INFO, "testing to read key B...");
+        for (i = 0; i < SectorsCnt; i++) {
+            // KEY A  but not KEY B
+            if ( e_sector[i].foundKey[0] && !e_sector[i].foundKey[1] ) {
 
-				uint8_t sectrail = (FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1);
+                uint8_t sectrail = (FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1);
 
-				PrintAndLogEx(NORMAL, "Reading block %d", sectrail);
+                PrintAndLogEx(NORMAL, "Reading block %d", sectrail);
 
-				UsbCommand c = {CMD_MIFARE_READBL, {sectrail, 0, 0}};
-				num_to_bytes(e_sector[i].Key[0], 6, c.d.asBytes); // KEY A
-				clearCommandBuffer();
-				SendCommand(&c);
+                UsbCommand c = {CMD_MIFARE_READBL, {sectrail, 0, 0}};
+                num_to_bytes(e_sector[i].Key[0], 6, c.d.asBytes); // KEY A
+                clearCommandBuffer();
+                SendCommand(&c);
 
-				UsbCommand resp;
-				if ( !WaitForResponseTimeout(CMD_ACK,&resp,1500)) continue;
+                UsbCommand resp;
+                if ( !WaitForResponseTimeout(CMD_ACK,&resp,1500)) continue;
 
-				uint8_t isOK  = resp.arg[0] & 0xff;
-				if (!isOK) continue;
+                uint8_t isOK  = resp.arg[0] & 0xff;
+                if (!isOK) continue;
 
-				uint8_t *data = resp.d.asBytes;
-				key64 = bytes_to_num(data+10, 6);
-				if (key64) {
-					PrintAndLogEx(NORMAL, "Data:%s", sprint_hex(data+10, 6));
-					e_sector[i].foundKey[1] = 1;
-					e_sector[i].Key[1] = key64;
-				}
-			}
-		}
-	}
+                uint8_t *data = resp.d.asBytes;
+                key64 = bytes_to_num(data+10, 6);
+                if (key64) {
+                    PrintAndLogEx(NORMAL, "Data:%s", sprint_hex(data+10, 6));
+                    e_sector[i].foundKey[1] = 1;
+                    e_sector[i].Key[1] = key64;
+                }
+            }
+        }
+    }
 
 out:
 
-	//print keys
-	printKeyTable( SectorsCnt, e_sector );
+    //print keys
+    printKeyTable( SectorsCnt, e_sector );
 
-	if (transferToEml) {
-		uint8_t block[16] = {0x00};
-		for (uint8_t i = 0; i < SectorsCnt; ++i ) {
-			mfEmlGetMem(block, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
-			if (e_sector[i].foundKey[0])
-				num_to_bytes(e_sector[i].Key[0], 6, block);
-			if (e_sector[i].foundKey[1])
-				num_to_bytes(e_sector[i].Key[1], 6, block+10);
-			mfEmlSetMem(block, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
-		}
-		PrintAndLogEx(SUCCESS, "Found keys have been transferred to the emulator memory");
-	}
+    if (transferToEml) {
+        uint8_t block[16] = {0x00};
+        for (uint8_t i = 0; i < SectorsCnt; ++i ) {
+            mfEmlGetMem(block, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
+            if (e_sector[i].foundKey[0])
+                num_to_bytes(e_sector[i].Key[0], 6, block);
+            if (e_sector[i].foundKey[1])
+                num_to_bytes(e_sector[i].Key[1], 6, block+10);
+            mfEmlSetMem(block, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
+        }
+        PrintAndLogEx(SUCCESS, "Found keys have been transferred to the emulator memory");
+    }
 
-	if (createDumpFile) {
-		fptr = GenerateFilename("hf-mf-", "-key.bin");
-		if (fptr == NULL) {
-			free(keyBlock);
-			free(e_sector);
-			return 1;
-		}
+    if (createDumpFile) {
+        fptr = GenerateFilename("hf-mf-", "-key.bin");
+        if (fptr == NULL) {
+            free(keyBlock);
+            free(e_sector);
+            return 1;
+        }
 
-		FILE *fkeys = fopen(fptr, "wb");
-		if (fkeys == NULL) {
-			PrintAndLogEx(WARNING, "Could not create file " _YELLOW_(%s), fptr);
-			free(keyBlock);
-			free(e_sector);
-			return 1;
-		}
-		PrintAndLogEx(INFO, "Printing keys to binary file " _YELLOW_(%s)"...", fptr);
+        FILE *fkeys = fopen(fptr, "wb");
+        if (fkeys == NULL) {
+            PrintAndLogEx(WARNING, "Could not create file " _YELLOW_(%s), fptr);
+            free(keyBlock);
+            free(e_sector);
+            return 1;
+        }
+        PrintAndLogEx(INFO, "Printing keys to binary file " _YELLOW_(%s)"...", fptr);
 
-		for( i=0; i<SectorsCnt; i++) {
-			num_to_bytes(e_sector[i].Key[0], 6, tempkey);
-			fwrite ( tempkey, 1, 6, fkeys );
-		}
-		for(i=0; i<SectorsCnt; i++) {
-			num_to_bytes(e_sector[i].Key[1], 6, tempkey);
-			fwrite ( tempkey, 1, 6, fkeys );
-		}
-		fclose(fkeys);
-		PrintAndLogEx(SUCCESS, "Found keys have been dumped to file " _YELLOW_(%s)". 0xffffffffffff has been inserted for unknown keys.", fptr);
-	}
+        for( i=0; i<SectorsCnt; i++) {
+            num_to_bytes(e_sector[i].Key[0], 6, tempkey);
+            fwrite ( tempkey, 1, 6, fkeys );
+        }
+        for(i=0; i<SectorsCnt; i++) {
+            num_to_bytes(e_sector[i].Key[1], 6, tempkey);
+            fwrite ( tempkey, 1, 6, fkeys );
+        }
+        fclose(fkeys);
+        PrintAndLogEx(SUCCESS, "Found keys have been dumped to file " _YELLOW_(%s)". 0xffffffffffff has been inserted for unknown keys.", fptr);
+    }
 
-	free(keyBlock);
-	free(e_sector);
-	PrintAndLogEx(NORMAL, "");
-	return 0;
+    free(keyBlock);
+    free(e_sector);
+    PrintAndLogEx(NORMAL, "");
+    return 0;
 }
 
 sector_t *k_sector = NULL;
 uint8_t k_sectorsCount = 16;
 static void emptySectorTable(){
 
-	// initialize storage for found keys
-	if (k_sector == NULL)
-		k_sector = calloc(k_sectorsCount, sizeof(sector_t));
-	if (k_sector == NULL)
-		return;
+    // initialize storage for found keys
+    if (k_sector == NULL)
+        k_sector = calloc(k_sectorsCount, sizeof(sector_t));
+    if (k_sector == NULL)
+        return;
 
-	// empty e_sector
-	for(int i = 0; i < k_sectorsCount; ++i){
-		k_sector[i].Key[0] = 0xffffffffffff;
-		k_sector[i].Key[1] = 0xffffffffffff;
-		k_sector[i].foundKey[0] = false;
-		k_sector[i].foundKey[1] = false;
-	}
+    // empty e_sector
+    for(int i = 0; i < k_sectorsCount; ++i){
+        k_sector[i].Key[0] = 0xffffffffffff;
+        k_sector[i].Key[1] = 0xffffffffffff;
+        k_sector[i].foundKey[0] = false;
+        k_sector[i].foundKey[1] = false;
+    }
 }
 
 void showSectorTable(){
-	if (k_sector != NULL) {
-		printKeyTable(k_sectorsCount, k_sector);
-		free(k_sector);
-		k_sector = NULL;
-	}
+    if (k_sector != NULL) {
+        printKeyTable(k_sectorsCount, k_sector);
+        free(k_sector);
+        k_sector = NULL;
+    }
 }
 
 void readerAttack(nonces_t data, bool setEmulatorMem, bool verbose) {
 
-	uint64_t key = 0;
-	bool success = false;
+    uint64_t key = 0;
+    bool success = false;
 
-	if (k_sector == NULL)
-		emptySectorTable();
+    if (k_sector == NULL)
+        emptySectorTable();
 
-	success = mfkey32_moebius(data, &key);
-	if (success) {
-		uint8_t sector = data.sector;
-		uint8_t keytype = data.keytype;
+    success = mfkey32_moebius(data, &key);
+    if (success) {
+        uint8_t sector = data.sector;
+        uint8_t keytype = data.keytype;
 
-		PrintAndLogEx(INFO, "Reader is trying authenticate with: Key %s, sector %02d: [%012" PRIx64 "]"
-			, keytype ? "B" : "A"
-			, sector
-			, key
-		);
+        PrintAndLogEx(INFO, "Reader is trying authenticate with: Key %s, sector %02d: [%012" PRIx64 "]"
+            , keytype ? "B" : "A"
+            , sector
+            , key
+        );
 
-		k_sector[sector].Key[keytype] = key;
-		k_sector[sector].foundKey[keytype] = true;
+        k_sector[sector].Key[keytype] = key;
+        k_sector[sector].foundKey[keytype] = true;
 
-		//set emulator memory for keys
-		if (setEmulatorMem) {
-			uint8_t	memBlock[16] = {0,0,0,0,0,0, 0xff, 0x0F, 0x80, 0x69, 0,0,0,0,0,0};
-			num_to_bytes( k_sector[sector].Key[0], 6, memBlock);
-			num_to_bytes( k_sector[sector].Key[1], 6, memBlock+10);
-			//iceman,  guessing this will not work so well for 4K tags.
-			PrintAndLogEx(INFO, "Setting Emulator Memory Block %02d: [%s]"
-				, (sector*4) + 3
-				, sprint_hex( memBlock, sizeof(memBlock))
-				);
-			mfEmlSetMem( memBlock, (sector*4) + 3, 1);
-		}
-	}
+        //set emulator memory for keys
+        if (setEmulatorMem) {
+            uint8_t memBlock[16] = {0,0,0,0,0,0, 0xff, 0x0F, 0x80, 0x69, 0,0,0,0,0,0};
+            num_to_bytes( k_sector[sector].Key[0], 6, memBlock);
+            num_to_bytes( k_sector[sector].Key[1], 6, memBlock+10);
+            //iceman,  guessing this will not work so well for 4K tags.
+            PrintAndLogEx(INFO, "Setting Emulator Memory Block %02d: [%s]"
+                , (sector*4) + 3
+                , sprint_hex( memBlock, sizeof(memBlock))
+                );
+            mfEmlSetMem( memBlock, (sector*4) + 3, 1);
+        }
+    }
 }
 
 int CmdHF14AMf1kSim(const char *Cmd) {
 
-	uint8_t uid[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-	uint8_t exitAfterNReads = 0;
-	uint8_t flags = (FLAG_UID_IN_EMUL | FLAG_4B_UID_IN_DATA);
-	int uidlen = 0;
-	uint8_t cmdp = 0;
-	bool errors = false, verbose = false, setEmulatorMem = false;
-	nonces_t data[1];
+    uint8_t uid[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+    uint8_t exitAfterNReads = 0;
+    uint8_t flags = (FLAG_UID_IN_EMUL | FLAG_4B_UID_IN_DATA);
+    int uidlen = 0;
+    uint8_t cmdp = 0;
+    bool errors = false, verbose = false, setEmulatorMem = false;
+    nonces_t data[1];
 
-	while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch( tolower(param_getchar(Cmd, cmdp))) {
-		case 'e':
-			setEmulatorMem = true;
-			cmdp++;
-			break;
-		case 'h':
-			return usage_hf14_mf1ksim();
-		case 'i':
-			flags |= FLAG_INTERACTIVE;
-			cmdp++;
-			break;
-		case 'n':
-			exitAfterNReads = param_get8(Cmd, cmdp+1);
-			cmdp += 2;
-			break;
-		case 'u':
-			param_gethex_ex(Cmd, cmdp+1, uid, &uidlen);
-			switch(uidlen) {
-				case 20: flags = FLAG_10B_UID_IN_DATA; break;
-				case 14: flags = FLAG_7B_UID_IN_DATA; break;
-				case  8: flags = FLAG_4B_UID_IN_DATA; break;
-				default: return usage_hf14_mf1ksim();
-			}
-			cmdp += 2;
-			break;
-		case 'v':
-			verbose = true;
-			cmdp++;
-			break;
-		case 'x':
-			flags |= FLAG_NR_AR_ATTACK;
-			cmdp++;
-			break;
-		default:
-			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-			errors = true;
-			break;
-		}
-	}
-	//Validations
-	if (errors) return usage_hf14_mf1ksim();
+    while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch( tolower(param_getchar(Cmd, cmdp))) {
+        case 'e':
+            setEmulatorMem = true;
+            cmdp++;
+            break;
+        case 'h':
+            return usage_hf14_mf1ksim();
+        case 'i':
+            flags |= FLAG_INTERACTIVE;
+            cmdp++;
+            break;
+        case 'n':
+            exitAfterNReads = param_get8(Cmd, cmdp+1);
+            cmdp += 2;
+            break;
+        case 'u':
+            param_gethex_ex(Cmd, cmdp+1, uid, &uidlen);
+            switch(uidlen) {
+                case 20: flags = FLAG_10B_UID_IN_DATA; break;
+                case 14: flags = FLAG_7B_UID_IN_DATA; break;
+                case  8: flags = FLAG_4B_UID_IN_DATA; break;
+                default: return usage_hf14_mf1ksim();
+            }
+            cmdp += 2;
+            break;
+        case 'v':
+            verbose = true;
+            cmdp++;
+            break;
+        case 'x':
+            flags |= FLAG_NR_AR_ATTACK;
+            cmdp++;
+            break;
+        default:
+            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+            errors = true;
+            break;
+        }
+    }
+    //Validations
+    if (errors) return usage_hf14_mf1ksim();
 
-	PrintAndLogEx(NORMAL, " uid:%s, numreads:%d, flags:%d (0x%02x) "
-				, (uidlen == 0 ) ? "N/A" : sprint_hex(uid, uidlen>>1)
-				, exitAfterNReads
-				, flags
-				, flags);
+    PrintAndLogEx(NORMAL, " uid:%s, numreads:%d, flags:%d (0x%02x) "
+                , (uidlen == 0 ) ? "N/A" : sprint_hex(uid, uidlen>>1)
+                , exitAfterNReads
+                , flags
+                , flags);
 
-	UsbCommand c = {CMD_SIMULATE_MIFARE_CARD, {flags, exitAfterNReads, 0}};
-	memcpy(c.d.asBytes, uid, sizeof(uid));
-	clearCommandBuffer();
-	SendCommand(&c);
-	UsbCommand resp;
+    UsbCommand c = {CMD_SIMULATE_MIFARE_CARD, {flags, exitAfterNReads, 0}};
+    memcpy(c.d.asBytes, uid, sizeof(uid));
+    clearCommandBuffer();
+    SendCommand(&c);
+    UsbCommand resp;
 
-	if(flags & FLAG_INTERACTIVE) {
-		PrintAndLogEx(INFO, "Press pm3-button or send another cmd to abort simulation");
+    if(flags & FLAG_INTERACTIVE) {
+        PrintAndLogEx(INFO, "Press pm3-button or send another cmd to abort simulation");
 
-		while( !ukbhit() ){
-			if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500) ) continue;
-			if ( !(flags & FLAG_NR_AR_ATTACK) ) break;
-			if ( (resp.arg[0] & 0xffff) != CMD_SIMULATE_MIFARE_CARD ) break;
+        while( !ukbhit() ){
+            if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500) ) continue;
+            if ( !(flags & FLAG_NR_AR_ATTACK) ) break;
+            if ( (resp.arg[0] & 0xffff) != CMD_SIMULATE_MIFARE_CARD ) break;
 
-			memcpy(data, resp.d.asBytes, sizeof(data));
-			readerAttack(data[0], setEmulatorMem, verbose);
-		}
-		showSectorTable();
-	}
-	return 0;
+            memcpy(data, resp.d.asBytes, sizeof(data));
+            readerAttack(data[0], setEmulatorMem, verbose);
+        }
+        showSectorTable();
+    }
+    return 0;
 }
 
 int CmdHF14AMfSniff(const char *Cmd){
-	bool wantLogToFile = false;
-	bool wantDecrypt = false;
-	//bool wantSaveToEml = false; TODO
-	bool wantSaveToEmlFile = false;
+    bool wantLogToFile = false;
+    bool wantDecrypt = false;
+    //bool wantSaveToEml = false; TODO
+    bool wantSaveToEmlFile = false;
 
-	//var
-	int res = 0, len = 0, blockLen = 0;
-	int pckNum = 0, num = 0;
-	uint8_t sak = 0;
-	uint8_t uid[10];
-	uint8_t uid_len = 0;
-	uint8_t atqa[2] = {0x00, 0x00};
-	bool isTag = false;
-	uint8_t *buf = NULL;
-	uint16_t bufsize = 0;
-	uint8_t *bufPtr = NULL;
-	uint16_t traceLen = 0;
+    //var
+    int res = 0, len = 0, blockLen = 0;
+    int pckNum = 0, num = 0;
+    uint8_t sak = 0;
+    uint8_t uid[10];
+    uint8_t uid_len = 0;
+    uint8_t atqa[2] = {0x00, 0x00};
+    bool isTag = false;
+    uint8_t *buf = NULL;
+    uint16_t bufsize = 0;
+    uint8_t *bufPtr = NULL;
+    uint16_t traceLen = 0;
 
-	memset(uid, 0x00, sizeof(uid));
+    memset(uid, 0x00, sizeof(uid));
 
-	char ctmp = tolower(param_getchar(Cmd, 0));
-	if ( ctmp == 'h') return usage_hf14_sniff();
+    char ctmp = tolower(param_getchar(Cmd, 0));
+    if ( ctmp == 'h') return usage_hf14_sniff();
 
-	for (int i = 0; i < 4; i++) {
-		ctmp = tolower(param_getchar(Cmd, i));
-		if (ctmp == 'l') wantLogToFile = true;
-		if (ctmp == 'd') wantDecrypt = true;
-		//if (ctmp == 'e') wantSaveToEml = true; TODO
-		if (ctmp == 'f') wantSaveToEmlFile = true;
-	}
+    for (int i = 0; i < 4; i++) {
+        ctmp = tolower(param_getchar(Cmd, i));
+        if (ctmp == 'l') wantLogToFile = true;
+        if (ctmp == 'd') wantDecrypt = true;
+        //if (ctmp == 'e') wantSaveToEml = true; TODO
+        if (ctmp == 'f') wantSaveToEmlFile = true;
+    }
 
-	PrintAndLogEx(NORMAL, "-------------------------------------------------------------------------\n");
-	PrintAndLogEx(NORMAL, "Executing mifare sniffing command. \n");
-	PrintAndLogEx(NORMAL, "Press the key on the proxmark3 device to abort both proxmark3 and client.\n");
-	PrintAndLogEx(NORMAL, "Press the key on pc keyboard to abort the client.\n");
-	PrintAndLogEx(NORMAL, "-------------------------------------------------------------------------\n");
+    PrintAndLogEx(NORMAL, "-------------------------------------------------------------------------\n");
+    PrintAndLogEx(NORMAL, "Executing mifare sniffing command. \n");
+    PrintAndLogEx(NORMAL, "Press the key on the proxmark3 device to abort both proxmark3 and client.\n");
+    PrintAndLogEx(NORMAL, "Press the key on pc keyboard to abort the client.\n");
+    PrintAndLogEx(NORMAL, "-------------------------------------------------------------------------\n");
 
-	UsbCommand c = {CMD_MIFARE_SNIFFER, {0, 0, 0}};
-	clearCommandBuffer();
-	SendCommand(&c);
+    UsbCommand c = {CMD_MIFARE_SNIFFER, {0, 0, 0}};
+    clearCommandBuffer();
+    SendCommand(&c);
 
-	UsbCommand resp;
+    UsbCommand resp;
 
-	// wait cycle
-	while (true) {
-		printf("."); fflush(stdout);
-		if (ukbhit()) {
-			int gc = getchar(); (void)gc;
-			PrintAndLogEx(INFO, "\naborted via keyboard!\n");
-			break;
-		}
+    // wait cycle
+    while (true) {
+        printf("."); fflush(stdout);
+        if (ukbhit()) {
+            int gc = getchar(); (void)gc;
+            PrintAndLogEx(INFO, "\naborted via keyboard!\n");
+            break;
+        }
 
-		if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
-			continue;
-		}
+        if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
+            continue;
+        }
 
-		res = resp.arg[0] & 0xff;
-		traceLen = resp.arg[1];
-		len = resp.arg[2];
+        res = resp.arg[0] & 0xff;
+        traceLen = resp.arg[1];
+        len = resp.arg[2];
 
-		if (res == 0) {
-			PrintAndLogEx(SUCCESS, "hf mifare sniff finished");
-			free(buf);
-			return 0;
-		}
+        if (res == 0) {
+            PrintAndLogEx(SUCCESS, "hf mifare sniff finished");
+            free(buf);
+            return 0;
+        }
 
-		if (res == 1) {								// there is (more) data to be transferred
-			if (pckNum == 0) {						// first packet, (re)allocate necessary buffer
-				if (traceLen > bufsize || buf == NULL) {
-					uint8_t *p;
-					if (buf == NULL)				// not yet allocated
-						p = calloc(traceLen, sizeof(uint8_t));
-					else							// need more memory
-						p = realloc(buf, traceLen);
+        if (res == 1) {                             // there is (more) data to be transferred
+            if (pckNum == 0) {                      // first packet, (re)allocate necessary buffer
+                if (traceLen > bufsize || buf == NULL) {
+                    uint8_t *p;
+                    if (buf == NULL)                // not yet allocated
+                        p = calloc(traceLen, sizeof(uint8_t));
+                    else                            // need more memory
+                        p = realloc(buf, traceLen);
 
-					if (p == NULL) {
-						PrintAndLogEx(FAILED, "Cannot allocate memory for trace");
-						free(buf);
-						return 2;
-					}
-					buf = p;
-				}
-				bufPtr = buf;
-				bufsize = traceLen;
-				memset(buf, 0x00, traceLen);
-			}
+                    if (p == NULL) {
+                        PrintAndLogEx(FAILED, "Cannot allocate memory for trace");
+                        free(buf);
+                        return 2;
+                    }
+                    buf = p;
+                }
+                bufPtr = buf;
+                bufsize = traceLen;
+                memset(buf, 0x00, traceLen);
+            }
 
-			// what happens if LEN is bigger then TRACELEN --iceman
-			memcpy(bufPtr, resp.d.asBytes, len);
-			bufPtr += len;
-			pckNum++;
-		}
+            // what happens if LEN is bigger then TRACELEN --iceman
+            memcpy(bufPtr, resp.d.asBytes, len);
+            bufPtr += len;
+            pckNum++;
+        }
 
-		if (res == 2) {								// received all data, start displaying
-			blockLen = bufPtr - buf;
-			bufPtr = buf;
-			PrintAndLogEx(NORMAL, ">\n");
-			PrintAndLogEx(SUCCESS, "received trace len: %d packages: %d", blockLen, pckNum);
-			while (bufPtr - buf < blockLen) {
-				bufPtr += 6;						// skip (void) timing information
-				len = *((uint16_t *)bufPtr);
-				if(len & 0x8000) {
-					isTag = true;
-					len &= 0x7fff;
-				} else {
-					isTag = false;
-				}
-				bufPtr += 2;
+        if (res == 2) {                             // received all data, start displaying
+            blockLen = bufPtr - buf;
+            bufPtr = buf;
+            PrintAndLogEx(NORMAL, ">\n");
+            PrintAndLogEx(SUCCESS, "received trace len: %d packages: %d", blockLen, pckNum);
+            while (bufPtr - buf < blockLen) {
+                bufPtr += 6;                        // skip (void) timing information
+                len = *((uint16_t *)bufPtr);
+                if(len & 0x8000) {
+                    isTag = true;
+                    len &= 0x7fff;
+                } else {
+                    isTag = false;
+                }
+                bufPtr += 2;
 
-				// the uid identification package
-				// 0xFF 0xFF xx xx xx xx xx xx xx xx xx xx aa aa cc 0xFF 0xFF
-				// x = uid,  a = atqa, c = sak
-				if ((len == 17) && (bufPtr[0] == 0xff) && (bufPtr[1] == 0xff) && (bufPtr[15] == 0xff) && (bufPtr[16] == 0xff)) {
-					memcpy(uid, bufPtr + 2, 10);
-					memcpy(atqa, bufPtr + 2 + 10, 2);
-					switch (atqa[0] & 0xC0) {
-						case 0x80: uid_len = 10; break;
-						case 0x40: uid_len = 7; break;
-						default:   uid_len = 4; break;
-					}
-					sak = bufPtr[14];
-					PrintAndLogEx(SUCCESS, "UID %s | ATQA %02x %02x | SAK 0x%02x",
-						sprint_hex(uid, uid_len),
-						atqa[1],
-						atqa[0],
-						sak);
-					if (wantLogToFile || wantDecrypt) {
-						FillFileNameByUID(logHexFileName, uid, ".log", uid_len);
-						AddLogCurrentDT(logHexFileName);
-						PrintAndLogEx(SUCCESS, "Trace saved to %s", logHexFileName);
-					}
-					if (wantDecrypt)
-						mfTraceInit(uid, uid_len, atqa, sak, wantSaveToEmlFile);
-				} else {
-					PrintAndLogEx(NORMAL, "%03d| %s |%s", num, isTag ? "TAG" : "RDR", sprint_hex(bufPtr, len));
-					if (wantLogToFile)
-						AddLogHex(logHexFileName, isTag ? "TAG| ":"RDR| ", bufPtr, len);
-					if (wantDecrypt)
-						mfTraceDecode(bufPtr, len, wantSaveToEmlFile);
-					num++;
-				}
-				bufPtr += len;
-				bufPtr += ((len-1)/8+1);	// ignore parity
-			}
-			pckNum = 0;
-		}
-	} // while (true)
+                // the uid identification package
+                // 0xFF 0xFF xx xx xx xx xx xx xx xx xx xx aa aa cc 0xFF 0xFF
+                // x = uid,  a = atqa, c = sak
+                if ((len == 17) && (bufPtr[0] == 0xff) && (bufPtr[1] == 0xff) && (bufPtr[15] == 0xff) && (bufPtr[16] == 0xff)) {
+                    memcpy(uid, bufPtr + 2, 10);
+                    memcpy(atqa, bufPtr + 2 + 10, 2);
+                    switch (atqa[0] & 0xC0) {
+                        case 0x80: uid_len = 10; break;
+                        case 0x40: uid_len = 7; break;
+                        default:   uid_len = 4; break;
+                    }
+                    sak = bufPtr[14];
+                    PrintAndLogEx(SUCCESS, "UID %s | ATQA %02x %02x | SAK 0x%02x",
+                        sprint_hex(uid, uid_len),
+                        atqa[1],
+                        atqa[0],
+                        sak);
+                    if (wantLogToFile || wantDecrypt) {
+                        FillFileNameByUID(logHexFileName, uid, ".log", uid_len);
+                        AddLogCurrentDT(logHexFileName);
+                        PrintAndLogEx(SUCCESS, "Trace saved to %s", logHexFileName);
+                    }
+                    if (wantDecrypt)
+                        mfTraceInit(uid, uid_len, atqa, sak, wantSaveToEmlFile);
+                } else {
+                    PrintAndLogEx(NORMAL, "%03d| %s |%s", num, isTag ? "TAG" : "RDR", sprint_hex(bufPtr, len));
+                    if (wantLogToFile)
+                        AddLogHex(logHexFileName, isTag ? "TAG| ":"RDR| ", bufPtr, len);
+                    if (wantDecrypt)
+                        mfTraceDecode(bufPtr, len, wantSaveToEmlFile);
+                    num++;
+                }
+                bufPtr += len;
+                bufPtr += ((len-1)/8+1); // ignore parity
+            }
+            pckNum = 0;
+        }
+    } // while (true)
 
-	free(buf);
-	return 0;
+    free(buf);
+    return 0;
 }
 
 int CmdHF14AMfDbg(const char *Cmd) {
 
-	char ctmp = tolower(param_getchar(Cmd, 0));
-	if (strlen(Cmd) < 1 || ctmp == 'h' ) return usage_hf14_dbg();
+    char ctmp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) < 1 || ctmp == 'h' ) return usage_hf14_dbg();
 
-	uint8_t dbgMode = param_get8ex(Cmd, 0, 0, 10);
-	if (dbgMode > 4) return usage_hf14_dbg();
+    uint8_t dbgMode = param_get8ex(Cmd, 0, 0, 10);
+    if (dbgMode > 4) return usage_hf14_dbg();
 
-	UsbCommand c = {CMD_MIFARE_SET_DBGMODE, {dbgMode, 0, 0}};
-	SendCommand(&c);
-	return 0;
+    UsbCommand c = {CMD_MIFARE_SET_DBGMODE, {dbgMode, 0, 0}};
+    SendCommand(&c);
+    return 0;
 }
 
 int CmdHF14AMfKeyBrute(const char *Cmd) {
 
-	uint8_t blockNo = 0, keytype = 0;
-	uint8_t key[6] = {0, 0, 0, 0, 0, 0};
-	uint64_t foundkey = 0;
+    uint8_t blockNo = 0, keytype = 0;
+    uint8_t key[6] = {0, 0, 0, 0, 0, 0};
+    uint64_t foundkey = 0;
 
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if ( cmdp == 'h' ) return usage_hf14_keybrute();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if ( cmdp == 'h' ) return usage_hf14_keybrute();
 
-	// block number
-	blockNo = param_get8(Cmd, 0);
+    // block number
+    blockNo = param_get8(Cmd, 0);
 
-	// keytype
-	cmdp = tolower(param_getchar(Cmd, 1));
-	if ( cmdp == 'b' ) keytype = 1;
+    // keytype
+    cmdp = tolower(param_getchar(Cmd, 1));
+    if ( cmdp == 'b' ) keytype = 1;
 
-	// key
-	if (param_gethex(Cmd, 2, key, 12)) return usage_hf14_keybrute();
+    // key
+    if (param_gethex(Cmd, 2, key, 12)) return usage_hf14_keybrute();
 
-	uint64_t t1 = msclock();
+    uint64_t t1 = msclock();
 
-	if (mfKeyBrute( blockNo, keytype, key, &foundkey))
-		PrintAndLogEx(SUCCESS, "found valid key: %012" PRIx64 " \n", foundkey);
-	else
-		PrintAndLogEx(FAILED, "key not found");
+    if (mfKeyBrute( blockNo, keytype, key, &foundkey))
+        PrintAndLogEx(SUCCESS, "found valid key: %012" PRIx64 " \n", foundkey);
+    else
+        PrintAndLogEx(FAILED, "key not found");
 
-	t1 = msclock() - t1;
-	PrintAndLogEx(SUCCESS, "\ntime in keybrute: %.0f seconds\n", (float)t1/1000.0);
-	return 0;
+    t1 = msclock() - t1;
+    PrintAndLogEx(SUCCESS, "\ntime in keybrute: %.0f seconds\n", (float)t1/1000.0);
+    return 0;
 }
 
 void printKeyTable( uint8_t sectorscnt, sector_t *e_sector ){
-	char strA[12+1] = {0};
-	char strB[12+1] = {0};
-	PrintAndLogEx(NORMAL, "|---|----------------|---|----------------|---|");
-	PrintAndLogEx(NORMAL, "|sec|key A           |res|key B           |res|");
-	PrintAndLogEx(NORMAL, "|---|----------------|---|----------------|---|");
-	for (uint8_t i = 0; i < sectorscnt; ++i) {
+    char strA[12+1] = {0};
+    char strB[12+1] = {0};
+    PrintAndLogEx(NORMAL, "|---|----------------|---|----------------|---|");
+    PrintAndLogEx(NORMAL, "|sec|key A           |res|key B           |res|");
+    PrintAndLogEx(NORMAL, "|---|----------------|---|----------------|---|");
+    for (uint8_t i = 0; i < sectorscnt; ++i) {
 
-		snprintf(strA, sizeof(strA), "------------");
-		snprintf(strB, sizeof(strB), "------------");
+        snprintf(strA, sizeof(strA), "------------");
+        snprintf(strB, sizeof(strB), "------------");
 
-		if ( e_sector[i].foundKey[0] )
-			snprintf(strA, sizeof(strA), "%012" PRIx64, e_sector[i].Key[0]);
+        if ( e_sector[i].foundKey[0] )
+            snprintf(strA, sizeof(strA), "%012" PRIx64, e_sector[i].Key[0]);
 
-		if ( e_sector[i].foundKey[1] )
-			snprintf(strB, sizeof(strB), "%012" PRIx64, e_sector[i].Key[1]);
+        if ( e_sector[i].foundKey[1] )
+            snprintf(strB, sizeof(strB), "%012" PRIx64, e_sector[i].Key[1]);
 
 
-		PrintAndLogEx(NORMAL, "|%03d|  %s  | %d |  %s  | %d |"
-			, i
-			, strA, e_sector[i].foundKey[0]
-			, strB, e_sector[i].foundKey[1]
-		);
-	}
-	PrintAndLogEx(NORMAL, "|---|----------------|---|----------------|---|");
+        PrintAndLogEx(NORMAL, "|%03d|  %s  | %d |  %s  | %d |"
+            , i
+            , strA, e_sector[i].foundKey[0]
+            , strB, e_sector[i].foundKey[1]
+        );
+    }
+    PrintAndLogEx(NORMAL, "|---|----------------|---|----------------|---|");
 }
 
 // EMULATOR COMMANDS
 int CmdHF14AMfEGet(const char *Cmd) {
-	uint8_t blockNo = 0;
-	uint8_t data[16] = {0x00};
-	char c = tolower(param_getchar(Cmd, 0));
+    uint8_t blockNo = 0;
+    uint8_t data[16] = {0x00};
+    char c = tolower(param_getchar(Cmd, 0));
 
-	if (strlen(Cmd) < 1 || c == 'h') return usage_hf14_eget();
+    if (strlen(Cmd) < 1 || c == 'h') return usage_hf14_eget();
 
-	blockNo = param_get8(Cmd, 0);
+    blockNo = param_get8(Cmd, 0);
 
-	PrintAndLogEx(NORMAL, "");
-	if (!mfEmlGetMem(data, blockNo, 1)) {
-		PrintAndLogEx(NORMAL, "data[%3d]:%s", blockNo, sprint_hex(data, sizeof(data)));
-	} else {
-		PrintAndLogEx(WARNING, "Command execute timeout");
-	}
+    PrintAndLogEx(NORMAL, "");
+    if (!mfEmlGetMem(data, blockNo, 1)) {
+        PrintAndLogEx(NORMAL, "data[%3d]:%s", blockNo, sprint_hex(data, sizeof(data)));
+    } else {
+        PrintAndLogEx(WARNING, "Command execute timeout");
+    }
   return 0;
 }
 
 int CmdHF14AMfEClear(const char *Cmd) {
-	char c = tolower(param_getchar(Cmd, 0));
-	if (c == 'h') return usage_hf14_eclr();
+    char c = tolower(param_getchar(Cmd, 0));
+    if (c == 'h') return usage_hf14_eclr();
 
-	UsbCommand cmd = {CMD_MIFARE_EML_MEMCLR, {0, 0, 0}};
-	clearCommandBuffer();
-	SendCommand(&cmd);
-	return 0;
+    UsbCommand cmd = {CMD_MIFARE_EML_MEMCLR, {0, 0, 0}};
+    clearCommandBuffer();
+    SendCommand(&cmd);
+    return 0;
 }
 
 int CmdHF14AMfESet(const char *Cmd) {
-	char c = tolower(param_getchar(Cmd, 0));
-	uint8_t memBlock[16];
-	uint8_t blockNo = 0;
-	memset(memBlock, 0x00, sizeof(memBlock));
+    char c = tolower(param_getchar(Cmd, 0));
+    uint8_t memBlock[16];
+    uint8_t blockNo = 0;
+    memset(memBlock, 0x00, sizeof(memBlock));
 
-	if (strlen(Cmd) < 3 || c == 'h')
-		return usage_hf14_eset();
+    if (strlen(Cmd) < 3 || c == 'h')
+        return usage_hf14_eset();
 
-	blockNo = param_get8(Cmd, 0);
+    blockNo = param_get8(Cmd, 0);
 
-	if (param_gethex(Cmd, 1, memBlock, 32)) {
-		PrintAndLogEx(WARNING, "block data must include 32 HEX symbols");
-		return 1;
-	}
+    if (param_gethex(Cmd, 1, memBlock, 32)) {
+        PrintAndLogEx(WARNING, "block data must include 32 HEX symbols");
+        return 1;
+    }
 
-	//  1 - blocks count
-	return mfEmlSetMem(memBlock, blockNo, 1);
+    //  1 - blocks count
+    return mfEmlSetMem(memBlock, blockNo, 1);
 }
 
 int CmdHF14AMfELoad(const char *Cmd) {
 
-	size_t counter = 0;
-	char filename[FILE_PATH_SIZE];
-	int blockNum, numBlocks, nameParamNo = 1;
-	uint8_t blockWidth = 16;
-	char c = tolower(param_getchar(Cmd, 0));
+    size_t counter = 0;
+    char filename[FILE_PATH_SIZE];
+    int blockNum, numBlocks, nameParamNo = 1;
+    uint8_t blockWidth = 16;
+    char c = tolower(param_getchar(Cmd, 0));
 
-	if ( strlen(Cmd) < 2 &&  c == 'h' )
-		return usage_hf14_eload();
+    if ( strlen(Cmd) < 2 &&  c == 'h' )
+        return usage_hf14_eload();
 
-	switch (c) {
-		case '0' : numBlocks = MIFARE_MINI_MAXBLOCK; break;
-		case '1' :
-		case '\0': numBlocks = MIFARE_1K_MAXBLOCK; break;
-		case '2' : numBlocks = MIFARE_2K_MAXBLOCK; break;
-		case '4' : numBlocks = MIFARE_4K_MAXBLOCK; break;
-		case 'u' : numBlocks = 255; blockWidth = 4; break;
-		default:  {
-			numBlocks = MIFARE_1K_MAXBLOCK;
-			nameParamNo = 0;
-		}
-	}
-	uint32_t numblk2 = param_get32ex(Cmd, 2, 0, 10);
-	if (numblk2 > 0)
-		numBlocks = numblk2;
+    switch (c) {
+        case '0' : numBlocks = MIFARE_MINI_MAXBLOCK; break;
+        case '1' :
+        case '\0': numBlocks = MIFARE_1K_MAXBLOCK; break;
+        case '2' : numBlocks = MIFARE_2K_MAXBLOCK; break;
+        case '4' : numBlocks = MIFARE_4K_MAXBLOCK; break;
+        case 'u' : numBlocks = 255; blockWidth = 4; break;
+        default:  {
+            numBlocks = MIFARE_1K_MAXBLOCK;
+            nameParamNo = 0;
+        }
+    }
+    uint32_t numblk2 = param_get32ex(Cmd, 2, 0, 10);
+    if (numblk2 > 0)
+        numBlocks = numblk2;
 
-	param_getstr(Cmd, nameParamNo, filename, sizeof(filename));
+    param_getstr(Cmd, nameParamNo, filename, sizeof(filename));
 
-	uint8_t *data = calloc(4096, sizeof(uint8_t));
-	size_t datalen = 0;
-	//int res = loadFile(filename, "bin", data, &datalen);
-	int res = loadFileEML( filename, "eml", data, &datalen);
-	if ( res ) {
-		free(data);
-		return 1;
-	}
+    uint8_t *data = calloc(4096, sizeof(uint8_t));
+    size_t datalen = 0;
+    //int res = loadFile(filename, "bin", data, &datalen);
+    int res = loadFileEML( filename, "eml", data, &datalen);
+    if ( res ) {
+        free(data);
+        return 1;
+    }
 
-	// 64 or 256 blocks.
-	if ( (datalen % blockWidth) != 0 ) {
-		PrintAndLogEx(FAILED, "File content error. Size doesn't match blockwidth ");
-		free(data);
-		return 2;
-	}
+    // 64 or 256 blocks.
+    if ( (datalen % blockWidth) != 0 ) {
+        PrintAndLogEx(FAILED, "File content error. Size doesn't match blockwidth ");
+        free(data);
+        return 2;
+    }
 
-	PrintAndLogEx(INFO, "Copying to emulator memory");
+    PrintAndLogEx(INFO, "Copying to emulator memory");
 
-	blockNum = 0;
-	while ( datalen ) {
+    blockNum = 0;
+    while ( datalen ) {
 
-		if (mfEmlSetMem_xt(data + counter, blockNum, 1, blockWidth)) {
-			PrintAndLogEx(FAILED, "Cant set emul block: %3d", blockNum);
-			free(data);
-			return 3;
-		}
-		printf("."); fflush(stdout);
+        if (mfEmlSetMem_xt(data + counter, blockNum, 1, blockWidth)) {
+            PrintAndLogEx(FAILED, "Cant set emul block: %3d", blockNum);
+            free(data);
+            return 3;
+        }
+        printf("."); fflush(stdout);
 
-		blockNum++;
-		counter += blockWidth;
-		datalen -= blockWidth;
-	}
-	PrintAndLogEx(NORMAL, "\n");
+        blockNum++;
+        counter += blockWidth;
+        datalen -= blockWidth;
+    }
+    PrintAndLogEx(NORMAL, "\n");
 
-	// Ultralight /Ntag
-	if ( blockWidth == 4 ) {
-		if ((blockNum != numBlocks)) {
-			PrintAndLogEx(FAILED, "Warning, Ultralight/Ntag file content, Loaded %d blocks into emulator memory", blockNum);
-			free(data);
-			return 0;
-		}
-	} else {
-		if ((blockNum != numBlocks)) {
-			PrintAndLogEx(FAILED, "Error, file content, Only loaded %d blocks, must be %d blocks into emulator memory", blockNum, numBlocks);
-			free(data);
-			return 4;
-		}
-	}
-	PrintAndLogEx(SUCCESS, "Loaded %d blocks from file: " _YELLOW_(%s), blockNum, filename);
-	free(data);
-	return 0;
+    // Ultralight /Ntag
+    if ( blockWidth == 4 ) {
+        if ((blockNum != numBlocks)) {
+            PrintAndLogEx(FAILED, "Warning, Ultralight/Ntag file content, Loaded %d blocks into emulator memory", blockNum);
+            free(data);
+            return 0;
+        }
+    } else {
+        if ((blockNum != numBlocks)) {
+            PrintAndLogEx(FAILED, "Error, file content, Only loaded %d blocks, must be %d blocks into emulator memory", blockNum, numBlocks);
+            free(data);
+            return 4;
+        }
+    }
+    PrintAndLogEx(SUCCESS, "Loaded %d blocks from file: " _YELLOW_(%s), blockNum, filename);
+    free(data);
+    return 0;
 }
 
 int CmdHF14AMfESave(const char *Cmd) {
 
-	char filename[FILE_PATH_SIZE];
-	char * fnameptr = filename;
-	uint8_t *dump;
-	int len, bytes, nameParamNo = 1;
-	uint16_t blocks;
+    char filename[FILE_PATH_SIZE];
+    char * fnameptr = filename;
+    uint8_t *dump;
+    int len, bytes, nameParamNo = 1;
+    uint16_t blocks;
 
-	memset(filename, 0, sizeof(filename));
+    memset(filename, 0, sizeof(filename));
 
-	char c = tolower(param_getchar(Cmd, 0));
-	if (c == 'h') return usage_hf14_esave();
+    char c = tolower(param_getchar(Cmd, 0));
+    if (c == 'h') return usage_hf14_esave();
 
-	blocks = NumOfBlocks(c);
-	bytes = blocks * MFBLOCK_SIZE;
+    blocks = NumOfBlocks(c);
+    bytes = blocks * MFBLOCK_SIZE;
 
-	dump = calloc(bytes, sizeof(uint8_t));
-	if (!dump) {
-		PrintAndLogEx(WARNING, "Fail, cannot allocate memory");
-		return 1;
-	}
-	memset(dump, 0, bytes);
+    dump = calloc(bytes, sizeof(uint8_t));
+    if (!dump) {
+        PrintAndLogEx(WARNING, "Fail, cannot allocate memory");
+        return 1;
+    }
+    memset(dump, 0, bytes);
 
-	PrintAndLogEx(INFO, "downloading from emulator memory");
-	if (!GetFromDevice( BIG_BUF_EML, dump, bytes, 0, NULL, 2500, false)) {
-		PrintAndLogEx(WARNING, "Fail, transfer from device time-out");
-		free(dump);
-		return 2;
-	}
+    PrintAndLogEx(INFO, "downloading from emulator memory");
+    if (!GetFromDevice( BIG_BUF_EML, dump, bytes, 0, NULL, 2500, false)) {
+        PrintAndLogEx(WARNING, "Fail, transfer from device time-out");
+        free(dump);
+        return 2;
+    }
 
-	len = param_getstr(Cmd, nameParamNo, filename, sizeof(filename));
-	if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5;
+    len = param_getstr(Cmd, nameParamNo, filename, sizeof(filename));
+    if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5;
 
-	// user supplied filename?
-	if (len < 1) {
-		fnameptr += sprintf(fnameptr, "hf-mf-");
-		FillFileNameByUID(fnameptr, dump, "-dump", 4);
-	}
+    // user supplied filename?
+    if (len < 1) {
+        fnameptr += sprintf(fnameptr, "hf-mf-");
+        FillFileNameByUID(fnameptr, dump, "-dump", 4);
+    }
 
-	saveFile(filename, "bin", dump, bytes);
-	saveFileEML(filename, "eml", dump, bytes, MFBLOCK_SIZE);
-	saveFileJSON(filename, "json", jsfCardMemory, dump, bytes);
-	free(dump);
-	return 0;
+    saveFile(filename, "bin", dump, bytes);
+    saveFileEML(filename, "eml", dump, bytes, MFBLOCK_SIZE);
+    saveFileJSON(filename, "json", jsfCardMemory, dump, bytes);
+    free(dump);
+    return 0;
 }
 
 int CmdHF14AMfECFill(const char *Cmd) {
-	uint8_t keyType = 0;
-	uint8_t numSectors = 16;
-	char c = tolower(param_getchar(Cmd, 0));
+    uint8_t keyType = 0;
+    uint8_t numSectors = 16;
+    char c = tolower(param_getchar(Cmd, 0));
 
-	if (strlen(Cmd) < 1 || c == 'h')
-		return usage_hf14_ecfill();
+    if (strlen(Cmd) < 1 || c == 'h')
+        return usage_hf14_ecfill();
 
-	if (c != 'a' &&  c != 'b') {
-		PrintAndLogEx(WARNING, "Key type must be A or B");
-		return 1;
-	}
-	if (c != 'a')
-		keyType = 1;
+    if (c != 'a' &&  c != 'b') {
+        PrintAndLogEx(WARNING, "Key type must be A or B");
+        return 1;
+    }
+    if (c != 'a')
+        keyType = 1;
 
-	c = tolower(param_getchar(Cmd, 1));
-	numSectors = NumOfSectors(c);
+    c = tolower(param_getchar(Cmd, 1));
+    numSectors = NumOfSectors(c);
 
-	PrintAndLogEx(NORMAL, "--params: numSectors: %d, keyType: %c\n", numSectors, (keyType == 0) ? 'A' : 'B');
-	UsbCommand cmd = {CMD_MIFARE_EML_CARDLOAD, {numSectors, keyType, 0}};
-	clearCommandBuffer();
-	SendCommand(&cmd);
-	return 0;
+    PrintAndLogEx(NORMAL, "--params: numSectors: %d, keyType: %c\n", numSectors, (keyType == 0) ? 'A' : 'B');
+    UsbCommand cmd = {CMD_MIFARE_EML_CARDLOAD, {numSectors, keyType, 0}};
+    clearCommandBuffer();
+    SendCommand(&cmd);
+    return 0;
 }
 
 int CmdHF14AMfEKeyPrn(const char *Cmd) {
-	int i;
-	uint8_t numSectors;
-	uint8_t data[16];
-	uint64_t keyA, keyB;
+    int i;
+    uint8_t numSectors;
+    uint8_t data[16];
+    uint64_t keyA, keyB;
 
-	char c = tolower(param_getchar(Cmd, 0));
-	if ( c == 'h' )
-		return usage_hf14_ekeyprn();
+    char c = tolower(param_getchar(Cmd, 0));
+    if ( c == 'h' )
+        return usage_hf14_ekeyprn();
 
-	numSectors = NumOfSectors(c);
+    numSectors = NumOfSectors(c);
 
-	PrintAndLogEx(NORMAL, "|---|----------------|----------------|");
-	PrintAndLogEx(NORMAL, "|sec|key A           |key B           |");
-	PrintAndLogEx(NORMAL, "|---|----------------|----------------|");
-	for (i = 0; i < numSectors; i++) {
-		if (mfEmlGetMem(data, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1)) {
-			PrintAndLogEx(WARNING, "error get block %d", FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1);
-			break;
-		}
-		keyA = bytes_to_num(data, 6);
-		keyB = bytes_to_num(data + 10, 6);
-		PrintAndLogEx(NORMAL, "|%03d|  %012" PRIx64 "  |  %012" PRIx64 "  |", i, keyA, keyB);
-	}
-	PrintAndLogEx(NORMAL, "|---|----------------|----------------|");
-	return 0;
+    PrintAndLogEx(NORMAL, "|---|----------------|----------------|");
+    PrintAndLogEx(NORMAL, "|sec|key A           |key B           |");
+    PrintAndLogEx(NORMAL, "|---|----------------|----------------|");
+    for (i = 0; i < numSectors; i++) {
+        if (mfEmlGetMem(data, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1)) {
+            PrintAndLogEx(WARNING, "error get block %d", FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1);
+            break;
+        }
+        keyA = bytes_to_num(data, 6);
+        keyB = bytes_to_num(data + 10, 6);
+        PrintAndLogEx(NORMAL, "|%03d|  %012" PRIx64 "  |  %012" PRIx64 "  |", i, keyA, keyB);
+    }
+    PrintAndLogEx(NORMAL, "|---|----------------|----------------|");
+    return 0;
 }
 
 // CHINESE MAGIC COMMANDS
 int CmdHF14AMfCSetUID(const char *Cmd) {
-	uint8_t wipeCard = 0;
-	uint8_t uid[8] = {0x00};
-	uint8_t oldUid[8] = {0x00};
-	uint8_t atqa[2] = {0x00};
-	uint8_t sak[1] = {0x00};
-	uint8_t atqaPresent = 1;
-	int res, argi = 0;
-	char ctmp;
+    uint8_t wipeCard = 0;
+    uint8_t uid[8] = {0x00};
+    uint8_t oldUid[8] = {0x00};
+    uint8_t atqa[2] = {0x00};
+    uint8_t sak[1] = {0x00};
+    uint8_t atqaPresent = 1;
+    int res, argi = 0;
+    char ctmp;
 
-	if (strlen(Cmd) < 1 || param_getchar(Cmd, argi) == 'h')
-		return usage_hf14_csetuid();
+    if (strlen(Cmd) < 1 || param_getchar(Cmd, argi) == 'h')
+        return usage_hf14_csetuid();
 
-	if (param_getchar(Cmd, argi) && param_gethex(Cmd, argi, uid, 8))
-		return usage_hf14_csetuid();
+    if (param_getchar(Cmd, argi) && param_gethex(Cmd, argi, uid, 8))
+        return usage_hf14_csetuid();
 
-	argi++;
+    argi++;
 
-	ctmp = tolower(param_getchar(Cmd, argi));
-	if (ctmp == 'w') {
-		wipeCard = 1;
-		atqaPresent = 0;
-	}
+    ctmp = tolower(param_getchar(Cmd, argi));
+    if (ctmp == 'w') {
+        wipeCard = 1;
+        atqaPresent = 0;
+    }
 
-	if (atqaPresent) {
-		if (param_getchar(Cmd, argi)) {
-			if (param_gethex(Cmd, argi, atqa, 4)) {
-				PrintAndLogEx(WARNING, "ATQA must include 4 HEX symbols");
-				return 1;
-			}
-			argi++;
-			if (!param_getchar(Cmd, argi) || param_gethex(Cmd, argi, sak, 2)) {
-				PrintAndLogEx(WARNING, "SAK must include 2 HEX symbols");
-				return 1;
-			}
-			argi++;
-		} else
-			atqaPresent = 0;
-	}
+    if (atqaPresent) {
+        if (param_getchar(Cmd, argi)) {
+            if (param_gethex(Cmd, argi, atqa, 4)) {
+                PrintAndLogEx(WARNING, "ATQA must include 4 HEX symbols");
+                return 1;
+            }
+            argi++;
+            if (!param_getchar(Cmd, argi) || param_gethex(Cmd, argi, sak, 2)) {
+                PrintAndLogEx(WARNING, "SAK must include 2 HEX symbols");
+                return 1;
+            }
+            argi++;
+        } else
+            atqaPresent = 0;
+    }
 
-	if (!wipeCard) {
-		ctmp = tolower(param_getchar(Cmd, argi));
-		if (ctmp == 'w') {
-			wipeCard = 1;
-		}
-	}
+    if (!wipeCard) {
+        ctmp = tolower(param_getchar(Cmd, argi));
+        if (ctmp == 'w') {
+            wipeCard = 1;
+        }
+    }
 
-	PrintAndLogEx(NORMAL, "--wipe card:%s  uid:%s", (wipeCard)?"YES":"NO", sprint_hex(uid, 4));
+    PrintAndLogEx(NORMAL, "--wipe card:%s  uid:%s", (wipeCard)?"YES":"NO", sprint_hex(uid, 4));
 
-	res = mfCSetUID(uid, (atqaPresent) ? atqa : NULL, (atqaPresent) ? sak : NULL, oldUid, wipeCard);
-	if (res) {
-		PrintAndLogEx(WARNING, "Can't set UID. error=%d", res);
-		return 1;
-	}
+    res = mfCSetUID(uid, (atqaPresent) ? atqa : NULL, (atqaPresent) ? sak : NULL, oldUid, wipeCard);
+    if (res) {
+        PrintAndLogEx(WARNING, "Can't set UID. error=%d", res);
+        return 1;
+    }
 
-	PrintAndLogEx(SUCCESS, "old UID:%s", sprint_hex(oldUid, 4));
-	PrintAndLogEx(SUCCESS, "new UID:%s", sprint_hex(uid, 4));
-	return 0;
+    PrintAndLogEx(SUCCESS, "old UID:%s", sprint_hex(oldUid, 4));
+    PrintAndLogEx(SUCCESS, "new UID:%s", sprint_hex(uid, 4));
+    return 0;
 }
 
 int CmdHF14AMfCSetBlk(const char *Cmd) {
-	uint8_t block[16] = {0x00};
-	uint8_t blockNo = 0;
-	uint8_t params = MAGIC_SINGLE;
-	int res;
-	char ctmp = tolower(param_getchar(Cmd, 0));
+    uint8_t block[16] = {0x00};
+    uint8_t blockNo = 0;
+    uint8_t params = MAGIC_SINGLE;
+    int res;
+    char ctmp = tolower(param_getchar(Cmd, 0));
 
-	if (strlen(Cmd) < 1 || ctmp == 'h') return usage_hf14_csetblk();
+    if (strlen(Cmd) < 1 || ctmp == 'h') return usage_hf14_csetblk();
 
-	blockNo = param_get8(Cmd, 0);
+    blockNo = param_get8(Cmd, 0);
 
-	if (param_gethex(Cmd, 1, block, 32)) return usage_hf14_csetblk();
+    if (param_gethex(Cmd, 1, block, 32)) return usage_hf14_csetblk();
 
-	ctmp = tolower(param_getchar(Cmd, 2));
-	if (ctmp == 'w')
-		params |= MAGIC_WIPE;
+    ctmp = tolower(param_getchar(Cmd, 2));
+    if (ctmp == 'w')
+        params |= MAGIC_WIPE;
 
-	PrintAndLogEx(NORMAL, "--block number:%2d data:%s", blockNo, sprint_hex(block, 16));
+    PrintAndLogEx(NORMAL, "--block number:%2d data:%s", blockNo, sprint_hex(block, 16));
 
-	res = mfCSetBlock(blockNo, block, NULL, params);
-	if (res) {
-		PrintAndLogEx(WARNING, "Can't write block. error=%d", res);
-		return 1;
-	}
-	return 0;
+    res = mfCSetBlock(blockNo, block, NULL, params);
+    if (res) {
+        PrintAndLogEx(WARNING, "Can't write block. error=%d", res);
+        return 1;
+    }
+    return 0;
 }
 
 int CmdHF14AMfCLoad(const char *Cmd) {
 
-	uint8_t buf8[16] = {0x00};
-	uint8_t fillFromEmulator = 0;
-	int blockNum, flags = 0;
-	bool fillFromJson = false;
-	bool fillFromBin = false;
-	char fileName[50] = {0};
+    uint8_t buf8[16] = {0x00};
+    uint8_t fillFromEmulator = 0;
+    int blockNum, flags = 0;
+    bool fillFromJson = false;
+    bool fillFromBin = false;
+    char fileName[50] = {0};
 
-	char ctmp = tolower(param_getchar(Cmd, 0));
-	if ( param_getlength(Cmd, 0) == 1 ) {
-		if (ctmp == 'h' || ctmp == 0x00) return usage_hf14_cload();
-		if (ctmp == 'e' ) fillFromEmulator = 1;
-		if (ctmp == 'j' ) fillFromJson = true;
-		if (ctmp == 'b' ) fillFromBin = true;
-	}
+    char ctmp = tolower(param_getchar(Cmd, 0));
+    if ( param_getlength(Cmd, 0) == 1 ) {
+        if (ctmp == 'h' || ctmp == 0x00) return usage_hf14_cload();
+        if (ctmp == 'e' ) fillFromEmulator = 1;
+        if (ctmp == 'j' ) fillFromJson = true;
+        if (ctmp == 'b' ) fillFromBin = true;
+    }
 
-	if (fillFromJson || fillFromBin)
-		param_getstr(Cmd, 1, fileName, sizeof(fileName));
+    if (fillFromJson || fillFromBin)
+        param_getstr(Cmd, 1, fileName, sizeof(fileName));
 
 
-	if (fillFromEmulator) {
-		for (blockNum = 0; blockNum < 16 * 4; blockNum += 1) {
-			if (mfEmlGetMem(buf8, blockNum, 1)) {
-				PrintAndLogEx(WARNING, "Cant get block: %d", blockNum);
-				return 2;
-			}
-			if (blockNum == 0) flags = MAGIC_INIT + MAGIC_WUPC;				// switch on field and send magic sequence
-			if (blockNum == 1) flags = 0;									// just write
-			if (blockNum == 16 * 4 - 1) flags = MAGIC_HALT + MAGIC_OFF;		// Done. Magic Halt and switch off field.
+    if (fillFromEmulator) {
+        for (blockNum = 0; blockNum < 16 * 4; blockNum += 1) {
+            if (mfEmlGetMem(buf8, blockNum, 1)) {
+                PrintAndLogEx(WARNING, "Cant get block: %d", blockNum);
+                return 2;
+            }
+            if (blockNum == 0) flags = MAGIC_INIT + MAGIC_WUPC;             // switch on field and send magic sequence
+            if (blockNum == 1) flags = 0;                                   // just write
+            if (blockNum == 16 * 4 - 1) flags = MAGIC_HALT + MAGIC_OFF;     // Done. Magic Halt and switch off field.
 
-			if (mfCSetBlock(blockNum, buf8, NULL, flags)) {
-				PrintAndLogEx(WARNING, "Cant set magic card block: %d", blockNum);
-				return 3;
-			}
-			printf("."); fflush(stdout);
-		}
-		PrintAndLogEx(NORMAL, "\n");
-		return 0;
-	}
+            if (mfCSetBlock(blockNum, buf8, NULL, flags)) {
+                PrintAndLogEx(WARNING, "Cant set magic card block: %d", blockNum);
+                return 3;
+            }
+            printf("."); fflush(stdout);
+        }
+        PrintAndLogEx(NORMAL, "\n");
+        return 0;
+    }
 
-	size_t maxdatalen = 4096;
-	uint8_t *data = calloc(maxdatalen, sizeof(uint8_t));
-	size_t datalen = 0;
-	int res = 0;
-	if (fillFromBin) {
-		res = loadFile(fileName, "bin", data, &datalen);
-	} else {
-		if (fillFromJson) {
-			res = loadFileJSON(fileName, "json", data, maxdatalen, &datalen);
-		} else {
-			res = loadFileEML( Cmd, "eml", data, &datalen);
-		}
-	}
+    size_t maxdatalen = 4096;
+    uint8_t *data = calloc(maxdatalen, sizeof(uint8_t));
+    size_t datalen = 0;
+    int res = 0;
+    if (fillFromBin) {
+        res = loadFile(fileName, "bin", data, &datalen);
+    } else {
+        if (fillFromJson) {
+            res = loadFileJSON(fileName, "json", data, maxdatalen, &datalen);
+        } else {
+            res = loadFileEML( Cmd, "eml", data, &datalen);
+        }
+    }
 
-	if ( res ) {
-		if ( data )
-			free(data);
-		return 1;
-	}
+    if ( res ) {
+        if ( data )
+            free(data);
+        return 1;
+    }
 
-//	PrintAndLogEx(INFO, "DATA | %s", sprint_hex(data+1000, 24) );
+//  PrintAndLogEx(INFO, "DATA | %s", sprint_hex(data+1000, 24) );
 
 
-	// 64 or 256blocks.
-	if (datalen != 1024 && datalen != 4096) {
-		PrintAndLogEx(WARNING, "File content error. ");
-		free(data);
-		return 2;
-	}
+    // 64 or 256blocks.
+    if (datalen != 1024 && datalen != 4096) {
+        PrintAndLogEx(WARNING, "File content error. ");
+        free(data);
+        return 2;
+    }
 
-	PrintAndLogEx(INFO, "Copying to magic card");
+    PrintAndLogEx(INFO, "Copying to magic card");
 
-	blockNum = 0;
-	while ( datalen ) {
+    blockNum = 0;
+    while ( datalen ) {
 
-		// switch on field and send magic sequence
-		if (blockNum == 0) flags = MAGIC_INIT + MAGIC_WUPC;
+        // switch on field and send magic sequence
+        if (blockNum == 0) flags = MAGIC_INIT + MAGIC_WUPC;
 
-		// write
-		if (blockNum == 1) flags = 0;
+        // write
+        if (blockNum == 1) flags = 0;
 
-		// Switch off field.
-		if (blockNum == 16 * 4 - 1) flags = MAGIC_HALT + MAGIC_OFF;
+        // Switch off field.
+        if (blockNum == 16 * 4 - 1) flags = MAGIC_HALT + MAGIC_OFF;
 
-		if (mfCSetBlock(blockNum, data + (16 * blockNum), NULL, flags)) {
-			PrintAndLogEx(WARNING, "Can't set magic card block: %d", blockNum);
-			free(data);
-			return 3;
-		}
+        if (mfCSetBlock(blockNum, data + (16 * blockNum), NULL, flags)) {
+            PrintAndLogEx(WARNING, "Can't set magic card block: %d", blockNum);
+            free(data);
+            return 3;
+        }
 
-		datalen -= 16;
+        datalen -= 16;
 
-		printf("."); fflush(stdout);
-		blockNum++;
+        printf("."); fflush(stdout);
+        blockNum++;
 
-		// magic card type - mifare 1K
-		if (blockNum >= MIFARE_1K_MAXBLOCK ) break;
-	}
-	PrintAndLogEx(NORMAL, "\n");
+        // magic card type - mifare 1K
+        if (blockNum >= MIFARE_1K_MAXBLOCK ) break;
+    }
+    PrintAndLogEx(NORMAL, "\n");
 
-	// 64 or 256blocks.
-	if (blockNum != 16 * 4 && blockNum != 32 * 4 + 8 * 16){
-		PrintAndLogEx(WARNING, "File content error. There must be 64 blocks");
-		free(data);
-		return 4;
-	}
+    // 64 or 256blocks.
+    if (blockNum != 16 * 4 && blockNum != 32 * 4 + 8 * 16){
+        PrintAndLogEx(WARNING, "File content error. There must be 64 blocks");
+        free(data);
+        return 4;
+    }
 
-	PrintAndLogEx(SUCCESS, "Card loaded %d blocks from file", blockNum);
-	free(data);
-	return 0;
+    PrintAndLogEx(SUCCESS, "Card loaded %d blocks from file", blockNum);
+    free(data);
+    return 0;
 }
 
 int CmdHF14AMfCGetBlk(const char *Cmd) {
-	uint8_t data[16] = {0};
-	uint8_t blockNo = 0;
-	int res;
-	memset(data, 0x00, sizeof(data));
+    uint8_t data[16] = {0};
+    uint8_t blockNo = 0;
+    int res;
+    memset(data, 0x00, sizeof(data));
 
-	char ctmp = tolower(param_getchar(Cmd, 0));
-	if (strlen(Cmd) < 1 || ctmp == 'h') return usage_hf14_cgetblk();
+    char ctmp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) < 1 || ctmp == 'h') return usage_hf14_cgetblk();
 
-	blockNo = param_get8(Cmd, 0);
+    blockNo = param_get8(Cmd, 0);
 
-	PrintAndLogEx(NORMAL, "--block number:%2d ", blockNo);
+    PrintAndLogEx(NORMAL, "--block number:%2d ", blockNo);
 
-	res = mfCGetBlock(blockNo, data, MAGIC_SINGLE);
-	if (res) {
-		PrintAndLogEx(WARNING, "Can't read block. error=%d", res);
-		return 1;
-	}
+    res = mfCGetBlock(blockNo, data, MAGIC_SINGLE);
+    if (res) {
+        PrintAndLogEx(WARNING, "Can't read block. error=%d", res);
+        return 1;
+    }
 
-	PrintAndLogEx(NORMAL, "data: %s", sprint_hex(data, sizeof(data)));
+    PrintAndLogEx(NORMAL, "data: %s", sprint_hex(data, sizeof(data)));
 
-	if (mfIsSectorTrailer(blockNo)) {
-		PrintAndLogEx(NORMAL, "Trailer decoded:");
-		PrintAndLogEx(NORMAL, "Key A: %s", sprint_hex_inrow(data, 6));
-		PrintAndLogEx(NORMAL, "Key B: %s", sprint_hex_inrow(&data[10], 6));
-		int bln = mfFirstBlockOfSector(mfSectorNum(blockNo));
-		int blinc = (mfNumBlocksPerSector(mfSectorNum(blockNo)) > 4) ? 5 : 1;
-		for (int i = 0; i < 4; i++) {
-			PrintAndLogEx(NORMAL, "Access block %d%s: %s", bln, ((blinc > 1) && (i < 3) ? "+" : "") , mfGetAccessConditionsDesc(i, &data[6]));
-			bln += blinc;
-		}
-		PrintAndLogEx(NORMAL, "UserData: %s", sprint_hex_inrow(&data[9], 1));
-	}
+    if (mfIsSectorTrailer(blockNo)) {
+        PrintAndLogEx(NORMAL, "Trailer decoded:");
+        PrintAndLogEx(NORMAL, "Key A: %s", sprint_hex_inrow(data, 6));
+        PrintAndLogEx(NORMAL, "Key B: %s", sprint_hex_inrow(&data[10], 6));
+        int bln = mfFirstBlockOfSector(mfSectorNum(blockNo));
+        int blinc = (mfNumBlocksPerSector(mfSectorNum(blockNo)) > 4) ? 5 : 1;
+        for (int i = 0; i < 4; i++) {
+            PrintAndLogEx(NORMAL, "Access block %d%s: %s", bln, ((blinc > 1) && (i < 3) ? "+" : "") , mfGetAccessConditionsDesc(i, &data[6]));
+            bln += blinc;
+        }
+        PrintAndLogEx(NORMAL, "UserData: %s", sprint_hex_inrow(&data[9], 1));
+    }
 
-	return 0;
+    return 0;
 }
 
 int CmdHF14AMfCGetSc(const char *Cmd) {
-	uint8_t data[16] = {0};
-	uint8_t sector = 0;
-	int i, res, flags;
+    uint8_t data[16] = {0};
+    uint8_t sector = 0;
+    int i, res, flags;
 
-	char ctmp = tolower(param_getchar(Cmd, 0));
-	if (strlen(Cmd) < 1 || ctmp == 'h') return usage_hf14_cgetsc();
+    char ctmp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) < 1 || ctmp == 'h') return usage_hf14_cgetsc();
 
-	sector = param_get8(Cmd, 0);
-	if (sector > 39) {
-		PrintAndLogEx(WARNING, "Sector number must be less then 40");
-		return 1;
-	}
+    sector = param_get8(Cmd, 0);
+    if (sector > 39) {
+        PrintAndLogEx(WARNING, "Sector number must be less then 40");
+        return 1;
+    }
 
-	PrintAndLogEx(NORMAL, "\n  # | data    |  Sector | %02d/ 0x%02X ", sector, sector);
-	PrintAndLogEx(NORMAL, "----+------------------------------------------------");
-	uint8_t blocks = 4;
-	uint8_t start = sector * 4;
-	if ( sector > 32 ) {
-		blocks = 16;
-		start = 128 + ( sector - 32 ) * 16;
-	}
+    PrintAndLogEx(NORMAL, "\n  # | data    |  Sector | %02d/ 0x%02X ", sector, sector);
+    PrintAndLogEx(NORMAL, "----+------------------------------------------------");
+    uint8_t blocks = 4;
+    uint8_t start = sector * 4;
+    if ( sector > 32 ) {
+        blocks = 16;
+        start = 128 + ( sector - 32 ) * 16;
+    }
 
-	flags = MAGIC_INIT + MAGIC_WUPC;
+    flags = MAGIC_INIT + MAGIC_WUPC;
 
-	for (i = 0; i < blocks; i++) {
-		if (i == 1) flags = 0;
-		if (i == blocks-1) flags = MAGIC_HALT + MAGIC_OFF;
+    for (i = 0; i < blocks; i++) {
+        if (i == 1) flags = 0;
+        if (i == blocks-1) flags = MAGIC_HALT + MAGIC_OFF;
 
-		res = mfCGetBlock( start + i, data, flags);
-		if (res) {
-			PrintAndLogEx(WARNING, "Can't read block. %d error=%d", start + i, res);
-			return 1;
-		}
-		PrintAndLogEx(NORMAL, "%3d | %s", start + i, sprint_hex(data, 16));
-	}
-	return 0;
+        res = mfCGetBlock( start + i, data, flags);
+        if (res) {
+            PrintAndLogEx(WARNING, "Can't read block. %d error=%d", start + i, res);
+            return 1;
+        }
+        PrintAndLogEx(NORMAL, "%3d | %s", start + i, sprint_hex(data, 16));
+    }
+    return 0;
 }
 
 int CmdHF14AMfCSave(const char *Cmd) {
 
-	char filename[FILE_PATH_SIZE];
-	char * fnameptr = filename;
-	uint8_t *dump;
-	bool fillEmulator = false;
-	bool errors = false, hasname = false, useuid = false;
-	int i, len, flags;
-	uint8_t numblocks = 0, cmdp = 0;
-	uint16_t bytes = 0;
-	char ctmp;
+    char filename[FILE_PATH_SIZE];
+    char * fnameptr = filename;
+    uint8_t *dump;
+    bool fillEmulator = false;
+    bool errors = false, hasname = false, useuid = false;
+    int i, len, flags;
+    uint8_t numblocks = 0, cmdp = 0;
+    uint16_t bytes = 0;
+    char ctmp;
 
-	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		ctmp = tolower(param_getchar(Cmd, cmdp));
-		switch (ctmp) {
-		case 'e':
-			useuid = true;
-			fillEmulator = true;
-			cmdp++;
-			break;
-		case 'h':
-			return usage_hf14_csave();
-		case '0':
-		case '1':
-		case '2':
-		case '4':
-			numblocks = NumOfBlocks(ctmp);
-			bytes =  numblocks * MFBLOCK_SIZE;
-			PrintAndLogEx(SUCCESS, "Saving magic mifare %cK", ctmp);
-			cmdp++;
-			break;
-		case 'u':
-			useuid = true;
-			hasname = true;
-			cmdp++;
-			break;
-		case 'o':
-			len = param_getstr(Cmd, cmdp+1, filename, FILE_PATH_SIZE);
-			if (len < 1) {
-				errors = true;
-				break;
-			}
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        ctmp = tolower(param_getchar(Cmd, cmdp));
+        switch (ctmp) {
+        case 'e':
+            useuid = true;
+            fillEmulator = true;
+            cmdp++;
+            break;
+        case 'h':
+            return usage_hf14_csave();
+        case '0':
+        case '1':
+        case '2':
+        case '4':
+            numblocks = NumOfBlocks(ctmp);
+            bytes =  numblocks * MFBLOCK_SIZE;
+            PrintAndLogEx(SUCCESS, "Saving magic mifare %cK", ctmp);
+            cmdp++;
+            break;
+        case 'u':
+            useuid = true;
+            hasname = true;
+            cmdp++;
+            break;
+        case 'o':
+            len = param_getstr(Cmd, cmdp+1, filename, FILE_PATH_SIZE);
+            if (len < 1) {
+                errors = true;
+                break;
+            }
 
-			useuid = false;
-			hasname = true;
-			cmdp += 2;
-			break;
-		default:
-			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-			errors = true;
-			break;
-		}
-	}
+            useuid = false;
+            hasname = true;
+            cmdp += 2;
+            break;
+        default:
+            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+            errors = true;
+            break;
+        }
+    }
 
-	if (!hasname && !fillEmulator) errors = true;
+    if (!hasname && !fillEmulator) errors = true;
 
-	if (errors || cmdp == 0) return usage_hf14_csave();
+    if (errors || cmdp == 0) return usage_hf14_csave();
 
-	dump = calloc(bytes, sizeof(uint8_t));
-	if (!dump) {
-		PrintAndLogEx(WARNING, "Fail, cannot allocate memory");
-		return 1;
-	}
-	memset(dump, 0, bytes);
+    dump = calloc(bytes, sizeof(uint8_t));
+    if (!dump) {
+        PrintAndLogEx(WARNING, "Fail, cannot allocate memory");
+        return 1;
+    }
+    memset(dump, 0, bytes);
 
-	flags = MAGIC_INIT + MAGIC_WUPC;
-	for (i = 0; i < numblocks; i++) {
-		if (i == 1) flags = 0;
-		if (i == numblocks - 1) flags = MAGIC_HALT + MAGIC_OFF;
+    flags = MAGIC_INIT + MAGIC_WUPC;
+    for (i = 0; i < numblocks; i++) {
+        if (i == 1) flags = 0;
+        if (i == numblocks - 1) flags = MAGIC_HALT + MAGIC_OFF;
 
-		if (mfCGetBlock(i, dump + (i*MFBLOCK_SIZE), flags)) {
-			PrintAndLogEx(WARNING, "Cant get block: %d", i);
-			free(dump);
-			return 2;
-		}
-	}
+        if (mfCGetBlock(i, dump + (i*MFBLOCK_SIZE), flags)) {
+            PrintAndLogEx(WARNING, "Cant get block: %d", i);
+            free(dump);
+            return 2;
+        }
+    }
 
-	if ( useuid ){
-		fnameptr += sprintf(fnameptr, "hf-mf-");
-		FillFileNameByUID(fnameptr, dump, "-dump", 4);
-	}
+    if ( useuid ){
+        fnameptr += sprintf(fnameptr, "hf-mf-");
+        FillFileNameByUID(fnameptr, dump, "-dump", 4);
+    }
 
-	if (fillEmulator) {
-		PrintAndLogEx(INFO, "uploading to emulator memory");
-		for (i = 0; i < numblocks; i += 5) {
-			if (mfEmlSetMem(dump + (i*MFBLOCK_SIZE), i, 5)) {
-				PrintAndLogEx(WARNING, "Cant set emul block: %d", i);
-			}
-			printf("."); fflush(stdout);
-		}
-		PrintAndLogEx(NORMAL, "\n");
-		PrintAndLogEx(SUCCESS, "uploaded %d bytes to emulator memory", bytes);
-	}
+    if (fillEmulator) {
+        PrintAndLogEx(INFO, "uploading to emulator memory");
+        for (i = 0; i < numblocks; i += 5) {
+            if (mfEmlSetMem(dump + (i*MFBLOCK_SIZE), i, 5)) {
+                PrintAndLogEx(WARNING, "Cant set emul block: %d", i);
+            }
+            printf("."); fflush(stdout);
+        }
+        PrintAndLogEx(NORMAL, "\n");
+        PrintAndLogEx(SUCCESS, "uploaded %d bytes to emulator memory", bytes);
+    }
 
-	saveFile(filename, "bin", dump, bytes);
-	saveFileEML(filename, "eml", dump, bytes, MFBLOCK_SIZE);
-	saveFileJSON(filename, "json", jsfCardMemory, dump, bytes);
-	free(dump);
-	return 0;
+    saveFile(filename, "bin", dump, bytes);
+    saveFileEML(filename, "eml", dump, bytes, MFBLOCK_SIZE);
+    saveFileJSON(filename, "json", jsfCardMemory, dump, bytes);
+    free(dump);
+    return 0;
 }
 
 //needs nt, ar, at, Data to decrypt
 int CmdHf14AMfDecryptBytes(const char *Cmd){
 
-	char ctmp = tolower(param_getchar(Cmd, 0));
-	if (strlen(Cmd) < 1 || ctmp == 'h') return usage_hf14_decryptbytes();
+    char ctmp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) < 1 || ctmp == 'h') return usage_hf14_decryptbytes();
 
-	uint32_t nt 	= param_get32ex(Cmd,0,0,16);
-	uint32_t ar_enc = param_get32ex(Cmd,1,0,16);
-	uint32_t at_enc = param_get32ex(Cmd,2,0,16);
+    uint32_t nt     = param_get32ex(Cmd,0,0,16);
+    uint32_t ar_enc = param_get32ex(Cmd,1,0,16);
+    uint32_t at_enc = param_get32ex(Cmd,2,0,16);
 
-	int len = param_getlength(Cmd, 3);
-	if (len & 1 ) {
-		PrintAndLogEx(WARNING, "Uneven hex string length. LEN=%d", len);
-		return 1;
-	}
+    int len = param_getlength(Cmd, 3);
+    if (len & 1 ) {
+        PrintAndLogEx(WARNING, "Uneven hex string length. LEN=%d", len);
+        return 1;
+    }
 
-	PrintAndLogEx(NORMAL, "nt\t%08X", nt);
-	PrintAndLogEx(NORMAL, "ar enc\t%08X", ar_enc);
-	PrintAndLogEx(NORMAL, "at enc\t%08X", at_enc);
+    PrintAndLogEx(NORMAL, "nt\t%08X", nt);
+    PrintAndLogEx(NORMAL, "ar enc\t%08X", ar_enc);
+    PrintAndLogEx(NORMAL, "at enc\t%08X", at_enc);
 
-	uint8_t *data = calloc(len, sizeof(uint8_t));
-	param_gethex_ex(Cmd, 3, data, &len);
-	len >>= 1;
-	tryDecryptWord( nt, ar_enc, at_enc, data, len);
-	free (data);
-	return 0;
+    uint8_t *data = calloc(len, sizeof(uint8_t));
+    param_gethex_ex(Cmd, 3, data, &len);
+    len >>= 1;
+    tryDecryptWord( nt, ar_enc, at_enc, data, len);
+    free (data);
+    return 0;
 }
 
 int CmdHf14AMfSetMod(const char *Cmd) {
-	uint8_t key[6] = {0, 0, 0, 0, 0, 0};
-	uint8_t mod = 2;
+    uint8_t key[6] = {0, 0, 0, 0, 0, 0};
+    uint8_t mod = 2;
 
-	char ctmp = param_getchar(Cmd, 0);
-	if (ctmp == '0') {
-		mod = 0;
-	} else if (ctmp == '1') {
-		mod = 1;
-	}
-	int gethexfail = param_gethex(Cmd, 1, key, 12);
-	if (mod == 2 || gethexfail) {
-		PrintAndLogEx(NORMAL, "Sets the load modulation strength of a MIFARE Classic EV1 card.");
-		PrintAndLogEx(NORMAL, "Usage: hf mf setmod <0|1> <block 0 key A>");
-		PrintAndLogEx(NORMAL, "       0 = normal modulation");
-		PrintAndLogEx(NORMAL, "       1 = strong modulation (default)");
-		return 1;
-	}
+    char ctmp = param_getchar(Cmd, 0);
+    if (ctmp == '0') {
+        mod = 0;
+    } else if (ctmp == '1') {
+        mod = 1;
+    }
+    int gethexfail = param_gethex(Cmd, 1, key, 12);
+    if (mod == 2 || gethexfail) {
+        PrintAndLogEx(NORMAL, "Sets the load modulation strength of a MIFARE Classic EV1 card.");
+        PrintAndLogEx(NORMAL, "Usage: hf mf setmod <0|1> <block 0 key A>");
+        PrintAndLogEx(NORMAL, "       0 = normal modulation");
+        PrintAndLogEx(NORMAL, "       1 = strong modulation (default)");
+        return 1;
+    }
 
-	UsbCommand c = {CMD_MIFARE_SETMOD, {mod, 0, 0}};
-	memcpy(c.d.asBytes, key, 6);
-	clearCommandBuffer();
-	SendCommand(&c);
+    UsbCommand c = {CMD_MIFARE_SETMOD, {mod, 0, 0}};
+    memcpy(c.d.asBytes, key, 6);
+    clearCommandBuffer();
+    SendCommand(&c);
 
-	UsbCommand resp;
-	if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-		uint8_t ok = resp.arg[0] & 0xff;
-		PrintAndLogEx(SUCCESS, "isOk:%02x", ok);
-		if (!ok)
-			PrintAndLogEx(FAILED, "Failed.");
-	} else {
-		PrintAndLogEx(WARNING, "Command execute timeout");
-	}
-	return 0;
+    UsbCommand resp;
+    if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
+        uint8_t ok = resp.arg[0] & 0xff;
+        PrintAndLogEx(SUCCESS, "isOk:%02x", ok);
+        if (!ok)
+            PrintAndLogEx(FAILED, "Failed.");
+    } else {
+        PrintAndLogEx(WARNING, "Command execute timeout");
+    }
+    return 0;
 }
 
 // Mifare NACK bug detection
 int CmdHf14AMfNack(const char *Cmd) {
 
-	bool verbose = false;
-	char ctmp = tolower(param_getchar(Cmd, 0));
-	if ( ctmp == 'h' ) return usage_hf14_nack();
-	if ( ctmp == 'v' ) verbose = true;
+    bool verbose = false;
+    char ctmp = tolower(param_getchar(Cmd, 0));
+    if ( ctmp == 'h' ) return usage_hf14_nack();
+    if ( ctmp == 'v' ) verbose = true;
 
-	if ( verbose )
-		PrintAndLogEx(INFO, "Started testing card for NACK bug. Press key to abort");
+    if ( verbose )
+        PrintAndLogEx(INFO, "Started testing card for NACK bug. Press key to abort");
 
-	detect_classic_nackbug(verbose);
-	return 0;
+    detect_classic_nackbug(verbose);
+    return 0;
 }
 
 int CmdHF14AMfice(const char *Cmd) {
 
-	uint8_t blockNo = 0;
-	uint8_t keyType = 0;
-	uint8_t trgBlockNo = 0;
-	uint8_t trgKeyType = 1;
-	bool slow = false;
-	bool initialize = true;
-	bool acquisition_completed = false;
-	uint8_t cmdp=0;
-	uint32_t flags = 0;
-	uint32_t total_num_nonces = 0;
-	char ctmp;
-	char filename[FILE_PATH_SIZE], *fptr;
-	FILE *fnonces = NULL;
-	UsbCommand resp;
+    uint8_t blockNo = 0;
+    uint8_t keyType = 0;
+    uint8_t trgBlockNo = 0;
+    uint8_t trgKeyType = 1;
+    bool slow = false;
+    bool initialize = true;
+    bool acquisition_completed = false;
+    uint8_t cmdp=0;
+    uint32_t flags = 0;
+    uint32_t total_num_nonces = 0;
+    char ctmp;
+    char filename[FILE_PATH_SIZE], *fptr;
+    FILE *fnonces = NULL;
+    UsbCommand resp;
 
-	uint32_t part_limit = 3000;
-	uint32_t limit = 50000;
+    uint32_t part_limit = 3000;
+    uint32_t limit = 50000;
 
-	while ((ctmp = param_getchar(Cmd, cmdp))) {
-		switch(tolower(ctmp))
-		{
-		case 'h':
-			return usage_hf14_ice();
-		case 'f':
-			param_getstr(Cmd, cmdp+1, filename, FILE_PATH_SIZE);
-			cmdp++;
-			break;
-		case 'l':
-			limit = param_get32ex(Cmd, cmdp+1, 50000, 10);
-			cmdp++;
-			break;
-		default:
-			PrintAndLogEx(WARNING, "Unknown parameter '%c'\n", ctmp);
-			usage_hf14_ice();
-			return 1;
-		}
-		cmdp++;
-	}
+    while ((ctmp = param_getchar(Cmd, cmdp))) {
+        switch(tolower(ctmp))
+        {
+        case 'h':
+            return usage_hf14_ice();
+        case 'f':
+            param_getstr(Cmd, cmdp+1, filename, FILE_PATH_SIZE);
+            cmdp++;
+            break;
+        case 'l':
+            limit = param_get32ex(Cmd, cmdp+1, 50000, 10);
+            cmdp++;
+            break;
+        default:
+            PrintAndLogEx(WARNING, "Unknown parameter '%c'\n", ctmp);
+            usage_hf14_ice();
+            return 1;
+        }
+        cmdp++;
+    }
 
-	if(filename[0]=='\0')
-	{
-		fptr = GenerateFilename("hf-mf-","-nonces.bin");
-		if (fptr == NULL)
-			return 1;
-		strcpy(filename, fptr);
-	}
+    if(filename[0]=='\0')
+    {
+        fptr = GenerateFilename("hf-mf-","-nonces.bin");
+        if (fptr == NULL)
+            return 1;
+        strcpy(filename, fptr);
+    }
 
-	PrintAndLogEx(NORMAL, "Collecting %u nonces \n", limit);
+    PrintAndLogEx(NORMAL, "Collecting %u nonces \n", limit);
 
-	if ((fnonces = fopen(filename,"wb")) == NULL) {
-		PrintAndLogEx(WARNING, "Could not create file " _YELLOW_(%s),filename);
-		return 3;
-	}
+    if ((fnonces = fopen(filename,"wb")) == NULL) {
+        PrintAndLogEx(WARNING, "Could not create file " _YELLOW_(%s),filename);
+        return 3;
+    }
 
-	clearCommandBuffer();
+    clearCommandBuffer();
 
-	uint64_t t1 = msclock();
+    uint64_t t1 = msclock();
 
-	do {
-		if (ukbhit()) {
-			int gc = getchar(); (void)gc;
-			PrintAndLogEx(INFO, "\naborted via keyboard!\n");
-			break;
-		}
+    do {
+        if (ukbhit()) {
+            int gc = getchar(); (void)gc;
+            PrintAndLogEx(INFO, "\naborted via keyboard!\n");
+            break;
+        }
 
-		flags = 0;
-		flags |= initialize ? 0x0001 : 0;
-		flags |= slow ? 0x0002 : 0;
-		UsbCommand c = {CMD_MIFARE_ACQUIRE_NONCES, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, flags}};
-		clearCommandBuffer();
-		SendCommand(&c);
+        flags = 0;
+        flags |= initialize ? 0x0001 : 0;
+        flags |= slow ? 0x0002 : 0;
+        UsbCommand c = {CMD_MIFARE_ACQUIRE_NONCES, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, flags}};
+        clearCommandBuffer();
+        SendCommand(&c);
 
-		if (!WaitForResponseTimeout(CMD_ACK, &resp, 3000)) goto out;
-		if (resp.arg[0])  goto out;
+        if (!WaitForResponseTimeout(CMD_ACK, &resp, 3000)) goto out;
+        if (resp.arg[0])  goto out;
 
-		uint32_t items = resp.arg[2];
-		if (fnonces) {
-			fwrite(resp.d.asBytes, 1, items*4, fnonces);
-			fflush(fnonces);
-		}
+        uint32_t items = resp.arg[2];
+        if (fnonces) {
+            fwrite(resp.d.asBytes, 1, items*4, fnonces);
+            fflush(fnonces);
+        }
 
-		total_num_nonces += items;
-		if ( total_num_nonces > part_limit ) {
-			PrintAndLogEx(INFO, "Total nonces %u\n", total_num_nonces);
-			part_limit += 3000;
-		}
+        total_num_nonces += items;
+        if ( total_num_nonces > part_limit ) {
+            PrintAndLogEx(INFO, "Total nonces %u\n", total_num_nonces);
+            part_limit += 3000;
+        }
 
-		acquisition_completed = ( total_num_nonces > limit);
+        acquisition_completed = ( total_num_nonces > limit);
 
-		initialize = false;
+        initialize = false;
 
-	} while (!acquisition_completed);
+    } while (!acquisition_completed);
 
 out:
-	PrintAndLogEx(SUCCESS, "time: %" PRIu64 " seconds\n", (msclock()-t1)/1000);
+    PrintAndLogEx(SUCCESS, "time: %" PRIu64 " seconds\n", (msclock()-t1)/1000);
 
-	if ( fnonces ) {
-		fflush(fnonces);
-		fclose(fnonces);
-	}
+    if ( fnonces ) {
+        fflush(fnonces);
+        fclose(fnonces);
+    }
 
-	UsbCommand c = {CMD_MIFARE_ACQUIRE_NONCES, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, 4}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+    UsbCommand c = {CMD_MIFARE_ACQUIRE_NONCES, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, 4}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 
 int CmdHF14AMfAuth4(const char *Cmd) {
-	uint8_t keyn[20] = {0};
-	int keynlen = 0;
-	uint8_t key[16] = {0};
-	int keylen = 0;
+    uint8_t keyn[20] = {0};
+    int keynlen = 0;
+    uint8_t key[16] = {0};
+    int keylen = 0;
 
-	CLIParserInit("hf mf auth4",
-		"Executes AES authentication command in ISO14443-4",
-		"Usage:\n\thf mf auth4 4000 000102030405060708090a0b0c0d0e0f -> executes authentication\n"
-			"\thf mf auth4 9003 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -> executes authentication\n");
+    CLIParserInit("hf mf auth4",
+        "Executes AES authentication command in ISO14443-4",
+        "Usage:\n\thf mf auth4 4000 000102030405060708090a0b0c0d0e0f -> executes authentication\n"
+            "\thf mf auth4 9003 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -> executes authentication\n");
 
-	void* argtable[] = {
-		arg_param_begin,
-		arg_str1(NULL,  NULL,     "<Key Num (HEX 2 bytes)>", NULL),
-		arg_str1(NULL,  NULL,     "<Key Value (HEX 16 bytes)>", NULL),
-		arg_param_end
-	};
-	CLIExecWithReturn(Cmd, argtable, true);
+    void* argtable[] = {
+        arg_param_begin,
+        arg_str1(NULL,  NULL,     "<Key Num (HEX 2 bytes)>", NULL),
+        arg_str1(NULL,  NULL,     "<Key Value (HEX 16 bytes)>", NULL),
+        arg_param_end
+    };
+    CLIExecWithReturn(Cmd, argtable, true);
 
-	CLIGetHexWithReturn(1, keyn, &keynlen);
-	CLIGetHexWithReturn(2, key, &keylen);
-	CLIParserFree();
+    CLIGetHexWithReturn(1, keyn, &keynlen);
+    CLIGetHexWithReturn(2, key, &keylen);
+    CLIParserFree();
 
-	if (keynlen != 2) {
-		PrintAndLogEx(ERR, "<Key Num> must be 2 bytes long instead of: %d", keynlen);
-		return 1;
-	}
+    if (keynlen != 2) {
+        PrintAndLogEx(ERR, "<Key Num> must be 2 bytes long instead of: %d", keynlen);
+        return 1;
+    }
 
-	if (keylen != 16) {
-		PrintAndLogEx(ERR, "<Key Value> must be 16 bytes long instead of: %d", keylen);
-		return 1;
-	}
+    if (keylen != 16) {
+        PrintAndLogEx(ERR, "<Key Value> must be 16 bytes long instead of: %d", keylen);
+        return 1;
+    }
 
-	return MifareAuth4(NULL, keyn, key, true, false, true);
+    return MifareAuth4(NULL, keyn, key, true, false, true);
 }
 
 // https://www.nxp.com/docs/en/application-note/AN10787.pdf
 int CmdHF14AMfMAD(const char *cmd) {
 
-	CLIParserInit("hf mf mad",
-		"Checks and prints Mifare Application Directory (MAD)",
-		"Usage:\n\thf mf mad -> shows MAD if exists\n"
-			"\thf mf mad -a 03e1 -k ffffffffffff -b -> shows NDEF data if exists. read card with custom key and key B\n");
+    CLIParserInit("hf mf mad",
+        "Checks and prints Mifare Application Directory (MAD)",
+        "Usage:\n\thf mf mad -> shows MAD if exists\n"
+            "\thf mf mad -a 03e1 -k ffffffffffff -b -> shows NDEF data if exists. read card with custom key and key B\n");
 
-	void* argtable[] = {
-		arg_param_begin,
-		arg_lit0("vV",  "verbose",  "show technical data"),
-		arg_str0("aA",  "aid",      "print all sectors with aid", NULL),
-		arg_str0("kK",  "key",      "key for printing sectors", NULL),
-		arg_lit0("bB",  "keyb",     "use key B for access printing sectors (by default: key A)"),
-		arg_param_end
-	};
-	CLIExecWithReturn(cmd, argtable, true);
-	bool verbose = arg_get_lit(1);
-	uint8_t aid[2] = {0};
-	int aidlen;
-	CLIGetHexWithReturn(2, aid, &aidlen);
-	uint8_t key[6] = {0};
-	int keylen;
-	CLIGetHexWithReturn(3, key, &keylen);
-	bool keyB = arg_get_lit(4);
+    void* argtable[] = {
+        arg_param_begin,
+        arg_lit0("vV",  "verbose",  "show technical data"),
+        arg_str0("aA",  "aid",      "print all sectors with aid", NULL),
+        arg_str0("kK",  "key",      "key for printing sectors", NULL),
+        arg_lit0("bB",  "keyb",     "use key B for access printing sectors (by default: key A)"),
+        arg_param_end
+    };
+    CLIExecWithReturn(cmd, argtable, true);
+    bool verbose = arg_get_lit(1);
+    uint8_t aid[2] = {0};
+    int aidlen;
+    CLIGetHexWithReturn(2, aid, &aidlen);
+    uint8_t key[6] = {0};
+    int keylen;
+    CLIGetHexWithReturn(3, key, &keylen);
+    bool keyB = arg_get_lit(4);
 
-	CLIParserFree();
+    CLIParserFree();
 
-	if (aidlen != 2 && keylen > 0) {
-		PrintAndLogEx(WARNING, "do not need a key without aid.");
-	}
+    if (aidlen != 2 && keylen > 0) {
+        PrintAndLogEx(WARNING, "do not need a key without aid.");
+    }
 
-	uint8_t sector0[16 * 4] = {0};
-	uint8_t sector10[16 * 4] = {0};
-	if (mfReadSector(MF_MAD1_SECTOR, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector0)) {
-		PrintAndLogEx(ERR, "read sector 0 error. card don't have MAD or don't have MAD on default keys.");
-		return 2;
-	}
+    uint8_t sector0[16 * 4] = {0};
+    uint8_t sector10[16 * 4] = {0};
+    if (mfReadSector(MF_MAD1_SECTOR, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector0)) {
+        PrintAndLogEx(ERR, "read sector 0 error. card don't have MAD or don't have MAD on default keys.");
+        return 2;
+    }
 
-	if (verbose) {
-		for(int i = 0; i < 4; i ++)
-			PrintAndLogEx(NORMAL, "[%d] %s", i, sprint_hex(&sector0[i * 16], 16));
-	}
+    if (verbose) {
+        for(int i = 0; i < 4; i ++)
+            PrintAndLogEx(NORMAL, "[%d] %s", i, sprint_hex(&sector0[i * 16], 16));
+    }
 
-	bool haveMAD2 = false;
-	MAD1DecodeAndPrint(sector0, verbose, &haveMAD2);
+    bool haveMAD2 = false;
+    MAD1DecodeAndPrint(sector0, verbose, &haveMAD2);
 
-	if (haveMAD2) {
-		if (mfReadSector(MF_MAD2_SECTOR, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector10)) {
-			PrintAndLogEx(ERR, "read sector 0x10 error. card don't have MAD or don't have MAD on default keys.");
-			return 2;
-		}
+    if (haveMAD2) {
+        if (mfReadSector(MF_MAD2_SECTOR, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector10)) {
+            PrintAndLogEx(ERR, "read sector 0x10 error. card don't have MAD or don't have MAD on default keys.");
+            return 2;
+        }
 
-		MAD2DecodeAndPrint(sector10, verbose);
-	}
+        MAD2DecodeAndPrint(sector10, verbose);
+    }
 
-	if (aidlen == 2) {
-		uint16_t aaid = (aid[0] << 8) + aid[1];
-		PrintAndLogEx(NORMAL, "\n-------------- AID 0x%04x ---------------", aaid);
+    if (aidlen == 2) {
+        uint16_t aaid = (aid[0] << 8) + aid[1];
+        PrintAndLogEx(NORMAL, "\n-------------- AID 0x%04x ---------------", aaid);
 
-		uint16_t mad[7 + 8 + 8 + 8 + 8] = {0};
-		size_t madlen = 0;
-		if (MADDecode(sector0, sector10, mad, &madlen)) {
-			PrintAndLogEx(ERR, "can't decode mad.");
-			return 10;
-		}
+        uint16_t mad[7 + 8 + 8 + 8 + 8] = {0};
+        size_t madlen = 0;
+        if (MADDecode(sector0, sector10, mad, &madlen)) {
+            PrintAndLogEx(ERR, "can't decode mad.");
+            return 10;
+        }
 
-		uint8_t akey[6] = {0};
-		memcpy(akey, g_mifare_ndef_key, 6);
-		if (keylen == 6) {
-			memcpy(akey, key, 6);
-		}
+        uint8_t akey[6] = {0};
+        memcpy(akey, g_mifare_ndef_key, 6);
+        if (keylen == 6) {
+            memcpy(akey, key, 6);
+        }
 
-		for (int i = 0; i < madlen; i++) {
-			if (aaid == mad[i]) {
-				uint8_t vsector[16 * 4] = {0};
-				if (mfReadSector(i + 1, keyB ? MF_KEY_B : MF_KEY_A, akey, vsector)) {
-					PrintAndLogEx(NORMAL, "");
-					PrintAndLogEx(ERR, "read sector %d error.", i + 1);
-					return 2;
-				}
+        for (int i = 0; i < madlen; i++) {
+            if (aaid == mad[i]) {
+                uint8_t vsector[16 * 4] = {0};
+                if (mfReadSector(i + 1, keyB ? MF_KEY_B : MF_KEY_A, akey, vsector)) {
+                    PrintAndLogEx(NORMAL, "");
+                    PrintAndLogEx(ERR, "read sector %d error.", i + 1);
+                    return 2;
+                }
 
-				for(int j = 0; j < (verbose ? 4 : 3); j ++)
-					PrintAndLogEx(NORMAL, " [%03d] %s", (i + 1) * 4 + j, sprint_hex(&vsector[j * 16], 16));
-			}
-		}
-	}
+                for(int j = 0; j < (verbose ? 4 : 3); j ++)
+                    PrintAndLogEx(NORMAL, " [%03d] %s", (i + 1) * 4 + j, sprint_hex(&vsector[j * 16], 16));
+            }
+        }
+    }
 
-	return 0;
+    return 0;
 }
 
 int CmdHFMFNDEF(const char *cmd) {
 
-	CLIParserInit("hf mf ndef",
-		"Prints NFC Data Exchange Format (NDEF)",
-		"Usage:\n\thf mf ndef -> shows NDEF data\n"
-			"\thf mf ndef -a 03e1 -k ffffffffffff -b -> shows NDEF data with custom AID, key and with key B\n");
+    CLIParserInit("hf mf ndef",
+        "Prints NFC Data Exchange Format (NDEF)",
+        "Usage:\n\thf mf ndef -> shows NDEF data\n"
+            "\thf mf ndef -a 03e1 -k ffffffffffff -b -> shows NDEF data with custom AID, key and with key B\n");
 
-	void* argtable[] = {
-		arg_param_begin,
-		arg_litn("vV",  "verbose",  0, 2, "show technical data"),
-		arg_str0("aA",  "aid",      "replace default aid for NDEF", NULL),
-		arg_str0("kK",  "key",      "replace default key for NDEF", NULL),
-		arg_lit0("bB",  "keyb",     "use key B for access sectors (by default: key A)"),
-		arg_param_end
-	};
-	CLIExecWithReturn(cmd, argtable, true);
+    void* argtable[] = {
+        arg_param_begin,
+        arg_litn("vV",  "verbose",  0, 2, "show technical data"),
+        arg_str0("aA",  "aid",      "replace default aid for NDEF", NULL),
+        arg_str0("kK",  "key",      "replace default key for NDEF", NULL),
+        arg_lit0("bB",  "keyb",     "use key B for access sectors (by default: key A)"),
+        arg_param_end
+    };
+    CLIExecWithReturn(cmd, argtable, true);
 
-	bool verbose = arg_get_lit(1);
-	bool verbose2 = arg_get_lit(1) > 1;
-	uint8_t aid[2] = {0};
-	int aidlen;
-	CLIGetHexWithReturn(2, aid, &aidlen);
-	uint8_t key[6] = {0};
-	int keylen;
-	CLIGetHexWithReturn(3, key, &keylen);
-	bool keyB = arg_get_lit(4);
+    bool verbose = arg_get_lit(1);
+    bool verbose2 = arg_get_lit(1) > 1;
+    uint8_t aid[2] = {0};
+    int aidlen;
+    CLIGetHexWithReturn(2, aid, &aidlen);
+    uint8_t key[6] = {0};
+    int keylen;
+    CLIGetHexWithReturn(3, key, &keylen);
+    bool keyB = arg_get_lit(4);
 
-	CLIParserFree();
+    CLIParserFree();
 
-	uint16_t ndefAID = 0x03e1;
-	if (aidlen == 2)
-		ndefAID = (aid[0] << 8) + aid[1];
+    uint16_t ndefAID = 0x03e1;
+    if (aidlen == 2)
+        ndefAID = (aid[0] << 8) + aid[1];
 
-	uint8_t ndefkey[6] = {0};
-	memcpy(ndefkey, g_mifare_ndef_key, 6);
-	if (keylen == 6) {
-		memcpy(ndefkey, key, 6);
-	}
+    uint8_t ndefkey[6] = {0};
+    memcpy(ndefkey, g_mifare_ndef_key, 6);
+    if (keylen == 6) {
+        memcpy(ndefkey, key, 6);
+    }
 
-	uint8_t sector0[16 * 4] = {0};
-	uint8_t sector10[16 * 4] = {0};
-	uint8_t data[4096] = {0};
-	int datalen = 0;
+    uint8_t sector0[16 * 4] = {0};
+    uint8_t sector10[16 * 4] = {0};
+    uint8_t data[4096] = {0};
+    int datalen = 0;
 
-	PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "");
 
-	if (mfReadSector(MF_MAD1_SECTOR, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector0)) {
-		PrintAndLogEx(ERR, "read sector 0 error. card don't have MAD or don't have MAD on default keys.");
-		return 2;
-	}
+    if (mfReadSector(MF_MAD1_SECTOR, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector0)) {
+        PrintAndLogEx(ERR, "read sector 0 error. card don't have MAD or don't have MAD on default keys.");
+        return 2;
+    }
 
-	bool haveMAD2 = false;
-	int res = MADCheck(sector0, NULL, verbose, &haveMAD2);
-	if (res) {
-		PrintAndLogEx(ERR, "MAD error %d.", res);
-		return res;
-	}
+    bool haveMAD2 = false;
+    int res = MADCheck(sector0, NULL, verbose, &haveMAD2);
+    if (res) {
+        PrintAndLogEx(ERR, "MAD error %d.", res);
+        return res;
+    }
 
-	if (haveMAD2) {
-		if (mfReadSector(MF_MAD2_SECTOR, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector10)) {
-			PrintAndLogEx(ERR, "read sector 0x10 error. card don't have MAD or don't have MAD on default keys.");
-			return 2;
-		}
-	}
+    if (haveMAD2) {
+        if (mfReadSector(MF_MAD2_SECTOR, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector10)) {
+            PrintAndLogEx(ERR, "read sector 0x10 error. card don't have MAD or don't have MAD on default keys.");
+            return 2;
+        }
+    }
 
-	uint16_t mad[7 + 8 + 8 + 8 + 8] = {0};
-	size_t madlen = 0;
-	if (MADDecode(sector0, (haveMAD2 ? sector10 : NULL), mad, &madlen)) {
-		PrintAndLogEx(ERR, "can't decode mad.");
-		return 10;
-	}
+    uint16_t mad[7 + 8 + 8 + 8 + 8] = {0};
+    size_t madlen = 0;
+    if (MADDecode(sector0, (haveMAD2 ? sector10 : NULL), mad, &madlen)) {
+        PrintAndLogEx(ERR, "can't decode mad.");
+        return 10;
+    }
 
-	printf("data reading:");
-	for (int i = 0; i < madlen; i++) {
-		if (ndefAID == mad[i]) {
-			uint8_t vsector[16 * 4] = {0};
-			if (mfReadSector(i + 1, keyB ? MF_KEY_B : MF_KEY_A, ndefkey, vsector)) {
-				PrintAndLogEx(ERR, "read sector %d error.", i + 1);
-				return 2;
-			}
+    printf("data reading:");
+    for (int i = 0; i < madlen; i++) {
+        if (ndefAID == mad[i]) {
+            uint8_t vsector[16 * 4] = {0};
+            if (mfReadSector(i + 1, keyB ? MF_KEY_B : MF_KEY_A, ndefkey, vsector)) {
+                PrintAndLogEx(ERR, "read sector %d error.", i + 1);
+                return 2;
+            }
 
-			memcpy(&data[datalen], vsector, 16 * 3);
-			datalen += 16 * 3;
+            memcpy(&data[datalen], vsector, 16 * 3);
+            datalen += 16 * 3;
 
-			printf(".");
-		}
-	}
-	printf(" OK\n");
+            printf(".");
+        }
+    }
+    printf(" OK\n");
 
-	if (!datalen) {
-		PrintAndLogEx(ERR, "no NDEF data.");
-		return 11;
-	}
+    if (!datalen) {
+        PrintAndLogEx(ERR, "no NDEF data.");
+        return 11;
+    }
 
-	if (verbose2) {
-		PrintAndLogEx(NORMAL, "NDEF data:");
-		dump_buffer(data, datalen, stdout, 1);
-	}
+    if (verbose2) {
+        PrintAndLogEx(NORMAL, "NDEF data:");
+        dump_buffer(data, datalen, stdout, 1);
+    }
 
-	NDEFDecodeAndPrint(data, datalen, verbose);
+    NDEFDecodeAndPrint(data, datalen, verbose);
 
-	return 0;
+    return 0;
 }
 
 int CmdHF14AMfList(const char *Cmd) {
-	CmdTraceList("mf");
-	return 0;
+    CmdTraceList("mf");
+    return 0;
 }
 
 static command_t CommandTable[] = {
-	{"help",		CmdHelp,				1, "This help"},
-	{"list",		CmdHF14AMfList,         0, "[Deprecated] List ISO 14443-a / Mifare history"},
-	{"darkside",	CmdHF14AMfDarkside,		0, "Darkside attack. read parity error messages."},
-	{"nested",		CmdHF14AMfNested,		0, "Nested attack. Test nested authentication"},
-	{"hardnested", 	CmdHF14AMfNestedHard, 	0, "Nested attack for hardened Mifare cards"},
-	{"keybrute",	CmdHF14AMfKeyBrute,		0, "J_Run's 2nd phase of multiple sector nested authentication key recovery"},
-	{"nack",		CmdHf14AMfNack,			0, "Test for Mifare NACK bug"},
-	{"chk",			CmdHF14AMfChk,			0, "Check keys"},
-	{"fchk",		CmdHF14AMfChk_fast,		0, "Check keys fast, targets all keys on card"},
-	{"decrypt",		CmdHf14AMfDecryptBytes, 1, "[nt] [ar_enc] [at_enc] [data] - to decrypt snoop or trace"},
-	{"-----------",	CmdHelp,				1, ""},
-	{"dbg",			CmdHF14AMfDbg,			0, "Set default debug mode"},
-	{"rdbl",		CmdHF14AMfRdBl,			0, "Read MIFARE classic block"},
-	{"rdsc",		CmdHF14AMfRdSc,			0, "Read MIFARE classic sector"},
-	{"dump",		CmdHF14AMfDump,			0, "Dump MIFARE classic tag to binary file"},
-	{"restore",		CmdHF14AMfRestore,		0, "Restore MIFARE classic binary file to BLANK tag"},
-	{"wrbl",		CmdHF14AMfWrBl,			0, "Write MIFARE classic block"},
-	{"setmod",		CmdHf14AMfSetMod, 		0, "Set MIFARE Classic EV1 load modulation strength"},
-	{"auth4",		CmdHF14AMfAuth4,		0, "ISO14443-4 AES authentication"},
-//	{"sniff",		CmdHF14AMfSniff,		0, "Sniff card-reader communication"},
-	{"-----------",	CmdHelp,				1, ""},
-	{"sim",			CmdHF14AMf1kSim,		0, "Simulate MIFARE card"},
-	{"eclr",		CmdHF14AMfEClear,		0, "Clear simulator memory block"},
-	{"eget",		CmdHF14AMfEGet,			0, "Get simulator memory block"},
-	{"eset",		CmdHF14AMfESet,			0, "Set simulator memory block"},
-	{"eload",		CmdHF14AMfELoad,		0, "Load from file emul dump"},
-	{"esave",		CmdHF14AMfESave,		0, "Save to file emul dump"},
-	{"ecfill",		CmdHF14AMfECFill,		0, "Fill simulator memory with help of keys from simulator"},
-	{"ekeyprn",		CmdHF14AMfEKeyPrn,		0, "Print keys from simulator memory"},
-	{"-----------",	CmdHelp,				1, ""},
-	{"csetuid",		CmdHF14AMfCSetUID,		0, "Set UID for magic Chinese card"},
-	{"csetblk",		CmdHF14AMfCSetBlk,		0, "Write block - Magic Chinese card"},
-	{"cgetblk",		CmdHF14AMfCGetBlk,		0, "Read block - Magic Chinese card"},
-	{"cgetsc",		CmdHF14AMfCGetSc,		0, "Read sector - Magic Chinese card"},
-	{"cload",		CmdHF14AMfCLoad,		0, "Load dump into magic Chinese card"},
-	{"csave",		CmdHF14AMfCSave,		0, "Save dump from magic Chinese card into file or emulator"},
-	{"-----------",	CmdHelp,				1, ""},
-	{"mad",			CmdHF14AMfMAD,			0, "Checks and prints MAD"},
-	{"ndef",		CmdHFMFNDEF,			0, "Prints NDEF records from card"},
+    {"help",        CmdHelp,                1, "This help"},
+    {"list",        CmdHF14AMfList,         0, "[Deprecated] List ISO 14443-a / Mifare history"},
+    {"darkside",    CmdHF14AMfDarkside,     0, "Darkside attack. read parity error messages."},
+    {"nested",      CmdHF14AMfNested,       0, "Nested attack. Test nested authentication"},
+    {"hardnested",  CmdHF14AMfNestedHard,   0, "Nested attack for hardened Mifare cards"},
+    {"keybrute",    CmdHF14AMfKeyBrute,     0, "J_Run's 2nd phase of multiple sector nested authentication key recovery"},
+    {"nack",        CmdHf14AMfNack,         0, "Test for Mifare NACK bug"},
+    {"chk",         CmdHF14AMfChk,          0, "Check keys"},
+    {"fchk",        CmdHF14AMfChk_fast,     0, "Check keys fast, targets all keys on card"},
+    {"decrypt",     CmdHf14AMfDecryptBytes, 1, "[nt] [ar_enc] [at_enc] [data] - to decrypt snoop or trace"},
+    {"-----------", CmdHelp,                1, ""},
+    {"dbg",         CmdHF14AMfDbg,          0, "Set default debug mode"},
+    {"rdbl",        CmdHF14AMfRdBl,         0, "Read MIFARE classic block"},
+    {"rdsc",        CmdHF14AMfRdSc,         0, "Read MIFARE classic sector"},
+    {"dump",        CmdHF14AMfDump,         0, "Dump MIFARE classic tag to binary file"},
+    {"restore",     CmdHF14AMfRestore,      0, "Restore MIFARE classic binary file to BLANK tag"},
+    {"wrbl",        CmdHF14AMfWrBl,         0, "Write MIFARE classic block"},
+    {"setmod",      CmdHf14AMfSetMod,       0, "Set MIFARE Classic EV1 load modulation strength"},
+    {"auth4",       CmdHF14AMfAuth4,        0, "ISO14443-4 AES authentication"},
+//    {"sniff",       CmdHF14AMfSniff,        0, "Sniff card-reader communication"},
+    {"-----------", CmdHelp,                1, ""},
+    {"sim",         CmdHF14AMf1kSim,        0, "Simulate MIFARE card"},
+    {"eclr",        CmdHF14AMfEClear,       0, "Clear simulator memory block"},
+    {"eget",        CmdHF14AMfEGet,         0, "Get simulator memory block"},
+    {"eset",        CmdHF14AMfESet,         0, "Set simulator memory block"},
+    {"eload",       CmdHF14AMfELoad,        0, "Load from file emul dump"},
+    {"esave",       CmdHF14AMfESave,        0, "Save to file emul dump"},
+    {"ecfill",      CmdHF14AMfECFill,       0, "Fill simulator memory with help of keys from simulator"},
+    {"ekeyprn",     CmdHF14AMfEKeyPrn,      0, "Print keys from simulator memory"},
+    {"-----------", CmdHelp,                1, ""},
+    {"csetuid",     CmdHF14AMfCSetUID,      0, "Set UID for magic Chinese card"},
+    {"csetblk",     CmdHF14AMfCSetBlk,      0, "Write block - Magic Chinese card"},
+    {"cgetblk",     CmdHF14AMfCGetBlk,      0, "Read block - Magic Chinese card"},
+    {"cgetsc",      CmdHF14AMfCGetSc,       0, "Read sector - Magic Chinese card"},
+    {"cload",       CmdHF14AMfCLoad,        0, "Load dump into magic Chinese card"},
+    {"csave",       CmdHF14AMfCSave,        0, "Save dump from magic Chinese card into file or emulator"},
+    {"-----------", CmdHelp,                1, ""},
+    {"mad",         CmdHF14AMfMAD,          0, "Checks and prints MAD"},
+    {"ndef",        CmdHFMFNDEF,            0, "Prints NDEF records from card"},
 
-	{"ice",			CmdHF14AMfice,			0, "collect Mifare Classic nonces to file"},
-	{NULL, NULL, 0, NULL}
+    {"ice",         CmdHF14AMfice,          0, "collect Mifare Classic nonces to file"},
+    {NULL, NULL, 0, NULL}
 };
 
 int CmdHFMF(const char *Cmd) {
-	clearCommandBuffer();
-	CmdsParse(CommandTable, Cmd);
-	return 0;
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
+    return 0;
 }
 
 int CmdHelp(const char *Cmd) {
-	CmdsHelp(CommandTable);
-	return 0;
+    CmdsHelp(CommandTable);
+    return 0;
 }
diff --git a/client/cmdhfmf.h b/client/cmdhfmf.h
index a8e622cc7..e7ad35b44 100644
--- a/client/cmdhfmf.h
+++ b/client/cmdhfmf.h
@@ -23,15 +23,15 @@
 #include "cmdparser.h"
 #include "common.h"
 #include "util.h"
-#include "mifare.h" 				// nonces_t struct
-#include "mifare/mfkey.h"   		// mfkey32_moebious
+#include "mifare.h"                        // nonces_t struct
+#include "mifare/mfkey.h"                  // mfkey32_moebious
 #include "cmdhfmfhard.h"
-#include "mifare/mifarehost.h"		// icesector_t,  sector_t
-#include "util_posix.h"				// msclock
-#include "mifare/mifaredefault.h"  	// mifare default key array
-#include "cmdhf14a.h" 				// dropfield
-#include "cliparser/cliparser.h" 	// argtable
-#include "hardnested/hardnested_bf_core.h"	// SetSIMDInstr
+#include "mifare/mifarehost.h"             // icesector_t,  sector_t
+#include "util_posix.h"                    // msclock
+#include "mifare/mifaredefault.h"          // mifare default key array
+#include "cmdhf14a.h"                      // dropfield
+#include "cliparser/cliparser.h"           // argtable
+#include "hardnested/hardnested_bf_core.h" // SetSIMDInstr
 
 extern int CmdHFMF(const char *Cmd);
 
diff --git a/client/cmdhfmfdes.c b/client/cmdhfmfdes.c
index 9ddd23b5f..317192329 100644
--- a/client/cmdhfmfdes.c
+++ b/client/cmdhfmfdes.c
@@ -37,180 +37,180 @@ static int CmdHelp(const char *Cmd);
 
 int CmdHF14ADesWb(const char *Cmd)
 {
-/* 	uint8_t blockNo = 0;
-	uint8_t keyType = 0;
-	uint8_t key[6] = {0, 0, 0, 0, 0, 0};
-	uint8_t bldata[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+/*  uint8_t blockNo = 0;
+    uint8_t keyType = 0;
+    uint8_t key[6] = {0, 0, 0, 0, 0, 0};
+    uint8_t bldata[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 
-	char cmdp	= 0x00;
+    char cmdp = 0x00;
 
-	if (strlen(Cmd)<3) {
-		PrintAndLogEx(NORMAL, "Usage:  hf mf wrbl    <block number> <key A/B> <key (12 hex symbols)> <block data (32 hex symbols)>");
-		PrintAndLogEx(NORMAL, "        sample: hf mf wrbl 0 A FFFFFFFFFFFF 000102030405060708090A0B0C0D0E0F");
-		return 0;
-	}
+    if (strlen(Cmd)<3) {
+        PrintAndLogEx(NORMAL, "Usage:  hf mf wrbl    <block number> <key A/B> <key (12 hex symbols)> <block data (32 hex symbols)>");
+        PrintAndLogEx(NORMAL, "        sample: hf mf wrbl 0 A FFFFFFFFFFFF 000102030405060708090A0B0C0D0E0F");
+        return 0;
+    }
 
-	blockNo = param_get8(Cmd, 0);
-	cmdp = param_getchar(Cmd, 1);
-	if (cmdp == 0x00) {
-		PrintAndLogEx(NORMAL, "Key type must be A or B");
-		return 1;
-	}
-	if (cmdp != 'A' && cmdp != 'a') keyType = 1;
-	if (param_gethex(Cmd, 2, key, 12)) {
-		PrintAndLogEx(NORMAL, "Key must include 12 HEX symbols");
-		return 1;
-	}
-	if (param_gethex(Cmd, 3, bldata, 32)) {
-		PrintAndLogEx(NORMAL, "Block data must include 32 HEX symbols");
-		return 1;
-	}
-	PrintAndLogEx(NORMAL, "--block no:%02x key type:%02x key:%s", blockNo, keyType, sprint_hex(key, 6));
-	PrintAndLogEx(NORMAL, "--data: %s", sprint_hex(bldata, 16));
+    blockNo = param_get8(Cmd, 0);
+    cmdp = param_getchar(Cmd, 1);
+    if (cmdp == 0x00) {
+        PrintAndLogEx(NORMAL, "Key type must be A or B");
+        return 1;
+    }
+    if (cmdp != 'A' && cmdp != 'a') keyType = 1;
+    if (param_gethex(Cmd, 2, key, 12)) {
+        PrintAndLogEx(NORMAL, "Key must include 12 HEX symbols");
+        return 1;
+    }
+    if (param_gethex(Cmd, 3, bldata, 32)) {
+        PrintAndLogEx(NORMAL, "Block data must include 32 HEX symbols");
+        return 1;
+    }
+    PrintAndLogEx(NORMAL, "--block no:%02x key type:%02x key:%s", blockNo, keyType, sprint_hex(key, 6));
+    PrintAndLogEx(NORMAL, "--data: %s", sprint_hex(bldata, 16));
 
   UsbCommand c = {CMD_MIFARE_WRITEBL, {blockNo, keyType, 0}};
-	memcpy(c.d.asBytes, key, 6);
-	memcpy(c.d.asBytes + 10, bldata, 16);
+    memcpy(c.d.asBytes, key, 6);
+    memcpy(c.d.asBytes + 10, bldata, 16);
   SendCommand(&c);
 
-	UsbCommand resp;
-	if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
-		uint8_t isOK  = resp.arg[0] & 0xff;
-		PrintAndLogEx(NORMAL, "isOk:%02x", isOK);
-	} else {
-		PrintAndLogEx(NORMAL, "Command execute timeout");
-	}
+    UsbCommand resp;
+    if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
+        uint8_t isOK  = resp.arg[0] & 0xff;
+        PrintAndLogEx(NORMAL, "isOk:%02x", isOK);
+    } else {
+        PrintAndLogEx(NORMAL, "Command execute timeout");
+    }
  */
-	return 0;
+    return 0;
 }
 
 int CmdHF14ADesRb(const char *Cmd)
 {
-	// uint8_t blockNo = 0;
-	// uint8_t keyType = 0;
-	// uint8_t key[6] = {0, 0, 0, 0, 0, 0};
+    // uint8_t blockNo = 0;
+    // uint8_t keyType = 0;
+    // uint8_t key[6] = {0, 0, 0, 0, 0, 0};
 
-	// char cmdp	= 0x00;
+    // char cmdp = 0x00;
 
 
-	// if (strlen(Cmd)<3) {
-		// PrintAndLogEx(NORMAL, "Usage:  hf mf rdbl    <block number> <key A/B> <key (12 hex symbols)>");
-		// PrintAndLogEx(NORMAL, "        sample: hf mf rdbl 0 A FFFFFFFFFFFF ");
-		// return 0;
-	// }
+    // if (strlen(Cmd)<3) {
+        // PrintAndLogEx(NORMAL, "Usage:  hf mf rdbl    <block number> <key A/B> <key (12 hex symbols)>");
+        // PrintAndLogEx(NORMAL, "        sample: hf mf rdbl 0 A FFFFFFFFFFFF ");
+        // return 0;
+    // }
 
-	// blockNo = param_get8(Cmd, 0);
-	// cmdp = param_getchar(Cmd, 1);
-	// if (cmdp == 0x00) {
-		// PrintAndLogEx(NORMAL, "Key type must be A or B");
-		// return 1;
-	// }
-	// if (cmdp != 'A' && cmdp != 'a') keyType = 1;
-	// if (param_gethex(Cmd, 2, key, 12)) {
-		// PrintAndLogEx(NORMAL, "Key must include 12 HEX symbols");
-		// return 1;
-	// }
-	// PrintAndLogEx(NORMAL, "--block no:%02x key type:%02x key:%s ", blockNo, keyType, sprint_hex(key, 6));
+    // blockNo = param_get8(Cmd, 0);
+    // cmdp = param_getchar(Cmd, 1);
+    // if (cmdp == 0x00) {
+        // PrintAndLogEx(NORMAL, "Key type must be A or B");
+        // return 1;
+    // }
+    // if (cmdp != 'A' && cmdp != 'a') keyType = 1;
+    // if (param_gethex(Cmd, 2, key, 12)) {
+        // PrintAndLogEx(NORMAL, "Key must include 12 HEX symbols");
+        // return 1;
+    // }
+    // PrintAndLogEx(NORMAL, "--block no:%02x key type:%02x key:%s ", blockNo, keyType, sprint_hex(key, 6));
 
   // UsbCommand c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}};
-	// memcpy(c.d.asBytes, key, 6);
+    // memcpy(c.d.asBytes, key, 6);
   // SendCommand(&c);
 
-	// UsbCommand resp;
-	// if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
-		// uint8_t                isOK  = resp.arg[0] & 0xff;
-		// uint8_t              * data  = resp.d.asBytes;
+    // UsbCommand resp;
+    // if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
+        // uint8_t                isOK  = resp.arg[0] & 0xff;
+        // uint8_t              * data  = resp.d.asBytes;
 
-		// if (isOK)
-			// PrintAndLogEx(NORMAL, "isOk:%02x data:%s", isOK, sprint_hex(data, 16));
-		// else
-			// PrintAndLogEx(NORMAL, "isOk:%02x", isOK);
-	// } else {
-		// PrintAndLogEx(NORMAL, "Command execute timeout");
-	// }
+        // if (isOK)
+            // PrintAndLogEx(NORMAL, "isOk:%02x data:%s", isOK, sprint_hex(data, 16));
+        // else
+            // PrintAndLogEx(NORMAL, "isOk:%02x", isOK);
+    // } else {
+        // PrintAndLogEx(NORMAL, "Command execute timeout");
+    // }
 
   return 0;
 }
 
 int CmdHF14ADesInfo(const char *Cmd){
 
-	UsbCommand c = {CMD_MIFARE_DESFIRE_INFO};
+    UsbCommand c = {CMD_MIFARE_DESFIRE_INFO};
     SendCommand(&c);
-	UsbCommand resp;
+    UsbCommand resp;
 
-	if ( !WaitForResponseTimeout(CMD_ACK,&resp,1500) ) {
-		PrintAndLogEx(WARNING, "Command execute timeout");
-		return 0;
-	}
-	uint8_t isOK  = resp.arg[0] & 0xff;
-	if ( !isOK ){
-		switch ( resp.arg[1] ) {
-			case 1:
-				PrintAndLogEx(WARNING, "Can't select card"); break;
-			case 2:
-				PrintAndLogEx(WARNING, "Card is most likely not Desfire. Its UID has wrong size"); break;
-			case 3:
-			default:
-				PrintAndLogEx(WARNING, "Command unsuccessful"); break;
-		}
-		return 0;
-	}
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "-- Desfire Information --------------------------------------");
-	PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
-	PrintAndLogEx(NORMAL, "  UID                : %s",sprint_hex(resp.d.asBytes, 7));
-	PrintAndLogEx(NORMAL, "  Batch number       : %s",sprint_hex(resp.d.asBytes+28,5));
-	PrintAndLogEx(NORMAL, "  Production date    : week %02x, 20%02x",resp.d.asBytes[33], resp.d.asBytes[34]);
-	PrintAndLogEx(NORMAL, "  -----------------------------------------------------------");
-	PrintAndLogEx(NORMAL, "  Hardware Information");
-	PrintAndLogEx(NORMAL, "      Vendor Id      : %s", getTagInfo(resp.d.asBytes[7]));
-	PrintAndLogEx(NORMAL, "      Type           : 0x%02X",resp.d.asBytes[8]);
-	PrintAndLogEx(NORMAL, "      Subtype        : 0x%02X",resp.d.asBytes[9]);
-	PrintAndLogEx(NORMAL, "      Version        : %s",GetVersionStr(resp.d.asBytes[10], resp.d.asBytes[11]) );
-	PrintAndLogEx(NORMAL, "      Storage size   : %s",GetCardSizeStr(resp.d.asBytes[12]));
-	PrintAndLogEx(NORMAL, "      Protocol       : %s",GetProtocolStr(resp.d.asBytes[13]));
-	PrintAndLogEx(NORMAL, "  -----------------------------------------------------------");
-	PrintAndLogEx(NORMAL, "  Software Information");
-	PrintAndLogEx(NORMAL, "      Vendor Id      : %s", getTagInfo(resp.d.asBytes[14]));
-	PrintAndLogEx(NORMAL, "      Type           : 0x%02X",resp.d.asBytes[15]);
-	PrintAndLogEx(NORMAL, "      Subtype        : 0x%02X",resp.d.asBytes[16]);
-	PrintAndLogEx(NORMAL, "      Version        : %d.%d",resp.d.asBytes[17], resp.d.asBytes[18]);
-	PrintAndLogEx(NORMAL, "      storage size   : %s", GetCardSizeStr(resp.d.asBytes[19]));
-	PrintAndLogEx(NORMAL, "      Protocol       : %s", GetProtocolStr(resp.d.asBytes[20]));
-	PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
+    if ( !WaitForResponseTimeout(CMD_ACK,&resp,1500) ) {
+        PrintAndLogEx(WARNING, "Command execute timeout");
+        return 0;
+    }
+    uint8_t isOK  = resp.arg[0] & 0xff;
+    if ( !isOK ){
+        switch ( resp.arg[1] ) {
+            case 1:
+                PrintAndLogEx(WARNING, "Can't select card"); break;
+            case 2:
+                PrintAndLogEx(WARNING, "Card is most likely not Desfire. Its UID has wrong size"); break;
+            case 3:
+            default:
+                PrintAndLogEx(WARNING, "Command unsuccessful"); break;
+        }
+        return 0;
+    }
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "-- Desfire Information --------------------------------------");
+    PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
+    PrintAndLogEx(NORMAL, "  UID                : %s",sprint_hex(resp.d.asBytes, 7));
+    PrintAndLogEx(NORMAL, "  Batch number       : %s",sprint_hex(resp.d.asBytes+28,5));
+    PrintAndLogEx(NORMAL, "  Production date    : week %02x, 20%02x",resp.d.asBytes[33], resp.d.asBytes[34]);
+    PrintAndLogEx(NORMAL, "  -----------------------------------------------------------");
+    PrintAndLogEx(NORMAL, "  Hardware Information");
+    PrintAndLogEx(NORMAL, "      Vendor Id      : %s", getTagInfo(resp.d.asBytes[7]));
+    PrintAndLogEx(NORMAL, "      Type           : 0x%02X",resp.d.asBytes[8]);
+    PrintAndLogEx(NORMAL, "      Subtype        : 0x%02X",resp.d.asBytes[9]);
+    PrintAndLogEx(NORMAL, "      Version        : %s",GetVersionStr(resp.d.asBytes[10], resp.d.asBytes[11]) );
+    PrintAndLogEx(NORMAL, "      Storage size   : %s",GetCardSizeStr(resp.d.asBytes[12]));
+    PrintAndLogEx(NORMAL, "      Protocol       : %s",GetProtocolStr(resp.d.asBytes[13]));
+    PrintAndLogEx(NORMAL, "  -----------------------------------------------------------");
+    PrintAndLogEx(NORMAL, "  Software Information");
+    PrintAndLogEx(NORMAL, "      Vendor Id      : %s", getTagInfo(resp.d.asBytes[14]));
+    PrintAndLogEx(NORMAL, "      Type           : 0x%02X",resp.d.asBytes[15]);
+    PrintAndLogEx(NORMAL, "      Subtype        : 0x%02X",resp.d.asBytes[16]);
+    PrintAndLogEx(NORMAL, "      Version        : %d.%d",resp.d.asBytes[17], resp.d.asBytes[18]);
+    PrintAndLogEx(NORMAL, "      storage size   : %s", GetCardSizeStr(resp.d.asBytes[19]));
+    PrintAndLogEx(NORMAL, "      Protocol       : %s", GetProtocolStr(resp.d.asBytes[20]));
+    PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
 
-	// Master Key settings
-	GetKeySettings(NULL);
+    // Master Key settings
+    GetKeySettings(NULL);
 
-	// Free memory on card
-	c.cmd = CMD_MIFARE_DESFIRE;
-	c.arg[0] = (INIT | DISCONNECT);
-	c.arg[1] = 0x01;
-	c.d.asBytes[0] = GET_FREE_MEMORY;
+    // Free memory on card
+    c.cmd = CMD_MIFARE_DESFIRE;
+    c.arg[0] = (INIT | DISCONNECT);
+    c.arg[1] = 0x01;
+    c.d.asBytes[0] = GET_FREE_MEMORY;
     SendCommand(&c);
-	if ( !WaitForResponseTimeout(CMD_ACK,&resp,1500))
-		return 0;
+    if ( !WaitForResponseTimeout(CMD_ACK,&resp,1500))
+        return 0;
 
-	uint8_t tmp[3];
-	memcpy(tmp, resp.d.asBytes+3,3);
+    uint8_t tmp[3];
+    memcpy(tmp, resp.d.asBytes+3,3);
 
-	PrintAndLogEx(NORMAL, "   Available free memory on card       : %d bytes", le24toh( tmp ));
-	PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
+    PrintAndLogEx(NORMAL, "   Available free memory on card       : %d bytes", le24toh( tmp ));
+    PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
 
-	/*
-		Card Master key (CMK)        0x00 AID = 00 00 00 (card level)
-		Application Master Key (AMK) 0x00 AID != 00 00 00
-		Application keys (APK)       0x01-0x0D
-		Application free             0x0E
-		Application never            0x0F
+    /*
+        Card Master key (CMK)        0x00 AID = 00 00 00 (card level)
+        Application Master Key (AMK) 0x00 AID != 00 00 00
+        Application keys (APK)       0x01-0x0D
+        Application free             0x0E
+        Application never            0x0F
 
-		ACCESS RIGHTS:
-		keys 0,1,2,3     C
-		keys 4,5,6,7     RW
-		keys 8,9,10,11   W
-		keys 12,13,14,15 R
+        ACCESS RIGHTS:
+        keys 0,1,2,3     C
+        keys 4,5,6,7     RW
+        keys 8,9,10,11   W
+        keys 12,13,14,15 R
 
-	*/
+    */
 
     return 1;
 }
@@ -218,329 +218,329 @@ int CmdHF14ADesInfo(const char *Cmd){
 /*
   The 7 MSBits (= n) code the storage size itself based on 2^n,
   the LSBit is set to '0' if the size is exactly 2^n
-	and set to '1' if the storage size is between 2^n and 2^(n+1).
-	For this version of DESFire the 7 MSBits are set to 0x0C (2^12 = 4096) and the LSBit is '0'.
+    and set to '1' if the storage size is between 2^n and 2^(n+1).
+    For this version of DESFire the 7 MSBits are set to 0x0C (2^12 = 4096) and the LSBit is '0'.
 */
 char * GetCardSizeStr( uint8_t fsize ){
 
- 	static char buf[30] = {0x00};
-	char *retStr = buf;
+    static char buf[30] = {0x00};
+    char *retStr = buf;
 
-	uint16_t usize = 1 << ((fsize >>1) + 1);
-	uint16_t lsize = 1 << (fsize >>1);
+    uint16_t usize = 1 << ((fsize >>1) + 1);
+    uint16_t lsize = 1 << (fsize >>1);
 
-	// is  LSB set?
-	if (  fsize & 1 )
-		sprintf(retStr, "0x%02X (%d - %d bytes)",fsize, usize, lsize);
-	else
-		sprintf(retStr, "0x%02X (%d bytes)", fsize, lsize);
-	return buf;
+    // is  LSB set?
+    if (  fsize & 1 )
+        sprintf(retStr, "0x%02X (%d - %d bytes)",fsize, usize, lsize);
+    else
+        sprintf(retStr, "0x%02X (%d bytes)", fsize, lsize);
+    return buf;
 }
 
 char * GetProtocolStr(uint8_t id){
 
- 	static char buf[30] = {0x00};
-	char *retStr = buf;
+    static char buf[30] = {0x00};
+    char *retStr = buf;
 
-	if ( id == 0x05)
-		sprintf(retStr,"0x%02X (ISO 14443-3, 14443-4)", id);
-	else
-		sprintf(retStr,"0x%02X (Unknown)", id);
-	return buf;
+    if ( id == 0x05)
+        sprintf(retStr,"0x%02X (ISO 14443-3, 14443-4)", id);
+    else
+        sprintf(retStr,"0x%02X (Unknown)", id);
+    return buf;
 }
 
 char * GetVersionStr(uint8_t major, uint8_t minor){
 
-	static char buf[30] = {0x00};
-	char *retStr = buf;
+    static char buf[30] = {0x00};
+    char *retStr = buf;
 
-	if ( major == 0x00)
-		sprintf(retStr,"%d.%d (Desfire MF3ICD40)", major, minor);
-	else if ( major == 0x01 && minor == 0x00)
-		sprintf(retStr,"%d.%d (Desfire EV1)", major, minor);
-	else if ( major == 0x12 && minor == 0x00)
-		sprintf(retStr,"%d.%d (Desfire EV2)", major, minor);
-	else
-		sprintf(retStr,"%d.%d (Unknown)", major, minor);
-	return buf;
+    if ( major == 0x00)
+        sprintf(retStr,"%d.%d (Desfire MF3ICD40)", major, minor);
+    else if ( major == 0x01 && minor == 0x00)
+        sprintf(retStr,"%d.%d (Desfire EV1)", major, minor);
+    else if ( major == 0x12 && minor == 0x00)
+        sprintf(retStr,"%d.%d (Desfire EV2)", major, minor);
+    else
+        sprintf(retStr,"%d.%d (Unknown)", major, minor);
+    return buf;
 }
 
 void GetKeySettings( uint8_t *aid){
 
-	char messStr[512] = {0x00};
-	char *str = messStr;
-	uint8_t isOK = 0;
-	uint32_t options = NONE;
-	UsbCommand c = {CMD_MIFARE_DESFIRE};
-	UsbCommand resp;
+    char messStr[512] = {0x00};
+    char *str = messStr;
+    uint8_t isOK = 0;
+    uint32_t options = NONE;
+    UsbCommand c = {CMD_MIFARE_DESFIRE};
+    UsbCommand resp;
 
-	//memset(messStr, 0x00, 512);
+    //memset(messStr, 0x00, 512);
 
-	if ( aid == NULL ){
-		PrintAndLogEx(NORMAL, " CMK - PICC, Card Master Key settings ");
-		PrintAndLogEx(NORMAL, "");
-		c.arg[CMDPOS] = (INIT | DISCONNECT);
-		c.arg[LENPOS] =  0x01;
-		c.d.asBytes[0] = GET_KEY_SETTINGS;  // 0x45
-		SendCommand(&c);
-		if ( !WaitForResponseTimeout(CMD_ACK,&resp,1000) ) {return;}
-		isOK  = resp.arg[0] & 0xff;
-		if ( !isOK ){
-			PrintAndLogEx(WARNING, "   Can't select master application");
-			return;
-		}
+    if ( aid == NULL ){
+        PrintAndLogEx(NORMAL, " CMK - PICC, Card Master Key settings ");
+        PrintAndLogEx(NORMAL, "");
+        c.arg[CMDPOS] = (INIT | DISCONNECT);
+        c.arg[LENPOS] =  0x01;
+        c.d.asBytes[0] = GET_KEY_SETTINGS;  // 0x45
+        SendCommand(&c);
+        if ( !WaitForResponseTimeout(CMD_ACK,&resp,1000) ) {return;}
+        isOK  = resp.arg[0] & 0xff;
+        if ( !isOK ){
+            PrintAndLogEx(WARNING, "   Can't select master application");
+            return;
+        }
 
-		str = (resp.d.asBytes[3] & (1 << 3 )) ? "YES":"NO";
-		PrintAndLogEx(NORMAL, "   [0x08] Configuration changeable       : %s", str);
-		str = (resp.d.asBytes[3] & (1 << 2 )) ? "NO":"YES";
-		PrintAndLogEx(NORMAL, "   [0x04] CMK required for create/delete : %s",str);
-		str = (resp.d.asBytes[3] & (1 << 1 )) ? "NO":"YES";
-		PrintAndLogEx(NORMAL, "   [0x02] Directory list access with CMK : %s",str);
-		str = (resp.d.asBytes[3] & (1 << 0 )) ? "YES" : "NO";
-		PrintAndLogEx(NORMAL, "   [0x01] CMK is changeable              : %s", str);
+        str = (resp.d.asBytes[3] & (1 << 3 )) ? "YES":"NO";
+        PrintAndLogEx(NORMAL, "   [0x08] Configuration changeable       : %s", str);
+        str = (resp.d.asBytes[3] & (1 << 2 )) ? "NO":"YES";
+        PrintAndLogEx(NORMAL, "   [0x04] CMK required for create/delete : %s",str);
+        str = (resp.d.asBytes[3] & (1 << 1 )) ? "NO":"YES";
+        PrintAndLogEx(NORMAL, "   [0x02] Directory list access with CMK : %s",str);
+        str = (resp.d.asBytes[3] & (1 << 0 )) ? "YES" : "NO";
+        PrintAndLogEx(NORMAL, "   [0x01] CMK is changeable              : %s", str);
 
-		c.arg[LENPOS] = 0x02; //LEN
-		c.d.asBytes[0] = GET_KEY_VERSION; //0x64
-		c.d.asBytes[1] = 0x00;
-		SendCommand(&c);
-		if ( !WaitForResponseTimeout(CMD_ACK,&resp,1000) ) { return; }
-		isOK  = resp.arg[0] & 0xff;
-		if ( !isOK ){
-			PrintAndLogEx(WARNING, "   Can't read key-version");
-			return;
-		}
-		PrintAndLogEx(NORMAL, "");
-		PrintAndLogEx(NORMAL, "   Max number of keys       : %d", resp.d.asBytes[4]);
-		PrintAndLogEx(NORMAL, "   Master key Version       : %d (0x%02x)", resp.d.asBytes[3], resp.d.asBytes[3]);
-		PrintAndLogEx(NORMAL, "   ----------------------------------------------------------");
+        c.arg[LENPOS] = 0x02; //LEN
+        c.d.asBytes[0] = GET_KEY_VERSION; //0x64
+        c.d.asBytes[1] = 0x00;
+        SendCommand(&c);
+        if ( !WaitForResponseTimeout(CMD_ACK,&resp,1000) ) { return; }
+        isOK  = resp.arg[0] & 0xff;
+        if ( !isOK ){
+            PrintAndLogEx(WARNING, "   Can't read key-version");
+            return;
+        }
+        PrintAndLogEx(NORMAL, "");
+        PrintAndLogEx(NORMAL, "   Max number of keys       : %d", resp.d.asBytes[4]);
+        PrintAndLogEx(NORMAL, "   Master key Version       : %d (0x%02x)", resp.d.asBytes[3], resp.d.asBytes[3]);
+        PrintAndLogEx(NORMAL, "   ----------------------------------------------------------");
 
-		c.arg[LENPOS] = 0x02; //LEN
-		c.d.asBytes[0] = AUTHENTICATE; //0x0A
-		c.d.asBytes[1] = 0x00; // KEY 0
-		SendCommand(&c);
-		if ( !WaitForResponseTimeout(CMD_ACK,&resp,1000) ) {return;}
-		isOK  = resp.d.asBytes[2] & 0xff;
-		PrintAndLogEx(NORMAL, "   [0x0A] Authenticate      : %s", ( isOK==0xAE ) ? "NO":"YES");
+        c.arg[LENPOS] = 0x02; //LEN
+        c.d.asBytes[0] = AUTHENTICATE; //0x0A
+        c.d.asBytes[1] = 0x00; // KEY 0
+        SendCommand(&c);
+        if ( !WaitForResponseTimeout(CMD_ACK,&resp,1000) ) {return;}
+        isOK  = resp.d.asBytes[2] & 0xff;
+        PrintAndLogEx(NORMAL, "   [0x0A] Authenticate      : %s", ( isOK==0xAE ) ? "NO":"YES");
 
-		c.d.asBytes[0] = AUTHENTICATE_ISO; //0x1A
-		SendCommand(&c);
-		if ( !WaitForResponseTimeout(CMD_ACK,&resp,1000) ) {return;}
-		isOK  = resp.d.asBytes[2] & 0xff;
-		PrintAndLogEx(NORMAL, "   [0x1A] Authenticate ISO  : %s", ( isOK==0xAE ) ? "NO":"YES");
+        c.d.asBytes[0] = AUTHENTICATE_ISO; //0x1A
+        SendCommand(&c);
+        if ( !WaitForResponseTimeout(CMD_ACK,&resp,1000) ) {return;}
+        isOK  = resp.d.asBytes[2] & 0xff;
+        PrintAndLogEx(NORMAL, "   [0x1A] Authenticate ISO  : %s", ( isOK==0xAE ) ? "NO":"YES");
 
-		c.d.asBytes[0] = AUTHENTICATE_AES; //0xAA
-		SendCommand(&c);
-		if ( !WaitForResponseTimeout(CMD_ACK,&resp,1000) ) {return;}
-		isOK  = resp.d.asBytes[2] & 0xff;
-		PrintAndLogEx(NORMAL, "   [0xAA] Authenticate AES  : %s", ( isOK==0xAE ) ? "NO":"YES");
-		PrintAndLogEx(NORMAL, "");
-		PrintAndLogEx(NORMAL, "   ----------------------------------------------------------");
+        c.d.asBytes[0] = AUTHENTICATE_AES; //0xAA
+        SendCommand(&c);
+        if ( !WaitForResponseTimeout(CMD_ACK,&resp,1000) ) {return;}
+        isOK  = resp.d.asBytes[2] & 0xff;
+        PrintAndLogEx(NORMAL, "   [0xAA] Authenticate AES  : %s", ( isOK==0xAE ) ? "NO":"YES");
+        PrintAndLogEx(NORMAL, "");
+        PrintAndLogEx(NORMAL, "   ----------------------------------------------------------");
 
-	} else {
-		PrintAndLogEx(NORMAL, " AMK - Application Master Key settings");
+    } else {
+        PrintAndLogEx(NORMAL, " AMK - Application Master Key settings");
 
-		// SELECT AID
-		c.arg[0] = (INIT | CLEARTRACE);
-		c.arg[LENPOS] = 0x04;
-		c.d.asBytes[0] = SELECT_APPLICATION;  // 0x5a
-		memcpy(c.d.asBytes+1, aid, 3);
-		SendCommand(&c);
+        // SELECT AID
+        c.arg[0] = (INIT | CLEARTRACE);
+        c.arg[LENPOS] = 0x04;
+        c.d.asBytes[0] = SELECT_APPLICATION;  // 0x5a
+        memcpy(c.d.asBytes+1, aid, 3);
+        SendCommand(&c);
 
-		if (!WaitForResponseTimeout(CMD_ACK,&resp,1500) ) {
-			PrintAndLogEx(WARNING, "   Timed-out");
-			return;
-		}
-		isOK  = resp.arg[0] & 0xff;
-		if ( !isOK ){
-			PrintAndLogEx(WARNING, "   Can't select AID: %s",sprint_hex(aid,3));
-			return;
-		}
+        if (!WaitForResponseTimeout(CMD_ACK,&resp,1500) ) {
+            PrintAndLogEx(WARNING, "   Timed-out");
+            return;
+        }
+        isOK  = resp.arg[0] & 0xff;
+        if ( !isOK ){
+            PrintAndLogEx(WARNING, "   Can't select AID: %s",sprint_hex(aid,3));
+            return;
+        }
 
-		// KEY SETTINGS
-		options = NONE;
-		c.arg[0] = options;
-		c.arg[LENPOS] = 0x01;
-		c.d.asBytes[0] = GET_KEY_SETTINGS; // 0x45
-		SendCommand(&c);
-		if ( !WaitForResponseTimeout(CMD_ACK,&resp,1500) ) {
-			return;
-		}
-		isOK  = resp.arg[0] & 0xff;
-		if ( !isOK ){
-			PrintAndLogEx(WARNING, "   Can't read Application Master key settings");
-		} else {
-			// Access rights.
-			uint8_t rights = (resp.d.asBytes[3] >> 4 & 0xff);
-			switch (rights){
-				case 0x00:
-					str = "AMK authentication is necessary to change any key (default)";
-					break;
-				case 0x0e:
-					str = "Authentication with the key to be changed (same KeyNo) is necessary to change a key";
-					break;
-				case 0x0f:
-					str = "All keys (except AMK,see Bit0) within this application are frozen";
-					break;
-				default:
-					str = "Authentication with the specified key is necessary to change any ley. A change key and a PICC master key (CMK) can only be changed after authentication with the master key. For keys other then the master or change key, an authentication with the same key is needed.";
-					break;
-			}
-			PrintAndLogEx(NORMAL, "Changekey Access rights");
-			PrintAndLogEx(NORMAL, "-- %s",str);
-			PrintAndLogEx(NORMAL, "");
-			// same as CMK
-			str = (resp.d.asBytes[3] & (1 << 3 )) ? "YES":"NO";
-			PrintAndLogEx(NORMAL, "   0x08 Configuration changeable       : %s", str);
-			str = (resp.d.asBytes[3] & (1 << 2 )) ? "NO":"YES";
-			PrintAndLogEx(NORMAL, "   0x04 AMK required for create/delete : %s",str);
-			str = (resp.d.asBytes[3] & (1 << 1 )) ? "NO":"YES";
-			PrintAndLogEx(NORMAL, "   0x02 Directory list access with AMK : %s",str);
-			str = (resp.d.asBytes[3] & (1 << 0 )) ? "YES" : "NO";
-			PrintAndLogEx(NORMAL, "   0x01 AMK is changeable              : %s", str);
-		}
+        // KEY SETTINGS
+        options = NONE;
+        c.arg[0] = options;
+        c.arg[LENPOS] = 0x01;
+        c.d.asBytes[0] = GET_KEY_SETTINGS; // 0x45
+        SendCommand(&c);
+        if ( !WaitForResponseTimeout(CMD_ACK,&resp,1500) ) {
+            return;
+        }
+        isOK  = resp.arg[0] & 0xff;
+        if ( !isOK ){
+            PrintAndLogEx(WARNING, "   Can't read Application Master key settings");
+        } else {
+            // Access rights.
+            uint8_t rights = (resp.d.asBytes[3] >> 4 & 0xff);
+            switch (rights){
+                case 0x00:
+                    str = "AMK authentication is necessary to change any key (default)";
+                    break;
+                case 0x0e:
+                    str = "Authentication with the key to be changed (same KeyNo) is necessary to change a key";
+                    break;
+                case 0x0f:
+                    str = "All keys (except AMK,see Bit0) within this application are frozen";
+                    break;
+                default:
+                    str = "Authentication with the specified key is necessary to change any ley. A change key and a PICC master key (CMK) can only be changed after authentication with the master key. For keys other then the master or change key, an authentication with the same key is needed.";
+                    break;
+            }
+            PrintAndLogEx(NORMAL, "Changekey Access rights");
+            PrintAndLogEx(NORMAL, "-- %s",str);
+            PrintAndLogEx(NORMAL, "");
+            // same as CMK
+            str = (resp.d.asBytes[3] & (1 << 3 )) ? "YES":"NO";
+            PrintAndLogEx(NORMAL, "   0x08 Configuration changeable       : %s", str);
+            str = (resp.d.asBytes[3] & (1 << 2 )) ? "NO":"YES";
+            PrintAndLogEx(NORMAL, "   0x04 AMK required for create/delete : %s",str);
+            str = (resp.d.asBytes[3] & (1 << 1 )) ? "NO":"YES";
+            PrintAndLogEx(NORMAL, "   0x02 Directory list access with AMK : %s",str);
+            str = (resp.d.asBytes[3] & (1 << 0 )) ? "YES" : "NO";
+            PrintAndLogEx(NORMAL, "   0x01 AMK is changeable              : %s", str);
+        }
 
-		// KEY VERSION  - AMK
-		c.arg[0] = NONE;
-		c.arg[LENPOS] = 0x02;
-		c.d.asBytes[0] = GET_KEY_VERSION; //0x64
-		c.d.asBytes[1] = 0x00;
-		SendCommand(&c);
-		if ( !WaitForResponseTimeout(CMD_ACK,&resp,1500) ) {
-			PrintAndLogEx(WARNING, "   Timed-out");
-			return;
-		}
+        // KEY VERSION  - AMK
+        c.arg[0] = NONE;
+        c.arg[LENPOS] = 0x02;
+        c.d.asBytes[0] = GET_KEY_VERSION; //0x64
+        c.d.asBytes[1] = 0x00;
+        SendCommand(&c);
+        if ( !WaitForResponseTimeout(CMD_ACK,&resp,1500) ) {
+            PrintAndLogEx(WARNING, "   Timed-out");
+            return;
+        }
 
-		int numOfKeys;
+        int numOfKeys;
 
-		isOK  = resp.arg[0] & 0xff;
-		if ( !isOK ){
-			PrintAndLogEx(WARNING, "   Can't read Application Master key version. Trying all keys");
-			numOfKeys = MAX_NUM_KEYS;
-		}
-		else{
-			numOfKeys = resp.d.asBytes[4];
-			PrintAndLogEx(NORMAL, "");
-			PrintAndLogEx(NORMAL, "     Max number of keys  : %d", numOfKeys );
-			PrintAndLogEx(NORMAL, "     Application Master key Version  : %d (0x%02x)", resp.d.asBytes[3], resp.d.asBytes[3]);
-			PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
-		}
+        isOK  = resp.arg[0] & 0xff;
+        if ( !isOK ){
+            PrintAndLogEx(WARNING, "   Can't read Application Master key version. Trying all keys");
+            numOfKeys = MAX_NUM_KEYS;
+        }
+        else{
+            numOfKeys = resp.d.asBytes[4];
+            PrintAndLogEx(NORMAL, "");
+            PrintAndLogEx(NORMAL, "     Max number of keys  : %d", numOfKeys );
+            PrintAndLogEx(NORMAL, "     Application Master key Version  : %d (0x%02x)", resp.d.asBytes[3], resp.d.asBytes[3]);
+            PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
+        }
 
-		// LOOP over numOfKeys that we got before.
-		// From 0x01 to numOfKeys.  We already got 0x00. (AMK)
-		for(int i=0x01; i<=0x0f; ++i){
+        // LOOP over numOfKeys that we got before.
+        // From 0x01 to numOfKeys.  We already got 0x00. (AMK)
+        for(int i=0x01; i<=0x0f; ++i){
 
-		}
+        }
 
 
-	}
+    }
 }
 
 int CmdHF14ADesEnumApplications(const char *Cmd){
 
-	uint8_t isOK = 0x00;
-	uint8_t aid[3];
-	uint32_t options = (INIT | DISCONNECT);
+    uint8_t isOK = 0x00;
+    uint8_t aid[3];
+    uint32_t options = (INIT | DISCONNECT);
 
-	UsbCommand c = {CMD_MIFARE_DESFIRE, {options , 0x01 }};
-	c.d.asBytes[0] = GET_APPLICATION_IDS;  //0x6a
+    UsbCommand c = {CMD_MIFARE_DESFIRE, {options , 0x01 }};
+    c.d.asBytes[0] = GET_APPLICATION_IDS;  //0x6a
 
     SendCommand(&c);
-	UsbCommand resp;
+    UsbCommand resp;
 
-	if ( !WaitForResponseTimeout(CMD_ACK,&resp,1500) ) {
-		return 0;
-	}
-	isOK  = resp.arg[0] & 0xff;
-	if ( !isOK ){
-		PrintAndLogEx(NORMAL, "Command unsuccessful");
-		return 0;
-	}
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "-- Desfire Enumerate Applications ---------------------------");
-	PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
+    if ( !WaitForResponseTimeout(CMD_ACK,&resp,1500) ) {
+        return 0;
+    }
+    isOK  = resp.arg[0] & 0xff;
+    if ( !isOK ){
+        PrintAndLogEx(NORMAL, "Command unsuccessful");
+        return 0;
+    }
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "-- Desfire Enumerate Applications ---------------------------");
+    PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
 
-	UsbCommand respAid;
-	UsbCommand respFiles;
+    UsbCommand respAid;
+    UsbCommand respFiles;
 
-	uint8_t num = 0;
-	int max = resp.arg[1] -3 -2;
+    uint8_t num = 0;
+    int max = resp.arg[1] -3 -2;
 
-	for(int i=3; i<=max; i+=3){
-		PrintAndLogEx(NORMAL, " Aid %d : %02X %02X %02X ",num ,resp.d.asBytes[i],resp.d.asBytes[i+1],resp.d.asBytes[i+2]);
-		num++;
+    for(int i=3; i<=max; i+=3){
+        PrintAndLogEx(NORMAL, " Aid %d : %02X %02X %02X ",num ,resp.d.asBytes[i],resp.d.asBytes[i+1],resp.d.asBytes[i+2]);
+        num++;
 
-		aid[0] = resp.d.asBytes[i];
-		aid[1] = resp.d.asBytes[i+1];
-		aid[2] = resp.d.asBytes[i+2];
-		GetKeySettings(aid);
+        aid[0] = resp.d.asBytes[i];
+        aid[1] = resp.d.asBytes[i+1];
+        aid[2] = resp.d.asBytes[i+2];
+        GetKeySettings(aid);
 
-		// Select Application
-		c.arg[CMDPOS] = INIT;
-		c.arg[LENPOS] = 0x04;
-		c.d.asBytes[0] = SELECT_APPLICATION;  // 0x5a
-		c.d.asBytes[1] = resp.d.asBytes[i];
-		c.d.asBytes[2] = resp.d.asBytes[i+1];
-		c.d.asBytes[3] = resp.d.asBytes[i+2];
-		SendCommand(&c);
+        // Select Application
+        c.arg[CMDPOS] = INIT;
+        c.arg[LENPOS] = 0x04;
+        c.d.asBytes[0] = SELECT_APPLICATION;  // 0x5a
+        c.d.asBytes[1] = resp.d.asBytes[i];
+        c.d.asBytes[2] = resp.d.asBytes[i+1];
+        c.d.asBytes[3] = resp.d.asBytes[i+2];
+        SendCommand(&c);
 
-		if (!WaitForResponseTimeout(CMD_ACK,&respAid,1500) ) {
-			PrintAndLogEx(WARNING, "   Timed-out");
-			continue;
-		}
-		isOK  = respAid.d.asBytes[2] & 0xff;
-		if ( isOK != 0x00 ){
-			PrintAndLogEx(WARNING, "   Can't select AID: %s",sprint_hex(resp.d.asBytes+i,3));
-			continue;
-		}
+        if (!WaitForResponseTimeout(CMD_ACK,&respAid,1500) ) {
+            PrintAndLogEx(WARNING, "   Timed-out");
+            continue;
+        }
+        isOK  = respAid.d.asBytes[2] & 0xff;
+        if ( isOK != 0x00 ){
+            PrintAndLogEx(WARNING, "   Can't select AID: %s",sprint_hex(resp.d.asBytes+i,3));
+            continue;
+        }
 
-		// Get File IDs
-		c.arg[CMDPOS] = NONE;
-		c.arg[LENPOS] = 0x01;
-		c.d.asBytes[0] = GET_FILE_IDS; // 0x6f
-		SendCommand(&c);
+        // Get File IDs
+        c.arg[CMDPOS] = NONE;
+        c.arg[LENPOS] = 0x01;
+        c.d.asBytes[0] = GET_FILE_IDS; // 0x6f
+        SendCommand(&c);
 
-		if ( !WaitForResponseTimeout(CMD_ACK,&respFiles,1500) ) {
-			PrintAndLogEx(WARNING, "   Timed-out");
-			continue;
-		} else {
-			isOK  = respFiles.d.asBytes[2] & 0xff;
-			if ( !isOK ){
-				PrintAndLogEx(WARNING, "   Can't get file ids ");
-			} else {
-				int respfileLen = resp.arg[1]-3-2;
-				for (int j=0; j< respfileLen; ++j){
-					PrintAndLogEx(NORMAL, "   Fileid %d :", resp.d.asBytes[j+3]);
-				}
-			}
-		}
+        if ( !WaitForResponseTimeout(CMD_ACK,&respFiles,1500) ) {
+            PrintAndLogEx(WARNING, "   Timed-out");
+            continue;
+        } else {
+            isOK  = respFiles.d.asBytes[2] & 0xff;
+            if ( !isOK ){
+                PrintAndLogEx(WARNING, "   Can't get file ids ");
+            } else {
+                int respfileLen = resp.arg[1]-3-2;
+                for (int j=0; j< respfileLen; ++j){
+                    PrintAndLogEx(NORMAL, "   Fileid %d :", resp.d.asBytes[j+3]);
+                }
+            }
+        }
 
-		// Get ISO File IDs
-		c.arg[CMDPOS] = DISCONNECT;
-		c.arg[LENPOS] = 0x01;
-		c.d.asBytes[0] = GET_ISOFILE_IDS; // 0x61
-		SendCommand(&c);
+        // Get ISO File IDs
+        c.arg[CMDPOS] = DISCONNECT;
+        c.arg[LENPOS] = 0x01;
+        c.d.asBytes[0] = GET_ISOFILE_IDS; // 0x61
+        SendCommand(&c);
 
-		if ( !WaitForResponseTimeout(CMD_ACK,&respFiles,1500) ) {
-			PrintAndLogEx(WARNING, "   Timed-out");
-			continue;
-		} else {
-			isOK  = respFiles.d.asBytes[2] & 0xff;
-			if ( !isOK ){
-				PrintAndLogEx(WARNING, "   Can't get ISO file ids ");
-			} else {
-				int respfileLen = resp.arg[1]-3-2;
-				for (int j=0; j< respfileLen; ++j){
-					PrintAndLogEx(NORMAL, " ISO  Fileid %d :", resp.d.asBytes[j+3]);
-				}
-			}
-		}
+        if ( !WaitForResponseTimeout(CMD_ACK,&respFiles,1500) ) {
+            PrintAndLogEx(WARNING, "   Timed-out");
+            continue;
+        } else {
+            isOK  = respFiles.d.asBytes[2] & 0xff;
+            if ( !isOK ){
+                PrintAndLogEx(WARNING, "   Can't get ISO file ids ");
+            } else {
+                int respfileLen = resp.arg[1]-3-2;
+                for (int j=0; j< respfileLen; ++j){
+                    PrintAndLogEx(NORMAL, " ISO  Fileid %d :", resp.d.asBytes[j+3]);
+                }
+            }
+        }
 
 
-	}
-	PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
+    }
+    PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
 
 
-	return 1;
+    return 1;
 }
 
 // MIAFRE DesFire Authentication
@@ -548,133 +548,133 @@ int CmdHF14ADesEnumApplications(const char *Cmd){
 #define BUFSIZE 256
 int CmdHF14ADesAuth(const char *Cmd){
 
-	// NR  DESC		KEYLENGHT
-	// ------------------------
-	// 1 = DES		8
-	// 2 = 3DES		16
-	// 3 = 3K 3DES	24
-	// 4 = AES		16
+    // NR  DESC     KEYLENGHT
+    // ------------------------
+    // 1 = DES      8
+    // 2 = 3DES     16
+    // 3 = 3K 3DES  24
+    // 4 = AES      16
 
-	uint8_t keylength = 8;
-	unsigned char key[24];
+    uint8_t keylength = 8;
+    unsigned char key[24];
 
     if (strlen(Cmd)<3) {
         PrintAndLogEx(NORMAL, "Usage:  hf mfdes auth <1|2|3> <1|2|3|4> <keyno> <key> ");
-		PrintAndLogEx(NORMAL, "		    Auth modes");
-		PrintAndLogEx(NORMAL, "                 1 = normal, 2 = iso, 3 = aes");
-		PrintAndLogEx(NORMAL, "		    Crypto");
-		PrintAndLogEx(NORMAL, "                 1 = DES 2 = 3DES 3 = 3K3DES 4 = AES");
-		PrintAndLogEx(NORMAL, "");
+        PrintAndLogEx(NORMAL, "            Auth modes");
+        PrintAndLogEx(NORMAL, "                 1 = normal, 2 = iso, 3 = aes");
+        PrintAndLogEx(NORMAL, "            Crypto");
+        PrintAndLogEx(NORMAL, "                 1 = DES 2 = 3DES 3 = 3K3DES 4 = AES");
+        PrintAndLogEx(NORMAL, "");
         PrintAndLogEx(NORMAL, "Examples:");
-		PrintAndLogEx(NORMAL, "         hf mfdes auth 1 1 0 11223344");
-		PrintAndLogEx(NORMAL, "         hf mfdes auth 3 4 0 404142434445464748494a4b4c4d4e4f");
+        PrintAndLogEx(NORMAL, "         hf mfdes auth 1 1 0 11223344");
+        PrintAndLogEx(NORMAL, "         hf mfdes auth 3 4 0 404142434445464748494a4b4c4d4e4f");
         return 0;
     }
-	uint8_t cmdAuthMode	= param_get8(Cmd,0);
-	uint8_t cmdAuthAlgo	= param_get8(Cmd,1);
-	uint8_t cmdKeyNo	= param_get8(Cmd,2);
+    uint8_t cmdAuthMode = param_get8(Cmd,0);
+    uint8_t cmdAuthAlgo = param_get8(Cmd,1);
+    uint8_t cmdKeyNo    = param_get8(Cmd,2);
 
-	switch (cmdAuthMode)
-	{
-		case 1:
-			if ( cmdAuthAlgo != 1 && cmdAuthAlgo != 2) {
-				PrintAndLogEx(NORMAL, "Crypto algo not valid for the auth mode");
-				return 1;
-			}
-			break;
-		case 2:
-			if ( cmdAuthAlgo != 1 && cmdAuthAlgo != 2 && cmdAuthAlgo != 3) {
-				PrintAndLogEx(NORMAL, "Crypto algo not valid for the auth mode");
-				return 1;
-			}
-			break;
-		case 3:
-			if ( cmdAuthAlgo != 4) {
-				PrintAndLogEx(NORMAL, "Crypto algo not valid for the auth mode");
-				return 1;
-			}
-			break;
-		default:
-			PrintAndLogEx(WARNING, "Wrong Auth mode");
-			return 1;
-			break;
-	}
+    switch (cmdAuthMode)
+    {
+        case 1:
+            if ( cmdAuthAlgo != 1 && cmdAuthAlgo != 2) {
+                PrintAndLogEx(NORMAL, "Crypto algo not valid for the auth mode");
+                return 1;
+            }
+            break;
+        case 2:
+            if ( cmdAuthAlgo != 1 && cmdAuthAlgo != 2 && cmdAuthAlgo != 3) {
+                PrintAndLogEx(NORMAL, "Crypto algo not valid for the auth mode");
+                return 1;
+            }
+            break;
+        case 3:
+            if ( cmdAuthAlgo != 4) {
+                PrintAndLogEx(NORMAL, "Crypto algo not valid for the auth mode");
+                return 1;
+            }
+            break;
+        default:
+            PrintAndLogEx(WARNING, "Wrong Auth mode");
+            return 1;
+            break;
+    }
 
-	switch (cmdAuthAlgo){
-		case 2:
-			keylength = 16;
-			PrintAndLogEx(NORMAL, "3DES selected");
-			break;
-		case 3:
-			keylength = 24;
-			PrintAndLogEx(NORMAL, "3 key 3DES selected");
-			break;
-		case 4:
-			keylength = 16;
-			PrintAndLogEx(NORMAL, "AES selected");
-			break;
-		default:
-			cmdAuthAlgo = 1;
-			keylength = 8;
-			PrintAndLogEx(NORMAL, "DES selected");
-			break;
-	}
+    switch (cmdAuthAlgo){
+        case 2:
+            keylength = 16;
+            PrintAndLogEx(NORMAL, "3DES selected");
+            break;
+        case 3:
+            keylength = 24;
+            PrintAndLogEx(NORMAL, "3 key 3DES selected");
+            break;
+        case 4:
+            keylength = 16;
+            PrintAndLogEx(NORMAL, "AES selected");
+            break;
+        default:
+            cmdAuthAlgo = 1;
+            keylength = 8;
+            PrintAndLogEx(NORMAL, "DES selected");
+            break;
+    }
 
-	// key
-	if (param_gethex(Cmd, 3, key, keylength*2)) {
-		PrintAndLogEx(WARNING, "Key must include %d HEX symbols", keylength);
-		return 1;
-	}
-	// algo, nyckell�ngd,
-	UsbCommand c = {CMD_MIFARE_DESFIRE_AUTH1, { cmdAuthMode, cmdAuthAlgo, cmdKeyNo }};
+    // key
+    if (param_gethex(Cmd, 3, key, keylength*2)) {
+        PrintAndLogEx(WARNING, "Key must include %d HEX symbols", keylength);
+        return 1;
+    }
+    // algo, nyckell�ngd,
+    UsbCommand c = {CMD_MIFARE_DESFIRE_AUTH1, { cmdAuthMode, cmdAuthAlgo, cmdKeyNo }};
 
-	c.d.asBytes[0] = keylength;
-	memcpy(c.d.asBytes+1, key, keylength);
-	clearCommandBuffer();
+    c.d.asBytes[0] = keylength;
+    memcpy(c.d.asBytes+1, key, keylength);
+    clearCommandBuffer();
     SendCommand(&c);
-	UsbCommand resp;
+    UsbCommand resp;
 
-	if (!WaitForResponseTimeout(CMD_ACK,&resp,3000)) {
-		PrintAndLogEx(WARNING, "Client command execute timeout");
-		return 0;
-	}
+    if (!WaitForResponseTimeout(CMD_ACK,&resp,3000)) {
+        PrintAndLogEx(WARNING, "Client command execute timeout");
+        return 0;
+    }
 
-	uint8_t isOK  = resp.arg[0] & 0xff;
-	if ( isOK) {
-		uint8_t * data= resp.d.asBytes;
+    uint8_t isOK  = resp.arg[0] & 0xff;
+    if ( isOK) {
+        uint8_t * data= resp.d.asBytes;
 
-		PrintAndLogEx(NORMAL, "  Key        :%s",sprint_hex(key, keylength));
-		PrintAndLogEx(NORMAL, "  SESSION    :%s",sprint_hex(data, keylength));
-		PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
-		//PrintAndLogEx(NORMAL, "  Expected   :B5 21 9E E8 1A A7 49 9D 21 96 68 7E 13 97 38 56");
-	} else{
-		PrintAndLogEx(NORMAL, "Client command failed.");
-	}
-	PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
+        PrintAndLogEx(NORMAL, "  Key        :%s",sprint_hex(key, keylength));
+        PrintAndLogEx(NORMAL, "  SESSION    :%s",sprint_hex(data, keylength));
+        PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
+        //PrintAndLogEx(NORMAL, "  Expected   :B5 21 9E E8 1A A7 49 9D 21 96 68 7E 13 97 38 56");
+    } else{
+        PrintAndLogEx(NORMAL, "Client command failed.");
+    }
+    PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
     return 1;
 }
 
 
 static command_t CommandTable[] = {
-  {"help",		CmdHelp,					1, "This help"},
-  {"info",		CmdHF14ADesInfo,			0, "Tag information"},
-  {"enum",		CmdHF14ADesEnumApplications,0, "Tries enumerate all applications"},
-  {"auth",		CmdHF14ADesAuth,			0, "Tries a MIFARE DesFire Authentication"},
-  {"rdbl",		CmdHF14ADesRb,				0, "Read MIFARE DesFire block"},
-  {"wrbl",		CmdHF14ADesWb,				0, "write MIFARE DesFire block"},
+  {"help",    CmdHelp,                    1, "This help"},
+  {"info",    CmdHF14ADesInfo,            0, "Tag information"},
+  {"enum",    CmdHF14ADesEnumApplications,0, "Tries enumerate all applications"},
+  {"auth",    CmdHF14ADesAuth,            0, "Tries a MIFARE DesFire Authentication"},
+  {"rdbl",    CmdHF14ADesRb,              0, "Read MIFARE DesFire block"},
+  {"wrbl",    CmdHF14ADesWb,              0, "write MIFARE DesFire block"},
   {NULL, NULL, 0, NULL}
 };
 
 int CmdHFMFDes(const char *Cmd) {
    // flush
-	clearCommandBuffer();
-	CmdsParse(CommandTable, Cmd);
-	return 0;
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
+    return 0;
 }
 
 int CmdHelp(const char *Cmd) {
-	CmdsHelp(CommandTable);
-	return 0;
+    CmdsHelp(CommandTable);
+    return 0;
 }
 
 
diff --git a/client/cmdhfmfdes.h b/client/cmdhfmfdes.h
index 01ca471c9..4ed3d4772 100644
--- a/client/cmdhfmfdes.h
+++ b/client/cmdhfmfdes.h
@@ -24,108 +24,108 @@ void GetKeySettings( uint8_t * aid );
 
 // Command options for Desfire behavior.
 enum  {
- NONE		= 	0x00,
- INIT 		=	0x01,
- DISCONNECT =	0x02,
- CLEARTRACE	= 	0x04,
- BAR		= 	0x08,
+ NONE       =    0x00,
+ INIT       =    0x01,
+ DISCONNECT =    0x02,
+ CLEARTRACE =    0x04,
+ BAR        =    0x08,
 } CmdOptions ;
 
 
-#define  CREATE_APPLICATION 		 0xca
-#define  DELETE_APPLICATION 		 0xda
-#define  GET_APPLICATION_IDS 		 0x6a
-#define  SELECT_APPLICATION 		 0x5a
-#define  FORMAT_PICC 				 0xfc
-#define  GET_VERSION 				 0x60
-#define  READ_DATA 					 0xbd
-#define  WRITE_DATA					 0x3d
-#define  GET_VALUE 					 0x6c
-#define  CREDIT 					 0x0c
-#define  DEBIT 						 0xdc
-#define  LIMITED_CREDIT 			 0x1c
-#define  WRITE_RECORD 				 0x3b
-#define  READ_RECORDS 				 0xbb
-#define  CLEAR_RECORD_FILE 			 0xeb
-#define  COMMIT_TRANSACTION 		 0xc7
-#define  ABORT_TRANSACTION 			 0xa7
-#define  GET_FREE_MEMORY             0x6e
-#define  GET_FILE_IDS 				 0x6f
-#define  GET_ISOFILE_IDS 			 0x61
-#define  GET_FILE_SETTINGS 			 0xf5
-#define  CHANGE_FILE_SETTINGS 		 0x5f
-#define  CREATE_STD_DATA_FILE 		 0xcd
-#define  CREATE_BACKUP_DATA_FILE 	 0xcb
-#define  CREATE_VALUE_FILE 			 0xcc
-#define  CREATE_LINEAR_RECORD_FILE 	 0xc1
-#define  CREATE_CYCLIC_RECORD_FILE 	 0xc0
-#define  DELETE_FILE 				 0xdf
-#define  AUTHENTICATE	 			 0x0a  // AUTHENTICATE_NATIVE
-#define  AUTHENTICATE_ISO 			 0x1a  // AUTHENTICATE_STANDARD
-#define  AUTHENTICATE_AES 			 0xaa
-#define  CHANGE_KEY_SETTINGS 		 0x54
-#define  GET_KEY_SETTINGS 			 0x45
-#define  CHANGE_KEY 				 0xc4
-#define  GET_KEY_VERSION 			 0x64
-#define  AUTHENTICATION_FRAME 		 0xAF
+#define CREATE_APPLICATION          0xca
+#define DELETE_APPLICATION          0xda
+#define GET_APPLICATION_IDS         0x6a
+#define SELECT_APPLICATION          0x5a
+#define FORMAT_PICC                 0xfc
+#define GET_VERSION                 0x60
+#define READ_DATA                   0xbd
+#define WRITE_DATA                  0x3d
+#define GET_VALUE                   0x6c
+#define CREDIT                      0x0c
+#define DEBIT                       0xdc
+#define LIMITED_CREDIT              0x1c
+#define WRITE_RECORD                0x3b
+#define READ_RECORDS                0xbb
+#define CLEAR_RECORD_FILE           0xeb
+#define COMMIT_TRANSACTION          0xc7
+#define ABORT_TRANSACTION           0xa7
+#define GET_FREE_MEMORY             0x6e
+#define GET_FILE_IDS                0x6f
+#define GET_ISOFILE_IDS             0x61
+#define GET_FILE_SETTINGS           0xf5
+#define CHANGE_FILE_SETTINGS        0x5f
+#define CREATE_STD_DATA_FILE        0xcd
+#define CREATE_BACKUP_DATA_FILE     0xcb
+#define CREATE_VALUE_FILE           0xcc
+#define CREATE_LINEAR_RECORD_FILE   0xc1
+#define CREATE_CYCLIC_RECORD_FILE   0xc0
+#define DELETE_FILE                 0xdf
+#define AUTHENTICATE                0x0a  // AUTHENTICATE_NATIVE
+#define AUTHENTICATE_ISO            0x1a  // AUTHENTICATE_STANDARD
+#define AUTHENTICATE_AES            0xaa
+#define CHANGE_KEY_SETTINGS         0x54
+#define GET_KEY_SETTINGS            0x45
+#define CHANGE_KEY                  0xc4
+#define GET_KEY_VERSION             0x64
+#define AUTHENTICATION_FRAME        0xAF
 
-#define MAX_NUM_KEYS 0x0F
-#define MAX_APPLICATION_COUNT 28
-#define MAX_FILE_COUNT 32
-#define MAX_FRAME_SIZE 60
-#define NOT_YET_AUTHENTICATED 255
-#define FRAME_PAYLOAD_SIZE (MAX_FRAME_SIZE - 5)
+#define MAX_NUM_KEYS                0x0F
+#define MAX_APPLICATION_COUNT       28
+#define MAX_FILE_COUNT              32
+#define MAX_FRAME_SIZE              60
+#define NOT_YET_AUTHENTICATED       255
+#define FRAME_PAYLOAD_SIZE          (MAX_FRAME_SIZE - 5)
 
 
 // status- and error codes                                                     |
-#define OPERATION_OK			0x00		// Successful operation
-#define NO_CHANGES				0x0C		//  No changes done to backup files
-											//  ,CommitTransaction/
-											//  AbortTransaction not necessary
-#define OUT_OF_EEPROM_ERROR		0x0E		// Insufficient NV-Memory to
-											//  complete command
-#define ILLEGAL_COMMAND_CODE	0x1C		// Command code not supported
-#define INTEGRITY_ERROR			0x1E		// CRC or MAC does not match data
-											//  Padding bytes not valid
-#define NO_SUCH_KEY				0x40		// Invalid key number specified
-#define LENGTH_ERROR			0x7E		// Length of command string invalid
-#define PERMISSION_DENIED		0x9D		// Current configuration status
-											//  does not allow the requested
-											//  command
-#define PARAMETER_ERROR			0x9E		// Value of the parameter(s) inval.
-#define APPLICATION_NOT_FOUND	0xA0		// Requested AID not present on PIC
-#define APPL_INTEGRITY_ERROR	0xA1 // [1] // Unrecoverable error within app-
-											//  lication, app will be disabled
-#define AUTHENTICATION_ERROR	0xAE		// Current authentication status
-											//  does not allow the requested
-											//  command
-#define ADDITIONAL_FRAME		0xAF		// Additional data frame is
-											//  expected to be sent
-#define BOUNDARY_ERROR			0xBE		// Attempt to read/write data from/
-											//  to beyond the file's/record's
-											//  limits. Attempt to exceed the
-											//  limits of a value file.
-#define PICC_INTEGRITY_ERROR	0xC1 // [1] // Unrecoverable error within PICC
-											//  ,PICC will be disabled
-#define COMMAND_ABORTED			0xCA		// Previous Command was not fully
-											//  completed Not all Frames were
-											//  requested or provided by PCD
-#define PICC_DISABLED_ERROR		0xCD // [1] // PICC was disabled by an unrecoverable error
-#define COUNT_ERROR				0xCE		// Number of Applications limited
-											//  to 28, no additional
-											//  CreateApplication possible
-#define DUPLICATE_ERROR			0xDE		// Creation of file/application
-											//  failed because file/application
-											//  with same number already exists
-#define EEPROM_ERROR			0xEE // [1]	// Could not complete NV-write
-											//  operation due to loss of power,
-											//  internal backup/rollback
-											//  mechanism activated
-#define FILE_NOT_FOUND_ERROR	0xF0		// Specified file number does not
-											//  exist
-#define FILE_INTEGRITY_ERROR	0xF1 // [1]	// Unrecoverable error within file,
-											//  file will be disabled
+#define OPERATION_OK                0x00 // Successful operation
+#define NO_CHANGES                  0x0C //  No changes done to backup files
+                                         //  ,CommitTransaction/
+                                         //  AbortTransaction not necessary
+#define OUT_OF_EEPROM_ERROR         0x0E // Insufficient NV-Memory to
+                                         //  complete command
+#define ILLEGAL_COMMAND_CODE        0x1C // Command code not supported
+#define INTEGRITY_ERROR             0x1E // CRC or MAC does not match data
+                                         //  Padding bytes not valid
+#define NO_SUCH_KEY                 0x40 // Invalid key number specified
+#define LENGTH_ERROR                0x7E // Length of command string invalid
+#define PERMISSION_DENIED           0x9D // Current configuration status
+                                         //  does not allow the requested
+                                         //  command
+#define PARAMETER_ERROR             0x9E // Value of the parameter(s) inval.
+#define APPLICATION_NOT_FOUND       0xA0 // Requested AID not present on PIC
+#define APPL_INTEGRITY_ERROR        0xA1 // [1] // Unrecoverable error within app-
+                                         //  lication, app will be disabled
+#define AUTHENTICATION_ERROR        0xAE // Current authentication status
+                                         //  does not allow the requested
+                                         //  command
+#define ADDITIONAL_FRAME            0xAF // Additional data frame is
+                                         //  expected to be sent
+#define BOUNDARY_ERROR              0xBE // Attempt to read/write data from/
+                                         //  to beyond the file's/record's
+                                         //  limits. Attempt to exceed the
+                                         //  limits of a value file.
+#define PICC_INTEGRITY_ERROR        0xC1 // [1] // Unrecoverable error within PICC
+                                         //  ,PICC will be disabled
+#define COMMAND_ABORTED             0xCA // Previous Command was not fully
+                                         //  completed Not all Frames were
+                                         //  requested or provided by PCD
+#define PICC_DISABLED_ERROR         0xCD // [1] // PICC was disabled by an unrecoverable error
+#define COUNT_ERROR                 0xCE // Number of Applications limited
+                                         //  to 28, no additional
+                                         //  CreateApplication possible
+#define DUPLICATE_ERROR             0xDE // Creation of file/application
+                                         //  failed because file/application
+                                         //  with same number already exists
+#define EEPROM_ERROR                0xEE // [1]    // Could not complete NV-write
+                                         //  operation due to loss of power,
+                                         //  internal backup/rollback
+                                         //  mechanism activated
+#define FILE_NOT_FOUND_ERROR        0xF0 // Specified file number does not
+                                         //  exist
+#define FILE_INTEGRITY_ERROR        0xF1 // [1]    // Unrecoverable error within file,
+                                         //  file will be disabled
 //
 // [1] These errors are not expected to appear during normal operation
 
-#endif
\ No newline at end of file
+#endif
diff --git a/client/cmdhfmfdesfire.c b/client/cmdhfmfdesfire.c
index 91b9bc645..88bbf9034 100644
--- a/client/cmdhfmfdesfire.c
+++ b/client/cmdhfmfdesfire.c
@@ -66,13 +66,13 @@ int CmdHF14AMfDESAuth(const char *Cmd){
     UsbCommand resp;
     if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
         uint8_t isOK  = resp.arg[0] & 0xff;
-	        cuid  = resp.arg[1];
+            cuid  = resp.arg[1];
         uint8_t * data= resp.d.asBytes;
 
          if (isOK){
              PrintAndLogEx(NORMAL, "enc(nc)/b0:%s", sprint_hex(data+2,8));
              memcpy(b0,data+2,8);
-		}
+        }
     } else {
         PrintAndLogEx(WARNING, "Command execute timeout");
     }
@@ -154,7 +154,7 @@ int CmdHF14AMfAESAuth(const char *Cmd){
     //
     // int private_AES_set_encrypt_key(const unsigned char *userKey, const int bits,AES_KEY *key);
      //int private_AES_set_decrypt_key(const unsigned char *userKey, const int bits,AES_KEY *key);
-	//
+    //
     //memcpy(key1,key,16);
     //memcpy(key2,key+8,8);
     AES_set_encrypt_key(key,128,&key_e);
@@ -166,20 +166,20 @@ int CmdHF14AMfAESAuth(const char *Cmd){
     UsbCommand resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         uint8_t isOK  = resp.arg[0] & 0xff;
-	        cuid  = resp.arg[1];
+            cuid  = resp.arg[1];
         uint8_t * data= resp.d.asBytes;
 
          if (isOK){
              PrintAndLogEx(NORMAL, "enc(nc)/b0:%s", sprint_hex(data+2,16));
              memcpy(b0,data+2,16);
-		}
+        }
     } else {
         PrintAndLogEx(WARNING, "Command execute timeout");
     }
     //
     // void AES_cbc_encrypt(const unsigned char *in, unsigned char *out,
-	//size_t length, const AES_KEY *key,
-	//unsigned char *ivec, const int enc);
+    //size_t length, const AES_KEY *key,
+    //unsigned char *ivec, const int enc);
 
    //Do crypto magic
     //DES_random_key(&nr);
@@ -230,16 +230,16 @@ int CmdHF14AMfAESAuth(const char *Cmd){
 //------------------------------------
 static command_t CommandTable[] =
 {
-    {"help",    CmdHelp,		1,"This help"},
-    {"dbg",     CmdHF14AMfDbg,		0,"Set default debug mode"},
-    {"des-auth",CmdHF14AMfDESAuth,	0,"Desfire Authentication"},
-    {"ev1-auth",CmdHF14AMfAESAuth,	0,"EV1 Authentication"},
+    {"help",    CmdHelp,            1,"This help"},
+    {"dbg",     CmdHF14AMfDbg,      0,"Set default debug mode"},
+    {"des-auth",CmdHF14AMfDESAuth,  0,"Desfire Authentication"},
+    {"ev1-auth",CmdHF14AMfAESAuth,  0,"EV1 Authentication"},
     {NULL, NULL, 0, NULL}
 };
 
 int CmdHFMFDesfire(const char *Cmd){
     // flush
-	clearCommandBuffer();
+    clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
diff --git a/client/cmdhfmfhard.c b/client/cmdhfmfhard.c
index d5c8c9403..5f3b650bc 100644
--- a/client/cmdhfmfhard.c
+++ b/client/cmdhfmfhard.c
@@ -37,24 +37,24 @@
 #include "hardnested/hardnested_bitarray_core.h"
 #include "zlib.h"
 
-#define NUM_CHECK_BITFLIPS_THREADS		(num_CPUs())
-#define NUM_REDUCTION_WORKING_THREADS	(num_CPUs())
+#define NUM_CHECK_BITFLIPS_THREADS      (num_CPUs())
+#define NUM_REDUCTION_WORKING_THREADS   (num_CPUs())
 
-#define IGNORE_BITFLIP_THRESHOLD		0.99	// ignore bitflip arrays which have nearly only valid states
+#define IGNORE_BITFLIP_THRESHOLD        0.99 // ignore bitflip arrays which have nearly only valid states
 
-#define STATE_FILES_DIRECTORY			"hardnested/tables/"
-#define STATE_FILE_TEMPLATE				"bitflip_%d_%03" PRIx16 "_states.bin.z"
+#define STATE_FILES_DIRECTORY           "hardnested/tables/"
+#define STATE_FILE_TEMPLATE             "bitflip_%d_%03" PRIx16 "_states.bin.z"
 
 #define DEBUG_KEY_ELIMINATION
 // #define DEBUG_REDUCTION
 
 static uint16_t sums[NUM_SUMS] = {0, 32, 56, 64, 80, 96, 104, 112, 120, 128, 136, 144, 152, 160, 176, 192, 200, 224, 256}; // possible sum property values
 
-#define NUM_PART_SUMS 					9		// number of possible partial sum property values
+#define NUM_PART_SUMS                   9 // number of possible partial sum property values
 
 typedef enum {
-	EVEN_STATE = 0,
-	ODD_STATE = 1
+    EVEN_STATE = 0,
+    ODD_STATE = 1
 } odd_even_t;
 
 static uint32_t num_acquired_nonces = 0;
@@ -64,8 +64,8 @@ static uint16_t num_effective_bitflips[2] = {0, 0};
 static uint16_t all_effective_bitflip[0x400];
 static uint16_t num_all_effective_bitflips = 0;
 static uint16_t num_1st_byte_effective_bitflips = 0;
-#define CHECK_1ST_BYTES			0x01
-#define CHECK_2ND_BYTES			0x02
+#define CHECK_1ST_BYTES 0x01
+#define CHECK_2ND_BYTES 0x02
 static uint8_t hardnested_stage = CHECK_1ST_BYTES;
 static uint64_t known_target_key;
 static uint32_t test_state[2] = {0,0};
@@ -73,60 +73,60 @@ static float brute_force_per_second;
 
 
 static void get_SIMD_instruction_set(char* instruction_set) {
-	switch(GetSIMDInstrAuto()) {
-		case SIMD_AVX512:
-			strcpy(instruction_set, "AVX512F");
-			break;
-		case SIMD_AVX2:
-			strcpy(instruction_set, "AVX2");
-			break;
-		case SIMD_AVX:
-			strcpy(instruction_set, "AVX");
-			break;
-		case SIMD_SSE2:
-			strcpy(instruction_set, "SSE2");
-			break;
-		case SIMD_MMX:
-			strcpy(instruction_set, "MMX");
-			break;
-		default:
-			strcpy(instruction_set, "no");
-			break;
-	}
+    switch(GetSIMDInstrAuto()) {
+        case SIMD_AVX512:
+            strcpy(instruction_set, "AVX512F");
+            break;
+        case SIMD_AVX2:
+            strcpy(instruction_set, "AVX2");
+            break;
+        case SIMD_AVX:
+            strcpy(instruction_set, "AVX");
+            break;
+        case SIMD_SSE2:
+            strcpy(instruction_set, "SSE2");
+            break;
+        case SIMD_MMX:
+            strcpy(instruction_set, "MMX");
+            break;
+        default:
+            strcpy(instruction_set, "no");
+            break;
+    }
 }
 
 
 static void print_progress_header(void) {
-	char progress_text[80];
-	char instr_set[12] = "";
-	get_SIMD_instruction_set(instr_set);
-	sprintf(progress_text, "Start using %d threads and %s SIMD core", num_CPUs(), instr_set);
-	PrintAndLogEx(NORMAL, "\n\n");
-	PrintAndLogEx(NORMAL, " time    | #nonces | Activity                                                | expected to brute force");
-	PrintAndLogEx(NORMAL, "         |         |                                                         | #states         | time ");
-	PrintAndLogEx(NORMAL, "------------------------------------------------------------------------------------------------------");
-	PrintAndLogEx(NORMAL, "       0 |       0 | %-55s |                 |", progress_text);
+    char progress_text[80];
+    char instr_set[12] = "";
+    get_SIMD_instruction_set(instr_set);
+    sprintf(progress_text, "Start using %d threads and %s SIMD core", num_CPUs(), instr_set);
+    PrintAndLogEx(NORMAL, "\n\n");
+    PrintAndLogEx(NORMAL, " time    | #nonces | Activity                                                | expected to brute force");
+    PrintAndLogEx(NORMAL, "         |         |                                                         | #states         | time ");
+    PrintAndLogEx(NORMAL, "------------------------------------------------------------------------------------------------------");
+    PrintAndLogEx(NORMAL, "       0 |       0 | %-55s |                 |", progress_text);
 }
 
 
 void hardnested_print_progress(uint32_t nonces, char *activity, float brute_force, uint64_t min_diff_print_time) {
-	static uint64_t last_print_time = 0;
-	if (msclock() - last_print_time > min_diff_print_time) {
-		last_print_time = msclock();
-		uint64_t total_time = msclock() - start_time;
-		float brute_force_time = brute_force / brute_force_per_second;
-		char brute_force_time_string[20];
-		if (brute_force_time < 90) {
-			sprintf(brute_force_time_string, "%2.0fs", brute_force_time);
-		} else if (brute_force_time < 60 * 90) {
-			sprintf(brute_force_time_string, "%2.0fmin", brute_force_time/60);
-		} else if (brute_force_time < 60 * 60 * 36) {
-			sprintf(brute_force_time_string, "%2.0fh", brute_force_time/(60*60));
-		} else {
-			sprintf(brute_force_time_string, "%2.0fd", brute_force_time/(60*60*24));
-		}
-		PrintAndLogEx(NORMAL, " %7.0f | %7u | %-55s | %15.0f | %5s", (float)total_time/1000.0, nonces, activity, brute_force, brute_force_time_string);
-	}
+    static uint64_t last_print_time = 0;
+    if (msclock() - last_print_time > min_diff_print_time) {
+        last_print_time = msclock();
+        uint64_t total_time = msclock() - start_time;
+        float brute_force_time = brute_force / brute_force_per_second;
+        char brute_force_time_string[20];
+        if (brute_force_time < 90) {
+            sprintf(brute_force_time_string, "%2.0fs", brute_force_time);
+        } else if (brute_force_time < 60 * 90) {
+            sprintf(brute_force_time_string, "%2.0fmin", brute_force_time/60);
+        } else if (brute_force_time < 60 * 60 * 36) {
+            sprintf(brute_force_time_string, "%2.0fh", brute_force_time/(60*60));
+        } else {
+            sprintf(brute_force_time_string, "%2.0fd", brute_force_time/(60*60*24));
+        }
+        PrintAndLogEx(NORMAL, " %7.0f | %7u | %-55s | %15.0f | %5s", (float)total_time/1000.0, nonces, activity, brute_force, brute_force_time_string);
+    }
 }
 
 
@@ -135,62 +135,62 @@ void hardnested_print_progress(uint32_t nonces, char *activity, float brute_forc
 
 static inline void clear_bitarray24(uint32_t *bitarray)
 {
-	memset(bitarray, 0x00, sizeof(uint32_t) * (1<<19));
+    memset(bitarray, 0x00, sizeof(uint32_t) * (1<<19));
 }
 
 
 static inline void set_bitarray24(uint32_t *bitarray)
 {
-	memset(bitarray, 0xff, sizeof(uint32_t) * (1<<19));
+    memset(bitarray, 0xff, sizeof(uint32_t) * (1<<19));
 }
 
 
 static inline void set_bit24(uint32_t *bitarray, uint32_t index)
 {
-	bitarray[index>>5] |= 0x80000000>>(index&0x0000001f);
+    bitarray[index>>5] |= 0x80000000>>(index&0x0000001f);
 }
 
 static inline uint32_t test_bit24(uint32_t *bitarray, uint32_t index)
 {
-	return 	bitarray[index>>5] & (0x80000000>>(index&0x0000001f));
+    return bitarray[index>>5] & (0x80000000>>(index&0x0000001f));
 }
 
 
 static inline uint32_t next_state(uint32_t *bitarray, uint32_t state)
 {
-	if (++state == 1<<24) return 1<<24;
-	uint32_t index = state >> 5;
-	uint_fast8_t bit = state & 0x1f;
-	uint32_t line = bitarray[index] << bit;
-	while (bit <= 0x1f) {
-		if (line & 0x80000000) return state;
-		state++;
-		bit++;
-		line <<= 1;
-	}
-	index++;
-	while (bitarray[index] == 0x00000000 && state < 1<<24) {
-		index++;
-		state += 0x20;
-	}
-	if (state >= 1<<24) return 1<<24;
+    if (++state == 1<<24) return 1<<24;
+    uint32_t index = state >> 5;
+    uint_fast8_t bit = state & 0x1f;
+    uint32_t line = bitarray[index] << bit;
+    while (bit <= 0x1f) {
+        if (line & 0x80000000) return state;
+        state++;
+        bit++;
+        line <<= 1;
+    }
+    index++;
+    while (bitarray[index] == 0x00000000 && state < 1<<24) {
+        index++;
+        state += 0x20;
+    }
+    if (state >= 1<<24) return 1<<24;
 #if defined __GNUC__
-	return state + __builtin_clz(bitarray[index]);
+    return state + __builtin_clz(bitarray[index]);
 #else
-	bit = 0x00;
-	line = bitarray[index];
-	while (bit <= 0x1f) {
-		if (line & 0x80000000) return state;
-		state++;
-		bit++;
-		line <<= 1;
-	}
-	return 1<<24;
+    bit = 0x00;
+    line = bitarray[index];
+    while (bit <= 0x1f) {
+        if (line & 0x80000000) return state;
+        state++;
+        bit++;
+        line <<= 1;
+    }
+    return 1<<24;
 #endif
 }
 
 
-#define BITFLIP_2ND_BYTE				0x0200
+#define BITFLIP_2ND_BYTE 0x0200
 
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -201,21 +201,21 @@ static uint32_t count_bitflip_bitarrays[2][0x400];
 
 static int compare_count_bitflip_bitarrays(const void *b1, const void *b2)
 {
-	uint64_t count1 = (uint64_t)count_bitflip_bitarrays[ODD_STATE][*(uint16_t *)b1] * count_bitflip_bitarrays[EVEN_STATE][*(uint16_t *)b1];
-	uint64_t count2 = (uint64_t)count_bitflip_bitarrays[ODD_STATE][*(uint16_t *)b2] * count_bitflip_bitarrays[EVEN_STATE][*(uint16_t *)b2];
-	return (count1 > count2) - (count2 > count1);
+    uint64_t count1 = (uint64_t)count_bitflip_bitarrays[ODD_STATE][*(uint16_t *)b1] * count_bitflip_bitarrays[EVEN_STATE][*(uint16_t *)b1];
+    uint64_t count2 = (uint64_t)count_bitflip_bitarrays[ODD_STATE][*(uint16_t *)b2] * count_bitflip_bitarrays[EVEN_STATE][*(uint16_t *)b2];
+    return (count1 > count2) - (count2 > count1);
 }
 
 
 static voidpf inflate_malloc(voidpf opaque, uInt items, uInt size)
 {
-	return calloc(items*size, sizeof(uint8_t));
+    return calloc(items*size, sizeof(uint8_t));
 }
 
 
 static void inflate_free(voidpf opaque, voidpf address)
 {
-	free(address);
+    free(address);
 }
 
 #define OUTPUT_BUFFER_LEN 80
@@ -227,15 +227,15 @@ static void inflate_free(voidpf opaque, voidpf address)
 static void init_inflate(z_streamp compressed_stream, uint8_t *input_buffer, uint32_t insize, uint8_t *output_buffer, uint32_t outsize)
 {
 
-	// initialize z_stream structure for inflate:
-	compressed_stream->next_in = input_buffer;
-	compressed_stream->avail_in = insize;
-	compressed_stream->next_out = output_buffer;
-	compressed_stream->avail_out = outsize;
-	compressed_stream->zalloc = &inflate_malloc;
-	compressed_stream->zfree = &inflate_free;
+    // initialize z_stream structure for inflate:
+    compressed_stream->next_in = input_buffer;
+    compressed_stream->avail_in = insize;
+    compressed_stream->next_out = output_buffer;
+    compressed_stream->avail_out = outsize;
+    compressed_stream->zalloc = &inflate_malloc;
+    compressed_stream->zfree = &inflate_free;
 
-	inflateInit2(compressed_stream, 0);
+    inflateInit2(compressed_stream, 0);
 
 }
 
@@ -243,124 +243,124 @@ static void init_inflate(z_streamp compressed_stream, uint8_t *input_buffer, uin
 static void init_bitflip_bitarrays(void)
 {
 #if defined (DEBUG_REDUCTION)
-	uint8_t line = 0;
+    uint8_t line = 0;
 #endif
 
 
-	z_stream compressed_stream;
+    z_stream compressed_stream;
 
-	char state_files_path[strlen(get_my_executable_directory()) + strlen(STATE_FILES_DIRECTORY) + strlen(STATE_FILE_TEMPLATE) + 1];
-	char state_file_name[strlen(STATE_FILE_TEMPLATE)+1];
+    char state_files_path[strlen(get_my_executable_directory()) + strlen(STATE_FILES_DIRECTORY) + strlen(STATE_FILE_TEMPLATE) + 1];
+    char state_file_name[strlen(STATE_FILE_TEMPLATE)+1];
 
-	for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
-		num_effective_bitflips[odd_even] = 0;
-		for (uint16_t bitflip = 0x001; bitflip < 0x400; bitflip++) {
-			bitflip_bitarrays[odd_even][bitflip] = NULL;
-			count_bitflip_bitarrays[odd_even][bitflip] = 1<<24;
-			sprintf(state_file_name, STATE_FILE_TEMPLATE, odd_even, bitflip);
-			strcpy(state_files_path, get_my_executable_directory());
-			strcat(state_files_path, STATE_FILES_DIRECTORY);
-			strcat(state_files_path, state_file_name);
-			FILE *statesfile = fopen(state_files_path, "rb");
-			if (statesfile == NULL) {
-				continue;
-			} else {
-				fseek(statesfile, 0, SEEK_END);
-				int fsize = ftell(statesfile);
-				if ( fsize == -1 ){
-					PrintAndLogEx(WARNING, "File read error with %s. Aborting...\n", state_file_name);
-					fclose(statesfile);
-					exit(5);
-				}
-				uint32_t filesize = (uint32_t)fsize;
-				rewind(statesfile);
-				uint8_t input_buffer[filesize];
-				size_t bytesread = fread(input_buffer, 1, filesize, statesfile);
-				if (bytesread != filesize) {
-					PrintAndLogEx(WARNING, "File read error with %s. Aborting...\n", state_file_name);
-					fclose(statesfile);
-					//inflateEnd(&compressed_stream);
-					exit(5);
-				}
-				fclose(statesfile);
-				uint32_t count = 0;
-				init_inflate(&compressed_stream, input_buffer, filesize, (uint8_t *)&count, sizeof(count));
-				inflate(&compressed_stream, Z_SYNC_FLUSH);
-				if ((float)count/(1<<24) < IGNORE_BITFLIP_THRESHOLD) {
-					uint32_t *bitset = (uint32_t *)malloc_bitarray(sizeof(uint32_t) * (1<<19));
-					if (bitset == NULL) {
-						PrintAndLogEx(WARNING, "Out of memory error in init_bitflip_statelists(). Aborting...\n");
-						inflateEnd(&compressed_stream);
-						exit(4);
-					}
-					compressed_stream.next_out = (uint8_t *)bitset;
-					compressed_stream.avail_out = sizeof(uint32_t) * (1<<19);
-					inflate(&compressed_stream, Z_SYNC_FLUSH);
-					effective_bitflip[odd_even][num_effective_bitflips[odd_even]++] = bitflip;
-					bitflip_bitarrays[odd_even][bitflip] = bitset;
-					count_bitflip_bitarrays[odd_even][bitflip] = count;
+    for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
+        num_effective_bitflips[odd_even] = 0;
+        for (uint16_t bitflip = 0x001; bitflip < 0x400; bitflip++) {
+            bitflip_bitarrays[odd_even][bitflip] = NULL;
+            count_bitflip_bitarrays[odd_even][bitflip] = 1<<24;
+            sprintf(state_file_name, STATE_FILE_TEMPLATE, odd_even, bitflip);
+            strcpy(state_files_path, get_my_executable_directory());
+            strcat(state_files_path, STATE_FILES_DIRECTORY);
+            strcat(state_files_path, state_file_name);
+            FILE *statesfile = fopen(state_files_path, "rb");
+            if (statesfile == NULL) {
+                continue;
+            } else {
+                fseek(statesfile, 0, SEEK_END);
+                int fsize = ftell(statesfile);
+                if ( fsize == -1 ){
+                    PrintAndLogEx(WARNING, "File read error with %s. Aborting...\n", state_file_name);
+                    fclose(statesfile);
+                    exit(5);
+                }
+                uint32_t filesize = (uint32_t)fsize;
+                rewind(statesfile);
+                uint8_t input_buffer[filesize];
+                size_t bytesread = fread(input_buffer, 1, filesize, statesfile);
+                if (bytesread != filesize) {
+                    PrintAndLogEx(WARNING, "File read error with %s. Aborting...\n", state_file_name);
+                    fclose(statesfile);
+                    //inflateEnd(&compressed_stream);
+                    exit(5);
+                }
+                fclose(statesfile);
+                uint32_t count = 0;
+                init_inflate(&compressed_stream, input_buffer, filesize, (uint8_t *)&count, sizeof(count));
+                inflate(&compressed_stream, Z_SYNC_FLUSH);
+                if ((float)count/(1<<24) < IGNORE_BITFLIP_THRESHOLD) {
+                    uint32_t *bitset = (uint32_t *)malloc_bitarray(sizeof(uint32_t) * (1<<19));
+                    if (bitset == NULL) {
+                        PrintAndLogEx(WARNING, "Out of memory error in init_bitflip_statelists(). Aborting...\n");
+                        inflateEnd(&compressed_stream);
+                        exit(4);
+                    }
+                    compressed_stream.next_out = (uint8_t *)bitset;
+                    compressed_stream.avail_out = sizeof(uint32_t) * (1<<19);
+                    inflate(&compressed_stream, Z_SYNC_FLUSH);
+                    effective_bitflip[odd_even][num_effective_bitflips[odd_even]++] = bitflip;
+                    bitflip_bitarrays[odd_even][bitflip] = bitset;
+                    count_bitflip_bitarrays[odd_even][bitflip] = count;
 #if defined (DEBUG_REDUCTION)
-					PrintAndLogEx(NORMAL, "(%03" PRIx16 " %s:%5.1f%%) ", bitflip, odd_even?"odd ":"even", (float)count/(1<<24)*100.0);
-					line++;
-					if (line == 8) {
-						PrintAndLogEx(NORMAL, "\n");
-						line = 0;
-					}
+                    PrintAndLogEx(NORMAL, "(%03" PRIx16 " %s:%5.1f%%) ", bitflip, odd_even?"odd ":"even", (float)count/(1<<24)*100.0);
+                    line++;
+                    if (line == 8) {
+                        PrintAndLogEx(NORMAL, "\n");
+                        line = 0;
+                    }
 #endif
-				}
-				inflateEnd(&compressed_stream);
-			}
-		}
-		effective_bitflip[odd_even][num_effective_bitflips[odd_even]] = 0x400;	// EndOfList marker
-	}
+                }
+                inflateEnd(&compressed_stream);
+            }
+        }
+        effective_bitflip[odd_even][num_effective_bitflips[odd_even]] = 0x400; // EndOfList marker
+    }
 
-	uint16_t i = 0;
-	uint16_t j = 0;
-	num_all_effective_bitflips = 0;
-	num_1st_byte_effective_bitflips = 0;
-	while (i < num_effective_bitflips[EVEN_STATE] || j < num_effective_bitflips[ODD_STATE]) {
-		if (effective_bitflip[EVEN_STATE][i] < effective_bitflip[ODD_STATE][j]) {
-			all_effective_bitflip[num_all_effective_bitflips++] = effective_bitflip[EVEN_STATE][i];
-			i++;
-		} else if (effective_bitflip[EVEN_STATE][i] > effective_bitflip[ODD_STATE][j]) {
-			all_effective_bitflip[num_all_effective_bitflips++] = effective_bitflip[ODD_STATE][j];
-			j++;
-		} else {
-			all_effective_bitflip[num_all_effective_bitflips++] = effective_bitflip[EVEN_STATE][i];
-			i++; j++;
-		}
-		if (!(all_effective_bitflip[num_all_effective_bitflips-1] & BITFLIP_2ND_BYTE)) {
-			num_1st_byte_effective_bitflips = num_all_effective_bitflips;
-		}
-	}
-	qsort(all_effective_bitflip, num_1st_byte_effective_bitflips, sizeof(uint16_t), compare_count_bitflip_bitarrays);
+    uint16_t i = 0;
+    uint16_t j = 0;
+    num_all_effective_bitflips = 0;
+    num_1st_byte_effective_bitflips = 0;
+    while (i < num_effective_bitflips[EVEN_STATE] || j < num_effective_bitflips[ODD_STATE]) {
+        if (effective_bitflip[EVEN_STATE][i] < effective_bitflip[ODD_STATE][j]) {
+            all_effective_bitflip[num_all_effective_bitflips++] = effective_bitflip[EVEN_STATE][i];
+            i++;
+        } else if (effective_bitflip[EVEN_STATE][i] > effective_bitflip[ODD_STATE][j]) {
+            all_effective_bitflip[num_all_effective_bitflips++] = effective_bitflip[ODD_STATE][j];
+            j++;
+        } else {
+            all_effective_bitflip[num_all_effective_bitflips++] = effective_bitflip[EVEN_STATE][i];
+            i++; j++;
+        }
+        if (!(all_effective_bitflip[num_all_effective_bitflips-1] & BITFLIP_2ND_BYTE)) {
+            num_1st_byte_effective_bitflips = num_all_effective_bitflips;
+        }
+    }
+    qsort(all_effective_bitflip, num_1st_byte_effective_bitflips, sizeof(uint16_t), compare_count_bitflip_bitarrays);
 #if defined (DEBUG_REDUCTION)
-	PrintAndLogEx(NORMAL, "\n1st byte effective bitflips (%d): \n", num_1st_byte_effective_bitflips);
-	for(uint16_t i = 0; i < num_1st_byte_effective_bitflips; i++) {
-		PrintAndLogEx(NORMAL, "%03x ",  all_effective_bitflip[i]);
-	}
+    PrintAndLogEx(NORMAL, "\n1st byte effective bitflips (%d): \n", num_1st_byte_effective_bitflips);
+    for(uint16_t i = 0; i < num_1st_byte_effective_bitflips; i++) {
+        PrintAndLogEx(NORMAL, "%03x ",  all_effective_bitflip[i]);
+    }
 #endif
-	qsort(all_effective_bitflip+num_1st_byte_effective_bitflips, num_all_effective_bitflips - num_1st_byte_effective_bitflips, sizeof(uint16_t), compare_count_bitflip_bitarrays);
+    qsort(all_effective_bitflip+num_1st_byte_effective_bitflips, num_all_effective_bitflips - num_1st_byte_effective_bitflips, sizeof(uint16_t), compare_count_bitflip_bitarrays);
 #if defined (DEBUG_REDUCTION)
-	PrintAndLogEx(NORMAL, "\n2nd byte effective bitflips (%d): \n", num_all_effective_bitflips - num_1st_byte_effective_bitflips);
-	for(uint16_t i = num_1st_byte_effective_bitflips; i < num_all_effective_bitflips; i++) {
-		PrintAndLogEx(NORMAL, "%03x ",  all_effective_bitflip[i]);
-	}
+    PrintAndLogEx(NORMAL, "\n2nd byte effective bitflips (%d): \n", num_all_effective_bitflips - num_1st_byte_effective_bitflips);
+    for(uint16_t i = num_1st_byte_effective_bitflips; i < num_all_effective_bitflips; i++) {
+        PrintAndLogEx(NORMAL, "%03x ",  all_effective_bitflip[i]);
+    }
 #endif
-	char progress_text[80];
-	sprintf(progress_text, "Using %d precalculated bitflip state tables", num_all_effective_bitflips);
-	hardnested_print_progress(0, progress_text, (float)(1LL<<47), 0);
+    char progress_text[80];
+    sprintf(progress_text, "Using %d precalculated bitflip state tables", num_all_effective_bitflips);
+    hardnested_print_progress(0, progress_text, (float)(1LL<<47), 0);
 }
 
 
-static void	free_bitflip_bitarrays(void)
+static void free_bitflip_bitarrays(void)
 {
-	for (int16_t bitflip = 0x3ff; bitflip > 0x000; bitflip--) {
-		free_bitarray(bitflip_bitarrays[ODD_STATE][bitflip]);
-	}
-	for (int16_t bitflip = 0x3ff; bitflip > 0x000; bitflip--) {
-		free_bitarray(bitflip_bitarrays[EVEN_STATE][bitflip]);
-	}
+    for (int16_t bitflip = 0x3ff; bitflip > 0x000; bitflip--) {
+        free_bitarray(bitflip_bitarrays[ODD_STATE][bitflip]);
+    }
+    for (int16_t bitflip = 0x3ff; bitflip > 0x000; bitflip--) {
+        free_bitarray(bitflip_bitarrays[EVEN_STATE][bitflip]);
+    }
 }
 
 
@@ -373,120 +373,120 @@ static uint32_t *sum_a0_bitarrays[2][NUM_SUMS];
 
 static uint16_t PartialSumProperty(uint32_t state, odd_even_t odd_even)
 {
-	uint16_t sum = 0;
-	for (uint16_t j = 0; j < 16; j++) {
-		uint32_t st = state;
-		uint16_t part_sum = 0;
-		if (odd_even == ODD_STATE) {
-			for (uint16_t i = 0; i < 5; i++) {
-				part_sum ^= filter(st);
-				st = (st << 1) | ((j >> (3-i)) & 0x01) ;
-			}
-			part_sum ^= 1;		// XOR 1 cancelled out for the other 8 bits
-		} else {
-			for (uint16_t i = 0; i < 4; i++) {
-				st = (st << 1) | ((j >> (3-i)) & 0x01) ;
-				part_sum ^= filter(st);
-			}
-		}
-		sum += part_sum;
-	}
-	return sum;
+    uint16_t sum = 0;
+    for (uint16_t j = 0; j < 16; j++) {
+        uint32_t st = state;
+        uint16_t part_sum = 0;
+        if (odd_even == ODD_STATE) {
+            for (uint16_t i = 0; i < 5; i++) {
+                part_sum ^= filter(st);
+                st = (st << 1) | ((j >> (3-i)) & 0x01) ;
+            }
+            part_sum ^= 1; // XOR 1 cancelled out for the other 8 bits
+        } else {
+            for (uint16_t i = 0; i < 4; i++) {
+                st = (st << 1) | ((j >> (3-i)) & 0x01) ;
+                part_sum ^= filter(st);
+            }
+        }
+        sum += part_sum;
+    }
+    return sum;
 }
 
 
 static void init_part_sum_bitarrays(void)
 {
-	for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
-		for (uint16_t part_sum_a0 = 0; part_sum_a0 < NUM_PART_SUMS; part_sum_a0++) {
-			part_sum_a0_bitarrays[odd_even][part_sum_a0] = (uint32_t *)malloc_bitarray(sizeof(uint32_t) * (1<<19));
-			if (part_sum_a0_bitarrays[odd_even][part_sum_a0] == NULL) {
-				PrintAndLogEx(WARNING, "Out of memory error in init_part_suma0_statelists(). Aborting...\n");
-				exit(4);
-			}
-			clear_bitarray24(part_sum_a0_bitarrays[odd_even][part_sum_a0]);
-		}
-	}
-	for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
-		//PrintAndLogEx(NORMAL, "(%d, %" PRIu16 ")...", odd_even, part_sum_a0);
-		for (uint32_t state = 0; state < (1<<20); state++) {
-			uint16_t part_sum_a0 = PartialSumProperty(state, odd_even) / 2;
-			for (uint16_t low_bits = 0; low_bits < 1<<4; low_bits++) {
-				set_bit24(part_sum_a0_bitarrays[odd_even][part_sum_a0], state<<4 | low_bits);
-			}
-		}
-	}
+    for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
+        for (uint16_t part_sum_a0 = 0; part_sum_a0 < NUM_PART_SUMS; part_sum_a0++) {
+            part_sum_a0_bitarrays[odd_even][part_sum_a0] = (uint32_t *)malloc_bitarray(sizeof(uint32_t) * (1<<19));
+            if (part_sum_a0_bitarrays[odd_even][part_sum_a0] == NULL) {
+                PrintAndLogEx(WARNING, "Out of memory error in init_part_suma0_statelists(). Aborting...\n");
+                exit(4);
+            }
+            clear_bitarray24(part_sum_a0_bitarrays[odd_even][part_sum_a0]);
+        }
+    }
+    for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
+        //PrintAndLogEx(NORMAL, "(%d, %" PRIu16 ")...", odd_even, part_sum_a0);
+        for (uint32_t state = 0; state < (1<<20); state++) {
+            uint16_t part_sum_a0 = PartialSumProperty(state, odd_even) / 2;
+            for (uint16_t low_bits = 0; low_bits < 1<<4; low_bits++) {
+                set_bit24(part_sum_a0_bitarrays[odd_even][part_sum_a0], state<<4 | low_bits);
+            }
+        }
+    }
 
-	for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
-		for (uint16_t part_sum_a8 = 0; part_sum_a8 < NUM_PART_SUMS; part_sum_a8++) {
-			part_sum_a8_bitarrays[odd_even][part_sum_a8] = (uint32_t *)malloc_bitarray(sizeof(uint32_t) * (1<<19));
-			if (part_sum_a8_bitarrays[odd_even][part_sum_a8] == NULL) {
-				PrintAndLogEx(WARNING, "Out of memory error in init_part_suma8_statelists(). Aborting...\n");
-				exit(4);
-			}
-			clear_bitarray24(part_sum_a8_bitarrays[odd_even][part_sum_a8]);
-		}
-	}
-	for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
-		//PrintAndLogEx(NORMAL, "(%d, %" PRIu16 ")...", odd_even, part_sum_a8);
-		for (uint32_t state = 0; state < (1<<20); state++) {
-			uint16_t part_sum_a8 = PartialSumProperty(state, odd_even) / 2;
-			for (uint16_t high_bits = 0; high_bits < 1<<4; high_bits++) {
-				set_bit24(part_sum_a8_bitarrays[odd_even][part_sum_a8], state | high_bits<<20);
-			}
-		}
-	}
+    for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
+        for (uint16_t part_sum_a8 = 0; part_sum_a8 < NUM_PART_SUMS; part_sum_a8++) {
+            part_sum_a8_bitarrays[odd_even][part_sum_a8] = (uint32_t *)malloc_bitarray(sizeof(uint32_t) * (1<<19));
+            if (part_sum_a8_bitarrays[odd_even][part_sum_a8] == NULL) {
+                PrintAndLogEx(WARNING, "Out of memory error in init_part_suma8_statelists(). Aborting...\n");
+                exit(4);
+            }
+            clear_bitarray24(part_sum_a8_bitarrays[odd_even][part_sum_a8]);
+        }
+    }
+    for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
+        //PrintAndLogEx(NORMAL, "(%d, %" PRIu16 ")...", odd_even, part_sum_a8);
+        for (uint32_t state = 0; state < (1<<20); state++) {
+            uint16_t part_sum_a8 = PartialSumProperty(state, odd_even) / 2;
+            for (uint16_t high_bits = 0; high_bits < 1<<4; high_bits++) {
+                set_bit24(part_sum_a8_bitarrays[odd_even][part_sum_a8], state | high_bits<<20);
+            }
+        }
+    }
 }
 
 
 static void free_part_sum_bitarrays(void)
 {
-	for (int16_t part_sum_a8 = (NUM_PART_SUMS-1); part_sum_a8 >= 0; part_sum_a8--) {
-		free_bitarray(part_sum_a8_bitarrays[ODD_STATE][part_sum_a8]);
-	}
-	for (int16_t part_sum_a8 = (NUM_PART_SUMS-1); part_sum_a8 >= 0; part_sum_a8--) {
-		free_bitarray(part_sum_a8_bitarrays[EVEN_STATE][part_sum_a8]);
-	}
-	for (int16_t part_sum_a0 = (NUM_PART_SUMS-1); part_sum_a0 >= 0; part_sum_a0--) {
-		free_bitarray(part_sum_a0_bitarrays[ODD_STATE][part_sum_a0]);
-	}
-	for (int16_t part_sum_a0 = (NUM_PART_SUMS-1); part_sum_a0 >= 0; part_sum_a0--) {
-		free_bitarray(part_sum_a0_bitarrays[EVEN_STATE][part_sum_a0]);
-	}
+    for (int16_t part_sum_a8 = (NUM_PART_SUMS-1); part_sum_a8 >= 0; part_sum_a8--) {
+        free_bitarray(part_sum_a8_bitarrays[ODD_STATE][part_sum_a8]);
+    }
+    for (int16_t part_sum_a8 = (NUM_PART_SUMS-1); part_sum_a8 >= 0; part_sum_a8--) {
+        free_bitarray(part_sum_a8_bitarrays[EVEN_STATE][part_sum_a8]);
+    }
+    for (int16_t part_sum_a0 = (NUM_PART_SUMS-1); part_sum_a0 >= 0; part_sum_a0--) {
+        free_bitarray(part_sum_a0_bitarrays[ODD_STATE][part_sum_a0]);
+    }
+    for (int16_t part_sum_a0 = (NUM_PART_SUMS-1); part_sum_a0 >= 0; part_sum_a0--) {
+        free_bitarray(part_sum_a0_bitarrays[EVEN_STATE][part_sum_a0]);
+    }
 }
 
 
 static void init_sum_bitarrays(void)
 {
-	for (uint16_t sum_a0 = 0; sum_a0 < NUM_SUMS; sum_a0++) {
-		for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
-			sum_a0_bitarrays[odd_even][sum_a0] = (uint32_t *)malloc_bitarray(sizeof(uint32_t) * (1<<19));
-			if (sum_a0_bitarrays[odd_even][sum_a0] == NULL) {
-				PrintAndLogEx(WARNING, "Out of memory error in init_sum_bitarrays(). Aborting...\n");
-				exit(4);
-			}
-			clear_bitarray24(sum_a0_bitarrays[odd_even][sum_a0]);
-		}
-	}
-	for (uint8_t p = 0; p < NUM_PART_SUMS; p++) {
-		for (uint8_t q = 0; q < NUM_PART_SUMS; q++) {
-			uint16_t sum_a0 = 2*p*(16-2*q) + (16-2*p)*2*q;
-			uint16_t sum_a0_idx = 0;
-			while (sums[sum_a0_idx] != sum_a0) sum_a0_idx++;
-			bitarray_OR(sum_a0_bitarrays[EVEN_STATE][sum_a0_idx], part_sum_a0_bitarrays[EVEN_STATE][q]);
-			bitarray_OR(sum_a0_bitarrays[ODD_STATE][sum_a0_idx], part_sum_a0_bitarrays[ODD_STATE][p]);
-		}
-	}
+    for (uint16_t sum_a0 = 0; sum_a0 < NUM_SUMS; sum_a0++) {
+        for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
+            sum_a0_bitarrays[odd_even][sum_a0] = (uint32_t *)malloc_bitarray(sizeof(uint32_t) * (1<<19));
+            if (sum_a0_bitarrays[odd_even][sum_a0] == NULL) {
+                PrintAndLogEx(WARNING, "Out of memory error in init_sum_bitarrays(). Aborting...\n");
+                exit(4);
+            }
+            clear_bitarray24(sum_a0_bitarrays[odd_even][sum_a0]);
+        }
+    }
+    for (uint8_t p = 0; p < NUM_PART_SUMS; p++) {
+        for (uint8_t q = 0; q < NUM_PART_SUMS; q++) {
+            uint16_t sum_a0 = 2*p*(16-2*q) + (16-2*p)*2*q;
+            uint16_t sum_a0_idx = 0;
+            while (sums[sum_a0_idx] != sum_a0) sum_a0_idx++;
+            bitarray_OR(sum_a0_bitarrays[EVEN_STATE][sum_a0_idx], part_sum_a0_bitarrays[EVEN_STATE][q]);
+            bitarray_OR(sum_a0_bitarrays[ODD_STATE][sum_a0_idx], part_sum_a0_bitarrays[ODD_STATE][p]);
+        }
+    }
 
 }
 
 
 static void free_sum_bitarrays(void)
 {
-	for (int8_t sum_a0 = NUM_SUMS-1; sum_a0 >= 0; sum_a0--) {
-		free_bitarray(sum_a0_bitarrays[ODD_STATE][sum_a0]);
-		free_bitarray(sum_a0_bitarrays[EVEN_STATE][sum_a0]);
-	}
+    for (int8_t sum_a0 = NUM_SUMS-1; sum_a0 >= 0; sum_a0--) {
+        free_bitarray(sum_a0_bitarrays[ODD_STATE][sum_a0]);
+        free_bitarray(sum_a0_bitarrays[EVEN_STATE][sum_a0]);
+    }
 }
 
 
@@ -494,9 +494,9 @@ static void free_sum_bitarrays(void)
 char failstr[250] = "";
 #endif
 
-static const float p_K0[NUM_SUMS] = {		// the probability that a random nonce has a Sum Property K
-	0.0290,	0.0083,	0.0006,	0.0339,	0.0048,	0.0934,	0.0119,	0.0489,	0.0602,	0.4180,	0.0602,	0.0489, 0.0119,	0.0934,	0.0048,	0.0339,	0.0006,	0.0083,	0.0290
-	};
+static const float p_K0[NUM_SUMS] = { // the probability that a random nonce has a Sum Property K
+    0.0290, 0.0083, 0.0006, 0.0339, 0.0048, 0.0934, 0.0119, 0.0489, 0.0602, 0.4180, 0.0602, 0.0489, 0.0119, 0.0934, 0.0048, 0.0339, 0.0006, 0.0083, 0.0290
+    };
 
 static float my_p_K[NUM_SUMS];
 
@@ -522,104 +522,104 @@ static statelist_t *candidates = NULL;
 
 static int add_nonce(uint32_t nonce_enc, uint8_t par_enc)
 {
-	uint8_t first_byte = nonce_enc >> 24;
-	noncelistentry_t *p1 = nonces[first_byte].first;
-	noncelistentry_t *p2 = NULL;
+    uint8_t first_byte = nonce_enc >> 24;
+    noncelistentry_t *p1 = nonces[first_byte].first;
+    noncelistentry_t *p2 = NULL;
 
-	if (p1 == NULL) {			// first nonce with this 1st byte
-		first_byte_num++;
-		first_byte_Sum += evenparity32((nonce_enc & 0xff000000) | (par_enc & 0x08));
-	}
+    if (p1 == NULL) { // first nonce with this 1st byte
+        first_byte_num++;
+        first_byte_Sum += evenparity32((nonce_enc & 0xff000000) | (par_enc & 0x08));
+    }
 
-	while (p1 != NULL && (p1->nonce_enc & 0x00ff0000) < (nonce_enc & 0x00ff0000)) {
-		p2 = p1;
-		p1 = p1->next;
-	}
+    while (p1 != NULL && (p1->nonce_enc & 0x00ff0000) < (nonce_enc & 0x00ff0000)) {
+        p2 = p1;
+        p1 = p1->next;
+    }
 
-	if (p1 == NULL) { 																	// need to add at the end of the list
-		if (p2 == NULL) { 			// list is empty yet. Add first entry.
-			p2 = nonces[first_byte].first = malloc(sizeof(noncelistentry_t));
-		} else {					// add new entry at end of existing list.
-			p2 = p2->next = malloc(sizeof(noncelistentry_t));
-		}
-	} else if ((p1->nonce_enc & 0x00ff0000) != (nonce_enc & 0x00ff0000)) {				// found distinct 2nd byte. Need to insert.
-		if (p2 == NULL) {			// need to insert at start of list
-			p2 = nonces[first_byte].first = malloc(sizeof(noncelistentry_t));
-		} else {
-			p2 = p2->next = malloc(sizeof(noncelistentry_t));
-		}
-	} else {																			// we have seen this 2nd byte before. Nothing to add or insert.
-		return (0);
-	}
+    if (p1 == NULL) {                                                          // need to add at the end of the list
+        if (p2 == NULL) {           // list is empty yet. Add first entry.
+            p2 = nonces[first_byte].first = malloc(sizeof(noncelistentry_t));
+        } else {                    // add new entry at end of existing list.
+            p2 = p2->next = malloc(sizeof(noncelistentry_t));
+        }
+    } else if ((p1->nonce_enc & 0x00ff0000) != (nonce_enc & 0x00ff0000)) {     // found distinct 2nd byte. Need to insert.
+        if (p2 == NULL) {           // need to insert at start of list
+            p2 = nonces[first_byte].first = malloc(sizeof(noncelistentry_t));
+        } else {
+            p2 = p2->next = malloc(sizeof(noncelistentry_t));
+        }
+    } else {                                                                   // we have seen this 2nd byte before. Nothing to add or insert.
+        return (0);
+    }
 
-	// add or insert new data
-	p2->next = p1;
-	p2->nonce_enc = nonce_enc;
-	p2->par_enc = par_enc;
+    // add or insert new data
+    p2->next = p1;
+    p2->nonce_enc = nonce_enc;
+    p2->par_enc = par_enc;
 
-	nonces[first_byte].num++;
-	nonces[first_byte].Sum += evenparity32((nonce_enc & 0x00ff0000) | (par_enc & 0x04));
-	nonces[first_byte].sum_a8_guess_dirty = true;   // indicates that we need to recalculate the Sum(a8) probability for this first byte
-	return (1);				// new nonce added
+    nonces[first_byte].num++;
+    nonces[first_byte].Sum += evenparity32((nonce_enc & 0x00ff0000) | (par_enc & 0x04));
+    nonces[first_byte].sum_a8_guess_dirty = true;   // indicates that we need to recalculate the Sum(a8) probability for this first byte
+    return (1); // new nonce added
 }
 
 
 static void init_nonce_memory(void)
 {
-	for (uint16_t i = 0; i < 256; i++) {
-		nonces[i].num = 0;
-		nonces[i].Sum = 0;
-		nonces[i].first = NULL;
-		for (uint16_t j = 0; j < NUM_SUMS; j++) {
-			nonces[i].sum_a8_guess[j].sum_a8_idx = j;
-			nonces[i].sum_a8_guess[j].prob = 0.0;
-		}
-		nonces[i].sum_a8_guess_dirty = false;
-		for (uint16_t bitflip = 0x000; bitflip < 0x400; bitflip++) {
-			nonces[i].BitFlips[bitflip] = 0;
-		}
-		nonces[i].states_bitarray[EVEN_STATE] = (uint32_t *)malloc_bitarray(sizeof(uint32_t) * (1<<19));
-		if (nonces[i].states_bitarray[EVEN_STATE] == NULL) {
-			PrintAndLogEx(WARNING, "Out of memory error in init_nonce_memory(). Aborting...\n");
-			exit(4);
-		}
-		set_bitarray24(nonces[i].states_bitarray[EVEN_STATE]);
-		nonces[i].num_states_bitarray[EVEN_STATE] = 1 << 24;
-		nonces[i].states_bitarray[ODD_STATE] = (uint32_t *)malloc_bitarray(sizeof(uint32_t) * (1<<19));
-		if (nonces[i].states_bitarray[ODD_STATE] == NULL) {
-			PrintAndLogEx(WARNING, "Out of memory error in init_nonce_memory(). Aborting...\n");
-			exit(4);
-		}
-		set_bitarray24(nonces[i].states_bitarray[ODD_STATE]);
-		nonces[i].num_states_bitarray[ODD_STATE] = 1 << 24;
-		nonces[i].all_bitflips_dirty[EVEN_STATE] = false;
-		nonces[i].all_bitflips_dirty[ODD_STATE] = false;
-	}
-	first_byte_num = 0;
-	first_byte_Sum = 0;
+    for (uint16_t i = 0; i < 256; i++) {
+        nonces[i].num = 0;
+        nonces[i].Sum = 0;
+        nonces[i].first = NULL;
+        for (uint16_t j = 0; j < NUM_SUMS; j++) {
+            nonces[i].sum_a8_guess[j].sum_a8_idx = j;
+            nonces[i].sum_a8_guess[j].prob = 0.0;
+        }
+        nonces[i].sum_a8_guess_dirty = false;
+        for (uint16_t bitflip = 0x000; bitflip < 0x400; bitflip++) {
+            nonces[i].BitFlips[bitflip] = 0;
+        }
+        nonces[i].states_bitarray[EVEN_STATE] = (uint32_t *)malloc_bitarray(sizeof(uint32_t) * (1<<19));
+        if (nonces[i].states_bitarray[EVEN_STATE] == NULL) {
+            PrintAndLogEx(WARNING, "Out of memory error in init_nonce_memory(). Aborting...\n");
+            exit(4);
+        }
+        set_bitarray24(nonces[i].states_bitarray[EVEN_STATE]);
+        nonces[i].num_states_bitarray[EVEN_STATE] = 1 << 24;
+        nonces[i].states_bitarray[ODD_STATE] = (uint32_t *)malloc_bitarray(sizeof(uint32_t) * (1<<19));
+        if (nonces[i].states_bitarray[ODD_STATE] == NULL) {
+            PrintAndLogEx(WARNING, "Out of memory error in init_nonce_memory(). Aborting...\n");
+            exit(4);
+        }
+        set_bitarray24(nonces[i].states_bitarray[ODD_STATE]);
+        nonces[i].num_states_bitarray[ODD_STATE] = 1 << 24;
+        nonces[i].all_bitflips_dirty[EVEN_STATE] = false;
+        nonces[i].all_bitflips_dirty[ODD_STATE] = false;
+    }
+    first_byte_num = 0;
+    first_byte_Sum = 0;
 }
 
 
 static void free_nonce_list(noncelistentry_t *p)
 {
-	if (p == NULL) {
-		return;
-	} else {
-		free_nonce_list(p->next);
-		free(p);
-	}
+    if (p == NULL) {
+        return;
+    } else {
+        free_nonce_list(p->next);
+        free(p);
+    }
 }
 
 
 static void free_nonces_memory(void)
 {
-	for (uint16_t i = 0; i < 256; i++) {
-		free_nonce_list(nonces[i].first);
-	}
-	for (int i = 255; i >= 0; i--) {
-		free_bitarray(nonces[i].states_bitarray[ODD_STATE]);
-		free_bitarray(nonces[i].states_bitarray[EVEN_STATE]);
-	}
+    for (uint16_t i = 0; i < 256; i++) {
+        free_nonce_list(nonces[i].first);
+    }
+    for (int i = 255; i >= 0; i--) {
+        free_bitarray(nonces[i].states_bitarray[ODD_STATE]);
+        free_bitarray(nonces[i].states_bitarray[EVEN_STATE]);
+    }
 }
 
 
@@ -628,60 +628,60 @@ static void free_nonces_memory(void)
 
 static double p_hypergeometric(uint16_t i_K, uint16_t n, uint16_t k)
 {
-	// for efficient computation we are using the recursive definition
-	//						(K-k+1) * (n-k+1)
-	// P(X=k) = P(X=k-1) * --------------------
-	//						   k * (N-K-n+k)
-	// and
-	//           (N-K)*(N-K-1)*...*(N-K-n+1)
-	// P(X=0) = -----------------------------
-	//               N*(N-1)*...*(N-n+1)
+    // for efficient computation we are using the recursive definition
+    //                      (K-k+1) * (n-k+1)
+    // P(X=k) = P(X=k-1) * --------------------
+    //                         k * (N-K-n+k)
+    // and
+    //           (N-K)*(N-K-1)*...*(N-K-n+1)
+    // P(X=0) = -----------------------------
+    //               N*(N-1)*...*(N-n+1)
 
 
-	uint16_t const N = 256;
-	uint16_t K = sums[i_K];
+    uint16_t const N = 256;
+    uint16_t K = sums[i_K];
 
 
 
-	if (n-k > N-K || k > K) return 0.0;	// avoids log(x<=0) in calculation below
-	if (k == 0) {
-		// use logarithms to avoid overflow with huge factorials (double type can only hold 170!)
-		double log_result = 0.0;
-		for (int16_t i = N-K; i >= N-K-n+1; i--) {
-			log_result += log(i);
-		}
-		for (int16_t i = N; i >= N-n+1; i--) {
-			log_result -= log(i);
-		}
-		return exp(log_result);
-	} else {
-		if (n-k == N-K) {	// special case. The published recursion below would fail with a divide by zero exception
-			double log_result = 0.0;
-			for (int16_t i = k+1; i <= n; i++) {
-				log_result += log(i);
-			}
-			for (int16_t i = K+1; i <= N; i++) {
-				log_result -= log(i);
-			}
-			return exp(log_result);
-		} else { 			// recursion
-			return (p_hypergeometric(i_K, n, k-1) * (K-k+1) * (n-k+1) / (k * (N-K-n+k)));
-		}
-	}
+    if (n-k > N-K || k > K) return 0.0; // avoids log(x<=0) in calculation below
+    if (k == 0) {
+        // use logarithms to avoid overflow with huge factorials (double type can only hold 170!)
+        double log_result = 0.0;
+        for (int16_t i = N-K; i >= N-K-n+1; i--) {
+            log_result += log(i);
+        }
+        for (int16_t i = N; i >= N-n+1; i--) {
+            log_result -= log(i);
+        }
+        return exp(log_result);
+    } else {
+        if (n-k == N-K) { // special case. The published recursion below would fail with a divide by zero exception
+            double log_result = 0.0;
+            for (int16_t i = k+1; i <= n; i++) {
+                log_result += log(i);
+            }
+            for (int16_t i = K+1; i <= N; i++) {
+                log_result -= log(i);
+            }
+            return exp(log_result);
+        } else {          // recursion
+            return (p_hypergeometric(i_K, n, k-1) * (K-k+1) * (n-k+1) / (k * (N-K-n+k)));
+        }
+    }
 }
 
 
 static float sum_probability(uint16_t i_K, uint16_t n, uint16_t k)
 {
-	if (k > sums[i_K]) return 0.0;
+    if (k > sums[i_K]) return 0.0;
 
-	double p_T_is_k_when_S_is_K = p_hypergeometric(i_K, n, k);
-	double p_S_is_K = p_K[i_K];
-	double p_T_is_k = 0;
-	for (uint16_t i = 0; i < NUM_SUMS; i++) {
-		p_T_is_k += p_K[i] * p_hypergeometric(i, n, k);
-	}
-	return(p_T_is_k_when_S_is_K * p_S_is_K / p_T_is_k);
+    double p_T_is_k_when_S_is_K = p_hypergeometric(i_K, n, k);
+    double p_S_is_K = p_K[i_K];
+    double p_T_is_k = 0;
+    for (uint16_t i = 0; i < NUM_SUMS; i++) {
+        p_T_is_k += p_K[i] * p_hypergeometric(i, n, k);
+    }
+    return(p_T_is_k_when_S_is_K * p_S_is_K / p_T_is_k);
 }
 
 
@@ -689,459 +689,459 @@ static uint32_t part_sum_count[2][NUM_PART_SUMS][NUM_PART_SUMS];
 
 static void init_allbitflips_array(void)
 {
-	for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
-		uint32_t *bitset = all_bitflips_bitarray[odd_even] = (uint32_t *)malloc_bitarray(sizeof(uint32_t) * (1<<19));
-		if (bitset == NULL) {
-			PrintAndLogEx(WARNING, "Out of memory in init_allbitflips_array(). Aborting...");
-			exit(4);
-		}
-		set_bitarray24(bitset);
-		all_bitflips_bitarray_dirty[odd_even] = false;
-		num_all_bitflips_bitarray[odd_even] = 1<<24;
-	}
+    for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
+        uint32_t *bitset = all_bitflips_bitarray[odd_even] = (uint32_t *)malloc_bitarray(sizeof(uint32_t) * (1<<19));
+        if (bitset == NULL) {
+            PrintAndLogEx(WARNING, "Out of memory in init_allbitflips_array(). Aborting...");
+            exit(4);
+        }
+        set_bitarray24(bitset);
+        all_bitflips_bitarray_dirty[odd_even] = false;
+        num_all_bitflips_bitarray[odd_even] = 1<<24;
+    }
 }
 
 
 static void update_allbitflips_array(void)
 {
-	if (hardnested_stage & CHECK_2ND_BYTES) {
-		for (uint16_t i = 0; i < 256; i++) {
-			for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
-				if (nonces[i].all_bitflips_dirty[odd_even]) {
-					uint32_t old_count = num_all_bitflips_bitarray[odd_even];
-					num_all_bitflips_bitarray[odd_even] = count_bitarray_low20_AND(all_bitflips_bitarray[odd_even], nonces[i].states_bitarray[odd_even]);
-					nonces[i].all_bitflips_dirty[odd_even] = false;
-					if (num_all_bitflips_bitarray[odd_even] != old_count) {
-						all_bitflips_bitarray_dirty[odd_even] = true;
-					}
-				}
-			}
-		}
-	}
+    if (hardnested_stage & CHECK_2ND_BYTES) {
+        for (uint16_t i = 0; i < 256; i++) {
+            for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
+                if (nonces[i].all_bitflips_dirty[odd_even]) {
+                    uint32_t old_count = num_all_bitflips_bitarray[odd_even];
+                    num_all_bitflips_bitarray[odd_even] = count_bitarray_low20_AND(all_bitflips_bitarray[odd_even], nonces[i].states_bitarray[odd_even]);
+                    nonces[i].all_bitflips_dirty[odd_even] = false;
+                    if (num_all_bitflips_bitarray[odd_even] != old_count) {
+                        all_bitflips_bitarray_dirty[odd_even] = true;
+                    }
+                }
+            }
+        }
+    }
 }
 
 
 static uint32_t estimated_num_states_part_sum_coarse(uint16_t part_sum_a0_idx, uint16_t part_sum_a8_idx, odd_even_t odd_even)
 {
-	return part_sum_count[odd_even][part_sum_a0_idx][part_sum_a8_idx];
+    return part_sum_count[odd_even][part_sum_a0_idx][part_sum_a8_idx];
 }
 
 
 static uint32_t estimated_num_states_part_sum(uint8_t first_byte, uint16_t part_sum_a0_idx, uint16_t part_sum_a8_idx, odd_even_t odd_even)
 {
-	if (odd_even == ODD_STATE) {
-		return count_bitarray_AND3(part_sum_a0_bitarrays[odd_even][part_sum_a0_idx],
-		                           part_sum_a8_bitarrays[odd_even][part_sum_a8_idx],
-			                       nonces[first_byte].states_bitarray[odd_even]);
-	} else {
-		return count_bitarray_AND4(part_sum_a0_bitarrays[odd_even][part_sum_a0_idx],
-		                           part_sum_a8_bitarrays[odd_even][part_sum_a8_idx],
-			                       nonces[first_byte].states_bitarray[odd_even],
-		                           nonces[first_byte^0x80].states_bitarray[odd_even]);
-	}
+    if (odd_even == ODD_STATE) {
+        return count_bitarray_AND3(part_sum_a0_bitarrays[odd_even][part_sum_a0_idx],
+                                   part_sum_a8_bitarrays[odd_even][part_sum_a8_idx],
+                                   nonces[first_byte].states_bitarray[odd_even]);
+    } else {
+        return count_bitarray_AND4(part_sum_a0_bitarrays[odd_even][part_sum_a0_idx],
+                                   part_sum_a8_bitarrays[odd_even][part_sum_a8_idx],
+                                   nonces[first_byte].states_bitarray[odd_even],
+                                   nonces[first_byte^0x80].states_bitarray[odd_even]);
+    }
 
-	// estimate reduction by all_bitflips_match()
-	// if (odd_even) {
-		// float p_bitflip = (float)nonces[first_byte ^ 0x80].num_states_bitarray[ODD_STATE] / num_all_bitflips_bitarray[ODD_STATE];
-		// return (float)count * p_bitflip;		//(p_bitflip - 0.25*p_bitflip*p_bitflip);
-	// } else {
-		// return count;
-	// }
+    // estimate reduction by all_bitflips_match()
+    // if (odd_even) {
+        // float p_bitflip = (float)nonces[first_byte ^ 0x80].num_states_bitarray[ODD_STATE] / num_all_bitflips_bitarray[ODD_STATE];
+        // return (float)count * p_bitflip; //(p_bitflip - 0.25*p_bitflip*p_bitflip);
+    // } else {
+        // return count;
+    // }
 }
 
 
 static uint64_t estimated_num_states(uint8_t first_byte, uint16_t sum_a0, uint16_t sum_a8)
 {
-	uint64_t num_states = 0;
-	for (uint8_t p = 0; p < NUM_PART_SUMS; p++) {
-		for (uint8_t q = 0; q < NUM_PART_SUMS; q++) {
-			if (2*p*(16-2*q) + (16-2*p)*2*q == sum_a0) {
-				for (uint8_t r = 0; r < NUM_PART_SUMS; r++) {
-					for (uint8_t s = 0; s < NUM_PART_SUMS; s++) {
-						if (2*r*(16-2*s) + (16-2*r)*2*s == sum_a8) {
-							num_states += (uint64_t)estimated_num_states_part_sum(first_byte, p, r, ODD_STATE)
-										* estimated_num_states_part_sum(first_byte, q, s, EVEN_STATE);
-						}
-					}
-				}
-			}
-		}
-	}
-	return num_states;
+    uint64_t num_states = 0;
+    for (uint8_t p = 0; p < NUM_PART_SUMS; p++) {
+        for (uint8_t q = 0; q < NUM_PART_SUMS; q++) {
+            if (2*p*(16-2*q) + (16-2*p)*2*q == sum_a0) {
+                for (uint8_t r = 0; r < NUM_PART_SUMS; r++) {
+                    for (uint8_t s = 0; s < NUM_PART_SUMS; s++) {
+                        if (2*r*(16-2*s) + (16-2*r)*2*s == sum_a8) {
+                            num_states += (uint64_t)estimated_num_states_part_sum(first_byte, p, r, ODD_STATE)
+                                        * estimated_num_states_part_sum(first_byte, q, s, EVEN_STATE);
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return num_states;
 }
 
 
 static uint64_t estimated_num_states_coarse(uint16_t sum_a0, uint16_t sum_a8)
 {
-	uint64_t num_states = 0;
-	for (uint8_t p = 0; p < NUM_PART_SUMS; p++) {
-		for (uint8_t q = 0; q < NUM_PART_SUMS; q++) {
-			if (2*p*(16-2*q) + (16-2*p)*2*q == sum_a0) {
-				for (uint8_t r = 0; r < NUM_PART_SUMS; r++) {
-					for (uint8_t s = 0; s < NUM_PART_SUMS; s++) {
-						if (2*r*(16-2*s) + (16-2*r)*2*s == sum_a8) {
-							num_states += (uint64_t)estimated_num_states_part_sum_coarse(p, r, ODD_STATE)
-										* estimated_num_states_part_sum_coarse(q, s, EVEN_STATE);
-						}
-					}
-				}
-			}
-		}
-	}
-	return num_states;
+    uint64_t num_states = 0;
+    for (uint8_t p = 0; p < NUM_PART_SUMS; p++) {
+        for (uint8_t q = 0; q < NUM_PART_SUMS; q++) {
+            if (2*p*(16-2*q) + (16-2*p)*2*q == sum_a0) {
+                for (uint8_t r = 0; r < NUM_PART_SUMS; r++) {
+                    for (uint8_t s = 0; s < NUM_PART_SUMS; s++) {
+                        if (2*r*(16-2*s) + (16-2*r)*2*s == sum_a8) {
+                            num_states += (uint64_t)estimated_num_states_part_sum_coarse(p, r, ODD_STATE)
+                                        * estimated_num_states_part_sum_coarse(q, s, EVEN_STATE);
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return num_states;
 }
 
 
 static void update_p_K(void)
 {
-	if (hardnested_stage & CHECK_2ND_BYTES) {
-		uint64_t total_count = 0;
-		uint16_t sum_a0 = sums[first_byte_Sum];
-		for (uint8_t sum_a8_idx = 0; sum_a8_idx < NUM_SUMS; sum_a8_idx++) {
-			uint16_t sum_a8 = sums[sum_a8_idx];
-			total_count += estimated_num_states_coarse(sum_a0, sum_a8);
-		}
-		for (uint8_t sum_a8_idx = 0; sum_a8_idx < NUM_SUMS; sum_a8_idx++) {
-			uint16_t sum_a8 = sums[sum_a8_idx];
-			my_p_K[sum_a8_idx] = (float)estimated_num_states_coarse(sum_a0, sum_a8) / total_count;
-		}
-		// PrintAndLogEx(NORMAL, "my_p_K = [");
-		// for (uint8_t sum_a8_idx = 0; sum_a8_idx < NUM_SUMS; sum_a8_idx++) {
-			// PrintAndLogEx(NORMAL, "%7.4f ", my_p_K[sum_a8_idx]);
-		// }
-		p_K = my_p_K;
-	}
+    if (hardnested_stage & CHECK_2ND_BYTES) {
+        uint64_t total_count = 0;
+        uint16_t sum_a0 = sums[first_byte_Sum];
+        for (uint8_t sum_a8_idx = 0; sum_a8_idx < NUM_SUMS; sum_a8_idx++) {
+            uint16_t sum_a8 = sums[sum_a8_idx];
+            total_count += estimated_num_states_coarse(sum_a0, sum_a8);
+        }
+        for (uint8_t sum_a8_idx = 0; sum_a8_idx < NUM_SUMS; sum_a8_idx++) {
+            uint16_t sum_a8 = sums[sum_a8_idx];
+            my_p_K[sum_a8_idx] = (float)estimated_num_states_coarse(sum_a0, sum_a8) / total_count;
+        }
+        // PrintAndLogEx(NORMAL, "my_p_K = [");
+        // for (uint8_t sum_a8_idx = 0; sum_a8_idx < NUM_SUMS; sum_a8_idx++) {
+            // PrintAndLogEx(NORMAL, "%7.4f ", my_p_K[sum_a8_idx]);
+        // }
+        p_K = my_p_K;
+    }
 }
 
 
 static void update_sum_bitarrays(odd_even_t odd_even)
 {
-	if (all_bitflips_bitarray_dirty[odd_even]) {
-		for (uint8_t part_sum = 0; part_sum < NUM_PART_SUMS; part_sum++) {
-			bitarray_AND(part_sum_a0_bitarrays[odd_even][part_sum], all_bitflips_bitarray[odd_even]);
-			bitarray_AND(part_sum_a8_bitarrays[odd_even][part_sum], all_bitflips_bitarray[odd_even]);
-		}
-		for (uint16_t i = 0; i < 256; i++) {
-			nonces[i].num_states_bitarray[odd_even] = count_bitarray_AND(nonces[i].states_bitarray[odd_even], all_bitflips_bitarray[odd_even]);
-		}
-		for (uint8_t part_sum_a0 = 0; part_sum_a0 < NUM_PART_SUMS; part_sum_a0++) {
-			for (uint8_t part_sum_a8 = 0; part_sum_a8 < NUM_PART_SUMS; part_sum_a8++) {
-				part_sum_count[odd_even][part_sum_a0][part_sum_a8]
-				    += count_bitarray_AND2(part_sum_a0_bitarrays[odd_even][part_sum_a0], part_sum_a8_bitarrays[odd_even][part_sum_a8]);
-			}
-		}
-		all_bitflips_bitarray_dirty[odd_even] = false;
-	}
+    if (all_bitflips_bitarray_dirty[odd_even]) {
+        for (uint8_t part_sum = 0; part_sum < NUM_PART_SUMS; part_sum++) {
+            bitarray_AND(part_sum_a0_bitarrays[odd_even][part_sum], all_bitflips_bitarray[odd_even]);
+            bitarray_AND(part_sum_a8_bitarrays[odd_even][part_sum], all_bitflips_bitarray[odd_even]);
+        }
+        for (uint16_t i = 0; i < 256; i++) {
+            nonces[i].num_states_bitarray[odd_even] = count_bitarray_AND(nonces[i].states_bitarray[odd_even], all_bitflips_bitarray[odd_even]);
+        }
+        for (uint8_t part_sum_a0 = 0; part_sum_a0 < NUM_PART_SUMS; part_sum_a0++) {
+            for (uint8_t part_sum_a8 = 0; part_sum_a8 < NUM_PART_SUMS; part_sum_a8++) {
+                part_sum_count[odd_even][part_sum_a0][part_sum_a8]
+                    += count_bitarray_AND2(part_sum_a0_bitarrays[odd_even][part_sum_a0], part_sum_a8_bitarrays[odd_even][part_sum_a8]);
+            }
+        }
+        all_bitflips_bitarray_dirty[odd_even] = false;
+    }
 }
 
 
 static int compare_expected_num_brute_force(const void *b1, const void *b2)
 {
-	uint8_t index1 = *(uint8_t *)b1;
-	uint8_t index2 = *(uint8_t *)b2;
-	float score1 = nonces[index1].expected_num_brute_force;
-	float score2 = nonces[index2].expected_num_brute_force;
-	return (score1 > score2) - (score1 < score2);
+    uint8_t index1 = *(uint8_t *)b1;
+    uint8_t index2 = *(uint8_t *)b2;
+    float score1 = nonces[index1].expected_num_brute_force;
+    float score2 = nonces[index2].expected_num_brute_force;
+    return (score1 > score2) - (score1 < score2);
 }
 
 
 static int compare_sum_a8_guess(const void *b1, const void *b2)
 {
-	float prob1 = ((guess_sum_a8_t *)b1)->prob;
-	float prob2 = ((guess_sum_a8_t *)b2)->prob;
-	return (prob1 < prob2) - (prob1 > prob2);
+    float prob1 = ((guess_sum_a8_t *)b1)->prob;
+    float prob2 = ((guess_sum_a8_t *)b2)->prob;
+    return (prob1 < prob2) - (prob1 > prob2);
 
 }
 
 
 static float check_smallest_bitflip_bitarrays(void)
 {
-	uint32_t num_odd, num_even;
-	uint64_t smallest = 1LL << 48;
-	// initialize best_first_bytes, do a rough estimation on remaining states
-	for (uint16_t i = 0; i < 256; i++) {
-		num_odd = nonces[i].num_states_bitarray[ODD_STATE];
-		num_even = nonces[i].num_states_bitarray[EVEN_STATE];	// * (float)nonces[i^0x80].num_states_bitarray[EVEN_STATE] / num_all_bitflips_bitarray[EVEN_STATE];
-		if ((uint64_t)num_odd * num_even < smallest) {
-			smallest = (uint64_t)num_odd * num_even;
-			best_first_byte_smallest_bitarray = i;
-		}
-	}
+    uint32_t num_odd, num_even;
+    uint64_t smallest = 1LL << 48;
+    // initialize best_first_bytes, do a rough estimation on remaining states
+    for (uint16_t i = 0; i < 256; i++) {
+        num_odd = nonces[i].num_states_bitarray[ODD_STATE];
+        num_even = nonces[i].num_states_bitarray[EVEN_STATE]; // * (float)nonces[i^0x80].num_states_bitarray[EVEN_STATE] / num_all_bitflips_bitarray[EVEN_STATE];
+        if ((uint64_t)num_odd * num_even < smallest) {
+            smallest = (uint64_t)num_odd * num_even;
+            best_first_byte_smallest_bitarray = i;
+        }
+    }
 
 #if defined (DEBUG_REDUCTION)
-	num_odd = nonces[best_first_byte_smallest_bitarray].num_states_bitarray[ODD_STATE];
-	num_even = nonces[best_first_byte_smallest_bitarray].num_states_bitarray[EVEN_STATE];	// * (float)nonces[best_first_byte_smallest_bitarray^0x80].num_states_bitarray[EVEN_STATE] / num_all_bitflips_bitarray[EVEN_STATE];
-	PrintAndLogEx(NORMAL, "0x%02x: %8d * %8d = %12" PRIu64 " (2^%1.1f)\n",	best_first_byte_smallest_bitarray, num_odd, num_even, (uint64_t)num_odd * num_even, log((uint64_t)num_odd * num_even)/log(2.0));
+    num_odd = nonces[best_first_byte_smallest_bitarray].num_states_bitarray[ODD_STATE];
+    num_even = nonces[best_first_byte_smallest_bitarray].num_states_bitarray[EVEN_STATE]; // * (float)nonces[best_first_byte_smallest_bitarray^0x80].num_states_bitarray[EVEN_STATE] / num_all_bitflips_bitarray[EVEN_STATE];
+    PrintAndLogEx(NORMAL, "0x%02x: %8d * %8d = %12" PRIu64 " (2^%1.1f)\n", best_first_byte_smallest_bitarray, num_odd, num_even, (uint64_t)num_odd * num_even, log((uint64_t)num_odd * num_even)/log(2.0));
 #endif
-	return (float)smallest/2.0;
+    return (float)smallest/2.0;
 }
 
 
 static void update_expected_brute_force(uint8_t best_byte) {
 
-	float total_prob = 0.0;
-	for (uint8_t i = 0; i < NUM_SUMS; i++) {
-		total_prob += nonces[best_byte].sum_a8_guess[i].prob;
-	}
-	// linear adjust probabilities to result in total_prob = 1.0;
-	for (uint8_t i = 0; i < NUM_SUMS; i++) {
-		nonces[best_byte].sum_a8_guess[i].prob /= total_prob;
-	}
-	float prob_all_failed = 1.0;
-	nonces[best_byte].expected_num_brute_force = 0.0;
-	for (uint8_t i = 0; i < NUM_SUMS; i++) {
-		nonces[best_byte].expected_num_brute_force += nonces[best_byte].sum_a8_guess[i].prob * (float)nonces[best_byte].sum_a8_guess[i].num_states / 2.0;
-		prob_all_failed -= nonces[best_byte].sum_a8_guess[i].prob;
-		nonces[best_byte].expected_num_brute_force += prob_all_failed * (float)nonces[best_byte].sum_a8_guess[i].num_states / 2.0;
-	}
-	return;
+    float total_prob = 0.0;
+    for (uint8_t i = 0; i < NUM_SUMS; i++) {
+        total_prob += nonces[best_byte].sum_a8_guess[i].prob;
+    }
+    // linear adjust probabilities to result in total_prob = 1.0;
+    for (uint8_t i = 0; i < NUM_SUMS; i++) {
+        nonces[best_byte].sum_a8_guess[i].prob /= total_prob;
+    }
+    float prob_all_failed = 1.0;
+    nonces[best_byte].expected_num_brute_force = 0.0;
+    for (uint8_t i = 0; i < NUM_SUMS; i++) {
+        nonces[best_byte].expected_num_brute_force += nonces[best_byte].sum_a8_guess[i].prob * (float)nonces[best_byte].sum_a8_guess[i].num_states / 2.0;
+        prob_all_failed -= nonces[best_byte].sum_a8_guess[i].prob;
+        nonces[best_byte].expected_num_brute_force += prob_all_failed * (float)nonces[best_byte].sum_a8_guess[i].num_states / 2.0;
+    }
+    return;
 }
 
 
 static float sort_best_first_bytes(void)
 {
 
-	// initialize best_first_bytes, do a rough estimation on remaining states for each Sum_a8 property
-	// and the expected number of states to brute force
-	for (uint16_t i = 0; i < 256; i++) {
-		best_first_bytes[i] = i;
-		float prob_all_failed = 1.0;
-		nonces[i].expected_num_brute_force = 0.0;
-		for (uint8_t j = 0; j < NUM_SUMS; j++) {
-			nonces[i].sum_a8_guess[j].num_states = estimated_num_states_coarse(sums[first_byte_Sum], sums[nonces[i].sum_a8_guess[j].sum_a8_idx]);
-			nonces[i].expected_num_brute_force += nonces[i].sum_a8_guess[j].prob * (float)nonces[i].sum_a8_guess[j].num_states / 2.0;
-			prob_all_failed -= nonces[i].sum_a8_guess[j].prob;
-			nonces[i].expected_num_brute_force += prob_all_failed * (float)nonces[i].sum_a8_guess[j].num_states / 2.0;
-		}
-	}
+    // initialize best_first_bytes, do a rough estimation on remaining states for each Sum_a8 property
+    // and the expected number of states to brute force
+    for (uint16_t i = 0; i < 256; i++) {
+        best_first_bytes[i] = i;
+        float prob_all_failed = 1.0;
+        nonces[i].expected_num_brute_force = 0.0;
+        for (uint8_t j = 0; j < NUM_SUMS; j++) {
+            nonces[i].sum_a8_guess[j].num_states = estimated_num_states_coarse(sums[first_byte_Sum], sums[nonces[i].sum_a8_guess[j].sum_a8_idx]);
+            nonces[i].expected_num_brute_force += nonces[i].sum_a8_guess[j].prob * (float)nonces[i].sum_a8_guess[j].num_states / 2.0;
+            prob_all_failed -= nonces[i].sum_a8_guess[j].prob;
+            nonces[i].expected_num_brute_force += prob_all_failed * (float)nonces[i].sum_a8_guess[j].num_states / 2.0;
+        }
+    }
 
-	// sort based on expected number of states to brute force
-	qsort(best_first_bytes, 256, 1, compare_expected_num_brute_force);
+    // sort based on expected number of states to brute force
+    qsort(best_first_bytes, 256, 1, compare_expected_num_brute_force);
 
-	// PrintAndLogEx(NORMAL, "refine estimations: ");
-	#define NUM_REFINES	1
-	// refine scores for the best:
-	for (uint16_t i = 0; i < NUM_REFINES; i++) {
-		// PrintAndLogEx(NORMAL, "%d...", i);
-		uint16_t first_byte = best_first_bytes[i];
-		for (uint8_t j = 0; j < NUM_SUMS && nonces[first_byte].sum_a8_guess[j].prob > 0.05; j++) {
-			nonces[first_byte].sum_a8_guess[j].num_states = estimated_num_states(first_byte, sums[first_byte_Sum], sums[nonces[first_byte].sum_a8_guess[j].sum_a8_idx]);
-		}
-		// while (nonces[first_byte].sum_a8_guess[0].num_states == 0
-				// || nonces[first_byte].sum_a8_guess[1].num_states == 0
-				// || nonces[first_byte].sum_a8_guess[2].num_states == 0) {
-			// if (nonces[first_byte].sum_a8_guess[0].num_states == 0) {
-				// nonces[first_byte].sum_a8_guess[0].prob = 0.0;
-				// PrintAndLogEx(NORMAL, "(0x%02x,%d)", first_byte, 0);
-			// }
-			// if (nonces[first_byte].sum_a8_guess[1].num_states == 0) {
-				// nonces[first_byte].sum_a8_guess[1].prob = 0.0;
-				// PrintAndLogEx(NORMAL, "(0x%02x,%d)", first_byte, 1);
-			// }
-			// if (nonces[first_byte].sum_a8_guess[2].num_states == 0) {
-				// nonces[first_byte].sum_a8_guess[2].prob = 0.0;
-				// PrintAndLogEx(NORMAL, "(0x%02x,%d)", first_byte, 2);
-			// }
-			// PrintAndLogEx(NORMAL, "|");
-			// qsort(nonces[first_byte].sum_a8_guess, NUM_SUMS, sizeof(guess_sum_a8_t), compare_sum_a8_guess);
-			// for (uint8_t j = 0; j < NUM_SUMS && nonces[first_byte].sum_a8_guess[j].prob > 0.05; j++) {
-				// nonces[first_byte].sum_a8_guess[j].num_states = estimated_num_states(first_byte, sums[first_byte_Sum], sums[nonces[first_byte].sum_a8_guess[j].sum_a8_idx]);
-			// }
-		// }
-		// float fix_probs = 0.0;
-		// for (uint8_t j = 0; j < NUM_SUMS; j++) {
-			// fix_probs += nonces[first_byte].sum_a8_guess[j].prob;
-		// }
-		// for (uint8_t j = 0; j < NUM_SUMS; j++) {
-			// nonces[first_byte].sum_a8_guess[j].prob /= fix_probs;
-		// }
-		// for (uint8_t j = 0; j < NUM_SUMS && nonces[first_byte].sum_a8_guess[j].prob > 0.05; j++) {
-			// nonces[first_byte].sum_a8_guess[j].num_states = estimated_num_states(first_byte, sums[first_byte_Sum], sums[nonces[first_byte].sum_a8_guess[j].sum_a8_idx]);
-		// }
-		float prob_all_failed = 1.0;
-		nonces[first_byte].expected_num_brute_force = 0.0;
-		for (uint8_t j = 0; j < NUM_SUMS; j++) {
-			nonces[first_byte].expected_num_brute_force += nonces[first_byte].sum_a8_guess[j].prob * (float)nonces[first_byte].sum_a8_guess[j].num_states / 2.0;
-			prob_all_failed -= nonces[first_byte].sum_a8_guess[j].prob;
-			nonces[first_byte].expected_num_brute_force += prob_all_failed * (float)nonces[first_byte].sum_a8_guess[j].num_states / 2.0;
-		}
-	}
+    // PrintAndLogEx(NORMAL, "refine estimations: ");
+    #define NUM_REFINES 1
+    // refine scores for the best:
+    for (uint16_t i = 0; i < NUM_REFINES; i++) {
+        // PrintAndLogEx(NORMAL, "%d...", i);
+        uint16_t first_byte = best_first_bytes[i];
+        for (uint8_t j = 0; j < NUM_SUMS && nonces[first_byte].sum_a8_guess[j].prob > 0.05; j++) {
+            nonces[first_byte].sum_a8_guess[j].num_states = estimated_num_states(first_byte, sums[first_byte_Sum], sums[nonces[first_byte].sum_a8_guess[j].sum_a8_idx]);
+        }
+        // while (nonces[first_byte].sum_a8_guess[0].num_states == 0
+                // || nonces[first_byte].sum_a8_guess[1].num_states == 0
+                // || nonces[first_byte].sum_a8_guess[2].num_states == 0) {
+            // if (nonces[first_byte].sum_a8_guess[0].num_states == 0) {
+                // nonces[first_byte].sum_a8_guess[0].prob = 0.0;
+                // PrintAndLogEx(NORMAL, "(0x%02x,%d)", first_byte, 0);
+            // }
+            // if (nonces[first_byte].sum_a8_guess[1].num_states == 0) {
+                // nonces[first_byte].sum_a8_guess[1].prob = 0.0;
+                // PrintAndLogEx(NORMAL, "(0x%02x,%d)", first_byte, 1);
+            // }
+            // if (nonces[first_byte].sum_a8_guess[2].num_states == 0) {
+                // nonces[first_byte].sum_a8_guess[2].prob = 0.0;
+                // PrintAndLogEx(NORMAL, "(0x%02x,%d)", first_byte, 2);
+            // }
+            // PrintAndLogEx(NORMAL, "|");
+            // qsort(nonces[first_byte].sum_a8_guess, NUM_SUMS, sizeof(guess_sum_a8_t), compare_sum_a8_guess);
+            // for (uint8_t j = 0; j < NUM_SUMS && nonces[first_byte].sum_a8_guess[j].prob > 0.05; j++) {
+                // nonces[first_byte].sum_a8_guess[j].num_states = estimated_num_states(first_byte, sums[first_byte_Sum], sums[nonces[first_byte].sum_a8_guess[j].sum_a8_idx]);
+            // }
+        // }
+        // float fix_probs = 0.0;
+        // for (uint8_t j = 0; j < NUM_SUMS; j++) {
+            // fix_probs += nonces[first_byte].sum_a8_guess[j].prob;
+        // }
+        // for (uint8_t j = 0; j < NUM_SUMS; j++) {
+            // nonces[first_byte].sum_a8_guess[j].prob /= fix_probs;
+        // }
+        // for (uint8_t j = 0; j < NUM_SUMS && nonces[first_byte].sum_a8_guess[j].prob > 0.05; j++) {
+            // nonces[first_byte].sum_a8_guess[j].num_states = estimated_num_states(first_byte, sums[first_byte_Sum], sums[nonces[first_byte].sum_a8_guess[j].sum_a8_idx]);
+        // }
+        float prob_all_failed = 1.0;
+        nonces[first_byte].expected_num_brute_force = 0.0;
+        for (uint8_t j = 0; j < NUM_SUMS; j++) {
+            nonces[first_byte].expected_num_brute_force += nonces[first_byte].sum_a8_guess[j].prob * (float)nonces[first_byte].sum_a8_guess[j].num_states / 2.0;
+            prob_all_failed -= nonces[first_byte].sum_a8_guess[j].prob;
+            nonces[first_byte].expected_num_brute_force += prob_all_failed * (float)nonces[first_byte].sum_a8_guess[j].num_states / 2.0;
+        }
+    }
 
-	// copy best byte to front:
-	float least_expected_brute_force = (1LL << 48);
-	uint8_t best_byte = 0;
-	for (uint16_t i = 0; i < 10; i++) {
-		uint16_t first_byte = best_first_bytes[i];
-		if (nonces[first_byte].expected_num_brute_force < least_expected_brute_force) {
-			least_expected_brute_force = nonces[first_byte].expected_num_brute_force;
-			best_byte = i;
-		}
-	}
-	if (best_byte != 0) {
-		// PrintAndLogEx(NORMAL, "0x%02x <-> 0x%02x", best_first_bytes[0], best_first_bytes[best_byte]);
-		uint8_t tmp = best_first_bytes[0];
-		best_first_bytes[0] = best_first_bytes[best_byte];
-		best_first_bytes[best_byte] = tmp;
-	}
+    // copy best byte to front:
+    float least_expected_brute_force = (1LL << 48);
+    uint8_t best_byte = 0;
+    for (uint16_t i = 0; i < 10; i++) {
+        uint16_t first_byte = best_first_bytes[i];
+        if (nonces[first_byte].expected_num_brute_force < least_expected_brute_force) {
+            least_expected_brute_force = nonces[first_byte].expected_num_brute_force;
+            best_byte = i;
+        }
+    }
+    if (best_byte != 0) {
+        // PrintAndLogEx(NORMAL, "0x%02x <-> 0x%02x", best_first_bytes[0], best_first_bytes[best_byte]);
+        uint8_t tmp = best_first_bytes[0];
+        best_first_bytes[0] = best_first_bytes[best_byte];
+        best_first_bytes[best_byte] = tmp;
+    }
 
-	return nonces[best_first_bytes[0]].expected_num_brute_force;
+    return nonces[best_first_bytes[0]].expected_num_brute_force;
 }
 
 
 static float update_reduction_rate(float last, bool init)
 {
-#define QUEUE_LEN	4
-	static float queue[QUEUE_LEN];
+#define QUEUE_LEN 4
+    static float queue[QUEUE_LEN];
 
-	for (uint16_t i = 0; i < QUEUE_LEN-1; i++) {
-		if (init) {
-			queue[i] = (float)(1LL << 48);
-		} else {
-			queue[i] = queue[i+1];
-		}
-	}
-	if (init) {
-		queue[QUEUE_LEN-1] = (float)(1LL << 48);
-	} else {
-		queue[QUEUE_LEN-1] = last;
-	}
+    for (uint16_t i = 0; i < QUEUE_LEN-1; i++) {
+        if (init) {
+            queue[i] = (float)(1LL << 48);
+        } else {
+            queue[i] = queue[i+1];
+        }
+    }
+    if (init) {
+        queue[QUEUE_LEN-1] = (float)(1LL << 48);
+    } else {
+        queue[QUEUE_LEN-1] = last;
+    }
 
-	// linear regression
-	float avg_y = 0.0;
-	float avg_x = 0.0;
-	for (uint16_t i = 0; i < QUEUE_LEN; i++) {
-		avg_x += i;
-		avg_y += queue[i];
-	}
-	avg_x /= QUEUE_LEN;
-	avg_y /= QUEUE_LEN;
+    // linear regression
+    float avg_y = 0.0;
+    float avg_x = 0.0;
+    for (uint16_t i = 0; i < QUEUE_LEN; i++) {
+        avg_x += i;
+        avg_y += queue[i];
+    }
+    avg_x /= QUEUE_LEN;
+    avg_y /= QUEUE_LEN;
 
-	float dev_xy = 0.0;
-	float dev_x2 = 0.0;
-	for (uint16_t i = 0; i < QUEUE_LEN; i++) {
-		dev_xy += (i - avg_x)*(queue[i] - avg_y);
-		dev_x2 += (i - avg_x)*(i - avg_x);
-	}
+    float dev_xy = 0.0;
+    float dev_x2 = 0.0;
+    for (uint16_t i = 0; i < QUEUE_LEN; i++) {
+        dev_xy += (i - avg_x)*(queue[i] - avg_y);
+        dev_x2 += (i - avg_x)*(i - avg_x);
+    }
 
-	float reduction_rate = -1.0 * dev_xy / dev_x2;  // the negative slope of the linear regression
+    float reduction_rate = -1.0 * dev_xy / dev_x2;  // the negative slope of the linear regression
 
 #if defined (DEBUG_REDUCTION)
-	PrintAndLogEx(NORMAL, "update_reduction_rate(%1.0f) = %1.0f per sample, brute_force_per_sample = %1.0f\n", last, reduction_rate, brute_force_per_second * (float)sample_period / 1000.0);
+    PrintAndLogEx(NORMAL, "update_reduction_rate(%1.0f) = %1.0f per sample, brute_force_per_sample = %1.0f\n", last, reduction_rate, brute_force_per_second * (float)sample_period / 1000.0);
 #endif
-	return reduction_rate;
+    return reduction_rate;
 }
 
 
 static bool shrink_key_space(float *brute_forces)
 {
 #if defined(DEBUG_REDUCTION)
-	PrintAndLogEx(NORMAL, "shrink_key_space() with stage = 0x%02x\n", hardnested_stage);
+    PrintAndLogEx(NORMAL, "shrink_key_space() with stage = 0x%02x\n", hardnested_stage);
 #endif
-	float brute_forces1 = check_smallest_bitflip_bitarrays();
-	float brute_forces2 = (float)(1LL << 47);
-	if (hardnested_stage & CHECK_2ND_BYTES) {
-		brute_forces2 = sort_best_first_bytes();
-	}
-	*brute_forces = MIN(brute_forces1, brute_forces2);
-	float reduction_rate = update_reduction_rate(*brute_forces, false);
+    float brute_forces1 = check_smallest_bitflip_bitarrays();
+    float brute_forces2 = (float)(1LL << 47);
+    if (hardnested_stage & CHECK_2ND_BYTES) {
+        brute_forces2 = sort_best_first_bytes();
+    }
+    *brute_forces = MIN(brute_forces1, brute_forces2);
+    float reduction_rate = update_reduction_rate(*brute_forces, false);
 
 //iceman 2018
-	return ((hardnested_stage & CHECK_2ND_BYTES) &&
-				reduction_rate >= 0.0 &&
-			   ( reduction_rate < brute_force_per_second * (float)sample_period / 1000.0  || *brute_forces < 0x1F00000000));
+    return ((hardnested_stage & CHECK_2ND_BYTES) &&
+                reduction_rate >= 0.0 &&
+               ( reduction_rate < brute_force_per_second * (float)sample_period / 1000.0  || *brute_forces < 0x1F00000000));
 }
 
 
 static void estimate_sum_a8(void)
 {
-	if (first_byte_num == 256) {
-		for (uint16_t i = 0; i < 256; i++) {
-			if (nonces[i].sum_a8_guess_dirty) {
-				for (uint16_t j = 0; j < NUM_SUMS; j++ ) {
-					uint16_t sum_a8_idx = nonces[i].sum_a8_guess[j].sum_a8_idx;
-					nonces[i].sum_a8_guess[j].prob = sum_probability(sum_a8_idx, nonces[i].num, nonces[i].Sum);
-				}
-				qsort(nonces[i].sum_a8_guess, NUM_SUMS, sizeof(guess_sum_a8_t), compare_sum_a8_guess);
-				nonces[i].sum_a8_guess_dirty = false;
-			}
-		}
-	}
+    if (first_byte_num == 256) {
+        for (uint16_t i = 0; i < 256; i++) {
+            if (nonces[i].sum_a8_guess_dirty) {
+                for (uint16_t j = 0; j < NUM_SUMS; j++ ) {
+                    uint16_t sum_a8_idx = nonces[i].sum_a8_guess[j].sum_a8_idx;
+                    nonces[i].sum_a8_guess[j].prob = sum_probability(sum_a8_idx, nonces[i].num, nonces[i].Sum);
+                }
+                qsort(nonces[i].sum_a8_guess, NUM_SUMS, sizeof(guess_sum_a8_t), compare_sum_a8_guess);
+                nonces[i].sum_a8_guess_dirty = false;
+            }
+        }
+    }
 }
 
 
 static int read_nonce_file(char *filename)
 {
-	FILE *fnonces = NULL;
-	char progress_text[80]="";
-	size_t bytes_read;
-	uint8_t trgBlockNo;
-	uint8_t trgKeyType;
-	uint8_t read_buf[9];
-	uint32_t nt_enc1, nt_enc2;
-	uint8_t par_enc;
+    FILE *fnonces = NULL;
+    char progress_text[80]="";
+    size_t bytes_read;
+    uint8_t trgBlockNo;
+    uint8_t trgKeyType;
+    uint8_t read_buf[9];
+    uint32_t nt_enc1, nt_enc2;
+    uint8_t par_enc;
 
-	num_acquired_nonces = 0;
-	if ((fnonces = fopen(filename,"rb")) == NULL) {
-		PrintAndLogEx(WARNING, "Could not open file %s",filename);
-		return 1;
-	}
-	snprintf(progress_text, 80, "Reading nonces from file %s...",filename);
-	hardnested_print_progress(0, progress_text, (float)(1LL<<47), 0);
-	bytes_read = fread(read_buf, 1, 6, fnonces);
-	if (bytes_read != 6) {
-		PrintAndLogEx(WARNING, "File reading error.");
-		fclose(fnonces);
-		return 1;
-	}
-	cuid = bytes_to_num(read_buf, 4);
-	trgBlockNo = bytes_to_num(read_buf+4, 1);
-	trgKeyType = bytes_to_num(read_buf+5, 1);
+    num_acquired_nonces = 0;
+    if ((fnonces = fopen(filename,"rb")) == NULL) {
+        PrintAndLogEx(WARNING, "Could not open file %s",filename);
+        return 1;
+    }
+    snprintf(progress_text, 80, "Reading nonces from file %s...",filename);
+    hardnested_print_progress(0, progress_text, (float)(1LL<<47), 0);
+    bytes_read = fread(read_buf, 1, 6, fnonces);
+    if (bytes_read != 6) {
+        PrintAndLogEx(WARNING, "File reading error.");
+        fclose(fnonces);
+        return 1;
+    }
+    cuid = bytes_to_num(read_buf, 4);
+    trgBlockNo = bytes_to_num(read_buf+4, 1);
+    trgKeyType = bytes_to_num(read_buf+5, 1);
 
-	bytes_read = fread(read_buf, 1, 9, fnonces);
-	while (bytes_read == 9) {
-		nt_enc1 = bytes_to_num(read_buf, 4);
-		nt_enc2 = bytes_to_num(read_buf+4, 4);
-		par_enc = bytes_to_num(read_buf+8, 1);
-		add_nonce(nt_enc1, par_enc >> 4);
-		add_nonce(nt_enc2, par_enc & 0x0f);
-		num_acquired_nonces += 2;
-		bytes_read = fread(read_buf, 1, 9, fnonces);
-	}
-	fclose(fnonces);
+    bytes_read = fread(read_buf, 1, 9, fnonces);
+    while (bytes_read == 9) {
+        nt_enc1 = bytes_to_num(read_buf, 4);
+        nt_enc2 = bytes_to_num(read_buf+4, 4);
+        par_enc = bytes_to_num(read_buf+8, 1);
+        add_nonce(nt_enc1, par_enc >> 4);
+        add_nonce(nt_enc2, par_enc & 0x0f);
+        num_acquired_nonces += 2;
+        bytes_read = fread(read_buf, 1, 9, fnonces);
+    }
+    fclose(fnonces);
 
-	char progress_string[80];
-	sprintf(progress_string, "Read %d nonces from file. cuid=%08x", num_acquired_nonces, cuid);
-	hardnested_print_progress(num_acquired_nonces, progress_string, (float)(1LL<<47), 0);
-	sprintf(progress_string, "Target Block=%d, Keytype=%c", trgBlockNo, trgKeyType==0?'A':'B');
-	hardnested_print_progress(num_acquired_nonces, progress_string, (float)(1LL<<47), 0);
+    char progress_string[80];
+    sprintf(progress_string, "Read %d nonces from file. cuid=%08x", num_acquired_nonces, cuid);
+    hardnested_print_progress(num_acquired_nonces, progress_string, (float)(1LL<<47), 0);
+    sprintf(progress_string, "Target Block=%d, Keytype=%c", trgBlockNo, trgKeyType==0?'A':'B');
+    hardnested_print_progress(num_acquired_nonces, progress_string, (float)(1LL<<47), 0);
 
-	for (uint16_t i = 0; i < NUM_SUMS; i++) {
-		if (first_byte_Sum == sums[i]) {
-			first_byte_Sum = i;
-			break;
-		}
-	}
+    for (uint16_t i = 0; i < NUM_SUMS; i++) {
+        if (first_byte_Sum == sums[i]) {
+            first_byte_Sum = i;
+            break;
+        }
+    }
 
-	return 0;
+    return 0;
 }
 
 
 noncelistentry_t *SearchFor2ndByte(uint8_t b1, uint8_t b2)
 {
-	noncelistentry_t *p = nonces[b1].first;
-	while (p != NULL) {
-		if ((p->nonce_enc >> 16 & 0xff) == b2) {
-			return p;
-		}
-		p = p->next;
-	}
-	return NULL;
+    noncelistentry_t *p = nonces[b1].first;
+    while (p != NULL) {
+        if ((p->nonce_enc >> 16 & 0xff) == b2) {
+            return p;
+        }
+        p = p->next;
+    }
+    return NULL;
 }
 
 
 static bool timeout(void)
 {
-	return (msclock() > last_sample_clock + sample_period);
+    return (msclock() > last_sample_clock + sample_period);
 }
 
 
@@ -1153,459 +1153,459 @@ __attribute__((force_align_arg_pointer))
 #endif
 *check_for_BitFlipProperties_thread(void *args)
 {
-	uint8_t first_byte = ((uint8_t *)args)[0];
-	uint8_t last_byte = ((uint8_t *)args)[1];
-	uint8_t time_budget = ((uint8_t *)args)[2];
+    uint8_t first_byte = ((uint8_t *)args)[0];
+    uint8_t last_byte = ((uint8_t *)args)[1];
+    uint8_t time_budget = ((uint8_t *)args)[2];
 
-	if (hardnested_stage & CHECK_1ST_BYTES) {
-		// for (uint16_t bitflip = 0x001; bitflip < 0x200; bitflip++) {
-		for (uint16_t bitflip_idx = 0; bitflip_idx < num_1st_byte_effective_bitflips; bitflip_idx++) {
-			uint16_t bitflip = all_effective_bitflip[bitflip_idx];
-			if (time_budget & timeout()) {
+    if (hardnested_stage & CHECK_1ST_BYTES) {
+        // for (uint16_t bitflip = 0x001; bitflip < 0x200; bitflip++) {
+        for (uint16_t bitflip_idx = 0; bitflip_idx < num_1st_byte_effective_bitflips; bitflip_idx++) {
+            uint16_t bitflip = all_effective_bitflip[bitflip_idx];
+            if (time_budget & timeout()) {
 #if defined (DEBUG_REDUCTION)
-				PrintAndLogEx(NORMAL, "break at bitflip_idx %d...", bitflip_idx);
+                PrintAndLogEx(NORMAL, "break at bitflip_idx %d...", bitflip_idx);
 #endif
-				return NULL;
-			}
-			for (uint16_t i = first_byte; i <= last_byte; i++) {
-				if (nonces[i].BitFlips[bitflip] == 0 && nonces[i].BitFlips[bitflip ^ 0x100] == 0
-					&& nonces[i].first != NULL && nonces[i^(bitflip&0xff)].first != NULL) {
-					uint8_t parity1 = (nonces[i].first->par_enc) >> 3;					// parity of first byte
-					uint8_t parity2 = (nonces[i^(bitflip&0xff)].first->par_enc) >> 3; 	// parity of nonce with bits flipped
-					if ((parity1 == parity2 && !(bitflip & 0x100)) 			// bitflip
-						|| (parity1 != parity2 && (bitflip & 0x100))) {		// not bitflip
-						nonces[i].BitFlips[bitflip] = 1;
-						for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
-							if (bitflip_bitarrays[odd_even][bitflip] != NULL) {
-								uint32_t old_count = nonces[i].num_states_bitarray[odd_even];
-								nonces[i].num_states_bitarray[odd_even] = count_bitarray_AND(nonces[i].states_bitarray[odd_even], bitflip_bitarrays[odd_even][bitflip]);
-								if (nonces[i].num_states_bitarray[odd_even] != old_count) {
-									nonces[i].all_bitflips_dirty[odd_even] = true;
-								}
-								// PrintAndLogEx(NORMAL, "bitflip: %d old: %d, new: %d ", bitflip, old_count, nonces[i].num_states_bitarray[odd_even]);
-							}
-						}
-					}
-				}
-			}
-			((uint8_t *)args)[1] = num_1st_byte_effective_bitflips - bitflip_idx - 1;  // bitflips still to go in stage 1
-		}
-	}
+                return NULL;
+            }
+            for (uint16_t i = first_byte; i <= last_byte; i++) {
+                if (nonces[i].BitFlips[bitflip] == 0 && nonces[i].BitFlips[bitflip ^ 0x100] == 0
+                    && nonces[i].first != NULL && nonces[i^(bitflip&0xff)].first != NULL) {
+                    uint8_t parity1 = (nonces[i].first->par_enc) >> 3;                  // parity of first byte
+                    uint8_t parity2 = (nonces[i^(bitflip&0xff)].first->par_enc) >> 3;   // parity of nonce with bits flipped
+                    if ((parity1 == parity2 && !(bitflip & 0x100))          // bitflip
+                        || (parity1 != parity2 && (bitflip & 0x100))) {     // not bitflip
+                        nonces[i].BitFlips[bitflip] = 1;
+                        for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
+                            if (bitflip_bitarrays[odd_even][bitflip] != NULL) {
+                                uint32_t old_count = nonces[i].num_states_bitarray[odd_even];
+                                nonces[i].num_states_bitarray[odd_even] = count_bitarray_AND(nonces[i].states_bitarray[odd_even], bitflip_bitarrays[odd_even][bitflip]);
+                                if (nonces[i].num_states_bitarray[odd_even] != old_count) {
+                                    nonces[i].all_bitflips_dirty[odd_even] = true;
+                                }
+                                // PrintAndLogEx(NORMAL, "bitflip: %d old: %d, new: %d ", bitflip, old_count, nonces[i].num_states_bitarray[odd_even]);
+                            }
+                        }
+                    }
+                }
+            }
+            ((uint8_t *)args)[1] = num_1st_byte_effective_bitflips - bitflip_idx - 1;  // bitflips still to go in stage 1
+        }
+    }
 
-	((uint8_t *)args)[1] = 0;  // stage 1 definitely completed
+    ((uint8_t *)args)[1] = 0;  // stage 1 definitely completed
 
-	if (hardnested_stage & CHECK_2ND_BYTES) {
-		for (uint16_t bitflip_idx = num_1st_byte_effective_bitflips; bitflip_idx < num_all_effective_bitflips; bitflip_idx++) {
-			uint16_t bitflip = all_effective_bitflip[bitflip_idx];
-			if (time_budget & timeout()) {
+    if (hardnested_stage & CHECK_2ND_BYTES) {
+        for (uint16_t bitflip_idx = num_1st_byte_effective_bitflips; bitflip_idx < num_all_effective_bitflips; bitflip_idx++) {
+            uint16_t bitflip = all_effective_bitflip[bitflip_idx];
+            if (time_budget & timeout()) {
 #if defined (DEBUG_REDUCTION)
-				PrintAndLogEx(NORMAL, "break at bitflip_idx %d...", bitflip_idx);
+                PrintAndLogEx(NORMAL, "break at bitflip_idx %d...", bitflip_idx);
 #endif
-				return NULL;
-			}
-			for (uint16_t i = first_byte; i <= last_byte; i++) {
-				// Check for Bit Flip Property of 2nd bytes
-				if (nonces[i].BitFlips[bitflip] == 0) {
-					for (uint16_t j = 0; j < 256; j++) { 	// for each 2nd Byte
-						noncelistentry_t *byte1 = SearchFor2ndByte(i, j);
-						noncelistentry_t *byte2 = SearchFor2ndByte(i, j^(bitflip&0xff));
-						if (byte1 != NULL && byte2 != NULL) {
-							uint8_t parity1 = byte1->par_enc >> 2 & 0x01;	// parity of 2nd byte
-							uint8_t parity2 = byte2->par_enc >> 2 & 0x01; 	// parity of 2nd byte with bits flipped
-							if ((parity1 == parity2 && !(bitflip&0x100)) 		// bitflip
-								|| (parity1 != parity2 && (bitflip&0x100))) { // not bitflip
-								nonces[i].BitFlips[bitflip] = 1;
-								for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
-									if (bitflip_bitarrays[odd_even][bitflip] != NULL) {
-										uint32_t old_count = nonces[i].num_states_bitarray[odd_even];
-										nonces[i].num_states_bitarray[odd_even] = count_bitarray_AND(nonces[i].states_bitarray[odd_even], bitflip_bitarrays[odd_even][bitflip]);
-										if (nonces[i].num_states_bitarray[odd_even] != old_count) {
-											nonces[i].all_bitflips_dirty[odd_even] = true;
-										}
-									}
-								}
-								break;
-							}
-						}
-					}
-				}
-				// PrintAndLogEx(NORMAL, "states_bitarray[0][%" PRIu16 "] contains %d ones.\n", i, count_states(nonces[i].states_bitarray[EVEN_STATE]));
-				// PrintAndLogEx(NORMAL, "states_bitarray[1][%" PRIu16 "] contains %d ones.\n", i, count_states(nonces[i].states_bitarray[ODD_STATE]));
-			}
-		}
-	}
+                return NULL;
+            }
+            for (uint16_t i = first_byte; i <= last_byte; i++) {
+                // Check for Bit Flip Property of 2nd bytes
+                if (nonces[i].BitFlips[bitflip] == 0) {
+                    for (uint16_t j = 0; j < 256; j++) { // for each 2nd Byte
+                        noncelistentry_t *byte1 = SearchFor2ndByte(i, j);
+                        noncelistentry_t *byte2 = SearchFor2ndByte(i, j^(bitflip&0xff));
+                        if (byte1 != NULL && byte2 != NULL) {
+                            uint8_t parity1 = byte1->par_enc >> 2 & 0x01; // parity of 2nd byte
+                            uint8_t parity2 = byte2->par_enc >> 2 & 0x01; // parity of 2nd byte with bits flipped
+                            if ((parity1 == parity2 && !(bitflip&0x100))  // bitflip
+                                || (parity1 != parity2 && (bitflip&0x100))) { // not bitflip
+                                nonces[i].BitFlips[bitflip] = 1;
+                                for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
+                                    if (bitflip_bitarrays[odd_even][bitflip] != NULL) {
+                                        uint32_t old_count = nonces[i].num_states_bitarray[odd_even];
+                                        nonces[i].num_states_bitarray[odd_even] = count_bitarray_AND(nonces[i].states_bitarray[odd_even], bitflip_bitarrays[odd_even][bitflip]);
+                                        if (nonces[i].num_states_bitarray[odd_even] != old_count) {
+                                            nonces[i].all_bitflips_dirty[odd_even] = true;
+                                         }
+                                    }
+                                }
+                                break;
+                            }
+                        }
+                    }
+                }
+                // PrintAndLogEx(NORMAL, "states_bitarray[0][%" PRIu16 "] contains %d ones.\n", i, count_states(nonces[i].states_bitarray[EVEN_STATE]));
+                // PrintAndLogEx(NORMAL, "states_bitarray[1][%" PRIu16 "] contains %d ones.\n", i, count_states(nonces[i].states_bitarray[ODD_STATE]));
+            }
+        }
+    }
 
-	return NULL;
+    return NULL;
 }
 
 
 static void check_for_BitFlipProperties(bool time_budget)
 {
-	// create and run worker threads
-	pthread_t thread_id[NUM_CHECK_BITFLIPS_THREADS];
+    // create and run worker threads
+    pthread_t thread_id[NUM_CHECK_BITFLIPS_THREADS];
 
-	uint8_t args[NUM_CHECK_BITFLIPS_THREADS][3];
-	uint16_t bytes_per_thread = (256 + (NUM_CHECK_BITFLIPS_THREADS/2)) / NUM_CHECK_BITFLIPS_THREADS;
-	for (uint8_t i = 0; i < NUM_CHECK_BITFLIPS_THREADS; i++) {
-		args[i][0] = i * bytes_per_thread;
-		args[i][1] = MIN(args[i][0]+bytes_per_thread-1, 255);
-		args[i][2] = time_budget;
-	}
-	args[NUM_CHECK_BITFLIPS_THREADS-1][1] = MAX(args[NUM_CHECK_BITFLIPS_THREADS-1][1], 255);
+    uint8_t args[NUM_CHECK_BITFLIPS_THREADS][3];
+    uint16_t bytes_per_thread = (256 + (NUM_CHECK_BITFLIPS_THREADS/2)) / NUM_CHECK_BITFLIPS_THREADS;
+    for (uint8_t i = 0; i < NUM_CHECK_BITFLIPS_THREADS; i++) {
+        args[i][0] = i * bytes_per_thread;
+        args[i][1] = MIN(args[i][0]+bytes_per_thread-1, 255);
+        args[i][2] = time_budget;
+    }
+    args[NUM_CHECK_BITFLIPS_THREADS-1][1] = MAX(args[NUM_CHECK_BITFLIPS_THREADS-1][1], 255);
 
-	// start threads
-	for (uint8_t i = 0; i < NUM_CHECK_BITFLIPS_THREADS; i++) {
-		pthread_create(&thread_id[i], NULL, check_for_BitFlipProperties_thread, args[i]);
-	}
+    // start threads
+    for (uint8_t i = 0; i < NUM_CHECK_BITFLIPS_THREADS; i++) {
+        pthread_create(&thread_id[i], NULL, check_for_BitFlipProperties_thread, args[i]);
+    }
 
-	// wait for threads to terminate:
-	for (uint8_t i = 0; i < NUM_CHECK_BITFLIPS_THREADS; i++) {
-		pthread_join(thread_id[i], NULL);
-	}
+    // wait for threads to terminate:
+    for (uint8_t i = 0; i < NUM_CHECK_BITFLIPS_THREADS; i++) {
+        pthread_join(thread_id[i], NULL);
+    }
 
-	if (hardnested_stage & CHECK_2ND_BYTES) {
-		hardnested_stage &= ~CHECK_1ST_BYTES;	// we are done with 1st stage, except...
-		for (uint16_t i = 0; i < NUM_CHECK_BITFLIPS_THREADS; i++) {
-			if (args[i][1] != 0) {
-				hardnested_stage |= CHECK_1ST_BYTES;  // ... when any of the threads didn't complete in time
-				break;
-			}
-		}
-	}
+    if (hardnested_stage & CHECK_2ND_BYTES) {
+        hardnested_stage &= ~CHECK_1ST_BYTES; // we are done with 1st stage, except...
+        for (uint16_t i = 0; i < NUM_CHECK_BITFLIPS_THREADS; i++) {
+            if (args[i][1] != 0) {
+                hardnested_stage |= CHECK_1ST_BYTES;  // ... when any of the threads didn't complete in time
+                break;
+            }
+        }
+    }
 #if defined (DEBUG_REDUCTION)
-	if (hardnested_stage & CHECK_1ST_BYTES) PrintAndLogEx(NORMAL, "stage 1 not completed yet\n");
+    if (hardnested_stage & CHECK_1ST_BYTES) PrintAndLogEx(NORMAL, "stage 1 not completed yet\n");
 #endif
 }
 
 
 static void update_nonce_data(bool time_budget)
 {
-	check_for_BitFlipProperties(time_budget);
-	update_allbitflips_array();
-	update_sum_bitarrays(EVEN_STATE);
-	update_sum_bitarrays(ODD_STATE);
-	update_p_K();
-	estimate_sum_a8();
+    check_for_BitFlipProperties(time_budget);
+    update_allbitflips_array();
+    update_sum_bitarrays(EVEN_STATE);
+    update_sum_bitarrays(ODD_STATE);
+    update_p_K();
+    estimate_sum_a8();
 }
 
 
 static void apply_sum_a0(void)
 {
-	uint32_t old_count = num_all_bitflips_bitarray[EVEN_STATE];
-	num_all_bitflips_bitarray[EVEN_STATE] = count_bitarray_AND(all_bitflips_bitarray[EVEN_STATE], sum_a0_bitarrays[EVEN_STATE][first_byte_Sum]);
-	if (num_all_bitflips_bitarray[EVEN_STATE] != old_count) {
-		all_bitflips_bitarray_dirty[EVEN_STATE] = true;
-	}
-	old_count = num_all_bitflips_bitarray[ODD_STATE];
-	num_all_bitflips_bitarray[ODD_STATE] = count_bitarray_AND(all_bitflips_bitarray[ODD_STATE], sum_a0_bitarrays[ODD_STATE][first_byte_Sum]);
-	if (num_all_bitflips_bitarray[ODD_STATE] != old_count) {
-		all_bitflips_bitarray_dirty[ODD_STATE] = true;
-	}
+    uint32_t old_count = num_all_bitflips_bitarray[EVEN_STATE];
+    num_all_bitflips_bitarray[EVEN_STATE] = count_bitarray_AND(all_bitflips_bitarray[EVEN_STATE], sum_a0_bitarrays[EVEN_STATE][first_byte_Sum]);
+    if (num_all_bitflips_bitarray[EVEN_STATE] != old_count) {
+        all_bitflips_bitarray_dirty[EVEN_STATE] = true;
+    }
+    old_count = num_all_bitflips_bitarray[ODD_STATE];
+    num_all_bitflips_bitarray[ODD_STATE] = count_bitarray_AND(all_bitflips_bitarray[ODD_STATE], sum_a0_bitarrays[ODD_STATE][first_byte_Sum]);
+    if (num_all_bitflips_bitarray[ODD_STATE] != old_count) {
+        all_bitflips_bitarray_dirty[ODD_STATE] = true;
+    }
 }
 
 
 static void simulate_MFplus_RNG(uint32_t test_cuid, uint64_t test_key, uint32_t *nt_enc, uint8_t *par_enc)
 {
-	struct Crypto1State sim_cs = {0, 0};
+    struct Crypto1State sim_cs = {0, 0};
 
-	// init cryptostate with key:
-	for(int8_t i = 47; i > 0; i -= 2) {
-		sim_cs.odd  = sim_cs.odd  << 1 | BIT(test_key, (i - 1) ^ 7);
-		sim_cs.even = sim_cs.even << 1 | BIT(test_key, i ^ 7);
-	}
+    // init cryptostate with key:
+    for(int8_t i = 47; i > 0; i -= 2) {
+        sim_cs.odd  = sim_cs.odd  << 1 | BIT(test_key, (i - 1) ^ 7);
+        sim_cs.even = sim_cs.even << 1 | BIT(test_key, i ^ 7);
+    }
 
-	*par_enc = 0;
-	uint32_t nt = (rand() & 0xff) << 24 | (rand() & 0xff) << 16 | (rand() & 0xff) << 8 | (rand() & 0xff);
-	for (int8_t byte_pos = 3; byte_pos >= 0; byte_pos--) {
-		uint8_t nt_byte_dec = (nt >> (8*byte_pos)) & 0xff;
-		uint8_t nt_byte_enc = crypto1_byte(&sim_cs, nt_byte_dec ^ (test_cuid >> (8*byte_pos)), false) ^ nt_byte_dec; 	// encode the nonce byte
-		*nt_enc = (*nt_enc << 8) | nt_byte_enc;
-		uint8_t ks_par = filter(sim_cs.odd);											// the keystream bit to encode/decode the parity bit
-		uint8_t nt_byte_par_enc = ks_par ^ oddparity8(nt_byte_dec);						// determine the nt byte's parity and encode it
-		*par_enc = (*par_enc << 1) | nt_byte_par_enc;
-	}
+    *par_enc = 0;
+    uint32_t nt = (rand() & 0xff) << 24 | (rand() & 0xff) << 16 | (rand() & 0xff) << 8 | (rand() & 0xff);
+    for (int8_t byte_pos = 3; byte_pos >= 0; byte_pos--) {
+        uint8_t nt_byte_dec = (nt >> (8*byte_pos)) & 0xff;
+        uint8_t nt_byte_enc = crypto1_byte(&sim_cs, nt_byte_dec ^ (test_cuid >> (8*byte_pos)), false) ^ nt_byte_dec;  // encode the nonce byte
+        *nt_enc = (*nt_enc << 8) | nt_byte_enc;
+        uint8_t ks_par = filter(sim_cs.odd);                         // the keystream bit to encode/decode the parity bit
+        uint8_t nt_byte_par_enc = ks_par ^ oddparity8(nt_byte_dec);  // determine the nt byte's parity and encode it
+        *par_enc = (*par_enc << 1) | nt_byte_par_enc;
+    }
 
 }
 
 
 static void simulate_acquire_nonces()
 {
-	time_t time1 = time(NULL);
-	last_sample_clock = 0;
-	sample_period = 1000;		// for simulation
-	hardnested_stage = CHECK_1ST_BYTES;
-	bool acquisition_completed = false;
-	uint32_t total_num_nonces = 0;
-	float brute_force;
-	bool reported_suma8 = false;
+    time_t time1 = time(NULL);
+    last_sample_clock = 0;
+    sample_period = 1000; // for simulation
+    hardnested_stage = CHECK_1ST_BYTES;
+    bool acquisition_completed = false;
+    uint32_t total_num_nonces = 0;
+    float brute_force;
+    bool reported_suma8 = false;
 
-	cuid = (rand() & 0xff) << 24 | (rand() & 0xff) << 16 | (rand() & 0xff) << 8 | (rand() & 0xff);
-	if (known_target_key == -1) {
-		known_target_key = ((uint64_t)rand() & 0xfff) << 36 | ((uint64_t)rand() & 0xfff) << 24 | ((uint64_t)rand() & 0xfff) << 12 | ((uint64_t)rand() & 0xfff);
-	}
+    cuid = (rand() & 0xff) << 24 | (rand() & 0xff) << 16 | (rand() & 0xff) << 8 | (rand() & 0xff);
+    if (known_target_key == -1) {
+        known_target_key = ((uint64_t)rand() & 0xfff) << 36 | ((uint64_t)rand() & 0xfff) << 24 | ((uint64_t)rand() & 0xfff) << 12 | ((uint64_t)rand() & 0xfff);
+    }
 
-	char progress_text[80];
-	sprintf(progress_text, "Simulating key %012" PRIx64 ", cuid %08" PRIx32 " ...", known_target_key, cuid);
-	hardnested_print_progress(0, progress_text, (float)(1LL<<47), 0);
-	fprintf(fstats, "%012" PRIx64 ";%" PRIx32 ";", known_target_key, cuid);
+    char progress_text[80];
+    sprintf(progress_text, "Simulating key %012" PRIx64 ", cuid %08" PRIx32 " ...", known_target_key, cuid);
+    hardnested_print_progress(0, progress_text, (float)(1LL<<47), 0);
+    fprintf(fstats, "%012" PRIx64 ";%" PRIx32 ";", known_target_key, cuid);
 
-	num_acquired_nonces = 0;
+    num_acquired_nonces = 0;
 
-	do {
-		uint32_t nt_enc = 0;
-		uint8_t par_enc = 0;
+    do {
+        uint32_t nt_enc = 0;
+        uint8_t par_enc = 0;
 
-		for (uint16_t i = 0; i < 113; i++) {
-			simulate_MFplus_RNG(cuid, known_target_key, &nt_enc, &par_enc);
-			num_acquired_nonces += add_nonce(nt_enc, par_enc);
-			total_num_nonces++;
-		}
+        for (uint16_t i = 0; i < 113; i++) {
+            simulate_MFplus_RNG(cuid, known_target_key, &nt_enc, &par_enc);
+            num_acquired_nonces += add_nonce(nt_enc, par_enc);
+            total_num_nonces++;
+        }
 
-		last_sample_clock = msclock();
+        last_sample_clock = msclock();
 
-		if (first_byte_num == 256 ) {
-			if (hardnested_stage == CHECK_1ST_BYTES) {
-				for (uint16_t i = 0; i < NUM_SUMS; i++) {
-					if (first_byte_Sum == sums[i]) {
-						first_byte_Sum = i;
-						break;
-					}
-				}
-				hardnested_stage |= CHECK_2ND_BYTES;
-				apply_sum_a0();
-			}
-			update_nonce_data(true);
-			acquisition_completed = shrink_key_space(&brute_force);
-			if (!reported_suma8) {
-				char progress_string[80];
-				sprintf(progress_string, "Apply Sum property. Sum(a0) = %d", sums[first_byte_Sum]);
-				hardnested_print_progress(num_acquired_nonces, progress_string, brute_force, 0);
-				reported_suma8 = true;
-			} else {
-				hardnested_print_progress(num_acquired_nonces, "Apply bit flip properties", brute_force, 0);
-			}
-		} else {
-			update_nonce_data(true);
-			acquisition_completed = shrink_key_space(&brute_force);
-			hardnested_print_progress(num_acquired_nonces, "Apply bit flip properties", brute_force, 0);
-		}
-	} while (!acquisition_completed);
+        if (first_byte_num == 256 ) {
+            if (hardnested_stage == CHECK_1ST_BYTES) {
+                for (uint16_t i = 0; i < NUM_SUMS; i++) {
+                    if (first_byte_Sum == sums[i]) {
+                        first_byte_Sum = i;
+                        break;
+                    }
+                }
+                hardnested_stage |= CHECK_2ND_BYTES;
+                apply_sum_a0();
+            }
+            update_nonce_data(true);
+            acquisition_completed = shrink_key_space(&brute_force);
+            if (!reported_suma8) {
+                char progress_string[80];
+                sprintf(progress_string, "Apply Sum property. Sum(a0) = %d", sums[first_byte_Sum]);
+                hardnested_print_progress(num_acquired_nonces, progress_string, brute_force, 0);
+                reported_suma8 = true;
+            } else {
+                hardnested_print_progress(num_acquired_nonces, "Apply bit flip properties", brute_force, 0);
+            }
+        } else {
+            update_nonce_data(true);
+            acquisition_completed = shrink_key_space(&brute_force);
+            hardnested_print_progress(num_acquired_nonces, "Apply bit flip properties", brute_force, 0);
+        }
+    } while (!acquisition_completed);
 
-	time_t end_time = time(NULL);
-	// PrintAndLogEx(NORMAL, "Acquired a total of %" PRId32" nonces in %1.0f seconds (%1.0f nonces/minute)",
-		// num_acquired_nonces,
-		// difftime(end_time, time1),
-		// difftime(end_time, time1)!=0.0?(float)total_num_nonces*60.0/difftime(end_time, time1):INFINITY
-		// );
+    time_t end_time = time(NULL);
+    // PrintAndLogEx(NORMAL, "Acquired a total of %" PRId32" nonces in %1.0f seconds (%1.0f nonces/minute)",
+        // num_acquired_nonces,
+        // difftime(end_time, time1),
+        // difftime(end_time, time1)!=0.0?(float)total_num_nonces*60.0/difftime(end_time, time1):INFINITY
+        // );
 
-	fprintf(fstats, "%" PRId32 ";%" PRId32 ";%1.0f;", total_num_nonces, num_acquired_nonces, difftime(end_time,time1));
+    fprintf(fstats, "%" PRId32 ";%" PRId32 ";%1.0f;", total_num_nonces, num_acquired_nonces, difftime(end_time,time1));
 
 }
 
 
 static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo, uint8_t trgKeyType, bool nonce_file_write, bool slow, char *filename)
 {
-	last_sample_clock = msclock();
-	sample_period = 2000;	// initial rough estimate. Will be refined.
-	bool initialize = true;
-	bool field_off = false;
-	hardnested_stage = CHECK_1ST_BYTES;
-	bool acquisition_completed = false;
-	uint32_t flags = 0;
-	uint8_t write_buf[9];
-	uint32_t total_num_nonces = 0;
-	float brute_force;
-	bool reported_suma8 = false;
-	char progress_text[80];
-	FILE *fnonces = NULL;
-	UsbCommand resp;
+    last_sample_clock = msclock();
+    sample_period = 2000; // initial rough estimate. Will be refined.
+    bool initialize = true;
+    bool field_off = false;
+    hardnested_stage = CHECK_1ST_BYTES;
+    bool acquisition_completed = false;
+    uint32_t flags = 0;
+    uint8_t write_buf[9];
+    uint32_t total_num_nonces = 0;
+    float brute_force;
+    bool reported_suma8 = false;
+    char progress_text[80];
+    FILE *fnonces = NULL;
+    UsbCommand resp;
 
-	num_acquired_nonces = 0;
+    num_acquired_nonces = 0;
 
-	clearCommandBuffer();
+    clearCommandBuffer();
 
-	do {
-		flags = 0;
-		flags |= initialize ? 0x0001 : 0;
-		flags |= slow ? 0x0002 : 0;
-		flags |= field_off ? 0x0004 : 0;
-		UsbCommand c = {CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, flags}};
-		memcpy(c.d.asBytes, key, 6);
+    do {
+        flags = 0;
+        flags |= initialize ? 0x0001 : 0;
+        flags |= slow ? 0x0002 : 0;
+        flags |= field_off ? 0x0004 : 0;
+        UsbCommand c = {CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, flags}};
+        memcpy(c.d.asBytes, key, 6);
 
-		clearCommandBuffer();
-		SendCommand(&c);
+        clearCommandBuffer();
+        SendCommand(&c);
 
-		if (field_off) break;
+        if (field_off) break;
 
-		if (initialize) {
-			if (!WaitForResponseTimeout(CMD_ACK, &resp, 3000)) {
-				//strange second call (iceman)
-				UsbCommand c = {CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, 4}};
-				clearCommandBuffer();
-				SendCommand(&c);
-				return 1;
-			}
-			if (resp.arg[0]) return resp.arg[0];  // error during nested_hard
+        if (initialize) {
+            if (!WaitForResponseTimeout(CMD_ACK, &resp, 3000)) {
+                //strange second call (iceman)
+                UsbCommand c = {CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, 4}};
+                clearCommandBuffer();
+                SendCommand(&c);
+                return 1;
+            }
+            if (resp.arg[0]) return resp.arg[0];  // error during nested_hard
 
-			cuid = resp.arg[1];
-			if (nonce_file_write && fnonces == NULL) {
-				if ((fnonces = fopen(filename,"wb")) == NULL) {
-					PrintAndLogEx(WARNING, "Could not create file %s", filename);
-					return 3;
-				}
-				snprintf(progress_text, 80, "Writing acquired nonces to binary file %s", filename);
-				hardnested_print_progress(0, progress_text, (float)(1LL<<47), 0);
-				num_to_bytes(cuid, 4, write_buf);
-				fwrite(write_buf, 1, 4, fnonces);
-				fwrite(&trgBlockNo, 1, 1, fnonces);
-				fwrite(&trgKeyType, 1, 1, fnonces);
-				fflush(fnonces);
-			}
-		}
+            cuid = resp.arg[1];
+            if (nonce_file_write && fnonces == NULL) {
+                if ((fnonces = fopen(filename,"wb")) == NULL) {
+                    PrintAndLogEx(WARNING, "Could not create file %s", filename);
+                    return 3;
+                }
+                snprintf(progress_text, 80, "Writing acquired nonces to binary file %s", filename);
+                hardnested_print_progress(0, progress_text, (float)(1LL<<47), 0);
+                num_to_bytes(cuid, 4, write_buf);
+                fwrite(write_buf, 1, 4, fnonces);
+                fwrite(&trgBlockNo, 1, 1, fnonces);
+                fwrite(&trgKeyType, 1, 1, fnonces);
+                fflush(fnonces);
+            }
+        }
 
-		if (!initialize) {
-			uint32_t nt_enc1, nt_enc2;
-			uint8_t par_enc;
-			uint16_t num_sampled_nonces = resp.arg[2];
-			uint8_t *bufp = resp.d.asBytes;
-			for (uint16_t i = 0; i < num_sampled_nonces; i+=2) {
-				nt_enc1 = bytes_to_num(bufp, 4);
-				nt_enc2 = bytes_to_num(bufp+4, 4);
-				par_enc = bytes_to_num(bufp+8, 1);
+        if (!initialize) {
+            uint32_t nt_enc1, nt_enc2;
+            uint8_t par_enc;
+            uint16_t num_sampled_nonces = resp.arg[2];
+            uint8_t *bufp = resp.d.asBytes;
+            for (uint16_t i = 0; i < num_sampled_nonces; i+=2) {
+                nt_enc1 = bytes_to_num(bufp, 4);
+                nt_enc2 = bytes_to_num(bufp+4, 4);
+                par_enc = bytes_to_num(bufp+8, 1);
 
-				//PrintAndLogEx(NORMAL, "Encrypted nonce: %08x, encrypted_parity: %02x\n", nt_enc1, par_enc >> 4);
-				num_acquired_nonces += add_nonce(nt_enc1, par_enc >> 4);
-				//PrintAndLogEx(NORMAL, "Encrypted nonce: %08x, encrypted_parity: %02x\n", nt_enc2, par_enc & 0x0f);
-				num_acquired_nonces += add_nonce(nt_enc2, par_enc & 0x0f);
+                //PrintAndLogEx(NORMAL, "Encrypted nonce: %08x, encrypted_parity: %02x\n", nt_enc1, par_enc >> 4);
+                num_acquired_nonces += add_nonce(nt_enc1, par_enc >> 4);
+                //PrintAndLogEx(NORMAL, "Encrypted nonce: %08x, encrypted_parity: %02x\n", nt_enc2, par_enc & 0x0f);
+                num_acquired_nonces += add_nonce(nt_enc2, par_enc & 0x0f);
 
-				if (nonce_file_write) {
-					fwrite(bufp, 1, 9, fnonces);
-					fflush(fnonces);
-				}
-				bufp += 9;
-			}
-			total_num_nonces += num_sampled_nonces;
+                if (nonce_file_write) {
+                    fwrite(bufp, 1, 9, fnonces);
+                    fflush(fnonces);
+                }
+                bufp += 9;
+            }
+            total_num_nonces += num_sampled_nonces;
 
-			if (first_byte_num == 256 ) {
-				if (hardnested_stage == CHECK_1ST_BYTES) {
-					for (uint16_t i = 0; i < NUM_SUMS; i++) {
-						if (first_byte_Sum == sums[i]) {
-							first_byte_Sum = i;
-							break;
-						}
-					}
-					hardnested_stage |= CHECK_2ND_BYTES;
-					apply_sum_a0();
-				}
-				update_nonce_data(true);
-				acquisition_completed = shrink_key_space(&brute_force);
-				if (!reported_suma8) {
-					char progress_string[80];
-					sprintf(progress_string, "Apply Sum property. Sum(a0) = %d", sums[first_byte_Sum]);
-					hardnested_print_progress(num_acquired_nonces, progress_string, brute_force, 0);
-					reported_suma8 = true;
-				} else {
-					hardnested_print_progress(num_acquired_nonces, "Apply bit flip properties", brute_force, 0);
-				}
-			} else {
-				update_nonce_data(true);
-				acquisition_completed = shrink_key_space(&brute_force);
-				hardnested_print_progress(num_acquired_nonces, "Apply bit flip properties", brute_force, 0);
-			}
-		}
+            if (first_byte_num == 256 ) {
+                if (hardnested_stage == CHECK_1ST_BYTES) {
+                    for (uint16_t i = 0; i < NUM_SUMS; i++) {
+                        if (first_byte_Sum == sums[i]) {
+                            first_byte_Sum = i;
+                            break;
+                        }
+                    }
+                    hardnested_stage |= CHECK_2ND_BYTES;
+                    apply_sum_a0();
+                }
+                update_nonce_data(true);
+                acquisition_completed = shrink_key_space(&brute_force);
+                if (!reported_suma8) {
+                    char progress_string[80];
+                    sprintf(progress_string, "Apply Sum property. Sum(a0) = %d", sums[first_byte_Sum]);
+                    hardnested_print_progress(num_acquired_nonces, progress_string, brute_force, 0);
+                    reported_suma8 = true;
+                } else {
+                    hardnested_print_progress(num_acquired_nonces, "Apply bit flip properties", brute_force, 0);
+                }
+            } else {
+                update_nonce_data(true);
+                acquisition_completed = shrink_key_space(&brute_force);
+                hardnested_print_progress(num_acquired_nonces, "Apply bit flip properties", brute_force, 0);
+            }
+        }
 
-		if (acquisition_completed) {
-			field_off = true;	// switch off field with next SendCommand and then finish
-		}
+        if (acquisition_completed) {
+            field_off = true; // switch off field with next SendCommand and then finish
+        }
 
-		if (!initialize) {
-			if (!WaitForResponseTimeout(CMD_ACK, &resp, 3000)) {
-				if (nonce_file_write) {
-					fclose(fnonces);
-				}
-				return 1;
-			}
-			if (resp.arg[0]) {
-				if (nonce_file_write) {
-					fclose(fnonces);
-				}
-				return resp.arg[0];  // error during nested_hard
-			}
-		}
+        if (!initialize) {
+            if (!WaitForResponseTimeout(CMD_ACK, &resp, 3000)) {
+                if (nonce_file_write) {
+                    fclose(fnonces);
+                }
+                return 1;
+            }
+            if (resp.arg[0]) {
+                if (nonce_file_write) {
+                    fclose(fnonces);
+                }
+                return resp.arg[0];  // error during nested_hard
+            }
+        }
 
-		initialize = false;
+        initialize = false;
 
-		if (msclock() - last_sample_clock < sample_period) {
-			sample_period = msclock() - last_sample_clock;
-		}
-		last_sample_clock = msclock();
+        if (msclock() - last_sample_clock < sample_period) {
+            sample_period = msclock() - last_sample_clock;
+        }
+        last_sample_clock = msclock();
 
-	} while (!acquisition_completed || field_off);
+    } while (!acquisition_completed || field_off);
 
-	if (nonce_file_write) {
-		fclose(fnonces);
-	}
+    if (nonce_file_write) {
+        fclose(fnonces);
+    }
 
-	// PrintAndLogEx(NORMAL, "Sampled a total of %d nonces in %d seconds (%0.0f nonces/minute)",
-		// total_num_nonces,
-		// time(NULL)-time1,
-		// (float)total_num_nonces*60.0/(time(NULL)-time1));
+    // PrintAndLogEx(NORMAL, "Sampled a total of %d nonces in %d seconds (%0.0f nonces/minute)",
+        // total_num_nonces,
+        // time(NULL)-time1,
+        // (float)total_num_nonces*60.0/(time(NULL)-time1));
 
-	return 0;
+    return 0;
 }
 
 
 static inline bool invariant_holds(uint_fast8_t byte_diff, uint_fast32_t state1, uint_fast32_t state2, uint_fast8_t bit, uint_fast8_t state_bit)
 {
-	uint_fast8_t j_1_bit_mask = 0x01 << (bit-1);
-	uint_fast8_t bit_diff = byte_diff & j_1_bit_mask;							 			// difference of (j-1)th bit
-	uint_fast8_t filter_diff = filter(state1 >> (4-state_bit)) ^ filter(state2 >> (4-state_bit));	// difference in filter function
-	uint_fast8_t mask_y12_y13 = 0xc0 >> state_bit;
-	uint_fast8_t state_bits_diff = (state1 ^ state2) & mask_y12_y13;						// difference in state bits 12 and 13
-	uint_fast8_t all_diff = evenparity8(bit_diff ^ state_bits_diff ^ filter_diff);			// use parity function to XOR all bits
-	return !all_diff;
+    uint_fast8_t j_1_bit_mask = 0x01 << (bit-1);
+    uint_fast8_t bit_diff = byte_diff & j_1_bit_mask;                                               // difference of (j-1)th bit
+    uint_fast8_t filter_diff = filter(state1 >> (4-state_bit)) ^ filter(state2 >> (4-state_bit));   // difference in filter function
+    uint_fast8_t mask_y12_y13 = 0xc0 >> state_bit;
+    uint_fast8_t state_bits_diff = (state1 ^ state2) & mask_y12_y13;                                // difference in state bits 12 and 13
+    uint_fast8_t all_diff = evenparity8(bit_diff ^ state_bits_diff ^ filter_diff);                  // use parity function to XOR all bits
+    return !all_diff;
 }
 
 
 static inline bool invalid_state(uint_fast8_t byte_diff, uint_fast32_t state1, uint_fast32_t state2, uint_fast8_t bit, uint_fast8_t state_bit)
 {
-	uint_fast8_t j_bit_mask = 0x01 << bit;
-	uint_fast8_t bit_diff = byte_diff & j_bit_mask;											// difference of jth bit
-	uint_fast8_t mask_y13_y16 = 0x48 >> state_bit;
-	uint_fast8_t state_bits_diff = (state1 ^ state2) & mask_y13_y16;						// difference in state bits 13 and 16
-	uint_fast8_t all_diff = evenparity8(bit_diff ^ state_bits_diff);						// use parity function to XOR all bits
-	return all_diff;
+    uint_fast8_t j_bit_mask = 0x01 << bit;
+    uint_fast8_t bit_diff = byte_diff & j_bit_mask;                                                 // difference of jth bit
+    uint_fast8_t mask_y13_y16 = 0x48 >> state_bit;
+    uint_fast8_t state_bits_diff = (state1 ^ state2) & mask_y13_y16;                                // difference in state bits 13 and 16
+    uint_fast8_t all_diff = evenparity8(bit_diff ^ state_bits_diff);                                // use parity function to XOR all bits
+    return all_diff;
 }
 
 
 static inline bool remaining_bits_match(uint_fast8_t num_common_bits, uint_fast8_t byte_diff, uint_fast32_t state1, uint_fast32_t state2, odd_even_t odd_even)
 {
-	if (odd_even) {
-		// odd bits
-		switch (num_common_bits) {
-			case 0: if (!invariant_holds(byte_diff, state1, state2, 1, 0)) return true;
-			case 1: if (invalid_state(byte_diff, state1, state2, 1, 0)) return false;
-			case 2: if (!invariant_holds(byte_diff, state1, state2, 3, 1)) return true;
-			case 3: if (invalid_state(byte_diff, state1, state2, 3, 1)) return false;
-			case 4: if (!invariant_holds(byte_diff, state1, state2, 5, 2)) return true;
-			case 5: if (invalid_state(byte_diff, state1, state2, 5, 2)) return false;
-			case 6: if (!invariant_holds(byte_diff, state1, state2, 7, 3)) return true;
-			case 7: if (invalid_state(byte_diff, state1, state2, 7, 3)) return false;
-		}
-	} else {
-		// even bits
-		switch (num_common_bits) {
-			case 0: if (invalid_state(byte_diff, state1, state2, 0, 0)) return false;
-			case 1: if (!invariant_holds(byte_diff, state1, state2, 2, 1)) return true;
-			case 2: if (invalid_state(byte_diff, state1, state2, 2, 1)) return false;
-			case 3: if (!invariant_holds(byte_diff, state1, state2, 4, 2)) return true;
-			case 4: if (invalid_state(byte_diff, state1, state2, 4, 2)) return false;
-			case 5: if (!invariant_holds(byte_diff, state1, state2, 6, 3)) return true;
-			case 6: if (invalid_state(byte_diff, state1, state2, 6, 3)) return false;
-		}
-	}
+    if (odd_even) {
+        // odd bits
+        switch (num_common_bits) {
+            case 0: if (!invariant_holds(byte_diff, state1, state2, 1, 0)) return true;
+            case 1: if (invalid_state(byte_diff, state1, state2, 1, 0)) return false;
+            case 2: if (!invariant_holds(byte_diff, state1, state2, 3, 1)) return true;
+            case 3: if (invalid_state(byte_diff, state1, state2, 3, 1)) return false;
+            case 4: if (!invariant_holds(byte_diff, state1, state2, 5, 2)) return true;
+            case 5: if (invalid_state(byte_diff, state1, state2, 5, 2)) return false;
+            case 6: if (!invariant_holds(byte_diff, state1, state2, 7, 3)) return true;
+            case 7: if (invalid_state(byte_diff, state1, state2, 7, 3)) return false;
+        }
+    } else {
+        // even bits
+        switch (num_common_bits) {
+            case 0: if (invalid_state(byte_diff, state1, state2, 0, 0)) return false;
+            case 1: if (!invariant_holds(byte_diff, state1, state2, 2, 1)) return true;
+            case 2: if (invalid_state(byte_diff, state1, state2, 2, 1)) return false;
+            case 3: if (!invariant_holds(byte_diff, state1, state2, 4, 2)) return true;
+            case 4: if (invalid_state(byte_diff, state1, state2, 4, 2)) return false;
+            case 5: if (!invariant_holds(byte_diff, state1, state2, 6, 3)) return true;
+            case 6: if (invalid_state(byte_diff, state1, state2, 6, 3)) return false;
+        }
+    }
 
-	return true;					// valid state
+    return true; // valid state
 }
 
 
@@ -1614,45 +1614,45 @@ static pthread_mutex_t book_of_work_mutex = PTHREAD_MUTEX_INITIALIZER;
 
 
 typedef enum {
-	TO_BE_DONE,
-	WORK_IN_PROGRESS,
-	COMPLETED
+    TO_BE_DONE,
+    WORK_IN_PROGRESS,
+    COMPLETED
 } work_status_t;
 
 static struct sl_cache_entry {
-	uint32_t *sl;
-	uint32_t len;
-	work_status_t cache_status;
-	} sl_cache[NUM_PART_SUMS][NUM_PART_SUMS][2];
+    uint32_t *sl;
+    uint32_t len;
+    work_status_t cache_status;
+    } sl_cache[NUM_PART_SUMS][NUM_PART_SUMS][2];
 
 
 static void init_statelist_cache(void)
 {
-	pthread_mutex_lock(&statelist_cache_mutex);
-	for (uint16_t i = 0; i < NUM_PART_SUMS; i++) {
-		for (uint16_t j = 0; j < NUM_PART_SUMS; j++) {
-			for (uint16_t k = 0; k < 2; k++) {
-				sl_cache[i][j][k].sl = NULL;
-				sl_cache[i][j][k].len = 0;
-				sl_cache[i][j][k].cache_status = TO_BE_DONE;
-			}
-		}
-	}
-	pthread_mutex_unlock(&statelist_cache_mutex);
+    pthread_mutex_lock(&statelist_cache_mutex);
+    for (uint16_t i = 0; i < NUM_PART_SUMS; i++) {
+        for (uint16_t j = 0; j < NUM_PART_SUMS; j++) {
+            for (uint16_t k = 0; k < 2; k++) {
+                sl_cache[i][j][k].sl = NULL;
+                sl_cache[i][j][k].len = 0;
+                sl_cache[i][j][k].cache_status = TO_BE_DONE;
+            }
+        }
+    }
+    pthread_mutex_unlock(&statelist_cache_mutex);
 }
 
 
 static void free_statelist_cache(void)
 {
-	pthread_mutex_lock(&statelist_cache_mutex);
-	for (uint16_t i = 0; i < NUM_PART_SUMS; i++) {
-		for (uint16_t j = 0; j < NUM_PART_SUMS; j++) {
-			for (uint16_t k = 0; k < 2; k++) {
-				free(sl_cache[i][j][k].sl);
-			}
-		}
-	}
-	pthread_mutex_unlock(&statelist_cache_mutex);
+    pthread_mutex_lock(&statelist_cache_mutex);
+    for (uint16_t i = 0; i < NUM_PART_SUMS; i++) {
+        for (uint16_t j = 0; j < NUM_PART_SUMS; j++) {
+            for (uint16_t k = 0; k < 2; k++) {
+                free(sl_cache[i][j][k].sl);
+            }
+        }
+    }
+    pthread_mutex_unlock(&statelist_cache_mutex);
 }
 
 
@@ -1662,224 +1662,224 @@ static inline bool bitflips_match(uint8_t byte, uint32_t state, odd_even_t odd_e
 static inline bool bitflips_match(uint8_t byte, uint32_t state, odd_even_t odd_even)
 #endif
 {
-	uint32_t *bitset = nonces[byte].states_bitarray[odd_even];
-	bool possible = test_bit24(bitset, state);
-	if (!possible) {
+    uint32_t *bitset = nonces[byte].states_bitarray[odd_even];
+    bool possible = test_bit24(bitset, state);
+    if (!possible) {
 #ifdef DEBUG_KEY_ELIMINATION
-		if (!quiet && known_target_key != -1 && state == test_state[odd_even]) {
-			PrintAndLogEx(NORMAL, "Initial state lists: %s test state eliminated by bitflip property.\n", odd_even==EVEN_STATE?"even":"odd");
-			sprintf(failstr, "Initial %s Byte Bitflip property", odd_even==EVEN_STATE?"even":"odd");
-		}
+        if (!quiet && known_target_key != -1 && state == test_state[odd_even]) {
+            PrintAndLogEx(NORMAL, "Initial state lists: %s test state eliminated by bitflip property.\n", odd_even==EVEN_STATE?"even":"odd");
+            sprintf(failstr, "Initial %s Byte Bitflip property", odd_even==EVEN_STATE?"even":"odd");
+        }
 #endif
-		return false;
-	}
+        return false;
+    }
 
-	return true;
+    return true;
 }
 
 
 static uint_fast8_t reverse(uint_fast8_t b)
 {
-	b = (b & 0xF0) >> 4 | (b & 0x0F) << 4;
-	b = (b & 0xCC) >> 2 | (b & 0x33) << 2;
-	b = (b & 0xAA) >> 1 | (b & 0x55) << 1;
-	return b;
+    b = (b & 0xF0) >> 4 | (b & 0x0F) << 4;
+    b = (b & 0xCC) >> 2 | (b & 0x33) << 2;
+    b = (b & 0xAA) >> 1 | (b & 0x55) << 1;
+    return b;
 }
 
 
 static bool all_bitflips_match(uint8_t byte, uint32_t state, odd_even_t odd_even)
 {
-	uint32_t masks[2][8] = {{0x00fffff0, 0x00fffff8, 0x00fffff8, 0x00fffffc, 0x00fffffc, 0x00fffffe, 0x00fffffe, 0x00ffffff},
-							{0x00fffff0, 0x00fffff0, 0x00fffff8, 0x00fffff8, 0x00fffffc, 0x00fffffc, 0x00fffffe, 0x00fffffe} };
+    uint32_t masks[2][8] = {{0x00fffff0, 0x00fffff8, 0x00fffff8, 0x00fffffc, 0x00fffffc, 0x00fffffe, 0x00fffffe, 0x00ffffff},
+                            {0x00fffff0, 0x00fffff0, 0x00fffff8, 0x00fffff8, 0x00fffffc, 0x00fffffc, 0x00fffffe, 0x00fffffe} };
 
-	for (uint16_t i = 1; i < 256; i++) {
-		uint_fast8_t bytes_diff = reverse(i);	// start with most common bits
-		uint_fast8_t byte2 = byte ^ bytes_diff;
-		uint_fast8_t num_common = trailing_zeros(bytes_diff);
-		uint32_t mask = masks[odd_even][num_common];
-		bool found_match = false;
-		for (uint8_t remaining_bits = 0; remaining_bits <= (~mask & 0xff); remaining_bits++) {
-			if (remaining_bits_match(num_common, bytes_diff, state, (state & mask) | remaining_bits, odd_even)) {
+    for (uint16_t i = 1; i < 256; i++) {
+        uint_fast8_t bytes_diff = reverse(i); // start with most common bits
+        uint_fast8_t byte2 = byte ^ bytes_diff;
+        uint_fast8_t num_common = trailing_zeros(bytes_diff);
+        uint32_t mask = masks[odd_even][num_common];
+        bool found_match = false;
+        for (uint8_t remaining_bits = 0; remaining_bits <= (~mask & 0xff); remaining_bits++) {
+            if (remaining_bits_match(num_common, bytes_diff, state, (state & mask) | remaining_bits, odd_even)) {
 #ifdef DEBUG_KEY_ELIMINATION
-				if (bitflips_match(byte2, (state & mask) | remaining_bits, odd_even, true)) {
+                if (bitflips_match(byte2, (state & mask) | remaining_bits, odd_even, true)) {
 #else
-				if (bitflips_match(byte2, (state & mask) | remaining_bits, odd_even)) {
+                if (bitflips_match(byte2, (state & mask) | remaining_bits, odd_even)) {
 #endif
-					found_match = true;
-					break;
-				}
-			}
-		}
-		if (!found_match) {
+                    found_match = true;
+                    break;
+                }
+            }
+        }
+        if (!found_match) {
 #ifdef DEBUG_KEY_ELIMINATION
-			if (known_target_key != -1 && state == test_state[odd_even]) {
-				PrintAndLogEx(NORMAL, "all_bitflips_match() 1st Byte: %s test state (0x%06x): Eliminated. Bytes = %02x, %02x, Common Bits = %d\n",
-					odd_even == ODD_STATE ? "odd" : "even",
-					test_state[odd_even],
-					byte,
-					byte2,
-					num_common);
-				if (failstr[0] == '\0') {
-					sprintf(failstr, "Other 1st Byte %s, all_bitflips_match(), no match", odd_even ? "odd" : "even");
-				}
-			}
+            if (known_target_key != -1 && state == test_state[odd_even]) {
+                PrintAndLogEx(NORMAL, "all_bitflips_match() 1st Byte: %s test state (0x%06x): Eliminated. Bytes = %02x, %02x, Common Bits = %d\n",
+                    odd_even == ODD_STATE ? "odd" : "even",
+                    test_state[odd_even],
+                    byte,
+                    byte2,
+                    num_common);
+                if (failstr[0] == '\0') {
+                    sprintf(failstr, "Other 1st Byte %s, all_bitflips_match(), no match", odd_even ? "odd" : "even");
+                }
+            }
 #endif
-			return false;
-		}
-	}
-	return true;
+            return false;
+        }
+    }
+    return true;
 }
 
 
-static void	bitarray_to_list(uint8_t byte, uint32_t *bitarray, uint32_t *state_list, uint32_t *len, odd_even_t odd_even)
+static void bitarray_to_list(uint8_t byte, uint32_t *bitarray, uint32_t *state_list, uint32_t *len, odd_even_t odd_even)
 {
-	uint32_t *p = state_list;
-	for (uint32_t state = next_state(bitarray, -1L); state < (1<<24); state = next_state(bitarray, state)) {
-		if (all_bitflips_match(byte, state, odd_even)) {
-			*p++ = state;
-		}
-	}
-	// add End Of List marker
-	*p = 0xffffffff;
-	*len = p - state_list;
+    uint32_t *p = state_list;
+    for (uint32_t state = next_state(bitarray, -1L); state < (1<<24); state = next_state(bitarray, state)) {
+        if (all_bitflips_match(byte, state, odd_even)) {
+            *p++ = state;
+        }
+    }
+    // add End Of List marker
+    *p = 0xffffffff;
+    *len = p - state_list;
 }
 
 
 static void add_cached_states(statelist_t *candidates, uint16_t part_sum_a0, uint16_t part_sum_a8, odd_even_t odd_even)
 {
-	candidates->states[odd_even] = sl_cache[part_sum_a0/2][part_sum_a8/2][odd_even].sl;
-	candidates->len[odd_even] = sl_cache[part_sum_a0/2][part_sum_a8/2][odd_even].len;
-	return;
+    candidates->states[odd_even] = sl_cache[part_sum_a0/2][part_sum_a8/2][odd_even].sl;
+    candidates->len[odd_even] = sl_cache[part_sum_a0/2][part_sum_a8/2][odd_even].len;
+    return;
 }
 
 
 static void add_matching_states(statelist_t *candidates, uint8_t part_sum_a0, uint8_t part_sum_a8, odd_even_t odd_even)
 {
-	uint32_t worstcase_size = 1<<20;
-	candidates->states[odd_even] = (uint32_t *)malloc(sizeof(uint32_t) * worstcase_size);
-	if (candidates->states[odd_even] == NULL) {
-		PrintAndLogEx(WARNING, "Out of memory error in add_matching_states() - statelist.\n");
-		exit(4);
-	}
-	uint32_t *candidates_bitarray = (uint32_t *)malloc_bitarray(sizeof(uint32_t) * worstcase_size);
-	if (candidates_bitarray == NULL) {
-		PrintAndLogEx(WARNING, "Out of memory error in add_matching_states() - bitarray.\n");
-		free(candidates->states[odd_even]);
-		exit(4);
-	}
+    uint32_t worstcase_size = 1<<20;
+    candidates->states[odd_even] = (uint32_t *)malloc(sizeof(uint32_t) * worstcase_size);
+    if (candidates->states[odd_even] == NULL) {
+        PrintAndLogEx(WARNING, "Out of memory error in add_matching_states() - statelist.\n");
+        exit(4);
+    }
+    uint32_t *candidates_bitarray = (uint32_t *)malloc_bitarray(sizeof(uint32_t) * worstcase_size);
+    if (candidates_bitarray == NULL) {
+        PrintAndLogEx(WARNING, "Out of memory error in add_matching_states() - bitarray.\n");
+        free(candidates->states[odd_even]);
+        exit(4);
+    }
 
-	uint32_t *bitarray_a0 = part_sum_a0_bitarrays[odd_even][part_sum_a0/2];
-	uint32_t *bitarray_a8 = part_sum_a8_bitarrays[odd_even][part_sum_a8/2];
-	uint32_t *bitarray_bitflips = nonces[best_first_bytes[0]].states_bitarray[odd_even];
+    uint32_t *bitarray_a0 = part_sum_a0_bitarrays[odd_even][part_sum_a0/2];
+    uint32_t *bitarray_a8 = part_sum_a8_bitarrays[odd_even][part_sum_a8/2];
+    uint32_t *bitarray_bitflips = nonces[best_first_bytes[0]].states_bitarray[odd_even];
 
-	bitarray_AND4(candidates_bitarray, bitarray_a0, bitarray_a8, bitarray_bitflips);
+    bitarray_AND4(candidates_bitarray, bitarray_a0, bitarray_a8, bitarray_bitflips);
 
-	bitarray_to_list(best_first_bytes[0], candidates_bitarray, candidates->states[odd_even], &(candidates->len[odd_even]), odd_even);
+    bitarray_to_list(best_first_bytes[0], candidates_bitarray, candidates->states[odd_even], &(candidates->len[odd_even]), odd_even);
 
-	if (candidates->len[odd_even] == 0) {
-		free(candidates->states[odd_even]);
-		candidates->states[odd_even] = NULL;
-	} else if (candidates->len[odd_even] + 1 < worstcase_size) {
-		candidates->states[odd_even] = realloc(candidates->states[odd_even], sizeof(uint32_t) * (candidates->len[odd_even] + 1));
-	}
-	free_bitarray(candidates_bitarray);
+    if (candidates->len[odd_even] == 0) {
+        free(candidates->states[odd_even]);
+        candidates->states[odd_even] = NULL;
+    } else if (candidates->len[odd_even] + 1 < worstcase_size) {
+        candidates->states[odd_even] = realloc(candidates->states[odd_even], sizeof(uint32_t) * (candidates->len[odd_even] + 1));
+    }
+    free_bitarray(candidates_bitarray);
 
-	pthread_mutex_lock(&statelist_cache_mutex);
-	sl_cache[part_sum_a0/2][part_sum_a8/2][odd_even].sl = candidates->states[odd_even];
-	sl_cache[part_sum_a0/2][part_sum_a8/2][odd_even].len = candidates->len[odd_even];
-	sl_cache[part_sum_a0/2][part_sum_a8/2][odd_even].cache_status = COMPLETED;
-	pthread_mutex_unlock(&statelist_cache_mutex);
-	return;
+    pthread_mutex_lock(&statelist_cache_mutex);
+    sl_cache[part_sum_a0/2][part_sum_a8/2][odd_even].sl = candidates->states[odd_even];
+    sl_cache[part_sum_a0/2][part_sum_a8/2][odd_even].len = candidates->len[odd_even];
+    sl_cache[part_sum_a0/2][part_sum_a8/2][odd_even].cache_status = COMPLETED;
+    pthread_mutex_unlock(&statelist_cache_mutex);
+    return;
 }
 
 static statelist_t *add_more_candidates(void)
 {
-	statelist_t *new_candidates = candidates;
-	if (candidates == NULL) {
-		candidates = (statelist_t *)malloc(sizeof(statelist_t));
-		new_candidates = candidates;
-	} else {
-		new_candidates = candidates;
-		while (new_candidates->next != NULL) {
-			new_candidates = new_candidates->next;
-		}
-		new_candidates = new_candidates->next = (statelist_t *)malloc(sizeof(statelist_t));
-	}
-	new_candidates->next = NULL;
-	new_candidates->len[ODD_STATE] = 0;
-	new_candidates->len[EVEN_STATE] = 0;
-	new_candidates->states[ODD_STATE] = NULL;
-	new_candidates->states[EVEN_STATE] = NULL;
-	return new_candidates;
+    statelist_t *new_candidates = candidates;
+    if (candidates == NULL) {
+        candidates = (statelist_t *)malloc(sizeof(statelist_t));
+        new_candidates = candidates;
+    } else {
+        new_candidates = candidates;
+        while (new_candidates->next != NULL) {
+            new_candidates = new_candidates->next;
+        }
+        new_candidates = new_candidates->next = (statelist_t *)malloc(sizeof(statelist_t));
+    }
+    new_candidates->next = NULL;
+    new_candidates->len[ODD_STATE] = 0;
+    new_candidates->len[EVEN_STATE] = 0;
+    new_candidates->states[ODD_STATE] = NULL;
+    new_candidates->states[EVEN_STATE] = NULL;
+    return new_candidates;
 }
 
 
 static void add_bitflip_candidates(uint8_t byte)
 {
-	statelist_t *candidates = add_more_candidates();
+    statelist_t *candidates = add_more_candidates();
 
-	for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
-		uint32_t worstcase_size = nonces[byte].num_states_bitarray[odd_even] + 1;
-		candidates->states[odd_even] = (uint32_t *)malloc(sizeof(uint32_t) * worstcase_size);
-		if (candidates->states[odd_even] == NULL) {
-			PrintAndLogEx(WARNING, "Out of memory error in add_bitflip_candidates().\n");
-			exit(4);
-		}
+    for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
+        uint32_t worstcase_size = nonces[byte].num_states_bitarray[odd_even] + 1;
+        candidates->states[odd_even] = (uint32_t *)malloc(sizeof(uint32_t) * worstcase_size);
+        if (candidates->states[odd_even] == NULL) {
+            PrintAndLogEx(WARNING, "Out of memory error in add_bitflip_candidates().\n");
+            exit(4);
+        }
 
-		bitarray_to_list(byte, nonces[byte].states_bitarray[odd_even], candidates->states[odd_even], &(candidates->len[odd_even]), odd_even);
+        bitarray_to_list(byte, nonces[byte].states_bitarray[odd_even], candidates->states[odd_even], &(candidates->len[odd_even]), odd_even);
 
-		if (candidates->len[odd_even] + 1 < worstcase_size) {
-			candidates->states[odd_even] = realloc(candidates->states[odd_even], sizeof(uint32_t) * (candidates->len[odd_even] + 1));
-		}
-	}
-	return;
+        if (candidates->len[odd_even] + 1 < worstcase_size) {
+            candidates->states[odd_even] = realloc(candidates->states[odd_even], sizeof(uint32_t) * (candidates->len[odd_even] + 1));
+        }
+    }
+    return;
 }
 
 
 static bool TestIfKeyExists(uint64_t key)
 {
-	struct Crypto1State *pcs;
-	pcs = crypto1_create(key);
-	crypto1_byte(pcs, (cuid >> 24) ^ best_first_bytes[0], true);
+    struct Crypto1State *pcs;
+    pcs = crypto1_create(key);
+    crypto1_byte(pcs, (cuid >> 24) ^ best_first_bytes[0], true);
 
-	uint32_t state_odd = pcs->odd & 0x00ffffff;
-	uint32_t state_even = pcs->even & 0x00ffffff;
+    uint32_t state_odd = pcs->odd & 0x00ffffff;
+    uint32_t state_even = pcs->even & 0x00ffffff;
 
-	uint64_t count = 0;
-	for (statelist_t *p = candidates; p != NULL; p = p->next) {
-		bool found_odd = false;
-		bool found_even = false;
-		uint32_t *p_odd = p->states[ODD_STATE];
-		uint32_t *p_even = p->states[EVEN_STATE];
-		if (p_odd != NULL && p_even != NULL) {
-			while (*p_odd != 0xffffffff) {
-				if ((*p_odd & 0x00ffffff) == state_odd) {
-					found_odd = true;
-					break;
-				}
-				p_odd++;
-			}
-			while (*p_even != 0xffffffff) {
-				if ((*p_even & 0x00ffffff) == state_even) {
-					found_even = true;
-				}
-				p_even++;
-			}
-			count += (uint64_t)(p_odd - p->states[ODD_STATE]) * (uint64_t)(p_even - p->states[EVEN_STATE]);
-		}
-		if (found_odd && found_even) {
-			num_keys_tested += count;
-			hardnested_print_progress(num_acquired_nonces, "(Test: Key found)", 0.0, 0);
-			crypto1_destroy(pcs);
-			return true;
-		}
-	}
+    uint64_t count = 0;
+    for (statelist_t *p = candidates; p != NULL; p = p->next) {
+        bool found_odd = false;
+        bool found_even = false;
+        uint32_t *p_odd = p->states[ODD_STATE];
+        uint32_t *p_even = p->states[EVEN_STATE];
+        if (p_odd != NULL && p_even != NULL) {
+            while (*p_odd != 0xffffffff) {
+                if ((*p_odd & 0x00ffffff) == state_odd) {
+                    found_odd = true;
+                    break;
+                }
+                p_odd++;
+            }
+            while (*p_even != 0xffffffff) {
+                if ((*p_even & 0x00ffffff) == state_even) {
+                    found_even = true;
+                }
+                p_even++;
+            }
+            count += (uint64_t)(p_odd - p->states[ODD_STATE]) * (uint64_t)(p_even - p->states[EVEN_STATE]);
+        }
+        if (found_odd && found_even) {
+            num_keys_tested += count;
+            hardnested_print_progress(num_acquired_nonces, "(Test: Key found)", 0.0, 0);
+            crypto1_destroy(pcs);
+            return true;
+        }
+    }
 
-	num_keys_tested += count;
-	hardnested_print_progress(num_acquired_nonces, "(Test: Key NOT found)", 0.0, 0);
+    num_keys_tested += count;
+    hardnested_print_progress(num_acquired_nonces, "(Test: Key NOT found)", 0.0, 0);
 
-	crypto1_destroy(pcs);
-	return false;
+    crypto1_destroy(pcs);
+    return false;
 }
 
 
@@ -1887,15 +1887,15 @@ static work_status_t book_of_work[NUM_PART_SUMS][NUM_PART_SUMS][NUM_PART_SUMS][N
 
 static void init_book_of_work(void)
 {
-	for (uint8_t p = 0; p < NUM_PART_SUMS; p++) {
-		for (uint8_t q = 0; q < NUM_PART_SUMS; q++) {
-			for (uint8_t r = 0; r < NUM_PART_SUMS; r++) {
-				for (uint8_t s = 0; s < NUM_PART_SUMS; s++) {
-					book_of_work[p][q][r][s] = TO_BE_DONE;
-				}
-			}
-		}
-	}
+    for (uint8_t p = 0; p < NUM_PART_SUMS; p++) {
+        for (uint8_t q = 0; q < NUM_PART_SUMS; q++) {
+            for (uint8_t r = 0; r < NUM_PART_SUMS; r++) {
+                for (uint8_t s = 0; s < NUM_PART_SUMS; s++) {
+                    book_of_work[p][q][r][s] = TO_BE_DONE;
+                }
+            }
+        }
+    }
 }
 
 static void
@@ -1906,283 +1906,283 @@ __attribute__((force_align_arg_pointer))
 #endif
 *generate_candidates_worker_thread(void *args)
 {
-	uint16_t *sum_args = (uint16_t *)args;
-	uint16_t sum_a0 = sums[sum_args[0]];
-	uint16_t sum_a8 = sums[sum_args[1]];
-	// uint16_t my_thread_number = sums[2];
+    uint16_t *sum_args = (uint16_t *)args;
+    uint16_t sum_a0 = sums[sum_args[0]];
+    uint16_t sum_a8 = sums[sum_args[1]];
+    // uint16_t my_thread_number = sums[2];
 
-	bool there_might_be_more_work = true;
-	do {
-		there_might_be_more_work = false;
-		for (uint8_t p = 0; p < NUM_PART_SUMS; p++) {
-			for (uint8_t q = 0; q < NUM_PART_SUMS; q++) {
-				if (2*p*(16-2*q) + (16-2*p)*2*q == sum_a0) {
-					// PrintAndLogEx(NORMAL, "Reducing Partial Statelists (p,q) = (%d,%d) with lengths %d, %d\n",
-							// p, q, partial_statelist[p].len[ODD_STATE], partial_statelist[q].len[EVEN_STATE]);
-					for (uint8_t r = 0; r < NUM_PART_SUMS; r++) {
-						for (uint8_t s = 0; s < NUM_PART_SUMS; s++) {
-							if (2*r*(16-2*s) + (16-2*r)*2*s == sum_a8) {
-								pthread_mutex_lock(&book_of_work_mutex);
-								if (book_of_work[p][q][r][s] != TO_BE_DONE) {  // this has been done or is currently been done by another thread. Look for some other work.
-									pthread_mutex_unlock(&book_of_work_mutex);
-									continue;
-								}
+    bool there_might_be_more_work = true;
+    do {
+        there_might_be_more_work = false;
+        for (uint8_t p = 0; p < NUM_PART_SUMS; p++) {
+            for (uint8_t q = 0; q < NUM_PART_SUMS; q++) {
+                if (2*p*(16-2*q) + (16-2*p)*2*q == sum_a0) {
+                    // PrintAndLogEx(NORMAL, "Reducing Partial Statelists (p,q) = (%d,%d) with lengths %d, %d\n",
+                            // p, q, partial_statelist[p].len[ODD_STATE], partial_statelist[q].len[EVEN_STATE]);
+                    for (uint8_t r = 0; r < NUM_PART_SUMS; r++) {
+                        for (uint8_t s = 0; s < NUM_PART_SUMS; s++) {
+                            if (2*r*(16-2*s) + (16-2*r)*2*s == sum_a8) {
+                                pthread_mutex_lock(&book_of_work_mutex);
+                                if (book_of_work[p][q][r][s] != TO_BE_DONE) {  // this has been done or is currently been done by another thread. Look for some other work.
+                                    pthread_mutex_unlock(&book_of_work_mutex);
+                                    continue;
+                                }
 
-								pthread_mutex_lock(&statelist_cache_mutex);
-								if (sl_cache[p][r][ODD_STATE].cache_status == WORK_IN_PROGRESS
-									|| sl_cache[q][s][EVEN_STATE].cache_status == WORK_IN_PROGRESS) { // defer until not blocked by another thread.
-									pthread_mutex_unlock(&statelist_cache_mutex);
-									pthread_mutex_unlock(&book_of_work_mutex);
-									there_might_be_more_work = true;
-									continue;
-								}
+                                pthread_mutex_lock(&statelist_cache_mutex);
+                                if (sl_cache[p][r][ODD_STATE].cache_status == WORK_IN_PROGRESS
+                                    || sl_cache[q][s][EVEN_STATE].cache_status == WORK_IN_PROGRESS) { // defer until not blocked by another thread.
+                                    pthread_mutex_unlock(&statelist_cache_mutex);
+                                    pthread_mutex_unlock(&book_of_work_mutex);
+                                    there_might_be_more_work = true;
+                                    continue;
+                                }
 
-								// we finally can do some work.
-								book_of_work[p][q][r][s] = WORK_IN_PROGRESS;
-								statelist_t *current_candidates = add_more_candidates();
+                                // we finally can do some work.
+                                book_of_work[p][q][r][s] = WORK_IN_PROGRESS;
+                                statelist_t *current_candidates = add_more_candidates();
 
-								// Check for cached results and add them first
-								bool odd_completed = false;
-								if (sl_cache[p][r][ODD_STATE].cache_status == COMPLETED) {
-									add_cached_states(current_candidates, 2*p, 2*r, ODD_STATE);
-									odd_completed = true;
-								}
-								bool even_completed = false;
-								if (sl_cache[q][s][EVEN_STATE].cache_status == COMPLETED) {
-									add_cached_states(current_candidates, 2*q, 2*s, EVEN_STATE);
-									even_completed = true;
-								}
+                                // Check for cached results and add them first
+                                bool odd_completed = false;
+                                if (sl_cache[p][r][ODD_STATE].cache_status == COMPLETED) {
+                                    add_cached_states(current_candidates, 2*p, 2*r, ODD_STATE);
+                                    odd_completed = true;
+                                }
+                                bool even_completed = false;
+                                if (sl_cache[q][s][EVEN_STATE].cache_status == COMPLETED) {
+                                    add_cached_states(current_candidates, 2*q, 2*s, EVEN_STATE);
+                                    even_completed = true;
+                                }
 
-								bool work_required = true;
+                                bool work_required = true;
 
-								// if there had been two cached results, there is no more work to do
-								if (even_completed && odd_completed) {
-									work_required = false;
-								}
+                                // if there had been two cached results, there is no more work to do
+                                if (even_completed && odd_completed) {
+                                    work_required = false;
+                                }
 
-								// if there had been one cached empty result, there is no need to calculate the other part:
-								if (work_required) {
-									if (even_completed && !current_candidates->len[EVEN_STATE]) {
-										current_candidates->len[ODD_STATE] = 0;
-										current_candidates->states[ODD_STATE] = NULL;
-										work_required = false;
-									}
-									if (odd_completed && !current_candidates->len[ODD_STATE]) {
-										current_candidates->len[EVEN_STATE] = 0;
-										current_candidates->states[EVEN_STATE] = NULL;
-										work_required = false;
-									}
-								}
+                                // if there had been one cached empty result, there is no need to calculate the other part:
+                                if (work_required) {
+                                    if (even_completed && !current_candidates->len[EVEN_STATE]) {
+                                        current_candidates->len[ODD_STATE] = 0;
+                                        current_candidates->states[ODD_STATE] = NULL;
+                                        work_required = false;
+                                    }
+                                    if (odd_completed && !current_candidates->len[ODD_STATE]) {
+                                        current_candidates->len[EVEN_STATE] = 0;
+                                        current_candidates->states[EVEN_STATE] = NULL;
+                                        work_required = false;
+                                    }
+                                }
 
-								if (!work_required) {
-									pthread_mutex_unlock(&statelist_cache_mutex);
-									pthread_mutex_unlock(&book_of_work_mutex);
-								} else {
-									// we really need to calculate something
-									if (even_completed) { // we had one cache hit with non-zero even states
-										// PrintAndLogEx(NORMAL, "Thread #%u: start working on  odd states p=%2d, r=%2d...\n", my_thread_number, p, r);
-										sl_cache[p][r][ODD_STATE].cache_status = WORK_IN_PROGRESS;
-										pthread_mutex_unlock(&statelist_cache_mutex);
-										pthread_mutex_unlock(&book_of_work_mutex);
-										add_matching_states(current_candidates, 2*p, 2*r, ODD_STATE);
-										work_required = false;
-									} else if (odd_completed) { // we had one cache hit with non-zero odd_states
-										// PrintAndLogEx(NORMAL, "Thread #%u: start working on even states q=%2d, s=%2d...\n", my_thread_number, q, s);
-										sl_cache[q][s][EVEN_STATE].cache_status = WORK_IN_PROGRESS;
-										pthread_mutex_unlock(&statelist_cache_mutex);
-										pthread_mutex_unlock(&book_of_work_mutex);
-										add_matching_states(current_candidates, 2*q, 2*s, EVEN_STATE);
-										work_required = false;
-									}
-								}
+                                if (!work_required) {
+                                    pthread_mutex_unlock(&statelist_cache_mutex);
+                                    pthread_mutex_unlock(&book_of_work_mutex);
+                                } else {
+                                    // we really need to calculate something
+                                    if (even_completed) { // we had one cache hit with non-zero even states
+                                        // PrintAndLogEx(NORMAL, "Thread #%u: start working on  odd states p=%2d, r=%2d...\n", my_thread_number, p, r);
+                                        sl_cache[p][r][ODD_STATE].cache_status = WORK_IN_PROGRESS;
+                                        pthread_mutex_unlock(&statelist_cache_mutex);
+                                        pthread_mutex_unlock(&book_of_work_mutex);
+                                        add_matching_states(current_candidates, 2*p, 2*r, ODD_STATE);
+                                        work_required = false;
+                                    } else if (odd_completed) { // we had one cache hit with non-zero odd_states
+                                        // PrintAndLogEx(NORMAL, "Thread #%u: start working on even states q=%2d, s=%2d...\n", my_thread_number, q, s);
+                                        sl_cache[q][s][EVEN_STATE].cache_status = WORK_IN_PROGRESS;
+                                        pthread_mutex_unlock(&statelist_cache_mutex);
+                                        pthread_mutex_unlock(&book_of_work_mutex);
+                                        add_matching_states(current_candidates, 2*q, 2*s, EVEN_STATE);
+                                        work_required = false;
+                                    }
+                                }
 
-								if (work_required) { // we had no cached result. Need to calculate both odd and even
-									sl_cache[p][r][ODD_STATE].cache_status = WORK_IN_PROGRESS;
-									sl_cache[q][s][EVEN_STATE].cache_status = WORK_IN_PROGRESS;
-									pthread_mutex_unlock(&statelist_cache_mutex);
-									pthread_mutex_unlock(&book_of_work_mutex);
+                                if (work_required) { // we had no cached result. Need to calculate both odd and even
+                                    sl_cache[p][r][ODD_STATE].cache_status = WORK_IN_PROGRESS;
+                                    sl_cache[q][s][EVEN_STATE].cache_status = WORK_IN_PROGRESS;
+                                    pthread_mutex_unlock(&statelist_cache_mutex);
+                                    pthread_mutex_unlock(&book_of_work_mutex);
 
-									add_matching_states(current_candidates, 2*p, 2*r, ODD_STATE);
-									if(current_candidates->len[ODD_STATE]) {
-										// PrintAndLogEx(NORMAL, "Thread #%u: start working on even states q=%2d, s=%2d...\n", my_thread_number, q, s);
-										add_matching_states(current_candidates, 2*q, 2*s, EVEN_STATE);
-									} else { // no need to calculate even states yet
-										pthread_mutex_lock(&statelist_cache_mutex);
-										sl_cache[q][s][EVEN_STATE].cache_status = TO_BE_DONE;
-										pthread_mutex_unlock(&statelist_cache_mutex);
-										current_candidates->len[EVEN_STATE] = 0;
-										current_candidates->states[EVEN_STATE] = NULL;
-									}
-								}
+                                    add_matching_states(current_candidates, 2*p, 2*r, ODD_STATE);
+                                    if(current_candidates->len[ODD_STATE]) {
+                                        // PrintAndLogEx(NORMAL, "Thread #%u: start working on even states q=%2d, s=%2d...\n", my_thread_number, q, s);
+                                        add_matching_states(current_candidates, 2*q, 2*s, EVEN_STATE);
+                                    } else { // no need to calculate even states yet
+                                        pthread_mutex_lock(&statelist_cache_mutex);
+                                        sl_cache[q][s][EVEN_STATE].cache_status = TO_BE_DONE;
+                                        pthread_mutex_unlock(&statelist_cache_mutex);
+                                        current_candidates->len[EVEN_STATE] = 0;
+                                        current_candidates->states[EVEN_STATE] = NULL;
+                                    }
+                                }
 
-								// update book of work
-								pthread_mutex_lock(&book_of_work_mutex);
-								book_of_work[p][q][r][s] = COMPLETED;
-								pthread_mutex_unlock(&book_of_work_mutex);
+                                // update book of work
+                                pthread_mutex_lock(&book_of_work_mutex);
+                                book_of_work[p][q][r][s] = COMPLETED;
+                                pthread_mutex_unlock(&book_of_work_mutex);
 
-								// if ((uint64_t)current_candidates->len[ODD_STATE] * current_candidates->len[EVEN_STATE]) {
-									// PrintAndLogEx(NORMAL, "Candidates for p=%2u, q=%2u, r=%2u, s=%2u: %" PRIu32 " * %" PRIu32 " = %" PRIu64 " (2^%0.1f)\n",
-										// 2*p, 2*q, 2*r, 2*s, current_candidates->len[ODD_STATE], current_candidates->len[EVEN_STATE],
-										// (uint64_t)current_candidates->len[ODD_STATE] * current_candidates->len[EVEN_STATE],
-										// log((uint64_t)current_candidates->len[ODD_STATE] * current_candidates->len[EVEN_STATE])/log(2));
-									// uint32_t estimated_odd = estimated_num_states_part_sum(best_first_bytes[0], p, r, ODD_STATE);
-									// uint32_t estimated_even= estimated_num_states_part_sum(best_first_bytes[0], q, s, EVEN_STATE);
-									// uint64_t estimated_total = (uint64_t)estimated_odd * estimated_even;
-									// PrintAndLogEx(NORMAL, "Estimated: %" PRIu32 " * %" PRIu32 " = %" PRIu64 " (2^%0.1f)\n", estimated_odd, estimated_even, estimated_total, log(estimated_total) / log(2));
-									// if (estimated_odd < current_candidates->len[ODD_STATE] || estimated_even < current_candidates->len[EVEN_STATE]) {
-										// PrintAndLogEx(NORMAL, "############################################################################ERROR! ESTIMATED < REAL !!!\n");
-										// //exit(2);
-										// }
-								// }
-							}
-						}
-					}
-				}
-			}
-		}
-	} while (there_might_be_more_work);
+                                // if ((uint64_t)current_candidates->len[ODD_STATE] * current_candidates->len[EVEN_STATE]) {
+                                    // PrintAndLogEx(NORMAL, "Candidates for p=%2u, q=%2u, r=%2u, s=%2u: %" PRIu32 " * %" PRIu32 " = %" PRIu64 " (2^%0.1f)\n",
+                                        // 2*p, 2*q, 2*r, 2*s, current_candidates->len[ODD_STATE], current_candidates->len[EVEN_STATE],
+                                        // (uint64_t)current_candidates->len[ODD_STATE] * current_candidates->len[EVEN_STATE],
+                                        // log((uint64_t)current_candidates->len[ODD_STATE] * current_candidates->len[EVEN_STATE])/log(2));
+                                    // uint32_t estimated_odd = estimated_num_states_part_sum(best_first_bytes[0], p, r, ODD_STATE);
+                                    // uint32_t estimated_even= estimated_num_states_part_sum(best_first_bytes[0], q, s, EVEN_STATE);
+                                    // uint64_t estimated_total = (uint64_t)estimated_odd * estimated_even;
+                                    // PrintAndLogEx(NORMAL, "Estimated: %" PRIu32 " * %" PRIu32 " = %" PRIu64 " (2^%0.1f)\n", estimated_odd, estimated_even, estimated_total, log(estimated_total) / log(2));
+                                    // if (estimated_odd < current_candidates->len[ODD_STATE] || estimated_even < current_candidates->len[EVEN_STATE]) {
+                                        // PrintAndLogEx(NORMAL, "############################################################################ERROR! ESTIMATED < REAL !!!\n");
+                                        // //exit(2);
+                                        // }
+                                // }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    } while (there_might_be_more_work);
 
-	return NULL;
+    return NULL;
 }
 
 
 static void generate_candidates(uint8_t sum_a0_idx, uint8_t sum_a8_idx)
 {
 
-	init_statelist_cache();
-	init_book_of_work();
+    init_statelist_cache();
+    init_book_of_work();
 
-	// create mutexes for accessing the statelist cache and our "book of work"
-	pthread_mutex_init(&statelist_cache_mutex, NULL);
-	pthread_mutex_init(&book_of_work_mutex, NULL);
+    // create mutexes for accessing the statelist cache and our "book of work"
+    pthread_mutex_init(&statelist_cache_mutex, NULL);
+    pthread_mutex_init(&book_of_work_mutex, NULL);
 
-	// create and run worker threads
-	pthread_t thread_id[NUM_REDUCTION_WORKING_THREADS];
+    // create and run worker threads
+    pthread_t thread_id[NUM_REDUCTION_WORKING_THREADS];
 
-	uint16_t sums[NUM_REDUCTION_WORKING_THREADS][3];
-	for (uint16_t i = 0; i < NUM_REDUCTION_WORKING_THREADS; i++) {
-		sums[i][0] = sum_a0_idx;
-		sums[i][1] = sum_a8_idx;
-		sums[i][2] = i+1;
-		pthread_create(thread_id + i, NULL, generate_candidates_worker_thread, sums[i]);
-	}
+    uint16_t sums[NUM_REDUCTION_WORKING_THREADS][3];
+    for (uint16_t i = 0; i < NUM_REDUCTION_WORKING_THREADS; i++) {
+        sums[i][0] = sum_a0_idx;
+        sums[i][1] = sum_a8_idx;
+        sums[i][2] = i+1;
+        pthread_create(thread_id + i, NULL, generate_candidates_worker_thread, sums[i]);
+    }
 
-	// wait for threads to terminate:
-	for (uint16_t i = 0; i < NUM_REDUCTION_WORKING_THREADS; i++) {
-		pthread_join(thread_id[i], NULL);
-	}
+    // wait for threads to terminate:
+    for (uint16_t i = 0; i < NUM_REDUCTION_WORKING_THREADS; i++) {
+        pthread_join(thread_id[i], NULL);
+    }
 
-	// clean up mutex
-	pthread_mutex_destroy(&statelist_cache_mutex);
+    // clean up mutex
+    pthread_mutex_destroy(&statelist_cache_mutex);
 
-	maximum_states = 0;
-	for (statelist_t *sl = candidates; sl != NULL; sl = sl->next) {
-		maximum_states += (uint64_t)sl->len[ODD_STATE] * sl->len[EVEN_STATE];
-	}
+    maximum_states = 0;
+    for (statelist_t *sl = candidates; sl != NULL; sl = sl->next) {
+        maximum_states += (uint64_t)sl->len[ODD_STATE] * sl->len[EVEN_STATE];
+    }
 
-	for (uint8_t i = 0; i < NUM_SUMS; i++) {
-		if (nonces[best_first_bytes[0]].sum_a8_guess[i].sum_a8_idx == sum_a8_idx) {
-			nonces[best_first_bytes[0]].sum_a8_guess[i].num_states = maximum_states;
-			break;
-		}
-	}
-	update_expected_brute_force(best_first_bytes[0]);
+    for (uint8_t i = 0; i < NUM_SUMS; i++) {
+        if (nonces[best_first_bytes[0]].sum_a8_guess[i].sum_a8_idx == sum_a8_idx) {
+            nonces[best_first_bytes[0]].sum_a8_guess[i].num_states = maximum_states;
+            break;
+        }
+    }
+    update_expected_brute_force(best_first_bytes[0]);
 
-	hardnested_print_progress(num_acquired_nonces, "Apply Sum(a8) and all bytes bitflip properties", nonces[best_first_bytes[0]].expected_num_brute_force, 0);
+    hardnested_print_progress(num_acquired_nonces, "Apply Sum(a8) and all bytes bitflip properties", nonces[best_first_bytes[0]].expected_num_brute_force, 0);
 }
 
 
-static void	free_candidates_memory(statelist_t *sl)
+static void free_candidates_memory(statelist_t *sl)
 {
-	if (sl == NULL)
-		return;
+    if (sl == NULL)
+        return;
 
-	free_candidates_memory(sl->next);
-	free(sl);
+    free_candidates_memory(sl->next);
+    free(sl);
 }
 
 
 static void pre_XOR_nonces(void)
 {
-	// prepare acquired nonces for faster brute forcing.
+    // prepare acquired nonces for faster brute forcing.
 
-	// XOR the cryptoUID and its parity
-	for (uint16_t i = 0; i < 256; i++) {
-		noncelistentry_t *test_nonce = nonces[i].first;
-		while (test_nonce != NULL) {
-			test_nonce->nonce_enc ^= cuid;
-			test_nonce->par_enc ^= oddparity8(cuid >>  0 & 0xff) << 0;
-			test_nonce->par_enc ^= oddparity8(cuid >>  8 & 0xff) << 1;
-			test_nonce->par_enc ^= oddparity8(cuid >> 16 & 0xff) << 2;
-			test_nonce->par_enc ^= oddparity8(cuid >> 24 & 0xff) << 3;
-			test_nonce = test_nonce->next;
-		}
-	}
+    // XOR the cryptoUID and its parity
+    for (uint16_t i = 0; i < 256; i++) {
+        noncelistentry_t *test_nonce = nonces[i].first;
+        while (test_nonce != NULL) {
+            test_nonce->nonce_enc ^= cuid;
+            test_nonce->par_enc ^= oddparity8(cuid >>  0 & 0xff) << 0;
+            test_nonce->par_enc ^= oddparity8(cuid >>  8 & 0xff) << 1;
+            test_nonce->par_enc ^= oddparity8(cuid >> 16 & 0xff) << 2;
+            test_nonce->par_enc ^= oddparity8(cuid >> 24 & 0xff) << 3;
+            test_nonce = test_nonce->next;
+        }
+    }
 }
 
 static bool brute_force(uint64_t *found_key)
 {
-	if (known_target_key != -1) {
-		TestIfKeyExists(known_target_key);
-	}
-	return brute_force_bs(NULL, candidates, cuid, num_acquired_nonces, maximum_states, nonces, best_first_bytes, found_key);
+    if (known_target_key != -1) {
+        TestIfKeyExists(known_target_key);
+    }
+    return brute_force_bs(NULL, candidates, cuid, num_acquired_nonces, maximum_states, nonces, best_first_bytes, found_key);
 }
 
 static uint16_t SumProperty(struct Crypto1State *s)
 {
-	uint16_t sum_odd = PartialSumProperty(s->odd, ODD_STATE);
-	uint16_t sum_even = PartialSumProperty(s->even, EVEN_STATE);
-	return (sum_odd*(16-sum_even) + (16-sum_odd)*sum_even);
+    uint16_t sum_odd = PartialSumProperty(s->odd, ODD_STATE);
+    uint16_t sum_even = PartialSumProperty(s->even, EVEN_STATE);
+    return (sum_odd*(16-sum_even) + (16-sum_odd)*sum_even);
 }
 
 
 static void Tests()
 {
-	if (known_target_key != -1) {
-		for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
-			uint32_t *bitset = nonces[best_first_bytes[0]].states_bitarray[odd_even];
-			if (!test_bit24(bitset, test_state[odd_even])) {
-				PrintAndLogEx(NORMAL, "\nBUG: known target key's %s state is not member of first nonce byte's (0x%02x) states_bitarray!\n",
-					odd_even==EVEN_STATE?"even":"odd ",
-					best_first_bytes[0]);
-			}
-		}
-	}
+    if (known_target_key != -1) {
+        for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
+            uint32_t *bitset = nonces[best_first_bytes[0]].states_bitarray[odd_even];
+            if (!test_bit24(bitset, test_state[odd_even])) {
+                PrintAndLogEx(NORMAL, "\nBUG: known target key's %s state is not member of first nonce byte's (0x%02x) states_bitarray!\n",
+                    odd_even==EVEN_STATE?"even":"odd ",
+                    best_first_bytes[0]);
+            }
+        }
+    }
 
-	if (known_target_key != -1) {
-		for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
-			uint32_t *bitset = all_bitflips_bitarray[odd_even];
-			if (!test_bit24(bitset, test_state[odd_even])) {
-				PrintAndLogEx(NORMAL, "\nBUG: known target key's %s state is not member of all_bitflips_bitarray!\n",
-					odd_even==EVEN_STATE?"even":"odd ");
-			}
-		}
-	}
+    if (known_target_key != -1) {
+        for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
+            uint32_t *bitset = all_bitflips_bitarray[odd_even];
+            if (!test_bit24(bitset, test_state[odd_even])) {
+                PrintAndLogEx(NORMAL, "\nBUG: known target key's %s state is not member of all_bitflips_bitarray!\n",
+                    odd_even==EVEN_STATE?"even":"odd ");
+            }
+        }
+    }
 }
 
 
 static void Tests2(void)
 {
-	if (known_target_key != -1) {
-		for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
-			uint32_t *bitset = nonces[best_first_byte_smallest_bitarray].states_bitarray[odd_even];
-			if (!test_bit24(bitset, test_state[odd_even])) {
-				PrintAndLogEx(NORMAL, "\nBUG: known target key's %s state is not member of first nonce byte's (0x%02x) states_bitarray!\n",
-					odd_even==EVEN_STATE?"even":"odd ",
-					best_first_byte_smallest_bitarray);
-			}
-		}
-	}
+    if (known_target_key != -1) {
+        for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
+            uint32_t *bitset = nonces[best_first_byte_smallest_bitarray].states_bitarray[odd_even];
+            if (!test_bit24(bitset, test_state[odd_even])) {
+                PrintAndLogEx(NORMAL, "\nBUG: known target key's %s state is not member of first nonce byte's (0x%02x) states_bitarray!\n",
+                    odd_even==EVEN_STATE?"even":"odd ",
+                    best_first_byte_smallest_bitarray);
+            }
+        }
+    }
 
-	if (known_target_key != -1) {
-		for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
-			uint32_t *bitset = all_bitflips_bitarray[odd_even];
-			if (!test_bit24(bitset, test_state[odd_even])) {
-				PrintAndLogEx(NORMAL, "\nBUG: known target key's %s state is not member of all_bitflips_bitarray!\n",
-					odd_even==EVEN_STATE?"even":"odd ");
-			}
-		}
-	}
+    if (known_target_key != -1) {
+        for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
+            uint32_t *bitset = all_bitflips_bitarray[odd_even];
+            if (!test_bit24(bitset, test_state[odd_even])) {
+                PrintAndLogEx(NORMAL, "\nBUG: known target key's %s state is not member of all_bitflips_bitarray!\n",
+                    odd_even==EVEN_STATE?"even":"odd ");
+            }
+        }
+    }
 
 }
 
@@ -2191,251 +2191,251 @@ static uint16_t real_sum_a8 = 0;
 
 static void set_test_state(uint8_t byte)
 {
-	struct Crypto1State *pcs;
-	pcs = crypto1_create(known_target_key);
-	crypto1_byte(pcs, (cuid >> 24) ^ byte, true);
-	test_state[ODD_STATE] = pcs->odd & 0x00ffffff;
-	test_state[EVEN_STATE] = pcs->even & 0x00ffffff;
-	real_sum_a8 = SumProperty(pcs);
-	crypto1_destroy(pcs);
+    struct Crypto1State *pcs;
+    pcs = crypto1_create(known_target_key);
+    crypto1_byte(pcs, (cuid >> 24) ^ byte, true);
+    test_state[ODD_STATE] = pcs->odd & 0x00ffffff;
+    test_state[EVEN_STATE] = pcs->even & 0x00ffffff;
+    real_sum_a8 = SumProperty(pcs);
+    crypto1_destroy(pcs);
 }
 
 
 int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t *trgkey, bool nonce_file_read, bool nonce_file_write, bool slow, int tests, uint64_t *foundkey, char *filename)
 {
-	char progress_text[80];
-	char instr_set[12] = {0};
+    char progress_text[80];
+    char instr_set[12] = {0};
 
-	get_SIMD_instruction_set(instr_set);
-	PrintAndLogEx(SUCCESS,"Using %s SIMD core.", instr_set);
+    get_SIMD_instruction_set(instr_set);
+    PrintAndLogEx(SUCCESS,"Using %s SIMD core.", instr_set);
 
-	srand((unsigned) time(NULL));
-	brute_force_per_second = brute_force_benchmark();
-	write_stats = false;
+    srand((unsigned) time(NULL));
+    brute_force_per_second = brute_force_benchmark();
+    write_stats = false;
 
-	if (tests) {
-		// set the correct locale for the stats printing
-		write_stats = true;
-		setlocale(LC_NUMERIC, "");
-		if ((fstats = fopen("hardnested_stats.txt","a")) == NULL) {
-			PrintAndLogEx(WARNING, "Could not create/open file hardnested_stats.txt");
-			return 3;
-		}
+    if (tests) {
+        // set the correct locale for the stats printing
+        write_stats = true;
+        setlocale(LC_NUMERIC, "");
+        if ((fstats = fopen("hardnested_stats.txt","a")) == NULL) {
+            PrintAndLogEx(WARNING, "Could not create/open file hardnested_stats.txt");
+            return 3;
+        }
 
-		for (uint32_t i = 0; i < tests; i++) {
-			start_time = msclock();
-			print_progress_header();
-			sprintf(progress_text, "Brute force benchmark: %1.0f million (2^%1.1f) keys/s", brute_force_per_second/1000000, log(brute_force_per_second)/log(2.0));
-			hardnested_print_progress(0, progress_text, (float)(1LL<<47), 0);
-			sprintf(progress_text, "Starting Test #%" PRIu32 " ...", i+1);
-			hardnested_print_progress(0, progress_text, (float)(1LL<<47), 0);
-			if (trgkey != NULL) {
-				known_target_key = bytes_to_num(trgkey, 6);
-			} else {
-				known_target_key = -1;
-			}
+        for (uint32_t i = 0; i < tests; i++) {
+            start_time = msclock();
+            print_progress_header();
+            sprintf(progress_text, "Brute force benchmark: %1.0f million (2^%1.1f) keys/s", brute_force_per_second/1000000, log(brute_force_per_second)/log(2.0));
+            hardnested_print_progress(0, progress_text, (float)(1LL<<47), 0);
+            sprintf(progress_text, "Starting Test #%" PRIu32 " ...", i+1);
+            hardnested_print_progress(0, progress_text, (float)(1LL<<47), 0);
+            if (trgkey != NULL) {
+                known_target_key = bytes_to_num(trgkey, 6);
+            } else {
+                known_target_key = -1;
+            }
 
-			init_bitflip_bitarrays();
-			init_part_sum_bitarrays();
-			init_sum_bitarrays();
-			init_allbitflips_array();
-			init_nonce_memory();
-			update_reduction_rate(0.0, true);
+            init_bitflip_bitarrays();
+            init_part_sum_bitarrays();
+            init_sum_bitarrays();
+            init_allbitflips_array();
+            init_nonce_memory();
+            update_reduction_rate(0.0, true);
 
-			simulate_acquire_nonces();
+            simulate_acquire_nonces();
 
-			set_test_state(best_first_bytes[0]);
+            set_test_state(best_first_bytes[0]);
 
-			Tests();
-			free_bitflip_bitarrays();
+            Tests();
+            free_bitflip_bitarrays();
 
-			fprintf(fstats, "%" PRIu16 ";%1.1f;", sums[first_byte_Sum], log(p_K0[first_byte_Sum])/log(2.0));
-			fprintf(fstats, "%" PRIu16 ";%1.1f;", sums[nonces[best_first_bytes[0]].sum_a8_guess[0].sum_a8_idx], log(p_K[nonces[best_first_bytes[0]].sum_a8_guess[0].sum_a8_idx])/log(2.0));
-			fprintf(fstats, "%" PRIu16 ";", real_sum_a8);
+            fprintf(fstats, "%" PRIu16 ";%1.1f;", sums[first_byte_Sum], log(p_K0[first_byte_Sum])/log(2.0));
+            fprintf(fstats, "%" PRIu16 ";%1.1f;", sums[nonces[best_first_bytes[0]].sum_a8_guess[0].sum_a8_idx], log(p_K[nonces[best_first_bytes[0]].sum_a8_guess[0].sum_a8_idx])/log(2.0));
+            fprintf(fstats, "%" PRIu16 ";", real_sum_a8);
 
 #ifdef DEBUG_KEY_ELIMINATION
-			failstr[0] = '\0';
+            failstr[0] = '\0';
 #endif
-			bool key_found = false;
-			num_keys_tested = 0;
-			uint32_t num_odd = nonces[best_first_byte_smallest_bitarray].num_states_bitarray[ODD_STATE];
-			uint32_t num_even = nonces[best_first_byte_smallest_bitarray].num_states_bitarray[EVEN_STATE];
-			float expected_brute_force1 = (float)num_odd * num_even / 2.0;
-			float expected_brute_force2 = nonces[best_first_bytes[0]].expected_num_brute_force;
-			fprintf(fstats, "%1.1f;%1.1f;", log(expected_brute_force1)/log(2.0), log(expected_brute_force2)/log(2.0));
+            bool key_found = false;
+            num_keys_tested = 0;
+            uint32_t num_odd = nonces[best_first_byte_smallest_bitarray].num_states_bitarray[ODD_STATE];
+            uint32_t num_even = nonces[best_first_byte_smallest_bitarray].num_states_bitarray[EVEN_STATE];
+            float expected_brute_force1 = (float)num_odd * num_even / 2.0;
+            float expected_brute_force2 = nonces[best_first_bytes[0]].expected_num_brute_force;
+            fprintf(fstats, "%1.1f;%1.1f;", log(expected_brute_force1)/log(2.0), log(expected_brute_force2)/log(2.0));
 
-			if (expected_brute_force1 < expected_brute_force2) {
-				hardnested_print_progress(num_acquired_nonces, "(Ignoring Sum(a8) properties)", expected_brute_force1, 0);
-				set_test_state(best_first_byte_smallest_bitarray);
-				add_bitflip_candidates(best_first_byte_smallest_bitarray);
-				Tests2();
-				maximum_states = 0;
-				for (statelist_t *sl = candidates; sl != NULL; sl = sl->next) {
-					maximum_states += (uint64_t)sl->len[ODD_STATE] * sl->len[EVEN_STATE];
-				}
+            if (expected_brute_force1 < expected_brute_force2) {
+                hardnested_print_progress(num_acquired_nonces, "(Ignoring Sum(a8) properties)", expected_brute_force1, 0);
+                set_test_state(best_first_byte_smallest_bitarray);
+                add_bitflip_candidates(best_first_byte_smallest_bitarray);
+                Tests2();
+                maximum_states = 0;
+                for (statelist_t *sl = candidates; sl != NULL; sl = sl->next) {
+                    maximum_states += (uint64_t)sl->len[ODD_STATE] * sl->len[EVEN_STATE];
+                }
 
-				best_first_bytes[0] = best_first_byte_smallest_bitarray;
-				pre_XOR_nonces();
-				prepare_bf_test_nonces(nonces, best_first_bytes[0]);
+                best_first_bytes[0] = best_first_byte_smallest_bitarray;
+                pre_XOR_nonces();
+                prepare_bf_test_nonces(nonces, best_first_bytes[0]);
 
-				key_found = brute_force(foundkey);
-				free(candidates->states[ODD_STATE]);
-				free(candidates->states[EVEN_STATE]);
-				free_candidates_memory(candidates);
-				candidates = NULL;
-			} else {
-				pre_XOR_nonces();
-				prepare_bf_test_nonces(nonces, best_first_bytes[0]);
-				for (uint8_t j = 0; j < NUM_SUMS && !key_found; j++) {
-					float expected_brute_force = nonces[best_first_bytes[0]].expected_num_brute_force;
-					sprintf(progress_text, "(%d. guess: Sum(a8) = %" PRIu16 ")", j+1, sums[nonces[best_first_bytes[0]].sum_a8_guess[j].sum_a8_idx]);
-					hardnested_print_progress(num_acquired_nonces, progress_text, expected_brute_force, 0);
-					if (sums[nonces[best_first_bytes[0]].sum_a8_guess[j].sum_a8_idx] != real_sum_a8) {
-						sprintf(progress_text, "(Estimated Sum(a8) is WRONG! Correct Sum(a8) = %" PRIu16 ")", real_sum_a8);
-						hardnested_print_progress(num_acquired_nonces, progress_text, expected_brute_force, 0);
-					}
-					generate_candidates(first_byte_Sum, nonces[best_first_bytes[0]].sum_a8_guess[j].sum_a8_idx);
+                key_found = brute_force(foundkey);
+                free(candidates->states[ODD_STATE]);
+                free(candidates->states[EVEN_STATE]);
+                free_candidates_memory(candidates);
+                candidates = NULL;
+            } else {
+                pre_XOR_nonces();
+                prepare_bf_test_nonces(nonces, best_first_bytes[0]);
+                for (uint8_t j = 0; j < NUM_SUMS && !key_found; j++) {
+                    float expected_brute_force = nonces[best_first_bytes[0]].expected_num_brute_force;
+                    sprintf(progress_text, "(%d. guess: Sum(a8) = %" PRIu16 ")", j+1, sums[nonces[best_first_bytes[0]].sum_a8_guess[j].sum_a8_idx]);
+                    hardnested_print_progress(num_acquired_nonces, progress_text, expected_brute_force, 0);
+                    if (sums[nonces[best_first_bytes[0]].sum_a8_guess[j].sum_a8_idx] != real_sum_a8) {
+                        sprintf(progress_text, "(Estimated Sum(a8) is WRONG! Correct Sum(a8) = %" PRIu16 ")", real_sum_a8);
+                        hardnested_print_progress(num_acquired_nonces, progress_text, expected_brute_force, 0);
+                    }
+                    generate_candidates(first_byte_Sum, nonces[best_first_bytes[0]].sum_a8_guess[j].sum_a8_idx);
 
-					key_found = brute_force(foundkey);
-					free_statelist_cache();
-					free_candidates_memory(candidates);
-					candidates = NULL;
-					if (!key_found) {
-						// update the statistics
-						nonces[best_first_bytes[0]].sum_a8_guess[j].prob = 0;
-						nonces[best_first_bytes[0]].sum_a8_guess[j].num_states = 0;
-						// and calculate new expected number of brute forces
-						update_expected_brute_force(best_first_bytes[0]);
-					}
-				}
-			}
-			#ifdef DEBUG_KEY_ELIMINATION
-			fprintf(fstats, "%1.1f;%1.0f;%d;%s\n", log(num_keys_tested)/log(2.0), (float)num_keys_tested/brute_force_per_second, key_found, failstr);
-			#else
-			fprintf(fstats, "%1.0f;%d\n", log(num_keys_tested)/log(2.0), (float)num_keys_tested/brute_force_per_second, key_found);
-			#endif
+                    key_found = brute_force(foundkey);
+                    free_statelist_cache();
+                    free_candidates_memory(candidates);
+                    candidates = NULL;
+                    if (!key_found) {
+                        // update the statistics
+                        nonces[best_first_bytes[0]].sum_a8_guess[j].prob = 0;
+                        nonces[best_first_bytes[0]].sum_a8_guess[j].num_states = 0;
+                        // and calculate new expected number of brute forces
+                        update_expected_brute_force(best_first_bytes[0]);
+                    }
+                }
+            }
+            #ifdef DEBUG_KEY_ELIMINATION
+            fprintf(fstats, "%1.1f;%1.0f;%d;%s\n", log(num_keys_tested)/log(2.0), (float)num_keys_tested/brute_force_per_second, key_found, failstr);
+            #else
+            fprintf(fstats, "%1.0f;%d\n", log(num_keys_tested)/log(2.0), (float)num_keys_tested/brute_force_per_second, key_found);
+            #endif
 
-			free_nonces_memory();
-			free_bitarray(all_bitflips_bitarray[ODD_STATE]);
-			free_bitarray(all_bitflips_bitarray[EVEN_STATE]);
-			free_sum_bitarrays();
-			free_part_sum_bitarrays();
-		}
-		fclose(fstats);
-	} else {
-		start_time = msclock();
-		print_progress_header();
-		sprintf(progress_text, "Brute force benchmark: %1.0f million (2^%1.1f) keys/s", brute_force_per_second/1000000, log(brute_force_per_second)/log(2.0));
-		hardnested_print_progress(0, progress_text, (float)(1LL<<47), 0);
-		init_bitflip_bitarrays();
-		init_part_sum_bitarrays();
-		init_sum_bitarrays();
-		init_allbitflips_array();
-		init_nonce_memory();
-		update_reduction_rate(0.0, true);
+            free_nonces_memory();
+            free_bitarray(all_bitflips_bitarray[ODD_STATE]);
+            free_bitarray(all_bitflips_bitarray[EVEN_STATE]);
+            free_sum_bitarrays();
+            free_part_sum_bitarrays();
+        }
+        fclose(fstats);
+    } else {
+        start_time = msclock();
+        print_progress_header();
+        sprintf(progress_text, "Brute force benchmark: %1.0f million (2^%1.1f) keys/s", brute_force_per_second/1000000, log(brute_force_per_second)/log(2.0));
+        hardnested_print_progress(0, progress_text, (float)(1LL<<47), 0);
+        init_bitflip_bitarrays();
+        init_part_sum_bitarrays();
+        init_sum_bitarrays();
+        init_allbitflips_array();
+        init_nonce_memory();
+        update_reduction_rate(0.0, true);
 
-		if (nonce_file_read) {  	// use pre-acquired data from file nonces.bin
-			if (read_nonce_file(filename) != 0) {
-				free_bitflip_bitarrays();
-				free_nonces_memory();
-				free_bitarray(all_bitflips_bitarray[ODD_STATE]);
-				free_bitarray(all_bitflips_bitarray[EVEN_STATE]);
-				free_sum_bitarrays();
-				free_part_sum_bitarrays();
-				return 3;
-			}
-			hardnested_stage = CHECK_1ST_BYTES | CHECK_2ND_BYTES;
-			update_nonce_data(false);
-			float brute_force;
-			shrink_key_space(&brute_force);
-		} else {					// acquire nonces.
-			uint16_t is_OK = acquire_nonces(blockNo, keyType, key, trgBlockNo, trgKeyType, nonce_file_write, slow, filename);
-			if (is_OK != 0) {
-				free_bitflip_bitarrays();
-				free_nonces_memory();
-				free_bitarray(all_bitflips_bitarray[ODD_STATE]);
-				free_bitarray(all_bitflips_bitarray[EVEN_STATE]);
-				free_sum_bitarrays();
-				free_part_sum_bitarrays();
+        if (nonce_file_read) {  // use pre-acquired data from file nonces.bin
+            if (read_nonce_file(filename) != 0) {
+                free_bitflip_bitarrays();
+                free_nonces_memory();
+                free_bitarray(all_bitflips_bitarray[ODD_STATE]);
+                free_bitarray(all_bitflips_bitarray[EVEN_STATE]);
+                free_sum_bitarrays();
+                free_part_sum_bitarrays();
+                return 3;
+            }
+            hardnested_stage = CHECK_1ST_BYTES | CHECK_2ND_BYTES;
+            update_nonce_data(false);
+            float brute_force;
+            shrink_key_space(&brute_force);
+        } else { // acquire nonces.
+            uint16_t is_OK = acquire_nonces(blockNo, keyType, key, trgBlockNo, trgKeyType, nonce_file_write, slow, filename);
+            if (is_OK != 0) {
+                free_bitflip_bitarrays();
+                free_nonces_memory();
+                free_bitarray(all_bitflips_bitarray[ODD_STATE]);
+                free_bitarray(all_bitflips_bitarray[EVEN_STATE]);
+                free_sum_bitarrays();
+                free_part_sum_bitarrays();
 
-				return is_OK;
-			}
-		}
+                return is_OK;
+            }
+        }
 
-		if (trgkey != NULL) {
-			known_target_key = bytes_to_num(trgkey, 6);
-			set_test_state(best_first_bytes[0]);
-		} else {
-			known_target_key = -1;
-		}
+        if (trgkey != NULL) {
+            known_target_key = bytes_to_num(trgkey, 6);
+            set_test_state(best_first_bytes[0]);
+        } else {
+            known_target_key = -1;
+        }
 
-		Tests();
+        Tests();
 
-		free_bitflip_bitarrays();
-		bool key_found = false;
-		num_keys_tested = 0;
-		uint32_t num_odd = nonces[best_first_byte_smallest_bitarray].num_states_bitarray[ODD_STATE];
-		uint32_t num_even = nonces[best_first_byte_smallest_bitarray].num_states_bitarray[EVEN_STATE];
-		float expected_brute_force1 = (float)num_odd * num_even / 2.0;
-		float expected_brute_force2 = nonces[best_first_bytes[0]].expected_num_brute_force;
+        free_bitflip_bitarrays();
+        bool key_found = false;
+        num_keys_tested = 0;
+        uint32_t num_odd = nonces[best_first_byte_smallest_bitarray].num_states_bitarray[ODD_STATE];
+        uint32_t num_even = nonces[best_first_byte_smallest_bitarray].num_states_bitarray[EVEN_STATE];
+        float expected_brute_force1 = (float)num_odd * num_even / 2.0;
+        float expected_brute_force2 = nonces[best_first_bytes[0]].expected_num_brute_force;
 
-		if (expected_brute_force1 < expected_brute_force2) {
-			hardnested_print_progress(num_acquired_nonces, "(Ignoring Sum(a8) properties)", expected_brute_force1, 0);
-			set_test_state(best_first_byte_smallest_bitarray);
-			add_bitflip_candidates(best_first_byte_smallest_bitarray);
-			Tests2();
-			maximum_states = 0;
+        if (expected_brute_force1 < expected_brute_force2) {
+            hardnested_print_progress(num_acquired_nonces, "(Ignoring Sum(a8) properties)", expected_brute_force1, 0);
+            set_test_state(best_first_byte_smallest_bitarray);
+            add_bitflip_candidates(best_first_byte_smallest_bitarray);
+            Tests2();
+            maximum_states = 0;
 
-			for (statelist_t *sl = candidates; sl != NULL; sl = sl->next) {
-				maximum_states += (uint64_t)sl->len[ODD_STATE] * sl->len[EVEN_STATE];
-			}
+            for (statelist_t *sl = candidates; sl != NULL; sl = sl->next) {
+                maximum_states += (uint64_t)sl->len[ODD_STATE] * sl->len[EVEN_STATE];
+            }
 
-			best_first_bytes[0] = best_first_byte_smallest_bitarray;
-			pre_XOR_nonces();
-			prepare_bf_test_nonces(nonces, best_first_bytes[0]);
+            best_first_bytes[0] = best_first_byte_smallest_bitarray;
+            pre_XOR_nonces();
+            prepare_bf_test_nonces(nonces, best_first_bytes[0]);
 
-			key_found = brute_force(foundkey);
-			free(candidates->states[ODD_STATE]);
-			free(candidates->states[EVEN_STATE]);
-			free_candidates_memory(candidates);
-			candidates = NULL;
-		} else {
+            key_found = brute_force(foundkey);
+            free(candidates->states[ODD_STATE]);
+            free(candidates->states[EVEN_STATE]);
+            free_candidates_memory(candidates);
+            candidates = NULL;
+        } else {
 
-			pre_XOR_nonces();
-			prepare_bf_test_nonces(nonces, best_first_bytes[0]);
+            pre_XOR_nonces();
+            prepare_bf_test_nonces(nonces, best_first_bytes[0]);
 
-			for (uint8_t j = 0; j < NUM_SUMS && !key_found; j++) {
-				float expected_brute_force = nonces[best_first_bytes[0]].expected_num_brute_force;
-				sprintf(progress_text, "(%d. guess: Sum(a8) = %" PRIu16 ")", j+1, sums[nonces[best_first_bytes[0]].sum_a8_guess[j].sum_a8_idx]);
-				hardnested_print_progress(num_acquired_nonces, progress_text, expected_brute_force, 0);
+            for (uint8_t j = 0; j < NUM_SUMS && !key_found; j++) {
+                float expected_brute_force = nonces[best_first_bytes[0]].expected_num_brute_force;
+                sprintf(progress_text, "(%d. guess: Sum(a8) = %" PRIu16 ")", j+1, sums[nonces[best_first_bytes[0]].sum_a8_guess[j].sum_a8_idx]);
+                hardnested_print_progress(num_acquired_nonces, progress_text, expected_brute_force, 0);
 
-				if (trgkey != NULL && sums[nonces[best_first_bytes[0]].sum_a8_guess[j].sum_a8_idx] != real_sum_a8) {
-					sprintf(progress_text, "(Estimated Sum(a8) is WRONG! Correct Sum(a8) = %" PRIu16 ")", real_sum_a8);
-					hardnested_print_progress(num_acquired_nonces, progress_text, expected_brute_force, 0);
-				}
+                if (trgkey != NULL && sums[nonces[best_first_bytes[0]].sum_a8_guess[j].sum_a8_idx] != real_sum_a8) {
+                    sprintf(progress_text, "(Estimated Sum(a8) is WRONG! Correct Sum(a8) = %" PRIu16 ")", real_sum_a8);
+                    hardnested_print_progress(num_acquired_nonces, progress_text, expected_brute_force, 0);
+                }
 
-				generate_candidates(first_byte_Sum, nonces[best_first_bytes[0]].sum_a8_guess[j].sum_a8_idx);
-				key_found = brute_force(foundkey);
-				free_statelist_cache();
-				free_candidates_memory(candidates);
-				candidates = NULL;
-				if (!key_found) {
-					// update the statistics
-					nonces[best_first_bytes[0]].sum_a8_guess[j].prob = 0;
-					nonces[best_first_bytes[0]].sum_a8_guess[j].num_states = 0;
-					// and calculate new expected number of brute forces
-					update_expected_brute_force(best_first_bytes[0]);
-				}
+                generate_candidates(first_byte_Sum, nonces[best_first_bytes[0]].sum_a8_guess[j].sum_a8_idx);
+                key_found = brute_force(foundkey);
+                free_statelist_cache();
+                free_candidates_memory(candidates);
+                candidates = NULL;
+                if (!key_found) {
+                    // update the statistics
+                    nonces[best_first_bytes[0]].sum_a8_guess[j].prob = 0;
+                    nonces[best_first_bytes[0]].sum_a8_guess[j].num_states = 0;
+                    // and calculate new expected number of brute forces
+                    update_expected_brute_force(best_first_bytes[0]);
+                }
 
-			}
-		}
+            }
+        }
 
-		free_nonces_memory();
-		free_bitarray(all_bitflips_bitarray[ODD_STATE]);
-		free_bitarray(all_bitflips_bitarray[EVEN_STATE]);
-		free_sum_bitarrays();
-		free_part_sum_bitarrays();
-	}
+        free_nonces_memory();
+        free_bitarray(all_bitflips_bitarray[ODD_STATE]);
+        free_bitarray(all_bitflips_bitarray[EVEN_STATE]);
+        free_sum_bitarrays();
+        free_part_sum_bitarrays();
+    }
 
-	return 0;
+    return 0;
 }
diff --git a/client/cmdhfmfhard.h b/client/cmdhfmfhard.h
index 8c044e586..e39358c7f 100644
--- a/client/cmdhfmfhard.h
+++ b/client/cmdhfmfhard.h
@@ -14,31 +14,31 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#define NUM_SUMS 						19		// number of possible sum property values
+#define NUM_SUMS 19 // number of possible sum property values
 
 typedef struct guess_sum_a8 {
-	float prob;
-	uint64_t num_states;
-	uint8_t sum_a8_idx;
+    float prob;
+    uint64_t num_states;
+    uint8_t sum_a8_idx;
 } guess_sum_a8_t;
 
 typedef struct noncelistentry {
-	uint32_t nonce_enc;
-	uint8_t par_enc;
-	void *next;
+    uint32_t nonce_enc;
+    uint8_t par_enc;
+    void *next;
 } noncelistentry_t;
 
 typedef struct noncelist {
-	uint16_t num;
-	uint16_t Sum;
-	guess_sum_a8_t sum_a8_guess[NUM_SUMS];
-	bool sum_a8_guess_dirty;
-	float expected_num_brute_force;
-	uint8_t BitFlips[0x400];
-	uint32_t *states_bitarray[2];
-	uint32_t num_states_bitarray[2];
-	bool all_bitflips_dirty[2];
-	noncelistentry_t *first;
+    uint16_t num;
+    uint16_t Sum;
+    guess_sum_a8_t sum_a8_guess[NUM_SUMS];
+    bool sum_a8_guess_dirty;
+    float expected_num_brute_force;
+    uint8_t BitFlips[0x400];
+    uint32_t *states_bitarray[2];
+    uint32_t num_states_bitarray[2];
+    bool all_bitflips_dirty[2];
+    noncelistentry_t *first;
 } noncelist_t;
 
 extern int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t *trgkey, bool nonce_file_read, bool nonce_file_write, bool slow, int tests, uint64_t *foundkey, char *filename);
diff --git a/client/cmdhfmfp.c b/client/cmdhfmfp.c
index ade39b9bc..ce5e6eb22 100644
--- a/client/cmdhfmfp.c
+++ b/client/cmdhfmfp.c
@@ -35,830 +35,830 @@ static int CmdHelp(const char *Cmd);
 
 int CmdHFMFPInfo(const char *cmd) {
 
-	if (cmd && strlen(cmd) > 0)
-		PrintAndLogEx(WARNING, "command don't have any parameters.\n");
+    if (cmd && strlen(cmd) > 0)
+        PrintAndLogEx(WARNING, "command don't have any parameters.\n");
 
-	// info about 14a part
-	CmdHF14AInfo("");
+    // info about 14a part
+    CmdHF14AInfo("");
 
-	// Mifare Plus info
-	UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};
-	SendCommand(&c);
+    // Mifare Plus info
+    UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};
+    SendCommand(&c);
 
-	UsbCommand resp;
-	WaitForResponse(CMD_ACK,&resp);
+    UsbCommand resp;
+    WaitForResponse(CMD_ACK,&resp);
 
-	iso14a_card_select_t card;
-	memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
+    iso14a_card_select_t card;
+    memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
 
-	uint64_t select_status = resp.arg[0];		// 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
+    uint64_t select_status = resp.arg[0]; // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
 
-	if (select_status == 1 || select_status == 2) {
-		PrintAndLogEx(NORMAL, "----------------------------------------------");
-		PrintAndLogEx(NORMAL, "Mifare Plus info:");
+    if (select_status == 1 || select_status == 2) {
+        PrintAndLogEx(NORMAL, "----------------------------------------------");
+        PrintAndLogEx(NORMAL, "Mifare Plus info:");
 
-		// MIFARE Type Identification Procedure
-		// https://www.nxp.com/docs/en/application-note/AN10833.pdf
-		uint16_t ATQA = card.atqa[0] + (card.atqa[1] << 8);
-		if (ATQA == 0x0004) PrintAndLogEx(INFO, "ATQA: Mifare Plus 2k 4bUID");
-		if (ATQA == 0x0002) PrintAndLogEx(INFO, "ATQA: Mifare Plus 4k 4bUID");
-		if (ATQA == 0x0044) PrintAndLogEx(INFO, "ATQA: Mifare Plus 2k 7bUID");
-		if (ATQA == 0x0042) PrintAndLogEx(INFO, "ATQA: Mifare Plus 4k 7bUID");
+        // MIFARE Type Identification Procedure
+        // https://www.nxp.com/docs/en/application-note/AN10833.pdf
+        uint16_t ATQA = card.atqa[0] + (card.atqa[1] << 8);
+        if (ATQA == 0x0004) PrintAndLogEx(INFO, "ATQA: Mifare Plus 2k 4bUID");
+        if (ATQA == 0x0002) PrintAndLogEx(INFO, "ATQA: Mifare Plus 4k 4bUID");
+        if (ATQA == 0x0044) PrintAndLogEx(INFO, "ATQA: Mifare Plus 2k 7bUID");
+        if (ATQA == 0x0042) PrintAndLogEx(INFO, "ATQA: Mifare Plus 4k 7bUID");
 
-		uint8_t SLmode = 0xff;
-		if (card.sak == 0x08) {
-			PrintAndLogEx(INFO, "SAK: Mifare Plus 2k 7bUID");
-			if (select_status == 2) SLmode = 1;
-		}
-		if (card.sak == 0x18) {
-			PrintAndLogEx(INFO, "SAK: Mifare Plus 4k 7bUID");
-			if (select_status == 2) SLmode = 1;
-		}
-		if (card.sak == 0x10) {
-			PrintAndLogEx(INFO, "SAK: Mifare Plus 2k");
-			if (select_status == 2) SLmode = 2;
-		}
-		if (card.sak == 0x11) {
-			PrintAndLogEx(INFO, "SAK: Mifare Plus 4k");
-			if (select_status == 2) SLmode = 2;
-		}
-		if (card.sak == 0x20) {
-			PrintAndLogEx(INFO, "SAK: Mifare Plus SL0/SL3 or Mifare desfire");
-			if (card.ats_len > 0) {
-				SLmode = 3;
+        uint8_t SLmode = 0xff;
+        if (card.sak == 0x08) {
+            PrintAndLogEx(INFO, "SAK: Mifare Plus 2k 7bUID");
+            if (select_status == 2) SLmode = 1;
+        }
+        if (card.sak == 0x18) {
+            PrintAndLogEx(INFO, "SAK: Mifare Plus 4k 7bUID");
+            if (select_status == 2) SLmode = 1;
+        }
+        if (card.sak == 0x10) {
+            PrintAndLogEx(INFO, "SAK: Mifare Plus 2k");
+            if (select_status == 2) SLmode = 2;
+        }
+        if (card.sak == 0x11) {
+            PrintAndLogEx(INFO, "SAK: Mifare Plus 4k");
+            if (select_status == 2) SLmode = 2;
+        }
+        if (card.sak == 0x20) {
+            PrintAndLogEx(INFO, "SAK: Mifare Plus SL0/SL3 or Mifare desfire");
+            if (card.ats_len > 0) {
+                SLmode = 3;
 
-				// check SL0
-				uint8_t data[250] = {0};
-				int datalen = 0;
-				// https://github.com/Proxmark/proxmark3/blob/master/client/scripts/mifarePlus.lua#L161
-				uint8_t cmd[3 + 16] = {0xa8, 0x90, 0x90, 0x00};
-				int res = ExchangeRAW14a(cmd, sizeof(cmd), false, false, data, sizeof(data), &datalen);
-				if (!res && datalen > 1 && data[0] == 0x09) {
-					SLmode = 0;
-				}
-			}
-		}
+                // check SL0
+                uint8_t data[250] = {0};
+                int datalen = 0;
+                // https://github.com/Proxmark/proxmark3/blob/master/client/scripts/mifarePlus.lua#L161
+                uint8_t cmd[3 + 16] = {0xa8, 0x90, 0x90, 0x00};
+                int res = ExchangeRAW14a(cmd, sizeof(cmd), false, false, data, sizeof(data), &datalen);
+                if (!res && datalen > 1 && data[0] == 0x09) {
+                    SLmode = 0;
+                }
+            }
+        }
 
-		if (SLmode != 0xff)
-			PrintAndLogEx(INFO, "Mifare Plus SL mode: SL%d", SLmode);
-		else
-			PrintAndLogEx(WARNING, "Mifare Plus SL mode: unknown(");
-	} else {
-		PrintAndLogEx(INFO, "Mifare Plus info not available.");
-	}
+        if (SLmode != 0xff)
+            PrintAndLogEx(INFO, "Mifare Plus SL mode: SL%d", SLmode);
+        else
+            PrintAndLogEx(WARNING, "Mifare Plus SL mode: unknown(");
+    } else {
+        PrintAndLogEx(INFO, "Mifare Plus info not available.");
+    }
 
-	DropField();
+    DropField();
 
-	return 0;
+    return 0;
 }
 
 int CmdHFMFPWritePerso(const char *cmd) {
-	uint8_t keyNum[64] = {0};
-	int keyNumLen = 0;
-	uint8_t key[64] = {0};
-	int keyLen = 0;
+    uint8_t keyNum[64] = {0};
+    int keyNumLen = 0;
+    uint8_t key[64] = {0};
+    int keyLen = 0;
 
-	CLIParserInit("hf mfp wrp",
-		"Executes Write Perso command. Can be used in SL0 mode only.",
-		"Usage:\n\thf mfp wrp 4000 000102030405060708090a0b0c0d0e0f -> write key (00..0f) to key number 4000 \n"
-			"\thf mfp wrp 4000 -> write default key(0xff..0xff) to key number 4000");
+    CLIParserInit("hf mfp wrp",
+        "Executes Write Perso command. Can be used in SL0 mode only.",
+        "Usage:\n\thf mfp wrp 4000 000102030405060708090a0b0c0d0e0f -> write key (00..0f) to key number 4000 \n"
+            "\thf mfp wrp 4000 -> write default key(0xff..0xff) to key number 4000");
 
-	void* argtable[] = {
-		arg_param_begin,
-		arg_lit0("vV",  "verbose", "show internal data."),
-		arg_str1(NULL,  NULL,      "<HEX key number (2b)>", NULL),
-		arg_strx0(NULL,  NULL,     "<HEX key (16b)>", NULL),
-		arg_param_end
-	};
-	CLIExecWithReturn(cmd, argtable, true);
+    void* argtable[] = {
+        arg_param_begin,
+        arg_lit0("vV",  "verbose", "show internal data."),
+        arg_str1(NULL,  NULL,      "<HEX key number (2b)>", NULL),
+        arg_strx0(NULL,  NULL,     "<HEX key (16b)>", NULL),
+        arg_param_end
+    };
+    CLIExecWithReturn(cmd, argtable, true);
 
-	bool verbose = arg_get_lit(1);
-	CLIGetHexWithReturn(2, keyNum, &keyNumLen);
-	CLIGetHexWithReturn(3, key, &keyLen);
-	CLIParserFree();
+    bool verbose = arg_get_lit(1);
+    CLIGetHexWithReturn(2, keyNum, &keyNumLen);
+    CLIGetHexWithReturn(3, key, &keyLen);
+    CLIParserFree();
 
-	mfpSetVerboseMode(verbose);
+    mfpSetVerboseMode(verbose);
 
-	if (!keyLen) {
-		memmove(key, DefaultKey, 16);
-		keyLen = 16;
-	}
+    if (!keyLen) {
+        memmove(key, DefaultKey, 16);
+        keyLen = 16;
+    }
 
-	if (keyNumLen != 2) {
-		PrintAndLogEx(ERR, "Key number length must be 2 bytes instead of: %d", keyNumLen);
-		return 1;
-	}
-	if (keyLen != 16) {
-		PrintAndLogEx(ERR, "Key length must be 16 bytes instead of: %d", keyLen);
-		return 1;
-	}
+    if (keyNumLen != 2) {
+        PrintAndLogEx(ERR, "Key number length must be 2 bytes instead of: %d", keyNumLen);
+        return 1;
+    }
+    if (keyLen != 16) {
+        PrintAndLogEx(ERR, "Key length must be 16 bytes instead of: %d", keyLen);
+        return 1;
+    }
 
-	uint8_t data[250] = {0};
-	int datalen = 0;
+    uint8_t data[250] = {0};
+    int datalen = 0;
 
-	int res = MFPWritePerso(keyNum, key, true, false, data, sizeof(data), &datalen);
-	if (res) {
-		PrintAndLogEx(ERR, "Exchange error: %d", res);
-		return res;
-	}
+    int res = MFPWritePerso(keyNum, key, true, false, data, sizeof(data), &datalen);
+    if (res) {
+        PrintAndLogEx(ERR, "Exchange error: %d", res);
+        return res;
+    }
 
-	if (datalen != 3) {
-		PrintAndLogEx(ERR, "Command must return 3 bytes instead of: %d", datalen);
-		return 1;
-	}
+    if (datalen != 3) {
+        PrintAndLogEx(ERR, "Command must return 3 bytes instead of: %d", datalen);
+        return 1;
+    }
 
-	if (data[0] != 0x90) {
-		PrintAndLogEx(ERR, "Command error: %02x %s", data[0], mfpGetErrorDescription(data[0]));
-		return 1;
-	}
-	PrintAndLogEx(INFO, "Write OK.");
+    if (data[0] != 0x90) {
+        PrintAndLogEx(ERR, "Command error: %02x %s", data[0], mfpGetErrorDescription(data[0]));
+        return 1;
+    }
+    PrintAndLogEx(INFO, "Write OK.");
 
-	return 0;
+    return 0;
 }
 
 uint16_t CardAddresses[] = {0x9000, 0x9001, 0x9002, 0x9003, 0x9004, 0xA000, 0xA001, 0xA080, 0xA081, 0xC000, 0xC001};
 
 int CmdHFMFPInitPerso(const char *cmd) {
-	int res;
-	uint8_t key[256] = {0};
-	int keyLen = 0;
-	uint8_t keyNum[2] = {0};
-	uint8_t data[250] = {0};
-	int datalen = 0;
+    int res;
+    uint8_t key[256] = {0};
+    int keyLen = 0;
+    uint8_t keyNum[2] = {0};
+    uint8_t data[250] = {0};
+    int datalen = 0;
 
-	CLIParserInit("hf mfp initp",
-		"Executes Write Perso command for all card's keys. Can be used in SL0 mode only.",
-		"Usage:\n\thf mfp initp 000102030405060708090a0b0c0d0e0f -> fill all the keys with key (00..0f)\n"
-			"\thf mfp initp -vv -> fill all the keys with default key(0xff..0xff) and show all the data exchange");
+    CLIParserInit("hf mfp initp",
+        "Executes Write Perso command for all card's keys. Can be used in SL0 mode only.",
+        "Usage:\n\thf mfp initp 000102030405060708090a0b0c0d0e0f -> fill all the keys with key (00..0f)\n"
+            "\thf mfp initp -vv -> fill all the keys with default key(0xff..0xff) and show all the data exchange");
 
-	void* argtable[] = {
-		arg_param_begin,
-		arg_litn("vV",  "verbose", 0, 2, "show internal data."),
-		arg_strx0(NULL,  NULL,      "<HEX key (16b)>", NULL),
-		arg_param_end
-	};
-	CLIExecWithReturn(cmd, argtable, true);
+    void* argtable[] = {
+        arg_param_begin,
+        arg_litn("vV",  "verbose", 0, 2, "show internal data."),
+        arg_strx0(NULL,  NULL,      "<HEX key (16b)>", NULL),
+        arg_param_end
+    };
+    CLIExecWithReturn(cmd, argtable, true);
 
-	bool verbose = arg_get_lit(1);
-	bool verbose2 = arg_get_lit(1) > 1;
-	CLIGetHexWithReturn(2, key, &keyLen);
-	CLIParserFree();
+    bool verbose = arg_get_lit(1);
+    bool verbose2 = arg_get_lit(1) > 1;
+    CLIGetHexWithReturn(2, key, &keyLen);
+    CLIParserFree();
 
-	if (keyLen && keyLen != 16) {
-		PrintAndLogEx(ERR, "Key length must be 16 bytes instead of: %d", keyLen);
-		return 1;
-	}
+    if (keyLen && keyLen != 16) {
+        PrintAndLogEx(ERR, "Key length must be 16 bytes instead of: %d", keyLen);
+        return 1;
+    }
 
-	if (!keyLen)
-		memmove(key, DefaultKey, 16);
+    if (!keyLen)
+        memmove(key, DefaultKey, 16);
 
-	mfpSetVerboseMode(verbose2);
-	for (uint16_t sn = 0x4000; sn < 0x4050; sn++) {
-		keyNum[0] = sn >> 8;
-		keyNum[1] = sn & 0xff;
-		res = MFPWritePerso(keyNum, key, (sn == 0x4000), true, data, sizeof(data), &datalen);
-		if (!res && (datalen == 3) && data[0] == 0x09) {
-			PrintAndLogEx(INFO, "2k card detected.");
-			break;
-		}
-		if (res || (datalen != 3) || data[0] != 0x90) {
-			PrintAndLogEx(ERR, "Write error on address %04x", sn);
-			break;
-		}
-	}
+    mfpSetVerboseMode(verbose2);
+    for (uint16_t sn = 0x4000; sn < 0x4050; sn++) {
+        keyNum[0] = sn >> 8;
+        keyNum[1] = sn & 0xff;
+        res = MFPWritePerso(keyNum, key, (sn == 0x4000), true, data, sizeof(data), &datalen);
+        if (!res && (datalen == 3) && data[0] == 0x09) {
+            PrintAndLogEx(INFO, "2k card detected.");
+            break;
+        }
+        if (res || (datalen != 3) || data[0] != 0x90) {
+            PrintAndLogEx(ERR, "Write error on address %04x", sn);
+            break;
+        }
+    }
 
-	mfpSetVerboseMode(verbose);
-	for (int i = 0; i < sizeof(CardAddresses) / 2; i++) {
-		keyNum[0] = CardAddresses[i] >> 8;
-		keyNum[1] = CardAddresses[i] & 0xff;
-		res = MFPWritePerso(keyNum, key, false, true, data, sizeof(data), &datalen);
-		if (!res && (datalen == 3) && data[0] == 0x09) {
-			PrintAndLogEx(WARNING, "Skipped[%04x]...", CardAddresses[i]);
-		} else {
-			if (res || (datalen != 3) || data[0] != 0x90) {
-				PrintAndLogEx(ERR, "Write error on address %04x", CardAddresses[i]);
-				break;
-			}
-		}
-	}
+    mfpSetVerboseMode(verbose);
+    for (int i = 0; i < sizeof(CardAddresses) / 2; i++) {
+        keyNum[0] = CardAddresses[i] >> 8;
+        keyNum[1] = CardAddresses[i] & 0xff;
+        res = MFPWritePerso(keyNum, key, false, true, data, sizeof(data), &datalen);
+        if (!res && (datalen == 3) && data[0] == 0x09) {
+            PrintAndLogEx(WARNING, "Skipped[%04x]...", CardAddresses[i]);
+        } else {
+            if (res || (datalen != 3) || data[0] != 0x90) {
+                PrintAndLogEx(ERR, "Write error on address %04x", CardAddresses[i]);
+                break;
+            }
+        }
+    }
 
-	DropField();
+    DropField();
 
-	if (res)
-		return res;
+    if (res)
+        return res;
 
-	PrintAndLogEx(INFO, "Done.");
+    PrintAndLogEx(INFO, "Done.");
 
-	return 0;
+    return 0;
 }
 
 int CmdHFMFPCommitPerso(const char *cmd) {
-	CLIParserInit("hf mfp commitp",
-		"Executes Commit Perso command. Can be used in SL0 mode only.",
-		"Usage:\n\thf mfp commitp ->  \n");
+    CLIParserInit("hf mfp commitp",
+        "Executes Commit Perso command. Can be used in SL0 mode only.",
+        "Usage:\n\thf mfp commitp ->  \n");
 
-	void* argtable[] = {
-		arg_param_begin,
-		arg_lit0("vV",  "verbose", "show internal data."),
-		arg_int0(NULL,  NULL,      "SL mode", NULL),
-		arg_param_end
-	};
-	CLIExecWithReturn(cmd, argtable, true);
+    void* argtable[] = {
+        arg_param_begin,
+        arg_lit0("vV",  "verbose", "show internal data."),
+        arg_int0(NULL,  NULL,      "SL mode", NULL),
+        arg_param_end
+    };
+    CLIExecWithReturn(cmd, argtable, true);
 
-	bool verbose = arg_get_lit(1);
-	CLIParserFree();
+    bool verbose = arg_get_lit(1);
+    CLIParserFree();
 
-	mfpSetVerboseMode(verbose);
+    mfpSetVerboseMode(verbose);
 
-	uint8_t data[250] = {0};
-	int datalen = 0;
+    uint8_t data[250] = {0};
+    int datalen = 0;
 
-	int res = MFPCommitPerso(true, false, data, sizeof(data), &datalen);
-	if (res) {
-		PrintAndLogEx(ERR, "Exchange error: %d", res);
-		return res;
-	}
+    int res = MFPCommitPerso(true, false, data, sizeof(data), &datalen);
+    if (res) {
+        PrintAndLogEx(ERR, "Exchange error: %d", res);
+        return res;
+    }
 
-	if (datalen != 3) {
-		PrintAndLogEx(ERR, "Command must return 3 bytes instead of: %d", datalen);
-		return 1;
-	}
+    if (datalen != 3) {
+        PrintAndLogEx(ERR, "Command must return 3 bytes instead of: %d", datalen);
+        return 1;
+    }
 
-	if (data[0] != 0x90) {
-		PrintAndLogEx(ERR, "Command error: %02x %s", data[0], mfpGetErrorDescription(data[0]));
-		return 1;
-	}
-	PrintAndLogEx(INFO, "Switch level OK.");
+    if (data[0] != 0x90) {
+        PrintAndLogEx(ERR, "Command error: %02x %s", data[0], mfpGetErrorDescription(data[0]));
+        return 1;
+    }
+    PrintAndLogEx(INFO, "Switch level OK.");
 
-	return 0;
+    return 0;
 }
 
 int CmdHFMFPAuth(const char *cmd) {
-	uint8_t keyn[250] = {0};
-	int keynlen = 0;
-	uint8_t key[250] = {0};
-	int keylen = 0;
+    uint8_t keyn[250] = {0};
+    int keynlen = 0;
+    uint8_t key[250] = {0};
+    int keylen = 0;
 
-	CLIParserInit("hf mfp auth",
-		"Executes AES authentication command for Mifare Plus card",
-		"Usage:\n\thf mfp auth 4000 000102030405060708090a0b0c0d0e0f -> executes authentication\n"
-			"\thf mfp auth 9003 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -v -> executes authentication and shows all the system data\n");
+    CLIParserInit("hf mfp auth",
+        "Executes AES authentication command for Mifare Plus card",
+        "Usage:\n\thf mfp auth 4000 000102030405060708090a0b0c0d0e0f -> executes authentication\n"
+            "\thf mfp auth 9003 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -v -> executes authentication and shows all the system data\n");
 
-	void* argtable[] = {
-		arg_param_begin,
-		arg_lit0("vV",  "verbose", "show internal data."),
-		arg_str1(NULL,  NULL,     "<Key Num (HEX 2 bytes)>", NULL),
-		arg_str1(NULL,  NULL,     "<Key Value (HEX 16 bytes)>", NULL),
-		arg_param_end
-	};
-	CLIExecWithReturn(cmd, argtable, true);
+    void* argtable[] = {
+        arg_param_begin,
+        arg_lit0("vV",  "verbose", "show internal data."),
+        arg_str1(NULL,  NULL,     "<Key Num (HEX 2 bytes)>", NULL),
+        arg_str1(NULL,  NULL,     "<Key Value (HEX 16 bytes)>", NULL),
+        arg_param_end
+    };
+    CLIExecWithReturn(cmd, argtable, true);
 
-	bool verbose = arg_get_lit(1);
-	CLIGetHexWithReturn(2, keyn, &keynlen);
-	CLIGetHexWithReturn(3, key, &keylen);
-	CLIParserFree();
+    bool verbose = arg_get_lit(1);
+    CLIGetHexWithReturn(2, keyn, &keynlen);
+    CLIGetHexWithReturn(3, key, &keylen);
+    CLIParserFree();
 
-	if (keynlen != 2) {
-		PrintAndLogEx(ERR, "ERROR: <Key Num> must be 2 bytes long instead of: %d", keynlen);
-		return 1;
-	}
+    if (keynlen != 2) {
+        PrintAndLogEx(ERR, "ERROR: <Key Num> must be 2 bytes long instead of: %d", keynlen);
+        return 1;
+    }
 
-	if (keylen != 16) {
-		PrintAndLogEx(ERR, "ERROR: <Key Value> must be 16 bytes long instead of: %d", keylen);
-		return 1;
-	}
+    if (keylen != 16) {
+        PrintAndLogEx(ERR, "ERROR: <Key Value> must be 16 bytes long instead of: %d", keylen);
+        return 1;
+    }
 
-	return MifareAuth4(NULL, keyn, key, true, false, verbose);
+    return MifareAuth4(NULL, keyn, key, true, false, verbose);
 }
 
 int CmdHFMFPRdbl(const char *cmd) {
-	uint8_t keyn[2] = {0};
-	uint8_t key[250] = {0};
-	int keylen = 0;
+    uint8_t keyn[2] = {0};
+    uint8_t key[250] = {0};
+    int keylen = 0;
 
-	CLIParserInit("hf mfp rdbl",
-		"Reads several blocks from Mifare Plus card.",
-		"Usage:\n\thf mfp rdbl 0 000102030405060708090a0b0c0d0e0f -> executes authentication and read block 0 data\n"
-			"\thf mfp rdbl 1 -v -> executes authentication and shows sector 1 data with default key 0xFF..0xFF and some additional data\n");
+    CLIParserInit("hf mfp rdbl",
+        "Reads several blocks from Mifare Plus card.",
+        "Usage:\n\thf mfp rdbl 0 000102030405060708090a0b0c0d0e0f -> executes authentication and read block 0 data\n"
+            "\thf mfp rdbl 1 -v -> executes authentication and shows sector 1 data with default key 0xFF..0xFF and some additional data\n");
 
-	void* argtable[] = {
-		arg_param_begin,
-		arg_lit0("vV",  "verbose", "show internal data."),
-		arg_int0("nN",  "count",   "blocks count (by default 1).", NULL),
-		arg_lit0("bB",  "keyb",    "use key B (by default keyA)."),
-		arg_lit0("pP",  "plain",   "plain communication mode between reader and card."),
-		arg_int1(NULL,  NULL,      "<Block Num (0..255)>", NULL),
-		arg_str0(NULL,  NULL,      "<Key Value (HEX 16 bytes)>", NULL),
-		arg_param_end
-	};
-	CLIExecWithReturn(cmd, argtable, false);
+    void* argtable[] = {
+        arg_param_begin,
+        arg_lit0("vV",  "verbose", "show internal data."),
+        arg_int0("nN",  "count",   "blocks count (by default 1).", NULL),
+        arg_lit0("bB",  "keyb",    "use key B (by default keyA)."),
+        arg_lit0("pP",  "plain",   "plain communication mode between reader and card."),
+        arg_int1(NULL,  NULL,      "<Block Num (0..255)>", NULL),
+        arg_str0(NULL,  NULL,      "<Key Value (HEX 16 bytes)>", NULL),
+        arg_param_end
+    };
+    CLIExecWithReturn(cmd, argtable, false);
 
-	bool verbose = arg_get_lit(1);
-	int blocksCount = arg_get_int_def(2, 1);
-	bool keyB = arg_get_lit(3);
-	int plain = arg_get_lit(4);
-	uint32_t blockn = arg_get_int(5);
-	CLIGetHexWithReturn(6, key, &keylen);
-	CLIParserFree();
+    bool verbose = arg_get_lit(1);
+    int blocksCount = arg_get_int_def(2, 1);
+    bool keyB = arg_get_lit(3);
+    int plain = arg_get_lit(4);
+    uint32_t blockn = arg_get_int(5);
+    CLIGetHexWithReturn(6, key, &keylen);
+    CLIParserFree();
 
-	mfpSetVerboseMode(verbose);
+    mfpSetVerboseMode(verbose);
 
-	if (!keylen) {
-		memmove(key, DefaultKey, 16);
-		keylen = 16;
-	}
+    if (!keylen) {
+        memmove(key, DefaultKey, 16);
+        keylen = 16;
+    }
 
-	if (blockn > 255) {
-		PrintAndLogEx(ERR, "<Block Num> must be in range [0..255] instead of: %d", blockn);
-		return 1;
-	}
+    if (blockn > 255) {
+        PrintAndLogEx(ERR, "<Block Num> must be in range [0..255] instead of: %d", blockn);
+        return 1;
+    }
 
-	if (keylen != 16) {
-		PrintAndLogEx(ERR, "<Key Value> must be 16 bytes long instead of: %d", keylen);
-		return 1;
-	}
+    if (keylen != 16) {
+        PrintAndLogEx(ERR, "<Key Value> must be 16 bytes long instead of: %d", keylen);
+        return 1;
+    }
 
-	// 3 blocks - wo iso14443-4 chaining
-	if (blocksCount > 3) {
-		PrintAndLogEx(ERR, "blocks count must be less than 3 instead of: %d", blocksCount);
-		return 1;
-	}
+    // 3 blocks - wo iso14443-4 chaining
+    if (blocksCount > 3) {
+        PrintAndLogEx(ERR, "blocks count must be less than 3 instead of: %d", blocksCount);
+        return 1;
+    }
 
-	if (blocksCount > 1 && mfIsSectorTrailer(blockn)) {
-		PrintAndLog("WARNING: trailer!");
-	}
+    if (blocksCount > 1 && mfIsSectorTrailer(blockn)) {
+        PrintAndLog("WARNING: trailer!");
+    }
 
-	uint8_t sectorNum = mfSectorNum(blockn & 0xff);
-	uint16_t uKeyNum = 0x4000 + sectorNum * 2 + (keyB ? 1 : 0);
-	keyn[0] = uKeyNum >> 8;
-	keyn[1] = uKeyNum & 0xff;
-	if (verbose)
-		PrintAndLogEx(INFO, "--block:%d sector[%d]:%02x key:%04x", blockn, mfNumBlocksPerSector(sectorNum), sectorNum, uKeyNum);
+    uint8_t sectorNum = mfSectorNum(blockn & 0xff);
+    uint16_t uKeyNum = 0x4000 + sectorNum * 2 + (keyB ? 1 : 0);
+    keyn[0] = uKeyNum >> 8;
+    keyn[1] = uKeyNum & 0xff;
+    if (verbose)
+        PrintAndLogEx(INFO, "--block:%d sector[%d]:%02x key:%04x", blockn, mfNumBlocksPerSector(sectorNum), sectorNum, uKeyNum);
 
-	mf4Session session;
-	int res = MifareAuth4(&session, keyn, key, true, true, verbose);
-	if (res) {
-		PrintAndLogEx(ERR, "Authentication error: %d", res);
-		return res;
-	}
+    mf4Session session;
+    int res = MifareAuth4(&session, keyn, key, true, true, verbose);
+    if (res) {
+        PrintAndLogEx(ERR, "Authentication error: %d", res);
+        return res;
+    }
 
-	uint8_t data[250] = {0};
-	int datalen = 0;
-	uint8_t mac[8] = {0};
-	res = MFPReadBlock(&session, plain, blockn & 0xff, blocksCount, false, false, data, sizeof(data), &datalen, mac);
-	if (res) {
-		PrintAndLogEx(ERR, "Read error: %d", res);
-		return res;
-	}
+    uint8_t data[250] = {0};
+    int datalen = 0;
+    uint8_t mac[8] = {0};
+    res = MFPReadBlock(&session, plain, blockn & 0xff, blocksCount, false, false, data, sizeof(data), &datalen, mac);
+    if (res) {
+        PrintAndLogEx(ERR, "Read error: %d", res);
+        return res;
+    }
 
-	if (datalen && data[0] != 0x90) {
-		PrintAndLogEx(ERR, "Card read error: %02x %s", data[0], mfpGetErrorDescription(data[0]));
-		return 6;
-	}
+    if (datalen && data[0] != 0x90) {
+        PrintAndLogEx(ERR, "Card read error: %02x %s", data[0], mfpGetErrorDescription(data[0]));
+        return 6;
+    }
 
-	if (datalen != 1 + blocksCount * 16 + 8 + 2) {
-		PrintAndLogEx(ERR, "Error return length:%d", datalen);
-		return 5;
-	}
+    if (datalen != 1 + blocksCount * 16 + 8 + 2) {
+        PrintAndLogEx(ERR, "Error return length:%d", datalen);
+        return 5;
+    }
 
-	int indx = blockn;
-	for(int i = 0; i < blocksCount; i++)  {
-		PrintAndLogEx(INFO, "data[%03d]: %s", indx, sprint_hex(&data[1 + i * 16], 16));
-		indx++;
-		if (mfIsSectorTrailer(indx) && i != blocksCount - 1){
-			PrintAndLogEx(INFO, "data[%03d]: ------------------- trailer -------------------", indx);
-			indx++;
-		}
-	}
+    int indx = blockn;
+    for(int i = 0; i < blocksCount; i++)  {
+        PrintAndLogEx(INFO, "data[%03d]: %s", indx, sprint_hex(&data[1 + i * 16], 16));
+        indx++;
+        if (mfIsSectorTrailer(indx) && i != blocksCount - 1){
+            PrintAndLogEx(INFO, "data[%03d]: ------------------- trailer -------------------", indx);
+            indx++;
+        }
+    }
 
-	if (memcmp(&data[blocksCount * 16 + 1], mac, 8)) {
-		PrintAndLogEx(WARNING, "WARNING: mac not equal...");
-		PrintAndLogEx(WARNING, "MAC   card: %s", sprint_hex(&data[blocksCount * 16 + 1], 8));
-		PrintAndLogEx(WARNING, "MAC reader: %s", sprint_hex(mac, 8));
-	} else {
-	if(verbose)
-			PrintAndLogEx(INFO, "MAC: %s", sprint_hex(&data[blocksCount * 16 + 1], 8));
-	}
+    if (memcmp(&data[blocksCount * 16 + 1], mac, 8)) {
+        PrintAndLogEx(WARNING, "WARNING: mac not equal...");
+        PrintAndLogEx(WARNING, "MAC   card: %s", sprint_hex(&data[blocksCount * 16 + 1], 8));
+        PrintAndLogEx(WARNING, "MAC reader: %s", sprint_hex(mac, 8));
+    } else {
+    if(verbose)
+            PrintAndLogEx(INFO, "MAC: %s", sprint_hex(&data[blocksCount * 16 + 1], 8));
+    }
 
-	return 0;
+    return 0;
 }
 
 int CmdHFMFPRdsc(const char *cmd) {
-	uint8_t keyn[2] = {0};
-	uint8_t key[250] = {0};
-	int keylen = 0;
+    uint8_t keyn[2] = {0};
+    uint8_t key[250] = {0};
+    int keylen = 0;
 
-	CLIParserInit("hf mfp rdsc",
-		"Reads one sector from Mifare Plus card.",
-		"Usage:\n\thf mfp rdsc 0 000102030405060708090a0b0c0d0e0f -> executes authentication and read sector 0 data\n"
-			"\thf mfp rdsc 1 -v -> executes authentication and shows sector 1 data with default key 0xFF..0xFF and some additional data\n");
+    CLIParserInit("hf mfp rdsc",
+        "Reads one sector from Mifare Plus card.",
+        "Usage:\n\thf mfp rdsc 0 000102030405060708090a0b0c0d0e0f -> executes authentication and read sector 0 data\n"
+            "\thf mfp rdsc 1 -v -> executes authentication and shows sector 1 data with default key 0xFF..0xFF and some additional data\n");
 
-	void* argtable[] = {
-		arg_param_begin,
-		arg_lit0("vV",  "verbose", "show internal data."),
-		arg_lit0("bB",  "keyb",    "use key B (by default keyA)."),
-		arg_lit0("pP",  "plain",   "plain communication mode between reader and card."),
-		arg_int1(NULL,  NULL,      "<Sector Num (0..255)>", NULL),
-		arg_str0(NULL,  NULL,      "<Key Value (HEX 16 bytes)>", NULL),
-		arg_param_end
-	};
-	CLIExecWithReturn(cmd, argtable, false);
+    void* argtable[] = {
+        arg_param_begin,
+        arg_lit0("vV",  "verbose", "show internal data."),
+        arg_lit0("bB",  "keyb",    "use key B (by default keyA)."),
+        arg_lit0("pP",  "plain",   "plain communication mode between reader and card."),
+        arg_int1(NULL,  NULL,      "<Sector Num (0..255)>", NULL),
+        arg_str0(NULL,  NULL,      "<Key Value (HEX 16 bytes)>", NULL),
+        arg_param_end
+    };
+    CLIExecWithReturn(cmd, argtable, false);
 
-	bool verbose = arg_get_lit(1);
-	bool keyB = arg_get_lit(2);
-	bool plain = arg_get_lit(3);
-	uint32_t sectorNum = arg_get_int(4);
-	CLIGetHexWithReturn(5, key, &keylen);
-	CLIParserFree();
+    bool verbose = arg_get_lit(1);
+    bool keyB = arg_get_lit(2);
+    bool plain = arg_get_lit(3);
+    uint32_t sectorNum = arg_get_int(4);
+    CLIGetHexWithReturn(5, key, &keylen);
+    CLIParserFree();
 
-	mfpSetVerboseMode(verbose);
+    mfpSetVerboseMode(verbose);
 
-	if (!keylen) {
-		memmove(key, DefaultKey, 16);
-		keylen = 16;
-	}
+    if (!keylen) {
+        memmove(key, DefaultKey, 16);
+        keylen = 16;
+    }
 
-	if (sectorNum > 39) {
-		PrintAndLogEx(ERR, "<Sector Num> must be in range [0..39] instead of: %d", sectorNum);
-		return 1;
-	}
+    if (sectorNum > 39) {
+        PrintAndLogEx(ERR, "<Sector Num> must be in range [0..39] instead of: %d", sectorNum);
+        return 1;
+    }
 
-	if (keylen != 16) {
-		PrintAndLogEx(ERR, "<Key Value> must be 16 bytes long instead of: %d", keylen);
-		return 1;
-	}
+    if (keylen != 16) {
+        PrintAndLogEx(ERR, "<Key Value> must be 16 bytes long instead of: %d", keylen);
+        return 1;
+    }
 
-	uint16_t uKeyNum = 0x4000 + sectorNum * 2 + (keyB ? 1 : 0);
-	keyn[0] = uKeyNum >> 8;
-	keyn[1] = uKeyNum & 0xff;
-	if (verbose)
-		PrintAndLogEx(INFO, "--sector[%d]:%02x key:%04x", mfNumBlocksPerSector(sectorNum), sectorNum, uKeyNum);
+    uint16_t uKeyNum = 0x4000 + sectorNum * 2 + (keyB ? 1 : 0);
+    keyn[0] = uKeyNum >> 8;
+    keyn[1] = uKeyNum & 0xff;
+    if (verbose)
+        PrintAndLogEx(INFO, "--sector[%d]:%02x key:%04x", mfNumBlocksPerSector(sectorNum), sectorNum, uKeyNum);
 
-	mf4Session session;
-	int res = MifareAuth4(&session, keyn, key, true, true, verbose);
-	if (res) {
-		PrintAndLogEx(ERR, "Authentication error: %d", res);
-		return res;
-	}
+    mf4Session session;
+    int res = MifareAuth4(&session, keyn, key, true, true, verbose);
+    if (res) {
+        PrintAndLogEx(ERR, "Authentication error: %d", res);
+        return res;
+    }
 
-	uint8_t data[250] = {0};
-	int datalen = 0;
-	uint8_t mac[8] = {0};
-	for(int n = mfFirstBlockOfSector(sectorNum); n < mfFirstBlockOfSector(sectorNum) + mfNumBlocksPerSector(sectorNum); n++) {
-		res = MFPReadBlock(&session, plain, n & 0xff, 1, false, true, data, sizeof(data), &datalen, mac);
-		if (res) {
-			PrintAndLogEx(ERR, "Read error: %d", res);
-			DropField();
-			return res;
-		}
+    uint8_t data[250] = {0};
+    int datalen = 0;
+    uint8_t mac[8] = {0};
+    for(int n = mfFirstBlockOfSector(sectorNum); n < mfFirstBlockOfSector(sectorNum) + mfNumBlocksPerSector(sectorNum); n++) {
+        res = MFPReadBlock(&session, plain, n & 0xff, 1, false, true, data, sizeof(data), &datalen, mac);
+        if (res) {
+            PrintAndLogEx(ERR, "Read error: %d", res);
+            DropField();
+            return res;
+        }
 
-		if (datalen && data[0] != 0x90) {
-			PrintAndLogEx(ERR, "Card read error: %02x %s", data[0], mfpGetErrorDescription(data[0]));
-			DropField();
-			return 6;
-		}
-		if (datalen != 1 + 16 + 8 + 2) {
-			PrintAndLogEx(ERR, "Error return length:%d", datalen);
-			DropField();
-			return 5;
-		}
+        if (datalen && data[0] != 0x90) {
+            PrintAndLogEx(ERR, "Card read error: %02x %s", data[0], mfpGetErrorDescription(data[0]));
+            DropField();
+            return 6;
+        }
+        if (datalen != 1 + 16 + 8 + 2) {
+            PrintAndLogEx(ERR, "Error return length:%d", datalen);
+            DropField();
+            return 5;
+        }
 
-		PrintAndLogEx(INFO, "data[%03d]: %s", n, sprint_hex(&data[1], 16));
+        PrintAndLogEx(INFO, "data[%03d]: %s", n, sprint_hex(&data[1], 16));
 
-		if (memcmp(&data[1 + 16], mac, 8)) {
-			PrintAndLogEx(WARNING, "WARNING: mac on block %d not equal...", n);
-			PrintAndLogEx(WARNING, "MAC   card: %s", sprint_hex(&data[1 + 16], 8));
-			PrintAndLogEx(WARNING, "MAC reader: %s", sprint_hex(mac, 8));
-		} else {
-			if(verbose)
-				PrintAndLogEx(INFO, "MAC: %s", sprint_hex(&data[1 + 16], 8));
-		}
-	}
-	DropField();
+        if (memcmp(&data[1 + 16], mac, 8)) {
+            PrintAndLogEx(WARNING, "WARNING: mac on block %d not equal...", n);
+            PrintAndLogEx(WARNING, "MAC   card: %s", sprint_hex(&data[1 + 16], 8));
+            PrintAndLogEx(WARNING, "MAC reader: %s", sprint_hex(mac, 8));
+        } else {
+            if(verbose)
+                PrintAndLogEx(INFO, "MAC: %s", sprint_hex(&data[1 + 16], 8));
+        }
+    }
+    DropField();
 
-	return 0;
+    return 0;
 }
 
 int CmdHFMFPWrbl(const char *cmd) {
-	uint8_t keyn[2] = {0};
-	uint8_t key[250] = {0};
-	int keylen = 0;
-	uint8_t datain[250] = {0};
-	int datainlen = 0;
+    uint8_t keyn[2] = {0};
+    uint8_t key[250] = {0};
+    int keylen = 0;
+    uint8_t datain[250] = {0};
+    int datainlen = 0;
 
-	CLIParserInit("hf mfp wrbl",
-		"Writes one block to Mifare Plus card.",
-		"Usage:\n\thf mfp wrbl 1 ff0000000000000000000000000000ff 000102030405060708090a0b0c0d0e0f -> writes block 1 data\n"
-			"\thf mfp wrbl 2 ff0000000000000000000000000000ff -v -> writes block 2 data with default key 0xFF..0xFF and some additional data\n");
+    CLIParserInit("hf mfp wrbl",
+        "Writes one block to Mifare Plus card.",
+        "Usage:\n\thf mfp wrbl 1 ff0000000000000000000000000000ff 000102030405060708090a0b0c0d0e0f -> writes block 1 data\n"
+            "\thf mfp wrbl 2 ff0000000000000000000000000000ff -v -> writes block 2 data with default key 0xFF..0xFF and some additional data\n");
 
-	void* argtable[] = {
-		arg_param_begin,
-		arg_lit0("vV",  "verbose", "show internal data."),
-		arg_lit0("bB",  "keyb",    "use key B (by default keyA)."),
-		arg_int1(NULL,  NULL,      "<Block Num (0..255)>", NULL),
-		arg_str1(NULL,  NULL,      "<Data (HEX 16 bytes)>", NULL),
-		arg_str0(NULL,  NULL,      "<Key (HEX 16 bytes)>", NULL),
-		arg_param_end
-	};
-	CLIExecWithReturn(cmd, argtable, false);
+    void* argtable[] = {
+        arg_param_begin,
+        arg_lit0("vV",  "verbose", "show internal data."),
+        arg_lit0("bB",  "keyb",    "use key B (by default keyA)."),
+        arg_int1(NULL,  NULL,      "<Block Num (0..255)>", NULL),
+        arg_str1(NULL,  NULL,      "<Data (HEX 16 bytes)>", NULL),
+        arg_str0(NULL,  NULL,      "<Key (HEX 16 bytes)>", NULL),
+        arg_param_end
+    };
+    CLIExecWithReturn(cmd, argtable, false);
 
-	bool verbose = arg_get_lit(1);
-	bool keyB = arg_get_lit(2);
-	uint32_t blockNum = arg_get_int(3);
-	CLIGetHexWithReturn(4, datain, &datainlen);
-	CLIGetHexWithReturn(5, key, &keylen);
-	CLIParserFree();
+    bool verbose = arg_get_lit(1);
+    bool keyB = arg_get_lit(2);
+    uint32_t blockNum = arg_get_int(3);
+    CLIGetHexWithReturn(4, datain, &datainlen);
+    CLIGetHexWithReturn(5, key, &keylen);
+    CLIParserFree();
 
-	mfpSetVerboseMode(verbose);
+    mfpSetVerboseMode(verbose);
 
-	if (!keylen) {
-		memmove(key, DefaultKey, 16);
-		keylen = 16;
-	}
+    if (!keylen) {
+        memmove(key, DefaultKey, 16);
+        keylen = 16;
+    }
 
-	if (blockNum > 39) {
-		PrintAndLogEx(ERR, "<Block Num> must be in range [0..255] instead of: %d", blockNum);
-		return 1;
-	}
+    if (blockNum > 39) {
+        PrintAndLogEx(ERR, "<Block Num> must be in range [0..255] instead of: %d", blockNum);
+        return 1;
+    }
 
-	if (keylen != 16) {
-		PrintAndLogEx(ERR, "<Key> must be 16 bytes long instead of: %d", keylen);
-		return 1;
-	}
+    if (keylen != 16) {
+        PrintAndLogEx(ERR, "<Key> must be 16 bytes long instead of: %d", keylen);
+        return 1;
+    }
 
-	if (datainlen != 16) {
-		PrintAndLogEx(ERR, "<Data> must be 16 bytes long instead of: %d", datainlen);
-		return 1;
-	}
+    if (datainlen != 16) {
+        PrintAndLogEx(ERR, "<Data> must be 16 bytes long instead of: %d", datainlen);
+        return 1;
+    }
 
-	uint8_t sectorNum = mfSectorNum(blockNum & 0xff);
-	uint16_t uKeyNum = 0x4000 + sectorNum * 2 + (keyB ? 1 : 0);
-	keyn[0] = uKeyNum >> 8;
-	keyn[1] = uKeyNum & 0xff;
-	if (verbose)
-		PrintAndLogEx(INFO, "--block:%d sector[%d]:%02x key:%04x", blockNum & 0xff, mfNumBlocksPerSector(sectorNum), sectorNum, uKeyNum);
+    uint8_t sectorNum = mfSectorNum(blockNum & 0xff);
+    uint16_t uKeyNum = 0x4000 + sectorNum * 2 + (keyB ? 1 : 0);
+    keyn[0] = uKeyNum >> 8;
+    keyn[1] = uKeyNum & 0xff;
+    if (verbose)
+        PrintAndLogEx(INFO, "--block:%d sector[%d]:%02x key:%04x", blockNum & 0xff, mfNumBlocksPerSector(sectorNum), sectorNum, uKeyNum);
 
-	mf4Session session;
-	int res = MifareAuth4(&session, keyn, key, true, true, verbose);
-	if (res) {
-		PrintAndLogEx(ERR, "Authentication error: %d", res);
-		return res;
-	}
+    mf4Session session;
+    int res = MifareAuth4(&session, keyn, key, true, true, verbose);
+    if (res) {
+        PrintAndLogEx(ERR, "Authentication error: %d", res);
+        return res;
+    }
 
-	uint8_t data[250] = {0};
-	int datalen = 0;
-	uint8_t mac[8] = {0};
-	res = MFPWriteBlock(&session, blockNum & 0xff, datain, false, false, data, sizeof(data), &datalen, mac);
-	if (res) {
-		PrintAndLogEx(ERR, "Write error: %d", res);
-		DropField();
-		return res;
-	}
+    uint8_t data[250] = {0};
+    int datalen = 0;
+    uint8_t mac[8] = {0};
+    res = MFPWriteBlock(&session, blockNum & 0xff, datain, false, false, data, sizeof(data), &datalen, mac);
+    if (res) {
+        PrintAndLogEx(ERR, "Write error: %d", res);
+        DropField();
+        return res;
+    }
 
-	if (datalen != 3 && (datalen != 3 + 8)) {
-		PrintAndLogEx(ERR, "Error return length:%d", datalen);
-		DropField();
-		return 5;
-	}
+    if (datalen != 3 && (datalen != 3 + 8)) {
+        PrintAndLogEx(ERR, "Error return length:%d", datalen);
+        DropField();
+        return 5;
+    }
 
-	if (datalen && data[0] != 0x90) {
-		PrintAndLogEx(ERR, "Card write error: %02x %s", data[0], mfpGetErrorDescription(data[0]));
-		DropField();
-		return 6;
-	}
+    if (datalen && data[0] != 0x90) {
+        PrintAndLogEx(ERR, "Card write error: %02x %s", data[0], mfpGetErrorDescription(data[0]));
+        DropField();
+        return 6;
+    }
 
-	if (memcmp(&data[1], mac, 8)) {
-		PrintAndLogEx(WARNING, "WARNING: mac not equal...");
-		PrintAndLogEx(WARNING, "MAC   card: %s", sprint_hex(&data[1], 8));
-		PrintAndLogEx(WARNING, "MAC reader: %s", sprint_hex(mac, 8));
-	} else {
-		if(verbose)
-			PrintAndLogEx(INFO, "MAC: %s", sprint_hex(&data[1], 8));
-	}
+    if (memcmp(&data[1], mac, 8)) {
+        PrintAndLogEx(WARNING, "WARNING: mac not equal...");
+        PrintAndLogEx(WARNING, "MAC   card: %s", sprint_hex(&data[1], 8));
+        PrintAndLogEx(WARNING, "MAC reader: %s", sprint_hex(mac, 8));
+    } else {
+        if(verbose)
+            PrintAndLogEx(INFO, "MAC: %s", sprint_hex(&data[1], 8));
+    }
 
-	DropField();
-	PrintAndLogEx(INFO, "Write OK.");
-	return 0;
+    DropField();
+    PrintAndLogEx(INFO, "Write OK.");
+    return 0;
 }
 
 int CmdHFMFPMAD(const char *cmd) {
 
-	CLIParserInit("hf mfp mad",
-		"Checks and prints Mifare Application Directory (MAD)",
-		"Usage:\n\thf mfp mad -> shows MAD if exists\n"
-			"\thf mfp mad -a 03e1 -k d3f7d3f7d3f7d3f7d3f7d3f7d3f7d3f7 -> shows NDEF data if exists\n");
+    CLIParserInit("hf mfp mad",
+        "Checks and prints Mifare Application Directory (MAD)",
+        "Usage:\n\thf mfp mad -> shows MAD if exists\n"
+            "\thf mfp mad -a 03e1 -k d3f7d3f7d3f7d3f7d3f7d3f7d3f7d3f7 -> shows NDEF data if exists\n");
 
-	void* argtable[] = {
-		arg_param_begin,
-		arg_lit0("vV",  "verbose",  "show technical data"),
-		arg_str0("aA",  "aid",      "print all sectors with aid", NULL),
-		arg_str0("kK",  "key",      "key for printing sectors", NULL),
-		arg_lit0("bB",  "keyb",     "use key B for access printing sectors (by default: key A)"),
-		arg_param_end
-	};
-	CLIExecWithReturn(cmd, argtable, true);
+    void* argtable[] = {
+        arg_param_begin,
+        arg_lit0("vV",  "verbose",  "show technical data"),
+        arg_str0("aA",  "aid",      "print all sectors with aid", NULL),
+        arg_str0("kK",  "key",      "key for printing sectors", NULL),
+        arg_lit0("bB",  "keyb",     "use key B for access printing sectors (by default: key A)"),
+        arg_param_end
+    };
+    CLIExecWithReturn(cmd, argtable, true);
 
-	bool verbose = arg_get_lit(1);
-	uint8_t aid[2] = {0};
-	int aidlen;
-	CLIGetHexWithReturn(2, aid, &aidlen);
-	uint8_t key[16] = {0};
-	int keylen;
-	CLIGetHexWithReturn(3, key, &keylen);
-	bool keyB = arg_get_lit(4);
+    bool verbose = arg_get_lit(1);
+    uint8_t aid[2] = {0};
+    int aidlen;
+    CLIGetHexWithReturn(2, aid, &aidlen);
+    uint8_t key[16] = {0};
+    int keylen;
+    CLIGetHexWithReturn(3, key, &keylen);
+    bool keyB = arg_get_lit(4);
 
-	CLIParserFree();
+    CLIParserFree();
 
-	if (aidlen != 2 && keylen > 0) {
-		PrintAndLogEx(WARNING, "do not need a key without aid.");
-	}
+    if (aidlen != 2 && keylen > 0) {
+        PrintAndLogEx(WARNING, "do not need a key without aid.");
+    }
 
-	uint8_t sector0[16 * 4] = {0};
-	uint8_t sector10[16 * 4] = {0};
+    uint8_t sector0[16 * 4] = {0};
+    uint8_t sector10[16 * 4] = {0};
 
-	if (mfpReadSector(MF_MAD1_SECTOR, MF_KEY_A, (uint8_t *)g_mifarep_mad_key, sector0, verbose)) {
-		PrintAndLogEx(NORMAL, "");
-		PrintAndLogEx(ERR, "read sector 0 error. card don't have MAD or don't have MAD on default keys.");
-		return 2;
-	}
+    if (mfpReadSector(MF_MAD1_SECTOR, MF_KEY_A, (uint8_t *)g_mifarep_mad_key, sector0, verbose)) {
+        PrintAndLogEx(NORMAL, "");
+        PrintAndLogEx(ERR, "read sector 0 error. card don't have MAD or don't have MAD on default keys.");
+        return 2;
+    }
 
-	if (verbose) {
-		for(int i = 0; i < 4; i ++)
-			PrintAndLogEx(NORMAL, "[%d] %s", i, sprint_hex(&sector0[i * 16], 16));
-	}
+    if (verbose) {
+        for(int i = 0; i < 4; i ++)
+            PrintAndLogEx(NORMAL, "[%d] %s", i, sprint_hex(&sector0[i * 16], 16));
+    }
 
-	bool haveMAD2 = false;
-	MAD1DecodeAndPrint(sector0, verbose, &haveMAD2);
+    bool haveMAD2 = false;
+    MAD1DecodeAndPrint(sector0, verbose, &haveMAD2);
 
-	if (haveMAD2) {
-		if (mfpReadSector(MF_MAD2_SECTOR, MF_KEY_A, (uint8_t *)g_mifarep_mad_key, sector10, verbose)) {
-			PrintAndLogEx(NORMAL, "");
-			PrintAndLogEx(ERR, "read sector 0x10 error. card don't have MAD or don't have MAD on default keys.");
-			return 2;
-		}
+    if (haveMAD2) {
+        if (mfpReadSector(MF_MAD2_SECTOR, MF_KEY_A, (uint8_t *)g_mifarep_mad_key, sector10, verbose)) {
+            PrintAndLogEx(NORMAL, "");
+            PrintAndLogEx(ERR, "read sector 0x10 error. card don't have MAD or don't have MAD on default keys.");
+            return 2;
+        }
 
-		MAD2DecodeAndPrint(sector10, verbose);
-	}
+        MAD2DecodeAndPrint(sector10, verbose);
+    }
 
-	if (aidlen == 2) {
-		uint16_t aaid = (aid[0] << 8) + aid[1];
-		PrintAndLogEx(NORMAL, "\n-------------- AID 0x%04x ---------------", aaid);
+    if (aidlen == 2) {
+        uint16_t aaid = (aid[0] << 8) + aid[1];
+        PrintAndLogEx(NORMAL, "\n-------------- AID 0x%04x ---------------", aaid);
 
-		uint16_t mad[7 + 8 + 8 + 8 + 8] = {0};
-		size_t madlen = 0;
-		if (MADDecode(sector0, sector10, mad, &madlen)) {
-			PrintAndLogEx(ERR, "can't decode mad.");
-			return 10;
-		}
+        uint16_t mad[7 + 8 + 8 + 8 + 8] = {0};
+        size_t madlen = 0;
+        if (MADDecode(sector0, sector10, mad, &madlen)) {
+            PrintAndLogEx(ERR, "can't decode mad.");
+            return 10;
+        }
 
-		uint8_t akey[16] = {0};
-		memcpy(akey, g_mifarep_ndef_key, 16);
-		if (keylen == 16) {
-			memcpy(akey, key, 16);
-		}
+        uint8_t akey[16] = {0};
+        memcpy(akey, g_mifarep_ndef_key, 16);
+        if (keylen == 16) {
+            memcpy(akey, key, 16);
+        }
 
-		for (int i = 0; i < madlen; i++) {
-			if (aaid == mad[i]) {
-				uint8_t vsector[16 * 4] = {0};
-				if (mfpReadSector(i + 1, keyB ? MF_KEY_B : MF_KEY_A, akey, vsector, false)) {
-					PrintAndLogEx(NORMAL, "");
-					PrintAndLogEx(ERR, "read sector %d error.", i + 1);
-					return 2;
-				}
+        for (int i = 0; i < madlen; i++) {
+            if (aaid == mad[i]) {
+                uint8_t vsector[16 * 4] = {0};
+                if (mfpReadSector(i + 1, keyB ? MF_KEY_B : MF_KEY_A, akey, vsector, false)) {
+                    PrintAndLogEx(NORMAL, "");
+                    PrintAndLogEx(ERR, "read sector %d error.", i + 1);
+                    return 2;
+                }
 
-				for(int j = 0; j < (verbose ? 4 : 3); j ++)
-					PrintAndLogEx(NORMAL, " [%03d] %s", (i + 1) * 4 + j, sprint_hex(&vsector[j * 16], 16));
-			}
-		}
-	}
+                for(int j = 0; j < (verbose ? 4 : 3); j ++)
+                    PrintAndLogEx(NORMAL, " [%03d] %s", (i + 1) * 4 + j, sprint_hex(&vsector[j * 16], 16));
+            }
+        }
+    }
 
-	return 0;
+    return 0;
 }
 
 int CmdHFMFPNDEF(const char *cmd) {
 
-	CLIParserInit("hf mfp ndef",
-		"Prints NFC Data Exchange Format (NDEF)",
-		"Usage:\n\thf mfp ndef -> shows NDEF data\n"
-			"\thf mfp ndef -a 03e1 -k d3f7d3f7d3f7d3f7d3f7d3f7d3f7d3f7 -> shows NDEF data with custom AID and key\n");
+    CLIParserInit("hf mfp ndef",
+        "Prints NFC Data Exchange Format (NDEF)",
+        "Usage:\n\thf mfp ndef -> shows NDEF data\n"
+            "\thf mfp ndef -a 03e1 -k d3f7d3f7d3f7d3f7d3f7d3f7d3f7d3f7 -> shows NDEF data with custom AID and key\n");
 
-	void* argtable[] = {
-		arg_param_begin,
-		arg_litn("vV",  "verbose",  0, 2, "show technical data"),
-		arg_str0("aA",  "aid",      "replace default aid for NDEF", NULL),
-		arg_str0("kK",  "key",      "replace default key for NDEF", NULL),
-		arg_lit0("bB",  "keyb",     "use key B for access sectors (by default: key A)"),
-		arg_param_end
-	};
-	CLIExecWithReturn(cmd, argtable, true);
+    void* argtable[] = {
+        arg_param_begin,
+        arg_litn("vV",  "verbose",  0, 2, "show technical data"),
+        arg_str0("aA",  "aid",      "replace default aid for NDEF", NULL),
+        arg_str0("kK",  "key",      "replace default key for NDEF", NULL),
+        arg_lit0("bB",  "keyb",     "use key B for access sectors (by default: key A)"),
+        arg_param_end
+    };
+    CLIExecWithReturn(cmd, argtable, true);
 
-	bool verbose = arg_get_lit(1);
-	bool verbose2 = arg_get_lit(1) > 1;
-	uint8_t aid[2] = {0};
-	int aidlen;
-	CLIGetHexWithReturn(2, aid, &aidlen);
-	uint8_t key[16] = {0};
-	int keylen;
-	CLIGetHexWithReturn(3, key, &keylen);
-	bool keyB = arg_get_lit(4);
+    bool verbose = arg_get_lit(1);
+    bool verbose2 = arg_get_lit(1) > 1;
+    uint8_t aid[2] = {0};
+    int aidlen;
+    CLIGetHexWithReturn(2, aid, &aidlen);
+    uint8_t key[16] = {0};
+    int keylen;
+    CLIGetHexWithReturn(3, key, &keylen);
+    bool keyB = arg_get_lit(4);
 
-	CLIParserFree();
+    CLIParserFree();
 
-	uint16_t ndefAID = 0x03e1;
-	if (aidlen == 2)
-		ndefAID = (aid[0] << 8) + aid[1];
+    uint16_t ndefAID = 0x03e1;
+    if (aidlen == 2)
+        ndefAID = (aid[0] << 8) + aid[1];
 
-	uint8_t ndefkey[16] = {0};
-	memcpy(ndefkey, g_mifarep_ndef_key, 16);
-	if (keylen == 16) {
-		memcpy(ndefkey, key, 16);
-	}
+    uint8_t ndefkey[16] = {0};
+    memcpy(ndefkey, g_mifarep_ndef_key, 16);
+    if (keylen == 16) {
+        memcpy(ndefkey, key, 16);
+    }
 
-	uint8_t sector0[16 * 4] = {0};
-	uint8_t sector10[16 * 4] = {0};
-	uint8_t data[4096] = {0};
-	int datalen = 0;
+    uint8_t sector0[16 * 4] = {0};
+    uint8_t sector10[16 * 4] = {0};
+    uint8_t data[4096] = {0};
+    int datalen = 0;
 
-	PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "");
 
-	if (mfpReadSector(MF_MAD1_SECTOR, MF_KEY_A, (uint8_t *)g_mifarep_mad_key, sector0, verbose)) {
-		PrintAndLogEx(ERR, "read sector 0 error. card don't have MAD or don't have MAD on default keys.");
-		return 2;
-	}
+    if (mfpReadSector(MF_MAD1_SECTOR, MF_KEY_A, (uint8_t *)g_mifarep_mad_key, sector0, verbose)) {
+        PrintAndLogEx(ERR, "read sector 0 error. card don't have MAD or don't have MAD on default keys.");
+        return 2;
+    }
 
-	bool haveMAD2 = false;
-	int res = MADCheck(sector0, NULL, verbose, &haveMAD2);
-	if (res) {
-		PrintAndLogEx(ERR, "MAD error %d.", res);
-		return res;
-	}
+    bool haveMAD2 = false;
+    int res = MADCheck(sector0, NULL, verbose, &haveMAD2);
+    if (res) {
+        PrintAndLogEx(ERR, "MAD error %d.", res);
+        return res;
+    }
 
-	if (haveMAD2) {
-		if (mfpReadSector(MF_MAD2_SECTOR, MF_KEY_A, (uint8_t *)g_mifarep_mad_key, sector10, verbose)) {
-			PrintAndLogEx(ERR, "read sector 0x10 error. card don't have MAD or don't have MAD on default keys.");
-			return 2;
-		}
-	}
+    if (haveMAD2) {
+        if (mfpReadSector(MF_MAD2_SECTOR, MF_KEY_A, (uint8_t *)g_mifarep_mad_key, sector10, verbose)) {
+            PrintAndLogEx(ERR, "read sector 0x10 error. card don't have MAD or don't have MAD on default keys.");
+            return 2;
+        }
+    }
 
-	uint16_t mad[7 + 8 + 8 + 8 + 8] = {0};
-	size_t madlen = 0;
-	if (MADDecode(sector0, (haveMAD2 ? sector10 : NULL), mad, &madlen)) {
-		PrintAndLogEx(ERR, "can't decode mad.");
-		return 10;
-	}
+    uint16_t mad[7 + 8 + 8 + 8 + 8] = {0};
+    size_t madlen = 0;
+    if (MADDecode(sector0, (haveMAD2 ? sector10 : NULL), mad, &madlen)) {
+        PrintAndLogEx(ERR, "can't decode mad.");
+        return 10;
+    }
 
-	printf("data reading:");
-	for (int i = 0; i < madlen; i++) {
-		if (ndefAID == mad[i]) {
-			uint8_t vsector[16 * 4] = {0};
-			if (mfpReadSector(i + 1, keyB ? MF_KEY_B : MF_KEY_A, ndefkey, vsector, false)) {
-				PrintAndLogEx(ERR, "read sector %d error.", i + 1);
-				return 2;
-			}
+    printf("data reading:");
+    for (int i = 0; i < madlen; i++) {
+        if (ndefAID == mad[i]) {
+            uint8_t vsector[16 * 4] = {0};
+            if (mfpReadSector(i + 1, keyB ? MF_KEY_B : MF_KEY_A, ndefkey, vsector, false)) {
+                PrintAndLogEx(ERR, "read sector %d error.", i + 1);
+                return 2;
+            }
 
-			memcpy(&data[datalen], vsector, 16 * 3);
-			datalen += 16 * 3;
+            memcpy(&data[datalen], vsector, 16 * 3);
+            datalen += 16 * 3;
 
-			printf(".");
-		}
-	}
-	printf(" OK\n");
+            printf(".");
+        }
+    }
+    printf(" OK\n");
 
-	if (!datalen) {
-		PrintAndLogEx(ERR, "no NDEF data.");
-		return 11;
-	}
+    if (!datalen) {
+        PrintAndLogEx(ERR, "no NDEF data.");
+        return 11;
+    }
 
-	if (verbose2) {
-		PrintAndLogEx(NORMAL, "NDEF data:");
-		dump_buffer(data, datalen, stdout, 1);
-	}
+    if (verbose2) {
+        PrintAndLogEx(NORMAL, "NDEF data:");
+        dump_buffer(data, datalen, stdout, 1);
+    }
 
-	NDEFDecodeAndPrint(data, datalen, verbose);
+    NDEFDecodeAndPrint(data, datalen, verbose);
 
-	return 0;
+    return 0;
 }
 
 static command_t CommandTable[] =
 {
-  {"help",             CmdHelp,					1, "This help"},
-  {"info",  	       CmdHFMFPInfo,			0, "Info about Mifare Plus tag"},
-  {"wrp",	  	       CmdHFMFPWritePerso,		0, "Write Perso command"},
-  {"initp",  	       CmdHFMFPInitPerso,		0, "Fills all the card's keys"},
-  {"commitp",  	       CmdHFMFPCommitPerso,		0, "Move card to SL1 or SL3 mode"},
-  {"auth",  	       CmdHFMFPAuth,			0, "Authentication"},
-  {"rdbl",  	       CmdHFMFPRdbl,			0, "Read blocks"},
-  {"rdsc",  	       CmdHFMFPRdsc,			0, "Read sectors"},
-  {"wrbl",  	       CmdHFMFPWrbl,			0, "Write blocks"},
-  {"mad",  	           CmdHFMFPMAD,				0, "Checks and prints MAD"},
-  {"ndef",  	       CmdHFMFPNDEF,			0, "Prints NDEF records from card"},
-  {NULL,               NULL,					0, NULL}
+  {"help",             CmdHelp,                 1, "This help"},
+  {"info",             CmdHFMFPInfo,            0, "Info about Mifare Plus tag"},
+  {"wrp",              CmdHFMFPWritePerso,      0, "Write Perso command"},
+  {"initp",            CmdHFMFPInitPerso,       0, "Fills all the card's keys"},
+  {"commitp",          CmdHFMFPCommitPerso,     0, "Move card to SL1 or SL3 mode"},
+  {"auth",             CmdHFMFPAuth,            0, "Authentication"},
+  {"rdbl",             CmdHFMFPRdbl,            0, "Read blocks"},
+  {"rdsc",             CmdHFMFPRdsc,            0, "Read sectors"},
+  {"wrbl",             CmdHFMFPWrbl,            0, "Write blocks"},
+  {"mad",              CmdHFMFPMAD,             0, "Checks and prints MAD"},
+  {"ndef",             CmdHFMFPNDEF,            0, "Prints NDEF records from card"},
+  {NULL,               NULL,                    0, NULL}
 };
 
 int CmdHFMFP(const char *Cmd) {
-	(void)WaitForResponseTimeout(CMD_ACK,NULL,100);
-	CmdsParse(CommandTable, Cmd);
-	return 0;
+    (void)WaitForResponseTimeout(CMD_ACK,NULL,100);
+    CmdsParse(CommandTable, Cmd);
+    return 0;
 }
 
 int CmdHelp(const char *Cmd) {
diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index c24ba6407..9dd6f979e 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -9,237 +9,237 @@
 //-----------------------------------------------------------------------------
 #include "cmdhfmfu.h"
 
-#define MAX_UL_BLOCKS		0x0F
-#define MAX_ULC_BLOCKS		0x2B
-#define MAX_ULEV1a_BLOCKS	0x13
-#define MAX_ULEV1b_BLOCKS	0x28
-#define MAX_NTAG_203		0x29
-#define MAX_NTAG_210		0x13
-#define MAX_NTAG_212		0x28
-#define MAX_NTAG_213		0x2C
-#define MAX_NTAG_215		0x86
-#define MAX_NTAG_216		0xE6
-#define MAX_MY_D_NFC		0xFF
-#define MAX_MY_D_MOVE		0x25
-#define MAX_MY_D_MOVE_LEAN	0x0F
-#define MAX_UL_NANO_40		0x0A
+#define MAX_UL_BLOCKS       0x0F
+#define MAX_ULC_BLOCKS      0x2B
+#define MAX_ULEV1a_BLOCKS   0x13
+#define MAX_ULEV1b_BLOCKS   0x28
+#define MAX_NTAG_203        0x29
+#define MAX_NTAG_210        0x13
+#define MAX_NTAG_212        0x28
+#define MAX_NTAG_213        0x2C
+#define MAX_NTAG_215        0x86
+#define MAX_NTAG_216        0xE6
+#define MAX_MY_D_NFC        0xFF
+#define MAX_MY_D_MOVE       0x25
+#define MAX_MY_D_MOVE_LEAN  0x0F
+#define MAX_UL_NANO_40      0x0A
 
 static int CmdHelp(const char *Cmd);
 
 #define PUBLIC_ECDA_KEYLEN 33
 uint8_t public_ecda_key[PUBLIC_ECDA_KEYLEN] = {
-		0x04, 0x49, 0x4e, 0x1a, 0x38, 0x6d, 0x3d, 0x3c,
-		0xfe, 0x3d, 0xc1, 0x0e, 0x5d, 0xe6, 0x8a, 0x49,
-		0x9b, 0x1c, 0x20, 0x2d, 0xb5, 0xb1, 0x32, 0x39,
-		0x3e, 0x89, 0xed, 0x19, 0xfe, 0x5b, 0xe8, 0xbc,
-		0x61
+        0x04, 0x49, 0x4e, 0x1a, 0x38, 0x6d, 0x3d, 0x3c,
+        0xfe, 0x3d, 0xc1, 0x0e, 0x5d, 0xe6, 0x8a, 0x49,
+        0x9b, 0x1c, 0x20, 0x2d, 0xb5, 0xb1, 0x32, 0x39,
+        0x3e, 0x89, 0xed, 0x19, 0xfe, 0x5b, 0xe8, 0xbc,
+        0x61
 };
 
 #define KEYS_3DES_COUNT 7
 uint8_t default_3des_keys[KEYS_3DES_COUNT][16] = {
-		{ 0x42,0x52,0x45,0x41,0x4b,0x4d,0x45,0x49,0x46,0x59,0x4f,0x55,0x43,0x41,0x4e,0x21 },// 3des std key
-		{ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },// all zeroes
-		{ 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f },// 0x00-0x0F
-		{ 0x49,0x45,0x4D,0x4B,0x41,0x45,0x52,0x42,0x21,0x4E,0x41,0x43,0x55,0x4F,0x59,0x46 },// NFC-key
-		{ 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01 },// all ones
-		{ 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF },// all FF
-		{ 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x88,0x99,0xAA,0xBB,0xCC,0xDD,0xEE,0xFF }	// 11 22 33
+        { 0x42,0x52,0x45,0x41,0x4b,0x4d,0x45,0x49,0x46,0x59,0x4f,0x55,0x43,0x41,0x4e,0x21 },// 3des std key
+        { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },// all zeroes
+        { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f },// 0x00-0x0F
+        { 0x49,0x45,0x4D,0x4B,0x41,0x45,0x52,0x42,0x21,0x4E,0x41,0x43,0x55,0x4F,0x59,0x46 },// NFC-key
+        { 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01 },// all ones
+        { 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF },// all FF
+        { 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x88,0x99,0xAA,0xBB,0xCC,0xDD,0xEE,0xFF }    // 11 22 33
 };
 
 #define KEYS_PWD_COUNT 1
 uint8_t default_pwd_pack[KEYS_PWD_COUNT][4] = {
-	{0xFF,0xFF,0xFF,0xFF}, // PACK 0x00,0x00 -- factory default
+    {0xFF,0xFF,0xFF,0xFF}, // PACK 0x00,0x00 -- factory default
 };
 
 #define MAX_UL_TYPES 22
 uint32_t UL_TYPES_ARRAY[MAX_UL_TYPES] = {
-		UNKNOWN, 		UL,				UL_C,		UL_EV1_48,		UL_EV1_128,		NTAG,
-		NTAG_203,		NTAG_210,		NTAG_212,	NTAG_213,		NTAG_215,		NTAG_216,
-		MY_D,			MY_D_NFC,		MY_D_MOVE,	MY_D_MOVE_NFC,	MY_D_MOVE_LEAN,	FUDAN_UL,
-		UL_EV1,			NTAG_213_F,		NTAG_216_F,	UL_NANO_40
-	};
+    UNKNOWN,   UL,          UL_C,        UL_EV1_48,       UL_EV1_128,      NTAG,
+    NTAG_203,  NTAG_210,    NTAG_212,    NTAG_213,        NTAG_215,        NTAG_216,
+    MY_D,      MY_D_NFC,    MY_D_MOVE,   MY_D_MOVE_NFC,   MY_D_MOVE_LEAN,  FUDAN_UL,
+    UL_EV1,    NTAG_213_F,  NTAG_216_F,  UL_NANO_40
+};
 
 uint8_t UL_MEMORY_ARRAY[MAX_UL_TYPES] = {
-		MAX_UL_BLOCKS,		MAX_UL_BLOCKS,	MAX_ULC_BLOCKS,	MAX_ULEV1a_BLOCKS,	MAX_ULEV1b_BLOCKS,	MAX_NTAG_203,
-		MAX_NTAG_203,		MAX_NTAG_210,	MAX_NTAG_212,	MAX_NTAG_213,		MAX_NTAG_215,		MAX_NTAG_216,
-		MAX_UL_BLOCKS,		MAX_MY_D_NFC,	MAX_MY_D_MOVE,	MAX_MY_D_MOVE,		MAX_MY_D_MOVE_LEAN,	MAX_UL_BLOCKS,
-		MAX_ULEV1a_BLOCKS,	MAX_NTAG_213,	MAX_NTAG_216,	MAX_UL_NANO_40
-	};
+    MAX_UL_BLOCKS,     MAX_UL_BLOCKS, MAX_ULC_BLOCKS, MAX_ULEV1a_BLOCKS, MAX_ULEV1b_BLOCKS,  MAX_NTAG_203,
+    MAX_NTAG_203,      MAX_NTAG_210,  MAX_NTAG_212,   MAX_NTAG_213,      MAX_NTAG_215,       MAX_NTAG_216,
+    MAX_UL_BLOCKS,     MAX_MY_D_NFC,  MAX_MY_D_MOVE,  MAX_MY_D_MOVE,     MAX_MY_D_MOVE_LEAN, MAX_UL_BLOCKS,
+    MAX_ULEV1a_BLOCKS, MAX_NTAG_213,  MAX_NTAG_216,   MAX_UL_NANO_40
+};
 
 //------------------------------------
 // Pwd & Pack generation Stuff
 //------------------------------------
 const uint32_t c_D[] = {
-	0x6D835AFC, 0x7D15CD97, 0x0942B409, 0x32F9C923, 0xA811FB02, 0x64F121E8,
-	0xD1CC8B4E, 0xE8873E6F, 0x61399BBB, 0xF1B91926, 0xAC661520, 0xA21A31C9,
-	0xD424808D, 0xFE118E07, 0xD18E728D, 0xABAC9E17, 0x18066433, 0x00E18E79,
-	0x65A77305, 0x5AE9E297, 0x11FC628C, 0x7BB3431F, 0x942A8308, 0xB2F8FD20,
-	0x5728B869, 0x30726D5A
+    0x6D835AFC, 0x7D15CD97, 0x0942B409, 0x32F9C923, 0xA811FB02, 0x64F121E8,
+    0xD1CC8B4E, 0xE8873E6F, 0x61399BBB, 0xF1B91926, 0xAC661520, 0xA21A31C9,
+    0xD424808D, 0xFE118E07, 0xD18E728D, 0xABAC9E17, 0x18066433, 0x00E18E79,
+    0x65A77305, 0x5AE9E297, 0x11FC628C, 0x7BB3431F, 0x942A8308, 0xB2F8FD20,
+    0x5728B869, 0x30726D5A
 };
 
 void transform_D(uint8_t* ru) {
-	//Transform
-	uint8_t i;
-	uint8_t p = 0;
-	uint32_t v1 = ((ru[3] << 24) | (ru[2] << 16) | (ru[1] << 8) | ru[0]) + c_D[p++];
-	uint32_t v2 = ((ru[7] << 24) | (ru[6] << 16) | (ru[5] << 8) | ru[4]) + c_D[p++];
-	for (i = 0; i < 12; i += 2)
-	{
-		uint32_t t1 = ROTL(v1 ^ v2, v2 & 0x1F) + c_D[p++];
-		uint32_t t2 = ROTL(v2 ^ t1, t1 & 0x1F) + c_D[p++];
-		v1 = ROTL(t1 ^ t2, t2 & 0x1F) + c_D[p++];
-		v2 = ROTL(t2 ^ v1, v1 & 0x1F) + c_D[p++];
-	}
+    //Transform
+    uint8_t i;
+    uint8_t p = 0;
+    uint32_t v1 = ((ru[3] << 24) | (ru[2] << 16) | (ru[1] << 8) | ru[0]) + c_D[p++];
+    uint32_t v2 = ((ru[7] << 24) | (ru[6] << 16) | (ru[5] << 8) | ru[4]) + c_D[p++];
+    for (i = 0; i < 12; i += 2)
+    {
+        uint32_t t1 = ROTL(v1 ^ v2, v2 & 0x1F) + c_D[p++];
+        uint32_t t2 = ROTL(v2 ^ t1, t1 & 0x1F) + c_D[p++];
+        v1 = ROTL(t1 ^ t2, t2 & 0x1F) + c_D[p++];
+        v2 = ROTL(t2 ^ v1, v1 & 0x1F) + c_D[p++];
+    }
 
-	//Re-use ru
-	ru[0] = v1 & 0xFF;
-	ru[1] = (v1 >> 8) & 0xFF;
-	ru[2] = (v1 >> 16) & 0xFF;
-	ru[3] = (v1 >> 24) & 0xFF;
-	ru[4] = v2 & 0xFF;
-	ru[5] = (v2 >> 8) & 0xFF;
-	ru[6] = (v2 >> 16) & 0xFF;
-	ru[7] = (v2 >> 24) & 0xFF;
+    //Re-use ru
+    ru[0] = v1 & 0xFF;
+    ru[1] = (v1 >> 8) & 0xFF;
+    ru[2] = (v1 >> 16) & 0xFF;
+    ru[3] = (v1 >> 24) & 0xFF;
+    ru[4] = v2 & 0xFF;
+    ru[5] = (v2 >> 8) & 0xFF;
+    ru[6] = (v2 >> 16) & 0xFF;
+    ru[7] = (v2 >> 24) & 0xFF;
 }
 
 // Certain pwd generation algo nickname A.
 uint32_t ul_ev1_pwdgenA(uint8_t* uid) {
 
-	uint8_t pos = (uid[3] ^ uid[4] ^ uid[5] ^ uid[6]) % 32;
+    uint8_t pos = (uid[3] ^ uid[4] ^ uid[5] ^ uid[6]) % 32;
 
-	uint32_t xortable[] = {
-						0x4f2711c1, 0x07D7BB83, 0x9636EF07, 0xB5F4460E, 0xF271141C, 0x7D7BB038, 0x636EF871, 0x5F4468E3,
-						0x271149C7, 0xD7BB0B8F, 0x36EF8F1E, 0xF446863D, 0x7114947A, 0x7BB0B0F5, 0x6EF8F9EB, 0x44686BD7,
-						0x11494fAF, 0xBB0B075F, 0xEF8F96BE, 0x4686B57C, 0x1494F2F9, 0xB0B07DF3, 0xF8F963E6, 0x686B5FCC,
-						0x494F2799, 0x0B07D733, 0x8F963667, 0x86B5F4CE, 0x94F2719C, 0xB07D7B38, 0xF9636E70, 0x6B5F44E0
-						};
+    uint32_t xortable[] = {
+                        0x4f2711c1, 0x07D7BB83, 0x9636EF07, 0xB5F4460E, 0xF271141C, 0x7D7BB038, 0x636EF871, 0x5F4468E3,
+                        0x271149C7, 0xD7BB0B8F, 0x36EF8F1E, 0xF446863D, 0x7114947A, 0x7BB0B0F5, 0x6EF8F9EB, 0x44686BD7,
+                        0x11494fAF, 0xBB0B075F, 0xEF8F96BE, 0x4686B57C, 0x1494F2F9, 0xB0B07DF3, 0xF8F963E6, 0x686B5FCC,
+                        0x494F2799, 0x0B07D733, 0x8F963667, 0x86B5F4CE, 0x94F2719C, 0xB07D7B38, 0xF9636E70, 0x6B5F44E0
+                        };
 
-	uint8_t entry[] = {0x00,0x00,0x00,0x00};
-	uint8_t pwd[] = {0x00,0x00,0x00,0x00};
+    uint8_t entry[] = {0x00,0x00,0x00,0x00};
+    uint8_t pwd[] = {0x00,0x00,0x00,0x00};
 
-	num_to_bytes( xortable[pos], 4, entry);
+    num_to_bytes( xortable[pos], 4, entry);
 
-	pwd[0] = entry[0] ^ uid[1] ^ uid[2] ^ uid[3];
-	pwd[1] = entry[1] ^ uid[0] ^ uid[2] ^ uid[4];
-	pwd[2] = entry[2] ^ uid[0] ^ uid[1] ^ uid[5];
-	pwd[3] = entry[3] ^ uid[6];
+    pwd[0] = entry[0] ^ uid[1] ^ uid[2] ^ uid[3];
+    pwd[1] = entry[1] ^ uid[0] ^ uid[2] ^ uid[4];
+    pwd[2] = entry[2] ^ uid[0] ^ uid[1] ^ uid[5];
+    pwd[3] = entry[3] ^ uid[6];
 
-	return (uint32_t)bytes_to_num(pwd, 4);
+    return (uint32_t)bytes_to_num(pwd, 4);
 }
 
 // Certain pwd generation algo nickname B. (very simple)
 uint32_t ul_ev1_pwdgenB(uint8_t* uid) {
 
-	uint8_t pwd[] = {0x00,0x00,0x00,0x00};
+    uint8_t pwd[] = {0x00,0x00,0x00,0x00};
 
-	pwd[0] = uid[1] ^ uid[3] ^ 0xAA;
-	pwd[1] = uid[2] ^ uid[4] ^ 0x55;
-	pwd[2] = uid[3] ^ uid[5] ^ 0xAA;
-	pwd[3] = uid[4] ^ uid[6] ^ 0x55;
-	return (uint32_t)bytes_to_num(pwd, 4);
+    pwd[0] = uid[1] ^ uid[3] ^ 0xAA;
+    pwd[1] = uid[2] ^ uid[4] ^ 0x55;
+    pwd[2] = uid[3] ^ uid[5] ^ 0xAA;
+    pwd[3] = uid[4] ^ uid[6] ^ 0x55;
+    return (uint32_t)bytes_to_num(pwd, 4);
 }
 
 // Certain pwd generation algo nickname C.
 uint32_t ul_ev1_pwdgenC(uint8_t* uid){
-	uint32_t pwd = 0;
-	uint8_t base[] = {
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x28,
-		0x63, 0x29, 0x20, 0x43, 0x6f, 0x70, 0x79, 0x72,
-		0x69, 0x67, 0x68, 0x74, 0x20, 0x4c, 0x45, 0x47,
-		0x4f, 0x20, 0x32, 0x30, 0x31, 0x34, 0xaa, 0xaa
-	};
+    uint32_t pwd = 0;
+    uint8_t base[] = {
+        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x28,
+        0x63, 0x29, 0x20, 0x43, 0x6f, 0x70, 0x79, 0x72,
+        0x69, 0x67, 0x68, 0x74, 0x20, 0x4c, 0x45, 0x47,
+        0x4f, 0x20, 0x32, 0x30, 0x31, 0x34, 0xaa, 0xaa
+    };
 
-	memcpy(base, uid, 7);
+    memcpy(base, uid, 7);
 
-	for (int i = 0; i < 32; i += 4) {
-		uint32_t b = *(uint32_t *)(base + i);
-		pwd = b + ROTR(pwd, 25) + ROTR(pwd, 10) - pwd;
-	}
-	return BSWAP_32(pwd);
+    for (int i = 0; i < 32; i += 4) {
+        uint32_t b = *(uint32_t *)(base + i);
+        pwd = b + ROTR(pwd, 25) + ROTR(pwd, 10) - pwd;
+    }
+    return BSWAP_32(pwd);
 }
 // Certain pwd generation algo nickname D.
 // a.k.a xzy
 uint32_t ul_ev1_pwdgenD(uint8_t* uid){
-	uint8_t i;
-	//Rotate
-	uint8_t r = (uid[1] + uid[3] + uid[5]) & 7; //Rotation offset
-	uint8_t ru[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; //Rotated UID
-	for (i = 0; i < 7; i++)
-		ru[(i + r) & 7] = uid[i];
+    uint8_t i;
+    //Rotate
+    uint8_t r = (uid[1] + uid[3] + uid[5]) & 7; //Rotation offset
+    uint8_t ru[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; //Rotated UID
+    for (i = 0; i < 7; i++)
+        ru[(i + r) & 7] = uid[i];
 
-	transform_D(ru);
+    transform_D(ru);
 
-	//Calc key
-	uint32_t pwd = 0; //Key as int
-	r = (ru[0] + ru[2] + ru[4] + ru[6]) & 3; //Offset
-	for (i = 0; i < 4; i++)
-		pwd = ru[i + r] + (pwd << 8);
+    //Calc key
+    uint32_t pwd = 0; //Key as int
+    r = (ru[0] + ru[2] + ru[4] + ru[6]) & 3; //Offset
+    for (i = 0; i < 4; i++)
+        pwd = ru[i + r] + (pwd << 8);
 
-	return BSWAP_32(pwd);
+    return BSWAP_32(pwd);
 }
 // pack generation for algo 1-3
 uint16_t ul_ev1_packgenA(uint8_t* uid){
-	uint16_t pack = (uid[0] ^ uid[1] ^ uid[2]) << 8 | (uid[2] ^ 8);
-	return pack;
+    uint16_t pack = (uid[0] ^ uid[1] ^ uid[2]) << 8 | (uid[2] ^ 8);
+    return pack;
 }
 uint16_t ul_ev1_packgenB(uint8_t* uid){
-	return 0x8080;
+    return 0x8080;
 }
 uint16_t ul_ev1_packgenC(uint8_t* uid){
-	return 0xaa55;
+    return 0xaa55;
 }
 uint16_t ul_ev1_packgenD(uint8_t* uid){
-	uint8_t i;
-	//Rotate
-	uint8_t r = (uid[2] + uid[5]) & 7; //Rotation offset
-	uint8_t ru[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; //Rotated UID
-	for (i = 0; i < 7; i++)
-		ru[(i + r) & 7] = uid[i];
+    uint8_t i;
+    //Rotate
+    uint8_t r = (uid[2] + uid[5]) & 7; //Rotation offset
+    uint8_t ru[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; //Rotated UID
+    for (i = 0; i < 7; i++)
+        ru[(i + r) & 7] = uid[i];
 
-	transform_D(ru);
+    transform_D(ru);
 
-	//Calc pack
-	uint32_t p = 0;
-	for (i = 0; i < 8; i++)
-		p += ru[i] * 13;
+    //Calc pack
+    uint32_t p = 0;
+    for (i = 0; i < 8; i++)
+        p += ru[i] * 13;
 
-	p ^= 0x5555;
-	return BSWAP_16( p & 0xFFFF );
+    p ^= 0x5555;
+    return BSWAP_16( p & 0xFFFF );
 }
 
 int ul_ev1_pwdgen_selftest(){
 
-	uint8_t uid1[] = {0x04, 0x11, 0x12, 0x11, 0x12, 0x11, 0x10};
-	uint32_t pwd1 = ul_ev1_pwdgenA(uid1);
-	PrintAndLogEx(NORMAL, "UID | %s | %08X | %s", sprint_hex(uid1,7), pwd1, (pwd1 == 0x8432EB17)?"OK":"->8432EB17<-");
+    uint8_t uid1[] = {0x04, 0x11, 0x12, 0x11, 0x12, 0x11, 0x10};
+    uint32_t pwd1 = ul_ev1_pwdgenA(uid1);
+    PrintAndLogEx(NORMAL, "UID | %s | %08X | %s", sprint_hex(uid1,7), pwd1, (pwd1 == 0x8432EB17)?"OK":"->8432EB17<-");
 
-	uint8_t uid2[] = {0x04, 0x1f, 0x98, 0xea, 0x1e, 0x3e, 0x81};
-	uint32_t pwd2 = ul_ev1_pwdgenB(uid2);
-	PrintAndLogEx(NORMAL, "UID | %s | %08X | %s", sprint_hex(uid2,7), pwd2, (pwd2 == 0x5fd37eca)?"OK":"->5fd37eca<--");
+    uint8_t uid2[] = {0x04, 0x1f, 0x98, 0xea, 0x1e, 0x3e, 0x81};
+    uint32_t pwd2 = ul_ev1_pwdgenB(uid2);
+    PrintAndLogEx(NORMAL, "UID | %s | %08X | %s", sprint_hex(uid2,7), pwd2, (pwd2 == 0x5fd37eca)?"OK":"->5fd37eca<--");
 
-	uint8_t uid3[] = {0x04, 0x62, 0xB6, 0x8A, 0xB4, 0x42, 0x80};
-	uint32_t pwd3 = ul_ev1_pwdgenC(uid3);
-	PrintAndLogEx(NORMAL, "UID | %s | %08X | %s", sprint_hex(uid3,7), pwd3, (pwd3 == 0x5a349515)?"OK":"->5a349515<--");
+    uint8_t uid3[] = {0x04, 0x62, 0xB6, 0x8A, 0xB4, 0x42, 0x80};
+    uint32_t pwd3 = ul_ev1_pwdgenC(uid3);
+    PrintAndLogEx(NORMAL, "UID | %s | %08X | %s", sprint_hex(uid3,7), pwd3, (pwd3 == 0x5a349515)?"OK":"->5a349515<--");
 
-	uint8_t uid4[] = {0x04, 0xC5, 0xDF, 0x4A, 0x6D, 0x51, 0x80};
-	uint32_t pwd4 = ul_ev1_pwdgenD(uid4);
-	PrintAndLogEx(NORMAL, "UID | %s | %08X | %s", sprint_hex(uid4,7), pwd4, (pwd4 == 0x72B1EC61)?"OK":"->72B1EC61<--");
-	return 0;
+    uint8_t uid4[] = {0x04, 0xC5, 0xDF, 0x4A, 0x6D, 0x51, 0x80};
+    uint32_t pwd4 = ul_ev1_pwdgenD(uid4);
+    PrintAndLogEx(NORMAL, "UID | %s | %08X | %s", sprint_hex(uid4,7), pwd4, (pwd4 == 0x72B1EC61)?"OK":"->72B1EC61<--");
+    return 0;
 }
 
 //------------------------------------
 // get version nxp product type
 char *getProductTypeStr( uint8_t id){
 
-	static char buf[20];
-	char *retStr = buf;
+    static char buf[20];
+    char *retStr = buf;
 
-	switch(id) {
-		case 3: sprintf(retStr, "%02X, Ultralight", id); break;
-		case 4:	sprintf(retStr, "%02X, NTAG", id); break;
-		default: sprintf(retStr, "%02X, unknown", id); break;
-	}
-	return buf;
+    switch(id) {
+        case 3: sprintf(retStr, "%02X, Ultralight", id); break;
+        case 4: sprintf(retStr, "%02X, NTAG", id); break;
+        default: sprintf(retStr, "%02X, unknown", id); break;
+    }
+    return buf;
 }
 
 /*
@@ -249,162 +249,162 @@ char *getProductTypeStr( uint8_t id){
 */
 char *getUlev1CardSizeStr( uint8_t fsize ){
 
-	static char buf[40];
-	char *retStr = buf;
-	memset(buf, 0, sizeof(buf));
+    static char buf[40];
+    char *retStr = buf;
+    memset(buf, 0, sizeof(buf));
 
-	uint16_t usize = 1 << ((fsize >>1) + 1);
-	uint16_t lsize = 1 << (fsize >>1);
+    uint16_t usize = 1 << ((fsize >>1) + 1);
+    uint16_t lsize = 1 << (fsize >>1);
 
-	// is  LSB set?
-	if (  fsize & 1 )
-		sprintf(retStr, "%02X, (%u <-> %u bytes)",fsize, usize, lsize);
-	else
-		sprintf(retStr, "%02X, (%u bytes)", fsize, lsize);
-	return buf;
+    // is  LSB set?
+    if (  fsize & 1 )
+        sprintf(retStr, "%02X, (%u <-> %u bytes)",fsize, usize, lsize);
+    else
+        sprintf(retStr, "%02X, (%u bytes)", fsize, lsize);
+    return buf;
 }
 
 static void ul_switch_on_field(void) {
-	UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT | ISO14A_NO_RATS, 0, 0}};
-	clearCommandBuffer();
-	SendCommand(&c);
+    UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT | ISO14A_NO_RATS, 0, 0}};
+    clearCommandBuffer();
+    SendCommand(&c);
 }
 
 static int ul_send_cmd_raw( uint8_t *cmd, uint8_t cmdlen, uint8_t *response, uint16_t responseLength ) {
-	UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_NO_DISCONNECT | ISO14A_APPEND_CRC | ISO14A_NO_RATS, cmdlen, 0}};
-	memcpy(c.d.asBytes, cmd, cmdlen);
-	clearCommandBuffer();
-	SendCommand(&c);
-	UsbCommand resp;
-	if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return -1;
-	if (!resp.arg[0] && responseLength) return -1;
+    UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_NO_DISCONNECT | ISO14A_APPEND_CRC | ISO14A_NO_RATS, cmdlen, 0}};
+    memcpy(c.d.asBytes, cmd, cmdlen);
+    clearCommandBuffer();
+    SendCommand(&c);
+    UsbCommand resp;
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return -1;
+    if (!resp.arg[0] && responseLength) return -1;
 
-	uint16_t resplen = (resp.arg[0] < responseLength) ? resp.arg[0] : responseLength;
-	memcpy(response, resp.d.asBytes, resplen);
-	return resplen;
+    uint16_t resplen = (resp.arg[0] < responseLength) ? resp.arg[0] : responseLength;
+    memcpy(response, resp.d.asBytes, resplen);
+    return resplen;
 }
 
 static int ul_select( iso14a_card_select_t *card ){
 
-	ul_switch_on_field();
+    ul_switch_on_field();
 
-	UsbCommand resp;
-	bool ans = false;
-	ans = WaitForResponseTimeout(CMD_ACK, &resp, 1500);
+    UsbCommand resp;
+    bool ans = false;
+    ans = WaitForResponseTimeout(CMD_ACK, &resp, 1500);
 
-	if (!ans || resp.arg[0] < 1) {
-		PrintAndLogEx(WARNING, "iso14443a card select failed");
-		DropField();
-		return 0;
-	}
+    if (!ans || resp.arg[0] < 1) {
+        PrintAndLogEx(WARNING, "iso14443a card select failed");
+        DropField();
+        return 0;
+    }
 
-	memcpy(card, resp.d.asBytes, sizeof(iso14a_card_select_t));
-	return 1;
+    memcpy(card, resp.d.asBytes, sizeof(iso14a_card_select_t));
+    return 1;
 }
 
 // This read command will at least return 16bytes.
 static int ul_read( uint8_t page, uint8_t *response, uint16_t responseLength ){
 
-	uint8_t cmd[] = {ISO14443A_CMD_READBLOCK, page};
-	int len = ul_send_cmd_raw(cmd, sizeof(cmd), response, responseLength);
-	return len;
+    uint8_t cmd[] = {ISO14443A_CMD_READBLOCK, page};
+    int len = ul_send_cmd_raw(cmd, sizeof(cmd), response, responseLength);
+    return len;
 }
 
 static int ul_comp_write( uint8_t page, uint8_t *data, uint8_t datalen ){
 
-	uint8_t cmd[18];
-	memset(cmd, 0x00, sizeof(cmd));
-	datalen = ( datalen > 16) ? 16 : datalen;
+    uint8_t cmd[18];
+    memset(cmd, 0x00, sizeof(cmd));
+    datalen = ( datalen > 16) ? 16 : datalen;
 
-	cmd[0] = ISO14443A_CMD_WRITEBLOCK;
-	cmd[1] = page;
-	memcpy(cmd+2, data, datalen);
+    cmd[0] = ISO14443A_CMD_WRITEBLOCK;
+    cmd[1] = page;
+    memcpy(cmd+2, data, datalen);
 
-	uint8_t response[1] = {0xff};
-	ul_send_cmd_raw(cmd, 2+datalen, response, sizeof(response));
-	// ACK
-	if ( response[0] == 0x0a ) return 0;
-	// NACK
-	return -1;
+    uint8_t response[1] = {0xff};
+    ul_send_cmd_raw(cmd, 2+datalen, response, sizeof(response));
+    // ACK
+    if ( response[0] == 0x0a ) return 0;
+    // NACK
+    return -1;
 }
 
 static int ulc_requestAuthentication( uint8_t *nonce, uint16_t nonceLength ){
 
-	uint8_t cmd[] = {MIFARE_ULC_AUTH_1, 0x00};
-	int len = ul_send_cmd_raw(cmd, sizeof(cmd), nonce, nonceLength);
-	return len;
+    uint8_t cmd[] = {MIFARE_ULC_AUTH_1, 0x00};
+    int len = ul_send_cmd_raw(cmd, sizeof(cmd), nonce, nonceLength);
+    return len;
 }
 
 static int ulc_authentication( uint8_t *key, bool switch_off_field ){
 
-	UsbCommand c = {CMD_MIFAREUC_AUTH, {switch_off_field}};
-	memcpy(c.d.asBytes, key, 16);
-	clearCommandBuffer();
-	SendCommand(&c);
-	UsbCommand resp;
-	if ( !WaitForResponseTimeout(CMD_ACK, &resp, 1500) ) return 0;
-	if ( resp.arg[0] == 1 ) return 1;
+    UsbCommand c = {CMD_MIFAREUC_AUTH, {switch_off_field}};
+    memcpy(c.d.asBytes, key, 16);
+    clearCommandBuffer();
+    SendCommand(&c);
+    UsbCommand resp;
+    if ( !WaitForResponseTimeout(CMD_ACK, &resp, 1500) ) return 0;
+    if ( resp.arg[0] == 1 ) return 1;
 
-	return 0;
+    return 0;
 }
 
 static int ulev1_requestAuthentication( uint8_t *pwd, uint8_t *pack, uint16_t packLength ){
 
-	uint8_t cmd[] = {MIFARE_ULEV1_AUTH, pwd[0], pwd[1], pwd[2], pwd[3]};
-	int len = ul_send_cmd_raw(cmd, sizeof(cmd), pack, packLength);
-	// NACK tables different tags,  but between 0-9 is a NEGATIVE response.
-	// ACK == 0xA
-	if ( len == 1 && pack[0] <= 0x09 )
-		return -1;
-	return len;
+    uint8_t cmd[] = {MIFARE_ULEV1_AUTH, pwd[0], pwd[1], pwd[2], pwd[3]};
+    int len = ul_send_cmd_raw(cmd, sizeof(cmd), pack, packLength);
+    // NACK tables different tags,  but between 0-9 is a NEGATIVE response.
+    // ACK == 0xA
+    if ( len == 1 && pack[0] <= 0x09 )
+        return -1;
+    return len;
 }
 
 static int ul_auth_select( iso14a_card_select_t *card, TagTypeUL_t tagtype, bool hasAuthKey, uint8_t *authkey, uint8_t *pack, uint8_t packSize){
-	if ( hasAuthKey && (tagtype & UL_C)) {
-		//will select card automatically and close connection on error
-		if (!ulc_authentication(authkey, false)) {
-			PrintAndLogEx(WARNING, "Authentication Failed UL-C");
-			return 0;
-		}
-	} else {
-		if ( !ul_select(card) ) return 0;
+    if ( hasAuthKey && (tagtype & UL_C)) {
+        //will select card automatically and close connection on error
+        if (!ulc_authentication(authkey, false)) {
+            PrintAndLogEx(WARNING, "Authentication Failed UL-C");
+            return 0;
+        }
+    } else {
+        if ( !ul_select(card) ) return 0;
 
-		if (hasAuthKey) {
-			if ( ulev1_requestAuthentication(authkey, pack, packSize) == -1 ) {
-				DropField();
-				PrintAndLogEx(WARNING, "Authentication Failed UL-EV1/NTAG");
-				return 0;
-			}
-		}
-	}
-	return 1;
+        if (hasAuthKey) {
+            if ( ulev1_requestAuthentication(authkey, pack, packSize) == -1 ) {
+                DropField();
+                PrintAndLogEx(WARNING, "Authentication Failed UL-EV1/NTAG");
+                return 0;
+            }
+        }
+    }
+    return 1;
 }
 
 static int ulev1_getVersion( uint8_t *response, uint16_t responseLength ){
-	uint8_t cmd[] = {MIFARE_ULEV1_VERSION};
-	int len = ul_send_cmd_raw(cmd, sizeof(cmd), response, responseLength);
-	return len;
+    uint8_t cmd[] = {MIFARE_ULEV1_VERSION};
+    int len = ul_send_cmd_raw(cmd, sizeof(cmd), response, responseLength);
+    return len;
 }
 
 static int ulev1_readCounter( uint8_t counter, uint8_t *response, uint16_t responseLength ){
 
-	uint8_t cmd[] = {MIFARE_ULEV1_READ_CNT, counter};
-	int len = ul_send_cmd_raw(cmd, sizeof(cmd), response, responseLength);
-	return len;
+    uint8_t cmd[] = {MIFARE_ULEV1_READ_CNT, counter};
+    int len = ul_send_cmd_raw(cmd, sizeof(cmd), response, responseLength);
+    return len;
 }
 
 static int ulev1_readTearing( uint8_t counter, uint8_t *response, uint16_t responseLength ){
 
-	uint8_t cmd[] = {MIFARE_ULEV1_CHECKTEAR, counter};
-	int len = ul_send_cmd_raw(cmd, sizeof(cmd), response, responseLength);
-	return len;
+    uint8_t cmd[] = {MIFARE_ULEV1_CHECKTEAR, counter};
+    int len = ul_send_cmd_raw(cmd, sizeof(cmd), response, responseLength);
+    return len;
 }
 
 static int ulev1_readSignature( uint8_t *response, uint16_t responseLength ){
 
-	uint8_t cmd[] = {MIFARE_ULEV1_READSIG, 0x00};
-	int len = ul_send_cmd_raw(cmd, sizeof(cmd), response, responseLength);
-	return len;
+    uint8_t cmd[] = {MIFARE_ULEV1_READSIG, 0x00};
+    int len = ul_send_cmd_raw(cmd, sizeof(cmd), response, responseLength);
+    return len;
 }
 
 // Fudan check checks for which error is given for a command with incorrect crc
@@ -421,718 +421,718 @@ static int ulev1_readSignature( uint8_t *response, uint16_t responseLength ){
 //
 // make sure field is off before calling this function
 static int ul_fudan_check( void ){
-	iso14a_card_select_t card;
-	if ( !ul_select(&card) )
-		return UL_ERROR;
+    iso14a_card_select_t card;
+    if ( !ul_select(&card) )
+        return UL_ERROR;
 
-	UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_NO_DISCONNECT | ISO14A_NO_RATS, 4, 0}};
+    UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_NO_DISCONNECT | ISO14A_NO_RATS, 4, 0}};
 
-	uint8_t cmd[4] = {0x30,0x00,0x02,0xa7}; //wrong crc on purpose  should be 0xa8
-	memcpy(c.d.asBytes, cmd, 4);
-	clearCommandBuffer();
-	SendCommand(&c);
-	UsbCommand resp;
-	if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return UL_ERROR;
-	if (resp.arg[0] != 1) return UL_ERROR;
+    uint8_t cmd[4] = {0x30,0x00,0x02,0xa7}; //wrong crc on purpose  should be 0xa8
+    memcpy(c.d.asBytes, cmd, 4);
+    clearCommandBuffer();
+    SendCommand(&c);
+    UsbCommand resp;
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return UL_ERROR;
+    if (resp.arg[0] != 1) return UL_ERROR;
 
-	return (!resp.d.asBytes[0]) ? FUDAN_UL : UL; //if response == 0x00 then Fudan, else Genuine NXP
+    return (!resp.d.asBytes[0]) ? FUDAN_UL : UL; //if response == 0x00 then Fudan, else Genuine NXP
 }
 
 static int ul_print_default( uint8_t *data){
 
-	uint8_t uid[7];
-	uid[0] = data[0];
-	uid[1] = data[1];
-	uid[2] = data[2];
-	uid[3] = data[4];
-	uid[4] = data[5];
-	uid[5] = data[6];
-	uid[6] = data[7];
+    uint8_t uid[7];
+    uid[0] = data[0];
+    uid[1] = data[1];
+    uid[2] = data[2];
+    uid[3] = data[4];
+    uid[4] = data[5];
+    uid[5] = data[6];
+    uid[6] = data[7];
 
-	PrintAndLogEx(NORMAL, "       UID : %s ", sprint_hex(uid, 7));
-	PrintAndLogEx(NORMAL, "    UID[0] : %02X, %s",  uid[0], getTagInfo(uid[0]) );
-	if ( uid[0] == 0x05 && ((uid[1] & 0xf0) >> 4) == 2 ) { // is infineon and 66RxxP
-		uint8_t chip = (data[8] & 0xC7); // 11000111  mask, bit 3,4,5 RFU
-		switch (chip){
-			case 0xc2: PrintAndLogEx(NORMAL, "   IC type : SLE 66R04P 770 Bytes"); break; //77 pages
-			case 0xc4: PrintAndLogEx(NORMAL, "   IC type : SLE 66R16P 2560 Bytes"); break; //256 pages
-			case 0xc6: PrintAndLogEx(NORMAL, "   IC type : SLE 66R32P 5120 Bytes"); break; //512 pages /2 sectors
-		}
-	}
-	// CT (cascade tag byte) 0x88 xor SN0 xor SN1 xor SN2
-	int crc0 = 0x88 ^ data[0] ^ data[1] ^data[2];
-	if ( data[3] == crc0 )
-		PrintAndLogEx(NORMAL, "      BCC0 : %02X, Ok", data[3]);
-	else
-		PrintAndLogEx(NORMAL, "      BCC0 : %02X, crc should be %02X", data[3], crc0);
+    PrintAndLogEx(NORMAL, "       UID : %s ", sprint_hex(uid, 7));
+    PrintAndLogEx(NORMAL, "    UID[0] : %02X, %s",  uid[0], getTagInfo(uid[0]) );
+    if ( uid[0] == 0x05 && ((uid[1] & 0xf0) >> 4) == 2 ) { // is infineon and 66RxxP
+        uint8_t chip = (data[8] & 0xC7); // 11000111  mask, bit 3,4,5 RFU
+        switch (chip){
+            case 0xc2: PrintAndLogEx(NORMAL, "   IC type : SLE 66R04P 770 Bytes"); break; //77 pages
+            case 0xc4: PrintAndLogEx(NORMAL, "   IC type : SLE 66R16P 2560 Bytes"); break; //256 pages
+            case 0xc6: PrintAndLogEx(NORMAL, "   IC type : SLE 66R32P 5120 Bytes"); break; //512 pages /2 sectors
+        }
+    }
+    // CT (cascade tag byte) 0x88 xor SN0 xor SN1 xor SN2
+    int crc0 = 0x88 ^ data[0] ^ data[1] ^data[2];
+    if ( data[3] == crc0 )
+        PrintAndLogEx(NORMAL, "      BCC0 : %02X, Ok", data[3]);
+    else
+        PrintAndLogEx(NORMAL, "      BCC0 : %02X, crc should be %02X", data[3], crc0);
 
-	int crc1 = data[4] ^ data[5] ^ data[6] ^data[7];
-	if ( data[8] == crc1 )
-		PrintAndLogEx(NORMAL, "      BCC1 : %02X, Ok", data[8]);
-	else
-		PrintAndLogEx(NORMAL, "      BCC1 : %02X, crc should be %02X", data[8], crc1 );
+    int crc1 = data[4] ^ data[5] ^ data[6] ^data[7];
+    if ( data[8] == crc1 )
+        PrintAndLogEx(NORMAL, "      BCC1 : %02X, Ok", data[8]);
+    else
+        PrintAndLogEx(NORMAL, "      BCC1 : %02X, crc should be %02X", data[8], crc1 );
 
-	PrintAndLogEx(NORMAL, "  Internal : %02X, %sdefault", data[9], (data[9]==0x48)?"":"not " );
+    PrintAndLogEx(NORMAL, "  Internal : %02X, %sdefault", data[9], (data[9]==0x48)?"":"not " );
 
-	PrintAndLogEx(NORMAL, "      Lock : %s - %s",
-				sprint_hex(data+10, 2),
-				sprint_bin(data+10, 2)
-		);
+    PrintAndLogEx(NORMAL, "      Lock : %s - %s",
+                sprint_hex(data+10, 2),
+                sprint_bin(data+10, 2)
+        );
 
-	PrintAndLogEx(NORMAL, "OneTimePad : %s - %s\n",
-				sprint_hex(data + 12, 4),
-				sprint_bin(data+12, 4)
-		);
+    PrintAndLogEx(NORMAL, "OneTimePad : %s - %s\n",
+                sprint_hex(data + 12, 4),
+                sprint_bin(data+12, 4)
+        );
 
-	return 0;
+    return 0;
 }
 
 static int ndef_print_CC(uint8_t *data) {
-	// no NDEF message
-	if (data[0] != 0xE1)
-		return -1;
+    // no NDEF message
+    if (data[0] != 0xE1)
+        return -1;
 
-	PrintAndLogEx(NORMAL, "--- NDEF Message");
-	PrintAndLogEx(NORMAL, "Capability Container: %s", sprint_hex(data,4) );
-	PrintAndLogEx(NORMAL, "  %02X : NDEF Magic Number", data[0]);
-	PrintAndLogEx(NORMAL, "  %02X : version %d.%d supported by tag", data[1], (data[1] & 0xF0) >> 4, data[1] & 0x0F);
-	PrintAndLogEx(NORMAL, "  %02X : Physical Memory Size: %d bytes", data[2], (data[2] + 1) * 8);
-	if ( data[2] == 0x96 )
-		PrintAndLogEx(NORMAL, "  %02X : NDEF Memory Size: %d bytes", data[2], 48);
-	else if ( data[2] == 0x12 )
-		PrintAndLogEx(NORMAL, "  %02X : NDEF Memory Size: %d bytes", data[2], 144);
-	else if ( data[2] == 0x3E )
-		PrintAndLogEx(NORMAL, "  %02X : NDEF Memory Size: %d bytes", data[2], 496);
-	else if ( data[2] == 0x6D )
-		PrintAndLogEx(NORMAL, "  %02X : NDEF Memory Size: %d bytes", data[2], 872);
+    PrintAndLogEx(NORMAL, "--- NDEF Message");
+    PrintAndLogEx(NORMAL, "Capability Container: %s", sprint_hex(data,4) );
+    PrintAndLogEx(NORMAL, "  %02X : NDEF Magic Number", data[0]);
+    PrintAndLogEx(NORMAL, "  %02X : version %d.%d supported by tag", data[1], (data[1] & 0xF0) >> 4, data[1] & 0x0F);
+    PrintAndLogEx(NORMAL, "  %02X : Physical Memory Size: %d bytes", data[2], (data[2] + 1) * 8);
+    if ( data[2] == 0x96 )
+        PrintAndLogEx(NORMAL, "  %02X : NDEF Memory Size: %d bytes", data[2], 48);
+    else if ( data[2] == 0x12 )
+        PrintAndLogEx(NORMAL, "  %02X : NDEF Memory Size: %d bytes", data[2], 144);
+    else if ( data[2] == 0x3E )
+        PrintAndLogEx(NORMAL, "  %02X : NDEF Memory Size: %d bytes", data[2], 496);
+    else if ( data[2] == 0x6D )
+        PrintAndLogEx(NORMAL, "  %02X : NDEF Memory Size: %d bytes", data[2], 872);
 
-	PrintAndLogEx(NORMAL, "  %02X : %s / %s", data[3],
-				(data[3] & 0xF0) ? "(RFU)" : "Read access granted without any security",
-				(data[3] & 0x0F)==0 ? "Write access granted without any security" : (data[3] & 0x0F)==0x0F ? "No write access granted at all" : "(RFU)");
-	return 0;
+    PrintAndLogEx(NORMAL, "  %02X : %s / %s", data[3],
+                (data[3] & 0xF0) ? "(RFU)" : "Read access granted without any security",
+                (data[3] & 0x0F)==0 ? "Write access granted without any security" : (data[3] & 0x0F)==0x0F ? "No write access granted at all" : "(RFU)");
+    return 0;
 }
 
 int ul_print_type(uint32_t tagtype, uint8_t spaces){
-	char spc[11] = "          ";
-	spc[10]=0x00;
-	char *spacer = spc + (10-spaces);
+    char spc[11] = "          ";
+    spc[10]=0x00;
+    char *spacer = spc + (10-spaces);
 
-	if ( tagtype & UL )
-		PrintAndLogEx(NORMAL, "%sTYPE : MIFARE Ultralight (MF0ICU1) %s", spacer, (tagtype & MAGIC) ? "<magic>" : "" );
-	else if ( tagtype & UL_C)
-		PrintAndLogEx(NORMAL, "%sTYPE : MIFARE Ultralight C (MF0ULC) %s", spacer, (tagtype & MAGIC) ? "<magic>" : "" );
-	else if ( tagtype & UL_NANO_40)
-		PrintAndLogEx(NORMAL, "%sTYPE : MIFARE Ultralight Nano 40bytes (MF0UNH00)", spacer);
-	else if ( tagtype & UL_EV1_48)
-		PrintAndLogEx(NORMAL, "%sTYPE : MIFARE Ultralight EV1 48bytes (MF0UL1101)", spacer);
-	else if ( tagtype & UL_EV1_128)
-		PrintAndLogEx(NORMAL, "%sTYPE : MIFARE Ultralight EV1 128bytes (MF0UL2101)", spacer);
-	else if ( tagtype & UL_EV1 )
-		PrintAndLogEx(NORMAL, "%sTYPE : MIFARE Ultralight EV1 UNKNOWN", spacer);
-	else if ( tagtype & NTAG )
-		PrintAndLogEx(NORMAL, "%sTYPE : NTAG UNKNOWN", spacer);
-	else if ( tagtype & NTAG_203 )
-		PrintAndLogEx(NORMAL, "%sTYPE : NTAG 203 144bytes (NT2H0301F0DT)", spacer);
-	else if ( tagtype & NTAG_210 )
-		PrintAndLogEx(NORMAL, "%sTYPE : NTAG 210 48bytes (NT2L1011G0DU)", spacer);
-	else if ( tagtype & NTAG_212 )
-		PrintAndLogEx(NORMAL, "%sTYPE : NTAG 212 128bytes (NT2L1211G0DU)", spacer);
-	else if ( tagtype & NTAG_213 )
-		PrintAndLogEx(NORMAL, "%sTYPE : NTAG 213 144bytes (NT2H1311G0DU)", spacer);
-	else if ( tagtype & NTAG_213_F )
-		PrintAndLogEx(NORMAL, "%sTYPE : NTAG 213F 144bytes (NT2H1311F0DTL)", spacer);
-	else if ( tagtype & NTAG_215 )
-		PrintAndLogEx(NORMAL, "%sTYPE : NTAG 215 504bytes (NT2H1511G0DU)", spacer);
-	else if ( tagtype & NTAG_216 )
-		PrintAndLogEx(NORMAL, "%sTYPE : NTAG 216 888bytes (NT2H1611G0DU)", spacer);
-	else if ( tagtype & NTAG_216_F )
-		PrintAndLogEx(NORMAL, "%sTYPE : NTAG 216F 888bytes (NT2H1611F0DTL)", spacer);
-	else if ( tagtype & NTAG_I2C_1K )
-		PrintAndLogEx(NORMAL, "%sTYPE : NTAG I%sC 888bytes (NT3H1101FHK)", spacer, "\xFD");
-	else if ( tagtype & NTAG_I2C_2K )
-		PrintAndLogEx(NORMAL, "%sTYPE : NTAG I%sC 1904bytes (NT3H1201FHK)", spacer, "\xFD");
-	else if ( tagtype & NTAG_I2C_1K_PLUS )
-		PrintAndLogEx(NORMAL, "%sTYPE : NTAG I%sC plus 888bytes (NT3H2111FHK)", spacer, "\xFD");
-	else if ( tagtype & NTAG_I2C_2K_PLUS )
-		PrintAndLogEx(NORMAL, "%sTYPE : NTAG I%sC plus 1912bytes (NT3H2211FHK)", spacer, "\xFD");
-	else if ( tagtype & MY_D )
-		PrintAndLogEx(NORMAL, "%sTYPE : INFINEON my-d\x99 (SLE 66RxxS)", spacer);
-	else if ( tagtype & MY_D_NFC )
-		PrintAndLogEx(NORMAL, "%sTYPE : INFINEON my-d\x99 NFC (SLE 66RxxP)", spacer);
-	else if ( tagtype & MY_D_MOVE )
-		PrintAndLogEx(NORMAL, "%sTYPE : INFINEON my-d\x99 move (SLE 66R01P)", spacer);
-	else if ( tagtype & MY_D_MOVE_NFC )
-		PrintAndLogEx(NORMAL, "%sTYPE : INFINEON my-d\x99 move NFC (SLE 66R01P)", spacer);
-	else if ( tagtype & MY_D_MOVE_LEAN )
-		PrintAndLogEx(NORMAL, "%sTYPE : INFINEON my-d\x99 move lean (SLE 66R01L)", spacer);
-	else if ( tagtype & FUDAN_UL )
-		PrintAndLogEx(NORMAL, "%sTYPE : FUDAN Ultralight Compatible (or other compatible) %s", spacer, (tagtype & MAGIC) ? "<magic>" : "" );
-	else
-		PrintAndLogEx(NORMAL, "%sTYPE : Unknown %06x", spacer, tagtype);
-	return 0;
+    if ( tagtype & UL )
+        PrintAndLogEx(NORMAL, "%sTYPE : MIFARE Ultralight (MF0ICU1) %s", spacer, (tagtype & MAGIC) ? "<magic>" : "" );
+    else if ( tagtype & UL_C)
+        PrintAndLogEx(NORMAL, "%sTYPE : MIFARE Ultralight C (MF0ULC) %s", spacer, (tagtype & MAGIC) ? "<magic>" : "" );
+    else if ( tagtype & UL_NANO_40)
+        PrintAndLogEx(NORMAL, "%sTYPE : MIFARE Ultralight Nano 40bytes (MF0UNH00)", spacer);
+    else if ( tagtype & UL_EV1_48)
+        PrintAndLogEx(NORMAL, "%sTYPE : MIFARE Ultralight EV1 48bytes (MF0UL1101)", spacer);
+    else if ( tagtype & UL_EV1_128)
+        PrintAndLogEx(NORMAL, "%sTYPE : MIFARE Ultralight EV1 128bytes (MF0UL2101)", spacer);
+    else if ( tagtype & UL_EV1 )
+        PrintAndLogEx(NORMAL, "%sTYPE : MIFARE Ultralight EV1 UNKNOWN", spacer);
+    else if ( tagtype & NTAG )
+        PrintAndLogEx(NORMAL, "%sTYPE : NTAG UNKNOWN", spacer);
+    else if ( tagtype & NTAG_203 )
+        PrintAndLogEx(NORMAL, "%sTYPE : NTAG 203 144bytes (NT2H0301F0DT)", spacer);
+    else if ( tagtype & NTAG_210 )
+        PrintAndLogEx(NORMAL, "%sTYPE : NTAG 210 48bytes (NT2L1011G0DU)", spacer);
+    else if ( tagtype & NTAG_212 )
+        PrintAndLogEx(NORMAL, "%sTYPE : NTAG 212 128bytes (NT2L1211G0DU)", spacer);
+    else if ( tagtype & NTAG_213 )
+        PrintAndLogEx(NORMAL, "%sTYPE : NTAG 213 144bytes (NT2H1311G0DU)", spacer);
+    else if ( tagtype & NTAG_213_F )
+        PrintAndLogEx(NORMAL, "%sTYPE : NTAG 213F 144bytes (NT2H1311F0DTL)", spacer);
+    else if ( tagtype & NTAG_215 )
+        PrintAndLogEx(NORMAL, "%sTYPE : NTAG 215 504bytes (NT2H1511G0DU)", spacer);
+    else if ( tagtype & NTAG_216 )
+        PrintAndLogEx(NORMAL, "%sTYPE : NTAG 216 888bytes (NT2H1611G0DU)", spacer);
+    else if ( tagtype & NTAG_216_F )
+        PrintAndLogEx(NORMAL, "%sTYPE : NTAG 216F 888bytes (NT2H1611F0DTL)", spacer);
+    else if ( tagtype & NTAG_I2C_1K )
+        PrintAndLogEx(NORMAL, "%sTYPE : NTAG I%sC 888bytes (NT3H1101FHK)", spacer, "\xFD");
+    else if ( tagtype & NTAG_I2C_2K )
+        PrintAndLogEx(NORMAL, "%sTYPE : NTAG I%sC 1904bytes (NT3H1201FHK)", spacer, "\xFD");
+    else if ( tagtype & NTAG_I2C_1K_PLUS )
+        PrintAndLogEx(NORMAL, "%sTYPE : NTAG I%sC plus 888bytes (NT3H2111FHK)", spacer, "\xFD");
+    else if ( tagtype & NTAG_I2C_2K_PLUS )
+        PrintAndLogEx(NORMAL, "%sTYPE : NTAG I%sC plus 1912bytes (NT3H2211FHK)", spacer, "\xFD");
+    else if ( tagtype & MY_D )
+        PrintAndLogEx(NORMAL, "%sTYPE : INFINEON my-d\x99 (SLE 66RxxS)", spacer);
+    else if ( tagtype & MY_D_NFC )
+        PrintAndLogEx(NORMAL, "%sTYPE : INFINEON my-d\x99 NFC (SLE 66RxxP)", spacer);
+    else if ( tagtype & MY_D_MOVE )
+        PrintAndLogEx(NORMAL, "%sTYPE : INFINEON my-d\x99 move (SLE 66R01P)", spacer);
+    else if ( tagtype & MY_D_MOVE_NFC )
+        PrintAndLogEx(NORMAL, "%sTYPE : INFINEON my-d\x99 move NFC (SLE 66R01P)", spacer);
+    else if ( tagtype & MY_D_MOVE_LEAN )
+        PrintAndLogEx(NORMAL, "%sTYPE : INFINEON my-d\x99 move lean (SLE 66R01L)", spacer);
+    else if ( tagtype & FUDAN_UL )
+        PrintAndLogEx(NORMAL, "%sTYPE : FUDAN Ultralight Compatible (or other compatible) %s", spacer, (tagtype & MAGIC) ? "<magic>" : "" );
+    else
+        PrintAndLogEx(NORMAL, "%sTYPE : Unknown %06x", spacer, tagtype);
+    return 0;
 }
 
 static int ulc_print_3deskey( uint8_t *data){
-	PrintAndLogEx(NORMAL, "         deskey1 [44/0x2C] : %s [s]", sprint_hex(data   ,4), sprint_ascii(data,4) );
-	PrintAndLogEx(NORMAL, "         deskey1 [45/0x2D] : %s [s]", sprint_hex(data+4 ,4), sprint_ascii(data+4,4));
-	PrintAndLogEx(NORMAL, "         deskey2 [46/0x2E] : %s [s]", sprint_hex(data+8 ,4), sprint_ascii(data+8,4));
-	PrintAndLogEx(NORMAL, "         deskey2 [47/0x2F] : %s [s]", sprint_hex(data+12,4), sprint_ascii(data+12,4));
-	PrintAndLogEx(NORMAL, "\n 3des key : %s", sprint_hex(SwapEndian64(data, 16, 8), 16));
-	return 0;
+    PrintAndLogEx(NORMAL, "         deskey1 [44/0x2C] : %s [s]", sprint_hex(data   ,4), sprint_ascii(data,4) );
+    PrintAndLogEx(NORMAL, "         deskey1 [45/0x2D] : %s [s]", sprint_hex(data+4 ,4), sprint_ascii(data+4,4));
+    PrintAndLogEx(NORMAL, "         deskey2 [46/0x2E] : %s [s]", sprint_hex(data+8 ,4), sprint_ascii(data+8,4));
+    PrintAndLogEx(NORMAL, "         deskey2 [47/0x2F] : %s [s]", sprint_hex(data+12,4), sprint_ascii(data+12,4));
+    PrintAndLogEx(NORMAL, "\n 3des key : %s", sprint_hex(SwapEndian64(data, 16, 8), 16));
+    return 0;
 }
 
 static int ulc_print_configuration( uint8_t *data){
 
-	PrintAndLogEx(NORMAL, "--- UL-C Configuration");
-	PrintAndLogEx(NORMAL, " Higher Lockbits [40/0x28] : %s - %s", sprint_hex(data, 4), sprint_bin(data, 2));
-	PrintAndLogEx(NORMAL, "         Counter [41/0x29] : %s - %s", sprint_hex(data+4, 4), sprint_bin(data+4, 2));
+    PrintAndLogEx(NORMAL, "--- UL-C Configuration");
+    PrintAndLogEx(NORMAL, " Higher Lockbits [40/0x28] : %s - %s", sprint_hex(data, 4), sprint_bin(data, 2));
+    PrintAndLogEx(NORMAL, "         Counter [41/0x29] : %s - %s", sprint_hex(data+4, 4), sprint_bin(data+4, 2));
 
-	bool validAuth = (data[8] >= 0x03 && data[8] <= 0x30);
-	if ( validAuth )
-		PrintAndLogEx(NORMAL, "           Auth0 [42/0x2A] : %s page %d/0x%02X and above need authentication", sprint_hex(data+8, 4), data[8],data[8] );
-	else{
-		if ( data[8] == 0){
-			PrintAndLogEx(NORMAL, "           Auth0 [42/0x2A] : %s default", sprint_hex(data+8, 4) );
-		} else {
-			PrintAndLogEx(NORMAL, "           Auth0 [42/0x2A] : %s auth byte is out-of-range", sprint_hex(data+8, 4) );
-		}
-	}
-	PrintAndLogEx(NORMAL, "           Auth1 [43/0x2B] : %s %s",
-			sprint_hex(data+12, 4),
-			(data[12] & 1) ? "write access restricted": "read and write access restricted"
-			);
-	return 0;
+    bool validAuth = (data[8] >= 0x03 && data[8] <= 0x30);
+    if ( validAuth )
+        PrintAndLogEx(NORMAL, "           Auth0 [42/0x2A] : %s page %d/0x%02X and above need authentication", sprint_hex(data+8, 4), data[8],data[8] );
+    else{
+        if ( data[8] == 0){
+            PrintAndLogEx(NORMAL, "           Auth0 [42/0x2A] : %s default", sprint_hex(data+8, 4) );
+        } else {
+            PrintAndLogEx(NORMAL, "           Auth0 [42/0x2A] : %s auth byte is out-of-range", sprint_hex(data+8, 4) );
+        }
+    }
+    PrintAndLogEx(NORMAL, "           Auth1 [43/0x2B] : %s %s",
+            sprint_hex(data+12, 4),
+            (data[12] & 1) ? "write access restricted": "read and write access restricted"
+            );
+    return 0;
 }
 
 static int ulev1_print_configuration(uint32_t tagtype, uint8_t *data, uint8_t startPage){
 
-	PrintAndLogEx(NORMAL, "\n--- Tag Configuration");
+    PrintAndLogEx(NORMAL, "\n--- Tag Configuration");
 
-	bool strg_mod_en = (data[0] & 2);
-	uint8_t authlim = (data[4] & 0x07);
-	bool nfc_cnf_en = (data[4] & 0x08);
-	bool nfc_cnf_prot_pwd = (data[4] & 0x10);
-	bool cfglck = (data[4] & 0x40);
-	bool prot = (data[4] & 0x80);
-	uint8_t vctid = data[5];
+    bool strg_mod_en = (data[0] & 2);
+    uint8_t authlim = (data[4] & 0x07);
+    bool nfc_cnf_en = (data[4] & 0x08);
+    bool nfc_cnf_prot_pwd = (data[4] & 0x10);
+    bool cfglck = (data[4] & 0x40);
+    bool prot = (data[4] & 0x80);
+    uint8_t vctid = data[5];
 
-	PrintAndLogEx(NORMAL, "  cfg0 [%u/0x%02X] : %s", startPage, startPage, sprint_hex(data, 4));
+    PrintAndLogEx(NORMAL, "  cfg0 [%u/0x%02X] : %s", startPage, startPage, sprint_hex(data, 4));
 
-	 if ( (tagtype & (NTAG_213_F | NTAG_216_F)) ) {
-		uint8_t mirror_conf = (data[0] & 0xC0);
-		uint8_t mirror_byte = (data[0] & 0x30);
-		bool sleep_en = (data[0] & 0x08);
-		strg_mod_en = (data[0] & 0x04);
-		uint8_t fdp_conf = (data[0] & 0x03);
+     if ( (tagtype & (NTAG_213_F | NTAG_216_F)) ) {
+        uint8_t mirror_conf = (data[0] & 0xC0);
+        uint8_t mirror_byte = (data[0] & 0x30);
+        bool sleep_en = (data[0] & 0x08);
+        strg_mod_en = (data[0] & 0x04);
+        uint8_t fdp_conf = (data[0] & 0x03);
 
-		switch (mirror_conf) {
-			case 0: PrintAndLogEx(NORMAL, "                    - no ASCII mirror"); break;
-			case 1: PrintAndLogEx(NORMAL, "                    - UID ASCII mirror"); break;
-			case 2: PrintAndLogEx(NORMAL, "                    - NFC counter ASCII mirror"); break;
-			case 3: PrintAndLogEx(NORMAL, "                    - UID and NFC counter ASCII mirror"); break;
-			default: break;
-		}
+        switch (mirror_conf) {
+            case 0: PrintAndLogEx(NORMAL, "                    - no ASCII mirror"); break;
+            case 1: PrintAndLogEx(NORMAL, "                    - UID ASCII mirror"); break;
+            case 2: PrintAndLogEx(NORMAL, "                    - NFC counter ASCII mirror"); break;
+            case 3: PrintAndLogEx(NORMAL, "                    - UID and NFC counter ASCII mirror"); break;
+            default: break;
+        }
 
-		PrintAndLogEx(NORMAL, "                    - SLEEP mode %s", (sleep_en) ? "enabled":"disabled");
+        PrintAndLogEx(NORMAL, "                    - SLEEP mode %s", (sleep_en) ? "enabled":"disabled");
 
-		switch (fdp_conf) {
-			case 0: PrintAndLogEx(NORMAL, "                    - no field detect"); break;
-			case 1: PrintAndLogEx(NORMAL, "                    - enabled by first State-of-Frame (start of communication)"); break;
-			case 2: PrintAndLogEx(NORMAL, "                    - enabled by selection of the tag"); break;
-			case 3: PrintAndLogEx(NORMAL, "                    - enabled by field presence"); break;
-			default: break;
-		}
-		// valid mirror start page and byte position within start page.
-		if ( tagtype & NTAG_213_F ) {
-			switch ( mirror_conf ) {
-				case 1: { PrintAndLogEx(NORMAL, "         mirror start block %02X | byte pos %02X - %s", data[2], mirror_byte, ( data[2]>= 0x4 && data[2] <= 0x24) ? "OK":"Invalid value"); break;}
-				case 2: { PrintAndLogEx(NORMAL, "         mirror start block %02X | byte pos %02X - %s", data[2], mirror_byte, ( data[2]>= 0x4 && data[2] <= 0x26) ? "OK":"Invalid value"); break;}
-				case 3: { PrintAndLogEx(NORMAL, "         mirror start block %02X | byte pos %02X - %s", data[2], mirror_byte, ( data[2]>= 0x4 && data[2] <= 0x22) ? "OK":"Invalid value"); break;}
-				default: break;
-			}
-		} else if ( tagtype & NTAG_216_F ) {
-			switch ( mirror_conf ) {
-				case 1: { PrintAndLogEx(NORMAL, "         mirror start block %02X | byte pos %02X - %s", data[2], mirror_byte, ( data[2]>= 0x4 && data[2] <= 0xDE) ? "OK":"Invalid value"); break;}
-				case 2: { PrintAndLogEx(NORMAL, "         mirror start block %02X | byte pos %02X - %s", data[2], mirror_byte, ( data[2]>= 0x4 && data[2] <= 0xE0) ? "OK":"Invalid value"); break;}
-				case 3: { PrintAndLogEx(NORMAL, "         mirror start block %02X | byte pos %02X - %s", data[2], mirror_byte, ( data[2]>= 0x4 && data[2] <= 0xDC) ? "OK":"Invalid value"); break;}
-				default: break;
-			}
-		}
-	}
-	PrintAndLogEx(NORMAL, "                    - strong modulation mode %s", (strg_mod_en) ? "enabled":"disabled");
+        switch (fdp_conf) {
+            case 0: PrintAndLogEx(NORMAL, "                    - no field detect"); break;
+            case 1: PrintAndLogEx(NORMAL, "                    - enabled by first State-of-Frame (start of communication)"); break;
+            case 2: PrintAndLogEx(NORMAL, "                    - enabled by selection of the tag"); break;
+            case 3: PrintAndLogEx(NORMAL, "                    - enabled by field presence"); break;
+            default: break;
+        }
+        // valid mirror start page and byte position within start page.
+        if ( tagtype & NTAG_213_F ) {
+            switch ( mirror_conf ) {
+                case 1: { PrintAndLogEx(NORMAL, "         mirror start block %02X | byte pos %02X - %s", data[2], mirror_byte, ( data[2]>= 0x4 && data[2] <= 0x24) ? "OK":"Invalid value"); break;}
+                case 2: { PrintAndLogEx(NORMAL, "         mirror start block %02X | byte pos %02X - %s", data[2], mirror_byte, ( data[2]>= 0x4 && data[2] <= 0x26) ? "OK":"Invalid value"); break;}
+                case 3: { PrintAndLogEx(NORMAL, "         mirror start block %02X | byte pos %02X - %s", data[2], mirror_byte, ( data[2]>= 0x4 && data[2] <= 0x22) ? "OK":"Invalid value"); break;}
+                default: break;
+            }
+        } else if ( tagtype & NTAG_216_F ) {
+            switch ( mirror_conf ) {
+                case 1: { PrintAndLogEx(NORMAL, "         mirror start block %02X | byte pos %02X - %s", data[2], mirror_byte, ( data[2]>= 0x4 && data[2] <= 0xDE) ? "OK":"Invalid value"); break;}
+                case 2: { PrintAndLogEx(NORMAL, "         mirror start block %02X | byte pos %02X - %s", data[2], mirror_byte, ( data[2]>= 0x4 && data[2] <= 0xE0) ? "OK":"Invalid value"); break;}
+                case 3: { PrintAndLogEx(NORMAL, "         mirror start block %02X | byte pos %02X - %s", data[2], mirror_byte, ( data[2]>= 0x4 && data[2] <= 0xDC) ? "OK":"Invalid value"); break;}
+                default: break;
+            }
+        }
+    }
+    PrintAndLogEx(NORMAL, "                    - strong modulation mode %s", (strg_mod_en) ? "enabled":"disabled");
 
-	if ( data[3] < 0xff )
-		PrintAndLogEx(NORMAL, "                    - page %d and above need authentication",data[3]);
-	else
-		PrintAndLogEx(NORMAL, "                    - pages don't need authentication");
+    if ( data[3] < 0xff )
+        PrintAndLogEx(NORMAL, "                    - page %d and above need authentication",data[3]);
+    else
+        PrintAndLogEx(NORMAL, "                    - pages don't need authentication");
 
-	PrintAndLogEx(NORMAL, "  cfg1 [%u/0x%02X] : %s", startPage + 1, startPage + 1,  sprint_hex(data+4, 4) );
-	if ( authlim == 0)
-		PrintAndLogEx(NORMAL, "                    - Unlimited password attempts");
-	else
-		PrintAndLogEx(NORMAL, "                    - Max number of password attempts is %d", authlim);
+    PrintAndLogEx(NORMAL, "  cfg1 [%u/0x%02X] : %s", startPage + 1, startPage + 1,  sprint_hex(data+4, 4) );
+    if ( authlim == 0)
+        PrintAndLogEx(NORMAL, "                    - Unlimited password attempts");
+    else
+        PrintAndLogEx(NORMAL, "                    - Max number of password attempts is %d", authlim);
 
-	PrintAndLogEx(NORMAL, "                    - NFC counter %s", (nfc_cnf_en) ? "enabled":"disabled");
-	PrintAndLogEx(NORMAL, "                    - NFC counter %s", (nfc_cnf_prot_pwd) ? "not protected":"password protection enabled");
+    PrintAndLogEx(NORMAL, "                    - NFC counter %s", (nfc_cnf_en) ? "enabled":"disabled");
+    PrintAndLogEx(NORMAL, "                    - NFC counter %s", (nfc_cnf_prot_pwd) ? "not protected":"password protection enabled");
 
-	PrintAndLogEx(NORMAL, "                    - user configuration %s", cfglck ? "permanently locked":"writeable");
-	PrintAndLogEx(NORMAL, "                    - %s access is protected with password", prot ? "read and write":"write");
-	PrintAndLogEx(NORMAL, "                    - %02X, Virtual Card Type Identifier is %s default", vctid, (vctid==0x05)? "":"not");
-	PrintAndLogEx(NORMAL, "  PWD  [%u/0x%02X] : %s- (cannot be read)", startPage + 2, startPage + 2,  sprint_hex(data+8, 4));
-	PrintAndLogEx(NORMAL, "  PACK [%u/0x%02X] : %s      - (cannot be read)", startPage + 3, startPage + 3,  sprint_hex(data+12, 2));
-	PrintAndLogEx(NORMAL, "  RFU  [%u/0x%02X] :       %s- (cannot be read)", startPage + 3, startPage + 3,  sprint_hex(data+14, 2));
-	return 0;
+    PrintAndLogEx(NORMAL, "                    - user configuration %s", cfglck ? "permanently locked":"writeable");
+    PrintAndLogEx(NORMAL, "                    - %s access is protected with password", prot ? "read and write":"write");
+    PrintAndLogEx(NORMAL, "                    - %02X, Virtual Card Type Identifier is %s default", vctid, (vctid==0x05)? "":"not");
+    PrintAndLogEx(NORMAL, "  PWD  [%u/0x%02X] : %s- (cannot be read)", startPage + 2, startPage + 2,  sprint_hex(data+8, 4));
+    PrintAndLogEx(NORMAL, "  PACK [%u/0x%02X] : %s      - (cannot be read)", startPage + 3, startPage + 3,  sprint_hex(data+12, 2));
+    PrintAndLogEx(NORMAL, "  RFU  [%u/0x%02X] :       %s- (cannot be read)", startPage + 3, startPage + 3,  sprint_hex(data+14, 2));
+    return 0;
 }
 
 static int ulev1_print_counters(){
-	PrintAndLogEx(NORMAL, "--- Tag Counters");
-	uint8_t tear[1] = {0};
-	uint8_t counter[3] = {0,0,0};
-	uint16_t len = 0;
-	for ( uint8_t i = 0; i<3; ++i) {
-		ulev1_readTearing(i,tear,sizeof(tear));
-		len = ulev1_readCounter(i,counter, sizeof(counter) );
-		if (len == 3) {
-			PrintAndLogEx(NORMAL, "       [%0d] : %s", i, sprint_hex(counter,3));
-			PrintAndLogEx(NORMAL, "                    - %02X tearing %s", tear[0], ( tear[0]==0xBD)?"Ok":"failure");
-		}
-	}
-	return len;
+    PrintAndLogEx(NORMAL, "--- Tag Counters");
+    uint8_t tear[1] = {0};
+    uint8_t counter[3] = {0,0,0};
+    uint16_t len = 0;
+    for ( uint8_t i = 0; i<3; ++i) {
+        ulev1_readTearing(i,tear,sizeof(tear));
+        len = ulev1_readCounter(i,counter, sizeof(counter) );
+        if (len == 3) {
+            PrintAndLogEx(NORMAL, "       [%0d] : %s", i, sprint_hex(counter,3));
+            PrintAndLogEx(NORMAL, "                    - %02X tearing %s", tear[0], ( tear[0]==0xBD)?"Ok":"failure");
+        }
+    }
+    return len;
 }
 
 static int ulev1_print_signature( uint8_t *data, uint8_t len){
-	PrintAndLogEx(NORMAL, "\n--- Tag Signature");
-	PrintAndLogEx(NORMAL, "IC signature public key name  : NXP NTAG21x (2013)");
-	PrintAndLogEx(NORMAL, "IC signature public key value : %s", sprint_hex(public_ecda_key, PUBLIC_ECDA_KEYLEN) );
-	PrintAndLogEx(NORMAL, "    Elliptic curve parameters : secp128r1");
-	PrintAndLogEx(NORMAL, "            Tag ECC Signature : %s", sprint_hex(data, len));
-	//to do:  verify if signature is valid
-	// only UID is signed.
-	//PrintAndLogEx(NORMAL, "IC signature status: %s valid", (iseccvalid() )?"":"not");
-	return 0;
+    PrintAndLogEx(NORMAL, "\n--- Tag Signature");
+    PrintAndLogEx(NORMAL, "IC signature public key name  : NXP NTAG21x (2013)");
+    PrintAndLogEx(NORMAL, "IC signature public key value : %s", sprint_hex(public_ecda_key, PUBLIC_ECDA_KEYLEN) );
+    PrintAndLogEx(NORMAL, "    Elliptic curve parameters : secp128r1");
+    PrintAndLogEx(NORMAL, "            Tag ECC Signature : %s", sprint_hex(data, len));
+    //to do:  verify if signature is valid
+    // only UID is signed.
+    //PrintAndLogEx(NORMAL, "IC signature status: %s valid", (iseccvalid() )?"":"not");
+    return 0;
 }
 
 static int ulev1_print_version(uint8_t *data){
-	PrintAndLogEx(NORMAL, "\n--- Tag Version");
-	PrintAndLogEx(NORMAL, "       Raw bytes : %s",sprint_hex(data, 8) );
-	PrintAndLogEx(NORMAL, "       Vendor ID : %02X, %s", data[1], getTagInfo(data[1]));
-	PrintAndLogEx(NORMAL, "    Product type : %s", getProductTypeStr(data[2]));
-	PrintAndLogEx(NORMAL, " Product subtype : %02X, %s", data[3], (data[3]==1) ?"17 pF":"50pF");
-	PrintAndLogEx(NORMAL, "   Major version : %02X", data[4]);
-	PrintAndLogEx(NORMAL, "   Minor version : %02X", data[5]);
-	PrintAndLogEx(NORMAL, "            Size : %s", getUlev1CardSizeStr(data[6]));
-	PrintAndLogEx(NORMAL, "   Protocol type : %02X %s", data[7],  (data[7]==0x3)?"(ISO14443-3 Compliant)":"");
-	return 0;
+    PrintAndLogEx(NORMAL, "\n--- Tag Version");
+    PrintAndLogEx(NORMAL, "       Raw bytes : %s",sprint_hex(data, 8) );
+    PrintAndLogEx(NORMAL, "       Vendor ID : %02X, %s", data[1], getTagInfo(data[1]));
+    PrintAndLogEx(NORMAL, "    Product type : %s", getProductTypeStr(data[2]));
+    PrintAndLogEx(NORMAL, " Product subtype : %02X, %s", data[3], (data[3]==1) ?"17 pF":"50pF");
+    PrintAndLogEx(NORMAL, "   Major version : %02X", data[4]);
+    PrintAndLogEx(NORMAL, "   Minor version : %02X", data[5]);
+    PrintAndLogEx(NORMAL, "            Size : %s", getUlev1CardSizeStr(data[6]));
+    PrintAndLogEx(NORMAL, "   Protocol type : %02X %s", data[7],  (data[7]==0x3)?"(ISO14443-3 Compliant)":"");
+    return 0;
 }
 
 /*
 static int ulc_magic_test(){
-	// Magic Ultralight test
-		// Magic UL-C, by observation,
-	// 1) it seems to have a static nonce response to 0x1A command.
-	// 2) the deskey bytes is not-zero:d out on as datasheet states.
-	// 3) UID - changeable, not only, but pages 0-1-2-3.
-	// 4) use the ul_magic_test !  magic tags answers specially!
-	int returnValue = UL_ERROR;
-	iso14a_card_select_t card;
-	uint8_t nonce1[11] = {0x00};
-	uint8_t nonce2[11] = {0x00};
-	int status = ul_select(&card);
-	if ( !status ){
-		return UL_ERROR;
-	}
-	status = ulc_requestAuthentication(nonce1, sizeof(nonce1));
-	if ( status > 0 ) {
-		status = ulc_requestAuthentication(nonce2, sizeof(nonce2));
-		returnValue =  ( !memcmp(nonce1, nonce2, 11) ) ? UL_C_MAGIC : UL_C;
-	} else {
-		returnValue = UL;
-	}
-	DropField();
-	return returnValue;
+    // Magic Ultralight test
+        // Magic UL-C, by observation,
+    // 1) it seems to have a static nonce response to 0x1A command.
+    // 2) the deskey bytes is not-zero:d out on as datasheet states.
+    // 3) UID - changeable, not only, but pages 0-1-2-3.
+    // 4) use the ul_magic_test !  magic tags answers specially!
+    int returnValue = UL_ERROR;
+    iso14a_card_select_t card;
+    uint8_t nonce1[11] = {0x00};
+    uint8_t nonce2[11] = {0x00};
+    int status = ul_select(&card);
+    if ( !status ){
+        return UL_ERROR;
+    }
+    status = ulc_requestAuthentication(nonce1, sizeof(nonce1));
+    if ( status > 0 ) {
+        status = ulc_requestAuthentication(nonce2, sizeof(nonce2));
+        returnValue =  ( !memcmp(nonce1, nonce2, 11) ) ? UL_C_MAGIC : UL_C;
+    } else {
+        returnValue = UL;
+    }
+    DropField();
+    return returnValue;
 }
 */
 static int ul_magic_test(){
-	// Magic Ultralight tests
-	// 1) take present UID, and try to write it back. OBSOLETE
-	// 2) make a wrong length write to page0, and see if tag answers with ACK/NACK:
+    // Magic Ultralight tests
+    // 1) take present UID, and try to write it back. OBSOLETE
+    // 2) make a wrong length write to page0, and see if tag answers with ACK/NACK:
 
-	iso14a_card_select_t card;
-	if ( !ul_select(&card) )
-		return UL_ERROR;
-	int status = ul_comp_write(0, NULL, 0);
-	DropField();
-	if ( status == 0 )
-		return MAGIC;
-	return 0;
+    iso14a_card_select_t card;
+    if ( !ul_select(&card) )
+        return UL_ERROR;
+    int status = ul_comp_write(0, NULL, 0);
+    DropField();
+    if ( status == 0 )
+        return MAGIC;
+    return 0;
 }
 
 uint32_t GetHF14AMfU_Type(void){
 
-	TagTypeUL_t tagtype = UNKNOWN;
-	iso14a_card_select_t card;
-	uint8_t version[10] = {0x00};
-	int status = 0;
-	int len;
+    TagTypeUL_t tagtype = UNKNOWN;
+    iso14a_card_select_t card;
+    uint8_t version[10] = {0x00};
+    int status = 0;
+    int len;
 
-	if (!ul_select(&card)) return UL_ERROR;
+    if (!ul_select(&card)) return UL_ERROR;
 
-	// Ultralight - ATQA / SAK
-	if ( card.atqa[1] != 0x00 || card.atqa[0] != 0x44 || card.sak != 0x00 ) {
-		//PrintAndLogEx(NORMAL, "Tag is not Ultralight | NTAG | MY-D  [ATQA: %02X %02X SAK: %02X]\n", card.atqa[1], card.atqa[0], card.sak);
-		DropField();
-		return UL_ERROR;
-	}
+    // Ultralight - ATQA / SAK
+    if ( card.atqa[1] != 0x00 || card.atqa[0] != 0x44 || card.sak != 0x00 ) {
+        //PrintAndLogEx(NORMAL, "Tag is not Ultralight | NTAG | MY-D  [ATQA: %02X %02X SAK: %02X]\n", card.atqa[1], card.atqa[0], card.sak);
+        DropField();
+        return UL_ERROR;
+    }
 
-	if ( card.uid[0] != 0x05) {
+    if ( card.uid[0] != 0x05) {
 
-		len  = ulev1_getVersion(version, sizeof(version));
-		DropField();
+        len  = ulev1_getVersion(version, sizeof(version));
+        DropField();
 
-		switch (len) {
-			case 0x0A: {
+        switch (len) {
+            case 0x0A: {
 
-				if ( memcmp(version, "\x00\x04\x03\x01\x01\x00\x0B", 7) == 0)      { tagtype = UL_EV1_48; break; }
-				else if ( memcmp(version, "\x00\x04\x03\x01\x02\x00\x0B", 7) == 0) { tagtype = UL_NANO_40; break; }
-				else if ( memcmp(version, "\x00\x04\x03\x02\x01\x00\x0B", 7) == 0) { tagtype = UL_EV1_48; break; }
-				else if ( memcmp(version, "\x00\x04\x03\x01\x01\x00\x0E", 7) == 0) { tagtype = UL_EV1_128; break; }
-				else if ( memcmp(version, "\x00\x04\x03\x02\x01\x00\x0E", 7) == 0) { tagtype = UL_EV1_128; break; }
-				else if ( memcmp(version, "\x00\x04\x04\x01\x01\x00\x0B", 7) == 0) { tagtype = NTAG_210; break; }
-				else if ( memcmp(version, "\x00\x04\x04\x01\x01\x00\x0E", 7) == 0) { tagtype = NTAG_212; break; }
-				else if ( memcmp(version, "\x00\x04\x04\x02\x01\x00\x0F", 7) == 0) { tagtype = NTAG_213; break; }
-				else if ( memcmp(version, "\x00\x04\x04\x02\x01\x00\x11", 7) == 0) { tagtype = NTAG_215; break; }
-				else if ( memcmp(version, "\x00\x04\x04\x02\x01\x00\x13", 7) == 0) { tagtype = NTAG_216; break; }
-				else if ( memcmp(version, "\x00\x04\x04\x04\x01\x00\x0F", 7) == 0) { tagtype = NTAG_213_F; break; }
-				else if ( memcmp(version, "\x00\x04\x04\x04\x01\x00\x13", 7) == 0) { tagtype = NTAG_216_F; break; }
-				else if ( memcmp(version, "\x00\x04\x04\x05\x02\x01\x13", 7) == 0) { tagtype = NTAG_I2C_1K; break; }
-				else if ( memcmp(version, "\x00\x04\x04\x05\x02\x01\x15", 7) == 0) { tagtype = NTAG_I2C_2K; break; }
-				else if ( memcmp(version, "\x00\x04\x04\x05\x02\x02\x13", 7) == 0) { tagtype = NTAG_I2C_1K_PLUS; break; }
-				else if ( memcmp(version, "\x00\x04\x04\x05\x02\x02\x15", 7) == 0) { tagtype = NTAG_I2C_2K_PLUS; break; }
-				else if ( version[2] == 0x04 ) { tagtype = NTAG; break; }
-				else if ( version[2] == 0x03 ) { tagtype = UL_EV1; }
-				break;
-			}
-			case 0x01: tagtype = UL_C; break;
-			case 0x00: tagtype = UL; break;
-			case -1  : tagtype = (UL | UL_C | NTAG_203); break;  // could be UL | UL_C magic tags
-			default  : tagtype = UNKNOWN; break;
-		}
+                if ( memcmp(version, "\x00\x04\x03\x01\x01\x00\x0B", 7) == 0)      { tagtype = UL_EV1_48; break; }
+                else if ( memcmp(version, "\x00\x04\x03\x01\x02\x00\x0B", 7) == 0) { tagtype = UL_NANO_40; break; }
+                else if ( memcmp(version, "\x00\x04\x03\x02\x01\x00\x0B", 7) == 0) { tagtype = UL_EV1_48; break; }
+                else if ( memcmp(version, "\x00\x04\x03\x01\x01\x00\x0E", 7) == 0) { tagtype = UL_EV1_128; break; }
+                else if ( memcmp(version, "\x00\x04\x03\x02\x01\x00\x0E", 7) == 0) { tagtype = UL_EV1_128; break; }
+                else if ( memcmp(version, "\x00\x04\x04\x01\x01\x00\x0B", 7) == 0) { tagtype = NTAG_210; break; }
+                else if ( memcmp(version, "\x00\x04\x04\x01\x01\x00\x0E", 7) == 0) { tagtype = NTAG_212; break; }
+                else if ( memcmp(version, "\x00\x04\x04\x02\x01\x00\x0F", 7) == 0) { tagtype = NTAG_213; break; }
+                else if ( memcmp(version, "\x00\x04\x04\x02\x01\x00\x11", 7) == 0) { tagtype = NTAG_215; break; }
+                else if ( memcmp(version, "\x00\x04\x04\x02\x01\x00\x13", 7) == 0) { tagtype = NTAG_216; break; }
+                else if ( memcmp(version, "\x00\x04\x04\x04\x01\x00\x0F", 7) == 0) { tagtype = NTAG_213_F; break; }
+                else if ( memcmp(version, "\x00\x04\x04\x04\x01\x00\x13", 7) == 0) { tagtype = NTAG_216_F; break; }
+                else if ( memcmp(version, "\x00\x04\x04\x05\x02\x01\x13", 7) == 0) { tagtype = NTAG_I2C_1K; break; }
+                else if ( memcmp(version, "\x00\x04\x04\x05\x02\x01\x15", 7) == 0) { tagtype = NTAG_I2C_2K; break; }
+                else if ( memcmp(version, "\x00\x04\x04\x05\x02\x02\x13", 7) == 0) { tagtype = NTAG_I2C_1K_PLUS; break; }
+                else if ( memcmp(version, "\x00\x04\x04\x05\x02\x02\x15", 7) == 0) { tagtype = NTAG_I2C_2K_PLUS; break; }
+                else if ( version[2] == 0x04 ) { tagtype = NTAG; break; }
+                else if ( version[2] == 0x03 ) { tagtype = UL_EV1; }
+                break;
+            }
+            case 0x01: tagtype = UL_C; break;
+            case 0x00: tagtype = UL; break;
+            case -1  : tagtype = (UL | UL_C | NTAG_203); break;  // could be UL | UL_C magic tags
+            default  : tagtype = UNKNOWN; break;
+        }
 
-		// UL vs UL-C vs ntag203 test
-		if (tagtype & (UL | UL_C | NTAG_203)) {
-			if ( !ul_select(&card) ) return UL_ERROR;
+        // UL vs UL-C vs ntag203 test
+        if (tagtype & (UL | UL_C | NTAG_203)) {
+            if ( !ul_select(&card) ) return UL_ERROR;
 
-			// do UL_C check first...
-			uint8_t nonce[11] = {0x00};
-			status = ulc_requestAuthentication(nonce, sizeof(nonce));
-			DropField();
-			if (status > 1) {
-				tagtype = UL_C;
-			} else {
-				// need to re-select after authentication error
-				if ( !ul_select(&card) ) return UL_ERROR;
+            // do UL_C check first...
+            uint8_t nonce[11] = {0x00};
+            status = ulc_requestAuthentication(nonce, sizeof(nonce));
+            DropField();
+            if (status > 1) {
+                tagtype = UL_C;
+            } else {
+                // need to re-select after authentication error
+                if ( !ul_select(&card) ) return UL_ERROR;
 
-				uint8_t data[16] = {0x00};
-				// read page 0x26-0x29 (last valid ntag203 page)
-				status = ul_read(0x26, data, sizeof(data));
-				if ( status <= 1 ) {
-					tagtype = UL;
-				} else {
-					// read page 0x30 (should error if it is a ntag203)
-					status = ul_read(0x30, data, sizeof(data));
-					if ( status <= 1 ){
-						tagtype = NTAG_203;
-					} else {
-						tagtype = UNKNOWN;
-					}
-				}
-				DropField();
-			}
-		}
-		if (tagtype & UL) {
-			tagtype = ul_fudan_check();
-			DropField();
-		}
-	} else {
-		DropField();
-		// Infinition MY-D tests   Exam high nibble
-		uint8_t nib = (card.uid[1] & 0xf0) >> 4;
-		switch ( nib ){
-			// case 0: tagtype =  SLE66R35E7; break; //or SLE 66R35E7 - mifare compat... should have different sak/atqa for mf 1k
-			case 1:	tagtype =  MY_D; break; // or SLE 66RxxS ... up to 512 pages of 8 user bytes...
-			case 2:	tagtype = (MY_D_NFC); break; // or SLE 66RxxP ... up to 512 pages of 8 user bytes... (or in nfc mode FF pages of 4 bytes)
-			case 3:	tagtype = (MY_D_MOVE | MY_D_MOVE_NFC); break; // or SLE 66R01P // 38 pages of 4 bytes //notice: we can not currently distinguish between these two
-			case 7: tagtype =  MY_D_MOVE_LEAN; break; // or SLE 66R01L  // 16 pages of 4 bytes
-		}
-	}
+                uint8_t data[16] = {0x00};
+                // read page 0x26-0x29 (last valid ntag203 page)
+                status = ul_read(0x26, data, sizeof(data));
+                if ( status <= 1 ) {
+                    tagtype = UL;
+                } else {
+                    // read page 0x30 (should error if it is a ntag203)
+                    status = ul_read(0x30, data, sizeof(data));
+                    if ( status <= 1 ){
+                        tagtype = NTAG_203;
+                    } else {
+                        tagtype = UNKNOWN;
+                    }
+                }
+                DropField();
+            }
+        }
+        if (tagtype & UL) {
+            tagtype = ul_fudan_check();
+            DropField();
+        }
+    } else {
+        DropField();
+        // Infinition MY-D tests   Exam high nibble
+        uint8_t nib = (card.uid[1] & 0xf0) >> 4;
+        switch ( nib ){
+            // case 0: tagtype =  SLE66R35E7; break; //or SLE 66R35E7 - mifare compat... should have different sak/atqa for mf 1k
+            case 1: tagtype =  MY_D; break; // or SLE 66RxxS ... up to 512 pages of 8 user bytes...
+            case 2: tagtype = (MY_D_NFC); break; // or SLE 66RxxP ... up to 512 pages of 8 user bytes... (or in nfc mode FF pages of 4 bytes)
+            case 3: tagtype = (MY_D_MOVE | MY_D_MOVE_NFC); break; // or SLE 66R01P // 38 pages of 4 bytes //notice: we can not currently distinguish between these two
+            case 7: tagtype =  MY_D_MOVE_LEAN; break; // or SLE 66R01L  // 16 pages of 4 bytes
+        }
+    }
 
-	tagtype |= ul_magic_test();
-	if (tagtype == (UNKNOWN | MAGIC)) tagtype = (UL_MAGIC);
-	return tagtype;
+    tagtype |= ul_magic_test();
+    if (tagtype == (UNKNOWN | MAGIC)) tagtype = (UL_MAGIC);
+    return tagtype;
 }
 //
 //  extended tag information
 //
 int CmdHF14AMfUInfo(const char *Cmd){
 
-	uint8_t authlim = 0xff;
-	uint8_t data[16] = {0x00};
-	iso14a_card_select_t card;
-	int status;
-	bool errors = false;
-	bool hasAuthKey = false;
-	bool locked = false;
-	bool swapEndian = false;
-	uint8_t cmdp = 0;
-	uint8_t dataLen = 0;
-	uint8_t authenticationkey[16] = {0x00};
-	uint8_t *authkeyptr = authenticationkey;
-	uint8_t pwd[4] = {0,0,0,0};
-	uint8_t	*key = pwd;
-	uint8_t pack[4] = {0,0,0,0};
-	int len = 0;
-	char tempStr[50];
+    uint8_t authlim = 0xff;
+    uint8_t data[16] = {0x00};
+    iso14a_card_select_t card;
+    int status;
+    bool errors = false;
+    bool hasAuthKey = false;
+    bool locked = false;
+    bool swapEndian = false;
+    uint8_t cmdp = 0;
+    uint8_t dataLen = 0;
+    uint8_t authenticationkey[16] = {0x00};
+    uint8_t *authkeyptr = authenticationkey;
+    uint8_t pwd[4] = {0,0,0,0};
+    uint8_t *key = pwd;
+    uint8_t pack[4] = {0,0,0,0};
+    int len = 0;
+    char tempStr[50];
 
-	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch (tolower(param_getchar(Cmd, cmdp))) {
-		case 'h':
-			return usage_hf_mfu_info();
-		case 'k':
-			dataLen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
-			if (dataLen == 32 || dataLen == 8) { //ul-c or ev1/ntag key length
-				errors = param_gethex(tempStr, 0, authenticationkey, dataLen);
-				dataLen /= 2; // handled as bytes from now on
-			} else {
-				PrintAndLogEx(WARNING, "ERROR: Key is incorrect length\n");
-				errors = true;
-			}
-			cmdp += 2;
-			hasAuthKey = true;
-			break;
-		case 'l':
-			swapEndian = true;
-			cmdp++;
-			break;
-		default:
-			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-			errors = true;
-			break;
-		}
-	}
-	//Validations
-	if (errors) return usage_hf_mfu_info();
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+        case 'h':
+            return usage_hf_mfu_info();
+        case 'k':
+            dataLen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
+            if (dataLen == 32 || dataLen == 8) { //ul-c or ev1/ntag key length
+                errors = param_gethex(tempStr, 0, authenticationkey, dataLen);
+                dataLen /= 2; // handled as bytes from now on
+            } else {
+                PrintAndLogEx(WARNING, "ERROR: Key is incorrect length\n");
+                errors = true;
+            }
+            cmdp += 2;
+            hasAuthKey = true;
+            break;
+        case 'l':
+            swapEndian = true;
+            cmdp++;
+            break;
+        default:
+            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+            errors = true;
+            break;
+        }
+    }
+    //Validations
+    if (errors) return usage_hf_mfu_info();
 
-	TagTypeUL_t tagtype = GetHF14AMfU_Type();
-	if (tagtype == UL_ERROR) return -1;
+    TagTypeUL_t tagtype = GetHF14AMfU_Type();
+    if (tagtype == UL_ERROR) return -1;
 
-	PrintAndLogEx(NORMAL, "\n--- Tag Information ---------");
-	PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
-	ul_print_type(tagtype, 6);
+    PrintAndLogEx(NORMAL, "\n--- Tag Information ---------");
+    PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
+    ul_print_type(tagtype, 6);
 
-	// Swap endianness
-	if (swapEndian && hasAuthKey) authkeyptr = SwapEndian64(authenticationkey, dataLen, (dataLen == 16) ? 8 : 4 );
+    // Swap endianness
+    if (swapEndian && hasAuthKey) authkeyptr = SwapEndian64(authenticationkey, dataLen, (dataLen == 16) ? 8 : 4 );
 
-	if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
+    if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
 
-	// read pages 0,1,2,3 (should read 4pages)
-	status = ul_read(0, data, sizeof(data));
-	if ( status == -1 ) {
-		DropField();
-		PrintAndLogEx(WARNING, "Error: tag didn't answer to READ");
-		return status;
-	} else if (status == 16) {
-		ul_print_default(data);
-		ndef_print_CC(data+12);
-	} else {
-		locked = true;
-	}
+    // read pages 0,1,2,3 (should read 4pages)
+    status = ul_read(0, data, sizeof(data));
+    if ( status == -1 ) {
+        DropField();
+        PrintAndLogEx(WARNING, "Error: tag didn't answer to READ");
+        return status;
+    } else if (status == 16) {
+        ul_print_default(data);
+        ndef_print_CC(data+12);
+    } else {
+        locked = true;
+    }
 
-	// UL_C Specific
-	if ((tagtype & UL_C)) {
+    // UL_C Specific
+    if ((tagtype & UL_C)) {
 
-		// read pages 0x28, 0x29, 0x2A, 0x2B
-		uint8_t ulc_conf[16] = {0x00};
-		status = ul_read(0x28, ulc_conf, sizeof(ulc_conf));
-		if ( status == -1 ){
-			PrintAndLogEx(WARNING, "Error: tag didn't answer to READ UL-C");
-			DropField();
-			return status;
-		}
-		if (status == 16)
-			ulc_print_configuration(ulc_conf);
-		else
-			locked = true;
+        // read pages 0x28, 0x29, 0x2A, 0x2B
+        uint8_t ulc_conf[16] = {0x00};
+        status = ul_read(0x28, ulc_conf, sizeof(ulc_conf));
+        if ( status == -1 ){
+            PrintAndLogEx(WARNING, "Error: tag didn't answer to READ UL-C");
+            DropField();
+            return status;
+        }
+        if (status == 16)
+            ulc_print_configuration(ulc_conf);
+        else
+            locked = true;
 
-		if ((tagtype & MAGIC)) {
-			//just read key
-			uint8_t ulc_deskey[16] = {0x00};
-			status = ul_read(0x2C, ulc_deskey, sizeof(ulc_deskey));
-			if ( status == -1 ) {
-				DropField();
-				PrintAndLogEx(WARNING, "Error: tag didn't answer to READ magic");
-				return status;
-			}
-			if (status == 16) ulc_print_3deskey(ulc_deskey);
+        if ((tagtype & MAGIC)) {
+            //just read key
+            uint8_t ulc_deskey[16] = {0x00};
+            status = ul_read(0x2C, ulc_deskey, sizeof(ulc_deskey));
+            if ( status == -1 ) {
+                DropField();
+                PrintAndLogEx(WARNING, "Error: tag didn't answer to READ magic");
+                return status;
+            }
+            if (status == 16) ulc_print_3deskey(ulc_deskey);
 
-		} else {
-			DropField();
-			// if we called info with key, just return
-			if ( hasAuthKey ) return 1;
+        } else {
+            DropField();
+            // if we called info with key, just return
+            if ( hasAuthKey ) return 1;
 
-			// also try to diversify default keys..  look into CmdHF14AMfuGenDiverseKeys
-			PrintAndLogEx(INFO, "Trying some default 3des keys");
-			for (uint8_t i = 0; i < KEYS_3DES_COUNT; ++i ) {
-				key = default_3des_keys[i];
-				if (ulc_authentication(key, true)) {
-					PrintAndLogEx(SUCCESS, "Found default 3des key: ");
-					uint8_t keySwap[16];
-					memcpy(keySwap, SwapEndian64(key,16,8), 16);
-					ulc_print_3deskey(keySwap);
-					return 1;
-				}
-			}
-			return 1;
-		}
-	}
+            // also try to diversify default keys..  look into CmdHF14AMfuGenDiverseKeys
+            PrintAndLogEx(INFO, "Trying some default 3des keys");
+            for (uint8_t i = 0; i < KEYS_3DES_COUNT; ++i ) {
+                key = default_3des_keys[i];
+                if (ulc_authentication(key, true)) {
+                    PrintAndLogEx(SUCCESS, "Found default 3des key: ");
+                    uint8_t keySwap[16];
+                    memcpy(keySwap, SwapEndian64(key,16,8), 16);
+                    ulc_print_3deskey(keySwap);
+                    return 1;
+                }
+            }
+            return 1;
+        }
+    }
 
-	// do counters and signature first (don't neet auth)
+    // do counters and signature first (don't neet auth)
 
-	// ul counters are different than ntag counters
-	if ((tagtype & (UL_EV1_48 | UL_EV1_128 | UL_EV1))) {
-		if (ulev1_print_counters() != 3) {
-			// failed - re-select
-			if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
-		}
-	}
+    // ul counters are different than ntag counters
+    if ((tagtype & (UL_EV1_48 | UL_EV1_128 | UL_EV1))) {
+        if (ulev1_print_counters() != 3) {
+            // failed - re-select
+            if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
+        }
+    }
 
-	// NTAG counters?
+    // NTAG counters?
 
-	// Read signature
-	if ((tagtype & (UL_EV1_48 | UL_EV1_128 | UL_EV1 | UL_NANO_40 | NTAG_213 | NTAG_213_F | NTAG_215 | NTAG_216 | NTAG_216_F | NTAG_I2C_1K | NTAG_I2C_2K | NTAG_I2C_1K_PLUS | NTAG_I2C_2K_PLUS))) {
-		uint8_t ulev1_signature[32] = {0x00};
-		status = ulev1_readSignature( ulev1_signature, sizeof(ulev1_signature));
-		if ( status == -1 ) {
-			PrintAndLogEx(WARNING, "Error: tag didn't answer to READ SIGNATURE");
-			DropField();
-			return status;
-		}
-		if (status == 32) ulev1_print_signature( ulev1_signature, sizeof(ulev1_signature));
-		else {
-			// re-select
-			if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
-		}
-	}
+    // Read signature
+    if ((tagtype & (UL_EV1_48 | UL_EV1_128 | UL_EV1 | UL_NANO_40 | NTAG_213 | NTAG_213_F | NTAG_215 | NTAG_216 | NTAG_216_F | NTAG_I2C_1K | NTAG_I2C_2K | NTAG_I2C_1K_PLUS | NTAG_I2C_2K_PLUS))) {
+        uint8_t ulev1_signature[32] = {0x00};
+        status = ulev1_readSignature( ulev1_signature, sizeof(ulev1_signature));
+        if ( status == -1 ) {
+            PrintAndLogEx(WARNING, "Error: tag didn't answer to READ SIGNATURE");
+            DropField();
+            return status;
+        }
+        if (status == 32) ulev1_print_signature( ulev1_signature, sizeof(ulev1_signature));
+        else {
+            // re-select
+            if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
+        }
+    }
 
-	// Get Version
-	if ((tagtype & (UL_EV1_48 | UL_EV1_128 | UL_EV1 | UL_NANO_40 | NTAG_213 | NTAG_213_F | NTAG_215 | NTAG_216 | NTAG_216_F | NTAG_I2C_1K | NTAG_I2C_2K | NTAG_I2C_1K_PLUS | NTAG_I2C_2K_PLUS))) {
-		uint8_t version[10] = {0x00};
-		status  = ulev1_getVersion(version, sizeof(version));
-		if ( status == -1 ) {
-			PrintAndLogEx(WARNING, "Error: tag didn't answer to GETVERSION");
-			DropField();
-			return status;
-		} else if (status == 10) {
-			ulev1_print_version(version);
-		} else {
-			locked = true;
-			if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
-		}
+    // Get Version
+    if ((tagtype & (UL_EV1_48 | UL_EV1_128 | UL_EV1 | UL_NANO_40 | NTAG_213 | NTAG_213_F | NTAG_215 | NTAG_216 | NTAG_216_F | NTAG_I2C_1K | NTAG_I2C_2K | NTAG_I2C_1K_PLUS | NTAG_I2C_2K_PLUS))) {
+        uint8_t version[10] = {0x00};
+        status  = ulev1_getVersion(version, sizeof(version));
+        if ( status == -1 ) {
+            PrintAndLogEx(WARNING, "Error: tag didn't answer to GETVERSION");
+            DropField();
+            return status;
+        } else if (status == 10) {
+            ulev1_print_version(version);
+        } else {
+            locked = true;
+            if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
+        }
 
-		uint8_t startconfigblock = 0;
-		uint8_t ulev1_conf[16] = {0x00};
+        uint8_t startconfigblock = 0;
+        uint8_t ulev1_conf[16] = {0x00};
 
-		// config blocks always are last 4 pages
-		for (uint8_t i = 0; i < MAX_UL_TYPES; i++) {
-			if (tagtype & UL_TYPES_ARRAY[i]) {
-				startconfigblock = UL_MEMORY_ARRAY[i]-3;
-				break;
-			}
-		}
+        // config blocks always are last 4 pages
+        for (uint8_t i = 0; i < MAX_UL_TYPES; i++) {
+            if (tagtype & UL_TYPES_ARRAY[i]) {
+                startconfigblock = UL_MEMORY_ARRAY[i]-3;
+                break;
+            }
+        }
 
-		if (startconfigblock){ // if we know where the config block is...
-			status = ul_read(startconfigblock, ulev1_conf, sizeof(ulev1_conf));
-			if ( status == -1 ) {
-				PrintAndLogEx(WARNING, "Error: tag didn't answer to READ EV1");
-				DropField();
-				return status;
-			} else if (status == 16) {
-				// save AUTHENTICATION LIMITS for later:
-				authlim = (ulev1_conf[4] & 0x07);
-				// add pwd / pack if used from cli
-				if ( hasAuthKey ) {
-					memcpy(ulev1_conf+8, authkeyptr, 4);
-					memcpy(ulev1_conf+12, pack, 2);
-				}
-				ulev1_print_configuration(tagtype, ulev1_conf, startconfigblock);
-			}
-		}
+        if (startconfigblock){ // if we know where the config block is...
+            status = ul_read(startconfigblock, ulev1_conf, sizeof(ulev1_conf));
+            if ( status == -1 ) {
+                PrintAndLogEx(WARNING, "Error: tag didn't answer to READ EV1");
+                DropField();
+                return status;
+            } else if (status == 16) {
+                // save AUTHENTICATION LIMITS for later:
+                authlim = (ulev1_conf[4] & 0x07);
+                // add pwd / pack if used from cli
+                if ( hasAuthKey ) {
+                    memcpy(ulev1_conf+8, authkeyptr, 4);
+                    memcpy(ulev1_conf+12, pack, 2);
+                }
+                ulev1_print_configuration(tagtype, ulev1_conf, startconfigblock);
+            }
+        }
 
-		// AUTHLIMIT, (number of failed authentications)
-		// 0 = limitless.
-		// 1-7 = limit. No automatic tries then.
-		// hasAuthKey,  if we was called with key, skip test.
-		if ( !authlim && !hasAuthKey ) {
-			PrintAndLogEx(NORMAL, "\n--- Known EV1/NTAG passwords.");
-			len = 0;
+        // AUTHLIMIT, (number of failed authentications)
+        // 0 = limitless.
+        // 1-7 = limit. No automatic tries then.
+        // hasAuthKey,  if we was called with key, skip test.
+        if ( !authlim && !hasAuthKey ) {
+            PrintAndLogEx(NORMAL, "\n--- Known EV1/NTAG passwords.");
+            len = 0;
 
-			// test pwd gen A
-			num_to_bytes( ul_ev1_pwdgenA(card.uid), 4, key);
-			len = ulev1_requestAuthentication(key, pack, sizeof(pack));
-			if (len > -1) {
-				PrintAndLogEx(SUCCESS, "Found a default password: %s || Pack: %02X %02X",sprint_hex(key, 4), pack[0], pack[1]);
-				goto out;
-			}
+            // test pwd gen A
+            num_to_bytes( ul_ev1_pwdgenA(card.uid), 4, key);
+            len = ulev1_requestAuthentication(key, pack, sizeof(pack));
+            if (len > -1) {
+                PrintAndLogEx(SUCCESS, "Found a default password: %s || Pack: %02X %02X",sprint_hex(key, 4), pack[0], pack[1]);
+                goto out;
+            }
 
-			if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
+            if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
 
-			// test pwd gen B
-			num_to_bytes( ul_ev1_pwdgenB(card.uid), 4, key);
-			len = ulev1_requestAuthentication(key, pack, sizeof(pack));
-			if (len > -1) {
-				PrintAndLogEx(SUCCESS, "Found a default password: %s || Pack: %02X %02X",sprint_hex(key, 4), pack[0], pack[1]);
-				goto out;
-			}
+            // test pwd gen B
+            num_to_bytes( ul_ev1_pwdgenB(card.uid), 4, key);
+            len = ulev1_requestAuthentication(key, pack, sizeof(pack));
+            if (len > -1) {
+                PrintAndLogEx(SUCCESS, "Found a default password: %s || Pack: %02X %02X",sprint_hex(key, 4), pack[0], pack[1]);
+                goto out;
+            }
 
-			if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
+            if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
 
-			// test pwd gen C
-			num_to_bytes( ul_ev1_pwdgenC(card.uid), 4, key);
-			len = ulev1_requestAuthentication(key, pack, sizeof(pack));
-			if (len > -1) {
-				PrintAndLogEx(SUCCESS, "Found a default password: %s || Pack: %02X %02X",sprint_hex(key, 4), pack[0], pack[1]);
-				goto out;
-			}
+            // test pwd gen C
+            num_to_bytes( ul_ev1_pwdgenC(card.uid), 4, key);
+            len = ulev1_requestAuthentication(key, pack, sizeof(pack));
+            if (len > -1) {
+                PrintAndLogEx(SUCCESS, "Found a default password: %s || Pack: %02X %02X",sprint_hex(key, 4), pack[0], pack[1]);
+                goto out;
+            }
 
-			if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
+            if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
 
-			// test pwd gen D
-			num_to_bytes( ul_ev1_pwdgenD(card.uid), 4, key);
-			len = ulev1_requestAuthentication(key, pack, sizeof(pack));
-			if (len > -1) {
-				PrintAndLogEx(SUCCESS, "Found a default password: %s || Pack: %02X %02X",sprint_hex(key, 4), pack[0], pack[1]);
-				goto out;
-			}
+            // test pwd gen D
+            num_to_bytes( ul_ev1_pwdgenD(card.uid), 4, key);
+            len = ulev1_requestAuthentication(key, pack, sizeof(pack));
+            if (len > -1) {
+                PrintAndLogEx(SUCCESS, "Found a default password: %s || Pack: %02X %02X",sprint_hex(key, 4), pack[0], pack[1]);
+                goto out;
+            }
 
-			if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
+            if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
 
-			for (uint8_t i = 0; i < KEYS_PWD_COUNT; ++i ) {
-				key = default_pwd_pack[i];
-				len = ulev1_requestAuthentication(key, pack, sizeof(pack));
-				if (len > -1) {
-					PrintAndLogEx(SUCCESS, "Found a default password: %s || Pack: %02X %02X",sprint_hex(key, 4), pack[0], pack[1]);
-					break;
-				} else {
-					if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
-				}
-			}
-			if (len < 1) PrintAndLogEx(WARNING, "password not known");
-		}
-	}
+            for (uint8_t i = 0; i < KEYS_PWD_COUNT; ++i ) {
+                key = default_pwd_pack[i];
+                len = ulev1_requestAuthentication(key, pack, sizeof(pack));
+                if (len > -1) {
+                    PrintAndLogEx(SUCCESS, "Found a default password: %s || Pack: %02X %02X",sprint_hex(key, 4), pack[0], pack[1]);
+                    break;
+                } else {
+                    if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
+                }
+            }
+            if (len < 1) PrintAndLogEx(WARNING, "password not known");
+        }
+    }
 out:
-	DropField();
-	if (locked) PrintAndLogEx(FAILED, "\nTag appears to be locked, try using the key to get more info");
-	PrintAndLogEx(NORMAL, "");
-	return 1;
+    DropField();
+    if (locked) PrintAndLogEx(FAILED, "\nTag appears to be locked, try using the key to get more info");
+    PrintAndLogEx(NORMAL, "");
+    return 1;
 }
 
 //
@@ -1140,517 +1140,517 @@ out:
 //
 int CmdHF14AMfUWrBl(const char *Cmd){
 
-	int blockNo = -1;
-	bool errors = false;
-	bool hasAuthKey = false;
-	bool hasPwdKey = false;
-	bool swapEndian = false;
+    int blockNo = -1;
+    bool errors = false;
+    bool hasAuthKey = false;
+    bool hasPwdKey = false;
+    bool swapEndian = false;
 
-	uint8_t cmdp = 0;
-	uint8_t keylen = 0;
-	uint8_t blockdata[20] = {0x00};
-	uint8_t data[16] = {0x00};
-	uint8_t authenticationkey[16] = {0x00};
-	uint8_t *authKeyPtr = authenticationkey;
+    uint8_t cmdp = 0;
+    uint8_t keylen = 0;
+    uint8_t blockdata[20] = {0x00};
+    uint8_t data[16] = {0x00};
+    uint8_t authenticationkey[16] = {0x00};
+    uint8_t *authKeyPtr = authenticationkey;
 
-	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch (tolower(param_getchar(Cmd, cmdp))) {
-			case 'h':
-				return usage_hf_mfu_wrbl();
-			case 'k':
-				// EV1/NTAG size key
-				keylen = param_gethex(Cmd, cmdp+1, data, 8);
-				if ( !keylen ) {
-					memcpy(authenticationkey, data, 4);
-					cmdp += 2;
-					hasPwdKey = true;
-					break;
-				}
-				// UL-C size key
-				keylen = param_gethex(Cmd, cmdp+1, data, 32);
-				if (!keylen){
-					memcpy(authenticationkey, data, 16);
-					cmdp += 2;
-					hasAuthKey = true;
-					break;
-				}
-				PrintAndLogEx(WARNING, "ERROR: Key is incorrect length\n");
-				errors = true;
-				break;
-			case 'b':
-				blockNo = param_get8(Cmd, cmdp+1);
-				if (blockNo < 0) {
-					PrintAndLogEx(WARNING, "Wrong block number");
-					errors = true;
-				}
-				cmdp += 2;
-				break;
-			case 'l':
-				swapEndian = true;
-				cmdp++;
-				break;
-			case 'd':
-				if ( param_gethex(Cmd, cmdp+1, blockdata, 8) ) {
-					PrintAndLogEx(WARNING, "Block data must include 8 HEX symbols");
-					errors = true;
-					break;
-				}
-				cmdp += 2;
-				break;
-			default:
-				PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-				errors = true;
-				break;
-		}
-	}
-	//Validations
-	if (errors || cmdp == 0) return usage_hf_mfu_wrbl();
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+            case 'h':
+                return usage_hf_mfu_wrbl();
+            case 'k':
+                // EV1/NTAG size key
+                keylen = param_gethex(Cmd, cmdp+1, data, 8);
+                if ( !keylen ) {
+                    memcpy(authenticationkey, data, 4);
+                    cmdp += 2;
+                    hasPwdKey = true;
+                    break;
+                }
+                // UL-C size key
+                keylen = param_gethex(Cmd, cmdp+1, data, 32);
+                if (!keylen){
+                    memcpy(authenticationkey, data, 16);
+                    cmdp += 2;
+                    hasAuthKey = true;
+                    break;
+                }
+                PrintAndLogEx(WARNING, "ERROR: Key is incorrect length\n");
+                errors = true;
+                break;
+            case 'b':
+                blockNo = param_get8(Cmd, cmdp+1);
+                if (blockNo < 0) {
+                    PrintAndLogEx(WARNING, "Wrong block number");
+                    errors = true;
+                }
+                cmdp += 2;
+                break;
+            case 'l':
+                swapEndian = true;
+                cmdp++;
+                break;
+            case 'd':
+                if ( param_gethex(Cmd, cmdp+1, blockdata, 8) ) {
+                    PrintAndLogEx(WARNING, "Block data must include 8 HEX symbols");
+                    errors = true;
+                    break;
+                }
+                cmdp += 2;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                errors = true;
+                break;
+        }
+    }
+    //Validations
+    if (errors || cmdp == 0) return usage_hf_mfu_wrbl();
 
-	if ( blockNo == -1 ) return usage_hf_mfu_wrbl();
-	// starting with getting tagtype
-	TagTypeUL_t tagtype = GetHF14AMfU_Type();
-	if (tagtype == UL_ERROR) return -1;
+    if ( blockNo == -1 ) return usage_hf_mfu_wrbl();
+    // starting with getting tagtype
+    TagTypeUL_t tagtype = GetHF14AMfU_Type();
+    if (tagtype == UL_ERROR) return -1;
 
-	uint8_t maxblockno = 0;
-	for (uint8_t idx = 0; idx < MAX_UL_TYPES; idx++){
-		if (tagtype & UL_TYPES_ARRAY[idx]) {
-			maxblockno = UL_MEMORY_ARRAY[idx];
-			break;
-		}
-	}
-	if (blockNo > maxblockno){
-		PrintAndLogEx(WARNING, "block number too large. Max block is %u/0x%02X \n", maxblockno,maxblockno);
-		return usage_hf_mfu_wrbl();
-	}
+    uint8_t maxblockno = 0;
+    for (uint8_t idx = 0; idx < MAX_UL_TYPES; idx++){
+        if (tagtype & UL_TYPES_ARRAY[idx]) {
+            maxblockno = UL_MEMORY_ARRAY[idx];
+            break;
+        }
+    }
+    if (blockNo > maxblockno){
+        PrintAndLogEx(WARNING, "block number too large. Max block is %u/0x%02X \n", maxblockno,maxblockno);
+        return usage_hf_mfu_wrbl();
+    }
 
-	// Swap endianness
-	if (swapEndian && hasAuthKey) authKeyPtr = SwapEndian64(authenticationkey, 16, 8);
-	if (swapEndian && hasPwdKey)  authKeyPtr = SwapEndian64(authenticationkey, 4, 4);
+    // Swap endianness
+    if (swapEndian && hasAuthKey) authKeyPtr = SwapEndian64(authenticationkey, 16, 8);
+    if (swapEndian && hasPwdKey)  authKeyPtr = SwapEndian64(authenticationkey, 4, 4);
 
-	if ( blockNo <= 3)
-		PrintAndLogEx(NORMAL, "Special Block: %0d (0x%02X) [ %s]", blockNo, blockNo, sprint_hex(blockdata, 4));
-	else
-		PrintAndLogEx(NORMAL, "Block: %0d (0x%02X) [ %s]", blockNo, blockNo, sprint_hex(blockdata, 4));
+    if ( blockNo <= 3)
+        PrintAndLogEx(NORMAL, "Special Block: %0d (0x%02X) [ %s]", blockNo, blockNo, sprint_hex(blockdata, 4));
+    else
+        PrintAndLogEx(NORMAL, "Block: %0d (0x%02X) [ %s]", blockNo, blockNo, sprint_hex(blockdata, 4));
 
-	//Send write Block
-	UsbCommand c = {CMD_MIFAREU_WRITEBL, {blockNo}};
-	memcpy(c.d.asBytes, blockdata, 4);
+    //Send write Block
+    UsbCommand c = {CMD_MIFAREU_WRITEBL, {blockNo}};
+    memcpy(c.d.asBytes, blockdata, 4);
 
-	if ( hasAuthKey ){
-		c.arg[1] = 1;
-		memcpy(c.d.asBytes+4, authKeyPtr, 16);
-	}
-	else if ( hasPwdKey ) {
-		c.arg[1] = 2;
-		memcpy(c.d.asBytes+4, authKeyPtr, 4);
-	}
+    if ( hasAuthKey ){
+        c.arg[1] = 1;
+        memcpy(c.d.asBytes+4, authKeyPtr, 16);
+    }
+    else if ( hasPwdKey ) {
+        c.arg[1] = 2;
+        memcpy(c.d.asBytes+4, authKeyPtr, 4);
+    }
 
-	clearCommandBuffer();
-	SendCommand(&c);
-	UsbCommand resp;
-	if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-		uint8_t isOK  = resp.arg[0] & 0xff;
-		PrintAndLogEx(SUCCESS, "isOk:%02x", isOK);
-	} else {
-		PrintAndLogEx(WARNING, "Command execute timeout");
-	}
+    clearCommandBuffer();
+    SendCommand(&c);
+    UsbCommand resp;
+    if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
+        uint8_t isOK  = resp.arg[0] & 0xff;
+        PrintAndLogEx(SUCCESS, "isOk:%02x", isOK);
+    } else {
+        PrintAndLogEx(WARNING, "Command execute timeout");
+    }
 
-	return 0;
+    return 0;
 }
 //
 //  Read Single Block
 //
 int CmdHF14AMfURdBl(const char *Cmd){
 
-	int blockNo = -1;
-	bool errors = false;
-	bool hasAuthKey = false;
-	bool hasPwdKey = false;
-	bool swapEndian = false;
-	uint8_t cmdp = 0;
-	uint8_t keylen = 0;
-	uint8_t data[16] = {0x00};
-	uint8_t authenticationkey[16] = {0x00};
-	uint8_t *authKeyPtr = authenticationkey;
+    int blockNo = -1;
+    bool errors = false;
+    bool hasAuthKey = false;
+    bool hasPwdKey = false;
+    bool swapEndian = false;
+    uint8_t cmdp = 0;
+    uint8_t keylen = 0;
+    uint8_t data[16] = {0x00};
+    uint8_t authenticationkey[16] = {0x00};
+    uint8_t *authKeyPtr = authenticationkey;
 
-	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch (tolower(param_getchar(Cmd, cmdp))) {
-			case 'h':
-				return usage_hf_mfu_rdbl();
-			case 'k':
-				// EV1/NTAG size key
-				keylen = param_gethex(Cmd, cmdp+1, data, 8);
-				if ( !keylen ) {
-					memcpy(authenticationkey, data, 4);
-					cmdp += 2;
-					hasPwdKey = true;
-					break;
-				}
-				// UL-C size key
-				keylen = param_gethex(Cmd, cmdp+1, data, 32);
-				if (!keylen){
-					memcpy(authenticationkey, data, 16);
-					cmdp += 2;
-					hasAuthKey = true;
-					break;
-				}
-				PrintAndLogEx(WARNING, "ERROR: Key is incorrect length\n");
-				errors = true;
-				break;
-			case 'b':
-				blockNo = param_get8(Cmd, cmdp+1);
-				if (blockNo < 0) {
-					PrintAndLogEx(WARNING, "Wrong block number");
-					errors = true;
-				}
-				cmdp += 2;
-				break;
-			case 'l':
-				swapEndian = true;
-				cmdp++;
-				break;
-			default:
-				PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-				errors = true;
-				break;
-		}
-	}
-	//Validations
-	if (errors || cmdp == 0) return usage_hf_mfu_rdbl();
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+            case 'h':
+                return usage_hf_mfu_rdbl();
+            case 'k':
+                // EV1/NTAG size key
+                keylen = param_gethex(Cmd, cmdp+1, data, 8);
+                if ( !keylen ) {
+                    memcpy(authenticationkey, data, 4);
+                    cmdp += 2;
+                    hasPwdKey = true;
+                    break;
+                }
+                // UL-C size key
+                keylen = param_gethex(Cmd, cmdp+1, data, 32);
+                if (!keylen){
+                    memcpy(authenticationkey, data, 16);
+                    cmdp += 2;
+                    hasAuthKey = true;
+                    break;
+                }
+                PrintAndLogEx(WARNING, "ERROR: Key is incorrect length\n");
+                errors = true;
+                break;
+            case 'b':
+                blockNo = param_get8(Cmd, cmdp+1);
+                if (blockNo < 0) {
+                    PrintAndLogEx(WARNING, "Wrong block number");
+                    errors = true;
+                }
+                cmdp += 2;
+                break;
+            case 'l':
+                swapEndian = true;
+                cmdp++;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                errors = true;
+                break;
+        }
+    }
+    //Validations
+    if (errors || cmdp == 0) return usage_hf_mfu_rdbl();
 
-	if ( blockNo == -1 ) return usage_hf_mfu_rdbl();
-	// start with getting tagtype
-	TagTypeUL_t tagtype = GetHF14AMfU_Type();
-	if (tagtype == UL_ERROR) return -1;
+    if ( blockNo == -1 ) return usage_hf_mfu_rdbl();
+    // start with getting tagtype
+    TagTypeUL_t tagtype = GetHF14AMfU_Type();
+    if (tagtype == UL_ERROR) return -1;
 
-	uint8_t maxblockno = 0;
-	for (uint8_t idx = 0; idx < MAX_UL_TYPES; idx++){
-		if (tagtype & UL_TYPES_ARRAY[idx]) {
-			maxblockno = UL_MEMORY_ARRAY[idx];
-			break;
-		}
-	}
-	if (blockNo > maxblockno){
-		PrintAndLogEx(WARNING, "block number to large. Max block is %u/0x%02X \n", maxblockno,maxblockno);
-		return usage_hf_mfu_rdbl();
-	}
+    uint8_t maxblockno = 0;
+    for (uint8_t idx = 0; idx < MAX_UL_TYPES; idx++){
+        if (tagtype & UL_TYPES_ARRAY[idx]) {
+            maxblockno = UL_MEMORY_ARRAY[idx];
+            break;
+        }
+    }
+    if (blockNo > maxblockno){
+        PrintAndLogEx(WARNING, "block number to large. Max block is %u/0x%02X \n", maxblockno,maxblockno);
+        return usage_hf_mfu_rdbl();
+    }
 
-	// Swap endianness
-	if (swapEndian && hasAuthKey) authKeyPtr = SwapEndian64(authenticationkey, 16, 8);
-	if (swapEndian && hasPwdKey)  authKeyPtr = SwapEndian64(authenticationkey, 4, 4);
+    // Swap endianness
+    if (swapEndian && hasAuthKey) authKeyPtr = SwapEndian64(authenticationkey, 16, 8);
+    if (swapEndian && hasPwdKey)  authKeyPtr = SwapEndian64(authenticationkey, 4, 4);
 
-	//Read Block
-	UsbCommand c = {CMD_MIFAREU_READBL, {blockNo}};
-	if ( hasAuthKey ){
-		c.arg[1] = 1;
-		memcpy(c.d.asBytes,authKeyPtr,16);
-	}
-	else if ( hasPwdKey ) {
-		c.arg[1] = 2;
-		memcpy(c.d.asBytes,authKeyPtr,4);
-	}
+    //Read Block
+    UsbCommand c = {CMD_MIFAREU_READBL, {blockNo}};
+    if ( hasAuthKey ){
+        c.arg[1] = 1;
+        memcpy(c.d.asBytes,authKeyPtr,16);
+    }
+    else if ( hasPwdKey ) {
+        c.arg[1] = 2;
+        memcpy(c.d.asBytes,authKeyPtr,4);
+    }
 
-	clearCommandBuffer();
-	SendCommand(&c);
-	UsbCommand resp;
-	if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
-		uint8_t isOK = resp.arg[0] & 0xff;
-		if (isOK) {
-			uint8_t *data = resp.d.asBytes;
-			PrintAndLogEx(NORMAL, "\nBlock#  | Data        | Ascii");
-			PrintAndLogEx(NORMAL, "-----------------------------");
-			PrintAndLogEx(NORMAL, "%02d/0x%02X | %s| %s\n", blockNo, blockNo, sprint_hex(data, 4), sprint_ascii(data,4));
-		}
-		else {
-			PrintAndLogEx(WARNING, "Failed reading block: (%02x)", isOK);
-		}
-	} else {
-		PrintAndLogEx(WARNING, "Command execute time-out");
-	}
-	return 0;
+    clearCommandBuffer();
+    SendCommand(&c);
+    UsbCommand resp;
+    if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
+        uint8_t isOK = resp.arg[0] & 0xff;
+        if (isOK) {
+            uint8_t *data = resp.d.asBytes;
+            PrintAndLogEx(NORMAL, "\nBlock#  | Data        | Ascii");
+            PrintAndLogEx(NORMAL, "-----------------------------");
+            PrintAndLogEx(NORMAL, "%02d/0x%02X | %s| %s\n", blockNo, blockNo, sprint_hex(data, 4), sprint_ascii(data,4));
+        }
+        else {
+            PrintAndLogEx(WARNING, "Failed reading block: (%02x)", isOK);
+        }
+    } else {
+        PrintAndLogEx(WARNING, "Command execute time-out");
+    }
+    return 0;
 }
 
 int usage_hf_mfu_info(void) {
-	PrintAndLogEx(NORMAL, "It gathers information about the tag and tries to detect what kind it is.");
-	PrintAndLogEx(NORMAL, "Sometimes the tags are locked down, and you may need a key to be able to read the information");
-	PrintAndLogEx(NORMAL, "The following tags can be identified:\n");
-	PrintAndLogEx(NORMAL, "Ultralight, Ultralight-C, Ultralight EV1, NTAG 203, NTAG 210,");
-	PrintAndLogEx(NORMAL, "NTAG 212, NTAG 213, NTAG 215, NTAG 216, NTAG I2C 1K & 2K");
-	PrintAndLogEx(NORMAL, "my-d, my-d NFC, my-d move, my-d move NFC\n");
-	PrintAndLogEx(NORMAL, "Usage:  hf mfu info k <key> l");
-	PrintAndLogEx(NORMAL, "  Options : ");
-	PrintAndLogEx(NORMAL, "  k <key> : (optional) key for authentication [UL-C 16bytes, EV1/NTAG 4bytes]");
-	PrintAndLogEx(NORMAL, "  l       : (optional) swap entered key's endianness");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "       hf mfu info");
-	PrintAndLogEx(NORMAL, "       hf mfu info k 00112233445566778899AABBCCDDEEFF");
-	PrintAndLogEx(NORMAL, "       hf mfu info k AABBCCDD");
-	return 0;
+    PrintAndLogEx(NORMAL, "It gathers information about the tag and tries to detect what kind it is.");
+    PrintAndLogEx(NORMAL, "Sometimes the tags are locked down, and you may need a key to be able to read the information");
+    PrintAndLogEx(NORMAL, "The following tags can be identified:\n");
+    PrintAndLogEx(NORMAL, "Ultralight, Ultralight-C, Ultralight EV1, NTAG 203, NTAG 210,");
+    PrintAndLogEx(NORMAL, "NTAG 212, NTAG 213, NTAG 215, NTAG 216, NTAG I2C 1K & 2K");
+    PrintAndLogEx(NORMAL, "my-d, my-d NFC, my-d move, my-d move NFC\n");
+    PrintAndLogEx(NORMAL, "Usage:  hf mfu info k <key> l");
+    PrintAndLogEx(NORMAL, "  Options : ");
+    PrintAndLogEx(NORMAL, "  k <key> : (optional) key for authentication [UL-C 16bytes, EV1/NTAG 4bytes]");
+    PrintAndLogEx(NORMAL, "  l       : (optional) swap entered key's endianness");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "       hf mfu info");
+    PrintAndLogEx(NORMAL, "       hf mfu info k 00112233445566778899AABBCCDDEEFF");
+    PrintAndLogEx(NORMAL, "       hf mfu info k AABBCCDD");
+    return 0;
 }
 
 int usage_hf_mfu_dump(void) {
-	PrintAndLogEx(NORMAL, "Reads all pages from Ultralight, Ultralight-C, Ultralight EV1");
-	PrintAndLogEx(NORMAL, "NTAG 203, NTAG 210, NTAG 212, NTAG 213, NTAG 215, NTAG 216");
-	PrintAndLogEx(NORMAL, "and saves binary dump into the file `filename.bin` or `cardUID.bin`");
-	PrintAndLogEx(NORMAL, "It autodetects card type.\n");
-	PrintAndLogEx(NORMAL, "Usage:  hf mfu dump k <key> l f <filename w/o .bin> p <page#> q <#pages>");
-	PrintAndLogEx(NORMAL, "  Options :");
-	PrintAndLogEx(NORMAL, "  k <key> : (optional) key for authentication [UL-C 16bytes, EV1/NTAG 4bytes]");
-	PrintAndLogEx(NORMAL, "  l       : (optional) swap entered key's endianness");
-	PrintAndLogEx(NORMAL, "  f <FN > : filename w/o .bin to save the dump as");
-	PrintAndLogEx(NORMAL, "  p <Pg > : starting Page number to manually set a page to start the dump at");
-	PrintAndLogEx(NORMAL, "  q <qty> : number of Pages to manually set how many pages to dump");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "       hf mfu dump");
-	PrintAndLogEx(NORMAL, "       hf mfu dump n myfile");
-	PrintAndLogEx(NORMAL, "       hf mfu dump k 00112233445566778899AABBCCDDEEFF");
-	PrintAndLogEx(NORMAL, "       hf mfu dump k AABBCCDD\n");
-	return 0;
+    PrintAndLogEx(NORMAL, "Reads all pages from Ultralight, Ultralight-C, Ultralight EV1");
+    PrintAndLogEx(NORMAL, "NTAG 203, NTAG 210, NTAG 212, NTAG 213, NTAG 215, NTAG 216");
+    PrintAndLogEx(NORMAL, "and saves binary dump into the file `filename.bin` or `cardUID.bin`");
+    PrintAndLogEx(NORMAL, "It autodetects card type.\n");
+    PrintAndLogEx(NORMAL, "Usage:  hf mfu dump k <key> l f <filename w/o .bin> p <page#> q <#pages>");
+    PrintAndLogEx(NORMAL, "  Options :");
+    PrintAndLogEx(NORMAL, "  k <key> : (optional) key for authentication [UL-C 16bytes, EV1/NTAG 4bytes]");
+    PrintAndLogEx(NORMAL, "  l       : (optional) swap entered key's endianness");
+    PrintAndLogEx(NORMAL, "  f <FN > : filename w/o .bin to save the dump as");
+    PrintAndLogEx(NORMAL, "  p <Pg > : starting Page number to manually set a page to start the dump at");
+    PrintAndLogEx(NORMAL, "  q <qty> : number of Pages to manually set how many pages to dump");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "       hf mfu dump");
+    PrintAndLogEx(NORMAL, "       hf mfu dump n myfile");
+    PrintAndLogEx(NORMAL, "       hf mfu dump k 00112233445566778899AABBCCDDEEFF");
+    PrintAndLogEx(NORMAL, "       hf mfu dump k AABBCCDD\n");
+    return 0;
 }
 
 int usage_hf_mfu_restore(void){
-	PrintAndLogEx(NORMAL, "Restore dumpfile onto card.");
-	PrintAndLogEx(NORMAL, "Usage:  hf mfu restore [h] [l] [s] k <key> n <filename w/o .bin> ");
-	PrintAndLogEx(NORMAL, "  Options :");
-	PrintAndLogEx(NORMAL, "  k <key> : (optional) key for authentication [UL-C 16bytes, EV1/NTAG 4bytes]");
-	PrintAndLogEx(NORMAL, "  l       : (optional) swap entered key's endianness");
-	PrintAndLogEx(NORMAL, "  s       : (optional) enable special write UID -MAGIC TAG ONLY-");
-	PrintAndLogEx(NORMAL, "  e       : (optional) enable special write version/signature -MAGIC NTAG 21* ONLY-");
-	PrintAndLogEx(NORMAL, "  r       : (optional) use the password found in dumpfile to configure tag. requires 'e' parameter to work");
-	PrintAndLogEx(NORMAL, "  f <FN>  : filename w/o .bin to restore");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "       hf mfu restore s f myfile");
-	PrintAndLogEx(NORMAL, "       hf mfu restore k AABBCCDD s f myfile\n");
-	PrintAndLogEx(NORMAL, "       hf mfu restore k AABBCCDD s e r f myfile\n");
-	return 0;
+    PrintAndLogEx(NORMAL, "Restore dumpfile onto card.");
+    PrintAndLogEx(NORMAL, "Usage:  hf mfu restore [h] [l] [s] k <key> n <filename w/o .bin> ");
+    PrintAndLogEx(NORMAL, "  Options :");
+    PrintAndLogEx(NORMAL, "  k <key> : (optional) key for authentication [UL-C 16bytes, EV1/NTAG 4bytes]");
+    PrintAndLogEx(NORMAL, "  l       : (optional) swap entered key's endianness");
+    PrintAndLogEx(NORMAL, "  s       : (optional) enable special write UID -MAGIC TAG ONLY-");
+    PrintAndLogEx(NORMAL, "  e       : (optional) enable special write version/signature -MAGIC NTAG 21* ONLY-");
+    PrintAndLogEx(NORMAL, "  r       : (optional) use the password found in dumpfile to configure tag. requires 'e' parameter to work");
+    PrintAndLogEx(NORMAL, "  f <FN>  : filename w/o .bin to restore");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "       hf mfu restore s f myfile");
+    PrintAndLogEx(NORMAL, "       hf mfu restore k AABBCCDD s f myfile\n");
+    PrintAndLogEx(NORMAL, "       hf mfu restore k AABBCCDD s e r f myfile\n");
+    return 0;
 }
 
 int usage_hf_mfu_rdbl(void) {
-	PrintAndLogEx(NORMAL, "Read a block and print. It autodetects card type.\n");
-	PrintAndLogEx(NORMAL, "Usage:  hf mfu rdbl b <block number> k <key> l\n");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "  b <no>  : block to read");
-	PrintAndLogEx(NORMAL, "  k <key> : (optional) key for authentication [UL-C 16bytes, EV1/NTAG 4bytes]");
-	PrintAndLogEx(NORMAL, "  l       : (optional) swap entered key's endianness");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "       hf mfu rdbl b 0");
-	PrintAndLogEx(NORMAL, "       hf mfu rdbl b 0 k 00112233445566778899AABBCCDDEEFF");
-	PrintAndLogEx(NORMAL, "       hf mfu rdbl b 0 k AABBCCDD\n");
-	return 0;
+    PrintAndLogEx(NORMAL, "Read a block and print. It autodetects card type.\n");
+    PrintAndLogEx(NORMAL, "Usage:  hf mfu rdbl b <block number> k <key> l\n");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "  b <no>  : block to read");
+    PrintAndLogEx(NORMAL, "  k <key> : (optional) key for authentication [UL-C 16bytes, EV1/NTAG 4bytes]");
+    PrintAndLogEx(NORMAL, "  l       : (optional) swap entered key's endianness");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "       hf mfu rdbl b 0");
+    PrintAndLogEx(NORMAL, "       hf mfu rdbl b 0 k 00112233445566778899AABBCCDDEEFF");
+    PrintAndLogEx(NORMAL, "       hf mfu rdbl b 0 k AABBCCDD\n");
+    return 0;
 }
 
 int usage_hf_mfu_wrbl(void) {
-	PrintAndLogEx(NORMAL, "Write a block. It autodetects card type.\n");
-	PrintAndLogEx(NORMAL, "Usage:  hf mfu wrbl b <block number> d <data> k <key> l\n");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "  b <no>   : block to write");
-	PrintAndLogEx(NORMAL, "  d <data> : block data - (8 hex symbols)");
-	PrintAndLogEx(NORMAL, "  k <key>  : (optional) key for authentication [UL-C 16bytes, EV1/NTAG 4bytes]");
-	PrintAndLogEx(NORMAL, "  l        : (optional) swap entered key's endianness");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        hf mfu wrbl b 0 d 01234567");
-	PrintAndLogEx(NORMAL, "        hf mfu wrbl b 0 d 01234567 k AABBCCDD\n");
-	return 0;
+    PrintAndLogEx(NORMAL, "Write a block. It autodetects card type.\n");
+    PrintAndLogEx(NORMAL, "Usage:  hf mfu wrbl b <block number> d <data> k <key> l\n");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "  b <no>   : block to write");
+    PrintAndLogEx(NORMAL, "  d <data> : block data - (8 hex symbols)");
+    PrintAndLogEx(NORMAL, "  k <key>  : (optional) key for authentication [UL-C 16bytes, EV1/NTAG 4bytes]");
+    PrintAndLogEx(NORMAL, "  l        : (optional) swap entered key's endianness");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "        hf mfu wrbl b 0 d 01234567");
+    PrintAndLogEx(NORMAL, "        hf mfu wrbl b 0 d 01234567 k AABBCCDD\n");
+    return 0;
 }
 
 int usage_hf_mfu_eload(void) {
-	PrintAndLogEx(NORMAL, "It loads emul dump from the file `filename.eml`");
-	PrintAndLogEx(NORMAL, "Hint: See script dumptoemul-mfu.lua to convert the .bin to the eml");
-	PrintAndLogEx(NORMAL, "Usage:  hf mfu eload u <file name w/o `.eml`> [numblocks]");
-	PrintAndLogEx(NORMAL, "  Options:");
-	PrintAndLogEx(NORMAL, "    h          : this help");
-	PrintAndLogEx(NORMAL, "    u          : UL (required)");
-	PrintAndLogEx(NORMAL, "    [filename] : without `.eml` (required)");
-	PrintAndLogEx(NORMAL, "    numblocks  : number of blocks to load from eml file (optional)");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "  sample: hf mfu eload u filename");
-	PrintAndLogEx(NORMAL, "          hf mfu eload u filename 57");
-			return 0;
+    PrintAndLogEx(NORMAL, "It loads emul dump from the file `filename.eml`");
+    PrintAndLogEx(NORMAL, "Hint: See script dumptoemul-mfu.lua to convert the .bin to the eml");
+    PrintAndLogEx(NORMAL, "Usage:  hf mfu eload u <file name w/o `.eml`> [numblocks]");
+    PrintAndLogEx(NORMAL, "  Options:");
+    PrintAndLogEx(NORMAL, "    h          : this help");
+    PrintAndLogEx(NORMAL, "    u          : UL (required)");
+    PrintAndLogEx(NORMAL, "    [filename] : without `.eml` (required)");
+    PrintAndLogEx(NORMAL, "    numblocks  : number of blocks to load from eml file (optional)");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "  sample: hf mfu eload u filename");
+    PrintAndLogEx(NORMAL, "          hf mfu eload u filename 57");
+            return 0;
 }
 
 int usage_hf_mfu_sim(void) {
-	PrintAndLogEx(NORMAL, "\nEmulating Ultralight tag from emulator memory\n");
-	PrintAndLogEx(NORMAL, "\nBe sure to load the emulator memory first!\n");
-	PrintAndLogEx(NORMAL, "Usage: hf mfu sim t 7 u <uid>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "    h       : this help");
-	PrintAndLogEx(NORMAL, "    t 7     : 7 = NTAG or Ultralight sim (required)");
-	PrintAndLogEx(NORMAL, "    u <uid> : 4 or 7 byte UID (optional)");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        hf mfu sim t 7");
-	PrintAndLogEx(NORMAL, "        hf mfu sim t 7 u 1122344556677\n");
+    PrintAndLogEx(NORMAL, "\nEmulating Ultralight tag from emulator memory\n");
+    PrintAndLogEx(NORMAL, "\nBe sure to load the emulator memory first!\n");
+    PrintAndLogEx(NORMAL, "Usage: hf mfu sim t 7 u <uid>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "    h       : this help");
+    PrintAndLogEx(NORMAL, "    t 7     : 7 = NTAG or Ultralight sim (required)");
+    PrintAndLogEx(NORMAL, "    u <uid> : 4 or 7 byte UID (optional)");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "        hf mfu sim t 7");
+    PrintAndLogEx(NORMAL, "        hf mfu sim t 7 u 1122344556677\n");
 
-	return 0;
+    return 0;
 }
 
 int usage_hf_mfu_ucauth(void) {
-	PrintAndLogEx(NORMAL, "Usage:  hf mfu cauth k <key number>");
-	PrintAndLogEx(NORMAL, "      0 (default): 3DES standard key");
-	PrintAndLogEx(NORMAL, "      1 : all 0x00 key");
-	PrintAndLogEx(NORMAL, "      2 : 0x00-0x0F key");
-	PrintAndLogEx(NORMAL, "      3 : nfc key");
-	PrintAndLogEx(NORMAL, "      4 : all 0x01 key");
-	PrintAndLogEx(NORMAL, "      5 : all 0xff key");
-	PrintAndLogEx(NORMAL, "      6 : 0x00-0xFF key");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "       hf mfu cauth k");
-	PrintAndLogEx(NORMAL, "       hf mfu cauth k 3");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage:  hf mfu cauth k <key number>");
+    PrintAndLogEx(NORMAL, "      0 (default): 3DES standard key");
+    PrintAndLogEx(NORMAL, "      1 : all 0x00 key");
+    PrintAndLogEx(NORMAL, "      2 : 0x00-0x0F key");
+    PrintAndLogEx(NORMAL, "      3 : nfc key");
+    PrintAndLogEx(NORMAL, "      4 : all 0x01 key");
+    PrintAndLogEx(NORMAL, "      5 : all 0xff key");
+    PrintAndLogEx(NORMAL, "      6 : 0x00-0xFF key");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "       hf mfu cauth k");
+    PrintAndLogEx(NORMAL, "       hf mfu cauth k 3");
+    return 0;
 }
 
 int usage_hf_mfu_ucsetpwd(void) {
-	PrintAndLogEx(NORMAL, "Usage:  hf mfu setpwd <password (32 hex symbols)>");
-	PrintAndLogEx(NORMAL, "       [password] - (32 hex symbols)");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "         hf mfu setpwd 000102030405060708090a0b0c0d0e0f");
-	PrintAndLogEx(NORMAL, "");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage:  hf mfu setpwd <password (32 hex symbols)>");
+    PrintAndLogEx(NORMAL, "       [password] - (32 hex symbols)");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "         hf mfu setpwd 000102030405060708090a0b0c0d0e0f");
+    PrintAndLogEx(NORMAL, "");
+    return 0;
 }
 
 int usage_hf_mfu_ucsetuid(void) {
-	PrintAndLogEx(NORMAL, "Usage:  hf mfu setuid <uid (14 hex symbols)>");
-	PrintAndLogEx(NORMAL, "       [uid] - (14 hex symbols)");
-	PrintAndLogEx(NORMAL, "\nThis only works for Magic Ultralight tags.");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "         hf mfu setuid 11223344556677");
-	PrintAndLogEx(NORMAL, "");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage:  hf mfu setuid <uid (14 hex symbols)>");
+    PrintAndLogEx(NORMAL, "       [uid] - (14 hex symbols)");
+    PrintAndLogEx(NORMAL, "\nThis only works for Magic Ultralight tags.");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "         hf mfu setuid 11223344556677");
+    PrintAndLogEx(NORMAL, "");
+    return 0;
 }
 
 int usage_hf_mfu_gendiverse(void){
-	PrintAndLogEx(NORMAL, "Usage:  hf mfu gen [h] [r] <uid (8 hex symbols)>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "    h       : this help");
-	PrintAndLogEx(NORMAL, "    r       : read uid from tag");
-	PrintAndLogEx(NORMAL, "    <uid>   : 4 byte UID (optional)");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        hf mfu gen r");
-	PrintAndLogEx(NORMAL, "        hf mfu gen 11223344");
-	PrintAndLogEx(NORMAL, "");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage:  hf mfu gen [h] [r] <uid (8 hex symbols)>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "    h       : this help");
+    PrintAndLogEx(NORMAL, "    r       : read uid from tag");
+    PrintAndLogEx(NORMAL, "    <uid>   : 4 byte UID (optional)");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "        hf mfu gen r");
+    PrintAndLogEx(NORMAL, "        hf mfu gen 11223344");
+    PrintAndLogEx(NORMAL, "");
+    return 0;
 }
 
 int usage_hf_mfu_pwdgen(void){
-	PrintAndLogEx(NORMAL, "Usage:  hf mfu pwdgen [h|t] [r] <uid (14 hex symbols)>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "    h       : this help");
-	PrintAndLogEx(NORMAL, "    t       : selftest");
-	PrintAndLogEx(NORMAL, "    r       : read uid from tag");
-	PrintAndLogEx(NORMAL, "    <uid>   : 7 byte UID (optional)");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        hf mfu pwdgen r");
-	PrintAndLogEx(NORMAL, "        hf mfu pwdgen 11223344556677");
-	PrintAndLogEx(NORMAL, "        hf mfu pwdgen t");
-	PrintAndLogEx(NORMAL, "");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage:  hf mfu pwdgen [h|t] [r] <uid (14 hex symbols)>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "    h       : this help");
+    PrintAndLogEx(NORMAL, "    t       : selftest");
+    PrintAndLogEx(NORMAL, "    r       : read uid from tag");
+    PrintAndLogEx(NORMAL, "    <uid>   : 7 byte UID (optional)");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "        hf mfu pwdgen r");
+    PrintAndLogEx(NORMAL, "        hf mfu pwdgen 11223344556677");
+    PrintAndLogEx(NORMAL, "        hf mfu pwdgen t");
+    PrintAndLogEx(NORMAL, "");
+    return 0;
 }
 
 void printMFUdump(mfu_dump_t* card) {
-	printMFUdumpEx(card, 255, 0);
+    printMFUdumpEx(card, 255, 0);
 }
 
 void printMFUdumpEx(mfu_dump_t* card, uint16_t pages, uint8_t startpage) {
-	PrintAndLogEx(NORMAL, "\n*special* data\n");
-	PrintAndLogEx(NORMAL, "\nDataType  | Data                    | Ascii");
-	PrintAndLogEx(NORMAL, "----------+-------------------------+---------");
-	PrintAndLogEx(NORMAL, "Version   | %s| %s", sprint_hex(card->version, sizeof(card->version)), sprint_ascii(card->version, sizeof(card->version)) );
-	PrintAndLogEx(NORMAL, "TBD       | %-24s| %s", sprint_hex(card->tbo, sizeof(card->tbo)), sprint_ascii(card->tbo, sizeof(card->tbo)));
-	PrintAndLogEx(NORMAL, "Tearing   | %-24s| %s", sprint_hex(card->tearing, sizeof(card->tearing)), sprint_ascii(card->tearing, sizeof(card->tearing)));
-	PrintAndLogEx(NORMAL, "Pack      | %-24s| %s", sprint_hex(card->pack, sizeof(card->pack)), sprint_ascii(card->pack, sizeof(card->pack)));
-	PrintAndLogEx(NORMAL, "TBD       | %-24s| %s", sprint_hex(card->tbo1, sizeof(card->tbo1)), sprint_ascii(card->tbo1, sizeof(card->tbo1)));
-	PrintAndLogEx(NORMAL, "Signature1| %s| %s", sprint_hex(card->signature, 16), sprint_ascii(card->signature, 16));
-	PrintAndLogEx(NORMAL, "Signature2| %s| %s", sprint_hex(card->signature+16, 16), sprint_ascii(card->signature+16, 16));
-	PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
-	PrintAndLogEx(NORMAL, "\nBlock#   | Data        |lck| Ascii");
-	PrintAndLogEx(NORMAL, "---------+-------------+---+------");
+    PrintAndLogEx(NORMAL, "\n*special* data\n");
+    PrintAndLogEx(NORMAL, "\nDataType  | Data                    | Ascii");
+    PrintAndLogEx(NORMAL, "----------+-------------------------+---------");
+    PrintAndLogEx(NORMAL, "Version   | %s| %s", sprint_hex(card->version, sizeof(card->version)), sprint_ascii(card->version, sizeof(card->version)) );
+    PrintAndLogEx(NORMAL, "TBD       | %-24s| %s", sprint_hex(card->tbo, sizeof(card->tbo)), sprint_ascii(card->tbo, sizeof(card->tbo)));
+    PrintAndLogEx(NORMAL, "Tearing   | %-24s| %s", sprint_hex(card->tearing, sizeof(card->tearing)), sprint_ascii(card->tearing, sizeof(card->tearing)));
+    PrintAndLogEx(NORMAL, "Pack      | %-24s| %s", sprint_hex(card->pack, sizeof(card->pack)), sprint_ascii(card->pack, sizeof(card->pack)));
+    PrintAndLogEx(NORMAL, "TBD       | %-24s| %s", sprint_hex(card->tbo1, sizeof(card->tbo1)), sprint_ascii(card->tbo1, sizeof(card->tbo1)));
+    PrintAndLogEx(NORMAL, "Signature1| %s| %s", sprint_hex(card->signature, 16), sprint_ascii(card->signature, 16));
+    PrintAndLogEx(NORMAL, "Signature2| %s| %s", sprint_hex(card->signature+16, 16), sprint_ascii(card->signature+16, 16));
+    PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
+    PrintAndLogEx(NORMAL, "\nBlock#   | Data        |lck| Ascii");
+    PrintAndLogEx(NORMAL, "---------+-------------+---+------");
 
-	uint8_t j = 0;
-	bool lckbit = false;
-	uint8_t *data = card->data;
+    uint8_t j = 0;
+    bool lckbit = false;
+    uint8_t *data = card->data;
 
-	uint8_t lockbytes_sta[] = {0,0};
-	uint8_t lockbytes_dyn[] = {0,0,0};
-	bool bit_stat[16]  = {0};
-	bool bit_dyn[16] = {0};
+    uint8_t lockbytes_sta[] = {0,0};
+    uint8_t lockbytes_dyn[] = {0,0,0};
+    bool bit_stat[16]  = {0};
+    bool bit_dyn[16] = {0};
 
-	// Load static lock bytes.
-	memcpy(lockbytes_sta, data+10, sizeof(lockbytes_sta));
-	for(j = 0; j < 16; j++){
-		bit_stat[j] = lockbytes_sta[j/8] & ( 1 <<(7-j%8));
-	}
+    // Load static lock bytes.
+    memcpy(lockbytes_sta, data+10, sizeof(lockbytes_sta));
+    for(j = 0; j < 16; j++){
+        bit_stat[j] = lockbytes_sta[j/8] & ( 1 <<(7-j%8));
+    }
 
-	// Load dynamic lockbytes if available
-	// TODO -- FIGURE OUT LOCK BYTES FOR TO EV1 and/or NTAG
-	if ( pages == 44 ) {
+    // Load dynamic lockbytes if available
+    // TODO -- FIGURE OUT LOCK BYTES FOR TO EV1 and/or NTAG
+    if ( pages == 44 ) {
 
-		memcpy(lockbytes_dyn, data+(40*4), sizeof(lockbytes_dyn));
+        memcpy(lockbytes_dyn, data+(40*4), sizeof(lockbytes_dyn));
 
-		for (j = 0; j < 16; j++) {
-			bit_dyn[j] = lockbytes_dyn[j/8] & ( 1 <<(7-j%8));
-		}
-		PrintAndLogEx(NORMAL, "DYNAMIC LOCK: %s\n", sprint_hex(lockbytes_dyn,3));
-	}
+        for (j = 0; j < 16; j++) {
+            bit_dyn[j] = lockbytes_dyn[j/8] & ( 1 <<(7-j%8));
+        }
+        PrintAndLogEx(NORMAL, "DYNAMIC LOCK: %s\n", sprint_hex(lockbytes_dyn,3));
+    }
 
-	for (uint8_t i = 0; i < pages; ++i) {
-		if ( i < 3 ) {
-			PrintAndLogEx(NORMAL, "%3d/0x%02X | %s|   | %s", i+startpage, i+startpage, sprint_hex(data + i * 4, 4), sprint_ascii(data + i * 4,4) );
-			continue;
-		}
-		switch(i){
-			case  3: lckbit = bit_stat[4]; break;
-			case  4: lckbit = bit_stat[3]; break;
-			case  5: lckbit = bit_stat[2]; break;
-			case  6: lckbit = bit_stat[1]; break;
-			case  7: lckbit = bit_stat[0]; break;
-			case  8: lckbit = bit_stat[15]; break;
-			case  9: lckbit = bit_stat[14]; break;
-			case 10: lckbit = bit_stat[13]; break;
-			case 11: lckbit = bit_stat[12]; break;
-			case 12: lckbit = bit_stat[11]; break;
-			case 13: lckbit = bit_stat[10]; break;
-			case 14: lckbit = bit_stat[9]; break;
-			case 15: lckbit = bit_stat[8]; break;
-			case 16:
-			case 17:
-			case 18:
-			case 19: lckbit = bit_dyn[6]; break;
-			case 20:
-			case 21:
-			case 22:
-			case 23: lckbit = bit_dyn[5]; break;
-			case 24:
-			case 25:
-			case 26:
-			case 27: lckbit = bit_dyn[4]; break;
-			case 28:
-			case 29:
-			case 30:
-			case 31: lckbit = bit_dyn[2]; break;
-			case 32:
-			case 33:
-			case 34:
-			case 35: lckbit = bit_dyn[1]; break;
-			case 36:
-			case 37:
-			case 38:
-			case 39: lckbit = bit_dyn[0]; break;
-			case 40: lckbit = bit_dyn[12]; break;
-			case 41: lckbit = bit_dyn[11]; break;
-			case 42: lckbit = bit_dyn[10]; break; //auth0
-			case 43: lckbit = bit_dyn[9]; break;  //auth1
-			default: break;
-		}
-		PrintAndLogEx(NORMAL, "%3d/0x%02X | %s| %d | %s", i+startpage, i+startpage, sprint_hex(data + i * 4, 4), lckbit, sprint_ascii(data + i * 4,4));
-	}
-	PrintAndLogEx(NORMAL, "---------------------------------");
+    for (uint8_t i = 0; i < pages; ++i) {
+        if ( i < 3 ) {
+            PrintAndLogEx(NORMAL, "%3d/0x%02X | %s|   | %s", i+startpage, i+startpage, sprint_hex(data + i * 4, 4), sprint_ascii(data + i * 4,4) );
+            continue;
+        }
+        switch(i){
+            case  3: lckbit = bit_stat[4]; break;
+            case  4: lckbit = bit_stat[3]; break;
+            case  5: lckbit = bit_stat[2]; break;
+            case  6: lckbit = bit_stat[1]; break;
+            case  7: lckbit = bit_stat[0]; break;
+            case  8: lckbit = bit_stat[15]; break;
+            case  9: lckbit = bit_stat[14]; break;
+            case 10: lckbit = bit_stat[13]; break;
+            case 11: lckbit = bit_stat[12]; break;
+            case 12: lckbit = bit_stat[11]; break;
+            case 13: lckbit = bit_stat[10]; break;
+            case 14: lckbit = bit_stat[9]; break;
+            case 15: lckbit = bit_stat[8]; break;
+            case 16:
+            case 17:
+            case 18:
+            case 19: lckbit = bit_dyn[6]; break;
+            case 20:
+            case 21:
+            case 22:
+            case 23: lckbit = bit_dyn[5]; break;
+            case 24:
+            case 25:
+            case 26:
+            case 27: lckbit = bit_dyn[4]; break;
+            case 28:
+            case 29:
+            case 30:
+            case 31: lckbit = bit_dyn[2]; break;
+            case 32:
+            case 33:
+            case 34:
+            case 35: lckbit = bit_dyn[1]; break;
+            case 36:
+            case 37:
+            case 38:
+            case 39: lckbit = bit_dyn[0]; break;
+            case 40: lckbit = bit_dyn[12]; break;
+            case 41: lckbit = bit_dyn[11]; break;
+            case 42: lckbit = bit_dyn[10]; break; //auth0
+            case 43: lckbit = bit_dyn[9]; break;  //auth1
+            default: break;
+        }
+        PrintAndLogEx(NORMAL, "%3d/0x%02X | %s| %d | %s", i+startpage, i+startpage, sprint_hex(data + i * 4, 4), lckbit, sprint_ascii(data + i * 4,4));
+    }
+    PrintAndLogEx(NORMAL, "---------------------------------");
 }
 
 //
@@ -1658,235 +1658,235 @@ void printMFUdumpEx(mfu_dump_t* card, uint16_t pages, uint8_t startpage) {
 //  Read and Dump Card Contents,  using auto detection of tag size.
 int CmdHF14AMfUDump(const char *Cmd){
 
-	uint8_t fileNameLen = 0;
-	char filename[FILE_PATH_SIZE] = {0x00};
-	char *fptr = filename;
+    uint8_t fileNameLen = 0;
+    char filename[FILE_PATH_SIZE] = {0x00};
+    char *fptr = filename;
 
-	uint8_t data[1024] = {0x00};
-	memset(data, 0x00, sizeof(data));
+    uint8_t data[1024] = {0x00};
+    memset(data, 0x00, sizeof(data));
 
-	bool hasAuthKey = false;
-	int i = 0;
-	int pages = 16;
-	uint8_t dataLen = 0;
-	uint8_t cmdp = 0;
-	uint8_t authenticationkey[16] = {0x00};
-	memset(authenticationkey, 0x00, sizeof(authenticationkey));
-	uint8_t	*authKeyPtr = authenticationkey;
+    bool hasAuthKey = false;
+    int i = 0;
+    int pages = 16;
+    uint8_t dataLen = 0;
+    uint8_t cmdp = 0;
+    uint8_t authenticationkey[16] = {0x00};
+    memset(authenticationkey, 0x00, sizeof(authenticationkey));
+    uint8_t *authKeyPtr = authenticationkey;
 
-	bool errors = false;
-	bool swapEndian = false;
-	bool manualPages = false;
-	uint8_t startPage = 0;
-	uint8_t card_mem_size = 0;
-	char tempStr[50];
+    bool errors = false;
+    bool swapEndian = false;
+    bool manualPages = false;
+    uint8_t startPage = 0;
+    uint8_t card_mem_size = 0;
+    char tempStr[50];
 
-	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch (tolower(param_getchar(Cmd, cmdp))) {
-		case 'h':
-			return usage_hf_mfu_dump();
-		case 'k':
-			dataLen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
-			if (dataLen == 32 || dataLen == 8) { //ul-c or ev1/ntag key length
-				errors = param_gethex(tempStr, 0, authenticationkey, dataLen);
-				dataLen /= 2;
-			} else {
-				PrintAndLogEx(WARNING, "ERROR: Key is incorrect length\n");
-				errors = true;
-			}
-			cmdp += 2;
-			hasAuthKey = true;
-			break;
-		case 'l':
-			swapEndian = true;
-			cmdp++;
-			break;
-		case 'f':
-			fileNameLen = param_getstr(Cmd, cmdp+1, filename, sizeof(filename));
-			cmdp += 2;
-			break;
-		case 'p': //set start page
-			startPage = param_get8(Cmd, cmdp+1);
-			manualPages = true;
-			cmdp += 2;
-			break;
-		case 'q':
-			pages = param_get8(Cmd, cmdp+1);
-			cmdp += 2;
-			manualPages = true;
-			break;
-		default:
-			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-			errors = true;
-			break;
-		}
-	}
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+        case 'h':
+            return usage_hf_mfu_dump();
+        case 'k':
+            dataLen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
+            if (dataLen == 32 || dataLen == 8) { //ul-c or ev1/ntag key length
+                errors = param_gethex(tempStr, 0, authenticationkey, dataLen);
+                dataLen /= 2;
+            } else {
+                PrintAndLogEx(WARNING, "ERROR: Key is incorrect length\n");
+                errors = true;
+            }
+            cmdp += 2;
+            hasAuthKey = true;
+            break;
+        case 'l':
+            swapEndian = true;
+            cmdp++;
+            break;
+        case 'f':
+            fileNameLen = param_getstr(Cmd, cmdp+1, filename, sizeof(filename));
+            cmdp += 2;
+            break;
+        case 'p': //set start page
+            startPage = param_get8(Cmd, cmdp+1);
+            manualPages = true;
+            cmdp += 2;
+            break;
+        case 'q':
+            pages = param_get8(Cmd, cmdp+1);
+            cmdp += 2;
+            manualPages = true;
+            break;
+        default:
+            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+            errors = true;
+            break;
+        }
+    }
 
-	//Validations
-	if (errors) return usage_hf_mfu_dump();
+    //Validations
+    if (errors) return usage_hf_mfu_dump();
 
-	//if we entered a key in little endian and set the swapEndian switch - switch it...
-	if (swapEndian && hasAuthKey)
-		authKeyPtr = SwapEndian64(authenticationkey, dataLen, (dataLen == 16) ? 8 : 4);
+    //if we entered a key in little endian and set the swapEndian switch - switch it...
+    if (swapEndian && hasAuthKey)
+        authKeyPtr = SwapEndian64(authenticationkey, dataLen, (dataLen == 16) ? 8 : 4);
 
-	TagTypeUL_t tagtype = GetHF14AMfU_Type();
-	if (tagtype == UL_ERROR) return -1;
+    TagTypeUL_t tagtype = GetHF14AMfU_Type();
+    if (tagtype == UL_ERROR) return -1;
 
-	//get number of pages to read
-	if (!manualPages) {
-		for (uint8_t idx = 0; idx < MAX_UL_TYPES; idx++) {
-			if (tagtype & UL_TYPES_ARRAY[idx]) {
-				//add one as maxblks starts at 0
-				card_mem_size =	pages = UL_MEMORY_ARRAY[idx]+1;
-				break;
-			}
-		}
-	}
-	ul_print_type(tagtype, 0);
-	PrintAndLogEx(SUCCESS, "Reading tag memory...");
-	UsbCommand c = {CMD_MIFAREU_READCARD, {startPage, pages}};
-	if ( hasAuthKey ) {
-		if (tagtype & UL_C)
-			c.arg[2] = 1; //UL_C auth
-		else
-			c.arg[2] = 2; //UL_EV1/NTAG auth
+    //get number of pages to read
+    if (!manualPages) {
+        for (uint8_t idx = 0; idx < MAX_UL_TYPES; idx++) {
+            if (tagtype & UL_TYPES_ARRAY[idx]) {
+                //add one as maxblks starts at 0
+                card_mem_size = pages = UL_MEMORY_ARRAY[idx]+1;
+                break;
+            }
+        }
+    }
+    ul_print_type(tagtype, 0);
+    PrintAndLogEx(SUCCESS, "Reading tag memory...");
+    UsbCommand c = {CMD_MIFAREU_READCARD, {startPage, pages}};
+    if ( hasAuthKey ) {
+        if (tagtype & UL_C)
+            c.arg[2] = 1; //UL_C auth
+        else
+            c.arg[2] = 2; //UL_EV1/NTAG auth
 
-		memcpy(c.d.asBytes, authKeyPtr, dataLen);
-	}
+        memcpy(c.d.asBytes, authKeyPtr, dataLen);
+    }
 
-	clearCommandBuffer();
-	SendCommand(&c);
-	UsbCommand resp;
-	if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
-		PrintAndLogEx(WARNING, "Command execute time-out");
-		return 1;
-	}
-	if (resp.arg[0] != 1) {
-		PrintAndLogEx(WARNING, "Failed reading block: (%02x)", i);
-		return 1;
-	}
+    clearCommandBuffer();
+    SendCommand(&c);
+    UsbCommand resp;
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
+        PrintAndLogEx(WARNING, "Command execute time-out");
+        return 1;
+    }
+    if (resp.arg[0] != 1) {
+        PrintAndLogEx(WARNING, "Failed reading block: (%02x)", i);
+        return 1;
+    }
 
-	uint32_t startindex = resp.arg[2];
-	uint32_t bufferSize = resp.arg[1];
-	if (bufferSize > sizeof(data)) {
-		PrintAndLogEx(FAILED, "Data exceeded Buffer size!");
-		bufferSize = sizeof(data);
-	}
+    uint32_t startindex = resp.arg[2];
+    uint32_t bufferSize = resp.arg[1];
+    if (bufferSize > sizeof(data)) {
+        PrintAndLogEx(FAILED, "Data exceeded Buffer size!");
+        bufferSize = sizeof(data);
+    }
 
-	if ( !GetFromDevice(BIG_BUF, data, bufferSize, startindex, NULL, 2500, false) ) {
-		PrintAndLogEx(WARNING, "command execution time out");
-		return 1;
-	}
+    if ( !GetFromDevice(BIG_BUF, data, bufferSize, startindex, NULL, 2500, false) ) {
+        PrintAndLogEx(WARNING, "command execution time out");
+        return 1;
+    }
 
-	bool is_partial = (pages != bufferSize/4);
+    bool is_partial = (pages != bufferSize/4);
 
-	pages = bufferSize/4;
+    pages = bufferSize/4;
 
-	iso14a_card_select_t card;
-	mfu_dump_t dump_file_data;
-	uint8_t	get_pack[] = {0,0};
-	uint8_t get_version[] = {0,0,0,0,0,0,0,0};
-	uint8_t	get_tearing[] = {0,0,0};
-	uint8_t	get_counter[] = {0,0,0};
-	uint8_t	dummy_pack[] = {0,0};
-	uint8_t	get_signature[32];
-	memset( get_signature, 0, sizeof(get_signature) );
+    iso14a_card_select_t card;
+    mfu_dump_t dump_file_data;
+    uint8_t get_pack[] = {0,0};
+    uint8_t get_version[] = {0,0,0,0,0,0,0,0};
+    uint8_t get_tearing[] = {0,0,0};
+    uint8_t get_counter[] = {0,0,0};
+    uint8_t dummy_pack[] = {0,0};
+    uint8_t get_signature[32];
+    memset( get_signature, 0, sizeof(get_signature) );
 
-	// not ul_c and not std ul then attempt to collect info like
-	//  VERSION, SIGNATURE, COUNTERS, TEARING, PACK,
-	if (!(tagtype & UL_C || tagtype & UL)) {
-		//attempt to read pack
-		if (!ul_auth_select( &card, tagtype, true, authKeyPtr, get_pack, sizeof(get_pack))) {
-			//reset pack
-			get_pack[0] = 0;
-			get_pack[1] = 0;
-		}
-		DropField();
+    // not ul_c and not std ul then attempt to collect info like
+    //  VERSION, SIGNATURE, COUNTERS, TEARING, PACK,
+    if (!(tagtype & UL_C || tagtype & UL)) {
+        //attempt to read pack
+        if (!ul_auth_select( &card, tagtype, true, authKeyPtr, get_pack, sizeof(get_pack))) {
+            //reset pack
+            get_pack[0] = 0;
+            get_pack[1] = 0;
+        }
+        DropField();
 
-		// only add pack if not partial read,  and complete pages read.
-		if ( !is_partial && pages == card_mem_size) {
+        // only add pack if not partial read,  and complete pages read.
+        if ( !is_partial && pages == card_mem_size) {
 
-			// add pack to block read
-			memcpy(data + (pages*4) - 4, get_pack, sizeof(get_pack));
-		}
+            // add pack to block read
+            memcpy(data + (pages*4) - 4, get_pack, sizeof(get_pack));
+        }
 
-		if ( hasAuthKey )
-			ul_auth_select( &card, tagtype, hasAuthKey, authKeyPtr, dummy_pack, sizeof(dummy_pack));
-		else
-			ul_select(&card);
+        if ( hasAuthKey )
+            ul_auth_select( &card, tagtype, hasAuthKey, authKeyPtr, dummy_pack, sizeof(dummy_pack));
+        else
+            ul_select(&card);
 
-		ulev1_getVersion( get_version, sizeof(get_version) );
-		for ( uint8_t i = 0; i<3; ++i) {
-			ulev1_readTearing(i, get_tearing+i, 1);
-			ulev1_readCounter(i, get_counter, sizeof(get_counter) );
-		}
+        ulev1_getVersion( get_version, sizeof(get_version) );
+        for ( uint8_t i = 0; i<3; ++i) {
+            ulev1_readTearing(i, get_tearing+i, 1);
+            ulev1_readCounter(i, get_counter, sizeof(get_counter) );
+        }
 
-		DropField();
-		if ( hasAuthKey )
-			ul_auth_select( &card, tagtype, hasAuthKey, authKeyPtr, dummy_pack, sizeof(dummy_pack));
-		else
-			ul_select(&card);
+        DropField();
+        if ( hasAuthKey )
+            ul_auth_select( &card, tagtype, hasAuthKey, authKeyPtr, dummy_pack, sizeof(dummy_pack));
+        else
+            ul_select(&card);
 
-		ulev1_readSignature( get_signature, sizeof(get_signature));
-		DropField();
-	}
+        ulev1_readSignature( get_signature, sizeof(get_signature));
+        DropField();
+    }
 
-	// format and add keys to block dump output
-	if (hasAuthKey) {
-		// if we didn't swapendian before - do it now for the sprint_hex call
-		// NOTE: default entry is bigendian (unless swapped), sprint_hex outputs little endian
-		//       need to swap to keep it the same
-		if (!swapEndian){
-			authKeyPtr = SwapEndian64(authenticationkey, dataLen, (dataLen == 16) ? 8 : 4);
-		} else {
-			authKeyPtr = authenticationkey;
-		}
+    // format and add keys to block dump output
+    if (hasAuthKey) {
+        // if we didn't swapendian before - do it now for the sprint_hex call
+        // NOTE: default entry is bigendian (unless swapped), sprint_hex outputs little endian
+        //       need to swap to keep it the same
+        if (!swapEndian){
+            authKeyPtr = SwapEndian64(authenticationkey, dataLen, (dataLen == 16) ? 8 : 4);
+        } else {
+            authKeyPtr = authenticationkey;
+        }
 
-		if (tagtype & UL_C){ //add 4 pages
-			memcpy(data + pages*4, authKeyPtr, dataLen);
-			pages += dataLen/4;
-		} else { // 2nd page from end
-			memcpy(data + (pages*4) - 8, authenticationkey, dataLen);
-		}
-	}
+        if (tagtype & UL_C){ //add 4 pages
+            memcpy(data + pages*4, authKeyPtr, dataLen);
+            pages += dataLen/4;
+        } else { // 2nd page from end
+            memcpy(data + (pages*4) - 8, authenticationkey, dataLen);
+        }
+    }
 
-	//add *special* blocks to dump
-	//iceman:  need to add counters and pwd values to the dump format
-	memcpy(dump_file_data.version, get_version, sizeof(dump_file_data.version));
-	memcpy(dump_file_data.tearing, get_tearing, sizeof(dump_file_data.tearing));
-	memcpy(dump_file_data.pack, get_pack, sizeof(dump_file_data.pack));
-	memcpy(dump_file_data.signature, get_signature, sizeof(dump_file_data.signature));
-	memcpy(dump_file_data.data, data, pages*4);
+    //add *special* blocks to dump
+    //iceman:  need to add counters and pwd values to the dump format
+    memcpy(dump_file_data.version, get_version, sizeof(dump_file_data.version));
+    memcpy(dump_file_data.tearing, get_tearing, sizeof(dump_file_data.tearing));
+    memcpy(dump_file_data.pack, get_pack, sizeof(dump_file_data.pack));
+    memcpy(dump_file_data.signature, get_signature, sizeof(dump_file_data.signature));
+    memcpy(dump_file_data.data, data, pages*4);
 
-	printMFUdumpEx(&dump_file_data, pages, startPage);
+    printMFUdumpEx(&dump_file_data, pages, startPage);
 
-	// user supplied filename?
-	if (fileNameLen < 1) {
+    // user supplied filename?
+    if (fileNameLen < 1) {
 
-		PrintAndLogEx(INFO, "Using UID as filename");
+        PrintAndLogEx(INFO, "Using UID as filename");
 
-		fptr += sprintf(fptr, "hf-mfu-");
-		FillFileNameByUID(fptr, card.uid, "-dump", card.uidlen);
-	}
-	uint16_t datalen = pages*4 + DUMP_PREFIX_LENGTH;
-	saveFile(filename, "bin", (uint8_t*)&dump_file_data, datalen);
-	saveFileJSON(filename, "json", jsfMfuMemory, (uint8_t*)&dump_file_data, datalen);
+        fptr += sprintf(fptr, "hf-mfu-");
+        FillFileNameByUID(fptr, card.uid, "-dump", card.uidlen);
+    }
+    uint16_t datalen = pages*4 + DUMP_PREFIX_LENGTH;
+    saveFile(filename, "bin", (uint8_t*)&dump_file_data, datalen);
+    saveFileJSON(filename, "json", jsfMfuMemory, (uint8_t*)&dump_file_data, datalen);
 
-	if ( is_partial )
-		PrintAndLogEx(WARNING, "Partial dump created. (%d of %d blocks)", pages, card_mem_size);
+    if ( is_partial )
+        PrintAndLogEx(WARNING, "Partial dump created. (%d of %d blocks)", pages, card_mem_size);
 
-	return 0;
+    return 0;
 }
 
 static void wait4response(uint8_t b){
-	UsbCommand resp;
-	if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-		uint8_t isOK  = resp.arg[0] & 0xff;
-		if ( !isOK )
-			PrintAndLogEx(WARNING, "failed to write block %d", b);
-	} else {
-		PrintAndLogEx(WARNING, "Command execute timeout");
-	}
+    UsbCommand resp;
+    if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
+        uint8_t isOK  = resp.arg[0] & 0xff;
+        if ( !isOK )
+            PrintAndLogEx(WARNING, "failed to write block %d", b);
+    } else {
+        PrintAndLogEx(WARNING, "Command execute timeout");
+    }
 }
 
 //
@@ -1894,246 +1894,246 @@ static void wait4response(uint8_t b){
 //
 int CmdHF14AMfURestore(const char *Cmd){
 
-	char tempStr[50] = {0};
-	char filename[FILE_PATH_SIZE] = {0};
-	uint8_t authkey[16] = {0};
-	uint8_t	*p_authkey = authkey;
-	uint8_t cmdp = 0, keylen = 0;
-	bool hasKey = false;
-	bool swapEndian = false;
-	bool errors = false;
-	bool write_special = false;
-	bool write_extra = false;
-	bool read_key = false;
-	size_t filelen = 0;
-	FILE *f;
-	UsbCommand c = {CMD_MIFAREU_WRITEBL, {0,0,0}};
+    char tempStr[50] = {0};
+    char filename[FILE_PATH_SIZE] = {0};
+    uint8_t authkey[16] = {0};
+    uint8_t *p_authkey = authkey;
+    uint8_t cmdp = 0, keylen = 0;
+    bool hasKey = false;
+    bool swapEndian = false;
+    bool errors = false;
+    bool write_special = false;
+    bool write_extra = false;
+    bool read_key = false;
+    size_t filelen = 0;
+    FILE *f;
+    UsbCommand c = {CMD_MIFAREU_WRITEBL, {0,0,0}};
 
-	memset(authkey, 0x00, sizeof(authkey));
+    memset(authkey, 0x00, sizeof(authkey));
 
-	while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch (tolower(param_getchar(Cmd, cmdp))) {
-		case 'h':
-			return usage_hf_mfu_restore();
-		case 'k':
-			keylen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
-			if (keylen == 32 || keylen == 8) { //ul-c or ev1/ntag key length
-				errors = param_gethex(tempStr, 0, authkey, keylen);
-				keylen /= 2;
-			} else {
-				PrintAndLogEx(WARNING, "ERROR: Key is incorrect length\n");
-				errors = true;
-			}
-			cmdp += 2;
-			hasKey = true;
-			break;
-		case 'l':
-			swapEndian = true;
-			cmdp++;
-			break;
-		case 'f':
-			filelen = param_getstr(Cmd, cmdp+1, filename, FILE_PATH_SIZE);
+    while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+        case 'h':
+            return usage_hf_mfu_restore();
+        case 'k':
+            keylen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
+            if (keylen == 32 || keylen == 8) { //ul-c or ev1/ntag key length
+                errors = param_gethex(tempStr, 0, authkey, keylen);
+                keylen /= 2;
+            } else {
+                PrintAndLogEx(WARNING, "ERROR: Key is incorrect length\n");
+                errors = true;
+            }
+            cmdp += 2;
+            hasKey = true;
+            break;
+        case 'l':
+            swapEndian = true;
+            cmdp++;
+            break;
+        case 'f':
+            filelen = param_getstr(Cmd, cmdp+1, filename, FILE_PATH_SIZE);
 
-			if (filelen > FILE_PATH_SIZE-5)
-				filelen = FILE_PATH_SIZE-5;
+            if (filelen > FILE_PATH_SIZE-5)
+                filelen = FILE_PATH_SIZE-5;
 
-			if (filelen < 1)
-				sprintf(filename, "dumpdata.bin");
+            if (filelen < 1)
+                sprintf(filename, "dumpdata.bin");
 
-			cmdp += 2;
-			break;
-		case 's':
-			cmdp++;
-			write_special = true;
-			break;
-		case 'e':
-			cmdp++;
-			write_extra = true;
-			break;
-		case 'r':
-			cmdp++;
-			read_key = true;
-			break;
-		default:
-			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-			errors = true;
-			break;
-		}
-	}
+            cmdp += 2;
+            break;
+        case 's':
+            cmdp++;
+            write_special = true;
+            break;
+        case 'e':
+            cmdp++;
+            write_extra = true;
+            break;
+        case 'r':
+            cmdp++;
+            read_key = true;
+            break;
+        default:
+            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+            errors = true;
+            break;
+        }
+    }
 
-	//Validations
-	if (errors || cmdp == 0) return usage_hf_mfu_restore();
+    //Validations
+    if (errors || cmdp == 0) return usage_hf_mfu_restore();
 
-	if ((f = fopen(filename,"rb")) == NULL) {
-		PrintAndLogEx(WARNING, "Could not find file " _YELLOW_(%s), filename);
-		return 1;
-	}
+    if ((f = fopen(filename,"rb")) == NULL) {
+        PrintAndLogEx(WARNING, "Could not find file " _YELLOW_(%s), filename);
+        return 1;
+    }
 
-	// get filesize to know how memory to allocate
-	fseek(f, 0, SEEK_END);
-	long fsize = ftell(f);
-	fseek(f, 0, SEEK_SET);
-	if (fsize < 0) 	{
-		PrintAndLogEx(WARNING, "Error, when getting filesize");
-		fclose(f);
-		return 1;
-	}
+    // get filesize to know how memory to allocate
+    fseek(f, 0, SEEK_END);
+    long fsize = ftell(f);
+    fseek(f, 0, SEEK_SET);
+    if (fsize < 0) {
+        PrintAndLogEx(WARNING, "Error, when getting filesize");
+        fclose(f);
+        return 1;
+    }
 
-	uint8_t *dump = calloc(fsize, sizeof(uint8_t));
-	if ( !dump ) {
-		PrintAndLogEx(WARNING, "Failed to allocate memory");
-		fclose(f);
-		return 1;
-	}
+    uint8_t *dump = calloc(fsize, sizeof(uint8_t));
+    if ( !dump ) {
+        PrintAndLogEx(WARNING, "Failed to allocate memory");
+        fclose(f);
+        return 1;
+    }
 
-	// read all data
-	size_t bytes_read = fread(dump, 1, fsize, f);
-	fclose(f);
-	if ( bytes_read < 48 ) {
-		PrintAndLogEx(WARNING, "Error, dump file is too small");
-		free(dump);
-		return 1;
-	}
+    // read all data
+    size_t bytes_read = fread(dump, 1, fsize, f);
+    fclose(f);
+    if ( bytes_read < 48 ) {
+        PrintAndLogEx(WARNING, "Error, dump file is too small");
+        free(dump);
+        return 1;
+    }
 
-	PrintAndLogEx(INFO, "Restoring " _YELLOW_(%s)" to card", filename);
+    PrintAndLogEx(INFO, "Restoring " _YELLOW_(%s)" to card", filename);
 
-	mfu_dump_t *mem = (mfu_dump_t*)dump;
-	uint8_t pages = (bytes_read-48)/4;
+    mfu_dump_t *mem = (mfu_dump_t*)dump;
+    uint8_t pages = (bytes_read-48)/4;
 
-	// print dump
-	printMFUdumpEx(mem, pages, 0);
+    // print dump
+    printMFUdumpEx(mem, pages, 0);
 
-	// Swap endianness
-	if (swapEndian && hasKey) {
-		if ( keylen == 16 )
-			p_authkey = SwapEndian64(authkey, keylen, 8);
-		else
-			p_authkey = SwapEndian64(authkey, keylen, 4);
-	}
+    // Swap endianness
+    if (swapEndian && hasKey) {
+        if ( keylen == 16 )
+            p_authkey = SwapEndian64(authkey, keylen, 8);
+        else
+            p_authkey = SwapEndian64(authkey, keylen, 4);
+    }
 
-	// set key - only once
-	if ( hasKey ){
-		c.arg[1] = (keylen == 16) ? 1 : 2;
-		memcpy(c.d.asBytes+4, p_authkey, keylen);
-	}
+    // set key - only once
+    if ( hasKey ){
+        c.arg[1] = (keylen == 16) ? 1 : 2;
+        memcpy(c.d.asBytes+4, p_authkey, keylen);
+    }
 
-	// write version, signature, pack
-	// only magic NTAG cards
-	if ( write_extra ) {
+    // write version, signature, pack
+    // only magic NTAG cards
+    if ( write_extra ) {
 
-		#define MFU_NTAG_SPECIAL_PWD		0xF0
-		#define MFU_NTAG_SPECIAL_PACK		0xF1
-		#define MFU_NTAG_SPECIAL_VERSION	0xFA
-		#define MFU_NTAG_SPECIAL_SIGNATURE	0xF2
-		// pwd
-		if ( hasKey || read_key) {
-			c.arg[0] = MFU_NTAG_SPECIAL_PWD;
+        #define MFU_NTAG_SPECIAL_PWD        0xF0
+        #define MFU_NTAG_SPECIAL_PACK       0xF1
+        #define MFU_NTAG_SPECIAL_VERSION    0xFA
+        #define MFU_NTAG_SPECIAL_SIGNATURE  0xF2
+        // pwd
+        if ( hasKey || read_key) {
+            c.arg[0] = MFU_NTAG_SPECIAL_PWD;
 
-			if (read_key) {
-				// try reading key from dump and use.
-				memcpy(c.d.asBytes, mem->data + ( bytes_read - 48 - 8), 4);
-			} else {
-				memcpy(c.d.asBytes,  p_authkey, 4 );
-			}
+            if (read_key) {
+                // try reading key from dump and use.
+                memcpy(c.d.asBytes, mem->data + ( bytes_read - 48 - 8), 4);
+            } else {
+                memcpy(c.d.asBytes,  p_authkey, 4 );
+            }
 
-			PrintAndLogEx(NORMAL, "special PWD     block written 0x%X - %s\n", MFU_NTAG_SPECIAL_PWD, sprint_hex(c.d.asBytes, 4));
-			clearCommandBuffer();
-			SendCommand(&c);
-			wait4response(MFU_NTAG_SPECIAL_PWD);
+            PrintAndLogEx(NORMAL, "special PWD     block written 0x%X - %s\n", MFU_NTAG_SPECIAL_PWD, sprint_hex(c.d.asBytes, 4));
+            clearCommandBuffer();
+            SendCommand(&c);
+            wait4response(MFU_NTAG_SPECIAL_PWD);
 
-			// copy the new key
-			c.arg[1] = 2;
-			memcpy(authkey, c.d.asBytes, 4);
-			memcpy(c.d.asBytes+4, authkey, 4);
-		}
+            // copy the new key
+            c.arg[1] = 2;
+            memcpy(authkey, c.d.asBytes, 4);
+            memcpy(c.d.asBytes+4, authkey, 4);
+        }
 
-		// pack
-		c.arg[0] = MFU_NTAG_SPECIAL_PACK;
-		c.d.asBytes[0] = mem->pack[0];
-		c.d.asBytes[1] = mem->pack[1];
-		c.d.asBytes[2] = 0;
-		c.d.asBytes[3] = 0;
-		PrintAndLogEx(NORMAL, "special PACK    block written 0x%X - %s\n", MFU_NTAG_SPECIAL_PACK, sprint_hex(c.d.asBytes, 4));
-		clearCommandBuffer();
-		SendCommand(&c);
-		wait4response(MFU_NTAG_SPECIAL_PACK);
+        // pack
+        c.arg[0] = MFU_NTAG_SPECIAL_PACK;
+        c.d.asBytes[0] = mem->pack[0];
+        c.d.asBytes[1] = mem->pack[1];
+        c.d.asBytes[2] = 0;
+        c.d.asBytes[3] = 0;
+        PrintAndLogEx(NORMAL, "special PACK    block written 0x%X - %s\n", MFU_NTAG_SPECIAL_PACK, sprint_hex(c.d.asBytes, 4));
+        clearCommandBuffer();
+        SendCommand(&c);
+        wait4response(MFU_NTAG_SPECIAL_PACK);
 
-		// Signature
-		for (uint8_t s = MFU_NTAG_SPECIAL_SIGNATURE, i=0; s < MFU_NTAG_SPECIAL_SIGNATURE+8; s++, i += 4){
-			c.arg[0] = s;
-			memcpy(c.d.asBytes, mem->signature+i, 4);
-			PrintAndLogEx(NORMAL, "special SIG     block written 0x%X - %s\n", s, sprint_hex(c.d.asBytes, 4) );
-			clearCommandBuffer();
-			SendCommand(&c);
-			wait4response(s);
-		}
+        // Signature
+        for (uint8_t s = MFU_NTAG_SPECIAL_SIGNATURE, i=0; s < MFU_NTAG_SPECIAL_SIGNATURE+8; s++, i += 4){
+            c.arg[0] = s;
+            memcpy(c.d.asBytes, mem->signature+i, 4);
+            PrintAndLogEx(NORMAL, "special SIG     block written 0x%X - %s\n", s, sprint_hex(c.d.asBytes, 4) );
+            clearCommandBuffer();
+            SendCommand(&c);
+            wait4response(s);
+        }
 
-		// Version
-		for (uint8_t s = MFU_NTAG_SPECIAL_VERSION, i=0; s < MFU_NTAG_SPECIAL_VERSION+2; s++, i += 4){
-			c.arg[0] = s;
-			memcpy(c.d.asBytes, mem->version+i, 4 );
-			PrintAndLogEx(NORMAL, "special VERSION block written 0x%X - %s\n", s, sprint_hex(c.d.asBytes, 4) );
-			clearCommandBuffer();
-			SendCommand(&c);
-			wait4response(s);
-		}
-	}
+        // Version
+        for (uint8_t s = MFU_NTAG_SPECIAL_VERSION, i=0; s < MFU_NTAG_SPECIAL_VERSION+2; s++, i += 4){
+            c.arg[0] = s;
+            memcpy(c.d.asBytes, mem->version+i, 4 );
+            PrintAndLogEx(NORMAL, "special VERSION block written 0x%X - %s\n", s, sprint_hex(c.d.asBytes, 4) );
+            clearCommandBuffer();
+            SendCommand(&c);
+            wait4response(s);
+        }
+    }
 
-	PrintAndLogEx(INFO, "Restoring data blocks.");
-	// write all other data
-	// Skip block 0,1,2,3 (only magic tags can write to them)
-	// Skip last 5 blocks usually is configuration
-	for (uint8_t b = 4; b < pages-5; b++) {
+    PrintAndLogEx(INFO, "Restoring data blocks.");
+    // write all other data
+    // Skip block 0,1,2,3 (only magic tags can write to them)
+    // Skip last 5 blocks usually is configuration
+    for (uint8_t b = 4; b < pages-5; b++) {
 
-		//Send write Block
-		c.arg[0] = b;
-		memcpy(c.d.asBytes, mem->data + (b*4), 4);
-		clearCommandBuffer();
-		SendCommand(&c);
-		wait4response(b);
-		printf("."); fflush(stdout);
-	}
-	PrintAndLogEx(NORMAL, "\n");
+        //Send write Block
+        c.arg[0] = b;
+        memcpy(c.d.asBytes, mem->data + (b*4), 4);
+        clearCommandBuffer();
+        SendCommand(&c);
+        wait4response(b);
+        printf("."); fflush(stdout);
+    }
+    PrintAndLogEx(NORMAL, "\n");
 
-	// write special data last
-	if (write_special) {
+    // write special data last
+    if (write_special) {
 
-		PrintAndLogEx(INFO, "Restoring configuration blocks.\n");
+        PrintAndLogEx(INFO, "Restoring configuration blocks.\n");
 
-		PrintAndLogEx(NORMAL, "authentication with keytype[%x]  %s\n", (uint8_t)(c.arg[1] & 0xff), sprint_hex(p_authkey,4));
+        PrintAndLogEx(NORMAL, "authentication with keytype[%x]  %s\n", (uint8_t)(c.arg[1] & 0xff), sprint_hex(p_authkey,4));
 
-		// otp, uid, lock, cfg1, cfg0, dynlockbits
-		uint8_t blocks[] = {3, 0, 1, 2, pages-5, pages-4, pages-3};
-		for ( uint8_t i = 0; i < sizeof(blocks); i++){
-			uint8_t b = blocks[i];
-			c.arg[0] = b;
-			memcpy(c.d.asBytes, mem->data + (b*4), 4);
-			clearCommandBuffer();
-			SendCommand(&c);
-			wait4response(b);
-			PrintAndLogEx(NORMAL, "special block written %u - %s\n", b, sprint_hex(c.d.asBytes, 4) );
-		}
-	}
+        // otp, uid, lock, cfg1, cfg0, dynlockbits
+        uint8_t blocks[] = {3, 0, 1, 2, pages-5, pages-4, pages-3};
+        for ( uint8_t i = 0; i < sizeof(blocks); i++){
+            uint8_t b = blocks[i];
+            c.arg[0] = b;
+            memcpy(c.d.asBytes, mem->data + (b*4), 4);
+            clearCommandBuffer();
+            SendCommand(&c);
+            wait4response(b);
+            PrintAndLogEx(NORMAL, "special block written %u - %s\n", b, sprint_hex(c.d.asBytes, 4) );
+        }
+    }
 
-	DropField();
-	free(dump);
-	return 0;
+    DropField();
+    free(dump);
+    return 0;
 }
 //
 //  Load emulator with dump file
 //
 int CmdHF14AMfUeLoad(const char *Cmd){
-	char c = tolower(param_getchar(Cmd, 0));
-	if ( c == 'h' || c == 0x00) return usage_hf_mfu_eload();
-	return CmdHF14AMfELoad(Cmd);
+    char c = tolower(param_getchar(Cmd, 0));
+    if ( c == 'h' || c == 0x00) return usage_hf_mfu_eload();
+    return CmdHF14AMfELoad(Cmd);
 }
 //
 //  Simulate tag
 //
 int CmdHF14AMfUSim(const char *Cmd){
-	char c = tolower(param_getchar(Cmd, 0));
-	if ( c == 'h' || c == 0x00) return usage_hf_mfu_sim();
-	return CmdHF14ASim(Cmd);
+    char c = tolower(param_getchar(Cmd, 0));
+    if ( c == 'h' || c == 0x00) return usage_hf_mfu_sim();
+    return CmdHF14ASim(Cmd);
 }
 
 //-------------------------------------------------------------------------------
@@ -2145,29 +2145,29 @@ int CmdHF14AMfUSim(const char *Cmd){
 //
 int CmdHF14AMfucAuth(const char *Cmd){
 
-	uint8_t keyNo = 3;
-	bool errors = false;
+    uint8_t keyNo = 3;
+    bool errors = false;
 
-	char cmdp = tolower(param_getchar(Cmd, 0));
+    char cmdp = tolower(param_getchar(Cmd, 0));
 
-	//Change key to user defined one
-	if (cmdp == 'k'){
-		keyNo = param_get8(Cmd, 1);
-		if(keyNo >= KEYS_3DES_COUNT)
-			errors = true;
-	}
+    //Change key to user defined one
+    if (cmdp == 'k'){
+        keyNo = param_get8(Cmd, 1);
+        if(keyNo >= KEYS_3DES_COUNT)
+            errors = true;
+    }
 
-	if (cmdp == 'h') errors = true;
+    if (cmdp == 'h') errors = true;
 
-	if (errors) return usage_hf_mfu_ucauth();
+    if (errors) return usage_hf_mfu_ucauth();
 
-	uint8_t *key = default_3des_keys[keyNo];
-	if (ulc_authentication(key, true))
-		PrintAndLogEx(SUCCESS, "Authentication successful. 3des key: %s",sprint_hex(key, 16));
-	else
-		PrintAndLogEx(WARNING, "Authentication failed");
+    uint8_t *key = default_3des_keys[keyNo];
+    if (ulc_authentication(key, true))
+        PrintAndLogEx(SUCCESS, "Authentication successful. 3des key: %s",sprint_hex(key, 16));
+    else
+        PrintAndLogEx(WARNING, "Authentication failed");
 
-	return 0;
+    return 0;
 }
 
 /**
@@ -2177,93 +2177,93 @@ Commented out, since it requires openssl
 
 int CmdTestDES(const char * cmd)
 {
-	uint8_t key[16] = {0x00};
+    uint8_t key[16] = {0x00};
 
-	memcpy(key,key3_3des_data,16);
-	DES_cblock RndA, RndB;
+    memcpy(key,key3_3des_data,16);
+    DES_cblock RndA, RndB;
 
-	PrintAndLogEx(NORMAL, "----------OpenSSL DES implementation----------");
-	{
-		uint8_t e_RndB[8] = {0x00};
-		unsigned char RndARndB[16] = {0x00};
+    PrintAndLogEx(NORMAL, "----------OpenSSL DES implementation----------");
+    {
+        uint8_t e_RndB[8] = {0x00};
+        unsigned char RndARndB[16] = {0x00};
 
-		DES_cblock iv = { 0 };
-		DES_key_schedule ks1,ks2;
-		DES_cblock key1,key2;
+        DES_cblock iv = { 0 };
+        DES_key_schedule ks1,ks2;
+        DES_cblock key1,key2;
 
-		memcpy(key,key3_3des_data,16);
-		memcpy(key1,key,8);
-		memcpy(key2,key+8,8);
+        memcpy(key,key3_3des_data,16);
+        memcpy(key1,key,8);
+        memcpy(key2,key+8,8);
 
 
-		DES_set_key((DES_cblock *)key1,&ks1);
-		DES_set_key((DES_cblock *)key2,&ks2);
+        DES_set_key((DES_cblock *)key1,&ks1);
+        DES_set_key((DES_cblock *)key2,&ks2);
 
-		DES_random_key(&RndA);
-		PrintAndLogEx(NORMAL, "     RndA:%s",sprint_hex(RndA, 8));
-		PrintAndLogEx(NORMAL, "     e_RndB:%s",sprint_hex(e_RndB, 8));
-		//void DES_ede2_cbc_encrypt(const unsigned char *input,
-		//    unsigned char *output, long length, DES_key_schedule *ks1,
-		//    DES_key_schedule *ks2, DES_cblock *ivec, int enc);
-		DES_ede2_cbc_encrypt(e_RndB,RndB,sizeof(e_RndB),&ks1,&ks2,&iv,0);
+        DES_random_key(&RndA);
+        PrintAndLogEx(NORMAL, "     RndA:%s",sprint_hex(RndA, 8));
+        PrintAndLogEx(NORMAL, "     e_RndB:%s",sprint_hex(e_RndB, 8));
+        //void DES_ede2_cbc_encrypt(const unsigned char *input,
+        //    unsigned char *output, long length, DES_key_schedule *ks1,
+        //    DES_key_schedule *ks2, DES_cblock *ivec, int enc);
+        DES_ede2_cbc_encrypt(e_RndB,RndB,sizeof(e_RndB),&ks1,&ks2,&iv,0);
 
-		PrintAndLogEx(NORMAL, "     RndB:%s",sprint_hex(RndB, 8));
-		rol(RndB,8);
-		memcpy(RndARndB,RndA,8);
-		memcpy(RndARndB+8,RndB,8);
-		PrintAndLogEx(NORMAL, "     RA+B:%s",sprint_hex(RndARndB, 16));
-		DES_ede2_cbc_encrypt(RndARndB,RndARndB,sizeof(RndARndB),&ks1,&ks2,&e_RndB,1);
-		PrintAndLogEx(NORMAL, "enc(RA+B):%s",sprint_hex(RndARndB, 16));
+        PrintAndLogEx(NORMAL, "     RndB:%s",sprint_hex(RndB, 8));
+        rol(RndB,8);
+        memcpy(RndARndB,RndA,8);
+        memcpy(RndARndB+8,RndB,8);
+        PrintAndLogEx(NORMAL, "     RA+B:%s",sprint_hex(RndARndB, 16));
+        DES_ede2_cbc_encrypt(RndARndB,RndARndB,sizeof(RndARndB),&ks1,&ks2,&e_RndB,1);
+        PrintAndLogEx(NORMAL, "enc(RA+B):%s",sprint_hex(RndARndB, 16));
 
-	}
-	PrintAndLogEx(NORMAL, "----------PolarSSL implementation----------");
-	{
-		uint8_t random_a[8]     = { 0 };
-		uint8_t enc_random_a[8] = { 0 };
-		uint8_t random_b[8]     = { 0 };
-		uint8_t enc_random_b[8] = { 0 };
-		uint8_t random_a_and_b[16] = { 0 };
-		des3_context ctx        = { 0 };
+    }
+    PrintAndLogEx(NORMAL, "----------PolarSSL implementation----------");
+    {
+        uint8_t random_a[8]     = { 0 };
+        uint8_t enc_random_a[8] = { 0 };
+        uint8_t random_b[8]     = { 0 };
+        uint8_t enc_random_b[8] = { 0 };
+        uint8_t random_a_and_b[16] = { 0 };
+        des3_context ctx        = { 0 };
 
-		memcpy(random_a, RndA,8);
+        memcpy(random_a, RndA,8);
 
-		uint8_t output[8]       = { 0 };
-		uint8_t iv[8]           = { 0 };
+        uint8_t output[8]       = { 0 };
+        uint8_t iv[8]           = { 0 };
 
-		PrintAndLogEx(NORMAL, "     RndA  :%s",sprint_hex(random_a, 8));
-		PrintAndLogEx(NORMAL, "     e_RndB:%s",sprint_hex(enc_random_b, 8));
+        PrintAndLogEx(NORMAL, "     RndA  :%s",sprint_hex(random_a, 8));
+        PrintAndLogEx(NORMAL, "     e_RndB:%s",sprint_hex(enc_random_b, 8));
 
-		des3_set2key_dec(&ctx, key);
+        des3_set2key_dec(&ctx, key);
 
-		des3_crypt_cbc(&ctx      // des3_context *ctx
-			, DES_DECRYPT        // int mode
-			, sizeof(random_b)   // size_t length
-			, iv                 // unsigned char iv[8]
-			, enc_random_b       // const unsigned char *input
-			, random_b           // unsigned char *output
-			);
+        des3_crypt_cbc(&ctx      // des3_context *ctx
+            , DES_DECRYPT        // int mode
+            , sizeof(random_b)   // size_t length
+            , iv                 // unsigned char iv[8]
+            , enc_random_b       // const unsigned char *input
+            , random_b           // unsigned char *output
+            );
 
-		PrintAndLogEx(NORMAL, "     RndB:%s",sprint_hex(random_b, 8));
+        PrintAndLogEx(NORMAL, "     RndB:%s",sprint_hex(random_b, 8));
 
-		rol(random_b,8);
-		memcpy(random_a_and_b  ,random_a,8);
-		memcpy(random_a_and_b+8,random_b,8);
+        rol(random_b,8);
+        memcpy(random_a_and_b  ,random_a,8);
+        memcpy(random_a_and_b+8,random_b,8);
 
-		PrintAndLogEx(NORMAL, "     RA+B:%s",sprint_hex(random_a_and_b, 16));
+        PrintAndLogEx(NORMAL, "     RA+B:%s",sprint_hex(random_a_and_b, 16));
 
-		des3_set2key_enc(&ctx, key);
+        des3_set2key_enc(&ctx, key);
 
-		des3_crypt_cbc(&ctx          // des3_context *ctx
-			, DES_ENCRYPT            // int mode
-			, sizeof(random_a_and_b)   // size_t length
-			, enc_random_b           // unsigned char iv[8]
-			, random_a_and_b         // const unsigned char *input
-			, random_a_and_b         // unsigned char *output
-			);
+        des3_crypt_cbc(&ctx          // des3_context *ctx
+            , DES_ENCRYPT            // int mode
+            , sizeof(random_a_and_b)   // size_t length
+            , enc_random_b           // unsigned char iv[8]
+            , random_a_and_b         // const unsigned char *input
+            , random_a_and_b         // unsigned char *output
+            );
 
-		PrintAndLogEx(NORMAL, "enc(RA+B):%s",sprint_hex(random_a_and_b, 16));
-	}
-	return 0;
+        PrintAndLogEx(NORMAL, "enc(RA+B):%s",sprint_hex(random_a_and_b, 16));
+    }
+    return 0;
 }
 **/
 
@@ -2272,34 +2272,34 @@ int CmdTestDES(const char * cmd)
 //
 int CmdHF14AMfucSetPwd(const char *Cmd){
 
-	uint8_t pwd[16] = {0x00};
-	char cmdp = tolower(param_getchar(Cmd, 0));
+    uint8_t pwd[16] = {0x00};
+    char cmdp = tolower(param_getchar(Cmd, 0));
 
-	if (strlen(Cmd) == 0  || cmdp == 'h') return usage_hf_mfu_ucsetpwd();
+    if (strlen(Cmd) == 0  || cmdp == 'h') return usage_hf_mfu_ucsetpwd();
 
-	if (param_gethex(Cmd, 0, pwd, 32)) {
-		PrintAndLogEx(WARNING, "Password must include 32 HEX symbols");
-		return 1;
-	}
+    if (param_gethex(Cmd, 0, pwd, 32)) {
+        PrintAndLogEx(WARNING, "Password must include 32 HEX symbols");
+        return 1;
+    }
 
-	UsbCommand c = {CMD_MIFAREUC_SETPWD};
-	memcpy( c.d.asBytes, pwd, 16);
-	clearCommandBuffer();
-	SendCommand(&c);
+    UsbCommand c = {CMD_MIFAREUC_SETPWD};
+    memcpy( c.d.asBytes, pwd, 16);
+    clearCommandBuffer();
+    SendCommand(&c);
 
-	UsbCommand resp;
-	if (WaitForResponseTimeout(CMD_ACK,&resp,1500) ) {
-		if ( (resp.arg[0] & 0xff) == 1) {
-			PrintAndLogEx(INFO, "Ultralight-C new password: %s", sprint_hex(pwd,16));
-		} else {
-			PrintAndLogEx(WARNING, "Failed writing at block %d", resp.arg[1] & 0xff);
-			return 1;
-		}
-	} else {
-		PrintAndLogEx(WARNING, "command execution time out");
-		return 1;
-	}
-	return 0;
+    UsbCommand resp;
+    if (WaitForResponseTimeout(CMD_ACK,&resp,1500) ) {
+        if ( (resp.arg[0] & 0xff) == 1) {
+            PrintAndLogEx(INFO, "Ultralight-C new password: %s", sprint_hex(pwd,16));
+        } else {
+            PrintAndLogEx(WARNING, "Failed writing at block %d", resp.arg[1] & 0xff);
+            return 1;
+        }
+    } else {
+        PrintAndLogEx(WARNING, "command execution time out");
+        return 1;
+    }
+    return 0;
 }
 
 //
@@ -2307,266 +2307,266 @@ int CmdHF14AMfucSetPwd(const char *Cmd){
 //
 int CmdHF14AMfucSetUid(const char *Cmd){
 
-	UsbCommand c = {CMD_MIFAREU_READBL};
-	UsbCommand resp;
-	uint8_t uid[7] = {0x00};
-	char cmdp = tolower(param_getchar(Cmd, 0));
+    UsbCommand c = {CMD_MIFAREU_READBL};
+    UsbCommand resp;
+    uint8_t uid[7] = {0x00};
+    char cmdp = tolower(param_getchar(Cmd, 0));
 
-	if (strlen(Cmd) == 0  || cmdp == 'h') return usage_hf_mfu_ucsetuid();
+    if (strlen(Cmd) == 0  || cmdp == 'h') return usage_hf_mfu_ucsetuid();
 
-	if (param_gethex(Cmd, 0, uid, 14)) {
-		PrintAndLogEx(WARNING, "UID must include 14 HEX symbols");
-		return 1;
-	}
+    if (param_gethex(Cmd, 0, uid, 14)) {
+        PrintAndLogEx(WARNING, "UID must include 14 HEX symbols");
+        return 1;
+    }
 
-	// read block2.
-	c.arg[0] = 2;
-	clearCommandBuffer();
-	SendCommand(&c);
-	if (!WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
-		PrintAndLogEx(WARNING, "Command execute timeout");
-		return 2;
-	}
+    // read block2.
+    c.arg[0] = 2;
+    clearCommandBuffer();
+    SendCommand(&c);
+    if (!WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
+        PrintAndLogEx(WARNING, "Command execute timeout");
+        return 2;
+    }
 
-	// save old block2.
-	uint8_t oldblock2[4] = {0x00};
-	memcpy(resp.d.asBytes, oldblock2, 4);
+    // save old block2.
+    uint8_t oldblock2[4] = {0x00};
+    memcpy(resp.d.asBytes, oldblock2, 4);
 
-	// block 0.
-	c.cmd = CMD_MIFAREU_WRITEBL;
-	c.arg[0] = 0;
-	c.d.asBytes[0] = uid[0];
-	c.d.asBytes[1] = uid[1];
-	c.d.asBytes[2] = uid[2];
-	c.d.asBytes[3] =  0x88 ^ uid[0] ^ uid[1] ^ uid[2];
-	clearCommandBuffer();
-	SendCommand(&c);
-	if (!WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
-		PrintAndLogEx(WARNING, "Command execute timeout");
-		return 3;
-	}
+    // block 0.
+    c.cmd = CMD_MIFAREU_WRITEBL;
+    c.arg[0] = 0;
+    c.d.asBytes[0] = uid[0];
+    c.d.asBytes[1] = uid[1];
+    c.d.asBytes[2] = uid[2];
+    c.d.asBytes[3] =  0x88 ^ uid[0] ^ uid[1] ^ uid[2];
+    clearCommandBuffer();
+    SendCommand(&c);
+    if (!WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
+        PrintAndLogEx(WARNING, "Command execute timeout");
+        return 3;
+    }
 
-	// block 1.
-	c.arg[0] = 1;
-	c.d.asBytes[0] = uid[3];
-	c.d.asBytes[1] = uid[4];
-	c.d.asBytes[2] = uid[5];
-	c.d.asBytes[3] = uid[6];
-	clearCommandBuffer();
-	SendCommand(&c);
-	if (!WaitForResponseTimeout(CMD_ACK,&resp,1500) ) {
-		PrintAndLogEx(WARNING, "Command execute timeout");
-		return 4;
-	}
+    // block 1.
+    c.arg[0] = 1;
+    c.d.asBytes[0] = uid[3];
+    c.d.asBytes[1] = uid[4];
+    c.d.asBytes[2] = uid[5];
+    c.d.asBytes[3] = uid[6];
+    clearCommandBuffer();
+    SendCommand(&c);
+    if (!WaitForResponseTimeout(CMD_ACK,&resp,1500) ) {
+        PrintAndLogEx(WARNING, "Command execute timeout");
+        return 4;
+    }
 
-	// block 2.
-	c.arg[0] = 2;
-	c.d.asBytes[0] = uid[3] ^ uid[4] ^ uid[5] ^ uid[6];
-	c.d.asBytes[1] = oldblock2[1];
-	c.d.asBytes[2] = oldblock2[2];
-	c.d.asBytes[3] = oldblock2[3];
-	clearCommandBuffer();
-	SendCommand(&c);
-	if (!WaitForResponseTimeout(CMD_ACK,&resp,1500) ) {
-		PrintAndLogEx(WARNING, "Command execute timeout");
-		return 5;
-	}
-	return 0;
+    // block 2.
+    c.arg[0] = 2;
+    c.d.asBytes[0] = uid[3] ^ uid[4] ^ uid[5] ^ uid[6];
+    c.d.asBytes[1] = oldblock2[1];
+    c.d.asBytes[2] = oldblock2[2];
+    c.d.asBytes[3] = oldblock2[3];
+    clearCommandBuffer();
+    SendCommand(&c);
+    if (!WaitForResponseTimeout(CMD_ACK,&resp,1500) ) {
+        PrintAndLogEx(WARNING, "Command execute timeout");
+        return 5;
+    }
+    return 0;
 }
 
 int CmdHF14AMfuGenDiverseKeys(const char *Cmd){
 
-	uint8_t uid[4];
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if (strlen(Cmd) == 0  || cmdp == 'h') return usage_hf_mfu_gendiverse();
+    uint8_t uid[4];
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) == 0  || cmdp == 'h') return usage_hf_mfu_gendiverse();
 
-	if ( cmdp == 'r' ) {
-		// read uid from tag
-		UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0}};
-		clearCommandBuffer();
-		SendCommand(&c);
-		UsbCommand resp;
-		WaitForResponse(CMD_ACK, &resp);
-		iso14a_card_select_t card;
-		memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
+    if ( cmdp == 'r' ) {
+        // read uid from tag
+        UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0}};
+        clearCommandBuffer();
+        SendCommand(&c);
+        UsbCommand resp;
+        WaitForResponse(CMD_ACK, &resp);
+        iso14a_card_select_t card;
+        memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
 
-		uint64_t select_status = resp.arg[0];
-		// 0: couldn't read,
-		// 1: OK, with ATS
-		// 2: OK, no ATS
-		// 3: proprietary Anticollision
+        uint64_t select_status = resp.arg[0];
+        // 0: couldn't read,
+        // 1: OK, with ATS
+        // 2: OK, no ATS
+        // 3: proprietary Anticollision
 
-		if ( select_status == 0 ) {
-			PrintAndLogEx(WARNING, "iso14443a card select failed");
-			return 1;
-		}
-		if ( card.uidlen != 4 ) {
-			PrintAndLogEx(WARNING, "Wrong sized UID, expected 4bytes got %d", card.uidlen);
-			return 1;
-		}
-		memcpy(uid, card.uid, sizeof(uid));
-	}
-	else {
-		if (param_gethex(Cmd, 0, uid, 8)) return usage_hf_mfu_gendiverse();
-	}
+        if ( select_status == 0 ) {
+            PrintAndLogEx(WARNING, "iso14443a card select failed");
+            return 1;
+        }
+        if ( card.uidlen != 4 ) {
+            PrintAndLogEx(WARNING, "Wrong sized UID, expected 4bytes got %d", card.uidlen);
+            return 1;
+        }
+        memcpy(uid, card.uid, sizeof(uid));
+    }
+    else {
+        if (param_gethex(Cmd, 0, uid, 8)) return usage_hf_mfu_gendiverse();
+    }
 
 
-	uint8_t iv[8] = { 0x00 };
-	uint8_t block = 0x01;
+    uint8_t iv[8] = { 0x00 };
+    uint8_t block = 0x01;
 
-	uint8_t mifarekeyA[] = { 0xA0,0xA1,0xA2,0xA3,0xA4,0xA5 };
-	uint8_t mifarekeyB[] = { 0xB0,0xB1,0xB2,0xB3,0xB4,0xB5 };
-	uint8_t dkeyA[8] = { 0x00 };
-	uint8_t dkeyB[8] = { 0x00 };
+    uint8_t mifarekeyA[] = { 0xA0,0xA1,0xA2,0xA3,0xA4,0xA5 };
+    uint8_t mifarekeyB[] = { 0xB0,0xB1,0xB2,0xB3,0xB4,0xB5 };
+    uint8_t dkeyA[8] = { 0x00 };
+    uint8_t dkeyB[8] = { 0x00 };
 
-	uint8_t masterkey[] = { 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x88,0x99,0xaa,0xbb,0xcc,0xdd,0xee,0xff };
+    uint8_t masterkey[] = { 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x88,0x99,0xaa,0xbb,0xcc,0xdd,0xee,0xff };
 
-	uint8_t mix[8] = { 0x00 };
-	uint8_t divkey[8] = { 0x00 };
+    uint8_t mix[8] = { 0x00 };
+    uint8_t divkey[8] = { 0x00 };
 
-	memcpy(mix, mifarekeyA, 4);
+    memcpy(mix, mifarekeyA, 4);
 
-	mix[4] = mifarekeyA[4] ^ uid[0];
-	mix[5] = mifarekeyA[5] ^ uid[1];
-	mix[6] = block ^ uid[2];
-	mix[7] = uid[3];
+    mix[4] = mifarekeyA[4] ^ uid[0];
+    mix[5] = mifarekeyA[5] ^ uid[1];
+    mix[6] = block ^ uid[2];
+    mix[7] = uid[3];
 
-	mbedtls_des3_context ctx;
-	mbedtls_des3_set2key_enc(&ctx, masterkey);
+    mbedtls_des3_context ctx;
+    mbedtls_des3_set2key_enc(&ctx, masterkey);
 
-	mbedtls_des3_crypt_cbc(&ctx  // des3_context
-		, MBEDTLS_DES_ENCRYPT    // int mode
-		, sizeof(mix)    // length
-		, iv             // iv[8]
-		, mix            // input
-		, divkey         // output
-		);
+    mbedtls_des3_crypt_cbc(&ctx  // des3_context
+        , MBEDTLS_DES_ENCRYPT    // int mode
+        , sizeof(mix)    // length
+        , iv             // iv[8]
+        , mix            // input
+        , divkey         // output
+        );
 
-	PrintAndLogEx(NORMAL, "-- 3DES version");
-	PrintAndLogEx(NORMAL, "Masterkey    :\t %s", sprint_hex(masterkey,sizeof(masterkey)));
-	PrintAndLogEx(NORMAL, "UID          :\t %s", sprint_hex(uid, sizeof(uid)));
-	PrintAndLogEx(NORMAL, "block        :\t %0d", block);
-	PrintAndLogEx(NORMAL, "Mifare key   :\t %s", sprint_hex(mifarekeyA, sizeof(mifarekeyA)));
-	PrintAndLogEx(NORMAL, "Message      :\t %s", sprint_hex(mix, sizeof(mix)));
-	PrintAndLogEx(NORMAL, "Diversified key: %s", sprint_hex(divkey+1, 6));
+    PrintAndLogEx(NORMAL, "-- 3DES version");
+    PrintAndLogEx(NORMAL, "Masterkey    :\t %s", sprint_hex(masterkey,sizeof(masterkey)));
+    PrintAndLogEx(NORMAL, "UID          :\t %s", sprint_hex(uid, sizeof(uid)));
+    PrintAndLogEx(NORMAL, "block        :\t %0d", block);
+    PrintAndLogEx(NORMAL, "Mifare key   :\t %s", sprint_hex(mifarekeyA, sizeof(mifarekeyA)));
+    PrintAndLogEx(NORMAL, "Message      :\t %s", sprint_hex(mix, sizeof(mix)));
+    PrintAndLogEx(NORMAL, "Diversified key: %s", sprint_hex(divkey+1, 6));
 
-	for (int i=0; i < sizeof(mifarekeyA); ++i){
-		dkeyA[i]  = (mifarekeyA[i] << 1) & 0xff;
-		dkeyA[6] |= ((mifarekeyA[i] >> 7) & 1) << (i+1);
-	}
+    for (int i=0; i < sizeof(mifarekeyA); ++i){
+        dkeyA[i]  = (mifarekeyA[i] << 1) & 0xff;
+        dkeyA[6] |= ((mifarekeyA[i] >> 7) & 1) << (i+1);
+    }
 
-	for (int i=0; i < sizeof(mifarekeyB); ++i){
-		dkeyB[1]  |= ((mifarekeyB[i] >> 7) & 1) << (i+1);
-		dkeyB[2+i] = (mifarekeyB[i] << 1) & 0xff;
-	}
+    for (int i=0; i < sizeof(mifarekeyB); ++i){
+        dkeyB[1]  |= ((mifarekeyB[i] >> 7) & 1) << (i+1);
+        dkeyB[2+i] = (mifarekeyB[i] << 1) & 0xff;
+    }
 
-	uint8_t zeros[8] = {0x00};
-	uint8_t newpwd[8] = {0x00};
-	uint8_t dmkey[24] = {0x00};
-	memcpy(dmkey, dkeyA, 8);
-	memcpy(dmkey+8, dkeyB, 8);
-	memcpy(dmkey+16, dkeyA, 8);
-	memset(iv, 0x00, 8);
+    uint8_t zeros[8] = {0x00};
+    uint8_t newpwd[8] = {0x00};
+    uint8_t dmkey[24] = {0x00};
+    memcpy(dmkey, dkeyA, 8);
+    memcpy(dmkey+8, dkeyB, 8);
+    memcpy(dmkey+16, dkeyA, 8);
+    memset(iv, 0x00, 8);
 
-	mbedtls_des3_set3key_enc(&ctx, dmkey);
+    mbedtls_des3_set3key_enc(&ctx, dmkey);
 
-	mbedtls_des3_crypt_cbc(&ctx  // des3_context
-		, MBEDTLS_DES_ENCRYPT    // int mode
-		, sizeof(newpwd) // length
-		, iv             // iv[8]
-		, zeros         // input
-		, newpwd         // output
-		);
+    mbedtls_des3_crypt_cbc(&ctx  // des3_context
+        , MBEDTLS_DES_ENCRYPT    // int mode
+        , sizeof(newpwd) // length
+        , iv             // iv[8]
+        , zeros         // input
+        , newpwd         // output
+        );
 
-	PrintAndLogEx(NORMAL, "\n-- DES version");
-	PrintAndLogEx(NORMAL, "Mifare dkeyA :\t %s", sprint_hex(dkeyA, sizeof(dkeyA)));
-	PrintAndLogEx(NORMAL, "Mifare dkeyB :\t %s", sprint_hex(dkeyB, sizeof(dkeyB)));
-	PrintAndLogEx(NORMAL, "Mifare ABA   :\t %s", sprint_hex(dmkey, sizeof(dmkey)));
-	PrintAndLogEx(NORMAL, "Mifare Pwd   :\t %s", sprint_hex(newpwd, sizeof(newpwd)));
+    PrintAndLogEx(NORMAL, "\n-- DES version");
+    PrintAndLogEx(NORMAL, "Mifare dkeyA :\t %s", sprint_hex(dkeyA, sizeof(dkeyA)));
+    PrintAndLogEx(NORMAL, "Mifare dkeyB :\t %s", sprint_hex(dkeyB, sizeof(dkeyB)));
+    PrintAndLogEx(NORMAL, "Mifare ABA   :\t %s", sprint_hex(dmkey, sizeof(dmkey)));
+    PrintAndLogEx(NORMAL, "Mifare Pwd   :\t %s", sprint_hex(newpwd, sizeof(newpwd)));
 
-	// next. from the diversify_key method.
-	return 0;
+    // next. from the diversify_key method.
+    return 0;
 }
 
 int CmdHF14AMfuPwdGen(const char *Cmd){
 
-	uint8_t uid[7] = {0x00};
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if (strlen(Cmd) == 0  || cmdp == 'h') return usage_hf_mfu_pwdgen();
+    uint8_t uid[7] = {0x00};
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) == 0  || cmdp == 'h') return usage_hf_mfu_pwdgen();
 
-	if (cmdp == 't') return ul_ev1_pwdgen_selftest();
+    if (cmdp == 't') return ul_ev1_pwdgen_selftest();
 
-	if ( cmdp == 'r') {
-			// read uid from tag
-		UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0}};
-		clearCommandBuffer();
-		SendCommand(&c);
-		UsbCommand resp;
-		WaitForResponse(CMD_ACK, &resp);
-		iso14a_card_select_t card;
-		memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
+    if ( cmdp == 'r') {
+            // read uid from tag
+        UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0}};
+        clearCommandBuffer();
+        SendCommand(&c);
+        UsbCommand resp;
+        WaitForResponse(CMD_ACK, &resp);
+        iso14a_card_select_t card;
+        memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
 
-		uint64_t select_status = resp.arg[0];
-		// 0: couldn't read
-		// 1: OK with ATS
-		// 2: OK, no ATS
-		// 3: proprietary Anticollision
-		if ( select_status == 0 ) {
-			PrintAndLogEx(WARNING, "iso14443a card select failed");
-			return 1;
-		}
-		if ( card.uidlen != 7 ) {
-			PrintAndLogEx(WARNING, "Wrong sized UID, expected 7bytes got %d", card.uidlen);
-			return 1;
-		}
-		memcpy(uid, card.uid, sizeof(uid));
-	}
-	else {
-		if (param_gethex(Cmd, 0, uid, 14)) return usage_hf_mfu_pwdgen();
-	}
+        uint64_t select_status = resp.arg[0];
+        // 0: couldn't read
+        // 1: OK with ATS
+        // 2: OK, no ATS
+        // 3: proprietary Anticollision
+        if ( select_status == 0 ) {
+            PrintAndLogEx(WARNING, "iso14443a card select failed");
+            return 1;
+        }
+        if ( card.uidlen != 7 ) {
+            PrintAndLogEx(WARNING, "Wrong sized UID, expected 7bytes got %d", card.uidlen);
+            return 1;
+        }
+        memcpy(uid, card.uid, sizeof(uid));
+    }
+    else {
+        if (param_gethex(Cmd, 0, uid, 14)) return usage_hf_mfu_pwdgen();
+    }
 
-	PrintAndLogEx(NORMAL, "---------------------------------");
-	PrintAndLogEx(NORMAL, " Using UID : %s", sprint_hex(uid, 7));
-	PrintAndLogEx(NORMAL, "---------------------------------");
-	PrintAndLogEx(NORMAL, " algo | pwd      | pack");
-	PrintAndLogEx(NORMAL, "------+----------+-----");
-	PrintAndLogEx(NORMAL, " EV1  | %08X | %04X", ul_ev1_pwdgenA(uid), ul_ev1_packgenA(uid));
-	PrintAndLogEx(NORMAL, " Ami  | %08X | %04X", ul_ev1_pwdgenB(uid), ul_ev1_packgenB(uid));
-	PrintAndLogEx(NORMAL, " LD   | %08X | %04X", ul_ev1_pwdgenC(uid), ul_ev1_packgenC(uid));
-	PrintAndLogEx(NORMAL, " XYZ  | %08X | %04X", ul_ev1_pwdgenD(uid), ul_ev1_packgenD(uid));
-	PrintAndLogEx(NORMAL, "------+----------+-----");
-	PrintAndLogEx(NORMAL, " Vingcard algo");
-	PrintAndLogEx(NORMAL, "--------------------");
-	return 0;
+    PrintAndLogEx(NORMAL, "---------------------------------");
+    PrintAndLogEx(NORMAL, " Using UID : %s", sprint_hex(uid, 7));
+    PrintAndLogEx(NORMAL, "---------------------------------");
+    PrintAndLogEx(NORMAL, " algo | pwd      | pack");
+    PrintAndLogEx(NORMAL, "------+----------+-----");
+    PrintAndLogEx(NORMAL, " EV1  | %08X | %04X", ul_ev1_pwdgenA(uid), ul_ev1_packgenA(uid));
+    PrintAndLogEx(NORMAL, " Ami  | %08X | %04X", ul_ev1_pwdgenB(uid), ul_ev1_packgenB(uid));
+    PrintAndLogEx(NORMAL, " LD   | %08X | %04X", ul_ev1_pwdgenC(uid), ul_ev1_packgenC(uid));
+    PrintAndLogEx(NORMAL, " XYZ  | %08X | %04X", ul_ev1_pwdgenD(uid), ul_ev1_packgenD(uid));
+    PrintAndLogEx(NORMAL, "------+----------+-----");
+    PrintAndLogEx(NORMAL, " Vingcard algo");
+    PrintAndLogEx(NORMAL, "--------------------");
+    return 0;
 }
 //------------------------------------
 // Menu Stuff
 //------------------------------------
 static command_t CommandTable[] = {
-	{"help",	CmdHelp,			1, "This help"},
-	{"dbg",		CmdHF14AMfDbg,		0, "Set default debug mode"},
-	{"info",	CmdHF14AMfUInfo,	0, "Tag information"},
-	{"dump",	CmdHF14AMfUDump,	0, "Dump Ultralight / Ultralight-C / NTAG tag to binary file"},
-	{"restore", CmdHF14AMfURestore, 0, "Restore a dump onto a MFU MAGIC tag"},
-	{"eload",	CmdHF14AMfUeLoad,   0, "load Ultralight .eml dump file into emulator memory"},
-	{"rdbl",	CmdHF14AMfURdBl,	0, "Read block"},
-	{"wrbl",	CmdHF14AMfUWrBl,	0, "Write block"},
-	{"cauth",	CmdHF14AMfucAuth,	0, "Authentication    - Ultralight C"},
-	{"setpwd",	CmdHF14AMfucSetPwd, 0, "Set 3des password - Ultralight-C"},
-	{"setuid",	CmdHF14AMfucSetUid, 0, "Set UID - MAGIC tags only"},
-	{"sim",		CmdHF14AMfUSim,     0, "Simulate Ultralight from emulator memory"},
-	{"gen",		CmdHF14AMfuGenDiverseKeys , 1, "Generate 3des mifare diversified keys"},
-	{"pwdgen",	CmdHF14AMfuPwdGen, 1, "Generate pwd from known algos"},
-	{NULL, NULL, 0, NULL}
+    {"help",    CmdHelp,            1, "This help"},
+    {"dbg",     CmdHF14AMfDbg,      0, "Set default debug mode"},
+    {"info",    CmdHF14AMfUInfo,    0, "Tag information"},
+    {"dump",    CmdHF14AMfUDump,    0, "Dump Ultralight / Ultralight-C / NTAG tag to binary file"},
+    {"restore", CmdHF14AMfURestore, 0, "Restore a dump onto a MFU MAGIC tag"},
+    {"eload",   CmdHF14AMfUeLoad,   0, "load Ultralight .eml dump file into emulator memory"},
+    {"rdbl",    CmdHF14AMfURdBl,    0, "Read block"},
+    {"wrbl",    CmdHF14AMfUWrBl,    0, "Write block"},
+    {"cauth",   CmdHF14AMfucAuth,   0, "Authentication    - Ultralight C"},
+    {"setpwd",  CmdHF14AMfucSetPwd, 0, "Set 3des password - Ultralight-C"},
+    {"setuid",  CmdHF14AMfucSetUid, 0, "Set UID - MAGIC tags only"},
+    {"sim",     CmdHF14AMfUSim,     0, "Simulate Ultralight from emulator memory"},
+    {"gen",     CmdHF14AMfuGenDiverseKeys , 1, "Generate 3des mifare diversified keys"},
+    {"pwdgen",  CmdHF14AMfuPwdGen,  1, "Generate pwd from known algos"},
+    {NULL, NULL, 0, NULL}
 };
 
 int CmdHFMFUltra(const char *Cmd){
-	clearCommandBuffer();
-	CmdsParse(CommandTable, Cmd);
-	return 0;
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
+    return 0;
 }
 
 int CmdHelp(const char *Cmd){
-	CmdsHelp(CommandTable);
-	return 0;
+    CmdsHelp(CommandTable);
+    return 0;
 }
diff --git a/client/cmdhfmfu.h b/client/cmdhfmfu.h
index 4a5528b83..16fa43001 100644
--- a/client/cmdhfmfu.h
+++ b/client/cmdhfmfu.h
@@ -15,14 +15,14 @@
 #define DUMP_PREFIX_LENGTH 48
 
 typedef struct {
-	uint8_t version[8];
-	uint8_t tbo[2];
-	uint8_t	tearing[3];
-	uint8_t	pack[2];
-	uint8_t tbo1[1];
-	uint8_t	signature[32];
-	//uint8_t	counter[3];
-	uint8_t data[1024];
+    uint8_t version[8];
+    uint8_t tbo[2];
+    uint8_t tearing[3];
+    uint8_t pack[2];
+    uint8_t tbo1[1];
+    uint8_t signature[32];
+    //uint8_t counter[3];
+    uint8_t data[1024];
 } mfu_dump_t;
 
 extern int CmdHF14AMfUWrBl(const char *Cmd);
@@ -76,36 +76,36 @@ uint16_t ul_ev1_packgen_VCNEW(uint8_t* uid, uint32_t pwd);
 uint32_t ul_ev1_otpgenA(uint8_t* uid);
 
 typedef enum TAGTYPE_UL {
-	UNKNOWN			= 0x000000,
-	UL				= 0x1,
-	UL_C			= 0x2,
-	UL_EV1_48		= 0x4,
-	UL_EV1_128		= 0x8,
-	NTAG			= 0x10,
-	NTAG_203		= 0x20,
-	NTAG_210		= 0x40,
-	NTAG_212		= 0x80,
-	NTAG_213		= 0x100,
-	NTAG_215		= 0x200,
-	NTAG_216		= 0x400,
-	MY_D			= 0x800,
-	MY_D_NFC		= 0x1000,
-	MY_D_MOVE		= 0x2000,
-	MY_D_MOVE_NFC	= 0x4000,
-	MY_D_MOVE_LEAN	= 0x8000,
-	NTAG_I2C_1K		= 0x10000,
-	NTAG_I2C_2K		= 0x20000,
-	NTAG_I2C_1K_PLUS	= 0x40000,
-	NTAG_I2C_2K_PLUS	= 0x80000,
-	FUDAN_UL		= 0x100000,
-	MAGIC			= 0x200000,
-	NTAG_213_F		= 0x400000,
-	NTAG_216_F		= 0x800000,
-	UL_EV1			= 0x1000000,
-	UL_NANO_40		= 0x2000000,
-	UL_MAGIC		= UL | MAGIC,
-	UL_C_MAGIC		= UL_C | MAGIC,
-	UL_ERROR		= 0xFFFFFF,
+    UNKNOWN          = 0x000000,
+    UL               = 0x1,
+    UL_C             = 0x2,
+    UL_EV1_48        = 0x4,
+    UL_EV1_128       = 0x8,
+    NTAG             = 0x10,
+    NTAG_203         = 0x20,
+    NTAG_210         = 0x40,
+    NTAG_212         = 0x80,
+    NTAG_213         = 0x100,
+    NTAG_215         = 0x200,
+    NTAG_216         = 0x400,
+    MY_D             = 0x800,
+    MY_D_NFC         = 0x1000,
+    MY_D_MOVE        = 0x2000,
+    MY_D_MOVE_NFC    = 0x4000,
+    MY_D_MOVE_LEAN   = 0x8000,
+    NTAG_I2C_1K      = 0x10000,
+    NTAG_I2C_2K      = 0x20000,
+    NTAG_I2C_1K_PLUS = 0x40000,
+    NTAG_I2C_2K_PLUS = 0x80000,
+    FUDAN_UL         = 0x100000,
+    MAGIC            = 0x200000,
+    NTAG_213_F       = 0x400000,
+    NTAG_216_F       = 0x800000,
+    UL_EV1           = 0x1000000,
+    UL_NANO_40       = 0x2000000,
+    UL_MAGIC         = UL | MAGIC,
+    UL_C_MAGIC       = UL_C | MAGIC,
+    UL_ERROR         = 0xFFFFFF,
 } TagTypeUL_t;
 
 #endif
diff --git a/client/cmdhftopaz.c b/client/cmdhftopaz.c
index 64d4a6f5b..d461cb2fa 100644
--- a/client/cmdhftopaz.c
+++ b/client/cmdhftopaz.c
@@ -9,229 +9,229 @@
 //-----------------------------------------------------------------------------
 #include "cmdhftopaz.h"
 
-#define TOPAZ_STATIC_MEMORY	(0x0f * 8)		// 15 blocks with 8 Bytes each
+#define TOPAZ_STATIC_MEMORY (0x0f * 8)  // 15 blocks with 8 Bytes each
 
 // a struct to describe a memory area which contains lock bits and the corresponding lockable memory area
 typedef struct dynamic_lock_area {
-	struct dynamic_lock_area *next;
-	uint16_t	byte_offset;			// the address of the lock bits
-	uint16_t	size_in_bits;
-	uint16_t	first_locked_byte;		// the address of the lockable area
-	uint16_t	bytes_locked_per_bit;
+    struct dynamic_lock_area *next;
+    uint16_t byte_offset;               // the address of the lock bits
+    uint16_t size_in_bits;
+    uint16_t first_locked_byte;         // the address of the lockable area
+    uint16_t bytes_locked_per_bit;
 } dynamic_lock_area_t;
 
 
 static struct {
-	uint8_t HR01[2];
-	uint8_t uid[7];
-	uint16_t size;
-	uint8_t data_blocks[TOPAZ_STATIC_MEMORY/8][8];	// this memory is always there
-	uint8_t *dynamic_memory;						// this memory can be there
-	dynamic_lock_area_t *dynamic_lock_areas;		// lock area descriptors
+    uint8_t HR01[2];
+    uint8_t uid[7];
+    uint16_t size;
+    uint8_t data_blocks[TOPAZ_STATIC_MEMORY/8][8]; // this memory is always there
+    uint8_t *dynamic_memory;                       // this memory can be there
+    dynamic_lock_area_t *dynamic_lock_areas;       // lock area descriptors
 } topaz_tag;
 
 static void topaz_switch_on_field(void) {
-	UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_SELECT | ISO14A_NO_DISCONNECT | ISO14A_TOPAZMODE | ISO14A_NO_RATS, 0, 0}};
-	SendCommand(&c);
+    UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_SELECT | ISO14A_NO_DISCONNECT | ISO14A_TOPAZMODE | ISO14A_NO_RATS, 0, 0}};
+    SendCommand(&c);
 }
 
 static void topaz_switch_off_field(void) {
-	UsbCommand c = {CMD_READER_ISO_14443a, {0, 0, 0}};
-	SendCommand(&c);
+    UsbCommand c = {CMD_READER_ISO_14443a, {0, 0, 0}};
+    SendCommand(&c);
 }
 
 // send a raw topaz command, returns the length of the response (0 in case of error)
 static int topaz_send_cmd_raw(uint8_t *cmd, uint8_t len, uint8_t *response) {
-	UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_NO_DISCONNECT | ISO14A_TOPAZMODE | ISO14A_NO_RATS, len, 0}};
-	memcpy(c.d.asBytes, cmd, len);
-	SendCommand(&c);
+    UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_NO_DISCONNECT | ISO14A_TOPAZMODE | ISO14A_NO_RATS, len, 0}};
+    memcpy(c.d.asBytes, cmd, len);
+    SendCommand(&c);
 
-	UsbCommand resp;
-	WaitForResponse(CMD_ACK, &resp);
+    UsbCommand resp;
+    WaitForResponse(CMD_ACK, &resp);
 
-	if (resp.arg[0] > 0) {
-		memcpy(response, resp.d.asBytes, resp.arg[0]);
-	}
+    if (resp.arg[0] > 0) {
+        memcpy(response, resp.d.asBytes, resp.arg[0]);
+    }
 
-	return resp.arg[0];
+    return resp.arg[0];
 }
 
 
 // calculate CRC bytes and send topaz command, returns the length of the response (0 in case of error)
 static int topaz_send_cmd(uint8_t *cmd, uint8_t len, uint8_t *response) {
-	if (len > 1) {
+    if (len > 1) {
         uint8_t b1, b2;
-		compute_crc(CRC_14443_B, cmd, len-2, &b1, &b2);
+        compute_crc(CRC_14443_B, cmd, len-2, &b1, &b2);
         cmd[len-2] = b1;
         cmd[len-1] = b2;
-	}
+    }
 
-	return topaz_send_cmd_raw(cmd, len, response);
+    return topaz_send_cmd_raw(cmd, len, response);
 }
 
 
 // select a topaz tag. Send WUPA and RID.
 static int topaz_select(uint8_t *atqa, uint8_t *rid_response) {
-	// ToDo: implement anticollision
+    // ToDo: implement anticollision
 
-	uint8_t wupa_cmd[] = {TOPAZ_WUPA};
-	uint8_t rid_cmd[] = {TOPAZ_RID, 0, 0, 0, 0, 0, 0, 0, 0};
+    uint8_t wupa_cmd[] = {TOPAZ_WUPA};
+    uint8_t rid_cmd[] = {TOPAZ_RID, 0, 0, 0, 0, 0, 0, 0, 0};
 
-	topaz_switch_on_field();
+    topaz_switch_on_field();
 
-	if (!topaz_send_cmd(wupa_cmd, sizeof(wupa_cmd), atqa)) {
-		topaz_switch_off_field();
-		return -1;		// WUPA failed
-	}
+    if (!topaz_send_cmd(wupa_cmd, sizeof(wupa_cmd), atqa)) {
+        topaz_switch_off_field();
+        return -1; // WUPA failed
+    }
 
-	if (!topaz_send_cmd(rid_cmd, sizeof(rid_cmd), rid_response)) {
-		topaz_switch_off_field();
-		return -2;		// RID failed
-	}
+    if (!topaz_send_cmd(rid_cmd, sizeof(rid_cmd), rid_response)) {
+        topaz_switch_off_field();
+        return -2; // RID failed
+    }
 
-	return 0;		// OK
+    return 0; // OK
 }
 
 
 // read all of the static memory of a selected Topaz tag.
 static int topaz_rall(uint8_t *uid, uint8_t *response) {
-	uint8_t rall_cmd[] = {TOPAZ_RALL, 0, 0, 0, 0, 0, 0, 0, 0};
+    uint8_t rall_cmd[] = {TOPAZ_RALL, 0, 0, 0, 0, 0, 0, 0, 0};
 
-	memcpy(&rall_cmd[3], uid, 4);
-	if (!topaz_send_cmd(rall_cmd, sizeof(rall_cmd), response)) {
-		topaz_switch_off_field();
-		return -1;		// RALL failed
-	}
+    memcpy(&rall_cmd[3], uid, 4);
+    if (!topaz_send_cmd(rall_cmd, sizeof(rall_cmd), response)) {
+        topaz_switch_off_field();
+        return -1; // RALL failed
+    }
 
-	return 0;
+    return 0;
 }
 
 
 // read a block (8 Bytes) of a selected Topaz tag.
 static int topaz_read_block(uint8_t *uid, uint8_t blockno, uint8_t *block_data)
 {
-	uint8_t read8_cmd[] = {TOPAZ_READ8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-	uint8_t read8_response[11];
+    uint8_t read8_cmd[] = {TOPAZ_READ8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+    uint8_t read8_response[11];
 
-	read8_cmd[1] = blockno;
-	memcpy(&read8_cmd[10], uid, 4);
-	if (!topaz_send_cmd(read8_cmd, sizeof(read8_cmd), read8_response)) {
-		topaz_switch_off_field();
-		return -1;		// READ8 failed
-	}
-	memcpy(block_data, &read8_response[1], 8);
-	return 0;
+    read8_cmd[1] = blockno;
+    memcpy(&read8_cmd[10], uid, 4);
+    if (!topaz_send_cmd(read8_cmd, sizeof(read8_cmd), read8_response)) {
+        topaz_switch_off_field();
+        return -1; // READ8 failed
+    }
+    memcpy(block_data, &read8_response[1], 8);
+    return 0;
 }
 
 // read a segment (16 blocks = 128 Bytes) of a selected Topaz tag. Works only for tags with dynamic memory.
 static int topaz_read_segment(uint8_t *uid, uint8_t segno, uint8_t *segment_data) {
-	uint8_t rseg_cmd[] = {TOPAZ_RSEG, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-	uint8_t rseg_response[131];
+    uint8_t rseg_cmd[] = {TOPAZ_RSEG, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+    uint8_t rseg_response[131];
 
-	rseg_cmd[1] = segno << 4;
-	memcpy(&rseg_cmd[10], uid, 4);
-	if (!topaz_send_cmd(rseg_cmd, sizeof(rseg_cmd), rseg_response)) {
-		topaz_switch_off_field();
-		return -1;		// RSEG failed
-	}
-	memcpy(segment_data, &rseg_response[1], 128);
-	return 0;
+    rseg_cmd[1] = segno << 4;
+    memcpy(&rseg_cmd[10], uid, 4);
+    if (!topaz_send_cmd(rseg_cmd, sizeof(rseg_cmd), rseg_response)) {
+        topaz_switch_off_field();
+        return -1; // RSEG failed
+    }
+    memcpy(segment_data, &rseg_response[1], 128);
+    return 0;
 }
 
 // search for the lock area descriptor for the lockable area including byteno
 static dynamic_lock_area_t *get_dynamic_lock_area(uint16_t byteno) {
-	dynamic_lock_area_t *lock_area;
-	lock_area = topaz_tag.dynamic_lock_areas;
+    dynamic_lock_area_t *lock_area;
+    lock_area = topaz_tag.dynamic_lock_areas;
 
-	while (lock_area != NULL) {
-		if (byteno < lock_area->first_locked_byte) {
-			lock_area = lock_area->next;
-		} else {
-			return lock_area;
-		}
-	}
-	return NULL;
+    while (lock_area != NULL) {
+        if (byteno < lock_area->first_locked_byte) {
+            lock_area = lock_area->next;
+        } else {
+            return lock_area;
+        }
+    }
+    return NULL;
 }
 
 // check if a memory byte is locked.
 static bool topaz_byte_is_locked(uint16_t byteno) {
-	uint8_t *lockbits;
-	uint16_t locked_bytes_per_bit;
-	dynamic_lock_area_t *lock_area;
+    uint8_t *lockbits;
+    uint16_t locked_bytes_per_bit;
+    dynamic_lock_area_t *lock_area;
 
-	if (byteno < TOPAZ_STATIC_MEMORY) {
-		lockbits = &topaz_tag.data_blocks[0x0e][0];
-		locked_bytes_per_bit = 8;
-	} else {
-		lock_area = get_dynamic_lock_area(byteno);
-		if (lock_area == NULL) {
-			return false;
-		} else {
-			lockbits = &topaz_tag.dynamic_memory[lock_area->byte_offset - TOPAZ_STATIC_MEMORY];
-			locked_bytes_per_bit = lock_area->bytes_locked_per_bit;
-			byteno = byteno - lock_area->first_locked_byte;
-		}
-	}
+    if (byteno < TOPAZ_STATIC_MEMORY) {
+        lockbits = &topaz_tag.data_blocks[0x0e][0];
+        locked_bytes_per_bit = 8;
+    } else {
+        lock_area = get_dynamic_lock_area(byteno);
+        if (lock_area == NULL) {
+            return false;
+        } else {
+            lockbits = &topaz_tag.dynamic_memory[lock_area->byte_offset - TOPAZ_STATIC_MEMORY];
+            locked_bytes_per_bit = lock_area->bytes_locked_per_bit;
+            byteno = byteno - lock_area->first_locked_byte;
+        }
+    }
 
-	uint16_t blockno = byteno / locked_bytes_per_bit;
-	if(lockbits[blockno/8] & (0x01 << (blockno % 8))) {
-		return true;
-	} else {
-		return false;
-	}
+    uint16_t blockno = byteno / locked_bytes_per_bit;
+    if(lockbits[blockno/8] & (0x01 << (blockno % 8))) {
+        return true;
+    } else {
+        return false;
+    }
 }
 
 
 // read and print the Capability Container
 static int topaz_print_CC(uint8_t *data) {
-	if (data[0] != 0xe1) {
-		topaz_tag.size = TOPAZ_STATIC_MEMORY;
-		return -1;		// no NDEF message
-	}
+    if (data[0] != 0xe1) {
+        topaz_tag.size = TOPAZ_STATIC_MEMORY;
+        return -1; // no NDEF message
+    }
 
-	PrintAndLogEx(NORMAL, "Capability Container: %02x %02x %02x %02x", data[0], data[1], data[2], data[3]);
-	PrintAndLogEx(NORMAL, "  %02x: NDEF Magic Number", data[0]);
-	PrintAndLogEx(NORMAL, "  %02x: version %d.%d supported by tag", data[1], (data[1] & 0xF0) >> 4, data[1] & 0x0f);
-	uint16_t memsize = (data[2] + 1) * 8;
-	topaz_tag.size = memsize;
-	topaz_tag.dynamic_memory = calloc(memsize - TOPAZ_STATIC_MEMORY, sizeof(uint8_t));
-	PrintAndLogEx(NORMAL, "  %02x: Physical Memory Size of this tag: %d bytes", data[2], memsize);
-	PrintAndLogEx(NORMAL, "  %02x: %s / %s", data[3],
-				(data[3] & 0xF0) ? "(RFU)" : "Read access granted without any security",
-				(data[3] & 0x0F)==0 ? "Write access granted without any security" : (data[3] & 0x0F)==0x0F ? "No write access granted at all" : "(RFU)");
-	return 0;
+    PrintAndLogEx(NORMAL, "Capability Container: %02x %02x %02x %02x", data[0], data[1], data[2], data[3]);
+    PrintAndLogEx(NORMAL, "  %02x: NDEF Magic Number", data[0]);
+    PrintAndLogEx(NORMAL, "  %02x: version %d.%d supported by tag", data[1], (data[1] & 0xF0) >> 4, data[1] & 0x0f);
+    uint16_t memsize = (data[2] + 1) * 8;
+    topaz_tag.size = memsize;
+    topaz_tag.dynamic_memory = calloc(memsize - TOPAZ_STATIC_MEMORY, sizeof(uint8_t));
+    PrintAndLogEx(NORMAL, "  %02x: Physical Memory Size of this tag: %d bytes", data[2], memsize);
+    PrintAndLogEx(NORMAL, "  %02x: %s / %s", data[3],
+                (data[3] & 0xF0) ? "(RFU)" : "Read access granted without any security",
+                (data[3] & 0x0F)==0 ? "Write access granted without any security" : (data[3] & 0x0F)==0x0F ? "No write access granted at all" : "(RFU)");
+    return 0;
 }
 
 
 // return type, length and value of a TLV, starting at memory position *TLV_ptr
 static void get_TLV(uint8_t **TLV_ptr, uint8_t *TLV_type, uint16_t *TLV_length, uint8_t **TLV_value) {
-	*TLV_length = 0;
-	*TLV_value = NULL;
+    *TLV_length = 0;
+    *TLV_value = NULL;
 
-	*TLV_type = **TLV_ptr;
-	*TLV_ptr += 1;
-	switch (*TLV_type) {
-		case 0x00:			// NULL TLV.
-		case 0xFE:			// Terminator TLV.
-			break;
-		case 0x01:			// Lock Control TLV
-		case 0x02:			// Reserved Memory TLV
-		case 0x03:			// NDEF message TLV
-		case 0xFD:			// proprietary TLV
-			*TLV_length = **TLV_ptr;
-			*TLV_ptr += 1;
-			if (*TLV_length == 0xff) {
-				*TLV_length = **TLV_ptr << 8;
-				*TLV_ptr += 1;
-				*TLV_length |= **TLV_ptr;
-				*TLV_ptr += 1;
-			}
-			*TLV_value = *TLV_ptr;
-			*TLV_ptr += *TLV_length;
-			break;
-		default:			// RFU
-			break;
-	}
+    *TLV_type = **TLV_ptr;
+    *TLV_ptr += 1;
+    switch (*TLV_type) {
+        case 0x00:          // NULL TLV.
+        case 0xFE:          // Terminator TLV.
+            break;
+        case 0x01:          // Lock Control TLV
+        case 0x02:          // Reserved Memory TLV
+        case 0x03:          // NDEF message TLV
+        case 0xFD:          // proprietary TLV
+            *TLV_length = **TLV_ptr;
+            *TLV_ptr += 1;
+            if (*TLV_length == 0xff) {
+                *TLV_length = **TLV_ptr << 8;
+                *TLV_ptr += 1;
+                *TLV_length |= **TLV_ptr;
+                *TLV_ptr += 1;
+            }
+            *TLV_value = *TLV_ptr;
+            *TLV_ptr += *TLV_length;
+            break;
+        default:            // RFU
+            break;
+    }
 }
 
 
@@ -239,291 +239,291 @@ static void get_TLV(uint8_t **TLV_ptr, uint8_t *TLV_type, uint16_t *TLV_length,
 // do not include the lock bits and reserved memory. We therefore need to adjust the start of the
 // respective lockable areas accordingly
 static void adjust_lock_areas(uint16_t block_start, uint16_t block_size) {
-	dynamic_lock_area_t *lock_area = topaz_tag.dynamic_lock_areas;
-	while (lock_area != NULL) {
-		if (lock_area->first_locked_byte <= block_start) {
-			lock_area->first_locked_byte += block_size;
-		}
-		lock_area = lock_area->next;
-	}
+    dynamic_lock_area_t *lock_area = topaz_tag.dynamic_lock_areas;
+    while (lock_area != NULL) {
+        if (lock_area->first_locked_byte <= block_start) {
+            lock_area->first_locked_byte += block_size;
+        }
+        lock_area = lock_area->next;
+    }
 }
 
 
 // read and print the lock area and reserved memory TLVs
 static void topaz_print_control_TLVs(uint8_t *memory) {
-	uint8_t *TLV_ptr = memory;
-	uint8_t TLV_type = 0;
-	uint16_t TLV_length;
-	uint8_t *TLV_value;
-	bool lock_TLV_present = false;
-	bool reserved_memory_control_TLV_present = false;
-	uint16_t next_lockable_byte = 0x0f * 8;				// first byte after static memory area
+    uint8_t *TLV_ptr = memory;
+    uint8_t TLV_type = 0;
+    uint16_t TLV_length;
+    uint8_t *TLV_value;
+    bool lock_TLV_present = false;
+    bool reserved_memory_control_TLV_present = false;
+    uint16_t next_lockable_byte = 0x0f * 8; // first byte after static memory area
 
-	while (*TLV_ptr != 0x03 && *TLV_ptr != 0xFD && *TLV_ptr != 0xFE) {
-		// all Lock Control TLVs shall be present before the NDEF message TLV, the proprietary TLV (and the Terminator TLV)
-		get_TLV(&TLV_ptr, &TLV_type, &TLV_length, &TLV_value);
-		if (TLV_type == 0x01) {			// a Lock Control TLV
-			uint8_t pages_addr = TLV_value[0] >> 4;
-			uint8_t byte_offset = TLV_value[0] & 0x0f;
-			uint16_t size_in_bits = TLV_value[1] ? TLV_value[1] : 256;
-			uint16_t size_in_bytes = (size_in_bits + 7)/8;
-			uint16_t bytes_per_page = 1 << (TLV_value[2] & 0x0f);
-			uint16_t bytes_locked_per_bit = 1 << (TLV_value[2] >> 4);
-			uint16_t area_start = pages_addr * bytes_per_page + byte_offset;
-			PrintAndLogEx(NORMAL, "Lock Area of %d bits at byte offset 0x%04x. Each Lock Bit locks %d bytes.",
-						size_in_bits,
-						area_start,
-						bytes_locked_per_bit);
-			lock_TLV_present = true;
-			dynamic_lock_area_t *old = topaz_tag.dynamic_lock_areas;
-			dynamic_lock_area_t *new = topaz_tag.dynamic_lock_areas;
-			if (old == NULL) {
-				new = topaz_tag.dynamic_lock_areas = (dynamic_lock_area_t *) calloc(sizeof(dynamic_lock_area_t) , sizeof(uint8_t));
-			} else {
-				while(old->next != NULL) {
-					old = old->next;
-				}
-				new = old->next = (dynamic_lock_area_t *) calloc(sizeof(dynamic_lock_area_t), sizeof(uint8_t));
-			}
-			new->next = NULL;
-			if (area_start <= next_lockable_byte) {
-				// lock areas are not lockable
-				next_lockable_byte += size_in_bytes;
-			}
-			new->first_locked_byte = next_lockable_byte;
-			new->byte_offset = area_start;
-			new->size_in_bits = size_in_bits;
-			new->bytes_locked_per_bit = bytes_locked_per_bit;
-			next_lockable_byte += size_in_bits * bytes_locked_per_bit;
-		}
-		if (TLV_type == 0x02) {			// a Reserved Memory Control TLV
-			uint8_t pages_addr = TLV_value[0] >> 4;
-			uint8_t byte_offset = TLV_value[0] & 0x0f;
-			uint16_t size_in_bytes = TLV_value[1] ? TLV_value[1] : 256;
-			uint8_t bytes_per_page = 1 << (TLV_value[2] & 0x0f);
-			uint16_t area_start = pages_addr * bytes_per_page + byte_offset;
-			PrintAndLogEx(NORMAL, "Reserved Memory of %d bytes at byte offset 0x%02x.",
-						size_in_bytes,
-						area_start);
-			reserved_memory_control_TLV_present = true;
-			adjust_lock_areas(area_start, size_in_bytes);  // reserved memory areas are not lockable
-			if (area_start <= next_lockable_byte) {
-				next_lockable_byte += size_in_bytes;
-			}
-		}
-	}
+    while (*TLV_ptr != 0x03 && *TLV_ptr != 0xFD && *TLV_ptr != 0xFE) {
+        // all Lock Control TLVs shall be present before the NDEF message TLV, the proprietary TLV (and the Terminator TLV)
+        get_TLV(&TLV_ptr, &TLV_type, &TLV_length, &TLV_value);
+        if (TLV_type == 0x01) { // a Lock Control TLV
+            uint8_t pages_addr = TLV_value[0] >> 4;
+            uint8_t byte_offset = TLV_value[0] & 0x0f;
+            uint16_t size_in_bits = TLV_value[1] ? TLV_value[1] : 256;
+            uint16_t size_in_bytes = (size_in_bits + 7)/8;
+            uint16_t bytes_per_page = 1 << (TLV_value[2] & 0x0f);
+            uint16_t bytes_locked_per_bit = 1 << (TLV_value[2] >> 4);
+            uint16_t area_start = pages_addr * bytes_per_page + byte_offset;
+            PrintAndLogEx(NORMAL, "Lock Area of %d bits at byte offset 0x%04x. Each Lock Bit locks %d bytes.",
+                        size_in_bits,
+                        area_start,
+                        bytes_locked_per_bit);
+            lock_TLV_present = true;
+            dynamic_lock_area_t *old = topaz_tag.dynamic_lock_areas;
+            dynamic_lock_area_t *new = topaz_tag.dynamic_lock_areas;
+            if (old == NULL) {
+                new = topaz_tag.dynamic_lock_areas = (dynamic_lock_area_t *) calloc(sizeof(dynamic_lock_area_t) , sizeof(uint8_t));
+            } else {
+                while(old->next != NULL) {
+                    old = old->next;
+                }
+                new = old->next = (dynamic_lock_area_t *) calloc(sizeof(dynamic_lock_area_t), sizeof(uint8_t));
+            }
+            new->next = NULL;
+            if (area_start <= next_lockable_byte) {
+                // lock areas are not lockable
+                next_lockable_byte += size_in_bytes;
+            }
+            new->first_locked_byte = next_lockable_byte;
+            new->byte_offset = area_start;
+            new->size_in_bits = size_in_bits;
+            new->bytes_locked_per_bit = bytes_locked_per_bit;
+            next_lockable_byte += size_in_bits * bytes_locked_per_bit;
+        }
+        if (TLV_type == 0x02) { // a Reserved Memory Control TLV
+            uint8_t pages_addr = TLV_value[0] >> 4;
+            uint8_t byte_offset = TLV_value[0] & 0x0f;
+            uint16_t size_in_bytes = TLV_value[1] ? TLV_value[1] : 256;
+            uint8_t bytes_per_page = 1 << (TLV_value[2] & 0x0f);
+            uint16_t area_start = pages_addr * bytes_per_page + byte_offset;
+            PrintAndLogEx(NORMAL, "Reserved Memory of %d bytes at byte offset 0x%02x.",
+                        size_in_bytes,
+                        area_start);
+            reserved_memory_control_TLV_present = true;
+            adjust_lock_areas(area_start, size_in_bytes);  // reserved memory areas are not lockable
+            if (area_start <= next_lockable_byte) {
+                next_lockable_byte += size_in_bytes;
+            }
+        }
+    }
 
-	if (!lock_TLV_present) {
-		PrintAndLogEx(NORMAL, "(No Lock Control TLV present)");
-	}
+    if (!lock_TLV_present) {
+        PrintAndLogEx(NORMAL, "(No Lock Control TLV present)");
+    }
 
-	if (!reserved_memory_control_TLV_present) {
-		PrintAndLogEx(NORMAL, "(No Reserved Memory Control TLV present)");
-	}
+    if (!reserved_memory_control_TLV_present) {
+        PrintAndLogEx(NORMAL, "(No Reserved Memory Control TLV present)");
+    }
 }
 
 // read all of the dynamic memory
 static int topaz_read_dynamic_data(void){
-	// first read the remaining block of segment 0
-	if (topaz_read_block(topaz_tag.uid, 0x0f, &topaz_tag.dynamic_memory[0]) == -1) {
-		PrintAndLogEx(WARNING, "Error while reading dynamic memory block %02x. Aborting...", 0x0f);
-		return -1;
-	}
+    // first read the remaining block of segment 0
+    if (topaz_read_block(topaz_tag.uid, 0x0f, &topaz_tag.dynamic_memory[0]) == -1) {
+        PrintAndLogEx(WARNING, "Error while reading dynamic memory block %02x. Aborting...", 0x0f);
+        return -1;
+    }
 
-	// read the remaining segments
-	uint8_t max_segment = topaz_tag.size / 128 - 1;
-	for (uint8_t segment = 1; segment <= max_segment; segment++) {
-		if (topaz_read_segment(topaz_tag.uid, segment, &topaz_tag.dynamic_memory[(segment-1)*128+8]) == -1) {
-			PrintAndLogEx(WARNING, "Error while reading dynamic memory block %02x. Aborting...", 0x0f);
-			return -1;
-		}
-	}
-	return 0;
+    // read the remaining segments
+    uint8_t max_segment = topaz_tag.size / 128 - 1;
+    for (uint8_t segment = 1; segment <= max_segment; segment++) {
+        if (topaz_read_segment(topaz_tag.uid, segment, &topaz_tag.dynamic_memory[(segment-1)*128+8]) == -1) {
+            PrintAndLogEx(WARNING, "Error while reading dynamic memory block %02x. Aborting...", 0x0f);
+            return -1;
+        }
+    }
+    return 0;
 }
 
 
 // read and print the dynamic memory
 static void topaz_print_dynamic_data(void) {
-	if (topaz_tag.size > TOPAZ_STATIC_MEMORY) {
-		PrintAndLogEx(NORMAL, "Dynamic Data blocks:");
-		if (topaz_read_dynamic_data() == 0) {
-			PrintAndLogEx(NORMAL, "block# | offset | Data                    | Locked(y/n)");
-			char line[80];
-			for (uint16_t blockno = 0x0f; blockno < topaz_tag.size/8; blockno++) {
-				uint8_t *block_data = &topaz_tag.dynamic_memory[(blockno-0x0f)*8];
-				char lockbits[9];
-				for (uint16_t j = 0; j < 8; j++) {
-					sprintf(&line[3*j], "%02x ", block_data[j]);
-					lockbits[j] = topaz_byte_is_locked(blockno*8+j) ? 'y' : 'n';
-				}
-				lockbits[8] = '\0';
-				PrintAndLogEx(NORMAL, "  0x%02x | 0x%04x | %s|   %-3s", blockno, blockno*8, line, lockbits);
-			}
-		}
-	}
+    if (topaz_tag.size > TOPAZ_STATIC_MEMORY) {
+        PrintAndLogEx(NORMAL, "Dynamic Data blocks:");
+        if (topaz_read_dynamic_data() == 0) {
+            PrintAndLogEx(NORMAL, "block# | offset | Data                    | Locked(y/n)");
+            char line[80];
+            for (uint16_t blockno = 0x0f; blockno < topaz_tag.size/8; blockno++) {
+                uint8_t *block_data = &topaz_tag.dynamic_memory[(blockno-0x0f)*8];
+                char lockbits[9];
+                for (uint16_t j = 0; j < 8; j++) {
+                    sprintf(&line[3*j], "%02x ", block_data[j]);
+                    lockbits[j] = topaz_byte_is_locked(blockno*8+j) ? 'y' : 'n';
+                }
+                lockbits[8] = '\0';
+                PrintAndLogEx(NORMAL, "  0x%02x | 0x%04x | %s|   %-3s", blockno, blockno*8, line, lockbits);
+            }
+        }
+    }
 }
 
 static void topaz_print_lifecycle_state(uint8_t *data) {
-	// to be done
+    // to be done
 }
 
 static void topaz_print_NDEF(uint8_t *data) {
-	// to be done.
+    // to be done.
 }
 
 // read a Topaz tag and print some useful information
 int CmdHFTopazReader(const char *Cmd) {
-	int status;
-	uint8_t atqa[2];
-	uint8_t rid_response[8];
-	uint8_t *uid_echo = &rid_response[2];
-	uint8_t rall_response[124];
-	bool verbose = true;
+    int status;
+    uint8_t atqa[2];
+    uint8_t rid_response[8];
+    uint8_t *uid_echo = &rid_response[2];
+    uint8_t rall_response[124];
+    bool verbose = true;
 
-	char ctmp = param_getchar(Cmd, 0);
-	if ( ctmp == 'S' || ctmp == 's') verbose = false;
+    char ctmp = param_getchar(Cmd, 0);
+    if ( ctmp == 'S' || ctmp == 's') verbose = false;
 
-	status = topaz_select(atqa, rid_response);
+    status = topaz_select(atqa, rid_response);
 
-	if (status == -1) {
-		if (verbose) PrintAndLogEx(WARNING, "Error: couldn't receive ATQA");
-		return -1;
-	}
+    if (status == -1) {
+        if (verbose) PrintAndLogEx(WARNING, "Error: couldn't receive ATQA");
+        return -1;
+    }
 
-	PrintAndLogEx(NORMAL, "ATQA : %02x %02x", atqa[1], atqa[0]);
-	if (atqa[1] != 0x0c && atqa[0] != 0x00) {
-		PrintAndLogEx(NORMAL, "Tag doesn't support the Topaz protocol.");
-		topaz_switch_off_field();
-		return -1;
-	}
+    PrintAndLogEx(NORMAL, "ATQA : %02x %02x", atqa[1], atqa[0]);
+    if (atqa[1] != 0x0c && atqa[0] != 0x00) {
+        PrintAndLogEx(NORMAL, "Tag doesn't support the Topaz protocol.");
+        topaz_switch_off_field();
+        return -1;
+    }
 
-	if (status == -2) {
-		PrintAndLogEx(WARNING, "Error: tag didn't answer to RID");
-		topaz_switch_off_field();
-		return -1;
-	}
+    if (status == -2) {
+        PrintAndLogEx(WARNING, "Error: tag didn't answer to RID");
+        topaz_switch_off_field();
+        return -1;
+    }
 
-	topaz_tag.HR01[0] = rid_response[0];
-	topaz_tag.HR01[1] = rid_response[1];
+    topaz_tag.HR01[0] = rid_response[0];
+    topaz_tag.HR01[1] = rid_response[1];
 
-	// ToDo: CRC check
-	PrintAndLogEx(NORMAL, "HR0  : %02x (%sa Topaz tag (%scapable of carrying a NDEF message), %s memory map)", rid_response[0],
-						(rid_response[0] & 0xF0) == 0x10 ? "" : "not ",
-						(rid_response[0] & 0xF0) == 0x10 ? "" : "not ",
-						(rid_response[0] & 0x0F) == 0x01 ? "static" : "dynamic");
-	PrintAndLogEx(NORMAL, "HR1  : %02x", rid_response[1]);
+    // ToDo: CRC check
+    PrintAndLogEx(NORMAL, "HR0  : %02x (%sa Topaz tag (%scapable of carrying a NDEF message), %s memory map)", rid_response[0],
+                        (rid_response[0] & 0xF0) == 0x10 ? "" : "not ",
+                        (rid_response[0] & 0xF0) == 0x10 ? "" : "not ",
+                        (rid_response[0] & 0x0F) == 0x01 ? "static" : "dynamic");
+    PrintAndLogEx(NORMAL, "HR1  : %02x", rid_response[1]);
 
-	status = topaz_rall(uid_echo, rall_response);
+    status = topaz_rall(uid_echo, rall_response);
 
-	if (status == -1) {
-		PrintAndLogEx(WARNING, "Error: tag didn't answer to RALL");
-		topaz_switch_off_field();
-		return -1;
-	}
+    if (status == -1) {
+        PrintAndLogEx(WARNING, "Error: tag didn't answer to RALL");
+        topaz_switch_off_field();
+        return -1;
+    }
 
-	memcpy(topaz_tag.uid, rall_response+2, 7);
-	PrintAndLogEx(NORMAL, "UID  : %02x %02x %02x %02x %02x %02x %02x",
-			topaz_tag.uid[6],
-			topaz_tag.uid[5],
-			topaz_tag.uid[4],
-			topaz_tag.uid[3],
-			topaz_tag.uid[2],
-			topaz_tag.uid[1],
-			topaz_tag.uid[0]);
+    memcpy(topaz_tag.uid, rall_response+2, 7);
+    PrintAndLogEx(NORMAL, "UID  : %02x %02x %02x %02x %02x %02x %02x",
+            topaz_tag.uid[6],
+            topaz_tag.uid[5],
+            topaz_tag.uid[4],
+            topaz_tag.uid[3],
+            topaz_tag.uid[2],
+            topaz_tag.uid[1],
+            topaz_tag.uid[0]);
 
-	PrintAndLogEx(NORMAL, "       UID[6] (Manufacturer Byte) = %02x, Manufacturer: %s",
-			topaz_tag.uid[6],
-			getTagInfo(topaz_tag.uid[6]));
+    PrintAndLogEx(NORMAL, "       UID[6] (Manufacturer Byte) = %02x, Manufacturer: %s",
+            topaz_tag.uid[6],
+            getTagInfo(topaz_tag.uid[6]));
 
-	memcpy(topaz_tag.data_blocks, rall_response+2, 0x0f*8);
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Static Data blocks 00 to 0c:");
-	PrintAndLogEx(NORMAL, "block# | offset | Data                    | Locked");
-	char line[80];
-	for (uint16_t i = 0; i <= 0x0c; i++) {
-		char lockbits[9];
-		for (uint16_t j = 0; j < 8; j++) {
-			sprintf(&line[3*j], "%02x ", topaz_tag.data_blocks[i][j] /*rall_response[2 + 8*i + j]*/);
-			lockbits[j] = topaz_byte_is_locked(i*8+j) ? 'y' : 'n';
-		}
-		lockbits[8] = '\0';
-		PrintAndLogEx(NORMAL, "  0x%02x | 0x%02x | %s|   %-3s", i, i*8, line, lockbits);
-	}
+    memcpy(topaz_tag.data_blocks, rall_response+2, 0x0f*8);
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Static Data blocks 00 to 0c:");
+    PrintAndLogEx(NORMAL, "block# | offset | Data                    | Locked");
+    char line[80];
+    for (uint16_t i = 0; i <= 0x0c; i++) {
+        char lockbits[9];
+        for (uint16_t j = 0; j < 8; j++) {
+            sprintf(&line[3*j], "%02x ", topaz_tag.data_blocks[i][j] /*rall_response[2 + 8*i + j]*/);
+            lockbits[j] = topaz_byte_is_locked(i*8+j) ? 'y' : 'n';
+        }
+        lockbits[8] = '\0';
+        PrintAndLogEx(NORMAL, "  0x%02x | 0x%02x | %s|   %-3s", i, i*8, line, lockbits);
+    }
 
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Static Reserved block 0d:");
-	for (uint16_t j = 0; j < 8; j++) {
-		sprintf(&line[3*j], "%02x ", topaz_tag.data_blocks[0x0d][j]);
-	}
-	PrintAndLogEx(NORMAL, "  0x%02x |  0x%02x  | %s|   %-3s", 0x0d, 0x0d*8, line, "n/a");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Static Reserved block 0d:");
+    for (uint16_t j = 0; j < 8; j++) {
+        sprintf(&line[3*j], "%02x ", topaz_tag.data_blocks[0x0d][j]);
+    }
+    PrintAndLogEx(NORMAL, "  0x%02x |  0x%02x  | %s|   %-3s", 0x0d, 0x0d*8, line, "n/a");
 
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Static Lockbits and OTP Bytes:");
-	for (uint16_t j = 0; j < 8; j++) {
-		sprintf(&line[3*j], "%02x ", topaz_tag.data_blocks[0x0e][j]);
-	}
-	PrintAndLogEx(NORMAL, "  0x%02x |  0x%02x  | %s|   %-3s", 0x0e, 0x0e*8, line, "n/a");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Static Lockbits and OTP Bytes:");
+    for (uint16_t j = 0; j < 8; j++) {
+        sprintf(&line[3*j], "%02x ", topaz_tag.data_blocks[0x0e][j]);
+    }
+    PrintAndLogEx(NORMAL, "  0x%02x |  0x%02x  | %s|   %-3s", 0x0e, 0x0e*8, line, "n/a");
 
-	PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "");
 
-	status = topaz_print_CC(&topaz_tag.data_blocks[1][0]);
+    status = topaz_print_CC(&topaz_tag.data_blocks[1][0]);
 
-	if (status == -1) {
-		PrintAndLogEx(NORMAL, "No NDEF message data present");
-		topaz_switch_off_field();
-		return 0;
-	}
+    if (status == -1) {
+        PrintAndLogEx(NORMAL, "No NDEF message data present");
+        topaz_switch_off_field();
+        return 0;
+    }
 
-	PrintAndLogEx(NORMAL, "");
-	topaz_print_control_TLVs(&topaz_tag.data_blocks[1][4]);
+    PrintAndLogEx(NORMAL, "");
+    topaz_print_control_TLVs(&topaz_tag.data_blocks[1][4]);
 
-	PrintAndLogEx(NORMAL, "");
-	topaz_print_dynamic_data();
+    PrintAndLogEx(NORMAL, "");
+    topaz_print_dynamic_data();
 
-	topaz_print_lifecycle_state(&topaz_tag.data_blocks[1][0]);
+    topaz_print_lifecycle_state(&topaz_tag.data_blocks[1][0]);
 
-	topaz_print_NDEF(&topaz_tag.data_blocks[1][0]);
+    topaz_print_NDEF(&topaz_tag.data_blocks[1][0]);
 
-	topaz_switch_off_field();
-	return 0;
+    topaz_switch_off_field();
+    return 0;
 }
 
 int CmdHFTopazSim(const char *Cmd) {
-	PrintAndLogEx(NORMAL, "not yet implemented");
-	return 0;
+    PrintAndLogEx(NORMAL, "not yet implemented");
+    return 0;
 }
 
 int CmdHFTopazCmdRaw(const char *Cmd) {
-	PrintAndLogEx(NORMAL, "not yet implemented. Use hf 14 raw with option -T.");
-	return 0;
+    PrintAndLogEx(NORMAL, "not yet implemented. Use hf 14 raw with option -T.");
+    return 0;
 }
 
 int CmdHFTopazList(const char *Cmd) {
-	CmdTraceList("topaz");
-	return 0;
+    CmdTraceList("topaz");
+    return 0;
 }
 
 static int CmdHelp(const char *Cmd);
 
 static command_t CommandTable[] = {
-	{"help",	CmdHelp,			1, "This help"},
-	{"reader",	CmdHFTopazReader,	0, "Act like a Topaz reader"},
-	{"sim",		CmdHFTopazSim,		0, "<UID> -- Simulate Topaz tag"},
-	{"sniff",	CmdHF14ASniff,		0, "Sniff Topaz reader-tag communication"},
-	{"raw",		CmdHFTopazCmdRaw,	0, "Send raw hex data to tag"},
-	{"list",	CmdHFTopazList,		0, "[Deprecated] List Topaz history"},
-	{NULL,		NULL,				0, NULL}
+    {"help",    CmdHelp,            1, "This help"},
+    {"reader",  CmdHFTopazReader,   0, "Act like a Topaz reader"},
+    {"sim",     CmdHFTopazSim,      0, "<UID> -- Simulate Topaz tag"},
+    {"sniff",   CmdHF14ASniff,      0, "Sniff Topaz reader-tag communication"},
+    {"raw",     CmdHFTopazCmdRaw,   0, "Send raw hex data to tag"},
+    {"list",    CmdHFTopazList,     0, "[Deprecated] List Topaz history"},
+    {NULL,      NULL,               0, NULL}
 };
 
 int CmdHFTopaz(const char *Cmd) {
-	clearCommandBuffer();
-	CmdsParse(CommandTable, Cmd);
-	return 0;
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
+    return 0;
 }
 
 static int CmdHelp(const char *Cmd) {
-	CmdsHelp(CommandTable);
-	return 0;
+    CmdsHelp(CommandTable);
+    return 0;
 }
 
 
diff --git a/client/cmdhw.c b/client/cmdhw.c
index 640729306..da53ee1f2 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -24,185 +24,185 @@
 static int CmdHelp(const char *Cmd);
 
 static void lookupChipID(uint32_t iChipID, uint32_t mem_used) {
-	char asBuff[120];
-	memset(asBuff, 0, sizeof(asBuff));
-	uint32_t mem_avail = 0;
-	PrintAndLogEx(NORMAL, "\n [ Hardware ] ");
+    char asBuff[120];
+    memset(asBuff, 0, sizeof(asBuff));
+    uint32_t mem_avail = 0;
+    PrintAndLogEx(NORMAL, "\n [ Hardware ] ");
 
-	switch(iChipID) {
-		case 0x270B0A40: sprintf(asBuff,"AT91SAM7S512 Rev A"); break;
-		case 0x270B0A4F: sprintf(asBuff,"AT91SAM7S512 Rev B"); break;
-		case 0x270D0940: sprintf(asBuff,"AT91SAM7S256 Rev A"); break;
-		case 0x270B0941: sprintf(asBuff,"AT91SAM7S256 Rev B"); break;
-		case 0x270B0942: sprintf(asBuff,"AT91SAM7S256 Rev C"); break;
-		case 0x270B0943: sprintf(asBuff,"AT91SAM7S256 Rev D"); break;
-		case 0x270C0740: sprintf(asBuff,"AT91SAM7S128 Rev A"); break;
-		case 0x270A0741: sprintf(asBuff,"AT91SAM7S128 Rev B"); break;
-		case 0x270A0742: sprintf(asBuff,"AT91SAM7S128 Rev C"); break;
-		case 0x270A0743: sprintf(asBuff,"AT91SAM7S128 Rev D"); break;
-		case 0x27090540: sprintf(asBuff,"AT91SAM7S64 Rev A"); break;
-		case 0x27090543: sprintf(asBuff,"AT91SAM7S64 Rev B"); break;
-		case 0x27090544: sprintf(asBuff,"AT91SAM7S64 Rev C"); break;
-		case 0x27080342: sprintf(asBuff,"AT91SAM7S321 Rev A"); break;
-		case 0x27080340: sprintf(asBuff,"AT91SAM7S32 Rev A"); break;
-		case 0x27080341: sprintf(asBuff,"AT91SAM7S32 Rev B"); break;
-		case 0x27050241: sprintf(asBuff,"AT9SAM7S161 Rev A"); break;
-		case 0x27050240: sprintf(asBuff,"AT91SAM7S16 Rev A"); break;
-	}
-	PrintAndLogEx(NORMAL, "  --= uC: %s",asBuff);
-	switch( (iChipID & 0xE0) >> 5) {
-		case 1: sprintf(asBuff,"ARM946ES");	break;
-		case 2:	sprintf(asBuff,"ARM7TDMI");	break;
-		case 4:	sprintf(asBuff,"ARM920T"); break;
-		case 5:	sprintf(asBuff,"ARM926EJS"); break;
-	}
-	PrintAndLogEx(NORMAL, "  --= Embedded Processor: %s",asBuff);
-	switch( (iChipID & 0xF00) >> 8) {
-		case 0:  mem_avail = 0; break;
-		case 1:	 mem_avail = 8; break;
-		case 2:  mem_avail = 16; break;
-		case 3:  mem_avail = 32; break;
-		case 5:	 mem_avail = 64; break;
-		case 7:	 mem_avail = 128; break;
-		case 9:  mem_avail = 256; break;
-		case 10: mem_avail = 512; break;
-		case 12: mem_avail = 1024; break;
-		case 14: mem_avail = 2048; break;
-	}
+    switch(iChipID) {
+        case 0x270B0A40: sprintf(asBuff,"AT91SAM7S512 Rev A"); break;
+        case 0x270B0A4F: sprintf(asBuff,"AT91SAM7S512 Rev B"); break;
+        case 0x270D0940: sprintf(asBuff,"AT91SAM7S256 Rev A"); break;
+        case 0x270B0941: sprintf(asBuff,"AT91SAM7S256 Rev B"); break;
+        case 0x270B0942: sprintf(asBuff,"AT91SAM7S256 Rev C"); break;
+        case 0x270B0943: sprintf(asBuff,"AT91SAM7S256 Rev D"); break;
+        case 0x270C0740: sprintf(asBuff,"AT91SAM7S128 Rev A"); break;
+        case 0x270A0741: sprintf(asBuff,"AT91SAM7S128 Rev B"); break;
+        case 0x270A0742: sprintf(asBuff,"AT91SAM7S128 Rev C"); break;
+        case 0x270A0743: sprintf(asBuff,"AT91SAM7S128 Rev D"); break;
+        case 0x27090540: sprintf(asBuff,"AT91SAM7S64 Rev A"); break;
+        case 0x27090543: sprintf(asBuff,"AT91SAM7S64 Rev B"); break;
+        case 0x27090544: sprintf(asBuff,"AT91SAM7S64 Rev C"); break;
+        case 0x27080342: sprintf(asBuff,"AT91SAM7S321 Rev A"); break;
+        case 0x27080340: sprintf(asBuff,"AT91SAM7S32 Rev A"); break;
+        case 0x27080341: sprintf(asBuff,"AT91SAM7S32 Rev B"); break;
+        case 0x27050241: sprintf(asBuff,"AT9SAM7S161 Rev A"); break;
+        case 0x27050240: sprintf(asBuff,"AT91SAM7S16 Rev A"); break;
+    }
+    PrintAndLogEx(NORMAL, "  --= uC: %s",asBuff);
+    switch( (iChipID & 0xE0) >> 5) {
+        case 1: sprintf(asBuff,"ARM946ES"); break;
+        case 2: sprintf(asBuff,"ARM7TDMI"); break;
+        case 4: sprintf(asBuff,"ARM920T"); break;
+        case 5: sprintf(asBuff,"ARM926EJS"); break;
+    }
+    PrintAndLogEx(NORMAL, "  --= Embedded Processor: %s",asBuff);
+    switch( (iChipID & 0xF00) >> 8) {
+        case 0:  mem_avail = 0; break;
+        case 1:  mem_avail = 8; break;
+        case 2:  mem_avail = 16; break;
+        case 3:  mem_avail = 32; break;
+        case 5:  mem_avail = 64; break;
+        case 7:  mem_avail = 128; break;
+        case 9:  mem_avail = 256; break;
+        case 10: mem_avail = 512; break;
+        case 12: mem_avail = 1024; break;
+        case 14: mem_avail = 2048; break;
+    }
 
-	uint32_t mem_left = 0;
-	if ( mem_avail > 0 )
-		mem_left = (mem_avail * 1024) - mem_used;
+    uint32_t mem_left = 0;
+    if ( mem_avail > 0 )
+        mem_left = (mem_avail * 1024) - mem_used;
 
-	PrintAndLogEx(NORMAL, "  --= Nonvolatile Program Memory Size: %uK bytes, Used: %u bytes (%2.0f%%) Free: %u bytes (%2.0f%%)",
-				mem_avail,
-				mem_used,
-				mem_avail == 0 ? 0.0f : (float)mem_used/(mem_avail*1024)*100,
-				mem_left,
-				mem_avail == 0 ? 0.0f : (float)mem_left/(mem_avail*1024)*100
-			);
+    PrintAndLogEx(NORMAL, "  --= Nonvolatile Program Memory Size: %uK bytes, Used: %u bytes (%2.0f%%) Free: %u bytes (%2.0f%%)",
+                mem_avail,
+                mem_used,
+                mem_avail == 0 ? 0.0f : (float)mem_used/(mem_avail*1024)*100,
+                mem_left,
+                mem_avail == 0 ? 0.0f : (float)mem_left/(mem_avail*1024)*100
+            );
 
-	switch( (iChipID & 0xF000) >> 12 ) {
-		case 0:	 sprintf(asBuff,"None"); break;
-		case 1:	 sprintf(asBuff,"8K bytes"); break;
-		case 2:	 sprintf(asBuff,"16K bytes"); break;
-		case 3:	 sprintf(asBuff,"32K bytes"); break;
-		case 5:  sprintf(asBuff,"64K bytes"); break;
-		case 7:  sprintf(asBuff,"128K bytes"); break;
-		case 9:  sprintf(asBuff,"256K bytes"); break;
-		case 10: sprintf(asBuff,"512K bytes"); break;
-		case 12: sprintf(asBuff,"1024K bytes");	break;
-		case 14: sprintf(asBuff,"2048K bytes"); break;
-	}
-	PrintAndLogEx(NORMAL, "  --= Second Nonvolatile Program Memory Size: %s",asBuff);
-	switch( (iChipID & 0xF0000) >> 16) {
-		case 1:  sprintf(asBuff,"1K bytes"); break;
-		case 2:  sprintf(asBuff,"2K bytes"); break;
-		case 3:	 sprintf(asBuff,"6K bytes"); break;
-		case 4:	 sprintf(asBuff,"112K bytes"); break;
-		case 5:	 sprintf(asBuff,"4K bytes"); break;
-		case 6:	 sprintf(asBuff,"80K bytes"); break;
-		case 7:  sprintf(asBuff,"160K bytes"); break;
-		case 8:	 sprintf(asBuff,"8K bytes"); break;
-		case 9:  sprintf(asBuff,"16K bytes"); break;
-		case 10: sprintf(asBuff,"32K bytes"); break;
-		case 11: sprintf(asBuff,"64K bytes"); break;
-		case 12: sprintf(asBuff,"128K bytes"); break;
-		case 13: sprintf(asBuff,"256K bytes"); break;
-		case 14: sprintf(asBuff,"96K bytes"); break;
-		case 15: sprintf(asBuff,"512K bytes");break;
-	}
-	PrintAndLogEx(NORMAL, "  --= Internal SRAM Size: %s",asBuff);
-	switch( (iChipID & 0xFF00000) >> 20) {
-		case 0x19: sprintf(asBuff,"AT91SAM9xx Series"); break;
-		case 0x29: sprintf(asBuff,"AT91SAM9XExx Series"); break;
-		case 0x34: sprintf(asBuff,"AT91x34 Series"); break;
-		case 0x37: sprintf(asBuff,"CAP7 Series"); break;
-		case 0x39: sprintf(asBuff,"CAP9 Series"); break;
-		case 0x3B: sprintf(asBuff,"CAP11 Series"); break;
-		case 0x40: sprintf(asBuff,"AT91x40 Series"); break;
-		case 0x42: sprintf(asBuff,"AT91x42 Series"); break;
-		case 0x55: sprintf(asBuff,"AT91x55 Series"); break;
-		case 0x60: sprintf(asBuff,"AT91SAM7Axx Series"); break;
-		case 0x61: sprintf(asBuff,"AT91SAM7AQxx Series"); break;
-		case 0x63: sprintf(asBuff,"AT91x63 Series"); break;
-		case 0x70: sprintf(asBuff,"AT91SAM7Sxx Series"); break;
-		case 0x71: sprintf(asBuff,"AT91SAM7XCxx Series"); break;
-		case 0x72: sprintf(asBuff,"AT91SAM7SExx Series"); break;
-		case 0x73: sprintf(asBuff,"AT91SAM7Lxx Series"); break;
-		case 0x75: sprintf(asBuff,"AT91SAM7Xxx Series"); break;
-		case 0x92: sprintf(asBuff,"AT91x92 Series"); break;
-		case 0xF0: sprintf(asBuff,"AT75Cxx Series"); break;
-	}
-	PrintAndLogEx(NORMAL, "  --= Architecture Identifier: %s",asBuff);
-	switch( (iChipID & 0x70000000) >> 28 ) {
-		case 0: sprintf(asBuff,"ROM"); break;
-		case 1: sprintf(asBuff,"ROMless or on-chip Flash");	break;
-		case 2:	sprintf(asBuff,"Embedded Flash Memory"); break;
-		case 3:	sprintf(asBuff,"ROM and Embedded Flash Memory\nNVPSIZ is ROM size\nNVPSIZ2 is Flash size");	break;
-		case 4:	sprintf(asBuff,"SRAM emulating ROM"); break;
-	}
-	PrintAndLogEx(NORMAL, "  --= Nonvolatile Program Memory Type: %s",asBuff);
+    switch( (iChipID & 0xF000) >> 12 ) {
+        case 0:  sprintf(asBuff,"None"); break;
+        case 1:  sprintf(asBuff,"8K bytes"); break;
+        case 2:  sprintf(asBuff,"16K bytes"); break;
+        case 3:  sprintf(asBuff,"32K bytes"); break;
+        case 5:  sprintf(asBuff,"64K bytes"); break;
+        case 7:  sprintf(asBuff,"128K bytes"); break;
+        case 9:  sprintf(asBuff,"256K bytes"); break;
+        case 10: sprintf(asBuff,"512K bytes"); break;
+        case 12: sprintf(asBuff,"1024K bytes"); break;
+        case 14: sprintf(asBuff,"2048K bytes"); break;
+    }
+    PrintAndLogEx(NORMAL, "  --= Second Nonvolatile Program Memory Size: %s",asBuff);
+    switch( (iChipID & 0xF0000) >> 16) {
+        case 1:  sprintf(asBuff,"1K bytes"); break;
+        case 2:  sprintf(asBuff,"2K bytes"); break;
+        case 3:  sprintf(asBuff,"6K bytes"); break;
+        case 4:  sprintf(asBuff,"112K bytes"); break;
+        case 5:  sprintf(asBuff,"4K bytes"); break;
+        case 6:  sprintf(asBuff,"80K bytes"); break;
+        case 7:  sprintf(asBuff,"160K bytes"); break;
+        case 8:  sprintf(asBuff,"8K bytes"); break;
+        case 9:  sprintf(asBuff,"16K bytes"); break;
+        case 10: sprintf(asBuff,"32K bytes"); break;
+        case 11: sprintf(asBuff,"64K bytes"); break;
+        case 12: sprintf(asBuff,"128K bytes"); break;
+        case 13: sprintf(asBuff,"256K bytes"); break;
+        case 14: sprintf(asBuff,"96K bytes"); break;
+        case 15: sprintf(asBuff,"512K bytes");break;
+    }
+    PrintAndLogEx(NORMAL, "  --= Internal SRAM Size: %s",asBuff);
+    switch( (iChipID & 0xFF00000) >> 20) {
+        case 0x19: sprintf(asBuff,"AT91SAM9xx Series"); break;
+        case 0x29: sprintf(asBuff,"AT91SAM9XExx Series"); break;
+        case 0x34: sprintf(asBuff,"AT91x34 Series"); break;
+        case 0x37: sprintf(asBuff,"CAP7 Series"); break;
+        case 0x39: sprintf(asBuff,"CAP9 Series"); break;
+        case 0x3B: sprintf(asBuff,"CAP11 Series"); break;
+        case 0x40: sprintf(asBuff,"AT91x40 Series"); break;
+        case 0x42: sprintf(asBuff,"AT91x42 Series"); break;
+        case 0x55: sprintf(asBuff,"AT91x55 Series"); break;
+        case 0x60: sprintf(asBuff,"AT91SAM7Axx Series"); break;
+        case 0x61: sprintf(asBuff,"AT91SAM7AQxx Series"); break;
+        case 0x63: sprintf(asBuff,"AT91x63 Series"); break;
+        case 0x70: sprintf(asBuff,"AT91SAM7Sxx Series"); break;
+        case 0x71: sprintf(asBuff,"AT91SAM7XCxx Series"); break;
+        case 0x72: sprintf(asBuff,"AT91SAM7SExx Series"); break;
+        case 0x73: sprintf(asBuff,"AT91SAM7Lxx Series"); break;
+        case 0x75: sprintf(asBuff,"AT91SAM7Xxx Series"); break;
+        case 0x92: sprintf(asBuff,"AT91x92 Series"); break;
+        case 0xF0: sprintf(asBuff,"AT75Cxx Series"); break;
+    }
+    PrintAndLogEx(NORMAL, "  --= Architecture Identifier: %s",asBuff);
+    switch( (iChipID & 0x70000000) >> 28 ) {
+        case 0: sprintf(asBuff,"ROM"); break;
+        case 1: sprintf(asBuff,"ROMless or on-chip Flash"); break;
+        case 2: sprintf(asBuff,"Embedded Flash Memory"); break;
+        case 3: sprintf(asBuff,"ROM and Embedded Flash Memory\nNVPSIZ is ROM size\nNVPSIZ2 is Flash size"); break;
+        case 4: sprintf(asBuff,"SRAM emulating ROM"); break;
+    }
+    PrintAndLogEx(NORMAL, "  --= Nonvolatile Program Memory Type: %s",asBuff);
 }
 
 int CmdDetectReader(const char *Cmd) {
-	UsbCommand c = {CMD_LISTEN_READER_FIELD};
-	// 'l' means LF - 125/134 kHz
-	if(*Cmd == 'l') {
-		c.arg[0] = 1;
-	} else if (*Cmd == 'h') {
-		c.arg[0] = 2;
-	} else if (*Cmd != '\0') {
-		PrintAndLogEx(NORMAL, "use 'detectreader' or 'detectreader l' or 'detectreader h'");
-		return 0;
-	}
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+    UsbCommand c = {CMD_LISTEN_READER_FIELD};
+    // 'l' means LF - 125/134 kHz
+    if(*Cmd == 'l') {
+        c.arg[0] = 1;
+    } else if (*Cmd == 'h') {
+        c.arg[0] = 2;
+    } else if (*Cmd != '\0') {
+        PrintAndLogEx(NORMAL, "use 'detectreader' or 'detectreader l' or 'detectreader h'");
+        return 0;
+    }
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 
 // ## FPGA Control
 int CmdFPGAOff(const char *Cmd) {
-	UsbCommand c = {CMD_FPGA_MAJOR_MODE_OFF};
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+    UsbCommand c = {CMD_FPGA_MAJOR_MODE_OFF};
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 
 #ifdef WITH_LCD
 int CmdLCD(const char *Cmd) {
-	int i, j;
+    int i, j;
 
-	UsbCommand c = {CMD_LCD};
-	sscanf(Cmd, "%x %d", &i, &j);
-	while (j--) {
-		c.arg[0] = i & 0x1ff;
-		clearCommandBuffer();
-		SendCommand(&c);
-	}
-	return 0;
+    UsbCommand c = {CMD_LCD};
+    sscanf(Cmd, "%x %d", &i, &j);
+    while (j--) {
+        c.arg[0] = i & 0x1ff;
+        clearCommandBuffer();
+        SendCommand(&c);
+    }
+    return 0;
 }
 
 int CmdLCDReset(const char *Cmd) {
-	UsbCommand c = {CMD_LCD_RESET, {strtol(Cmd, NULL, 0), 0, 0}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+    UsbCommand c = {CMD_LCD_RESET, {strtol(Cmd, NULL, 0), 0, 0}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 #endif
 
 int CmdReadmem(const char *Cmd) {
-	UsbCommand c = {CMD_READ_MEM, {strtol(Cmd, NULL, 0), 0, 0}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+    UsbCommand c = {CMD_READ_MEM, {strtol(Cmd, NULL, 0), 0, 0}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 
 int CmdReset(const char *Cmd) {
-	UsbCommand c = {CMD_HARDWARE_RESET};
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+    UsbCommand c = {CMD_HARDWARE_RESET};
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 
 /*
@@ -210,35 +210,35 @@ int CmdReset(const char *Cmd) {
  * 600kHz.
  */
 int CmdSetDivisor(const char *Cmd) {
-	UsbCommand c = {CMD_SET_LF_DIVISOR, {strtol(Cmd, NULL, 0), 0, 0}};
+    UsbCommand c = {CMD_SET_LF_DIVISOR, {strtol(Cmd, NULL, 0), 0, 0}};
 
-	if (c.arg[0] < 19 || c.arg[0] > 255) {
-		PrintAndLogEx(NORMAL, "divisor must be between 19 and 255");
-		return 1;
-	}
-	// 12 000 000 (12Mhz)
-	clearCommandBuffer();
-	SendCommand(&c);
-	PrintAndLogEx(NORMAL, "Divisor set, expected %.1f KHz", ((double)12000 / (c.arg[0]+1)) );
-	return 0;
+    if (c.arg[0] < 19 || c.arg[0] > 255) {
+        PrintAndLogEx(NORMAL, "divisor must be between 19 and 255");
+        return 1;
+    }
+    // 12 000 000 (12Mhz)
+    clearCommandBuffer();
+    SendCommand(&c);
+    PrintAndLogEx(NORMAL, "Divisor set, expected %.1f KHz", ((double)12000 / (c.arg[0]+1)) );
+    return 0;
 }
 
 int CmdSetMux(const char *Cmd) {
 
-	if (strlen(Cmd) < 5) {
-		PrintAndLogEx(NORMAL, "expected:  lopkd | loraw | hipkd | hiraw");
-		return 1;
-	}
+    if (strlen(Cmd) < 5) {
+        PrintAndLogEx(NORMAL, "expected:  lopkd | loraw | hipkd | hiraw");
+        return 1;
+    }
 
-	UsbCommand c = {CMD_SET_ADC_MUX};
+    UsbCommand c = {CMD_SET_ADC_MUX};
 
-	if (strcmp(Cmd, "lopkd") == 0) 		c.arg[0] = 0;
-	else if (strcmp(Cmd, "loraw") == 0)	c.arg[0] = 1;
-	else if (strcmp(Cmd, "hipkd") == 0)	c.arg[0] = 2;
-	else if (strcmp(Cmd, "hiraw") == 0)	c.arg[0] = 3;
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+    if (strcmp(Cmd, "lopkd") == 0)      c.arg[0] = 0;
+    else if (strcmp(Cmd, "loraw") == 0) c.arg[0] = 1;
+    else if (strcmp(Cmd, "hipkd") == 0) c.arg[0] = 2;
+    else if (strcmp(Cmd, "hiraw") == 0) c.arg[0] = 3;
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 
 int CmdTune(const char *Cmd) {
@@ -247,90 +247,90 @@ int CmdTune(const char *Cmd) {
 
 int CmdVersion(const char *Cmd) {
 
-	bool silent = (Cmd[0] == 's' || Cmd[0] ==  'S');
-	if ( silent )
-		return 0;
+    bool silent = (Cmd[0] == 's' || Cmd[0] ==  'S');
+    if ( silent )
+        return 0;
 
-	UsbCommand c = {CMD_VERSION, {0, 0, 0}};
-	UsbCommand resp;
-	clearCommandBuffer();
-	SendCommand(&c);
-	if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {
+    UsbCommand c = {CMD_VERSION, {0, 0, 0}};
+    UsbCommand resp;
+    clearCommandBuffer();
+    SendCommand(&c);
+    if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {
 #ifdef __WIN32
-		PrintAndLogEx(NORMAL, "\n [ Proxmark3 RFID instrument ]\n");
+        PrintAndLogEx(NORMAL, "\n [ Proxmark3 RFID instrument ]\n");
 #else
-		PrintAndLogEx(NORMAL, "\n\e[34m [ Proxmark3 RFID instrument ]\e[0m\n");
+        PrintAndLogEx(NORMAL, "\n\e[34m [ Proxmark3 RFID instrument ]\e[0m\n");
 #endif
-		char s[50] = {0};
+        char s[50] = {0};
 #if defined(WITH_FLASH) || defined(WITH_SMARTCARD) || defined(WITH_FPC)
-		strncat(s, "build for RDV40 with ", sizeof(s) - strlen(s) - 1);
+        strncat(s, "build for RDV40 with ", sizeof(s) - strlen(s) - 1);
 #endif
 #ifdef WITH_FLASH
-		strncat(s, "flashmem; ", sizeof(s) - strlen(s) - 1);
+        strncat(s, "flashmem; ", sizeof(s) - strlen(s) - 1);
 #endif
 #ifdef WITH_SMARTCARD
-		strncat(s, "smartcard; ", sizeof(s) - strlen(s) - 1);
+        strncat(s, "smartcard; ", sizeof(s) - strlen(s) - 1);
 #endif
 #ifdef WITH_FPC
-		strncat(s, "fpc; ", sizeof(s) - strlen(s) - 1);
+        strncat(s, "fpc; ", sizeof(s) - strlen(s) - 1);
 #endif
-		PrintAndLogEx(NORMAL, "\n [ CLIENT ]");
-		PrintAndLogEx(NORMAL, "  client: iceman %s \n", s);
+        PrintAndLogEx(NORMAL, "\n [ CLIENT ]");
+        PrintAndLogEx(NORMAL, "  client: iceman %s \n", s);
 
-		PrintAndLogEx(NORMAL, (char*)resp.d.asBytes);
-		lookupChipID(resp.arg[0], resp.arg[1]);
-	}
-	PrintAndLogEx(NORMAL, "\n");
-	return 0;
+        PrintAndLogEx(NORMAL, (char*)resp.d.asBytes);
+        lookupChipID(resp.arg[0], resp.arg[1]);
+    }
+    PrintAndLogEx(NORMAL, "\n");
+    return 0;
 }
 
 int CmdStatus(const char *Cmd) {
-	clearCommandBuffer();
-	UsbCommand c = {CMD_STATUS};
-	SendCommand(&c);
-	if (!WaitForResponseTimeout(CMD_ACK, &c, 1900))
-		PrintAndLogEx(NORMAL, "Status command failed. USB Speed Test timed out");
-	return 0;
+    clearCommandBuffer();
+    UsbCommand c = {CMD_STATUS};
+    SendCommand(&c);
+    if (!WaitForResponseTimeout(CMD_ACK, &c, 1900))
+        PrintAndLogEx(NORMAL, "Status command failed. USB Speed Test timed out");
+    return 0;
 }
 
 int CmdPing(const char *Cmd) {
-	clearCommandBuffer();
-	UsbCommand resp;
-	UsbCommand c = {CMD_PING};
-	SendCommand(&c);
-	if (WaitForResponseTimeout(CMD_ACK, &resp, 1000))
-		PrintAndLogEx(NORMAL, "Ping successful");
-	else
-		PrintAndLogEx(NORMAL, "Ping failed");
-	return 0;
+    clearCommandBuffer();
+    UsbCommand resp;
+    UsbCommand c = {CMD_PING};
+    SendCommand(&c);
+    if (WaitForResponseTimeout(CMD_ACK, &resp, 1000))
+        PrintAndLogEx(NORMAL, "Ping successful");
+    else
+        PrintAndLogEx(NORMAL, "Ping failed");
+    return 0;
 }
 
 static command_t CommandTable[] = {
-	{"help",          CmdHelp,        1, "This help"},
-	{"detectreader",  CmdDetectReader,0, "['l'|'h'] -- Detect external reader field (option 'l' or 'h' to limit to LF or HF)"},
-	{"fpgaoff",       CmdFPGAOff,     0, "Set FPGA off"},
+    {"help",          CmdHelp,        1, "This help"},
+    {"detectreader",  CmdDetectReader,0, "['l'|'h'] -- Detect external reader field (option 'l' or 'h' to limit to LF or HF)"},
+    {"fpgaoff",       CmdFPGAOff,     0, "Set FPGA off"},
 #ifdef WITH_LCD
-	{"lcd",           CmdLCD,         0, "<HEX command> <count> -- Send command/data to LCD"},
-	{"lcdreset",      CmdLCDReset,    0, "Hardware reset LCD"},
+    {"lcd",           CmdLCD,         0, "<HEX command> <count> -- Send command/data to LCD"},
+    {"lcdreset",      CmdLCDReset,    0, "Hardware reset LCD"},
 #endif
-	{"readmem",       CmdReadmem,     0, "[address] -- Read memory at decimal address from flash"},
-	{"reset",         CmdReset,       0, "Reset the Proxmark3"},
-	{"setlfdivisor",  CmdSetDivisor,  0, "<19 - 255> -- Drive LF antenna at 12Mhz/(divisor+1)"},
-	{"setmux",        CmdSetMux,      0, "<loraw|hiraw|lopkd|hipkd> -- Set the ADC mux to a specific value"},
-	{"tune",          CmdTune,        0, "Measure antenna tuning"},
-	{"version",       CmdVersion,     0, "Show version information about the connected Proxmark"},
-	{"status",        CmdStatus,      0, "Show runtime status information about the connected Proxmark"},
-	{"ping",          CmdPing,        0, "Test if the pm3 is responsive"},
-	{NULL, NULL, 0, NULL}
+    {"readmem",       CmdReadmem,     0, "[address] -- Read memory at decimal address from flash"},
+    {"reset",         CmdReset,       0, "Reset the Proxmark3"},
+    {"setlfdivisor",  CmdSetDivisor,  0, "<19 - 255> -- Drive LF antenna at 12Mhz/(divisor+1)"},
+    {"setmux",        CmdSetMux,      0, "<loraw|hiraw|lopkd|hipkd> -- Set the ADC mux to a specific value"},
+    {"tune",          CmdTune,        0, "Measure antenna tuning"},
+    {"version",       CmdVersion,     0, "Show version information about the connected Proxmark"},
+    {"status",        CmdStatus,      0, "Show runtime status information about the connected Proxmark"},
+    {"ping",          CmdPing,        0, "Test if the pm3 is responsive"},
+    {NULL, NULL, 0, NULL}
 };
 
 int CmdHW(const char *Cmd) {
-	clearCommandBuffer();
-	CmdsParse(CommandTable, Cmd);
-	return 0;
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
+    return 0;
 }
 
 int CmdHelp(const char *Cmd) {
-	CmdsHelp(CommandTable);
-	return 0;
+    CmdsHelp(CommandTable);
+    return 0;
 }
diff --git a/client/cmdlf.c b/client/cmdlf.c
index b877f8f3b..c40e5b32d 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -14,396 +14,396 @@ bool g_lf_threshold_set = false;
 static int CmdHelp(const char *Cmd);
 
 int usage_lf_cmdread(void) {
-	PrintAndLogEx(NORMAL, "Usage: lf cmdread d <delay period> z <zero period> o <one period> c <cmdbytes>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h             This help");
-	PrintAndLogEx(NORMAL, "       d <delay>     delay OFF period, (0 for bitbang mode) (decimal)");
-	PrintAndLogEx(NORMAL, "       z <zero>      time period ZERO, (decimal)");
-	PrintAndLogEx(NORMAL, "       o <one>       time period ONE, (decimal)");
-	PrintAndLogEx(NORMAL, "       c <cmd>       Command bytes  (in ones and zeros)");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "       ************* All periods in microseconds (ms)");
-	PrintAndLogEx(NORMAL, "       ************* Use lf config to configure options.");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      lf cmdread d 80 z 100 o 200 c 11000");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage: lf cmdread d <delay period> z <zero period> o <one period> c <cmdbytes>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h             This help");
+    PrintAndLogEx(NORMAL, "       d <delay>     delay OFF period, (0 for bitbang mode) (decimal)");
+    PrintAndLogEx(NORMAL, "       z <zero>      time period ZERO, (decimal)");
+    PrintAndLogEx(NORMAL, "       o <one>       time period ONE, (decimal)");
+    PrintAndLogEx(NORMAL, "       c <cmd>       Command bytes  (in ones and zeros)");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "       ************* All periods in microseconds (ms)");
+    PrintAndLogEx(NORMAL, "       ************* Use lf config to configure options.");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      lf cmdread d 80 z 100 o 200 c 11000");
+    return 0;
 }
 int usage_lf_read(void){
-	PrintAndLogEx(NORMAL, "Usage: lf read [h] [s] [d numofsamples]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h            This help");
-	PrintAndLogEx(NORMAL, "       s            silent run no printout");
-	PrintAndLogEx(NORMAL, "       d #samples   # samples to collect (optional)");
-	PrintAndLogEx(NORMAL, "Use 'lf config' to set parameters.");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "         lf read s d 12000     - collects 12000samples silent");
-	PrintAndLogEx(NORMAL, "         lf read s");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage: lf read [h] [s] [d numofsamples]");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h            This help");
+    PrintAndLogEx(NORMAL, "       s            silent run no printout");
+    PrintAndLogEx(NORMAL, "       d #samples   # samples to collect (optional)");
+    PrintAndLogEx(NORMAL, "Use 'lf config' to set parameters.");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "         lf read s d 12000     - collects 12000samples silent");
+    PrintAndLogEx(NORMAL, "         lf read s");
+    return 0;
 }
 int usage_lf_snoop(void) {
-	PrintAndLogEx(NORMAL, "Snoop low frequence signal. Use 'lf config' to set parameters.");
-	PrintAndLogEx(NORMAL, "Usage: lf snoop [h]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h         This help");
-	PrintAndLogEx(NORMAL, "This function takes no arguments. ");
-	PrintAndLogEx(NORMAL, "Use 'lf config' to set parameters.");
-	return 0;
+    PrintAndLogEx(NORMAL, "Snoop low frequence signal. Use 'lf config' to set parameters.");
+    PrintAndLogEx(NORMAL, "Usage: lf snoop [h]");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "      h         This help");
+    PrintAndLogEx(NORMAL, "This function takes no arguments. ");
+    PrintAndLogEx(NORMAL, "Use 'lf config' to set parameters.");
+    return 0;
 }
 int usage_lf_config(void) {
-	PrintAndLogEx(NORMAL, "Usage: lf config [h] [H|<divisor>] [b <bps>] [d <decim>] [a 0|1]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h             This help");
-	PrintAndLogEx(NORMAL, "       L             Low frequency (125 KHz)");
-	PrintAndLogEx(NORMAL, "       H             High frequency (134 KHz)");
-	PrintAndLogEx(NORMAL, "       q <divisor>   Manually set divisor. 88-> 134KHz, 95-> 125 Hz");
-	PrintAndLogEx(NORMAL, "       b <bps>       Sets resolution of bits per sample. Default (max): 8");
-	PrintAndLogEx(NORMAL, "       d <decim>     Sets decimation. A value of N saves only 1 in N samples. Default: 1");
-	PrintAndLogEx(NORMAL, "       a [0|1]       Averaging - if set, will average the stored sample value when decimating. Default: 1");
-	PrintAndLogEx(NORMAL, "       t <threshold> Sets trigger threshold. 0 means no threshold (range: 0-128)");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      lf config b 8 L");
-	PrintAndLogEx(NORMAL, "                    Samples at 125KHz, 8bps.");
-	PrintAndLogEx(NORMAL, "      lf config H b 4 d 3");
-	PrintAndLogEx(NORMAL, "                    Samples at 134KHz, averages three samples into one, stored with ");
-	PrintAndLogEx(NORMAL, "                    a resolution of 4 bits per sample.");
-	PrintAndLogEx(NORMAL, "      lf read");
-	PrintAndLogEx(NORMAL, "                    Performs a read (active field)");
-	PrintAndLogEx(NORMAL, "      lf snoop");
-	PrintAndLogEx(NORMAL, "                    Performs a snoop (no active field)");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage: lf config [h] [H|<divisor>] [b <bps>] [d <decim>] [a 0|1]");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h             This help");
+    PrintAndLogEx(NORMAL, "       L             Low frequency (125 KHz)");
+    PrintAndLogEx(NORMAL, "       H             High frequency (134 KHz)");
+    PrintAndLogEx(NORMAL, "       q <divisor>   Manually set divisor. 88-> 134KHz, 95-> 125 Hz");
+    PrintAndLogEx(NORMAL, "       b <bps>       Sets resolution of bits per sample. Default (max): 8");
+    PrintAndLogEx(NORMAL, "       d <decim>     Sets decimation. A value of N saves only 1 in N samples. Default: 1");
+    PrintAndLogEx(NORMAL, "       a [0|1]       Averaging - if set, will average the stored sample value when decimating. Default: 1");
+    PrintAndLogEx(NORMAL, "       t <threshold> Sets trigger threshold. 0 means no threshold (range: 0-128)");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      lf config b 8 L");
+    PrintAndLogEx(NORMAL, "                    Samples at 125KHz, 8bps.");
+    PrintAndLogEx(NORMAL, "      lf config H b 4 d 3");
+    PrintAndLogEx(NORMAL, "                    Samples at 134KHz, averages three samples into one, stored with ");
+    PrintAndLogEx(NORMAL, "                    a resolution of 4 bits per sample.");
+    PrintAndLogEx(NORMAL, "      lf read");
+    PrintAndLogEx(NORMAL, "                    Performs a read (active field)");
+    PrintAndLogEx(NORMAL, "      lf snoop");
+    PrintAndLogEx(NORMAL, "                    Performs a snoop (no active field)");
+    return 0;
 }
 int usage_lf_simfsk(void) {
-	PrintAndLogEx(NORMAL, "Usage: lf simfsk [h] [c <clock>] [H <fcHigh>] [L <fcLow>] [d <hexdata>]");
-	PrintAndLogEx(NORMAL, "there are about four FSK modulations to know of.");
-	PrintAndLogEx(NORMAL, "FSK1  -  where fc/8 = high  and fc/5 = low");
-	PrintAndLogEx(NORMAL, "FSK1a -  is inverted FSK1,  ie:   fc/5 = high and fc/8 = low");
-	PrintAndLogEx(NORMAL, "FSK2  -  where fc/10 = high  and fc/8 = low");
-	PrintAndLogEx(NORMAL, "FSK2a -  is inverted FSK2,  ie:   fc/10 = high and fc/8 = low");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h              This help");
-	PrintAndLogEx(NORMAL, "       c <clock>      Manually set clock - can autodetect if using DemodBuffer");
-	PrintAndLogEx(NORMAL, "       H <fcHigh>     Manually set the larger Field Clock");
-	PrintAndLogEx(NORMAL, "       L <fcLow>      Manually set the smaller Field Clock");
-	//PrintAndLogEx(NORMAL, "       s              TBD- -STT to enable a gap between playback repetitions - default: no gap");
-	PrintAndLogEx(NORMAL, "       d <hexdata>    Data to sim as hex - omit to sim from DemodBuffer");
-	PrintAndLogEx(NORMAL, "\n  NOTE: if you set one clock manually set them all manually");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "       lf simfsk c 40 H 8 L 5 d 010203      -  FSK1  rf/40  data 010203");
-	PrintAndLogEx(NORMAL, "       lf simfsk c 40 H 5 L 8 d 010203      -  FSK1a rf/40  data 010203");
-	PrintAndLogEx(NORMAL, "       lf simfsk c 64 H 10 L 8 d 010203     -  FSK2  rf/64  data 010203");
-	PrintAndLogEx(NORMAL, "       lf simfsk c 64 H 8 L 10 d 010203     -  FSK2a rf/64  data 010203");
-	PrintAndLogEx(NORMAL, "");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage: lf simfsk [h] [c <clock>] [H <fcHigh>] [L <fcLow>] [d <hexdata>]");
+    PrintAndLogEx(NORMAL, "there are about four FSK modulations to know of.");
+    PrintAndLogEx(NORMAL, "FSK1  -  where fc/8 = high  and fc/5 = low");
+    PrintAndLogEx(NORMAL, "FSK1a -  is inverted FSK1,  ie:   fc/5 = high and fc/8 = low");
+    PrintAndLogEx(NORMAL, "FSK2  -  where fc/10 = high  and fc/8 = low");
+    PrintAndLogEx(NORMAL, "FSK2a -  is inverted FSK2,  ie:   fc/10 = high and fc/8 = low");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h              This help");
+    PrintAndLogEx(NORMAL, "       c <clock>      Manually set clock - can autodetect if using DemodBuffer");
+    PrintAndLogEx(NORMAL, "       H <fcHigh>     Manually set the larger Field Clock");
+    PrintAndLogEx(NORMAL, "       L <fcLow>      Manually set the smaller Field Clock");
+    //PrintAndLogEx(NORMAL, "       s              TBD- -STT to enable a gap between playback repetitions - default: no gap");
+    PrintAndLogEx(NORMAL, "       d <hexdata>    Data to sim as hex - omit to sim from DemodBuffer");
+    PrintAndLogEx(NORMAL, "\n  NOTE: if you set one clock manually set them all manually");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "       lf simfsk c 40 H 8 L 5 d 010203      -  FSK1  rf/40  data 010203");
+    PrintAndLogEx(NORMAL, "       lf simfsk c 40 H 5 L 8 d 010203      -  FSK1a rf/40  data 010203");
+    PrintAndLogEx(NORMAL, "       lf simfsk c 64 H 10 L 8 d 010203     -  FSK2  rf/64  data 010203");
+    PrintAndLogEx(NORMAL, "       lf simfsk c 64 H 8 L 10 d 010203     -  FSK2a rf/64  data 010203");
+    PrintAndLogEx(NORMAL, "");
+    return 0;
 }
 int usage_lf_simask(void) {
-	PrintAndLogEx(NORMAL, "Usage: lf simask [c <clock>] [i] [b|m|r] [s] [d <raw hex to sim>]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h              This help");
-	PrintAndLogEx(NORMAL, "       c <clock>      Manually set clock - can autodetect if using DemodBuffer");
-	PrintAndLogEx(NORMAL, "       i              invert data");
-	PrintAndLogEx(NORMAL, "       b              sim ask/biphase");
-	PrintAndLogEx(NORMAL, "       m              sim ask/manchester - Default");
-	PrintAndLogEx(NORMAL, "       r              sim ask/raw");
-	PrintAndLogEx(NORMAL, "       s              add t55xx Sequence Terminator gap - default: no gaps (only manchester)");
-	PrintAndLogEx(NORMAL, "       d <hexdata>    Data to sim as hex - omit to sim from DemodBuffer");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage: lf simask [c <clock>] [i] [b|m|r] [s] [d <raw hex to sim>]");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h              This help");
+    PrintAndLogEx(NORMAL, "       c <clock>      Manually set clock - can autodetect if using DemodBuffer");
+    PrintAndLogEx(NORMAL, "       i              invert data");
+    PrintAndLogEx(NORMAL, "       b              sim ask/biphase");
+    PrintAndLogEx(NORMAL, "       m              sim ask/manchester - Default");
+    PrintAndLogEx(NORMAL, "       r              sim ask/raw");
+    PrintAndLogEx(NORMAL, "       s              add t55xx Sequence Terminator gap - default: no gaps (only manchester)");
+    PrintAndLogEx(NORMAL, "       d <hexdata>    Data to sim as hex - omit to sim from DemodBuffer");
+    return 0;
 }
 int usage_lf_simpsk(void) {
-	PrintAndLogEx(NORMAL, "Usage: lf simpsk [1|2|3] [c <clock>] [i] [r <carrier>] [d <raw hex to sim>]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h              This help");
-	PrintAndLogEx(NORMAL, "       c <clock>      Manually set clock - can autodetect if using DemodBuffer");
-	PrintAndLogEx(NORMAL, "       i              invert data");
-	PrintAndLogEx(NORMAL, "       1              set PSK1 (default)");
-	PrintAndLogEx(NORMAL, "       2              set PSK2");
-	PrintAndLogEx(NORMAL, "       3              set PSK3");
-	PrintAndLogEx(NORMAL, "       r <carrier>    2|4|8 are valid carriers: default = 2");
-	PrintAndLogEx(NORMAL, "       d <hexdata>    Data to sim as hex - omit to sim from DemodBuffer");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage: lf simpsk [1|2|3] [c <clock>] [i] [r <carrier>] [d <raw hex to sim>]");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h              This help");
+    PrintAndLogEx(NORMAL, "       c <clock>      Manually set clock - can autodetect if using DemodBuffer");
+    PrintAndLogEx(NORMAL, "       i              invert data");
+    PrintAndLogEx(NORMAL, "       1              set PSK1 (default)");
+    PrintAndLogEx(NORMAL, "       2              set PSK2");
+    PrintAndLogEx(NORMAL, "       3              set PSK3");
+    PrintAndLogEx(NORMAL, "       r <carrier>    2|4|8 are valid carriers: default = 2");
+    PrintAndLogEx(NORMAL, "       d <hexdata>    Data to sim as hex - omit to sim from DemodBuffer");
+    return 0;
 }
 int usage_lf_find(void){
     PrintAndLogEx(NORMAL, "Usage:  lf search [h] <0|1> [u]");
     PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h             This help");
-	PrintAndLogEx(NORMAL, "       <0|1>         Use data from Graphbuffer, if not set, try reading data from tag.");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h             This help");
+    PrintAndLogEx(NORMAL, "       <0|1>         Use data from Graphbuffer, if not set, try reading data from tag.");
     PrintAndLogEx(NORMAL, "       u             Search for Unknown tags, if not set, reads only known tags.");
-	PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "      lf search     = try reading data from tag & search for known tags");
     PrintAndLogEx(NORMAL, "      lf search 1   = use data from GraphBuffer & search for known tags");
     PrintAndLogEx(NORMAL, "      lf search u   = try reading data from tag & search for known and unknown tags");
     PrintAndLogEx(NORMAL, "      lf search 1 u = use data from GraphBuffer & search for known and unknown tags");
-	return 0;
+    return 0;
 }
 
 
 /* send a LF command before reading */
 int CmdLFCommandRead(const char *Cmd) {
 
-	UsbCommand c = {CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K, {0,0,0}};
-	bool errors = false;
+    UsbCommand c = {CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K, {0,0,0}};
+    bool errors = false;
 
-  	uint8_t cmdp = 0;
-	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch (tolower(param_getchar(Cmd, cmdp))) {
-		case 'h':
-			return usage_lf_cmdread();
-		case 'c':
-			param_getstr(Cmd, cmdp+1, (char *)&c.d.asBytes, sizeof(c.d.asBytes));
-			cmdp += 2;
-			break;
-		case 'd':
-			c.arg[0] = param_get32ex(Cmd, cmdp+1, 0, 10);
-			cmdp += 2;
-			break;
-		case 'z':
-			c.arg[1] = param_get32ex(Cmd, cmdp+1, 0, 10) & 0xFFFF;
-			cmdp += 2;
-			break;
-		case 'o':
-			c.arg[2] = param_get32ex(Cmd, cmdp+1, 0, 10) & 0xFFFF;
-			cmdp += 2;
-			break;
-		default:
-			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-			errors = true;
-			break;
-		}
-	}
+    uint8_t cmdp = 0;
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+        case 'h':
+            return usage_lf_cmdread();
+        case 'c':
+            param_getstr(Cmd, cmdp+1, (char *)&c.d.asBytes, sizeof(c.d.asBytes));
+            cmdp += 2;
+            break;
+        case 'd':
+            c.arg[0] = param_get32ex(Cmd, cmdp+1, 0, 10);
+            cmdp += 2;
+            break;
+        case 'z':
+            c.arg[1] = param_get32ex(Cmd, cmdp+1, 0, 10) & 0xFFFF;
+            cmdp += 2;
+            break;
+        case 'o':
+            c.arg[2] = param_get32ex(Cmd, cmdp+1, 0, 10) & 0xFFFF;
+            cmdp += 2;
+            break;
+        default:
+            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+            errors = true;
+            break;
+        }
+    }
 
-	//Validations
-	if (errors || cmdp == 0)  return usage_lf_cmdread();
+    //Validations
+    if (errors || cmdp == 0)  return usage_lf_cmdread();
 
-	clearCommandBuffer();
-	SendCommand(&c);
+    clearCommandBuffer();
+    SendCommand(&c);
 
-	WaitForResponse(CMD_ACK, NULL);
-	getSamples(0, true);
-	return 0;
+    WaitForResponse(CMD_ACK, NULL);
+    getSamples(0, true);
+    return 0;
 }
 
 int CmdFlexdemod(const char *Cmd) {
 
-	if ( GraphTraceLen < 0 )
-		return 0;
+    if ( GraphTraceLen < 0 )
+        return 0;
 
 #ifndef LONG_WAIT
 #define LONG_WAIT 100
 #endif
-	int i, j, start, bit, sum, phase = 0;
+    int i, j, start, bit, sum, phase = 0;
 
-	int data[GraphTraceLen];
-	memcpy(data, GraphBuffer, GraphTraceLen);
+    int data[GraphTraceLen];
+    memcpy(data, GraphBuffer, GraphTraceLen);
 
-	size_t size = GraphTraceLen;
+    size_t size = GraphTraceLen;
 
-	for (i = 0; i < GraphTraceLen; ++i)
-		data[i] = (data[i] < 0) ? -1 : 1;
+    for (i = 0; i < GraphTraceLen; ++i)
+        data[i] = (data[i] < 0) ? -1 : 1;
 
-	for (start = 0; start < size - LONG_WAIT; start++) {
-		int first = data[start];
-		for (i = start; i < start + LONG_WAIT; i++) {
-			if (data[i] != first) {
-				break;
-			}
-		}
-		if (i == (start + LONG_WAIT))
-			break;
-	}
+    for (start = 0; start < size - LONG_WAIT; start++) {
+        int first = data[start];
+        for (i = start; i < start + LONG_WAIT; i++) {
+            if (data[i] != first) {
+                break;
+            }
+        }
+        if (i == (start + LONG_WAIT))
+            break;
+    }
 
-	if (start == size - LONG_WAIT) {
-		PrintAndLogEx(NORMAL, "nothing to wait for");
-		return 0;
-	}
+    if (start == size - LONG_WAIT) {
+        PrintAndLogEx(NORMAL, "nothing to wait for");
+        return 0;
+    }
 
-	data[start] = 4;
-	data[start+1] = 0;
+    data[start] = 4;
+    data[start+1] = 0;
 
-	uint8_t bits[64] = {0x00};
+    uint8_t bits[64] = {0x00};
 
-	i = start;
-	for (bit = 0; bit < 64; bit++) {
-		sum = 0;
-		for (int j = 0; j < 16; j++) {
-			sum += data[i++];
-		}
-		bits[bit] = (sum > 0) ? 1 : 0;
-		PrintAndLogEx(NORMAL, "bit %d sum %d", bit, sum);
-	}
+    i = start;
+    for (bit = 0; bit < 64; bit++) {
+        sum = 0;
+        for (int j = 0; j < 16; j++) {
+            sum += data[i++];
+        }
+        bits[bit] = (sum > 0) ? 1 : 0;
+        PrintAndLogEx(NORMAL, "bit %d sum %d", bit, sum);
+    }
 
-	for (bit = 0; bit < 64; bit++) {
-		sum = 0;
-		for (j = 0; j < 16; j++)
-			sum += data[i++];
+    for (bit = 0; bit < 64; bit++) {
+        sum = 0;
+        for (j = 0; j < 16; j++)
+            sum += data[i++];
 
-		if (sum > 0 && bits[bit] != 1) PrintAndLogEx(NORMAL, "oops1 at %d", bit);
+        if (sum > 0 && bits[bit] != 1) PrintAndLogEx(NORMAL, "oops1 at %d", bit);
 
-		if (sum < 0 && bits[bit] != 0) PrintAndLogEx(NORMAL, "oops2 at %d", bit);
+        if (sum < 0 && bits[bit] != 0) PrintAndLogEx(NORMAL, "oops2 at %d", bit);
 
-	}
+    }
 
-	// iceman,  use demod buffer?  blue line?
-	// HACK writing back to graphbuffer.
-	GraphTraceLen = 32 * 64;
-	i = 0;
-	for (bit = 0; bit < 64; bit++) {
+    // iceman,  use demod buffer?  blue line?
+    // HACK writing back to graphbuffer.
+    GraphTraceLen = 32 * 64;
+    i = 0;
+    for (bit = 0; bit < 64; bit++) {
 
-		phase = (bits[bit] == 0) ? 0 : 1;
+        phase = (bits[bit] == 0) ? 0 : 1;
 
-		for (j = 0; j < 32; j++) {
-			GraphBuffer[i++] = phase;
-			phase = !phase;
-		}
-	}
-	RepaintGraphWindow();
-	return 0;
+        for (j = 0; j < 32; j++) {
+            GraphBuffer[i++] = phase;
+            phase = !phase;
+        }
+    }
+    RepaintGraphWindow();
+    return 0;
 }
 
 int CmdLFSetConfig(const char *Cmd) {
-	uint8_t divisor =  0;//Frequency divisor
-	uint8_t bps = 0; // Bits per sample
-	uint8_t decimation = 0; //How many to keep
-	bool averaging = 1; // Defaults to true
-	bool errors = false;
-	int trigger_threshold = -1;//Means no change
-	uint8_t unsigned_trigg = 0;
+    uint8_t divisor =  0;//Frequency divisor
+    uint8_t bps = 0; // Bits per sample
+    uint8_t decimation = 0; //How many to keep
+    bool averaging = 1; // Defaults to true
+    bool errors = false;
+    int trigger_threshold = -1;//Means no change
+    uint8_t unsigned_trigg = 0;
 
-	uint8_t cmdp = 0;
-	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch (param_getchar(Cmd, cmdp)) {
-		case 'h':
-			return usage_lf_config();
-		case 'H':
-			divisor = 88;
-			cmdp++;
-			break;
-		case 'L':
-			divisor = 95;
-			cmdp++;
-			break;
-		case 'q':
-			errors |= param_getdec(Cmd, cmdp+1, &divisor);
-			cmdp+=2;
-			break;
-		case 't':
-			errors |= param_getdec(Cmd, cmdp+1, &unsigned_trigg);
-			cmdp+=2;
-			if(!errors) {
-				trigger_threshold = unsigned_trigg;
-				g_lf_threshold_set = (trigger_threshold > 0);
-			}
-			break;
-		case 'b':
-			errors |= param_getdec(Cmd, cmdp+1, &bps);
-			cmdp+=2;
-			break;
-		case 'd':
-			errors |= param_getdec(Cmd, cmdp+1, &decimation);
-			cmdp+=2;
-			break;
-		case 'a':
-			averaging = param_getchar(Cmd, cmdp+1) == '1';
-			cmdp+=2;
-			break;
-		default:
-			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-			errors = 1;
-			break;
-		}
-	}
+    uint8_t cmdp = 0;
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (param_getchar(Cmd, cmdp)) {
+        case 'h':
+            return usage_lf_config();
+        case 'H':
+            divisor = 88;
+            cmdp++;
+            break;
+        case 'L':
+            divisor = 95;
+            cmdp++;
+            break;
+        case 'q':
+            errors |= param_getdec(Cmd, cmdp+1, &divisor);
+            cmdp+=2;
+            break;
+        case 't':
+            errors |= param_getdec(Cmd, cmdp+1, &unsigned_trigg);
+            cmdp+=2;
+            if(!errors) {
+                trigger_threshold = unsigned_trigg;
+                g_lf_threshold_set = (trigger_threshold > 0);
+            }
+            break;
+        case 'b':
+            errors |= param_getdec(Cmd, cmdp+1, &bps);
+            cmdp+=2;
+            break;
+        case 'd':
+            errors |= param_getdec(Cmd, cmdp+1, &decimation);
+            cmdp+=2;
+            break;
+        case 'a':
+            averaging = param_getchar(Cmd, cmdp+1) == '1';
+            cmdp+=2;
+            break;
+        default:
+            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+            errors = 1;
+            break;
+        }
+    }
 
-	//Validations
-	if (errors || cmdp == 0) return usage_lf_config();
+    //Validations
+    if (errors || cmdp == 0) return usage_lf_config();
 
-	//Bps is limited to 8
-	if (bps >> 4) bps = 8;
+    //Bps is limited to 8
+    if (bps >> 4) bps = 8;
 
-	sample_config config = { decimation, bps, averaging, divisor, trigger_threshold };
+    sample_config config = { decimation, bps, averaging, divisor, trigger_threshold };
 
-	UsbCommand c = {CMD_SET_LF_SAMPLING_CONFIG, {0,0,0} };
-	memcpy(c.d.asBytes, &config, sizeof(sample_config));
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+    UsbCommand c = {CMD_SET_LF_SAMPLING_CONFIG, {0,0,0} };
+    memcpy(c.d.asBytes, &config, sizeof(sample_config));
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 
 bool lf_read(bool silent, uint32_t samples) {
-	if ( IsOffline() ) return false;
-	UsbCommand c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_125K, {silent, samples, 0}};
-	clearCommandBuffer();
-	SendCommand(&c);
+    if ( IsOffline() ) return false;
+    UsbCommand c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_125K, {silent, samples, 0}};
+    clearCommandBuffer();
+    SendCommand(&c);
 
-	UsbCommand resp;
-	if (g_lf_threshold_set) {
-		WaitForResponse(CMD_ACK, &resp);
-	} else {
-		if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2500) ) {
-			PrintAndLogEx(WARNING, "command execution time out");
-			return false;
-		}
-	}
-	// resp.arg[0] is bits read not bytes read.
-	getSamples(resp.arg[0]/8, silent);
+    UsbCommand resp;
+    if (g_lf_threshold_set) {
+        WaitForResponse(CMD_ACK, &resp);
+    } else {
+        if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2500) ) {
+            PrintAndLogEx(WARNING, "command execution time out");
+            return false;
+        }
+    }
+    // resp.arg[0] is bits read not bytes read.
+    getSamples(resp.arg[0]/8, silent);
 
-	return true;
+    return true;
 }
 
 int CmdLFRead(const char *Cmd) {
 
-	if ( IsOffline() ) return 0;
+    if ( IsOffline() ) return 0;
 
-	bool errors = false;
-	bool silent = false;
-	uint32_t samples = 0;
-	uint8_t cmdp = 0;
-	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch (tolower(param_getchar(Cmd, cmdp))) {
-		case 'h':
-			return usage_lf_read();
-		case 's':
-			silent = true;
-			cmdp++;
-			break;
-		case 'd':
-			samples = param_get32ex(Cmd, cmdp, 0, 10);
-			cmdp +=2;
-			break;
-		default:
-			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-			errors = true;
-			break;
-		}
-	}
+    bool errors = false;
+    bool silent = false;
+    uint32_t samples = 0;
+    uint8_t cmdp = 0;
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+        case 'h':
+            return usage_lf_read();
+        case 's':
+            silent = true;
+            cmdp++;
+            break;
+        case 'd':
+            samples = param_get32ex(Cmd, cmdp, 0, 10);
+            cmdp +=2;
+            break;
+        default:
+            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+            errors = true;
+            break;
+        }
+    }
 
-	//Validations
-	if (errors) return usage_lf_read();
+    //Validations
+    if (errors) return usage_lf_read();
 
-	return lf_read(silent, samples);
+    return lf_read(silent, samples);
 }
 
 int CmdLFSnoop(const char *Cmd) {
-	uint8_t cmdp = tolower(param_getchar(Cmd, 0));
-	if (cmdp == 'h') return usage_lf_snoop();
+    uint8_t cmdp = tolower(param_getchar(Cmd, 0));
+    if (cmdp == 'h') return usage_lf_snoop();
 
-	UsbCommand c = {CMD_LF_SNOOP_RAW_ADC_SAMPLES,{0,0,0}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	WaitForResponse(CMD_ACK, NULL);
-	getSamples(0, false);
-	return 0;
+    UsbCommand c = {CMD_LF_SNOOP_RAW_ADC_SAMPLES,{0,0,0}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    WaitForResponse(CMD_ACK, NULL);
+    getSamples(0, false);
+    return 0;
 }
 
 static void ChkBitstream(const char *str) {
-	// convert to bitstream if necessary
-	for (int i = 0; i < (int)(GraphTraceLen / 2); i++){
-		if (GraphBuffer[i] > 1 || GraphBuffer[i] < 0) {
-			CmdGetBitStream("");
-			break;
-		}
-	}
+    // convert to bitstream if necessary
+    for (int i = 0; i < (int)(GraphTraceLen / 2); i++){
+        if (GraphBuffer[i] > 1 || GraphBuffer[i] < 0) {
+            CmdGetBitStream("");
+            break;
+        }
+    }
 }
 //Attempt to simulate any wave in buffer (one bit per output sample)
 // converts GraphBuffer to bitstream (based on zero crossings) if needed.
@@ -411,602 +411,602 @@ int CmdLFSim(const char *Cmd) {
 #define FPGA_LF 1
 #define FPGA_HF 2
 
-	int gap = 0;
-	sscanf(Cmd, "%i", &gap);
+    int gap = 0;
+    sscanf(Cmd, "%i", &gap);
 
-	// convert to bitstream if necessary
-	ChkBitstream(Cmd);
+    // convert to bitstream if necessary
+    ChkBitstream(Cmd);
 
-	PrintAndLogEx(DEBUG, "DEBUG: Sending [%d bytes]\n", GraphTraceLen);
+    PrintAndLogEx(DEBUG, "DEBUG: Sending [%d bytes]\n", GraphTraceLen);
 
-	//can send only 512 bits at a time (1 byte sent per bit...)
-	for (uint16_t i = 0; i < GraphTraceLen; i += USB_CMD_DATA_SIZE) {
-		UsbCommand c = {CMD_UPLOAD_SIM_SAMPLES_125K, {i, FPGA_LF, 0}};
+    //can send only 512 bits at a time (1 byte sent per bit...)
+    for (uint16_t i = 0; i < GraphTraceLen; i += USB_CMD_DATA_SIZE) {
+        UsbCommand c = {CMD_UPLOAD_SIM_SAMPLES_125K, {i, FPGA_LF, 0}};
 
-		for (uint16_t j = 0; j < USB_CMD_DATA_SIZE; j++)
-			c.d.asBytes[j] = GraphBuffer[i+j];
+        for (uint16_t j = 0; j < USB_CMD_DATA_SIZE; j++)
+            c.d.asBytes[j] = GraphBuffer[i+j];
 
-		clearCommandBuffer();
-		SendCommand(&c);
-		WaitForResponse(CMD_ACK, NULL);
-		printf("."); fflush(stdout);
-	}
+        clearCommandBuffer();
+        SendCommand(&c);
+        WaitForResponse(CMD_ACK, NULL);
+        printf("."); fflush(stdout);
+    }
 
-	PrintAndLogEx(NORMAL, "Simulating");
+    PrintAndLogEx(NORMAL, "Simulating");
 
-	UsbCommand c = {CMD_SIMULATE_TAG_125K, {GraphTraceLen, gap, 0}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+    UsbCommand c = {CMD_SIMULATE_TAG_125K, {GraphTraceLen, gap, 0}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 
 // by marshmellow - sim fsk data given clock, fcHigh, fcLow, invert
 // - allow pull data from DemodBuffer
 int CmdLFfskSim(const char *Cmd) {
-	//might be able to autodetect FCs and clock from Graphbuffer if using demod buffer
-	// otherwise will need FChigh, FClow, Clock, and bitstream
-	uint8_t fcHigh = 0, fcLow = 0, clk = 0;
-	bool errors = false, separator = false;
-	char hexData[64] = {0x00}; // store entered hex data
-	uint8_t data[255] = {0x00};
-	int dataLen = 0;
-	uint8_t cmdp = 0;
+    //might be able to autodetect FCs and clock from Graphbuffer if using demod buffer
+    // otherwise will need FChigh, FClow, Clock, and bitstream
+    uint8_t fcHigh = 0, fcLow = 0, clk = 0;
+    bool errors = false, separator = false;
+    char hexData[64] = {0x00}; // store entered hex data
+    uint8_t data[255] = {0x00};
+    int dataLen = 0;
+    uint8_t cmdp = 0;
 
-	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch (param_getchar(Cmd, cmdp)){
-			case 'h':
-				return usage_lf_simfsk();
-			case 'c':
-				errors |= param_getdec(Cmd, cmdp+1, &clk);
-				cmdp += 2;
-				break;
-			case 'H':
-				errors |= param_getdec(Cmd, cmdp+1, &fcHigh);
-				cmdp += 2;
-				break;
-			case 'L':
-				errors |= param_getdec(Cmd, cmdp+1, &fcLow);
-				cmdp += 2;
-				break;
-			case 's':
-				separator = 1;
-				cmdp++;
-				break;
-			case 'd':
-				dataLen = param_getstr(Cmd, cmdp+1, hexData, sizeof(hexData));
-				if (dataLen == 0)
-					errors = true;
-				else
-					dataLen = hextobinarray((char *)data, hexData);
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (param_getchar(Cmd, cmdp)){
+            case 'h':
+                return usage_lf_simfsk();
+            case 'c':
+                errors |= param_getdec(Cmd, cmdp+1, &clk);
+                cmdp += 2;
+                break;
+            case 'H':
+                errors |= param_getdec(Cmd, cmdp+1, &fcHigh);
+                cmdp += 2;
+                break;
+            case 'L':
+                errors |= param_getdec(Cmd, cmdp+1, &fcLow);
+                cmdp += 2;
+                break;
+            case 's':
+                separator = 1;
+                cmdp++;
+                break;
+            case 'd':
+                dataLen = param_getstr(Cmd, cmdp+1, hexData, sizeof(hexData));
+                if (dataLen == 0)
+                    errors = true;
+                else
+                    dataLen = hextobinarray((char *)data, hexData);
 
-				if (dataLen == 0) errors = true;
-				if (errors) PrintAndLogEx(WARNING, "Error getting hex data");
-				cmdp += 2;
-				break;
-			default:
-				PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-				errors = true;
-				break;
-		}
-	}
+                if (dataLen == 0) errors = true;
+                if (errors) PrintAndLogEx(WARNING, "Error getting hex data");
+                cmdp += 2;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                errors = true;
+                break;
+        }
+    }
 
-	// No args
-	if (cmdp == 0 && DemodBufferLen == 0) return usage_lf_simfsk();
+    // No args
+    if (cmdp == 0 && DemodBufferLen == 0) return usage_lf_simfsk();
 
-	//Validations
-	if (errors) return usage_lf_simfsk();
+    //Validations
+    if (errors) return usage_lf_simfsk();
 
-	int firstClockEdge = 0;
-	if (dataLen == 0){ //using DemodBuffer
-		if (clk == 0 || fcHigh == 0 || fcLow == 0){ //manual settings must set them all
-			uint8_t ans = fskClocks(&fcHigh, &fcLow, &clk, &firstClockEdge);
-			if (ans==0){
-				if (!fcHigh) fcHigh = 10;
-				if (!fcLow) fcLow = 8;
-				if (!clk) clk = 50;
-			}
-		}
-	} else {
-		setDemodBuf(data, dataLen, 0);
-	}
+    int firstClockEdge = 0;
+    if (dataLen == 0){ //using DemodBuffer
+        if (clk == 0 || fcHigh == 0 || fcLow == 0){ //manual settings must set them all
+            uint8_t ans = fskClocks(&fcHigh, &fcLow, &clk, &firstClockEdge);
+            if (ans==0){
+                if (!fcHigh) fcHigh = 10;
+                if (!fcLow) fcLow = 8;
+                if (!clk) clk = 50;
+            }
+        }
+    } else {
+        setDemodBuf(data, dataLen, 0);
+    }
 
-	//default if not found
-	if (clk == 0) clk = 50;
-	if (fcHigh == 0) fcHigh = 10;
-	if (fcLow == 0) fcLow = 8;
+    //default if not found
+    if (clk == 0) clk = 50;
+    if (fcHigh == 0) fcHigh = 10;
+    if (fcLow == 0) fcLow = 8;
 
-	uint16_t arg1, arg2;
-	arg1 = fcHigh << 8 | fcLow;
-	arg2 = separator << 8 | clk;
-	size_t size = DemodBufferLen;
-	if (size > USB_CMD_DATA_SIZE) {
-		PrintAndLogEx(NORMAL, "DemodBuffer too long for current implementation - length: %d - max: %d", size, USB_CMD_DATA_SIZE);
-		size = USB_CMD_DATA_SIZE;
-	}
-	UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}};
+    uint16_t arg1, arg2;
+    arg1 = fcHigh << 8 | fcLow;
+    arg2 = separator << 8 | clk;
+    size_t size = DemodBufferLen;
+    if (size > USB_CMD_DATA_SIZE) {
+        PrintAndLogEx(NORMAL, "DemodBuffer too long for current implementation - length: %d - max: %d", size, USB_CMD_DATA_SIZE);
+        size = USB_CMD_DATA_SIZE;
+    }
+    UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}};
 
-	memcpy(c.d.asBytes, DemodBuffer, size);
-	clearCommandBuffer();
-	SendCommand(&c);
+    memcpy(c.d.asBytes, DemodBuffer, size);
+    clearCommandBuffer();
+    SendCommand(&c);
 
-	setClockGrid(clk, 0);
-	return 0;
+    setClockGrid(clk, 0);
+    return 0;
 }
 
 // by marshmellow - sim ask data given clock, invert, manchester or raw, separator
 // - allow pull data from DemodBuffer
 int CmdLFaskSim(const char *Cmd) {
-	// autodetect clock from Graphbuffer if using demod buffer
-	// needs clock, invert, manchester/raw as m or r, separator as s, and bitstream
-	uint8_t encoding = 1, separator = 0, clk = 0, invert = 0;
-	bool errors = false;
-	char hexData[64] = {0x00};
-	uint8_t data[255] = {0x00}; // store entered hex data
-	int dataLen = 0;
-	uint8_t cmdp = 0;
+    // autodetect clock from Graphbuffer if using demod buffer
+    // needs clock, invert, manchester/raw as m or r, separator as s, and bitstream
+    uint8_t encoding = 1, separator = 0, clk = 0, invert = 0;
+    bool errors = false;
+    char hexData[64] = {0x00};
+    uint8_t data[255] = {0x00}; // store entered hex data
+    int dataLen = 0;
+    uint8_t cmdp = 0;
 
-	while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch (tolower(param_getchar(Cmd, cmdp))) {
-			case 'h': return usage_lf_simask();
-			case 'i':
-				invert = 1;
-				cmdp++;
-				break;
-			case 'c':
-				errors |= param_getdec(Cmd, cmdp+1, &clk);
-				cmdp += 2;
-				break;
-			case 'b':
-				encoding = 2; //biphase
-				cmdp++;
-				break;
-			case 'm':
-				encoding = 1; //manchester
-				cmdp++;
-				break;
-			case 'r':
-				encoding = 0; //raw
-				cmdp++;
-				break;
-			case 's':
-				separator = 1;
-				cmdp++;
-				break;
-			case 'd':
-				dataLen = param_getstr(Cmd, cmdp+1, hexData, sizeof(hexData));
-				if (dataLen == 0)
-					errors = true;
-				else
-					dataLen = hextobinarray((char *)data, hexData);
+    while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+            case 'h': return usage_lf_simask();
+            case 'i':
+                invert = 1;
+                cmdp++;
+                break;
+            case 'c':
+                errors |= param_getdec(Cmd, cmdp+1, &clk);
+                cmdp += 2;
+                break;
+            case 'b':
+                encoding = 2; //biphase
+                cmdp++;
+                break;
+            case 'm':
+                encoding = 1; //manchester
+                cmdp++;
+                break;
+            case 'r':
+                encoding = 0; //raw
+                cmdp++;
+                break;
+            case 's':
+                separator = 1;
+                cmdp++;
+                break;
+            case 'd':
+                dataLen = param_getstr(Cmd, cmdp+1, hexData, sizeof(hexData));
+                if (dataLen == 0)
+                    errors = true;
+                else
+                    dataLen = hextobinarray((char *)data, hexData);
 
-				if (dataLen == 0) errors = true;
-				if (errors) PrintAndLogEx(WARNING, "Error getting hex data, datalen: %d", dataLen);
-				cmdp += 2;
-				break;
-			default:
-				PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-				errors = true;
-				break;
-		}
-	}
+                if (dataLen == 0) errors = true;
+                if (errors) PrintAndLogEx(WARNING, "Error getting hex data, datalen: %d", dataLen);
+                cmdp += 2;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                errors = true;
+                break;
+        }
+    }
 
-	// No args
-	if (cmdp == 0 && DemodBufferLen == 0) return usage_lf_simask();
+    // No args
+    if (cmdp == 0 && DemodBufferLen == 0) return usage_lf_simask();
 
-	//Validations
-	if (errors) return usage_lf_simask();
+    //Validations
+    if (errors) return usage_lf_simask();
 
-	if (dataLen == 0){ //using DemodBuffer
-		if (clk == 0)
-			clk = GetAskClock("0", false);
-	} else {
-		setDemodBuf(data, dataLen, 0);
-	}
-	if (clk == 0) clk = 64;
-	if (encoding == 0) clk /= 2; //askraw needs to double the clock speed
+    if (dataLen == 0){ //using DemodBuffer
+        if (clk == 0)
+            clk = GetAskClock("0", false);
+    } else {
+        setDemodBuf(data, dataLen, 0);
+    }
+    if (clk == 0) clk = 64;
+    if (encoding == 0) clk /= 2; //askraw needs to double the clock speed
 
-	size_t size = DemodBufferLen;
+    size_t size = DemodBufferLen;
 
-	if (size > USB_CMD_DATA_SIZE) {
-		PrintAndLogEx(NORMAL, "DemodBuffer too long for current implementation - length: %d - max: %d", size, USB_CMD_DATA_SIZE);
-		size = USB_CMD_DATA_SIZE;
-	}
+    if (size > USB_CMD_DATA_SIZE) {
+        PrintAndLogEx(NORMAL, "DemodBuffer too long for current implementation - length: %d - max: %d", size, USB_CMD_DATA_SIZE);
+        size = USB_CMD_DATA_SIZE;
+    }
 
-	PrintAndLogEx(NORMAL, "preparing to sim ask data: %d bits", size);
+    PrintAndLogEx(NORMAL, "preparing to sim ask data: %d bits", size);
 
-	uint16_t arg1, arg2;
-	arg1 = clk << 8 | encoding;
-	arg2 = invert << 8 | separator;
+    uint16_t arg1, arg2;
+    arg1 = clk << 8 | encoding;
+    arg2 = invert << 8 | separator;
 
-	UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};
-	memcpy(c.d.asBytes, DemodBuffer, size);
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+    UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};
+    memcpy(c.d.asBytes, DemodBuffer, size);
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 
 // by marshmellow - sim psk data given carrier, clock, invert
 // - allow pull data from DemodBuffer or parameters
 int CmdLFpskSim(const char *Cmd) {
-	//might be able to autodetect FC and clock from Graphbuffer if using demod buffer
-	//will need carrier, Clock, and bitstream
-	uint8_t carrier=0, clk=0;
-	uint8_t invert=0;
-	bool errors = false;
-	char hexData[64] = {0x00}; // store entered hex data
-	uint8_t data[255] = {0x00};
-	int dataLen = 0;
-	uint8_t cmdp = 0;
-	uint8_t pskType = 1;
+    //might be able to autodetect FC and clock from Graphbuffer if using demod buffer
+    //will need carrier, Clock, and bitstream
+    uint8_t carrier=0, clk=0;
+    uint8_t invert=0;
+    bool errors = false;
+    char hexData[64] = {0x00}; // store entered hex data
+    uint8_t data[255] = {0x00};
+    int dataLen = 0;
+    uint8_t cmdp = 0;
+    uint8_t pskType = 1;
 
-	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch (tolower(param_getchar(Cmd, cmdp))) {
-			case 'h':
-				return usage_lf_simpsk();
-			case 'i':
-				invert = 1;
-				cmdp++;
-				break;
-			case 'c':
-				errors |= param_getdec(Cmd,cmdp+1,&clk);
-				cmdp +=2;
-				break;
-			case 'r':
-				errors |= param_getdec(Cmd,cmdp+1,&carrier);
-				cmdp += 2;
-				break;
-			case '1':
-				pskType = 1;
-				cmdp++;
-				break;
-			case '2':
-				pskType = 2;
-				cmdp++;
-				break;
-			case '3':
-				pskType = 3;
-				cmdp++;
-				break;
-			case 'd':
-				dataLen = param_getstr(Cmd, cmdp+1, hexData, sizeof(hexData));
-				if (dataLen == 0)
-					errors = true;
-				else
-					dataLen = hextobinarray((char *)data, hexData);
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+            case 'h':
+                return usage_lf_simpsk();
+            case 'i':
+                invert = 1;
+                cmdp++;
+                break;
+            case 'c':
+                errors |= param_getdec(Cmd,cmdp+1,&clk);
+                cmdp +=2;
+                break;
+            case 'r':
+                errors |= param_getdec(Cmd,cmdp+1,&carrier);
+                cmdp += 2;
+                break;
+            case '1':
+                pskType = 1;
+                cmdp++;
+                break;
+            case '2':
+                pskType = 2;
+                cmdp++;
+                break;
+            case '3':
+                pskType = 3;
+                cmdp++;
+                break;
+            case 'd':
+                dataLen = param_getstr(Cmd, cmdp+1, hexData, sizeof(hexData));
+                if (dataLen == 0)
+                    errors = true;
+                else
+                    dataLen = hextobinarray((char *)data, hexData);
 
-				if (dataLen == 0) errors = true;
-				if (errors) PrintAndLogEx(WARNING, "Error getting hex data");
-				cmdp+=2;
-				break;
-			default:
-				PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-				errors = true;
-				break;
-			}
-	}
-	// No args
-	if (cmdp == 0 && DemodBufferLen == 0)
-		errors = true;
+                if (dataLen == 0) errors = true;
+                if (errors) PrintAndLogEx(WARNING, "Error getting hex data");
+                cmdp+=2;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                errors = true;
+                break;
+            }
+    }
+    // No args
+    if (cmdp == 0 && DemodBufferLen == 0)
+        errors = true;
 
-	//Validations
-	if (errors) return usage_lf_simpsk();
+    //Validations
+    if (errors) return usage_lf_simpsk();
 
-	if (dataLen == 0){ //using DemodBuffer
-		PrintAndLogEx(NORMAL, "Getting Clocks");
+    if (dataLen == 0){ //using DemodBuffer
+        PrintAndLogEx(NORMAL, "Getting Clocks");
 
-		if (clk==0) clk = GetPskClock("", false);
-		PrintAndLogEx(NORMAL, "clk: %d",clk);
+        if (clk==0) clk = GetPskClock("", false);
+        PrintAndLogEx(NORMAL, "clk: %d",clk);
 
-		if (!carrier) carrier = GetPskCarrier("", false);
-		PrintAndLogEx(NORMAL, "carrier: %d", carrier);
+        if (!carrier) carrier = GetPskCarrier("", false);
+        PrintAndLogEx(NORMAL, "carrier: %d", carrier);
 
-	} else {
-		setDemodBuf(data, dataLen, 0);
-	}
+    } else {
+        setDemodBuf(data, dataLen, 0);
+    }
 
-	if (clk <= 0) clk = 32;
+    if (clk <= 0) clk = 32;
 
-	if (carrier != 2 && carrier != 4 && carrier != 8 )
-		carrier = 2;
+    if (carrier != 2 && carrier != 4 && carrier != 8 )
+        carrier = 2;
 
-	if (pskType != 1){
-		if (pskType == 2){
-			//need to convert psk2 to psk1 data before sim
-			psk2TOpsk1(DemodBuffer, DemodBufferLen);
-		} else {
-			PrintAndLogEx(NORMAL, "Sorry, PSK3 not yet available");
-		}
-	}
-	uint16_t arg1, arg2;
-	arg1 = clk << 8 | carrier;
-	arg2 = invert;
-	size_t size = DemodBufferLen;
-	if (size > USB_CMD_DATA_SIZE) {
-		PrintAndLogEx(NORMAL, "DemodBuffer too long for current implementation - length: %d - max: %d", size, USB_CMD_DATA_SIZE);
-		size = USB_CMD_DATA_SIZE;
-	}
-	UsbCommand c = {CMD_PSK_SIM_TAG, {arg1, arg2, size}};
-	PrintAndLogEx(DEBUG, "DEBUG: Sending DemodBuffer Length: %d", size);
-	memcpy(c.d.asBytes, DemodBuffer, size);
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+    if (pskType != 1){
+        if (pskType == 2){
+            //need to convert psk2 to psk1 data before sim
+            psk2TOpsk1(DemodBuffer, DemodBufferLen);
+        } else {
+            PrintAndLogEx(NORMAL, "Sorry, PSK3 not yet available");
+        }
+    }
+    uint16_t arg1, arg2;
+    arg1 = clk << 8 | carrier;
+    arg2 = invert;
+    size_t size = DemodBufferLen;
+    if (size > USB_CMD_DATA_SIZE) {
+        PrintAndLogEx(NORMAL, "DemodBuffer too long for current implementation - length: %d - max: %d", size, USB_CMD_DATA_SIZE);
+        size = USB_CMD_DATA_SIZE;
+    }
+    UsbCommand c = {CMD_PSK_SIM_TAG, {arg1, arg2, size}};
+    PrintAndLogEx(DEBUG, "DEBUG: Sending DemodBuffer Length: %d", size);
+    memcpy(c.d.asBytes, DemodBuffer, size);
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 
 int CmdLFSimBidir(const char *Cmd) {
-	// Set ADC to twice the carrier for a slight supersampling
-	// HACK: not implemented in ARMSRC.
-	PrintAndLogEx(INFO, "Not implemented yet.");
-	UsbCommand c = {CMD_LF_SIMULATE_BIDIR, {47, 384, 0}};
-	SendCommand(&c);
-	return 0;
+    // Set ADC to twice the carrier for a slight supersampling
+    // HACK: not implemented in ARMSRC.
+    PrintAndLogEx(INFO, "Not implemented yet.");
+    UsbCommand c = {CMD_LF_SIMULATE_BIDIR, {47, 384, 0}};
+    SendCommand(&c);
+    return 0;
 }
 
 // ICEMAN,  todo,   swap from Graphbuffer.
 int CmdVchDemod(const char *Cmd) {
-	// Is this the entire sync pattern, or does this also include some
-	// data bits that happen to be the same everywhere? That would be
-	// lovely to know.
-	static const int SyncPattern[] = {
-		1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-		1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-		1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-		1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-		1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-		1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-		1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-		1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-		1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-		1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-	};
+    // Is this the entire sync pattern, or does this also include some
+    // data bits that happen to be the same everywhere? That would be
+    // lovely to know.
+    static const int SyncPattern[] = {
+        1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
+        1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
+        1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
+        1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
+        1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
+        1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    };
 
-	// So first, we correlate for the sync pattern, and mark that.
-	int bestCorrel = 0, bestPos = 0;
-	int i, j, sum = 0;
+    // So first, we correlate for the sync pattern, and mark that.
+    int bestCorrel = 0, bestPos = 0;
+    int i, j, sum = 0;
 
-	// It does us no good to find the sync pattern, with fewer than 2048 samples after it.
+    // It does us no good to find the sync pattern, with fewer than 2048 samples after it.
 
-	for (i = 0; i < (GraphTraceLen - 2048); i++) {
-		for (j = 0; j < ARRAYLEN(SyncPattern); j++) {
-			sum += GraphBuffer[i+j] * SyncPattern[j];
-		}
-		if (sum > bestCorrel) {
-			bestCorrel = sum;
-			bestPos = i;
-		}
-	}
-	PrintAndLogEx(NORMAL, "best sync at %d [metric %d]", bestPos, bestCorrel);
+    for (i = 0; i < (GraphTraceLen - 2048); i++) {
+        for (j = 0; j < ARRAYLEN(SyncPattern); j++) {
+            sum += GraphBuffer[i+j] * SyncPattern[j];
+        }
+        if (sum > bestCorrel) {
+            bestCorrel = sum;
+            bestPos = i;
+        }
+    }
+    PrintAndLogEx(NORMAL, "best sync at %d [metric %d]", bestPos, bestCorrel);
 
-	char bits[257];
-	bits[256] = '\0';
+    char bits[257];
+    bits[256] = '\0';
 
-	int worst = INT_MAX, worstPos = 0;
+    int worst = INT_MAX, worstPos = 0;
 
-	for (i = 0; i < 2048; i += 8) {
-		sum = 0;
-		for (j = 0; j < 8; j++)
-			sum += GraphBuffer[bestPos+i+j];
+    for (i = 0; i < 2048; i += 8) {
+        sum = 0;
+        for (j = 0; j < 8; j++)
+            sum += GraphBuffer[bestPos+i+j];
 
-		if (sum < 0)
-			bits[i/8] = '.';
-		else
-			bits[i/8] = '1';
+        if (sum < 0)
+            bits[i/8] = '.';
+        else
+            bits[i/8] = '1';
 
-		if(abs(sum) < worst) {
-			worst = abs(sum);
-			worstPos = i;
-		}
-	}
-	PrintAndLogEx(NORMAL, "bits:");
-	PrintAndLogEx(NORMAL, "%s", bits);
-	PrintAndLogEx(NORMAL, "worst metric: %d at pos %d", worst, worstPos);
+        if(abs(sum) < worst) {
+            worst = abs(sum);
+            worstPos = i;
+        }
+    }
+    PrintAndLogEx(NORMAL, "bits:");
+    PrintAndLogEx(NORMAL, "%s", bits);
+    PrintAndLogEx(NORMAL, "worst metric: %d at pos %d", worst, worstPos);
 
-	// clone
-	if (strcmp(Cmd, "clone")==0) {
-		GraphTraceLen = 0;
-		char *s;
-			for(s = bits; *s; s++) {
-				for(j = 0; j < 16; j++) {
-					GraphBuffer[GraphTraceLen++] = (*s == '1') ? 1 : 0;
-				}
-			}
-		RepaintGraphWindow();
-	}
-	return 0;
+    // clone
+    if (strcmp(Cmd, "clone")==0) {
+        GraphTraceLen = 0;
+        char *s;
+            for(s = bits; *s; s++) {
+                for(j = 0; j < 16; j++) {
+                    GraphBuffer[GraphTraceLen++] = (*s == '1') ? 1 : 0;
+                }
+            }
+        RepaintGraphWindow();
+    }
+    return 0;
 }
 
 //by marshmellow
 bool CheckChipType(bool getDeviceData) {
 
-	bool retval = false;
+    bool retval = false;
 
-	if (!getDeviceData) return retval;
+    if (!getDeviceData) return retval;
 
-	save_restoreGB(GRAPH_SAVE);
-	save_restoreDB(GRAPH_SAVE);
+    save_restoreGB(GRAPH_SAVE);
+    save_restoreDB(GRAPH_SAVE);
 
-	//check for em4x05/em4x69 chips first
-	uint32_t word = 0;
-	if (EM4x05IsBlock0(&word)) {
-		PrintAndLogEx(SUCCESS, "\nValid EM4x05/EM4x69 Chip Found");
-		PrintAndLogEx(SUCCESS, "Try " _YELLOW_(`lf em 4x05`) " commands");
-		retval = true;
-		goto out;
-	}
+    //check for em4x05/em4x69 chips first
+    uint32_t word = 0;
+    if (EM4x05IsBlock0(&word)) {
+        PrintAndLogEx(SUCCESS, "\nValid EM4x05/EM4x69 Chip Found");
+        PrintAndLogEx(SUCCESS, "Try " _YELLOW_(`lf em 4x05`) " commands");
+        retval = true;
+        goto out;
+    }
 
-	//check for t55xx chip...
-	if (tryDetectP1(true)) {
-		PrintAndLogEx(SUCCESS, "\nValid T55xx Chip Found");
-		PrintAndLogEx(SUCCESS, "Try " _YELLOW_(`lf t55xx`)" commands");
-		retval = true;
-		goto out;
-	}
+    //check for t55xx chip...
+    if (tryDetectP1(true)) {
+        PrintAndLogEx(SUCCESS, "\nValid T55xx Chip Found");
+        PrintAndLogEx(SUCCESS, "Try " _YELLOW_(`lf t55xx`)" commands");
+        retval = true;
+        goto out;
+    }
 
-out:	
-	save_restoreGB(GRAPH_RESTORE);
-	save_restoreDB(GRAPH_RESTORE);
-	return retval;
+out:
+    save_restoreGB(GRAPH_RESTORE);
+    save_restoreDB(GRAPH_RESTORE);
+    return retval;
 }
 
 //by marshmellow
 int CmdLFfind(const char *Cmd) {
-	int ans = 0;
-	size_t minLength = 2000;
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	char testRaw = param_getchar(Cmd, 1);
+    int ans = 0;
+    size_t minLength = 2000;
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    char testRaw = param_getchar(Cmd, 1);
 
-	if (strlen(Cmd) > 3 || cmdp == 'h') return usage_lf_find();
+    if (strlen(Cmd) > 3 || cmdp == 'h') return usage_lf_find();
 
-	if (cmdp == 'u') testRaw = 'u';
+    if (cmdp == 'u') testRaw = 'u';
 
-	bool isOnline = (!IsOffline() && (cmdp != '1') );
+    bool isOnline = (!IsOffline() && (cmdp != '1') );
 
-	if (isOnline)
-		lf_read(true, 30000);
+    if (isOnline)
+        lf_read(true, 30000);
 
-	if (GraphTraceLen < minLength) {
-		PrintAndLogEx(FAILED, "Data in Graphbuffer was too small.");
-		return 0;
-	}
+    if (GraphTraceLen < minLength) {
+        PrintAndLogEx(FAILED, "Data in Graphbuffer was too small.");
+        return 0;
+    }
 
-	PrintAndLogEx(INFO, "NOTE: some demods output possible binary");
-	PrintAndLogEx(INFO, "if it finds something that looks like a tag");
-	PrintAndLogEx(INFO, "False Positives " _YELLOW_(ARE) "possible\n");
-	PrintAndLogEx(INFO, "\nChecking for known tags:\n");
+    PrintAndLogEx(INFO, "NOTE: some demods output possible binary");
+    PrintAndLogEx(INFO, "if it finds something that looks like a tag");
+    PrintAndLogEx(INFO, "False Positives " _YELLOW_(ARE) "possible\n");
+    PrintAndLogEx(INFO, "\nChecking for known tags:\n");
 
-	// only run these tests if device is online
-	if (isOnline) {
-		// only run if graphbuffer is just noise as it should be for hitag
-		// The improved noise detection will find Cotag.
-		if (getSignalProperties()->isnoise) {
+    // only run these tests if device is online
+    if (isOnline) {
+        // only run if graphbuffer is just noise as it should be for hitag
+        // The improved noise detection will find Cotag.
+        if (getSignalProperties()->isnoise) {
 
-			PrintAndLogEx(INFO, "Signal looks just like noise. Looking for Hitag signal now.");
+            PrintAndLogEx(INFO, "Signal looks just like noise. Looking for Hitag signal now.");
 
-			// 26 === RHT2F_UID_ONLY
-			if (CmdLFHitagReader("26") == 0) { PrintAndLogEx(SUCCESS, "\nValid Hitag Found!"); return 1;}
-			if (CmdCOTAGRead("") > 0) 	{ PrintAndLogEx(SUCCESS, "\nValid COTAG ID Found!"); return 1;}
+            // 26 === RHT2F_UID_ONLY
+            if (CmdLFHitagReader("26") == 0) { PrintAndLogEx(SUCCESS, "\nValid Hitag Found!"); return 1;}
+            if (CmdCOTAGRead("") > 0) { PrintAndLogEx(SUCCESS, "\nValid COTAG ID Found!"); return 1;}
 
-			PrintAndLogEx(FAILED, "\nNo Data Found! - maybe not an LF tag?");
-		    return 0;
-		}
-	}
+            PrintAndLogEx(FAILED, "\nNo Data Found! - maybe not an LF tag?");
+            return 0;
+        }
+    }
 
-	if (EM4x50Read("", false))	{ PrintAndLogEx(SUCCESS, "\nValid EM4x50 ID Found!"); return 1;}
-	if (CmdAWIDDemod(""))		{ PrintAndLogEx(SUCCESS, "\nValid AWID ID Found!"); goto out;}
-	if (CmdEM410xDemod(""))		{ PrintAndLogEx(SUCCESS, "\nValid EM410x ID Found!"); goto out;}
-	if (CmdFdxDemod(""))		{ PrintAndLogEx(SUCCESS, "\nValid FDX-B ID Found!"); goto out;}
-	if (CmdGuardDemod(""))		{ PrintAndLogEx(SUCCESS, "\nValid Guardall G-Prox II ID Found!"); goto out; }
-	if (CmdHIDDemod(""))		{ PrintAndLogEx(SUCCESS, "\nValid HID Prox ID Found!"); goto out;}
-	if (CmdPSKIdteck(""))		{ PrintAndLogEx(SUCCESS, "\nValid Idteck ID Found!"); goto out;}
-	if (CmdIndalaDemod(""))		{ PrintAndLogEx(SUCCESS, "\nValid Indala ID Found!");  goto out;}
-	if (CmdIOProxDemod(""))		{ PrintAndLogEx(SUCCESS, "\nValid IO Prox ID Found!"); goto out;}
-	if (CmdJablotronDemod(""))	{ PrintAndLogEx(SUCCESS, "\nValid Jablotron ID Found!"); goto out;}
-	if (CmdLFNedapDemod(""))	{ PrintAndLogEx(SUCCESS, "\nValid NEDAP ID Found!"); goto out;}
-	if (CmdNexWatchDemod("")) 	{ PrintAndLogEx(SUCCESS, "\nValid NexWatch ID Found!"); goto out;}
-	if (CmdNoralsyDemod(""))	{ PrintAndLogEx(SUCCESS, "\nValid Noralsy ID Found!"); goto out;}
-	if (CmdKeriDemod(""))		{ PrintAndLogEx(SUCCESS, "\nValid KERI ID Found!"); goto out;}
-	if (CmdPacDemod(""))		{ PrintAndLogEx(SUCCESS, "\nValid PAC/Stanley ID Found!"); goto out;}
-	if (CmdParadoxDemod(""))	{ PrintAndLogEx(SUCCESS, "\nValid Paradox ID Found!"); goto out;}
-	if (CmdPrescoDemod(""))		{ PrintAndLogEx(SUCCESS, "\nValid Presco ID Found!"); goto out;}
-	if (CmdPyramidDemod(""))	{ PrintAndLogEx(SUCCESS, "\nValid Pyramid ID Found!"); goto out;}
-	if (CmdSecurakeyDemod(""))	{ PrintAndLogEx(SUCCESS, "\nValid Securakey ID Found!"); goto out;}
-	if (CmdVikingDemod(""))		{ PrintAndLogEx(SUCCESS, "\nValid Viking ID Found!"); goto out;}
-	if (CmdVisa2kDemod(""))		{ PrintAndLogEx(SUCCESS, "\nValid Visa2000 ID Found!"); goto out;}
-    if (CmdTIDemod(""))     	{ PrintAndLogEx(SUCCESS, "\nValid Texas Instrument ID Found!"); goto out;}
-	//if (CmdFermaxDemod(""))		{ PrintAndLogEx(SUCCESS, "\nValid Fermax ID Found!"); goto out;}
-	// flexdemod?
+    if (EM4x50Read("", false))  { PrintAndLogEx(SUCCESS, "\nValid EM4x50 ID Found!"); return 1;}
+    if (CmdAWIDDemod(""))       { PrintAndLogEx(SUCCESS, "\nValid AWID ID Found!"); goto out;}
+    if (CmdEM410xDemod(""))     { PrintAndLogEx(SUCCESS, "\nValid EM410x ID Found!"); goto out;}
+    if (CmdFdxDemod(""))        { PrintAndLogEx(SUCCESS, "\nValid FDX-B ID Found!"); goto out;}
+    if (CmdGuardDemod(""))      { PrintAndLogEx(SUCCESS, "\nValid Guardall G-Prox II ID Found!"); goto out; }
+    if (CmdHIDDemod(""))        { PrintAndLogEx(SUCCESS, "\nValid HID Prox ID Found!"); goto out;}
+    if (CmdPSKIdteck(""))       { PrintAndLogEx(SUCCESS, "\nValid Idteck ID Found!"); goto out;}
+    if (CmdIndalaDemod(""))     { PrintAndLogEx(SUCCESS, "\nValid Indala ID Found!");  goto out;}
+    if (CmdIOProxDemod(""))     { PrintAndLogEx(SUCCESS, "\nValid IO Prox ID Found!"); goto out;}
+    if (CmdJablotronDemod(""))  { PrintAndLogEx(SUCCESS, "\nValid Jablotron ID Found!"); goto out;}
+    if (CmdLFNedapDemod(""))    { PrintAndLogEx(SUCCESS, "\nValid NEDAP ID Found!"); goto out;}
+    if (CmdNexWatchDemod(""))   { PrintAndLogEx(SUCCESS, "\nValid NexWatch ID Found!"); goto out;}
+    if (CmdNoralsyDemod(""))    { PrintAndLogEx(SUCCESS, "\nValid Noralsy ID Found!"); goto out;}
+    if (CmdKeriDemod(""))       { PrintAndLogEx(SUCCESS, "\nValid KERI ID Found!"); goto out;}
+    if (CmdPacDemod(""))        { PrintAndLogEx(SUCCESS, "\nValid PAC/Stanley ID Found!"); goto out;}
+    if (CmdParadoxDemod(""))    { PrintAndLogEx(SUCCESS, "\nValid Paradox ID Found!"); goto out;}
+    if (CmdPrescoDemod(""))     { PrintAndLogEx(SUCCESS, "\nValid Presco ID Found!"); goto out;}
+    if (CmdPyramidDemod(""))    { PrintAndLogEx(SUCCESS, "\nValid Pyramid ID Found!"); goto out;}
+    if (CmdSecurakeyDemod(""))  { PrintAndLogEx(SUCCESS, "\nValid Securakey ID Found!"); goto out;}
+    if (CmdVikingDemod(""))     { PrintAndLogEx(SUCCESS, "\nValid Viking ID Found!"); goto out;}
+    if (CmdVisa2kDemod(""))     { PrintAndLogEx(SUCCESS, "\nValid Visa2000 ID Found!"); goto out;}
+    if (CmdTIDemod(""))         { PrintAndLogEx(SUCCESS, "\nValid Texas Instrument ID Found!"); goto out;}
+    //if (CmdFermaxDemod("")) { PrintAndLogEx(SUCCESS, "\nValid Fermax ID Found!"); goto out;}
+    // flexdemod?
 
-	PrintAndLogEx(FAILED, "\nNo known 125/134 KHz tags Found!\n");
+    PrintAndLogEx(FAILED, "\nNo known 125/134 KHz tags Found!\n");
 
-	if (testRaw == 'u'){
-		//test unknown tag formats (raw mode)
-		PrintAndLogEx(INFO, "\nChecking for Unknown tags:\n");
-		ans = AutoCorrelate(GraphBuffer, GraphBuffer, GraphTraceLen, 4000, false, false);
-		if (ans > 0) {
+    if (testRaw == 'u'){
+        //test unknown tag formats (raw mode)
+        PrintAndLogEx(INFO, "\nChecking for Unknown tags:\n");
+        ans = AutoCorrelate(GraphBuffer, GraphBuffer, GraphTraceLen, 4000, false, false);
+        if (ans > 0) {
 
-			PrintAndLogEx(INFO, "Possible Auto Correlation of %d repeating samples",ans);
+            PrintAndLogEx(INFO, "Possible Auto Correlation of %d repeating samples",ans);
 
-			if ( ans % 8 == 0)
-				PrintAndLogEx(INFO, "Possible %d bytes", (ans / 8));
-		}
+            if ( ans % 8 == 0)
+                PrintAndLogEx(INFO, "Possible %d bytes", (ans / 8));
+        }
 
-		 //fsk
-		if ( GetFskClock("", false) ) {
-			if ( FSKrawDemod("", true) ) {
-				PrintAndLogEx(NORMAL, "\nUnknown FSK Modulated Tag Found!"); goto out;
-			}
-		}
+         //fsk
+        if ( GetFskClock("", false) ) {
+            if ( FSKrawDemod("", true) ) {
+                PrintAndLogEx(NORMAL, "\nUnknown FSK Modulated Tag Found!"); goto out;
+            }
+        }
 
-		bool st = true;
-		if ( ASKDemod_ext("0 0 0", true, false, 1, &st) ) {
-		  PrintAndLogEx(NORMAL, "\nUnknown ASK Modulated and Manchester encoded Tag Found!");
-		  PrintAndLogEx(NORMAL, "\nif it does not look right it could instead be ASK/Biphase - try 'data rawdemod ab'");
-		  goto out;
-		}
+        bool st = true;
+        if ( ASKDemod_ext("0 0 0", true, false, 1, &st) ) {
+          PrintAndLogEx(NORMAL, "\nUnknown ASK Modulated and Manchester encoded Tag Found!");
+          PrintAndLogEx(NORMAL, "\nif it does not look right it could instead be ASK/Biphase - try 'data rawdemod ab'");
+          goto out;
+        }
 
-		if ( CmdPSK1rawDemod("") ) {
-			PrintAndLogEx(NORMAL, "Possible unknown PSK1 Modulated Tag Found above!\n\nCould also be PSK2 - try 'data rawdemod p2'");
-			PrintAndLogEx(NORMAL, "\nCould also be PSK3 - [currently not supported]");
-			PrintAndLogEx(NORMAL, "\nCould also be NRZ - try 'data nrzrawdemod");
-			goto out;
-		}
+        if ( CmdPSK1rawDemod("") ) {
+            PrintAndLogEx(NORMAL, "Possible unknown PSK1 Modulated Tag Found above!\n\nCould also be PSK2 - try 'data rawdemod p2'");
+            PrintAndLogEx(NORMAL, "\nCould also be PSK3 - [currently not supported]");
+            PrintAndLogEx(NORMAL, "\nCould also be NRZ - try 'data nrzrawdemod");
+            goto out;
+        }
 
-		PrintAndLogEx(FAILED, "\nNo Data Found!\n");
-	}
+        PrintAndLogEx(FAILED, "\nNo Data Found!\n");
+    }
 out:
-	// identify chipset
-	CheckChipType(isOnline);
-	return 0;
+    // identify chipset
+    CheckChipType(isOnline);
+    return 0;
 }
 
 static command_t CommandTable[] = {
-	{"help",        CmdHelp,            1, "This help"},
-	{"awid",        CmdLFAWID,          1, "{ AWID RFIDs...              }"},
-	{"cotag",       CmdLFCOTAG,         1, "{ COTAG CHIPs...             }"},
-	{"em",          CmdLFEM4X,          1, "{ EM4X CHIPs & RFIDs...      }"},
-	{"fdx",         CmdLFFdx,           1, "{ FDX-B RFIDs...             }"},
-	{"gproxii",     CmdLFGuard,			1, "{ Guardall Prox II RFIDs...  }"},
-	{"hid",         CmdLFHID,           1, "{ HID RFIDs...               }"},
-	{"hitag",       CmdLFHitag,         1, "{ Hitag CHIPs...             }"},
-	{"indala",      CmdLFINDALA,        1, "{ Indala RFIDs...            }"},
-	{"io",          CmdLFIO,            1, "{ ioProx RFIDs...            }"},
-	{"jablotron",	CmdLFJablotron,		1, "{ Jablotron RFIDs...         }"},
-	{"keri",		CmdLFKeri,			1, "{ KERI RFIDs...              }"},
-	{"nedap",		CmdLFNedap,			1, "{ Nedap RFIDs...             }"},
-	{"nexwatch",    CmdLFNEXWATCH,      1, "{ NexWatch RFIDs...          }"},
-	{"noralsy",		CmdLFNoralsy,		1, "{ Noralsy RFIDs...           }"},
-	{"pac",         CmdLFPac,           1, "{ PAC/Stanley RFIDs...       }"},
-	{"paradox",     CmdLFParadox,       1, "{ Paradox RFIDs...           }"},
-	{"pcf7931",     CmdLFPCF7931,       1, "{ PCF7931 CHIPs...           }"},
-	{"presco",      CmdLFPresco,        1, "{ Presco RFIDs...            }"},
-	{"pyramid",		CmdLFPyramid,       1, "{ Farpointe/Pyramid RFIDs... }"},
-	{"securakey",   CmdLFSecurakey,     1, "{ Securakey RFIDs...         }"},
-	{"ti",          CmdLFTI,            1, "{ TI CHIPs...                }"},
-	{"t55xx",       CmdLFT55XX,         1, "{ T55xx CHIPs...             }"},
-	{"viking",      CmdLFViking,        1, "{ Viking RFIDs...            }"},
-	{"visa2000",    CmdLFVisa2k,        1, "{ Visa2000 RFIDs...          }"},
-	{"config",      CmdLFSetConfig,     0, "Set config for LF sampling, bit/sample, decimation, frequency"},
-	{"cmdread",     CmdLFCommandRead,   0, "<off period> <'0' period> <'1' period> <command> ['h' 134] \n\t\t-- Modulate LF reader field to send command before read (all periods in microseconds)"},
-	{"flexdemod",   CmdFlexdemod,       1, "Demodulate samples for FlexPass"},
-	{"read",        CmdLFRead,          0, "['s' silent] Read 125/134 kHz LF ID-only tag. Do 'lf read h' for help"},
-	{"search",      CmdLFfind,          1, "[offline] ['u'] Read and Search for valid known tag (in offline mode it you can load first then search) \n\t\t-- 'u' to search for unknown tags"},
-	{"sim",         CmdLFSim,           0, "[GAP] -- Simulate LF tag from buffer with optional GAP (in microseconds)"},
-	{"simask",      CmdLFaskSim,        0, "[clock] [invert <1|0>] [biphase/manchester/raw <'b'|'m'|'r'>] [msg separator 's'] [d <hexdata>] \n\t\t-- Simulate LF ASK tag from demodbuffer or input"},
-	{"simfsk",      CmdLFfskSim,        0, "[c <clock>] [i] [H <fcHigh>] [L <fcLow>] [d <hexdata>] \n\t\t-- Simulate LF FSK tag from demodbuffer or input"},
-	{"simpsk",      CmdLFpskSim,        0, "[1|2|3] [c <clock>] [i] [r <carrier>] [d <raw hex to sim>] \n\t\t-- Simulate LF PSK tag from demodbuffer or input"},
-	{"simbidir",    CmdLFSimBidir,      0, "Simulate LF tag (with bidirectional data transmission between reader and tag)"},
-	{"snoop",       CmdLFSnoop,         0, "Snoop LF"},
-	{"vchdemod",    CmdVchDemod,        1, "['clone'] -- Demodulate samples for VeriChip"},
-	{NULL, NULL, 0, NULL}
+    {"help",        CmdHelp,            1, "This help"},
+    {"awid",        CmdLFAWID,          1, "{ AWID RFIDs...              }"},
+    {"cotag",       CmdLFCOTAG,         1, "{ COTAG CHIPs...             }"},
+    {"em",          CmdLFEM4X,          1, "{ EM4X CHIPs & RFIDs...      }"},
+    {"fdx",         CmdLFFdx,           1, "{ FDX-B RFIDs...             }"},
+    {"gproxii",     CmdLFGuard,         1, "{ Guardall Prox II RFIDs...  }"},
+    {"hid",         CmdLFHID,           1, "{ HID RFIDs...               }"},
+    {"hitag",       CmdLFHitag,         1, "{ Hitag CHIPs...             }"},
+    {"indala",      CmdLFINDALA,        1, "{ Indala RFIDs...            }"},
+    {"io",          CmdLFIO,            1, "{ ioProx RFIDs...            }"},
+    {"jablotron",   CmdLFJablotron,     1, "{ Jablotron RFIDs...         }"},
+    {"keri",        CmdLFKeri,          1, "{ KERI RFIDs...              }"},
+    {"nedap",       CmdLFNedap,         1, "{ Nedap RFIDs...             }"},
+    {"nexwatch",    CmdLFNEXWATCH,      1, "{ NexWatch RFIDs...          }"},
+    {"noralsy",     CmdLFNoralsy,       1, "{ Noralsy RFIDs...           }"},
+    {"pac",         CmdLFPac,           1, "{ PAC/Stanley RFIDs...       }"},
+    {"paradox",     CmdLFParadox,       1, "{ Paradox RFIDs...           }"},
+    {"pcf7931",     CmdLFPCF7931,       1, "{ PCF7931 CHIPs...           }"},
+    {"presco",      CmdLFPresco,        1, "{ Presco RFIDs...            }"},
+    {"pyramid",     CmdLFPyramid,       1, "{ Farpointe/Pyramid RFIDs... }"},
+    {"securakey",   CmdLFSecurakey,     1, "{ Securakey RFIDs...         }"},
+    {"ti",          CmdLFTI,            1, "{ TI CHIPs...                }"},
+    {"t55xx",       CmdLFT55XX,         1, "{ T55xx CHIPs...             }"},
+    {"viking",      CmdLFViking,        1, "{ Viking RFIDs...            }"},
+    {"visa2000",    CmdLFVisa2k,        1, "{ Visa2000 RFIDs...          }"},
+    {"config",      CmdLFSetConfig,     0, "Set config for LF sampling, bit/sample, decimation, frequency"},
+    {"cmdread",     CmdLFCommandRead,   0, "<off period> <'0' period> <'1' period> <command> ['h' 134] \n\t\t-- Modulate LF reader field to send command before read (all periods in microseconds)"},
+    {"flexdemod",   CmdFlexdemod,       1, "Demodulate samples for FlexPass"},
+    {"read",        CmdLFRead,          0, "['s' silent] Read 125/134 kHz LF ID-only tag. Do 'lf read h' for help"},
+    {"search",      CmdLFfind,          1, "[offline] ['u'] Read and Search for valid known tag (in offline mode it you can load first then search) \n\t\t-- 'u' to search for unknown tags"},
+    {"sim",         CmdLFSim,           0, "[GAP] -- Simulate LF tag from buffer with optional GAP (in microseconds)"},
+    {"simask",      CmdLFaskSim,        0, "[clock] [invert <1|0>] [biphase/manchester/raw <'b'|'m'|'r'>] [msg separator 's'] [d <hexdata>] \n\t\t-- Simulate LF ASK tag from demodbuffer or input"},
+    {"simfsk",      CmdLFfskSim,        0, "[c <clock>] [i] [H <fcHigh>] [L <fcLow>] [d <hexdata>] \n\t\t-- Simulate LF FSK tag from demodbuffer or input"},
+    {"simpsk",      CmdLFpskSim,        0, "[1|2|3] [c <clock>] [i] [r <carrier>] [d <raw hex to sim>] \n\t\t-- Simulate LF PSK tag from demodbuffer or input"},
+    {"simbidir",    CmdLFSimBidir,      0, "Simulate LF tag (with bidirectional data transmission between reader and tag)"},
+    {"snoop",       CmdLFSnoop,         0, "Snoop LF"},
+    {"vchdemod",    CmdVchDemod,        1, "['clone'] -- Demodulate samples for VeriChip"},
+    {NULL, NULL, 0, NULL}
 };
 
 int CmdLF(const char *Cmd) {
-	clearCommandBuffer();
-	CmdsParse(CommandTable, Cmd);
-	return 0;
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
+    return 0;
 }
 
 int CmdHelp(const char *Cmd) {
-	CmdsHelp(CommandTable);
-	return 0;
+    CmdsHelp(CommandTable);
+    return 0;
 }
diff --git a/client/cmdlf.h b/client/cmdlf.h
index be0313528..3e2aff271 100644
--- a/client/cmdlf.h
+++ b/client/cmdlf.h
@@ -17,41 +17,41 @@
 #include <string.h>
 #include <limits.h>
 #include "proxmark3.h"
-#include "lfdemod.h"		// device/client demods of LF signals
-#include "util.h"			// for parsing cli command utils
-#include "ui.h"				// for show graph controls
-#include "graph.h"			// for graph data
-#include "cmdparser.h"		// for getting cli commands included in cmdmain.h
-#include "cmdmain.h"		// for sending cmds to device. GetFromBigBuf
-#include "cmddata.h"		// for `lf search`
-#include "cmdlfawid.h"		// for awid menu
-#include "cmdlfem4x.h"		// for em4x menu
-#include "cmdlfhid.h"		// for hid menu
-#include "cmdlfhitag.h"		// for hitag menu
-#include "cmdlfio.h"		// for ioprox menu
-#include "cmdlft55xx.h"		// for t55xx menu
-#include "cmdlfti.h"		// for ti menu
-#include "cmdlfpresco.h"	// for presco menu
-#include "cmdlfpcf7931.h"	// for pcf7931 menu
-#include "cmdlfpyramid.h"	// for pyramid menu
-#include "cmdlfviking.h"	// for viking menu
-#include "cmdlfguard.h"		// for GuardAll menu
-#include "cmdlfnedap.h"		// for NEDAP menu
-#include "cmdlfjablotron.h"	// for JABLOTRON menu
+#include "lfdemod.h"        // device/client demods of LF signals
+#include "util.h"           // for parsing cli command utils
+#include "ui.h"             // for show graph controls
+#include "graph.h"          // for graph data
+#include "cmdparser.h"      // for getting cli commands included in cmdmain.h
+#include "cmdmain.h"        // for sending cmds to device. GetFromBigBuf
+#include "cmddata.h"        // for `lf search`
+#include "cmdlfawid.h"      // for awid menu
+#include "cmdlfem4x.h"      // for em4x menu
+#include "cmdlfhid.h"       // for hid menu
+#include "cmdlfhitag.h"     // for hitag menu
+#include "cmdlfio.h"        // for ioprox menu
+#include "cmdlft55xx.h"     // for t55xx menu
+#include "cmdlfti.h"        // for ti menu
+#include "cmdlfpresco.h"    // for presco menu
+#include "cmdlfpcf7931.h"   // for pcf7931 menu
+#include "cmdlfpyramid.h"   // for pyramid menu
+#include "cmdlfviking.h"    // for viking menu
+#include "cmdlfguard.h"     // for GuardAll menu
+#include "cmdlfnedap.h"     // for NEDAP menu
+#include "cmdlfjablotron.h" // for JABLOTRON menu
 #include "cmdlfvisa2000.h"  // for VISA2000 menu
-#include "cmdlfnoralsy.h"	// for NORALSY meny
-#include "cmdlffdx.h"		// for FDX-B meny
-#include "cmdlfcotag.h"		// for COTAG meny
-#include "cmdlfindala.h"	// for indala menu
-#include "cmdlfguard.h"		// for gproxii menu
-#include "cmdlffdx.h"		// for fdx-b menu
-#include "cmdlfparadox.h"	// for paradox menu
-#include "cmdlfnexwatch.h"	//for nexwatch menu
-#include "cmdlfsecurakey.h"	//for securakey menu
-#include "cmdlfpac.h"		// for pac menu
-#include "cmdlfkeri.h"		// for keri menu
+#include "cmdlfnoralsy.h"   // for NORALSY meny
+#include "cmdlffdx.h"       // for FDX-B meny
+#include "cmdlfcotag.h"     // for COTAG meny
+#include "cmdlfindala.h"    // for indala menu
+#include "cmdlfguard.h"     // for gproxii menu
+#include "cmdlffdx.h"       // for fdx-b menu
+#include "cmdlfparadox.h"   // for paradox menu
+#include "cmdlfnexwatch.h"  // for nexwatch menu
+#include "cmdlfsecurakey.h" // for securakey menu
+#include "cmdlfpac.h"       // for pac menu
+#include "cmdlfkeri.h"      // for keri menu
 
-#define T55XX_WRITE_TIMEOUT	1500
+#define T55XX_WRITE_TIMEOUT 1500
 
 int CmdLF(const char *Cmd);
 
diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c
index 6e181aa34..aa30b7797 100644
--- a/client/cmdlfawid.c
+++ b/client/cmdlfawid.c
@@ -15,563 +15,563 @@
 static int CmdHelp(const char *Cmd);
 
 int usage_lf_awid_read(void) {
-	PrintAndLogEx(NORMAL, "Enables AWID compatible reader mode printing details of scanned AWID26 or AWID50 tags.");
-	PrintAndLogEx(NORMAL, "By default, values are printed and logged until the button is pressed or another USB command is issued.");
-	PrintAndLogEx(NORMAL, "If the [1] option is provided, reader mode is exited after reading a single AWID card.");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  lf awid read [h] [1]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h :  This help");
-	PrintAndLogEx(NORMAL, "      1 : (optional) stop after reading a single card");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "       lf awid read");
-	PrintAndLogEx(NORMAL, "       lf awid read 1");
-	return 0;
+    PrintAndLogEx(NORMAL, "Enables AWID compatible reader mode printing details of scanned AWID26 or AWID50 tags.");
+    PrintAndLogEx(NORMAL, "By default, values are printed and logged until the button is pressed or another USB command is issued.");
+    PrintAndLogEx(NORMAL, "If the [1] option is provided, reader mode is exited after reading a single AWID card.");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  lf awid read [h] [1]");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "      h :  This help");
+    PrintAndLogEx(NORMAL, "      1 : (optional) stop after reading a single card");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "       lf awid read");
+    PrintAndLogEx(NORMAL, "       lf awid read 1");
+    return 0;
 }
 
 int usage_lf_awid_sim(void) {
-	PrintAndLogEx(NORMAL, "Enables simulation of AWID card with specified facility-code and card number.");
-	PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  lf awid sim [h] <format> <facility-code> <card-number>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "                h :  This help");
-	PrintAndLogEx(NORMAL, "         <format> :  format length 26|34|37|50");
-	PrintAndLogEx(NORMAL, "  <facility-code> :  8|16bit value facility code");
-	PrintAndLogEx(NORMAL, "    <card number> :  16|32-bit value card number");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "       lf awid sim 26 224 1337");
-	PrintAndLogEx(NORMAL, "       lf awid sim 50 2001 deadc0de");
-	return 0;
+    PrintAndLogEx(NORMAL, "Enables simulation of AWID card with specified facility-code and card number.");
+    PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  lf awid sim [h] <format> <facility-code> <card-number>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "                h :  This help");
+    PrintAndLogEx(NORMAL, "         <format> :  format length 26|34|37|50");
+    PrintAndLogEx(NORMAL, "  <facility-code> :  8|16bit value facility code");
+    PrintAndLogEx(NORMAL, "    <card number> :  16|32-bit value card number");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "       lf awid sim 26 224 1337");
+    PrintAndLogEx(NORMAL, "       lf awid sim 50 2001 deadc0de");
+    return 0;
 }
 
 int usage_lf_awid_clone(void) {
-	PrintAndLogEx(NORMAL, "Enables cloning of AWID card with specified facility-code and card number onto T55x7.");
-	PrintAndLogEx(NORMAL, "The T55x7 must be on the antenna when issuing this command.  T55x7 blocks are calculated and printed in the process.");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  lf awid clone [h] <format> <facility-code> <card-number> [Q5]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "                h :  This help");
-	PrintAndLogEx(NORMAL, "         <format> :  format length 26|34|37|50");
-	PrintAndLogEx(NORMAL, "  <facility-code> :  8|16bit value facility code");
-	PrintAndLogEx(NORMAL, "    <card number> :  16|32-bit value card number");
-	PrintAndLogEx(NORMAL, "               Q5 :  optional - clone to Q5 (T5555) instead of T55x7 chip");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "       lf awid clone 26 224 1337");
-	PrintAndLogEx(NORMAL, "       lf awid clone 50 2001 13371337");
-	return 0;
+    PrintAndLogEx(NORMAL, "Enables cloning of AWID card with specified facility-code and card number onto T55x7.");
+    PrintAndLogEx(NORMAL, "The T55x7 must be on the antenna when issuing this command.  T55x7 blocks are calculated and printed in the process.");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  lf awid clone [h] <format> <facility-code> <card-number> [Q5]");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "                h :  This help");
+    PrintAndLogEx(NORMAL, "         <format> :  format length 26|34|37|50");
+    PrintAndLogEx(NORMAL, "  <facility-code> :  8|16bit value facility code");
+    PrintAndLogEx(NORMAL, "    <card number> :  16|32-bit value card number");
+    PrintAndLogEx(NORMAL, "               Q5 :  optional - clone to Q5 (T5555) instead of T55x7 chip");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "       lf awid clone 26 224 1337");
+    PrintAndLogEx(NORMAL, "       lf awid clone 50 2001 13371337");
+    return 0;
 }
 
 int usage_lf_awid_brute(void){
-	PrintAndLogEx(NORMAL, "Enables bruteforce of AWID reader with specified facility-code.");
-	PrintAndLogEx(NORMAL, "This is a attack against reader. if cardnumber is given, it starts with it and goes up / down one step");
-	PrintAndLogEx(NORMAL, "if cardnumber is not given, it starts with 1 and goes up to 65535");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  lf awid brute [h] [v] a <format> f <facility-code> c <cardnumber> d <delay>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h                 :  This help");
-	PrintAndLogEx(NORMAL, "       a <format>        :  format length 26|50");
-	PrintAndLogEx(NORMAL, "       f <facility-code> :  8|16bit value facility code");
-	PrintAndLogEx(NORMAL, "       c <cardnumber>    :  (optional) cardnumber to start with, max 65535");
-	PrintAndLogEx(NORMAL, "       d <delay>         :  delay betweens attempts in ms. Default 1000ms");
-	PrintAndLogEx(NORMAL, "       v                 :  verbose logging, show all tries");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "       lf awid brute a 26 f 224");
-	PrintAndLogEx(NORMAL, "       lf awid brute a 50 f 2001 d 2000");
-	PrintAndLogEx(NORMAL, "       lf awid brute v a 50 f 2001 c 200 d 2000");
-	return 0;
+    PrintAndLogEx(NORMAL, "Enables bruteforce of AWID reader with specified facility-code.");
+    PrintAndLogEx(NORMAL, "This is a attack against reader. if cardnumber is given, it starts with it and goes up / down one step");
+    PrintAndLogEx(NORMAL, "if cardnumber is not given, it starts with 1 and goes up to 65535");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  lf awid brute [h] [v] a <format> f <facility-code> c <cardnumber> d <delay>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h                 :  This help");
+    PrintAndLogEx(NORMAL, "       a <format>        :  format length 26|50");
+    PrintAndLogEx(NORMAL, "       f <facility-code> :  8|16bit value facility code");
+    PrintAndLogEx(NORMAL, "       c <cardnumber>    :  (optional) cardnumber to start with, max 65535");
+    PrintAndLogEx(NORMAL, "       d <delay>         :  delay betweens attempts in ms. Default 1000ms");
+    PrintAndLogEx(NORMAL, "       v                 :  verbose logging, show all tries");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "       lf awid brute a 26 f 224");
+    PrintAndLogEx(NORMAL, "       lf awid brute a 50 f 2001 d 2000");
+    PrintAndLogEx(NORMAL, "       lf awid brute v a 50 f 2001 c 200 d 2000");
+    return 0;
 }
 
 static bool sendPing(void){
-	UsbCommand ping = {CMD_PING, {1, 2, 3}};
-	SendCommand(&ping);
-	SendCommand(&ping);
-	SendCommand(&ping);
-	clearCommandBuffer();
-	UsbCommand resp;
-	if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000))
-		return false;
-	return true;
+    UsbCommand ping = {CMD_PING, {1, 2, 3}};
+    SendCommand(&ping);
+    SendCommand(&ping);
+    SendCommand(&ping);
+    clearCommandBuffer();
+    UsbCommand resp;
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000))
+        return false;
+    return true;
 }
 
 static bool sendTry(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint32_t delay, uint8_t *bits, size_t bs_len, bool verbose){
 
-	if ( verbose )
-		PrintAndLogEx(INFO, "Trying FC: %u; CN: %u", fc, cn);
+    if ( verbose )
+        PrintAndLogEx(INFO, "Trying FC: %u; CN: %u", fc, cn);
 
-	if ( !getAWIDBits(fmtlen, fc, cn, bits)) {
-		PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
-		return false;
-	}
+    if ( !getAWIDBits(fmtlen, fc, cn, bits)) {
+        PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
+        return false;
+    }
 
-	uint8_t clk = 50, high = 10, low = 8, invert = 1;
-	uint64_t arg1 = (high << 8) + low;
-	uint64_t arg2 = (invert << 8) + clk;
+    uint8_t clk = 50, high = 10, low = 8, invert = 1;
+    uint64_t arg1 = (high << 8) + low;
+    uint64_t arg2 = (invert << 8) + clk;
 
-	UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, bs_len}};
-	memcpy(c.d.asBytes, bits, bs_len);
-	clearCommandBuffer();
-	SendCommand(&c);
+    UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, bs_len}};
+    memcpy(c.d.asBytes, bits, bs_len);
+    clearCommandBuffer();
+    SendCommand(&c);
 
-	msleep(delay);
-	sendPing();
-	return true;
+    msleep(delay);
+    sendPing();
+    return true;
 }
 
 //refactored by marshmellow
 int getAWIDBits(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint8_t *bits) {
 
-	// the return bits, preamble 0000 0001
-	bits[7] = 1;
+    // the return bits, preamble 0000 0001
+    bits[7] = 1;
 
-	uint8_t pre[66];
-	memset(pre, 0, sizeof(pre));
+    uint8_t pre[66];
+    memset(pre, 0, sizeof(pre));
 
-	// add formatlength
-	num_to_bytebits(fmtlen, 8, pre);
+    // add formatlength
+    num_to_bytebits(fmtlen, 8, pre);
 
-	// add facilitycode, cardnumber and wiegand parity bits
-	switch (fmtlen) {
-		case 26:{
-			uint8_t wiegand[24];
-			num_to_bytebits(fc, 8, wiegand);
-			num_to_bytebits(cn, 16, wiegand+8);
-			wiegand_add_parity(pre+8, wiegand,  sizeof(wiegand));
-			break;
-		}
-		case 34:{
-			uint8_t wiegand[32];
-			num_to_bytebits(fc, 8, wiegand);
-			num_to_bytebits(cn, 24, wiegand+8);
-			wiegand_add_parity(pre+8, wiegand,  sizeof(wiegand));
-			break;
-		}
-		case 37:{
-			uint8_t wiegand[31];
-			num_to_bytebits(fc, 13, wiegand);
-			num_to_bytebits(cn, 18, wiegand+13);
-			wiegand_add_parity(pre+8, wiegand,  sizeof(wiegand));
-			break;
-		}
-		case 50: {
-			uint8_t wiegand[48];
-			num_to_bytebits(fc, 16, wiegand);
-			num_to_bytebits(cn, 32, wiegand+16);
-			wiegand_add_parity(pre+8, wiegand, sizeof(wiegand));
-			break;
-		}
-	}
+    // add facilitycode, cardnumber and wiegand parity bits
+    switch (fmtlen) {
+        case 26:{
+            uint8_t wiegand[24];
+            num_to_bytebits(fc, 8, wiegand);
+            num_to_bytebits(cn, 16, wiegand+8);
+            wiegand_add_parity(pre+8, wiegand,  sizeof(wiegand));
+            break;
+        }
+        case 34:{
+            uint8_t wiegand[32];
+            num_to_bytebits(fc, 8, wiegand);
+            num_to_bytebits(cn, 24, wiegand+8);
+            wiegand_add_parity(pre+8, wiegand,  sizeof(wiegand));
+            break;
+        }
+        case 37:{
+            uint8_t wiegand[31];
+            num_to_bytebits(fc, 13, wiegand);
+            num_to_bytebits(cn, 18, wiegand+13);
+            wiegand_add_parity(pre+8, wiegand,  sizeof(wiegand));
+            break;
+        }
+        case 50: {
+            uint8_t wiegand[48];
+            num_to_bytebits(fc, 16, wiegand);
+            num_to_bytebits(cn, 32, wiegand+16);
+            wiegand_add_parity(pre+8, wiegand, sizeof(wiegand));
+            break;
+        }
+    }
 
-	// add AWID 4bit parity
-	size_t bitLen = addParity(pre, bits+8, 66, 4, 1);
+    // add AWID 4bit parity
+    size_t bitLen = addParity(pre, bits+8, 66, 4, 1);
 
-	if (bitLen != 88) return 0;
+    if (bitLen != 88) return 0;
 
-	PrintAndLogEx(SUCCESS, "awid raw bits:\n %s \n", sprint_bin(bits, bitLen));
+    PrintAndLogEx(SUCCESS, "awid raw bits:\n %s \n", sprint_bin(bits, bitLen));
 
-	return 1;
+    return 1;
 }
 
 static void verify_values(uint8_t *fmtlen, uint32_t *fc, uint32_t *cn){
-	switch (*fmtlen) {
-		case 50:
-			if ((*fc & 0xFFFF) != *fc) {
-				*fc &= 0xFFFF;
-				PrintAndLogEx(INFO, "Facility-Code Truncated to 16-bits (AWID50): %u", *fc);
-			}
-			break;
-		case 37:
-			if ((*fc & 0x1FFF) != *fc) {
-				*fc &= 0x1FFF;
-				PrintAndLogEx(INFO, "Facility-Code Truncated to 13-bits (AWID37): %u", *fc);
-			}
-			if ((*cn & 0x3FFFF) != *cn) {
-				*cn &= 0x3FFFF;
-				PrintAndLogEx(INFO, "Card Number Truncated to 18-bits (AWID37): %u", *cn);
-			}
-			break;
-		case 34:
-			if ((*fc & 0xFF) != *fc) {
-				*fc &= 0xFF;
-				PrintAndLogEx(INFO, "Facility-Code Truncated to 8-bits (AWID34): %u", *fc);
-			}
-			if ((*cn & 0xFFFFFF) != *cn) {
-				*cn &= 0xFFFFFF;
-				PrintAndLogEx(INFO, "Card Number Truncated to 24-bits (AWID34): %u", *cn);
-			}
-			break;
-		case 26:
-		default:
-			*fmtlen = 26;
-			if ((*fc & 0xFF) != *fc) {
-				*fc &= 0xFF;
-				PrintAndLogEx(INFO, "Facility-Code Truncated to 8-bits (AWID26): %u", *fc);
-			}
-			if ((*cn & 0xFFFF) != *cn) {
-				*cn &= 0xFFFF;
-				PrintAndLogEx(INFO, "Card Number Truncated to 16-bits (AWID26): %u", *cn);
-			}
-			break;
-	}
+    switch (*fmtlen) {
+        case 50:
+            if ((*fc & 0xFFFF) != *fc) {
+                *fc &= 0xFFFF;
+                PrintAndLogEx(INFO, "Facility-Code Truncated to 16-bits (AWID50): %u", *fc);
+            }
+            break;
+        case 37:
+            if ((*fc & 0x1FFF) != *fc) {
+                *fc &= 0x1FFF;
+                PrintAndLogEx(INFO, "Facility-Code Truncated to 13-bits (AWID37): %u", *fc);
+            }
+            if ((*cn & 0x3FFFF) != *cn) {
+                *cn &= 0x3FFFF;
+                PrintAndLogEx(INFO, "Card Number Truncated to 18-bits (AWID37): %u", *cn);
+            }
+            break;
+        case 34:
+            if ((*fc & 0xFF) != *fc) {
+                *fc &= 0xFF;
+                PrintAndLogEx(INFO, "Facility-Code Truncated to 8-bits (AWID34): %u", *fc);
+            }
+            if ((*cn & 0xFFFFFF) != *cn) {
+                *cn &= 0xFFFFFF;
+                PrintAndLogEx(INFO, "Card Number Truncated to 24-bits (AWID34): %u", *cn);
+            }
+            break;
+        case 26:
+        default:
+            *fmtlen = 26;
+            if ((*fc & 0xFF) != *fc) {
+                *fc &= 0xFF;
+                PrintAndLogEx(INFO, "Facility-Code Truncated to 8-bits (AWID26): %u", *fc);
+            }
+            if ((*cn & 0xFFFF) != *cn) {
+                *cn &= 0xFFFF;
+                PrintAndLogEx(INFO, "Card Number Truncated to 16-bits (AWID26): %u", *cn);
+            }
+            break;
+    }
 }
 
 // this read is the "normal" read,  which download lf signal and tries to demod here.
 int CmdAWIDRead(const char *Cmd) {
-	lf_read(true, 12000);
-	return CmdAWIDDemod(Cmd);
+    lf_read(true, 12000);
+    return CmdAWIDDemod(Cmd);
 }
 // this read loops on device side.
 // uses the demod in lfops.c
 int CmdAWIDRead_device(const char *Cmd) {
 
-	if (Cmd[0] == 'h' || Cmd[0] == 'H') return usage_lf_awid_read();
-	uint8_t findone = (Cmd[0] == '1') ? 1 : 0;
-	UsbCommand c = {CMD_AWID_DEMOD_FSK, {findone, 0, 0}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+    if (Cmd[0] == 'h' || Cmd[0] == 'H') return usage_lf_awid_read();
+    uint8_t findone = (Cmd[0] == '1') ? 1 : 0;
+    UsbCommand c = {CMD_AWID_DEMOD_FSK, {findone, 0, 0}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 
 //by marshmellow
 //AWID Prox demod - FSK2a RF/50 with preamble of 00000001  (always a 96 bit data stream)
 //print full AWID Prox ID and some bit format details if found
 int CmdAWIDDemod(const char *Cmd) {
-	uint8_t bits[MAX_GRAPH_TRACE_LEN]={0};
-	size_t size = getFromGraphBuf(bits);
-	if (size == 0) {
-		PrintAndLogEx(DEBUG, "DEBUG: Error - AWID not enough samples");
-		return 0;
-	}
-	//get binary from fsk wave
-	int waveIdx = 0;
-	int idx = detectAWID(bits, &size, &waveIdx);
-	if (idx <= 0){
+    uint8_t bits[MAX_GRAPH_TRACE_LEN]={0};
+    size_t size = getFromGraphBuf(bits);
+    if (size == 0) {
+        PrintAndLogEx(DEBUG, "DEBUG: Error - AWID not enough samples");
+        return 0;
+    }
+    //get binary from fsk wave
+    int waveIdx = 0;
+    int idx = detectAWID(bits, &size, &waveIdx);
+    if (idx <= 0){
 
-		if (idx == -1)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - AWID not enough samples");
-		else if (idx == -2)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - AWID only noise found");
-		else if (idx == -3)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - AWID problem during FSK demod");
-		else if (idx == -4)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - AWID preamble not found");
-		else if (idx == -5)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - AWID size not correct, size %d", size);
-		else
-			PrintAndLogEx(DEBUG, "DEBUG: Error - AWID error demoding fsk %d",idx);
+        if (idx == -1)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - AWID not enough samples");
+        else if (idx == -2)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - AWID only noise found");
+        else if (idx == -3)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - AWID problem during FSK demod");
+        else if (idx == -4)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - AWID preamble not found");
+        else if (idx == -5)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - AWID size not correct, size %d", size);
+        else
+            PrintAndLogEx(DEBUG, "DEBUG: Error - AWID error demoding fsk %d",idx);
 
-		return 0;
-	}
+        return 0;
+    }
 
-	setDemodBuf(bits, size, idx);
-	setClockGrid(50, waveIdx + (idx*50));
+    setDemodBuf(bits, size, idx);
+    setClockGrid(50, waveIdx + (idx*50));
 
 
-	// Index map
-	// 0            10            20            30              40            50              60
-	// |            |             |             |               |             |               |
-	// 01234567 890 1 234 5 678 9 012 3 456 7 890 1 234 5 678 9 012 3 456 7 890 1 234 5 678 9 012 3 - to 96
-	// -----------------------------------------------------------------------------
-	// 00000001 000 1 110 1 101 1 011 1 101 1 010 0 000 1 000 1 010 0 001 0 110 1 100 0 000 1 000 1
-	// premable bbb o bbb o bbw o fff o fff o ffc o ccc o ccc o ccc o ccc o ccc o wxx o xxx o xxx o - to 96
-	//          |---26 bit---|    |-----117----||-------------142-------------|
-	// b = format bit len, o = odd parity of last 3 bits
-	// f = facility code, c = card number
-	// w = wiegand parity
-	// (26 bit format shown)
+    // Index map
+    // 0            10            20            30              40            50              60
+    // |            |             |             |               |             |               |
+    // 01234567 890 1 234 5 678 9 012 3 456 7 890 1 234 5 678 9 012 3 456 7 890 1 234 5 678 9 012 3 - to 96
+    // -----------------------------------------------------------------------------
+    // 00000001 000 1 110 1 101 1 011 1 101 1 010 0 000 1 000 1 010 0 001 0 110 1 100 0 000 1 000 1
+    // premable bbb o bbb o bbw o fff o fff o ffc o ccc o ccc o ccc o ccc o ccc o wxx o xxx o xxx o - to 96
+    //          |---26 bit---|    |-----117----||-------------142-------------|
+    // b = format bit len, o = odd parity of last 3 bits
+    // f = facility code, c = card number
+    // w = wiegand parity
+    // (26 bit format shown)
 
-	//get raw ID before removing parities
-	uint32_t rawLo = bytebits_to_byte(bits + idx + 64, 32);
-	uint32_t rawHi = bytebits_to_byte(bits + idx + 32, 32);
-	uint32_t rawHi2 = bytebits_to_byte(bits + idx, 32);
+    //get raw ID before removing parities
+    uint32_t rawLo = bytebits_to_byte(bits + idx + 64, 32);
+    uint32_t rawHi = bytebits_to_byte(bits + idx + 32, 32);
+    uint32_t rawHi2 = bytebits_to_byte(bits + idx, 32);
 
-	size = removeParity(bits, idx+8, 4, 1, 88);
-	if (size != 66) {
-		PrintAndLogEx(DEBUG, "DEBUG: Error - AWID at parity check-tag size does not match AWID format");
-		return 0;
-	}
-	// ok valid card found!
+    size = removeParity(bits, idx+8, 4, 1, 88);
+    if (size != 66) {
+        PrintAndLogEx(DEBUG, "DEBUG: Error - AWID at parity check-tag size does not match AWID format");
+        return 0;
+    }
+    // ok valid card found!
 
-	// Index map
-	// 0           10         20        30          40        50        60
-	// |           |          |         |           |         |         |
-	// 01234567 8 90123456 7890123456789012 3 456789012345678901234567890123456
-	// -----------------------------------------------------------------------------
-	// 00011010 1 01110101 0000000010001110 1 000000000000000000000000000000000
-	// bbbbbbbb w ffffffff cccccccccccccccc w xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-	// |26 bit|   |-117--| |-----142------|
+    // Index map
+    // 0           10         20        30          40        50        60
+    // |           |          |         |           |         |         |
+    // 01234567 8 90123456 7890123456789012 3 456789012345678901234567890123456
+    // -----------------------------------------------------------------------------
+    // 00011010 1 01110101 0000000010001110 1 000000000000000000000000000000000
+    // bbbbbbbb w ffffffff cccccccccccccccc w xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+    // |26 bit|   |-117--| |-----142------|
     //
-	// 00110010 0 0000111110100000 00000000000100010010100010000111 1 000000000
-	// bbbbbbbb w ffffffffffffffff cccccccccccccccccccccccccccccccc w xxxxxxxxx
-	// |50 bit|   |----4000------| |-----------2248975------------|
-	// b = format bit len, o = odd parity of last 3 bits
-	// f = facility code, c = card number
-	// w = wiegand parity
+    // 00110010 0 0000111110100000 00000000000100010010100010000111 1 000000000
+    // bbbbbbbb w ffffffffffffffff cccccccccccccccccccccccccccccccc w xxxxxxxxx
+    // |50 bit|   |----4000------| |-----------2248975------------|
+    // b = format bit len, o = odd parity of last 3 bits
+    // f = facility code, c = card number
+    // w = wiegand parity
 
-	uint32_t fc = 0;
-	uint32_t cardnum = 0;
-	uint32_t code1 = 0;
-	uint32_t code2 = 0;
-	uint8_t fmtLen = bytebits_to_byte(bits, 8);
+    uint32_t fc = 0;
+    uint32_t cardnum = 0;
+    uint32_t code1 = 0;
+    uint32_t code2 = 0;
+    uint8_t fmtLen = bytebits_to_byte(bits, 8);
 
-	switch(fmtLen) {
-		case 26:
-			fc = bytebits_to_byte(bits + 9, 8);
-			cardnum = bytebits_to_byte(bits + 17, 16);
-			code1 = bytebits_to_byte(bits + 8,fmtLen);
-			PrintAndLogEx(SUCCESS, "AWID Found - BitLength: %d, FC: %d, Card: %u - Wiegand: %x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, rawHi2, rawHi, rawLo);
-			break;
-		case 34:
-			fc = bytebits_to_byte(bits + 9, 8);
-			cardnum = bytebits_to_byte(bits + 17, 24);
-			code1 = bytebits_to_byte(bits + 8, (fmtLen-32) );
-			code2 = bytebits_to_byte(bits + 8 + (fmtLen-32), 32);
-			PrintAndLogEx(SUCCESS, "AWID Found - BitLength: %d, FC: %d, Card: %u - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, code2, rawHi2, rawHi, rawLo);
-			break;
-		case 37:
-			fc = bytebits_to_byte(bits + 9, 13);
-			cardnum = bytebits_to_byte(bits + 22, 18);
-			code1 = bytebits_to_byte(bits + 8, (fmtLen-32) );
-			code2 = bytebits_to_byte(bits + 8 + (fmtLen-32), 32);
-			PrintAndLogEx(SUCCESS, "AWID Found - BitLength: %d, FC: %d, Card: %u - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, code2, rawHi2, rawHi, rawLo);
-			break;
-		// case 40:
-		// break;
-		case 50:
-			fc = bytebits_to_byte(bits + 9, 16);
-			cardnum = bytebits_to_byte(bits + 25, 32);
-			code1 = bytebits_to_byte(bits + 8, (fmtLen-32) );
-			code2 = bytebits_to_byte(bits + 8 + (fmtLen-32), 32);
-			PrintAndLogEx(SUCCESS, "AWID Found - BitLength: %d, FC: %d, Card: %u - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, code2, rawHi2, rawHi, rawLo);
-			break;
-		default:
-			if (fmtLen > 32 ) {
-				cardnum = bytebits_to_byte(bits + 8 + (fmtLen-17), 16);
-				code1 = bytebits_to_byte(bits + 8, fmtLen-32);
-				code2 = bytebits_to_byte(bits + 8 + (fmtLen-32), 32);
-				PrintAndLogEx(SUCCESS, "AWID Found - BitLength: %d -unknown BitLength- (%u) - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, cardnum, code1, code2, rawHi2, rawHi, rawLo);
-			} else {
-				cardnum = bytebits_to_byte(bits + 8 + (fmtLen-17), 16);
-				code1 = bytebits_to_byte(bits + 8, fmtLen);
-				PrintAndLogEx(SUCCESS, "AWID Found - BitLength: %d -unknown BitLength- (%u) - Wiegand: %x, Raw: %08x%08x%08x", fmtLen, cardnum, code1, rawHi2, rawHi, rawLo);
-			}
-			break;
-	}
+    switch(fmtLen) {
+        case 26:
+            fc = bytebits_to_byte(bits + 9, 8);
+            cardnum = bytebits_to_byte(bits + 17, 16);
+            code1 = bytebits_to_byte(bits + 8,fmtLen);
+            PrintAndLogEx(SUCCESS, "AWID Found - BitLength: %d, FC: %d, Card: %u - Wiegand: %x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, rawHi2, rawHi, rawLo);
+            break;
+        case 34:
+            fc = bytebits_to_byte(bits + 9, 8);
+            cardnum = bytebits_to_byte(bits + 17, 24);
+            code1 = bytebits_to_byte(bits + 8, (fmtLen-32) );
+            code2 = bytebits_to_byte(bits + 8 + (fmtLen-32), 32);
+            PrintAndLogEx(SUCCESS, "AWID Found - BitLength: %d, FC: %d, Card: %u - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, code2, rawHi2, rawHi, rawLo);
+            break;
+        case 37:
+            fc = bytebits_to_byte(bits + 9, 13);
+            cardnum = bytebits_to_byte(bits + 22, 18);
+            code1 = bytebits_to_byte(bits + 8, (fmtLen-32) );
+            code2 = bytebits_to_byte(bits + 8 + (fmtLen-32), 32);
+            PrintAndLogEx(SUCCESS, "AWID Found - BitLength: %d, FC: %d, Card: %u - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, code2, rawHi2, rawHi, rawLo);
+            break;
+        // case 40:
+        // break;
+        case 50:
+            fc = bytebits_to_byte(bits + 9, 16);
+            cardnum = bytebits_to_byte(bits + 25, 32);
+            code1 = bytebits_to_byte(bits + 8, (fmtLen-32) );
+            code2 = bytebits_to_byte(bits + 8 + (fmtLen-32), 32);
+            PrintAndLogEx(SUCCESS, "AWID Found - BitLength: %d, FC: %d, Card: %u - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, code2, rawHi2, rawHi, rawLo);
+            break;
+        default:
+            if (fmtLen > 32 ) {
+                cardnum = bytebits_to_byte(bits + 8 + (fmtLen-17), 16);
+                code1 = bytebits_to_byte(bits + 8, fmtLen-32);
+                code2 = bytebits_to_byte(bits + 8 + (fmtLen-32), 32);
+                PrintAndLogEx(SUCCESS, "AWID Found - BitLength: %d -unknown BitLength- (%u) - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, cardnum, code1, code2, rawHi2, rawHi, rawLo);
+            } else {
+                cardnum = bytebits_to_byte(bits + 8 + (fmtLen-17), 16);
+                code1 = bytebits_to_byte(bits + 8, fmtLen);
+                PrintAndLogEx(SUCCESS, "AWID Found - BitLength: %d -unknown BitLength- (%u) - Wiegand: %x, Raw: %08x%08x%08x", fmtLen, cardnum, code1, rawHi2, rawHi, rawLo);
+            }
+            break;
+    }
 
-	PrintAndLogEx(DEBUG, "DEBUG: AWID idx: %d, Len: %d Printing Demod Buffer:", idx, size);
-	if (g_debugMode)
-		printDemodBuff();
+    PrintAndLogEx(DEBUG, "DEBUG: AWID idx: %d, Len: %d Printing Demod Buffer:", idx, size);
+    if (g_debugMode)
+        printDemodBuff();
 
-	return 1;
+    return 1;
 }
 
 int CmdAWIDSim(const char *Cmd) {
-	uint32_t fc = 0, cn = 0;
-	uint8_t fmtlen = 0;
-	uint8_t bits[96];
-	size_t size = sizeof(bits);
-	memset(bits, 0x00, size);
+    uint32_t fc = 0, cn = 0;
+    uint8_t fmtlen = 0;
+    uint8_t bits[96];
+    size_t size = sizeof(bits);
+    memset(bits, 0x00, size);
 
-	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_awid_sim();
+    char cmdp = param_getchar(Cmd, 0);
+    if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_awid_sim();
 
-  	fmtlen = param_get8(Cmd, 0);
-	fc = param_get32ex(Cmd, 1, 0, 10);
-	cn = param_get32ex(Cmd, 2, 0, 10);
-	if ( !fc || !cn) return usage_lf_awid_sim();
+    fmtlen = param_get8(Cmd, 0);
+    fc = param_get32ex(Cmd, 1, 0, 10);
+    cn = param_get32ex(Cmd, 2, 0, 10);
+    if ( !fc || !cn) return usage_lf_awid_sim();
 
-	verify_values(&fmtlen, &fc, &cn);
+    verify_values(&fmtlen, &fc, &cn);
 
-	PrintAndLogEx(SUCCESS, "Simulating AWID %u -- FC: %u; CN: %u\n", fmtlen, fc, cn);
-	PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation or run another command");
+    PrintAndLogEx(SUCCESS, "Simulating AWID %u -- FC: %u; CN: %u\n", fmtlen, fc, cn);
+    PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation or run another command");
 
-	if (!getAWIDBits(fmtlen, fc, cn, bits)) {
-		PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
-		return 1;
-	}
+    if (!getAWIDBits(fmtlen, fc, cn, bits)) {
+        PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
+        return 1;
+    }
 
-	uint8_t clk = 50, high = 10, low = 8, invert = 1;
-	uint64_t arg1 = (high << 8) + low;
-	uint64_t arg2 = (invert << 8) + clk;
+    uint8_t clk = 50, high = 10, low = 8, invert = 1;
+    uint64_t arg1 = (high << 8) + low;
+    uint64_t arg2 = (invert << 8) + clk;
 
-	// AWID uses: FSK2a fcHigh: 10, fcLow: 8, clk: 50, invert: 1
-	// arg1 --- fcHigh<<8 + fcLow
-	// arg2 --- Inversion and clk setting
-	// 96   --- Bitstream length: 96-bits == 12 bytes
-	UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}};
-	memcpy(c.d.asBytes, bits, size);
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+    // AWID uses: FSK2a fcHigh: 10, fcLow: 8, clk: 50, invert: 1
+    // arg1 --- fcHigh<<8 + fcLow
+    // arg2 --- Inversion and clk setting
+    // 96   --- Bitstream length: 96-bits == 12 bytes
+    UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}};
+    memcpy(c.d.asBytes, bits, size);
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 
 int CmdAWIDClone(const char *Cmd) {
-	uint32_t blocks[4] = {T55x7_MODULATION_FSK2a | T55x7_BITRATE_RF_50 | 3<<T55x7_MAXBLOCK_SHIFT, 0, 0, 0};
-	uint32_t fc = 0, cn = 0;
-	uint8_t fmtlen = 0;
-	uint8_t bits[96];
-	uint8_t *bs=bits;
-	memset(bs,0,sizeof(bits));
+    uint32_t blocks[4] = {T55x7_MODULATION_FSK2a | T55x7_BITRATE_RF_50 | 3<<T55x7_MAXBLOCK_SHIFT, 0, 0, 0};
+    uint32_t fc = 0, cn = 0;
+    uint8_t fmtlen = 0;
+    uint8_t bits[96];
+    uint8_t *bs=bits;
+    memset(bs,0,sizeof(bits));
 
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_awid_clone();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_awid_clone();
 
-  	fmtlen = param_get8(Cmd, 0);
-	fc = param_get32ex(Cmd, 1, 0, 10);
-	cn = param_get32ex(Cmd, 2, 0, 10);
+    fmtlen = param_get8(Cmd, 0);
+    fc = param_get32ex(Cmd, 1, 0, 10);
+    cn = param_get32ex(Cmd, 2, 0, 10);
 
-	if ( !fc || !cn) return usage_lf_awid_clone();
+    if ( !fc || !cn) return usage_lf_awid_clone();
 
-	if (tolower(param_getchar(Cmd, 3)) == 'q')
-		//t5555 (Q5) BITRATE = (RF-2)/2 (iceman)
-		blocks[0] = T5555_MODULATION_FSK2 | T5555_INVERT_OUTPUT | T5555_SET_BITRATE(50) | 3<<T5555_MAXBLOCK_SHIFT;
+    if (tolower(param_getchar(Cmd, 3)) == 'q')
+        //t5555 (Q5) BITRATE = (RF-2)/2 (iceman)
+        blocks[0] = T5555_MODULATION_FSK2 | T5555_INVERT_OUTPUT | T5555_SET_BITRATE(50) | 3<<T5555_MAXBLOCK_SHIFT;
 
-	verify_values(&fmtlen, &fc, &cn);
+    verify_values(&fmtlen, &fc, &cn);
 
-	if ( !getAWIDBits(fmtlen, fc, cn, bs)) {
-		PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
-		return 1;
-	}
+    if ( !getAWIDBits(fmtlen, fc, cn, bs)) {
+        PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
+        return 1;
+    }
 
-	blocks[1] = bytebits_to_byte(bs, 32);
-	blocks[2] = bytebits_to_byte(bs + 32, 32);
-	blocks[3] = bytebits_to_byte(bs + 64, 32);
+    blocks[1] = bytebits_to_byte(bs, 32);
+    blocks[2] = bytebits_to_byte(bs + 32, 32);
+    blocks[3] = bytebits_to_byte(bs + 64, 32);
 
-	PrintAndLogEx(INFO, "Preparing to clone AWID %u to T55x7 with FC: %u, CN: %u", fmtlen, fc, cn);
-	print_blocks(blocks, 4);
+    PrintAndLogEx(INFO, "Preparing to clone AWID %u to T55x7 with FC: %u, CN: %u", fmtlen, fc, cn);
+    print_blocks(blocks, 4);
 
-	UsbCommand resp;
-	UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
+    UsbCommand resp;
+    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
 
-	for (uint8_t i=0; i<4; i++) {
-		c.arg[0] = blocks[i];
-		c.arg[1] = i;
-		clearCommandBuffer();
-		SendCommand(&c);
-		if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)){
-			PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
-			return -1;
-		}
-	}
-	return 0;
+    for (uint8_t i=0; i<4; i++) {
+        c.arg[0] = blocks[i];
+        c.arg[1] = i;
+        clearCommandBuffer();
+        SendCommand(&c);
+        if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)){
+            PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
+            return -1;
+        }
+    }
+    return 0;
 }
 
 int CmdAWIDBrute(const char *Cmd) {
 
-	bool errors = false, verbose = false;
-	uint32_t fc = 0, cn = 0, delay = 1000;
-	uint8_t fmtlen = 0;
-	uint8_t bits[96];
-	size_t size = sizeof(bits);
-	memset(bits, 0x00, size);
-	uint8_t cmdp = 0;
+    bool errors = false, verbose = false;
+    uint32_t fc = 0, cn = 0, delay = 1000;
+    uint8_t fmtlen = 0;
+    uint8_t bits[96];
+    size_t size = sizeof(bits);
+    memset(bits, 0x00, size);
+    uint8_t cmdp = 0;
 
-	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch ( tolower(param_getchar(Cmd, cmdp))) {
-		case 'h':
-			return usage_lf_awid_brute();
-		case 'f':
-		  	fc =  param_get32ex(Cmd ,cmdp+1, 0, 10);
-			if ( !fc )
-				errors = true;
-			cmdp += 2;
-			break;
-		case 'd':
-			// delay between attemps,  defaults to 1000ms.
-			delay = param_get32ex(Cmd, cmdp+1, 1000, 10);
-			cmdp += 2;
-			break;
-		case 'c':
-			cn = param_get32ex(Cmd, cmdp+1, 0, 10);
-			// truncate cardnumber.
-			cn &= 0xFFFF;
-			cmdp += 2;
-			break;
-		case 'a':
-			fmtlen = param_get8(Cmd, cmdp+1);
-			cmdp += 2;
-			break;
-		case 'v':
-			verbose = true;
-			cmdp++;
-			break;
-		default:
-			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-			errors = true;
-			break;
-		}
-	}
-	if ( fc == 0 ) errors = true;
-	if ( errors ) return usage_lf_awid_brute();
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch ( tolower(param_getchar(Cmd, cmdp))) {
+        case 'h':
+            return usage_lf_awid_brute();
+        case 'f':
+            fc =  param_get32ex(Cmd ,cmdp+1, 0, 10);
+            if ( !fc )
+                errors = true;
+            cmdp += 2;
+            break;
+        case 'd':
+            // delay between attemps,  defaults to 1000ms.
+            delay = param_get32ex(Cmd, cmdp+1, 1000, 10);
+            cmdp += 2;
+            break;
+        case 'c':
+            cn = param_get32ex(Cmd, cmdp+1, 0, 10);
+            // truncate cardnumber.
+            cn &= 0xFFFF;
+            cmdp += 2;
+            break;
+        case 'a':
+            fmtlen = param_get8(Cmd, cmdp+1);
+            cmdp += 2;
+            break;
+        case 'v':
+            verbose = true;
+            cmdp++;
+            break;
+        default:
+            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+            errors = true;
+            break;
+        }
+    }
+    if ( fc == 0 ) errors = true;
+    if ( errors ) return usage_lf_awid_brute();
 
-	// limit fc according to selected format
-	switch(fmtlen) {
-		case 50:
-			if ((fc & 0xFFFF) != fc) {
-				fc &= 0xFFFF;
-				PrintAndLogEx(INFO, "Facility-code truncated to 16-bits (AWID50): %u", fc);
-			}
-			break;
-		default:
-			if ((fc & 0xFF) != fc) {
-				fc &= 0xFF;
-				PrintAndLogEx(INFO, "Facility-code truncated to 8-bits (AWID26): %u", fc);
-			}
-			break;
-	}
+    // limit fc according to selected format
+    switch(fmtlen) {
+        case 50:
+            if ((fc & 0xFFFF) != fc) {
+                fc &= 0xFFFF;
+                PrintAndLogEx(INFO, "Facility-code truncated to 16-bits (AWID50): %u", fc);
+            }
+            break;
+        default:
+            if ((fc & 0xFF) != fc) {
+                fc &= 0xFF;
+                PrintAndLogEx(INFO, "Facility-code truncated to 8-bits (AWID26): %u", fc);
+            }
+            break;
+    }
 
-	PrintAndLogEx(SUCCESS, "Bruteforceing AWID %d Reader", fmtlen);
-	PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation or press key");
+    PrintAndLogEx(SUCCESS, "Bruteforceing AWID %d Reader", fmtlen);
+    PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation or press key");
 
-	uint16_t up = cn;
-	uint16_t down = cn;
+    uint16_t up = cn;
+    uint16_t down = cn;
 
-	// main loop
-	for (;;){
+    // main loop
+    for (;;){
 
-		if ( IsOffline() ) {
-			PrintAndLogEx(WARNING, "Device offline\n");
-			return  2;
-		}
-		if (ukbhit()) {
-			int gc = getchar(); (void)gc;
-			PrintAndLogEx(INFO, "aborted via keyboard!");
-			return sendPing();
-		}
+        if ( IsOffline() ) {
+            PrintAndLogEx(WARNING, "Device offline\n");
+            return  2;
+        }
+        if (ukbhit()) {
+            int gc = getchar(); (void)gc;
+            PrintAndLogEx(INFO, "aborted via keyboard!");
+            return sendPing();
+        }
 
-		// Do one up
-		if ( up < 0xFFFF )
-			if ( !sendTry(fmtlen, fc, up++, delay, bits, size, verbose)) return 1;
+        // Do one up
+        if ( up < 0xFFFF )
+            if ( !sendTry(fmtlen, fc, up++, delay, bits, size, verbose)) return 1;
 
-		// Do one down  (if cardnumber is given)
-		if ( cn > 1 )
-			if ( down > 1 )
-				if ( !sendTry(fmtlen, fc, --down, delay, bits, size, verbose)) return 1;
-	}
-	return 0;
+        // Do one down  (if cardnumber is given)
+        if ( cn > 1 )
+            if ( down > 1 )
+                if ( !sendTry(fmtlen, fc, --down, delay, bits, size, verbose)) return 1;
+    }
+    return 0;
 }
 
 static command_t CommandTable[] = {
-	{"help",	CmdHelp,		1, "this help"},
-	{"demod",	CmdAWIDDemod,	0, "demodulate an AWID FSK tag from the GraphBuffer"},
-	{"read",	CmdAWIDRead,	0, "attempt to read and extract tag data"},
-	{"clone",	CmdAWIDClone,	0, "clone AWID to T55x7"},
-	{"sim",		CmdAWIDSim,		0, "simulate AWID tag"},
-	{"brute",	CmdAWIDBrute,	0, "Bruteforce card number against reader"},
-	{NULL, NULL, 0, NULL}
+    {"help",    CmdHelp,        1, "this help"},
+    {"demod",   CmdAWIDDemod,   0, "demodulate an AWID FSK tag from the GraphBuffer"},
+    {"read",    CmdAWIDRead,    0, "attempt to read and extract tag data"},
+    {"clone",   CmdAWIDClone,   0, "clone AWID to T55x7"},
+    {"sim",     CmdAWIDSim,     0, "simulate AWID tag"},
+    {"brute",   CmdAWIDBrute,   0, "Bruteforce card number against reader"},
+    {NULL, NULL, 0, NULL}
 };
 
 int CmdLFAWID(const char *Cmd) {
-	clearCommandBuffer();
-	CmdsParse(CommandTable, Cmd);
-	return 0;
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
+    return 0;
 }
 
 int CmdHelp(const char *Cmd) {
-	CmdsHelp(CommandTable);
-	return 0;
+    CmdsHelp(CommandTable);
+    return 0;
 }
diff --git a/client/cmdlfawid.h b/client/cmdlfawid.h
index 8a7eced78..edee0473c 100644
--- a/client/cmdlfawid.h
+++ b/client/cmdlfawid.h
@@ -12,13 +12,13 @@
 #define CMDLFAWID_H__
 
 #include <stdio.h>      // sscanf
-#include <stdbool.h>	// bool
+#include <stdbool.h>    // bool
 #include "proxmark3.h"  // Definitions, USB controls, etc
 #include "ui.h"         // PrintAndLog
 #include "cmdparser.h"  // CmdsParse, CmdsHelp
 #include "lfdemod.h"    // parityTest
 #include "util.h"       // weigandparity
-#include "cmdlf.h"	    // lf read
+#include "cmdlf.h"      // lf read
 #include "protocols.h"  // for T55xx config register definitions
 #include "cmdmain.h"
 #include "util_posix.h"
diff --git a/client/cmdlfcotag.c b/client/cmdlfcotag.c
index 208355ad8..1e9adb401 100644
--- a/client/cmdlfcotag.c
+++ b/client/cmdlfcotag.c
@@ -12,54 +12,54 @@
 static int CmdHelp(const char *Cmd);
 
 int usage_lf_cotag_read(void){
-	PrintAndLogEx(NORMAL, "Usage: lf COTAG read [h] <signaldata>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h          : This help");
-	PrintAndLogEx(NORMAL, "      <0|1|2>    : 0 - HIGH/LOW signal; maxlength bigbuff");
-	PrintAndLogEx(NORMAL, "                 : 1 - translation of HI/LO into bytes with manchester 0,1");
-	PrintAndLogEx(NORMAL, "                 : 2 - raw signal; maxlength bigbuff");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Example:");
-	PrintAndLogEx(NORMAL, "        lf cotag read 0");
-	PrintAndLogEx(NORMAL, "        lf cotag read 1");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage: lf COTAG read [h] <signaldata>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "      h          : This help");
+    PrintAndLogEx(NORMAL, "      <0|1|2>    : 0 - HIGH/LOW signal; maxlength bigbuff");
+    PrintAndLogEx(NORMAL, "                 : 1 - translation of HI/LO into bytes with manchester 0,1");
+    PrintAndLogEx(NORMAL, "                 : 2 - raw signal; maxlength bigbuff");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Example:");
+    PrintAndLogEx(NORMAL, "        lf cotag read 0");
+    PrintAndLogEx(NORMAL, "        lf cotag read 1");
+    return 0;
 }
 
 // COTAG demod should be able to use GraphBuffer,
 // when data load samples
 int CmdCOTAGDemod(const char *Cmd) {
 
-	uint8_t bits[COTAG_BITS] = {0};
-	size_t bitlen = COTAG_BITS;
-	memcpy(bits, DemodBuffer, COTAG_BITS);
+    uint8_t bits[COTAG_BITS] = {0};
+    size_t bitlen = COTAG_BITS;
+    memcpy(bits, DemodBuffer, COTAG_BITS);
 
-	uint8_t alignPos = 0;
-	int err = manrawdecode(bits, &bitlen, 1, &alignPos);
-	if (err){
-		if (g_debugMode) PrintAndLogEx(DEBUG, "DEBUG: Error - COTAG too many errors: %d", err);
-		return -1;
-	}
+    uint8_t alignPos = 0;
+    int err = manrawdecode(bits, &bitlen, 1, &alignPos);
+    if (err){
+        if (g_debugMode) PrintAndLogEx(DEBUG, "DEBUG: Error - COTAG too many errors: %d", err);
+        return -1;
+    }
 
-	setDemodBuf(bits, bitlen, 0);
+    setDemodBuf(bits, bitlen, 0);
 
-	//got a good demod
-	uint16_t cn = bytebits_to_byteLSBF(bits+1, 16);
-	uint32_t fc = bytebits_to_byteLSBF(bits+1+16, 8);
+    //got a good demod
+    uint16_t cn = bytebits_to_byteLSBF(bits+1, 16);
+    uint32_t fc = bytebits_to_byteLSBF(bits+1+16, 8);
 
-	uint32_t raw1 = bytebits_to_byteLSBF(bits, 32);
-	uint32_t raw2 = bytebits_to_byteLSBF(bits+32, 32);
-	uint32_t raw3 = bytebits_to_byteLSBF(bits+64, 32);
-	uint32_t raw4 = bytebits_to_byteLSBF(bits+96, 32);
+    uint32_t raw1 = bytebits_to_byteLSBF(bits, 32);
+    uint32_t raw2 = bytebits_to_byteLSBF(bits+32, 32);
+    uint32_t raw3 = bytebits_to_byteLSBF(bits+64, 32);
+    uint32_t raw4 = bytebits_to_byteLSBF(bits+96, 32);
 
-	/*
-	fc 161:   1010 0001 -> LSB 1000 0101
-	cn 33593  1000 0011 0011 1001 -> LSB 1001 1100 1100 0001
+    /*
+    fc 161:   1010 0001 -> LSB 1000 0101
+    cn 33593  1000 0011 0011 1001 -> LSB 1001 1100 1100 0001
         cccc cccc cccc cccc                     ffffffff
-	  0 1001 1100 1100 0001 1000 0101 0000 0000 100001010000000001111011100000011010000010000000000000000000000000000000000000000000000000000000100111001100000110000101000
+      0 1001 1100 1100 0001 1000 0101 0000 0000 100001010000000001111011100000011010000010000000000000000000000000000000000000000000000000000000100111001100000110000101000
         1001 1100 1100 0001                     10000101
-	*/
-	PrintAndLogEx(SUCCESS, "COTAG Found: FC %u, CN: %u Raw: %08X%08X%08X%08X", fc, cn, raw1 ,raw2, raw3, raw4);
-	return 1;
+    */
+    PrintAndLogEx(SUCCESS, "COTAG Found: FC %u, CN: %u Raw: %08X%08X%08X%08X", fc, cn, raw1 ,raw2, raw3, raw4);
+    return 1;
 }
 
 // When reading a COTAG.
@@ -68,54 +68,54 @@ int CmdCOTAGDemod(const char *Cmd) {
 // 2 = raw signal -  maxlength bigbuff
 int CmdCOTAGRead(const char *Cmd) {
 
-	if (Cmd[0] == 'h' || Cmd[0] == 'H') return usage_lf_cotag_read();
+    if (Cmd[0] == 'h' || Cmd[0] == 'H') return usage_lf_cotag_read();
 
-	uint32_t rawsignal = 1;
-	sscanf(Cmd, "%u", &rawsignal);
+    uint32_t rawsignal = 1;
+    sscanf(Cmd, "%u", &rawsignal);
 
-	UsbCommand c = {CMD_COTAG, {rawsignal, 0, 0}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	if ( !WaitForResponseTimeout(CMD_ACK, NULL, 7000) ) {
-		PrintAndLogEx(WARNING, "command execution time out");
-		return -1;
-	}
+    UsbCommand c = {CMD_COTAG, {rawsignal, 0, 0}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    if ( !WaitForResponseTimeout(CMD_ACK, NULL, 7000) ) {
+        PrintAndLogEx(WARNING, "command execution time out");
+        return -1;
+    }
 
-	switch ( rawsignal ){
-		case 0:
-		case 2: {
-			CmdPlot("");
-			CmdGrid("384");
-			getSamples(0, true);
-			break;
-		}
-		case 1: {
+    switch ( rawsignal ){
+        case 0:
+        case 2: {
+            CmdPlot("");
+            CmdGrid("384");
+            getSamples(0, true);
+            break;
+        }
+        case 1: {
 
-			if ( !GetFromDevice(BIG_BUF, DemodBuffer, COTAG_BITS, 0, NULL, 1000, false)) {
-				PrintAndLogEx(WARNING, "timeout while waiting for reply.");
-				return -1;
-			}
-			DemodBufferLen = COTAG_BITS;
-			return CmdCOTAGDemod("");
-		}
-	}
-	return 0;
+            if ( !GetFromDevice(BIG_BUF, DemodBuffer, COTAG_BITS, 0, NULL, 1000, false)) {
+                PrintAndLogEx(WARNING, "timeout while waiting for reply.");
+                return -1;
+            }
+            DemodBufferLen = COTAG_BITS;
+            return CmdCOTAGDemod("");
+        }
+    }
+    return 0;
 }
 
 static command_t CommandTable[] = {
-	{"help",      CmdHelp,         1, "This help"},
-	{"demod",     CmdCOTAGDemod,   1, "Tries to decode a COTAG signal"},
-	{"read",      CmdCOTAGRead,    0, "Attempt to read and extract tag data"},
-	{NULL, NULL, 0, NULL}
+    {"help",      CmdHelp,         1, "This help"},
+    {"demod",     CmdCOTAGDemod,   1, "Tries to decode a COTAG signal"},
+    {"read",      CmdCOTAGRead,    0, "Attempt to read and extract tag data"},
+    {NULL, NULL, 0, NULL}
 };
 
 int CmdLFCOTAG(const char *Cmd) {
-	clearCommandBuffer();
-	CmdsParse(CommandTable, Cmd);
-	return 0;
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
+    return 0;
 }
 
 int CmdHelp(const char *Cmd) {
-	CmdsHelp(CommandTable);
-	return 0;
+    CmdsHelp(CommandTable);
+    return 0;
 }
diff --git a/client/cmdlfcotag.h b/client/cmdlfcotag.h
index 9270ccbb7..b774b12a8 100644
--- a/client/cmdlfcotag.h
+++ b/client/cmdlfcotag.h
@@ -13,11 +13,11 @@
 
 #include "proxmark3.h"  // Definitions, USB controls, COTAG_BITS
 #include "util.h"       // FALSE / TRUE
-#include "cmddata.h"	// getSamples
+#include "cmddata.h"    // getSamples
 #include "cmdparser.h"  // CmdsParse, CmdsHelp
 #include "comms.h"
-#include "ui.h"			// PrintAndLog
-#include "cmdlf.h"		// Setconfig
+#include "ui.h"         // PrintAndLog
+#include "cmdlf.h"      // Setconfig
 
 #ifndef COTAG_BITS
 #define COTAG_BITS 264
diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index f9ebf5f03..99bf440bf 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -16,179 +16,179 @@ static int CmdHelp(const char *Cmd);
 
 //////////////// 410x commands
 int usage_lf_em410x_demod(void){
-	PrintAndLogEx(NORMAL, "Usage:  lf em 410x_demod [h] [clock] <0|1> [maxError]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "     h                   - this help");
-	PrintAndLogEx(NORMAL, "     clock               -  set clock as integer, optional, if not set, autodetect.");
-	PrintAndLogEx(NORMAL, "     <0|1>               - 0 normal output, 1 for invert output");
-	PrintAndLogEx(NORMAL, "     maxerror            - set maximum allowed errors, default = 100.");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "           lf em 410x_demod        = demod an EM410x Tag ID from GraphBuffer");
-	PrintAndLogEx(NORMAL, "           lf em 410x_demod 32     = demod an EM410x Tag ID from GraphBuffer using a clock of RF/32");
-	PrintAndLogEx(NORMAL, "           lf em 410x_demod 32 1   = demod an EM410x Tag ID from GraphBuffer using a clock of RF/32 and inverting data");
-	PrintAndLogEx(NORMAL, "           lf em 410x_demod 1      = demod an EM410x Tag ID from GraphBuffer while inverting data");
-	PrintAndLogEx(NORMAL, "           lf em 410x_demod 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;
+    PrintAndLogEx(NORMAL, "Usage:  lf em 410x_demod [h] [clock] <0|1> [maxError]");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "     h                   - this help");
+    PrintAndLogEx(NORMAL, "     clock               -  set clock as integer, optional, if not set, autodetect.");
+    PrintAndLogEx(NORMAL, "     <0|1>               - 0 normal output, 1 for invert output");
+    PrintAndLogEx(NORMAL, "     maxerror            - set maximum allowed errors, default = 100.");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "           lf em 410x_demod        = demod an EM410x Tag ID from GraphBuffer");
+    PrintAndLogEx(NORMAL, "           lf em 410x_demod 32     = demod an EM410x Tag ID from GraphBuffer using a clock of RF/32");
+    PrintAndLogEx(NORMAL, "           lf em 410x_demod 32 1   = demod an EM410x Tag ID from GraphBuffer using a clock of RF/32 and inverting data");
+    PrintAndLogEx(NORMAL, "           lf em 410x_demod 1      = demod an EM410x Tag ID from GraphBuffer while inverting data");
+    PrintAndLogEx(NORMAL, "           lf em 410x_demod 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;
 }
 int usage_lf_em410x_write(void) {
-	PrintAndLogEx(NORMAL, "Writes EM410x ID to a T55x7 / T5555 (Q5) tag");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  lf em 410x_write [h] <id> <card> [clock]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h         - this help");
-	PrintAndLogEx(NORMAL, "       <id>      - ID number");
-	PrintAndLogEx(NORMAL, "       <card>    - 0|1 T5555 (Q5) / T55x7");
-	PrintAndLogEx(NORMAL, "       <clock>   - 16|32|40|64, optional, set R/F clock rate, defaults to 64");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      lf em 410x_write 0F0368568B 1       = write ID to t55x7 card");
-	return 0;
+    PrintAndLogEx(NORMAL, "Writes EM410x ID to a T55x7 / T5555 (Q5) tag");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  lf em 410x_write [h] <id> <card> [clock]");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h         - this help");
+    PrintAndLogEx(NORMAL, "       <id>      - ID number");
+    PrintAndLogEx(NORMAL, "       <card>    - 0|1 T5555 (Q5) / T55x7");
+    PrintAndLogEx(NORMAL, "       <clock>   - 16|32|40|64, optional, set R/F clock rate, defaults to 64");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      lf em 410x_write 0F0368568B 1       = write ID to t55x7 card");
+    return 0;
 }
 int usage_lf_em410x_ws(void) {
-	PrintAndLogEx(NORMAL, "Watch 'nd Spoof, activates reader, waits until a EM410x tag gets presented then it starts simulating the found UID");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  lf em 410x_spoof [h]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h         - this help");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      lf em 410x_spoof");
-	return 0;
+    PrintAndLogEx(NORMAL, "Watch 'nd Spoof, activates reader, waits until a EM410x tag gets presented then it starts simulating the found UID");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  lf em 410x_spoof [h]");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h         - this help");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      lf em 410x_spoof");
+    return 0;
 }
 int usage_lf_em410x_clone(void) {
-	PrintAndLogEx(NORMAL, "Simulating EM410x tag");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  lf em 410x_clone [h] <uid> <clock>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h         - this help");
-	PrintAndLogEx(NORMAL, "       uid       - uid (10 HEX symbols)");
-	PrintAndLogEx(NORMAL, "       clock     - clock (32|64) (optional)");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      lf em 410x_clone 0F0368568B");
-	PrintAndLogEx(NORMAL, "      lf em 410x_clone 0F0368568B 32");
-	return 0;
+    PrintAndLogEx(NORMAL, "Simulating EM410x tag");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  lf em 410x_clone [h] <uid> <clock>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h         - this help");
+    PrintAndLogEx(NORMAL, "       uid       - uid (10 HEX symbols)");
+    PrintAndLogEx(NORMAL, "       clock     - clock (32|64) (optional)");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      lf em 410x_clone 0F0368568B");
+    PrintAndLogEx(NORMAL, "      lf em 410x_clone 0F0368568B 32");
+    return 0;
 }
 int usage_lf_em410x_sim(void) {
-	PrintAndLogEx(NORMAL, "Simulating EM410x tag");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  lf em 410x_sim [h] <uid> <clock>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h         - this help");
-	PrintAndLogEx(NORMAL, "       uid       - uid (10 HEX symbols)");
-	PrintAndLogEx(NORMAL, "       clock     - clock (32|64) (optional)");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      lf em 410x_sim 0F0368568B");
-	PrintAndLogEx(NORMAL, "      lf em 410x_sim 0F0368568B 32");
-	return 0;
+    PrintAndLogEx(NORMAL, "Simulating EM410x tag");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  lf em 410x_sim [h] <uid> <clock>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h         - this help");
+    PrintAndLogEx(NORMAL, "       uid       - uid (10 HEX symbols)");
+    PrintAndLogEx(NORMAL, "       clock     - clock (32|64) (optional)");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      lf em 410x_sim 0F0368568B");
+    PrintAndLogEx(NORMAL, "      lf em 410x_sim 0F0368568B 32");
+    return 0;
 }
 int usage_lf_em410x_brute(void) {
-	PrintAndLogEx(NORMAL, "Bruteforcing by emulating EM410x tag");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  lf em 410x_brute [h] ids.txt [d 2000] [c clock]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h             - this help");
-	PrintAndLogEx(NORMAL, "       ids.txt       - file with UIDs in HEX format, one per line");
-	PrintAndLogEx(NORMAL, "       d (2000)      - pause delay in milliseconds between UIDs simulation, default 1000 ms (optional)");
-	PrintAndLogEx(NORMAL, "       c (32)        - clock (32|64), default 64 (optional)");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      lf em 410x_brute ids.txt");
-	PrintAndLogEx(NORMAL, "      lf em 410x_brute ids.txt c 32");
-	PrintAndLogEx(NORMAL, "      lf em 410x_brute ids.txt d 3000");
-	PrintAndLogEx(NORMAL, "      lf em 410x_brute ids.txt d 3000 c 32");
-	return 0;
+    PrintAndLogEx(NORMAL, "Bruteforcing by emulating EM410x tag");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  lf em 410x_brute [h] ids.txt [d 2000] [c clock]");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h             - this help");
+    PrintAndLogEx(NORMAL, "       ids.txt       - file with UIDs in HEX format, one per line");
+    PrintAndLogEx(NORMAL, "       d (2000)      - pause delay in milliseconds between UIDs simulation, default 1000 ms (optional)");
+    PrintAndLogEx(NORMAL, "       c (32)        - clock (32|64), default 64 (optional)");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      lf em 410x_brute ids.txt");
+    PrintAndLogEx(NORMAL, "      lf em 410x_brute ids.txt c 32");
+    PrintAndLogEx(NORMAL, "      lf em 410x_brute ids.txt d 3000");
+    PrintAndLogEx(NORMAL, "      lf em 410x_brute ids.txt d 3000 c 32");
+    return 0;
 }
 
 //////////////// 4050 / 4450 commands
 int usage_lf_em4x50_dump(void) {
-	PrintAndLogEx(NORMAL, "Dump EM4x50/EM4x69.  Tag must be on antenna. ");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  lf em 4x50_dump [h] <pwd>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h         - this help");
-	PrintAndLogEx(NORMAL, "       pwd       - password (hex) (optional)");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      lf em 4x50_dump");
-	PrintAndLogEx(NORMAL, "      lf em 4x50_dump 11223344");
-	return 0;
+    PrintAndLogEx(NORMAL, "Dump EM4x50/EM4x69.  Tag must be on antenna. ");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  lf em 4x50_dump [h] <pwd>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h         - this help");
+    PrintAndLogEx(NORMAL, "       pwd       - password (hex) (optional)");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      lf em 4x50_dump");
+    PrintAndLogEx(NORMAL, "      lf em 4x50_dump 11223344");
+    return 0;
 }
 int usage_lf_em4x50_read(void) {
-	PrintAndLogEx(NORMAL, "Read EM 4x50/EM4x69.  Tag must be on antenna. ");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  lf em 4x50_read [h] <address> <pwd>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h         - this help");
-	PrintAndLogEx(NORMAL, "       address   - memory address to read. (0-15)");
-	PrintAndLogEx(NORMAL, "       pwd       - password (hex) (optional)");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      lf em 4x50_read 1");
-	PrintAndLogEx(NORMAL, "      lf em 4x50_read 1 11223344");
-	return 0;
+    PrintAndLogEx(NORMAL, "Read EM 4x50/EM4x69.  Tag must be on antenna. ");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  lf em 4x50_read [h] <address> <pwd>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h         - this help");
+    PrintAndLogEx(NORMAL, "       address   - memory address to read. (0-15)");
+    PrintAndLogEx(NORMAL, "       pwd       - password (hex) (optional)");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      lf em 4x50_read 1");
+    PrintAndLogEx(NORMAL, "      lf em 4x50_read 1 11223344");
+    return 0;
 }
 int usage_lf_em4x50_write(void) {
-	PrintAndLogEx(NORMAL, "Write EM 4x50/4x69.  Tag must be on antenna. ");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  lf em 4x50_write [h] <address> <data> <pwd>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h         - this help");
-	PrintAndLogEx(NORMAL, "       address   - memory address to write to. (0-15)");
-	PrintAndLogEx(NORMAL, "       data      - data to write (hex)");
-	PrintAndLogEx(NORMAL, "       pwd       - password (hex) (optional)");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      lf em 4x50_write 1 deadc0de");
-	PrintAndLogEx(NORMAL, "      lf em 4x50_write 1 deadc0de 11223344");
-	return 0;
+    PrintAndLogEx(NORMAL, "Write EM 4x50/4x69.  Tag must be on antenna. ");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  lf em 4x50_write [h] <address> <data> <pwd>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h         - this help");
+    PrintAndLogEx(NORMAL, "       address   - memory address to write to. (0-15)");
+    PrintAndLogEx(NORMAL, "       data      - data to write (hex)");
+    PrintAndLogEx(NORMAL, "       pwd       - password (hex) (optional)");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      lf em 4x50_write 1 deadc0de");
+    PrintAndLogEx(NORMAL, "      lf em 4x50_write 1 deadc0de 11223344");
+    return 0;
 }
 
 //////////////// 4205 / 4305 commands
 int usage_lf_em4x05_dump(void) {
-	PrintAndLogEx(NORMAL, "Dump EM4x05/EM4x69.  Tag must be on antenna. ");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  lf em 4x05_dump [h] <pwd>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h         - this help");
-	PrintAndLogEx(NORMAL, "       pwd       - password (hex) (optional)");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      lf em 4x05_dump");
-	PrintAndLogEx(NORMAL, "      lf em 4x05_dump 11223344");
-	return 0;
+    PrintAndLogEx(NORMAL, "Dump EM4x05/EM4x69.  Tag must be on antenna. ");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  lf em 4x05_dump [h] <pwd>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h         - this help");
+    PrintAndLogEx(NORMAL, "       pwd       - password (hex) (optional)");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      lf em 4x05_dump");
+    PrintAndLogEx(NORMAL, "      lf em 4x05_dump 11223344");
+    return 0;
 }
 int usage_lf_em4x05_read(void) {
-	PrintAndLogEx(NORMAL, "Read EM4x05/EM4x69.  Tag must be on antenna. ");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  lf em 4x05_read [h] <address> <pwd>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h         - this help");
-	PrintAndLogEx(NORMAL, "       address   - memory address to read. (0-15)");
-	PrintAndLogEx(NORMAL, "       pwd       - password (hex) (optional)");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      lf em 4x05_read 1");
-	PrintAndLogEx(NORMAL, "      lf em 4x05_read 1 11223344");
-	return 0;
+    PrintAndLogEx(NORMAL, "Read EM4x05/EM4x69.  Tag must be on antenna. ");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  lf em 4x05_read [h] <address> <pwd>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h         - this help");
+    PrintAndLogEx(NORMAL, "       address   - memory address to read. (0-15)");
+    PrintAndLogEx(NORMAL, "       pwd       - password (hex) (optional)");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      lf em 4x05_read 1");
+    PrintAndLogEx(NORMAL, "      lf em 4x05_read 1 11223344");
+    return 0;
 }
 int usage_lf_em4x05_write(void) {
-	PrintAndLogEx(NORMAL, "Write EM4x05/4x69.  Tag must be on antenna. ");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  lf em 4x05_write [h] <address> <data> <pwd>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h         - this help");
-	PrintAndLogEx(NORMAL, "       address   - memory address to write to. (0-15)");
-	PrintAndLogEx(NORMAL, "       data      - data to write (hex)");
-	PrintAndLogEx(NORMAL, "       pwd       - password (hex) (optional)");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      lf em 4x05_write 1 deadc0de");
-	PrintAndLogEx(NORMAL, "      lf em 4x05_write 1 deadc0de 11223344");
-	return 0;
+    PrintAndLogEx(NORMAL, "Write EM4x05/4x69.  Tag must be on antenna. ");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  lf em 4x05_write [h] <address> <data> <pwd>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h         - this help");
+    PrintAndLogEx(NORMAL, "       address   - memory address to write to. (0-15)");
+    PrintAndLogEx(NORMAL, "       data      - data to write (hex)");
+    PrintAndLogEx(NORMAL, "       pwd       - password (hex) (optional)");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      lf em 4x05_write 1 deadc0de");
+    PrintAndLogEx(NORMAL, "      lf em 4x05_write 1 deadc0de 11223344");
+    return 0;
 }
 int usage_lf_em4x05_info(void) {
-	PrintAndLogEx(NORMAL, "Tag information EM4205/4305/4469//4569 tags.  Tag must be on antenna.");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  lf em 4x05_info [h] <pwd>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h         - this help");
-	PrintAndLogEx(NORMAL, "       pwd       - password (hex) (optional)");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      lf em 4x05_info");
-	PrintAndLogEx(NORMAL, "      lf em 4x05_info deadc0de");
-	return 0;
+    PrintAndLogEx(NORMAL, "Tag information EM4205/4305/4469//4569 tags.  Tag must be on antenna.");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  lf em 4x05_info [h] <pwd>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h         - this help");
+    PrintAndLogEx(NORMAL, "       pwd       - password (hex) (optional)");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      lf em 4x05_info");
+    PrintAndLogEx(NORMAL, "      lf em 4x05_info deadc0de");
+    return 0;
 }
 
 /* Read the ID of an EM410x tag.
@@ -203,146 +203,146 @@ int usage_lf_em4x05_info(void) {
 // Construct the graph for emulating an EM410X tag
 void ConstructEM410xEmulGraph(const char *uid,const  uint8_t clock) {
 
-	int i, j, binary[4], parity[4];
-	uint32_t n;
-	/* clear our graph */
-	ClearGraph(false);
+    int i, j, binary[4], parity[4];
+    uint32_t n;
+    /* clear our graph */
+    ClearGraph(false);
 
-	/* write 9 start bits */
-	for (i = 0; i < 9; i++)
-		AppendGraph(false, clock, 1);
+    /* write 9 start bits */
+    for (i = 0; i < 9; i++)
+        AppendGraph(false, 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;
+    /* 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(false, clock, binary[0]);
-		AppendGraph(false, clock, binary[1]);
-		AppendGraph(false, clock, binary[2]);
-		AppendGraph(false, clock, binary[3]);
+        /* append each bit */
+        AppendGraph(false, clock, binary[0]);
+        AppendGraph(false, clock, binary[1]);
+        AppendGraph(false, clock, binary[2]);
+        AppendGraph(false, clock, binary[3]);
 
-		/* append parity bit */
-		AppendGraph(false, clock, binary[0] ^ binary[1] ^ binary[2] ^ binary[3]);
+        /* append parity bit */
+        AppendGraph(false, 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];
-	}
+        /* keep track of column parity */
+        parity[0] ^= binary[0];
+        parity[1] ^= binary[1];
+        parity[2] ^= binary[2];
+        parity[3] ^= binary[3];
+    }
 
-	/* parity columns */
-	AppendGraph(false, clock, parity[0]);
-	AppendGraph(false, clock, parity[1]);
-	AppendGraph(false, clock, parity[2]);
-	AppendGraph(false, clock, parity[3]);
+    /* parity columns */
+    AppendGraph(false, clock, parity[0]);
+    AppendGraph(false, clock, parity[1]);
+    AppendGraph(false, clock, parity[2]);
+    AppendGraph(false, clock, parity[3]);
 
-	/* stop bit */
-	AppendGraph(true, clock, 0);
+    /* stop bit */
+    AppendGraph(true, clock, 0);
 }
 
 //by marshmellow
 //print 64 bit EM410x ID in multiple formats
 void printEM410x(uint32_t hi, uint64_t id) {
 
-	if (!id && !hi) return;
+    if (!id && !hi) return;
 
-	PrintAndLogEx(SUCCESS, "EM410x %s pattern found", (hi) ? "XL" : "" );
+    PrintAndLogEx(SUCCESS, "EM410x %s pattern found", (hi) ? "XL" : "" );
 
-	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)));
-		}
-	}
+    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
-		PrintAndLogEx(NORMAL, "\nEM TAG ID      : %06X%016" PRIX64, hi, id);
-	} else {
-		//output 40 bit em id
-		PrintAndLogEx(NORMAL, "\nEM TAG ID      : %010" PRIX64, id);
-		PrintAndLogEx(NORMAL, "\nPossible de-scramble patterns");
-		PrintAndLogEx(NORMAL, "Unique TAG ID  : %010" PRIX64, id2lo);
-		PrintAndLogEx(NORMAL, "HoneyWell IdentKey {");
-		PrintAndLogEx(NORMAL, "DEZ 8          : %08" PRIu64, id & 0xFFFFFF);
-		PrintAndLogEx(NORMAL, "DEZ 10         : %010" PRIu64, id & 0xFFFFFFFF);
-		PrintAndLogEx(NORMAL, "DEZ 5.5        : %05" PRIu64 ".%05" PRIu64, (id>>16LL) & 0xFFFF, (id & 0xFFFF));
-		PrintAndLogEx(NORMAL, "DEZ 3.5A       : %03" PRIu64 ".%05" PRIu64, (id>>32ll), (id & 0xFFFF));
-		PrintAndLogEx(NORMAL, "DEZ 3.5B       : %03" PRIu64 ".%05" PRIu64, (id & 0xFF000000) >> 24, (id & 0xFFFF));
-		PrintAndLogEx(NORMAL, "DEZ 3.5C       : %03" PRIu64 ".%05" PRIu64, (id & 0xFF0000) >> 16, (id & 0xFFFF));
-		PrintAndLogEx(NORMAL, "DEZ 14/IK2     : %014" PRIu64, id);
-		PrintAndLogEx(NORMAL, "DEZ 15/IK3     : %015" PRIu64, id2lo);
-		PrintAndLogEx(NORMAL, "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;
-		PrintAndLogEx(NORMAL, "}\nOther          : %05" PRIu64 "_%03" PRIu64 "_%08" PRIu64, (id&0xFFFF), ((id>>16LL) & 0xFF), (id & 0xFFFFFF));
-		PrintAndLogEx(NORMAL, "Pattern Paxton : %" PRIu64 " [0x%" PRIX64 "]", paxton, paxton);
+    if (hi){
+        //output 88 bit em id
+        PrintAndLogEx(NORMAL, "\nEM TAG ID      : %06X%016" PRIX64, hi, id);
+    } else {
+        //output 40 bit em id
+        PrintAndLogEx(NORMAL, "\nEM TAG ID      : %010" PRIX64, id);
+        PrintAndLogEx(NORMAL, "\nPossible de-scramble patterns");
+        PrintAndLogEx(NORMAL, "Unique TAG ID  : %010" PRIX64, id2lo);
+        PrintAndLogEx(NORMAL, "HoneyWell IdentKey {");
+        PrintAndLogEx(NORMAL, "DEZ 8          : %08" PRIu64, id & 0xFFFFFF);
+        PrintAndLogEx(NORMAL, "DEZ 10         : %010" PRIu64, id & 0xFFFFFFFF);
+        PrintAndLogEx(NORMAL, "DEZ 5.5        : %05" PRIu64 ".%05" PRIu64, (id>>16LL) & 0xFFFF, (id & 0xFFFF));
+        PrintAndLogEx(NORMAL, "DEZ 3.5A       : %03" PRIu64 ".%05" PRIu64, (id>>32ll), (id & 0xFFFF));
+        PrintAndLogEx(NORMAL, "DEZ 3.5B       : %03" PRIu64 ".%05" PRIu64, (id & 0xFF000000) >> 24, (id & 0xFFFF));
+        PrintAndLogEx(NORMAL, "DEZ 3.5C       : %03" PRIu64 ".%05" PRIu64, (id & 0xFF0000) >> 16, (id & 0xFFFF));
+        PrintAndLogEx(NORMAL, "DEZ 14/IK2     : %014" PRIu64, id);
+        PrintAndLogEx(NORMAL, "DEZ 15/IK3     : %015" PRIu64, id2lo);
+        PrintAndLogEx(NORMAL, "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;
+        PrintAndLogEx(NORMAL, "}\nOther          : %05" PRIu64 "_%03" PRIu64 "_%08" PRIu64, (id&0xFFFF), ((id>>16LL) & 0xFF), (id & 0xFFFFFF));
+        PrintAndLogEx(NORMAL, "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 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;
+        uint32_t p1  = 0;
 
-		p1 |= arr[23] << 21;
-		p1 |= arr[22] << 23;
-		p1 |= arr[21] << 20;
-		p1 |= arr[20] << 22;
+        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[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[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[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[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;
-		PrintAndLogEx(NORMAL, "Pattern 1      : %d [0x%X]", p1, p1);
+        p1 |= arr[3]  << 10;
+        p1 |= arr[2]  << 4;
+        p1 |= arr[1]  << 5;
+        p1 |= arr[0]  << 9;
+        PrintAndLogEx(NORMAL, "Pattern 1      : %d [0x%X]", p1, p1);
 
-		uint16_t sebury1 = id & 0xFFFF;
-		uint8_t  sebury2 = (id >> 16) & 0x7F;
-		uint32_t sebury3 = id & 0x7FFFFF;
-		PrintAndLogEx(NORMAL, "Pattern Sebury : %d %d %d  [0x%X 0x%X 0x%X]", sebury1, sebury2, sebury3, sebury1, sebury2, sebury3);
-	}
+        uint16_t sebury1 = id & 0xFFFF;
+        uint8_t  sebury2 = (id >> 16) & 0x7F;
+        uint32_t sebury3 = id & 0x7FFFFF;
+        PrintAndLogEx(NORMAL, "Pattern Sebury : %d %d %d  [0x%X 0x%X 0x%X]", sebury1, sebury2, sebury3, sebury1, sebury2, sebury3);
+    }
 }
 /* Read the ID of an EM410x tag.
  * Format:
@@ -353,66 +353,66 @@ void printEM410x(uint32_t hi, uint64_t id) {
  *   0                     <-- stop bit, end of tag
  */
 int AskEm410xDecode(bool verbose, uint32_t *hi, uint64_t *lo ) {
-	size_t idx = 0;
-	uint8_t bits[512] = {0};
-	size_t size = sizeof(bits);
-	if ( !getDemodBuf(bits, &size) ) {
-		PrintAndLogEx(DEBUG, "DEBUG: Error - Em410x problem during copy from ASK demod");
-		return 0;
-	}
+    size_t idx = 0;
+    uint8_t bits[512] = {0};
+    size_t size = sizeof(bits);
+    if ( !getDemodBuf(bits, &size) ) {
+        PrintAndLogEx(DEBUG, "DEBUG: Error - Em410x problem during copy from ASK demod");
+        return 0;
+    }
 
-	int ans = Em410xDecode(bits, &size, &idx, hi, lo);
-	if ( ans < 0){
+    int ans = Em410xDecode(bits, &size, &idx, hi, lo);
+    if ( ans < 0){
 
-		if (ans == -2)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - Em410x not enough samples after demod");
-		else if (ans == -4)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - Em410x preamble not found");
-		else if (ans == -5)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - Em410x Size not correct: %d", size);
-		else if (ans == -6)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - Em410x parity failed");
+        if (ans == -2)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - Em410x not enough samples after demod");
+        else if (ans == -4)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - Em410x preamble not found");
+        else if (ans == -5)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - Em410x Size not correct: %d", size);
+        else if (ans == -6)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - Em410x parity failed");
 
-		return 0;
-	}
-	if (!lo && !hi) {
-		PrintAndLogEx(DEBUG, "DEBUG: Error - Em410x decoded to all zeros");
-		return 0;
-	}
+        return 0;
+    }
+    if (!lo && !hi) {
+        PrintAndLogEx(DEBUG, "DEBUG: Error - Em410x decoded to all zeros");
+        return 0;
+    }
 
-	//set GraphBuffer for clone or sim command
-	setDemodBuf(DemodBuffer, (size==40) ? 64 : 128, idx+1);
-	setClockGrid(g_DemodClock, g_DemodStartIdx + ((idx+1)*g_DemodClock));
+    //set GraphBuffer for clone or sim command
+    setDemodBuf(DemodBuffer, (size==40) ? 64 : 128, idx+1);
+    setClockGrid(g_DemodClock, g_DemodStartIdx + ((idx+1)*g_DemodClock));
 
-	PrintAndLogEx(DEBUG, "DEBUG: Em410x idx: %d, Len: %d, Printing Demod Buffer:", idx, size);
-	if (g_debugMode)
-		printDemodBuff();
+    PrintAndLogEx(DEBUG, "DEBUG: Em410x idx: %d, Len: %d, Printing Demod Buffer:", idx, size);
+    if (g_debugMode)
+        printDemodBuff();
 
-	if (verbose)
-		printEM410x(*hi, *lo);
+    if (verbose)
+        printEM410x(*hi, *lo);
 
-	return 1;
+    return 1;
 }
 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);
+    bool st = true;
+    if (!ASKDemod_ext(Cmd, false, false, 1, &st)) return 0;
+    return AskEm410xDecode(verbose, hi, lo);
 }
 
 // this read is the "normal" read,  which download lf signal and tries to demod here.
 int CmdEM410xRead(const char *Cmd) {
-	lf_read(true, 8192);
-	return CmdEM410xDemod(Cmd);
+    lf_read(true, 8192);
+    return CmdEM410xDemod(Cmd);
 }
 
 // this read loops on device side.
 // uses the demod in lfops.c
 int CmdEM410xRead_device(const char *Cmd) {
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	uint8_t findone = (cmdp == '1') ? 1 : 0;
-	UsbCommand c = {CMD_EM410X_DEMOD, {findone, 0, 0}};
-	SendCommand(&c);
-	return 0;
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    uint8_t findone = (cmdp == '1') ? 1 : 0;
+    UsbCommand c = {CMD_EM410X_DEMOD, {findone, 0, 0}};
+    SendCommand(&c);
+    return 0;
 }
 
  //by marshmellow
@@ -420,152 +420,152 @@ int CmdEM410xRead_device(const char *Cmd) {
 //attempts to demodulate ask while decoding manchester
 //prints binary found and saves in graphbuffer for further commands
 int CmdEM410xDemod(const char *Cmd) {
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if (strlen(Cmd) > 10 || cmdp == 'h') return usage_lf_em410x_demod();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) > 10 || cmdp == 'h') return usage_lf_em410x_demod();
 
-	uint32_t hi = 0;
-	uint64_t lo = 0;
+    uint32_t hi = 0;
+    uint64_t lo = 0;
 
-	if (AskEm410xDemod(Cmd, &hi, &lo, true) != 1) return 0;
+    if (AskEm410xDemod(Cmd, &hi, &lo, true) != 1) return 0;
 
-	g_em410xid = lo;
-	return 1;
+    g_em410xid = lo;
+    return 1;
 }
 
 // emulate an EM410X tag
 int CmdEM410xSim(const char *Cmd) {
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if (cmdp == 'h') return usage_lf_em410x_sim();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (cmdp == 'h') return usage_lf_em410x_sim();
 
-	uint8_t uid[5] = {0x00};
+    uint8_t uid[5] = {0x00};
 
-	/* clock is 64 in EM410x tags */
-	uint8_t clock = 64;
+    /* clock is 64 in EM410x tags */
+    uint8_t clock = 64;
 
-	if (param_gethex(Cmd, 0, uid, 10)) {
-		PrintAndLogEx(FAILED, "UID must include 10 HEX symbols");
-		return 0;
-	}
+    if (param_gethex(Cmd, 0, uid, 10)) {
+        PrintAndLogEx(FAILED, "UID must include 10 HEX symbols");
+        return 0;
+    }
 
-	param_getdec(Cmd, 1, &clock);
+    param_getdec(Cmd, 1, &clock);
 
-	PrintAndLogEx(SUCCESS, "Starting simulating UID %02X%02X%02X%02X%02X  clock: %d", uid[0],uid[1],uid[2],uid[3],uid[4],clock);
-	PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation");
+    PrintAndLogEx(SUCCESS, "Starting simulating UID %02X%02X%02X%02X%02X  clock: %d", uid[0],uid[1],uid[2],uid[3],uid[4],clock);
+    PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation");
 
-	ConstructEM410xEmulGraph(Cmd, clock);
+    ConstructEM410xEmulGraph(Cmd, clock);
 
-	CmdLFSim("0"); //240 start_gap.
-	return 0;
+    CmdLFSim("0"); //240 start_gap.
+    return 0;
 }
 
 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;
-	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 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;
+    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 = tolower(param_getchar(Cmd, 0));
-	if (cmdp == 'h') return usage_lf_em410x_brute();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (cmdp == 'h') return usage_lf_em410x_brute();
 
-	cmdp = tolower(param_getchar(Cmd, 1));
-	if (cmdp == 'd') {
-		delay = param_get32ex(Cmd, 2, 1000, 10);
-		param_getdec(Cmd, 4, &clock);
-	} else if (cmdp == 'c') {
-		param_getdec(Cmd, 2, &clock);
-		delay = param_get32ex(Cmd, 4, 1000, 10);
-	}
+    cmdp = tolower(param_getchar(Cmd, 1));
+    if (cmdp == 'd') {
+        delay = param_get32ex(Cmd, 2, 1000, 10);
+        param_getdec(Cmd, 4, &clock);
+    } else if (cmdp == 'c') {
+        param_getdec(Cmd, 2, &clock);
+        delay = param_get32ex(Cmd, 4, 1000, 10);
+    }
 
-	int filelen = param_getstr(Cmd, 0, filename, FILE_PATH_SIZE);
-	if (filelen == 0) {
-		PrintAndLogEx(WARNING, "Error: Please specify a filename");
-		return 1;
-	}
+    int filelen = param_getstr(Cmd, 0, filename, FILE_PATH_SIZE);
+    if (filelen == 0) {
+        PrintAndLogEx(WARNING, "Error: Please specify a filename");
+        return 1;
+    }
 
-	if ((f = fopen(filename, "r")) == NULL) {
-		PrintAndLogEx(WARNING, "Error: Could not open UIDs file [%s]", filename);
-		return 1;
-	}
+    if ((f = fopen(filename, "r")) == NULL) {
+        PrintAndLogEx(WARNING, "Error: Could not open UIDs file [%s]", filename);
+        return 1;
+    }
 
-	uidBlock = calloc(stUidBlock, 5);
-	if (uidBlock == NULL) {
-		fclose(f);
-		return 1;
-	}
+    uidBlock = calloc(stUidBlock, 5);
+    if (uidBlock == NULL) {
+        fclose(f);
+        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
+    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;
+        //The line start with # is comment, skip
+        if( buf[0]=='#' ) continue;
 
-		if (param_gethex(buf, 0, uid, 10)) {
-			PrintAndLogEx(FAILED, "UIDs must include 10 HEX symbols");
-			free(uidBlock);
-			fclose(f);
-			return 1;
-		}
+        if (param_gethex(buf, 0, uid, 10)) {
+            PrintAndLogEx(FAILED, "UIDs must include 10 HEX symbols");
+            free(uidBlock);
+            fclose(f);
+            return 1;
+        }
 
-		buf[10] = 0;
+        buf[10] = 0;
 
-		if ( stUidBlock - uidcnt < 2) {
-				p = realloc(uidBlock, 5 * (stUidBlock += 10) );
-				if (!p) {
-					PrintAndLogEx(WARNING, "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));
-	}
+        if ( stUidBlock - uidcnt < 2) {
+                p = realloc(uidBlock, 5 * (stUidBlock += 10) );
+                if (!p) {
+                    PrintAndLogEx(WARNING, "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);
+    fclose(f);
 
-	if (uidcnt == 0) {
-		PrintAndLogEx(FAILED, "No UIDs found in file");
-		free(uidBlock);
-		return 1;
-	}
+    if (uidcnt == 0) {
+        PrintAndLogEx(FAILED, "No UIDs found in file");
+        free(uidBlock);
+        return 1;
+    }
 
-	PrintAndLogEx(SUCCESS, "Loaded %d UIDs from %s, pause delay: %d ms", uidcnt, filename, delay);
+    PrintAndLogEx(SUCCESS, "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;
+    // loop
+    for(uint32_t c = 0; c < uidcnt; ++c ) {
+        char testuid[11];
+        testuid[10] = 0;
 
-		if (ukbhit()) {
-			int gc = getchar(); (void)gc;
-			PrintAndLogEx(WARNING, "\nAborted via keyboard!\n");
-			free(uidBlock);
-			return 0;
-		}
+        if (ukbhit()) {
+            int gc = getchar(); (void)gc;
+            PrintAndLogEx(WARNING, "\nAborted via keyboard!\n");
+            free(uidBlock);
+            return 0;
+        }
 
-		sprintf(testuid, "%010" PRIX64, bytes_to_num(uidBlock + 5*c, 5));
-		PrintAndLogEx(NORMAL, "Bruteforce %d / %d: simulating UID  %s, clock %d", c + 1, uidcnt, testuid, clock);
+        sprintf(testuid, "%010" PRIX64, bytes_to_num(uidBlock + 5*c, 5));
+        PrintAndLogEx(NORMAL, "Bruteforce %d / %d: simulating UID  %s, clock %d", c + 1, uidcnt, testuid, clock);
 
-		ConstructEM410xEmulGraph(testuid, clock);
+        ConstructEM410xEmulGraph(testuid, clock);
 
-		CmdLFSim("0"); //240 start_gap.
+        CmdLFSim("0"); //240 start_gap.
 
-		msleep(delay);
-	}
+        msleep(delay);
+    }
 
-	free(uidBlock);
-	return 0;
+    free(uidBlock);
+    return 0;
 }
 
 /* Function is equivalent of lf read + data samples + em410xread
@@ -577,120 +577,120 @@ int CmdEM410xBrute(const char *Cmd) {
  *  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
+ *  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) {
-	do {
-		if (ukbhit()) {
-			int gc = getchar(); (void)gc;
-			PrintAndLogEx(WARNING, "\naborted via keyboard!\n");
-			break;
-		}
-		lf_read(true, 8201);
+    do {
+        if (ukbhit()) {
+            int gc = getchar(); (void)gc;
+            PrintAndLogEx(WARNING, "\naborted via keyboard!\n");
+            break;
+        }
+        lf_read(true, 8201);
 
-	} while (!CmdEM410xRead(""));
-	return 0;
+    } while (!CmdEM410xRead(""));
+    return 0;
 }
 
 //currently only supports manchester modulations
 int CmdEM410xWatchnSpoof(const char *Cmd) {
 
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if (cmdp == 'h') return usage_lf_em410x_ws();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (cmdp == 'h') return usage_lf_em410x_ws();
 
-	// loops if the captured ID was in XL-format.
-	CmdEM410xWatch(Cmd);
-	PrintAndLogEx(SUCCESS, "# Replaying captured ID: %010" PRIx64 , g_em410xid);
-	CmdLFaskSim("");
-	return 0;
+    // loops if the captured ID was in XL-format.
+    CmdEM410xWatch(Cmd);
+    PrintAndLogEx(SUCCESS, "# Replaying captured ID: %010" PRIx64 , g_em410xid);
+    CmdLFaskSim("");
+    return 0;
 }
 
 int CmdEM410xWrite(const char *Cmd) {
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if (cmdp == 0x00 || cmdp == 'h') return usage_lf_em410x_write();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (cmdp == 0x00 || cmdp == 'h') return usage_lf_em410x_write();
 
-	uint64_t id = 0xFFFFFFFFFFFFFFFF; // invalid id value
-	int card = 0xFF; // invalid card value
-	uint32_t clock = 0; // invalid clock value
+    uint64_t id = 0xFFFFFFFFFFFFFFFF; // invalid id value
+    int card = 0xFF; // invalid card value
+    uint32_t clock = 0; // invalid clock value
 
-	sscanf(Cmd, "%" SCNx64 " %d %d", &id, &card, &clock);
+    sscanf(Cmd, "%" SCNx64 " %d %d", &id, &card, &clock);
 
-	// Check ID
-	if (id == 0xFFFFFFFFFFFFFFFF) {
-		PrintAndLogEx(WARNING, "Error! ID is required.\n");
-		return 0;
-	}
-	if (id >= 0x10000000000) {
-		PrintAndLogEx(WARNING, "Error! Given EM410x ID is longer than 40 bits.\n");
-		return 0;
-	}
+    // Check ID
+    if (id == 0xFFFFFFFFFFFFFFFF) {
+        PrintAndLogEx(WARNING, "Error! ID is required.\n");
+        return 0;
+    }
+    if (id >= 0x10000000000) {
+        PrintAndLogEx(WARNING, "Error! Given EM410x ID is longer than 40 bits.\n");
+        return 0;
+    }
 
-	// Check Card
-	if (card == 0xFF) {
-		PrintAndLogEx(WARNING, "Error! Card type required.\n");
-		return 0;
-	}
-	if (card < 0) {
-		PrintAndLogEx(WARNING, "Error! Bad card type selected.\n");
-		return 0;
-	}
+    // Check Card
+    if (card == 0xFF) {
+        PrintAndLogEx(WARNING, "Error! Card type required.\n");
+        return 0;
+    }
+    if (card < 0) {
+        PrintAndLogEx(WARNING, "Error! Bad card type selected.\n");
+        return 0;
+    }
 
-	// Check Clock
-	if (clock == 0)
-		clock = 64;
+    // Check Clock
+    if (clock == 0)
+        clock = 64;
 
-	// Allowed clock rates: 16, 32, 40 and 64
-	if ((clock != 16) && (clock != 32) && (clock != 64) && (clock != 40)) {
-		PrintAndLogEx(WARNING, "Error! Clock rate %d not valid. Supported clock rates are 16, 32, 40 and 64.\n", clock);
-		return 0;
-	}
+    // Allowed clock rates: 16, 32, 40 and 64
+    if ((clock != 16) && (clock != 32) && (clock != 64) && (clock != 40)) {
+        PrintAndLogEx(WARNING, "Error! Clock rate %d not valid. Supported clock rates are 16, 32, 40 and 64.\n", clock);
+        return 0;
+    }
 
-	if (card == 1) {
-		PrintAndLogEx(SUCCESS, "Writing %s tag with UID 0x%010" PRIx64 " (clock rate: %d)", "T55x7", id, clock);
-		// NOTE: We really should pass the clock in as a separate argument, but to
-		//   provide for backwards-compatibility for older firmware, and to avoid
-		//   having to add another argument to CMD_EM410X_WRITE_TAG, we just store
-		//   the clock rate in bits 8-15 of the card value
-		card = (card & 0xFF) | ((clock << 8) & 0xFF00);
-	}	else if (card == 0) {
-		PrintAndLogEx(SUCCESS, "Writing %s tag with UID 0x%010" PRIx64, "T5555", id, clock);
-		card = (card & 0xFF) | ((clock << 8) & 0xFF00);
-	} else {
-		PrintAndLogEx(FAILED, "Error! Bad card type selected.\n");
-		return 0;
-	}
+    if (card == 1) {
+        PrintAndLogEx(SUCCESS, "Writing %s tag with UID 0x%010" PRIx64 " (clock rate: %d)", "T55x7", id, clock);
+        // NOTE: We really should pass the clock in as a separate argument, but to
+        //   provide for backwards-compatibility for older firmware, and to avoid
+        //   having to add another argument to CMD_EM410X_WRITE_TAG, we just store
+        //   the clock rate in bits 8-15 of the card value
+        card = (card & 0xFF) | ((clock << 8) & 0xFF00);
+    } else if (card == 0) {
+        PrintAndLogEx(SUCCESS, "Writing %s tag with UID 0x%010" PRIx64, "T5555", id, clock);
+        card = (card & 0xFF) | ((clock << 8) & 0xFF00);
+    } else {
+        PrintAndLogEx(FAILED, "Error! Bad card type selected.\n");
+        return 0;
+    }
 
-	UsbCommand c = {CMD_EM410X_WRITE_TAG, {card, (uint32_t)(id >> 32), (uint32_t)id}};
-	SendCommand(&c);
-	return 0;
+    UsbCommand c = {CMD_EM410X_WRITE_TAG, {card, (uint32_t)(id >> 32), (uint32_t)id}};
+    SendCommand(&c);
+    return 0;
 }
 
 //**************** Start of EM4x50 Code ************************
 bool EM_EndParityTest(uint8_t *bs, size_t size, uint8_t rows, uint8_t cols, uint8_t pType) {
-	if (rows * cols > size) return false;
-	uint8_t colP = 0;
-	//assume last col is a parity and do not test
-	for (uint8_t colNum = 0; colNum < cols-1; colNum++) {
-		for (uint8_t rowNum = 0; rowNum < rows; rowNum++) {
-			colP ^= bs[(rowNum * cols) + colNum];
-		}
-		if (colP != pType) return false;
-	}
-	return true;
+    if (rows * cols > size) return false;
+    uint8_t colP = 0;
+    //assume last col is a parity and do not test
+    for (uint8_t colNum = 0; colNum < cols-1; colNum++) {
+        for (uint8_t rowNum = 0; rowNum < rows; rowNum++) {
+            colP ^= bs[(rowNum * cols) + colNum];
+        }
+        if (colP != pType) return false;
+    }
+    return true;
 }
 
 bool EM_ByteParityTest(uint8_t *bs, size_t size, uint8_t rows, uint8_t cols, uint8_t pType) {
-	if (rows * cols > size) return false;
-	
-	uint8_t rowP = 0;
-	//assume last row is a parity row and do not test
-	for (uint8_t rowNum = 0; rowNum < rows-1; rowNum++) {
-		for (uint8_t colNum = 0; colNum < cols; colNum++) {
-			rowP ^= bs[(rowNum * cols) + colNum];
-		}
-		if (rowP != pType) return false;
-	}
-	return true;
+    if (rows * cols > size) return false;
+
+    uint8_t rowP = 0;
+    //assume last row is a parity row and do not test
+    for (uint8_t rowNum = 0; rowNum < rows-1; rowNum++) {
+        for (uint8_t colNum = 0; colNum < cols; colNum++) {
+            rowP ^= bs[(rowNum * cols) + colNum];
+        }
+        if (rowP != pType) return false;
+    }
+    return true;
 }
 
 // EM word parity test.
@@ -705,61 +705,61 @@ bool EM_ByteParityTest(uint8_t *bs, size_t size, uint8_t rows, uint8_t cols, uin
 
 bool EMwordparitytest(uint8_t *bits){
 
-	// last row/col parity must be 0
-	if (bits[44] != 0 ) return false;
+    // last row/col parity must be 0
+    if (bits[44] != 0 ) return false;
 
-	// col parity check
-	uint8_t c1 = bytebits_to_byte(bits, 8) ^ bytebits_to_byte(bits+9, 8) ^ bytebits_to_byte(bits+18, 8) ^ bytebits_to_byte(bits+27, 8);
-	uint8_t c2 = bytebits_to_byte(bits+36, 8);
-	if ( c1 != c2 ) return false;
+    // col parity check
+    uint8_t c1 = bytebits_to_byte(bits, 8) ^ bytebits_to_byte(bits+9, 8) ^ bytebits_to_byte(bits+18, 8) ^ bytebits_to_byte(bits+27, 8);
+    uint8_t c2 = bytebits_to_byte(bits+36, 8);
+    if ( c1 != c2 ) return false;
 
-	// row parity check
-	uint8_t rowP = 0;
-	for ( uint8_t i = 0; i < 36; ++i ) {
+    // row parity check
+    uint8_t rowP = 0;
+    for ( uint8_t i = 0; i < 36; ++i ) {
 
-		rowP ^= bits[i];
-		if ( i>0 && (i % 9) == 0) {
+        rowP ^= bits[i];
+        if ( i>0 && (i % 9) == 0) {
 
-			if ( rowP != EVEN )
-				return false;
+            if ( rowP != EVEN )
+                return false;
 
-			rowP = 0;
-		}
-	}
-	// all checks ok.
-	return true;
+            rowP = 0;
+        }
+    }
+    // all checks ok.
+    return true;
 }
 
 //////////////// 4050 / 4450 commands
 
 uint32_t OutputEM4x50_Block(uint8_t *BitStream, size_t size, bool verbose, bool pTest) {
-	if (size<45) return 0;
+    if (size<45) return 0;
 
-	uint32_t code = bytebits_to_byte(BitStream,8);
-	code = code<<8 | bytebits_to_byte(BitStream+9,8);
-	code = code<<8 | bytebits_to_byte(BitStream+18,8);
-	code = code<<8 | bytebits_to_byte(BitStream+27,8);
+    uint32_t code = bytebits_to_byte(BitStream,8);
+    code = code<<8 | bytebits_to_byte(BitStream+9,8);
+    code = code<<8 | bytebits_to_byte(BitStream+18,8);
+    code = code<<8 | bytebits_to_byte(BitStream+27,8);
 
-	if (verbose || g_debugMode){
-		for (uint8_t i = 0; i<5; i++){
-			if (i == 4) PrintAndLogEx(NORMAL, ""); //parity byte spacer
-			PrintAndLogEx(NORMAL, "%d%d%d%d%d%d%d%d %d -> 0x%02x",
-			    BitStream[i*9],
-			    BitStream[i*9+1],
-			    BitStream[i*9+2],
-			    BitStream[i*9+3],
-			    BitStream[i*9+4],
-			    BitStream[i*9+5],
-			    BitStream[i*9+6],
-			    BitStream[i*9+7],
-			    BitStream[i*9+8],
-			    bytebits_to_byte(BitStream+i*9,8)
-			);
-		}
-		
-		PrintAndLogEx(SUCCESS, "Parity checks | %s", (pTest)? _GREEN_(Passed) : _RED_(Failed));
-	}
-	return code;
+    if (verbose || g_debugMode){
+        for (uint8_t i = 0; i<5; i++){
+            if (i == 4) PrintAndLogEx(NORMAL, ""); //parity byte spacer
+            PrintAndLogEx(NORMAL, "%d%d%d%d%d%d%d%d %d -> 0x%02x",
+                BitStream[i*9],
+                BitStream[i*9+1],
+                BitStream[i*9+2],
+                BitStream[i*9+3],
+                BitStream[i*9+4],
+                BitStream[i*9+5],
+                BitStream[i*9+6],
+                BitStream[i*9+7],
+                BitStream[i*9+8],
+                bytebits_to_byte(BitStream+i*9,8)
+            );
+        }
+
+        PrintAndLogEx(SUCCESS, "Parity checks | %s", (pTest)? _GREEN_(Passed) : _RED_(Failed));
+    }
+    return code;
 }
 
 /* Read the transmitted data of an EM4x50 tag from the graphbuffer
@@ -783,597 +783,597 @@ uint32_t OutputEM4x50_Block(uint8_t *BitStream, size_t size, bool verbose, bool
  */
  //completed by Marshmellow
 int EM4x50Read(const char *Cmd, bool verbose) {
-	uint8_t fndClk[] = {8,16,32,40,50,64,128};
-	int clk = 0, invert = 0, tol = 0, phaseoff;
-	int i = 0, j = 0, startblock, skip, block, start, end, low = 0, high = 0, minClk = 255;
-	uint32_t Code[6];
-	char tmp[6];
-	char tmp2[20];
-	bool complete = false;
+    uint8_t fndClk[] = {8,16,32,40,50,64,128};
+    int clk = 0, invert = 0, tol = 0, phaseoff;
+    int i = 0, j = 0, startblock, skip, block, start, end, low = 0, high = 0, minClk = 255;
+    uint32_t Code[6];
+    char tmp[6];
+    char tmp2[20];
+    bool complete = false;
 
-	int tmpbuff[MAX_GRAPH_TRACE_LEN / 64];
-	memset(tmpbuff, 0, sizeof(tmpbuff) );
+    int tmpbuff[MAX_GRAPH_TRACE_LEN / 64];
+    memset(tmpbuff, 0, sizeof(tmpbuff) );
 
-	// get user entry if any
-	sscanf(Cmd, "%i %i", &clk, &invert);
+    // get user entry if any
+    sscanf(Cmd, "%i %i", &clk, &invert);
 
-	uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
-	size_t size = getFromGraphBuf(bits);
-	computeSignalProperties(bits, size);
+    uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
+    size_t size = getFromGraphBuf(bits);
+    computeSignalProperties(bits, size);
 
-	signal_t *sp = getSignalProperties();
-	high = sp->high;
-	low = sp->low;
+    signal_t *sp = getSignalProperties();
+    high = sp->high;
+    low = sp->low;
 
-	// get to first full low to prime loop and skip incomplete first pulse
-	while ((bits[i] < high) && (i < size))
-		++i;
-	while ((bits[i] > low) && (i < size))
-		++i;
-	skip = i;
+    // get to first full low to prime loop and skip incomplete first pulse
+    while ((bits[i] < high) && (i < size))
+        ++i;
+    while ((bits[i] > low) && (i < size))
+        ++i;
+    skip = i;
 
-	// populate tmpbuff buffer with pulse lengths
-	while (i < size) {
-		// measure from low to low
-		while ((bits[i] > low) && (i < size))
-			++i;
-		start= i;
-		while ((bits[i] < high) && (i < size))
-			++i;
-		while ((bits[i] > low) && (i < size))
-			++i;
-		if (j >= (MAX_GRAPH_TRACE_LEN/64)) {
-			break;
-		}
-		tmpbuff[j++] = i - start;
-		if (i-start < minClk && i < size) {
-			minClk = i - start;
-		}
-	}
-	// set clock
-	if (!clk) {
-		for (uint8_t clkCnt = 0; clkCnt < 7; clkCnt++) {
-			tol = fndClk[clkCnt] / 8;
-			if (minClk >= fndClk[clkCnt] - tol && minClk <= fndClk[clkCnt] + 1) {
-				clk = fndClk[clkCnt];
-				break;
-			}
-		}
-		if (!clk) {
-			if (verbose || g_debugMode) PrintAndLogEx(WARNING, "Error: EM4x50 - didn't find a clock");
-			return 0;
-		}
-	} else tol = clk / 8;
+    // populate tmpbuff buffer with pulse lengths
+    while (i < size) {
+        // measure from low to low
+        while ((bits[i] > low) && (i < size))
+            ++i;
+        start= i;
+        while ((bits[i] < high) && (i < size))
+            ++i;
+        while ((bits[i] > low) && (i < size))
+            ++i;
+        if (j >= (MAX_GRAPH_TRACE_LEN/64)) {
+            break;
+        }
+        tmpbuff[j++] = i - start;
+        if (i-start < minClk && i < size) {
+            minClk = i - start;
+        }
+    }
+    // set clock
+    if (!clk) {
+        for (uint8_t clkCnt = 0; clkCnt < 7; clkCnt++) {
+            tol = fndClk[clkCnt] / 8;
+            if (minClk >= fndClk[clkCnt] - tol && minClk <= fndClk[clkCnt] + 1) {
+                clk = fndClk[clkCnt];
+                break;
+            }
+        }
+        if (!clk) {
+            if (verbose || g_debugMode) PrintAndLogEx(WARNING, "Error: EM4x50 - didn't find a clock");
+            return 0;
+        }
+    } else tol = clk / 8;
 
-	// look for data start - should be 2 pairs of LW (pulses of clk*3,clk*2)
-	start = -1;
-	for (i= 0; i < j - 4 ; ++i) {
-		skip += tmpbuff[i];
-		if (tmpbuff[i] >= clk * 3 - tol && tmpbuff[i] <= clk * 3 + tol)  //3 clocks
-			if (tmpbuff[i+1] >= clk * 2 - tol && tmpbuff[i+1] <= clk * 2 + tol)  //2 clocks
-				if (tmpbuff[i+2] >= clk * 3 - tol && tmpbuff[i+2] <= clk * 3 + tol) //3 clocks
-					if (tmpbuff[i+3] >= clk-tol)  //1.5 to 2 clocks - depends on bit following
-					{
-						start= i + 4;
-						break;
-					}
-	}
-	startblock = i + 4;
+    // look for data start - should be 2 pairs of LW (pulses of clk*3,clk*2)
+    start = -1;
+    for (i= 0; i < j - 4 ; ++i) {
+        skip += tmpbuff[i];
+        if (tmpbuff[i] >= clk * 3 - tol && tmpbuff[i] <= clk * 3 + tol)  //3 clocks
+            if (tmpbuff[i+1] >= clk * 2 - tol && tmpbuff[i+1] <= clk * 2 + tol)  //2 clocks
+                if (tmpbuff[i+2] >= clk * 3 - tol && tmpbuff[i+2] <= clk * 3 + tol) //3 clocks
+                    if (tmpbuff[i+3] >= clk-tol)  //1.5 to 2 clocks - depends on bit following
+                    {
+                        start= i + 4;
+                        break;
+                    }
+    }
+    startblock = i + 4;
 
-	// skip over the remainder of LW
-	skip += (tmpbuff[i+1] + tmpbuff[i+2] + clk);
+    // skip over the remainder of LW
+    skip += (tmpbuff[i+1] + tmpbuff[i+2] + clk);
 
-	if (tmpbuff[i+3] > clk)
-		phaseoff = tmpbuff[i+3] - clk;
-	else
-		phaseoff = 0;
+    if (tmpbuff[i+3] > clk)
+        phaseoff = tmpbuff[i+3] - clk;
+    else
+        phaseoff = 0;
 
-	// now do it again to find the end
-	end = skip;
-	for (i += 3; i < j - 4 ; ++i) {
-		end += tmpbuff[i];
-		if (tmpbuff[i] >= clk * 3 - tol && tmpbuff[i] <= clk * 3 + tol)  //3 clocks
-			if (tmpbuff[i+1] >= clk * 2 - tol && tmpbuff[i+1] <= clk * 2 + tol)  //2 clocks
-				if (tmpbuff[i+2] >= clk * 3 - tol && tmpbuff[i+2] <= clk * 3 + tol) //3 clocks
-					if (tmpbuff[i+3] >= clk-tol)  //1.5 to 2 clocks - depends on bit following
-					{
-						complete= true;
-						break;
-					}
-	}
-	end = i;
-	// report back
-	if (verbose || g_debugMode) {
-		if (start >= 0) {
-			PrintAndLogEx(NORMAL, "\nNote: one block = 50 bits (32 data, 12 parity, 6 marker)");
-		}	else {
-			PrintAndLogEx(NORMAL, "No data found!, clock tried:%d",clk);
-			PrintAndLogEx(NORMAL, "Try again with more samples.");
-			PrintAndLogEx(NORMAL, "  or after a 'data askedge' command to clean up the read");
-			return 0;
-		}
-	} else if (start < 0) return 0;
+    // now do it again to find the end
+    end = skip;
+    for (i += 3; i < j - 4 ; ++i) {
+        end += tmpbuff[i];
+        if (tmpbuff[i] >= clk * 3 - tol && tmpbuff[i] <= clk * 3 + tol)  //3 clocks
+            if (tmpbuff[i+1] >= clk * 2 - tol && tmpbuff[i+1] <= clk * 2 + tol)  //2 clocks
+                if (tmpbuff[i+2] >= clk * 3 - tol && tmpbuff[i+2] <= clk * 3 + tol) //3 clocks
+                    if (tmpbuff[i+3] >= clk-tol)  //1.5 to 2 clocks - depends on bit following
+                    {
+                        complete= true;
+                        break;
+                    }
+    }
+    end = i;
+    // report back
+    if (verbose || g_debugMode) {
+        if (start >= 0) {
+            PrintAndLogEx(NORMAL, "\nNote: one block = 50 bits (32 data, 12 parity, 6 marker)");
+        } else {
+            PrintAndLogEx(NORMAL, "No data found!, clock tried:%d",clk);
+            PrintAndLogEx(NORMAL, "Try again with more samples.");
+            PrintAndLogEx(NORMAL, "  or after a 'data askedge' command to clean up the read");
+            return 0;
+        }
+    } else if (start < 0) return 0;
 
-	start = skip;
-	snprintf(tmp2, sizeof(tmp2),"%d %d 1000 %d", clk, invert, clk * 47);
-	// save GraphBuffer - to restore it later
-	save_restoreGB(GRAPH_SAVE);
-	// get rid of leading crap
-	snprintf(tmp, sizeof(tmp), "%i", skip);
-	CmdLtrim(tmp);
-	bool pTest;
-	bool AllPTest = true;
-	// now work through remaining buffer printing out data blocks
-	block = 0;
-	i = startblock;
-	while (block < 6) {
-		if (verbose || g_debugMode) PrintAndLogEx(NORMAL, "\nBlock %i:", block);
-		skip = phaseoff;
+    start = skip;
+    snprintf(tmp2, sizeof(tmp2),"%d %d 1000 %d", clk, invert, clk * 47);
+    // 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;
+    bool AllPTest = true;
+    // now work through remaining buffer printing out data blocks
+    block = 0;
+    i = startblock;
+    while (block < 6) {
+        if (verbose || g_debugMode) PrintAndLogEx(NORMAL, "\nBlock %i:", block);
+        skip = phaseoff;
 
-		// look for LW before start of next block
-		for ( ; i < j - 4 ; ++i) {
-			skip += tmpbuff[i];
-			if (tmpbuff[i] >= clk * 3 - tol && tmpbuff[i] <= clk * 3 + tol)
-				if (tmpbuff[i+1] >= clk-tol)
-					break;
-		}
-		if (i >= j-4) break; //next LW not found
-		skip += clk;
-		if (tmpbuff[i+1] > clk)
-			phaseoff = tmpbuff[i+1] - clk;
-		else
-			phaseoff = 0;
+        // look for LW before start of next block
+        for ( ; i < j - 4 ; ++i) {
+            skip += tmpbuff[i];
+            if (tmpbuff[i] >= clk * 3 - tol && tmpbuff[i] <= clk * 3 + tol)
+                if (tmpbuff[i+1] >= clk-tol)
+                    break;
+        }
+        if (i >= j-4) break; //next LW not found
+        skip += clk;
+        if (tmpbuff[i+1] > clk)
+            phaseoff = tmpbuff[i+1] - clk;
+        else
+            phaseoff = 0;
 
-		i += 2;
+        i += 2;
 
-		if (ASKDemod(tmp2, false, false, 1) < 1) {
-			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_EndParityTest(DemodBuffer,DemodBufferLen, 5, 9, 0);
-		AllPTest &= pTest;
-		//get output
-		Code[block] = OutputEM4x50_Block(DemodBuffer, DemodBufferLen, verbose, pTest);
-		PrintAndLogEx(DEBUG, "\nskipping %d samples, bits:%d", skip, skip/clk);
-		//skip to start of next block
-		snprintf(tmp, sizeof(tmp), "%i", skip);
-		CmdLtrim(tmp);
-		block++;
-		if (i >= end) break; //in case chip doesn't output 6 blocks
-	}
-	//print full code:
-	if (verbose || g_debugMode || AllPTest){
-		if (!complete) {
-			PrintAndLogEx(NORMAL, _RED_(*** Warning!) );
-			PrintAndLogEx(NORMAL, "Partial data - no end found!");
-			PrintAndLogEx(NORMAL, "Try again with more samples.");
-		}
-		PrintAndLogEx(NORMAL, "Found data at sample: %i - using clock: %i", start, clk);
-		end = block;
-		for (block=0; block < end; block++){
-			PrintAndLogEx(NORMAL, "Block %d: %08x", block, Code[block]);
-		}
-		
-		PrintAndLogEx(NORMAL, "Parities checks | %s", (AllPTest) ? _GREEN_(Passed) : _RED_(Failed) );
-		
-		if (AllPTest == 0) {
-			PrintAndLogEx(NORMAL, "Try cleaning the read samples with " _YELLOW_('data askedge') );
-		}
-	}
+        if (ASKDemod(tmp2, false, false, 1) < 1) {
+            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_EndParityTest(DemodBuffer,DemodBufferLen, 5, 9, 0);
+        AllPTest &= pTest;
+        //get output
+        Code[block] = OutputEM4x50_Block(DemodBuffer, DemodBufferLen, verbose, pTest);
+        PrintAndLogEx(DEBUG, "\nskipping %d samples, bits:%d", skip, skip/clk);
+        //skip to start of next block
+        snprintf(tmp, sizeof(tmp), "%i", skip);
+        CmdLtrim(tmp);
+        block++;
+        if (i >= end) break; //in case chip doesn't output 6 blocks
+    }
+    //print full code:
+    if (verbose || g_debugMode || AllPTest){
+        if (!complete) {
+            PrintAndLogEx(NORMAL, _RED_(*** Warning!) );
+            PrintAndLogEx(NORMAL, "Partial data - no end found!");
+            PrintAndLogEx(NORMAL, "Try again with more samples.");
+        }
+        PrintAndLogEx(NORMAL, "Found data at sample: %i - using clock: %i", start, clk);
+        end = block;
+        for (block=0; block < end; block++){
+            PrintAndLogEx(NORMAL, "Block %d: %08x", block, Code[block]);
+        }
 
-	//restore GraphBuffer
-	save_restoreGB(GRAPH_RESTORE);
-	return (int)AllPTest;
+        PrintAndLogEx(NORMAL, "Parities checks | %s", (AllPTest) ? _GREEN_(Passed) : _RED_(Failed) );
+
+        if (AllPTest == 0) {
+            PrintAndLogEx(NORMAL, "Try cleaning the read samples with " _YELLOW_('data askedge') );
+        }
+    }
+
+    //restore GraphBuffer
+    save_restoreGB(GRAPH_RESTORE);
+    return (int)AllPTest;
 }
 
 int CmdEM4x50Read(const char *Cmd) {
-	uint8_t ctmp = tolower(param_getchar(Cmd, 0));
-	if ( ctmp == 'h' ) return usage_lf_em4x50_read();
-	return EM4x50Read(Cmd, true);
+    uint8_t ctmp = tolower(param_getchar(Cmd, 0));
+    if ( ctmp == 'h' ) return usage_lf_em4x50_read();
+    return EM4x50Read(Cmd, true);
 }
 int CmdEM4x50Write(const char *Cmd){
-	uint8_t ctmp = tolower(param_getchar(Cmd, 0));
-	if ( ctmp == 'h' ) return usage_lf_em4x50_write();
-	PrintAndLogEx(NORMAL, "no implemented yet");
-	return 0;
+    uint8_t ctmp = tolower(param_getchar(Cmd, 0));
+    if ( ctmp == 'h' ) return usage_lf_em4x50_write();
+    PrintAndLogEx(NORMAL, "no implemented yet");
+    return 0;
 }
 int CmdEM4x50Dump(const char *Cmd){
-	uint8_t ctmp = tolower(param_getchar(Cmd, 0));
-	if ( ctmp == 'h' ) return usage_lf_em4x50_dump();
-	PrintAndLogEx(NORMAL, "no implemented yet");
-	return 0;
+    uint8_t ctmp = tolower(param_getchar(Cmd, 0));
+    if ( ctmp == 'h' ) return usage_lf_em4x50_dump();
+    PrintAndLogEx(NORMAL, "no implemented yet");
+    return 0;
 }
 
 #define EM_PREAMBLE_LEN 6
 // download samples from device and copy to Graphbuffer
 bool downloadSamplesEM(){
 
-	// 8 bit preamble + 32 bit word response (max clock (128) * 40bits = 5120 samples)
-	uint8_t got[6000];
-	if ( !GetFromDevice(BIG_BUF, got, sizeof(got), 0, NULL, 2500, false)) {
-		PrintAndLogEx(WARNING, "command execution time out");
-		return false;
-	}
+    // 8 bit preamble + 32 bit word response (max clock (128) * 40bits = 5120 samples)
+    uint8_t got[6000];
+    if ( !GetFromDevice(BIG_BUF, got, sizeof(got), 0, NULL, 2500, false)) {
+        PrintAndLogEx(WARNING, "command execution time out");
+        return false;
+    }
 
-	setGraphBuf(got, sizeof(got));
-	// set signal properties low/high/mean/amplitude and is_noise detection
-	computeSignalProperties(got, sizeof(got));
-	RepaintGraphWindow();
-	if (getSignalProperties()->isnoise) {
-		PrintAndLogEx(DEBUG, "No tag found - signal looks like noise");
-		return false;
-	}
-	return true;
+    setGraphBuf(got, sizeof(got));
+    // set signal properties low/high/mean/amplitude and is_noise detection
+    computeSignalProperties(got, sizeof(got));
+    RepaintGraphWindow();
+    if (getSignalProperties()->isnoise) {
+        PrintAndLogEx(DEBUG, "No tag found - signal looks like noise");
+        return false;
+    }
+    return true;
 }
 
 // em_demod
 bool doPreambleSearch(size_t *startIdx){
 
-	// sanity check
-	if ( DemodBufferLen < EM_PREAMBLE_LEN) {
-		PrintAndLogEx(DEBUG, "DEBUG: Error - EM4305 demodbuffer too small");
-		return false;
-	}
+    // sanity check
+    if ( DemodBufferLen < EM_PREAMBLE_LEN) {
+        PrintAndLogEx(DEBUG, "DEBUG: Error - EM4305 demodbuffer too small");
+        return false;
+    }
 
-	// set size to 20 to only test first 14 positions for the preamble
-	size_t size = (20 > DemodBufferLen) ? DemodBufferLen : 20;
-	*startIdx = 0;
-	// skip first two 0 bits as they might have been missed in the demod
-	uint8_t preamble[EM_PREAMBLE_LEN] = {0,0,1,0,1,0};
+    // set size to 20 to only test first 14 positions for the preamble
+    size_t size = (20 > DemodBufferLen) ? DemodBufferLen : 20;
+    *startIdx = 0;
+    // skip first two 0 bits as they might have been missed in the demod
+    uint8_t preamble[EM_PREAMBLE_LEN] = {0,0,1,0,1,0};
 
-	if ( !preambleSearchEx(DemodBuffer, preamble, EM_PREAMBLE_LEN, &size, startIdx, true)) {
-		PrintAndLogEx(DEBUG, "DEBUG: Error - EM4305 preamble not found :: %d", *startIdx);
-		return false;
-	}
-	return true;
+    if ( !preambleSearchEx(DemodBuffer, preamble, EM_PREAMBLE_LEN, &size, startIdx, true)) {
+        PrintAndLogEx(DEBUG, "DEBUG: Error - EM4305 preamble not found :: %d", *startIdx);
+        return false;
+    }
+    return true;
 }
 
 bool detectFSK(){
-	// detect fsk clock
-	if (!GetFskClock("", false)) {
-		PrintAndLogEx(DEBUG, "DEBUG: Error - EM: FSK clock failed");
-		return false;
-	}
-	// demod
-	int ans = FSKrawDemod("0 0", false);
-	if (!ans) {
-		PrintAndLogEx(DEBUG, "DEBUG: Error - EM: FSK Demod failed");
-		return false;
-	}
-	return true;
+    // detect fsk clock
+    if (!GetFskClock("", false)) {
+        PrintAndLogEx(DEBUG, "DEBUG: Error - EM: FSK clock failed");
+        return false;
+    }
+    // demod
+    int ans = FSKrawDemod("0 0", false);
+    if (!ans) {
+        PrintAndLogEx(DEBUG, "DEBUG: Error - EM: FSK Demod failed");
+        return false;
+    }
+    return true;
 }
 // PSK clocks should be easy to detect ( but difficult to demod a non-repeating pattern... )
 bool detectPSK(){
-	int	ans = GetPskClock("", false);
-	if (ans <= 0) {
-		PrintAndLogEx(DEBUG, "DEBUG: Error - EM: PSK clock failed");
-		return false;
-	}
-	//demod
-	//try psk1 -- 0 0 6 (six errors?!?)
-	ans = PSKDemod("0 0 6", false);
-	if (!ans) {
-		PrintAndLogEx(DEBUG, "DEBUG: Error - EM: PSK1 Demod failed");
+    int ans = GetPskClock("", false);
+    if (ans <= 0) {
+        PrintAndLogEx(DEBUG, "DEBUG: Error - EM: PSK clock failed");
+        return false;
+    }
+    //demod
+    //try psk1 -- 0 0 6 (six errors?!?)
+    ans = PSKDemod("0 0 6", false);
+    if (!ans) {
+        PrintAndLogEx(DEBUG, "DEBUG: Error - EM: PSK1 Demod failed");
 
-		//try psk1 inverted
-		ans = PSKDemod("0 1 6", false);
-		if (!ans) {
-			PrintAndLogEx(DEBUG, "DEBUG: Error - EM: PSK1 inverted Demod failed");
-			return false;
-		}
-	}
-	// either PSK1 or PSK1 inverted is ok from here.
-	// lets check PSK2 later.
-	return true;
+        //try psk1 inverted
+        ans = PSKDemod("0 1 6", false);
+        if (!ans) {
+            PrintAndLogEx(DEBUG, "DEBUG: Error - EM: PSK1 inverted Demod failed");
+            return false;
+        }
+    }
+    // either PSK1 or PSK1 inverted is ok from here.
+    // lets check PSK2 later.
+    return true;
 }
 // try manchester - NOTE: ST only applies to T55x7 tags.
 bool detectASK_MAN(){
-	bool stcheck = false;
-	if ( !ASKDemod_ext("0 0 0", false, false, 1, &stcheck) ) {
-		PrintAndLogEx(DEBUG, "DEBUG: Error - EM: ASK/Manchester Demod failed");
-		return false;
-	}
-	return true;
+    bool stcheck = false;
+    if ( !ASKDemod_ext("0 0 0", false, false, 1, &stcheck) ) {
+        PrintAndLogEx(DEBUG, "DEBUG: Error - EM: ASK/Manchester Demod failed");
+        return false;
+    }
+    return true;
 }
 bool detectASK_BI(){
-	int ans = ASKbiphaseDemod("0 0 1", false);
-	if (!ans) {
-		PrintAndLogEx(DEBUG, "DEBUG: Error - EM: ASK/biphase normal demod failed");
+    int ans = ASKbiphaseDemod("0 0 1", false);
+    if (!ans) {
+        PrintAndLogEx(DEBUG, "DEBUG: Error - EM: ASK/biphase normal demod failed");
 
-		ans = ASKbiphaseDemod("0 1 1", false);
-		if (!ans) {
-			PrintAndLogEx(DEBUG, "DEBUG: Error - EM: ASK/biphase inverted demod failed");
-			return false;
-		}
-	}
-	return true;
+        ans = ASKbiphaseDemod("0 1 1", false);
+        if (!ans) {
+            PrintAndLogEx(DEBUG, "DEBUG: Error - EM: ASK/biphase inverted demod failed");
+            return false;
+        }
+    }
+    return true;
 }
 
 // param: idx - start index in demoded data.
 bool setDemodBufferEM(uint32_t *word, size_t idx){
 
-	//test for even parity bits.
-	uint8_t parity[45] = {0};
-	memcpy( parity, DemodBuffer, 45);
-	if (!EMwordparitytest(parity) ){
-		PrintAndLogEx(DEBUG, "DEBUG: Error - EM Parity tests failed");
-		return false;
-	}
+    //test for even parity bits.
+    uint8_t parity[45] = {0};
+    memcpy( parity, DemodBuffer, 45);
+    if (!EMwordparitytest(parity) ){
+        PrintAndLogEx(DEBUG, "DEBUG: Error - EM Parity tests failed");
+        return false;
+    }
 
     // test for even parity bits and remove them. (leave out the end row of parities so 36 bits)
-	if (!removeParity(DemodBuffer, idx + EM_PREAMBLE_LEN, 9, 0, 36)) {
-		PrintAndLogEx(DEBUG, "DEBUG: Error - EM, failed removing parity");
-		return false;
-	}
-	setDemodBuf(DemodBuffer, 32, 0);
-	*word = bytebits_to_byteLSBF(DemodBuffer, 32);
-	return true;
+    if (!removeParity(DemodBuffer, idx + EM_PREAMBLE_LEN, 9, 0, 36)) {
+        PrintAndLogEx(DEBUG, "DEBUG: Error - EM, failed removing parity");
+        return false;
+    }
+    setDemodBuf(DemodBuffer, 32, 0);
+    *word = bytebits_to_byteLSBF(DemodBuffer, 32);
+    return true;
 }
 
 // FSK, PSK, ASK/MANCHESTER, ASK/BIPHASE, ASK/DIPHASE
 // should cover 90% of known used configs
 // the rest will need to be manually demoded for now...
 bool demodEM4x05resp(uint32_t *word) {
-	size_t idx = 0;
-	*word = 0;
-	if (detectASK_MAN() && doPreambleSearch( &idx ))
-		return setDemodBufferEM(word, idx);
+    size_t idx = 0;
+    *word = 0;
+    if (detectASK_MAN() && doPreambleSearch( &idx ))
+        return setDemodBufferEM(word, idx);
 
-	if (detectASK_BI() && doPreambleSearch( &idx ))
-		return setDemodBufferEM(word, idx);
+    if (detectASK_BI() && doPreambleSearch( &idx ))
+        return setDemodBufferEM(word, idx);
 
-	if (detectFSK() && doPreambleSearch( &idx ))
-		return setDemodBufferEM(word, idx);
+    if (detectFSK() && doPreambleSearch( &idx ))
+        return setDemodBufferEM(word, idx);
 
-	if (detectPSK()) {
-		if (doPreambleSearch( &idx ))
-			return setDemodBufferEM(word, idx);
+    if (detectPSK()) {
+        if (doPreambleSearch( &idx ))
+            return setDemodBufferEM(word, idx);
 
-		psk1TOpsk2(DemodBuffer, DemodBufferLen);
-		if (doPreambleSearch( &idx ))
-			return setDemodBufferEM(word, idx);
-	}
-	return false;
+        psk1TOpsk2(DemodBuffer, DemodBufferLen);
+        if (doPreambleSearch( &idx ))
+            return setDemodBufferEM(word, idx);
+    }
+    return false;
 }
 
 //////////////// 4205 / 4305 commands
 int EM4x05ReadWord_ext(uint8_t addr, uint32_t pwd, bool usePwd, uint32_t *word) {
-	UsbCommand c = {CMD_EM4X_READ_WORD, {addr, pwd, usePwd}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	UsbCommand resp;
-	if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)){
-		PrintAndLogEx(DEBUG, "timeout while waiting for reply.");
-		return -1;
-	}
-	if ( !downloadSamplesEM() ) {
-		return -1;
-	}
+    UsbCommand c = {CMD_EM4X_READ_WORD, {addr, pwd, usePwd}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    UsbCommand resp;
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)){
+        PrintAndLogEx(DEBUG, "timeout while waiting for reply.");
+        return -1;
+    }
+    if ( !downloadSamplesEM() ) {
+        return -1;
+    }
 
-	return demodEM4x05resp(word);
+    return demodEM4x05resp(word);
 }
 
 int CmdEM4x05Dump(const char *Cmd) {
-	uint8_t addr = 0;
-	uint32_t pwd = 0;
-	bool usePwd = false;
-	uint8_t ctmp = tolower(param_getchar(Cmd, 0));
-	if ( ctmp == 'h' ) return usage_lf_em4x05_dump();
+    uint8_t addr = 0;
+    uint32_t pwd = 0;
+    bool usePwd = false;
+    uint8_t ctmp = tolower(param_getchar(Cmd, 0));
+    if ( ctmp == 'h' ) return usage_lf_em4x05_dump();
 
-	// for now use default input of 1 as invalid (unlikely 1 will be a valid password...)
-	pwd = param_get32ex(Cmd, 0, 1, 16);
+    // for now use default input of 1 as invalid (unlikely 1 will be a valid password...)
+    pwd = param_get32ex(Cmd, 0, 1, 16);
 
-	if ( pwd != 1 )
-		usePwd = true;
+    if ( pwd != 1 )
+        usePwd = true;
 
-	int success = 1;
-	uint32_t word = 0;
-	PrintAndLogEx(NORMAL, "Addr | data   | ascii");
-	PrintAndLogEx(NORMAL, "-----+--------+------");
-	for (; addr < 16; addr++) {
+    int success = 1;
+    uint32_t word = 0;
+    PrintAndLogEx(NORMAL, "Addr | data   | ascii");
+    PrintAndLogEx(NORMAL, "-----+--------+------");
+    for (; addr < 16; addr++) {
 
-		if (addr == 2) {
-			if (usePwd) {
-				PrintAndLogEx(NORMAL, " %02u | %08X", addr, pwd, word );
-			} else {
-				PrintAndLogEx(NORMAL, " 02 | " _RED_(cannot read) );
-			}
-		} else {
-			success &= EM4x05ReadWord_ext(addr, pwd, usePwd, &word);
-		}
-	}
+        if (addr == 2) {
+            if (usePwd) {
+                PrintAndLogEx(NORMAL, " %02u | %08X", addr, pwd, word );
+            } else {
+                PrintAndLogEx(NORMAL, " 02 | " _RED_(cannot read) );
+            }
+        } else {
+            success &= EM4x05ReadWord_ext(addr, pwd, usePwd, &word);
+        }
+    }
 
-	return success;
+    return success;
 }
 
 int CmdEM4x05Read(const char *Cmd) {
-	uint8_t addr;
-	uint32_t pwd;
-	bool usePwd = false;
-	uint8_t ctmp = tolower(param_getchar(Cmd, 0));
-	if ( strlen(Cmd) == 0 || ctmp == 'h' ) return usage_lf_em4x05_read();
+    uint8_t addr;
+    uint32_t pwd;
+    bool usePwd = false;
+    uint8_t ctmp = tolower(param_getchar(Cmd, 0));
+    if ( strlen(Cmd) == 0 || ctmp == 'h' ) return usage_lf_em4x05_read();
 
-	addr = param_get8ex(Cmd, 0, 50, 10);
-	pwd =  param_get32ex(Cmd, 1, 1, 16);
+    addr = param_get8ex(Cmd, 0, 50, 10);
+    pwd =  param_get32ex(Cmd, 1, 1, 16);
 
-	if (addr > 15) {
-		PrintAndLogEx(NORMAL, "Address must be between 0 and 15");
-		return 1;
-	}
-	if ( pwd == 1 ) {
-		PrintAndLogEx(NORMAL, "Reading address %02u", addr);
-	}	else {
-		usePwd = true;
-		PrintAndLogEx(NORMAL, "Reading address %02u | password %08X", addr, pwd);
-	}
+    if (addr > 15) {
+        PrintAndLogEx(NORMAL, "Address must be between 0 and 15");
+        return 1;
+    }
+    if ( pwd == 1 ) {
+        PrintAndLogEx(NORMAL, "Reading address %02u", addr);
+    } else {
+        usePwd = true;
+        PrintAndLogEx(NORMAL, "Reading address %02u | password %08X", addr, pwd);
+    }
 
-	uint32_t word = 0;
-	int isOk = EM4x05ReadWord_ext(addr, pwd, usePwd, &word);
-	if (isOk)
-		PrintAndLogEx(NORMAL, "Address %02d | %08X - %s", addr, word, (addr > 13) ? "Lock" : "");
-	else
-		PrintAndLogEx(NORMAL, "Read Address %02d | " _RED_(failed), addr);
-	return isOk;
+    uint32_t word = 0;
+    int isOk = EM4x05ReadWord_ext(addr, pwd, usePwd, &word);
+    if (isOk)
+        PrintAndLogEx(NORMAL, "Address %02d | %08X - %s", addr, word, (addr > 13) ? "Lock" : "");
+    else
+        PrintAndLogEx(NORMAL, "Read Address %02d | " _RED_(failed), addr);
+    return isOk;
 }
 
 int CmdEM4x05Write(const char *Cmd) {
-	uint8_t ctmp = tolower(param_getchar(Cmd, 0));
-	if ( strlen(Cmd) == 0 || ctmp == 'h' ) return usage_lf_em4x05_write();
+    uint8_t ctmp = tolower(param_getchar(Cmd, 0));
+    if ( strlen(Cmd) == 0 || ctmp == 'h' ) return usage_lf_em4x05_write();
 
-	bool usePwd = false;
-	uint8_t addr = 50; // default to invalid address
-	uint32_t data = 0; // default to blank data
-	uint32_t pwd = 1; // default to blank password
+    bool usePwd = false;
+    uint8_t addr = 50; // default to invalid address
+    uint32_t data = 0; // default to blank data
+    uint32_t pwd = 1; // default to blank password
 
-	addr = param_get8ex(Cmd, 0, 50, 10);
-	data = param_get32ex(Cmd, 1, 0, 16);
-	pwd =  param_get32ex(Cmd, 2, 1, 16);
+    addr = param_get8ex(Cmd, 0, 50, 10);
+    data = param_get32ex(Cmd, 1, 0, 16);
+    pwd =  param_get32ex(Cmd, 2, 1, 16);
 
-	if ( addr > 15 ) {
-		PrintAndLogEx(NORMAL, "Address must be between 0 and 15");
-		return 1;
-	}
-	if ( pwd == 1 )
-		PrintAndLogEx(NORMAL, "Writing address %d data %08X", addr, data);
-	else {
-		usePwd = true;
-		PrintAndLogEx(NORMAL, "Writing address %d data %08X using password %08X", addr, data, pwd);
-	}
+    if ( addr > 15 ) {
+        PrintAndLogEx(NORMAL, "Address must be between 0 and 15");
+        return 1;
+    }
+    if ( pwd == 1 )
+        PrintAndLogEx(NORMAL, "Writing address %d data %08X", addr, data);
+    else {
+        usePwd = true;
+        PrintAndLogEx(NORMAL, "Writing address %d data %08X using password %08X", addr, data, pwd);
+    }
 
-	uint16_t flag = (addr << 8 ) | usePwd;
+    uint16_t flag = (addr << 8 ) | usePwd;
 
-	UsbCommand c = {CMD_EM4X_WRITE_WORD, {flag, data, pwd}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	UsbCommand resp;
-	if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)){
-		PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
-		return -1;
-	}
+    UsbCommand c = {CMD_EM4X_WRITE_WORD, {flag, data, pwd}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    UsbCommand resp;
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)){
+        PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
+        return -1;
+    }
 
-	if (!downloadSamplesEM())
-		return -1;
+    if (!downloadSamplesEM())
+        return -1;
 
-	//need 0 bits demoded (after preamble) to verify write cmd
-	uint32_t dummy = 0;
-	int isOk = demodEM4x05resp(&dummy);
-	if (isOk)
-		PrintAndLogEx(NORMAL, "Write " _GREEN_(Verified) );
-	else
-		PrintAndLogEx(NORMAL, "Write could " _RED_(not) "be verified");
-	return isOk;
+    //need 0 bits demoded (after preamble) to verify write cmd
+    uint32_t dummy = 0;
+    int isOk = demodEM4x05resp(&dummy);
+    if (isOk)
+        PrintAndLogEx(NORMAL, "Write " _GREEN_(Verified) );
+    else
+        PrintAndLogEx(NORMAL, "Write could " _RED_(not) "be verified");
+    return isOk;
 }
 
 void printEM4x05config(uint32_t wordData) {
-	uint16_t datarate = (((wordData & 0x3F)+1)*2);
-	uint8_t encoder = ((wordData >> 6) & 0xF);
-	char enc[14];
-	memset(enc,0,sizeof(enc));
+    uint16_t datarate = (((wordData & 0x3F)+1)*2);
+    uint8_t encoder = ((wordData >> 6) & 0xF);
+    char enc[14];
+    memset(enc,0,sizeof(enc));
 
-	uint8_t PSKcf = (wordData >> 10) & 0x3;
-	char cf[10];
-	memset(cf,0,sizeof(cf));
-	uint8_t delay = (wordData >> 12) & 0x3;
-	char cdelay[33];
-	memset(cdelay,0,sizeof(cdelay));
-	uint8_t 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;
-		case 2: snprintf(enc,sizeof(enc),"Biphase"); break;
-		case 3: snprintf(enc,sizeof(enc),"Miller"); break;
-		case 4: snprintf(enc,sizeof(enc),"PSK1"); break;
-		case 5: snprintf(enc,sizeof(enc),"PSK2"); break;
-		case 6: snprintf(enc,sizeof(enc),"PSK3"); break;
-		case 7: snprintf(enc,sizeof(enc),"Unknown"); break;
-		case 8: snprintf(enc,sizeof(enc),"FSK1"); break;
-		case 9: snprintf(enc,sizeof(enc),"FSK2"); break;
-		default: snprintf(enc,sizeof(enc),"Unknown"); break;
-	}
+    uint8_t PSKcf = (wordData >> 10) & 0x3;
+    char cf[10];
+    memset(cf,0,sizeof(cf));
+    uint8_t delay = (wordData >> 12) & 0x3;
+    char cdelay[33];
+    memset(cdelay,0,sizeof(cdelay));
+    uint8_t 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;
+        case 2: snprintf(enc,sizeof(enc),"Biphase"); break;
+        case 3: snprintf(enc,sizeof(enc),"Miller"); break;
+        case 4: snprintf(enc,sizeof(enc),"PSK1"); break;
+        case 5: snprintf(enc,sizeof(enc),"PSK2"); break;
+        case 6: snprintf(enc,sizeof(enc),"PSK3"); break;
+        case 7: snprintf(enc,sizeof(enc),"Unknown"); break;
+        case 8: snprintf(enc,sizeof(enc),"FSK1"); break;
+        case 9: snprintf(enc,sizeof(enc),"FSK2"); break;
+        default: snprintf(enc,sizeof(enc),"Unknown"); break;
+    }
 
-	switch (PSKcf) {
-		case 0: snprintf(cf,sizeof(cf),"RF/2"); break;
-		case 1: snprintf(cf,sizeof(cf),"RF/8"); break;
-		case 2: snprintf(cf,sizeof(cf),"RF/4"); break;
-		case 3: snprintf(cf,sizeof(cf),"unknown"); break;
-	}
+    switch (PSKcf) {
+        case 0: snprintf(cf,sizeof(cf),"RF/2"); break;
+        case 1: snprintf(cf,sizeof(cf),"RF/8"); break;
+        case 2: snprintf(cf,sizeof(cf),"RF/4"); break;
+        case 3: snprintf(cf,sizeof(cf),"unknown"); break;
+    }
 
-	switch (delay) {
-		case 0: snprintf(cdelay, sizeof(cdelay),"no delay"); break;
-		case 1: snprintf(cdelay, sizeof(cdelay),"BP/8 or 1/8th bit period delay"); break;
-		case 2: snprintf(cdelay, sizeof(cdelay),"BP/4 or 1/4th bit period delay"); break;
-		case 3: snprintf(cdelay, sizeof(cdelay),"no delay"); break;
-	}
-	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;
-	PrintAndLogEx(NORMAL, "ConfigWord: %08X (Word 4)\n", wordData);
-	PrintAndLogEx(NORMAL, "Config Breakdown:");
-	PrintAndLogEx(NORMAL, " Data Rate:  %02u | RF/%u", wordData & 0x3F, datarate);
-	PrintAndLogEx(NORMAL, "   Encoder:   %u | %s", encoder, enc);
-	PrintAndLogEx(NORMAL, "    PSK CF:   %u | %s", PSKcf, cf);
-	PrintAndLogEx(NORMAL, "     Delay:   %u | %s", delay, cdelay);
-	PrintAndLogEx(NORMAL, " LastWordR:  %02u | Address of last word for default read - meaning %u blocks are output", LWR, numblks);
-	PrintAndLogEx(NORMAL, " ReadLogin:   %u | Read Login is %s", readLogin, readLogin ? "Required" : "Not Required");
-	PrintAndLogEx(NORMAL, "   ReadHKL:   %u | Read Housekeeping Words Login is %s", readHKL, readHKL ? "Required" : "Not Required");
-	PrintAndLogEx(NORMAL, "WriteLogin:   %u | Write Login is %s", writeLogin, writeLogin ? "Required" : "Not Required");
-	PrintAndLogEx(NORMAL, "  WriteHKL:   %u | Write Housekeeping Words Login is %s", writeHKL, writeHKL ? "Required" : "Not Required");
-	PrintAndLogEx(NORMAL, "    R.A.W.:   %u | Read After Write is %s", raw, raw ? "On" : "Off");
-	PrintAndLogEx(NORMAL, "   Disable:   %u | Disable Command is %s", disable, disable ? "Accepted" : "Not Accepted");
-	PrintAndLogEx(NORMAL, "    R.T.F.:   %u | Reader Talk First is %s", rtf, rtf ? "Enabled" : "Disabled");
-	PrintAndLogEx(NORMAL, "    Pigeon:   %u | Pigeon Mode is %s\n", pigeon, pigeon ? "Enabled" : "Disabled");
+    switch (delay) {
+        case 0: snprintf(cdelay, sizeof(cdelay),"no delay"); break;
+        case 1: snprintf(cdelay, sizeof(cdelay),"BP/8 or 1/8th bit period delay"); break;
+        case 2: snprintf(cdelay, sizeof(cdelay),"BP/4 or 1/4th bit period delay"); break;
+        case 3: snprintf(cdelay, sizeof(cdelay),"no delay"); break;
+    }
+    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;
+    PrintAndLogEx(NORMAL, "ConfigWord: %08X (Word 4)\n", wordData);
+    PrintAndLogEx(NORMAL, "Config Breakdown:");
+    PrintAndLogEx(NORMAL, " Data Rate:  %02u | RF/%u", wordData & 0x3F, datarate);
+    PrintAndLogEx(NORMAL, "   Encoder:   %u | %s", encoder, enc);
+    PrintAndLogEx(NORMAL, "    PSK CF:   %u | %s", PSKcf, cf);
+    PrintAndLogEx(NORMAL, "     Delay:   %u | %s", delay, cdelay);
+    PrintAndLogEx(NORMAL, " LastWordR:  %02u | Address of last word for default read - meaning %u blocks are output", LWR, numblks);
+    PrintAndLogEx(NORMAL, " ReadLogin:   %u | Read Login is %s", readLogin, readLogin ? "Required" : "Not Required");
+    PrintAndLogEx(NORMAL, "   ReadHKL:   %u | Read Housekeeping Words Login is %s", readHKL, readHKL ? "Required" : "Not Required");
+    PrintAndLogEx(NORMAL, "WriteLogin:   %u | Write Login is %s", writeLogin, writeLogin ? "Required" : "Not Required");
+    PrintAndLogEx(NORMAL, "  WriteHKL:   %u | Write Housekeeping Words Login is %s", writeHKL, writeHKL ? "Required" : "Not Required");
+    PrintAndLogEx(NORMAL, "    R.A.W.:   %u | Read After Write is %s", raw, raw ? "On" : "Off");
+    PrintAndLogEx(NORMAL, "   Disable:   %u | Disable Command is %s", disable, disable ? "Accepted" : "Not Accepted");
+    PrintAndLogEx(NORMAL, "    R.T.F.:   %u | Reader Talk First is %s", rtf, rtf ? "Enabled" : "Disabled");
+    PrintAndLogEx(NORMAL, "    Pigeon:   %u | Pigeon Mode is %s\n", pigeon, pigeon ? "Enabled" : "Disabled");
 }
 
 void printEM4x05info(uint32_t block0, uint32_t serial) {
 
-	uint8_t chipType = (block0 >> 1) & 0xF;
-	uint8_t cap = (block0 >> 5) & 3;
-	uint16_t custCode = (block0 >> 9) & 0x3FF;
+    uint8_t chipType = (block0 >> 1) & 0xF;
+    uint8_t cap = (block0 >> 5) & 3;
+    uint16_t custCode = (block0 >> 9) & 0x3FF;
 
-	switch (chipType) {
-		case 9:  PrintAndLogEx(NORMAL, "\n Chip Type:   %u | EM4305", chipType); break;
-		case 8:  PrintAndLogEx(NORMAL, "\n Chip Type:   %u | EM4205", chipType); break;
-		case 4:  PrintAndLogEx(NORMAL, " Chip Type:   %u | Unknown", chipType); break;
-		case 2:  PrintAndLogEx(NORMAL, " Chip Type:   %u | EM4469", chipType); break;
-		//add more here when known
-		default: PrintAndLogEx(NORMAL, " Chip Type:   %u Unknown", chipType); break;
-	}
+    switch (chipType) {
+        case 9:  PrintAndLogEx(NORMAL, "\n Chip Type:   %u | EM4305", chipType); break;
+        case 8:  PrintAndLogEx(NORMAL, "\n Chip Type:   %u | EM4205", chipType); break;
+        case 4:  PrintAndLogEx(NORMAL, " Chip Type:   %u | Unknown", chipType); break;
+        case 2:  PrintAndLogEx(NORMAL, " Chip Type:   %u | EM4469", chipType); break;
+        //add more here when known
+        default: PrintAndLogEx(NORMAL, " Chip Type:   %u Unknown", chipType); break;
+    }
 
-	switch (cap) {
-		case 3:  PrintAndLogEx(NORMAL, "  Cap Type:   %u | 330pF",cap); break;
-		case 2:  PrintAndLogEx(NORMAL, "  Cap Type:   %u | %spF",cap, (chipType==2)? "75":"210"); break;
-		case 1:  PrintAndLogEx(NORMAL, "  Cap Type:   %u | 250pF",cap); break;
-		case 0:  PrintAndLogEx(NORMAL, "  Cap Type:   %u | no resonant capacitor",cap); break;
-		default: PrintAndLogEx(NORMAL, "  Cap Type:   %u | unknown",cap); break;
-	}
+    switch (cap) {
+        case 3:  PrintAndLogEx(NORMAL, "  Cap Type:   %u | 330pF",cap); break;
+        case 2:  PrintAndLogEx(NORMAL, "  Cap Type:   %u | %spF",cap, (chipType==2)? "75":"210"); break;
+        case 1:  PrintAndLogEx(NORMAL, "  Cap Type:   %u | 250pF",cap); break;
+        case 0:  PrintAndLogEx(NORMAL, "  Cap Type:   %u | no resonant capacitor",cap); break;
+        default: PrintAndLogEx(NORMAL, "  Cap Type:   %u | unknown",cap); break;
+    }
 
-	PrintAndLogEx(NORMAL, " Cust Code: %03u | %s", custCode, (custCode == 0x200) ? "Default": "Unknown");
-	if (serial != 0)
-		PrintAndLogEx(NORMAL, "\n  Serial #: %08X\n", serial);
+    PrintAndLogEx(NORMAL, " Cust Code: %03u | %s", custCode, (custCode == 0x200) ? "Default": "Unknown");
+    if (serial != 0)
+        PrintAndLogEx(NORMAL, "\n  Serial #: %08X\n", serial);
 }
 
 void printEM4x05ProtectionBits(uint32_t word) {
-	for (uint8_t i = 0; i < 15; i++) {
-		PrintAndLogEx(NORMAL, "      Word:  %02u | %s", i, (((1 << i) & word ) || i < 2) ? "Is Write Locked" : "Is Not Write Locked");
-		if (i==14)
-			PrintAndLogEx(NORMAL, "      Word:  %02u | %s", i+1, (((1 << i) & word ) || i < 2) ? "Is Write Locked" : "Is Not Write Locked");
-	}
+    for (uint8_t i = 0; i < 15; i++) {
+        PrintAndLogEx(NORMAL, "      Word:  %02u | %s", i, (((1 << i) & word ) || i < 2) ? "Is Write Locked" : "Is Not Write Locked");
+        if (i==14)
+            PrintAndLogEx(NORMAL, "      Word:  %02u | %s", i+1, (((1 << i) & word ) || i < 2) ? "Is Write Locked" : "Is Not Write Locked");
+    }
 }
 
 //quick test for EM4x05/EM4x69 tag
 bool EM4x05IsBlock0(uint32_t *word) {
-	int res = EM4x05ReadWord_ext(0, 0, false, word);
-	return (res > 0) ? true : false;
+    int res = EM4x05ReadWord_ext(0, 0, false, word);
+    return (res > 0) ? true : false;
 }
 
 int CmdEM4x05Info(const char *Cmd) {
@@ -1381,77 +1381,77 @@ int CmdEM4x05Info(const char *Cmd) {
 #define EM_CONFIG_BLOCK 4
 #define EM_PROT1_BLOCK 14
 #define EM_PROT2_BLOCK 15
-	uint32_t pwd;
-	uint32_t word = 0, block0 = 0, serial = 0;
-  	bool usePwd = false;
-	uint8_t ctmp = tolower(param_getchar(Cmd, 0));
-	if ( ctmp == 'h' ) return usage_lf_em4x05_info();
+    uint32_t pwd;
+    uint32_t word = 0, block0 = 0, serial = 0;
+    bool usePwd = false;
+    uint8_t ctmp = tolower(param_getchar(Cmd, 0));
+    if ( ctmp == 'h' ) return usage_lf_em4x05_info();
 
-	// for now use default input of 1 as invalid (unlikely 1 will be a valid password...)
-	pwd = param_get32ex(Cmd, 0, 1, 16);
+    // for now use default input of 1 as invalid (unlikely 1 will be a valid password...)
+    pwd = param_get32ex(Cmd, 0, 1, 16);
 
-	if ( pwd != 1 )
-		usePwd = true;
+    if ( pwd != 1 )
+        usePwd = true;
 
-	// read word 0 (chip info)
-	// block 0 can be read even without a password.
-	if ( !EM4x05IsBlock0(&block0) )
-		return -1;
+    // read word 0 (chip info)
+    // block 0 can be read even without a password.
+    if ( !EM4x05IsBlock0(&block0) )
+        return -1;
 
-	// read word 1 (serial #) doesn't need pwd
-	// continue if failed, .. non blocking fail.
-	EM4x05ReadWord_ext(EM_SERIAL_BLOCK, 0, false, &serial);
-	printEM4x05info(block0, serial);
+    // read word 1 (serial #) doesn't need pwd
+    // continue if failed, .. non blocking fail.
+    EM4x05ReadWord_ext(EM_SERIAL_BLOCK, 0, false, &serial);
+    printEM4x05info(block0, serial);
 
-	// read word 4 (config block)
-	// needs password if one is set
-	if ( EM4x05ReadWord_ext(EM_CONFIG_BLOCK, pwd, usePwd, &word) != 1 )
-		return 0;
+    // read word 4 (config block)
+    // needs password if one is set
+    if ( EM4x05ReadWord_ext(EM_CONFIG_BLOCK, pwd, usePwd, &word) != 1 )
+        return 0;
 
-	printEM4x05config(word);
+    printEM4x05config(word);
 
-	// read word 14 and 15 to see which is being used for the protection bits
-	if ( EM4x05ReadWord_ext(EM_PROT1_BLOCK, pwd, usePwd, &word) != 1 ) {
-		return 0;
-	}
-	// if status bit says this is not the used protection word
-	if (!(word & 0x8000)) {
-		if ( EM4x05ReadWord_ext(EM_PROT2_BLOCK, pwd, usePwd, &word) != 1 )
-			return 0;
-	}
-	//something went wrong
-	if (!(word & 0x8000)) return 0;
-	printEM4x05ProtectionBits(word);
-	return 1;
+    // read word 14 and 15 to see which is being used for the protection bits
+    if ( EM4x05ReadWord_ext(EM_PROT1_BLOCK, pwd, usePwd, &word) != 1 ) {
+        return 0;
+    }
+    // if status bit says this is not the used protection word
+    if (!(word & 0x8000)) {
+        if ( EM4x05ReadWord_ext(EM_PROT2_BLOCK, pwd, usePwd, &word) != 1 )
+            return 0;
+    }
+    //something went wrong
+    if (!(word & 0x8000)) return 0;
+    printEM4x05ProtectionBits(word);
+    return 1;
 }
 
 static command_t CommandTable[] = {
-	{"help", 		CmdHelp, 			1, "This help"},
-	//{"410x_demod",	CmdEMdemodASK, 		0, "Extract ID from EM410x tag on antenna)"},
-	{"410x_demod",	CmdEM410xDemod, 	0, "demodulate a EM410x tag from the GraphBuffer"},
-	{"410x_read",	CmdEM410xRead, 		1, "attempt to read and extract tag data"},
-	{"410x_sim",	CmdEM410xSim, 		0, "simulate EM410x tag"},
-	{"410x_brute",  CmdEM410xBrute,		0, "reader bruteforce attack by simulating EM410x tags"},
-	{"410x_watch",	CmdEM410xWatch, 	0, "watches for EM410x 125/134 kHz tags (option 'h' for 134)"},
-	{"410x_spoof",	CmdEM410xWatchnSpoof, 0, "watches for EM410x 125/134 kHz tags, and replays them. (option 'h' for 134)" },
-	{"410x_write",	CmdEM410xWrite, 	0, "write EM410x UID to T5555(Q5) or T55x7 tag"},
-	{"4x05_dump",	CmdEM4x05Dump,		0, "dump EM4x05/EM4x69 tag"},
-	{"4x05_info",   CmdEM4x05Info,      0, "tag information EM4x05/EM4x69"},
-	{"4x05_read",	CmdEM4x05Read, 		0, "read word data from EM4x05/EM4x69"},
-	{"4x05_write",	CmdEM4x05Write,		0, "write word data to EM4x05/EM4x69"},
-	{"4x50_dump",	CmdEM4x50Dump,		0, "dump EM4x50 tag"},
-	{"4x50_read",	CmdEM4x50Read, 		0, "read word data from EM4x50"},
-	{"4x50_write",	CmdEM4x50Write, 	0, "write word data to EM4x50"},
-	{NULL, NULL, 0, NULL}
+    {"help",        CmdHelp,              1, "This help"},
+    //{"410x_demod",  CmdEMdemodASK,        0, "Extract ID from EM410x tag on antenna)"},
+    {"410x_demod",  CmdEM410xDemod,       0, "demodulate a EM410x tag from the GraphBuffer"},
+    {"410x_read",   CmdEM410xRead,        1, "attempt to read and extract tag data"},
+    {"410x_sim",    CmdEM410xSim,         0, "simulate EM410x tag"},
+    {"410x_brute",  CmdEM410xBrute,       0, "reader bruteforce attack by simulating EM410x tags"},
+    {"410x_watch",  CmdEM410xWatch,       0, "watches for EM410x 125/134 kHz tags (option 'h' for 134)"},
+    {"410x_spoof",  CmdEM410xWatchnSpoof, 0, "watches for EM410x 125/134 kHz tags, and replays them. (option 'h' for 134)" },
+    {"410x_write",  CmdEM410xWrite,       0, "write EM410x UID to T5555(Q5) or T55x7 tag"},
+    {"4x05_dump",   CmdEM4x05Dump,        0, "dump EM4x05/EM4x69 tag"},
+    {"4x05_info",   CmdEM4x05Info,        0, "tag information EM4x05/EM4x69"},
+    {"4x05_read",   CmdEM4x05Read,        0, "read word data from EM4x05/EM4x69"},
+    {"4x05_write",  CmdEM4x05Write,       0, "write word data to EM4x05/EM4x69"},
+    {"4x50_dump",   CmdEM4x50Dump,        0, "dump EM4x50 tag"},
+    {"4x50_read",   CmdEM4x50Read,        0, "read word data from EM4x50"},
+    {"4x50_write",  CmdEM4x50Write,       0, "write word data to EM4x50"},
+    {NULL, NULL, 0, NULL}
 };
 
 int CmdLFEM4X(const char *Cmd) {
-	clearCommandBuffer();
-	CmdsParse(CommandTable, Cmd);
-	return 0;
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
+    return 0;
 }
 
 int CmdHelp(const char *Cmd) {
-	CmdsHelp(CommandTable);
-	return 0;
+    CmdsHelp(CommandTable);
+    return 0;
 }
diff --git a/client/cmdlffdx.c b/client/cmdlffdx.c
index c87f40ba4..c2a3a0e40 100644
--- a/client/cmdlffdx.c
+++ b/client/cmdlffdx.c
@@ -11,133 +11,133 @@
 #include "cmdlffdx.h"
 
 /*
-	FDX-B ISO11784/85 demod  (aka animal tag)  BIPHASE, inverted, rf/32,  with preamble of 00000000001 (128bits)
-	8 databits + 1 parity (1)
-	CIITT 16 checksum
-	NATIONAL CODE, ICAR database
-	COUNTRY CODE (ISO3166) or http://cms.abvma.ca/uploads/ManufacturersISOsandCountryCodes.pdf
-	FLAG (animal/non-animal)
+    FDX-B ISO11784/85 demod  (aka animal tag)  BIPHASE, inverted, rf/32,  with preamble of 00000000001 (128bits)
+    8 databits + 1 parity (1)
+    CIITT 16 checksum
+    NATIONAL CODE, ICAR database
+    COUNTRY CODE (ISO3166) or http://cms.abvma.ca/uploads/ManufacturersISOsandCountryCodes.pdf
+    FLAG (animal/non-animal)
 
-	38 IDbits
-	10 country code
-	1 extra app bit
-	14 reserved bits
-	1 animal bit
-	16 ccitt CRC chksum over 64bit ID CODE.
-	24 appli bits.
+    38 IDbits
+    10 country code
+    1 extra app bit
+    14 reserved bits
+    1 animal bit
+    16 ccitt CRC chksum over 64bit ID CODE.
+    24 appli bits.
 
-	sample: 985121004515220  [ 37FF65B88EF94 ]
+    sample: 985121004515220  [ 37FF65B88EF94 ]
 */
 
 static int CmdHelp(const char *Cmd);
 
 int usage_lf_fdx_clone(void){
-	PrintAndLogEx(NORMAL, "Clone a FDX-B animal tag to a T55x7 tag.");
-	PrintAndLogEx(NORMAL, "Usage: lf fdx clone [h] <country id> <animal id> <Q5>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h            : This help");
-	PrintAndLogEx(NORMAL, "      <country id> : Country id");
-	PrintAndLogEx(NORMAL, "      <animal id>  : Animal id");
-	// has extended data?
-	//reserved/rfu
-	//is animal tag
-	// extended data
-	PrintAndLogEx(NORMAL, "      <Q5>        : Specify write to Q5 (t5555 instead of t55x7)");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "       lf fdx clone 999 112233");
-	return 0;
+    PrintAndLogEx(NORMAL, "Clone a FDX-B animal tag to a T55x7 tag.");
+    PrintAndLogEx(NORMAL, "Usage: lf fdx clone [h] <country id> <animal id> <Q5>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "      h            : This help");
+    PrintAndLogEx(NORMAL, "      <country id> : Country id");
+    PrintAndLogEx(NORMAL, "      <animal id>  : Animal id");
+    // has extended data?
+    //reserved/rfu
+    //is animal tag
+    // extended data
+    PrintAndLogEx(NORMAL, "      <Q5>        : Specify write to Q5 (t5555 instead of t55x7)");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "       lf fdx clone 999 112233");
+    return 0;
 }
 
 int usage_lf_fdx_sim(void) {
-	PrintAndLogEx(NORMAL, "Enables simulation of FDX-B animal tag");
-	PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  lf fdx sim [h] <country id> <animal id>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h            : This help");
-	PrintAndLogEx(NORMAL, "      <country id> : Country ID");
-	PrintAndLogEx(NORMAL, "      <animal id>  : Animal ID");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "       lf fdx sim 999 112233");
-	return 0;
+    PrintAndLogEx(NORMAL, "Enables simulation of FDX-B animal tag");
+    PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  lf fdx sim [h] <country id> <animal id>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "      h            : This help");
+    PrintAndLogEx(NORMAL, "      <country id> : Country ID");
+    PrintAndLogEx(NORMAL, "      <animal id>  : Animal ID");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "       lf fdx sim 999 112233");
+    return 0;
 }
 
 // Ask/Biphase Demod then try to locate an ISO 11784/85 ID
 // BitStream must contain previously askrawdemod and biphasedemoded data
 int detectFDXB(uint8_t *dest, size_t *size) {
- 	//make sure buffer has enough data
-	if (*size < 128*2) return -1;
-	size_t startIdx = 0;
-	uint8_t preamble[] = {0,0,0,0,0,0,0,0,0,0,1};
-	if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
-		return -2; //preamble not found
-	if (*size != 128) return -3; //wrong demoded size
-	//return start position
-	return (int)startIdx;
+    //make sure buffer has enough data
+    if (*size < 128*2) return -1;
+    size_t startIdx = 0;
+    uint8_t preamble[] = {0,0,0,0,0,0,0,0,0,0,1};
+    if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
+        return -2; //preamble not found
+    if (*size != 128) return -3; //wrong demoded size
+    //return start position
+    return (int)startIdx;
 }
 
 // clearing the topbit needed for the preambl detection.
 static void verify_values(uint32_t countryid, uint64_t animalid){
-	if ((animalid & 0x3FFFFFFFFF) != animalid) {
-		animalid &= 0x3FFFFFFFFF;
-		PrintAndLogEx(INFO, "Animal ID Truncated to 38bits: %"PRIx64, animalid);
-	}
-	if ( (countryid & 0x3ff) != countryid ) {
-		countryid &= 0x3ff;
-		PrintAndLogEx(INFO, "Country ID Truncated to 10bits: %03d", countryid);
-	}
+    if ((animalid & 0x3FFFFFFFFF) != animalid) {
+        animalid &= 0x3FFFFFFFFF;
+        PrintAndLogEx(INFO, "Animal ID Truncated to 38bits: %"PRIx64, animalid);
+    }
+    if ( (countryid & 0x3ff) != countryid ) {
+        countryid &= 0x3ff;
+        PrintAndLogEx(INFO, "Country ID Truncated to 10bits: %03d", countryid);
+    }
 }
 
 int getFDXBits(uint64_t national_id, uint16_t country, uint8_t isanimal, uint8_t isextended, uint32_t extended, uint8_t *bits) {
 
     // add preamble ten 0x00 and one 0x01
     memset(bits, 0x00, 10);
-	bits[10] = 1;
+    bits[10] = 1;
 
-	// 128bits
+    // 128bits
     // every 9th bit is 0x01, but we can just fill the rest with 0x01 and overwrite
-	memset(bits, 0x01, 128);
+    memset(bits, 0x01, 128);
 
     // add preamble ten 0x00 and one 0x01
     memset(bits, 0x00, 10);
 
-	// add reserved
-	num_to_bytebitsLSBF(0x00, 7, bits + 66);
-	num_to_bytebitsLSBF(0x00 >> 7, 7, bits + 74);
+    // add reserved
+    num_to_bytebitsLSBF(0x00, 7, bits + 66);
+    num_to_bytebitsLSBF(0x00 >> 7, 7, bits + 74);
 
-	// add animal flag - OK
-	bits[65] = isanimal;
+    // add animal flag - OK
+    bits[65] = isanimal;
 
-	// add extended flag - OK
-	bits[81] = isextended;
+    // add extended flag - OK
+    bits[81] = isextended;
 
-	// add national code 40bits - OK
-	num_to_bytebitsLSBF(national_id >> 0, 8, bits+11);
-	num_to_bytebitsLSBF(national_id >> 8, 8, bits+20);
-	num_to_bytebitsLSBF(national_id >> 16, 8, bits+29);
-	num_to_bytebitsLSBF(national_id >> 24, 8, bits+38);
-	num_to_bytebitsLSBF(national_id >> 32, 6, bits+47);
+    // add national code 40bits - OK
+    num_to_bytebitsLSBF(national_id >> 0, 8, bits+11);
+    num_to_bytebitsLSBF(national_id >> 8, 8, bits+20);
+    num_to_bytebitsLSBF(national_id >> 16, 8, bits+29);
+    num_to_bytebitsLSBF(national_id >> 24, 8, bits+38);
+    num_to_bytebitsLSBF(national_id >> 32, 6, bits+47);
 
-	// add country code - OK
-	num_to_bytebitsLSBF(country >> 0, 2, bits+53);
-	num_to_bytebitsLSBF(country >> 2, 8, bits+56);
+    // add country code - OK
+    num_to_bytebitsLSBF(country >> 0, 2, bits+53);
+    num_to_bytebitsLSBF(country >> 2, 8, bits+56);
 
-	// add crc-16 - OK
-	uint8_t raw[8];
-	for (uint8_t i=0; i<8; ++i)
-		raw[i] = bytebits_to_byte(bits + 11 + i * 9, 8);
+    // add crc-16 - OK
+    uint8_t raw[8];
+    for (uint8_t i=0; i<8; ++i)
+        raw[i] = bytebits_to_byte(bits + 11 + i * 9, 8);
 
-	uint16_t crc = crc16_kermit(raw, 8);
-	num_to_bytebitsLSBF(crc >> 0, 8, bits+83);
-	num_to_bytebitsLSBF(crc >> 8, 8, bits+92);
+    uint16_t crc = crc16_kermit(raw, 8);
+    num_to_bytebitsLSBF(crc >> 0, 8, bits+83);
+    num_to_bytebitsLSBF(crc >> 8, 8, bits+92);
 
-	// extended data - OK
-	num_to_bytebitsLSBF( extended >> 0 , 8, bits+101);
-	num_to_bytebitsLSBF( extended >> 8 , 8, bits+110);
-	num_to_bytebitsLSBF( extended >> 16, 8, bits+119);
-	return 1;
+    // extended data - OK
+    num_to_bytebitsLSBF( extended >> 0 , 8, bits+101);
+    num_to_bytebitsLSBF( extended >> 8 , 8, bits+110);
+    num_to_bytebitsLSBF( extended >> 16, 8, bits+119);
+    return 1;
 }
 
 // FDX-B ISO11784/85 demod  (aka animal tag)  BIPHASE, inverted, rf/32,  with preamble of 00000000001 (128bits)
@@ -159,74 +159,74 @@ int getFDXBits(uint64_t national_id, uint16_t country, uint8_t isanimal, uint8_t
 */
 int CmdFDXBdemodBI(const char *Cmd){
 
-	int clk = 32;
-	int invert = 1, errCnt = 0, offset = 0, maxErr = 0;
-	uint8_t bs[MAX_DEMOD_BUF_LEN];
-	size_t size = getFromGraphBuf(bs);
+    int clk = 32;
+    int invert = 1, errCnt = 0, offset = 0, maxErr = 0;
+    uint8_t bs[MAX_DEMOD_BUF_LEN];
+    size_t size = getFromGraphBuf(bs);
 
-	errCnt = askdemod(bs, &size, &clk, &invert, maxErr, 0, 0);
-	if ( errCnt < 0 || errCnt > maxErr ) {
-		PrintAndLogEx(DEBUG, "DEBUG: Error - FDXB no data or error found %d, clock: %d", errCnt, clk);
-		return 0;
-	}
+    errCnt = askdemod(bs, &size, &clk, &invert, maxErr, 0, 0);
+    if ( errCnt < 0 || errCnt > maxErr ) {
+        PrintAndLogEx(DEBUG, "DEBUG: Error - FDXB no data or error found %d, clock: %d", errCnt, clk);
+        return 0;
+    }
 
-	errCnt = BiphaseRawDecode(bs, &size, &offset, 1);
-	if (errCnt < 0 || errCnt > maxErr ) {
-		PrintAndLogEx(DEBUG, "DEBUG: Error - FDXB BiphaseRawDecode: %d", errCnt);
-		return 0;
-	}
+    errCnt = BiphaseRawDecode(bs, &size, &offset, 1);
+    if (errCnt < 0 || errCnt > maxErr ) {
+        PrintAndLogEx(DEBUG, "DEBUG: Error - FDXB BiphaseRawDecode: %d", errCnt);
+        return 0;
+    }
 
-	int preambleIndex = detectFDXB(bs, &size);
-	if (preambleIndex < 0){
-		PrintAndLogEx(DEBUG, "DEBUG: Error - FDXB preamble not found :: %d",preambleIndex);
-		return 0;
-	}
-	if (size != 128) {
-		PrintAndLogEx(DEBUG, "DEBUG: Error - FDXB incorrect data length found");
-		return 0;
-	}
+    int preambleIndex = detectFDXB(bs, &size);
+    if (preambleIndex < 0){
+        PrintAndLogEx(DEBUG, "DEBUG: Error - FDXB preamble not found :: %d",preambleIndex);
+        return 0;
+    }
+    if (size != 128) {
+        PrintAndLogEx(DEBUG, "DEBUG: Error - FDXB incorrect data length found");
+        return 0;
+    }
 
-	setDemodBuf(bs, 128, preambleIndex);
+    setDemodBuf(bs, 128, preambleIndex);
 
-	// remove marker bits (1's every 9th digit after preamble) (pType = 2)
-	size = removeParity(bs, preambleIndex + 11, 9, 2, 117);
-	if ( size != 104 ) {
-		PrintAndLogEx(DEBUG, "DEBUG: Error - FDXB error removeParity:: %d", size);
-		return 0;
-	}
-	PrintAndLogEx(SUCCESS, "\nFDX-B / ISO 11784/5 Animal Tag ID Found:");
+    // remove marker bits (1's every 9th digit after preamble) (pType = 2)
+    size = removeParity(bs, preambleIndex + 11, 9, 2, 117);
+    if ( size != 104 ) {
+        PrintAndLogEx(DEBUG, "DEBUG: Error - FDXB error removeParity:: %d", size);
+        return 0;
+    }
+    PrintAndLogEx(SUCCESS, "\nFDX-B / ISO 11784/5 Animal Tag ID Found:");
 
-	//got a good demod
-	uint64_t NationalCode = ((uint64_t)(bytebits_to_byteLSBF(bs+32, 6)) << 32) | bytebits_to_byteLSBF(bs, 32);
-	uint32_t countryCode = bytebits_to_byteLSBF(bs+38, 10);
-	uint8_t dataBlockBit = bs[48];
-	uint32_t reservedCode = bytebits_to_byteLSBF(bs+49, 14);
-	uint8_t animalBit = bs[63];
-	uint32_t crc16 = bytebits_to_byteLSBF(bs+64, 16);
-	uint32_t extended = bytebits_to_byteLSBF(bs+80, 24);
+    //got a good demod
+    uint64_t NationalCode = ((uint64_t)(bytebits_to_byteLSBF(bs+32, 6)) << 32) | bytebits_to_byteLSBF(bs, 32);
+    uint32_t countryCode = bytebits_to_byteLSBF(bs+38, 10);
+    uint8_t dataBlockBit = bs[48];
+    uint32_t reservedCode = bytebits_to_byteLSBF(bs+49, 14);
+    uint8_t animalBit = bs[63];
+    uint32_t crc16 = bytebits_to_byteLSBF(bs+64, 16);
+    uint32_t extended = bytebits_to_byteLSBF(bs+80, 24);
 
-	uint64_t rawid = ((uint64_t)bytebits_to_byte(bs, 32) << 32) | bytebits_to_byte(bs+32, 32);
-	uint8_t raw[8];
-	num_to_bytes(rawid, 8, raw);
+    uint64_t rawid = ((uint64_t)bytebits_to_byte(bs, 32) << 32) | bytebits_to_byte(bs+32, 32);
+    uint8_t raw[8];
+    num_to_bytes(rawid, 8, raw);
 
-	PrintAndLogEx(SUCCESS, "Raw ID Hex: %s", sprint_hex(raw,8));
+    PrintAndLogEx(SUCCESS, "Raw ID Hex: %s", sprint_hex(raw,8));
 
-	uint16_t calcCrc = crc16_kermit(raw, 8);
-	PrintAndLogEx(SUCCESS, "Animal ID:     %04u-%012" PRIu64, countryCode, NationalCode);
-	PrintAndLogEx(SUCCESS, "National Code: %012" PRIu64, NationalCode);
-	PrintAndLogEx(SUCCESS, "CountryCode:   %04u", countryCode);
+    uint16_t calcCrc = crc16_kermit(raw, 8);
+    PrintAndLogEx(SUCCESS, "Animal ID:     %04u-%012" PRIu64, countryCode, NationalCode);
+    PrintAndLogEx(SUCCESS, "National Code: %012" PRIu64, NationalCode);
+    PrintAndLogEx(SUCCESS, "CountryCode:   %04u", countryCode);
 
-	PrintAndLogEx(SUCCESS, "Reserved/RFU:      %u", reservedCode);
-	PrintAndLogEx(SUCCESS, "Animal Tag:        %s", animalBit ? _YELLOW_(True) : "False");
-	PrintAndLogEx(SUCCESS, "Has extended data: %s [0x%X]", dataBlockBit ? _YELLOW_(True) : "False", extended);
-	PrintAndLogEx(SUCCESS, "CRC:           0x%04X - [%04X] - %s", crc16, calcCrc, (calcCrc == crc16) ? _GREEN_(Passed) : "Failed");
+    PrintAndLogEx(SUCCESS, "Reserved/RFU:      %u", reservedCode);
+    PrintAndLogEx(SUCCESS, "Animal Tag:        %s", animalBit ? _YELLOW_(True) : "False");
+    PrintAndLogEx(SUCCESS, "Has extended data: %s [0x%X]", dataBlockBit ? _YELLOW_(True) : "False", extended);
+    PrintAndLogEx(SUCCESS, "CRC:           0x%04X - [%04X] - %s", crc16, calcCrc, (calcCrc == crc16) ? _GREEN_(Passed) : "Failed");
 
-	if (g_debugMode) {
-		PrintAndLogEx(DEBUG, "Start marker %d;   Size %d", preambleIndex, size);
-		char *bin = sprint_bin_break(bs, size, 16);
-		PrintAndLogEx(DEBUG, "DEBUG BinStream:\n%s",bin);
-	}
-	return 1;
+    if (g_debugMode) {
+        PrintAndLogEx(DEBUG, "Start marker %d;   Size %d", preambleIndex, size);
+        char *bin = sprint_bin_break(bs, size, 16);
+        PrintAndLogEx(DEBUG, "DEBUG BinStream:\n%s",bin);
+    }
+    return 1;
 }
 
 
@@ -234,171 +234,171 @@ int CmdFDXBdemodBI(const char *Cmd){
 //almost the same demod as cmddata.c/CmdFDXBdemodBI
 int CmdFdxDemod(const char *Cmd) {
 
-	//Differential Biphase / di-phase (inverted biphase)
-	//get binary from ask wave
-	if (!ASKbiphaseDemod("0 32 1 0", false)) {
-		PrintAndLogEx(DEBUG, "DEBUG: Error - FDX-B ASKbiphaseDemod failed");
-		return 0;
-	}
-	size_t size = DemodBufferLen;
-	int preambleIndex = detectFDXB(DemodBuffer, &size);
-	if (preambleIndex < 0){
+    //Differential Biphase / di-phase (inverted biphase)
+    //get binary from ask wave
+    if (!ASKbiphaseDemod("0 32 1 0", false)) {
+        PrintAndLogEx(DEBUG, "DEBUG: Error - FDX-B ASKbiphaseDemod failed");
+        return 0;
+    }
+    size_t size = DemodBufferLen;
+    int preambleIndex = detectFDXB(DemodBuffer, &size);
+    if (preambleIndex < 0){
 
-		if (preambleIndex == -1)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - FDX-B too few bits found");
-		else if (preambleIndex == -2)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - FDX-B preamble not found");
-		else if (preambleIndex == -3)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - FDX-B Size not correct: %d", size);
-		else
-			PrintAndLogEx(DEBUG, "DEBUG: Error - FDX-B ans: %d", preambleIndex);
-		return 0;
-	}
+        if (preambleIndex == -1)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - FDX-B too few bits found");
+        else if (preambleIndex == -2)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - FDX-B preamble not found");
+        else if (preambleIndex == -3)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - FDX-B Size not correct: %d", size);
+        else
+            PrintAndLogEx(DEBUG, "DEBUG: Error - FDX-B ans: %d", preambleIndex);
+        return 0;
+    }
 
-	// set and leave DemodBuffer intact
-	setDemodBuf(DemodBuffer, 128, preambleIndex);
-	setClockGrid(g_DemodClock, g_DemodStartIdx + (preambleIndex*g_DemodClock));
-	// remove marker bits (1's every 9th digit after preamble) (pType = 2)
-	size = removeParity(DemodBuffer, 11, 9, 2, 117);
-	if ( size != 104 ) {
-		PrintAndLogEx(DEBUG, "DEBUG: Error - FDX-B error removeParity: %d", size);
-		return 0;
-	}
+    // set and leave DemodBuffer intact
+    setDemodBuf(DemodBuffer, 128, preambleIndex);
+    setClockGrid(g_DemodClock, g_DemodStartIdx + (preambleIndex*g_DemodClock));
+    // remove marker bits (1's every 9th digit after preamble) (pType = 2)
+    size = removeParity(DemodBuffer, 11, 9, 2, 117);
+    if ( size != 104 ) {
+        PrintAndLogEx(DEBUG, "DEBUG: Error - FDX-B error removeParity: %d", size);
+        return 0;
+    }
 
-	//got a good demod
-	uint64_t NationalCode = ((uint64_t)(bytebits_to_byteLSBF(DemodBuffer+32,6)) << 32) | bytebits_to_byteLSBF(DemodBuffer,32);
-	uint16_t countryCode = bytebits_to_byteLSBF(DemodBuffer+38,10);
-	uint8_t dataBlockBit = DemodBuffer[48];
-	uint32_t reservedCode = bytebits_to_byteLSBF(DemodBuffer+49,14);
-	uint8_t animalBit = DemodBuffer[63];
-	uint32_t crc16 = bytebits_to_byteLSBF(DemodBuffer+64,16);
-	uint32_t extended = bytebits_to_byteLSBF(DemodBuffer+80,24);
-	uint64_t rawid = (uint64_t)(bytebits_to_byte(DemodBuffer,32)) << 32 | bytebits_to_byte(DemodBuffer+32, 32);
-	uint8_t raw[8];
-	num_to_bytes(rawid, 8, raw);
+    //got a good demod
+    uint64_t NationalCode = ((uint64_t)(bytebits_to_byteLSBF(DemodBuffer+32,6)) << 32) | bytebits_to_byteLSBF(DemodBuffer,32);
+    uint16_t countryCode = bytebits_to_byteLSBF(DemodBuffer+38,10);
+    uint8_t dataBlockBit = DemodBuffer[48];
+    uint32_t reservedCode = bytebits_to_byteLSBF(DemodBuffer+49,14);
+    uint8_t animalBit = DemodBuffer[63];
+    uint32_t crc16 = bytebits_to_byteLSBF(DemodBuffer+64,16);
+    uint32_t extended = bytebits_to_byteLSBF(DemodBuffer+80,24);
+    uint64_t rawid = (uint64_t)(bytebits_to_byte(DemodBuffer,32)) << 32 | bytebits_to_byte(DemodBuffer+32, 32);
+    uint8_t raw[8];
+    num_to_bytes(rawid, 8, raw);
 
 
-	uint16_t calcCrc = crc16_kermit(raw, 8);
+    uint16_t calcCrc = crc16_kermit(raw, 8);
 
-	PrintAndLogEx(SUCCESS, "\nFDX-B / ISO 11784/5 Animal Tag ID Found:  Raw : %s", sprint_hex(raw, 8));
-	PrintAndLogEx(SUCCESS, "Animal ID          %04u-%012" PRIu64, countryCode, NationalCode);
-	PrintAndLogEx(SUCCESS, "National Code      %012" PRIu64 " (0x%" PRIx64 ")", NationalCode, NationalCode);
-	PrintAndLogEx(SUCCESS, "Country Code       %04u", countryCode);
-	PrintAndLogEx(SUCCESS, "Reserved/RFU       %u (0x04%X)", reservedCode,  reservedCode);
-	PrintAndLogEx(SUCCESS, "Animal Tag         %s", animalBit ? _YELLOW_(True) : "False");
-	PrintAndLogEx(SUCCESS, "Has extended data  %s [0x%X]", dataBlockBit ? _YELLOW_(True) : "False", extended);
-	PrintAndLogEx(SUCCESS, "CRC-16             0x%04X - 0x%04X [%s]", crc16, calcCrc, (calcCrc == crc16) ? _GREEN_(Ok) : "Failed");
+    PrintAndLogEx(SUCCESS, "\nFDX-B / ISO 11784/5 Animal Tag ID Found:  Raw : %s", sprint_hex(raw, 8));
+    PrintAndLogEx(SUCCESS, "Animal ID          %04u-%012" PRIu64, countryCode, NationalCode);
+    PrintAndLogEx(SUCCESS, "National Code      %012" PRIu64 " (0x%" PRIx64 ")", NationalCode, NationalCode);
+    PrintAndLogEx(SUCCESS, "Country Code       %04u", countryCode);
+    PrintAndLogEx(SUCCESS, "Reserved/RFU       %u (0x04%X)", reservedCode,  reservedCode);
+    PrintAndLogEx(SUCCESS, "Animal Tag         %s", animalBit ? _YELLOW_(True) : "False");
+    PrintAndLogEx(SUCCESS, "Has extended data  %s [0x%X]", dataBlockBit ? _YELLOW_(True) : "False", extended);
+    PrintAndLogEx(SUCCESS, "CRC-16             0x%04X - 0x%04X [%s]", crc16, calcCrc, (calcCrc == crc16) ? _GREEN_(Ok) : "Failed");
 
-	if (g_debugMode) {
-		PrintAndLogEx(DEBUG, "Start marker %d;   Size %d", preambleIndex, size);
-		char *bin = sprint_bin_break(DemodBuffer, size, 16);
-		PrintAndLogEx(DEBUG, "DEBUG bin stream:\n%s", bin);
-	}
+    if (g_debugMode) {
+        PrintAndLogEx(DEBUG, "Start marker %d;   Size %d", preambleIndex, size);
+        char *bin = sprint_bin_break(DemodBuffer, size, 16);
+        PrintAndLogEx(DEBUG, "DEBUG bin stream:\n%s", bin);
+    }
 
-	// set block 0 for later
-	//g_DemodConfig = T55x7_MODULATION_DIPHASE | T55x7_BITRATE_RF_32 | 4 << T55x7_MAXBLOCK_SHIFT;
+    // set block 0 for later
+    //g_DemodConfig = T55x7_MODULATION_DIPHASE | T55x7_BITRATE_RF_32 | 4 << T55x7_MAXBLOCK_SHIFT;
 
-	return 1;
+    return 1;
 }
 
 int CmdFdxRead(const char *Cmd) {
-	lf_read(true, 10000);
-	return CmdFdxDemod(Cmd);
+    lf_read(true, 10000);
+    return CmdFdxDemod(Cmd);
 }
 
 int CmdFdxClone(const char *Cmd) {
 
-	uint32_t countryid = 0;
-	uint64_t animalid = 0;
-	uint32_t blocks[5] = {T55x7_MODULATION_DIPHASE | T55x7_BITRATE_RF_32 | 4 << T55x7_MAXBLOCK_SHIFT, 0, 0, 0, 0};
-	uint8_t bits[128];
-	uint8_t *bs = bits;
-	memset(bs, 0, sizeof(bits));
+    uint32_t countryid = 0;
+    uint64_t animalid = 0;
+    uint32_t blocks[5] = {T55x7_MODULATION_DIPHASE | T55x7_BITRATE_RF_32 | 4 << T55x7_MAXBLOCK_SHIFT, 0, 0, 0, 0};
+    uint8_t bits[128];
+    uint8_t *bs = bits;
+    memset(bs, 0, sizeof(bits));
 
-	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_fdx_clone();
+    char cmdp = param_getchar(Cmd, 0);
+    if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_fdx_clone();
 
-	countryid = param_get32ex(Cmd, 0, 0, 10);
-	animalid = param_get64ex(Cmd, 1, 0, 10);
+    countryid = param_get32ex(Cmd, 0, 0, 10);
+    animalid = param_get64ex(Cmd, 1, 0, 10);
 
-	verify_values(countryid, animalid);
+    verify_values(countryid, animalid);
 
-	// getFDXBits(uint64_t national_id, uint16_t country, uint8_t isanimal, uint8_t isextended, uint32_t extended, uint8_t *bits)
-	if ( !getFDXBits(animalid, countryid, 1, 0, 0, bs)) {
-		PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
-		return 1;
-	}
+    // getFDXBits(uint64_t national_id, uint16_t country, uint8_t isanimal, uint8_t isextended, uint32_t extended, uint8_t *bits)
+    if ( !getFDXBits(animalid, countryid, 1, 0, 0, bs)) {
+        PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
+        return 1;
+    }
 
-	//Q5
-	if (param_getchar(Cmd, 2) == 'Q' || param_getchar(Cmd, 2) == 'q')
-		blocks[0] = T5555_MODULATION_BIPHASE | T5555_INVERT_OUTPUT | T5555_SET_BITRATE(32) | 4 << T5555_MAXBLOCK_SHIFT;
+    //Q5
+    if (param_getchar(Cmd, 2) == 'Q' || param_getchar(Cmd, 2) == 'q')
+        blocks[0] = T5555_MODULATION_BIPHASE | T5555_INVERT_OUTPUT | T5555_SET_BITRATE(32) | 4 << T5555_MAXBLOCK_SHIFT;
 
-	// convert from bit stream to block data
-	blocks[1] = bytebits_to_byte(bs, 32);
-	blocks[2] = bytebits_to_byte(bs + 32, 32);
-	blocks[3] = bytebits_to_byte(bs + 64, 32);
-	blocks[4] = bytebits_to_byte(bs + 96, 32);
+    // convert from bit stream to block data
+    blocks[1] = bytebits_to_byte(bs, 32);
+    blocks[2] = bytebits_to_byte(bs + 32, 32);
+    blocks[3] = bytebits_to_byte(bs + 64, 32);
+    blocks[4] = bytebits_to_byte(bs + 96, 32);
 
-	PrintAndLogEx(INFO, "Preparing to clone FDX-B to T55x7 with animal ID: %04u-%"PRIu64, countryid, animalid);
-	print_blocks(blocks, 5);
+    PrintAndLogEx(INFO, "Preparing to clone FDX-B to T55x7 with animal ID: %04u-%"PRIu64, countryid, animalid);
+    print_blocks(blocks, 5);
 
-	UsbCommand resp;
-	UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
+    UsbCommand resp;
+    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
 
-	for (int i = 4; i >= 0; --i) {
-		c.arg[0] = blocks[i];
-		c.arg[1] = i;
-		clearCommandBuffer();
-		SendCommand(&c);
-		if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)){
-			PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
-			return -1;
-		}
-	}
+    for (int i = 4; i >= 0; --i) {
+        c.arg[0] = blocks[i];
+        c.arg[1] = i;
+        clearCommandBuffer();
+        SendCommand(&c);
+        if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)){
+            PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
+            return -1;
+        }
+    }
     return 0;
 }
 
 int CmdFdxSim(const char *Cmd) {
-	uint32_t countryid = 0;
-	uint64_t animalid = 0;
+    uint32_t countryid = 0;
+    uint64_t animalid = 0;
 
-	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_fdx_sim();
+    char cmdp = param_getchar(Cmd, 0);
+    if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_fdx_sim();
 
-	countryid = param_get32ex(Cmd, 0, 0, 10);
-	animalid = param_get64ex(Cmd, 1, 0, 10);
+    countryid = param_get32ex(Cmd, 0, 0, 10);
+    animalid = param_get64ex(Cmd, 1, 0, 10);
 
-	verify_values(countryid, animalid);
+    verify_values(countryid, animalid);
 
-	// 32, no STT, BIPHASE INVERTED == diphase
-	uint8_t clk = 32, encoding = 2, separator = 0, invert = 1;
-	uint16_t arg1, arg2;
-	size_t size = 128;
-	arg1 = clk << 8 | encoding;
-	arg2 = invert << 8 | separator;
+    // 32, no STT, BIPHASE INVERTED == diphase
+    uint8_t clk = 32, encoding = 2, separator = 0, invert = 1;
+    uint16_t arg1, arg2;
+    size_t size = 128;
+    arg1 = clk << 8 | encoding;
+    arg2 = invert << 8 | separator;
 
-	PrintAndLogEx(SUCCESS, "Simulating FDX-B animal ID: %04u-%"PRIu64, countryid, animalid);
+    PrintAndLogEx(SUCCESS, "Simulating FDX-B animal ID: %04u-%"PRIu64, countryid, animalid);
 
-	UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};
+    UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};
 
-	 //getFDXBits(uint64_t national_id, uint16_t country, uint8_t isanimal, uint8_t isextended, uint32_t extended, uint8_t *bits)
-	getFDXBits(animalid, countryid, 1, 0, 0, c.d.asBytes);
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+     //getFDXBits(uint64_t national_id, uint16_t country, uint8_t isanimal, uint8_t isextended, uint32_t extended, uint8_t *bits)
+    getFDXBits(animalid, countryid, 1, 0, 0, c.d.asBytes);
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 
 static command_t CommandTable[] = {
-    {"help",	CmdHelp,	1, "this help"},
-	{"demod",	CmdFdxDemod,1, "demodulate a FDX-B ISO11784/85 tag from the GraphBuffer"},
-	{"read",	CmdFdxRead,	0, "attempt to read and extract tag data"},
-	{"clone",	CmdFdxClone,0, "clone animal ID tag to T55x7 (or to q5/T5555)"},
-	{"sim",		CmdFdxSim,	0, "simulate Animal ID tag"},
+    {"help",    CmdHelp,    1, "this help"},
+    {"demod",   CmdFdxDemod,1, "demodulate a FDX-B ISO11784/85 tag from the GraphBuffer"},
+    {"read",    CmdFdxRead, 0, "attempt to read and extract tag data"},
+    {"clone",   CmdFdxClone,0, "clone animal ID tag to T55x7 (or to q5/T5555)"},
+    {"sim",     CmdFdxSim,  0, "simulate Animal ID tag"},
     {NULL, NULL, 0, NULL}
 };
 
 int CmdLFFdx(const char *Cmd) {
-	clearCommandBuffer();
+    clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
diff --git a/client/cmdlffdx.h b/client/cmdlffdx.h
index 107bb83ec..1ae12633a 100644
--- a/client/cmdlffdx.h
+++ b/client/cmdlffdx.h
@@ -8,14 +8,14 @@
 //-----------------------------------------------------------------------------
 #ifndef CMDLFFDX_H__
 #define CMDLFFDX_H__
-#include "proxmark3.h"	// Definitions, USB controls, etc
-#include "ui.h"			// PrintAndLog
+#include "proxmark3.h"  // Definitions, USB controls, etc
+#include "ui.h"         // PrintAndLog
 #include "util.h"       // weigandparity
 #include "cmdparser.h"
 #include "cmddata.h"
 #include "cmdmain.h"
-#include "cmdlf.h"		// lf read
-#include "crc16.h"		// for checksum crc-16_ccitt
+#include "cmdlf.h"      // lf read
+#include "crc16.h"      // for checksum crc-16_ccitt
 #include "protocols.h"  // for T55xx config register definitions
 #include "lfdemod.h"    // parityTest
 
diff --git a/client/cmdlfguard.c b/client/cmdlfguard.c
index 3e3642766..cb64ea528 100644
--- a/client/cmdlfguard.c
+++ b/client/cmdlfguard.c
@@ -12,131 +12,131 @@
 static int CmdHelp(const char *Cmd);
 
 int usage_lf_guard_clone(void){
-	PrintAndLogEx(NORMAL, "clone a Guardall tag to a T55x7 tag.");
-	PrintAndLogEx(NORMAL, "The facility-code is 8-bit and the card number is 16-bit.  Larger values are truncated. ");
-	PrintAndLogEx(NORMAL, "Currently work only on 26bit");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage: lf gprox clone [h] <format> <Facility-Code> <Card-Number>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "         <format> :  format length 26|32|36|40");
-	PrintAndLogEx(NORMAL, "  <Facility-Code> :  8-bit value facility code");
-	PrintAndLogEx(NORMAL, "  <Card Number>   : 16-bit value card number");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "       lf gprox clone 26 123 11223");
-	return 0;
+    PrintAndLogEx(NORMAL, "clone a Guardall tag to a T55x7 tag.");
+    PrintAndLogEx(NORMAL, "The facility-code is 8-bit and the card number is 16-bit.  Larger values are truncated. ");
+    PrintAndLogEx(NORMAL, "Currently work only on 26bit");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage: lf gprox clone [h] <format> <Facility-Code> <Card-Number>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "         <format> :  format length 26|32|36|40");
+    PrintAndLogEx(NORMAL, "  <Facility-Code> :  8-bit value facility code");
+    PrintAndLogEx(NORMAL, "  <Card Number>   : 16-bit value card number");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "       lf gprox clone 26 123 11223");
+    return 0;
 }
 
 int usage_lf_guard_sim(void) {
-	PrintAndLogEx(NORMAL, "Enables simulation of Guardall card with specified card number.");
-	PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
-	PrintAndLogEx(NORMAL, "The facility-code is 8-bit and the card number is 16-bit.  Larger values are truncated.");
-	PrintAndLogEx(NORMAL, "Currently work only on 26bit");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  lf gprox sim [h] <format> <Facility-Code> <Card-Number>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "         <format> :  format length 26|32|36|40");
-	PrintAndLogEx(NORMAL, "  <Facility-Code> :  8-bit value facility code");
-	PrintAndLogEx(NORMAL, "  <Card Number>   : 16-bit value card number");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "       lf gprox sim 26 123 11223");
-	return 0;
+    PrintAndLogEx(NORMAL, "Enables simulation of Guardall card with specified card number.");
+    PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
+    PrintAndLogEx(NORMAL, "The facility-code is 8-bit and the card number is 16-bit.  Larger values are truncated.");
+    PrintAndLogEx(NORMAL, "Currently work only on 26bit");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  lf gprox sim [h] <format> <Facility-Code> <Card-Number>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "         <format> :  format length 26|32|36|40");
+    PrintAndLogEx(NORMAL, "  <Facility-Code> :  8-bit value facility code");
+    PrintAndLogEx(NORMAL, "  <Card Number>   : 16-bit value card number");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "       lf gprox sim 26 123 11223");
+    return 0;
 }
 
 // Works for 26bits.
 int GetGuardBits(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint8_t *guardBits) {
 
-	uint8_t xorKey = 0x66;
-	uint8_t i;
-	uint8_t pre[96];
-	uint8_t rawbytes[12];
-	memset(pre, 0x00, sizeof(pre));
-	memset(rawbytes, 0x00, sizeof(rawbytes));
+    uint8_t xorKey = 0x66;
+    uint8_t i;
+    uint8_t pre[96];
+    uint8_t rawbytes[12];
+    memset(pre, 0x00, sizeof(pre));
+    memset(rawbytes, 0x00, sizeof(rawbytes));
 
-	// add format length (decimal)
-	switch (fmtlen) {
-		case 32: {
-			rawbytes[1] = (32 << 2);
+    // add format length (decimal)
+    switch (fmtlen) {
+        case 32: {
+            rawbytes[1] = (32 << 2);
 
-			break;
-		}
-		case 36: {
-			// FC = ((ByteStream[3] & 0x7F)<<7) | (ByteStream[4]>>1);
-			// Card = ((ByteStream[4]&1)<<19) | (ByteStream[5]<<11) | (ByteStream[6]<<3) | (ByteStream[7]>>5);
-			rawbytes[1] = (36 << 2);
-			// Get 26 wiegand from FacilityCode, CardNumber
-			uint8_t wiegand[34];
-			memset(wiegand, 0x00, sizeof(wiegand));
-			num_to_bytebits(fc, 8, wiegand);
-			num_to_bytebits(cn, 26, wiegand+8);
+            break;
+        }
+        case 36: {
+            // FC = ((ByteStream[3] & 0x7F)<<7) | (ByteStream[4]>>1);
+            // Card = ((ByteStream[4]&1)<<19) | (ByteStream[5]<<11) | (ByteStream[6]<<3) | (ByteStream[7]>>5);
+            rawbytes[1] = (36 << 2);
+            // Get 26 wiegand from FacilityCode, CardNumber
+            uint8_t wiegand[34];
+            memset(wiegand, 0x00, sizeof(wiegand));
+            num_to_bytebits(fc, 8, wiegand);
+            num_to_bytebits(cn, 26, wiegand+8);
 
-			// add wiegand parity bits (dest, source, len)
-			wiegand_add_parity(pre, wiegand, 34);
-			break;
-		}
-		case 40: {
-			rawbytes[1] = (40 << 2);
-			break;
-		}
-		case 26:
-		default: {
-			rawbytes[1] = (26 << 2);
-			// Get 26 wiegand from FacilityCode, CardNumber
-			uint8_t wiegand[24];
-			memset(wiegand, 0x00, sizeof(wiegand));
-			num_to_bytebits(fc, 8, wiegand);
-			num_to_bytebits(cn, 16, wiegand+8);
+            // add wiegand parity bits (dest, source, len)
+            wiegand_add_parity(pre, wiegand, 34);
+            break;
+        }
+        case 40: {
+            rawbytes[1] = (40 << 2);
+            break;
+        }
+        case 26:
+        default: {
+            rawbytes[1] = (26 << 2);
+            // Get 26 wiegand from FacilityCode, CardNumber
+            uint8_t wiegand[24];
+            memset(wiegand, 0x00, sizeof(wiegand));
+            num_to_bytebits(fc, 8, wiegand);
+            num_to_bytebits(cn, 16, wiegand+8);
 
-			// add wiegand parity bits (dest, source, len)
-			wiegand_add_parity(pre, wiegand, 24);
-			break;
-		}
-	}
-	// 2bit checksum, unknown today,
-	// these two bits are the last ones of rawbyte[1], hence the LSHIFT above.
+            // add wiegand parity bits (dest, source, len)
+            wiegand_add_parity(pre, wiegand, 24);
+            break;
+        }
+    }
+    // 2bit checksum, unknown today,
+    // these two bits are the last ones of rawbyte[1], hence the LSHIFT above.
 
 
-	// xor key
-	rawbytes[0] = xorKey;
+    // xor key
+    rawbytes[0] = xorKey;
 
-	rawbytes[2] = 1;
-	rawbytes[3] = 0;
+    rawbytes[2] = 1;
+    rawbytes[3] = 0;
 
-	// add wiegand to rawbytes
-	for (i = 0; i < 4; ++i)
-		rawbytes[i+4] = bytebits_to_byte( pre + (i*8), 8);
+    // add wiegand to rawbytes
+    for (i = 0; i < 4; ++i)
+        rawbytes[i+4] = bytebits_to_byte( pre + (i*8), 8);
 
-	PrintAndLogEx(DEBUG, " WIE | %s\n", sprint_hex(rawbytes, sizeof(rawbytes)));
+    PrintAndLogEx(DEBUG, " WIE | %s\n", sprint_hex(rawbytes, sizeof(rawbytes)));
 
 
-	// XOR (only works on wiegand stuff)
-	for (i = 1; i < 12; ++i)
-		rawbytes[i] ^= xorKey ;
+    // XOR (only works on wiegand stuff)
+    for (i = 1; i < 12; ++i)
+        rawbytes[i] ^= xorKey ;
 
-	PrintAndLogEx(DEBUG, " XOR | %s \n", sprint_hex(rawbytes, sizeof(rawbytes)));
+    PrintAndLogEx(DEBUG, " XOR | %s \n", sprint_hex(rawbytes, sizeof(rawbytes)));
 
-	// convert rawbytes to bits in pre
-	for (i = 0; i < 12; ++i)
-		num_to_bytebitsLSBF( rawbytes[i], 8, pre + (i*8));
+    // convert rawbytes to bits in pre
+    for (i = 0; i < 12; ++i)
+        num_to_bytebitsLSBF( rawbytes[i], 8, pre + (i*8));
 
-	PrintAndLogEx(DEBUG, "\n Raw | %s \n", sprint_hex(rawbytes, sizeof(rawbytes)));
-	PrintAndLogEx(DEBUG, " Raw | %s\n", sprint_bin(pre, 64) );
+    PrintAndLogEx(DEBUG, "\n Raw | %s \n", sprint_hex(rawbytes, sizeof(rawbytes)));
+    PrintAndLogEx(DEBUG, " Raw | %s\n", sprint_bin(pre, 64) );
 
-	// add spacer bit 0 every 4 bits, starting with index 0,
-	// 12 bytes, 24 nibbles.  24+1 extra bites. 3bytes.  ie 9bytes | 1byte xorkey, 8bytes rawdata (64bits, should be enough for a 40bit wiegand)
-	addParity(pre, guardBits+6, 64, 5, 3);
+    // add spacer bit 0 every 4 bits, starting with index 0,
+    // 12 bytes, 24 nibbles.  24+1 extra bites. 3bytes.  ie 9bytes | 1byte xorkey, 8bytes rawdata (64bits, should be enough for a 40bit wiegand)
+    addParity(pre, guardBits+6, 64, 5, 3);
 
-	// preamble
-	guardBits[0] = 1;
-	guardBits[1] = 1;
-	guardBits[2] = 1;
-	guardBits[3] = 1;
-	guardBits[4] = 1;
-	guardBits[5] = 0;
+    // preamble
+    guardBits[0] = 1;
+    guardBits[1] = 1;
+    guardBits[2] = 1;
+    guardBits[3] = 1;
+    guardBits[4] = 1;
+    guardBits[5] = 0;
 
-	PrintAndLogEx(DEBUG, " FIN | %s\n", sprint_bin(guardBits, 96) );
-	return 1;
+    PrintAndLogEx(DEBUG, " FIN | %s\n", sprint_bin(guardBits, 96) );
+    return 1;
 }
 
 // by marshmellow
@@ -146,25 +146,25 @@ int GetGuardBits(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint8_t *guardBits) {
 // Bitstream must contain previously askrawdemod and biphasedemoded data
 int detectGProxII(uint8_t *bits, size_t *size) {
 
-	size_t startIdx = 0;
-	uint8_t preamble[] = {1,1,1,1,1,0};
+    size_t startIdx = 0;
+    uint8_t preamble[] = {1,1,1,1,1,0};
 
-	// sanity check
-	if ( *size < sizeof(preamble) ) return -1;
+    // sanity check
+    if ( *size < sizeof(preamble) ) return -1;
 
-	if (!preambleSearch(bits, preamble, sizeof(preamble), size, &startIdx))
-		return -2; //preamble not found
+    if (!preambleSearch(bits, preamble, sizeof(preamble), size, &startIdx))
+        return -2; //preamble not found
 
-	 //gProxII should be 96 bits
-	if (*size != 96) return -3;
+     //gProxII should be 96 bits
+    if (*size != 96) return -3;
 
-	//check first 6 spacer bits to verify format
-	if (!bits[startIdx+5] && !bits[startIdx+10] && !bits[startIdx+15] && !bits[startIdx+20] && !bits[startIdx+25] && !bits[startIdx+30]){
-		//confirmed proper separator bits found
-		//return start position
-		return (int) startIdx;
-	}
-	return -5; //spacer bits not found - not a valid gproxII
+    //check first 6 spacer bits to verify format
+    if (!bits[startIdx+5] && !bits[startIdx+10] && !bits[startIdx+15] && !bits[startIdx+20] && !bits[startIdx+25] && !bits[startIdx+30]){
+        //confirmed proper separator bits found
+        //return start position
+        return (int) startIdx;
+    }
+    return -5; //spacer bits not found - not a valid gproxII
 }
 
 //by marshmellow
@@ -174,189 +174,189 @@ int detectGProxII(uint8_t *bits, size_t *size) {
 //if successful it will push askraw data back to demod buffer ready for emulation
 int CmdGuardDemod(const char *Cmd) {
 
-	//Differential Biphase
-	//get binary from ask wave
-	if (!ASKbiphaseDemod("0 64 0 0", false)) {
-		PrintAndLogEx(DEBUG, "DEBUG: Error - gProxII ASKbiphaseDemod failed");
-		return 0;
-	}
+    //Differential Biphase
+    //get binary from ask wave
+    if (!ASKbiphaseDemod("0 64 0 0", false)) {
+        PrintAndLogEx(DEBUG, "DEBUG: Error - gProxII ASKbiphaseDemod failed");
+        return 0;
+    }
 
-	size_t size = DemodBufferLen;
+    size_t size = DemodBufferLen;
 
-	int preambleIndex = detectGProxII(DemodBuffer, &size);
-	if (preambleIndex < 0){
+    int preambleIndex = detectGProxII(DemodBuffer, &size);
+    if (preambleIndex < 0){
 
-		if (preambleIndex == -1)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - gProxII too few bits found");
-		else if (preambleIndex == -2)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - gProxII preamble not found");
-		else if (preambleIndex == -3)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - gProxII size not correct: %d", size);
-		else if (preambleIndex == -5)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - gProxII wrong spacerbits");
-		else
-			PrintAndLogEx(DEBUG, "DEBUG: Error - gProxII ans: %d", preambleIndex);
-		return 0;
-	}
+        if (preambleIndex == -1)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - gProxII too few bits found");
+        else if (preambleIndex == -2)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - gProxII preamble not found");
+        else if (preambleIndex == -3)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - gProxII size not correct: %d", size);
+        else if (preambleIndex == -5)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - gProxII wrong spacerbits");
+        else
+            PrintAndLogEx(DEBUG, "DEBUG: Error - gProxII ans: %d", preambleIndex);
+        return 0;
+    }
 
-	//got a good demod of 96 bits
-	uint8_t ByteStream[8] = {0x00};
-	uint8_t xorKey = 0;
-	size_t startIdx = preambleIndex + 6; //start after 6 bit preamble
+    //got a good demod of 96 bits
+    uint8_t ByteStream[8] = {0x00};
+    uint8_t xorKey = 0;
+    size_t startIdx = preambleIndex + 6; //start after 6 bit preamble
 
-	uint8_t bits_no_spacer[90];
-	//so as to not mess with raw DemodBuffer copy to a new sample array
-	memcpy(bits_no_spacer, DemodBuffer + startIdx, 90);
-	// remove the 18 (90/5=18) parity bits (down to 72 bits (96-6-18=72))
-	size_t len = removeParity(bits_no_spacer, 0, 5, 3, 90); //source, startloc, paritylen, ptype, length_to_run
-	if (len != 72) {
-		PrintAndLogEx(DEBUG, "DEBUG: Error - gProxII spacer removal did not produce 72 bits: %u, start: %u", len, startIdx);
-		return 0;
-	}
-	// get key and then get all 8 bytes of payload decoded
-	xorKey = (uint8_t)bytebits_to_byteLSBF(bits_no_spacer, 8);
-	for (size_t idx = 0; idx < 8; idx++) {
-		ByteStream[idx] = ((uint8_t)bytebits_to_byteLSBF(bits_no_spacer+8 + (idx*8),8)) ^ xorKey;
-		PrintAndLogEx(DEBUG, "DEBUG: gProxII byte %u after xor: %02x", (unsigned int)idx, ByteStream[idx]);
-	}
+    uint8_t bits_no_spacer[90];
+    //so as to not mess with raw DemodBuffer copy to a new sample array
+    memcpy(bits_no_spacer, DemodBuffer + startIdx, 90);
+    // remove the 18 (90/5=18) parity bits (down to 72 bits (96-6-18=72))
+    size_t len = removeParity(bits_no_spacer, 0, 5, 3, 90); //source, startloc, paritylen, ptype, length_to_run
+    if (len != 72) {
+        PrintAndLogEx(DEBUG, "DEBUG: Error - gProxII spacer removal did not produce 72 bits: %u, start: %u", len, startIdx);
+        return 0;
+    }
+    // get key and then get all 8 bytes of payload decoded
+    xorKey = (uint8_t)bytebits_to_byteLSBF(bits_no_spacer, 8);
+    for (size_t idx = 0; idx < 8; idx++) {
+        ByteStream[idx] = ((uint8_t)bytebits_to_byteLSBF(bits_no_spacer+8 + (idx*8),8)) ^ xorKey;
+        PrintAndLogEx(DEBUG, "DEBUG: gProxII byte %u after xor: %02x", (unsigned int)idx, ByteStream[idx]);
+    }
 
-	setDemodBuf(DemodBuffer, 96, preambleIndex);
-	setClockGrid(g_DemodClock, g_DemodStartIdx + (preambleIndex*g_DemodClock));
+    setDemodBuf(DemodBuffer, 96, preambleIndex);
+    setClockGrid(g_DemodClock, g_DemodStartIdx + (preambleIndex*g_DemodClock));
 
-	//ByteStream contains 8 Bytes (64 bits) of decrypted raw tag data
-	uint8_t fmtLen = ByteStream[0] >> 2;
-	uint32_t FC = 0;
-	uint32_t Card = 0;
-	//get raw 96 bits to print
-	uint32_t raw1 = bytebits_to_byte(DemodBuffer,32);
-	uint32_t raw2 = bytebits_to_byte(DemodBuffer + 32, 32);
-	uint32_t raw3 = bytebits_to_byte(DemodBuffer + 64, 32);
-	bool unknown = false;
-	switch(fmtLen) {
-		case 36:
-			FC = ((ByteStream[3] & 0x7F)<<7) | (ByteStream[4]>>1);
-			Card = ((ByteStream[4]&1)<<19) | (ByteStream[5]<<11) | (ByteStream[6]<<3) | (ByteStream[7]>>5);
-			break;
-		case 26:
-			FC = ((ByteStream[3] & 0x7F)<<1) | (ByteStream[4]>>7);
-			Card = ((ByteStream[4]&0x7F)<<9) | (ByteStream[5]<<1) | (ByteStream[6]>>7);
-			break;
-		default :
-			unknown = true;
-			break;
-	}
-	if ( !unknown)
-		PrintAndLogEx(SUCCESS, "G-Prox-II Found: Format Len: %ubit - FC: %u - Card: %u, Raw: %08x%08x%08x", fmtLen, FC, Card, raw1, raw2, raw3);
-	else
-		PrintAndLogEx(SUCCESS, "Unknown G-Prox-II Fmt Found: Format Len: %u, Raw: %08x%08x%08x", fmtLen, raw1, raw2, raw3);
+    //ByteStream contains 8 Bytes (64 bits) of decrypted raw tag data
+    uint8_t fmtLen = ByteStream[0] >> 2;
+    uint32_t FC = 0;
+    uint32_t Card = 0;
+    //get raw 96 bits to print
+    uint32_t raw1 = bytebits_to_byte(DemodBuffer,32);
+    uint32_t raw2 = bytebits_to_byte(DemodBuffer + 32, 32);
+    uint32_t raw3 = bytebits_to_byte(DemodBuffer + 64, 32);
+    bool unknown = false;
+    switch(fmtLen) {
+        case 36:
+            FC = ((ByteStream[3] & 0x7F)<<7) | (ByteStream[4]>>1);
+            Card = ((ByteStream[4]&1)<<19) | (ByteStream[5]<<11) | (ByteStream[6]<<3) | (ByteStream[7]>>5);
+            break;
+        case 26:
+            FC = ((ByteStream[3] & 0x7F)<<1) | (ByteStream[4]>>7);
+            Card = ((ByteStream[4]&0x7F)<<9) | (ByteStream[5]<<1) | (ByteStream[6]>>7);
+            break;
+        default :
+            unknown = true;
+            break;
+    }
+    if ( !unknown)
+        PrintAndLogEx(SUCCESS, "G-Prox-II Found: Format Len: %ubit - FC: %u - Card: %u, Raw: %08x%08x%08x", fmtLen, FC, Card, raw1, raw2, raw3);
+    else
+        PrintAndLogEx(SUCCESS, "Unknown G-Prox-II Fmt Found: Format Len: %u, Raw: %08x%08x%08x", fmtLen, raw1, raw2, raw3);
 
-	return 1;
+    return 1;
 }
 
 int CmdGuardRead(const char *Cmd) {
-	lf_read(true, 10000);
-	return CmdGuardDemod(Cmd);
+    lf_read(true, 10000);
+    return CmdGuardDemod(Cmd);
 }
 
 int CmdGuardClone(const char *Cmd) {
 
-	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_guard_clone();
+    char cmdp = param_getchar(Cmd, 0);
+    if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_guard_clone();
 
-	uint32_t facilitycode = 0, cardnumber = 0, fc = 0, cn = 0, fmtlen = 0;
-	uint8_t i;
-	uint8_t bs[96];
-	memset(bs, 0x00, sizeof(bs));
+    uint32_t facilitycode = 0, cardnumber = 0, fc = 0, cn = 0, fmtlen = 0;
+    uint8_t i;
+    uint8_t bs[96];
+    memset(bs, 0x00, sizeof(bs));
 
-	//GuardProxII - compat mode, ASK/Biphase,  data rate 64, 3 data blocks
-	uint32_t blocks[4] = {T55x7_MODULATION_BIPHASE | T55x7_BITRATE_RF_64 | 3 << T55x7_MAXBLOCK_SHIFT, 0, 0, 0};
+    //GuardProxII - compat mode, ASK/Biphase,  data rate 64, 3 data blocks
+    uint32_t blocks[4] = {T55x7_MODULATION_BIPHASE | T55x7_BITRATE_RF_64 | 3 << T55x7_MAXBLOCK_SHIFT, 0, 0, 0};
 
-	if (sscanf(Cmd, "%u %u %u", &fmtlen, &fc, &cn ) != 3) return usage_lf_guard_clone();
+    if (sscanf(Cmd, "%u %u %u", &fmtlen, &fc, &cn ) != 3) return usage_lf_guard_clone();
 
-	fmtlen &= 0x7f;
-	facilitycode = (fc & 0x000000FF);
-	cardnumber = (cn & 0x0000FFFF);
+    fmtlen &= 0x7f;
+    facilitycode = (fc & 0x000000FF);
+    cardnumber = (cn & 0x0000FFFF);
 
-	if ( !GetGuardBits(fmtlen, facilitycode, cardnumber, bs)) {
-		PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
-		return 1;
-	}
+    if ( !GetGuardBits(fmtlen, facilitycode, cardnumber, bs)) {
+        PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
+        return 1;
+    }
 
-	// Q5
-	if (param_getchar(Cmd, 3) == 'Q' || param_getchar(Cmd, 3) == 'q')
-		blocks[0] = T5555_MODULATION_FSK2 | T5555_SET_BITRATE(50) | 3 << T5555_MAXBLOCK_SHIFT;
+    // Q5
+    if (param_getchar(Cmd, 3) == 'Q' || param_getchar(Cmd, 3) == 'q')
+        blocks[0] = T5555_MODULATION_FSK2 | T5555_SET_BITRATE(50) | 3 << T5555_MAXBLOCK_SHIFT;
 
-	blocks[1] = bytebits_to_byte(bs, 32);
-	blocks[2] = bytebits_to_byte(bs + 32, 32);
-	blocks[3] = bytebits_to_byte(bs + 64, 32);
+    blocks[1] = bytebits_to_byte(bs, 32);
+    blocks[2] = bytebits_to_byte(bs + 32, 32);
+    blocks[3] = bytebits_to_byte(bs + 64, 32);
 
-	PrintAndLogEx(INFO, "Preparing to clone Guardall to T55x7 with Facility Code: %u, Card Number: %u", facilitycode, cardnumber);
-	print_blocks(blocks, 4);
+    PrintAndLogEx(INFO, "Preparing to clone Guardall to T55x7 with Facility Code: %u, Card Number: %u", facilitycode, cardnumber);
+    print_blocks(blocks, 4);
 
-	UsbCommand resp;
-	UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
+    UsbCommand resp;
+    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
 
-	for ( i = 0; i<4; ++i ) {
-		c.arg[0] = blocks[i];
-		c.arg[1] = i;
-		clearCommandBuffer();
-		SendCommand(&c);
-		if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)){
-			PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
-			return -1;
-		}
-	}
+    for ( i = 0; i<4; ++i ) {
+        c.arg[0] = blocks[i];
+        c.arg[1] = i;
+        clearCommandBuffer();
+        SendCommand(&c);
+        if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)){
+            PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
+            return -1;
+        }
+    }
     return 0;
 }
 
 int CmdGuardSim(const char *Cmd) {
 
-	// Guard uses:  clk: 64, invert: 0, encoding: 2 (ASK Biphase)
-	uint8_t clock = 64, encoding = 2, separator = 0, invert = 0;
-	uint32_t facilitycode = 0, cardnumber = 0, fc = 0, cn = 0, fmtlen = 0;
+    // Guard uses:  clk: 64, invert: 0, encoding: 2 (ASK Biphase)
+    uint8_t clock = 64, encoding = 2, separator = 0, invert = 0;
+    uint32_t facilitycode = 0, cardnumber = 0, fc = 0, cn = 0, fmtlen = 0;
 
-	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_guard_sim();
+    char cmdp = param_getchar(Cmd, 0);
+    if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_guard_sim();
 
-	if (sscanf(Cmd, "%u %u %u", &fmtlen, &fc, &cn ) != 3) return usage_lf_guard_sim();
+    if (sscanf(Cmd, "%u %u %u", &fmtlen, &fc, &cn ) != 3) return usage_lf_guard_sim();
 
-	uint8_t bs[96];
-	size_t size = sizeof(bs);
-	memset(bs, 0x00, size);
+    uint8_t bs[96];
+    size_t size = sizeof(bs);
+    memset(bs, 0x00, size);
 
-	fmtlen &= 0x7F;
-	facilitycode = (fc & 0x000000FF);
-	cardnumber = (cn & 0x0000FFFF);
+    fmtlen &= 0x7F;
+    facilitycode = (fc & 0x000000FF);
+    cardnumber = (cn & 0x0000FFFF);
 
-	if ( !GetGuardBits(fmtlen, facilitycode, cardnumber, bs)) {
-		PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
-		return 1;
-	}
+    if ( !GetGuardBits(fmtlen, facilitycode, cardnumber, bs)) {
+        PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
+        return 1;
+    }
 
-	PrintAndLogEx(SUCCESS, "Simulating Guardall - Facility Code: %u, CardNumber: %u", facilitycode, cardnumber );
+    PrintAndLogEx(SUCCESS, "Simulating Guardall - Facility Code: %u, CardNumber: %u", facilitycode, cardnumber );
 
-	uint64_t arg1, arg2;
-	arg1 = (clock << 8) | encoding;
-	arg2 = (invert << 8) | separator;
+    uint64_t arg1, arg2;
+    arg1 = (clock << 8) | encoding;
+    arg2 = (invert << 8) | separator;
 
-	UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};
-	memcpy(c.d.asBytes, bs, size );
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+    UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};
+    memcpy(c.d.asBytes, bs, size );
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 
 static command_t CommandTable[] = {
-    {"help",	CmdHelp,		1, "this help"},
-	{"demod",	CmdGuardDemod,	1, "demodulate a G Prox II tag from the GraphBuffer"},
-	{"read",	CmdGuardRead,	0, "attempt to read and extract tag data from the antenna"},
-	{"clone",	CmdGuardClone,	0, "clone Guardall tag"},
-	{"sim",		CmdGuardSim,	0, "simulate Guardall tag"},
+    {"help",    CmdHelp,        1, "this help"},
+    {"demod",   CmdGuardDemod,  1, "demodulate a G Prox II tag from the GraphBuffer"},
+    {"read",    CmdGuardRead,   0, "attempt to read and extract tag data from the antenna"},
+    {"clone",   CmdGuardClone,  0, "clone Guardall tag"},
+    {"sim",     CmdGuardSim,    0, "simulate Guardall tag"},
     {NULL, NULL, 0, NULL}
 };
 
 int CmdLFGuard(const char *Cmd) {
-	clearCommandBuffer();
+    clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c
index 87cb8d160..ea074cc31 100644
--- a/client/cmdlfhid.c
+++ b/client/cmdlfhid.c
@@ -17,578 +17,578 @@
 static int CmdHelp(const char *Cmd);
 
 int usage_lf_hid_read(void){
-	PrintAndLogEx(NORMAL, "Enables HID compatible reader mode printing details.");
-	PrintAndLogEx(NORMAL, "By default, values are printed and logged until the button is pressed or another USB command is issued.");
-	PrintAndLogEx(NORMAL, "If the [1] option is provided, reader mode is exited after reading a single HID card.");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  lf hid read [h] [1]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h :  This help");
-	PrintAndLogEx(NORMAL, "      1 : (optional) stop after reading a single card");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "       lf hid read");
-	PrintAndLogEx(NORMAL, "       lf hid read 1");
-	return 0;
+    PrintAndLogEx(NORMAL, "Enables HID compatible reader mode printing details.");
+    PrintAndLogEx(NORMAL, "By default, values are printed and logged until the button is pressed or another USB command is issued.");
+    PrintAndLogEx(NORMAL, "If the [1] option is provided, reader mode is exited after reading a single HID card.");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  lf hid read [h] [1]");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "      h :  This help");
+    PrintAndLogEx(NORMAL, "      1 : (optional) stop after reading a single card");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "       lf hid read");
+    PrintAndLogEx(NORMAL, "       lf hid read 1");
+    return 0;
 }
 int usage_lf_hid_wiegand(void){
-	PrintAndLogEx(NORMAL, "This command converts facility code/card number to Wiegand code");
-	PrintAndLogEx(NORMAL, "");
-  	PrintAndLogEx(NORMAL, "Usage: lf hid wiegand [h] [OEM] [FC] [CN]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h             - This help");
-	PrintAndLogEx(NORMAL, "       OEM           - OEM number / site code");
-	PrintAndLogEx(NORMAL, "       FC            - facility code");
-	PrintAndLogEx(NORMAL, "       CN            - card number");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      lf hid wiegand 0 101 2001");
-	return 0;
+    PrintAndLogEx(NORMAL, "This command converts facility code/card number to Wiegand code");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage: lf hid wiegand [h] [OEM] [FC] [CN]");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h             - This help");
+    PrintAndLogEx(NORMAL, "       OEM           - OEM number / site code");
+    PrintAndLogEx(NORMAL, "       FC            - facility code");
+    PrintAndLogEx(NORMAL, "       CN            - card number");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      lf hid wiegand 0 101 2001");
+    return 0;
 }
 int usage_lf_hid_sim(void){
-	PrintAndLogEx(NORMAL, "Enables simulation of HID card with card number.");
-	PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  lf hid sim [h] [ID]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h	- This help");
-	PrintAndLogEx(NORMAL, "       ID  - HID id");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      lf hid sim 2006ec0c86");
-	return 0;
+    PrintAndLogEx(NORMAL, "Enables simulation of HID card with card number.");
+    PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  lf hid sim [h] [ID]");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h   - This help");
+    PrintAndLogEx(NORMAL, "       ID  - HID id");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      lf hid sim 2006ec0c86");
+    return 0;
 }
 int usage_lf_hid_clone(void){
-	PrintAndLogEx(NORMAL, "Clone HID to T55x7.  Tag must be on antenna. ");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  lf hid clone [h] [ID] <L>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h	- This help");
-	PrintAndLogEx(NORMAL, "       ID  - HID id");
-	PrintAndLogEx(NORMAL, "       L   - 84bit ID");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      lf hid clone 2006ec0c86");
-	PrintAndLogEx(NORMAL, "      lf hid clone 2006ec0c86 L");
-	return 0;
+    PrintAndLogEx(NORMAL, "Clone HID to T55x7.  Tag must be on antenna. ");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  lf hid clone [h] [ID] <L>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h   - This help");
+    PrintAndLogEx(NORMAL, "       ID  - HID id");
+    PrintAndLogEx(NORMAL, "       L   - 84bit ID");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      lf hid clone 2006ec0c86");
+    PrintAndLogEx(NORMAL, "      lf hid clone 2006ec0c86 L");
+    return 0;
 }
 int usage_lf_hid_brute(void){
-	PrintAndLogEx(NORMAL, "Enables bruteforce of HID readers with specified facility code.");
-	PrintAndLogEx(NORMAL, "This is a attack against reader. if cardnumber is given, it starts with it and goes up / down one step");
-	PrintAndLogEx(NORMAL, "if cardnumber is not given, it starts with 1 and goes up to 65535");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  lf hid brute [h] [v] a <format> f <facility-code> c <cardnumber> d <delay>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h                 :  This help");
-	PrintAndLogEx(NORMAL, "       a <format>        :  26|33|34|35|37|40|44|84");
-	PrintAndLogEx(NORMAL, "       f <facility-code> :  8-bit value HID facility code");
-	PrintAndLogEx(NORMAL, "       c <cardnumber>    :  (optional) cardnumber to start with, max 65535");
-	PrintAndLogEx(NORMAL, "       d <delay>         :  delay betweens attempts in ms. Default 1000ms");
-	PrintAndLogEx(NORMAL, "       v                 :  verbose logging, show all tries");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "       lf hid brute a 26 f 224");
-	PrintAndLogEx(NORMAL, "       lf hid brute a 26 f 21 d 2000");
-	PrintAndLogEx(NORMAL, "       lf hid brute v a 26 f 21 c 200 d 2000");
-	return 0;
+    PrintAndLogEx(NORMAL, "Enables bruteforce of HID readers with specified facility code.");
+    PrintAndLogEx(NORMAL, "This is a attack against reader. if cardnumber is given, it starts with it and goes up / down one step");
+    PrintAndLogEx(NORMAL, "if cardnumber is not given, it starts with 1 and goes up to 65535");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  lf hid brute [h] [v] a <format> f <facility-code> c <cardnumber> d <delay>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h                 :  This help");
+    PrintAndLogEx(NORMAL, "       a <format>        :  26|33|34|35|37|40|44|84");
+    PrintAndLogEx(NORMAL, "       f <facility-code> :  8-bit value HID facility code");
+    PrintAndLogEx(NORMAL, "       c <cardnumber>    :  (optional) cardnumber to start with, max 65535");
+    PrintAndLogEx(NORMAL, "       d <delay>         :  delay betweens attempts in ms. Default 1000ms");
+    PrintAndLogEx(NORMAL, "       v                 :  verbose logging, show all tries");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "       lf hid brute a 26 f 224");
+    PrintAndLogEx(NORMAL, "       lf hid brute a 26 f 21 d 2000");
+    PrintAndLogEx(NORMAL, "       lf hid brute v a 26 f 21 c 200 d 2000");
+    return 0;
 }
 
 // sending three times.  Didn't seem to break the previous sim?
 static bool sendPing(void){
-	UsbCommand ping = {CMD_PING, {1, 2, 3}};
-	SendCommand(&ping);
-	SendCommand(&ping);
-	SendCommand(&ping);
-	clearCommandBuffer();
-	UsbCommand resp;
-	if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000))
-		return false;
-	return true;
+    UsbCommand ping = {CMD_PING, {1, 2, 3}};
+    SendCommand(&ping);
+    SendCommand(&ping);
+    SendCommand(&ping);
+    clearCommandBuffer();
+    UsbCommand resp;
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000))
+        return false;
+    return true;
 }
 static bool sendTry(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint32_t delay, uint8_t *bits, bool verbose){
 
-	// this should be optional.
-	if ( verbose )
-		PrintAndLogEx(INFO, "Trying FC: %u; CN: %u", fc, cn);
+    // this should be optional.
+    if ( verbose )
+        PrintAndLogEx(INFO, "Trying FC: %u; CN: %u", fc, cn);
 
-	calcWiegand( fmtlen, fc, cn, bits);
+    calcWiegand( fmtlen, fc, cn, bits);
 
-	uint64_t arg1 = bytebits_to_byte(bits, 32);
-	uint64_t arg2 = bytebits_to_byte(bits + 32, 32);
-	UsbCommand c = {CMD_HID_SIM_TAG, {arg1, arg2, 0}};
-	clearCommandBuffer();
-	SendCommand(&c);
+    uint64_t arg1 = bytebits_to_byte(bits, 32);
+    uint64_t arg2 = bytebits_to_byte(bits + 32, 32);
+    UsbCommand c = {CMD_HID_SIM_TAG, {arg1, arg2, 0}};
+    clearCommandBuffer();
+    SendCommand(&c);
 
-	msleep(delay);
-	sendPing();
-	return true;
+    msleep(delay);
+    sendPing();
+    return true;
 }
 
 //by marshmellow (based on existing demod + holiman's refactor)
 //HID Prox demod - FSK RF/50 with preamble of 00011101 (then manchester encoded)
 //print full HID Prox ID and some bit format details if found
 int CmdHIDDemod(const char *Cmd) {
-	//raw fsk demod no manchester decoding no start bit finding just get binary from wave
-	uint32_t hi2=0, hi=0, lo=0;
+    //raw fsk demod no manchester decoding no start bit finding just get binary from wave
+    uint32_t hi2=0, hi=0, lo=0;
 
-	uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
-	size_t size = getFromGraphBuf(bits);
-	if (size == 0) {
-		PrintAndLogEx(DEBUG, "DEBUG: Error - HID not enough samples");
-		return 0;
-	}
-	//get binary from fsk wave
-	int waveIdx = 0;
-	int idx = HIDdemodFSK(bits, &size, &hi2, &hi, &lo, &waveIdx);
-	if (idx < 0) {
+    uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
+    size_t size = getFromGraphBuf(bits);
+    if (size == 0) {
+        PrintAndLogEx(DEBUG, "DEBUG: Error - HID not enough samples");
+        return 0;
+    }
+    //get binary from fsk wave
+    int waveIdx = 0;
+    int idx = HIDdemodFSK(bits, &size, &hi2, &hi, &lo, &waveIdx);
+    if (idx < 0) {
 
-		if (idx == -1)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - HID not enough samples");
-		else if (idx == -2)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - HID just noise detected");
-		else if (idx == -3)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - HID problem during FSK demod");
-		else if (idx == -4)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - HID preamble not found");
-		else if (idx == -5)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - HID error in Manchester data, size %d", size);
-		else
-			PrintAndLogEx(DEBUG, "DEBUG: Error - HID error demoding fsk %d", idx);
+        if (idx == -1)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - HID not enough samples");
+        else if (idx == -2)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - HID just noise detected");
+        else if (idx == -3)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - HID problem during FSK demod");
+        else if (idx == -4)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - HID preamble not found");
+        else if (idx == -5)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - HID error in Manchester data, size %d", size);
+        else
+            PrintAndLogEx(DEBUG, "DEBUG: Error - HID error demoding fsk %d", idx);
 
-		return 0;
-	}
+        return 0;
+    }
 
-	setDemodBuf(bits, size, idx);
-	setClockGrid(50, waveIdx + (idx*50));
+    setDemodBuf(bits, size, idx);
+    setClockGrid(50, waveIdx + (idx*50));
 
-	if (hi2==0 && hi==0 && lo==0) {
-		PrintAndLogEx(DEBUG, "DEBUG: Error - HID no values found");
-		return 0;
-	}
+    if (hi2==0 && hi==0 && lo==0) {
+        PrintAndLogEx(DEBUG, "DEBUG: Error - HID no values found");
+        return 0;
+    }
 
-	if (hi2 != 0){ //extra large HID tags
-		PrintAndLogEx(SUCCESS, "HID Prox TAG ID: %x%08x%08x (%u)", hi2, hi, lo, (lo>>1) & 0xFFFF);
-	} else {  //standard HID tags <38 bits
-		uint8_t fmtLen = 0;
-		uint32_t cc = 0;
-		uint32_t fc = 0;
-		uint32_t cardnum = 0;
-		if ((( hi >> 5) & 1) == 1){//if bit 38 is set then < 37 bit format is used
-			uint32_t lo2=0;
-			lo2=(((hi & 31) << 12) | (lo >> 20)); //get bits 21-37 to check for format len bit
-			uint8_t idx3 = 1;
-			while ( lo2 > 1){ //find last bit set to 1 (format len bit)
-				lo2 >>= 1;
-				idx3++;
-			}
-			fmtLen = idx3 + 19;
-			fc = 0;
-			cardnum = 0;
-			if(fmtLen==26){
-				cardnum = (lo >> 1) & 0xFFFF;
-				fc = ( lo >> 17) & 0xFF;
-			}
-			if(fmtLen==32 && (lo & 0x40000000)){//if 32 bit and Kastle bit set
-				cardnum = (lo >> 1) & 0xFFFF;
-				fc = (lo >> 17) & 0xFF;
-				cc = (lo >> 25) & 0x1F;
-			}
-			if(fmtLen==34){
-				cardnum = (lo >> 1) & 0xFFFF;
-				fc= ((hi & 1)<< 15) | (lo >> 17);
-			}
-			if(fmtLen==35){
-				cardnum = (lo >> 1) & 0xFFFFF;
-				fc = ((hi & 1) << 11 ) | (lo >> 21);
-			}
-		}
-		else { //if bit 38 is not set then 37 bit format is used
-			fmtLen = 37;
-			fc = 0;
-			cardnum = 0;
-			if(fmtLen == 37){
-				cardnum = (lo >> 1 ) & 0x7FFFF;
-				fc = ((hi & 0xF) << 12) | (lo >> 20);
-			}
-		}
-		if(fmtLen==32 && (lo & 0x40000000)){//if 32 bit and Kastle bit set
-			PrintAndLogEx(SUCCESS, "HID Prox TAG (Kastle format) ID: %08x (%u) - Format Len: 32bit - CC: %u - FC: %u - Card: %u", lo, (lo >> 1) & 0xFFFF, cc, fc, cardnum);
-		}else{
-			PrintAndLogEx(SUCCESS, "HID Prox TAG ID: %x%08x (%u) - Format Len: %ubit - FC: %u - Card: %u", hi, lo, (lo >> 1) & 0xFFFF, fmtLen, fc, cardnum);
-		}
-	}
+    if (hi2 != 0){ //extra large HID tags
+        PrintAndLogEx(SUCCESS, "HID Prox TAG ID: %x%08x%08x (%u)", hi2, hi, lo, (lo>>1) & 0xFFFF);
+    } else {  //standard HID tags <38 bits
+        uint8_t fmtLen = 0;
+        uint32_t cc = 0;
+        uint32_t fc = 0;
+        uint32_t cardnum = 0;
+        if ((( hi >> 5) & 1) == 1){//if bit 38 is set then < 37 bit format is used
+            uint32_t lo2=0;
+            lo2=(((hi & 31) << 12) | (lo >> 20)); //get bits 21-37 to check for format len bit
+            uint8_t idx3 = 1;
+            while ( lo2 > 1){ //find last bit set to 1 (format len bit)
+                lo2 >>= 1;
+                idx3++;
+            }
+            fmtLen = idx3 + 19;
+            fc = 0;
+            cardnum = 0;
+            if(fmtLen==26){
+                cardnum = (lo >> 1) & 0xFFFF;
+                fc = ( lo >> 17) & 0xFF;
+            }
+            if(fmtLen==32 && (lo & 0x40000000)){//if 32 bit and Kastle bit set
+                cardnum = (lo >> 1) & 0xFFFF;
+                fc = (lo >> 17) & 0xFF;
+                cc = (lo >> 25) & 0x1F;
+            }
+            if(fmtLen==34){
+                cardnum = (lo >> 1) & 0xFFFF;
+                fc= ((hi & 1)<< 15) | (lo >> 17);
+            }
+            if(fmtLen==35){
+                cardnum = (lo >> 1) & 0xFFFFF;
+                fc = ((hi & 1) << 11 ) | (lo >> 21);
+            }
+        }
+        else { //if bit 38 is not set then 37 bit format is used
+            fmtLen = 37;
+            fc = 0;
+            cardnum = 0;
+            if(fmtLen == 37){
+                cardnum = (lo >> 1 ) & 0x7FFFF;
+                fc = ((hi & 0xF) << 12) | (lo >> 20);
+            }
+        }
+        if(fmtLen==32 && (lo & 0x40000000)){//if 32 bit and Kastle bit set
+            PrintAndLogEx(SUCCESS, "HID Prox TAG (Kastle format) ID: %08x (%u) - Format Len: 32bit - CC: %u - FC: %u - Card: %u", lo, (lo >> 1) & 0xFFFF, cc, fc, cardnum);
+        }else{
+            PrintAndLogEx(SUCCESS, "HID Prox TAG ID: %x%08x (%u) - Format Len: %ubit - FC: %u - Card: %u", hi, lo, (lo >> 1) & 0xFFFF, fmtLen, fc, cardnum);
+        }
+    }
 
-	PrintAndLogEx(DEBUG, "DEBUG: HID idx: %d, Len: %d, Printing Demod Buffer:", idx, size);
-	if (g_debugMode)
-		printDemodBuff();
+    PrintAndLogEx(DEBUG, "DEBUG: HID idx: %d, Len: %d, Printing Demod Buffer:", idx, size);
+    if (g_debugMode)
+        printDemodBuff();
 
-	return 1;
+    return 1;
 }
 
 // this read is the "normal" read,  which download lf signal and tries to demod here.
 int CmdHIDRead(const char *Cmd) {
-	lf_read(true, 12000);
-	return CmdHIDDemod(Cmd);
+    lf_read(true, 12000);
+    return CmdHIDDemod(Cmd);
 }
 
 // this read loops on device side.
 // uses the demod in lfops.c
 int CmdHIDRead_device(const char *Cmd) {
 
-	if (Cmd[0] == 'h' || Cmd[0] == 'H') return usage_lf_hid_read();
-	uint8_t findone = ( Cmd[0] == '1' ) ? 1 : 0;
-	UsbCommand c = {CMD_HID_DEMOD_FSK, {findone, 0 , 0}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+    if (Cmd[0] == 'h' || Cmd[0] == 'H') return usage_lf_hid_read();
+    uint8_t findone = ( Cmd[0] == '1' ) ? 1 : 0;
+    UsbCommand c = {CMD_HID_DEMOD_FSK, {findone, 0 , 0}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 
 int CmdHIDSim(const char *Cmd) {
-	uint32_t hi = 0, lo = 0;
-	uint32_t n = 0, i = 0;
+    uint32_t hi = 0, lo = 0;
+    uint32_t n = 0, i = 0;
 
-	uint8_t ctmp = tolower(param_getchar(Cmd, 0));
-	if ( strlen(Cmd) == 0 || ctmp == 'h' ) return usage_lf_hid_sim();
+    uint8_t ctmp = tolower(param_getchar(Cmd, 0));
+    if ( strlen(Cmd) == 0 || ctmp == 'h' ) return usage_lf_hid_sim();
 
-	while (sscanf(&Cmd[i++], "%1x", &n ) == 1) {
-		hi = (hi << 4) | (lo >> 28);
-		lo = (lo << 4) | (n & 0xf);
-	}
+    while (sscanf(&Cmd[i++], "%1x", &n ) == 1) {
+        hi = (hi << 4) | (lo >> 28);
+        lo = (lo << 4) | (n & 0xf);
+    }
 
-	PrintAndLogEx(SUCCESS, "Simulating HID tag with ID %x%08x", hi, lo);
-	PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation");
+    PrintAndLogEx(SUCCESS, "Simulating HID tag with ID %x%08x", hi, lo);
+    PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation");
 
-	UsbCommand c = {CMD_HID_SIM_TAG, {hi, lo, 0}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+    UsbCommand c = {CMD_HID_SIM_TAG, {hi, lo, 0}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 
 int CmdHIDClone(const char *Cmd) {
 
-	uint32_t hi2 = 0, hi = 0, lo = 0;
-	uint32_t n = 0, i = 0;
-	UsbCommand c = {CMD_HID_CLONE_TAG};
+    uint32_t hi2 = 0, hi = 0, lo = 0;
+    uint32_t n = 0, i = 0;
+    UsbCommand c = {CMD_HID_CLONE_TAG};
 
-	uint8_t ctmp = param_getchar(Cmd, 0);
-	if ( strlen(Cmd) == 0 || ctmp == 'H' || ctmp == 'h' ) return usage_lf_hid_clone();
+    uint8_t ctmp = param_getchar(Cmd, 0);
+    if ( strlen(Cmd) == 0 || ctmp == 'H' || ctmp == 'h' ) return usage_lf_hid_clone();
 
-	if (strchr(Cmd,'l') != 0) {
-		while (sscanf(&Cmd[i++], "%1x", &n ) == 1) {
-			hi2 = (hi2 << 4) | (hi >> 28);
-			hi = (hi << 4) | (lo >> 28);
-			lo = (lo << 4) | (n & 0xf);
-		}
+    if (strchr(Cmd,'l') != 0) {
+        while (sscanf(&Cmd[i++], "%1x", &n ) == 1) {
+            hi2 = (hi2 << 4) | (hi >> 28);
+            hi = (hi << 4) | (lo >> 28);
+            lo = (lo << 4) | (n & 0xf);
+        }
 
-		PrintAndLogEx(INFO, "Preparing to clone HID tag with long ID %x%08x%08x", hi2, hi, lo);
+        PrintAndLogEx(INFO, "Preparing to clone HID tag with long ID %x%08x%08x", hi2, hi, lo);
 
-		c.d.asBytes[0] = 1;
-	} else {
-		while (sscanf(&Cmd[i++], "%1x", &n ) == 1) {
-			hi = (hi << 4) | (lo >> 28);
-			lo = (lo << 4) | (n & 0xf);
-		}
-		PrintAndLogEx(INFO, "Preparing to clone HID tag with ID %x%08x", hi, lo);
-		hi2 = 0;
-		c.d.asBytes[0] = 0;
-	}
+        c.d.asBytes[0] = 1;
+    } else {
+        while (sscanf(&Cmd[i++], "%1x", &n ) == 1) {
+            hi = (hi << 4) | (lo >> 28);
+            lo = (lo << 4) | (n & 0xf);
+        }
+        PrintAndLogEx(INFO, "Preparing to clone HID tag with ID %x%08x", hi, lo);
+        hi2 = 0;
+        c.d.asBytes[0] = 0;
+    }
 
-	c.arg[0] = hi2;
-	c.arg[1] = hi;
-	c.arg[2] = lo;
+    c.arg[0] = hi2;
+    c.arg[1] = hi;
+    c.arg[2] = lo;
 
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 // struct to handle wiegand
 typedef struct {
-	uint8_t  FormatLen;
-	uint8_t  SiteCode;
-	uint8_t  FacilityCode;
-	uint8_t  CardNumber;
-	uint8_t* Wiegand;
-	size_t   Wiegand_n;
+    uint8_t  FormatLen;
+    uint8_t  SiteCode;
+    uint8_t  FacilityCode;
+    uint8_t  CardNumber;
+    uint8_t* Wiegand;
+    size_t   Wiegand_n;
  } wiegand_t;
 
 static void addHIDMarker(uint8_t fmtlen, uint8_t *out) {
-	// temp array
-	uint8_t arr[BITS];
-	memset(arr, 0, BITS);
+    // temp array
+    uint8_t arr[BITS];
+    memset(arr, 0, BITS);
 
-	// copy inpu
-	uint8_t pos = sizeof(arr)-fmtlen;
-	memcpy(arr+pos, out, fmtlen);
+    // copy inpu
+    uint8_t pos = sizeof(arr)-fmtlen;
+    memcpy(arr+pos, out, fmtlen);
 
-	switch(fmtlen) {
-		case 26:{
-			// start sentinel, BITS-bit 27 = 1
-			arr[BITS-27] = 1;
-			// fmt smaller than 37 used,  bit37 = 1
-			arr[BITS-38]  = 1;
-			memcpy(out, arr, BITS);
-			break;
-		}
-		case 34:
-			// start sentinel, BITS-bit 27 = 1
-			arr[BITS-35] = 1;
+    switch(fmtlen) {
+        case 26:{
+            // start sentinel, BITS-bit 27 = 1
+            arr[BITS-27] = 1;
+            // fmt smaller than 37 used,  bit37 = 1
+            arr[BITS-38]  = 1;
+            memcpy(out, arr, BITS);
+            break;
+        }
+        case 34:
+            // start sentinel, BITS-bit 27 = 1
+            arr[BITS-35] = 1;
 
-			// fmt smaller than 37 used,  bit37 = 1
-			arr[BITS-38]  = 1;
-			memcpy(out, arr, BITS);
-			break;
-		default:break;
-	}
+            // fmt smaller than 37 used,  bit37 = 1
+            arr[BITS-38]  = 1;
+            memcpy(out, arr, BITS);
+            break;
+        default:break;
+    }
 }
 
 // static void getParity34(uint32_t *hi, uint32_t *lo){
-	// uint32_t result = 0;
-	// int i;
+    // uint32_t result = 0;
+    // int i;
 
-	// // even parity
-	// for (i = 7;i >= 0;i--)
-		// result ^= (*hi >> i) & i;
-	// for (i = 31;i >= 24;i--)
-		// result ^= (*lo >> i) & 1;
+    // // even parity
+    // for (i = 7;i >= 0;i--)
+        // result ^= (*hi >> i) & i;
+    // for (i = 31;i >= 24;i--)
+        // result ^= (*lo >> i) & 1;
 
-	// *hi |= result << 2;
+    // *hi |= result << 2;
 
-	// // odd parity bit
-	// result = 0;
-	// for (i = 23;i >= 1;i--)
-		// result ^= (*lo >> i) & 1;
+    // // odd parity bit
+    // result = 0;
+    // for (i = 23;i >= 1;i--)
+        // result ^= (*lo >> i) & 1;
 
-	// *lo |= !result;
+    // *lo |= !result;
 // }
 // static void getParity37H(uint32_t *hi, uint32_t *lo){
-	// uint32_t result = 0;
-	// int i;
+    // uint32_t result = 0;
+    // int i;
 
-	// // even parity
-	// for (i = 4;i >= 0;i--)
-		// result ^= (*hi >> i) & 1;
-	// for (i = 31;i >= 20;i--)
-		// result ^= (*lo >> i) & 1;
-	// *hi |= result << 4;
+    // // even parity
+    // for (i = 4;i >= 0;i--)
+        // result ^= (*hi >> i) & 1;
+    // for (i = 31;i >= 20;i--)
+        // result ^= (*lo >> i) & 1;
+    // *hi |= result << 4;
 
-	// // odd parity
-	// result = 0;
-	// for (i = 19;i >= 1;i--)
-		// result ^= (*lo >> i) & 1;
-	// *lo |= result;
+    // // odd parity
+    // result = 0;
+    // for (i = 19;i >= 1;i--)
+        // result ^= (*lo >> i) & 1;
+    // *lo |= result;
 // }
 
 //static void calc26(uint16_t fc, uint32_t cardno,  uint8_t *out){
 static void calc26(uint16_t fc, uint32_t cardno, uint8_t *out){
-	uint8_t wiegand[24];
-	num_to_bytebits(fc, 8, wiegand);
-	num_to_bytebits(cardno, 16, wiegand+8);
-	wiegand_add_parity(out,  wiegand, sizeof(wiegand) );
+    uint8_t wiegand[24];
+    num_to_bytebits(fc, 8, wiegand);
+    num_to_bytebits(cardno, 16, wiegand+8);
+    wiegand_add_parity(out,  wiegand, sizeof(wiegand) );
 }
 // static void calc33(uint16_t fc, uint32_t cardno,  uint8_t *out){
 // }
 static void calc34(uint16_t fc, uint32_t cardno, uint8_t *out){
-	uint8_t wiegand[32];
-	num_to_bytebits(fc, 16, wiegand);
-	num_to_bytebits(cardno, 16, wiegand + 16);
-  	wiegand_add_parity(out,  wiegand, sizeof(wiegand) );
+    uint8_t wiegand[32];
+    num_to_bytebits(fc, 16, wiegand);
+    num_to_bytebits(cardno, 16, wiegand + 16);
+    wiegand_add_parity(out,  wiegand, sizeof(wiegand) );
 }
 // static void calc35(uint16_t fc, uint32_t cardno,  uint8_t *out){
-	// *lo = ((cardno & 0xFFFFF) << 1) | fc << 21;
-	// *hi = (1 << 5) | ((fc >> 11) & 1);
+    // *lo = ((cardno & 0xFFFFF) << 1) | fc << 21;
+    // *hi = (1 << 5) | ((fc >> 11) & 1);
 // }
 static void calc37S(uint16_t fc, uint32_t cardno, uint8_t *out){
-	// FC 2 - 17   - 16 bit
-	// cardno 18 - 36  - 19 bit
-	// Even P1   1 - 19
-	// Odd  P37  19 - 36
-	uint8_t wiegand[35];
-	num_to_bytebits(fc, 16, wiegand);
-	num_to_bytebits(cardno, 19, wiegand + 16);
-  	wiegand_add_parity(out,  wiegand, sizeof(wiegand) );
+    // FC 2 - 17   - 16 bit
+    // cardno 18 - 36  - 19 bit
+    // Even P1   1 - 19
+    // Odd  P37  19 - 36
+    uint8_t wiegand[35];
+    num_to_bytebits(fc, 16, wiegand);
+    num_to_bytebits(cardno, 19, wiegand + 16);
+    wiegand_add_parity(out,  wiegand, sizeof(wiegand) );
 }
 static void calc37H(uint64_t cardno, uint8_t *out){
-	// SC NONE
-	// cardno 1-35 34 bits
-	// Even Parity  0th bit  1-18
-	// Odd  Parity 36th bit 19-35
-	uint8_t wiegand[37];
-	num_to_bytebits( (uint32_t)(cardno >> 32), 2, wiegand);
-	num_to_bytebits( (uint32_t)(cardno >> 0), 32, wiegand + 2);
-  	wiegand_add_parity(out,  wiegand, sizeof(wiegand) );
+    // SC NONE
+    // cardno 1-35 34 bits
+    // Even Parity  0th bit  1-18
+    // Odd  Parity 36th bit 19-35
+    uint8_t wiegand[37];
+    num_to_bytebits( (uint32_t)(cardno >> 32), 2, wiegand);
+    num_to_bytebits( (uint32_t)(cardno >> 0), 32, wiegand + 2);
+    wiegand_add_parity(out,  wiegand, sizeof(wiegand) );
 
-	PrintAndLogEx(NORMAL, "%x %x\n", (uint32_t)(cardno >> 32), (uint32_t)cardno );
+    PrintAndLogEx(NORMAL, "%x %x\n", (uint32_t)(cardno >> 32), (uint32_t)cardno );
 }
 // static void calc40(uint64_t cardno,  uint8_t *out){
-	// cardno = (cardno & 0xFFFFFFFFFF);
-	// *lo = ((cardno & 0xFFFFFFFF) << 1 );
-	// *hi = (cardno >> 31);
+    // cardno = (cardno & 0xFFFFFFFFFF);
+    // *lo = ((cardno & 0xFFFFFFFF) << 1 );
+    // *hi = (cardno >> 31);
 // }
 
 void calcWiegand(uint8_t fmtlen, uint16_t fc, uint64_t cardno, uint8_t *bits){
-	 uint32_t cn32 = (cardno & 0xFFFFFFFF);
-	 switch ( fmtlen ) {
-		case 26: calc26(fc, cn32, bits); break;
-		// case 33 : calc33(fc, cn32, bits); break;
-		case 34: calc34(fc, cn32, bits); break;
-		// case 35 : calc35(fc, cn32, bits); break;
-		case 37: calc37S(fc, cn32, bits); break;
-		case 38: calc37H(cardno, bits); break;
-		// case 40 : calc40(cardno, bits);	break;
-		// case 44 : { break; }
-		// case 84 : { break; }
-		default: break;
-	}
+     uint32_t cn32 = (cardno & 0xFFFFFFFF);
+     switch ( fmtlen ) {
+        case 26: calc26(fc, cn32, bits); break;
+        // case 33 : calc33(fc, cn32, bits); break;
+        case 34: calc34(fc, cn32, bits); break;
+        // case 35 : calc35(fc, cn32, bits); break;
+        case 37: calc37S(fc, cn32, bits); break;
+        case 38: calc37H(cardno, bits); break;
+        // case 40 : calc40(cardno, bits); break;
+        // case 44 : { break; }
+        // case 84 : { break; }
+        default: break;
+    }
 }
 
 int CmdHIDWiegand(const char *Cmd) {
-	uint32_t oem = 0, fc = 0;
-	uint64_t cardnum = 0;
-	uint64_t blocks = 0, wiegand = 0;
+    uint32_t oem = 0, fc = 0;
+    uint64_t cardnum = 0;
+    uint64_t blocks = 0, wiegand = 0;
 
-	uint8_t bits[BITS];
-	uint8_t *bs = bits;
-	memset(bs, 0, sizeof(bits));
+    uint8_t bits[BITS];
+    uint8_t *bs = bits;
+    memset(bs, 0, sizeof(bits));
 
-	uint8_t ctmp = param_getchar(Cmd, 0);
-	if ( strlen(Cmd) == 0 || strlen(Cmd) < 3 || ctmp == 'H' || ctmp == 'h' ) return usage_lf_hid_wiegand();
+    uint8_t ctmp = param_getchar(Cmd, 0);
+    if ( strlen(Cmd) == 0 || strlen(Cmd) < 3 || ctmp == 'H' || ctmp == 'h' ) return usage_lf_hid_wiegand();
 
-	oem = param_get8(Cmd, 0);
-	fc = param_get32ex(Cmd, 1, 0, 10);
-	cardnum = param_get64ex(Cmd, 2, 0, 10);
+    oem = param_get8(Cmd, 0);
+    fc = param_get32ex(Cmd, 1, 0, 10);
+    cardnum = param_get64ex(Cmd, 2, 0, 10);
 
-	uint8_t fmtlen[] = {26,33,34,35,37,38,40};
+    uint8_t fmtlen[] = {26,33,34,35,37,38,40};
 
-	PrintAndLogEx(NORMAL, "HID | OEM | FC   | CN      |  Wiegand  |  HID Formatted");
-	PrintAndLogEx(NORMAL, "----+-----+------+---------+-----------+--------------------");
-	for (uint8_t i = 0; i < sizeof(fmtlen); i++){
-		memset(bits, 0x00, sizeof(bits));
-		calcWiegand( fmtlen[i], fc, cardnum, bs);
-		PrintAndLogEx(NORMAL, "ice:: %s \n", sprint_bin(bs, fmtlen[i]));
-		wiegand = (uint64_t)bytebits_to_byte(bs, 32) << 32 | bytebits_to_byte(bs+32, 32);
+    PrintAndLogEx(NORMAL, "HID | OEM | FC   | CN      |  Wiegand  |  HID Formatted");
+    PrintAndLogEx(NORMAL, "----+-----+------+---------+-----------+--------------------");
+    for (uint8_t i = 0; i < sizeof(fmtlen); i++){
+        memset(bits, 0x00, sizeof(bits));
+        calcWiegand( fmtlen[i], fc, cardnum, bs);
+        PrintAndLogEx(NORMAL, "ice:: %s \n", sprint_bin(bs, fmtlen[i]));
+        wiegand = (uint64_t)bytebits_to_byte(bs, 32) << 32 | bytebits_to_byte(bs+32, 32);
 
-		addHIDMarker(fmtlen[i], bs);
-		PrintAndLogEx(NORMAL, "ice:: %s\n", sprint_bin(bs, BITS));
-		blocks = (uint64_t)bytebits_to_byte(bs+32, 32) << 32 | bytebits_to_byte(bs+64, 32);
-		uint8_t shifts = 64-fmtlen[i];
-		wiegand >>= shifts;
+        addHIDMarker(fmtlen[i], bs);
+        PrintAndLogEx(NORMAL, "ice:: %s\n", sprint_bin(bs, BITS));
+        blocks = (uint64_t)bytebits_to_byte(bs+32, 32) << 32 | bytebits_to_byte(bs+64, 32);
+        uint8_t shifts = 64-fmtlen[i];
+        wiegand >>= shifts;
 
-		PrintAndLogEx(NORMAL, " %u | %03u | %03u  | %" PRIu64 "  | %" PRIX64 "  |  %" PRIX64 ,
-			fmtlen[i],
-			oem,
-			fc,
-			cardnum,
-			wiegand,
-			blocks
-			);
-	}
-	PrintAndLogEx(NORMAL, "----+-----+-----+-------+-----------+--------------------");
-	return 0;
+        PrintAndLogEx(NORMAL, " %u | %03u | %03u  | %" PRIu64 "  | %" PRIX64 "  |  %" PRIX64 ,
+            fmtlen[i],
+            oem,
+            fc,
+            cardnum,
+            wiegand,
+            blocks
+            );
+    }
+    PrintAndLogEx(NORMAL, "----+-----+-----+-------+-----------+--------------------");
+    return 0;
 }
 
 int CmdHIDBrute(const char *Cmd){
 
-	bool errors = false, verbose = false;
-	uint32_t fc = 0, cn = 0, delay = 1000;
-	uint8_t fmtlen = 0;
-	uint8_t bits[96];
-	memset(bits, 0, sizeof(bits));
-	uint8_t cmdp = 0;
+    bool errors = false, verbose = false;
+    uint32_t fc = 0, cn = 0, delay = 1000;
+    uint8_t fmtlen = 0;
+    uint8_t bits[96];
+    memset(bits, 0, sizeof(bits));
+    uint8_t cmdp = 0;
 
-	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch (tolower(param_getchar(Cmd, cmdp))) {
-		case 'h':
-			return usage_lf_hid_brute();
-		case 'f':
-		  	fc =  param_get32ex(Cmd ,cmdp+1, 0, 10);
-			if ( !fc )
-				errors = true;
-			cmdp += 2;
-			break;
-		case 'd':
-			// delay between attemps,  defaults to 1000ms.
-			delay = param_get32ex(Cmd, cmdp+1, 1000, 10);
-			cmdp += 2;
-			break;
-		case 'c':
-			cn = param_get32ex(Cmd, cmdp+1, 0, 10);
-			// truncate cardnumber.
-			cn &= 0xFFFF;
-			cmdp += 2;
-			break;
-		case 'a':
-			fmtlen = param_get8(Cmd, cmdp+1);
-			cmdp += 2;
-			bool is_ftm_ok = false;
-			uint8_t ftms[] = {26, 33, 34, 35, 37};
-			for ( uint8_t i = 0; i < sizeof(ftms); i++){
-				if ( ftms[i] == fmtlen ) {
-					is_ftm_ok = true;
-				}
-			}
-			// negated
-			errors = !is_ftm_ok;
-			break;
-		case 'v':
-			verbose = true;
-			cmdp++;
-			break;
-		default:
-			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-			errors = true;
-			break;
-		}
-	}
-	if ( fc == 0 ) errors = true;
-	if ( errors ) return usage_lf_hid_brute();
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+        case 'h':
+            return usage_lf_hid_brute();
+        case 'f':
+            fc =  param_get32ex(Cmd ,cmdp+1, 0, 10);
+            if ( !fc )
+                errors = true;
+            cmdp += 2;
+            break;
+        case 'd':
+            // delay between attemps,  defaults to 1000ms.
+            delay = param_get32ex(Cmd, cmdp+1, 1000, 10);
+            cmdp += 2;
+            break;
+        case 'c':
+            cn = param_get32ex(Cmd, cmdp+1, 0, 10);
+            // truncate cardnumber.
+            cn &= 0xFFFF;
+            cmdp += 2;
+            break;
+        case 'a':
+            fmtlen = param_get8(Cmd, cmdp+1);
+            cmdp += 2;
+            bool is_ftm_ok = false;
+            uint8_t ftms[] = {26, 33, 34, 35, 37};
+            for ( uint8_t i = 0; i < sizeof(ftms); i++){
+                if ( ftms[i] == fmtlen ) {
+                    is_ftm_ok = true;
+                }
+            }
+            // negated
+            errors = !is_ftm_ok;
+            break;
+        case 'v':
+            verbose = true;
+            cmdp++;
+            break;
+        default:
+            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+            errors = true;
+            break;
+        }
+    }
+    if ( fc == 0 ) errors = true;
+    if ( errors ) return usage_lf_hid_brute();
 
-	PrintAndLogEx(INFO, "Brute-forcing HID reader");
-	PrintAndLogEx(INFO, "Press pm3-button to abort simulation or run another command");
+    PrintAndLogEx(INFO, "Brute-forcing HID reader");
+    PrintAndLogEx(INFO, "Press pm3-button to abort simulation or run another command");
 
-	uint16_t up = cn;
-	uint16_t down = cn;
+    uint16_t up = cn;
+    uint16_t down = cn;
 
-	// main loop
-	for (;;){
+    // main loop
+    for (;;){
 
-		if ( IsOffline() ) {
-			PrintAndLogEx(WARNING, "Device offline\n");
-			return  2;
-		}
+        if ( IsOffline() ) {
+            PrintAndLogEx(WARNING, "Device offline\n");
+            return  2;
+        }
 
-		if (ukbhit()) {
-			int gc = getchar(); (void)gc;
-			PrintAndLogEx(INFO, "aborted via keyboard!");
-			return sendPing();
-		}
+        if (ukbhit()) {
+            int gc = getchar(); (void)gc;
+            PrintAndLogEx(INFO, "aborted via keyboard!");
+            return sendPing();
+        }
 
-		// Do one up
-		if ( up < 0xFFFF )
-			if ( !sendTry(fmtlen, fc, up++, delay, bits, verbose)) return 1;
+        // Do one up
+        if ( up < 0xFFFF )
+            if ( !sendTry(fmtlen, fc, up++, delay, bits, verbose)) return 1;
 
-		// Do one down  (if cardnumber is given)
-		if ( cn > 1 )
-			if ( down > 1 )
-				if ( !sendTry(fmtlen, fc, --down, delay, bits, verbose)) return 1;
-	}
-	return 0;
+        // Do one down  (if cardnumber is given)
+        if ( cn > 1 )
+            if ( down > 1 )
+                if ( !sendTry(fmtlen, fc, --down, delay, bits, verbose)) return 1;
+    }
+    return 0;
 }
 
 static command_t CommandTable[] = {
-	{"help",	CmdHelp,        1, "this help"},
-	{"demod",	CmdHIDDemod,	0, "demodulate HID Prox tag from the GraphBuffer"},
-	{"read",	CmdHIDRead,		0, "attempt to read and extract tag data"},
-	{"clone",	CmdHIDClone,	0, "clone HID to T55x7"},
-	{"sim",		CmdHIDSim,		0, "simulate HID tag"},
-	{"wiegand",	CmdHIDWiegand,	1, "convert facility code/card number to Wiegand code"},
-	{"brute",	CmdHIDBrute,	0, "bruteforce card number against reader"},
-	{NULL, NULL, 0, NULL}
+    {"help",    CmdHelp,        1, "this help"},
+    {"demod",   CmdHIDDemod,    0, "demodulate HID Prox tag from the GraphBuffer"},
+    {"read",    CmdHIDRead,     0, "attempt to read and extract tag data"},
+    {"clone",   CmdHIDClone,    0, "clone HID to T55x7"},
+    {"sim",     CmdHIDSim,      0, "simulate HID tag"},
+    {"wiegand", CmdHIDWiegand,  1, "convert facility code/card number to Wiegand code"},
+    {"brute",   CmdHIDBrute,    0, "bruteforce card number against reader"},
+    {NULL, NULL, 0, NULL}
 };
 
 int CmdLFHID(const char *Cmd) {
-	clearCommandBuffer();
-	CmdsParse(CommandTable, Cmd);
-	return 0;
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
+    return 0;
 }
 
 int CmdHelp(const char *Cmd) {
-	CmdsHelp(CommandTable);
-	return 0;
+    CmdsHelp(CommandTable);
+    return 0;
 }
diff --git a/client/cmdlfhid.h b/client/cmdlfhid.h
index 895117960..48d6f63a2 100644
--- a/client/cmdlfhid.h
+++ b/client/cmdlfhid.h
@@ -17,9 +17,9 @@
 #include "ui.h"
 #include "graph.h"
 #include "cmdparser.h"
-#include "util.h"		// wiegand_add_parity etc
+#include "util.h"     // wiegand_add_parity etc
 #include "cmddata.h"  //for g_debugMode, demodbuff cmds
-#include "cmdlf.h"	  // lf_read
+#include "cmdlf.h"    // lf_read
 #include "cmdmain.h"
 #include "util_posix.h"
 #include "lfdemod.h"
diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index 45aeea317..6d355fc58 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -26,400 +26,400 @@
 static int CmdHelp(const char *Cmd);
 
 size_t nbytes(size_t nbits) {
-	return (nbits/8) + ((nbits%8) > 0);
+    return (nbits/8) + ((nbits%8) > 0);
 }
 
 int CmdLFHitagList(const char *Cmd) {
- 	uint8_t *got = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
-	if ( !got ) {
-		PrintAndLogEx(WARNING, "Cannot allocate memory for trace");
-		return 2;
-	}
+    uint8_t *got = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
+    if ( !got ) {
+        PrintAndLogEx(WARNING, "Cannot allocate memory for trace");
+        return 2;
+    }
 
-	// Query for the actual size of the trace
-	UsbCommand response;
-	if ( !GetFromDevice(BIG_BUF, got, USB_CMD_DATA_SIZE, 0, &response, 2500, false) ) {
-		PrintAndLogEx(WARNING, "command execution time out");
-		free(got);
-		return 2;
-	}
+    // Query for the actual size of the trace
+    UsbCommand response;
+    if ( !GetFromDevice(BIG_BUF, got, USB_CMD_DATA_SIZE, 0, &response, 2500, false) ) {
+        PrintAndLogEx(WARNING, "command execution time out");
+        free(got);
+        return 2;
+    }
 
-	uint16_t traceLen = response.arg[2];
-	if (traceLen > USB_CMD_DATA_SIZE) {
-		uint8_t *p = realloc(got, traceLen);
-		if (p == NULL) {
-			PrintAndLogEx(WARNING, "Cannot allocate memory for trace");
-			free(got);
-			return 2;
-		}
-		got = p;
-		if ( !GetFromDevice(BIG_BUF, got, traceLen, 0, NULL, 2500, false) ) {
-			PrintAndLogEx(WARNING, "command execution time out");
-			free(got);
-			return 2;
-		}
-	}
+    uint16_t traceLen = response.arg[2];
+    if (traceLen > USB_CMD_DATA_SIZE) {
+        uint8_t *p = realloc(got, traceLen);
+        if (p == NULL) {
+            PrintAndLogEx(WARNING, "Cannot allocate memory for trace");
+            free(got);
+            return 2;
+        }
+        got = p;
+        if ( !GetFromDevice(BIG_BUF, got, traceLen, 0, NULL, 2500, false) ) {
+            PrintAndLogEx(WARNING, "command execution time out");
+            free(got);
+            return 2;
+        }
+    }
 
-	PrintAndLogEx(NORMAL, "recorded activity (TraceLen = %d bytes):");
-	PrintAndLogEx(NORMAL, " ETU     :nbits: who bytes");
-	PrintAndLogEx(NORMAL, "---------+-----+----+-----------");
+    PrintAndLogEx(NORMAL, "recorded activity (TraceLen = %d bytes):");
+    PrintAndLogEx(NORMAL, " ETU     :nbits: who bytes");
+    PrintAndLogEx(NORMAL, "---------+-----+----+-----------");
 
-	int i = 0;
-	int prev = -1;
-	int len = strlen(Cmd);
+    int i = 0;
+    int prev = -1;
+    int len = strlen(Cmd);
 
-	char filename[FILE_PATH_SIZE]  = { 0x00 };
-	FILE* f = NULL;
+    char filename[FILE_PATH_SIZE]  = { 0x00 };
+    FILE* f = NULL;
 
-	if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
+    if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
 
-	memcpy(filename, Cmd, len);
+    memcpy(filename, Cmd, len);
 
-	if (strlen(filename) > 0) {
-		f = fopen(filename,"wb");
-		if (!f) {
-			PrintAndLogEx(WARNING, "Error: Could not open file [%s]",filename);
-			return 1;
-		}
-	}
+    if (strlen(filename) > 0) {
+        f = fopen(filename,"wb");
+        if (!f) {
+            PrintAndLogEx(WARNING, "Error: Could not open file [%s]",filename);
+            return 1;
+        }
+    }
 
-	for (;;) {
+    for (;;) {
 
-		if(i >= traceLen) { break; }
+        if(i >= traceLen) { break; }
 
-		bool isResponse;
-		int timestamp = *((uint32_t *)(got+i));
-		if (timestamp & 0x80000000) {
-			timestamp &= 0x7fffffff;
-			isResponse = 1;
-		} else {
-			isResponse = 0;
-		}
+        bool isResponse;
+        int timestamp = *((uint32_t *)(got+i));
+        if (timestamp & 0x80000000) {
+            timestamp &= 0x7fffffff;
+            isResponse = 1;
+        } else {
+            isResponse = 0;
+        }
 
-		int parityBits = *((uint32_t *)(got+i+4));
-		// 4 bytes of additional information...
-		// maximum of 32 additional parity bit information
-		//
-		// TODO:
-		// at each quarter bit period we can send power level (16 levels)
-		// or each half bit period in 256 levels.
+        int parityBits = *((uint32_t *)(got+i+4));
+        // 4 bytes of additional information...
+        // maximum of 32 additional parity bit information
+        //
+        // TODO:
+        // at each quarter bit period we can send power level (16 levels)
+        // or each half bit period in 256 levels.
 
-		int bits = got[i+8];
-		int len = nbytes(got[i+8]);
+        int bits = got[i+8];
+        int len = nbytes(got[i+8]);
 
-		if (len > 100) {
-		  break;
-		}
-		if (i + len > traceLen) { break;}
+        if (len > 100) {
+          break;
+        }
+        if (i + len > traceLen) { break;}
 
-		uint8_t *frame = (got+i+9);
+        uint8_t *frame = (got+i+9);
 
-		// Break and stick with current result if buffer was not completely full
-		if (frame[0] == 0x44 && frame[1] == 0x44 && frame[3] == 0x44) { break; }
+        // Break and stick with current result if buffer was not completely full
+        if (frame[0] == 0x44 && frame[1] == 0x44 && frame[3] == 0x44) { break; }
 
-		char line[1000] = "";
-		int j;
-		for (j = 0; j < len; j++) {
+        char line[1000] = "";
+        int j;
+        for (j = 0; j < len; j++) {
 
-		  //if((parityBits >> (len - j - 1)) & 0x01) {
-		  if (isResponse && (oddparity8(frame[j]) != ((parityBits >> (len - j - 1)) & 0x01))) {
-			sprintf(line+(j*4), "%02x!  ", frame[j]);
-		  }
-		  else {
-			sprintf(line+(j*4), "%02x   ", frame[j]);
-		  }
-		}
+          //if((parityBits >> (len - j - 1)) & 0x01) {
+          if (isResponse && (oddparity8(frame[j]) != ((parityBits >> (len - j - 1)) & 0x01))) {
+            sprintf(line+(j*4), "%02x!  ", frame[j]);
+          }
+          else {
+            sprintf(line+(j*4), "%02x   ", frame[j]);
+          }
+        }
 
-		PrintAndLogEx(NORMAL, " +%7d:  %3d: %s %s",
-			(prev < 0 ? 0 : (timestamp - prev)),
-			bits,
-			(isResponse ? "TAG" : "   "),
-			line);
+        PrintAndLogEx(NORMAL, " +%7d:  %3d: %s %s",
+            (prev < 0 ? 0 : (timestamp - prev)),
+            bits,
+            (isResponse ? "TAG" : "   "),
+            line);
 
-		if (f) {
-			fprintf(f," +%7d:  %3d: %s %s\n",
-				(prev < 0 ? 0 : (timestamp - prev)),
-				bits,
-				(isResponse ? "TAG" : "   "),
-				line);
-		}
+        if (f) {
+            fprintf(f," +%7d:  %3d: %s %s\n",
+                (prev < 0 ? 0 : (timestamp - prev)),
+                bits,
+                (isResponse ? "TAG" : "   "),
+                line);
+        }
 
-		prev = timestamp;
-		i += (len + 9);
-	}
+        prev = timestamp;
+        i += (len + 9);
+    }
 
-	if (f) {
-		fclose(f);
-		PrintAndLogEx(NORMAL, "Recorded activity succesfully written to file: %s", filename);
-	}
+    if (f) {
+        fclose(f);
+        PrintAndLogEx(NORMAL, "Recorded activity succesfully written to file: %s", filename);
+    }
 
-	free(got);
-	return 0;
+    free(got);
+    return 0;
 }
 
 int CmdLFHitagSnoop(const char *Cmd) {
-	UsbCommand c = {CMD_SNOOP_HITAG};
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+    UsbCommand c = {CMD_SNOOP_HITAG};
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 
 int CmdLFHitagSim(const char *Cmd) {
 
-	UsbCommand c = {CMD_SIMULATE_HITAG};
-	char filename[FILE_PATH_SIZE] = { 0x00 };
-	FILE* f;
-	bool tag_mem_supplied;
+    UsbCommand c = {CMD_SIMULATE_HITAG};
+    char filename[FILE_PATH_SIZE] = { 0x00 };
+    FILE* f;
+    bool tag_mem_supplied;
 
-	int len = strlen(Cmd);
-	if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
-	memcpy(filename, Cmd, len);
+    int len = strlen(Cmd);
+    if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
+    memcpy(filename, Cmd, len);
 
-	if (strlen(filename) > 0) {
-		f = fopen(filename,"rb+");
-		if (!f) {
-			PrintAndLogEx(WARNING, "Error: Could not open file [%s]",filename);
-			return 1;
-		}
-		tag_mem_supplied = true;
-		size_t bytes_read = fread(c.d.asBytes, 1, 48, f);
-		if ( bytes_read == 48) {
-			PrintAndLogEx(WARNING, "Error: File reading error");
-			fclose(f);
-			return 1;
-		}
-		fclose(f);
-	} else {
-		tag_mem_supplied = false;
-	}
+    if (strlen(filename) > 0) {
+        f = fopen(filename,"rb+");
+        if (!f) {
+            PrintAndLogEx(WARNING, "Error: Could not open file [%s]",filename);
+            return 1;
+        }
+        tag_mem_supplied = true;
+        size_t bytes_read = fread(c.d.asBytes, 1, 48, f);
+        if ( bytes_read == 48) {
+            PrintAndLogEx(WARNING, "Error: File reading error");
+            fclose(f);
+            return 1;
+        }
+        fclose(f);
+    } else {
+        tag_mem_supplied = false;
+    }
 
-	// Does the tag comes with memory
-	c.arg[0] = (uint32_t)tag_mem_supplied;
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+    // Does the tag comes with memory
+    c.arg[0] = (uint32_t)tag_mem_supplied;
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 
 int CmdLFHitagReader(const char *Cmd) {
 
-	UsbCommand c = {CMD_READER_HITAG, {0,0,0} };//, {param_get32ex(Cmd,0,0,10),param_get32ex(Cmd,1,0,16),param_get32ex(Cmd,2,0,16),param_get32ex(Cmd,3,0,16)}};
-	hitag_data* htd = (hitag_data*)c.d.asBytes;
-	hitag_function htf = param_get32ex(Cmd, 0, 0, 10);
+    UsbCommand c = {CMD_READER_HITAG, {0,0,0} };//, {param_get32ex(Cmd,0,0,10),param_get32ex(Cmd,1,0,16),param_get32ex(Cmd,2,0,16),param_get32ex(Cmd,3,0,16)}};
+    hitag_data* htd = (hitag_data*)c.d.asBytes;
+    hitag_function htf = param_get32ex(Cmd, 0, 0, 10);
 
-	switch (htf) {
-		case 01: { //RHTSF_CHALLENGE
-			c.cmd = CMD_READ_HITAG_S;
-			num_to_bytes(param_get32ex(Cmd, 1, 0, 16), 4, htd->auth.NrAr);
-			num_to_bytes(param_get32ex(Cmd, 2, 0, 16), 4, htd->auth.NrAr+4);
-		} break;
-		case 02: { //RHTSF_KEY
-			c.cmd = CMD_READ_HITAG_S;
-			num_to_bytes(param_get64ex(Cmd, 1, 0, 16), 6, htd->crypto.key);
-		} break;
-		case RHT2F_PASSWORD: {
-			num_to_bytes(param_get32ex(Cmd, 1, 0, 16), 4, htd->pwd.password);
-		} break;
-		case RHT2F_AUTHENTICATE: {
-			num_to_bytes(param_get32ex(Cmd, 1, 0, 16), 4, htd->auth.NrAr);
-			num_to_bytes(param_get32ex(Cmd, 2, 0, 16), 4, htd->auth.NrAr+4);
-		} break;
-		case RHT2F_CRYPTO: {
-			num_to_bytes(param_get64ex(Cmd, 1, 0, 16), 6, htd->crypto.key);
-		} break;
-		case RHT2F_TEST_AUTH_ATTEMPTS: {
-			// No additional parameters needed
-		} break;
-		case RHT2F_UID_ONLY: {
-			// No additional parameters needed
-		} break;
-		default: {
-			PrintAndLogEx(NORMAL, "\nError: unkown reader function %d", htf);
-			PrintAndLogEx(NORMAL, "");
-			PrintAndLogEx(NORMAL, "Usage: hitag reader <Reader Function #>");
-			PrintAndLogEx(NORMAL, "Reader Functions:");
-			PrintAndLogEx(NORMAL, " HitagS (0*)");
-			PrintAndLogEx(NORMAL, "  01 <nr> <ar> (Challenge) read all pages from a Hitag S tag");
-			PrintAndLogEx(NORMAL, "  02 <key> (set to 0 if no authentication is needed) read all pages from a Hitag S tag");
-			PrintAndLogEx(NORMAL, " Hitag1 (1*)");
-			PrintAndLogEx(NORMAL, " Hitag2 (2*)");
-			PrintAndLogEx(NORMAL, "  21 <password> (password mode)");
-			PrintAndLogEx(NORMAL, "  22 <nr> <ar> (authentication)");
-			PrintAndLogEx(NORMAL, "  23 <key> (authentication) key is in format: ISK high + ISK low");
-			PrintAndLogEx(NORMAL, "  25 (test recorded authentications)");
-			PrintAndLogEx(NORMAL, "  26 just read UID");
-			return 1;
-		} break;
-	}
+    switch (htf) {
+        case 01: { //RHTSF_CHALLENGE
+            c.cmd = CMD_READ_HITAG_S;
+            num_to_bytes(param_get32ex(Cmd, 1, 0, 16), 4, htd->auth.NrAr);
+            num_to_bytes(param_get32ex(Cmd, 2, 0, 16), 4, htd->auth.NrAr+4);
+        } break;
+        case 02: { //RHTSF_KEY
+            c.cmd = CMD_READ_HITAG_S;
+            num_to_bytes(param_get64ex(Cmd, 1, 0, 16), 6, htd->crypto.key);
+        } break;
+        case RHT2F_PASSWORD: {
+            num_to_bytes(param_get32ex(Cmd, 1, 0, 16), 4, htd->pwd.password);
+        } break;
+        case RHT2F_AUTHENTICATE: {
+            num_to_bytes(param_get32ex(Cmd, 1, 0, 16), 4, htd->auth.NrAr);
+            num_to_bytes(param_get32ex(Cmd, 2, 0, 16), 4, htd->auth.NrAr+4);
+        } break;
+        case RHT2F_CRYPTO: {
+            num_to_bytes(param_get64ex(Cmd, 1, 0, 16), 6, htd->crypto.key);
+        } break;
+        case RHT2F_TEST_AUTH_ATTEMPTS: {
+            // No additional parameters needed
+        } break;
+        case RHT2F_UID_ONLY: {
+            // No additional parameters needed
+        } break;
+        default: {
+            PrintAndLogEx(NORMAL, "\nError: unkown reader function %d", htf);
+            PrintAndLogEx(NORMAL, "");
+            PrintAndLogEx(NORMAL, "Usage: hitag reader <Reader Function #>");
+            PrintAndLogEx(NORMAL, "Reader Functions:");
+            PrintAndLogEx(NORMAL, " HitagS (0*)");
+            PrintAndLogEx(NORMAL, "  01 <nr> <ar> (Challenge) read all pages from a Hitag S tag");
+            PrintAndLogEx(NORMAL, "  02 <key> (set to 0 if no authentication is needed) read all pages from a Hitag S tag");
+            PrintAndLogEx(NORMAL, " Hitag1 (1*)");
+            PrintAndLogEx(NORMAL, " Hitag2 (2*)");
+            PrintAndLogEx(NORMAL, "  21 <password> (password mode)");
+            PrintAndLogEx(NORMAL, "  22 <nr> <ar> (authentication)");
+            PrintAndLogEx(NORMAL, "  23 <key> (authentication) key is in format: ISK high + ISK low");
+            PrintAndLogEx(NORMAL, "  25 (test recorded authentications)");
+            PrintAndLogEx(NORMAL, "  26 just read UID");
+            return 1;
+        } break;
+    }
 
-	// Copy the hitag2 function into the first argument
-	c.arg[0] = htf;
-	clearCommandBuffer();
-	SendCommand(&c);
-	UsbCommand resp;
-	if ( !WaitForResponseTimeout(CMD_ACK, &resp, 4000) ) {
-		PrintAndLogEx(WARNING, "timeout while waiting for reply.");
-		return 1;
-	}
+    // Copy the hitag2 function into the first argument
+    c.arg[0] = htf;
+    clearCommandBuffer();
+    SendCommand(&c);
+    UsbCommand resp;
+    if ( !WaitForResponseTimeout(CMD_ACK, &resp, 4000) ) {
+        PrintAndLogEx(WARNING, "timeout while waiting for reply.");
+        return 1;
+    }
 
-	// Check the return status, stored in the first argument
-	if (resp.arg[0] == false) {
-		PrintAndLogEx(DEBUG, "DEBUG: Error - hitag failed");
-		return 1;
-	}
+    // Check the return status, stored in the first argument
+    if (resp.arg[0] == false) {
+        PrintAndLogEx(DEBUG, "DEBUG: Error - hitag failed");
+        return 1;
+    }
 
-	uint32_t id = bytes_to_num(resp.d.asBytes, 4);
+    uint32_t id = bytes_to_num(resp.d.asBytes, 4);
 
-	if (htf == RHT2F_UID_ONLY){
-		PrintAndLogEx(NORMAL, "Valid Hitag2 tag found - UID: %08x", id);
-	} else {
-		char filename[FILE_PATH_SIZE];
-		FILE* f = NULL;
-		sprintf(filename, "%08x_%04x.ht2", id, (rand() & 0xffff));
-		f = fopen(filename, "wb");
-		if (!f) {
-			PrintAndLogEx(WARNING, "Error: Could not open file [%s]", filename);
-			return 1;
-		}
+    if (htf == RHT2F_UID_ONLY){
+        PrintAndLogEx(NORMAL, "Valid Hitag2 tag found - UID: %08x", id);
+    } else {
+        char filename[FILE_PATH_SIZE];
+        FILE* f = NULL;
+        sprintf(filename, "%08x_%04x.ht2", id, (rand() & 0xffff));
+        f = fopen(filename, "wb");
+        if (!f) {
+            PrintAndLogEx(WARNING, "Error: Could not open file [%s]", filename);
+            return 1;
+        }
 
-		// Write the 48 tag memory bytes to file and finalize
-		fwrite(resp.d.asBytes, 1, 48, f);
-		fclose(f);
-		PrintAndLogEx(NORMAL, "Succesfully saved tag memory to [%s]", filename);
-	}
-	return 0;
+        // Write the 48 tag memory bytes to file and finalize
+        fwrite(resp.d.asBytes, 1, 48, f);
+        fclose(f);
+        PrintAndLogEx(NORMAL, "Succesfully saved tag memory to [%s]", filename);
+    }
+    return 0;
 }
 
 int CmdLFHitagSimS(const char *Cmd) {
-	UsbCommand c = { CMD_SIMULATE_HITAG_S };
-	char filename[FILE_PATH_SIZE] = { 0x00 };
-	FILE* f;
-	bool tag_mem_supplied;
-	int len = strlen(Cmd);
-	if (len > FILE_PATH_SIZE)
-		len = FILE_PATH_SIZE;
-	memcpy(filename, Cmd, len);
+    UsbCommand c = { CMD_SIMULATE_HITAG_S };
+    char filename[FILE_PATH_SIZE] = { 0x00 };
+    FILE* f;
+    bool tag_mem_supplied;
+    int len = strlen(Cmd);
+    if (len > FILE_PATH_SIZE)
+        len = FILE_PATH_SIZE;
+    memcpy(filename, Cmd, len);
 
-	if (strlen(filename) > 0) {
-		f = fopen(filename, "rb+");
-		if (!f) {
-			PrintAndLogEx(WARNING, "Error: Could not open file [%s]", filename);
-			return 1;
-		}
-		tag_mem_supplied = true;
-		size_t bytes_read = fread(c.d.asBytes, 1, 4*64, f);
-		if ( bytes_read == 4*64) {
-			PrintAndLogEx(WARNING, "Error: File reading error");
-			fclose(f);
-			return 1;
-		}
-		fclose(f);
-	} else {
-		tag_mem_supplied = false;
-	}
+    if (strlen(filename) > 0) {
+        f = fopen(filename, "rb+");
+        if (!f) {
+            PrintAndLogEx(WARNING, "Error: Could not open file [%s]", filename);
+            return 1;
+        }
+        tag_mem_supplied = true;
+        size_t bytes_read = fread(c.d.asBytes, 1, 4*64, f);
+        if ( bytes_read == 4*64) {
+            PrintAndLogEx(WARNING, "Error: File reading error");
+            fclose(f);
+            return 1;
+        }
+        fclose(f);
+    } else {
+        tag_mem_supplied = false;
+    }
 
-	// Does the tag comes with memory
-	c.arg[0] = (uint32_t) tag_mem_supplied;
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+    // Does the tag comes with memory
+    c.arg[0] = (uint32_t) tag_mem_supplied;
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 
 int CmdLFHitagCheckChallenges(const char *Cmd) {
-	UsbCommand c = { CMD_TEST_HITAGS_TRACES };
-	char filename[FILE_PATH_SIZE] = { 0x00 };
-	FILE* f;
-	bool file_given;
-	int len = strlen(Cmd);
-	if (len > FILE_PATH_SIZE)
-		len = FILE_PATH_SIZE;
-	memcpy(filename, Cmd, len);
+    UsbCommand c = { CMD_TEST_HITAGS_TRACES };
+    char filename[FILE_PATH_SIZE] = { 0x00 };
+    FILE* f;
+    bool file_given;
+    int len = strlen(Cmd);
+    if (len > FILE_PATH_SIZE)
+        len = FILE_PATH_SIZE;
+    memcpy(filename, Cmd, len);
 
-	if (strlen(filename) > 0) {
-		f = fopen(filename,"rb+");
-		if ( !f ) {
-			PrintAndLogEx(WARNING, "Error: Could not open file [%s]", filename);
-			return 1;
-		}
-		file_given = true;
-		size_t bytes_read = fread(c.d.asBytes, 1, 8*60, f);
-		if ( bytes_read == 8*60) {
-			PrintAndLogEx(WARNING, "Error: File reading error");
-			fclose(f);
-			return 1;
+    if (strlen(filename) > 0) {
+        f = fopen(filename,"rb+");
+        if ( !f ) {
+            PrintAndLogEx(WARNING, "Error: Could not open file [%s]", filename);
+            return 1;
         }
-		fclose(f);
-	} else {
-		file_given = false;
-	}
+        file_given = true;
+        size_t bytes_read = fread(c.d.asBytes, 1, 8*60, f);
+        if ( bytes_read == 8*60) {
+            PrintAndLogEx(WARNING, "Error: File reading error");
+            fclose(f);
+            return 1;
+        }
+        fclose(f);
+    } else {
+        file_given = false;
+    }
 
-	//file with all the challenges to try
-	c.arg[0] = (uint32_t)file_given;
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+    //file with all the challenges to try
+    c.arg[0] = (uint32_t)file_given;
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 
 int CmdLFHitagWP(const char *Cmd) {
-	UsbCommand c = { CMD_WR_HITAG_S };
-	hitag_data* htd = (hitag_data*)c.d.asBytes;
-	hitag_function htf = param_get32ex(Cmd, 0, 0, 10);
-	switch (htf) {
-		case 03: { //WHTSF_CHALLENGE
-			num_to_bytes(param_get64ex(Cmd, 1, 0, 16), 8, htd->auth.NrAr);
-			c.arg[2]= param_get32ex(Cmd, 2, 0, 10);
-			num_to_bytes(param_get32ex(Cmd, 3, 0, 16), 4, htd->auth.data);
-		} break;
-		case 04:
-		case 24:
-		 { //WHTSF_KEY
-			num_to_bytes(param_get64ex(Cmd, 1, 0, 16), 6, htd->crypto.key);
-			c.arg[2]= param_get32ex(Cmd, 2, 0, 10);
-			num_to_bytes(param_get32ex(Cmd, 3, 0, 16), 4, htd->crypto.data);
+    UsbCommand c = { CMD_WR_HITAG_S };
+    hitag_data* htd = (hitag_data*)c.d.asBytes;
+    hitag_function htf = param_get32ex(Cmd, 0, 0, 10);
+    switch (htf) {
+        case 03: { //WHTSF_CHALLENGE
+            num_to_bytes(param_get64ex(Cmd, 1, 0, 16), 8, htd->auth.NrAr);
+            c.arg[2]= param_get32ex(Cmd, 2, 0, 10);
+            num_to_bytes(param_get32ex(Cmd, 3, 0, 16), 4, htd->auth.data);
+        } break;
+        case 04:
+        case 24:
+         { //WHTSF_KEY
+            num_to_bytes(param_get64ex(Cmd, 1, 0, 16), 6, htd->crypto.key);
+            c.arg[2]= param_get32ex(Cmd, 2, 0, 10);
+            num_to_bytes(param_get32ex(Cmd, 3, 0, 16), 4, htd->crypto.data);
 
-		} break;
-		default: {
-			PrintAndLogEx(WARNING, "Error: unkown writer function %d", htf);
-			PrintAndLogEx(NORMAL, "Hitag writer functions");
-			PrintAndLogEx(NORMAL, " HitagS (0*)");
-			PrintAndLogEx(NORMAL, "  03 <nr,ar> (Challenge) <page> <byte0...byte3> write page on a Hitag S tag");
-			PrintAndLogEx(NORMAL, "  04 <key> (set to 0 if no authentication is needed) <page> <byte0...byte3> write page on a Hitag S tag");
-			PrintAndLogEx(NORMAL, " Hitag1 (1*)");
-			PrintAndLogEx(NORMAL, " Hitag2 (2*)");
-			return 1;
-		} break;
-	}
-	// Copy the hitag function into the first argument
-	c.arg[0] = htf;
+        } break;
+        default: {
+            PrintAndLogEx(WARNING, "Error: unkown writer function %d", htf);
+            PrintAndLogEx(NORMAL, "Hitag writer functions");
+            PrintAndLogEx(NORMAL, " HitagS (0*)");
+            PrintAndLogEx(NORMAL, "  03 <nr,ar> (Challenge) <page> <byte0...byte3> write page on a Hitag S tag");
+            PrintAndLogEx(NORMAL, "  04 <key> (set to 0 if no authentication is needed) <page> <byte0...byte3> write page on a Hitag S tag");
+            PrintAndLogEx(NORMAL, " Hitag1 (1*)");
+            PrintAndLogEx(NORMAL, " Hitag2 (2*)");
+            return 1;
+        } break;
+    }
+    // Copy the hitag function into the first argument
+    c.arg[0] = htf;
 
-	clearCommandBuffer();
-	SendCommand(&c);
-	UsbCommand resp;
-	WaitForResponse(CMD_ACK, &resp);
+    clearCommandBuffer();
+    SendCommand(&c);
+    UsbCommand resp;
+    WaitForResponse(CMD_ACK, &resp);
 
-	// Check the return status, stored in the first argument
-	if (resp.arg[0] == false) return 1;
-	return 0;
+    // Check the return status, stored in the first argument
+    if (resp.arg[0] == false) return 1;
+    return 0;
 }
 
 static command_t CommandTable[] = {
-	{"help",	CmdHelp,           1, "This help"},
-	{"list",	CmdLFHitagList,    1, "<outfile> List Hitag trace history"},
-	{"reader",	CmdLFHitagReader,  1, "Act like a Hitag Reader"},
-	{"sim",		CmdLFHitagSim,     1, "<infile> Simulate Hitag transponder"},
-	{"simS",	CmdLFHitagSimS,    1, "<hitagS.hts> Simulate HitagS transponder" },
-	{"snoop",	CmdLFHitagSnoop,   1, "Eavesdrop Hitag communication"},
-	{"writer",	CmdLFHitagWP,      1, "Act like a Hitag Writer" },
-	{"check_challenges",	CmdLFHitagCheckChallenges,   1, "<challenges.cc> test all challenges" },
-	{ NULL,NULL, 0, NULL }
+    {"help",    CmdHelp,           1, "This help"},
+    {"list",    CmdLFHitagList,    1, "<outfile> List Hitag trace history"},
+    {"reader",  CmdLFHitagReader,  1, "Act like a Hitag Reader"},
+    {"sim",     CmdLFHitagSim,     1, "<infile> Simulate Hitag transponder"},
+    {"simS",    CmdLFHitagSimS,    1, "<hitagS.hts> Simulate HitagS transponder" },
+    {"snoop",   CmdLFHitagSnoop,   1, "Eavesdrop Hitag communication"},
+    {"writer",  CmdLFHitagWP,      1, "Act like a Hitag Writer" },
+    {"check_challenges", CmdLFHitagCheckChallenges,   1, "<challenges.cc> test all challenges" },
+    { NULL,NULL, 0, NULL }
 };
 
 int CmdLFHitag(const char *Cmd) {
-	clearCommandBuffer();
-	CmdsParse(CommandTable, Cmd);
-	return 0;
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
+    return 0;
 }
 
 int CmdHelp(const char *Cmd) {
-	CmdsHelp(CommandTable);
-	return 0;
+    CmdsHelp(CommandTable);
+    return 0;
 }
diff --git a/client/cmdlfindala.c b/client/cmdlfindala.c
index 17e3455d9..b926e133d 100644
--- a/client/cmdlfindala.c
+++ b/client/cmdlfindala.c
@@ -13,165 +13,165 @@
 static int CmdHelp(const char *Cmd);
 
 int usage_lf_indala_demod(void) {
-	PrintAndLogEx(NORMAL, "Enables Indala compatible reader mode printing details of scanned tags.");
-	PrintAndLogEx(NORMAL, "By default, values are printed and logged until the button is pressed or another USB command is issued.");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  lf indala demod [h]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h :  This help");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        lf indala demod");
-	return 0;
+    PrintAndLogEx(NORMAL, "Enables Indala compatible reader mode printing details of scanned tags.");
+    PrintAndLogEx(NORMAL, "By default, values are printed and logged until the button is pressed or another USB command is issued.");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  lf indala demod [h]");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "      h :  This help");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "        lf indala demod");
+    return 0;
 }
 
 int usage_lf_indala_sim(void) {
-	PrintAndLogEx(NORMAL, "Enables simulation of Indala card with specified uid.");
-	PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  lf indala sim [h] <uid>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "            h :  This help");
-	PrintAndLogEx(NORMAL, "        <uid> :  64/224 UID");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "       lf indala sim deadc0de");
-	return 0;
+    PrintAndLogEx(NORMAL, "Enables simulation of Indala card with specified uid.");
+    PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  lf indala sim [h] <uid>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "            h :  This help");
+    PrintAndLogEx(NORMAL, "        <uid> :  64/224 UID");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "       lf indala sim deadc0de");
+    return 0;
 }
 
 int usage_lf_indala_clone(void) {
-	PrintAndLogEx(NORMAL, "Enables cloning of Indala card with specified uid onto T55x7.");
-	PrintAndLogEx(NORMAL, "The T55x7 must be on the antenna when issuing this command.  T55x7 blocks are calculated and printed in the process.");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  lf indala clone [h] <uid> [Q5]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "            h :  This help");
-	PrintAndLogEx(NORMAL, "        <uid> :  64/224 UID");
-	PrintAndLogEx(NORMAL, "           Q5 :  optional - clone to Q5 (T5555) instead of T55x7 chip");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "       lf indala clone 112233");
-	return 0;
+    PrintAndLogEx(NORMAL, "Enables cloning of Indala card with specified uid onto T55x7.");
+    PrintAndLogEx(NORMAL, "The T55x7 must be on the antenna when issuing this command.  T55x7 blocks are calculated and printed in the process.");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  lf indala clone [h] <uid> [Q5]");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "            h :  This help");
+    PrintAndLogEx(NORMAL, "        <uid> :  64/224 UID");
+    PrintAndLogEx(NORMAL, "           Q5 :  optional - clone to Q5 (T5555) instead of T55x7 chip");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "       lf indala clone 112233");
+    return 0;
 }
 
 // redesigned by marshmellow adjusted from existing decode functions
 // indala id decoding
 int indala64decode(uint8_t *dest, size_t *size, uint8_t *invert) {
-	//standard 64 bit indala formats including 26 bit 40134 format
-	uint8_t   preamble64[] = {1,0,1,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 1};
-	uint8_t preamble64_i[] = {0,1,0,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 0};
-	size_t idx = 0;
-	size_t found_size = *size;
-	if (!preambleSearch(dest, preamble64, sizeof(preamble64), &found_size, &idx) ) {
-		// if didn't find preamble try again inverting
-		if (!preambleSearch(dest, preamble64_i, sizeof(preamble64_i), &found_size, &idx)) return -1;
-		*invert ^= 1;
-	}
-	if (found_size != 64) return -2;
+    //standard 64 bit indala formats including 26 bit 40134 format
+    uint8_t   preamble64[] = {1,0,1,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 1};
+    uint8_t preamble64_i[] = {0,1,0,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 0};
+    size_t idx = 0;
+    size_t found_size = *size;
+    if (!preambleSearch(dest, preamble64, sizeof(preamble64), &found_size, &idx) ) {
+        // if didn't find preamble try again inverting
+        if (!preambleSearch(dest, preamble64_i, sizeof(preamble64_i), &found_size, &idx)) return -1;
+        *invert ^= 1;
+    }
+    if (found_size != 64) return -2;
 
-	if (*invert == 1)
-		for (size_t i = idx; i < found_size + idx; i++)
-			dest[i] ^= 1;
+    if (*invert == 1)
+        for (size_t i = idx; i < found_size + idx; i++)
+            dest[i] ^= 1;
 
-	// note: don't change *size until we are sure we got it...
-	*size = found_size;
-	return (int) idx;
+    // note: don't change *size until we are sure we got it...
+    *size = found_size;
+    return (int) idx;
 }
 
 int indala224decode(uint8_t *dest, size_t *size, uint8_t *invert) {
-	//large 224 bit indala formats (different preamble too...)
-	uint8_t   preamble224[] = {1,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 1};
-	uint8_t preamble224_i[] = {0,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 0};
-	size_t idx = 0;
-	size_t found_size = *size;
-	if (!preambleSearch(dest, preamble224, sizeof(preamble224), &found_size, &idx) ) {
-		// if didn't find preamble try again inverting
-		if (!preambleSearch(dest, preamble224_i, sizeof(preamble224_i), &found_size, &idx)) return -1;
-		*invert ^= 1;
-	}
-	if (found_size != 224) return -2;
+    //large 224 bit indala formats (different preamble too...)
+    uint8_t   preamble224[] = {1,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 1};
+    uint8_t preamble224_i[] = {0,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 0};
+    size_t idx = 0;
+    size_t found_size = *size;
+    if (!preambleSearch(dest, preamble224, sizeof(preamble224), &found_size, &idx) ) {
+        // if didn't find preamble try again inverting
+        if (!preambleSearch(dest, preamble224_i, sizeof(preamble224_i), &found_size, &idx)) return -1;
+        *invert ^= 1;
+    }
+    if (found_size != 224) return -2;
 
-	if (*invert==1 && idx > 0)
-		for (size_t i = idx-1; i < found_size + idx + 2; i++)
-			dest[i] ^= 1;
+    if (*invert==1 && idx > 0)
+        for (size_t i = idx-1; i < found_size + idx + 2; i++)
+            dest[i] ^= 1;
 
-	// 224 formats are typically PSK2 (afaik 2017 Marshmellow)
-	// note loses 1 bit at beginning of transformation...
-	// don't need to verify array is big enough as to get here there has to be a full preamble after all of our data
-	psk1TOpsk2(dest + (idx-1), found_size+2);
-	idx++;
+    // 224 formats are typically PSK2 (afaik 2017 Marshmellow)
+    // note loses 1 bit at beginning of transformation...
+    // don't need to verify array is big enough as to get here there has to be a full preamble after all of our data
+    psk1TOpsk2(dest + (idx-1), found_size+2);
+    idx++;
 
-	*size = found_size;
-	return (int) idx;
+    *size = found_size;
+    return (int) idx;
 }
 
 // this read is the "normal" read,  which download lf signal and tries to demod here.
 int CmdIndalaRead(const char *Cmd) {
-	lf_read(true, 30000);
-	return CmdIndalaDemod(Cmd);
+    lf_read(true, 30000);
+    return CmdIndalaDemod(Cmd);
 }
 
 // Indala 26 bit decode
 // by marshmellow
 // optional arguments - same as PSKDemod (clock & invert & maxerr)
 int CmdIndalaDemod(const char *Cmd) {
-	int ans;
-	if (strlen(Cmd) > 0)
-		ans = PSKDemod(Cmd, 0);
-	else //default to RF/32
-		ans = PSKDemod("32", 0);
+    int ans;
+    if (strlen(Cmd) > 0)
+        ans = PSKDemod(Cmd, 0);
+    else //default to RF/32
+        ans = PSKDemod("32", 0);
 
-	if (!ans){
-		PrintAndLogEx(DEBUG, "DEBUG: Error - Indala can't demod signal: %d", ans);
-		return 0;
-	}
+    if (!ans){
+        PrintAndLogEx(DEBUG, "DEBUG: Error - Indala can't demod signal: %d", ans);
+        return 0;
+    }
 
-	uint8_t invert = 0;
-	size_t size = DemodBufferLen;
-	int idx = indala64decode(DemodBuffer, &size, &invert);
-	if (idx < 0 || size != 64) {
-		// try 224 indala
-		invert = 0;
-		size = DemodBufferLen;
-		idx = indala224decode(DemodBuffer, &size, &invert);
-		if (idx < 0 || size != 224) {
-			PrintAndLogEx(DEBUG, "DEBUG: Error - Indala wrong size, expected [64|224] got: %d (startindex %i)", size, idx);
-			return 0;
-		}
-	}
+    uint8_t invert = 0;
+    size_t size = DemodBufferLen;
+    int idx = indala64decode(DemodBuffer, &size, &invert);
+    if (idx < 0 || size != 64) {
+        // try 224 indala
+        invert = 0;
+        size = DemodBufferLen;
+        idx = indala224decode(DemodBuffer, &size, &invert);
+        if (idx < 0 || size != 224) {
+            PrintAndLogEx(DEBUG, "DEBUG: Error - Indala wrong size, expected [64|224] got: %d (startindex %i)", size, idx);
+            return 0;
+        }
+    }
 
-	setDemodBuf(DemodBuffer, size, (size_t)idx);
-	setClockGrid(g_DemodClock, g_DemodStartIdx + (idx * g_DemodClock));
-	if (invert) {
-		PrintAndLogEx(DEBUG, "DEBUG: Error - Indala had to invert bits");
-		for (size_t i = 0; i < size; i++)
-			DemodBuffer[i] ^= 1;
-	}
+    setDemodBuf(DemodBuffer, size, (size_t)idx);
+    setClockGrid(g_DemodClock, g_DemodStartIdx + (idx * g_DemodClock));
+    if (invert) {
+        PrintAndLogEx(DEBUG, "DEBUG: Error - Indala had to invert bits");
+        for (size_t i = 0; i < size; i++)
+            DemodBuffer[i] ^= 1;
+    }
 
-	//convert UID to HEX
-	uint32_t uid1, uid2, uid3, uid4, uid5, uid6, uid7;
-	uid1 = bytebits_to_byte(DemodBuffer,32);
-	uid2 = bytebits_to_byte(DemodBuffer+32,32);
-	if (DemodBufferLen == 64){
-		PrintAndLogEx(SUCCESS, "Indala Found - bitlength %d, UID = (0x%x%08x)\n%s",
-			DemodBufferLen, uid1, uid2, sprint_bin_break(DemodBuffer,DemodBufferLen,32)
-		);
-	} else {
-		uid3 = bytebits_to_byte(DemodBuffer+64,32);
-		uid4 = bytebits_to_byte(DemodBuffer+96,32);
-		uid5 = bytebits_to_byte(DemodBuffer+128,32);
-		uid6 = bytebits_to_byte(DemodBuffer+160,32);
-		uid7 = bytebits_to_byte(DemodBuffer+192,32);
-		PrintAndLogEx(SUCCESS, "Indala Found - bitlength %d, UID = (0x%x%08x%08x%08x%08x%08x%08x)\n%s",
-			DemodBufferLen,
-		    uid1, uid2, uid3, uid4, uid5, uid6, uid7, sprint_bin_break(DemodBuffer, DemodBufferLen, 32)
-		);
-	}
-	if (g_debugMode){
-		PrintAndLogEx(DEBUG, "DEBUG: Indala - printing demodbuffer:");
-		printDemodBuff();
-	}
-	return 1;
+    //convert UID to HEX
+    uint32_t uid1, uid2, uid3, uid4, uid5, uid6, uid7;
+    uid1 = bytebits_to_byte(DemodBuffer,32);
+    uid2 = bytebits_to_byte(DemodBuffer+32,32);
+    if (DemodBufferLen == 64){
+        PrintAndLogEx(SUCCESS, "Indala Found - bitlength %d, UID = (0x%x%08x)\n%s",
+            DemodBufferLen, uid1, uid2, sprint_bin_break(DemodBuffer,DemodBufferLen,32)
+        );
+    } else {
+        uid3 = bytebits_to_byte(DemodBuffer+64,32);
+        uid4 = bytebits_to_byte(DemodBuffer+96,32);
+        uid5 = bytebits_to_byte(DemodBuffer+128,32);
+        uid6 = bytebits_to_byte(DemodBuffer+160,32);
+        uid7 = bytebits_to_byte(DemodBuffer+192,32);
+        PrintAndLogEx(SUCCESS, "Indala Found - bitlength %d, UID = (0x%x%08x%08x%08x%08x%08x%08x)\n%s",
+            DemodBufferLen,
+            uid1, uid2, uid3, uid4, uid5, uid6, uid7, sprint_bin_break(DemodBuffer, DemodBufferLen, 32)
+        );
+    }
+    if (g_debugMode){
+        PrintAndLogEx(DEBUG, "DEBUG: Indala - printing demodbuffer:");
+        printDemodBuff();
+    }
+    return 1;
 }
 
 // older alternative indala demodulate (has some positives and negatives)
@@ -179,307 +179,307 @@ int CmdIndalaDemod(const char *Cmd) {
 // poor psk signal can be difficult to demod this approach might succeed when the other fails
 // but the other appears to currently be more accurate than this approach most of the time.
 int CmdIndalaDemodAlt(const char *Cmd) {
-	// Usage: recover 64bit UID by default, specify "224" as arg to recover a 224bit UID
-	int state = -1;
-	int count = 0;
-	int i, j;
+    // Usage: recover 64bit UID by default, specify "224" as arg to recover a 224bit UID
+    int state = -1;
+    int count = 0;
+    int i, j;
 
-	// worst case with GraphTraceLen=40000 is < 4096
-	// under normal conditions it's < 2048
-	uint8_t data[MAX_GRAPH_TRACE_LEN] = {0};
-	size_t datasize = getFromGraphBuf(data);
+    // worst case with GraphTraceLen=40000 is < 4096
+    // under normal conditions it's < 2048
+    uint8_t data[MAX_GRAPH_TRACE_LEN] = {0};
+    size_t datasize = getFromGraphBuf(data);
 
-	uint8_t rawbits[4096];
-	int rawbit = 0;
-	int worst = 0, worstPos = 0;
+    uint8_t rawbits[4096];
+    int rawbit = 0;
+    int worst = 0, worstPos = 0;
 
-	//clear clock grid and demod plot
-	setClockGrid(0, 0);
-	DemodBufferLen = 0;
+    //clear clock grid and demod plot
+    setClockGrid(0, 0);
+    DemodBufferLen = 0;
 
-	// PrintAndLogEx(NORMAL, "Expecting a bit less than %d raw bits", GraphTraceLen / 32);
-	// loop through raw signal - since we know it is psk1 rf/32 fc/2 skip every other value (+=2)
-	for (i = 0; i < datasize-1; i += 2) {
-		count += 1;
-		if ((data[i] > data[i + 1]) && (state != 1)) {
-			// appears redundant - marshmellow
-			if (state == 0) {
-				for (j = 0; j <  count - 8; j += 16) {
-					rawbits[rawbit++] = 0;
-				}
-				if ((abs(count - j)) > worst) {
-					worst = abs(count - j);
-					worstPos = i;
-				}
-			}
-			state = 1;
-			count = 0;
-		} else if ((data[i] < data[i + 1]) && (state != 0)) {
-			//appears redundant
-			if (state == 1) {
-				for (j = 0; j <  count - 8; j += 16) {
-					rawbits[rawbit++] = 1;
-				}
-				if ((abs(count - j)) > worst) {
-					worst = abs(count - j);
-					worstPos = i;
-				}
-			}
-			state = 0;
-			count = 0;
-		}
-	}
+    // PrintAndLogEx(NORMAL, "Expecting a bit less than %d raw bits", GraphTraceLen / 32);
+    // loop through raw signal - since we know it is psk1 rf/32 fc/2 skip every other value (+=2)
+    for (i = 0; i < datasize-1; i += 2) {
+        count += 1;
+        if ((data[i] > data[i + 1]) && (state != 1)) {
+            // appears redundant - marshmellow
+            if (state == 0) {
+                for (j = 0; j <  count - 8; j += 16) {
+                    rawbits[rawbit++] = 0;
+                }
+                if ((abs(count - j)) > worst) {
+                    worst = abs(count - j);
+                    worstPos = i;
+                }
+            }
+            state = 1;
+            count = 0;
+        } else if ((data[i] < data[i + 1]) && (state != 0)) {
+            //appears redundant
+            if (state == 1) {
+                for (j = 0; j <  count - 8; j += 16) {
+                    rawbits[rawbit++] = 1;
+                }
+                if ((abs(count - j)) > worst) {
+                    worst = abs(count - j);
+                    worstPos = i;
+                }
+            }
+            state = 0;
+            count = 0;
+        }
+    }
 
-	if (rawbit > 0){
-		PrintAndLogEx(INFO, "Recovered %d raw bits, expected: %d", rawbit, GraphTraceLen/32);
-		PrintAndLogEx(INFO, "worst metric (0=best..7=worst): %d at pos %d", worst, worstPos);
-	} else {
-		return 0;
-	}
+    if (rawbit > 0){
+        PrintAndLogEx(INFO, "Recovered %d raw bits, expected: %d", rawbit, GraphTraceLen/32);
+        PrintAndLogEx(INFO, "worst metric (0=best..7=worst): %d at pos %d", worst, worstPos);
+    } else {
+        return 0;
+    }
 
-	// Finding the start of a UID
-	int uidlen, long_wait;
-	if (strcmp(Cmd, "224") == 0) {
-		uidlen = 224;
-		long_wait = 30;
-	} else {
-		uidlen = 64;
-		long_wait = 29;
-	}
+    // Finding the start of a UID
+    int uidlen, long_wait;
+    if (strcmp(Cmd, "224") == 0) {
+        uidlen = 224;
+        long_wait = 30;
+    } else {
+        uidlen = 64;
+        long_wait = 29;
+    }
 
-	int start;
-	int first = 0;
-	for (start = 0; start <= rawbit - uidlen; start++) {
-		first = rawbits[start];
-		for (i = start; i < start + long_wait; i++) {
-			if (rawbits[i] != first) {
-				break;
-			}
-		}
-		if (i == (start + long_wait)) {
-			break;
-		}
-	}
+    int start;
+    int first = 0;
+    for (start = 0; start <= rawbit - uidlen; start++) {
+        first = rawbits[start];
+        for (i = start; i < start + long_wait; i++) {
+            if (rawbits[i] != first) {
+                break;
+            }
+        }
+        if (i == (start + long_wait)) {
+            break;
+        }
+    }
 
-	if (start == rawbit - uidlen + 1) {
-		PrintAndLogEx(FAILED, "nothing to wait for");
-		return 0;
-	}
+    if (start == rawbit - uidlen + 1) {
+        PrintAndLogEx(FAILED, "nothing to wait for");
+        return 0;
+    }
 
-	// Inverting signal if needed
-	if (first == 1) {
-		for (i = start; i < rawbit; i++) {
-			rawbits[i] = !rawbits[i];
-		}
-	}
+    // Inverting signal if needed
+    if (first == 1) {
+        for (i = start; i < rawbit; i++) {
+            rawbits[i] = !rawbits[i];
+        }
+    }
 
-	// Dumping UID
-	uint8_t bits[224] = {0x00};
-	char showbits[225] = {0x00};
-	int bit;
-	i = start;
-	int times = 0;
+    // Dumping UID
+    uint8_t bits[224] = {0x00};
+    char showbits[225] = {0x00};
+    int bit;
+    i = start;
+    int times = 0;
 
-	if (uidlen > rawbit) {
-		PrintAndLogEx(WARNING, "Warning: not enough raw bits to get a full UID");
-		for (bit = 0; bit < rawbit; bit++) {
-			bits[bit] = rawbits[i++];
-			// As we cannot know the parity, let's use "." and "/"
-			showbits[bit] = '.' + bits[bit];
-		}
-		showbits[bit+1]='\0';
-		PrintAndLogEx(SUCCESS, "Partial UID | %s", showbits);
-		return 0;
-	} else {
-		for (bit = 0; bit < uidlen; bit++) {
-			bits[bit] = rawbits[i++];
-			showbits[bit] = '0' + bits[bit];
-		}
-		times = 1;
-	}
+    if (uidlen > rawbit) {
+        PrintAndLogEx(WARNING, "Warning: not enough raw bits to get a full UID");
+        for (bit = 0; bit < rawbit; bit++) {
+            bits[bit] = rawbits[i++];
+            // As we cannot know the parity, let's use "." and "/"
+            showbits[bit] = '.' + bits[bit];
+        }
+        showbits[bit+1]='\0';
+        PrintAndLogEx(SUCCESS, "Partial UID | %s", showbits);
+        return 0;
+    } else {
+        for (bit = 0; bit < uidlen; bit++) {
+            bits[bit] = rawbits[i++];
+            showbits[bit] = '0' + bits[bit];
+        }
+        times = 1;
+    }
 
-	//convert UID to HEX
-	uint32_t uid1, uid2, uid3, uid4, uid5, uid6, uid7;
-	int idx;
-	uid1 = uid2 = 0;
+    //convert UID to HEX
+    uint32_t uid1, uid2, uid3, uid4, uid5, uid6, uid7;
+    int idx;
+    uid1 = uid2 = 0;
 
-	if (uidlen == 64){
-		for( idx=0; idx < 64; idx++) {
-				if (showbits[idx] == '0') {
-					uid1 = (uid1<<1) | (uid2>>31);
-					uid2 = (uid2<<1) | 0;
-				} else {
-					uid1 = (uid1<<1) | (uid2>>31);
-					uid2 = (uid2<<1) | 1;
-				}
-			}
-		PrintAndLogEx(SUCCESS, "UID | %s (%x%08x)", showbits, uid1, uid2);
-	}
-	else {
-		uid3 = uid4 = uid5 = uid6 = uid7 = 0;
+    if (uidlen == 64){
+        for( idx=0; idx < 64; idx++) {
+                if (showbits[idx] == '0') {
+                    uid1 = (uid1<<1) | (uid2>>31);
+                    uid2 = (uid2<<1) | 0;
+                } else {
+                    uid1 = (uid1<<1) | (uid2>>31);
+                    uid2 = (uid2<<1) | 1;
+                }
+            }
+        PrintAndLogEx(SUCCESS, "UID | %s (%x%08x)", showbits, uid1, uid2);
+    }
+    else {
+        uid3 = uid4 = uid5 = uid6 = uid7 = 0;
 
-		for( idx=0; idx<224; idx++) {
-				uid1 = (uid1<<1) | (uid2>>31);
-				uid2 = (uid2<<1) | (uid3>>31);
-				uid3 = (uid3<<1) | (uid4>>31);
-				uid4 = (uid4<<1) | (uid5>>31);
-				uid5 = (uid5<<1) | (uid6>>31);
-				uid6 = (uid6<<1) | (uid7>>31);
+        for( idx=0; idx<224; idx++) {
+                uid1 = (uid1<<1) | (uid2>>31);
+                uid2 = (uid2<<1) | (uid3>>31);
+                uid3 = (uid3<<1) | (uid4>>31);
+                uid4 = (uid4<<1) | (uid5>>31);
+                uid5 = (uid5<<1) | (uid6>>31);
+                uid6 = (uid6<<1) | (uid7>>31);
 
-			if (showbits[idx] == '0')
-				uid7 = (uid7<<1) | 0;
-			else
-				uid7 = (uid7<<1) | 1;
-			}
-		PrintAndLogEx(SUCCESS, "UID | %s (%x%08x%08x%08x%08x%08x%08x)", showbits, uid1, uid2, uid3, uid4, uid5, uid6, uid7);
-	}
+            if (showbits[idx] == '0')
+                uid7 = (uid7<<1) | 0;
+            else
+                uid7 = (uid7<<1) | 1;
+            }
+        PrintAndLogEx(SUCCESS, "UID | %s (%x%08x%08x%08x%08x%08x%08x)", showbits, uid1, uid2, uid3, uid4, uid5, uid6, uid7);
+    }
 
-	// Checking UID against next occurrences
-		int failed = 0;
-	for (; i + uidlen <= rawbit;) {
-		failed = 0;
-		for (bit = 0; bit < uidlen; bit++) {
-			if (bits[bit] != rawbits[i++]) {
-				failed = 1;
-				break;
-			}
-		}
-		if (failed == 1) {
-			break;
-		}
-		times += 1;
-	}
+    // Checking UID against next occurrences
+        int failed = 0;
+    for (; i + uidlen <= rawbit;) {
+        failed = 0;
+        for (bit = 0; bit < uidlen; bit++) {
+            if (bits[bit] != rawbits[i++]) {
+                failed = 1;
+                break;
+            }
+        }
+        if (failed == 1) {
+            break;
+        }
+        times += 1;
+    }
 
-	PrintAndLogEx(DEBUG, "Occurrences: %d (expected %d)", times, (rawbit - start) / uidlen);
+    PrintAndLogEx(DEBUG, "Occurrences: %d (expected %d)", times, (rawbit - start) / uidlen);
 
-	// Remodulating for tag cloning
-	// HACK: 2015-01-04 this will have an impact on our new way of seening lf commands (demod)
-	// since this changes graphbuffer data.
-	GraphTraceLen = 32 * uidlen;
-	i = 0;
-	int phase = 0;
-	for (bit = 0; bit < uidlen; bit++) {
-		if (bits[bit] == 0) {
-			phase = 0;
-		} else {
-			phase = 1;
-		}
-		int j;
-		for (j = 0; j < 32; j++) {
-			GraphBuffer[i++] = phase;
-			phase = !phase;
-		}
-	}
+    // Remodulating for tag cloning
+    // HACK: 2015-01-04 this will have an impact on our new way of seening lf commands (demod)
+    // since this changes graphbuffer data.
+    GraphTraceLen = 32 * uidlen;
+    i = 0;
+    int phase = 0;
+    for (bit = 0; bit < uidlen; bit++) {
+        if (bits[bit] == 0) {
+            phase = 0;
+        } else {
+            phase = 1;
+        }
+        int j;
+        for (j = 0; j < 32; j++) {
+            GraphBuffer[i++] = phase;
+            phase = !phase;
+        }
+    }
 
-	RepaintGraphWindow();
-	return 1;
+    RepaintGraphWindow();
+    return 1;
 }
 
 int CmdIndalaSim(const char *Cmd) {
 
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_indala_sim();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_indala_sim();
 
-	uint8_t bits[224];
-	size_t size = sizeof(bits);
-	memset(bits, 0x00, size);
+    uint8_t bits[224];
+    size_t size = sizeof(bits);
+    memset(bits, 0x00, size);
 
-	// uid
-	uint8_t hexuid[100];
-	int len = 0;
-	param_gethex_ex(Cmd, 0, hexuid, &len);
-	if ( len > 28 )
-		return usage_lf_indala_sim();
+    // uid
+    uint8_t hexuid[100];
+    int len = 0;
+    param_gethex_ex(Cmd, 0, hexuid, &len);
+    if ( len > 28 )
+        return usage_lf_indala_sim();
 
-	// convert to binarray
-	uint8_t counter = 223;
-	for (uint8_t i = 0; i < len; i++) {
-		for(uint8_t j = 0; j < 8; j++) {
-			bits[counter--] = hexuid[i] & 1;
-			hexuid[i] >>= 1;
-		}
-	}
+    // convert to binarray
+    uint8_t counter = 223;
+    for (uint8_t i = 0; i < len; i++) {
+        for(uint8_t j = 0; j < 8; j++) {
+            bits[counter--] = hexuid[i] & 1;
+            hexuid[i] >>= 1;
+        }
+    }
 
-	// indala PSK
-	uint8_t clk = 32, carrier = 2, invert = 0;
-	uint16_t arg1, arg2;
-	arg1 = clk << 8 | carrier;
-	arg2 = invert;
+    // indala PSK
+    uint8_t clk = 32, carrier = 2, invert = 0;
+    uint16_t arg1, arg2;
+    arg1 = clk << 8 | carrier;
+    arg2 = invert;
 
-	// It has to send either 64bits (8bytes) or 224bits (28bytes).  Zero padding needed if not.
-	// lf simpsk 1 c 32 r 2 d 0102030405060708
+    // It has to send either 64bits (8bytes) or 224bits (28bytes).  Zero padding needed if not.
+    // lf simpsk 1 c 32 r 2 d 0102030405060708
 
-	PrintAndLogEx(SUCCESS, "Simulating Indala UID: %s",  sprint_hex(hexuid, len));
-	PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation or run another command");
+    PrintAndLogEx(SUCCESS, "Simulating Indala UID: %s",  sprint_hex(hexuid, len));
+    PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation or run another command");
 
-	UsbCommand c = {CMD_PSK_SIM_TAG, {arg1, arg2, size}};
-	memcpy(c.d.asBytes, bits, size);
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+    UsbCommand c = {CMD_PSK_SIM_TAG, {arg1, arg2, size}};
+    memcpy(c.d.asBytes, bits, size);
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 
 // iceman - needs refactoring
 int CmdIndalaClone(const char *Cmd) {
-	UsbCommand c = {0};
-	uint32_t uid1, uid2, uid3, uid4, uid5, uid6, uid7;
-	uid1 =  uid2 = uid3 = uid4 = uid5 = uid6 = uid7 = 0;
-	uint32_t n = 0, i = 0;
+    UsbCommand c = {0};
+    uint32_t uid1, uid2, uid3, uid4, uid5, uid6, uid7;
+    uid1 =  uid2 = uid3 = uid4 = uid5 = uid6 = uid7 = 0;
+    uint32_t n = 0, i = 0;
 
-	if (strchr(Cmd,'l') != 0) {
+    if (strchr(Cmd,'l') != 0) {
 
-		while (sscanf(&Cmd[i++], "%1x", &n ) == 1) {
-			uid1 = (uid1 << 4) | (uid2 >> 28);
-			uid2 = (uid2 << 4) | (uid3 >> 28);
-			uid3 = (uid3 << 4) | (uid4 >> 28);
-			uid4 = (uid4 << 4) | (uid5 >> 28);
-			uid5 = (uid5 << 4) | (uid6 >> 28);
-			uid6 = (uid6 << 4) | (uid7 >> 28);
-			uid7 = (uid7 << 4) | (n & 0xf);
-		}
+        while (sscanf(&Cmd[i++], "%1x", &n ) == 1) {
+            uid1 = (uid1 << 4) | (uid2 >> 28);
+            uid2 = (uid2 << 4) | (uid3 >> 28);
+            uid3 = (uid3 << 4) | (uid4 >> 28);
+            uid4 = (uid4 << 4) | (uid5 >> 28);
+            uid5 = (uid5 << 4) | (uid6 >> 28);
+            uid6 = (uid6 << 4) | (uid7 >> 28);
+            uid7 = (uid7 << 4) | (n & 0xf);
+        }
 
-		PrintAndLogEx(INFO, "Preparing to clone Indala 224bit tag with UID %x%08x%08x%08x%08x%08x%08x", uid1, uid2, uid3, uid4, uid5, uid6, uid7);
-		c.cmd = CMD_INDALA_CLONE_TAG_L;
-		c.d.asDwords[0] = uid1;
-		c.d.asDwords[1] = uid2;
-		c.d.asDwords[2] = uid3;
-		c.d.asDwords[3] = uid4;
-		c.d.asDwords[4] = uid5;
-		c.d.asDwords[5] = uid6;
-		c.d.asDwords[6] = uid7;
-	} else {
-		while (sscanf(&Cmd[i++], "%1x", &n ) == 1) {
-			uid1 = (uid1 << 4) | (uid2 >> 28);
-			uid2 = (uid2 << 4) | (n & 0xf);
-		}
-		PrintAndLogEx(INFO, "Preparing to clone Indala 64bit tag with UID %x%08x", uid1, uid2);
-		c.cmd = CMD_INDALA_CLONE_TAG;
-		c.arg[0] = uid1;
-		c.arg[1] = uid2;
-	}
+        PrintAndLogEx(INFO, "Preparing to clone Indala 224bit tag with UID %x%08x%08x%08x%08x%08x%08x", uid1, uid2, uid3, uid4, uid5, uid6, uid7);
+        c.cmd = CMD_INDALA_CLONE_TAG_L;
+        c.d.asDwords[0] = uid1;
+        c.d.asDwords[1] = uid2;
+        c.d.asDwords[2] = uid3;
+        c.d.asDwords[3] = uid4;
+        c.d.asDwords[4] = uid5;
+        c.d.asDwords[5] = uid6;
+        c.d.asDwords[6] = uid7;
+    } else {
+        while (sscanf(&Cmd[i++], "%1x", &n ) == 1) {
+            uid1 = (uid1 << 4) | (uid2 >> 28);
+            uid2 = (uid2 << 4) | (n & 0xf);
+        }
+        PrintAndLogEx(INFO, "Preparing to clone Indala 64bit tag with UID %x%08x", uid1, uid2);
+        c.cmd = CMD_INDALA_CLONE_TAG;
+        c.arg[0] = uid1;
+        c.arg[1] = uid2;
+    }
 
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 
 static command_t CommandTable[] = {
-	{"help",	CmdHelp,			1, "this help"},
-	{"demod",	CmdIndalaDemod,		1, "demodulate an indala tag (PSK1) from GraphBuffer"},
-	{"altdemod", CmdIndalaDemodAlt,	1, "alternative method to Demodulate samples for Indala 64 bit UID (option '224' for 224 bit)"},
-	{"read",	CmdIndalaRead,		0, "read an Indala Prox tag from the antenna"},
-	{"clone",	CmdIndalaClone,		0, "clone Indala to T55x7"},
-	{"sim",		CmdIndalaSim,		0, "simulate Indala tag"},
-	{NULL, NULL, 0, NULL}
+    {"help",     CmdHelp,            1, "this help"},
+    {"demod",    CmdIndalaDemod,     1, "demodulate an indala tag (PSK1) from GraphBuffer"},
+    {"altdemod", CmdIndalaDemodAlt,  1, "alternative method to Demodulate samples for Indala 64 bit UID (option '224' for 224 bit)"},
+    {"read",     CmdIndalaRead,      0, "read an Indala Prox tag from the antenna"},
+    {"clone",    CmdIndalaClone,     0, "clone Indala to T55x7"},
+    {"sim",      CmdIndalaSim,       0, "simulate Indala tag"},
+    {NULL, NULL, 0, NULL}
 };
 
 int CmdLFINDALA(const char *Cmd){
-	clearCommandBuffer();
-	CmdsParse(CommandTable, Cmd);
-	return 0;
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
+    return 0;
 }
 
 int CmdHelp(const char *Cmd) {
-	CmdsHelp(CommandTable);
-	return 0;
+    CmdsHelp(CommandTable);
+    return 0;
 }
diff --git a/client/cmdlfindala.h b/client/cmdlfindala.h
index cb852e389..3430ad499 100644
--- a/client/cmdlfindala.h
+++ b/client/cmdlfindala.h
@@ -21,7 +21,7 @@
 #include "protocols.h"  // for T55xx config register definitions
 #include "cmdmain.h"
 #include "cmddata.h"
-#include "cmdlf.h"		// lf_read
+#include "cmdlf.h"      // lf_read
 
 extern int CmdLFINDALA(const char *Cmd);
 
diff --git a/client/cmdlfio.c b/client/cmdlfio.c
index 53ad90ec7..eab1dc7f3 100644
--- a/client/cmdlfio.c
+++ b/client/cmdlfio.c
@@ -13,167 +13,167 @@
 static int CmdHelp(const char *Cmd);
 
 int usage_lf_io_read(void) {
-	PrintAndLogEx(NORMAL, "Enables IOProx compatible reader mode printing details of scanned tags.");
-	PrintAndLogEx(NORMAL, "By default, values are printed and logged until the button is pressed or another USB command is issued.");
-	PrintAndLogEx(NORMAL, "If the [1] option is provided, reader mode is exited after reading a single card.");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  lf io read [h] [1]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h :  This help");
-	PrintAndLogEx(NORMAL, "      1 : (optional) stop after reading a single card");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        lf io read");
-	PrintAndLogEx(NORMAL, "        lf io read 1");
-	return 0;
+    PrintAndLogEx(NORMAL, "Enables IOProx compatible reader mode printing details of scanned tags.");
+    PrintAndLogEx(NORMAL, "By default, values are printed and logged until the button is pressed or another USB command is issued.");
+    PrintAndLogEx(NORMAL, "If the [1] option is provided, reader mode is exited after reading a single card.");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  lf io read [h] [1]");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "      h :  This help");
+    PrintAndLogEx(NORMAL, "      1 : (optional) stop after reading a single card");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "        lf io read");
+    PrintAndLogEx(NORMAL, "        lf io read 1");
+    return 0;
 }
 
 int usage_lf_io_sim(void) {
-	PrintAndLogEx(NORMAL, "Enables simulation of IOProx card with specified facility-code and card number.");
-	PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  lf io sim [h] <version> <facility-code> <card-number>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "                h :  This help");
-	PrintAndLogEx(NORMAL, "        <version> :  8bit version");
-	PrintAndLogEx(NORMAL, "  <facility-code> :  8bit value facility code");
-	PrintAndLogEx(NORMAL, "    <card number> :  16bit value card number");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "       lf io sim 26 101 1337");
-	return 0;
+    PrintAndLogEx(NORMAL, "Enables simulation of IOProx card with specified facility-code and card number.");
+    PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  lf io sim [h] <version> <facility-code> <card-number>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "                h :  This help");
+    PrintAndLogEx(NORMAL, "        <version> :  8bit version");
+    PrintAndLogEx(NORMAL, "  <facility-code> :  8bit value facility code");
+    PrintAndLogEx(NORMAL, "    <card number> :  16bit value card number");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "       lf io sim 26 101 1337");
+    return 0;
 }
 
 int usage_lf_io_clone(void) {
-	PrintAndLogEx(NORMAL, "Enables cloning of IOProx card with specified facility-code and card number onto T55x7.");
-	PrintAndLogEx(NORMAL, "The T55x7 must be on the antenna when issuing this command.  T55x7 blocks are calculated and printed in the process.");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  lf io clone [h] <version> <facility-code> <card-number> [Q5]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "                h :  This help");
-	PrintAndLogEx(NORMAL, "        <version> :  8bit version");
-	PrintAndLogEx(NORMAL, "  <facility-code> :  8bit value facility code");
-	PrintAndLogEx(NORMAL, "    <card number> :  16bit value card number");
-	PrintAndLogEx(NORMAL, "               Q5 :  optional - clone to Q5 (T5555) instead of T55x7 chip");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "       lf io clone 26 101 1337");
-	return 0;
+    PrintAndLogEx(NORMAL, "Enables cloning of IOProx card with specified facility-code and card number onto T55x7.");
+    PrintAndLogEx(NORMAL, "The T55x7 must be on the antenna when issuing this command.  T55x7 blocks are calculated and printed in the process.");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  lf io clone [h] <version> <facility-code> <card-number> [Q5]");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "                h :  This help");
+    PrintAndLogEx(NORMAL, "        <version> :  8bit version");
+    PrintAndLogEx(NORMAL, "  <facility-code> :  8bit value facility code");
+    PrintAndLogEx(NORMAL, "    <card number> :  16bit value card number");
+    PrintAndLogEx(NORMAL, "               Q5 :  optional - clone to Q5 (T5555) instead of T55x7 chip");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "       lf io clone 26 101 1337");
+    return 0;
 }
 
 // this read is the "normal" read,  which download lf signal and tries to demod here.
 int CmdIOProxRead(const char *Cmd) {
-	lf_read(true, 12000);
-	return CmdIOProxDemod(Cmd);
+    lf_read(true, 12000);
+    return CmdIOProxDemod(Cmd);
 }
 // this read loops on device side.
 // uses the demod in lfops.c
 int CmdIOProxRead_device(const char *Cmd) {
-	if (Cmd[0] == 'h' || Cmd[0] == 'H') return usage_lf_io_read();
-	int findone = (Cmd[0]=='1') ? 1 : 0;
-	UsbCommand c = {CMD_IO_DEMOD_FSK, {findone, 0, 0}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+    if (Cmd[0] == 'h' || Cmd[0] == 'H') return usage_lf_io_read();
+    int findone = (Cmd[0]=='1') ? 1 : 0;
+    UsbCommand c = {CMD_IO_DEMOD_FSK, {findone, 0, 0}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 
 //by marshmellow
 //IO-Prox demod - FSK RF/64 with preamble of 000000001
 //print ioprox ID and some format details
 int CmdIOProxDemod(const char *Cmd) {
-	int retval = 0;
-	int idx = 0;
-	uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
-	size_t size = getFromGraphBuf(bits);
-	if (size < 65) {
-		PrintAndLogEx(DEBUG, "DEBUG: Error - IO prox not enough samples in GraphBuffer");
-		return 0;
-	}
-	//get binary from fsk wave
-	int waveIdx = 0;
-	idx = detectIOProx(bits, &size, &waveIdx);
-	if (idx < 0) {
-		if (g_debugMode) {
-			if (idx == -1) {
-				PrintAndLogEx(DEBUG, "DEBUG: Error - IO prox not enough samples");
-			} else if (idx == -2) {
-				PrintAndLogEx(DEBUG, "DEBUG: Error - IO prox just noise detected");
-			} else if (idx == -3) {
-				PrintAndLogEx(DEBUG, "DEBUG: Error - IO prox error during fskdemod");
-			} else if (idx == -4) {
-				PrintAndLogEx(DEBUG, "DEBUG: Error - IO prox preamble not found");
-			} else if (idx == -5) {
-				PrintAndLogEx(DEBUG, "DEBUG: Error - IO size not correct, size %d", size);
-			} else if (idx == -6) {
-				PrintAndLogEx(DEBUG, "DEBUG: Error - IO prox separator bits not found");
-			} else {
-				PrintAndLogEx(DEBUG, "DEBUG: Error - IO prox error demoding fsk %d", idx);
-			}
-		}
-		return 0;
-	}
-	setDemodBuf(bits, size, idx);
-	setClockGrid(64, waveIdx + (idx*64));
+    int retval = 0;
+    int idx = 0;
+    uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
+    size_t size = getFromGraphBuf(bits);
+    if (size < 65) {
+        PrintAndLogEx(DEBUG, "DEBUG: Error - IO prox not enough samples in GraphBuffer");
+        return 0;
+    }
+    //get binary from fsk wave
+    int waveIdx = 0;
+    idx = detectIOProx(bits, &size, &waveIdx);
+    if (idx < 0) {
+        if (g_debugMode) {
+            if (idx == -1) {
+                PrintAndLogEx(DEBUG, "DEBUG: Error - IO prox not enough samples");
+            } else if (idx == -2) {
+                PrintAndLogEx(DEBUG, "DEBUG: Error - IO prox just noise detected");
+            } else if (idx == -3) {
+                PrintAndLogEx(DEBUG, "DEBUG: Error - IO prox error during fskdemod");
+            } else if (idx == -4) {
+                PrintAndLogEx(DEBUG, "DEBUG: Error - IO prox preamble not found");
+            } else if (idx == -5) {
+                PrintAndLogEx(DEBUG, "DEBUG: Error - IO size not correct, size %d", size);
+            } else if (idx == -6) {
+                PrintAndLogEx(DEBUG, "DEBUG: Error - IO prox separator bits not found");
+            } else {
+                PrintAndLogEx(DEBUG, "DEBUG: Error - IO prox error demoding fsk %d", idx);
+            }
+        }
+        return 0;
+    }
+    setDemodBuf(bits, size, idx);
+    setClockGrid(64, waveIdx + (idx*64));
 
-	if (idx == 0) {
-		if (g_debugMode) {
-			PrintAndLogEx(DEBUG, "DEBUG: Error - IO prox data not found - FSK Bits: %d", size);
-			if (size > 92) PrintAndLogEx(DEBUG, "%s", sprint_bin_break(bits, 92, 16));
-		}
-		return retval;
-	}
+    if (idx == 0) {
+        if (g_debugMode) {
+            PrintAndLogEx(DEBUG, "DEBUG: Error - IO prox data not found - FSK Bits: %d", size);
+            if (size > 92) PrintAndLogEx(DEBUG, "%s", sprint_bin_break(bits, 92, 16));
+        }
+        return retval;
+    }
 
-	//Index map
-	//0           10          20          30          40          50          60
-	//|           |           |           |           |           |           |
-	//01234567 8 90123456 7 89012345 6 78901234 5 67890123 4 56789012 3 45678901 23
-	//-----------------------------------------------------------------------------
-	//00000000 0 11110000 1 facility 1 version* 1 code*one 1 code*two 1 ???????? 11
-	//
-	//XSF(version)facility:codeone+codetwo (raw)
+    //Index map
+    //0           10          20          30          40          50          60
+    //|           |           |           |           |           |           |
+    //01234567 8 90123456 7 89012345 6 78901234 5 67890123 4 56789012 3 45678901 23
+    //-----------------------------------------------------------------------------
+    //00000000 0 11110000 1 facility 1 version* 1 code*one 1 code*two 1 ???????? 11
+    //
+    //XSF(version)facility:codeone+codetwo (raw)
 
-	PrintAndLogEx(DEBUG, "%d%d%d%d%d%d%d%d %d", bits[idx], bits[idx+1], bits[idx+2], bits[idx+3], bits[idx+4], bits[idx+5], bits[idx+6], bits[idx+7], bits[idx+8]);
-	PrintAndLogEx(DEBUG, "%d%d%d%d%d%d%d%d %d", bits[idx+9], bits[idx+10], bits[idx+11],bits[idx+12],bits[idx+13],bits[idx+14],bits[idx+15],bits[idx+16],bits[idx+17]);
-	PrintAndLogEx(DEBUG, "%d%d%d%d%d%d%d%d %d facility", bits[idx+18], bits[idx+19], bits[idx+20],bits[idx+21],bits[idx+22],bits[idx+23],bits[idx+24],bits[idx+25],bits[idx+26]);
-	PrintAndLogEx(DEBUG, "%d%d%d%d%d%d%d%d %d version", bits[idx+27], bits[idx+28], bits[idx+29],bits[idx+30],bits[idx+31],bits[idx+32],bits[idx+33],bits[idx+34],bits[idx+35]);
-	PrintAndLogEx(DEBUG, "%d%d%d%d%d%d%d%d %d code1", bits[idx+36], bits[idx+37], bits[idx+38],bits[idx+39],bits[idx+40],bits[idx+41],bits[idx+42],bits[idx+43],bits[idx+44]);
-	PrintAndLogEx(DEBUG, "%d%d%d%d%d%d%d%d %d code2", bits[idx+45], bits[idx+46], bits[idx+47],bits[idx+48],bits[idx+49],bits[idx+50],bits[idx+51],bits[idx+52],bits[idx+53]);
-	PrintAndLogEx(DEBUG, "%d%d%d%d%d%d%d%d %d%d checksum", bits[idx+54],bits[idx+55],bits[idx+56],bits[idx+57],bits[idx+58],bits[idx+59],bits[idx+60],bits[idx+61],bits[idx+62],bits[idx+63]);
+    PrintAndLogEx(DEBUG, "%d%d%d%d%d%d%d%d %d", bits[idx], bits[idx+1], bits[idx+2], bits[idx+3], bits[idx+4], bits[idx+5], bits[idx+6], bits[idx+7], bits[idx+8]);
+    PrintAndLogEx(DEBUG, "%d%d%d%d%d%d%d%d %d", bits[idx+9], bits[idx+10], bits[idx+11],bits[idx+12],bits[idx+13],bits[idx+14],bits[idx+15],bits[idx+16],bits[idx+17]);
+    PrintAndLogEx(DEBUG, "%d%d%d%d%d%d%d%d %d facility", bits[idx+18], bits[idx+19], bits[idx+20],bits[idx+21],bits[idx+22],bits[idx+23],bits[idx+24],bits[idx+25],bits[idx+26]);
+    PrintAndLogEx(DEBUG, "%d%d%d%d%d%d%d%d %d version", bits[idx+27], bits[idx+28], bits[idx+29],bits[idx+30],bits[idx+31],bits[idx+32],bits[idx+33],bits[idx+34],bits[idx+35]);
+    PrintAndLogEx(DEBUG, "%d%d%d%d%d%d%d%d %d code1", bits[idx+36], bits[idx+37], bits[idx+38],bits[idx+39],bits[idx+40],bits[idx+41],bits[idx+42],bits[idx+43],bits[idx+44]);
+    PrintAndLogEx(DEBUG, "%d%d%d%d%d%d%d%d %d code2", bits[idx+45], bits[idx+46], bits[idx+47],bits[idx+48],bits[idx+49],bits[idx+50],bits[idx+51],bits[idx+52],bits[idx+53]);
+    PrintAndLogEx(DEBUG, "%d%d%d%d%d%d%d%d %d%d checksum", bits[idx+54],bits[idx+55],bits[idx+56],bits[idx+57],bits[idx+58],bits[idx+59],bits[idx+60],bits[idx+61],bits[idx+62],bits[idx+63]);
 
-	uint32_t code = bytebits_to_byte(bits+idx,32);
-	uint32_t code2 = bytebits_to_byte(bits+idx+32,32);
-	uint8_t version = bytebits_to_byte(bits+idx+27,8); //14,4
-	uint8_t facilitycode = bytebits_to_byte(bits+idx+18,8) ;
-	uint16_t number = (bytebits_to_byte(bits+idx+36,8)<<8)|(bytebits_to_byte(bits+idx+45,8)); //36,9
-	uint8_t crc = bytebits_to_byte(bits+idx+54,8);
-	uint8_t calccrc = 0;
+    uint32_t code = bytebits_to_byte(bits+idx,32);
+    uint32_t code2 = bytebits_to_byte(bits+idx+32,32);
+    uint8_t version = bytebits_to_byte(bits+idx+27,8); //14,4
+    uint8_t facilitycode = bytebits_to_byte(bits+idx+18,8) ;
+    uint16_t number = (bytebits_to_byte(bits+idx+36,8)<<8)|(bytebits_to_byte(bits+idx+45,8)); //36,9
+    uint8_t crc = bytebits_to_byte(bits+idx+54,8);
+    uint8_t calccrc = 0;
 
-	for (uint8_t i = 1; i < 6; ++i){
-		calccrc += bytebits_to_byte(bits + idx + 9 * i ,8);
-	}
-	calccrc &= 0xff;
-	calccrc = 0xff - calccrc;
+    for (uint8_t i = 1; i < 6; ++i){
+        calccrc += bytebits_to_byte(bits + idx + 9 * i ,8);
+    }
+    calccrc &= 0xff;
+    calccrc = 0xff - calccrc;
 
-	char crcStr[30];
-	memset(crcStr, 0x00, sizeof(crcStr) );
+    char crcStr[30];
+    memset(crcStr, 0x00, sizeof(crcStr) );
 
-	if (crc == calccrc) {
-		snprintf(crcStr, 3, "ok");
-		retval = 1;
-	} else {
-		PrintAndLogEx(DEBUG, "DEBUG: Error - IO prox crc failed");
+    if (crc == calccrc) {
+        snprintf(crcStr, 3, "ok");
+        retval = 1;
+    } else {
+        PrintAndLogEx(DEBUG, "DEBUG: Error - IO prox crc failed");
 
-		snprintf(crcStr, sizeof(crcStr), "failed 0x%02X != 0x%02X", crc, calccrc);
-		retval = 0;
-	}
+        snprintf(crcStr, sizeof(crcStr), "failed 0x%02X != 0x%02X", crc, calccrc);
+        retval = 0;
+    }
 
-	PrintAndLogEx(SUCCESS, "IO Prox XSF(%02d)%02x:%05d (%08x%08x) [crc %s]", version, facilitycode, number, code, code2, crcStr);
+    PrintAndLogEx(SUCCESS, "IO Prox XSF(%02d)%02x:%05d (%08x%08x) [crc %s]", version, facilitycode, number, code, code2, crcStr);
 
-	if (g_debugMode){
-		PrintAndLogEx(DEBUG, "DEBUG: IO prox idx: %d, Len: %d, Printing demod buffer:", idx, size);
-		printDemodBuff();
-	}
-	return retval;
+    if (g_debugMode){
+        PrintAndLogEx(DEBUG, "DEBUG: IO prox idx: %d, Len: %d, Printing demod buffer:", idx, size);
+        printDemodBuff();
+    }
+    return retval;
 }
 
 //Index map
@@ -184,169 +184,169 @@ int CmdIOProxDemod(const char *Cmd) {
 //00000000 0 11110000 1 facility 1 version* 1 code*one 1 code*two 1 ???????? 11
 //XSF(version)facility:codeone+codetwo (raw)
 int getIOProxBits(uint8_t version, uint8_t fc, uint16_t cn, uint8_t *bits) {
-	#define SEPARATOR 1
-	uint8_t pos=0;
-	// the return bits, preamble 0000 0000 0
-	uint8_t pre[64];
-	memset(pre, 0, sizeof(pre));
+    #define SEPARATOR 1
+    uint8_t pos=0;
+    // the return bits, preamble 0000 0000 0
+    uint8_t pre[64];
+    memset(pre, 0, sizeof(pre));
 
-	// skip 9 zeros as preamble
-	pos = 9;
+    // skip 9 zeros as preamble
+    pos = 9;
 
-	// another fixed byte 11110000 = 0xF0
-	num_to_bytebits(0xF0, 8, pre+pos);
-	pos += 8;
-	pre[pos] = SEPARATOR;
-	pos++;
+    // another fixed byte 11110000 = 0xF0
+    num_to_bytebits(0xF0, 8, pre+pos);
+    pos += 8;
+    pre[pos] = SEPARATOR;
+    pos++;
 
-	// add facilitycode
-	num_to_bytebits(fc, 8, pre+pos);
-	pos += 8;
-	pre[pos] = SEPARATOR;
-	pos++;
+    // add facilitycode
+    num_to_bytebits(fc, 8, pre+pos);
+    pos += 8;
+    pre[pos] = SEPARATOR;
+    pos++;
 
-	// add version
-	num_to_bytebits(version, 8, pre+pos);
-	pos += 8;
-	pre[pos] = SEPARATOR;
-	pos++;
+    // add version
+    num_to_bytebits(version, 8, pre+pos);
+    pos += 8;
+    pre[pos] = SEPARATOR;
+    pos++;
 
-	// cardnumber high byte
-	num_to_bytebits( ((cn & 0xFF00)>>8), 8, pre+pos);
-	pos += 8;
-	pre[pos] = SEPARATOR;
-	pos++;
+    // cardnumber high byte
+    num_to_bytebits( ((cn & 0xFF00)>>8), 8, pre+pos);
+    pos += 8;
+    pre[pos] = SEPARATOR;
+    pos++;
 
-	// cardnumber low byte
-	num_to_bytebits( (cn & 0xFF), 8, pre+pos);
-	pos += 8;
-	pre[pos] = SEPARATOR;
-	pos++;
+    // cardnumber low byte
+    num_to_bytebits( (cn & 0xFF), 8, pre+pos);
+    pos += 8;
+    pre[pos] = SEPARATOR;
+    pos++;
 
-	// calculate and add CRC
-	uint16_t crc = 0;
-	for (uint8_t i=1; i<6; ++i)
-		crc += bytebits_to_byte(pre+9*i, 8);
+    // calculate and add CRC
+    uint16_t crc = 0;
+    for (uint8_t i=1; i<6; ++i)
+        crc += bytebits_to_byte(pre+9*i, 8);
 
-	crc &= 0xFF;
-	crc = 0xff - crc;
-	num_to_bytebits(crc, 8, pre+pos);
-	pos += 8;
+    crc &= 0xFF;
+    crc = 0xff - crc;
+    num_to_bytebits(crc, 8, pre+pos);
+    pos += 8;
 
-	// Final two ONES
-	pre[pos] = SEPARATOR;
-	pre[++pos] = SEPARATOR;
+    // Final two ONES
+    pre[pos] = SEPARATOR;
+    pre[++pos] = SEPARATOR;
 
-	memcpy(bits, pre, sizeof(pre));
+    memcpy(bits, pre, sizeof(pre));
 
-	PrintAndLogEx(SUCCESS, "IO raw bits:\n %s \n", sprint_bin(bits, 64));
-	return 1;
+    PrintAndLogEx(SUCCESS, "IO raw bits:\n %s \n", sprint_bin(bits, 64));
+    return 1;
 }
 
 int CmdIOProxSim(const char *Cmd) {
-	uint16_t cn = 0;
-	uint8_t version = 0, fc = 0;
-	uint8_t bits[64];
-	size_t size = sizeof(bits);
-	memset(bits, 0x00, size);
+    uint16_t cn = 0;
+    uint8_t version = 0, fc = 0;
+    uint8_t bits[64];
+    size_t size = sizeof(bits);
+    memset(bits, 0x00, size);
 
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_io_sim();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_io_sim();
 
-  	version = param_get8(Cmd, 0);
-	fc = param_get8(Cmd, 1);
-	cn = param_get32ex(Cmd, 2, 0, 10);
+    version = param_get8(Cmd, 0);
+    fc = param_get8(Cmd, 1);
+    cn = param_get32ex(Cmd, 2, 0, 10);
 
-	if ( !version | !fc || !cn) return usage_lf_io_sim();
+    if ( !version | !fc || !cn) return usage_lf_io_sim();
 
-	if ((cn & 0xFFFF) != cn) {
-		cn &= 0xFFFF;
-		PrintAndLogEx(INFO, "Card Number Truncated to 16-bits (IOProx): %u", cn);
-	}
+    if ((cn & 0xFFFF) != cn) {
+        cn &= 0xFFFF;
+        PrintAndLogEx(INFO, "Card Number Truncated to 16-bits (IOProx): %u", cn);
+    }
 
-	// clock 64, FSK2a fcHIGH 10 | fcLOW 8
-	uint8_t clk = 64, invert = 1, high = 10, low = 8;
-	uint16_t arg1, arg2;
-	arg1 = high << 8 | low;
-	arg2 = invert << 8 | clk;
+    // clock 64, FSK2a fcHIGH 10 | fcLOW 8
+    uint8_t clk = 64, invert = 1, high = 10, low = 8;
+    uint16_t arg1, arg2;
+    arg1 = high << 8 | low;
+    arg2 = invert << 8 | clk;
 
-	PrintAndLogEx(SUCCESS, "Simulating IOProx version: %u FC: %u; CN: %u\n", version, fc, cn);
-	PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation or run another command");
+    PrintAndLogEx(SUCCESS, "Simulating IOProx version: %u FC: %u; CN: %u\n", version, fc, cn);
+    PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation or run another command");
 
-	if ( !getIOProxBits(version, fc, cn, bits)) {
-		PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
-		return 1;
-	}
-	// IOProx uses: fcHigh: 10, fcLow: 8, clk: 64, invert: 1
-	// arg1 --- fcHigh<<8 + fcLow
-	// arg2 --- Invert and clk setting
-	// size --- 64 bits == 8 bytes
-	UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}};
-	memcpy(c.d.asBytes, bits, size);
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+    if ( !getIOProxBits(version, fc, cn, bits)) {
+        PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
+        return 1;
+    }
+    // IOProx uses: fcHigh: 10, fcLow: 8, clk: 64, invert: 1
+    // arg1 --- fcHigh<<8 + fcLow
+    // arg2 --- Invert and clk setting
+    // size --- 64 bits == 8 bytes
+    UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}};
+    memcpy(c.d.asBytes, bits, size);
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 
 int CmdIOProxClone(const char *Cmd) {
 
-	uint32_t blocks[3] = {T55x7_MODULATION_FSK2a | T55x7_BITRATE_RF_64 | 2 << T55x7_MAXBLOCK_SHIFT, 0, 0};
-	uint16_t cn = 0;
-	uint8_t version = 0, fc = 0;
-	uint8_t bits[64];
-	memset(bits,0,sizeof(bits));
+    uint32_t blocks[3] = {T55x7_MODULATION_FSK2a | T55x7_BITRATE_RF_64 | 2 << T55x7_MAXBLOCK_SHIFT, 0, 0};
+    uint16_t cn = 0;
+    uint8_t version = 0, fc = 0;
+    uint8_t bits[64];
+    memset(bits,0,sizeof(bits));
 
-	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_io_clone();
+    char cmdp = param_getchar(Cmd, 0);
+    if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_io_clone();
 
-  	version = param_get8(Cmd, 0);
-	fc = param_get8(Cmd, 1);
-	cn = param_get32ex(Cmd, 2, 0, 10);
+    version = param_get8(Cmd, 0);
+    fc = param_get8(Cmd, 1);
+    cn = param_get32ex(Cmd, 2, 0, 10);
 
-	if ( !version | !fc || !cn) return usage_lf_io_clone();
+    if ( !version | !fc || !cn) return usage_lf_io_clone();
 
-	if ((cn & 0xFFFF) != cn) {
-		cn &= 0xFFFF;
-		PrintAndLogEx(INFO, "Card Number Truncated to 16-bits (IOProx): %u", cn);
-	}
+    if ((cn & 0xFFFF) != cn) {
+        cn &= 0xFFFF;
+        PrintAndLogEx(INFO, "Card Number Truncated to 16-bits (IOProx): %u", cn);
+    }
 
-	if ( !getIOProxBits(version, fc, cn, bits)) {
-		PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
-		return 1;
-	}
+    if ( !getIOProxBits(version, fc, cn, bits)) {
+        PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
+        return 1;
+    }
 
-	if (param_getchar(Cmd, 3) == 'Q' || param_getchar(Cmd, 3) == 'q')
-		blocks[0] = T5555_MODULATION_FSK2 | T5555_INVERT_OUTPUT | T5555_SET_BITRATE(64) | 2 << T5555_MAXBLOCK_SHIFT;
+    if (param_getchar(Cmd, 3) == 'Q' || param_getchar(Cmd, 3) == 'q')
+        blocks[0] = T5555_MODULATION_FSK2 | T5555_INVERT_OUTPUT | T5555_SET_BITRATE(64) | 2 << T5555_MAXBLOCK_SHIFT;
 
-	blocks[1] = bytebits_to_byte(bits, 32);
-	blocks[2] = bytebits_to_byte(bits + 32, 32);
+    blocks[1] = bytebits_to_byte(bits, 32);
+    blocks[2] = bytebits_to_byte(bits + 32, 32);
 
-	PrintAndLogEx(INFO, "Preparing to clone IOProx to T55x7 with Version: %u FC: %u, CN: %u", version, fc, cn);
-	print_blocks(blocks, 3);
+    PrintAndLogEx(INFO, "Preparing to clone IOProx to T55x7 with Version: %u FC: %u, CN: %u", version, fc, cn);
+    print_blocks(blocks, 3);
 
-	//UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
-	UsbCommand c = {CMD_IO_CLONE_TAG, {blocks[1],blocks[2],0}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+    //UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
+    UsbCommand c = {CMD_IO_CLONE_TAG, {blocks[1],blocks[2],0}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 
 static command_t CommandTable[] = {
-	{"help",	CmdHelp,		1, "this help"},
-	{"demod",	CmdIOProxDemod,	1, "demodulate an IOProx tag from the GraphBuffer"},
-	{"read",	CmdIOProxRead,	1, "attempt to read and extract tag data"},
-	{"clone",	CmdIOProxClone,	0, "clone IOProx to T55x7"},
-	{"sim",		CmdIOProxSim,	0, "simulate IOProx tag"},
-	{NULL, NULL, 0, NULL}
+    {"help",    CmdHelp,        1, "this help"},
+    {"demod",   CmdIOProxDemod, 1, "demodulate an IOProx tag from the GraphBuffer"},
+    {"read",    CmdIOProxRead,  1, "attempt to read and extract tag data"},
+    {"clone",   CmdIOProxClone, 0, "clone IOProx to T55x7"},
+    {"sim",     CmdIOProxSim,   0, "simulate IOProx tag"},
+    {NULL, NULL, 0, NULL}
 };
 
 int CmdLFIO(const char *Cmd){
-	clearCommandBuffer();
-	CmdsParse(CommandTable, Cmd);
-	return 0;
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
+    return 0;
 }
 
 int CmdHelp(const char *Cmd) {
-	CmdsHelp(CommandTable);
-	return 0;
+    CmdsHelp(CommandTable);
+    return 0;
 }
diff --git a/client/cmdlfjablotron.c b/client/cmdlfjablotron.c
index 339752202..12c7a77e5 100644
--- a/client/cmdlfjablotron.c
+++ b/client/cmdlfjablotron.c
@@ -13,52 +13,52 @@
 static int CmdHelp(const char *Cmd);
 
 int usage_lf_jablotron_clone(void){
-	PrintAndLogEx(NORMAL, "clone a Jablotron tag to a T55x7 tag.");
-	PrintAndLogEx(NORMAL, "Usage: lf jablotron clone [h] <card ID> <Q5>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h          : This help");
-	PrintAndLogEx(NORMAL, "      <card ID>  : jablotron card ID");
-	PrintAndLogEx(NORMAL, "      <Q5>       : specify write to Q5 (t5555 instead of t55x7)");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "       lf jablotron clone 112233");
-	return 0;
+    PrintAndLogEx(NORMAL, "clone a Jablotron tag to a T55x7 tag.");
+    PrintAndLogEx(NORMAL, "Usage: lf jablotron clone [h] <card ID> <Q5>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "      h          : This help");
+    PrintAndLogEx(NORMAL, "      <card ID>  : jablotron card ID");
+    PrintAndLogEx(NORMAL, "      <Q5>       : specify write to Q5 (t5555 instead of t55x7)");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "       lf jablotron clone 112233");
+    return 0;
 }
 
 int usage_lf_jablotron_sim(void) {
-	PrintAndLogEx(NORMAL, "Enables simulation of jablotron card with specified card number.");
-	PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  lf jablotron sim [h] <card ID>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h          : This help");
-	PrintAndLogEx(NORMAL, "      <card ID>  : jablotron card ID");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "       lf jablotron sim 112233");
-	return 0;
+    PrintAndLogEx(NORMAL, "Enables simulation of jablotron card with specified card number.");
+    PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  lf jablotron sim [h] <card ID>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "      h          : This help");
+    PrintAndLogEx(NORMAL, "      <card ID>  : jablotron card ID");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "       lf jablotron sim 112233");
+    return 0;
 }
 
 static uint8_t jablontron_chksum(uint8_t *bits){
-	uint8_t chksum = 0;
-	for (int i=16; i < 56; i += 8) {
-		chksum += bytebits_to_byte(bits+i,8);
-	}
-	chksum ^= 0x3A;
-	return chksum;
+    uint8_t chksum = 0;
+    for (int i=16; i < 56; i += 8) {
+        chksum += bytebits_to_byte(bits+i,8);
+    }
+    chksum ^= 0x3A;
+    return chksum;
 }
 
 int getJablotronBits(uint64_t fullcode, uint8_t *bits) {
-	//preamp
-	num_to_bytebits(0xFFFF, 16, bits);
+    //preamp
+    num_to_bytebits(0xFFFF, 16, bits);
 
-	//fullcode
-	num_to_bytebits(fullcode, 40, bits+16);
+    //fullcode
+    num_to_bytebits(fullcode, 40, bits+16);
 
-	//chksum byte
-	uint8_t chksum = jablontron_chksum(bits);
-	num_to_bytebits(chksum, 8, bits+56);
-	return 1;
+    //chksum byte
+    uint8_t chksum = jablontron_chksum(bits);
+    num_to_bytebits(chksum, 8, bits+56);
+    return 1;
 }
 
 // ASK/Diphase fc/64 (inverted Biphase)
@@ -66,180 +66,180 @@ int getJablotronBits(uint64_t fullcode, uint8_t *bits) {
 // the parameter *bits needs to be demoded before call
 // 0xFFFF preamble, 64bits
 int detectJablotron(uint8_t *bits, size_t *size) {
-	if (*size < 64*2) return -1; //make sure buffer has enough data
-	size_t startIdx = 0;
-	uint8_t preamble[] = {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0};
-	if (preambleSearch(bits, preamble, sizeof(preamble), size, &startIdx) == 0)
-		return -2; //preamble not found
-	if (*size != 64) return -3; // wrong demoded size
+    if (*size < 64*2) return -1; //make sure buffer has enough data
+    size_t startIdx = 0;
+    uint8_t preamble[] = {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0};
+    if (preambleSearch(bits, preamble, sizeof(preamble), size, &startIdx) == 0)
+        return -2; //preamble not found
+    if (*size != 64) return -3; // wrong demoded size
 
-	uint8_t checkchksum = jablontron_chksum(bits+startIdx);
-	uint8_t crc = bytebits_to_byte(bits+startIdx+56, 8);
-	if ( checkchksum != crc ) return -5;
-	return (int)startIdx;
+    uint8_t checkchksum = jablontron_chksum(bits+startIdx);
+    uint8_t crc = bytebits_to_byte(bits+startIdx+56, 8);
+    if ( checkchksum != crc ) return -5;
+    return (int)startIdx;
 }
 
 static uint64_t getJablontronCardId( uint64_t rawcode ){
-	uint64_t id = 0;
-	uint8_t bytes[] = {0,0,0,0,0};
-	num_to_bytes(rawcode, 5, bytes);
-	for ( int i = 4, j = 0; i > -1;  --i, j += 2 ) {
-		id += NIBBLE_LOW( bytes[i] ) * (int)pow(10,j);
-		id += NIBBLE_HIGH( bytes[i] ) * (int)pow(10,j+1);
-	}
-	return id;
+    uint64_t id = 0;
+    uint8_t bytes[] = {0,0,0,0,0};
+    num_to_bytes(rawcode, 5, bytes);
+    for ( int i = 4, j = 0; i > -1;  --i, j += 2 ) {
+        id += NIBBLE_LOW( bytes[i] ) * (int)pow(10,j);
+        id += NIBBLE_HIGH( bytes[i] ) * (int)pow(10,j+1);
+    }
+    return id;
 }
 
 //see ASKDemod for what args are accepted
 int CmdJablotronDemod(const char *Cmd) {
 
-	//Differential Biphase / di-phase (inverted biphase)
-	//get binary from ask wave
-	if (!ASKbiphaseDemod("0 64 1 0", false)) {
-		if (g_debugMode) PrintAndLogEx(DEBUG, "DEBUG: Error - Jablotron ASKbiphaseDemod failed");
-		return 0;
-	}
-	size_t size = DemodBufferLen;
-	int ans = detectJablotron(DemodBuffer, &size);
-	if (ans < 0){
-		if (g_debugMode){
-			if (ans == -1)
-				PrintAndLogEx(DEBUG, "DEBUG: Error - Jablotron too few bits found");
-			else if (ans == -2)
-				PrintAndLogEx(DEBUG, "DEBUG: Error - Jablotron preamble not found");
-			else if (ans == -3)
-				PrintAndLogEx(DEBUG, "DEBUG: Error - Jablotron size not correct: %d", size);
-			else if (ans == -5)
-				PrintAndLogEx(DEBUG, "DEBUG: Error - Jablotron checksum failed");
-			else
-				PrintAndLogEx(DEBUG, "DEBUG: Error - Jablotron ans: %d", ans);
-		}
-		return 0;
-	}
+    //Differential Biphase / di-phase (inverted biphase)
+    //get binary from ask wave
+    if (!ASKbiphaseDemod("0 64 1 0", false)) {
+        if (g_debugMode) PrintAndLogEx(DEBUG, "DEBUG: Error - Jablotron ASKbiphaseDemod failed");
+        return 0;
+    }
+    size_t size = DemodBufferLen;
+    int ans = detectJablotron(DemodBuffer, &size);
+    if (ans < 0){
+        if (g_debugMode){
+            if (ans == -1)
+                PrintAndLogEx(DEBUG, "DEBUG: Error - Jablotron too few bits found");
+            else if (ans == -2)
+                PrintAndLogEx(DEBUG, "DEBUG: Error - Jablotron preamble not found");
+            else if (ans == -3)
+                PrintAndLogEx(DEBUG, "DEBUG: Error - Jablotron size not correct: %d", size);
+            else if (ans == -5)
+                PrintAndLogEx(DEBUG, "DEBUG: Error - Jablotron checksum failed");
+            else
+                PrintAndLogEx(DEBUG, "DEBUG: Error - Jablotron ans: %d", ans);
+        }
+        return 0;
+    }
 
-	setDemodBuf(DemodBuffer, 64, ans);
-	setClockGrid(g_DemodClock, g_DemodStartIdx + (ans*g_DemodClock));
+    setDemodBuf(DemodBuffer, 64, ans);
+    setClockGrid(g_DemodClock, g_DemodStartIdx + (ans*g_DemodClock));
 
-	//got a good demod
-	uint32_t raw1 = bytebits_to_byte(DemodBuffer, 32);
-	uint32_t raw2 = bytebits_to_byte(DemodBuffer+32, 32);
+    //got a good demod
+    uint32_t raw1 = bytebits_to_byte(DemodBuffer, 32);
+    uint32_t raw2 = bytebits_to_byte(DemodBuffer+32, 32);
 
-	uint64_t rawid = bytebits_to_byte(DemodBuffer+16, 40);
-	uint64_t id = getJablontronCardId(rawid);
+    uint64_t rawid = bytebits_to_byte(DemodBuffer+16, 40);
+    uint64_t id = getJablontronCardId(rawid);
 
-	PrintAndLogEx(SUCCESS, "Jablotron Tag Found: Card ID: %"PRIx64" :: Raw: %08X%08X", id, raw1, raw2);
+    PrintAndLogEx(SUCCESS, "Jablotron Tag Found: Card ID: %"PRIx64" :: Raw: %08X%08X", id, raw1, raw2);
 
-	uint8_t chksum = raw2 & 0xFF;
-	PrintAndLogEx(INFO, "Checksum: %02X [%s]",
-		chksum,
-		(chksum == jablontron_chksum(DemodBuffer)) ? _GREEN_(OK) : _RED_(FAIL)
-	);
+    uint8_t chksum = raw2 & 0xFF;
+    PrintAndLogEx(INFO, "Checksum: %02X [%s]",
+        chksum,
+        (chksum == jablontron_chksum(DemodBuffer)) ? _GREEN_(OK) : _RED_(FAIL)
+    );
 
-	id = DEC2BCD(id);
-	// Printed format: 1410-nn-nnnn-nnnn
-	PrintAndLogEx(SUCCESS, "Printed: 1410-%02X-%04X-%04X",
-		(uint8_t)(id >> 32) & 0xFF,
-		(uint16_t)(id >> 16) & 0xFFFF,
-		(uint16_t)id & 0xFFFF
-	);
-	return 1;
+    id = DEC2BCD(id);
+    // Printed format: 1410-nn-nnnn-nnnn
+    PrintAndLogEx(SUCCESS, "Printed: 1410-%02X-%04X-%04X",
+        (uint8_t)(id >> 32) & 0xFF,
+        (uint16_t)(id >> 16) & 0xFFFF,
+        (uint16_t)id & 0xFFFF
+    );
+    return 1;
 }
 
 int CmdJablotronRead(const char *Cmd) {
-	lf_read(true, 10000);
-	return CmdJablotronDemod(Cmd);
+    lf_read(true, 10000);
+    return CmdJablotronDemod(Cmd);
 }
 
 int CmdJablotronClone(const char *Cmd) {
 
-	uint64_t fullcode = 0;
-	uint32_t blocks[3] = {T55x7_MODULATION_DIPHASE | T55x7_BITRATE_RF_64 | 2 << T55x7_MAXBLOCK_SHIFT, 0, 0};
+    uint64_t fullcode = 0;
+    uint32_t blocks[3] = {T55x7_MODULATION_DIPHASE | T55x7_BITRATE_RF_64 | 2 << T55x7_MAXBLOCK_SHIFT, 0, 0};
 
-	uint8_t bits[64];
-	memset(bits, 0, sizeof(bits));
+    uint8_t bits[64];
+    memset(bits, 0, sizeof(bits));
 
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_jablotron_clone();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_jablotron_clone();
 
-	fullcode = param_get64ex(Cmd, 0, 0, 16);
+    fullcode = param_get64ex(Cmd, 0, 0, 16);
 
-	//Q5
-	if (param_getchar(Cmd, 1) == 'Q' || param_getchar(Cmd, 1) == 'q')
-		blocks[0] = T5555_MODULATION_BIPHASE | T5555_INVERT_OUTPUT | T5555_SET_BITRATE(64) | 2 << T5555_MAXBLOCK_SHIFT;
+    //Q5
+    if (param_getchar(Cmd, 1) == 'Q' || param_getchar(Cmd, 1) == 'q')
+        blocks[0] = T5555_MODULATION_BIPHASE | T5555_INVERT_OUTPUT | T5555_SET_BITRATE(64) | 2 << T5555_MAXBLOCK_SHIFT;
 
-	// clearing the topbit needed for the preambl detection.
-	if ((fullcode & 0x7FFFFFFFFF) != fullcode) {
-		fullcode &= 0x7FFFFFFFFF;
-		PrintAndLogEx(INFO, "Card Number Truncated to 39bits: %"PRIx64, fullcode);
-	}
+    // clearing the topbit needed for the preambl detection.
+    if ((fullcode & 0x7FFFFFFFFF) != fullcode) {
+        fullcode &= 0x7FFFFFFFFF;
+        PrintAndLogEx(INFO, "Card Number Truncated to 39bits: %"PRIx64, fullcode);
+    }
 
-	if ( !getJablotronBits(fullcode, bits)) {
-		PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
-		return 1;
-	}
+    if ( !getJablotronBits(fullcode, bits)) {
+        PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
+        return 1;
+    }
 
-	blocks[1] = bytebits_to_byte(bits, 32);
-	blocks[2] = bytebits_to_byte(bits + 32, 32);
+    blocks[1] = bytebits_to_byte(bits, 32);
+    blocks[2] = bytebits_to_byte(bits + 32, 32);
 
-	PrintAndLogEx(INFO, "Preparing to clone Jablotron to T55x7 with FullCode: %"PRIx64, fullcode);
-	print_blocks(blocks, 3);
+    PrintAndLogEx(INFO, "Preparing to clone Jablotron to T55x7 with FullCode: %"PRIx64, fullcode);
+    print_blocks(blocks, 3);
 
-	UsbCommand resp;
-	UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
+    UsbCommand resp;
+    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
 
-	for (uint8_t i=0; i<3; i++) {
-		c.arg[0] = blocks[i];
-		c.arg[1] = i;
-		clearCommandBuffer();
-		SendCommand(&c);
-		if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)){
-			PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
-			return -1;
-		}
-	}
+    for (uint8_t i=0; i<3; i++) {
+        c.arg[0] = blocks[i];
+        c.arg[1] = i;
+        clearCommandBuffer();
+        SendCommand(&c);
+        if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)){
+            PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
+            return -1;
+        }
+    }
     return 0;
 }
 
 int CmdJablotronSim(const char *Cmd) {
-	uint64_t fullcode = 0;
+    uint64_t fullcode = 0;
 
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_jablotron_sim();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_jablotron_sim();
 
-	fullcode = param_get64ex(Cmd, 0, 0, 16);
+    fullcode = param_get64ex(Cmd, 0, 0, 16);
 
-	// clearing the topbit needed for the preambl detection.
-	if ((fullcode & 0x7FFFFFFFFF) != fullcode) {
-		fullcode &= 0x7FFFFFFFFF;
-		PrintAndLogEx(INFO, "Card Number Truncated to 39bits: %"PRIx64, fullcode);
-	}
+    // clearing the topbit needed for the preambl detection.
+    if ((fullcode & 0x7FFFFFFFFF) != fullcode) {
+        fullcode &= 0x7FFFFFFFFF;
+        PrintAndLogEx(INFO, "Card Number Truncated to 39bits: %"PRIx64, fullcode);
+    }
 
-	uint8_t clk = 64, encoding = 2, separator = 0, invert = 1;
-	uint16_t arg1, arg2;
-	size_t size = 64;
-	arg1 = clk << 8 | encoding;
-	arg2 = invert << 8 | separator;
+    uint8_t clk = 64, encoding = 2, separator = 0, invert = 1;
+    uint16_t arg1, arg2;
+    size_t size = 64;
+    arg1 = clk << 8 | encoding;
+    arg2 = invert << 8 | separator;
 
-	PrintAndLogEx(SUCCESS, "Simulating Jablotron - FullCode: %"PRIx64, fullcode);
+    PrintAndLogEx(SUCCESS, "Simulating Jablotron - FullCode: %"PRIx64, fullcode);
 
-	UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};
-	getJablotronBits(fullcode, c.d.asBytes);
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+    UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};
+    getJablotronBits(fullcode, c.d.asBytes);
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 
 static command_t CommandTable[] = {
-    {"help",	CmdHelp,			1, "This help"},
-	{"demod",	CmdJablotronDemod,	1, "Demodulate an Jablotron tag from the GraphBuffer"},
-	{"read",	CmdJablotronRead,	0, "Attempt to read and extract tag data from the antenna"},
-	{"clone",	CmdJablotronClone,	0, "clone jablotron tag"},
-	{"sim",		CmdJablotronSim,	0, "simulate jablotron tag"},
+    {"help",    CmdHelp,            1, "This help"},
+    {"demod",   CmdJablotronDemod,  1, "Demodulate an Jablotron tag from the GraphBuffer"},
+    {"read",    CmdJablotronRead,   0, "Attempt to read and extract tag data from the antenna"},
+    {"clone",   CmdJablotronClone,  0, "clone jablotron tag"},
+    {"sim",     CmdJablotronSim,    0, "simulate jablotron tag"},
     {NULL, NULL, 0, NULL}
 };
 
 int CmdLFJablotron(const char *Cmd) {
-	clearCommandBuffer();
+    clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
diff --git a/client/cmdlfkeri.c b/client/cmdlfkeri.c
index 79fc9e6f1..af2b48552 100644
--- a/client/cmdlfkeri.c
+++ b/client/cmdlfkeri.c
@@ -12,232 +12,232 @@
 static int CmdHelp(const char *Cmd);
 
 int usage_lf_keri_clone(void){
-	PrintAndLogEx(NORMAL, "clone a KERI tag to a T55x7 tag.");
-	PrintAndLogEx(NORMAL, "Usage: lf keri clone [h] <id> <Q5>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h          : This help");
-	PrintAndLogEx(NORMAL, "      <id>       : Keri Internal ID");
-	PrintAndLogEx(NORMAL, "      <Q5>       : specify write to Q5 (t5555 instead of t55x7)");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "       lf keri clone 112233");
-	return 0;
+    PrintAndLogEx(NORMAL, "clone a KERI tag to a T55x7 tag.");
+    PrintAndLogEx(NORMAL, "Usage: lf keri clone [h] <id> <Q5>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "      h          : This help");
+    PrintAndLogEx(NORMAL, "      <id>       : Keri Internal ID");
+    PrintAndLogEx(NORMAL, "      <Q5>       : specify write to Q5 (t5555 instead of t55x7)");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "       lf keri clone 112233");
+    return 0;
 }
 
 int usage_lf_keri_sim(void) {
-	PrintAndLogEx(NORMAL, "Enables simulation of KERI card with specified card number.");
-	PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  lf keri sim [h] <id>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h          : This help");
-	PrintAndLogEx(NORMAL, "      <id>       : Keri Internal ID");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "       lf keri sim 112233");
-	return 0;
+    PrintAndLogEx(NORMAL, "Enables simulation of KERI card with specified card number.");
+    PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  lf keri sim [h] <id>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "      h          : This help");
+    PrintAndLogEx(NORMAL, "      <id>       : Keri Internal ID");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "       lf keri sim 112233");
+    return 0;
 }
 
 // find KERI preamble in already demoded data
 int detectKeri(uint8_t *dest, size_t *size, bool *invert) {
 
-	uint8_t preamble[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1};
-	uint8_t preamble_i[] = {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0};
+    uint8_t preamble[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1};
+    uint8_t preamble_i[] = {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0};
 
-	// sanity check.
-	if ( *size < sizeof(preamble) + 100) return -1;
+    // sanity check.
+    if ( *size < sizeof(preamble) + 100) return -1;
 
-	size_t startIdx = 0;
+    size_t startIdx = 0;
 
-	if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx)) {
+    if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx)) {
 
-		// if didn't find preamble try again inverting
-		if (!preambleSearch(DemodBuffer, preamble_i, sizeof(preamble_i), size, &startIdx))
-			return -2;
+        // if didn't find preamble try again inverting
+        if (!preambleSearch(DemodBuffer, preamble_i, sizeof(preamble_i), size, &startIdx))
+            return -2;
 
-		*invert ^= 1;
-	}
+        *invert ^= 1;
+    }
 
-	if (*size != 64) return -3; //wrong demoded size
+    if (*size != 64) return -3; //wrong demoded size
 
-	return (int)startIdx;
+    return (int)startIdx;
 }
 
 int CmdKeriDemod(const char *Cmd) {
 
-	if (!PSKDemod("", false)) {
-		PrintAndLogEx(DEBUG, "DEBUG: Error - KERI: PSK1 Demod failed");
-		return 0;
-	}
-	bool invert = false;
-	size_t size = DemodBufferLen;
-	int idx = detectKeri(DemodBuffer, &size, &invert);
-	if (idx < 0) {
-		if (idx == -1)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - KERI: too few bits found");
-		else if (idx == -2)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - KERI: preamble not found");
-		else if (idx == -3)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - KERI: Size not correct: 64 != %d", size);
-		else
-			PrintAndLogEx(DEBUG, "DEBUG: Error - KERI: ans: %d", idx);
+    if (!PSKDemod("", false)) {
+        PrintAndLogEx(DEBUG, "DEBUG: Error - KERI: PSK1 Demod failed");
+        return 0;
+    }
+    bool invert = false;
+    size_t size = DemodBufferLen;
+    int idx = detectKeri(DemodBuffer, &size, &invert);
+    if (idx < 0) {
+        if (idx == -1)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - KERI: too few bits found");
+        else if (idx == -2)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - KERI: preamble not found");
+        else if (idx == -3)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - KERI: Size not correct: 64 != %d", size);
+        else
+            PrintAndLogEx(DEBUG, "DEBUG: Error - KERI: ans: %d", idx);
 
-		return 0;
-	}
-	setDemodBuf(DemodBuffer, size, idx);
-	setClockGrid(g_DemodClock, g_DemodStartIdx + (idx * g_DemodClock));
+        return 0;
+    }
+    setDemodBuf(DemodBuffer, size, idx);
+    setClockGrid(g_DemodClock, g_DemodStartIdx + (idx * g_DemodClock));
 
-	//got a good demod
-	uint32_t raw1 = bytebits_to_byte(DemodBuffer   , 32);
-	uint32_t raw2 = bytebits_to_byte(DemodBuffer+32, 32);
+    //got a good demod
+    uint32_t raw1 = bytebits_to_byte(DemodBuffer   , 32);
+    uint32_t raw2 = bytebits_to_byte(DemodBuffer+32, 32);
 
-	//get internal id
-	uint32_t ID = bytebits_to_byte(DemodBuffer+29, 32);
-	ID &= 0x7FFFFFFF;
+    //get internal id
+    uint32_t ID = bytebits_to_byte(DemodBuffer+29, 32);
+    ID &= 0x7FFFFFFF;
 
-	/*
-		000000000000000000000000000001XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX111
-		^^^^^^^^^^^^^^^^^^^^^^^^^^^^^1###############################^^^
-		Preamble block 29 bits of ZEROS
-		32 bit Internal ID  (First bit always 1)
-		3 bit of 1s in the end
+    /*
+        000000000000000000000000000001XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX111
+        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^1###############################^^^
+        Preamble block 29 bits of ZEROS
+        32 bit Internal ID  (First bit always 1)
+        3 bit of 1s in the end
 
-		How this is decoded to Facility ID, Card number is unknown
-		Facility ID =  0-31  (indicates 5 bits)
-		Card number = up to 10 digits
+        How this is decoded to Facility ID, Card number is unknown
+        Facility ID =  0-31  (indicates 5 bits)
+        Card number = up to 10 digits
 
-		Might be a hash of FC & CN to generate Internal ID
-	*/
+        Might be a hash of FC & CN to generate Internal ID
+    */
 
-	PrintAndLogEx(SUCCESS, "KERI Tag Found -- Internal ID: %u", ID);
-	PrintAndLogEx(SUCCESS, "Raw: %08X%08X", raw1 ,raw2);
+    PrintAndLogEx(SUCCESS, "KERI Tag Found -- Internal ID: %u", ID);
+    PrintAndLogEx(SUCCESS, "Raw: %08X%08X", raw1 ,raw2);
 
-	if (invert){
-		PrintAndLogEx(INFO, "Had to Invert - probably KERI");
-		for (size_t i = 0; i < size; i++)
-			DemodBuffer[i] ^= 1;
+    if (invert){
+        PrintAndLogEx(INFO, "Had to Invert - probably KERI");
+        for (size_t i = 0; i < size; i++)
+            DemodBuffer[i] ^= 1;
 
-		CmdPrintDemodBuff("x");
-	}
-	return 1;
+        CmdPrintDemodBuff("x");
+    }
+    return 1;
 }
 
 int CmdKeriRead(const char *Cmd) {
-	lf_read(true, 10000);
-	return CmdKeriDemod(Cmd);
+    lf_read(true, 10000);
+    return CmdKeriDemod(Cmd);
 }
 
 int CmdKeriClone(const char *Cmd) {
 
-	uint32_t internalid = 0;
-	uint32_t blocks[3] = {
-			T55x7_TESTMODE_DISABLED |
-			T55x7_X_MODE |
-			T55x7_MODULATION_PSK1 |
-			T55x7_PSKCF_RF_2 |
-			2 << T55x7_MAXBLOCK_SHIFT,
-			0,
-			0};
+    uint32_t internalid = 0;
+    uint32_t blocks[3] = {
+            T55x7_TESTMODE_DISABLED |
+            T55x7_X_MODE |
+            T55x7_MODULATION_PSK1 |
+            T55x7_PSKCF_RF_2 |
+            2 << T55x7_MAXBLOCK_SHIFT,
+            0,
+            0};
 
-	// dynamic bitrate used
-	blocks[0] |= 0xF << 18;
+    // dynamic bitrate used
+    blocks[0] |= 0xF << 18;
 
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_keri_clone();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_keri_clone();
 
-	internalid = param_get32ex(Cmd, 0, 0, 10);
+    internalid = param_get32ex(Cmd, 0, 0, 10);
 
-	//Q5
-	if (tolower(param_getchar(Cmd, 1)) == 'q') {
-		blocks[0] =
-			T5555_MODULATION_PSK1 |
-			T5555_SET_BITRATE(128) |
-			T5555_PSK_RF_2 |
-			2 << T5555_MAXBLOCK_SHIFT;
-	}
+    //Q5
+    if (tolower(param_getchar(Cmd, 1)) == 'q') {
+        blocks[0] =
+            T5555_MODULATION_PSK1 |
+            T5555_SET_BITRATE(128) |
+            T5555_PSK_RF_2 |
+            2 << T5555_MAXBLOCK_SHIFT;
+    }
 
 
-	// MSB is ONE
-	internalid |= 0x80000000;
+    // MSB is ONE
+    internalid |= 0x80000000;
 
-	// 3 LSB is ONE
-	uint64_t data =  ((uint64_t)internalid << 3 ) + 7;
+    // 3 LSB is ONE
+    uint64_t data =  ((uint64_t)internalid << 3 ) + 7;
 
-	//
-	blocks[1] = data >> 32;
-	blocks[2] = data & 0xFFFFFFFF;
+    //
+    blocks[1] = data >> 32;
+    blocks[2] = data & 0xFFFFFFFF;
 
-	PrintAndLogEx(INFO, "Preparing to clone KERI to T55x7 with Internal Id: %u", internalid);
-	print_blocks(blocks, 3);
+    PrintAndLogEx(INFO, "Preparing to clone KERI to T55x7 with Internal Id: %u", internalid);
+    print_blocks(blocks, 3);
 
 
-	UsbCommand resp;
-	UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
+    UsbCommand resp;
+    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
 
 
-	for (uint8_t i = 0; i < 3; i++) {
-		c.arg[0] = blocks[i];
-		c.arg[1] = i;
-		clearCommandBuffer();
-		SendCommand(&c);
-		if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)){
-			PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
-			return -1;
-		}
-	}
+    for (uint8_t i = 0; i < 3; i++) {
+        c.arg[0] = blocks[i];
+        c.arg[1] = i;
+        clearCommandBuffer();
+        SendCommand(&c);
+        if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)){
+            PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
+            return -1;
+        }
+    }
 
     return 0;
 }
 
 int CmdKeriSim(const char *Cmd) {
 
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_keri_sim();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_keri_sim();
 
-	uint64_t internalid = param_get32ex(Cmd, 0, 0, 10);
-	internalid |= 0x80000000;
-	internalid <<= 3;
-	internalid += 7;
+    uint64_t internalid = param_get32ex(Cmd, 0, 0, 10);
+    internalid |= 0x80000000;
+    internalid <<= 3;
+    internalid += 7;
 
-	uint8_t bits[64] = {0x00};
-	// loop to bits
-	uint8_t j = 0;
-	for ( int8_t i = 63; i >= 0; --i) {
-		bits[j++] = ((internalid >> i) & 1 );
-	}
+    uint8_t bits[64] = {0x00};
+    // loop to bits
+    uint8_t j = 0;
+    for ( int8_t i = 63; i >= 0; --i) {
+        bits[j++] = ((internalid >> i) & 1 );
+    }
 
-	uint8_t clk = 32, carrier = 2, invert = 0;
-	uint16_t arg1, arg2;
-	size_t size = 64;
-	arg1 = clk << 8 | carrier;
-	arg2 = invert;
+    uint8_t clk = 32, carrier = 2, invert = 0;
+    uint16_t arg1, arg2;
+    size_t size = 64;
+    arg1 = clk << 8 | carrier;
+    arg2 = invert;
 
-	PrintAndLogEx(SUCCESS, "Simulating KERI - Internal Id: %u", internalid);
+    PrintAndLogEx(SUCCESS, "Simulating KERI - Internal Id: %u", internalid);
 
-	UsbCommand c = {CMD_PSK_SIM_TAG, {arg1, arg2, size}};
-	memcpy(c.d.asBytes, bits, size);
-	clearCommandBuffer();
-	SendCommand(&c);
+    UsbCommand c = {CMD_PSK_SIM_TAG, {arg1, arg2, size}};
+    memcpy(c.d.asBytes, bits, size);
+    clearCommandBuffer();
+    SendCommand(&c);
 
-	return 0;
+    return 0;
 }
 
 static command_t CommandTable[] = {
-	{"help",  CmdHelp,		1, "This help"},
-	{"demod", CmdKeriDemod,	1, "Demodulate an KERI tag from the GraphBuffer"},
-	{"read",  CmdKeriRead,	0, "Attempt to read and extract tag data from the antenna"},
-	{"clone", CmdKeriClone,	0, "clone KERI to T55x7"},
-	{"sim",   CmdKeriSim,	0, "simulate KERI tag"},
-	{NULL, NULL, 0, NULL}
+    {"help",  CmdHelp,      1, "This help"},
+    {"demod", CmdKeriDemod, 1, "Demodulate an KERI tag from the GraphBuffer"},
+    {"read",  CmdKeriRead,  0, "Attempt to read and extract tag data from the antenna"},
+    {"clone", CmdKeriClone, 0, "clone KERI to T55x7"},
+    {"sim",   CmdKeriSim,   0, "simulate KERI tag"},
+    {NULL, NULL, 0, NULL}
 };
 
 int CmdLFKeri(const char *Cmd) {
-	clearCommandBuffer();
-	CmdsParse(CommandTable, Cmd);
-	return 0;
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
+    return 0;
 }
 
 int CmdHelp(const char *Cmd) {
-	CmdsHelp(CommandTable);
-	return 0;
+    CmdsHelp(CommandTable);
+    return 0;
 }
diff --git a/client/cmdlfnedap.c b/client/cmdlfnedap.c
index 353ff535d..07e07e7ec 100644
--- a/client/cmdlfnedap.c
+++ b/client/cmdlfnedap.c
@@ -11,96 +11,96 @@
 static int CmdHelp(const char *Cmd);
 
 int usage_lf_nedap_clone(void){
-	PrintAndLogEx(NORMAL, "clone a NEDAP tag to a T55x7 tag.");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage: lf nedap clone [h] <Card-Number>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h             : This help");
-	PrintAndLogEx(NORMAL, "      <Card Number> : 24-bit value card number");
-//	PrintAndLogEx(NORMAL, "      Q5            : optional - clone to Q5 (T5555) instead of T55x7 chip");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "       lf nedap clone 112233");
-	return 0;
+    PrintAndLogEx(NORMAL, "clone a NEDAP tag to a T55x7 tag.");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage: lf nedap clone [h] <Card-Number>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "      h             : This help");
+    PrintAndLogEx(NORMAL, "      <Card Number> : 24-bit value card number");
+//  PrintAndLogEx(NORMAL, "      Q5            : optional - clone to Q5 (T5555) instead of T55x7 chip");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "       lf nedap clone 112233");
+    return 0;
 }
 
 int usage_lf_nedap_sim(void) {
-	PrintAndLogEx(NORMAL, "Enables simulation of NEDAP card with specified card number.");
-	PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  lf nedap sim [h] <Card-Number>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h               : This help");
-	PrintAndLogEx(NORMAL, "      <Card Number>   : 24-bit value card number");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "       lf nedap sim 112233");
-	return 0;
+    PrintAndLogEx(NORMAL, "Enables simulation of NEDAP card with specified card number.");
+    PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  lf nedap sim [h] <Card-Number>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "      h               : This help");
+    PrintAndLogEx(NORMAL, "      <Card Number>   : 24-bit value card number");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "       lf nedap sim 112233");
+    return 0;
 }
 
 // find nedap preamble in already demoded data
 int detectNedap(uint8_t *dest, size_t *size) {
-	//make sure buffer has data
-	if (*size < 128) return -3;
+    //make sure buffer has data
+    if (*size < 128) return -3;
 
-	size_t startIdx = 0;
-	//uint8_t preamble[] = {1,1,1,1,1,1,1,1,1,0,0,0,1};
-	uint8_t preamble[] = {1,1,1,1,1,1,1,1,1,0};
-	if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
-		return -4; //preamble not found
-	return (int) startIdx;
+    size_t startIdx = 0;
+    //uint8_t preamble[] = {1,1,1,1,1,1,1,1,1,0,0,0,1};
+    uint8_t preamble[] = {1,1,1,1,1,1,1,1,1,0};
+    if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
+        return -4; //preamble not found
+    return (int) startIdx;
 }
 
 int GetNedapBits(uint32_t cn, uint8_t *nedapBits) {
 
-	uint8_t pre[128];
-	memset(pre, 0x00, sizeof(pre));
+    uint8_t pre[128];
+    memset(pre, 0x00, sizeof(pre));
 
-	// preamble  1111 1111 10 = 0xFF8
-	num_to_bytebits(0xFF8, 12, pre);
+    // preamble  1111 1111 10 = 0xFF8
+    num_to_bytebits(0xFF8, 12, pre);
 
-	// fixed tagtype code?  0010 1101 = 0x2D
-	num_to_bytebits(0x2D, 8, pre+10);
+    // fixed tagtype code?  0010 1101 = 0x2D
+    num_to_bytebits(0x2D, 8, pre+10);
 
-	// 46 encrypted bits - UNKNOWN ALGO
-	//    -- 16 bits checksum. Should be 4x4 checksum,  based on UID and 2 constant values.
-	//    -- 30 bits undocumented?
-	//num_to_bytebits(cn, 46, pre+18);
+    // 46 encrypted bits - UNKNOWN ALGO
+    //    -- 16 bits checksum. Should be 4x4 checksum,  based on UID and 2 constant values.
+    //    -- 30 bits undocumented?
+    //num_to_bytebits(cn, 46, pre+18);
 
-	//----from this part, the UID in clear text, with a 1bit ZERO as separator between bytes.
-	pre[64] = 0;
-	pre[73] = 0;
-	pre[82] = 0;
-	pre[91] = 0;
-	pre[100] = 0;
-	pre[109] = 0;
-	pre[118] = 0;
+    //----from this part, the UID in clear text, with a 1bit ZERO as separator between bytes.
+    pre[64] = 0;
+    pre[73] = 0;
+    pre[82] = 0;
+    pre[91] = 0;
+    pre[100] = 0;
+    pre[109] = 0;
+    pre[118] = 0;
 
-	// cardnumber (uid)
-	num_to_bytebits( (cn >>  0) & 0xFF, 8, pre+65);
-	num_to_bytebits( (cn >>  8) & 0xFF, 8, pre+74);
-	num_to_bytebits( (cn >> 16) & 0xFF, 8, pre+83);
+    // cardnumber (uid)
+    num_to_bytebits( (cn >>  0) & 0xFF, 8, pre+65);
+    num_to_bytebits( (cn >>  8) & 0xFF, 8, pre+74);
+    num_to_bytebits( (cn >> 16) & 0xFF, 8, pre+83);
 
-	// two ?
-	num_to_bytebits( 0, 8, pre+92);
-	num_to_bytebits( 0, 8, pre+101);
+    // two ?
+    num_to_bytebits( 0, 8, pre+92);
+    num_to_bytebits( 0, 8, pre+101);
 
-	// chksum
-	num_to_bytebits( (0 >> 0) & 0xFF, 8, pre+110);
-	num_to_bytebits( (0 >> 8) & 0xFF, 8, pre+119);
+    // chksum
+    num_to_bytebits( (0 >> 0) & 0xFF, 8, pre+110);
+    num_to_bytebits( (0 >> 8) & 0xFF, 8, pre+119);
 
 
-	// add paritybits	(bitsource, dest, sourcelen, paritylen, parityType (odd, even,)
-	addParity(pre, pre+64, 64, 8, 1);
-	addParity(pre+64, pre+64, 64, 8, 1);
+    // add paritybits (bitsource, dest, sourcelen, paritylen, parityType (odd, even,)
+    addParity(pre, pre+64, 64, 8, 1);
+    addParity(pre+64, pre+64, 64, 8, 1);
 
-	pre[63] = GetParity( DemodBuffer, EVEN, 63);
-	pre[127] = GetParity( DemodBuffer+64, EVEN, 63);
+    pre[63] = GetParity( DemodBuffer, EVEN, 63);
+    pre[127] = GetParity( DemodBuffer+64, EVEN, 63);
 
-	memcpy(nedapBits, pre, 128);
+    memcpy(nedapBits, pre, 128);
 
-	// 1111111110001011010000010110100011001001000010110101001101011001000110011010010000000000100001110001001000000001000101011100111
-	return 1;
+    // 1111111110001011010000010110100011001001000010110101001101011001000110011010010000000000100001110001001000000001000101011100111
+    return 1;
 }
 /*
  - UID: 001630
@@ -113,30 +113,30 @@ int GetNedapBits(uint32_t cn, uint8_t *nedapBits) {
 //print NEDAP Prox ID, encoding, encrypted ID,
 
 int CmdLFNedapDemod(const char *Cmd) {
-	//raw ask demod no start bit finding just get binary from wave
-	if (!ASKbiphaseDemod("0 64 1 0", false)) {
-		if (g_debugMode) PrintAndLogEx(DEBUG, "DEBUG: Error - Nedap ASKbiphaseDemod failed");
-		return 0;
-	}
-	size_t size = DemodBufferLen;
-	int idx = detectNedap(DemodBuffer, &size);
-	if (idx < 0){
-		if (g_debugMode){
-			// if (idx == -5)
-				// PrintAndLogEx(DEBUG, "DEBUG: Error - not enough samples");
-			// else if (idx == -1)
-				// PrintAndLogEx(DEBUG, "DEBUG: Error - only noise found");
-			// else if (idx == -2)
-				// PrintAndLogEx(DEBUG, "DEBUG: Error - problem during ASK/Biphase demod");
-			if (idx == -3)
-				PrintAndLogEx(DEBUG, "DEBUG: Error - Nedap Size not correct: %d", size);
-			else if (idx == -4)
-				PrintAndLogEx(DEBUG, "DEBUG: Error - Nedap preamble not found");
-			else
-				PrintAndLogEx(DEBUG, "DEBUG: Error - Nedap idx: %d",idx);
-		}
-		return 0;
-	}
+    //raw ask demod no start bit finding just get binary from wave
+    if (!ASKbiphaseDemod("0 64 1 0", false)) {
+        if (g_debugMode) PrintAndLogEx(DEBUG, "DEBUG: Error - Nedap ASKbiphaseDemod failed");
+        return 0;
+    }
+    size_t size = DemodBufferLen;
+    int idx = detectNedap(DemodBuffer, &size);
+    if (idx < 0){
+        if (g_debugMode){
+            // if (idx == -5)
+                // PrintAndLogEx(DEBUG, "DEBUG: Error - not enough samples");
+            // else if (idx == -1)
+                // PrintAndLogEx(DEBUG, "DEBUG: Error - only noise found");
+            // else if (idx == -2)
+                // PrintAndLogEx(DEBUG, "DEBUG: Error - problem during ASK/Biphase demod");
+            if (idx == -3)
+                PrintAndLogEx(DEBUG, "DEBUG: Error - Nedap Size not correct: %d", size);
+            else if (idx == -4)
+                PrintAndLogEx(DEBUG, "DEBUG: Error - Nedap preamble not found");
+            else
+                PrintAndLogEx(DEBUG, "DEBUG: Error - Nedap idx: %d",idx);
+        }
+        return 0;
+    }
 
 /* Index map                                                      E                                                                              E
  preamble    enc tag type         encrypted uid                   P d    33    d    90    d    04    d    71    d    40    d    45    d    E7    P
@@ -153,59 +153,59 @@ int CmdLFNedapDemod(const char *Cmd) {
  0 11100111
  1
 
-	 Tag ID is 049033
-	 I = Identical on all tags
-	 R = Random ?
-	 UID2, UID1, UID0 == card number
+     Tag ID is 049033
+     I = Identical on all tags
+     R = Random ?
+     UID2, UID1, UID0 == card number
 
 */
-	//get raw ID before removing parities
-	uint32_t raw[4] = {0,0,0,0};
-	raw[0] = bytebits_to_byte(DemodBuffer+idx+96,32);
-	raw[1] = bytebits_to_byte(DemodBuffer+idx+64,32);
-	raw[2] = bytebits_to_byte(DemodBuffer+idx+32,32);
-	raw[3] = bytebits_to_byte(DemodBuffer+idx,32);
-	setDemodBuf(DemodBuffer, 128, idx);
-	setClockGrid(g_DemodClock, g_DemodStartIdx + (idx*g_DemodClock));
+    //get raw ID before removing parities
+    uint32_t raw[4] = {0,0,0,0};
+    raw[0] = bytebits_to_byte(DemodBuffer+idx+96,32);
+    raw[1] = bytebits_to_byte(DemodBuffer+idx+64,32);
+    raw[2] = bytebits_to_byte(DemodBuffer+idx+32,32);
+    raw[3] = bytebits_to_byte(DemodBuffer+idx,32);
+    setDemodBuf(DemodBuffer, 128, idx);
+    setClockGrid(g_DemodClock, g_DemodStartIdx + (idx*g_DemodClock));
 
-	uint8_t firstParity = GetParity( DemodBuffer, EVEN, 63);
-	if ( firstParity != DemodBuffer[63]  ) {
-		PrintAndLogEx(DEBUG, "DEBUG: Error - Nedap 1st 64bit parity check failed:  %d|%d ", DemodBuffer[63], firstParity);
-		return 0;
-	}
+    uint8_t firstParity = GetParity( DemodBuffer, EVEN, 63);
+    if ( firstParity != DemodBuffer[63]  ) {
+        PrintAndLogEx(DEBUG, "DEBUG: Error - Nedap 1st 64bit parity check failed:  %d|%d ", DemodBuffer[63], firstParity);
+        return 0;
+    }
 
-	uint8_t secondParity = GetParity( DemodBuffer+64, EVEN, 63);
-	if ( secondParity != DemodBuffer[127]  ) {
-		PrintAndLogEx(DEBUG, "DEBUG: Error - Nedap 2st 64bit parity check failed:  %d|%d ", DemodBuffer[127], secondParity);
-		return 0;
-	}
+    uint8_t secondParity = GetParity( DemodBuffer+64, EVEN, 63);
+    if ( secondParity != DemodBuffer[127]  ) {
+        PrintAndLogEx(DEBUG, "DEBUG: Error - Nedap 2st 64bit parity check failed:  %d|%d ", DemodBuffer[127], secondParity);
+        return 0;
+    }
 
-	// ok valid card found!
-	uint32_t uid = 0;
-	uid =  bytebits_to_byte(DemodBuffer+65, 8);
-	uid |= bytebits_to_byte(DemodBuffer+74, 8) << 8;
-	uid |= bytebits_to_byte(DemodBuffer+83, 8) << 16;
+    // ok valid card found!
+    uint32_t uid = 0;
+    uid =  bytebits_to_byte(DemodBuffer+65, 8);
+    uid |= bytebits_to_byte(DemodBuffer+74, 8) << 8;
+    uid |= bytebits_to_byte(DemodBuffer+83, 8) << 16;
 
-	uint16_t two = 0;
-	two =  bytebits_to_byte(DemodBuffer+92, 8);
-	two |= bytebits_to_byte(DemodBuffer+101, 8) << 8;
+    uint16_t two = 0;
+    two =  bytebits_to_byte(DemodBuffer+92, 8);
+    two |= bytebits_to_byte(DemodBuffer+101, 8) << 8;
 
-	uint16_t chksum2 = 0;
-	chksum2 =  bytebits_to_byte(DemodBuffer+110, 8);
-	chksum2 |= bytebits_to_byte(DemodBuffer+119, 8) << 8;
+    uint16_t chksum2 = 0;
+    chksum2 =  bytebits_to_byte(DemodBuffer+110, 8);
+    chksum2 |= bytebits_to_byte(DemodBuffer+119, 8) << 8;
 
-	PrintAndLogEx(SUCCESS, "NEDAP ID Found - Raw: %08x%08x%08x%08x", raw[3], raw[2], raw[1], raw[0]);
-	PrintAndLogEx(SUCCESS, " - UID: %06X", uid);
-	PrintAndLogEx(SUCCESS, " - i: %04X", two);
-	PrintAndLogEx(SUCCESS, " - Checksum2 %04X", chksum2);
+    PrintAndLogEx(SUCCESS, "NEDAP ID Found - Raw: %08x%08x%08x%08x", raw[3], raw[2], raw[1], raw[0]);
+    PrintAndLogEx(SUCCESS, " - UID: %06X", uid);
+    PrintAndLogEx(SUCCESS, " - i: %04X", two);
+    PrintAndLogEx(SUCCESS, " - Checksum2 %04X", chksum2);
 
-	if (g_debugMode){
-		PrintAndLogEx(DEBUG, "DEBUG: idx: %d, Len: %d, Printing Demod Buffer:", idx, 128);
-		printDemodBuff();
-		PrintAndLogEx(DEBUG, "BIN:\n%s", sprint_bin_break( DemodBuffer, 128, 64) );
-	}
+    if (g_debugMode){
+        PrintAndLogEx(DEBUG, "DEBUG: idx: %d, Len: %d, Printing Demod Buffer:", idx, 128);
+        printDemodBuff();
+        PrintAndLogEx(DEBUG, "BIN:\n%s", sprint_bin_break( DemodBuffer, 128, 64) );
+    }
 
-	return 1;
+    return 1;
 }
 /*
 configuration
@@ -232,120 +232,120 @@ lf t55xx wr b 4 d 4c0003ff
 */
 
 int CmdLFNedapRead(const char *Cmd) {
-	lf_read(true, 12000);
-	return CmdLFNedapDemod(Cmd);
+    lf_read(true, 12000);
+    return CmdLFNedapDemod(Cmd);
 }
 /*
 int CmdLFNedapClone(const char *Cmd) {
 
-	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_nedap_clone();
+    char cmdp = param_getchar(Cmd, 0);
+    if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_nedap_clone();
 
-	uint32_t cardnumber=0, cn = 0;
-	uint32_t blocks[5];
-	uint8_t bits[128];
-	memset(bits, 0x00, sizeof(bits));
+    uint32_t cardnumber=0, cn = 0;
+    uint32_t blocks[5];
+    uint8_t bits[128];
+    memset(bits, 0x00, sizeof(bits));
 
-	if (sscanf(Cmd, "%u", &cn ) != 1) return usage_lf_nedap_clone();
+    if (sscanf(Cmd, "%u", &cn ) != 1) return usage_lf_nedap_clone();
 
-	cardnumber = (cn & 0x00FFFFFF);
+    cardnumber = (cn & 0x00FFFFFF);
 
-	if ( !GetNedapBits(cardnumber, bits)) {
-		PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
-		return 1;
-	}
+    if ( !GetNedapBits(cardnumber, bits)) {
+        PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
+        return 1;
+    }
 
-	((ASK/DIphase   data rawdemod ab 0 64 1 0
-	//NEDAP - compat mode, ASK/DIphase, data rate 64, 4 data blocks
-	// DI-pahse (CDP) T55x7_MODULATION_DIPHASE
-	blocks[0] = T55x7_MODULATION_DIPHASE | T55x7_BITRATE_RF_64 | 7 << T55x7_MAXBLOCK_SHIFT;
+    ((ASK/DIphase   data rawdemod ab 0 64 1 0
+    //NEDAP - compat mode, ASK/DIphase, data rate 64, 4 data blocks
+    // DI-pahse (CDP) T55x7_MODULATION_DIPHASE
+    blocks[0] = T55x7_MODULATION_DIPHASE | T55x7_BITRATE_RF_64 | 7 << T55x7_MAXBLOCK_SHIFT;
 
-	if (param_getchar(Cmd, 3) == 'Q' || param_getchar(Cmd, 3) == 'q')
-		blocks[0] = T5555_MODULATION_BIPHASE | T5555_INVERT_OUTPUT | T5555_SET_BITRATE(64) | 7 <<T5555_MAXBLOCK_SHIFT;
+    if (param_getchar(Cmd, 3) == 'Q' || param_getchar(Cmd, 3) == 'q')
+        blocks[0] = T5555_MODULATION_BIPHASE | T5555_INVERT_OUTPUT | T5555_SET_BITRATE(64) | 7 <<T5555_MAXBLOCK_SHIFT;
 
-	blocks[1] = bytebits_to_byte(bits, 32);
-	blocks[2] = bytebits_to_byte(bits + 32, 32);
-	blocks[3] = bytebits_to_byte(bits + 64, 32);
-	blocks[4] = bytebits_to_byte(bits + 96, 32);
+    blocks[1] = bytebits_to_byte(bits, 32);
+    blocks[2] = bytebits_to_byte(bits + 32, 32);
+    blocks[3] = bytebits_to_byte(bits + 64, 32);
+    blocks[4] = bytebits_to_byte(bits + 96, 32);
 
-	PrintAndLogEx(INFO, "Preparing to clone NEDAP to T55x7 with card number: %u", cardnumber);
-	print_blocks(blocks, 5);
+    PrintAndLogEx(INFO, "Preparing to clone NEDAP to T55x7 with card number: %u", cardnumber);
+    print_blocks(blocks, 5);
 
-	UsbCommand resp;
-	UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
+    UsbCommand resp;
+    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
 
-	for (uint8_t i = 0; i<5; ++i ) {
-		c.arg[0] = blocks[i];
-		c.arg[1] = i;
-		clearCommandBuffer();
-		SendCommand(&c);
-		if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)){
-			PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
-			return -1;
-		}
-	}
+    for (uint8_t i = 0; i<5; ++i ) {
+        c.arg[0] = blocks[i];
+        c.arg[1] = i;
+        clearCommandBuffer();
+        SendCommand(&c);
+        if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)){
+            PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
+            return -1;
+        }
+    }
     return 0;
 }
 */
 
 int CmdLFNedapSim(const char *Cmd) {
 
-	uint32_t cardnumber = 0, cn = 0;
+    uint32_t cardnumber = 0, cn = 0;
 
-	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_nedap_sim();
+    char cmdp = param_getchar(Cmd, 0);
+    if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_nedap_sim();
 
-	if (sscanf(Cmd, "%u", &cn ) != 1) return usage_lf_nedap_sim();
+    if (sscanf(Cmd, "%u", &cn ) != 1) return usage_lf_nedap_sim();
 
-	cardnumber = (cn & 0x00FFFFFF);
+    cardnumber = (cn & 0x00FFFFFF);
 
-	uint8_t bs[128];
-	size_t size = sizeof(bs);
-	memset(bs, 0x00, size);
+    uint8_t bs[128];
+    size_t size = sizeof(bs);
+    memset(bs, 0x00, size);
 
-	// NEDAP,  Biphase = 2, clock 64, inverted,  (DIPhase == inverted BIphase
-	uint8_t  clk = 64, encoding = 2, separator = 0, invert = 1;
-	uint16_t arg1, arg2;
-	arg1 = clk << 8 | encoding;
-	arg2 = invert << 8 | separator;
+    // NEDAP,  Biphase = 2, clock 64, inverted,  (DIPhase == inverted BIphase
+    uint8_t  clk = 64, encoding = 2, separator = 0, invert = 1;
+    uint16_t arg1, arg2;
+    arg1 = clk << 8 | encoding;
+    arg2 = invert << 8 | separator;
 
-	if ( !GetNedapBits(cardnumber, bs)) {
-		PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
-		return 1;
-	}
+    if ( !GetNedapBits(cardnumber, bs)) {
+        PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
+        return 1;
+    }
 
-	PrintAndLogEx(SUCCESS, "bin  %s", sprint_bin_break(bs, 128, 32));
-	PrintAndLogEx(SUCCESS, "Simulating Nedap - CardNumber: %u", cardnumber );
+    PrintAndLogEx(SUCCESS, "bin  %s", sprint_bin_break(bs, 128, 32));
+    PrintAndLogEx(SUCCESS, "Simulating Nedap - CardNumber: %u", cardnumber );
 
-	UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};
-	memcpy(c.d.asBytes, bs, size);
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+    UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};
+    memcpy(c.d.asBytes, bs, size);
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 
 int CmdLFNedapChk(const char *Cmd){
     //301600714021BE
-	uint8_t data[256] = { 0x30, 0x16, 0x00, 0x71, 0x40, 0x21, 0xBE};
-	int len = 0;
-	param_gethex_ex(Cmd, 0, data, &len);
+    uint8_t data[256] = { 0x30, 0x16, 0x00, 0x71, 0x40, 0x21, 0xBE};
+    int len = 0;
+    param_gethex_ex(Cmd, 0, data, &len);
 
-	len = ( len == 0 ) ? 5 : len>>1;
+    len = ( len == 0 ) ? 5 : len>>1;
 
-	PrintAndLogEx(SUCCESS, "Input: [%d] %s", len, sprint_hex(data, len));
+    PrintAndLogEx(SUCCESS, "Input: [%d] %s", len, sprint_hex(data, len));
 
-	//uint8_t last = GetParity(data, EVEN, 62);
-	//PrintAndLogEx(NORMAL, "TEST PARITY::  %d | %d ", DemodBuffer[62], last);
+    //uint8_t last = GetParity(data, EVEN, 62);
+    //PrintAndLogEx(NORMAL, "TEST PARITY::  %d | %d ", DemodBuffer[62], last);
 
     uint8_t cl = 0x1D, ch = 0x1D, carry = 0;
     uint8_t al, bl, temp;
 
-	for (int i =len; i >= 0; --i){
-		al = data[i];
+    for (int i =len; i >= 0; --i){
+        al = data[i];
         for (int j = 8; j > 0; --j) {
 
             bl = al ^ ch;
-			//PrintAndLogEx(NORMAL, "BL %02x | CH %02x \n", al, ch);
+            //PrintAndLogEx(NORMAL, "BL %02x | CH %02x \n", al, ch);
 
             carry = (cl & 0x80) ? 1 : 0;
             cl <<= 1;
@@ -367,22 +367,22 @@ int CmdLFNedapChk(const char *Cmd){
         }
     }
 
-	PrintAndLogEx(SUCCESS, "Nedap checksum: 0x%X", ((ch << 8) | cl) );
-	return 0;
+    PrintAndLogEx(SUCCESS, "Nedap checksum: 0x%X", ((ch << 8) | cl) );
+    return 0;
 }
 
 static command_t CommandTable[] = {
-    {"help",	CmdHelp,		1, "this help"},
-	{"demod",	CmdLFNedapDemod,0, "demodulate an Nedap tag from the GraphBuffer"},
-	{"read",	CmdLFNedapRead, 0, "attempt to read and extract tag data"},
-//	{"clone",	CmdLFNedapClone,0, "<Card Number>  clone nedap tag"},
-	{"sim",		CmdLFNedapSim,  0, "simulate nedap tag"},
-	{"chk",		CmdLFNedapChk,	1, "calculate Nedap Checksum <uid bytes>"},
+    {"help",    CmdHelp,        1, "this help"},
+    {"demod",   CmdLFNedapDemod,0, "demodulate an Nedap tag from the GraphBuffer"},
+    {"read",    CmdLFNedapRead, 0, "attempt to read and extract tag data"},
+//  {"clone",   CmdLFNedapClone,0, "<Card Number>  clone nedap tag"},
+    {"sim",     CmdLFNedapSim,  0, "simulate nedap tag"},
+    {"chk",     CmdLFNedapChk,  1, "calculate Nedap Checksum <uid bytes>"},
     {NULL, NULL, 0, NULL}
 };
 
 int CmdLFNedap(const char *Cmd) {
-	clearCommandBuffer();
+    clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
diff --git a/client/cmdlfnexwatch.c b/client/cmdlfnexwatch.c
index dd6bf3ff9..a8cc421fd 100644
--- a/client/cmdlfnexwatch.c
+++ b/client/cmdlfnexwatch.c
@@ -14,98 +14,98 @@ static int CmdHelp(const char *Cmd);
 
 int detectNexWatch(uint8_t *dest, size_t *size, bool *invert) {
 
-	uint8_t preamble[28]   = {0,0,0,0,0,1,0,1,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
-	uint8_t preamble_i[28] = {1,1,1,1,1,0,1,0,1,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1};
-	// sanity check.
-	if ( *size < sizeof(preamble) + 100) return -1;
+    uint8_t preamble[28]   = {0,0,0,0,0,1,0,1,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+    uint8_t preamble_i[28] = {1,1,1,1,1,0,1,0,1,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1};
+    // sanity check.
+    if ( *size < sizeof(preamble) + 100) return -1;
 
-	size_t startIdx = 0;
+    size_t startIdx = 0;
 
-	if (!preambleSearch(DemodBuffer, preamble, sizeof(preamble), size, &startIdx)){
-		// if didn't find preamble try again inverting
-		if (!preambleSearch(DemodBuffer, preamble_i, sizeof(preamble_i), size, &startIdx)) return -4;
-		*invert ^= 1;
-	}
+    if (!preambleSearch(DemodBuffer, preamble, sizeof(preamble), size, &startIdx)){
+        // if didn't find preamble try again inverting
+        if (!preambleSearch(DemodBuffer, preamble_i, sizeof(preamble_i), size, &startIdx)) return -4;
+        *invert ^= 1;
+    }
 
-	// size tests?
-	return (int) startIdx;
+    // size tests?
+    return (int) startIdx;
 }
 
 int CmdNexWatchDemod(const char *Cmd) {
 
-	if (!PSKDemod("", false)) {
-		PrintAndLogEx(DEBUG, "DEBUG: Error - NexWatch can't demod signal");
-		return 0;
-	}
-	bool invert = false;
-	size_t size = DemodBufferLen;
-	int idx = detectNexWatch(DemodBuffer, &size, &invert);
-	if (idx <= 0) {
-			if (idx == -1)
-				PrintAndLogEx(DEBUG, "DEBUG: Error - NexWatch not enough samples");
-			// else if (idx == -2)
-				// PrintAndLogEx(DEBUG, "DEBUG: Error - NexWatch only noise found");
-			// else if (idx == -3)
-				// PrintAndLogEx(DEBUG, "DEBUG: Error - NexWatch problem during PSK demod");
-			else if (idx == -4)
-				PrintAndLogEx(DEBUG, "DEBUG: Error - NexWatch preamble not found");
-			// else if (idx == -5)
-				// PrintAndLogEx(DEBUG, "DEBUG: Error - NexWatch size not correct: %d", size);
-			else
-				PrintAndLogEx(DEBUG, "DEBUG: Error - NexWatch error %d",idx);
+    if (!PSKDemod("", false)) {
+        PrintAndLogEx(DEBUG, "DEBUG: Error - NexWatch can't demod signal");
+        return 0;
+    }
+    bool invert = false;
+    size_t size = DemodBufferLen;
+    int idx = detectNexWatch(DemodBuffer, &size, &invert);
+    if (idx <= 0) {
+            if (idx == -1)
+                PrintAndLogEx(DEBUG, "DEBUG: Error - NexWatch not enough samples");
+            // else if (idx == -2)
+                // PrintAndLogEx(DEBUG, "DEBUG: Error - NexWatch only noise found");
+            // else if (idx == -3)
+                // PrintAndLogEx(DEBUG, "DEBUG: Error - NexWatch problem during PSK demod");
+            else if (idx == -4)
+                PrintAndLogEx(DEBUG, "DEBUG: Error - NexWatch preamble not found");
+            // else if (idx == -5)
+                // PrintAndLogEx(DEBUG, "DEBUG: Error - NexWatch size not correct: %d", size);
+            else
+                PrintAndLogEx(DEBUG, "DEBUG: Error - NexWatch error %d",idx);
 
-		return 0;
-	}
+        return 0;
+    }
 
-	setDemodBuf(DemodBuffer, size, idx+4);
-	setClockGrid(g_DemodClock, g_DemodStartIdx + ((idx+4)*g_DemodClock));
+    setDemodBuf(DemodBuffer, size, idx+4);
+    setClockGrid(g_DemodClock, g_DemodStartIdx + ((idx+4)*g_DemodClock));
 
-	idx = 8+32; // 8 = preamble, 32 = reserved bits (always 0)
+    idx = 8+32; // 8 = preamble, 32 = reserved bits (always 0)
 
-	//get ID
-	uint32_t ID = 0;
-	for (uint8_t k = 0; k < 4; k++){
-		for (uint8_t m = 0; m < 8; m++){
-			ID = (ID << 1) | DemodBuffer[m + k + (m*4)];
-		}
-	}
-	//parity check (TBD)
+    //get ID
+    uint32_t ID = 0;
+    for (uint8_t k = 0; k < 4; k++){
+        for (uint8_t m = 0; m < 8; m++){
+            ID = (ID << 1) | DemodBuffer[m + k + (m*4)];
+        }
+    }
+    //parity check (TBD)
 
-	//checksum check (TBD)
+    //checksum check (TBD)
 
-	//output
-	PrintAndLogEx(NORMAL, "NexWatch ID: %d", ID);
-	if (invert){
-		PrintAndLogEx(NORMAL, "Had to Invert - probably NexKey");
-		for (size_t i = 0; i < size; i++)
-			DemodBuffer[i] ^= 1;
-	}
+    //output
+    PrintAndLogEx(NORMAL, "NexWatch ID: %d", ID);
+    if (invert){
+        PrintAndLogEx(NORMAL, "Had to Invert - probably NexKey");
+        for (size_t i = 0; i < size; i++)
+            DemodBuffer[i] ^= 1;
+    }
 
-	CmdPrintDemodBuff("x");
-	return 1;
+    CmdPrintDemodBuff("x");
+    return 1;
 }
 
 //by marshmellow
 //see ASKDemod for what args are accepted
 int CmdNexWatchRead(const char *Cmd) {
-	lf_read(true, 10000);
-	return CmdNexWatchDemod(Cmd);
+    lf_read(true, 10000);
+    return CmdNexWatchDemod(Cmd);
 }
 
 static command_t CommandTable[] = {
-	{"help",  CmdHelp,			1, "This help"},
-	{"demod", CmdNexWatchDemod,	1, "Demodulate a NexWatch tag (nexkey, quadrakey) from the GraphBuffer"},
-	{"read",  CmdNexWatchRead,	0, "Attempt to Read and Extract tag data from the antenna"},
-	{NULL, NULL, 0, NULL}
+    {"help",  CmdHelp,          1, "This help"},
+    {"demod", CmdNexWatchDemod, 1, "Demodulate a NexWatch tag (nexkey, quadrakey) from the GraphBuffer"},
+    {"read",  CmdNexWatchRead,  0, "Attempt to Read and Extract tag data from the antenna"},
+    {NULL, NULL, 0, NULL}
 };
 
 int CmdLFNEXWATCH(const char *Cmd) {
-	clearCommandBuffer();
-	CmdsParse(CommandTable, Cmd);
-	return 0;
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
+    return 0;
 }
 
 int CmdHelp(const char *Cmd) {
-	CmdsHelp(CommandTable);
-	return 0;
+    CmdsHelp(CommandTable);
+    return 0;
 }
diff --git a/client/cmdlfnoralsy.c b/client/cmdlfnoralsy.c
index a858feb2e..763d70e1e 100644
--- a/client/cmdlfnoralsy.c
+++ b/client/cmdlfnoralsy.c
@@ -12,32 +12,32 @@
 static int CmdHelp(const char *Cmd);
 
 int usage_lf_noralsy_clone(void){
-	PrintAndLogEx(NORMAL, "clone a Noralsy tag to a T55x7 tag.");
-	PrintAndLogEx(NORMAL, "Usage: lf noralsy clone [h] <card id> <year> <Q5>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h          : This help");
-	PrintAndLogEx(NORMAL, "      <card id>  : Noralsy card ID");
-	PrintAndLogEx(NORMAL, "      <year>     : Tag allocation year");
-	PrintAndLogEx(NORMAL, "      <Q5>       : specify write to Q5 (t5555 instead of t55x7)");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "       lf noralsy clone 112233");
-	return 0;
+    PrintAndLogEx(NORMAL, "clone a Noralsy tag to a T55x7 tag.");
+    PrintAndLogEx(NORMAL, "Usage: lf noralsy clone [h] <card id> <year> <Q5>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "      h          : This help");
+    PrintAndLogEx(NORMAL, "      <card id>  : Noralsy card ID");
+    PrintAndLogEx(NORMAL, "      <year>     : Tag allocation year");
+    PrintAndLogEx(NORMAL, "      <Q5>       : specify write to Q5 (t5555 instead of t55x7)");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "       lf noralsy clone 112233");
+    return 0;
 }
 
 int usage_lf_noralsy_sim(void) {
-	PrintAndLogEx(NORMAL, "Enables simulation of Noralsy card with specified card number.");
-	PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  lf noralsy sim [h] <card id> <year>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h          : This help");
-	PrintAndLogEx(NORMAL, "      <card id>  : Noralsy card ID");
-	PrintAndLogEx(NORMAL, "      <year>     : Tag allocation year");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "       lf noralsy sim 112233");
-	return 0;
+    PrintAndLogEx(NORMAL, "Enables simulation of Noralsy card with specified card number.");
+    PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  lf noralsy sim [h] <card id> <year>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "      h          : This help");
+    PrintAndLogEx(NORMAL, "      <card id>  : Noralsy card ID");
+    PrintAndLogEx(NORMAL, "      <year>     : Tag allocation year");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "       lf noralsy sim 112233");
+    return 0;
 }
 
 static uint8_t noralsy_chksum( uint8_t* bits, uint8_t len) {
@@ -47,44 +47,44 @@ static uint8_t noralsy_chksum( uint8_t* bits, uint8_t len) {
     return sum & 0x0F ;
 }
 int getnoralsyBits(uint32_t id, uint16_t year, uint8_t *bits) {
-	//preamp
-	num_to_bytebits(0xBB0214FF, 32, bits);  // --> Have seen 0xBB0214FF / 0xBB0314FF  UNKNOWN
+    //preamp
+    num_to_bytebits(0xBB0214FF, 32, bits);  // --> Have seen 0xBB0214FF / 0xBB0314FF  UNKNOWN
 
-	//convert ID into BCD-format
-	id = DEC2BCD(id);
-	year = DEC2BCD(year);
-	year &= 0xFF;
+    //convert ID into BCD-format
+    id = DEC2BCD(id);
+    year = DEC2BCD(year);
+    year &= 0xFF;
 
-	uint16_t sub1 = (id & 0xFFF0000) >> 16;
-	uint8_t sub2 = (id & 0x000FF00) >> 8;
-	uint8_t sub3 = (id & 0x00000FF);
+    uint16_t sub1 = (id & 0xFFF0000) >> 16;
+    uint8_t sub2 = (id & 0x000FF00) >> 8;
+    uint8_t sub3 = (id & 0x00000FF);
 
-	num_to_bytebits(sub1, 12, bits+32);
-	num_to_bytebits(year, 8, bits+44);
-	num_to_bytebits(0, 4, bits+52);   // --> UNKNOWN. Flag?
+    num_to_bytebits(sub1, 12, bits+32);
+    num_to_bytebits(year, 8, bits+44);
+    num_to_bytebits(0, 4, bits+52);   // --> UNKNOWN. Flag?
 
-	num_to_bytebits(sub2, 8, bits+56);
-	num_to_bytebits(sub3, 8, bits+64);
+    num_to_bytebits(sub2, 8, bits+56);
+    num_to_bytebits(sub3, 8, bits+64);
 
-	//chksum byte
-	uint8_t chksum = noralsy_chksum(bits+32, 40);
-	num_to_bytebits(chksum, 4, bits+72);
-	chksum = noralsy_chksum(bits, 76);
-	num_to_bytebits(chksum, 4, bits+76);
-	return 1;
+    //chksum byte
+    uint8_t chksum = noralsy_chksum(bits+32, 40);
+    num_to_bytebits(chksum, 4, bits+72);
+    chksum = noralsy_chksum(bits, 76);
+    num_to_bytebits(chksum, 4, bits+76);
+    return 1;
 }
 
 // by iceman
 // find Noralsy preamble in already demoded data
 int detectNoralsy(uint8_t *dest, size_t *size) {
-	if (*size < 96) return -1; //make sure buffer has data
-	size_t startIdx = 0;
-	uint8_t preamble[] = {1,0,1,1,1,0,1,1,0,0,0,0};
-	if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
-		return -2; //preamble not found
-	if (*size != 96) return -3; //wrong demoded size
-	//return start position
-	return (int)startIdx;
+    if (*size < 96) return -1; //make sure buffer has data
+    size_t startIdx = 0;
+    uint8_t preamble[] = {1,0,1,1,1,0,1,1,0,0,0,0};
+    if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
+        return -2; //preamble not found
+    if (*size != 96) return -3; //wrong demoded size
+    //return start position
+    return (int)startIdx;
 }
 /*
 *
@@ -102,171 +102,171 @@ int detectNoralsy(uint8_t *dest, size_t *size) {
 //see ASKDemod for what args are accepted
 int CmdNoralsyDemod(const char *Cmd) {
 
-	//ASK / Manchester
-	bool st = true;
-	if (!ASKDemod_ext("32 0 0", false, false, 1, &st)) {
-		if (g_debugMode) PrintAndLogEx(DEBUG, "DEBUG: Error - Noralsy: ASK/Manchester Demod failed");
-		return 0;
-	}
-	if (!st) {
-		if (g_debugMode) PrintAndLogEx(DEBUG, "DEBUG: Error - Noralsy: sequence terminator not found");
-		return 0;
-	}
+    //ASK / Manchester
+    bool st = true;
+    if (!ASKDemod_ext("32 0 0", false, false, 1, &st)) {
+        if (g_debugMode) PrintAndLogEx(DEBUG, "DEBUG: Error - Noralsy: ASK/Manchester Demod failed");
+        return 0;
+    }
+    if (!st) {
+        if (g_debugMode) PrintAndLogEx(DEBUG, "DEBUG: Error - Noralsy: sequence terminator not found");
+        return 0;
+    }
 
-	size_t size = DemodBufferLen;
-	int ans = detectNoralsy(DemodBuffer, &size);
-	if (ans < 0){
-		if (g_debugMode){
-			if (ans == -1)
-				PrintAndLogEx(DEBUG, "DEBUG: Error - Noralsy: too few bits found");
-			else if (ans == -2)
-				PrintAndLogEx(DEBUG, "DEBUG: Error - Noralsy: preamble not found");
-			else if (ans == -3)
-				PrintAndLogEx(DEBUG, "DEBUG: Error - Noralsy: Size not correct: %d", size);
-			else
-				PrintAndLogEx(DEBUG, "DEBUG: Error - Noralsy: ans: %d", ans);
-		}
-		return 0;
-	}
-	setDemodBuf(DemodBuffer, 96, ans);
-	setClockGrid(g_DemodClock, g_DemodStartIdx + (ans*g_DemodClock));
+    size_t size = DemodBufferLen;
+    int ans = detectNoralsy(DemodBuffer, &size);
+    if (ans < 0){
+        if (g_debugMode){
+            if (ans == -1)
+                PrintAndLogEx(DEBUG, "DEBUG: Error - Noralsy: too few bits found");
+            else if (ans == -2)
+                PrintAndLogEx(DEBUG, "DEBUG: Error - Noralsy: preamble not found");
+            else if (ans == -3)
+                PrintAndLogEx(DEBUG, "DEBUG: Error - Noralsy: Size not correct: %d", size);
+            else
+                PrintAndLogEx(DEBUG, "DEBUG: Error - Noralsy: ans: %d", ans);
+        }
+        return 0;
+    }
+    setDemodBuf(DemodBuffer, 96, ans);
+    setClockGrid(g_DemodClock, g_DemodStartIdx + (ans*g_DemodClock));
 
-	//got a good demod
-	uint32_t raw1 = bytebits_to_byte(DemodBuffer, 32);
-	uint32_t raw2 = bytebits_to_byte(DemodBuffer+32, 32);
-	uint32_t raw3 = bytebits_to_byte(DemodBuffer+64, 32);
+    //got a good demod
+    uint32_t raw1 = bytebits_to_byte(DemodBuffer, 32);
+    uint32_t raw2 = bytebits_to_byte(DemodBuffer+32, 32);
+    uint32_t raw3 = bytebits_to_byte(DemodBuffer+64, 32);
 
-	uint32_t cardid = ((raw2 & 0xFFF00000) >> 20) << 16;
-	cardid |= (raw2 & 0xFF) << 8;
-	cardid |= ((raw3 & 0xFF000000) >> 24);
-	cardid = BCD2DEC(cardid);
+    uint32_t cardid = ((raw2 & 0xFFF00000) >> 20) << 16;
+    cardid |= (raw2 & 0xFF) << 8;
+    cardid |= ((raw3 & 0xFF000000) >> 24);
+    cardid = BCD2DEC(cardid);
 
-	uint16_t year = (raw2 & 0x000ff000) >> 12;
-	year = BCD2DEC(year);
-	year += ( year > 60 ) ? 1900: 2000;
+    uint16_t year = (raw2 & 0x000ff000) >> 12;
+    year = BCD2DEC(year);
+    year += ( year > 60 ) ? 1900: 2000;
 
-	// calc checksums
-	uint8_t calc1 = noralsy_chksum(DemodBuffer+32, 40);
-	uint8_t calc2 = noralsy_chksum(DemodBuffer, 76);
-	uint8_t chk1 = 0, chk2 = 0;
-	chk1 = bytebits_to_byte(DemodBuffer+72, 4);
-	chk2 = bytebits_to_byte(DemodBuffer+76, 4);
-	// test checksums
-	if ( chk1 != calc1 ) {
-		if (g_debugMode) PrintAndLogEx(DEBUG, "DEBUG: Error - Noralsy: checksum 1 failed %x - %x\n", chk1, calc1);
-		return 0;
-	}
-	if ( chk2 != calc2 ) {
-		if (g_debugMode) PrintAndLogEx(DEBUG, "DEBUG: Error - Noralsy: checksum 2 failed %x - %x\n", chk2, calc2);
-		return 0;
-	}
+    // calc checksums
+    uint8_t calc1 = noralsy_chksum(DemodBuffer+32, 40);
+    uint8_t calc2 = noralsy_chksum(DemodBuffer, 76);
+    uint8_t chk1 = 0, chk2 = 0;
+    chk1 = bytebits_to_byte(DemodBuffer+72, 4);
+    chk2 = bytebits_to_byte(DemodBuffer+76, 4);
+    // test checksums
+    if ( chk1 != calc1 ) {
+        if (g_debugMode) PrintAndLogEx(DEBUG, "DEBUG: Error - Noralsy: checksum 1 failed %x - %x\n", chk1, calc1);
+        return 0;
+    }
+    if ( chk2 != calc2 ) {
+        if (g_debugMode) PrintAndLogEx(DEBUG, "DEBUG: Error - Noralsy: checksum 2 failed %x - %x\n", chk2, calc2);
+        return 0;
+    }
 
-	PrintAndLogEx(SUCCESS, "Noralsy Tag Found: Card ID %u, Year: %u Raw: %08X%08X%08X", cardid, year, raw1 ,raw2, raw3);
-	if (raw1 != 0xBB0214FF) {
-		PrintAndLogEx(WARNING, "Unknown bits set in first block! Expected 0xBB0214FF, Found: 0x%08X", raw1);
-		PrintAndLogEx(WARNING, "Please post this output in forum to further research on this format");
-	}
-	return 1;
+    PrintAndLogEx(SUCCESS, "Noralsy Tag Found: Card ID %u, Year: %u Raw: %08X%08X%08X", cardid, year, raw1 ,raw2, raw3);
+    if (raw1 != 0xBB0214FF) {
+        PrintAndLogEx(WARNING, "Unknown bits set in first block! Expected 0xBB0214FF, Found: 0x%08X", raw1);
+        PrintAndLogEx(WARNING, "Please post this output in forum to further research on this format");
+    }
+    return 1;
 }
 
 int CmdNoralsyRead(const char *Cmd) {
-	lf_read(true, 8000);
-	return CmdNoralsyDemod(Cmd);
+    lf_read(true, 8000);
+    return CmdNoralsyDemod(Cmd);
 }
 
 int CmdNoralsyClone(const char *Cmd) {
 
-	uint16_t year = 0;
-	uint32_t id = 0;
-	uint32_t blocks[4] = {T55x7_MODULATION_MANCHESTER | T55x7_BITRATE_RF_32 | T55x7_ST_TERMINATOR | 3 << T55x7_MAXBLOCK_SHIFT, 0, 0};
-	uint8_t bits[96];
-	memset(bits, 0, sizeof(bits));
+    uint16_t year = 0;
+    uint32_t id = 0;
+    uint32_t blocks[4] = {T55x7_MODULATION_MANCHESTER | T55x7_BITRATE_RF_32 | T55x7_ST_TERMINATOR | 3 << T55x7_MAXBLOCK_SHIFT, 0, 0};
+    uint8_t bits[96];
+    memset(bits, 0, sizeof(bits));
 
-	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_noralsy_clone();
+    char cmdp = param_getchar(Cmd, 0);
+    if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_noralsy_clone();
 
-	id = param_get32ex(Cmd, 0, 0, 10);
-	year = param_get32ex(Cmd, 1, 2000, 10);
+    id = param_get32ex(Cmd, 0, 0, 10);
+    year = param_get32ex(Cmd, 1, 2000, 10);
 
-	//Q5
-	if (param_getchar(Cmd, 2) == 'Q' || param_getchar(Cmd, 2) == 'q')
-		blocks[0] = T5555_MODULATION_MANCHESTER | T5555_SET_BITRATE(32) | T5555_ST_TERMINATOR | 3 << T5555_MAXBLOCK_SHIFT;
+    //Q5
+    if (param_getchar(Cmd, 2) == 'Q' || param_getchar(Cmd, 2) == 'q')
+        blocks[0] = T5555_MODULATION_MANCHESTER | T5555_SET_BITRATE(32) | T5555_ST_TERMINATOR | 3 << T5555_MAXBLOCK_SHIFT;
 
-	 if ( !getnoralsyBits(id, year, bits)) {
-		PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
-		return 1;
-	}
+     if ( !getnoralsyBits(id, year, bits)) {
+        PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
+        return 1;
+    }
 
-	//
-	blocks[1] = bytebits_to_byte(bits, 32);
-	blocks[2] = bytebits_to_byte(bits + 32, 32);
-	blocks[3] = bytebits_to_byte(bits + 64, 32);
+    //
+    blocks[1] = bytebits_to_byte(bits, 32);
+    blocks[2] = bytebits_to_byte(bits + 32, 32);
+    blocks[3] = bytebits_to_byte(bits + 64, 32);
 
-	PrintAndLogEx(INFO, "Preparing to clone Noralsy to T55x7 with CardId: %u", id);
-	print_blocks(blocks, 4);
+    PrintAndLogEx(INFO, "Preparing to clone Noralsy to T55x7 with CardId: %u", id);
+    print_blocks(blocks, 4);
 
-	UsbCommand resp;
-	UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
+    UsbCommand resp;
+    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
 
-	for (uint8_t i=0; i<4; i++) {
-		c.arg[0] = blocks[i];
-		c.arg[1] = i;
-		clearCommandBuffer();
-		SendCommand(&c);
-		if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)){
-			PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
-			return -1;
-		}
-	}
+    for (uint8_t i=0; i<4; i++) {
+        c.arg[0] = blocks[i];
+        c.arg[1] = i;
+        clearCommandBuffer();
+        SendCommand(&c);
+        if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)){
+            PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
+            return -1;
+        }
+    }
     return 0;
 }
 
 int CmdNoralsySim(const char *Cmd) {
 
-	uint8_t bits[96];
-	uint8_t *bs = bits;
-	memset(bs, 0, sizeof(bits));
+    uint8_t bits[96];
+    uint8_t *bs = bits;
+    memset(bs, 0, sizeof(bits));
 
-	uint16_t year = 0;
-	uint32_t id = 0;
+    uint16_t year = 0;
+    uint32_t id = 0;
 
-	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_noralsy_sim();
+    char cmdp = param_getchar(Cmd, 0);
+    if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_noralsy_sim();
 
-	id = param_get32ex(Cmd, 0, 0, 10);
-	year = param_get32ex(Cmd, 1, 2000, 10);
+    id = param_get32ex(Cmd, 0, 0, 10);
+    year = param_get32ex(Cmd, 1, 2000, 10);
 
-	uint8_t clk = 32, encoding = 1, separator = 1, invert = 0;
-	uint16_t arg1, arg2;
-	size_t size = 96;
-	arg1 = clk << 8 | encoding;
-	arg2 = invert << 8 | separator;
+    uint8_t clk = 32, encoding = 1, separator = 1, invert = 0;
+    uint16_t arg1, arg2;
+    size_t size = 96;
+    arg1 = clk << 8 | encoding;
+    arg2 = invert << 8 | separator;
 
-	 if ( !getnoralsyBits(id, year, bs)) {
-		PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
-		return 1;
-	}
+     if ( !getnoralsyBits(id, year, bs)) {
+        PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
+        return 1;
+    }
 
-	PrintAndLogEx(SUCCESS, "Simulating Noralsy - CardId: %u", id);
+    PrintAndLogEx(SUCCESS, "Simulating Noralsy - CardId: %u", id);
 
-	UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};
-	memcpy(c.d.asBytes, bs, size);
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+    UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};
+    memcpy(c.d.asBytes, bs, size);
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 
 static command_t CommandTable[] = {
-    {"help",	CmdHelp,		1, "This help"},
-	{"demod",	CmdNoralsyDemod,1, "Demodulate an Noralsy tag from the GraphBuffer"},
-	{"read",	CmdNoralsyRead, 0, "Attempt to read and extract tag data from the antenna"},
-	{"clone",	CmdNoralsyClone,0, "clone Noralsy to T55x7"},
-	{"sim",		CmdNoralsySim,	0, "simulate Noralsy tag"},
+    {"help",    CmdHelp,        1, "This help"},
+    {"demod",   CmdNoralsyDemod,1, "Demodulate an Noralsy tag from the GraphBuffer"},
+    {"read",    CmdNoralsyRead, 0, "Attempt to read and extract tag data from the antenna"},
+    {"clone",   CmdNoralsyClone,0, "clone Noralsy to T55x7"},
+    {"sim",     CmdNoralsySim,  0, "simulate Noralsy tag"},
     {NULL, NULL, 0, NULL}
 };
 
 int CmdLFNoralsy(const char *Cmd) {
-	clearCommandBuffer();
+    clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
diff --git a/client/cmdlfpac.c b/client/cmdlfpac.c
index a6a79e64a..4c9bda1db 100644
--- a/client/cmdlfpac.c
+++ b/client/cmdlfpac.c
@@ -14,75 +14,75 @@ static int CmdHelp(const char *Cmd);
 // by marshmellow
 // find PAC preamble in already demoded data
 int detectPac(uint8_t *dest, size_t *size) {
-	if (*size < 128) return -1; //make sure buffer has data
-	size_t startIdx = 0;
-	uint8_t preamble[] = {1,1,1,1,1,1,1,1,0,0,1,0,0,0,0,0,0,1,0};
-	if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
-		return -2; //preamble not found
-	if (*size != 128) return -3; //wrong demoded size
-	//return start position
-	return (int)startIdx;
+    if (*size < 128) return -1; //make sure buffer has data
+    size_t startIdx = 0;
+    uint8_t preamble[] = {1,1,1,1,1,1,1,1,0,0,1,0,0,0,0,0,0,1,0};
+    if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
+        return -2; //preamble not found
+    if (*size != 128) return -3; //wrong demoded size
+    //return start position
+    return (int)startIdx;
 }
 
 //see NRZDemod for what args are accepted
 int CmdPacDemod(const char *Cmd) {
 
-	//NRZ
-	if (!NRZrawDemod(Cmd, false)) {
-		PrintAndLogEx(DEBUG, "DEBUG: Error - PAC: NRZ Demod failed");
-		return 0;
-	}
-	size_t size = DemodBufferLen;
-	int ans = detectPac(DemodBuffer, &size);
-	if (ans < 0) {
-		if (ans == -1)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - PAC: too few bits found");
-		else if (ans == -2)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - PAC: preamble not found");
-		else if (ans == -3)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - PAC: Size not correct: %d", size);
-		else
-			PrintAndLogEx(DEBUG, "DEBUG: Error - PAC: ans: %d", ans);
+    //NRZ
+    if (!NRZrawDemod(Cmd, false)) {
+        PrintAndLogEx(DEBUG, "DEBUG: Error - PAC: NRZ Demod failed");
+        return 0;
+    }
+    size_t size = DemodBufferLen;
+    int ans = detectPac(DemodBuffer, &size);
+    if (ans < 0) {
+        if (ans == -1)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - PAC: too few bits found");
+        else if (ans == -2)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - PAC: preamble not found");
+        else if (ans == -3)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - PAC: Size not correct: %d", size);
+        else
+            PrintAndLogEx(DEBUG, "DEBUG: Error - PAC: ans: %d", ans);
 
-		return 0;
-	}
-	setDemodBuf(DemodBuffer, 128, ans);
-	setClockGrid(g_DemodClock, g_DemodStartIdx + (ans*g_DemodClock));
+        return 0;
+    }
+    setDemodBuf(DemodBuffer, 128, ans);
+    setClockGrid(g_DemodClock, g_DemodStartIdx + (ans*g_DemodClock));
 
-	//got a good demod
-	uint32_t raw1 = bytebits_to_byte(DemodBuffer   , 32);
-	uint32_t raw2 = bytebits_to_byte(DemodBuffer+32, 32);
-	uint32_t raw3 = bytebits_to_byte(DemodBuffer+64, 32);
-	uint32_t raw4 = bytebits_to_byte(DemodBuffer+96, 32);
+    //got a good demod
+    uint32_t raw1 = bytebits_to_byte(DemodBuffer   , 32);
+    uint32_t raw2 = bytebits_to_byte(DemodBuffer+32, 32);
+    uint32_t raw3 = bytebits_to_byte(DemodBuffer+64, 32);
+    uint32_t raw4 = bytebits_to_byte(DemodBuffer+96, 32);
 
-	// preamble     then appears to have marker bits of "10"                                                                                                                                       CS?
-	// 11111111001000000 10 01001100 10 00001101 10 00001101 10 00001101 10 00001101 10 00001101 10 00001101 10 00001101 10 00001101 10 10001100 10 100000001
-	// unknown checksum 9 bits at the end
+    // preamble     then appears to have marker bits of "10"                                                                                                                                       CS?
+    // 11111111001000000 10 01001100 10 00001101 10 00001101 10 00001101 10 00001101 10 00001101 10 00001101 10 00001101 10 00001101 10 10001100 10 100000001
+    // unknown checksum 9 bits at the end
 
-	PrintAndLogEx(NORMAL, "PAC/Stanley Tag Found -- Raw: %08X%08X%08X%08X", raw1 ,raw2, raw3, raw4);
-	PrintAndLogEx(NORMAL, "\nHow the Raw ID is translated by the reader is unknown");
-	return 1;
+    PrintAndLogEx(NORMAL, "PAC/Stanley Tag Found -- Raw: %08X%08X%08X%08X", raw1 ,raw2, raw3, raw4);
+    PrintAndLogEx(NORMAL, "\nHow the Raw ID is translated by the reader is unknown");
+    return 1;
 }
 
 int CmdPacRead(const char *Cmd) {
-	lf_read(true, 4096*2 + 20);
-	return CmdPacDemod(Cmd);
+    lf_read(true, 4096*2 + 20);
+    return CmdPacDemod(Cmd);
 }
 
 static command_t CommandTable[] = {
-	{"help",  CmdHelp,    1, "This help"},
-	{"demod", CmdPacDemod,1, "Demodulate an PAC tag from the GraphBuffer"},
-	{"read",  CmdPacRead, 0, "Attempt to read and extract tag data from the antenna"},
-	{NULL, NULL, 0, NULL}
+    {"help",  CmdHelp,    1, "This help"},
+    {"demod", CmdPacDemod,1, "Demodulate an PAC tag from the GraphBuffer"},
+    {"read",  CmdPacRead, 0, "Attempt to read and extract tag data from the antenna"},
+    {NULL, NULL, 0, NULL}
 };
 
 int CmdLFPac(const char *Cmd) {
-	clearCommandBuffer();
-	CmdsParse(CommandTable, Cmd);
-	return 0;
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
+    return 0;
 }
 
 int CmdHelp(const char *Cmd) {
-	CmdsHelp(CommandTable);
-	return 0;
+    CmdsHelp(CommandTable);
+    return 0;
 }
diff --git a/client/cmdlfparadox.c b/client/cmdlfparadox.c
index 80088c85c..cda0833dd 100644
--- a/client/cmdlfparadox.c
+++ b/client/cmdlfparadox.c
@@ -22,183 +22,183 @@
 static int CmdHelp(const char *Cmd);
 
 int usage_lf_paradox_sim(void) {
-	PrintAndLogEx(NORMAL, "Enables simulation of Paradox card with specified card number.");
-	PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
-	PrintAndLogEx(NORMAL, "The facility-code is 8-bit and the card number is 16-bit.  Larger values are truncated.");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  lf paradox sim [h] <Facility-Code> <Card-Number>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "  h               : this help");
-	PrintAndLogEx(NORMAL, "  <Facility-Code> :  8-bit value facility code");
-	PrintAndLogEx(NORMAL, "  <Card Number>   : 16-bit value card number");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "       lf paradox sim 123 11223");
-	return 0;
+    PrintAndLogEx(NORMAL, "Enables simulation of Paradox card with specified card number.");
+    PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
+    PrintAndLogEx(NORMAL, "The facility-code is 8-bit and the card number is 16-bit.  Larger values are truncated.");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  lf paradox sim [h] <Facility-Code> <Card-Number>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "  h               : this help");
+    PrintAndLogEx(NORMAL, "  <Facility-Code> :  8-bit value facility code");
+    PrintAndLogEx(NORMAL, "  <Card Number>   : 16-bit value card number");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "       lf paradox sim 123 11223");
+    return 0;
 }
 
 // loop to get raw paradox waveform then FSK demodulate the TAG ID from it
 int detectParadox(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32_t *lo, int *waveStartIdx) {
-	//make sure buffer has data
-	if (*size < 96*50) return -1;
-	
-	if (getSignalProperties()->isnoise) return -2;
+    //make sure buffer has data
+    if (*size < 96*50) return -1;
 
-	// FSK demodulator
-	*size = fskdemod(dest, *size, 50, 1, 10, 8, waveStartIdx); // paradox fsk2a
+    if (getSignalProperties()->isnoise) return -2;
 
-	//did we get a good demod?
-	if (*size < 96) return -3;
+    // FSK demodulator
+    *size = fskdemod(dest, *size, 50, 1, 10, 8, waveStartIdx); // paradox fsk2a
 
-	// 00001111 bit pattern represent start of frame, 01 pattern represents a 0 and 10 represents a 1
-	size_t startIdx = 0;
-	uint8_t preamble[] = {0,0,0,0,1,1,1,1};
-	if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
-		return -4; //preamble not found
+    //did we get a good demod?
+    if (*size < 96) return -3;
 
-	size_t numStart = startIdx + sizeof(preamble);
-	// final loop, go over previously decoded FSK data and manchester decode into usable tag ID
-	for (size_t idx = numStart; (idx-numStart) < *size - sizeof(preamble); idx+=2){
-		if (dest[idx] == dest[idx+1])
-			return -5; //not manchester data
+    // 00001111 bit pattern represent start of frame, 01 pattern represents a 0 and 10 represents a 1
+    size_t startIdx = 0;
+    uint8_t preamble[] = {0,0,0,0,1,1,1,1};
+    if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
+        return -4; //preamble not found
 
-		*hi2 = (*hi2 << 1) | (*hi >> 31);
-		*hi = (*hi << 1) | (*lo >> 31);
-		//Then, shift in a 0 or one into low
-		*lo <<= 1;
-		if (dest[idx] && !dest[idx+1])	// 1 0
-			*lo |= 1;
-		else // 0 1
-			*lo |= 0;
-	}
-	return (int)startIdx;
+    size_t numStart = startIdx + sizeof(preamble);
+    // final loop, go over previously decoded FSK data and manchester decode into usable tag ID
+    for (size_t idx = numStart; (idx-numStart) < *size - sizeof(preamble); idx+=2){
+        if (dest[idx] == dest[idx+1])
+            return -5; //not manchester data
+
+        *hi2 = (*hi2 << 1) | (*hi >> 31);
+        *hi = (*hi << 1) | (*lo >> 31);
+        //Then, shift in a 0 or one into low
+        *lo <<= 1;
+        if (dest[idx] && !dest[idx+1]) // 1 0
+            *lo |= 1;
+        else // 0 1
+            *lo |= 0;
+    }
+    return (int)startIdx;
 }
 
 //by marshmellow
 //Paradox Prox demod - FSK2a RF/50 with preamble of 00001111 (then manchester encoded)
 //print full Paradox Prox ID and some bit format details if found
 int CmdParadoxDemod(const char *Cmd) {
-	//raw fsk demod no manchester decoding no start bit finding just get binary from wave
-	uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
-	size_t size = getFromGraphBuf(bits);
-	if (size == 0) {
-		PrintAndLogEx(DEBUG, "DEBUG: Error - Paradox not enough samples");
-		return 0;
-	}
+    //raw fsk demod no manchester decoding no start bit finding just get binary from wave
+    uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
+    size_t size = getFromGraphBuf(bits);
+    if (size == 0) {
+        PrintAndLogEx(DEBUG, "DEBUG: Error - Paradox not enough samples");
+        return 0;
+    }
 
-	uint32_t hi2 = 0, hi = 0, lo = 0;
-	int waveIdx = 0;
-	//get binary from fsk wave
-	int idx = detectParadox(bits, &size, &hi2, &hi, &lo, &waveIdx);
-	if (idx < 0){
+    uint32_t hi2 = 0, hi = 0, lo = 0;
+    int waveIdx = 0;
+    //get binary from fsk wave
+    int idx = detectParadox(bits, &size, &hi2, &hi, &lo, &waveIdx);
+    if (idx < 0){
 
-		if (idx == -1)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - Paradox not enough samples");
-		else if (idx == -2)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - Paradox just noise detected");
-		else if (idx == -3)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - Paradox problem during FSK demod");
-		else if (idx == -4)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - Paradox preamble not found");
-		else if (idx == -5)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - Paradox error in Manchester data, size %d", size);
-		else
-			PrintAndLogEx(DEBUG, "DEBUG: Error - Paradox error demoding fsk %d", idx);
+        if (idx == -1)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - Paradox not enough samples");
+        else if (idx == -2)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - Paradox just noise detected");
+        else if (idx == -3)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - Paradox problem during FSK demod");
+        else if (idx == -4)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - Paradox preamble not found");
+        else if (idx == -5)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - Paradox error in Manchester data, size %d", size);
+        else
+            PrintAndLogEx(DEBUG, "DEBUG: Error - Paradox error demoding fsk %d", idx);
 
-		return 0;
-	}
+        return 0;
+    }
 
-	setDemodBuf(bits, size, idx);
-	setClockGrid(50, waveIdx + (idx * 50));
+    setDemodBuf(bits, size, idx);
+    setClockGrid(50, waveIdx + (idx * 50));
 
-	if (hi2 == 0 && hi == 0 && lo == 0){
-		PrintAndLogEx(DEBUG, "DEBUG: Error - Paradox no value found");
-		return 0;
-	}
+    if (hi2 == 0 && hi == 0 && lo == 0){
+        PrintAndLogEx(DEBUG, "DEBUG: Error - Paradox no value found");
+        return 0;
+    }
 
-	uint32_t fc = ((hi & 0x3) << 6) | (lo >> 26);
-	uint32_t cardnum = (lo >> 10) & 0xFFFF;
-	uint32_t rawLo = bytebits_to_byte(bits + idx + 64, 32);
-	uint32_t rawHi = bytebits_to_byte(bits + idx + 32, 32);
-	uint32_t rawHi2 = bytebits_to_byte(bits + idx, 32);
+    uint32_t fc = ((hi & 0x3) << 6) | (lo >> 26);
+    uint32_t cardnum = (lo >> 10) & 0xFFFF;
+    uint32_t rawLo = bytebits_to_byte(bits + idx + 64, 32);
+    uint32_t rawHi = bytebits_to_byte(bits + idx + 32, 32);
+    uint32_t rawHi2 = bytebits_to_byte(bits + idx, 32);
 
-	PrintAndLogEx(NORMAL, "Paradox TAG ID: %x%08x - FC: %d - Card: %d - Checksum: %02x - RAW: %08x%08x%08x",
-		hi >> 10,
-		(hi & 0x3) << 26 | (lo >> 10),
-		fc, cardnum,
-		(lo >> 2) & 0xFF,
-		rawHi2,
-		rawHi,
-		rawLo
-	);
+    PrintAndLogEx(NORMAL, "Paradox TAG ID: %x%08x - FC: %d - Card: %d - Checksum: %02x - RAW: %08x%08x%08x",
+        hi >> 10,
+        (hi & 0x3) << 26 | (lo >> 10),
+        fc, cardnum,
+        (lo >> 2) & 0xFF,
+        rawHi2,
+        rawHi,
+        rawLo
+    );
 
-	PrintAndLogEx(DEBUG, "DEBUG: Paradox idx: %d, len: %d, Printing Demod Buffer:", idx, size);
-	if (g_debugMode)
-		printDemodBuff();
+    PrintAndLogEx(DEBUG, "DEBUG: Paradox idx: %d, len: %d, Printing Demod Buffer:", idx, size);
+    if (g_debugMode)
+        printDemodBuff();
 
-	return 1;
+    return 1;
 }
 //by marshmellow
 //see ASKDemod for what args are accepted
 int CmdParadoxRead(const char *Cmd) {
-	lf_read(true, 10000);
-	return CmdParadoxDemod(Cmd);
+    lf_read(true, 10000);
+    return CmdParadoxDemod(Cmd);
 }
 
 int CmdParadoxSim(const char *Cmd) {
 
-	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_paradox_sim();
+    char cmdp = param_getchar(Cmd, 0);
+    if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_paradox_sim();
 
-	uint32_t facilitycode = 0, cardnumber = 0, fc = 0, cn = 0;
+    uint32_t facilitycode = 0, cardnumber = 0, fc = 0, cn = 0;
 
-	uint8_t bs[96];
-	size_t size = sizeof(bs);
-	memset(bs, 0x00, size);
+    uint8_t bs[96];
+    size_t size = sizeof(bs);
+    memset(bs, 0x00, size);
 
-	// Paradox uses:  fcHigh: 10, fcLow: 8, clk: 50, invert: 1  FSK2a
-	uint8_t clk = 50, invert = 1, high = 10, low = 8;
-	uint16_t arg1, arg2;
-	arg1 = high << 8 | low;
-	arg2 = invert << 8 | clk;
+    // Paradox uses:  fcHigh: 10, fcLow: 8, clk: 50, invert: 1  FSK2a
+    uint8_t clk = 50, invert = 1, high = 10, low = 8;
+    uint16_t arg1, arg2;
+    arg1 = high << 8 | low;
+    arg2 = invert << 8 | clk;
 
-	if (sscanf(Cmd, "%u %u", &fc, &cn ) != 2) return usage_lf_paradox_sim();
+    if (sscanf(Cmd, "%u %u", &fc, &cn ) != 2) return usage_lf_paradox_sim();
 
-	facilitycode = (fc & 0x000000FF);
-	cardnumber = (cn & 0x0000FFFF);
+    facilitycode = (fc & 0x000000FF);
+    cardnumber = (cn & 0x0000FFFF);
 
-	// if ( !GetParadoxBits(facilitycode, cardnumber, bs)) {
-		// PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
-		// return 1;
-	// }
+    // if ( !GetParadoxBits(facilitycode, cardnumber, bs)) {
+        // PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
+        // return 1;
+    // }
 
-	PrintAndLogEx(NORMAL, "Simulating Paradox - Facility Code: %u, CardNumber: %u", facilitycode, cardnumber );
+    PrintAndLogEx(NORMAL, "Simulating Paradox - Facility Code: %u, CardNumber: %u", facilitycode, cardnumber );
 
-	UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}};
-	memcpy(c.d.asBytes, bs, size);
-	clearCommandBuffer();
-	SendCommand(&c);
+    UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}};
+    memcpy(c.d.asBytes, bs, size);
+    clearCommandBuffer();
+    SendCommand(&c);
 
-	PrintAndLogEx(NORMAL, "UNFINISHED");
-	return 0;
+    PrintAndLogEx(NORMAL, "UNFINISHED");
+    return 0;
 }
 
 static command_t CommandTable[] = {
-	{"help",  CmdHelp,			1, "This help"},
-	{"demod", CmdParadoxDemod,	1, "Demodulate a Paradox FSK tag from the GraphBuffer"},
-	{"read",  CmdParadoxRead,	0, "Attempt to read and Extract tag data from the antenna"},
-//	{"clone",	CmdParadoxClone,0, "clone paradox tag"},
-	{"sim",		CmdParadoxSim,	0, "simulate paradox tag"},
-	{NULL, NULL, 0, NULL}
+    {"help",  CmdHelp,          1, "This help"},
+    {"demod", CmdParadoxDemod,  1, "Demodulate a Paradox FSK tag from the GraphBuffer"},
+    {"read",  CmdParadoxRead,   0, "Attempt to read and Extract tag data from the antenna"},
+//  {"clone", CmdParadoxClone,  0, "clone paradox tag"},
+    {"sim",   CmdParadoxSim,    0, "simulate paradox tag"},
+    {NULL, NULL, 0, NULL}
 };
 
 int CmdLFParadox(const char *Cmd) {
-    clearCommandBuffer();    
-	CmdsParse(CommandTable, Cmd);
-	return 0;
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
+    return 0;
 }
 
 int CmdHelp(const char *Cmd) {
-	CmdsHelp(CommandTable);
-	return 0;
+    CmdsHelp(CommandTable);
+    return 0;
 }
diff --git a/client/cmdlfpcf7931.c b/client/cmdlfpcf7931.c
index c47a44e7b..1bddd4e4c 100644
--- a/client/cmdlfpcf7931.c
+++ b/client/cmdlfpcf7931.c
@@ -28,150 +28,150 @@ static int CmdHelp(const char *Cmd);
 
 // Default values - Configuration
 struct pcf7931_config configPcf = {
-	{0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF},
-	PCF7931_DEFAULT_INITDELAY,
-	PCF7931_DEFAULT_OFFSET_WIDTH,
-	PCF7931_DEFAULT_OFFSET_POSITION
-	};
+    {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF},
+    PCF7931_DEFAULT_INITDELAY,
+    PCF7931_DEFAULT_OFFSET_WIDTH,
+    PCF7931_DEFAULT_OFFSET_POSITION
+    };
 
 // Resets the configuration settings to default values.
 int pcf7931_resetConfig(){
-	memset(configPcf.Pwd, 0xFF, sizeof(configPcf.Pwd) );
-	configPcf.InitDelay = PCF7931_DEFAULT_INITDELAY;
-	configPcf.OffsetWidth = PCF7931_DEFAULT_OFFSET_WIDTH;
-	configPcf.OffsetPosition = PCF7931_DEFAULT_OFFSET_POSITION;
-	return 0;
+    memset(configPcf.Pwd, 0xFF, sizeof(configPcf.Pwd) );
+    configPcf.InitDelay = PCF7931_DEFAULT_INITDELAY;
+    configPcf.OffsetWidth = PCF7931_DEFAULT_OFFSET_WIDTH;
+    configPcf.OffsetPosition = PCF7931_DEFAULT_OFFSET_POSITION;
+    return 0;
 }
 
 int pcf7931_printConfig(){
-	PrintAndLogEx(NORMAL, "Password (LSB first on bytes) : %s", sprint_hex( configPcf.Pwd, sizeof(configPcf.Pwd)));
-	PrintAndLogEx(NORMAL, "Tag initialization delay      : %d us", configPcf.InitDelay);
-	PrintAndLogEx(NORMAL, "Offset low pulses width       : %d us", configPcf.OffsetWidth);
-	PrintAndLogEx(NORMAL, "Offset low pulses position    : %d us", configPcf.OffsetPosition);
-	return 0;
+    PrintAndLogEx(NORMAL, "Password (LSB first on bytes) : %s", sprint_hex( configPcf.Pwd, sizeof(configPcf.Pwd)));
+    PrintAndLogEx(NORMAL, "Tag initialization delay      : %d us", configPcf.InitDelay);
+    PrintAndLogEx(NORMAL, "Offset low pulses width       : %d us", configPcf.OffsetWidth);
+    PrintAndLogEx(NORMAL, "Offset low pulses position    : %d us", configPcf.OffsetPosition);
+    return 0;
 }
 
 int usage_pcf7931_read(){
-	PrintAndLogEx(NORMAL, "Usage: lf pcf7931 read [h] ");
-	PrintAndLogEx(NORMAL, "This command tries to read a PCF7931 tag.");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h   This help");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      lf pcf7931 read");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage: lf pcf7931 read [h] ");
+    PrintAndLogEx(NORMAL, "This command tries to read a PCF7931 tag.");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h   This help");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      lf pcf7931 read");
+    return 0;
 }
 
 int usage_pcf7931_write(){
-	PrintAndLogEx(NORMAL, "Usage: lf pcf7931 write [h] <block address> <byte address> <data>");
-	PrintAndLogEx(NORMAL, "This command tries to write a PCF7931 tag.");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h 			   This help");
-	PrintAndLogEx(NORMAL, "       blockaddress   Block to save [0-7]");
-	PrintAndLogEx(NORMAL, "       byteaddress    Index of byte inside block to write [0-15]");
-	PrintAndLogEx(NORMAL, "       data           one byte of data (hex)");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      lf pcf7931 write 2 1 FF");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage: lf pcf7931 write [h] <block address> <byte address> <data>");
+    PrintAndLogEx(NORMAL, "This command tries to write a PCF7931 tag.");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h              This help");
+    PrintAndLogEx(NORMAL, "       blockaddress   Block to save [0-7]");
+    PrintAndLogEx(NORMAL, "       byteaddress    Index of byte inside block to write [0-15]");
+    PrintAndLogEx(NORMAL, "       data           one byte of data (hex)");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      lf pcf7931 write 2 1 FF");
+    return 0;
 }
 
 int usage_pcf7931_config(){
-	PrintAndLogEx(NORMAL, "Usage: lf pcf7931 config [h] [r] <pwd> <delay> <offset width> <offset position>");
-	PrintAndLogEx(NORMAL, "This command tries to set the configuration used with PCF7931 commands");
-	PrintAndLogEx(NORMAL, "The time offsets could be useful to correct slew rate generated by the antenna");
-	PrintAndLogEx(NORMAL, "Caling without some parameter will print the current configuration.");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h       This help");
-	PrintAndLogEx(NORMAL, "       r       Reset configuration to default values");
-	PrintAndLogEx(NORMAL, "       pwd     Password, hex, 7bytes, LSB-order");
-	PrintAndLogEx(NORMAL, "       delay   Tag initialization delay (in us) decimal");
-	PrintAndLogEx(NORMAL, "       offset  Low pulses width (in us) decimal");
-	PrintAndLogEx(NORMAL, "       offset  Low pulses position (in us) decimal");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      lf pcf7931 config");
-	PrintAndLogEx(NORMAL, "      lf pcf7931 config r");
-	PrintAndLogEx(NORMAL, "      lf pcf7931 config 11223344556677 20000");
-	PrintAndLogEx(NORMAL, "      lf pcf7931 config 11223344556677 17500 -10 30");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage: lf pcf7931 config [h] [r] <pwd> <delay> <offset width> <offset position>");
+    PrintAndLogEx(NORMAL, "This command tries to set the configuration used with PCF7931 commands");
+    PrintAndLogEx(NORMAL, "The time offsets could be useful to correct slew rate generated by the antenna");
+    PrintAndLogEx(NORMAL, "Caling without some parameter will print the current configuration.");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h       This help");
+    PrintAndLogEx(NORMAL, "       r       Reset configuration to default values");
+    PrintAndLogEx(NORMAL, "       pwd     Password, hex, 7bytes, LSB-order");
+    PrintAndLogEx(NORMAL, "       delay   Tag initialization delay (in us) decimal");
+    PrintAndLogEx(NORMAL, "       offset  Low pulses width (in us) decimal");
+    PrintAndLogEx(NORMAL, "       offset  Low pulses position (in us) decimal");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      lf pcf7931 config");
+    PrintAndLogEx(NORMAL, "      lf pcf7931 config r");
+    PrintAndLogEx(NORMAL, "      lf pcf7931 config 11223344556677 20000");
+    PrintAndLogEx(NORMAL, "      lf pcf7931 config 11223344556677 17500 -10 30");
+    return 0;
 }
 
 int CmdLFPCF7931Read(const char *Cmd){
 
-	uint8_t ctmp = param_getchar(Cmd, 0);
-	if ( ctmp == 'H' || ctmp == 'h' ) return usage_pcf7931_read();
+    uint8_t ctmp = param_getchar(Cmd, 0);
+    if ( ctmp == 'H' || ctmp == 'h' ) return usage_pcf7931_read();
 
-	UsbCommand resp;
-	UsbCommand c = {CMD_PCF7931_READ, {0, 0, 0}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2500) ) {
-		PrintAndLogEx(WARNING, "command execution time out");
-		return 1;
-	}
-	return 0;
+    UsbCommand resp;
+    UsbCommand c = {CMD_PCF7931_READ, {0, 0, 0}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2500) ) {
+        PrintAndLogEx(WARNING, "command execution time out");
+        return 1;
+    }
+    return 0;
 }
 
 int CmdLFPCF7931Config(const char *Cmd){
 
-	uint8_t ctmp = param_getchar(Cmd, 0);
-	if ( ctmp == 0) return pcf7931_printConfig();
-	if ( ctmp == 'H' || ctmp == 'h' ) return usage_pcf7931_config();
-	if ( ctmp == 'R' || ctmp == 'r' ) return pcf7931_resetConfig();
+    uint8_t ctmp = param_getchar(Cmd, 0);
+    if ( ctmp == 0) return pcf7931_printConfig();
+    if ( ctmp == 'H' || ctmp == 'h' ) return usage_pcf7931_config();
+    if ( ctmp == 'R' || ctmp == 'r' ) return pcf7931_resetConfig();
 
-	if ( param_gethex(Cmd, 0, configPcf.Pwd, 14) ) return usage_pcf7931_config();
+    if ( param_gethex(Cmd, 0, configPcf.Pwd, 14) ) return usage_pcf7931_config();
 
-	configPcf.InitDelay = (param_get32ex(Cmd,1,0,10) & 0xFFFF);
-	configPcf.OffsetWidth = (int)(param_get32ex(Cmd,2,0,10) & 0xFFFF);
-	configPcf.OffsetPosition = (int)(param_get32ex(Cmd,3,0,10) & 0xFFFF);
+    configPcf.InitDelay = (param_get32ex(Cmd,1,0,10) & 0xFFFF);
+    configPcf.OffsetWidth = (int)(param_get32ex(Cmd,2,0,10) & 0xFFFF);
+    configPcf.OffsetPosition = (int)(param_get32ex(Cmd,3,0,10) & 0xFFFF);
 
-	pcf7931_printConfig();
-	return 0;
+    pcf7931_printConfig();
+    return 0;
 }
 
 int CmdLFPCF7931Write(const char *Cmd){
 
-	uint8_t ctmp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) < 1 || ctmp == 'h' || ctmp == 'H') return usage_pcf7931_write();
+    uint8_t ctmp = param_getchar(Cmd, 0);
+    if (strlen(Cmd) < 1 || ctmp == 'h' || ctmp == 'H') return usage_pcf7931_write();
 
-	uint8_t block = 0, bytepos = 0, data = 0;
+    uint8_t block = 0, bytepos = 0, data = 0;
 
-	if ( param_getdec(Cmd, 0, &block) ) return usage_pcf7931_write();
-	if ( param_getdec(Cmd, 1, &bytepos) ) return usage_pcf7931_write();
+    if ( param_getdec(Cmd, 0, &block) ) return usage_pcf7931_write();
+    if ( param_getdec(Cmd, 1, &bytepos) ) return usage_pcf7931_write();
 
-	if ( (block > 7) || (bytepos > 15) ) return usage_pcf7931_write();
+    if ( (block > 7) || (bytepos > 15) ) return usage_pcf7931_write();
 
-	data 	= param_get8ex(Cmd, 2, 0, 16);
+    data = param_get8ex(Cmd, 2, 0, 16);
 
-	PrintAndLogEx(NORMAL, "Writing block: %d", block);
-	PrintAndLogEx(NORMAL, "          pos: %d", bytepos);
-	PrintAndLogEx(NORMAL, "         data: 0x%02X", data);
+    PrintAndLogEx(NORMAL, "Writing block: %d", block);
+    PrintAndLogEx(NORMAL, "          pos: %d", bytepos);
+    PrintAndLogEx(NORMAL, "         data: 0x%02X", data);
 
-	UsbCommand c = {CMD_PCF7931_WRITE, { block, bytepos, data} };
-	memcpy(c.d.asDwords, configPcf.Pwd, sizeof(configPcf.Pwd) );
+    UsbCommand c = {CMD_PCF7931_WRITE, { block, bytepos, data} };
+    memcpy(c.d.asDwords, configPcf.Pwd, sizeof(configPcf.Pwd) );
     c.d.asDwords[7] = (configPcf.OffsetWidth + 128);
     c.d.asDwords[8] = (configPcf.OffsetPosition + 128);
     c.d.asDwords[9] = configPcf.InitDelay;
 
-	clearCommandBuffer();
-	SendCommand(&c);
-	//no ack?
-	return 0;
+    clearCommandBuffer();
+    SendCommand(&c);
+    //no ack?
+    return 0;
 }
 
 static command_t CommandTable[] = {
-	{"help", 	CmdHelp,			1, "This help"},
-	{"read",   CmdLFPCF7931Read,   0, "Read content of a PCF7931 transponder"},
-	{"write",  CmdLFPCF7931Write,  0, "Write data on a PCF7931 transponder."},
-	{"config",	CmdLFPCF7931Config, 1, "Configure the password, the tags initialization delay and time offsets (optional)"},
-	{NULL, NULL, 0, NULL}
+    {"help",   CmdHelp,            1, "This help"},
+    {"read",   CmdLFPCF7931Read,   0, "Read content of a PCF7931 transponder"},
+    {"write",  CmdLFPCF7931Write,  0, "Write data on a PCF7931 transponder."},
+    {"config", CmdLFPCF7931Config, 1, "Configure the password, the tags initialization delay and time offsets (optional)"},
+    {NULL, NULL, 0, NULL}
 };
 
 int CmdLFPCF7931(const char *Cmd) {
-	clearCommandBuffer();
-	CmdsParse(CommandTable, Cmd);
-	return 0;
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
+    return 0;
 }
 
 int CmdHelp(const char *Cmd) {
-	CmdsHelp(CommandTable);
-	return 0;
+    CmdsHelp(CommandTable);
+    return 0;
 }
diff --git a/client/cmdlfpcf7931.h b/client/cmdlfpcf7931.h
index e093039c9..9e279e731 100644
--- a/client/cmdlfpcf7931.h
+++ b/client/cmdlfpcf7931.h
@@ -1,6 +1,6 @@
 //-----------------------------------------------------------------------------
 // Copyright (C) 2012 Chalk <chalk.secu at gmail.com>
-//				 2015 Dake <thomas.cayrou at gmail.com>
+//               2015 Dake <thomas.cayrou at gmail.com>
 
 // This code is licensed to you under the terms of the GNU GPL, version 2 or,
 // at your option, any later version. See the LICENSE.txt file for the text of
@@ -13,10 +13,10 @@
 #define CMDLFPCF7931_H__
 
 struct pcf7931_config{
-	uint8_t Pwd[7];
-	uint16_t InitDelay;
-	int16_t OffsetWidth;
-	int16_t OffsetPosition;
+    uint8_t Pwd[7];
+    uint16_t InitDelay;
+    int16_t OffsetWidth;
+    int16_t OffsetPosition;
 };
 
 int pcf7931_resetConfig();
diff --git a/client/cmdlfpresco.c b/client/cmdlfpresco.c
index 1b54899bd..51175df83 100644
--- a/client/cmdlfpresco.c
+++ b/client/cmdlfpresco.c
@@ -11,247 +11,247 @@
 static int CmdHelp(const char *Cmd);
 
 int usage_lf_presco_clone(void){
-	PrintAndLogEx(NORMAL, "clone a Presco tag to a T55x7 tag.");
-	PrintAndLogEx(NORMAL, "Usage: lf presco clone [h] d <Card-ID> c <hex-ID> <Q5>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "  h             : this help");
-	PrintAndLogEx(NORMAL, "  d <Card-ID>   : 9 digit presco card ID");
-	PrintAndLogEx(NORMAL, "  c <hex-ID>    : 8 digit hex card number");
-	PrintAndLogEx(NORMAL, "  <Q5>          : specify write to Q5 (t5555 instead of t55x7)");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "       lf presco clone d 123456789");
-	return 0;
+    PrintAndLogEx(NORMAL, "clone a Presco tag to a T55x7 tag.");
+    PrintAndLogEx(NORMAL, "Usage: lf presco clone [h] d <Card-ID> c <hex-ID> <Q5>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "  h             : this help");
+    PrintAndLogEx(NORMAL, "  d <Card-ID>   : 9 digit presco card ID");
+    PrintAndLogEx(NORMAL, "  c <hex-ID>    : 8 digit hex card number");
+    PrintAndLogEx(NORMAL, "  <Q5>          : specify write to Q5 (t5555 instead of t55x7)");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "       lf presco clone d 123456789");
+    return 0;
 }
 
 int usage_lf_presco_sim(void) {
-	PrintAndLogEx(NORMAL, "Enables simulation of presco card with specified card number.");
-	PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
-	PrintAndLogEx(NORMAL, "Per presco format, the card number is 9 digit number and can contain *# chars. Larger values are truncated.");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  lf presco sim [h] d <Card-ID> or c <hex-ID>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "  h             : this help");
-	PrintAndLogEx(NORMAL, "  d <Card-ID>   : 9 digit presco card number");
-	PrintAndLogEx(NORMAL, "  c <hex-ID>    : 8 digit hex card number");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "       lf presco sim d 123456789");
-	return 0;
+    PrintAndLogEx(NORMAL, "Enables simulation of presco card with specified card number.");
+    PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
+    PrintAndLogEx(NORMAL, "Per presco format, the card number is 9 digit number and can contain *# chars. Larger values are truncated.");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  lf presco sim [h] d <Card-ID> or c <hex-ID>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "  h             : this help");
+    PrintAndLogEx(NORMAL, "  d <Card-ID>   : 9 digit presco card number");
+    PrintAndLogEx(NORMAL, "  c <hex-ID>    : 8 digit hex card number");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "       lf presco sim d 123456789");
+    return 0;
 }
 
 // find presco preamble 0x10D in already demoded data
 int detectPresco(uint8_t *dest, size_t *size) {
-	if (*size < 128*2) return -1; //make sure buffer has data
-	size_t startIdx = 0;
-	uint8_t preamble[] = {0,0,0,1,0,0,0,0,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0};
-	if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
-		return -2; //preamble not found
-	if (*size != 128) return -3; //wrong demoded size
-	//return start position
-	return (int)startIdx;
+    if (*size < 128*2) return -1; //make sure buffer has data
+    size_t startIdx = 0;
+    uint8_t preamble[] = {0,0,0,1,0,0,0,0,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0};
+    if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
+        return -2; //preamble not found
+    if (*size != 128) return -3; //wrong demoded size
+    //return start position
+    return (int)startIdx;
 }
 
 // convert base 12 ID to sitecode & usercode & 8 bit other unknown code
 int GetWiegandFromPresco(const char *Cmd, uint32_t *sitecode, uint32_t *usercode, uint32_t *fullcode, bool *Q5) {
 
-	uint8_t val = 0;
-	bool hex = false, errors = false;
-	uint8_t cmdp = 0;
-	char id[11];
-	int stringlen = 0;
-	memset(id, 0x00, sizeof(id));
+    uint8_t val = 0;
+    bool hex = false, errors = false;
+    uint8_t cmdp = 0;
+    char id[11];
+    int stringlen = 0;
+    memset(id, 0x00, sizeof(id));
 
-	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch (tolower(param_getchar(Cmd, cmdp))) {
-			case 'h':
-				return -1;
-			case 'c':
-				hex = true;
-				//get hex
-				*fullcode = param_get32ex(Cmd, cmdp+1, 0, 16);
-				cmdp+=2;
-				break;
-			case 'd':
-				//param get string int param_getstr(const char *line, int paramnum, char * str)
-				stringlen = param_getstr(Cmd, cmdp+1, id, sizeof(id));
-				if (stringlen < 2) return -1;
-				cmdp += 2;
-				break;
-			case 'q':
-				*Q5 = true;
-				cmdp++;
-				break;
-			default:
-				PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-				errors = 1;
-				break;
-		}
-	}
-	//Validations
-	if (errors || cmdp == 0) return -1;
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+            case 'h':
+                return -1;
+            case 'c':
+                hex = true;
+                //get hex
+                *fullcode = param_get32ex(Cmd, cmdp+1, 0, 16);
+                cmdp+=2;
+                break;
+            case 'd':
+                //param get string int param_getstr(const char *line, int paramnum, char * str)
+                stringlen = param_getstr(Cmd, cmdp+1, id, sizeof(id));
+                if (stringlen < 2) return -1;
+                cmdp += 2;
+                break;
+            case 'q':
+                *Q5 = true;
+                cmdp++;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                errors = 1;
+                break;
+        }
+    }
+    //Validations
+    if (errors || cmdp == 0) return -1;
 
-	if (!hex) {
-		for (int index =0; index < strlen(id); ++index) {
+    if (!hex) {
+        for (int index =0; index < strlen(id); ++index) {
 
-			// Get value from number string.
-			if ( id[index] == '*' )
-				val = 10;
-			if ( id[index] == '#')
-				val = 11;
-			if ( id[index] >= 0x30 && id[index] <= 0x39 )
-				val = id[index] - 0x30;
+            // Get value from number string.
+            if ( id[index] == '*' )
+                val = 10;
+            if ( id[index] == '#')
+                val = 11;
+            if ( id[index] >= 0x30 && id[index] <= 0x39 )
+                val = id[index] - 0x30;
 
-			*fullcode += val;
+            *fullcode += val;
 
-			// last digit is only added, not multipled.
-			if ( index < strlen(id)-1 )
-					*fullcode *= 12;
-		}
-	}
+            // last digit is only added, not multipled.
+            if ( index < strlen(id)-1 )
+                    *fullcode *= 12;
+        }
+    }
 
-	*usercode = *fullcode & 0x0000FFFF; //% 65566
-	*sitecode = (*fullcode >> 24) & 0x000000FF;  // /= 16777216;
-	return 0;
+    *usercode = *fullcode & 0x0000FFFF; //% 65566
+    *sitecode = (*fullcode >> 24) & 0x000000FF;  // /= 16777216;
+    return 0;
 }
 
 // calc not certain - intended to get bitstream for programming / sim
 int GetPrescoBits(uint32_t fullcode, uint8_t *prescoBits) {
-	num_to_bytebits(0x10D00000, 32, prescoBits);
-	num_to_bytebits(0x00000000, 32, prescoBits+32);
-	num_to_bytebits(0x00000000, 32, prescoBits+64);
-	num_to_bytebits(fullcode  , 32, prescoBits+96);
-	return 1;
+    num_to_bytebits(0x10D00000, 32, prescoBits);
+    num_to_bytebits(0x00000000, 32, prescoBits+32);
+    num_to_bytebits(0x00000000, 32, prescoBits+64);
+    num_to_bytebits(fullcode  , 32, prescoBits+96);
+    return 1;
 }
 
 //see ASKDemod for what args are accepted
 int CmdPrescoDemod(const char *Cmd) {
-	bool st = true;
-	if (!ASKDemod_ext("32 0 0 0 0 a", false, false, 1, &st)) {
-		PrintAndLogEx(DEBUG, "DEBUG: Error Presco ASKDemod failed");
-		return 0;
-	}
-	size_t size = DemodBufferLen;
-	int ans = detectPresco(DemodBuffer, &size);
-	if (ans < 0) {
-		if (ans == -1)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - Presco: too few bits found");
-		else if (ans == -2)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - Presco: preamble not found");
-		else if (ans == -3)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - Presco: Size not correct: %d", size);
-		else
-			PrintAndLogEx(DEBUG, "DEBUG: Error - Presco: ans: %d", ans);
-		return 0;
-	}
-	setDemodBuf(DemodBuffer, 128, ans);
-	setClockGrid(g_DemodClock, g_DemodStartIdx + (ans*g_DemodClock));
+    bool st = true;
+    if (!ASKDemod_ext("32 0 0 0 0 a", false, false, 1, &st)) {
+        PrintAndLogEx(DEBUG, "DEBUG: Error Presco ASKDemod failed");
+        return 0;
+    }
+    size_t size = DemodBufferLen;
+    int ans = detectPresco(DemodBuffer, &size);
+    if (ans < 0) {
+        if (ans == -1)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - Presco: too few bits found");
+        else if (ans == -2)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - Presco: preamble not found");
+        else if (ans == -3)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - Presco: Size not correct: %d", size);
+        else
+            PrintAndLogEx(DEBUG, "DEBUG: Error - Presco: ans: %d", ans);
+        return 0;
+    }
+    setDemodBuf(DemodBuffer, 128, ans);
+    setClockGrid(g_DemodClock, g_DemodStartIdx + (ans*g_DemodClock));
 
-	//got a good demod
-	uint32_t raw1 = bytebits_to_byte(DemodBuffer, 32);
-	uint32_t raw2 = bytebits_to_byte(DemodBuffer+32, 32);
-	uint32_t raw3 = bytebits_to_byte(DemodBuffer+64, 32);
-	uint32_t raw4 = bytebits_to_byte(DemodBuffer+96, 32);
-	uint32_t cardid = raw4;
-	PrintAndLogEx(SUCCESS, "Presco Tag Found: Card ID %08X, Raw: %08X%08X%08X%08X", cardid, raw1, raw2, raw3, raw4);
+    //got a good demod
+    uint32_t raw1 = bytebits_to_byte(DemodBuffer, 32);
+    uint32_t raw2 = bytebits_to_byte(DemodBuffer+32, 32);
+    uint32_t raw3 = bytebits_to_byte(DemodBuffer+64, 32);
+    uint32_t raw4 = bytebits_to_byte(DemodBuffer+96, 32);
+    uint32_t cardid = raw4;
+    PrintAndLogEx(SUCCESS, "Presco Tag Found: Card ID %08X, Raw: %08X%08X%08X%08X", cardid, raw1, raw2, raw3, raw4);
 
-	uint32_t sitecode = 0, usercode = 0, fullcode = 0;
-	bool Q5 = false;
-	char cmd[12] = {0};
-	sprintf(cmd, "H %08X", cardid);
-	GetWiegandFromPresco(cmd, &sitecode, &usercode, &fullcode, &Q5);
-	PrintAndLogEx(SUCCESS, "SiteCode %u, UserCode %u, FullCode, %08X", sitecode, usercode, fullcode);
-	return 1;
+    uint32_t sitecode = 0, usercode = 0, fullcode = 0;
+    bool Q5 = false;
+    char cmd[12] = {0};
+    sprintf(cmd, "H %08X", cardid);
+    GetWiegandFromPresco(cmd, &sitecode, &usercode, &fullcode, &Q5);
+    PrintAndLogEx(SUCCESS, "SiteCode %u, UserCode %u, FullCode, %08X", sitecode, usercode, fullcode);
+    return 1;
 }
 
 //see ASKDemod for what args are accepted
 int CmdPrescoRead(const char *Cmd) {
-	//	Presco Number: 123456789 --> Sitecode 30 | usercode 8665
-	lf_read(true, 12000);
-	return CmdPrescoDemod(Cmd);
+    // Presco Number: 123456789 --> Sitecode 30 | usercode 8665
+    lf_read(true, 12000);
+    return CmdPrescoDemod(Cmd);
 }
 
 // takes base 12 ID converts to hex
 // Or takes 8 digit hex ID
 int CmdPrescoClone(const char *Cmd) {
 
-	bool Q5 = false;
-	uint32_t sitecode=0, usercode=0, fullcode=0;
-	uint32_t blocks[5] = {T55x7_MODULATION_MANCHESTER | T55x7_BITRATE_RF_32 | 4 << T55x7_MAXBLOCK_SHIFT | T55x7_ST_TERMINATOR, 0, 0, 0, 0};
+    bool Q5 = false;
+    uint32_t sitecode=0, usercode=0, fullcode=0;
+    uint32_t blocks[5] = {T55x7_MODULATION_MANCHESTER | T55x7_BITRATE_RF_32 | 4 << T55x7_MAXBLOCK_SHIFT | T55x7_ST_TERMINATOR, 0, 0, 0, 0};
 
-	// get wiegand from printed number.
-	if (GetWiegandFromPresco(Cmd, &sitecode, &usercode, &fullcode, &Q5) == -1) return usage_lf_presco_clone();
+    // get wiegand from printed number.
+    if (GetWiegandFromPresco(Cmd, &sitecode, &usercode, &fullcode, &Q5) == -1) return usage_lf_presco_clone();
 
-	if (Q5)
-		blocks[0] = T5555_MODULATION_MANCHESTER | T5555_SET_BITRATE(32) | 4 << T5555_MAXBLOCK_SHIFT | T5555_ST_TERMINATOR;
+    if (Q5)
+        blocks[0] = T5555_MODULATION_MANCHESTER | T5555_SET_BITRATE(32) | 4 << T5555_MAXBLOCK_SHIFT | T5555_ST_TERMINATOR;
 
-	if ((sitecode & 0xFF) != sitecode) {
-		sitecode &= 0xFF;
-		PrintAndLogEx(INFO, "Facility-Code Truncated to 8-bits (Presco): %u", sitecode);
-	}
+    if ((sitecode & 0xFF) != sitecode) {
+        sitecode &= 0xFF;
+        PrintAndLogEx(INFO, "Facility-Code Truncated to 8-bits (Presco): %u", sitecode);
+    }
 
-	if ((usercode & 0xFFFF) != usercode) {
-		usercode &= 0xFFFF;
-		PrintAndLogEx(INFO, "Card Number Truncated to 16-bits (Presco): %u", usercode);
-	}
+    if ((usercode & 0xFFFF) != usercode) {
+        usercode &= 0xFFFF;
+        PrintAndLogEx(INFO, "Card Number Truncated to 16-bits (Presco): %u", usercode);
+    }
 
-	blocks[1] = 0x10D00000; //preamble
-	blocks[2] = 0x00000000;
-	blocks[3] = 0x00000000;
-	blocks[4] = fullcode;
+    blocks[1] = 0x10D00000; //preamble
+    blocks[2] = 0x00000000;
+    blocks[3] = 0x00000000;
+    blocks[4] = fullcode;
 
-	PrintAndLogEx(INFO, "Preparing to clone Presco to T55x7 with SiteCode: %u, UserCode: %u, FullCode: %08x", sitecode, usercode, fullcode);
-	print_blocks(blocks, 5);
+    PrintAndLogEx(INFO, "Preparing to clone Presco to T55x7 with SiteCode: %u, UserCode: %u, FullCode: %08x", sitecode, usercode, fullcode);
+    print_blocks(blocks, 5);
 
-	UsbCommand resp;
-	UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
+    UsbCommand resp;
+    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
 
-	for (uint8_t i=0; i<5; i++) {
-		c.arg[0] = blocks[i];
-		c.arg[1] = i;
-		clearCommandBuffer();
-		SendCommand(&c);
-		if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)){
-			PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
-			return -1;
-		}
-	}
+    for (uint8_t i=0; i<5; i++) {
+        c.arg[0] = blocks[i];
+        c.arg[1] = i;
+        clearCommandBuffer();
+        SendCommand(&c);
+        if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)){
+            PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
+            return -1;
+        }
+    }
     return 0;
 }
 
 // takes base 12 ID converts to hex
 // Or takes 8 digit hex ID
 int CmdPrescoSim(const char *Cmd) {
-	uint32_t sitecode=0, usercode=0, fullcode=0;
-	bool Q5=false;
-	// get wiegand from printed number.
-	if (GetWiegandFromPresco(Cmd, &sitecode, &usercode, &fullcode, &Q5) == -1) return usage_lf_presco_sim();
+    uint32_t sitecode=0, usercode=0, fullcode=0;
+    bool Q5=false;
+    // get wiegand from printed number.
+    if (GetWiegandFromPresco(Cmd, &sitecode, &usercode, &fullcode, &Q5) == -1) return usage_lf_presco_sim();
 
-	uint8_t clk = 32, encoding = 1, separator = 1, invert = 0;
-	uint16_t arg1, arg2;
-	size_t size = 128;
-	arg1 = clk << 8 | encoding;
-	arg2 = invert << 8 | separator;
+    uint8_t clk = 32, encoding = 1, separator = 1, invert = 0;
+    uint16_t arg1, arg2;
+    size_t size = 128;
+    arg1 = clk << 8 | encoding;
+    arg2 = invert << 8 | separator;
 
-	PrintAndLogEx(SUCCESS, "Simulating Presco - SiteCode: %u, UserCode: %u, FullCode: %08X",sitecode, usercode, fullcode);
+    PrintAndLogEx(SUCCESS, "Simulating Presco - SiteCode: %u, UserCode: %u, FullCode: %08X",sitecode, usercode, fullcode);
 
-	UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};
-	GetPrescoBits(fullcode, c.d.asBytes);
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+    UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};
+    GetPrescoBits(fullcode, c.d.asBytes);
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 
 static command_t CommandTable[] = {
-    {"help",	CmdHelp,		1, "This help"},
-	{"read",	CmdPrescoRead,  0, "Attempt to read and Extract tag data"},
-	{"clone",	CmdPrescoClone, 0, "clone presco tag"},
-	{"sim",		CmdPrescoSim,   0, "simulate presco tag"},
+    {"help",    CmdHelp,        1, "This help"},
+    {"read",    CmdPrescoRead,  0, "Attempt to read and Extract tag data"},
+    {"clone",   CmdPrescoClone, 0, "clone presco tag"},
+    {"sim",     CmdPrescoSim,   0, "simulate presco tag"},
     {NULL, NULL, 0, NULL}
 };
 
 int CmdLFPresco(const char *Cmd) {
-	clearCommandBuffer();
+    clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c
index af8c570c5..939d9444d 100644
--- a/client/cmdlfpyramid.c
+++ b/client/cmdlfpyramid.c
@@ -12,344 +12,344 @@
 static int CmdHelp(const char *Cmd);
 
 int usage_lf_pyramid_clone(void){
-	PrintAndLogEx(NORMAL, "clone a Farpointe/Pyramid tag to a T55x7 tag.");
-	PrintAndLogEx(NORMAL, "The facility-code is 8-bit and the card number is 16-bit.  Larger values are truncated. ");
-	PrintAndLogEx(NORMAL, "Currently only works on 26bit");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage: lf pyramid clone [h] <Facility-Code> <Card-Number> [Q5]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "  h               : this help");
-	PrintAndLogEx(NORMAL, "  <Facility-Code> :  8-bit value facility code");
-	PrintAndLogEx(NORMAL, "  <Card Number>   : 16-bit value card number");
-	PrintAndLogEx(NORMAL, "  Q5              : optional - clone to Q5 (T5555) instead of T55x7 chip");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "       lf pyramid clone 123 11223");
-	return 0;
+    PrintAndLogEx(NORMAL, "clone a Farpointe/Pyramid tag to a T55x7 tag.");
+    PrintAndLogEx(NORMAL, "The facility-code is 8-bit and the card number is 16-bit.  Larger values are truncated. ");
+    PrintAndLogEx(NORMAL, "Currently only works on 26bit");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage: lf pyramid clone [h] <Facility-Code> <Card-Number> [Q5]");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "  h               : this help");
+    PrintAndLogEx(NORMAL, "  <Facility-Code> :  8-bit value facility code");
+    PrintAndLogEx(NORMAL, "  <Card Number>   : 16-bit value card number");
+    PrintAndLogEx(NORMAL, "  Q5              : optional - clone to Q5 (T5555) instead of T55x7 chip");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "       lf pyramid clone 123 11223");
+    return 0;
 }
 
 int usage_lf_pyramid_sim(void) {
-	PrintAndLogEx(NORMAL, "Enables simulation of Farpointe/Pyramid card with specified card number.");
-	PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
-	PrintAndLogEx(NORMAL, "The facility-code is 8-bit and the card number is 16-bit.  Larger values are truncated.");
-	PrintAndLogEx(NORMAL, "Currently work only on 26bit");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  lf pyramid sim [h] <Facility-Code> <Card-Number>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "  h               : this help");
-	PrintAndLogEx(NORMAL, "  <Facility-Code> :  8-bit value facility code");
-	PrintAndLogEx(NORMAL, "  <Card Number>   : 16-bit value card number");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "       lf pyramid sim 123 11223");
-	return 0;
+    PrintAndLogEx(NORMAL, "Enables simulation of Farpointe/Pyramid card with specified card number.");
+    PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
+    PrintAndLogEx(NORMAL, "The facility-code is 8-bit and the card number is 16-bit.  Larger values are truncated.");
+    PrintAndLogEx(NORMAL, "Currently work only on 26bit");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  lf pyramid sim [h] <Facility-Code> <Card-Number>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "  h               : this help");
+    PrintAndLogEx(NORMAL, "  <Facility-Code> :  8-bit value facility code");
+    PrintAndLogEx(NORMAL, "  <Card Number>   : 16-bit value card number");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "       lf pyramid sim 123 11223");
+    return 0;
 }
 
 // by marshmellow
 // FSK Demod then try to locate a Farpointe Data (pyramid) ID
 int detectPyramid(uint8_t *dest, size_t *size, int *waveStartIdx) {
-	//make sure buffer has data
-	if (*size < 128*50) return -1;
+    //make sure buffer has data
+    if (*size < 128*50) return -1;
 
-	//test samples are not just noise
-	if (getSignalProperties()->isnoise) return -2;
+    //test samples are not just noise
+    if (getSignalProperties()->isnoise) return -2;
 
-	// FSK demodulator RF/50 FSK 10,8
-	*size = fskdemod(dest, *size, 50, 0, 10, 8, waveStartIdx);  // pyramid fsk2
+    // FSK demodulator RF/50 FSK 10,8
+    *size = fskdemod(dest, *size, 50, 0, 10, 8, waveStartIdx);  // pyramid fsk2
 
-	//did we get a good demod?
-	if (*size < 128) return -3;
+    //did we get a good demod?
+    if (*size < 128) return -3;
 
-	size_t startIdx = 0;
-	uint8_t preamble[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1};
-	if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
-		return -4; //preamble not found
+    size_t startIdx = 0;
+    uint8_t preamble[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1};
+    if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
+        return -4; //preamble not found
 
-	// wrong size?  (between to preambles)
-	if (*size != 128) return -5;
+    // wrong size?  (between to preambles)
+    if (*size != 128) return -5;
 
-	return (int)startIdx;
+    return (int)startIdx;
 }
 
 // Works for 26bits.
 int GetPyramidBits(uint32_t fc, uint32_t cn, uint8_t *pyramidBits) {
 
-	uint8_t pre[128];
-	memset(pre, 0x00, sizeof(pre));
+    uint8_t pre[128];
+    memset(pre, 0x00, sizeof(pre));
 
-	// format start bit
-	pre[79] = 1;
+    // format start bit
+    pre[79] = 1;
 
-	// Get 26 wiegand from FacilityCode, CardNumber
-	uint8_t wiegand[24];
-	memset(wiegand, 0x00, sizeof(wiegand));
-	num_to_bytebits(fc, 8, wiegand);
-	num_to_bytebits(cn, 16, wiegand+8);
+    // Get 26 wiegand from FacilityCode, CardNumber
+    uint8_t wiegand[24];
+    memset(wiegand, 0x00, sizeof(wiegand));
+    num_to_bytebits(fc, 8, wiegand);
+    num_to_bytebits(cn, 16, wiegand+8);
 
-	// add wiegand parity bits (dest, source, len)
-	wiegand_add_parity(pre+80, wiegand, 24);
+    // add wiegand parity bits (dest, source, len)
+    wiegand_add_parity(pre+80, wiegand, 24);
 
-	// add paritybits	(bitsource, dest, sourcelen, paritylen, parityType (odd, even,)
-	addParity(pre+8, pyramidBits+8, 102, 8, 1);
+    // add paritybits (bitsource, dest, sourcelen, paritylen, parityType (odd, even,)
+    addParity(pre+8, pyramidBits+8, 102, 8, 1);
 
-	// add checksum
-	uint8_t csBuff[13];
-	for (uint8_t i = 0; i < 13; i++)
-		csBuff[i] = bytebits_to_byte(pyramidBits + 16 + (i*8), 8);
+    // add checksum
+    uint8_t csBuff[13];
+    for (uint8_t i = 0; i < 13; i++)
+        csBuff[i] = bytebits_to_byte(pyramidBits + 16 + (i*8), 8);
 
-	uint32_t crc = CRC8Maxim(csBuff, 13);
-	num_to_bytebits(crc, 8, pyramidBits+120);
-	return 1;
+    uint32_t crc = CRC8Maxim(csBuff, 13);
+    num_to_bytebits(crc, 8, pyramidBits+120);
+    return 1;
 }
 
 //by marshmellow
 //Pyramid Prox demod - FSK RF/50 with preamble of 0000000000000001  (always a 128 bit data stream)
 //print full Farpointe Data/Pyramid Prox ID and some bit format details if found
 int CmdPyramidDemod(const char *Cmd) {
-	//raw fsk demod no manchester decoding no start bit finding just get binary from wave
-	uint8_t bits[MAX_GRAPH_TRACE_LEN]={0};
-	size_t size = getFromGraphBuf(bits);
-	if (size == 0) {
-		PrintAndLogEx(DEBUG, "DEBUG: Error - Pyramid not enough samples");
-		return 0;
-	}
-	//get binary from fsk wave
-	int waveIdx=0;
-	int idx = detectPyramid(bits, &size, &waveIdx);
-	if (idx < 0){
-			if (idx == -1)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - Pyramid: not enough samples");
-		else if (idx == -2)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - Pyramid: only noise found");
-		else if (idx == -3)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - Pyramid: problem during FSK demod");
-		else if (idx == -4)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - Pyramid: preamble not found");
-		else if (idx == -5)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - Pyramid: size not correct: %d", size);
-		else
-			PrintAndLogEx(DEBUG, "DEBUG: Error - Pyramid: error demoding fsk idx: %d",idx);
-		return 0;
-	}
-	setDemodBuf(bits, size, idx);
-	setClockGrid(50, waveIdx + (idx*50));
+    //raw fsk demod no manchester decoding no start bit finding just get binary from wave
+    uint8_t bits[MAX_GRAPH_TRACE_LEN]={0};
+    size_t size = getFromGraphBuf(bits);
+    if (size == 0) {
+        PrintAndLogEx(DEBUG, "DEBUG: Error - Pyramid not enough samples");
+        return 0;
+    }
+    //get binary from fsk wave
+    int waveIdx=0;
+    int idx = detectPyramid(bits, &size, &waveIdx);
+    if (idx < 0){
+            if (idx == -1)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - Pyramid: not enough samples");
+        else if (idx == -2)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - Pyramid: only noise found");
+        else if (idx == -3)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - Pyramid: problem during FSK demod");
+        else if (idx == -4)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - Pyramid: preamble not found");
+        else if (idx == -5)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - Pyramid: size not correct: %d", size);
+        else
+            PrintAndLogEx(DEBUG, "DEBUG: Error - Pyramid: error demoding fsk idx: %d",idx);
+        return 0;
+    }
+    setDemodBuf(bits, size, idx);
+    setClockGrid(50, waveIdx + (idx*50));
 
-	// Index map
-	// 0           10          20          30            40          50          60
-	// |           |           |           |             |           |           |
-	// 0123456 7 8901234 5 6789012 3 4567890 1 2345678 9 0123456 7 8901234 5 6789012 3
-	// -----------------------------------------------------------------------------
-	// 0000000 0 0000000 1 0000000 1 0000000 1 0000000 1 0000000 1 0000000 1 0000000 1
-	// premable  xxxxxxx o xxxxxxx o xxxxxxx o xxxxxxx o xxxxxxx o xxxxxxx o xxxxxxx o
+    // Index map
+    // 0           10          20          30            40          50          60
+    // |           |           |           |             |           |           |
+    // 0123456 7 8901234 5 6789012 3 4567890 1 2345678 9 0123456 7 8901234 5 6789012 3
+    // -----------------------------------------------------------------------------
+    // 0000000 0 0000000 1 0000000 1 0000000 1 0000000 1 0000000 1 0000000 1 0000000 1
+    // premable  xxxxxxx o xxxxxxx o xxxxxxx o xxxxxxx o xxxxxxx o xxxxxxx o xxxxxxx o
 
-	// 64    70            80          90          100         110           120
-	// |     |             |           |           |           |             |
-	// 4567890 1 2345678 9 0123456 7 8901234 5 6789012 3 4567890 1 2345678 9 0123456 7
-	// -----------------------------------------------------------------------------
-	// 0000000 1 0000000 1 0000000 1 0110111 0 0011000 1 0000001 0 0001100 1 1001010 0
-	// xxxxxxx o xxxxxxx o xxxxxxx o xswffff o ffffccc o ccccccc o ccccccw o ppppppp o
-	//                                  |---115---||---------71---------|
-	// s = format start bit, o = odd parity of last 7 bits
-	// f = facility code, c = card number
-	// w = wiegand parity, x = extra space for other formats
-	// p = CRC8maxim checksum
-	// (26 bit format shown)
+    // 64    70            80          90          100         110           120
+    // |     |             |           |           |           |             |
+    // 4567890 1 2345678 9 0123456 7 8901234 5 6789012 3 4567890 1 2345678 9 0123456 7
+    // -----------------------------------------------------------------------------
+    // 0000000 1 0000000 1 0000000 1 0110111 0 0011000 1 0000001 0 0001100 1 1001010 0
+    // xxxxxxx o xxxxxxx o xxxxxxx o xswffff o ffffccc o ccccccc o ccccccw o ppppppp o
+    //                                  |---115---||---------71---------|
+    // s = format start bit, o = odd parity of last 7 bits
+    // f = facility code, c = card number
+    // w = wiegand parity, x = extra space for other formats
+    // p = CRC8maxim checksum
+    // (26 bit format shown)
 
-	//get bytes for checksum calc
-	uint8_t checksum = bytebits_to_byte(bits + idx + 120, 8);
-	uint8_t csBuff[14] = {0x00};
-	for (uint8_t i = 0; i < 13; i++){
-		csBuff[i] = bytebits_to_byte(bits + idx + 16 + (i*8), 8);
-	}
-	//check checksum calc
-	//checksum calc thanks to ICEMAN!!
-	uint32_t checkCS =  CRC8Maxim(csBuff, 13);
+    //get bytes for checksum calc
+    uint8_t checksum = bytebits_to_byte(bits + idx + 120, 8);
+    uint8_t csBuff[14] = {0x00};
+    for (uint8_t i = 0; i < 13; i++){
+        csBuff[i] = bytebits_to_byte(bits + idx + 16 + (i*8), 8);
+    }
+    //check checksum calc
+    //checksum calc thanks to ICEMAN!!
+    uint32_t checkCS =  CRC8Maxim(csBuff, 13);
 
-	//get raw ID before removing parities
-	uint32_t rawLo = bytebits_to_byte(bits+idx+96, 32);
-	uint32_t rawHi = bytebits_to_byte(bits+idx+64, 32);
-	uint32_t rawHi2 = bytebits_to_byte(bits+idx+32, 32);
-	uint32_t rawHi3 = bytebits_to_byte(bits+idx, 32);
+    //get raw ID before removing parities
+    uint32_t rawLo = bytebits_to_byte(bits+idx+96, 32);
+    uint32_t rawHi = bytebits_to_byte(bits+idx+64, 32);
+    uint32_t rawHi2 = bytebits_to_byte(bits+idx+32, 32);
+    uint32_t rawHi3 = bytebits_to_byte(bits+idx, 32);
 
-	size = removeParity(bits, idx+8, 8, 1, 120);
-	if (size != 105){
-		if ( size == 0)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - Pyramid: parity check failed - IDX: %d, hi3: %08X", idx, rawHi3);
-		else
-			PrintAndLogEx(DEBUG, "DEBUG: Error - Pyramid: at parity check - tag size does not match Pyramid format, SIZE: %d, IDX: %d, hi3: %08X", size, idx, rawHi3);
-		return 0;
-	}
+    size = removeParity(bits, idx+8, 8, 1, 120);
+    if (size != 105){
+        if ( size == 0)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - Pyramid: parity check failed - IDX: %d, hi3: %08X", idx, rawHi3);
+        else
+            PrintAndLogEx(DEBUG, "DEBUG: Error - Pyramid: at parity check - tag size does not match Pyramid format, SIZE: %d, IDX: %d, hi3: %08X", size, idx, rawHi3);
+        return 0;
+    }
 
-	// ok valid card found!
+    // ok valid card found!
 
-	// Index map
-	// 0         10        20        30        40        50        60        70
-	// |         |         |         |         |         |         |         |
-	// 01234567890123456789012345678901234567890123456789012345678901234567890
-	// -----------------------------------------------------------------------
-	// 00000000000000000000000000000000000000000000000000000000000000000000000
-	// xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+    // Index map
+    // 0         10        20        30        40        50        60        70
+    // |         |         |         |         |         |         |         |
+    // 01234567890123456789012345678901234567890123456789012345678901234567890
+    // -----------------------------------------------------------------------
+    // 00000000000000000000000000000000000000000000000000000000000000000000000
+    // xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
-	// 71         80         90          100
-	// |          |          |           |
-	// 1 2 34567890 1234567890123456 7 8901234
-	// ---------------------------------------
-	// 1 1 01110011 0000000001000110 0 1001010
-	// s w ffffffff cccccccccccccccc w ppppppp
-	//     |--115-| |------71------|
-	// s = format start bit, o = odd parity of last 7 bits
-	// f = facility code, c = card number
-	// w = wiegand parity, x = extra space for other formats
-	// p = CRC8-Maxim checksum
-	// (26 bit format shown)
+    // 71         80         90          100
+    // |          |          |           |
+    // 1 2 34567890 1234567890123456 7 8901234
+    // ---------------------------------------
+    // 1 1 01110011 0000000001000110 0 1001010
+    // s w ffffffff cccccccccccccccc w ppppppp
+    //     |--115-| |------71------|
+    // s = format start bit, o = odd parity of last 7 bits
+    // f = facility code, c = card number
+    // w = wiegand parity, x = extra space for other formats
+    // p = CRC8-Maxim checksum
+    // (26 bit format shown)
 
-	//find start bit to get fmtLen
-	int j;
-	for (j=0; j < size; ++j){
-		if(bits[j]) break;
-	}
+    //find start bit to get fmtLen
+    int j;
+    for (j=0; j < size; ++j){
+        if(bits[j]) break;
+    }
 
-	uint8_t fmtLen = size-j-8;
-	uint32_t fc = 0;
-	uint32_t cardnum = 0;
-	uint32_t code1 = 0;
+    uint8_t fmtLen = size-j-8;
+    uint32_t fc = 0;
+    uint32_t cardnum = 0;
+    uint32_t code1 = 0;
 
-	if ( fmtLen == 26 ){
-		fc = bytebits_to_byte(bits+73, 8);
-		cardnum = bytebits_to_byte(bits+81, 16);
-		code1 = bytebits_to_byte(bits+72,fmtLen);
-		PrintAndLogEx(SUCCESS, "Pyramid ID Found - BitLength: %d, FC: %d, Card: %d - Wiegand: %x, Raw: %08x%08x%08x%08x", fmtLen, fc, cardnum, code1, rawHi3, rawHi2, rawHi, rawLo);
-	} else if (fmtLen == 45) {
-		fmtLen = 42; //end = 10 bits not 7 like 26 bit fmt
-		fc = bytebits_to_byte(bits+53, 10);
-		cardnum = bytebits_to_byte(bits+63, 32);
-		PrintAndLogEx(SUCCESS, "Pyramid ID Found - BitLength: %d, FC: %d, Card: %d - Raw: %08x%08x%08x%08x", fmtLen, fc, cardnum, rawHi3, rawHi2, rawHi, rawLo);
-	} else {
-		cardnum = bytebits_to_byte(bits+81, 16);
-		if (fmtLen>32){
-			//code1 = bytebits_to_byte(bits+(size-fmtLen),fmtLen-32);
-			//code2 = bytebits_to_byte(bits+(size-32),32);
-		PrintAndLogEx(SUCCESS, "Pyramid ID Found - BitLength: %d -unknown BitLength- (%d), Raw: %08x%08x%08x%08x", fmtLen, cardnum, rawHi3, rawHi2, rawHi, rawLo);
-		} else{
-			//code1 = bytebits_to_byte(bits+(size-fmtLen),fmtLen);
-			PrintAndLogEx(SUCCESS, "Pyramid ID Found - BitLength: %d -unknown BitLength- (%d), Raw: %08x%08x%08x%08x", fmtLen, cardnum, rawHi3, rawHi2, rawHi, rawLo);
-		}
-	}
-	if (checksum == checkCS)
-		PrintAndLogEx(SUCCESS, "Checksum %02x passed", checksum);
-	else
-		PrintAndLogEx(FAILED, "Checksum %02x failed - should have been %02x", checksum, checkCS);
+    if ( fmtLen == 26 ){
+        fc = bytebits_to_byte(bits+73, 8);
+        cardnum = bytebits_to_byte(bits+81, 16);
+        code1 = bytebits_to_byte(bits+72,fmtLen);
+        PrintAndLogEx(SUCCESS, "Pyramid ID Found - BitLength: %d, FC: %d, Card: %d - Wiegand: %x, Raw: %08x%08x%08x%08x", fmtLen, fc, cardnum, code1, rawHi3, rawHi2, rawHi, rawLo);
+    } else if (fmtLen == 45) {
+        fmtLen = 42; //end = 10 bits not 7 like 26 bit fmt
+        fc = bytebits_to_byte(bits+53, 10);
+        cardnum = bytebits_to_byte(bits+63, 32);
+        PrintAndLogEx(SUCCESS, "Pyramid ID Found - BitLength: %d, FC: %d, Card: %d - Raw: %08x%08x%08x%08x", fmtLen, fc, cardnum, rawHi3, rawHi2, rawHi, rawLo);
+    } else {
+        cardnum = bytebits_to_byte(bits+81, 16);
+        if (fmtLen>32){
+            //code1 = bytebits_to_byte(bits+(size-fmtLen),fmtLen-32);
+            //code2 = bytebits_to_byte(bits+(size-32),32);
+        PrintAndLogEx(SUCCESS, "Pyramid ID Found - BitLength: %d -unknown BitLength- (%d), Raw: %08x%08x%08x%08x", fmtLen, cardnum, rawHi3, rawHi2, rawHi, rawLo);
+        } else{
+            //code1 = bytebits_to_byte(bits+(size-fmtLen),fmtLen);
+            PrintAndLogEx(SUCCESS, "Pyramid ID Found - BitLength: %d -unknown BitLength- (%d), Raw: %08x%08x%08x%08x", fmtLen, cardnum, rawHi3, rawHi2, rawHi, rawLo);
+        }
+    }
+    if (checksum == checkCS)
+        PrintAndLogEx(SUCCESS, "Checksum %02x passed", checksum);
+    else
+        PrintAndLogEx(FAILED, "Checksum %02x failed - should have been %02x", checksum, checkCS);
 
-	PrintAndLogEx(DEBUG, "DEBUG: Pyramid: idx: %d, Len: %d, Printing Demod Buffer:", idx, 128);
-	if (g_debugMode)
-		printDemodBuff();
+    PrintAndLogEx(DEBUG, "DEBUG: Pyramid: idx: %d, Len: %d, Printing Demod Buffer:", idx, 128);
+    if (g_debugMode)
+        printDemodBuff();
 
-	return 1;
+    return 1;
 }
 
 int CmdPyramidRead(const char *Cmd) {
-	lf_read(true, 15000);
-	return CmdPyramidDemod(Cmd);
+    lf_read(true, 15000);
+    return CmdPyramidDemod(Cmd);
 }
 
 int CmdPyramidClone(const char *Cmd) {
 
-	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_pyramid_clone();
+    char cmdp = param_getchar(Cmd, 0);
+    if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_pyramid_clone();
 
-	uint32_t facilitycode=0, cardnumber=0, fc = 0, cn = 0;
-	uint32_t blocks[5];
-	uint8_t bs[128];
-	memset(bs, 0x00, sizeof(bs));
+    uint32_t facilitycode=0, cardnumber=0, fc = 0, cn = 0;
+    uint32_t blocks[5];
+    uint8_t bs[128];
+    memset(bs, 0x00, sizeof(bs));
 
-	if (sscanf(Cmd, "%u %u", &fc, &cn ) != 2) return usage_lf_pyramid_clone();
+    if (sscanf(Cmd, "%u %u", &fc, &cn ) != 2) return usage_lf_pyramid_clone();
 
-	facilitycode = (fc & 0x000000FF);
-	cardnumber = (cn & 0x0000FFFF);
+    facilitycode = (fc & 0x000000FF);
+    cardnumber = (cn & 0x0000FFFF);
 
-	if ( !GetPyramidBits(facilitycode, cardnumber, bs)) {
-		PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
-		return 1;
-	}
+    if ( !GetPyramidBits(facilitycode, cardnumber, bs)) {
+        PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
+        return 1;
+    }
 
-	//Pyramid - compat mode, FSK2a, data rate 50, 4 data blocks
-	blocks[0] = T55x7_MODULATION_FSK2a | T55x7_BITRATE_RF_50 | 4 << T55x7_MAXBLOCK_SHIFT;
+    //Pyramid - compat mode, FSK2a, data rate 50, 4 data blocks
+    blocks[0] = T55x7_MODULATION_FSK2a | T55x7_BITRATE_RF_50 | 4 << T55x7_MAXBLOCK_SHIFT;
 
-	// Q5
-	if (param_getchar(Cmd, 2) == 'Q' || param_getchar(Cmd, 2) == 'q')
-		blocks[0] = T5555_MODULATION_FSK2 | T5555_INVERT_OUTPUT | T5555_SET_BITRATE(50) | 4 << T5555_MAXBLOCK_SHIFT;
+    // Q5
+    if (param_getchar(Cmd, 2) == 'Q' || param_getchar(Cmd, 2) == 'q')
+        blocks[0] = T5555_MODULATION_FSK2 | T5555_INVERT_OUTPUT | T5555_SET_BITRATE(50) | 4 << T5555_MAXBLOCK_SHIFT;
 
-	blocks[1] = bytebits_to_byte(bs, 32);
-	blocks[2] = bytebits_to_byte(bs + 32, 32);
-	blocks[3] = bytebits_to_byte(bs + 64, 32);
-	blocks[4] = bytebits_to_byte(bs + 96, 32);
+    blocks[1] = bytebits_to_byte(bs, 32);
+    blocks[2] = bytebits_to_byte(bs + 32, 32);
+    blocks[3] = bytebits_to_byte(bs + 64, 32);
+    blocks[4] = bytebits_to_byte(bs + 96, 32);
 
-	PrintAndLogEx(INFO, "Preparing to clone Farpointe/Pyramid to T55x7 with Facility Code: %u, Card Number: %u", facilitycode, cardnumber);
-	print_blocks(blocks, 5);
+    PrintAndLogEx(INFO, "Preparing to clone Farpointe/Pyramid to T55x7 with Facility Code: %u, Card Number: %u", facilitycode, cardnumber);
+    print_blocks(blocks, 5);
 
-	UsbCommand resp;
-	UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
+    UsbCommand resp;
+    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
 
-	for (uint8_t i = 0; i < 5; ++i ) {
-		c.arg[0] = blocks[i];
-		c.arg[1] = i;
-		clearCommandBuffer();
-		SendCommand(&c);
-		if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)){
-			PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
-			return -1;
-		}
-	}
+    for (uint8_t i = 0; i < 5; ++i ) {
+        c.arg[0] = blocks[i];
+        c.arg[1] = i;
+        clearCommandBuffer();
+        SendCommand(&c);
+        if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)){
+            PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
+            return -1;
+        }
+    }
     return 0;
 }
 
 int CmdPyramidSim(const char *Cmd) {
 
-	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_pyramid_sim();
+    char cmdp = param_getchar(Cmd, 0);
+    if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_pyramid_sim();
 
-	uint32_t facilitycode = 0, cardnumber = 0, fc = 0, cn = 0;
+    uint32_t facilitycode = 0, cardnumber = 0, fc = 0, cn = 0;
 
-	uint8_t bs[128];
-	size_t size = sizeof(bs);
-	memset(bs, 0x00, size);
+    uint8_t bs[128];
+    size_t size = sizeof(bs);
+    memset(bs, 0x00, size);
 
-	// Pyramid uses:  fcHigh: 10, fcLow: 8, clk: 50, invert: 0
-	uint8_t clk = 50, invert = 0, high = 10, low = 8;
-	uint16_t arg1, arg2;
-	arg1 = high << 8 | low;
-	arg2 = invert << 8 | clk;
+    // Pyramid uses:  fcHigh: 10, fcLow: 8, clk: 50, invert: 0
+    uint8_t clk = 50, invert = 0, high = 10, low = 8;
+    uint16_t arg1, arg2;
+    arg1 = high << 8 | low;
+    arg2 = invert << 8 | clk;
 
-	if (sscanf(Cmd, "%u %u", &fc, &cn ) != 2) return usage_lf_pyramid_sim();
+    if (sscanf(Cmd, "%u %u", &fc, &cn ) != 2) return usage_lf_pyramid_sim();
 
-	facilitycode = (fc & 0x000000FF);
-	cardnumber = (cn & 0x0000FFFF);
+    facilitycode = (fc & 0x000000FF);
+    cardnumber = (cn & 0x0000FFFF);
 
-	if ( !GetPyramidBits(facilitycode, cardnumber, bs)) {
-		PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
-		return 1;
-	}
+    if ( !GetPyramidBits(facilitycode, cardnumber, bs)) {
+        PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
+        return 1;
+    }
 
-	PrintAndLogEx(SUCCESS, "Simulating Farpointe/Pyramid - Facility Code: %u, CardNumber: %u", facilitycode, cardnumber );
+    PrintAndLogEx(SUCCESS, "Simulating Farpointe/Pyramid - Facility Code: %u, CardNumber: %u", facilitycode, cardnumber );
 
-	UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}};
-	memcpy(c.d.asBytes, bs, size);
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+    UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}};
+    memcpy(c.d.asBytes, bs, size);
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 
 static command_t CommandTable[] = {
-    {"help",	CmdHelp,		1, "this help"},
-	{"demod",	CmdPyramidDemod,0, "demodulate a Pyramid FSK tag from the GraphBuffer"},
-	{"read",	CmdPyramidRead,	0, "attempt to read and extract tag data"},
-	{"clone",	CmdPyramidClone,0, "clone pyramid tag"},
-	{"sim",		CmdPyramidSim,	0, "simulate pyramid tag"},
+    {"help",    CmdHelp,        1, "this help"},
+    {"demod",   CmdPyramidDemod,0, "demodulate a Pyramid FSK tag from the GraphBuffer"},
+    {"read",    CmdPyramidRead, 0, "attempt to read and extract tag data"},
+    {"clone",   CmdPyramidClone,0, "clone pyramid tag"},
+    {"sim",     CmdPyramidSim,  0, "simulate pyramid tag"},
     {NULL, NULL, 0, NULL}
 };
 
 int CmdLFPyramid(const char *Cmd) {
-	clearCommandBuffer();
+    clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
diff --git a/client/cmdlfsecurakey.c b/client/cmdlfsecurakey.c
index 64e491d7f..52feead8a 100644
--- a/client/cmdlfsecurakey.c
+++ b/client/cmdlfsecurakey.c
@@ -14,119 +14,119 @@ static int CmdHelp(const char *Cmd);
 // by marshmellow
 // find Securakey preamble in already demoded data
 int detectSecurakey(uint8_t *dest, size_t *size) {
-	if (*size < 96) return -1; //make sure buffer has data
-	size_t startIdx = 0;
-	uint8_t preamble[] = {0,1,1,1,1,1,1,1,1,1,0,0,1};
-	if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
-		return -2; //preamble not found
-	if (*size != 96) return -3; //wrong demoded size
-	//return start position
-	return (int)startIdx;
+    if (*size < 96) return -1; //make sure buffer has data
+    size_t startIdx = 0;
+    uint8_t preamble[] = {0,1,1,1,1,1,1,1,1,1,0,0,1};
+    if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
+        return -2; //preamble not found
+    if (*size != 96) return -3; //wrong demoded size
+    //return start position
+    return (int)startIdx;
 }
 
 //see ASKDemod for what args are accepted
 int CmdSecurakeyDemod(const char *Cmd) {
 
-	//ASK / Manchester
-	bool st = false;
-	if (!ASKDemod_ext("40 0 0", false, false, 1, &st)) {
-		PrintAndLogEx(DEBUG, "DEBUG: Error - Securakey: ASK/Manchester Demod failed");
-		return 0;
-	}
-	if (st) return 0;
-	size_t size = DemodBufferLen;
-	int ans = detectSecurakey(DemodBuffer, &size);
-	if (ans < 0) {
-		if (ans == -1)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - Securakey: too few bits found");
-		else if (ans == -2)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - Securakey: preamble not found");
-		else if (ans == -3)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - Securakey: Size not correct: %d", size);
-		else
-			PrintAndLogEx(DEBUG, "DEBUG: Error - Securakey: ans: %d", ans);
-		return 0;
-	}
-	setDemodBuf(DemodBuffer, 96, ans);
-	setClockGrid(g_DemodClock, g_DemodStartIdx + (ans*g_DemodClock));
+    //ASK / Manchester
+    bool st = false;
+    if (!ASKDemod_ext("40 0 0", false, false, 1, &st)) {
+        PrintAndLogEx(DEBUG, "DEBUG: Error - Securakey: ASK/Manchester Demod failed");
+        return 0;
+    }
+    if (st) return 0;
+    size_t size = DemodBufferLen;
+    int ans = detectSecurakey(DemodBuffer, &size);
+    if (ans < 0) {
+        if (ans == -1)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - Securakey: too few bits found");
+        else if (ans == -2)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - Securakey: preamble not found");
+        else if (ans == -3)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - Securakey: Size not correct: %d", size);
+        else
+            PrintAndLogEx(DEBUG, "DEBUG: Error - Securakey: ans: %d", ans);
+        return 0;
+    }
+    setDemodBuf(DemodBuffer, 96, ans);
+    setClockGrid(g_DemodClock, g_DemodStartIdx + (ans*g_DemodClock));
 
-	//got a good demod
-	uint32_t raw1 = bytebits_to_byte(DemodBuffer   , 32);
-	uint32_t raw2 = bytebits_to_byte(DemodBuffer+32, 32);
-	uint32_t raw3 = bytebits_to_byte(DemodBuffer+64, 32);
+    //got a good demod
+    uint32_t raw1 = bytebits_to_byte(DemodBuffer   , 32);
+    uint32_t raw2 = bytebits_to_byte(DemodBuffer+32, 32);
+    uint32_t raw3 = bytebits_to_byte(DemodBuffer+64, 32);
 
-	// 26 bit format
-	// preamble     ??bitlen   reserved        EPx   xxxxxxxy   yyyyyyyy   yyyyyyyOP  CS?        CS2?
-	// 0111111111 0 01011010 0 00000000 0 00000010 0 00110110 0 00111110 0 01100010 0 00001111 0 01100000 0 00000000 0 0000
+    // 26 bit format
+    // preamble     ??bitlen   reserved        EPx   xxxxxxxy   yyyyyyyy   yyyyyyyOP  CS?        CS2?
+    // 0111111111 0 01011010 0 00000000 0 00000010 0 00110110 0 00111110 0 01100010 0 00001111 0 01100000 0 00000000 0 0000
 
-	// 32 bit format
-	// preamble     ??bitlen   reserved  EPxxxxxxx   xxxxxxxy   yyyyyyyy   yyyyyyyOP  CS?        CS2?
-	// 0111111111 0 01100000 0 00000000 0 10000100 0 11001010 0 01011011 0 01010110 0 00010110 0 11100000 0 00000000 0 0000
+    // 32 bit format
+    // preamble     ??bitlen   reserved  EPxxxxxxx   xxxxxxxy   yyyyyyyy   yyyyyyyOP  CS?        CS2?
+    // 0111111111 0 01100000 0 00000000 0 10000100 0 11001010 0 01011011 0 01010110 0 00010110 0 11100000 0 00000000 0 0000
 
-	// x = FC?
-	// y = card #
-	// standard wiegand parities.
-	// unknown checksum 11 bits? at the end
-	uint8_t bits_no_spacer[85];
-	memcpy(bits_no_spacer, DemodBuffer + 11, 85);
+    // x = FC?
+    // y = card #
+    // standard wiegand parities.
+    // unknown checksum 11 bits? at the end
+    uint8_t bits_no_spacer[85];
+    memcpy(bits_no_spacer, DemodBuffer + 11, 85);
 
-	// remove marker bits (0's every 9th digit after preamble) (pType = 3 (always 0s))
-	size = removeParity(bits_no_spacer, 0, 9, 3, 85);
-	if ( size != 85-9 ) {
-		PrintAndLogEx(DEBUG, "DEBUG: Error removeParity: %d", size);
-		return 0;
-	}
+    // remove marker bits (0's every 9th digit after preamble) (pType = 3 (always 0s))
+    size = removeParity(bits_no_spacer, 0, 9, 3, 85);
+    if ( size != 85-9 ) {
+        PrintAndLogEx(DEBUG, "DEBUG: Error removeParity: %d", size);
+        return 0;
+    }
 
-	uint8_t bitLen = (uint8_t)bytebits_to_byte(bits_no_spacer+2, 6);
-	uint32_t fc=0, lWiegand=0, rWiegand=0;
-	if (bitLen > 40) { //securakey's max bitlen is 40 bits...
-		PrintAndLogEx(DEBUG, "DEBUG: Error bitLen too long: %u", bitLen);
-		return 0;
-	}
-	// get left 1/2 wiegand & right 1/2 wiegand (for parity test and wiegand print)
-	lWiegand = bytebits_to_byte(bits_no_spacer + 48 - bitLen, bitLen/2);
-	rWiegand = bytebits_to_byte(bits_no_spacer + 48 - bitLen + bitLen/2, bitLen/2);
-	// get FC
-	fc = bytebits_to_byte(bits_no_spacer+49-bitLen, bitLen-2-16);
+    uint8_t bitLen = (uint8_t)bytebits_to_byte(bits_no_spacer+2, 6);
+    uint32_t fc=0, lWiegand=0, rWiegand=0;
+    if (bitLen > 40) { //securakey's max bitlen is 40 bits...
+        PrintAndLogEx(DEBUG, "DEBUG: Error bitLen too long: %u", bitLen);
+        return 0;
+    }
+    // get left 1/2 wiegand & right 1/2 wiegand (for parity test and wiegand print)
+    lWiegand = bytebits_to_byte(bits_no_spacer + 48 - bitLen, bitLen/2);
+    rWiegand = bytebits_to_byte(bits_no_spacer + 48 - bitLen + bitLen/2, bitLen/2);
+    // get FC
+    fc = bytebits_to_byte(bits_no_spacer+49-bitLen, bitLen-2-16);
 
-	// test bitLen
-	if (bitLen != 26 && bitLen != 32)
-		PrintAndLogEx(NORMAL, "***unknown securakey bitLen - share with forum***");
+    // test bitLen
+    if (bitLen != 26 && bitLen != 32)
+        PrintAndLogEx(NORMAL, "***unknown securakey bitLen - share with forum***");
 
-	uint32_t cardid = bytebits_to_byte(bits_no_spacer+8+23, 16);
-	// test parities - evenparity32 looks to add an even parity returns 0 if already even...
-	bool parity = !evenparity32(lWiegand) && !oddparity32(rWiegand);
+    uint32_t cardid = bytebits_to_byte(bits_no_spacer+8+23, 16);
+    // test parities - evenparity32 looks to add an even parity returns 0 if already even...
+    bool parity = !evenparity32(lWiegand) && !oddparity32(rWiegand);
 
-	PrintAndLogEx(SUCCESS, "Securakey Tag Found--BitLen: %u, Card ID: %u, FC: 0x%X, Raw: %08X%08X%08X", bitLen, cardid, fc, raw1 ,raw2, raw3);
-	if (bitLen <= 32)
-		PrintAndLogEx(SUCCESS, "Wiegand: %08X, Parity: %s", (lWiegand<<(bitLen/2)) | rWiegand, parity ? "Passed" : "Failed");
-	PrintAndLogEx(INFO, "\nHow the FC translates to printed FC is unknown");
-	PrintAndLogEx(INFO, "How the checksum is calculated is unknown");
-	PrintAndLogEx(INFO, "Help the community identify this format further\n by sharing your tag on the pm3 forum or with forum members");
-	return 1;
+    PrintAndLogEx(SUCCESS, "Securakey Tag Found--BitLen: %u, Card ID: %u, FC: 0x%X, Raw: %08X%08X%08X", bitLen, cardid, fc, raw1 ,raw2, raw3);
+    if (bitLen <= 32)
+        PrintAndLogEx(SUCCESS, "Wiegand: %08X, Parity: %s", (lWiegand<<(bitLen/2)) | rWiegand, parity ? "Passed" : "Failed");
+    PrintAndLogEx(INFO, "\nHow the FC translates to printed FC is unknown");
+    PrintAndLogEx(INFO, "How the checksum is calculated is unknown");
+    PrintAndLogEx(INFO, "Help the community identify this format further\n by sharing your tag on the pm3 forum or with forum members");
+    return 1;
 }
 
 int CmdSecurakeyRead(const char *Cmd) {
-	lf_read(true, 8000);
-	return CmdSecurakeyDemod(Cmd);
+    lf_read(true, 8000);
+    return CmdSecurakeyDemod(Cmd);
 }
 
 static command_t CommandTable[] = {
-	{"help",  CmdHelp,          1, "This help"},
-	{"demod", CmdSecurakeyDemod,1, "Demodulate an Securakey tag from the GraphBuffer"},
-	{"read",  CmdSecurakeyRead, 0, "Attempt to read and extract tag data from the antenna"},
-	//{"clone",	CmdSecurakeyClone,0, "clone Securakey tag"},
-	//{"sim",		CmdSecurakeydSim,	0, "simulate Securakey tag"},
+    {"help",  CmdHelp,          1, "This help"},
+    {"demod", CmdSecurakeyDemod,1, "Demodulate an Securakey tag from the GraphBuffer"},
+    {"read",  CmdSecurakeyRead, 0, "Attempt to read and extract tag data from the antenna"},
+    //{"clone", CmdSecurakeyClone,0, "clone Securakey tag"},
+    //{"sim",   CmdSecurakeydSim, 0, "simulate Securakey tag"},
     {NULL, NULL, 0, NULL}
 };
 
 int CmdLFSecurakey(const char *Cmd) {
-	clearCommandBuffer();
-	CmdsParse(CommandTable, Cmd);
-	return 0;
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
+    return 0;
 }
 
 int CmdHelp(const char *Cmd) {
-	CmdsHelp(CommandTable);
-	return 0;
+    CmdsHelp(CommandTable);
+    return 0;
 }
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 3e4e8dc2a..0aba4b4be 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -12,159 +12,159 @@
 t55xx_conf_block_t config = { .modulation = DEMOD_ASK, .inverted = false, .offset = 0x00, .block0 = 0x00, .Q5 = false };
 
 t55xx_conf_block_t Get_t55xx_Config(){
-	return config;
+    return config;
 }
 void Set_t55xx_Config(t55xx_conf_block_t conf){
-	config = conf;
+    config = conf;
 }
 
 int usage_t55xx_config(){
-	PrintAndLogEx(NORMAL, "Usage: lf t55xx config [d <demodulation>] [i 1] [o <offset>] [Q5]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h                                - This help");
-	PrintAndLogEx(NORMAL, "       b <8|16|32|40|50|64|100|128>     - Set bitrate");
-	PrintAndLogEx(NORMAL, "       d <FSK|FSK1|FSK1a|FSK2|FSK2a|ASK|PSK1|PSK2|NRZ|BI|BIa>  - Set demodulation FSK / ASK / PSK / NRZ / Biphase / Biphase A");
-	PrintAndLogEx(NORMAL, "       i [1]                            - Invert data signal, defaults to normal");
-	PrintAndLogEx(NORMAL, "       o [offset]                       - Set offset, where data should start decode in bitstream");
-	PrintAndLogEx(NORMAL, "       Q5                               - Set as Q5(T5555) chip instead of T55x7");
-	PrintAndLogEx(NORMAL, "       ST                               - Set Sequence Terminator on");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      lf t55xx config d FSK          - FSK demodulation");
-	PrintAndLogEx(NORMAL, "      lf t55xx config d FSK i 1      - FSK demodulation, inverse data");
-	PrintAndLogEx(NORMAL, "      lf t55xx config d FSK i 1 o 3  - FSK demodulation, inverse data, offset=3,start from position 3 to decode data");
-	PrintAndLogEx(NORMAL, "");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage: lf t55xx config [d <demodulation>] [i 1] [o <offset>] [Q5]");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h                                - This help");
+    PrintAndLogEx(NORMAL, "       b <8|16|32|40|50|64|100|128>     - Set bitrate");
+    PrintAndLogEx(NORMAL, "       d <FSK|FSK1|FSK1a|FSK2|FSK2a|ASK|PSK1|PSK2|NRZ|BI|BIa>  - Set demodulation FSK / ASK / PSK / NRZ / Biphase / Biphase A");
+    PrintAndLogEx(NORMAL, "       i [1]                            - Invert data signal, defaults to normal");
+    PrintAndLogEx(NORMAL, "       o [offset]                       - Set offset, where data should start decode in bitstream");
+    PrintAndLogEx(NORMAL, "       Q5                               - Set as Q5(T5555) chip instead of T55x7");
+    PrintAndLogEx(NORMAL, "       ST                               - Set Sequence Terminator on");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      lf t55xx config d FSK          - FSK demodulation");
+    PrintAndLogEx(NORMAL, "      lf t55xx config d FSK i 1      - FSK demodulation, inverse data");
+    PrintAndLogEx(NORMAL, "      lf t55xx config d FSK i 1 o 3  - FSK demodulation, inverse data, offset=3,start from position 3 to decode data");
+    PrintAndLogEx(NORMAL, "");
+    return 0;
 }
 int usage_t55xx_read(){
-	PrintAndLogEx(NORMAL, "Usage:  lf t55xx read [b <block>] [p <password>] <override_safety> <page1>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "     b <block>    - block number to read. Between 0-7");
-	PrintAndLogEx(NORMAL, "     p <password> - OPTIONAL password (8 hex characters)");
-	PrintAndLogEx(NORMAL, "     o            - OPTIONAL override safety check");
-	PrintAndLogEx(NORMAL, "     1            - OPTIONAL read Page 1 instead of Page 0");
-	PrintAndLogEx(NORMAL, "     ****WARNING****");
-	PrintAndLogEx(NORMAL, "     Use of read with password on a tag not configured for a pwd");
-	PrintAndLogEx(NORMAL, "     can damage the tag");
+    PrintAndLogEx(NORMAL, "Usage:  lf t55xx read [b <block>] [p <password>] <override_safety> <page1>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "     b <block>    - block number to read. Between 0-7");
+    PrintAndLogEx(NORMAL, "     p <password> - OPTIONAL password (8 hex characters)");
+    PrintAndLogEx(NORMAL, "     o            - OPTIONAL override safety check");
+    PrintAndLogEx(NORMAL, "     1            - OPTIONAL read Page 1 instead of Page 0");
+    PrintAndLogEx(NORMAL, "     ****WARNING****");
+    PrintAndLogEx(NORMAL, "     Use of read with password on a tag not configured for a pwd");
+    PrintAndLogEx(NORMAL, "     can damage the tag");
     PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-    PrintAndLogEx(NORMAL, "      lf t55xx read b 0				- read data from block 0");
-	PrintAndLogEx(NORMAL, "      lf t55xx read b 0 p feedbeef		- read data from block 0 password feedbeef");
-	PrintAndLogEx(NORMAL, "      lf t55xx read b 0 p feedbeef o	- read data from block 0 password feedbeef safety check");
-	PrintAndLogEx(NORMAL, "");
-	return 0;
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      lf t55xx read b 0                 - read data from block 0");
+    PrintAndLogEx(NORMAL, "      lf t55xx read b 0 p feedbeef      - read data from block 0 password feedbeef");
+    PrintAndLogEx(NORMAL, "      lf t55xx read b 0 p feedbeef o    - read data from block 0 password feedbeef safety check");
+    PrintAndLogEx(NORMAL, "");
+    return 0;
 }
 int usage_t55xx_write(){
-	PrintAndLogEx(NORMAL, "Usage:  lf t55xx write [b <block>] [d <data>] [p <password>] [1] [t]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "     b <block>    - block number to write. Between 0-7");
-	PrintAndLogEx(NORMAL, "     d <data>     - 4 bytes of data to write (8 hex characters)");
-	PrintAndLogEx(NORMAL, "     p <password> - OPTIONAL password 4bytes (8 hex characters)");
-	PrintAndLogEx(NORMAL, "     1            - OPTIONAL write Page 1 instead of Page 0");
-	PrintAndLogEx(NORMAL, "     t            - OPTIONAL test mode write - ****DANGER****");
+    PrintAndLogEx(NORMAL, "Usage:  lf t55xx write [b <block>] [d <data>] [p <password>] [1] [t]");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "     b <block>    - block number to write. Between 0-7");
+    PrintAndLogEx(NORMAL, "     d <data>     - 4 bytes of data to write (8 hex characters)");
+    PrintAndLogEx(NORMAL, "     p <password> - OPTIONAL password 4bytes (8 hex characters)");
+    PrintAndLogEx(NORMAL, "     1            - OPTIONAL write Page 1 instead of Page 0");
+    PrintAndLogEx(NORMAL, "     t            - OPTIONAL test mode write - ****DANGER****");
     PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      lf t55xx write b 3 d 11223344            - write 11223344 to block 3");
-	PrintAndLogEx(NORMAL, "      lf t55xx write b 3 d 11223344 p feedbeef - write 11223344 to block 3 password feedbeef");
-	PrintAndLogEx(NORMAL, "");
-	return 0;
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      lf t55xx write b 3 d 11223344            - write 11223344 to block 3");
+    PrintAndLogEx(NORMAL, "      lf t55xx write b 3 d 11223344 p feedbeef - write 11223344 to block 3 password feedbeef");
+    PrintAndLogEx(NORMAL, "");
+    return 0;
 }
 int usage_t55xx_trace() {
-	PrintAndLogEx(NORMAL, "Usage:  lf t55xx trace [1]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "     1             - if set, use Graphbuffer otherwise read data from tag.");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      lf t55xx trace");
-	PrintAndLogEx(NORMAL, "      lf t55xx trace 1");
-	PrintAndLogEx(NORMAL, "");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage:  lf t55xx trace [1]");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "     1            - if set, use Graphbuffer otherwise read data from tag.");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      lf t55xx trace");
+    PrintAndLogEx(NORMAL, "      lf t55xx trace 1");
+    PrintAndLogEx(NORMAL, "");
+    return 0;
 }
 int usage_t55xx_info() {
-	PrintAndLogEx(NORMAL, "Usage:  lf t55xx info [1]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "     1             - if set, use Graphbuffer otherwise read data from tag.");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      lf t55xx info");
-	PrintAndLogEx(NORMAL, "      lf t55xx info 1");
-	PrintAndLogEx(NORMAL, "");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage:  lf t55xx info [1]");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "     1            - if set, use Graphbuffer otherwise read data from tag.");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      lf t55xx info");
+    PrintAndLogEx(NORMAL, "      lf t55xx info 1");
+    PrintAndLogEx(NORMAL, "");
+    return 0;
 }
 int usage_t55xx_dump(){
-	PrintAndLogEx(NORMAL, "Usage:  lf t55xx dump <password> [o]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "     <password>  - OPTIONAL password 4bytes (8 hex symbols)");
-	PrintAndLogEx(NORMAL, "     o           - OPTIONAL override, force pwd read despite danger to card");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      lf t55xx dump");
-	PrintAndLogEx(NORMAL, "      lf t55xx dump feedbeef o");
-	PrintAndLogEx(NORMAL, "");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage:  lf t55xx dump <password> [o]");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "     <password>   - OPTIONAL password 4bytes (8 hex symbols)");
+    PrintAndLogEx(NORMAL, "     o            - OPTIONAL override, force pwd read despite danger to card");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      lf t55xx dump");
+    PrintAndLogEx(NORMAL, "      lf t55xx dump feedbeef o");
+    PrintAndLogEx(NORMAL, "");
+    return 0;
 }
 int usage_t55xx_detect(){
-	PrintAndLogEx(NORMAL, "Usage:  lf t55xx detect [1] [p <password>]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "     1             - if set, use Graphbuffer otherwise read data from tag.");
-	PrintAndLogEx(NORMAL, "     p <password>  - OPTIONAL password (8 hex characters)");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      lf t55xx detect");
-	PrintAndLogEx(NORMAL, "      lf t55xx detect 1");
-	PrintAndLogEx(NORMAL, "      lf t55xx detect p 11223344");
-	PrintAndLogEx(NORMAL, "");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage:  lf t55xx detect [1] [p <password>]");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "     1            - if set, use Graphbuffer otherwise read data from tag.");
+    PrintAndLogEx(NORMAL, "     p <password> - OPTIONAL password (8 hex characters)");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      lf t55xx detect");
+    PrintAndLogEx(NORMAL, "      lf t55xx detect 1");
+    PrintAndLogEx(NORMAL, "      lf t55xx detect p 11223344");
+    PrintAndLogEx(NORMAL, "");
+    return 0;
 }
 int usage_t55xx_detectP1(){
-	PrintAndLogEx(NORMAL, "Command: Detect Page 1 of a t55xx chip");
-	PrintAndLogEx(NORMAL, "Usage:  lf t55xx p1detect [1] [p <password>]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "     1             - if set, use Graphbuffer otherwise read data from tag.");
-	PrintAndLogEx(NORMAL, "     p <password>  - OPTIONAL password (8 hex characters)");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      lf t55xx p1detect");
-	PrintAndLogEx(NORMAL, "      lf t55xx p1detect 1");
-	PrintAndLogEx(NORMAL, "      lf t55xx p1detect p 11223344");
-	PrintAndLogEx(NORMAL, "");
-	return 0;
+    PrintAndLogEx(NORMAL, "Command: Detect Page 1 of a t55xx chip");
+    PrintAndLogEx(NORMAL, "Usage:  lf t55xx p1detect [1] [p <password>]");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "     1            - if set, use Graphbuffer otherwise read data from tag.");
+    PrintAndLogEx(NORMAL, "     p <password> - OPTIONAL password (8 hex characters)");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      lf t55xx p1detect");
+    PrintAndLogEx(NORMAL, "      lf t55xx p1detect 1");
+    PrintAndLogEx(NORMAL, "      lf t55xx p1detect p 11223344");
+    PrintAndLogEx(NORMAL, "");
+    return 0;
 }
 int usage_t55xx_wakup(){
-	PrintAndLogEx(NORMAL, "Usage:  lf t55xx wakeup [h] p <password>");
-	PrintAndLogEx(NORMAL, "This commands send the Answer-On-Request command and leaves the readerfield ON afterwards.");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "     h 			- this help");
-    PrintAndLogEx(NORMAL, "     p <password>	- password 4bytes (8 hex symbols)");
+    PrintAndLogEx(NORMAL, "Usage:  lf t55xx wakeup [h] p <password>");
+    PrintAndLogEx(NORMAL, "This commands send the Answer-On-Request command and leaves the readerfield ON afterwards.");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "     h            - this help");
+    PrintAndLogEx(NORMAL, "     p <password> - password 4bytes (8 hex symbols)");
     PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "      lf t55xx wakeup p 11223344  - send wakeup password");
-	return 0;
+    return 0;
 }
 int usage_t55xx_chk(){
-	PrintAndLogEx(NORMAL, "This command uses a dictionary attack");
-	PrintAndLogEx(NORMAL, "press 'enter' to cancel the command");
+    PrintAndLogEx(NORMAL, "This command uses a dictionary attack");
+    PrintAndLogEx(NORMAL, "press 'enter' to cancel the command");
     PrintAndLogEx(NORMAL, "Usage: lf t55xx bruteforce [h] <m> [i <*.dic>]");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "     h			- this help");
-	PrintAndLogEx(NORMAL, "     m			- use dictionary from flashmemory\n");
-    PrintAndLogEx(NORMAL, "     i <*.dic>	- loads a default keys dictionary file <*.dic>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "     h           - this help");
+    PrintAndLogEx(NORMAL, "     m           - use dictionary from flashmemory\n");
+    PrintAndLogEx(NORMAL, "     i <*.dic>   - loads a default keys dictionary file <*.dic>");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "       lf t55xx bruteforce m");
-	PrintAndLogEx(NORMAL, "       lf t55xx bruteforce i default_pwd.dic");
+    PrintAndLogEx(NORMAL, "       lf t55xx bruteforce i default_pwd.dic");
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
 int usage_t55xx_bruteforce(){
-	PrintAndLogEx(NORMAL, "This command uses bruteforce to scan a number range");
-	PrintAndLogEx(NORMAL, "press 'enter' to cancel the command");
+    PrintAndLogEx(NORMAL, "This command uses bruteforce to scan a number range");
+    PrintAndLogEx(NORMAL, "press 'enter' to cancel the command");
     PrintAndLogEx(NORMAL, "Usage: lf t55xx bruteforce [h] <start password> <end password>");
     PrintAndLogEx(NORMAL, "       password must be 4 bytes (8 hex symbols)");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "     h			- this help");
-	PrintAndLogEx(NORMAL, "     <start_pwd> - 4 byte hex value to start pwd search at");
-	PrintAndLogEx(NORMAL, "     <end_pwd>   - 4 byte hex value to end pwd search at");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "     h           - this help");
+    PrintAndLogEx(NORMAL, "     <start_pwd> - 4 byte hex value to start pwd search at");
+    PrintAndLogEx(NORMAL, "     <end_pwd>   - 4 byte hex value to end pwd search at");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "       lf t55xx bruteforce aaaaaaaa bbbbbbbb");
@@ -172,1878 +172,1878 @@ int usage_t55xx_bruteforce(){
     return 0;
 }
 int usage_t55xx_recoverpw(){
-	PrintAndLogEx(NORMAL, "This command uses a few tricks to try to recover mangled password");
-	PrintAndLogEx(NORMAL, "press 'enter' to cancel the command");
-	PrintAndLogEx(NORMAL, "WARNING: this may brick non-password protected chips!");
-	PrintAndLogEx(NORMAL, "Usage: lf t55xx recoverpw [password]");
-	PrintAndLogEx(NORMAL, "       password must be 4 bytes (8 hex symbols)");
-	PrintAndLogEx(NORMAL, "       default password is 51243648, used by many cloners");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "     h           - this help");
-	PrintAndLogEx(NORMAL, "     [password]  - 4 byte hex value of password written by cloner");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "       lf t55xx recoverpw");
-	PrintAndLogEx(NORMAL, "       lf t55xx recoverpw 51243648");
-	PrintAndLogEx(NORMAL, "");
-	return 0;
-}int usage_t55xx_wipe(){
-	PrintAndLogEx(NORMAL, "Usage:  lf t55xx wipe [h] [Q5]");
-	PrintAndLogEx(NORMAL, "This commands wipes a tag, fills blocks 1-7 with zeros and a default configuration block");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "     h 	- this help");
-	PrintAndLogEx(NORMAL, "     Q5  - indicates to use the T5555 (Q5) default configuration block");
+    PrintAndLogEx(NORMAL, "This command uses a few tricks to try to recover mangled password");
+    PrintAndLogEx(NORMAL, "press 'enter' to cancel the command");
+    PrintAndLogEx(NORMAL, "WARNING: this may brick non-password protected chips!");
+    PrintAndLogEx(NORMAL, "Usage: lf t55xx recoverpw [password]");
+    PrintAndLogEx(NORMAL, "       password must be 4 bytes (8 hex symbols)");
+    PrintAndLogEx(NORMAL, "       default password is 51243648, used by many cloners");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "     h           - this help");
+    PrintAndLogEx(NORMAL, "     [password]  - 4 byte hex value of password written by cloner");
     PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-    PrintAndLogEx(NORMAL, "      lf t55xx wipe	-  wipes a t55x7 tag,    config block 0x000880E0");
-	PrintAndLogEx(NORMAL, "      lf t55xx wipe Q5 -  wipes a t5555 Q5 tag, config block 0x6001F004");
-	return 0;
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "       lf t55xx recoverpw");
+    PrintAndLogEx(NORMAL, "       lf t55xx recoverpw 51243648");
+    PrintAndLogEx(NORMAL, "");
+    return 0;
+}int usage_t55xx_wipe(){
+    PrintAndLogEx(NORMAL, "Usage:  lf t55xx wipe [h] [Q5]");
+    PrintAndLogEx(NORMAL, "This commands wipes a tag, fills blocks 1-7 with zeros and a default configuration block");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "     h   - this help");
+    PrintAndLogEx(NORMAL, "     Q5  - indicates to use the T5555 (Q5) default configuration block");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      lf t55xx wipe    -  wipes a t55x7 tag,    config block 0x000880E0");
+    PrintAndLogEx(NORMAL, "      lf t55xx wipe Q5 -  wipes a t5555 Q5 tag, config block 0x6001F004");
+    return 0;
 }
 int usage_lf_deviceconfig(){
-	PrintAndLogEx(NORMAL, "Sets t55x7 timings for direkt commands. The timings are set here in Field Clocks (FC), \nwhich is converted to (US) on device");
-	PrintAndLogEx(NORMAL, "Usage: lf t55xx deviceconfig a <gap> b <gap> c <gap> d <gap> e <gap> p");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "       h              - This help");
-	PrintAndLogEx(NORMAL, "       a <8..255>     - Set start gap");
-	PrintAndLogEx(NORMAL, "       b <8..255>     - Set write gap");
-	PrintAndLogEx(NORMAL, "       c <8..255>     - Set write ZERO gap");
-	PrintAndLogEx(NORMAL, "       d <8..255>     - Set write ONE gap");
-	PrintAndLogEx(NORMAL, "       e <8..255>     - Set read gap");
-	PrintAndLogEx(NORMAL, "       p              - persist to flashmemory");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      lf t55xx deviceconfig a 29 b 17 c 15 d 47 e 15   - default T55XX");
-	PrintAndLogEx(NORMAL, "      lf t55xx deviceconfig a 55 b 14 c 21 d 30        - default EM4305");
-	PrintAndLogEx(NORMAL, "");
-	return 0;
+    PrintAndLogEx(NORMAL, "Sets t55x7 timings for direkt commands. The timings are set here in Field Clocks (FC), \nwhich is converted to (US) on device");
+    PrintAndLogEx(NORMAL, "Usage: lf t55xx deviceconfig a <gap> b <gap> c <gap> d <gap> e <gap> p");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h              - This help");
+    PrintAndLogEx(NORMAL, "       a <8..255>     - Set start gap");
+    PrintAndLogEx(NORMAL, "       b <8..255>     - Set write gap");
+    PrintAndLogEx(NORMAL, "       c <8..255>     - Set write ZERO gap");
+    PrintAndLogEx(NORMAL, "       d <8..255>     - Set write ONE gap");
+    PrintAndLogEx(NORMAL, "       e <8..255>     - Set read gap");
+    PrintAndLogEx(NORMAL, "       p              - persist to flashmemory");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      lf t55xx deviceconfig a 29 b 17 c 15 d 47 e 15   - default T55XX");
+    PrintAndLogEx(NORMAL, "      lf t55xx deviceconfig a 55 b 14 c 21 d 30        - default EM4305");
+    PrintAndLogEx(NORMAL, "");
+    return 0;
 }
 
 int CmdHelp(const char *Cmd);
 
 void printT5xxHeader(uint8_t page){
-	PrintAndLogEx(NORMAL, "Reading Page %d:", page);
-	PrintAndLogEx(NORMAL, "blk | hex data | binary                           | ascii");
-	PrintAndLogEx(NORMAL, "----+----------+----------------------------------+-------");
+    PrintAndLogEx(NORMAL, "Reading Page %d:", page);
+    PrintAndLogEx(NORMAL, "blk | hex data | binary                           | ascii");
+    PrintAndLogEx(NORMAL, "----+----------+----------------------------------+-------");
 }
 
 int CmdT55xxSetConfig(const char *Cmd) {
 
-	uint8_t offset = 0;
-	char modulation[6] = {0x00};
-	char tmp = 0x00;
-	uint8_t bitRate = 0;
-	uint8_t rates[9] = {8,16,32,40,50,64,100,128,0};
-	uint8_t cmdp = 0;
-	bool errors = false;
-	while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		tmp = tolower(param_getchar(Cmd, cmdp));
-		switch(tmp)	{
-		case 'h':
-			return usage_t55xx_config();
-		case 'b':
-			errors |= param_getdec(Cmd, cmdp+1, &bitRate);
-			if ( !errors){
-				uint8_t i = 0;
-				for (; i < 9; i++){
-					if (rates[i]==bitRate) {
-						config.bitrate = i;
-						break;
-					}
-				}
-				if (i==9) errors = true;
-			}
-			cmdp+=2;
-			break;
-		case 'd':
-			param_getstr(Cmd, cmdp+1, modulation, sizeof(modulation));
-			cmdp += 2;
+    uint8_t offset = 0;
+    char modulation[6] = {0x00};
+    char tmp = 0x00;
+    uint8_t bitRate = 0;
+    uint8_t rates[9] = {8,16,32,40,50,64,100,128,0};
+    uint8_t cmdp = 0;
+    bool errors = false;
+    while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        tmp = tolower(param_getchar(Cmd, cmdp));
+        switch(tmp) {
+        case 'h':
+            return usage_t55xx_config();
+        case 'b':
+            errors |= param_getdec(Cmd, cmdp+1, &bitRate);
+            if ( !errors){
+                uint8_t i = 0;
+                for (; i < 9; i++){
+                    if (rates[i]==bitRate) {
+                        config.bitrate = i;
+                        break;
+                    }
+                }
+                if (i==9) errors = true;
+            }
+            cmdp+=2;
+            break;
+        case 'd':
+            param_getstr(Cmd, cmdp+1, modulation, sizeof(modulation));
+            cmdp += 2;
 
-			if ( strcmp(modulation, "FSK" ) == 0) {
-				config.modulation = DEMOD_FSK;
-			} else if ( strcmp(modulation, "FSK1" ) == 0) {
-				config.modulation = DEMOD_FSK1;
-				config.inverted=1;
-			} else if ( strcmp(modulation, "FSK1a" ) == 0) {
-				config.modulation = DEMOD_FSK1a;
-				config.inverted=0;
-			} else if ( strcmp(modulation, "FSK2" ) == 0) {
-				config.modulation = DEMOD_FSK2;
-				config.inverted=0;
-			} else if ( strcmp(modulation, "FSK2a" ) == 0) {
-				config.modulation = DEMOD_FSK2a;
-				config.inverted=1;
-			} else if ( strcmp(modulation, "ASK" ) == 0) {
-				config.modulation = DEMOD_ASK;
-			} else if ( strcmp(modulation, "NRZ" ) == 0) {
-				config.modulation = DEMOD_NRZ;
-			} else if ( strcmp(modulation, "PSK1" ) == 0) {
-				config.modulation = DEMOD_PSK1;
-			} else if ( strcmp(modulation, "PSK2" ) == 0) {
-				config.modulation = DEMOD_PSK2;
-			} else if ( strcmp(modulation, "PSK3" ) == 0) {
-				config.modulation = DEMOD_PSK3;
-			} else if ( strcmp(modulation, "BIa" ) == 0) {
-				config.modulation = DEMOD_BIa;
-				config.inverted=1;
-			} else if ( strcmp(modulation, "BI" ) == 0) {
-				config.modulation = DEMOD_BI;
-				config.inverted=0;
-			} else {
-				PrintAndLogEx(WARNING, "Unknown modulation '%s'", modulation);
-				errors = true;
-			}
-			break;
-		case 'i':
-			config.inverted = param_getchar(Cmd,cmdp+1) == '1';
-			cmdp+=2;
-			break;
-		case 'o':
-			errors |= param_getdec(Cmd, cmdp+1, &offset);
-			if ( !errors )
-				config.offset = offset;
-			cmdp+=2;
-			break;
-		case 'q':
-			config.Q5 = true;
-			cmdp++;
-			break;
-		case 's':
-			config.ST = true;
-			cmdp++;
-			break;
-		default:
-			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-			errors = true;
-			break;
-		}
-	}
+            if ( strcmp(modulation, "FSK" ) == 0) {
+                config.modulation = DEMOD_FSK;
+            } else if ( strcmp(modulation, "FSK1" ) == 0) {
+                config.modulation = DEMOD_FSK1;
+                config.inverted=1;
+            } else if ( strcmp(modulation, "FSK1a" ) == 0) {
+                config.modulation = DEMOD_FSK1a;
+                config.inverted=0;
+            } else if ( strcmp(modulation, "FSK2" ) == 0) {
+                config.modulation = DEMOD_FSK2;
+                config.inverted=0;
+            } else if ( strcmp(modulation, "FSK2a" ) == 0) {
+                config.modulation = DEMOD_FSK2a;
+                config.inverted=1;
+            } else if ( strcmp(modulation, "ASK" ) == 0) {
+                config.modulation = DEMOD_ASK;
+            } else if ( strcmp(modulation, "NRZ" ) == 0) {
+                config.modulation = DEMOD_NRZ;
+            } else if ( strcmp(modulation, "PSK1" ) == 0) {
+                config.modulation = DEMOD_PSK1;
+            } else if ( strcmp(modulation, "PSK2" ) == 0) {
+                config.modulation = DEMOD_PSK2;
+            } else if ( strcmp(modulation, "PSK3" ) == 0) {
+                config.modulation = DEMOD_PSK3;
+            } else if ( strcmp(modulation, "BIa" ) == 0) {
+                config.modulation = DEMOD_BIa;
+                config.inverted=1;
+            } else if ( strcmp(modulation, "BI" ) == 0) {
+                config.modulation = DEMOD_BI;
+                config.inverted=0;
+            } else {
+                PrintAndLogEx(WARNING, "Unknown modulation '%s'", modulation);
+                errors = true;
+            }
+            break;
+        case 'i':
+            config.inverted = param_getchar(Cmd,cmdp+1) == '1';
+            cmdp+=2;
+            break;
+        case 'o':
+            errors |= param_getdec(Cmd, cmdp+1, &offset);
+            if ( !errors )
+                config.offset = offset;
+            cmdp+=2;
+            break;
+        case 'q':
+            config.Q5 = true;
+            cmdp++;
+            break;
+        case 's':
+            config.ST = true;
+            cmdp++;
+            break;
+        default:
+            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+            errors = true;
+            break;
+        }
+    }
 
-	// No args
-	if (cmdp == 0) return printConfiguration( config );
+    // No args
+    if (cmdp == 0) return printConfiguration( config );
 
-	//Validations
-	if (errors) return usage_t55xx_config();
+    //Validations
+    if (errors) return usage_t55xx_config();
 
- 	config.block0 = 0;
- 	return printConfiguration ( config );
+    config.block0 = 0;
+    return printConfiguration ( config );
 }
 
 int T55xxReadBlock(uint8_t block, bool page1, bool usepwd, bool override, uint32_t password){
-	//Password mode
-	if ( usepwd ) {
-		// try reading the config block and verify that PWD bit is set before doing this!
-		if ( !override ) {
+    //Password mode
+    if ( usepwd ) {
+        // try reading the config block and verify that PWD bit is set before doing this!
+        if ( !override ) {
 
-			if ( !AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, false, 0 ) ) return 0;
+            if ( !AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, false, 0 ) ) return 0;
 
-			if ( !tryDetectModulation() ) {
-				PrintAndLogEx(NORMAL, "Safety Check: Could not detect if PWD bit is set in config block. Exits.");
-				return 0;
-			} else {
-				PrintAndLogEx(NORMAL, "Safety Check: PWD bit is NOT set in config block. Reading without password...");
-				usepwd = false;
-				page1 = false;
-			}
-		} else {
-			PrintAndLogEx(NORMAL, "Safety Check Overriden - proceeding despite risk");
-		}
-	}
+            if ( !tryDetectModulation() ) {
+                PrintAndLogEx(NORMAL, "Safety Check: Could not detect if PWD bit is set in config block. Exits.");
+                return 0;
+            } else {
+                PrintAndLogEx(NORMAL, "Safety Check: PWD bit is NOT set in config block. Reading without password...");
+                usepwd = false;
+                page1 = false;
+            }
+        } else {
+            PrintAndLogEx(NORMAL, "Safety Check Overriden - proceeding despite risk");
+        }
+    }
 
-	if (!AquireData(page1, block, usepwd, password) ) return 0;
-	if (!DecodeT55xxBlock()) return 0;
+    if (!AquireData(page1, block, usepwd, password) ) return 0;
+    if (!DecodeT55xxBlock()) return 0;
 
-	char blk[10] = {0};
-	sprintf(blk, "%02d", block);
-	printT55xxBlock(blk);
-	return 1;
+    char blk[10] = {0};
+    sprintf(blk, "%02d", block);
+    printT55xxBlock(blk);
+    return 1;
 }
 
 int CmdT55xxReadBlock(const char *Cmd) {
-	uint8_t block = REGULAR_READ_MODE_BLOCK;
-	uint32_t password = 0; //default to blank Block 7
-	bool usepwd = false;
-	bool override = false;
-	bool page1 = false;
-	bool errors = false;
-	uint8_t cmdp = 0;
-	while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch ( tolower(param_getchar(Cmd, cmdp))) {
-		case 'h':
-			return usage_t55xx_read();
-		case 'b':
-			errors |= param_getdec(Cmd, cmdp+1, &block);
-			cmdp += 2;
-			break;
-		case 'o':
-			override = true;
-			cmdp++;
-			break;
-		case 'p':
-			password = param_get32ex(Cmd, cmdp+1, 0, 16);
-			usepwd = true;
-			cmdp += 2;
-			break;
-		case '1':
-			page1 = true;
-			cmdp++;
-			break;
-		default:
-			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-			errors = true;
-			break;
-		}
-	}
-	if (errors) return usage_t55xx_read();
+    uint8_t block = REGULAR_READ_MODE_BLOCK;
+    uint32_t password = 0; //default to blank Block 7
+    bool usepwd = false;
+    bool override = false;
+    bool page1 = false;
+    bool errors = false;
+    uint8_t cmdp = 0;
+    while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch ( tolower(param_getchar(Cmd, cmdp))) {
+        case 'h':
+            return usage_t55xx_read();
+        case 'b':
+            errors |= param_getdec(Cmd, cmdp+1, &block);
+            cmdp += 2;
+            break;
+        case 'o':
+            override = true;
+            cmdp++;
+            break;
+        case 'p':
+            password = param_get32ex(Cmd, cmdp+1, 0, 16);
+            usepwd = true;
+            cmdp += 2;
+            break;
+        case '1':
+            page1 = true;
+            cmdp++;
+            break;
+        default:
+            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+            errors = true;
+            break;
+        }
+    }
+    if (errors) return usage_t55xx_read();
 
-	if (block > 7 && block != REGULAR_READ_MODE_BLOCK	) {
-		PrintAndLogEx(NORMAL, "Block must be between 0 and 7");
-		return 0;
-	}
+    if (block > 7 && block != REGULAR_READ_MODE_BLOCK) {
+        PrintAndLogEx(NORMAL, "Block must be between 0 and 7");
+        return 0;
+    }
 
-	printT5xxHeader(page1);
-	return T55xxReadBlock(block, page1, usepwd, override, password);
+    printT5xxHeader(page1);
+    return T55xxReadBlock(block, page1, usepwd, override, password);
 }
 
 bool DecodeT55xxBlock(){
 
-	char buf[30] = {0x00};
-	char *cmdStr = buf;
-	int ans = 0;
-	bool ST = config.ST;
-	uint8_t bitRate[8] = {8,16,32,40,50,64,100,128};
-	DemodBufferLen = 0x00;
+    char buf[30] = {0x00};
+    char *cmdStr = buf;
+    int ans = 0;
+    bool ST = config.ST;
+    uint8_t bitRate[8] = {8,16,32,40,50,64,100,128};
+    DemodBufferLen = 0x00;
 
-	switch( config.modulation ){
-		case DEMOD_FSK:
-			snprintf(cmdStr, sizeof(buf),"%d %d", bitRate[config.bitrate], config.inverted );
-			ans = FSKrawDemod(cmdStr, false);
-			break;
-		case DEMOD_FSK1:
-		case DEMOD_FSK1a:
-			snprintf(cmdStr, sizeof(buf),"%d %d 8 5", bitRate[config.bitrate], config.inverted );
-			ans = FSKrawDemod(cmdStr, false);
-			break;
-		case DEMOD_FSK2:
-		case DEMOD_FSK2a:
-			snprintf(cmdStr, sizeof(buf),"%d %d 10 8", bitRate[config.bitrate], config.inverted );
-			ans = FSKrawDemod(cmdStr, false);
-			break;
-		case DEMOD_ASK:
-			snprintf(cmdStr, sizeof(buf),"%d %d 1", bitRate[config.bitrate], config.inverted );
-			ans = ASKDemod_ext(cmdStr, false, false, 1, &ST);
-			break;
-		case DEMOD_PSK1:
-			// skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)
-			save_restoreGB(GRAPH_SAVE);
-			CmdLtrim("160");
-			snprintf(cmdStr, sizeof(buf),"%d %d 6", bitRate[config.bitrate], config.inverted );
-			ans = PSKDemod(cmdStr, false);
-			//undo trim samples
-			save_restoreGB(GRAPH_RESTORE);
-			break;
-		case DEMOD_PSK2: //inverted won't affect this
-		case DEMOD_PSK3: //not fully implemented
-			// skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)
-			save_restoreGB(GRAPH_SAVE);
-			CmdLtrim("160");
-			snprintf(cmdStr, sizeof(buf),"%d 0 6", bitRate[config.bitrate] );
-			ans = PSKDemod(cmdStr, false);
-			psk1TOpsk2(DemodBuffer, DemodBufferLen);
-			//undo trim samples
-			save_restoreGB(GRAPH_RESTORE);
-			break;
-		case DEMOD_NRZ:
-			snprintf(cmdStr, sizeof(buf),"%d %d 1", bitRate[config.bitrate], config.inverted );
-			ans = NRZrawDemod(cmdStr, false);
-			break;
-		case DEMOD_BI:
-		case DEMOD_BIa:
-			snprintf(cmdStr, sizeof(buf),"0 %d %d 1", bitRate[config.bitrate], config.inverted );
-			ans = ASKbiphaseDemod(cmdStr, false);
-			break;
-		default:
-			return false;
-	}
-	return (bool) ans;
+    switch( config.modulation ){
+        case DEMOD_FSK:
+            snprintf(cmdStr, sizeof(buf),"%d %d", bitRate[config.bitrate], config.inverted );
+            ans = FSKrawDemod(cmdStr, false);
+            break;
+        case DEMOD_FSK1:
+        case DEMOD_FSK1a:
+            snprintf(cmdStr, sizeof(buf),"%d %d 8 5", bitRate[config.bitrate], config.inverted );
+            ans = FSKrawDemod(cmdStr, false);
+            break;
+        case DEMOD_FSK2:
+        case DEMOD_FSK2a:
+            snprintf(cmdStr, sizeof(buf),"%d %d 10 8", bitRate[config.bitrate], config.inverted );
+            ans = FSKrawDemod(cmdStr, false);
+            break;
+        case DEMOD_ASK:
+            snprintf(cmdStr, sizeof(buf),"%d %d 1", bitRate[config.bitrate], config.inverted );
+            ans = ASKDemod_ext(cmdStr, false, false, 1, &ST);
+            break;
+        case DEMOD_PSK1:
+            // skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)
+            save_restoreGB(GRAPH_SAVE);
+            CmdLtrim("160");
+            snprintf(cmdStr, sizeof(buf),"%d %d 6", bitRate[config.bitrate], config.inverted );
+            ans = PSKDemod(cmdStr, false);
+            //undo trim samples
+            save_restoreGB(GRAPH_RESTORE);
+            break;
+        case DEMOD_PSK2: //inverted won't affect this
+        case DEMOD_PSK3: //not fully implemented
+            // skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)
+            save_restoreGB(GRAPH_SAVE);
+            CmdLtrim("160");
+            snprintf(cmdStr, sizeof(buf),"%d 0 6", bitRate[config.bitrate] );
+            ans = PSKDemod(cmdStr, false);
+            psk1TOpsk2(DemodBuffer, DemodBufferLen);
+            //undo trim samples
+            save_restoreGB(GRAPH_RESTORE);
+            break;
+        case DEMOD_NRZ:
+            snprintf(cmdStr, sizeof(buf),"%d %d 1", bitRate[config.bitrate], config.inverted );
+            ans = NRZrawDemod(cmdStr, false);
+            break;
+        case DEMOD_BI:
+        case DEMOD_BIa:
+            snprintf(cmdStr, sizeof(buf),"0 %d %d 1", bitRate[config.bitrate], config.inverted );
+            ans = ASKbiphaseDemod(cmdStr, false);
+            break;
+        default:
+            return false;
+    }
+    return (bool) ans;
 }
 
 bool DecodeT5555TraceBlock() {
-	DemodBufferLen = 0x00;
+    DemodBufferLen = 0x00;
 
-	// According to datasheet. Always: RF/64, not inverted, Manchester
-	return (bool) ASKDemod("64 0 1", false, false, 1);
+    // According to datasheet. Always: RF/64, not inverted, Manchester
+    return (bool) ASKDemod("64 0 1", false, false, 1);
 }
 
 // sanity check. Don't use proxmark if it is offline and you didn't specify useGraphbuf
 static int SanityOfflineCheck( bool useGraphBuffer ){
-	if ( !useGraphBuffer && IsOffline() ) {
-		PrintAndLogEx(NORMAL, "Your proxmark3 device is offline. Specify [1] to use graphbuffer data instead");
-		return 0;
-	}
-	return 1;
+    if ( !useGraphBuffer && IsOffline() ) {
+        PrintAndLogEx(NORMAL, "Your proxmark3 device is offline. Specify [1] to use graphbuffer data instead");
+        return 0;
+    }
+    return 1;
 }
 
 int CmdT55xxDetect(const char *Cmd){
-	bool errors = false;
-	bool useGB = false, usepwd = false;
-	uint32_t password = 0;
-	uint8_t cmdp = 0;
+    bool errors = false;
+    bool useGB = false, usepwd = false;
+    uint32_t password = 0;
+    uint8_t cmdp = 0;
 
-	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch ( tolower(param_getchar(Cmd, cmdp))) {
-		case 'h':
-			return usage_t55xx_detect();
-		case 'p':
-			password = param_get32ex(Cmd, cmdp+1, 0, 16);
-			usepwd = true;
-			cmdp += 2;
-			break;
-		case '1':
-			// use Graphbuffer data
-			useGB = true;
-			cmdp++;
-			break;
-		default:
-			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-			errors = true;
-			break;
-		}
-	}
-	if (errors) return usage_t55xx_detect();
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch ( tolower(param_getchar(Cmd, cmdp))) {
+        case 'h':
+            return usage_t55xx_detect();
+        case 'p':
+            password = param_get32ex(Cmd, cmdp+1, 0, 16);
+            usepwd = true;
+            cmdp += 2;
+            break;
+        case '1':
+            // use Graphbuffer data
+            useGB = true;
+            cmdp++;
+            break;
+        default:
+            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+            errors = true;
+            break;
+        }
+    }
+    if (errors) return usage_t55xx_detect();
 
-	// sanity check.
-	if (!SanityOfflineCheck(useGB)) return 1;
+    // sanity check.
+    if (!SanityOfflineCheck(useGB)) return 1;
 
-	if ( !useGB) {
-		if ( !AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, usepwd, password) )
-			return 1;
-	}
+    if ( !useGB) {
+        if ( !AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, usepwd, password) )
+            return 1;
+    }
 
-	if ( !tryDetectModulation() )
-		PrintAndLogEx(WARNING, "Could not detect modulation automatically. Try setting it manually with \'lf t55xx config\'");
+    if ( !tryDetectModulation() )
+        PrintAndLogEx(WARNING, "Could not detect modulation automatically. Try setting it manually with \'lf t55xx config\'");
 
-	return 0;
+    return 0;
 }
 
 // detect configuration?
 bool tryDetectModulation(){
 
-	t55xx_conf_block_t tests[15];
-	int bitRate = 0, clk = 0, firstClockEdge = 0;
-	uint8_t hits = 0, fc1 = 0, fc2 = 0, ans = 0;
+    t55xx_conf_block_t tests[15];
+    int bitRate = 0, clk = 0, firstClockEdge = 0;
+    uint8_t hits = 0, fc1 = 0, fc2 = 0, ans = 0;
 
-	ans = fskClocks(&fc1, &fc2, (uint8_t *)&clk, &firstClockEdge);
+    ans = fskClocks(&fc1, &fc2, (uint8_t *)&clk, &firstClockEdge);
 
-	if (ans && ((fc1==10 && fc2==8) || (fc1==8 && fc2==5))) {
-		if ( FSKrawDemod("0 0", false) && test(DEMOD_FSK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)){
-			tests[hits].modulation = DEMOD_FSK;
-			if (fc1==8 && fc2 == 5)
-				tests[hits].modulation = DEMOD_FSK1a;
-			else if (fc1==10 && fc2 == 8)
-				tests[hits].modulation = DEMOD_FSK2;
-			tests[hits].bitrate = bitRate;
-			tests[hits].inverted = false;
-			tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
-			tests[hits].ST = false;
-			++hits;
-		}
-		if ( FSKrawDemod("0 1", false) && test(DEMOD_FSK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
-			tests[hits].modulation = DEMOD_FSK;
-			if (fc1 == 8 && fc2 == 5)
-				tests[hits].modulation = DEMOD_FSK1;
-			else if (fc1 == 10 && fc2 == 8)
-				tests[hits].modulation = DEMOD_FSK2a;
-			tests[hits].bitrate = bitRate;
-			tests[hits].inverted = true;
-			tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
-			tests[hits].ST = false;
-			++hits;
-		}
-	} else {
-		clk = GetAskClock("", false);
-		if (clk > 0) {
-			tests[hits].ST = true;
-			// "0 0 1 " == clock auto, invert false, maxError 1.
-			// false = no verbose
-			// false = no emSearch
-			// 1 = Ask/Man
-			// st = true
-			if ( ASKDemod_ext("0 0 1", false, false, 1, &tests[hits].ST) && test(DEMOD_ASK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
-				tests[hits].modulation = DEMOD_ASK;
-				tests[hits].bitrate = bitRate;
-				tests[hits].inverted = false;
-				tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
-				++hits;
-			}
-			tests[hits].ST = true;
-			// "0 0 1 " == clock auto, invert true, maxError 1.
-			// false = no verbose
-			// false = no emSearch
-			// 1 = Ask/Man
-			// st = true
-			if ( ASKDemod_ext("0 1 1", false, false, 1, &tests[hits].ST)  && test(DEMOD_ASK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
-				tests[hits].modulation = DEMOD_ASK;
-				tests[hits].bitrate = bitRate;
-				tests[hits].inverted = true;
-				tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
-				++hits;
-			}
-			if ( ASKbiphaseDemod("0 0 0 2", false) && test(DEMOD_BI, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5) ) {
-				tests[hits].modulation = DEMOD_BI;
-				tests[hits].bitrate = bitRate;
-				tests[hits].inverted = false;
-				tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
-				tests[hits].ST = false;
-				++hits;
-			}
-			if ( ASKbiphaseDemod("0 0 1 2", false) && test(DEMOD_BIa, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5) ) {
-				tests[hits].modulation = DEMOD_BIa;
-				tests[hits].bitrate = bitRate;
-				tests[hits].inverted = true;
-				tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
-				tests[hits].ST = false;
-				++hits;
-			}
-		}
-		clk = GetNrzClock("", false);
-		if (clk > 8) { //clock of rf/8 is likely a false positive, so don't use it.
-			if ( NRZrawDemod("0 0 1", false)  && test(DEMOD_NRZ, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
-				tests[hits].modulation = DEMOD_NRZ;
-				tests[hits].bitrate = bitRate;
-				tests[hits].inverted = false;
-				tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
-				tests[hits].ST = false;
-				++hits;
-			}
+    if (ans && ((fc1==10 && fc2==8) || (fc1==8 && fc2==5))) {
+        if ( FSKrawDemod("0 0", false) && test(DEMOD_FSK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)){
+            tests[hits].modulation = DEMOD_FSK;
+            if (fc1==8 && fc2 == 5)
+                tests[hits].modulation = DEMOD_FSK1a;
+            else if (fc1==10 && fc2 == 8)
+                tests[hits].modulation = DEMOD_FSK2;
+            tests[hits].bitrate = bitRate;
+            tests[hits].inverted = false;
+            tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+            tests[hits].ST = false;
+            ++hits;
+        }
+        if ( FSKrawDemod("0 1", false) && test(DEMOD_FSK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
+            tests[hits].modulation = DEMOD_FSK;
+            if (fc1 == 8 && fc2 == 5)
+                tests[hits].modulation = DEMOD_FSK1;
+            else if (fc1 == 10 && fc2 == 8)
+                tests[hits].modulation = DEMOD_FSK2a;
+            tests[hits].bitrate = bitRate;
+            tests[hits].inverted = true;
+            tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+            tests[hits].ST = false;
+            ++hits;
+        }
+    } else {
+        clk = GetAskClock("", false);
+        if (clk > 0) {
+            tests[hits].ST = true;
+            // "0 0 1 " == clock auto, invert false, maxError 1.
+            // false = no verbose
+            // false = no emSearch
+            // 1 = Ask/Man
+            // st = true
+            if ( ASKDemod_ext("0 0 1", false, false, 1, &tests[hits].ST) && test(DEMOD_ASK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
+                tests[hits].modulation = DEMOD_ASK;
+                tests[hits].bitrate = bitRate;
+                tests[hits].inverted = false;
+                tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+                ++hits;
+            }
+            tests[hits].ST = true;
+            // "0 0 1 " == clock auto, invert true, maxError 1.
+            // false = no verbose
+            // false = no emSearch
+            // 1 = Ask/Man
+            // st = true
+            if ( ASKDemod_ext("0 1 1", false, false, 1, &tests[hits].ST)  && test(DEMOD_ASK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
+                tests[hits].modulation = DEMOD_ASK;
+                tests[hits].bitrate = bitRate;
+                tests[hits].inverted = true;
+                tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+                ++hits;
+            }
+            if ( ASKbiphaseDemod("0 0 0 2", false) && test(DEMOD_BI, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5) ) {
+                tests[hits].modulation = DEMOD_BI;
+                tests[hits].bitrate = bitRate;
+                tests[hits].inverted = false;
+                tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+                tests[hits].ST = false;
+                ++hits;
+            }
+            if ( ASKbiphaseDemod("0 0 1 2", false) && test(DEMOD_BIa, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5) ) {
+                tests[hits].modulation = DEMOD_BIa;
+                tests[hits].bitrate = bitRate;
+                tests[hits].inverted = true;
+                tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+                tests[hits].ST = false;
+                ++hits;
+            }
+        }
+        clk = GetNrzClock("", false);
+        if (clk > 8) { //clock of rf/8 is likely a false positive, so don't use it.
+            if ( NRZrawDemod("0 0 1", false)  && test(DEMOD_NRZ, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
+                tests[hits].modulation = DEMOD_NRZ;
+                tests[hits].bitrate = bitRate;
+                tests[hits].inverted = false;
+                tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+                tests[hits].ST = false;
+                ++hits;
+            }
 
-			if ( NRZrawDemod("0 1 1", false)  && test(DEMOD_NRZ, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
-				tests[hits].modulation = DEMOD_NRZ;
-				tests[hits].bitrate = bitRate;
-				tests[hits].inverted = true;
-				tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
-				tests[hits].ST = false;
-				++hits;
-			}
-		}
+            if ( NRZrawDemod("0 1 1", false)  && test(DEMOD_NRZ, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
+                tests[hits].modulation = DEMOD_NRZ;
+                tests[hits].bitrate = bitRate;
+                tests[hits].inverted = true;
+                tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+                tests[hits].ST = false;
+                ++hits;
+            }
+        }
 
-		clk = GetPskClock("", false);
-		if (clk > 0) {
-			// allow undo
-			save_restoreGB(GRAPH_SAVE);
-			// skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)
-			CmdLtrim("160");
-			if ( PSKDemod("0 0 6", false) && test(DEMOD_PSK1, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
-				tests[hits].modulation = DEMOD_PSK1;
-				tests[hits].bitrate = bitRate;
-				tests[hits].inverted = false;
-				tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
-				tests[hits].ST = false;
-				++hits;
-			}
-			if ( PSKDemod("0 1 6", false) && test(DEMOD_PSK1, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
-				tests[hits].modulation = DEMOD_PSK1;
-				tests[hits].bitrate = bitRate;
-				tests[hits].inverted = true;
-				tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
-				tests[hits].ST = false;
-				++hits;
-			}
-			//ICEMAN: are these PSKDemod calls needed?
-			// PSK2 - needs a call to psk1TOpsk2.
-			if ( PSKDemod("0 0 6", false)) {
-				psk1TOpsk2(DemodBuffer, DemodBufferLen);
-				if (test(DEMOD_PSK2, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)){
-					tests[hits].modulation = DEMOD_PSK2;
-					tests[hits].bitrate = bitRate;
-					tests[hits].inverted = false;
-					tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
-					tests[hits].ST = false;
-					++hits;
-				}
-			} // inverse waves does not affect this demod
-			// PSK3 - needs a call to psk1TOpsk2.
-			if ( PSKDemod("0 0 6", false)) {
-				psk1TOpsk2(DemodBuffer, DemodBufferLen);
-				if (test(DEMOD_PSK3, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)){
-					tests[hits].modulation = DEMOD_PSK3;
-					tests[hits].bitrate = bitRate;
-					tests[hits].inverted = false;
-					tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
-					tests[hits].ST = false;
-					++hits;
-				}
-			} // inverse waves does not affect this demod
-		//undo trim samples
-			save_restoreGB(GRAPH_RESTORE);
-		}
-	}
-	if ( hits == 1) {
-		config.modulation = tests[0].modulation;
-		config.bitrate = tests[0].bitrate;
-		config.inverted = tests[0].inverted;
-		config.offset = tests[0].offset;
-		config.block0 = tests[0].block0;
-		config.Q5 = tests[0].Q5;
-		config.ST = tests[0].ST;
-		printConfiguration( config );
-		return true;
-	}
+        clk = GetPskClock("", false);
+        if (clk > 0) {
+            // allow undo
+            save_restoreGB(GRAPH_SAVE);
+            // skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)
+            CmdLtrim("160");
+            if ( PSKDemod("0 0 6", false) && test(DEMOD_PSK1, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
+                tests[hits].modulation = DEMOD_PSK1;
+                tests[hits].bitrate = bitRate;
+                tests[hits].inverted = false;
+                tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+                tests[hits].ST = false;
+                ++hits;
+            }
+            if ( PSKDemod("0 1 6", false) && test(DEMOD_PSK1, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
+                tests[hits].modulation = DEMOD_PSK1;
+                tests[hits].bitrate = bitRate;
+                tests[hits].inverted = true;
+                tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+                tests[hits].ST = false;
+                ++hits;
+            }
+            //ICEMAN: are these PSKDemod calls needed?
+            // PSK2 - needs a call to psk1TOpsk2.
+            if ( PSKDemod("0 0 6", false)) {
+                psk1TOpsk2(DemodBuffer, DemodBufferLen);
+                if (test(DEMOD_PSK2, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)){
+                    tests[hits].modulation = DEMOD_PSK2;
+                    tests[hits].bitrate = bitRate;
+                    tests[hits].inverted = false;
+                    tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+                    tests[hits].ST = false;
+                    ++hits;
+                }
+            } // inverse waves does not affect this demod
+            // PSK3 - needs a call to psk1TOpsk2.
+            if ( PSKDemod("0 0 6", false)) {
+                psk1TOpsk2(DemodBuffer, DemodBufferLen);
+                if (test(DEMOD_PSK3, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)){
+                    tests[hits].modulation = DEMOD_PSK3;
+                    tests[hits].bitrate = bitRate;
+                    tests[hits].inverted = false;
+                    tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+                    tests[hits].ST = false;
+                    ++hits;
+                }
+            } // inverse waves does not affect this demod
+        //undo trim samples
+            save_restoreGB(GRAPH_RESTORE);
+        }
+    }
+    if ( hits == 1) {
+        config.modulation = tests[0].modulation;
+        config.bitrate = tests[0].bitrate;
+        config.inverted = tests[0].inverted;
+        config.offset = tests[0].offset;
+        config.block0 = tests[0].block0;
+        config.Q5 = tests[0].Q5;
+        config.ST = tests[0].ST;
+        printConfiguration( config );
+        return true;
+    }
 
-	bool retval = false;
-	if ( hits > 1) {
-		PrintAndLogEx(SUCCESS, "Found [%d] possible matches for modulation.", hits);
-		for(int i=0; i<hits; ++i){
-			retval = testKnownConfigBlock(tests[i].block0);
-			if ( retval ) {
-				PrintAndLogEx(NORMAL, "--[%d]--------------- << selected this", i+1);
-				config.modulation = tests[i].modulation;
-				config.bitrate = tests[i].bitrate;
-				config.inverted = tests[i].inverted;
-				config.offset = tests[i].offset;
-				config.block0 = tests[i].block0;
-				config.Q5 = tests[i].Q5;
-				config.ST = tests[i].ST;
-			} else {
-				PrintAndLogEx(NORMAL, "--[%d]---------------", i+1);
-			}
-			printConfiguration( tests[i] );
-		}
-	}
-	return retval;
+    bool retval = false;
+    if ( hits > 1) {
+        PrintAndLogEx(SUCCESS, "Found [%d] possible matches for modulation.", hits);
+        for(int i=0; i<hits; ++i){
+            retval = testKnownConfigBlock(tests[i].block0);
+            if ( retval ) {
+                PrintAndLogEx(NORMAL, "--[%d]--------------- << selected this", i+1);
+                config.modulation = tests[i].modulation;
+                config.bitrate = tests[i].bitrate;
+                config.inverted = tests[i].inverted;
+                config.offset = tests[i].offset;
+                config.block0 = tests[i].block0;
+                config.Q5 = tests[i].Q5;
+                config.ST = tests[i].ST;
+            } else {
+                PrintAndLogEx(NORMAL, "--[%d]---------------", i+1);
+            }
+            printConfiguration( tests[i] );
+        }
+    }
+    return retval;
 }
 
 bool testKnownConfigBlock(uint32_t block0) {
-	switch(block0){
-		case T55X7_DEFAULT_CONFIG_BLOCK:
-		case T55X7_RAW_CONFIG_BLOCK:
-		case T55X7_EM_UNIQUE_CONFIG_BLOCK:
-		case T55X7_FDXB_CONFIG_BLOCK:
-		case T55X7_HID_26_CONFIG_BLOCK:
-		case T55X7_PYRAMID_CONFIG_BLOCK:
-		case T55X7_INDALA_64_CONFIG_BLOCK:
-		case T55X7_INDALA_224_CONFIG_BLOCK:
-		case T55X7_GUARDPROXII_CONFIG_BLOCK:
-		case T55X7_VIKING_CONFIG_BLOCK:
-		case T55X7_NORALYS_CONFIG_BLOCK:
-		case T55X7_IOPROX_CONFIG_BLOCK:
-		case T55X7_PRESCO_CONFIG_BLOCK:
-			return true;
-	}
-	return false;
+    switch(block0){
+        case T55X7_DEFAULT_CONFIG_BLOCK:
+        case T55X7_RAW_CONFIG_BLOCK:
+        case T55X7_EM_UNIQUE_CONFIG_BLOCK:
+        case T55X7_FDXB_CONFIG_BLOCK:
+        case T55X7_HID_26_CONFIG_BLOCK:
+        case T55X7_PYRAMID_CONFIG_BLOCK:
+        case T55X7_INDALA_64_CONFIG_BLOCK:
+        case T55X7_INDALA_224_CONFIG_BLOCK:
+        case T55X7_GUARDPROXII_CONFIG_BLOCK:
+        case T55X7_VIKING_CONFIG_BLOCK:
+        case T55X7_NORALYS_CONFIG_BLOCK:
+        case T55X7_IOPROX_CONFIG_BLOCK:
+        case T55X7_PRESCO_CONFIG_BLOCK:
+            return true;
+    }
+    return false;
 }
 
 bool testModulation(uint8_t mode, uint8_t modread){
-	switch( mode ){
-		case DEMOD_FSK:
-			if (modread >= DEMOD_FSK1 && modread <= DEMOD_FSK2a) return true;
-			break;
-		case DEMOD_ASK:
-			if (modread == DEMOD_ASK) return true;
-			break;
-		case DEMOD_PSK1:
-			if (modread == DEMOD_PSK1) return true;
-			break;
-		case DEMOD_PSK2:
-			if (modread == DEMOD_PSK2) return true;
-			break;
-		case DEMOD_PSK3:
-			if (modread == DEMOD_PSK3) return true;
-			break;
-		case DEMOD_NRZ:
-			if (modread == DEMOD_NRZ) return true;
-			break;
-		case DEMOD_BI:
-			if (modread == DEMOD_BI) return true;
-			break;
-		case DEMOD_BIa:
-			if (modread == DEMOD_BIa) return true;
-			break;
-		default:
-			return false;
-	}
-	return false;
+    switch( mode ){
+        case DEMOD_FSK:
+            if (modread >= DEMOD_FSK1 && modread <= DEMOD_FSK2a) return true;
+            break;
+        case DEMOD_ASK:
+            if (modread == DEMOD_ASK) return true;
+            break;
+        case DEMOD_PSK1:
+            if (modread == DEMOD_PSK1) return true;
+            break;
+        case DEMOD_PSK2:
+            if (modread == DEMOD_PSK2) return true;
+            break;
+        case DEMOD_PSK3:
+            if (modread == DEMOD_PSK3) return true;
+            break;
+        case DEMOD_NRZ:
+            if (modread == DEMOD_NRZ) return true;
+            break;
+        case DEMOD_BI:
+            if (modread == DEMOD_BI) return true;
+            break;
+        case DEMOD_BIa:
+            if (modread == DEMOD_BIa) return true;
+            break;
+        default:
+            return false;
+    }
+    return false;
 }
 
-bool testQ5Modulation(uint8_t	mode, uint8_t	modread){
-	switch( mode ){
-		case DEMOD_FSK:
-			if (modread >= 4 && modread <= 5) return true;
-			break;
-		case DEMOD_ASK:
-			if (modread == 0) return true;
-			break;
-		case DEMOD_PSK1:
-			if (modread == 1) return true;
-			break;
-		case DEMOD_PSK2:
-			if (modread == 2) return true;
-			break;
-		case DEMOD_PSK3:
-			if (modread == 3) return true;
-			break;
-		case DEMOD_NRZ:
-			if (modread == 7) return true;
-			break;
-		case DEMOD_BI:
-			if (modread == 6) return true;
-			break;
-		default:
-			return false;
-	}
-	return false;
+bool testQ5Modulation(uint8_t mode, uint8_t modread){
+    switch( mode ){
+        case DEMOD_FSK:
+            if (modread >= 4 && modread <= 5) return true;
+            break;
+        case DEMOD_ASK:
+            if (modread == 0) return true;
+            break;
+        case DEMOD_PSK1:
+            if (modread == 1) return true;
+            break;
+        case DEMOD_PSK2:
+            if (modread == 2) return true;
+            break;
+        case DEMOD_PSK3:
+            if (modread == 3) return true;
+            break;
+        case DEMOD_NRZ:
+            if (modread == 7) return true;
+            break;
+        case DEMOD_BI:
+            if (modread == 6) return true;
+            break;
+        default:
+            return false;
+    }
+    return false;
 }
 
 int convertQ5bitRate(uint8_t bitRateRead) {
-	uint8_t expected[] = {8, 16, 32, 40, 50, 64, 100, 128};
-	for (int i=0; i<8; i++)
-		if (expected[i] == bitRateRead)
-			return i;
+    uint8_t expected[] = {8, 16, 32, 40, 50, 64, 100, 128};
+    for (int i=0; i<8; i++)
+        if (expected[i] == bitRateRead)
+            return i;
 
-	return -1;
+    return -1;
 }
 
-bool testQ5(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t	clk){
+bool testQ5(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk){
 
-	if ( DemodBufferLen < 64 ) return false;
-	uint8_t si = 0;
-	for (uint8_t idx = 28; idx < 64; idx++){
-		si = idx;
-		if ( PackBits(si, 28, DemodBuffer) == 0x00 ) continue;
+    if ( DemodBufferLen < 64 ) return false;
+    uint8_t si = 0;
+    for (uint8_t idx = 28; idx < 64; idx++){
+        si = idx;
+        if ( PackBits(si, 28, DemodBuffer) == 0x00 ) continue;
 
-		uint8_t safer     = PackBits(si, 4, DemodBuffer); si += 4;     //master key
-		uint8_t resv      = PackBits(si, 8, DemodBuffer); si += 8;
-		// 2nibble must be zeroed.
-		if (safer != 0x6 && safer != 0x9) continue;
-		if ( resv > 0x00) continue;
-		//uint8_t	pageSel   = PackBits(si, 1, DemodBuffer); si += 1;
-		//uint8_t fastWrite = PackBits(si, 1, DemodBuffer); si += 1;
-		si += 1+1;
-		int bitRate       = PackBits(si, 6, DemodBuffer)*2 + 2; si += 6;     //bit rate
-		if (bitRate > 128 || bitRate < 8) continue;
+        uint8_t safer     = PackBits(si, 4, DemodBuffer); si += 4;     //master key
+        uint8_t resv      = PackBits(si, 8, DemodBuffer); si += 8;
+        // 2nibble must be zeroed.
+        if (safer != 0x6 && safer != 0x9) continue;
+        if ( resv > 0x00) continue;
+        //uint8_t pageSel   = PackBits(si, 1, DemodBuffer); si += 1;
+        //uint8_t fastWrite = PackBits(si, 1, DemodBuffer); si += 1;
+        si += 1+1;
+        int bitRate       = PackBits(si, 6, DemodBuffer)*2 + 2; si += 6;     //bit rate
+        if (bitRate > 128 || bitRate < 8) continue;
 
-		//uint8_t AOR       = PackBits(si, 1, DemodBuffer); si += 1;
-		//uint8_t PWD       = PackBits(si, 1, DemodBuffer); si += 1;
-		//uint8_t pskcr     = PackBits(si, 2, DemodBuffer); si += 2;  //could check psk cr
-		//uint8_t inverse   = PackBits(si, 1, DemodBuffer); si += 1;
-		si += 1+1+2+1;
-		uint8_t modread   = PackBits(si, 3, DemodBuffer); si += 3;
-		uint8_t maxBlk    = PackBits(si, 3, DemodBuffer); si += 3;
-		//uint8_t ST        = PackBits(si, 1, DemodBuffer); si += 1;
-		if (maxBlk == 0) continue;
-		//test modulation
-		if (!testQ5Modulation(mode, modread)) continue;
-		if (bitRate != clk) continue;
-		*fndBitRate = convertQ5bitRate(bitRate);
-		if (*fndBitRate < 0) continue;
-		*offset = idx;
+        //uint8_t AOR       = PackBits(si, 1, DemodBuffer); si += 1;
+        //uint8_t PWD       = PackBits(si, 1, DemodBuffer); si += 1;
+        //uint8_t pskcr     = PackBits(si, 2, DemodBuffer); si += 2;  //could check psk cr
+        //uint8_t inverse   = PackBits(si, 1, DemodBuffer); si += 1;
+        si += 1+1+2+1;
+        uint8_t modread   = PackBits(si, 3, DemodBuffer); si += 3;
+        uint8_t maxBlk    = PackBits(si, 3, DemodBuffer); si += 3;
+        //uint8_t ST        = PackBits(si, 1, DemodBuffer); si += 1;
+        if (maxBlk == 0) continue;
+        //test modulation
+        if (!testQ5Modulation(mode, modread)) continue;
+        if (bitRate != clk) continue;
+        *fndBitRate = convertQ5bitRate(bitRate);
+        if (*fndBitRate < 0) continue;
+        *offset = idx;
 
-		return true;
-	}
-	return false;
+        return true;
+    }
+    return false;
 }
 
 bool testBitRate(uint8_t readRate, uint8_t clk){
-	uint8_t expected[] = {8, 16, 32, 40, 50, 64, 100, 128};
-	if (expected[readRate] == clk)
-		return true;
+    uint8_t expected[] = {8, 16, 32, 40, 50, 64, 100, 128};
+    if (expected[readRate] == clk)
+        return true;
 
-	return false;
+    return false;
 }
 
 bool test(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk, bool *Q5){
 
-	if ( DemodBufferLen < 64 ) return false;
-	uint8_t si = 0;
-	for (uint8_t idx = 28; idx < 64; idx++){
-		si = idx;
-		if ( PackBits(si, 28, DemodBuffer) == 0x00 ) continue;
+    if ( DemodBufferLen < 64 ) return false;
+    uint8_t si = 0;
+    for (uint8_t idx = 28; idx < 64; idx++){
+        si = idx;
+        if ( PackBits(si, 28, DemodBuffer) == 0x00 ) continue;
 
-		uint8_t safer    = PackBits(si, 4, DemodBuffer); si += 4;     //master key
-		uint8_t resv     = PackBits(si, 4, DemodBuffer); si += 4;     //was 7 & +=7+3 //should be only 4 bits if extended mode
-		// 2nibble must be zeroed.
-		// moved test to here, since this gets most faults first.
-		if ( resv > 0x00) continue;
+        uint8_t safer    = PackBits(si, 4, DemodBuffer); si += 4;     //master key
+        uint8_t resv     = PackBits(si, 4, DemodBuffer); si += 4;     //was 7 & +=7+3 //should be only 4 bits if extended mode
+        // 2nibble must be zeroed.
+        // moved test to here, since this gets most faults first.
+        if ( resv > 0x00) continue;
 
-		int bitRate      = PackBits(si, 6, DemodBuffer); si += 6;     //bit rate (includes extended mode part of rate)
-		uint8_t extend   = PackBits(si, 1, DemodBuffer); si += 1;     //bit 15 extended mode
-		uint8_t modread  = PackBits(si, 5, DemodBuffer); si += 5+2+1;
-		//uint8_t pskcr   = PackBits(si, 2, DemodBuffer); si += 2+1;  //could check psk cr
-		//uint8_t nml01    = PackBits(si, 1, DemodBuffer); si += 1+5;   //bit 24, 30, 31 could be tested for 0 if not extended mode
-		//uint8_t nml02    = PackBits(si, 2, DemodBuffer); si += 2;
+        int bitRate      = PackBits(si, 6, DemodBuffer); si += 6;     //bit rate (includes extended mode part of rate)
+        uint8_t extend   = PackBits(si, 1, DemodBuffer); si += 1;     //bit 15 extended mode
+        uint8_t modread  = PackBits(si, 5, DemodBuffer); si += 5+2+1;
+        //uint8_t pskcr   = PackBits(si, 2, DemodBuffer); si += 2+1;  //could check psk cr
+        //uint8_t nml01    = PackBits(si, 1, DemodBuffer); si += 1+5;   //bit 24, 30, 31 could be tested for 0 if not extended mode
+        //uint8_t nml02    = PackBits(si, 2, DemodBuffer); si += 2;
 
-		//if extended mode
-		bool extMode =( (safer == 0x6 || safer == 0x9) && extend) ? true : false;
+        //if extended mode
+        bool extMode =( (safer == 0x6 || safer == 0x9) && extend) ? true : false;
 
-		if (!extMode){
-			if (bitRate > 7) continue;
-			if (!testBitRate(bitRate, clk)) continue;
-		} else { //extended mode bitrate = same function to calc bitrate as em4x05
-			if (EM4x05_GET_BITRATE(bitRate) != clk) continue;
+        if (!extMode){
+            if (bitRate > 7) continue;
+            if (!testBitRate(bitRate, clk)) continue;
+        } else { //extended mode bitrate = same function to calc bitrate as em4x05
+            if (EM4x05_GET_BITRATE(bitRate) != clk) continue;
 
-		}
-		//test modulation
-		if (!testModulation(mode, modread)) continue;
-		*fndBitRate = bitRate;
-		*offset = idx;
-		*Q5 = false;
-		return true;
-	}
-	if (testQ5(mode, offset, fndBitRate, clk)) {
-		*Q5 = true;
-		return true;
-	}
-	return false;
+        }
+        //test modulation
+        if (!testModulation(mode, modread)) continue;
+        *fndBitRate = bitRate;
+        *offset = idx;
+        *Q5 = false;
+        return true;
+    }
+    if (testQ5(mode, offset, fndBitRate, clk)) {
+        *Q5 = true;
+        return true;
+    }
+    return false;
 }
 
 void printT55xxBlock(const char *blockNum){
 
-	uint8_t i = config.offset;
-	uint8_t endpos = 32 + i;
-	uint32_t blockData = 0;
-	uint8_t bits[64] = {0x00};
+    uint8_t i = config.offset;
+    uint8_t endpos = 32 + i;
+    uint32_t blockData = 0;
+    uint8_t bits[64] = {0x00};
 
-	if ( !DemodBufferLen) return;
+    if ( !DemodBufferLen) return;
 
-	if ( endpos > DemodBufferLen){
-		PrintAndLogEx(NORMAL, "The configured offset %d is too big. Possible offset: %d)", i, DemodBufferLen-32);
-		return;
-	}
+    if ( endpos > DemodBufferLen){
+        PrintAndLogEx(NORMAL, "The configured offset %d is too big. Possible offset: %d)", i, DemodBufferLen-32);
+        return;
+    }
 
-	for (; i < endpos; ++i)
-		bits[i - config.offset] = DemodBuffer[i];
+    for (; i < endpos; ++i)
+        bits[i - config.offset] = DemodBuffer[i];
 
-	blockData = PackBits(0, 32, bits);
-	uint8_t bytes[4] = {0};
-	num_to_bytes(blockData, 4, bytes);
+    blockData = PackBits(0, 32, bits);
+    uint8_t bytes[4] = {0};
+    num_to_bytes(blockData, 4, bytes);
 
-	PrintAndLogEx(NORMAL, " %s | %08X | %s | %s", blockNum, blockData, sprint_bin(bits,32), sprint_ascii(bytes,4));
+    PrintAndLogEx(NORMAL, " %s | %08X | %s | %s", blockNum, blockData, sprint_bin(bits,32), sprint_ascii(bytes,4));
 }
 
 int special(const char *Cmd) {
-	uint32_t blockData = 0;
-	uint8_t bits[32] = {0x00};
+    uint32_t blockData = 0;
+    uint8_t bits[32] = {0x00};
 
-	PrintAndLogEx(NORMAL, "OFFSET | DATA  | BINARY                              | ASCII");
-	PrintAndLogEx(NORMAL, "-------+-------+-------------------------------------+------");
-	int i,j = 0;
-	for (; j < 64; ++j){
+    PrintAndLogEx(NORMAL, "OFFSET | DATA  | BINARY                              | ASCII");
+    PrintAndLogEx(NORMAL, "-------+-------+-------------------------------------+------");
+    int i,j = 0;
+    for (; j < 64; ++j){
 
-		for (i = 0; i < 32; ++i)
-			bits[i]=DemodBuffer[j+i];
+        for (i = 0; i < 32; ++i)
+            bits[i]=DemodBuffer[j+i];
 
-		blockData = PackBits(0, 32, bits);
+        blockData = PackBits(0, 32, bits);
 
-		PrintAndLogEx(NORMAL, "%02d | 0x%08X | %s",j , blockData, sprint_bin(bits,32));
-	}
-	return 0;
+        PrintAndLogEx(NORMAL, "%02d | 0x%08X | %s",j , blockData, sprint_bin(bits,32));
+    }
+    return 0;
 }
 
 int printConfiguration( t55xx_conf_block_t b){
-	PrintAndLogEx(NORMAL, "Chip Type  : %s", (b.Q5) ? "T5555(Q5)" : "T55x7");
-	PrintAndLogEx(NORMAL, "Modulation : %s", GetSelectedModulationStr(b.modulation) );
-	PrintAndLogEx(NORMAL, "Bit Rate   : %s", GetBitRateStr(b.bitrate, (b.block0 & T55x7_X_MODE && (b.block0>>28==6 || b.block0>>28==9))) );
-	PrintAndLogEx(NORMAL, "Inverted   : %s", (b.inverted) ? _GREEN_(Yes) : "No" );
-	PrintAndLogEx(NORMAL, "Offset     : %d", b.offset);
-	PrintAndLogEx(NORMAL, "Seq. Term. : %s", (b.ST) ? _GREEN_(Yes) : "No" );
-	PrintAndLogEx(NORMAL, "Block0     : 0x%08X", b.block0);
-	PrintAndLogEx(NORMAL, "");
-	return 0;
+    PrintAndLogEx(NORMAL, "Chip Type  : %s", (b.Q5) ? "T5555(Q5)" : "T55x7");
+    PrintAndLogEx(NORMAL, "Modulation : %s", GetSelectedModulationStr(b.modulation) );
+    PrintAndLogEx(NORMAL, "Bit Rate   : %s", GetBitRateStr(b.bitrate, (b.block0 & T55x7_X_MODE && (b.block0>>28==6 || b.block0>>28==9))) );
+    PrintAndLogEx(NORMAL, "Inverted   : %s", (b.inverted) ? _GREEN_(Yes) : "No" );
+    PrintAndLogEx(NORMAL, "Offset     : %d", b.offset);
+    PrintAndLogEx(NORMAL, "Seq. Term. : %s", (b.ST) ? _GREEN_(Yes) : "No" );
+    PrintAndLogEx(NORMAL, "Block0     : 0x%08X", b.block0);
+    PrintAndLogEx(NORMAL, "");
+    return 0;
 }
 
 int CmdT55xxWakeUp(const char *Cmd) {
-	uint32_t password = 0;
-	uint8_t cmdp = 0;
-	bool errors = false;
-	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch (tolower(param_getchar(Cmd, cmdp))) {
-		case 'h':
-			return usage_t55xx_wakup();
-		case 'p':
-			password = param_get32ex(Cmd, cmdp+1, 0, 16);
-			cmdp += 2;
-			errors = false;
-			break;
-		default:
-			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-			errors = true;
-			break;
-		}
-	}
-	if (errors) return usage_t55xx_wakup();
+    uint32_t password = 0;
+    uint8_t cmdp = 0;
+    bool errors = false;
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+        case 'h':
+            return usage_t55xx_wakup();
+        case 'p':
+            password = param_get32ex(Cmd, cmdp+1, 0, 16);
+            cmdp += 2;
+            errors = false;
+            break;
+        default:
+            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+            errors = true;
+            break;
+        }
+    }
+    if (errors) return usage_t55xx_wakup();
 
-	UsbCommand c = {CMD_T55XX_WAKEUP, {password, 0, 0}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	PrintAndLogEx(SUCCESS, "Wake up command sent. Try read now");
-	return 0;
+    UsbCommand c = {CMD_T55XX_WAKEUP, {password, 0, 0}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    PrintAndLogEx(SUCCESS, "Wake up command sent. Try read now");
+    return 0;
 }
 
 int CmdT55xxWriteBlock(const char *Cmd) {
-	uint8_t block = 0xFF; //default to invalid block
-	uint32_t data = 0; //default to blank Block
-	uint32_t password = 0; //default to blank Block 7
-	bool usepwd = false;
-	bool page1 = false;
-	bool gotdata = false;
-	bool testMode = false;
-	bool errors = false;
-	uint8_t cmdp = 0;
-	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch (tolower(param_getchar(Cmd, cmdp))) {
-		case 'h':
-			return usage_t55xx_write();
-		case 'b':
-			errors |= param_getdec(Cmd, cmdp+1, &block);
-			cmdp += 2;
-			break;
-		case 'd':
-			data = param_get32ex(Cmd, cmdp+1, 0, 16);
-			gotdata	= true;
-			cmdp += 2;
-			break;
-		case 'p':
-			password = param_get32ex(Cmd, cmdp+1, 0, 16);
-			usepwd = true;
-			cmdp += 2;
-			break;
-		case 't':
-			testMode = true;
-			cmdp++;
-			break;
-		case '1':
-			page1 = true;
-			cmdp++;
-			break;
-		default:
-			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-			errors = true;
-			break;
-		}
-	}
-	if (errors || !gotdata) return usage_t55xx_write();
+    uint8_t block = 0xFF; //default to invalid block
+    uint32_t data = 0; //default to blank Block
+    uint32_t password = 0; //default to blank Block 7
+    bool usepwd = false;
+    bool page1 = false;
+    bool gotdata = false;
+    bool testMode = false;
+    bool errors = false;
+    uint8_t cmdp = 0;
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+        case 'h':
+            return usage_t55xx_write();
+        case 'b':
+            errors |= param_getdec(Cmd, cmdp+1, &block);
+            cmdp += 2;
+            break;
+        case 'd':
+            data = param_get32ex(Cmd, cmdp+1, 0, 16);
+            gotdata = true;
+            cmdp += 2;
+            break;
+        case 'p':
+            password = param_get32ex(Cmd, cmdp+1, 0, 16);
+            usepwd = true;
+            cmdp += 2;
+            break;
+        case 't':
+            testMode = true;
+            cmdp++;
+            break;
+        case '1':
+            page1 = true;
+            cmdp++;
+            break;
+        default:
+            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+            errors = true;
+            break;
+        }
+    }
+    if (errors || !gotdata) return usage_t55xx_write();
 
-	if (block > 7) {
-		PrintAndLogEx(WARNING, "Block number must be between 0 and 7");
-		return 0;
-	}
+    if (block > 7) {
+        PrintAndLogEx(WARNING, "Block number must be between 0 and 7");
+        return 0;
+    }
 
-	UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {data, block, 0}};
-	UsbCommand resp;
- 	c.d.asBytes[0] = (page1) ? 0x2 : 0;
- 	c.d.asBytes[0] |= (testMode) ? 0x4 : 0;
+    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {data, block, 0}};
+    UsbCommand resp;
+    c.d.asBytes[0] = (page1) ? 0x2 : 0;
+    c.d.asBytes[0] |= (testMode) ? 0x4 : 0;
 
-	char pwdStr[16] = {0};
-	snprintf(pwdStr, sizeof(pwdStr), "pwd: 0x%08X", password);
+    char pwdStr[16] = {0};
+    snprintf(pwdStr, sizeof(pwdStr), "pwd: 0x%08X", password);
 
-	PrintAndLogEx(INFO, "Writing page %d  block: %02d  data: 0x%08X %s", page1, block, data,  (usepwd) ? pwdStr : "" );
+    PrintAndLogEx(INFO, "Writing page %d  block: %02d  data: 0x%08X %s", page1, block, data,  (usepwd) ? pwdStr : "" );
 
-	//Password mode
-	if (usepwd) {
-		c.arg[2] = password;
-		c.d.asBytes[0] |= 0x1;
-	}
-	clearCommandBuffer();
-	SendCommand(&c);
-	if ( !WaitForResponseTimeout(CMD_ACK, &resp, 1500 )){
-		PrintAndLogEx(WARNING, "Error occurred, device did not ACK write operation. (May be due to old firmware)");
-		return 0;
-	}
-	return 1;
+    //Password mode
+    if (usepwd) {
+        c.arg[2] = password;
+        c.d.asBytes[0] |= 0x1;
+    }
+    clearCommandBuffer();
+    SendCommand(&c);
+    if ( !WaitForResponseTimeout(CMD_ACK, &resp, 1500 )){
+        PrintAndLogEx(WARNING, "Error occurred, device did not ACK write operation. (May be due to old firmware)");
+        return 0;
+    }
+    return 1;
 }
 
 int CmdT55xxReadTrace(const char *Cmd) {
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if (strlen(Cmd) > 1 || cmdp == 'h') return usage_t55xx_trace();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) > 1 || cmdp == 'h') return usage_t55xx_trace();
 
-	bool pwdmode = false;
-	uint32_t password = 0;
+    bool pwdmode = false;
+    uint32_t password = 0;
 
-	if (strlen(Cmd) == 0) {
-		// sanity check.
-		if (!SanityOfflineCheck(false)) return 1;
+    if (strlen(Cmd) == 0) {
+        // sanity check.
+        if (!SanityOfflineCheck(false)) return 1;
 
-		if ( !AquireData( T55x7_PAGE1, REGULAR_READ_MODE_BLOCK, pwdmode, password ) )
-			return 1;
-	}
+        if ( !AquireData( T55x7_PAGE1, REGULAR_READ_MODE_BLOCK, pwdmode, password ) )
+            return 1;
+    }
 
-	if ( config.Q5 ){
-		if (!DecodeT5555TraceBlock()) return 1;
-	} else {
-		if (!DecodeT55xxBlock()) return 1;
-	}
+    if ( config.Q5 ){
+        if (!DecodeT5555TraceBlock()) return 1;
+    } else {
+        if (!DecodeT55xxBlock()) return 1;
+    }
 
-	if ( !DemodBufferLen ) return 1;
+    if ( !DemodBufferLen ) return 1;
 
-	RepaintGraphWindow();
-	uint8_t repeat = (config.offset > 5) ? 32 : 0;
+    RepaintGraphWindow();
+    uint8_t repeat = (config.offset > 5) ? 32 : 0;
 
-	uint8_t si = config.offset + repeat;
-	uint32_t bl1 = PackBits(si, 32, DemodBuffer);
-	uint32_t bl2 = PackBits(si+32, 32, DemodBuffer);
+    uint8_t si = config.offset + repeat;
+    uint32_t bl1 = PackBits(si, 32, DemodBuffer);
+    uint32_t bl2 = PackBits(si+32, 32, DemodBuffer);
 
-	if (config.Q5) {
-		uint32_t hdr = PackBits(si, 9,  DemodBuffer); si += 9;
+    if (config.Q5) {
+        uint32_t hdr = PackBits(si, 9,  DemodBuffer); si += 9;
 
-		if (hdr != 0x1FF) {
-		  PrintAndLogEx(FAILED, "Invalid Q5 Trace data header (expected 0x1FF, found %X)", hdr);
-		  return 1;
-		}
+        if (hdr != 0x1FF) {
+          PrintAndLogEx(FAILED, "Invalid Q5 Trace data header (expected 0x1FF, found %X)", hdr);
+          return 1;
+        }
 
-		t5555_tracedata_t data = {.bl1 = bl1, .bl2 = bl2, .icr = 0, .lotidc = '?', .lotid = 0, .wafer = 0, .dw =0};
+        t5555_tracedata_t data = {.bl1 = bl1, .bl2 = bl2, .icr = 0, .lotidc = '?', .lotid = 0, .wafer = 0, .dw =0};
 
-		data.icr     = PackBits(si, 2,  DemodBuffer); si += 2;
-		data.lotidc  = 'Z' - PackBits(si, 2,  DemodBuffer); si += 3;
+        data.icr     = PackBits(si, 2,  DemodBuffer); si += 2;
+        data.lotidc  = 'Z' - PackBits(si, 2,  DemodBuffer); si += 3;
 
-		data.lotid   = PackBits(si, 4,  DemodBuffer); si += 5;
-		data.lotid <<= 4;
-		data.lotid  |= PackBits(si, 4,  DemodBuffer); si += 5;
-		data.lotid <<= 4;
-		data.lotid  |= PackBits(si, 4,  DemodBuffer); si += 5;
-		data.lotid <<= 4;
-		data.lotid  |= PackBits(si, 4,  DemodBuffer); si += 5;
-		data.lotid <<= 1;
-		data.lotid  |= PackBits(si, 1,  DemodBuffer); si += 1;
+        data.lotid   = PackBits(si, 4,  DemodBuffer); si += 5;
+        data.lotid <<= 4;
+        data.lotid  |= PackBits(si, 4,  DemodBuffer); si += 5;
+        data.lotid <<= 4;
+        data.lotid  |= PackBits(si, 4,  DemodBuffer); si += 5;
+        data.lotid <<= 4;
+        data.lotid  |= PackBits(si, 4,  DemodBuffer); si += 5;
+        data.lotid <<= 1;
+        data.lotid  |= PackBits(si, 1,  DemodBuffer); si += 1;
 
-		data.wafer   = PackBits(si, 3,  DemodBuffer); si += 4;
-		data.wafer <<= 2;
-		data.wafer  |= PackBits(si, 2,  DemodBuffer); si += 2;
+        data.wafer   = PackBits(si, 3,  DemodBuffer); si += 4;
+        data.wafer <<= 2;
+        data.wafer  |= PackBits(si, 2,  DemodBuffer); si += 2;
 
-		data.dw      = PackBits(si, 2,  DemodBuffer); si += 3;
-		data.dw    <<= 4;
-		data.dw     |= PackBits(si, 4,  DemodBuffer); si += 5;
-		data.dw    <<= 4;
-		data.dw     |= PackBits(si, 4,  DemodBuffer); si += 5;
-		data.dw    <<= 4;
-		data.dw     |= PackBits(si, 4,  DemodBuffer); si += 5;
+        data.dw      = PackBits(si, 2,  DemodBuffer); si += 3;
+        data.dw    <<= 4;
+        data.dw     |= PackBits(si, 4,  DemodBuffer); si += 5;
+        data.dw    <<= 4;
+        data.dw     |= PackBits(si, 4,  DemodBuffer); si += 5;
+        data.dw    <<= 4;
+        data.dw     |= PackBits(si, 4,  DemodBuffer); si += 5;
 
-		printT5555Trace(data, repeat);
+        printT5555Trace(data, repeat);
 
-	} else {
+    } else {
 
-		t55x7_tracedata_t data = {.bl1 = bl1, .bl2 = bl2, .acl = 0, .mfc = 0, .cid = 0, .year = 0, .quarter = 0, .icr = 0,  .lotid = 0, .wafer = 0, .dw = 0};
+        t55x7_tracedata_t data = {.bl1 = bl1, .bl2 = bl2, .acl = 0, .mfc = 0, .cid = 0, .year = 0, .quarter = 0, .icr = 0,  .lotid = 0, .wafer = 0, .dw = 0};
 
-		data.acl = PackBits(si, 8,  DemodBuffer); si += 8;
-		if ( data.acl != 0xE0 ) {
-			PrintAndLogEx(FAILED, "The modulation is most likely wrong since the ACL is not 0xE0. ");
-			return 1;
-		}
+        data.acl = PackBits(si, 8,  DemodBuffer); si += 8;
+        if ( data.acl != 0xE0 ) {
+            PrintAndLogEx(FAILED, "The modulation is most likely wrong since the ACL is not 0xE0. ");
+            return 1;
+        }
 
-		data.mfc     = PackBits(si, 8,  DemodBuffer); si += 8;
-		data.cid     = PackBits(si, 5,  DemodBuffer); si += 5;
-		data.icr     = PackBits(si, 3,  DemodBuffer); si += 3;
-		data.year    = PackBits(si, 4,  DemodBuffer); si += 4;
-		data.quarter = PackBits(si, 2,  DemodBuffer); si += 2;
-		data.lotid   = PackBits(si, 14, DemodBuffer); si += 14;
-		data.wafer   = PackBits(si, 5,  DemodBuffer); si += 5;
-		data.dw      = PackBits(si, 15, DemodBuffer);
+        data.mfc     = PackBits(si, 8,  DemodBuffer); si += 8;
+        data.cid     = PackBits(si, 5,  DemodBuffer); si += 5;
+        data.icr     = PackBits(si, 3,  DemodBuffer); si += 3;
+        data.year    = PackBits(si, 4,  DemodBuffer); si += 4;
+        data.quarter = PackBits(si, 2,  DemodBuffer); si += 2;
+        data.lotid   = PackBits(si, 14, DemodBuffer); si += 14;
+        data.wafer   = PackBits(si, 5,  DemodBuffer); si += 5;
+        data.dw      = PackBits(si, 15, DemodBuffer);
 
-		time_t t = time(NULL);
-		struct tm tm = *localtime(&t);
-		if ( data.year > tm.tm_year-110)
-			data.year += 2000;
-		else
-			data.year += 2010;
+        time_t t = time(NULL);
+        struct tm tm = *localtime(&t);
+        if ( data.year > tm.tm_year-110)
+            data.year += 2000;
+        else
+            data.year += 2010;
 
-		printT55x7Trace(data, repeat);
-	}
-	return 0;
+        printT55x7Trace(data, repeat);
+    }
+    return 0;
 }
 
 void printT55x7Trace( t55x7_tracedata_t data, uint8_t repeat ){
-	PrintAndLogEx(NORMAL, "-- T55x7 Trace Information ----------------------------------");
-	PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
-	PrintAndLogEx(NORMAL, " ACL Allocation class (ISO/IEC 15963-1)  : 0x%02X (%d)", data.acl, data.acl);
-	PrintAndLogEx(NORMAL, " MFC Manufacturer ID (ISO/IEC 7816-6)    : 0x%02X (%d) - %s", data.mfc, data.mfc, getTagInfo(data.mfc));
-	PrintAndLogEx(NORMAL, " CID                                     : 0x%02X (%d) - %s", data.cid, data.cid, GetModelStrFromCID(data.cid));
-	PrintAndLogEx(NORMAL, " ICR IC Revision                         : %d", data.icr );
-	PrintAndLogEx(NORMAL, " Manufactured");
-	PrintAndLogEx(NORMAL, "     Year/Quarter : %d/%d", data.year, data.quarter);
-	PrintAndLogEx(NORMAL, "     Lot ID       : %d", data.lotid );
-	PrintAndLogEx(NORMAL, "     Wafer number : %d", data.wafer);
-	PrintAndLogEx(NORMAL, "     Die Number   : %d", data.dw);
-	PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
-	PrintAndLogEx(NORMAL, " Raw Data - Page 1");
-	PrintAndLogEx(NORMAL, "     Block 1  : 0x%08X  %s", data.bl1, sprint_bin(DemodBuffer+config.offset+repeat,32) );
-	PrintAndLogEx(NORMAL, "     Block 2  : 0x%08X  %s", data.bl2, sprint_bin(DemodBuffer+config.offset+repeat+32,32) );
-	PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
+    PrintAndLogEx(NORMAL, "-- T55x7 Trace Information ----------------------------------");
+    PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
+    PrintAndLogEx(NORMAL, " ACL Allocation class (ISO/IEC 15963-1)  : 0x%02X (%d)", data.acl, data.acl);
+    PrintAndLogEx(NORMAL, " MFC Manufacturer ID (ISO/IEC 7816-6)    : 0x%02X (%d) - %s", data.mfc, data.mfc, getTagInfo(data.mfc));
+    PrintAndLogEx(NORMAL, " CID                                     : 0x%02X (%d) - %s", data.cid, data.cid, GetModelStrFromCID(data.cid));
+    PrintAndLogEx(NORMAL, " ICR IC Revision                         : %d", data.icr );
+    PrintAndLogEx(NORMAL, " Manufactured");
+    PrintAndLogEx(NORMAL, "     Year/Quarter : %d/%d", data.year, data.quarter);
+    PrintAndLogEx(NORMAL, "     Lot ID       : %d", data.lotid );
+    PrintAndLogEx(NORMAL, "     Wafer number : %d", data.wafer);
+    PrintAndLogEx(NORMAL, "     Die Number   : %d", data.dw);
+    PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
+    PrintAndLogEx(NORMAL, " Raw Data - Page 1");
+    PrintAndLogEx(NORMAL, "     Block 1  : 0x%08X  %s", data.bl1, sprint_bin(DemodBuffer+config.offset+repeat,32) );
+    PrintAndLogEx(NORMAL, "     Block 2  : 0x%08X  %s", data.bl2, sprint_bin(DemodBuffer+config.offset+repeat+32,32) );
+    PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
 
-	/*
-	TRACE - BLOCK O
-		Bits	Definition								HEX
-		1-8		ACL Allocation class (ISO/IEC 15963-1)	0xE0
-		9-16	MFC Manufacturer ID (ISO/IEC 7816-6)	0x15 Atmel Corporation
-		17-21	CID										0x1 = Atmel ATA5577M1  0x2 = Atmel ATA5577M2
-		22-24	ICR IC revision
-		25-28	YEAR (BCD encoded) 						9 (= 2009)
-		29-30	QUARTER									1,2,3,4
-		31-32	LOT ID
+    /*
+    TRACE - BLOCK O
+        Bits    Definition                             HEX
+        1-8     ACL Allocation class (ISO/IEC 15963-1) 0xE0
+        9-16    MFC Manufacturer ID (ISO/IEC 7816-6)   0x15 Atmel Corporation
+        17-21   CID                                    0x1 = Atmel ATA5577M1  0x2 = Atmel ATA5577M2
+        22-24   ICR IC revision
+        25-28   YEAR (BCD encoded)                     9 (= 2009)
+        29-30   QUARTER                                1,2,3,4
+        31-32   LOT ID
 
-	TRACE - BLOCK 1
-		1-12	LOT ID
-		13-17	Wafer number
-		18-32	DW,  die number sequential
-	*/
+    TRACE - BLOCK 1
+        1-12    LOT ID
+        13-17   Wafer number
+        18-32   DW,  die number sequential
+    */
 }
 
 void printT5555Trace( t5555_tracedata_t data, uint8_t repeat ){
-	PrintAndLogEx(NORMAL, "-- T5555 (Q5) Trace Information -----------------------------");
-	PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
-	PrintAndLogEx(NORMAL, " ICR IC Revision  : %d", data.icr );
-	PrintAndLogEx(NORMAL, "     Lot          : %c%d", data.lotidc, data.lotid);
-	PrintAndLogEx(NORMAL, "     Wafer number : %d", data.wafer);
-	PrintAndLogEx(NORMAL, "     Die Number   : %d", data.dw);
-	PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
-	PrintAndLogEx(NORMAL, " Raw Data - Page 1");
-	PrintAndLogEx(NORMAL, "     Block 1  : 0x%08X  %s", data.bl1, sprint_bin(DemodBuffer+config.offset+repeat,32) );
-	PrintAndLogEx(NORMAL, "     Block 2  : 0x%08X  %s", data.bl2, sprint_bin(DemodBuffer+config.offset+repeat+32,32) );
+    PrintAndLogEx(NORMAL, "-- T5555 (Q5) Trace Information -----------------------------");
+    PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
+    PrintAndLogEx(NORMAL, " ICR IC Revision  : %d", data.icr );
+    PrintAndLogEx(NORMAL, "     Lot          : %c%d", data.lotidc, data.lotid);
+    PrintAndLogEx(NORMAL, "     Wafer number : %d", data.wafer);
+    PrintAndLogEx(NORMAL, "     Die Number   : %d", data.dw);
+    PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
+    PrintAndLogEx(NORMAL, " Raw Data - Page 1");
+    PrintAndLogEx(NORMAL, "     Block 1  : 0x%08X  %s", data.bl1, sprint_bin(DemodBuffer+config.offset+repeat,32) );
+    PrintAndLogEx(NORMAL, "     Block 2  : 0x%08X  %s", data.bl2, sprint_bin(DemodBuffer+config.offset+repeat+32,32) );
 
-	/*
-		** Q5 **
-		TRACE - BLOCK O and BLOCK1
-		Bits	Definition				HEX
-		1-9		Header                  0x1FF
-		10-11 IC Revision
-		12-13 Lot ID char
-		15-35 Lot ID (NB parity)
-		36-41 Wafer number (NB parity)
-		42-58 DW, die number sequential (NB parity)
-		60-63 Parity bits
-		64    Always zero
-	*/
+    /*
+        ** Q5 **
+        TRACE - BLOCK O and BLOCK1
+        Bits  Definition                HEX
+        1-9   Header                  0x1FF
+        10-11 IC Revision
+        12-13 Lot ID char
+        15-35 Lot ID (NB parity)
+        36-41 Wafer number (NB parity)
+        42-58 DW, die number sequential (NB parity)
+        60-63 Parity bits
+        64    Always zero
+    */
 }
 
 //need to add Q5 info...
 int CmdT55xxInfo(const char *Cmd){
-	/*
-		Page 0 Block 0 Configuration data.
-		Normal mode
-		Extended mode
-	*/
-	bool pwdmode = false;
-	uint32_t password = 0;
-	char cmdp = tolower(param_getchar(Cmd, 0));
+    /*
+        Page 0 Block 0 Configuration data.
+        Normal mode
+        Extended mode
+    */
+    bool pwdmode = false;
+    uint32_t password = 0;
+    char cmdp = tolower(param_getchar(Cmd, 0));
 
-	if (strlen(Cmd) > 1 || cmdp == 'h') return usage_t55xx_info();
+    if (strlen(Cmd) > 1 || cmdp == 'h') return usage_t55xx_info();
 
-	if (strlen(Cmd) == 0) {
-		// sanity check.
-		if (!SanityOfflineCheck(false)) return 1;
+    if (strlen(Cmd) == 0) {
+        // sanity check.
+        if (!SanityOfflineCheck(false)) return 1;
 
-		if ( !AquireData( T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, pwdmode, password ) )
-			return 1;
-	}
+        if ( !AquireData( T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, pwdmode, password ) )
+            return 1;
+    }
 
-	if (!DecodeT55xxBlock()) return 1;
+    if (!DecodeT55xxBlock()) return 1;
 
-	// too little space to start with
-	if ( DemodBufferLen < 32) return 1;
+    // too little space to start with
+    if ( DemodBufferLen < 32) return 1;
 
-	//
-	//PrintAndLogEx(NORMAL, "Offset+32 ==%d\n DemodLen == %d", config.offset + 32, DemodBufferLen);
+    //
+    //PrintAndLogEx(NORMAL, "Offset+32 ==%d\n DemodLen == %d", config.offset + 32, DemodBufferLen);
 
-	uint8_t si = config.offset;
-	uint32_t block0   = PackBits(si, 32, DemodBuffer);
-	uint32_t safer    = PackBits(si, 4, DemodBuffer); si += 4;
-	uint32_t resv     = PackBits(si, 7, DemodBuffer); si += 7;
-	uint32_t dbr      = PackBits(si, 3, DemodBuffer); si += 3;
-	uint32_t extend   = PackBits(si, 1, DemodBuffer); si += 1;
-	uint32_t datamod  = PackBits(si, 5, DemodBuffer); si += 5;
-	uint32_t pskcf    = PackBits(si, 2, DemodBuffer); si += 2;
-	uint32_t aor      = PackBits(si, 1, DemodBuffer); si += 1;
-	uint32_t otp      = PackBits(si, 1, DemodBuffer); si += 1;
-	uint32_t maxblk   = PackBits(si, 3, DemodBuffer); si += 3;
-	uint32_t pwd      = PackBits(si, 1, DemodBuffer); si += 1;
-	uint32_t sst      = PackBits(si, 1, DemodBuffer); si += 1;
-	uint32_t fw       = PackBits(si, 1, DemodBuffer); si += 1;
-	uint32_t inv      = PackBits(si, 1, DemodBuffer); si += 1;
-	uint32_t por      = PackBits(si, 1, DemodBuffer); si += 1;
+    uint8_t si = config.offset;
+    uint32_t block0   = PackBits(si, 32, DemodBuffer);
+    uint32_t safer    = PackBits(si, 4, DemodBuffer); si += 4;
+    uint32_t resv     = PackBits(si, 7, DemodBuffer); si += 7;
+    uint32_t dbr      = PackBits(si, 3, DemodBuffer); si += 3;
+    uint32_t extend   = PackBits(si, 1, DemodBuffer); si += 1;
+    uint32_t datamod  = PackBits(si, 5, DemodBuffer); si += 5;
+    uint32_t pskcf    = PackBits(si, 2, DemodBuffer); si += 2;
+    uint32_t aor      = PackBits(si, 1, DemodBuffer); si += 1;
+    uint32_t otp      = PackBits(si, 1, DemodBuffer); si += 1;
+    uint32_t maxblk   = PackBits(si, 3, DemodBuffer); si += 3;
+    uint32_t pwd      = PackBits(si, 1, DemodBuffer); si += 1;
+    uint32_t sst      = PackBits(si, 1, DemodBuffer); si += 1;
+    uint32_t fw       = PackBits(si, 1, DemodBuffer); si += 1;
+    uint32_t inv      = PackBits(si, 1, DemodBuffer); si += 1;
+    uint32_t por      = PackBits(si, 1, DemodBuffer); si += 1;
 
-	if (config.Q5)
-		PrintAndLogEx(NORMAL, _RED_(*** Warning ***) " Config Info read off a Q5 will not display as expected");
+    if (config.Q5)
+        PrintAndLogEx(NORMAL, _RED_(*** Warning ***) " Config Info read off a Q5 will not display as expected");
 
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "-- T55x7 Configuration & Tag Information --------------------");
-	PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
-	PrintAndLogEx(NORMAL, " Safer key                 : %s", GetSaferStr(safer));
-	PrintAndLogEx(NORMAL, " reserved                  : %d", resv);
-	PrintAndLogEx(NORMAL, " Data bit rate             : %s", GetBitRateStr(dbr, extend));
-	PrintAndLogEx(NORMAL, " eXtended mode             : %s", (extend) ? _YELLOW_(Yes - Warning) : "No");
-	PrintAndLogEx(NORMAL, " Modulation                : %s", GetModulationStr(datamod));
-	PrintAndLogEx(NORMAL, " PSK clock frequency       : %d", pskcf);
-	PrintAndLogEx(NORMAL, " AOR - Answer on Request   : %s", (aor) ? _GREEN_(Yes) : "No");
-	PrintAndLogEx(NORMAL, " OTP - One Time Pad        : %s", (otp) ? _YELLOW_(Yes - Warning) : "No" );
-	PrintAndLogEx(NORMAL, " Max block                 : %d", maxblk);
-	PrintAndLogEx(NORMAL, " Password mode             : %s", (pwd) ? _GREEN_(Yes) : "No");
-	PrintAndLogEx(NORMAL, " Sequence Start Terminator : %s", (sst) ? _GREEN_(Yes) : "No");
-	PrintAndLogEx(NORMAL, " Fast Write                : %s", (fw)  ? _GREEN_(Yes) : "No");
-	PrintAndLogEx(NORMAL, " Inverse data              : %s", (inv) ? _GREEN_(Yes) : "No");
-	PrintAndLogEx(NORMAL, " POR-Delay                 : %s", (por) ? _GREEN_(Yes) : "No");
-	PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
-	PrintAndLogEx(NORMAL, " Raw Data - Page 0");
-	PrintAndLogEx(NORMAL, "     Block 0  : 0x%08X  %s", block0, sprint_bin(DemodBuffer + config.offset, 32) );
-	PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
-	return 0;
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "-- T55x7 Configuration & Tag Information --------------------");
+    PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
+    PrintAndLogEx(NORMAL, " Safer key                 : %s", GetSaferStr(safer));
+    PrintAndLogEx(NORMAL, " reserved                  : %d", resv);
+    PrintAndLogEx(NORMAL, " Data bit rate             : %s", GetBitRateStr(dbr, extend));
+    PrintAndLogEx(NORMAL, " eXtended mode             : %s", (extend) ? _YELLOW_(Yes - Warning) : "No");
+    PrintAndLogEx(NORMAL, " Modulation                : %s", GetModulationStr(datamod));
+    PrintAndLogEx(NORMAL, " PSK clock frequency       : %d", pskcf);
+    PrintAndLogEx(NORMAL, " AOR - Answer on Request   : %s", (aor) ? _GREEN_(Yes) : "No");
+    PrintAndLogEx(NORMAL, " OTP - One Time Pad        : %s", (otp) ? _YELLOW_(Yes - Warning) : "No" );
+    PrintAndLogEx(NORMAL, " Max block                 : %d", maxblk);
+    PrintAndLogEx(NORMAL, " Password mode             : %s", (pwd) ? _GREEN_(Yes) : "No");
+    PrintAndLogEx(NORMAL, " Sequence Start Terminator : %s", (sst) ? _GREEN_(Yes) : "No");
+    PrintAndLogEx(NORMAL, " Fast Write                : %s", (fw)  ? _GREEN_(Yes) : "No");
+    PrintAndLogEx(NORMAL, " Inverse data              : %s", (inv) ? _GREEN_(Yes) : "No");
+    PrintAndLogEx(NORMAL, " POR-Delay                 : %s", (por) ? _GREEN_(Yes) : "No");
+    PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
+    PrintAndLogEx(NORMAL, " Raw Data - Page 0");
+    PrintAndLogEx(NORMAL, "     Block 0  : 0x%08X  %s", block0, sprint_bin(DemodBuffer + config.offset, 32) );
+    PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
+    return 0;
 }
 
 int CmdT55xxDump(const char *Cmd){
 
-	uint32_t password = 0;
-	bool override = false;
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if ( cmdp == 'h') return usage_t55xx_dump();
+    uint32_t password = 0;
+    bool override = false;
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if ( cmdp == 'h') return usage_t55xx_dump();
 
-	bool usepwd = ( strlen(Cmd) > 0);
-	if ( usepwd ){
-		password = param_get32ex(Cmd, 0, 0, 16);
-		if (param_getchar(Cmd, 1) =='o' )
-			override = true;
-	}
+    bool usepwd = ( strlen(Cmd) > 0);
+    if ( usepwd ){
+        password = param_get32ex(Cmd, 0, 0, 16);
+        if (param_getchar(Cmd, 1) =='o' )
+            override = true;
+    }
 
-	printT5xxHeader(0);
-	for ( uint8_t i = 0; i < 8; ++i)
-		T55xxReadBlock(i, 0, usepwd, override, password);
+    printT5xxHeader(0);
+    for ( uint8_t i = 0; i < 8; ++i)
+        T55xxReadBlock(i, 0, usepwd, override, password);
 
-	printT5xxHeader(1);
-	for ( uint8_t	i = 0; i < 4; i++)
-		T55xxReadBlock(i, 1, usepwd, override, password);
+    printT5xxHeader(1);
+    for ( uint8_t i = 0; i < 4; i++)
+        T55xxReadBlock(i, 1, usepwd, override, password);
 
-	return 1;
+    return 1;
 }
 
 bool AquireData( uint8_t page, uint8_t block, bool pwdmode, uint32_t password ) {
-	// arg0 bitmodes:
-	// 	bit0 = pwdmode
-	// 	bit1 = page to read from
-	// arg1: which block to read
-	// arg2: password
-	uint8_t arg0 = (page<<1) | pwdmode;
-	UsbCommand c = {CMD_T55XX_READ_BLOCK, {arg0, block, password}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	if ( !WaitForResponseTimeout(CMD_ACK, NULL, 2500) ) {
-		PrintAndLogEx(WARNING, "command execution time out");
-		return false;
-	}
+    // arg0 bitmodes:
+    //  bit0 = pwdmode
+    //  bit1 = page to read from
+    // arg1: which block to read
+    // arg2: password
+    uint8_t arg0 = (page<<1) | pwdmode;
+    UsbCommand c = {CMD_T55XX_READ_BLOCK, {arg0, block, password}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    if ( !WaitForResponseTimeout(CMD_ACK, NULL, 2500) ) {
+        PrintAndLogEx(WARNING, "command execution time out");
+        return false;
+    }
 
     getSamples(12000, true);
-        
-	return !getSignalProperties()->isnoise;
+
+    return !getSignalProperties()->isnoise;
 }
 
 char * GetBitRateStr(uint32_t id, bool xmode) {
- 	static char buf[25];
+    static char buf[25];
 
-	char *retStr = buf;
-	if (xmode) { //xmode bitrate calc is same as em4x05 calc
-		snprintf(retStr,sizeof(buf),"%d - RF/%d", id, EM4x05_GET_BITRATE(id));
-	} else {
-		switch (id){
-		case 0:   snprintf(retStr,sizeof(buf),"%d - RF/8",id);   break;
-		case 1:   snprintf(retStr,sizeof(buf),"%d - RF/16",id);  break;
-		case 2:   snprintf(retStr,sizeof(buf),"%d - RF/32",id);  break;
-		case 3:   snprintf(retStr,sizeof(buf),"%d - RF/40",id);  break;
-		case 4:   snprintf(retStr,sizeof(buf),"%d - RF/50",id);  break;
-		case 5:   snprintf(retStr,sizeof(buf),"%d - RF/64",id);  break;
-		case 6:   snprintf(retStr,sizeof(buf),"%d - RF/100",id); break;
-		case 7:   snprintf(retStr,sizeof(buf),"%d - RF/128",id); break;
-		default:  snprintf(retStr,sizeof(buf),"%d - (Unknown)",id); break;
-		}
-	}
-	return buf;
+    char *retStr = buf;
+    if (xmode) { //xmode bitrate calc is same as em4x05 calc
+        snprintf(retStr,sizeof(buf),"%d - RF/%d", id, EM4x05_GET_BITRATE(id));
+    } else {
+        switch (id){
+        case 0:   snprintf(retStr,sizeof(buf),"%d - RF/8",id);   break;
+        case 1:   snprintf(retStr,sizeof(buf),"%d - RF/16",id);  break;
+        case 2:   snprintf(retStr,sizeof(buf),"%d - RF/32",id);  break;
+        case 3:   snprintf(retStr,sizeof(buf),"%d - RF/40",id);  break;
+        case 4:   snprintf(retStr,sizeof(buf),"%d - RF/50",id);  break;
+        case 5:   snprintf(retStr,sizeof(buf),"%d - RF/64",id);  break;
+        case 6:   snprintf(retStr,sizeof(buf),"%d - RF/100",id); break;
+        case 7:   snprintf(retStr,sizeof(buf),"%d - RF/128",id); break;
+        default:  snprintf(retStr,sizeof(buf),"%d - (Unknown)",id); break;
+        }
+    }
+    return buf;
 }
 
 char * GetSaferStr(uint32_t id){
-	static char buf[40];
-	char *retStr = buf;
+    static char buf[40];
+    char *retStr = buf;
 
-	snprintf(retStr,sizeof(buf),"%d",id);
-	if (id == 6) {
-		snprintf(retStr,sizeof(buf),"%d - passwd",id);
-	}
-	if (id == 9 ){
-		snprintf(retStr,sizeof(buf),"%d - testmode",id);
-	}
+    snprintf(retStr,sizeof(buf),"%d",id);
+    if (id == 6) {
+        snprintf(retStr,sizeof(buf),"%d - passwd",id);
+    }
+    if (id == 9 ){
+        snprintf(retStr,sizeof(buf),"%d - testmode",id);
+    }
 
-	return buf;
+    return buf;
 }
 
 char * GetModulationStr( uint32_t id){
-	static char buf[60];
-	char *retStr = buf;
+    static char buf[60];
+    char *retStr = buf;
 
-	switch (id){
-		case 0: snprintf(retStr,sizeof(buf),"%d - DIRECT (ASK/NRZ)",id); break;
-		case 1:	snprintf(retStr,sizeof(buf),"%d - PSK 1 phase change when input changes",id); break;
-		case 2:	snprintf(retStr,sizeof(buf),"%d - PSK 2 phase change on bitclk if input high",id); break;
-		case 3:	snprintf(retStr,sizeof(buf),"%d - PSK 3 phase change on rising edge of input",id); break;
-		case 4:	snprintf(retStr,sizeof(buf),"%d - FSK 1 RF/8  RF/5",id); break;
-		case 5:	snprintf(retStr,sizeof(buf),"%d - FSK 2 RF/8  RF/10",id); break;
-		case 6:	snprintf(retStr,sizeof(buf),"%d - FSK 1a RF/5  RF/8",id); break;
-		case 7: snprintf(retStr,sizeof(buf),"%d - FSK 2a RF/10  RF/8",id); break;
-		case 8:	snprintf(retStr,sizeof(buf),"%d - Manchester",id); break;
-		case 16: snprintf(retStr,sizeof(buf),"%d - Biphase",id); break;
-		case 0x18:snprintf(retStr,sizeof(buf),"%d - Biphase a - AKA Conditional Dephase Encoding(CDP)",id); break;
-		case 17: snprintf(retStr,sizeof(buf),"%d - Reserved",id); break;
-		default: snprintf(retStr,sizeof(buf),"0x%02X (Unknown)",id); break;
-		}
-	return buf;
+    switch (id){
+        case 0: snprintf(retStr,sizeof(buf),"%d - DIRECT (ASK/NRZ)",id); break;
+        case 1: snprintf(retStr,sizeof(buf),"%d - PSK 1 phase change when input changes",id); break;
+        case 2: snprintf(retStr,sizeof(buf),"%d - PSK 2 phase change on bitclk if input high",id); break;
+        case 3: snprintf(retStr,sizeof(buf),"%d - PSK 3 phase change on rising edge of input",id); break;
+        case 4: snprintf(retStr,sizeof(buf),"%d - FSK 1 RF/8  RF/5",id); break;
+        case 5: snprintf(retStr,sizeof(buf),"%d - FSK 2 RF/8  RF/10",id); break;
+        case 6: snprintf(retStr,sizeof(buf),"%d - FSK 1a RF/5  RF/8",id); break;
+        case 7: snprintf(retStr,sizeof(buf),"%d - FSK 2a RF/10  RF/8",id); break;
+        case 8: snprintf(retStr,sizeof(buf),"%d - Manchester",id); break;
+        case 16: snprintf(retStr,sizeof(buf),"%d - Biphase",id); break;
+        case 0x18:snprintf(retStr,sizeof(buf),"%d - Biphase a - AKA Conditional Dephase Encoding(CDP)",id); break;
+        case 17: snprintf(retStr,sizeof(buf),"%d - Reserved",id); break;
+        default: snprintf(retStr,sizeof(buf),"0x%02X (Unknown)",id); break;
+        }
+    return buf;
 }
 
 char * GetModelStrFromCID(uint32_t cid){
 
-	static char buf[10];
-	char *retStr = buf;
+    static char buf[10];
+    char *retStr = buf;
 
-	if (cid == 1) snprintf(retStr, sizeof(buf),"ATA5577M1");
-	if (cid == 2) snprintf(retStr, sizeof(buf),"ATA5577M2");
-	return buf;
+    if (cid == 1) snprintf(retStr, sizeof(buf),"ATA5577M1");
+    if (cid == 2) snprintf(retStr, sizeof(buf),"ATA5577M2");
+    return buf;
 }
 
 char * GetSelectedModulationStr( uint8_t id){
 
-	static char buf[20];
-	char *retStr = buf;
+    static char buf[20];
+    char *retStr = buf;
 
-	switch (id){
-		case DEMOD_FSK:	snprintf(retStr,sizeof(buf),"FSK");	break;
-		case DEMOD_FSK1: snprintf(retStr,sizeof(buf),"FSK1"); break;
-		case DEMOD_FSK1a: snprintf(retStr,sizeof(buf),"FSK1a"); break;
-		case DEMOD_FSK2: snprintf(retStr,sizeof(buf),"FSK2"); break;
-		case DEMOD_FSK2a: snprintf(retStr,sizeof(buf),"FSK2a"); break;
-		case DEMOD_ASK: snprintf(retStr,sizeof(buf),"ASK"); break;
-		case DEMOD_NRZ: snprintf(retStr,sizeof(buf),"DIRECT/NRZ"); break;
-		case DEMOD_PSK1: snprintf(retStr,sizeof(buf),"PSK1"); break;
-		case DEMOD_PSK2: snprintf(retStr,sizeof(buf),"PSK2"); break;
-		case DEMOD_PSK3: snprintf(retStr,sizeof(buf),"PSK3"); break;
-		case DEMOD_BI: snprintf(retStr,sizeof(buf),"BIPHASE"); break;
-		case DEMOD_BIa: snprintf(retStr,sizeof(buf),"BIPHASEa - (CDP)"); break;
-		default: snprintf(retStr,sizeof(buf),"(Unknown)"); break;
-		}
-	return buf;
+    switch (id){
+        case DEMOD_FSK: snprintf(retStr,sizeof(buf),"FSK"); break;
+        case DEMOD_FSK1: snprintf(retStr,sizeof(buf),"FSK1"); break;
+        case DEMOD_FSK1a: snprintf(retStr,sizeof(buf),"FSK1a"); break;
+        case DEMOD_FSK2: snprintf(retStr,sizeof(buf),"FSK2"); break;
+        case DEMOD_FSK2a: snprintf(retStr,sizeof(buf),"FSK2a"); break;
+        case DEMOD_ASK: snprintf(retStr,sizeof(buf),"ASK"); break;
+        case DEMOD_NRZ: snprintf(retStr,sizeof(buf),"DIRECT/NRZ"); break;
+        case DEMOD_PSK1: snprintf(retStr,sizeof(buf),"PSK1"); break;
+        case DEMOD_PSK2: snprintf(retStr,sizeof(buf),"PSK2"); break;
+        case DEMOD_PSK3: snprintf(retStr,sizeof(buf),"PSK3"); break;
+        case DEMOD_BI: snprintf(retStr,sizeof(buf),"BIPHASE"); break;
+        case DEMOD_BIa: snprintf(retStr,sizeof(buf),"BIPHASEa - (CDP)"); break;
+        default: snprintf(retStr,sizeof(buf),"(Unknown)"); break;
+        }
+    return buf;
 }
 
 void t55x7_create_config_block( int tagtype ){
 
-	/*
+    /*
      T55X7_DEFAULT_CONFIG_BLOCK, T55X7_RAW_CONFIG_BLOCK
      T55X7_EM_UNIQUE_CONFIG_BLOCK, T55X7_FDXB_CONFIG_BLOCK,
-	 T55X7_FDXB_CONFIG_BLOCK, T55X7_HID_26_CONFIG_BLOCK, T55X7_INDALA_64_CONFIG_BLOCK, T55X7_INDALA_224_CONFIG_BLOCK
-	 T55X7_GUARDPROXII_CONFIG_BLOCK, T55X7_VIKING_CONFIG_BLOCK,	T55X7_NORALYS_CONFIG_BLOCK, T55X7_IOPROX_CONFIG_BLOCK
-	*/
-	static char buf[60];
-	char *retStr = buf;
+     T55X7_FDXB_CONFIG_BLOCK, T55X7_HID_26_CONFIG_BLOCK, T55X7_INDALA_64_CONFIG_BLOCK, T55X7_INDALA_224_CONFIG_BLOCK
+     T55X7_GUARDPROXII_CONFIG_BLOCK, T55X7_VIKING_CONFIG_BLOCK, T55X7_NORALYS_CONFIG_BLOCK, T55X7_IOPROX_CONFIG_BLOCK
+    */
+    static char buf[60];
+    char *retStr = buf;
 
-	switch (tagtype){
-		case 0: snprintf(retStr, sizeof(buf),"%08X - T55X7 Default", T55X7_DEFAULT_CONFIG_BLOCK); break;
-		case 1: snprintf(retStr, sizeof(buf),"%08X - T55X7 Raw", T55X7_RAW_CONFIG_BLOCK); break;
-		case 2: snprintf(retStr, sizeof(buf),"%08X - T5555 Q5 Default", T5555_DEFAULT_CONFIG_BLOCK); break;
-		default:
-			break;
-	}
-	PrintAndLogEx(NORMAL, buf);
+    switch (tagtype){
+        case 0: snprintf(retStr, sizeof(buf),"%08X - T55X7 Default", T55X7_DEFAULT_CONFIG_BLOCK); break;
+        case 1: snprintf(retStr, sizeof(buf),"%08X - T55X7 Raw", T55X7_RAW_CONFIG_BLOCK); break;
+        case 2: snprintf(retStr, sizeof(buf),"%08X - T5555 Q5 Default", T5555_DEFAULT_CONFIG_BLOCK); break;
+        default:
+            break;
+    }
+    PrintAndLogEx(NORMAL, buf);
 }
 
 int CmdResetRead(const char *Cmd) {
-	UsbCommand c = {CMD_T55XX_RESET_READ, {0,0,0}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	if ( !WaitForResponseTimeout(CMD_ACK, NULL, 2500) ) {
-		PrintAndLogEx(WARNING, "command execution time out");
-		return 0;
-	}
+    UsbCommand c = {CMD_T55XX_RESET_READ, {0,0,0}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    if ( !WaitForResponseTimeout(CMD_ACK, NULL, 2500) ) {
+        PrintAndLogEx(WARNING, "command execution time out");
+        return 0;
+    }
 
-	uint8_t got[BIGBUF_SIZE-1];
-	if ( !GetFromDevice(BIG_BUF, got, sizeof(got), 0, NULL, 2500, false)) {
-		PrintAndLogEx(WARNING, "command execution time out");
-		return 0;
-	}
-	setGraphBuf(got, sizeof(got));
-	return 1;
+    uint8_t got[BIGBUF_SIZE-1];
+    if ( !GetFromDevice(BIG_BUF, got, sizeof(got), 0, NULL, 2500, false)) {
+        PrintAndLogEx(WARNING, "command execution time out");
+        return 0;
+    }
+    setGraphBuf(got, sizeof(got));
+    return 1;
 }
 
 int CmdT55xxWipe(const char *Cmd) {
-	char writeData[20] = {0};
-	char *ptrData = writeData;
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if ( cmdp == 'h') return usage_t55xx_wipe();
+    char writeData[20] = {0};
+    char *ptrData = writeData;
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if ( cmdp == 'h') return usage_t55xx_wipe();
 
-	bool Q5 = (cmdp == 'q');
+    bool Q5 = (cmdp == 'q');
 
-	// Try with the default password to reset block 0
-	// With a pwd should work even if pwd bit not set
-	PrintAndLogEx(INFO, "\nBeginning Wipe of a T55xx tag (assuming the tag is not password protected)\n");
+    // Try with the default password to reset block 0
+    // With a pwd should work even if pwd bit not set
+    PrintAndLogEx(INFO, "\nBeginning Wipe of a T55xx tag (assuming the tag is not password protected)\n");
 
-	if ( Q5 )
-		snprintf(ptrData,sizeof(writeData),"b 0 d 6001F004 p 0");
-	else
-		snprintf(ptrData,sizeof(writeData),"b 0 d 000880E0 p 0");
+    if ( Q5 )
+        snprintf(ptrData,sizeof(writeData),"b 0 d 6001F004 p 0");
+    else
+        snprintf(ptrData,sizeof(writeData),"b 0 d 000880E0 p 0");
 
-	if (!CmdT55xxWriteBlock(ptrData)) PrintAndLogEx(WARNING, "Error writing blk 0");
+    if (!CmdT55xxWriteBlock(ptrData)) PrintAndLogEx(WARNING, "Error writing blk 0");
 
-	for (uint8_t blk = 1; blk<8; blk++) {
+    for (uint8_t blk = 1; blk<8; blk++) {
 
-		snprintf(ptrData,sizeof(writeData),"b %d d 0", blk);
+        snprintf(ptrData,sizeof(writeData),"b %d d 0", blk);
 
-		if (!CmdT55xxWriteBlock(ptrData)) PrintAndLogEx(WARNING, "Error writing blk %d", blk);
+        if (!CmdT55xxWriteBlock(ptrData)) PrintAndLogEx(WARNING, "Error writing blk %d", blk);
 
-		memset(writeData, 0x00, sizeof(writeData));
-	}
-	return 0;
+        memset(writeData, 0x00, sizeof(writeData));
+    }
+    return 0;
 }
 
 bool IsCancelled(void) {
-	if (ukbhit()) {
-		int gc = getchar(); (void)gc;
-		PrintAndLogEx(WARNING, "\naborted via keyboard!\n");
-		return true;
-	}
-	return false;
+    if (ukbhit()) {
+        int gc = getchar(); (void)gc;
+        PrintAndLogEx(WARNING, "\naborted via keyboard!\n");
+        return true;
+    }
+    return false;
 }
 
 int CmdT55xxChkPwds(const char *Cmd) {
-	// load a default pwd file.
-	char line[9];
-	char filename[FILE_PATH_SIZE] = {0};
-	int	keycnt = 0;
-	uint8_t stKeyBlock = 20;
-	uint8_t *keyBlock = NULL, *p = NULL;
+    // load a default pwd file.
+    char line[9];
+    char filename[FILE_PATH_SIZE] = {0};
+    int keycnt = 0;
+    uint8_t stKeyBlock = 20;
+    uint8_t *keyBlock = NULL, *p = NULL;
     bool found = false;
-	uint8_t timeout = 0;
+    uint8_t timeout = 0;
 
-	memset(line, 0, sizeof(line));
+    memset(line, 0, sizeof(line));
 
     char cmdp = tolower(param_getchar(Cmd, 0));
-	if (strlen(Cmd) == 0 || cmdp == 'h') return usage_t55xx_chk();
+    if (strlen(Cmd) == 0 || cmdp == 'h') return usage_t55xx_chk();
 
-	/*
-	if ( T55xxReadBlock(7, 0, 0, 0, 0) ) {
+    /*
+    if ( T55xxReadBlock(7, 0, 0, 0, 0) ) {
 
-		// now try to validate it..
-		PrintAndLogEx(WARNING, "\n Block 7 was readable");
-		return 1;
-	}
-	*/
+        // now try to validate it..
+        PrintAndLogEx(WARNING, "\n Block 7 was readable");
+        return 1;
+    }
+    */
 
-	uint64_t t1 = msclock();
+    uint64_t t1 = msclock();
 
-	if ( cmdp == 'm' ) {
-		UsbCommand c = {CMD_T55XX_CHKPWDS, {0,0,0} };
-		clearCommandBuffer();
-		SendCommand(&c);
-		UsbCommand resp;
+    if ( cmdp == 'm' ) {
+        UsbCommand c = {CMD_T55XX_CHKPWDS, {0,0,0} };
+        clearCommandBuffer();
+        SendCommand(&c);
+        UsbCommand resp;
 
-		while ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
-			timeout++;
-			printf("."); fflush(stdout);
-			if (timeout > 180) {
-				PrintAndLogEx(WARNING, "\nno response from Proxmark. Aborting...");
-				return 2;
-			}
-		}
+        while ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
+            timeout++;
+            printf("."); fflush(stdout);
+            if (timeout > 180) {
+                PrintAndLogEx(WARNING, "\nno response from Proxmark. Aborting...");
+                return 2;
+            }
+        }
 
-		if ( resp.arg[0] ) {
-			PrintAndLogEx(SUCCESS, "\nFound a candidate [ %08X ]. Trying to validate", resp.arg[1]);
+        if ( resp.arg[0] ) {
+            PrintAndLogEx(SUCCESS, "\nFound a candidate [ %08X ]. Trying to validate", resp.arg[1]);
 
-			if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, resp.arg[1])) {
-				PrintAndLogEx(INFO, "Aquireing data from device failed. Quitting");
-				return 2;
-			}
+            if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, resp.arg[1])) {
+                PrintAndLogEx(INFO, "Aquireing data from device failed. Quitting");
+                return 2;
+            }
 
-			found = tryDetectModulation();
-			if (found) {
-				PrintAndLogEx(SUCCESS, "Found valid password: [ %08X ]", resp.arg[1]);
-			} else {
-				PrintAndLogEx(WARNING, "Password NOT found.");
-			}
-		} else {
-			PrintAndLogEx(WARNING, "Password NOT found.");
-		}
+            found = tryDetectModulation();
+            if (found) {
+                PrintAndLogEx(SUCCESS, "Found valid password: [ %08X ]", resp.arg[1]);
+            } else {
+                PrintAndLogEx(WARNING, "Password NOT found.");
+            }
+        } else {
+            PrintAndLogEx(WARNING, "Password NOT found.");
+        }
 
-		goto out;
-	}
+        goto out;
+    }
 
-	keyBlock = calloc(stKeyBlock, 4);
-	if (keyBlock == NULL) return 1;
+    keyBlock = calloc(stKeyBlock, 4);
+    if (keyBlock == NULL) return 1;
 
-	if (cmdp == 'i') {
+    if (cmdp == 'i') {
 
-		int len = strlen(Cmd+2);
-		if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
-		memcpy(filename, Cmd+2, len);
+        int len = strlen(Cmd+2);
+        if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
+        memcpy(filename, Cmd+2, len);
 
-		FILE * f = fopen( filename , "r");
-		if ( !f ) {
-			PrintAndLogEx(FAILED, "File: " _YELLOW_(%s) ": not found or locked.", filename);
-			free(keyBlock);
-			return 1;
-		}
+        FILE * f = fopen( filename , "r");
+        if ( !f ) {
+            PrintAndLogEx(FAILED, "File: " _YELLOW_(%s) ": not found or locked.", filename);
+            free(keyBlock);
+            return 1;
+        }
 
-		while( fgets(line, sizeof(line), f) ){
-			if (strlen(line) < 8 || line[7] == '\n') continue;
+        while( fgets(line, sizeof(line), f) ){
+            if (strlen(line) < 8 || line[7] == '\n') continue;
 
-			//goto next line
-			while (fgetc(f) != '\n' && !feof(f)) ;
+            //goto next line
+            while (fgetc(f) != '\n' && !feof(f)) ;
 
-			//The line start with # is comment, skip
-			if( line[0]=='#' ) continue;
+            //The line start with # is comment, skip
+            if( line[0]=='#' ) continue;
 
-			if (!isxdigit(line[0])) {
-				PrintAndLogEx(WARNING, "File content error. '%s' must include 8 HEX symbols", line);
-				continue;
-			}
+            if (!isxdigit(line[0])) {
+                PrintAndLogEx(WARNING, "File content error. '%s' must include 8 HEX symbols", line);
+                continue;
+            }
 
-			line[8] = 0;
+            line[8] = 0;
 
-			// realloc keyblock array size.
-			if ( stKeyBlock - keycnt < 2) {
-				p = realloc(keyBlock, 4 * (stKeyBlock += 10));
-				if (!p) {
-					PrintAndLogEx(WARNING, "Cannot allocate memory for defaultKeys");
-					free(keyBlock);
-					if (f)
-						fclose(f);
-					return 2;
-				}
-				keyBlock = p;
-			}
-			// clear mem
-			memset(keyBlock + 4 * keycnt, 0, 4);
+            // realloc keyblock array size.
+            if ( stKeyBlock - keycnt < 2) {
+                p = realloc(keyBlock, 4 * (stKeyBlock += 10));
+                if (!p) {
+                    PrintAndLogEx(WARNING, "Cannot allocate memory for defaultKeys");
+                    free(keyBlock);
+                    if (f)
+                        fclose(f);
+                    return 2;
+                }
+                keyBlock = p;
+            }
+            // clear mem
+            memset(keyBlock + 4 * keycnt, 0, 4);
 
-			num_to_bytes( strtoll(line, NULL, 16), 4, keyBlock + 4*keycnt);
+            num_to_bytes( strtoll(line, NULL, 16), 4, keyBlock + 4*keycnt);
 
-//			PrintAndLogEx(NORMAL, "chk custom pwd[%2d] %08X", keycnt, bytes_to_num(keyBlock + 4 * keycnt, 4) );
-			keycnt++;
-			memset(line, 0, sizeof(line));
-		}
+// PrintAndLogEx(NORMAL, "chk custom pwd[%2d] %08X", keycnt, bytes_to_num(keyBlock + 4 * keycnt, 4) );
+            keycnt++;
+            memset(line, 0, sizeof(line));
+        }
 
-		if (f)
-			fclose(f);
+        if (f)
+            fclose(f);
 
-		if (keycnt == 0) {
-			PrintAndLogEx(WARNING, "No keys found in file");
-			free(keyBlock);
-			return 1;
-		}
-		PrintAndLogEx(SUCCESS, "Loaded %d keys", keycnt);
+        if (keycnt == 0) {
+            PrintAndLogEx(WARNING, "No keys found in file");
+            free(keyBlock);
+            return 1;
+        }
+        PrintAndLogEx(SUCCESS, "Loaded %d keys", keycnt);
 
-		// loop
-		uint64_t testpwd = 0x00;
-		for (uint16_t c = 0; c < keycnt; ++c ) {
+        // loop
+        uint64_t testpwd = 0x00;
+        for (uint16_t c = 0; c < keycnt; ++c ) {
 
-			if ( IsOffline() ) {
-				PrintAndLogEx(WARNING, "Device offline\n");
-				free(keyBlock);
-				return  2;
-			}
+            if ( IsOffline() ) {
+                PrintAndLogEx(WARNING, "Device offline\n");
+                free(keyBlock);
+                return  2;
+            }
 
-			if (IsCancelled()) {
-				free(keyBlock);
-				return 0;
-			}
+            if (IsCancelled()) {
+                free(keyBlock);
+                return 0;
+            }
 
-			testpwd = bytes_to_num(keyBlock + 4*c, 4);
+            testpwd = bytes_to_num(keyBlock + 4*c, 4);
 
-			PrintAndLogEx(INFO, "Testing %08X", testpwd);
+            PrintAndLogEx(INFO, "Testing %08X", testpwd);
 
-			if ( !AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, testpwd)) {
-				PrintAndLogEx(INFO, "Aquireing data from device failed. Quitting");
-				free(keyBlock);
-				return 0;
-			}
+            if ( !AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, testpwd)) {
+                PrintAndLogEx(INFO, "Aquireing data from device failed. Quitting");
+                free(keyBlock);
+                return 0;
+            }
 
-			found = tryDetectModulation();
-			if ( found )
-				break;
+            found = tryDetectModulation();
+            if ( found )
+                break;
 
-		}
-		if ( found )
-			PrintAndLogEx(SUCCESS, "Found valid password: [ %08X ]", testpwd);
-		else
-			PrintAndLogEx(WARNING, "Password NOT found.");
-	}
+        }
+        if ( found )
+            PrintAndLogEx(SUCCESS, "Found valid password: [ %08X ]", testpwd);
+        else
+            PrintAndLogEx(WARNING, "Password NOT found.");
+    }
 
-	free(keyBlock);
+    free(keyBlock);
 
 out:
-	t1 = msclock() - t1;
-	PrintAndLogEx(SUCCESS, "\nTime in bruteforce: %.0f seconds\n", (float)t1/1000.0);
-	return 0;
+    t1 = msclock() - t1;
+    PrintAndLogEx(SUCCESS, "\nTime in bruteforce: %.0f seconds\n", (float)t1/1000.0);
+    return 0;
 }
 
 int CmdT55xxBruteForce(const char *Cmd) {
 
     uint32_t start_password = 0x00000000; //start password
     uint32_t end_password   = 0xFFFFFFFF; //end   password
-	uint32_t curr = 0;
+    uint32_t curr = 0;
     bool found = false;
 
 
     char cmdp = tolower(param_getchar(Cmd, 0));
-	if (cmdp == 'h') return usage_t55xx_bruteforce();
+    if (cmdp == 'h') return usage_t55xx_bruteforce();
 
-	uint64_t t1 = msclock();
+    uint64_t t1 = msclock();
 
-	// Try to read Block 7, first :)
+    // Try to read Block 7, first :)
 
-	// incremental pwd range search
+    // incremental pwd range search
     start_password = param_get32ex(Cmd, 0, 0, 16);
-	end_password = param_get32ex(Cmd, 1, 0, 16);
+    end_password = param_get32ex(Cmd, 1, 0, 16);
 
-	curr = start_password;
+    curr = start_password;
 
-	if ( start_password >= end_password ) {
-		return usage_t55xx_bruteforce();
-	}
+    if ( start_password >= end_password ) {
+        return usage_t55xx_bruteforce();
+    }
 
     PrintAndLogEx(INFO, "Search password range [%08X -> %08X]", start_password, end_password);
 
     while ( !found ){
 
-		printf("."); fflush(stdout);
+        printf("."); fflush(stdout);
 
-		if (IsCancelled()) {
-			return 0;
-		}
+        if (IsCancelled()) {
+            return 0;
+        }
 
-		if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, curr)) {
-			PrintAndLogEx(WARNING, "Aquiring data from device failed. Quitting");
-			return 0;
-		}
+        if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, curr)) {
+            PrintAndLogEx(WARNING, "Aquiring data from device failed. Quitting");
+            return 0;
+        }
 
-		found = tryDetectModulation();
+        found = tryDetectModulation();
 
-		if (curr == end_password)
-			break;
-		curr++;
+        if (curr == end_password)
+            break;
+        curr++;
     }
 
     PrintAndLogEx(NORMAL, "");
 
     if (found)
-		PrintAndLogEx(SUCCESS, "Found valid password: [ %08X ]", curr);
+        PrintAndLogEx(SUCCESS, "Found valid password: [ %08X ]", curr);
     else
-		PrintAndLogEx(WARNING, "Password NOT found. Last tried: [ %08X ]", --curr);
+        PrintAndLogEx(WARNING, "Password NOT found. Last tried: [ %08X ]", --curr);
 
-	t1 = msclock() - t1;
-	PrintAndLogEx(SUCCESS, "\nTime in bruteforce: %.0f seconds\n", (float)t1/1000.0);
+    t1 = msclock() - t1;
+    PrintAndLogEx(SUCCESS, "\nTime in bruteforce: %.0f seconds\n", (float)t1/1000.0);
     return 0;
 }
 
 int tryOnePassword(uint32_t password) {
-	PrintAndLogEx(INFO, "Trying password %08x", password);
-	if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, password)) {
-		PrintAndLogEx(NORMAL, "Acquire data from device failed. Quitting");
-		return -1;
-	}
+    PrintAndLogEx(INFO, "Trying password %08x", password);
+    if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, password)) {
+        PrintAndLogEx(NORMAL, "Acquire data from device failed. Quitting");
+        return -1;
+    }
 
-	if (tryDetectModulation())
-		return 1;
-	else
-		return 0;
+    if (tryDetectModulation())
+        return 1;
+    else
+        return 0;
 }
 
 int CmdT55xxRecoverPW(const char *Cmd) {
-	int bit = 0;
-	uint32_t orig_password = 0x0;
-	uint32_t curr_password = 0x0;
-	uint32_t prev_password = 0xffffffff;
-	uint32_t mask = 0x0;
-	int found = 0;
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if (cmdp == 'h' ) return usage_t55xx_recoverpw();
+    int bit = 0;
+    uint32_t orig_password = 0x0;
+    uint32_t curr_password = 0x0;
+    uint32_t prev_password = 0xffffffff;
+    uint32_t mask = 0x0;
+    int found = 0;
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (cmdp == 'h' ) return usage_t55xx_recoverpw();
 
-	orig_password = param_get32ex(Cmd, 0, 0x51243648, 16); //password used by handheld cloners
+    orig_password = param_get32ex(Cmd, 0, 0x51243648, 16); //password used by handheld cloners
 
-	// first try fliping each bit in the expected password
-	while (bit < 32) {
-		curr_password = orig_password ^ ( 1 << bit );
-		found = tryOnePassword(curr_password);
-		if (found == -1) return 0;
-		bit++;
+    // first try fliping each bit in the expected password
+    while (bit < 32) {
+        curr_password = orig_password ^ ( 1 << bit );
+        found = tryOnePassword(curr_password);
+        if (found == -1) return 0;
+        bit++;
 
-		if (IsCancelled()) return 0;
-	}
+        if (IsCancelled()) return 0;
+    }
 
-	// now try to use partial original password, since block 7 should have been completely
-	// erased during the write sequence and it is possible that only partial password has been
-	// written
-	// not sure from which end the bit bits are written, so try from both ends
-	// from low bit to high bit
-	bit = 0;
-	while (bit < 32) {
-		mask += ( 1 << bit );
-		curr_password = orig_password & mask;
-		// if updated mask didn't change the password, don't try it again
-		if (prev_password == curr_password) {
-			bit++;
-			continue;
-		}
-		found = tryOnePassword(curr_password);
-		if (found == -1) return 0;
-		bit++;
-		prev_password = curr_password;
+    // now try to use partial original password, since block 7 should have been completely
+    // erased during the write sequence and it is possible that only partial password has been
+    // written
+    // not sure from which end the bit bits are written, so try from both ends
+    // from low bit to high bit
+    bit = 0;
+    while (bit < 32) {
+        mask += ( 1 << bit );
+        curr_password = orig_password & mask;
+        // if updated mask didn't change the password, don't try it again
+        if (prev_password == curr_password) {
+            bit++;
+            continue;
+        }
+        found = tryOnePassword(curr_password);
+        if (found == -1) return 0;
+        bit++;
+        prev_password = curr_password;
 
-		if (IsCancelled()) return 0;
-	}
+        if (IsCancelled()) return 0;
+    }
 
-	// from high bit to low
-	bit = 0;
-	mask = 0xffffffff;
-	while (bit < 32) {
-		mask -= ( 1 << bit );
-		curr_password = orig_password & mask;
-		// if updated mask didn't change the password, don't try it again
-		if (prev_password == curr_password) {
-			bit++;
-			continue;
-		}
-		found = tryOnePassword(curr_password);
-		if (found == -1)
-			return 0;
-		bit++;
-		prev_password = curr_password;
+    // from high bit to low
+    bit = 0;
+    mask = 0xffffffff;
+    while (bit < 32) {
+        mask -= ( 1 << bit );
+        curr_password = orig_password & mask;
+        // if updated mask didn't change the password, don't try it again
+        if (prev_password == curr_password) {
+            bit++;
+            continue;
+        }
+        found = tryOnePassword(curr_password);
+        if (found == -1)
+            return 0;
+        bit++;
+        prev_password = curr_password;
 
-		if (IsCancelled()) return 0;
-	}
+        if (IsCancelled()) return 0;
+    }
 
-	PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "");
 
-	if (found == 1)
-		PrintAndLogEx(SUCCESS, "Found valid password: [%08x]", curr_password);
-	else
-		PrintAndLogEx(WARNING, "Password NOT found.");
+    if (found == 1)
+        PrintAndLogEx(SUCCESS, "Found valid password: [%08x]", curr_password);
+    else
+        PrintAndLogEx(WARNING, "Password NOT found.");
 
-	return 0;
+    return 0;
 }
 
 // note length of data returned is different for different chips.
 // some return all page 1 (64 bits) and others return just that block (32 bits)
 // unfortunately the 64 bits makes this more likely to get a false positive...
 bool tryDetectP1(bool getData) {
-	uint8_t preamble[] = {1,1,1,0,0,0,0,0,0,0,0,1,0,1,0,1};
-	size_t startIdx = 0;
-	uint8_t fc1 = 0, fc2 = 0, ans = 0;
-	int clk = 0, firstClockEdge = 0;
-	bool st = true;
+    uint8_t preamble[] = {1,1,1,0,0,0,0,0,0,0,0,1,0,1,0,1};
+    size_t startIdx = 0;
+    uint8_t fc1 = 0, fc2 = 0, ans = 0;
+    int clk = 0, firstClockEdge = 0;
+    bool st = true;
 
-	if ( getData ) {
-		if ( !AquireData(T55x7_PAGE1, 1, false, 0) )
-			return false;
-	}
+    if ( getData ) {
+        if ( !AquireData(T55x7_PAGE1, 1, false, 0) )
+            return false;
+    }
 
-	// try fsk clock detect. if successful it cannot be any other type of modulation...  (in theory...)
-	ans = fskClocks(&fc1, &fc2, (uint8_t *)&clk, &firstClockEdge);
-	if (ans && ((fc1==10 && fc2==8) || (fc1==8 && fc2==5))) {
-		if ( FSKrawDemod("0 0", false) &&
-			  preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
-			  (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
-			return true;
-		}
-		if ( FSKrawDemod("0 1", false) &&
-			  preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
-			  (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
-			return true;
-		}
-		return false;
-	}
+    // try fsk clock detect. if successful it cannot be any other type of modulation...  (in theory...)
+    ans = fskClocks(&fc1, &fc2, (uint8_t *)&clk, &firstClockEdge);
+    if (ans && ((fc1==10 && fc2==8) || (fc1==8 && fc2==5))) {
+        if ( FSKrawDemod("0 0", false) &&
+              preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
+              (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
+            return true;
+        }
+        if ( FSKrawDemod("0 1", false) &&
+              preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
+              (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
+            return true;
+        }
+        return false;
+    }
 
-	// try ask clock detect.  it could be another type even if successful.
-	clk = GetAskClock("", false);
-	if (clk > 0) {
-		if ( ASKDemod_ext("0 0 1", false, false, 1, &st) &&
-			  preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
-			  (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
-			return true;
-		}
-		st = true;
-		if ( ASKDemod_ext("0 1 1", false, false, 1, &st)  &&
-				preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
-				(DemodBufferLen == 32 || DemodBufferLen == 64) ) {
-			return true;
-		}
-		if ( ASKbiphaseDemod("0 0 0 2", false) &&
-				preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
-				(DemodBufferLen == 32 || DemodBufferLen == 64) ) {
-			return true;
-		}
-		if ( ASKbiphaseDemod("0 0 1 2", false) &&
-				preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
-				(DemodBufferLen == 32 || DemodBufferLen == 64) ) {
-			return true;
-		}
-	}
+    // try ask clock detect.  it could be another type even if successful.
+    clk = GetAskClock("", false);
+    if (clk > 0) {
+        if ( ASKDemod_ext("0 0 1", false, false, 1, &st) &&
+              preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
+              (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
+            return true;
+        }
+        st = true;
+        if ( ASKDemod_ext("0 1 1", false, false, 1, &st)  &&
+                preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
+                (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
+            return true;
+        }
+        if ( ASKbiphaseDemod("0 0 0 2", false) &&
+                preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
+                (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
+            return true;
+        }
+        if ( ASKbiphaseDemod("0 0 1 2", false) &&
+                preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
+                (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
+            return true;
+        }
+    }
 
-	// try NRZ clock detect.  it could be another type even if successful.
-	clk = GetNrzClock("", false); //has the most false positives :(
-	if (clk > 0) {
-		if ( NRZrawDemod("0 0 1", false)  &&
-				preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
-				(DemodBufferLen == 32 || DemodBufferLen == 64) ) {
-			return true;
-		}
-		if ( NRZrawDemod("0 1 1", false)  &&
-				preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
-				(DemodBufferLen == 32 || DemodBufferLen == 64) ) {
-			return true;
-		}
-	}
+    // try NRZ clock detect.  it could be another type even if successful.
+    clk = GetNrzClock("", false); //has the most false positives :(
+    if (clk > 0) {
+        if ( NRZrawDemod("0 0 1", false)  &&
+                preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
+                (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
+            return true;
+        }
+        if ( NRZrawDemod("0 1 1", false)  &&
+                preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
+                (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
+            return true;
+        }
+    }
 
-	// Fewer card uses PSK
-	// try psk clock detect. if successful it cannot be any other type of modulation... (in theory...)
-	clk = GetPskClock("", false);
-	if (clk > 0) {
-		// allow undo
-		// save_restoreGB(GRAPH_SAVE);
-		// skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)
-		//CmdLtrim("160");
-		if ( PSKDemod("0 0 6", false) &&
-			  preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
-			  (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
-			//save_restoreGB(GRAPH_RESTORE);
-			return true;
-		}
-		if ( PSKDemod("0 1 6", false) &&
-			  preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
-			  (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
-			//save_restoreGB(GRAPH_RESTORE);
-			return true;
-		}
-		// PSK2 - needs a call to psk1TOpsk2.
-		if ( PSKDemod("0 0 6", false)) {
-			psk1TOpsk2(DemodBuffer, DemodBufferLen);
-			if (preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
-				  (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
-				//save_restoreGB(GRAPH_RESTORE);
-				return true;
-			}
-		} // inverse waves does not affect PSK2 demod
-		//undo trim samples
-		//save_restoreGB(GRAPH_RESTORE); 
-		// no other modulation clocks = 2 or 4 so quit searching
-		if (fc1 != 8) return false;
-	}
+    // Fewer card uses PSK
+    // try psk clock detect. if successful it cannot be any other type of modulation... (in theory...)
+    clk = GetPskClock("", false);
+    if (clk > 0) {
+        // allow undo
+        // save_restoreGB(GRAPH_SAVE);
+        // skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)
+        //CmdLtrim("160");
+        if ( PSKDemod("0 0 6", false) &&
+              preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
+              (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
+            //save_restoreGB(GRAPH_RESTORE);
+            return true;
+        }
+        if ( PSKDemod("0 1 6", false) &&
+              preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
+              (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
+            //save_restoreGB(GRAPH_RESTORE);
+            return true;
+        }
+        // PSK2 - needs a call to psk1TOpsk2.
+        if ( PSKDemod("0 0 6", false)) {
+            psk1TOpsk2(DemodBuffer, DemodBufferLen);
+            if (preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
+                  (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
+                //save_restoreGB(GRAPH_RESTORE);
+                return true;
+            }
+        } // inverse waves does not affect PSK2 demod
+        //undo trim samples
+        //save_restoreGB(GRAPH_RESTORE);
+        // no other modulation clocks = 2 or 4 so quit searching
+        if (fc1 != 8) return false;
+    }
 
-	return false;
+    return false;
 }
 //  does this need to be a callable command?
 int CmdT55xxDetectPage1(const char *Cmd){
-	bool errors = false;
-	bool useGB = false;
-	bool usepwd = false;
-	uint32_t password = 0;
-	uint8_t cmdp = 0;
+    bool errors = false;
+    bool useGB = false;
+    bool usepwd = false;
+    uint32_t password = 0;
+    uint8_t cmdp = 0;
 
-	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch (tolower(param_getchar(Cmd, cmdp))) {
-		case 'h':
-			return usage_t55xx_detectP1();
-		case 'p':
-			password = param_get32ex(Cmd, cmdp+1, 0, 16);
-			usepwd = true;
-			cmdp += 2;
-			break;
-		case '1':
-			// use Graphbuffer data
-			useGB = true;
-			cmdp++;
-			break;
-		default:
-			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-			errors = true;
-			break;
-		}
-	}
-	if (errors) return usage_t55xx_detectP1();
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+        case 'h':
+            return usage_t55xx_detectP1();
+        case 'p':
+            password = param_get32ex(Cmd, cmdp+1, 0, 16);
+            usepwd = true;
+            cmdp += 2;
+            break;
+        case '1':
+            // use Graphbuffer data
+            useGB = true;
+            cmdp++;
+            break;
+        default:
+            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+            errors = true;
+            break;
+        }
+    }
+    if (errors) return usage_t55xx_detectP1();
 
-	if ( !useGB ) {
-		if ( !AquireData(T55x7_PAGE1, 1, usepwd, password) )
-			return false;
-	}
-	bool success = tryDetectP1(false);
-	if (success) PrintAndLogEx(SUCCESS, "T55xx chip found!");
-	return success;
+    if ( !useGB ) {
+        if ( !AquireData(T55x7_PAGE1, 1, usepwd, password) )
+            return false;
+    }
+    bool success = tryDetectP1(false);
+    if (success) PrintAndLogEx(SUCCESS, "T55xx chip found!");
+    return success;
 }
 
 int CmdT55xxSetDeviceConfig(const char *Cmd){
-	uint8_t startgap = 0, writegap = 0;
-	uint8_t write0 = 0, write1 = 0, readgap = 0;
-	bool errors = false, shall_persist = false;
-	uint8_t cmdp = 0;
-	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch (tolower(param_getchar(Cmd, cmdp))) {
-		case 'h':
-			return usage_lf_deviceconfig();
-		case 'a':
-			errors |= param_getdec(Cmd, cmdp+1, &startgap);
-			cmdp += 2;
-			break;
-		case 'b':
-			errors |= param_getdec(Cmd, cmdp+1, &writegap);
-			cmdp += 2;
-			break;
-		case 'c':
-			errors |= param_getdec(Cmd, cmdp+1, &write0);
-			cmdp += 2;
-			break;
-		case 'd':
-			errors |= param_getdec(Cmd, cmdp+1, &write1);
-			cmdp += 2;
-			break;
-		case 'e':
-			errors |= param_getdec(Cmd, cmdp+1, &readgap);
-			cmdp += 2;
-			break;
-		case 'p':
-			shall_persist = true;
-			cmdp++;
-			break;
-		default:
-			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-			errors = 1;
-			break;
-		}
-	}
+    uint8_t startgap = 0, writegap = 0;
+    uint8_t write0 = 0, write1 = 0, readgap = 0;
+    bool errors = false, shall_persist = false;
+    uint8_t cmdp = 0;
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+        case 'h':
+            return usage_lf_deviceconfig();
+        case 'a':
+            errors |= param_getdec(Cmd, cmdp+1, &startgap);
+            cmdp += 2;
+            break;
+        case 'b':
+            errors |= param_getdec(Cmd, cmdp+1, &writegap);
+            cmdp += 2;
+            break;
+        case 'c':
+            errors |= param_getdec(Cmd, cmdp+1, &write0);
+            cmdp += 2;
+            break;
+        case 'd':
+            errors |= param_getdec(Cmd, cmdp+1, &write1);
+            cmdp += 2;
+            break;
+        case 'e':
+            errors |= param_getdec(Cmd, cmdp+1, &readgap);
+            cmdp += 2;
+            break;
+        case 'p':
+            shall_persist = true;
+            cmdp++;
+            break;
+        default:
+            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+            errors = 1;
+            break;
+        }
+    }
 
-	//Validations
-	if (errors || cmdp == 0) return usage_lf_deviceconfig();
+    //Validations
+    if (errors || cmdp == 0) return usage_lf_deviceconfig();
 
-	t55xx_config config = { startgap*8, writegap*8, write0*8, write1*8, readgap*8 };
+    t55xx_config config = { startgap*8, writegap*8, write0*8, write1*8, readgap*8 };
 
-	UsbCommand c = {CMD_SET_LF_T55XX_CONFIG, {shall_persist,0,0} };
-	memcpy(c.d.asBytes, &config, sizeof(t55xx_config));
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+    UsbCommand c = {CMD_SET_LF_T55XX_CONFIG, {shall_persist,0,0} };
+    memcpy(c.d.asBytes, &config, sizeof(t55xx_config));
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 
 static command_t CommandTable[] = {
-	{"help",		CmdHelp,           1, "This help"},
-	{"bruteforce",	CmdT55xxBruteForce,0, "<start password> <end password> [i <*.dic>] Simple bruteforce attack to find password"},
-	{"config",		CmdT55xxSetConfig, 1, "Set/Get T55XX configuration (modulation, inverted, offset, rate)"},
-	{"chk",			CmdT55xxChkPwds,   1, "Check passwords"},
-	{"detect",		CmdT55xxDetect,    1, "[1] Try detecting the tag modulation from reading the configuration block."},
-	{"deviceconfig", CmdT55xxSetDeviceConfig, 1, "Set/Get T55XX device configuration (startgap, writegap, write0, write1, readgap"},
-	{"p1detect",	CmdT55xxDetectPage1,1, "[1] Try detecting if this is a t55xx tag by reading page 1"},
-	{"dump",		CmdT55xxDump,      0, "[password] [o] Dump T55xx card block 0-7. Optional [password], [override]"},
-	{"info",		CmdT55xxInfo,      1, "[1] Show T55x7 configuration data (page 0/ blk 0)"},
-	{"read",		CmdT55xxReadBlock, 0, "b <block> p [password] [o] [1] -- Read T55xx block data. Optional [p password], [override], [page1]"},
-	{"resetread",	CmdResetRead,      0, "Send Reset Cmd then lf read the stream to attempt to identify the start of it (needs a demod and/or plot after)"},
-	{"recoverpw",	CmdT55xxRecoverPW, 0, "[password] Try to recover from bad password write from a cloner. Only use on PW protected chips!"},
-	{"special",		special,           0, "Show block changes with 64 different offsets"},
-	{"trace",		CmdT55xxReadTrace, 1, "[1] Show T55x7 traceability data (page 1/ blk 0-1)"},
-	{"wakeup",		CmdT55xxWakeUp,    0, "Send AOR wakeup command"},
-	{"wipe",		CmdT55xxWipe,      0, "[q] Wipe a T55xx tag and set defaults (will destroy any data on tag)"},
-	{"write",		CmdT55xxWriteBlock,0, "b <block> d <data> p [password] [1] -- Write T55xx block data. Optional [p password], [page1]"},
-	{NULL, NULL, 0, NULL}
+    {"help",        CmdHelp,                 1, "This help"},
+    {"bruteforce",  CmdT55xxBruteForce,      0, "<start password> <end password> [i <*.dic>] Simple bruteforce attack to find password"},
+    {"config",      CmdT55xxSetConfig,       1, "Set/Get T55XX configuration (modulation, inverted, offset, rate)"},
+    {"chk",         CmdT55xxChkPwds,         1, "Check passwords"},
+    {"detect",      CmdT55xxDetect,          1, "[1] Try detecting the tag modulation from reading the configuration block."},
+    {"deviceconfig",CmdT55xxSetDeviceConfig, 1, "Set/Get T55XX device configuration (startgap, writegap, write0, write1, readgap"},
+    {"p1detect",    CmdT55xxDetectPage1,     1, "[1] Try detecting if this is a t55xx tag by reading page 1"},
+    {"dump",        CmdT55xxDump,            0, "[password] [o] Dump T55xx card block 0-7. Optional [password], [override]"},
+    {"info",        CmdT55xxInfo,            1, "[1] Show T55x7 configuration data (page 0/ blk 0)"},
+    {"read",        CmdT55xxReadBlock,       0, "b <block> p [password] [o] [1] -- Read T55xx block data. Optional [p password], [override], [page1]"},
+    {"resetread",   CmdResetRead,            0, "Send Reset Cmd then lf read the stream to attempt to identify the start of it (needs a demod and/or plot after)"},
+    {"recoverpw",   CmdT55xxRecoverPW,       0, "[password] Try to recover from bad password write from a cloner. Only use on PW protected chips!"},
+    {"special",     special,                 0, "Show block changes with 64 different offsets"},
+    {"trace",       CmdT55xxReadTrace,       1, "[1] Show T55x7 traceability data (page 1/ blk 0-1)"},
+    {"wakeup",      CmdT55xxWakeUp,          0, "Send AOR wakeup command"},
+    {"wipe",        CmdT55xxWipe,            0, "[q] Wipe a T55xx tag and set defaults (will destroy any data on tag)"},
+    {"write",       CmdT55xxWriteBlock,      0, "b <block> d <data> p [password] [1] -- Write T55xx block data. Optional [p password], [page1]"},
+    {NULL, NULL, 0, NULL}
 };
 
 int CmdLFT55XX(const char *Cmd) {
-	clearCommandBuffer();
-	CmdsParse(CommandTable, Cmd);
-	return 0;
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
+    return 0;
 }
 
 int CmdHelp(const char *Cmd) {
-	CmdsHelp(CommandTable);
-	return 0;
+    CmdsHelp(CommandTable);
+    return 0;
 }
diff --git a/client/cmdlft55xx.h b/client/cmdlft55xx.h
index c4e0fc98b..77cb60b8a 100644
--- a/client/cmdlft55xx.h
+++ b/client/cmdlft55xx.h
@@ -30,103 +30,103 @@
 #define T55x7_CONFIGURATION_BLOCK 0x00
 #define T55x7_PAGE0 0x00
 #define T55x7_PAGE1 0x01
-#define T55x7_PWD	0x00000010
+#define T55x7_PWD 0x00000010
 #define REGULAR_READ_MODE_BLOCK 0xFF
 
 // config blocks
-#define T55X7_DEFAULT_CONFIG_BLOCK      0x000880E8      // ASK, compat mode, data rate 32, manchester, STT, 7 data blocks
-#define T55X7_RAW_CONFIG_BLOCK          0x000880E0      // ASK, compat mode, data rate 32, manchester, 7 data blocks
-#define T55X7_EM_UNIQUE_CONFIG_BLOCK    0x00148040      // ASK, emulate em4x02/unique - compat mode, manchester, data rate 64, 2 data blocks
+#define T55X7_DEFAULT_CONFIG_BLOCK      0x000880E8  // ASK, compat mode, data rate 32, manchester, STT, 7 data blocks
+#define T55X7_RAW_CONFIG_BLOCK          0x000880E0  // ASK, compat mode, data rate 32, manchester, 7 data blocks
+#define T55X7_EM_UNIQUE_CONFIG_BLOCK    0x00148040  // ASK, emulate em4x02/unique - compat mode, manchester, data rate 64, 2 data blocks
 // FDXB requires data inversion and BiPhase 57 is simply BiPhase 50 inverted, so we can either do it using the modulation scheme or the inversion flag
 // we've done both below to prove that it works either way, and the modulation value for BiPhase 50 in the Atmel data sheet of binary "10001" (17) is a typo,
 // and it should actually be "10000" (16)
-// #define T55X7_FDXB_CONFIG_BLOCK         903F8080  // emulate fdx-b - xtended mode, BiPhase ('57), data rate 32, 4 data blocks
+// #define T55X7_FDXB_CONFIG_BLOCK        0x903F8080  // emulate fdx-b - xtended mode, BiPhase ('57), data rate 32, 4 data blocks
 #define T55X7_FDXB_CONFIG_BLOCK         0x903F0082  // emulate fdx-b - xtended mode, BiPhase ('50), invert data, data rate 32, 4 data blocks
 #define T55X7_HID_26_CONFIG_BLOCK       0x00107060  // hid 26 bit - compat mode, FSK2a, data rate 50, 3 data blocks
-#define T55X7_PYRAMID_CONFIG_BLOCK		0x00107080  // Pyramid 26 bit - compat mode, FSK2a, data rate 50, 4 data blocks
+#define T55X7_PYRAMID_CONFIG_BLOCK      0x00107080  // Pyramid 26 bit - compat mode, FSK2a, data rate 50, 4 data blocks
 #define T55X7_INDALA_64_CONFIG_BLOCK    0x00081040  // emulate indala 64 bit - compat mode, PSK1, psk carrier FC * 2, data rate 32, maxblock 2
 #define T55X7_INDALA_224_CONFIG_BLOCK   0x000810E0  // emulate indala 224 bit - compat mode, PSK1, psk carrier FC * 2, data rate 32, maxblock 7
-#define T55X7_GUARDPROXII_CONFIG_BLOCK	0x00150060	// bitrate 64pcb, Direct modulation, Biphase, 3 data blocks
-#define T55X7_VIKING_CONFIG_BLOCK		0x00088040	// ASK, compat mode, data rate 32, Manchester, 2 data blocks
-#define T55X7_NORALYS_CONFIG_BLOCK		0x00088C6A	// ASK, compat mode,   (NORALYS - KCP3000)
-#define T55X7_IOPROX_CONFIG_BLOCK		0x00147040  // ioprox - FSK2a, data rate 64, 2 data blocks
-#define T55X7_PRESCO_CONFIG_BLOCK		0x00088088  // ASK, data rate 32, Manchester, 5 data blocks, STT
-#define T55X7_NEDAP_64_CONFIG_BLOCK		0x907f0042  // BiPhase,  data rate 64, 3 data blocks
-#define T55X7_NEDAP_128_CONFIG_BLOCK	0x907f0082  // BiPhase,  data rate 64, 5 data blocks
+#define T55X7_GUARDPROXII_CONFIG_BLOCK  0x00150060  // bitrate 64pcb, Direct modulation, Biphase, 3 data blocks
+#define T55X7_VIKING_CONFIG_BLOCK       0x00088040  // ASK, compat mode, data rate 32, Manchester, 2 data blocks
+#define T55X7_NORALYS_CONFIG_BLOCK      0x00088C6A  // ASK, compat mode,   (NORALYS - KCP3000)
+#define T55X7_IOPROX_CONFIG_BLOCK       0x00147040  // ioprox - FSK2a, data rate 64, 2 data blocks
+#define T55X7_PRESCO_CONFIG_BLOCK       0x00088088  // ASK, data rate 32, Manchester, 5 data blocks, STT
+#define T55X7_NEDAP_64_CONFIG_BLOCK     0x907f0042  // BiPhase,  data rate 64, 3 data blocks
+#define T55X7_NEDAP_128_CONFIG_BLOCK    0x907f0082  // BiPhase,  data rate 64, 5 data blocks
 #define T55X7_bin 0b0010
 
-#define T5555_DEFAULT_CONFIG_BLOCK		0x6001F004  // data rate 64 , ask, manchester, 2 data blocks?
+#define T5555_DEFAULT_CONFIG_BLOCK      0x6001F004  // data rate 64 , ask, manchester, 2 data blocks?
 enum {
-	T55x7_RAW = 0x00,
-	T55x7_DEFAULT = 0x00,
-	T5555_DEFAULT = 0x01,
-	EM_UNIQUE  = 0x0,
-	FDBX = 0x02,
-	HID_26 = 0x03,
-	INDALA_64 = 0x04,
-	INDALA_224 = 0x05,
-	GUARDPROXXII = 0x06,
-	VIKING = 0x07,
-	NORALSYS = 0x08,
-	IOPROX = 0x09,
-	NEDAP_64 = 0x0A,
-	NEDAP_128 = 0x0B,
+    T55x7_RAW = 0x00,
+    T55x7_DEFAULT = 0x00,
+    T5555_DEFAULT = 0x01,
+    EM_UNIQUE  = 0x0,
+    FDBX = 0x02,
+    HID_26 = 0x03,
+    INDALA_64 = 0x04,
+    INDALA_224 = 0x05,
+    GUARDPROXXII = 0x06,
+    VIKING = 0x07,
+    NORALSYS = 0x08,
+    IOPROX = 0x09,
+    NEDAP_64 = 0x0A,
+    NEDAP_128 = 0x0B,
 } t55xx_tag;
 
 typedef struct {
-	uint32_t bl1;
-	uint32_t bl2;
-	uint32_t acl;
-	uint32_t mfc;
-	uint32_t cid;
-	uint32_t year;
-	uint32_t quarter;
-	uint32_t icr;
-	uint32_t lotid;
-	uint32_t wafer;
-	uint32_t dw;
+    uint32_t bl1;
+    uint32_t bl2;
+    uint32_t acl;
+    uint32_t mfc;
+    uint32_t cid;
+    uint32_t year;
+    uint32_t quarter;
+    uint32_t icr;
+    uint32_t lotid;
+    uint32_t wafer;
+    uint32_t dw;
 } t55x7_tracedata_t;
 
 typedef struct {
-	uint32_t bl1;
-	uint32_t bl2;
-	uint32_t icr;
-	char lotidc;
-	uint32_t lotid;
-	uint32_t wafer;
-	uint32_t dw;
+    uint32_t bl1;
+    uint32_t bl2;
+    uint32_t icr;
+    char lotidc;
+    uint32_t lotid;
+    uint32_t wafer;
+    uint32_t dw;
 } t5555_tracedata_t;
 
 typedef struct {
-	enum {
-		DEMOD_NRZ  = 0x00,
-		DEMOD_PSK1 = 0x01,
-		DEMOD_PSK2 = 0x02,
-		DEMOD_PSK3 = 0x03,
-		DEMOD_FSK1  = 0x04,
-		DEMOD_FSK1a = 0x05,
-		DEMOD_FSK2  = 0x06,
-		DEMOD_FSK2a = 0x07,
-		DEMOD_FSK   = 0xF0, //generic FSK (auto detect FCs)
-		DEMOD_ASK  = 0x08,
-		DEMOD_BI   = 0x10,
-		DEMOD_BIa  = 0x18,
-	}  modulation;
-	bool inverted;
-	uint8_t offset;
-	uint32_t block0;
-	enum {
-		RF_8 = 0x00,
-		RF_16 = 0x01,
-		RF_32 = 0x02,
-		RF_40 = 0x03,
-		RF_50 = 0x04,
-		RF_64 = 0x05,
-		RF_100 = 0x06,
-		RF_128 = 0x07,
-	} bitrate;
-	bool Q5;
-	bool ST;
+    enum {
+        DEMOD_NRZ  = 0x00,
+        DEMOD_PSK1 = 0x01,
+        DEMOD_PSK2 = 0x02,
+        DEMOD_PSK3 = 0x03,
+        DEMOD_FSK1  = 0x04,
+        DEMOD_FSK1a = 0x05,
+        DEMOD_FSK2  = 0x06,
+        DEMOD_FSK2a = 0x07,
+        DEMOD_FSK   = 0xF0, //generic FSK (auto detect FCs)
+        DEMOD_ASK  = 0x08,
+        DEMOD_BI   = 0x10,
+        DEMOD_BIa  = 0x18,
+    }  modulation;
+    bool inverted;
+    uint8_t offset;
+    uint32_t block0;
+    enum {
+        RF_8 = 0x00,
+        RF_16 = 0x01,
+        RF_32 = 0x02,
+        RF_40 = 0x03,
+        RF_50 = 0x04,
+        RF_64 = 0x05,
+        RF_100 = 0x06,
+        RF_128 = 0x07,
+    } bitrate;
+    bool Q5;
+    bool ST;
 } t55xx_conf_block_t;
 
 t55xx_conf_block_t Get_t55xx_Config(void);
diff --git a/client/cmdlfti.c b/client/cmdlfti.c
index 1eb649ca5..0f4cf4f96 100644
--- a/client/cmdlfti.c
+++ b/client/cmdlfti.c
@@ -86,221 +86,221 @@ int CmdTIDemod(const char *Cmd) {
     int i, j, TagType;
     int lowSum = 0, highSum = 0;;
     int lowTot = 0, highTot = 0;
-    int retval = 0;     
-    
-	for (i = 0; i < GraphTraceLen - convLen; i++) {
-		lowSum = 0;
-		highSum = 0;;
+    int retval = 0;
 
-		for (j = 0; j < lowLen; j++) {
-			lowSum += LowTone[j] * GraphBuffer[i+j];
-		}
-		for (j = 0; j < highLen; j++) {
-			highSum += HighTone[j] * GraphBuffer[i+j];
-		}
-		lowSum = abs((100 * lowSum) / lowLen);
-		highSum = abs((100 * highSum) / highLen);
-		lowSum = (lowSum < 0) ? -lowSum : lowSum;
-		highSum = (highSum < 0) ? -highSum : highSum;
+    for (i = 0; i < GraphTraceLen - convLen; i++) {
+        lowSum = 0;
+        highSum = 0;;
 
-		GraphBuffer[i] = (highSum << 16) | lowSum;
-	}
+        for (j = 0; j < lowLen; j++) {
+            lowSum += LowTone[j] * GraphBuffer[i+j];
+        }
+        for (j = 0; j < highLen; j++) {
+            highSum += HighTone[j] * GraphBuffer[i+j];
+        }
+        lowSum = abs((100 * lowSum) / lowLen);
+        highSum = abs((100 * highSum) / highLen);
+        lowSum = (lowSum < 0) ? -lowSum : lowSum;
+        highSum = (highSum < 0) ? -highSum : highSum;
 
-	for (i = 0; i < GraphTraceLen - convLen - 16; i++) {
-		lowTot = 0;
-		highTot = 0;
-		// 16 and 15 are f_s divided by f_l and f_h, rounded
-		for (j = 0; j < 16; j++) {
-			lowTot += (GraphBuffer[i+j] & 0xffff);
-		}
-		for (j = 0; j < 15; j++) {
-			highTot += (GraphBuffer[i+j] >> 16);
-		}
-		GraphBuffer[i] = lowTot - highTot;
-	}
+        GraphBuffer[i] = (highSum << 16) | lowSum;
+    }
 
-	GraphTraceLen -= (convLen + 16);
+    for (i = 0; i < GraphTraceLen - convLen - 16; i++) {
+        lowTot = 0;
+        highTot = 0;
+        // 16 and 15 are f_s divided by f_l and f_h, rounded
+        for (j = 0; j < 16; j++) {
+            lowTot += (GraphBuffer[i+j] & 0xffff);
+        }
+        for (j = 0; j < 15; j++) {
+            highTot += (GraphBuffer[i+j] >> 16);
+        }
+        GraphBuffer[i] = lowTot - highTot;
+    }
 
-	RepaintGraphWindow();
+    GraphTraceLen -= (convLen + 16);
 
-	// TI tag data format is 16 prebits, 8 start bits, 64 data bits,
-	// 16 crc CCITT bits, 8 stop bits, 15 end bits
+    RepaintGraphWindow();
 
-	// the 16 prebits are always low
-	// the 8 start and stop bits of a tag must match
-	// the start/stop prebits of a ro tag are 01111110
-	// the start/stop prebits of a rw tag are 11111110
-	// the 15 end bits of a ro tag are all low
-	// the 15 end bits of a rw tag match bits 15-1 of the data bits
+    // TI tag data format is 16 prebits, 8 start bits, 64 data bits,
+    // 16 crc CCITT bits, 8 stop bits, 15 end bits
 
-	// Okay, so now we have unsliced soft decisions;
-	// find bit-sync, and then get some bits.
-	// look for 17 low bits followed by 6 highs (common pattern for ro and rw tags)
-	int max = 0, maxPos = 0;
-	for (i = 0; i < 6000; i++) {
-		int j;
-		int dec = 0;
-		// searching 17 consecutive lows
-		for (j = 0; j < 17*lowLen; j++) {
-			dec -= GraphBuffer[i+j];
-		}
-		// searching 7 consecutive highs
-		for (; j < 17*lowLen + 6*highLen; j++) {
-			dec += GraphBuffer[i+j];
-		}
-		if (dec > max) {
-			max = dec;
-			maxPos = i;
-		}
-	}
+    // the 16 prebits are always low
+    // the 8 start and stop bits of a tag must match
+    // the start/stop prebits of a ro tag are 01111110
+    // the start/stop prebits of a rw tag are 11111110
+    // the 15 end bits of a ro tag are all low
+    // the 15 end bits of a rw tag match bits 15-1 of the data bits
 
-	// place a marker in the buffer to visually aid location
-	// of the start of sync
-	GraphBuffer[maxPos] = 800;
-	GraphBuffer[maxPos+1] = -800;
+    // Okay, so now we have unsliced soft decisions;
+    // find bit-sync, and then get some bits.
+    // look for 17 low bits followed by 6 highs (common pattern for ro and rw tags)
+    int max = 0, maxPos = 0;
+    for (i = 0; i < 6000; i++) {
+        int j;
+        int dec = 0;
+        // searching 17 consecutive lows
+        for (j = 0; j < 17*lowLen; j++) {
+            dec -= GraphBuffer[i+j];
+        }
+        // searching 7 consecutive highs
+        for (; j < 17*lowLen + 6*highLen; j++) {
+            dec += GraphBuffer[i+j];
+        }
+        if (dec > max) {
+            max = dec;
+            maxPos = i;
+        }
+    }
 
-	// advance pointer to start of actual data stream (after 16 pre and 8 start bits)
-	maxPos += 17 * lowLen;
-	maxPos +=  6 * highLen;
+    // place a marker in the buffer to visually aid location
+    // of the start of sync
+    GraphBuffer[maxPos] = 800;
+    GraphBuffer[maxPos+1] = -800;
 
-	// place a marker in the buffer to visually aid location
-	// of the end of sync
-	GraphBuffer[maxPos] = 800;
-	GraphBuffer[maxPos+1] = -800;
+    // advance pointer to start of actual data stream (after 16 pre and 8 start bits)
+    maxPos += 17 * lowLen;
+    maxPos +=  6 * highLen;
 
-	PrintAndLogEx(DEBUG, "actual data bits start at sample %d", maxPos);
-	PrintAndLogEx(DEBUG, "length %d/%d", highLen, lowLen);
+    // place a marker in the buffer to visually aid location
+    // of the end of sync
+    GraphBuffer[maxPos] = 800;
+    GraphBuffer[maxPos+1] = -800;
 
-	uint8_t bits[1+64+16+8+16];
-	bits[sizeof(bits)-1] = '\0';
+    PrintAndLogEx(DEBUG, "actual data bits start at sample %d", maxPos);
+    PrintAndLogEx(DEBUG, "length %d/%d", highLen, lowLen);
 
-	uint32_t shift3 = 0x7e000000, shift2 = 0, shift1 = 0, shift0 = 0;
+    uint8_t bits[1+64+16+8+16];
+    bits[sizeof(bits)-1] = '\0';
 
-	for (i = 0; i < ARRAYLEN(bits)-1; i++) {
-		int high = 0;
-		int low = 0;
-		int j;
-		for (j = 0; j < lowLen; j++) {
-			low -= GraphBuffer[maxPos+j];
-		}
-		for (j = 0; j < highLen; j++) {
-			high += GraphBuffer[maxPos+j];
-		}
+    uint32_t shift3 = 0x7e000000, shift2 = 0, shift1 = 0, shift0 = 0;
 
-		if (high > low) {
-			bits[i] = '1';
-			maxPos += highLen;
-			// bitstream arrives lsb first so shift right
-			shift3 |= (1<<31);
-		} else {
-			bits[i] = '.';
-			maxPos += lowLen;
-		}
+    for (i = 0; i < ARRAYLEN(bits)-1; i++) {
+        int high = 0;
+        int low = 0;
+        int j;
+        for (j = 0; j < lowLen; j++) {
+            low -= GraphBuffer[maxPos+j];
+        }
+        for (j = 0; j < highLen; j++) {
+            high += GraphBuffer[maxPos+j];
+        }
 
-		// 128 bit right shift register
-		shift0 = (shift0>>1) | (shift1 << 31);
-		shift1 = (shift1>>1) | (shift2 << 31);
-		shift2 = (shift2>>1) | (shift3 << 31);
-		shift3 >>= 1;
+        if (high > low) {
+            bits[i] = '1';
+            maxPos += highLen;
+            // bitstream arrives lsb first so shift right
+            shift3 |= (1<<31);
+        } else {
+            bits[i] = '.';
+            maxPos += lowLen;
+        }
 
-		// place a marker in the buffer between bits to visually aid location
-		GraphBuffer[maxPos] = 800;
-		GraphBuffer[maxPos+1] = -800;
-	}
+        // 128 bit right shift register
+        shift0 = (shift0>>1) | (shift1 << 31);
+        shift1 = (shift1>>1) | (shift2 << 31);
+        shift2 = (shift2>>1) | (shift3 << 31);
+        shift3 >>= 1;
 
-	RepaintGraphWindow();
+        // place a marker in the buffer between bits to visually aid location
+        GraphBuffer[maxPos] = 800;
+        GraphBuffer[maxPos+1] = -800;
+    }
 
-	PrintAndLogEx(INFO, "raw tag bits = %s", bits);
+    RepaintGraphWindow();
 
-	TagType = (shift3 >> 8) & 0xFF;
-	if ( TagType != ((shift0 >> 16) & 0xFF) ) {
-		PrintAndLogEx(WARNING, "Error: start and stop bits do not match!");
+    PrintAndLogEx(INFO, "raw tag bits = %s", bits);
+
+    TagType = (shift3 >> 8) & 0xFF;
+    if ( TagType != ((shift0 >> 16) & 0xFF) ) {
+        PrintAndLogEx(WARNING, "Error: start and stop bits do not match!");
         goto out;
-	}
-	else if (TagType == 0x7E) {
-		PrintAndLogEx(INFO, "Readonly TI tag detected.");
-		retval = 1;
-        goto out;
-	}
-	else if (TagType == 0xFE) {
-		PrintAndLogEx(INFO, "Rewriteable TI tag detected.");
-
-		// put 64 bit data into shift1 and shift0
-		shift0 = (shift0 >> 24) | (shift1 << 8);
-		shift1 = (shift1 >> 24) | (shift2 << 8);
-
-		// align 16 bit crc into lower half of shift2
-		shift2 = ((shift2 >> 24) | (shift3 << 8)) & 0x0FFFF;
-
-		// align 16 bit "end bits" or "ident" into lower half of shift3
-		shift3 >>= 16;
-
-		// only 15 bits compare, last bit of ident is not valid
-		if ( (shift3 ^ shift0) & 0x7FFF ) {
-		  PrintAndLogEx(WARNING, "Error: Ident mismatch!");
-		}
-		// WARNING the order of the bytes in which we calc crc below needs checking
-		// i'm 99% sure the crc algorithm is correct, but it may need to eat the
-		// bytes in reverse or something
-		// calculate CRC
-		crc = 0;
-		crc = update_crc16(crc, (shift0 >>  0) & 0xFF);
-		crc = update_crc16(crc, (shift0 >>  8) & 0xFF);
-		crc = update_crc16(crc, (shift0 >> 16) & 0xFF);
-		crc = update_crc16(crc, (shift0 >> 24) & 0xFF);
-        
-		crc = update_crc16(crc, (shift1 >>  0) & 0xFF);
-		crc = update_crc16(crc, (shift1 >>  8) & 0xFF);
-		crc = update_crc16(crc, (shift1 >> 16) & 0xFF);
-		crc = update_crc16(crc, (shift1 >> 24) & 0xFF);
-
-		//crc =  crc16_ccitt(message, sizeof(message);
-
-		char *crcStr = (crc == (shift2 & 0xFFFF) ) ? "Passed" : "Failed";
-
-		PrintAndLogEx(INFO, "Tag data = %08X%08X  [Crc %04X %s]", shift1, shift0, crc, crcStr );
-
-		if (crc != (shift2 & 0xFFFF))
-			PrintAndLogEx(WARNING, "Error: CRC mismatch, calculated %04X, got %04X", crc, shift2 & 0xFFFF);
-        
+    }
+    else if (TagType == 0x7E) {
+        PrintAndLogEx(INFO, "Readonly TI tag detected.");
         retval = 1;
         goto out;
-	}
-	else {
-		PrintAndLogEx(WARNING, "Unknown tag type.");
-	}
-    
+    }
+    else if (TagType == 0xFE) {
+        PrintAndLogEx(INFO, "Rewriteable TI tag detected.");
+
+        // put 64 bit data into shift1 and shift0
+        shift0 = (shift0 >> 24) | (shift1 << 8);
+        shift1 = (shift1 >> 24) | (shift2 << 8);
+
+        // align 16 bit crc into lower half of shift2
+        shift2 = ((shift2 >> 24) | (shift3 << 8)) & 0x0FFFF;
+
+        // align 16 bit "end bits" or "ident" into lower half of shift3
+        shift3 >>= 16;
+
+        // only 15 bits compare, last bit of ident is not valid
+        if ( (shift3 ^ shift0) & 0x7FFF ) {
+          PrintAndLogEx(WARNING, "Error: Ident mismatch!");
+        }
+        // WARNING the order of the bytes in which we calc crc below needs checking
+        // i'm 99% sure the crc algorithm is correct, but it may need to eat the
+        // bytes in reverse or something
+        // calculate CRC
+        crc = 0;
+        crc = update_crc16(crc, (shift0 >>  0) & 0xFF);
+        crc = update_crc16(crc, (shift0 >>  8) & 0xFF);
+        crc = update_crc16(crc, (shift0 >> 16) & 0xFF);
+        crc = update_crc16(crc, (shift0 >> 24) & 0xFF);
+
+        crc = update_crc16(crc, (shift1 >>  0) & 0xFF);
+        crc = update_crc16(crc, (shift1 >>  8) & 0xFF);
+        crc = update_crc16(crc, (shift1 >> 16) & 0xFF);
+        crc = update_crc16(crc, (shift1 >> 24) & 0xFF);
+
+        //crc =  crc16_ccitt(message, sizeof(message);
+
+        char *crcStr = (crc == (shift2 & 0xFFFF) ) ? "Passed" : "Failed";
+
+        PrintAndLogEx(INFO, "Tag data = %08X%08X  [Crc %04X %s]", shift1, shift0, crc, crcStr );
+
+        if (crc != (shift2 & 0xFFFF))
+            PrintAndLogEx(WARNING, "Error: CRC mismatch, calculated %04X, got %04X", crc, shift2 & 0xFFFF);
+
+        retval = 1;
+        goto out;
+    }
+    else {
+        PrintAndLogEx(WARNING, "Unknown tag type.");
+    }
+
 out:
     if ( retval == 0)
         save_restoreGB(GRAPH_RESTORE);
-    
-	return retval;
+
+    return retval;
 }
 
 // read a TI tag and return its ID
 int CmdTIRead(const char *Cmd) {
-	UsbCommand c = {CMD_READ_TI_TYPE};
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+    UsbCommand c = {CMD_READ_TI_TYPE};
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 
 // write new data to a r/w TI tag
 int CmdTIWrite(const char *Cmd) {
-	int res = 0;
-	UsbCommand c = {CMD_WRITE_TI_TYPE};
-	res = sscanf(Cmd, "%012" SCNx64 " %012" SCNx64 " %012" SCNx64 "", &c.arg[0], &c.arg[1], &c.arg[2]);
+    int res = 0;
+    UsbCommand c = {CMD_WRITE_TI_TYPE};
+    res = sscanf(Cmd, "%012" SCNx64 " %012" SCNx64 " %012" SCNx64 "", &c.arg[0], &c.arg[1], &c.arg[2]);
 
-	if (res == 2) 
+    if (res == 2)
         c.arg[2] = 0;
-    
-	if (res < 2) {
-		PrintAndLogEx(WARNING, "Please specify the data as two hex strings, optionally the CRC as a third");
-		return 1;
-	}
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+
+    if (res < 2) {
+        PrintAndLogEx(WARNING, "Please specify the data as two hex strings, optionally the CRC as a third");
+        return 1;
+    }
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 
 static command_t CommandTable[] = {
diff --git a/client/cmdlfviking.c b/client/cmdlfviking.c
index 7f32ab5e5..37370dc88 100644
--- a/client/cmdlfviking.c
+++ b/client/cmdlfviking.c
@@ -12,163 +12,163 @@
 static int CmdHelp(const char *Cmd);
 
 int usage_lf_viking_clone(void) {
-	PrintAndLogEx(NORMAL, "clone a Viking AM tag to a T55x7 tag.");
-	PrintAndLogEx(NORMAL, "Usage: lf viking clone <Card ID - 8 hex digits> <Q5>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "  <Card Number>  : 8 digit hex viking card number");
-	PrintAndLogEx(NORMAL, "  <Q5>           : specify write to Q5 (t5555 instead of t55x7)");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "       lf viking clone 1A337 Q5");
-	return 0;
+    PrintAndLogEx(NORMAL, "clone a Viking AM tag to a T55x7 tag.");
+    PrintAndLogEx(NORMAL, "Usage: lf viking clone <Card ID - 8 hex digits> <Q5>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "  <Card Number>  : 8 digit hex viking card number");
+    PrintAndLogEx(NORMAL, "  <Q5>           : specify write to Q5 (t5555 instead of t55x7)");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "       lf viking clone 1A337 Q5");
+    return 0;
 }
 
 int usage_lf_viking_sim(void) {
-	PrintAndLogEx(NORMAL, "Enables simulation of viking card with specified card number.");
-	PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
-	PrintAndLogEx(NORMAL, "Per viking format, the card number is 8 digit hex number.  Larger values are truncated.");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  lf viking sim <Card-Number>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "  <Card Number>   : 8 digit hex viking card number");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "       lf viking sim 1A337");
-	return 0;
+    PrintAndLogEx(NORMAL, "Enables simulation of viking card with specified card number.");
+    PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
+    PrintAndLogEx(NORMAL, "Per viking format, the card number is 8 digit hex number.  Larger values are truncated.");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  lf viking sim <Card-Number>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "  <Card Number>   : 8 digit hex viking card number");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "       lf viking sim 1A337");
+    return 0;
 }
 
 // calc checksum
 uint64_t getVikingBits(uint32_t id) {
-	uint8_t checksum = ((id>>24) & 0xFF) ^ ((id>>16) & 0xFF) ^ ((id>>8) & 0xFF) ^ (id & 0xFF) ^ 0xF2 ^ 0xA8;
-	uint64_t ret = (uint64_t)0xF2 << 56;
-	ret |= (uint64_t)id << 8;
-	ret	|= checksum;
-	return ret;
+    uint8_t checksum = ((id>>24) & 0xFF) ^ ((id>>16) & 0xFF) ^ ((id>>8) & 0xFF) ^ (id & 0xFF) ^ 0xF2 ^ 0xA8;
+    uint64_t ret = (uint64_t)0xF2 << 56;
+    ret |= (uint64_t)id << 8;
+    ret |= checksum;
+    return ret;
 }
 // by marshmellow
 // find viking preamble 0xF200 in already demoded data
 int detectViking(uint8_t *dest, size_t *size) {
-	//make sure buffer has data
-	if (*size < 64*2) return -2;
-	size_t startIdx = 0;
-	uint8_t preamble[] = {1,1,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
-	if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
-		return -4; //preamble not found
+    //make sure buffer has data
+    if (*size < 64*2) return -2;
+    size_t startIdx = 0;
+    uint8_t preamble[] = {1,1,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+    if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
+        return -4; //preamble not found
 
-	uint32_t checkCalc = bytebits_to_byte(dest+startIdx,8) ^
-						 bytebits_to_byte(dest+startIdx+8,8) ^
-						 bytebits_to_byte(dest+startIdx+16,8) ^
-						 bytebits_to_byte(dest+startIdx+24,8) ^
-						 bytebits_to_byte(dest+startIdx+32,8) ^
-						 bytebits_to_byte(dest+startIdx+40,8) ^
-						 bytebits_to_byte(dest+startIdx+48,8) ^
-						 bytebits_to_byte(dest+startIdx+56,8);
-	if ( checkCalc != 0xA8 ) return -5;
-	if (*size != 64) return -6;
-	//return start position
-	return (int)startIdx;
+    uint32_t checkCalc = bytebits_to_byte(dest+startIdx,8) ^
+                         bytebits_to_byte(dest+startIdx+8,8) ^
+                         bytebits_to_byte(dest+startIdx+16,8) ^
+                         bytebits_to_byte(dest+startIdx+24,8) ^
+                         bytebits_to_byte(dest+startIdx+32,8) ^
+                         bytebits_to_byte(dest+startIdx+40,8) ^
+                         bytebits_to_byte(dest+startIdx+48,8) ^
+                         bytebits_to_byte(dest+startIdx+56,8);
+    if ( checkCalc != 0xA8 ) return -5;
+    if (*size != 64) return -6;
+    //return start position
+    return (int)startIdx;
 }
 
 //by marshmellow
 //see ASKDemod for what args are accepted
 int CmdVikingDemod(const char *Cmd) {
-	if (!ASKDemod(Cmd, false, false, 1)) {
-		PrintAndLogEx(DEBUG, "DEBUG: Error - Viking ASKDemod failed");
-		return 0;
-	}
-	size_t size = DemodBufferLen;
+    if (!ASKDemod(Cmd, false, false, 1)) {
+        PrintAndLogEx(DEBUG, "DEBUG: Error - Viking ASKDemod failed");
+        return 0;
+    }
+    size_t size = DemodBufferLen;
 
-	int ans = detectViking(DemodBuffer, &size);
-	if (ans < 0) {
-		PrintAndLogEx(DEBUG, "DEBUG: Error - Viking Demod %d %s", ans, (ans == -5)?"[chksum error]":"");
-		return 0;
-	}
-	//got a good demod
-	uint32_t raw1 = bytebits_to_byte(DemodBuffer+ans, 32);
-	uint32_t raw2 = bytebits_to_byte(DemodBuffer+ans+32, 32);
-	uint32_t cardid = bytebits_to_byte(DemodBuffer+ans+24, 32);
-	uint8_t  checksum = bytebits_to_byte(DemodBuffer+ans+32+24, 8);
-	PrintAndLogEx(SUCCESS, "Viking Tag Found: Card ID %08X, Checksum: %02X", cardid, checksum);
-	PrintAndLogEx(SUCCESS, "Raw: %08X%08X", raw1,raw2);
-	setDemodBuf(DemodBuffer, 64, ans);
-	setClockGrid(g_DemodClock, g_DemodStartIdx + (ans*g_DemodClock));
-	return 1;
+    int ans = detectViking(DemodBuffer, &size);
+    if (ans < 0) {
+        PrintAndLogEx(DEBUG, "DEBUG: Error - Viking Demod %d %s", ans, (ans == -5)?"[chksum error]":"");
+        return 0;
+    }
+    //got a good demod
+    uint32_t raw1 = bytebits_to_byte(DemodBuffer+ans, 32);
+    uint32_t raw2 = bytebits_to_byte(DemodBuffer+ans+32, 32);
+    uint32_t cardid = bytebits_to_byte(DemodBuffer+ans+24, 32);
+    uint8_t  checksum = bytebits_to_byte(DemodBuffer+ans+32+24, 8);
+    PrintAndLogEx(SUCCESS, "Viking Tag Found: Card ID %08X, Checksum: %02X", cardid, checksum);
+    PrintAndLogEx(SUCCESS, "Raw: %08X%08X", raw1,raw2);
+    setDemodBuf(DemodBuffer, 64, ans);
+    setClockGrid(g_DemodClock, g_DemodStartIdx + (ans*g_DemodClock));
+    return 1;
 }
 
 //by marshmellow
 //see ASKDemod for what args are accepted
 int CmdVikingRead(const char *Cmd) {
-	lf_read(true, 10000);
-	return CmdVikingDemod(Cmd);
+    lf_read(true, 10000);
+    return CmdVikingDemod(Cmd);
 }
 
 int CmdVikingClone(const char *Cmd) {
-	uint32_t id = 0;
-	uint64_t rawID = 0;
-	bool Q5 = false;
-	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_viking_clone();
+    uint32_t id = 0;
+    uint64_t rawID = 0;
+    bool Q5 = false;
+    char cmdp = param_getchar(Cmd, 0);
+    if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_viking_clone();
 
-	id = param_get32ex(Cmd, 0, 0, 16);
-	if (id == 0) return usage_lf_viking_clone();
+    id = param_get32ex(Cmd, 0, 0, 16);
+    if (id == 0) return usage_lf_viking_clone();
 
-	cmdp = param_getchar(Cmd, 1);
-	if ( cmdp == 'Q' || cmdp == 'q')
-		Q5 = true;
+    cmdp = param_getchar(Cmd, 1);
+    if ( cmdp == 'Q' || cmdp == 'q')
+        Q5 = true;
 
-	rawID = getVikingBits(id);
+    rawID = getVikingBits(id);
 
-	PrintAndLogEx(INFO, "Preparing to clone Viking tag - ID: %08X, Raw: %08X%08X",id,(uint32_t)(rawID >> 32),(uint32_t) (rawID & 0xFFFFFFFF));
+    PrintAndLogEx(INFO, "Preparing to clone Viking tag - ID: %08X, Raw: %08X%08X",id,(uint32_t)(rawID >> 32),(uint32_t) (rawID & 0xFFFFFFFF));
 
-	UsbCommand c = {CMD_VIKING_CLONE_TAG, {rawID >> 32, rawID & 0xFFFFFFFF, Q5}};
-	clearCommandBuffer();
+    UsbCommand c = {CMD_VIKING_CLONE_TAG, {rawID >> 32, rawID & 0xFFFFFFFF, Q5}};
+    clearCommandBuffer();
     SendCommand(&c);
-	UsbCommand resp;
-	if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)){
-		PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
-		return -1;
-	}
+    UsbCommand resp;
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)){
+        PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
+        return -1;
+    }
     return 0;
 }
 
 int CmdVikingSim(const char *Cmd) {
-	uint32_t id = 0;
-	uint64_t rawID = 0;
-	uint8_t clk = 32, encoding = 1, separator = 0, invert = 0;
+    uint32_t id = 0;
+    uint64_t rawID = 0;
+    uint8_t clk = 32, encoding = 1, separator = 0, invert = 0;
 
-	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_viking_sim();
+    char cmdp = param_getchar(Cmd, 0);
+    if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_viking_sim();
 
-	id = param_get32ex(Cmd, 0, 0, 16);
-	if (id == 0) return usage_lf_viking_sim();
+    id = param_get32ex(Cmd, 0, 0, 16);
+    if (id == 0) return usage_lf_viking_sim();
 
-	rawID = getVikingBits(id);
+    rawID = getVikingBits(id);
 
-	uint16_t arg1, arg2;
-	size_t size = 64;
-	arg1 = clk << 8 | encoding;
-	arg2 = invert << 8 | separator;
+    uint16_t arg1, arg2;
+    size_t size = 64;
+    arg1 = clk << 8 | encoding;
+    arg2 = invert << 8 | separator;
 
-	PrintAndLogEx(SUCCESS, "Simulating Viking - ID: %08X, Raw: %08X%08X",id,(uint32_t)(rawID >> 32),(uint32_t) (rawID & 0xFFFFFFFF));
+    PrintAndLogEx(SUCCESS, "Simulating Viking - ID: %08X, Raw: %08X%08X",id,(uint32_t)(rawID >> 32),(uint32_t) (rawID & 0xFFFFFFFF));
 
-	UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};
-	num_to_bytebits(rawID, size, c.d.asBytes);
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+    UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};
+    num_to_bytebits(rawID, size, c.d.asBytes);
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 
 static command_t CommandTable[] = {
-    {"help",	CmdHelp,		1, "This help"},
-	{"demod",	CmdVikingDemod, 1, "Demodulate a Viking tag from the GraphBuffer"},
-	{"read",	CmdVikingRead,  0, "Attempt to read and Extract tag data from the antenna"},
-	{"clone",	CmdVikingClone, 0, "<8 digit ID number> clone viking tag"},
-	{"sim",		CmdVikingSim,   0, "<8 digit ID number> simulate viking tag"},
+    {"help",    CmdHelp,        1, "This help"},
+    {"demod",   CmdVikingDemod, 1, "Demodulate a Viking tag from the GraphBuffer"},
+    {"read",    CmdVikingRead,  0, "Attempt to read and Extract tag data from the antenna"},
+    {"clone",   CmdVikingClone, 0, "<8 digit ID number> clone viking tag"},
+    {"sim",     CmdVikingSim,   0, "<8 digit ID number> simulate viking tag"},
     {NULL, NULL, 0, NULL}
 };
 
 int CmdLFViking(const char *Cmd) {
-	clearCommandBuffer();
+    clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
diff --git a/client/cmdlfvisa2000.c b/client/cmdlfvisa2000.c
index 430aea8f4..51dc5c843 100644
--- a/client/cmdlfvisa2000.c
+++ b/client/cmdlfvisa2000.c
@@ -16,30 +16,30 @@
 static int CmdHelp(const char *Cmd);
 
 int usage_lf_visa2k_clone(void){
-	PrintAndLogEx(NORMAL, "clone a Visa2000 tag to a T55x7 tag.");
-	PrintAndLogEx(NORMAL, "Usage: lf visa2000 clone [h] <card ID> <Q5>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h          : This help");
-	PrintAndLogEx(NORMAL, "      <card ID>  : Visa2k card ID");
-	PrintAndLogEx(NORMAL, "      <Q5>       : specify write to Q5 (t5555 instead of t55x7)");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "      lf visa2000 clone 112233");
-	return 0;
+    PrintAndLogEx(NORMAL, "clone a Visa2000 tag to a T55x7 tag.");
+    PrintAndLogEx(NORMAL, "Usage: lf visa2000 clone [h] <card ID> <Q5>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "      h          : This help");
+    PrintAndLogEx(NORMAL, "      <card ID>  : Visa2k card ID");
+    PrintAndLogEx(NORMAL, "      <Q5>       : specify write to Q5 (t5555 instead of t55x7)");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      lf visa2000 clone 112233");
+    return 0;
 }
 
 int usage_lf_visa2k_sim(void) {
-	PrintAndLogEx(NORMAL, "Enables simulation of visa2k card with specified card number.");
-	PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Usage:  lf visa2000 sim [h] <card ID>");
-	PrintAndLogEx(NORMAL, "Options:");
-	PrintAndLogEx(NORMAL, "      h          : This help");
-	PrintAndLogEx(NORMAL, "      <card ID>  : Visa2k card ID");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        lf visa2000 sim 112233");
-	return 0;
+    PrintAndLogEx(NORMAL, "Enables simulation of visa2k card with specified card number.");
+    PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  lf visa2000 sim [h] <card ID>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "      h          : This help");
+    PrintAndLogEx(NORMAL, "      <card ID>  : Visa2k card ID");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "        lf visa2000 sim 112233");
+    return 0;
 }
 
 static uint8_t visa_chksum( uint32_t id ) {
@@ -50,36 +50,36 @@ static uint8_t visa_chksum( uint32_t id ) {
 }
 
 static uint8_t visa_parity( uint32_t id) {
-	// 4bit parity LUT
-	uint8_t par_lut[] = {
-		0,1,1,0
-		,1,0,0,1
-		,1,0,0,1
-		,0,1,1,0
-	};
-	uint8_t par = 0;
-	par |= par_lut[ (id >> 28) & 0xF ] << 7;
-	par |= par_lut[ (id >> 24) & 0xF ] << 6;
-	par |= par_lut[ (id >> 20) & 0xF ] << 5;
-	par |= par_lut[ (id >> 16) & 0xF ] << 4;
-	par |= par_lut[ (id >> 12) & 0xF ] << 3;
-	par |= par_lut[ (id >>  8) & 0xF ] << 2;
-	par |= par_lut[ (id >>  4) & 0xF ] << 1;
-	par |= par_lut[ (id & 0xF) ];
-	return par;
+    // 4bit parity LUT
+    uint8_t par_lut[] = {
+        0,1,1,0
+        ,1,0,0,1
+        ,1,0,0,1
+        ,0,1,1,0
+    };
+    uint8_t par = 0;
+    par |= par_lut[ (id >> 28) & 0xF ] << 7;
+    par |= par_lut[ (id >> 24) & 0xF ] << 6;
+    par |= par_lut[ (id >> 20) & 0xF ] << 5;
+    par |= par_lut[ (id >> 16) & 0xF ] << 4;
+    par |= par_lut[ (id >> 12) & 0xF ] << 3;
+    par |= par_lut[ (id >>  8) & 0xF ] << 2;
+    par |= par_lut[ (id >>  4) & 0xF ] << 1;
+    par |= par_lut[ (id & 0xF) ];
+    return par;
 }
 
 // by iceman
 // find Visa2000 preamble in already demoded data
 int detectVisa2k(uint8_t *dest, size_t *size) {
-	if (*size < 96) return -1; //make sure buffer has data
-	size_t startIdx = 0;
-	uint8_t preamble[] = {0,1,0,1,0,1,1,0,0,1,0,0,1,0,0,1,0,1,0,1,0,0,1,1,0,0,1,1,0,0,1,0};
-	if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
-		return -2; //preamble not found
-	if (*size != 96) return -3; //wrong demoded size
-	//return start position
-	return (int)startIdx;
+    if (*size < 96) return -1; //make sure buffer has data
+    size_t startIdx = 0;
+    uint8_t preamble[] = {0,1,0,1,0,1,1,0,0,1,0,0,1,0,0,1,0,1,0,1,0,0,1,1,0,0,1,1,0,0,1,0};
+    if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
+        return -2; //preamble not found
+    if (*size != 96) return -3; //wrong demoded size
+    //return start position
+    return (int)startIdx;
 }
 
 /**
@@ -96,148 +96,148 @@ int detectVisa2k(uint8_t *dest, size_t *size) {
 //see ASKDemod for what args are accepted
 int CmdVisa2kDemod(const char *Cmd) {
 
-	save_restoreGB(GRAPH_SAVE);
+    save_restoreGB(GRAPH_SAVE);
 
-	//sCmdAskEdgeDetect("");
+    //sCmdAskEdgeDetect("");
 
-	//ASK / Manchester
-	bool st = true;
-	if (!ASKDemod_ext("64 0 0", false, false, 1, &st)) {
-		PrintAndLogEx(DEBUG, "DEBUG: Error - Visa2k: ASK/Manchester Demod failed");
-		save_restoreGB(GRAPH_RESTORE);
-		return 0;
-	}
-	size_t size = DemodBufferLen;
-	int ans = detectVisa2k(DemodBuffer, &size);
-	if (ans < 0){
-		if (ans == -1)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - Visa2k: too few bits found");
-		else if (ans == -2)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - Visa2k: preamble not found");
-		else if (ans == -3)
-			PrintAndLogEx(DEBUG, "DEBUG: Error - Visa2k: Size not correct: %d", size);
-		else
-			PrintAndLogEx(DEBUG, "DEBUG: Error - Visa2k: ans: %d", ans);
+    //ASK / Manchester
+    bool st = true;
+    if (!ASKDemod_ext("64 0 0", false, false, 1, &st)) {
+        PrintAndLogEx(DEBUG, "DEBUG: Error - Visa2k: ASK/Manchester Demod failed");
+        save_restoreGB(GRAPH_RESTORE);
+        return 0;
+    }
+    size_t size = DemodBufferLen;
+    int ans = detectVisa2k(DemodBuffer, &size);
+    if (ans < 0){
+        if (ans == -1)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - Visa2k: too few bits found");
+        else if (ans == -2)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - Visa2k: preamble not found");
+        else if (ans == -3)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - Visa2k: Size not correct: %d", size);
+        else
+            PrintAndLogEx(DEBUG, "DEBUG: Error - Visa2k: ans: %d", ans);
 
-		save_restoreGB(GRAPH_RESTORE);
-		return 0;
-	}
-	setDemodBuf(DemodBuffer, 96, ans);
-	setClockGrid(g_DemodClock, g_DemodStartIdx + (ans*g_DemodClock));
+        save_restoreGB(GRAPH_RESTORE);
+        return 0;
+    }
+    setDemodBuf(DemodBuffer, 96, ans);
+    setClockGrid(g_DemodClock, g_DemodStartIdx + (ans*g_DemodClock));
 
-	//got a good demod
-	uint32_t raw1 = bytebits_to_byte(DemodBuffer, 32);
-	uint32_t raw2 = bytebits_to_byte(DemodBuffer+32, 32);
-	uint32_t raw3 = bytebits_to_byte(DemodBuffer+64, 32);
+    //got a good demod
+    uint32_t raw1 = bytebits_to_byte(DemodBuffer, 32);
+    uint32_t raw2 = bytebits_to_byte(DemodBuffer+32, 32);
+    uint32_t raw3 = bytebits_to_byte(DemodBuffer+64, 32);
 
-	// chksum
-	uint8_t calc = visa_chksum(raw2);
-	uint8_t chk = raw3 & 0xF;
+    // chksum
+    uint8_t calc = visa_chksum(raw2);
+    uint8_t chk = raw3 & 0xF;
 
-	// test checksums
-	if ( chk != calc ) {
-		PrintAndLogEx(DEBUG, "DEBUG: error: Visa2000 checksum failed %x - %x\n", chk, calc);
-		save_restoreGB(GRAPH_RESTORE);
-		return 0;
-	}
-	// parity
-	uint8_t calc_par = visa_parity(raw2);
-	uint8_t chk_par = (raw3 & 0xFF0) >> 4;
-	if ( calc_par != chk_par) {
-		PrintAndLogEx(DEBUG, "DEBUG: error: Visa2000 parity failed %x - %x\n", chk_par, calc_par);
-		save_restoreGB(GRAPH_RESTORE);
-		return 0;
-	}
-	PrintAndLogEx(SUCCESS, "Visa2000 Tag Found: Card ID %u,  Raw: %08X%08X%08X", raw2,  raw1 ,raw2, raw3);
-	return 1;
+    // test checksums
+    if ( chk != calc ) {
+        PrintAndLogEx(DEBUG, "DEBUG: error: Visa2000 checksum failed %x - %x\n", chk, calc);
+        save_restoreGB(GRAPH_RESTORE);
+        return 0;
+    }
+    // parity
+    uint8_t calc_par = visa_parity(raw2);
+    uint8_t chk_par = (raw3 & 0xFF0) >> 4;
+    if ( calc_par != chk_par) {
+        PrintAndLogEx(DEBUG, "DEBUG: error: Visa2000 parity failed %x - %x\n", chk_par, calc_par);
+        save_restoreGB(GRAPH_RESTORE);
+        return 0;
+    }
+    PrintAndLogEx(SUCCESS, "Visa2000 Tag Found: Card ID %u,  Raw: %08X%08X%08X", raw2,  raw1 ,raw2, raw3);
+    return 1;
 }
 
 // 64*96*2=12288 samples just in case we just missed the first preamble we can still catch 2 of them
 int CmdVisa2kRead(const char *Cmd) {
-	lf_read(true, 20000);
-	return CmdVisa2kDemod(Cmd);
+    lf_read(true, 20000);
+    return CmdVisa2kDemod(Cmd);
 }
 
 int CmdVisa2kClone(const char *Cmd) {
 
-	uint64_t id = 0;
-	uint32_t blocks[4] = {T55x7_MODULATION_MANCHESTER | T55x7_BITRATE_RF_64 | T55x7_ST_TERMINATOR | 3 << T55x7_MAXBLOCK_SHIFT, BL0CK1, 0};
+    uint64_t id = 0;
+    uint32_t blocks[4] = {T55x7_MODULATION_MANCHESTER | T55x7_BITRATE_RF_64 | T55x7_ST_TERMINATOR | 3 << T55x7_MAXBLOCK_SHIFT, BL0CK1, 0};
 
-	char cmdp = tolower(param_getchar(Cmd, 0));
-	if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_visa2k_clone();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_visa2k_clone();
 
-	id = param_get32ex(Cmd, 0, 0, 10);
+    id = param_get32ex(Cmd, 0, 0, 10);
 
-	//Q5
-	if (param_getchar(Cmd, 1) == 'Q' || param_getchar(Cmd, 1) == 'q')
-		blocks[0] = T5555_MODULATION_MANCHESTER | T5555_SET_BITRATE(64) | T5555_ST_TERMINATOR | 3 << T5555_MAXBLOCK_SHIFT;
+    //Q5
+    if (param_getchar(Cmd, 1) == 'Q' || param_getchar(Cmd, 1) == 'q')
+        blocks[0] = T5555_MODULATION_MANCHESTER | T5555_SET_BITRATE(64) | T5555_ST_TERMINATOR | 3 << T5555_MAXBLOCK_SHIFT;
 
-	blocks[2] = id;
-	blocks[3] =  (visa_parity(id) << 4) | visa_chksum(id);
+    blocks[2] = id;
+    blocks[3] =  (visa_parity(id) << 4) | visa_chksum(id);
 
-	PrintAndLogEx(INFO, "Preparing to clone Visa2000 to T55x7 with CardId: %u", id);
-	print_blocks(blocks, 4);
+    PrintAndLogEx(INFO, "Preparing to clone Visa2000 to T55x7 with CardId: %u", id);
+    print_blocks(blocks, 4);
 
-	UsbCommand resp;
-	UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
+    UsbCommand resp;
+    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
 
-	for (uint8_t i = 0; i < 4; i++) {
-		c.arg[0] = blocks[i];
-		c.arg[1] = i;
-		clearCommandBuffer();
-		SendCommand(&c);
-		if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)){
-			PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
-			return -1;
-		}
-	}
+    for (uint8_t i = 0; i < 4; i++) {
+        c.arg[0] = blocks[i];
+        c.arg[1] = i;
+        clearCommandBuffer();
+        SendCommand(&c);
+        if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)){
+            PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
+            return -1;
+        }
+    }
     return 0;
 }
 
 int CmdVisa2kSim(const char *Cmd) {
 
-	uint32_t id = 0;
-	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_visa2k_sim();
+    uint32_t id = 0;
+    char cmdp = param_getchar(Cmd, 0);
+    if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_visa2k_sim();
 
-	id = param_get32ex(Cmd, 0, 0, 10);
+    id = param_get32ex(Cmd, 0, 0, 10);
 
-	uint8_t clk = 64, encoding = 1, separator = 1, invert = 0;
-	uint16_t arg1, arg2;
-	size_t size = 96;
-	arg1 = clk << 8 | encoding;
-	arg2 = invert << 8 | separator;
+    uint8_t clk = 64, encoding = 1, separator = 1, invert = 0;
+    uint16_t arg1, arg2;
+    size_t size = 96;
+    arg1 = clk << 8 | encoding;
+    arg2 = invert << 8 | separator;
 
-	PrintAndLogEx(SUCCESS, "Simulating Visa2000 - CardId: %u", id);
+    PrintAndLogEx(SUCCESS, "Simulating Visa2000 - CardId: %u", id);
 
-	UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};
+    UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};
 
-	uint32_t blocks[3] = { BL0CK1, id, (visa_parity(id) << 4) | visa_chksum(id) };
+    uint32_t blocks[3] = { BL0CK1, id, (visa_parity(id) << 4) | visa_chksum(id) };
 
-	for(int i = 0; i < 3; ++i)
-		num_to_bytebits(blocks[i], 32, c.d.asBytes + i*32);
+    for(int i = 0; i < 3; ++i)
+        num_to_bytebits(blocks[i], 32, c.d.asBytes + i*32);
 
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 
 static command_t CommandTable[] = {
-	{"help",	CmdHelp,		1, "This help"},
-	{"demod",	CmdVisa2kDemod,	1, "demodulate an VISA2000 tag from the GraphBuffer"},
-	{"read",	CmdVisa2kRead,	0, "attempt to read and extract tag data from the antenna"},
-	{"clone",	CmdVisa2kClone,	0, "clone Visa2000 to t55x7"},
-	{"sim",		CmdVisa2kSim,	0, "simulate Visa2000 tag"},
-	{NULL, NULL, 0, NULL}
+    {"help",    CmdHelp,        1, "This help"},
+    {"demod",   CmdVisa2kDemod, 1, "demodulate an VISA2000 tag from the GraphBuffer"},
+    {"read",    CmdVisa2kRead,  0, "attempt to read and extract tag data from the antenna"},
+    {"clone",   CmdVisa2kClone, 0, "clone Visa2000 to t55x7"},
+    {"sim",     CmdVisa2kSim,   0, "simulate Visa2000 tag"},
+    {NULL, NULL, 0, NULL}
 };
 
 int CmdLFVisa2k(const char *Cmd) {
-	clearCommandBuffer();
-	CmdsParse(CommandTable, Cmd);
-	return 0;
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
+    return 0;
 }
 
 int CmdHelp(const char *Cmd) {
-	CmdsHelp(CommandTable);
-	return 0;
+    CmdsHelp(CommandTable);
+    return 0;
 }
diff --git a/client/cmdmain.c b/client/cmdmain.c
index 20e388b43..c9ddae448 100644
--- a/client/cmdmain.c
+++ b/client/cmdmain.c
@@ -16,56 +16,56 @@ static int CmdRev(const char *Cmd);
 static int CmdRem(const char *Cmd);
 
 static command_t CommandTable[] = {
-	{"help",	CmdHelp,	1, "This help. Use '<command> help' for details of a particular command."},
-	{"analyse", CmdAnalyse, 1, "{ Analyse utils... }"},
-	{"data",	CmdData,	1, "{ Plot window / data buffer manipulation... }"},
-	{"hf",		CmdHF,		1, "{ High Frequency commands... }"},
-	{"hw",		CmdHW,		1, "{ Hardware commands... }"},
-	{"lf",		CmdLF,		1, "{ Low Frequency commands... }"},
-	{"emv",     CmdEMV,     1, "{ EMV iso14443 and iso7816... }"},
-	{"rem", 	CmdRem,		1, "{ Add text to row in log file }"},
-	{"reveng",	CmdRev, 	1, "{ Crc calculations from the RevEng software... }"},
-	{"script",	CmdScript,	1, "{ Scripting commands }"},
-	{"trace",	CmdTrace,	1, "{ Trace manipulation... }"},
+    {"help",    CmdHelp,      1, "This help. Use '<command> help' for details of a particular command."},
+    {"analyse", CmdAnalyse,   1, "{ Analyse utils... }"},
+    {"data",    CmdData,      1, "{ Plot window / data buffer manipulation... }"},
+    {"hf",      CmdHF,        1, "{ High Frequency commands... }"},
+    {"hw",      CmdHW,        1, "{ Hardware commands... }"},
+    {"lf",      CmdLF,        1, "{ Low Frequency commands... }"},
+    {"emv",     CmdEMV,       1, "{ EMV iso14443 and iso7816... }"},
+    {"rem",     CmdRem,       1, "{ Add text to row in log file }"},
+    {"reveng",  CmdRev,       1, "{ Crc calculations from the RevEng software... }"},
+    {"script",  CmdScript,    1, "{ Scripting commands }"},
+    {"trace",   CmdTrace,     1, "{ Trace manipulation... }"},
 #ifdef WITH_FLASH
-	{"mem",		CmdFlashMem,	1, "{ Flash Memory manipulation... }"},
+    {"mem",     CmdFlashMem,  1, "{ Flash Memory manipulation... }"},
 #endif
 #ifdef WITH_SMARTCARD
-	{"sc",		CmdSmartcard,	1, "{ Smart card ISO7816 commands... }"},
+    {"sc",      CmdSmartcard, 1, "{ Smart card ISO7816 commands... }"},
 #endif
-	{"quit",	CmdQuit,	1, ""},
-	{"exit",	CmdQuit,	1, "Exit program"},
-	{NULL, NULL, 0, NULL}
+    {"quit",    CmdQuit,      1, ""},
+    {"exit",    CmdQuit,      1, "Exit program"},
+    {NULL, NULL, 0, NULL}
 };
 
 command_t* getTopLevelCommandTable() {
-	return CommandTable;
+    return CommandTable;
 }
 
 int CmdRem(const char *Cmd) {
-	char buf[22];
+    char buf[22];
 
-	memset(buf, 0x00, sizeof(buf));
-	struct tm *curTime;
-	time_t now = time(0);
-	curTime = gmtime(&now);
-	strftime (buf, sizeof(buf), "%Y-%m-%dT%H:%M:%SZ", curTime); // ISO8601
-	PrintAndLogEx(NORMAL, "%s remark: %s", buf, Cmd);
-	return 0;
+    memset(buf, 0x00, sizeof(buf));
+    struct tm *curTime;
+    time_t now = time(0);
+    curTime = gmtime(&now);
+    strftime (buf, sizeof(buf), "%Y-%m-%dT%H:%M:%SZ", curTime); // ISO8601
+    PrintAndLogEx(NORMAL, "%s remark: %s", buf, Cmd);
+    return 0;
 }
 
 int CmdHelp(const char *Cmd) {
-	CmdsHelp(CommandTable);
-	return 0;
+    CmdsHelp(CommandTable);
+    return 0;
 }
 
 int CmdQuit(const char *Cmd) {
-	return 99;
+    return 99;
 }
 
 int CmdRev(const char *Cmd) {
-	CmdCrc(Cmd);
-	return 0;
+    CmdCrc(Cmd);
+    return 0;
 }
 
 //-----------------------------------------------------------------------------
@@ -73,5 +73,5 @@ int CmdRev(const char *Cmd) {
 // then presses Enter, which the full command line that they typed.
 //-----------------------------------------------------------------------------
 int CommandReceived(char *Cmd) {
-	return CmdsParse(CommandTable, Cmd);
+    return CmdsParse(CommandTable, Cmd);
 }
\ No newline at end of file
diff --git a/client/cmdmain.h b/client/cmdmain.h
index a1ef64e1a..a030e9a6a 100644
--- a/client/cmdmain.h
+++ b/client/cmdmain.h
@@ -31,14 +31,14 @@
 #include "cmdscript.h"
 #include "cmdcrc.h"
 #include "cmdanalyse.h"
-#include "emv/cmdemv.h"		// EMV
+#include "emv/cmdemv.h"   // EMV
 
 #ifdef WITH_FLASH
-#include "cmdflashmem.h"	// rdv40 flashmem commands
+#include "cmdflashmem.h"  // rdv40 flashmem commands
 #endif
 
 #ifdef WITH_SMARTCARD
-#include "cmdsmartcard.h"	// rdv40 smart card ISO7816 commands
+#include "cmdsmartcard.h" // rdv40 smart card ISO7816 commands
 #endif
 
 extern int CommandReceived(char *Cmd);
diff --git a/client/cmdparser.c b/client/cmdparser.c
index bbe7b2d8d..7a6ceaff9 100644
--- a/client/cmdparser.c
+++ b/client/cmdparser.c
@@ -18,113 +18,113 @@
 #include "comms.h"
 
 void CmdsHelp(const command_t Commands[]) {
-	if (Commands[0].Name == NULL) return;
-	int i = 0;
-	while (Commands[i].Name) {
-		if (!IsOffline() || Commands[i].Offline)
-			PrintAndLogEx(NORMAL, "%-16s %s", Commands[i].Name, Commands[i].Help);
-		++i;
-	}
+    if (Commands[0].Name == NULL) return;
+    int i = 0;
+    while (Commands[i].Name) {
+        if (!IsOffline() || Commands[i].Offline)
+            PrintAndLogEx(NORMAL, "%-16s %s", Commands[i].Name, Commands[i].Help);
+        ++i;
+    }
 }
 
 int CmdsParse(const command_t Commands[], const char *Cmd) {
-	// Help dump children
-	if (strcmp( Cmd, "XX_internal_command_dump_XX") == 0) {
-		dumpCommandsRecursive(Commands, 0);
-		return 0;
-	}
-	// Markdown help dump children
-	if(strcmp( Cmd, "XX_internal_command_dump_markdown_XX") == 0) {
-		dumpCommandsRecursive(Commands, 1);
-		return 0;
-	}
-	char cmd_name[128];
-	int len = 0;
-	memset(cmd_name, 0, sizeof(cmd_name));
-	sscanf(Cmd, "%127s%n", cmd_name, &len);
-	str_lower(cmd_name);
-	int i = 0;
-	while (Commands[i].Name && strcmp(Commands[i].Name, cmd_name))
-		++i;
+    // Help dump children
+    if (strcmp( Cmd, "XX_internal_command_dump_XX") == 0) {
+        dumpCommandsRecursive(Commands, 0);
+        return 0;
+    }
+    // Markdown help dump children
+    if(strcmp( Cmd, "XX_internal_command_dump_markdown_XX") == 0) {
+        dumpCommandsRecursive(Commands, 1);
+        return 0;
+    }
+    char cmd_name[128];
+    int len = 0;
+    memset(cmd_name, 0, sizeof(cmd_name));
+    sscanf(Cmd, "%127s%n", cmd_name, &len);
+    str_lower(cmd_name);
+    int i = 0;
+    while (Commands[i].Name && strcmp(Commands[i].Name, cmd_name))
+        ++i;
 
-	/* try to find exactly one prefix-match */
-	if (!Commands[i].Name) {
-		int last_match = 0;
-		int matches = 0;
+    /* try to find exactly one prefix-match */
+    if (!Commands[i].Name) {
+        int last_match = 0;
+        int matches = 0;
 
-		for (i=0; Commands[i].Name; i++) {
-			if( !strncmp(Commands[i].Name, cmd_name, strlen(cmd_name)) ) {
-				last_match = i;
-				matches++;
-			}
-		}
-		if (matches == 1) i = last_match;
-	}
+        for (i=0; Commands[i].Name; i++) {
+            if( !strncmp(Commands[i].Name, cmd_name, strlen(cmd_name)) ) {
+                last_match = i;
+                matches++;
+            }
+        }
+        if (matches == 1) i = last_match;
+    }
 
-	if (Commands[i].Name) {
-		while (Cmd[len] == ' ')
-		++len;
-		return Commands[i].Parse(Cmd + len);
-	} else {
-		// show help for selected hierarchy or if command not recognised
-		CmdsHelp(Commands);
-	}
+    if (Commands[i].Name) {
+        while (Cmd[len] == ' ')
+        ++len;
+        return Commands[i].Parse(Cmd + len);
+    } else {
+        // show help for selected hierarchy or if command not recognised
+        CmdsHelp(Commands);
+    }
 
-	return 0;
+    return 0;
 }
 
 char pparent[512] = {0};
 char *parent = pparent;
 
 void dumpCommandsRecursive(const command_t cmds[], int markdown) {
-	if (cmds[0].Name == NULL) return;
+    if (cmds[0].Name == NULL) return;
 
-	int i = 0;
-	int w_cmd = 25;
-	int w_off = 8;
-	// First, dump all single commands, which are not a container for
-	// other commands
-	if (markdown) {
-		PrintAndLogEx(NORMAL, "|%-*s|%-*s|%s\n",w_cmd,"command",w_off,"offline","description");
-		PrintAndLogEx(NORMAL, "|%-*s|%-*s|%s\n",w_cmd,"-------",w_off,"-------","-----------");
-	} else {
-		PrintAndLogEx(NORMAL, "%-*s|%-*s|%s\n",w_cmd,"command",w_off,"offline","description");
-		PrintAndLogEx(NORMAL, "%-*s|%-*s|%s\n",w_cmd,"-------",w_off,"-------","-----------");
-	}
+    int i = 0;
+    int w_cmd = 25;
+    int w_off = 8;
+    // First, dump all single commands, which are not a container for
+    // other commands
+    if (markdown) {
+        PrintAndLogEx(NORMAL, "|%-*s|%-*s|%s\n",w_cmd,"command",w_off,"offline","description");
+        PrintAndLogEx(NORMAL, "|%-*s|%-*s|%s\n",w_cmd,"-------",w_off,"-------","-----------");
+    } else {
+        PrintAndLogEx(NORMAL, "%-*s|%-*s|%s\n",w_cmd,"command",w_off,"offline","description");
+        PrintAndLogEx(NORMAL, "%-*s|%-*s|%s\n",w_cmd,"-------",w_off,"-------","-----------");
+    }
 
-	while (cmds[i].Name) {
-		char* cmd_offline = "N";
-		if (cmds[i].Help[0] == '{' && ++i) continue;
+    while (cmds[i].Name) {
+        char* cmd_offline = "N";
+        if (cmds[i].Help[0] == '{' && ++i) continue;
 
-		if ( cmds[i].Offline)
-			cmd_offline = "Y";
-		if (markdown)
-		  PrintAndLogEx(NORMAL, "|`%s%-*s`|%-*s|`%s`\n", parent, w_cmd-(int)strlen(parent)-2, cmds[i].Name, w_off, cmd_offline, cmds[i].Help);
-		else
-		  PrintAndLogEx(NORMAL, "%s%-*s|%-*s|%s\n", parent, w_cmd-(int)strlen(parent), cmds[i].Name, w_off, cmd_offline, cmds[i].Help);
-		++i;
-	}
-	PrintAndLogEx(NORMAL, "\n\n");
-	i = 0;
+        if ( cmds[i].Offline)
+            cmd_offline = "Y";
+        if (markdown)
+          PrintAndLogEx(NORMAL, "|`%s%-*s`|%-*s|`%s`\n", parent, w_cmd-(int)strlen(parent)-2, cmds[i].Name, w_off, cmd_offline, cmds[i].Help);
+        else
+          PrintAndLogEx(NORMAL, "%s%-*s|%-*s|%s\n", parent, w_cmd-(int)strlen(parent), cmds[i].Name, w_off, cmd_offline, cmds[i].Help);
+        ++i;
+    }
+    PrintAndLogEx(NORMAL, "\n\n");
+    i = 0;
 
-	// Then, print the categories. These will go into subsections with their own tables
-	while (cmds[i].Name) {
-		if(cmds[i].Help[0] != '{' && ++i)  continue;
+    // Then, print the categories. These will go into subsections with their own tables
+    while (cmds[i].Name) {
+        if(cmds[i].Help[0] != '{' && ++i)  continue;
 
-		PrintAndLogEx(NORMAL, "### %s%s\n\n %s\n\n", parent, cmds[i].Name, cmds[i].Help);
+        PrintAndLogEx(NORMAL, "### %s%s\n\n %s\n\n", parent, cmds[i].Name, cmds[i].Help);
 
-		char currentparent[512] = {0};
-		snprintf(currentparent, sizeof currentparent, "%s%s ", parent, cmds[i].Name);
-		char *old_parent = parent;
-		parent = currentparent;
-		// This is what causes the recursion, since commands Parse-implementation
-		// in turn calls the CmdsParse above.
-		if (markdown)
-		  cmds[i].Parse("XX_internal_command_dump_markdown_XX");
-		else
-		  cmds[i].Parse("XX_internal_command_dump_XX");
+        char currentparent[512] = {0};
+        snprintf(currentparent, sizeof currentparent, "%s%s ", parent, cmds[i].Name);
+        char *old_parent = parent;
+        parent = currentparent;
+        // This is what causes the recursion, since commands Parse-implementation
+        // in turn calls the CmdsParse above.
+        if (markdown)
+          cmds[i].Parse("XX_internal_command_dump_markdown_XX");
+        else
+          cmds[i].Parse("XX_internal_command_dump_XX");
 
-		parent = old_parent;
-		++i;
-	}
+        parent = old_parent;
+        ++i;
+    }
 }
diff --git a/client/cmdscript.c b/client/cmdscript.c
index 6ded9c1a9..d8c819365 100644
--- a/client/cmdscript.c
+++ b/client/cmdscript.c
@@ -69,30 +69,30 @@ bool endsWith(char* base, char* str) {
 */
 int CmdScriptList(const char *Cmd) {
 
-	char const * exedir = get_my_executable_directory();
-	if (exedir == NULL)
-	    return 0;
-	char script_directory_path[strlen(exedir) + strlen(LUA_SCRIPTS_DIRECTORY) + 1];
-	strcpy(script_directory_path, exedir);
-	strcpy(script_directory_path, get_my_executable_directory());
-	strcat(script_directory_path, LUA_SCRIPTS_DIRECTORY);
+    char const * exedir = get_my_executable_directory();
+    if (exedir == NULL)
+        return 0;
+    char script_directory_path[strlen(exedir) + strlen(LUA_SCRIPTS_DIRECTORY) + 1];
+    strcpy(script_directory_path, exedir);
+    strcpy(script_directory_path, get_my_executable_directory());
+    strcat(script_directory_path, LUA_SCRIPTS_DIRECTORY);
 
-	struct dirent **namelist;
-	int n;
+    struct dirent **namelist;
+    int n;
 
-	n = scandir(script_directory_path, &namelist, NULL, alphasort);
-	if (n == -1) {
-		PrintAndLogEx(FAILED, "Couldn't open the scripts-directory");
-		return 1;
-	}
+    n = scandir(script_directory_path, &namelist, NULL, alphasort);
+    if (n == -1) {
+        PrintAndLogEx(FAILED, "Couldn't open the scripts-directory");
+        return 1;
+    }
 
-	for (uint16_t i = 0; i < n; i++) {
-		if (str_ends_with(namelist[i]->d_name, ".lua"))
-			PrintAndLogEx(NORMAL, "%-21s", namelist[i]->d_name);
-		free(namelist[i]);
-	}
-	free(namelist);
-	return 0;
+    for (uint16_t i = 0; i < n; i++) {
+        if (str_ends_with(namelist[i]->d_name, ".lua"))
+            PrintAndLogEx(NORMAL, "%-21s", namelist[i]->d_name);
+        free(namelist[i]);
+    }
+    free(namelist);
+    return 0;
 }
 
 /**
@@ -115,8 +115,8 @@ int CmdScriptRun(const char *Cmd) {
     //Add the 'bin' library
     set_bin_library(lua_state);
 
-	//Add the 'bit' library
-	set_bit_library(lua_state);
+    //Add the 'bit' library
+    set_bit_library(lua_state);
 
     char script_name[128] = {0};
     char arguments[256] = {0};
@@ -128,13 +128,13 @@ int CmdScriptRun(const char *Cmd) {
     char *suffix = "";
     if (!endsWith(script_name, ".lua")) {
         suffix = ".lua";
-	}
+    }
 
-	char script_path[strlen(get_my_executable_directory()) + strlen(LUA_SCRIPTS_DIRECTORY) + strlen(script_name) + strlen(suffix) + 1];
-	strcpy(script_path, get_my_executable_directory());
-	strcat(script_path, LUA_SCRIPTS_DIRECTORY);
-	strcat(script_path, script_name);
-	strcat(script_path, suffix);
+    char script_path[strlen(get_my_executable_directory()) + strlen(LUA_SCRIPTS_DIRECTORY) + strlen(script_name) + strlen(suffix) + 1];
+    strcpy(script_path, get_my_executable_directory());
+    strcat(script_path, LUA_SCRIPTS_DIRECTORY);
+    strcat(script_path, script_name);
+    strcat(script_path, suffix);
 
     PrintAndLogEx(SUCCESS, "Executing: %s%s, args '%s'\n", script_name, suffix, arguments);
 
@@ -167,10 +167,10 @@ int CmdScriptRun(const char *Cmd) {
 }
 
 static command_t CommandTable[] = {
-	{"help",  CmdHelp,			1, "This help"},
-	{"list",  CmdScriptList,	1, "List available scripts"},
-	{"run",   CmdScriptRun,		1, "<name> -- Execute a script"},
-	{NULL, NULL, 0, NULL}
+    {"help",  CmdHelp,          1, "This help"},
+    {"list",  CmdScriptList,    1, "List available scripts"},
+    {"run",   CmdScriptRun,     1, "<name> -- Execute a script"},
+    {NULL, NULL, 0, NULL}
 };
 
 /**
@@ -180,9 +180,9 @@ static command_t CommandTable[] = {
  * @return
  */
 int CmdScript(const char *Cmd) {
-	clearCommandBuffer();
-	CmdsParse(CommandTable, Cmd);
-	return 0;
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
+    return 0;
 }
 
 /**
diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index 0faacd23a..40d4df3e9 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -13,1126 +13,1126 @@
 static int CmdHelp(const char *Cmd);
 
 int usage_sm_raw(void) {
-	PrintAndLogEx(NORMAL, "Usage: sc raw [h|r|c] d <0A 0B 0C ... hex>");
-	PrintAndLogEx(NORMAL, "       h          :  this help");
-	PrintAndLogEx(NORMAL, "       r          :  do not read response");
-	PrintAndLogEx(NORMAL, "       a          :  active smartcard without select (reset sc module)");
-	PrintAndLogEx(NORMAL, "       s          :  active smartcard with select (get ATR)");
-	PrintAndLogEx(NORMAL, "       t          :  executes TLV decoder if it possible");
-	PrintAndLogEx(NORMAL, "       0          :  use protocol T=0");
-	PrintAndLogEx(NORMAL, "       d <bytes>  :  bytes to send");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        sc raw s 0 d 00a404000e315041592e5359532e4444463031  - `1PAY.SYS.DDF01` PPSE directory with get ATR");
-	PrintAndLogEx(NORMAL, "        sc raw 0 d 00a404000e325041592e5359532e4444463031    - `2PAY.SYS.DDF01` PPSE directory");
-	PrintAndLogEx(NORMAL, "        sc raw 0 t d 00a4040007a0000000041010              - Mastercard");
-	PrintAndLogEx(NORMAL, "        sc raw 0 t d 00a4040007a0000000031010                - Visa");
+    PrintAndLogEx(NORMAL, "Usage: sc raw [h|r|c] d <0A 0B 0C ... hex>");
+    PrintAndLogEx(NORMAL, "       h          :  this help");
+    PrintAndLogEx(NORMAL, "       r          :  do not read response");
+    PrintAndLogEx(NORMAL, "       a          :  active smartcard without select (reset sc module)");
+    PrintAndLogEx(NORMAL, "       s          :  active smartcard with select (get ATR)");
+    PrintAndLogEx(NORMAL, "       t          :  executes TLV decoder if it possible");
+    PrintAndLogEx(NORMAL, "       0          :  use protocol T=0");
+    PrintAndLogEx(NORMAL, "       d <bytes>  :  bytes to send");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "        sc raw s 0 d 00a404000e315041592e5359532e4444463031  - `1PAY.SYS.DDF01` PPSE directory with get ATR");
+    PrintAndLogEx(NORMAL, "        sc raw 0 d 00a404000e325041592e5359532e4444463031    - `2PAY.SYS.DDF01` PPSE directory");
+    PrintAndLogEx(NORMAL, "        sc raw 0 t d 00a4040007a0000000041010              - Mastercard");
+    PrintAndLogEx(NORMAL, "        sc raw 0 t d 00a4040007a0000000031010                - Visa");
 
-	return 0;
+    return 0;
 }
 int usage_sm_reader(void) {
-	PrintAndLogEx(NORMAL, "Usage: sc reader [h|s]");
-	PrintAndLogEx(NORMAL, "       h          :  this help");
-	PrintAndLogEx(NORMAL, "       s          :  silent (no messages)");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        sc reader");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage: sc reader [h|s]");
+    PrintAndLogEx(NORMAL, "       h          :  this help");
+    PrintAndLogEx(NORMAL, "       s          :  silent (no messages)");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "        sc reader");
+    return 0;
 }
 int usage_sm_info(void) {
-	PrintAndLogEx(NORMAL, "Usage: s info [h|s]");
-	PrintAndLogEx(NORMAL, "       h          :  this help");
-	PrintAndLogEx(NORMAL, "       s          :  silent (no messages)");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        sc info");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage: s info [h|s]");
+    PrintAndLogEx(NORMAL, "       h          :  this help");
+    PrintAndLogEx(NORMAL, "       s          :  silent (no messages)");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "        sc info");
+    return 0;
 }
 int usage_sm_upgrade(void) {
-	PrintAndLogEx(NORMAL, "Upgrade firmware");
-	PrintAndLogEx(NORMAL, "Usage:  sc upgrade f <file name>");
-	PrintAndLogEx(NORMAL, "       h               :  this help");
-	PrintAndLogEx(NORMAL, "       f <filename>    :  firmware file name");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        sc upgrade f myfile");
-	return 0;
+    PrintAndLogEx(NORMAL, "Upgrade firmware");
+    PrintAndLogEx(NORMAL, "Usage:  sc upgrade f <file name>");
+    PrintAndLogEx(NORMAL, "       h               :  this help");
+    PrintAndLogEx(NORMAL, "       f <filename>    :  firmware file name");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "        sc upgrade f myfile");
+    return 0;
 }
 int usage_sm_setclock(void) {
-	PrintAndLogEx(NORMAL, "Usage: sc setclock [h] c <clockspeed>");
-	PrintAndLogEx(NORMAL, "       h          :  this help");
-	PrintAndLogEx(NORMAL, "       c <>       :  clockspeed (0 = 16mhz, 1=8mhz, 2=4mhz) ");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        sc setclock c 2");
-	return 0;
+    PrintAndLogEx(NORMAL, "Usage: sc setclock [h] c <clockspeed>");
+    PrintAndLogEx(NORMAL, "       h          :  this help");
+    PrintAndLogEx(NORMAL, "       c <>       :  clockspeed (0 = 16mhz, 1=8mhz, 2=4mhz) ");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "        sc setclock c 2");
+    return 0;
 }
 int usage_sm_brute(void) {
-	PrintAndLogEx(NORMAL, "Tries to bruteforce SFI, using a known list of AID's ");
-	PrintAndLogEx(NORMAL, "Usage: sc brute [h]");
-	PrintAndLogEx(NORMAL, "       h          :  this help");
-	PrintAndLogEx(NORMAL, "       t          :  executes TLV decoder if it possible");
-//	PrintAndLogEx(NORMAL, "       0          :  use protocol T=0");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        sc brute t");
-	return 0;
+    PrintAndLogEx(NORMAL, "Tries to bruteforce SFI, using a known list of AID's ");
+    PrintAndLogEx(NORMAL, "Usage: sc brute [h]");
+    PrintAndLogEx(NORMAL, "       h          :  this help");
+    PrintAndLogEx(NORMAL, "       t          :  executes TLV decoder if it possible");
+//  PrintAndLogEx(NORMAL, "       0          :  use protocol T=0");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "        sc brute t");
+    return 0;
 }
 
 static int smart_loadjson(const char *preferredName, const char *suffix, json_t **root) {
 
-	json_error_t error;
+    json_error_t error;
 
-	if ( preferredName == NULL ) return 1;
-	if ( suffix == NULL ) return 1;
+    if ( preferredName == NULL ) return 1;
+    if ( suffix == NULL ) return 1;
 
-	int retval = 0;
-	int size = sizeof(char) * (strlen(get_my_executable_directory()) + strlen(preferredName) + strlen(suffix) + 10);
-	char * fileName = calloc(size, sizeof(char));
-	sprintf(fileName, "%s%s.%s", get_my_executable_directory(), preferredName, suffix);
-	*root = json_load_file(fileName, 0, &error);
-	if (!*root) {
-		PrintAndLogEx(ERR, "json (%s) error on line %d: %s", fileName, error.line, error.text);
-		retval = 2;
-		goto out;
-	}
+    int retval = 0;
+    int size = sizeof(char) * (strlen(get_my_executable_directory()) + strlen(preferredName) + strlen(suffix) + 10);
+    char * fileName = calloc(size, sizeof(char));
+    sprintf(fileName, "%s%s.%s", get_my_executable_directory(), preferredName, suffix);
+    *root = json_load_file(fileName, 0, &error);
+    if (!*root) {
+        PrintAndLogEx(ERR, "json (%s) error on line %d: %s", fileName, error.line, error.text);
+        retval = 2;
+        goto out;
+    }
 
-	if (!json_is_array(*root)) {
-		PrintAndLogEx(ERR, "Invalid json (%s) format. root must be an array.", fileName);
-		retval = 3;
-		goto out;
-	}
+    if (!json_is_array(*root)) {
+        PrintAndLogEx(ERR, "Invalid json (%s) format. root must be an array.", fileName);
+        retval = 3;
+        goto out;
+    }
 
-	PrintAndLogEx(SUCCESS, "Loaded file (%s) OK.", fileName);
+    PrintAndLogEx(SUCCESS, "Loaded file (%s) OK.", fileName);
 out:
-	free(fileName);
-	return retval;
+    free(fileName);
+    return retval;
 }
 
 uint8_t GetATRTA1(uint8_t *atr, size_t atrlen) {
-	if (atrlen > 2) {
-		uint8_t T0 = atr[1];
-		if (T0 & 0x10)
-			return atr[2];
-	}
+    if (atrlen > 2) {
+        uint8_t T0 = atr[1];
+        if (T0 & 0x10)
+            return atr[2];
+    }
 
-	return 0x11; // default value is ‘0x11’, corresponding to fmax=5 MHz, Fi=372, Di=1.
+    return 0x11; // default value is ‘0x11’, corresponding to fmax=5 MHz, Fi=372, Di=1.
 }
 
 int DiArray[] = {
-	0,  // b0000 RFU
-	1,  // b0001
-	2,
-	4,
-	8,
-	16,
-	32,  // b0110
-	64,  // b0111. This was RFU in ISO/IEC 7816-3:1997 and former. Some card readers or drivers may erroneously reject cards using this value
-	12,
-	20,
-	0,   // b1010 RFU
-	0,
-	0,   // ...
-	0,
-	0,
-	0    // b1111 RFU
+    0,  // b0000 RFU
+    1,  // b0001
+    2,
+    4,
+    8,
+    16,
+    32,  // b0110
+    64,  // b0111. This was RFU in ISO/IEC 7816-3:1997 and former. Some card readers or drivers may erroneously reject cards using this value
+    12,
+    20,
+    0,   // b1010 RFU
+    0,
+    0,   // ...
+    0,
+    0,
+    0    // b1111 RFU
 };
 
 int FiArray[] = {
-	372,    // b0000 Historical note: in ISO/IEC 7816-3:1989, this was assigned to cards with internal clock
-	372,    // b0001
-	558,    // b0010
-	744,    // b0011
-	1116,   // b0100
-	1488,   // b0101
-	1860,   // b0110
-	0,      // b0111 RFU
-	0,      // b1000 RFU
-	512,    // b1001
-	768,    // b1010
-	1024,   // b1011
-	1536,   // b1100
-	2048,   // b1101
-	0,      // b1110 RFU
-	0       // b1111 RFU
+    372,    // b0000 Historical note: in ISO/IEC 7816-3:1989, this was assigned to cards with internal clock
+    372,    // b0001
+    558,    // b0010
+    744,    // b0011
+    1116,   // b0100
+    1488,   // b0101
+    1860,   // b0110
+    0,      // b0111 RFU
+    0,      // b1000 RFU
+    512,    // b1001
+    768,    // b1010
+    1024,   // b1011
+    1536,   // b1100
+    2048,   // b1101
+    0,      // b1110 RFU
+    0       // b1111 RFU
 };
 
 float FArray[] = {
-	4,    // b0000 Historical note: in ISO/IEC 7816-3:1989, this was assigned to cards with internal clock
-	5,    // b0001
-	6,    // b0010
-	8,    // b0011
-	12,   // b0100
-	16,   // b0101
-	20,   // b0110
-	0,    // b0111 RFU
-	0,    // b1000 RFU
-	5,    // b1001
-	7.5,  // b1010
-	10,   // b1011
-	15,   // b1100
-	20,   // b1101
-	0,    // b1110 RFU
-	0     // b1111 RFU
+    4,    // b0000 Historical note: in ISO/IEC 7816-3:1989, this was assigned to cards with internal clock
+    5,    // b0001
+    6,    // b0010
+    8,    // b0011
+    12,   // b0100
+    16,   // b0101
+    20,   // b0110
+    0,    // b0111 RFU
+    0,    // b1000 RFU
+    5,    // b1001
+    7.5,  // b1010
+    10,   // b1011
+    15,   // b1100
+    20,   // b1101
+    0,    // b1110 RFU
+    0     // b1111 RFU
 };
 
 int GetATRDi(uint8_t *atr, size_t atrlen) {
-	uint8_t TA1 = GetATRTA1(atr, atrlen);
-	return DiArray[TA1 & 0x0F];  // The 4 low-order bits of TA1 (4th MSbit to 1st LSbit) encode Di
+    uint8_t TA1 = GetATRTA1(atr, atrlen);
+    return DiArray[TA1 & 0x0F];  // The 4 low-order bits of TA1 (4th MSbit to 1st LSbit) encode Di
 }
 
 int GetATRFi(uint8_t *atr, size_t atrlen) {
-	uint8_t TA1 = GetATRTA1(atr, atrlen);
-	return FiArray[TA1 >> 4];  // The 4 high-order bits of TA1 (8th MSbit to 5th LSbit) encode fmax and Fi
+    uint8_t TA1 = GetATRTA1(atr, atrlen);
+    return FiArray[TA1 >> 4];  // The 4 high-order bits of TA1 (8th MSbit to 5th LSbit) encode fmax and Fi
 }
 
 float GetATRF(uint8_t *atr, size_t atrlen) {
-	uint8_t TA1 = GetATRTA1(atr, atrlen);
-	return FArray[TA1 >> 4];  // The 4 high-order bits of TA1 (8th MSbit to 5th LSbit) encode fmax and Fi
+    uint8_t TA1 = GetATRTA1(atr, atrlen);
+    return FArray[TA1 >> 4];  // The 4 high-order bits of TA1 (8th MSbit to 5th LSbit) encode fmax and Fi
 }
 
 static int PrintATR(uint8_t *atr, size_t atrlen) {
 
-	uint8_t T0 = atr[1];
-	uint8_t K = T0 & 0x0F;
-	uint8_t TD1 = 0, T1len = 0, TD1len = 0, TDilen = 0;
+    uint8_t T0 = atr[1];
+    uint8_t K = T0 & 0x0F;
+    uint8_t TD1 = 0, T1len = 0, TD1len = 0, TDilen = 0;
 
-	if (T0 & 0x10) {
-		PrintAndLog("\t- TA1 (Maximum clock frequency, proposed bit duration) [ 0x%02x ]", atr[2 + T1len]);
-		T1len++;
-	}
+    if (T0 & 0x10) {
+        PrintAndLog("\t- TA1 (Maximum clock frequency, proposed bit duration) [ 0x%02x ]", atr[2 + T1len]);
+        T1len++;
+    }
 
-	if (T0 & 0x20) {
-		PrintAndLog("\t- TB1 (Deprecated: VPP requirements) [ 0x%02x ]", atr[2 + T1len]);
-		T1len++;
-	}
+    if (T0 & 0x20) {
+        PrintAndLog("\t- TB1 (Deprecated: VPP requirements) [ 0x%02x ]", atr[2 + T1len]);
+        T1len++;
+    }
 
-	if (T0 & 0x40) {
-		PrintAndLog("\t- TC1 (Extra delay between bytes required by card) [ 0x%02x ]", atr[2 + T1len]);
-		T1len++;
-	}
+    if (T0 & 0x40) {
+        PrintAndLog("\t- TC1 (Extra delay between bytes required by card) [ 0x%02x ]", atr[2 + T1len]);
+        T1len++;
+    }
 
-	if (T0 & 0x80) {
-		TD1 = atr[2 + T1len];
-		PrintAndLog("\t- TD1 (First offered transmission protocol, presence of TA2..TD2) [ 0x%02x ] Protocol T%d", TD1, TD1 & 0x0f);
-		T1len++;
+    if (T0 & 0x80) {
+        TD1 = atr[2 + T1len];
+        PrintAndLog("\t- TD1 (First offered transmission protocol, presence of TA2..TD2) [ 0x%02x ] Protocol T%d", TD1, TD1 & 0x0f);
+        T1len++;
 
-		if (TD1 & 0x10) {
-			PrintAndLog("\t- TA2 (Specific protocol and parameters to be used after the ATR) [ 0x%02x ]", atr[2 + T1len + TD1len]);
-			TD1len++;
-		}
-		if (TD1 & 0x20) {
-			PrintAndLog("\t- TB2 (Deprecated: VPP precise voltage requirement) [ 0x%02x ]", atr[2 + T1len + TD1len]);
-			TD1len++;
-		}
-		if (TD1 & 0x40) {
-			PrintAndLog("\t- TC2 (Maximum waiting time for protocol T=0) [ 0x%02x ]", atr[2 + T1len + TD1len]);
-			TD1len++;
-		}
-		if (TD1 & 0x80) {
-			uint8_t TDi = atr[2 + T1len + TD1len];
-			PrintAndLog("\t- TD2 (A supported protocol or more global parameters, presence of TA3..TD3) [ 0x%02x ] Protocol T%d", TDi, TDi & 0x0f);
-			TD1len++;
+        if (TD1 & 0x10) {
+            PrintAndLog("\t- TA2 (Specific protocol and parameters to be used after the ATR) [ 0x%02x ]", atr[2 + T1len + TD1len]);
+            TD1len++;
+        }
+        if (TD1 & 0x20) {
+            PrintAndLog("\t- TB2 (Deprecated: VPP precise voltage requirement) [ 0x%02x ]", atr[2 + T1len + TD1len]);
+            TD1len++;
+        }
+        if (TD1 & 0x40) {
+            PrintAndLog("\t- TC2 (Maximum waiting time for protocol T=0) [ 0x%02x ]", atr[2 + T1len + TD1len]);
+            TD1len++;
+        }
+        if (TD1 & 0x80) {
+            uint8_t TDi = atr[2 + T1len + TD1len];
+            PrintAndLog("\t- TD2 (A supported protocol or more global parameters, presence of TA3..TD3) [ 0x%02x ] Protocol T%d", TDi, TDi & 0x0f);
+            TD1len++;
 
-			bool nextCycle = true;
-			uint8_t vi = 3;
-			while (nextCycle) {
-				nextCycle = false;
-				if (TDi & 0x10) {
-					PrintAndLog("\t- TA%d: 0x%02x", vi, atr[2 + T1len + TD1len + TDilen]);
-					TDilen++;
-				}
-				if (TDi & 0x20) {
-					PrintAndLog("\t- TB%d: 0x%02x", vi, atr[2 + T1len + TD1len + TDilen]);
-					TDilen++;
-				}
-				if (TDi & 0x40) {
-					PrintAndLog("\t- TC%d: 0x%02x", vi, atr[2 + T1len + TD1len + TDilen]);
-					TDilen++;
-				}
-				if (TDi & 0x80) {
-					TDi = atr[2 + T1len + TD1len + TDilen];
-					PrintAndLog("\t- TD%d [ 0x%02x ] Protocol T%d", vi, TDi, TDi & 0x0f);
-					TDilen++;
+            bool nextCycle = true;
+            uint8_t vi = 3;
+            while (nextCycle) {
+                nextCycle = false;
+                if (TDi & 0x10) {
+                    PrintAndLog("\t- TA%d: 0x%02x", vi, atr[2 + T1len + TD1len + TDilen]);
+                    TDilen++;
+                }
+                if (TDi & 0x20) {
+                    PrintAndLog("\t- TB%d: 0x%02x", vi, atr[2 + T1len + TD1len + TDilen]);
+                    TDilen++;
+                }
+                if (TDi & 0x40) {
+                    PrintAndLog("\t- TC%d: 0x%02x", vi, atr[2 + T1len + TD1len + TDilen]);
+                    TDilen++;
+                }
+                if (TDi & 0x80) {
+                    TDi = atr[2 + T1len + TD1len + TDilen];
+                    PrintAndLog("\t- TD%d [ 0x%02x ] Protocol T%d", vi, TDi, TDi & 0x0f);
+                    TDilen++;
 
-					nextCycle = true;
-					vi++;
-				}
-			}
-		}
-	}
+                    nextCycle = true;
+                    vi++;
+                }
+            }
+        }
+    }
 
-	uint8_t vxor = 0;
-	for (int i = 1; i < atrlen; i++)
-		vxor ^= atr[i];
+    uint8_t vxor = 0;
+    for (int i = 1; i < atrlen; i++)
+        vxor ^= atr[i];
 
-	if (vxor)
-		PrintAndLogEx(WARNING, "Check summ error. Must be 0 got 0x%02X", vxor);
-	else
-		PrintAndLogEx(INFO, "Check summ OK.");
+    if (vxor)
+        PrintAndLogEx(WARNING, "Check summ error. Must be 0 got 0x%02X", vxor);
+    else
+        PrintAndLogEx(INFO, "Check summ OK.");
 
-	if (atr[0] != 0x3b)
-		PrintAndLogEx(WARNING, "Not a direct convention [ 0x%02x ]", atr[0]);
+    if (atr[0] != 0x3b)
+        PrintAndLogEx(WARNING, "Not a direct convention [ 0x%02x ]", atr[0]);
 
 
-	uint8_t calen = 2 + T1len + TD1len + TDilen + K;
+    uint8_t calen = 2 + T1len + TD1len + TDilen + K;
 
-	if (atrlen != calen && atrlen != calen + 1)  // may be CRC
-		PrintAndLogEx(ERR, "ATR length error. len: %d, T1len: %d, TD1len: %d, TDilen: %d, K: %d", atrlen, T1len, TD1len, TDilen, K);
+    if (atrlen != calen && atrlen != calen + 1)  // may be CRC
+        PrintAndLogEx(ERR, "ATR length error. len: %d, T1len: %d, TD1len: %d, TDilen: %d, K: %d", atrlen, T1len, TD1len, TDilen, K);
 
-	if (K > 0)
-		PrintAndLogEx(INFO, "\nHistorical bytes | len 0x%02d | format %02x", K, atr[2 + T1len + TD1len + TDilen]);
+    if (K > 0)
+        PrintAndLogEx(INFO, "\nHistorical bytes | len 0x%02d | format %02x", K, atr[2 + T1len + TD1len + TDilen]);
 
-	if (K > 1) {
-		PrintAndLogEx(INFO, "\tHistorical bytes");
-		dump_buffer(&atr[2 + T1len + TD1len + TDilen], K, NULL, 1);
-	}
+    if (K > 1) {
+        PrintAndLogEx(INFO, "\tHistorical bytes");
+        dump_buffer(&atr[2 + T1len + TD1len + TDilen], K, NULL, 1);
+    }
 
-	return 0;
+    return 0;
 }
 
 bool smart_select(bool silent, smart_card_atr_t *atr) {
-	if (atr)
-		memset(atr, 0, sizeof(smart_card_atr_t));
+    if (atr)
+        memset(atr, 0, sizeof(smart_card_atr_t));
 
-	UsbCommand c = {CMD_SMART_ATR, {0, 0, 0}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	UsbCommand resp;
-	if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2500) ) {
-		if (!silent) PrintAndLogEx(WARNING, "smart card select failed");
-		return false;
-	}
+    UsbCommand c = {CMD_SMART_ATR, {0, 0, 0}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    UsbCommand resp;
+    if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2500) ) {
+        if (!silent) PrintAndLogEx(WARNING, "smart card select failed");
+        return false;
+    }
 
-	uint8_t isok = resp.arg[0] & 0xFF;
-	if (!isok) {
-		if (!silent) PrintAndLogEx(WARNING, "smart card select failed");
-		return false;
-	}
+    uint8_t isok = resp.arg[0] & 0xFF;
+    if (!isok) {
+        if (!silent) PrintAndLogEx(WARNING, "smart card select failed");
+        return false;
+    }
 
-	smart_card_atr_t card;
-	memcpy(&card, (smart_card_atr_t *)resp.d.asBytes, sizeof(smart_card_atr_t));
+    smart_card_atr_t card;
+    memcpy(&card, (smart_card_atr_t *)resp.d.asBytes, sizeof(smart_card_atr_t));
 
-	if (atr)
-		memcpy(atr, &card, sizeof(smart_card_atr_t));
+    if (atr)
+        memcpy(atr, &card, sizeof(smart_card_atr_t));
 
-	if (!silent)
-		PrintAndLogEx(INFO, "ISO7816-3 ATR : %s", sprint_hex(card.atr, card.atr_len));
+    if (!silent)
+        PrintAndLogEx(INFO, "ISO7816-3 ATR : %s", sprint_hex(card.atr, card.atr_len));
 
-	return true;
+    return true;
 }
 
 static int smart_wait(uint8_t *data, bool silent) {
-	UsbCommand resp;
-	if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
-		if (!silent) PrintAndLogEx(WARNING, "smart card response timeout");
-		return -1;
-	}
+    UsbCommand resp;
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
+        if (!silent) PrintAndLogEx(WARNING, "smart card response timeout");
+        return -1;
+    }
 
-	uint32_t len = resp.arg[0];
-	if ( !len ) {
-		if (!silent) PrintAndLogEx(WARNING, "smart card response failed");
-		return -2;
-	}
-	memcpy(data, resp.d.asBytes, len);
-	if (len >= 2) {
-		if (!silent) PrintAndLogEx(SUCCESS, "%02X%02X | %s", data[len - 2], data[len - 1], GetAPDUCodeDescription(data[len - 2], data[len - 1]));
-	} else {
-		if (!silent) PrintAndLogEx(SUCCESS, " %d | %s", len, sprint_hex_inrow_ex(data,  len, 8));
-	}
+    uint32_t len = resp.arg[0];
+    if ( !len ) {
+        if (!silent) PrintAndLogEx(WARNING, "smart card response failed");
+        return -2;
+    }
+    memcpy(data, resp.d.asBytes, len);
+    if (len >= 2) {
+        if (!silent) PrintAndLogEx(SUCCESS, "%02X%02X | %s", data[len - 2], data[len - 1], GetAPDUCodeDescription(data[len - 2], data[len - 1]));
+    } else {
+        if (!silent) PrintAndLogEx(SUCCESS, " %d | %s", len, sprint_hex_inrow_ex(data,  len, 8));
+    }
 
-	return len;
+    return len;
 }
 
 static int smart_responseEx(uint8_t *data, bool silent) {
 
-	int datalen = smart_wait(data, silent);
-	bool needGetData = false;
+    int datalen = smart_wait(data, silent);
+    bool needGetData = false;
 
-	if (datalen < 2 ) {
-		goto out;
-	}
+    if (datalen < 2 ) {
+        goto out;
+    }
 
-	if ( data[datalen - 2] == 0x61 || data[datalen - 2] == 0x9F ) {
-		needGetData = true;
-	}
+    if ( data[datalen - 2] == 0x61 || data[datalen - 2] == 0x9F ) {
+        needGetData = true;
+    }
 
-	if (needGetData) {
-		int len = data[datalen - 1];
-		if (!silent) PrintAndLogEx(INFO, "Requesting 0x%02X bytes response", len);
-		uint8_t getstatus[] = {0x00, ISO7816_GET_RESPONSE, 0x00, 0x00, len};
-		UsbCommand cStatus = {CMD_SMART_RAW, {SC_RAW, sizeof(getstatus), 0}};
-		memcpy(cStatus.d.asBytes, getstatus, sizeof(getstatus) );
-		clearCommandBuffer();
-		SendCommand(&cStatus);
+    if (needGetData) {
+        int len = data[datalen - 1];
+        if (!silent) PrintAndLogEx(INFO, "Requesting 0x%02X bytes response", len);
+        uint8_t getstatus[] = {0x00, ISO7816_GET_RESPONSE, 0x00, 0x00, len};
+        UsbCommand cStatus = {CMD_SMART_RAW, {SC_RAW, sizeof(getstatus), 0}};
+        memcpy(cStatus.d.asBytes, getstatus, sizeof(getstatus) );
+        clearCommandBuffer();
+        SendCommand(&cStatus);
 
-		datalen = smart_wait(data, silent);
+        datalen = smart_wait(data, silent);
 
-		if (datalen < 2 ) {
-			goto out;
-		}
+        if (datalen < 2 ) {
+            goto out;
+        }
 
-		// data wo ACK
-		if (datalen != len + 2) {
-			// data with ACK
-			if (datalen == len + 2 + 1) { // 2 - response, 1 - ACK
-				if (data[0] != ISO7816_GET_RESPONSE) {
-					if (!silent) {
-						PrintAndLogEx(ERR, "GetResponse ACK error. len 0x%x | data[0] %02X", len, data[0]);
-					}
-					datalen = 0;
-					goto out;
-				}
+        // data wo ACK
+        if (datalen != len + 2) {
+            // data with ACK
+            if (datalen == len + 2 + 1) { // 2 - response, 1 - ACK
+                if (data[0] != ISO7816_GET_RESPONSE) {
+                    if (!silent) {
+                        PrintAndLogEx(ERR, "GetResponse ACK error. len 0x%x | data[0] %02X", len, data[0]);
+                    }
+                    datalen = 0;
+                    goto out;
+                }
 
-				datalen--;
-				memmove(data, &data[1], datalen);
-			} else {
-				// wrong length
-				if (!silent) {
-					PrintAndLogEx(WARNING, "GetResponse wrong length. Must be 0x%02X got 0x%02X", len, datalen - 3);
-				}
-			}
-		}
-	}
+                datalen--;
+                memmove(data, &data[1], datalen);
+            } else {
+                // wrong length
+                if (!silent) {
+                    PrintAndLogEx(WARNING, "GetResponse wrong length. Must be 0x%02X got 0x%02X", len, datalen - 3);
+                }
+            }
+        }
+    }
 
 out:
-	return datalen;
+    return datalen;
 }
 
 static int smart_response(uint8_t *data) {
-	return smart_responseEx(data, false);
+    return smart_responseEx(data, false);
 }
 
 int CmdSmartRaw(const char *Cmd) {
 
-	int hexlen = 0;
+    int hexlen = 0;
     bool active = false;
     bool active_select = false;
     bool useT0 = false;
-	uint8_t cmdp = 0;
-	bool errors = false, reply = true, decodeTLV = false, breakloop = false;
-	uint8_t data[USB_CMD_DATA_SIZE] = {0x00};
+    uint8_t cmdp = 0;
+    bool errors = false, reply = true, decodeTLV = false, breakloop = false;
+    uint8_t data[USB_CMD_DATA_SIZE] = {0x00};
 
-	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch (tolower(param_getchar(Cmd, cmdp))) {
-		case 'h': return usage_sm_raw();
-		case 'r':
-			reply = false;
-			cmdp++;
-			break;
-		case 'a':
-			active = true;
-			cmdp++;
-			break;
-		case 's':
-			active_select = true;
-			cmdp++;
-			break;
-		case 't':
-			decodeTLV = true;
-			cmdp++;
-			break;
-		case '0':
-			useT0 = true;
-			cmdp++;
-			break;
-		case 'd': {
-			switch (param_gethex_to_eol(Cmd, cmdp+1, data, sizeof(data), &hexlen)) {
-			case 1:
-				PrintAndLogEx(WARNING, "Invalid HEX value.");
-				return 1;
-			case 2:
-				PrintAndLogEx(WARNING, "Too many bytes.  Max %d bytes", sizeof(data));
-				return 1;
-			case 3:
-				PrintAndLogEx(WARNING, "Hex must have even number of digits.");
-				return 1;
-			}
-			cmdp++;
-			breakloop = true;
-			break;
-		}
-		default:
-			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-			errors = true;
-			break;
-		}
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+        case 'h': return usage_sm_raw();
+        case 'r':
+            reply = false;
+            cmdp++;
+            break;
+        case 'a':
+            active = true;
+            cmdp++;
+            break;
+        case 's':
+            active_select = true;
+            cmdp++;
+            break;
+        case 't':
+            decodeTLV = true;
+            cmdp++;
+            break;
+        case '0':
+            useT0 = true;
+            cmdp++;
+            break;
+        case 'd': {
+            switch (param_gethex_to_eol(Cmd, cmdp+1, data, sizeof(data), &hexlen)) {
+            case 1:
+                PrintAndLogEx(WARNING, "Invalid HEX value.");
+                return 1;
+            case 2:
+                PrintAndLogEx(WARNING, "Too many bytes.  Max %d bytes", sizeof(data));
+                return 1;
+            case 3:
+                PrintAndLogEx(WARNING, "Hex must have even number of digits.");
+                return 1;
+            }
+            cmdp++;
+            breakloop = true;
+            break;
+        }
+        default:
+            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+            errors = true;
+            break;
+        }
 
-		if ( breakloop )
-			break;
-	}
+        if ( breakloop )
+            break;
+    }
 
-	//Validations
-	if (errors || cmdp == 0 ) return usage_sm_raw();
+    //Validations
+    if (errors || cmdp == 0 ) return usage_sm_raw();
 
-	// arg0 = RFU flags
-	// arg1 = length
-	UsbCommand c = {CMD_SMART_RAW, {0, hexlen, 0}};
+    // arg0 = RFU flags
+    // arg1 = length
+    UsbCommand c = {CMD_SMART_RAW, {0, hexlen, 0}};
 
-	if (active || active_select) {
+    if (active || active_select) {
         c.arg[0] |= SC_CONNECT;
         if (active_select)
             c.arg[0] |= SC_SELECT;
     }
 
-	if (hexlen > 0) {
-		if (useT0)
-			c.arg[0] |= SC_RAW_T0;
-		else
-			c.arg[0] |= SC_RAW;
-	}
+    if (hexlen > 0) {
+        if (useT0)
+            c.arg[0] |= SC_RAW_T0;
+        else
+            c.arg[0] |= SC_RAW;
+    }
 
-	memcpy(c.d.asBytes, data, hexlen );
-	clearCommandBuffer();
-	SendCommand(&c);
+    memcpy(c.d.asBytes, data, hexlen );
+    clearCommandBuffer();
+    SendCommand(&c);
 
-	// reading response from smart card
-	if ( reply ) {
+    // reading response from smart card
+    if ( reply ) {
 
-		uint8_t* buf = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
-		if ( !buf )
-			return 1;
+        uint8_t* buf = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
+        if ( !buf )
+            return 1;
 
-		int len = smart_response(buf);
-		if ( len < 0 ) {
-			free(buf);
-			return 2;
-		}
+        int len = smart_response(buf);
+        if ( len < 0 ) {
+            free(buf);
+            return 2;
+        }
 
-		if ( buf[0] == 0x6C ) {
-			data[4]	= buf[1];
+        if ( buf[0] == 0x6C ) {
+            data[4] = buf[1];
 
-			memcpy(c.d.asBytes, data, sizeof(data) );
-			clearCommandBuffer();
-			SendCommand(&c);
-			len = smart_response(buf);
+            memcpy(c.d.asBytes, data, sizeof(data) );
+            clearCommandBuffer();
+            SendCommand(&c);
+            len = smart_response(buf);
 
-			data[4] = 0;
-		}
+            data[4] = 0;
+        }
 
-		if (decodeTLV && len > 4)
-			TLVPrintFromBuffer(buf, len-2);
+        if (decodeTLV && len > 4)
+            TLVPrintFromBuffer(buf, len-2);
 
-		free(buf);
-	}
-	return 0;
+        free(buf);
+    }
+    return 0;
 }
 
 int ExchangeAPDUSC(uint8_t *datain, int datainlen, bool activateCard, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
-	*dataoutlen = 0;
+    *dataoutlen = 0;
 
-	if (activateCard)
-		smart_select(false, NULL);
+    if (activateCard)
+        smart_select(false, NULL);
 
-	PrintAndLogEx(DEBUG, "APDU SC");
+    PrintAndLogEx(DEBUG, "APDU SC");
 
-	UsbCommand c = {CMD_SMART_RAW, {SC_RAW_T0, datainlen, 0}};
-	if (activateCard) {
-		c.arg[0] |= SC_SELECT | SC_CONNECT;
-	}
-	memcpy(c.d.asBytes, datain, datainlen);
-	clearCommandBuffer();
-	SendCommand(&c);
+    UsbCommand c = {CMD_SMART_RAW, {SC_RAW_T0, datainlen, 0}};
+    if (activateCard) {
+        c.arg[0] |= SC_SELECT | SC_CONNECT;
+    }
+    memcpy(c.d.asBytes, datain, datainlen);
+    clearCommandBuffer();
+    SendCommand(&c);
 
-	int len = smart_responseEx(dataout, true);
+    int len = smart_responseEx(dataout, true);
 
-	if ( len < 0 ) {
-		return 1;
-	}
+    if ( len < 0 ) {
+        return 1;
+    }
 
-	// retry
-	if (len > 1 && dataout[len - 2] == 0x6c && datainlen > 4) {
-		UsbCommand c2 = {CMD_SMART_RAW, {SC_RAW_T0, datainlen, 0}};
-		memcpy(c2.d.asBytes, datain, 5);
+    // retry
+    if (len > 1 && dataout[len - 2] == 0x6c && datainlen > 4) {
+        UsbCommand c2 = {CMD_SMART_RAW, {SC_RAW_T0, datainlen, 0}};
+        memcpy(c2.d.asBytes, datain, 5);
 
-		// transfer length via T=0
-		c2.d.asBytes[4] = dataout[len - 1];
+        // transfer length via T=0
+        c2.d.asBytes[4] = dataout[len - 1];
 
-		clearCommandBuffer();
-		SendCommand(&c2);
+        clearCommandBuffer();
+        SendCommand(&c2);
 
-		len = smart_responseEx(dataout, true);
-	}
+        len = smart_responseEx(dataout, true);
+    }
 
-	*dataoutlen = len;
-	return 0;
+    *dataoutlen = len;
+    return 0;
 }
 
 int CmdSmartUpgrade(const char *Cmd) {
 
-	PrintAndLogEx(WARNING, "WARNING - Smartcard socket firmware upgrade.");
-	PrintAndLogEx(WARNING, "A dangerous command, do wrong and you will brick the smart card socket");
+    PrintAndLogEx(WARNING, "WARNING - Smartcard socket firmware upgrade.");
+    PrintAndLogEx(WARNING, "A dangerous command, do wrong and you will brick the smart card socket");
 
-	FILE *f;
-	char filename[FILE_PATH_SIZE] = {0};
-	uint8_t cmdp = 0;
-	bool errors = false;
+    FILE *f;
+    char filename[FILE_PATH_SIZE] = {0};
+    uint8_t cmdp = 0;
+    bool errors = false;
 
-	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch (tolower(param_getchar(Cmd, cmdp))) {
-		case 'f':
-			//File handling and reading
-			if ( param_getstr(Cmd, cmdp+1, filename, FILE_PATH_SIZE) >= FILE_PATH_SIZE ) {
-				PrintAndLogEx(FAILED, "Filename too long");
-				errors = true;
-				break;
-			}
-			cmdp += 2;
-			break;
-		case 'h':
-			return usage_sm_upgrade();
-		default:
-			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-			errors = true;
-			break;
-		}
-	}
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+        case 'f':
+            //File handling and reading
+            if ( param_getstr(Cmd, cmdp+1, filename, FILE_PATH_SIZE) >= FILE_PATH_SIZE ) {
+                PrintAndLogEx(FAILED, "Filename too long");
+                errors = true;
+                break;
+            }
+            cmdp += 2;
+            break;
+        case 'h':
+            return usage_sm_upgrade();
+        default:
+            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+            errors = true;
+            break;
+        }
+    }
 
-	//Validations
-	if (errors || cmdp == 0 ) return usage_sm_upgrade();
+    //Validations
+    if (errors || cmdp == 0 ) return usage_sm_upgrade();
 
-	// load file
-	f = fopen(filename, "rb");
-	if ( !f ){
-		PrintAndLogEx(FAILED, "File: " _YELLOW_(%s) ": not found or locked.", filename);
-		return 1;
-	}
+    // load file
+    f = fopen(filename, "rb");
+    if ( !f ){
+        PrintAndLogEx(FAILED, "File: " _YELLOW_(%s) ": not found or locked.", filename);
+        return 1;
+    }
 
-	// get filesize in order to malloc memory
-	fseek(f, 0, SEEK_END);
-	long fsize = ftell(f);
-	fseek(f, 0, SEEK_SET);
+    // get filesize in order to malloc memory
+    fseek(f, 0, SEEK_END);
+    long fsize = ftell(f);
+    fseek(f, 0, SEEK_SET);
 
-	if (fsize < 0) 	{
-		PrintAndLogDevice(WARNING, "error, when getting filesize");
-		fclose(f);
-		return 1;
-	}
+    if (fsize < 0) {
+        PrintAndLogDevice(WARNING, "error, when getting filesize");
+        fclose(f);
+        return 1;
+    }
 
-	uint8_t *dump = calloc(fsize, sizeof(uint8_t));
-	if (!dump) {
-		PrintAndLogDevice(WARNING, "error, cannot allocate memory ");
-		fclose(f);
-		return 1;
-	}
+    uint8_t *dump = calloc(fsize, sizeof(uint8_t));
+    if (!dump) {
+        PrintAndLogDevice(WARNING, "error, cannot allocate memory ");
+        fclose(f);
+        return 1;
+    }
 
-	size_t bytes_read = fread(dump, 1, fsize, f);
-	if (f)
-		fclose(f);
+    size_t bytes_read = fread(dump, 1, fsize, f);
+    if (f)
+        fclose(f);
 
-	PrintAndLogEx(SUCCESS, "Smartcard socket firmware uploading to PM3");
-	//Send to device
-	uint32_t index = 0;
-	uint32_t bytes_sent = 0;
-	uint32_t bytes_remaining = bytes_read;
+    PrintAndLogEx(SUCCESS, "Smartcard socket firmware uploading to PM3");
+    //Send to device
+    uint32_t index = 0;
+    uint32_t bytes_sent = 0;
+    uint32_t bytes_remaining = bytes_read;
 
-	while (bytes_remaining > 0){
-		uint32_t bytes_in_packet = MIN(USB_CMD_DATA_SIZE, bytes_remaining);
-		UsbCommand c = {CMD_SMART_UPLOAD, {index + bytes_sent, bytes_in_packet, 0}};
+    while (bytes_remaining > 0){
+        uint32_t bytes_in_packet = MIN(USB_CMD_DATA_SIZE, bytes_remaining);
+        UsbCommand c = {CMD_SMART_UPLOAD, {index + bytes_sent, bytes_in_packet, 0}};
 
-		// Fill usb bytes with 0xFF
-		memset(c.d.asBytes, 0xFF, USB_CMD_DATA_SIZE);
-		memcpy(c.d.asBytes, dump + bytes_sent, bytes_in_packet);
-		clearCommandBuffer();
-		SendCommand(&c);
-		if ( !WaitForResponseTimeout(CMD_ACK, NULL, 2000) ) {
-			PrintAndLogEx(WARNING, "timeout while waiting for reply.");
-			free(dump);
-			return 1;
-		}
+        // Fill usb bytes with 0xFF
+        memset(c.d.asBytes, 0xFF, USB_CMD_DATA_SIZE);
+        memcpy(c.d.asBytes, dump + bytes_sent, bytes_in_packet);
+        clearCommandBuffer();
+        SendCommand(&c);
+        if ( !WaitForResponseTimeout(CMD_ACK, NULL, 2000) ) {
+            PrintAndLogEx(WARNING, "timeout while waiting for reply.");
+            free(dump);
+            return 1;
+        }
 
-		bytes_remaining -= bytes_in_packet;
-		bytes_sent += bytes_in_packet;
-		printf("."); fflush(stdout);
-	}
-	free(dump);
-	printf("\n");
-	PrintAndLogEx(SUCCESS, "Smartcard socket firmware updating,  don\'t turn off your PM3!");
+        bytes_remaining -= bytes_in_packet;
+        bytes_sent += bytes_in_packet;
+        printf("."); fflush(stdout);
+    }
+    free(dump);
+    printf("\n");
+    PrintAndLogEx(SUCCESS, "Smartcard socket firmware updating,  don\'t turn off your PM3!");
 
-	// trigger the firmware upgrade
-	UsbCommand c = {CMD_SMART_UPGRADE, {bytes_read, 0, 0}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	UsbCommand resp;
-	if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2500) ) {
-		PrintAndLogEx(WARNING, "timeout while waiting for reply.");
-		return 1;
-	}
-	if ( (resp.arg[0] & 0xFF ) )
-		PrintAndLogEx(SUCCESS, "Smartcard socket firmware upgraded successful");
-	else
-		PrintAndLogEx(FAILED, "Smartcard socket firmware updating failed");
-	return 0;
+    // trigger the firmware upgrade
+    UsbCommand c = {CMD_SMART_UPGRADE, {bytes_read, 0, 0}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    UsbCommand resp;
+    if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2500) ) {
+        PrintAndLogEx(WARNING, "timeout while waiting for reply.");
+        return 1;
+    }
+    if ( (resp.arg[0] & 0xFF ) )
+        PrintAndLogEx(SUCCESS, "Smartcard socket firmware upgraded successful");
+    else
+        PrintAndLogEx(FAILED, "Smartcard socket firmware updating failed");
+    return 0;
 }
 
 int CmdSmartInfo(const char *Cmd){
-	uint8_t cmdp = 0;
-	bool errors = false, silent = false;
+    uint8_t cmdp = 0;
+    bool errors = false, silent = false;
 
-	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch (tolower(param_getchar(Cmd, cmdp))) {
-		case 'h': return usage_sm_info();
-		case 's':
-			silent = true;
-			break;
-		default:
-			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-			errors = true;
-			break;
-		}
-		cmdp++;
-	}
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+        case 'h': return usage_sm_info();
+        case 's':
+            silent = true;
+            break;
+        default:
+            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+            errors = true;
+            break;
+        }
+        cmdp++;
+    }
 
-	//Validations
-	if (errors ) return usage_sm_info();
+    //Validations
+    if (errors ) return usage_sm_info();
 
-	UsbCommand c = {CMD_SMART_ATR, {0, 0, 0}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	UsbCommand resp;
-	if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2500) ) {
-		if (!silent) PrintAndLogEx(WARNING, "smart card select failed");
-		return 1;
-	}
+    UsbCommand c = {CMD_SMART_ATR, {0, 0, 0}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    UsbCommand resp;
+    if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2500) ) {
+        if (!silent) PrintAndLogEx(WARNING, "smart card select failed");
+        return 1;
+    }
 
-	uint8_t isok = resp.arg[0] & 0xFF;
-	if (!isok) {
-		if (!silent) PrintAndLogEx(WARNING, "smart card select failed");
-		return 1;
-	}
+    uint8_t isok = resp.arg[0] & 0xFF;
+    if (!isok) {
+        if (!silent) PrintAndLogEx(WARNING, "smart card select failed");
+        return 1;
+    }
 
-	smart_card_atr_t card;
-	memcpy(&card, (smart_card_atr_t *)resp.d.asBytes, sizeof(smart_card_atr_t));
+    smart_card_atr_t card;
+    memcpy(&card, (smart_card_atr_t *)resp.d.asBytes, sizeof(smart_card_atr_t));
 
-	// print header
-	PrintAndLogEx(INFO, "--- Smartcard Information ---------");
-	PrintAndLogEx(INFO, "-------------------------------------------------------------");
-	PrintAndLogEx(INFO, "ISO7618-3 ATR : %s", sprint_hex(card.atr, card.atr_len));
-	PrintAndLogEx(INFO, "\nhttp://smartcard-atr.appspot.com/parse?ATR=%s", sprint_hex_inrow(card.atr, card.atr_len) );
+    // print header
+    PrintAndLogEx(INFO, "--- Smartcard Information ---------");
+    PrintAndLogEx(INFO, "-------------------------------------------------------------");
+    PrintAndLogEx(INFO, "ISO7618-3 ATR : %s", sprint_hex(card.atr, card.atr_len));
+    PrintAndLogEx(INFO, "\nhttp://smartcard-atr.appspot.com/parse?ATR=%s", sprint_hex_inrow(card.atr, card.atr_len) );
 
-	// print ATR
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(INFO, "ATR");
-	PrintATR(card.atr, card.atr_len);
+    // print ATR
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(INFO, "ATR");
+    PrintATR(card.atr, card.atr_len);
 
-	// print D/F (brom byte TA1 or defaults)
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(INFO, "D/F (TA1)");
-	int Di = GetATRDi(card.atr, card.atr_len);
-	int Fi = GetATRFi(card.atr, card.atr_len);
-	float F = GetATRF(card.atr, card.atr_len);
-	if (GetATRTA1(card.atr, card.atr_len) == 0x11)
-		PrintAndLogEx(INFO, "Using default values...");
+    // print D/F (brom byte TA1 or defaults)
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(INFO, "D/F (TA1)");
+    int Di = GetATRDi(card.atr, card.atr_len);
+    int Fi = GetATRFi(card.atr, card.atr_len);
+    float F = GetATRF(card.atr, card.atr_len);
+    if (GetATRTA1(card.atr, card.atr_len) == 0x11)
+        PrintAndLogEx(INFO, "Using default values...");
 
-	PrintAndLogEx(NORMAL, "\t- Di %d", Di);
-	PrintAndLogEx(NORMAL, "\t- Fi %d", Fi);
-	PrintAndLogEx(NORMAL, "\t- F  %.1f MHz", F);
+    PrintAndLogEx(NORMAL, "\t- Di %d", Di);
+    PrintAndLogEx(NORMAL, "\t- Fi %d", Fi);
+    PrintAndLogEx(NORMAL, "\t- F  %.1f MHz", F);
 
-	if (Di && Fi) {
-		PrintAndLogEx(NORMAL, "\t- Cycles/ETU %d", Fi/Di);
-		PrintAndLogEx(NORMAL, "\t- %.1f bits/sec at 4MHz", (float)4000000 / (Fi/Di));
-		PrintAndLogEx(NORMAL, "\t- %.1f bits/sec at Fmax (%.1fMHz)", (F * 1000000) / (Fi/Di), F);
-	} else {
-		PrintAndLogEx(WARNING, "\t- Di or Fi is RFU.");
-	};
+    if (Di && Fi) {
+        PrintAndLogEx(NORMAL, "\t- Cycles/ETU %d", Fi/Di);
+        PrintAndLogEx(NORMAL, "\t- %.1f bits/sec at 4MHz", (float)4000000 / (Fi/Di));
+        PrintAndLogEx(NORMAL, "\t- %.1f bits/sec at Fmax (%.1fMHz)", (F * 1000000) / (Fi/Di), F);
+    } else {
+        PrintAndLogEx(WARNING, "\t- Di or Fi is RFU.");
+    };
 
-	return 0;
+    return 0;
 }
 
 int CmdSmartReader(const char *Cmd){
-	uint8_t cmdp = 0;
-	bool errors = false, silent = false;
+    uint8_t cmdp = 0;
+    bool errors = false, silent = false;
 
-	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch (tolower(param_getchar(Cmd, cmdp))) {
-		case 'h': return usage_sm_reader();
-		case 's':
-			silent = true;
-			break;
-		default:
-			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-			errors = true;
-			break;
-		}
-		cmdp++;
-	}
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+        case 'h': return usage_sm_reader();
+        case 's':
+            silent = true;
+            break;
+        default:
+            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+            errors = true;
+            break;
+        }
+        cmdp++;
+    }
 
-	//Validations
-	if (errors ) return usage_sm_reader();
+    //Validations
+    if (errors ) return usage_sm_reader();
 
-	UsbCommand c = {CMD_SMART_ATR, {0, 0, 0}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	UsbCommand resp;
-	if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2500) ) {
-		if (!silent) PrintAndLogEx(WARNING, "smart card select failed");
-		return 1;
-	}
+    UsbCommand c = {CMD_SMART_ATR, {0, 0, 0}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    UsbCommand resp;
+    if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2500) ) {
+        if (!silent) PrintAndLogEx(WARNING, "smart card select failed");
+        return 1;
+    }
 
-	uint8_t isok = resp.arg[0] & 0xFF;
-	if (!isok) {
-		if (!silent) PrintAndLogEx(WARNING, "smart card select failed");
-		return 1;
-	}
-	smart_card_atr_t card;
-	memcpy(&card, (smart_card_atr_t *)resp.d.asBytes, sizeof(smart_card_atr_t));
+    uint8_t isok = resp.arg[0] & 0xFF;
+    if (!isok) {
+        if (!silent) PrintAndLogEx(WARNING, "smart card select failed");
+        return 1;
+    }
+    smart_card_atr_t card;
+    memcpy(&card, (smart_card_atr_t *)resp.d.asBytes, sizeof(smart_card_atr_t));
 
-	PrintAndLogEx(INFO, "ISO7816-3 ATR : %s", sprint_hex(card.atr, card.atr_len));
-	return 0;
+    PrintAndLogEx(INFO, "ISO7816-3 ATR : %s", sprint_hex(card.atr, card.atr_len));
+    return 0;
 }
 
 int CmdSmartSetClock(const char *Cmd){
-	uint8_t cmdp = 0;
-	bool errors = false;
-	uint8_t clock = 0;
-	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch (tolower(param_getchar(Cmd, cmdp))) {
-		case 'h': return usage_sm_setclock();
-		case 'c':
-			clock = param_get8ex(Cmd, cmdp+1, 2, 10);
-			if ( clock > 2)
-				errors = true;
+    uint8_t cmdp = 0;
+    bool errors = false;
+    uint8_t clock = 0;
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+        case 'h': return usage_sm_setclock();
+        case 'c':
+            clock = param_get8ex(Cmd, cmdp+1, 2, 10);
+            if ( clock > 2)
+                errors = true;
 
-			cmdp += 2;
-			break;
-		default:
-			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-			errors = true;
-			break;
-		}
-	}
+            cmdp += 2;
+            break;
+        default:
+            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+            errors = true;
+            break;
+        }
+    }
 
-	//Validations
-	if (errors || cmdp == 0) return usage_sm_setclock();
+    //Validations
+    if (errors || cmdp == 0) return usage_sm_setclock();
 
-	UsbCommand c = {CMD_SMART_SETCLOCK, {clock, 0, 0}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	UsbCommand resp;
-	if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2500) ) {
-		PrintAndLogEx(WARNING, "smart card select failed");
-		return 1;
-	}
+    UsbCommand c = {CMD_SMART_SETCLOCK, {clock, 0, 0}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    UsbCommand resp;
+    if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2500) ) {
+        PrintAndLogEx(WARNING, "smart card select failed");
+        return 1;
+    }
 
-	uint8_t isok = resp.arg[0] & 0xFF;
-	if (!isok) {
-		PrintAndLogEx(WARNING, "smart card set clock failed");
-		return 1;
-	}
+    uint8_t isok = resp.arg[0] & 0xFF;
+    if (!isok) {
+        PrintAndLogEx(WARNING, "smart card set clock failed");
+        return 1;
+    }
 
-	switch (clock) {
-		case 0:
-			PrintAndLogEx(SUCCESS, "Clock changed to 16mhz giving 10800 baudrate");
-			break;
-		case 1:
-			PrintAndLogEx(SUCCESS, "Clock changed to 8mhz giving 21600 baudrate");
-			break;
-		case 2:
-			PrintAndLogEx(SUCCESS, "Clock changed to 4mhz giving 86400 baudrate");
-			break;
-		default:
-			break;
-	}
-	return 0;
+    switch (clock) {
+        case 0:
+            PrintAndLogEx(SUCCESS, "Clock changed to 16mhz giving 10800 baudrate");
+            break;
+        case 1:
+            PrintAndLogEx(SUCCESS, "Clock changed to 8mhz giving 21600 baudrate");
+            break;
+        case 2:
+            PrintAndLogEx(SUCCESS, "Clock changed to 4mhz giving 86400 baudrate");
+            break;
+        default:
+            break;
+    }
+    return 0;
 }
 
 int CmdSmartList(const char *Cmd) {
-	CmdTraceList("7816");
-	return 0;
+    CmdTraceList("7816");
+    return 0;
 }
 
 static void smart_brute_prim(){
 
-	uint8_t* buf = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
-	if ( !buf )
-		return;
+    uint8_t* buf = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
+    if ( !buf )
+        return;
 
-	int len = 0;
-	uint8_t get_card_data[] = {
-		0x80, 0xCA, 0x9F, 0x13, 0x00,
-		0x80, 0xCA, 0x9F, 0x17, 0x00,
-		0x80, 0xCA,	0x9F, 0x36, 0x00,
-		0x80, 0xCA, 0x9F, 0x4f, 0x00
-	};
+    int len = 0;
+    uint8_t get_card_data[] = {
+        0x80, 0xCA, 0x9F, 0x13, 0x00,
+        0x80, 0xCA, 0x9F, 0x17, 0x00,
+        0x80, 0xCA, 0x9F, 0x36, 0x00,
+        0x80, 0xCA, 0x9F, 0x4f, 0x00
+    };
 
-	UsbCommand c = {CMD_SMART_RAW, {SC_RAW_T0, 5, 0}};
+    UsbCommand c = {CMD_SMART_RAW, {SC_RAW_T0, 5, 0}};
 
-	PrintAndLogEx(INFO, "Reading primitives");
+    PrintAndLogEx(INFO, "Reading primitives");
 
-	for (int i = 0; i < sizeof(get_card_data); i += 5) {
+    for (int i = 0; i < sizeof(get_card_data); i += 5) {
 
-		memcpy(c.d.asBytes, get_card_data+i, 5 );
-		clearCommandBuffer();
-		SendCommand(&c);
+        memcpy(c.d.asBytes, get_card_data+i, 5 );
+        clearCommandBuffer();
+        SendCommand(&c);
 
-		len = smart_responseEx(buf, true);
+        len = smart_responseEx(buf, true);
 
-		if ( len > 2 ) {
+        if ( len > 2 ) {
 
-			//if ( decodeTLV ) {
-				//if (!TLVPrintFromBuffer(buf, len-2)) {
-					PrintAndLogEx(SUCCESS, "\tHEX  %d |: %s", len, sprint_hex(buf, len));
-				//}
-			//}
-		}
-		len = 0;
-	}
-	free(buf);
+            //if ( decodeTLV ) {
+                //if (!TLVPrintFromBuffer(buf, len-2)) {
+                    PrintAndLogEx(SUCCESS, "\tHEX  %d |: %s", len, sprint_hex(buf, len));
+                //}
+            //}
+        }
+        len = 0;
+    }
+    free(buf);
 }
 
 static int smart_brute_sfi(bool decodeTLV){
 
-	uint8_t* buf = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
-	if ( !buf )
-		return 1;
+    uint8_t* buf = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
+    if ( !buf )
+        return 1;
 
-	int len = 0;
-	// READ RECORD
-	uint8_t READ_RECORD[] = {0x00, 0xB2, 0x00, 0x00, 0x00};
-	UsbCommand c = {CMD_SMART_RAW, {SC_RAW_T0, sizeof(READ_RECORD), 0}};
+    int len = 0;
+    // READ RECORD
+    uint8_t READ_RECORD[] = {0x00, 0xB2, 0x00, 0x00, 0x00};
+    UsbCommand c = {CMD_SMART_RAW, {SC_RAW_T0, sizeof(READ_RECORD), 0}};
 
-	PrintAndLogEx(INFO, "Start SFI brute forcing");
+    PrintAndLogEx(INFO, "Start SFI brute forcing");
 
-	for (uint8_t sfi=1; sfi <= 31; sfi++) {
+    for (uint8_t sfi=1; sfi <= 31; sfi++) {
 
-		printf("."); fflush(stdout);
+        printf("."); fflush(stdout);
 
-		for (uint16_t rec=1; rec <= 255; rec++) {
+        for (uint16_t rec=1; rec <= 255; rec++) {
 
-			if (ukbhit()) {
-				int gc = getchar();	(void)gc;
-				PrintAndLogEx(WARNING, "\naborted via keyboard!\n");
-				free(buf);
-				return 1;
-			}
+            if (ukbhit()) {
+                int gc = getchar(); (void)gc;
+                PrintAndLogEx(WARNING, "\naborted via keyboard!\n");
+                free(buf);
+                return 1;
+            }
 
-			READ_RECORD[2] = rec;
-			READ_RECORD[3] = (sfi << 3) | 4;
+            READ_RECORD[2] = rec;
+            READ_RECORD[3] = (sfi << 3) | 4;
 
-			memcpy(c.d.asBytes, READ_RECORD, sizeof(READ_RECORD) );
-			clearCommandBuffer();
-			SendCommand(&c);
+            memcpy(c.d.asBytes, READ_RECORD, sizeof(READ_RECORD) );
+            clearCommandBuffer();
+            SendCommand(&c);
 
-			len = smart_responseEx(buf, true);
+            len = smart_responseEx(buf, true);
 
-			if ( buf[0] == 0x6C ) {
-				READ_RECORD[4]	= buf[1];
+            if ( buf[0] == 0x6C ) {
+                READ_RECORD[4] = buf[1];
 
-				memcpy(c.d.asBytes, READ_RECORD, sizeof(READ_RECORD) );
-				clearCommandBuffer();
-				SendCommand(&c);
-				len = smart_responseEx(buf, true);
+                memcpy(c.d.asBytes, READ_RECORD, sizeof(READ_RECORD) );
+                clearCommandBuffer();
+                SendCommand(&c);
+                len = smart_responseEx(buf, true);
 
-				READ_RECORD[4] = 0;
-			}
+                READ_RECORD[4] = 0;
+            }
 
-			if ( len > 4 ) {
+            if ( len > 4 ) {
 
-				PrintAndLogEx(SUCCESS, "\n\t file %02d, record %02d found", sfi, rec);
+                PrintAndLogEx(SUCCESS, "\n\t file %02d, record %02d found", sfi, rec);
 
-				uint8_t modifier = (buf[0] == 0xC0) ? 1 : 0;
+                uint8_t modifier = (buf[0] == 0xC0) ? 1 : 0;
 
-				if ( decodeTLV ) {
-					if (!TLVPrintFromBuffer(buf + modifier, len-2-modifier)) {
-						PrintAndLogEx(SUCCESS, "\tHEX: %s", sprint_hex(buf, len));
-					}
-				}
-			}
-			memset(buf, 0x00, USB_CMD_DATA_SIZE);
-		}
-	}
-	free(buf);
-	return 0;
+                if ( decodeTLV ) {
+                    if (!TLVPrintFromBuffer(buf + modifier, len-2-modifier)) {
+                        PrintAndLogEx(SUCCESS, "\tHEX: %s", sprint_hex(buf, len));
+                    }
+                }
+            }
+            memset(buf, 0x00, USB_CMD_DATA_SIZE);
+        }
+    }
+    free(buf);
+    return 0;
 }
 
 static void smart_brute_options(bool decodeTLV) {
 
-	uint8_t* buf = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
-	if ( !buf )
-		return;
+    uint8_t* buf = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
+    if ( !buf )
+        return;
 
-	uint8_t GET_PROCESSING_OPTIONS[] = {0x80, 0xA8, 0x00, 0x00, 0x02, 0x83, 0x00, 0x00};
+    uint8_t GET_PROCESSING_OPTIONS[] = {0x80, 0xA8, 0x00, 0x00, 0x02, 0x83, 0x00, 0x00};
 
-	// Get processing options command
-	UsbCommand c = {CMD_SMART_RAW, {SC_RAW_T0, sizeof(GET_PROCESSING_OPTIONS), 0}};
-	memcpy(c.d.asBytes, GET_PROCESSING_OPTIONS, sizeof(GET_PROCESSING_OPTIONS) );
-	clearCommandBuffer();
-	SendCommand(&c);
+    // Get processing options command
+    UsbCommand c = {CMD_SMART_RAW, {SC_RAW_T0, sizeof(GET_PROCESSING_OPTIONS), 0}};
+    memcpy(c.d.asBytes, GET_PROCESSING_OPTIONS, sizeof(GET_PROCESSING_OPTIONS) );
+    clearCommandBuffer();
+    SendCommand(&c);
 
-	int len = smart_responseEx(buf, true);
-	if ( len > 4 ) {
-		PrintAndLogEx(SUCCESS, "Got processing options");
-		if ( decodeTLV ) {
-			TLVPrintFromBuffer(buf, len-2);
-		}
-	} else {
-		PrintAndLogEx(FAILED, "Getting processing options failed");
-	}
+    int len = smart_responseEx(buf, true);
+    if ( len > 4 ) {
+        PrintAndLogEx(SUCCESS, "Got processing options");
+        if ( decodeTLV ) {
+            TLVPrintFromBuffer(buf, len-2);
+        }
+    } else {
+        PrintAndLogEx(FAILED, "Getting processing options failed");
+    }
 
-	free(buf);
+    free(buf);
 }
 
 int CmdSmartBruteforceSFI(const char *Cmd) {
 
-	uint8_t cmdp = 0;
-	bool errors = false, decodeTLV = false; //, useT0 = false;
+    uint8_t cmdp = 0;
+    bool errors = false, decodeTLV = false; //, useT0 = false;
 
-	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-		switch (tolower(param_getchar(Cmd, cmdp))) {
-		case 'h': return usage_sm_brute();
-		case 't':
-			decodeTLV = true;
-			cmdp++;
-			break;
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+        case 'h': return usage_sm_brute();
+        case 't':
+            decodeTLV = true;
+            cmdp++;
+            break;
 /*
-		case '0':
-			useT0 = true;
-			cmdp++;
-			break;
+        case '0':
+            useT0 = true;
+            cmdp++;
+            break;
 */
-		default:
-			PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-			errors = true;
-			break;
-		}
-	}
+        default:
+            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+            errors = true;
+            break;
+        }
+    }
 
-	//Validations
-	if (errors) return usage_sm_brute();
+    //Validations
+    if (errors) return usage_sm_brute();
 
-	const char *SELECT = "00a40400%02x%s";
+    const char *SELECT = "00a40400%02x%s";
 
-//	uint8_t GENERATE_AC[] = {0x80, 0xAE};
-//	uint8_t GET_CHALLENGE[] = {0x00, 0x84, 0x00};
-//	uint8_t GET_DATA[] = {0x80, 0xCA, 0x00, 0x00, 0x00};
-//	uint8_t SELECT[] = {0x00, 0xA4, 0x04, 0x00};
-//	uint8_t UNBLOCK_PIN[] = {0x84, 0x24, 0x00, 0x00, 0x00};
-//	uint8_t VERIFY[] = {0x00, 0x20, 0x00, 0x80};
+//  uint8_t GENERATE_AC[] = {0x80, 0xAE};
+//  uint8_t GET_CHALLENGE[] = {0x00, 0x84, 0x00};
+//  uint8_t GET_DATA[] = {0x80, 0xCA, 0x00, 0x00, 0x00};
+//  uint8_t SELECT[] = {0x00, 0xA4, 0x04, 0x00};
+//  uint8_t UNBLOCK_PIN[] = {0x84, 0x24, 0x00, 0x00, 0x00};
+//  uint8_t VERIFY[] = {0x00, 0x20, 0x00, 0x80};
 
-	// Select AID command
-	UsbCommand cAid = {CMD_SMART_RAW, {SC_RAW_T0, 0, 0}};
+    // Select AID command
+    UsbCommand cAid = {CMD_SMART_RAW, {SC_RAW_T0, 0, 0}};
 
-	PrintAndLogEx(INFO, "Importing AID list");
-	json_t *root = NULL;
-	smart_loadjson("aidlist", "json", &root);
+    PrintAndLogEx(INFO, "Importing AID list");
+    json_t *root = NULL;
+    smart_loadjson("aidlist", "json", &root);
 
-	uint8_t* buf = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
-	if ( !buf )
-		return 1;
+    uint8_t* buf = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
+    if ( !buf )
+        return 1;
 
-	PrintAndLogEx(INFO, "Selecting card");
-	if ( !smart_select(false, NULL) ) {
-		free(buf);
-		return 1;
-	}
+    PrintAndLogEx(INFO, "Selecting card");
+    if ( !smart_select(false, NULL) ) {
+        free(buf);
+        return 1;
+    }
 
-	char* caid = NULL;
+    char* caid = NULL;
 
-	for (int i = 0; i < json_array_size(root); i++) {
+    for (int i = 0; i < json_array_size(root); i++) {
 
-		printf("+"); fflush(stdout);
+        printf("+"); fflush(stdout);
 
-		if (caid)
-			free(caid);
+        if (caid)
+            free(caid);
 
-		json_t *data, *jaid;
+        json_t *data, *jaid;
 
-		data = json_array_get(root, i);
-		if (!json_is_object(data)) {
-			PrintAndLogEx(ERR, "data %d is not an object\n", i + 1);
-			json_decref(root);
-			return 1;
-		}
+        data = json_array_get(root, i);
+        if (!json_is_object(data)) {
+            PrintAndLogEx(ERR, "data %d is not an object\n", i + 1);
+            json_decref(root);
+            return 1;
+        }
 
-		jaid = json_object_get(data, "AID");
-		if (!json_is_string(jaid)) {
-			PrintAndLogEx(ERR, "AID data [%d] is not a string", i + 1);
-			json_decref(root);
-			return 1;
-		}
+        jaid = json_object_get(data, "AID");
+        if (!json_is_string(jaid)) {
+            PrintAndLogEx(ERR, "AID data [%d] is not a string", i + 1);
+            json_decref(root);
+            return 1;
+        }
 
-		const char* aid = json_string_value(jaid);
-		if ( !aid )
-			continue;
+        const char* aid = json_string_value(jaid);
+        if ( !aid )
+            continue;
 
-		size_t aidlen = strlen(aid);
-		caid = calloc( 8+2+aidlen+1, sizeof(uint8_t));
-		snprintf(caid, 8+2+aidlen+1, SELECT, aidlen >> 1, aid);
+        size_t aidlen = strlen(aid);
+        caid = calloc( 8+2+aidlen+1, sizeof(uint8_t));
+        snprintf(caid, 8+2+aidlen+1, SELECT, aidlen >> 1, aid);
 
-		int hexlen = 0;
-		int res = param_gethex_to_eol(caid, 0, cAid.d.asBytes, sizeof(cAid.d.asBytes), &hexlen);
-		if ( res )
-			continue;
+        int hexlen = 0;
+        int res = param_gethex_to_eol(caid, 0, cAid.d.asBytes, sizeof(cAid.d.asBytes), &hexlen);
+        if ( res )
+            continue;
 
-		cAid.arg[1] = hexlen;
+        cAid.arg[1] = hexlen;
 
-		clearCommandBuffer();
-		SendCommand(&cAid);
+        clearCommandBuffer();
+        SendCommand(&cAid);
 
-		int len = smart_responseEx(buf, true);
-		if ( len < 3 )
-			continue;
+        int len = smart_responseEx(buf, true);
+        if ( len < 3 )
+            continue;
 
-		json_t *jvendor, *jname;
-		jvendor = json_object_get(data, "Vendor");
-		if (!json_is_string(jvendor)) {
-			PrintAndLogEx(ERR, "Vendor data [%d] is not a string", i + 1);
-			continue;
-		}
+        json_t *jvendor, *jname;
+        jvendor = json_object_get(data, "Vendor");
+        if (!json_is_string(jvendor)) {
+            PrintAndLogEx(ERR, "Vendor data [%d] is not a string", i + 1);
+            continue;
+        }
 
-		const char* vendor = json_string_value(jvendor);
-		if ( !vendor )
-			continue;
+        const char* vendor = json_string_value(jvendor);
+        if ( !vendor )
+            continue;
 
-		jname = json_object_get(data, "Name");
-		if (!json_is_string(jname)) {
-			PrintAndLogEx(ERR, "Name data [%d] is not a string", i + 1);
-			continue;
-		}
-		const char* name = json_string_value(jname);
-		if ( !name )
-			continue;
+        jname = json_object_get(data, "Name");
+        if (!json_is_string(jname)) {
+            PrintAndLogEx(ERR, "Name data [%d] is not a string", i + 1);
+            continue;
+        }
+        const char* name = json_string_value(jname);
+        if ( !name )
+            continue;
 
-		PrintAndLogEx(SUCCESS, "\nAID %s | %s | %s", aid, vendor, name);
+        PrintAndLogEx(SUCCESS, "\nAID %s | %s | %s", aid, vendor, name);
 
-		smart_brute_options(decodeTLV);
+        smart_brute_options(decodeTLV);
 
-		smart_brute_prim();
+        smart_brute_prim();
 
-		smart_brute_sfi(decodeTLV);
+        smart_brute_sfi(decodeTLV);
 
-		PrintAndLogEx(SUCCESS, "\nSFI brute force done\n");
-	}
+        PrintAndLogEx(SUCCESS, "\nSFI brute force done\n");
+    }
 
-	if (caid)
-		free(caid);
+    if (caid)
+        free(caid);
 
-	free(buf);
-	json_decref(root);
+    free(buf);
+    json_decref(root);
 
-	PrintAndLogEx(SUCCESS, "\nSearch completed.");
-	return 0;
+    PrintAndLogEx(SUCCESS, "\nSearch completed.");
+    return 0;
 }
 
 static command_t CommandTable[] = {
-	{"help",	CmdHelp,            1, "This help"},
-	{"list",	CmdSmartList,       0, "List ISO 7816 history"},
-	{"info",	CmdSmartInfo,		1, "Tag information"},
-	{"reader",	CmdSmartReader,		1, "Act like an IS07816 reader"},
-	{"raw",		CmdSmartRaw,		1, "Send raw hex data to tag"},
-	{"upgrade",	CmdSmartUpgrade,	1, "Upgrade firmware"},
-	{"setclock", CmdSmartSetClock,	1, "Set clock speed"},
-	{"brute", 	CmdSmartBruteforceSFI, 1, "Bruteforce SFI"},
-	{NULL, NULL, 0, NULL}
+    {"help",    CmdHelp,               1, "This help"},
+    {"list",    CmdSmartList,          0, "List ISO 7816 history"},
+    {"info",    CmdSmartInfo,          1, "Tag information"},
+    {"reader",  CmdSmartReader,        1, "Act like an IS07816 reader"},
+    {"raw",     CmdSmartRaw,           1, "Send raw hex data to tag"},
+    {"upgrade", CmdSmartUpgrade,       1, "Upgrade firmware"},
+    {"setclock",CmdSmartSetClock,      1, "Set clock speed"},
+    {"brute",   CmdSmartBruteforceSFI, 1, "Bruteforce SFI"},
+    {NULL, NULL, 0, NULL}
 };
 
 int CmdSmartcard(const char *Cmd) {
-	clearCommandBuffer();
-	CmdsParse(CommandTable, Cmd);
-	return 0;
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
+    return 0;
 }
 
 int CmdHelp(const char *Cmd) {
-	CmdsHelp(CommandTable);
-	return 0;
+    CmdsHelp(CommandTable);
+    return 0;
 }
diff --git a/client/cmdsmartcard.h b/client/cmdsmartcard.h
index 00bc41ff4..f7c3bed5a 100644
--- a/client/cmdsmartcard.h
+++ b/client/cmdsmartcard.h
@@ -20,11 +20,11 @@
 #include "cmdparser.h"
 #include "common.h"
 #include "util.h"
-#include "loclass/fileutils.h"	// saveFile
-#include "comms.h"				// getfromdevice
-#include "emv/emvcore.h"		// decodeTVL
-#include "emv/apduinfo.h"		// APDUcode description
-#include "emv/dump.h"			// dump_buffer
+#include "loclass/fileutils.h"  // saveFile
+#include "comms.h"              // getfromdevice
+#include "emv/emvcore.h"        // decodeTVL
+#include "emv/apduinfo.h"       // APDUcode description
+#include "emv/dump.h"           // dump_buffer
 
 extern int CmdSmartcard(const char *Cmd);
 
diff --git a/client/cmdtrace.c b/client/cmdtrace.c
index a93195635..86fa07169 100644
--- a/client/cmdtrace.c
+++ b/client/cmdtrace.c
@@ -16,611 +16,611 @@ static uint8_t *trace;
 long traceLen = 0;
 
 int usage_trace_list(){
-	PrintAndLogEx(NORMAL, "List protocol data in trace buffer.");
-	PrintAndLogEx(NORMAL, "Usage:  trace list <protocol> [f][c| <0|1>");
-	PrintAndLogEx(NORMAL, "    f      - show frame delay times as well");
-	PrintAndLogEx(NORMAL, "    c      - mark CRC bytes");
-	PrintAndLogEx(NORMAL, "    <0|1>  - use data from Tracebuffer, if not set, try reading data from tag.");
-	PrintAndLogEx(NORMAL, "Supported <protocol> values:");
-	PrintAndLogEx(NORMAL, "    raw    - just show raw data without annotations");
-	PrintAndLogEx(NORMAL, "    14a    - interpret data as iso14443a communications");
-	PrintAndLogEx(NORMAL, "    mf     - interpret data as iso14443a communications and decrypt crypto1 stream");
-	PrintAndLogEx(NORMAL, "    14b    - interpret data as iso14443b communications");
-	PrintAndLogEx(NORMAL, "    15     - interpret data as iso15693 communications");
-	PrintAndLogEx(NORMAL, "    des    - interpret data as DESFire communications");
+    PrintAndLogEx(NORMAL, "List protocol data in trace buffer.");
+    PrintAndLogEx(NORMAL, "Usage:  trace list <protocol> [f][c| <0|1>");
+    PrintAndLogEx(NORMAL, "    f      - show frame delay times as well");
+    PrintAndLogEx(NORMAL, "    c      - mark CRC bytes");
+    PrintAndLogEx(NORMAL, "    <0|1>  - use data from Tracebuffer, if not set, try reading data from tag.");
+    PrintAndLogEx(NORMAL, "Supported <protocol> values:");
+    PrintAndLogEx(NORMAL, "    raw    - just show raw data without annotations");
+    PrintAndLogEx(NORMAL, "    14a    - interpret data as iso14443a communications");
+    PrintAndLogEx(NORMAL, "    mf     - interpret data as iso14443a communications and decrypt crypto1 stream");
+    PrintAndLogEx(NORMAL, "    14b    - interpret data as iso14443b communications");
+    PrintAndLogEx(NORMAL, "    15     - interpret data as iso15693 communications");
+    PrintAndLogEx(NORMAL, "    des    - interpret data as DESFire communications");
 #ifdef WITH_EMV
-	PrintAndLogEx(NORMAL, "    emv    - interpret data as EMV / communications");
+    PrintAndLogEx(NORMAL, "    emv    - interpret data as EMV / communications");
 #endif
-	PrintAndLogEx(NORMAL, "    iclass - interpret data as iclass communications");
-	PrintAndLogEx(NORMAL, "    topaz  - interpret data as topaz communications");
-	PrintAndLogEx(NORMAL, "    7816   - interpret data as iso7816-4 communications");
-	PrintAndLogEx(NORMAL, "    legic  - interpret data as LEGIC communications");
-	PrintAndLogEx(NORMAL, "    felica - interpret data as ISO18092 / FeliCa communications");
-	PrintAndLogEx(NORMAL, "");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        trace list 14a f");
-	PrintAndLogEx(NORMAL, "        trace list iclass");
-	return 0;
+    PrintAndLogEx(NORMAL, "    iclass - interpret data as iclass communications");
+    PrintAndLogEx(NORMAL, "    topaz  - interpret data as topaz communications");
+    PrintAndLogEx(NORMAL, "    7816   - interpret data as iso7816-4 communications");
+    PrintAndLogEx(NORMAL, "    legic  - interpret data as LEGIC communications");
+    PrintAndLogEx(NORMAL, "    felica - interpret data as ISO18092 / FeliCa communications");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "        trace list 14a f");
+    PrintAndLogEx(NORMAL, "        trace list iclass");
+    return 0;
 }
 int usage_trace_load(){
-	PrintAndLogEx(NORMAL, "Load protocol data from file to trace buffer.");
-	PrintAndLogEx(NORMAL, "Usage:  trace load <filename>");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        trace load mytracefile.bin");
-	return 0;
+    PrintAndLogEx(NORMAL, "Load protocol data from file to trace buffer.");
+    PrintAndLogEx(NORMAL, "Usage:  trace load <filename>");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "        trace load mytracefile.bin");
+    return 0;
 }
 int usage_trace_save(){
-	PrintAndLogEx(NORMAL, "Save protocol data from trace buffer to file.");
-	PrintAndLogEx(NORMAL, "Usage:  trace save <filename>");
-	PrintAndLogEx(NORMAL, "Examples:");
-	PrintAndLogEx(NORMAL, "        trace save mytracefile.bin");
-	return 0;
+    PrintAndLogEx(NORMAL, "Save protocol data from trace buffer to file.");
+    PrintAndLogEx(NORMAL, "Usage:  trace save <filename>");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "        trace save mytracefile.bin");
+    return 0;
 }
 
 bool is_last_record(uint16_t tracepos, uint8_t *trace, uint16_t traceLen) {
-	return(tracepos + sizeof(uint32_t) + sizeof(uint16_t) + sizeof(uint16_t) >= traceLen);
+    return(tracepos + sizeof(uint32_t) + sizeof(uint16_t) + sizeof(uint16_t) >= traceLen);
 }
 
 bool next_record_is_response(uint16_t tracepos, uint8_t *trace) {
-	uint16_t next_records_datalen = *((uint16_t *)(trace + tracepos + sizeof(uint32_t) + sizeof(uint16_t)));
-	return(next_records_datalen & 0x8000);
+    uint16_t next_records_datalen = *((uint16_t *)(trace + tracepos + sizeof(uint32_t) + sizeof(uint16_t)));
+    return(next_records_datalen & 0x8000);
 }
 
 bool merge_topaz_reader_frames(uint32_t timestamp, uint32_t *duration, uint16_t *tracepos, uint16_t traceLen,
-								uint8_t *trace, uint8_t *frame, uint8_t *topaz_reader_command, uint16_t *data_len) {
+                                uint8_t *trace, uint8_t *frame, uint8_t *topaz_reader_command, uint16_t *data_len) {
 
-#define MAX_TOPAZ_READER_CMD_LEN	16
+#define MAX_TOPAZ_READER_CMD_LEN 16
 
-	uint32_t last_timestamp = timestamp + *duration;
+    uint32_t last_timestamp = timestamp + *duration;
 
-	if ((*data_len != 1) || (frame[0] == TOPAZ_WUPA) || (frame[0] == TOPAZ_REQA)) return false;
+    if ((*data_len != 1) || (frame[0] == TOPAZ_WUPA) || (frame[0] == TOPAZ_REQA)) return false;
 
-	memcpy(topaz_reader_command, frame, *data_len);
+    memcpy(topaz_reader_command, frame, *data_len);
 
-	while (!is_last_record(*tracepos, trace, traceLen) && !next_record_is_response(*tracepos, trace)) {
-		uint32_t next_timestamp = *((uint32_t *)(trace + *tracepos));
-		*tracepos += sizeof(uint32_t);
-		uint16_t next_duration = *((uint16_t *)(trace + *tracepos));
-		*tracepos += sizeof(uint16_t);
-		uint16_t next_data_len = *((uint16_t *)(trace + *tracepos)) & 0x7FFF;
-		*tracepos += sizeof(uint16_t);
-		uint8_t *next_frame = (trace + *tracepos);
-		*tracepos += next_data_len;
-		if ((next_data_len == 1) && (*data_len + next_data_len <= MAX_TOPAZ_READER_CMD_LEN)) {
-			memcpy(topaz_reader_command + *data_len, next_frame, next_data_len);
-			*data_len += next_data_len;
-			last_timestamp = next_timestamp + next_duration;
-		} else {
-			// rewind and exit
-			*tracepos = *tracepos - next_data_len - sizeof(uint16_t) - sizeof(uint16_t) - sizeof(uint32_t);
-			break;
-		}
-		uint16_t next_parity_len = (next_data_len-1)/8 + 1;
-		*tracepos += next_parity_len;
-	}
+    while (!is_last_record(*tracepos, trace, traceLen) && !next_record_is_response(*tracepos, trace)) {
+        uint32_t next_timestamp = *((uint32_t *)(trace + *tracepos));
+        *tracepos += sizeof(uint32_t);
+        uint16_t next_duration = *((uint16_t *)(trace + *tracepos));
+        *tracepos += sizeof(uint16_t);
+        uint16_t next_data_len = *((uint16_t *)(trace + *tracepos)) & 0x7FFF;
+        *tracepos += sizeof(uint16_t);
+        uint8_t *next_frame = (trace + *tracepos);
+        *tracepos += next_data_len;
+        if ((next_data_len == 1) && (*data_len + next_data_len <= MAX_TOPAZ_READER_CMD_LEN)) {
+            memcpy(topaz_reader_command + *data_len, next_frame, next_data_len);
+            *data_len += next_data_len;
+            last_timestamp = next_timestamp + next_duration;
+        } else {
+            // rewind and exit
+            *tracepos = *tracepos - next_data_len - sizeof(uint16_t) - sizeof(uint16_t) - sizeof(uint32_t);
+            break;
+        }
+        uint16_t next_parity_len = (next_data_len-1)/8 + 1;
+        *tracepos += next_parity_len;
+    }
 
-	*duration = last_timestamp - timestamp;
+    *duration = last_timestamp - timestamp;
 
-	return true;
+    return true;
 }
 
 uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, uint8_t protocol, bool showWaitCycles, bool markCRCBytes) {
-	// sanity check
-	if (tracepos + sizeof(uint32_t) + sizeof(uint16_t) + sizeof(uint16_t) > traceLen) return traceLen;
+    // sanity check
+    if (tracepos + sizeof(uint32_t) + sizeof(uint16_t) + sizeof(uint16_t) > traceLen) return traceLen;
 
-	bool isResponse;
-	uint16_t data_len, parity_len;
-	uint32_t duration, timestamp, first_timestamp, EndOfTransmissionTimestamp;
-	uint8_t topaz_reader_command[9];
-	char explanation[30] = {0};
-	uint8_t mfData[32] = {0};
-	size_t mfDataLen = 0;
+    bool isResponse;
+    uint16_t data_len, parity_len;
+    uint32_t duration, timestamp, first_timestamp, EndOfTransmissionTimestamp;
+    uint8_t topaz_reader_command[9];
+    char explanation[30] = {0};
+    uint8_t mfData[32] = {0};
+    size_t mfDataLen = 0;
 
 
-	first_timestamp = *((uint32_t *)(trace));
-	timestamp = *((uint32_t *)(trace + tracepos));
-	tracepos += 4;
+    first_timestamp = *((uint32_t *)(trace));
+    timestamp = *((uint32_t *)(trace + tracepos));
+    tracepos += 4;
 
-	duration = *((uint16_t *)(trace + tracepos));
-	tracepos += 2;
+    duration = *((uint16_t *)(trace + tracepos));
+    tracepos += 2;
 
-	data_len = *((uint16_t *)(trace + tracepos));
-	tracepos += 2;
+    data_len = *((uint16_t *)(trace + tracepos));
+    tracepos += 2;
 
-	if (data_len & 0x8000) {
-		data_len &= 0x7fff;
-		isResponse = true;
-	} else {
-		isResponse = false;
-	}
-	parity_len = (data_len-1)/8 + 1;
+    if (data_len & 0x8000) {
+        data_len &= 0x7fff;
+        isResponse = true;
+    } else {
+        isResponse = false;
+    }
+    parity_len = (data_len-1)/8 + 1;
 
-	if (tracepos + data_len + parity_len > traceLen) {
-		return traceLen;
-	}
-	uint8_t *frame = trace + tracepos;
-	tracepos += data_len;
-	uint8_t *parityBytes = trace + tracepos;
-	tracepos += parity_len;
+    if (tracepos + data_len + parity_len > traceLen) {
+        return traceLen;
+    }
+    uint8_t *frame = trace + tracepos;
+    tracepos += data_len;
+    uint8_t *parityBytes = trace + tracepos;
+    tracepos += parity_len;
 
-	if (protocol == TOPAZ && !isResponse) {
-		// topaz reader commands come in 1 or 9 separate frames with 7 or 8 Bits each.
-		// merge them:
-		if (merge_topaz_reader_frames(timestamp, &duration, &tracepos, traceLen, trace, frame, topaz_reader_command, &data_len)) {
-			frame = topaz_reader_command;
-		}
-	}
+    if (protocol == TOPAZ && !isResponse) {
+        // topaz reader commands come in 1 or 9 separate frames with 7 or 8 Bits each.
+        // merge them:
+        if (merge_topaz_reader_frames(timestamp, &duration, &tracepos, traceLen, trace, frame, topaz_reader_command, &data_len)) {
+            frame = topaz_reader_command;
+        }
+    }
 
-	//Check the CRC status
-	uint8_t crcStatus = 2;
+    //Check the CRC status
+    uint8_t crcStatus = 2;
 
-	if (data_len > 2) {
-		switch (protocol) {
-			case ICLASS:
-				crcStatus = iclass_CRC_check(isResponse, frame, data_len);
-				break;
-			case ISO_14443B:
-			case TOPAZ:
-			case FELICA:
-				crcStatus = iso14443B_CRC_check(frame, data_len);
-				break;
-			case PROTO_MIFARE:
-				crcStatus = mifare_CRC_check(isResponse, frame, data_len);
-				break;
-			case ISO_14443A:
-			case MFDES:
-				crcStatus = iso14443A_CRC_check(isResponse, frame, data_len);
-				break;
-			case ISO_15693:
-				crcStatus = iso15693_CRC_check(frame, data_len);
-				break;
-			case ISO_7816_4:
-			default:
-				break;
-		}
-	}
-	//0 CRC-command, CRC not ok
-	//1 CRC-command, CRC ok
-	//2 Not crc-command
+    if (data_len > 2) {
+        switch (protocol) {
+            case ICLASS:
+                crcStatus = iclass_CRC_check(isResponse, frame, data_len);
+                break;
+            case ISO_14443B:
+            case TOPAZ:
+            case FELICA:
+                crcStatus = iso14443B_CRC_check(frame, data_len);
+                break;
+            case PROTO_MIFARE:
+                crcStatus = mifare_CRC_check(isResponse, frame, data_len);
+                break;
+            case ISO_14443A:
+            case MFDES:
+                crcStatus = iso14443A_CRC_check(isResponse, frame, data_len);
+                break;
+            case ISO_15693:
+                crcStatus = iso15693_CRC_check(frame, data_len);
+                break;
+            case ISO_7816_4:
+            default:
+                break;
+        }
+    }
+    //0 CRC-command, CRC not ok
+    //1 CRC-command, CRC ok
+    //2 Not crc-command
 
-	//--- Draw the data column
-	char line[18][110];
+    //--- Draw the data column
+    char line[18][110];
 
-	for (int j = 0; j < data_len && j/18 < 18; j++) {
+    for (int j = 0; j < data_len && j/18 < 18; j++) {
 
-		uint8_t parityBits = parityBytes[j >> 3];
-		if (protocol != LEGIC &&
-			protocol != ISO_14443B &&
-			protocol != ISO_7816_4 &&
-			(isResponse || protocol == ISO_14443A) &&
-			(oddparity8(frame[j]) != ((parityBits >> (7-(j&0x0007))) & 0x01))) {
+        uint8_t parityBits = parityBytes[j >> 3];
+        if (protocol != LEGIC &&
+            protocol != ISO_14443B &&
+            protocol != ISO_7816_4 &&
+            (isResponse || protocol == ISO_14443A) &&
+            (oddparity8(frame[j]) != ((parityBits >> (7-(j&0x0007))) & 0x01))) {
 
-			snprintf(line[j/18]+(( j % 18) * 4),110, "%02x! ", frame[j]);
-		} else {
-			snprintf(line[j/18]+(( j % 18) * 4),110, "%02x  ", frame[j]);
-		}
+            snprintf(line[j/18]+(( j % 18) * 4),110, "%02x! ", frame[j]);
+        } else {
+            snprintf(line[j/18]+(( j % 18) * 4),110, "%02x  ", frame[j]);
+        }
 
-	}
+    }
 
-	if (markCRCBytes) {
-		//CRC-command
-		if(crcStatus == 0 || crcStatus == 1) {
-			char *pos1 = line[(data_len-2)/18]+(((data_len-2) % 18) * 4);
-			(*pos1) = '[';
-			char *pos2 = line[(data_len)/18]+(((data_len) % 18) * 4);
-			sprintf(pos2, "%c", ']');
-		}
-	}
+    if (markCRCBytes) {
+        //CRC-command
+        if(crcStatus == 0 || crcStatus == 1) {
+            char *pos1 = line[(data_len-2)/18]+(((data_len-2) % 18) * 4);
+            (*pos1) = '[';
+            char *pos2 = line[(data_len)/18]+(((data_len) % 18) * 4);
+            sprintf(pos2, "%c", ']');
+        }
+    }
 
-	if (data_len == 0 ) {
-		sprintf(line[0],"<empty trace - possible error>");
-		return tracepos;
-	}
+    if (data_len == 0 ) {
+        sprintf(line[0],"<empty trace - possible error>");
+        return tracepos;
+    }
 
-	// Draw the CRC column
-	char *crc = (crcStatus == 0 ? "!crc" : (crcStatus == 1 ? " ok " : "    "));
+    // Draw the CRC column
+    char *crc = (crcStatus == 0 ? "!crc" : (crcStatus == 1 ? " ok " : "    "));
 
-	EndOfTransmissionTimestamp = timestamp + duration;
+    EndOfTransmissionTimestamp = timestamp + duration;
 
-	// Always annotate LEGIC read/tag
-	if ( protocol == LEGIC )
-		annotateLegic(explanation, sizeof(explanation), frame, data_len);
+    // Always annotate LEGIC read/tag
+    if ( protocol == LEGIC )
+        annotateLegic(explanation, sizeof(explanation), frame, data_len);
 
-	if ( protocol == PROTO_MIFARE )
-		annotateMifare(explanation, sizeof(explanation), frame, data_len, parityBytes, parity_len, isResponse);
+    if ( protocol == PROTO_MIFARE )
+        annotateMifare(explanation, sizeof(explanation), frame, data_len, parityBytes, parity_len, isResponse);
 
-	if (!isResponse)	{
-		switch(protocol) {
-			case ICLASS:		annotateIclass(explanation,sizeof(explanation),frame,data_len); break;
-			case ISO_14443A:	annotateIso14443a(explanation,sizeof(explanation),frame,data_len); break;
-			case MFDES:			annotateMfDesfire(explanation,sizeof(explanation),frame,data_len); break;
-			case ISO_14443B:	annotateIso14443b(explanation,sizeof(explanation),frame,data_len); break;
-			case TOPAZ:			annotateTopaz(explanation,sizeof(explanation),frame,data_len); break;
-			case ISO_7816_4:	annotateIso7816(explanation,sizeof(explanation),frame,data_len); break;
-			case ISO_15693:		annotateIso15693(explanation,sizeof(explanation),frame,data_len); break;
-			case FELICA:		annotateFelica(explanation,sizeof(explanation),frame,data_len); break;
-			default:			break;
-		}
-	}
+    if (!isResponse) {
+        switch(protocol) {
+            case ICLASS:        annotateIclass(explanation,sizeof(explanation),frame,data_len); break;
+            case ISO_14443A:    annotateIso14443a(explanation,sizeof(explanation),frame,data_len); break;
+            case MFDES:         annotateMfDesfire(explanation,sizeof(explanation),frame,data_len); break;
+            case ISO_14443B:    annotateIso14443b(explanation,sizeof(explanation),frame,data_len); break;
+            case TOPAZ:         annotateTopaz(explanation,sizeof(explanation),frame,data_len); break;
+            case ISO_7816_4:    annotateIso7816(explanation,sizeof(explanation),frame,data_len); break;
+            case ISO_15693:     annotateIso15693(explanation,sizeof(explanation),frame,data_len); break;
+            case FELICA:        annotateFelica(explanation,sizeof(explanation),frame,data_len); break;
+            default:            break;
+        }
+    }
 
-	int num_lines = MIN((data_len - 1)/18 + 1, 18);
-	for (int j = 0; j < num_lines ; j++) {
-		if (j == 0) {
-			PrintAndLogEx(NORMAL, " %10u | %10u | %s |%-72s | %s| %s",
-				(timestamp - first_timestamp),
-				(EndOfTransmissionTimestamp - first_timestamp),
-				(isResponse ? "Tag" : "Rdr"),
-				line[j],
-				(j == num_lines-1) ? crc : "    ",
-				(j == num_lines-1) ? explanation : "");
-		} else {
-			PrintAndLogEx(NORMAL, "            |            |     |%-72s | %s| %s",
-				line[j],
-				(j == num_lines-1) ? crc : "    ",
-				(j == num_lines-1) ? explanation : "");
-		}
-	}
+    int num_lines = MIN((data_len - 1)/18 + 1, 18);
+    for (int j = 0; j < num_lines ; j++) {
+        if (j == 0) {
+            PrintAndLogEx(NORMAL, " %10u | %10u | %s |%-72s | %s| %s",
+                (timestamp - first_timestamp),
+                (EndOfTransmissionTimestamp - first_timestamp),
+                (isResponse ? "Tag" : "Rdr"),
+                line[j],
+                (j == num_lines-1) ? crc : "    ",
+                (j == num_lines-1) ? explanation : "");
+        } else {
+            PrintAndLogEx(NORMAL, "            |            |     |%-72s | %s| %s",
+                line[j],
+                (j == num_lines-1) ? crc : "    ",
+                (j == num_lines-1) ? explanation : "");
+        }
+    }
 
-	if (DecodeMifareData(frame, data_len, parityBytes, isResponse, mfData, &mfDataLen)) {
-		memset(explanation, 0x00, sizeof(explanation));
-		if (!isResponse) {
-			annotateIso14443a(explanation, sizeof(explanation), mfData, mfDataLen);
-		}
-		uint8_t crcc = iso14443A_CRC_check(isResponse, mfData, mfDataLen);
-		PrintAndLogEx(NORMAL, "            |            |  *  |%-72s | %-4s| %s",
-			sprint_hex_inrow_spaces(mfData, mfDataLen, 2),
-			(crcc == 0 ? "!crc" : (crcc == 1 ? " ok " : "    ")),
-			explanation);
-	};
+    if (DecodeMifareData(frame, data_len, parityBytes, isResponse, mfData, &mfDataLen)) {
+        memset(explanation, 0x00, sizeof(explanation));
+        if (!isResponse) {
+            annotateIso14443a(explanation, sizeof(explanation), mfData, mfDataLen);
+        }
+        uint8_t crcc = iso14443A_CRC_check(isResponse, mfData, mfDataLen);
+        PrintAndLogEx(NORMAL, "            |            |  *  |%-72s | %-4s| %s",
+            sprint_hex_inrow_spaces(mfData, mfDataLen, 2),
+            (crcc == 0 ? "!crc" : (crcc == 1 ? " ok " : "    ")),
+            explanation);
+    };
 
-	if (is_last_record(tracepos, trace, traceLen)) return traceLen;
+    if (is_last_record(tracepos, trace, traceLen)) return traceLen;
 
-	if (showWaitCycles && !isResponse && next_record_is_response(tracepos, trace)) {
-		uint32_t next_timestamp = *((uint32_t *)(trace + tracepos));
-			PrintAndLogEx(NORMAL, " %10u | %10u | %s |fdt (Frame Delay Time): %d",
-				(EndOfTransmissionTimestamp - first_timestamp),
-				(next_timestamp - first_timestamp),
-				"   ",
-				(next_timestamp - EndOfTransmissionTimestamp));
-		}
+    if (showWaitCycles && !isResponse && next_record_is_response(tracepos, trace)) {
+        uint32_t next_timestamp = *((uint32_t *)(trace + tracepos));
+            PrintAndLogEx(NORMAL, " %10u | %10u | %s |fdt (Frame Delay Time): %d",
+                (EndOfTransmissionTimestamp - first_timestamp),
+                (next_timestamp - first_timestamp),
+                "   ",
+                (next_timestamp - EndOfTransmissionTimestamp));
+        }
 
-	return tracepos;
+    return tracepos;
 }
 
 void printFelica(uint16_t traceLen, uint8_t *trace) {
 
-	PrintAndLogEx(NORMAL, "ISO18092 / FeliCa - Timings are not as accurate");
-	PrintAndLogEx(NORMAL, "    Gap | Src | Data                            | CRC      | Annotation        |");
-	PrintAndLogEx(NORMAL, "--------|-----|---------------------------------|----------|-------------------|");
+    PrintAndLogEx(NORMAL, "ISO18092 / FeliCa - Timings are not as accurate");
+    PrintAndLogEx(NORMAL, "    Gap | Src | Data                            | CRC      | Annotation        |");
+    PrintAndLogEx(NORMAL, "--------|-----|---------------------------------|----------|-------------------|");
     uint16_t tracepos = 0;
 
     while( tracepos < traceLen) {
 
-		if (tracepos + 3 >= traceLen) break;
+        if (tracepos + 3 >= traceLen) break;
 
 
-		uint16_t gap = *((uint16_t *)(trace + tracepos));
-		uint8_t crc_ok = trace[tracepos+2];
-		tracepos += 3;
+        uint16_t gap = *((uint16_t *)(trace + tracepos));
+        uint8_t crc_ok = trace[tracepos+2];
+        tracepos += 3;
 
-		if (tracepos + 3 >= traceLen) break;
+        if (tracepos + 3 >= traceLen) break;
 
-		uint16_t len = trace[tracepos+2];
+        uint16_t len = trace[tracepos+2];
 
-		//I am stripping SYNC
-		tracepos += 3; //skip SYNC
+        //I am stripping SYNC
+        tracepos += 3; //skip SYNC
 
-		if( tracepos + len + 1 >= traceLen) break;
+        if( tracepos + len + 1 >= traceLen) break;
 
-		uint8_t cmd = trace[tracepos];
-		uint8_t isResponse = cmd&1;
+        uint8_t cmd = trace[tracepos];
+        uint8_t isResponse = cmd&1;
 
-		char line[32][110];
-		for (int j = 0; j < len+1 && j/8 < 32; j++) {
-			snprintf(line[j/8]+(( j % 8) * 4), 110, " %02x ", trace[tracepos+j]);
-		}
-		char expbuf[50];
-		switch(cmd) {
-			case FELICA_POLL_REQ: snprintf(expbuf,49,"Poll Req");break;
-			case FELICA_POLL_ACK: snprintf(expbuf,49,"Poll Resp");break;
+        char line[32][110];
+        for (int j = 0; j < len+1 && j/8 < 32; j++) {
+            snprintf(line[j/8]+(( j % 8) * 4), 110, " %02x ", trace[tracepos+j]);
+        }
+        char expbuf[50];
+        switch(cmd) {
+            case FELICA_POLL_REQ: snprintf(expbuf,49,"Poll Req");break;
+            case FELICA_POLL_ACK: snprintf(expbuf,49,"Poll Resp");break;
 
-			case FELICA_REQSRV_REQ: snprintf(expbuf,49,"Request Srvc Req");break;
-			case FELICA_REQSRV_ACK: snprintf(expbuf,49,"Request Srv Resp");break;
+            case FELICA_REQSRV_REQ: snprintf(expbuf,49,"Request Srvc Req");break;
+            case FELICA_REQSRV_ACK: snprintf(expbuf,49,"Request Srv Resp");break;
 
-			case FELICA_RDBLK_REQ: snprintf(expbuf,49,"Read block(s) Req");break;
-			case FELICA_RDBLK_ACK: snprintf(expbuf,49,"Read block(s) Resp");break;
+            case FELICA_RDBLK_REQ: snprintf(expbuf,49,"Read block(s) Req");break;
+            case FELICA_RDBLK_ACK: snprintf(expbuf,49,"Read block(s) Resp");break;
 
-			case FELICA_WRTBLK_REQ: snprintf(expbuf,49,"Write block(s) Req");break;
-			case FELICA_WRTBLK_ACK: snprintf(expbuf,49,"Write block(s) Resp");break;
-			case FELICA_SRCHSYSCODE_REQ: snprintf(expbuf,49,"Search syscode Req");break;
-			case FELICA_SRCHSYSCODE_ACK: snprintf(expbuf,49,"Search syscode Resp");break;
+            case FELICA_WRTBLK_REQ: snprintf(expbuf,49,"Write block(s) Req");break;
+            case FELICA_WRTBLK_ACK: snprintf(expbuf,49,"Write block(s) Resp");break;
+            case FELICA_SRCHSYSCODE_REQ: snprintf(expbuf,49,"Search syscode Req");break;
+            case FELICA_SRCHSYSCODE_ACK: snprintf(expbuf,49,"Search syscode Resp");break;
 
-			case FELICA_REQSYSCODE_REQ: snprintf(expbuf,49,"Request syscode Req");break;
-			case FELICA_REQSYSCODE_ACK: snprintf(expbuf,49,"Request syscode Resp");break;
+            case FELICA_REQSYSCODE_REQ: snprintf(expbuf,49,"Request syscode Req");break;
+            case FELICA_REQSYSCODE_ACK: snprintf(expbuf,49,"Request syscode Resp");break;
 
-			case FELICA_AUTH1_REQ: snprintf(expbuf,49,"Auth1 Req");break;
-			case FELICA_AUTH1_ACK: snprintf(expbuf,49,"Auth1 Resp");break;
+            case FELICA_AUTH1_REQ: snprintf(expbuf,49,"Auth1 Req");break;
+            case FELICA_AUTH1_ACK: snprintf(expbuf,49,"Auth1 Resp");break;
 
-			case FELICA_AUTH2_REQ: snprintf(expbuf,49,"Auth2 Req");break;
-			case FELICA_AUTH2_ACK: snprintf(expbuf,49,"Auth2 Resp");break;
+            case FELICA_AUTH2_REQ: snprintf(expbuf,49,"Auth2 Req");break;
+            case FELICA_AUTH2_ACK: snprintf(expbuf,49,"Auth2 Resp");break;
 
-			case FELICA_RDSEC_REQ: snprintf(expbuf,49,"Secure read Req");break;
-			case FELICA_RDSEC_ACK: snprintf(expbuf,49,"Secure read Resp");break;
+            case FELICA_RDSEC_REQ: snprintf(expbuf,49,"Secure read Req");break;
+            case FELICA_RDSEC_ACK: snprintf(expbuf,49,"Secure read Resp");break;
 
-			case FELICA_WRTSEC_REQ: snprintf(expbuf,49,"Secure write Req");break;
-			case FELICA_WRTSEC_ACK: snprintf(expbuf,49,"Secure write Resp");break;
+            case FELICA_WRTSEC_REQ: snprintf(expbuf,49,"Secure write Req");break;
+            case FELICA_WRTSEC_ACK: snprintf(expbuf,49,"Secure write Resp");break;
 
-			case FELICA_REQSRV2_REQ: snprintf(expbuf,49,"Request Srvc v2 Req");break;
-			case FELICA_REQSRV2_ACK: snprintf(expbuf,49,"Request Srvc v2 Resp");break;
+            case FELICA_REQSRV2_REQ: snprintf(expbuf,49,"Request Srvc v2 Req");break;
+            case FELICA_REQSRV2_ACK: snprintf(expbuf,49,"Request Srvc v2 Resp");break;
 
-			case FELICA_GETSTATUS_REQ: snprintf(expbuf,49,"Get status Req");break;
-			case FELICA_GETSTATUS_ACK: snprintf(expbuf,49,"Get status Resp");break;
+            case FELICA_GETSTATUS_REQ: snprintf(expbuf,49,"Get status Req");break;
+            case FELICA_GETSTATUS_ACK: snprintf(expbuf,49,"Get status Resp");break;
 
-			case FELICA_OSVER_REQ: snprintf(expbuf,49,"Get OS Version Req");break;
-			case FELICA_OSVER_ACK: snprintf(expbuf,49,"Get OS Version Resp");break;
+            case FELICA_OSVER_REQ: snprintf(expbuf,49,"Get OS Version Req");break;
+            case FELICA_OSVER_ACK: snprintf(expbuf,49,"Get OS Version Resp");break;
 
-			case FELICA_RESET_MODE_REQ: snprintf(expbuf,49,"Reset mode Req");break;
-			case FELICA_RESET_MODE_ACK: snprintf(expbuf,49,"Reset mode Resp");break;
+            case FELICA_RESET_MODE_REQ: snprintf(expbuf,49,"Reset mode Req");break;
+            case FELICA_RESET_MODE_ACK: snprintf(expbuf,49,"Reset mode Resp");break;
 
-			case FELICA_AUTH1V2_REQ: snprintf(expbuf,49,"Auth1 v2 Req");break;
-			case FELICA_AUTH1V2_ACK: snprintf(expbuf,49,"Auth1 v2 Resp");break;
+            case FELICA_AUTH1V2_REQ: snprintf(expbuf,49,"Auth1 v2 Req");break;
+            case FELICA_AUTH1V2_ACK: snprintf(expbuf,49,"Auth1 v2 Resp");break;
 
-			case FELICA_AUTH2V2_REQ: snprintf(expbuf,49,"Auth2 v2 Req");break;
-			case FELICA_AUTH2V2_ACK: snprintf(expbuf,49,"Auth2 v2 Resp");break;
+            case FELICA_AUTH2V2_REQ: snprintf(expbuf,49,"Auth2 v2 Req");break;
+            case FELICA_AUTH2V2_ACK: snprintf(expbuf,49,"Auth2 v2 Resp");break;
 
-			case FELICA_RDSECV2_REQ: snprintf(expbuf,49,"Secure read v2 Req");break;
-			case FELICA_RDSECV2_ACK: snprintf(expbuf,49,"Secure read v2 Resp");break;
-			case FELICA_WRTSECV2_REQ: snprintf(expbuf,49,"Secure write v2 Req");break;
-			case FELICA_WRTSECV2_ACK: snprintf(expbuf,49,"Secure write v2 Resp");break;
+            case FELICA_RDSECV2_REQ: snprintf(expbuf,49,"Secure read v2 Req");break;
+            case FELICA_RDSECV2_ACK: snprintf(expbuf,49,"Secure read v2 Resp");break;
+            case FELICA_WRTSECV2_REQ: snprintf(expbuf,49,"Secure write v2 Req");break;
+            case FELICA_WRTSECV2_ACK: snprintf(expbuf,49,"Secure write v2 Resp");break;
 
-			case FELICA_UPDATE_RNDID_REQ: snprintf(expbuf,49,"Update IDr Req");break;
-			case FELICA_UPDATE_RNDID_ACK: snprintf(expbuf,49,"Update IDr Resp");break;
-			default: snprintf(expbuf,49,"Unknown");break;
-		}
+            case FELICA_UPDATE_RNDID_REQ: snprintf(expbuf,49,"Update IDr Req");break;
+            case FELICA_UPDATE_RNDID_ACK: snprintf(expbuf,49,"Update IDr Resp");break;
+            default: snprintf(expbuf,49,"Unknown");break;
+        }
 
-		int num_lines = MIN((len )/16 + 1, 16);
-		for (int j = 0; j < num_lines ; j++) {
-			if (j == 0) {
-				PrintAndLogEx(NORMAL, "%7d | %s |%-32s |%02x %02x %s| %s",
-					gap,
-					(isResponse ? "Tag" : "Rdr"),
-					line[j],
-					trace[tracepos+len],
-					trace[tracepos+len+1],
-					(crc_ok) ? "OK" : "NG",
-					expbuf);
-			} else {
-				PrintAndLogEx(NORMAL, "        |     |%-32s |        |    ", line[j]);
-			}
-		}
-		tracepos += len + 1;
-	}
+        int num_lines = MIN((len )/16 + 1, 16);
+        for (int j = 0; j < num_lines ; j++) {
+            if (j == 0) {
+                PrintAndLogEx(NORMAL, "%7d | %s |%-32s |%02x %02x %s| %s",
+                    gap,
+                    (isResponse ? "Tag" : "Rdr"),
+                    line[j],
+                    trace[tracepos+len],
+                    trace[tracepos+len+1],
+                    (crc_ok) ? "OK" : "NG",
+                    expbuf);
+            } else {
+                PrintAndLogEx(NORMAL, "        |     |%-32s |        |    ", line[j]);
+            }
+        }
+        tracepos += len + 1;
+    }
     PrintAndLogEx(NORMAL, "");
 }
 
 // sanity check. Don't use proxmark if it is offline and you didn't specify useTraceBuffer
 /*
 static int SanityOfflineCheck( bool useTraceBuffer ){
-	if ( !useTraceBuffer && offline) {
-		PrintAndLogEx(NORMAL, "Your proxmark3 device is offline. Specify [1] to use TraceBuffer data instead");
-		return 0;
-	}
-	return 1;
+    if ( !useTraceBuffer && offline) {
+        PrintAndLogEx(NORMAL, "Your proxmark3 device is offline. Specify [1] to use TraceBuffer data instead");
+        return 0;
+    }
+    return 1;
 }
 */
 
 int CmdTraceList(const char *Cmd) {
 
-	clearCommandBuffer();
+    clearCommandBuffer();
 
-	bool showWaitCycles = false;
-	bool markCRCBytes = false;
-	bool isOnline = true;
-	bool errors = false;
-	uint8_t protocol = 0;
-	char type[10] = {0};
+    bool showWaitCycles = false;
+    bool markCRCBytes = false;
+    bool isOnline = true;
+    bool errors = false;
+    uint8_t protocol = 0;
+    char type[10] = {0};
 
-	//int tlen = param_getstr(Cmd,0,type);
-	//char param1 = param_getchar(Cmd, 1);
-	//char param2 = param_getchar(Cmd, 2);
+    //int tlen = param_getstr(Cmd,0,type);
+    //char param1 = param_getchar(Cmd, 1);
+    //char param2 = param_getchar(Cmd, 2);
 
-	char cmdp = 0;
-	while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+    char cmdp = 0;
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
 
-		int slen = param_getstr(Cmd, cmdp, type, sizeof(type) );
-		if ( slen == 1) {
+        int slen = param_getstr(Cmd, cmdp, type, sizeof(type) );
+        if ( slen == 1) {
 
-			switch ( tolower(param_getchar(Cmd, cmdp))) {
-			case 'h':
-				return usage_trace_list();
-			case 'f':
-				showWaitCycles = true;
-				cmdp++;
-				break;
-			case 'c':
-				markCRCBytes = true;
-				cmdp++;
-				break;
-			case '0':
-				isOnline = true;
-				cmdp++;
-				break;
-			case '1':
-				isOnline = false;
-				cmdp++;
-				break;
-			default:
-				PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-				errors = true;
-				break;
-			}
+            switch ( tolower(param_getchar(Cmd, cmdp))) {
+            case 'h':
+                return usage_trace_list();
+            case 'f':
+                showWaitCycles = true;
+                cmdp++;
+                break;
+            case 'c':
+                markCRCBytes = true;
+                cmdp++;
+                break;
+            case '0':
+                isOnline = true;
+                cmdp++;
+                break;
+            case '1':
+                isOnline = false;
+                cmdp++;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                errors = true;
+                break;
+            }
 
-		} else {
+        } else {
 
-			str_lower(type);
+            str_lower(type);
 
-			// validate type of output
-			if (strcmp(type,     "iclass") == 0)	protocol = ICLASS;
-			else if(strcmp(type, "14a") == 0)		protocol = ISO_14443A;
-			else if(strcmp(type, "14b") == 0)		protocol = ISO_14443B;
-			else if(strcmp(type, "topaz") == 0)		protocol = TOPAZ;
-			else if(strcmp(type, "7816") == 0)		protocol = ISO_7816_4;
-			else if(strcmp(type, "des") == 0)		protocol = MFDES;
-			else if(strcmp(type, "legic") == 0)		protocol = LEGIC;
-			else if(strcmp(type, "15") == 0)		protocol = ISO_15693;
-			else if(strcmp(type, "felica") == 0)	protocol = FELICA;
-			else if(strcmp(type, "mf") == 0)		protocol = PROTO_MIFARE;
-			else if(strcmp(type, "raw") == 0)		protocol = -1;//No crc, no annotations
-			else errors = true;
+            // validate type of output
+            if (strcmp(type,     "iclass") == 0)    protocol = ICLASS;
+            else if(strcmp(type, "14a") == 0)       protocol = ISO_14443A;
+            else if(strcmp(type, "14b") == 0)       protocol = ISO_14443B;
+            else if(strcmp(type, "topaz") == 0)     protocol = TOPAZ;
+            else if(strcmp(type, "7816") == 0)      protocol = ISO_7816_4;
+            else if(strcmp(type, "des") == 0)       protocol = MFDES;
+            else if(strcmp(type, "legic") == 0)     protocol = LEGIC;
+            else if(strcmp(type, "15") == 0)        protocol = ISO_15693;
+            else if(strcmp(type, "felica") == 0)    protocol = FELICA;
+            else if(strcmp(type, "mf") == 0)        protocol = PROTO_MIFARE;
+            else if(strcmp(type, "raw") == 0)       protocol = -1;//No crc, no annotations
+            else errors = true;
 
-			cmdp++;
-		}
-	}
+            cmdp++;
+        }
+    }
 
-	//if (!SanityOfflineCheck(isOnline)) return 1;
+    //if (!SanityOfflineCheck(isOnline)) return 1;
 
-	//Validations
-	if (errors) return usage_trace_list();
+    //Validations
+    if (errors) return usage_trace_list();
 
-	uint16_t tracepos = 0;
+    uint16_t tracepos = 0;
 
-	// reserv some space.
-	if (!trace)
-		trace = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
+    // reserv some space.
+    if (!trace)
+        trace = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
 
-	if ( isOnline ) {
-		// Query for the size of the trace,  downloading USB_CMD_DATA_SIZE
-		UsbCommand response;
-		if ( !GetFromDevice(BIG_BUF, trace, USB_CMD_DATA_SIZE, 0, &response, 4000, true)) {
-			PrintAndLogEx(WARNING, "timeout while waiting for reply.");
-			return 1;
-		}
+    if ( isOnline ) {
+        // Query for the size of the trace,  downloading USB_CMD_DATA_SIZE
+        UsbCommand response;
+        if ( !GetFromDevice(BIG_BUF, trace, USB_CMD_DATA_SIZE, 0, &response, 4000, true)) {
+            PrintAndLogEx(WARNING, "timeout while waiting for reply.");
+            return 1;
+        }
 
-		traceLen = response.arg[2];
-		if (traceLen > USB_CMD_DATA_SIZE) {
-			uint8_t *p = realloc(trace, traceLen);
-			if (p == NULL) {
-				PrintAndLogEx(FAILED, "Cannot allocate memory for trace");
-				free(trace);
-				return 2;
-			}
-			trace = p;
-			if ( !GetFromDevice(BIG_BUF, trace, traceLen, 0, NULL, 2500, false)) {
-				PrintAndLogEx(WARNING, "command execution time out");
-				free(trace);
-				return 3;
-			}
-		}
-	}
+        traceLen = response.arg[2];
+        if (traceLen > USB_CMD_DATA_SIZE) {
+            uint8_t *p = realloc(trace, traceLen);
+            if (p == NULL) {
+                PrintAndLogEx(FAILED, "Cannot allocate memory for trace");
+                free(trace);
+                return 2;
+            }
+            trace = p;
+            if ( !GetFromDevice(BIG_BUF, trace, traceLen, 0, NULL, 2500, false)) {
+                PrintAndLogEx(WARNING, "command execution time out");
+                free(trace);
+                return 3;
+            }
+        }
+    }
 
-	PrintAndLogEx(SUCCESS, "Recorded Activity (TraceLen = %d bytes)", traceLen);
-	PrintAndLogEx(INFO, "");
-	if (protocol == FELICA) {
-		printFelica(traceLen, trace);
-	} else {
-		PrintAndLogEx(NORMAL, "Start = Start of Start Bit, End = End of last modulation. Src = Source of Transfer");
-		if ( protocol == ISO_14443A || protocol == PROTO_MIFARE)
-			PrintAndLogEx(NORMAL, "iso14443a - All times are in carrier periods (1/13.56Mhz)");
-		if ( protocol == ICLASS )
-			PrintAndLogEx(NORMAL, "iClass - Timings are not as accurate");
-		if ( protocol == LEGIC )
-			PrintAndLogEx(NORMAL, "LEGIC - Reader Mode: Timings are in ticks (1us == 1.5ticks)\n"
-			                      "        Tag Mode: Timings are in sub carrier periods (1/212 kHz == 4.7us)");
-		if ( protocol == ISO_15693 )
-			PrintAndLogEx(NORMAL, "ISO15693 - Timings are not as accurate");
-		if ( protocol == ISO_7816_4 )
-			PrintAndLogEx(NORMAL, "ISO7816-4 / Smartcard - Timings N/A yet");
+    PrintAndLogEx(SUCCESS, "Recorded Activity (TraceLen = %d bytes)", traceLen);
+    PrintAndLogEx(INFO, "");
+    if (protocol == FELICA) {
+        printFelica(traceLen, trace);
+    } else {
+        PrintAndLogEx(NORMAL, "Start = Start of Start Bit, End = End of last modulation. Src = Source of Transfer");
+        if ( protocol == ISO_14443A || protocol == PROTO_MIFARE)
+            PrintAndLogEx(NORMAL, "iso14443a - All times are in carrier periods (1/13.56Mhz)");
+        if ( protocol == ICLASS )
+            PrintAndLogEx(NORMAL, "iClass - Timings are not as accurate");
+        if ( protocol == LEGIC )
+            PrintAndLogEx(NORMAL, "LEGIC - Reader Mode: Timings are in ticks (1us == 1.5ticks)\n"
+                                  "        Tag Mode: Timings are in sub carrier periods (1/212 kHz == 4.7us)");
+        if ( protocol == ISO_15693 )
+            PrintAndLogEx(NORMAL, "ISO15693 - Timings are not as accurate");
+        if ( protocol == ISO_7816_4 )
+            PrintAndLogEx(NORMAL, "ISO7816-4 / Smartcard - Timings N/A yet");
 
-		PrintAndLogEx(NORMAL, "");
-		PrintAndLogEx(NORMAL, "      Start |        End | Src | Data (! denotes parity error)                                           | CRC | Annotation");
-		PrintAndLogEx(NORMAL, "------------+------------+-----+-------------------------------------------------------------------------+-----+--------------------");
+        PrintAndLogEx(NORMAL, "");
+        PrintAndLogEx(NORMAL, "      Start |        End | Src | Data (! denotes parity error)                                           | CRC | Annotation");
+        PrintAndLogEx(NORMAL, "------------+------------+-----+-------------------------------------------------------------------------+-----+--------------------");
 
-		ClearAuthData();
-		while (tracepos < traceLen) {
-			tracepos = printTraceLine(tracepos, traceLen, trace, protocol, showWaitCycles, markCRCBytes);
-		}
-	}
-	return 0;
+        ClearAuthData();
+        while (tracepos < traceLen) {
+            tracepos = printTraceLine(tracepos, traceLen, trace, protocol, showWaitCycles, markCRCBytes);
+        }
+    }
+    return 0;
 }
 
 int CmdTraceLoad(const char *Cmd) {
 
-	FILE *f = NULL;
-	char filename[FILE_PATH_SIZE];
-	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) < 1 || cmdp == 'h' || cmdp == 'H') return usage_trace_load();
+    FILE *f = NULL;
+    char filename[FILE_PATH_SIZE];
+    char cmdp = param_getchar(Cmd, 0);
+    if (strlen(Cmd) < 1 || cmdp == 'h' || cmdp == 'H') return usage_trace_load();
 
-	param_getstr(Cmd, 0, filename, sizeof(filename));
+    param_getstr(Cmd, 0, filename, sizeof(filename));
 
-	if ((f = fopen(filename, "rb")) == NULL) {
-		PrintAndLogEx(FAILED, "Could not open file %s", filename);
-		return 0;
-	}
+    if ((f = fopen(filename, "rb")) == NULL) {
+        PrintAndLogEx(FAILED, "Could not open file %s", filename);
+        return 0;
+    }
 
-	// get filesize in order to malloc memory
-	fseek(f, 0, SEEK_END);
-	long fsize = ftell(f);
-	fseek(f, 0, SEEK_SET);
+    // get filesize in order to malloc memory
+    fseek(f, 0, SEEK_END);
+    long fsize = ftell(f);
+    fseek(f, 0, SEEK_SET);
 
-	if (fsize < 0) 	{
-		PrintAndLogEx(FAILED, "error, when getting filesize");
-		fclose(f);
-		return 3;
-	}
-	if (fsize < 4 ) 	{
-		PrintAndLogEx(FAILED, "error, file is too small");
-		fclose(f);
-		return 4;
-	}
+    if (fsize < 0) {
+        PrintAndLogEx(FAILED, "error, when getting filesize");
+        fclose(f);
+        return 3;
+    }
+    if (fsize < 4 ) {
+        PrintAndLogEx(FAILED, "error, file is too small");
+        fclose(f);
+        return 4;
+    }
 
-	if ( trace )
-		free(trace);
+    if ( trace )
+        free(trace);
 
-	trace = calloc(fsize, sizeof(uint8_t));
-	if (!trace) {
-		PrintAndLogEx(FAILED, "Cannot allocate memory for trace");
-		fclose(f);
-		return 2;
-	}
+    trace = calloc(fsize, sizeof(uint8_t));
+    if (!trace) {
+        PrintAndLogEx(FAILED, "Cannot allocate memory for trace");
+        fclose(f);
+        return 2;
+    }
 
-	size_t bytes_read = fread(trace, 1, fsize, f);
-	traceLen = bytes_read;
-	fclose(f);
-	PrintAndLogEx(SUCCESS, "Recorded Activity (TraceLen = %d bytes) loaded from file %s", traceLen, filename);
-	return 0;
+    size_t bytes_read = fread(trace, 1, fsize, f);
+    traceLen = bytes_read;
+    fclose(f);
+    PrintAndLogEx(SUCCESS, "Recorded Activity (TraceLen = %d bytes) loaded from file %s", traceLen, filename);
+    return 0;
 }
 
 int CmdTraceSave(const char *Cmd) {
 
-	if (traceLen == 0 ) {
-		PrintAndLogEx(WARNING, "trace is empty, exiting...");
-		return 0;
-	}
+    if (traceLen == 0 ) {
+        PrintAndLogEx(WARNING, "trace is empty, exiting...");
+        return 0;
+    }
 
-	char filename[FILE_PATH_SIZE];
-	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) < 1 || cmdp == 'h' || cmdp == 'H') return usage_trace_save();
+    char filename[FILE_PATH_SIZE];
+    char cmdp = param_getchar(Cmd, 0);
+    if (strlen(Cmd) < 1 || cmdp == 'h' || cmdp == 'H') return usage_trace_save();
 
-	param_getstr(Cmd, 0, filename, sizeof(filename));
-	saveFile(filename, "bin", trace, traceLen);
-	return 0;
+    param_getstr(Cmd, 0, filename, sizeof(filename));
+    saveFile(filename, "bin", trace, traceLen);
+    return 0;
 }
 
 static command_t CommandTable[] = {
-	{"help",	CmdHelp,          1, "This help"},
-	{"list",    CmdTraceList,     1, "List protocol data in trace buffer"},
-	{"load",	CmdTraceLoad,     1, "Load trace from file"},
-	{"save",	CmdTraceSave,     1, "Save trace buffer to file"},
-	{NULL, NULL, 0, NULL}
+    {"help",    CmdHelp,          1, "This help"},
+    {"list",    CmdTraceList,     1, "List protocol data in trace buffer"},
+    {"load",    CmdTraceLoad,     1, "Load trace from file"},
+    {"save",    CmdTraceSave,     1, "Save trace buffer to file"},
+    {NULL, NULL, 0, NULL}
 };
 
 int CmdTrace(const char *Cmd) {
-	clearCommandBuffer();
-	CmdsParse(CommandTable, Cmd);
-	return 0;
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
+    return 0;
 }
 
 int CmdHelp(const char *Cmd) {
-	CmdsHelp(CommandTable);
-	return 0;
+    CmdsHelp(CommandTable);
+    return 0;
 }
diff --git a/client/cmdtrace.h b/client/cmdtrace.h
index ca56fd3cc..0d370123d 100644
--- a/client/cmdtrace.h
+++ b/client/cmdtrace.h
@@ -18,14 +18,14 @@
 #include <limits.h>
 #include "proxmark3.h"
 #include "protocols.h"
-#include "parity.h"			// oddparity
-#include "cmdhflist.h"		// annotations
-#include "iso15693tools.h"	// ISO15693 crc
-#include "util.h"			// for parsing cli command utils
-#include "ui.h"				// for show graph controls
-#include "cmdparser.h"		// for getting cli commands included in cmdmain.h
-#include "comms.h"		// for sending cmds to device. GetFromBigBuf
-#include "loclass/fileutils.h"		// for saveFile
+#include "parity.h"             // oddparity
+#include "cmdhflist.h"          // annotations
+#include "iso15693tools.h"      // ISO15693 crc
+#include "util.h"               // for parsing cli command utils
+#include "ui.h"                 // for show graph controls
+#include "cmdparser.h"          // for getting cli commands included in cmdmain.h
+#include "comms.h"              // for sending cmds to device. GetFromBigBuf
+#include "loclass/fileutils.h"  // for saveFile
 
 extern int CmdTrace(const char *Cmd);
 
diff --git a/client/comms.c b/client/comms.c
index 7e9441a95..9a09c060e 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -45,41 +45,41 @@ static pthread_mutex_t rxBufferMutex = PTHREAD_MUTEX_INITIALIZER;
 // These wrappers are required because it is not possible to access a static
 // global variable outside of the context of a single file.
 void SetOffline(bool value) {
-	offline = value;
+    offline = value;
 }
 
 bool IsOffline() {
-	return offline;
+    return offline;
 }
 
 void SendCommand(UsbCommand *c) {
 
-	#ifdef COMMS_DEBUG
-	PrintAndLogEx(NORMAL, "Sending %d bytes | cmd %04x\n", sizeof(UsbCommand), c->cmd);
-	#endif
+    #ifdef COMMS_DEBUG
+    PrintAndLogEx(NORMAL, "Sending %d bytes | cmd %04x\n", sizeof(UsbCommand), c->cmd);
+    #endif
 
-	if (offline) {
-		PrintAndLogEx(NORMAL, "Sending bytes to proxmark failed - offline");
-		return;
-	}
+    if (offline) {
+        PrintAndLogEx(NORMAL, "Sending bytes to proxmark failed - offline");
+        return;
+    }
 
-	pthread_mutex_lock(&txBufferMutex);
-	/**
-	This causes hangups at times, when the pm3 unit is unresponsive or disconnected. The main console thread is alive,
-	but comm thread just spins here. Not good.../holiman
-	**/
-	while (txBuffer_pending) {
-		// wait for communication thread to complete sending a previous commmand
-		pthread_cond_wait(&txBufferSig, &txBufferMutex);
-	}
+    pthread_mutex_lock(&txBufferMutex);
+    /**
+    This causes hangups at times, when the pm3 unit is unresponsive or disconnected. The main console thread is alive,
+    but comm thread just spins here. Not good.../holiman
+    **/
+    while (txBuffer_pending) {
+        // wait for communication thread to complete sending a previous commmand
+        pthread_cond_wait(&txBufferSig, &txBufferMutex);
+    }
 
-	txBuffer = *c;
-	txBuffer_pending = true;
+    txBuffer = *c;
+    txBuffer_pending = true;
 
-	// tell communication thread that a new command can be send
-	pthread_cond_signal(&txBufferSig);
+    // tell communication thread that a new command can be send
+    pthread_cond_signal(&txBufferSig);
 
-	pthread_mutex_unlock(&txBufferMutex);
+    pthread_mutex_unlock(&txBufferMutex);
 
 //__atomic_test_and_set(&txcmd_pending, __ATOMIC_SEQ_CST);
 }
@@ -91,10 +91,10 @@ void SendCommand(UsbCommand *c) {
  *  operation. Right now we'll just have to live with this.
  */
 void clearCommandBuffer() {
-	//This is a very simple operation
-	pthread_mutex_lock(&rxBufferMutex);
-	cmd_tail = cmd_head;
-	pthread_mutex_unlock(&rxBufferMutex);
+    //This is a very simple operation
+    pthread_mutex_lock(&rxBufferMutex);
+    cmd_tail = cmd_head;
+    pthread_mutex_unlock(&rxBufferMutex);
 }
 /**
  * @brief storeCommand stores a USB command in a circular buffer
@@ -102,20 +102,20 @@ void clearCommandBuffer() {
  */
 static void storeCommand(UsbCommand *command) {
 
-	pthread_mutex_lock(&rxBufferMutex);
+    pthread_mutex_lock(&rxBufferMutex);
     if ( ( cmd_head+1) % CMD_BUFFER_SIZE == cmd_tail) {
         //If these two are equal, we're about to overwrite in the
         // circular buffer.
         PrintAndLogEx(FAILED, "WARNING: Command buffer about to overwrite command! This needs to be fixed!");
-		fflush(stdout);
+        fflush(stdout);
     }
     //Store the command at the 'head' location
     UsbCommand* destination = &rxBuffer[cmd_head];
     memcpy(destination, command, sizeof(UsbCommand));
 
-	 //increment head and wrap
+     //increment head and wrap
     cmd_head = (cmd_head +1) % CMD_BUFFER_SIZE;
-	pthread_mutex_unlock(&rxBufferMutex);
+    pthread_mutex_unlock(&rxBufferMutex);
 }
 /**
  * @brief getCommand gets a command from an internal circular buffer.
@@ -123,12 +123,12 @@ static void storeCommand(UsbCommand *command) {
  * @return 1 if response was returned, 0 if nothing has been received
  */
 static int getCommand(UsbCommand* response) {
-	pthread_mutex_lock(&rxBufferMutex);
+    pthread_mutex_lock(&rxBufferMutex);
     //If head == tail, there's nothing to read, or if we just got initialized
     if (cmd_head == cmd_tail)  {
-		pthread_mutex_unlock(&rxBufferMutex);
-		return 0;
-	}
+        pthread_mutex_unlock(&rxBufferMutex);
+        return 0;
+    }
 
     //Pick out the next unread command
     UsbCommand* last_unread = &rxBuffer[cmd_tail];
@@ -137,7 +137,7 @@ static int getCommand(UsbCommand* response) {
     //Increment tail - this is a circular buffer, so modulo buffer size
     cmd_tail = (cmd_tail +1 ) % CMD_BUFFER_SIZE;
 
-	pthread_mutex_unlock(&rxBufferMutex);
+    pthread_mutex_unlock(&rxBufferMutex);
     return 1;
 }
 
@@ -147,74 +147,74 @@ static int getCommand(UsbCommand* response) {
 //-----------------------------------------------------------------------------
 static void UsbCommandReceived(UsbCommand* c) {
 
-	switch(c->cmd) {
-		// First check if we are handling a debug message
-		case CMD_DEBUG_PRINT_STRING: {
+    switch(c->cmd) {
+        // First check if we are handling a debug message
+        case CMD_DEBUG_PRINT_STRING: {
 
-			char s[USB_CMD_DATA_SIZE+1];
-			memset(s, 0x00, sizeof(s));
-			size_t len = MIN(c->arg[0], USB_CMD_DATA_SIZE);
-			memcpy(s, c->d.asBytes, len);
-			uint64_t flag = c->arg[1];
+            char s[USB_CMD_DATA_SIZE+1];
+            memset(s, 0x00, sizeof(s));
+            size_t len = MIN(c->arg[0], USB_CMD_DATA_SIZE);
+            memcpy(s, c->d.asBytes, len);
+            uint64_t flag = c->arg[1];
 
-			switch (flag) {
-				case FLAG_RAWPRINT:
-					printf("%s", s);
-					break;
-				case FLAG_NONEWLINE:
-					printf("\r%s", s);
-					break;
-				case FLAG_NOLOG:
-					printf("%s\r\n", s);
-					break;
-				//case FLAG_NOPROMPT:
-				//	break;
-				case FLAG_NOOPT:
-				default:
-					PrintAndLogEx(NORMAL, "#db# %s", s);
-					break;
-			}
-			fflush(stdout);
-			break;
-		}
-		case CMD_DEBUG_PRINT_INTEGERS: {
-			PrintAndLogEx(NORMAL, "#db# %" PRIx64 ", %" PRIx64 ", %" PRIx64 "", c->arg[0], c->arg[1], c->arg[2]);
-			break;
-		}
-		// iceman:  hw status - down the path on device, runs printusbspeed which starts sending a lot of
-		// CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K packages which is not dealt with. I wonder if simply ignoring them will
-		// work. lets try it.
-		default: {
-			storeCommand(c);
-			break;
-		}
-	}
+            switch (flag) {
+                case FLAG_RAWPRINT:
+                    printf("%s", s);
+                    break;
+                case FLAG_NONEWLINE:
+                    printf("\r%s", s);
+                    break;
+                case FLAG_NOLOG:
+                    printf("%s\r\n", s);
+                    break;
+                //case FLAG_NOPROMPT:
+                //  break;
+                case FLAG_NOOPT:
+                default:
+                    PrintAndLogEx(NORMAL, "#db# %s", s);
+                    break;
+            }
+            fflush(stdout);
+            break;
+        }
+        case CMD_DEBUG_PRINT_INTEGERS: {
+            PrintAndLogEx(NORMAL, "#db# %" PRIx64 ", %" PRIx64 ", %" PRIx64 "", c->arg[0], c->arg[1], c->arg[2]);
+            break;
+        }
+        // iceman:  hw status - down the path on device, runs printusbspeed which starts sending a lot of
+        // CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K packages which is not dealt with. I wonder if simply ignoring them will
+        // work. lets try it.
+        default: {
+            storeCommand(c);
+            break;
+        }
+    }
 }
 
 /*
 bool hookUpPM3() {
-	bool ret = false;
-	sp = uart_open( comport );
+    bool ret = false;
+    sp = uart_open( comport );
 
-	if (sp == INVALID_SERIAL_PORT) {
-		PrintAndLogEx(WARNING, "Reconnect failed, retrying...  (reason: invalid serial port)\n");
-		sp = NULL;
-		serial_port_name = NULL;
-		ret = false;
-		offline = 1;
-	} else if (sp == CLAIMED_SERIAL_PORT) {
-		PrintAndLogEx(WARNING, "Reconnect failed, retrying... (reason: serial port is claimed by another process)\n");
-		sp = NULL;
-		serial_port_name = NULL;
-		ret = false;
-		offline = 1;
-	} else {
-		PrintAndLogEx(SUCCESS, "Proxmark reconnected\n");
-		serial_port_name = ;
-		ret = true;
-		offline = 0;
-	}
-	return ret;
+    if (sp == INVALID_SERIAL_PORT) {
+        PrintAndLogEx(WARNING, "Reconnect failed, retrying...  (reason: invalid serial port)\n");
+        sp = NULL;
+        serial_port_name = NULL;
+        ret = false;
+        offline = 1;
+    } else if (sp == CLAIMED_SERIAL_PORT) {
+        PrintAndLogEx(WARNING, "Reconnect failed, retrying... (reason: serial port is claimed by another process)\n");
+        sp = NULL;
+        serial_port_name = NULL;
+        ret = false;
+        offline = 1;
+    } else {
+        PrintAndLogEx(SUCCESS, "Proxmark reconnected\n");
+        serial_port_name = ;
+        ret = true;
+        offline = 0;
+    }
+    return ret;
 }
 */
 
@@ -225,152 +225,152 @@ __attribute__((force_align_arg_pointer))
 #endif
 #endif
 *uart_communication(void *targ) {
-	communication_arg_t *conn = (communication_arg_t*)targ;
-	size_t rxlen, totallen = 0;
-	UsbCommand rx;
-	UsbCommand *prx = &rx;
+    communication_arg_t *conn = (communication_arg_t*)targ;
+    size_t rxlen, totallen = 0;
+    UsbCommand rx;
+    UsbCommand *prx = &rx;
 
-	//int counter_to_offline = 0;
+    //int counter_to_offline = 0;
 
 #if defined(__MACH__) && defined(__APPLE__)
-	disableAppNap("Proxmark3 polling UART");
+    disableAppNap("Proxmark3 polling UART");
 #endif
 
-	while (conn->run) {
-		rxlen = 0;
-		bool ACK_received = false;
+    while (conn->run) {
+        rxlen = 0;
+        bool ACK_received = false;
 
-		if (uart_receive(sp, (uint8_t *)prx, sizeof(UsbCommand) - (prx - &rx), &rxlen) && rxlen) {
-			prx += rxlen;
-			totallen += rxlen;
+        if (uart_receive(sp, (uint8_t *)prx, sizeof(UsbCommand) - (prx - &rx), &rxlen) && rxlen) {
+            prx += rxlen;
+            totallen += rxlen;
 
-			if ( totallen < sizeof(UsbCommand)) {
+            if ( totallen < sizeof(UsbCommand)) {
 
-				// iceman: this looping is no working as expected at all. The reassemble of package is nonfunctional.
-				// solved so far with increasing the timeouts of the serial port configuration.
-				PrintAndLogEx(NORMAL, "Foo %d | %d (loop)", prx - &rx, rxlen);
-				continue;
-			}
+                // iceman: this looping is no working as expected at all. The reassemble of package is nonfunctional.
+                // solved so far with increasing the timeouts of the serial port configuration.
+                PrintAndLogEx(NORMAL, "Foo %d | %d (loop)", prx - &rx, rxlen);
+                continue;
+            }
 
-			totallen = 0;
-			UsbCommandReceived(&rx);
-			if (rx.cmd == CMD_ACK) {
-				ACK_received = true;
-			}
-		}
+            totallen = 0;
+            UsbCommandReceived(&rx);
+            if (rx.cmd == CMD_ACK) {
+                ACK_received = true;
+            }
+        }
 
-		prx = &rx;
+        prx = &rx;
 
-		pthread_mutex_lock(&txBufferMutex);
+        pthread_mutex_lock(&txBufferMutex);
 
-		if (conn->block_after_ACK) {
-			// if we just received an ACK, wait here until a new command is to be transmitted
-			if (ACK_received) {
-				while (!txBuffer_pending) {
-					pthread_cond_wait(&txBufferSig, &txBufferMutex);
-				}
-			}
-		}
+        if (conn->block_after_ACK) {
+            // if we just received an ACK, wait here until a new command is to be transmitted
+            if (ACK_received) {
+                while (!txBuffer_pending) {
+                    pthread_cond_wait(&txBufferSig, &txBufferMutex);
+                }
+            }
+        }
 
-		if (txBuffer_pending) {
-			if (!uart_send(sp, (uint8_t*) &txBuffer, sizeof(UsbCommand))) {
-				//counter_to_offline++;
-				PrintAndLogEx(WARNING, "sending bytes to proxmark failed");
-			}
-			txBuffer_pending = false;
+        if (txBuffer_pending) {
+            if (!uart_send(sp, (uint8_t*) &txBuffer, sizeof(UsbCommand))) {
+                //counter_to_offline++;
+                PrintAndLogEx(WARNING, "sending bytes to proxmark failed");
+            }
+            txBuffer_pending = false;
 
-			// tell main thread that txBuffer is empty
-			pthread_cond_signal(&txBufferSig);
-		}
+            // tell main thread that txBuffer is empty
+            pthread_cond_signal(&txBufferSig);
+        }
 
-		pthread_mutex_unlock(&txBufferMutex);
-	}
+        pthread_mutex_unlock(&txBufferMutex);
+    }
 
-	// when this reader thread dies, we close the serial port.
-	uart_close(sp);
-	sp = NULL;
+    // when this reader thread dies, we close the serial port.
+    uart_close(sp);
+    sp = NULL;
 
 #if defined(__MACH__) && defined(__APPLE__)
-	enableAppNap();
+    enableAppNap();
 #endif
 
-	pthread_exit(NULL);
-	return NULL;
+    pthread_exit(NULL);
+    return NULL;
 }
 
 bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode) {
 
-	char *portname = (char *)port;
-	if (!wait_for_port) {
-		sp = uart_open(portname);
-	} else {
-		PrintAndLogEx(SUCCESS, "Waiting for Proxmark to appear on " _YELLOW_(%s), portname);
-		fflush(stdout);
-		int openCount = 0;
-		do {
-			sp = uart_open(portname);
-			msleep(500);
-			printf("."); fflush(stdout);
-		} while (++openCount < timeout && (sp == INVALID_SERIAL_PORT || sp == CLAIMED_SERIAL_PORT));
-		//PrintAndLogEx(NORMAL, "\n");
-	}
+    char *portname = (char *)port;
+    if (!wait_for_port) {
+        sp = uart_open(portname);
+    } else {
+        PrintAndLogEx(SUCCESS, "Waiting for Proxmark to appear on " _YELLOW_(%s), portname);
+        fflush(stdout);
+        int openCount = 0;
+        do {
+            sp = uart_open(portname);
+            msleep(500);
+            printf("."); fflush(stdout);
+        } while (++openCount < timeout && (sp == INVALID_SERIAL_PORT || sp == CLAIMED_SERIAL_PORT));
+        //PrintAndLogEx(NORMAL, "\n");
+    }
 
-	// check result of uart opening
-	if (sp == INVALID_SERIAL_PORT) {
-		PrintAndLogEx(WARNING, _RED_(ERROR:) "invalid serial port");
-		sp = NULL;
-		serial_port_name = NULL;
-		return false;
-	} else if (sp == CLAIMED_SERIAL_PORT) {
-		PrintAndLogEx(WARNING, _RED_(ERROR:) "serial port is claimed by another process");
-		sp = NULL;
-		serial_port_name = NULL;
-		return false;
-	} else {
-		// start the USB communication thread
-		serial_port_name = portname;
-		conn.run = true;
-		conn.block_after_ACK = flash_mode;
-		pthread_create(&USB_communication_thread, NULL, &uart_communication, &conn);
-		//pthread_create(&FPC_communication_thread, NULL, &uart_communication, &conn);
+    // check result of uart opening
+    if (sp == INVALID_SERIAL_PORT) {
+        PrintAndLogEx(WARNING, _RED_(ERROR:) "invalid serial port");
+        sp = NULL;
+        serial_port_name = NULL;
+        return false;
+    } else if (sp == CLAIMED_SERIAL_PORT) {
+        PrintAndLogEx(WARNING, _RED_(ERROR:) "serial port is claimed by another process");
+        sp = NULL;
+        serial_port_name = NULL;
+        return false;
+    } else {
+        // start the USB communication thread
+        serial_port_name = portname;
+        conn.run = true;
+        conn.block_after_ACK = flash_mode;
+        pthread_create(&USB_communication_thread, NULL, &uart_communication, &conn);
+        //pthread_create(&FPC_communication_thread, NULL, &uart_communication, &conn);
 
-		fflush(stdout);
-		// create a mutex to avoid interlacing print commands from our different threads
-		//pthread_mutex_init(&print_lock, NULL);
-		return true;
-	}
+        fflush(stdout);
+        // create a mutex to avoid interlacing print commands from our different threads
+        //pthread_mutex_init(&print_lock, NULL);
+        return true;
+    }
 }
 
 void CloseProxmark(void) {
-	conn.run = false;
+    conn.run = false;
 
 
 #ifdef __BIONIC__
-	if (USB_communication_thread != 0) {
-		pthread_join(USB_communication_thread, NULL);
-	}
+    if (USB_communication_thread != 0) {
+        pthread_join(USB_communication_thread, NULL);
+    }
 #else
-	pthread_join(USB_communication_thread, NULL);
-	//pthread_join(FPC_communication_thread, NULL);
+    pthread_join(USB_communication_thread, NULL);
+    //pthread_join(FPC_communication_thread, NULL);
 #endif
 
-	if (sp) {
-		uart_close(sp);
-	}
+    if (sp) {
+        uart_close(sp);
+    }
 
 #if defined(__linux__) && !defined(NO_UNLINK)
-	// Fix for linux, it seems that it is extremely slow to release the serial port file descriptor /dev/*
-	//
-	// This may be disabled at compile-time with -DNO_UNLINK (used for a JNI-based serial port on Android).
-	if (serial_port_name) {
-		unlink(serial_port_name);
-	}
+    // Fix for linux, it seems that it is extremely slow to release the serial port file descriptor /dev/*
+    //
+    // This may be disabled at compile-time with -DNO_UNLINK (used for a JNI-based serial port on Android).
+    if (serial_port_name) {
+        unlink(serial_port_name);
+    }
 #endif
 
-	// Clean up our state
-	sp = NULL;
-	serial_port_name = NULL;
-	memset(&USB_communication_thread, 0, sizeof(pthread_t));
+    // Clean up our state
+    sp = NULL;
+    serial_port_name = NULL;
+    memset(&USB_communication_thread, 0, sizeof(pthread_t));
 }
 
 /**
@@ -385,40 +385,40 @@ void CloseProxmark(void) {
  */
 bool WaitForResponseTimeoutW(uint32_t cmd, UsbCommand* response, size_t ms_timeout, bool show_warning) {
 
-	UsbCommand resp;
+    UsbCommand resp;
 
-	if (response == NULL)
-		response = &resp;
+    if (response == NULL)
+        response = &resp;
 
-	uint64_t start_time = msclock();
+    uint64_t start_time = msclock();
 
-	// Wait until the command is received
-	while (true) {
+    // Wait until the command is received
+    while (true) {
 
-		while ( getCommand(response) ) {
-			if (cmd == CMD_UNKNOWN || response->cmd == cmd)
-				return true;
-		}
+        while ( getCommand(response) ) {
+            if (cmd == CMD_UNKNOWN || response->cmd == cmd)
+                return true;
+        }
 
-		if (msclock() - start_time > ms_timeout)
-			break;
+        if (msclock() - start_time > ms_timeout)
+            break;
 
-		if (msclock() - start_time > 3000 && show_warning) {
-			// 3 seconds elapsed (but this doesn't mean the timeout was exceeded)
-			PrintAndLogEx(NORMAL, "Waiting for a response from the proxmark...");
-			PrintAndLogEx(NORMAL, "You can cancel this operation by pressing the pm3 button");
-			show_warning = false;
-		}
-	}
-	return false;
+        if (msclock() - start_time > 3000 && show_warning) {
+            // 3 seconds elapsed (but this doesn't mean the timeout was exceeded)
+            PrintAndLogEx(NORMAL, "Waiting for a response from the proxmark...");
+            PrintAndLogEx(NORMAL, "You can cancel this operation by pressing the pm3 button");
+            show_warning = false;
+        }
+    }
+    return false;
 }
 
 bool WaitForResponseTimeout(uint32_t cmd, UsbCommand* response, size_t ms_timeout) {
-	return WaitForResponseTimeoutW(cmd, response, ms_timeout, true);
+    return WaitForResponseTimeoutW(cmd, response, ms_timeout, true);
 }
 
 bool WaitForResponse(uint32_t cmd, UsbCommand* response) {
-	return WaitForResponseTimeoutW(cmd, response, -1, true);
+    return WaitForResponseTimeoutW(cmd, response, -1, true);
 }
 
 /**
@@ -436,89 +436,89 @@ bool WaitForResponse(uint32_t cmd, UsbCommand* response) {
 */
 bool GetFromDevice(DeviceMemType_t memtype, uint8_t *dest, uint32_t bytes, uint32_t start_index, UsbCommand *response, size_t ms_timeout, bool show_warning) {
 
-	if (dest == NULL) return false;
-	if (bytes == 0) return true;
+    if (dest == NULL) return false;
+    if (bytes == 0) return true;
 
-	UsbCommand resp;
-	if (response == NULL)
-		response = &resp;
+    UsbCommand resp;
+    if (response == NULL)
+        response = &resp;
 
-	// clear
-	clearCommandBuffer();
+    // clear
+    clearCommandBuffer();
 
-	switch (memtype) {
-		case BIG_BUF: {
-			UsbCommand c = {CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K, {start_index, bytes, 0}};
-			SendCommand(&c);
-			return dl_it(dest, bytes, start_index, response, ms_timeout, show_warning, CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K);
-		}
-		case BIG_BUF_EML: {
-			UsbCommand c = {CMD_DOWNLOAD_EML_BIGBUF, {start_index, bytes, 0}};
-			SendCommand(&c);
-			return dl_it(dest, bytes, start_index, response, ms_timeout, show_warning, CMD_DOWNLOADED_EML_BIGBUF);
-		}
-		case FLASH_MEM: {
-			UsbCommand c = {CMD_FLASHMEM_DOWNLOAD, {start_index, bytes, 0}};
-			SendCommand(&c);
-			return dl_it(dest, bytes, start_index, response, ms_timeout, show_warning, CMD_FLASHMEM_DOWNLOADED);
-		}
-		case SIM_MEM: {
-			//UsbCommand c = {CMD_DOWNLOAD_SIM_MEM, {start_index, bytes, 0}};
-			//SendCommand(&c);
-			//return dl_it(dest, bytes, start_index, response, ms_timeout, show_warning, CMD_DOWNLOADED_SIMMEM);
-			return false;
-		}
-	}
-	return false;
+    switch (memtype) {
+        case BIG_BUF: {
+            UsbCommand c = {CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K, {start_index, bytes, 0}};
+            SendCommand(&c);
+            return dl_it(dest, bytes, start_index, response, ms_timeout, show_warning, CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K);
+        }
+        case BIG_BUF_EML: {
+            UsbCommand c = {CMD_DOWNLOAD_EML_BIGBUF, {start_index, bytes, 0}};
+            SendCommand(&c);
+            return dl_it(dest, bytes, start_index, response, ms_timeout, show_warning, CMD_DOWNLOADED_EML_BIGBUF);
+        }
+        case FLASH_MEM: {
+            UsbCommand c = {CMD_FLASHMEM_DOWNLOAD, {start_index, bytes, 0}};
+            SendCommand(&c);
+            return dl_it(dest, bytes, start_index, response, ms_timeout, show_warning, CMD_FLASHMEM_DOWNLOADED);
+        }
+        case SIM_MEM: {
+            //UsbCommand c = {CMD_DOWNLOAD_SIM_MEM, {start_index, bytes, 0}};
+            //SendCommand(&c);
+            //return dl_it(dest, bytes, start_index, response, ms_timeout, show_warning, CMD_DOWNLOADED_SIMMEM);
+            return false;
+        }
+    }
+    return false;
 }
 
 bool dl_it(uint8_t *dest, uint32_t bytes, uint32_t start_index, UsbCommand *response, size_t ms_timeout, bool show_warning, uint32_t rec_cmd) {
 
-	uint32_t bytes_completed = 0;
-	uint64_t start_time = msclock();
+    uint32_t bytes_completed = 0;
+    uint64_t start_time = msclock();
 
-	while (true) {
+    while (true) {
 
-		if (getCommand(response)) {
+        if (getCommand(response)) {
 
-			// sample_buf is a array pointer, located in data.c
-			// arg0 = offset in transfer. Startindex of this chunk
-			// arg1 = length bytes to transfer
-			// arg2 = bigbuff tracelength (?)
-			if (response->cmd == rec_cmd) {
+            // sample_buf is a array pointer, located in data.c
+            // arg0 = offset in transfer. Startindex of this chunk
+            // arg1 = length bytes to transfer
+            // arg2 = bigbuff tracelength (?)
+            if (response->cmd == rec_cmd) {
 
-				uint32_t offset = response->arg[0];
-				uint32_t copy_bytes = MIN(bytes - bytes_completed, response->arg[1]);
-				//uint32_t tracelen = c->arg[2];
+                uint32_t offset = response->arg[0];
+                uint32_t copy_bytes = MIN(bytes - bytes_completed, response->arg[1]);
+                //uint32_t tracelen = c->arg[2];
 
-				// extended bounds check1.  upper limit is USB_CMD_DATA_SIZE
-				// shouldn't happen
-				copy_bytes = MIN(copy_bytes, USB_CMD_DATA_SIZE);
+                // extended bounds check1.  upper limit is USB_CMD_DATA_SIZE
+                // shouldn't happen
+                copy_bytes = MIN(copy_bytes, USB_CMD_DATA_SIZE);
 
-				// extended bounds check2.
-				if ( offset + copy_bytes > bytes ) {
-					PrintAndLogEx(FAILED, "ERROR: Out of bounds when downloading from device,  offset %u | len %u | total len %u > buf_size %u", offset, copy_bytes,  offset+copy_bytes,  bytes);
-					break;
-				}
+                // extended bounds check2.
+                if ( offset + copy_bytes > bytes ) {
+                    PrintAndLogEx(FAILED, "ERROR: Out of bounds when downloading from device,  offset %u | len %u | total len %u > buf_size %u", offset, copy_bytes,  offset+copy_bytes,  bytes);
+                    break;
+                }
 
-				memcpy(dest + offset, response->d.asBytes, copy_bytes);
-				bytes_completed += copy_bytes;
-			} else if (response->cmd == CMD_ACK) {
-				return true;
-			}
-		}
+                memcpy(dest + offset, response->d.asBytes, copy_bytes);
+                bytes_completed += copy_bytes;
+            } else if (response->cmd == CMD_ACK) {
+                return true;
+            }
+        }
 
-		if (msclock() - start_time > ms_timeout) {
-			PrintAndLogEx(FAILED, "Timed out while trying to download data from device");
-			break;
-		}
+        if (msclock() - start_time > ms_timeout) {
+            PrintAndLogEx(FAILED, "Timed out while trying to download data from device");
+            break;
+        }
 
-		if (msclock() - start_time > 3000 && show_warning) {
-			// 3 seconds elapsed (but this doesn't mean the timeout was exceeded)
-			PrintAndLogEx(NORMAL, "Waiting for a response from the proxmark...");
-			PrintAndLogEx(NORMAL, "You can cancel this operation by pressing the pm3 button");
-			show_warning = false;
-		}
-	}
-	return false;
+        if (msclock() - start_time > 3000 && show_warning) {
+            // 3 seconds elapsed (but this doesn't mean the timeout was exceeded)
+            PrintAndLogEx(NORMAL, "Waiting for a response from the proxmark...");
+            PrintAndLogEx(NORMAL, "You can cancel this operation by pressing the pm3 button");
+            show_warning = false;
+        }
+    }
+    return false;
 }
diff --git a/client/comms.h b/client/comms.h
index d3303be3f..bf7869d77 100644
--- a/client/comms.h
+++ b/client/comms.h
@@ -24,7 +24,7 @@
 #include "util_darwin.h"
 
 #if defined(__linux__) && !defined(NO_UNLINK)
-#include <unistd.h>		// for unlink()
+#include <unistd.h> // for unlink()
 #endif
 
 //For storing command that are received from the device
@@ -33,15 +33,15 @@
 #endif
 
 typedef enum {
-	BIG_BUF,
-	BIG_BUF_EML,
-	FLASH_MEM,
-	SIM_MEM,
-	} DeviceMemType_t;
+    BIG_BUF,
+    BIG_BUF_EML,
+    FLASH_MEM,
+    SIM_MEM,
+    } DeviceMemType_t;
 
 typedef struct {
-	bool run; // If TRUE, continue running the uart_communication thread
-	bool block_after_ACK; // if true, block after receiving an ACK package
+    bool run; // If TRUE, continue running the uart_communication thread
+    bool block_after_ACK; // if true, block after receiving an ACK package
 } communication_arg_t;
 
 
diff --git a/client/crypto/asn1dump.c b/client/crypto/asn1dump.c
index 38d03d353..276351e96 100644
--- a/client/crypto/asn1dump.c
+++ b/client/crypto/asn1dump.c
@@ -25,336 +25,336 @@
 #include "proxmark3.h"
 
 #ifndef PRINT_INDENT
-# define PRINT_INDENT(level) 	{for (int i = 0; i < (level); i++) fprintf(f, "   ");}
+# define PRINT_INDENT(level) {for (int i = 0; i < (level); i++) fprintf(f, "   ");}
 #endif
 
 enum asn1_tag_t {
-	ASN1_TAG_GENERIC,
-	ASN1_TAG_BOOLEAN,
-	ASN1_TAG_INTEGER,
-	ASN1_TAG_STRING,
-	ASN1_TAG_OCTET_STRING,
-	ASN1_TAG_UTC_TIME,
-	ASN1_TAG_STR_TIME,
-	ASN1_TAG_OBJECT_ID,
+    ASN1_TAG_GENERIC,
+    ASN1_TAG_BOOLEAN,
+    ASN1_TAG_INTEGER,
+    ASN1_TAG_STRING,
+    ASN1_TAG_OCTET_STRING,
+    ASN1_TAG_UTC_TIME,
+    ASN1_TAG_STR_TIME,
+    ASN1_TAG_OBJECT_ID,
 };
 
 struct asn1_tag {
-	tlv_tag_t tag;
-	char *name;
-	enum asn1_tag_t type;
-	const void *data;
+    tlv_tag_t tag;
+    char *name;
+    enum asn1_tag_t type;
+    const void *data;
 };
 
 static const struct asn1_tag asn1_tags[] = {
-	// internal
-	{ 0x00  , "Unknown ???" },
+    // internal
+    { 0x00  , "Unknown ???" },
 
-	// ASN.1
-	{ 0x01, "BOOLEAN", ASN1_TAG_BOOLEAN },
-	{ 0x02, "INTEGER", ASN1_TAG_INTEGER },
-	{ 0x03, "BIT STRING" },
-	{ 0x04, "OCTET STRING", ASN1_TAG_OCTET_STRING},
-	{ 0x05, "NULL" },
-	{ 0x06, "OBJECT IDENTIFIER", ASN1_TAG_OBJECT_ID },
-	{ 0x07, "OBJECT DESCRIPTOR" },
-	{ 0x08, "EXTERNAL" },
-	{ 0x09, "REAL" },
-	{ 0x0A, "ENUMERATED" },
-	{ 0x0B, "EMBEDDED_PDV" },
-	{ 0x0C, "UTF8String", ASN1_TAG_STRING },
-	{ 0x10, "SEQUENCE" },
-	{ 0x11, "SET" },
-	{ 0x12, "NumericString", ASN1_TAG_STRING },
-	{ 0x13, "PrintableString", ASN1_TAG_STRING },
-	{ 0x14, "T61String" },
-	{ 0x15, "VideotexString" },
-	{ 0x16, "IA5String" },
-	{ 0x17, "UTCTime", ASN1_TAG_UTC_TIME },
-	{ 0x18, "GeneralizedTime", ASN1_TAG_STR_TIME },
-	{ 0x19, "GraphicString" },
-	{ 0x1A, "VisibleString", ASN1_TAG_STRING },
-	{ 0x1B, "GeneralString", ASN1_TAG_STRING },
-	{ 0x1C, "UniversalString", ASN1_TAG_STRING },
-	{ 0x1E, "BMPString" },
-	{ 0x30, "SEQUENCE" },
-	{ 0x31, "SET" },
-	{ 0xa0, "[0]" },
-	{ 0xa1, "[1]" },
-	{ 0xa2, "[2]" },
-	{ 0xa3, "[3]" },
-	{ 0xa4, "[4]" },
-	{ 0xa5, "[5]" },
+    // ASN.1
+    { 0x01, "BOOLEAN", ASN1_TAG_BOOLEAN },
+    { 0x02, "INTEGER", ASN1_TAG_INTEGER },
+    { 0x03, "BIT STRING" },
+    { 0x04, "OCTET STRING", ASN1_TAG_OCTET_STRING},
+    { 0x05, "NULL" },
+    { 0x06, "OBJECT IDENTIFIER", ASN1_TAG_OBJECT_ID },
+    { 0x07, "OBJECT DESCRIPTOR" },
+    { 0x08, "EXTERNAL" },
+    { 0x09, "REAL" },
+    { 0x0A, "ENUMERATED" },
+    { 0x0B, "EMBEDDED_PDV" },
+    { 0x0C, "UTF8String", ASN1_TAG_STRING },
+    { 0x10, "SEQUENCE" },
+    { 0x11, "SET" },
+    { 0x12, "NumericString", ASN1_TAG_STRING },
+    { 0x13, "PrintableString", ASN1_TAG_STRING },
+    { 0x14, "T61String" },
+    { 0x15, "VideotexString" },
+    { 0x16, "IA5String" },
+    { 0x17, "UTCTime", ASN1_TAG_UTC_TIME },
+    { 0x18, "GeneralizedTime", ASN1_TAG_STR_TIME },
+    { 0x19, "GraphicString" },
+    { 0x1A, "VisibleString", ASN1_TAG_STRING },
+    { 0x1B, "GeneralString", ASN1_TAG_STRING },
+    { 0x1C, "UniversalString", ASN1_TAG_STRING },
+    { 0x1E, "BMPString" },
+    { 0x30, "SEQUENCE" },
+    { 0x31, "SET" },
+    { 0xa0, "[0]" },
+    { 0xa1, "[1]" },
+    { 0xa2, "[2]" },
+    { 0xa3, "[3]" },
+    { 0xa4, "[4]" },
+    { 0xa5, "[5]" },
 };
 
 static int asn1_sort_tag(tlv_tag_t tag) {
-	return (int)(tag >= 0x100 ? tag : tag << 8);
+    return (int)(tag >= 0x100 ? tag : tag << 8);
 }
 
 static int asn1_tlv_compare(const void *a, const void *b) {
-	const struct tlv *tlv = a;
-	const struct asn1_tag *tag = b;
+    const struct tlv *tlv = a;
+    const struct asn1_tag *tag = b;
 
-	return asn1_sort_tag(tlv->tag) - (asn1_sort_tag(tag->tag));
+    return asn1_sort_tag(tlv->tag) - (asn1_sort_tag(tag->tag));
 }
 
 static const struct asn1_tag *asn1_get_tag(const struct tlv *tlv) {
-	struct asn1_tag *tag = bsearch(tlv, asn1_tags, sizeof(asn1_tags) / sizeof(asn1_tags[0]),
-			sizeof(asn1_tags[0]), asn1_tlv_compare);
+    struct asn1_tag *tag = bsearch(tlv, asn1_tags, sizeof(asn1_tags) / sizeof(asn1_tags[0]),
+            sizeof(asn1_tags[0]), asn1_tlv_compare);
 
-	return tag ? tag : &asn1_tags[0];
+    return tag ? tag : &asn1_tags[0];
 }
 
 static void asn1_tag_dump_str_time(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level, bool longyear, bool *needdump){
-	int len = tlv->len;
-	*needdump = false;
+    int len = tlv->len;
+    *needdump = false;
 
-	int startindx = longyear ? 4 : 2;
+    int startindx = longyear ? 4 : 2;
 
-	if (len > 4) {
-		fprintf(f, "\tvalue: '");
-		while (true) {
-			// year
-			if (!longyear)
-				fprintf(f, "20");
-			fwrite(tlv->value, 1, longyear ? 4 : 2, f);
-			fprintf(f, "-");
-			if (len < startindx + 2)
-				break;
-			// month
-			fwrite(&tlv->value[startindx], 1, 2, f);
-			fprintf(f, "-");
-			if (len < startindx + 4)
-				break;
-			// day
-			fwrite(&tlv->value[startindx + 2], 1, 2, f);
-			fprintf(f, " ");
-			if (len < startindx + 6)
-				break;
-			// hour
-			fwrite(&tlv->value[startindx + 4], 1, 2, f);
-			fprintf(f, ":");
-			if (len < startindx + 8)
-				break;
-			// min
-			fwrite(&tlv->value[startindx + 6], 1, 2, f);
-			fprintf(f, ":");
-			if (len < startindx + 10)
-				break;
-			// sec
-			fwrite(&tlv->value[startindx + 8], 1, 2, f);
-			if (len < startindx + 11)
-				break;
-			// time zone
-			fprintf(f, " zone: %.*s", len - 10 - (longyear ? 4 : 2), &tlv->value[startindx + 10]);
+    if (len > 4) {
+        fprintf(f, "\tvalue: '");
+        while (true) {
+            // year
+            if (!longyear)
+                fprintf(f, "20");
+            fwrite(tlv->value, 1, longyear ? 4 : 2, f);
+            fprintf(f, "-");
+            if (len < startindx + 2)
+                break;
+            // month
+            fwrite(&tlv->value[startindx], 1, 2, f);
+            fprintf(f, "-");
+            if (len < startindx + 4)
+                break;
+            // day
+            fwrite(&tlv->value[startindx + 2], 1, 2, f);
+            fprintf(f, " ");
+            if (len < startindx + 6)
+                break;
+            // hour
+            fwrite(&tlv->value[startindx + 4], 1, 2, f);
+            fprintf(f, ":");
+            if (len < startindx + 8)
+                break;
+            // min
+            fwrite(&tlv->value[startindx + 6], 1, 2, f);
+            fprintf(f, ":");
+            if (len < startindx + 10)
+                break;
+            // sec
+            fwrite(&tlv->value[startindx + 8], 1, 2, f);
+            if (len < startindx + 11)
+                break;
+            // time zone
+            fprintf(f, " zone: %.*s", len - 10 - (longyear ? 4 : 2), &tlv->value[startindx + 10]);
 
-			break;
-		}
-		fprintf(f, "'\n");
-	} else {
-		fprintf(f, "\n");
-		*needdump = true;
-	}
+            break;
+        }
+        fprintf(f, "'\n");
+    } else {
+        fprintf(f, "\n");
+        *needdump = true;
+    }
 }
 
 static void asn1_tag_dump_string(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level){
-	fprintf(f, "\tvalue: '");
-	fwrite(tlv->value, 1, tlv->len, f);
-	fprintf(f, "'\n");
+    fprintf(f, "\tvalue: '");
+    fwrite(tlv->value, 1, tlv->len, f);
+    fprintf(f, "'\n");
 }
 
 static void asn1_tag_dump_octet_string(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level, bool *needdump){
-	*needdump = false;
-	for (int i = 0; i < tlv->len; i++)
-		if (!isspace(tlv->value[i]) && !isprint(tlv->value[i])){
-			*needdump = true;
-			break;
-		}
+    *needdump = false;
+    for (int i = 0; i < tlv->len; i++)
+        if (!isspace(tlv->value[i]) && !isprint(tlv->value[i])){
+            *needdump = true;
+            break;
+        }
 
-	if (*needdump) {
-		fprintf(f, "'\n");
-	} else {
-		fprintf(f, "\t\t");
-		asn1_tag_dump_string(tlv, tag, f, level);
-	}
+    if (*needdump) {
+        fprintf(f, "'\n");
+    } else {
+        fprintf(f, "\t\t");
+        asn1_tag_dump_string(tlv, tag, f, level);
+    }
 }
 
 static unsigned long asn1_value_integer(const struct tlv *tlv, unsigned start, unsigned end) {
-	unsigned long ret = 0;
-	int i;
+    unsigned long ret = 0;
+    int i;
 
-	if (end > tlv->len * 2)
-		return ret;
-	if (start >= end)
-		return ret;
+    if (end > tlv->len * 2)
+        return ret;
+    if (start >= end)
+        return ret;
 
-	if (start & 1) {
-		ret += tlv->value[start/2] & 0xf;
-		i = start + 1;
-	} else
-		i = start;
+    if (start & 1) {
+        ret += tlv->value[start/2] & 0xf;
+        i = start + 1;
+    } else
+        i = start;
 
-	for (; i < end - 1; i += 2) {
-		ret *= 10;
-		ret += tlv->value[i/2] >> 4;
-		ret *= 10;
-		ret += tlv->value[i/2] & 0xf;
-	}
+    for (; i < end - 1; i += 2) {
+        ret *= 10;
+        ret += tlv->value[i/2] >> 4;
+        ret *= 10;
+        ret += tlv->value[i/2] & 0xf;
+    }
 
-	if (end & 1) {
-		ret *= 10;
-		ret += tlv->value[end/2] >> 4;
-	}
+    if (end & 1) {
+        ret *= 10;
+        ret += tlv->value[end/2] >> 4;
+    }
 
-	return ret;
+    return ret;
 }
 
 static void asn1_tag_dump_boolean(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level) {
-	PRINT_INDENT(level);
-	if (tlv->len > 0) {
-		fprintf(f, "\tvalue: %s\n", tlv->value[0]?"true":"false");
-	} else {
-		fprintf(f, "n/a\n");
-	}
+    PRINT_INDENT(level);
+    if (tlv->len > 0) {
+        fprintf(f, "\tvalue: %s\n", tlv->value[0]?"true":"false");
+    } else {
+        fprintf(f, "n/a\n");
+    }
 }
 
 static void asn1_tag_dump_integer(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level) {
-	PRINT_INDENT(level);
-	if (tlv->len == 4) {
-		int32_t val = 0;
-		for (int i = 0; i < tlv->len; i++)
-			val = (val << 8) + tlv->value[i];
-		fprintf(f, "\tvalue4b: %d\n", val);
-		return;
-	}
-	fprintf(f, "\tvalue: %lu\n", asn1_value_integer(tlv, 0, tlv->len * 2));
+    PRINT_INDENT(level);
+    if (tlv->len == 4) {
+        int32_t val = 0;
+        for (int i = 0; i < tlv->len; i++)
+            val = (val << 8) + tlv->value[i];
+        fprintf(f, "\tvalue4b: %d\n", val);
+        return;
+    }
+    fprintf(f, "\tvalue: %lu\n", asn1_value_integer(tlv, 0, tlv->len * 2));
 }
 
 static char *asn1_oid_description(const char *oid, bool with_group_desc) {
-	json_error_t error;
-	json_t *root = NULL;
-	char fname[300] = {0};
-	static char res[300];
-	memset(res, 0x00, sizeof(res));
+    json_error_t error;
+    json_t *root = NULL;
+    char fname[300] = {0};
+    static char res[300];
+    memset(res, 0x00, sizeof(res));
 
-	size_t len = strlen(get_my_executable_directory());
-	if ( len > 300 ) len = 299;
+    size_t len = strlen(get_my_executable_directory());
+    if ( len > 300 ) len = 299;
 
-	strncpy(fname, get_my_executable_directory(), len);
-	strcat(fname, "crypto/oids.json");
-	if (access(fname, F_OK) < 0) {
-		strncpy(fname, get_my_executable_directory(), len);
-		strcat(fname, "oids.json");
-		if (access(fname, F_OK) < 0) {
-			goto error; // file not found
-		}
-	}
+    strncpy(fname, get_my_executable_directory(), len);
+    strcat(fname, "crypto/oids.json");
+    if (access(fname, F_OK) < 0) {
+        strncpy(fname, get_my_executable_directory(), len);
+        strcat(fname, "oids.json");
+        if (access(fname, F_OK) < 0) {
+            goto error; // file not found
+        }
+    }
 
-	// load `oids.json`
-	root = json_load_file(fname, 0, &error);
+    // load `oids.json`
+    root = json_load_file(fname, 0, &error);
 
-	if (!root || !json_is_object(root)) {
-		goto error;
-	}
+    if (!root || !json_is_object(root)) {
+        goto error;
+    }
 
-	json_t *elm = json_object_get(root, oid);
-	if (!elm) {
-		goto error;
-	}
+    json_t *elm = json_object_get(root, oid);
+    if (!elm) {
+        goto error;
+    }
 
-	if (JsonLoadStr(elm, "$.d", res))
-		goto error;
+    if (JsonLoadStr(elm, "$.d", res))
+        goto error;
 
-	char strext[300] = {0};
-	if (!JsonLoadStr(elm, "$.c", strext)) {
-		strcat(res, " (");
-		strcat(res, strext);
-		strcat(res, ")");
-	}
+    char strext[300] = {0};
+    if (!JsonLoadStr(elm, "$.c", strext)) {
+        strcat(res, " (");
+        strcat(res, strext);
+        strcat(res, ")");
+    }
 
-	json_decref(root);
-	return res;
+    json_decref(root);
+    return res;
 
 error:
-	if (root)
-		json_decref(root);
-	return NULL;
+    if (root)
+        json_decref(root);
+    return NULL;
 }
 
 static void asn1_tag_dump_object_id(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level) {
-	PRINT_INDENT(level);
-	mbedtls_asn1_buf asn1_buf;
-	asn1_buf.len = tlv->len;
-	asn1_buf.p = (uint8_t *)tlv->value;
-	char pstr[300];
-	mbedtls_oid_get_numeric_string(pstr, sizeof(pstr), &asn1_buf);
-	fprintf(f, " %s", pstr);
+    PRINT_INDENT(level);
+    mbedtls_asn1_buf asn1_buf;
+    asn1_buf.len = tlv->len;
+    asn1_buf.p = (uint8_t *)tlv->value;
+    char pstr[300];
+    mbedtls_oid_get_numeric_string(pstr, sizeof(pstr), &asn1_buf);
+    fprintf(f, " %s", pstr);
 
-	char *jsondesc = asn1_oid_description(pstr, true);
-	if (jsondesc) {
-		fprintf(f, " -  %s", jsondesc);
-	} else {
-		const char *ppstr;
-		mbedtls_oid_get_attr_short_name(&asn1_buf, &ppstr);
-		if (ppstr && strnlen(ppstr, 1)) {
-			fprintf(f, " (%s)\n", ppstr);
-			return;
-		}
-		mbedtls_oid_get_sig_alg_desc(&asn1_buf, &ppstr);
-		if (ppstr && strnlen(ppstr, 1)) {
-			fprintf(f, " (%s)\n", ppstr);
-			return;
-		}
-		mbedtls_oid_get_extended_key_usage(&asn1_buf, &ppstr);
-		if (ppstr && strnlen(ppstr, 1)) {
-			fprintf(f, " (%s)\n", ppstr);
-			return;
-		}
-	}
-	fprintf(f, "\n");
+    char *jsondesc = asn1_oid_description(pstr, true);
+    if (jsondesc) {
+        fprintf(f, " -  %s", jsondesc);
+    } else {
+        const char *ppstr;
+        mbedtls_oid_get_attr_short_name(&asn1_buf, &ppstr);
+        if (ppstr && strnlen(ppstr, 1)) {
+            fprintf(f, " (%s)\n", ppstr);
+            return;
+        }
+        mbedtls_oid_get_sig_alg_desc(&asn1_buf, &ppstr);
+        if (ppstr && strnlen(ppstr, 1)) {
+            fprintf(f, " (%s)\n", ppstr);
+            return;
+        }
+        mbedtls_oid_get_extended_key_usage(&asn1_buf, &ppstr);
+        if (ppstr && strnlen(ppstr, 1)) {
+            fprintf(f, " (%s)\n", ppstr);
+            return;
+        }
+    }
+    fprintf(f, "\n");
 }
 
 bool asn1_tag_dump(const struct tlv *tlv, FILE *f, int level, bool *candump) {
-	if (!tlv) {
-		fprintf(f, "NULL\n");
-		return false;
-	}
+    if (!tlv) {
+        fprintf(f, "NULL\n");
+        return false;
+    }
 
-	const struct asn1_tag *tag = asn1_get_tag(tlv);
+    const struct asn1_tag *tag = asn1_get_tag(tlv);
 
-	PRINT_INDENT(level);
-	fprintf(f, "--%2hx[%02zx] '%s':", tlv->tag, tlv->len, tag->name);
+    PRINT_INDENT(level);
+    fprintf(f, "--%2hx[%02zx] '%s':", tlv->tag, tlv->len, tag->name);
 
-	switch (tag->type) {
-	case ASN1_TAG_GENERIC:
-		fprintf(f, "\n");
-		break;
-	case ASN1_TAG_STRING:
-		asn1_tag_dump_string(tlv, tag, f, level);
-		*candump = false;
-		break;
-	case ASN1_TAG_OCTET_STRING:
-		asn1_tag_dump_octet_string(tlv, tag, f, level, candump);
-		break;
-	case ASN1_TAG_BOOLEAN:
-		asn1_tag_dump_boolean(tlv, tag, f, level);
-		*candump = false;
-		break;
-	case ASN1_TAG_INTEGER:
-		asn1_tag_dump_integer(tlv, tag, f, level);
-		*candump = false;
-		break;
-	case ASN1_TAG_UTC_TIME:
-		asn1_tag_dump_str_time(tlv, tag, f, level, false, candump);
-		break;
-	case ASN1_TAG_STR_TIME:
-		asn1_tag_dump_str_time(tlv, tag, f, level, true, candump);
-		break;
-	case ASN1_TAG_OBJECT_ID:
-		asn1_tag_dump_object_id(tlv, tag, f, level);
-		*candump = false;
-		break;
-	};
+    switch (tag->type) {
+    case ASN1_TAG_GENERIC:
+        fprintf(f, "\n");
+        break;
+    case ASN1_TAG_STRING:
+        asn1_tag_dump_string(tlv, tag, f, level);
+        *candump = false;
+        break;
+    case ASN1_TAG_OCTET_STRING:
+        asn1_tag_dump_octet_string(tlv, tag, f, level, candump);
+        break;
+    case ASN1_TAG_BOOLEAN:
+        asn1_tag_dump_boolean(tlv, tag, f, level);
+        *candump = false;
+        break;
+    case ASN1_TAG_INTEGER:
+        asn1_tag_dump_integer(tlv, tag, f, level);
+        *candump = false;
+        break;
+    case ASN1_TAG_UTC_TIME:
+        asn1_tag_dump_str_time(tlv, tag, f, level, false, candump);
+        break;
+    case ASN1_TAG_STR_TIME:
+        asn1_tag_dump_str_time(tlv, tag, f, level, true, candump);
+        break;
+    case ASN1_TAG_OBJECT_ID:
+        asn1_tag_dump_object_id(tlv, tag, f, level);
+        *candump = false;
+        break;
+    };
 
-	return true;
+    return true;
 }
diff --git a/client/crypto/asn1utils.c b/client/crypto/asn1utils.c
index f8b296e60..35fbe43b3 100644
--- a/client/crypto/asn1utils.c
+++ b/client/crypto/asn1utils.c
@@ -18,72 +18,72 @@
 #include "util.h"
 
 int ecdsa_asn1_get_signature(uint8_t *signature, size_t signaturelen, uint8_t *rval, uint8_t *sval) {
-	if (!signature || !signaturelen || !rval || !sval)
-		return 1;
+    if (!signature || !signaturelen || !rval || !sval)
+        return 1;
 
-	int res = 0;
-	unsigned char *p = signature;
-	const unsigned char *end = p + signaturelen;
-	size_t len;
-	mbedtls_mpi xmpi;
+    int res = 0;
+    unsigned char *p = signature;
+    const unsigned char *end = p + signaturelen;
+    size_t len;
+    mbedtls_mpi xmpi;
 
-	if ((res = mbedtls_asn1_get_tag(&p, end, &len, MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE)) == 0) {
-		mbedtls_mpi_init(&xmpi);
-		res = mbedtls_asn1_get_mpi(&p, end, &xmpi);
-		if (res) {
-			mbedtls_mpi_free(&xmpi);
-			goto exit;
-		}
+    if ((res = mbedtls_asn1_get_tag(&p, end, &len, MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE)) == 0) {
+        mbedtls_mpi_init(&xmpi);
+        res = mbedtls_asn1_get_mpi(&p, end, &xmpi);
+        if (res) {
+            mbedtls_mpi_free(&xmpi);
+            goto exit;
+        }
 
-		res = mbedtls_mpi_write_binary(&xmpi, rval, 32);
-		mbedtls_mpi_free(&xmpi);
-		if (res)
-			goto exit;
+        res = mbedtls_mpi_write_binary(&xmpi, rval, 32);
+        mbedtls_mpi_free(&xmpi);
+        if (res)
+            goto exit;
 
-		mbedtls_mpi_init(&xmpi);
-		res = mbedtls_asn1_get_mpi(&p, end, &xmpi);
-		if (res) {
-			mbedtls_mpi_free(&xmpi);
-			goto exit;
-		}
+        mbedtls_mpi_init(&xmpi);
+        res = mbedtls_asn1_get_mpi(&p, end, &xmpi);
+        if (res) {
+            mbedtls_mpi_free(&xmpi);
+            goto exit;
+        }
 
-		res = mbedtls_mpi_write_binary(&xmpi, sval, 32);
-		mbedtls_mpi_free(&xmpi);
-		if (res)
-			goto exit;
+        res = mbedtls_mpi_write_binary(&xmpi, sval, 32);
+        mbedtls_mpi_free(&xmpi);
+        if (res)
+            goto exit;
 
-		// check size
-		if (end != p)
-			return 2;
-		}
+        // check size
+        if (end != p)
+            return 2;
+        }
 
 exit:
-	return res;
+    return res;
 }
 
 static bool print_cb(void *data, const struct tlv *tlv, int level, bool is_leaf) {
-	bool candump = true;
-	asn1_tag_dump(tlv, stdout, level, &candump);
-	if (is_leaf && candump) {
-		dump_buffer(tlv->value, tlv->len, stdout, level);
-	}
+    bool candump = true;
+    asn1_tag_dump(tlv, stdout, level, &candump);
+    if (is_leaf && candump) {
+        dump_buffer(tlv->value, tlv->len, stdout, level);
+    }
 
-	return true;
+    return true;
 }
 
 int asn1_print(uint8_t *asn1buf, size_t asn1buflen, char *indent) {
 
-	struct tlvdb *t = NULL;
-	t = tlvdb_parse_multi(asn1buf, asn1buflen);
-	if (t) {
-		tlvdb_visit(t, print_cb, NULL, 0);
-		tlvdb_free(t);
-	} else {
-		PrintAndLogEx(ERR, "Can't parse data as TLV tree.");
-		return 1;
-	}
+    struct tlvdb *t = NULL;
+    t = tlvdb_parse_multi(asn1buf, asn1buflen);
+    if (t) {
+        tlvdb_visit(t, print_cb, NULL, 0);
+        tlvdb_free(t);
+    } else {
+        PrintAndLogEx(ERR, "Can't parse data as TLV tree.");
+        return 1;
+    }
 
-	return 0;
+    return 0;
 }
 
 
diff --git a/client/crypto/libpcrypto.c b/client/crypto/libpcrypto.c
index 37668b4e4..4d6c33704 100644
--- a/client/crypto/libpcrypto.c
+++ b/client/crypto/libpcrypto.c
@@ -27,291 +27,291 @@
 
 // NIST Special Publication 800-38A — Recommendation for block cipher modes of operation: methods and techniques, 2001.
 int aes_encode(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *output, int length){
-	uint8_t iiv[16] = {0};
-	if (iv)
-		memcpy(iiv, iv, 16);
+    uint8_t iiv[16] = {0};
+    if (iv)
+        memcpy(iiv, iv, 16);
 
-	mbedtls_aes_context aes;
-	mbedtls_aes_init(&aes);
-	if (mbedtls_aes_setkey_enc(&aes, key, 128))
-		return 1;
-	if (mbedtls_aes_crypt_cbc(&aes, MBEDTLS_AES_ENCRYPT, length, iiv, input, output))
-		return 2;
-	mbedtls_aes_free(&aes);
+    mbedtls_aes_context aes;
+    mbedtls_aes_init(&aes);
+    if (mbedtls_aes_setkey_enc(&aes, key, 128))
+        return 1;
+    if (mbedtls_aes_crypt_cbc(&aes, MBEDTLS_AES_ENCRYPT, length, iiv, input, output))
+        return 2;
+    mbedtls_aes_free(&aes);
 
-	return 0;
+    return 0;
 }
 
 int aes_decode(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *output, int length){
-	uint8_t iiv[16] = {0};
-	if (iv)
-		memcpy(iiv, iv, 16);
+    uint8_t iiv[16] = {0};
+    if (iv)
+        memcpy(iiv, iv, 16);
 
-	mbedtls_aes_context aes;
-	mbedtls_aes_init(&aes);
-	if (mbedtls_aes_setkey_dec(&aes, key, 128))
-		return 1;
-	if (mbedtls_aes_crypt_cbc(&aes, MBEDTLS_AES_DECRYPT, length, iiv, input, output))
-		return 2;
-	mbedtls_aes_free(&aes);
+    mbedtls_aes_context aes;
+    mbedtls_aes_init(&aes);
+    if (mbedtls_aes_setkey_dec(&aes, key, 128))
+        return 1;
+    if (mbedtls_aes_crypt_cbc(&aes, MBEDTLS_AES_DECRYPT, length, iiv, input, output))
+        return 2;
+    mbedtls_aes_free(&aes);
 
-	return 0;
+    return 0;
 }
 
 // NIST Special Publication 800-38B — Recommendation for block cipher modes of operation: The CMAC mode for authentication.
 // https://csrc.nist.gov/CSRC/media/Projects/Cryptographic-Standards-and-Guidelines/documents/examples/AES_CMAC.pdf
 int aes_cmac(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *mac, int length) {
-	memset(mac, 0x00, 16);
+    memset(mac, 0x00, 16);
 
-	//  NIST 800-38B
-	return mbedtls_aes_cmac_prf_128(key, MBEDTLS_AES_BLOCK_SIZE, input, length, mac);
+    //  NIST 800-38B
+    return mbedtls_aes_cmac_prf_128(key, MBEDTLS_AES_BLOCK_SIZE, input, length, mac);
 }
 
 int aes_cmac8(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *mac, int length) {
-	uint8_t cmac[16] = {0};
-	memset(mac, 0x00, 8);
+    uint8_t cmac[16] = {0};
+    memset(mac, 0x00, 8);
 
-	int res = aes_cmac(iv, key, input, cmac, length);
-	if (res)
-		return res;
+    int res = aes_cmac(iv, key, input, cmac, length);
+    if (res)
+        return res;
 
-	for(int i = 0; i < 8; i++)
-		mac[i] = cmac[i * 2 + 1];
+    for(int i = 0; i < 8; i++)
+        mac[i] = cmac[i * 2 + 1];
 
-	return 0;
+    return 0;
 }
 
 static uint8_t fixed_rand_value[250] = {0};
 static int fixed_rand(void *rng_state, unsigned char *output, size_t len) {
-	if (len <= 250) {
-		memcpy(output, fixed_rand_value, len);
-	} else {
-		memset(output, 0x00, len);
-	}
+    if (len <= 250) {
+        memcpy(output, fixed_rand_value, len);
+    } else {
+        memset(output, 0x00, len);
+    }
 
-	return 0;
+    return 0;
 }
 
 int sha256hash(uint8_t *input, int length, uint8_t *hash) {
-	if (!hash || !input)
-		return 1;
+    if (!hash || !input)
+        return 1;
 
-	mbedtls_sha256_context sctx;
-	mbedtls_sha256_init(&sctx);
-	mbedtls_sha256_starts(&sctx, 0); // SHA-256, not 224
-	mbedtls_sha256_update(&sctx, input, length);
-	mbedtls_sha256_finish(&sctx, hash);
-	mbedtls_sha256_free(&sctx);
+    mbedtls_sha256_context sctx;
+    mbedtls_sha256_init(&sctx);
+    mbedtls_sha256_starts(&sctx, 0); // SHA-256, not 224
+    mbedtls_sha256_update(&sctx, input, length);
+    mbedtls_sha256_finish(&sctx, hash);
+    mbedtls_sha256_free(&sctx);
 
-	return 0;
+    return 0;
 }
 
 int ecdsa_init_str(mbedtls_ecdsa_context *ctx, char * key_d, char *key_x, char *key_y) {
-	if (!ctx)
-		return 1;
+    if (!ctx)
+        return 1;
 
-	int res;
+    int res;
 
-	mbedtls_ecdsa_init(ctx);
-	res = mbedtls_ecp_group_load(&ctx->grp, MBEDTLS_ECP_DP_SECP256R1); // secp256r1
-	if (res)
-		return res;
+    mbedtls_ecdsa_init(ctx);
+    res = mbedtls_ecp_group_load(&ctx->grp, MBEDTLS_ECP_DP_SECP256R1); // secp256r1
+    if (res)
+        return res;
 
-	if (key_d) {
-		res = mbedtls_mpi_read_string(&ctx->d, 16, key_d);
-		if (res)
-			return res;
-	}
+    if (key_d) {
+        res = mbedtls_mpi_read_string(&ctx->d, 16, key_d);
+        if (res)
+            return res;
+    }
 
-	if (key_x && key_y) {
-		res = mbedtls_ecp_point_read_string(&ctx->Q, 16, key_x, key_y);
-		if (res)
-			return res;
-	}
+    if (key_x && key_y) {
+        res = mbedtls_ecp_point_read_string(&ctx->Q, 16, key_x, key_y);
+        if (res)
+            return res;
+    }
 
-	return 0;
+    return 0;
 }
 
 int ecdsa_init(mbedtls_ecdsa_context *ctx, uint8_t * key_d, uint8_t *key_xy) {
-	if (!ctx)
-		return 1;
+    if (!ctx)
+        return 1;
 
-	int res;
+    int res;
 
-	mbedtls_ecdsa_init(ctx);
-	res = mbedtls_ecp_group_load(&ctx->grp, MBEDTLS_ECP_DP_SECP256R1); // secp256r1
-	if (res)
-		return res;
+    mbedtls_ecdsa_init(ctx);
+    res = mbedtls_ecp_group_load(&ctx->grp, MBEDTLS_ECP_DP_SECP256R1); // secp256r1
+    if (res)
+        return res;
 
-	if (key_d) {
-		res = mbedtls_mpi_read_binary(&ctx->d, key_d, 32);
-		if (res)
-			return res;
-	}
+    if (key_d) {
+        res = mbedtls_mpi_read_binary(&ctx->d, key_d, 32);
+        if (res)
+            return res;
+    }
 
-	if (key_xy) {
-		res = mbedtls_ecp_point_read_binary(&ctx->grp, &ctx->Q, key_xy, 32 * 2 + 1);
-		if (res)
-			return res;
-	}
+    if (key_xy) {
+        res = mbedtls_ecp_point_read_binary(&ctx->grp, &ctx->Q, key_xy, 32 * 2 + 1);
+        if (res)
+            return res;
+    }
 
-	return 0;
+    return 0;
 }
 
 int ecdsa_key_create(uint8_t * key_d, uint8_t *key_xy) {
-	int res;
-	mbedtls_ecdsa_context ctx;
-	ecdsa_init(&ctx, NULL, NULL);
+    int res;
+    mbedtls_ecdsa_context ctx;
+    ecdsa_init(&ctx, NULL, NULL);
 
 
     mbedtls_entropy_context entropy;
     mbedtls_ctr_drbg_context ctr_drbg;
-	const char *pers = "ecdsaproxmark";
+    const char *pers = "ecdsaproxmark";
 
     mbedtls_entropy_init(&entropy);
     mbedtls_ctr_drbg_init(&ctr_drbg);
 
     res = mbedtls_ctr_drbg_seed(&ctr_drbg, mbedtls_entropy_func, &entropy, (const unsigned char *)pers, strlen(pers));
-	if (res)
+    if (res)
         goto exit;
 
     res = mbedtls_ecdsa_genkey(&ctx, MBEDTLS_ECP_DP_SECP256R1, mbedtls_ctr_drbg_random, &ctr_drbg);
-	if (res)
-		goto exit;
+    if (res)
+        goto exit;
 
-	res = mbedtls_mpi_write_binary(&ctx.d, key_d, 32);
-	if (res)
-		goto exit;
+    res = mbedtls_mpi_write_binary(&ctx.d, key_d, 32);
+    if (res)
+        goto exit;
 
-	size_t keylen = 0;
-	uint8_t public_key[200] = {0};
-	res = mbedtls_ecp_point_write_binary(&ctx.grp, &ctx.Q, MBEDTLS_ECP_PF_UNCOMPRESSED, &keylen, public_key, sizeof(public_key));
-	if (res)
-		goto exit;
+    size_t keylen = 0;
+    uint8_t public_key[200] = {0};
+    res = mbedtls_ecp_point_write_binary(&ctx.grp, &ctx.Q, MBEDTLS_ECP_PF_UNCOMPRESSED, &keylen, public_key, sizeof(public_key));
+    if (res)
+        goto exit;
 
-	if (keylen != 65) { // 0x04 <key x 32b><key y 32b>
-		res = 1;
-		goto exit;
-	}
-	memcpy(key_xy, public_key, 65);
+    if (keylen != 65) { // 0x04 <key x 32b><key y 32b>
+        res = 1;
+        goto exit;
+    }
+    memcpy(key_xy, public_key, 65);
 
 exit:
     mbedtls_entropy_free(&entropy);
     mbedtls_ctr_drbg_free(&ctr_drbg);
-	mbedtls_ecdsa_free(&ctx);
-	return res;
+    mbedtls_ecdsa_free(&ctx);
+    return res;
 }
 
 char *ecdsa_get_error(int ret) {
-	static char retstr[300];
-	memset(retstr, 0x00, sizeof(retstr));
-	mbedtls_strerror(ret, retstr, sizeof(retstr));
-	return retstr;
+    static char retstr[300];
+    memset(retstr, 0x00, sizeof(retstr));
+    mbedtls_strerror(ret, retstr, sizeof(retstr));
+    return retstr;
 }
 
 int ecdsa_public_key_from_pk(mbedtls_pk_context *pk, uint8_t *key, size_t keylen) {
-	int res = 0;
-	size_t realkeylen = 0;
-	if (keylen < 65)
-		return 1;
+    int res = 0;
+    size_t realkeylen = 0;
+    if (keylen < 65)
+        return 1;
 
-	mbedtls_ecdsa_context ctx;
-	mbedtls_ecdsa_init(&ctx);
+    mbedtls_ecdsa_context ctx;
+    mbedtls_ecdsa_init(&ctx);
 
-	res = mbedtls_ecp_group_load(&ctx.grp, MBEDTLS_ECP_DP_SECP256R1); // secp256r1
-	if (res)
-		goto exit;
+    res = mbedtls_ecp_group_load(&ctx.grp, MBEDTLS_ECP_DP_SECP256R1); // secp256r1
+    if (res)
+        goto exit;
 
-	res = mbedtls_ecdsa_from_keypair(&ctx, mbedtls_pk_ec(*pk) );
-	if (res)
-		goto exit;
+    res = mbedtls_ecdsa_from_keypair(&ctx, mbedtls_pk_ec(*pk) );
+    if (res)
+        goto exit;
 
-	res = mbedtls_ecp_point_write_binary(&ctx.grp, &ctx.Q, MBEDTLS_ECP_PF_UNCOMPRESSED, &realkeylen, key, keylen);
-	if (realkeylen != 65)
-		res = 2;
+    res = mbedtls_ecp_point_write_binary(&ctx.grp, &ctx.Q, MBEDTLS_ECP_PF_UNCOMPRESSED, &realkeylen, key, keylen);
+    if (realkeylen != 65)
+        res = 2;
 exit:
-	mbedtls_ecdsa_free(&ctx);
-	return res;
+    mbedtls_ecdsa_free(&ctx);
+    return res;
 }
 
 int ecdsa_signature_create(uint8_t *key_d, uint8_t *key_xy, uint8_t *input, int length, uint8_t *signature, size_t *signaturelen) {
-	int res;
-	*signaturelen = 0;
+    int res;
+    *signaturelen = 0;
 
-	uint8_t shahash[32] = {0};
-	res = sha256hash(input, length, shahash);
-	if (res)
-		return res;
+    uint8_t shahash[32] = {0};
+    res = sha256hash(input, length, shahash);
+    if (res)
+        return res;
 
     mbedtls_entropy_context entropy;
     mbedtls_ctr_drbg_context ctr_drbg;
-	const char *pers = "ecdsaproxmark";
+    const char *pers = "ecdsaproxmark";
 
     mbedtls_entropy_init(&entropy);
     mbedtls_ctr_drbg_init(&ctr_drbg);
 
     res = mbedtls_ctr_drbg_seed(&ctr_drbg, mbedtls_entropy_func, &entropy, (const unsigned char *)pers, strlen(pers));
-	if (res)
+    if (res)
         goto exit;
 
-	mbedtls_ecdsa_context ctx;
-	ecdsa_init(&ctx, key_d, key_xy);
-	res = mbedtls_ecdsa_write_signature(&ctx, MBEDTLS_MD_SHA256, shahash, sizeof(shahash), signature, signaturelen, mbedtls_ctr_drbg_random, &ctr_drbg);
+    mbedtls_ecdsa_context ctx;
+    ecdsa_init(&ctx, key_d, key_xy);
+    res = mbedtls_ecdsa_write_signature(&ctx, MBEDTLS_MD_SHA256, shahash, sizeof(shahash), signature, signaturelen, mbedtls_ctr_drbg_random, &ctr_drbg);
 
 exit:
     mbedtls_ctr_drbg_free(&ctr_drbg);
-	mbedtls_ecdsa_free(&ctx);
-	return res;
+    mbedtls_ecdsa_free(&ctx);
+    return res;
 }
 
 int ecdsa_signature_create_test(char * key_d, char *key_x, char *key_y, char *random, uint8_t *input, int length, uint8_t *signature, size_t *signaturelen) {
-	int res;
-	*signaturelen = 0;
+    int res;
+    *signaturelen = 0;
 
-	uint8_t shahash[32] = {0};
-	res = sha256hash(input, length, shahash);
-	if (res)
-		return res;
+    uint8_t shahash[32] = {0};
+    res = sha256hash(input, length, shahash);
+    if (res)
+        return res;
 
-	int rndlen = 0;
-	param_gethex_to_eol(random, 0, fixed_rand_value, sizeof(fixed_rand_value), &rndlen);
+    int rndlen = 0;
+    param_gethex_to_eol(random, 0, fixed_rand_value, sizeof(fixed_rand_value), &rndlen);
 
-	mbedtls_ecdsa_context ctx;
-	ecdsa_init_str(&ctx, key_d, key_x, key_y);
-	res = mbedtls_ecdsa_write_signature(&ctx, MBEDTLS_MD_SHA256, shahash, sizeof(shahash), signature, signaturelen, fixed_rand, NULL);
+    mbedtls_ecdsa_context ctx;
+    ecdsa_init_str(&ctx, key_d, key_x, key_y);
+    res = mbedtls_ecdsa_write_signature(&ctx, MBEDTLS_MD_SHA256, shahash, sizeof(shahash), signature, signaturelen, fixed_rand, NULL);
 
-	mbedtls_ecdsa_free(&ctx);
-	return res;
+    mbedtls_ecdsa_free(&ctx);
+    return res;
 }
 
 int ecdsa_signature_verify_keystr(char *key_x, char *key_y, uint8_t *input, int length, uint8_t *signature, size_t signaturelen) {
-	int res;
-	uint8_t shahash[32] = {0};
-	res = sha256hash(input, length, shahash);
-	if (res)
-		return res;
+    int res;
+    uint8_t shahash[32] = {0};
+    res = sha256hash(input, length, shahash);
+    if (res)
+        return res;
 
-	mbedtls_ecdsa_context ctx;
-	ecdsa_init_str(&ctx, NULL, key_x, key_y);
-	res = mbedtls_ecdsa_read_signature(&ctx, shahash, sizeof(shahash), signature, signaturelen);
+    mbedtls_ecdsa_context ctx;
+    ecdsa_init_str(&ctx, NULL, key_x, key_y);
+    res = mbedtls_ecdsa_read_signature(&ctx, shahash, sizeof(shahash), signature, signaturelen);
 
-	mbedtls_ecdsa_free(&ctx);
-	return res;
+    mbedtls_ecdsa_free(&ctx);
+    return res;
 }
 
 int ecdsa_signature_verify(uint8_t *key_xy, uint8_t *input, int length, uint8_t *signature, size_t signaturelen) {
-	int res;
-	uint8_t shahash[32] = {0};
-	res = sha256hash(input, length, shahash);
-	if (res)
-		return res;
+    int res;
+    uint8_t shahash[32] = {0};
+    res = sha256hash(input, length, shahash);
+    if (res)
+        return res;
 
-	mbedtls_ecdsa_context ctx;
-	ecdsa_init(&ctx, NULL, key_xy);
-	res = mbedtls_ecdsa_read_signature(&ctx, shahash, sizeof(shahash), signature, signaturelen);
+    mbedtls_ecdsa_context ctx;
+    ecdsa_init(&ctx, NULL, key_xy);
+    res = mbedtls_ecdsa_read_signature(&ctx, shahash, sizeof(shahash), signature, signaturelen);
 
-	mbedtls_ecdsa_free(&ctx);
-	return res;
+    mbedtls_ecdsa_free(&ctx);
+    return res;
 }
 
 #define T_PRIVATE_KEY "C477F9F65C22CCE20657FAA5B2D1D8122336F851A508A1ED04E479C34985BF96"
@@ -322,86 +322,86 @@ int ecdsa_signature_verify(uint8_t *key_xy, uint8_t *input, int length, uint8_t
 #define T_S           "DC42C2122D6392CD3E3A993A89502A8198C1886FE69D262C4B329BDB6B63FAF1"
 
 int ecdsa_nist_test(bool verbose) {
-	int res;
-	uint8_t input[] = "Example of ECDSA with P-256";
-	int length = strlen((char *)input);
-	uint8_t signature[300] = {0};
-	size_t siglen = 0;
+    int res;
+    uint8_t input[] = "Example of ECDSA with P-256";
+    int length = strlen((char *)input);
+    uint8_t signature[300] = {0};
+    size_t siglen = 0;
 
-	// NIST ecdsa test
-	if (verbose)
-		printf("  ECDSA NIST test: ");
-	// make signature
-	res = ecdsa_signature_create_test(T_PRIVATE_KEY, T_Q_X, T_Q_Y, T_K, input, length, signature, &siglen);
-//	printf("res: %x signature[%x]: %s\n", (res<0)?-res:res, siglen, sprint_hex(signature, siglen));
-	if (res)
-		goto exit;
+    // NIST ecdsa test
+    if (verbose)
+        printf("  ECDSA NIST test: ");
+    // make signature
+    res = ecdsa_signature_create_test(T_PRIVATE_KEY, T_Q_X, T_Q_Y, T_K, input, length, signature, &siglen);
+// printf("res: %x signature[%x]: %s\n", (res<0)?-res:res, siglen, sprint_hex(signature, siglen));
+    if (res)
+        goto exit;
 
-	// check vectors
-	uint8_t rval[300] = {0};
-	uint8_t sval[300] = {0};
-	res = ecdsa_asn1_get_signature(signature, siglen, rval, sval);
-	if (res)
-		goto exit;
+    // check vectors
+    uint8_t rval[300] = {0};
+    uint8_t sval[300] = {0};
+    res = ecdsa_asn1_get_signature(signature, siglen, rval, sval);
+    if (res)
+        goto exit;
 
-	int slen = 0;
-	uint8_t rval_s[33] = {0};
-	param_gethex_to_eol(T_R, 0, rval_s, sizeof(rval_s), &slen);
-	uint8_t sval_s[33] = {0};
-	param_gethex_to_eol(T_S, 0, sval_s, sizeof(sval_s), &slen);
-	if (strncmp((char *)rval, (char *)rval_s, 32) || strncmp((char *)sval, (char *)sval_s, 32)) {
-		printf("R or S check error\n");
-		res = 100;
-		goto exit;
-	}
+    int slen = 0;
+    uint8_t rval_s[33] = {0};
+    param_gethex_to_eol(T_R, 0, rval_s, sizeof(rval_s), &slen);
+    uint8_t sval_s[33] = {0};
+    param_gethex_to_eol(T_S, 0, sval_s, sizeof(sval_s), &slen);
+    if (strncmp((char *)rval, (char *)rval_s, 32) || strncmp((char *)sval, (char *)sval_s, 32)) {
+        printf("R or S check error\n");
+        res = 100;
+        goto exit;
+    }
 
-	// verify signature
-	res = ecdsa_signature_verify_keystr(T_Q_X, T_Q_Y, input, length, signature, siglen);
-	if (res)
-		goto exit;
+    // verify signature
+    res = ecdsa_signature_verify_keystr(T_Q_X, T_Q_Y, input, length, signature, siglen);
+    if (res)
+        goto exit;
 
-	// verify wrong signature
-	input[0] ^= 0xFF;
-	res = ecdsa_signature_verify_keystr(T_Q_X, T_Q_Y, input, length, signature, siglen);
-	if (!res) {
-		res = 1;
-		goto exit;
-	}
-	if (verbose)
-		printf("passed\n");
+    // verify wrong signature
+    input[0] ^= 0xFF;
+    res = ecdsa_signature_verify_keystr(T_Q_X, T_Q_Y, input, length, signature, siglen);
+    if (!res) {
+        res = 1;
+        goto exit;
+    }
+    if (verbose)
+        printf("passed\n");
 
-	// random ecdsa test
-	if (verbose)
-		printf("  ECDSA binary signature create/check test: ");
+    // random ecdsa test
+    if (verbose)
+        printf("  ECDSA binary signature create/check test: ");
 
-	uint8_t key_d[32] = {0};
-	uint8_t key_xy[32 * 2 + 2] = {0};
-	memset(signature, 0x00, sizeof(signature));
-	siglen = 0;
+    uint8_t key_d[32] = {0};
+    uint8_t key_xy[32 * 2 + 2] = {0};
+    memset(signature, 0x00, sizeof(signature));
+    siglen = 0;
 
-	res = ecdsa_key_create(key_d, key_xy);
-	if (res)
-		goto exit;
+    res = ecdsa_key_create(key_d, key_xy);
+    if (res)
+        goto exit;
 
-	res = ecdsa_signature_create(key_d, key_xy, input, length, signature, &siglen);
-	if (res)
-		goto exit;
+    res = ecdsa_signature_create(key_d, key_xy, input, length, signature, &siglen);
+    if (res)
+        goto exit;
 
-	res = ecdsa_signature_verify(key_xy, input, length, signature, siglen);
-	if (res)
-		goto exit;
+    res = ecdsa_signature_verify(key_xy, input, length, signature, siglen);
+    if (res)
+        goto exit;
 
-	input[0] ^= 0xFF;
-	res = ecdsa_signature_verify(key_xy, input, length, signature, siglen);
-	if (!res)
-		goto exit;
+    input[0] ^= 0xFF;
+    res = ecdsa_signature_verify(key_xy, input, length, signature, siglen);
+    if (!res)
+        goto exit;
 
-	if (verbose)
-		printf("passed\n\n");
+    if (verbose)
+        printf("passed\n\n");
 
-	return 0;
+    return 0;
 exit:
-	if (verbose)
-		printf("failed\n\n");
-	return res;
+    if (verbose)
+        printf("failed\n\n");
+    return res;
 }
diff --git a/client/elf.h b/client/elf.h
index 90e203353..0551cbd76 100644
--- a/client/elf.h
+++ b/client/elf.h
@@ -10,33 +10,33 @@
 #define __ELF_H__
 
 typedef struct {
-	uint32_t p_type;
-	uint32_t p_offset;
-	uint32_t p_vaddr;
-	uint32_t p_paddr;
-	uint32_t p_filesz;
-	uint32_t p_memsz;
-	uint32_t p_flags;
-	uint32_t p_align;
+    uint32_t p_type;
+    uint32_t p_offset;
+    uint32_t p_vaddr;
+    uint32_t p_paddr;
+    uint32_t p_filesz;
+    uint32_t p_memsz;
+    uint32_t p_flags;
+    uint32_t p_align;
 } __attribute__((__packed__)) Elf32_Phdr;
 
 #define EI_NIDENT 16
 
 typedef struct {
-	unsigned char   e_ident[EI_NIDENT];
-	uint16_t e_type;
-	uint16_t e_machine;
-	uint32_t e_version;
-	uint32_t e_entry;
-	uint32_t e_phoff;
-	uint32_t e_shoff;
-	uint32_t e_flags;
-	uint16_t e_ehsize;
-	uint16_t e_phentsize;
-	uint16_t e_phnum;
-	uint16_t e_shentsize;
-	uint16_t e_shnum;
-	uint16_t e_shtrndx;
+    unsigned char   e_ident[EI_NIDENT];
+    uint16_t e_type;
+    uint16_t e_machine;
+    uint32_t e_version;
+    uint32_t e_entry;
+    uint32_t e_phoff;
+    uint32_t e_shoff;
+    uint32_t e_flags;
+    uint16_t e_ehsize;
+    uint16_t e_phentsize;
+    uint16_t e_phnum;
+    uint16_t e_shentsize;
+    uint16_t e_shnum;
+    uint16_t e_shtrndx;
 } __attribute__((__packed__)) Elf32_Ehdr;
 
 #define PT_NULL      0
diff --git a/client/emv/apduinfo.c b/client/emv/apduinfo.c
index 17e87c45f..226252e14 100644
--- a/client/emv/apduinfo.c
+++ b/client/emv/apduinfo.c
@@ -11,307 +11,307 @@
 #include "apduinfo.h"
 
 const APDUCode APDUCodeTable[] = {
-	//  ID             Type                  Description
-	{"XXXX", 	APDUCODE_TYPE_NONE,			""}, // blank string
-	{"6---", 	APDUCODE_TYPE_ERROR,		"Class not supported."},
-	{"61--", 	APDUCODE_TYPE_INFO,			"Response bytes still available"},
-	{"61XX", 	APDUCODE_TYPE_INFO,			"Command successfully executed; 'XX' bytes of data are available and can be requested using GET RESPONSE."},
-	{"62--", 	APDUCODE_TYPE_WARNING,		"State of non-volatile memory unchanged"},
-	{"6200", 	APDUCODE_TYPE_WARNING,		"No information given (NV-Ram not changed)"},
-	{"6201", 	APDUCODE_TYPE_WARNING,		"NV-Ram not changed 1."},
-	{"6281", 	APDUCODE_TYPE_WARNING,		"Part of returned data may be corrupted"},
-	{"6282", 	APDUCODE_TYPE_WARNING,		"End of file/record reached before reading Le bytes"},
-	{"6283", 	APDUCODE_TYPE_WARNING,		"Selected file invalidated"},
-	{"6284", 	APDUCODE_TYPE_WARNING,		"Selected file is not valid. FCI not formated according to ISO"},
-	{"6285", 	APDUCODE_TYPE_WARNING,		"No input data available from a sensor on the card. No Purse Engine enslaved for R3bc"},
-	{"62A2", 	APDUCODE_TYPE_WARNING,		"Wrong R-MAC"},
-	{"62A4", 	APDUCODE_TYPE_WARNING,		"Card locked (during reset( ))"},
-	{"62CX", 	APDUCODE_TYPE_WARNING,		"Counter with value x (command dependent)"},
-	{"62F1", 	APDUCODE_TYPE_WARNING,		"Wrong C-MAC"},
-	{"62F3", 	APDUCODE_TYPE_WARNING,		"Internal reset"},
-	{"62F5", 	APDUCODE_TYPE_WARNING,		"Default agent locked"},
-	{"62F7", 	APDUCODE_TYPE_WARNING,		"Cardholder locked"},
-	{"62F8", 	APDUCODE_TYPE_WARNING,		"Basement is current agent"},
-	{"62F9", 	APDUCODE_TYPE_WARNING,		"CALC Key Set not unblocked"},
-	{"62FX", 	APDUCODE_TYPE_WARNING,		"-"},
-	{"62XX", 	APDUCODE_TYPE_WARNING,		"RFU"},
-	{"63--", 	APDUCODE_TYPE_WARNING,		"State of non-volatile memory changed"},
-	{"6300", 	APDUCODE_TYPE_WARNING,		"No information given (NV-Ram changed)"},
-	{"6381", 	APDUCODE_TYPE_WARNING,		"File filled up by the last write. Loading/updating is not allowed."},
-	{"6382", 	APDUCODE_TYPE_WARNING,		"Card key not supported."},
-	{"6383", 	APDUCODE_TYPE_WARNING,		"Reader key not supported."},
-	{"6384", 	APDUCODE_TYPE_WARNING,		"Plaintext transmission not supported."},
-	{"6385", 	APDUCODE_TYPE_WARNING,		"Secured transmission not supported."},
-	{"6386", 	APDUCODE_TYPE_WARNING,		"Volatile memory is not available."},
-	{"6387", 	APDUCODE_TYPE_WARNING,		"Non-volatile memory is not available."},
-	{"6388", 	APDUCODE_TYPE_WARNING,		"Key number not valid."},
-	{"6389", 	APDUCODE_TYPE_WARNING,		"Key length is not correct."},
-	{"63C0", 	APDUCODE_TYPE_WARNING,		"Verify fail, no try left."},
-	{"63C1", 	APDUCODE_TYPE_WARNING,		"Verify fail, 1 try left."},
-	{"63C2", 	APDUCODE_TYPE_WARNING,		"Verify fail, 2 tries left."},
-	{"63C3", 	APDUCODE_TYPE_WARNING,		"Verify fail, 3 tries left."},
-	{"63CX", 	APDUCODE_TYPE_WARNING,		"The counter has reached the value 'x' (0 = x = 15) (command dependent)."},
-	{"63F1", 	APDUCODE_TYPE_WARNING,		"More data expected."},
-	{"63F2", 	APDUCODE_TYPE_WARNING,		"More data expected and proactive command pending."},
-	{"63FX", 	APDUCODE_TYPE_WARNING,		"-"},
-	{"63XX", 	APDUCODE_TYPE_WARNING,		"RFU"},
-	{"64--", 	APDUCODE_TYPE_ERROR,		"State of non-volatile memory unchanged"},
-	{"6400", 	APDUCODE_TYPE_ERROR,		"No information given (NV-Ram not changed)"},
-	{"6401", 	APDUCODE_TYPE_ERROR,		"Command timeout. Immediate response required by the card."},
-	{"64XX", 	APDUCODE_TYPE_ERROR,		"RFU"},
-	{"65--", 	APDUCODE_TYPE_ERROR,		"State of non-volatile memory changed"},
-	{"6500", 	APDUCODE_TYPE_ERROR,		"No information given"},
-	{"6501", 	APDUCODE_TYPE_ERROR,		"Write error. Memory failure. There have been problems in writing or reading the EEPROM. Other hardware problems may also bring this error."},
-	{"6581", 	APDUCODE_TYPE_ERROR,		"Memory failure"},
-	{"65FX", 	APDUCODE_TYPE_ERROR,		"-"},
-	{"65XX", 	APDUCODE_TYPE_ERROR,		"RFU"},
-	{"66--", 	APDUCODE_TYPE_SECURITY,		" "},
-	{"6600", 	APDUCODE_TYPE_SECURITY,		"Error while receiving (timeout)"},
-	{"6601", 	APDUCODE_TYPE_SECURITY,		"Error while receiving (character parity error)"},
-	{"6602", 	APDUCODE_TYPE_SECURITY,		"Wrong checksum"},
-	{"6603", 	APDUCODE_TYPE_SECURITY,		"The current DF file without FCI"},
-	{"6604", 	APDUCODE_TYPE_SECURITY,		"No SF or KF under the current DF"},
-	{"6669", 	APDUCODE_TYPE_SECURITY,		"Incorrect Encryption/Decryption Padding"},
-	{"66XX", 	APDUCODE_TYPE_SECURITY,		"-"},
-	{"67--", 	APDUCODE_TYPE_ERROR,		" "},
-	{"6700", 	APDUCODE_TYPE_ERROR,		"Wrong length"},
-	{"67XX", 	APDUCODE_TYPE_ERROR,		"length incorrect (procedure)(ISO 7816-3)"},
-	{"68--", 	APDUCODE_TYPE_ERROR,		"Functions in CLA not supported"},
-	{"6800", 	APDUCODE_TYPE_ERROR,		"No information given (The request function is not supported by the card)"},
-	{"6881", 	APDUCODE_TYPE_ERROR,		"Logical channel not supported"},
-	{"6882", 	APDUCODE_TYPE_ERROR,		"Secure messaging not supported"},
-	{"6883", 	APDUCODE_TYPE_ERROR,		"Last command of the chain expected"},
-	{"6884", 	APDUCODE_TYPE_ERROR,		"Command chaining not supported"},
-	{"68FX", 	APDUCODE_TYPE_ERROR,		"-"},
-	{"68XX", 	APDUCODE_TYPE_ERROR,		"RFU"},
-	{"69--", 	APDUCODE_TYPE_ERROR,		"Command not allowed"},
-	{"6900", 	APDUCODE_TYPE_ERROR,		"No information given (Command not allowed)"},
-	{"6901", 	APDUCODE_TYPE_ERROR,		"Command not accepted (inactive state)"},
-	{"6981", 	APDUCODE_TYPE_ERROR,		"Command incompatible with file structure"},
-	{"6982", 	APDUCODE_TYPE_ERROR,		"Security condition not satisfied."},
-	{"6983", 	APDUCODE_TYPE_ERROR,		"Authentication method blocked"},
-	{"6984", 	APDUCODE_TYPE_ERROR,		"Referenced data reversibly blocked (invalidated)"},
-	{"6985", 	APDUCODE_TYPE_ERROR,		"Conditions of use not satisfied."},
-	{"6986", 	APDUCODE_TYPE_ERROR,		"Command not allowed (no current EF)"},
-	{"6987", 	APDUCODE_TYPE_ERROR,		"Expected secure messaging (SM) object missing"},
-	{"6988", 	APDUCODE_TYPE_ERROR,		"Incorrect secure messaging (SM) data object"},
-	{"698D", 	APDUCODE_TYPE_NONE, 		"Reserved"},
-	{"6996", 	APDUCODE_TYPE_ERROR,		"Data must be updated again"},
-	{"69E1", 	APDUCODE_TYPE_ERROR,		"POL1 of the currently Enabled Profile prevents this action."},
-	{"69F0", 	APDUCODE_TYPE_ERROR,		"Permission Denied"},
-	{"69F1", 	APDUCODE_TYPE_ERROR,		"Permission Denied - Missing Privilege"},
-	{"69FX", 	APDUCODE_TYPE_ERROR,		"-"},
-	{"69XX", 	APDUCODE_TYPE_ERROR,		"RFU"},
-	{"6A--", 	APDUCODE_TYPE_ERROR,		"Wrong parameter(s) P1-P2"},
-	{"6A00", 	APDUCODE_TYPE_ERROR,		"No information given (Bytes P1 and/or P2 are incorrect)"},
-	{"6A80", 	APDUCODE_TYPE_ERROR,		"The parameters in the data field are incorrect."},
-	{"6A81", 	APDUCODE_TYPE_ERROR,		"Function not supported"},
-	{"6A82", 	APDUCODE_TYPE_ERROR,		"File not found"},
-	{"6A83", 	APDUCODE_TYPE_ERROR,		"Record not found"},
-	{"6A84", 	APDUCODE_TYPE_ERROR,		"There is insufficient memory space in record or file"},
-	{"6A85", 	APDUCODE_TYPE_ERROR,		"Lc inconsistent with TLV structure"},
-	{"6A86", 	APDUCODE_TYPE_ERROR,		"Incorrect P1 or P2 parameter."},
-	{"6A87", 	APDUCODE_TYPE_ERROR,		"Lc inconsistent with P1-P2"},
-	{"6A88", 	APDUCODE_TYPE_ERROR,		"Referenced data not found"},
-	{"6A89", 	APDUCODE_TYPE_ERROR,		"File already exists"},
-	{"6A8A", 	APDUCODE_TYPE_ERROR,		"DF name already exists."},
-	{"6AF0", 	APDUCODE_TYPE_ERROR,		"Wrong parameter value"},
-	{"6AFX", 	APDUCODE_TYPE_ERROR,		"-"},
-	{"6AXX", 	APDUCODE_TYPE_ERROR,		"RFU"},
-	{"6B--", 	APDUCODE_TYPE_ERROR,		" "},
-	{"6B00", 	APDUCODE_TYPE_ERROR,		"Wrong parameter(s) P1-P2"},
-	{"6BXX", 	APDUCODE_TYPE_ERROR,		"Reference incorrect (procedure byte), (ISO 7816-3)"},
-	{"6C--", 	APDUCODE_TYPE_ERROR,		"Wrong length Le"},
-	{"6C00", 	APDUCODE_TYPE_ERROR,		"Incorrect P3 length."},
-	{"6CXX", 	APDUCODE_TYPE_ERROR,		"Bad length value in Le; 'xx' is the correct exact Le"},
-	{"6D--", 	APDUCODE_TYPE_ERROR,		" "},
-	{"6D00", 	APDUCODE_TYPE_ERROR,		"Instruction code not supported or invalid"},
-	{"6DXX", 	APDUCODE_TYPE_ERROR,		"Instruction code not programmed or invalid (procedure byte), (ISO 7816-3)"},
-	{"6E--", 	APDUCODE_TYPE_ERROR,		" "},
-	{"6E00", 	APDUCODE_TYPE_ERROR,		"Class not supported"},
-	{"6EXX", 	APDUCODE_TYPE_ERROR,		"Instruction class not supported (procedure byte), (ISO 7816-3)"},
-	{"6F--", 	APDUCODE_TYPE_ERROR,		"Internal exception"},
-	{"6F00", 	APDUCODE_TYPE_ERROR,		"Command aborted - more exact diagnosis not possible (e.g., operating system error)."},
-	{"6FFF", 	APDUCODE_TYPE_ERROR,		"Card dead (overuse)"},
-	{"6FXX", 	APDUCODE_TYPE_ERROR,		"No precise diagnosis (procedure byte), (ISO 7816-3)"},
-	{"9---", 	APDUCODE_TYPE_NONE, 		""},
-	{"9000", 	APDUCODE_TYPE_INFO,			"Command successfully executed (OK)."},
-	{"9004", 	APDUCODE_TYPE_WARNING,		"PIN not succesfully verified, 3 or more PIN tries left"},
-	{"9008", 	APDUCODE_TYPE_NONE, 		"Key/file not found"},
-	{"9080", 	APDUCODE_TYPE_WARNING,		"Unblock Try Counter has reached zero"},
-	{"9100", 	APDUCODE_TYPE_NONE, 		"OK"},
-	{"9101", 	APDUCODE_TYPE_NONE, 		"States.activity, States.lock Status or States.lockable has wrong value"},
-	{"9102", 	APDUCODE_TYPE_NONE, 		"Transaction number reached its limit"},
-	{"910C", 	APDUCODE_TYPE_NONE, 		"No changes"},
-	{"910E", 	APDUCODE_TYPE_NONE, 		"Insufficient NV-Memory to complete command"},
-	{"911C", 	APDUCODE_TYPE_NONE, 		"Command code not supported"},
-	{"911E", 	APDUCODE_TYPE_NONE, 		"CRC or MAC does not match data"},
-	{"9140", 	APDUCODE_TYPE_NONE, 		"Invalid key number specified"},
-	{"917E", 	APDUCODE_TYPE_NONE, 		"Length of command string invalid"},
-	{"919D", 	APDUCODE_TYPE_NONE, 		"Not allow the requested command"},
-	{"919E", 	APDUCODE_TYPE_NONE, 		"Value of the parameter invalid"},
-	{"91A0", 	APDUCODE_TYPE_NONE, 		"Requested AID not present on PICC"},
-	{"91A1", 	APDUCODE_TYPE_NONE, 		"Unrecoverable error within application"},
-	{"91AE", 	APDUCODE_TYPE_NONE, 		"Authentication status does not allow the requested command"},
-	{"91AF", 	APDUCODE_TYPE_NONE, 		"Additional data frame is expected to be sent"},
-	{"91BE", 	APDUCODE_TYPE_NONE, 		"Out of boundary"},
-	{"91C1", 	APDUCODE_TYPE_NONE, 		"Unrecoverable error within PICC"},
-	{"91CA", 	APDUCODE_TYPE_NONE, 		"Previous Command was not fully completed"},
-	{"91CD", 	APDUCODE_TYPE_NONE, 		"PICC was disabled by an unrecoverable error"},
-	{"91CE", 	APDUCODE_TYPE_NONE, 		"Number of Applications limited to 28"},
-	{"91DE", 	APDUCODE_TYPE_NONE, 		"File or application already exists"},
-	{"91EE", 	APDUCODE_TYPE_NONE, 		"Could not complete NV-write operation due to loss of power"},
-	{"91F0", 	APDUCODE_TYPE_NONE, 		"Specified file number does not exist"},
-	{"91F1", 	APDUCODE_TYPE_NONE, 		"Unrecoverable error within file"},
-	{"920x", 	APDUCODE_TYPE_INFO,			"Writing to EEPROM successful after 'x' attempts."},
-	{"9210", 	APDUCODE_TYPE_ERROR,		"Insufficient memory. No more storage available."},
-	{"9240", 	APDUCODE_TYPE_ERROR,		"Writing to EEPROM not successful."},
-	{"9301", 	APDUCODE_TYPE_NONE, 		"Integrity error"},
-	{"9302", 	APDUCODE_TYPE_NONE, 		"Candidate S2 invalid"},
-	{"9303", 	APDUCODE_TYPE_ERROR,		"Application is permanently locked"},
-	{"9400", 	APDUCODE_TYPE_ERROR,		"No EF selected."},
-	{"9401", 	APDUCODE_TYPE_NONE, 		"Candidate currency code does not match purse currency"},
-	{"9402", 	APDUCODE_TYPE_NONE, 		"Candidate amount too high"},
-	{"9402", 	APDUCODE_TYPE_ERROR,		"Address range exceeded."},
-	{"9403", 	APDUCODE_TYPE_NONE, 		"Candidate amount too low"},
-	{"9404", 	APDUCODE_TYPE_ERROR,		"FID not found, record not found or comparison pattern not found."},
-	{"9405", 	APDUCODE_TYPE_NONE, 		"Problems in the data field"},
-	{"9406", 	APDUCODE_TYPE_ERROR,		"Required MAC unavailable"},
-	{"9407", 	APDUCODE_TYPE_NONE, 		"Bad currency : purse engine has no slot with R3bc currency"},
-	{"9408", 	APDUCODE_TYPE_NONE, 		"R3bc currency not supported in purse engine"},
-	{"9408", 	APDUCODE_TYPE_ERROR,		"Selected file type does not match command."},
-	{"9580", 	APDUCODE_TYPE_NONE, 		"Bad sequence"},
-	{"9681", 	APDUCODE_TYPE_NONE, 		"Slave not found"},
-	{"9700", 	APDUCODE_TYPE_NONE, 		"PIN blocked and Unblock Try Counter is 1 or 2"},
-	{"9702", 	APDUCODE_TYPE_NONE, 		"Main keys are blocked"},
-	{"9704", 	APDUCODE_TYPE_NONE, 		"PIN not succesfully verified, 3 or more PIN tries left"},
-	{"9784", 	APDUCODE_TYPE_NONE, 		"Base key"},
-	{"9785", 	APDUCODE_TYPE_NONE, 		"Limit exceeded - C-MAC key"},
-	{"9786", 	APDUCODE_TYPE_NONE, 		"SM error - Limit exceeded - R-MAC key"},
-	{"9787", 	APDUCODE_TYPE_NONE, 		"Limit exceeded - sequence counter"},
-	{"9788", 	APDUCODE_TYPE_NONE, 		"Limit exceeded - R-MAC length"},
-	{"9789", 	APDUCODE_TYPE_NONE, 		"Service not available"},
-	{"9802", 	APDUCODE_TYPE_ERROR,		"No PIN defined."},
-	{"9804", 	APDUCODE_TYPE_ERROR,		"Access conditions not satisfied, authentication failed."},
-	{"9835", 	APDUCODE_TYPE_ERROR,		"ASK RANDOM or GIVE RANDOM not executed."},
-	{"9840", 	APDUCODE_TYPE_ERROR,		"PIN verification not successful."},
-	{"9850", 	APDUCODE_TYPE_ERROR,		"INCREASE or DECREASE could not be executed because a limit has been reached."},
-	{"9862", 	APDUCODE_TYPE_ERROR,		"Authentication Error, application specific (incorrect MAC)"},
-	{"9900", 	APDUCODE_TYPE_NONE, 		"1 PIN try left"},
-	{"9904", 	APDUCODE_TYPE_NONE, 		"PIN not succesfully verified, 1 PIN try left"},
-	{"9985", 	APDUCODE_TYPE_NONE, 		"Wrong status - Cardholder lock"},
-	{"9986", 	APDUCODE_TYPE_ERROR,		"Missing privilege"},
-	{"9987", 	APDUCODE_TYPE_NONE, 		"PIN is not installed"},
-	{"9988", 	APDUCODE_TYPE_NONE, 		"Wrong status - R-MAC state"},
-	{"9A00", 	APDUCODE_TYPE_NONE, 		"2 PIN try left"},
-	{"9A04", 	APDUCODE_TYPE_NONE, 		"PIN not succesfully verified, 2 PIN try left"},
-	{"9A71", 	APDUCODE_TYPE_NONE, 		"Wrong parameter value - Double agent AID"},
-	{"9A72", 	APDUCODE_TYPE_NONE, 		"Wrong parameter value - Double agent Type"},
-	{"9D05", 	APDUCODE_TYPE_ERROR,		"Incorrect certificate type"},
-	{"9D07", 	APDUCODE_TYPE_ERROR,		"Incorrect session data size"},
-	{"9D08", 	APDUCODE_TYPE_ERROR,		"Incorrect DIR file record size"},
-	{"9D09", 	APDUCODE_TYPE_ERROR,		"Incorrect FCI record size"},
-	{"9D0A", 	APDUCODE_TYPE_ERROR,		"Incorrect code size"},
-	{"9D10", 	APDUCODE_TYPE_ERROR,		"Insufficient memory to load application"},
-	{"9D11", 	APDUCODE_TYPE_ERROR,		"Invalid AID"},
-	{"9D12", 	APDUCODE_TYPE_ERROR,		"Duplicate AID"},
-	{"9D13", 	APDUCODE_TYPE_ERROR,		"Application previously loaded"},
-	{"9D14", 	APDUCODE_TYPE_ERROR,		"Application history list full"},
-	{"9D15", 	APDUCODE_TYPE_ERROR,		"Application not open"},
-	{"9D17", 	APDUCODE_TYPE_ERROR,		"Invalid offset"},
-	{"9D18", 	APDUCODE_TYPE_ERROR,		"Application already loaded"},
-	{"9D19", 	APDUCODE_TYPE_ERROR,		"Invalid certificate"},
-	{"9D1A", 	APDUCODE_TYPE_ERROR,		"Invalid signature"},
-	{"9D1B", 	APDUCODE_TYPE_ERROR,		"Invalid KTU"},
-	{"9D1D", 	APDUCODE_TYPE_ERROR,		"MSM controls not set"},
-	{"9D1E", 	APDUCODE_TYPE_ERROR,		"Application signature does not exist"},
-	{"9D1F", 	APDUCODE_TYPE_ERROR,		"KTU does not exist"},
-	{"9D20", 	APDUCODE_TYPE_ERROR,		"Application not loaded"},
-	{"9D21", 	APDUCODE_TYPE_ERROR,		"Invalid Open command data length"},
-	{"9D30", 	APDUCODE_TYPE_ERROR,		"Check data parameter is incorrect (invalid start address)"},
-	{"9D31", 	APDUCODE_TYPE_ERROR,		"Check data parameter is incorrect (invalid length)"},
-	{"9D32", 	APDUCODE_TYPE_ERROR,		"Check data parameter is incorrect (illegal memory check area)"},
-	{"9D40", 	APDUCODE_TYPE_ERROR,		"Invalid MSM Controls ciphertext"},
-	{"9D41", 	APDUCODE_TYPE_ERROR,		"MSM controls already set"},
-	{"9D42", 	APDUCODE_TYPE_ERROR,		"Set MSM Controls data length less than 2 bytes"},
-	{"9D43", 	APDUCODE_TYPE_ERROR,		"Invalid MSM Controls data length"},
-	{"9D44", 	APDUCODE_TYPE_ERROR,		"Excess MSM Controls ciphertext"},
-	{"9D45", 	APDUCODE_TYPE_ERROR,		"Verification of MSM Controls data failed"},
-	{"9D50", 	APDUCODE_TYPE_ERROR,		"Invalid MCD Issuer production ID"},
-	{"9D51", 	APDUCODE_TYPE_ERROR,		"Invalid MCD Issuer ID"},
-	{"9D52", 	APDUCODE_TYPE_ERROR,		"Invalid set MSM controls data date"},
-	{"9D53", 	APDUCODE_TYPE_ERROR,		"Invalid MCD number"},
-	{"9D54", 	APDUCODE_TYPE_ERROR,		"Reserved field error"},
-	{"9D55", 	APDUCODE_TYPE_ERROR,		"Reserved field error"},
-	{"9D56", 	APDUCODE_TYPE_ERROR,		"Reserved field error"},
-	{"9D57", 	APDUCODE_TYPE_ERROR,		"Reserved field error"},
-	{"9D60", 	APDUCODE_TYPE_ERROR,		"MAC verification failed"},
-	{"9D61", 	APDUCODE_TYPE_ERROR,		"Maximum number of unblocks reached"},
-	{"9D62", 	APDUCODE_TYPE_ERROR,		"Card was not blocked"},
-	{"9D63", 	APDUCODE_TYPE_ERROR,		"Crypto functions not available"},
-	{"9D64", 	APDUCODE_TYPE_ERROR,		"No application loaded"},
-	{"9E00", 	APDUCODE_TYPE_NONE, 		"PIN not installed"},
-	{"9E04", 	APDUCODE_TYPE_NONE, 		"PIN not succesfully verified, PIN not installed"},
-	{"9F00", 	APDUCODE_TYPE_NONE, 		"PIN blocked and Unblock Try Counter is 3"},
-	{"9F04", 	APDUCODE_TYPE_NONE, 		"PIN not succesfully verified, PIN blocked and Unblock Try Counter is 3"},
-	{"9FXX", 	APDUCODE_TYPE_NONE, 		"Command successfully executed; 'xx' bytes of data are available and can be requested using GET RESPONSE."},
-	{"9XXX", 	APDUCODE_TYPE_NONE, 		"Application related status, (ISO 7816-3)"}
+    //  ID             Type                  Description
+    {"XXXX",     APDUCODE_TYPE_NONE,         ""}, // blank string
+    {"6---",     APDUCODE_TYPE_ERROR,        "Class not supported."},
+    {"61--",     APDUCODE_TYPE_INFO,         "Response bytes still available"},
+    {"61XX",     APDUCODE_TYPE_INFO,         "Command successfully executed; 'XX' bytes of data are available and can be requested using GET RESPONSE."},
+    {"62--",     APDUCODE_TYPE_WARNING,      "State of non-volatile memory unchanged"},
+    {"6200",     APDUCODE_TYPE_WARNING,      "No information given (NV-Ram not changed)"},
+    {"6201",     APDUCODE_TYPE_WARNING,      "NV-Ram not changed 1."},
+    {"6281",     APDUCODE_TYPE_WARNING,      "Part of returned data may be corrupted"},
+    {"6282",     APDUCODE_TYPE_WARNING,      "End of file/record reached before reading Le bytes"},
+    {"6283",     APDUCODE_TYPE_WARNING,      "Selected file invalidated"},
+    {"6284",     APDUCODE_TYPE_WARNING,      "Selected file is not valid. FCI not formated according to ISO"},
+    {"6285",     APDUCODE_TYPE_WARNING,      "No input data available from a sensor on the card. No Purse Engine enslaved for R3bc"},
+    {"62A2",     APDUCODE_TYPE_WARNING,      "Wrong R-MAC"},
+    {"62A4",     APDUCODE_TYPE_WARNING,      "Card locked (during reset( ))"},
+    {"62CX",     APDUCODE_TYPE_WARNING,      "Counter with value x (command dependent)"},
+    {"62F1",     APDUCODE_TYPE_WARNING,      "Wrong C-MAC"},
+    {"62F3",     APDUCODE_TYPE_WARNING,      "Internal reset"},
+    {"62F5",     APDUCODE_TYPE_WARNING,      "Default agent locked"},
+    {"62F7",     APDUCODE_TYPE_WARNING,      "Cardholder locked"},
+    {"62F8",     APDUCODE_TYPE_WARNING,      "Basement is current agent"},
+    {"62F9",     APDUCODE_TYPE_WARNING,      "CALC Key Set not unblocked"},
+    {"62FX",     APDUCODE_TYPE_WARNING,      "-"},
+    {"62XX",     APDUCODE_TYPE_WARNING,      "RFU"},
+    {"63--",     APDUCODE_TYPE_WARNING,      "State of non-volatile memory changed"},
+    {"6300",     APDUCODE_TYPE_WARNING,      "No information given (NV-Ram changed)"},
+    {"6381",     APDUCODE_TYPE_WARNING,      "File filled up by the last write. Loading/updating is not allowed."},
+    {"6382",     APDUCODE_TYPE_WARNING,      "Card key not supported."},
+    {"6383",     APDUCODE_TYPE_WARNING,      "Reader key not supported."},
+    {"6384",     APDUCODE_TYPE_WARNING,      "Plaintext transmission not supported."},
+    {"6385",     APDUCODE_TYPE_WARNING,      "Secured transmission not supported."},
+    {"6386",     APDUCODE_TYPE_WARNING,      "Volatile memory is not available."},
+    {"6387",     APDUCODE_TYPE_WARNING,      "Non-volatile memory is not available."},
+    {"6388",     APDUCODE_TYPE_WARNING,      "Key number not valid."},
+    {"6389",     APDUCODE_TYPE_WARNING,      "Key length is not correct."},
+    {"63C0",     APDUCODE_TYPE_WARNING,      "Verify fail, no try left."},
+    {"63C1",     APDUCODE_TYPE_WARNING,      "Verify fail, 1 try left."},
+    {"63C2",     APDUCODE_TYPE_WARNING,      "Verify fail, 2 tries left."},
+    {"63C3",     APDUCODE_TYPE_WARNING,      "Verify fail, 3 tries left."},
+    {"63CX",     APDUCODE_TYPE_WARNING,      "The counter has reached the value 'x' (0 = x = 15) (command dependent)."},
+    {"63F1",     APDUCODE_TYPE_WARNING,      "More data expected."},
+    {"63F2",     APDUCODE_TYPE_WARNING,      "More data expected and proactive command pending."},
+    {"63FX",     APDUCODE_TYPE_WARNING,      "-"},
+    {"63XX",     APDUCODE_TYPE_WARNING,      "RFU"},
+    {"64--",     APDUCODE_TYPE_ERROR,        "State of non-volatile memory unchanged"},
+    {"6400",     APDUCODE_TYPE_ERROR,        "No information given (NV-Ram not changed)"},
+    {"6401",     APDUCODE_TYPE_ERROR,        "Command timeout. Immediate response required by the card."},
+    {"64XX",     APDUCODE_TYPE_ERROR,        "RFU"},
+    {"65--",     APDUCODE_TYPE_ERROR,        "State of non-volatile memory changed"},
+    {"6500",     APDUCODE_TYPE_ERROR,        "No information given"},
+    {"6501",     APDUCODE_TYPE_ERROR,        "Write error. Memory failure. There have been problems in writing or reading the EEPROM. Other hardware problems may also bring this error."},
+    {"6581",     APDUCODE_TYPE_ERROR,        "Memory failure"},
+    {"65FX",     APDUCODE_TYPE_ERROR,        "-"},
+    {"65XX",     APDUCODE_TYPE_ERROR,        "RFU"},
+    {"66--",     APDUCODE_TYPE_SECURITY,     " "},
+    {"6600",     APDUCODE_TYPE_SECURITY,     "Error while receiving (timeout)"},
+    {"6601",     APDUCODE_TYPE_SECURITY,     "Error while receiving (character parity error)"},
+    {"6602",     APDUCODE_TYPE_SECURITY,     "Wrong checksum"},
+    {"6603",     APDUCODE_TYPE_SECURITY,     "The current DF file without FCI"},
+    {"6604",     APDUCODE_TYPE_SECURITY,     "No SF or KF under the current DF"},
+    {"6669",     APDUCODE_TYPE_SECURITY,     "Incorrect Encryption/Decryption Padding"},
+    {"66XX",     APDUCODE_TYPE_SECURITY,     "-"},
+    {"67--",     APDUCODE_TYPE_ERROR,        " "},
+    {"6700",     APDUCODE_TYPE_ERROR,        "Wrong length"},
+    {"67XX",     APDUCODE_TYPE_ERROR,        "length incorrect (procedure)(ISO 7816-3)"},
+    {"68--",     APDUCODE_TYPE_ERROR,        "Functions in CLA not supported"},
+    {"6800",     APDUCODE_TYPE_ERROR,        "No information given (The request function is not supported by the card)"},
+    {"6881",     APDUCODE_TYPE_ERROR,        "Logical channel not supported"},
+    {"6882",     APDUCODE_TYPE_ERROR,        "Secure messaging not supported"},
+    {"6883",     APDUCODE_TYPE_ERROR,        "Last command of the chain expected"},
+    {"6884",     APDUCODE_TYPE_ERROR,        "Command chaining not supported"},
+    {"68FX",     APDUCODE_TYPE_ERROR,        "-"},
+    {"68XX",     APDUCODE_TYPE_ERROR,        "RFU"},
+    {"69--",     APDUCODE_TYPE_ERROR,        "Command not allowed"},
+    {"6900",     APDUCODE_TYPE_ERROR,        "No information given (Command not allowed)"},
+    {"6901",     APDUCODE_TYPE_ERROR,        "Command not accepted (inactive state)"},
+    {"6981",     APDUCODE_TYPE_ERROR,        "Command incompatible with file structure"},
+    {"6982",     APDUCODE_TYPE_ERROR,        "Security condition not satisfied."},
+    {"6983",     APDUCODE_TYPE_ERROR,        "Authentication method blocked"},
+    {"6984",     APDUCODE_TYPE_ERROR,        "Referenced data reversibly blocked (invalidated)"},
+    {"6985",     APDUCODE_TYPE_ERROR,        "Conditions of use not satisfied."},
+    {"6986",     APDUCODE_TYPE_ERROR,        "Command not allowed (no current EF)"},
+    {"6987",     APDUCODE_TYPE_ERROR,        "Expected secure messaging (SM) object missing"},
+    {"6988",     APDUCODE_TYPE_ERROR,        "Incorrect secure messaging (SM) data object"},
+    {"698D",     APDUCODE_TYPE_NONE,         "Reserved"},
+    {"6996",     APDUCODE_TYPE_ERROR,        "Data must be updated again"},
+    {"69E1",     APDUCODE_TYPE_ERROR,        "POL1 of the currently Enabled Profile prevents this action."},
+    {"69F0",     APDUCODE_TYPE_ERROR,        "Permission Denied"},
+    {"69F1",     APDUCODE_TYPE_ERROR,        "Permission Denied - Missing Privilege"},
+    {"69FX",     APDUCODE_TYPE_ERROR,        "-"},
+    {"69XX",     APDUCODE_TYPE_ERROR,        "RFU"},
+    {"6A--",     APDUCODE_TYPE_ERROR,        "Wrong parameter(s) P1-P2"},
+    {"6A00",     APDUCODE_TYPE_ERROR,        "No information given (Bytes P1 and/or P2 are incorrect)"},
+    {"6A80",     APDUCODE_TYPE_ERROR,        "The parameters in the data field are incorrect."},
+    {"6A81",     APDUCODE_TYPE_ERROR,        "Function not supported"},
+    {"6A82",     APDUCODE_TYPE_ERROR,        "File not found"},
+    {"6A83",     APDUCODE_TYPE_ERROR,        "Record not found"},
+    {"6A84",     APDUCODE_TYPE_ERROR,        "There is insufficient memory space in record or file"},
+    {"6A85",     APDUCODE_TYPE_ERROR,        "Lc inconsistent with TLV structure"},
+    {"6A86",     APDUCODE_TYPE_ERROR,        "Incorrect P1 or P2 parameter."},
+    {"6A87",     APDUCODE_TYPE_ERROR,        "Lc inconsistent with P1-P2"},
+    {"6A88",     APDUCODE_TYPE_ERROR,        "Referenced data not found"},
+    {"6A89",     APDUCODE_TYPE_ERROR,        "File already exists"},
+    {"6A8A",     APDUCODE_TYPE_ERROR,        "DF name already exists."},
+    {"6AF0",     APDUCODE_TYPE_ERROR,        "Wrong parameter value"},
+    {"6AFX",     APDUCODE_TYPE_ERROR,        "-"},
+    {"6AXX",     APDUCODE_TYPE_ERROR,        "RFU"},
+    {"6B--",     APDUCODE_TYPE_ERROR,        " "},
+    {"6B00",     APDUCODE_TYPE_ERROR,        "Wrong parameter(s) P1-P2"},
+    {"6BXX",     APDUCODE_TYPE_ERROR,        "Reference incorrect (procedure byte), (ISO 7816-3)"},
+    {"6C--",     APDUCODE_TYPE_ERROR,        "Wrong length Le"},
+    {"6C00",     APDUCODE_TYPE_ERROR,        "Incorrect P3 length."},
+    {"6CXX",     APDUCODE_TYPE_ERROR,        "Bad length value in Le; 'xx' is the correct exact Le"},
+    {"6D--",     APDUCODE_TYPE_ERROR,        " "},
+    {"6D00",     APDUCODE_TYPE_ERROR,        "Instruction code not supported or invalid"},
+    {"6DXX",     APDUCODE_TYPE_ERROR,        "Instruction code not programmed or invalid (procedure byte), (ISO 7816-3)"},
+    {"6E--",     APDUCODE_TYPE_ERROR,        " "},
+    {"6E00",     APDUCODE_TYPE_ERROR,        "Class not supported"},
+    {"6EXX",     APDUCODE_TYPE_ERROR,        "Instruction class not supported (procedure byte), (ISO 7816-3)"},
+    {"6F--",     APDUCODE_TYPE_ERROR,        "Internal exception"},
+    {"6F00",     APDUCODE_TYPE_ERROR,        "Command aborted - more exact diagnosis not possible (e.g., operating system error)."},
+    {"6FFF",     APDUCODE_TYPE_ERROR,        "Card dead (overuse)"},
+    {"6FXX",     APDUCODE_TYPE_ERROR,        "No precise diagnosis (procedure byte), (ISO 7816-3)"},
+    {"9---",     APDUCODE_TYPE_NONE,         ""},
+    {"9000",     APDUCODE_TYPE_INFO,         "Command successfully executed (OK)."},
+    {"9004",     APDUCODE_TYPE_WARNING,      "PIN not succesfully verified, 3 or more PIN tries left"},
+    {"9008",     APDUCODE_TYPE_NONE,         "Key/file not found"},
+    {"9080",     APDUCODE_TYPE_WARNING,      "Unblock Try Counter has reached zero"},
+    {"9100",     APDUCODE_TYPE_NONE,         "OK"},
+    {"9101",     APDUCODE_TYPE_NONE,         "States.activity, States.lock Status or States.lockable has wrong value"},
+    {"9102",     APDUCODE_TYPE_NONE,         "Transaction number reached its limit"},
+    {"910C",     APDUCODE_TYPE_NONE,         "No changes"},
+    {"910E",     APDUCODE_TYPE_NONE,         "Insufficient NV-Memory to complete command"},
+    {"911C",     APDUCODE_TYPE_NONE,         "Command code not supported"},
+    {"911E",     APDUCODE_TYPE_NONE,         "CRC or MAC does not match data"},
+    {"9140",     APDUCODE_TYPE_NONE,         "Invalid key number specified"},
+    {"917E",     APDUCODE_TYPE_NONE,         "Length of command string invalid"},
+    {"919D",     APDUCODE_TYPE_NONE,         "Not allow the requested command"},
+    {"919E",     APDUCODE_TYPE_NONE,         "Value of the parameter invalid"},
+    {"91A0",     APDUCODE_TYPE_NONE,         "Requested AID not present on PICC"},
+    {"91A1",     APDUCODE_TYPE_NONE,         "Unrecoverable error within application"},
+    {"91AE",     APDUCODE_TYPE_NONE,         "Authentication status does not allow the requested command"},
+    {"91AF",     APDUCODE_TYPE_NONE,         "Additional data frame is expected to be sent"},
+    {"91BE",     APDUCODE_TYPE_NONE,         "Out of boundary"},
+    {"91C1",     APDUCODE_TYPE_NONE,         "Unrecoverable error within PICC"},
+    {"91CA",     APDUCODE_TYPE_NONE,         "Previous Command was not fully completed"},
+    {"91CD",     APDUCODE_TYPE_NONE,         "PICC was disabled by an unrecoverable error"},
+    {"91CE",     APDUCODE_TYPE_NONE,         "Number of Applications limited to 28"},
+    {"91DE",     APDUCODE_TYPE_NONE,         "File or application already exists"},
+    {"91EE",     APDUCODE_TYPE_NONE,         "Could not complete NV-write operation due to loss of power"},
+    {"91F0",     APDUCODE_TYPE_NONE,         "Specified file number does not exist"},
+    {"91F1",     APDUCODE_TYPE_NONE,         "Unrecoverable error within file"},
+    {"920x",     APDUCODE_TYPE_INFO,         "Writing to EEPROM successful after 'x' attempts."},
+    {"9210",     APDUCODE_TYPE_ERROR,        "Insufficient memory. No more storage available."},
+    {"9240",     APDUCODE_TYPE_ERROR,        "Writing to EEPROM not successful."},
+    {"9301",     APDUCODE_TYPE_NONE,         "Integrity error"},
+    {"9302",     APDUCODE_TYPE_NONE,         "Candidate S2 invalid"},
+    {"9303",     APDUCODE_TYPE_ERROR,        "Application is permanently locked"},
+    {"9400",     APDUCODE_TYPE_ERROR,        "No EF selected."},
+    {"9401",     APDUCODE_TYPE_NONE,         "Candidate currency code does not match purse currency"},
+    {"9402",     APDUCODE_TYPE_NONE,         "Candidate amount too high"},
+    {"9402",     APDUCODE_TYPE_ERROR,        "Address range exceeded."},
+    {"9403",     APDUCODE_TYPE_NONE,         "Candidate amount too low"},
+    {"9404",     APDUCODE_TYPE_ERROR,        "FID not found, record not found or comparison pattern not found."},
+    {"9405",     APDUCODE_TYPE_NONE,         "Problems in the data field"},
+    {"9406",     APDUCODE_TYPE_ERROR,        "Required MAC unavailable"},
+    {"9407",     APDUCODE_TYPE_NONE,         "Bad currency : purse engine has no slot with R3bc currency"},
+    {"9408",     APDUCODE_TYPE_NONE,         "R3bc currency not supported in purse engine"},
+    {"9408",     APDUCODE_TYPE_ERROR,        "Selected file type does not match command."},
+    {"9580",     APDUCODE_TYPE_NONE,         "Bad sequence"},
+    {"9681",     APDUCODE_TYPE_NONE,         "Slave not found"},
+    {"9700",     APDUCODE_TYPE_NONE,         "PIN blocked and Unblock Try Counter is 1 or 2"},
+    {"9702",     APDUCODE_TYPE_NONE,         "Main keys are blocked"},
+    {"9704",     APDUCODE_TYPE_NONE,         "PIN not succesfully verified, 3 or more PIN tries left"},
+    {"9784",     APDUCODE_TYPE_NONE,         "Base key"},
+    {"9785",     APDUCODE_TYPE_NONE,         "Limit exceeded - C-MAC key"},
+    {"9786",     APDUCODE_TYPE_NONE,         "SM error - Limit exceeded - R-MAC key"},
+    {"9787",     APDUCODE_TYPE_NONE,         "Limit exceeded - sequence counter"},
+    {"9788",     APDUCODE_TYPE_NONE,         "Limit exceeded - R-MAC length"},
+    {"9789",     APDUCODE_TYPE_NONE,         "Service not available"},
+    {"9802",     APDUCODE_TYPE_ERROR,        "No PIN defined."},
+    {"9804",     APDUCODE_TYPE_ERROR,        "Access conditions not satisfied, authentication failed."},
+    {"9835",     APDUCODE_TYPE_ERROR,        "ASK RANDOM or GIVE RANDOM not executed."},
+    {"9840",     APDUCODE_TYPE_ERROR,        "PIN verification not successful."},
+    {"9850",     APDUCODE_TYPE_ERROR,        "INCREASE or DECREASE could not be executed because a limit has been reached."},
+    {"9862",     APDUCODE_TYPE_ERROR,        "Authentication Error, application specific (incorrect MAC)"},
+    {"9900",     APDUCODE_TYPE_NONE,         "1 PIN try left"},
+    {"9904",     APDUCODE_TYPE_NONE,         "PIN not succesfully verified, 1 PIN try left"},
+    {"9985",     APDUCODE_TYPE_NONE,         "Wrong status - Cardholder lock"},
+    {"9986",     APDUCODE_TYPE_ERROR,        "Missing privilege"},
+    {"9987",     APDUCODE_TYPE_NONE,         "PIN is not installed"},
+    {"9988",     APDUCODE_TYPE_NONE,         "Wrong status - R-MAC state"},
+    {"9A00",     APDUCODE_TYPE_NONE,         "2 PIN try left"},
+    {"9A04",     APDUCODE_TYPE_NONE,         "PIN not succesfully verified, 2 PIN try left"},
+    {"9A71",     APDUCODE_TYPE_NONE,         "Wrong parameter value - Double agent AID"},
+    {"9A72",     APDUCODE_TYPE_NONE,         "Wrong parameter value - Double agent Type"},
+    {"9D05",     APDUCODE_TYPE_ERROR,        "Incorrect certificate type"},
+    {"9D07",     APDUCODE_TYPE_ERROR,        "Incorrect session data size"},
+    {"9D08",     APDUCODE_TYPE_ERROR,        "Incorrect DIR file record size"},
+    {"9D09",     APDUCODE_TYPE_ERROR,        "Incorrect FCI record size"},
+    {"9D0A",     APDUCODE_TYPE_ERROR,        "Incorrect code size"},
+    {"9D10",     APDUCODE_TYPE_ERROR,        "Insufficient memory to load application"},
+    {"9D11",     APDUCODE_TYPE_ERROR,        "Invalid AID"},
+    {"9D12",     APDUCODE_TYPE_ERROR,        "Duplicate AID"},
+    {"9D13",     APDUCODE_TYPE_ERROR,        "Application previously loaded"},
+    {"9D14",     APDUCODE_TYPE_ERROR,        "Application history list full"},
+    {"9D15",     APDUCODE_TYPE_ERROR,        "Application not open"},
+    {"9D17",     APDUCODE_TYPE_ERROR,        "Invalid offset"},
+    {"9D18",     APDUCODE_TYPE_ERROR,        "Application already loaded"},
+    {"9D19",     APDUCODE_TYPE_ERROR,        "Invalid certificate"},
+    {"9D1A",     APDUCODE_TYPE_ERROR,        "Invalid signature"},
+    {"9D1B",     APDUCODE_TYPE_ERROR,        "Invalid KTU"},
+    {"9D1D",     APDUCODE_TYPE_ERROR,        "MSM controls not set"},
+    {"9D1E",     APDUCODE_TYPE_ERROR,        "Application signature does not exist"},
+    {"9D1F",     APDUCODE_TYPE_ERROR,        "KTU does not exist"},
+    {"9D20",     APDUCODE_TYPE_ERROR,        "Application not loaded"},
+    {"9D21",     APDUCODE_TYPE_ERROR,        "Invalid Open command data length"},
+    {"9D30",     APDUCODE_TYPE_ERROR,        "Check data parameter is incorrect (invalid start address)"},
+    {"9D31",     APDUCODE_TYPE_ERROR,        "Check data parameter is incorrect (invalid length)"},
+    {"9D32",     APDUCODE_TYPE_ERROR,        "Check data parameter is incorrect (illegal memory check area)"},
+    {"9D40",     APDUCODE_TYPE_ERROR,        "Invalid MSM Controls ciphertext"},
+    {"9D41",     APDUCODE_TYPE_ERROR,        "MSM controls already set"},
+    {"9D42",     APDUCODE_TYPE_ERROR,        "Set MSM Controls data length less than 2 bytes"},
+    {"9D43",     APDUCODE_TYPE_ERROR,        "Invalid MSM Controls data length"},
+    {"9D44",     APDUCODE_TYPE_ERROR,        "Excess MSM Controls ciphertext"},
+    {"9D45",     APDUCODE_TYPE_ERROR,        "Verification of MSM Controls data failed"},
+    {"9D50",     APDUCODE_TYPE_ERROR,        "Invalid MCD Issuer production ID"},
+    {"9D51",     APDUCODE_TYPE_ERROR,        "Invalid MCD Issuer ID"},
+    {"9D52",     APDUCODE_TYPE_ERROR,        "Invalid set MSM controls data date"},
+    {"9D53",     APDUCODE_TYPE_ERROR,        "Invalid MCD number"},
+    {"9D54",     APDUCODE_TYPE_ERROR,        "Reserved field error"},
+    {"9D55",     APDUCODE_TYPE_ERROR,        "Reserved field error"},
+    {"9D56",     APDUCODE_TYPE_ERROR,        "Reserved field error"},
+    {"9D57",     APDUCODE_TYPE_ERROR,        "Reserved field error"},
+    {"9D60",     APDUCODE_TYPE_ERROR,        "MAC verification failed"},
+    {"9D61",     APDUCODE_TYPE_ERROR,        "Maximum number of unblocks reached"},
+    {"9D62",     APDUCODE_TYPE_ERROR,        "Card was not blocked"},
+    {"9D63",     APDUCODE_TYPE_ERROR,        "Crypto functions not available"},
+    {"9D64",     APDUCODE_TYPE_ERROR,        "No application loaded"},
+    {"9E00",     APDUCODE_TYPE_NONE,         "PIN not installed"},
+    {"9E04",     APDUCODE_TYPE_NONE,         "PIN not succesfully verified, PIN not installed"},
+    {"9F00",     APDUCODE_TYPE_NONE,         "PIN blocked and Unblock Try Counter is 3"},
+    {"9F04",     APDUCODE_TYPE_NONE,         "PIN not succesfully verified, PIN blocked and Unblock Try Counter is 3"},
+    {"9FXX",     APDUCODE_TYPE_NONE,         "Command successfully executed; 'xx' bytes of data are available and can be requested using GET RESPONSE."},
+    {"9XXX",     APDUCODE_TYPE_NONE,         "Application related status, (ISO 7816-3)"}
 };
 const size_t APDUCodeTableLen = sizeof(APDUCodeTable)/sizeof(APDUCode);
 
 int CodeCmp(const char *code1, const char *code2) {
-	int xsymb = 0;
-	int cmp = 0;
-	for (int i = 0; i < 4; i++) {
-		if (code1[i] == code2[i])
-			cmp++;
-		if (code1[i] == 'X' || code2[i] == 'X')
-			xsymb++;
-	}
-	if (cmp == 4)
-		return 0;
+    int xsymb = 0;
+    int cmp = 0;
+    for (int i = 0; i < 4; i++) {
+        if (code1[i] == code2[i])
+            cmp++;
+        if (code1[i] == 'X' || code2[i] == 'X')
+            xsymb++;
+    }
+    if (cmp == 4)
+        return 0;
 
-	if (cmp + xsymb == 4)
-		return xsymb;
+    if (cmp + xsymb == 4)
+        return xsymb;
 
-	return -1;
+    return -1;
 }
 
 const APDUCode* const GetAPDUCode(uint8_t sw1, uint8_t sw2) {
-	char buf[6] = {0};
-	int res;
-	int mineq = APDUCodeTableLen;
-	int mineqindx = 0;
+    char buf[6] = {0};
+    int res;
+    int mineq = APDUCodeTableLen;
+    int mineqindx = 0;
 
-	sprintf(buf, "%02X%02X", sw1, sw2);
+    sprintf(buf, "%02X%02X", sw1, sw2);
 
-	for (int i = 0; i < APDUCodeTableLen; i++) {
-		res = CodeCmp(APDUCodeTable[i].ID, buf);
+    for (int i = 0; i < APDUCodeTableLen; i++) {
+        res = CodeCmp(APDUCodeTable[i].ID, buf);
 
-		// equal
-		if (res == 0) {
-			return &APDUCodeTable[i];
-		}
+        // equal
+        if (res == 0) {
+            return &APDUCodeTable[i];
+        }
 
-		// with some  'X'
-		if (res > 0 && mineq > res) {
-			mineq = res;
-			mineqindx = i;
-		}
-	}
+        // with some  'X'
+        if (res > 0 && mineq > res) {
+            mineq = res;
+            mineqindx = i;
+        }
+    }
 
-	// if we have not equal, but with some 'X'
-	if (mineqindx < APDUCodeTableLen) {
-		return &APDUCodeTable[mineqindx];
-	}
+    // if we have not equal, but with some 'X'
+    if (mineqindx < APDUCodeTableLen) {
+        return &APDUCodeTable[mineqindx];
+    }
 
-	return NULL;
+    return NULL;
 }
 
 const char* GetAPDUCodeDescription(uint8_t sw1, uint8_t sw2) {
-	const APDUCode *cd = GetAPDUCode(sw1, sw2);
-	if (cd)
-		return cd->Description;
-	else
-		return APDUCodeTable[0].Description; //empty string
+    const APDUCode *cd = GetAPDUCode(sw1, sw2);
+    if (cd)
+        return cd->Description;
+    else
+        return APDUCodeTable[0].Description; //empty string
 }
diff --git a/client/emv/apduinfo.h b/client/emv/apduinfo.h
index c64230502..0e06f515f 100644
--- a/client/emv/apduinfo.h
+++ b/client/emv/apduinfo.h
@@ -16,16 +16,16 @@
 #include <stdlib.h>
 #include <inttypes.h>
 
-#define APDUCODE_TYPE_NONE		0
-#define APDUCODE_TYPE_INFO		1
-#define APDUCODE_TYPE_WARNING	2
-#define APDUCODE_TYPE_ERROR		3
-#define APDUCODE_TYPE_SECURITY	4
+#define APDUCODE_TYPE_NONE     0
+#define APDUCODE_TYPE_INFO     1
+#define APDUCODE_TYPE_WARNING  2
+#define APDUCODE_TYPE_ERROR    3
+#define APDUCODE_TYPE_SECURITY 4
 
 typedef struct {
-	const char *ID;
-	const uint8_t Type;
-	const char *Description;
+    const char *ID;
+    const uint8_t Type;
+    const char *Description;
 } APDUCode;
 
 extern const APDUCode* const GetAPDUCode(uint8_t sw1, uint8_t sw2);
diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index 5d73e88c9..cf6c56efd 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -21,1954 +21,1954 @@ static int CmdHelp(const char *Cmd);
 
 #define TLV_ADD(tag, value)( tlvdb_change_or_add_node(tlvRoot, tag, sizeof(value) - 1, (const unsigned char *)value) )
 void ParamLoadDefaults(struct tlvdb *tlvRoot) {
-	//9F02:(Amount, authorized (Numeric)) len:6
-	TLV_ADD(0x9F02, "\x00\x00\x00\x00\x01\x00");
-	//9F1A:(Terminal Country Code) len:2
-	TLV_ADD(0x9F1A, "ru");
-	//5F2A:(Transaction Currency Code) len:2
-	// USD 840, EUR 978, RUR 810, RUB 643, RUR 810(old), UAH 980, AZN 031, n/a 999
-	TLV_ADD(0x5F2A, "\x09\x80");
-	//9A:(Transaction Date) len:3
-	TLV_ADD(0x9A,   "\x00\x00\x00");
-	//9C:(Transaction Type) len:1   |  00 => Goods and service #01 => Cash
-	TLV_ADD(0x9C,   "\x00");
-	// 9F37 Unpredictable Number len:4
-	TLV_ADD(0x9F37, "\x01\x02\x03\x04");
-	// 9F6A Unpredictable Number (MSD for UDOL) len:4
-	TLV_ADD(0x9F6A, "\x01\x02\x03\x04");
-	//9F66:(Terminal Transaction Qualifiers (TTQ)) len:4
-	TLV_ADD(0x9F66, "\x26\x00\x00\x00"); // qVSDC
-	//95:(Terminal Verification Results) len:5
-	// all OK TVR
-	TLV_ADD(0x95,   "\x00\x00\x00\x00\x00");
+    //9F02:(Amount, authorized (Numeric)) len:6
+    TLV_ADD(0x9F02, "\x00\x00\x00\x00\x01\x00");
+    //9F1A:(Terminal Country Code) len:2
+    TLV_ADD(0x9F1A, "ru");
+    //5F2A:(Transaction Currency Code) len:2
+    // USD 840, EUR 978, RUR 810, RUB 643, RUR 810(old), UAH 980, AZN 031, n/a 999
+    TLV_ADD(0x5F2A, "\x09\x80");
+    //9A:(Transaction Date) len:3
+    TLV_ADD(0x9A,   "\x00\x00\x00");
+    //9C:(Transaction Type) len:1   |  00 => Goods and service #01 => Cash
+    TLV_ADD(0x9C,   "\x00");
+    // 9F37 Unpredictable Number len:4
+    TLV_ADD(0x9F37, "\x01\x02\x03\x04");
+    // 9F6A Unpredictable Number (MSD for UDOL) len:4
+    TLV_ADD(0x9F6A, "\x01\x02\x03\x04");
+    //9F66:(Terminal Transaction Qualifiers (TTQ)) len:4
+    TLV_ADD(0x9F66, "\x26\x00\x00\x00"); // qVSDC
+    //95:(Terminal Verification Results) len:5
+    // all OK TVR
+    TLV_ADD(0x95,   "\x00\x00\x00\x00\x00");
 }
 
 void PrintChannel(EMVCommandChannel channel) {
-	switch(channel) {
-	case ECC_CONTACTLESS:
-		PrintAndLogEx(INFO, "Channel: CONTACTLESS");
-		break;
-	case ECC_CONTACT:
-		PrintAndLogEx(INFO, "Channel: CONTACT");
-		break;
-	}
+    switch(channel) {
+    case ECC_CONTACTLESS:
+        PrintAndLogEx(INFO, "Channel: CONTACTLESS");
+        break;
+    case ECC_CONTACT:
+        PrintAndLogEx(INFO, "Channel: CONTACT");
+        break;
+    }
 }
 
 int CmdEMVSelect(const char *cmd) {
-	uint8_t data[APDU_AID_LEN] = {0};
-	int datalen = 0;
+    uint8_t data[APDU_AID_LEN] = {0};
+    int datalen = 0;
 
-	CLIParserInit("emv select",
-		"Executes select applet command",
-		"Usage:\n\temv select -s a00000000101 -> select card, select applet\n\temv select -st a00000000101 -> select card, select applet, show result in TLV\n");
+    CLIParserInit("emv select",
+        "Executes select applet command",
+        "Usage:\n\temv select -s a00000000101 -> select card, select applet\n\temv select -st a00000000101 -> select card, select applet, show result in TLV\n");
 
-	void* argtable[] = {
-		arg_param_begin,
-		arg_lit0("sS",  "select",  "activate field and select card"),
-		arg_lit0("kK",  "keep",    "keep field for next command"),
-		arg_lit0("aA",  "apdu",    "show APDU reqests and responses"),
-		arg_lit0("tT",  "tlv",     "TLV decode results"),
-		arg_lit0("wW",  "wired",   "Send data via contact (iso7816) interface. Contactless interface set by default."),
-		arg_strx0(NULL,  NULL,     "<HEX applet AID>", NULL),
-		arg_param_end
-	};
-	CLIExecWithReturn(cmd, argtable, true);
+    void* argtable[] = {
+        arg_param_begin,
+        arg_lit0("sS",  "select",  "activate field and select card"),
+        arg_lit0("kK",  "keep",    "keep field for next command"),
+        arg_lit0("aA",  "apdu",    "show APDU reqests and responses"),
+        arg_lit0("tT",  "tlv",     "TLV decode results"),
+        arg_lit0("wW",  "wired",   "Send data via contact (iso7816) interface. Contactless interface set by default."),
+        arg_strx0(NULL,  NULL,     "<HEX applet AID>", NULL),
+        arg_param_end
+    };
+    CLIExecWithReturn(cmd, argtable, true);
 
-	bool activateField = arg_get_lit(1);
-	bool leaveSignalON = arg_get_lit(2);
-	bool APDULogging = arg_get_lit(3);
-	bool decodeTLV = arg_get_lit(4);
-	EMVCommandChannel channel = ECC_CONTACTLESS;
-	if (arg_get_lit(5))
-		channel = ECC_CONTACT;
-	PrintChannel(channel);
-	CLIGetHexWithReturn(6, data, &datalen);
-	CLIParserFree();
+    bool activateField = arg_get_lit(1);
+    bool leaveSignalON = arg_get_lit(2);
+    bool APDULogging = arg_get_lit(3);
+    bool decodeTLV = arg_get_lit(4);
+    EMVCommandChannel channel = ECC_CONTACTLESS;
+    if (arg_get_lit(5))
+        channel = ECC_CONTACT;
+    PrintChannel(channel);
+    CLIGetHexWithReturn(6, data, &datalen);
+    CLIParserFree();
 
-	SetAPDULogging(APDULogging);
+    SetAPDULogging(APDULogging);
 
-	// exec
-	uint8_t buf[APDU_RES_LEN] = {0};
-	size_t len = 0;
-	uint16_t sw = 0;
-	int res = EMVSelect(channel, activateField, leaveSignalON, data, datalen, buf, sizeof(buf), &len, &sw, NULL);
+    // exec
+    uint8_t buf[APDU_RES_LEN] = {0};
+    size_t len = 0;
+    uint16_t sw = 0;
+    int res = EMVSelect(channel, activateField, leaveSignalON, data, datalen, buf, sizeof(buf), &len, &sw, NULL);
 
-	if (sw)
-		PrintAndLogEx(INFO, "APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
+    if (sw)
+        PrintAndLogEx(INFO, "APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
 
-	if (res)
-		return res;
+    if (res)
+        return res;
 
-	if (decodeTLV)
-		TLVPrintFromBuffer(buf, len);
+    if (decodeTLV)
+        TLVPrintFromBuffer(buf, len);
 
-	return 0;
+    return 0;
 }
 
 int CmdEMVSearch(const char *cmd) {
 
-	CLIParserInit("emv search",
-		"Tries to select all applets from applet list:\n",
-		"Usage:\n\temv search -s -> select card and search\n\temv search -st -> select card, search and show result in TLV\n");
+    CLIParserInit("emv search",
+        "Tries to select all applets from applet list:\n",
+        "Usage:\n\temv search -s -> select card and search\n\temv search -st -> select card, search and show result in TLV\n");
 
-	void* argtable[] = {
-		arg_param_begin,
-		arg_lit0("sS",  "select",  "activate field and select card"),
-		arg_lit0("kK",  "keep",    "keep field ON for next command"),
-		arg_lit0("aA",  "apdu",    "show APDU reqests and responses"),
-		arg_lit0("tT",  "tlv",     "TLV decode results of selected applets"),
-		arg_lit0("wW",  "wired",   "Send data via contact (iso7816) interface. Contactless interface set by default."),
-		arg_param_end
-	};
-	CLIExecWithReturn(cmd, argtable, true);
+    void* argtable[] = {
+        arg_param_begin,
+        arg_lit0("sS",  "select",  "activate field and select card"),
+        arg_lit0("kK",  "keep",    "keep field ON for next command"),
+        arg_lit0("aA",  "apdu",    "show APDU reqests and responses"),
+        arg_lit0("tT",  "tlv",     "TLV decode results of selected applets"),
+        arg_lit0("wW",  "wired",   "Send data via contact (iso7816) interface. Contactless interface set by default."),
+        arg_param_end
+    };
+    CLIExecWithReturn(cmd, argtable, true);
 
-	bool activateField = arg_get_lit(1);
-	bool leaveSignalON = arg_get_lit(2);
-	bool APDULogging = arg_get_lit(3);
-	bool decodeTLV = arg_get_lit(4);
-	EMVCommandChannel channel = ECC_CONTACTLESS;
-	if (arg_get_lit(5))
-		channel = ECC_CONTACT;
-	PrintChannel(channel);
-	CLIParserFree();
+    bool activateField = arg_get_lit(1);
+    bool leaveSignalON = arg_get_lit(2);
+    bool APDULogging = arg_get_lit(3);
+    bool decodeTLV = arg_get_lit(4);
+    EMVCommandChannel channel = ECC_CONTACTLESS;
+    if (arg_get_lit(5))
+        channel = ECC_CONTACT;
+    PrintChannel(channel);
+    CLIParserFree();
 
-	SetAPDULogging(APDULogging);
+    SetAPDULogging(APDULogging);
 
-	struct tlvdb *t = NULL;
-	const char *al = "Applets list";
-	t = tlvdb_fixed(1, strlen(al), (const unsigned char *)al);
+    struct tlvdb *t = NULL;
+    const char *al = "Applets list";
+    t = tlvdb_fixed(1, strlen(al), (const unsigned char *)al);
 
-	if (EMVSearch(channel, activateField, leaveSignalON, decodeTLV, t)) {
-		tlvdb_free(t);
-		return 2;
-	}
+    if (EMVSearch(channel, activateField, leaveSignalON, decodeTLV, t)) {
+        tlvdb_free(t);
+        return 2;
+    }
 
-	PrintAndLogEx(SUCCESS, "Search completed.");
+    PrintAndLogEx(SUCCESS, "Search completed.");
 
-	// print list here
-	if (!decodeTLV) {
-		TLVPrintAIDlistFromSelectTLV(t);
-	}
+    // print list here
+    if (!decodeTLV) {
+        TLVPrintAIDlistFromSelectTLV(t);
+    }
 
-	tlvdb_free(t);
+    tlvdb_free(t);
 
-	return 0;
+    return 0;
 }
 
 int CmdEMVPPSE(const char *cmd) {
 
-	CLIParserInit("emv pse",
-		"Executes PSE/PPSE select command. It returns list of applet on the card:\n",
-		"Usage:\n\temv pse -s1 -> select, get pse\n\temv pse -st2 -> select, get ppse, show result in TLV\n");
+    CLIParserInit("emv pse",
+        "Executes PSE/PPSE select command. It returns list of applet on the card:\n",
+        "Usage:\n\temv pse -s1 -> select, get pse\n\temv pse -st2 -> select, get ppse, show result in TLV\n");
 
-	void* argtable[] = {
-		arg_param_begin,
-		arg_lit0("sS",  "select",  "activate field and select card"),
-		arg_lit0("kK",  "keep",    "keep field ON for next command"),
-		arg_lit0("1",   "pse",     "pse (1PAY.SYS.DDF01) mode"),
-		arg_lit0("2",   "ppse",    "ppse (2PAY.SYS.DDF01) mode (default mode)"),
-		arg_lit0("aA",  "apdu",    "show APDU reqests and responses"),
-		arg_lit0("tT",  "tlv",     "TLV decode results of selected applets"),
-		arg_lit0("wW",  "wired",   "Send data via contact (iso7816) interface. Contactless interface set by default."),
-		arg_param_end
-	};
-	CLIExecWithReturn(cmd, argtable, true);
+    void* argtable[] = {
+        arg_param_begin,
+        arg_lit0("sS",  "select",  "activate field and select card"),
+        arg_lit0("kK",  "keep",    "keep field ON for next command"),
+        arg_lit0("1",   "pse",     "pse (1PAY.SYS.DDF01) mode"),
+        arg_lit0("2",   "ppse",    "ppse (2PAY.SYS.DDF01) mode (default mode)"),
+        arg_lit0("aA",  "apdu",    "show APDU reqests and responses"),
+        arg_lit0("tT",  "tlv",     "TLV decode results of selected applets"),
+        arg_lit0("wW",  "wired",   "Send data via contact (iso7816) interface. Contactless interface set by default."),
+        arg_param_end
+    };
+    CLIExecWithReturn(cmd, argtable, true);
 
-	bool activateField = arg_get_lit(1);
-	bool leaveSignalON = arg_get_lit(2);
-	uint8_t PSENum = 2;
-	if (arg_get_lit(3))
-		PSENum = 1;
-	if (arg_get_lit(4))
-		PSENum = 2;
-	bool APDULogging = arg_get_lit(5);
-	bool decodeTLV = arg_get_lit(6);
-	EMVCommandChannel channel = ECC_CONTACTLESS;
-	if (arg_get_lit(7))
-		channel = ECC_CONTACT;
-	PrintChannel(channel);
-	CLIParserFree();
+    bool activateField = arg_get_lit(1);
+    bool leaveSignalON = arg_get_lit(2);
+    uint8_t PSENum = 2;
+    if (arg_get_lit(3))
+        PSENum = 1;
+    if (arg_get_lit(4))
+        PSENum = 2;
+    bool APDULogging = arg_get_lit(5);
+    bool decodeTLV = arg_get_lit(6);
+    EMVCommandChannel channel = ECC_CONTACTLESS;
+    if (arg_get_lit(7))
+        channel = ECC_CONTACT;
+    PrintChannel(channel);
+    CLIParserFree();
 
-	SetAPDULogging(APDULogging);
+    SetAPDULogging(APDULogging);
 
-	// exec
-	uint8_t buf[APDU_RES_LEN] = {0};
-	size_t len = 0;
-	uint16_t sw = 0;
-	int res = EMVSelectPSE(channel, activateField, leaveSignalON, PSENum, buf, sizeof(buf), &len, &sw);
+    // exec
+    uint8_t buf[APDU_RES_LEN] = {0};
+    size_t len = 0;
+    uint16_t sw = 0;
+    int res = EMVSelectPSE(channel, activateField, leaveSignalON, PSENum, buf, sizeof(buf), &len, &sw);
 
-	if (sw)
-		PrintAndLogEx(INFO, "APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
+    if (sw)
+        PrintAndLogEx(INFO, "APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
 
-	if (res)
-		return res;
+    if (res)
+        return res;
 
 
-	if (decodeTLV)
-		TLVPrintFromBuffer(buf, len);
+    if (decodeTLV)
+        TLVPrintFromBuffer(buf, len);
 
-	return 0;
+    return 0;
 }
 
 int CmdEMVGPO(const char *cmd) {
-	uint8_t data[APDU_RES_LEN] = {0};
-	int datalen = 0;
+    uint8_t data[APDU_RES_LEN] = {0};
+    int datalen = 0;
 
-	CLIParserInit("emv gpo",
-		"Executes Get Processing Options command. It returns data in TLV format (0x77 - format2) or plain format (0x80 - format1).\nNeeds a EMV applet to be selected.",
-		"Usage:\n\temv gpo -k -> execute GPO\n"
-			"\temv gpo -t 01020304 -> execute GPO with 4-byte PDOL data, show result in TLV\n"
-			"\temv gpo -pmt 9F 37 04 -> load params from file, make PDOL data from PDOL, execute GPO with PDOL, show result in TLV\n");
+    CLIParserInit("emv gpo",
+        "Executes Get Processing Options command. It returns data in TLV format (0x77 - format2) or plain format (0x80 - format1).\nNeeds a EMV applet to be selected.",
+        "Usage:\n\temv gpo -k -> execute GPO\n"
+            "\temv gpo -t 01020304 -> execute GPO with 4-byte PDOL data, show result in TLV\n"
+            "\temv gpo -pmt 9F 37 04 -> load params from file, make PDOL data from PDOL, execute GPO with PDOL, show result in TLV\n");
 
-	void* argtable[] = {
-		arg_param_begin,
-		arg_lit0("kK",  "keep",    "keep field ON for next command"),
-		arg_lit0("pP",  "params",  "load parameters from `emv/defparams.json` file for PDOLdata making from PDOL and parameters"),
-		arg_lit0("mM",  "make",    "make PDOLdata from PDOL (tag 9F38) and parameters (by default uses default parameters)"),
-		arg_lit0("aA",  "apdu",    "show APDU reqests and responses"),
-		arg_lit0("tT",  "tlv",     "TLV decode results of selected applets"),
-		arg_lit0("wW",  "wired",   "Send data via contact (iso7816) interface. Contactless interface set by default."),
-		arg_strx0(NULL,  NULL,     "<HEX PDOLdata/PDOL>", NULL),
-		arg_param_end
-	};
-	CLIExecWithReturn(cmd, argtable, true);
+    void* argtable[] = {
+        arg_param_begin,
+        arg_lit0("kK",  "keep",    "keep field ON for next command"),
+        arg_lit0("pP",  "params",  "load parameters from `emv/defparams.json` file for PDOLdata making from PDOL and parameters"),
+        arg_lit0("mM",  "make",    "make PDOLdata from PDOL (tag 9F38) and parameters (by default uses default parameters)"),
+        arg_lit0("aA",  "apdu",    "show APDU reqests and responses"),
+        arg_lit0("tT",  "tlv",     "TLV decode results of selected applets"),
+        arg_lit0("wW",  "wired",   "Send data via contact (iso7816) interface. Contactless interface set by default."),
+        arg_strx0(NULL,  NULL,     "<HEX PDOLdata/PDOL>", NULL),
+        arg_param_end
+    };
+    CLIExecWithReturn(cmd, argtable, true);
 
-	bool leaveSignalON = arg_get_lit(1);
-	bool paramsLoadFromFile = arg_get_lit(2);
-	bool dataMakeFromPDOL = arg_get_lit(3);
-	bool APDULogging = arg_get_lit(4);
-	bool decodeTLV = arg_get_lit(5);
-	EMVCommandChannel channel = ECC_CONTACTLESS;
-	if (arg_get_lit(6))
-		channel = ECC_CONTACT;
-	PrintChannel(channel);
-	CLIGetHexWithReturn(7, data, &datalen);
-	CLIParserFree();
+    bool leaveSignalON = arg_get_lit(1);
+    bool paramsLoadFromFile = arg_get_lit(2);
+    bool dataMakeFromPDOL = arg_get_lit(3);
+    bool APDULogging = arg_get_lit(4);
+    bool decodeTLV = arg_get_lit(5);
+    EMVCommandChannel channel = ECC_CONTACTLESS;
+    if (arg_get_lit(6))
+        channel = ECC_CONTACT;
+    PrintChannel(channel);
+    CLIGetHexWithReturn(7, data, &datalen);
+    CLIParserFree();
 
-	SetAPDULogging(APDULogging);
+    SetAPDULogging(APDULogging);
 
-	// Init TLV tree
-	const char *alr = "Root terminal TLV tree";
-	struct tlvdb *tlvRoot = tlvdb_fixed(1, strlen(alr), (const unsigned char *)alr);
+    // Init TLV tree
+    const char *alr = "Root terminal TLV tree";
+    struct tlvdb *tlvRoot = tlvdb_fixed(1, strlen(alr), (const unsigned char *)alr);
 
-	// calc PDOL
-	struct tlv *pdol_data_tlv = NULL;
-	struct tlvdb *tmp_ext = NULL;
-	struct tlv data_tlv = {
-		.tag = 0x83,
-		.len = datalen,
-		.value = (uint8_t *)data,
-	};
-	if (dataMakeFromPDOL) {
-		ParamLoadDefaults(tlvRoot);
+    // calc PDOL
+    struct tlv *pdol_data_tlv = NULL;
+    struct tlvdb *tmp_ext = NULL;
+    struct tlv data_tlv = {
+        .tag = 0x83,
+        .len = datalen,
+        .value = (uint8_t *)data,
+    };
+    if (dataMakeFromPDOL) {
+        ParamLoadDefaults(tlvRoot);
 
-		if (paramsLoadFromFile) {
-			PrintAndLogEx(INFO, "Params loading from file...");
-			ParamLoadFromJson(tlvRoot);
-		};
+        if (paramsLoadFromFile) {
+            PrintAndLogEx(INFO, "Params loading from file...");
+            ParamLoadFromJson(tlvRoot);
+        };
 
-		tmp_ext = tlvdb_external(0x9f38, datalen, data);
-		pdol_data_tlv = dol_process((const struct tlv *)tmp_ext, tlvRoot, 0x83);
-		if (!pdol_data_tlv){
-			PrintAndLogEx(ERR, "Can't create PDOL TLV.");
-			tlvdb_free(tmp_ext);
-			tlvdb_free(tlvRoot);
-			return 4;
-		}
-	} else {
-		if (paramsLoadFromFile) {
-			PrintAndLogEx(WARNING, "Don't need to load parameters. Sending plain PDOL data...");
-		}
-		pdol_data_tlv = &data_tlv;
-	}
+        tmp_ext = tlvdb_external(0x9f38, datalen, data);
+        pdol_data_tlv = dol_process((const struct tlv *)tmp_ext, tlvRoot, 0x83);
+        if (!pdol_data_tlv){
+            PrintAndLogEx(ERR, "Can't create PDOL TLV.");
+            tlvdb_free(tmp_ext);
+            tlvdb_free(tlvRoot);
+            return 4;
+        }
+    } else {
+        if (paramsLoadFromFile) {
+            PrintAndLogEx(WARNING, "Don't need to load parameters. Sending plain PDOL data...");
+        }
+        pdol_data_tlv = &data_tlv;
+    }
 
-	size_t pdol_data_tlv_data_len = 0;
-	unsigned char *pdol_data_tlv_data = tlv_encode(pdol_data_tlv, &pdol_data_tlv_data_len);
-	if (!pdol_data_tlv_data) {
-		PrintAndLogEx(ERR, "Can't create PDOL data.");
-		tlvdb_free(tmp_ext);
-		tlvdb_free(tlvRoot);
-		return 4;
-	}
-	PrintAndLogEx(INFO, "PDOL data[%d]: %s", pdol_data_tlv_data_len, sprint_hex(pdol_data_tlv_data, pdol_data_tlv_data_len));
+    size_t pdol_data_tlv_data_len = 0;
+    unsigned char *pdol_data_tlv_data = tlv_encode(pdol_data_tlv, &pdol_data_tlv_data_len);
+    if (!pdol_data_tlv_data) {
+        PrintAndLogEx(ERR, "Can't create PDOL data.");
+        tlvdb_free(tmp_ext);
+        tlvdb_free(tlvRoot);
+        return 4;
+    }
+    PrintAndLogEx(INFO, "PDOL data[%d]: %s", pdol_data_tlv_data_len, sprint_hex(pdol_data_tlv_data, pdol_data_tlv_data_len));
 
-	// exec
-	uint8_t buf[APDU_RES_LEN] = {0};
-	size_t len = 0;
-	uint16_t sw = 0;
-	int res = EMVGPO(channel, leaveSignalON, pdol_data_tlv_data, pdol_data_tlv_data_len, buf, sizeof(buf), &len, &sw, tlvRoot);
+    // exec
+    uint8_t buf[APDU_RES_LEN] = {0};
+    size_t len = 0;
+    uint16_t sw = 0;
+    int res = EMVGPO(channel, leaveSignalON, pdol_data_tlv_data, pdol_data_tlv_data_len, buf, sizeof(buf), &len, &sw, tlvRoot);
 
-	if (pdol_data_tlv != &data_tlv)
-		free(pdol_data_tlv);
+    if (pdol_data_tlv != &data_tlv)
+        free(pdol_data_tlv);
 
-	tlvdb_free(tmp_ext);
-	tlvdb_free(tlvRoot);
+    tlvdb_free(tmp_ext);
+    tlvdb_free(tlvRoot);
 
-	if (sw)
-		PrintAndLogEx(INFO, "APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
+    if (sw)
+        PrintAndLogEx(INFO, "APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
 
-	if (res)
-		return res;
+    if (res)
+        return res;
 
-	if (decodeTLV)
-		TLVPrintFromBuffer(buf, len);
+    if (decodeTLV)
+        TLVPrintFromBuffer(buf, len);
 
-	return 0;
+    return 0;
 }
 
 int CmdEMVReadRecord(const char *cmd) {
-	uint8_t data[APDU_RES_LEN] = {0};
-	int datalen = 0;
+    uint8_t data[APDU_RES_LEN] = {0};
+    int datalen = 0;
 
-	CLIParserInit("emv readrec",
-		"Executes Read Record command. It returns data in TLV format.\nNeeds a bank applet to be selected and sometimes needs GPO to be executed.",
-		"Usage:\n\temv readrec -k 0101 -> read file SFI=01, SFIrec=01\n\temv readrec -kt 0201-> read file 0201 and show result in TLV\n");
+    CLIParserInit("emv readrec",
+        "Executes Read Record command. It returns data in TLV format.\nNeeds a bank applet to be selected and sometimes needs GPO to be executed.",
+        "Usage:\n\temv readrec -k 0101 -> read file SFI=01, SFIrec=01\n\temv readrec -kt 0201-> read file 0201 and show result in TLV\n");
 
-	void* argtable[] = {
-		arg_param_begin,
-		arg_lit0("kK",  "keep",    "keep field ON for next command"),
-		arg_lit0("aA",  "apdu",    "show APDU reqests and responses"),
-		arg_lit0("tT",  "tlv",     "TLV decode results of selected applets"),
-		arg_lit0("wW",  "wired",   "Send data via contact (iso7816) interface. Contactless interface set by default."),
-		arg_strx1(NULL,  NULL,     "<SFI 1byte HEX><SFIrecord 1byte HEX>", NULL),
-		arg_param_end
-	};
-	CLIExecWithReturn(cmd, argtable, true);
+    void* argtable[] = {
+        arg_param_begin,
+        arg_lit0("kK",  "keep",    "keep field ON for next command"),
+        arg_lit0("aA",  "apdu",    "show APDU reqests and responses"),
+        arg_lit0("tT",  "tlv",     "TLV decode results of selected applets"),
+        arg_lit0("wW",  "wired",   "Send data via contact (iso7816) interface. Contactless interface set by default."),
+        arg_strx1(NULL,  NULL,     "<SFI 1byte HEX><SFIrecord 1byte HEX>", NULL),
+        arg_param_end
+    };
+    CLIExecWithReturn(cmd, argtable, true);
 
-	bool leaveSignalON = arg_get_lit(1);
-	bool APDULogging = arg_get_lit(2);
-	bool decodeTLV = arg_get_lit(3);
-	EMVCommandChannel channel = ECC_CONTACTLESS;
-	if (arg_get_lit(4))
-		channel = ECC_CONTACT;
-	PrintChannel(channel);
-	CLIGetHexWithReturn(5, data, &datalen);
-	CLIParserFree();
+    bool leaveSignalON = arg_get_lit(1);
+    bool APDULogging = arg_get_lit(2);
+    bool decodeTLV = arg_get_lit(3);
+    EMVCommandChannel channel = ECC_CONTACTLESS;
+    if (arg_get_lit(4))
+        channel = ECC_CONTACT;
+    PrintChannel(channel);
+    CLIGetHexWithReturn(5, data, &datalen);
+    CLIParserFree();
 
-	if (datalen != 2) {
-		PrintAndLogEx(ERR, "Command needs to have 2 bytes of data");
-		return 1;
-	}
+    if (datalen != 2) {
+        PrintAndLogEx(ERR, "Command needs to have 2 bytes of data");
+        return 1;
+    }
 
-	SetAPDULogging(APDULogging);
+    SetAPDULogging(APDULogging);
 
-	// exec
-	uint8_t buf[APDU_RES_LEN] = {0};
-	size_t len = 0;
-	uint16_t sw = 0;
-	int res = EMVReadRecord(channel, leaveSignalON, data[0], data[1], buf, sizeof(buf), &len, &sw, NULL);
+    // exec
+    uint8_t buf[APDU_RES_LEN] = {0};
+    size_t len = 0;
+    uint16_t sw = 0;
+    int res = EMVReadRecord(channel, leaveSignalON, data[0], data[1], buf, sizeof(buf), &len, &sw, NULL);
 
-	if (sw)
-		PrintAndLogEx(INFO, "APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
+    if (sw)
+        PrintAndLogEx(INFO, "APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
 
-	if (res)
-		return res;
+    if (res)
+        return res;
 
 
-	if (decodeTLV)
-		TLVPrintFromBuffer(buf, len);
+    if (decodeTLV)
+        TLVPrintFromBuffer(buf, len);
 
-	return 0;
+    return 0;
 }
 
 int CmdEMVAC(const char *cmd) {
-	uint8_t data[APDU_RES_LEN] = {0};
-	int datalen = 0;
+    uint8_t data[APDU_RES_LEN] = {0};
+    int datalen = 0;
 
-	CLIParserInit("emv genac",
-		"Generate Application Cryptogram command. It returns data in TLV format .\nNeeds a EMV applet to be selected and GPO to be executed.",
-		"Usage:\n\temv genac -k 0102 -> generate AC with 2-byte CDOLdata and keep field ON after command\n"
-			"\temv genac -t 01020304 -> generate AC with 4-byte CDOL data, show result in TLV\n"
-			"\temv genac -Daac 01020304 -> generate AC with 4-byte CDOL data and terminal decision 'declined'\n"
-			"\temv genac -pmt 9F 37 04 -> load params from file, make CDOL data from CDOL, generate AC with CDOL, show result in TLV");
+    CLIParserInit("emv genac",
+        "Generate Application Cryptogram command. It returns data in TLV format .\nNeeds a EMV applet to be selected and GPO to be executed.",
+        "Usage:\n\temv genac -k 0102 -> generate AC with 2-byte CDOLdata and keep field ON after command\n"
+            "\temv genac -t 01020304 -> generate AC with 4-byte CDOL data, show result in TLV\n"
+            "\temv genac -Daac 01020304 -> generate AC with 4-byte CDOL data and terminal decision 'declined'\n"
+            "\temv genac -pmt 9F 37 04 -> load params from file, make CDOL data from CDOL, generate AC with CDOL, show result in TLV");
 
-	void* argtable[] = {
-		arg_param_begin,
-		arg_lit0("kK",  "keep",     "keep field ON for next command"),
-		arg_lit0("cC",  "cda",      "executes CDA transaction. Needs to get SDAD in results."),
-		arg_str0("dD",  "decision", "<aac|tc|arqc>", "Terminal decision. aac - declined, tc - approved, arqc - online authorisation requested"),
-		arg_lit0("pP",  "params",   "load parameters from `emv/defparams.json` file for CDOLdata making from CDOL and parameters"),
-		arg_lit0("mM",  "make",     "make CDOLdata from CDOL (tag 8C and 8D) and parameters (by default uses default parameters)"),
-		arg_lit0("aA",  "apdu",     "show APDU reqests and responses"),
-		arg_lit0("tT",  "tlv",      "TLV decode results of selected applets"),
-		arg_lit0("wW",  "wired",   "Send data via contact (iso7816) interface. Contactless interface set by default."),
-		arg_strx1(NULL,  NULL,      "<HEX CDOLdata/CDOL>", NULL),
-		arg_param_end
-	};
-	CLIExecWithReturn(cmd, argtable, false);
+    void* argtable[] = {
+        arg_param_begin,
+        arg_lit0("kK",  "keep",     "keep field ON for next command"),
+        arg_lit0("cC",  "cda",      "executes CDA transaction. Needs to get SDAD in results."),
+        arg_str0("dD",  "decision", "<aac|tc|arqc>", "Terminal decision. aac - declined, tc - approved, arqc - online authorisation requested"),
+        arg_lit0("pP",  "params",   "load parameters from `emv/defparams.json` file for CDOLdata making from CDOL and parameters"),
+        arg_lit0("mM",  "make",     "make CDOLdata from CDOL (tag 8C and 8D) and parameters (by default uses default parameters)"),
+        arg_lit0("aA",  "apdu",     "show APDU reqests and responses"),
+        arg_lit0("tT",  "tlv",      "TLV decode results of selected applets"),
+        arg_lit0("wW",  "wired",   "Send data via contact (iso7816) interface. Contactless interface set by default."),
+        arg_strx1(NULL,  NULL,      "<HEX CDOLdata/CDOL>", NULL),
+        arg_param_end
+    };
+    CLIExecWithReturn(cmd, argtable, false);
 
-	bool leaveSignalON = arg_get_lit(1);
-	bool trTypeCDA = arg_get_lit(2);
-	uint8_t termDecision = 0xff;
-	if (arg_get_str_len(3)) {
-		if (!strncmp(arg_get_str(3)->sval[0], "aac", 4))
-			termDecision = EMVAC_AAC;
-		if (!strncmp(arg_get_str(3)->sval[0], "tc", 4))
-			termDecision = EMVAC_TC;
-		if (!strncmp(arg_get_str(3)->sval[0], "arqc", 4))
-			termDecision = EMVAC_ARQC;
+    bool leaveSignalON = arg_get_lit(1);
+    bool trTypeCDA = arg_get_lit(2);
+    uint8_t termDecision = 0xff;
+    if (arg_get_str_len(3)) {
+        if (!strncmp(arg_get_str(3)->sval[0], "aac", 4))
+            termDecision = EMVAC_AAC;
+        if (!strncmp(arg_get_str(3)->sval[0], "tc", 4))
+            termDecision = EMVAC_TC;
+        if (!strncmp(arg_get_str(3)->sval[0], "arqc", 4))
+            termDecision = EMVAC_ARQC;
 
-		if (termDecision == 0xff) {
-			PrintAndLog("ERROR: can't find terminal decision '%s'", arg_get_str(3)->sval[0]);
-			return 1;
-		}
-	} else {
-		termDecision = EMVAC_TC;
-	}
-	if (trTypeCDA)
-		termDecision = termDecision | EMVAC_CDAREQ;
-	bool paramsLoadFromFile = arg_get_lit(4);
-	bool dataMakeFromCDOL = arg_get_lit(5);
-	bool APDULogging = arg_get_lit(6);
-	bool decodeTLV = arg_get_lit(7);
-	EMVCommandChannel channel = ECC_CONTACTLESS;
-	if (arg_get_lit(8))
-		channel = ECC_CONTACT;
-	PrintChannel(channel);
-	CLIGetHexWithReturn(9, data, &datalen);
-	CLIParserFree();
+        if (termDecision == 0xff) {
+            PrintAndLog("ERROR: can't find terminal decision '%s'", arg_get_str(3)->sval[0]);
+            return 1;
+        }
+    } else {
+        termDecision = EMVAC_TC;
+    }
+    if (trTypeCDA)
+        termDecision = termDecision | EMVAC_CDAREQ;
+    bool paramsLoadFromFile = arg_get_lit(4);
+    bool dataMakeFromCDOL = arg_get_lit(5);
+    bool APDULogging = arg_get_lit(6);
+    bool decodeTLV = arg_get_lit(7);
+    EMVCommandChannel channel = ECC_CONTACTLESS;
+    if (arg_get_lit(8))
+        channel = ECC_CONTACT;
+    PrintChannel(channel);
+    CLIGetHexWithReturn(9, data, &datalen);
+    CLIParserFree();
 
-	SetAPDULogging(APDULogging);
+    SetAPDULogging(APDULogging);
 
-	// Init TLV tree
-	const char *alr = "Root terminal TLV tree";
-	struct tlvdb *tlvRoot = tlvdb_fixed(1, strlen(alr), (const unsigned char *)alr);
+    // Init TLV tree
+    const char *alr = "Root terminal TLV tree";
+    struct tlvdb *tlvRoot = tlvdb_fixed(1, strlen(alr), (const unsigned char *)alr);
 
-	// calc CDOL
-	struct tlv *cdol_data_tlv = NULL;
-	struct tlvdb *tmp_ext = NULL;
-	struct tlv data_tlv = {
-		.tag = 0x01,
-		.len = datalen,
-		.value = (uint8_t *)data,
-	};
+    // calc CDOL
+    struct tlv *cdol_data_tlv = NULL;
+    struct tlvdb *tmp_ext = NULL;
+    struct tlv data_tlv = {
+        .tag = 0x01,
+        .len = datalen,
+        .value = (uint8_t *)data,
+    };
 
-	if (dataMakeFromCDOL) {
-		ParamLoadDefaults(tlvRoot);
+    if (dataMakeFromCDOL) {
+        ParamLoadDefaults(tlvRoot);
 
-		if (paramsLoadFromFile) {
-			PrintAndLogEx(INFO, "Params loading from file...");
-			ParamLoadFromJson(tlvRoot);
-		};
+        if (paramsLoadFromFile) {
+            PrintAndLogEx(INFO, "Params loading from file...");
+            ParamLoadFromJson(tlvRoot);
+        };
 
-		tmp_ext = tlvdb_external(0x8c, datalen, data);
-		cdol_data_tlv = dol_process((const struct tlv *)tmp_ext, tlvRoot, 0x01); // 0x01 - dummy tag
-		if (!cdol_data_tlv){
-			PrintAndLogEx(ERR, "Can't create CDOL TLV.");
-			tlvdb_free(tmp_ext);
-			tlvdb_free(tlvRoot);
-			return 4;
-		}
-	} else {
-		if (paramsLoadFromFile) {
-			PrintAndLogEx(WARNING, "Don't need to load parameters. Sending plain CDOL data...");
-		}
-		cdol_data_tlv = &data_tlv;
-	}
+        tmp_ext = tlvdb_external(0x8c, datalen, data);
+        cdol_data_tlv = dol_process((const struct tlv *)tmp_ext, tlvRoot, 0x01); // 0x01 - dummy tag
+        if (!cdol_data_tlv){
+            PrintAndLogEx(ERR, "Can't create CDOL TLV.");
+            tlvdb_free(tmp_ext);
+            tlvdb_free(tlvRoot);
+            return 4;
+        }
+    } else {
+        if (paramsLoadFromFile) {
+            PrintAndLogEx(WARNING, "Don't need to load parameters. Sending plain CDOL data...");
+        }
+        cdol_data_tlv = &data_tlv;
+    }
 
-	PrintAndLogEx(INFO, "CDOL data[%d]: %s", cdol_data_tlv->len, sprint_hex(cdol_data_tlv->value, cdol_data_tlv->len));
+    PrintAndLogEx(INFO, "CDOL data[%d]: %s", cdol_data_tlv->len, sprint_hex(cdol_data_tlv->value, cdol_data_tlv->len));
 
-	// exec
-	uint8_t buf[APDU_RES_LEN] = {0};
-	size_t len = 0;
-	uint16_t sw = 0;
-	int res = EMVAC(channel, leaveSignalON, termDecision, (uint8_t *)cdol_data_tlv->value, cdol_data_tlv->len, buf, sizeof(buf), &len, &sw, tlvRoot);
+    // exec
+    uint8_t buf[APDU_RES_LEN] = {0};
+    size_t len = 0;
+    uint16_t sw = 0;
+    int res = EMVAC(channel, leaveSignalON, termDecision, (uint8_t *)cdol_data_tlv->value, cdol_data_tlv->len, buf, sizeof(buf), &len, &sw, tlvRoot);
 
-	if (cdol_data_tlv != &data_tlv)
-		free(cdol_data_tlv);
+    if (cdol_data_tlv != &data_tlv)
+        free(cdol_data_tlv);
 
-	tlvdb_free(tmp_ext);
-	tlvdb_free(tlvRoot);
+    tlvdb_free(tmp_ext);
+    tlvdb_free(tlvRoot);
 
-	if (sw)
-		PrintAndLogEx(INFO, "APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
+    if (sw)
+        PrintAndLogEx(INFO, "APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
 
-	if (res)
-		return res;
+    if (res)
+        return res;
 
-	if (decodeTLV)
-		TLVPrintFromBuffer(buf, len);
+    if (decodeTLV)
+        TLVPrintFromBuffer(buf, len);
 
-	return 0;
+    return 0;
 }
 
 int CmdEMVGenerateChallenge(const char *cmd) {
 
-	CLIParserInit("emv challenge",
-		"Executes Generate Challenge command. It returns 4 or 8-byte random number from card.\nNeeds a EMV applet to be selected and GPO to be executed.",
-		"Usage:\n\temv challenge -> get challenge\n\temv challenge -k -> get challenge, keep fileld ON\n");
+    CLIParserInit("emv challenge",
+        "Executes Generate Challenge command. It returns 4 or 8-byte random number from card.\nNeeds a EMV applet to be selected and GPO to be executed.",
+        "Usage:\n\temv challenge -> get challenge\n\temv challenge -k -> get challenge, keep fileld ON\n");
 
-	void* argtable[] = {
-		arg_param_begin,
-		arg_lit0("kK",  "keep",    "keep field ON for next command"),
-		arg_lit0("aA",  "apdu",    "show APDU reqests and responses"),
-		arg_lit0("wW",  "wired",   "Send data via contact (iso7816) interface. Contactless interface set by default."),
-		arg_param_end
-	};
-	CLIExecWithReturn(cmd, argtable, true);
+    void* argtable[] = {
+        arg_param_begin,
+        arg_lit0("kK",  "keep",    "keep field ON for next command"),
+        arg_lit0("aA",  "apdu",    "show APDU reqests and responses"),
+        arg_lit0("wW",  "wired",   "Send data via contact (iso7816) interface. Contactless interface set by default."),
+        arg_param_end
+    };
+    CLIExecWithReturn(cmd, argtable, true);
 
-	bool leaveSignalON = arg_get_lit(1);
-	bool APDULogging = arg_get_lit(2);
-	EMVCommandChannel channel = ECC_CONTACTLESS;
-	if (arg_get_lit(3))
-		channel = ECC_CONTACT;
-	PrintChannel(channel);
-	CLIParserFree();
+    bool leaveSignalON = arg_get_lit(1);
+    bool APDULogging = arg_get_lit(2);
+    EMVCommandChannel channel = ECC_CONTACTLESS;
+    if (arg_get_lit(3))
+        channel = ECC_CONTACT;
+    PrintChannel(channel);
+    CLIParserFree();
 
-	SetAPDULogging(APDULogging);
+    SetAPDULogging(APDULogging);
 
-	// exec
-	uint8_t buf[APDU_RES_LEN] = {0};
-	size_t len = 0;
-	uint16_t sw = 0;
-	int res = EMVGenerateChallenge(channel, leaveSignalON, buf, sizeof(buf), &len, &sw, NULL);
+    // exec
+    uint8_t buf[APDU_RES_LEN] = {0};
+    size_t len = 0;
+    uint16_t sw = 0;
+    int res = EMVGenerateChallenge(channel, leaveSignalON, buf, sizeof(buf), &len, &sw, NULL);
 
-	if (sw)
-		PrintAndLogEx(INFO, "APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
+    if (sw)
+        PrintAndLogEx(INFO, "APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
 
-	if (res)
-		return res;
+    if (res)
+        return res;
 
-	PrintAndLogEx(SUCCESS, "Challenge: %s", sprint_hex(buf, len));
+    PrintAndLogEx(SUCCESS, "Challenge: %s", sprint_hex(buf, len));
 
-	if (len != 4 && len != 8)
-		PrintAndLogEx(WARNING, "Length of challenge must be 4 or 8, but it %d", len);
+    if (len != 4 && len != 8)
+        PrintAndLogEx(WARNING, "Length of challenge must be 4 or 8, but it %d", len);
 
-	return 0;
+    return 0;
 }
 
 int CmdEMVInternalAuthenticate(const char *cmd) {
-	uint8_t data[APDU_RES_LEN] = {0};
-	int datalen = 0;
+    uint8_t data[APDU_RES_LEN] = {0};
+    int datalen = 0;
 
-	CLIParserInit("emv intauth",
-		"Generate Internal Authenticate command. Usually needs 4-byte random number. It returns data in TLV format .\n"
-		"Needs a EMV applet to be selected and GPO to be executed.",
+    CLIParserInit("emv intauth",
+        "Generate Internal Authenticate command. Usually needs 4-byte random number. It returns data in TLV format .\n"
+        "Needs a EMV applet to be selected and GPO to be executed.",
 
-		"Usage:\n"
-		"\temv intauth -k 01020304 -> execute Internal Authenticate with 4-byte DDOLdata and keep field ON after command\n"
-			"\temv intauth -t 01020304 -> execute Internal Authenticate with 4-byte DDOL data, show result in TLV\n"
-			"\temv intauth -pmt 9F 37 04 -> load params from file, make DDOL data from DDOL, Internal Authenticate with DDOL, show result in TLV");
+        "Usage:\n"
+        "\temv intauth -k 01020304 -> execute Internal Authenticate with 4-byte DDOLdata and keep field ON after command\n"
+            "\temv intauth -t 01020304 -> execute Internal Authenticate with 4-byte DDOL data, show result in TLV\n"
+            "\temv intauth -pmt 9F 37 04 -> load params from file, make DDOL data from DDOL, Internal Authenticate with DDOL, show result in TLV");
 
-	void* argtable[] = {
-		arg_param_begin,
-		arg_lit0("kK",  "keep",    "keep field ON for next command"),
-		arg_lit0("pP",  "params",  "load parameters from `emv/defparams.json` file for DDOLdata making from DDOL and parameters"),
-		arg_lit0("mM",  "make",    "make DDOLdata from DDOL (tag 9F49) and parameters (by default uses default parameters)"),
-		arg_lit0("aA",  "apdu",    "show APDU reqests and responses"),
-		arg_lit0("tT",  "tlv",     "TLV decode results of selected applets"),
-		arg_lit0("wW",  "wired",   "Send data via contact (iso7816) interface. Contactless interface set by default."),
-		arg_strx1(NULL,  NULL,     "<HEX DDOLdata/DDOL>", NULL),
-		arg_param_end
-	};
-	CLIExecWithReturn(cmd, argtable, false);
+    void* argtable[] = {
+        arg_param_begin,
+        arg_lit0("kK",  "keep",    "keep field ON for next command"),
+        arg_lit0("pP",  "params",  "load parameters from `emv/defparams.json` file for DDOLdata making from DDOL and parameters"),
+        arg_lit0("mM",  "make",    "make DDOLdata from DDOL (tag 9F49) and parameters (by default uses default parameters)"),
+        arg_lit0("aA",  "apdu",    "show APDU reqests and responses"),
+        arg_lit0("tT",  "tlv",     "TLV decode results of selected applets"),
+        arg_lit0("wW",  "wired",   "Send data via contact (iso7816) interface. Contactless interface set by default."),
+        arg_strx1(NULL,  NULL,     "<HEX DDOLdata/DDOL>", NULL),
+        arg_param_end
+    };
+    CLIExecWithReturn(cmd, argtable, false);
 
-	bool leaveSignalON = arg_get_lit(1);
-	bool paramsLoadFromFile = arg_get_lit(2);
-	bool dataMakeFromDDOL = arg_get_lit(3);
-	bool APDULogging = arg_get_lit(4);
-	bool decodeTLV = arg_get_lit(5);
-	EMVCommandChannel channel = ECC_CONTACTLESS;
-	if (arg_get_lit(6))
-		channel = ECC_CONTACT;
-	PrintChannel(channel);
-	CLIGetHexWithReturn(7, data, &datalen);
-	CLIParserFree();
+    bool leaveSignalON = arg_get_lit(1);
+    bool paramsLoadFromFile = arg_get_lit(2);
+    bool dataMakeFromDDOL = arg_get_lit(3);
+    bool APDULogging = arg_get_lit(4);
+    bool decodeTLV = arg_get_lit(5);
+    EMVCommandChannel channel = ECC_CONTACTLESS;
+    if (arg_get_lit(6))
+        channel = ECC_CONTACT;
+    PrintChannel(channel);
+    CLIGetHexWithReturn(7, data, &datalen);
+    CLIParserFree();
 
-	SetAPDULogging(APDULogging);
+    SetAPDULogging(APDULogging);
 
-	// Init TLV tree
-	const char *alr = "Root terminal TLV tree";
-	struct tlvdb *tlvRoot = tlvdb_fixed(1, strlen(alr), (const unsigned char *)alr);
+    // Init TLV tree
+    const char *alr = "Root terminal TLV tree";
+    struct tlvdb *tlvRoot = tlvdb_fixed(1, strlen(alr), (const unsigned char *)alr);
 
-	// calc DDOL
-	struct tlv *ddol_data_tlv = NULL;
-	struct tlvdb *tmp_ext = NULL;
-	struct tlv data_tlv = {
-		.tag = 0x01,
-		.len = datalen,
-		.value = (uint8_t *)data,
-	};
+    // calc DDOL
+    struct tlv *ddol_data_tlv = NULL;
+    struct tlvdb *tmp_ext = NULL;
+    struct tlv data_tlv = {
+        .tag = 0x01,
+        .len = datalen,
+        .value = (uint8_t *)data,
+    };
 
-	if (dataMakeFromDDOL) {
-		ParamLoadDefaults(tlvRoot);
+    if (dataMakeFromDDOL) {
+        ParamLoadDefaults(tlvRoot);
 
-		if (paramsLoadFromFile) {
-			PrintAndLogEx(INFO, "Params loading from file...");
-			ParamLoadFromJson(tlvRoot);
-		};
+        if (paramsLoadFromFile) {
+            PrintAndLogEx(INFO, "Params loading from file...");
+            ParamLoadFromJson(tlvRoot);
+        };
 
-		tmp_ext = tlvdb_external(0x9f49, datalen, data);
-		ddol_data_tlv = dol_process((const struct tlv *)tmp_ext, tlvRoot, 0x01); // 0x01 - dummy tag
-		if (!ddol_data_tlv){
-			PrintAndLogEx(ERR, "Can't create DDOL TLV.");
-			tlvdb_free(tmp_ext);
-			tlvdb_free(tlvRoot);
-			return 4;
-		}
-	} else {
-		if (paramsLoadFromFile) {
-			PrintAndLogEx(WARNING, "Don't need to load parameters. Sending plain DDOL data...");
-		}
-		ddol_data_tlv = &data_tlv;
-	}
+        tmp_ext = tlvdb_external(0x9f49, datalen, data);
+        ddol_data_tlv = dol_process((const struct tlv *)tmp_ext, tlvRoot, 0x01); // 0x01 - dummy tag
+        if (!ddol_data_tlv){
+            PrintAndLogEx(ERR, "Can't create DDOL TLV.");
+            tlvdb_free(tmp_ext);
+            tlvdb_free(tlvRoot);
+            return 4;
+        }
+    } else {
+        if (paramsLoadFromFile) {
+            PrintAndLogEx(WARNING, "Don't need to load parameters. Sending plain DDOL data...");
+        }
+        ddol_data_tlv = &data_tlv;
+    }
 
-	PrintAndLogEx(INFO, "DDOL data[%d]: %s", ddol_data_tlv->len, sprint_hex(ddol_data_tlv->value, ddol_data_tlv->len));
+    PrintAndLogEx(INFO, "DDOL data[%d]: %s", ddol_data_tlv->len, sprint_hex(ddol_data_tlv->value, ddol_data_tlv->len));
 
-	// exec
-	uint8_t buf[APDU_RES_LEN] = {0};
-	size_t len = 0;
-	uint16_t sw = 0;
-	int res = EMVInternalAuthenticate(channel, leaveSignalON, data, datalen, buf, sizeof(buf), &len, &sw, NULL);
+    // exec
+    uint8_t buf[APDU_RES_LEN] = {0};
+    size_t len = 0;
+    uint16_t sw = 0;
+    int res = EMVInternalAuthenticate(channel, leaveSignalON, data, datalen, buf, sizeof(buf), &len, &sw, NULL);
 
-	if (ddol_data_tlv != &data_tlv)
-		free(ddol_data_tlv);
+    if (ddol_data_tlv != &data_tlv)
+        free(ddol_data_tlv);
 
-	tlvdb_free(tmp_ext);
-	tlvdb_free(tlvRoot);
+    tlvdb_free(tmp_ext);
+    tlvdb_free(tlvRoot);
 
-	if (sw)
-		PrintAndLogEx(INFO, "APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
+    if (sw)
+        PrintAndLogEx(INFO, "APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
 
-	if (res)
-		return res;
+    if (res)
+        return res;
 
-	if (decodeTLV)
-		TLVPrintFromBuffer(buf, len);
+    if (decodeTLV)
+        TLVPrintFromBuffer(buf, len);
 
-	return 0;
+    return 0;
 }
 
 #define dreturn(n) {free(pdol_data_tlv); tlvdb_free(tlvSelect); tlvdb_free(tlvRoot); DropFieldEx( channel ); return n;}
 
 void InitTransactionParameters(struct tlvdb *tlvRoot, bool paramLoadJSON, enum TransactionType TrType, bool GenACGPO) {
 
-	ParamLoadDefaults(tlvRoot);
+    ParamLoadDefaults(tlvRoot);
 
-	if (paramLoadJSON) {
-		PrintAndLog("* * Transaction parameters loading from JSON...");
-		ParamLoadFromJson(tlvRoot);
-	}
+    if (paramLoadJSON) {
+        PrintAndLog("* * Transaction parameters loading from JSON...");
+        ParamLoadFromJson(tlvRoot);
+    }
 
-	//9F66:(Terminal Transaction Qualifiers (TTQ)) len:4
-	char *qVSDC = "\x26\x00\x00\x00";
-	if (GenACGPO) {
-		qVSDC = "\x26\x80\x00\x00";
-	}
-	switch(TrType) {
-		case TT_MSD:
-			TLV_ADD(0x9F66, "\x86\x00\x00\x00"); // MSD
-			break;
-		// not standard for contactless. just for test.
-		case TT_VSDC:
-			TLV_ADD(0x9F66, "\x46\x00\x00\x00"); // VSDC
-			break;
-		case TT_QVSDCMCHIP:
-			TLV_ADD(0x9F66, qVSDC); // qVSDC
-			break;
-		case TT_CDA:
-			TLV_ADD(0x9F66, qVSDC); // qVSDC (VISA CDA not enabled)
-			break;
-		default:
-			break;
-	}
+    //9F66:(Terminal Transaction Qualifiers (TTQ)) len:4
+    char *qVSDC = "\x26\x00\x00\x00";
+    if (GenACGPO) {
+        qVSDC = "\x26\x80\x00\x00";
+    }
+    switch(TrType) {
+        case TT_MSD:
+            TLV_ADD(0x9F66, "\x86\x00\x00\x00"); // MSD
+            break;
+        // not standard for contactless. just for test.
+        case TT_VSDC:
+            TLV_ADD(0x9F66, "\x46\x00\x00\x00"); // VSDC
+            break;
+        case TT_QVSDCMCHIP:
+            TLV_ADD(0x9F66, qVSDC); // qVSDC
+            break;
+        case TT_CDA:
+            TLV_ADD(0x9F66, qVSDC); // qVSDC (VISA CDA not enabled)
+            break;
+        default:
+            break;
+    }
 }
 
 void ProcessGPOResponseFormat1(struct tlvdb *tlvRoot, uint8_t *buf, size_t len, bool decodeTLV) {
-	if (buf[0] == 0x80) {
-		if (decodeTLV){
-			PrintAndLog("GPO response format1:");
-			TLVPrintFromBuffer(buf, len);
-		}
+    if (buf[0] == 0x80) {
+        if (decodeTLV){
+            PrintAndLog("GPO response format1:");
+            TLVPrintFromBuffer(buf, len);
+        }
 
-		if (len < 4 || (len - 4) % 4) {
-			PrintAndLogEx(ERR, "GPO response format1 parsing error. length=%d", len);
-		} else {
-			// AIP
-			struct tlvdb * f1AIP = tlvdb_fixed(0x82, 2, buf + 2);
-			tlvdb_add(tlvRoot, f1AIP);
-			if (decodeTLV){
-				PrintAndLogEx(INFO, "\n* * Decode response format 1 (0x80) AIP and AFL:");
-				TLVPrintFromTLV(f1AIP);
-			}
+        if (len < 4 || (len - 4) % 4) {
+            PrintAndLogEx(ERR, "GPO response format1 parsing error. length=%d", len);
+        } else {
+            // AIP
+            struct tlvdb * f1AIP = tlvdb_fixed(0x82, 2, buf + 2);
+            tlvdb_add(tlvRoot, f1AIP);
+            if (decodeTLV){
+                PrintAndLogEx(INFO, "\n* * Decode response format 1 (0x80) AIP and AFL:");
+                TLVPrintFromTLV(f1AIP);
+            }
 
-			// AFL
-			struct tlvdb * f1AFL = tlvdb_fixed(0x94, len - 4, buf + 2 + 2);
-			tlvdb_add(tlvRoot, f1AFL);
-			if (decodeTLV)
-				TLVPrintFromTLV(f1AFL);
-		}
-	} else {
-		if (decodeTLV)
-			TLVPrintFromBuffer(buf, len);
-	}
+            // AFL
+            struct tlvdb * f1AFL = tlvdb_fixed(0x94, len - 4, buf + 2 + 2);
+            tlvdb_add(tlvRoot, f1AFL);
+            if (decodeTLV)
+                TLVPrintFromTLV(f1AFL);
+        }
+    } else {
+        if (decodeTLV)
+            TLVPrintFromBuffer(buf, len);
+    }
 }
 
 void ProcessACResponseFormat1(struct tlvdb *tlvRoot, uint8_t *buf, size_t len, bool decodeTLV) {
-	if (buf[0] == 0x80) {
-		if (decodeTLV){
-			PrintAndLog("GPO response format1:");
-			TLVPrintFromBuffer(buf, len);
-		}
+    if (buf[0] == 0x80) {
+        if (decodeTLV){
+            PrintAndLog("GPO response format1:");
+            TLVPrintFromBuffer(buf, len);
+        }
 
-		uint8_t elmlen = len - 2; // wo 0x80XX
+        uint8_t elmlen = len - 2; // wo 0x80XX
 
-		if (len < 4 + 2 || (elmlen - 2) % 4 || elmlen != buf[1]) {
-			PrintAndLogEx(ERR, "GPO response format1 parsing error. length=%d", len);
-		} else {
-			struct tlvdb *tlvElm = NULL;
-			if (decodeTLV)
-				PrintAndLog("\n------------ Format1 decoded ------------");
+        if (len < 4 + 2 || (elmlen - 2) % 4 || elmlen != buf[1]) {
+            PrintAndLogEx(ERR, "GPO response format1 parsing error. length=%d", len);
+        } else {
+            struct tlvdb *tlvElm = NULL;
+            if (decodeTLV)
+                PrintAndLog("\n------------ Format1 decoded ------------");
 
-			// CID (Cryptogram Information Data)
-			tlvdb_change_or_add_node_ex(tlvRoot, 0x9f27, 1, &buf[2], &tlvElm);
-			if (decodeTLV)
-				TLVPrintFromTLV(tlvElm);
+            // CID (Cryptogram Information Data)
+            tlvdb_change_or_add_node_ex(tlvRoot, 0x9f27, 1, &buf[2], &tlvElm);
+            if (decodeTLV)
+                TLVPrintFromTLV(tlvElm);
 
-			// ATC (Application Transaction Counter)
-			tlvdb_change_or_add_node_ex(tlvRoot, 0x9f36, 2, &buf[3], &tlvElm);
-			if (decodeTLV)
-				TLVPrintFromTLV(tlvElm);
+            // ATC (Application Transaction Counter)
+            tlvdb_change_or_add_node_ex(tlvRoot, 0x9f36, 2, &buf[3], &tlvElm);
+            if (decodeTLV)
+                TLVPrintFromTLV(tlvElm);
 
-			// AC (Application Cryptogram)
-			tlvdb_change_or_add_node_ex(tlvRoot, 0x9f26, MIN(8, elmlen - 3), &buf[5], &tlvElm);
-			if (decodeTLV)
-				TLVPrintFromTLV(tlvElm);
+            // AC (Application Cryptogram)
+            tlvdb_change_or_add_node_ex(tlvRoot, 0x9f26, MIN(8, elmlen - 3), &buf[5], &tlvElm);
+            if (decodeTLV)
+                TLVPrintFromTLV(tlvElm);
 
-			// IAD (Issuer Application Data) - optional
-			if (len > 11 + 2) {
-				tlvdb_change_or_add_node_ex(tlvRoot, 0x9f10, elmlen - 11, &buf[13], &tlvElm);
-				if (decodeTLV)
-					TLVPrintFromTLV(tlvElm);
-			}
-		}
-	} else {
-		if (decodeTLV)
-			TLVPrintFromBuffer(buf, len);
-	}
+            // IAD (Issuer Application Data) - optional
+            if (len > 11 + 2) {
+                tlvdb_change_or_add_node_ex(tlvRoot, 0x9f10, elmlen - 11, &buf[13], &tlvElm);
+                if (decodeTLV)
+                    TLVPrintFromTLV(tlvElm);
+            }
+        }
+    } else {
+        if (decodeTLV)
+            TLVPrintFromBuffer(buf, len);
+    }
 }
 
 int CmdEMVExec(const char *cmd) {
-	uint8_t buf[APDU_RES_LEN] = {0};
-	size_t len = 0;
-	uint16_t sw = 0;
-	uint8_t AID[APDU_AID_LEN] = {0};
-	size_t AIDlen = 0;
-	uint8_t ODAiList[4096];
-	size_t ODAiListLen = 0;
+    uint8_t buf[APDU_RES_LEN] = {0};
+    size_t len = 0;
+    uint16_t sw = 0;
+    uint8_t AID[APDU_AID_LEN] = {0};
+    size_t AIDlen = 0;
+    uint8_t ODAiList[4096];
+    size_t ODAiListLen = 0;
 
-	int res;
+    int res;
 
-	struct tlvdb *tlvSelect = NULL;
-	struct tlvdb *tlvRoot = NULL;
-	struct tlv *pdol_data_tlv = NULL;
+    struct tlvdb *tlvSelect = NULL;
+    struct tlvdb *tlvRoot = NULL;
+    struct tlv *pdol_data_tlv = NULL;
 
-	CLIParserInit("emv exec",
-		"Executes EMV contactless transaction",
-		"Usage:\n"
-			"\temv exec -sat -> select card, execute MSD transaction, show APDU and TLV\n"
-			"\temv exec -satc -> select card, execute CDA transaction, show APDU and TLV\n");
+    CLIParserInit("emv exec",
+        "Executes EMV contactless transaction",
+        "Usage:\n"
+            "\temv exec -sat -> select card, execute MSD transaction, show APDU and TLV\n"
+            "\temv exec -satc -> select card, execute CDA transaction, show APDU and TLV\n");
 
-	void* argtable[] = {
-		arg_param_begin,
-		arg_lit0("sS",  "select",   "activate field and select card."),
-		arg_lit0("aA",  "apdu",     "show APDU reqests and responses."),
-		arg_lit0("tT",  "tlv",      "TLV decode results."),
-		arg_lit0("jJ",  "jload",    "Load transaction parameters from `emv/defparams.json` file."),
-		arg_lit0("fF",  "forceaid", "Force search AID. Search AID instead of execute PPSE."),
-		arg_rem("By default:",      "Transaction type - MSD"),
-		arg_lit0("vV",  "qvsdc",    "Transaction type - qVSDC or M/Chip."),
-		arg_lit0("cC",  "qvsdccda", "Transaction type - qVSDC or M/Chip plus CDA (SDAD generation)."),
-		arg_lit0("xX",  "vsdc",     "Transaction type - VSDC. For test only. Not a standart behavior."),
-		arg_lit0("gG",  "acgpo",    "VISA. generate AC from GPO."),
-		arg_lit0("wW",  "wired",   "Send data via contact (iso7816) interface. Contactless interface set by default."),
-		arg_param_end
-	};
-	CLIExecWithReturn(cmd, argtable, true);
+    void* argtable[] = {
+        arg_param_begin,
+        arg_lit0("sS",  "select",   "activate field and select card."),
+        arg_lit0("aA",  "apdu",     "show APDU reqests and responses."),
+        arg_lit0("tT",  "tlv",      "TLV decode results."),
+        arg_lit0("jJ",  "jload",    "Load transaction parameters from `emv/defparams.json` file."),
+        arg_lit0("fF",  "forceaid", "Force search AID. Search AID instead of execute PPSE."),
+        arg_rem("By default:",      "Transaction type - MSD"),
+        arg_lit0("vV",  "qvsdc",    "Transaction type - qVSDC or M/Chip."),
+        arg_lit0("cC",  "qvsdccda", "Transaction type - qVSDC or M/Chip plus CDA (SDAD generation)."),
+        arg_lit0("xX",  "vsdc",     "Transaction type - VSDC. For test only. Not a standart behavior."),
+        arg_lit0("gG",  "acgpo",    "VISA. generate AC from GPO."),
+        arg_lit0("wW",  "wired",   "Send data via contact (iso7816) interface. Contactless interface set by default."),
+        arg_param_end
+    };
+    CLIExecWithReturn(cmd, argtable, true);
 
-	bool activateField = arg_get_lit(1);
-	bool showAPDU = arg_get_lit(2);
-	bool decodeTLV = arg_get_lit(3);
-	bool paramLoadJSON = arg_get_lit(4);
-	bool forceSearch = arg_get_lit(5);
+    bool activateField = arg_get_lit(1);
+    bool showAPDU = arg_get_lit(2);
+    bool decodeTLV = arg_get_lit(3);
+    bool paramLoadJSON = arg_get_lit(4);
+    bool forceSearch = arg_get_lit(5);
 
-	enum TransactionType TrType = TT_MSD;
-	if (arg_get_lit(7))
-		TrType = TT_QVSDCMCHIP;
-	if (arg_get_lit(8))
-		TrType = TT_CDA;
-	if (arg_get_lit(9))
-		TrType = TT_VSDC;
+    enum TransactionType TrType = TT_MSD;
+    if (arg_get_lit(7))
+        TrType = TT_QVSDCMCHIP;
+    if (arg_get_lit(8))
+        TrType = TT_CDA;
+    if (arg_get_lit(9))
+        TrType = TT_VSDC;
 
-	bool GenACGPO = arg_get_lit(10);
-	EMVCommandChannel channel = ECC_CONTACTLESS;
-	if (arg_get_lit(11))
-		channel = ECC_CONTACT;
-	PrintChannel(channel);
-	uint8_t psenum = (channel == ECC_CONTACT) ? 1 : 2;
-	CLIParserFree();
+    bool GenACGPO = arg_get_lit(10);
+    EMVCommandChannel channel = ECC_CONTACTLESS;
+    if (arg_get_lit(11))
+        channel = ECC_CONTACT;
+    PrintChannel(channel);
+    uint8_t psenum = (channel == ECC_CONTACT) ? 1 : 2;
+    CLIParserFree();
 
 #ifndef WITH_SMARTCARD
-	// not compiled with smartcard functionality,  we need to exit
-	if ( channel == ECC_CONTACT ) {
-		PrintAndLogEx(WARNING, "PM3 Client is not compiled with support for SMARTCARD. Exiting.");
-		return 0;
-	}
+    // not compiled with smartcard functionality,  we need to exit
+    if ( channel == ECC_CONTACT ) {
+        PrintAndLogEx(WARNING, "PM3 Client is not compiled with support for SMARTCARD. Exiting.");
+        return 0;
+    }
 #endif
 
-	SetAPDULogging(showAPDU);
-
-	// init applets list tree
-	const char *al = "Applets list";
-	tlvSelect = tlvdb_fixed(1, strlen(al), (const unsigned char *)al);
-
-	// Application Selection
-	// https://www.openscdp.org/scripts/tutorial/emv/applicationselection.html
-	if (!forceSearch) {
-		// PPSE
-		PrintAndLogEx(NORMAL, "\n* PPSE.");
-		SetAPDULogging(showAPDU);
-		res = EMVSearchPSE(channel, activateField, true, psenum, decodeTLV, tlvSelect);
-
-		// check PPSE and select application id
-		if (!res) {
-			TLVPrintAIDlistFromSelectTLV(tlvSelect);
-			EMVSelectApplication(tlvSelect, AID, &AIDlen);
-		}
-	}
-
-	// Search
-	if (!AIDlen) {
-		PrintAndLogEx(NORMAL, "\n* Search AID in list.");
-		SetAPDULogging(false);
-		if (EMVSearch(channel, activateField, true, decodeTLV, tlvSelect)) {
-			dreturn(2);
-		}
-
-		// check search and select application id
-		TLVPrintAIDlistFromSelectTLV(tlvSelect);
-		EMVSelectApplication(tlvSelect, AID, &AIDlen);
-	}
-
-	// Init TLV tree
-	const char *alr = "Root terminal TLV tree";
-	tlvRoot = tlvdb_fixed(1, strlen(alr), (const unsigned char *)alr);
-
-	// check if we found EMV application on card
-	if (!AIDlen) {
-		PrintAndLogEx(WARNING, "Can't select AID. EMV AID not found");
-		dreturn(2);
-	}
-
-	// Select
-	PrintAndLogEx(NORMAL, "\n* Selecting AID:%s", sprint_hex_inrow(AID, AIDlen));
-	SetAPDULogging(showAPDU);
-	res = EMVSelect(channel, false, true, AID, AIDlen, buf, sizeof(buf), &len, &sw, tlvRoot);
-
-	if (res) {
-		PrintAndLogEx(WARNING, "Can't select AID (%d). Exit...", res);
-		dreturn(3);
-	}
-
-	if (decodeTLV)
-		TLVPrintFromBuffer(buf, len);
-	PrintAndLog("* Selected.");
-
-	PrintAndLog("\n* Init transaction parameters.");
-	InitTransactionParameters(tlvRoot, paramLoadJSON, TrType, GenACGPO);
-	TLVPrintFromTLV(tlvRoot); // TODO delete!!!
-
-	PrintAndLogEx(NORMAL, "\n* Calc PDOL.");
-	pdol_data_tlv = dol_process(tlvdb_get(tlvRoot, 0x9f38, NULL), tlvRoot, 0x83);
-	if (!pdol_data_tlv){
-		PrintAndLogEx(WARNING, "Error: can't create PDOL TLV.");
-		dreturn(4);
-	}
-
-	size_t pdol_data_tlv_data_len;
-	unsigned char *pdol_data_tlv_data = tlv_encode(pdol_data_tlv, &pdol_data_tlv_data_len);
-	if (!pdol_data_tlv_data) {
-		PrintAndLogEx(WARNING, "Error: can't create PDOL data.");
-		dreturn(4);
-	}
-	PrintAndLogEx(NORMAL, "PDOL data[%d]: %s", pdol_data_tlv_data_len, sprint_hex(pdol_data_tlv_data, pdol_data_tlv_data_len));
-
-	PrintAndLogEx(NORMAL, "\n* GPO.");
-	res = EMVGPO(channel, true, pdol_data_tlv_data, pdol_data_tlv_data_len, buf, sizeof(buf), &len, &sw, tlvRoot);
-
-	free(pdol_data_tlv_data);
-	//free(pdol_data_tlv); --- free on exit.
-
-	if (res) {
-		PrintAndLogEx(NORMAL, "GPO error(%d): %4x. Exit...", res, sw);
-		dreturn(5);
-	}
-
-	// process response template format 1 [id:80  2b AIP + x4b AFL] and format 2 [id:77 TLV]
-	ProcessGPOResponseFormat1(tlvRoot, buf, len, decodeTLV);
-
-	// extract PAN from track2
-	{
-		const struct tlv *track2 = tlvdb_get(tlvRoot, 0x57, NULL);
-		if (!tlvdb_get(tlvRoot, 0x5a, NULL) && track2 && track2->len >= 8) {
-			struct tlvdb *pan = GetPANFromTrack2(track2);
-			if (pan) {
-				tlvdb_add(tlvRoot, pan);
-
-				const struct tlv *pantlv = tlvdb_get(tlvRoot, 0x5a, NULL);
-				PrintAndLogEx(NORMAL, "\n* * Extracted PAN from track2: %s", sprint_hex(pantlv->value, pantlv->len));
-			} else {
-				PrintAndLogEx(NORMAL, "\n* * WARNING: Can't extract PAN from track2.");
-			}
-		}
-	}
-
-	PrintAndLogEx(NORMAL, "\n* Read records from AFL.");
-	const struct tlv *AFL = tlvdb_get(tlvRoot, 0x94, NULL);
-
-	if (!AFL || !AFL->len)
-		PrintAndLogEx(NORMAL, "WARNING: AFL not found.");
-
-	while (AFL && AFL->len) {
-		if (AFL->len % 4) {
-			PrintAndLogEx(WARNING, "Error: Wrong AFL length: %d", AFL->len);
-			break;
-		}
-
-		for (int i = 0; i < AFL->len / 4; i++) {
-			uint8_t SFI = AFL->value[i * 4 + 0] >> 3;
-			uint8_t SFIstart = AFL->value[i * 4 + 1];
-			uint8_t SFIend = AFL->value[i * 4 + 2];
-			uint8_t SFIoffline = AFL->value[i * 4 + 3];
-
-			PrintAndLogEx(NORMAL, "* * SFI[%02x] start:%02x end:%02x offline count:%02x", SFI, SFIstart, SFIend, SFIoffline);
-			if (SFI == 0 || SFI == 31 || SFIstart == 0 || SFIstart > SFIend) {
-				PrintAndLogEx(NORMAL, "SFI ERROR! Skipped...");
-				continue;
-			}
-
-			for (int n = SFIstart; n <= SFIend; n++) {
-				PrintAndLogEx(NORMAL, "* * * SFI[%02x] %d", SFI, n);
-
-				res = EMVReadRecord(channel, true, SFI, n, buf, sizeof(buf), &len, &sw, tlvRoot);
-				if (res) {
-					PrintAndLogEx(WARNING, "Error SFI[%02x]. APDU error %4x", SFI, sw);
-					continue;
-				}
-
-				if (decodeTLV) {
-					TLVPrintFromBuffer(buf, len);
-					PrintAndLogEx(NORMAL, "");
-				}
-
-				// Build Input list for Offline Data Authentication
-				// EMV 4.3 book3 10.3, page 96
-				if (SFIoffline > 0) {
-					if (SFI < 11) {
-						const unsigned char *abuf = buf;
-						size_t elmlen = len;
-						struct tlv e;
-						if (tlv_parse_tl(&abuf, &elmlen, &e)) {
-							memcpy(&ODAiList[ODAiListLen], &buf[len - elmlen], elmlen);
-							ODAiListLen += elmlen;
-						} else {
-							PrintAndLogEx(WARNING, "Error SFI[%02x]. Creating input list for Offline Data Authentication error.", SFI);
-						}
-					} else {
-						memcpy(&ODAiList[ODAiListLen], buf, len);
-						ODAiListLen += len;
-					}
-
-					SFIoffline--;
-				}
-			}
-		}
-
-		break;
-	}
-
-	// copy Input list for Offline Data Authentication
-	if (ODAiListLen) {
-		struct tlvdb *oda = tlvdb_fixed(0x21, ODAiListLen, ODAiList); // not a standard tag
-		tlvdb_add(tlvRoot, oda);
-		PrintAndLogEx(NORMAL, "* Input list for Offline Data Authentication added to TLV. len=%d \n", ODAiListLen);
-	}
-
-	// get AIP
-	uint16_t AIP = 0;
-	const struct tlv *AIPtlv = tlvdb_get(tlvRoot, 0x82, NULL);
-	if (AIPtlv) {
-		AIP = AIPtlv->value[0] + AIPtlv->value[1] * 0x100;
-		PrintAndLogEx(NORMAL, "* * AIP=%04x", AIP);
-	} else {
-		PrintAndLogEx(ERR, "Can't found AIP.");
-	}
-
-	// SDA
-	if (AIP & 0x0040) {
-		PrintAndLogEx(NORMAL, "\n* SDA");
-		trSDA(tlvRoot);
-	}
-
-	// DDA
-	if (AIP & 0x0020) {
-		PrintAndLogEx(NORMAL, "\n* DDA");
-		trDDA(channel, decodeTLV, tlvRoot);
-	}
-
-	// transaction check
-
-	// qVSDC
-	if (TrType == TT_QVSDCMCHIP || TrType == TT_CDA){
-		// 9F26: Application Cryptogram
-		const struct tlv *AC = tlvdb_get(tlvRoot, 0x9F26, NULL);
-		if (AC) {
-			PrintAndLogEx(NORMAL, "\n--> qVSDC transaction.");
-			PrintAndLogEx(NORMAL, "* AC path");
-
-			// 9F36: Application Transaction Counter (ATC)
-			const struct tlv *ATC = tlvdb_get(tlvRoot, 0x9F36, NULL);
-			if (ATC) {
-
-				// 9F10: Issuer Application Data - optional
-				const struct tlv *IAD = tlvdb_get(tlvRoot, 0x9F10, NULL);
-
-				// print AC data
-				PrintAndLogEx(NORMAL, "ATC: %s", sprint_hex(ATC->value, ATC->len));
-				PrintAndLogEx(NORMAL, "AC: %s", sprint_hex(AC->value, AC->len));
-				if (IAD) {
-					PrintAndLogEx(NORMAL, "IAD: %s", sprint_hex(IAD->value, IAD->len));
-
-					if (IAD->len >= IAD->value[0] + 1) {
-						PrintAndLogEx(NORMAL, "\tKey index:  0x%02x", IAD->value[1]);
-						PrintAndLogEx(NORMAL, "\tCrypto ver: 0x%02x(%03d)", IAD->value[2], IAD->value[2]);
-						PrintAndLogEx(NORMAL, "\tCVR:", sprint_hex(&IAD->value[3], IAD->value[0] - 2));
-						struct tlvdb * cvr = tlvdb_fixed(0x20, IAD->value[0] - 2, &IAD->value[3]);
-						TLVPrintFromTLVLev(cvr, 1);
-					}
-				} else {
-					PrintAndLogEx(NORMAL, "WARNING: IAD not found.");
-				}
-
-			} else {
-				PrintAndLogEx(WARNING, "Error AC: Application Transaction Counter (ATC) not found.");
-			}
-		}
-	}
-
-	// Mastercard M/CHIP
-	if (GetCardPSVendor(AID, AIDlen) == CV_MASTERCARD && (TrType == TT_QVSDCMCHIP || TrType == TT_CDA)){
-		const struct tlv *CDOL1 = tlvdb_get(tlvRoot, 0x8c, NULL);
-		if (CDOL1 && GetCardPSVendor(AID, AIDlen) == CV_MASTERCARD) { // and m/chip transaction flag
-			PrintAndLogEx(NORMAL, "\n--> Mastercard M/Chip transaction.");
-
-			PrintAndLogEx(NORMAL, "* * Generate challenge");
-			res = EMVGenerateChallenge(channel, true, buf, sizeof(buf), &len, &sw, tlvRoot);
-			if (res) {
-				PrintAndLogEx(WARNING, "Error GetChallenge. APDU error %4x", sw);
-				dreturn(6);
-			}
-			if (len < 4) {
-				PrintAndLogEx(WARNING, "Error GetChallenge. Wrong challenge length %d", len);
-				dreturn(6);
-			}
-
-			// ICC Dynamic Number
-			struct tlvdb * ICCDynN = tlvdb_fixed(0x9f4c, len, buf);
-			tlvdb_add(tlvRoot, ICCDynN);
-			if (decodeTLV) {
-				PrintAndLogEx(NORMAL, "\n* * ICC Dynamic Number:");
-				TLVPrintFromTLV(ICCDynN);
-			}
-
-			PrintAndLogEx(NORMAL, "* * Calc CDOL1");
-			struct tlv *cdol_data_tlv = dol_process(tlvdb_get(tlvRoot, 0x8c, NULL), tlvRoot, 0x01); // 0x01 - dummy tag
-			if (!cdol_data_tlv) {
-				PrintAndLogEx(WARNING, "Error: can't create CDOL1 TLV.");
-				dreturn(6);
-			}
-
-			PrintAndLogEx(NORMAL, "CDOL1 data[%d]: %s", cdol_data_tlv->len, sprint_hex(cdol_data_tlv->value, cdol_data_tlv->len));
-
-			PrintAndLogEx(NORMAL, "* * AC1");
-			// EMVAC_TC + EMVAC_CDAREQ --- to get SDAD
-			res = EMVAC(channel, true, (TrType == TT_CDA) ? EMVAC_TC + EMVAC_CDAREQ : EMVAC_TC, (uint8_t *)cdol_data_tlv->value, cdol_data_tlv->len, buf, sizeof(buf), &len, &sw, tlvRoot);
-
-			if (res) {
-				PrintAndLogEx(NORMAL, "AC1 error(%d): %4x. Exit...", res, sw);
-				dreturn(7);
-			}
-
-			if (decodeTLV)
-				TLVPrintFromBuffer(buf, len);
-
-			// CDA
-			PrintAndLogEx(NORMAL, "\n* CDA:");
-			struct tlvdb *ac_tlv = tlvdb_parse_multi(buf, len);
-			res = trCDA(tlvRoot, ac_tlv, pdol_data_tlv, cdol_data_tlv);
-			if (res) {
-				PrintAndLogEx(NORMAL, "CDA error (%d)", res);
-			}
-
-			free(ac_tlv);
-			free(cdol_data_tlv);
-
-			PrintAndLogEx(NORMAL, "\n* M/Chip transaction result:");
-			// 9F27: Cryptogram Information Data (CID)
-			const struct tlv *CID = tlvdb_get(tlvRoot, 0x9F27, NULL);
-			if (CID) {
-				emv_tag_dump(CID, stdout, 0);
-				PrintAndLogEx(NORMAL, "------------------------------");
-				if (CID->len > 0) {
-					switch(CID->value[0] & EMVAC_AC_MASK){
-						case EMVAC_AAC:
-							PrintAndLogEx(NORMAL, "Transaction DECLINED.");
-							break;
-						case EMVAC_TC:
-							PrintAndLogEx(NORMAL, "Transaction approved OFFLINE.");
-							break;
-						case EMVAC_ARQC:
-							PrintAndLogEx(NORMAL, "Transaction approved ONLINE.");
-							break;
-						default:
-							PrintAndLogEx(WARNING, "Error: CID transaction code error %2x", CID->value[0] & EMVAC_AC_MASK);
-							break;
-					}
-				} else {
-					PrintAndLogEx(WARNING, "Error: Wrong CID length %d", CID->len);
-				}
-			} else {
-				PrintAndLogEx(WARNING, "Error: CID(9F27) not found.");
-			}
-
-		}
-	}
-
-	// MSD
-	if (AIP & 0x8000 && TrType == TT_MSD) {
-		PrintAndLogEx(NORMAL, "\n--> MSD transaction.");
-
-		PrintAndLogEx(NORMAL, "* MSD dCVV path. Check dCVV");
-
-		const struct tlv *track2 = tlvdb_get(tlvRoot, 0x57, NULL);
-		if (track2) {
-			PrintAndLogEx(NORMAL, "Track2: %s", sprint_hex(track2->value, track2->len));
-
-			struct tlvdb *dCVV = GetdCVVRawFromTrack2(track2);
-			PrintAndLogEx(NORMAL, "dCVV raw data:");
-			TLVPrintFromTLV(dCVV);
-
-			if (GetCardPSVendor(AID, AIDlen) == CV_MASTERCARD) {
-				PrintAndLogEx(NORMAL, "\n* Mastercard calculate UDOL");
-
-				// UDOL (9F69)
-				const struct tlv *UDOL = tlvdb_get(tlvRoot, 0x9F69, NULL);
-				// UDOL(9F69) default: 9F6A (Unpredictable number) 4 bytes
-				const struct tlv defUDOL = {
-					.tag = 0x01,
-					.len = 3,
-					.value = (uint8_t *)"\x9f\x6a\x04",
-				};
-				if (!UDOL)
-					PrintAndLogEx(NORMAL, "Use default UDOL.");
-
-				struct tlv *udol_data_tlv = dol_process(UDOL ? UDOL : &defUDOL, tlvRoot, 0x01); // 0x01 - dummy tag
-				if (!udol_data_tlv) {
-					PrintAndLogEx(WARNING, "Error: can't create UDOL TLV.");
-					dreturn(8);
-				}
-
-				PrintAndLogEx(NORMAL, "UDOL data[%d]: %s", udol_data_tlv->len, sprint_hex(udol_data_tlv->value, udol_data_tlv->len));
-
-				PrintAndLogEx(NORMAL, "\n* Mastercard compute cryptographic checksum(UDOL)");
-
-				res = MSCComputeCryptoChecksum(channel, true, (uint8_t *)udol_data_tlv->value, udol_data_tlv->len, buf, sizeof(buf), &len, &sw, tlvRoot);
-				if (res) {
-					PrintAndLogEx(WARNING, "Error Compute Crypto Checksum. APDU error %4x", sw);
-					free(udol_data_tlv);
-					dreturn(9);
-				}
-
-				// Mastercard compute cryptographic checksum result
-				TLVPrintFromBuffer(buf, len);
-				PrintAndLogEx(NORMAL, "");
-
-				free(udol_data_tlv);
-
-			}
-		} else {
-			PrintAndLogEx(WARNING, "Error MSD: Track2 data not found.");
-		}
-	}
-
-	// VSDC
-	if (GetCardPSVendor(AID, AIDlen) == CV_VISA && (TrType == TT_VSDC || TrType == TT_CDA)){
-		PrintAndLogEx(NORMAL, "\n--> VSDC transaction.");
-
-		PrintAndLogEx(NORMAL, "* * Calc CDOL1");
-		struct tlv *cdol1_data_tlv = dol_process(tlvdb_get(tlvRoot, 0x8c, NULL), tlvRoot, 0x01); // 0x01 - dummy tag
-		if (!cdol1_data_tlv) {
-			PrintAndLogEx(WARNING, "Error: can't create CDOL1 TLV.");
-			dreturn(6);
-		}
-
-		PrintAndLogEx(NORMAL, "CDOL1 data[%d]: %s", cdol1_data_tlv->len, sprint_hex(cdol1_data_tlv->value, cdol1_data_tlv->len));
-
-		PrintAndLogEx(NORMAL, "* * AC1");
-		// EMVAC_TC + EMVAC_CDAREQ --- to get SDAD
-		res = EMVAC(channel, true, (TrType == TT_CDA) ? EMVAC_TC + EMVAC_CDAREQ : EMVAC_TC, (uint8_t *)cdol1_data_tlv->value, cdol1_data_tlv->len, buf, sizeof(buf), &len, &sw, tlvRoot);
-
-		if (res) {
-			PrintAndLogEx(NORMAL, "AC1 error(%d): %4x. Exit...", res, sw);
-			free(cdol1_data_tlv);
-			dreturn(7);
-		}
-
-		// process Format1 (0x80) and print Format2 (0x77)
-		ProcessACResponseFormat1(tlvRoot, buf, len, decodeTLV);
-
-		uint8_t CID = 0;
-		tlvdb_get_uint8(tlvRoot, 0x9f27, &CID);
-
-		// AC1 print result
-		PrintAndLog("");
-		if ((CID & EMVAC_AC_MASK) == EMVAC_AAC)		PrintAndLogEx(INFO, "AC1 result: AAC (Transaction declined)");
-		if ((CID & EMVAC_AC_MASK) == EMVAC_TC)		PrintAndLogEx(INFO, "AC1 result: TC (Transaction approved)");
-		if ((CID & EMVAC_AC_MASK) == EMVAC_ARQC)	PrintAndLogEx(INFO, "AC1 result: ARQC (Online authorisation requested)");
-		if ((CID & EMVAC_AC_MASK) == EMVAC_AC_MASK)	PrintAndLogEx(INFO, "AC1 result: RFU");
-
-		// decode Issuer Application Data (IAD)
-		uint8_t CryptoVersion = 0;
-		const struct tlv *IAD = tlvdb_get(tlvRoot, 0x9f10, NULL);
-		if (IAD && (IAD->len > 1)) {
-			PrintAndLogEx(NORMAL, "\n* * Issuer Application Data (IAD):");
-			uint8_t VDDlen = IAD->value[0]; // Visa discretionary data length
-			uint8_t IDDlen = 0;             // Issuer discretionary data length
-			PrintAndLogEx(NORMAL, "IAD length: %d", IAD->len);
-			PrintAndLogEx(NORMAL, "VDDlen: %d", VDDlen);
-			if (VDDlen < IAD->len - 1)
-				IDDlen = IAD->value[VDDlen + 1];
-			PrintAndLogEx(NORMAL, "IDDlen: %d", IDDlen);
-
-			uint8_t DerivKeyIndex = IAD->value[1];
-			CryptoVersion = IAD->value[2];
-
-			PrintAndLogEx(NORMAL, "CryptoVersion: %d", CryptoVersion);
-			PrintAndLogEx(NORMAL, "DerivKeyIndex: %d", DerivKeyIndex);
-
-			// Card Verification Results (CVR) decode
-			if ((VDDlen - 2) > 0) {
-				uint8_t CVRlen = IAD->value[3];
-				if (CVRlen == (VDDlen - 2 - 1)) {
-					PrintAndLogEx(NORMAL, "CVR length: %d", CVRlen);
-					PrintAndLogEx(NORMAL, "CVR: %s", sprint_hex(&IAD->value[4], CVRlen));
-				} else {
-					PrintAndLogEx(NORMAL, "Wrong CVR length! CVR: %s", sprint_hex(&IAD->value[3], VDDlen - 2));
-				}
-			}
-			if (IDDlen)
-				PrintAndLogEx(NORMAL, "IDD: %s", sprint_hex(&IAD->value[VDDlen + 1], IDDlen));
-		} else {
-			PrintAndLogEx(NORMAL, "Issuer Application Data (IAD) not found.");
-		}
-
-		PrintAndLogEx(NORMAL, "\n* * Processing online request");
-
-		// authorization response code from acquirer
-		const char HostResponse[] = "00"; // 0x3030
-		size_t HostResponseLen = sizeof(HostResponse) - 1;
-		PrintAndLogEx(NORMAL, "Host Response: `%s`", HostResponse);
-		tlvdb_change_or_add_node(tlvRoot, 0x8a, HostResponseLen, (const unsigned char *)HostResponse);
-
-		if (CryptoVersion == 10) {
-			PrintAndLogEx(NORMAL, "\n* * Generate ARPC");
-
-			// Application Cryptogram (AC)
-			const struct tlv *AC = tlvdb_get(tlvRoot, 0x9f26, NULL);
-			if (AC && (AC->len > 0)) {
-				PrintAndLogEx(NORMAL, "AC: %s", sprint_hex(AC->value, AC->len));
-
-				size_t rawARPClen = AC->len;
-				uint8_t rawARPC[rawARPClen];
-				memcpy(rawARPC, AC->value, AC->len);
-				for (int i = 0; (i < HostResponseLen) && (i < rawARPClen); i++)
-					rawARPC[i] ^= HostResponse[i];
-				PrintAndLogEx(NORMAL, "raw ARPC: %s", sprint_hex(rawARPC, rawARPClen));
-
-				// here must be calculation of ARPC, but we dont know a bank keys.
-				PrintAndLogEx(NORMAL, "ARPC: n/a");
-
-			} else {
-				PrintAndLogEx(NORMAL, "Application Cryptogram (AC) not found.");
-			}
-
-			// here must be external authenticate, but we dont know ARPC
-
-		}
-
-
-		// needs to send AC2 command (res == ARQC)
-		if ((CID & EMVAC_AC_MASK) == EMVAC_ARQC) {
-			PrintAndLogEx(NORMAL, "\n* * Calc CDOL2");
-			struct tlv *cdol2_data_tlv = dol_process(tlvdb_get(tlvRoot, 0x8d, NULL), tlvRoot, 0x01); // 0x01 - dummy tag
-			if (!cdol2_data_tlv) {
-				PrintAndLogEx(WARNING, "Error: can't create CDOL2 TLV.");
-				dreturn(6);
-			}
-
-			PrintAndLogEx(NORMAL, "CDOL2 data[%d]: %s", cdol2_data_tlv->len, sprint_hex(cdol2_data_tlv->value, cdol2_data_tlv->len));
-
-			//PrintAndLogEx(NORMAL, "* * AC2");
-
-
-			// here must be AC2, but we dont make external authenticate (
-
-/*			// AC2
-			PRINT_INDENT(level);
-			if ((CID & EMVAC_AC2_MASK) == EMVAC_AAC2)	fprintf(f, "\tAC2: AAC (Transaction declined)\n");
-			if ((CID & EMVAC_AC2_MASK) == EMVAC_TC2)	fprintf(f, "\tAC2: TC (Transaction approved)\n");
-			if ((CID & EMVAC_AC2_MASK) == EMVAC_ARQC2)	fprintf(f, "\tAC2: not requested (ARQC)\n");
-			if ((CID & EMVAC_AC2_MASK) == EMVAC_AC2_MASK)	fprintf(f, "\tAC2: RFU\n");
+    SetAPDULogging(showAPDU);
+
+    // init applets list tree
+    const char *al = "Applets list";
+    tlvSelect = tlvdb_fixed(1, strlen(al), (const unsigned char *)al);
+
+    // Application Selection
+    // https://www.openscdp.org/scripts/tutorial/emv/applicationselection.html
+    if (!forceSearch) {
+        // PPSE
+        PrintAndLogEx(NORMAL, "\n* PPSE.");
+        SetAPDULogging(showAPDU);
+        res = EMVSearchPSE(channel, activateField, true, psenum, decodeTLV, tlvSelect);
+
+        // check PPSE and select application id
+        if (!res) {
+            TLVPrintAIDlistFromSelectTLV(tlvSelect);
+            EMVSelectApplication(tlvSelect, AID, &AIDlen);
+        }
+    }
+
+    // Search
+    if (!AIDlen) {
+        PrintAndLogEx(NORMAL, "\n* Search AID in list.");
+        SetAPDULogging(false);
+        if (EMVSearch(channel, activateField, true, decodeTLV, tlvSelect)) {
+            dreturn(2);
+        }
+
+        // check search and select application id
+        TLVPrintAIDlistFromSelectTLV(tlvSelect);
+        EMVSelectApplication(tlvSelect, AID, &AIDlen);
+    }
+
+    // Init TLV tree
+    const char *alr = "Root terminal TLV tree";
+    tlvRoot = tlvdb_fixed(1, strlen(alr), (const unsigned char *)alr);
+
+    // check if we found EMV application on card
+    if (!AIDlen) {
+        PrintAndLogEx(WARNING, "Can't select AID. EMV AID not found");
+        dreturn(2);
+    }
+
+    // Select
+    PrintAndLogEx(NORMAL, "\n* Selecting AID:%s", sprint_hex_inrow(AID, AIDlen));
+    SetAPDULogging(showAPDU);
+    res = EMVSelect(channel, false, true, AID, AIDlen, buf, sizeof(buf), &len, &sw, tlvRoot);
+
+    if (res) {
+        PrintAndLogEx(WARNING, "Can't select AID (%d). Exit...", res);
+        dreturn(3);
+    }
+
+    if (decodeTLV)
+        TLVPrintFromBuffer(buf, len);
+    PrintAndLog("* Selected.");
+
+    PrintAndLog("\n* Init transaction parameters.");
+    InitTransactionParameters(tlvRoot, paramLoadJSON, TrType, GenACGPO);
+    TLVPrintFromTLV(tlvRoot); // TODO delete!!!
+
+    PrintAndLogEx(NORMAL, "\n* Calc PDOL.");
+    pdol_data_tlv = dol_process(tlvdb_get(tlvRoot, 0x9f38, NULL), tlvRoot, 0x83);
+    if (!pdol_data_tlv){
+        PrintAndLogEx(WARNING, "Error: can't create PDOL TLV.");
+        dreturn(4);
+    }
+
+    size_t pdol_data_tlv_data_len;
+    unsigned char *pdol_data_tlv_data = tlv_encode(pdol_data_tlv, &pdol_data_tlv_data_len);
+    if (!pdol_data_tlv_data) {
+        PrintAndLogEx(WARNING, "Error: can't create PDOL data.");
+        dreturn(4);
+    }
+    PrintAndLogEx(NORMAL, "PDOL data[%d]: %s", pdol_data_tlv_data_len, sprint_hex(pdol_data_tlv_data, pdol_data_tlv_data_len));
+
+    PrintAndLogEx(NORMAL, "\n* GPO.");
+    res = EMVGPO(channel, true, pdol_data_tlv_data, pdol_data_tlv_data_len, buf, sizeof(buf), &len, &sw, tlvRoot);
+
+    free(pdol_data_tlv_data);
+    //free(pdol_data_tlv); --- free on exit.
+
+    if (res) {
+        PrintAndLogEx(NORMAL, "GPO error(%d): %4x. Exit...", res, sw);
+        dreturn(5);
+    }
+
+    // process response template format 1 [id:80  2b AIP + x4b AFL] and format 2 [id:77 TLV]
+    ProcessGPOResponseFormat1(tlvRoot, buf, len, decodeTLV);
+
+    // extract PAN from track2
+    {
+        const struct tlv *track2 = tlvdb_get(tlvRoot, 0x57, NULL);
+        if (!tlvdb_get(tlvRoot, 0x5a, NULL) && track2 && track2->len >= 8) {
+            struct tlvdb *pan = GetPANFromTrack2(track2);
+            if (pan) {
+                tlvdb_add(tlvRoot, pan);
+
+                const struct tlv *pantlv = tlvdb_get(tlvRoot, 0x5a, NULL);
+                PrintAndLogEx(NORMAL, "\n* * Extracted PAN from track2: %s", sprint_hex(pantlv->value, pantlv->len));
+            } else {
+                PrintAndLogEx(NORMAL, "\n* * WARNING: Can't extract PAN from track2.");
+            }
+        }
+    }
+
+    PrintAndLogEx(NORMAL, "\n* Read records from AFL.");
+    const struct tlv *AFL = tlvdb_get(tlvRoot, 0x94, NULL);
+
+    if (!AFL || !AFL->len)
+        PrintAndLogEx(NORMAL, "WARNING: AFL not found.");
+
+    while (AFL && AFL->len) {
+        if (AFL->len % 4) {
+            PrintAndLogEx(WARNING, "Error: Wrong AFL length: %d", AFL->len);
+            break;
+        }
+
+        for (int i = 0; i < AFL->len / 4; i++) {
+            uint8_t SFI = AFL->value[i * 4 + 0] >> 3;
+            uint8_t SFIstart = AFL->value[i * 4 + 1];
+            uint8_t SFIend = AFL->value[i * 4 + 2];
+            uint8_t SFIoffline = AFL->value[i * 4 + 3];
+
+            PrintAndLogEx(NORMAL, "* * SFI[%02x] start:%02x end:%02x offline count:%02x", SFI, SFIstart, SFIend, SFIoffline);
+            if (SFI == 0 || SFI == 31 || SFIstart == 0 || SFIstart > SFIend) {
+                PrintAndLogEx(NORMAL, "SFI ERROR! Skipped...");
+                continue;
+            }
+
+            for (int n = SFIstart; n <= SFIend; n++) {
+                PrintAndLogEx(NORMAL, "* * * SFI[%02x] %d", SFI, n);
+
+                res = EMVReadRecord(channel, true, SFI, n, buf, sizeof(buf), &len, &sw, tlvRoot);
+                if (res) {
+                    PrintAndLogEx(WARNING, "Error SFI[%02x]. APDU error %4x", SFI, sw);
+                    continue;
+                }
+
+                if (decodeTLV) {
+                    TLVPrintFromBuffer(buf, len);
+                    PrintAndLogEx(NORMAL, "");
+                }
+
+                // Build Input list for Offline Data Authentication
+                // EMV 4.3 book3 10.3, page 96
+                if (SFIoffline > 0) {
+                    if (SFI < 11) {
+                        const unsigned char *abuf = buf;
+                        size_t elmlen = len;
+                        struct tlv e;
+                        if (tlv_parse_tl(&abuf, &elmlen, &e)) {
+                            memcpy(&ODAiList[ODAiListLen], &buf[len - elmlen], elmlen);
+                            ODAiListLen += elmlen;
+                        } else {
+                            PrintAndLogEx(WARNING, "Error SFI[%02x]. Creating input list for Offline Data Authentication error.", SFI);
+                        }
+                    } else {
+                        memcpy(&ODAiList[ODAiListLen], buf, len);
+                        ODAiListLen += len;
+                    }
+
+                    SFIoffline--;
+                }
+            }
+        }
+
+        break;
+    }
+
+    // copy Input list for Offline Data Authentication
+    if (ODAiListLen) {
+        struct tlvdb *oda = tlvdb_fixed(0x21, ODAiListLen, ODAiList); // not a standard tag
+        tlvdb_add(tlvRoot, oda);
+        PrintAndLogEx(NORMAL, "* Input list for Offline Data Authentication added to TLV. len=%d \n", ODAiListLen);
+    }
+
+    // get AIP
+    uint16_t AIP = 0;
+    const struct tlv *AIPtlv = tlvdb_get(tlvRoot, 0x82, NULL);
+    if (AIPtlv) {
+        AIP = AIPtlv->value[0] + AIPtlv->value[1] * 0x100;
+        PrintAndLogEx(NORMAL, "* * AIP=%04x", AIP);
+    } else {
+        PrintAndLogEx(ERR, "Can't found AIP.");
+    }
+
+    // SDA
+    if (AIP & 0x0040) {
+        PrintAndLogEx(NORMAL, "\n* SDA");
+        trSDA(tlvRoot);
+    }
+
+    // DDA
+    if (AIP & 0x0020) {
+        PrintAndLogEx(NORMAL, "\n* DDA");
+        trDDA(channel, decodeTLV, tlvRoot);
+    }
+
+    // transaction check
+
+    // qVSDC
+    if (TrType == TT_QVSDCMCHIP || TrType == TT_CDA){
+        // 9F26: Application Cryptogram
+        const struct tlv *AC = tlvdb_get(tlvRoot, 0x9F26, NULL);
+        if (AC) {
+            PrintAndLogEx(NORMAL, "\n--> qVSDC transaction.");
+            PrintAndLogEx(NORMAL, "* AC path");
+
+            // 9F36: Application Transaction Counter (ATC)
+            const struct tlv *ATC = tlvdb_get(tlvRoot, 0x9F36, NULL);
+            if (ATC) {
+
+                // 9F10: Issuer Application Data - optional
+                const struct tlv *IAD = tlvdb_get(tlvRoot, 0x9F10, NULL);
+
+                // print AC data
+                PrintAndLogEx(NORMAL, "ATC: %s", sprint_hex(ATC->value, ATC->len));
+                PrintAndLogEx(NORMAL, "AC: %s", sprint_hex(AC->value, AC->len));
+                if (IAD) {
+                    PrintAndLogEx(NORMAL, "IAD: %s", sprint_hex(IAD->value, IAD->len));
+
+                    if (IAD->len >= IAD->value[0] + 1) {
+                        PrintAndLogEx(NORMAL, "\tKey index:  0x%02x", IAD->value[1]);
+                        PrintAndLogEx(NORMAL, "\tCrypto ver: 0x%02x(%03d)", IAD->value[2], IAD->value[2]);
+                        PrintAndLogEx(NORMAL, "\tCVR:", sprint_hex(&IAD->value[3], IAD->value[0] - 2));
+                        struct tlvdb * cvr = tlvdb_fixed(0x20, IAD->value[0] - 2, &IAD->value[3]);
+                        TLVPrintFromTLVLev(cvr, 1);
+                    }
+                } else {
+                    PrintAndLogEx(NORMAL, "WARNING: IAD not found.");
+                }
+
+            } else {
+                PrintAndLogEx(WARNING, "Error AC: Application Transaction Counter (ATC) not found.");
+            }
+        }
+    }
+
+    // Mastercard M/CHIP
+    if (GetCardPSVendor(AID, AIDlen) == CV_MASTERCARD && (TrType == TT_QVSDCMCHIP || TrType == TT_CDA)){
+        const struct tlv *CDOL1 = tlvdb_get(tlvRoot, 0x8c, NULL);
+        if (CDOL1 && GetCardPSVendor(AID, AIDlen) == CV_MASTERCARD) { // and m/chip transaction flag
+            PrintAndLogEx(NORMAL, "\n--> Mastercard M/Chip transaction.");
+
+            PrintAndLogEx(NORMAL, "* * Generate challenge");
+            res = EMVGenerateChallenge(channel, true, buf, sizeof(buf), &len, &sw, tlvRoot);
+            if (res) {
+                PrintAndLogEx(WARNING, "Error GetChallenge. APDU error %4x", sw);
+                dreturn(6);
+            }
+            if (len < 4) {
+                PrintAndLogEx(WARNING, "Error GetChallenge. Wrong challenge length %d", len);
+                dreturn(6);
+            }
+
+            // ICC Dynamic Number
+            struct tlvdb * ICCDynN = tlvdb_fixed(0x9f4c, len, buf);
+            tlvdb_add(tlvRoot, ICCDynN);
+            if (decodeTLV) {
+                PrintAndLogEx(NORMAL, "\n* * ICC Dynamic Number:");
+                TLVPrintFromTLV(ICCDynN);
+            }
+
+            PrintAndLogEx(NORMAL, "* * Calc CDOL1");
+            struct tlv *cdol_data_tlv = dol_process(tlvdb_get(tlvRoot, 0x8c, NULL), tlvRoot, 0x01); // 0x01 - dummy tag
+            if (!cdol_data_tlv) {
+                PrintAndLogEx(WARNING, "Error: can't create CDOL1 TLV.");
+                dreturn(6);
+            }
+
+            PrintAndLogEx(NORMAL, "CDOL1 data[%d]: %s", cdol_data_tlv->len, sprint_hex(cdol_data_tlv->value, cdol_data_tlv->len));
+
+            PrintAndLogEx(NORMAL, "* * AC1");
+            // EMVAC_TC + EMVAC_CDAREQ --- to get SDAD
+            res = EMVAC(channel, true, (TrType == TT_CDA) ? EMVAC_TC + EMVAC_CDAREQ : EMVAC_TC, (uint8_t *)cdol_data_tlv->value, cdol_data_tlv->len, buf, sizeof(buf), &len, &sw, tlvRoot);
+
+            if (res) {
+                PrintAndLogEx(NORMAL, "AC1 error(%d): %4x. Exit...", res, sw);
+                dreturn(7);
+            }
+
+            if (decodeTLV)
+                TLVPrintFromBuffer(buf, len);
+
+            // CDA
+            PrintAndLogEx(NORMAL, "\n* CDA:");
+            struct tlvdb *ac_tlv = tlvdb_parse_multi(buf, len);
+            res = trCDA(tlvRoot, ac_tlv, pdol_data_tlv, cdol_data_tlv);
+            if (res) {
+                PrintAndLogEx(NORMAL, "CDA error (%d)", res);
+            }
+
+            free(ac_tlv);
+            free(cdol_data_tlv);
+
+            PrintAndLogEx(NORMAL, "\n* M/Chip transaction result:");
+            // 9F27: Cryptogram Information Data (CID)
+            const struct tlv *CID = tlvdb_get(tlvRoot, 0x9F27, NULL);
+            if (CID) {
+                emv_tag_dump(CID, stdout, 0);
+                PrintAndLogEx(NORMAL, "------------------------------");
+                if (CID->len > 0) {
+                    switch(CID->value[0] & EMVAC_AC_MASK){
+                        case EMVAC_AAC:
+                            PrintAndLogEx(NORMAL, "Transaction DECLINED.");
+                            break;
+                        case EMVAC_TC:
+                            PrintAndLogEx(NORMAL, "Transaction approved OFFLINE.");
+                            break;
+                        case EMVAC_ARQC:
+                            PrintAndLogEx(NORMAL, "Transaction approved ONLINE.");
+                            break;
+                        default:
+                            PrintAndLogEx(WARNING, "Error: CID transaction code error %2x", CID->value[0] & EMVAC_AC_MASK);
+                            break;
+                    }
+                } else {
+                    PrintAndLogEx(WARNING, "Error: Wrong CID length %d", CID->len);
+                }
+            } else {
+                PrintAndLogEx(WARNING, "Error: CID(9F27) not found.");
+            }
+
+        }
+    }
+
+    // MSD
+    if (AIP & 0x8000 && TrType == TT_MSD) {
+        PrintAndLogEx(NORMAL, "\n--> MSD transaction.");
+
+        PrintAndLogEx(NORMAL, "* MSD dCVV path. Check dCVV");
+
+        const struct tlv *track2 = tlvdb_get(tlvRoot, 0x57, NULL);
+        if (track2) {
+            PrintAndLogEx(NORMAL, "Track2: %s", sprint_hex(track2->value, track2->len));
+
+            struct tlvdb *dCVV = GetdCVVRawFromTrack2(track2);
+            PrintAndLogEx(NORMAL, "dCVV raw data:");
+            TLVPrintFromTLV(dCVV);
+
+            if (GetCardPSVendor(AID, AIDlen) == CV_MASTERCARD) {
+                PrintAndLogEx(NORMAL, "\n* Mastercard calculate UDOL");
+
+                // UDOL (9F69)
+                const struct tlv *UDOL = tlvdb_get(tlvRoot, 0x9F69, NULL);
+                // UDOL(9F69) default: 9F6A (Unpredictable number) 4 bytes
+                const struct tlv defUDOL = {
+                    .tag = 0x01,
+                    .len = 3,
+                    .value = (uint8_t *)"\x9f\x6a\x04",
+                };
+                if (!UDOL)
+                    PrintAndLogEx(NORMAL, "Use default UDOL.");
+
+                struct tlv *udol_data_tlv = dol_process(UDOL ? UDOL : &defUDOL, tlvRoot, 0x01); // 0x01 - dummy tag
+                if (!udol_data_tlv) {
+                    PrintAndLogEx(WARNING, "Error: can't create UDOL TLV.");
+                    dreturn(8);
+                }
+
+                PrintAndLogEx(NORMAL, "UDOL data[%d]: %s", udol_data_tlv->len, sprint_hex(udol_data_tlv->value, udol_data_tlv->len));
+
+                PrintAndLogEx(NORMAL, "\n* Mastercard compute cryptographic checksum(UDOL)");
+
+                res = MSCComputeCryptoChecksum(channel, true, (uint8_t *)udol_data_tlv->value, udol_data_tlv->len, buf, sizeof(buf), &len, &sw, tlvRoot);
+                if (res) {
+                    PrintAndLogEx(WARNING, "Error Compute Crypto Checksum. APDU error %4x", sw);
+                    free(udol_data_tlv);
+                    dreturn(9);
+                }
+
+                // Mastercard compute cryptographic checksum result
+                TLVPrintFromBuffer(buf, len);
+                PrintAndLogEx(NORMAL, "");
+
+                free(udol_data_tlv);
+
+            }
+        } else {
+            PrintAndLogEx(WARNING, "Error MSD: Track2 data not found.");
+        }
+    }
+
+    // VSDC
+    if (GetCardPSVendor(AID, AIDlen) == CV_VISA && (TrType == TT_VSDC || TrType == TT_CDA)){
+        PrintAndLogEx(NORMAL, "\n--> VSDC transaction.");
+
+        PrintAndLogEx(NORMAL, "* * Calc CDOL1");
+        struct tlv *cdol1_data_tlv = dol_process(tlvdb_get(tlvRoot, 0x8c, NULL), tlvRoot, 0x01); // 0x01 - dummy tag
+        if (!cdol1_data_tlv) {
+            PrintAndLogEx(WARNING, "Error: can't create CDOL1 TLV.");
+            dreturn(6);
+        }
+
+        PrintAndLogEx(NORMAL, "CDOL1 data[%d]: %s", cdol1_data_tlv->len, sprint_hex(cdol1_data_tlv->value, cdol1_data_tlv->len));
+
+        PrintAndLogEx(NORMAL, "* * AC1");
+        // EMVAC_TC + EMVAC_CDAREQ --- to get SDAD
+        res = EMVAC(channel, true, (TrType == TT_CDA) ? EMVAC_TC + EMVAC_CDAREQ : EMVAC_TC, (uint8_t *)cdol1_data_tlv->value, cdol1_data_tlv->len, buf, sizeof(buf), &len, &sw, tlvRoot);
+
+        if (res) {
+            PrintAndLogEx(NORMAL, "AC1 error(%d): %4x. Exit...", res, sw);
+            free(cdol1_data_tlv);
+            dreturn(7);
+        }
+
+        // process Format1 (0x80) and print Format2 (0x77)
+        ProcessACResponseFormat1(tlvRoot, buf, len, decodeTLV);
+
+        uint8_t CID = 0;
+        tlvdb_get_uint8(tlvRoot, 0x9f27, &CID);
+
+        // AC1 print result
+        PrintAndLog("");
+        if ((CID & EMVAC_AC_MASK) == EMVAC_AAC)     PrintAndLogEx(INFO, "AC1 result: AAC (Transaction declined)");
+        if ((CID & EMVAC_AC_MASK) == EMVAC_TC)      PrintAndLogEx(INFO, "AC1 result: TC (Transaction approved)");
+        if ((CID & EMVAC_AC_MASK) == EMVAC_ARQC)    PrintAndLogEx(INFO, "AC1 result: ARQC (Online authorisation requested)");
+        if ((CID & EMVAC_AC_MASK) == EMVAC_AC_MASK) PrintAndLogEx(INFO, "AC1 result: RFU");
+
+        // decode Issuer Application Data (IAD)
+        uint8_t CryptoVersion = 0;
+        const struct tlv *IAD = tlvdb_get(tlvRoot, 0x9f10, NULL);
+        if (IAD && (IAD->len > 1)) {
+            PrintAndLogEx(NORMAL, "\n* * Issuer Application Data (IAD):");
+            uint8_t VDDlen = IAD->value[0]; // Visa discretionary data length
+            uint8_t IDDlen = 0;             // Issuer discretionary data length
+            PrintAndLogEx(NORMAL, "IAD length: %d", IAD->len);
+            PrintAndLogEx(NORMAL, "VDDlen: %d", VDDlen);
+            if (VDDlen < IAD->len - 1)
+                IDDlen = IAD->value[VDDlen + 1];
+            PrintAndLogEx(NORMAL, "IDDlen: %d", IDDlen);
+
+            uint8_t DerivKeyIndex = IAD->value[1];
+            CryptoVersion = IAD->value[2];
+
+            PrintAndLogEx(NORMAL, "CryptoVersion: %d", CryptoVersion);
+            PrintAndLogEx(NORMAL, "DerivKeyIndex: %d", DerivKeyIndex);
+
+            // Card Verification Results (CVR) decode
+            if ((VDDlen - 2) > 0) {
+                uint8_t CVRlen = IAD->value[3];
+                if (CVRlen == (VDDlen - 2 - 1)) {
+                    PrintAndLogEx(NORMAL, "CVR length: %d", CVRlen);
+                    PrintAndLogEx(NORMAL, "CVR: %s", sprint_hex(&IAD->value[4], CVRlen));
+                } else {
+                    PrintAndLogEx(NORMAL, "Wrong CVR length! CVR: %s", sprint_hex(&IAD->value[3], VDDlen - 2));
+                }
+            }
+            if (IDDlen)
+                PrintAndLogEx(NORMAL, "IDD: %s", sprint_hex(&IAD->value[VDDlen + 1], IDDlen));
+        } else {
+            PrintAndLogEx(NORMAL, "Issuer Application Data (IAD) not found.");
+        }
+
+        PrintAndLogEx(NORMAL, "\n* * Processing online request");
+
+        // authorization response code from acquirer
+        const char HostResponse[] = "00"; // 0x3030
+        size_t HostResponseLen = sizeof(HostResponse) - 1;
+        PrintAndLogEx(NORMAL, "Host Response: `%s`", HostResponse);
+        tlvdb_change_or_add_node(tlvRoot, 0x8a, HostResponseLen, (const unsigned char *)HostResponse);
+
+        if (CryptoVersion == 10) {
+            PrintAndLogEx(NORMAL, "\n* * Generate ARPC");
+
+            // Application Cryptogram (AC)
+            const struct tlv *AC = tlvdb_get(tlvRoot, 0x9f26, NULL);
+            if (AC && (AC->len > 0)) {
+                PrintAndLogEx(NORMAL, "AC: %s", sprint_hex(AC->value, AC->len));
+
+                size_t rawARPClen = AC->len;
+                uint8_t rawARPC[rawARPClen];
+                memcpy(rawARPC, AC->value, AC->len);
+                for (int i = 0; (i < HostResponseLen) && (i < rawARPClen); i++)
+                    rawARPC[i] ^= HostResponse[i];
+                PrintAndLogEx(NORMAL, "raw ARPC: %s", sprint_hex(rawARPC, rawARPClen));
+
+                // here must be calculation of ARPC, but we dont know a bank keys.
+                PrintAndLogEx(NORMAL, "ARPC: n/a");
+
+            } else {
+                PrintAndLogEx(NORMAL, "Application Cryptogram (AC) not found.");
+            }
+
+            // here must be external authenticate, but we dont know ARPC
+
+        }
+
+
+        // needs to send AC2 command (res == ARQC)
+        if ((CID & EMVAC_AC_MASK) == EMVAC_ARQC) {
+            PrintAndLogEx(NORMAL, "\n* * Calc CDOL2");
+            struct tlv *cdol2_data_tlv = dol_process(tlvdb_get(tlvRoot, 0x8d, NULL), tlvRoot, 0x01); // 0x01 - dummy tag
+            if (!cdol2_data_tlv) {
+                PrintAndLogEx(WARNING, "Error: can't create CDOL2 TLV.");
+                dreturn(6);
+            }
+
+            PrintAndLogEx(NORMAL, "CDOL2 data[%d]: %s", cdol2_data_tlv->len, sprint_hex(cdol2_data_tlv->value, cdol2_data_tlv->len));
+
+            //PrintAndLogEx(NORMAL, "* * AC2");
+
+
+            // here must be AC2, but we dont make external authenticate (
+
+/*          // AC2
+            PRINT_INDENT(level);
+            if ((CID & EMVAC_AC2_MASK) == EMVAC_AAC2)     fprintf(f, "\tAC2: AAC (Transaction declined)\n");
+            if ((CID & EMVAC_AC2_MASK) == EMVAC_TC2)      fprintf(f, "\tAC2: TC (Transaction approved)\n");
+            if ((CID & EMVAC_AC2_MASK) == EMVAC_ARQC2)    fprintf(f, "\tAC2: not requested (ARQC)\n");
+            if ((CID & EMVAC_AC2_MASK) == EMVAC_AC2_MASK) fprintf(f, "\tAC2: RFU\n");
 */
-		}
+        }
 
-	}
+    }
 
-	DropFieldEx( channel );
+    DropFieldEx( channel );
 
-	// Destroy TLV's
-	free(pdol_data_tlv);
-	tlvdb_free(tlvSelect);
-	tlvdb_free(tlvRoot);
+    // Destroy TLV's
+    free(pdol_data_tlv);
+    tlvdb_free(tlvSelect);
+    tlvdb_free(tlvRoot);
 
-	PrintAndLogEx(NORMAL, "\n* Transaction completed.");
-	return 0;
+    PrintAndLogEx(NORMAL, "\n* Transaction completed.");
+    return 0;
 }
 
 int CmdEMVScan(const char *cmd) {
-	uint8_t AID[APDU_AID_LEN] = {0};
-	size_t AIDlen = 0;
-	uint8_t buf[APDU_RES_LEN] = {0};
-	size_t len = 0;
-	uint16_t sw = 0;
-	int res;
-	json_t *root;
-	json_error_t error;
+    uint8_t AID[APDU_AID_LEN] = {0};
+    size_t AIDlen = 0;
+    uint8_t buf[APDU_RES_LEN] = {0};
+    size_t len = 0;
+    uint16_t sw = 0;
+    int res;
+    json_t *root;
+    json_error_t error;
 
-	CLIParserInit("emv scan",
-		"Scan EMV card and save it contents to a file.",
-		"It executes EMV contactless transaction and saves result to a file which can be used for emulation\n"
-			"Usage:\n\temv scan -at -> scan MSD transaction mode and show APDU and TLV\n"
-			"\temv scan -c -> scan CDA transaction mode\n");
+    CLIParserInit("emv scan",
+        "Scan EMV card and save it contents to a file.",
+        "It executes EMV contactless transaction and saves result to a file which can be used for emulation\n"
+            "Usage:\n\temv scan -at -> scan MSD transaction mode and show APDU and TLV\n"
+            "\temv scan -c -> scan CDA transaction mode\n");
 
-	void* argtable[] = {
-		arg_param_begin,
-		arg_lit0("aA",  "apdu",     "show APDU reqests and responses."),
-		arg_lit0("tT",  "tlv",      "TLV decode results."),
-		arg_lit0("eE",  "extract",  "Extract TLV elements and fill Application Data"),
-		arg_lit0("jJ",  "jload",    "Load transaction parameters from `emv/defparams.json` file."),
-		arg_rem("By default:",      "Transaction type - MSD"),
-		arg_lit0("vV",  "qvsdc",    "Transaction type - qVSDC or M/Chip."),
-		arg_lit0("cC",  "qvsdccda", "Transaction type - qVSDC or M/Chip plus CDA (SDAD generation)."),
-		arg_lit0("xX",  "vsdc",     "Transaction type - VSDC. For test only. Not a standart behavior."),
-		arg_lit0("gG",  "acgpo",    "VISA. generate AC from GPO."),
-		arg_lit0("mM",  "merge",    "Merge output file with card's data. (warning: the file may be corrupted!)"),
-		arg_lit0("wW",  "wired",   "Send data via contact (iso7816) interface. Contactless interface set by default."),
-		arg_str1(NULL,  NULL,		"output.json", "JSON output file name"),
-		arg_param_end
-	};
-	CLIExecWithReturn(cmd, argtable, true);
+    void* argtable[] = {
+        arg_param_begin,
+        arg_lit0("aA",  "apdu",     "show APDU reqests and responses."),
+        arg_lit0("tT",  "tlv",      "TLV decode results."),
+        arg_lit0("eE",  "extract",  "Extract TLV elements and fill Application Data"),
+        arg_lit0("jJ",  "jload",    "Load transaction parameters from `emv/defparams.json` file."),
+        arg_rem("By default:",      "Transaction type - MSD"),
+        arg_lit0("vV",  "qvsdc",    "Transaction type - qVSDC or M/Chip."),
+        arg_lit0("cC",  "qvsdccda", "Transaction type - qVSDC or M/Chip plus CDA (SDAD generation)."),
+        arg_lit0("xX",  "vsdc",     "Transaction type - VSDC. For test only. Not a standart behavior."),
+        arg_lit0("gG",  "acgpo",    "VISA. generate AC from GPO."),
+        arg_lit0("mM",  "merge",    "Merge output file with card's data. (warning: the file may be corrupted!)"),
+        arg_lit0("wW",  "wired",    "Send data via contact (iso7816) interface. Contactless interface set by default."),
+        arg_str1(NULL,  NULL,       "output.json", "JSON output file name"),
+        arg_param_end
+    };
+    CLIExecWithReturn(cmd, argtable, true);
 
-	bool showAPDU = arg_get_lit(1);
-	bool decodeTLV = arg_get_lit(2);
-	bool extractTLVElements = arg_get_lit(3);
-	bool paramLoadJSON = arg_get_lit(4);
+    bool showAPDU = arg_get_lit(1);
+    bool decodeTLV = arg_get_lit(2);
+    bool extractTLVElements = arg_get_lit(3);
+    bool paramLoadJSON = arg_get_lit(4);
 
-	enum TransactionType TrType = TT_MSD;
-	if (arg_get_lit(6))
-		TrType = TT_QVSDCMCHIP;
-	if (arg_get_lit(7))
-		TrType = TT_CDA;
-	if (arg_get_lit(8))
-		TrType = TT_VSDC;
+    enum TransactionType TrType = TT_MSD;
+    if (arg_get_lit(6))
+        TrType = TT_QVSDCMCHIP;
+    if (arg_get_lit(7))
+        TrType = TT_CDA;
+    if (arg_get_lit(8))
+        TrType = TT_VSDC;
 
-	bool GenACGPO = arg_get_lit(9);
-	bool MergeJSON = arg_get_lit(10);
-	EMVCommandChannel channel = ECC_CONTACTLESS;
-	if (arg_get_lit(11))
-		channel = ECC_CONTACT;
-	PrintChannel(channel);
-	uint8_t psenum = (channel == ECC_CONTACT) ? 1 : 2;
-	uint8_t relfname[250] ={0};
-	char *crelfname = (char *)relfname;
-	int relfnamelen = 0;
-	CLIGetStrWithReturn(12, relfname, &relfnamelen);
-	CLIParserFree();
+    bool GenACGPO = arg_get_lit(9);
+    bool MergeJSON = arg_get_lit(10);
+    EMVCommandChannel channel = ECC_CONTACTLESS;
+    if (arg_get_lit(11))
+        channel = ECC_CONTACT;
+    PrintChannel(channel);
+    uint8_t psenum = (channel == ECC_CONTACT) ? 1 : 2;
+    uint8_t relfname[250] ={0};
+    char *crelfname = (char *)relfname;
+    int relfnamelen = 0;
+    CLIGetStrWithReturn(12, relfname, &relfnamelen);
+    CLIParserFree();
 
 #ifndef WITH_SMARTCARD
-	// not compiled with smartcard functionality,  we need to exit
-	if ( channel == ECC_CONTACT ) {
-		PrintAndLogEx(WARNING, "PM3 Client is not compiled with support for SMARTCARD. Exiting.");
-		return 0;
-	}
+    // not compiled with smartcard functionality,  we need to exit
+    if ( channel == ECC_CONTACT ) {
+        PrintAndLogEx(WARNING, "PM3 Client is not compiled with support for SMARTCARD. Exiting.");
+        return 0;
+    }
 #endif
 
-	SetAPDULogging(showAPDU);
+    SetAPDULogging(showAPDU);
 
-	// current path + file name
-	if (!strstr(crelfname, ".json"))
-		strcat(crelfname, ".json");
-	char fname[strlen(get_my_executable_directory()) + strlen(crelfname) + 1];
-	strcpy(fname, get_my_executable_directory());
-	strcat(fname, crelfname);
+    // current path + file name
+    if (!strstr(crelfname, ".json"))
+        strcat(crelfname, ".json");
+    char fname[strlen(get_my_executable_directory()) + strlen(crelfname) + 1];
+    strcpy(fname, get_my_executable_directory());
+    strcat(fname, crelfname);
 
-	if (MergeJSON) {
-		root = json_load_file(fname, 0, &error);
-		if (!root) {
-			PrintAndLogEx(ERR, "Json error on line %d: %s", error.line, error.text);
-			return 1;
-		}
+    if (MergeJSON) {
+        root = json_load_file(fname, 0, &error);
+        if (!root) {
+            PrintAndLogEx(ERR, "Json error on line %d: %s", error.line, error.text);
+            return 1;
+        }
 
-		if (!json_is_object(root)) {
-			PrintAndLogEx(ERR, "Invalid json format. root must be an object.");
-			return 1;
-		}
-	} else {
-		root = json_object();
-	}
+        if (!json_is_object(root)) {
+            PrintAndLogEx(ERR, "Invalid json format. root must be an object.");
+            return 1;
+        }
+    } else {
+        root = json_object();
+    }
 
-	// drop field at start
-	DropFieldEx( channel );
+    // drop field at start
+    DropFieldEx( channel );
 
-	JsonSaveStr(root, "$.File.Created", "proxmark3 `emv scan`");
+    JsonSaveStr(root, "$.File.Created", "proxmark3 `emv scan`");
 
-	if (channel == ECC_CONTACTLESS) {
-		// iso 14443 select
-		PrintAndLogEx(NORMAL, "--> GET UID, ATS.");
+    if (channel == ECC_CONTACTLESS) {
+        // iso 14443 select
+        PrintAndLogEx(NORMAL, "--> GET UID, ATS.");
 
-		iso14a_card_select_t card;
-		if (Hf14443_4aGetCardData(&card)) {
-			return 2;
-		}
+        iso14a_card_select_t card;
+        if (Hf14443_4aGetCardData(&card)) {
+            return 2;
+        }
 
-		JsonSaveStr(root, "$.Card.Contactless.Communication", "iso14443-4a");
-		JsonSaveBufAsHex(root, "$.Card.Contactless.UID", (uint8_t *)&card.uid, card.uidlen);
-		JsonSaveHex(root, "$.Card.Contactless.ATQA", card.atqa[0] + (card.atqa[1] << 2), 2);
-		JsonSaveHex(root, "$.Card.Contactless.SAK", card.sak, 0);
-		JsonSaveBufAsHex(root, "$.Card.Contactless.ATS", (uint8_t *)card.ats, card.ats_len);
-	} else {
-		PrintAndLogEx(NORMAL, "--> GET ATR.");
+        JsonSaveStr(root, "$.Card.Contactless.Communication", "iso14443-4a");
+        JsonSaveBufAsHex(root, "$.Card.Contactless.UID", (uint8_t *)&card.uid, card.uidlen);
+        JsonSaveHex(root, "$.Card.Contactless.ATQA", card.atqa[0] + (card.atqa[1] << 2), 2);
+        JsonSaveHex(root, "$.Card.Contactless.SAK", card.sak, 0);
+        JsonSaveBufAsHex(root, "$.Card.Contactless.ATS", (uint8_t *)card.ats, card.ats_len);
+    } else {
+        PrintAndLogEx(NORMAL, "--> GET ATR.");
 
-		smart_card_atr_t card;
-		smart_select(true, &card);
-		if (!card.atr_len) {
-			PrintAndLogEx(ERR, "Can't get ATR from a smart card.");
-			return 1;
-		}
+        smart_card_atr_t card;
+        smart_select(true, &card);
+        if (!card.atr_len) {
+            PrintAndLogEx(ERR, "Can't get ATR from a smart card.");
+            return 1;
+        }
 
-		JsonSaveStr(root, "$.Card.Contact.Communication", "iso7816");
-		JsonSaveBufAsHex(root, "$.Card.Contact.ATR", (uint8_t *)card.atr, card.atr_len);
-	}
+        JsonSaveStr(root, "$.Card.Contact.Communication", "iso7816");
+        JsonSaveBufAsHex(root, "$.Card.Contact.ATR", (uint8_t *)card.atr, card.atr_len);
+    }
 
-	// init applets list tree
-	const char *al = "Applets list";
-	struct tlvdb *tlvSelect = tlvdb_fixed(1, strlen(al), (const unsigned char *)al);
+    // init applets list tree
+    const char *al = "Applets list";
+    struct tlvdb *tlvSelect = tlvdb_fixed(1, strlen(al), (const unsigned char *)al);
 
-	// EMV PPSE
-	PrintAndLogEx(NORMAL, "--> PPSE.");
-	res = EMVSelectPSE(channel, true, true, 2, buf, sizeof(buf), &len, &sw);
+    // EMV PPSE
+    PrintAndLogEx(NORMAL, "--> PPSE.");
+    res = EMVSelectPSE(channel, true, true, 2, buf, sizeof(buf), &len, &sw);
 
-	if (!res && sw == 0x9000){
-		if (decodeTLV)
-			TLVPrintFromBuffer(buf, len);
+    if (!res && sw == 0x9000){
+        if (decodeTLV)
+            TLVPrintFromBuffer(buf, len);
 
-		JsonSaveBufAsHex(root, "$.PPSE.AID", (uint8_t *)"2PAY.SYS.DDF01", 14);
+        JsonSaveBufAsHex(root, "$.PPSE.AID", (uint8_t *)"2PAY.SYS.DDF01", 14);
 
-		struct tlvdb *fci = tlvdb_parse_multi(buf, len);
-		if (extractTLVElements)
-			JsonSaveTLVTree(root, root, "$.PPSE.FCITemplate", fci);
-		else
-			JsonSaveTLVTreeElm(root, "$.PPSE.FCITemplate", fci, true, true, false);
-		JsonSaveTLVValue(root, "$.Application.KernelID", tlvdb_find_full(fci, 0x9f2a));
-		tlvdb_free(fci);
-	}
+        struct tlvdb *fci = tlvdb_parse_multi(buf, len);
+        if (extractTLVElements)
+            JsonSaveTLVTree(root, root, "$.PPSE.FCITemplate", fci);
+        else
+            JsonSaveTLVTreeElm(root, "$.PPSE.FCITemplate", fci, true, true, false);
+        JsonSaveTLVValue(root, "$.Application.KernelID", tlvdb_find_full(fci, 0x9f2a));
+        tlvdb_free(fci);
+    }
 
-	res = EMVSearchPSE(channel, false, true, psenum, decodeTLV, tlvSelect);
+    res = EMVSearchPSE(channel, false, true, psenum, decodeTLV, tlvSelect);
 
-	// check PPSE and select application id
-	if (!res) {
-		TLVPrintAIDlistFromSelectTLV(tlvSelect);
-	} else {
-		// EMV SEARCH with AID list
-		SetAPDULogging(false);
-		PrintAndLogEx(NORMAL, "--> AID search.");
-		if (EMVSearch(channel, false, true, decodeTLV, tlvSelect)) {
-			PrintAndLogEx(ERR, "Can't found any of EMV AID. Exit...");
-			tlvdb_free(tlvSelect);
-			DropFieldEx( channel );
-			return 3;
-		}
+    // check PPSE and select application id
+    if (!res) {
+        TLVPrintAIDlistFromSelectTLV(tlvSelect);
+    } else {
+        // EMV SEARCH with AID list
+        SetAPDULogging(false);
+        PrintAndLogEx(NORMAL, "--> AID search.");
+        if (EMVSearch(channel, false, true, decodeTLV, tlvSelect)) {
+            PrintAndLogEx(ERR, "Can't found any of EMV AID. Exit...");
+            tlvdb_free(tlvSelect);
+            DropFieldEx( channel );
+            return 3;
+        }
 
-		// check search and select application id
-		TLVPrintAIDlistFromSelectTLV(tlvSelect);
-	}
+        // check search and select application id
+        TLVPrintAIDlistFromSelectTLV(tlvSelect);
+    }
 
-	// EMV SELECT application
-	SetAPDULogging(showAPDU);
-	EMVSelectApplication(tlvSelect, AID, &AIDlen);
+    // EMV SELECT application
+    SetAPDULogging(showAPDU);
+    EMVSelectApplication(tlvSelect, AID, &AIDlen);
 
-	tlvdb_free(tlvSelect);
+    tlvdb_free(tlvSelect);
 
-	if (!AIDlen) {
-		PrintAndLogEx(INFO, "Can't select AID. EMV AID not found. Exit...");
-		DropFieldEx( channel );
-		return 4;
-	}
+    if (!AIDlen) {
+        PrintAndLogEx(INFO, "Can't select AID. EMV AID not found. Exit...");
+        DropFieldEx( channel );
+        return 4;
+    }
 
-	JsonSaveBufAsHex(root, "$.Application.AID", AID, AIDlen);
+    JsonSaveBufAsHex(root, "$.Application.AID", AID, AIDlen);
 
-	// Init TLV tree
-	const char *alr = "Root terminal TLV tree";
-	struct tlvdb *tlvRoot = tlvdb_fixed(1, strlen(alr), (const unsigned char *)alr);
+    // Init TLV tree
+    const char *alr = "Root terminal TLV tree";
+    struct tlvdb *tlvRoot = tlvdb_fixed(1, strlen(alr), (const unsigned char *)alr);
 
-	// EMV SELECT applet
+    // EMV SELECT applet
 
-	PrintAndLogEx(NORMAL, "\n-->Selecting AID:%s.", sprint_hex_inrow(AID, AIDlen));
-	SetAPDULogging(showAPDU);
-	res = EMVSelect(channel, false, true, AID, AIDlen, buf, sizeof(buf), &len, &sw, tlvRoot);
+    PrintAndLogEx(NORMAL, "\n-->Selecting AID:%s.", sprint_hex_inrow(AID, AIDlen));
+    SetAPDULogging(showAPDU);
+    res = EMVSelect(channel, false, true, AID, AIDlen, buf, sizeof(buf), &len, &sw, tlvRoot);
 
-	if (res) {
-		PrintAndLogEx(ERR, "Can't select AID (%d). Exit...", res);
-		tlvdb_free(tlvRoot);
-		DropFieldEx( channel );
-		return 5;
-	}
+    if (res) {
+        PrintAndLogEx(ERR, "Can't select AID (%d). Exit...", res);
+        tlvdb_free(tlvRoot);
+        DropFieldEx( channel );
+        return 5;
+    }
 
-	if (decodeTLV)
-		TLVPrintFromBuffer(buf, len);
+    if (decodeTLV)
+        TLVPrintFromBuffer(buf, len);
 
-	// save mode
-	if (tlvdb_get(tlvRoot, 0x9f38, NULL)) {
-		JsonSaveStr(root, "$.Application.Mode", TransactionTypeStr[TrType]);
-	}
+    // save mode
+    if (tlvdb_get(tlvRoot, 0x9f38, NULL)) {
+        JsonSaveStr(root, "$.Application.Mode", TransactionTypeStr[TrType]);
+    }
 
-	struct tlvdb *fci = tlvdb_parse_multi(buf, len);
-	if (extractTLVElements)
-		JsonSaveTLVTree(root, root, "$.Application.FCITemplate", fci);
-	else
-		JsonSaveTLVTreeElm(root, "$.Application.FCITemplate", fci, true, true, false);
-	tlvdb_free(fci);
+    struct tlvdb *fci = tlvdb_parse_multi(buf, len);
+    if (extractTLVElements)
+        JsonSaveTLVTree(root, root, "$.Application.FCITemplate", fci);
+    else
+        JsonSaveTLVTreeElm(root, "$.Application.FCITemplate", fci, true, true, false);
+    tlvdb_free(fci);
 
-	// create transaction parameters
-	PrintAndLogEx(NORMAL, "-->Init transaction parameters.");
-	InitTransactionParameters(tlvRoot, paramLoadJSON, TrType, GenACGPO);
+    // create transaction parameters
+    PrintAndLogEx(NORMAL, "-->Init transaction parameters.");
+    InitTransactionParameters(tlvRoot, paramLoadJSON, TrType, GenACGPO);
 
-	PrintAndLogEx(NORMAL, "-->Calc PDOL.");
-	struct tlv *pdol_data_tlv = dol_process(tlvdb_get(tlvRoot, 0x9f38, NULL), tlvRoot, 0x83);
-	if (!pdol_data_tlv){
-		PrintAndLogEx(ERR, "Can't create PDOL TLV.");
-		tlvdb_free(tlvRoot);
-		DropFieldEx( channel );
-		return 6;
-	}
+    PrintAndLogEx(NORMAL, "-->Calc PDOL.");
+    struct tlv *pdol_data_tlv = dol_process(tlvdb_get(tlvRoot, 0x9f38, NULL), tlvRoot, 0x83);
+    if (!pdol_data_tlv){
+        PrintAndLogEx(ERR, "Can't create PDOL TLV.");
+        tlvdb_free(tlvRoot);
+        DropFieldEx( channel );
+        return 6;
+    }
 
-	size_t pdol_data_tlv_data_len;
-	unsigned char *pdol_data_tlv_data = tlv_encode(pdol_data_tlv, &pdol_data_tlv_data_len);
-	if (!pdol_data_tlv_data) {
-		PrintAndLogEx(ERR, "Can't create PDOL data.");
-		tlvdb_free(tlvRoot);
-		DropFieldEx( channel );
-		return 6;
-	}
-	PrintAndLogEx(INFO, "PDOL data[%d]: %s", pdol_data_tlv_data_len, sprint_hex(pdol_data_tlv_data, pdol_data_tlv_data_len));
+    size_t pdol_data_tlv_data_len;
+    unsigned char *pdol_data_tlv_data = tlv_encode(pdol_data_tlv, &pdol_data_tlv_data_len);
+    if (!pdol_data_tlv_data) {
+        PrintAndLogEx(ERR, "Can't create PDOL data.");
+        tlvdb_free(tlvRoot);
+        DropFieldEx( channel );
+        return 6;
+    }
+    PrintAndLogEx(INFO, "PDOL data[%d]: %s", pdol_data_tlv_data_len, sprint_hex(pdol_data_tlv_data, pdol_data_tlv_data_len));
 
-	PrintAndLogEx(INFO, "-->GPO.");
-	res = EMVGPO(channel, true, pdol_data_tlv_data, pdol_data_tlv_data_len, buf, sizeof(buf), &len, &sw, tlvRoot);
+    PrintAndLogEx(INFO, "-->GPO.");
+    res = EMVGPO(channel, true, pdol_data_tlv_data, pdol_data_tlv_data_len, buf, sizeof(buf), &len, &sw, tlvRoot);
 
-	free(pdol_data_tlv_data);
-	free(pdol_data_tlv);
+    free(pdol_data_tlv_data);
+    free(pdol_data_tlv);
 
-	if (res) {
-		PrintAndLogEx(ERR, "GPO error(%d): %4x. Exit...", res, sw);
-		tlvdb_free(tlvRoot);
-		DropFieldEx( channel );
-		return 7;
-	}
-	ProcessGPOResponseFormat1(tlvRoot, buf, len, decodeTLV);
+    if (res) {
+        PrintAndLogEx(ERR, "GPO error(%d): %4x. Exit...", res, sw);
+        tlvdb_free(tlvRoot);
+        DropFieldEx( channel );
+        return 7;
+    }
+    ProcessGPOResponseFormat1(tlvRoot, buf, len, decodeTLV);
 
-	struct tlvdb *gpofci = tlvdb_parse_multi(buf, len);
-	if (extractTLVElements)
-		JsonSaveTLVTree(root, root, "$.Application.GPO", gpofci);
-	else
-		JsonSaveTLVTreeElm(root, "$.Application.GPO", gpofci, true, true, false);
+    struct tlvdb *gpofci = tlvdb_parse_multi(buf, len);
+    if (extractTLVElements)
+        JsonSaveTLVTree(root, root, "$.Application.GPO", gpofci);
+    else
+        JsonSaveTLVTreeElm(root, "$.Application.GPO", gpofci, true, true, false);
 
-	JsonSaveTLVValue(root, "$.ApplicationData.AIP", tlvdb_find_full(gpofci, 0x82));
-	JsonSaveTLVValue(root, "$.ApplicationData.AFL", tlvdb_find_full(gpofci, 0x94));
+    JsonSaveTLVValue(root, "$.ApplicationData.AIP", tlvdb_find_full(gpofci, 0x82));
+    JsonSaveTLVValue(root, "$.ApplicationData.AFL", tlvdb_find_full(gpofci, 0x94));
 
-	tlvdb_free(gpofci);
+    tlvdb_free(gpofci);
 
-	PrintAndLogEx(INFO, "-->Read records from AFL.");
-	const struct tlv *AFL = tlvdb_get(tlvRoot, 0x94, NULL);
+    PrintAndLogEx(INFO, "-->Read records from AFL.");
+    const struct tlv *AFL = tlvdb_get(tlvRoot, 0x94, NULL);
 
-	while(AFL && AFL->len) {
-		if (AFL->len % 4) {
-			PrintAndLogEx(ERR, "Wrong AFL length: %d", AFL->len);
-			break;
-		}
+    while(AFL && AFL->len) {
+        if (AFL->len % 4) {
+            PrintAndLogEx(ERR, "Wrong AFL length: %d", AFL->len);
+            break;
+        }
 
-		json_t *sfijson = json_path_get(root, "$.Application.Records");
-		if (!sfijson) {
-			json_t *app = json_path_get(root, "$.Application");
-			json_object_set_new(app, "Records", json_array());
+        json_t *sfijson = json_path_get(root, "$.Application.Records");
+        if (!sfijson) {
+            json_t *app = json_path_get(root, "$.Application");
+            json_object_set_new(app, "Records", json_array());
 
-			sfijson = json_path_get(root, "$.Application.Records");
-		}
-		if (!json_is_array(sfijson)) {
-			PrintAndLogEx(ERR, "Internal logic error. `$.Application.Records` is not an array.");
-			break;
-		}
-		for (int i = 0; i < AFL->len / 4; i++) {
-			uint8_t SFI = AFL->value[i * 4 + 0] >> 3;
-			uint8_t SFIstart = AFL->value[i * 4 + 1];
-			uint8_t SFIend = AFL->value[i * 4 + 2];
-			uint8_t SFIoffline = AFL->value[i * 4 + 3];
+            sfijson = json_path_get(root, "$.Application.Records");
+        }
+        if (!json_is_array(sfijson)) {
+            PrintAndLogEx(ERR, "Internal logic error. `$.Application.Records` is not an array.");
+            break;
+        }
+        for (int i = 0; i < AFL->len / 4; i++) {
+            uint8_t SFI = AFL->value[i * 4 + 0] >> 3;
+            uint8_t SFIstart = AFL->value[i * 4 + 1];
+            uint8_t SFIend = AFL->value[i * 4 + 2];
+            uint8_t SFIoffline = AFL->value[i * 4 + 3];
 
-			PrintAndLogEx(INFO, "--->SFI[%02x] start:%02x end:%02x offline:%02x", SFI, SFIstart, SFIend, SFIoffline);
-			if (SFI == 0 || SFI == 31 || SFIstart == 0 || SFIstart > SFIend) {
-				PrintAndLogEx(ERR, "SFI ERROR! Skipped...");
-				continue;
-			}
+            PrintAndLogEx(INFO, "--->SFI[%02x] start:%02x end:%02x offline:%02x", SFI, SFIstart, SFIend, SFIoffline);
+            if (SFI == 0 || SFI == 31 || SFIstart == 0 || SFIstart > SFIend) {
+                PrintAndLogEx(ERR, "SFI ERROR! Skipped...");
+                continue;
+            }
 
-			for(int n = SFIstart; n <= SFIend; n++) {
-				PrintAndLogEx(INFO, "---->SFI[%02x] %d", SFI, n);
+            for(int n = SFIstart; n <= SFIend; n++) {
+                PrintAndLogEx(INFO, "---->SFI[%02x] %d", SFI, n);
 
-				res = EMVReadRecord(channel, true, SFI, n, buf, sizeof(buf), &len, &sw, tlvRoot);
-				if (res) {
-					PrintAndLogEx(ERR, "SFI[%02x]. APDU error %4x", SFI, sw);
-					continue;
-				}
+                res = EMVReadRecord(channel, true, SFI, n, buf, sizeof(buf), &len, &sw, tlvRoot);
+                if (res) {
+                    PrintAndLogEx(ERR, "SFI[%02x]. APDU error %4x", SFI, sw);
+                    continue;
+                }
 
-				if (decodeTLV) {
-					TLVPrintFromBuffer(buf, len);
-					PrintAndLog("");
-				}
+                if (decodeTLV) {
+                    TLVPrintFromBuffer(buf, len);
+                    PrintAndLog("");
+                }
 
-				json_t *jsonelm = json_object();
-				json_array_append_new(sfijson, jsonelm);
+                json_t *jsonelm = json_object();
+                json_array_append_new(sfijson, jsonelm);
 
-				JsonSaveHex(jsonelm, "SFI", SFI, 1);
-				JsonSaveHex(jsonelm, "RecordNum", n, 1);
-				JsonSaveHex(jsonelm, "Offline", SFIoffline, 1);
+                JsonSaveHex(jsonelm, "SFI", SFI, 1);
+                JsonSaveHex(jsonelm, "RecordNum", n, 1);
+                JsonSaveHex(jsonelm, "Offline", SFIoffline, 1);
 
-				struct tlvdb *rsfi = tlvdb_parse_multi(buf, len);
-				if (extractTLVElements)
-					JsonSaveTLVTree(root, jsonelm, "$.Data", rsfi);
-				else
-					JsonSaveTLVTreeElm(jsonelm, "$.Data", rsfi, true, true, false);
-				tlvdb_free(rsfi);
-			}
-		}
+                struct tlvdb *rsfi = tlvdb_parse_multi(buf, len);
+                if (extractTLVElements)
+                    JsonSaveTLVTree(root, jsonelm, "$.Data", rsfi);
+                else
+                    JsonSaveTLVTreeElm(jsonelm, "$.Data", rsfi, true, true, false);
+                tlvdb_free(rsfi);
+            }
+        }
 
-		break;
-	}
+        break;
+    }
 
-	// getting certificates
-	if (tlvdb_get(tlvRoot, 0x90, NULL)) {
-		PrintAndLogEx(INFO, "-->Recovering certificates.");
-		PKISetStrictExecution(false);
-		RecoveryCertificates(tlvRoot, root);
-		PKISetStrictExecution(true);
-	}
+    // getting certificates
+    if (tlvdb_get(tlvRoot, 0x90, NULL)) {
+        PrintAndLogEx(INFO, "-->Recovering certificates.");
+        PKISetStrictExecution(false);
+        RecoveryCertificates(tlvRoot, root);
+        PKISetStrictExecution(true);
+    }
 
-	// free tlv object
-	tlvdb_free(tlvRoot);
+    // free tlv object
+    tlvdb_free(tlvRoot);
 
-	DropFieldEx( channel );
+    DropFieldEx( channel );
 
-	res = json_dump_file(root, fname, JSON_INDENT(2));
-	if (res) {
-		PrintAndLogEx(ERR, "Can't save the file: %s", fname);
-		return 200;
-	}
-	PrintAndLogEx(SUCCESS, "File `%s` saved.", fname);
+    res = json_dump_file(root, fname, JSON_INDENT(2));
+    if (res) {
+        PrintAndLogEx(ERR, "Can't save the file: %s", fname);
+        return 200;
+    }
+    PrintAndLogEx(SUCCESS, "File `%s` saved.", fname);
 
-	// free json object
-	json_decref(root);
+    // free json object
+    json_decref(root);
 
-	return 0;
+    return 0;
 }
 
 int CmdEMVList(const char *Cmd) {
-	return CmdTraceList("7816");
+    return CmdTraceList("7816");
 }
 
 int CmdEMVTest(const char *cmd) {
-	return ExecuteCryptoTests(true);
+    return ExecuteCryptoTests(true);
 }
 
 int CmdEMVRoca(const char *cmd) {
-	uint8_t AID[APDU_AID_LEN] = {0};
-	size_t AIDlen = 0;
-	uint8_t buf[APDU_RES_LEN] = {0};
-	size_t len = 0;
-	uint16_t sw = 0;
-	int res;
+    uint8_t AID[APDU_AID_LEN] = {0};
+    size_t AIDlen = 0;
+    uint8_t buf[APDU_RES_LEN] = {0};
+    size_t len = 0;
+    uint16_t sw = 0;
+    int res;
 
-	CLIParserInit("emv roca",
-		"Tries to extract public keys and run the ROCA test against them.\n",
-		"Usage:\n"
-			"\temv roca -w -> select --CONTACT-- card and run test\n"
-			"\temv roca -> select --CONTACTLESS-- card and run test\n"
-			);
+    CLIParserInit("emv roca",
+        "Tries to extract public keys and run the ROCA test against them.\n",
+        "Usage:\n"
+            "\temv roca -w -> select --CONTACT-- card and run test\n"
+            "\temv roca -> select --CONTACTLESS-- card and run test\n"
+            );
 
-	void* argtable[] = {
-		arg_param_begin,
-		arg_lit0("tT",  "selftest",   "self test"),
-		arg_lit0("wW",  "wired",   "Send data via contact (iso7816) interface. Contactless interface set by default."),
-		arg_param_end
-	};
-	CLIExecWithReturn(cmd, argtable, true);
+    void* argtable[] = {
+        arg_param_begin,
+        arg_lit0("tT",  "selftest",   "self test"),
+        arg_lit0("wW",  "wired",   "Send data via contact (iso7816) interface. Contactless interface set by default."),
+        arg_param_end
+    };
+    CLIExecWithReturn(cmd, argtable, true);
 
-	EMVCommandChannel channel = ECC_CONTACTLESS;
-	if (arg_get_lit(1))
-		return roca_self_test();
+    EMVCommandChannel channel = ECC_CONTACTLESS;
+    if (arg_get_lit(1))
+        return roca_self_test();
 
-	if (arg_get_lit(2))
-		channel = ECC_CONTACT;
-	PrintChannel(channel);
-	CLIParserFree();
+    if (arg_get_lit(2))
+        channel = ECC_CONTACT;
+    PrintChannel(channel);
+    CLIParserFree();
 
 #ifndef WITH_SMARTCARD
-	// not compiled with smartcard functionality,  we need to exit
-	if ( channel == ECC_CONTACT ) {
-		PrintAndLogEx(WARNING, "PM3 Client is not compiled with support for SMARTCARD. Exiting.");
-		return 0;
-	}
+    // not compiled with smartcard functionality,  we need to exit
+    if ( channel == ECC_CONTACT ) {
+        PrintAndLogEx(WARNING, "PM3 Client is not compiled with support for SMARTCARD. Exiting.");
+        return 0;
+    }
 #endif
 
-	// select card
-	uint8_t psenum = (channel == ECC_CONTACT) ? 1 : 2;
+    // select card
+    uint8_t psenum = (channel == ECC_CONTACT) ? 1 : 2;
 
-	SetAPDULogging(false);
+    SetAPDULogging(false);
 
-	// init applets list tree
-	const char *al = "Applets list";
-	struct tlvdb *tlvSelect = tlvdb_fixed(1, strlen(al), (const unsigned char *)al);
+    // init applets list tree
+    const char *al = "Applets list";
+    struct tlvdb *tlvSelect = tlvdb_fixed(1, strlen(al), (const unsigned char *)al);
 
-	// EMV PPSE
-	PrintAndLogEx(NORMAL, "--> PPSE.");
-	res = EMVSearchPSE(channel, false, true, psenum, false, tlvSelect);
+    // EMV PPSE
+    PrintAndLogEx(NORMAL, "--> PPSE.");
+    res = EMVSearchPSE(channel, false, true, psenum, false, tlvSelect);
 
-	// check PPSE and select application id
-	if (!res) {
-		TLVPrintAIDlistFromSelectTLV(tlvSelect);
-	} else {
-		// EMV SEARCH with AID list
-		PrintAndLogEx(NORMAL, "--> AID search.");
-		if (EMVSearch(channel, false, true, false, tlvSelect)) {
-			PrintAndLogEx(ERR, "Can't found any of EMV AID. Exit...");
-			tlvdb_free(tlvSelect);
-			DropFieldEx( channel );
-			return 3;
-		}
+    // check PPSE and select application id
+    if (!res) {
+        TLVPrintAIDlistFromSelectTLV(tlvSelect);
+    } else {
+        // EMV SEARCH with AID list
+        PrintAndLogEx(NORMAL, "--> AID search.");
+        if (EMVSearch(channel, false, true, false, tlvSelect)) {
+            PrintAndLogEx(ERR, "Can't found any of EMV AID. Exit...");
+            tlvdb_free(tlvSelect);
+            DropFieldEx( channel );
+            return 3;
+        }
 
-		// check search and select application id
-		TLVPrintAIDlistFromSelectTLV(tlvSelect);
-	}
+        // check search and select application id
+        TLVPrintAIDlistFromSelectTLV(tlvSelect);
+    }
 
-	// EMV SELECT application
-	SetAPDULogging(false);
-	EMVSelectApplication(tlvSelect, AID, &AIDlen);
+    // EMV SELECT application
+    SetAPDULogging(false);
+    EMVSelectApplication(tlvSelect, AID, &AIDlen);
 
-	tlvdb_free(tlvSelect);
+    tlvdb_free(tlvSelect);
 
-	if (!AIDlen) {
-		PrintAndLogEx(INFO, "Can't select AID. EMV AID not found. Exit...");
-		DropFieldEx( channel );
-		return 4;
-	}
+    if (!AIDlen) {
+        PrintAndLogEx(INFO, "Can't select AID. EMV AID not found. Exit...");
+        DropFieldEx( channel );
+        return 4;
+    }
 
-	// Init TLV tree
-	const char *alr = "Root terminal TLV tree";
-	struct tlvdb *tlvRoot = tlvdb_fixed(1, strlen(alr), (const unsigned char *)alr);
+    // Init TLV tree
+    const char *alr = "Root terminal TLV tree";
+    struct tlvdb *tlvRoot = tlvdb_fixed(1, strlen(alr), (const unsigned char *)alr);
 
-	// EMV SELECT applet
-	PrintAndLogEx(NORMAL, "\n-->Selecting AID:%s.", sprint_hex_inrow(AID, AIDlen));
-	res = EMVSelect(channel, false, true, AID, AIDlen, buf, sizeof(buf), &len, &sw, tlvRoot);
+    // EMV SELECT applet
+    PrintAndLogEx(NORMAL, "\n-->Selecting AID:%s.", sprint_hex_inrow(AID, AIDlen));
+    res = EMVSelect(channel, false, true, AID, AIDlen, buf, sizeof(buf), &len, &sw, tlvRoot);
 
-	if (res) {
-		PrintAndLogEx(ERR, "Can't select AID (%d). Exit...", res);
-		tlvdb_free(tlvRoot);
-		DropFieldEx( channel );
-		return 5;
-	}
+    if (res) {
+        PrintAndLogEx(ERR, "Can't select AID (%d). Exit...", res);
+        tlvdb_free(tlvRoot);
+        DropFieldEx( channel );
+        return 5;
+    }
 
-	PrintAndLog("\n* Init transaction parameters.");
-	InitTransactionParameters(tlvRoot, true, TT_QVSDCMCHIP, false);
+    PrintAndLog("\n* Init transaction parameters.");
+    InitTransactionParameters(tlvRoot, true, TT_QVSDCMCHIP, false);
 
-	PrintAndLogEx(NORMAL, "-->Calc PDOL.");
-	struct tlv *pdol_data_tlv = dol_process(tlvdb_get(tlvRoot, 0x9f38, NULL), tlvRoot, 0x83);
-	if (!pdol_data_tlv){
-		PrintAndLogEx(ERR, "Can't create PDOL TLV.");
-		tlvdb_free(tlvRoot);
-		DropFieldEx( channel );
-		return 6;
-	}
+    PrintAndLogEx(NORMAL, "-->Calc PDOL.");
+    struct tlv *pdol_data_tlv = dol_process(tlvdb_get(tlvRoot, 0x9f38, NULL), tlvRoot, 0x83);
+    if (!pdol_data_tlv){
+        PrintAndLogEx(ERR, "Can't create PDOL TLV.");
+        tlvdb_free(tlvRoot);
+        DropFieldEx( channel );
+        return 6;
+    }
 
-	size_t pdol_data_tlv_data_len;
-	unsigned char *pdol_data_tlv_data = tlv_encode(pdol_data_tlv, &pdol_data_tlv_data_len);
-	if (!pdol_data_tlv_data) {
-		PrintAndLogEx(ERR, "Can't create PDOL data.");
-		tlvdb_free(tlvRoot);
-		DropFieldEx( channel );
-		free(pdol_data_tlv);
-		return 6;
-	}
-	PrintAndLogEx(INFO, "PDOL data[%d]: %s", pdol_data_tlv_data_len, sprint_hex(pdol_data_tlv_data, pdol_data_tlv_data_len));
+    size_t pdol_data_tlv_data_len;
+    unsigned char *pdol_data_tlv_data = tlv_encode(pdol_data_tlv, &pdol_data_tlv_data_len);
+    if (!pdol_data_tlv_data) {
+        PrintAndLogEx(ERR, "Can't create PDOL data.");
+        tlvdb_free(tlvRoot);
+        DropFieldEx( channel );
+        free(pdol_data_tlv);
+        return 6;
+    }
+    PrintAndLogEx(INFO, "PDOL data[%d]: %s", pdol_data_tlv_data_len, sprint_hex(pdol_data_tlv_data, pdol_data_tlv_data_len));
 
-	PrintAndLogEx(INFO, "-->GPO.");
-	res = EMVGPO(channel, true, pdol_data_tlv_data, pdol_data_tlv_data_len, buf, sizeof(buf), &len, &sw, tlvRoot);
+    PrintAndLogEx(INFO, "-->GPO.");
+    res = EMVGPO(channel, true, pdol_data_tlv_data, pdol_data_tlv_data_len, buf, sizeof(buf), &len, &sw, tlvRoot);
 
-	free(pdol_data_tlv_data);
-	free(pdol_data_tlv);
+    free(pdol_data_tlv_data);
+    free(pdol_data_tlv);
 
-	if (res) {
-		PrintAndLogEx(ERR, "GPO error(%d): %4x. Exit...", res, sw);
-		tlvdb_free(tlvRoot);
-		DropFieldEx( channel );
-		return 7;
-	}
-	ProcessGPOResponseFormat1(tlvRoot, buf, len, false);
+    if (res) {
+        PrintAndLogEx(ERR, "GPO error(%d): %4x. Exit...", res, sw);
+        tlvdb_free(tlvRoot);
+        DropFieldEx( channel );
+        return 7;
+    }
+    ProcessGPOResponseFormat1(tlvRoot, buf, len, false);
 
-	PrintAndLogEx(INFO, "-->Read records from AFL.");
-	const struct tlv *AFL = tlvdb_get(tlvRoot, 0x94, NULL);
+    PrintAndLogEx(INFO, "-->Read records from AFL.");
+    const struct tlv *AFL = tlvdb_get(tlvRoot, 0x94, NULL);
 
-	while(AFL && AFL->len) {
-		if (AFL->len % 4) {
-			PrintAndLogEx(ERR, "Wrong AFL length: %d", AFL->len);
-			break;
-		}
+    while(AFL && AFL->len) {
+        if (AFL->len % 4) {
+            PrintAndLogEx(ERR, "Wrong AFL length: %d", AFL->len);
+            break;
+        }
 
-		for (int i = 0; i < AFL->len / 4; i++) {
-			uint8_t SFI = AFL->value[i * 4 + 0] >> 3;
-			uint8_t SFIstart = AFL->value[i * 4 + 1];
-			uint8_t SFIend = AFL->value[i * 4 + 2];
-			uint8_t SFIoffline = AFL->value[i * 4 + 3];
+        for (int i = 0; i < AFL->len / 4; i++) {
+            uint8_t SFI = AFL->value[i * 4 + 0] >> 3;
+            uint8_t SFIstart = AFL->value[i * 4 + 1];
+            uint8_t SFIend = AFL->value[i * 4 + 2];
+            uint8_t SFIoffline = AFL->value[i * 4 + 3];
 
-			PrintAndLogEx(INFO, "--->SFI[%02x] start:%02x end:%02x offline:%02x", SFI, SFIstart, SFIend, SFIoffline);
-			if (SFI == 0 || SFI == 31 || SFIstart == 0 || SFIstart > SFIend) {
-				PrintAndLogEx(ERR, "SFI ERROR! Skipped...");
-				continue;
-			}
+            PrintAndLogEx(INFO, "--->SFI[%02x] start:%02x end:%02x offline:%02x", SFI, SFIstart, SFIend, SFIoffline);
+            if (SFI == 0 || SFI == 31 || SFIstart == 0 || SFIstart > SFIend) {
+                PrintAndLogEx(ERR, "SFI ERROR! Skipped...");
+                continue;
+            }
 
-			for(int n = SFIstart; n <= SFIend; n++) {
-				PrintAndLogEx(INFO, "---->SFI[%02x] %d", SFI, n);
+            for(int n = SFIstart; n <= SFIend; n++) {
+                PrintAndLogEx(INFO, "---->SFI[%02x] %d", SFI, n);
 
-				res = EMVReadRecord(channel, true, SFI, n, buf, sizeof(buf), &len, &sw, tlvRoot);
-				if (res) {
-					PrintAndLogEx(ERR, "SFI[%02x]. APDU error %4x", SFI, sw);
-					continue;
-				}
-			}
-		}
+                res = EMVReadRecord(channel, true, SFI, n, buf, sizeof(buf), &len, &sw, tlvRoot);
+                if (res) {
+                    PrintAndLogEx(ERR, "SFI[%02x]. APDU error %4x", SFI, sw);
+                    continue;
+                }
+            }
+        }
 
-		break;
-	}
+        break;
+    }
 
-	// getting certificates
- 	if (tlvdb_get(tlvRoot, 0x90, NULL)) {
-		PrintAndLogEx(INFO, "-->Recovering certificates.");
-		PKISetStrictExecution(false);
+    // getting certificates
+    if (tlvdb_get(tlvRoot, 0x90, NULL)) {
+        PrintAndLogEx(INFO, "-->Recovering certificates.");
+        PKISetStrictExecution(false);
 
-		struct emv_pk *pk = get_ca_pk(tlvRoot);
-		if (!pk) {
-			PrintAndLogEx(ERR, "ERROR: Key not found. Exit.");
-			goto out;
-		}
+        struct emv_pk *pk = get_ca_pk(tlvRoot);
+        if (!pk) {
+            PrintAndLogEx(ERR, "ERROR: Key not found. Exit.");
+            goto out;
+        }
 
-		struct emv_pk *issuer_pk = emv_pki_recover_issuer_cert(pk, tlvRoot);
-		if (!issuer_pk) {
-			emv_pk_free(pk);
-			PrintAndLogEx(WARNING, "WARNING: Issuer certificate not found. Exit.");
-			goto out;
-		}
+        struct emv_pk *issuer_pk = emv_pki_recover_issuer_cert(pk, tlvRoot);
+        if (!issuer_pk) {
+            emv_pk_free(pk);
+            PrintAndLogEx(WARNING, "WARNING: Issuer certificate not found. Exit.");
+            goto out;
+        }
 
-		PrintAndLogEx(SUCCESS, "Issuer PK recovered. RID %s IDX %02hhx CSN %s",
-				sprint_hex(issuer_pk->rid, 5),
-				issuer_pk->index,
-				sprint_hex(issuer_pk->serial, 3)
-				);
+        PrintAndLogEx(SUCCESS, "Issuer PK recovered. RID %s IDX %02hhx CSN %s",
+                sprint_hex(issuer_pk->rid, 5),
+                issuer_pk->index,
+                sprint_hex(issuer_pk->serial, 3)
+                );
 
 
-		struct emv_pk *icc_pk = emv_pki_recover_icc_cert(issuer_pk, tlvRoot, NULL);
-		if (!icc_pk) {
-			emv_pk_free(pk);
-			emv_pk_free(issuer_pk);
-			PrintAndLogEx(WARNING, "WARNING: ICC certificate not found. Exit.");
-			goto out;
-		}
-		PrintAndLogEx(SUCCESS, "ICC PK recovered. RID %s IDX %02hhx CSN %s\n",
-				sprint_hex(icc_pk->rid, 5),
-				icc_pk->index,
-				sprint_hex(icc_pk->serial, 3)
-				);
+        struct emv_pk *icc_pk = emv_pki_recover_icc_cert(issuer_pk, tlvRoot, NULL);
+        if (!icc_pk) {
+            emv_pk_free(pk);
+            emv_pk_free(issuer_pk);
+            PrintAndLogEx(WARNING, "WARNING: ICC certificate not found. Exit.");
+            goto out;
+        }
+        PrintAndLogEx(SUCCESS, "ICC PK recovered. RID %s IDX %02hhx CSN %s\n",
+                sprint_hex(icc_pk->rid, 5),
+                icc_pk->index,
+                sprint_hex(icc_pk->serial, 3)
+                );
 
-		PrintAndLogEx(INFO, "ICC pk modulus: %s", sprint_hex_inrow(icc_pk->modulus, icc_pk->mlen));
+        PrintAndLogEx(INFO, "ICC pk modulus: %s", sprint_hex_inrow(icc_pk->modulus, icc_pk->mlen));
 
-		//	icc_pk->exp, icc_pk->elen
-		//	icc_pk->modulus, icc_pk->mlen
-		if (icc_pk->elen > 0 && icc_pk->mlen > 0) {
-			if (emv_rocacheck(icc_pk->modulus, icc_pk->mlen, true)) {
-				PrintAndLogEx(INFO, "ICC pk is a subject to ROCA vulnerability, insecure..");
-			} else {
-				PrintAndLogEx(INFO, "ICC pk is OK(");
-			}
-		}
+        // icc_pk->exp, icc_pk->elen
+        // icc_pk->modulus, icc_pk->mlen
+        if (icc_pk->elen > 0 && icc_pk->mlen > 0) {
+            if (emv_rocacheck(icc_pk->modulus, icc_pk->mlen, true)) {
+                PrintAndLogEx(INFO, "ICC pk is a subject to ROCA vulnerability, insecure..");
+            } else {
+                PrintAndLogEx(INFO, "ICC pk is OK(");
+            }
+        }
 
-		PKISetStrictExecution(true);
-	}
+        PKISetStrictExecution(true);
+    }
 
 out:
 
-	// free tlv object
-	tlvdb_free(tlvRoot);
+    // free tlv object
+    tlvdb_free(tlvRoot);
 
-	DropFieldEx( channel );
-	return 0;
+    DropFieldEx( channel );
+    return 0;
 }
 
 static command_t CommandTable[] =  {
-	{"help",		CmdHelp,						1,	"This help"},
-	{"exec",		CmdEMVExec,						0,	"Executes EMV contactless transaction."},
-	{"pse",			CmdEMVPPSE,						0,	"Execute PPSE. It selects 2PAY.SYS.DDF01 or 1PAY.SYS.DDF01 directory."},
-	{"search",		CmdEMVSearch,					0,	"Try to select all applets from applets list and print installed applets."},
-	{"select",		CmdEMVSelect,					0,	"Select applet."},
-	{"gpo",			CmdEMVGPO,						0,	"Execute GetProcessingOptions."},
-	{"readrec",		CmdEMVReadRecord,				0,	"Read files from card."},
-	{"genac",		CmdEMVAC,						0,	"Generate ApplicationCryptogram."},
-	{"challenge",	CmdEMVGenerateChallenge,		0,	"Generate challenge."},
-	{"intauth",		CmdEMVInternalAuthenticate,		0,	"Internal authentication."},
-	{"scan",		CmdEMVScan,						0,	"Scan EMV card and save it contents to json file for emulator."},
-	{"test",		CmdEMVTest,						0,	"Crypto logic test."},
-	/*
-	{"getrng",		CmdEMVGetrng,	  				0, "get random number from terminal"},
-	{"eload",		CmdEmvELoad, 	  				0, "load EMV tag into device"},
-	{"dump",		CmdEmvDump,	  					0, "dump EMV tag values"},
-	{"sim",			CmdEmvSim,	  					0, "simulate EMV tag"},
-	{"clone",		CmdEmvClone,	  				0, "clone an EMV tag"},
-	*/
-	{"list",		CmdEMVList,	  					0, "[Deprecated] List ISO7816 history"},
-	{"roca",		CmdEMVRoca,	  					0, "Extract public keys and run ROCA test"},
-	{NULL, NULL, 0, NULL}
+    {"help",        CmdHelp,                        1, "This help"},
+    {"exec",        CmdEMVExec,                     0, "Executes EMV contactless transaction."},
+    {"pse",         CmdEMVPPSE,                     0, "Execute PPSE. It selects 2PAY.SYS.DDF01 or 1PAY.SYS.DDF01 directory."},
+    {"search",      CmdEMVSearch,                   0, "Try to select all applets from applets list and print installed applets."},
+    {"select",      CmdEMVSelect,                   0, "Select applet."},
+    {"gpo",         CmdEMVGPO,                      0, "Execute GetProcessingOptions."},
+    {"readrec",     CmdEMVReadRecord,               0, "Read files from card."},
+    {"genac",       CmdEMVAC,                       0, "Generate ApplicationCryptogram."},
+    {"challenge",   CmdEMVGenerateChallenge,        0, "Generate challenge."},
+    {"intauth",     CmdEMVInternalAuthenticate,     0, "Internal authentication."},
+    {"scan",        CmdEMVScan,                     0, "Scan EMV card and save it contents to json file for emulator."},
+    {"test",        CmdEMVTest,                     0, "Crypto logic test."},
+    /*
+    {"getrng",      CmdEMVGetrng,                   0, "get random number from terminal"},
+    {"eload",       CmdEmvELoad,                    0, "load EMV tag into device"},
+    {"dump",        CmdEmvDump,                     0, "dump EMV tag values"},
+    {"sim",         CmdEmvSim,                      0, "simulate EMV tag"},
+    {"clone",       CmdEmvClone,                    0, "clone an EMV tag"},
+    */
+    {"list",        CmdEMVList,                     0, "[Deprecated] List ISO7816 history"},
+    {"roca",        CmdEMVRoca,                     0, "Extract public keys and run ROCA test"},
+    {NULL, NULL, 0, NULL}
 };
 
 int CmdEMV(const char *Cmd) {
-	clearCommandBuffer();
-	CmdsParse(CommandTable, Cmd);
-	return 0;
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
+    return 0;
 }
 
 int CmdHelp(const char *Cmd) {
-	CmdsHelp(CommandTable);
-	return 0;
+    CmdsHelp(CommandTable);
+    return 0;
 }
diff --git a/client/emv/crypto.c b/client/emv/crypto.c
index d8ec5fc08..45d3891e8 100644
--- a/client/emv/crypto.c
+++ b/client/emv/crypto.c
@@ -26,154 +26,154 @@ static struct crypto_backend *crypto_backend;
 
 static bool crypto_init(void)
 {
-	if (crypto_backend)
-		return true;
+    if (crypto_backend)
+        return true;
 
-	crypto_backend = crypto_polarssl_init();
+    crypto_backend = crypto_polarssl_init();
 
-	if (!crypto_backend)
-		return false;
+    if (!crypto_backend)
+        return false;
 
-	return true;
+    return true;
 }
 
 struct crypto_hash *crypto_hash_open(enum crypto_algo_hash hash)
 {
-	struct crypto_hash *ch;
+    struct crypto_hash *ch;
 
-	if (!crypto_init())
-		return NULL;
+    if (!crypto_init())
+        return NULL;
 
-	ch = crypto_backend->hash_open(hash);
-	if (ch)
-		ch->algo = hash;
+    ch = crypto_backend->hash_open(hash);
+    if (ch)
+        ch->algo = hash;
 
-	return ch;
+    return ch;
 }
 
 void crypto_hash_close(struct crypto_hash *ch)
 {
-	ch->close(ch);
+    ch->close(ch);
 }
 
 void crypto_hash_write(struct crypto_hash *ch, const unsigned char *buf, size_t len)
 {
-	ch->write(ch, buf, len);
+    ch->write(ch, buf, len);
 }
 
 unsigned char *crypto_hash_read(struct crypto_hash *ch)
 {
-	return ch->read(ch);
+    return ch->read(ch);
 }
 
 size_t crypto_hash_get_size(const struct crypto_hash *ch)
 {
-	return ch->get_size(ch);
+    return ch->get_size(ch);
 }
 
 struct crypto_pk *crypto_pk_open(enum crypto_algo_pk pk, ...)
 {
-	struct crypto_pk *cp;
-	va_list vl;
+    struct crypto_pk *cp;
+    va_list vl;
 
-	if (!crypto_init())
-		return NULL;
+    if (!crypto_init())
+        return NULL;
 
-	va_start(vl, pk);
-	cp = crypto_backend->pk_open(pk, vl);
-	va_end(vl);
+    va_start(vl, pk);
+    cp = crypto_backend->pk_open(pk, vl);
+    va_end(vl);
 
-	if (cp)
-		cp->algo = pk;
+    if (cp)
+        cp->algo = pk;
 
-	return cp;
+    return cp;
 }
 
 struct crypto_pk *crypto_pk_open_priv(enum crypto_algo_pk pk, ...)
 {
-	struct crypto_pk *cp;
-	va_list vl;
+    struct crypto_pk *cp;
+    va_list vl;
 
-	if (!crypto_init())
-		return NULL;
+    if (!crypto_init())
+        return NULL;
 
-	if (!crypto_backend->pk_open_priv)
-		return NULL;
+    if (!crypto_backend->pk_open_priv)
+        return NULL;
 
-	va_start(vl, pk);
-	cp = crypto_backend->pk_open_priv(pk, vl);
-	va_end(vl);
+    va_start(vl, pk);
+    cp = crypto_backend->pk_open_priv(pk, vl);
+    va_end(vl);
 
-	if (cp)
-		cp->algo = pk;
+    if (cp)
+        cp->algo = pk;
 
-	return cp;
+    return cp;
 }
 
 struct crypto_pk *crypto_pk_genkey(enum crypto_algo_pk pk, ...)
 {
-	struct crypto_pk *cp;
-	va_list vl;
+    struct crypto_pk *cp;
+    va_list vl;
 
-	if (!crypto_init())
-		return NULL;
+    if (!crypto_init())
+        return NULL;
 
-	if (!crypto_backend->pk_genkey)
-		return NULL;
+    if (!crypto_backend->pk_genkey)
+        return NULL;
 
-	va_start(vl, pk);
-	cp = crypto_backend->pk_genkey(pk, vl);
-	va_end(vl);
+    va_start(vl, pk);
+    cp = crypto_backend->pk_genkey(pk, vl);
+    va_end(vl);
 
-	if (cp)
-		cp->algo = pk;
+    if (cp)
+        cp->algo = pk;
 
-	return cp;
+    return cp;
 }
 
 void crypto_pk_close(struct crypto_pk *cp)
 {
-	cp->close(cp);
+    cp->close(cp);
 }
 
 unsigned char *crypto_pk_encrypt(const struct crypto_pk *cp, const unsigned char *buf, size_t len, size_t *clen)
 {
-	return cp->encrypt(cp, buf, len, clen);
+    return cp->encrypt(cp, buf, len, clen);
 }
 
 unsigned char *crypto_pk_decrypt(const struct crypto_pk *cp, const unsigned char *buf, size_t len, size_t *clen)
 {
-	if (!cp->decrypt) {
-		*clen = 0;
+    if (!cp->decrypt) {
+        *clen = 0;
 
-		return NULL;
-	}
+        return NULL;
+    }
 
-	return cp->decrypt(cp, buf, len, clen);
+    return cp->decrypt(cp, buf, len, clen);
 }
 
 enum crypto_algo_pk crypto_pk_get_algo(const struct crypto_pk *cp)
 {
-	if (!cp)
-		return PK_INVALID;
+    if (!cp)
+        return PK_INVALID;
 
-	return cp->algo;
+    return cp->algo;
 }
 
 size_t crypto_pk_get_nbits(const struct crypto_pk *cp)
 {
-	if (!cp->get_nbits)
-		return 0;
+    if (!cp->get_nbits)
+        return 0;
 
-	return cp->get_nbits(cp);
+    return cp->get_nbits(cp);
 }
 
 unsigned char *crypto_pk_get_parameter(const struct crypto_pk *cp, unsigned param, size_t *plen)
 {
-	*plen = 0;
+    *plen = 0;
 
-	if (!cp->get_parameter)
-		return NULL;
+    if (!cp->get_parameter)
+        return NULL;
 
-	return cp->get_parameter(cp, param, plen);
+    return cp->get_parameter(cp, param, plen);
 }
diff --git a/client/emv/crypto.h b/client/emv/crypto.h
index 940e8b2be..4eacca0b8 100644
--- a/client/emv/crypto.h
+++ b/client/emv/crypto.h
@@ -20,8 +20,8 @@
 #include <stddef.h>
 
 enum crypto_algo_hash {
-	HASH_INVALID,
-	HASH_SHA_1,
+    HASH_INVALID,
+    HASH_SHA_1,
 };
 
 struct crypto_hash *crypto_hash_open(enum crypto_algo_hash hash);
@@ -31,8 +31,8 @@ unsigned char *crypto_hash_read(struct crypto_hash *ch);
 size_t crypto_hash_get_size(const struct crypto_hash *ch);
 
 enum crypto_algo_pk {
-	PK_INVALID,
-	PK_RSA,
+    PK_INVALID,
+    PK_RSA,
 };
 
 struct crypto_pk *crypto_pk_open(enum crypto_algo_pk pk, ...);
diff --git a/client/emv/crypto_backend.h b/client/emv/crypto_backend.h
index a815ae116..1113cf341 100644
--- a/client/emv/crypto_backend.h
+++ b/client/emv/crypto_backend.h
@@ -22,27 +22,27 @@
 #include <stdarg.h>
 
 struct crypto_hash {
-	enum crypto_algo_hash algo;
-	void (*write)(struct crypto_hash *ch, const unsigned char *buf, size_t len);
-	unsigned char *(*read)(struct crypto_hash *ch);
-	void (*close)(struct crypto_hash *ch);
-	size_t (*get_size)(const struct crypto_hash *ch);
+    enum crypto_algo_hash algo;
+    void (*write)(struct crypto_hash *ch, const unsigned char *buf, size_t len);
+    unsigned char *(*read)(struct crypto_hash *ch);
+    void (*close)(struct crypto_hash *ch);
+    size_t (*get_size)(const struct crypto_hash *ch);
 };
 
 struct crypto_pk {
-	enum crypto_algo_pk algo;
-	unsigned char *(*encrypt)(const struct crypto_pk *cp, const unsigned char *buf, size_t len, size_t *clen);
-	unsigned char *(*decrypt)(const struct crypto_pk *cp, const unsigned char *buf, size_t len, size_t *clen);
-	unsigned char *(*get_parameter)(const struct crypto_pk *cp, unsigned param, size_t *plen);
-	size_t (*get_nbits)(const struct crypto_pk *cp);
-	void (*close)(struct crypto_pk *cp);
+    enum crypto_algo_pk algo;
+    unsigned char *(*encrypt)(const struct crypto_pk *cp, const unsigned char *buf, size_t len, size_t *clen);
+    unsigned char *(*decrypt)(const struct crypto_pk *cp, const unsigned char *buf, size_t len, size_t *clen);
+    unsigned char *(*get_parameter)(const struct crypto_pk *cp, unsigned param, size_t *plen);
+    size_t (*get_nbits)(const struct crypto_pk *cp);
+    void (*close)(struct crypto_pk *cp);
 };
 
 struct crypto_backend {
-	struct crypto_hash *(*hash_open)(enum crypto_algo_hash hash);
-	struct crypto_pk *(*pk_open)(enum crypto_algo_pk pk, va_list vl);
-	struct crypto_pk *(*pk_open_priv)(enum crypto_algo_pk pk, va_list vl);
-	struct crypto_pk *(*pk_genkey)(enum crypto_algo_pk pk, va_list vl);
+    struct crypto_hash *(*hash_open)(enum crypto_algo_hash hash);
+    struct crypto_pk *(*pk_open)(enum crypto_algo_pk pk, va_list vl);
+    struct crypto_pk *(*pk_open_priv)(enum crypto_algo_pk pk, va_list vl);
+    struct crypto_pk *(*pk_genkey)(enum crypto_algo_pk pk, va_list vl);
 };
 
 struct crypto_backend *crypto_polarssl_init(void);
diff --git a/client/emv/crypto_polarssl.c b/client/emv/crypto_polarssl.c
index f04b6c9e5..cac8734fa 100644
--- a/client/emv/crypto_polarssl.c
+++ b/client/emv/crypto_polarssl.c
@@ -10,7 +10,7 @@
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  * Lesser General Public License for more details.
  */
 
@@ -30,132 +30,132 @@
 #include "mbedtls/sha1.h"
 
 struct crypto_hash_polarssl {
-	struct crypto_hash ch;
-	mbedtls_sha1_context ctx;
+    struct crypto_hash ch;
+    mbedtls_sha1_context ctx;
 };
 
 static void crypto_hash_polarssl_close(struct crypto_hash *_ch)
 {
-	struct crypto_hash_polarssl *ch = (struct crypto_hash_polarssl *)_ch;
+    struct crypto_hash_polarssl *ch = (struct crypto_hash_polarssl *)_ch;
 
-	free(ch);
+    free(ch);
 }
 
 static void crypto_hash_polarssl_write(struct crypto_hash *_ch, const unsigned char *buf, size_t len)
 {
-	struct crypto_hash_polarssl *ch = (struct crypto_hash_polarssl *)_ch;
+    struct crypto_hash_polarssl *ch = (struct crypto_hash_polarssl *)_ch;
 
-	mbedtls_sha1_update(&(ch->ctx), buf, len);
+    mbedtls_sha1_update(&(ch->ctx), buf, len);
 }
 
 static unsigned char *crypto_hash_polarssl_read(struct crypto_hash *_ch)
 {
-	struct crypto_hash_polarssl *ch = (struct crypto_hash_polarssl *)_ch;
+    struct crypto_hash_polarssl *ch = (struct crypto_hash_polarssl *)_ch;
 
-	static unsigned char sha1sum[20];
-	mbedtls_sha1_finish(&(ch->ctx), sha1sum);
-	return sha1sum;
+    static unsigned char sha1sum[20];
+    mbedtls_sha1_finish(&(ch->ctx), sha1sum);
+    return sha1sum;
 }
 
 static size_t crypto_hash_polarssl_get_size(const struct crypto_hash *ch)
 {
-	if (ch->algo == HASH_SHA_1)
-		return 20;
-	else
-		return 0;
+    if (ch->algo == HASH_SHA_1)
+        return 20;
+    else
+        return 0;
 }
 
 static struct crypto_hash *crypto_hash_polarssl_open(enum crypto_algo_hash hash)
 {
-	if (hash != HASH_SHA_1)
-		return NULL;
+    if (hash != HASH_SHA_1)
+        return NULL;
 
-	struct crypto_hash_polarssl *ch = malloc(sizeof(*ch));
+    struct crypto_hash_polarssl *ch = malloc(sizeof(*ch));
 
-	mbedtls_sha1_starts(&(ch->ctx));
+    mbedtls_sha1_starts(&(ch->ctx));
 
-	ch->ch.write = crypto_hash_polarssl_write;
-	ch->ch.read = crypto_hash_polarssl_read;
-	ch->ch.close = crypto_hash_polarssl_close;
-	ch->ch.get_size = crypto_hash_polarssl_get_size;
+    ch->ch.write = crypto_hash_polarssl_write;
+    ch->ch.read = crypto_hash_polarssl_read;
+    ch->ch.close = crypto_hash_polarssl_close;
+    ch->ch.get_size = crypto_hash_polarssl_get_size;
 
-	return &ch->ch;
+    return &ch->ch;
 }
 
 struct crypto_pk_polarssl {
-	struct crypto_pk cp;
-	mbedtls_rsa_context ctx;
+    struct crypto_pk cp;
+    mbedtls_rsa_context ctx;
 };
 
 static struct crypto_pk *crypto_pk_polarssl_open_rsa(va_list vl)
 {
-	struct crypto_pk_polarssl *cp = malloc(sizeof(*cp));
-	memset(cp, 0x00, sizeof(*cp));
+    struct crypto_pk_polarssl *cp = malloc(sizeof(*cp));
+    memset(cp, 0x00, sizeof(*cp));
 
-	char *mod = va_arg(vl, char *);	 // N
-	int modlen = va_arg(vl, size_t);
-	char *exp = va_arg(vl, char *);	 // E
-	int explen = va_arg(vl, size_t);
+    char *mod = va_arg(vl, char *); // N
+    int modlen = va_arg(vl, size_t);
+    char *exp = va_arg(vl, char *); // E
+    int explen = va_arg(vl, size_t);
 
-	mbedtls_rsa_init(&cp->ctx, MBEDTLS_RSA_PKCS_V15, 0);
+    mbedtls_rsa_init(&cp->ctx, MBEDTLS_RSA_PKCS_V15, 0);
 
-	cp->ctx.len = modlen; // size(N) in bytes
-	mbedtls_mpi_read_binary(&cp->ctx.N, (const unsigned char *)mod, modlen);
-	mbedtls_mpi_read_binary(&cp->ctx.E, (const unsigned char *)exp, explen);
+    cp->ctx.len = modlen; // size(N) in bytes
+    mbedtls_mpi_read_binary(&cp->ctx.N, (const unsigned char *)mod, modlen);
+    mbedtls_mpi_read_binary(&cp->ctx.E, (const unsigned char *)exp, explen);
 
-	int res = mbedtls_rsa_check_pubkey(&cp->ctx);
-	if(res != 0) {
-		fprintf(stderr, "PolarSSL public key error res=%x exp=%d mod=%d.\n", res * -1, explen, modlen);
-		free(cp);
-		return NULL;
-	}
+    int res = mbedtls_rsa_check_pubkey(&cp->ctx);
+    if(res != 0) {
+        fprintf(stderr, "PolarSSL public key error res=%x exp=%d mod=%d.\n", res * -1, explen, modlen);
+        free(cp);
+        return NULL;
+    }
 
-	return &cp->cp;
+    return &cp->cp;
 }
 
 static struct crypto_pk *crypto_pk_polarssl_open_priv_rsa(va_list vl)
 {
-	struct crypto_pk_polarssl *cp = malloc(sizeof(*cp));
-	memset(cp, 0x00, sizeof(*cp));
-	char *mod = va_arg(vl, char *);
-	int modlen = va_arg(vl, size_t);
-	char *exp = va_arg(vl, char *);
-	int explen = va_arg(vl, size_t);
-	char *d = va_arg(vl, char *);
-	int dlen = va_arg(vl, size_t);
-	char *p = va_arg(vl, char *);
-	int plen = va_arg(vl, size_t);
-	char *q = va_arg(vl, char *);
-	int qlen = va_arg(vl, size_t);
-	char *dp = va_arg(vl, char *);
-	int dplen = va_arg(vl, size_t);
-	char *dq = va_arg(vl, char *);
-	int dqlen = va_arg(vl, size_t);
-	// calc QP via Q and P
-//	char *inv = va_arg(vl, char *);
-//	int invlen = va_arg(vl, size_t);
+    struct crypto_pk_polarssl *cp = malloc(sizeof(*cp));
+    memset(cp, 0x00, sizeof(*cp));
+    char *mod = va_arg(vl, char *);
+    int modlen = va_arg(vl, size_t);
+    char *exp = va_arg(vl, char *);
+    int explen = va_arg(vl, size_t);
+    char *d = va_arg(vl, char *);
+    int dlen = va_arg(vl, size_t);
+    char *p = va_arg(vl, char *);
+    int plen = va_arg(vl, size_t);
+    char *q = va_arg(vl, char *);
+    int qlen = va_arg(vl, size_t);
+    char *dp = va_arg(vl, char *);
+    int dplen = va_arg(vl, size_t);
+    char *dq = va_arg(vl, char *);
+    int dqlen = va_arg(vl, size_t);
+    // calc QP via Q and P
+// char *inv = va_arg(vl, char *);
+// int invlen = va_arg(vl, size_t);
 
-	mbedtls_rsa_init(&cp->ctx, MBEDTLS_RSA_PKCS_V15, 0);
+    mbedtls_rsa_init(&cp->ctx, MBEDTLS_RSA_PKCS_V15, 0);
 
-	cp->ctx.len = modlen; // size(N) in bytes
-	mbedtls_mpi_read_binary(&cp->ctx.N,  (const unsigned char *)mod, modlen);
-	mbedtls_mpi_read_binary(&cp->ctx.E,  (const unsigned char *)exp, explen);
+    cp->ctx.len = modlen; // size(N) in bytes
+    mbedtls_mpi_read_binary(&cp->ctx.N,  (const unsigned char *)mod, modlen);
+    mbedtls_mpi_read_binary(&cp->ctx.E,  (const unsigned char *)exp, explen);
 
-	mbedtls_mpi_read_binary(&cp->ctx.D,  (const unsigned char *)d, dlen);
-	mbedtls_mpi_read_binary(&cp->ctx.P,  (const unsigned char *)p, plen);
-	mbedtls_mpi_read_binary(&cp->ctx.Q,  (const unsigned char *)q, qlen);
-	mbedtls_mpi_read_binary(&cp->ctx.DP, (const unsigned char *)dp, dplen);
-	mbedtls_mpi_read_binary(&cp->ctx.DQ, (const unsigned char *)dq, dqlen);
-	mbedtls_mpi_inv_mod(&cp->ctx.QP, &cp->ctx.Q, &cp->ctx.P);
+    mbedtls_mpi_read_binary(&cp->ctx.D,  (const unsigned char *)d, dlen);
+    mbedtls_mpi_read_binary(&cp->ctx.P,  (const unsigned char *)p, plen);
+    mbedtls_mpi_read_binary(&cp->ctx.Q,  (const unsigned char *)q, qlen);
+    mbedtls_mpi_read_binary(&cp->ctx.DP, (const unsigned char *)dp, dplen);
+    mbedtls_mpi_read_binary(&cp->ctx.DQ, (const unsigned char *)dq, dqlen);
+    mbedtls_mpi_inv_mod(&cp->ctx.QP, &cp->ctx.Q, &cp->ctx.P);
 
-	int res = mbedtls_rsa_check_privkey(&cp->ctx);
-	if(res != 0) {
-		fprintf(stderr, "PolarSSL private key error res=%x exp=%d mod=%d.\n", res * -1, explen, modlen);
-		free(cp);
-		return NULL;
-	}
+    int res = mbedtls_rsa_check_privkey(&cp->ctx);
+    if(res != 0) {
+        fprintf(stderr, "PolarSSL private key error res=%x exp=%d mod=%d.\n", res * -1, explen, modlen);
+        free(cp);
+        return NULL;
+    }
 
-	return &cp->cp;
+    return &cp->cp;
 }
 
 static int myrand(void *rng_state, unsigned char *output, size_t len) {
@@ -173,184 +173,184 @@ static int myrand(void *rng_state, unsigned char *output, size_t len) {
 
 static struct crypto_pk *crypto_pk_polarssl_genkey_rsa(va_list vl)
 {
-	struct crypto_pk_polarssl *cp = malloc(sizeof(*cp));
-	memset(cp, 0x00, sizeof(*cp));
+    struct crypto_pk_polarssl *cp = malloc(sizeof(*cp));
+    memset(cp, 0x00, sizeof(*cp));
 
-	int transient = va_arg(vl, int);
-	unsigned int nbits = va_arg(vl, unsigned int);
-	unsigned int exp = va_arg(vl, unsigned int);
+    int transient = va_arg(vl, int);
+    unsigned int nbits = va_arg(vl, unsigned int);
+    unsigned int exp = va_arg(vl, unsigned int);
 
-	if (transient) {
-	}
+    if (transient) {
+    }
 
-	int res = mbedtls_rsa_gen_key(&cp->ctx, &myrand, NULL, nbits, exp);
-	if (res) {
-		fprintf(stderr, "PolarSSL private key generation error res=%x exp=%d nbits=%d.\n", res * -1, exp, nbits);
-		free(cp);
-		return NULL;
-	}
+    int res = mbedtls_rsa_gen_key(&cp->ctx, &myrand, NULL, nbits, exp);
+    if (res) {
+        fprintf(stderr, "PolarSSL private key generation error res=%x exp=%d nbits=%d.\n", res * -1, exp, nbits);
+        free(cp);
+        return NULL;
+    }
 
-	return &cp->cp;
+    return &cp->cp;
 }
 
 static void crypto_pk_polarssl_close(struct crypto_pk *_cp)
 {
-	struct crypto_pk_polarssl *cp = (struct crypto_pk_polarssl *)_cp;
+    struct crypto_pk_polarssl *cp = (struct crypto_pk_polarssl *)_cp;
 
-	mbedtls_rsa_free(&cp->ctx);
-	free(cp);
+    mbedtls_rsa_free(&cp->ctx);
+    free(cp);
 }
 
 static unsigned char *crypto_pk_polarssl_encrypt(const struct crypto_pk *_cp, const unsigned char *buf, size_t len, size_t *clen)
 {
-	struct crypto_pk_polarssl *cp = (struct crypto_pk_polarssl *)_cp;
-	int res;
-	unsigned char *result;
+    struct crypto_pk_polarssl *cp = (struct crypto_pk_polarssl *)_cp;
+    int res;
+    unsigned char *result;
 
-	*clen = 0;
-	size_t keylen = mbedtls_mpi_size(&cp->ctx.N);
+    *clen = 0;
+    size_t keylen = mbedtls_mpi_size(&cp->ctx.N);
 
-	result = malloc(keylen);
-	if (!result) {
-		printf("RSA encrypt failed. Can't allocate result memory.\n");
-		return NULL;
-	}
+    result = malloc(keylen);
+    if (!result) {
+        printf("RSA encrypt failed. Can't allocate result memory.\n");
+        return NULL;
+    }
 
-	res = mbedtls_rsa_public(&cp->ctx, buf, result);
-	if(res) {
-		printf("RSA encrypt failed. Error: %x data len: %zd key len: %zd\n", res * -1, len, keylen);
-		free(result);
-		return NULL;
-	}
+    res = mbedtls_rsa_public(&cp->ctx, buf, result);
+    if(res) {
+        printf("RSA encrypt failed. Error: %x data len: %zd key len: %zd\n", res * -1, len, keylen);
+        free(result);
+        return NULL;
+    }
 
-	*clen = keylen;
+    *clen = keylen;
 
-	return result;
+    return result;
 }
 
 static unsigned char *crypto_pk_polarssl_decrypt(const struct crypto_pk *_cp, const unsigned char *buf, size_t len, size_t *clen)
 {
-	struct crypto_pk_polarssl *cp = (struct crypto_pk_polarssl *)_cp;
-	int res;
-	unsigned char *result;
+    struct crypto_pk_polarssl *cp = (struct crypto_pk_polarssl *)_cp;
+    int res;
+    unsigned char *result;
 
-	*clen = 0;
-	size_t keylen = mbedtls_mpi_size(&cp->ctx.N);
+    *clen = 0;
+    size_t keylen = mbedtls_mpi_size(&cp->ctx.N);
 
-	result = malloc(keylen);
-	if (!result) {
-		printf("RSA encrypt failed. Can't allocate result memory.\n");
-		return NULL;
-	}
+    result = malloc(keylen);
+    if (!result) {
+        printf("RSA encrypt failed. Can't allocate result memory.\n");
+        return NULL;
+    }
 
-	res = mbedtls_rsa_private(&cp->ctx, NULL, NULL, buf, result); // CHECK???
-	if(res) {
-		printf("RSA decrypt failed. Error: %x data len: %zd key len: %zd\n", res * -1, len, keylen);
-		free(result);
-		return NULL;
-	}
+    res = mbedtls_rsa_private(&cp->ctx, NULL, NULL, buf, result); // CHECK???
+    if(res) {
+        printf("RSA decrypt failed. Error: %x data len: %zd key len: %zd\n", res * -1, len, keylen);
+        free(result);
+        return NULL;
+    }
 
-	*clen = keylen;
+    *clen = keylen;
 
-	return result;
+    return result;
 }
 
 static size_t crypto_pk_polarssl_get_nbits(const struct crypto_pk *_cp)
 {
-	struct crypto_pk_polarssl *cp = (struct crypto_pk_polarssl *)_cp;
+    struct crypto_pk_polarssl *cp = (struct crypto_pk_polarssl *)_cp;
 
-	return cp->ctx.len * 8;
+    return cp->ctx.len * 8;
 return 0;
 }
 
 static unsigned char *crypto_pk_polarssl_get_parameter(const struct crypto_pk *_cp, unsigned param, size_t *plen)
 {
-	struct crypto_pk_polarssl *cp = (struct crypto_pk_polarssl *)_cp;
-	unsigned char *result = NULL;
-	switch(param){
-		// mod
-		case 0:
-			*plen = mbedtls_mpi_size(&cp->ctx.N);
-			result = malloc(*plen);
-			memset(result, 0x00, *plen);
-			mbedtls_mpi_write_binary(&cp->ctx.N, result, *plen);
-			break;
-		// exp
-		case 1:
-			*plen = mbedtls_mpi_size(&cp->ctx.E);
-			result = malloc(*plen);
-			memset(result, 0x00, *plen);
-			mbedtls_mpi_write_binary(&cp->ctx.E, result, *plen);
-			break;
-		default:
-			printf("Error get parameter. Param=%d", param);
-			break;
-	}
+    struct crypto_pk_polarssl *cp = (struct crypto_pk_polarssl *)_cp;
+    unsigned char *result = NULL;
+    switch(param){
+        // mod
+        case 0:
+            *plen = mbedtls_mpi_size(&cp->ctx.N);
+            result = malloc(*plen);
+            memset(result, 0x00, *plen);
+            mbedtls_mpi_write_binary(&cp->ctx.N, result, *plen);
+            break;
+        // exp
+        case 1:
+            *plen = mbedtls_mpi_size(&cp->ctx.E);
+            result = malloc(*plen);
+            memset(result, 0x00, *plen);
+            mbedtls_mpi_write_binary(&cp->ctx.E, result, *plen);
+            break;
+        default:
+            printf("Error get parameter. Param=%d", param);
+            break;
+    }
 
-	return result;
+    return result;
 }
 
 static struct crypto_pk *crypto_pk_polarssl_open(enum crypto_algo_pk pk, va_list vl)
 {
-	struct crypto_pk *cp;
+    struct crypto_pk *cp;
 
-	if (pk == PK_RSA)
-		cp = crypto_pk_polarssl_open_rsa(vl);
-	else
-		return NULL;
+    if (pk == PK_RSA)
+        cp = crypto_pk_polarssl_open_rsa(vl);
+    else
+        return NULL;
 
-	cp->close = crypto_pk_polarssl_close;
-	cp->encrypt = crypto_pk_polarssl_encrypt;
-	cp->get_parameter = crypto_pk_polarssl_get_parameter;
-	cp->get_nbits = crypto_pk_polarssl_get_nbits;
+    cp->close = crypto_pk_polarssl_close;
+    cp->encrypt = crypto_pk_polarssl_encrypt;
+    cp->get_parameter = crypto_pk_polarssl_get_parameter;
+    cp->get_nbits = crypto_pk_polarssl_get_nbits;
 
-	return cp;
+    return cp;
 }
 
 static struct crypto_pk *crypto_pk_polarssl_open_priv(enum crypto_algo_pk pk, va_list vl)
 {
-	struct crypto_pk *cp;
+    struct crypto_pk *cp;
 
-	if (pk == PK_RSA)
-		cp = crypto_pk_polarssl_open_priv_rsa(vl);
-	else
-		return NULL;
+    if (pk == PK_RSA)
+        cp = crypto_pk_polarssl_open_priv_rsa(vl);
+    else
+        return NULL;
 
-	cp->close = crypto_pk_polarssl_close;
-	cp->encrypt = crypto_pk_polarssl_encrypt;
-	cp->decrypt = crypto_pk_polarssl_decrypt;
-	cp->get_parameter = crypto_pk_polarssl_get_parameter;
-	cp->get_nbits = crypto_pk_polarssl_get_nbits;
+    cp->close = crypto_pk_polarssl_close;
+    cp->encrypt = crypto_pk_polarssl_encrypt;
+    cp->decrypt = crypto_pk_polarssl_decrypt;
+    cp->get_parameter = crypto_pk_polarssl_get_parameter;
+    cp->get_nbits = crypto_pk_polarssl_get_nbits;
 
-	return cp;
+    return cp;
 }
 
 static struct crypto_pk *crypto_pk_polarssl_genkey(enum crypto_algo_pk pk, va_list vl)
 {
-	struct crypto_pk *cp;
+    struct crypto_pk *cp;
 
-	if (pk == PK_RSA)
-		cp = crypto_pk_polarssl_genkey_rsa(vl);
-	else
-		return NULL;
+    if (pk == PK_RSA)
+        cp = crypto_pk_polarssl_genkey_rsa(vl);
+    else
+        return NULL;
 
-	cp->close = crypto_pk_polarssl_close;
-	cp->encrypt = crypto_pk_polarssl_encrypt;
-	cp->decrypt = crypto_pk_polarssl_decrypt;
-	cp->get_parameter = crypto_pk_polarssl_get_parameter;
-	cp->get_nbits = crypto_pk_polarssl_get_nbits;
+    cp->close = crypto_pk_polarssl_close;
+    cp->encrypt = crypto_pk_polarssl_encrypt;
+    cp->decrypt = crypto_pk_polarssl_decrypt;
+    cp->get_parameter = crypto_pk_polarssl_get_parameter;
+    cp->get_nbits = crypto_pk_polarssl_get_nbits;
 
-	return cp;
+    return cp;
 }
 
 static struct crypto_backend crypto_polarssl_backend = {
-	.hash_open = crypto_hash_polarssl_open,
-	.pk_open = crypto_pk_polarssl_open,
-	.pk_open_priv = crypto_pk_polarssl_open_priv,
-	.pk_genkey = crypto_pk_polarssl_genkey,
+    .hash_open = crypto_hash_polarssl_open,
+    .pk_open = crypto_pk_polarssl_open,
+    .pk_open_priv = crypto_pk_polarssl_open_priv,
+    .pk_genkey = crypto_pk_polarssl_genkey,
 };
 
 struct crypto_backend *crypto_polarssl_init(void)
 {
-	return &crypto_polarssl_backend;
+    return &crypto_polarssl_backend;
 }
diff --git a/client/emv/dol.c b/client/emv/dol.c
index 0fc1c49b9..da63a574e 100644
--- a/client/emv/dol.c
+++ b/client/emv/dol.c
@@ -25,111 +25,111 @@
 
 static size_t dol_calculate_len(const struct tlv *tlv, size_t data_len)
 {
-	if (!tlv)
-		return 0;
+    if (!tlv)
+        return 0;
 
-	const unsigned char *buf = tlv->value;
-	size_t left = tlv->len;
-	size_t count = 0;
+    const unsigned char *buf = tlv->value;
+    size_t left = tlv->len;
+    size_t count = 0;
 
-	while (left) {
-		struct tlv tlv;
-		if (!tlv_parse_tl(&buf, &left, &tlv))
-			return 0;
+    while (left) {
+        struct tlv tlv;
+        if (!tlv_parse_tl(&buf, &left, &tlv))
+            return 0;
 
-		count += tlv.len;
+        count += tlv.len;
 
-		/* Last tag can be of variable length */
-		if (tlv.len == 0 && left == 0)
-			count = data_len;
-	}
+        /* Last tag can be of variable length */
+        if (tlv.len == 0 && left == 0)
+            count = data_len;
+    }
 
-	return count;
+    return count;
 }
 
 struct tlv *dol_process(const struct tlv *tlv, const struct tlvdb *tlvdb, tlv_tag_t tag)
 {
-	size_t res_len;
-	if (!tlv || !(res_len = dol_calculate_len(tlv, 0))) {
-		struct tlv *res_tlv = malloc(sizeof(*res_tlv));
+    size_t res_len;
+    if (!tlv || !(res_len = dol_calculate_len(tlv, 0))) {
+        struct tlv *res_tlv = malloc(sizeof(*res_tlv));
 
-		res_tlv->tag = tag;
-		res_tlv->len = 0;
-		res_tlv->value = NULL;
+        res_tlv->tag = tag;
+        res_tlv->len = 0;
+        res_tlv->value = NULL;
 
-		return res_tlv;
-	}
+        return res_tlv;
+    }
 
-	struct tlv *res_tlv = malloc(sizeof(*res_tlv) + res_len);
-	if (!res_tlv)
-		return NULL;
+    struct tlv *res_tlv = malloc(sizeof(*res_tlv) + res_len);
+    if (!res_tlv)
+        return NULL;
 
-	const unsigned char *buf = tlv->value;
-	size_t left = tlv->len;
-	unsigned char *res = (unsigned char *)(res_tlv + 1);
-	size_t pos = 0;
+    const unsigned char *buf = tlv->value;
+    size_t left = tlv->len;
+    unsigned char *res = (unsigned char *)(res_tlv + 1);
+    size_t pos = 0;
 
-	while (left) {
-		struct tlv cur_tlv;
-		if (!tlv_parse_tl(&buf, &left, &cur_tlv) || pos + cur_tlv.len > res_len) {
-			free(res_tlv);
+    while (left) {
+        struct tlv cur_tlv;
+        if (!tlv_parse_tl(&buf, &left, &cur_tlv) || pos + cur_tlv.len > res_len) {
+            free(res_tlv);
 
-			return NULL;
-		}
+            return NULL;
+        }
 
-		const struct tlv *tag_tlv = tlvdb_get(tlvdb, cur_tlv.tag, NULL);
-		if (!tag_tlv) {
-			memset(res + pos, 0, cur_tlv.len);
-		} else if (tag_tlv->len > cur_tlv.len) {
-			memcpy(res + pos, tag_tlv->value, cur_tlv.len);
-		} else {
-			// FIXME: cn data should be padded with 0xFF !!!
-			memcpy(res + pos, tag_tlv->value, tag_tlv->len);
-			memset(res + pos + tag_tlv->len, 0, cur_tlv.len - tag_tlv->len);
-		}
-		pos += cur_tlv.len;
-	}
+        const struct tlv *tag_tlv = tlvdb_get(tlvdb, cur_tlv.tag, NULL);
+        if (!tag_tlv) {
+            memset(res + pos, 0, cur_tlv.len);
+        } else if (tag_tlv->len > cur_tlv.len) {
+            memcpy(res + pos, tag_tlv->value, cur_tlv.len);
+        } else {
+            // FIXME: cn data should be padded with 0xFF !!!
+            memcpy(res + pos, tag_tlv->value, tag_tlv->len);
+            memset(res + pos + tag_tlv->len, 0, cur_tlv.len - tag_tlv->len);
+        }
+        pos += cur_tlv.len;
+    }
 
-	res_tlv->tag = tag;
-	res_tlv->len = res_len;
-	res_tlv->value = res;
+    res_tlv->tag = tag;
+    res_tlv->len = res_len;
+    res_tlv->value = res;
 
-	return res_tlv;
+    return res_tlv;
 }
 
 struct tlvdb *dol_parse(const struct tlv *tlv, const unsigned char *data, size_t data_len)
 {
-	if (!tlv)
-		return NULL;
+    if (!tlv)
+        return NULL;
 
-	const unsigned char *buf = tlv->value;
-	size_t left = tlv->len;
-	size_t res_len = dol_calculate_len(tlv, data_len);
-	size_t pos = 0;
-	struct tlvdb *db = NULL;
+    const unsigned char *buf = tlv->value;
+    size_t left = tlv->len;
+    size_t res_len = dol_calculate_len(tlv, data_len);
+    size_t pos = 0;
+    struct tlvdb *db = NULL;
 
-	if (res_len != data_len)
-		return NULL;
+    if (res_len != data_len)
+        return NULL;
 
-	while (left) {
-		struct tlv cur_tlv;
-		if (!tlv_parse_tl(&buf, &left, &cur_tlv) || pos + cur_tlv.len > res_len) {
-			tlvdb_free(db);
-			return NULL;
-		}
+    while (left) {
+        struct tlv cur_tlv;
+        if (!tlv_parse_tl(&buf, &left, &cur_tlv) || pos + cur_tlv.len > res_len) {
+            tlvdb_free(db);
+            return NULL;
+        }
 
-		/* Last tag can be of variable length */
-		if (cur_tlv.len == 0 && left == 0)
-			cur_tlv.len = res_len - pos;
+        /* Last tag can be of variable length */
+        if (cur_tlv.len == 0 && left == 0)
+            cur_tlv.len = res_len - pos;
 
-		struct tlvdb *tag_db = tlvdb_fixed(cur_tlv.tag, cur_tlv.len, data + pos);
-		if (!db)
-			db = tag_db;
-		else
-			tlvdb_add(db, tag_db);
+        struct tlvdb *tag_db = tlvdb_fixed(cur_tlv.tag, cur_tlv.len, data + pos);
+        if (!db)
+            db = tag_db;
+        else
+            tlvdb_add(db, tag_db);
 
-		pos += cur_tlv.len;
-	}
+        pos += cur_tlv.len;
+    }
 
-	return db;
+    return db;
 }
diff --git a/client/emv/dump.c b/client/emv/dump.c
index 47de7c3c2..93e59dfd0 100644
--- a/client/emv/dump.c
+++ b/client/emv/dump.c
@@ -20,40 +20,40 @@
 #include "dump.h"
 
 
-#define PRINT_INDENT(level) 	{for (int i = 0; i < (level); i++) fprintf(f, "   ");}
+#define PRINT_INDENT(level) {for (int i = 0; i < (level); i++) fprintf(f, "   ");}
 
 void dump_buffer_simple(const unsigned char *ptr, size_t len, FILE *f)
 {
-	int i;
+    int i;
 
-	if (!f)
-		f = stdout;
+    if (!f)
+        f = stdout;
 
-	for (i = 0; i < len; i ++)
-		fprintf(f, "%s%02hhX", i ? " " : "", ptr[i]);
+    for (i = 0; i < len; i ++)
+        fprintf(f, "%s%02hhX", i ? " " : "", ptr[i]);
 }
 
 void dump_buffer(const unsigned char *ptr, size_t len, FILE *f, int level)
 {
-	int i, j;
+    int i, j;
 
-	if (!f)
-		f = stdout;
+    if (!f)
+        f = stdout;
 
-	for (i = 0; i < len; i += 16) {
-		PRINT_INDENT(level);
-		fprintf(f, "\t%02x:", i);
-		for (j = 0; j < 16; j++) {
-			if (i + j < len)
-				fprintf(f, " %02hhx", ptr[i + j]);
-			else
-				fprintf(f, "   ");
-		}
-		fprintf(f, " |");
-		for (j = 0; j < 16 && i + j < len; j++) {
-			fprintf(f, "%c", (ptr[i+j] >= 0x20 && ptr[i+j] < 0x7f) ? ptr[i+j] : '.' );
-		}
-		fprintf(f, "\n");
-	}
+    for (i = 0; i < len; i += 16) {
+        PRINT_INDENT(level);
+        fprintf(f, "\t%02x:", i);
+        for (j = 0; j < 16; j++) {
+            if (i + j < len)
+                fprintf(f, " %02hhx", ptr[i + j]);
+            else
+                fprintf(f, "   ");
+        }
+        fprintf(f, " |");
+        for (j = 0; j < 16 && i + j < len; j++) {
+            fprintf(f, "%c", (ptr[i+j] >= 0x20 && ptr[i+j] < 0x7f) ? ptr[i+j] : '.' );
+        }
+        fprintf(f, "\n");
+    }
 }
 
diff --git a/client/emv/emv_pk.c b/client/emv/emv_pk.c
index 211e4edc2..d1fa3359d 100644
--- a/client/emv/emv_pk.c
+++ b/client/emv/emv_pk.c
@@ -31,488 +31,488 @@
 #include <sys/types.h>
 
 #define BCD(c) (((c) >= '0' && (c) <= '9') ? ((c) - '0') : \
-		-1)
+        -1)
 
 #define HEX(c) (((c) >= '0' && (c) <= '9') ? ((c) - '0') : \
-		((c) >= 'A' && (c) <= 'F') ? ((c) - 'A' + 10) : \
-		((c) >= 'a' && (c) <= 'f') ? ((c) - 'a' + 10) : \
-		-1)
+        ((c) >= 'A' && (c) <= 'F') ? ((c) - 'A' + 10) : \
+        ((c) >= 'a' && (c) <= 'f') ? ((c) - 'a' + 10) : \
+        -1)
 
 #define TOHEX(v) ((v) < 10 ? (v) + '0' : (v) - 10 + 'a')
 
 static ssize_t emv_pk_read_bin(char *buf, unsigned char *bin, size_t size, size_t *read)
 {
-	size_t left = size;
-	char *p = buf;
-	while (*p && *p == ' ')
-		p++;
+    size_t left = size;
+    char *p = buf;
+    while (*p && *p == ' ')
+        p++;
 
-	while (left > 0) {
-		int c1, c2;
-		c1 = HEX(*p);
-		if (c1 == -1)
-			return -(p - buf);
-		p++;
-		c2 = HEX(*p);
-		if (c2 == -1)
-			return -(p - buf);
-		p++;
-		*bin = (c1 * 16 + c2);
-		bin ++;
-		left --;
-		if (*p == ':')
-			p++;
-		else if (read) {
-			*read = (size - left);
-			break;
-		} else if (left == 0)
-			break;
-		else
-			return -(p - buf);
-	}
+    while (left > 0) {
+        int c1, c2;
+        c1 = HEX(*p);
+        if (c1 == -1)
+            return -(p - buf);
+        p++;
+        c2 = HEX(*p);
+        if (c2 == -1)
+            return -(p - buf);
+        p++;
+        *bin = (c1 * 16 + c2);
+        bin ++;
+        left --;
+        if (*p == ':')
+            p++;
+        else if (read) {
+            *read = (size - left);
+            break;
+        } else if (left == 0)
+            break;
+        else
+            return -(p - buf);
+    }
 
-	while (*p && *p == ' ')
-		p++;
+    while (*p && *p == ' ')
+        p++;
 
-	p--;
+    p--;
 
-	return (p - buf);
+    return (p - buf);
 }
 
 static ssize_t emv_pk_read_ymv(char *buf, unsigned *ymv)
 {
-	int i;
-	unsigned char temp[3];
-	char *p = buf;
+    int i;
+    unsigned char temp[3];
+    char *p = buf;
 
-	*ymv = 0;
+    *ymv = 0;
 
-	while (*p && *p == ' ')
-		p++;
+    while (*p && *p == ' ')
+        p++;
 
-	for (i = 0; i < 3; i++) {
-		int c1, c2;
-		c1 = BCD(*p);
-		if (c1 == -1)
-			return -(p - buf);
-		p++;
-		c2 = BCD(*p);
-		if (c2 == -1)
-			return -(p - buf);
-		p++;
-		temp[i] = (c1 * 16 + c2);
-	}
+    for (i = 0; i < 3; i++) {
+        int c1, c2;
+        c1 = BCD(*p);
+        if (c1 == -1)
+            return -(p - buf);
+        p++;
+        c2 = BCD(*p);
+        if (c2 == -1)
+            return -(p - buf);
+        p++;
+        temp[i] = (c1 * 16 + c2);
+    }
 
-	while (*p && *p == ' ')
-		p++;
+    while (*p && *p == ' ')
+        p++;
 
-	p--;
+    p--;
 
-	if (temp[1] > 0x12 || temp[2] > 0x31)
-		return -(p - buf);
+    if (temp[1] > 0x12 || temp[2] > 0x31)
+        return -(p - buf);
 
-	*ymv = (temp[0] * 0x10000 + temp[1] * 0x100 + temp[2]);
+    *ymv = (temp[0] * 0x10000 + temp[1] * 0x100 + temp[2]);
 
-	return (p - buf);
+    return (p - buf);
 }
 
 static ssize_t emv_pk_read_string(char *buf, char *str, size_t size)
 {
-	char *p = buf;
-	while (*p && *p == ' ')
-		p++;
+    char *p = buf;
+    while (*p && *p == ' ')
+        p++;
 
-	while (size > 1) {
-		if (*p == ' ')
-			break;
-		else if (*p < 0x20 || *p >= 0x7f)
-			return -(p - buf);
-		*str = *p;
-		p++;
-		str ++;
-		size --;
-	}
+    while (size > 1) {
+        if (*p == ' ')
+            break;
+        else if (*p < 0x20 || *p >= 0x7f)
+            return -(p - buf);
+        *str = *p;
+        p++;
+        str ++;
+        size --;
+    }
 
-	*str = 0;
+    *str = 0;
 
-	while (*p && *p == ' ')
-		p++;
+    while (*p && *p == ' ')
+        p++;
 
-	p--;
+    p--;
 
-	return (p - buf);
+    return (p - buf);
 }
 
 
 struct emv_pk *emv_pk_parse_pk(char *buf)
 {
-	struct emv_pk *r = calloc(1, sizeof(*r));
-	ssize_t l;
-	char temp[10];
+    struct emv_pk *r = calloc(1, sizeof(*r));
+    ssize_t l;
+    char temp[10];
 
-	l = emv_pk_read_bin(buf, r->rid, 5, NULL);
-	if (l <= 0)
-		goto out;
-	buf += l;
+    l = emv_pk_read_bin(buf, r->rid, 5, NULL);
+    if (l <= 0)
+        goto out;
+    buf += l;
 
-	l = emv_pk_read_bin(buf, &r->index, 1, NULL);
-	if (l <= 0)
-		goto out;
-	buf += l;
+    l = emv_pk_read_bin(buf, &r->index, 1, NULL);
+    if (l <= 0)
+        goto out;
+    buf += l;
 
-	l = emv_pk_read_ymv(buf, &r->expire);
-	if (l <= 0)
-		goto out;
-	buf += l;
+    l = emv_pk_read_ymv(buf, &r->expire);
+    if (l <= 0)
+        goto out;
+    buf += l;
 
-	l = emv_pk_read_string(buf, temp, sizeof(temp));
-	if (l <= 0)
-		goto out;
-	buf += l;
+    l = emv_pk_read_string(buf, temp, sizeof(temp));
+    if (l <= 0)
+        goto out;
+    buf += l;
 
-	if (!strcmp(temp, "rsa"))
-		r->pk_algo = PK_RSA;
-	else
-		goto out;
+    if (!strcmp(temp, "rsa"))
+        r->pk_algo = PK_RSA;
+    else
+        goto out;
 
-	l = emv_pk_read_bin(buf, r->exp, sizeof(r->exp), &r->elen);
-	if (l <= 0)
-		goto out;
-	buf += l;
+    l = emv_pk_read_bin(buf, r->exp, sizeof(r->exp), &r->elen);
+    if (l <= 0)
+        goto out;
+    buf += l;
 
-	r->modulus = malloc(2048/8);
-	l = emv_pk_read_bin(buf, r->modulus, 2048/8, &r->mlen);
-	if (l <= 0)
-		goto out2;
-	buf += l;
+    r->modulus = malloc(2048/8);
+    l = emv_pk_read_bin(buf, r->modulus, 2048/8, &r->mlen);
+    if (l <= 0)
+        goto out2;
+    buf += l;
 
-	l = emv_pk_read_string(buf, temp, sizeof(temp));
-	if (l <= 0)
-		goto out2;
-	buf += l;
+    l = emv_pk_read_string(buf, temp, sizeof(temp));
+    if (l <= 0)
+        goto out2;
+    buf += l;
 
-	if (!strcmp(temp, "sha1"))
-		r->hash_algo = HASH_SHA_1;
-	else
-		goto out2;
+    if (!strcmp(temp, "sha1"))
+        r->hash_algo = HASH_SHA_1;
+    else
+        goto out2;
 
-	l = emv_pk_read_bin(buf, r->hash, 20, NULL);
-	if (l <= 0)
-		goto out2;
+    l = emv_pk_read_bin(buf, r->hash, 20, NULL);
+    if (l <= 0)
+        goto out2;
 
-	return r;
+    return r;
 
 out2:
-	free(r->modulus);
+    free(r->modulus);
 out:
-	free(r);
-	return NULL;
+    free(r);
+    return NULL;
 }
 
 static size_t emv_pk_write_bin(char *out, size_t outlen, const unsigned char *buf, size_t len)
 {
-	int i;
-	size_t pos = 0;
+    int i;
+    size_t pos = 0;
 
-	if (len == 0)
-		return 0;
-	if (outlen < len * 3)
-		return 0;
+    if (len == 0)
+        return 0;
+    if (outlen < len * 3)
+        return 0;
 
-	out[pos++] = TOHEX(buf[0] >> 4);
-	out[pos++] = TOHEX(buf[0] & 0xf);
-	for (i = 1; i < len; i++) {
-		out[pos++] = ':';
-		out[pos++] = TOHEX(buf[i] >> 4);
-		out[pos++] = TOHEX(buf[i] & 0xf);
-	}
-	out[pos++] = ' ';
+    out[pos++] = TOHEX(buf[0] >> 4);
+    out[pos++] = TOHEX(buf[0] & 0xf);
+    for (i = 1; i < len; i++) {
+        out[pos++] = ':';
+        out[pos++] = TOHEX(buf[i] >> 4);
+        out[pos++] = TOHEX(buf[i] & 0xf);
+    }
+    out[pos++] = ' ';
 
-	return pos;
+    return pos;
 }
 
 static size_t emv_pk_write_str(char *out, size_t outlen, const char *str)
 {
-	size_t len = strlen(str);
+    size_t len = strlen(str);
 
-	if (len == 0)
-		return 0;
-	if (outlen < len)
-		return 0;
+    if (len == 0)
+        return 0;
+    if (outlen < len)
+        return 0;
 
-	memcpy(out, str, len);
+    memcpy(out, str, len);
 
-	return len;
+    return len;
 }
 
 char *emv_pk_dump_pk(const struct emv_pk *pk)
 {
-	size_t outsize = 1024; /* should be enough */
-	char *out = malloc(outsize); /* should be enough */
-	size_t outpos = 0;
-	size_t rc;
+    size_t outsize = 1024; /* should be enough */
+    char *out = malloc(outsize); /* should be enough */
+    size_t outpos = 0;
+    size_t rc;
 
-	if (!out)
-		return NULL;
+    if (!out)
+        return NULL;
 
-	rc = emv_pk_write_bin(out + outpos, outsize - outpos, pk->rid, 5);
-	if (rc == 0)
-		goto err;
-	outpos += rc;
+    rc = emv_pk_write_bin(out + outpos, outsize - outpos, pk->rid, 5);
+    if (rc == 0)
+        goto err;
+    outpos += rc;
 
-	rc = emv_pk_write_bin(out + outpos, outsize - outpos, &pk->index, 1);
-	if (rc == 0)
-		goto err;
-	outpos += rc;
+    rc = emv_pk_write_bin(out + outpos, outsize - outpos, &pk->index, 1);
+    if (rc == 0)
+        goto err;
+    outpos += rc;
 
-	if (outpos + 7 > outsize)
-		goto err;
-	out[outpos++] = TOHEX((pk->expire >> 20) & 0xf);
-	out[outpos++] = TOHEX((pk->expire >> 16) & 0xf);
-	out[outpos++] = TOHEX((pk->expire >> 12) & 0xf);
-	out[outpos++] = TOHEX((pk->expire >> 8 ) & 0xf);
-	out[outpos++] = TOHEX((pk->expire >> 4 ) & 0xf);
-	out[outpos++] = TOHEX((pk->expire >> 0 ) & 0xf);
-	out[outpos++] = ' ';
+    if (outpos + 7 > outsize)
+        goto err;
+    out[outpos++] = TOHEX((pk->expire >> 20) & 0xf);
+    out[outpos++] = TOHEX((pk->expire >> 16) & 0xf);
+    out[outpos++] = TOHEX((pk->expire >> 12) & 0xf);
+    out[outpos++] = TOHEX((pk->expire >> 8 ) & 0xf);
+    out[outpos++] = TOHEX((pk->expire >> 4 ) & 0xf);
+    out[outpos++] = TOHEX((pk->expire >> 0 ) & 0xf);
+    out[outpos++] = ' ';
 
-	if (pk->pk_algo == PK_RSA) {
-		rc = emv_pk_write_str(out + outpos, outsize - outpos, "rsa");
-		if (rc == 0)
-			goto err;
-		outpos += rc;
-		out[outpos++] = ' ';
-	} else {
-		if (outpos + 4 > outsize)
-			goto err;
-		out[outpos++] = '?';
-		out[outpos++] = '?';
-		out[outpos++] = TOHEX(pk->pk_algo >> 4);
-		out[outpos++] = TOHEX(pk->pk_algo & 0xf);
-	}
+    if (pk->pk_algo == PK_RSA) {
+        rc = emv_pk_write_str(out + outpos, outsize - outpos, "rsa");
+        if (rc == 0)
+            goto err;
+        outpos += rc;
+        out[outpos++] = ' ';
+    } else {
+        if (outpos + 4 > outsize)
+            goto err;
+        out[outpos++] = '?';
+        out[outpos++] = '?';
+        out[outpos++] = TOHEX(pk->pk_algo >> 4);
+        out[outpos++] = TOHEX(pk->pk_algo & 0xf);
+    }
 
-	rc = emv_pk_write_bin(out + outpos, outsize - outpos, pk->exp, pk->elen);
-	if (rc == 0)
-		goto err;
-	outpos += rc;
+    rc = emv_pk_write_bin(out + outpos, outsize - outpos, pk->exp, pk->elen);
+    if (rc == 0)
+        goto err;
+    outpos += rc;
 
-	rc = emv_pk_write_bin(out + outpos, outsize - outpos, pk->modulus, pk->mlen);
-	if (rc == 0)
-		goto err;
-	outpos += rc;
+    rc = emv_pk_write_bin(out + outpos, outsize - outpos, pk->modulus, pk->mlen);
+    if (rc == 0)
+        goto err;
+    outpos += rc;
 
-	if (pk->hash_algo == HASH_SHA_1) {
-		rc = emv_pk_write_str(out + outpos, outsize - outpos, "sha1");
-		if (rc == 0)
-			goto err;
-		outpos += rc;
-		out[outpos++] = ' ';
-	} else {
-		if (outpos + 4 > outsize)
-			goto err;
-		out[outpos++] = '?';
-		out[outpos++] = '?';
-		out[outpos++] = TOHEX(pk->pk_algo >> 4);
-		out[outpos++] = TOHEX(pk->pk_algo & 0xf);
-	}
+    if (pk->hash_algo == HASH_SHA_1) {
+        rc = emv_pk_write_str(out + outpos, outsize - outpos, "sha1");
+        if (rc == 0)
+            goto err;
+        outpos += rc;
+        out[outpos++] = ' ';
+    } else {
+        if (outpos + 4 > outsize)
+            goto err;
+        out[outpos++] = '?';
+        out[outpos++] = '?';
+        out[outpos++] = TOHEX(pk->pk_algo >> 4);
+        out[outpos++] = TOHEX(pk->pk_algo & 0xf);
+    }
 
 
-	rc = emv_pk_write_bin(out + outpos, outsize - outpos, pk->hash, 20);
-	if (rc == 0)
-		goto err;
-	outpos += rc;
+    rc = emv_pk_write_bin(out + outpos, outsize - outpos, pk->hash, 20);
+    if (rc == 0)
+        goto err;
+    outpos += rc;
 
-	out[outpos-1] = '\0';
+    out[outpos-1] = '\0';
 
-	return out;
+    return out;
 
 err:
-	free(out);
-	return NULL;
+    free(out);
+    return NULL;
 }
 
 bool emv_pk_verify(const struct emv_pk *pk)
 {
-	struct crypto_hash *ch = crypto_hash_open(pk->hash_algo);
-	if (!ch)
-		return false;
+    struct crypto_hash *ch = crypto_hash_open(pk->hash_algo);
+    if (!ch)
+        return false;
 
-	crypto_hash_write(ch, pk->rid, sizeof(pk->rid));
-	crypto_hash_write(ch, &pk->index, 1);
-	crypto_hash_write(ch, pk->modulus, pk->mlen);
-	crypto_hash_write(ch, pk->exp, pk->elen);
+    crypto_hash_write(ch, pk->rid, sizeof(pk->rid));
+    crypto_hash_write(ch, &pk->index, 1);
+    crypto_hash_write(ch, pk->modulus, pk->mlen);
+    crypto_hash_write(ch, pk->exp, pk->elen);
 
-	unsigned char *h = crypto_hash_read(ch);
-	if (!h) {
-		crypto_hash_close(ch);
-		return false;
-	}
+    unsigned char *h = crypto_hash_read(ch);
+    if (!h) {
+        crypto_hash_close(ch);
+        return false;
+    }
 
-	size_t hsize = crypto_hash_get_size(ch);
-	bool r = hsize && !memcmp(h, pk->hash, hsize) ? true : false;
+    size_t hsize = crypto_hash_get_size(ch);
+    bool r = hsize && !memcmp(h, pk->hash, hsize) ? true : false;
 
-	crypto_hash_close(ch);
+    crypto_hash_close(ch);
 
-	return r;
+    return r;
 }
 
 struct emv_pk *emv_pk_new(size_t modlen, size_t explen)
 {
-	struct emv_pk *pk;
+    struct emv_pk *pk;
 
-	/* Not supported ATM */
-	if (explen > 3)
-		return NULL;
+    /* Not supported ATM */
+    if (explen > 3)
+        return NULL;
 
-	pk = calloc(1, sizeof(*pk));
-	if (!pk)
-		return NULL;
+    pk = calloc(1, sizeof(*pk));
+    if (!pk)
+        return NULL;
 
-	pk->mlen = modlen;
-	pk->elen = explen;
+    pk->mlen = modlen;
+    pk->elen = explen;
 
-	pk->modulus = calloc(modlen, 1);
-	if (!pk->modulus) {
-		free(pk);
-		pk = NULL;
-	}
+    pk->modulus = calloc(modlen, 1);
+    if (!pk->modulus) {
+        free(pk);
+        pk = NULL;
+    }
 
-	return pk;
+    return pk;
 }
 
 void emv_pk_free(struct emv_pk *pk)
 {
-	if (!pk)
-		return;
+    if (!pk)
+        return;
 
-	free(pk->modulus);
-	free(pk);
+    free(pk->modulus);
+    free(pk);
 }
 
 static struct emv_pk *emv_pk_get_ca_pk_from_file(const char *fname,
-		const unsigned char *rid,
-		unsigned char idx)
+        const unsigned char *rid,
+        unsigned char idx)
 {
-	if  (!fname)
-		return NULL;
+    if  (!fname)
+        return NULL;
 
-	FILE *f = fopen(fname, "r");
-	if (!f) {
-		perror("fopen");
-		return NULL;
-	}
+    FILE *f = fopen(fname, "r");
+    if (!f) {
+        perror("fopen");
+        return NULL;
+    }
 
-	while (!feof(f)) {
-		char buf[2048];
-		if (fgets(buf, sizeof(buf), f) == NULL)
-			break;
+    while (!feof(f)) {
+        char buf[2048];
+        if (fgets(buf, sizeof(buf), f) == NULL)
+            break;
 
-		struct emv_pk *pk = emv_pk_parse_pk(buf);
-		if (!pk)
-			continue;
-		if (memcmp(pk->rid, rid, 5) || pk->index != idx) {
-			emv_pk_free(pk);
-			continue;
-		}
+        struct emv_pk *pk = emv_pk_parse_pk(buf);
+        if (!pk)
+            continue;
+        if (memcmp(pk->rid, rid, 5) || pk->index != idx) {
+            emv_pk_free(pk);
+            continue;
+        }
 
-		fclose(f);
+        fclose(f);
 
-		return pk;
-	}
+        return pk;
+    }
 
-	fclose(f);
+    fclose(f);
 
-	return NULL;
+    return NULL;
 }
 
 char *emv_pk_get_ca_pk_file(const char *dirname, const unsigned char *rid, unsigned char idx)
 {
-	if (!dirname)
-		dirname = ".";//openemv_config_get_str("capk.dir", NULL);
+    if (!dirname)
+        dirname = ".";//openemv_config_get_str("capk.dir", NULL);
 
-	char *filename;
-	int ret = asprintf(&filename, "%s/%02hhx%02hhx%02hhx%02hhx%02hhx_%02hhx.0",
-			dirname,
-			rid[0],
-			rid[1],
-			rid[2],
-			rid[3],
-			rid[4],
-			idx);
+    char *filename;
+    int ret = asprintf(&filename, "%s/%02hhx%02hhx%02hhx%02hhx%02hhx_%02hhx.0",
+            dirname,
+            rid[0],
+            rid[1],
+            rid[2],
+            rid[3],
+            rid[4],
+            idx);
 
-	if (ret <= 0)
-		return NULL;
+    if (ret <= 0)
+        return NULL;
 
-	return filename;
+    return filename;
 }
 
 char *emv_pk_get_ca_pk_rid_file(const char *dirname, const unsigned char *rid)
 {
-	if (!dirname)
-		dirname = "."; //openemv_config_get_str("capk.dir", NULL);
+    if (!dirname)
+        dirname = "."; //openemv_config_get_str("capk.dir", NULL);
 
-	char *filename;
-	int ret = asprintf(&filename, "%s/%02hhx%02hhx%02hhx%02hhx%02hhx.pks",
-			dirname,
-			rid[0],
-			rid[1],
-			rid[2],
-			rid[3],
-			rid[4]);
+    char *filename;
+    int ret = asprintf(&filename, "%s/%02hhx%02hhx%02hhx%02hhx%02hhx.pks",
+            dirname,
+            rid[0],
+            rid[1],
+            rid[2],
+            rid[3],
+            rid[4]);
 
-	if (ret <= 0)
-		return NULL;
+    if (ret <= 0)
+        return NULL;
 
-	return filename;
+    return filename;
 }
 
 struct emv_pk *emv_pk_get_ca_pk(const unsigned char *rid, unsigned char idx)
 {
-	struct emv_pk *pk = NULL;
+    struct emv_pk *pk = NULL;
 
-/*	if (!pk) {
-		char *fname = emv_pk_get_ca_pk_file(NULL, rid, idx);
-		if (fname) {
-			pk = emv_pk_get_ca_pk_from_file(fname, rid, idx);
-			free(fname);
-		}
-	}
+/*  if (!pk) {
+        char *fname = emv_pk_get_ca_pk_file(NULL, rid, idx);
+        if (fname) {
+            pk = emv_pk_get_ca_pk_from_file(fname, rid, idx);
+            free(fname);
+        }
+    }
 
-	if (!pk) {
-		char *fname = emv_pk_get_ca_pk_rid_file(NULL, rid);
-		if (fname) {
-			pk = emv_pk_get_ca_pk_from_file(fname, rid, idx);
-			free(fname);
-		}
-	}
+    if (!pk) {
+        char *fname = emv_pk_get_ca_pk_rid_file(NULL, rid);
+        if (fname) {
+            pk = emv_pk_get_ca_pk_from_file(fname, rid, idx);
+            free(fname);
+        }
+    }
 */
-	if (!pk) {
-		const char *relfname = "emv/capk.txt";
+    if (!pk) {
+        const char *relfname = "emv/capk.txt";
 
-		char fname[strlen(get_my_executable_directory()) + strlen(relfname) + 1];
-		strcpy(fname, get_my_executable_directory());
-		strcat(fname, relfname);
+        char fname[strlen(get_my_executable_directory()) + strlen(relfname) + 1];
+        strcpy(fname, get_my_executable_directory());
+        strcat(fname, relfname);
 
-		pk = emv_pk_get_ca_pk_from_file(fname, rid, idx);
-	}
-	if (!pk)
-		return NULL;
+        pk = emv_pk_get_ca_pk_from_file(fname, rid, idx);
+    }
+    if (!pk)
+        return NULL;
 
-	printf("Verifying CA PK for %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx %zd bits...",
-				pk->rid[0],
-				pk->rid[1],
-				pk->rid[2],
-				pk->rid[3],
-				pk->rid[4],
-				pk->index,
-				pk->mlen * 8);
-	if (emv_pk_verify(pk)) {
-		printf("OK\n");
+    printf("Verifying CA PK for %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx %zd bits...",
+                pk->rid[0],
+                pk->rid[1],
+                pk->rid[2],
+                pk->rid[3],
+                pk->rid[4],
+                pk->index,
+                pk->mlen * 8);
+    if (emv_pk_verify(pk)) {
+        printf("OK\n");
 
-		return pk;
-	}
+        return pk;
+    }
 
-	printf("Failed!\n");
-	emv_pk_free(pk);
+    printf("Failed!\n");
+    emv_pk_free(pk);
 
-	return NULL;
+    return NULL;
 }
diff --git a/client/emv/emv_pk.h b/client/emv/emv_pk.h
index e291a065e..ed8000dc0 100644
--- a/client/emv/emv_pk.h
+++ b/client/emv/emv_pk.h
@@ -20,21 +20,21 @@
 #include <stddef.h>
 
 struct emv_pk {
-	unsigned char rid[5];
-	unsigned char index;
-	unsigned char serial[3];
-	unsigned char pan[10];
-	unsigned char hash_algo;
-	unsigned char pk_algo;
-	unsigned char hash[20];
-	unsigned char exp[3];
-	size_t elen;
-	size_t mlen;
-	unsigned char *modulus;
-	unsigned int expire;
+    unsigned char rid[5];
+    unsigned char index;
+    unsigned char serial[3];
+    unsigned char pan[10];
+    unsigned char hash_algo;
+    unsigned char pk_algo;
+    unsigned char hash[20];
+    unsigned char exp[3];
+    size_t elen;
+    size_t mlen;
+    unsigned char *modulus;
+    unsigned int expire;
 };
 
-#define EXPIRE(yy, mm, dd)	0x ## yy ## mm ## dd
+#define EXPIRE(yy, mm, dd) 0x ## yy ## mm ## dd
 
 struct emv_pk *emv_pk_parse_pk(char *buf);
 struct emv_pk *emv_pk_new(size_t modlen, size_t explen);
diff --git a/client/emv/emv_pki.c b/client/emv/emv_pki.c
index 2c661f11a..5854ef103 100644
--- a/client/emv/emv_pki.c
+++ b/client/emv/emv_pki.c
@@ -29,7 +29,7 @@
 
 static bool strictExecution = true;
 void PKISetStrictExecution(bool se) {
-	strictExecution = se;
+    strictExecution = se;
 }
 
 static const unsigned char empty_tlv_value[] = {};
@@ -38,551 +38,551 @@ static const struct tlv empty_tlv = {.tag = 0x0, .len = 0, .value = empty_tlv_va
 static size_t emv_pki_hash_psn[256] = { 0, 0, 11, 2, 17, 2, };
 
 static unsigned char *emv_pki_decode_message(const struct emv_pk *enc_pk,
-		uint8_t msgtype,
-		size_t *len,
-		const struct tlv *cert_tlv,
-		int tlv_count,
-		... /* A list of tlv pointers */
-		)
+        uint8_t msgtype,
+        size_t *len,
+        const struct tlv *cert_tlv,
+        int tlv_count,
+        ... /* A list of tlv pointers */
+        )
 {
-	struct crypto_pk *kcp;
-	unsigned char *data;
-	size_t data_len;
-	va_list vl;
+    struct crypto_pk *kcp;
+    unsigned char *data;
+    size_t data_len;
+    va_list vl;
 
-	if (!enc_pk)
-		return NULL;
+    if (!enc_pk)
+        return NULL;
 
-	if (!cert_tlv) {
-		printf("ERROR: Can't find certificate\n");
-		return NULL;
-	}
+    if (!cert_tlv) {
+        printf("ERROR: Can't find certificate\n");
+        return NULL;
+    }
 
-	if (cert_tlv->len != enc_pk->mlen) {
-		printf("ERROR: Certificate length (%zu) not equal key length (%zu)\n", cert_tlv->len, enc_pk->mlen);
-		return NULL;
-	}
-	kcp = crypto_pk_open(enc_pk->pk_algo,
-			enc_pk->modulus, enc_pk->mlen,
-			enc_pk->exp, enc_pk->elen);
-	if (!kcp)
-		return NULL;
+    if (cert_tlv->len != enc_pk->mlen) {
+        printf("ERROR: Certificate length (%zu) not equal key length (%zu)\n", cert_tlv->len, enc_pk->mlen);
+        return NULL;
+    }
+    kcp = crypto_pk_open(enc_pk->pk_algo,
+            enc_pk->modulus, enc_pk->mlen,
+            enc_pk->exp, enc_pk->elen);
+    if (!kcp)
+        return NULL;
 
-	data = crypto_pk_encrypt(kcp, cert_tlv->value, cert_tlv->len, &data_len);
-	crypto_pk_close(kcp);
+    data = crypto_pk_encrypt(kcp, cert_tlv->value, cert_tlv->len, &data_len);
+    crypto_pk_close(kcp);
 
-/*	if (true){
-		printf("Recovered data:\n");
-		dump_buffer(data, data_len, stdout, 0);
-	}*/
+/*  if (true){
+        printf("Recovered data:\n");
+        dump_buffer(data, data_len, stdout, 0);
+    }*/
 
-	if (data[data_len-1] != 0xbc || data[0] != 0x6a || data[1] != msgtype) {
-		printf("ERROR: Certificate format\n");
-		free(data);
-		return NULL;
-	}
+    if (data[data_len-1] != 0xbc || data[0] != 0x6a || data[1] != msgtype) {
+        printf("ERROR: Certificate format\n");
+        free(data);
+        return NULL;
+    }
 
-	size_t hash_pos = emv_pki_hash_psn[msgtype];
-	if (hash_pos == 0 || hash_pos > data_len){
-		printf("ERROR: Cant get hash position in the certificate\n");
-		free(data);
-		return NULL;
-	}
+    size_t hash_pos = emv_pki_hash_psn[msgtype];
+    if (hash_pos == 0 || hash_pos > data_len){
+        printf("ERROR: Cant get hash position in the certificate\n");
+        free(data);
+        return NULL;
+    }
 
-	struct crypto_hash *ch;
-	ch = crypto_hash_open(data[hash_pos]);
-	if (!ch) {
-		printf("ERROR: Cant do hash\n");
-		free(data);
-		return NULL;
-	}
+    struct crypto_hash *ch;
+    ch = crypto_hash_open(data[hash_pos]);
+    if (!ch) {
+        printf("ERROR: Cant do hash\n");
+        free(data);
+        return NULL;
+    }
 
-	size_t hash_len = crypto_hash_get_size(ch);
-	crypto_hash_write(ch, data + 1, data_len - 2 - hash_len);
+    size_t hash_len = crypto_hash_get_size(ch);
+    crypto_hash_write(ch, data + 1, data_len - 2 - hash_len);
 
-	va_start(vl, tlv_count);
-	for (int i = 0; i < tlv_count; i++) {
-		const struct tlv *add_tlv = va_arg(vl, const struct tlv *);
-		if (!add_tlv)
-			continue;
+    va_start(vl, tlv_count);
+    for (int i = 0; i < tlv_count; i++) {
+        const struct tlv *add_tlv = va_arg(vl, const struct tlv *);
+        if (!add_tlv)
+            continue;
 
-		crypto_hash_write(ch, add_tlv->value, add_tlv->len);
-	}
-	va_end(vl);
+        crypto_hash_write(ch, add_tlv->value, add_tlv->len);
+    }
+    va_end(vl);
 
-	uint8_t hash[hash_len];
-	memset(hash, 0, hash_len);
-	memcpy(hash, crypto_hash_read(ch), hash_len);
-	if (memcmp(data + data_len - 1 - hash_len, hash, hash_len)) {
-		printf("ERROR: Calculated wrong hash\n");
-		printf("decoded:    %s\n",sprint_hex(data + data_len - 1 - hash_len, hash_len));
-		printf("calculated: %s\n",sprint_hex(hash, hash_len));
+    uint8_t hash[hash_len];
+    memset(hash, 0, hash_len);
+    memcpy(hash, crypto_hash_read(ch), hash_len);
+    if (memcmp(data + data_len - 1 - hash_len, hash, hash_len)) {
+        printf("ERROR: Calculated wrong hash\n");
+        printf("decoded:    %s\n",sprint_hex(data + data_len - 1 - hash_len, hash_len));
+        printf("calculated: %s\n",sprint_hex(hash, hash_len));
 
-		if (strictExecution) {
-			crypto_hash_close(ch);
-			free(data);
-			return NULL;
-		}
-	}
+        if (strictExecution) {
+            crypto_hash_close(ch);
+            free(data);
+            return NULL;
+        }
+    }
 
-	crypto_hash_close(ch);
+    crypto_hash_close(ch);
 
-	*len = data_len - hash_len - 1;
+    *len = data_len - hash_len - 1;
 
-	return data;
+    return data;
 }
 
 static unsigned emv_cn_length(const struct tlv *tlv)
 {
-	int i;
+    int i;
 
-	for (i = 0; i < tlv->len; i++) {
-		unsigned char c = tlv->value[i];
+    for (i = 0; i < tlv->len; i++) {
+        unsigned char c = tlv->value[i];
 
-		if (c >> 4 == 0xf)
-			return 2 * i;
+        if (c >> 4 == 0xf)
+            return 2 * i;
 
-		if ((c & 0xf) == 0xf)
-			return 2 * i + 1;
-	}
+        if ((c & 0xf) == 0xf)
+            return 2 * i + 1;
+    }
 
-	return 2 * tlv->len;
+    return 2 * tlv->len;
 }
 
 static unsigned char emv_cn_get(const struct tlv *tlv, unsigned pos)
 {
-	if (pos > tlv->len * 2)
-		return 0xf;
+    if (pos > tlv->len * 2)
+        return 0xf;
 
-	unsigned char c = tlv->value[pos / 2];
+    unsigned char c = tlv->value[pos / 2];
 
-	if (pos % 2)
-		return c & 0xf;
-	else
-		return c >> 4;
+    if (pos % 2)
+        return c & 0xf;
+    else
+        return c >> 4;
 }
 
 static struct emv_pk *emv_pki_decode_key_ex(const struct emv_pk *enc_pk,
-		unsigned char msgtype,
-		const struct tlv *pan_tlv,
-		const struct tlv *cert_tlv,
-		const struct tlv *exp_tlv,
-		const struct tlv *rem_tlv,
-		const struct tlv *add_tlv,
-		const struct tlv *sdatl_tlv,
-		bool showData
-		)
+        unsigned char msgtype,
+        const struct tlv *pan_tlv,
+        const struct tlv *cert_tlv,
+        const struct tlv *exp_tlv,
+        const struct tlv *rem_tlv,
+        const struct tlv *add_tlv,
+        const struct tlv *sdatl_tlv,
+        bool showData
+        )
 {
-	size_t pan_length;
-	unsigned char *data;
-	size_t data_len;
-	size_t pk_len;
+    size_t pan_length;
+    unsigned char *data;
+    size_t data_len;
+    size_t pk_len;
 
-	if (!cert_tlv || !exp_tlv || !pan_tlv)
-		return NULL;
+    if (!cert_tlv || !exp_tlv || !pan_tlv)
+        return NULL;
 
-	if (!rem_tlv)
-		rem_tlv = &empty_tlv;
+    if (!rem_tlv)
+        rem_tlv = &empty_tlv;
 
-	if (msgtype == 2)
-		pan_length = 4;
-	else if (msgtype == 4)
-		pan_length = 10;
-	else {
-		printf("ERROR: Message type must be 2 or 4\n");
-		return NULL;
-	}
+    if (msgtype == 2)
+        pan_length = 4;
+    else if (msgtype == 4)
+        pan_length = 10;
+    else {
+        printf("ERROR: Message type must be 2 or 4\n");
+        return NULL;
+    }
 
-	data = emv_pki_decode_message(enc_pk, msgtype, &data_len,
-			cert_tlv,
-			5,
-			rem_tlv,
-			exp_tlv,
-			add_tlv,
-			sdatl_tlv,
-			NULL);
-	if (!data || data_len < 11 + pan_length) {
-		printf("ERROR: Can't decode message\n");
-		return NULL;
-	}
+    data = emv_pki_decode_message(enc_pk, msgtype, &data_len,
+            cert_tlv,
+            5,
+            rem_tlv,
+            exp_tlv,
+            add_tlv,
+            sdatl_tlv,
+            NULL);
+    if (!data || data_len < 11 + pan_length) {
+        printf("ERROR: Can't decode message\n");
+        return NULL;
+    }
 
-	if (showData){
-		printf("Recovered data:\n");
-		dump_buffer(data, data_len, stdout, 0);
-	}
+    if (showData){
+        printf("Recovered data:\n");
+        dump_buffer(data, data_len, stdout, 0);
+    }
 
-	/* Perform the rest of checks here */
+    /* Perform the rest of checks here */
 
-	struct tlv pan2_tlv = {
-		.tag = 0x5a,
-		.len = pan_length,
-		.value = &data[2],
-	};
-	unsigned pan_len = emv_cn_length(pan_tlv);
-	unsigned pan2_len = emv_cn_length(&pan2_tlv);
+    struct tlv pan2_tlv = {
+        .tag = 0x5a,
+        .len = pan_length,
+        .value = &data[2],
+    };
+    unsigned pan_len = emv_cn_length(pan_tlv);
+    unsigned pan2_len = emv_cn_length(&pan2_tlv);
 
-	if (((msgtype == 2) && (pan2_len < 4 || pan2_len > pan_len)) ||
-	    ((msgtype == 4) && (pan2_len != pan_len))) {
-		printf("ERROR: Invalid PAN lengths\n");
-		free(data);
+    if (((msgtype == 2) && (pan2_len < 4 || pan2_len > pan_len)) ||
+        ((msgtype == 4) && (pan2_len != pan_len))) {
+        printf("ERROR: Invalid PAN lengths\n");
+        free(data);
 
-		return NULL;
-	}
+        return NULL;
+    }
 
-	unsigned i;
-	for (i = 0; i < pan2_len; i++)
-		if (emv_cn_get(pan_tlv, i) != emv_cn_get(&pan2_tlv, i)) {
-			printf("ERROR: PAN data mismatch\n");
-			printf("tlv  pan=%s\n", sprint_hex(pan_tlv->value, pan_tlv->len));
-			printf("cert pan=%s\n", sprint_hex(pan2_tlv.value, pan2_tlv.len));
-			free(data);
+    unsigned i;
+    for (i = 0; i < pan2_len; i++)
+        if (emv_cn_get(pan_tlv, i) != emv_cn_get(&pan2_tlv, i)) {
+            printf("ERROR: PAN data mismatch\n");
+            printf("tlv  pan=%s\n", sprint_hex(pan_tlv->value, pan_tlv->len));
+            printf("cert pan=%s\n", sprint_hex(pan2_tlv.value, pan2_tlv.len));
+            free(data);
 
-			return NULL;
-		}
+            return NULL;
+        }
 
-	pk_len = data[9 + pan_length];
-	if (pk_len > data_len - 11 - pan_length + rem_tlv->len) {
-		printf("ERROR: Invalid pk length\n");
-		free(data);
-		return NULL;
-	}
+    pk_len = data[9 + pan_length];
+    if (pk_len > data_len - 11 - pan_length + rem_tlv->len) {
+        printf("ERROR: Invalid pk length\n");
+        free(data);
+        return NULL;
+    }
 
-	if (exp_tlv->len != data[10 + pan_length]) {
-		free(data);
-		return NULL;
-	}
+    if (exp_tlv->len != data[10 + pan_length]) {
+        free(data);
+        return NULL;
+    }
 
-	struct emv_pk *pk = emv_pk_new(pk_len, exp_tlv->len);
+    struct emv_pk *pk = emv_pk_new(pk_len, exp_tlv->len);
 
-	memcpy(pk->rid, enc_pk->rid, 5);
-	pk->index = enc_pk->index;
+    memcpy(pk->rid, enc_pk->rid, 5);
+    pk->index = enc_pk->index;
 
-	pk->hash_algo = data[7 + pan_length];
-	pk->pk_algo = data[8 + pan_length];
-	pk->expire = (data[3 + pan_length] << 16) | (data[2 + pan_length] << 8) | 0x31;
-	memcpy(pk->serial, data + 4 + pan_length, 3);
-	memcpy(pk->pan, data + 2, pan_length);
-	memset(pk->pan + pan_length, 0xff, 10 - pan_length);
+    pk->hash_algo = data[7 + pan_length];
+    pk->pk_algo = data[8 + pan_length];
+    pk->expire = (data[3 + pan_length] << 16) | (data[2 + pan_length] << 8) | 0x31;
+    memcpy(pk->serial, data + 4 + pan_length, 3);
+    memcpy(pk->pan, data + 2, pan_length);
+    memset(pk->pan + pan_length, 0xff, 10 - pan_length);
 
-	memcpy(pk->modulus, data + 11 + pan_length,
-			pk_len < data_len - (11 + pan_length) ?
-			pk_len :
-			data_len - (11 + pan_length));
-	memcpy(pk->modulus + data_len - (11 + pan_length), rem_tlv->value, rem_tlv->len);
-	memcpy(pk->exp, exp_tlv->value, exp_tlv->len);
+    memcpy(pk->modulus, data + 11 + pan_length,
+            pk_len < data_len - (11 + pan_length) ?
+            pk_len :
+            data_len - (11 + pan_length));
+    memcpy(pk->modulus + data_len - (11 + pan_length), rem_tlv->value, rem_tlv->len);
+    memcpy(pk->exp, exp_tlv->value, exp_tlv->len);
 
-	free(data);
+    free(data);
 
-	return pk;
+    return pk;
 }
 
 static struct emv_pk *emv_pki_decode_key(const struct emv_pk *enc_pk,
-		unsigned char msgtype,
-		const struct tlv *pan_tlv,
-		const struct tlv *cert_tlv,
-		const struct tlv *exp_tlv,
-		const struct tlv *rem_tlv,
-		const struct tlv *add_tlv,
-		const struct tlv *sdatl_tlv
-		) {
-	return emv_pki_decode_key_ex(enc_pk, msgtype, pan_tlv, cert_tlv, exp_tlv, rem_tlv, add_tlv, sdatl_tlv, false);
+        unsigned char msgtype,
+        const struct tlv *pan_tlv,
+        const struct tlv *cert_tlv,
+        const struct tlv *exp_tlv,
+        const struct tlv *rem_tlv,
+        const struct tlv *add_tlv,
+        const struct tlv *sdatl_tlv
+        ) {
+    return emv_pki_decode_key_ex(enc_pk, msgtype, pan_tlv, cert_tlv, exp_tlv, rem_tlv, add_tlv, sdatl_tlv, false);
 }
 
 struct emv_pk *emv_pki_recover_issuer_cert(const struct emv_pk *pk, struct tlvdb *db)
 {
-	return emv_pki_decode_key(pk, 2,
-			tlvdb_get(db, 0x5a, NULL),
-			tlvdb_get(db, 0x90, NULL),
-			tlvdb_get(db, 0x9f32, NULL),
-			tlvdb_get(db, 0x92, NULL),
-			NULL,
-			NULL);
+    return emv_pki_decode_key(pk, 2,
+            tlvdb_get(db, 0x5a, NULL),
+            tlvdb_get(db, 0x90, NULL),
+            tlvdb_get(db, 0x9f32, NULL),
+            tlvdb_get(db, 0x92, NULL),
+            NULL,
+            NULL);
 }
 
 struct emv_pk *emv_pki_recover_icc_cert(const struct emv_pk *pk, struct tlvdb *db, const struct tlv *sda_tlv)
 {
-	size_t sdatl_len;
-	unsigned char *sdatl = emv_pki_sdatl_fill(db, &sdatl_len);
-	struct tlv sda_tdata = {
-		.tag = 0x00,        // dummy tag
-		.len = sdatl_len,
-		.value = sdatl
-	};
+    size_t sdatl_len;
+    unsigned char *sdatl = emv_pki_sdatl_fill(db, &sdatl_len);
+    struct tlv sda_tdata = {
+        .tag = 0x00,        // dummy tag
+        .len = sdatl_len,
+        .value = sdatl
+    };
 
-	struct emv_pk *res = emv_pki_decode_key(pk, 4,
-			tlvdb_get(db, 0x5a, NULL),
-			tlvdb_get(db, 0x9f46, NULL),
-			tlvdb_get(db, 0x9f47, NULL),
-			tlvdb_get(db, 0x9f48, NULL),
-			sda_tlv,
-			&sda_tdata);
+    struct emv_pk *res = emv_pki_decode_key(pk, 4,
+            tlvdb_get(db, 0x5a, NULL),
+            tlvdb_get(db, 0x9f46, NULL),
+            tlvdb_get(db, 0x9f47, NULL),
+            tlvdb_get(db, 0x9f48, NULL),
+            sda_tlv,
+            &sda_tdata);
 
-	free(sdatl); // malloc here: emv_pki_sdatl_fill
-	return res;
+    free(sdatl); // malloc here: emv_pki_sdatl_fill
+    return res;
 }
 
 struct emv_pk *emv_pki_recover_icc_pe_cert(const struct emv_pk *pk, struct tlvdb *db)
 {
-	return emv_pki_decode_key(pk, 4,
-			tlvdb_get(db, 0x5a, NULL),
-			tlvdb_get(db, 0x9f2d, NULL),
-			tlvdb_get(db, 0x9f2e, NULL),
-			tlvdb_get(db, 0x9f2f, NULL),
-			NULL,
-			NULL);
+    return emv_pki_decode_key(pk, 4,
+            tlvdb_get(db, 0x5a, NULL),
+            tlvdb_get(db, 0x9f2d, NULL),
+            tlvdb_get(db, 0x9f2e, NULL),
+            tlvdb_get(db, 0x9f2f, NULL),
+            NULL,
+            NULL);
 }
 
 unsigned char *emv_pki_sdatl_fill(const struct tlvdb *db, size_t *sdatl_len) {
-	uint8_t buf[2048] = {0};
-	size_t len = 0;
+    uint8_t buf[2048] = {0};
+    size_t len = 0;
 
-	*sdatl_len = 0;
+    *sdatl_len = 0;
 
-	const struct tlv *sda_tl = tlvdb_get(db, 0x9f4a, NULL);
-	if (!sda_tl || sda_tl->len <= 0)
-		return NULL;
+    const struct tlv *sda_tl = tlvdb_get(db, 0x9f4a, NULL);
+    if (!sda_tl || sda_tl->len <= 0)
+        return NULL;
 
-	for (int i = 0; i < sda_tl->len; i++) {
-		uint32_t tag = sda_tl->value[i]; // here may be multibyte, but now not
-		const struct tlv *elm = tlvdb_get(db, tag, NULL);
-		if (elm) {
-			memcpy(&buf[len], elm->value, elm->len);
-			len += elm->len;
-		}
-	}
+    for (int i = 0; i < sda_tl->len; i++) {
+        uint32_t tag = sda_tl->value[i]; // here may be multibyte, but now not
+        const struct tlv *elm = tlvdb_get(db, tag, NULL);
+        if (elm) {
+            memcpy(&buf[len], elm->value, elm->len);
+            len += elm->len;
+        }
+    }
 
-	if (len) {
-		*sdatl_len = len;
-		unsigned char *value = malloc(len);
-		memcpy(value, buf, len);
-		return value;
-	}
+    if (len) {
+        *sdatl_len = len;
+        unsigned char *value = malloc(len);
+        memcpy(value, buf, len);
+        return value;
+    }
 
-	return NULL;
+    return NULL;
 }
 
 
 struct tlvdb *emv_pki_recover_dac_ex(const struct emv_pk *enc_pk, const struct tlvdb *db, const struct tlv *sda_tlv, bool showData)
 {
-	size_t data_len;
+    size_t data_len;
 
-	// Static Data Authentication Tag List
-	size_t sdatl_len;
-	unsigned char *sdatl = emv_pki_sdatl_fill(db, &sdatl_len);
-	struct tlv sda_tdata = {
-		.tag = 0x00,        // dummy tag
-		.len = sdatl_len,
-		.value = sdatl
-	};
+    // Static Data Authentication Tag List
+    size_t sdatl_len;
+    unsigned char *sdatl = emv_pki_sdatl_fill(db, &sdatl_len);
+    struct tlv sda_tdata = {
+        .tag = 0x00,        // dummy tag
+        .len = sdatl_len,
+        .value = sdatl
+    };
 
-	unsigned char *data = emv_pki_decode_message(enc_pk, 3, &data_len,
-			tlvdb_get(db, 0x93, NULL),
-			3,
-			sda_tlv,
-			&sda_tdata,
-			NULL);
+    unsigned char *data = emv_pki_decode_message(enc_pk, 3, &data_len,
+            tlvdb_get(db, 0x93, NULL),
+            3,
+            sda_tlv,
+            &sda_tdata,
+            NULL);
 
-	free(sdatl); // malloc here: emv_pki_sdatl_fill
+    free(sdatl); // malloc here: emv_pki_sdatl_fill
 
-	if (!data || data_len < 5)
-		return NULL;
+    if (!data || data_len < 5)
+        return NULL;
 
-	if (showData){
-		printf("Recovered data:\n");
-		dump_buffer(data, data_len, stdout, 0);
-	}
+    if (showData){
+        printf("Recovered data:\n");
+        dump_buffer(data, data_len, stdout, 0);
+    }
 
-	struct tlvdb *dac_db = tlvdb_fixed(0x9f45, 2, data+3);
+    struct tlvdb *dac_db = tlvdb_fixed(0x9f45, 2, data+3);
 
-	free(data);
+    free(data);
 
-	return dac_db;
+    return dac_db;
 }
 struct tlvdb *emv_pki_recover_dac(const struct emv_pk *enc_pk, const struct tlvdb *db, const struct tlv *sda_tlv) {
-	return emv_pki_recover_dac_ex(enc_pk, db, sda_tlv, false);
+    return emv_pki_recover_dac_ex(enc_pk, db, sda_tlv, false);
 }
 
 struct tlvdb *emv_pki_recover_idn(const struct emv_pk *enc_pk, const struct tlvdb *db, const struct tlv *dyn_tlv) {
-	return emv_pki_recover_idn_ex(enc_pk, db, dyn_tlv, false);
+    return emv_pki_recover_idn_ex(enc_pk, db, dyn_tlv, false);
 }
 
 struct tlvdb *emv_pki_recover_idn_ex(const struct emv_pk *enc_pk, const struct tlvdb *db, const struct tlv *dyn_tlv, bool showData)
 {
-	size_t data_len;
-	unsigned char *data = emv_pki_decode_message(enc_pk, 5, &data_len,
-			tlvdb_get(db, 0x9f4b, NULL),
-			2,
-			dyn_tlv,
-			NULL);
+    size_t data_len;
+    unsigned char *data = emv_pki_decode_message(enc_pk, 5, &data_len,
+            tlvdb_get(db, 0x9f4b, NULL),
+            2,
+            dyn_tlv,
+            NULL);
 
-	if (!data || data_len < 3)
-		return NULL;
+    if (!data || data_len < 3)
+        return NULL;
 
-	if (data[3] < 2 || data[3] > data_len - 3) {
-		free(data);
-		return NULL;
-	}
+    if (data[3] < 2 || data[3] > data_len - 3) {
+        free(data);
+        return NULL;
+    }
 
-	if (showData){
-		printf("Recovered data:\n");
-		dump_buffer(data, data_len, stdout, 0);
-	}
+    if (showData){
+        printf("Recovered data:\n");
+        dump_buffer(data, data_len, stdout, 0);
+    }
 
-	size_t idn_len = data[4];
-	if (idn_len > data[3] - 1) {
-		free(data);
-		return NULL;
-	}
+    size_t idn_len = data[4];
+    if (idn_len > data[3] - 1) {
+        free(data);
+        return NULL;
+    }
 
-	// 9f4c ICC Dynamic Number
-	struct tlvdb *idn_db = tlvdb_fixed(0x9f4c, idn_len, data + 5);
+    // 9f4c ICC Dynamic Number
+    struct tlvdb *idn_db = tlvdb_fixed(0x9f4c, idn_len, data + 5);
 
-	free(data);
+    free(data);
 
-	return idn_db;
+    return idn_db;
 }
 
 struct tlvdb *emv_pki_recover_atc_ex(const struct emv_pk *enc_pk, const struct tlvdb *db, bool showData)
 {
-	size_t data_len;
-	unsigned char *data = emv_pki_decode_message(enc_pk, 5, &data_len,
-			tlvdb_get(db, 0x9f4b, NULL),
-			5,
-			tlvdb_get(db, 0x9f37, NULL),
-			tlvdb_get(db, 0x9f02, NULL),
-			tlvdb_get(db, 0x5f2a, NULL),
-			tlvdb_get(db, 0x9f69, NULL),
-			NULL);
+    size_t data_len;
+    unsigned char *data = emv_pki_decode_message(enc_pk, 5, &data_len,
+            tlvdb_get(db, 0x9f4b, NULL),
+            5,
+            tlvdb_get(db, 0x9f37, NULL),
+            tlvdb_get(db, 0x9f02, NULL),
+            tlvdb_get(db, 0x5f2a, NULL),
+            tlvdb_get(db, 0x9f69, NULL),
+            NULL);
 
-	if (!data || data_len < 3)
-		return NULL;
+    if (!data || data_len < 3)
+        return NULL;
 
-	if (data[3] < 2 || data[3] > data_len - 3) {
-		free(data);
-		return NULL;
-	}
+    if (data[3] < 2 || data[3] > data_len - 3) {
+        free(data);
+        return NULL;
+    }
 
-	if (showData){
-		printf("Recovered data:\n");
-		dump_buffer(data, data_len, stdout, 0);
-	}
+    if (showData){
+        printf("Recovered data:\n");
+        dump_buffer(data, data_len, stdout, 0);
+    }
 
-	size_t idn_len = data[4];
-	if (idn_len > data[3] - 1) {
-		free(data);
-		return NULL;
-	}
+    size_t idn_len = data[4];
+    if (idn_len > data[3] - 1) {
+        free(data);
+        return NULL;
+    }
 
-	// 9f36 Application Transaction Counter (ATC)
-	struct tlvdb *atc_db = tlvdb_fixed(0x9f36, idn_len, data + 5);
+    // 9f36 Application Transaction Counter (ATC)
+    struct tlvdb *atc_db = tlvdb_fixed(0x9f36, idn_len, data + 5);
 
-	free(data);
+    free(data);
 
-	return atc_db;
+    return atc_db;
 }
 
 static bool tlv_hash(void *data, const struct tlv *tlv, int level, bool is_leaf)
 {
-	struct crypto_hash *ch = data;
-	size_t tag_len;
-	unsigned char *tag;
+    struct crypto_hash *ch = data;
+    size_t tag_len;
+    unsigned char *tag;
 
-	if (tlv_is_constructed(tlv))
-		return true;
+    if (tlv_is_constructed(tlv))
+        return true;
 
-	if (tlv->tag == 0x9f4b)
-		return true;
+    if (tlv->tag == 0x9f4b)
+        return true;
 
-	tag = tlv_encode(tlv, &tag_len);
-	crypto_hash_write(ch, tag, tag_len);
-	free(tag);
+    tag = tlv_encode(tlv, &tag_len);
+    crypto_hash_write(ch, tag, tag_len);
+    free(tag);
 
-	return true;
+    return true;
 }
 
 struct tlvdb *emv_pki_perform_cda(const struct emv_pk *enc_pk, const struct tlvdb *db,
-		const struct tlvdb *this_db,
-		const struct tlv *pdol_data_tlv,
-		const struct tlv *crm1_tlv,
-		const struct tlv *crm2_tlv)
+        const struct tlvdb *this_db,
+        const struct tlv *pdol_data_tlv,
+        const struct tlv *crm1_tlv,
+        const struct tlv *crm2_tlv)
 {
-	return emv_pki_perform_cda_ex(enc_pk, db, this_db, pdol_data_tlv, crm1_tlv, crm2_tlv, false);
+    return emv_pki_perform_cda_ex(enc_pk, db, this_db, pdol_data_tlv, crm1_tlv, crm2_tlv, false);
 }
 struct tlvdb *emv_pki_perform_cda_ex(const struct emv_pk *enc_pk, const struct tlvdb *db,
-		const struct tlvdb *this_db,     // AC TLV result
-		const struct tlv *pdol_data_tlv, // PDOL
-		const struct tlv *crm1_tlv,      // CDOL1
-		const struct tlv *crm2_tlv,      // CDOL2
-		bool showData)
+        const struct tlvdb *this_db,     // AC TLV result
+        const struct tlv *pdol_data_tlv, // PDOL
+        const struct tlv *crm1_tlv,      // CDOL1
+        const struct tlv *crm2_tlv,      // CDOL2
+        bool showData)
 {
-	const struct tlv *un_tlv = tlvdb_get(db, 0x9f37, NULL);
-	const struct tlv *cid_tlv = tlvdb_get(this_db, 0x9f27, NULL);
+    const struct tlv *un_tlv = tlvdb_get(db, 0x9f37, NULL);
+    const struct tlv *cid_tlv = tlvdb_get(this_db, 0x9f27, NULL);
 
-	if (!un_tlv || !cid_tlv)
-		return NULL;
+    if (!un_tlv || !cid_tlv)
+        return NULL;
 
-	size_t data_len = 0;
-	unsigned char *data = emv_pki_decode_message(enc_pk, 5, &data_len,
-			tlvdb_get(this_db, 0x9f4b, NULL),
-			2,
-			un_tlv,
-			NULL);
-	if (!data || data_len < 3) {
-		printf("ERROR: can't decode message. len %zu\n", data_len);
-		return NULL;
-	}
+    size_t data_len = 0;
+    unsigned char *data = emv_pki_decode_message(enc_pk, 5, &data_len,
+            tlvdb_get(this_db, 0x9f4b, NULL),
+            2,
+            un_tlv,
+            NULL);
+    if (!data || data_len < 3) {
+        printf("ERROR: can't decode message. len %zu\n", data_len);
+        return NULL;
+    }
 
-	if (showData){
-		printf("Recovered data:\n");
-		dump_buffer(data, data_len, stdout, 0);
-	}
+    if (showData){
+        printf("Recovered data:\n");
+        dump_buffer(data, data_len, stdout, 0);
+    }
 
-	if (data[3] < 30 || data[3] > data_len - 4) {
-		printf("ERROR: Invalid data length\n");
-		free(data);
-		return NULL;
-	}
+    if (data[3] < 30 || data[3] > data_len - 4) {
+        printf("ERROR: Invalid data length\n");
+        free(data);
+        return NULL;
+    }
 
-	if (!cid_tlv || cid_tlv->len != 1 || cid_tlv->value[0] != data[5 + data[4]]) {
-		printf("ERROR: CID mismatch\n");
-		free(data);
-		return NULL;
-	}
+    if (!cid_tlv || cid_tlv->len != 1 || cid_tlv->value[0] != data[5 + data[4]]) {
+        printf("ERROR: CID mismatch\n");
+        free(data);
+        return NULL;
+    }
 
-	struct crypto_hash *ch;
-	ch = crypto_hash_open(enc_pk->hash_algo);
-	if (!ch) {
-		printf("ERROR: can't create hash\n");
-		free(data);
-		return NULL;
-	}
+    struct crypto_hash *ch;
+    ch = crypto_hash_open(enc_pk->hash_algo);
+    if (!ch) {
+        printf("ERROR: can't create hash\n");
+        free(data);
+        return NULL;
+    }
 
-	if (pdol_data_tlv)
-		crypto_hash_write(ch, pdol_data_tlv->value, pdol_data_tlv->len);
-	if (crm1_tlv)
-		crypto_hash_write(ch, crm1_tlv->value, crm1_tlv->len);
-	if (crm2_tlv)
-		crypto_hash_write(ch, crm2_tlv->value, crm2_tlv->len);
+    if (pdol_data_tlv)
+        crypto_hash_write(ch, pdol_data_tlv->value, pdol_data_tlv->len);
+    if (crm1_tlv)
+        crypto_hash_write(ch, crm1_tlv->value, crm1_tlv->len);
+    if (crm2_tlv)
+        crypto_hash_write(ch, crm2_tlv->value, crm2_tlv->len);
 
-	tlvdb_visit(this_db, tlv_hash, ch, 0);
+    tlvdb_visit(this_db, tlv_hash, ch, 0);
 
-	if (memcmp(data + 5 + data[4] + 1 + 8, crypto_hash_read(ch), 20)) {
-		printf("ERROR: calculated hash error\n");
-		crypto_hash_close(ch);
-		free(data);
-		return NULL;
-	}
-	crypto_hash_close(ch);
+    if (memcmp(data + 5 + data[4] + 1 + 8, crypto_hash_read(ch), 20)) {
+        printf("ERROR: calculated hash error\n");
+        crypto_hash_close(ch);
+        free(data);
+        return NULL;
+    }
+    crypto_hash_close(ch);
 
-	size_t idn_len = data[4];
-	if (idn_len > data[3] - 1) {
-		printf("ERROR: Invalid IDN length\n");
-		free(data);
-		return NULL;
-	}
+    size_t idn_len = data[4];
+    if (idn_len > data[3] - 1) {
+        printf("ERROR: Invalid IDN length\n");
+        free(data);
+        return NULL;
+    }
 
-	struct tlvdb *idn_db = tlvdb_fixed(0x9f4c, idn_len, data + 5);
-	free(data);
+    struct tlvdb *idn_db = tlvdb_fixed(0x9f4c, idn_len, data + 5);
+    free(data);
 
-	return idn_db;
+    return idn_db;
 }
diff --git a/client/emv/emv_pki.h b/client/emv/emv_pki.h
index f5d80bd6d..df7fe9d50 100644
--- a/client/emv/emv_pki.h
+++ b/client/emv/emv_pki.h
@@ -34,15 +34,15 @@ struct tlvdb *emv_pki_recover_idn(const struct emv_pk *pk, const struct tlvdb *d
 struct tlvdb *emv_pki_recover_idn_ex(const struct emv_pk *pk, const struct tlvdb *db, const struct tlv *dyn_tlv, bool showData);
 struct tlvdb *emv_pki_recover_atc_ex(const struct emv_pk *enc_pk, const struct tlvdb *db, bool showData);
 struct tlvdb *emv_pki_perform_cda(const struct emv_pk *enc_pk, const struct tlvdb *db,
-		const struct tlvdb *this_db,
-		const struct tlv *pdol_data_tlv,
-		const struct tlv *crm1_tlv,
-		const struct tlv *crm2_tlv);
+        const struct tlvdb *this_db,
+        const struct tlv *pdol_data_tlv,
+        const struct tlv *crm1_tlv,
+        const struct tlv *crm2_tlv);
 struct tlvdb *emv_pki_perform_cda_ex(const struct emv_pk *enc_pk, const struct tlvdb *db,
-		const struct tlvdb *this_db,
-		const struct tlv *pdol_data_tlv,
-		const struct tlv *crm1_tlv,
-		const struct tlv *crm2_tlv,
-		bool showData);
+        const struct tlvdb *this_db,
+        const struct tlv *pdol_data_tlv,
+        const struct tlv *crm1_tlv,
+        const struct tlv *crm2_tlv,
+        bool showData);
 
 #endif
diff --git a/client/emv/emv_pki_priv.c b/client/emv/emv_pki_priv.c
index d67a87057..ec78f508a 100644
--- a/client/emv/emv_pki_priv.c
+++ b/client/emv/emv_pki_priv.c
@@ -25,259 +25,259 @@
 #include <stdarg.h>
 
 struct emv_pk *emv_pki_make_ca(const struct crypto_pk *cp,
-		const unsigned char *rid, unsigned char index,
-		unsigned int expire, enum crypto_algo_hash hash_algo)
+        const unsigned char *rid, unsigned char index,
+        unsigned int expire, enum crypto_algo_hash hash_algo)
 {
-	size_t modlen, explen;
-	unsigned char *mod, *exp;
+    size_t modlen, explen;
+    unsigned char *mod, *exp;
 
-	if (!rid)
-		return NULL;
+    if (!rid)
+        return NULL;
 
-	mod = crypto_pk_get_parameter(cp, 0, &modlen);
-	exp = crypto_pk_get_parameter(cp, 1, &explen);
+    mod = crypto_pk_get_parameter(cp, 0, &modlen);
+    exp = crypto_pk_get_parameter(cp, 1, &explen);
 
-	if (!mod || !modlen || !exp || !explen) {
-		free(mod);
-		free(exp);
+    if (!mod || !modlen || !exp || !explen) {
+        free(mod);
+        free(exp);
 
-		return NULL;
-	}
+        return NULL;
+    }
 
-	struct emv_pk *pk = emv_pk_new(modlen, explen);
-	memcpy(pk->rid, rid, 5);
-	pk->index = index;
-	pk->expire = expire;
-	pk->pk_algo = crypto_pk_get_algo(cp);
-	pk->hash_algo = hash_algo;
-	memcpy(pk->modulus, mod, modlen);
-	memcpy(pk->exp, exp, explen);
+    struct emv_pk *pk = emv_pk_new(modlen, explen);
+    memcpy(pk->rid, rid, 5);
+    pk->index = index;
+    pk->expire = expire;
+    pk->pk_algo = crypto_pk_get_algo(cp);
+    pk->hash_algo = hash_algo;
+    memcpy(pk->modulus, mod, modlen);
+    memcpy(pk->exp, exp, explen);
 
-	free(mod);
-	free(exp);
+    free(mod);
+    free(exp);
 
-	struct crypto_hash *ch = crypto_hash_open(pk->hash_algo);
-	if (!ch) {
-		emv_pk_free(pk);
-		return false;
-	}
+    struct crypto_hash *ch = crypto_hash_open(pk->hash_algo);
+    if (!ch) {
+        emv_pk_free(pk);
+        return false;
+    }
 
-	crypto_hash_write(ch, pk->rid, sizeof(pk->rid));
-	crypto_hash_write(ch, &pk->index, 1);
-	crypto_hash_write(ch, pk->modulus, pk->mlen);
-	crypto_hash_write(ch, pk->exp, pk->elen);
+    crypto_hash_write(ch, pk->rid, sizeof(pk->rid));
+    crypto_hash_write(ch, &pk->index, 1);
+    crypto_hash_write(ch, pk->modulus, pk->mlen);
+    crypto_hash_write(ch, pk->exp, pk->elen);
 
-	unsigned char *h = crypto_hash_read(ch);
-	if (!h) {
-		crypto_hash_close(ch);
-		emv_pk_free(pk);
+    unsigned char *h = crypto_hash_read(ch);
+    if (!h) {
+        crypto_hash_close(ch);
+        emv_pk_free(pk);
 
-		return NULL;
-	}
+        return NULL;
+    }
 
-	memcpy(pk->hash, h, crypto_hash_get_size(ch));
-	crypto_hash_close(ch);
+    memcpy(pk->hash, h, crypto_hash_get_size(ch));
+    crypto_hash_close(ch);
 
-	return pk;
+    return pk;
 }
 
 static struct tlvdb *emv_pki_sign_message(const struct crypto_pk *cp,
-		tlv_tag_t cert_tag, tlv_tag_t rem_tag,
-		const unsigned char *msg, size_t msg_len,
-		... /* A list of tlv pointers, end with NULL */
-		)
+        tlv_tag_t cert_tag, tlv_tag_t rem_tag,
+        const unsigned char *msg, size_t msg_len,
+        ... /* A list of tlv pointers, end with NULL */
+        )
 {
-	size_t tmp_len = (crypto_pk_get_nbits(cp) + 7) / 8;
-	unsigned char *tmp = malloc(tmp_len);
-	if (!tmp)
-		return NULL;
+    size_t tmp_len = (crypto_pk_get_nbits(cp) + 7) / 8;
+    unsigned char *tmp = malloc(tmp_len);
+    if (!tmp)
+        return NULL;
 
-	// XXX
-	struct crypto_hash *ch = crypto_hash_open(HASH_SHA_1);
-	if (!ch) {
-		free(tmp);
+    // XXX
+    struct crypto_hash *ch = crypto_hash_open(HASH_SHA_1);
+    if (!ch) {
+        free(tmp);
 
-		return NULL;
-	}
+        return NULL;
+    }
 
-	tmp[0] = 0x6a;
-	tmp[tmp_len - 1] = 0xbc;
+    tmp[0] = 0x6a;
+    tmp[tmp_len - 1] = 0xbc;
 
-	const unsigned char *rem;
-	size_t rem_len;
-	size_t hash_len = crypto_hash_get_size(ch);
-	size_t part_len = tmp_len - 2 - hash_len;
-	if (part_len < msg_len) {
-		memcpy(tmp + 1, msg, part_len);
-		rem = msg + part_len;
-		rem_len = msg_len - part_len;
-	} else {
-		memcpy(tmp + 1, msg, msg_len);
-		memset(tmp + 1 + msg_len, 0xbb, part_len - msg_len);
-		rem = NULL;
-		rem_len = 0;
-	}
-	crypto_hash_write(ch, tmp + 1, part_len);
-	crypto_hash_write(ch, rem, rem_len);
+    const unsigned char *rem;
+    size_t rem_len;
+    size_t hash_len = crypto_hash_get_size(ch);
+    size_t part_len = tmp_len - 2 - hash_len;
+    if (part_len < msg_len) {
+        memcpy(tmp + 1, msg, part_len);
+        rem = msg + part_len;
+        rem_len = msg_len - part_len;
+    } else {
+        memcpy(tmp + 1, msg, msg_len);
+        memset(tmp + 1 + msg_len, 0xbb, part_len - msg_len);
+        rem = NULL;
+        rem_len = 0;
+    }
+    crypto_hash_write(ch, tmp + 1, part_len);
+    crypto_hash_write(ch, rem, rem_len);
 
-	va_list vl;
-	va_start(vl, msg_len);
-	while (true) {
-		const struct tlv *add_tlv = va_arg(vl, const struct tlv *);
-		if (!add_tlv)
-			break;
+    va_list vl;
+    va_start(vl, msg_len);
+    while (true) {
+        const struct tlv *add_tlv = va_arg(vl, const struct tlv *);
+        if (!add_tlv)
+            break;
 
-		crypto_hash_write(ch, add_tlv->value, add_tlv->len);
-	}
-	va_end(vl);
+        crypto_hash_write(ch, add_tlv->value, add_tlv->len);
+    }
+    va_end(vl);
 
-	unsigned char *h = crypto_hash_read(ch);
-	if (!h) {
-		crypto_hash_close(ch);
-		free(tmp);
+    unsigned char *h = crypto_hash_read(ch);
+    if (!h) {
+        crypto_hash_close(ch);
+        free(tmp);
 
-		return NULL;
-	}
+        return NULL;
+    }
 
-	memcpy(tmp + 1 + part_len, h, hash_len);
-	crypto_hash_close(ch);
+    memcpy(tmp + 1 + part_len, h, hash_len);
+    crypto_hash_close(ch);
 
-	size_t cert_len;
-	unsigned char *cert = crypto_pk_decrypt(cp, tmp, tmp_len, &cert_len);
-	free(tmp);
+    size_t cert_len;
+    unsigned char *cert = crypto_pk_decrypt(cp, tmp, tmp_len, &cert_len);
+    free(tmp);
 
-	if (!cert)
-		return NULL;
+    if (!cert)
+        return NULL;
 
-	struct tlvdb *db = tlvdb_fixed(cert_tag, cert_len, cert);
-	free(cert);
-	if (!db)
-		return NULL;
+    struct tlvdb *db = tlvdb_fixed(cert_tag, cert_len, cert);
+    free(cert);
+    if (!db)
+        return NULL;
 
-	if (rem) {
-		struct tlvdb *rdb = tlvdb_fixed(rem_tag, rem_len, rem);
-		if (!rdb) {
-			tlvdb_free(db);
+    if (rem) {
+        struct tlvdb *rdb = tlvdb_fixed(rem_tag, rem_len, rem);
+        if (!rdb) {
+            tlvdb_free(db);
 
-			return NULL;
-		}
-		tlvdb_add(db, rdb);
-	}
+            return NULL;
+        }
+        tlvdb_add(db, rdb);
+    }
 
-	return db;
+    return db;
 }
 
 static struct tlvdb *emv_pki_sign_key(const struct crypto_pk *cp,
-		struct emv_pk *ipk,
-		unsigned char msgtype,
-		size_t pan_len,
-		tlv_tag_t cert_tag,
-		tlv_tag_t exp_tag,
-		tlv_tag_t rem_tag,
-		const struct tlv *add_tlv
-		)
+        struct emv_pk *ipk,
+        unsigned char msgtype,
+        size_t pan_len,
+        tlv_tag_t cert_tag,
+        tlv_tag_t exp_tag,
+        tlv_tag_t rem_tag,
+        const struct tlv *add_tlv
+        )
 {
-	unsigned pos = 0;
-	unsigned char *msg = malloc(1 + pan_len + 2 + 3 + 1 + 1 + 1 + 1 + ipk->mlen);
+    unsigned pos = 0;
+    unsigned char *msg = malloc(1 + pan_len + 2 + 3 + 1 + 1 + 1 + 1 + ipk->mlen);
 
-	if (!msg)
-		return NULL;
+    if (!msg)
+        return NULL;
 
-	msg[pos++] = msgtype;
-	memcpy(msg + pos, ipk->pan, pan_len); pos += pan_len;
-	msg[pos++] = (ipk->expire >> 8) & 0xff;
-	msg[pos++] = (ipk->expire >> 16) & 0xff;
-	memcpy(msg + pos, ipk->serial, 3); pos += 3;
-	msg[pos++] = ipk->hash_algo;
-	msg[pos++] = ipk->pk_algo;
-	msg[pos++] = ipk->mlen;
-	msg[pos++] = ipk->elen;
-	memcpy(msg + pos, ipk->modulus, ipk->mlen);
-	pos += ipk->mlen;
+    msg[pos++] = msgtype;
+    memcpy(msg + pos, ipk->pan, pan_len); pos += pan_len;
+    msg[pos++] = (ipk->expire >> 8) & 0xff;
+    msg[pos++] = (ipk->expire >> 16) & 0xff;
+    memcpy(msg + pos, ipk->serial, 3); pos += 3;
+    msg[pos++] = ipk->hash_algo;
+    msg[pos++] = ipk->pk_algo;
+    msg[pos++] = ipk->mlen;
+    msg[pos++] = ipk->elen;
+    memcpy(msg + pos, ipk->modulus, ipk->mlen);
+    pos += ipk->mlen;
 
-	struct tlvdb *exp_db = tlvdb_fixed(exp_tag, ipk->elen, ipk->exp);
-	if (!exp_db) {
-		free(msg);
+    struct tlvdb *exp_db = tlvdb_fixed(exp_tag, ipk->elen, ipk->exp);
+    if (!exp_db) {
+        free(msg);
 
-		return NULL;
-	}
+        return NULL;
+    }
 
-	struct tlvdb *db = emv_pki_sign_message(cp,
-			cert_tag, rem_tag,
-			msg, pos,
-			tlvdb_get(exp_db, exp_tag, NULL),
-			add_tlv,
-			NULL);
-	free(msg);
-	if (!db)
-		return NULL;
+    struct tlvdb *db = emv_pki_sign_message(cp,
+            cert_tag, rem_tag,
+            msg, pos,
+            tlvdb_get(exp_db, exp_tag, NULL),
+            add_tlv,
+            NULL);
+    free(msg);
+    if (!db)
+        return NULL;
 
-	tlvdb_add(db, exp_db);
+    tlvdb_add(db, exp_db);
 
-	return db;
+    return db;
 }
 
 struct tlvdb *emv_pki_sign_issuer_cert(const struct crypto_pk *cp, struct emv_pk *issuer_pk)
 {
-	return emv_pki_sign_key(cp, issuer_pk, 2, 4, 0x90, 0x9f32, 0x92, NULL);
+    return emv_pki_sign_key(cp, issuer_pk, 2, 4, 0x90, 0x9f32, 0x92, NULL);
 }
 
 struct tlvdb *emv_pki_sign_icc_cert(const struct crypto_pk *cp, struct emv_pk *icc_pk, const struct tlv *sda_tlv)
 {
-	return emv_pki_sign_key(cp, icc_pk, 4, 10, 0x9f46, 0x9f47, 0x9f48, sda_tlv);
+    return emv_pki_sign_key(cp, icc_pk, 4, 10, 0x9f46, 0x9f47, 0x9f48, sda_tlv);
 }
 
 struct tlvdb *emv_pki_sign_icc_pe_cert(const struct crypto_pk *cp, struct emv_pk *icc_pe_pk)
 {
-	return emv_pki_sign_key(cp, icc_pe_pk, 4, 10, 0x9f2d, 0x9f2e, 0x9f2f, NULL);
+    return emv_pki_sign_key(cp, icc_pe_pk, 4, 10, 0x9f2d, 0x9f2e, 0x9f2f, NULL);
 }
 
 struct tlvdb *emv_pki_sign_dac(const struct crypto_pk *cp, const struct tlv *dac_tlv, const struct tlv *sda_tlv)
 {
-	unsigned pos = 0;
-	unsigned char *msg = malloc(1+1+dac_tlv->len);
+    unsigned pos = 0;
+    unsigned char *msg = malloc(1+1+dac_tlv->len);
 
-	if (!msg)
-		return NULL;
+    if (!msg)
+        return NULL;
 
-	msg[pos++] = 3;
-	msg[pos++] = HASH_SHA_1;
-	memcpy(msg+pos, dac_tlv->value, dac_tlv->len);
-	pos += dac_tlv->len;
+    msg[pos++] = 3;
+    msg[pos++] = HASH_SHA_1;
+    memcpy(msg+pos, dac_tlv->value, dac_tlv->len);
+    pos += dac_tlv->len;
 
-	struct tlvdb *db = emv_pki_sign_message(cp,
-			0x93, 0,
-			msg, pos,
-			sda_tlv,
-			NULL);
+    struct tlvdb *db = emv_pki_sign_message(cp,
+            0x93, 0,
+            msg, pos,
+            sda_tlv,
+            NULL);
 
-	free(msg);
+    free(msg);
 
-	return db;
+    return db;
 }
 
 struct tlvdb *emv_pki_sign_idn(const struct crypto_pk *cp, const struct tlv *idn_tlv, const struct tlv *dyn_tlv)
 {
-	unsigned pos = 0;
-	unsigned char *msg = malloc(1+1+1+1+idn_tlv->len);
+    unsigned pos = 0;
+    unsigned char *msg = malloc(1+1+1+1+idn_tlv->len);
 
-	if (!msg)
-		return NULL;
+    if (!msg)
+        return NULL;
 
-	msg[pos++] = 5;
-	msg[pos++] = HASH_SHA_1;
-	msg[pos++] = idn_tlv->len + 1;
-	msg[pos++] = idn_tlv->len;
-	memcpy(msg+pos, idn_tlv->value, idn_tlv->len);
-	pos += idn_tlv->len;
+    msg[pos++] = 5;
+    msg[pos++] = HASH_SHA_1;
+    msg[pos++] = idn_tlv->len + 1;
+    msg[pos++] = idn_tlv->len;
+    memcpy(msg+pos, idn_tlv->value, idn_tlv->len);
+    pos += idn_tlv->len;
 
-	struct tlvdb *db = emv_pki_sign_message(cp,
-			0x9f4b, 0,
-			msg, pos,
-			dyn_tlv,
-			NULL);
+    struct tlvdb *db = emv_pki_sign_message(cp,
+            0x9f4b, 0,
+            msg, pos,
+            dyn_tlv,
+            NULL);
 
-	free(msg);
+    free(msg);
 
-	return db;
+    return db;
 }
diff --git a/client/emv/emv_pki_priv.h b/client/emv/emv_pki_priv.h
index 4f1639d5c..edb361947 100644
--- a/client/emv/emv_pki_priv.h
+++ b/client/emv/emv_pki_priv.h
@@ -23,8 +23,8 @@
 #include <stddef.h>
 
 struct emv_pk *emv_pki_make_ca(const struct crypto_pk *cp,
-		const unsigned char *rid, unsigned char index,
-		unsigned int expire, enum crypto_algo_hash hash_algo);
+        const unsigned char *rid, unsigned char index,
+        unsigned int expire, enum crypto_algo_hash hash_algo);
 struct tlvdb *emv_pki_sign_issuer_cert(const struct crypto_pk *cp, struct emv_pk *issuer_pk);
 struct tlvdb *emv_pki_sign_icc_cert(const struct crypto_pk *cp, struct emv_pk *icc_pk, const struct tlv *sda_tlv);
 struct tlvdb *emv_pki_sign_icc_pe_cert(const struct crypto_pk *cp, struct emv_pk *icc_pe_pk);
diff --git a/client/emv/emv_roca.c b/client/emv/emv_roca.c
index f98117450..7f58f3906 100644
--- a/client/emv/emv_roca.c
+++ b/client/emv/emv_roca.c
@@ -24,152 +24,152 @@
 #include "emv_roca.h"
 
 static uint8_t g_primes[ROCA_PRINTS_LENGTH] = {
-	11, 13, 17, 19, 37, 53, 61, 71, 73, 79, 97, 103, 107, 109, 127, 151, 157
+    11, 13, 17, 19, 37, 53, 61, 71, 73, 79, 97, 103, 107, 109, 127, 151, 157
 };
 
 mbedtls_mpi g_prints[ROCA_PRINTS_LENGTH];
 
 void rocacheck_init(void) {
 
-	for (int i = 0; i < ROCA_PRINTS_LENGTH; i++)
-		mbedtls_mpi_init(&g_prints[i]);
+    for (int i = 0; i < ROCA_PRINTS_LENGTH; i++)
+        mbedtls_mpi_init(&g_prints[i]);
 
-	mbedtls_mpi_read_string(&g_prints[0], 10, "1026");
-	mbedtls_mpi_read_string(&g_prints[1], 10, "5658");
-	mbedtls_mpi_read_string(&g_prints[2], 10, "107286");
-	mbedtls_mpi_read_string(&g_prints[3], 10, "199410");
-	mbedtls_mpi_read_string(&g_prints[4], 10, "67109890");
-	mbedtls_mpi_read_string(&g_prints[5], 10, "5310023542746834");
-	mbedtls_mpi_read_string(&g_prints[6], 10, "1455791217086302986");
-	mbedtls_mpi_read_string(&g_prints[7], 10, "20052041432995567486");
-	mbedtls_mpi_read_string(&g_prints[8], 10, "6041388139249378920330");
-	mbedtls_mpi_read_string(&g_prints[9], 10, "207530445072488465666");
-	mbedtls_mpi_read_string(&g_prints[10], 10, "79228162521181866724264247298");
-	mbedtls_mpi_read_string(&g_prints[11], 10, "1760368345969468176824550810518");
-	mbedtls_mpi_read_string(&g_prints[12], 10, "50079290986288516948354744811034");
-	mbedtls_mpi_read_string(&g_prints[13], 10, "473022961816146413042658758988474");
-	mbedtls_mpi_read_string(&g_prints[14], 10, "144390480366845522447407333004847678774");
-	mbedtls_mpi_read_string(&g_prints[15], 10, "1800793591454480341970779146165214289059119882");
-	mbedtls_mpi_read_string(&g_prints[16], 10, "126304807362733370595828809000324029340048915994");
+    mbedtls_mpi_read_string(&g_prints[0], 10, "1026");
+    mbedtls_mpi_read_string(&g_prints[1], 10, "5658");
+    mbedtls_mpi_read_string(&g_prints[2], 10, "107286");
+    mbedtls_mpi_read_string(&g_prints[3], 10, "199410");
+    mbedtls_mpi_read_string(&g_prints[4], 10, "67109890");
+    mbedtls_mpi_read_string(&g_prints[5], 10, "5310023542746834");
+    mbedtls_mpi_read_string(&g_prints[6], 10, "1455791217086302986");
+    mbedtls_mpi_read_string(&g_prints[7], 10, "20052041432995567486");
+    mbedtls_mpi_read_string(&g_prints[8], 10, "6041388139249378920330");
+    mbedtls_mpi_read_string(&g_prints[9], 10, "207530445072488465666");
+    mbedtls_mpi_read_string(&g_prints[10], 10, "79228162521181866724264247298");
+    mbedtls_mpi_read_string(&g_prints[11], 10, "1760368345969468176824550810518");
+    mbedtls_mpi_read_string(&g_prints[12], 10, "50079290986288516948354744811034");
+    mbedtls_mpi_read_string(&g_prints[13], 10, "473022961816146413042658758988474");
+    mbedtls_mpi_read_string(&g_prints[14], 10, "144390480366845522447407333004847678774");
+    mbedtls_mpi_read_string(&g_prints[15], 10, "1800793591454480341970779146165214289059119882");
+    mbedtls_mpi_read_string(&g_prints[16], 10, "126304807362733370595828809000324029340048915994");
 }
 
 void rocacheck_cleanup(void) {
-	for (int i = 0; i < ROCA_PRINTS_LENGTH; i++)
-		mbedtls_mpi_free(&g_prints[i]);
+    for (int i = 0; i < ROCA_PRINTS_LENGTH; i++)
+        mbedtls_mpi_free(&g_prints[i]);
 }
 
-int bitand_is_zero(	mbedtls_mpi* a, mbedtls_mpi* b ) {
+int bitand_is_zero( mbedtls_mpi* a, mbedtls_mpi* b ) {
 
-	for (int i = 0; i < mbedtls_mpi_bitlen(a); i++) {
+    for (int i = 0; i < mbedtls_mpi_bitlen(a); i++) {
 
-		if (mbedtls_mpi_get_bit(a, i) && mbedtls_mpi_get_bit(b, i))
-			return 0;
-	}
-	return 1;
+        if (mbedtls_mpi_get_bit(a, i) && mbedtls_mpi_get_bit(b, i))
+            return 0;
+    }
+    return 1;
 }
 
 
 mbedtls_mpi_uint mpi_get_uint(const mbedtls_mpi *X) {
 
-	if (X->n == 1 && X->s > 0) {
-		return X->p[0];
-	}
-	printf("ZERRRRO!!!\n");
-	return 0;
+    if (X->n == 1 && X->s > 0) {
+        return X->p[0];
+    }
+    printf("ZERRRRO!!!\n");
+    return 0;
 }
 
 void print_mpi(const char *msg, int radix, const mbedtls_mpi *X) {
 
-	char Xchar[400] = {0};
-	size_t len = 0;
+    char Xchar[400] = {0};
+    size_t len = 0;
 
-	mbedtls_mpi_write_string(X, radix, Xchar, sizeof(Xchar), &len);
-	printf("%s[%d] %s\n", msg, len, Xchar);
+    mbedtls_mpi_write_string(X, radix, Xchar, sizeof(Xchar), &len);
+    printf("%s[%d] %s\n", msg, len, Xchar);
 }
 
 bool emv_rocacheck(const unsigned char *buf, size_t buflen, bool verbose) {
 
-	mbedtls_mpi t_modulus;
-	mbedtls_mpi_init(&t_modulus);
+    mbedtls_mpi t_modulus;
+    mbedtls_mpi_init(&t_modulus);
 
-	bool ret = false;
+    bool ret = false;
 
-	rocacheck_init();
+    rocacheck_init();
 
-	MBEDTLS_MPI_CHK( mbedtls_mpi_read_binary(&t_modulus, buf, buflen) );
+    MBEDTLS_MPI_CHK( mbedtls_mpi_read_binary(&t_modulus, buf, buflen) );
 
-	for (int i = 0; i < ROCA_PRINTS_LENGTH; i++) {
+    for (int i = 0; i < ROCA_PRINTS_LENGTH; i++) {
 
-		mbedtls_mpi t_temp;
-		mbedtls_mpi t_prime;
-		mbedtls_mpi g_one;
+        mbedtls_mpi t_temp;
+        mbedtls_mpi t_prime;
+        mbedtls_mpi g_one;
 
-		mbedtls_mpi_init(&t_temp);
-		mbedtls_mpi_init(&t_prime);
-		mbedtls_mpi_init(&g_one);
+        mbedtls_mpi_init(&t_temp);
+        mbedtls_mpi_init(&t_prime);
+        mbedtls_mpi_init(&g_one);
 
-		MBEDTLS_MPI_CHK( mbedtls_mpi_read_string(&g_one, 10, "1") );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_read_string(&g_one, 10, "1") );
 
-		MBEDTLS_MPI_CHK( mbedtls_mpi_add_int(&t_prime, &t_prime, g_primes[i]) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_add_int(&t_prime, &t_prime, g_primes[i]) );
 
-		MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi(&t_temp, &t_modulus, &t_prime) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi(&t_temp, &t_modulus, &t_prime) );
 
-		MBEDTLS_MPI_CHK( mbedtls_mpi_shift_l(&g_one, mpi_get_uint(&t_temp)) );
+        MBEDTLS_MPI_CHK( mbedtls_mpi_shift_l(&g_one, mpi_get_uint(&t_temp)) );
 
-		if (bitand_is_zero(&g_one, &g_prints[i])) {
-			if (verbose)
-				PrintAndLogEx(FAILED, "No fingerprint found.\n");
-			goto cleanup;
-		}
+        if (bitand_is_zero(&g_one, &g_prints[i])) {
+            if (verbose)
+                PrintAndLogEx(FAILED, "No fingerprint found.\n");
+            goto cleanup;
+        }
 
-		mbedtls_mpi_free(&g_one);
-		mbedtls_mpi_free(&t_temp);
-		mbedtls_mpi_free(&t_prime);
-	}
+        mbedtls_mpi_free(&g_one);
+        mbedtls_mpi_free(&t_temp);
+        mbedtls_mpi_free(&t_prime);
+    }
 
-	ret = true;
-	if (verbose)
-		PrintAndLogEx(SUCCESS, "Fingerprint found!\n");
+    ret = true;
+    if (verbose)
+        PrintAndLogEx(SUCCESS, "Fingerprint found!\n");
 
 cleanup:
-	mbedtls_mpi_free(&t_modulus);
+    mbedtls_mpi_free(&t_modulus);
 
-	rocacheck_cleanup();
-	return ret;
+    rocacheck_cleanup();
+    return ret;
 }
 
 int roca_self_test(void) {
-	int ret = 0;
+    int ret = 0;
 
-	PrintAndLogEx(INFO, "ROCA check vulnerability tests" );
+    PrintAndLogEx(INFO, "ROCA check vulnerability tests" );
 
-	// positive
-	uint8_t keyp[] = "\x94\x4e\x13\x20\x8a\x28\x0c\x37\xef\xc3\x1c\x31\x14\x48\x5e\x59"\
-	                "\x01\x92\xad\xbb\x8e\x11\xc8\x7c\xad\x60\xcd\xef\x00\x37\xce\x99"\
-					"\x27\x83\x30\xd3\xf4\x71\xa2\x53\x8f\xa6\x67\x80\x2e\xd2\xa3\xc4"\
-					"\x4a\x8b\x7d\xea\x82\x6e\x88\x8d\x0a\xa3\x41\xfd\x66\x4f\x7f\xa7";
+    // positive
+    uint8_t keyp[] = "\x94\x4e\x13\x20\x8a\x28\x0c\x37\xef\xc3\x1c\x31\x14\x48\x5e\x59"\
+                    "\x01\x92\xad\xbb\x8e\x11\xc8\x7c\xad\x60\xcd\xef\x00\x37\xce\x99"\
+                    "\x27\x83\x30\xd3\xf4\x71\xa2\x53\x8f\xa6\x67\x80\x2e\xd2\xa3\xc4"\
+                    "\x4a\x8b\x7d\xea\x82\x6e\x88\x8d\x0a\xa3\x41\xfd\x66\x4f\x7f\xa7";
 
 
-	if (emv_rocacheck(keyp, 64, false)) {
-		PrintAndLogEx(SUCCESS, "Weak modulus [ %s]", _GREEN_(PASS) );
-	}
-	else {
-		ret++;
-		PrintAndLogEx(FAILED, "Weak modulus [ %s]", _RED_(FAIL) );
-	}
+    if (emv_rocacheck(keyp, 64, false)) {
+        PrintAndLogEx(SUCCESS, "Weak modulus [ %s]", _GREEN_(PASS) );
+    }
+    else {
+        ret++;
+        PrintAndLogEx(FAILED, "Weak modulus [ %s]", _RED_(FAIL) );
+    }
 
-	// negative
-	uint8_t keyn[] = "\x84\x4e\x13\x20\x8a\x28\x0c\x37\xef\xc3\x1c\x31\x14\x48\x5e\x59"\
-	                "\x01\x92\xad\xbb\x8e\x11\xc8\x7c\xad\x60\xcd\xef\x00\x37\xce\x99"\
-					"\x27\x83\x30\xd3\xf4\x71\xa2\x53\x8f\xa6\x67\x80\x2e\xd2\xa3\xc4"\
-					"\x4a\x8b\x7d\xea\x82\x6e\x88\x8d\x0a\xa3\x41\xfd\x66\x4f\x7f\xa7";
+    // negative
+    uint8_t keyn[] = "\x84\x4e\x13\x20\x8a\x28\x0c\x37\xef\xc3\x1c\x31\x14\x48\x5e\x59"\
+                    "\x01\x92\xad\xbb\x8e\x11\xc8\x7c\xad\x60\xcd\xef\x00\x37\xce\x99"\
+                    "\x27\x83\x30\xd3\xf4\x71\xa2\x53\x8f\xa6\x67\x80\x2e\xd2\xa3\xc4"\
+                    "\x4a\x8b\x7d\xea\x82\x6e\x88\x8d\x0a\xa3\x41\xfd\x66\x4f\x7f\xa7";
 
-	if (emv_rocacheck(keyn, 64, false)) {
-		ret++;
-		PrintAndLogEx(FAILED, "Strong modulus [ %s]", _RED_(FAIL) );
-	} else {
-		PrintAndLogEx(SUCCESS, "Strong modulus [ %s]", _GREEN_(PASS) );
-	}
+    if (emv_rocacheck(keyn, 64, false)) {
+        ret++;
+        PrintAndLogEx(FAILED, "Strong modulus [ %s]", _RED_(FAIL) );
+    } else {
+        PrintAndLogEx(SUCCESS, "Strong modulus [ %s]", _GREEN_(PASS) );
+    }
 
-	return ret;
+    return ret;
 }
diff --git a/client/emv/emv_roca.h b/client/emv/emv_roca.h
index b37d4de14..a531ea101 100644
--- a/client/emv/emv_roca.h
+++ b/client/emv/emv_roca.h
@@ -29,7 +29,7 @@
 #include "mbedtls/bignum.h"
 #include "util.h"
 
-#define ROCA_PRINTS_LENGTH	17
+#define ROCA_PRINTS_LENGTH 17
 
 extern bool emv_rocacheck( const unsigned char *buf, size_t buflen, bool verbose );
 extern int roca_self_test( void );
diff --git a/client/emv/emv_tags.c b/client/emv/emv_tags.c
index 2cad81397..9e7b3d2aa 100644
--- a/client/emv/emv_tags.c
+++ b/client/emv/emv_tags.c
@@ -23,809 +23,809 @@
 #include <stdlib.h>
 #include <string.h>
 
-#define PRINT_INDENT(level) 	{for (int i = 0; i < (level); i++) fprintf(f, "   ");}
+#define PRINT_INDENT(level) {for (int i = 0; i < (level); i++) fprintf(f, "   ");}
 
 enum emv_tag_t {
-	EMV_TAG_GENERIC,
-	EMV_TAG_BITMASK,
-	EMV_TAG_DOL,
-	EMV_TAG_CVM_LIST,
-	EMV_TAG_AFL,
-	EMV_TAG_STRING,
-	EMV_TAG_NUMERIC,
-	EMV_TAG_YYMMDD,
-	EMV_TAG_CVR,
-	EMV_TAG_CID,
+    EMV_TAG_GENERIC,
+    EMV_TAG_BITMASK,
+    EMV_TAG_DOL,
+    EMV_TAG_CVM_LIST,
+    EMV_TAG_AFL,
+    EMV_TAG_STRING,
+    EMV_TAG_NUMERIC,
+    EMV_TAG_YYMMDD,
+    EMV_TAG_CVR,
+    EMV_TAG_CID,
 };
 
 struct emv_tag {
-	tlv_tag_t tag;
-	char *name;
-	enum emv_tag_t type;
-	const void *data;
+    tlv_tag_t tag;
+    char *name;
+    enum emv_tag_t type;
+    const void *data;
 };
 
 struct emv_tag_bit {
-	unsigned bit;
-	const char *name;
+    unsigned bit;
+    const char *name;
 };
 
 #define EMV_BIT(byte, bit) ((byte - 1) * 8 + (8 - bit))
 #define EMV_BIT_FINISH { (~0), NULL }
 
 static const struct emv_tag_bit EMV_AIP[] = {
-	{ EMV_BIT(1, 7), "SDA supported" },
-	{ EMV_BIT(1, 6), "DDA supported" },
-	{ EMV_BIT(1, 5), "Cardholder verification is supported" },
-	{ EMV_BIT(1, 4), "Terminal risk management is to be performed" },
-	{ EMV_BIT(1, 3), "Issuer authentication is supported" },
-	{ EMV_BIT(1, 2), "Reserved for use by the EMV Contactless Specifications" },
-	{ EMV_BIT(1, 1), "CDA supported (Combined Dynamic Data Authentication / Application Cryptogram Generation)" },
-	{ EMV_BIT(2, 8), "MSD is supported (Magnetic Stripe Data)" },
-	{ EMV_BIT(2, 7), "Reserved for use by the EMV Contactless Specifications" },
-	{ EMV_BIT(2, 6), "Reserved for use by the EMV Contactless Specifications" },
-	{ EMV_BIT(2, 1), "Reserved for use by the EMV Contactless Specifications" },
-	EMV_BIT_FINISH,
+    { EMV_BIT(1, 7), "SDA supported" },
+    { EMV_BIT(1, 6), "DDA supported" },
+    { EMV_BIT(1, 5), "Cardholder verification is supported" },
+    { EMV_BIT(1, 4), "Terminal risk management is to be performed" },
+    { EMV_BIT(1, 3), "Issuer authentication is supported" },
+    { EMV_BIT(1, 2), "Reserved for use by the EMV Contactless Specifications" },
+    { EMV_BIT(1, 1), "CDA supported (Combined Dynamic Data Authentication / Application Cryptogram Generation)" },
+    { EMV_BIT(2, 8), "MSD is supported (Magnetic Stripe Data)" },
+    { EMV_BIT(2, 7), "Reserved for use by the EMV Contactless Specifications" },
+    { EMV_BIT(2, 6), "Reserved for use by the EMV Contactless Specifications" },
+    { EMV_BIT(2, 1), "Reserved for use by the EMV Contactless Specifications" },
+    EMV_BIT_FINISH,
 };
 
 static const struct emv_tag_bit EMV_AUC[] = {
-	{ EMV_BIT(1, 8), "Valid for domestic cash transactions" },
-	{ EMV_BIT(1, 7), "Valid for international cash transactions" },
-	{ EMV_BIT(1, 6), "Valid for domestic goods" },
-	{ EMV_BIT(1, 5), "Valid for international goods" },
-	{ EMV_BIT(1, 4), "Valid for domestic services" },
-	{ EMV_BIT(1, 3), "Valid for international services" },
-	{ EMV_BIT(1, 2), "Valid for ATMs" },
-	{ EMV_BIT(1, 1), "Valid at terminals other than ATMs" },
-	{ EMV_BIT(2, 8), "Domestic cashback allowed" },
-	{ EMV_BIT(2, 7), "International cashback allowed" },
-	EMV_BIT_FINISH,
+    { EMV_BIT(1, 8), "Valid for domestic cash transactions" },
+    { EMV_BIT(1, 7), "Valid for international cash transactions" },
+    { EMV_BIT(1, 6), "Valid for domestic goods" },
+    { EMV_BIT(1, 5), "Valid for international goods" },
+    { EMV_BIT(1, 4), "Valid for domestic services" },
+    { EMV_BIT(1, 3), "Valid for international services" },
+    { EMV_BIT(1, 2), "Valid for ATMs" },
+    { EMV_BIT(1, 1), "Valid at terminals other than ATMs" },
+    { EMV_BIT(2, 8), "Domestic cashback allowed" },
+    { EMV_BIT(2, 7), "International cashback allowed" },
+    EMV_BIT_FINISH,
 };
 
 static const struct emv_tag_bit EMV_TVR[] = {
-	{ EMV_BIT(1, 8), "Offline data authentication was not performed" },
-	{ EMV_BIT(1, 7), "SDA failed" },
-	{ EMV_BIT(1, 6), "ICC data missing" },
-	{ EMV_BIT(1, 5), "Card appears on terminal exception file" },
-	{ EMV_BIT(1, 4), "DDA failed" },
-	{ EMV_BIT(1, 3), "CDA failed" },
-	{ EMV_BIT(1, 2), "SDA selected" },
-	{ EMV_BIT(2, 8), "ICC and terminal have different application versions" },
-	{ EMV_BIT(2, 7), "Expired application" },
-	{ EMV_BIT(2, 6), "Application not yet effective" },
-	{ EMV_BIT(2, 5), "Requested service not allowed for card product" },
-	{ EMV_BIT(2, 4), "New card" },
-	{ EMV_BIT(3, 8), "Cardholder verification was not successful" },
-	{ EMV_BIT(3, 7), "Unrecognised CVM" },
-	{ EMV_BIT(3, 6), "PIN Try Limit exceeded" },
-	{ EMV_BIT(3, 5), "PIN entry required and PIN pad not present or not working" },
-	{ EMV_BIT(3, 4), "PIN entry required, PIN pad present, but PIN was not entered" },
-	{ EMV_BIT(3, 3), "Online PIN entered" },
-	{ EMV_BIT(4, 8), "Transaction exceeds floor limit" },
-	{ EMV_BIT(4, 7), "Lower consecutive offline limit exceeded" },
-	{ EMV_BIT(4, 6), "Upper consecutive offline limit exceeded" },
-	{ EMV_BIT(4, 5), "Transaction selected randomly for online processing" },
-	{ EMV_BIT(4, 4), "Merchant forced transaction online" },
-	{ EMV_BIT(5, 8), "Default TDOL used" },
-	{ EMV_BIT(5, 7), "Issuer authentication failed" },
-	{ EMV_BIT(5, 6), "Script processing failed before final GENERATE AC" },
-	{ EMV_BIT(5, 5), "Script processing failed after final GENERATE AC" },
-	{ EMV_BIT(5, 4), "Reserved for use by the EMV Contactless Specifications" },
-	{ EMV_BIT(5, 3), "Reserved for use by the EMV Contactless Specifications" },
-	{ EMV_BIT(5, 2), "Reserved for use by the EMV Contactless Specifications" },
-	{ EMV_BIT(5, 1), "Reserved for use by the EMV Contactless Specifications" },
-	EMV_BIT_FINISH,
+    { EMV_BIT(1, 8), "Offline data authentication was not performed" },
+    { EMV_BIT(1, 7), "SDA failed" },
+    { EMV_BIT(1, 6), "ICC data missing" },
+    { EMV_BIT(1, 5), "Card appears on terminal exception file" },
+    { EMV_BIT(1, 4), "DDA failed" },
+    { EMV_BIT(1, 3), "CDA failed" },
+    { EMV_BIT(1, 2), "SDA selected" },
+    { EMV_BIT(2, 8), "ICC and terminal have different application versions" },
+    { EMV_BIT(2, 7), "Expired application" },
+    { EMV_BIT(2, 6), "Application not yet effective" },
+    { EMV_BIT(2, 5), "Requested service not allowed for card product" },
+    { EMV_BIT(2, 4), "New card" },
+    { EMV_BIT(3, 8), "Cardholder verification was not successful" },
+    { EMV_BIT(3, 7), "Unrecognised CVM" },
+    { EMV_BIT(3, 6), "PIN Try Limit exceeded" },
+    { EMV_BIT(3, 5), "PIN entry required and PIN pad not present or not working" },
+    { EMV_BIT(3, 4), "PIN entry required, PIN pad present, but PIN was not entered" },
+    { EMV_BIT(3, 3), "Online PIN entered" },
+    { EMV_BIT(4, 8), "Transaction exceeds floor limit" },
+    { EMV_BIT(4, 7), "Lower consecutive offline limit exceeded" },
+    { EMV_BIT(4, 6), "Upper consecutive offline limit exceeded" },
+    { EMV_BIT(4, 5), "Transaction selected randomly for online processing" },
+    { EMV_BIT(4, 4), "Merchant forced transaction online" },
+    { EMV_BIT(5, 8), "Default TDOL used" },
+    { EMV_BIT(5, 7), "Issuer authentication failed" },
+    { EMV_BIT(5, 6), "Script processing failed before final GENERATE AC" },
+    { EMV_BIT(5, 5), "Script processing failed after final GENERATE AC" },
+    { EMV_BIT(5, 4), "Reserved for use by the EMV Contactless Specifications" },
+    { EMV_BIT(5, 3), "Reserved for use by the EMV Contactless Specifications" },
+    { EMV_BIT(5, 2), "Reserved for use by the EMV Contactless Specifications" },
+    { EMV_BIT(5, 1), "Reserved for use by the EMV Contactless Specifications" },
+    EMV_BIT_FINISH,
 };
 
 static const struct emv_tag_bit EMV_CTQ[] = {
-	{ EMV_BIT(1, 8), "Online PIN Required" },
-	{ EMV_BIT(1, 7), "Signature Required" },
-	{ EMV_BIT(1, 6), "Go Online if Offline Data Authentication Fails and Reader is online capable" },
-	{ EMV_BIT(1, 5), "Switch Interface if Offline Data Authentication fails and Reader supports VIS" },
-	{ EMV_BIT(1, 4), "Go Online if Application Expired" },
-	{ EMV_BIT(1, 3), "Switch Interface for Cash Transactions" },
-	{ EMV_BIT(1, 2), "Switch Interface for Cashback Transactions" },
-	{ EMV_BIT(2, 8), "Consumer Device CVM Performed" },
-	{ EMV_BIT(2, 7), "Card supports Issuer Update Processing at the POS" },
-	EMV_BIT_FINISH,
+    { EMV_BIT(1, 8), "Online PIN Required" },
+    { EMV_BIT(1, 7), "Signature Required" },
+    { EMV_BIT(1, 6), "Go Online if Offline Data Authentication Fails and Reader is online capable" },
+    { EMV_BIT(1, 5), "Switch Interface if Offline Data Authentication fails and Reader supports VIS" },
+    { EMV_BIT(1, 4), "Go Online if Application Expired" },
+    { EMV_BIT(1, 3), "Switch Interface for Cash Transactions" },
+    { EMV_BIT(1, 2), "Switch Interface for Cashback Transactions" },
+    { EMV_BIT(2, 8), "Consumer Device CVM Performed" },
+    { EMV_BIT(2, 7), "Card supports Issuer Update Processing at the POS" },
+    EMV_BIT_FINISH,
 };
 
 static const struct emv_tag_bit EMV_TTQ[] = {
-	{ EMV_BIT(1, 8), "MSD supported" },
-	{ EMV_BIT(1, 7), "VSDC supported" },
-	{ EMV_BIT(1, 6), "qVSDC supported" },
-	{ EMV_BIT(1, 5), "EMV contact chip supported" },
-	{ EMV_BIT(1, 4), "Offline-only reader" },
-	{ EMV_BIT(1, 3), "Online PIN supported" },
-	{ EMV_BIT(1, 2), "Signature supported" },
-	{ EMV_BIT(1, 1), "Offline Data Authentication (ODA) for Online Authorizations supported\nWarning!!!! Readers compliant to this specification set TTQ byte 1 bit 1 (this field) to 0b" },
-	{ EMV_BIT(2, 8), "Online cryptogram required" },
-	{ EMV_BIT(2, 7), "CVM required" },
-	{ EMV_BIT(2, 6), "(Contact Chip) Offline PIN supported" },
-	{ EMV_BIT(3, 8), "Issuer Update Processing supported" },
-	{ EMV_BIT(3, 7), "Mobile functionality supported (Consumer Device CVM)" },
-	EMV_BIT_FINISH,
+    { EMV_BIT(1, 8), "MSD supported" },
+    { EMV_BIT(1, 7), "VSDC supported" },
+    { EMV_BIT(1, 6), "qVSDC supported" },
+    { EMV_BIT(1, 5), "EMV contact chip supported" },
+    { EMV_BIT(1, 4), "Offline-only reader" },
+    { EMV_BIT(1, 3), "Online PIN supported" },
+    { EMV_BIT(1, 2), "Signature supported" },
+    { EMV_BIT(1, 1), "Offline Data Authentication (ODA) for Online Authorizations supported\nWarning!!!! Readers compliant to this specification set TTQ byte 1 bit 1 (this field) to 0b" },
+    { EMV_BIT(2, 8), "Online cryptogram required" },
+    { EMV_BIT(2, 7), "CVM required" },
+    { EMV_BIT(2, 6), "(Contact Chip) Offline PIN supported" },
+    { EMV_BIT(3, 8), "Issuer Update Processing supported" },
+    { EMV_BIT(3, 7), "Mobile functionality supported (Consumer Device CVM)" },
+    EMV_BIT_FINISH,
 };
 
 static const struct emv_tag_bit EMV_CVR[] = {
-	// mask 0F 0F F0 0F
-	{ EMV_BIT(1, 4), "CDA Performed" },
-	{ EMV_BIT(1, 3), "Offline DDA Performed" },
-	{ EMV_BIT(1, 2), "Issuer Authentication Not Performed" },
-	{ EMV_BIT(1, 1), "Issuer Authentication performed and Failed" },
-	{ EMV_BIT(2, 4), "Offline PIN Verification Performed" },
-	{ EMV_BIT(2, 3), "Offline PIN Verification Performed and PIN Not Successfully Verified" },
-	{ EMV_BIT(2, 2), "PIN Try Limit Exceeded" },
-	{ EMV_BIT(2, 1), "Last Online Transaction Not Completed" },
-	{ EMV_BIT(3, 8), "Lower Offline Transaction Count Limit Exceeded" },
-	{ EMV_BIT(3, 7), "Upper Offline Transaction Count Limit Exceeded" },
-	{ EMV_BIT(3, 6), "Lower Cumulative Offline Amount Limit Exceeded" },
-	{ EMV_BIT(3, 5), "Upper Cumulative Offline Amount Limit Exceeded" },
-	{ EMV_BIT(4, 4), "Issuer script processing failed on last transaction" },
-	{ EMV_BIT(4, 3), "Offline data authentication failed on previous transaction and transaction declined offline" },
-	{ EMV_BIT(4, 2), "Go Online on Next Transaction Was Set" },
-	{ EMV_BIT(4, 1), "Unable to go Online" },
-	EMV_BIT_FINISH,
+    // mask 0F 0F F0 0F
+    { EMV_BIT(1, 4), "CDA Performed" },
+    { EMV_BIT(1, 3), "Offline DDA Performed" },
+    { EMV_BIT(1, 2), "Issuer Authentication Not Performed" },
+    { EMV_BIT(1, 1), "Issuer Authentication performed and Failed" },
+    { EMV_BIT(2, 4), "Offline PIN Verification Performed" },
+    { EMV_BIT(2, 3), "Offline PIN Verification Performed and PIN Not Successfully Verified" },
+    { EMV_BIT(2, 2), "PIN Try Limit Exceeded" },
+    { EMV_BIT(2, 1), "Last Online Transaction Not Completed" },
+    { EMV_BIT(3, 8), "Lower Offline Transaction Count Limit Exceeded" },
+    { EMV_BIT(3, 7), "Upper Offline Transaction Count Limit Exceeded" },
+    { EMV_BIT(3, 6), "Lower Cumulative Offline Amount Limit Exceeded" },
+    { EMV_BIT(3, 5), "Upper Cumulative Offline Amount Limit Exceeded" },
+    { EMV_BIT(4, 4), "Issuer script processing failed on last transaction" },
+    { EMV_BIT(4, 3), "Offline data authentication failed on previous transaction and transaction declined offline" },
+    { EMV_BIT(4, 2), "Go Online on Next Transaction Was Set" },
+    { EMV_BIT(4, 1), "Unable to go Online" },
+    EMV_BIT_FINISH,
 };
 
 // All Data Elements by Tags used in TLV structure (according to the EMV 4.2 Standard )
 // https://www.eftlab.co.uk/index.php/site-map/knowledge-base/145-emv-nfc-tags
 // http://dexterous-programmer.blogspot.in/2012/05/emv-tags.html
 static const struct emv_tag emv_tags[] = {
-	// internal
-	{ 0x00  , "Unknown ???" },
-	{ 0x01  , "", EMV_TAG_STRING }, // string for headers
-	{ 0x02  , "Raw data" }, // data
-	{ 0x06  , "Object Identifier (OID)" },
-	{ 0x20  , "Cardholder Verification Results (CVR)", EMV_TAG_CVR }, // not standard!
-	{ 0x21  , "Input list for Offline Data Authentication" }, // not standard! data for "Offline Data Authentication" come from "read records" command. (EMV book3 10.3)
+    // internal
+    { 0x00  , "Unknown ???" },
+    { 0x01  , "", EMV_TAG_STRING }, // string for headers
+    { 0x02  , "Raw data" }, // data
+    { 0x06  , "Object Identifier (OID)" },
+    { 0x20  , "Cardholder Verification Results (CVR)", EMV_TAG_CVR }, // not standard!
+    { 0x21  , "Input list for Offline Data Authentication" }, // not standard! data for "Offline Data Authentication" come from "read records" command. (EMV book3 10.3)
 
-	// EMV
-	{ 0x41  , "Country code and national data" },
-	{ 0x42  , "Issuer Identification Number (IIN)" },
-	{ 0x4f  , "Application Dedicated File (ADF) Name" },
-	{ 0x50  , "Application Label", EMV_TAG_STRING },
-	{ 0x51  , "File reference data element" },
-	{ 0x52  , "Command APDU" },
-	{ 0x53  , "Discretionary data (or template)" },
-	{ 0x56  , "Track 1 Data" },
-	{ 0x57  , "Track 2 Equivalent Data" },
-	{ 0x5a  , "Application Primary Account Number (PAN)" },
-	{ 0x5f20, "Cardholder Name", EMV_TAG_STRING },
-	{ 0x5f24, "Application Expiration Date", EMV_TAG_YYMMDD },
-	{ 0x5f25, "Application Effective Date", EMV_TAG_YYMMDD },
-	{ 0x5f28, "Issuer Country Code", EMV_TAG_NUMERIC },
-	{ 0x5f2a, "Transaction Currency Code", EMV_TAG_NUMERIC },
-	{ 0x5f2d, "Language Preference", EMV_TAG_STRING },
-	{ 0x5f30, "Service Code", EMV_TAG_NUMERIC },
-	{ 0x5f34, "Application Primary Account Number (PAN) Sequence Number", EMV_TAG_NUMERIC },
-	{ 0x5f36, "Transaction Currency Exponent",  EMV_TAG_NUMERIC },
-	{ 0x5f50, "Issuer URL", EMV_TAG_STRING },
-	{ 0x5f53, "International Bank Account Number (IBAN)" },
-	{ 0x5f54, "Bank Identifier Code (BIC)" },
-	{ 0x5f55, "Issuer Country Code (alpha2 format)", EMV_TAG_STRING },
-	{ 0x5f56, "Issuer Country Code (alpha3 format)", EMV_TAG_STRING },
+    // EMV
+    { 0x41  , "Country code and national data" },
+    { 0x42  , "Issuer Identification Number (IIN)" },
+    { 0x4f  , "Application Dedicated File (ADF) Name" },
+    { 0x50  , "Application Label", EMV_TAG_STRING },
+    { 0x51  , "File reference data element" },
+    { 0x52  , "Command APDU" },
+    { 0x53  , "Discretionary data (or template)" },
+    { 0x56  , "Track 1 Data" },
+    { 0x57  , "Track 2 Equivalent Data" },
+    { 0x5a  , "Application Primary Account Number (PAN)" },
+    { 0x5f20, "Cardholder Name", EMV_TAG_STRING },
+    { 0x5f24, "Application Expiration Date", EMV_TAG_YYMMDD },
+    { 0x5f25, "Application Effective Date", EMV_TAG_YYMMDD },
+    { 0x5f28, "Issuer Country Code", EMV_TAG_NUMERIC },
+    { 0x5f2a, "Transaction Currency Code", EMV_TAG_NUMERIC },
+    { 0x5f2d, "Language Preference", EMV_TAG_STRING },
+    { 0x5f30, "Service Code", EMV_TAG_NUMERIC },
+    { 0x5f34, "Application Primary Account Number (PAN) Sequence Number", EMV_TAG_NUMERIC },
+    { 0x5f36, "Transaction Currency Exponent",  EMV_TAG_NUMERIC },
+    { 0x5f50, "Issuer URL", EMV_TAG_STRING },
+    { 0x5f53, "International Bank Account Number (IBAN)" },
+    { 0x5f54, "Bank Identifier Code (BIC)" },
+    { 0x5f55, "Issuer Country Code (alpha2 format)", EMV_TAG_STRING },
+    { 0x5f56, "Issuer Country Code (alpha3 format)", EMV_TAG_STRING },
 
-	{ 0x61  , "Application Template" },
-	{ 0x6f  , "File Control Information (FCI) Template" },
-	{ 0x70  , "READ RECORD Response Message Template" },
-	{ 0x71  , "Issues Script Template 1" },
-	{ 0x72  , "Issues Script Template 2" },
-	{ 0x73  , "Directory Discretionary Template" },
-	{ 0x77  , "Response Message Template Format 2" },
-	{ 0x80  , "Response Message Template Format 1" },
-	{ 0x81  , "Amount, Authorised (Binary)" },
-	{ 0x82  , "Application Interchange Profile", EMV_TAG_BITMASK, &EMV_AIP },
-	{ 0x83  , "Command Template" },
-	{ 0x84  , "Dedicated File (DF) Name" },
-	{ 0x86	, "Issuer Script Command" },
-	{ 0x87  , "Application Priority Indicator" },
-	{ 0x88  , "Short File Identifier (SFI)" },
-	{ 0x89  , "Authorisation Code" },
-	{ 0x8a  , "Authorisation Response Code" },
-	{ 0x8c  , "Card Risk Management Data Object List 1 (CDOL1)", EMV_TAG_DOL },
-	{ 0x8d  , "Card Risk Management Data Object List 2 (CDOL2)", EMV_TAG_DOL },
-	{ 0x8e  , "Cardholder Verification Method (CVM) List", EMV_TAG_CVM_LIST },
-	{ 0x8f  , "Certification Authority Public Key Index" },
-	{ 0x90  , "Issuer Public Key Certificate" },
-	{ 0x91  , "Issuer Authentication Data" },
-	{ 0x92  , "Issuer Public Key Remainder" },
-	{ 0x93  , "Signed Static Application Data" },
-	{ 0x94  , "Application File Locator (AFL)", EMV_TAG_AFL },
-	{ 0x95  , "Terminal Verification Results" },
-	{ 0x97  , "Transaction Certificate Data Object List (TDOL)" },
-	{ 0x98  , "Transaction Certificate (TC) Hash Value" },
-	{ 0x99  , "Transaction Personal Identification Number (PIN) Data" },
-	{ 0x9a  , "Transaction Date", EMV_TAG_YYMMDD },
-	{ 0x9b  , "Transaction Status Information" },
-	{ 0x9c  , "Transaction Type", EMV_TAG_NUMERIC },
-	{ 0x9d  , "Directory Definition File (DDF) Name" },
+    { 0x61  , "Application Template" },
+    { 0x6f  , "File Control Information (FCI) Template" },
+    { 0x70  , "READ RECORD Response Message Template" },
+    { 0x71  , "Issues Script Template 1" },
+    { 0x72  , "Issues Script Template 2" },
+    { 0x73  , "Directory Discretionary Template" },
+    { 0x77  , "Response Message Template Format 2" },
+    { 0x80  , "Response Message Template Format 1" },
+    { 0x81  , "Amount, Authorised (Binary)" },
+    { 0x82  , "Application Interchange Profile", EMV_TAG_BITMASK, &EMV_AIP },
+    { 0x83  , "Command Template" },
+    { 0x84  , "Dedicated File (DF) Name" },
+    { 0x86  , "Issuer Script Command" },
+    { 0x87  , "Application Priority Indicator" },
+    { 0x88  , "Short File Identifier (SFI)" },
+    { 0x89  , "Authorisation Code" },
+    { 0x8a  , "Authorisation Response Code" },
+    { 0x8c  , "Card Risk Management Data Object List 1 (CDOL1)", EMV_TAG_DOL },
+    { 0x8d  , "Card Risk Management Data Object List 2 (CDOL2)", EMV_TAG_DOL },
+    { 0x8e  , "Cardholder Verification Method (CVM) List", EMV_TAG_CVM_LIST },
+    { 0x8f  , "Certification Authority Public Key Index" },
+    { 0x90  , "Issuer Public Key Certificate" },
+    { 0x91  , "Issuer Authentication Data" },
+    { 0x92  , "Issuer Public Key Remainder" },
+    { 0x93  , "Signed Static Application Data" },
+    { 0x94  , "Application File Locator (AFL)", EMV_TAG_AFL },
+    { 0x95  , "Terminal Verification Results" },
+    { 0x97  , "Transaction Certificate Data Object List (TDOL)" },
+    { 0x98  , "Transaction Certificate (TC) Hash Value" },
+    { 0x99  , "Transaction Personal Identification Number (PIN) Data" },
+    { 0x9a  , "Transaction Date", EMV_TAG_YYMMDD },
+    { 0x9b  , "Transaction Status Information" },
+    { 0x9c  , "Transaction Type", EMV_TAG_NUMERIC },
+    { 0x9d  , "Directory Definition File (DDF) Name" },
 
-	{ 0x9f01, "Acquirer Identifier", EMV_TAG_NUMERIC },
-	{ 0x9f02, "Amount, Authorised (Numeric)", EMV_TAG_NUMERIC },
-	{ 0x9f03, "Amount, Other (Numeric)", EMV_TAG_NUMERIC },
-	{ 0x9f04, "Amount, Other (Binary)", EMV_TAG_NUMERIC },
-	{ 0x9f05, "Application Discretionary Data" },
-	{ 0x9f06, "Application Identifier (AID), Terminal. ISO 7816-5" },
-	{ 0x9f07, "Application Usage Control", EMV_TAG_BITMASK, &EMV_AUC },
-	{ 0x9f08, "Application Version Number" },
-	{ 0x9f09, "Application Version Number - terminal" },
-	{ 0x9f0a, "Application Selection Registered Proprietary Data" }, // https://blog.ul-ts.com/posts/electronic-card-identifier-one-more-step-for-mif-compliance/
-	{ 0x9f0b, "Cardholder Name Extended", EMV_TAG_STRING },
-	{ 0x9f0d, "Issuer Action Code - Default", EMV_TAG_BITMASK, &EMV_TVR },
-	{ 0x9f0e, "Issuer Action Code - Denial", EMV_TAG_BITMASK, &EMV_TVR },
-	{ 0x9f0f, "Issuer Action Code - Online", EMV_TAG_BITMASK, &EMV_TVR },
-	{ 0x9f10, "Issuer Application Data" },
-	{ 0x9f11, "Issuer Code Table Index", EMV_TAG_NUMERIC },
-	{ 0x9f12, "Application Preferred Name", EMV_TAG_STRING },
-	{ 0x9f13, "Last Online Application Transaction Counter (ATC) Register" },
-	{ 0x9f14, "Lower Consecutive Offline Limit" },
-	{ 0x9f15, "Merchant Category Code", EMV_TAG_NUMERIC },
-	{ 0x9f16, "Merchant Identifier", EMV_TAG_STRING },
-	{ 0x9f17, "Personal Identification Number (PIN) Try Counter" },
-	{ 0x9f18, "Issuer Script Identifier" },
-	{ 0x9f1a, "Terminal Country Code" },
-	{ 0x9f1b, "Terminal Floor Limit" },
-	{ 0x9f1c, "Terminal Identification", EMV_TAG_STRING },
-	{ 0x9f1d, "Terminal Risk Management Data" },
-	{ 0x9f1e, "Interface Device (IFD) Serial Number", EMV_TAG_STRING },
-	{ 0x9f1f, "Track 1 Discretionary Data", EMV_TAG_STRING },
-	{ 0x9f20, "Track 2 Discretionary Data", EMV_TAG_STRING },
-	{ 0x9f21, "Transaction Time" },
-	{ 0x9f22, "Certification Authority Public Key Index - Terminal" },
-	{ 0x9f23, "Upper Consecutive Offline Limit" },
-	{ 0x9f26, "Application Cryptogram" },
-	{ 0x9f27, "Cryptogram Information Data", EMV_TAG_CID },
-	{ 0x9f2a, "Kernel Identifier" },
-	{ 0x9f2d, "ICC PIN Encipherment Public Key Certificate" },
-	{ 0x9f2e, "ICC PIN Encipherment Public Key Exponent" },
-	{ 0x9f2f, "ICC PIN Encipherment Public Key Remainder" },
-	{ 0x9f32, "Issuer Public Key Exponent" },
-	{ 0x9f33, "Terminal Capabilities" },
-	{ 0x9f34, "Cardholder Verification Method (CVM) Results" },
-	{ 0x9f35, "Terminal Type" },
-	{ 0x9f36, "Application Transaction Counter (ATC)" },
-	{ 0x9f37, "Unpredictable Number" },
-	{ 0x9f38, "Processing Options Data Object List (PDOL)", EMV_TAG_DOL },
-	{ 0x9f39, "Point-of-Service (POS) Entry Mode", EMV_TAG_NUMERIC },
-	{ 0x9f3a, "Amount, Reference Currency" },
-	{ 0x9f3b, "Application Reference Currency", EMV_TAG_NUMERIC },
-	{ 0x9f3c, "Transaction Reference Currency Code", EMV_TAG_NUMERIC },
-	{ 0x9f3d, "Transaction Reference Currency Exponent", EMV_TAG_NUMERIC },
-	{ 0x9f40, "Additional Terminal Capabilities" },
-	{ 0x9f41, "Transaction Sequence Counter", EMV_TAG_NUMERIC },
-	{ 0x9f42, "Application Currency Code", EMV_TAG_NUMERIC },
-	{ 0x9f43, "Application Reference Currency Exponent", EMV_TAG_NUMERIC },
-	{ 0x9f44, "Application Currency Exponent", EMV_TAG_NUMERIC },
-	{ 0x9f45, "Data Authentication Code" },
-	{ 0x9f46, "ICC Public Key Certificate" },
-	{ 0x9f47, "ICC Public Key Exponent" },
-	{ 0x9f48, "ICC Public Key Remainder" },
-	{ 0x9f49, "Dynamic Data Authentication Data Object List (DDOL)", EMV_TAG_DOL },
-	{ 0x9f4a, "Static Data Authentication Tag List" },
-	{ 0x9f4b, "Signed Dynamic Application Data" },
-	{ 0x9f4c, "ICC Dynamic Number" },
-	{ 0x9f4d, "Log Entry" },
-	{ 0x9f4e, "Merchant Name and Location", EMV_TAG_STRING },
-	{ 0x9f4f, "Log Format", EMV_TAG_DOL },
+    { 0x9f01, "Acquirer Identifier", EMV_TAG_NUMERIC },
+    { 0x9f02, "Amount, Authorised (Numeric)", EMV_TAG_NUMERIC },
+    { 0x9f03, "Amount, Other (Numeric)", EMV_TAG_NUMERIC },
+    { 0x9f04, "Amount, Other (Binary)", EMV_TAG_NUMERIC },
+    { 0x9f05, "Application Discretionary Data" },
+    { 0x9f06, "Application Identifier (AID), Terminal. ISO 7816-5" },
+    { 0x9f07, "Application Usage Control", EMV_TAG_BITMASK, &EMV_AUC },
+    { 0x9f08, "Application Version Number" },
+    { 0x9f09, "Application Version Number - terminal" },
+    { 0x9f0a, "Application Selection Registered Proprietary Data" }, // https://blog.ul-ts.com/posts/electronic-card-identifier-one-more-step-for-mif-compliance/
+    { 0x9f0b, "Cardholder Name Extended", EMV_TAG_STRING },
+    { 0x9f0d, "Issuer Action Code - Default", EMV_TAG_BITMASK, &EMV_TVR },
+    { 0x9f0e, "Issuer Action Code - Denial", EMV_TAG_BITMASK, &EMV_TVR },
+    { 0x9f0f, "Issuer Action Code - Online", EMV_TAG_BITMASK, &EMV_TVR },
+    { 0x9f10, "Issuer Application Data" },
+    { 0x9f11, "Issuer Code Table Index", EMV_TAG_NUMERIC },
+    { 0x9f12, "Application Preferred Name", EMV_TAG_STRING },
+    { 0x9f13, "Last Online Application Transaction Counter (ATC) Register" },
+    { 0x9f14, "Lower Consecutive Offline Limit" },
+    { 0x9f15, "Merchant Category Code", EMV_TAG_NUMERIC },
+    { 0x9f16, "Merchant Identifier", EMV_TAG_STRING },
+    { 0x9f17, "Personal Identification Number (PIN) Try Counter" },
+    { 0x9f18, "Issuer Script Identifier" },
+    { 0x9f1a, "Terminal Country Code" },
+    { 0x9f1b, "Terminal Floor Limit" },
+    { 0x9f1c, "Terminal Identification", EMV_TAG_STRING },
+    { 0x9f1d, "Terminal Risk Management Data" },
+    { 0x9f1e, "Interface Device (IFD) Serial Number", EMV_TAG_STRING },
+    { 0x9f1f, "Track 1 Discretionary Data", EMV_TAG_STRING },
+    { 0x9f20, "Track 2 Discretionary Data", EMV_TAG_STRING },
+    { 0x9f21, "Transaction Time" },
+    { 0x9f22, "Certification Authority Public Key Index - Terminal" },
+    { 0x9f23, "Upper Consecutive Offline Limit" },
+    { 0x9f26, "Application Cryptogram" },
+    { 0x9f27, "Cryptogram Information Data", EMV_TAG_CID },
+    { 0x9f2a, "Kernel Identifier" },
+    { 0x9f2d, "ICC PIN Encipherment Public Key Certificate" },
+    { 0x9f2e, "ICC PIN Encipherment Public Key Exponent" },
+    { 0x9f2f, "ICC PIN Encipherment Public Key Remainder" },
+    { 0x9f32, "Issuer Public Key Exponent" },
+    { 0x9f33, "Terminal Capabilities" },
+    { 0x9f34, "Cardholder Verification Method (CVM) Results" },
+    { 0x9f35, "Terminal Type" },
+    { 0x9f36, "Application Transaction Counter (ATC)" },
+    { 0x9f37, "Unpredictable Number" },
+    { 0x9f38, "Processing Options Data Object List (PDOL)", EMV_TAG_DOL },
+    { 0x9f39, "Point-of-Service (POS) Entry Mode", EMV_TAG_NUMERIC },
+    { 0x9f3a, "Amount, Reference Currency" },
+    { 0x9f3b, "Application Reference Currency", EMV_TAG_NUMERIC },
+    { 0x9f3c, "Transaction Reference Currency Code", EMV_TAG_NUMERIC },
+    { 0x9f3d, "Transaction Reference Currency Exponent", EMV_TAG_NUMERIC },
+    { 0x9f40, "Additional Terminal Capabilities" },
+    { 0x9f41, "Transaction Sequence Counter", EMV_TAG_NUMERIC },
+    { 0x9f42, "Application Currency Code", EMV_TAG_NUMERIC },
+    { 0x9f43, "Application Reference Currency Exponent", EMV_TAG_NUMERIC },
+    { 0x9f44, "Application Currency Exponent", EMV_TAG_NUMERIC },
+    { 0x9f45, "Data Authentication Code" },
+    { 0x9f46, "ICC Public Key Certificate" },
+    { 0x9f47, "ICC Public Key Exponent" },
+    { 0x9f48, "ICC Public Key Remainder" },
+    { 0x9f49, "Dynamic Data Authentication Data Object List (DDOL)", EMV_TAG_DOL },
+    { 0x9f4a, "Static Data Authentication Tag List" },
+    { 0x9f4b, "Signed Dynamic Application Data" },
+    { 0x9f4c, "ICC Dynamic Number" },
+    { 0x9f4d, "Log Entry" },
+    { 0x9f4e, "Merchant Name and Location", EMV_TAG_STRING },
+    { 0x9f4f, "Log Format", EMV_TAG_DOL },
 
-	{ 0x9f50, "Offline Accumulator Balance" },
-	{ 0x9f51, "Application Currency Code" },
-	{ 0x9f51, "DRDOL" },
+    { 0x9f50, "Offline Accumulator Balance" },
+    { 0x9f51, "Application Currency Code" },
+    { 0x9f51, "DRDOL" },
 
-	{ 0x9f52, "Application Default Action (ADA)" },
-	{ 0x9f52, "Terminal Compatibility Indicator" },
+    { 0x9f52, "Application Default Action (ADA)" },
+    { 0x9f52, "Terminal Compatibility Indicator" },
 
-	{ 0x9f53, "Transaction Category Code" },
-	{ 0x9f54, "DS ODS Card" },
+    { 0x9f53, "Transaction Category Code" },
+    { 0x9f54, "DS ODS Card" },
 
-	{ 0x9f55, "Mobile Support Indicator" },
-	{ 0x9f55, "Issuer Authentication Flags" },
+    { 0x9f55, "Mobile Support Indicator" },
+    { 0x9f55, "Issuer Authentication Flags" },
 
-	{ 0x9f56, "Issuer Authentication Indicator" },
-	{ 0x9f57, "Issuer Country Code" },
-	{ 0x9f58, "Consecutive Transaction Counter Limit (CTCL)" },
-	{ 0x9f59, "Consecutive Transaction Counter Upper Limit (CTCUL)" },
-	{ 0x9f5A, "Application Program Identifier" },
-	{ 0x9f5b, "Issuer Script Results" },
-	{ 0x9f5c, "Cumulative Total Transaction Amount Upper Limit (CTTAUL)" },
-	{ 0x9f5d, "Application Capabilities Information" },
-	{ 0x9f5e, "Data Storage Identifier" },
-	{ 0x9f5f, "DS Slot Availability" },
+    { 0x9f56, "Issuer Authentication Indicator" },
+    { 0x9f57, "Issuer Country Code" },
+    { 0x9f58, "Consecutive Transaction Counter Limit (CTCL)" },
+    { 0x9f59, "Consecutive Transaction Counter Upper Limit (CTCUL)" },
+    { 0x9f5A, "Application Program Identifier" },
+    { 0x9f5b, "Issuer Script Results" },
+    { 0x9f5c, "Cumulative Total Transaction Amount Upper Limit (CTTAUL)" },
+    { 0x9f5d, "Application Capabilities Information" },
+    { 0x9f5e, "Data Storage Identifier" },
+    { 0x9f5f, "DS Slot Availability" },
 
-	{ 0x9f60, "CVC3 (Track1)" },
-	{ 0x9f61, "CVC3 (Track2)" },
-	{ 0x9f62, "PCVC3 (Track1)" },
-	{ 0x9f63, "PUNATC (Track1)" },
-	{ 0x9f64, "NATC (Track1)" },
-	{ 0x9f65, "PCVC3 (Track2)" },
-	{ 0x9f66, "PUNATC (Track2) / Terminal Transaction Qualifiers (TTQ)", EMV_TAG_BITMASK, &EMV_TTQ },
-	{ 0x9f67, "NATC (Track2) / MSD Offset" },
-	{ 0x9f68, "Cardholder verification method list (PayPass)" },
-	{ 0x9f69, "Card Authentication Related Data (UDOL)" },
-	{ 0x9f6a, "Unpredictable Number", EMV_TAG_NUMERIC },
-	{ 0x9f6b, "Track 2 Data" },
-	{ 0x9f6c, "Card Transaction Qualifiers (CTQ)", EMV_TAG_BITMASK, &EMV_CTQ },
-	{ 0x9f6d, "Mag-stripe Application Version Number (Reader)" },
-	{ 0x9f6e, "Form Factor Indicator" },
-	{ 0x9f6f, "DS Slot Management Control" },
+    { 0x9f60, "CVC3 (Track1)" },
+    { 0x9f61, "CVC3 (Track2)" },
+    { 0x9f62, "PCVC3 (Track1)" },
+    { 0x9f63, "PUNATC (Track1)" },
+    { 0x9f64, "NATC (Track1)" },
+    { 0x9f65, "PCVC3 (Track2)" },
+    { 0x9f66, "PUNATC (Track2) / Terminal Transaction Qualifiers (TTQ)", EMV_TAG_BITMASK, &EMV_TTQ },
+    { 0x9f67, "NATC (Track2) / MSD Offset" },
+    { 0x9f68, "Cardholder verification method list (PayPass)" },
+    { 0x9f69, "Card Authentication Related Data (UDOL)" },
+    { 0x9f6a, "Unpredictable Number", EMV_TAG_NUMERIC },
+    { 0x9f6b, "Track 2 Data" },
+    { 0x9f6c, "Card Transaction Qualifiers (CTQ)", EMV_TAG_BITMASK, &EMV_CTQ },
+    { 0x9f6d, "Mag-stripe Application Version Number (Reader)" },
+    { 0x9f6e, "Form Factor Indicator" },
+    { 0x9f6f, "DS Slot Management Control" },
 
-	{ 0x9f70, "Protected Data Envelope 1" },
-	{ 0x9f71, "Protected Data Envelope 2" },
-	{ 0x9f72, "Protected Data Envelope 3" },
-	{ 0x9f73, "Protected Data Envelope 4" },
-	{ 0x9f74, "Protected Data Envelope 5" },
-	{ 0x9f75, "Unprotected Data Envelope 1" },
-	{ 0x9f76, "Unprotected Data Envelope 2" },
-	{ 0x9f77, "Unprotected Data Envelope 3" },
-	{ 0x9f78, "Unprotected Data Envelope 4" },
-	{ 0x9f79, "Unprotected Data Envelope 5" },
-	{ 0x9f7c, "Merchant Custom Data / Customer Exclusive Data (CED)" },
-	{ 0x9f7d, "DS Summary 1" },
-	{ 0x9f7f, "DS Unpredictable Number" },
+    { 0x9f70, "Protected Data Envelope 1" },
+    { 0x9f71, "Protected Data Envelope 2" },
+    { 0x9f72, "Protected Data Envelope 3" },
+    { 0x9f73, "Protected Data Envelope 4" },
+    { 0x9f74, "Protected Data Envelope 5" },
+    { 0x9f75, "Unprotected Data Envelope 1" },
+    { 0x9f76, "Unprotected Data Envelope 2" },
+    { 0x9f77, "Unprotected Data Envelope 3" },
+    { 0x9f78, "Unprotected Data Envelope 4" },
+    { 0x9f79, "Unprotected Data Envelope 5" },
+    { 0x9f7c, "Merchant Custom Data / Customer Exclusive Data (CED)" },
+    { 0x9f7d, "DS Summary 1" },
+    { 0x9f7f, "DS Unpredictable Number" },
 
-	{ 0xa5  , "File Control Information (FCI) Proprietary Template" },
-	{ 0xbf0c, "File Control Information (FCI) Issuer Discretionary Data" },
-	{ 0xdf20, "Issuer Proprietary Bitmap (IPB)" },
-	{ 0xdf4b, "POS Cardholder Interaction Information" },
-	{ 0xdf60, "VISA Log Entry" },
-	{ 0xdf61, "DS Digest H" },
-	{ 0xdf62, "DS ODS Info" },
-	{ 0xdf63, "DS ODS Term" },
+    { 0xa5  , "File Control Information (FCI) Proprietary Template" },
+    { 0xbf0c, "File Control Information (FCI) Issuer Discretionary Data" },
+    { 0xdf20, "Issuer Proprietary Bitmap (IPB)" },
+    { 0xdf4b, "POS Cardholder Interaction Information" },
+    { 0xdf60, "VISA Log Entry" },
+    { 0xdf61, "DS Digest H" },
+    { 0xdf62, "DS ODS Info" },
+    { 0xdf63, "DS ODS Term" },
 
-	{ 0xdf8104, "Balance Read Before Gen AC" },
-	{ 0xdf8105, "Balance Read After Gen AC" },
-	{ 0xdf8106, "Data Needed" },
-	{ 0xdf8107, "CDOL1 Related Data" },
-	{ 0xdf8108, "DS AC Type" },
-	{ 0xdf8109, "DS Input (Term)" },
-	{ 0xdf810a, "DS ODS Info For Reader" },
-	{ 0xdf810b, "DS Summary Status" },
-	{ 0xdf810c, "Kernel ID" },
-	{ 0xdf810d, "DSVN Term" },
-	{ 0xdf810e, "Post-Gen AC Put Data Status" },
-	{ 0xdf810f, "Pre-Gen AC Put Data Status" },
-	{ 0xdf8110, "Proceed To First Write Flag" },
-	{ 0xdf8111, "PDOL Related Data" },
-	{ 0xdf8112, "Tags To Read" },
-	{ 0xdf8113, "DRDOL Related Data" },
-	{ 0xdf8114, "Reference Control Parameter" },
-	{ 0xdf8115, "Error Indication" },
-	{ 0xdf8116, "User Interface Request Data" },
-	{ 0xdf8117, "Card Data Input Capability" },
-	{ 0xdf8118, "CVM Capability - CVM Required" },
-	{ 0xdf8119, "CVM Capability - No CVM Required" },
-	{ 0xdf811a, "Default UDOL" },
-	{ 0xdf811b, "Kernel Configuration" },
-	{ 0xdf811c, "Max Lifetime of Torn Transaction Log Record" },
-	{ 0xdf811d, "Max Number of Torn Transaction Log Records" },
-	{ 0xdf811e, "Mag-stripe CVM Capability – CVM Required" },
-	{ 0xdf811f, "Security Capability" },
-	{ 0xdf8120, "Terminal Action Code – Default" },
-	{ 0xdf8121, "Terminal Action Code – Denial" },
-	{ 0xdf8122, "Terminal Action Code – Online" },
-	{ 0xdf8123, "Reader Contactless Floor Limit" },
-	{ 0xdf8124, "Reader Contactless Transaction Limit (No On-device CVM)" },
-	{ 0xdf8125, "Reader Contactless Transaction Limit (On-device CVM)" },
-	{ 0xdf8126, "Reader CVM Required Limit" },
-	{ 0xdf8127, "TIME_OUT_VALUE" },
-	{ 0xdf8128, "IDS Status" },
-	{ 0xdf8129, "Outcome Parameter Set" },
-	{ 0xdf812a, "DD Card (Track1)" },
-	{ 0xdf812b, "DD Card (Track2)" },
-	{ 0xdf812c, "Mag-stripe CVM Capability – No CVM Required" },
-	{ 0xdf812d, "Message Hold Time" },
+    { 0xdf8104, "Balance Read Before Gen AC" },
+    { 0xdf8105, "Balance Read After Gen AC" },
+    { 0xdf8106, "Data Needed" },
+    { 0xdf8107, "CDOL1 Related Data" },
+    { 0xdf8108, "DS AC Type" },
+    { 0xdf8109, "DS Input (Term)" },
+    { 0xdf810a, "DS ODS Info For Reader" },
+    { 0xdf810b, "DS Summary Status" },
+    { 0xdf810c, "Kernel ID" },
+    { 0xdf810d, "DSVN Term" },
+    { 0xdf810e, "Post-Gen AC Put Data Status" },
+    { 0xdf810f, "Pre-Gen AC Put Data Status" },
+    { 0xdf8110, "Proceed To First Write Flag" },
+    { 0xdf8111, "PDOL Related Data" },
+    { 0xdf8112, "Tags To Read" },
+    { 0xdf8113, "DRDOL Related Data" },
+    { 0xdf8114, "Reference Control Parameter" },
+    { 0xdf8115, "Error Indication" },
+    { 0xdf8116, "User Interface Request Data" },
+    { 0xdf8117, "Card Data Input Capability" },
+    { 0xdf8118, "CVM Capability - CVM Required" },
+    { 0xdf8119, "CVM Capability - No CVM Required" },
+    { 0xdf811a, "Default UDOL" },
+    { 0xdf811b, "Kernel Configuration" },
+    { 0xdf811c, "Max Lifetime of Torn Transaction Log Record" },
+    { 0xdf811d, "Max Number of Torn Transaction Log Records" },
+    { 0xdf811e, "Mag-stripe CVM Capability – CVM Required" },
+    { 0xdf811f, "Security Capability" },
+    { 0xdf8120, "Terminal Action Code – Default" },
+    { 0xdf8121, "Terminal Action Code – Denial" },
+    { 0xdf8122, "Terminal Action Code – Online" },
+    { 0xdf8123, "Reader Contactless Floor Limit" },
+    { 0xdf8124, "Reader Contactless Transaction Limit (No On-device CVM)" },
+    { 0xdf8125, "Reader Contactless Transaction Limit (On-device CVM)" },
+    { 0xdf8126, "Reader CVM Required Limit" },
+    { 0xdf8127, "TIME_OUT_VALUE" },
+    { 0xdf8128, "IDS Status" },
+    { 0xdf8129, "Outcome Parameter Set" },
+    { 0xdf812a, "DD Card (Track1)" },
+    { 0xdf812b, "DD Card (Track2)" },
+    { 0xdf812c, "Mag-stripe CVM Capability – No CVM Required" },
+    { 0xdf812d, "Message Hold Time" },
 
-	{ 0xff8101, "Torn Record" },
-	{ 0xff8102, "Tags To Write Before Gen AC" },
-	{ 0xff8103, "Tags To Write After Gen AC" },
-	{ 0xff8104, "Data To Send" },
-	{ 0xff8105, "Data Record" },
-	{ 0xff8106, "Discretionary Data" },
+    { 0xff8101, "Torn Record" },
+    { 0xff8102, "Tags To Write Before Gen AC" },
+    { 0xff8103, "Tags To Write After Gen AC" },
+    { 0xff8104, "Data To Send" },
+    { 0xff8105, "Data Record" },
+    { 0xff8106, "Discretionary Data" },
 };
 
 static int emv_sort_tag(tlv_tag_t tag) {
-	return (int)(tag >= 0x100 ? tag : tag << 8);
+    return (int)(tag >= 0x100 ? tag : tag << 8);
 }
 
 static int emv_tlv_compare(const void *a, const void *b) {
-	const struct tlv *tlv = a;
-	const struct emv_tag *tag = b;
+    const struct tlv *tlv = a;
+    const struct emv_tag *tag = b;
 
-	return emv_sort_tag(tlv->tag) - (emv_sort_tag(tag->tag));
+    return emv_sort_tag(tlv->tag) - (emv_sort_tag(tag->tag));
 }
 
 static const struct emv_tag *emv_get_tag(const struct tlv *tlv) {
-	struct emv_tag *tag = bsearch(tlv, emv_tags, sizeof(emv_tags)/sizeof(emv_tags[0]),
-			sizeof(emv_tags[0]), emv_tlv_compare);
+    struct emv_tag *tag = bsearch(tlv, emv_tags, sizeof(emv_tags)/sizeof(emv_tags[0]),
+            sizeof(emv_tags[0]), emv_tlv_compare);
 
-	return tag ? tag : &emv_tags[0];
+    return tag ? tag : &emv_tags[0];
 }
 
 static const char *bitstrings[] = {
-	".......1",
-	"......1.",
-	".....1..",
-	"....1...",
-	"...1....",
-	"..1.....",
-	".1......",
-	"1.......",
+    ".......1",
+    "......1.",
+    ".....1..",
+    "....1...",
+    "...1....",
+    "..1.....",
+    ".1......",
+    "1.......",
 };
 
 static void emv_tag_dump_bitmask(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level) {
-	const struct emv_tag_bit *bits = tag->data;
-	unsigned bit, byte;
+    const struct emv_tag_bit *bits = tag->data;
+    unsigned bit, byte;
 
-	for (byte = 1; byte <= tlv->len; byte ++) {
-		unsigned char val = tlv->value[byte - 1];
-		PRINT_INDENT(level);
-		fprintf(f, "\tByte %u (%02x)\n", byte, val);
-		for (bit = 8; bit > 0; bit--, val <<= 1) {
-			if (val & 0x80){
-				PRINT_INDENT(level);
-				fprintf(f, "\t\t%s - '%s'\n", bitstrings[bit - 1],
-						bits->bit == EMV_BIT(byte, bit) ? bits->name : "Unknown");
-			}
-			if (bits->bit == EMV_BIT(byte, bit))
-				bits ++;
-		}
-	}
+    for (byte = 1; byte <= tlv->len; byte ++) {
+        unsigned char val = tlv->value[byte - 1];
+        PRINT_INDENT(level);
+        fprintf(f, "\tByte %u (%02x)\n", byte, val);
+        for (bit = 8; bit > 0; bit--, val <<= 1) {
+            if (val & 0x80){
+                PRINT_INDENT(level);
+                fprintf(f, "\t\t%s - '%s'\n", bitstrings[bit - 1],
+                        bits->bit == EMV_BIT(byte, bit) ? bits->name : "Unknown");
+            }
+            if (bits->bit == EMV_BIT(byte, bit))
+                bits ++;
+        }
+    }
 }
 
 static void emv_tag_dump_dol(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level) {
-	const unsigned char *buf = tlv->value;
-	size_t left = tlv->len;
+    const unsigned char *buf = tlv->value;
+    size_t left = tlv->len;
 
-	while (left) {
-		struct tlv doltlv;
-		const struct emv_tag *doltag;
+    while (left) {
+        struct tlv doltlv;
+        const struct emv_tag *doltag;
 
-		if (!tlv_parse_tl(&buf, &left, &doltlv)) {
-			PRINT_INDENT(level);
-			fprintf(f, "Invalid Tag-Len\n");
-			continue;
-		}
+        if (!tlv_parse_tl(&buf, &left, &doltlv)) {
+            PRINT_INDENT(level);
+            fprintf(f, "Invalid Tag-Len\n");
+            continue;
+        }
 
-		doltag = emv_get_tag(&doltlv);
+        doltag = emv_get_tag(&doltlv);
 
-		PRINT_INDENT(level);
-		fprintf(f, "\tTag %4hx len %02zx ('%s')\n", doltlv.tag, doltlv.len, doltag->name);
-	}
+        PRINT_INDENT(level);
+        fprintf(f, "\tTag %4hx len %02zx ('%s')\n", doltlv.tag, doltlv.len, doltag->name);
+    }
 }
 
 static void emv_tag_dump_string(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level) {
-	fprintf(f, "\tString value '");
-	fwrite(tlv->value, 1, tlv->len, f);
-	fprintf(f, "'\n");
+    fprintf(f, "\tString value '");
+    fwrite(tlv->value, 1, tlv->len, f);
+    fprintf(f, "'\n");
 }
 
 static unsigned long emv_value_numeric(const struct tlv *tlv, unsigned start, unsigned end) {
-	unsigned long ret = 0;
-	int i;
+    unsigned long ret = 0;
+    int i;
 
-	if (end > tlv->len * 2)
-		return ret;
-	if (start >= end)
-		return ret;
+    if (end > tlv->len * 2)
+        return ret;
+    if (start >= end)
+        return ret;
 
-	if (start & 1) {
-		ret += tlv->value[start/2] & 0xf;
-		i = start + 1;
-	} else
-		i = start;
+    if (start & 1) {
+        ret += tlv->value[start/2] & 0xf;
+        i = start + 1;
+    } else
+        i = start;
 
-	for (; i < end - 1; i += 2) {
-		ret *= 10;
-		ret += tlv->value[i/2] >> 4;
-		ret *= 10;
-		ret += tlv->value[i/2] & 0xf;
-	}
+    for (; i < end - 1; i += 2) {
+        ret *= 10;
+        ret += tlv->value[i/2] >> 4;
+        ret *= 10;
+        ret += tlv->value[i/2] & 0xf;
+    }
 
-	if (end & 1) {
-		ret *= 10;
-		ret += tlv->value[end/2] >> 4;
-	}
+    if (end & 1) {
+        ret *= 10;
+        ret += tlv->value[end/2] >> 4;
+    }
 
-	return ret;
+    return ret;
 }
 
 static void emv_tag_dump_numeric(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level) {
-	PRINT_INDENT(level);
-	fprintf(f, "\tNumeric value %lu\n", emv_value_numeric(tlv, 0, tlv->len * 2));
+    PRINT_INDENT(level);
+    fprintf(f, "\tNumeric value %lu\n", emv_value_numeric(tlv, 0, tlv->len * 2));
 }
 
 static void emv_tag_dump_yymmdd(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level) {
-	PRINT_INDENT(level);
-	fprintf(f, "\tDate: 20%02ld.%ld.%ld\n",
-			emv_value_numeric(tlv, 0, 2),
-			emv_value_numeric(tlv, 2, 4),
-			emv_value_numeric(tlv, 4, 6));
+    PRINT_INDENT(level);
+    fprintf(f, "\tDate: 20%02ld.%ld.%ld\n",
+            emv_value_numeric(tlv, 0, 2),
+            emv_value_numeric(tlv, 2, 4),
+            emv_value_numeric(tlv, 4, 6));
 }
 
 static uint32_t emv_get_binary(const unsigned char *S) {
-	return (S[0] << 24) | (S[1] << 16) | (S[2] << 8) | (S[3] << 0);
+    return (S[0] << 24) | (S[1] << 16) | (S[2] << 8) | (S[3] << 0);
 }
 
 // https://github.com/binaryfoo/emv-bertlv/blob/master/src/main/resources/fields/visa-cvr.txt
 static void emv_tag_dump_cvr(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level) {
-	if (!tlv || tlv->len < 1) {
-		PRINT_INDENT(level);
-		fprintf(f, "\tINVALID!\n");
-		return;
-	}
+    if (!tlv || tlv->len < 1) {
+        PRINT_INDENT(level);
+        fprintf(f, "\tINVALID!\n");
+        return;
+    }
 
-	if (tlv->len != tlv->value[0] + 1) {
-		PRINT_INDENT(level);
-		fprintf(f, "\tINVALID length!\n");
-		return;
-	}
+    if (tlv->len != tlv->value[0] + 1) {
+        PRINT_INDENT(level);
+        fprintf(f, "\tINVALID length!\n");
+        return;
+    }
 
-	if (tlv->len >= 2) {
-		// AC1
-		PRINT_INDENT(level);
-		if ((tlv->value[1] & 0xC0) == 0x00)	fprintf(f, "\tAC1: AAC (Transaction declined)\n");
-		if ((tlv->value[1] & 0xC0) == 0x40)	fprintf(f, "\tAC1: TC (Transaction approved)\n");
-		if ((tlv->value[1] & 0xC0) == 0x80)	fprintf(f, "\tAC1: ARQC (Online authorisation requested)\n");
-		if ((tlv->value[1] & 0xC0) == 0xC0)	fprintf(f, "\tAC1: RFU\n");
-		// AC2
-		PRINT_INDENT(level);
-		if ((tlv->value[1] & 0x30) == 0x00)	fprintf(f, "\tAC2: AAC (Transaction declined)\n");
-		if ((tlv->value[1] & 0x30) == 0x10)	fprintf(f, "\tAC2: TC (Transaction approved)\n");
-		if ((tlv->value[1] & 0x30) == 0x20)	fprintf(f, "\tAC2: not requested (ARQC)\n");
-		if ((tlv->value[1] & 0x30) == 0x30)	fprintf(f, "\tAC2: RFU\n");
-	}
-	if (tlv->len >= 3 && (tlv->value[2] >> 4)) {
-		PRINT_INDENT(level);
-		fprintf(f, "\tPIN try: %x\n", tlv->value[2] >> 4);
-	}
-	if (tlv->len >= 4 && (tlv->value[3] & 0x0F)) {
-		PRINT_INDENT(level);
-		fprintf(f, "\tIssuer discretionary bits: %x\n", tlv->value[3] & 0x0F);
-	}
-	if (tlv->len >= 5 && (tlv->value[4] >> 4)) {
-		PRINT_INDENT(level);
-		fprintf(f, "\tSuccessfully processed issuer script commands: %x\n", tlv->value[4] >> 4);
-	}
+    if (tlv->len >= 2) {
+        // AC1
+        PRINT_INDENT(level);
+        if ((tlv->value[1] & 0xC0) == 0x00) fprintf(f, "\tAC1: AAC (Transaction declined)\n");
+        if ((tlv->value[1] & 0xC0) == 0x40) fprintf(f, "\tAC1: TC (Transaction approved)\n");
+        if ((tlv->value[1] & 0xC0) == 0x80) fprintf(f, "\tAC1: ARQC (Online authorisation requested)\n");
+        if ((tlv->value[1] & 0xC0) == 0xC0) fprintf(f, "\tAC1: RFU\n");
+        // AC2
+        PRINT_INDENT(level);
+        if ((tlv->value[1] & 0x30) == 0x00) fprintf(f, "\tAC2: AAC (Transaction declined)\n");
+        if ((tlv->value[1] & 0x30) == 0x10) fprintf(f, "\tAC2: TC (Transaction approved)\n");
+        if ((tlv->value[1] & 0x30) == 0x20) fprintf(f, "\tAC2: not requested (ARQC)\n");
+        if ((tlv->value[1] & 0x30) == 0x30) fprintf(f, "\tAC2: RFU\n");
+    }
+    if (tlv->len >= 3 && (tlv->value[2] >> 4)) {
+        PRINT_INDENT(level);
+        fprintf(f, "\tPIN try: %x\n", tlv->value[2] >> 4);
+    }
+    if (tlv->len >= 4 && (tlv->value[3] & 0x0F)) {
+        PRINT_INDENT(level);
+        fprintf(f, "\tIssuer discretionary bits: %x\n", tlv->value[3] & 0x0F);
+    }
+    if (tlv->len >= 5 && (tlv->value[4] >> 4)) {
+        PRINT_INDENT(level);
+        fprintf(f, "\tSuccessfully processed issuer script commands: %x\n", tlv->value[4] >> 4);
+    }
 
-	// mask 0F 0F F0 0F
-	uint8_t data[20] = {0};
-	memcpy(data, &tlv->value[1], tlv->len - 1);
-	data[0] &= 0x0F;
-	data[1] &= 0x0F;
-	data[2] &= 0xF0;
-	data[3] &= 0x0F;
-	const struct tlv bit_tlv = {
-		.tag = tlv->tag,
-		.len = tlv->len - 1,
-		.value = data,
-	};
-	const struct emv_tag bit_tag = {
-		.tag = tag->tag,
-		.name = tag->name,
-		.type = EMV_TAG_BITMASK,
-		.data = EMV_CVR,
-	};
+    // mask 0F 0F F0 0F
+    uint8_t data[20] = {0};
+    memcpy(data, &tlv->value[1], tlv->len - 1);
+    data[0] &= 0x0F;
+    data[1] &= 0x0F;
+    data[2] &= 0xF0;
+    data[3] &= 0x0F;
+    const struct tlv bit_tlv = {
+        .tag = tlv->tag,
+        .len = tlv->len - 1,
+        .value = data,
+    };
+    const struct emv_tag bit_tag = {
+        .tag = tag->tag,
+        .name = tag->name,
+        .type = EMV_TAG_BITMASK,
+        .data = EMV_CVR,
+    };
 
-	if (data[0] || data[1] || data[2] || data[3])
-		emv_tag_dump_bitmask(&bit_tlv, &bit_tag, f, level);
+    if (data[0] || data[1] || data[2] || data[3])
+        emv_tag_dump_bitmask(&bit_tlv, &bit_tag, f, level);
 }
 
 // EMV Book 3
 static void emv_tag_dump_cid(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level) {
-	if (!tlv || tlv->len < 1) {
-		PRINT_INDENT(level);
-		fprintf(f, "\tINVALID!\n");
-		return;
-	}
+    if (!tlv || tlv->len < 1) {
+        PRINT_INDENT(level);
+        fprintf(f, "\tINVALID!\n");
+        return;
+    }
 
-	PRINT_INDENT(level);
-	if ((tlv->value[0] & EMVAC_AC_MASK) == EMVAC_AAC)		fprintf(f, "\tAC1: AAC (Transaction declined)\n");
-	if ((tlv->value[0] & EMVAC_AC_MASK) == EMVAC_TC)		fprintf(f, "\tAC1: TC (Transaction approved)\n");
-	if ((tlv->value[0] & EMVAC_AC_MASK) == EMVAC_ARQC)		fprintf(f, "\tAC1: ARQC (Online authorisation requested)\n");
-	if ((tlv->value[0] & EMVAC_AC_MASK) == EMVAC_AC_MASK)	fprintf(f, "\tAC1: RFU\n");
+    PRINT_INDENT(level);
+    if ((tlv->value[0] & EMVAC_AC_MASK) == EMVAC_AAC)       fprintf(f, "\tAC1: AAC (Transaction declined)\n");
+    if ((tlv->value[0] & EMVAC_AC_MASK) == EMVAC_TC)        fprintf(f, "\tAC1: TC (Transaction approved)\n");
+    if ((tlv->value[0] & EMVAC_AC_MASK) == EMVAC_ARQC)      fprintf(f, "\tAC1: ARQC (Online authorisation requested)\n");
+    if ((tlv->value[0] & EMVAC_AC_MASK) == EMVAC_AC_MASK)   fprintf(f, "\tAC1: RFU\n");
 
-	if (tlv->value[0] & EMVCID_ADVICE) {
-		PRINT_INDENT(level);
-		fprintf(f, "\tAdvice required!\n");
-	}
+    if (tlv->value[0] & EMVCID_ADVICE) {
+        PRINT_INDENT(level);
+        fprintf(f, "\tAdvice required!\n");
+    }
 
-	if (tlv->value[0] & EMVCID_REASON_MASK) {
-		PRINT_INDENT(level);
-		fprintf(f, "\tReason/advice/referral code: ");
-		switch((tlv->value[0] & EMVCID_REASON_MASK)) {
-			case 0:
-				fprintf(f, "No information given\n");
-				break;
-			case 1:
-				fprintf(f, "Service not allowed\n");
-				break;
-			case 2:
-				fprintf(f, "PIN Try Limit exceeded\n");
-				break;
-			case 3:
-				fprintf(f, "Issuer authentication failed\n");
-				break;
-			default:
-				fprintf(f, "\tRFU: %2x\n", (tlv->value[0] & EMVCID_REASON_MASK));
-				break;
-		}
-	}
+    if (tlv->value[0] & EMVCID_REASON_MASK) {
+        PRINT_INDENT(level);
+        fprintf(f, "\tReason/advice/referral code: ");
+        switch((tlv->value[0] & EMVCID_REASON_MASK)) {
+            case 0:
+                fprintf(f, "No information given\n");
+                break;
+            case 1:
+                fprintf(f, "Service not allowed\n");
+                break;
+            case 2:
+                fprintf(f, "PIN Try Limit exceeded\n");
+                break;
+            case 3:
+                fprintf(f, "Issuer authentication failed\n");
+                break;
+            default:
+                fprintf(f, "\tRFU: %2x\n", (tlv->value[0] & EMVCID_REASON_MASK));
+                break;
+        }
+    }
 }
 
 static void emv_tag_dump_cvm_list(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level) {
-	uint32_t X, Y;
-	int i;
+    uint32_t X, Y;
+    int i;
 
-	if (tlv->len < 10 || tlv->len % 2) {
-		PRINT_INDENT(level);
-		fprintf(f, "\tINVALID!\n");
-		return;
-	}
+    if (tlv->len < 10 || tlv->len % 2) {
+        PRINT_INDENT(level);
+        fprintf(f, "\tINVALID!\n");
+        return;
+    }
 
-	X = emv_get_binary(tlv->value);
-	Y = emv_get_binary(tlv->value + 4);
+    X = emv_get_binary(tlv->value);
+    Y = emv_get_binary(tlv->value + 4);
 
-	PRINT_INDENT(level);
-	fprintf(f, "\tX: %d\n", X);
-	PRINT_INDENT(level);
-	fprintf(f, "\tY: %d\n", Y);
+    PRINT_INDENT(level);
+    fprintf(f, "\tX: %d\n", X);
+    PRINT_INDENT(level);
+    fprintf(f, "\tY: %d\n", Y);
 
-	for (i = 8; i < tlv->len; i+= 2) {
-		const char *method;
-		const char *condition;
+    for (i = 8; i < tlv->len; i+= 2) {
+        const char *method;
+        const char *condition;
 
-		switch (tlv->value[i] & 0x3f) {
-		case 0x0:
-			method = "Fail CVM processing";
-			break;
-		case 0x1:
-			method = "Plaintext PIN verification performed by ICC";
-			break;
-		case 0x2:
-			method = "Enciphered PIN verified online";
-			break;
-		case 0x3:
-			method = "Plaintext PIN verification performed by ICC and signature (paper)";
-			break;
-		case 0x4:
-			method = "Enciphered PIN verification performed by ICC";
-			break;
-		case 0x5:
-			method = "Enciphered PIN verification performed by ICC and signature (paper)";
-			break;
-		case 0x1e:
-			method = "Signature (paper)";
-			break;
-		case 0x1f:
-			method = "No CVM required";
-			break;
-		case 0x3f:
-			method = "NOT AVAILABLE!";
-			break;
-		default:
-			method = "Unknown";
-			break;
-		}
+        switch (tlv->value[i] & 0x3f) {
+        case 0x0:
+            method = "Fail CVM processing";
+            break;
+        case 0x1:
+            method = "Plaintext PIN verification performed by ICC";
+            break;
+        case 0x2:
+            method = "Enciphered PIN verified online";
+            break;
+        case 0x3:
+            method = "Plaintext PIN verification performed by ICC and signature (paper)";
+            break;
+        case 0x4:
+            method = "Enciphered PIN verification performed by ICC";
+            break;
+        case 0x5:
+            method = "Enciphered PIN verification performed by ICC and signature (paper)";
+            break;
+        case 0x1e:
+            method = "Signature (paper)";
+            break;
+        case 0x1f:
+            method = "No CVM required";
+            break;
+        case 0x3f:
+            method = "NOT AVAILABLE!";
+            break;
+        default:
+            method = "Unknown";
+            break;
+        }
 
-		switch (tlv->value[i+1]) {
-		case 0x00:
-			condition = "Always";
-			break;
-		case 0x01:
-			condition = "If unattended cash";
-			break;
-		case 0x02:
-			condition = "If not unattended cash and not manual cash and not purchase with cashback";
-			break;
-		case 0x03:
-			condition = "If terminal supports the CVM";
-			break;
-		case 0x04:
-			condition = "If manual cash";
-			break;
-		case 0x05:
-			condition = "If purchase with cashback";
-			break;
-		case 0x06:
-			condition = "If transaction is in the application currency and is under X value";
-			break;
-		case 0x07:
-			condition = "If transaction is in the application currency and is over X value";
-			break;
-		case 0x08:
-			condition = "If transaction is in the application currency and is under Y value";
-			break;
-		case 0x09:
-			condition = "If transaction is in the application currency and is over Y value";
-			break;
-		default:
-			condition = "Unknown";
-			break;
-		}
+        switch (tlv->value[i+1]) {
+        case 0x00:
+            condition = "Always";
+            break;
+        case 0x01:
+            condition = "If unattended cash";
+            break;
+        case 0x02:
+            condition = "If not unattended cash and not manual cash and not purchase with cashback";
+            break;
+        case 0x03:
+            condition = "If terminal supports the CVM";
+            break;
+        case 0x04:
+            condition = "If manual cash";
+            break;
+        case 0x05:
+            condition = "If purchase with cashback";
+            break;
+        case 0x06:
+            condition = "If transaction is in the application currency and is under X value";
+            break;
+        case 0x07:
+            condition = "If transaction is in the application currency and is over X value";
+            break;
+        case 0x08:
+            condition = "If transaction is in the application currency and is under Y value";
+            break;
+        case 0x09:
+            condition = "If transaction is in the application currency and is over Y value";
+            break;
+        default:
+            condition = "Unknown";
+            break;
+        }
 
-		PRINT_INDENT(level);
-		fprintf(f, "\t%02x %02x: '%s' '%s' and '%s' if this CVM is unsuccessful\n",
-				tlv->value[i], tlv->value[i+1],
-				method, condition, (tlv->value[i] & 0x40) ? "continue" : "fail");
-	}
+        PRINT_INDENT(level);
+        fprintf(f, "\t%02x %02x: '%s' '%s' and '%s' if this CVM is unsuccessful\n",
+                tlv->value[i], tlv->value[i+1],
+                method, condition, (tlv->value[i] & 0x40) ? "continue" : "fail");
+    }
 }
 
 static void emv_tag_dump_afl(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level) {
-	if (tlv->len < 4 || tlv->len % 4) {
-		PRINT_INDENT(level);
-		fprintf(f, "\tINVALID!\n");
-		return;
-	}
+    if (tlv->len < 4 || tlv->len % 4) {
+        PRINT_INDENT(level);
+        fprintf(f, "\tINVALID!\n");
+        return;
+    }
 
-	for (int i = 0; i < tlv->len / 4; i++) {
-		PRINT_INDENT(level);
-		fprintf(f, "SFI[%02x] start:%02x end:%02x offline:%02x\n", tlv->value[i * 4 + 0] >> 3, tlv->value[i * 4 + 1], tlv->value[i * 4 + 2], tlv->value[i * 4 + 3]);
-	}
+    for (int i = 0; i < tlv->len / 4; i++) {
+        PRINT_INDENT(level);
+        fprintf(f, "SFI[%02x] start:%02x end:%02x offline:%02x\n", tlv->value[i * 4 + 0] >> 3, tlv->value[i * 4 + 1], tlv->value[i * 4 + 2], tlv->value[i * 4 + 3]);
+    }
 }
 
 bool emv_tag_dump(const struct tlv *tlv, FILE *f, int level) {
-	if (!tlv) {
-		fprintf(f, "NULL\n");
-		return false;
-	}
+    if (!tlv) {
+        fprintf(f, "NULL\n");
+        return false;
+    }
 
-	const struct emv_tag *tag = emv_get_tag(tlv);
+    const struct emv_tag *tag = emv_get_tag(tlv);
 
-	PRINT_INDENT(level);
-	fprintf(f, "--%2hx[%02zx] '%s':", tlv->tag, tlv->len, tag->name);
+    PRINT_INDENT(level);
+    fprintf(f, "--%2hx[%02zx] '%s':", tlv->tag, tlv->len, tag->name);
 
-	switch (tag->type) {
-	case EMV_TAG_GENERIC:
-		fprintf(f, "\n");
-		break;
-	case EMV_TAG_BITMASK:
-		fprintf(f, "\n");
-		emv_tag_dump_bitmask(tlv, tag, f, level);
-		break;
-	case EMV_TAG_DOL:
-		fprintf(f, "\n");
-		emv_tag_dump_dol(tlv, tag, f, level);
-		break;
-	case EMV_TAG_CVM_LIST:
-		fprintf(f, "\n");
-		emv_tag_dump_cvm_list(tlv, tag, f, level);
-		break;
-	case EMV_TAG_AFL:
-		fprintf(f, "\n");
-		emv_tag_dump_afl(tlv, tag, f, level);
-		break;
-	case EMV_TAG_STRING:
-		emv_tag_dump_string(tlv, tag, f, level);
-		break;
-	case EMV_TAG_NUMERIC:
-		emv_tag_dump_numeric(tlv, tag, f, level);
-		break;
-	case EMV_TAG_YYMMDD:
-		emv_tag_dump_yymmdd(tlv, tag, f, level);
-		break;
-	case EMV_TAG_CVR:
-		fprintf(f, "\n");
-		emv_tag_dump_cvr(tlv, tag, f, level);
-		break;
-	case EMV_TAG_CID:
-		fprintf(f, "\n");
-		emv_tag_dump_cid(tlv, tag, f, level);
-		break;
-	};
+    switch (tag->type) {
+    case EMV_TAG_GENERIC:
+        fprintf(f, "\n");
+        break;
+    case EMV_TAG_BITMASK:
+        fprintf(f, "\n");
+        emv_tag_dump_bitmask(tlv, tag, f, level);
+        break;
+    case EMV_TAG_DOL:
+        fprintf(f, "\n");
+        emv_tag_dump_dol(tlv, tag, f, level);
+        break;
+    case EMV_TAG_CVM_LIST:
+        fprintf(f, "\n");
+        emv_tag_dump_cvm_list(tlv, tag, f, level);
+        break;
+    case EMV_TAG_AFL:
+        fprintf(f, "\n");
+        emv_tag_dump_afl(tlv, tag, f, level);
+        break;
+    case EMV_TAG_STRING:
+        emv_tag_dump_string(tlv, tag, f, level);
+        break;
+    case EMV_TAG_NUMERIC:
+        emv_tag_dump_numeric(tlv, tag, f, level);
+        break;
+    case EMV_TAG_YYMMDD:
+        emv_tag_dump_yymmdd(tlv, tag, f, level);
+        break;
+    case EMV_TAG_CVR:
+        fprintf(f, "\n");
+        emv_tag_dump_cvr(tlv, tag, f, level);
+        break;
+    case EMV_TAG_CID:
+        fprintf(f, "\n");
+        emv_tag_dump_cid(tlv, tag, f, level);
+        break;
+    };
 
-	return true;
+    return true;
 }
 
 char *emv_get_tag_name(const struct tlv *tlv) {
-	static char *defstr = "";
+    static char *defstr = "";
 
-	if (!tlv)
-		return defstr;
+    if (!tlv)
+        return defstr;
 
-	const struct emv_tag *tag = emv_get_tag(tlv);
-	if (tag)
-		return tag->name;
+    const struct emv_tag *tag = emv_get_tag(tlv);
+    if (tag)
+        return tag->name;
 
-	return defstr;
+    return defstr;
 }
diff --git a/client/emv/emvcore.c b/client/emv/emvcore.c
index 796fc22ea..b2fc430a2 100644
--- a/client/emv/emvcore.c
+++ b/client/emv/emvcore.c
@@ -15,1032 +15,1032 @@
 // Got from here. Thanks)
 // https://eftlab.co.uk/index.php/site-map/knowledge-base/211-emv-aid-rid-pix
 static const char *PSElist [] = {
-	"325041592E5359532E4444463031", // 2PAY.SYS.DDF01 - Visa Proximity Payment System Environment - PPSE
-	"315041592E5359532E4444463031"  // 1PAY.SYS.DDF01 - Visa Payment System Environment - PSE
+    "325041592E5359532E4444463031", // 2PAY.SYS.DDF01 - Visa Proximity Payment System Environment - PPSE
+    "315041592E5359532E4444463031"  // 1PAY.SYS.DDF01 - Visa Payment System Environment - PSE
 };
 //static const size_t PSElistLen = sizeof(PSElist)/sizeof(char*);
 
 char *TransactionTypeStr[] = {
-	"MSD",
-	"VSDC",
-	"qVCDCMCHIP",
-	"CDA"
+    "MSD",
+    "VSDC",
+    "qVCDCMCHIP",
+    "CDA"
 };
 
 typedef struct {
-	enum CardPSVendor vendor;
-	const char* aid;
+    enum CardPSVendor vendor;
+    const char* aid;
 } TAIDList;
 
 static const TAIDList AIDlist [] = {
-	// Visa International
-	{ CV_VISA, 	"A00000000305076010"},			// VISA ELO Credit
-	{ CV_VISA, 	"A0000000031010" },				// VISA Debit/Credit (Classic)
-	{ CV_VISA, 	"A000000003101001" },			// VISA Credit
-	{ CV_VISA, 	"A000000003101002" },			// VISA Debit
-	{ CV_VISA, 	"A0000000032010" },				// VISA Electron
-	{ CV_VISA, 	"A0000000032020" },				// VISA
-	{ CV_VISA, 	"A0000000033010" },				// VISA Interlink
-	{ CV_VISA, 	"A0000000034010" },				// VISA Specific
-	{ CV_VISA, 	"A0000000035010" },				// VISA Specific
-	{ CV_VISA, 	"A0000000036010" },				// Domestic Visa Cash Stored Value
-	{ CV_VISA, 	"A0000000036020" },				// International Visa Cash Stored Value
-	{ CV_VISA, 	"A0000000038002" },				// VISA Auth, VisaRemAuthen EMV-CAP (DPA)
-	{ CV_VISA, 	"A0000000038010" },				// VISA Plus
-	{ CV_VISA, 	"A0000000039010" },				// VISA Loyalty
-	{ CV_VISA, 	"A000000003999910" },			// VISA Proprietary ATM
-	// Visa USA
-	{ CV_VISA, 	"A000000098" },					// Debit Card
-	{ CV_VISA, 	"A0000000980848" },				// Debit Card
-	// Mastercard International
-	{ CV_MASTERCARD, "A00000000401" },			// MasterCard PayPass
-	{ CV_MASTERCARD, "A0000000041010" },		// MasterCard Credit
-	{ CV_MASTERCARD, "A00000000410101213" },	// MasterCard Credit
-	{ CV_MASTERCARD, "A00000000410101215" },	// MasterCard Credit
-	{ CV_MASTERCARD, "A0000000042010" },		// MasterCard Specific
-	{ CV_MASTERCARD, "A0000000043010" },		// MasterCard Specific
-	{ CV_MASTERCARD, "A0000000043060" },		// Maestro (Debit)
-	{ CV_MASTERCARD, "A000000004306001" },		// Maestro (Debit)
-	{ CV_MASTERCARD, "A0000000044010" },		// MasterCard Specific
-	{ CV_MASTERCARD, "A0000000045010" },		// MasterCard Specific
-	{ CV_MASTERCARD, "A0000000046000" },		// Cirrus
-	{ CV_MASTERCARD, "A0000000048002" },		// SecureCode Auth EMV-CAP
-	{ CV_MASTERCARD, "A0000000049999" },		// MasterCard PayPass
-	// American Express
-	{ CV_AMERICANEXPRESS, "A000000025" },
-	{ CV_AMERICANEXPRESS, "A0000000250000" },
-	{ CV_AMERICANEXPRESS, "A00000002501" },
-	{ CV_AMERICANEXPRESS, "A000000025010402" },
-	{ CV_AMERICANEXPRESS, "A000000025010701" },
-	{ CV_AMERICANEXPRESS, "A000000025010801" },
-	// Groupement des Cartes Bancaires "CB"
-	{ CV_CB, "A0000000421010" },				// Cartes Bancaire EMV Card
-	{ CV_CB, "A0000000422010" },
-	{ CV_CB, "A0000000423010" },
-	{ CV_CB, "A0000000424010" },
-	{ CV_CB, "A0000000425010" },
-	// JCB CO., LTD.
-	{ CV_JCB, "A00000006510" },					// JCB
-	{ CV_JCB, "A0000000651010" },				// JCB J Smart Credit
-	// Other
-	{ CV_OTHER, "A0000001544442" },				// Banricompras Debito - Banrisul - Banco do Estado do Rio Grande do SUL - S.A.
-	{ CV_OTHER, "F0000000030001" },				// BRADESCO
-	{ CV_OTHER, "A0000005241010" },				// RuPay - RuPay
-	{ CV_OTHER, "D5780000021010" }				// Bankaxept - Bankaxept
+    // Visa International
+    { CV_VISA,     "A00000000305076010"},        // VISA ELO Credit
+    { CV_VISA,     "A0000000031010" },           // VISA Debit/Credit (Classic)
+    { CV_VISA,     "A000000003101001" },         // VISA Credit
+    { CV_VISA,     "A000000003101002" },         // VISA Debit
+    { CV_VISA,     "A0000000032010" },           // VISA Electron
+    { CV_VISA,     "A0000000032020" },           // VISA
+    { CV_VISA,     "A0000000033010" },           // VISA Interlink
+    { CV_VISA,     "A0000000034010" },           // VISA Specific
+    { CV_VISA,     "A0000000035010" },           // VISA Specific
+    { CV_VISA,     "A0000000036010" },           // Domestic Visa Cash Stored Value
+    { CV_VISA,     "A0000000036020" },           // International Visa Cash Stored Value
+    { CV_VISA,     "A0000000038002" },           // VISA Auth, VisaRemAuthen EMV-CAP (DPA)
+    { CV_VISA,     "A0000000038010" },           // VISA Plus
+    { CV_VISA,     "A0000000039010" },           // VISA Loyalty
+    { CV_VISA,     "A000000003999910" },         // VISA Proprietary ATM
+    // Visa USA
+    { CV_VISA,     "A000000098" },               // Debit Card
+    { CV_VISA,     "A0000000980848" },           // Debit Card
+    // Mastercard International
+    { CV_MASTERCARD, "A00000000401" },           // MasterCard PayPass
+    { CV_MASTERCARD, "A0000000041010" },         // MasterCard Credit
+    { CV_MASTERCARD, "A00000000410101213" },     // MasterCard Credit
+    { CV_MASTERCARD, "A00000000410101215" },     // MasterCard Credit
+    { CV_MASTERCARD, "A0000000042010" },         // MasterCard Specific
+    { CV_MASTERCARD, "A0000000043010" },         // MasterCard Specific
+    { CV_MASTERCARD, "A0000000043060" },         // Maestro (Debit)
+    { CV_MASTERCARD, "A000000004306001" },       // Maestro (Debit)
+    { CV_MASTERCARD, "A0000000044010" },         // MasterCard Specific
+    { CV_MASTERCARD, "A0000000045010" },         // MasterCard Specific
+    { CV_MASTERCARD, "A0000000046000" },         // Cirrus
+    { CV_MASTERCARD, "A0000000048002" },         // SecureCode Auth EMV-CAP
+    { CV_MASTERCARD, "A0000000049999" },         // MasterCard PayPass
+    // American Express
+    { CV_AMERICANEXPRESS, "A000000025" },
+    { CV_AMERICANEXPRESS, "A0000000250000" },
+    { CV_AMERICANEXPRESS, "A00000002501" },
+    { CV_AMERICANEXPRESS, "A000000025010402" },
+    { CV_AMERICANEXPRESS, "A000000025010701" },
+    { CV_AMERICANEXPRESS, "A000000025010801" },
+    // Groupement des Cartes Bancaires "CB"
+    { CV_CB, "A0000000421010" },                 // Cartes Bancaire EMV Card
+    { CV_CB, "A0000000422010" },
+    { CV_CB, "A0000000423010" },
+    { CV_CB, "A0000000424010" },
+    { CV_CB, "A0000000425010" },
+    // JCB CO., LTD.
+    { CV_JCB, "A00000006510" },                  // JCB
+    { CV_JCB, "A0000000651010" },                // JCB J Smart Credit
+    // Other
+    { CV_OTHER, "A0000001544442" },              // Banricompras Debito - Banrisul - Banco do Estado do Rio Grande do SUL - S.A.
+    { CV_OTHER, "F0000000030001" },              // BRADESCO
+    { CV_OTHER, "A0000005241010" },              // RuPay - RuPay
+    { CV_OTHER, "D5780000021010" }               // Bankaxept - Bankaxept
 };
 static const size_t AIDlistLen = sizeof(AIDlist)/sizeof(TAIDList);
 
 static bool APDULogging = false;
 void SetAPDULogging(bool logging) {
-	APDULogging = logging;
+    APDULogging = logging;
 }
 
 enum CardPSVendor GetCardPSVendor(uint8_t * AID, size_t AIDlen) {
-	char buf[100] = {0};
-	if (AIDlen < 1)
-		return CV_NA;
+    char buf[100] = {0};
+    if (AIDlen < 1)
+        return CV_NA;
 
-	hex_to_buffer((uint8_t *)buf, AID, AIDlen, sizeof(buf) - 1, 0, 0, true);
+    hex_to_buffer((uint8_t *)buf, AID, AIDlen, sizeof(buf) - 1, 0, 0, true);
 
-	for(int i = 0; i < AIDlistLen; i ++) {
-		if (strncmp(AIDlist[i].aid, buf, strlen(AIDlist[i].aid)) == 0){
-			return AIDlist[i].vendor;
-		}
-	}
+    for(int i = 0; i < AIDlistLen; i ++) {
+        if (strncmp(AIDlist[i].aid, buf, strlen(AIDlist[i].aid)) == 0){
+            return AIDlist[i].vendor;
+        }
+    }
 
-	return CV_NA;
+    return CV_NA;
 }
 
 static bool print_cb(void *data, const struct tlv *tlv, int level, bool is_leaf) {
-	emv_tag_dump(tlv, stdout, level);
-	if (is_leaf) {
-		dump_buffer(tlv->value, tlv->len, stdout, level);
-	}
+    emv_tag_dump(tlv, stdout, level);
+    if (is_leaf) {
+        dump_buffer(tlv->value, tlv->len, stdout, level);
+    }
 
-	return true;
+    return true;
 }
 
 bool TLVPrintFromBuffer(uint8_t *data, int datalen) {
-	struct tlvdb *t = NULL;
-	t = tlvdb_parse_multi(data, datalen);
-	if (t) {
-		PrintAndLogEx(NORMAL, "-------------------- TLV decoded --------------------");
+    struct tlvdb *t = NULL;
+    t = tlvdb_parse_multi(data, datalen);
+    if (t) {
+        PrintAndLogEx(NORMAL, "-------------------- TLV decoded --------------------");
 
-		tlvdb_visit(t, print_cb, NULL, 0);
-		tlvdb_free(t);
-		return true;
-	} else {
-		PrintAndLogEx(WARNING, "TLV ERROR: Can't parse response as TLV tree.");
-	}
-	return false;
+        tlvdb_visit(t, print_cb, NULL, 0);
+        tlvdb_free(t);
+        return true;
+    } else {
+        PrintAndLogEx(WARNING, "TLV ERROR: Can't parse response as TLV tree.");
+    }
+    return false;
 }
 
 void TLVPrintFromTLVLev(struct tlvdb *tlv, int level) {
-	if (!tlv)
-		return;
+    if (!tlv)
+        return;
 
-	tlvdb_visit(tlv, print_cb, NULL, level);
+    tlvdb_visit(tlv, print_cb, NULL, level);
 }
 
 void TLVPrintFromTLV(struct tlvdb *tlv) {
-	TLVPrintFromTLVLev(tlv, 0);
+    TLVPrintFromTLVLev(tlv, 0);
 }
 
 void TLVPrintAIDlistFromSelectTLV(struct tlvdb *tlv) {
-	PrintAndLogEx(NORMAL, "|------------------|--------|-------------------------|");
-	PrintAndLogEx(NORMAL, "|    AID           |Priority| Name                    |");
-	PrintAndLogEx(NORMAL, "|------------------|--------|-------------------------|");
+    PrintAndLogEx(NORMAL, "|------------------|--------|-------------------------|");
+    PrintAndLogEx(NORMAL, "|    AID           |Priority| Name                    |");
+    PrintAndLogEx(NORMAL, "|------------------|--------|-------------------------|");
 
-	struct tlvdb *ttmp = tlvdb_find(tlv, 0x6f);
-	if (!ttmp)
-		PrintAndLogEx(NORMAL, "|                         none                        |");
+    struct tlvdb *ttmp = tlvdb_find(tlv, 0x6f);
+    if (!ttmp)
+        PrintAndLogEx(NORMAL, "|                         none                        |");
 
-	while (ttmp) {
-		const struct tlv *tgAID = tlvdb_get_inchild(ttmp, 0x84, NULL);
-		const struct tlv *tgName = tlvdb_get_inchild(ttmp, 0x50, NULL);
-		const struct tlv *tgPrio = tlvdb_get_inchild(ttmp, 0x87, NULL);
-		if (!tgAID)
-			break;
-		PrintAndLogEx(NORMAL, "|%s|   %s  |%s|",
-			sprint_hex_inrow_ex(tgAID->value, tgAID->len, 18),
-			(tgPrio) ? sprint_hex(tgPrio->value, 1) : "   ",
-			(tgName) ? sprint_ascii_ex(tgName->value, tgName->len, 25) : "                         ");
+    while (ttmp) {
+        const struct tlv *tgAID = tlvdb_get_inchild(ttmp, 0x84, NULL);
+        const struct tlv *tgName = tlvdb_get_inchild(ttmp, 0x50, NULL);
+        const struct tlv *tgPrio = tlvdb_get_inchild(ttmp, 0x87, NULL);
+        if (!tgAID)
+            break;
+        PrintAndLogEx(NORMAL, "|%s|   %s  |%s|",
+            sprint_hex_inrow_ex(tgAID->value, tgAID->len, 18),
+            (tgPrio) ? sprint_hex(tgPrio->value, 1) : "   ",
+            (tgName) ? sprint_ascii_ex(tgName->value, tgName->len, 25) : "                         ");
 
-		ttmp = tlvdb_find_next(ttmp, 0x6f);
-	}
+        ttmp = tlvdb_find_next(ttmp, 0x6f);
+    }
 
-	PrintAndLogEx(NORMAL, "|------------------|--------|-------------------------|");
+    PrintAndLogEx(NORMAL, "|------------------|--------|-------------------------|");
 }
 
 struct tlvdb *GetPANFromTrack2(const struct tlv *track2) {
-	char track2Hex[200] = {0};
-	uint8_t PAN[100] = {0};
-	int PANlen = 0;
-	char *tmp = track2Hex;
+    char track2Hex[200] = {0};
+    uint8_t PAN[100] = {0};
+    int PANlen = 0;
+    char *tmp = track2Hex;
 
-	if (!track2)
-		return NULL;
+    if (!track2)
+        return NULL;
 
-	for (int i = 0; i < track2->len; ++i, tmp += 2)
-		sprintf(tmp, "%02x", (unsigned int)track2->value[i]);
+    for (int i = 0; i < track2->len; ++i, tmp += 2)
+        sprintf(tmp, "%02x", (unsigned int)track2->value[i]);
 
-	int posD = strchr(track2Hex, 'd') - track2Hex;
-	if (posD < 1)
-		return NULL;
+    int posD = strchr(track2Hex, 'd') - track2Hex;
+    if (posD < 1)
+        return NULL;
 
-	track2Hex[posD] = 0;
-	if (strlen(track2Hex) % 2) {
-		track2Hex[posD] = 'F';
-		track2Hex[posD + 1] = '\0';
-	}
+    track2Hex[posD] = 0;
+    if (strlen(track2Hex) % 2) {
+        track2Hex[posD] = 'F';
+        track2Hex[posD + 1] = '\0';
+    }
 
-	param_gethex_to_eol(track2Hex, 0, PAN, sizeof(PAN), &PANlen);
+    param_gethex_to_eol(track2Hex, 0, PAN, sizeof(PAN), &PANlen);
 
   return tlvdb_fixed(0x5a, PANlen, PAN);
 }
 
 struct tlvdb *GetdCVVRawFromTrack2(const struct tlv *track2) {
-	char track2Hex[200] = {0};
-	char dCVVHex[100] = {0};
-	uint8_t dCVV[100] = {0};
-	int dCVVlen = 0;
-	const int PINlen = 5; // must calculated from 9F67 MSD Offset but i have not seen this tag)
-	char *tmp = track2Hex;
+    char track2Hex[200] = {0};
+    char dCVVHex[100] = {0};
+    uint8_t dCVV[100] = {0};
+    int dCVVlen = 0;
+    const int PINlen = 5; // must calculated from 9F67 MSD Offset but i have not seen this tag)
+    char *tmp = track2Hex;
 
-	if (!track2)
-		return NULL;
+    if (!track2)
+        return NULL;
 
-	for (int i = 0; i < track2->len; ++i, tmp += 2)
-		sprintf(tmp, "%02x", (unsigned int)track2->value[i]);
+    for (int i = 0; i < track2->len; ++i, tmp += 2)
+        sprintf(tmp, "%02x", (unsigned int)track2->value[i]);
 
-	int posD = strchr(track2Hex, 'd') - track2Hex;
-	if (posD < 1)
-		return NULL;
+    int posD = strchr(track2Hex, 'd') - track2Hex;
+    if (posD < 1)
+        return NULL;
 
-	memset(dCVVHex, '0', 32);
-	// ATC
-	memcpy(dCVVHex + 0, track2Hex + posD + PINlen + 11, 4);
-	// PAN 5 hex
-	memcpy(dCVVHex + 4, track2Hex, 5);
-	// expire date
-	memcpy(dCVVHex + 9, track2Hex + posD + 1, 4);
-	// service code
-	memcpy(dCVVHex + 13, track2Hex + posD + 5, 3);
+    memset(dCVVHex, '0', 32);
+    // ATC
+    memcpy(dCVVHex + 0, track2Hex + posD + PINlen + 11, 4);
+    // PAN 5 hex
+    memcpy(dCVVHex + 4, track2Hex, 5);
+    // expire date
+    memcpy(dCVVHex + 9, track2Hex + posD + 1, 4);
+    // service code
+    memcpy(dCVVHex + 13, track2Hex + posD + 5, 3);
 
-	param_gethex_to_eol(dCVVHex, 0, dCVV, sizeof(dCVV), &dCVVlen);
+    param_gethex_to_eol(dCVVHex, 0, dCVV, sizeof(dCVV), &dCVVlen);
 
   return tlvdb_fixed(0x02, dCVVlen, dCVV);
 }
 
 int EMVExchangeEx(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, sAPDU apdu, bool IncludeLe, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
-	uint8_t data[APDU_RES_LEN] = {0};
+    uint8_t data[APDU_RES_LEN] = {0};
 
-	*ResultLen = 0;
-	if (sw)	*sw = 0;
-	uint16_t isw = 0;
-	int res = 0;
+    *ResultLen = 0;
+    if (sw) *sw = 0;
+    uint16_t isw = 0;
+    int res = 0;
 
-	if (ActivateField) {
-		DropFieldEx( channel );
-		msleep(50);
-	}
+    if (ActivateField) {
+        DropFieldEx( channel );
+        msleep(50);
+    }
 
-	// COMPUTE APDU
-	memcpy(data, &apdu, 5);
-	if (apdu.data)
-		memcpy(&data[5], apdu.data, apdu.Lc);
+    // COMPUTE APDU
+    memcpy(data, &apdu, 5);
+    if (apdu.data)
+        memcpy(&data[5], apdu.data, apdu.Lc);
 
-	if (APDULogging)
-		PrintAndLogEx(SUCCESS, ">>>> %s", sprint_hex(data, (IncludeLe?6:5) + apdu.Lc));
+    if (APDULogging)
+        PrintAndLogEx(SUCCESS, ">>>> %s", sprint_hex(data, (IncludeLe?6:5) + apdu.Lc));
 
-	switch(channel) {
-	case ECC_CONTACTLESS:
-		// 6 byes + data = INS + CLA + P1 + P2 + Lc + <data = Nc> + Le(?IncludeLe)
-		res = ExchangeAPDU14a(data, (IncludeLe?6:5) + apdu.Lc, ActivateField, LeaveFieldON, Result, (int)MaxResultLen, (int *)ResultLen);
-		if (res) {
-			return res;
-		}
-		break;
-	case ECC_CONTACT:
+    switch(channel) {
+    case ECC_CONTACTLESS:
+        // 6 byes + data = INS + CLA + P1 + P2 + Lc + <data = Nc> + Le(?IncludeLe)
+        res = ExchangeAPDU14a(data, (IncludeLe?6:5) + apdu.Lc, ActivateField, LeaveFieldON, Result, (int)MaxResultLen, (int *)ResultLen);
+        if (res) {
+            return res;
+        }
+        break;
+    case ECC_CONTACT:
 #ifdef WITH_SMARTCARD
-		res = ExchangeAPDUSC(data, (IncludeLe?6:5) + apdu.Lc, ActivateField, LeaveFieldON, Result, (int)MaxResultLen, (int *)ResultLen);
+        res = ExchangeAPDUSC(data, (IncludeLe?6:5) + apdu.Lc, ActivateField, LeaveFieldON, Result, (int)MaxResultLen, (int *)ResultLen);
 #else
-		res = 1;
+        res = 1;
 #endif
-		if (res) {
-			return res;
-		}
-		break;
-	}
+        if (res) {
+            return res;
+        }
+        break;
+    }
 
-	if (APDULogging)
-		PrintAndLogEx(SUCCESS, "<<<< %s", sprint_hex(Result, *ResultLen));
+    if (APDULogging)
+        PrintAndLogEx(SUCCESS, "<<<< %s", sprint_hex(Result, *ResultLen));
 
-	if (*ResultLen < 2) {
-		return 200;
-	}
+    if (*ResultLen < 2) {
+        return 200;
+    }
 
-	*ResultLen -= 2;
-	isw = Result[*ResultLen] * 0x0100 + Result[*ResultLen + 1];
-	if (sw)
-		*sw = isw;
+    *ResultLen -= 2;
+    isw = Result[*ResultLen] * 0x0100 + Result[*ResultLen + 1];
+    if (sw)
+        *sw = isw;
 
-	if (isw != 0x9000) {
-		if (APDULogging) {
-			if (*sw >> 8 == 0x61) {
-				PrintAndLogEx(ERR, "APDU chaining len:%02x -->", *sw & 0xff);
-			} else {
-				PrintAndLogEx(ERR, "APDU(%02x%02x) ERROR: [%4X] %s", apdu.CLA, apdu.INS, isw, GetAPDUCodeDescription(*sw >> 8, *sw & 0xff));
-				return 5;
-			}
-		}
-	}
+    if (isw != 0x9000) {
+        if (APDULogging) {
+            if (*sw >> 8 == 0x61) {
+                PrintAndLogEx(ERR, "APDU chaining len:%02x -->", *sw & 0xff);
+            } else {
+                PrintAndLogEx(ERR, "APDU(%02x%02x) ERROR: [%4X] %s", apdu.CLA, apdu.INS, isw, GetAPDUCodeDescription(*sw >> 8, *sw & 0xff));
+                return 5;
+            }
+        }
+    }
 
-	// add to tlv tree
-	if (tlv) {
-		struct tlvdb *t = tlvdb_parse_multi(Result, *ResultLen);
-		tlvdb_add(tlv, t);
-	}
+    // add to tlv tree
+    if (tlv) {
+        struct tlvdb *t = tlvdb_parse_multi(Result, *ResultLen);
+        tlvdb_add(tlv, t);
+    }
 
-	return 0;
+    return 0;
 }
 
 int EMVExchange(EMVCommandChannel channel, bool LeaveFieldON, sAPDU apdu, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
-	return EMVExchangeEx(channel, false, LeaveFieldON, apdu, (channel == ECC_CONTACTLESS), Result, MaxResultLen, ResultLen, sw, tlv);
+    return EMVExchangeEx(channel, false, LeaveFieldON, apdu, (channel == ECC_CONTACTLESS), Result, MaxResultLen, ResultLen, sw, tlv);
 }
 
 int EMVSelect(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, uint8_t *AID, size_t AIDLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
-	return EMVExchangeEx(channel, ActivateField, LeaveFieldON, (sAPDU){0x00, 0xa4, 0x04, 0x00, AIDLen, AID}, (channel == ECC_CONTACTLESS), Result, MaxResultLen, ResultLen, sw, tlv);
+    return EMVExchangeEx(channel, ActivateField, LeaveFieldON, (sAPDU){0x00, 0xa4, 0x04, 0x00, AIDLen, AID}, (channel == ECC_CONTACTLESS), Result, MaxResultLen, ResultLen, sw, tlv);
 }
 
 int EMVSelectPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, uint8_t PSENum, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
-	uint8_t buf[APDU_AID_LEN] = {0};
-	*ResultLen = 0;
-	int len = 0;
-	int res = 0;
-	switch (PSENum) {
-		case 1:
-			param_gethex_to_eol(PSElist[1], 0, buf, sizeof(buf), &len);
-			break;
-		case 2:
-			param_gethex_to_eol(PSElist[0], 0, buf, sizeof(buf), &len);
-			break;
-		default:
-			return -1;
-	}
+    uint8_t buf[APDU_AID_LEN] = {0};
+    *ResultLen = 0;
+    int len = 0;
+    int res = 0;
+    switch (PSENum) {
+        case 1:
+            param_gethex_to_eol(PSElist[1], 0, buf, sizeof(buf), &len);
+            break;
+        case 2:
+            param_gethex_to_eol(PSElist[0], 0, buf, sizeof(buf), &len);
+            break;
+        default:
+            return -1;
+    }
 
-	// select
-	res = EMVSelect(channel, ActivateField, LeaveFieldON, buf, len, Result, MaxResultLen, ResultLen, sw, NULL);
+    // select
+    res = EMVSelect(channel, ActivateField, LeaveFieldON, buf, len, Result, MaxResultLen, ResultLen, sw, NULL);
 
-	return res;
+    return res;
 }
 
 int EMVSelectWithRetry(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, uint8_t *AID, size_t AIDLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
-	int retrycnt = 0;
-	int res = 0;
-	do {
-		res = EMVSelect(channel, false, true, AID, AIDLen, Result, MaxResultLen, ResultLen, sw, tlv);
+    int retrycnt = 0;
+    int res = 0;
+    do {
+        res = EMVSelect(channel, false, true, AID, AIDLen, Result, MaxResultLen, ResultLen, sw, tlv);
 
-		// retry if error and not returned sw error
-		if (res && res != 5) {
-			if (++retrycnt < 3){
-				continue;
-			} else {
-				// card select error, proxmark error
-				if (res == 1) {
-					PrintAndLogEx(WARNING, "Exit...");
-					return 1;
-				}
+        // retry if error and not returned sw error
+        if (res && res != 5) {
+            if (++retrycnt < 3){
+                continue;
+            } else {
+                // card select error, proxmark error
+                if (res == 1) {
+                    PrintAndLogEx(WARNING, "Exit...");
+                    return 1;
+                }
 
-				retrycnt = 0;
-				PrintAndLogEx(NORMAL, "Retry failed [%s]. Skiped...", sprint_hex_inrow(AID, AIDLen));
-				return res;
-			}
-		}
-	} while (res && res != 5);
+                retrycnt = 0;
+                PrintAndLogEx(NORMAL, "Retry failed [%s]. Skiped...", sprint_hex_inrow(AID, AIDLen));
+                return res;
+            }
+        }
+    } while (res && res != 5);
 
-	return res;
+    return res;
 }
 
 int EMVCheckAID(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlvdbelm, struct tlvdb *tlv){
-	uint8_t data[APDU_RES_LEN] = {0};
-	size_t datalen = 0;
-	int res = 0;
-	uint16_t sw = 0;
+    uint8_t data[APDU_RES_LEN] = {0};
+    size_t datalen = 0;
+    int res = 0;
+    uint16_t sw = 0;
 
-	while (tlvdbelm) {
-		const struct tlv *tgAID = tlvdb_get_inchild(tlvdbelm, 0x4f, NULL);
-		if (tgAID) {
-			res = EMVSelectWithRetry(channel, false, true, (uint8_t *)tgAID->value, tgAID->len, data, sizeof(data), &datalen, &sw, tlv);
+    while (tlvdbelm) {
+        const struct tlv *tgAID = tlvdb_get_inchild(tlvdbelm, 0x4f, NULL);
+        if (tgAID) {
+            res = EMVSelectWithRetry(channel, false, true, (uint8_t *)tgAID->value, tgAID->len, data, sizeof(data), &datalen, &sw, tlv);
 
-			// if returned sw error
-			if (res == 5) {
-				// next element
-				tlvdbelm = tlvdb_find_next(tlvdbelm, 0x61);
-				continue;
-			}
+            // if returned sw error
+            if (res == 5) {
+                // next element
+                tlvdbelm = tlvdb_find_next(tlvdbelm, 0x61);
+                continue;
+            }
 
-			if (res)
-				break;
+            if (res)
+                break;
 
-			// all is ok
-			if (decodeTLV){
-				PrintAndLogEx(NORMAL, "%s:", sprint_hex_inrow(tgAID->value, tgAID->len));
-				TLVPrintFromBuffer(data, datalen);
-			}
-		}
-		tlvdbelm = tlvdb_find_next(tlvdbelm, 0x61);
-	}
-	return res;
+            // all is ok
+            if (decodeTLV){
+                PrintAndLogEx(NORMAL, "%s:", sprint_hex_inrow(tgAID->value, tgAID->len));
+                TLVPrintFromBuffer(data, datalen);
+            }
+        }
+        tlvdbelm = tlvdb_find_next(tlvdbelm, 0x61);
+    }
+    return res;
 }
 
 int EMVSearchPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, uint8_t PSENum, bool decodeTLV, struct tlvdb *tlv) {
-	uint8_t data[APDU_RES_LEN] = {0};
-	size_t datalen = 0;
-	uint8_t sfidata[0x11][APDU_RES_LEN];
-	size_t sfidatalen[0x11] = {0};
-	uint16_t sw = 0;
-	int res;
-	bool fileFound = false;
+    uint8_t data[APDU_RES_LEN] = {0};
+    size_t datalen = 0;
+    uint8_t sfidata[0x11][APDU_RES_LEN];
+    size_t sfidatalen[0x11] = {0};
+    uint16_t sw = 0;
+    int res;
+    bool fileFound = false;
 
-	// select PPSE
-	res = EMVSelectPSE(channel, ActivateField, true, PSENum, data, sizeof(data), &datalen, &sw);
+    // select PPSE
+    res = EMVSelectPSE(channel, ActivateField, true, PSENum, data, sizeof(data), &datalen, &sw);
 
-	if (!res){
-		if (sw != 0x9000) {
-			PrintAndLogEx(FAILED, "Select PSE error. APDU error: %04x.", sw);
-			return 1;
-		}
+    if (!res){
+        if (sw != 0x9000) {
+            PrintAndLogEx(FAILED, "Select PSE error. APDU error: %04x.", sw);
+            return 1;
+        }
 
-		struct tlvdb *t = NULL;
-		t = tlvdb_parse_multi(data, datalen);
-		if (t) {
-			// PSE/PPSE with SFI
-			struct tlvdb *tsfi = tlvdb_find_path(t, (tlv_tag_t[]){0x6f, 0xa5, 0x88, 0x00});
-			if (tsfi) {
-				uint8_t sfin = 0;
-				tlv_get_uint8(tlvdb_get_tlv(tsfi), &sfin);
-				PrintAndLogEx(INFO, "* PPSE get SFI: 0x%02x.", sfin);
+        struct tlvdb *t = NULL;
+        t = tlvdb_parse_multi(data, datalen);
+        if (t) {
+            // PSE/PPSE with SFI
+            struct tlvdb *tsfi = tlvdb_find_path(t, (tlv_tag_t[]){0x6f, 0xa5, 0x88, 0x00});
+            if (tsfi) {
+                uint8_t sfin = 0;
+                tlv_get_uint8(tlvdb_get_tlv(tsfi), &sfin);
+                PrintAndLogEx(INFO, "* PPSE get SFI: 0x%02x.", sfin);
 
-				for (uint8_t ui = 0x01; ui <= 0x10; ui++) {
-					PrintAndLogEx(INFO, "* * Get SFI: 0x%02x. num: 0x%02x", sfin, ui);
-					res = EMVReadRecord(channel, true, sfin, ui, sfidata[ui], APDU_RES_LEN, &sfidatalen[ui], &sw, NULL);
+                for (uint8_t ui = 0x01; ui <= 0x10; ui++) {
+                    PrintAndLogEx(INFO, "* * Get SFI: 0x%02x. num: 0x%02x", sfin, ui);
+                    res = EMVReadRecord(channel, true, sfin, ui, sfidata[ui], APDU_RES_LEN, &sfidatalen[ui], &sw, NULL);
 
-					// end of records
-					if (sw == 0x6a83) {
-						sfidatalen[ui] = 0;
-						PrintAndLogEx(INFO, "* * PPSE get SFI. End of records.");
-						break;
-					}
+                    // end of records
+                    if (sw == 0x6a83) {
+                        sfidatalen[ui] = 0;
+                        PrintAndLogEx(INFO, "* * PPSE get SFI. End of records.");
+                        break;
+                    }
 
-					// error catch!
-					if (sw != 0x9000) {
-						sfidatalen[ui] = 0;
-						PrintAndLogEx(FAILED, "PPSE get Error. APDU error: %04x.", sw);
-						break;
-					}
+                    // error catch!
+                    if (sw != 0x9000) {
+                        sfidatalen[ui] = 0;
+                        PrintAndLogEx(FAILED, "PPSE get Error. APDU error: %04x.", sw);
+                        break;
+                    }
 
-					if (decodeTLV){
-						TLVPrintFromBuffer(sfidata[ui], sfidatalen[ui]);
-					}
-				}
+                    if (decodeTLV){
+                        TLVPrintFromBuffer(sfidata[ui], sfidatalen[ui]);
+                    }
+                }
 
-				for (uint8_t ui = 0x01; ui <= 0x10; ui++) {
-					if (sfidatalen[ui]) {
-						struct tlvdb *tsfi = NULL;
-						tsfi = tlvdb_parse_multi(sfidata[ui], sfidatalen[ui]);
-						if (tsfi) {
-							struct tlvdb *tsfitmp = tlvdb_find_path(tsfi, (tlv_tag_t[]){0x70, 0x61, 0x00});
-							if (!tsfitmp) {
-								PrintAndLogEx(FAILED, "SFI 0x%02d don't have records.", sfidatalen[ui]);
-								continue;
-							}
-							res = EMVCheckAID(channel, decodeTLV, tsfitmp, tlv);
-							fileFound = true;
-						}
-						tlvdb_free(tsfi);
-					}
-				}
-			}
+                for (uint8_t ui = 0x01; ui <= 0x10; ui++) {
+                    if (sfidatalen[ui]) {
+                        struct tlvdb *tsfi = NULL;
+                        tsfi = tlvdb_parse_multi(sfidata[ui], sfidatalen[ui]);
+                        if (tsfi) {
+                            struct tlvdb *tsfitmp = tlvdb_find_path(tsfi, (tlv_tag_t[]){0x70, 0x61, 0x00});
+                            if (!tsfitmp) {
+                                PrintAndLogEx(FAILED, "SFI 0x%02d don't have records.", sfidatalen[ui]);
+                                continue;
+                            }
+                            res = EMVCheckAID(channel, decodeTLV, tsfitmp, tlv);
+                            fileFound = true;
+                        }
+                        tlvdb_free(tsfi);
+                    }
+                }
+            }
 
 
-			// PSE/PPSE plain (wo SFI)
-			struct tlvdb *ttmp = tlvdb_find_path(t, (tlv_tag_t[]){0x6f, 0xa5, 0xbf0c, 0x61, 0x00});
-			if (ttmp) {
-				res = EMVCheckAID(channel, decodeTLV, ttmp, tlv);
-				fileFound = true;
-			}
+            // PSE/PPSE plain (wo SFI)
+            struct tlvdb *ttmp = tlvdb_find_path(t, (tlv_tag_t[]){0x6f, 0xa5, 0xbf0c, 0x61, 0x00});
+            if (ttmp) {
+                res = EMVCheckAID(channel, decodeTLV, ttmp, tlv);
+                fileFound = true;
+            }
 
-			if (!fileFound)
-				PrintAndLogEx(FAILED, "PPSE don't have records.");
+            if (!fileFound)
+                PrintAndLogEx(FAILED, "PPSE don't have records.");
 
-			tlvdb_free(t);
-		} else {
-			PrintAndLogEx(WARNING, "PPSE ERROR: Can't get TLV from response.");
-		}
-	} else {
-		PrintAndLogEx(WARNING, "PPSE ERROR: Can't select PPSE AID. Error: %d", res);
-	}
+            tlvdb_free(t);
+        } else {
+            PrintAndLogEx(WARNING, "PPSE ERROR: Can't get TLV from response.");
+        }
+    } else {
+        PrintAndLogEx(WARNING, "PPSE ERROR: Can't select PPSE AID. Error: %d", res);
+    }
 
-	if(!LeaveFieldON)
-		DropFieldEx( channel );
+    if(!LeaveFieldON)
+        DropFieldEx( channel );
 
-	return res;
+    return res;
 }
 
 int EMVSearch(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, bool decodeTLV, struct tlvdb *tlv) {
-	uint8_t aidbuf[APDU_AID_LEN] = {0};
-	int aidlen = 0;
-	uint8_t data[APDU_RES_LEN] = {0};
-	size_t datalen = 0;
-	uint16_t sw = 0;
+    uint8_t aidbuf[APDU_AID_LEN] = {0};
+    int aidlen = 0;
+    uint8_t data[APDU_RES_LEN] = {0};
+    size_t datalen = 0;
+    uint16_t sw = 0;
 
-	int res = 0;
-	int retrycnt = 0;
-	for(int i = 0; i < AIDlistLen; i ++) {
-		param_gethex_to_eol(AIDlist[i].aid, 0, aidbuf, sizeof(aidbuf), &aidlen);
-		res = EMVSelect(channel, (i == 0) ? ActivateField : false, (i == AIDlistLen - 1) ? LeaveFieldON : true, aidbuf, aidlen, data, sizeof(data), &datalen, &sw, tlv);
-		// retry if error and not returned sw error
-		if (res && res != 5) {
-			if (++retrycnt < 3){
-				i--;
-			} else {
-				// (1) - card select error, proxmark error OR (200) - result length = 0
-				if (res == 1 || res == 200) {
-					PrintAndLogEx(WARNING, "Exit...");
-					return 1;
-				}
+    int res = 0;
+    int retrycnt = 0;
+    for(int i = 0; i < AIDlistLen; i ++) {
+        param_gethex_to_eol(AIDlist[i].aid, 0, aidbuf, sizeof(aidbuf), &aidlen);
+        res = EMVSelect(channel, (i == 0) ? ActivateField : false, (i == AIDlistLen - 1) ? LeaveFieldON : true, aidbuf, aidlen, data, sizeof(data), &datalen, &sw, tlv);
+        // retry if error and not returned sw error
+        if (res && res != 5) {
+            if (++retrycnt < 3){
+                i--;
+            } else {
+                // (1) - card select error, proxmark error OR (200) - result length = 0
+                if (res == 1 || res == 200) {
+                    PrintAndLogEx(WARNING, "Exit...");
+                    return 1;
+                }
 
-				retrycnt = 0;
-				PrintAndLogEx(FAILED, "Retry failed [%s]. Skipped...", AIDlist[i].aid);
-			}
-			continue;
-		}
-		retrycnt = 0;
+                retrycnt = 0;
+                PrintAndLogEx(FAILED, "Retry failed [%s]. Skipped...", AIDlist[i].aid);
+            }
+            continue;
+        }
+        retrycnt = 0;
 
-		if (res)
-			continue;
+        if (res)
+            continue;
 
-		if (!datalen)
-			continue;
+        if (!datalen)
+            continue;
 
-		if (decodeTLV) {
-			PrintAndLogEx(SUCCESS, "%s", AIDlist[i].aid);
-			TLVPrintFromBuffer(data, datalen);
-		}
-	}
+        if (decodeTLV) {
+            PrintAndLogEx(SUCCESS, "%s", AIDlist[i].aid);
+            TLVPrintFromBuffer(data, datalen);
+        }
+    }
 
-	return 0;
+    return 0;
 }
 
 int EMVSelectApplication(struct tlvdb *tlv, uint8_t *AID, size_t *AIDlen) {
-	// check priority. 0x00 - highest
-	int prio = 0xffff;
+    // check priority. 0x00 - highest
+    int prio = 0xffff;
 
-	*AIDlen = 0;
+    *AIDlen = 0;
 
-	struct tlvdb *ttmp = tlvdb_find(tlv, 0x6f);
-	if (!ttmp)
-		return 1;
+    struct tlvdb *ttmp = tlvdb_find(tlv, 0x6f);
+    if (!ttmp)
+        return 1;
 
-	while (ttmp) {
-		const struct tlv *tgAID = tlvdb_get_inchild(ttmp, 0x84, NULL);
-		const struct tlv *tgPrio = tlvdb_get_inchild(ttmp, 0x87, NULL);
+    while (ttmp) {
+        const struct tlv *tgAID = tlvdb_get_inchild(ttmp, 0x84, NULL);
+        const struct tlv *tgPrio = tlvdb_get_inchild(ttmp, 0x87, NULL);
 
-		if (!tgAID)
-			break;
+        if (!tgAID)
+            break;
 
-		if (tgPrio) {
-			int pt = bytes_to_num((uint8_t*)tgPrio->value, (tgPrio->len < 2) ? tgPrio->len : 2);
-			if (pt < prio) {
-				prio = pt;
+        if (tgPrio) {
+            int pt = bytes_to_num((uint8_t*)tgPrio->value, (tgPrio->len < 2) ? tgPrio->len : 2);
+            if (pt < prio) {
+                prio = pt;
 
-				memcpy(AID, tgAID->value, tgAID->len);
-				*AIDlen = tgAID->len;
-			}
-		} else {
-			// takes the first application from list wo priority
-			if (!*AIDlen) {
-			memcpy(AID, tgAID->value, tgAID->len);
-			*AIDlen = tgAID->len;
-			}
-		}
+                memcpy(AID, tgAID->value, tgAID->len);
+                *AIDlen = tgAID->len;
+            }
+        } else {
+            // takes the first application from list wo priority
+            if (!*AIDlen) {
+            memcpy(AID, tgAID->value, tgAID->len);
+            *AIDlen = tgAID->len;
+            }
+        }
 
-		ttmp = tlvdb_find_next(ttmp, 0x6f);
-	}
+        ttmp = tlvdb_find_next(ttmp, 0x6f);
+    }
 
-	return 0;
+    return 0;
 }
 
 int EMVGPO(EMVCommandChannel channel, bool LeaveFieldON, uint8_t *PDOL, size_t PDOLLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
-	return EMVExchange(channel, LeaveFieldON, (sAPDU){0x80, 0xa8, 0x00, 0x00, PDOLLen, PDOL}, Result, MaxResultLen, ResultLen, sw, tlv);
+    return EMVExchange(channel, LeaveFieldON, (sAPDU){0x80, 0xa8, 0x00, 0x00, PDOLLen, PDOL}, Result, MaxResultLen, ResultLen, sw, tlv);
 }
 
 int EMVReadRecord(EMVCommandChannel channel, bool LeaveFieldON, uint8_t SFI, uint8_t SFIrec, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
-	int res = EMVExchange(channel, LeaveFieldON, (sAPDU){0x00, 0xb2, SFIrec, (SFI << 3) | 0x04, 0, NULL}, Result, MaxResultLen, ResultLen, sw, tlv);
-	if (*sw == 0x6700) {
-		PrintAndLogEx(INFO, ">>> trying to reissue command withouth Le...");
-		res = EMVExchangeEx(channel, false, LeaveFieldON, (sAPDU){0x00, 0xb2, SFIrec, (SFI << 3) | 0x04, 0, NULL}, false, Result, MaxResultLen, ResultLen, sw, tlv);
-	}
-	return res;
+    int res = EMVExchange(channel, LeaveFieldON, (sAPDU){0x00, 0xb2, SFIrec, (SFI << 3) | 0x04, 0, NULL}, Result, MaxResultLen, ResultLen, sw, tlv);
+    if (*sw == 0x6700) {
+        PrintAndLogEx(INFO, ">>> trying to reissue command withouth Le...");
+        res = EMVExchangeEx(channel, false, LeaveFieldON, (sAPDU){0x00, 0xb2, SFIrec, (SFI << 3) | 0x04, 0, NULL}, false, Result, MaxResultLen, ResultLen, sw, tlv);
+    }
+    return res;
 }
 
 int EMVAC(EMVCommandChannel channel, bool LeaveFieldON, uint8_t RefControl, uint8_t *CDOL, size_t CDOLLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
-	return EMVExchange(channel, LeaveFieldON, (sAPDU){0x80, 0xae, RefControl, 0x00, CDOLLen, CDOL}, Result, MaxResultLen, ResultLen, sw, tlv);
+    return EMVExchange(channel, LeaveFieldON, (sAPDU){0x80, 0xae, RefControl, 0x00, CDOLLen, CDOL}, Result, MaxResultLen, ResultLen, sw, tlv);
 }
 
 int EMVGenerateChallenge(EMVCommandChannel channel, bool LeaveFieldON, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
-	int res = EMVExchange(channel, LeaveFieldON, (sAPDU){0x00, 0x84, 0x00, 0x00, 0x00, NULL}, Result, MaxResultLen, ResultLen, sw, tlv);
-	if (*sw == 0x6700) {
-		PrintAndLogEx(INFO, ">>> trying to reissue command withouth Le...");
-		res = EMVExchangeEx(channel, false, LeaveFieldON, (sAPDU){0x00, 0x84, 0x00, 0x00, 0x00, NULL}, false, Result, MaxResultLen, ResultLen, sw, tlv);
-	}
-	return res;
+    int res = EMVExchange(channel, LeaveFieldON, (sAPDU){0x00, 0x84, 0x00, 0x00, 0x00, NULL}, Result, MaxResultLen, ResultLen, sw, tlv);
+    if (*sw == 0x6700) {
+        PrintAndLogEx(INFO, ">>> trying to reissue command withouth Le...");
+        res = EMVExchangeEx(channel, false, LeaveFieldON, (sAPDU){0x00, 0x84, 0x00, 0x00, 0x00, NULL}, false, Result, MaxResultLen, ResultLen, sw, tlv);
+    }
+    return res;
 }
 
 int EMVInternalAuthenticate(EMVCommandChannel channel, bool LeaveFieldON, uint8_t *DDOL, size_t DDOLLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
-	return EMVExchangeEx(channel, false, LeaveFieldON, (sAPDU){0x00, 0x88, 0x00, 0x00, DDOLLen, DDOL}, true, Result, MaxResultLen, ResultLen, sw, tlv);
+    return EMVExchangeEx(channel, false, LeaveFieldON, (sAPDU){0x00, 0x88, 0x00, 0x00, DDOLLen, DDOL}, true, Result, MaxResultLen, ResultLen, sw, tlv);
 }
 
 int MSCComputeCryptoChecksum(EMVCommandChannel channel, bool LeaveFieldON, uint8_t *UDOL, uint8_t UDOLlen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
-	return EMVExchange(channel, LeaveFieldON, (sAPDU){0x80, 0x2a, 0x8e, 0x80, UDOLlen, UDOL}, Result, MaxResultLen, ResultLen, sw, tlv);
+    return EMVExchange(channel, LeaveFieldON, (sAPDU){0x80, 0x2a, 0x8e, 0x80, UDOLlen, UDOL}, Result, MaxResultLen, ResultLen, sw, tlv);
 }
 
 // Authentication
 struct emv_pk *get_ca_pk(struct tlvdb *db) {
-	const struct tlv *df_tlv = tlvdb_get(db, 0x84, NULL);
-	const struct tlv *caidx_tlv = tlvdb_get(db, 0x8f, NULL);
+    const struct tlv *df_tlv = tlvdb_get(db, 0x84, NULL);
+    const struct tlv *caidx_tlv = tlvdb_get(db, 0x8f, NULL);
 
-	if (!df_tlv || !caidx_tlv || df_tlv->len < 6 || caidx_tlv->len != 1)
-		return NULL;
+    if (!df_tlv || !caidx_tlv || df_tlv->len < 6 || caidx_tlv->len != 1)
+        return NULL;
 
-	PrintAndLogEx(NORMAL, "CA public key index 0x%0x", caidx_tlv->value[0]);
-	return emv_pk_get_ca_pk(df_tlv->value, caidx_tlv->value[0]);
+    PrintAndLogEx(NORMAL, "CA public key index 0x%0x", caidx_tlv->value[0]);
+    return emv_pk_get_ca_pk(df_tlv->value, caidx_tlv->value[0]);
 }
 
 int trSDA(struct tlvdb *tlv) {
 
-	struct emv_pk *pk = get_ca_pk(tlv);
-	if (!pk) {
-		PrintAndLogEx(WARNING, "Error: Key not found. Exit.");
-		return 2;
-	}
+    struct emv_pk *pk = get_ca_pk(tlv);
+    if (!pk) {
+        PrintAndLogEx(WARNING, "Error: Key not found. Exit.");
+        return 2;
+    }
 
-	struct emv_pk *issuer_pk = emv_pki_recover_issuer_cert(pk, tlv);
-	if (!issuer_pk) {
-		emv_pk_free(pk);
-		PrintAndLogEx(WARNING, "Error: Issuer certificate not found. Exit.");
-		return 2;
-	}
+    struct emv_pk *issuer_pk = emv_pki_recover_issuer_cert(pk, tlv);
+    if (!issuer_pk) {
+        emv_pk_free(pk);
+        PrintAndLogEx(WARNING, "Error: Issuer certificate not found. Exit.");
+        return 2;
+    }
 
-	PrintAndLogEx(SUCCESS, "Issuer PK recovered. RID %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx CSN %02hhx:%02hhx:%02hhx",
-		issuer_pk->rid[0],
-		issuer_pk->rid[1],
-		issuer_pk->rid[2],
-		issuer_pk->rid[3],
-		issuer_pk->rid[4],
-		issuer_pk->index,
-		issuer_pk->serial[0],
-		issuer_pk->serial[1],
-		issuer_pk->serial[2]
-		);
+    PrintAndLogEx(SUCCESS, "Issuer PK recovered. RID %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx CSN %02hhx:%02hhx:%02hhx",
+        issuer_pk->rid[0],
+        issuer_pk->rid[1],
+        issuer_pk->rid[2],
+        issuer_pk->rid[3],
+        issuer_pk->rid[4],
+        issuer_pk->index,
+        issuer_pk->serial[0],
+        issuer_pk->serial[1],
+        issuer_pk->serial[2]
+        );
 
-	const struct tlv *sda_tlv = tlvdb_get(tlv, 0x21, NULL);
-	if (!sda_tlv || sda_tlv->len < 1) {
-		emv_pk_free(issuer_pk);
-		emv_pk_free(pk);
-		PrintAndLogEx(WARNING, "Can't find input list for Offline Data Authentication. Exit.");
-		return 3;
-	}
+    const struct tlv *sda_tlv = tlvdb_get(tlv, 0x21, NULL);
+    if (!sda_tlv || sda_tlv->len < 1) {
+        emv_pk_free(issuer_pk);
+        emv_pk_free(pk);
+        PrintAndLogEx(WARNING, "Can't find input list for Offline Data Authentication. Exit.");
+        return 3;
+    }
 
-	struct tlvdb *dac_db = emv_pki_recover_dac(issuer_pk, tlv, sda_tlv);
-	if (dac_db) {
-		const struct tlv *dac_tlv = tlvdb_get(dac_db, 0x9f45, NULL);
-		PrintAndLogEx(NORMAL, "SDA verified OK. (Data Authentication Code: %02hhx:%02hhx)\n", dac_tlv->value[0], dac_tlv->value[1]);
-		tlvdb_add(tlv, dac_db);
-	} else {
-		emv_pk_free(issuer_pk);
-		emv_pk_free(pk);
-		PrintAndLogEx(WARNING, "SSAD verify error");
-		return 4;
-	}
+    struct tlvdb *dac_db = emv_pki_recover_dac(issuer_pk, tlv, sda_tlv);
+    if (dac_db) {
+        const struct tlv *dac_tlv = tlvdb_get(dac_db, 0x9f45, NULL);
+        PrintAndLogEx(NORMAL, "SDA verified OK. (Data Authentication Code: %02hhx:%02hhx)\n", dac_tlv->value[0], dac_tlv->value[1]);
+        tlvdb_add(tlv, dac_db);
+    } else {
+        emv_pk_free(issuer_pk);
+        emv_pk_free(pk);
+        PrintAndLogEx(WARNING, "SSAD verify error");
+        return 4;
+    }
 
-	emv_pk_free(issuer_pk);
-	emv_pk_free(pk);
-	return 0;
+    emv_pk_free(issuer_pk);
+    emv_pk_free(pk);
+    return 0;
 }
 
 static const unsigned char default_ddol_value[] = {0x9f, 0x37, 0x04};
 static struct tlv default_ddol_tlv = {.tag = 0x9f49, .len = 3, .value = default_ddol_value };
 
 int trDDA(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlv) {
-	uint8_t buf[APDU_RES_LEN] = {0};
-	size_t len = 0;
-	uint16_t sw = 0;
+    uint8_t buf[APDU_RES_LEN] = {0};
+    size_t len = 0;
+    uint16_t sw = 0;
 
-	struct emv_pk *pk = get_ca_pk(tlv);
-	if (!pk) {
-		PrintAndLogEx(WARNING, "Error: Key not found. Exit.");
-		return 2;
-	}
+    struct emv_pk *pk = get_ca_pk(tlv);
+    if (!pk) {
+        PrintAndLogEx(WARNING, "Error: Key not found. Exit.");
+        return 2;
+    }
 
-	const struct tlv *sda_tlv = tlvdb_get(tlv, 0x21, NULL);
-/*	if (!sda_tlv || sda_tlv->len < 1) { it may be 0!!!!
-		emv_pk_free(pk);
-		PrintAndLogEx(WARNING, "Error: Can't find input list for Offline Data Authentication. Exit.");
-		return 3;
-	}
+    const struct tlv *sda_tlv = tlvdb_get(tlv, 0x21, NULL);
+/* if (!sda_tlv || sda_tlv->len < 1) { it may be 0!!!!
+        emv_pk_free(pk);
+        PrintAndLogEx(WARNING, "Error: Can't find input list for Offline Data Authentication. Exit.");
+        return 3;
+    }
 */
-	struct emv_pk *issuer_pk = emv_pki_recover_issuer_cert(pk, tlv);
-	if (!issuer_pk) {
-		emv_pk_free(pk);
-		PrintAndLogEx(WARNING, "Error: Issuer certificate not found. Exit.");
-		return 2;
-	}
-	PrintAndLogEx(SUCCESS, "Issuer PK recovered. RID %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx CSN %02hhx:%02hhx:%02hhx\n",
-			issuer_pk->rid[0],
-			issuer_pk->rid[1],
-			issuer_pk->rid[2],
-			issuer_pk->rid[3],
-			issuer_pk->rid[4],
-			issuer_pk->index,
-			issuer_pk->serial[0],
-			issuer_pk->serial[1],
-			issuer_pk->serial[2]
-			);
+    struct emv_pk *issuer_pk = emv_pki_recover_issuer_cert(pk, tlv);
+    if (!issuer_pk) {
+        emv_pk_free(pk);
+        PrintAndLogEx(WARNING, "Error: Issuer certificate not found. Exit.");
+        return 2;
+    }
+    PrintAndLogEx(SUCCESS, "Issuer PK recovered. RID %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx CSN %02hhx:%02hhx:%02hhx\n",
+            issuer_pk->rid[0],
+            issuer_pk->rid[1],
+            issuer_pk->rid[2],
+            issuer_pk->rid[3],
+            issuer_pk->rid[4],
+            issuer_pk->index,
+            issuer_pk->serial[0],
+            issuer_pk->serial[1],
+            issuer_pk->serial[2]
+            );
 
-	struct emv_pk *icc_pk = emv_pki_recover_icc_cert(issuer_pk, tlv, sda_tlv);
-	if (!icc_pk) {
-		emv_pk_free(pk);
-		emv_pk_free(issuer_pk);
-		PrintAndLogEx(WARNING, "Error: ICC certificate not found. Exit.");
-		return 2;
-	}
-	PrintAndLogEx(SUCCESS, "ICC PK recovered. RID %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx CSN %02hhx:%02hhx:%02hhx\n",
-			icc_pk->rid[0],
-			icc_pk->rid[1],
-			icc_pk->rid[2],
-			icc_pk->rid[3],
-			icc_pk->rid[4],
-			icc_pk->index,
-			icc_pk->serial[0],
-			icc_pk->serial[1],
-			icc_pk->serial[2]
-			);
+    struct emv_pk *icc_pk = emv_pki_recover_icc_cert(issuer_pk, tlv, sda_tlv);
+    if (!icc_pk) {
+        emv_pk_free(pk);
+        emv_pk_free(issuer_pk);
+        PrintAndLogEx(WARNING, "Error: ICC certificate not found. Exit.");
+        return 2;
+    }
+    PrintAndLogEx(SUCCESS, "ICC PK recovered. RID %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx CSN %02hhx:%02hhx:%02hhx\n",
+            icc_pk->rid[0],
+            icc_pk->rid[1],
+            icc_pk->rid[2],
+            icc_pk->rid[3],
+            icc_pk->rid[4],
+            icc_pk->index,
+            icc_pk->serial[0],
+            icc_pk->serial[1],
+            icc_pk->serial[2]
+            );
 
-	if (tlvdb_get(tlv, 0x9f2d, NULL)) {
-		struct emv_pk *icc_pe_pk = emv_pki_recover_icc_pe_cert(issuer_pk, tlv);
-		if (!icc_pe_pk) {
-			PrintAndLogEx(WARNING, "WARNING: ICC PE PK recover error. ");
-		} else {
-			PrintAndLogEx(SUCCESS, "ICC PE PK recovered. RID %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx CSN %02hhx:%02hhx:%02hhx\n",
-					icc_pe_pk->rid[0],
-					icc_pe_pk->rid[1],
-					icc_pe_pk->rid[2],
-					icc_pe_pk->rid[3],
-					icc_pe_pk->rid[4],
-					icc_pe_pk->index,
-					icc_pe_pk->serial[0],
-					icc_pe_pk->serial[1],
-					icc_pe_pk->serial[2]
-					);
-		}
-	} else {
-		PrintAndLogEx(INFO, "ICC PE PK (PIN Encipherment Public Key Certificate) not found.\n");
-	}
+    if (tlvdb_get(tlv, 0x9f2d, NULL)) {
+        struct emv_pk *icc_pe_pk = emv_pki_recover_icc_pe_cert(issuer_pk, tlv);
+        if (!icc_pe_pk) {
+            PrintAndLogEx(WARNING, "WARNING: ICC PE PK recover error. ");
+        } else {
+            PrintAndLogEx(SUCCESS, "ICC PE PK recovered. RID %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx CSN %02hhx:%02hhx:%02hhx\n",
+                    icc_pe_pk->rid[0],
+                    icc_pe_pk->rid[1],
+                    icc_pe_pk->rid[2],
+                    icc_pe_pk->rid[3],
+                    icc_pe_pk->rid[4],
+                    icc_pe_pk->index,
+                    icc_pe_pk->serial[0],
+                    icc_pe_pk->serial[1],
+                    icc_pe_pk->serial[2]
+                    );
+        }
+    } else {
+        PrintAndLogEx(INFO, "ICC PE PK (PIN Encipherment Public Key Certificate) not found.\n");
+    }
 
-	// 9F4B: Signed Dynamic Application Data
-	const struct tlv *sdad_tlv = tlvdb_get(tlv, 0x9f4b, NULL);
-	// DDA with internal authenticate OR fDDA with filled 0x9F4B tag (GPO result)
-	// EMV kernel3 v2.4, contactless book C-3, C.1., page 147
-	if (sdad_tlv) {
-		PrintAndLogEx(NORMAL, "\n* * Got Signed Dynamic Application Data (9F4B) form GPO. Maybe fDDA...");
+    // 9F4B: Signed Dynamic Application Data
+    const struct tlv *sdad_tlv = tlvdb_get(tlv, 0x9f4b, NULL);
+    // DDA with internal authenticate OR fDDA with filled 0x9F4B tag (GPO result)
+    // EMV kernel3 v2.4, contactless book C-3, C.1., page 147
+    if (sdad_tlv) {
+        PrintAndLogEx(NORMAL, "\n* * Got Signed Dynamic Application Data (9F4B) form GPO. Maybe fDDA...");
 
-		const struct tlvdb *atc_db = emv_pki_recover_atc_ex(icc_pk, tlv, true);
-		if (!atc_db) {
-			PrintAndLogEx(WARNING, "Error: Can't recover IDN (ICC Dynamic Number)");
-			emv_pk_free(pk);
-			emv_pk_free(issuer_pk);
-			emv_pk_free(icc_pk);
-			return 8;
-		}
+        const struct tlvdb *atc_db = emv_pki_recover_atc_ex(icc_pk, tlv, true);
+        if (!atc_db) {
+            PrintAndLogEx(WARNING, "Error: Can't recover IDN (ICC Dynamic Number)");
+            emv_pk_free(pk);
+            emv_pk_free(issuer_pk);
+            emv_pk_free(icc_pk);
+            return 8;
+        }
 
-		// 9f36 Application Transaction Counter (ATC)
-		const struct tlv *atc_tlv = tlvdb_get(atc_db, 0x9f36, NULL);
-		if(atc_tlv) {
-			PrintAndLogEx(NORMAL, "\nATC (Application Transaction Counter) [%zu] %s", atc_tlv->len, sprint_hex_inrow(atc_tlv->value, atc_tlv->len));
+        // 9f36 Application Transaction Counter (ATC)
+        const struct tlv *atc_tlv = tlvdb_get(atc_db, 0x9f36, NULL);
+        if(atc_tlv) {
+            PrintAndLogEx(NORMAL, "\nATC (Application Transaction Counter) [%zu] %s", atc_tlv->len, sprint_hex_inrow(atc_tlv->value, atc_tlv->len));
 
-			const struct tlv *core_atc_tlv = tlvdb_get(tlv, 0x9f36, NULL);
-			if(tlv_equal(core_atc_tlv, atc_tlv)) {
-				PrintAndLogEx(SUCCESS, "ATC check OK.");
-				PrintAndLogEx(SUCCESS, "fDDA (fast DDA) verified OK.");
-			} else {
-				PrintAndLogEx(WARNING, "Error: fDDA verified, but ATC in the certificate and ATC in the record not the same.");
-			}
-		} else {
-			PrintAndLogEx(NORMAL, "\nERROR: fDDA (fast DDA) verify error");
-			emv_pk_free(pk);
-			emv_pk_free(issuer_pk);
-			emv_pk_free(icc_pk);
-			return 9;
-		}
-	} else {
-		struct tlvdb *dac_db = emv_pki_recover_dac(issuer_pk, tlv, sda_tlv);
-		if (dac_db) {
-			const struct tlv *dac_tlv = tlvdb_get(dac_db, 0x9f45, NULL);
-			PrintAndLogEx(NORMAL, "SDAD verified OK. (Data Authentication Code: %02hhx:%02hhx)\n", dac_tlv->value[0], dac_tlv->value[1]);
-			tlvdb_add(tlv, dac_db);
-		} else {
-			PrintAndLogEx(WARNING, "Error: SSAD verify error");
-			emv_pk_free(pk);
-			emv_pk_free(issuer_pk);
-			emv_pk_free(icc_pk);
-			return 4;
-		}
+            const struct tlv *core_atc_tlv = tlvdb_get(tlv, 0x9f36, NULL);
+            if(tlv_equal(core_atc_tlv, atc_tlv)) {
+                PrintAndLogEx(SUCCESS, "ATC check OK.");
+                PrintAndLogEx(SUCCESS, "fDDA (fast DDA) verified OK.");
+            } else {
+                PrintAndLogEx(WARNING, "Error: fDDA verified, but ATC in the certificate and ATC in the record not the same.");
+            }
+        } else {
+            PrintAndLogEx(NORMAL, "\nERROR: fDDA (fast DDA) verify error");
+            emv_pk_free(pk);
+            emv_pk_free(issuer_pk);
+            emv_pk_free(icc_pk);
+            return 9;
+        }
+    } else {
+        struct tlvdb *dac_db = emv_pki_recover_dac(issuer_pk, tlv, sda_tlv);
+        if (dac_db) {
+            const struct tlv *dac_tlv = tlvdb_get(dac_db, 0x9f45, NULL);
+            PrintAndLogEx(NORMAL, "SDAD verified OK. (Data Authentication Code: %02hhx:%02hhx)\n", dac_tlv->value[0], dac_tlv->value[1]);
+            tlvdb_add(tlv, dac_db);
+        } else {
+            PrintAndLogEx(WARNING, "Error: SSAD verify error");
+            emv_pk_free(pk);
+            emv_pk_free(issuer_pk);
+            emv_pk_free(icc_pk);
+            return 4;
+        }
 
-		PrintAndLogEx(NORMAL, "\n* * Calc DDOL");
-		const struct tlv *ddol_tlv = tlvdb_get(tlv, 0x9f49, NULL);
-		if (!ddol_tlv) {
-			ddol_tlv = &default_ddol_tlv;
-			PrintAndLogEx(NORMAL, "DDOL [9f49] not found. Using default DDOL");
-		}
+        PrintAndLogEx(NORMAL, "\n* * Calc DDOL");
+        const struct tlv *ddol_tlv = tlvdb_get(tlv, 0x9f49, NULL);
+        if (!ddol_tlv) {
+            ddol_tlv = &default_ddol_tlv;
+            PrintAndLogEx(NORMAL, "DDOL [9f49] not found. Using default DDOL");
+        }
 
-		struct tlv *ddol_data_tlv = dol_process(ddol_tlv, tlv, 0);
-		if (!ddol_data_tlv) {
-			PrintAndLogEx(WARNING, "Error: Can't create DDOL TLV");
-			emv_pk_free(pk);
-			emv_pk_free(issuer_pk);
-			emv_pk_free(icc_pk);
-			return 5;
-		}
+        struct tlv *ddol_data_tlv = dol_process(ddol_tlv, tlv, 0);
+        if (!ddol_data_tlv) {
+            PrintAndLogEx(WARNING, "Error: Can't create DDOL TLV");
+            emv_pk_free(pk);
+            emv_pk_free(issuer_pk);
+            emv_pk_free(icc_pk);
+            return 5;
+        }
 
-		PrintAndLogEx(NORMAL, "DDOL data[%d]: %s", ddol_data_tlv->len, sprint_hex(ddol_data_tlv->value, ddol_data_tlv->len));
+        PrintAndLogEx(NORMAL, "DDOL data[%d]: %s", ddol_data_tlv->len, sprint_hex(ddol_data_tlv->value, ddol_data_tlv->len));
 
-		PrintAndLogEx(NORMAL, "\n* * Internal Authenticate");
-		int res = EMVInternalAuthenticate(channel, true, (uint8_t *)ddol_data_tlv->value, ddol_data_tlv->len, buf, sizeof(buf), &len, &sw, NULL);
-		if (res) {
-			PrintAndLogEx(WARNING, "Internal Authenticate error(%d): %4x. Exit...", res, sw);
-			free(ddol_data_tlv);
-			emv_pk_free(pk);
-			emv_pk_free(issuer_pk);
-			emv_pk_free(icc_pk);
-			return 6;
-		}
+        PrintAndLogEx(NORMAL, "\n* * Internal Authenticate");
+        int res = EMVInternalAuthenticate(channel, true, (uint8_t *)ddol_data_tlv->value, ddol_data_tlv->len, buf, sizeof(buf), &len, &sw, NULL);
+        if (res) {
+            PrintAndLogEx(WARNING, "Internal Authenticate error(%d): %4x. Exit...", res, sw);
+            free(ddol_data_tlv);
+            emv_pk_free(pk);
+            emv_pk_free(issuer_pk);
+            emv_pk_free(icc_pk);
+            return 6;
+        }
 
-		struct tlvdb *dda_db = NULL;
-		if (buf[0] == 0x80) {
-			if (len < 3 ) {
-				PrintAndLogEx(WARNING, "Error: Internal Authenticate format1 parsing error. length=%d", len);
-			} else {
-				// parse response 0x80
-				struct tlvdb *t80 = tlvdb_parse_multi(buf, len);
-				const struct tlv * t80tlv = tlvdb_get_tlv(t80);
+        struct tlvdb *dda_db = NULL;
+        if (buf[0] == 0x80) {
+            if (len < 3 ) {
+                PrintAndLogEx(WARNING, "Error: Internal Authenticate format1 parsing error. length=%d", len);
+            } else {
+                // parse response 0x80
+                struct tlvdb *t80 = tlvdb_parse_multi(buf, len);
+                const struct tlv * t80tlv = tlvdb_get_tlv(t80);
 
-				// 9f4b Signed Dynamic Application Data
-				dda_db = tlvdb_fixed(0x9f4b, t80tlv->len, t80tlv->value);
-				tlvdb_add(tlv, dda_db);
+                // 9f4b Signed Dynamic Application Data
+                dda_db = tlvdb_fixed(0x9f4b, t80tlv->len, t80tlv->value);
+                tlvdb_add(tlv, dda_db);
 
-				tlvdb_free(t80);
+                tlvdb_free(t80);
 
-				if (decodeTLV){
-					PrintAndLogEx(NORMAL, "* * * Decode response format 1:");
-					TLVPrintFromTLV(dda_db);
-				}
-			}
-		} else {
-			dda_db = tlvdb_parse_multi(buf, len);
-			if(!dda_db) {
-				PrintAndLogEx(WARNING, "Error: Can't parse Internal Authenticate result as TLV");
-				free(ddol_data_tlv);
-				emv_pk_free(pk);
-				emv_pk_free(issuer_pk);
-				emv_pk_free(icc_pk);
-				return 7;
-			}
-			tlvdb_add(tlv, dda_db);
+                if (decodeTLV){
+                    PrintAndLogEx(NORMAL, "* * * Decode response format 1:");
+                    TLVPrintFromTLV(dda_db);
+                }
+            }
+        } else {
+            dda_db = tlvdb_parse_multi(buf, len);
+            if(!dda_db) {
+                PrintAndLogEx(WARNING, "Error: Can't parse Internal Authenticate result as TLV");
+                free(ddol_data_tlv);
+                emv_pk_free(pk);
+                emv_pk_free(issuer_pk);
+                emv_pk_free(icc_pk);
+                return 7;
+            }
+            tlvdb_add(tlv, dda_db);
 
-			if (decodeTLV)
-				TLVPrintFromTLV(dda_db);
-		}
+            if (decodeTLV)
+                TLVPrintFromTLV(dda_db);
+        }
 
-		struct tlvdb *idn_db = emv_pki_recover_idn_ex(icc_pk, dda_db, ddol_data_tlv, true);
-		free(ddol_data_tlv);
-		if (!idn_db) {
-			PrintAndLogEx(WARNING, "Error: Can't recover IDN (ICC Dynamic Number)");
-			tlvdb_free(dda_db);
-			emv_pk_free(pk);
-			emv_pk_free(issuer_pk);
-			emv_pk_free(icc_pk);
-			return 8;
-		}
-		tlvdb_free(dda_db);
+        struct tlvdb *idn_db = emv_pki_recover_idn_ex(icc_pk, dda_db, ddol_data_tlv, true);
+        free(ddol_data_tlv);
+        if (!idn_db) {
+            PrintAndLogEx(WARNING, "Error: Can't recover IDN (ICC Dynamic Number)");
+            tlvdb_free(dda_db);
+            emv_pk_free(pk);
+            emv_pk_free(issuer_pk);
+            emv_pk_free(icc_pk);
+            return 8;
+        }
+        tlvdb_free(dda_db);
 
-		// 9f4c ICC Dynamic Number
-		const struct tlv *idn_tlv = tlvdb_get(idn_db, 0x9f4c, NULL);
-		if(idn_tlv) {
-			PrintAndLogEx(INFO, "\nIDN (ICC Dynamic Number) [%zu] %s", idn_tlv->len, sprint_hex_inrow(idn_tlv->value, idn_tlv->len));
-			PrintAndLogEx(INFO, "DDA verified OK.");
-			tlvdb_add(tlv, idn_db);
-			tlvdb_free(idn_db);
-		} else {
-			PrintAndLogEx(ERR, "\nDDA verify error");
-			tlvdb_free(idn_db);
+        // 9f4c ICC Dynamic Number
+        const struct tlv *idn_tlv = tlvdb_get(idn_db, 0x9f4c, NULL);
+        if(idn_tlv) {
+            PrintAndLogEx(INFO, "\nIDN (ICC Dynamic Number) [%zu] %s", idn_tlv->len, sprint_hex_inrow(idn_tlv->value, idn_tlv->len));
+            PrintAndLogEx(INFO, "DDA verified OK.");
+            tlvdb_add(tlv, idn_db);
+            tlvdb_free(idn_db);
+        } else {
+            PrintAndLogEx(ERR, "\nDDA verify error");
+            tlvdb_free(idn_db);
 
-			emv_pk_free(pk);
-			emv_pk_free(issuer_pk);
-			emv_pk_free(icc_pk);
-			return 9;
-		}
-	}
+            emv_pk_free(pk);
+            emv_pk_free(issuer_pk);
+            emv_pk_free(icc_pk);
+            return 9;
+        }
+    }
 
-	emv_pk_free(pk);
-	emv_pk_free(issuer_pk);
-	emv_pk_free(icc_pk);
-	return 0;
+    emv_pk_free(pk);
+    emv_pk_free(issuer_pk);
+    emv_pk_free(icc_pk);
+    return 0;
 }
 
 int trCDA(struct tlvdb *tlv, struct tlvdb *ac_tlv, struct tlv *pdol_data_tlv, struct tlv *ac_data_tlv) {
 
-	struct emv_pk *pk = get_ca_pk(tlv);
-	if (!pk) {
-		PrintAndLogEx(WARNING, "Error: Key not found. Exit.");
-		return 2;
-	}
+    struct emv_pk *pk = get_ca_pk(tlv);
+    if (!pk) {
+        PrintAndLogEx(WARNING, "Error: Key not found. Exit.");
+        return 2;
+    }
 
-	const struct tlv *sda_tlv = tlvdb_get(tlv, 0x21, NULL);
-	if (!sda_tlv || sda_tlv->len < 1) {
-		PrintAndLogEx(WARNING, "Error: Can't find input list for Offline Data Authentication. Exit.");
-		emv_pk_free(pk);
-		return 3;
-	}
+    const struct tlv *sda_tlv = tlvdb_get(tlv, 0x21, NULL);
+    if (!sda_tlv || sda_tlv->len < 1) {
+        PrintAndLogEx(WARNING, "Error: Can't find input list for Offline Data Authentication. Exit.");
+        emv_pk_free(pk);
+        return 3;
+    }
 
-	struct emv_pk *issuer_pk = emv_pki_recover_issuer_cert(pk, tlv);
-	if (!issuer_pk) {
-		PrintAndLogEx(WARNING, "Error: Issuer certificate not found. Exit.");
-		emv_pk_free(pk);
-		return 2;
-	}
-	PrintAndLogEx(SUCCESS, "Issuer PK recovered. RID %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx CSN %02hhx:%02hhx:%02hhx\n",
-			issuer_pk->rid[0],
-			issuer_pk->rid[1],
-			issuer_pk->rid[2],
-			issuer_pk->rid[3],
-			issuer_pk->rid[4],
-			issuer_pk->index,
-			issuer_pk->serial[0],
-			issuer_pk->serial[1],
-			issuer_pk->serial[2]
-			);
+    struct emv_pk *issuer_pk = emv_pki_recover_issuer_cert(pk, tlv);
+    if (!issuer_pk) {
+        PrintAndLogEx(WARNING, "Error: Issuer certificate not found. Exit.");
+        emv_pk_free(pk);
+        return 2;
+    }
+    PrintAndLogEx(SUCCESS, "Issuer PK recovered. RID %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx CSN %02hhx:%02hhx:%02hhx\n",
+            issuer_pk->rid[0],
+            issuer_pk->rid[1],
+            issuer_pk->rid[2],
+            issuer_pk->rid[3],
+            issuer_pk->rid[4],
+            issuer_pk->index,
+            issuer_pk->serial[0],
+            issuer_pk->serial[1],
+            issuer_pk->serial[2]
+            );
 
-	struct emv_pk *icc_pk = emv_pki_recover_icc_cert(issuer_pk, tlv, sda_tlv);
-	if (!icc_pk) {
-		PrintAndLogEx(WARNING, "Error: ICC setrificate not found. Exit.");
-		emv_pk_free(pk);
-		emv_pk_free(issuer_pk);
-		return 2;
-	}
-	PrintAndLogEx(SUCCESS, "ICC PK recovered. RID %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx CSN %02hhx:%02hhx:%02hhx\n",
-			icc_pk->rid[0],
-			icc_pk->rid[1],
-			icc_pk->rid[2],
-			icc_pk->rid[3],
-			icc_pk->rid[4],
-			icc_pk->index,
-			icc_pk->serial[0],
-			icc_pk->serial[1],
-			icc_pk->serial[2]
-			);
+    struct emv_pk *icc_pk = emv_pki_recover_icc_cert(issuer_pk, tlv, sda_tlv);
+    if (!icc_pk) {
+        PrintAndLogEx(WARNING, "Error: ICC setrificate not found. Exit.");
+        emv_pk_free(pk);
+        emv_pk_free(issuer_pk);
+        return 2;
+    }
+    PrintAndLogEx(SUCCESS, "ICC PK recovered. RID %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx CSN %02hhx:%02hhx:%02hhx\n",
+            icc_pk->rid[0],
+            icc_pk->rid[1],
+            icc_pk->rid[2],
+            icc_pk->rid[3],
+            icc_pk->rid[4],
+            icc_pk->index,
+            icc_pk->serial[0],
+            icc_pk->serial[1],
+            icc_pk->serial[2]
+            );
 
-	struct tlvdb *dac_db = emv_pki_recover_dac(issuer_pk, tlv, sda_tlv);
-	if (dac_db) {
-		const struct tlv *dac_tlv = tlvdb_get(dac_db, 0x9f45, NULL);
-		PrintAndLogEx(NORMAL, "SSAD verified OK. (%02hhx:%02hhx)", dac_tlv->value[0], dac_tlv->value[1]);
-		tlvdb_add(tlv, dac_db);
-	} else {
-		PrintAndLogEx(WARNING, "Error: SSAD verify error");
-		emv_pk_free(pk);
-		emv_pk_free(issuer_pk);
-		emv_pk_free(icc_pk);
-		return 4;
-	}
+    struct tlvdb *dac_db = emv_pki_recover_dac(issuer_pk, tlv, sda_tlv);
+    if (dac_db) {
+        const struct tlv *dac_tlv = tlvdb_get(dac_db, 0x9f45, NULL);
+        PrintAndLogEx(NORMAL, "SSAD verified OK. (%02hhx:%02hhx)", dac_tlv->value[0], dac_tlv->value[1]);
+        tlvdb_add(tlv, dac_db);
+    } else {
+        PrintAndLogEx(WARNING, "Error: SSAD verify error");
+        emv_pk_free(pk);
+        emv_pk_free(issuer_pk);
+        emv_pk_free(icc_pk);
+        return 4;
+    }
 
-	PrintAndLogEx(NORMAL, "\n* * Check Signed Dynamic Application Data (SDAD)");
-	struct tlvdb *idn_db = emv_pki_perform_cda_ex(icc_pk, tlv, ac_tlv,
-			pdol_data_tlv, // pdol
-			ac_data_tlv,   // cdol1
-			NULL,          // cdol2
-			true);
-	if (idn_db) {
-		const struct tlv *idn_tlv = tlvdb_get(idn_db, 0x9f4c, NULL);
-		PrintAndLogEx(NORMAL, "\nIDN (ICC Dynamic Number) [%zu] %s", idn_tlv->len, sprint_hex_inrow(idn_tlv->value, idn_tlv->len));
-		PrintAndLogEx(NORMAL, "CDA verified OK.");
-		tlvdb_add(tlv, idn_db);
-	} else {
-		PrintAndLogEx(NORMAL, "\nERROR: CDA verify error");
-	}
+    PrintAndLogEx(NORMAL, "\n* * Check Signed Dynamic Application Data (SDAD)");
+    struct tlvdb *idn_db = emv_pki_perform_cda_ex(icc_pk, tlv, ac_tlv,
+            pdol_data_tlv, // pdol
+            ac_data_tlv,   // cdol1
+            NULL,          // cdol2
+            true);
+    if (idn_db) {
+        const struct tlv *idn_tlv = tlvdb_get(idn_db, 0x9f4c, NULL);
+        PrintAndLogEx(NORMAL, "\nIDN (ICC Dynamic Number) [%zu] %s", idn_tlv->len, sprint_hex_inrow(idn_tlv->value, idn_tlv->len));
+        PrintAndLogEx(NORMAL, "CDA verified OK.");
+        tlvdb_add(tlv, idn_db);
+    } else {
+        PrintAndLogEx(NORMAL, "\nERROR: CDA verify error");
+    }
 
-	emv_pk_free(pk);
-	emv_pk_free(issuer_pk);
-	emv_pk_free(icc_pk);
-	return 0;
+    emv_pk_free(pk);
+    emv_pk_free(issuer_pk);
+    emv_pk_free(icc_pk);
+    return 0;
 }
 
 int RecoveryCertificates(struct tlvdb *tlvRoot, json_t *root) {
 
-	struct emv_pk *pk = get_ca_pk(tlvRoot);
-	if (!pk) {
-		PrintAndLog("ERROR: Key not found. Exit.");
-		return 1;
-	}
+    struct emv_pk *pk = get_ca_pk(tlvRoot);
+    if (!pk) {
+        PrintAndLog("ERROR: Key not found. Exit.");
+        return 1;
+    }
 
-	struct emv_pk *issuer_pk = emv_pki_recover_issuer_cert(pk, tlvRoot);
-	if (!issuer_pk) {
-		emv_pk_free(pk);
-		PrintAndLog("WARNING: Issuer certificate not found. Exit.");
-		return 2;
-	}
-	PrintAndLogEx(SUCCESS, "Issuer PK recovered. RID %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx CSN %02hhx:%02hhx:%02hhx",
-			issuer_pk->rid[0],
-			issuer_pk->rid[1],
-			issuer_pk->rid[2],
-			issuer_pk->rid[3],
-			issuer_pk->rid[4],
-			issuer_pk->index,
-			issuer_pk->serial[0],
-			issuer_pk->serial[1],
-			issuer_pk->serial[2]
-			);
+    struct emv_pk *issuer_pk = emv_pki_recover_issuer_cert(pk, tlvRoot);
+    if (!issuer_pk) {
+        emv_pk_free(pk);
+        PrintAndLog("WARNING: Issuer certificate not found. Exit.");
+        return 2;
+    }
+    PrintAndLogEx(SUCCESS, "Issuer PK recovered. RID %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx CSN %02hhx:%02hhx:%02hhx",
+            issuer_pk->rid[0],
+            issuer_pk->rid[1],
+            issuer_pk->rid[2],
+            issuer_pk->rid[3],
+            issuer_pk->rid[4],
+            issuer_pk->index,
+            issuer_pk->serial[0],
+            issuer_pk->serial[1],
+            issuer_pk->serial[2]
+            );
 
-	JsonSaveBufAsHex(root, "$.ApplicationData.RID", issuer_pk->rid, 5);
+    JsonSaveBufAsHex(root, "$.ApplicationData.RID", issuer_pk->rid, 5);
 
-	char *issuer_pk_c = emv_pk_dump_pk(issuer_pk);
-	JsonSaveStr(root, "$.ApplicationData.IssuerPublicKeyDec", issuer_pk_c);
-	JsonSaveBufAsHex(root, "$.ApplicationData.IssuerPublicKeyModulus", issuer_pk->modulus, issuer_pk->mlen);
-	free(issuer_pk_c);
+    char *issuer_pk_c = emv_pk_dump_pk(issuer_pk);
+    JsonSaveStr(root, "$.ApplicationData.IssuerPublicKeyDec", issuer_pk_c);
+    JsonSaveBufAsHex(root, "$.ApplicationData.IssuerPublicKeyModulus", issuer_pk->modulus, issuer_pk->mlen);
+    free(issuer_pk_c);
 
-	struct emv_pk *icc_pk = emv_pki_recover_icc_cert(issuer_pk, tlvRoot, NULL);
-	if (!icc_pk) {
-		emv_pk_free(pk);
-		emv_pk_free(issuer_pk);
-		PrintAndLogEx(WARNING, "WARNING: ICC certificate not found. Exit.");
-		return 2;
-	}
-	PrintAndLogEx(SUCCESS, "ICC PK recovered. RID %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx CSN %02hhx:%02hhx:%02hhx\n",
-			icc_pk->rid[0],
-			icc_pk->rid[1],
-			icc_pk->rid[2],
-			icc_pk->rid[3],
-			icc_pk->rid[4],
-			icc_pk->index,
-			icc_pk->serial[0],
-			icc_pk->serial[1],
-			icc_pk->serial[2]
-			);
+    struct emv_pk *icc_pk = emv_pki_recover_icc_cert(issuer_pk, tlvRoot, NULL);
+    if (!icc_pk) {
+        emv_pk_free(pk);
+        emv_pk_free(issuer_pk);
+        PrintAndLogEx(WARNING, "WARNING: ICC certificate not found. Exit.");
+        return 2;
+    }
+    PrintAndLogEx(SUCCESS, "ICC PK recovered. RID %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx CSN %02hhx:%02hhx:%02hhx\n",
+            icc_pk->rid[0],
+            icc_pk->rid[1],
+            icc_pk->rid[2],
+            icc_pk->rid[3],
+            icc_pk->rid[4],
+            icc_pk->index,
+            icc_pk->serial[0],
+            icc_pk->serial[1],
+            icc_pk->serial[2]
+            );
 
-	char *icc_pk_c = emv_pk_dump_pk(icc_pk);
-	JsonSaveStr(root, "$.ApplicationData.ICCPublicKeyDec", icc_pk_c);
-	JsonSaveBufAsHex(root, "$.ApplicationData.ICCPublicKeyModulus", icc_pk->modulus, icc_pk->mlen);
-	free(issuer_pk_c);
+    char *icc_pk_c = emv_pk_dump_pk(icc_pk);
+    JsonSaveStr(root, "$.ApplicationData.ICCPublicKeyDec", icc_pk_c);
+    JsonSaveBufAsHex(root, "$.ApplicationData.ICCPublicKeyModulus", icc_pk->modulus, icc_pk->mlen);
+    free(issuer_pk_c);
 
-	return 0;
+    return 0;
 }
diff --git a/client/emv/emvcore.h b/client/emv/emvcore.h
index 9aaaf2e6f..cfc0e9457 100644
--- a/client/emv/emvcore.h
+++ b/client/emv/emvcore.h
@@ -33,35 +33,35 @@
 #define APDU_AID_LEN 50
 
 typedef enum {
-	ECC_CONTACTLESS,
-	ECC_CONTACT
+    ECC_CONTACTLESS,
+    ECC_CONTACT
 } EMVCommandChannel;
 
 enum TransactionType {
-	TT_MSD,
-	TT_VSDC,        // contact only. not standart for contactless
-	TT_QVSDCMCHIP,
-	TT_CDA,
+    TT_MSD,
+    TT_VSDC,        // contact only. not standart for contactless
+    TT_QVSDCMCHIP,
+    TT_CDA,
 };
 extern char *TransactionTypeStr[];
 
 typedef struct {
-	uint8_t CLA;
-	uint8_t INS;
-	uint8_t P1;
-	uint8_t P2;
-	uint8_t Lc;
-	uint8_t *data;
+    uint8_t CLA;
+    uint8_t INS;
+    uint8_t P1;
+    uint8_t P2;
+    uint8_t Lc;
+    uint8_t *data;
 } sAPDU;
 
 enum CardPSVendor {
-	CV_NA,
-	CV_VISA,
-	CV_MASTERCARD,
-	CV_AMERICANEXPRESS,
-	CV_JCB,
-	CV_CB,
-	CV_OTHER,
+    CV_NA,
+    CV_VISA,
+    CV_MASTERCARD,
+    CV_AMERICANEXPRESS,
+    CV_JCB,
+    CV_CB,
+    CV_OTHER,
 };
 extern enum CardPSVendor GetCardPSVendor(uint8_t * AID, size_t AIDlen);
 
diff --git a/client/emv/emvjson.c b/client/emv/emvjson.c
index 4468d49b3..0b96b846c 100644
--- a/client/emv/emvjson.c
+++ b/client/emv/emvjson.c
@@ -61,342 +61,342 @@ static const ApplicationDataElm ApplicationData[] = {
 int ApplicationDataLen = sizeof(ApplicationData) / sizeof(ApplicationDataElm);
 
 char* GetApplicationDataName(tlv_tag_t tag) {
-	for (int i = 0; i < ApplicationDataLen; i++)
-		if (ApplicationData[i].Tag == tag)
-			return ApplicationData[i].Name;
+    for (int i = 0; i < ApplicationDataLen; i++)
+        if (ApplicationData[i].Tag == tag)
+            return ApplicationData[i].Name;
 
-	return NULL;
+    return NULL;
 }
 
 int JsonSaveJsonObject(json_t *root, char *path, json_t *value) {
-	json_error_t error;
+    json_error_t error;
 
-	if (strlen(path) < 1)
-		return 1;
+    if (strlen(path) < 1)
+        return 1;
 
-	if (path[0] == '$') {
-		if (json_path_set(root, path, value, 0, &error)) {
-			PrintAndLog("ERROR: can't set json path: ", error.text);
-			return 2;
-		} else {
-			return 0;
-		}
-	} else {
-		return json_object_set_new(root, path, value);
-	}
+    if (path[0] == '$') {
+        if (json_path_set(root, path, value, 0, &error)) {
+            PrintAndLog("ERROR: can't set json path: ", error.text);
+            return 2;
+        } else {
+            return 0;
+        }
+    } else {
+        return json_object_set_new(root, path, value);
+    }
 }
 
 int JsonSaveInt(json_t *root, char *path, int value) {
-	return JsonSaveJsonObject(root, path, json_integer(value));
+    return JsonSaveJsonObject(root, path, json_integer(value));
 }
 
 int JsonSaveStr(json_t *root, char *path, char *value) {
-	return JsonSaveJsonObject(root, path, json_string(value));
+    return JsonSaveJsonObject(root, path, json_string(value));
 };
 
 int JsonSaveBufAsHexCompact(json_t *elm, char *path, uint8_t *data, size_t datalen) {
-	char * msg = sprint_hex_inrow(data, datalen);
-	if (msg && strlen(msg) && msg[strlen(msg) - 1] == ' ')
-		msg[strlen(msg) - 1] = '\0';
+    char * msg = sprint_hex_inrow(data, datalen);
+    if (msg && strlen(msg) && msg[strlen(msg) - 1] == ' ')
+        msg[strlen(msg) - 1] = '\0';
 
-	return JsonSaveStr(elm, path, msg);
+    return JsonSaveStr(elm, path, msg);
 }
 
 int JsonSaveBufAsHex(json_t *elm, char *path, uint8_t *data, size_t datalen) {
-	char * msg = sprint_hex(data, datalen);
-	if (msg && strlen(msg) && msg[strlen(msg) - 1] == ' ')
-		msg[strlen(msg) - 1] = '\0';
+    char * msg = sprint_hex(data, datalen);
+    if (msg && strlen(msg) && msg[strlen(msg) - 1] == ' ')
+        msg[strlen(msg) - 1] = '\0';
 
-	return JsonSaveStr(elm, path, msg);
+    return JsonSaveStr(elm, path, msg);
 }
 
 int JsonSaveHex(json_t *elm, char *path, uint64_t data, int datalen) {
-	uint8_t bdata[8] = {0};
-	int len = 0;
-	if (!datalen) {
-		for (uint64_t u = 0xffffffffffffffff; u; u = u << 8) {
-			if (!(data & u)) {
-				break;
-			}
-			len++;
-		}
-		if (!len)
-			len = 1;
-	} else {
-		len = datalen;
-	}
-	num_to_bytes(data, len, bdata);
+    uint8_t bdata[8] = {0};
+    int len = 0;
+    if (!datalen) {
+        for (uint64_t u = 0xffffffffffffffff; u; u = u << 8) {
+            if (!(data & u)) {
+                break;
+            }
+            len++;
+        }
+        if (!len)
+            len = 1;
+    } else {
+        len = datalen;
+    }
+    num_to_bytes(data, len, bdata);
 
-	return JsonSaveBufAsHex(elm, path, bdata, len);
+    return JsonSaveBufAsHex(elm, path, bdata, len);
 }
 
 int JsonSaveTLVValue(json_t *root, char *path, struct tlvdb *tlvdbelm) {
-	const struct tlv *tlvelm = tlvdb_get_tlv(tlvdbelm);
-	if (tlvelm)
-		return JsonSaveBufAsHex(root, path, (uint8_t *)tlvelm->value, tlvelm->len);
-	else
-		return 1;
+    const struct tlv *tlvelm = tlvdb_get_tlv(tlvdbelm);
+    if (tlvelm)
+        return JsonSaveBufAsHex(root, path, (uint8_t *)tlvelm->value, tlvelm->len);
+    else
+        return 1;
 }
 
 int JsonSaveTLVElm(json_t *elm, char *path, struct tlv *tlvelm, bool saveName, bool saveValue, bool saveAppDataLink) {
-	json_error_t error;
+    json_error_t error;
 
-	if (strlen(path) < 1 || !tlvelm)
-		return 1;
+    if (strlen(path) < 1 || !tlvelm)
+        return 1;
 
-	if (path[0] == '$') {
+    if (path[0] == '$') {
 
-		json_t *obj = json_path_get(elm, path);
-		if (!obj) {
-			obj = json_object();
+        json_t *obj = json_path_get(elm, path);
+        if (!obj) {
+            obj = json_object();
 
-			if (json_is_array(elm)) {
-				if (json_array_append_new(elm, obj)) {
-					PrintAndLog("ERROR: can't append array: %s", path);
-					return 2;
-				}
-			} else {
-				if (json_path_set(elm, path, obj, 0, &error)) {
-					PrintAndLog("ERROR: can't set json path: ", error.text);
-					return 2;
-				}
-			}
-		}
+            if (json_is_array(elm)) {
+                if (json_array_append_new(elm, obj)) {
+                    PrintAndLog("ERROR: can't append array: %s", path);
+                    return 2;
+                }
+            } else {
+                if (json_path_set(elm, path, obj, 0, &error)) {
+                    PrintAndLog("ERROR: can't set json path: ", error.text);
+                    return 2;
+                }
+            }
+        }
 
-		if (saveAppDataLink) {
-			char * AppDataName = GetApplicationDataName(tlvelm->tag);
-			if (AppDataName)
-				JsonSaveStr(obj, "appdata", AppDataName);
-		} else {
-			char * name = emv_get_tag_name(tlvelm);
-			if (saveName && name && strlen(name) > 0 && strncmp(name, "Unknown", 7))
-				JsonSaveStr(obj, "name", emv_get_tag_name(tlvelm));
-			JsonSaveHex(obj, "tag", tlvelm->tag, 0);
-			if (saveValue) {
-				JsonSaveHex(obj, "length", tlvelm->len, 0);
-				JsonSaveBufAsHex(obj, "value", (uint8_t *)tlvelm->value, tlvelm->len);
-			};
-		}
-	}
+        if (saveAppDataLink) {
+            char * AppDataName = GetApplicationDataName(tlvelm->tag);
+            if (AppDataName)
+                JsonSaveStr(obj, "appdata", AppDataName);
+        } else {
+            char * name = emv_get_tag_name(tlvelm);
+            if (saveName && name && strlen(name) > 0 && strncmp(name, "Unknown", 7))
+                JsonSaveStr(obj, "name", emv_get_tag_name(tlvelm));
+            JsonSaveHex(obj, "tag", tlvelm->tag, 0);
+            if (saveValue) {
+                JsonSaveHex(obj, "length", tlvelm->len, 0);
+                JsonSaveBufAsHex(obj, "value", (uint8_t *)tlvelm->value, tlvelm->len);
+            };
+        }
+    }
 
-	return 0;
+    return 0;
 }
 
 int JsonSaveTLVTreeElm(json_t *elm, char *path, struct tlvdb *tlvdbelm, bool saveName, bool saveValue, bool saveAppDataLink) {
-	return JsonSaveTLVElm(elm, path, (struct tlv *)tlvdb_get_tlv(tlvdbelm), saveName, saveValue, saveAppDataLink);
+    return JsonSaveTLVElm(elm, path, (struct tlv *)tlvdb_get_tlv(tlvdbelm), saveName, saveValue, saveAppDataLink);
 }
 
 int JsonSaveTLVTree(json_t *root, json_t *elm, char *path, struct tlvdb *tlvdbelm) {
-	struct tlvdb *tlvp = tlvdbelm;
-	while (tlvp) {
-		const struct tlv * tlvpelm = tlvdb_get_tlv(tlvp);
-		char * AppDataName = NULL;
-		if (tlvpelm)
-			AppDataName = GetApplicationDataName(tlvpelm->tag);
+    struct tlvdb *tlvp = tlvdbelm;
+    while (tlvp) {
+        const struct tlv * tlvpelm = tlvdb_get_tlv(tlvp);
+        char * AppDataName = NULL;
+        if (tlvpelm)
+            AppDataName = GetApplicationDataName(tlvpelm->tag);
 
-		if (AppDataName) {
-			char appdatalink[200] = {0};
-			sprintf(appdatalink, "$.ApplicationData.%s", AppDataName);
-			JsonSaveBufAsHex(root, appdatalink, (uint8_t *)tlvpelm->value, tlvpelm->len);
-		}
+        if (AppDataName) {
+            char appdatalink[200] = {0};
+            sprintf(appdatalink, "$.ApplicationData.%s", AppDataName);
+            JsonSaveBufAsHex(root, appdatalink, (uint8_t *)tlvpelm->value, tlvpelm->len);
+        }
 
-		json_t *pelm = json_path_get(elm, path);
-		if (pelm && json_is_array(pelm)) {
-			json_t *appendelm = json_object();
-			json_array_append_new(pelm, appendelm);
-			JsonSaveTLVTreeElm(appendelm, "$", tlvp, !AppDataName, !tlvdb_elm_get_children(tlvp), AppDataName);
-			pelm = appendelm;
-		} else {
-			JsonSaveTLVTreeElm(elm, path, tlvp, !AppDataName, !tlvdb_elm_get_children(tlvp), AppDataName);
-			pelm = json_path_get(elm, path);
-		}
+        json_t *pelm = json_path_get(elm, path);
+        if (pelm && json_is_array(pelm)) {
+            json_t *appendelm = json_object();
+            json_array_append_new(pelm, appendelm);
+            JsonSaveTLVTreeElm(appendelm, "$", tlvp, !AppDataName, !tlvdb_elm_get_children(tlvp), AppDataName);
+            pelm = appendelm;
+        } else {
+            JsonSaveTLVTreeElm(elm, path, tlvp, !AppDataName, !tlvdb_elm_get_children(tlvp), AppDataName);
+            pelm = json_path_get(elm, path);
+        }
 
-		if (tlvdb_elm_get_children(tlvp)) {
-			// get path element
-			if(!pelm)
-				return 1;
+        if (tlvdb_elm_get_children(tlvp)) {
+            // get path element
+            if(!pelm)
+                return 1;
 
-			// check childs element and add it if not found
-			json_t *chjson = json_path_get(pelm, "$.Childs");
-			if (!chjson) {
-				json_object_set_new(pelm, "Childs", json_array());
+            // check childs element and add it if not found
+            json_t *chjson = json_path_get(pelm, "$.Childs");
+            if (!chjson) {
+                json_object_set_new(pelm, "Childs", json_array());
 
-				chjson = json_path_get(pelm, "$.Childs");
-			}
+                chjson = json_path_get(pelm, "$.Childs");
+            }
 
-			// check
-			if (!json_is_array(chjson)) {
-				PrintAndLog("E->Internal logic error. `$.Childs` is not an array.");
-				break;
-			}
+            // check
+            if (!json_is_array(chjson)) {
+                PrintAndLog("E->Internal logic error. `$.Childs` is not an array.");
+                break;
+            }
 
-			// Recursion
-			JsonSaveTLVTree(root, chjson, "$", tlvdb_elm_get_children(tlvp));
-		}
+            // Recursion
+            JsonSaveTLVTree(root, chjson, "$", tlvdb_elm_get_children(tlvp));
+        }
 
-		tlvp = tlvdb_elm_get_next(tlvp);
-	}
-	return 0;
+        tlvp = tlvdb_elm_get_next(tlvp);
+    }
+    return 0;
 }
 
 bool HexToBuffer(const char *errormsg, const char *hexvalue, uint8_t * buffer, size_t maxbufferlen, size_t *bufferlen) {
-	int buflen = 0;
+    int buflen = 0;
 
-	switch (param_gethex_to_eol(hexvalue, 0, buffer, maxbufferlen, &buflen)) {
-		case 1:
-			PrintAndLog("%s Invalid HEX value.", errormsg);
-			return false;
-		case 2:
-			PrintAndLog("%s Hex value too large.", errormsg);
-			return false;
-		case 3:
-			PrintAndLog("%s Hex value must have even number of digits.", errormsg);
-			return false;
-	}
+    switch (param_gethex_to_eol(hexvalue, 0, buffer, maxbufferlen, &buflen)) {
+        case 1:
+            PrintAndLog("%s Invalid HEX value.", errormsg);
+            return false;
+        case 2:
+            PrintAndLog("%s Hex value too large.", errormsg);
+            return false;
+        case 3:
+            PrintAndLog("%s Hex value must have even number of digits.", errormsg);
+            return false;
+    }
 
-	if (buflen > maxbufferlen) {
-		PrintAndLog("%s HEX length (%d) more than %d", errormsg, (bufferlen) ? *bufferlen : -1, maxbufferlen);
-		return false;
-	}
+    if (buflen > maxbufferlen) {
+        PrintAndLog("%s HEX length (%d) more than %d", errormsg, (bufferlen) ? *bufferlen : -1, maxbufferlen);
+        return false;
+    }
 
-	if ( bufferlen )
-		*bufferlen = buflen;
+    if ( bufferlen )
+        *bufferlen = buflen;
 
-	return true;
+    return true;
 }
 
 int JsonLoadStr(json_t *root, char *path, char *value) {
-	if (!value)
-		return 1;
+    if (!value)
+        return 1;
 
-	json_t *jelm = json_path_get((const json_t *)root, path);
-	if (!jelm || !json_is_string(jelm))
-		return 2;
+    json_t *jelm = json_path_get((const json_t *)root, path);
+    if (!jelm || !json_is_string(jelm))
+        return 2;
 
-	const char * strval = json_string_value(jelm);
-	if (!strval)
-		return 1;
+    const char * strval = json_string_value(jelm);
+    if (!strval)
+        return 1;
 
-	memcpy(value, strval, strlen(strval));
+    memcpy(value, strval, strlen(strval));
 
-	return 0;
+    return 0;
 }
 
 int JsonLoadBufAsHex(json_t *elm, char *path, uint8_t *data, size_t maxbufferlen, size_t *datalen) {
-	if (datalen)
-		*datalen = 0;
+    if (datalen)
+        *datalen = 0;
 
-	json_t *jelm = json_path_get((const json_t *)elm, path);
-	if (!jelm || !json_is_string(jelm))
-		return 1;
+    json_t *jelm = json_path_get((const json_t *)elm, path);
+    if (!jelm || !json_is_string(jelm))
+        return 1;
 
-	if (!HexToBuffer("ERROR load", json_string_value(jelm), data, maxbufferlen, datalen))
-		return 2;
+    if (!HexToBuffer("ERROR load", json_string_value(jelm), data, maxbufferlen, datalen))
+        return 2;
 
-	return 0;
+    return 0;
 };
 
 bool ParamLoadFromJson(struct tlvdb *tlv) {
-	json_t *root;
-	json_error_t error;
+    json_t *root;
+    json_error_t error;
 
-	if (!tlv) {
-		PrintAndLog("ERROR load params: tlv tree is NULL.");
-		return false;
-	}
+    if (!tlv) {
+        PrintAndLog("ERROR load params: tlv tree is NULL.");
+        return false;
+    }
 
-	// current path + file name
-	const char *relfname = "emv/defparams.json";
-	char fname[strlen(get_my_executable_directory()) + strlen(relfname) + 1];
-	strcpy(fname, get_my_executable_directory());
-	strcat(fname, relfname);
+    // current path + file name
+    const char *relfname = "emv/defparams.json";
+    char fname[strlen(get_my_executable_directory()) + strlen(relfname) + 1];
+    strcpy(fname, get_my_executable_directory());
+    strcat(fname, relfname);
 
-	root = json_load_file(fname, 0, &error);
-	if (!root) {
-		PrintAndLog("Load params: json error on line %d: %s", error.line, error.text);
-		return false;
-	}
+    root = json_load_file(fname, 0, &error);
+    if (!root) {
+        PrintAndLog("Load params: json error on line %d: %s", error.line, error.text);
+        return false;
+    }
 
-	if (!json_is_array(root)) {
-		PrintAndLog("Load params: Invalid json format. root must be array.");
-		return false;
-	}
+    if (!json_is_array(root)) {
+        PrintAndLog("Load params: Invalid json format. root must be array.");
+        return false;
+    }
 
-	PrintAndLog("Load params: json(%d) OK", json_array_size(root));
+    PrintAndLog("Load params: json(%d) OK", json_array_size(root));
 
-	for(int i = 0; i < json_array_size(root); i++) {
-		json_t *data, *jtag, *jlength, *jvalue;
+    for(int i = 0; i < json_array_size(root); i++) {
+        json_t *data, *jtag, *jlength, *jvalue;
 
-		data = json_array_get(root, i);
-		if(!json_is_object(data))
-		{
-			PrintAndLog("Load params: data [%d] is not an object", i + 1);
-			json_decref(root);
-			return false;
-		}
+        data = json_array_get(root, i);
+        if(!json_is_object(data))
+        {
+            PrintAndLog("Load params: data [%d] is not an object", i + 1);
+            json_decref(root);
+            return false;
+        }
 
-		jtag = json_object_get(data, "tag");
-		if(!json_is_string(jtag))
-		{
-			PrintAndLog("Load params: data [%d] tag is not a string", i + 1);
-			json_decref(root);
-			return false;
-		}
-		const char *tlvTag = json_string_value(jtag);
+        jtag = json_object_get(data, "tag");
+        if(!json_is_string(jtag))
+        {
+            PrintAndLog("Load params: data [%d] tag is not a string", i + 1);
+            json_decref(root);
+            return false;
+        }
+        const char *tlvTag = json_string_value(jtag);
 
-		jvalue = json_object_get(data, "value");
-		if(!json_is_string(jvalue))
-		{
-			PrintAndLog("Load params: data [%d] value is not a string", i + 1);
-			json_decref(root);
-			return false;
-		}
-		const char *tlvValue = json_string_value(jvalue);
+        jvalue = json_object_get(data, "value");
+        if(!json_is_string(jvalue))
+        {
+            PrintAndLog("Load params: data [%d] value is not a string", i + 1);
+            json_decref(root);
+            return false;
+        }
+        const char *tlvValue = json_string_value(jvalue);
 
-		jlength = json_object_get(data, "length");
-		if(!json_is_number(jlength))
-		{
-			PrintAndLog("Load params: data [%d] length is not a number", i + 1);
-			json_decref(root);
-			return false;
-		}
+        jlength = json_object_get(data, "length");
+        if(!json_is_number(jlength))
+        {
+            PrintAndLog("Load params: data [%d] length is not a number", i + 1);
+            json_decref(root);
+            return false;
+        }
 
-		int tlvLength = json_integer_value(jlength);
-		if (tlvLength > 250) {
-			PrintAndLog("Load params: data [%d] length more than 250", i + 1);
-			json_decref(root);
-			return false;
-		}
+        int tlvLength = json_integer_value(jlength);
+        if (tlvLength > 250) {
+            PrintAndLog("Load params: data [%d] length more than 250", i + 1);
+            json_decref(root);
+            return false;
+        }
 
-		PrintAndLog("TLV param: %s[%d]=%s", tlvTag, tlvLength, tlvValue);
-		uint8_t buf[251] = {0};
-		size_t buflen = 0;
+        PrintAndLog("TLV param: %s[%d]=%s", tlvTag, tlvLength, tlvValue);
+        uint8_t buf[251] = {0};
+        size_t buflen = 0;
 
-		if (!HexToBuffer("TLV Error type:", tlvTag, buf, 4, &buflen)) {
-			json_decref(root);
-			return false;
-		}
-		tlv_tag_t tag = 0;
-		for (int i = 0; i < buflen; i++) {
-			tag = (tag << 8) | buf[i];
-		}
+        if (!HexToBuffer("TLV Error type:", tlvTag, buf, 4, &buflen)) {
+            json_decref(root);
+            return false;
+        }
+        tlv_tag_t tag = 0;
+        for (int i = 0; i < buflen; i++) {
+            tag = (tag << 8) | buf[i];
+        }
 
-		if (!HexToBuffer("TLV Error value:", tlvValue, buf, sizeof(buf) - 1, &buflen)) {
-			json_decref(root);
-			return false;
-		}
+        if (!HexToBuffer("TLV Error value:", tlvValue, buf, sizeof(buf) - 1, &buflen)) {
+            json_decref(root);
+            return false;
+        }
 
-		if (buflen != tlvLength) {
-			PrintAndLog("Load params: data [%d] length of HEX must(%d) be identical to length in TLV param(%d)", i + 1, buflen, tlvLength);
-			json_decref(root);
-			return false;
-		}
+        if (buflen != tlvLength) {
+            PrintAndLog("Load params: data [%d] length of HEX must(%d) be identical to length in TLV param(%d)", i + 1, buflen, tlvLength);
+            json_decref(root);
+            return false;
+        }
 
-		tlvdb_change_or_add_node(tlv, tag, tlvLength, (const unsigned char *)buf);
-	}
+        tlvdb_change_or_add_node(tlv, tag, tlvLength, (const unsigned char *)buf);
+    }
 
-	json_decref(root);
+    json_decref(root);
 
-	return true;
+    return true;
 }
 
diff --git a/client/emv/emvjson.h b/client/emv/emvjson.h
index 996b611d5..5ca6947f5 100644
--- a/client/emv/emvjson.h
+++ b/client/emv/emvjson.h
@@ -14,8 +14,8 @@
 #include "tlv.h"
 
 typedef struct {
-	tlv_tag_t Tag;
-	char *Name;
+    tlv_tag_t Tag;
+    char *Name;
 } ApplicationDataElm;
 
 extern char* GetApplicationDataName(tlv_tag_t tag);
diff --git a/client/emv/test/cda_test.c b/client/emv/test/cda_test.c
index a029558d6..0047a09bf 100644
--- a/client/emv/test/cda_test.c
+++ b/client/emv/test/cda_test.c
@@ -28,415 +28,415 @@
 #include <stdlib.h>
 
 struct emv_pk c_mchip_05 = {
-	.rid = { 0xa0, 0x00, 0x00, 0x00, 0x04, },
-	.index = 5,
-	.hash_algo = HASH_SHA_1,
-	.pk_algo = PK_RSA,
-	.hash = {
-		0xeb, 0xfa, 0x0d, 0x5d,
-		0x06, 0xd8, 0xce, 0x70,
-		0x2d, 0xa3, 0xea, 0xe8,
-		0x90, 0x70, 0x1d, 0x45,
-		0xe2, 0x74, 0xc8, 0x45, },
-	.exp = { 0x03, },
-	.elen = 1,
-	.mlen = 1408 / 8,
-	.modulus = (unsigned char[]){
-		0xb8, 0x04, 0x8a, 0xbc, 0x30, 0xc9, 0x0d, 0x97, 0x63, 0x36, 0x54, 0x3e, 0x3f, 0xd7, 0x09, 0x1c,
-		0x8f, 0xe4, 0x80, 0x0d, 0xf8, 0x20, 0xed, 0x55, 0xe7, 0xe9, 0x48, 0x13, 0xed, 0x00, 0x55, 0x5b,
-		0x57, 0x3f, 0xec, 0xa3, 0xd8, 0x4a, 0xf6, 0x13, 0x1a, 0x65, 0x1d, 0x66, 0xcf, 0xf4, 0x28, 0x4f,
-		0xb1, 0x3b, 0x63, 0x5e, 0xdd, 0x0e, 0xe4, 0x01, 0x76, 0xd8, 0xbf, 0x04, 0xb7, 0xfd, 0x1c, 0x7b,
-		0xac, 0xf9, 0xac, 0x73, 0x27, 0xdf, 0xaa, 0x8a, 0xa7, 0x2d, 0x10, 0xdb, 0x3b, 0x8e, 0x70, 0xb2,
-		0xdd, 0xd8, 0x11, 0xcb, 0x41, 0x96, 0x52, 0x5e, 0xa3, 0x86, 0xac, 0xc3, 0x3c, 0x0d, 0x9d, 0x45,
-		0x75, 0x91, 0x64, 0x69, 0xc4, 0xe4, 0xf5, 0x3e, 0x8e, 0x1c, 0x91, 0x2c, 0xc6, 0x18, 0xcb, 0x22,
-		0xdd, 0xe7, 0xc3, 0x56, 0x8e, 0x90, 0x02, 0x2e, 0x6b, 0xba, 0x77, 0x02, 0x02, 0xe4, 0x52, 0x2a,
-		0x2d, 0xd6, 0x23, 0xd1, 0x80, 0xe2, 0x15, 0xbd, 0x1d, 0x15, 0x07, 0xfe, 0x3d, 0xc9, 0x0c, 0xa3,
-		0x10, 0xd2, 0x7b, 0x3e, 0xfc, 0xcd, 0x8f, 0x83, 0xde, 0x30, 0x52, 0xca, 0xd1, 0xe4, 0x89, 0x38,
-		0xc6, 0x8d, 0x09, 0x5a, 0xac, 0x91, 0xb5, 0xf3, 0x7e, 0x28, 0xbb, 0x49, 0xec, 0x7e, 0xd5, 0x97,
-	},
+    .rid = { 0xa0, 0x00, 0x00, 0x00, 0x04, },
+    .index = 5,
+    .hash_algo = HASH_SHA_1,
+    .pk_algo = PK_RSA,
+    .hash = {
+        0xeb, 0xfa, 0x0d, 0x5d,
+        0x06, 0xd8, 0xce, 0x70,
+        0x2d, 0xa3, 0xea, 0xe8,
+        0x90, 0x70, 0x1d, 0x45,
+        0xe2, 0x74, 0xc8, 0x45, },
+    .exp = { 0x03, },
+    .elen = 1,
+    .mlen = 1408 / 8,
+    .modulus = (unsigned char[]){
+        0xb8, 0x04, 0x8a, 0xbc, 0x30, 0xc9, 0x0d, 0x97, 0x63, 0x36, 0x54, 0x3e, 0x3f, 0xd7, 0x09, 0x1c,
+        0x8f, 0xe4, 0x80, 0x0d, 0xf8, 0x20, 0xed, 0x55, 0xe7, 0xe9, 0x48, 0x13, 0xed, 0x00, 0x55, 0x5b,
+        0x57, 0x3f, 0xec, 0xa3, 0xd8, 0x4a, 0xf6, 0x13, 0x1a, 0x65, 0x1d, 0x66, 0xcf, 0xf4, 0x28, 0x4f,
+        0xb1, 0x3b, 0x63, 0x5e, 0xdd, 0x0e, 0xe4, 0x01, 0x76, 0xd8, 0xbf, 0x04, 0xb7, 0xfd, 0x1c, 0x7b,
+        0xac, 0xf9, 0xac, 0x73, 0x27, 0xdf, 0xaa, 0x8a, 0xa7, 0x2d, 0x10, 0xdb, 0x3b, 0x8e, 0x70, 0xb2,
+        0xdd, 0xd8, 0x11, 0xcb, 0x41, 0x96, 0x52, 0x5e, 0xa3, 0x86, 0xac, 0xc3, 0x3c, 0x0d, 0x9d, 0x45,
+        0x75, 0x91, 0x64, 0x69, 0xc4, 0xe4, 0xf5, 0x3e, 0x8e, 0x1c, 0x91, 0x2c, 0xc6, 0x18, 0xcb, 0x22,
+        0xdd, 0xe7, 0xc3, 0x56, 0x8e, 0x90, 0x02, 0x2e, 0x6b, 0xba, 0x77, 0x02, 0x02, 0xe4, 0x52, 0x2a,
+        0x2d, 0xd6, 0x23, 0xd1, 0x80, 0xe2, 0x15, 0xbd, 0x1d, 0x15, 0x07, 0xfe, 0x3d, 0xc9, 0x0c, 0xa3,
+        0x10, 0xd2, 0x7b, 0x3e, 0xfc, 0xcd, 0x8f, 0x83, 0xde, 0x30, 0x52, 0xca, 0xd1, 0xe4, 0x89, 0x38,
+        0xc6, 0x8d, 0x09, 0x5a, 0xac, 0x91, 0xb5, 0xf3, 0x7e, 0x28, 0xbb, 0x49, 0xec, 0x7e, 0xd5, 0x97,
+    },
 };
 
 const unsigned char c_issuer_cert[] = {
-		0x17, 0x14, 0x28, 0x4f, 0x76, 0x3b, 0x85, 0x86, 0xee, 0x6d, 0x31, 0x99, 0x51, 0xf7, 0xe6, 0x3f,
-		0xa2, 0x50, 0x76, 0xe5, 0x0d, 0xc9, 0xd3, 0x20, 0x0b, 0xa9, 0x98, 0xd3, 0xa0, 0x52, 0xad, 0xba,
-		0x9a, 0xb6, 0x9a, 0xc6, 0xad, 0x6a, 0xdd, 0x3c, 0xe0, 0x9f, 0x02, 0x78, 0xf4, 0x07, 0x4e, 0xc4,
-		0xee, 0x9b, 0x1d, 0x22, 0x68, 0xa3, 0xe9, 0x53, 0x57, 0x5e, 0x45, 0x4e, 0x50, 0xcd, 0x86, 0x0b,
-		0xf4, 0x24, 0xc5, 0x1c, 0x59, 0x77, 0x12, 0xd2, 0xaa, 0x05, 0x70, 0x89, 0xdd, 0x86, 0x73, 0xe5,
-		0x1b, 0x1e, 0x1d, 0x71, 0x88, 0x03, 0x48, 0x92, 0x07, 0x7a, 0xc1, 0x8a, 0x6a, 0xe2, 0x34, 0x88,
-		0xbe, 0xa9, 0xdf, 0x3b, 0x1a, 0x83, 0xf2, 0xc0, 0x80, 0x0c, 0xd7, 0xc5, 0xcd, 0xf2, 0xfd, 0xe0,
-		0x49, 0x6f, 0x7b, 0xc3, 0x9f, 0xb4, 0xbf, 0x36, 0x32, 0x99, 0xbf, 0xa6, 0x37, 0xb2, 0xec, 0x33,
-		0xc5, 0x07, 0xe3, 0x68, 0x21, 0xee, 0xc2, 0x07, 0x5f, 0x0e, 0x42, 0x0d, 0x38, 0xa1, 0xc9, 0xf3,
-		0x12, 0x72, 0x61, 0xba, 0x31, 0x6c, 0x98, 0x76, 0x74, 0xfa, 0xdb, 0x20, 0xea, 0x7f, 0xeb, 0x75,
-		0xee, 0x45, 0x5d, 0x12, 0x14, 0x6e, 0xa6, 0xf0, 0x2e, 0x8b, 0x01, 0xec, 0x2f, 0xa7, 0xa1, 0x15,
+        0x17, 0x14, 0x28, 0x4f, 0x76, 0x3b, 0x85, 0x86, 0xee, 0x6d, 0x31, 0x99, 0x51, 0xf7, 0xe6, 0x3f,
+        0xa2, 0x50, 0x76, 0xe5, 0x0d, 0xc9, 0xd3, 0x20, 0x0b, 0xa9, 0x98, 0xd3, 0xa0, 0x52, 0xad, 0xba,
+        0x9a, 0xb6, 0x9a, 0xc6, 0xad, 0x6a, 0xdd, 0x3c, 0xe0, 0x9f, 0x02, 0x78, 0xf4, 0x07, 0x4e, 0xc4,
+        0xee, 0x9b, 0x1d, 0x22, 0x68, 0xa3, 0xe9, 0x53, 0x57, 0x5e, 0x45, 0x4e, 0x50, 0xcd, 0x86, 0x0b,
+        0xf4, 0x24, 0xc5, 0x1c, 0x59, 0x77, 0x12, 0xd2, 0xaa, 0x05, 0x70, 0x89, 0xdd, 0x86, 0x73, 0xe5,
+        0x1b, 0x1e, 0x1d, 0x71, 0x88, 0x03, 0x48, 0x92, 0x07, 0x7a, 0xc1, 0x8a, 0x6a, 0xe2, 0x34, 0x88,
+        0xbe, 0xa9, 0xdf, 0x3b, 0x1a, 0x83, 0xf2, 0xc0, 0x80, 0x0c, 0xd7, 0xc5, 0xcd, 0xf2, 0xfd, 0xe0,
+        0x49, 0x6f, 0x7b, 0xc3, 0x9f, 0xb4, 0xbf, 0x36, 0x32, 0x99, 0xbf, 0xa6, 0x37, 0xb2, 0xec, 0x33,
+        0xc5, 0x07, 0xe3, 0x68, 0x21, 0xee, 0xc2, 0x07, 0x5f, 0x0e, 0x42, 0x0d, 0x38, 0xa1, 0xc9, 0xf3,
+        0x12, 0x72, 0x61, 0xba, 0x31, 0x6c, 0x98, 0x76, 0x74, 0xfa, 0xdb, 0x20, 0xea, 0x7f, 0xeb, 0x75,
+        0xee, 0x45, 0x5d, 0x12, 0x14, 0x6e, 0xa6, 0xf0, 0x2e, 0x8b, 0x01, 0xec, 0x2f, 0xa7, 0xa1, 0x15,
 };
 
 const unsigned char c_issuer_rem[] = {
-		0x6e, 0x63, 0xb7, 0xbc, 0x70, 0xab, 0xdd, 0x09, 0x34, 0x1b, 0x34, 0xc0, 0x32, 0x86, 0xba, 0x9b,
-		0xd8, 0x3b, 0xa7, 0x93, 0x6c, 0x5b, 0x77, 0x98, 0xfb, 0x22, 0xc5, 0xe5, 0x3f, 0xf2, 0x40, 0xa2,
-		0x6d, 0xbd, 0x64, 0x15,
+        0x6e, 0x63, 0xb7, 0xbc, 0x70, 0xab, 0xdd, 0x09, 0x34, 0x1b, 0x34, 0xc0, 0x32, 0x86, 0xba, 0x9b,
+        0xd8, 0x3b, 0xa7, 0x93, 0x6c, 0x5b, 0x77, 0x98, 0xfb, 0x22, 0xc5, 0xe5, 0x3f, 0xf2, 0x40, 0xa2,
+        0x6d, 0xbd, 0x64, 0x15,
 };
 
 const unsigned char c_issuer_exp[] = {
-		0x03,
+        0x03,
 };
 
 const unsigned char c_icc_cert[] = {
-		0xa4, 0x2f, 0xbe, 0xb1, 0x56, 0xb9, 0x8d, 0xcb, 0x05, 0x54, 0xda, 0x06, 0x2a, 0xdc, 0xa5, 0x30,
-		0x9a, 0x91, 0xf0, 0x4f, 0xa2, 0xc7, 0xbd, 0x71, 0x02, 0xa8, 0xd7, 0x3f, 0x16, 0xa3, 0xcf, 0xad,
-		0xe8, 0xaa, 0xdf, 0x4f, 0x3f, 0xe2, 0xa2, 0x12, 0x5c, 0xcd, 0xd7, 0x7c, 0x6b, 0x9f, 0x78, 0xb5,
-		0xb4, 0x37, 0x1c, 0xe0, 0x80, 0x57, 0x25, 0xb0, 0xf9, 0xc0, 0x27, 0xaf, 0x14, 0x7d, 0x91, 0xe1,
-		0xff, 0xdb, 0x20, 0x1e, 0x9c, 0x17, 0x0c, 0xe7, 0x77, 0x05, 0x3a, 0x17, 0x2a, 0xd5, 0x26, 0xdc,
-		0xaf, 0xd3, 0x38, 0x95, 0xe1, 0xa9, 0x47, 0x30, 0x5c, 0x5b, 0x16, 0x7f, 0x2e, 0x7c, 0x6f, 0x99,
-		0x15, 0x81, 0xa6, 0x52, 0xee, 0x47, 0x31, 0x54, 0x76, 0x0c, 0x2e, 0xd7, 0x74, 0x21, 0x4e, 0x50,
-		0xdf, 0xec, 0xdd, 0x4c, 0xf2, 0x94, 0xc9, 0x74, 0xb8, 0x9e, 0xbc, 0xa2, 0x5b, 0x5a, 0xb3, 0xc0,
-		0xbe, 0xb5, 0x0d, 0xfa, 0xf7, 0x82, 0xaf, 0xde, 0x14, 0x33, 0xd9, 0x0c, 0xa2, 0xa8, 0x9d, 0x65,
-		0x1e, 0x75, 0xd6, 0x7e, 0xbc, 0x7c, 0x3e, 0x36, 0xf5, 0xa1, 0x65, 0xee, 0x61, 0x32, 0x61, 0x29,
-		0x39, 0xc1, 0xec, 0xd3, 0x99, 0xe4, 0x60, 0x74, 0xb9, 0x96, 0xd9, 0x3a, 0x88, 0xe0, 0x1e, 0x0a,
+        0xa4, 0x2f, 0xbe, 0xb1, 0x56, 0xb9, 0x8d, 0xcb, 0x05, 0x54, 0xda, 0x06, 0x2a, 0xdc, 0xa5, 0x30,
+        0x9a, 0x91, 0xf0, 0x4f, 0xa2, 0xc7, 0xbd, 0x71, 0x02, 0xa8, 0xd7, 0x3f, 0x16, 0xa3, 0xcf, 0xad,
+        0xe8, 0xaa, 0xdf, 0x4f, 0x3f, 0xe2, 0xa2, 0x12, 0x5c, 0xcd, 0xd7, 0x7c, 0x6b, 0x9f, 0x78, 0xb5,
+        0xb4, 0x37, 0x1c, 0xe0, 0x80, 0x57, 0x25, 0xb0, 0xf9, 0xc0, 0x27, 0xaf, 0x14, 0x7d, 0x91, 0xe1,
+        0xff, 0xdb, 0x20, 0x1e, 0x9c, 0x17, 0x0c, 0xe7, 0x77, 0x05, 0x3a, 0x17, 0x2a, 0xd5, 0x26, 0xdc,
+        0xaf, 0xd3, 0x38, 0x95, 0xe1, 0xa9, 0x47, 0x30, 0x5c, 0x5b, 0x16, 0x7f, 0x2e, 0x7c, 0x6f, 0x99,
+        0x15, 0x81, 0xa6, 0x52, 0xee, 0x47, 0x31, 0x54, 0x76, 0x0c, 0x2e, 0xd7, 0x74, 0x21, 0x4e, 0x50,
+        0xdf, 0xec, 0xdd, 0x4c, 0xf2, 0x94, 0xc9, 0x74, 0xb8, 0x9e, 0xbc, 0xa2, 0x5b, 0x5a, 0xb3, 0xc0,
+        0xbe, 0xb5, 0x0d, 0xfa, 0xf7, 0x82, 0xaf, 0xde, 0x14, 0x33, 0xd9, 0x0c, 0xa2, 0xa8, 0x9d, 0x65,
+        0x1e, 0x75, 0xd6, 0x7e, 0xbc, 0x7c, 0x3e, 0x36, 0xf5, 0xa1, 0x65, 0xee, 0x61, 0x32, 0x61, 0x29,
+        0x39, 0xc1, 0xec, 0xd3, 0x99, 0xe4, 0x60, 0x74, 0xb9, 0x96, 0xd9, 0x3a, 0x88, 0xe0, 0x1e, 0x0a,
 };
 
 const unsigned char c_icc_exp[] = {
-		0x03,
+        0x03,
 };
 
 const unsigned char c_sdad_cr[] = {
-	0x1c, 0x00, 0x9f, 0xc4, 0x86, 0x79, 0x15, 0x7d, 0xbf, 0xf4, 0x5f, 0x65, 0xd3, 0x3f, 0xf7, 0x8d,
-	0x4f, 0xcb, 0xf0, 0xcf, 0x5e, 0xa4, 0x20, 0x8d, 0x10, 0x7a, 0xe9, 0x5a, 0xa3, 0x8c, 0x54, 0x6d,
-	0x0e, 0x5a, 0x18, 0xb8, 0x74, 0x03, 0xa1, 0x2b, 0xd4, 0x47, 0xa8, 0xbb, 0xfc, 0x1e, 0x49, 0xce,
-	0x0b, 0x2e, 0x25, 0x13, 0x89, 0x20, 0x57, 0x03, 0xc9, 0xbb, 0x1a, 0x88, 0xcc, 0x79, 0xf1, 0xdd,
-	0xc2, 0xf9, 0x84, 0x1e, 0xad, 0xf0, 0x7c, 0xe0, 0x7b, 0x62, 0x51, 0x1d, 0xdc, 0x93, 0xdf, 0x59,
-	0xf2, 0x8f, 0x0e, 0x91, 0xf9, 0x23, 0x32, 0xd2, 0x9c, 0xde, 0xf2, 0xbc, 0xcb, 0x10, 0x08, 0x85,
-	0x05, 0x00, 0xef, 0x3e, 0x47, 0x0a, 0x4c, 0xb1, 0x8c, 0xd9, 0x1a, 0xa5, 0xc1, 0xa1, 0x08, 0xf3,
+    0x1c, 0x00, 0x9f, 0xc4, 0x86, 0x79, 0x15, 0x7d, 0xbf, 0xf4, 0x5f, 0x65, 0xd3, 0x3f, 0xf7, 0x8d,
+    0x4f, 0xcb, 0xf0, 0xcf, 0x5e, 0xa4, 0x20, 0x8d, 0x10, 0x7a, 0xe9, 0x5a, 0xa3, 0x8c, 0x54, 0x6d,
+    0x0e, 0x5a, 0x18, 0xb8, 0x74, 0x03, 0xa1, 0x2b, 0xd4, 0x47, 0xa8, 0xbb, 0xfc, 0x1e, 0x49, 0xce,
+    0x0b, 0x2e, 0x25, 0x13, 0x89, 0x20, 0x57, 0x03, 0xc9, 0xbb, 0x1a, 0x88, 0xcc, 0x79, 0xf1, 0xdd,
+    0xc2, 0xf9, 0x84, 0x1e, 0xad, 0xf0, 0x7c, 0xe0, 0x7b, 0x62, 0x51, 0x1d, 0xdc, 0x93, 0xdf, 0x59,
+    0xf2, 0x8f, 0x0e, 0x91, 0xf9, 0x23, 0x32, 0xd2, 0x9c, 0xde, 0xf2, 0xbc, 0xcb, 0x10, 0x08, 0x85,
+    0x05, 0x00, 0xef, 0x3e, 0x47, 0x0a, 0x4c, 0xb1, 0x8c, 0xd9, 0x1a, 0xa5, 0xc1, 0xa1, 0x08, 0xf3,
 
 };
 
 const unsigned char c_ssd1[] = {
-	0x5f, 0x25, 0x03, 0x14, 0x05, 0x01, 0x5f, 0x24, 0x03, 0x15, 0x06, 0x30, 0x5a, 0x08, 0x52, 0x85,
-	0x88, 0x12, 0x54, 0x34, 0x56, 0x53, 0x5f, 0x34, 0x01, 0x01, 0x8e, 0x0c, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x1e, 0x03, 0x1f, 0x03, 0x9f, 0x07, 0x02, 0xff, 0x00, 0x9f, 0x0d, 0x05,
-	0xbc, 0x50, 0xbc, 0x00, 0x00, 0x9f, 0x0e, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9f, 0x0f, 0x05,
-	0xbc, 0x70, 0xbc, 0x98, 0x00, 0x9f, 0x4a, 0x01, 0x82, 0x5f, 0x28, 0x02, 0x06, 0x43, 0x8c, 0x21,
-	0x9f, 0x02, 0x06, 0x9f, 0x03, 0x06, 0x9f, 0x1a, 0x02, 0x95, 0x05, 0x5f, 0x2a, 0x02, 0x9a, 0x03,
-	0x9c, 0x01, 0x9f, 0x37, 0x04, 0x9f, 0x35, 0x01, 0x9f, 0x45, 0x02, 0x9f, 0x4c, 0x08, 0x9f, 0x34,
-	0x03, 0x8d, 0x0c, 0x91, 0x0a, 0x8a, 0x02, 0x95, 0x05, 0x9f, 0x37, 0x04, 0x9f, 0x4c, 0x08,
-	0x39, 0x00,
+    0x5f, 0x25, 0x03, 0x14, 0x05, 0x01, 0x5f, 0x24, 0x03, 0x15, 0x06, 0x30, 0x5a, 0x08, 0x52, 0x85,
+    0x88, 0x12, 0x54, 0x34, 0x56, 0x53, 0x5f, 0x34, 0x01, 0x01, 0x8e, 0x0c, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x1e, 0x03, 0x1f, 0x03, 0x9f, 0x07, 0x02, 0xff, 0x00, 0x9f, 0x0d, 0x05,
+    0xbc, 0x50, 0xbc, 0x00, 0x00, 0x9f, 0x0e, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9f, 0x0f, 0x05,
+    0xbc, 0x70, 0xbc, 0x98, 0x00, 0x9f, 0x4a, 0x01, 0x82, 0x5f, 0x28, 0x02, 0x06, 0x43, 0x8c, 0x21,
+    0x9f, 0x02, 0x06, 0x9f, 0x03, 0x06, 0x9f, 0x1a, 0x02, 0x95, 0x05, 0x5f, 0x2a, 0x02, 0x9a, 0x03,
+    0x9c, 0x01, 0x9f, 0x37, 0x04, 0x9f, 0x35, 0x01, 0x9f, 0x45, 0x02, 0x9f, 0x4c, 0x08, 0x9f, 0x34,
+    0x03, 0x8d, 0x0c, 0x91, 0x0a, 0x8a, 0x02, 0x95, 0x05, 0x9f, 0x37, 0x04, 0x9f, 0x4c, 0x08,
+    0x39, 0x00,
 };
 static const struct tlv ssd1_tlv = {
-	.len = sizeof(c_ssd1),
-	.value = c_ssd1,
+    .len = sizeof(c_ssd1),
+    .value = c_ssd1,
 };
 
 const unsigned char c_pan[] = {
-	0x52, 0x85, 0x88, 0x12, 0x54, 0x34, 0x56, 0x53,
+    0x52, 0x85, 0x88, 0x12, 0x54, 0x34, 0x56, 0x53,
 };
 
 const unsigned char c_dd1[] = {
-	0x12, 0x34, 0x57, 0x79,
+    0x12, 0x34, 0x57, 0x79,
 };
 
 const unsigned char c_dd2[] = {
-	0x9f, 0x27, 0x01, 0x40, 0x9f, 0x36, 0x02, 0x00, 0x10, 0x9f, 0x10, 0x12, 0x00, 0x10, 0x90, 0x40,
-	0x01, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
+    0x9f, 0x27, 0x01, 0x40, 0x9f, 0x36, 0x02, 0x00, 0x10, 0x9f, 0x10, 0x12, 0x00, 0x10, 0x90, 0x40,
+    0x01, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
 };
 
 const unsigned char c_crm1[] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x43, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x06, 0x43, 0x14, 0x09, 0x25, 0x50, 0x12, 0x34, 0x57, 0x79, 0x23, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x03, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x43, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x06, 0x43, 0x14, 0x09, 0x25, 0x50, 0x12, 0x34, 0x57, 0x79, 0x23, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x03, 0x00,
 };
 static const struct tlv crm1_tlv = {
-	.len = sizeof(c_crm1),
-	.value = c_crm1,
+    .len = sizeof(c_crm1),
+    .value = c_crm1,
 };
 
 static int cda_test_raw(bool verbose)
 {
-	const struct emv_pk *pk = &c_mchip_05;
+    const struct emv_pk *pk = &c_mchip_05;
 
-	struct crypto_pk *kcp = crypto_pk_open(PK_RSA,
-			pk->modulus, pk->mlen,
-			pk->exp, pk->elen);
-	if (!kcp)
-		return 1;
+    struct crypto_pk *kcp = crypto_pk_open(PK_RSA,
+            pk->modulus, pk->mlen,
+            pk->exp, pk->elen);
+    if (!kcp)
+        return 1;
 
-	unsigned char *ipk_data;
-	size_t ipk_data_len;
-	ipk_data = crypto_pk_encrypt(kcp, c_issuer_cert, sizeof(c_issuer_cert), &ipk_data_len);
-	crypto_pk_close(kcp);
+    unsigned char *ipk_data;
+    size_t ipk_data_len;
+    ipk_data = crypto_pk_encrypt(kcp, c_issuer_cert, sizeof(c_issuer_cert), &ipk_data_len);
+    crypto_pk_close(kcp);
 
-	if (!ipk_data)
-		return 1;
+    if (!ipk_data)
+        return 1;
 
-	if (verbose) {
-		printf("issuer cert:\n");
-		dump_buffer(ipk_data, ipk_data_len, stdout, 0);
-	}
+    if (verbose) {
+        printf("issuer cert:\n");
+        dump_buffer(ipk_data, ipk_data_len, stdout, 0);
+    }
 
-	size_t ipk_pk_len = ipk_data[13];
-	unsigned char *ipk_pk = malloc(ipk_pk_len);
-	memcpy(ipk_pk, ipk_data + 15, ipk_data_len - 36);
-	memcpy(ipk_pk + ipk_data_len - 36, c_issuer_rem, sizeof(c_issuer_rem));
+    size_t ipk_pk_len = ipk_data[13];
+    unsigned char *ipk_pk = malloc(ipk_pk_len);
+    memcpy(ipk_pk, ipk_data + 15, ipk_data_len - 36);
+    memcpy(ipk_pk + ipk_data_len - 36, c_issuer_rem, sizeof(c_issuer_rem));
 
-	struct crypto_hash *ch;
-	ch = crypto_hash_open(HASH_SHA_1);
-	if (!ch) {
-		free(ipk_pk);
-		free(ipk_data);
-		return 1;
-	}
+    struct crypto_hash *ch;
+    ch = crypto_hash_open(HASH_SHA_1);
+    if (!ch) {
+        free(ipk_pk);
+        free(ipk_data);
+        return 1;
+    }
 
-	crypto_hash_write(ch, ipk_data + 1, 14);
-	crypto_hash_write(ch, ipk_pk, ipk_pk_len);
-	crypto_hash_write(ch, c_issuer_exp, sizeof(c_issuer_exp));
+    crypto_hash_write(ch, ipk_data + 1, 14);
+    crypto_hash_write(ch, ipk_pk, ipk_pk_len);
+    crypto_hash_write(ch, c_issuer_exp, sizeof(c_issuer_exp));
 
-	unsigned char *h = crypto_hash_read(ch);
-	if (!h) {
-		crypto_hash_close(ch);
-		free(ipk_pk);
-		free(ipk_data);
-		return 1;
-	}
+    unsigned char *h = crypto_hash_read(ch);
+    if (!h) {
+        crypto_hash_close(ch);
+        free(ipk_pk);
+        free(ipk_data);
+        return 1;
+    }
 
-	if (verbose) {
-		printf("crypto hash:\n");
-		dump_buffer(h, 20, stdout, 0);
-	}
+    if (verbose) {
+        printf("crypto hash:\n");
+        dump_buffer(h, 20, stdout, 0);
+    }
 
-	if (memcmp(ipk_data + ipk_data_len - 21, h, 20)) {
-		crypto_hash_close(ch);
-		free(ipk_pk);
-		free(ipk_data);
-		return 1;
-	}
+    if (memcmp(ipk_data + ipk_data_len - 21, h, 20)) {
+        crypto_hash_close(ch);
+        free(ipk_pk);
+        free(ipk_data);
+        return 1;
+    }
 
-	crypto_hash_close(ch);
-	free(ipk_data);
+    crypto_hash_close(ch);
+    free(ipk_data);
 
-	struct crypto_pk *ikcp = crypto_pk_open(PK_RSA, ipk_pk, (int) ipk_pk_len,
-			c_issuer_exp, (int) sizeof(c_issuer_exp));
-	free(ipk_pk);
-	if (!ikcp)
-		return 1;
+    struct crypto_pk *ikcp = crypto_pk_open(PK_RSA, ipk_pk, (int) ipk_pk_len,
+            c_issuer_exp, (int) sizeof(c_issuer_exp));
+    free(ipk_pk);
+    if (!ikcp)
+        return 1;
 
-	unsigned char *iccpk_data;
-	size_t iccpk_data_len;
-	iccpk_data = crypto_pk_encrypt(ikcp, c_icc_cert, sizeof(c_icc_cert), &iccpk_data_len);
-	crypto_pk_close(ikcp);
+    unsigned char *iccpk_data;
+    size_t iccpk_data_len;
+    iccpk_data = crypto_pk_encrypt(ikcp, c_icc_cert, sizeof(c_icc_cert), &iccpk_data_len);
+    crypto_pk_close(ikcp);
 
-	if (!iccpk_data)
-		return 1;
+    if (!iccpk_data)
+        return 1;
 
-	if (verbose) {
-		printf("icc cert:\n");
-		dump_buffer(iccpk_data, iccpk_data_len, stdout, 0);
-	}
+    if (verbose) {
+        printf("icc cert:\n");
+        dump_buffer(iccpk_data, iccpk_data_len, stdout, 0);
+    }
 
-	size_t iccpk_pk_len = iccpk_data[19];
-	unsigned char *iccpk_pk = malloc(iccpk_pk_len);
-	memcpy(iccpk_pk, iccpk_data + 21, /*iccpk_data_len - 36*/iccpk_pk_len);
-	/*memcpy(iccpk_pk + iccpk_data_len - 36, icc_rem, sizeof(icc_rem));*/
+    size_t iccpk_pk_len = iccpk_data[19];
+    unsigned char *iccpk_pk = malloc(iccpk_pk_len);
+    memcpy(iccpk_pk, iccpk_data + 21, /*iccpk_data_len - 36*/iccpk_pk_len);
+    /*memcpy(iccpk_pk + iccpk_data_len - 36, icc_rem, sizeof(icc_rem));*/
 
-	ch = crypto_hash_open(HASH_SHA_1);
-	if (!ch) {
-		free(iccpk_pk);
-		free(iccpk_data);
-		return 1;
-	}
+    ch = crypto_hash_open(HASH_SHA_1);
+    if (!ch) {
+        free(iccpk_pk);
+        free(iccpk_data);
+        return 1;
+    }
 
-	crypto_hash_write(ch, iccpk_data + 1, iccpk_data_len - 22);
-	crypto_hash_write(ch, c_icc_exp, sizeof(c_icc_exp));
-	crypto_hash_write(ch, c_ssd1, sizeof(c_ssd1));
+    crypto_hash_write(ch, iccpk_data + 1, iccpk_data_len - 22);
+    crypto_hash_write(ch, c_icc_exp, sizeof(c_icc_exp));
+    crypto_hash_write(ch, c_ssd1, sizeof(c_ssd1));
 
-	h = crypto_hash_read(ch);
-	if (!h) {
-		crypto_hash_close(ch);
-		free(iccpk_pk);
-		free(iccpk_data);
-		return 1;
-	}
+    h = crypto_hash_read(ch);
+    if (!h) {
+        crypto_hash_close(ch);
+        free(iccpk_pk);
+        free(iccpk_data);
+        return 1;
+    }
 
-	if (verbose) {
-		printf("crypto hash1.1:\n");
-		dump_buffer(h, 20, stdout, 0);
-	}
+    if (verbose) {
+        printf("crypto hash1.1:\n");
+        dump_buffer(h, 20, stdout, 0);
+    }
 
-	if (memcmp(iccpk_data + iccpk_data_len - 21, h, 20)) {
-		crypto_hash_close(ch);
-		free(iccpk_pk);
-		free(iccpk_data);
-		return 1;
-	}
+    if (memcmp(iccpk_data + iccpk_data_len - 21, h, 20)) {
+        crypto_hash_close(ch);
+        free(iccpk_pk);
+        free(iccpk_data);
+        return 1;
+    }
 
-	crypto_hash_close(ch);
-	free(iccpk_data);
+    crypto_hash_close(ch);
+    free(iccpk_data);
 
-	struct crypto_pk *icckcp = crypto_pk_open(PK_RSA, iccpk_pk, (int) iccpk_pk_len,
-			c_issuer_exp, (int) sizeof(c_issuer_exp));
-	free(iccpk_pk);
-	if (!icckcp)
-		return 1;
+    struct crypto_pk *icckcp = crypto_pk_open(PK_RSA, iccpk_pk, (int) iccpk_pk_len,
+            c_issuer_exp, (int) sizeof(c_issuer_exp));
+    free(iccpk_pk);
+    if (!icckcp)
+        return 1;
 
-	size_t sdad_len;
-	unsigned char *sdad = crypto_pk_encrypt(icckcp, c_sdad_cr, sizeof(c_sdad_cr), &sdad_len);
-	crypto_pk_close(icckcp);
-	if (!sdad)
-		return 1;
+    size_t sdad_len;
+    unsigned char *sdad = crypto_pk_encrypt(icckcp, c_sdad_cr, sizeof(c_sdad_cr), &sdad_len);
+    crypto_pk_close(icckcp);
+    if (!sdad)
+        return 1;
 
-	if (verbose) {
-		printf("SDAD:\n");
-		dump_buffer(sdad, sdad_len, stdout, 0);
-	}
+    if (verbose) {
+        printf("SDAD:\n");
+        dump_buffer(sdad, sdad_len, stdout, 0);
+    }
 
-	ch = crypto_hash_open(HASH_SHA_1);
-	if (!ch) {
-		free(sdad);
-		return 1;
-	}
+    ch = crypto_hash_open(HASH_SHA_1);
+    if (!ch) {
+        free(sdad);
+        return 1;
+    }
 
-	crypto_hash_write(ch, sdad + 1, sdad_len - 22);
-	crypto_hash_write(ch, c_dd1, sizeof(c_dd1));
+    crypto_hash_write(ch, sdad + 1, sdad_len - 22);
+    crypto_hash_write(ch, c_dd1, sizeof(c_dd1));
 
-	unsigned char *h2 = crypto_hash_read(ch);
-	if (!h2) {
-		crypto_hash_close(ch);
-		free(sdad);
-		return 1;
-	}
+    unsigned char *h2 = crypto_hash_read(ch);
+    if (!h2) {
+        crypto_hash_close(ch);
+        free(sdad);
+        return 1;
+    }
 
-	if (verbose) {
-		printf("crypto hash2:\n");
-		dump_buffer(h2, 20, stdout, 0);
-	}
+    if (verbose) {
+        printf("crypto hash2:\n");
+        dump_buffer(h2, 20, stdout, 0);
+    }
 
-	crypto_hash_close(ch);
+    crypto_hash_close(ch);
 
-	ch =  crypto_hash_open(HASH_SHA_1);
-	if (!ch) {
-		free(sdad);
-		return 1;
-	}
+    ch =  crypto_hash_open(HASH_SHA_1);
+    if (!ch) {
+        free(sdad);
+        return 1;
+    }
 
-	crypto_hash_write(ch, c_crm1, sizeof(c_crm1));
-	crypto_hash_write(ch, c_dd2, sizeof(c_dd2));
+    crypto_hash_write(ch, c_crm1, sizeof(c_crm1));
+    crypto_hash_write(ch, c_dd2, sizeof(c_dd2));
 
-	h = crypto_hash_read(ch);
-	if (!h) {
-		crypto_hash_close(ch);
-		free(sdad);
-		return 1;
-	}
+    h = crypto_hash_read(ch);
+    if (!h) {
+        crypto_hash_close(ch);
+        free(sdad);
+        return 1;
+    }
 
-	if (verbose) {
-		printf("crypto hash2.1:\n");
-		dump_buffer(h, 20, stdout, 0);
-	}
+    if (verbose) {
+        printf("crypto hash2.1:\n");
+        dump_buffer(h, 20, stdout, 0);
+    }
 
-	if (memcmp(sdad + 5 + 8 + 1 + 8, h, 20)) {
-		crypto_hash_close(ch);
-		free(sdad);
-		return 1;
-	}
+    if (memcmp(sdad + 5 + 8 + 1 + 8, h, 20)) {
+        crypto_hash_close(ch);
+        free(sdad);
+        return 1;
+    }
 
-	crypto_hash_close(ch);
+    crypto_hash_close(ch);
 
-	free(sdad);
+    free(sdad);
 
-	return 0;
+    return 0;
 }
 
 static int cda_test_pk(bool verbose)
 {
-	const struct emv_pk *pk = &c_mchip_05;
-	struct tlvdb *db;
+    const struct emv_pk *pk = &c_mchip_05;
+    struct tlvdb *db;
 
-	db = tlvdb_external(0x90, sizeof(c_issuer_cert), c_issuer_cert);
-	tlvdb_add(db, tlvdb_external(0x9f32, sizeof(c_issuer_exp), c_issuer_exp));
-	tlvdb_add(db, tlvdb_external(0x92, sizeof(c_issuer_rem), c_issuer_rem));
-	tlvdb_add(db, tlvdb_external(0x5a, sizeof(c_pan), c_pan));
+    db = tlvdb_external(0x90, sizeof(c_issuer_cert), c_issuer_cert);
+    tlvdb_add(db, tlvdb_external(0x9f32, sizeof(c_issuer_exp), c_issuer_exp));
+    tlvdb_add(db, tlvdb_external(0x92, sizeof(c_issuer_rem), c_issuer_rem));
+    tlvdb_add(db, tlvdb_external(0x5a, sizeof(c_pan), c_pan));
 
-	struct emv_pk *ipk = emv_pki_recover_issuer_cert(pk, db);
-	if (!ipk) {
-		fprintf(stderr, "Could not recover Issuer certificate!\n");
-		tlvdb_free(db);
-		return 2;
-	}
+    struct emv_pk *ipk = emv_pki_recover_issuer_cert(pk, db);
+    if (!ipk) {
+        fprintf(stderr, "Could not recover Issuer certificate!\n");
+        tlvdb_free(db);
+        return 2;
+    }
 
-	tlvdb_add(db, tlvdb_external(0x9f46, sizeof(c_icc_cert), c_icc_cert));
-	tlvdb_add(db, tlvdb_external(0x9f47, sizeof(c_icc_exp), c_icc_exp));
-	/*tlvdb_add(db, tlvdb_external(0x9f48, sizeof(issuer_rem), issuer_rem));*/
+    tlvdb_add(db, tlvdb_external(0x9f46, sizeof(c_icc_cert), c_icc_cert));
+    tlvdb_add(db, tlvdb_external(0x9f47, sizeof(c_icc_exp), c_icc_exp));
+    /*tlvdb_add(db, tlvdb_external(0x9f48, sizeof(issuer_rem), issuer_rem));*/
 
-	struct emv_pk *iccpk = emv_pki_recover_icc_cert(ipk, db, &ssd1_tlv);
-	if (!iccpk) {
-		fprintf(stderr, "Could not recover ICC certificate!\n");
-		emv_pk_free(ipk);
-		tlvdb_free(db);
-		return 2;
-	}
+    struct emv_pk *iccpk = emv_pki_recover_icc_cert(ipk, db, &ssd1_tlv);
+    if (!iccpk) {
+        fprintf(stderr, "Could not recover ICC certificate!\n");
+        emv_pk_free(ipk);
+        tlvdb_free(db);
+        return 2;
+    }
 
-	tlvdb_add(db, tlvdb_fixed(0x9f37, sizeof(c_dd1), c_dd1));
+    tlvdb_add(db, tlvdb_fixed(0x9f37, sizeof(c_dd1), c_dd1));
 
-	struct tlvdb *cda_db;
-	cda_db = tlvdb_fixed(0x9f27, 1, (unsigned char[]){ 0x40 });
-	tlvdb_add(cda_db, tlvdb_fixed(0x9f36, 2, (unsigned char[]) { 0x00, 0x10 }));
-	tlvdb_add(cda_db, tlvdb_external(0x9f4b, sizeof(c_sdad_cr), c_sdad_cr));
-	tlvdb_add(cda_db, tlvdb_fixed(0x9f10, 0x12,
-			(unsigned char[]) { 0x00, 0x10, 0x90, 0x40, 0x01, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff}));
+    struct tlvdb *cda_db;
+    cda_db = tlvdb_fixed(0x9f27, 1, (unsigned char[]){ 0x40 });
+    tlvdb_add(cda_db, tlvdb_fixed(0x9f36, 2, (unsigned char[]) { 0x00, 0x10 }));
+    tlvdb_add(cda_db, tlvdb_external(0x9f4b, sizeof(c_sdad_cr), c_sdad_cr));
+    tlvdb_add(cda_db, tlvdb_fixed(0x9f10, 0x12,
+            (unsigned char[]) { 0x00, 0x10, 0x90, 0x40, 0x01, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff}));
 
-	struct tlvdb *idndb = emv_pki_perform_cda(iccpk, db, cda_db,
-			NULL,
-			&crm1_tlv,
-			NULL);
-	if (!idndb) {
-		fprintf(stderr, "Could not recover IDN!\n");
-		tlvdb_free(cda_db);
-		emv_pk_free(iccpk);
-		emv_pk_free(ipk);
-		tlvdb_free(db);
-		return 2;
-	}
+    struct tlvdb *idndb = emv_pki_perform_cda(iccpk, db, cda_db,
+            NULL,
+            &crm1_tlv,
+            NULL);
+    if (!idndb) {
+        fprintf(stderr, "Could not recover IDN!\n");
+        tlvdb_free(cda_db);
+        emv_pk_free(iccpk);
+        emv_pk_free(ipk);
+        tlvdb_free(db);
+        return 2;
+    }
 
-	const struct tlv *idn = tlvdb_get(idndb, 0x9f4c, NULL);
-	if (!idn) {
-		fprintf(stderr, "IDN not found!\n");
-		tlvdb_free(idndb);
-		tlvdb_free(cda_db);
-		emv_pk_free(iccpk);
-		emv_pk_free(ipk);
-		tlvdb_free(db);
-		return 2;
-	}
+    const struct tlv *idn = tlvdb_get(idndb, 0x9f4c, NULL);
+    if (!idn) {
+        fprintf(stderr, "IDN not found!\n");
+        tlvdb_free(idndb);
+        tlvdb_free(cda_db);
+        emv_pk_free(iccpk);
+        emv_pk_free(ipk);
+        tlvdb_free(db);
+        return 2;
+    }
 
-	if (verbose) {
-		printf("IDN:\n");
-		dump_buffer(idn->value, idn->len, stdout, 0);
-	}
+    if (verbose) {
+        printf("IDN:\n");
+        dump_buffer(idn->value, idn->len, stdout, 0);
+    }
 
-	tlvdb_free(idndb);
-	tlvdb_free(cda_db);
-	emv_pk_free(iccpk);
-	emv_pk_free(ipk);
-	tlvdb_free(db);
+    tlvdb_free(idndb);
+    tlvdb_free(cda_db);
+    emv_pk_free(iccpk);
+    emv_pk_free(ipk);
+    tlvdb_free(db);
 
-	return 0;
+    return 0;
 }
 
 int exec_cda_test(bool verbose)
 {
-	int ret;
-	fprintf(stdout, "\n");
+    int ret;
+    fprintf(stdout, "\n");
 
-	ret = cda_test_raw(verbose);
-	if (ret) {
-		fprintf(stderr, "CDA raw test: failed\n");
-		return ret;
-	}
-	fprintf(stdout, "CDA raw test: passed\n");
+    ret = cda_test_raw(verbose);
+    if (ret) {
+        fprintf(stderr, "CDA raw test: failed\n");
+        return ret;
+    }
+    fprintf(stdout, "CDA raw test: passed\n");
 
-	ret = cda_test_pk(verbose);
-	if (ret) {
-		fprintf(stderr, "CDA test pk: failed\n");
-		return ret;
-	}
-	fprintf(stdout, "CDA test pk: passed\n");
+    ret = cda_test_pk(verbose);
+    if (ret) {
+        fprintf(stderr, "CDA test pk: failed\n");
+        return ret;
+    }
+    fprintf(stdout, "CDA test pk: passed\n");
 
-	return 0;
+    return 0;
 }
diff --git a/client/emv/test/crypto_test.c b/client/emv/test/crypto_test.c
index dee9128fe..93391eaae 100644
--- a/client/emv/test/crypto_test.c
+++ b/client/emv/test/crypto_test.c
@@ -27,301 +27,301 @@
 
 static int test_genkey(unsigned int keylength, unsigned char *msg, size_t msg_len, bool verbose)
 {
-	int ret = 1;
-	size_t tmp_len, tmp2_len;
-	unsigned char *tmp, *tmp2;
-	struct crypto_pk *pk;
+    int ret = 1;
+    size_t tmp_len, tmp2_len;
+    unsigned char *tmp, *tmp2;
+    struct crypto_pk *pk;
 
-	printf("Testing key length %u ", keylength);
-	uint64_t ms = msclock();
+    printf("Testing key length %u ", keylength);
+    uint64_t ms = msclock();
 
-	pk = crypto_pk_genkey(PK_RSA, 1, keylength, 3);
-	if (!pk) {
-		fprintf(stderr, "ERROR: key generation error.\n");
-		goto out;
-	}
+    pk = crypto_pk_genkey(PK_RSA, 1, keylength, 3);
+    if (!pk) {
+        fprintf(stderr, "ERROR: key generation error.\n");
+        goto out;
+    }
 
-	tmp_len = crypto_pk_get_nbits(pk);
-	if (tmp_len != keylength) {
-		fprintf(stderr, "ERROR: crypto_pk_get_nbits.\n");
-		goto close;
-	}
+    tmp_len = crypto_pk_get_nbits(pk);
+    if (tmp_len != keylength) {
+        fprintf(stderr, "ERROR: crypto_pk_get_nbits.\n");
+        goto close;
+    }
 
-	tmp = crypto_pk_decrypt(pk, msg, msg_len, &tmp_len);
-	if (!tmp) {
-		fprintf(stderr, "ERROR: crypto_pk_decrypt.\n");
-		goto close;
-	}
+    tmp = crypto_pk_decrypt(pk, msg, msg_len, &tmp_len);
+    if (!tmp) {
+        fprintf(stderr, "ERROR: crypto_pk_decrypt.\n");
+        goto close;
+    }
 
-	tmp2 = crypto_pk_encrypt(pk, tmp, tmp_len, &tmp2_len);
-	if (!tmp2) {
-		fprintf(stderr, "ERROR: crypto_pk_encrypt.\n");
-		goto free_tmp;
-	}
+    tmp2 = crypto_pk_encrypt(pk, tmp, tmp_len, &tmp2_len);
+    if (!tmp2) {
+        fprintf(stderr, "ERROR: crypto_pk_encrypt.\n");
+        goto free_tmp;
+    }
 
-	if (tmp2_len == msg_len && !memcmp(tmp2, msg, tmp2_len)) {
-		ret = 0;
-	} else {
-		fprintf(stderr, "ERROR: encrypt-decrypt sequence length or data error.\n");
-	}
+    if (tmp2_len == msg_len && !memcmp(tmp2, msg, tmp2_len)) {
+        ret = 0;
+    } else {
+        fprintf(stderr, "ERROR: encrypt-decrypt sequence length or data error.\n");
+    }
 
-	free(tmp2);
-	printf("passed. (%"PRIu64" ms) \n", msclock() - ms);
+    free(tmp2);
+    printf("passed. (%"PRIu64" ms) \n", msclock() - ms);
 free_tmp:
-	free(tmp);
+    free(tmp);
 close:
-	crypto_pk_close(pk);
+    crypto_pk_close(pk);
 
 out:
-	return ret;
+    return ret;
 }
 
 static unsigned char message[4096 / 8] =
-	"aaaaaaaaaaaaaaaabbbbbbbbbbbbbbbb"
-	"ccccccccccccccccdddddddddddddddd"
-	"eeeeeeeeeeeeeeeeffffffffffffffff"
-	"gggggggggggggggghhhhhhhhhhhhhhhh"
-	"iiiiiiiiiiiiiiiijjjjjjjjjjjjjjjj"
-	"kkkkkkkkkkkkkkkkllllllllllllllll"
-	"mmmmmmmmmmmmmmmmnnnnnnnnnnnnnnnn"
-	"oooooooooooooooopppppppppppppppp"
-	"qqqqqqqqqqqqqqqqrrrrrrrrrrrrrrrr"
-	"sssssssssssssssstttttttttttttttt"
-	"uuuuuuuuuuuuuuuuvvvvvvvvvvvvvvvv"
-	"wwwwwwwwwwwwwwwwxxxxxxxxxxxxxxxx"
-	"yyyyyyyyyyyyyyyyzzzzzzzzzzzzzzzz"
-	"aaaaaaaaaaaaaaaabbbbbbbbbbbbbbbb"
-	"ccccccccccccccccdddddddddddddddd"
-	"eeeeeeeeeeeeeeeeffffffffffffffff"
-	;
+    "aaaaaaaaaaaaaaaabbbbbbbbbbbbbbbb"
+    "ccccccccccccccccdddddddddddddddd"
+    "eeeeeeeeeeeeeeeeffffffffffffffff"
+    "gggggggggggggggghhhhhhhhhhhhhhhh"
+    "iiiiiiiiiiiiiiiijjjjjjjjjjjjjjjj"
+    "kkkkkkkkkkkkkkkkllllllllllllllll"
+    "mmmmmmmmmmmmmmmmnnnnnnnnnnnnnnnn"
+    "oooooooooooooooopppppppppppppppp"
+    "qqqqqqqqqqqqqqqqrrrrrrrrrrrrrrrr"
+    "sssssssssssssssstttttttttttttttt"
+    "uuuuuuuuuuuuuuuuvvvvvvvvvvvvvvvv"
+    "wwwwwwwwwwwwwwwwxxxxxxxxxxxxxxxx"
+    "yyyyyyyyyyyyyyyyzzzzzzzzzzzzzzzz"
+    "aaaaaaaaaaaaaaaabbbbbbbbbbbbbbbb"
+    "ccccccccccccccccdddddddddddddddd"
+    "eeeeeeeeeeeeeeeeffffffffffffffff"
+    ;
 
 static unsigned char pk_N[] = {
-	0xdb, 0x12, 0xe4, 0xf1, 0x8d, 0x43, 0x74, 0xf0, 0xec, 0x38, 0xdc, 0xfb, 0xf9, 0x20, 0x75, 0x6d,
-	0x05, 0xf4, 0x36, 0xc2, 0x21, 0xac, 0x34, 0x0d, 0x16, 0xc5, 0x23, 0xcb, 0xfc, 0x9a, 0x8a, 0xd1,
-	0xe0, 0xbd, 0xda, 0xe5, 0x77, 0xd5, 0xaf, 0x65, 0x8d, 0x6b, 0x62, 0x5c, 0xcd, 0x89, 0x06, 0x8d,
-	0x11, 0x19, 0x6b, 0x0e, 0x3e, 0xe2, 0x80, 0x45, 0xf6, 0x44, 0x55, 0x21, 0x9c, 0x86, 0x90, 0x00,
-	0xa8, 0xaf, 0x8c, 0x94, 0xde, 0x3f, 0xe8, 0x56, 0x52, 0xfe, 0xee, 0xa5, 0x36, 0x72, 0x07, 0xf2,
-	0xcf, 0x8e, 0xf0, 0xbd, 0xff, 0x36, 0xd5, 0xf2, 0xad, 0x74, 0x1d, 0x17, 0xd0, 0xb7, 0x93, 0xe2,
-	0x2c, 0x8d, 0x3f, 0xb6, 0x7c, 0x65, 0x19, 0x9f, 0xa7, 0x80, 0x1f, 0x9f, 0xe5, 0x2f, 0x2d, 0x75,
-	0xc9, 0xc2, 0xe9, 0x70, 0xfa, 0x1e, 0x5a, 0xc6, 0xa3, 0x82, 0xd1, 0x29, 0x5a, 0x60, 0xce, 0x1f,
-	0x40, 0x2e, 0xfc, 0x2a, 0x5e, 0xde, 0xc9, 0x67, 0xfc, 0x45, 0x18, 0xce, 0xf2, 0x83, 0x94, 0x53,
-	0xd6, 0x4f, 0x2e, 0xc5, 0x2d, 0xa1, 0xa5, 0x7a, 0x63, 0x26, 0x70, 0xcb, 0x76, 0xfc, 0xb5, 0x8d,
-	0x0f, 0x88, 0x4c, 0x07, 0xba, 0xfa, 0x8b, 0xbc, 0xa0, 0xea, 0xea, 0x0a, 0xe6, 0xa5, 0x44, 0xa5,
-	0x0d, 0x12, 0x66, 0x2b, 0xf7, 0xc4, 0x76, 0xa3, 0x82, 0xa6, 0x2b, 0xb2, 0x5a, 0x27, 0xcd, 0x11,
-	0xd2, 0x9d, 0x42, 0x86, 0x8c, 0x82, 0xc8, 0xe1, 0xff, 0x7d, 0xf1, 0xd9, 0xd9, 0xa1, 0xf3, 0x3d,
-	0xc3, 0x12, 0x4e, 0x47, 0xc8, 0xa2, 0xcd, 0x72, 0x5a, 0x18, 0xea, 0x89, 0x5c, 0x73, 0x28, 0x52,
-	0xf8, 0xdb, 0x70, 0xdc, 0x92, 0xc9, 0xb7, 0x98, 0x10, 0x94, 0x79, 0xdc, 0x9e, 0x12, 0x6c, 0x14,
-	0x78, 0xf9, 0x5a, 0xad, 0x00, 0x98, 0xc8, 0x17, 0x79, 0x8a, 0xed, 0xe7, 0xc3, 0xd3, 0xa7, 0x8b,
+    0xdb, 0x12, 0xe4, 0xf1, 0x8d, 0x43, 0x74, 0xf0, 0xec, 0x38, 0xdc, 0xfb, 0xf9, 0x20, 0x75, 0x6d,
+    0x05, 0xf4, 0x36, 0xc2, 0x21, 0xac, 0x34, 0x0d, 0x16, 0xc5, 0x23, 0xcb, 0xfc, 0x9a, 0x8a, 0xd1,
+    0xe0, 0xbd, 0xda, 0xe5, 0x77, 0xd5, 0xaf, 0x65, 0x8d, 0x6b, 0x62, 0x5c, 0xcd, 0x89, 0x06, 0x8d,
+    0x11, 0x19, 0x6b, 0x0e, 0x3e, 0xe2, 0x80, 0x45, 0xf6, 0x44, 0x55, 0x21, 0x9c, 0x86, 0x90, 0x00,
+    0xa8, 0xaf, 0x8c, 0x94, 0xde, 0x3f, 0xe8, 0x56, 0x52, 0xfe, 0xee, 0xa5, 0x36, 0x72, 0x07, 0xf2,
+    0xcf, 0x8e, 0xf0, 0xbd, 0xff, 0x36, 0xd5, 0xf2, 0xad, 0x74, 0x1d, 0x17, 0xd0, 0xb7, 0x93, 0xe2,
+    0x2c, 0x8d, 0x3f, 0xb6, 0x7c, 0x65, 0x19, 0x9f, 0xa7, 0x80, 0x1f, 0x9f, 0xe5, 0x2f, 0x2d, 0x75,
+    0xc9, 0xc2, 0xe9, 0x70, 0xfa, 0x1e, 0x5a, 0xc6, 0xa3, 0x82, 0xd1, 0x29, 0x5a, 0x60, 0xce, 0x1f,
+    0x40, 0x2e, 0xfc, 0x2a, 0x5e, 0xde, 0xc9, 0x67, 0xfc, 0x45, 0x18, 0xce, 0xf2, 0x83, 0x94, 0x53,
+    0xd6, 0x4f, 0x2e, 0xc5, 0x2d, 0xa1, 0xa5, 0x7a, 0x63, 0x26, 0x70, 0xcb, 0x76, 0xfc, 0xb5, 0x8d,
+    0x0f, 0x88, 0x4c, 0x07, 0xba, 0xfa, 0x8b, 0xbc, 0xa0, 0xea, 0xea, 0x0a, 0xe6, 0xa5, 0x44, 0xa5,
+    0x0d, 0x12, 0x66, 0x2b, 0xf7, 0xc4, 0x76, 0xa3, 0x82, 0xa6, 0x2b, 0xb2, 0x5a, 0x27, 0xcd, 0x11,
+    0xd2, 0x9d, 0x42, 0x86, 0x8c, 0x82, 0xc8, 0xe1, 0xff, 0x7d, 0xf1, 0xd9, 0xd9, 0xa1, 0xf3, 0x3d,
+    0xc3, 0x12, 0x4e, 0x47, 0xc8, 0xa2, 0xcd, 0x72, 0x5a, 0x18, 0xea, 0x89, 0x5c, 0x73, 0x28, 0x52,
+    0xf8, 0xdb, 0x70, 0xdc, 0x92, 0xc9, 0xb7, 0x98, 0x10, 0x94, 0x79, 0xdc, 0x9e, 0x12, 0x6c, 0x14,
+    0x78, 0xf9, 0x5a, 0xad, 0x00, 0x98, 0xc8, 0x17, 0x79, 0x8a, 0xed, 0xe7, 0xc3, 0xd3, 0xa7, 0x8b,
 };
 
 static unsigned char pk_E[] = {
-	0x01, 0x00, 0x01,
+    0x01, 0x00, 0x01,
 };
 
 static unsigned char pk_D[] = {
-	0x01, 0x17, 0xd4, 0x0a, 0x9c, 0x80, 0xd4, 0xa9, 0x8b, 0x14, 0x31, 0x8e, 0x14, 0x4d, 0x24, 0x28,
-	0xda, 0x19, 0xc0, 0xd8, 0x31, 0x20, 0xd1, 0xd5, 0xaa, 0xe2, 0x6a, 0xee, 0x4e, 0xa1, 0x5a, 0xc5,
-	0xf7, 0x50, 0x1b, 0x32, 0x7f, 0xe9, 0x92, 0x09, 0x78, 0xae, 0x2b, 0x7c, 0x79, 0x0e, 0x10, 0xf9,
-	0x4d, 0x37, 0x8a, 0x40, 0x34, 0xf2, 0x1e, 0x5f, 0xba, 0xfd, 0xd6, 0x4a, 0xe7, 0xa4, 0x08, 0x3d,
-	0xe8, 0x99, 0x8f, 0xa3, 0x02, 0x84, 0xe1, 0x1c, 0xe5, 0x27, 0x1e, 0x7b, 0xb6, 0x8c, 0xd5, 0x1b,
-	0x52, 0x0b, 0xcd, 0x89, 0xb5, 0x27, 0x49, 0xe3, 0xff, 0x17, 0x90, 0x39, 0x99, 0x32, 0x01, 0x4b,
-	0xe4, 0x9b, 0x03, 0xd1, 0x5e, 0x47, 0x86, 0xdc, 0x34, 0x12, 0xc0, 0x95, 0xa4, 0xa8, 0x1a, 0x9a,
-	0xf6, 0xd9, 0xc1, 0x1e, 0x6e, 0x31, 0x0e, 0x94, 0xe5, 0x25, 0xf6, 0xf3, 0x34, 0xdf, 0x3c, 0xc8,
-	0x0a, 0xc5, 0x8c, 0x00, 0x5c, 0x59, 0x55, 0x06, 0xd1, 0x39, 0x84, 0x35, 0x96, 0x40, 0xe8, 0xb2,
-	0xf7, 0x13, 0x83, 0x37, 0xe1, 0xe2, 0x79, 0x41, 0x90, 0x2a, 0xc3, 0x71, 0xc5, 0xcf, 0xf0, 0xaa,
-	0x01, 0x2f, 0x48, 0x9c, 0x3f, 0x29, 0x7b, 0xb7, 0x5c, 0xef, 0x25, 0xde, 0x34, 0x23, 0x81, 0x7a,
-	0x4c, 0x3a, 0x9b, 0xe4, 0xa7, 0x44, 0x73, 0xbf, 0xf7, 0x39, 0x43, 0xa4, 0x39, 0xa0, 0x1b, 0xf7,
-	0x4f, 0x5f, 0x14, 0x49, 0x32, 0x0e, 0x66, 0xd0, 0x29, 0xb5, 0x80, 0xe0, 0xba, 0x3b, 0x88, 0x2b,
-	0x14, 0xa4, 0x26, 0x00, 0x2f, 0x50, 0x20, 0x4e, 0xfa, 0xc2, 0x44, 0x72, 0x72, 0x6c, 0x2a, 0x77,
-	0x85, 0x20, 0xe0, 0x1d, 0x95, 0x6a, 0x66, 0xe7, 0xb8, 0xca, 0x5b, 0xc9, 0xc3, 0xf3, 0x39, 0xef,
-	0xd7, 0xd5, 0x45, 0xb6, 0x3e, 0x19, 0xea, 0x7c, 0x56, 0x20, 0x1b, 0x95, 0x86, 0x2e, 0xc7, 0x51,
+    0x01, 0x17, 0xd4, 0x0a, 0x9c, 0x80, 0xd4, 0xa9, 0x8b, 0x14, 0x31, 0x8e, 0x14, 0x4d, 0x24, 0x28,
+    0xda, 0x19, 0xc0, 0xd8, 0x31, 0x20, 0xd1, 0xd5, 0xaa, 0xe2, 0x6a, 0xee, 0x4e, 0xa1, 0x5a, 0xc5,
+    0xf7, 0x50, 0x1b, 0x32, 0x7f, 0xe9, 0x92, 0x09, 0x78, 0xae, 0x2b, 0x7c, 0x79, 0x0e, 0x10, 0xf9,
+    0x4d, 0x37, 0x8a, 0x40, 0x34, 0xf2, 0x1e, 0x5f, 0xba, 0xfd, 0xd6, 0x4a, 0xe7, 0xa4, 0x08, 0x3d,
+    0xe8, 0x99, 0x8f, 0xa3, 0x02, 0x84, 0xe1, 0x1c, 0xe5, 0x27, 0x1e, 0x7b, 0xb6, 0x8c, 0xd5, 0x1b,
+    0x52, 0x0b, 0xcd, 0x89, 0xb5, 0x27, 0x49, 0xe3, 0xff, 0x17, 0x90, 0x39, 0x99, 0x32, 0x01, 0x4b,
+    0xe4, 0x9b, 0x03, 0xd1, 0x5e, 0x47, 0x86, 0xdc, 0x34, 0x12, 0xc0, 0x95, 0xa4, 0xa8, 0x1a, 0x9a,
+    0xf6, 0xd9, 0xc1, 0x1e, 0x6e, 0x31, 0x0e, 0x94, 0xe5, 0x25, 0xf6, 0xf3, 0x34, 0xdf, 0x3c, 0xc8,
+    0x0a, 0xc5, 0x8c, 0x00, 0x5c, 0x59, 0x55, 0x06, 0xd1, 0x39, 0x84, 0x35, 0x96, 0x40, 0xe8, 0xb2,
+    0xf7, 0x13, 0x83, 0x37, 0xe1, 0xe2, 0x79, 0x41, 0x90, 0x2a, 0xc3, 0x71, 0xc5, 0xcf, 0xf0, 0xaa,
+    0x01, 0x2f, 0x48, 0x9c, 0x3f, 0x29, 0x7b, 0xb7, 0x5c, 0xef, 0x25, 0xde, 0x34, 0x23, 0x81, 0x7a,
+    0x4c, 0x3a, 0x9b, 0xe4, 0xa7, 0x44, 0x73, 0xbf, 0xf7, 0x39, 0x43, 0xa4, 0x39, 0xa0, 0x1b, 0xf7,
+    0x4f, 0x5f, 0x14, 0x49, 0x32, 0x0e, 0x66, 0xd0, 0x29, 0xb5, 0x80, 0xe0, 0xba, 0x3b, 0x88, 0x2b,
+    0x14, 0xa4, 0x26, 0x00, 0x2f, 0x50, 0x20, 0x4e, 0xfa, 0xc2, 0x44, 0x72, 0x72, 0x6c, 0x2a, 0x77,
+    0x85, 0x20, 0xe0, 0x1d, 0x95, 0x6a, 0x66, 0xe7, 0xb8, 0xca, 0x5b, 0xc9, 0xc3, 0xf3, 0x39, 0xef,
+    0xd7, 0xd5, 0x45, 0xb6, 0x3e, 0x19, 0xea, 0x7c, 0x56, 0x20, 0x1b, 0x95, 0x86, 0x2e, 0xc7, 0x51,
 };
 
 static unsigned char pk_P[] = {
-	0xf5, 0x93, 0x0f, 0x76, 0x00, 0xab, 0x37, 0x01, 0xb9, 0x52, 0xb6, 0x82, 0xf9, 0xf5, 0xae, 0x29,
-	0x8f, 0xd5, 0x08, 0xbc, 0xf7, 0x9f, 0x84, 0xb6, 0x4c, 0x94, 0xb5, 0xfc, 0xfe, 0xe1, 0xcd, 0x6a,
-	0xf4, 0x9c, 0xa7, 0x33, 0xdb, 0xd8, 0xc8, 0xc1, 0xc0, 0x8d, 0x65, 0xed, 0x29, 0x99, 0x6c, 0x5c,
-	0xbe, 0x08, 0xac, 0x04, 0xe4, 0x3a, 0x18, 0xe2, 0x0f, 0x70, 0x26, 0x70, 0x9b, 0x71, 0xfc, 0x9f,
-	0x22, 0xea, 0x90, 0x3b, 0xc2, 0xa5, 0x16, 0x7a, 0xcd, 0x04, 0x3e, 0xa6, 0x37, 0x49, 0xa7, 0xee,
-	0xaa, 0xe4, 0x9d, 0xaa, 0x9b, 0xb0, 0xe2, 0x6a, 0x9d, 0x1e, 0xcd, 0x83, 0x4e, 0xd8, 0x59, 0x6d,
-	0x03, 0xd5, 0x4c, 0x5e, 0xc5, 0x22, 0x10, 0xb7, 0xcc, 0x0c, 0x90, 0x76, 0x05, 0x21, 0xe7, 0x77,
-	0x5c, 0x88, 0x5f, 0xd0, 0x5f, 0x9e, 0x2e, 0x49, 0x56, 0xf4, 0x2b, 0xa9, 0x99, 0x57, 0x74, 0x19,
+    0xf5, 0x93, 0x0f, 0x76, 0x00, 0xab, 0x37, 0x01, 0xb9, 0x52, 0xb6, 0x82, 0xf9, 0xf5, 0xae, 0x29,
+    0x8f, 0xd5, 0x08, 0xbc, 0xf7, 0x9f, 0x84, 0xb6, 0x4c, 0x94, 0xb5, 0xfc, 0xfe, 0xe1, 0xcd, 0x6a,
+    0xf4, 0x9c, 0xa7, 0x33, 0xdb, 0xd8, 0xc8, 0xc1, 0xc0, 0x8d, 0x65, 0xed, 0x29, 0x99, 0x6c, 0x5c,
+    0xbe, 0x08, 0xac, 0x04, 0xe4, 0x3a, 0x18, 0xe2, 0x0f, 0x70, 0x26, 0x70, 0x9b, 0x71, 0xfc, 0x9f,
+    0x22, 0xea, 0x90, 0x3b, 0xc2, 0xa5, 0x16, 0x7a, 0xcd, 0x04, 0x3e, 0xa6, 0x37, 0x49, 0xa7, 0xee,
+    0xaa, 0xe4, 0x9d, 0xaa, 0x9b, 0xb0, 0xe2, 0x6a, 0x9d, 0x1e, 0xcd, 0x83, 0x4e, 0xd8, 0x59, 0x6d,
+    0x03, 0xd5, 0x4c, 0x5e, 0xc5, 0x22, 0x10, 0xb7, 0xcc, 0x0c, 0x90, 0x76, 0x05, 0x21, 0xe7, 0x77,
+    0x5c, 0x88, 0x5f, 0xd0, 0x5f, 0x9e, 0x2e, 0x49, 0x56, 0xf4, 0x2b, 0xa9, 0x99, 0x57, 0x74, 0x19,
 };
 
 static unsigned char pk_Q[] = {
-	0xe4, 0x5f, 0xd2, 0x28, 0xbd, 0xf3, 0xdd, 0x70, 0x3d, 0xfd, 0x01, 0x23, 0xae, 0x93, 0x6a, 0x91,
-	0xca, 0x68, 0xb1, 0xdb, 0x81, 0xab, 0x1e, 0x63, 0x76, 0x9b, 0x6d, 0xaa, 0x41, 0x87, 0x5a, 0x79,
-	0xe7, 0xce, 0xd6, 0x84, 0x32, 0x53, 0xf5, 0xfc, 0xb7, 0x41, 0x7c, 0xcb, 0x88, 0x09, 0xcb, 0xe9,
-	0x07, 0x16, 0x28, 0x55, 0x23, 0xe5, 0xf2, 0xf5, 0x23, 0xf5, 0xee, 0x2b, 0x9d, 0x91, 0x56, 0xc6,
-	0x30, 0x91, 0x4d, 0x16, 0x11, 0x6c, 0x48, 0x45, 0xe8, 0x5d, 0x0e, 0x9e, 0x04, 0xc8, 0xb6, 0xdd,
-	0xba, 0x0d, 0xdf, 0x53, 0x56, 0xfa, 0x0b, 0x0b, 0x99, 0x8d, 0xea, 0x5c, 0x45, 0x7d, 0xed, 0xad,
-	0x1f, 0xc5, 0xc1, 0x7d, 0x63, 0x31, 0xf8, 0x32, 0xb5, 0x33, 0xb0, 0xef, 0xce, 0x2e, 0x74, 0x1e,
-	0x77, 0x2a, 0x18, 0x35, 0x3d, 0x6e, 0x01, 0xba, 0xde, 0x21, 0x8e, 0x14, 0x12, 0xc3, 0x0d, 0x43,
+    0xe4, 0x5f, 0xd2, 0x28, 0xbd, 0xf3, 0xdd, 0x70, 0x3d, 0xfd, 0x01, 0x23, 0xae, 0x93, 0x6a, 0x91,
+    0xca, 0x68, 0xb1, 0xdb, 0x81, 0xab, 0x1e, 0x63, 0x76, 0x9b, 0x6d, 0xaa, 0x41, 0x87, 0x5a, 0x79,
+    0xe7, 0xce, 0xd6, 0x84, 0x32, 0x53, 0xf5, 0xfc, 0xb7, 0x41, 0x7c, 0xcb, 0x88, 0x09, 0xcb, 0xe9,
+    0x07, 0x16, 0x28, 0x55, 0x23, 0xe5, 0xf2, 0xf5, 0x23, 0xf5, 0xee, 0x2b, 0x9d, 0x91, 0x56, 0xc6,
+    0x30, 0x91, 0x4d, 0x16, 0x11, 0x6c, 0x48, 0x45, 0xe8, 0x5d, 0x0e, 0x9e, 0x04, 0xc8, 0xb6, 0xdd,
+    0xba, 0x0d, 0xdf, 0x53, 0x56, 0xfa, 0x0b, 0x0b, 0x99, 0x8d, 0xea, 0x5c, 0x45, 0x7d, 0xed, 0xad,
+    0x1f, 0xc5, 0xc1, 0x7d, 0x63, 0x31, 0xf8, 0x32, 0xb5, 0x33, 0xb0, 0xef, 0xce, 0x2e, 0x74, 0x1e,
+    0x77, 0x2a, 0x18, 0x35, 0x3d, 0x6e, 0x01, 0xba, 0xde, 0x21, 0x8e, 0x14, 0x12, 0xc3, 0x0d, 0x43,
 };
 
 static unsigned char pk_dP[] = {
-	0x5a, 0xc8, 0xf7, 0x1a, 0x44, 0xbd, 0x07, 0x24, 0xd8, 0x02, 0x3f, 0xfe, 0xc3, 0xb1, 0x93, 0xa5,
-	0x41, 0xcb, 0x1b, 0xe3, 0xe0, 0x17, 0x54, 0xd4, 0xa0, 0x13, 0x0a, 0x04, 0x71, 0xa5, 0xc0, 0x6f,
-	0x1d, 0xe7, 0x1b, 0xd9, 0x0c, 0x19, 0x64, 0x7e, 0x5c, 0x54, 0xe9, 0xad, 0x77, 0x87, 0x84, 0x8b,
-	0xf4, 0xa4, 0xf8, 0x13, 0x06, 0xdc, 0x83, 0x7e, 0x6e, 0xfe, 0xa2, 0xf7, 0x56, 0x40, 0x19, 0x88,
-	0x2b, 0x3c, 0x53, 0xfe, 0x03, 0xc3, 0x4c, 0x40, 0x31, 0xb2, 0xb4, 0x06, 0x76, 0xc2, 0x00, 0x17,
-	0x37, 0x8e, 0x34, 0xcb, 0x71, 0xab, 0x3e, 0xc8, 0xf3, 0x35, 0x03, 0xfc, 0xdb, 0x15, 0x18, 0x5a,
-	0x38, 0xe4, 0x8d, 0xcb, 0x2b, 0x4d, 0xa0, 0xa8, 0x92, 0x02, 0xc3, 0x15, 0x1e, 0x68, 0x9e, 0x4d,
-	0x7e, 0x23, 0xdc, 0x68, 0x08, 0x31, 0x4e, 0x23, 0x46, 0xc6, 0x15, 0xae, 0x29, 0x46, 0x2f, 0x61,
+    0x5a, 0xc8, 0xf7, 0x1a, 0x44, 0xbd, 0x07, 0x24, 0xd8, 0x02, 0x3f, 0xfe, 0xc3, 0xb1, 0x93, 0xa5,
+    0x41, 0xcb, 0x1b, 0xe3, 0xe0, 0x17, 0x54, 0xd4, 0xa0, 0x13, 0x0a, 0x04, 0x71, 0xa5, 0xc0, 0x6f,
+    0x1d, 0xe7, 0x1b, 0xd9, 0x0c, 0x19, 0x64, 0x7e, 0x5c, 0x54, 0xe9, 0xad, 0x77, 0x87, 0x84, 0x8b,
+    0xf4, 0xa4, 0xf8, 0x13, 0x06, 0xdc, 0x83, 0x7e, 0x6e, 0xfe, 0xa2, 0xf7, 0x56, 0x40, 0x19, 0x88,
+    0x2b, 0x3c, 0x53, 0xfe, 0x03, 0xc3, 0x4c, 0x40, 0x31, 0xb2, 0xb4, 0x06, 0x76, 0xc2, 0x00, 0x17,
+    0x37, 0x8e, 0x34, 0xcb, 0x71, 0xab, 0x3e, 0xc8, 0xf3, 0x35, 0x03, 0xfc, 0xdb, 0x15, 0x18, 0x5a,
+    0x38, 0xe4, 0x8d, 0xcb, 0x2b, 0x4d, 0xa0, 0xa8, 0x92, 0x02, 0xc3, 0x15, 0x1e, 0x68, 0x9e, 0x4d,
+    0x7e, 0x23, 0xdc, 0x68, 0x08, 0x31, 0x4e, 0x23, 0x46, 0xc6, 0x15, 0xae, 0x29, 0x46, 0x2f, 0x61,
 };
 
 static unsigned char pk_dQ[] = {
-	0x33, 0x61, 0x9f, 0xae, 0x0c, 0xf6, 0xc6, 0x16, 0x8f, 0xcb, 0xd1, 0xaa, 0xce, 0x87, 0x5a, 0x4d,
-	0xcc, 0xe5, 0x7b, 0x46, 0xb0, 0xc8, 0xe8, 0x40, 0x66, 0x9a, 0x17, 0xb5, 0x5b, 0xa2, 0xf1, 0x67,
-	0x46, 0x11, 0x52, 0x50, 0x51, 0xe6, 0x74, 0x0c, 0xd4, 0xca, 0x46, 0x22, 0xa0, 0xcb, 0xdb, 0x75,
-	0xe5, 0x63, 0x45, 0xd5, 0xca, 0x0a, 0xdd, 0x7b, 0xec, 0x08, 0x53, 0xfa, 0xba, 0x2b, 0xce, 0x03,
-	0x2f, 0x40, 0x31, 0xc0, 0xca, 0x50, 0xbb, 0x7e, 0x07, 0x06, 0x90, 0xd8, 0x5a, 0xa9, 0x32, 0x03,
-	0x76, 0xed, 0xd2, 0x16, 0x35, 0x16, 0x72, 0xcf, 0xbc, 0x4f, 0xa2, 0xaf, 0xf9, 0xee, 0x98, 0x40,
-	0x00, 0x4b, 0x04, 0xfa, 0x8a, 0x0b, 0xdf, 0x14, 0xc1, 0x92, 0x0c, 0xb8, 0x17, 0x82, 0x7a, 0x1b,
-	0xb4, 0xa1, 0xe2, 0xea, 0x6f, 0x94, 0xc5, 0x8c, 0xde, 0x97, 0x5c, 0x19, 0x06, 0x13, 0x9e, 0x73,
+    0x33, 0x61, 0x9f, 0xae, 0x0c, 0xf6, 0xc6, 0x16, 0x8f, 0xcb, 0xd1, 0xaa, 0xce, 0x87, 0x5a, 0x4d,
+    0xcc, 0xe5, 0x7b, 0x46, 0xb0, 0xc8, 0xe8, 0x40, 0x66, 0x9a, 0x17, 0xb5, 0x5b, 0xa2, 0xf1, 0x67,
+    0x46, 0x11, 0x52, 0x50, 0x51, 0xe6, 0x74, 0x0c, 0xd4, 0xca, 0x46, 0x22, 0xa0, 0xcb, 0xdb, 0x75,
+    0xe5, 0x63, 0x45, 0xd5, 0xca, 0x0a, 0xdd, 0x7b, 0xec, 0x08, 0x53, 0xfa, 0xba, 0x2b, 0xce, 0x03,
+    0x2f, 0x40, 0x31, 0xc0, 0xca, 0x50, 0xbb, 0x7e, 0x07, 0x06, 0x90, 0xd8, 0x5a, 0xa9, 0x32, 0x03,
+    0x76, 0xed, 0xd2, 0x16, 0x35, 0x16, 0x72, 0xcf, 0xbc, 0x4f, 0xa2, 0xaf, 0xf9, 0xee, 0x98, 0x40,
+    0x00, 0x4b, 0x04, 0xfa, 0x8a, 0x0b, 0xdf, 0x14, 0xc1, 0x92, 0x0c, 0xb8, 0x17, 0x82, 0x7a, 0x1b,
+    0xb4, 0xa1, 0xe2, 0xea, 0x6f, 0x94, 0xc5, 0x8c, 0xde, 0x97, 0x5c, 0x19, 0x06, 0x13, 0x9e, 0x73,
 };
 
 static unsigned char pk_I[] = {
-	0x75, 0x40, 0xc6, 0x02, 0x7e, 0x4f, 0xad, 0xdb, 0x95, 0xac, 0x07, 0x8d, 0x80, 0xb6, 0x80, 0x02,
-	0x06, 0xdd, 0xb8, 0x5d, 0x92, 0x65, 0x69, 0x26, 0x86, 0x61, 0x6c, 0x87, 0x4e, 0xe5, 0x03, 0x68,
-	0xc6, 0x10, 0x15, 0x8c, 0x43, 0x3a, 0x45, 0x63, 0x48, 0xb7, 0x8a, 0x8c, 0xa2, 0x2b, 0x34, 0xb6,
-	0x83, 0xfe, 0xa8, 0x10, 0xa5, 0x74, 0xa5, 0xa9, 0x52, 0x42, 0x1f, 0xa0, 0x80, 0x6a, 0xc5, 0x35,
-	0xe8, 0xb8, 0xc2, 0xa0, 0x3f, 0x49, 0x18, 0xcf, 0x0e, 0x54, 0x3c, 0x70, 0x11, 0x11, 0xd3, 0x85,
-	0x8c, 0xb2, 0xe5, 0x74, 0xdf, 0x98, 0xea, 0x6c, 0xc0, 0x5f, 0x7f, 0xff, 0x69, 0xbf, 0x08, 0x8d,
-	0x1b, 0xc4, 0x90, 0xcc, 0xa4, 0xcd, 0xcc, 0x34, 0x58, 0xe5, 0x91, 0x53, 0x3a, 0xd5, 0x39, 0xf4,
-	0xd4, 0x42, 0xc9, 0x17, 0xb2, 0x2c, 0x92, 0x12, 0x37, 0x1b, 0xd3, 0xc5, 0x79, 0xd2, 0x65, 0x61,
+    0x75, 0x40, 0xc6, 0x02, 0x7e, 0x4f, 0xad, 0xdb, 0x95, 0xac, 0x07, 0x8d, 0x80, 0xb6, 0x80, 0x02,
+    0x06, 0xdd, 0xb8, 0x5d, 0x92, 0x65, 0x69, 0x26, 0x86, 0x61, 0x6c, 0x87, 0x4e, 0xe5, 0x03, 0x68,
+    0xc6, 0x10, 0x15, 0x8c, 0x43, 0x3a, 0x45, 0x63, 0x48, 0xb7, 0x8a, 0x8c, 0xa2, 0x2b, 0x34, 0xb6,
+    0x83, 0xfe, 0xa8, 0x10, 0xa5, 0x74, 0xa5, 0xa9, 0x52, 0x42, 0x1f, 0xa0, 0x80, 0x6a, 0xc5, 0x35,
+    0xe8, 0xb8, 0xc2, 0xa0, 0x3f, 0x49, 0x18, 0xcf, 0x0e, 0x54, 0x3c, 0x70, 0x11, 0x11, 0xd3, 0x85,
+    0x8c, 0xb2, 0xe5, 0x74, 0xdf, 0x98, 0xea, 0x6c, 0xc0, 0x5f, 0x7f, 0xff, 0x69, 0xbf, 0x08, 0x8d,
+    0x1b, 0xc4, 0x90, 0xcc, 0xa4, 0xcd, 0xcc, 0x34, 0x58, 0xe5, 0x91, 0x53, 0x3a, 0xd5, 0x39, 0xf4,
+    0xd4, 0x42, 0xc9, 0x17, 0xb2, 0x2c, 0x92, 0x12, 0x37, 0x1b, 0xd3, 0xc5, 0x79, 0xd2, 0x65, 0x61,
 };
 
 static int test_pk(bool verbose)
 {
-	int ret = 1;
-	size_t tmp_len, tmp2_len;
-	unsigned char *tmp, *tmp2;
-	struct crypto_pk *pubk, *privk;
-	unsigned char *msg = message;
-	size_t msg_len = sizeof(pk_N);
+    int ret = 1;
+    size_t tmp_len, tmp2_len;
+    unsigned char *tmp, *tmp2;
+    struct crypto_pk *pubk, *privk;
+    unsigned char *msg = message;
+    size_t msg_len = sizeof(pk_N);
 
-	printf("Testing public keys interfaces\n");
+    printf("Testing public keys interfaces\n");
 
-	pubk = crypto_pk_open(PK_RSA,
-			pk_N, sizeof(pk_N),
-			pk_E, sizeof(pk_E));
-	if (!pubk) {
-		fprintf(stderr, "ERROR: open public key.\n");
-		return 1;
-	}
+    pubk = crypto_pk_open(PK_RSA,
+            pk_N, sizeof(pk_N),
+            pk_E, sizeof(pk_E));
+    if (!pubk) {
+        fprintf(stderr, "ERROR: open public key.\n");
+        return 1;
+    }
 
-	tmp_len = crypto_pk_get_nbits(pubk);
-	if (tmp_len != sizeof(pk_N) * 8) {
-		fprintf(stderr, "ERROR: crypto_pk_get_nbits mismatch.\n");
-		goto close_pub;
-	}
+    tmp_len = crypto_pk_get_nbits(pubk);
+    if (tmp_len != sizeof(pk_N) * 8) {
+        fprintf(stderr, "ERROR: crypto_pk_get_nbits mismatch.\n");
+        goto close_pub;
+    }
 
-	tmp = crypto_pk_get_parameter(pubk, 0, &tmp_len);
-	if (tmp_len != sizeof(pk_N) || memcmp(tmp, pk_N, tmp_len)) {
-		fprintf(stderr, "ERROR: crypto_pk_get_parameter(0) Modulus. param len %zu len %zu\n", tmp_len, sizeof(pk_N));
-		free(tmp);
-		goto close_pub;
-	}
-	free(tmp);
+    tmp = crypto_pk_get_parameter(pubk, 0, &tmp_len);
+    if (tmp_len != sizeof(pk_N) || memcmp(tmp, pk_N, tmp_len)) {
+        fprintf(stderr, "ERROR: crypto_pk_get_parameter(0) Modulus. param len %zu len %zu\n", tmp_len, sizeof(pk_N));
+        free(tmp);
+        goto close_pub;
+    }
+    free(tmp);
 
-	tmp = crypto_pk_get_parameter(pubk, 1, &tmp_len);
-	if (tmp_len != sizeof(pk_E) || memcmp(tmp, pk_E, tmp_len)) {
-		fprintf(stderr, "ERROR: crypto_pk_get_parameter(1) Exponent.\n");
-		free(tmp);
-		goto close_pub;
-	}
-	free(tmp);
+    tmp = crypto_pk_get_parameter(pubk, 1, &tmp_len);
+    if (tmp_len != sizeof(pk_E) || memcmp(tmp, pk_E, tmp_len)) {
+        fprintf(stderr, "ERROR: crypto_pk_get_parameter(1) Exponent.\n");
+        free(tmp);
+        goto close_pub;
+    }
+    free(tmp);
 
-	privk = crypto_pk_open_priv(PK_RSA,
-			pk_N, sizeof(pk_N),
-			pk_E, sizeof(pk_E),
-			pk_D, sizeof(pk_D),
-			pk_P, sizeof(pk_P),
-			pk_Q, sizeof(pk_Q),
-			pk_dP, sizeof(pk_dP),
-			pk_dQ, sizeof(pk_dQ),
-			pk_I, sizeof(pk_I));
-	if (!privk) {
-		fprintf(stderr, "ERROR: open private key.\n");
-		goto close_pub;
-	}
+    privk = crypto_pk_open_priv(PK_RSA,
+            pk_N, sizeof(pk_N),
+            pk_E, sizeof(pk_E),
+            pk_D, sizeof(pk_D),
+            pk_P, sizeof(pk_P),
+            pk_Q, sizeof(pk_Q),
+            pk_dP, sizeof(pk_dP),
+            pk_dQ, sizeof(pk_dQ),
+            pk_I, sizeof(pk_I));
+    if (!privk) {
+        fprintf(stderr, "ERROR: open private key.\n");
+        goto close_pub;
+    }
 
 
-	tmp_len = crypto_pk_get_nbits(privk);
-	if (tmp_len != sizeof(pk_N) * 8) {
-		fprintf(stderr, "ERROR: crypto_pk_get_nbits mismatch.\n");
-		goto close_pub;
-	}
+    tmp_len = crypto_pk_get_nbits(privk);
+    if (tmp_len != sizeof(pk_N) * 8) {
+        fprintf(stderr, "ERROR: crypto_pk_get_nbits mismatch.\n");
+        goto close_pub;
+    }
 
-	tmp = crypto_pk_get_parameter(privk, 0, &tmp_len);
-	if (tmp_len != sizeof(pk_N) || memcmp(tmp, pk_N, tmp_len)) {
-		fprintf(stderr, "ERROR: crypto_pk_get_parameter(0) Modulus. param len %zu len %zu\n", tmp_len, sizeof(pk_N));
-		free(tmp);
-		goto close;
-	}
-	free(tmp);
+    tmp = crypto_pk_get_parameter(privk, 0, &tmp_len);
+    if (tmp_len != sizeof(pk_N) || memcmp(tmp, pk_N, tmp_len)) {
+        fprintf(stderr, "ERROR: crypto_pk_get_parameter(0) Modulus. param len %zu len %zu\n", tmp_len, sizeof(pk_N));
+        free(tmp);
+        goto close;
+    }
+    free(tmp);
 
-	tmp = crypto_pk_get_parameter(privk, 1, &tmp_len);
-	if (tmp_len != sizeof(pk_E) || memcmp(tmp, pk_E, tmp_len)) {
-		fprintf(stderr, "ERROR: crypto_pk_get_parameter(1) Exponent.\n");
-		free(tmp);
-		goto close;
-	}
-	free(tmp);
+    tmp = crypto_pk_get_parameter(privk, 1, &tmp_len);
+    if (tmp_len != sizeof(pk_E) || memcmp(tmp, pk_E, tmp_len)) {
+        fprintf(stderr, "ERROR: crypto_pk_get_parameter(1) Exponent.\n");
+        free(tmp);
+        goto close;
+    }
+    free(tmp);
 
-	tmp = crypto_pk_decrypt(privk, msg, msg_len, &tmp_len);
-	if (!tmp) {
-		fprintf(stderr, "ERROR: crypto_pk_decrypt.\n");
-		goto close;
-	}
+    tmp = crypto_pk_decrypt(privk, msg, msg_len, &tmp_len);
+    if (!tmp) {
+        fprintf(stderr, "ERROR: crypto_pk_decrypt.\n");
+        goto close;
+    }
 
-	tmp2 = crypto_pk_encrypt(pubk, tmp, tmp_len, &tmp2_len);
-	if (!tmp2) {
-		fprintf(stderr, "ERROR: crypto_pk_encrypt.\n");
-		goto free_tmp;
-	}
+    tmp2 = crypto_pk_encrypt(pubk, tmp, tmp_len, &tmp2_len);
+    if (!tmp2) {
+        fprintf(stderr, "ERROR: crypto_pk_encrypt.\n");
+        goto free_tmp;
+    }
 
-	if (tmp2_len == msg_len && !memcmp(tmp2, msg, tmp2_len)) {
-		ret = 0;
-	} else {
-		fprintf(stderr, "ERROR: encrypt-decrypt sequence length or data error.\n");
-	}
+    if (tmp2_len == msg_len && !memcmp(tmp2, msg, tmp2_len)) {
+        ret = 0;
+    } else {
+        fprintf(stderr, "ERROR: encrypt-decrypt sequence length or data error.\n");
+    }
 
-	free(tmp2);
+    free(tmp2);
 free_tmp:
-	free(tmp);
+    free(tmp);
 
 close:
-	crypto_pk_close(privk);
+    crypto_pk_close(privk);
 close_pub:
-	crypto_pk_close(pubk);
+    crypto_pk_close(pubk);
 
-	return ret;
+    return ret;
 }
 
 int exec_crypto_test(bool verbose)
 {
-	unsigned int keylengths[] = {1024, 1152, 1408, 1984, 2048, 3072, 4096};
-	int i;
-	int ret;
-	fprintf(stdout, "\n");
+    unsigned int keylengths[] = {1024, 1152, 1408, 1984, 2048, 3072, 4096};
+    int i;
+    int ret;
+    fprintf(stdout, "\n");
 
-	ret = test_pk(verbose);
-	if (ret) {
-		fprintf(stderr, "Crypto raw test: failed\n");
-		return ret;
-	}
-	fprintf(stdout, "Crypto raw test: passed\n\n");
+    ret = test_pk(verbose);
+    if (ret) {
+        fprintf(stderr, "Crypto raw test: failed\n");
+        return ret;
+    }
+    fprintf(stdout, "Crypto raw test: passed\n\n");
 
-	for (i = 0; i < sizeof(keylengths) / sizeof(keylengths[0]); i++) {
-		unsigned int kl = keylengths[i];
-		ret = test_genkey(kl, message, kl / 8, verbose);
-		if (ret) {
-			fprintf(stderr, "Crypto generate key[%d] test: failed\n", kl);
-			return ret;
-		}
-	}
+    for (i = 0; i < sizeof(keylengths) / sizeof(keylengths[0]); i++) {
+        unsigned int kl = keylengths[i];
+        ret = test_genkey(kl, message, kl / 8, verbose);
+        if (ret) {
+            fprintf(stderr, "Crypto generate key[%d] test: failed\n", kl);
+            return ret;
+        }
+    }
 
-	return 0;
+    return 0;
 }
diff --git a/client/emv/test/cryptotest.c b/client/emv/test/cryptotest.c
index 5d7017f9c..d442da1c1 100644
--- a/client/emv/test/cryptotest.c
+++ b/client/emv/test/cryptotest.c
@@ -34,73 +34,73 @@
 #include "emv/emv_roca.h"
 
 int ExecuteCryptoTests(bool verbose) {
-	int res;
-	bool TestFail = false;
+    int res;
+    bool TestFail = false;
 
-	res = mbedtls_mpi_self_test(verbose);
-	if (res) TestFail = true;
+    res = mbedtls_mpi_self_test(verbose);
+    if (res) TestFail = true;
 
-	res = mbedtls_aes_self_test(verbose);
-	if (res) TestFail = true;
+    res = mbedtls_aes_self_test(verbose);
+    if (res) TestFail = true;
 
-	res = mbedtls_des_self_test(verbose);
-	if (res) TestFail = true;
+    res = mbedtls_des_self_test(verbose);
+    if (res) TestFail = true;
 
-	res = mbedtls_sha1_self_test(verbose);
-	if (res) TestFail = true;
+    res = mbedtls_sha1_self_test(verbose);
+    if (res) TestFail = true;
 
-	res = mbedtls_md5_self_test(verbose);
-	if (res) TestFail = true;
+    res = mbedtls_md5_self_test(verbose);
+    if (res) TestFail = true;
 
-	res = mbedtls_rsa_self_test(verbose);
-	if (res) TestFail = true;
+    res = mbedtls_rsa_self_test(verbose);
+    if (res) TestFail = true;
 
-	res = mbedtls_entropy_self_test(verbose);
-	if (res) TestFail = true;
+    res = mbedtls_entropy_self_test(verbose);
+    if (res) TestFail = true;
 
-	res = mbedtls_timing_self_test(verbose);
-	if (res) TestFail = true;
+    res = mbedtls_timing_self_test(verbose);
+    if (res) TestFail = true;
 
-	res = mbedtls_ctr_drbg_self_test(verbose);
-	if (res) TestFail = true;
+    res = mbedtls_ctr_drbg_self_test(verbose);
+    if (res) TestFail = true;
 
-	res = mbedtls_base64_self_test(verbose);
-	if (res) TestFail = true;
+    res = mbedtls_base64_self_test(verbose);
+    if (res) TestFail = true;
 
-	res = mbedtls_cmac_self_test(verbose);
-	if (res) TestFail = true;
+    res = mbedtls_cmac_self_test(verbose);
+    if (res) TestFail = true;
 
-	res = ecdsa_nist_test(verbose);
-	if (res) TestFail = true;
+    res = ecdsa_nist_test(verbose);
+    if (res) TestFail = true;
 
-	res = mbedtls_ecp_self_test(verbose);
-	if (res) TestFail = true;
+    res = mbedtls_ecp_self_test(verbose);
+    if (res) TestFail = true;
 
-	res = mbedtls_x509_self_test(verbose);
-	if (res) TestFail = true;
+    res = mbedtls_x509_self_test(verbose);
+    if (res) TestFail = true;
 
-	res = exec_sda_test(verbose);
-	if (res) TestFail = true;
+    res = exec_sda_test(verbose);
+    if (res) TestFail = true;
 
-	res = exec_dda_test(verbose);
-	if (res) TestFail = true;
+    res = exec_dda_test(verbose);
+    if (res) TestFail = true;
 
-	res = exec_cda_test(verbose);
-	if (res) TestFail = true;
+    res = exec_cda_test(verbose);
+    if (res) TestFail = true;
 
-	res = exec_crypto_test(verbose);
-	if (res) TestFail = true;
+    res = exec_crypto_test(verbose);
+    if (res) TestFail = true;
 
-	res = roca_self_test();
-	if (res) TestFail = true;
+    res = roca_self_test();
+    if (res) TestFail = true;
 
-	PrintAndLog("\n--------------------------");
+    PrintAndLog("\n--------------------------");
 
-	if (TestFail)
-		PrintAndLogEx(FAILED, "\tTest(s) [ %s ]", _RED_(FAIL) );
-	else
-		PrintAndLogEx(SUCCESS, "\tTest(s) [ %s ]", _GREEN_(OK) );
+    if (TestFail)
+        PrintAndLogEx(FAILED, "\tTest(s) [ %s ]", _RED_(FAIL) );
+    else
+        PrintAndLogEx(SUCCESS, "\tTest(s) [ %s ]", _GREEN_(OK) );
 
-	return TestFail;
+    return TestFail;
 }
 
diff --git a/client/emv/test/dda_test.c b/client/emv/test/dda_test.c
index afdd4e20b..0fc12ee1f 100644
--- a/client/emv/test/dda_test.c
+++ b/client/emv/test/dda_test.c
@@ -30,361 +30,361 @@
 #include <stdlib.h>
 
 struct emv_pk mchip_05 = {
-	.rid = { 0xa0, 0x00, 0x00, 0x00, 0x04, },
-	.index = 5,
-	.hash_algo = HASH_SHA_1,
-	.pk_algo = PK_RSA,
-	.hash = {
-		0xeb, 0xfa, 0x0d, 0x5d,
-		0x06, 0xd8, 0xce, 0x70,
-		0x2d, 0xa3, 0xea, 0xe8,
-		0x90, 0x70, 0x1d, 0x45,
-		0xe2, 0x74, 0xc8, 0x45, },
-	.exp = { 0x03, },
-	.elen = 1,
-	.mlen = 1408 / 8,
-	.modulus = (unsigned char[]){
-		0xb8, 0x04, 0x8a, 0xbc, 0x30, 0xc9, 0x0d, 0x97, 0x63, 0x36, 0x54, 0x3e, 0x3f, 0xd7, 0x09, 0x1c,
-		0x8f, 0xe4, 0x80, 0x0d, 0xf8, 0x20, 0xed, 0x55, 0xe7, 0xe9, 0x48, 0x13, 0xed, 0x00, 0x55, 0x5b,
-		0x57, 0x3f, 0xec, 0xa3, 0xd8, 0x4a, 0xf6, 0x13, 0x1a, 0x65, 0x1d, 0x66, 0xcf, 0xf4, 0x28, 0x4f,
-		0xb1, 0x3b, 0x63, 0x5e, 0xdd, 0x0e, 0xe4, 0x01, 0x76, 0xd8, 0xbf, 0x04, 0xb7, 0xfd, 0x1c, 0x7b,
-		0xac, 0xf9, 0xac, 0x73, 0x27, 0xdf, 0xaa, 0x8a, 0xa7, 0x2d, 0x10, 0xdb, 0x3b, 0x8e, 0x70, 0xb2,
-		0xdd, 0xd8, 0x11, 0xcb, 0x41, 0x96, 0x52, 0x5e, 0xa3, 0x86, 0xac, 0xc3, 0x3c, 0x0d, 0x9d, 0x45,
-		0x75, 0x91, 0x64, 0x69, 0xc4, 0xe4, 0xf5, 0x3e, 0x8e, 0x1c, 0x91, 0x2c, 0xc6, 0x18, 0xcb, 0x22,
-		0xdd, 0xe7, 0xc3, 0x56, 0x8e, 0x90, 0x02, 0x2e, 0x6b, 0xba, 0x77, 0x02, 0x02, 0xe4, 0x52, 0x2a,
-		0x2d, 0xd6, 0x23, 0xd1, 0x80, 0xe2, 0x15, 0xbd, 0x1d, 0x15, 0x07, 0xfe, 0x3d, 0xc9, 0x0c, 0xa3,
-		0x10, 0xd2, 0x7b, 0x3e, 0xfc, 0xcd, 0x8f, 0x83, 0xde, 0x30, 0x52, 0xca, 0xd1, 0xe4, 0x89, 0x38,
-		0xc6, 0x8d, 0x09, 0x5a, 0xac, 0x91, 0xb5, 0xf3, 0x7e, 0x28, 0xbb, 0x49, 0xec, 0x7e, 0xd5, 0x97,
-	},
+    .rid = { 0xa0, 0x00, 0x00, 0x00, 0x04, },
+    .index = 5,
+    .hash_algo = HASH_SHA_1,
+    .pk_algo = PK_RSA,
+    .hash = {
+        0xeb, 0xfa, 0x0d, 0x5d,
+        0x06, 0xd8, 0xce, 0x70,
+        0x2d, 0xa3, 0xea, 0xe8,
+        0x90, 0x70, 0x1d, 0x45,
+        0xe2, 0x74, 0xc8, 0x45, },
+    .exp = { 0x03, },
+    .elen = 1,
+    .mlen = 1408 / 8,
+    .modulus = (unsigned char[]){
+        0xb8, 0x04, 0x8a, 0xbc, 0x30, 0xc9, 0x0d, 0x97, 0x63, 0x36, 0x54, 0x3e, 0x3f, 0xd7, 0x09, 0x1c,
+        0x8f, 0xe4, 0x80, 0x0d, 0xf8, 0x20, 0xed, 0x55, 0xe7, 0xe9, 0x48, 0x13, 0xed, 0x00, 0x55, 0x5b,
+        0x57, 0x3f, 0xec, 0xa3, 0xd8, 0x4a, 0xf6, 0x13, 0x1a, 0x65, 0x1d, 0x66, 0xcf, 0xf4, 0x28, 0x4f,
+        0xb1, 0x3b, 0x63, 0x5e, 0xdd, 0x0e, 0xe4, 0x01, 0x76, 0xd8, 0xbf, 0x04, 0xb7, 0xfd, 0x1c, 0x7b,
+        0xac, 0xf9, 0xac, 0x73, 0x27, 0xdf, 0xaa, 0x8a, 0xa7, 0x2d, 0x10, 0xdb, 0x3b, 0x8e, 0x70, 0xb2,
+        0xdd, 0xd8, 0x11, 0xcb, 0x41, 0x96, 0x52, 0x5e, 0xa3, 0x86, 0xac, 0xc3, 0x3c, 0x0d, 0x9d, 0x45,
+        0x75, 0x91, 0x64, 0x69, 0xc4, 0xe4, 0xf5, 0x3e, 0x8e, 0x1c, 0x91, 0x2c, 0xc6, 0x18, 0xcb, 0x22,
+        0xdd, 0xe7, 0xc3, 0x56, 0x8e, 0x90, 0x02, 0x2e, 0x6b, 0xba, 0x77, 0x02, 0x02, 0xe4, 0x52, 0x2a,
+        0x2d, 0xd6, 0x23, 0xd1, 0x80, 0xe2, 0x15, 0xbd, 0x1d, 0x15, 0x07, 0xfe, 0x3d, 0xc9, 0x0c, 0xa3,
+        0x10, 0xd2, 0x7b, 0x3e, 0xfc, 0xcd, 0x8f, 0x83, 0xde, 0x30, 0x52, 0xca, 0xd1, 0xe4, 0x89, 0x38,
+        0xc6, 0x8d, 0x09, 0x5a, 0xac, 0x91, 0xb5, 0xf3, 0x7e, 0x28, 0xbb, 0x49, 0xec, 0x7e, 0xd5, 0x97,
+    },
 };
 
 const unsigned char d_issuer_cert[] = {
-		0x17, 0x14, 0x28, 0x4f, 0x76, 0x3b, 0x85, 0x86, 0xee, 0x6d, 0x31, 0x99, 0x51, 0xf7, 0xe6, 0x3f,
-		0xa2, 0x50, 0x76, 0xe5, 0x0d, 0xc9, 0xd3, 0x20, 0x0b, 0xa9, 0x98, 0xd3, 0xa0, 0x52, 0xad, 0xba,
-		0x9a, 0xb6, 0x9a, 0xc6, 0xad, 0x6a, 0xdd, 0x3c, 0xe0, 0x9f, 0x02, 0x78, 0xf4, 0x07, 0x4e, 0xc4,
-		0xee, 0x9b, 0x1d, 0x22, 0x68, 0xa3, 0xe9, 0x53, 0x57, 0x5e, 0x45, 0x4e, 0x50, 0xcd, 0x86, 0x0b,
-		0xf4, 0x24, 0xc5, 0x1c, 0x59, 0x77, 0x12, 0xd2, 0xaa, 0x05, 0x70, 0x89, 0xdd, 0x86, 0x73, 0xe5,
-		0x1b, 0x1e, 0x1d, 0x71, 0x88, 0x03, 0x48, 0x92, 0x07, 0x7a, 0xc1, 0x8a, 0x6a, 0xe2, 0x34, 0x88,
-		0xbe, 0xa9, 0xdf, 0x3b, 0x1a, 0x83, 0xf2, 0xc0, 0x80, 0x0c, 0xd7, 0xc5, 0xcd, 0xf2, 0xfd, 0xe0,
-		0x49, 0x6f, 0x7b, 0xc3, 0x9f, 0xb4, 0xbf, 0x36, 0x32, 0x99, 0xbf, 0xa6, 0x37, 0xb2, 0xec, 0x33,
-		0xc5, 0x07, 0xe3, 0x68, 0x21, 0xee, 0xc2, 0x07, 0x5f, 0x0e, 0x42, 0x0d, 0x38, 0xa1, 0xc9, 0xf3,
-		0x12, 0x72, 0x61, 0xba, 0x31, 0x6c, 0x98, 0x76, 0x74, 0xfa, 0xdb, 0x20, 0xea, 0x7f, 0xeb, 0x75,
-		0xee, 0x45, 0x5d, 0x12, 0x14, 0x6e, 0xa6, 0xf0, 0x2e, 0x8b, 0x01, 0xec, 0x2f, 0xa7, 0xa1, 0x15,
+        0x17, 0x14, 0x28, 0x4f, 0x76, 0x3b, 0x85, 0x86, 0xee, 0x6d, 0x31, 0x99, 0x51, 0xf7, 0xe6, 0x3f,
+        0xa2, 0x50, 0x76, 0xe5, 0x0d, 0xc9, 0xd3, 0x20, 0x0b, 0xa9, 0x98, 0xd3, 0xa0, 0x52, 0xad, 0xba,
+        0x9a, 0xb6, 0x9a, 0xc6, 0xad, 0x6a, 0xdd, 0x3c, 0xe0, 0x9f, 0x02, 0x78, 0xf4, 0x07, 0x4e, 0xc4,
+        0xee, 0x9b, 0x1d, 0x22, 0x68, 0xa3, 0xe9, 0x53, 0x57, 0x5e, 0x45, 0x4e, 0x50, 0xcd, 0x86, 0x0b,
+        0xf4, 0x24, 0xc5, 0x1c, 0x59, 0x77, 0x12, 0xd2, 0xaa, 0x05, 0x70, 0x89, 0xdd, 0x86, 0x73, 0xe5,
+        0x1b, 0x1e, 0x1d, 0x71, 0x88, 0x03, 0x48, 0x92, 0x07, 0x7a, 0xc1, 0x8a, 0x6a, 0xe2, 0x34, 0x88,
+        0xbe, 0xa9, 0xdf, 0x3b, 0x1a, 0x83, 0xf2, 0xc0, 0x80, 0x0c, 0xd7, 0xc5, 0xcd, 0xf2, 0xfd, 0xe0,
+        0x49, 0x6f, 0x7b, 0xc3, 0x9f, 0xb4, 0xbf, 0x36, 0x32, 0x99, 0xbf, 0xa6, 0x37, 0xb2, 0xec, 0x33,
+        0xc5, 0x07, 0xe3, 0x68, 0x21, 0xee, 0xc2, 0x07, 0x5f, 0x0e, 0x42, 0x0d, 0x38, 0xa1, 0xc9, 0xf3,
+        0x12, 0x72, 0x61, 0xba, 0x31, 0x6c, 0x98, 0x76, 0x74, 0xfa, 0xdb, 0x20, 0xea, 0x7f, 0xeb, 0x75,
+        0xee, 0x45, 0x5d, 0x12, 0x14, 0x6e, 0xa6, 0xf0, 0x2e, 0x8b, 0x01, 0xec, 0x2f, 0xa7, 0xa1, 0x15,
 };
 
 const unsigned char d_issuer_rem[] = {
-		0x6e, 0x63, 0xb7, 0xbc, 0x70, 0xab, 0xdd, 0x09, 0x34, 0x1b, 0x34, 0xc0, 0x32, 0x86, 0xba, 0x9b,
-		0xd8, 0x3b, 0xa7, 0x93, 0x6c, 0x5b, 0x77, 0x98, 0xfb, 0x22, 0xc5, 0xe5, 0x3f, 0xf2, 0x40, 0xa2,
-		0x6d, 0xbd, 0x64, 0x15,
+        0x6e, 0x63, 0xb7, 0xbc, 0x70, 0xab, 0xdd, 0x09, 0x34, 0x1b, 0x34, 0xc0, 0x32, 0x86, 0xba, 0x9b,
+        0xd8, 0x3b, 0xa7, 0x93, 0x6c, 0x5b, 0x77, 0x98, 0xfb, 0x22, 0xc5, 0xe5, 0x3f, 0xf2, 0x40, 0xa2,
+        0x6d, 0xbd, 0x64, 0x15,
 };
 
 const unsigned char d_issuer_exp[] = {
-		0x03,
+        0x03,
 };
 
 const unsigned char d_icc_cert[] = {
-		0xa4, 0x2f, 0xbe, 0xb1, 0x56, 0xb9, 0x8d, 0xcb, 0x05, 0x54, 0xda, 0x06, 0x2a, 0xdc, 0xa5, 0x30,
-		0x9a, 0x91, 0xf0, 0x4f, 0xa2, 0xc7, 0xbd, 0x71, 0x02, 0xa8, 0xd7, 0x3f, 0x16, 0xa3, 0xcf, 0xad,
-		0xe8, 0xaa, 0xdf, 0x4f, 0x3f, 0xe2, 0xa2, 0x12, 0x5c, 0xcd, 0xd7, 0x7c, 0x6b, 0x9f, 0x78, 0xb5,
-		0xb4, 0x37, 0x1c, 0xe0, 0x80, 0x57, 0x25, 0xb0, 0xf9, 0xc0, 0x27, 0xaf, 0x14, 0x7d, 0x91, 0xe1,
-		0xff, 0xdb, 0x20, 0x1e, 0x9c, 0x17, 0x0c, 0xe7, 0x77, 0x05, 0x3a, 0x17, 0x2a, 0xd5, 0x26, 0xdc,
-		0xaf, 0xd3, 0x38, 0x95, 0xe1, 0xa9, 0x47, 0x30, 0x5c, 0x5b, 0x16, 0x7f, 0x2e, 0x7c, 0x6f, 0x99,
-		0x15, 0x81, 0xa6, 0x52, 0xee, 0x47, 0x31, 0x54, 0x76, 0x0c, 0x2e, 0xd7, 0x74, 0x21, 0x4e, 0x50,
-		0xdf, 0xec, 0xdd, 0x4c, 0xf2, 0x94, 0xc9, 0x74, 0xb8, 0x9e, 0xbc, 0xa2, 0x5b, 0x5a, 0xb3, 0xc0,
-		0xbe, 0xb5, 0x0d, 0xfa, 0xf7, 0x82, 0xaf, 0xde, 0x14, 0x33, 0xd9, 0x0c, 0xa2, 0xa8, 0x9d, 0x65,
-		0x1e, 0x75, 0xd6, 0x7e, 0xbc, 0x7c, 0x3e, 0x36, 0xf5, 0xa1, 0x65, 0xee, 0x61, 0x32, 0x61, 0x29,
-		0x39, 0xc1, 0xec, 0xd3, 0x99, 0xe4, 0x60, 0x74, 0xb9, 0x96, 0xd9, 0x3a, 0x88, 0xe0, 0x1e, 0x0a,
+        0xa4, 0x2f, 0xbe, 0xb1, 0x56, 0xb9, 0x8d, 0xcb, 0x05, 0x54, 0xda, 0x06, 0x2a, 0xdc, 0xa5, 0x30,
+        0x9a, 0x91, 0xf0, 0x4f, 0xa2, 0xc7, 0xbd, 0x71, 0x02, 0xa8, 0xd7, 0x3f, 0x16, 0xa3, 0xcf, 0xad,
+        0xe8, 0xaa, 0xdf, 0x4f, 0x3f, 0xe2, 0xa2, 0x12, 0x5c, 0xcd, 0xd7, 0x7c, 0x6b, 0x9f, 0x78, 0xb5,
+        0xb4, 0x37, 0x1c, 0xe0, 0x80, 0x57, 0x25, 0xb0, 0xf9, 0xc0, 0x27, 0xaf, 0x14, 0x7d, 0x91, 0xe1,
+        0xff, 0xdb, 0x20, 0x1e, 0x9c, 0x17, 0x0c, 0xe7, 0x77, 0x05, 0x3a, 0x17, 0x2a, 0xd5, 0x26, 0xdc,
+        0xaf, 0xd3, 0x38, 0x95, 0xe1, 0xa9, 0x47, 0x30, 0x5c, 0x5b, 0x16, 0x7f, 0x2e, 0x7c, 0x6f, 0x99,
+        0x15, 0x81, 0xa6, 0x52, 0xee, 0x47, 0x31, 0x54, 0x76, 0x0c, 0x2e, 0xd7, 0x74, 0x21, 0x4e, 0x50,
+        0xdf, 0xec, 0xdd, 0x4c, 0xf2, 0x94, 0xc9, 0x74, 0xb8, 0x9e, 0xbc, 0xa2, 0x5b, 0x5a, 0xb3, 0xc0,
+        0xbe, 0xb5, 0x0d, 0xfa, 0xf7, 0x82, 0xaf, 0xde, 0x14, 0x33, 0xd9, 0x0c, 0xa2, 0xa8, 0x9d, 0x65,
+        0x1e, 0x75, 0xd6, 0x7e, 0xbc, 0x7c, 0x3e, 0x36, 0xf5, 0xa1, 0x65, 0xee, 0x61, 0x32, 0x61, 0x29,
+        0x39, 0xc1, 0xec, 0xd3, 0x99, 0xe4, 0x60, 0x74, 0xb9, 0x96, 0xd9, 0x3a, 0x88, 0xe0, 0x1e, 0x0a,
 };
 
 const unsigned char d_icc_exp[] = {
-		0x03,
+        0x03,
 };
 
 const unsigned char d_sdad_cr[] = {
-	0x3d, 0x87, 0xf3, 0x10, 0x56, 0x10, 0x2d, 0x25, 0x12, 0xcf, 0xde, 0x30, 0x90, 0x06, 0x27, 0xc1,
-	0x26, 0x3a, 0x76, 0xd1, 0xda, 0xa8, 0x21, 0xf5, 0x08, 0x31, 0xe6, 0x06, 0xc5, 0x45, 0x44, 0xc2,
-	0x58, 0x13, 0x1e, 0xae, 0xbe, 0x87, 0x4d, 0xcb, 0x1a, 0x28, 0xcf, 0x82, 0xd3, 0xff, 0x91, 0x11,
-	0x82, 0x60, 0xbc, 0x91, 0x11, 0x37, 0x11, 0xd3, 0xb2, 0x89, 0xfa, 0x41, 0xbe, 0x69, 0xc7, 0xa7,
-	0xb5, 0xc7, 0x83, 0xe6, 0xf8, 0xf9, 0x7f, 0xce, 0x13, 0xf0, 0x8b, 0x13, 0xfa, 0x44, 0x18, 0x3e,
-	0x37, 0x18, 0xce, 0xbf, 0x0c, 0x41, 0x47, 0x3d, 0x2b, 0x0f, 0xf4, 0xde, 0x44, 0xb6, 0xa0, 0x2d,
-	0x75, 0xad, 0xb6, 0xd4, 0x96, 0x23, 0x93, 0xff, 0xdf, 0x4e, 0x69, 0x02, 0x6c, 0xdf, 0x38, 0xff,
+    0x3d, 0x87, 0xf3, 0x10, 0x56, 0x10, 0x2d, 0x25, 0x12, 0xcf, 0xde, 0x30, 0x90, 0x06, 0x27, 0xc1,
+    0x26, 0x3a, 0x76, 0xd1, 0xda, 0xa8, 0x21, 0xf5, 0x08, 0x31, 0xe6, 0x06, 0xc5, 0x45, 0x44, 0xc2,
+    0x58, 0x13, 0x1e, 0xae, 0xbe, 0x87, 0x4d, 0xcb, 0x1a, 0x28, 0xcf, 0x82, 0xd3, 0xff, 0x91, 0x11,
+    0x82, 0x60, 0xbc, 0x91, 0x11, 0x37, 0x11, 0xd3, 0xb2, 0x89, 0xfa, 0x41, 0xbe, 0x69, 0xc7, 0xa7,
+    0xb5, 0xc7, 0x83, 0xe6, 0xf8, 0xf9, 0x7f, 0xce, 0x13, 0xf0, 0x8b, 0x13, 0xfa, 0x44, 0x18, 0x3e,
+    0x37, 0x18, 0xce, 0xbf, 0x0c, 0x41, 0x47, 0x3d, 0x2b, 0x0f, 0xf4, 0xde, 0x44, 0xb6, 0xa0, 0x2d,
+    0x75, 0xad, 0xb6, 0xd4, 0x96, 0x23, 0x93, 0xff, 0xdf, 0x4e, 0x69, 0x02, 0x6c, 0xdf, 0x38, 0xff,
 };
 
 const unsigned char d_ssd1[] = {
-	0x5f, 0x25, 0x03, 0x14, 0x05, 0x01, 0x5f, 0x24, 0x03, 0x15, 0x06, 0x30, 0x5a, 0x08, 0x52, 0x85,
-	0x88, 0x12, 0x54, 0x34, 0x56, 0x53, 0x5f, 0x34, 0x01, 0x01, 0x8e, 0x0c, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x1e, 0x03, 0x1f, 0x03, 0x9f, 0x07, 0x02, 0xff, 0x00, 0x9f, 0x0d, 0x05,
-	0xbc, 0x50, 0xbc, 0x00, 0x00, 0x9f, 0x0e, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9f, 0x0f, 0x05,
-	0xbc, 0x70, 0xbc, 0x98, 0x00, 0x9f, 0x4a, 0x01, 0x82, 0x5f, 0x28, 0x02, 0x06, 0x43, 0x8c, 0x21,
-	0x9f, 0x02, 0x06, 0x9f, 0x03, 0x06, 0x9f, 0x1a, 0x02, 0x95, 0x05, 0x5f, 0x2a, 0x02, 0x9a, 0x03,
-	0x9c, 0x01, 0x9f, 0x37, 0x04, 0x9f, 0x35, 0x01, 0x9f, 0x45, 0x02, 0x9f, 0x4c, 0x08, 0x9f, 0x34,
-	0x03, 0x8d, 0x0c, 0x91, 0x0a, 0x8a, 0x02, 0x95, 0x05, 0x9f, 0x37, 0x04, 0x9f, 0x4c, 0x08,
-	0x39, 0x00,
+    0x5f, 0x25, 0x03, 0x14, 0x05, 0x01, 0x5f, 0x24, 0x03, 0x15, 0x06, 0x30, 0x5a, 0x08, 0x52, 0x85,
+    0x88, 0x12, 0x54, 0x34, 0x56, 0x53, 0x5f, 0x34, 0x01, 0x01, 0x8e, 0x0c, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x1e, 0x03, 0x1f, 0x03, 0x9f, 0x07, 0x02, 0xff, 0x00, 0x9f, 0x0d, 0x05,
+    0xbc, 0x50, 0xbc, 0x00, 0x00, 0x9f, 0x0e, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9f, 0x0f, 0x05,
+    0xbc, 0x70, 0xbc, 0x98, 0x00, 0x9f, 0x4a, 0x01, 0x82, 0x5f, 0x28, 0x02, 0x06, 0x43, 0x8c, 0x21,
+    0x9f, 0x02, 0x06, 0x9f, 0x03, 0x06, 0x9f, 0x1a, 0x02, 0x95, 0x05, 0x5f, 0x2a, 0x02, 0x9a, 0x03,
+    0x9c, 0x01, 0x9f, 0x37, 0x04, 0x9f, 0x35, 0x01, 0x9f, 0x45, 0x02, 0x9f, 0x4c, 0x08, 0x9f, 0x34,
+    0x03, 0x8d, 0x0c, 0x91, 0x0a, 0x8a, 0x02, 0x95, 0x05, 0x9f, 0x37, 0x04, 0x9f, 0x4c, 0x08,
+    0x39, 0x00,
 };
 static const struct tlv ssd1_tlv = {
-	.len = sizeof(d_ssd1),
-	.value = d_ssd1,
+    .len = sizeof(d_ssd1),
+    .value = d_ssd1,
 };
 
 const unsigned char d_pan[] = {
-	0x52, 0x85, 0x88, 0x12, 0x54, 0x34, 0x56, 0x53,
+    0x52, 0x85, 0x88, 0x12, 0x54, 0x34, 0x56, 0x53,
 };
 
 const unsigned char d_dd1[] = {
-	0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00,
 };
 static const struct tlv dd1_tlv = {
-	.len = sizeof(d_dd1),
-	.value = d_dd1,
+    .len = sizeof(d_dd1),
+    .value = d_dd1,
 };
 
 static int dda_test_raw(bool verbose)
 {
-	const struct emv_pk *pk = &mchip_05;
+    const struct emv_pk *pk = &mchip_05;
 
-	struct crypto_pk *kcp = crypto_pk_open(PK_RSA,
-			pk->modulus, pk->mlen,
-			pk->exp, pk->elen);
-	if (!kcp)
-		return 1;
+    struct crypto_pk *kcp = crypto_pk_open(PK_RSA,
+            pk->modulus, pk->mlen,
+            pk->exp, pk->elen);
+    if (!kcp)
+        return 1;
 
-	unsigned char *ipk_data;
-	size_t ipk_data_len;
-	ipk_data = crypto_pk_encrypt(kcp, d_issuer_cert, sizeof(d_issuer_cert), &ipk_data_len);
-	crypto_pk_close(kcp);
+    unsigned char *ipk_data;
+    size_t ipk_data_len;
+    ipk_data = crypto_pk_encrypt(kcp, d_issuer_cert, sizeof(d_issuer_cert), &ipk_data_len);
+    crypto_pk_close(kcp);
 
-	if (!ipk_data)
-		return 1;
+    if (!ipk_data)
+        return 1;
 
-	if (verbose) {
-		printf("issuer cert:\n");
-		dump_buffer(ipk_data, ipk_data_len, stdout, 0);
-	}
+    if (verbose) {
+        printf("issuer cert:\n");
+        dump_buffer(ipk_data, ipk_data_len, stdout, 0);
+    }
 
-	size_t ipk_pk_len = ipk_data[13];
-	unsigned char *ipk_pk = malloc(ipk_pk_len);
-	memcpy(ipk_pk, ipk_data + 15, ipk_data_len - 36);
-	memcpy(ipk_pk + ipk_data_len - 36, d_issuer_rem, sizeof(d_issuer_rem));
+    size_t ipk_pk_len = ipk_data[13];
+    unsigned char *ipk_pk = malloc(ipk_pk_len);
+    memcpy(ipk_pk, ipk_data + 15, ipk_data_len - 36);
+    memcpy(ipk_pk + ipk_data_len - 36, d_issuer_rem, sizeof(d_issuer_rem));
 
-	struct crypto_hash *ch;
-	ch = crypto_hash_open(HASH_SHA_1);
-	if (!ch) {
-		free(ipk_pk);
-		free(ipk_data);
-		return 1;
-	}
+    struct crypto_hash *ch;
+    ch = crypto_hash_open(HASH_SHA_1);
+    if (!ch) {
+        free(ipk_pk);
+        free(ipk_data);
+        return 1;
+    }
 
-	crypto_hash_write(ch, ipk_data + 1, 14);
-	crypto_hash_write(ch, ipk_pk, ipk_pk_len);
-	crypto_hash_write(ch, d_issuer_exp, sizeof(d_issuer_exp));
+    crypto_hash_write(ch, ipk_data + 1, 14);
+    crypto_hash_write(ch, ipk_pk, ipk_pk_len);
+    crypto_hash_write(ch, d_issuer_exp, sizeof(d_issuer_exp));
 
-	unsigned char *h = crypto_hash_read(ch);
-	if (!h) {
-		crypto_hash_close(ch);
-		free(ipk_pk);
-		free(ipk_data);
-		return 1;
-	}
+    unsigned char *h = crypto_hash_read(ch);
+    if (!h) {
+        crypto_hash_close(ch);
+        free(ipk_pk);
+        free(ipk_data);
+        return 1;
+    }
 
-	if (verbose) {
-		printf("crypto hash:\n");
-		dump_buffer(h, 20, stdout, 0);
-	}
+    if (verbose) {
+        printf("crypto hash:\n");
+        dump_buffer(h, 20, stdout, 0);
+    }
 
-	if (memcmp(ipk_data + ipk_data_len - 21, h, 20)) {
-		crypto_hash_close(ch);
-		free(ipk_pk);
-		free(ipk_data);
-		return 1;
-	}
+    if (memcmp(ipk_data + ipk_data_len - 21, h, 20)) {
+        crypto_hash_close(ch);
+        free(ipk_pk);
+        free(ipk_data);
+        return 1;
+    }
 
-	crypto_hash_close(ch);
-	free(ipk_data);
+    crypto_hash_close(ch);
+    free(ipk_data);
 
-	struct crypto_pk *ikcp = crypto_pk_open(PK_RSA, ipk_pk, (int) ipk_pk_len,
-			d_issuer_exp, (int) sizeof(d_issuer_exp));
-	free(ipk_pk);
-	if (!ikcp)
-		return 1;
+    struct crypto_pk *ikcp = crypto_pk_open(PK_RSA, ipk_pk, (int) ipk_pk_len,
+            d_issuer_exp, (int) sizeof(d_issuer_exp));
+    free(ipk_pk);
+    if (!ikcp)
+        return 1;
 
-	unsigned char *iccpk_data;
-	size_t iccpk_data_len;
-	iccpk_data = crypto_pk_encrypt(ikcp, d_icc_cert, sizeof(d_icc_cert), &iccpk_data_len);
-	crypto_pk_close(ikcp);
+    unsigned char *iccpk_data;
+    size_t iccpk_data_len;
+    iccpk_data = crypto_pk_encrypt(ikcp, d_icc_cert, sizeof(d_icc_cert), &iccpk_data_len);
+    crypto_pk_close(ikcp);
 
-	if (!iccpk_data)
-		return 1;
+    if (!iccpk_data)
+        return 1;
 
-	if (verbose) {
-		printf("icc cert:\n");
-		dump_buffer(iccpk_data, iccpk_data_len, stdout, 0);
-	}
+    if (verbose) {
+        printf("icc cert:\n");
+        dump_buffer(iccpk_data, iccpk_data_len, stdout, 0);
+    }
 
-	size_t iccpk_pk_len = iccpk_data[19];
-	unsigned char *iccpk_pk = malloc(iccpk_pk_len);
-	memcpy(iccpk_pk, iccpk_data + 21, /*iccpk_data_len - 36*/iccpk_pk_len);
-	/*memcpy(iccpk_pk + iccpk_data_len - 36, icc_rem, sizeof(icc_rem));*/
+    size_t iccpk_pk_len = iccpk_data[19];
+    unsigned char *iccpk_pk = malloc(iccpk_pk_len);
+    memcpy(iccpk_pk, iccpk_data + 21, /*iccpk_data_len - 36*/iccpk_pk_len);
+    /*memcpy(iccpk_pk + iccpk_data_len - 36, icc_rem, sizeof(icc_rem));*/
 
-	ch = crypto_hash_open(HASH_SHA_1);
-	if (!ch) {
-		free(iccpk_pk);
-		free(iccpk_data);
-		return 1;
-	}
+    ch = crypto_hash_open(HASH_SHA_1);
+    if (!ch) {
+        free(iccpk_pk);
+        free(iccpk_data);
+        return 1;
+    }
 
-	crypto_hash_write(ch, iccpk_data + 1, iccpk_data_len - 22);
-	crypto_hash_write(ch, d_icc_exp, sizeof(d_icc_exp));
-	crypto_hash_write(ch, d_ssd1, sizeof(d_ssd1));
+    crypto_hash_write(ch, iccpk_data + 1, iccpk_data_len - 22);
+    crypto_hash_write(ch, d_icc_exp, sizeof(d_icc_exp));
+    crypto_hash_write(ch, d_ssd1, sizeof(d_ssd1));
 
-	h = crypto_hash_read(ch);
-	if (!h) {
-		crypto_hash_close(ch);
-		free(iccpk_pk);
-		free(iccpk_data);
-		return 1;
-	}
+    h = crypto_hash_read(ch);
+    if (!h) {
+        crypto_hash_close(ch);
+        free(iccpk_pk);
+        free(iccpk_data);
+        return 1;
+    }
 
-	if (verbose) {
-		printf("crypto hash1.1:\n");
-		dump_buffer(h, 20, stdout, 0);
-	}
+    if (verbose) {
+        printf("crypto hash1.1:\n");
+        dump_buffer(h, 20, stdout, 0);
+    }
 
-	if (memcmp(iccpk_data + iccpk_data_len - 21, h, 20)) {
-		crypto_hash_close(ch);
-		free(iccpk_pk);
-		free(iccpk_data);
-		return 1;
-	}
+    if (memcmp(iccpk_data + iccpk_data_len - 21, h, 20)) {
+        crypto_hash_close(ch);
+        free(iccpk_pk);
+        free(iccpk_data);
+        return 1;
+    }
 
-	crypto_hash_close(ch);
-	free(iccpk_data);
+    crypto_hash_close(ch);
+    free(iccpk_data);
 
-	struct crypto_pk *icckcp = crypto_pk_open(PK_RSA, iccpk_pk, (int) iccpk_pk_len,
-			d_issuer_exp, (int) sizeof(d_issuer_exp));
-	free(iccpk_pk);
-	if (!icckcp)
-		return 1;
+    struct crypto_pk *icckcp = crypto_pk_open(PK_RSA, iccpk_pk, (int) iccpk_pk_len,
+            d_issuer_exp, (int) sizeof(d_issuer_exp));
+    free(iccpk_pk);
+    if (!icckcp)
+        return 1;
 
-	size_t sdad_len;
-	unsigned char *sdad = crypto_pk_encrypt(icckcp, d_sdad_cr, sizeof(d_sdad_cr), &sdad_len);
-	crypto_pk_close(icckcp);
-	if (!sdad)
-		return 1;
+    size_t sdad_len;
+    unsigned char *sdad = crypto_pk_encrypt(icckcp, d_sdad_cr, sizeof(d_sdad_cr), &sdad_len);
+    crypto_pk_close(icckcp);
+    if (!sdad)
+        return 1;
 
-	if (verbose) {
-		printf("sdad:\n");
-		dump_buffer(sdad, sdad_len, stdout, 0);
-	}
+    if (verbose) {
+        printf("sdad:\n");
+        dump_buffer(sdad, sdad_len, stdout, 0);
+    }
 
-	ch = crypto_hash_open(HASH_SHA_1);
-	if (!ch) {
-		free(sdad);
-		return 1;
-	}
+    ch = crypto_hash_open(HASH_SHA_1);
+    if (!ch) {
+        free(sdad);
+        return 1;
+    }
 
-	crypto_hash_write(ch, sdad + 1, sdad_len - 22);
-	crypto_hash_write(ch, d_dd1, sizeof(d_dd1));
+    crypto_hash_write(ch, sdad + 1, sdad_len - 22);
+    crypto_hash_write(ch, d_dd1, sizeof(d_dd1));
 
-	unsigned char *h2 = crypto_hash_read(ch);
-	if (!h2) {
-		crypto_hash_close(ch);
-		free(sdad);
-		return 1;
-	}
+    unsigned char *h2 = crypto_hash_read(ch);
+    if (!h2) {
+        crypto_hash_close(ch);
+        free(sdad);
+        return 1;
+    }
 
-	if (verbose) {
-		printf("crypto hash2:\n");
-		dump_buffer(h2, 20, stdout, 0);
-	}
+    if (verbose) {
+        printf("crypto hash2:\n");
+        dump_buffer(h2, 20, stdout, 0);
+    }
 
-	crypto_hash_close(ch);
+    crypto_hash_close(ch);
 
-	free(sdad);
+    free(sdad);
 
-	return 0;
+    return 0;
 }
 
 static int dda_test_pk(bool verbose)
 {
-	const struct emv_pk *pk = &mchip_05;
-	struct tlvdb *db;
+    const struct emv_pk *pk = &mchip_05;
+    struct tlvdb *db;
 
-	db = tlvdb_external(0x90, sizeof(d_issuer_cert), d_issuer_cert);
-	tlvdb_add(db, tlvdb_external(0x9f32, sizeof(d_issuer_exp), d_issuer_exp));
-	tlvdb_add(db, tlvdb_external(0x92, sizeof(d_issuer_rem), d_issuer_rem));
-	tlvdb_add(db, tlvdb_external(0x5a, sizeof(d_pan), d_pan));
+    db = tlvdb_external(0x90, sizeof(d_issuer_cert), d_issuer_cert);
+    tlvdb_add(db, tlvdb_external(0x9f32, sizeof(d_issuer_exp), d_issuer_exp));
+    tlvdb_add(db, tlvdb_external(0x92, sizeof(d_issuer_rem), d_issuer_rem));
+    tlvdb_add(db, tlvdb_external(0x5a, sizeof(d_pan), d_pan));
 
-	struct emv_pk *ipk = emv_pki_recover_issuer_cert(pk, db);
-	if (!ipk) {
-		fprintf(stderr, "Could not recover Issuer certificate!\n");
-		tlvdb_free(db);
-		return 2;
-	}
+    struct emv_pk *ipk = emv_pki_recover_issuer_cert(pk, db);
+    if (!ipk) {
+        fprintf(stderr, "Could not recover Issuer certificate!\n");
+        tlvdb_free(db);
+        return 2;
+    }
 
-	tlvdb_add(db, tlvdb_external(0x9f46, sizeof(d_icc_cert), d_icc_cert));
-	tlvdb_add(db, tlvdb_external(0x9f47, sizeof(d_icc_exp), d_icc_exp));
-	/*tlvdb_add(db, tlvdb_external(0x9f48, sizeof(d_issuer_rem), d_issuer_rem));*/
+    tlvdb_add(db, tlvdb_external(0x9f46, sizeof(d_icc_cert), d_icc_cert));
+    tlvdb_add(db, tlvdb_external(0x9f47, sizeof(d_icc_exp), d_icc_exp));
+    /*tlvdb_add(db, tlvdb_external(0x9f48, sizeof(d_issuer_rem), d_issuer_rem));*/
 
-	struct emv_pk *iccpk = emv_pki_recover_icc_cert(ipk, db, &ssd1_tlv);
-	if (!iccpk) {
-		fprintf(stderr, "Could not recover ICC certificate!\n");
-		emv_pk_free(ipk);
-		tlvdb_free(db);
-		return 2;
-	}
+    struct emv_pk *iccpk = emv_pki_recover_icc_cert(ipk, db, &ssd1_tlv);
+    if (!iccpk) {
+        fprintf(stderr, "Could not recover ICC certificate!\n");
+        emv_pk_free(ipk);
+        tlvdb_free(db);
+        return 2;
+    }
 
-	tlvdb_add(db, tlvdb_external(0x9f4b, sizeof(d_sdad_cr), d_sdad_cr));
+    tlvdb_add(db, tlvdb_external(0x9f4b, sizeof(d_sdad_cr), d_sdad_cr));
 
-	struct tlvdb *idndb = emv_pki_recover_idn(iccpk, db, &dd1_tlv);
-	if (!idndb) {
-		fprintf(stderr, "Could not recover IDN!\n");
-		emv_pk_free(iccpk);
-		emv_pk_free(ipk);
-		tlvdb_free(db);
-		return 2;
-	}
+    struct tlvdb *idndb = emv_pki_recover_idn(iccpk, db, &dd1_tlv);
+    if (!idndb) {
+        fprintf(stderr, "Could not recover IDN!\n");
+        emv_pk_free(iccpk);
+        emv_pk_free(ipk);
+        tlvdb_free(db);
+        return 2;
+    }
 
-	const struct tlv *idn = tlvdb_get(idndb, 0x9f4c, NULL);
-	if (!idn) {
-		fprintf(stderr, "IDN not found!\n");
-		tlvdb_free(idndb);
-		emv_pk_free(iccpk);
-		emv_pk_free(ipk);
-		tlvdb_free(db);
-		return 2;
-	}
+    const struct tlv *idn = tlvdb_get(idndb, 0x9f4c, NULL);
+    if (!idn) {
+        fprintf(stderr, "IDN not found!\n");
+        tlvdb_free(idndb);
+        emv_pk_free(iccpk);
+        emv_pk_free(ipk);
+        tlvdb_free(db);
+        return 2;
+    }
 
-	if (verbose) {
-		printf("IDN:\n");
-		dump_buffer(idn->value, idn->len, stdout, 0);
-	}
+    if (verbose) {
+        printf("IDN:\n");
+        dump_buffer(idn->value, idn->len, stdout, 0);
+    }
 
-	tlvdb_free(idndb);
-	emv_pk_free(iccpk);
-	emv_pk_free(ipk);
-	tlvdb_free(db);
+    tlvdb_free(idndb);
+    emv_pk_free(iccpk);
+    emv_pk_free(ipk);
+    tlvdb_free(db);
 
-	return 0;
+    return 0;
 }
 
 int exec_dda_test(bool verbose)
 {
-	int ret;
-	fprintf(stdout, "\n");
+    int ret;
+    fprintf(stdout, "\n");
 
-	ret = dda_test_raw(verbose);
-	if (ret) {
-		fprintf(stderr, "DDA raw test: failed\n");
-		return ret;
-	}
-	fprintf(stdout, "DDA raw test: passed\n");
+    ret = dda_test_raw(verbose);
+    if (ret) {
+        fprintf(stderr, "DDA raw test: failed\n");
+        return ret;
+    }
+    fprintf(stdout, "DDA raw test: passed\n");
 
-	ret = dda_test_pk(verbose);
-	if (ret) {
-		fprintf(stderr, "DDA test pk: failed\n");
-		return ret;
-	}
-	fprintf(stdout, "DDA test pk: passed\n");
+    ret = dda_test_pk(verbose);
+    if (ret) {
+        fprintf(stderr, "DDA test pk: failed\n");
+        return ret;
+    }
+    fprintf(stdout, "DDA test pk: passed\n");
 
-	return 0;
+    return 0;
 }
diff --git a/client/emv/test/sda_test.c b/client/emv/test/sda_test.c
index 2aafcf19f..df1620cfd 100644
--- a/client/emv/test/sda_test.c
+++ b/client/emv/test/sda_test.c
@@ -28,250 +28,250 @@
 #include <stdlib.h>
 
 struct emv_pk vsdc_01 = {
-	.rid = { 0xa0, 0x00, 0x00, 0x00, 0x03, },
-	.index = 1,
-	.hash_algo = HASH_SHA_1,
-	.pk_algo = PK_RSA,
-	.hash = {
-		0xd3, 0x4a, 0x6a, 0x77,
-		0x60, 0x11, 0xc7, 0xe7,
-		0xce, 0x3a, 0xec, 0x5f,
-		0x03, 0xad, 0x2f, 0x8c,
-		0xfc, 0x55, 0x03, 0xcc, },
-	.exp = { 0x03, },
-	.elen = 1,
-	.mlen = 1024 / 8,
-	.modulus = (unsigned char[]){
-		0xc6, 0x96, 0x03, 0x42, 0x13, 0xd7, 0xd8, 0x54, 0x69, 0x84, 0x57, 0x9d, 0x1d, 0x0f, 0x0e, 0xa5,
-		0x19, 0xcf, 0xf8, 0xde, 0xff, 0xc4, 0x29, 0x35, 0x4c, 0xf3, 0xa8, 0x71, 0xa6, 0xf7, 0x18, 0x3f,
-		0x12, 0x28, 0xda, 0x5c, 0x74, 0x70, 0xc0, 0x55, 0x38, 0x71, 0x00, 0xcb, 0x93, 0x5a, 0x71, 0x2c,
-		0x4e, 0x28, 0x64, 0xdf, 0x5d, 0x64, 0xba, 0x93, 0xfe, 0x7e, 0x63, 0xe7, 0x1f, 0x25, 0xb1, 0xe5,
-		0xf5, 0x29, 0x85, 0x75, 0xeb, 0xe1, 0xc6, 0x3a, 0xa6, 0x17, 0x70, 0x69, 0x17, 0x91, 0x1d, 0xc2,
-		0xa7, 0x5a, 0xc2, 0x8b, 0x25, 0x1c, 0x7e, 0xf4, 0x0f, 0x23, 0x65, 0x91, 0x24, 0x90, 0xb9, 0x39,
-		0xbc, 0xa2, 0x12, 0x4a, 0x30, 0xa2, 0x8f, 0x54, 0x40, 0x2c, 0x34, 0xae, 0xca, 0x33, 0x1a, 0xb6,
-		0x7e, 0x1e, 0x79, 0xb2, 0x85, 0xdd, 0x57, 0x71, 0xb5, 0xd9, 0xff, 0x79, 0xea, 0x63, 0x0b, 0x75,
-	},
+    .rid = { 0xa0, 0x00, 0x00, 0x00, 0x03, },
+    .index = 1,
+    .hash_algo = HASH_SHA_1,
+    .pk_algo = PK_RSA,
+    .hash = {
+        0xd3, 0x4a, 0x6a, 0x77,
+        0x60, 0x11, 0xc7, 0xe7,
+        0xce, 0x3a, 0xec, 0x5f,
+        0x03, 0xad, 0x2f, 0x8c,
+        0xfc, 0x55, 0x03, 0xcc, },
+    .exp = { 0x03, },
+    .elen = 1,
+    .mlen = 1024 / 8,
+    .modulus = (unsigned char[]){
+        0xc6, 0x96, 0x03, 0x42, 0x13, 0xd7, 0xd8, 0x54, 0x69, 0x84, 0x57, 0x9d, 0x1d, 0x0f, 0x0e, 0xa5,
+        0x19, 0xcf, 0xf8, 0xde, 0xff, 0xc4, 0x29, 0x35, 0x4c, 0xf3, 0xa8, 0x71, 0xa6, 0xf7, 0x18, 0x3f,
+        0x12, 0x28, 0xda, 0x5c, 0x74, 0x70, 0xc0, 0x55, 0x38, 0x71, 0x00, 0xcb, 0x93, 0x5a, 0x71, 0x2c,
+        0x4e, 0x28, 0x64, 0xdf, 0x5d, 0x64, 0xba, 0x93, 0xfe, 0x7e, 0x63, 0xe7, 0x1f, 0x25, 0xb1, 0xe5,
+        0xf5, 0x29, 0x85, 0x75, 0xeb, 0xe1, 0xc6, 0x3a, 0xa6, 0x17, 0x70, 0x69, 0x17, 0x91, 0x1d, 0xc2,
+        0xa7, 0x5a, 0xc2, 0x8b, 0x25, 0x1c, 0x7e, 0xf4, 0x0f, 0x23, 0x65, 0x91, 0x24, 0x90, 0xb9, 0x39,
+        0xbc, 0xa2, 0x12, 0x4a, 0x30, 0xa2, 0x8f, 0x54, 0x40, 0x2c, 0x34, 0xae, 0xca, 0x33, 0x1a, 0xb6,
+        0x7e, 0x1e, 0x79, 0xb2, 0x85, 0xdd, 0x57, 0x71, 0xb5, 0xd9, 0xff, 0x79, 0xea, 0x63, 0x0b, 0x75,
+    },
 };
 
 const unsigned char issuer_cert[] = {
-		0x3c, 0x5f, 0xea, 0xd4, 0xdd, 0x7b, 0xca, 0x44, 0xf9, 0x3e, 0x90, 0xc4, 0x4f, 0x76, 0xed, 0xe5,
-		0x4a, 0x32, 0x88, 0xec, 0xdc, 0x78, 0x46, 0x9f, 0xcb, 0x12, 0x25, 0xc0, 0x3b, 0x2c, 0x04, 0xf2,
-		0xc2, 0xf4, 0x12, 0x28, 0x1a, 0x08, 0x22, 0xdf, 0x14, 0x64, 0x92, 0x30, 0x98, 0x9f, 0xb1, 0x49,
-		0x40, 0x70, 0xda, 0xf8, 0xc9, 0x53, 0x4a, 0x78, 0x81, 0x96, 0x01, 0x48, 0x61, 0x6a, 0xce, 0x58,
-		0x17, 0x88, 0x12, 0x0d, 0x35, 0x06, 0xac, 0xe4, 0xce, 0xe5, 0x64, 0xfb, 0x27, 0xee, 0x53, 0x34,
-		0x1c, 0x22, 0xf0, 0xb4, 0x5b, 0x31, 0x87, 0x3d, 0x05, 0xde, 0x54, 0x5e, 0xfe, 0x33, 0xbc, 0xd2,
-		0x9b, 0x21, 0x85, 0xd0, 0x35, 0xa8, 0x06, 0xad, 0x08, 0xc6, 0x97, 0x6f, 0x35, 0x05, 0xa1, 0x99,
-		0x99, 0x93, 0x0c, 0xa8, 0xa0, 0x3e, 0xfa, 0x32, 0x1c, 0x48, 0x60, 0x61, 0xf7, 0xdc, 0xec, 0x9f,
+        0x3c, 0x5f, 0xea, 0xd4, 0xdd, 0x7b, 0xca, 0x44, 0xf9, 0x3e, 0x90, 0xc4, 0x4f, 0x76, 0xed, 0xe5,
+        0x4a, 0x32, 0x88, 0xec, 0xdc, 0x78, 0x46, 0x9f, 0xcb, 0x12, 0x25, 0xc0, 0x3b, 0x2c, 0x04, 0xf2,
+        0xc2, 0xf4, 0x12, 0x28, 0x1a, 0x08, 0x22, 0xdf, 0x14, 0x64, 0x92, 0x30, 0x98, 0x9f, 0xb1, 0x49,
+        0x40, 0x70, 0xda, 0xf8, 0xc9, 0x53, 0x4a, 0x78, 0x81, 0x96, 0x01, 0x48, 0x61, 0x6a, 0xce, 0x58,
+        0x17, 0x88, 0x12, 0x0d, 0x35, 0x06, 0xac, 0xe4, 0xce, 0xe5, 0x64, 0xfb, 0x27, 0xee, 0x53, 0x34,
+        0x1c, 0x22, 0xf0, 0xb4, 0x5b, 0x31, 0x87, 0x3d, 0x05, 0xde, 0x54, 0x5e, 0xfe, 0x33, 0xbc, 0xd2,
+        0x9b, 0x21, 0x85, 0xd0, 0x35, 0xa8, 0x06, 0xad, 0x08, 0xc6, 0x97, 0x6f, 0x35, 0x05, 0xa1, 0x99,
+        0x99, 0x93, 0x0c, 0xa8, 0xa0, 0x3e, 0xfa, 0x32, 0x1c, 0x48, 0x60, 0x61, 0xf7, 0xdc, 0xec, 0x9f,
 };
 
 const unsigned char issuer_rem[] = {
-		0x1e, 0xbc, 0xa3, 0x0f, 0x00, 0xce, 0x59, 0x62, 0xa8, 0xc6, 0xe1, 0x30, 0x54, 0x4b, 0x82, 0x89,
-		0x1b, 0x23, 0x6c, 0x65, 0xde, 0x29, 0x31, 0x7f, 0x36, 0x47, 0x35, 0xde, 0xe6, 0x3f, 0x65, 0x98,
-		0x97, 0x58, 0x35, 0xd5
+        0x1e, 0xbc, 0xa3, 0x0f, 0x00, 0xce, 0x59, 0x62, 0xa8, 0xc6, 0xe1, 0x30, 0x54, 0x4b, 0x82, 0x89,
+        0x1b, 0x23, 0x6c, 0x65, 0xde, 0x29, 0x31, 0x7f, 0x36, 0x47, 0x35, 0xde, 0xe6, 0x3f, 0x65, 0x98,
+        0x97, 0x58, 0x35, 0xd5
 };
 
 const unsigned char issuer_exp[] = {
-		0x03,
+        0x03,
 };
 
 const unsigned char ssad_cr[] = {
-		0x99, 0xa5, 0x58, 0xb6, 0x2b, 0x67, 0x4a, 0xa5, 0xe7, 0xd2, 0xa5, 0x7e, 0x5e, 0xf6, 0xa6, 0xf2,
-		0x25, 0x8e, 0x5d, 0xa0, 0x52, 0xd0, 0x5b, 0x54, 0xe5, 0xc1, 0x15, 0xff, 0x1c, 0xec, 0xf9, 0x4a,
-		0xa2, 0xdf, 0x8f, 0x39, 0xa0, 0x1d, 0x71, 0xc6, 0x19, 0xeb, 0x81, 0x9d, 0xa5, 0x2e, 0xf3, 0x81,
-		0xe8, 0x49, 0x79, 0x58, 0x6a, 0xea, 0x78, 0x55, 0xff, 0xbe, 0xf4, 0x0a, 0xa3, 0xa7, 0x1c, 0xd3,
-		0xb0, 0x4c, 0xfd, 0xf2, 0x70, 0xae, 0xc8, 0x15, 0x8a, 0x27, 0x97, 0xf2, 0x4f, 0xd6, 0x13, 0xb7,
-		0x48, 0x13, 0x46, 0x61, 0x13, 0x5c, 0xd2, 0x90, 0xe4, 0x5b, 0x04, 0xa8, 0xe0, 0xcc, 0xc7, 0x11,
-		0xae, 0x04, 0x2f, 0x15, 0x9e, 0x73, 0xc8, 0x9c, 0x2a, 0x7e, 0x65, 0xa4, 0xc2, 0xfd, 0x1d, 0x61,
-		0x06, 0x02, 0x4a, 0xa2, 0x71, 0x30, 0xb0, 0xec, 0xec, 0x02, 0x38, 0xf9, 0x16, 0x59, 0xde, 0x96,
+        0x99, 0xa5, 0x58, 0xb6, 0x2b, 0x67, 0x4a, 0xa5, 0xe7, 0xd2, 0xa5, 0x7e, 0x5e, 0xf6, 0xa6, 0xf2,
+        0x25, 0x8e, 0x5d, 0xa0, 0x52, 0xd0, 0x5b, 0x54, 0xe5, 0xc1, 0x15, 0xff, 0x1c, 0xec, 0xf9, 0x4a,
+        0xa2, 0xdf, 0x8f, 0x39, 0xa0, 0x1d, 0x71, 0xc6, 0x19, 0xeb, 0x81, 0x9d, 0xa5, 0x2e, 0xf3, 0x81,
+        0xe8, 0x49, 0x79, 0x58, 0x6a, 0xea, 0x78, 0x55, 0xff, 0xbe, 0xf4, 0x0a, 0xa3, 0xa7, 0x1c, 0xd3,
+        0xb0, 0x4c, 0xfd, 0xf2, 0x70, 0xae, 0xc8, 0x15, 0x8a, 0x27, 0x97, 0xf2, 0x4f, 0xd6, 0x13, 0xb7,
+        0x48, 0x13, 0x46, 0x61, 0x13, 0x5c, 0xd2, 0x90, 0xe4, 0x5b, 0x04, 0xa8, 0xe0, 0xcc, 0xc7, 0x11,
+        0xae, 0x04, 0x2f, 0x15, 0x9e, 0x73, 0xc8, 0x9c, 0x2a, 0x7e, 0x65, 0xa4, 0xc2, 0xfd, 0x1d, 0x61,
+        0x06, 0x02, 0x4a, 0xa2, 0x71, 0x30, 0xb0, 0xec, 0xec, 0x02, 0x38, 0xf9, 0x16, 0x59, 0xde, 0x96,
 };
 
 const unsigned char ssd1[] = {
-	0x5f, 0x24, 0x03, 0x08, 0x12, 0x31, 0x5a, 0x08, 0x42, 0x76, 0x55, 0x00, 0x13, 0x23, 0x45, 0x99, 0x5f, 0x34, 0x01, 0x01, 0x9f, 0x07, 0x02, 0xff, 0x00, 0x9f, 0x0d, 0x05, 0xd0, 0x40, 0xac, 0xa8, 0x00, 0x9f, 0x0e, 0x05, 0x00, 0x10, 0x00, 0x00, 0x00, 0x9f, 0x0f, 0x05, 0xd0, 0x68, 0xbc, 0xf8, 0x00,
-	0x5c, 0x00,
+    0x5f, 0x24, 0x03, 0x08, 0x12, 0x31, 0x5a, 0x08, 0x42, 0x76, 0x55, 0x00, 0x13, 0x23, 0x45, 0x99, 0x5f, 0x34, 0x01, 0x01, 0x9f, 0x07, 0x02, 0xff, 0x00, 0x9f, 0x0d, 0x05, 0xd0, 0x40, 0xac, 0xa8, 0x00, 0x9f, 0x0e, 0x05, 0x00, 0x10, 0x00, 0x00, 0x00, 0x9f, 0x0f, 0x05, 0xd0, 0x68, 0xbc, 0xf8, 0x00,
+    0x5c, 0x00,
 };
 static const struct tlv ssd1_tlv = {
-	.len = sizeof(ssd1),
-	.value = ssd1,
+    .len = sizeof(ssd1),
+    .value = ssd1,
 };
 
 const unsigned char pan[] = {
-	0x42, 0x76, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x42, 0x76, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
 static int sda_test_raw(bool verbose)
 {
-	const struct emv_pk *pk = &vsdc_01;
+    const struct emv_pk *pk = &vsdc_01;
 
-	struct crypto_pk *kcp = crypto_pk_open(PK_RSA,
-			pk->modulus, pk->mlen,
-			pk->exp, pk->elen);
-	if (!kcp)
-		return 1;
+    struct crypto_pk *kcp = crypto_pk_open(PK_RSA,
+            pk->modulus, pk->mlen,
+            pk->exp, pk->elen);
+    if (!kcp)
+        return 1;
 
-	unsigned char *ipk_data;
-	size_t ipk_data_len;
-	ipk_data = crypto_pk_encrypt(kcp, issuer_cert, sizeof(issuer_cert), &ipk_data_len);
-	crypto_pk_close(kcp);
+    unsigned char *ipk_data;
+    size_t ipk_data_len;
+    ipk_data = crypto_pk_encrypt(kcp, issuer_cert, sizeof(issuer_cert), &ipk_data_len);
+    crypto_pk_close(kcp);
 
-	if (!ipk_data)
-		return 1;
+    if (!ipk_data)
+        return 1;
 
-	if (verbose) {
-		printf("issuer cert:\n");
-		dump_buffer(ipk_data, ipk_data_len, stdout, 0);
-	}
+    if (verbose) {
+        printf("issuer cert:\n");
+        dump_buffer(ipk_data, ipk_data_len, stdout, 0);
+    }
 
-	size_t ipk_pk_len = ipk_data[13];
-	unsigned char *ipk_pk = malloc(ipk_pk_len);
-	memcpy(ipk_pk, ipk_data + 15, ipk_data_len - 36);
-	memcpy(ipk_pk + ipk_data_len - 36, issuer_rem, sizeof(issuer_rem));
+    size_t ipk_pk_len = ipk_data[13];
+    unsigned char *ipk_pk = malloc(ipk_pk_len);
+    memcpy(ipk_pk, ipk_data + 15, ipk_data_len - 36);
+    memcpy(ipk_pk + ipk_data_len - 36, issuer_rem, sizeof(issuer_rem));
 
-	struct crypto_hash *ch;
-	ch = crypto_hash_open(HASH_SHA_1);
-	if (!ch) {
-		free(ipk_pk);
-		free(ipk_data);
-		return 1;
-	}
+    struct crypto_hash *ch;
+    ch = crypto_hash_open(HASH_SHA_1);
+    if (!ch) {
+        free(ipk_pk);
+        free(ipk_data);
+        return 1;
+    }
 
-	crypto_hash_write(ch, ipk_data + 1, 14);
-	crypto_hash_write(ch, ipk_pk, ipk_pk_len);
-	crypto_hash_write(ch, issuer_exp, sizeof(issuer_exp));
+    crypto_hash_write(ch, ipk_data + 1, 14);
+    crypto_hash_write(ch, ipk_pk, ipk_pk_len);
+    crypto_hash_write(ch, issuer_exp, sizeof(issuer_exp));
 
-	unsigned char *h = crypto_hash_read(ch);
-	if (!h) {
-		crypto_hash_close(ch);
-		free(ipk_pk);
-		free(ipk_data);
-		return 1;
-	}
+    unsigned char *h = crypto_hash_read(ch);
+    if (!h) {
+        crypto_hash_close(ch);
+        free(ipk_pk);
+        free(ipk_data);
+        return 1;
+    }
 
-	if (verbose) {
-		printf("crypto hash:\n");
-		dump_buffer(h, 20, stdout, 0);
-	}
+    if (verbose) {
+        printf("crypto hash:\n");
+        dump_buffer(h, 20, stdout, 0);
+    }
 
-	if (memcmp(ipk_data + ipk_data_len - 21, h, 20)) {
-		crypto_hash_close(ch);
-		free(ipk_pk);
-		free(ipk_data);
-		return 1;
-	}
+    if (memcmp(ipk_data + ipk_data_len - 21, h, 20)) {
+        crypto_hash_close(ch);
+        free(ipk_pk);
+        free(ipk_data);
+        return 1;
+    }
 
-	crypto_hash_close(ch);
-	free(ipk_data);
+    crypto_hash_close(ch);
+    free(ipk_data);
 
-	struct crypto_pk *ikcp = crypto_pk_open(PK_RSA, ipk_pk, (int) ipk_pk_len,
-			issuer_exp, (int) sizeof(issuer_exp));
-	free(ipk_pk);
-	if (!ikcp)
-		return 1;
+    struct crypto_pk *ikcp = crypto_pk_open(PK_RSA, ipk_pk, (int) ipk_pk_len,
+            issuer_exp, (int) sizeof(issuer_exp));
+    free(ipk_pk);
+    if (!ikcp)
+        return 1;
 
-	size_t ssad_len;
-	unsigned char *ssad = crypto_pk_encrypt(ikcp, ssad_cr, sizeof(ssad_cr), &ssad_len);
-	crypto_pk_close(ikcp);
-	if (!ssad)
-		return 1;
+    size_t ssad_len;
+    unsigned char *ssad = crypto_pk_encrypt(ikcp, ssad_cr, sizeof(ssad_cr), &ssad_len);
+    crypto_pk_close(ikcp);
+    if (!ssad)
+        return 1;
 
-	if (verbose) {
-		printf("ssad:\n");
-		dump_buffer(ssad, ssad_len, stdout, 0);
-	}
+    if (verbose) {
+        printf("ssad:\n");
+        dump_buffer(ssad, ssad_len, stdout, 0);
+    }
 
-	ch = crypto_hash_open(HASH_SHA_1);
-	if (!ch) {
-		free(ssad);
-		return 1;
-	}
+    ch = crypto_hash_open(HASH_SHA_1);
+    if (!ch) {
+        free(ssad);
+        return 1;
+    }
 
-	crypto_hash_write(ch, ssad + 1, ssad_len - 22);
-	crypto_hash_write(ch, ssd1, sizeof(ssd1));
+    crypto_hash_write(ch, ssad + 1, ssad_len - 22);
+    crypto_hash_write(ch, ssd1, sizeof(ssd1));
 
-	unsigned char *h2 = crypto_hash_read(ch);
-	if (!h2) {
-		crypto_hash_close(ch);
-		free(ssad);
-		return 1;
-	}
+    unsigned char *h2 = crypto_hash_read(ch);
+    if (!h2) {
+        crypto_hash_close(ch);
+        free(ssad);
+        return 1;
+    }
 
-	if (verbose) {
-		printf("crypto hash2:\n");
-		dump_buffer(h2, 20, stdout, 0);
-	}
+    if (verbose) {
+        printf("crypto hash2:\n");
+        dump_buffer(h2, 20, stdout, 0);
+    }
 
-	crypto_hash_close(ch);
+    crypto_hash_close(ch);
 
-	free(ssad);
+    free(ssad);
 
-	return 0;
+    return 0;
 }
 
 static int sda_test_pk(bool verbose)
 {
-	const struct emv_pk *pk = &vsdc_01;
-	struct tlvdb *db;
+    const struct emv_pk *pk = &vsdc_01;
+    struct tlvdb *db;
 
-	db = tlvdb_external(0x90, sizeof(issuer_cert), issuer_cert);
-	tlvdb_add(db, tlvdb_external(0x9f32, sizeof(issuer_exp), issuer_exp));
-	tlvdb_add(db, tlvdb_external(0x92, sizeof(issuer_rem), issuer_rem));
-	tlvdb_add(db, tlvdb_external(0x5a, sizeof(pan), pan));
+    db = tlvdb_external(0x90, sizeof(issuer_cert), issuer_cert);
+    tlvdb_add(db, tlvdb_external(0x9f32, sizeof(issuer_exp), issuer_exp));
+    tlvdb_add(db, tlvdb_external(0x92, sizeof(issuer_rem), issuer_rem));
+    tlvdb_add(db, tlvdb_external(0x5a, sizeof(pan), pan));
 
-	struct emv_pk *ipk = emv_pki_recover_issuer_cert(pk, db);
-	if (!ipk) {
-		fprintf(stderr, "Could not recover Issuer certificate!\n");
-		tlvdb_free(db);
-		return 2;
-	}
+    struct emv_pk *ipk = emv_pki_recover_issuer_cert(pk, db);
+    if (!ipk) {
+        fprintf(stderr, "Could not recover Issuer certificate!\n");
+        tlvdb_free(db);
+        return 2;
+    }
 
-	tlvdb_add(db, tlvdb_external(0x93, sizeof(ssad_cr), ssad_cr));
+    tlvdb_add(db, tlvdb_external(0x93, sizeof(ssad_cr), ssad_cr));
 
-	struct tlvdb *dacdb = emv_pki_recover_dac(ipk, db, &ssd1_tlv);
-	if (!dacdb) {
-		fprintf(stderr, "Could not recover DAC!\n");
-		emv_pk_free(ipk);
-		tlvdb_free(db);
-		return 2;
-	}
+    struct tlvdb *dacdb = emv_pki_recover_dac(ipk, db, &ssd1_tlv);
+    if (!dacdb) {
+        fprintf(stderr, "Could not recover DAC!\n");
+        emv_pk_free(ipk);
+        tlvdb_free(db);
+        return 2;
+    }
 
-	const struct tlv *dac = tlvdb_get(dacdb, 0x9f45, NULL);
-	if (!dac) {
-		fprintf(stderr, "DAC not found!\n");
-		tlvdb_free(dacdb);
-		emv_pk_free(ipk);
-		tlvdb_free(db);
-		return 2;
-	}
+    const struct tlv *dac = tlvdb_get(dacdb, 0x9f45, NULL);
+    if (!dac) {
+        fprintf(stderr, "DAC not found!\n");
+        tlvdb_free(dacdb);
+        emv_pk_free(ipk);
+        tlvdb_free(db);
+        return 2;
+    }
 
-	if (verbose) {
-		printf("dac:\n");
-		dump_buffer(dac->value, dac->len, stdout, 0);
-	}
+    if (verbose) {
+        printf("dac:\n");
+        dump_buffer(dac->value, dac->len, stdout, 0);
+    }
 
-	tlvdb_free(dacdb);
-	emv_pk_free(ipk);
-	tlvdb_free(db);
+    tlvdb_free(dacdb);
+    emv_pk_free(ipk);
+    tlvdb_free(db);
 
-	return 0;
+    return 0;
 }
 
 int exec_sda_test(bool verbose)
 {
-	int ret;
-	fprintf(stdout, "\n");
+    int ret;
+    fprintf(stdout, "\n");
 
-	ret = sda_test_raw(verbose);
-	if (ret) {
-		fprintf(stderr, "SDA raw test: failed\n");
-		return ret;
-	}
-	fprintf(stdout, "SDA raw test: passed\n");
+    ret = sda_test_raw(verbose);
+    if (ret) {
+        fprintf(stderr, "SDA raw test: failed\n");
+        return ret;
+    }
+    fprintf(stdout, "SDA raw test: passed\n");
 
-	ret = sda_test_pk(verbose);
-	if (ret) {
-		fprintf(stderr, "SDA test pk: failed\n");
-		return ret;
-	}
-	fprintf(stdout, "SDA test pk: passed\n");
+    ret = sda_test_pk(verbose);
+    if (ret) {
+        fprintf(stderr, "SDA test pk: failed\n");
+        return ret;
+    }
+    fprintf(stdout, "SDA test pk: passed\n");
 
-	return 0;
+    return 0;
 }
diff --git a/client/emv/tlv.c b/client/emv/tlv.c
index 31277c325..fe4d3906f 100644
--- a/client/emv/tlv.c
+++ b/client/emv/tlv.c
@@ -26,574 +26,574 @@
 #include <stddef.h>
 #include <stdlib.h>
 
-#define TLV_TAG_CLASS_MASK	0xc0
-#define TLV_TAG_COMPLEX		0x20
-#define TLV_TAG_VALUE_MASK	0x1f
-#define TLV_TAG_VALUE_CONT	0x1f
-#define TLV_TAG_INVALID		0
+#define TLV_TAG_CLASS_MASK  0xc0
+#define TLV_TAG_COMPLEX     0x20
+#define TLV_TAG_VALUE_MASK  0x1f
+#define TLV_TAG_VALUE_CONT  0x1f
+#define TLV_TAG_INVALID     0
 
-#define TLV_LEN_LONG		0x80
-#define TLV_LEN_MASK		0x7f
-#define TLV_LEN_INVALID		(~0)
+#define TLV_LEN_LONG        0x80
+#define TLV_LEN_MASK        0x7f
+#define TLV_LEN_INVALID     (~0)
 
 // http://radek.io/2012/11/10/magical-container_of-macro/
 //#define container_of(ptr, type, member) ({
-//	const typeof( ((type *)0)->member ) *__mptr = (ptr);
+//  const typeof( ((type *)0)->member ) *__mptr = (ptr);
 //        (type *)( (char *)__mptr - offsetof(type,member) );})
 
 struct tlvdb {
-	struct tlv tag;
-	struct tlvdb *next;
-	struct tlvdb *parent;
-	struct tlvdb *children;
+    struct tlv tag;
+    struct tlvdb *next;
+    struct tlvdb *parent;
+    struct tlvdb *children;
 };
 
 struct tlvdb_root {
-	struct tlvdb db;
-	size_t len;
-	unsigned char buf[0];
+    struct tlvdb db;
+    size_t len;
+    unsigned char buf[0];
 };
 
 static tlv_tag_t tlv_parse_tag(const unsigned char **buf, size_t *len)
 {
-	tlv_tag_t tag;
+    tlv_tag_t tag;
 
-	if (*len == 0)
-		return TLV_TAG_INVALID;
-	tag = **buf;
-	--*len;
-	++*buf;
-	if ((tag & TLV_TAG_VALUE_MASK) != TLV_TAG_VALUE_CONT)
-		return tag;
+    if (*len == 0)
+        return TLV_TAG_INVALID;
+    tag = **buf;
+    --*len;
+    ++*buf;
+    if ((tag & TLV_TAG_VALUE_MASK) != TLV_TAG_VALUE_CONT)
+        return tag;
 
-	if (*len == 0)
-		return TLV_TAG_INVALID;
+    if (*len == 0)
+        return TLV_TAG_INVALID;
 
-	tag <<= 8;
-	tag |= **buf;
-	--*len;
-	++*buf;
+    tag <<= 8;
+    tag |= **buf;
+    --*len;
+    ++*buf;
 
-	return tag;
+    return tag;
 }
 
 static size_t tlv_parse_len(const unsigned char **buf, size_t *len)
 {
-	size_t l;
+    size_t l;
 
-	if (*len == 0)
-		return TLV_LEN_INVALID;
+    if (*len == 0)
+        return TLV_LEN_INVALID;
 
-	l = **buf;
-	--*len;
-	++*buf;
+    l = **buf;
+    --*len;
+    ++*buf;
 
-	if (!(l & TLV_LEN_LONG))
-		return l;
+    if (!(l & TLV_LEN_LONG))
+        return l;
 
-	size_t ll = l &~ TLV_LEN_LONG;
-	if (ll > 5)
-		return TLV_LEN_INVALID;
+    size_t ll = l &~ TLV_LEN_LONG;
+    if (ll > 5)
+        return TLV_LEN_INVALID;
 
-	l = 0;
-	for (int i = 1; i <= ll; i++) {
-		l = (l << 8) + **buf;
-		--*len;
-		++*buf;
-	}
+    l = 0;
+    for (int i = 1; i <= ll; i++) {
+        l = (l << 8) + **buf;
+        --*len;
+        ++*buf;
+    }
 
-	return l;
+    return l;
 }
 
 bool tlv_parse_tl(const unsigned char **buf, size_t *len, struct tlv *tlv)
 {
-	tlv->value = 0;
+    tlv->value = 0;
 
-	tlv->tag = tlv_parse_tag(buf, len);
-	if (tlv->tag == TLV_TAG_INVALID)
-		return false;
+    tlv->tag = tlv_parse_tag(buf, len);
+    if (tlv->tag == TLV_TAG_INVALID)
+        return false;
 
-	tlv->len = tlv_parse_len(buf, len);
-	if (tlv->len == TLV_LEN_INVALID)
-		return false;
+    tlv->len = tlv_parse_len(buf, len);
+    if (tlv->len == TLV_LEN_INVALID)
+        return false;
 
-	return true;
+    return true;
 }
 
 static struct tlvdb *tlvdb_parse_children(struct tlvdb *parent);
 
 static bool tlvdb_parse_one(struct tlvdb *tlvdb,
-		struct tlvdb *parent,
-		const unsigned char **tmp,
-		size_t *left)
+        struct tlvdb *parent,
+        const unsigned char **tmp,
+        size_t *left)
 {
-	tlvdb->next = tlvdb->children = NULL;
-	tlvdb->parent = parent;
+    tlvdb->next = tlvdb->children = NULL;
+    tlvdb->parent = parent;
 
-	tlvdb->tag.tag = tlv_parse_tag(tmp, left);
-	if (tlvdb->tag.tag == TLV_TAG_INVALID)
-		goto err;
+    tlvdb->tag.tag = tlv_parse_tag(tmp, left);
+    if (tlvdb->tag.tag == TLV_TAG_INVALID)
+        goto err;
 
-	tlvdb->tag.len = tlv_parse_len(tmp, left);
-	if (tlvdb->tag.len == TLV_LEN_INVALID)
-		goto err;
+    tlvdb->tag.len = tlv_parse_len(tmp, left);
+    if (tlvdb->tag.len == TLV_LEN_INVALID)
+        goto err;
 
-	if (tlvdb->tag.len > *left)
-		goto err;
+    if (tlvdb->tag.len > *left)
+        goto err;
 
-	tlvdb->tag.value = *tmp;
+    tlvdb->tag.value = *tmp;
 
-	*tmp += tlvdb->tag.len;
-	*left -= tlvdb->tag.len;
+    *tmp += tlvdb->tag.len;
+    *left -= tlvdb->tag.len;
 
-	if (tlv_is_constructed(&tlvdb->tag) && (tlvdb->tag.len != 0)) {
-		tlvdb->children = tlvdb_parse_children(tlvdb);
-		if (!tlvdb->children)
-			goto err;
-	} else {
-		tlvdb->children = NULL;
-	}
+    if (tlv_is_constructed(&tlvdb->tag) && (tlvdb->tag.len != 0)) {
+        tlvdb->children = tlvdb_parse_children(tlvdb);
+        if (!tlvdb->children)
+            goto err;
+    } else {
+        tlvdb->children = NULL;
+    }
 
-	return true;
+    return true;
 
 err:
-	return false;
+    return false;
 }
 
 static struct tlvdb *tlvdb_parse_children(struct tlvdb *parent)
 {
-	const unsigned char *tmp = parent->tag.value;
-	size_t left = parent->tag.len;
-	struct tlvdb *tlvdb, *first = NULL, *prev = NULL;
+    const unsigned char *tmp = parent->tag.value;
+    size_t left = parent->tag.len;
+    struct tlvdb *tlvdb, *first = NULL, *prev = NULL;
 
-	while (left != 0) {
-		tlvdb = malloc(sizeof(*tlvdb));
-		if (prev)
-			prev->next = tlvdb;
-		else
-			first = tlvdb;
-		prev = tlvdb;
+    while (left != 0) {
+        tlvdb = malloc(sizeof(*tlvdb));
+        if (prev)
+            prev->next = tlvdb;
+        else
+            first = tlvdb;
+        prev = tlvdb;
 
-		if (!tlvdb_parse_one(tlvdb, parent, &tmp, &left))
-			goto err;
+        if (!tlvdb_parse_one(tlvdb, parent, &tmp, &left))
+            goto err;
 
-		tlvdb->parent = parent;
-	}
+        tlvdb->parent = parent;
+    }
 
-	return first;
+    return first;
 
 err:
-	tlvdb_free(first);
+    tlvdb_free(first);
 
-	return NULL;
+    return NULL;
 }
 
 struct tlvdb *tlvdb_parse(const unsigned char *buf, size_t len)
 {
-	struct tlvdb_root *root;
-	const unsigned char *tmp;
-	size_t left;
+    struct tlvdb_root *root;
+    const unsigned char *tmp;
+    size_t left;
 
-	if (!len || !buf)
-		return NULL;
+    if (!len || !buf)
+        return NULL;
 
-	root = malloc(sizeof(*root) + len);
-	root->len = len;
-	memcpy(root->buf, buf, len);
+    root = malloc(sizeof(*root) + len);
+    root->len = len;
+    memcpy(root->buf, buf, len);
 
-	tmp = root->buf;
-	left = len;
+    tmp = root->buf;
+    left = len;
 
-	if (!tlvdb_parse_one(&root->db, NULL, &tmp, &left))
-		goto err;
+    if (!tlvdb_parse_one(&root->db, NULL, &tmp, &left))
+        goto err;
 
-	if (left)
-		goto err;
+    if (left)
+        goto err;
 
-	return &root->db;
+    return &root->db;
 
 err:
-	tlvdb_free(&root->db);
+    tlvdb_free(&root->db);
 
-	return NULL;
+    return NULL;
 }
 
 struct tlvdb *tlvdb_parse_multi(const unsigned char *buf, size_t len)
 {
-	struct tlvdb_root *root;
-	const unsigned char *tmp;
-	size_t left;
+    struct tlvdb_root *root;
+    const unsigned char *tmp;
+    size_t left;
 
-	if (!len || !buf)
-		return NULL;
+    if (!len || !buf)
+        return NULL;
 
-	root = malloc(sizeof(*root) + len);
-	root->len = len;
-	memcpy(root->buf, buf, len);
+    root = malloc(sizeof(*root) + len);
+    root->len = len;
+    memcpy(root->buf, buf, len);
 
-	tmp = root->buf;
-	left = len;
+    tmp = root->buf;
+    left = len;
 
-	if (!tlvdb_parse_one(&root->db, NULL, &tmp, &left))
-		goto err;
+    if (!tlvdb_parse_one(&root->db, NULL, &tmp, &left))
+        goto err;
 
-	while (left != 0) {
-		struct tlvdb *db = malloc(sizeof(*db));
-		if (!tlvdb_parse_one(db, NULL, &tmp, &left)) {
-			free (db);
-			goto err;
-		}
+    while (left != 0) {
+        struct tlvdb *db = malloc(sizeof(*db));
+        if (!tlvdb_parse_one(db, NULL, &tmp, &left)) {
+            free (db);
+            goto err;
+        }
 
-		tlvdb_add(&root->db, db);
-	}
+        tlvdb_add(&root->db, db);
+    }
 
-	return &root->db;
+    return &root->db;
 
 err:
-	tlvdb_free(&root->db);
+    tlvdb_free(&root->db);
 
-	return NULL;
+    return NULL;
 }
 
 struct tlvdb *tlvdb_fixed(tlv_tag_t tag, size_t len, const unsigned char *value)
 {
-	struct tlvdb_root *root = malloc(sizeof(*root) + len);
+    struct tlvdb_root *root = malloc(sizeof(*root) + len);
 
-	root->len = len;
-	memcpy(root->buf, value, len);
+    root->len = len;
+    memcpy(root->buf, value, len);
 
-	root->db.parent = root->db.next = root->db.children = NULL;
-	root->db.tag.tag = tag;
-	root->db.tag.len = len;
-	root->db.tag.value = root->buf;
+    root->db.parent = root->db.next = root->db.children = NULL;
+    root->db.tag.tag = tag;
+    root->db.tag.len = len;
+    root->db.tag.value = root->buf;
 
-	return &root->db;
+    return &root->db;
 }
 
 struct tlvdb *tlvdb_external(tlv_tag_t tag, size_t len, const unsigned char *value)
 {
-	struct tlvdb_root *root = malloc(sizeof(*root));
+    struct tlvdb_root *root = malloc(sizeof(*root));
 
-	root->len = 0;
+    root->len = 0;
 
-	root->db.parent = root->db.next = root->db.children = NULL;
-	root->db.tag.tag = tag;
-	root->db.tag.len = len;
-	root->db.tag.value = value;
+    root->db.parent = root->db.next = root->db.children = NULL;
+    root->db.tag.tag = tag;
+    root->db.tag.len = len;
+    root->db.tag.value = value;
 
-	return &root->db;
+    return &root->db;
 }
 
 void tlvdb_free(struct tlvdb *tlvdb)
 {
-	struct tlvdb *next = NULL;
+    struct tlvdb *next = NULL;
 
-	if (!tlvdb)
-		return;
+    if (!tlvdb)
+        return;
 
-	for (; tlvdb; tlvdb = next) {
-		next = tlvdb->next;
-		tlvdb_free(tlvdb->children);
-		free(tlvdb);
-	}
+    for (; tlvdb; tlvdb = next) {
+        next = tlvdb->next;
+        tlvdb_free(tlvdb->children);
+        free(tlvdb);
+    }
 }
 
 struct tlvdb *tlvdb_find_next(struct tlvdb *tlvdb, tlv_tag_t tag) {
-	if (!tlvdb)
-		return NULL;
+    if (!tlvdb)
+        return NULL;
 
-	return tlvdb_find(tlvdb->next, tag);
+    return tlvdb_find(tlvdb->next, tag);
 }
 
 struct tlvdb *tlvdb_find(struct tlvdb *tlvdb, tlv_tag_t tag) {
-	if (!tlvdb)
-		return NULL;
+    if (!tlvdb)
+        return NULL;
 
-	for (; tlvdb; tlvdb = tlvdb->next) {
-		if (tlvdb->tag.tag == tag)
-			return tlvdb;
-	}
+    for (; tlvdb; tlvdb = tlvdb->next) {
+        if (tlvdb->tag.tag == tag)
+            return tlvdb;
+    }
 
-	return NULL;
+    return NULL;
 }
 
 struct tlvdb *tlvdb_find_full(struct tlvdb *tlvdb, tlv_tag_t tag) {
-	if (!tlvdb)
-		return NULL;
+    if (!tlvdb)
+        return NULL;
 
-	for (; tlvdb; tlvdb = tlvdb->next) {
-		if (tlvdb->tag.tag == tag)
-			return tlvdb;
+    for (; tlvdb; tlvdb = tlvdb->next) {
+        if (tlvdb->tag.tag == tag)
+            return tlvdb;
 
-		if (tlvdb->children) {
-			struct tlvdb * ch = tlvdb_find_full(tlvdb->children, tag);
-			if (ch)
-				return ch;
-		}
-	}
+        if (tlvdb->children) {
+            struct tlvdb * ch = tlvdb_find_full(tlvdb->children, tag);
+            if (ch)
+                return ch;
+        }
+    }
 
-	return NULL;
+    return NULL;
 }
 
 struct tlvdb *tlvdb_find_path(struct tlvdb *tlvdb, tlv_tag_t tag[]) {
-	int i = 0;
-	struct tlvdb *tnext = tlvdb;
+    int i = 0;
+    struct tlvdb *tnext = tlvdb;
 
-	while (tnext && tag[i]) {
-		tnext = tlvdb_find(tnext, tag[i]);
-		i++;
-		if (tag[i] && tnext) {
-			tnext = tnext->children;
-		}
-	}
+    while (tnext && tag[i]) {
+        tnext = tlvdb_find(tnext, tag[i]);
+        i++;
+        if (tag[i] && tnext) {
+            tnext = tnext->children;
+        }
+    }
 
-	return tnext;
+    return tnext;
 }
 
 void tlvdb_add(struct tlvdb *tlvdb, struct tlvdb *other)
 {
-	if (tlvdb == other)
-		return;
+    if (tlvdb == other)
+        return;
 
-	while (tlvdb->next) {
-		if (tlvdb->next == other)
-			return;
+    while (tlvdb->next) {
+        if (tlvdb->next == other)
+            return;
 
-		tlvdb = tlvdb->next;
-	}
+        tlvdb = tlvdb->next;
+    }
 
-	tlvdb->next = other;
+    tlvdb->next = other;
 }
 
 void tlvdb_change_or_add_node_ex(struct tlvdb *tlvdb, tlv_tag_t tag, size_t len, const unsigned char *value, struct tlvdb **tlvdb_elm)
 {
-	struct tlvdb *telm = tlvdb_find_full(tlvdb, tag);
-	if (telm == NULL) {
-		// new tlv element
-		struct tlvdb *elm = tlvdb_fixed(tag, len, value);
-		tlvdb_add(tlvdb, elm);
-		if (tlvdb_elm)
-			*tlvdb_elm = elm;
-	} else {
-		// the same tlv structure
-		if (telm->tag.tag == tag && telm->tag.len == len && !memcmp(telm->tag.value, value, len))
-			return;
+    struct tlvdb *telm = tlvdb_find_full(tlvdb, tag);
+    if (telm == NULL) {
+        // new tlv element
+        struct tlvdb *elm = tlvdb_fixed(tag, len, value);
+        tlvdb_add(tlvdb, elm);
+        if (tlvdb_elm)
+            *tlvdb_elm = elm;
+    } else {
+        // the same tlv structure
+        if (telm->tag.tag == tag && telm->tag.len == len && !memcmp(telm->tag.value, value, len))
+            return;
 
-		// replace tlv element
-		struct tlvdb *tnewelm = tlvdb_fixed(tag, len, value);
-		tnewelm->next = telm->next;
-		tnewelm->parent = telm->parent;
+        // replace tlv element
+        struct tlvdb *tnewelm = tlvdb_fixed(tag, len, value);
+        tnewelm->next = telm->next;
+        tnewelm->parent = telm->parent;
 
-		// if telm stayed first in children chain
-		if (telm->parent && telm->parent->children == telm) {
-			telm->parent->children = tnewelm;
-		}
+        // if telm stayed first in children chain
+        if (telm->parent && telm->parent->children == telm) {
+            telm->parent->children = tnewelm;
+        }
 
-		// if telm have previous element
-		if (telm != tlvdb) {
-			// elm in root
-			struct tlvdb *celm = tlvdb;
-			// elm in child list of node
-			if (telm->parent && telm->parent->children)
-				celm = telm->parent->children;
+        // if telm have previous element
+        if (telm != tlvdb) {
+            // elm in root
+            struct tlvdb *celm = tlvdb;
+            // elm in child list of node
+            if (telm->parent && telm->parent->children)
+                celm = telm->parent->children;
 
-			// find previous element
-			for (; celm; celm = celm->next) {
-				if (celm->next == telm) {
-					celm->next = tnewelm;
-					break;
-				}
-			}
-		}
+            // find previous element
+            for (; celm; celm = celm->next) {
+                if (celm->next == telm) {
+                    celm->next = tnewelm;
+                    break;
+                }
+            }
+        }
 
-		// free old element with childrens
-		telm->next = NULL;
-		tlvdb_free(telm);
+        // free old element with childrens
+        telm->next = NULL;
+        tlvdb_free(telm);
 
-		if (tlvdb_elm)
-			*tlvdb_elm = tnewelm;
-	}
+        if (tlvdb_elm)
+            *tlvdb_elm = tnewelm;
+    }
 
-	return;
+    return;
 }
 
 void tlvdb_change_or_add_node(struct tlvdb *tlvdb, tlv_tag_t tag, size_t len, const unsigned char *value)
 {
-	tlvdb_change_or_add_node_ex(tlvdb, tag, len, value, NULL);
+    tlvdb_change_or_add_node_ex(tlvdb, tag, len, value, NULL);
 }
 
 void tlvdb_visit(const struct tlvdb *tlvdb, tlv_cb cb, void *data, int level)
 {
-	struct tlvdb *next = NULL;
+    struct tlvdb *next = NULL;
 
-	if (!tlvdb)
-		return;
+    if (!tlvdb)
+        return;
 
-	for (; tlvdb; tlvdb = next) {
-		next = tlvdb->next;
-		cb(data, &tlvdb->tag, level, (tlvdb->children == NULL));
-		tlvdb_visit(tlvdb->children, cb, data, level + 1);
-	}
+    for (; tlvdb; tlvdb = next) {
+        next = tlvdb->next;
+        cb(data, &tlvdb->tag, level, (tlvdb->children == NULL));
+        tlvdb_visit(tlvdb->children, cb, data, level + 1);
+    }
 }
 
 static const struct tlvdb *tlvdb_next(const struct tlvdb *tlvdb)
 {
-	if (tlvdb->children)
-		return tlvdb->children;
+    if (tlvdb->children)
+        return tlvdb->children;
 
-	while (tlvdb) {
-		if (tlvdb->next)
-			return tlvdb->next;
+    while (tlvdb) {
+        if (tlvdb->next)
+            return tlvdb->next;
 
-		tlvdb = tlvdb->parent;
-	}
+        tlvdb = tlvdb->parent;
+    }
 
-	return NULL;
+    return NULL;
 }
 
 const struct tlv *tlvdb_get(const struct tlvdb *tlvdb, tlv_tag_t tag, const struct tlv *prev)
 {
-	if (prev) {
-//		tlvdb = tlvdb_next(container_of(prev, struct tlvdb, tag));
-		tlvdb = tlvdb_next((struct tlvdb *)prev);
-	}
+    if (prev) {
+// tlvdb = tlvdb_next(container_of(prev, struct tlvdb, tag));
+        tlvdb = tlvdb_next((struct tlvdb *)prev);
+    }
 
 
-	while (tlvdb) {
-		if (tlvdb->tag.tag == tag)
-			return &tlvdb->tag;
+    while (tlvdb) {
+        if (tlvdb->tag.tag == tag)
+            return &tlvdb->tag;
 
-		tlvdb = tlvdb_next(tlvdb);
-	}
+        tlvdb = tlvdb_next(tlvdb);
+    }
 
-	return NULL;
+    return NULL;
 }
 
 const struct tlv *tlvdb_get_inchild(const struct tlvdb *tlvdb, tlv_tag_t tag, const struct tlv *prev) {
-	tlvdb = tlvdb->children;
-	return tlvdb_get(tlvdb, tag, prev);
+    tlvdb = tlvdb->children;
+    return tlvdb_get(tlvdb, tag, prev);
 }
 
 const struct tlv *tlvdb_get_tlv(const struct tlvdb *tlvdb) {
-	if (tlvdb)
-		return &tlvdb->tag;
-	else
-		return NULL;
+    if (tlvdb)
+        return &tlvdb->tag;
+    else
+        return NULL;
 }
 
 unsigned char *tlv_encode(const struct tlv *tlv, size_t *len)
 {
-	size_t size = tlv->len;
-	unsigned char *data;
-	size_t pos;
+    size_t size = tlv->len;
+    unsigned char *data;
+    size_t pos;
 
-	if (tlv->tag > 0x100)
-		size += 2;
-	else
-		size += 1;
+    if (tlv->tag > 0x100)
+        size += 2;
+    else
+        size += 1;
 
-	if (tlv->len > 0x7f)
-		size += 2;
-	else
-		size += 1;
+    if (tlv->len > 0x7f)
+        size += 2;
+    else
+        size += 1;
 
-	data = malloc(size);
-	if (!data) {
-		*len = 0;
-		return NULL;
-	}
+    data = malloc(size);
+    if (!data) {
+        *len = 0;
+        return NULL;
+    }
 
-	pos = 0;
+    pos = 0;
 
-	if (tlv->tag > 0x100) {
-		data[pos++] = tlv->tag >> 8;
-		data[pos++] = tlv->tag & 0xff;
-	} else
-		data[pos++] = tlv->tag;
+    if (tlv->tag > 0x100) {
+        data[pos++] = tlv->tag >> 8;
+        data[pos++] = tlv->tag & 0xff;
+    } else
+        data[pos++] = tlv->tag;
 
-	if (tlv->len > 0x7f) {
-		data[pos++] = 0x81;
-		data[pos++] = tlv->len;
-	} else
-		data[pos++] = tlv->len;
+    if (tlv->len > 0x7f) {
+        data[pos++] = 0x81;
+        data[pos++] = tlv->len;
+    } else
+        data[pos++] = tlv->len;
 
-	memcpy(data + pos, tlv->value, tlv->len);
-	pos += tlv->len;
+    memcpy(data + pos, tlv->value, tlv->len);
+    pos += tlv->len;
 
-	*len = pos;
-	return data;
+    *len = pos;
+    return data;
 }
 
 bool tlv_is_constructed(const struct tlv *tlv)
 {
-	return (tlv->tag < 0x100 ? tlv->tag : tlv->tag >> 8) & TLV_TAG_COMPLEX;
+    return (tlv->tag < 0x100 ? tlv->tag : tlv->tag >> 8) & TLV_TAG_COMPLEX;
 }
 
 bool tlv_equal(const struct tlv *a, const struct tlv *b)
 {
-	if (!a && !b)
-		return true;
+    if (!a && !b)
+        return true;
 
-	if (!a || !b)
-		return false;
+    if (!a || !b)
+        return false;
 
-	return a->tag == b->tag && a->len == b->len && !memcmp(a->value, b->value, a->len);
+    return a->tag == b->tag && a->len == b->len && !memcmp(a->value, b->value, a->len);
 }
 
 struct tlvdb *tlvdb_elm_get_next(struct tlvdb *tlvdb)
 {
-	return tlvdb->next;
+    return tlvdb->next;
 }
 
 struct tlvdb *tlvdb_elm_get_children(struct tlvdb *tlvdb)
 {
-	return tlvdb->children;
+    return tlvdb->children;
 }
 
 struct tlvdb *tlvdb_elm_get_parent(struct tlvdb *tlvdb)
 {
-	return tlvdb->parent;
+    return tlvdb->parent;
 }
 
 bool tlvdb_get_uint8(struct tlvdb *tlvRoot, tlv_tag_t tag, uint8_t *value)
 {
-	const struct tlv *tlvelm = tlvdb_get(tlvRoot, tag, NULL);
-	return tlv_get_uint8(tlvelm, value);
+    const struct tlv *tlvelm = tlvdb_get(tlvRoot, tag, NULL);
+    return tlv_get_uint8(tlvelm, value);
 }
 
 bool tlv_get_uint8(const struct tlv *etlv, uint8_t *value)
 {
-	*value = 0;
-	if (etlv)
-	{
-		if (etlv->len == 0)
-			return true;
+    *value = 0;
+    if (etlv)
+    {
+        if (etlv->len == 0)
+            return true;
 
-		if (etlv->len == 1)
-		{
-			*value = etlv->value[0];
-			return true;
-		}
-	}
-	return false;
+        if (etlv->len == 1)
+        {
+            *value = etlv->value[0];
+            return true;
+        }
+    }
+    return false;
 }
 
 bool tlv_get_int(const struct tlv *etlv, int *value)
 {
-	*value = 0;
-	if (etlv)
-	{
-		if (etlv->len == 0)
-			return true;
+    *value = 0;
+    if (etlv)
+    {
+        if (etlv->len == 0)
+            return true;
 
-		if (etlv->len <= 4)
-		{
-			for (int i = 0; i < etlv->len; i++)
-			{
-				*value += etlv->value[i] * (1 << (i * 8));
-			}
-			return true;
-		}
-	}
-	return false;
+        if (etlv->len <= 4)
+        {
+            for (int i = 0; i < etlv->len; i++)
+            {
+                *value += etlv->value[i] * (1 << (i * 8));
+            }
+            return true;
+        }
+    }
+    return false;
 }
diff --git a/client/emv/tlv.h b/client/emv/tlv.h
index 7e171c102..053b31362 100644
--- a/client/emv/tlv.h
+++ b/client/emv/tlv.h
@@ -25,9 +25,9 @@
 typedef uint32_t tlv_tag_t;
 
 struct tlv {
-	tlv_tag_t tag;
-	size_t len;
-	const unsigned char *value;
+    tlv_tag_t tag;
+    size_t len;
+    const unsigned char *value;
 };
 
 struct tlvdb;
diff --git a/client/fido/additional_ca.c b/client/fido/additional_ca.c
index ccda7f251..58bada3fe 100644
--- a/client/fido/additional_ca.c
+++ b/client/fido/additional_ca.c
@@ -12,32 +12,32 @@
 #include "additional_ca.h"
 #include "mbedtls/certs.h"
 
-#define GLOBALSIGN_CA				\
-"-----BEGIN CERTIFICATE-----\r\n"	\
-"MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkG\r\n"	\
-"A1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jv\r\n"	\
-"b3QgQ0ExGzAZBgNVBAMTEkdsb2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAw\r\n"	\
-"MDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9i\r\n"	\
-"YWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYDVQQDExJHbG9iYWxT\r\n"	\
-"aWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDaDuaZ\r\n"	\
-"jc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavp\r\n"	\
-"xy0Sy6scTHAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp\r\n"	\
-"1Wrjsok6Vjk4bwY8iGlbKk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdG\r\n"	\
-"snUOhugZitVtbNV4FpWi6cgKOOvyJBNPc1STE4U6G7weNLWLBYy5d4ux2x8gkasJ\r\n"	\
-"U26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrXgzT/LCrBbBlDSgeF59N8\r\n"	\
-"9iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8E\r\n"	\
-"BTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0B\r\n"	\
-"AQUFAAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOz\r\n"	\
-"yj1hTdNGCbM+w6DjY1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE\r\n"	\
-"38NflNUVyRRBnMRddWQVDf9VMOyGj/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymP\r\n"	\
-"AbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhHhm4qxFYxldBniYUr+WymXUad\r\n"	\
-"DKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveCX4XSQRjbgbME\r\n"	\
-"HMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==\r\n"	\
+#define GLOBALSIGN_CA \
+"-----BEGIN CERTIFICATE-----\r\n" \
+"MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkG\r\n" \
+"A1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jv\r\n" \
+"b3QgQ0ExGzAZBgNVBAMTEkdsb2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAw\r\n" \
+"MDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9i\r\n" \
+"YWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYDVQQDExJHbG9iYWxT\r\n" \
+"aWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDaDuaZ\r\n" \
+"jc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavp\r\n" \
+"xy0Sy6scTHAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp\r\n" \
+"1Wrjsok6Vjk4bwY8iGlbKk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdG\r\n" \
+"snUOhugZitVtbNV4FpWi6cgKOOvyJBNPc1STE4U6G7weNLWLBYy5d4ux2x8gkasJ\r\n" \
+"U26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrXgzT/LCrBbBlDSgeF59N8\r\n" \
+"9iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8E\r\n" \
+"BTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0B\r\n" \
+"AQUFAAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOz\r\n" \
+"yj1hTdNGCbM+w6DjY1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE\r\n" \
+"38NflNUVyRRBnMRddWQVDf9VMOyGj/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymP\r\n" \
+"AbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhHhm4qxFYxldBniYUr+WymXUad\r\n" \
+"DKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveCX4XSQRjbgbME\r\n" \
+"HMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==\r\n" \
 "-----END CERTIFICATE-----\r\n"
 
 // Name: Yubico U2F Root CA Serial 457200631
 // Issued: 2014-08-01
-#define YUBICO_CA	\
+#define YUBICO_CA \
 "-----BEGIN CERTIFICATE-----\r\n" \
 "MIIDHjCCAgagAwIBAgIEG0BT9zANBgkqhkiG9w0BAQsFADAuMSwwKgYDVQQDEyNZ\r\n" \
 "dWJpY28gVTJGIFJvb3QgQ0EgU2VyaWFsIDQ1NzIwMDYzMTAgFw0xNDA4MDEwMDAw\r\n" \
@@ -60,7 +60,7 @@
 
 // Name: SoloKey U2F Root CA Serial 14143382635911888524 (0xc44763928ff4be8c)
 // Issued: 2018-11-11
-#define SOLOKEY_CA	\
+#define SOLOKEY_CA \
 "-----BEGIN CERTIFICATE-----\r\n" \
 "MIIB9DCCAZoCCQDER2OSj/S+jDAKBggqhkjOPQQDAjCBgDELMAkGA1UEBhMCVVMx\r\n" \
 "ETAPBgNVBAgMCE1hcnlsYW5kMRIwEAYDVQQKDAlTb2xvIEtleXMxEDAOBgNVBAsM\r\n" \
diff --git a/client/fido/cbortools.c b/client/fido/cbortools.c
index 8883ac475..7c3573289 100644
--- a/client/fido/cbortools.c
+++ b/client/fido/cbortools.c
@@ -17,475 +17,475 @@
 #include "fidocore.h"
 
 static void indent(int nestingLevel) {
-	while (nestingLevel--)
-		printf("  ");
+    while (nestingLevel--)
+        printf("  ");
 }
 
 static CborError dumpelm(CborValue *it, bool *got_next, int nestingLevel) {
-	CborError err;
-	*got_next = false;
+    CborError err;
+    *got_next = false;
 
-	CborType type = cbor_value_get_type(it);
-	indent(nestingLevel);
-	switch (type) {
-	case CborMapType:
-	case CborArrayType: {
-		printf(type == CborArrayType ? "Array[" : "Map[");
-		break;
-	}
+    CborType type = cbor_value_get_type(it);
+    indent(nestingLevel);
+    switch (type) {
+    case CborMapType:
+    case CborArrayType: {
+        printf(type == CborArrayType ? "Array[" : "Map[");
+        break;
+    }
 
-	case CborIntegerType: {
-		int64_t val;
-		cbor_value_get_int64(it, &val);     // can't fail
-		printf("%lld", (long long)val);
-		break;
-	}
+    case CborIntegerType: {
+        int64_t val;
+        cbor_value_get_int64(it, &val);     // can't fail
+        printf("%lld", (long long)val);
+        break;
+    }
 
-	case CborByteStringType: {
-		uint8_t *buf;
-		size_t n;
-		err = cbor_value_dup_byte_string(it, &buf, &n, it);
-		*got_next = true;
-		if (err)
-			return err;     // parse error
-		printf("%s", sprint_hex(buf, n));
-		free(buf);
-		break;
-	}
+    case CborByteStringType: {
+        uint8_t *buf;
+        size_t n;
+        err = cbor_value_dup_byte_string(it, &buf, &n, it);
+        *got_next = true;
+        if (err)
+            return err;     // parse error
+        printf("%s", sprint_hex(buf, n));
+        free(buf);
+        break;
+    }
 
-	case CborTextStringType: {
-		char *buf;
-		size_t n;
-		err = cbor_value_dup_text_string(it, &buf, &n, it);
-		*got_next = true;
-		if (err)
-			return err;     // parse error
-		printf("%s", buf);
-		free(buf);
-		break;
-	}
+    case CborTextStringType: {
+        char *buf;
+        size_t n;
+        err = cbor_value_dup_text_string(it, &buf, &n, it);
+        *got_next = true;
+        if (err)
+            return err;     // parse error
+        printf("%s", buf);
+        free(buf);
+        break;
+    }
 
-	case CborTagType: {
-		CborTag tag;
-		cbor_value_get_tag(it, &tag);
-		printf("Tag(%lld)", (long long)tag);
-		break;
-	}
+    case CborTagType: {
+        CborTag tag;
+        cbor_value_get_tag(it, &tag);
+        printf("Tag(%lld)", (long long)tag);
+        break;
+    }
 
-	case CborSimpleType: {
-		uint8_t type;
-		cbor_value_get_simple_type(it, &type);
-		printf("simple(%u)", type);
-		break;
-	}
+    case CborSimpleType: {
+        uint8_t type;
+        cbor_value_get_simple_type(it, &type);
+        printf("simple(%u)", type);
+        break;
+    }
 
-	case CborNullType:
-		printf("null");
-		break;
+    case CborNullType:
+        printf("null");
+        break;
 
-	case CborUndefinedType:
-		printf("undefined");
-		break;
+    case CborUndefinedType:
+        printf("undefined");
+        break;
 
-	case CborBooleanType: {
-		bool val;
-		cbor_value_get_boolean(it, &val);       // can't fail
-		printf("%s", val ? "true" : "false");
-		break;
-	}
+    case CborBooleanType: {
+        bool val;
+        cbor_value_get_boolean(it, &val);       // can't fail
+        printf("%s", val ? "true" : "false");
+        break;
+    }
 
-	case CborDoubleType: {
-		double val;
-		if (false) {
-			float f;
-	case CborFloatType:
-			cbor_value_get_float(it, &f);
-			val = f;
-		} else {
-			cbor_value_get_double(it, &val);
-		}
-		printf("%g", val);
-		break;
-	}
-	case CborHalfFloatType: {
-		uint16_t val;
-		cbor_value_get_half_float(it, &val);
-		printf("__f16(%04x)", val);
-		break;
-	}
+    case CborDoubleType: {
+        double val;
+        if (false) {
+            float f;
+    case CborFloatType:
+            cbor_value_get_float(it, &f);
+            val = f;
+        } else {
+            cbor_value_get_double(it, &val);
+        }
+        printf("%g", val);
+        break;
+    }
+    case CborHalfFloatType: {
+        uint16_t val;
+        cbor_value_get_half_float(it, &val);
+        printf("__f16(%04x)", val);
+        break;
+    }
 
-	case CborInvalidType:
-		printf("CborInvalidType!!!");
-		break;
-	}
+    case CborInvalidType:
+        printf("CborInvalidType!!!");
+        break;
+    }
 
-	return CborNoError;
+    return CborNoError;
 }
 
 static CborError dumprecursive(uint8_t cmdCode, bool isResponse, CborValue *it, bool isMapType, int nestingLevel) {
-	int elmCount = 0;
-	while (!cbor_value_at_end(it)) {
-		CborError err;
-		CborType type = cbor_value_get_type(it);
+    int elmCount = 0;
+    while (!cbor_value_at_end(it)) {
+        CborError err;
+        CborType type = cbor_value_get_type(it);
 //printf("^%x^", type);
-		bool got_next;
+        bool got_next;
 
-		switch (type) {
-		case CborMapType:
-		case CborArrayType: {
-			// recursive type
-			CborValue recursed;
-			assert(cbor_value_is_container(it));
-			if (!(isMapType && (elmCount % 2)))
-				indent(nestingLevel);
-			printf(type == CborArrayType ? "Array[\n" : "Map[\n");
-			err = cbor_value_enter_container(it, &recursed);
-			if (err)
-				return err;       // parse error
-			err = dumprecursive(cmdCode, isResponse, &recursed, (type == CborMapType), nestingLevel + 1);
-			if (err)
-				return err;       // parse error
-			err = cbor_value_leave_container(it, &recursed);
-			if (err)
-				return err;       // parse error
-			indent(nestingLevel);
-			printf("]");
-			got_next = true;
-			break;
-		}
+        switch (type) {
+        case CborMapType:
+        case CborArrayType: {
+            // recursive type
+            CborValue recursed;
+            assert(cbor_value_is_container(it));
+            if (!(isMapType && (elmCount % 2)))
+                indent(nestingLevel);
+            printf(type == CborArrayType ? "Array[\n" : "Map[\n");
+            err = cbor_value_enter_container(it, &recursed);
+            if (err)
+                return err;       // parse error
+            err = dumprecursive(cmdCode, isResponse, &recursed, (type == CborMapType), nestingLevel + 1);
+            if (err)
+                return err;       // parse error
+            err = cbor_value_leave_container(it, &recursed);
+            if (err)
+                return err;       // parse error
+            indent(nestingLevel);
+            printf("]");
+            got_next = true;
+            break;
+        }
 
-		default: {
-			err = dumpelm(it, &got_next, (isMapType && (elmCount % 2)) ? 0 : nestingLevel);
-			if (err)
-				return err;
-			if (cmdCode > 0 && nestingLevel == 1 && isMapType && !(elmCount % 2)) {
-				int64_t val;
-				cbor_value_get_int64(it, &val);
-				char *desc = fido2GetCmdMemberDescription(cmdCode, isResponse, val);
-				if (desc)
-					printf(" (%s)", desc);
-			}
-			break;
-		}
-		}
+        default: {
+            err = dumpelm(it, &got_next, (isMapType && (elmCount % 2)) ? 0 : nestingLevel);
+            if (err)
+                return err;
+            if (cmdCode > 0 && nestingLevel == 1 && isMapType && !(elmCount % 2)) {
+                int64_t val;
+                cbor_value_get_int64(it, &val);
+                char *desc = fido2GetCmdMemberDescription(cmdCode, isResponse, val);
+                if (desc)
+                    printf(" (%s)", desc);
+            }
+            break;
+        }
+        }
 
-		if (!got_next) {
-			err = cbor_value_advance_fixed(it);
-			if (err)
-				return err;
-		}
-		if (isMapType && !(elmCount % 2)) {
-			printf(": ");
-		} else {
-			printf("\n");
-		}
-		elmCount++;
-	}
-	return CborNoError;
+        if (!got_next) {
+            err = cbor_value_advance_fixed(it);
+            if (err)
+                return err;
+        }
+        if (isMapType && !(elmCount % 2)) {
+            printf(": ");
+        } else {
+            printf("\n");
+        }
+        elmCount++;
+    }
+    return CborNoError;
 }
 
 int TinyCborInit(uint8_t *data, size_t length, CborValue *cb) {
-	CborParser parser;
-	CborError err = cbor_parser_init(data, length, 0, &parser, cb);
+    CborParser parser;
+    CborError err = cbor_parser_init(data, length, 0, &parser, cb);
     if (err)
-		return err;
+        return err;
 
-	return 0;
+    return 0;
 }
 
 int TinyCborPrintFIDOPackage(uint8_t cmdCode, bool isResponse, uint8_t *data, size_t length) {
-	CborValue cb;
-	int res;
-	res = TinyCborInit(data, length, &cb);
-	if (res)
-		return res;
+    CborValue cb;
+    int res;
+    res = TinyCborInit(data, length, &cb);
+    if (res)
+        return res;
 
     CborError err = dumprecursive(cmdCode, isResponse, &cb, false, 0);
 
-	if (err) {
-		fprintf(stderr,
+    if (err) {
+        fprintf(stderr,
 #if __WORDSIZE == 64
-		"CBOR parsing failure at offset %" PRId64 " : %s\n",
+        "CBOR parsing failure at offset %" PRId64 " : %s\n",
 #else
-		"CBOR parsing failure at offset %" PRId32 " : %s\n",
+        "CBOR parsing failure at offset %" PRId32 " : %s\n",
 #endif
-		cb.ptr - data, cbor_error_string(err));
-		return 1;
-	}
+        cb.ptr - data, cbor_error_string(err));
+        return 1;
+    }
 
-	return 0;
+    return 0;
 }
 
 int JsonObjElmCount(json_t *elm) {
-	int res = 0;
-	const char *key;
-	json_t *value;
+    int res = 0;
+    const char *key;
+    json_t *value;
 
-	if (!json_is_object(elm))
-		return 0;
+    if (!json_is_object(elm))
+        return 0;
 
-	json_object_foreach(elm, key, value) {
-		if (strlen(key) > 0 && key[0] != '.')
-			res++;
-	}
+    json_object_foreach(elm, key, value) {
+        if (strlen(key) > 0 && key[0] != '.')
+            res++;
+    }
 
-	return res;
+    return res;
 }
 
 int JsonToCbor(json_t *elm, CborEncoder *encoder) {
-	if (!elm || !encoder)
-		return 1;
+    if (!elm || !encoder)
+        return 1;
 
-	int res;
+    int res;
 
-	// CBOR map == JSON object
-	if (json_is_object(elm)) {
-		CborEncoder map;
-		const char *key;
-		json_t *value;
+    // CBOR map == JSON object
+    if (json_is_object(elm)) {
+        CborEncoder map;
+        const char *key;
+        json_t *value;
 
-		res = cbor_encoder_create_map(encoder, &map, JsonObjElmCount(elm));
-		cbor_check(res);
+        res = cbor_encoder_create_map(encoder, &map, JsonObjElmCount(elm));
+        cbor_check(res);
 
-		json_object_foreach(elm, key, value) {
-			if (strlen(key) > 0 && key[0] != '.') {
-				res = cbor_encode_text_stringz(&map, key);
-				cbor_check(res);
+        json_object_foreach(elm, key, value) {
+            if (strlen(key) > 0 && key[0] != '.') {
+                res = cbor_encode_text_stringz(&map, key);
+                cbor_check(res);
 
-				// RECURSION!
-				JsonToCbor(value, &map);
-			}
-		}
+                // RECURSION!
+                JsonToCbor(value, &map);
+            }
+        }
 
-		res = cbor_encoder_close_container(encoder, &map);
-		cbor_check(res);
-	}
+        res = cbor_encoder_close_container(encoder, &map);
+        cbor_check(res);
+    }
 
-	// CBOR array == JSON array
-	if (json_is_array(elm)) {
-		size_t index;
-		json_t *value;
-		CborEncoder array;
+    // CBOR array == JSON array
+    if (json_is_array(elm)) {
+        size_t index;
+        json_t *value;
+        CborEncoder array;
 
-		res = cbor_encoder_create_array(encoder, &array, json_array_size(elm));
-		cbor_check(res);
+        res = cbor_encoder_create_array(encoder, &array, json_array_size(elm));
+        cbor_check(res);
 
-		json_array_foreach(elm, index, value) {
-			// RECURSION!
-			JsonToCbor(value, &array);
-		}
+        json_array_foreach(elm, index, value) {
+            // RECURSION!
+            JsonToCbor(value, &array);
+        }
 
-		res = cbor_encoder_close_container(encoder, &array);
-		cbor_check(res);
-	}
+        res = cbor_encoder_close_container(encoder, &array);
+        cbor_check(res);
+    }
 
-	if (json_is_boolean(elm)) {
-		res = cbor_encode_boolean(encoder, json_is_true(elm));
-		cbor_check(res);
-	}
+    if (json_is_boolean(elm)) {
+        res = cbor_encode_boolean(encoder, json_is_true(elm));
+        cbor_check(res);
+    }
 
-	if (json_is_integer(elm)) {
-		res = cbor_encode_int(encoder, json_integer_value(elm));
-		cbor_check(res);
-	}
+    if (json_is_integer(elm)) {
+        res = cbor_encode_int(encoder, json_integer_value(elm));
+        cbor_check(res);
+    }
 
-	if (json_is_real(elm)) {
-		res = cbor_encode_float(encoder, json_real_value(elm));
-		cbor_check(res);
-	}
+    if (json_is_real(elm)) {
+        res = cbor_encode_float(encoder, json_real_value(elm));
+        cbor_check(res);
+    }
 
-	if (json_is_string(elm)) {
-		const char * val = json_string_value(elm);
-		if (CheckStringIsHEXValue(val)) {
-			size_t datalen = 0;
-			uint8_t data[4096] = {0};
-			res = JsonLoadBufAsHex(elm, "$", data, sizeof(data), &datalen);
-			if (res)
-				return 100;
+    if (json_is_string(elm)) {
+        const char * val = json_string_value(elm);
+        if (CheckStringIsHEXValue(val)) {
+            size_t datalen = 0;
+            uint8_t data[4096] = {0};
+            res = JsonLoadBufAsHex(elm, "$", data, sizeof(data), &datalen);
+            if (res)
+                return 100;
 
-			res = cbor_encode_byte_string(encoder, data, datalen);
-			cbor_check(res);
-		} else {
-			res = cbor_encode_text_stringz(encoder, val);
-			cbor_check(res);
-		}
-	}
+            res = cbor_encode_byte_string(encoder, data, datalen);
+            cbor_check(res);
+        } else {
+            res = cbor_encode_text_stringz(encoder, val);
+            cbor_check(res);
+        }
+    }
 
 
 
-	return 0;
+    return 0;
 }
 
 int CborMapGetKeyById(CborParser *parser, CborValue *map, uint8_t *data, size_t dataLen, int key) {
-	CborValue cb;
+    CborValue cb;
 
-	CborError err = cbor_parser_init(data, dataLen, 0, parser, &cb);
-	cbor_check(err);
+    CborError err = cbor_parser_init(data, dataLen, 0, parser, &cb);
+    cbor_check(err);
 
-	if (cbor_value_get_type(&cb) != CborMapType)
-		return 1;
+    if (cbor_value_get_type(&cb) != CborMapType)
+        return 1;
 
-	err = cbor_value_enter_container(&cb, map);
-	cbor_check(err);
+    err = cbor_value_enter_container(&cb, map);
+    cbor_check(err);
 
-	int64_t indx;
-	while (!cbor_value_at_end(map)) {
-		// check number
-		if (cbor_value_get_type(map) != CborIntegerType)
-			return 1;
+    int64_t indx;
+    while (!cbor_value_at_end(map)) {
+        // check number
+        if (cbor_value_get_type(map) != CborIntegerType)
+            return 1;
 
-		cbor_value_get_int64(map, &indx);
+        cbor_value_get_int64(map, &indx);
 
-		err = cbor_value_advance(map);
-		cbor_check(err);
+        err = cbor_value_advance(map);
+        cbor_check(err);
 
-		if (indx == key)
-			return 0;
+        if (indx == key)
+            return 0;
 
-		// pass value
-		err = cbor_value_advance(map);
-		cbor_check(err);
-	}
+        // pass value
+        err = cbor_value_advance(map);
+        cbor_check(err);
+    }
 
-	err = cbor_value_leave_container(&cb, map);
-	cbor_check(err);
+    err = cbor_value_leave_container(&cb, map);
+    cbor_check(err);
 
-	return 2;
+    return 2;
 }
 
 CborError CborGetArrayBinStringValue(CborValue *elm, uint8_t *data, size_t maxdatalen, size_t *datalen) {
-	return CborGetArrayBinStringValueEx(elm, data, maxdatalen, datalen, NULL, 0);
+    return CborGetArrayBinStringValueEx(elm, data, maxdatalen, datalen, NULL, 0);
 }
 
 CborError CborGetArrayBinStringValueEx(CborValue *elm, uint8_t *data, size_t maxdatalen, size_t *datalen, uint8_t *delimeter, size_t delimeterlen) {
-	CborValue array;
-	if (datalen)
-		*datalen = 0;
+    CborValue array;
+    if (datalen)
+        *datalen = 0;
 
-	size_t slen = maxdatalen;
-	size_t totallen = 0;
+    size_t slen = maxdatalen;
+    size_t totallen = 0;
 
-	CborError res = cbor_value_enter_container(elm, &array);
-	cbor_check(res);
+    CborError res = cbor_value_enter_container(elm, &array);
+    cbor_check(res);
 
-	while (!cbor_value_at_end(&array)) {
-		res = cbor_value_copy_byte_string(&array, &data[totallen], &slen, &array);
-		cbor_check(res);
+    while (!cbor_value_at_end(&array)) {
+        res = cbor_value_copy_byte_string(&array, &data[totallen], &slen, &array);
+        cbor_check(res);
 
-		totallen += slen;
-		if (delimeter) {
-			memcpy(&data[totallen], delimeter, delimeterlen);
-			totallen += delimeterlen;
-		}
-		slen = maxdatalen - totallen;
-	}
+        totallen += slen;
+        if (delimeter) {
+            memcpy(&data[totallen], delimeter, delimeterlen);
+            totallen += delimeterlen;
+        }
+        slen = maxdatalen - totallen;
+    }
 
-	res = cbor_value_leave_container(elm, &array);
-	cbor_check(res);
+    res = cbor_value_leave_container(elm, &array);
+    cbor_check(res);
 
-	if (datalen)
-		*datalen = totallen;
+    if (datalen)
+        *datalen = totallen;
 
-	return CborNoError;
+    return CborNoError;
 };
 
 CborError CborGetBinStringValue(CborValue *elm, uint8_t *data, size_t maxdatalen, size_t *datalen) {
-	if (datalen)
-		*datalen = 0;
+    if (datalen)
+        *datalen = 0;
 
-	size_t slen = maxdatalen;
+    size_t slen = maxdatalen;
 
-	CborError res = cbor_value_copy_byte_string(elm, data, &slen, elm);
-	cbor_check(res);
+    CborError res = cbor_value_copy_byte_string(elm, data, &slen, elm);
+    cbor_check(res);
 
-	if (datalen)
-		*datalen = slen;
+    if (datalen)
+        *datalen = slen;
 
-	return CborNoError;
+    return CborNoError;
 };
 
 CborError CborGetArrayStringValue(CborValue *elm, char *data, size_t maxdatalen, size_t *datalen, char *delimeter) {
-	CborValue array;
-	if (datalen)
-		*datalen = 0;
+    CborValue array;
+    if (datalen)
+        *datalen = 0;
 
-	size_t slen = maxdatalen;
-	size_t totallen = 0;
+    size_t slen = maxdatalen;
+    size_t totallen = 0;
 
-	CborError res = cbor_value_enter_container(elm, &array);
-	cbor_check(res);
+    CborError res = cbor_value_enter_container(elm, &array);
+    cbor_check(res);
 
-	while (!cbor_value_at_end(&array)) {
-		res = cbor_value_copy_text_string(&array, &data[totallen], &slen, &array);
-		cbor_check(res);
+    while (!cbor_value_at_end(&array)) {
+        res = cbor_value_copy_text_string(&array, &data[totallen], &slen, &array);
+        cbor_check(res);
 
-		totallen += slen;
-		if (delimeter) {
-			strcat(data, delimeter);
-			totallen += strlen(delimeter);
-		}
-		slen = maxdatalen - totallen;
-		data[totallen] = 0x00;
-	}
+        totallen += slen;
+        if (delimeter) {
+            strcat(data, delimeter);
+            totallen += strlen(delimeter);
+        }
+        slen = maxdatalen - totallen;
+        data[totallen] = 0x00;
+    }
 
-	res = cbor_value_leave_container(elm, &array);
-	cbor_check(res);
+    res = cbor_value_leave_container(elm, &array);
+    cbor_check(res);
 
-	if (datalen)
-		*datalen = totallen;
+    if (datalen)
+        *datalen = totallen;
 
-	return CborNoError;
+    return CborNoError;
 };
 
 CborError CborGetStringValue(CborValue *elm, char *data, size_t maxdatalen, size_t *datalen) {
-	if (datalen)
-		*datalen = 0;
+    if (datalen)
+        *datalen = 0;
 
-	size_t slen = maxdatalen;
+    size_t slen = maxdatalen;
 
-	CborError res = cbor_value_copy_text_string(elm, data, &slen, elm);
-	cbor_check(res);
+    CborError res = cbor_value_copy_text_string(elm, data, &slen, elm);
+    cbor_check(res);
 
-	if (datalen)
-		*datalen = slen;
+    if (datalen)
+        *datalen = slen;
 
-	return CborNoError;
+    return CborNoError;
 };
 
 CborError CborGetStringValueBuf(CborValue *elm) {
-	static char stringBuf[2048];
-	memset(stringBuf, 0x00, sizeof(stringBuf));
+    static char stringBuf[2048];
+    memset(stringBuf, 0x00, sizeof(stringBuf));
 
-	return CborGetStringValue(elm, stringBuf, sizeof(stringBuf), NULL);
+    return CborGetStringValue(elm, stringBuf, sizeof(stringBuf), NULL);
 };
 
 int CBOREncodeElm(json_t *root, char *rootElmId, CborEncoder *encoder) {
-	json_t *elm = NULL;
-	if (rootElmId && strlen(rootElmId) && rootElmId[0] == '$')
-		elm = json_path_get(root, rootElmId);
-	else
-		elm = json_object_get(root, rootElmId);
+    json_t *elm = NULL;
+    if (rootElmId && strlen(rootElmId) && rootElmId[0] == '$')
+        elm = json_path_get(root, rootElmId);
+    else
+        elm = json_object_get(root, rootElmId);
 
-	if (!elm)
-		return 1;
+    if (!elm)
+        return 1;
 
-	int res = JsonToCbor(elm, encoder);
+    int res = JsonToCbor(elm, encoder);
 
-	return res;
+    return res;
 }
 
 CborError CBOREncodeClientDataHash(json_t *root, CborEncoder *encoder) {
-	uint8_t buf[100] = {0};
-	size_t jlen;
+    uint8_t buf[100] = {0};
+    size_t jlen;
 
-	JsonLoadBufAsHex(root, "$.ClientDataHash", buf, sizeof(buf), &jlen);
+    JsonLoadBufAsHex(root, "$.ClientDataHash", buf, sizeof(buf), &jlen);
 
-	// fill with 0x00 if not found
-	if (!jlen)
-		jlen = 32;
+    // fill with 0x00 if not found
+    if (!jlen)
+        jlen = 32;
 
-	int res = cbor_encode_byte_string(encoder, buf, jlen);
-	cbor_check(res);
+    int res = cbor_encode_byte_string(encoder, buf, jlen);
+    cbor_check(res);
 
-	return 0;
+    return 0;
 }
diff --git a/client/fido/cose.c b/client/fido/cose.c
index 86c016314..81cf1f974 100644
--- a/client/fido/cose.c
+++ b/client/fido/cose.c
@@ -18,222 +18,222 @@
 static const char COSEEmptyStr[] = "";
 
 typedef struct {
-	int Value;
-	char *Name;
-	char *Description;
+    int Value;
+    char *Name;
+    char *Description;
 } COSEValueNameDesc_t;
 
 typedef struct {
-	int Value;
-	char *Type;
-	char *Name;
-	char *Description;
+    int Value;
+    char *Type;
+    char *Name;
+    char *Description;
 } COSEValueTypeNameDesc_t;
 
 // kty - Key Type Values
 COSEValueNameDesc_t COSEKeyTypeValueDesc[] = {
-	{0, "Reserved",  "Reserved"},
-	{1, "OKP",       "Octet Key Pair"},
-	{2, "EC2",       "Elliptic Curve Key w/ x- and y-coordinate pair"},
-	{4, "Symmetric", "Symmetric Key"},
+    {0, "Reserved",  "Reserved"},
+    {1, "OKP",       "Octet Key Pair"},
+    {2, "EC2",       "Elliptic Curve Key w/ x- and y-coordinate pair"},
+    {4, "Symmetric", "Symmetric Key"},
 };
 
 COSEValueNameDesc_t *GetCOSEktyElm(int id) {
-	for (int i = 0; i < ARRAYLEN(COSEKeyTypeValueDesc); i++)
-		if (COSEKeyTypeValueDesc[i].Value == id)
-			return &COSEKeyTypeValueDesc[i];
-	return NULL;
+    for (int i = 0; i < ARRAYLEN(COSEKeyTypeValueDesc); i++)
+        if (COSEKeyTypeValueDesc[i].Value == id)
+            return &COSEKeyTypeValueDesc[i];
+    return NULL;
 }
 
 const char *GetCOSEktyDescription(int id) {
-	COSEValueNameDesc_t *elm = GetCOSEktyElm(id);
-	if (elm)
-		return elm->Description;
-	return COSEEmptyStr;
+    COSEValueNameDesc_t *elm = GetCOSEktyElm(id);
+    if (elm)
+        return elm->Description;
+    return COSEEmptyStr;
 }
 
 // keys
 COSEValueTypeNameDesc_t COSECurvesDesc[] = {
-	{1, "EC2", "P-256",    "NIST P-256 also known as secp256r1"},
-	{2, "EC2", "P-384",    "NIST P-384 also known as secp384r1"},
-	{3, "EC2", "P-521",    "NIST P-521 also known as secp521r1"},
-	{4, "OKP", "X25519",   "X25519 for use w/ ECDH only"},
-	{5, "OKP", "X448",     "X448 for use w/ ECDH only"},
-	{6, "OKP", "Ed25519",  "Ed25519 for use w/ EdDSA only"},
-	{7, "OKP", "Ed448",    "Ed448 for use w/ EdDSA only"},
+    {1, "EC2", "P-256",    "NIST P-256 also known as secp256r1"},
+    {2, "EC2", "P-384",    "NIST P-384 also known as secp384r1"},
+    {3, "EC2", "P-521",    "NIST P-521 also known as secp521r1"},
+    {4, "OKP", "X25519",   "X25519 for use w/ ECDH only"},
+    {5, "OKP", "X448",     "X448 for use w/ ECDH only"},
+    {6, "OKP", "Ed25519",  "Ed25519 for use w/ EdDSA only"},
+    {7, "OKP", "Ed448",    "Ed448 for use w/ EdDSA only"},
 };
 
 COSEValueTypeNameDesc_t *GetCOSECurveElm(int id) {
-	for (int i = 0; i < ARRAYLEN(COSECurvesDesc); i++)
-		if (COSECurvesDesc[i].Value == id)
-			return &COSECurvesDesc[i];
-	return NULL;
+    for (int i = 0; i < ARRAYLEN(COSECurvesDesc); i++)
+        if (COSECurvesDesc[i].Value == id)
+            return &COSECurvesDesc[i];
+    return NULL;
 }
 
 const char *GetCOSECurveDescription(int id) {
-	COSEValueTypeNameDesc_t *elm = GetCOSECurveElm(id);
-	if (elm)
-		return elm->Description;
-	return COSEEmptyStr;
+    COSEValueTypeNameDesc_t *elm = GetCOSECurveElm(id);
+    if (elm)
+        return elm->Description;
+    return COSEEmptyStr;
 }
 
 // RFC8152 https://www.iana.org/assignments/cose/cose.xhtml#algorithms
 COSEValueNameDesc_t COSEAlg[] = {
-	{-65536,	"Unassigned",				"Unassigned"},
-	{-65535,	"RS1", 						"RSASSA-PKCS1-v1_5 w/ SHA-1"},
-	{-259,		"RS512", 					"RSASSA-PKCS1-v1_5 w/ SHA-512"},
-	{-258,		"RS384", 					"RSASSA-PKCS1-v1_5 w/ SHA-384"},
-	{-257,		"RS256", 					"RSASSA-PKCS1-v1_5 w/ SHA-256"},
-	{-42,		"RSAES-OAEP w/ SHA-512",	"RSAES-OAEP w/ SHA-512"},
-	{-41,		"RSAES-OAEP w/ SHA-256",	"RSAES-OAEP w/ SHA-256"},
-	{-40,		"RSAES-OAEP w/ RFC 8017 def param",	"RSAES-OAEP w/ SHA-1"},
-	{-39,		"PS512",					"RSASSA-PSS w/ SHA-512"},
-	{-38,		"PS384",					"RSASSA-PSS w/ SHA-384"},
-	{-37,		"PS256",					"RSASSA-PSS w/ SHA-256"},
-	{-36,		"ES512",					"ECDSA w/ SHA-512"},
-	{-35,		"ES384",					"ECDSA w/ SHA-384"},
-	{-34,		"ECDH-SS + A256KW",			"ECDH SS w/ Concat KDF and AES Key Wrap w/ 256-bit key"},
-	{-33,		"ECDH-SS + A192KW",			"ECDH SS w/ Concat KDF and AES Key Wrap w/ 192-bit key"},
-	{-32,		"ECDH-SS + A128KW",			"ECDH SS w/ Concat KDF and AES Key Wrap w/ 128-bit key"},
-	{-31,		"ECDH-ES + A256KW",			"ECDH ES w/ Concat KDF and AES Key Wrap w/ 256-bit key"},
-	{-30,		"ECDH-ES + A192KW",			"ECDH ES w/ Concat KDF and AES Key Wrap w/ 192-bit key"},
-	{-29,		"ECDH-ES + A128KW",			"ECDH ES w/ Concat KDF and AES Key Wrap w/ 128-bit key"},
-	{-28,		"ECDH-SS + HKDF-512",		"ECDH SS w/ HKDF - generate key directly"},
-	{-27,		"ECDH-SS + HKDF-256",		"ECDH SS w/ HKDF - generate key directly"},
-	{-26,		"ECDH-ES + HKDF-512",		"ECDH ES w/ HKDF - generate key directly"},
-	{-25,		"ECDH-ES + HKDF-256",		"ECDH ES w/ HKDF - generate key directly"},
-	{-13,		"direct+HKDF-AES-256",		"Shared secret w/ AES-MAC 256-bit key"},
-	{-12,		"direct+HKDF-AES-128",		"Shared secret w/ AES-MAC 128-bit key"},
-	{-11,		"direct+HKDF-SHA-512",		"Shared secret w/ HKDF and SHA-512"},
-	{-10,		"direct+HKDF-SHA-256",		"Shared secret w/ HKDF and SHA-256"},
-	{-8,		"EdDSA",					"EdDSA"},
-	{-7,		"ES256",					"ECDSA w/ SHA-256"},
-	{-6,		"direct",					"Direct use of CEK"},
-	{-5,		"A256KW",					"AES Key Wrap w/ 256-bit key"},
-	{-4,		"A192KW",					"AES Key Wrap w/ 192-bit key"},
-	{-3,		"A128KW",					"AES Key Wrap w/ 128-bit key"},
-	{0,			"Reserved",					"Reserved"},
-	{1,			"A128GCM",					"AES-GCM mode w/ 128-bit key, 128-bit tag"},
-	{2,			"A192GCM",					"AES-GCM mode w/ 192-bit key, 128-bit tag"},
-	{3,			"A256GCM",					"AES-GCM mode w/ 256-bit key, 128-bit tag"},
-	{4,			"HMAC 256/64",				"HMAC w/ SHA-256 truncated to 64 bits"},
-	{5,			"HMAC 256/256",				"HMAC w/ SHA-256"},
-	{6,			"HMAC 384/384",				"HMAC w/ SHA-384"},
-	{7,			"HMAC 512/512",				"HMAC w/ SHA-512"},
-	{10,		"AES-CCM-16-64-128",		"AES-CCM mode 128-bit key, 64-bit tag, 13-byte nonce"},
-	{11,		"AES-CCM-16-64-256",		"AES-CCM mode 256-bit key, 64-bit tag, 13-byte nonce"},
-	{12,		"AES-CCM-64-64-128",		"AES-CCM mode 128-bit key, 64-bit tag, 7-byte nonce"},
-	{13,		"AES-CCM-64-64-256",		"AES-CCM mode 256-bit key, 64-bit tag, 7-byte nonce"},
-	{14,		"AES-MAC 128/64",			"AES-MAC 128-bit key, 64-bit tag"},
-	{15,		"AES-MAC 256/64",			"AES-MAC 256-bit key, 64-bit tag"},
-	{24,		"ChaCha20/Poly1305",		"ChaCha20/Poly1305 w/ 256-bit key, 128-bit tag"},
-	{25,		"AES-MAC 128/128",			"AES-MAC 128-bit key, 128-bit tag"},
-	{26,		"AES-MAC 256/128",			"AES-MAC 256-bit key, 128-bit tag"},
-	{30,		"AES-CCM-16-128-128",		"AES-CCM mode 128-bit key, 128-bit tag, 13-byte nonce"},
-	{31,		"AES-CCM-16-128-256",		"AES-CCM mode 256-bit key, 128-bit tag, 13-byte nonce"},
-	{32,		"AES-CCM-64-128-128",		"AES-CCM mode 128-bit key, 128-bit tag, 7-byte nonce"},
-	{33,		"AES-CCM-64-128-256",		"AES-CCM mode 256-bit key, 128-bit tag, 7-byte nonce"}
+    {-65536,    "Unassigned",               "Unassigned"},
+    {-65535,    "RS1",                      "RSASSA-PKCS1-v1_5 w/ SHA-1"},
+    {-259,      "RS512",                    "RSASSA-PKCS1-v1_5 w/ SHA-512"},
+    {-258,      "RS384",                    "RSASSA-PKCS1-v1_5 w/ SHA-384"},
+    {-257,      "RS256",                    "RSASSA-PKCS1-v1_5 w/ SHA-256"},
+    {-42,       "RSAES-OAEP w/ SHA-512",    "RSAES-OAEP w/ SHA-512"},
+    {-41,       "RSAES-OAEP w/ SHA-256",    "RSAES-OAEP w/ SHA-256"},
+    {-40,       "RSAES-OAEP w/ RFC 8017 def param",    "RSAES-OAEP w/ SHA-1"},
+    {-39,       "PS512",                    "RSASSA-PSS w/ SHA-512"},
+    {-38,       "PS384",                    "RSASSA-PSS w/ SHA-384"},
+    {-37,       "PS256",                    "RSASSA-PSS w/ SHA-256"},
+    {-36,       "ES512",                    "ECDSA w/ SHA-512"},
+    {-35,       "ES384",                    "ECDSA w/ SHA-384"},
+    {-34,       "ECDH-SS + A256KW",         "ECDH SS w/ Concat KDF and AES Key Wrap w/ 256-bit key"},
+    {-33,       "ECDH-SS + A192KW",         "ECDH SS w/ Concat KDF and AES Key Wrap w/ 192-bit key"},
+    {-32,       "ECDH-SS + A128KW",         "ECDH SS w/ Concat KDF and AES Key Wrap w/ 128-bit key"},
+    {-31,       "ECDH-ES + A256KW",         "ECDH ES w/ Concat KDF and AES Key Wrap w/ 256-bit key"},
+    {-30,       "ECDH-ES + A192KW",         "ECDH ES w/ Concat KDF and AES Key Wrap w/ 192-bit key"},
+    {-29,       "ECDH-ES + A128KW",         "ECDH ES w/ Concat KDF and AES Key Wrap w/ 128-bit key"},
+    {-28,       "ECDH-SS + HKDF-512",       "ECDH SS w/ HKDF - generate key directly"},
+    {-27,       "ECDH-SS + HKDF-256",       "ECDH SS w/ HKDF - generate key directly"},
+    {-26,       "ECDH-ES + HKDF-512",       "ECDH ES w/ HKDF - generate key directly"},
+    {-25,       "ECDH-ES + HKDF-256",       "ECDH ES w/ HKDF - generate key directly"},
+    {-13,       "direct+HKDF-AES-256",      "Shared secret w/ AES-MAC 256-bit key"},
+    {-12,       "direct+HKDF-AES-128",      "Shared secret w/ AES-MAC 128-bit key"},
+    {-11,       "direct+HKDF-SHA-512",      "Shared secret w/ HKDF and SHA-512"},
+    {-10,       "direct+HKDF-SHA-256",      "Shared secret w/ HKDF and SHA-256"},
+    {-8,        "EdDSA",                    "EdDSA"},
+    {-7,        "ES256",                    "ECDSA w/ SHA-256"},
+    {-6,        "direct",                   "Direct use of CEK"},
+    {-5,        "A256KW",                   "AES Key Wrap w/ 256-bit key"},
+    {-4,        "A192KW",                   "AES Key Wrap w/ 192-bit key"},
+    {-3,        "A128KW",                   "AES Key Wrap w/ 128-bit key"},
+    {0,         "Reserved",                 "Reserved"},
+    {1,         "A128GCM",                  "AES-GCM mode w/ 128-bit key, 128-bit tag"},
+    {2,         "A192GCM",                  "AES-GCM mode w/ 192-bit key, 128-bit tag"},
+    {3,         "A256GCM",                  "AES-GCM mode w/ 256-bit key, 128-bit tag"},
+    {4,         "HMAC 256/64",              "HMAC w/ SHA-256 truncated to 64 bits"},
+    {5,         "HMAC 256/256",             "HMAC w/ SHA-256"},
+    {6,         "HMAC 384/384",             "HMAC w/ SHA-384"},
+    {7,         "HMAC 512/512",             "HMAC w/ SHA-512"},
+    {10,        "AES-CCM-16-64-128",        "AES-CCM mode 128-bit key, 64-bit tag, 13-byte nonce"},
+    {11,        "AES-CCM-16-64-256",        "AES-CCM mode 256-bit key, 64-bit tag, 13-byte nonce"},
+    {12,        "AES-CCM-64-64-128",        "AES-CCM mode 128-bit key, 64-bit tag, 7-byte nonce"},
+    {13,        "AES-CCM-64-64-256",        "AES-CCM mode 256-bit key, 64-bit tag, 7-byte nonce"},
+    {14,        "AES-MAC 128/64",           "AES-MAC 128-bit key, 64-bit tag"},
+    {15,        "AES-MAC 256/64",           "AES-MAC 256-bit key, 64-bit tag"},
+    {24,        "ChaCha20/Poly1305",        "ChaCha20/Poly1305 w/ 256-bit key, 128-bit tag"},
+    {25,        "AES-MAC 128/128",          "AES-MAC 128-bit key, 128-bit tag"},
+    {26,        "AES-MAC 256/128",          "AES-MAC 256-bit key, 128-bit tag"},
+    {30,        "AES-CCM-16-128-128",       "AES-CCM mode 128-bit key, 128-bit tag, 13-byte nonce"},
+    {31,        "AES-CCM-16-128-256",       "AES-CCM mode 256-bit key, 128-bit tag, 13-byte nonce"},
+    {32,        "AES-CCM-64-128-128",       "AES-CCM mode 128-bit key, 128-bit tag, 7-byte nonce"},
+    {33,        "AES-CCM-64-128-256",       "AES-CCM mode 256-bit key, 128-bit tag, 7-byte nonce"}
 };
 
 COSEValueNameDesc_t *GetCOSEAlgElm(int id) {
-	for (int i = 0; i < ARRAYLEN(COSEAlg); i++)
-		if (COSEAlg[i].Value == id)
-			return &COSEAlg[i];
-	return NULL;
+    for (int i = 0; i < ARRAYLEN(COSEAlg); i++)
+        if (COSEAlg[i].Value == id)
+            return &COSEAlg[i];
+    return NULL;
 }
 
 const char *GetCOSEAlgName(int id) {
-	COSEValueNameDesc_t *elm = GetCOSEAlgElm(id);
-	if (elm)
-		return elm->Name;
-	return COSEEmptyStr;
+    COSEValueNameDesc_t *elm = GetCOSEAlgElm(id);
+    if (elm)
+        return elm->Name;
+    return COSEEmptyStr;
 }
 
 const char *GetCOSEAlgDescription(int id) {
-	COSEValueNameDesc_t *elm = GetCOSEAlgElm(id);
-	if (elm)
-		return elm->Description;
-	return COSEEmptyStr;
+    COSEValueNameDesc_t *elm = GetCOSEAlgElm(id);
+    if (elm)
+        return elm->Description;
+    return COSEEmptyStr;
 }
 
 int COSEGetECDSAKey(uint8_t *data, size_t datalen, bool verbose, uint8_t *public_key) {
-	CborParser parser;
-	CborValue map;
-	int64_t i64;
-	size_t len;
+    CborParser parser;
+    CborValue map;
+    int64_t i64;
+    size_t len;
 
-	if(verbose)
-		PrintAndLog("----------- CBOR decode ----------------");
+    if(verbose)
+        PrintAndLog("----------- CBOR decode ----------------");
 
-	// kty
-	int res = CborMapGetKeyById(&parser, &map, data, datalen, 1);
-	if(!res) {
-		cbor_value_get_int64(&map, &i64);
-		if(verbose)
-			PrintAndLog("kty [%lld] %s", (long long)i64, GetCOSEktyDescription(i64));
-		if (i64 != 2)
-			PrintAndLog("ERROR: kty must be 2.");
-	}
+    // kty
+    int res = CborMapGetKeyById(&parser, &map, data, datalen, 1);
+    if(!res) {
+        cbor_value_get_int64(&map, &i64);
+        if(verbose)
+            PrintAndLog("kty [%lld] %s", (long long)i64, GetCOSEktyDescription(i64));
+        if (i64 != 2)
+            PrintAndLog("ERROR: kty must be 2.");
+    }
 
-	// algorithm
-	res = CborMapGetKeyById(&parser, &map, data, datalen, 3);
-	if(!res) {
-		cbor_value_get_int64(&map, &i64);
-		if(verbose)
-			PrintAndLog("algorithm [%lld] %s", (long long)i64, GetCOSEAlgDescription(i64));
-		if (i64 != -7)
-			PrintAndLog("ERROR: algorithm must be -7.");
-	}
+    // algorithm
+    res = CborMapGetKeyById(&parser, &map, data, datalen, 3);
+    if(!res) {
+        cbor_value_get_int64(&map, &i64);
+        if(verbose)
+            PrintAndLog("algorithm [%lld] %s", (long long)i64, GetCOSEAlgDescription(i64));
+        if (i64 != -7)
+            PrintAndLog("ERROR: algorithm must be -7.");
+    }
 
-	// curve
-	res = CborMapGetKeyById(&parser, &map, data, datalen, -1);
-	if(!res) {
-		cbor_value_get_int64(&map, &i64);
-		if(verbose)
-			PrintAndLog("curve [%lld] %s", (long long)i64, GetCOSECurveDescription(i64));
-		if (i64 != 1)
-			PrintAndLog("ERROR: curve must be 1.");
-	}
+    // curve
+    res = CborMapGetKeyById(&parser, &map, data, datalen, -1);
+    if(!res) {
+        cbor_value_get_int64(&map, &i64);
+        if(verbose)
+            PrintAndLog("curve [%lld] %s", (long long)i64, GetCOSECurveDescription(i64));
+        if (i64 != 1)
+            PrintAndLog("ERROR: curve must be 1.");
+    }
 
-	// plain key
-	public_key[0] = 0x04;
+    // plain key
+    public_key[0] = 0x04;
 
-	// x - coordinate
-	res = CborMapGetKeyById(&parser, &map, data, datalen, -2);
-	if(!res) {
-		res = CborGetBinStringValue(&map, &public_key[1], 32, &len);
-		cbor_check(res);
-		if(verbose)
-			PrintAndLog("x - coordinate [%d]: %s", len, sprint_hex(&public_key[1], 32));
-		if (len != 32)
-			PrintAndLog("ERROR: x - coordinate length must be 32.");
-	}
+    // x - coordinate
+    res = CborMapGetKeyById(&parser, &map, data, datalen, -2);
+    if(!res) {
+        res = CborGetBinStringValue(&map, &public_key[1], 32, &len);
+        cbor_check(res);
+        if(verbose)
+            PrintAndLog("x - coordinate [%d]: %s", len, sprint_hex(&public_key[1], 32));
+        if (len != 32)
+            PrintAndLog("ERROR: x - coordinate length must be 32.");
+    }
 
-	// y - coordinate
-	res = CborMapGetKeyById(&parser, &map, data, datalen, -3);
-	if(!res) {
-		res = CborGetBinStringValue(&map, &public_key[33], 32, &len);
-		cbor_check(res);
-		if(verbose)
-			PrintAndLog("y - coordinate [%d]: %s", len, sprint_hex(&public_key[33], 32));
-		if (len != 32)
-			PrintAndLog("ERROR: y - coordinate length must be 32.");
-	}
+    // y - coordinate
+    res = CborMapGetKeyById(&parser, &map, data, datalen, -3);
+    if(!res) {
+        res = CborGetBinStringValue(&map, &public_key[33], 32, &len);
+        cbor_check(res);
+        if(verbose)
+            PrintAndLog("y - coordinate [%d]: %s", len, sprint_hex(&public_key[33], 32));
+        if (len != 32)
+            PrintAndLog("ERROR: y - coordinate length must be 32.");
+    }
 
-	// d - private key
-	uint8_t private_key[128] = {0};
-	res = CborMapGetKeyById(&parser, &map, data, datalen, -4);
-	if(!res) {
-		res = CborGetBinStringValue(&map, private_key, sizeof(private_key), &len);
-		cbor_check(res);
-		if(verbose)
-			PrintAndLog("d - private key [%d]: %s", len, sprint_hex(private_key, len));
-	}
+    // d - private key
+    uint8_t private_key[128] = {0};
+    res = CborMapGetKeyById(&parser, &map, data, datalen, -4);
+    if(!res) {
+        res = CborGetBinStringValue(&map, private_key, sizeof(private_key), &len);
+        cbor_check(res);
+        if(verbose)
+            PrintAndLog("d - private key [%d]: %s", len, sprint_hex(private_key, len));
+    }
 
-	if(verbose)
-		PrintAndLog("----------- CBOR decode ----------------");
+    if(verbose)
+        PrintAndLog("----------- CBOR decode ----------------");
 
-	return 0;
+    return 0;
 }
 
 
diff --git a/client/fido/fidocore.c b/client/fido/fidocore.c
index a91a57d8f..a05b362d4 100644
--- a/client/fido/fidocore.c
+++ b/client/fido/fidocore.c
@@ -24,784 +24,784 @@
 #include "fido/cose.h"
 
 typedef struct {
-	uint8_t ErrorCode;
-	char *ShortDescription;
-	char *Description;
+    uint8_t ErrorCode;
+    char *ShortDescription;
+    char *Description;
 } fido2Error_t;
 
 fido2Error_t fido2Errors[] = {
-	{0xFF, "n/a",								"n/a"},
-	{0x00, "CTAP1_ERR_SUCCESS",					"Indicates successful response."},
-	{0x01, "CTAP1_ERR_INVALID_COMMAND",			"The command is not a valid CTAP command."},
-	{0x02, "CTAP1_ERR_INVALID_PARAMETER",		"The command included an invalid parameter."},
-	{0x03, "CTAP1_ERR_INVALID_LENGTH",			"Invalid message or item length."},
-	{0x04, "CTAP1_ERR_INVALID_SEQ",				"Invalid message sequencing."},
-	{0x05, "CTAP1_ERR_TIMEOUT",					"Message timed out."},
-	{0x06, "CTAP1_ERR_CHANNEL_BUSY",			"Channel busy."},
-	{0x0A, "CTAP1_ERR_LOCK_REQUIRED",			"Command requires channel lock."},
-	{0x0B, "CTAP1_ERR_INVALID_CHANNEL",			"Command not allowed on this cid."},
-	{0x10, "CTAP2_ERR_CBOR_PARSING",			"Error while parsing CBOR."},
-	{0x11, "CTAP2_ERR_CBOR_UNEXPECTED_TYPE",	"Invalid/unexpected CBOR error."},
-	{0x12, "CTAP2_ERR_INVALID_CBOR",			"Error when parsing CBOR."},
-	{0x13, "CTAP2_ERR_INVALID_CBOR_TYPE",		"Invalid or unexpected CBOR type."},
-	{0x14, "CTAP2_ERR_MISSING_PARAMETER",		"Missing non-optional parameter."},
-	{0x15, "CTAP2_ERR_LIMIT_EXCEEDED",			"Limit for number of items exceeded."},
-	{0x16, "CTAP2_ERR_UNSUPPORTED_EXTENSION",	"Unsupported extension."},
-	{0x17, "CTAP2_ERR_TOO_MANY_ELEMENTS",		"Limit for number of items exceeded."},
-	{0x18, "CTAP2_ERR_EXTENSION_NOT_SUPPORTED",	"Unsupported extension."},
-	{0x19, "CTAP2_ERR_CREDENTIAL_EXCLUDED",		"Valid credential found in the exludeList."},
-	{0x20, "CTAP2_ERR_CREDENTIAL_NOT_VALID",	"Credential not valid for authenticator."},
-	{0x21, "CTAP2_ERR_PROCESSING",				"Processing (Lengthy operation is in progress)."},
-	{0x22, "CTAP2_ERR_INVALID_CREDENTIAL",		"Credential not valid for the authenticator."},
-	{0x23, "CTAP2_ERR_USER_ACTION_PENDING",		"Authentication is waiting for user interaction."},
-	{0x24, "CTAP2_ERR_OPERATION_PENDING",		"Processing, lengthy operation is in progress."},
-	{0x25, "CTAP2_ERR_NO_OPERATIONS",			"No request is pending."},
-	{0x26, "CTAP2_ERR_UNSUPPORTED_ALGORITHM",	"Authenticator does not support requested algorithm."},
-	{0x27, "CTAP2_ERR_OPERATION_DENIED",		"Not authorized for requested operation."},
-	{0x28, "CTAP2_ERR_KEY_STORE_FULL",			"Internal key storage is full."},
-	{0x29, "CTAP2_ERR_NOT_BUSY",				"Authenticator cannot cancel as it is not busy."},
-	{0x2A, "CTAP2_ERR_NO_OPERATION_PENDING",	"No outstanding operations."},
-	{0x2B, "CTAP2_ERR_UNSUPPORTED_OPTION",		"Unsupported option."},
-	{0x2C, "CTAP2_ERR_INVALID_OPTION",			"Unsupported option."},
-	{0x2D, "CTAP2_ERR_KEEPALIVE_CANCEL",		"Pending keep alive was cancelled."},
-	{0x2E, "CTAP2_ERR_NO_CREDENTIALS",			"No valid credentials provided."},
-	{0x2F, "CTAP2_ERR_USER_ACTION_TIMEOUT",		"Timeout waiting for user interaction."},
-	{0x30, "CTAP2_ERR_NOT_ALLOWED",				"Continuation command, such as, authenticatorGetNextAssertion not allowed."},
-	{0x31, "CTAP2_ERR_PIN_INVALID",				"PIN Blocked."},
-	{0x32, "CTAP2_ERR_PIN_BLOCKED",				"PIN Blocked."},
-	{0x33, "CTAP2_ERR_PIN_AUTH_INVALID",		"PIN authentication,pinAuth, verification failed."},
-	{0x34, "CTAP2_ERR_PIN_AUTH_BLOCKED",		"PIN authentication,pinAuth, blocked. Requires power recycle to reset."},
-	{0x35, "CTAP2_ERR_PIN_NOT_SET",				"No PIN has been set."},
-	{0x36, "CTAP2_ERR_PIN_REQUIRED",			"PIN is required for the selected operation."},
-	{0x37, "CTAP2_ERR_PIN_POLICY_VIOLATION",	"PIN policy violation. Currently only enforces minimum length."},
-	{0x38, "CTAP2_ERR_PIN_TOKEN_EXPIRED",		"pinToken expired on authenticator."},
-	{0x39, "CTAP2_ERR_REQUEST_TOO_LARGE",		"Authenticator cannot handle this request due to memory constraints."},
-	{0x7F, "CTAP1_ERR_OTHER",					"Other unspecified error."},
-	{0xDF, "CTAP2_ERR_SPEC_LAST", 				"CTAP 2 spec last error."},
+    {0xFF, "n/a",                               "n/a"},
+    {0x00, "CTAP1_ERR_SUCCESS",                 "Indicates successful response."},
+    {0x01, "CTAP1_ERR_INVALID_COMMAND",         "The command is not a valid CTAP command."},
+    {0x02, "CTAP1_ERR_INVALID_PARAMETER",       "The command included an invalid parameter."},
+    {0x03, "CTAP1_ERR_INVALID_LENGTH",          "Invalid message or item length."},
+    {0x04, "CTAP1_ERR_INVALID_SEQ",             "Invalid message sequencing."},
+    {0x05, "CTAP1_ERR_TIMEOUT",                 "Message timed out."},
+    {0x06, "CTAP1_ERR_CHANNEL_BUSY",            "Channel busy."},
+    {0x0A, "CTAP1_ERR_LOCK_REQUIRED",           "Command requires channel lock."},
+    {0x0B, "CTAP1_ERR_INVALID_CHANNEL",         "Command not allowed on this cid."},
+    {0x10, "CTAP2_ERR_CBOR_PARSING",            "Error while parsing CBOR."},
+    {0x11, "CTAP2_ERR_CBOR_UNEXPECTED_TYPE",    "Invalid/unexpected CBOR error."},
+    {0x12, "CTAP2_ERR_INVALID_CBOR",            "Error when parsing CBOR."},
+    {0x13, "CTAP2_ERR_INVALID_CBOR_TYPE",       "Invalid or unexpected CBOR type."},
+    {0x14, "CTAP2_ERR_MISSING_PARAMETER",       "Missing non-optional parameter."},
+    {0x15, "CTAP2_ERR_LIMIT_EXCEEDED",          "Limit for number of items exceeded."},
+    {0x16, "CTAP2_ERR_UNSUPPORTED_EXTENSION",   "Unsupported extension."},
+    {0x17, "CTAP2_ERR_TOO_MANY_ELEMENTS",       "Limit for number of items exceeded."},
+    {0x18, "CTAP2_ERR_EXTENSION_NOT_SUPPORTED", "Unsupported extension."},
+    {0x19, "CTAP2_ERR_CREDENTIAL_EXCLUDED",     "Valid credential found in the exludeList."},
+    {0x20, "CTAP2_ERR_CREDENTIAL_NOT_VALID",    "Credential not valid for authenticator."},
+    {0x21, "CTAP2_ERR_PROCESSING",              "Processing (Lengthy operation is in progress)."},
+    {0x22, "CTAP2_ERR_INVALID_CREDENTIAL",      "Credential not valid for the authenticator."},
+    {0x23, "CTAP2_ERR_USER_ACTION_PENDING",     "Authentication is waiting for user interaction."},
+    {0x24, "CTAP2_ERR_OPERATION_PENDING",       "Processing, lengthy operation is in progress."},
+    {0x25, "CTAP2_ERR_NO_OPERATIONS",           "No request is pending."},
+    {0x26, "CTAP2_ERR_UNSUPPORTED_ALGORITHM",   "Authenticator does not support requested algorithm."},
+    {0x27, "CTAP2_ERR_OPERATION_DENIED",        "Not authorized for requested operation."},
+    {0x28, "CTAP2_ERR_KEY_STORE_FULL",          "Internal key storage is full."},
+    {0x29, "CTAP2_ERR_NOT_BUSY",                "Authenticator cannot cancel as it is not busy."},
+    {0x2A, "CTAP2_ERR_NO_OPERATION_PENDING",    "No outstanding operations."},
+    {0x2B, "CTAP2_ERR_UNSUPPORTED_OPTION",      "Unsupported option."},
+    {0x2C, "CTAP2_ERR_INVALID_OPTION",          "Unsupported option."},
+    {0x2D, "CTAP2_ERR_KEEPALIVE_CANCEL",        "Pending keep alive was cancelled."},
+    {0x2E, "CTAP2_ERR_NO_CREDENTIALS",          "No valid credentials provided."},
+    {0x2F, "CTAP2_ERR_USER_ACTION_TIMEOUT",     "Timeout waiting for user interaction."},
+    {0x30, "CTAP2_ERR_NOT_ALLOWED",             "Continuation command, such as, authenticatorGetNextAssertion not allowed."},
+    {0x31, "CTAP2_ERR_PIN_INVALID",             "PIN Blocked."},
+    {0x32, "CTAP2_ERR_PIN_BLOCKED",             "PIN Blocked."},
+    {0x33, "CTAP2_ERR_PIN_AUTH_INVALID",        "PIN authentication,pinAuth, verification failed."},
+    {0x34, "CTAP2_ERR_PIN_AUTH_BLOCKED",        "PIN authentication,pinAuth, blocked. Requires power recycle to reset."},
+    {0x35, "CTAP2_ERR_PIN_NOT_SET",             "No PIN has been set."},
+    {0x36, "CTAP2_ERR_PIN_REQUIRED",            "PIN is required for the selected operation."},
+    {0x37, "CTAP2_ERR_PIN_POLICY_VIOLATION",    "PIN policy violation. Currently only enforces minimum length."},
+    {0x38, "CTAP2_ERR_PIN_TOKEN_EXPIRED",       "pinToken expired on authenticator."},
+    {0x39, "CTAP2_ERR_REQUEST_TOO_LARGE",       "Authenticator cannot handle this request due to memory constraints."},
+    {0x7F, "CTAP1_ERR_OTHER",                   "Other unspecified error."},
+    {0xDF, "CTAP2_ERR_SPEC_LAST",               "CTAP 2 spec last error."},
 };
 
 typedef struct {
-	fido2Commands Command;
-	fido2PacketType PckType;
-	int MemberNumber;
-	char *Description;
+    fido2Commands Command;
+    fido2PacketType PckType;
+    int MemberNumber;
+    char *Description;
 } fido2Desc_t;
 
 fido2Desc_t fido2CmdGetInfoRespDesc[] = {
-	{fido2CmdMakeCredential, 	ptResponse, 0x01, "fmt"},
-	{fido2CmdMakeCredential, 	ptResponse, 0x02, "authData"},
-	{fido2CmdMakeCredential, 	ptResponse, 0x03, "attStmt"},
+    {fido2CmdMakeCredential,    ptResponse, 0x01, "fmt"},
+    {fido2CmdMakeCredential,    ptResponse, 0x02, "authData"},
+    {fido2CmdMakeCredential,    ptResponse, 0x03, "attStmt"},
 
-	{fido2CmdMakeCredential, 	ptQuery,    0x01, "clientDataHash"},
-	{fido2CmdMakeCredential, 	ptQuery,    0x02, "rp"},
-	{fido2CmdMakeCredential, 	ptQuery,    0x03, "user"},
-	{fido2CmdMakeCredential, 	ptQuery,    0x04, "pubKeyCredParams"},
-	{fido2CmdMakeCredential, 	ptQuery,    0x05, "excludeList"},
-	{fido2CmdMakeCredential, 	ptQuery,    0x06, "extensions"},
-	{fido2CmdMakeCredential, 	ptQuery,    0x07, "options"},
-	{fido2CmdMakeCredential, 	ptQuery,    0x08, "pinAuth"},
-	{fido2CmdMakeCredential, 	ptQuery,    0x09, "pinProtocol"},
+    {fido2CmdMakeCredential,    ptQuery,    0x01, "clientDataHash"},
+    {fido2CmdMakeCredential,    ptQuery,    0x02, "rp"},
+    {fido2CmdMakeCredential,    ptQuery,    0x03, "user"},
+    {fido2CmdMakeCredential,    ptQuery,    0x04, "pubKeyCredParams"},
+    {fido2CmdMakeCredential,    ptQuery,    0x05, "excludeList"},
+    {fido2CmdMakeCredential,    ptQuery,    0x06, "extensions"},
+    {fido2CmdMakeCredential,    ptQuery,    0x07, "options"},
+    {fido2CmdMakeCredential,    ptQuery,    0x08, "pinAuth"},
+    {fido2CmdMakeCredential,    ptQuery,    0x09, "pinProtocol"},
 
-	{fido2CmdGetAssertion, 		ptResponse, 0x01, "credential"},
-	{fido2CmdGetAssertion, 		ptResponse, 0x02, "authData"},
-	{fido2CmdGetAssertion, 		ptResponse, 0x03, "signature"},
-	{fido2CmdGetAssertion, 		ptResponse, 0x04, "publicKeyCredentialUserEntity"},
-	{fido2CmdGetAssertion, 		ptResponse, 0x05, "numberOfCredentials"},
+    {fido2CmdGetAssertion,      ptResponse, 0x01, "credential"},
+    {fido2CmdGetAssertion,      ptResponse, 0x02, "authData"},
+    {fido2CmdGetAssertion,      ptResponse, 0x03, "signature"},
+    {fido2CmdGetAssertion,      ptResponse, 0x04, "publicKeyCredentialUserEntity"},
+    {fido2CmdGetAssertion,      ptResponse, 0x05, "numberOfCredentials"},
 
-	{fido2CmdGetAssertion, 		ptQuery,    0x01, "rpId"},
-	{fido2CmdGetAssertion, 		ptQuery,    0x02, "clientDataHash"},
-	{fido2CmdGetAssertion, 		ptQuery,    0x03, "allowList"},
-	{fido2CmdGetAssertion, 		ptQuery,    0x04, "extensions"},
-	{fido2CmdGetAssertion, 		ptQuery,    0x05, "options"},
-	{fido2CmdGetAssertion, 		ptQuery,    0x06, "pinAuth"},
-	{fido2CmdGetAssertion, 		ptQuery,    0x07, "pinProtocol"},
+    {fido2CmdGetAssertion,      ptQuery,    0x01, "rpId"},
+    {fido2CmdGetAssertion,      ptQuery,    0x02, "clientDataHash"},
+    {fido2CmdGetAssertion,      ptQuery,    0x03, "allowList"},
+    {fido2CmdGetAssertion,      ptQuery,    0x04, "extensions"},
+    {fido2CmdGetAssertion,      ptQuery,    0x05, "options"},
+    {fido2CmdGetAssertion,      ptQuery,    0x06, "pinAuth"},
+    {fido2CmdGetAssertion,      ptQuery,    0x07, "pinProtocol"},
 
-	{fido2CmdGetNextAssertion, 	ptResponse, 0x01, "credential"},
-	{fido2CmdGetNextAssertion, 	ptResponse, 0x02, "authData"},
-	{fido2CmdGetNextAssertion, 	ptResponse, 0x03, "signature"},
-	{fido2CmdGetNextAssertion, 	ptResponse, 0x04, "publicKeyCredentialUserEntity"},
+    {fido2CmdGetNextAssertion,  ptResponse, 0x01, "credential"},
+    {fido2CmdGetNextAssertion,  ptResponse, 0x02, "authData"},
+    {fido2CmdGetNextAssertion,  ptResponse, 0x03, "signature"},
+    {fido2CmdGetNextAssertion,  ptResponse, 0x04, "publicKeyCredentialUserEntity"},
 
-	{fido2CmdGetInfo, 			ptResponse, 0x01, "versions"},
-	{fido2CmdGetInfo, 			ptResponse, 0x02, "extensions"},
-	{fido2CmdGetInfo, 			ptResponse, 0x03, "aaguid"},
-	{fido2CmdGetInfo, 			ptResponse, 0x04, "options"},
-	{fido2CmdGetInfo, 			ptResponse, 0x05, "maxMsgSize"},
-	{fido2CmdGetInfo, 			ptResponse, 0x06, "pinProtocols"},
+    {fido2CmdGetInfo,           ptResponse, 0x01, "versions"},
+    {fido2CmdGetInfo,           ptResponse, 0x02, "extensions"},
+    {fido2CmdGetInfo,           ptResponse, 0x03, "aaguid"},
+    {fido2CmdGetInfo,           ptResponse, 0x04, "options"},
+    {fido2CmdGetInfo,           ptResponse, 0x05, "maxMsgSize"},
+    {fido2CmdGetInfo,           ptResponse, 0x06, "pinProtocols"},
 
-	{fido2CmdClientPIN, 		ptResponse, 0x01, "keyAgreement"},
-	{fido2CmdClientPIN, 		ptResponse, 0x02, "pinToken"},
-	{fido2CmdClientPIN, 		ptResponse, 0x03, "retries"},
+    {fido2CmdClientPIN,         ptResponse, 0x01, "keyAgreement"},
+    {fido2CmdClientPIN,         ptResponse, 0x02, "pinToken"},
+    {fido2CmdClientPIN,         ptResponse, 0x03, "retries"},
 
-	{fido2CmdClientPIN, 		ptQuery,    0x01, "pinProtocol"},
-	{fido2CmdClientPIN, 		ptQuery,    0x02, "subCommand"},
-	{fido2CmdClientPIN, 		ptQuery,    0x03, "keyAgreement"},
-	{fido2CmdClientPIN, 		ptQuery,    0x04, "pinAuth"},
-	{fido2CmdClientPIN, 		ptQuery,    0x05, "newPinEnc"},
-	{fido2CmdClientPIN, 		ptQuery,    0x06, "pinHashEnc"},
-	{fido2CmdClientPIN, 		ptQuery,    0x07, "getKeyAgreement"},
-	{fido2CmdClientPIN, 		ptQuery,    0x08, "getRetries"},
+    {fido2CmdClientPIN,         ptQuery,    0x01, "pinProtocol"},
+    {fido2CmdClientPIN,         ptQuery,    0x02, "subCommand"},
+    {fido2CmdClientPIN,         ptQuery,    0x03, "keyAgreement"},
+    {fido2CmdClientPIN,         ptQuery,    0x04, "pinAuth"},
+    {fido2CmdClientPIN,         ptQuery,    0x05, "newPinEnc"},
+    {fido2CmdClientPIN,         ptQuery,    0x06, "pinHashEnc"},
+    {fido2CmdClientPIN,         ptQuery,    0x07, "getKeyAgreement"},
+    {fido2CmdClientPIN,         ptQuery,    0x08, "getRetries"},
 
-	{fido2COSEKey,		 		ptResponse, 0x01, "kty"},
-	{fido2COSEKey,		 		ptResponse, 0x03, "alg"},
-	{fido2COSEKey,		 		ptResponse,   -1, "crv"},
-	{fido2COSEKey,		 		ptResponse,   -2, "x - coordinate"},
-	{fido2COSEKey,		 		ptResponse,   -3, "y - coordinate"},
-	{fido2COSEKey,		 		ptResponse,   -4, "d - private key"},
+    {fido2COSEKey,              ptResponse, 0x01, "kty"},
+    {fido2COSEKey,              ptResponse, 0x03, "alg"},
+    {fido2COSEKey,              ptResponse,   -1, "crv"},
+    {fido2COSEKey,              ptResponse,   -2, "x - coordinate"},
+    {fido2COSEKey,              ptResponse,   -3, "y - coordinate"},
+    {fido2COSEKey,              ptResponse,   -4, "d - private key"},
 };
 
 char *fido2GetCmdErrorDescription(uint8_t errorCode) {
-	for (int i = 0; i < sizeof(fido2Errors) / sizeof(fido2Error_t); i++)
-		if (fido2Errors[i].ErrorCode == errorCode)
-			return fido2Errors[i].Description;
+    for (int i = 0; i < sizeof(fido2Errors) / sizeof(fido2Error_t); i++)
+        if (fido2Errors[i].ErrorCode == errorCode)
+            return fido2Errors[i].Description;
 
-	return fido2Errors[0].Description;
+    return fido2Errors[0].Description;
 }
 
 char *fido2GetCmdMemberDescription(uint8_t cmdCode, bool isResponse, int memberNum) {
-	for (int i = 0; i < sizeof(fido2CmdGetInfoRespDesc) / sizeof(fido2Desc_t); i++)
-		if (fido2CmdGetInfoRespDesc[i].Command == cmdCode &&
-			fido2CmdGetInfoRespDesc[i].PckType == (isResponse ? ptResponse : ptQuery) &&
-			fido2CmdGetInfoRespDesc[i].MemberNumber == memberNum )
-			return fido2CmdGetInfoRespDesc[i].Description;
+    for (int i = 0; i < sizeof(fido2CmdGetInfoRespDesc) / sizeof(fido2Desc_t); i++)
+        if (fido2CmdGetInfoRespDesc[i].Command == cmdCode &&
+            fido2CmdGetInfoRespDesc[i].PckType == (isResponse ? ptResponse : ptQuery) &&
+            fido2CmdGetInfoRespDesc[i].MemberNumber == memberNum )
+            return fido2CmdGetInfoRespDesc[i].Description;
 
-	return NULL;
+    return NULL;
 }
 
 int FIDOSelect(bool ActivateField, bool LeaveFieldON, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
-	uint8_t data[] = {0xA0, 0x00, 0x00, 0x06, 0x47, 0x2F, 0x00, 0x01};
+    uint8_t data[] = {0xA0, 0x00, 0x00, 0x06, 0x47, 0x2F, 0x00, 0x01};
 
-	return EMVSelect(ECC_CONTACTLESS, ActivateField, LeaveFieldON, data, sizeof(data), Result, MaxResultLen, ResultLen, sw, NULL);
+    return EMVSelect(ECC_CONTACTLESS, ActivateField, LeaveFieldON, data, sizeof(data), Result, MaxResultLen, ResultLen, sw, NULL);
 }
 
 int FIDOExchange(sAPDU apdu, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
-	int res = EMVExchange(ECC_CONTACTLESS, true, apdu, Result, MaxResultLen, ResultLen, sw, NULL);
-	if (res == 5) // apdu result (sw) not a 0x9000
-		res = 0;
-	// software chaining
-	while (!res && (*sw >> 8) == 0x61) {
-		size_t oldlen = *ResultLen;
-		res = EMVExchange(ECC_CONTACTLESS, true, (sAPDU){0x00, 0xC0, 0x00, 0x00, 0x00, NULL}, &Result[oldlen], MaxResultLen - oldlen, ResultLen, sw, NULL);
-		if (res == 5) // apdu result (sw) not a 0x9000
-			res = 0;
+    int res = EMVExchange(ECC_CONTACTLESS, true, apdu, Result, MaxResultLen, ResultLen, sw, NULL);
+    if (res == 5) // apdu result (sw) not a 0x9000
+        res = 0;
+    // software chaining
+    while (!res && (*sw >> 8) == 0x61) {
+        size_t oldlen = *ResultLen;
+        res = EMVExchange(ECC_CONTACTLESS, true, (sAPDU){0x00, 0xC0, 0x00, 0x00, 0x00, NULL}, &Result[oldlen], MaxResultLen - oldlen, ResultLen, sw, NULL);
+        if (res == 5) // apdu result (sw) not a 0x9000
+            res = 0;
 
-		*ResultLen += oldlen;
-		if (*ResultLen > MaxResultLen)
-			return 100;
-	}
-	return res;
+        *ResultLen += oldlen;
+        if (*ResultLen > MaxResultLen)
+            return 100;
+    }
+    return res;
 }
 
 int FIDORegister(uint8_t *params, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
-	return FIDOExchange((sAPDU){0x00, 0x01, 0x03, 0x00, 64, params}, Result, MaxResultLen, ResultLen, sw);
+    return FIDOExchange((sAPDU){0x00, 0x01, 0x03, 0x00, 64, params}, Result, MaxResultLen, ResultLen, sw);
 }
 
 int FIDOAuthentication(uint8_t *params, uint8_t paramslen, uint8_t controlb, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
-	return FIDOExchange((sAPDU){0x00, 0x02, controlb, 0x00, paramslen, params}, Result, MaxResultLen, ResultLen, sw);
+    return FIDOExchange((sAPDU){0x00, 0x02, controlb, 0x00, paramslen, params}, Result, MaxResultLen, ResultLen, sw);
 }
 
 int FIDO2GetInfo(uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
-	uint8_t data[] = {fido2CmdGetInfo};
-	return FIDOExchange((sAPDU){0x80, 0x10, 0x00, 0x00, sizeof(data), data}, Result, MaxResultLen, ResultLen, sw);
+    uint8_t data[] = {fido2CmdGetInfo};
+    return FIDOExchange((sAPDU){0x80, 0x10, 0x00, 0x00, sizeof(data), data}, Result, MaxResultLen, ResultLen, sw);
 }
 
 int FIDO2MakeCredential(uint8_t *params, uint8_t paramslen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
-	uint8_t data[paramslen + 1];
-	data[0] = fido2CmdMakeCredential;
-	memcpy(&data[1], params, paramslen);
-	return FIDOExchange((sAPDU){0x80, 0x10, 0x00, 0x00, sizeof(data), data}, Result, MaxResultLen, ResultLen, sw);
+    uint8_t data[paramslen + 1];
+    data[0] = fido2CmdMakeCredential;
+    memcpy(&data[1], params, paramslen);
+    return FIDOExchange((sAPDU){0x80, 0x10, 0x00, 0x00, sizeof(data), data}, Result, MaxResultLen, ResultLen, sw);
 }
 
 int FIDO2GetAssertion(uint8_t *params, uint8_t paramslen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
-	uint8_t data[paramslen + 1];
-	data[0] = fido2CmdGetAssertion;
-	memcpy(&data[1], params, paramslen);
-	return FIDOExchange((sAPDU){0x80, 0x10, 0x00, 0x00, sizeof(data), data}, Result, MaxResultLen, ResultLen, sw);
+    uint8_t data[paramslen + 1];
+    data[0] = fido2CmdGetAssertion;
+    memcpy(&data[1], params, paramslen);
+    return FIDOExchange((sAPDU){0x80, 0x10, 0x00, 0x00, sizeof(data), data}, Result, MaxResultLen, ResultLen, sw);
 }
 
 int FIDOCheckDERAndGetKey(uint8_t *der, size_t derLen, bool verbose, uint8_t *publicKey, size_t publicKeyMaxLen) {
-	int res;
+    int res;
 
-	// load CA's
-	mbedtls_x509_crt cacert;
-	mbedtls_x509_crt_init(&cacert);
-	res = mbedtls_x509_crt_parse(&cacert, (const unsigned char *) additional_ca_pem, additional_ca_pem_len);
-	if (res < 0) {
-		PrintAndLog("ERROR: CA parse certificate returned -0x%x - %s", -res, ecdsa_get_error(res));
-	}
-	if (verbose)
-		PrintAndLog("CA load OK. %d skipped", res);
+    // load CA's
+    mbedtls_x509_crt cacert;
+    mbedtls_x509_crt_init(&cacert);
+    res = mbedtls_x509_crt_parse(&cacert, (const unsigned char *) additional_ca_pem, additional_ca_pem_len);
+    if (res < 0) {
+        PrintAndLog("ERROR: CA parse certificate returned -0x%x - %s", -res, ecdsa_get_error(res));
+    }
+    if (verbose)
+        PrintAndLog("CA load OK. %d skipped", res);
 
-	// load DER certificate from authenticator's data
-	mbedtls_x509_crt cert;
-	mbedtls_x509_crt_init(&cert);
-	res = mbedtls_x509_crt_parse_der(&cert, der, derLen);
-	if (res) {
-		PrintAndLog("ERROR: DER parse returned 0x%x - %s", (res<0)?-res:res, ecdsa_get_error(res));
-	}
+    // load DER certificate from authenticator's data
+    mbedtls_x509_crt cert;
+    mbedtls_x509_crt_init(&cert);
+    res = mbedtls_x509_crt_parse_der(&cert, der, derLen);
+    if (res) {
+        PrintAndLog("ERROR: DER parse returned 0x%x - %s", (res<0)?-res:res, ecdsa_get_error(res));
+    }
 
-	// get certificate info
-	char linfo[300] = {0};
-	if (verbose) {
-		mbedtls_x509_crt_info(linfo, sizeof(linfo), "  ", &cert);
-		PrintAndLog("DER certificate info:\n%s", linfo);
-	}
+    // get certificate info
+    char linfo[300] = {0};
+    if (verbose) {
+        mbedtls_x509_crt_info(linfo, sizeof(linfo), "  ", &cert);
+        PrintAndLog("DER certificate info:\n%s", linfo);
+    }
 
-	// verify certificate
-	uint32_t verifyflags = 0;
-	res = mbedtls_x509_crt_verify(&cert, &cacert, NULL, NULL, &verifyflags, NULL, NULL);
-	if (res) {
-		PrintAndLog("ERROR: DER verify returned 0x%x - %s\n", (res<0)?-res:res, ecdsa_get_error(res));
-	} else {
-		PrintAndLog("Certificate OK.\n");
-	}
+    // verify certificate
+    uint32_t verifyflags = 0;
+    res = mbedtls_x509_crt_verify(&cert, &cacert, NULL, NULL, &verifyflags, NULL, NULL);
+    if (res) {
+        PrintAndLog("ERROR: DER verify returned 0x%x - %s\n", (res<0)?-res:res, ecdsa_get_error(res));
+    } else {
+        PrintAndLog("Certificate OK.\n");
+    }
 
-	if (verbose) {
-		memset(linfo, 0x00, sizeof(linfo));
-		mbedtls_x509_crt_verify_info(linfo, sizeof(linfo), "  ", verifyflags);
-		PrintAndLog("Verification info:\n%s", linfo);
-	}
+    if (verbose) {
+        memset(linfo, 0x00, sizeof(linfo));
+        mbedtls_x509_crt_verify_info(linfo, sizeof(linfo), "  ", verifyflags);
+        PrintAndLog("Verification info:\n%s", linfo);
+    }
 
-	// get public key
-	res = ecdsa_public_key_from_pk(&cert.pk, publicKey, publicKeyMaxLen);
-	if (res) {
-		PrintAndLog("ERROR: getting public key from certificate 0x%x - %s", (res<0)?-res:res, ecdsa_get_error(res));
-	} else {
-		if (verbose)
-			PrintAndLog("Got a public key from certificate:\n%s", sprint_hex_inrow(publicKey, 65));
-	}
+    // get public key
+    res = ecdsa_public_key_from_pk(&cert.pk, publicKey, publicKeyMaxLen);
+    if (res) {
+        PrintAndLog("ERROR: getting public key from certificate 0x%x - %s", (res<0)?-res:res, ecdsa_get_error(res));
+    } else {
+        if (verbose)
+            PrintAndLog("Got a public key from certificate:\n%s", sprint_hex_inrow(publicKey, 65));
+    }
 
-	if (verbose)
-		PrintAndLog("------------------DER-------------------");
+    if (verbose)
+        PrintAndLog("------------------DER-------------------");
 
-	mbedtls_x509_crt_free(&cert);
-	mbedtls_x509_crt_free(&cacert);
+    mbedtls_x509_crt_free(&cert);
+    mbedtls_x509_crt_free(&cacert);
 
-	return 0;
+    return 0;
 }
 
 #define fido_check_if(r) if ((r) != CborNoError) {return r;} else
 #define fido_check(r) if ((r) != CborNoError) return r;
 
 int FIDO2CreateMakeCredentionalReq(json_t *root, uint8_t *data, size_t maxdatalen, size_t *datalen) {
-	if (datalen)
-		*datalen = 0;
-	if (!root || !data || !maxdatalen)
-		return 1;
+    if (datalen)
+        *datalen = 0;
+    if (!root || !data || !maxdatalen)
+        return 1;
 
-	int res;
-	CborEncoder encoder;
-	CborEncoder map;
+    int res;
+    CborEncoder encoder;
+    CborEncoder map;
 
-	cbor_encoder_init(&encoder, data, maxdatalen, 0);
+    cbor_encoder_init(&encoder, data, maxdatalen, 0);
 
-	// create main map
-	res = cbor_encoder_create_map(&encoder, &map, 5);
-	fido_check_if(res) {
-		// clientDataHash
-		res = cbor_encode_uint(&map, 1);
-		fido_check_if(res) {
-			res = CBOREncodeClientDataHash(root, &map);
-			fido_check(res);
-		}
+    // create main map
+    res = cbor_encoder_create_map(&encoder, &map, 5);
+    fido_check_if(res) {
+        // clientDataHash
+        res = cbor_encode_uint(&map, 1);
+        fido_check_if(res) {
+            res = CBOREncodeClientDataHash(root, &map);
+            fido_check(res);
+        }
 
-		// rp
-		res = cbor_encode_uint(&map, 2);
-		fido_check_if(res) {
-			res = CBOREncodeElm(root, "RelyingPartyEntity", &map);
-			fido_check(res);
-		}
+        // rp
+        res = cbor_encode_uint(&map, 2);
+        fido_check_if(res) {
+            res = CBOREncodeElm(root, "RelyingPartyEntity", &map);
+            fido_check(res);
+        }
 
-		// user
-		res = cbor_encode_uint(&map, 3);
-		fido_check_if(res) {
-			res = CBOREncodeElm(root, "UserEntity", &map);
-			fido_check(res);
-		}
+        // user
+        res = cbor_encode_uint(&map, 3);
+        fido_check_if(res) {
+            res = CBOREncodeElm(root, "UserEntity", &map);
+            fido_check(res);
+        }
 
-		// pubKeyCredParams
-		res = cbor_encode_uint(&map, 4);
-		fido_check_if(res) {
-			res = CBOREncodeElm(root, "pubKeyCredParams", &map);
-			fido_check(res);
-		}
+        // pubKeyCredParams
+        res = cbor_encode_uint(&map, 4);
+        fido_check_if(res) {
+            res = CBOREncodeElm(root, "pubKeyCredParams", &map);
+            fido_check(res);
+        }
 
-		// options
-		res = cbor_encode_uint(&map, 7);
-		fido_check_if(res) {
-			res = CBOREncodeElm(root, "MakeCredentialOptions", &map);
-			fido_check(res);
-		}
-	}
-	res = cbor_encoder_close_container(&encoder, &map);
-	fido_check(res);
+        // options
+        res = cbor_encode_uint(&map, 7);
+        fido_check_if(res) {
+            res = CBOREncodeElm(root, "MakeCredentialOptions", &map);
+            fido_check(res);
+        }
+    }
+    res = cbor_encoder_close_container(&encoder, &map);
+    fido_check(res);
 
-	size_t len = cbor_encoder_get_buffer_size(&encoder, data);
-	if (datalen)
-		*datalen = len;
+    size_t len = cbor_encoder_get_buffer_size(&encoder, data);
+    if (datalen)
+        *datalen = len;
 
-	return 0;
+    return 0;
 }
 
 bool CheckrpIdHash(json_t *json, uint8_t *hash) {
-	char hashval[300] = {0};
-	uint8_t hash2[32] = {0};
+    char hashval[300] = {0};
+    uint8_t hash2[32] = {0};
 
-	JsonLoadStr(json, "$.RelyingPartyEntity.id", hashval);
-	int res = sha256hash((uint8_t *)hashval, strlen(hashval), hash2);
-	if (res)
-		return false;
+    JsonLoadStr(json, "$.RelyingPartyEntity.id", hashval);
+    int res = sha256hash((uint8_t *)hashval, strlen(hashval), hash2);
+    if (res)
+        return false;
 
-	return !memcmp(hash, hash2, 32);
+    return !memcmp(hash, hash2, 32);
 }
 
 // check ANSI X9.62 format ECDSA signature (on P-256)
 int FIDO2CheckSignature(json_t *root, uint8_t *publickey, uint8_t *sign, size_t signLen, uint8_t *authData, size_t authDataLen, bool verbose) {
-	int res;
-	uint8_t rval[300] = {0};
-	uint8_t sval[300] = {0};
-	res = ecdsa_asn1_get_signature(sign, signLen, rval, sval);
-	if (!res) {
-		if (verbose) {
-			PrintAndLog("  r: %s", sprint_hex(rval, 32));
-			PrintAndLog("  s: %s", sprint_hex(sval, 32));
-		}
+    int res;
+    uint8_t rval[300] = {0};
+    uint8_t sval[300] = {0};
+    res = ecdsa_asn1_get_signature(sign, signLen, rval, sval);
+    if (!res) {
+        if (verbose) {
+            PrintAndLog("  r: %s", sprint_hex(rval, 32));
+            PrintAndLog("  s: %s", sprint_hex(sval, 32));
+        }
 
-		uint8_t clientDataHash[32] = {0};
-		size_t clientDataHashLen = 0;
-		res = JsonLoadBufAsHex(root, "$.ClientDataHash", clientDataHash, sizeof(clientDataHash), &clientDataHashLen);
-		if (res || clientDataHashLen != 32) {
-			PrintAndLog("ERROR: Can't get clientDataHash from json!");
-			return 2;
-		}
+        uint8_t clientDataHash[32] = {0};
+        size_t clientDataHashLen = 0;
+        res = JsonLoadBufAsHex(root, "$.ClientDataHash", clientDataHash, sizeof(clientDataHash), &clientDataHashLen);
+        if (res || clientDataHashLen != 32) {
+            PrintAndLog("ERROR: Can't get clientDataHash from json!");
+            return 2;
+        }
 
-		uint8_t xbuf[4096] = {0};
-		size_t xbuflen = 0;
-		res = FillBuffer(xbuf, sizeof(xbuf), &xbuflen,
-			authData, authDataLen,  // rpIdHash[32] + flags[1] + signCount[4]
-			clientDataHash, 32,     // Hash of the serialized client data. "$.ClientDataHash" from json
-			NULL, 0);
-		//PrintAndLog("--xbuf(%d)[%d]: %s", res, xbuflen, sprint_hex(xbuf, xbuflen));
-		res = ecdsa_signature_verify(publickey, xbuf, xbuflen, sign, signLen);
-		if (res) {
-			if (res == -0x4e00) {
-				PrintAndLog("Signature is NOT VALID.");
-			} else {
-				PrintAndLog("Other signature check error: %x %s", (res<0)?-res:res, ecdsa_get_error(res));
-			}
-			return res;
-		} else {
-			PrintAndLog("Signature is OK.");
-		}
-	} else {
-		PrintAndLog("Invalid signature. res=%d.", res);
-		return res;
-	}
+        uint8_t xbuf[4096] = {0};
+        size_t xbuflen = 0;
+        res = FillBuffer(xbuf, sizeof(xbuf), &xbuflen,
+            authData, authDataLen,  // rpIdHash[32] + flags[1] + signCount[4]
+            clientDataHash, 32,     // Hash of the serialized client data. "$.ClientDataHash" from json
+            NULL, 0);
+        //PrintAndLog("--xbuf(%d)[%d]: %s", res, xbuflen, sprint_hex(xbuf, xbuflen));
+        res = ecdsa_signature_verify(publickey, xbuf, xbuflen, sign, signLen);
+        if (res) {
+            if (res == -0x4e00) {
+                PrintAndLog("Signature is NOT VALID.");
+            } else {
+                PrintAndLog("Other signature check error: %x %s", (res<0)?-res:res, ecdsa_get_error(res));
+            }
+            return res;
+        } else {
+            PrintAndLog("Signature is OK.");
+        }
+    } else {
+        PrintAndLog("Invalid signature. res=%d.", res);
+        return res;
+    }
 
-	return 0;
+    return 0;
 }
 
 int FIDO2MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, bool verbose, bool verbose2, bool showCBOR, bool showDERTLV) {
-	CborParser parser;
-	CborValue map, mapsmt;
-	int res;
-	char *buf;
-	uint8_t *ubuf;
-	size_t n;
+    CborParser parser;
+    CborValue map, mapsmt;
+    int res;
+    char *buf;
+    uint8_t *ubuf;
+    size_t n;
 
-	// fmt
-	res = CborMapGetKeyById(&parser, &map, data, dataLen, 1);
-	if (res)
-		return res;
+    // fmt
+    res = CborMapGetKeyById(&parser, &map, data, dataLen, 1);
+    if (res)
+        return res;
 
-	res = cbor_value_dup_text_string(&map, &buf, &n, &map);
-	cbor_check(res);
-	PrintAndLog("format: %s", buf);
-	free(buf);
+    res = cbor_value_dup_text_string(&map, &buf, &n, &map);
+    cbor_check(res);
+    PrintAndLog("format: %s", buf);
+    free(buf);
 
-	// authData
-	uint8_t authData[400] = {0};
-	size_t authDataLen = 0;
-	res = CborMapGetKeyById(&parser, &map, data, dataLen, 2);
-	if (res)
-		return res;
-	res = cbor_value_dup_byte_string(&map, &ubuf, &n, &map);
-	cbor_check(res);
+    // authData
+    uint8_t authData[400] = {0};
+    size_t authDataLen = 0;
+    res = CborMapGetKeyById(&parser, &map, data, dataLen, 2);
+    if (res)
+        return res;
+    res = cbor_value_dup_byte_string(&map, &ubuf, &n, &map);
+    cbor_check(res);
 
-	authDataLen = n;
-	memcpy(authData, ubuf, authDataLen);
+    authDataLen = n;
+    memcpy(authData, ubuf, authDataLen);
 
-	if (verbose2) {
-		PrintAndLog("authData[%d]: %s", n, sprint_hex_inrow(authData, authDataLen));
-	} else {
-		PrintAndLog("authData[%d]: %s...", n, sprint_hex(authData, MIN(authDataLen, 16)));
-	}
+    if (verbose2) {
+        PrintAndLog("authData[%d]: %s", n, sprint_hex_inrow(authData, authDataLen));
+    } else {
+        PrintAndLog("authData[%d]: %s...", n, sprint_hex(authData, MIN(authDataLen, 16)));
+    }
 
-	PrintAndLog("RP ID Hash: %s", sprint_hex(ubuf, 32));
+    PrintAndLog("RP ID Hash: %s", sprint_hex(ubuf, 32));
 
-	// check RP ID Hash
-	if (CheckrpIdHash(root, ubuf)) {
-		PrintAndLog("rpIdHash OK.");
-	} else {
-		PrintAndLog("rpIdHash ERROR!");
-	}
+    // check RP ID Hash
+    if (CheckrpIdHash(root, ubuf)) {
+        PrintAndLog("rpIdHash OK.");
+    } else {
+        PrintAndLog("rpIdHash ERROR!");
+    }
 
-	PrintAndLog("Flags 0x%02x:", ubuf[32]);
-	if (!ubuf[32])
-		PrintAndLog("none");
-	if (ubuf[32] & 0x01)
-		PrintAndLog("up - user presence result");
-	if (ubuf[32] & 0x04)
-		PrintAndLog("uv - user verification (fingerprint scan or a PIN or ...) result");
-	if (ubuf[32] & 0x40)
-		PrintAndLog("at - attested credential data included");
-	if (ubuf[32] & 0x80)
-		PrintAndLog("ed - extension data included");
+    PrintAndLog("Flags 0x%02x:", ubuf[32]);
+    if (!ubuf[32])
+        PrintAndLog("none");
+    if (ubuf[32] & 0x01)
+        PrintAndLog("up - user presence result");
+    if (ubuf[32] & 0x04)
+        PrintAndLog("uv - user verification (fingerprint scan or a PIN or ...) result");
+    if (ubuf[32] & 0x40)
+        PrintAndLog("at - attested credential data included");
+    if (ubuf[32] & 0x80)
+        PrintAndLog("ed - extension data included");
 
-	uint32_t cntr =  (uint32_t)bytes_to_num(&ubuf[33], 4);
-	PrintAndLog("Counter: %d", cntr);
-	JsonSaveInt(root, "$.AppData.Counter", cntr);
+    uint32_t cntr =  (uint32_t)bytes_to_num(&ubuf[33], 4);
+    PrintAndLog("Counter: %d", cntr);
+    JsonSaveInt(root, "$.AppData.Counter", cntr);
 
-	// attestation data
-	PrintAndLog("AAGUID: %s", sprint_hex(&ubuf[37], 16));
-	JsonSaveBufAsHexCompact(root, "$.AppData.AAGUID", &ubuf[37], 16);
+    // attestation data
+    PrintAndLog("AAGUID: %s", sprint_hex(&ubuf[37], 16));
+    JsonSaveBufAsHexCompact(root, "$.AppData.AAGUID", &ubuf[37], 16);
 
-	// Credential ID
-	uint8_t cridlen = (uint16_t)bytes_to_num(&ubuf[53], 2);
-	PrintAndLog("Credential id[%d]: %s", cridlen, sprint_hex_inrow(&ubuf[55], cridlen));
-	JsonSaveInt(root, "$.AppData.CredentialIdLen", cridlen);
-	JsonSaveBufAsHexCompact(root, "$.AppData.CredentialId", &ubuf[55], cridlen);
+    // Credential ID
+    uint8_t cridlen = (uint16_t)bytes_to_num(&ubuf[53], 2);
+    PrintAndLog("Credential id[%d]: %s", cridlen, sprint_hex_inrow(&ubuf[55], cridlen));
+    JsonSaveInt(root, "$.AppData.CredentialIdLen", cridlen);
+    JsonSaveBufAsHexCompact(root, "$.AppData.CredentialId", &ubuf[55], cridlen);
 
-	//Credentional public key (COSE_KEY)
-	uint8_t coseKey[65] = {0};
-	uint16_t cplen = n - 55 - cridlen;
-	if (verbose2) {
-		PrintAndLog("Credentional public key (COSE_KEY)[%d]: %s", cplen, sprint_hex_inrow(&ubuf[55 + cridlen], cplen));
-	} else {
-		PrintAndLog("Credentional public key (COSE_KEY)[%d]: %s...", cplen, sprint_hex(&ubuf[55 + cridlen], MIN(cplen, 16)));
-	}
-	JsonSaveBufAsHexCompact(root, "$.AppData.COSE_KEY", &ubuf[55 + cridlen], cplen);
+    //Credentional public key (COSE_KEY)
+    uint8_t coseKey[65] = {0};
+    uint16_t cplen = n - 55 - cridlen;
+    if (verbose2) {
+        PrintAndLog("Credentional public key (COSE_KEY)[%d]: %s", cplen, sprint_hex_inrow(&ubuf[55 + cridlen], cplen));
+    } else {
+        PrintAndLog("Credentional public key (COSE_KEY)[%d]: %s...", cplen, sprint_hex(&ubuf[55 + cridlen], MIN(cplen, 16)));
+    }
+    JsonSaveBufAsHexCompact(root, "$.AppData.COSE_KEY", &ubuf[55 + cridlen], cplen);
 
-	if (showCBOR) {
-		PrintAndLog("COSE structure:");
-		PrintAndLog("---------------- CBOR ------------------");
-		TinyCborPrintFIDOPackage(fido2COSEKey, true, &ubuf[55 + cridlen], cplen);
-		PrintAndLog("---------------- CBOR ------------------");
-	}
+    if (showCBOR) {
+        PrintAndLog("COSE structure:");
+        PrintAndLog("---------------- CBOR ------------------");
+        TinyCborPrintFIDOPackage(fido2COSEKey, true, &ubuf[55 + cridlen], cplen);
+        PrintAndLog("---------------- CBOR ------------------");
+    }
 
-	res = COSEGetECDSAKey(&ubuf[55 + cridlen], cplen, verbose, coseKey);
-	if (res) {
-		PrintAndLog("ERROR: Can't get COSE_KEY.");
-	} else {
-		PrintAndLog("COSE public key: %s", sprint_hex_inrow(coseKey, sizeof(coseKey)));
-		JsonSaveBufAsHexCompact(root, "$.AppData.COSEPublicKey", coseKey, sizeof(coseKey));
-	}
+    res = COSEGetECDSAKey(&ubuf[55 + cridlen], cplen, verbose, coseKey);
+    if (res) {
+        PrintAndLog("ERROR: Can't get COSE_KEY.");
+    } else {
+        PrintAndLog("COSE public key: %s", sprint_hex_inrow(coseKey, sizeof(coseKey)));
+        JsonSaveBufAsHexCompact(root, "$.AppData.COSEPublicKey", coseKey, sizeof(coseKey));
+    }
 
-	free(ubuf);
+    free(ubuf);
 
-	// attStmt - we are check only as DER certificate
-	int64_t alg = 0;
-	uint8_t sign[128] = {0};
-	size_t signLen = 0;
-	uint8_t der[4097] = {0};
-	size_t derLen = 0;
+    // attStmt - we are check only as DER certificate
+    int64_t alg = 0;
+    uint8_t sign[128] = {0};
+    size_t signLen = 0;
+    uint8_t der[4097] = {0};
+    size_t derLen = 0;
 
-	res = CborMapGetKeyById(&parser, &map, data, dataLen, 3);
-	if (res)
-		return res;
+    res = CborMapGetKeyById(&parser, &map, data, dataLen, 3);
+    if (res)
+        return res;
 
-	res = cbor_value_enter_container(&map, &mapsmt);
-	cbor_check(res);
+    res = cbor_value_enter_container(&map, &mapsmt);
+    cbor_check(res);
 
-	while (!cbor_value_at_end(&mapsmt)) {
-		char key[100] = {0};
-		res = CborGetStringValue(&mapsmt, key, sizeof(key), &n);
-		cbor_check(res);
-		if (!strcmp(key, "alg")) {
-			cbor_value_get_int64(&mapsmt, &alg);
-			PrintAndLog("Alg [%lld] %s", (long long)alg, GetCOSEAlgDescription(alg));
-			res = cbor_value_advance_fixed(&mapsmt);
-			cbor_check(res);
-		}
+    while (!cbor_value_at_end(&mapsmt)) {
+        char key[100] = {0};
+        res = CborGetStringValue(&mapsmt, key, sizeof(key), &n);
+        cbor_check(res);
+        if (!strcmp(key, "alg")) {
+            cbor_value_get_int64(&mapsmt, &alg);
+            PrintAndLog("Alg [%lld] %s", (long long)alg, GetCOSEAlgDescription(alg));
+            res = cbor_value_advance_fixed(&mapsmt);
+            cbor_check(res);
+        }
 
-		if (!strcmp(key, "sig")) {
-			res = CborGetBinStringValue(&mapsmt, sign, sizeof(sign), &signLen);
-			cbor_check(res);
-			if (verbose2) {
-				PrintAndLog("signature [%d]: %s", signLen, sprint_hex_inrow(sign, signLen));
-			} else {
-				PrintAndLog("signature [%d]: %s...", signLen, sprint_hex(sign, MIN(signLen, 16)));
-			}
-		}
+        if (!strcmp(key, "sig")) {
+            res = CborGetBinStringValue(&mapsmt, sign, sizeof(sign), &signLen);
+            cbor_check(res);
+            if (verbose2) {
+                PrintAndLog("signature [%d]: %s", signLen, sprint_hex_inrow(sign, signLen));
+            } else {
+                PrintAndLog("signature [%d]: %s...", signLen, sprint_hex(sign, MIN(signLen, 16)));
+            }
+        }
 
-		if (!strcmp(key, "x5c")) {
-			res = CborGetArrayBinStringValue(&mapsmt, der, sizeof(der), &derLen);
-			cbor_check(res);
-			if (verbose2) {
-				PrintAndLog("DER certificate[%d]:\n------------------DER-------------------", derLen);
-				dump_buffer_simple((const unsigned char *)der, derLen, NULL);
-				PrintAndLog("\n----------------DER---------------------");
-			} else {
-				PrintAndLog("DER [%d]: %s...", derLen, sprint_hex(der, MIN(derLen, 16)));
-			}
-				JsonSaveBufAsHexCompact(root, "$.AppData.DER", der, derLen);
-		}
-	}
-	res = cbor_value_leave_container(&map, &mapsmt);
-	cbor_check(res);
+        if (!strcmp(key, "x5c")) {
+            res = CborGetArrayBinStringValue(&mapsmt, der, sizeof(der), &derLen);
+            cbor_check(res);
+            if (verbose2) {
+                PrintAndLog("DER certificate[%d]:\n------------------DER-------------------", derLen);
+                dump_buffer_simple((const unsigned char *)der, derLen, NULL);
+                PrintAndLog("\n----------------DER---------------------");
+            } else {
+                PrintAndLog("DER [%d]: %s...", derLen, sprint_hex(der, MIN(derLen, 16)));
+            }
+                JsonSaveBufAsHexCompact(root, "$.AppData.DER", der, derLen);
+        }
+    }
+    res = cbor_value_leave_container(&map, &mapsmt);
+    cbor_check(res);
 
-	uint8_t public_key[65] = {0};
+    uint8_t public_key[65] = {0};
 
-	// print DER certificate in TLV view
-	if (showDERTLV) {
-		PrintAndLog("----------------DER TLV-----------------");
-		asn1_print(der, derLen, "  ");
-		PrintAndLog("----------------DER TLV-----------------");
-	}
+    // print DER certificate in TLV view
+    if (showDERTLV) {
+        PrintAndLog("----------------DER TLV-----------------");
+        asn1_print(der, derLen, "  ");
+        PrintAndLog("----------------DER TLV-----------------");
+    }
     FIDOCheckDERAndGetKey(der, derLen, verbose, public_key, sizeof(public_key));
-	JsonSaveBufAsHexCompact(root, "$.AppData.DERPublicKey", public_key, sizeof(public_key));
+    JsonSaveBufAsHexCompact(root, "$.AppData.DERPublicKey", public_key, sizeof(public_key));
 
-	// check ANSI X9.62 format ECDSA signature (on P-256)
-	FIDO2CheckSignature(root, public_key, sign, signLen, authData, authDataLen, verbose);
+    // check ANSI X9.62 format ECDSA signature (on P-256)
+    FIDO2CheckSignature(root, public_key, sign, signLen, authData, authDataLen, verbose);
 
-	return 0;
+    return 0;
 }
 
 int FIDO2CreateGetAssertionReq(json_t *root, uint8_t *data, size_t maxdatalen, size_t *datalen, bool createAllowList) {
-	if (datalen)
-		*datalen = 0;
-	if (!root || !data || !maxdatalen)
-		return 1;
+    if (datalen)
+        *datalen = 0;
+    if (!root || !data || !maxdatalen)
+        return 1;
 
-	int res;
-	CborEncoder encoder;
-	CborEncoder map, array, mapint;
+    int res;
+    CborEncoder encoder;
+    CborEncoder map, array, mapint;
 
-	cbor_encoder_init(&encoder, data, maxdatalen, 0);
+    cbor_encoder_init(&encoder, data, maxdatalen, 0);
 
-	// create main map
-	res = cbor_encoder_create_map(&encoder, &map, createAllowList ? 4 : 3);
-	fido_check_if(res) {
-		// rpId
-		res = cbor_encode_uint(&map, 1);
-		fido_check_if(res) {
-			res = CBOREncodeElm(root, "$.RelyingPartyEntity.id", &map);
-			fido_check(res);
-		}
+    // create main map
+    res = cbor_encoder_create_map(&encoder, &map, createAllowList ? 4 : 3);
+    fido_check_if(res) {
+        // rpId
+        res = cbor_encode_uint(&map, 1);
+        fido_check_if(res) {
+            res = CBOREncodeElm(root, "$.RelyingPartyEntity.id", &map);
+            fido_check(res);
+        }
 
-		// clientDataHash
-		res = cbor_encode_uint(&map, 2);
-		fido_check_if(res) {
-			res = CBOREncodeClientDataHash(root, &map);
-			fido_check(res);
-		}
+        // clientDataHash
+        res = cbor_encode_uint(&map, 2);
+        fido_check_if(res) {
+            res = CBOREncodeClientDataHash(root, &map);
+            fido_check(res);
+        }
 
-		// allowList
-		if (createAllowList) {
-			res = cbor_encode_uint(&map, 3);
-			fido_check_if(res) {
-				res = cbor_encoder_create_array(&map, &array, 1);
-				fido_check_if(res) {
-					res = cbor_encoder_create_map(&array, &mapint, 2);
-					fido_check_if(res) {
-						res = cbor_encode_text_stringz(&mapint, "type");
-						fido_check(res);
+        // allowList
+        if (createAllowList) {
+            res = cbor_encode_uint(&map, 3);
+            fido_check_if(res) {
+                res = cbor_encoder_create_array(&map, &array, 1);
+                fido_check_if(res) {
+                    res = cbor_encoder_create_map(&array, &mapint, 2);
+                    fido_check_if(res) {
+                        res = cbor_encode_text_stringz(&mapint, "type");
+                        fido_check(res);
 
-						res = cbor_encode_text_stringz(&mapint, "public-key");
-						fido_check(res);
+                        res = cbor_encode_text_stringz(&mapint, "public-key");
+                        fido_check(res);
 
-						res = cbor_encode_text_stringz(&mapint, "id");
-						fido_check(res);
+                        res = cbor_encode_text_stringz(&mapint, "id");
+                        fido_check(res);
 
-						res = CBOREncodeElm(root, "$.AppData.CredentialId", &mapint);
-						fido_check(res);
-					}
-					res = cbor_encoder_close_container(&array, &mapint);
-					fido_check(res);
-				}
-				res = cbor_encoder_close_container(&map, &array);
-				fido_check(res);
-			}
-		}
+                        res = CBOREncodeElm(root, "$.AppData.CredentialId", &mapint);
+                        fido_check(res);
+                    }
+                    res = cbor_encoder_close_container(&array, &mapint);
+                    fido_check(res);
+                }
+                res = cbor_encoder_close_container(&map, &array);
+                fido_check(res);
+            }
+        }
 
-		// options
-		res = cbor_encode_uint(&map, 5);
-		fido_check_if(res) {
-			res = CBOREncodeElm(root, "GetAssertionOptions", &map);
-			fido_check(res);
-		}
-	}
-	res = cbor_encoder_close_container(&encoder, &map);
-	fido_check(res);
+        // options
+        res = cbor_encode_uint(&map, 5);
+        fido_check_if(res) {
+            res = CBOREncodeElm(root, "GetAssertionOptions", &map);
+            fido_check(res);
+        }
+    }
+    res = cbor_encoder_close_container(&encoder, &map);
+    fido_check(res);
 
-	size_t len = cbor_encoder_get_buffer_size(&encoder, data);
-	if (datalen)
-		*datalen = len;
+    size_t len = cbor_encoder_get_buffer_size(&encoder, data);
+    if (datalen)
+        *datalen = len;
 
-	return 0;
+    return 0;
 }
 
 int FIDO2GetAssertionParseRes(json_t *root, uint8_t *data, size_t dataLen, bool verbose, bool verbose2, bool showCBOR) {
-	CborParser parser;
-	CborValue map, mapint;
-	int res;
-	uint8_t *ubuf;
-	size_t n;
+    CborParser parser;
+    CborValue map, mapint;
+    int res;
+    uint8_t *ubuf;
+    size_t n;
 
-	// credential
-	res = CborMapGetKeyById(&parser, &map, data, dataLen, 1);
-	if (res)
-		return res;
+    // credential
+    res = CborMapGetKeyById(&parser, &map, data, dataLen, 1);
+    if (res)
+        return res;
 
-	res = cbor_value_enter_container(&map, &mapint);
-	cbor_check(res);
+    res = cbor_value_enter_container(&map, &mapint);
+    cbor_check(res);
 
-	while (!cbor_value_at_end(&mapint)) {
-		char key[100] = {0};
-		res = CborGetStringValue(&mapint, key, sizeof(key), &n);
-		cbor_check(res);
+    while (!cbor_value_at_end(&mapint)) {
+        char key[100] = {0};
+        res = CborGetStringValue(&mapint, key, sizeof(key), &n);
+        cbor_check(res);
 
-		if (!strcmp(key, "type")) {
-			char ctype[200] = {0};
-			res = CborGetStringValue(&mapint, ctype, sizeof(ctype), &n);
-			cbor_check(res);
-			PrintAndLog("credential type: %s", ctype);
-		}
+        if (!strcmp(key, "type")) {
+            char ctype[200] = {0};
+            res = CborGetStringValue(&mapint, ctype, sizeof(ctype), &n);
+            cbor_check(res);
+            PrintAndLog("credential type: %s", ctype);
+        }
 
-		if (!strcmp(key, "id")) {
-			uint8_t cid[200] = {0};
-			res = CborGetBinStringValue(&mapint, cid, sizeof(cid), &n);
-			cbor_check(res);
-			PrintAndLog("credential id [%d]: %s", n, sprint_hex(cid, n));
-		}
-	}
-	res = cbor_value_leave_container(&map, &mapint);
-	cbor_check(res);
+        if (!strcmp(key, "id")) {
+            uint8_t cid[200] = {0};
+            res = CborGetBinStringValue(&mapint, cid, sizeof(cid), &n);
+            cbor_check(res);
+            PrintAndLog("credential id [%d]: %s", n, sprint_hex(cid, n));
+        }
+    }
+    res = cbor_value_leave_container(&map, &mapint);
+    cbor_check(res);
 
-	// authData
-	uint8_t authData[400] = {0};
-	size_t authDataLen = 0;
-	res = CborMapGetKeyById(&parser, &map, data, dataLen, 2);
-	if (res)
-		return res;
-	res = cbor_value_dup_byte_string(&map, &ubuf, &n, &map);
-	cbor_check(res);
+    // authData
+    uint8_t authData[400] = {0};
+    size_t authDataLen = 0;
+    res = CborMapGetKeyById(&parser, &map, data, dataLen, 2);
+    if (res)
+        return res;
+    res = cbor_value_dup_byte_string(&map, &ubuf, &n, &map);
+    cbor_check(res);
 
-	authDataLen = n;
-	memcpy(authData, ubuf, authDataLen);
+    authDataLen = n;
+    memcpy(authData, ubuf, authDataLen);
 
-	if (verbose2) {
-		PrintAndLog("authData[%d]: %s", n, sprint_hex_inrow(authData, authDataLen));
-	} else {
-		PrintAndLog("authData[%d]: %s...", n, sprint_hex(authData, MIN(authDataLen, 16)));
-	}
+    if (verbose2) {
+        PrintAndLog("authData[%d]: %s", n, sprint_hex_inrow(authData, authDataLen));
+    } else {
+        PrintAndLog("authData[%d]: %s...", n, sprint_hex(authData, MIN(authDataLen, 16)));
+    }
 
-	PrintAndLog("RP ID Hash: %s", sprint_hex(ubuf, 32));
+    PrintAndLog("RP ID Hash: %s", sprint_hex(ubuf, 32));
 
-	// check RP ID Hash
-	if (CheckrpIdHash(root, ubuf)) {
-		PrintAndLog("rpIdHash OK.");
-	} else {
-		PrintAndLog("rpIdHash ERROR!");
-	}
+    // check RP ID Hash
+    if (CheckrpIdHash(root, ubuf)) {
+        PrintAndLog("rpIdHash OK.");
+    } else {
+        PrintAndLog("rpIdHash ERROR!");
+    }
 
-	PrintAndLog("Flags 0x%02x:", ubuf[32]);
-	if (!ubuf[32])
-		PrintAndLog("none");
-	if (ubuf[32] & 0x01)
-		PrintAndLog("up - user presence result");
-	if (ubuf[32] & 0x04)
-		PrintAndLog("uv - user verification (fingerprint scan or a PIN or ...) result");
-	if (ubuf[32] & 0x40)
-		PrintAndLog("at - attested credential data included");
-	if (ubuf[32] & 0x80)
-		PrintAndLog("ed - extension data included");
+    PrintAndLog("Flags 0x%02x:", ubuf[32]);
+    if (!ubuf[32])
+        PrintAndLog("none");
+    if (ubuf[32] & 0x01)
+        PrintAndLog("up - user presence result");
+    if (ubuf[32] & 0x04)
+        PrintAndLog("uv - user verification (fingerprint scan or a PIN or ...) result");
+    if (ubuf[32] & 0x40)
+        PrintAndLog("at - attested credential data included");
+    if (ubuf[32] & 0x80)
+        PrintAndLog("ed - extension data included");
 
-	uint32_t cntr =  (uint32_t)bytes_to_num(&ubuf[33], 4);
-	PrintAndLog("Counter: %d", cntr);
-	JsonSaveInt(root, "$.AppData.Counter", cntr);
+    uint32_t cntr =  (uint32_t)bytes_to_num(&ubuf[33], 4);
+    PrintAndLog("Counter: %d", cntr);
+    JsonSaveInt(root, "$.AppData.Counter", cntr);
 
-	free(ubuf);
+    free(ubuf);
 
-	// publicKeyCredentialUserEntity
-	res = CborMapGetKeyById(&parser, &map, data, dataLen, 4);
-	if (res) {
-		PrintAndLog("UserEntity n/a");
-	} else {
-		res = cbor_value_enter_container(&map, &mapint);
-		cbor_check(res);
+    // publicKeyCredentialUserEntity
+    res = CborMapGetKeyById(&parser, &map, data, dataLen, 4);
+    if (res) {
+        PrintAndLog("UserEntity n/a");
+    } else {
+        res = cbor_value_enter_container(&map, &mapint);
+        cbor_check(res);
 
-		while (!cbor_value_at_end(&mapint)) {
-			char key[100] = {0};
-			res = CborGetStringValue(&mapint, key, sizeof(key), &n);
-			cbor_check(res);
+        while (!cbor_value_at_end(&mapint)) {
+            char key[100] = {0};
+            res = CborGetStringValue(&mapint, key, sizeof(key), &n);
+            cbor_check(res);
 
-			if (!strcmp(key, "name") || !strcmp(key, "displayName")) {
-				char cname[200] = {0};
-				res = CborGetStringValue(&mapint, cname, sizeof(cname), &n);
-				cbor_check(res);
-				PrintAndLog("UserEntity %s: %s", key, cname);
-			}
+            if (!strcmp(key, "name") || !strcmp(key, "displayName")) {
+                char cname[200] = {0};
+                res = CborGetStringValue(&mapint, cname, sizeof(cname), &n);
+                cbor_check(res);
+                PrintAndLog("UserEntity %s: %s", key, cname);
+            }
 
-			if (!strcmp(key, "id")) {
-				uint8_t cid[200] = {0};
-				res = CborGetBinStringValue(&mapint, cid, sizeof(cid), &n);
-				cbor_check(res);
-				PrintAndLog("UserEntity id [%d]: %s", n, sprint_hex(cid, n));
+            if (!strcmp(key, "id")) {
+                uint8_t cid[200] = {0};
+                res = CborGetBinStringValue(&mapint, cid, sizeof(cid), &n);
+                cbor_check(res);
+                PrintAndLog("UserEntity id [%d]: %s", n, sprint_hex(cid, n));
 
-				// check
-				uint8_t idbuf[100] = {0};
-				size_t idbuflen;
+                // check
+                uint8_t idbuf[100] = {0};
+                size_t idbuflen;
 
-				JsonLoadBufAsHex(root, "$.UserEntity.id", idbuf, sizeof(idbuf), &idbuflen);
+                JsonLoadBufAsHex(root, "$.UserEntity.id", idbuf, sizeof(idbuf), &idbuflen);
 
-				if (idbuflen == n && !memcmp(idbuf, cid, idbuflen)) {
-					PrintAndLog("UserEntity id OK.");
-				} else {
-					PrintAndLog("ERROR: Wrong UserEntity id (from json: %s)", sprint_hex(idbuf, idbuflen));
-				}
-			}
-		}
-		res = cbor_value_leave_container(&map, &mapint);
-		cbor_check(res);
-	}
+                if (idbuflen == n && !memcmp(idbuf, cid, idbuflen)) {
+                    PrintAndLog("UserEntity id OK.");
+                } else {
+                    PrintAndLog("ERROR: Wrong UserEntity id (from json: %s)", sprint_hex(idbuf, idbuflen));
+                }
+            }
+        }
+        res = cbor_value_leave_container(&map, &mapint);
+        cbor_check(res);
+    }
 
 
-	// signature
-	res = CborMapGetKeyById(&parser, &map, data, dataLen, 3);
-	if (res)
-		return res;
-	res = cbor_value_dup_byte_string(&map, &ubuf, &n, &map);
-	cbor_check(res);
+    // signature
+    res = CborMapGetKeyById(&parser, &map, data, dataLen, 3);
+    if (res)
+        return res;
+    res = cbor_value_dup_byte_string(&map, &ubuf, &n, &map);
+    cbor_check(res);
 
-	uint8_t *sign = ubuf;
-	size_t signLen = n;
+    uint8_t *sign = ubuf;
+    size_t signLen = n;
 
-	cbor_check(res);
-	if (verbose2) {
-		PrintAndLog("signature [%d]: %s", signLen, sprint_hex_inrow(sign, signLen));
-	} else {
-		PrintAndLog("signature [%d]: %s...", signLen, sprint_hex(sign, MIN(signLen, 16)));
-	}
+    cbor_check(res);
+    if (verbose2) {
+        PrintAndLog("signature [%d]: %s", signLen, sprint_hex_inrow(sign, signLen));
+    } else {
+        PrintAndLog("signature [%d]: %s...", signLen, sprint_hex(sign, MIN(signLen, 16)));
+    }
 
-	// get public key from json
-	uint8_t PublicKey[65] = {0};
-	size_t PublicKeyLen = 0;
-	JsonLoadBufAsHex(root, "$.AppData.COSEPublicKey", PublicKey, 65, &PublicKeyLen);
+    // get public key from json
+    uint8_t PublicKey[65] = {0};
+    size_t PublicKeyLen = 0;
+    JsonLoadBufAsHex(root, "$.AppData.COSEPublicKey", PublicKey, 65, &PublicKeyLen);
 
-	// check ANSI X9.62 format ECDSA signature (on P-256)
-	FIDO2CheckSignature(root, PublicKey, sign, signLen, authData, authDataLen, verbose);
+    // check ANSI X9.62 format ECDSA signature (on P-256)
+    FIDO2CheckSignature(root, PublicKey, sign, signLen, authData, authDataLen, verbose);
 
-	free(ubuf);
+    free(ubuf);
 
-	// numberOfCredentials
-	res = CborMapGetKeyById(&parser, &map, data, dataLen, 5);
-	if (res) {
-		PrintAndLog("numberOfCredentials: 1 by default");
-	} else {
-		int64_t numberOfCredentials = 0;
-		cbor_value_get_int64(&map, &numberOfCredentials);
-		PrintAndLog("numberOfCredentials: %lld", (long long)numberOfCredentials);
-	}
+    // numberOfCredentials
+    res = CborMapGetKeyById(&parser, &map, data, dataLen, 5);
+    if (res) {
+        PrintAndLog("numberOfCredentials: 1 by default");
+    } else {
+        int64_t numberOfCredentials = 0;
+        cbor_value_get_int64(&map, &numberOfCredentials);
+        PrintAndLog("numberOfCredentials: %lld", (long long)numberOfCredentials);
+    }
 
-	return 0;
+    return 0;
 }
diff --git a/client/fido/fidocore.h b/client/fido/fidocore.h
index 931cf146b..60923a44b 100644
--- a/client/fido/fidocore.h
+++ b/client/fido/fidocore.h
@@ -18,21 +18,21 @@
 #include "cmdhf14a.h"
 
 typedef enum {
-	fido2CmdMakeCredential		= 0x01,
-	fido2CmdGetAssertion		= 0x02,
-	fido2CmdCancel				= 0x03,
-	fido2CmdGetInfo				= 0x04,
-	fido2CmdClientPIN			= 0x06,
-	fido2CmdReset				= 0x07,
-	fido2CmdGetNextAssertion	= 0x08,
+    fido2CmdMakeCredential      = 0x01,
+    fido2CmdGetAssertion        = 0x02,
+    fido2CmdCancel              = 0x03,
+    fido2CmdGetInfo             = 0x04,
+    fido2CmdClientPIN           = 0x06,
+    fido2CmdReset               = 0x07,
+    fido2CmdGetNextAssertion    = 0x08,
 
-	// another data
-	fido2COSEKey                = 0xF0
+    // another data
+    fido2COSEKey                = 0xF0
 } fido2Commands;
 
 typedef enum  {
-	ptQuery,
-	ptResponse,
+    ptQuery,
+    ptResponse,
 } fido2PacketType;
 
 extern int FIDOSelect(bool ActivateField, bool LeaveFieldON, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw);
diff --git a/client/flash.c b/client/flash.c
index 2c06311c3..2df7ee4cd 100644
--- a/client/flash.c
+++ b/client/flash.c
@@ -25,438 +25,438 @@
 #define BLOCK_SIZE             0x200
 
 static const uint8_t elf_ident[] = {
-	0x7f, 'E', 'L', 'F',
-	ELFCLASS32,
-	ELFDATA2LSB,
-	EV_CURRENT
+    0x7f, 'E', 'L', 'F',
+    ELFCLASS32,
+    ELFDATA2LSB,
+    EV_CURRENT
 };
 
 // Turn PHDRs into flasher segments, checking for PHDR sanity and merging adjacent
 // unaligned segments if needed
 static int build_segs_from_phdrs(flash_file_t *ctx, FILE *fd, Elf32_Phdr *phdrs, uint16_t num_phdrs) {
-	Elf32_Phdr *phdr = phdrs;
-	flash_seg_t *seg;
-	uint32_t last_end = 0;
+    Elf32_Phdr *phdr = phdrs;
+    flash_seg_t *seg;
+    uint32_t last_end = 0;
 
-	ctx->segments = calloc(sizeof(flash_seg_t) * num_phdrs, sizeof(uint8_t));
-	if (!ctx->segments) {
-		fprintf(stderr, "Out of memory\n");
-		return -1;
-	}
-	ctx->num_segs = 0;
-	seg = ctx->segments;
+    ctx->segments = calloc(sizeof(flash_seg_t) * num_phdrs, sizeof(uint8_t));
+    if (!ctx->segments) {
+        fprintf(stderr, "Out of memory\n");
+        return -1;
+    }
+    ctx->num_segs = 0;
+    seg = ctx->segments;
 
-	fprintf(stdout, "Loading usable ELF segments:\n");
-	for (int i = 0; i < num_phdrs; i++) {
-		if (le32(phdr->p_type) != PT_LOAD) {
-			phdr++;
-			continue;
-		}
-		uint32_t vaddr = le32(phdr->p_vaddr);
-		uint32_t paddr = le32(phdr->p_paddr);
-		uint32_t filesz = le32(phdr->p_filesz);
-		uint32_t memsz = le32(phdr->p_memsz);
-		uint32_t offset = le32(phdr->p_offset);
-		uint32_t flags = le32(phdr->p_flags);
-		if (!filesz) {
-			phdr++;
-			continue;
-		}
-		fprintf(stdout, "%d: V 0x%08x P 0x%08x (0x%08x->0x%08x) [%c%c%c] @0x%x\n",
-		        i, vaddr, paddr, filesz, memsz,
-		        flags & PF_R ? 'R' : ' ',
-		        flags & PF_W ? 'W' : ' ',
-		        flags & PF_X ? 'X' : ' ',
-		        offset);
-		if (filesz != memsz) {
-			fprintf(stderr, "Error: PHDR file size does not equal memory size\n"
-			                "(DATA+BSS PHDRs do not make sense on ROM platforms!)\n");
-			return -1;
-		}
-		if (paddr < last_end) {
-			fprintf(stderr, "Error: PHDRs not sorted or overlap\n");
-			return -1;
-		}
-		if (paddr < FLASH_START || (paddr+filesz) > FLASH_END) {
-			fprintf(stderr, "Error: PHDR is not contained in Flash\n");
-			return -1;
-		}
-		if (vaddr >= FLASH_START && vaddr < FLASH_END && (flags & PF_W)) {
-			fprintf(stderr, "Error: Flash VMA segment is writable\n");
-			return -1;
-		}
+    fprintf(stdout, "Loading usable ELF segments:\n");
+    for (int i = 0; i < num_phdrs; i++) {
+        if (le32(phdr->p_type) != PT_LOAD) {
+            phdr++;
+            continue;
+        }
+        uint32_t vaddr = le32(phdr->p_vaddr);
+        uint32_t paddr = le32(phdr->p_paddr);
+        uint32_t filesz = le32(phdr->p_filesz);
+        uint32_t memsz = le32(phdr->p_memsz);
+        uint32_t offset = le32(phdr->p_offset);
+        uint32_t flags = le32(phdr->p_flags);
+        if (!filesz) {
+            phdr++;
+            continue;
+        }
+        fprintf(stdout, "%d: V 0x%08x P 0x%08x (0x%08x->0x%08x) [%c%c%c] @0x%x\n",
+                i, vaddr, paddr, filesz, memsz,
+                flags & PF_R ? 'R' : ' ',
+                flags & PF_W ? 'W' : ' ',
+                flags & PF_X ? 'X' : ' ',
+                offset);
+        if (filesz != memsz) {
+            fprintf(stderr, "Error: PHDR file size does not equal memory size\n"
+                            "(DATA+BSS PHDRs do not make sense on ROM platforms!)\n");
+            return -1;
+        }
+        if (paddr < last_end) {
+            fprintf(stderr, "Error: PHDRs not sorted or overlap\n");
+            return -1;
+        }
+        if (paddr < FLASH_START || (paddr+filesz) > FLASH_END) {
+            fprintf(stderr, "Error: PHDR is not contained in Flash\n");
+            return -1;
+        }
+        if (vaddr >= FLASH_START && vaddr < FLASH_END && (flags & PF_W)) {
+            fprintf(stderr, "Error: Flash VMA segment is writable\n");
+            return -1;
+        }
 
-		uint8_t *data;
-		// make extra space if we need to move the data forward
-		data = calloc(filesz + BLOCK_SIZE, sizeof(uint8_t));
-		if (!data) {
-			fprintf(stderr, "Error: Out of memory\n");
-			return -1;
-		}
-		if (fseek(fd, offset, SEEK_SET) < 0 || fread(data, 1, filesz, fd) != filesz) {
-			fprintf(stderr, "Error while reading PHDR payload\n");
-			free(data);
-			return -1;
-		}
+        uint8_t *data;
+        // make extra space if we need to move the data forward
+        data = calloc(filesz + BLOCK_SIZE, sizeof(uint8_t));
+        if (!data) {
+            fprintf(stderr, "Error: Out of memory\n");
+            return -1;
+        }
+        if (fseek(fd, offset, SEEK_SET) < 0 || fread(data, 1, filesz, fd) != filesz) {
+            fprintf(stderr, "Error while reading PHDR payload\n");
+            free(data);
+            return -1;
+        }
 
-		uint32_t block_offset = paddr & (BLOCK_SIZE-1);
-		if (block_offset) {
-			if (ctx->num_segs) {
-				flash_seg_t *prev_seg = seg - 1;
-				uint32_t this_end = paddr + filesz;
-				uint32_t this_firstblock = paddr & ~(BLOCK_SIZE-1);
-				uint32_t prev_lastblock = (last_end - 1) & ~(BLOCK_SIZE-1);
+        uint32_t block_offset = paddr & (BLOCK_SIZE-1);
+        if (block_offset) {
+            if (ctx->num_segs) {
+                flash_seg_t *prev_seg = seg - 1;
+                uint32_t this_end = paddr + filesz;
+                uint32_t this_firstblock = paddr & ~(BLOCK_SIZE-1);
+                uint32_t prev_lastblock = (last_end - 1) & ~(BLOCK_SIZE-1);
 
-				if (this_firstblock == prev_lastblock) {
-					uint32_t new_length = this_end - prev_seg->start;
-					uint32_t this_offset = paddr - prev_seg->start;
-					uint32_t hole = this_offset - prev_seg->length;
-					uint8_t *new_data = calloc(new_length, sizeof(uint8_t));
-					if (!new_data) {
-						fprintf(stderr, "Error: Out of memory\n");
-						free(data);
-						return -1;
-					}
-					memset(new_data, 0xff, new_length);
-					memcpy(new_data, prev_seg->data, prev_seg->length);
-					memcpy(new_data + this_offset, data, filesz);
-					fprintf(stderr, "Note: Extending previous segment from 0x%x to 0x%x bytes\n",
-					        prev_seg->length, new_length);
-					if (hole)
-						fprintf(stderr, "Note: 0x%x-byte hole created\n", hole);
-					free(data);
-					free(prev_seg->data);
-					prev_seg->data = new_data;
-					prev_seg->length = new_length;
-					last_end = this_end;
-					phdr++;
-					continue;
-				}
-			}
-			fprintf(stderr, "Warning: segment does not begin on a block boundary, will pad\n");
-			memmove(data + block_offset, data, filesz);
-			memset(data, 0xFF, block_offset);
-			filesz += block_offset;
-			paddr -= block_offset;
-		}
+                if (this_firstblock == prev_lastblock) {
+                    uint32_t new_length = this_end - prev_seg->start;
+                    uint32_t this_offset = paddr - prev_seg->start;
+                    uint32_t hole = this_offset - prev_seg->length;
+                    uint8_t *new_data = calloc(new_length, sizeof(uint8_t));
+                    if (!new_data) {
+                        fprintf(stderr, "Error: Out of memory\n");
+                        free(data);
+                        return -1;
+                    }
+                    memset(new_data, 0xff, new_length);
+                    memcpy(new_data, prev_seg->data, prev_seg->length);
+                    memcpy(new_data + this_offset, data, filesz);
+                    fprintf(stderr, "Note: Extending previous segment from 0x%x to 0x%x bytes\n",
+                            prev_seg->length, new_length);
+                    if (hole)
+                        fprintf(stderr, "Note: 0x%x-byte hole created\n", hole);
+                    free(data);
+                    free(prev_seg->data);
+                    prev_seg->data = new_data;
+                    prev_seg->length = new_length;
+                    last_end = this_end;
+                    phdr++;
+                    continue;
+                }
+            }
+            fprintf(stderr, "Warning: segment does not begin on a block boundary, will pad\n");
+            memmove(data + block_offset, data, filesz);
+            memset(data, 0xFF, block_offset);
+            filesz += block_offset;
+            paddr -= block_offset;
+        }
 
-		seg->data = data;
-		seg->start = paddr;
-		seg->length = filesz;
-		seg++;
-		ctx->num_segs++;
+        seg->data = data;
+        seg->start = paddr;
+        seg->length = filesz;
+        seg++;
+        ctx->num_segs++;
 
-		last_end = paddr + filesz;
-		phdr++;
-	}
-	return 0;
+        last_end = paddr + filesz;
+        phdr++;
+    }
+    return 0;
 }
 
 // Sanity check segments and check for bootloader writes
 static int check_segs(flash_file_t *ctx, int can_write_bl) {
-	for (int i = 0; i < ctx->num_segs; i++) {
-		flash_seg_t *seg = &ctx->segments[i];
+    for (int i = 0; i < ctx->num_segs; i++) {
+        flash_seg_t *seg = &ctx->segments[i];
 
-		if (seg->start & (BLOCK_SIZE-1)) {
-			fprintf(stderr, "Error: Segment is not aligned\n");
-			return -1;
-		}
-		if (seg->start < FLASH_START) {
-			fprintf(stderr, "Error: Segment is outside of flash bounds\n");
-			return -1;
-		}
-		if (seg->start + seg->length > FLASH_END) {
-			fprintf(stderr, "Error: Segment is outside of flash bounds\n");
-			return -1;
-		}
-		if (!can_write_bl && seg->start < BOOTLOADER_END) {
-			fprintf(stderr, "Attempted to write bootloader but bootloader writes are not enabled\n");
-			return -1;
-		}
-	}
-	return 0;
+        if (seg->start & (BLOCK_SIZE-1)) {
+            fprintf(stderr, "Error: Segment is not aligned\n");
+            return -1;
+        }
+        if (seg->start < FLASH_START) {
+            fprintf(stderr, "Error: Segment is outside of flash bounds\n");
+            return -1;
+        }
+        if (seg->start + seg->length > FLASH_END) {
+            fprintf(stderr, "Error: Segment is outside of flash bounds\n");
+            return -1;
+        }
+        if (!can_write_bl && seg->start < BOOTLOADER_END) {
+            fprintf(stderr, "Attempted to write bootloader but bootloader writes are not enabled\n");
+            return -1;
+        }
+    }
+    return 0;
 }
 
 // Load an ELF file and prepare it for flashing
 int flash_load(flash_file_t *ctx, const char *name, int can_write_bl) {
-	FILE *fd = NULL;
-	Elf32_Ehdr ehdr;
-	Elf32_Phdr *phdrs = NULL;
-	uint16_t num_phdrs;
-	int res;
+    FILE *fd = NULL;
+    Elf32_Ehdr ehdr;
+    Elf32_Phdr *phdrs = NULL;
+    uint16_t num_phdrs;
+    int res;
 
-	fd = fopen(name, "rb");
-	if (!fd) {
-		fprintf(stderr, _RED_(Could not open file) "%s  >>> ", name);
-		perror(NULL);
-		goto fail;
-	}
+    fd = fopen(name, "rb");
+    if (!fd) {
+        fprintf(stderr, _RED_(Could not open file) "%s  >>> ", name);
+        perror(NULL);
+        goto fail;
+    }
 
-	fprintf(stdout, _BLUE_(Loading ELF file) "%s\n", name);
+    fprintf(stdout, _BLUE_(Loading ELF file) "%s\n", name);
 
-	if (fread(&ehdr, sizeof(ehdr), 1, fd) != 1) {
-		fprintf(stderr, "Error while reading ELF file header\n");
-		goto fail;
-	}
-	if (memcmp(ehdr.e_ident, elf_ident, sizeof(elf_ident))
-		|| le32(ehdr.e_version) != 1)
-	{
-		fprintf(stderr, "Not an ELF file or wrong ELF type\n");
-		goto fail;
-	}
-	if (le16(ehdr.e_type) != ET_EXEC) {
-		fprintf(stderr, "ELF is not executable\n");
-		goto fail;
-	}
-	if (le16(ehdr.e_machine) != EM_ARM) {
-		fprintf(stderr, "Wrong ELF architecture\n");
-		goto fail;
-	}
-	if (!ehdr.e_phnum || !ehdr.e_phoff) {
-		fprintf(stderr, "ELF has no PHDRs\n");
-		goto fail;
-	}
-	if (le16(ehdr.e_phentsize) != sizeof(Elf32_Phdr)) {
-		// could be a structure padding issue...
-		fprintf(stderr, "Either the ELF file or this code is made of fail\n");
-		goto fail;
-	}
-	num_phdrs = le16(ehdr.e_phnum);
+    if (fread(&ehdr, sizeof(ehdr), 1, fd) != 1) {
+        fprintf(stderr, "Error while reading ELF file header\n");
+        goto fail;
+    }
+    if (memcmp(ehdr.e_ident, elf_ident, sizeof(elf_ident))
+        || le32(ehdr.e_version) != 1)
+    {
+        fprintf(stderr, "Not an ELF file or wrong ELF type\n");
+        goto fail;
+    }
+    if (le16(ehdr.e_type) != ET_EXEC) {
+        fprintf(stderr, "ELF is not executable\n");
+        goto fail;
+    }
+    if (le16(ehdr.e_machine) != EM_ARM) {
+        fprintf(stderr, "Wrong ELF architecture\n");
+        goto fail;
+    }
+    if (!ehdr.e_phnum || !ehdr.e_phoff) {
+        fprintf(stderr, "ELF has no PHDRs\n");
+        goto fail;
+    }
+    if (le16(ehdr.e_phentsize) != sizeof(Elf32_Phdr)) {
+        // could be a structure padding issue...
+        fprintf(stderr, "Either the ELF file or this code is made of fail\n");
+        goto fail;
+    }
+    num_phdrs = le16(ehdr.e_phnum);
 
-	phdrs = calloc(le16(ehdr.e_phnum) * sizeof(Elf32_Phdr), sizeof(uint8_t));
-	if (!phdrs) {
-		fprintf(stderr, "Out of memory\n");
-		goto fail;
-	}
-	if (fseek(fd, le32(ehdr.e_phoff), SEEK_SET) < 0) {
-		fprintf(stderr, "Error while reading ELF PHDRs\n");
-		goto fail;
-	}
-	if (fread(phdrs, sizeof(Elf32_Phdr), num_phdrs, fd) != num_phdrs) {
-		fprintf(stderr, "Error while reading ELF PHDRs\n");
-		goto fail;
-	}
+    phdrs = calloc(le16(ehdr.e_phnum) * sizeof(Elf32_Phdr), sizeof(uint8_t));
+    if (!phdrs) {
+        fprintf(stderr, "Out of memory\n");
+        goto fail;
+    }
+    if (fseek(fd, le32(ehdr.e_phoff), SEEK_SET) < 0) {
+        fprintf(stderr, "Error while reading ELF PHDRs\n");
+        goto fail;
+    }
+    if (fread(phdrs, sizeof(Elf32_Phdr), num_phdrs, fd) != num_phdrs) {
+        fprintf(stderr, "Error while reading ELF PHDRs\n");
+        goto fail;
+    }
 
-	res = build_segs_from_phdrs(ctx, fd, phdrs, num_phdrs);
-	if (res < 0)
-		goto fail;
-	res = check_segs(ctx, can_write_bl);
-	if (res < 0)
-		goto fail;
+    res = build_segs_from_phdrs(ctx, fd, phdrs, num_phdrs);
+    if (res < 0)
+        goto fail;
+    res = check_segs(ctx, can_write_bl);
+    if (res < 0)
+        goto fail;
 
-	free(phdrs);
-	fclose(fd);
-	ctx->filename = name;
-	return 0;
+    free(phdrs);
+    fclose(fd);
+    ctx->filename = name;
+    return 0;
 
 fail:
-	if (phdrs)
-		free(phdrs);
-	if (fd)
-		fclose(fd);
-	flash_free(ctx);
-	return -1;
+    if (phdrs)
+        free(phdrs);
+    if (fd)
+        fclose(fd);
+    flash_free(ctx);
+    return -1;
 }
 
 // Get the state of the proxmark, backwards compatible
 static int get_proxmark_state(uint32_t *state) {
-	UsbCommand c = {CMD_DEVICE_INFO};
-	SendCommand(&c);
-	UsbCommand resp;
-	WaitForResponse(CMD_UNKNOWN, &resp);  // wait for any response. No timeout.
+    UsbCommand c = {CMD_DEVICE_INFO};
+    SendCommand(&c);
+    UsbCommand resp;
+    WaitForResponse(CMD_UNKNOWN, &resp);  // wait for any response. No timeout.
 
-	// Three outcomes:
-	// 1. The old bootrom code will ignore CMD_DEVICE_INFO, but respond with an ACK
-	// 2. The old os code will respond with CMD_DEBUG_PRINT_STRING and "unknown command"
-	// 3. The new bootrom and os codes will respond with CMD_DEVICE_INFO and flags
+    // Three outcomes:
+    // 1. The old bootrom code will ignore CMD_DEVICE_INFO, but respond with an ACK
+    // 2. The old os code will respond with CMD_DEBUG_PRINT_STRING and "unknown command"
+    // 3. The new bootrom and os codes will respond with CMD_DEVICE_INFO and flags
 
-	switch (resp.cmd) {
-		case CMD_ACK:
-			*state = DEVICE_INFO_FLAG_CURRENT_MODE_BOOTROM;
-			break;
-		case CMD_DEBUG_PRINT_STRING:
-			*state = DEVICE_INFO_FLAG_CURRENT_MODE_OS;
-			break;
-		case CMD_DEVICE_INFO:
-			*state = resp.arg[0];
-			break;
-		default:
-			fprintf(stderr, _RED_(Error:) "Couldn't get proxmark state, bad response type: 0x%04" PRIx64 "\n", resp.cmd);
-			return -1;
-			break;
-	}
-	return 0;
+    switch (resp.cmd) {
+        case CMD_ACK:
+            *state = DEVICE_INFO_FLAG_CURRENT_MODE_BOOTROM;
+            break;
+        case CMD_DEBUG_PRINT_STRING:
+            *state = DEVICE_INFO_FLAG_CURRENT_MODE_OS;
+            break;
+        case CMD_DEVICE_INFO:
+            *state = resp.arg[0];
+            break;
+        default:
+            fprintf(stderr, _RED_(Error:) "Couldn't get proxmark state, bad response type: 0x%04" PRIx64 "\n", resp.cmd);
+            return -1;
+            break;
+    }
+    return 0;
 }
 
 // Enter the bootloader to be able to start flashing
 static int enter_bootloader(char *serial_port_name) {
-	uint32_t state;
+    uint32_t state;
 
-	if (get_proxmark_state(&state) < 0)
-		return -1;
+    if (get_proxmark_state(&state) < 0)
+        return -1;
 
-	/* Already in flash state, we're done. */
-	if (state & DEVICE_INFO_FLAG_CURRENT_MODE_BOOTROM)
-		return 0;
+    /* Already in flash state, we're done. */
+    if (state & DEVICE_INFO_FLAG_CURRENT_MODE_BOOTROM)
+        return 0;
 
-	if (state & DEVICE_INFO_FLAG_CURRENT_MODE_OS) {
-		fprintf(stdout, _BLUE_(Entering bootloader...) "\n");
-		UsbCommand c;
-		memset(&c, 0, sizeof (c));
+    if (state & DEVICE_INFO_FLAG_CURRENT_MODE_OS) {
+        fprintf(stdout, _BLUE_(Entering bootloader...) "\n");
+        UsbCommand c;
+        memset(&c, 0, sizeof (c));
 
-		if ((state & DEVICE_INFO_FLAG_BOOTROM_PRESENT)
-			&& (state & DEVICE_INFO_FLAG_OSIMAGE_PRESENT)) {
-			// New style handover: Send CMD_START_FLASH, which will reset the board
-			// and enter the bootrom on the next boot.
-			c.cmd = CMD_START_FLASH;
-			SendCommand(&c);
-			fprintf(stdout, "(Press and release the button only to abort)\n");
-		} else {
-			// Old style handover: Ask the user to press the button, then reset the board
-			c.cmd = CMD_HARDWARE_RESET;
-			SendCommand(&c);
-			fprintf(stdout, "Press and hold down button NOW if your bootloader requires it.\n");
-		}
-		msleep(100);
-		CloseProxmark();
+        if ((state & DEVICE_INFO_FLAG_BOOTROM_PRESENT)
+            && (state & DEVICE_INFO_FLAG_OSIMAGE_PRESENT)) {
+            // New style handover: Send CMD_START_FLASH, which will reset the board
+            // and enter the bootrom on the next boot.
+            c.cmd = CMD_START_FLASH;
+            SendCommand(&c);
+            fprintf(stdout, "(Press and release the button only to abort)\n");
+        } else {
+            // Old style handover: Ask the user to press the button, then reset the board
+            c.cmd = CMD_HARDWARE_RESET;
+            SendCommand(&c);
+            fprintf(stdout, "Press and hold down button NOW if your bootloader requires it.\n");
+        }
+        msleep(100);
+        CloseProxmark();
 
-		bool opened = OpenProxmark(serial_port_name, true, 60, true);
-		if (opened) {
-			fprintf(stdout, " " _GREEN_(Found) "\n");
-			return 0;
-		} else {
-			fprintf(stdout, _RED_(Error:) "Proxmark not found.\n");
-			return -1;
-		}
-	}
+        bool opened = OpenProxmark(serial_port_name, true, 60, true);
+        if (opened) {
+            fprintf(stdout, " " _GREEN_(Found) "\n");
+            return 0;
+        } else {
+            fprintf(stdout, _RED_(Error:) "Proxmark not found.\n");
+            return -1;
+        }
+    }
 
-	fprintf(stderr, _RED_(Error:) "Unknown Proxmark mode\n");
-	return -1;
+    fprintf(stderr, _RED_(Error:) "Unknown Proxmark mode\n");
+    return -1;
 }
 
 static int wait_for_ack(UsbCommand *ack) {
-	WaitForResponse(CMD_UNKNOWN, ack);
+    WaitForResponse(CMD_UNKNOWN, ack);
 
-	if (ack->cmd != CMD_ACK) {
-		printf("Error: Unexpected reply 0x%04" PRIx64 " %s (expected ACK)\n",
-			ack->cmd,
-			(ack->cmd == CMD_NACK) ? "NACK" : ""
-			);
-		return -1;
-	}
-	return 0;
+    if (ack->cmd != CMD_ACK) {
+        printf("Error: Unexpected reply 0x%04" PRIx64 " %s (expected ACK)\n",
+            ack->cmd,
+            (ack->cmd == CMD_NACK) ? "NACK" : ""
+            );
+        return -1;
+    }
+    return 0;
 }
 
 // Go into flashing mode
 int flash_start_flashing(int enable_bl_writes, char *serial_port_name) {
-	uint32_t state;
+    uint32_t state;
 
-	if (enter_bootloader(serial_port_name) < 0)
-		return -1;
+    if (enter_bootloader(serial_port_name) < 0)
+        return -1;
 
-	if (get_proxmark_state(&state) < 0)
-		return -1;
+    if (get_proxmark_state(&state) < 0)
+        return -1;
 
-	if (state & DEVICE_INFO_FLAG_UNDERSTANDS_START_FLASH) {
-		// This command is stupid. Why the heck does it care which area we're
-		// flashing, as long as it's not the bootloader area? The mind boggles.
-		UsbCommand c = {CMD_START_FLASH};
+    if (state & DEVICE_INFO_FLAG_UNDERSTANDS_START_FLASH) {
+        // This command is stupid. Why the heck does it care which area we're
+        // flashing, as long as it's not the bootloader area? The mind boggles.
+        UsbCommand c = {CMD_START_FLASH};
 
-		if (enable_bl_writes) {
-			c.arg[0] = FLASH_START;
-			c.arg[1] = FLASH_END;
-			c.arg[2] = START_FLASH_MAGIC;
-		} else {
-			c.arg[0] = BOOTLOADER_END;
-			c.arg[1] = FLASH_END;
-			c.arg[2] = 0;
-		}
-		SendCommand(&c);
-		return wait_for_ack(&c);
-	} else {
-		fprintf(stderr, _RED_(Note: Your bootloader does not understand the new START_FLASH command) "\n");
-		fprintf(stderr, _RED_(      It is recommended that you update your bootloader) "\n\n");
-	}
-	return 0;
+        if (enable_bl_writes) {
+            c.arg[0] = FLASH_START;
+            c.arg[1] = FLASH_END;
+            c.arg[2] = START_FLASH_MAGIC;
+        } else {
+            c.arg[0] = BOOTLOADER_END;
+            c.arg[1] = FLASH_END;
+            c.arg[2] = 0;
+        }
+        SendCommand(&c);
+        return wait_for_ack(&c);
+    } else {
+        fprintf(stderr, _RED_(Note: Your bootloader does not understand the new START_FLASH command) "\n");
+        fprintf(stderr, _RED_(      It is recommended that you update your bootloader) "\n\n");
+    }
+    return 0;
 }
 
 static int write_block(uint32_t address, uint8_t *data, uint32_t length) {
-	uint8_t block_buf[BLOCK_SIZE];
-	memset(block_buf, 0xFF, BLOCK_SIZE);
-	memcpy(block_buf, data, length);
-	UsbCommand c = {CMD_FINISH_WRITE, {address, 0, 0}};
-	memcpy(c.d.asBytes, block_buf, length);
-	SendCommand(&c);
-	int ret = wait_for_ack(&c);
-	if (ret && c.arg[0]) {
-		uint32_t lock_bits = c.arg[0] >> 16;
-		bool lock_error = c.arg[0] & AT91C_MC_LOCKE;
-		bool prog_error = c.arg[0] & AT91C_MC_PROGE;
-		bool security_bit = c.arg[0] & AT91C_MC_SECURITY;
-		printf("%s", lock_error ? "       Lock Error\n" : "");
-		printf("%s", prog_error ? "       Invalid Command or bad Keyword\n" : "");
-		printf("%s", security_bit ? "       Security Bit is set!\n" : "");
-		printf("       Lock Bits:      0x%04x\n", lock_bits);
-	}
-	return ret;
+    uint8_t block_buf[BLOCK_SIZE];
+    memset(block_buf, 0xFF, BLOCK_SIZE);
+    memcpy(block_buf, data, length);
+    UsbCommand c = {CMD_FINISH_WRITE, {address, 0, 0}};
+    memcpy(c.d.asBytes, block_buf, length);
+    SendCommand(&c);
+    int ret = wait_for_ack(&c);
+    if (ret && c.arg[0]) {
+        uint32_t lock_bits = c.arg[0] >> 16;
+        bool lock_error = c.arg[0] & AT91C_MC_LOCKE;
+        bool prog_error = c.arg[0] & AT91C_MC_PROGE;
+        bool security_bit = c.arg[0] & AT91C_MC_SECURITY;
+        printf("%s", lock_error ? "       Lock Error\n" : "");
+        printf("%s", prog_error ? "       Invalid Command or bad Keyword\n" : "");
+        printf("%s", security_bit ? "       Security Bit is set!\n" : "");
+        printf("       Lock Bits:      0x%04x\n", lock_bits);
+    }
+    return ret;
 }
 
 // Write a file's segments to Flash
 int flash_write(flash_file_t *ctx) {
-	fprintf(stdout, "Writing segments for file: %s\n", ctx->filename);
-	for (int i = 0; i < ctx->num_segs; i++) {
-		flash_seg_t *seg = &ctx->segments[i];
+    fprintf(stdout, "Writing segments for file: %s\n", ctx->filename);
+    for (int i = 0; i < ctx->num_segs; i++) {
+        flash_seg_t *seg = &ctx->segments[i];
 
-		uint32_t length = seg->length;
-		uint32_t blocks = (length + BLOCK_SIZE - 1) / BLOCK_SIZE;
-		uint32_t end = seg->start + length;
+        uint32_t length = seg->length;
+        uint32_t blocks = (length + BLOCK_SIZE - 1) / BLOCK_SIZE;
+        uint32_t end = seg->start + length;
 
-		fprintf(stdout, " 0x%08x..0x%08x [0x%x / %d blocks]", seg->start, end - 1, length, blocks);
-		fflush(stdout);
-		int block = 0;
-		uint8_t *data = seg->data;
-		uint32_t baddr = seg->start;
+        fprintf(stdout, " 0x%08x..0x%08x [0x%x / %d blocks]", seg->start, end - 1, length, blocks);
+        fflush(stdout);
+        int block = 0;
+        uint8_t *data = seg->data;
+        uint32_t baddr = seg->start;
 
-		while (length) {
-			uint32_t block_size = length;
-			if (block_size > BLOCK_SIZE)
-				block_size = BLOCK_SIZE;
+        while (length) {
+            uint32_t block_size = length;
+            if (block_size > BLOCK_SIZE)
+                block_size = BLOCK_SIZE;
 
-			if (write_block(baddr, data, block_size) < 0) {
-				fprintf(stderr, " ERROR\n");
-				fprintf(stderr, "Error writing block %d of %d\n", block, blocks);
-				return -1;
-			}
+            if (write_block(baddr, data, block_size) < 0) {
+                fprintf(stderr, " ERROR\n");
+                fprintf(stderr, "Error writing block %d of %d\n", block, blocks);
+                return -1;
+            }
 
-			data += block_size;
-			baddr += block_size;
-			length -= block_size;
-			block++;
-			fprintf(stdout, "."); fflush(stdout);
-		}
-		fprintf(stdout, _GREEN_(OK) "\n");
-		fflush(stdout);
-	}
-	return 0;
+            data += block_size;
+            baddr += block_size;
+            length -= block_size;
+            block++;
+            fprintf(stdout, "."); fflush(stdout);
+        }
+        fprintf(stdout, _GREEN_(OK) "\n");
+        fflush(stdout);
+    }
+    return 0;
 }
 
 // free a file context
 void flash_free(flash_file_t *ctx) {
-	if (!ctx)
-		return;
-	if (ctx->segments) {
-		for (int i = 0; i < ctx->num_segs; i++)
-			free(ctx->segments[i].data);
-		free(ctx->segments);
-		ctx->segments = NULL;
-		ctx->num_segs = 0;
-	}
+    if (!ctx)
+        return;
+    if (ctx->segments) {
+        for (int i = 0; i < ctx->num_segs; i++)
+            free(ctx->segments[i].data);
+        free(ctx->segments);
+        ctx->segments = NULL;
+        ctx->num_segs = 0;
+    }
 }
 
 // just reset the unit
 int flash_stop_flashing(void) {
-	UsbCommand c = {CMD_HARDWARE_RESET};
-	SendCommand(&c);
-	msleep(100);
-	return 0;
+    UsbCommand c = {CMD_HARDWARE_RESET};
+    SendCommand(&c);
+    msleep(100);
+    return 0;
 }
\ No newline at end of file
diff --git a/client/flash.h b/client/flash.h
index 5372df089..547a8d1d6 100644
--- a/client/flash.h
+++ b/client/flash.h
@@ -25,16 +25,16 @@
 #include "comms.h"
 
 typedef struct {
-	void *data;
-	uint32_t start;
-	uint32_t length;
+    void *data;
+    uint32_t start;
+    uint32_t length;
 } flash_seg_t;
 
 typedef struct {
-	const char *filename;
-	int can_write_bl;
-	int num_segs;
-	flash_seg_t *segments;
+    const char *filename;
+    int can_write_bl;
+    int num_segs;
+    flash_seg_t *segments;
 } flash_file_t;
 
 int flash_load(flash_file_t *ctx, const char *name, int can_write_bl);
diff --git a/client/flasher.c b/client/flasher.c
index c1ec7b4f1..9c5488bee 100644
--- a/client/flasher.c
+++ b/client/flasher.c
@@ -21,95 +21,95 @@
 #define MAX_FILES 4
 
 void cmd_debug(UsbCommand* c) {
-	//  Debug
-	printf("UsbCommand length[len=%zd]\n", sizeof(UsbCommand));
-	printf("  cmd[len=%zd]: %016" PRIx64"\n", sizeof(c->cmd), c->cmd);
-	printf(" arg0[len=%zd]: %016" PRIx64"\n", sizeof(c->arg[0]), c->arg[0]);
-	printf(" arg1[len=%zd]: %016" PRIx64"\n", sizeof(c->arg[1]), c->arg[1]);
-	printf(" arg2[len=%zd]: %016" PRIx64"\n", sizeof(c->arg[2]), c->arg[2]);
-	printf(" data[len=%zd]: ", sizeof(c->d.asBytes));
+    //  Debug
+    printf("UsbCommand length[len=%zd]\n", sizeof(UsbCommand));
+    printf("  cmd[len=%zd]: %016" PRIx64"\n", sizeof(c->cmd), c->cmd);
+    printf(" arg0[len=%zd]: %016" PRIx64"\n", sizeof(c->arg[0]), c->arg[0]);
+    printf(" arg1[len=%zd]: %016" PRIx64"\n", sizeof(c->arg[1]), c->arg[1]);
+    printf(" arg2[len=%zd]: %016" PRIx64"\n", sizeof(c->arg[2]), c->arg[2]);
+    printf(" data[len=%zd]: ", sizeof(c->d.asBytes));
 
-	for (size_t i=0; i<16; i++)
-		printf("%02x", c->d.asBytes[i]);
+    for (size_t i=0; i<16; i++)
+        printf("%02x", c->d.asBytes[i]);
 
-	printf("...\n");
+    printf("...\n");
 }
 
 static void usage(char *argv0) {
-	fprintf(stdout, "Usage:   %s <port> [-b] image.elf [image.elf...]\n\n", argv0);
-	fprintf(stdout, "\t-b\tEnable flashing of bootloader area (DANGEROUS)\n\n");
-	fprintf(stdout, "\nExample:\n\n\t %s "SERIAL_PORT_H" armsrc/obj/fullimage.elf\n", argv0);
+    fprintf(stdout, "Usage:   %s <port> [-b] image.elf [image.elf...]\n\n", argv0);
+    fprintf(stdout, "\t-b\tEnable flashing of bootloader area (DANGEROUS)\n\n");
+    fprintf(stdout, "\nExample:\n\n\t %s "SERIAL_PORT_H" armsrc/obj/fullimage.elf\n", argv0);
 #ifdef __linux__
-	fprintf(stdout, "\nNote (Linux): if the flasher gets stuck in 'Waiting for Proxmark to reappear on <DEVICE>',\n");
-	fprintf(stdout, "              you need to blacklist proxmark for modem-manager - see wiki for more details:\n\n");
-	fprintf(stdout, "              https://github.com/Proxmark/proxmark3/wiki/Gentoo Linux\n\n");
-	fprintf(stdout, "              https://github.com/Proxmark/proxmark3/wiki/Ubuntu Linux\n\n");
-	fprintf(stdout, "              https://github.com/Proxmark/proxmark3/wiki/OSX\n\n");
+    fprintf(stdout, "\nNote (Linux): if the flasher gets stuck in 'Waiting for Proxmark to reappear on <DEVICE>',\n");
+    fprintf(stdout, "              you need to blacklist proxmark for modem-manager - see wiki for more details:\n\n");
+    fprintf(stdout, "              https://github.com/Proxmark/proxmark3/wiki/Gentoo Linux\n\n");
+    fprintf(stdout, "              https://github.com/Proxmark/proxmark3/wiki/Ubuntu Linux\n\n");
+    fprintf(stdout, "              https://github.com/Proxmark/proxmark3/wiki/OSX\n\n");
 #endif
 }
 
 int main(int argc, char **argv) {
-	int can_write_bl = 0;
-	int num_files = 0;
-	int res;
-	flash_file_t files[MAX_FILES];
+    int can_write_bl = 0;
+    int num_files = 0;
+    int res;
+    flash_file_t files[MAX_FILES];
 
-	memset(files, 0, sizeof(files));
+    memset(files, 0, sizeof(files));
 
-	if (argc < 3) {
-		usage(argv[0]);
-		return -1;
-	}
+    if (argc < 3) {
+        usage(argv[0]);
+        return -1;
+    }
 
-	for (int i = 2; i < argc; i++) {
-		if (argv[i][0] == '-') {
-			if (!strcmp(argv[i], "-b")) {
-				can_write_bl = 1;
-			} else {
-				usage(argv[0]);
-				return -1;
-			}
-		} else {
-			res = flash_load(&files[num_files], argv[i], can_write_bl);
-			if (res < 0)
-				return -1;
+    for (int i = 2; i < argc; i++) {
+        if (argv[i][0] == '-') {
+            if (!strcmp(argv[i], "-b")) {
+                can_write_bl = 1;
+            } else {
+                usage(argv[0]);
+                return -1;
+            }
+        } else {
+            res = flash_load(&files[num_files], argv[i], can_write_bl);
+            if (res < 0)
+                return -1;
 
-			fprintf(stderr, "\n");
-			num_files++;
-		}
-	}
+            fprintf(stderr, "\n");
+            num_files++;
+        }
+    }
 
-	char* serial_port_name = argv[1];
+    char* serial_port_name = argv[1];
 
-	if (!OpenProxmark(serial_port_name, true, 60, true)) {
-		fprintf(stderr, "Could not find Proxmark on " _RED_(%s) ".\n\n", serial_port_name);
-		return -1;
-	} else {
-		fprintf(stderr, _GREEN_(Found) "\n");
-	}
+    if (!OpenProxmark(serial_port_name, true, 60, true)) {
+        fprintf(stderr, "Could not find Proxmark on " _RED_(%s) ".\n\n", serial_port_name);
+        return -1;
+    } else {
+        fprintf(stderr, _GREEN_(Found) "\n");
+    }
 
-	res = flash_start_flashing(can_write_bl, serial_port_name);
-	if (res < 0)
-		return -1;
+    res = flash_start_flashing(can_write_bl, serial_port_name);
+    if (res < 0)
+        return -1;
 
-	fprintf(stdout, "\n" _BLUE_(Flashing...)"\n");
+    fprintf(stdout, "\n" _BLUE_(Flashing...)"\n");
 
-	for (int i = 0; i < num_files; i++) {
-		res = flash_write(&files[i]);
-		if (res < 0)
-			return -1;
-		flash_free(&files[i]);
-		fprintf(stdout, "\n");
-	}
+    for (int i = 0; i < num_files; i++) {
+        res = flash_write(&files[i]);
+        if (res < 0)
+            return -1;
+        flash_free(&files[i]);
+        fprintf(stdout, "\n");
+    }
 
-	fprintf(stdout, _BLUE_(Resetting hardware...) "\n");
+    fprintf(stdout, _BLUE_(Resetting hardware...) "\n");
 
-	res = flash_stop_flashing();
-	if (res < 0)
-		return -1;
+    res = flash_stop_flashing();
+    if (res < 0)
+        return -1;
 
-	CloseProxmark();
+    CloseProxmark();
 
-	fprintf(stdout, _BLUE_(All done.) "\n\nHave a nice day!\n");
-	return 0;
+    fprintf(stdout, _BLUE_(All done.) "\n\nHave a nice day!\n");
+    return 0;
 }
diff --git a/client/fpga_compress.c b/client/fpga_compress.c
index 1f959fa9f..3b2f900b9 100644
--- a/client/fpga_compress.c
+++ b/client/fpga_compress.c
@@ -24,242 +24,242 @@
 #define MAX(a,b) ((a)>(b)?(a):(b))
 
 // zlib configuration
-#define COMPRESS_LEVEL			9		// use best possible compression
-#define COMPRESS_WINDOW_BITS	15		// default = max = 15 for a window of 2^15 = 32KBytes
-#define COMPRESS_MEM_LEVEL		9		// determines the amount of memory allocated during compression. Default = 8.
+#define COMPRESS_LEVEL          9  // use best possible compression
+#define COMPRESS_WINDOW_BITS    15 // default = max = 15 for a window of 2^15 = 32KBytes
+#define COMPRESS_MEM_LEVEL      9  // determines the amount of memory allocated during compression. Default = 8.
 /* COMPRESS_STRATEGY can be
-	Z_DEFAULT_STRATEGY (the default),
-	Z_FILTERED (more huffmann, less string matching),
-	Z_HUFFMAN_ONLY (huffman only, no string matching)
-	Z_RLE (distances limited to one)
-	Z_FIXED (prevents the use of dynamic Huffman codes)
+    Z_DEFAULT_STRATEGY (the default),
+    Z_FILTERED (more huffmann, less string matching),
+    Z_HUFFMAN_ONLY (huffman only, no string matching)
+    Z_RLE (distances limited to one)
+    Z_FIXED (prevents the use of dynamic Huffman codes)
 */
 
-#define	COMPRESS_STRATEGY		Z_DEFAULT_STRATEGY
+#define COMPRESS_STRATEGY         Z_DEFAULT_STRATEGY
 // zlib tuning parameters:
-#define COMPRESS_GOOD_LENGTH		258
-#define	COMPRESS_MAX_LAZY			258
-#define	COMPRESS_MAX_NICE_LENGTH	258
-#define	COMPRESS_MAX_CHAIN			8192
+#define COMPRESS_GOOD_LENGTH      258
+#define COMPRESS_MAX_LAZY         258
+#define COMPRESS_MAX_NICE_LENGTH  258
+#define COMPRESS_MAX_CHAIN        8192
 
-#define HARDNESTED_TABLE_SIZE		(sizeof(uint32_t) * ((1L<<19)+1))
+#define HARDNESTED_TABLE_SIZE (sizeof(uint32_t) * ((1L<<19)+1))
 
 static void usage(void)
 {
-	fprintf(stdout, "Usage: fpga_compress <infile1> <infile2> ... <infile_n> <outfile>\n");
-	fprintf(stdout, "          Combine n FPGA bitstream files and compress them into one.\n\n");
-	fprintf(stdout, "       fpga_compress -v <infile1> <infile2> ... <infile_n> <outfile>\n");
-	fprintf(stdout, "          Extract Version Information from FPGA bitstream files and write it to <outfile>\n\n");
-	fprintf(stdout, "       fpga_compress -d <infile> <outfile>\n");
-	fprintf(stdout, "          Decompress <infile>. Write result to <outfile>\n\n");
-	fprintf(stdout, "       fpga_compress -t <infile> <outfile>\n");
-	fprintf(stdout, "          Compress hardnested table <infile>. Write result to <outfile>\n\n");
+    fprintf(stdout, "Usage: fpga_compress <infile1> <infile2> ... <infile_n> <outfile>\n");
+    fprintf(stdout, "          Combine n FPGA bitstream files and compress them into one.\n\n");
+    fprintf(stdout, "       fpga_compress -v <infile1> <infile2> ... <infile_n> <outfile>\n");
+    fprintf(stdout, "          Extract Version Information from FPGA bitstream files and write it to <outfile>\n\n");
+    fprintf(stdout, "       fpga_compress -d <infile> <outfile>\n");
+    fprintf(stdout, "          Decompress <infile>. Write result to <outfile>\n\n");
+    fprintf(stdout, "       fpga_compress -t <infile> <outfile>\n");
+    fprintf(stdout, "          Compress hardnested table <infile>. Write result to <outfile>\n\n");
 }
 
 
 static voidpf fpga_deflate_malloc(voidpf opaque, uInt items, uInt size)
 {
-	return calloc(items*size, sizeof(uint8_t));
+    return calloc(items*size, sizeof(uint8_t));
 }
 
 
 static void fpga_deflate_free(voidpf opaque, voidpf address)
 {
-	free(address);
+    free(address);
 }
 
 
 static bool all_feof(FILE *infile[], uint8_t num_infiles)
 {
-	for (uint16_t i = 0; i < num_infiles; i++) {
-		if (!feof(infile[i])) {
-			return false;
-		}
-	}
-	return true;
+    for (uint16_t i = 0; i < num_infiles; i++) {
+        if (!feof(infile[i])) {
+            return false;
+        }
+    }
+    return true;
 }
 
 
 int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile, bool hardnested_mode)
 {
-	uint8_t *fpga_config;
-	uint32_t i;
-	int32_t ret;
-	uint8_t c;
-	z_stream compressed_fpga_stream;
+    uint8_t *fpga_config;
+    uint32_t i;
+    int32_t ret;
+    uint8_t c;
+    z_stream compressed_fpga_stream;
 
-	if (hardnested_mode) {
-		fpga_config = calloc(num_infiles * HARDNESTED_TABLE_SIZE, sizeof(uint8_t));
-	} else {
-		fpga_config = calloc(num_infiles * FPGA_CONFIG_SIZE, sizeof(uint8_t));
-	}
-	// read the input files. Interleave them into fpga_config[]
-	i = 0;
-	do {
+    if (hardnested_mode) {
+        fpga_config = calloc(num_infiles * HARDNESTED_TABLE_SIZE, sizeof(uint8_t));
+    } else {
+        fpga_config = calloc(num_infiles * FPGA_CONFIG_SIZE, sizeof(uint8_t));
+    }
+    // read the input files. Interleave them into fpga_config[]
+    i = 0;
+    do {
 
-		if (i >= num_infiles * (hardnested_mode ? HARDNESTED_TABLE_SIZE : FPGA_CONFIG_SIZE)) {
-			if (hardnested_mode) {
-				fprintf(stderr,
+        if (i >= num_infiles * (hardnested_mode ? HARDNESTED_TABLE_SIZE : FPGA_CONFIG_SIZE)) {
+            if (hardnested_mode) {
+                fprintf(stderr,
 #if __WORDSIZE == 64
-				"Input file too big (> %" PRIu64 " bytes). This is probably not a hardnested bitflip state table.\n"
+                "Input file too big (> %" PRIu64 " bytes). This is probably not a hardnested bitflip state table.\n"
 #else
-				"Input file too big (> %lu bytes). This is probably not a hardnested bitflip state table.\n"
+                "Input file too big (> %lu bytes). This is probably not a hardnested bitflip state table.\n"
 #endif
-				, HARDNESTED_TABLE_SIZE);
+                , HARDNESTED_TABLE_SIZE);
 
-			} else {
-				fprintf(stderr, "Input files too big (total > %lu bytes). These are probably not PM3 FPGA config files.\n", num_infiles * FPGA_CONFIG_SIZE);
-			}
-			for(uint16_t j = 0; j < num_infiles; j++) {
-				fclose(infile[j]);
-			}
-			free(fpga_config);
-			return(EXIT_FAILURE);
-		}
+            } else {
+                fprintf(stderr, "Input files too big (total > %lu bytes). These are probably not PM3 FPGA config files.\n", num_infiles * FPGA_CONFIG_SIZE);
+            }
+            for(uint16_t j = 0; j < num_infiles; j++) {
+                fclose(infile[j]);
+            }
+            free(fpga_config);
+            return(EXIT_FAILURE);
+        }
 
-		for(uint16_t j = 0; j < num_infiles; j++) {
-			for(uint16_t k = 0; k < FPGA_INTERLEAVE_SIZE; k++) {
-				c = (uint8_t)fgetc(infile[j]);
-				if (!feof(infile[j])) {
-					fpga_config[i++] = c;
-				} else if (num_infiles > 1) {
-					fpga_config[i++] = '\0';
-				}
-			}
-		}
+        for(uint16_t j = 0; j < num_infiles; j++) {
+            for(uint16_t k = 0; k < FPGA_INTERLEAVE_SIZE; k++) {
+                c = (uint8_t)fgetc(infile[j]);
+                if (!feof(infile[j])) {
+                    fpga_config[i++] = c;
+                } else if (num_infiles > 1) {
+                    fpga_config[i++] = '\0';
+                }
+            }
+        }
 
-	} while (!all_feof(infile, num_infiles));
+    } while (!all_feof(infile, num_infiles));
 
-	// initialize zlib structures
-	compressed_fpga_stream.next_in = fpga_config;
-	compressed_fpga_stream.avail_in = i;
-	compressed_fpga_stream.zalloc = fpga_deflate_malloc;
-	compressed_fpga_stream.zfree = fpga_deflate_free;
-	compressed_fpga_stream.opaque = Z_NULL;
+    // initialize zlib structures
+    compressed_fpga_stream.next_in = fpga_config;
+    compressed_fpga_stream.avail_in = i;
+    compressed_fpga_stream.zalloc = fpga_deflate_malloc;
+    compressed_fpga_stream.zfree = fpga_deflate_free;
+    compressed_fpga_stream.opaque = Z_NULL;
 
-	ret = deflateInit2(&compressed_fpga_stream,
-						COMPRESS_LEVEL,
-						Z_DEFLATED,
-						COMPRESS_WINDOW_BITS,
-						COMPRESS_MEM_LEVEL,
-						COMPRESS_STRATEGY);
+    ret = deflateInit2(&compressed_fpga_stream,
+                        COMPRESS_LEVEL,
+                        Z_DEFLATED,
+                        COMPRESS_WINDOW_BITS,
+                        COMPRESS_MEM_LEVEL,
+                        COMPRESS_STRATEGY);
 
-	// estimate the size of the compressed output
-	uint32_t outsize_max = deflateBound(&compressed_fpga_stream, compressed_fpga_stream.avail_in);
-	uint8_t *outbuf = calloc(outsize_max, sizeof(uint8_t));
-	compressed_fpga_stream.next_out = outbuf;
-	compressed_fpga_stream.avail_out = outsize_max;
+    // estimate the size of the compressed output
+    uint32_t outsize_max = deflateBound(&compressed_fpga_stream, compressed_fpga_stream.avail_in);
+    uint8_t *outbuf = calloc(outsize_max, sizeof(uint8_t));
+    compressed_fpga_stream.next_out = outbuf;
+    compressed_fpga_stream.avail_out = outsize_max;
 
-	if (ret == Z_OK) {
-		ret = deflateTune(&compressed_fpga_stream,
-							COMPRESS_GOOD_LENGTH,
-							COMPRESS_MAX_LAZY,
-							COMPRESS_MAX_NICE_LENGTH,
-							COMPRESS_MAX_CHAIN);
-	}
+    if (ret == Z_OK) {
+        ret = deflateTune(&compressed_fpga_stream,
+                            COMPRESS_GOOD_LENGTH,
+                            COMPRESS_MAX_LAZY,
+                            COMPRESS_MAX_NICE_LENGTH,
+                            COMPRESS_MAX_CHAIN);
+    }
 
-	if (ret == Z_OK) {
-		ret = deflate(&compressed_fpga_stream, Z_FINISH);
-	}
+    if (ret == Z_OK) {
+        ret = deflate(&compressed_fpga_stream, Z_FINISH);
+    }
 
-	fprintf(stdout, "compressed %u input bytes to %lu output bytes\n", i, compressed_fpga_stream.total_out);
+    fprintf(stdout, "compressed %u input bytes to %lu output bytes\n", i, compressed_fpga_stream.total_out);
 
-	if (ret != Z_STREAM_END) {
-		fprintf(stderr, "Error in deflate(): %d %s\n", ret, compressed_fpga_stream.msg);
-		free(outbuf);
-		deflateEnd(&compressed_fpga_stream);
-		for(uint16_t j = 0; j < num_infiles; j++) {
-			fclose(infile[j]);
-		}
-		fclose(outfile);
-		free(infile);
-		free(fpga_config);
-		return(EXIT_FAILURE);
-		}
+    if (ret != Z_STREAM_END) {
+        fprintf(stderr, "Error in deflate(): %d %s\n", ret, compressed_fpga_stream.msg);
+        free(outbuf);
+        deflateEnd(&compressed_fpga_stream);
+        for(uint16_t j = 0; j < num_infiles; j++) {
+            fclose(infile[j]);
+        }
+        fclose(outfile);
+        free(infile);
+        free(fpga_config);
+        return(EXIT_FAILURE);
+        }
 
-	for (i = 0; i < compressed_fpga_stream.total_out; i++) {
-		fputc(outbuf[i], outfile);
-	}
+    for (i = 0; i < compressed_fpga_stream.total_out; i++) {
+        fputc(outbuf[i], outfile);
+    }
 
-	free(outbuf);
-	deflateEnd(&compressed_fpga_stream);
-	for(uint16_t j = 0; j < num_infiles; j++) {
-		fclose(infile[j]);
-	}
-	fclose(outfile);
-	free(infile);
-	free(fpga_config);
+    free(outbuf);
+    deflateEnd(&compressed_fpga_stream);
+    for(uint16_t j = 0; j < num_infiles; j++) {
+        fclose(infile[j]);
+    }
+    fclose(outfile);
+    free(infile);
+    free(fpga_config);
 
-	return(EXIT_SUCCESS);
+    return(EXIT_SUCCESS);
 
 }
 
 
 int zlib_decompress(FILE *infile, FILE *outfile)
 {
-	#define DECOMPRESS_BUF_SIZE 1024
-	uint8_t outbuf[DECOMPRESS_BUF_SIZE];
-	uint8_t inbuf[DECOMPRESS_BUF_SIZE];
-	int32_t ret;
+    #define DECOMPRESS_BUF_SIZE 1024
+    uint8_t outbuf[DECOMPRESS_BUF_SIZE];
+    uint8_t inbuf[DECOMPRESS_BUF_SIZE];
+    int32_t ret;
 
-	z_stream compressed_fpga_stream;
+    z_stream compressed_fpga_stream;
 
-	// initialize zlib structures
-	compressed_fpga_stream.next_in = inbuf;
-	compressed_fpga_stream.avail_in = 0;
-	compressed_fpga_stream.next_out = outbuf;
-	compressed_fpga_stream.avail_out = DECOMPRESS_BUF_SIZE;
-	compressed_fpga_stream.zalloc = fpga_deflate_malloc;
-	compressed_fpga_stream.zfree = fpga_deflate_free;
-	compressed_fpga_stream.opaque = Z_NULL;
+    // initialize zlib structures
+    compressed_fpga_stream.next_in = inbuf;
+    compressed_fpga_stream.avail_in = 0;
+    compressed_fpga_stream.next_out = outbuf;
+    compressed_fpga_stream.avail_out = DECOMPRESS_BUF_SIZE;
+    compressed_fpga_stream.zalloc = fpga_deflate_malloc;
+    compressed_fpga_stream.zfree = fpga_deflate_free;
+    compressed_fpga_stream.opaque = Z_NULL;
 
-	ret = inflateInit2(&compressed_fpga_stream, 0);
+    ret = inflateInit2(&compressed_fpga_stream, 0);
 
-	do {
-		if (compressed_fpga_stream.avail_in == 0) {
-			compressed_fpga_stream.next_in = inbuf;
-			uint16_t i = 0;
-			do {
-				int32_t c = fgetc(infile);
-				if (!feof(infile)) {
-					inbuf[i++] = c & 0xFF;
-					compressed_fpga_stream.avail_in++;
-				} else {
-					break;
-				}
-			} while (i < DECOMPRESS_BUF_SIZE);
-		}
+    do {
+        if (compressed_fpga_stream.avail_in == 0) {
+            compressed_fpga_stream.next_in = inbuf;
+            uint16_t i = 0;
+            do {
+                int32_t c = fgetc(infile);
+                if (!feof(infile)) {
+                    inbuf[i++] = c & 0xFF;
+                    compressed_fpga_stream.avail_in++;
+                } else {
+                    break;
+                }
+            } while (i < DECOMPRESS_BUF_SIZE);
+        }
 
-		ret = inflate(&compressed_fpga_stream, Z_SYNC_FLUSH);
+        ret = inflate(&compressed_fpga_stream, Z_SYNC_FLUSH);
 
-		if (ret != Z_OK && ret != Z_STREAM_END) {
-			break;
-		}
+        if (ret != Z_OK && ret != Z_STREAM_END) {
+            break;
+        }
 
-		if (compressed_fpga_stream.avail_out == 0) {
-			for (uint16_t i = 0; i < DECOMPRESS_BUF_SIZE; i++) {
-				fputc(outbuf[i], outfile);
-			}
-			compressed_fpga_stream.avail_out = DECOMPRESS_BUF_SIZE;
-			compressed_fpga_stream.next_out = outbuf;
-		}
-	} while (ret == Z_OK);
+        if (compressed_fpga_stream.avail_out == 0) {
+            for (uint16_t i = 0; i < DECOMPRESS_BUF_SIZE; i++) {
+                fputc(outbuf[i], outfile);
+            }
+            compressed_fpga_stream.avail_out = DECOMPRESS_BUF_SIZE;
+            compressed_fpga_stream.next_out = outbuf;
+        }
+    } while (ret == Z_OK);
 
-	if (ret == Z_STREAM_END) {  // reached end of input
-		uint16_t i = 0;
-		while (compressed_fpga_stream.avail_out < DECOMPRESS_BUF_SIZE) {
-			fputc(outbuf[i++], outfile);
-			compressed_fpga_stream.avail_out++;
-		}
-		fclose(outfile);
-		fclose(infile);
-		return(EXIT_SUCCESS);
-	} else {
-		fprintf(stderr, "Error. Inflate() returned error %d, %s", ret, compressed_fpga_stream.msg);
-		fclose(outfile);
-		fclose(infile);
-		return(EXIT_FAILURE);
-	}
+    if (ret == Z_STREAM_END) {  // reached end of input
+        uint16_t i = 0;
+        while (compressed_fpga_stream.avail_out < DECOMPRESS_BUF_SIZE) {
+            fputc(outbuf[i++], outfile);
+            compressed_fpga_stream.avail_out++;
+        }
+        fclose(outfile);
+        fclose(infile);
+        return(EXIT_SUCCESS);
+    } else {
+        fprintf(stderr, "Error. Inflate() returned error %d, %s", ret, compressed_fpga_stream.msg);
+        fclose(outfile);
+        fclose(infile);
+        return(EXIT_FAILURE);
+    }
 
 }
 
@@ -272,210 +272,210 @@ int zlib_decompress(FILE *infile, FILE *outfile)
  */
 static int bitparse_find_section(FILE *infile, char section_name, unsigned int *section_length)
 {
-	int result = 0;
-	#define MAX_FPGA_BIT_STREAM_HEADER_SEARCH 100  // maximum number of bytes to search for the requested section
-	uint16_t numbytes = 0;
-	while (numbytes < MAX_FPGA_BIT_STREAM_HEADER_SEARCH) {
-		char current_name = (char)fgetc(infile);
-		numbytes++;
-		if (current_name < 'a' || current_name > 'e') {
-			/* Strange section name, abort */
-			break;
-		}
-		unsigned int current_length = 0;
-		switch (current_name) {
-		case 'e':
-			/* Four byte length field */
-			current_length += fgetc(infile) << 24;
-			current_length += fgetc(infile) << 16;
-			numbytes += 2;
-		default: /* Fall through, two byte length field */
-			current_length += fgetc(infile) << 8;
-			current_length += fgetc(infile) << 0;
-			numbytes += 2;
-		}
+    int result = 0;
+    #define MAX_FPGA_BIT_STREAM_HEADER_SEARCH 100  // maximum number of bytes to search for the requested section
+    uint16_t numbytes = 0;
+    while (numbytes < MAX_FPGA_BIT_STREAM_HEADER_SEARCH) {
+        char current_name = (char)fgetc(infile);
+        numbytes++;
+        if (current_name < 'a' || current_name > 'e') {
+            /* Strange section name, abort */
+            break;
+        }
+        unsigned int current_length = 0;
+        switch (current_name) {
+        case 'e':
+            /* Four byte length field */
+            current_length += fgetc(infile) << 24;
+            current_length += fgetc(infile) << 16;
+            numbytes += 2;
+        default: /* Fall through, two byte length field */
+            current_length += fgetc(infile) << 8;
+            current_length += fgetc(infile) << 0;
+            numbytes += 2;
+        }
 
-		if (current_name != 'e' && current_length > 255) {
-			/* Maybe a parse error */
-			break;
-		}
+        if (current_name != 'e' && current_length > 255) {
+            /* Maybe a parse error */
+            break;
+        }
 
-		if (current_name == section_name) {
-			/* Found it */
-			*section_length = current_length;
-			result = 1;
-			break;
-		}
+        if (current_name == section_name) {
+            /* Found it */
+            *section_length = current_length;
+            result = 1;
+            break;
+        }
 
-		for (uint16_t i = 0; i < current_length && numbytes < MAX_FPGA_BIT_STREAM_HEADER_SEARCH; i++) {
-			(void)fgetc(infile);
-			numbytes++;
-		}
-	}
-	return result;
+        for (uint16_t i = 0; i < current_length && numbytes < MAX_FPGA_BIT_STREAM_HEADER_SEARCH; i++) {
+            (void)fgetc(infile);
+            numbytes++;
+        }
+    }
+    return result;
 }
 
 static int FpgaGatherVersion(FILE *infile, char* infile_name, char *dst, int len)
 {
-	unsigned int fpga_info_len;
-	char tempstr[40] = {0x00};
+    unsigned int fpga_info_len;
+    char tempstr[40] = {0x00};
 
-	dst[0] = '\0';
+    dst[0] = '\0';
 
-	for (uint16_t i = 0; i < FPGA_BITSTREAM_FIXED_HEADER_SIZE; i++) {
-		if (fgetc(infile) != bitparse_fixed_header[i]) {
-			fprintf(stderr, "Invalid FPGA file. Aborting...\n\n");
-			return(EXIT_FAILURE);
-		}
-	}
+    for (uint16_t i = 0; i < FPGA_BITSTREAM_FIXED_HEADER_SIZE; i++) {
+        if (fgetc(infile) != bitparse_fixed_header[i]) {
+            fprintf(stderr, "Invalid FPGA file. Aborting...\n\n");
+            return(EXIT_FAILURE);
+        }
+    }
 
-	if (!memcmp("fpga_lf", basename(infile_name), 7))
-		strncat(dst, "LF", len-1);
-	else if (!memcmp("fpga_hf", basename(infile_name), 7))
-		strncat(dst, "HF", len-1);
+    if (!memcmp("fpga_lf", basename(infile_name), 7))
+        strncat(dst, "LF", len-1);
+    else if (!memcmp("fpga_hf", basename(infile_name), 7))
+        strncat(dst, "HF", len-1);
 
-	strncat(dst, " image built", len-1);
-	if (bitparse_find_section(infile, 'b', &fpga_info_len)) {
-		strncat(dst, " for ", len-1);
-		for (uint16_t i = 0; i < fpga_info_len; i++) {
-			char c = (char)fgetc(infile);
-			if (i < sizeof(tempstr)) {
-				tempstr[i] = c;
-			}
-		}
-		strncat(dst, tempstr, len-1);
-	}
+    strncat(dst, " image built", len-1);
+    if (bitparse_find_section(infile, 'b', &fpga_info_len)) {
+        strncat(dst, " for ", len-1);
+        for (uint16_t i = 0; i < fpga_info_len; i++) {
+            char c = (char)fgetc(infile);
+            if (i < sizeof(tempstr)) {
+                tempstr[i] = c;
+            }
+        }
+        strncat(dst, tempstr, len-1);
+    }
 
-	if (bitparse_find_section(infile, 'c', &fpga_info_len)) {
-		strncat(dst, " on ", len-1);
-		for (uint16_t i = 0; i < fpga_info_len; i++) {
-			char c = (char)fgetc(infile);
-			if (i < sizeof(tempstr)) {
-				tempstr[i] = c;
-			}
-		}
-		strncat(dst, tempstr, len-1);
-	}
+    if (bitparse_find_section(infile, 'c', &fpga_info_len)) {
+        strncat(dst, " on ", len-1);
+        for (uint16_t i = 0; i < fpga_info_len; i++) {
+            char c = (char)fgetc(infile);
+            if (i < sizeof(tempstr)) {
+                tempstr[i] = c;
+            }
+        }
+        strncat(dst, tempstr, len-1);
+    }
 
-	if (bitparse_find_section(infile, 'd', &fpga_info_len)) {
-		strncat(dst, " at ", len-1);
-		for (uint16_t i = 0; i < fpga_info_len; i++) {
-			char c = (char)fgetc(infile);
-			if (i < sizeof(tempstr)) {
-				tempstr[i] = c;
-			}
-		}
-		strncat(dst, tempstr, len-1);
-	}
-	return 0;
+    if (bitparse_find_section(infile, 'd', &fpga_info_len)) {
+        strncat(dst, " at ", len-1);
+        for (uint16_t i = 0; i < fpga_info_len; i++) {
+            char c = (char)fgetc(infile);
+            if (i < sizeof(tempstr)) {
+                tempstr[i] = c;
+            }
+        }
+        strncat(dst, tempstr, len-1);
+    }
+    return 0;
 }
 
 static void print_version_info_preamble(FILE *outfile, int num_infiles) {
-	fprintf(outfile, "//-----------------------------------------------------------------------------\n");
-	fprintf(outfile, "// piwi, 2018\n");
-	fprintf(outfile, "//\n");
-	fprintf(outfile, "// This code is licensed to you under the terms of the GNU GPL, version 2 or,\n");
-	fprintf(outfile, "// at your option, any later version. See the LICENSE.txt file for the text of\n");
-	fprintf(outfile, "// the license.\n");
-	fprintf(outfile, "//-----------------------------------------------------------------------------\n");
-	fprintf(outfile, "// Version information on fpga images\n");
-	fprintf(outfile, "//\n");
-	fprintf(outfile, "// This file is generated by fpga_compress. Don't edit!\n");
-	fprintf(outfile, "//-----------------------------------------------------------------------------\n");
-	fprintf(outfile, "\n");
-	fprintf(outfile, "\n");
-	fprintf(outfile, "const int fpga_bitstream_num = %d;\n", num_infiles);
-	fprintf(outfile, "const char* const fpga_version_information[%d] = {\n", num_infiles);
+    fprintf(outfile, "//-----------------------------------------------------------------------------\n");
+    fprintf(outfile, "// piwi, 2018\n");
+    fprintf(outfile, "//\n");
+    fprintf(outfile, "// This code is licensed to you under the terms of the GNU GPL, version 2 or,\n");
+    fprintf(outfile, "// at your option, any later version. See the LICENSE.txt file for the text of\n");
+    fprintf(outfile, "// the license.\n");
+    fprintf(outfile, "//-----------------------------------------------------------------------------\n");
+    fprintf(outfile, "// Version information on fpga images\n");
+    fprintf(outfile, "//\n");
+    fprintf(outfile, "// This file is generated by fpga_compress. Don't edit!\n");
+    fprintf(outfile, "//-----------------------------------------------------------------------------\n");
+    fprintf(outfile, "\n");
+    fprintf(outfile, "\n");
+    fprintf(outfile, "const int fpga_bitstream_num = %d;\n", num_infiles);
+    fprintf(outfile, "const char* const fpga_version_information[%d] = {\n", num_infiles);
 }
 
 static int generate_fpga_version_info(FILE *infile[], char *infile_names[], int num_infiles, FILE *outfile) {
 
-	char version_string[80] = "";
+    char version_string[80] = "";
 
-	print_version_info_preamble(outfile, num_infiles);
+    print_version_info_preamble(outfile, num_infiles);
 
-	for (int i = 0; i < num_infiles; i++) {
-		FpgaGatherVersion(infile[i], infile_names[i], version_string, sizeof(version_string));
-		fprintf(outfile, "\t\" %s\"", version_string);
-		if (i != num_infiles-1) {
-			fprintf(outfile, ",");
-		}
-		fprintf(outfile,"\n");
-	}
-	fprintf(outfile, "};\n");
-	return 0;
+    for (int i = 0; i < num_infiles; i++) {
+        FpgaGatherVersion(infile[i], infile_names[i], version_string, sizeof(version_string));
+        fprintf(outfile, "\t\" %s\"", version_string);
+        if (i != num_infiles-1) {
+            fprintf(outfile, ",");
+        }
+        fprintf(outfile,"\n");
+    }
+    fprintf(outfile, "};\n");
+    return 0;
 }
 
 int main(int argc, char **argv)
 {
-	FILE **infiles;
-	char **infile_names;
-	FILE *outfile;
+    FILE **infiles;
+    char **infile_names;
+    FILE *outfile;
 
-	if (argc == 1 || argc == 2) {
-		usage();
-		return(EXIT_FAILURE);
-	}
+    if (argc == 1 || argc == 2) {
+        usage();
+        return(EXIT_FAILURE);
+    }
 
-	if (!strcmp(argv[1], "-d")) {			// Decompress
+    if (!strcmp(argv[1], "-d")) { // Decompress
 
-		infiles = calloc(1, sizeof(FILE*));
-		if (argc != 4) {
-			usage();
-			return(EXIT_FAILURE);
-		}
-		infiles[0] = fopen(argv[2], "rb");
-		if (infiles[0] == NULL) {
-			fprintf(stderr, "Error. Cannot open input file %s\n\n", argv[2]);
-			return(EXIT_FAILURE);
-		}
-		outfile = fopen(argv[3], "wb");
-		if (outfile == NULL) {
-			fprintf(stderr, "Error. Cannot open output file %s\n\n", argv[3]);
-			return(EXIT_FAILURE);
-		}
-		return zlib_decompress(infiles[0], outfile);
+        infiles = calloc(1, sizeof(FILE*));
+        if (argc != 4) {
+            usage();
+            return(EXIT_FAILURE);
+        }
+        infiles[0] = fopen(argv[2], "rb");
+        if (infiles[0] == NULL) {
+            fprintf(stderr, "Error. Cannot open input file %s\n\n", argv[2]);
+            return(EXIT_FAILURE);
+        }
+        outfile = fopen(argv[3], "wb");
+        if (outfile == NULL) {
+            fprintf(stderr, "Error. Cannot open output file %s\n\n", argv[3]);
+            return(EXIT_FAILURE);
+        }
+        return zlib_decompress(infiles[0], outfile);
 
-	} else { // Compress or gemerate version info
+    } else { // Compress or gemerate version info
 
-		bool hardnested_mode = false;
-		bool generate_version_file = false;
-		int num_input_files = 0;
-		if (!strcmp(argv[1], "-t")) { 			// compress one hardnested table
-			if (argc != 4) {
-				usage();
-				return(EXIT_FAILURE);
-			}
-			hardnested_mode = true;
-			num_input_files = 1;
-		} else if (!strcmp(argv[1], "-v")) { 	// generate version info
-			generate_version_file = true;
-			num_input_files = argc-3;
-		} else { 								// compress 1..n fpga files
-			num_input_files = argc-2;
-		}
+        bool hardnested_mode = false;
+        bool generate_version_file = false;
+        int num_input_files = 0;
+        if (!strcmp(argv[1], "-t")) {  // compress one hardnested table
+            if (argc != 4) {
+                usage();
+                return(EXIT_FAILURE);
+            }
+            hardnested_mode = true;
+            num_input_files = 1;
+        } else if (!strcmp(argv[1], "-v")) {  // generate version info
+            generate_version_file = true;
+            num_input_files = argc-3;
+        } else {  // compress 1..n fpga files
+            num_input_files = argc-2;
+        }
 
-		infiles = calloc(num_input_files, sizeof(FILE*));
-		infile_names = calloc(num_input_files, sizeof(char*));
-		for (uint16_t i = 0; i < num_input_files; i++) {
-			infile_names[i] = argv[i+((hardnested_mode || generate_version_file)?2:1)];
-			infiles[i] = fopen(infile_names[i], "rb");
-			if (infiles[i] == NULL) {
-				fprintf(stderr, "Error. Cannot open input file %s\n\n", infile_names[i]);
-				return(EXIT_FAILURE);
-			}
-		}
-		outfile = fopen(argv[argc-1], "wb");
-		if (outfile == NULL) {
-			fprintf(stderr, "Error. Cannot open output file %s\n\n", argv[argc-1]);
-			return(EXIT_FAILURE);
-		}
-		if (generate_version_file) {
-			if (generate_fpga_version_info(infiles, infile_names, num_input_files, outfile)) {
-				return(EXIT_FAILURE);
-			}
-		} else {
-		return zlib_compress(infiles, num_input_files, outfile, hardnested_mode);
-		}
-	}
+        infiles = calloc(num_input_files, sizeof(FILE*));
+        infile_names = calloc(num_input_files, sizeof(char*));
+        for (uint16_t i = 0; i < num_input_files; i++) {
+            infile_names[i] = argv[i+((hardnested_mode || generate_version_file)?2:1)];
+            infiles[i] = fopen(infile_names[i], "rb");
+            if (infiles[i] == NULL) {
+                fprintf(stderr, "Error. Cannot open input file %s\n\n", infile_names[i]);
+                return(EXIT_FAILURE);
+            }
+        }
+        outfile = fopen(argv[argc-1], "wb");
+        if (outfile == NULL) {
+            fprintf(stderr, "Error. Cannot open output file %s\n\n", argv[argc-1]);
+            return(EXIT_FAILURE);
+        }
+        if (generate_version_file) {
+            if (generate_fpga_version_info(infiles, infile_names, num_input_files, outfile)) {
+                return(EXIT_FAILURE);
+            }
+        } else {
+        return zlib_compress(infiles, num_input_files, outfile, hardnested_mode);
+        }
+    }
 }
diff --git a/client/graph.c b/client/graph.c
index 2df0d8202..4f10ab94d 100644
--- a/client/graph.c
+++ b/client/graph.c
@@ -17,238 +17,238 @@ int s_Buff[MAX_GRAPH_TRACE_LEN];
 TODO,  verfy that this doesn't overflow buffer  (iceman)
 */
 void AppendGraph(bool redraw, int clock, int bit) {
-	int i;
-	//set first half the clock bit (all 1's or 0's for a 0 or 1 bit)
-	for (i = 0; i < (int)(clock / 2); ++i)
-		GraphBuffer[GraphTraceLen++] = bit ;
-	//set second half of the clock bit (all 0's or 1's for a 0 or 1 bit)
-	for (i = (int)(clock / 2); i < clock; ++i)
-		GraphBuffer[GraphTraceLen++] = bit ^ 1;
+    int i;
+    //set first half the clock bit (all 1's or 0's for a 0 or 1 bit)
+    for (i = 0; i < (int)(clock / 2); ++i)
+        GraphBuffer[GraphTraceLen++] = bit ;
+    //set second half of the clock bit (all 0's or 1's for a 0 or 1 bit)
+    for (i = (int)(clock / 2); i < clock; ++i)
+        GraphBuffer[GraphTraceLen++] = bit ^ 1;
 
-	if (redraw)
-		RepaintGraphWindow();
+    if (redraw)
+        RepaintGraphWindow();
 }
 
 // clear out our graph window
 int ClearGraph(bool redraw) {
-	int gtl = GraphTraceLen;
-	memset(GraphBuffer, 0x00, GraphTraceLen);
-	GraphTraceLen = 0;
-	if (redraw)
-		RepaintGraphWindow();
-	return gtl;
+    int gtl = GraphTraceLen;
+    memset(GraphBuffer, 0x00, GraphTraceLen);
+    GraphTraceLen = 0;
+    if (redraw)
+        RepaintGraphWindow();
+    return gtl;
 }
 // option '1' to save GraphBuffer any other to restore
 void save_restoreGB(uint8_t saveOpt) {
-	static int SavedGB[MAX_GRAPH_TRACE_LEN];
-	static int SavedGBlen = 0;
-	static bool GB_Saved = false;
-	static int SavedGridOffsetAdj = 0;
+    static int SavedGB[MAX_GRAPH_TRACE_LEN];
+    static int SavedGBlen = 0;
+    static bool GB_Saved = false;
+    static int SavedGridOffsetAdj = 0;
 
-	if (saveOpt == GRAPH_SAVE) { //save
-		memcpy(SavedGB, GraphBuffer, sizeof(GraphBuffer));
-		SavedGBlen = GraphTraceLen;
-		GB_Saved = true;
-		SavedGridOffsetAdj = GridOffset;
-	} else if (GB_Saved){ //restore
-		memcpy(GraphBuffer, SavedGB, sizeof(GraphBuffer));
-		GraphTraceLen = SavedGBlen;
-		GridOffset = SavedGridOffsetAdj;
-		RepaintGraphWindow();
-	}
-	return;
+    if (saveOpt == GRAPH_SAVE) { //save
+        memcpy(SavedGB, GraphBuffer, sizeof(GraphBuffer));
+        SavedGBlen = GraphTraceLen;
+        GB_Saved = true;
+        SavedGridOffsetAdj = GridOffset;
+    } else if (GB_Saved){ //restore
+        memcpy(GraphBuffer, SavedGB, sizeof(GraphBuffer));
+        GraphTraceLen = SavedGBlen;
+        GridOffset = SavedGridOffsetAdj;
+        RepaintGraphWindow();
+    }
+    return;
 }
 
 void setGraphBuf(uint8_t *buf, size_t size) {
-	if ( buf == NULL ) return;
+    if ( buf == NULL ) return;
 
-	ClearGraph(false);
+    ClearGraph(false);
 
-	if ( size > MAX_GRAPH_TRACE_LEN )
-		size = MAX_GRAPH_TRACE_LEN;
+    if ( size > MAX_GRAPH_TRACE_LEN )
+        size = MAX_GRAPH_TRACE_LEN;
 
-	for (uint32_t i = 0; i < size; ++i)
-		GraphBuffer[i] = buf[i] - 128;
+    for (uint32_t i = 0; i < size; ++i)
+        GraphBuffer[i] = buf[i] - 128;
 
-	GraphTraceLen = size;
-	RepaintGraphWindow();
-	return;
+    GraphTraceLen = size;
+    RepaintGraphWindow();
+    return;
 }
 
 size_t getFromGraphBuf(uint8_t *buf) {
-	if (buf == NULL ) return 0;
-	uint32_t i;
-	for (i=0; i < GraphTraceLen; ++i){
-		//trim
-		if (GraphBuffer[i] > 127) GraphBuffer[i] = 127;
-		if (GraphBuffer[i] < -127) GraphBuffer[i] = -127;
-		buf[i] = (uint8_t)(GraphBuffer[i] + 128);
-	}
-	return i;
+    if (buf == NULL ) return 0;
+    uint32_t i;
+    for (i=0; i < GraphTraceLen; ++i){
+        //trim
+        if (GraphBuffer[i] > 127) GraphBuffer[i] = 127;
+        if (GraphBuffer[i] < -127) GraphBuffer[i] = -127;
+        buf[i] = (uint8_t)(GraphBuffer[i] + 128);
+    }
+    return i;
 }
 
 // A simple test to see if there is any data inside Graphbuffer.
 bool HasGraphData(){
-	if ( GraphTraceLen <= 0) {
-		PrintAndLogEx(NORMAL, "No data available, try reading something first");
-		return false;
-	}
-	return true;
+    if ( GraphTraceLen <= 0) {
+        PrintAndLogEx(NORMAL, "No data available, try reading something first");
+        return false;
+    }
+    return true;
 }
 
 // Get or auto-detect ask clock rate
 int GetAskClock(const char *str, bool printAns) {
     if (getSignalProperties()->isnoise)
         return false;
-    
-	int clock = param_get32ex(str, 0, 0, 10);
-	if (clock > 0)
-		return clock;
 
-	// Auto-detect clock
-	uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
-	size_t size = getFromGraphBuf(bits);
-	if (size == 0) {
-		PrintAndLogEx(WARNING, "Failed to copy from graphbuffer");
-		return -1;
-	}
+    int clock = param_get32ex(str, 0, 0, 10);
+    if (clock > 0)
+        return clock;
 
-	size_t ststart = 0, stend = 0;
-	bool st = DetectST(bits, &size, &clock, &ststart, &stend);
-	int idx = stend;
-	if (st == false) {
-		idx = DetectASKClock(bits, size, &clock, 20);
-	}
+    // Auto-detect clock
+    uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
+    size_t size = getFromGraphBuf(bits);
+    if (size == 0) {
+        PrintAndLogEx(WARNING, "Failed to copy from graphbuffer");
+        return -1;
+    }
 
-	if ( clock > 0 ) {
-		setClockGrid(clock, idx);
-	}
-	// Only print this message if we're not looping something
-	if (printAns || g_debugMode)
-		PrintAndLogEx(SUCCESS, "Auto-detected clock rate: %d, Best Starting Position: %d", clock, idx);
+    size_t ststart = 0, stend = 0;
+    bool st = DetectST(bits, &size, &clock, &ststart, &stend);
+    int idx = stend;
+    if (st == false) {
+        idx = DetectASKClock(bits, size, &clock, 20);
+    }
 
-	return clock;
+    if ( clock > 0 ) {
+        setClockGrid(clock, idx);
+    }
+    // Only print this message if we're not looping something
+    if (printAns || g_debugMode)
+        PrintAndLogEx(SUCCESS, "Auto-detected clock rate: %d, Best Starting Position: %d", clock, idx);
+
+    return clock;
 }
 
 uint8_t GetPskCarrier(const char *str, bool printAns) {
     if (getSignalProperties()->isnoise)
         return false;
-    
-	uint8_t carrier = 0;
-	uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
-	size_t size = getFromGraphBuf(bits);
-	if ( size == 0 ) {
-		PrintAndLogEx(WARNING, "Failed to copy from graphbuffer");
-		return 0;
-	}
-	uint16_t fc = countFC(bits, size, false);
-	carrier = fc & 0xFF;
-	if (carrier != 2 && carrier != 4 && carrier != 8) return 0;
-	if (( fc >> 8) == 10 && carrier == 8) return 0;
-	// Only print this message if we're not looping something
-	if (printAns)
-		PrintAndLogEx(SUCCESS, "Auto-detected PSK carrier rate: %d", carrier);
-	return carrier;
+
+    uint8_t carrier = 0;
+    uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
+    size_t size = getFromGraphBuf(bits);
+    if ( size == 0 ) {
+        PrintAndLogEx(WARNING, "Failed to copy from graphbuffer");
+        return 0;
+    }
+    uint16_t fc = countFC(bits, size, false);
+    carrier = fc & 0xFF;
+    if (carrier != 2 && carrier != 4 && carrier != 8) return 0;
+    if (( fc >> 8) == 10 && carrier == 8) return 0;
+    // Only print this message if we're not looping something
+    if (printAns)
+        PrintAndLogEx(SUCCESS, "Auto-detected PSK carrier rate: %d", carrier);
+    return carrier;
 }
 
 int GetPskClock(const char* str, bool printAns) {
 
     if (getSignalProperties()->isnoise)
         return -1;
-    
-	int clock = param_get32ex(str, 0, 0, 10);
-	if (clock != 0)
-		return clock;
 
-	// Auto-detect clock
-	uint8_t grph[MAX_GRAPH_TRACE_LEN] = {0};
-	size_t size = getFromGraphBuf(grph);
-	if ( size == 0 ) {
-		PrintAndLogEx(WARNING, "Failed to copy from graphbuffer");
-		return -1;
-	}
-	size_t firstPhaseShiftLoc = 0;
-	uint8_t curPhase = 0, fc = 0;
-	clock = DetectPSKClock(grph, size, 0, &firstPhaseShiftLoc, &curPhase, &fc);
-	setClockGrid(clock, firstPhaseShiftLoc);
-	// Only print this message if we're not looping something
-	if (printAns)
-		PrintAndLogEx(SUCCESS, "Auto-detected clock rate: %d", clock);
-	return clock;
+    int clock = param_get32ex(str, 0, 0, 10);
+    if (clock != 0)
+        return clock;
+
+    // Auto-detect clock
+    uint8_t grph[MAX_GRAPH_TRACE_LEN] = {0};
+    size_t size = getFromGraphBuf(grph);
+    if ( size == 0 ) {
+        PrintAndLogEx(WARNING, "Failed to copy from graphbuffer");
+        return -1;
+    }
+    size_t firstPhaseShiftLoc = 0;
+    uint8_t curPhase = 0, fc = 0;
+    clock = DetectPSKClock(grph, size, 0, &firstPhaseShiftLoc, &curPhase, &fc);
+    setClockGrid(clock, firstPhaseShiftLoc);
+    // Only print this message if we're not looping something
+    if (printAns)
+        PrintAndLogEx(SUCCESS, "Auto-detected clock rate: %d", clock);
+    return clock;
 }
 
 int GetNrzClock(const char* str, bool printAns) {
 
     if (getSignalProperties()->isnoise)
         return -1;
-    
-	int clock = param_get32ex(str, 0, 0, 10);
-	if (clock != 0)
-		return clock;
-    
-	// Auto-detect clock
-	uint8_t grph[MAX_GRAPH_TRACE_LEN] = {0};
-	size_t size = getFromGraphBuf(grph);
-	if ( size == 0 ) {
-		PrintAndLogEx(WARNING, "Failed to copy from graphbuffer");
-		return -1;
-	}
-	size_t clkStartIdx = 0;
-	clock = DetectNRZClock(grph, size, 0, &clkStartIdx);
-	setClockGrid(clock, clkStartIdx);
-	// Only print this message if we're not looping something
-	if (printAns)
-		PrintAndLogEx(SUCCESS, "Auto-detected clock rate: %d", clock);
-	return clock;
+
+    int clock = param_get32ex(str, 0, 0, 10);
+    if (clock != 0)
+        return clock;
+
+    // Auto-detect clock
+    uint8_t grph[MAX_GRAPH_TRACE_LEN] = {0};
+    size_t size = getFromGraphBuf(grph);
+    if ( size == 0 ) {
+        PrintAndLogEx(WARNING, "Failed to copy from graphbuffer");
+        return -1;
+    }
+    size_t clkStartIdx = 0;
+    clock = DetectNRZClock(grph, size, 0, &clkStartIdx);
+    setClockGrid(clock, clkStartIdx);
+    // Only print this message if we're not looping something
+    if (printAns)
+        PrintAndLogEx(SUCCESS, "Auto-detected clock rate: %d", clock);
+    return clock;
 }
 //by marshmellow
 //attempt to detect the field clock and bit clock for FSK
 int GetFskClock(const char* str, bool printAns) {
 
-	int clock = param_get32ex(str, 0, 0, 10);
-	if (clock != 0)
-		return clock;
+    int clock = param_get32ex(str, 0, 0, 10);
+    if (clock != 0)
+        return clock;
 
-	uint8_t fc1 = 0, fc2 = 0, rf1 = 0;
-	int firstClockEdge = 0;
+    uint8_t fc1 = 0, fc2 = 0, rf1 = 0;
+    int firstClockEdge = 0;
 
-	if ( !fskClocks(&fc1, &fc2, &rf1, &firstClockEdge))
-		return 0;
+    if ( !fskClocks(&fc1, &fc2, &rf1, &firstClockEdge))
+        return 0;
 
-	if ((fc1==10 && fc2==8) || (fc1==8 && fc2==5)){
-		if (printAns)
-			PrintAndLogEx(SUCCESS, "Detected Field Clocks: FC/%d, FC/%d - Bit Clock: RF/%d", fc1, fc2, rf1);
-		setClockGrid(rf1, firstClockEdge);
-		return rf1;
-	}
+    if ((fc1==10 && fc2==8) || (fc1==8 && fc2==5)){
+        if (printAns)
+            PrintAndLogEx(SUCCESS, "Detected Field Clocks: FC/%d, FC/%d - Bit Clock: RF/%d", fc1, fc2, rf1);
+        setClockGrid(rf1, firstClockEdge);
+        return rf1;
+    }
 
-	PrintAndLogEx(DEBUG, "DEBUG: unknown fsk field clock detected");
-	PrintAndLogEx(DEBUG, "Detected Field Clocks: FC/%d, FC/%d - Bit Clock: RF/%d", fc1, fc2, rf1);
-	return 0;
+    PrintAndLogEx(DEBUG, "DEBUG: unknown fsk field clock detected");
+    PrintAndLogEx(DEBUG, "Detected Field Clocks: FC/%d, FC/%d - Bit Clock: RF/%d", fc1, fc2, rf1);
+    return 0;
 }
 bool fskClocks(uint8_t *fc1, uint8_t *fc2, uint8_t *rf1, int *firstClockEdge) {
 
     if (getSignalProperties()->isnoise)
         return false;
 
-	uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
-	size_t size = getFromGraphBuf(bits);
-	if (size == 0)
-		return false;
+    uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
+    size_t size = getFromGraphBuf(bits);
+    if (size == 0)
+        return false;
 
-	uint16_t ans = countFC(bits, size, true);
-	if (ans == 0) {
-		PrintAndLogEx(DEBUG, "DEBUG: No data found");
-		return false;
-	}
+    uint16_t ans = countFC(bits, size, true);
+    if (ans == 0) {
+        PrintAndLogEx(DEBUG, "DEBUG: No data found");
+        return false;
+    }
 
-	*fc1 = (ans >> 8) & 0xFF;
-	*fc2 = ans & 0xFF;
-	*rf1 = detectFSKClk(bits, size, *fc1, *fc2, firstClockEdge);
-	if (*rf1 == 0) {
-		PrintAndLogEx(DEBUG, "DEBUG: Clock detect error");
-		return false;
-	}
-	return true;
+    *fc1 = (ans >> 8) & 0xFF;
+    *fc2 = ans & 0xFF;
+    *rf1 = detectFSKClk(bits, size, *fc1, *fc2, firstClockEdge);
+    if (*rf1 == 0) {
+        PrintAndLogEx(DEBUG, "DEBUG: Clock detect error");
+        return false;
+    }
+    return true;
 }
 
diff --git a/client/guidummy.cpp b/client/guidummy.cpp
index 6c24973bb..a51cb37d8 100644
--- a/client/guidummy.cpp
+++ b/client/guidummy.cpp
@@ -12,12 +12,12 @@
 
 extern "C" void ShowGraphWindow(void)
 {
-	static int warned = 0;
+    static int warned = 0;
 
-	if (!warned) {
-		printf("No GUI in this build!\n");
-		warned = 1;
-	}
+    if (!warned) {
+        printf("No GUI in this build!\n");
+        warned = 1;
+    }
 }
 
 extern "C" void HideGraphWindow(void) {}
diff --git a/client/hardnested/hardnested_bf_core.c b/client/hardnested/hardnested_bf_core.c
index e80a9cd19..7a91b48f6 100644
--- a/client/hardnested/hardnested_bf_core.c
+++ b/client/hardnested/hardnested_bf_core.c
@@ -146,12 +146,12 @@ bitslice_test_nonces_t bitslice_test_nonces_dispatch;
 #define free_bitslice(x) _aligned_free(x)
 #elif defined (__APPLE__)
 static void *malloc_bitslice(size_t x) {
-	char *allocated_memory;
-	if (posix_memalign((void**)&allocated_memory, MAX_BITSLICES/8, x)) {
-		return NULL;
-	} else {
-		return __builtin_assume_aligned(allocated_memory, MAX_BITSLICES/8);
-	}
+    char *allocated_memory;
+    if (posix_memalign((void**)&allocated_memory, MAX_BITSLICES/8, x)) {
+        return NULL;
+    } else {
+        return __builtin_assume_aligned(allocated_memory, MAX_BITSLICES/8);
+    }
 }
 #define free_bitslice(x) free(x)
 #else
@@ -160,8 +160,8 @@ static void *malloc_bitslice(size_t x) {
 #endif
 
 typedef enum {
-	EVEN_STATE = 0,
-	ODD_STATE = 1
+    EVEN_STATE = 0,
+    ODD_STATE = 1
 } odd_even_t;
 
 
@@ -175,32 +175,32 @@ static bitslice_t bs_zeroes;
 
 void BITSLICE_TEST_NONCES(uint32_t nonces_to_bruteforce, uint32_t *bf_test_nonce, uint8_t *bf_test_nonce_par) {
 
-	// initialize 1 and 0 vectors
+    // initialize 1 and 0 vectors
     memset(bs_ones.bytes, 0xff, VECTOR_SIZE);
     memset(bs_zeroes.bytes, 0x00, VECTOR_SIZE);
 
-	// bitslice nonces' 2nd to 4th byte
-	for (uint32_t i = 0; i < nonces_to_bruteforce; i++) {
-		for(uint32_t bit_idx = 0; bit_idx < KEYSTREAM_SIZE; bit_idx++){
-			bool bit = get_bit(KEYSTREAM_SIZE-1-bit_idx, BSWAP_32(bf_test_nonce[i] << 8));
-			if(bit){
-				bitsliced_encrypted_nonces[i][bit_idx].value = bs_ones.value;
-			} else {
-				bitsliced_encrypted_nonces[i][bit_idx].value = bs_zeroes.value;
-			}
-		}
-	}
-	// bitslice nonces' parity (4 bits)
-	for (uint32_t i = 0; i < nonces_to_bruteforce; i++) {
-		for(uint32_t bit_idx = 0; bit_idx < 4; bit_idx++){
-			bool bit = get_bit(4-1-bit_idx, bf_test_nonce_par[i]);
-			if(bit){
-				bitsliced_encrypted_parity_bits[i][bit_idx].value = bs_ones.value;
-			} else {
-				bitsliced_encrypted_parity_bits[i][bit_idx].value = bs_zeroes.value;
-			}
-		}
-	}
+    // bitslice nonces' 2nd to 4th byte
+    for (uint32_t i = 0; i < nonces_to_bruteforce; i++) {
+        for(uint32_t bit_idx = 0; bit_idx < KEYSTREAM_SIZE; bit_idx++){
+            bool bit = get_bit(KEYSTREAM_SIZE-1-bit_idx, BSWAP_32(bf_test_nonce[i] << 8));
+            if(bit){
+                bitsliced_encrypted_nonces[i][bit_idx].value = bs_ones.value;
+            } else {
+                bitsliced_encrypted_nonces[i][bit_idx].value = bs_zeroes.value;
+            }
+        }
+    }
+    // bitslice nonces' parity (4 bits)
+    for (uint32_t i = 0; i < nonces_to_bruteforce; i++) {
+        for(uint32_t bit_idx = 0; bit_idx < 4; bit_idx++){
+            bool bit = get_bit(4-1-bit_idx, bf_test_nonce_par[i]);
+            if(bit){
+                bitsliced_encrypted_parity_bits[i][bit_idx].value = bs_ones.value;
+            } else {
+                bitsliced_encrypted_parity_bits[i][bit_idx].value = bs_zeroes.value;
+            }
+        }
+    }
 
 }
 
@@ -208,65 +208,65 @@ void BITSLICE_TEST_NONCES(uint32_t nonces_to_bruteforce, uint32_t *bf_test_nonce
 const uint64_t CRACK_STATES_BITSLICED(uint32_t cuid, uint8_t *best_first_bytes, statelist_t *p, uint32_t *keys_found, uint64_t *num_keys_tested, uint32_t nonces_to_bruteforce, uint8_t *bf_test_nonce_2nd_byte, noncelist_t *nonces){
 
     // Unlike aczid's implementation this doesn't roll back at all when performing bitsliced bruteforce.
-	// We know that the best first byte is already shifted in. Testing with the remaining three bytes of
-	// the nonces is sufficient to eliminate most of them. The small rest is tested with a simple unsliced
-	// brute forcing (including roll back).
+    // We know that the best first byte is already shifted in. Testing with the remaining three bytes of
+    // the nonces is sufficient to eliminate most of them. The small rest is tested with a simple unsliced
+    // brute forcing (including roll back).
 
-	bitslice_t states[KEYSTREAM_SIZE+STATE_SIZE];
-	bitslice_t * restrict state_p;
+    bitslice_t states[KEYSTREAM_SIZE+STATE_SIZE];
+    bitslice_t * restrict state_p;
     uint64_t key = -1;
     uint64_t bucket_states_tested = 0;
     uint32_t bucket_size[(p->len[EVEN_STATE] - 1)/MAX_BITSLICES + 1];
     uint32_t bitsliced_blocks = 0;
     uint32_t const *restrict p_even_end = p->states[EVEN_STATE] + p->len[EVEN_STATE];
 #if defined (DEBUG_BRUTE_FORCE)
-	uint32_t elimination_step = 0;
-	#define MAX_ELIMINATION_STEP	32
-	uint64_t keys_eliminated[MAX_ELIMINATION_STEP] = {0};
+    uint32_t elimination_step = 0;
+    #define MAX_ELIMINATION_STEP 32
+    uint64_t keys_eliminated[MAX_ELIMINATION_STEP] = {0};
 #endif
 #ifdef DEBUG_KEY_ELIMINATION
-	bool bucket_contains_test_key[(p->len[EVEN_STATE] - 1)/MAX_BITSLICES + 1];
+    bool bucket_contains_test_key[(p->len[EVEN_STATE] - 1)/MAX_BITSLICES + 1];
 #endif
 
-	// constant ones/zeroes
-	bitslice_t bs_ones;
+    // constant ones/zeroes
+    bitslice_t bs_ones;
     memset(bs_ones.bytes, 0xff, VECTOR_SIZE);
-	bitslice_t bs_zeroes;
+    bitslice_t bs_zeroes;
     memset(bs_zeroes.bytes, 0x00, VECTOR_SIZE);
 
     // bitslice all the even states
     bitslice_t **restrict bitsliced_even_states = (bitslice_t **)malloc(((p->len[EVEN_STATE] - 1)/MAX_BITSLICES + 1) * sizeof(bitslice_t *));
-	if (bitsliced_even_states == NULL) {
-		printf("Out of memory error in brute_force. Aborting...");
-		exit(4);
-	}
+    if (bitsliced_even_states == NULL) {
+        printf("Out of memory error in brute_force. Aborting...");
+        exit(4);
+    }
     bitslice_value_t *restrict bitsliced_even_feedback = malloc_bitslice(((p->len[EVEN_STATE] - 1)/MAX_BITSLICES + 1) * sizeof(bitslice_value_t));
-	if (bitsliced_even_feedback == NULL) {
-		printf("Out of memory error in brute_force. Aborting...");
-		exit(4);
-	}
+    if (bitsliced_even_feedback == NULL) {
+        printf("Out of memory error in brute_force. Aborting...");
+        exit(4);
+    }
     for(uint32_t *restrict p_even = p->states[EVEN_STATE]; p_even < p_even_end; p_even += MAX_BITSLICES){
         bitslice_t *restrict lstate_p = malloc_bitslice(STATE_SIZE/2*sizeof(bitslice_t));
-		if (lstate_p == NULL) {
-			printf("Out of memory error in brute_force. Aborting... \n");
-			exit(4);
-		}
+        if (lstate_p == NULL) {
+            printf("Out of memory error in brute_force. Aborting... \n");
+            exit(4);
+        }
         memset(lstate_p, 0x00, STATE_SIZE/2*sizeof(bitslice_t)); // zero even bits
         // bitslice even half-states
         const uint32_t max_slices = (p_even_end-p_even) < MAX_BITSLICES ? p_even_end-p_even : MAX_BITSLICES;
         bucket_size[bitsliced_blocks] = max_slices;
 #ifdef DEBUG_KEY_ELIMINATION
-		bucket_contains_test_key[bitsliced_blocks] = false;
+        bucket_contains_test_key[bitsliced_blocks] = false;
 #endif
-		uint32_t slice_idx;
+        uint32_t slice_idx;
         for(slice_idx = 0; slice_idx < max_slices; ++slice_idx){
             uint32_t e = *(p_even+slice_idx);
 #ifdef DEBUG_KEY_ELIMINATION
-			if (known_target_key != -1 && e == test_state[EVEN_STATE]) {
-				bucket_contains_test_key[bitsliced_blocks] = true;
-				// printf("bucket %d contains test key even state\n", bitsliced_blocks);
-				// printf("in slice %d\n", slice_idx);
-			}
+            if (known_target_key != -1 && e == test_state[EVEN_STATE]) {
+                bucket_contains_test_key[bitsliced_blocks] = true;
+                // printf("bucket %d contains test key even state\n", bitsliced_blocks);
+                // printf("in slice %d\n", slice_idx);
+            }
 #endif
             for(uint32_t bit_idx = 0; bit_idx < STATE_SIZE/2; bit_idx++, e >>= 1){
                 // set even bits
@@ -275,8 +275,8 @@ const uint64_t CRACK_STATES_BITSLICED(uint32_t cuid, uint8_t *best_first_bytes,
                 }
             }
         }
-		// padding with last even state
-		for ( ; slice_idx < MAX_BITSLICES; ++slice_idx) {
+        // padding with last even state
+        for ( ; slice_idx < MAX_BITSLICES; ++slice_idx) {
             uint32_t e = *(p_even_end-1);
             for(uint32_t bit_idx = 0; bit_idx < STATE_SIZE/2; bit_idx++, e >>= 1){
                 // set even bits
@@ -284,13 +284,13 @@ const uint64_t CRACK_STATES_BITSLICED(uint32_t cuid, uint8_t *best_first_bytes,
                     lstate_p[bit_idx].bytes64[slice_idx>>6] |= 1ull << (slice_idx & 0x3f);
                 }
             }
-		}
+        }
         bitsliced_even_states[bitsliced_blocks] = lstate_p;
-		// bitsliced_even_feedback[bitsliced_blocks] = bs_ones;
-		bitsliced_even_feedback[bitsliced_blocks] = lstate_p[(47- 0)/2].value ^
+        // bitsliced_even_feedback[bitsliced_blocks] = bs_ones;
+        bitsliced_even_feedback[bitsliced_blocks] = lstate_p[(47- 0)/2].value ^
                                                     lstate_p[(47-10)/2].value ^ lstate_p[(47-12)/2].value ^ lstate_p[(47-14)/2].value ^
                                                     lstate_p[(47-24)/2].value ^ lstate_p[(47-42)/2].value;
-		bitsliced_blocks++;
+        bitsliced_blocks++;
     }
     // bitslice every odd state to every block of even states
     for(uint32_t const *restrict p_odd = p->states[ODD_STATE]; p_odd < p->states[ODD_STATE] + p->len[ODD_STATE]; ++p_odd){
@@ -299,78 +299,78 @@ const uint64_t CRACK_STATES_BITSLICED(uint32_t cuid, uint8_t *best_first_bytes,
             goto out;
         }
 
-		// set odd state bits and pre-compute first keystream bit vector. This is the same for all blocks of even states
+        // set odd state bits and pre-compute first keystream bit vector. This is the same for all blocks of even states
 
-		state_p = &states[KEYSTREAM_SIZE];
-		uint32_t o = *p_odd;
+        state_p = &states[KEYSTREAM_SIZE];
+        uint32_t o = *p_odd;
 
         // pre-compute the odd feedback bit
         bool odd_feedback_bit = evenparity32(o&0x29ce5c);
         const bitslice_value_t odd_feedback = odd_feedback_bit ? bs_ones.value : bs_zeroes.value;
 
-		// set odd state bits
-		for (uint32_t state_idx = 0; state_idx < STATE_SIZE; o >>= 1, state_idx += 2) {
-			if (o & 1){
-				state_p[state_idx] = bs_ones;
-			} else {
-				state_p[state_idx] = bs_zeroes;
-			}
-		}
+        // set odd state bits
+        for (uint32_t state_idx = 0; state_idx < STATE_SIZE; o >>= 1, state_idx += 2) {
+            if (o & 1){
+                state_p[state_idx] = bs_ones;
+            } else {
+                state_p[state_idx] = bs_zeroes;
+            }
+        }
 
-		bitslice_value_t crypto1_bs_f20b_2[16];
-		bitslice_value_t crypto1_bs_f20b_3[8];
+        bitslice_value_t crypto1_bs_f20b_2[16];
+        bitslice_value_t crypto1_bs_f20b_3[8];
 
-		crypto1_bs_f20b_2[0] = f20b(state_p[47-25].value, state_p[47-27].value, state_p[47-29].value, state_p[47-31].value);
-		crypto1_bs_f20b_3[0] = f20b(state_p[47-41].value, state_p[47-43].value, state_p[47-45].value, state_p[47-47].value);
+        crypto1_bs_f20b_2[0] = f20b(state_p[47-25].value, state_p[47-27].value, state_p[47-29].value, state_p[47-31].value);
+        crypto1_bs_f20b_3[0] = f20b(state_p[47-41].value, state_p[47-43].value, state_p[47-45].value, state_p[47-47].value);
 
-		bitslice_value_t ksb[8];
-		ksb[0] = f20c(f20a(state_p[47- 9].value, state_p[47-11].value, state_p[47-13].value, state_p[47-15].value),
-		              f20b(state_p[47-17].value, state_p[47-19].value, state_p[47-21].value, state_p[47-23].value),
-		              crypto1_bs_f20b_2[0],
-		              f20a(state_p[47-33].value, state_p[47-35].value, state_p[47-37].value, state_p[47-39].value),
-		              crypto1_bs_f20b_3[0]);
+        bitslice_value_t ksb[8];
+        ksb[0] = f20c(f20a(state_p[47- 9].value, state_p[47-11].value, state_p[47-13].value, state_p[47-15].value),
+                      f20b(state_p[47-17].value, state_p[47-19].value, state_p[47-21].value, state_p[47-23].value),
+                      crypto1_bs_f20b_2[0],
+                      f20a(state_p[47-33].value, state_p[47-35].value, state_p[47-37].value, state_p[47-39].value),
+                      crypto1_bs_f20b_3[0]);
 
-		uint32_t *restrict p_even = p->states[EVEN_STATE];
+        uint32_t *restrict p_even = p->states[EVEN_STATE];
         for (uint32_t block_idx = 0; block_idx < bitsliced_blocks; ++block_idx, p_even += MAX_BITSLICES) {
 
 #ifdef DEBUG_KEY_ELIMINATION
-			// if (known_target_key != -1 && bucket_contains_test_key[block_idx] && *p_odd == test_state[ODD_STATE]) {
-				// printf("Now testing known target key.\n");
-				// printf("block_idx = %d/%d\n", block_idx, bitsliced_blocks);
-			// }
+            // if (known_target_key != -1 && bucket_contains_test_key[block_idx] && *p_odd == test_state[ODD_STATE]) {
+                // printf("Now testing known target key.\n");
+                // printf("block_idx = %d/%d\n", block_idx, bitsliced_blocks);
+            // }
 #endif
             // add the even state bits
-			const bitslice_t *restrict bitsliced_even_state = bitsliced_even_states[block_idx];
-			for(uint32_t state_idx = 1; state_idx < STATE_SIZE; state_idx += 2) {
-				state_p[state_idx] = bitsliced_even_state[state_idx/2];
-			}
+            const bitslice_t *restrict bitsliced_even_state = bitsliced_even_states[block_idx];
+            for(uint32_t state_idx = 1; state_idx < STATE_SIZE; state_idx += 2) {
+                state_p[state_idx] = bitsliced_even_state[state_idx/2];
+            }
 
-			// pre-compute first feedback bit vector. This is the same for all nonces
-			bitslice_value_t fbb[8];
+            // pre-compute first feedback bit vector. This is the same for all nonces
+            bitslice_value_t fbb[8];
             fbb[0] = odd_feedback ^ bitsliced_even_feedback[block_idx];
 
             // vector to contain test results (1 = passed, 0 = failed)
             bitslice_t results = bs_ones;
 
-			// parity_bits
-			bitslice_value_t par[8];
-			par[0] = bs_zeroes.value;
-			uint32_t next_common_bits = 0;
+            // parity_bits
+            bitslice_value_t par[8];
+            par[0] = bs_zeroes.value;
+            uint32_t next_common_bits = 0;
 
             for(uint32_t tests = 0; tests < nonces_to_bruteforce; ++tests){
-				// common bits with preceding test nonce
-				uint32_t common_bits = next_common_bits; //tests ? trailing_zeros(bf_test_nonce_2nd_byte[tests] ^ bf_test_nonce_2nd_byte[tests-1]) : 0;
-				next_common_bits = tests < nonces_to_bruteforce - 1 ? trailing_zeros(bf_test_nonce_2nd_byte[tests] ^ bf_test_nonce_2nd_byte[tests+1]) : 0;
-                uint32_t parity_bit_idx = 1;							// start checking with the parity of second nonce byte
-                bitslice_value_t fb_bits = fbb[common_bits];		// start with precomputed feedback bits from previous nonce
-                bitslice_value_t ks_bits = ksb[common_bits];		// dito for first keystream bits
+                // common bits with preceding test nonce
+                uint32_t common_bits = next_common_bits; //tests ? trailing_zeros(bf_test_nonce_2nd_byte[tests] ^ bf_test_nonce_2nd_byte[tests-1]) : 0;
+                next_common_bits = tests < nonces_to_bruteforce - 1 ? trailing_zeros(bf_test_nonce_2nd_byte[tests] ^ bf_test_nonce_2nd_byte[tests+1]) : 0;
+                uint32_t parity_bit_idx = 1;                        // start checking with the parity of second nonce byte
+                bitslice_value_t fb_bits = fbb[common_bits];        // start with precomputed feedback bits from previous nonce
+                bitslice_value_t ks_bits = ksb[common_bits];        // dito for first keystream bits
                 bitslice_value_t parity_bit_vector = par[common_bits]; // dito for first parity vector
-				// bitslice_value_t fb_bits = fbb[0];		// start with precomputed feedback bits from previous nonce
-				// bitslice_value_t ks_bits = ksb[0];		// dito for first keystream bits
-				// bitslice_value_t parity_bit_vector = par[0]; // dito for first parity vector
-				state_p -= common_bits;								// and reuse the already calculated state bits
+                // bitslice_value_t fb_bits = fbb[0];               // start with precomputed feedback bits from previous nonce
+                // bitslice_value_t ks_bits = ksb[0];               // dito for first keystream bits
+                // bitslice_value_t parity_bit_vector = par[0];     // dito for first parity vector
+                state_p -= common_bits;                             // and reuse the already calculated state bits
                 // highest bit is transmitted/received first. We start with Bit 23 (highest bit of second nonce byte),
-				// or the highest bit which differs from the previous nonce
+                // or the highest bit which differs from the previous nonce
                 for (int32_t ks_idx = KEYSTREAM_SIZE-1-common_bits; ks_idx >= 0; --ks_idx) {
 
                     // decrypt nonce bits
@@ -381,35 +381,35 @@ const uint64_t CRACK_STATES_BITSLICED(uint32_t cuid, uint8_t *best_first_bytes,
                     parity_bit_vector ^= decrypted_nonce_bit_vector;
 
                     // update state
-					state_p--;
+                    state_p--;
                     state_p[0].value = fb_bits ^ decrypted_nonce_bit_vector;
 
-					// update crypto1 subfunctions
-					bitslice_value_t f20a_1, f20b_1, f20b_2, f20a_2, f20b_3;
-					f20a_2 = f20a(state_p[47-33].value, state_p[47-35].value, state_p[47-37].value, state_p[47-39].value);
-					f20b_3 = f20b(state_p[47-41].value, state_p[47-43].value, state_p[47-45].value, state_p[47-47].value);
-					if (ks_idx > KEYSTREAM_SIZE - 8) {
-						f20a_1 = f20a(state_p[47- 9].value, state_p[47-11].value, state_p[47-13].value, state_p[47-15].value);
-						f20b_1 = f20b(state_p[47-17].value, state_p[47-19].value, state_p[47-21].value, state_p[47-23].value);
-						f20b_2 = f20b(state_p[47-25].value, state_p[47-27].value, state_p[47-29].value, state_p[47-31].value);
-						crypto1_bs_f20b_2[KEYSTREAM_SIZE - ks_idx] = f20b_2;
-						crypto1_bs_f20b_3[KEYSTREAM_SIZE - ks_idx] = f20b_3;
-					} else if (ks_idx > KEYSTREAM_SIZE - 16) {
-						f20a_1 = f20a(state_p[47- 9].value, state_p[47-11].value, state_p[47-13].value, state_p[47-15].value);
-						f20b_1 = crypto1_bs_f20b_2[KEYSTREAM_SIZE - ks_idx - 8];
-						f20b_2 = f20b(state_p[47-25].value, state_p[47-27].value, state_p[47-29].value, state_p[47-31].value);
-						crypto1_bs_f20b_2[KEYSTREAM_SIZE - ks_idx] = f20b_2;
-					} else if (ks_idx > KEYSTREAM_SIZE - 24){
-						f20a_1 = f20a(state_p[47- 9].value, state_p[47-11].value, state_p[47-13].value, state_p[47-15].value);
-						f20b_1 = crypto1_bs_f20b_2[KEYSTREAM_SIZE - ks_idx - 8];
-						f20b_2 = crypto1_bs_f20b_3[KEYSTREAM_SIZE - ks_idx - 16];
-					} else {
-						f20a_1 = f20a(state_p[47- 9].value, state_p[47-11].value, state_p[47-13].value, state_p[47-15].value);
-						f20b_1 = f20b(state_p[47-17].value, state_p[47-19].value, state_p[47-21].value, state_p[47-23].value);
-						f20b_2 = f20b(state_p[47-25].value, state_p[47-27].value, state_p[47-29].value, state_p[47-31].value);
-					}
-					// update keystream bit
-					ks_bits = f20c(f20a_1, f20b_1, f20b_2, f20a_2, f20b_3);
+                    // update crypto1 subfunctions
+                    bitslice_value_t f20a_1, f20b_1, f20b_2, f20a_2, f20b_3;
+                    f20a_2 = f20a(state_p[47-33].value, state_p[47-35].value, state_p[47-37].value, state_p[47-39].value);
+                    f20b_3 = f20b(state_p[47-41].value, state_p[47-43].value, state_p[47-45].value, state_p[47-47].value);
+                    if (ks_idx > KEYSTREAM_SIZE - 8) {
+                        f20a_1 = f20a(state_p[47- 9].value, state_p[47-11].value, state_p[47-13].value, state_p[47-15].value);
+                        f20b_1 = f20b(state_p[47-17].value, state_p[47-19].value, state_p[47-21].value, state_p[47-23].value);
+                        f20b_2 = f20b(state_p[47-25].value, state_p[47-27].value, state_p[47-29].value, state_p[47-31].value);
+                        crypto1_bs_f20b_2[KEYSTREAM_SIZE - ks_idx] = f20b_2;
+                        crypto1_bs_f20b_3[KEYSTREAM_SIZE - ks_idx] = f20b_3;
+                    } else if (ks_idx > KEYSTREAM_SIZE - 16) {
+                        f20a_1 = f20a(state_p[47- 9].value, state_p[47-11].value, state_p[47-13].value, state_p[47-15].value);
+                        f20b_1 = crypto1_bs_f20b_2[KEYSTREAM_SIZE - ks_idx - 8];
+                        f20b_2 = f20b(state_p[47-25].value, state_p[47-27].value, state_p[47-29].value, state_p[47-31].value);
+                        crypto1_bs_f20b_2[KEYSTREAM_SIZE - ks_idx] = f20b_2;
+                    } else if (ks_idx > KEYSTREAM_SIZE - 24){
+                        f20a_1 = f20a(state_p[47- 9].value, state_p[47-11].value, state_p[47-13].value, state_p[47-15].value);
+                        f20b_1 = crypto1_bs_f20b_2[KEYSTREAM_SIZE - ks_idx - 8];
+                        f20b_2 = crypto1_bs_f20b_3[KEYSTREAM_SIZE - ks_idx - 16];
+                    } else {
+                        f20a_1 = f20a(state_p[47- 9].value, state_p[47-11].value, state_p[47-13].value, state_p[47-15].value);
+                        f20b_1 = f20b(state_p[47-17].value, state_p[47-19].value, state_p[47-21].value, state_p[47-23].value);
+                        f20b_2 = f20b(state_p[47-25].value, state_p[47-27].value, state_p[47-29].value, state_p[47-31].value);
+                    }
+                    // update keystream bit
+                    ks_bits = f20c(f20a_1, f20b_1, f20b_2, f20a_2, f20b_3);
 
                     // for each completed byte:
                     if ((ks_idx & 0x07) == 0) {
@@ -437,88 +437,88 @@ const uint64_t CRACK_STATES_BITSLICED(uint32_t cuid, uint8_t *best_first_bytes,
 #endif
                           ) {
 #if defined (DEBUG_BRUTE_FORCE)
-							if (elimination_step < MAX_ELIMINATION_STEP) {
-								keys_eliminated[elimination_step] += MAX_BITSLICES;
-							}
+                            if (elimination_step < MAX_ELIMINATION_STEP) {
+                                keys_eliminated[elimination_step] += MAX_BITSLICES;
+                            }
 #endif
 #ifdef DEBUG_KEY_ELIMINATION
-							if (known_target_key != -1 && bucket_contains_test_key[block_idx] && *p_odd == test_state[ODD_STATE]) {
-								printf("Known target key eliminated in brute_force.\n");
-								printf("block_idx = %d/%d, nonce = %d/%d\n", block_idx, bitsliced_blocks, tests, nonces_to_bruteforce);
-							}
+                            if (known_target_key != -1 && bucket_contains_test_key[block_idx] && *p_odd == test_state[ODD_STATE]) {
+                                printf("Known target key eliminated in brute_force.\n");
+                                printf("block_idx = %d/%d, nonce = %d/%d\n", block_idx, bitsliced_blocks, tests, nonces_to_bruteforce);
+                            }
 #endif
-							goto stop_tests;
-						}
-						// prepare for next nonce byte
+                            goto stop_tests;
+                        }
+                        // prepare for next nonce byte
 #if defined (DEBUG_BRUTE_FORCE)
-						elimination_step++;
+                        elimination_step++;
 #endif
-						parity_bit_vector = bs_zeroes.value;
-					}
-					// update feedback bit vector
-					if (ks_idx != 0) {
-						fb_bits =
-								  (state_p[47- 0].value ^ state_p[47- 5].value ^ state_p[47- 9].value ^
-								   state_p[47-10].value ^ state_p[47-12].value ^ state_p[47-14].value ^
-								   state_p[47-15].value ^ state_p[47-17].value ^ state_p[47-19].value ^
-								   state_p[47-24].value ^ state_p[47-25].value ^ state_p[47-27].value ^
-								   state_p[47-29].value ^ state_p[47-35].value ^ state_p[47-39].value ^
-								   state_p[47-41].value ^ state_p[47-42].value ^ state_p[47-43].value);
-					}
-					// remember feedback and keystream vectors for later use
-					uint8_t bit = KEYSTREAM_SIZE - ks_idx;
-					if (bit <= next_common_bits) {  // if needed and not yet stored
-						fbb[bit] = fb_bits;
-						ksb[bit] = ks_bits;
-						par[bit] = parity_bit_vector;
-					}
+                        parity_bit_vector = bs_zeroes.value;
+                    }
+                    // update feedback bit vector
+                    if (ks_idx != 0) {
+                        fb_bits =
+                                  (state_p[47- 0].value ^ state_p[47- 5].value ^ state_p[47- 9].value ^
+                                   state_p[47-10].value ^ state_p[47-12].value ^ state_p[47-14].value ^
+                                   state_p[47-15].value ^ state_p[47-17].value ^ state_p[47-19].value ^
+                                   state_p[47-24].value ^ state_p[47-25].value ^ state_p[47-27].value ^
+                                   state_p[47-29].value ^ state_p[47-35].value ^ state_p[47-39].value ^
+                                   state_p[47-41].value ^ state_p[47-42].value ^ state_p[47-43].value);
+                    }
+                    // remember feedback and keystream vectors for later use
+                    uint8_t bit = KEYSTREAM_SIZE - ks_idx;
+                    if (bit <= next_common_bits) {  // if needed and not yet stored
+                        fbb[bit] = fb_bits;
+                        ksb[bit] = ks_bits;
+                        par[bit] = parity_bit_vector;
+                    }
                 }
-				// prepare for next nonce. Revert to initial state
-				state_p = &states[KEYSTREAM_SIZE];
+                // prepare for next nonce. Revert to initial state
+                state_p = &states[KEYSTREAM_SIZE];
             }
 
             // all nonce tests were successful: we've found a possible key in this block!
-			uint32_t *p_even_test = p_even;
+            uint32_t *p_even_test = p_even;
             for (uint32_t results_word = 0; results_word < MAX_BITSLICES / 64; ++results_word) {
-				uint64_t results64 = results.bytes64[results_word];
-				for (uint32_t results_bit = 0; results_bit < 64; results_bit++) {
-					if (results64 & 0x01) {
-						if (verify_key(cuid, nonces, best_first_bytes, *p_odd, *p_even_test)) {
-							struct Crypto1State pcs;
-							pcs.odd = *p_odd;
-							pcs.even = *p_even_test;
-							lfsr_rollback_byte(&pcs, (cuid >> 24) ^ best_first_bytes[0], true);
-							crypto1_get_lfsr(&pcs, &key);
-							bucket_states_tested += 64 * results_word + results_bit;
-							goto out;
-						}
+                uint64_t results64 = results.bytes64[results_word];
+                for (uint32_t results_bit = 0; results_bit < 64; results_bit++) {
+                    if (results64 & 0x01) {
+                        if (verify_key(cuid, nonces, best_first_bytes, *p_odd, *p_even_test)) {
+                            struct Crypto1State pcs;
+                            pcs.odd = *p_odd;
+                            pcs.even = *p_even_test;
+                            lfsr_rollback_byte(&pcs, (cuid >> 24) ^ best_first_bytes[0], true);
+                            crypto1_get_lfsr(&pcs, &key);
+                            bucket_states_tested += 64 * results_word + results_bit;
+                            goto out;
+                        }
 #ifdef DEBUG_KEY_ELIMINATION
-						if (known_target_key != -1 && *p_even_test == test_state[EVEN_STATE] && *p_odd == test_state[ODD_STATE]) {
-							printf("Known target key eliminated in brute_force verification.\n");
-							printf("block_idx = %d/%d\n", block_idx, bitsliced_blocks);
-						}
+                        if (known_target_key != -1 && *p_even_test == test_state[EVEN_STATE] && *p_odd == test_state[ODD_STATE]) {
+                            printf("Known target key eliminated in brute_force verification.\n");
+                            printf("block_idx = %d/%d\n", block_idx, bitsliced_blocks);
+                        }
 #endif
-					}
+                    }
 #ifdef DEBUG_KEY_ELIMINATION
-					if (known_target_key != -1 && *p_even_test == test_state[EVEN_STATE] && *p_odd == test_state[ODD_STATE]) {
-						printf("Known target key eliminated in brute_force (results_bit == 0).\n");
-						printf("block_idx = %d/%d\n", block_idx, bitsliced_blocks);
-					}
+                    if (known_target_key != -1 && *p_even_test == test_state[EVEN_STATE] && *p_odd == test_state[ODD_STATE]) {
+                        printf("Known target key eliminated in brute_force (results_bit == 0).\n");
+                        printf("block_idx = %d/%d\n", block_idx, bitsliced_blocks);
+                    }
 #endif
-					results64 >>= 1;
-					p_even_test++;
-					if (p_even_test == p_even_end) {
-						goto stop_tests;
-					}
-				}
+                    results64 >>= 1;
+                    p_even_test++;
+                    if (p_even_test == p_even_end) {
+                        goto stop_tests;
+                    }
+                }
             }
 stop_tests:
 #if defined (DEBUG_BRUTE_FORCE)
-			elimination_step = 0;
+            elimination_step = 0;
 #endif
             bucket_states_tested += bucket_size[block_idx];
             // prepare to set new states
-			state_p = &states[KEYSTREAM_SIZE];
+            state_p = &states[KEYSTREAM_SIZE];
             continue;
         }
     }
@@ -526,14 +526,14 @@ out:
     for(uint32_t block_idx = 0; block_idx < bitsliced_blocks; ++block_idx){
         free_bitslice(bitsliced_even_states[block_idx]);
     }
-	free(bitsliced_even_states);
-	free_bitslice(bitsliced_even_feedback);
+    free(bitsliced_even_states);
+    free_bitslice(bitsliced_even_feedback);
     __sync_fetch_and_add(num_keys_tested, bucket_states_tested);
 
 #if defined (DEBUG_BRUTE_FORCE)
-	for (uint32_t i = 0; i < MAX_ELIMINATION_STEP; i++) {
-		printf("Eliminated after %2u test_bytes: %5.2f%%\n", i+1, (float)keys_eliminated[i] / bucket_states_tested * 100);
-	}
+    for (uint32_t i = 0; i < MAX_ELIMINATION_STEP; i++) {
+        printf("Eliminated after %2u test_bytes: %5.2f%%\n", i+1, (float)keys_eliminated[i] / bucket_states_tested * 100);
+    }
 #endif
     return key;
 }
@@ -549,102 +549,102 @@ bitslice_test_nonces_t *bitslice_test_nonces_function_p = &bitslice_test_nonces_
 static SIMDExecInstr intSIMDInstr = SIMD_AUTO;
 
 void SetSIMDInstr(SIMDExecInstr instr) {
-	intSIMDInstr = instr;
+    intSIMDInstr = instr;
 
-	crack_states_bitsliced_function_p = &crack_states_bitsliced_dispatch;
-	bitslice_test_nonces_function_p = &bitslice_test_nonces_dispatch;
+    crack_states_bitsliced_function_p = &crack_states_bitsliced_dispatch;
+    bitslice_test_nonces_function_p = &bitslice_test_nonces_dispatch;
 }
 
 SIMDExecInstr GetSIMDInstr() {
-	SIMDExecInstr instr = SIMD_NONE;
+    SIMDExecInstr instr = SIMD_NONE;
 
 #if defined (__i386__) || defined (__x86_64__)
-	#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
-		#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
-		if (__builtin_cpu_supports("avx512f")) instr = SIMD_AVX512;
-		else if (__builtin_cpu_supports("avx2")) instr = SIMD_AVX2;
-		#else
-		if (__builtin_cpu_supports("avx2")) instr = SIMD_AVX2;
-		#endif
-		else if (__builtin_cpu_supports("avx")) instr = SIMD_AVX;
-		else if (__builtin_cpu_supports("sse2")) instr = SIMD_SSE2;
-		else if (__builtin_cpu_supports("mmx")) instr = SIMD_MMX;
-		else
-	#endif
+    #if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
+        #if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
+        if (__builtin_cpu_supports("avx512f")) instr = SIMD_AVX512;
+        else if (__builtin_cpu_supports("avx2")) instr = SIMD_AVX2;
+        #else
+        if (__builtin_cpu_supports("avx2")) instr = SIMD_AVX2;
+        #endif
+        else if (__builtin_cpu_supports("avx")) instr = SIMD_AVX;
+        else if (__builtin_cpu_supports("sse2")) instr = SIMD_SSE2;
+        else if (__builtin_cpu_supports("mmx")) instr = SIMD_MMX;
+        else
+    #endif
 #endif
-		instr = SIMD_NONE;
+        instr = SIMD_NONE;
 
-	return instr;
+    return instr;
 }
 
 SIMDExecInstr GetSIMDInstrAuto() {
-	SIMDExecInstr instr = intSIMDInstr;
-	if (instr == SIMD_AUTO)
-		return GetSIMDInstr();
+    SIMDExecInstr instr = intSIMDInstr;
+    if (instr == SIMD_AUTO)
+        return GetSIMDInstr();
 
-	return instr;
+    return instr;
 }
 
 // determine the available instruction set at runtime and call the correct function
 const uint64_t crack_states_bitsliced_dispatch(uint32_t cuid, uint8_t *best_first_bytes, statelist_t *p, uint32_t *keys_found, uint64_t *num_keys_tested, uint32_t nonces_to_bruteforce, uint8_t *bf_test_nonce_2nd_byte, noncelist_t *nonces) {
-	switch(GetSIMDInstrAuto()) {
+    switch(GetSIMDInstrAuto()) {
 #if defined (__i386__) || defined (__x86_64__)
-	#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
-		#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
-		case SIMD_AVX512:
-			crack_states_bitsliced_function_p = &crack_states_bitsliced_AVX512;
-			break;
-		#endif
-		case SIMD_AVX2:
-			crack_states_bitsliced_function_p = &crack_states_bitsliced_AVX2;
-			break;
-		case SIMD_AVX:
-			crack_states_bitsliced_function_p = &crack_states_bitsliced_AVX;
-			break;
-		case SIMD_SSE2:
-			crack_states_bitsliced_function_p = &crack_states_bitsliced_SSE2;
-			break;
-		case SIMD_MMX:
-			crack_states_bitsliced_function_p = &crack_states_bitsliced_MMX;
-			break;
-	#endif
+    #if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
+        #if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
+        case SIMD_AVX512:
+            crack_states_bitsliced_function_p = &crack_states_bitsliced_AVX512;
+            break;
+        #endif
+        case SIMD_AVX2:
+            crack_states_bitsliced_function_p = &crack_states_bitsliced_AVX2;
+            break;
+        case SIMD_AVX:
+            crack_states_bitsliced_function_p = &crack_states_bitsliced_AVX;
+            break;
+        case SIMD_SSE2:
+            crack_states_bitsliced_function_p = &crack_states_bitsliced_SSE2;
+            break;
+        case SIMD_MMX:
+            crack_states_bitsliced_function_p = &crack_states_bitsliced_MMX;
+            break;
+    #endif
 #endif
-		default:
-		crack_states_bitsliced_function_p = &crack_states_bitsliced_NOSIMD;
-			break;
-	}
+        default:
+        crack_states_bitsliced_function_p = &crack_states_bitsliced_NOSIMD;
+            break;
+    }
 
     // call the most optimized function for this CPU
     return (*crack_states_bitsliced_function_p)(cuid, best_first_bytes, p, keys_found, num_keys_tested, nonces_to_bruteforce, bf_test_nonce_2nd_byte, nonces);
 }
 
 void bitslice_test_nonces_dispatch(uint32_t nonces_to_bruteforce, uint32_t *bf_test_nonce, uint8_t *bf_test_nonce_par) {
-	switch(GetSIMDInstrAuto()) {
+    switch(GetSIMDInstrAuto()) {
 #if defined (__i386__) || defined (__x86_64__)
-	#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
-		#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
-		case SIMD_AVX512:
-			bitslice_test_nonces_function_p = &bitslice_test_nonces_AVX512;
-			break;
-		#endif
-		case SIMD_AVX2:
-			bitslice_test_nonces_function_p = &bitslice_test_nonces_AVX2;
-			break;
-		case SIMD_AVX:
-			bitslice_test_nonces_function_p = &bitslice_test_nonces_AVX;
-			break;
-		case SIMD_SSE2:
-			bitslice_test_nonces_function_p = &bitslice_test_nonces_SSE2;
-			break;
-		case SIMD_MMX:
-			bitslice_test_nonces_function_p = &bitslice_test_nonces_MMX;
-			break;
-	#endif
+    #if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
+        #if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
+        case SIMD_AVX512:
+            bitslice_test_nonces_function_p = &bitslice_test_nonces_AVX512;
+            break;
+        #endif
+        case SIMD_AVX2:
+            bitslice_test_nonces_function_p = &bitslice_test_nonces_AVX2;
+            break;
+        case SIMD_AVX:
+            bitslice_test_nonces_function_p = &bitslice_test_nonces_AVX;
+            break;
+        case SIMD_SSE2:
+            bitslice_test_nonces_function_p = &bitslice_test_nonces_SSE2;
+            break;
+        case SIMD_MMX:
+            bitslice_test_nonces_function_p = &bitslice_test_nonces_MMX;
+            break;
+    #endif
 #endif
-		default:
-		bitslice_test_nonces_function_p = &bitslice_test_nonces_NOSIMD;
-			break;
-	}
+        default:
+        bitslice_test_nonces_function_p = &bitslice_test_nonces_NOSIMD;
+            break;
+    }
 
     // call the most optimized function for this CPU
     (*bitslice_test_nonces_function_p)(nonces_to_bruteforce, bf_test_nonce, bf_test_nonce_par);
diff --git a/client/hardnested/hardnested_bf_core.h b/client/hardnested/hardnested_bf_core.h
index c7d0b03dd..bd0e83c68 100644
--- a/client/hardnested/hardnested_bf_core.h
+++ b/client/hardnested/hardnested_bf_core.h
@@ -50,16 +50,16 @@ THE SOFTWARE.
 #ifndef HARDNESTED_BF_CORE_H__
 #define HARDNESTED_BF_CORE_H__
 
-#include "hardnested_bruteforce.h"			// statelist_t
+#include "hardnested_bruteforce.h" // statelist_t
 
 typedef enum {
-	SIMD_AUTO,
-	SIMD_AVX512,
-	SIMD_AVX2,
-	SIMD_AVX,
-	SIMD_SSE2,
-	SIMD_MMX,
-	SIMD_NONE,
+    SIMD_AUTO,
+    SIMD_AVX512,
+    SIMD_AVX2,
+    SIMD_AVX,
+    SIMD_SSE2,
+    SIMD_MMX,
+    SIMD_NONE,
 } SIMDExecInstr;
 extern void SetSIMDInstr(SIMDExecInstr instr);
 extern SIMDExecInstr GetSIMDInstrAuto();
diff --git a/client/hardnested/hardnested_bitarray_core.c b/client/hardnested/hardnested_bitarray_core.c
index 1abdd8c79..09d9ef60b 100644
--- a/client/hardnested/hardnested_bitarray_core.c
+++ b/client/hardnested/hardnested_bitarray_core.c
@@ -146,16 +146,16 @@ count_bitarray_AND4_t count_bitarray_AND4_AVX512, count_bitarray_AND4_AVX2, coun
 inline uint32_t *MALLOC_BITARRAY(uint32_t x)
 {
 #if defined (_WIN32)
-	return __builtin_assume_aligned(_aligned_malloc((x), __BIGGEST_ALIGNMENT__), __BIGGEST_ALIGNMENT__);
+    return __builtin_assume_aligned(_aligned_malloc((x), __BIGGEST_ALIGNMENT__), __BIGGEST_ALIGNMENT__);
 #elif defined (__APPLE__)
-	uint32_t *allocated_memory;
-	if (posix_memalign((void**)&allocated_memory, __BIGGEST_ALIGNMENT__, x)) {
-		return NULL;
-	} else {
-		return __builtin_assume_aligned(allocated_memory, __BIGGEST_ALIGNMENT__);
-	}
+    uint32_t *allocated_memory;
+    if (posix_memalign((void**)&allocated_memory, __BIGGEST_ALIGNMENT__, x)) {
+        return NULL;
+    } else {
+        return __builtin_assume_aligned(allocated_memory, __BIGGEST_ALIGNMENT__);
+    }
 #else
-	return __builtin_assume_aligned(memalign(__BIGGEST_ALIGNMENT__, (x)), __BIGGEST_ALIGNMENT__);
+    return __builtin_assume_aligned(memalign(__BIGGEST_ALIGNMENT__, (x)), __BIGGEST_ALIGNMENT__);
 #endif
 }
 
@@ -163,139 +163,139 @@ inline uint32_t *MALLOC_BITARRAY(uint32_t x)
 inline void FREE_BITARRAY(uint32_t *x)
 {
 #ifdef _WIN32
-	_aligned_free(x);
+    _aligned_free(x);
 #else
-	free(x);
+    free(x);
 #endif
 }
 
 
 inline uint32_t BITCOUNT(uint32_t a)
 {
-	return __builtin_popcountl(a);
+    return __builtin_popcountl(a);
 }
 
 
 inline uint32_t COUNT_STATES(uint32_t *A)
 {
-	uint32_t count = 0;
-	for (uint32_t i = 0; i < (1<<19); i++) {
-		count += BITCOUNT(A[i]);
-	}
-	return count;
+    uint32_t count = 0;
+    for (uint32_t i = 0; i < (1<<19); i++) {
+        count += BITCOUNT(A[i]);
+    }
+    return count;
 }
 
 
 inline void BITARRAY_AND(uint32_t *restrict A, uint32_t *restrict B)
 {
-	A = __builtin_assume_aligned(A, __BIGGEST_ALIGNMENT__);
-	B = __builtin_assume_aligned(B, __BIGGEST_ALIGNMENT__);
-	for (uint32_t i = 0; i < (1<<19); i++) {
-		A[i] &= B[i];
-	}
+    A = __builtin_assume_aligned(A, __BIGGEST_ALIGNMENT__);
+    B = __builtin_assume_aligned(B, __BIGGEST_ALIGNMENT__);
+    for (uint32_t i = 0; i < (1<<19); i++) {
+        A[i] &= B[i];
+    }
 }
 
 
 inline void BITARRAY_LOW20_AND(uint32_t *restrict A, uint32_t *restrict B)
 {
-	uint16_t *a = (uint16_t *)__builtin_assume_aligned(A, __BIGGEST_ALIGNMENT__);
-	uint16_t *b = (uint16_t *)__builtin_assume_aligned(B, __BIGGEST_ALIGNMENT__);
+    uint16_t *a = (uint16_t *)__builtin_assume_aligned(A, __BIGGEST_ALIGNMENT__);
+    uint16_t *b = (uint16_t *)__builtin_assume_aligned(B, __BIGGEST_ALIGNMENT__);
 
-	for (uint32_t i = 0; i < (1<<20); i++) {
-		if (!b[i]) {
-			a[i] = 0;
-		}
-	}
+    for (uint32_t i = 0; i < (1<<20); i++) {
+        if (!b[i]) {
+            a[i] = 0;
+        }
+    }
 }
 
 
 inline uint32_t COUNT_BITARRAY_AND(uint32_t *restrict A, uint32_t *restrict B)
 {
-	A = __builtin_assume_aligned(A, __BIGGEST_ALIGNMENT__);
-	B = __builtin_assume_aligned(B, __BIGGEST_ALIGNMENT__);
-	uint32_t count = 0;
-	for (uint32_t i = 0; i < (1<<19); i++) {
-		A[i] &= B[i];
-		count += BITCOUNT(A[i]);
-	}
-	return count;
+    A = __builtin_assume_aligned(A, __BIGGEST_ALIGNMENT__);
+    B = __builtin_assume_aligned(B, __BIGGEST_ALIGNMENT__);
+    uint32_t count = 0;
+    for (uint32_t i = 0; i < (1<<19); i++) {
+        A[i] &= B[i];
+        count += BITCOUNT(A[i]);
+    }
+    return count;
 }
 
 
 inline uint32_t COUNT_BITARRAY_LOW20_AND(uint32_t *restrict A, uint32_t *restrict B)
 {
-	uint16_t *a = (uint16_t *)__builtin_assume_aligned(A, __BIGGEST_ALIGNMENT__);
-	uint16_t *b = (uint16_t *)__builtin_assume_aligned(B, __BIGGEST_ALIGNMENT__);
-	uint32_t count = 0;
+    uint16_t *a = (uint16_t *)__builtin_assume_aligned(A, __BIGGEST_ALIGNMENT__);
+    uint16_t *b = (uint16_t *)__builtin_assume_aligned(B, __BIGGEST_ALIGNMENT__);
+    uint32_t count = 0;
 
-	for (uint32_t i = 0; i < (1<<20); i++) {
-		if (!b[i]) {
-			a[i] = 0;
-		}
-		count += BITCOUNT(a[i]);
-	}
-	return count;
+    for (uint32_t i = 0; i < (1<<20); i++) {
+        if (!b[i]) {
+            a[i] = 0;
+        }
+        count += BITCOUNT(a[i]);
+    }
+    return count;
 }
 
 
 inline void BITARRAY_AND4(uint32_t *restrict A, uint32_t *restrict B, uint32_t *restrict C, uint32_t *restrict D)
 {
-	A = __builtin_assume_aligned(A, __BIGGEST_ALIGNMENT__);
-	B = __builtin_assume_aligned(B, __BIGGEST_ALIGNMENT__);
-	C = __builtin_assume_aligned(C, __BIGGEST_ALIGNMENT__);
-	D = __builtin_assume_aligned(D, __BIGGEST_ALIGNMENT__);
-	for (uint32_t i = 0; i < (1<<19); i++) {
-		A[i] = B[i] & C[i] & D[i];
-	}
+    A = __builtin_assume_aligned(A, __BIGGEST_ALIGNMENT__);
+    B = __builtin_assume_aligned(B, __BIGGEST_ALIGNMENT__);
+    C = __builtin_assume_aligned(C, __BIGGEST_ALIGNMENT__);
+    D = __builtin_assume_aligned(D, __BIGGEST_ALIGNMENT__);
+    for (uint32_t i = 0; i < (1<<19); i++) {
+        A[i] = B[i] & C[i] & D[i];
+    }
 }
 
 
 inline void BITARRAY_OR(uint32_t *restrict A, uint32_t *restrict B)
 {
-	A = __builtin_assume_aligned(A, __BIGGEST_ALIGNMENT__);
-	B = __builtin_assume_aligned(B, __BIGGEST_ALIGNMENT__);
-	for (uint32_t i = 0; i < (1<<19); i++) {
-		A[i] |= B[i];
-	}
+    A = __builtin_assume_aligned(A, __BIGGEST_ALIGNMENT__);
+    B = __builtin_assume_aligned(B, __BIGGEST_ALIGNMENT__);
+    for (uint32_t i = 0; i < (1<<19); i++) {
+        A[i] |= B[i];
+    }
 }
 
 
 inline uint32_t COUNT_BITARRAY_AND2(uint32_t *restrict A, uint32_t *restrict B)
 {
-	A = __builtin_assume_aligned(A, __BIGGEST_ALIGNMENT__);
-	B = __builtin_assume_aligned(B, __BIGGEST_ALIGNMENT__);
-	uint32_t count = 0;
-	for (uint32_t i = 0; i < (1<<19); i++) {
-		count += BITCOUNT(A[i] & B[i]);
-	}
-	return count;
+    A = __builtin_assume_aligned(A, __BIGGEST_ALIGNMENT__);
+    B = __builtin_assume_aligned(B, __BIGGEST_ALIGNMENT__);
+    uint32_t count = 0;
+    for (uint32_t i = 0; i < (1<<19); i++) {
+        count += BITCOUNT(A[i] & B[i]);
+    }
+    return count;
 }
 
 
 inline uint32_t COUNT_BITARRAY_AND3(uint32_t *restrict A, uint32_t *restrict B, uint32_t *restrict C)
 {
-	A = __builtin_assume_aligned(A, __BIGGEST_ALIGNMENT__);
-	B = __builtin_assume_aligned(B, __BIGGEST_ALIGNMENT__);
-	C = __builtin_assume_aligned(C, __BIGGEST_ALIGNMENT__);
-	uint32_t count = 0;
-	for (uint32_t i = 0; i < (1<<19); i++) {
-		count += BITCOUNT(A[i] & B[i] & C[i]);
-	}
-	return count;
+    A = __builtin_assume_aligned(A, __BIGGEST_ALIGNMENT__);
+    B = __builtin_assume_aligned(B, __BIGGEST_ALIGNMENT__);
+    C = __builtin_assume_aligned(C, __BIGGEST_ALIGNMENT__);
+    uint32_t count = 0;
+    for (uint32_t i = 0; i < (1<<19); i++) {
+        count += BITCOUNT(A[i] & B[i] & C[i]);
+    }
+    return count;
 }
 
 
 inline uint32_t COUNT_BITARRAY_AND4(uint32_t *restrict A, uint32_t *restrict B, uint32_t *restrict C, uint32_t *restrict D)
 {
-	A = __builtin_assume_aligned(A, __BIGGEST_ALIGNMENT__);
-	B = __builtin_assume_aligned(B, __BIGGEST_ALIGNMENT__);
-	C = __builtin_assume_aligned(C, __BIGGEST_ALIGNMENT__);
-	D = __builtin_assume_aligned(D, __BIGGEST_ALIGNMENT__);
-	uint32_t count = 0;
-	for (uint32_t i = 0; i < (1<<19); i++) {
-		count += BITCOUNT(A[i] & B[i] & C[i] & D[i]);
-	}
-	return count;
+    A = __builtin_assume_aligned(A, __BIGGEST_ALIGNMENT__);
+    B = __builtin_assume_aligned(B, __BIGGEST_ALIGNMENT__);
+    C = __builtin_assume_aligned(C, __BIGGEST_ALIGNMENT__);
+    D = __builtin_assume_aligned(D, __BIGGEST_ALIGNMENT__);
+    uint32_t count = 0;
+    for (uint32_t i = 0; i < (1<<19); i++) {
+        count += BITCOUNT(A[i] & B[i] & C[i] & D[i]);
+    }
+    return count;
 }
 
 
@@ -319,20 +319,20 @@ count_bitarray_AND4_t *count_bitarray_AND4_function_p = &count_bitarray_AND4_dis
 // determine the available instruction set at runtime and call the correct function
 uint32_t *malloc_bitarray_dispatch(uint32_t x) {
 #if defined (__i386__) || defined (__x86_64__)
-	#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
-		#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
-	if (__builtin_cpu_supports("avx512f")) malloc_bitarray_function_p = &malloc_bitarray_AVX512;
-	else if (__builtin_cpu_supports("avx2")) malloc_bitarray_function_p = &malloc_bitarray_AVX2;
-		#else
-	if (__builtin_cpu_supports("avx2")) malloc_bitarray_function_p = &malloc_bitarray_AVX2;
-		#endif
-	else if (__builtin_cpu_supports("avx")) malloc_bitarray_function_p = &malloc_bitarray_AVX;
-	else if (__builtin_cpu_supports("sse2")) malloc_bitarray_function_p = &malloc_bitarray_SSE2;
-	else if (__builtin_cpu_supports("mmx")) malloc_bitarray_function_p = &malloc_bitarray_MMX;
-	else
-	#endif
+    #if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
+        #if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
+    if (__builtin_cpu_supports("avx512f")) malloc_bitarray_function_p = &malloc_bitarray_AVX512;
+    else if (__builtin_cpu_supports("avx2")) malloc_bitarray_function_p = &malloc_bitarray_AVX2;
+        #else
+    if (__builtin_cpu_supports("avx2")) malloc_bitarray_function_p = &malloc_bitarray_AVX2;
+        #endif
+    else if (__builtin_cpu_supports("avx")) malloc_bitarray_function_p = &malloc_bitarray_AVX;
+    else if (__builtin_cpu_supports("sse2")) malloc_bitarray_function_p = &malloc_bitarray_SSE2;
+    else if (__builtin_cpu_supports("mmx")) malloc_bitarray_function_p = &malloc_bitarray_MMX;
+    else
+    #endif
 #endif
-		malloc_bitarray_function_p = &malloc_bitarray_NOSIMD;
+        malloc_bitarray_function_p = &malloc_bitarray_NOSIMD;
 
     // call the most optimized function for this CPU
     return (*malloc_bitarray_function_p)(x);
@@ -340,20 +340,20 @@ uint32_t *malloc_bitarray_dispatch(uint32_t x) {
 
 void free_bitarray_dispatch(uint32_t *x) {
 #if defined (__i386__) || defined (__x86_64__)
-	#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
-		#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
-	if (__builtin_cpu_supports("avx512f")) free_bitarray_function_p = &free_bitarray_AVX512;
-	else if (__builtin_cpu_supports("avx2")) free_bitarray_function_p = &free_bitarray_AVX2;
-		#else
-	if (__builtin_cpu_supports("avx2")) free_bitarray_function_p = &free_bitarray_AVX2;
-		#endif
-	else if (__builtin_cpu_supports("avx")) free_bitarray_function_p = &free_bitarray_AVX;
-	else if (__builtin_cpu_supports("sse2")) free_bitarray_function_p = &free_bitarray_SSE2;
-	else if (__builtin_cpu_supports("mmx")) free_bitarray_function_p = &free_bitarray_MMX;
-	else
-	#endif
+    #if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
+        #if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
+    if (__builtin_cpu_supports("avx512f")) free_bitarray_function_p = &free_bitarray_AVX512;
+    else if (__builtin_cpu_supports("avx2")) free_bitarray_function_p = &free_bitarray_AVX2;
+        #else
+    if (__builtin_cpu_supports("avx2")) free_bitarray_function_p = &free_bitarray_AVX2;
+        #endif
+    else if (__builtin_cpu_supports("avx")) free_bitarray_function_p = &free_bitarray_AVX;
+    else if (__builtin_cpu_supports("sse2")) free_bitarray_function_p = &free_bitarray_SSE2;
+    else if (__builtin_cpu_supports("mmx")) free_bitarray_function_p = &free_bitarray_MMX;
+    else
+    #endif
 #endif
-		free_bitarray_function_p = &free_bitarray_NOSIMD;
+        free_bitarray_function_p = &free_bitarray_NOSIMD;
 
     // call the most optimized function for this CPU
     (*free_bitarray_function_p)(x);
@@ -361,20 +361,20 @@ void free_bitarray_dispatch(uint32_t *x) {
 
 uint32_t bitcount_dispatch(uint32_t a) {
 #if defined (__i386__) || defined (__x86_64__)
-	#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
-		#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
-	if (__builtin_cpu_supports("avx512f")) bitcount_function_p = &bitcount_AVX512;
-	else if (__builtin_cpu_supports("avx2")) bitcount_function_p = &bitcount_AVX2;
-		#else
-	if (__builtin_cpu_supports("avx2")) bitcount_function_p = &bitcount_AVX2;
-		#endif
-	else if (__builtin_cpu_supports("avx")) bitcount_function_p = &bitcount_AVX;
-	else if (__builtin_cpu_supports("sse2")) bitcount_function_p = &bitcount_SSE2;
-	else if (__builtin_cpu_supports("mmx")) bitcount_function_p = &bitcount_MMX;
-	else
-	#endif
+    #if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
+        #if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
+    if (__builtin_cpu_supports("avx512f")) bitcount_function_p = &bitcount_AVX512;
+    else if (__builtin_cpu_supports("avx2")) bitcount_function_p = &bitcount_AVX2;
+        #else
+    if (__builtin_cpu_supports("avx2")) bitcount_function_p = &bitcount_AVX2;
+        #endif
+    else if (__builtin_cpu_supports("avx")) bitcount_function_p = &bitcount_AVX;
+    else if (__builtin_cpu_supports("sse2")) bitcount_function_p = &bitcount_SSE2;
+    else if (__builtin_cpu_supports("mmx")) bitcount_function_p = &bitcount_MMX;
+    else
+    #endif
 #endif
-		bitcount_function_p = &bitcount_NOSIMD;
+        bitcount_function_p = &bitcount_NOSIMD;
 
     // call the most optimized function for this CPU
     return (*bitcount_function_p)(a);
@@ -382,20 +382,20 @@ uint32_t bitcount_dispatch(uint32_t a) {
 
 uint32_t count_states_dispatch(uint32_t *bitarray) {
 #if defined (__i386__) || defined (__x86_64__)
-	#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
-		#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
-	if (__builtin_cpu_supports("avx512f")) count_states_function_p = &count_states_AVX512;
-	else if (__builtin_cpu_supports("avx2")) count_states_function_p = &count_states_AVX2;
-		#else
-	if (__builtin_cpu_supports("avx2")) count_states_function_p = &count_states_AVX2;
-		#endif
-	else if (__builtin_cpu_supports("avx")) count_states_function_p = &count_states_AVX;
-	else if (__builtin_cpu_supports("sse2")) count_states_function_p = &count_states_SSE2;
-	else if (__builtin_cpu_supports("mmx")) count_states_function_p = &count_states_MMX;
-	else
-	#endif
+    #if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
+        #if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
+    if (__builtin_cpu_supports("avx512f")) count_states_function_p = &count_states_AVX512;
+    else if (__builtin_cpu_supports("avx2")) count_states_function_p = &count_states_AVX2;
+        #else
+    if (__builtin_cpu_supports("avx2")) count_states_function_p = &count_states_AVX2;
+        #endif
+    else if (__builtin_cpu_supports("avx")) count_states_function_p = &count_states_AVX;
+    else if (__builtin_cpu_supports("sse2")) count_states_function_p = &count_states_SSE2;
+    else if (__builtin_cpu_supports("mmx")) count_states_function_p = &count_states_MMX;
+    else
+    #endif
 #endif
-		count_states_function_p = &count_states_NOSIMD;
+        count_states_function_p = &count_states_NOSIMD;
 
     // call the most optimized function for this CPU
     return (*count_states_function_p)(bitarray);
@@ -403,20 +403,20 @@ uint32_t count_states_dispatch(uint32_t *bitarray) {
 
 void bitarray_AND_dispatch(uint32_t *A, uint32_t *B) {
 #if defined (__i386__) || defined (__x86_64__)
-	#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
-		#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
-	if (__builtin_cpu_supports("avx512f")) bitarray_AND_function_p = &bitarray_AND_AVX512;
-	else if (__builtin_cpu_supports("avx2")) bitarray_AND_function_p = &bitarray_AND_AVX2;
-		#else
-	if (__builtin_cpu_supports("avx2")) bitarray_AND_function_p = &bitarray_AND_AVX2;
-		#endif
-	else if (__builtin_cpu_supports("avx")) bitarray_AND_function_p = &bitarray_AND_AVX;
-	else if (__builtin_cpu_supports("sse2")) bitarray_AND_function_p = &bitarray_AND_SSE2;
-	else if (__builtin_cpu_supports("mmx")) bitarray_AND_function_p = &bitarray_AND_MMX;
-	else
-	#endif
+    #if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
+        #if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
+    if (__builtin_cpu_supports("avx512f")) bitarray_AND_function_p = &bitarray_AND_AVX512;
+    else if (__builtin_cpu_supports("avx2")) bitarray_AND_function_p = &bitarray_AND_AVX2;
+        #else
+    if (__builtin_cpu_supports("avx2")) bitarray_AND_function_p = &bitarray_AND_AVX2;
+        #endif
+    else if (__builtin_cpu_supports("avx")) bitarray_AND_function_p = &bitarray_AND_AVX;
+    else if (__builtin_cpu_supports("sse2")) bitarray_AND_function_p = &bitarray_AND_SSE2;
+    else if (__builtin_cpu_supports("mmx")) bitarray_AND_function_p = &bitarray_AND_MMX;
+    else
+    #endif
 #endif
-		bitarray_AND_function_p = &bitarray_AND_NOSIMD;
+        bitarray_AND_function_p = &bitarray_AND_NOSIMD;
 
     // call the most optimized function for this CPU
     (*bitarray_AND_function_p)(A,B);
@@ -424,20 +424,20 @@ void bitarray_AND_dispatch(uint32_t *A, uint32_t *B) {
 
 void bitarray_low20_AND_dispatch(uint32_t *A, uint32_t *B) {
 #if defined (__i386__) || defined (__x86_64__)
-	#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
-		#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
-	if (__builtin_cpu_supports("avx512f")) bitarray_low20_AND_function_p = &bitarray_low20_AND_AVX512;
-	else if (__builtin_cpu_supports("avx2")) bitarray_low20_AND_function_p = &bitarray_low20_AND_AVX2;
-		#else
-	if (__builtin_cpu_supports("avx2")) bitarray_low20_AND_function_p = &bitarray_low20_AND_AVX2;
-		#endif
-	else if (__builtin_cpu_supports("avx")) bitarray_low20_AND_function_p = &bitarray_low20_AND_AVX;
-	else if (__builtin_cpu_supports("sse2")) bitarray_low20_AND_function_p = &bitarray_low20_AND_SSE2;
-	else if (__builtin_cpu_supports("mmx")) bitarray_low20_AND_function_p = &bitarray_low20_AND_MMX;
-	else
-	#endif
+    #if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
+        #if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
+    if (__builtin_cpu_supports("avx512f")) bitarray_low20_AND_function_p = &bitarray_low20_AND_AVX512;
+    else if (__builtin_cpu_supports("avx2")) bitarray_low20_AND_function_p = &bitarray_low20_AND_AVX2;
+        #else
+    if (__builtin_cpu_supports("avx2")) bitarray_low20_AND_function_p = &bitarray_low20_AND_AVX2;
+        #endif
+    else if (__builtin_cpu_supports("avx")) bitarray_low20_AND_function_p = &bitarray_low20_AND_AVX;
+    else if (__builtin_cpu_supports("sse2")) bitarray_low20_AND_function_p = &bitarray_low20_AND_SSE2;
+    else if (__builtin_cpu_supports("mmx")) bitarray_low20_AND_function_p = &bitarray_low20_AND_MMX;
+    else
+    #endif
 #endif
-		bitarray_low20_AND_function_p = &bitarray_low20_AND_NOSIMD;
+        bitarray_low20_AND_function_p = &bitarray_low20_AND_NOSIMD;
 
     // call the most optimized function for this CPU
     (*bitarray_low20_AND_function_p)(A, B);
@@ -445,20 +445,20 @@ void bitarray_low20_AND_dispatch(uint32_t *A, uint32_t *B) {
 
 uint32_t count_bitarray_AND_dispatch(uint32_t *A, uint32_t *B) {
 #if defined (__i386__) || defined (__x86_64__)
-	#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
-		#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
-	if (__builtin_cpu_supports("avx512f")) count_bitarray_AND_function_p = &count_bitarray_AND_AVX512;
-	else if (__builtin_cpu_supports("avx2")) count_bitarray_AND_function_p = &count_bitarray_AND_AVX2;
-		#else
-	if (__builtin_cpu_supports("avx2")) count_bitarray_AND_function_p = &count_bitarray_AND_AVX2;
-		#endif
-	else if (__builtin_cpu_supports("avx")) count_bitarray_AND_function_p = &count_bitarray_AND_AVX;
-	else if (__builtin_cpu_supports("sse2")) count_bitarray_AND_function_p = &count_bitarray_AND_SSE2;
-	else if (__builtin_cpu_supports("mmx")) count_bitarray_AND_function_p = &count_bitarray_AND_MMX;
-	else
-	#endif
+    #if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
+        #if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
+    if (__builtin_cpu_supports("avx512f")) count_bitarray_AND_function_p = &count_bitarray_AND_AVX512;
+    else if (__builtin_cpu_supports("avx2")) count_bitarray_AND_function_p = &count_bitarray_AND_AVX2;
+        #else
+    if (__builtin_cpu_supports("avx2")) count_bitarray_AND_function_p = &count_bitarray_AND_AVX2;
+        #endif
+    else if (__builtin_cpu_supports("avx")) count_bitarray_AND_function_p = &count_bitarray_AND_AVX;
+    else if (__builtin_cpu_supports("sse2")) count_bitarray_AND_function_p = &count_bitarray_AND_SSE2;
+    else if (__builtin_cpu_supports("mmx")) count_bitarray_AND_function_p = &count_bitarray_AND_MMX;
+    else
+    #endif
 #endif
-		count_bitarray_AND_function_p = &count_bitarray_AND_NOSIMD;
+        count_bitarray_AND_function_p = &count_bitarray_AND_NOSIMD;
 
     // call the most optimized function for this CPU
     return (*count_bitarray_AND_function_p)(A, B);
@@ -466,20 +466,20 @@ uint32_t count_bitarray_AND_dispatch(uint32_t *A, uint32_t *B) {
 
 uint32_t count_bitarray_low20_AND_dispatch(uint32_t *A, uint32_t *B) {
 #if defined (__i386__) || defined (__x86_64__)
-	#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
-		#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
-	if (__builtin_cpu_supports("avx512f")) count_bitarray_low20_AND_function_p = &count_bitarray_low20_AND_AVX512;
-	else if (__builtin_cpu_supports("avx2")) count_bitarray_low20_AND_function_p = &count_bitarray_low20_AND_AVX2;
-		#else
-	if (__builtin_cpu_supports("avx2")) count_bitarray_low20_AND_function_p = &count_bitarray_low20_AND_AVX2;
-		#endif
-	else if (__builtin_cpu_supports("avx")) count_bitarray_low20_AND_function_p = &count_bitarray_low20_AND_AVX;
-	else if (__builtin_cpu_supports("sse2")) count_bitarray_low20_AND_function_p = &count_bitarray_low20_AND_SSE2;
-	else if (__builtin_cpu_supports("mmx")) count_bitarray_low20_AND_function_p = &count_bitarray_low20_AND_MMX;
-	else
-	#endif
+    #if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
+        #if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
+    if (__builtin_cpu_supports("avx512f")) count_bitarray_low20_AND_function_p = &count_bitarray_low20_AND_AVX512;
+    else if (__builtin_cpu_supports("avx2")) count_bitarray_low20_AND_function_p = &count_bitarray_low20_AND_AVX2;
+        #else
+    if (__builtin_cpu_supports("avx2")) count_bitarray_low20_AND_function_p = &count_bitarray_low20_AND_AVX2;
+        #endif
+    else if (__builtin_cpu_supports("avx")) count_bitarray_low20_AND_function_p = &count_bitarray_low20_AND_AVX;
+    else if (__builtin_cpu_supports("sse2")) count_bitarray_low20_AND_function_p = &count_bitarray_low20_AND_SSE2;
+    else if (__builtin_cpu_supports("mmx")) count_bitarray_low20_AND_function_p = &count_bitarray_low20_AND_MMX;
+    else
+    #endif
 #endif
-		count_bitarray_low20_AND_function_p = &count_bitarray_low20_AND_NOSIMD;
+        count_bitarray_low20_AND_function_p = &count_bitarray_low20_AND_NOSIMD;
 
     // call the most optimized function for this CPU
     return (*count_bitarray_low20_AND_function_p)(A, B);
@@ -487,20 +487,20 @@ uint32_t count_bitarray_low20_AND_dispatch(uint32_t *A, uint32_t *B) {
 
 void bitarray_AND4_dispatch(uint32_t *A, uint32_t *B, uint32_t *C, uint32_t *D) {
 #if defined (__i386__) || defined (__x86_64__)
-	#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
-		#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
-	if (__builtin_cpu_supports("avx512f")) bitarray_AND4_function_p = &bitarray_AND4_AVX512;
-	else if (__builtin_cpu_supports("avx2")) bitarray_AND4_function_p = &bitarray_AND4_AVX2;
-		#else
-	if (__builtin_cpu_supports("avx2")) bitarray_AND4_function_p = &bitarray_AND4_AVX2;
-		#endif
-	else if (__builtin_cpu_supports("avx")) bitarray_AND4_function_p = &bitarray_AND4_AVX;
-	else if (__builtin_cpu_supports("sse2")) bitarray_AND4_function_p = &bitarray_AND4_SSE2;
-	else if (__builtin_cpu_supports("mmx")) bitarray_AND4_function_p = &bitarray_AND4_MMX;
-	else
-	#endif
+    #if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
+        #if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
+    if (__builtin_cpu_supports("avx512f")) bitarray_AND4_function_p = &bitarray_AND4_AVX512;
+    else if (__builtin_cpu_supports("avx2")) bitarray_AND4_function_p = &bitarray_AND4_AVX2;
+        #else
+    if (__builtin_cpu_supports("avx2")) bitarray_AND4_function_p = &bitarray_AND4_AVX2;
+        #endif
+    else if (__builtin_cpu_supports("avx")) bitarray_AND4_function_p = &bitarray_AND4_AVX;
+    else if (__builtin_cpu_supports("sse2")) bitarray_AND4_function_p = &bitarray_AND4_SSE2;
+    else if (__builtin_cpu_supports("mmx")) bitarray_AND4_function_p = &bitarray_AND4_MMX;
+    else
+    #endif
 #endif
-		bitarray_AND4_function_p = &bitarray_AND4_NOSIMD;
+        bitarray_AND4_function_p = &bitarray_AND4_NOSIMD;
 
     // call the most optimized function for this CPU
     (*bitarray_AND4_function_p)(A, B, C, D);
@@ -508,20 +508,20 @@ void bitarray_AND4_dispatch(uint32_t *A, uint32_t *B, uint32_t *C, uint32_t *D)
 
 void bitarray_OR_dispatch(uint32_t *A, uint32_t *B) {
 #if defined (__i386__) || defined (__x86_64__)
-	#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
-		#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
-	if (__builtin_cpu_supports("avx512f")) bitarray_OR_function_p = &bitarray_OR_AVX512;
-	else if (__builtin_cpu_supports("avx2")) bitarray_OR_function_p = &bitarray_OR_AVX2;
-		#else
-	if (__builtin_cpu_supports("avx2")) bitarray_OR_function_p = &bitarray_OR_AVX2;
-		#endif
-	else if (__builtin_cpu_supports("avx")) bitarray_OR_function_p = &bitarray_OR_AVX;
-	else if (__builtin_cpu_supports("sse2")) bitarray_OR_function_p = &bitarray_OR_SSE2;
-	else if (__builtin_cpu_supports("mmx")) bitarray_OR_function_p = &bitarray_OR_MMX;
-	else
-	#endif
+    #if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
+        #if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
+    if (__builtin_cpu_supports("avx512f")) bitarray_OR_function_p = &bitarray_OR_AVX512;
+    else if (__builtin_cpu_supports("avx2")) bitarray_OR_function_p = &bitarray_OR_AVX2;
+        #else
+    if (__builtin_cpu_supports("avx2")) bitarray_OR_function_p = &bitarray_OR_AVX2;
+        #endif
+    else if (__builtin_cpu_supports("avx")) bitarray_OR_function_p = &bitarray_OR_AVX;
+    else if (__builtin_cpu_supports("sse2")) bitarray_OR_function_p = &bitarray_OR_SSE2;
+    else if (__builtin_cpu_supports("mmx")) bitarray_OR_function_p = &bitarray_OR_MMX;
+    else
+    #endif
 #endif
-		bitarray_OR_function_p = &bitarray_OR_NOSIMD;
+        bitarray_OR_function_p = &bitarray_OR_NOSIMD;
 
     // call the most optimized function for this CPU
     (*bitarray_OR_function_p)(A,B);
@@ -529,20 +529,20 @@ void bitarray_OR_dispatch(uint32_t *A, uint32_t *B) {
 
 uint32_t count_bitarray_AND2_dispatch(uint32_t *A, uint32_t *B) {
 #if defined (__i386__) || defined (__x86_64__)
-	#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
-		#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
-	if (__builtin_cpu_supports("avx512f")) count_bitarray_AND2_function_p = &count_bitarray_AND2_AVX512;
-	else if (__builtin_cpu_supports("avx2")) count_bitarray_AND2_function_p = &count_bitarray_AND2_AVX2;
-		#else
-	if (__builtin_cpu_supports("avx2")) count_bitarray_AND2_function_p = &count_bitarray_AND2_AVX2;
-		#endif
-	else if (__builtin_cpu_supports("avx")) count_bitarray_AND2_function_p = &count_bitarray_AND2_AVX;
-	else if (__builtin_cpu_supports("sse2")) count_bitarray_AND2_function_p = &count_bitarray_AND2_SSE2;
-	else if (__builtin_cpu_supports("mmx")) count_bitarray_AND2_function_p = &count_bitarray_AND2_MMX;
-	else
-	#endif
+    #if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
+        #if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
+    if (__builtin_cpu_supports("avx512f")) count_bitarray_AND2_function_p = &count_bitarray_AND2_AVX512;
+    else if (__builtin_cpu_supports("avx2")) count_bitarray_AND2_function_p = &count_bitarray_AND2_AVX2;
+        #else
+    if (__builtin_cpu_supports("avx2")) count_bitarray_AND2_function_p = &count_bitarray_AND2_AVX2;
+        #endif
+    else if (__builtin_cpu_supports("avx")) count_bitarray_AND2_function_p = &count_bitarray_AND2_AVX;
+    else if (__builtin_cpu_supports("sse2")) count_bitarray_AND2_function_p = &count_bitarray_AND2_SSE2;
+    else if (__builtin_cpu_supports("mmx")) count_bitarray_AND2_function_p = &count_bitarray_AND2_MMX;
+    else
+    #endif
 #endif
-		count_bitarray_AND2_function_p = &count_bitarray_AND2_NOSIMD;
+        count_bitarray_AND2_function_p = &count_bitarray_AND2_NOSIMD;
 
     // call the most optimized function for this CPU
     return (*count_bitarray_AND2_function_p)(A, B);
@@ -550,20 +550,20 @@ uint32_t count_bitarray_AND2_dispatch(uint32_t *A, uint32_t *B) {
 
 uint32_t count_bitarray_AND3_dispatch(uint32_t *A, uint32_t *B, uint32_t *C) {
 #if defined (__i386__) || defined (__x86_64__)
-	#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
-		#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
-	if (__builtin_cpu_supports("avx512f")) count_bitarray_AND3_function_p = &count_bitarray_AND3_AVX512;
-	else if (__builtin_cpu_supports("avx2")) count_bitarray_AND3_function_p = &count_bitarray_AND3_AVX2;
-		#else
-	if (__builtin_cpu_supports("avx2")) count_bitarray_AND3_function_p = &count_bitarray_AND3_AVX2;
-		#endif
-	else if (__builtin_cpu_supports("avx")) count_bitarray_AND3_function_p = &count_bitarray_AND3_AVX;
-	else if (__builtin_cpu_supports("sse2")) count_bitarray_AND3_function_p = &count_bitarray_AND3_SSE2;
-	else if (__builtin_cpu_supports("mmx")) count_bitarray_AND3_function_p = &count_bitarray_AND3_MMX;
-	else
-	#endif
+    #if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
+        #if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
+    if (__builtin_cpu_supports("avx512f")) count_bitarray_AND3_function_p = &count_bitarray_AND3_AVX512;
+    else if (__builtin_cpu_supports("avx2")) count_bitarray_AND3_function_p = &count_bitarray_AND3_AVX2;
+        #else
+    if (__builtin_cpu_supports("avx2")) count_bitarray_AND3_function_p = &count_bitarray_AND3_AVX2;
+        #endif
+    else if (__builtin_cpu_supports("avx")) count_bitarray_AND3_function_p = &count_bitarray_AND3_AVX;
+    else if (__builtin_cpu_supports("sse2")) count_bitarray_AND3_function_p = &count_bitarray_AND3_SSE2;
+    else if (__builtin_cpu_supports("mmx")) count_bitarray_AND3_function_p = &count_bitarray_AND3_MMX;
+    else
+    #endif
 #endif
-		count_bitarray_AND3_function_p = &count_bitarray_AND3_NOSIMD;
+        count_bitarray_AND3_function_p = &count_bitarray_AND3_NOSIMD;
 
     // call the most optimized function for this CPU
     return (*count_bitarray_AND3_function_p)(A, B, C);
@@ -571,20 +571,20 @@ uint32_t count_bitarray_AND3_dispatch(uint32_t *A, uint32_t *B, uint32_t *C) {
 
 uint32_t count_bitarray_AND4_dispatch(uint32_t *A, uint32_t *B, uint32_t *C, uint32_t *D) {
 #if defined (__i386__) || defined (__x86_64__)
-	#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
-		#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
-	if (__builtin_cpu_supports("avx512f")) count_bitarray_AND4_function_p = &count_bitarray_AND4_AVX512;
-	else if (__builtin_cpu_supports("avx2")) count_bitarray_AND4_function_p = &count_bitarray_AND4_AVX2;
-		#else
-	if (__builtin_cpu_supports("avx2")) count_bitarray_AND4_function_p = &count_bitarray_AND4_AVX2;
-		#endif
-	else if (__builtin_cpu_supports("avx")) count_bitarray_AND4_function_p = &count_bitarray_AND4_AVX;
-	else if (__builtin_cpu_supports("sse2")) count_bitarray_AND4_function_p = &count_bitarray_AND4_SSE2;
-	else if (__builtin_cpu_supports("mmx")) count_bitarray_AND4_function_p = &count_bitarray_AND4_MMX;
-	else
-	#endif
+    #if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
+        #if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
+    if (__builtin_cpu_supports("avx512f")) count_bitarray_AND4_function_p = &count_bitarray_AND4_AVX512;
+    else if (__builtin_cpu_supports("avx2")) count_bitarray_AND4_function_p = &count_bitarray_AND4_AVX2;
+        #else
+    if (__builtin_cpu_supports("avx2")) count_bitarray_AND4_function_p = &count_bitarray_AND4_AVX2;
+        #endif
+    else if (__builtin_cpu_supports("avx")) count_bitarray_AND4_function_p = &count_bitarray_AND4_AVX;
+    else if (__builtin_cpu_supports("sse2")) count_bitarray_AND4_function_p = &count_bitarray_AND4_SSE2;
+    else if (__builtin_cpu_supports("mmx")) count_bitarray_AND4_function_p = &count_bitarray_AND4_MMX;
+    else
+    #endif
 #endif
-		count_bitarray_AND4_function_p = &count_bitarray_AND4_NOSIMD;
+        count_bitarray_AND4_function_p = &count_bitarray_AND4_NOSIMD;
 
     // call the most optimized function for this CPU
     return (*count_bitarray_AND4_function_p)(A, B, C, D);
diff --git a/client/hardnested/hardnested_bruteforce.c b/client/hardnested/hardnested_bruteforce.c
index 49cd4908d..ce250152a 100644
--- a/client/hardnested/hardnested_bruteforce.c
+++ b/client/hardnested/hardnested_bruteforce.c
@@ -64,10 +64,10 @@ THE SOFTWARE.
 #include "crapto1/crapto1.h"
 #include "parity.h"
 
-#define NUM_BRUTE_FORCE_THREADS			(num_CPUs())
-#define DEFAULT_BRUTE_FORCE_RATE		(120000000.0)		// if benchmark doesn't succeed
-#define TEST_BENCH_SIZE					(6000)				// number of odd and even states for brute force benchmark
-#define TEST_BENCH_FILENAME				"hardnested/bf_bench_data.bin"
+#define NUM_BRUTE_FORCE_THREADS         (num_CPUs())
+#define DEFAULT_BRUTE_FORCE_RATE        (120000000.0) // if benchmark doesn't succeed
+#define TEST_BENCH_SIZE                 (6000)        // number of odd and even states for brute force benchmark
+#define TEST_BENCH_FILENAME             "hardnested/bf_bench_data.bin"
 //#define WRITE_BENCH_FILE
 
 // debugging options
@@ -75,8 +75,8 @@ THE SOFTWARE.
 // #define DEBUG_BRUTE_FORCE
 
 typedef enum {
-	EVEN_STATE = 0,
-	ODD_STATE = 1
+    EVEN_STATE = 0,
+    ODD_STATE = 1
 } odd_even_t;
 
 static uint32_t nonces_to_bruteforce = 0;
@@ -91,99 +91,99 @@ static uint64_t found_bs_key = 0;
 
 inline uint8_t trailing_zeros(uint8_t byte)
 {
-	static const uint8_t trailing_zeros_LUT[256] = {
-		8, 0, 1, 0, 2, 0, 1, 0,	3, 0, 1, 0, 2, 0, 1, 0,
-		4, 0, 1, 0, 2, 0, 1, 0,	3, 0, 1, 0, 2, 0, 1, 0,
-		5, 0, 1, 0, 2, 0, 1, 0,	3, 0, 1, 0, 2, 0, 1, 0,
-		4, 0, 1, 0, 2, 0, 1, 0,	3, 0, 1, 0, 2, 0, 1, 0,
-		6, 0, 1, 0, 2, 0, 1, 0,	3, 0, 1, 0, 2, 0, 1, 0,
-		4, 0, 1, 0, 2, 0, 1, 0,	3, 0, 1, 0, 2, 0, 1, 0,
-		5, 0, 1, 0, 2, 0, 1, 0,	3, 0, 1, 0, 2, 0, 1, 0,
-		4, 0, 1, 0, 2, 0, 1, 0,	3, 0, 1, 0, 2, 0, 1, 0,
-		7, 0, 1, 0, 2, 0, 1, 0,	3, 0, 1, 0, 2, 0, 1, 0,
-		4, 0, 1, 0, 2, 0, 1, 0,	3, 0, 1, 0, 2, 0, 1, 0,
-		5, 0, 1, 0, 2, 0, 1, 0,	3, 0, 1, 0, 2, 0, 1, 0,
-		4, 0, 1, 0, 2, 0, 1, 0,	3, 0, 1, 0, 2, 0, 1, 0,
-		6, 0, 1, 0, 2, 0, 1, 0,	3, 0, 1, 0, 2, 0, 1, 0,
-		4, 0, 1, 0, 2, 0, 1, 0,	3, 0, 1, 0, 2, 0, 1, 0,
-		5, 0, 1, 0, 2, 0, 1, 0,	3, 0, 1, 0, 2, 0, 1, 0,
-		4, 0, 1, 0, 2, 0, 1, 0,	3, 0, 1, 0, 2, 0, 1, 0
-	};
+    static const uint8_t trailing_zeros_LUT[256] = {
+        8, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+        4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+        5, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+        4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+        6, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+        4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+        5, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+        4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+        7, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+        4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+        5, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+        4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+        6, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+        4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+        5, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+        4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0
+    };
 
-	return trailing_zeros_LUT[byte];
+    return trailing_zeros_LUT[byte];
 }
 
 
 bool verify_key(uint32_t cuid, noncelist_t *nonces, uint8_t *best_first_bytes, uint32_t odd, uint32_t even)
 {
-	struct Crypto1State pcs;
-	for (uint16_t test_first_byte = 1; test_first_byte < 256; test_first_byte++) {
-		noncelistentry_t *test_nonce = nonces[best_first_bytes[test_first_byte]].first;
-		while (test_nonce != NULL) {
-			pcs.odd = odd;
-			pcs.even = even;
-			lfsr_rollback_byte(&pcs, (cuid >> 24) ^ best_first_bytes[0], true);
-			for (int8_t byte_pos = 3; byte_pos >= 0; byte_pos--) {
-				uint8_t test_par_enc_bit = (test_nonce->par_enc >> byte_pos) & 0x01;			// the encoded parity bit
-				uint8_t test_byte_enc = (test_nonce->nonce_enc >> (8*byte_pos)) & 0xff; 		// the encoded nonce byte
-				uint8_t test_byte_dec = crypto1_byte(&pcs, test_byte_enc /* ^ (cuid >> (8*byte_pos)) */, true) ^ test_byte_enc; 	// decode the nonce byte
-				uint8_t ks_par = filter(pcs.odd);												// the keystream bit to encode/decode the parity bit
-				uint8_t test_par_enc2 = ks_par ^ evenparity8(test_byte_dec);					// determine the decoded byte's parity and encode it
-				if (test_par_enc_bit != test_par_enc2) {
-					return false;
-				}
-			}
-			test_nonce = test_nonce->next;
-		}
-	}
-	return true;
+    struct Crypto1State pcs;
+    for (uint16_t test_first_byte = 1; test_first_byte < 256; test_first_byte++) {
+        noncelistentry_t *test_nonce = nonces[best_first_bytes[test_first_byte]].first;
+        while (test_nonce != NULL) {
+            pcs.odd = odd;
+            pcs.even = even;
+            lfsr_rollback_byte(&pcs, (cuid >> 24) ^ best_first_bytes[0], true);
+            for (int8_t byte_pos = 3; byte_pos >= 0; byte_pos--) {
+                uint8_t test_par_enc_bit = (test_nonce->par_enc >> byte_pos) & 0x01;     // the encoded parity bit
+                uint8_t test_byte_enc = (test_nonce->nonce_enc >> (8*byte_pos)) & 0xff;  // the encoded nonce byte
+                uint8_t test_byte_dec = crypto1_byte(&pcs, test_byte_enc /* ^ (cuid >> (8*byte_pos)) */, true) ^ test_byte_enc; // decode the nonce byte
+                uint8_t ks_par = filter(pcs.odd);                                        // the keystream bit to encode/decode the parity bit
+                uint8_t test_par_enc2 = ks_par ^ evenparity8(test_byte_dec);             // determine the decoded byte's parity and encode it
+                if (test_par_enc_bit != test_par_enc2) {
+                    return false;
+                }
+            }
+            test_nonce = test_nonce->next;
+        }
+    }
+    return true;
 }
 static void*
 #ifdef __has_attribute
-	#if __has_attribute(force_align_arg_pointer)
-	__attribute__((force_align_arg_pointer))
-	#endif
+    #if __has_attribute(force_align_arg_pointer)
+    __attribute__((force_align_arg_pointer))
+    #endif
 #endif
 crack_states_thread(void* x){
-	struct arg {
-		bool silent;
-		int thread_ID;
-		uint32_t cuid;
-		uint32_t num_acquired_nonces;
-		uint64_t maximum_states;
-		noncelist_t *nonces;
-		uint8_t* best_first_bytes;
-	} *thread_arg;
+    struct arg {
+        bool silent;
+        int thread_ID;
+        uint32_t cuid;
+        uint32_t num_acquired_nonces;
+        uint64_t maximum_states;
+        noncelist_t *nonces;
+        uint8_t* best_first_bytes;
+    } *thread_arg;
 
-	thread_arg = (struct arg *)x;
+    thread_arg = (struct arg *)x;
     const int thread_id = thread_arg->thread_ID;
     uint32_t current_bucket = thread_id;
     while(current_bucket < bucket_count){
         statelist_t *bucket = buckets[current_bucket];
         if(bucket){
 #if defined (DEBUG_BRUTE_FORCE)
-			printf("Thread %u starts working on bucket %u\n", thread_id, current_bucket);
+            printf("Thread %u starts working on bucket %u\n", thread_id, current_bucket);
 #endif
             const uint64_t key = crack_states_bitsliced(thread_arg->cuid, thread_arg->best_first_bytes, bucket, &keys_found, &num_keys_tested, nonces_to_bruteforce, bf_test_nonce_2nd_byte, thread_arg->nonces);
             if(key != -1){
                 __atomic_fetch_add(&keys_found, 1, __ATOMIC_SEQ_CST);
-				__atomic_fetch_add(&found_bs_key, key, __ATOMIC_SEQ_CST);
+                __atomic_fetch_add(&found_bs_key, key, __ATOMIC_SEQ_CST);
 
-				char progress_text[80];
-				char keystr[18];
-				sprintf(keystr, "%012" PRIx64 "  ", key);
-				sprintf(progress_text, "Brute force phase completed. Key found: " _YELLOW_(%s), keystr);
-				hardnested_print_progress(thread_arg->num_acquired_nonces, progress_text, 0.0, 0);
+                char progress_text[80];
+                char keystr[18];
+                sprintf(keystr, "%012" PRIx64 "  ", key);
+                sprintf(progress_text, "Brute force phase completed. Key found: " _YELLOW_(%s), keystr);
+                hardnested_print_progress(thread_arg->num_acquired_nonces, progress_text, 0.0, 0);
                 break;
             } else if(keys_found){
                 break;
             } else {
-				if (!thread_arg->silent) {
-					char progress_text[80];
-					sprintf(progress_text, "Brute force phase: %6.02f%%\t", 100.0*(float)num_keys_tested/(float)(thread_arg->maximum_states));
-					float remaining_bruteforce = thread_arg->nonces[thread_arg->best_first_bytes[0]].expected_num_brute_force - (float)num_keys_tested/2;
-					hardnested_print_progress(thread_arg->num_acquired_nonces, progress_text, remaining_bruteforce, 5000);
-				}
+                if (!thread_arg->silent) {
+                    char progress_text[80];
+                    sprintf(progress_text, "Brute force phase: %6.02f%%\t", 100.0*(float)num_keys_tested/(float)(thread_arg->maximum_states));
+                    float remaining_bruteforce = thread_arg->nonces[thread_arg->best_first_bytes[0]].expected_num_brute_force - (float)num_keys_tested/2;
+                    hardnested_print_progress(thread_arg->num_acquired_nonces, progress_text, remaining_bruteforce, 5000);
+                }
             }
         }
         current_bucket += NUM_BRUTE_FORCE_THREADS;
@@ -194,97 +194,97 @@ crack_states_thread(void* x){
 
 void prepare_bf_test_nonces(noncelist_t *nonces, uint8_t best_first_byte)
 {
-	// we do bitsliced brute forcing with best_first_bytes[0] only.
-	// Extract the corresponding 2nd bytes
-	noncelistentry_t *test_nonce = nonces[best_first_byte].first;
-	uint32_t i = 0;
-	while (test_nonce != NULL) {
-		bf_test_nonce[i] = test_nonce->nonce_enc;
-		bf_test_nonce_par[i] = test_nonce->par_enc;
-		bf_test_nonce_2nd_byte[i] = (test_nonce->nonce_enc >> 16) & 0xff;
-		test_nonce = test_nonce->next;
-		i++;
-	}
-	nonces_to_bruteforce = i;
+    // we do bitsliced brute forcing with best_first_bytes[0] only.
+    // Extract the corresponding 2nd bytes
+    noncelistentry_t *test_nonce = nonces[best_first_byte].first;
+    uint32_t i = 0;
+    while (test_nonce != NULL) {
+        bf_test_nonce[i] = test_nonce->nonce_enc;
+        bf_test_nonce_par[i] = test_nonce->par_enc;
+        bf_test_nonce_2nd_byte[i] = (test_nonce->nonce_enc >> 16) & 0xff;
+        test_nonce = test_nonce->next;
+        i++;
+    }
+    nonces_to_bruteforce = i;
 
-	// printf("Nonces to bruteforce: %d\n", nonces_to_bruteforce);
-	// printf("Common bits of first 4 2nd nonce bytes (before sorting): %u %u %u\n",
-			// trailing_zeros(bf_test_nonce_2nd_byte[1] ^ bf_test_nonce_2nd_byte[0]),
-			// trailing_zeros(bf_test_nonce_2nd_byte[2] ^ bf_test_nonce_2nd_byte[1]),
-			// trailing_zeros(bf_test_nonce_2nd_byte[3] ^ bf_test_nonce_2nd_byte[2]));
+    // printf("Nonces to bruteforce: %d\n", nonces_to_bruteforce);
+    // printf("Common bits of first 4 2nd nonce bytes (before sorting): %u %u %u\n",
+            // trailing_zeros(bf_test_nonce_2nd_byte[1] ^ bf_test_nonce_2nd_byte[0]),
+            // trailing_zeros(bf_test_nonce_2nd_byte[2] ^ bf_test_nonce_2nd_byte[1]),
+            // trailing_zeros(bf_test_nonce_2nd_byte[3] ^ bf_test_nonce_2nd_byte[2]));
 
-	uint8_t best_4[4] = {0};
-	int sum_best = -1;
-	for (uint16_t n1 = 0; n1 < nonces_to_bruteforce; n1++) {
-		for (uint16_t n2 = 0; n2 < nonces_to_bruteforce; n2++) {
-			if (n2 != n1) {
-				for (uint16_t n3 = 0; n3 < nonces_to_bruteforce; n3++) {
-					if ((n3 != n2 && n3 != n1) || nonces_to_bruteforce < 3
-					    // && trailing_zeros(bf_test_nonce_2nd_byte[n1] ^ bf_test_nonce_2nd_byte[n2])
-						    // > trailing_zeros(bf_test_nonce_2nd_byte[n2] ^ bf_test_nonce_2nd_byte[n3])
-							) {
-						for (uint16_t n4 = 0; n4 < nonces_to_bruteforce; n4++) {
-							if ((n4 != n3 && n4 != n2 && n4 != n1) || nonces_to_bruteforce < 4
-								// && trailing_zeros(bf_test_nonce_2nd_byte[n2] ^ bf_test_nonce_2nd_byte[n3])
-								// > trailing_zeros(bf_test_nonce_2nd_byte[n3] ^ bf_test_nonce_2nd_byte[n4])
-								) {
-								int sum = nonces_to_bruteforce > 1 ? trailing_zeros(bf_test_nonce_2nd_byte[n1] ^ bf_test_nonce_2nd_byte[n2]) : 0.0
-								          + nonces_to_bruteforce > 2 ? trailing_zeros(bf_test_nonce_2nd_byte[n2] ^ bf_test_nonce_2nd_byte[n3]) : 0.0
-										  + nonces_to_bruteforce > 3 ? trailing_zeros(bf_test_nonce_2nd_byte[n3] ^ bf_test_nonce_2nd_byte[n4]) : 0.0;
-								if (sum > sum_best) {
-									sum_best = sum;
-									best_4[0] = n1;
-									best_4[1] = n2;
-									best_4[2] = n3;
-									best_4[3] = n4;
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-	}
+    uint8_t best_4[4] = {0};
+    int sum_best = -1;
+    for (uint16_t n1 = 0; n1 < nonces_to_bruteforce; n1++) {
+        for (uint16_t n2 = 0; n2 < nonces_to_bruteforce; n2++) {
+            if (n2 != n1) {
+                for (uint16_t n3 = 0; n3 < nonces_to_bruteforce; n3++) {
+                    if ((n3 != n2 && n3 != n1) || nonces_to_bruteforce < 3
+                        // && trailing_zeros(bf_test_nonce_2nd_byte[n1] ^ bf_test_nonce_2nd_byte[n2])
+                            // > trailing_zeros(bf_test_nonce_2nd_byte[n2] ^ bf_test_nonce_2nd_byte[n3])
+                            ) {
+                        for (uint16_t n4 = 0; n4 < nonces_to_bruteforce; n4++) {
+                            if ((n4 != n3 && n4 != n2 && n4 != n1) || nonces_to_bruteforce < 4
+                                // && trailing_zeros(bf_test_nonce_2nd_byte[n2] ^ bf_test_nonce_2nd_byte[n3])
+                                // > trailing_zeros(bf_test_nonce_2nd_byte[n3] ^ bf_test_nonce_2nd_byte[n4])
+                                ) {
+                                int sum = nonces_to_bruteforce > 1 ? trailing_zeros(bf_test_nonce_2nd_byte[n1] ^ bf_test_nonce_2nd_byte[n2]) : 0.0
+                                          + nonces_to_bruteforce > 2 ? trailing_zeros(bf_test_nonce_2nd_byte[n2] ^ bf_test_nonce_2nd_byte[n3]) : 0.0
+                                          + nonces_to_bruteforce > 3 ? trailing_zeros(bf_test_nonce_2nd_byte[n3] ^ bf_test_nonce_2nd_byte[n4]) : 0.0;
+                                if (sum > sum_best) {
+                                    sum_best = sum;
+                                    best_4[0] = n1;
+                                    best_4[1] = n2;
+                                    best_4[2] = n3;
+                                    best_4[3] = n4;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
 
-	uint32_t bf_test_nonce_temp[4];
-	uint8_t bf_test_nonce_par_temp[4];
-	uint8_t bf_test_nonce_2nd_byte_temp[4];
-	for (uint8_t i = 0; i < 4 && i < nonces_to_bruteforce; i++) {
-		bf_test_nonce_temp[i] = bf_test_nonce[best_4[i]];
+    uint32_t bf_test_nonce_temp[4];
+    uint8_t bf_test_nonce_par_temp[4];
+    uint8_t bf_test_nonce_2nd_byte_temp[4];
+    for (uint8_t i = 0; i < 4 && i < nonces_to_bruteforce; i++) {
+        bf_test_nonce_temp[i] = bf_test_nonce[best_4[i]];
 
-		bf_test_nonce_par_temp[i] = bf_test_nonce_par[best_4[i]];
-		bf_test_nonce_2nd_byte_temp[i] = bf_test_nonce_2nd_byte[best_4[i]];
-	}
-	for (uint8_t i = 0; i < 4 && i < nonces_to_bruteforce; i++) {
-		bf_test_nonce[i] = bf_test_nonce_temp[i];
-		bf_test_nonce_par[i] = bf_test_nonce_par_temp[i];
-		bf_test_nonce_2nd_byte[i] = bf_test_nonce_2nd_byte_temp[i];
-	}
+        bf_test_nonce_par_temp[i] = bf_test_nonce_par[best_4[i]];
+        bf_test_nonce_2nd_byte_temp[i] = bf_test_nonce_2nd_byte[best_4[i]];
+    }
+    for (uint8_t i = 0; i < 4 && i < nonces_to_bruteforce; i++) {
+        bf_test_nonce[i] = bf_test_nonce_temp[i];
+        bf_test_nonce_par[i] = bf_test_nonce_par_temp[i];
+        bf_test_nonce_2nd_byte[i] = bf_test_nonce_2nd_byte_temp[i];
+    }
 }
 
 
 #if defined (WRITE_BENCH_FILE)
 static void write_benchfile(statelist_t *candidates) {
 
-	printf("Writing brute force benchmark data...");
-	FILE *benchfile = fopen(TEST_BENCH_FILENAME, "wb");
-	fwrite(&nonces_to_bruteforce, 1, sizeof(nonces_to_bruteforce), benchfile);
-	for (uint32_t i = 0; i < nonces_to_bruteforce; i++) {
-		fwrite(&(bf_test_nonce[i]), 1, sizeof(bf_test_nonce[i]), benchfile);
-		fwrite(&(bf_test_nonce_par[i]), 1, sizeof(bf_test_nonce_par[i]), benchfile);
-	}
-	uint32_t num_states = MIN(candidates->len[EVEN_STATE], TEST_BENCH_SIZE);
-	fwrite(&num_states, 1, sizeof(num_states), benchfile);
-	for (uint32_t i = 0; i < num_states; i++) {
-		fwrite(&(candidates->states[EVEN_STATE][i]), 1, sizeof(uint32_t), benchfile);
-	}
-	num_states = MIN(candidates->len[ODD_STATE], TEST_BENCH_SIZE);
-	fwrite(&num_states, 1, sizeof(num_states), benchfile);
-	for (uint32_t i = 0; i < num_states; i++) {
-		fwrite(&(candidates->states[ODD_STATE][i]), 1, sizeof(uint32_t), benchfile);
-	}
-	fclose(benchfile);
-	printf("done.\n");
+    printf("Writing brute force benchmark data...");
+    FILE *benchfile = fopen(TEST_BENCH_FILENAME, "wb");
+    fwrite(&nonces_to_bruteforce, 1, sizeof(nonces_to_bruteforce), benchfile);
+    for (uint32_t i = 0; i < nonces_to_bruteforce; i++) {
+        fwrite(&(bf_test_nonce[i]), 1, sizeof(bf_test_nonce[i]), benchfile);
+        fwrite(&(bf_test_nonce_par[i]), 1, sizeof(bf_test_nonce_par[i]), benchfile);
+    }
+    uint32_t num_states = MIN(candidates->len[EVEN_STATE], TEST_BENCH_SIZE);
+    fwrite(&num_states, 1, sizeof(num_states), benchfile);
+    for (uint32_t i = 0; i < num_states; i++) {
+        fwrite(&(candidates->states[EVEN_STATE][i]), 1, sizeof(uint32_t), benchfile);
+    }
+    num_states = MIN(candidates->len[ODD_STATE], TEST_BENCH_SIZE);
+    fwrite(&num_states, 1, sizeof(num_states), benchfile);
+    for (uint32_t i = 0; i < num_states; i++) {
+        fwrite(&(candidates->states[ODD_STATE][i]), 1, sizeof(uint32_t), benchfile);
+    }
+    fclose(benchfile);
+    printf("done.\n");
 }
 #endif
 
@@ -292,174 +292,174 @@ static void write_benchfile(statelist_t *candidates) {
 bool brute_force_bs(float *bf_rate, statelist_t *candidates, uint32_t cuid, uint32_t num_acquired_nonces, uint64_t maximum_states, noncelist_t *nonces, uint8_t *best_first_bytes, uint64_t *foundkey)
 {
 #if defined (WRITE_BENCH_FILE)
-	write_benchfile(candidates);
+    write_benchfile(candidates);
 #endif
-	bool silent = (bf_rate != NULL);
+    bool silent = (bf_rate != NULL);
 
-	keys_found = 0;
-	num_keys_tested = 0;
-	found_bs_key = 0;
+    keys_found = 0;
+    num_keys_tested = 0;
+    found_bs_key = 0;
 
-	bitslice_test_nonces(nonces_to_bruteforce, bf_test_nonce, bf_test_nonce_par);
+    bitslice_test_nonces(nonces_to_bruteforce, bf_test_nonce, bf_test_nonce_par);
 
-	// count number of states to go
-	bucket_count = 0;
-	for (statelist_t *p = candidates; p != NULL; p = p->next) {
-		if (p->states[ODD_STATE] != NULL && p->states[EVEN_STATE] != NULL) {
-			buckets[bucket_count] = p;
-			bucket_count++;
-		}
-	}
+    // count number of states to go
+    bucket_count = 0;
+    for (statelist_t *p = candidates; p != NULL; p = p->next) {
+        if (p->states[ODD_STATE] != NULL && p->states[EVEN_STATE] != NULL) {
+            buckets[bucket_count] = p;
+            bucket_count++;
+        }
+    }
 
-	uint64_t start_time = msclock();
+    uint64_t start_time = msclock();
 
 #if defined(__linux__) ||  defined(__APPLE__)
-	if ( NUM_BRUTE_FORCE_THREADS < 0 )
-		return false;
+    if ( NUM_BRUTE_FORCE_THREADS < 0 )
+        return false;
 #endif
 
-	pthread_t threads[NUM_BRUTE_FORCE_THREADS];
-	struct args {
-		bool silent;
-		int thread_ID;
-		uint32_t cuid;
-		uint32_t num_acquired_nonces;
-		uint64_t maximum_states;
-		noncelist_t *nonces;
-		uint8_t *best_first_bytes;
-	} thread_args[NUM_BRUTE_FORCE_THREADS];
+    pthread_t threads[NUM_BRUTE_FORCE_THREADS];
+    struct args {
+        bool silent;
+        int thread_ID;
+        uint32_t cuid;
+        uint32_t num_acquired_nonces;
+        uint64_t maximum_states;
+        noncelist_t *nonces;
+        uint8_t *best_first_bytes;
+    } thread_args[NUM_BRUTE_FORCE_THREADS];
 
-	for (uint32_t i = 0; i < NUM_BRUTE_FORCE_THREADS; i++){
-		thread_args[i].thread_ID = i;
-		thread_args[i].silent = silent;
-		thread_args[i].cuid = cuid;
-		thread_args[i].num_acquired_nonces = num_acquired_nonces;
-		thread_args[i].maximum_states = maximum_states;
-		thread_args[i].nonces = nonces;
-		thread_args[i].best_first_bytes = best_first_bytes;
-		pthread_create(&threads[i], NULL, crack_states_thread, (void*)&thread_args[i]);
-	}
-	for (uint32_t i = 0; i < NUM_BRUTE_FORCE_THREADS; i++){
-		pthread_join(threads[i], 0);
-	}
+    for (uint32_t i = 0; i < NUM_BRUTE_FORCE_THREADS; i++){
+        thread_args[i].thread_ID = i;
+        thread_args[i].silent = silent;
+        thread_args[i].cuid = cuid;
+        thread_args[i].num_acquired_nonces = num_acquired_nonces;
+        thread_args[i].maximum_states = maximum_states;
+        thread_args[i].nonces = nonces;
+        thread_args[i].best_first_bytes = best_first_bytes;
+        pthread_create(&threads[i], NULL, crack_states_thread, (void*)&thread_args[i]);
+    }
+    for (uint32_t i = 0; i < NUM_BRUTE_FORCE_THREADS; i++){
+        pthread_join(threads[i], 0);
+    }
 
-	uint64_t elapsed_time = msclock() - start_time;
+    uint64_t elapsed_time = msclock() - start_time;
 
-	if (bf_rate != NULL)
-		*bf_rate = (float)num_keys_tested / ((float)elapsed_time / 1000.0);
+    if (bf_rate != NULL)
+        *bf_rate = (float)num_keys_tested / ((float)elapsed_time / 1000.0);
 
-	if ( keys_found > 0)
-		*foundkey = found_bs_key;
+    if ( keys_found > 0)
+        *foundkey = found_bs_key;
 
-	return (keys_found != 0);
+    return (keys_found != 0);
 }
 
 
 static bool read_bench_data(statelist_t *test_candidates) {
 
-	size_t bytes_read = 0;
-	uint32_t temp = 0;
-	uint32_t num_states = 0;
-	uint32_t states_read = 0;
+    size_t bytes_read = 0;
+    uint32_t temp = 0;
+    uint32_t num_states = 0;
+    uint32_t states_read = 0;
 
-	char bench_file_path[strlen(get_my_executable_directory()) + strlen(TEST_BENCH_FILENAME) + 1];
-	strcpy(bench_file_path, get_my_executable_directory());
-	strcat(bench_file_path, TEST_BENCH_FILENAME);
+    char bench_file_path[strlen(get_my_executable_directory()) + strlen(TEST_BENCH_FILENAME) + 1];
+    strcpy(bench_file_path, get_my_executable_directory());
+    strcat(bench_file_path, TEST_BENCH_FILENAME);
 
-	FILE *benchfile = fopen(bench_file_path, "rb");
-	if (benchfile == NULL) {
-		return false;
-	}
-	bytes_read = fread(&nonces_to_bruteforce, 1, sizeof(nonces_to_bruteforce), benchfile);
-	if (bytes_read != sizeof(nonces_to_bruteforce)) {
-		fclose(benchfile);
-		return false;
-	}
-	for (uint16_t i = 0; i < nonces_to_bruteforce && i < 256; i++) {
-		bytes_read = fread(&bf_test_nonce[i], 1, sizeof(uint32_t), benchfile);
-		if (bytes_read != sizeof(uint32_t)) {
-			fclose(benchfile);
-			return false;
-		}
-		bf_test_nonce_2nd_byte[i] = (bf_test_nonce[i] >> 16) & 0xff;
-		bytes_read = fread(&bf_test_nonce_par[i], 1, sizeof(uint8_t), benchfile);
-		if (bytes_read != sizeof(uint8_t)) {
-			fclose(benchfile);
-			return false;
-		}
-	}
-	bytes_read = fread(&num_states, 1, sizeof(uint32_t), benchfile);
-	if (bytes_read != sizeof(uint32_t)) {
-		fclose(benchfile);
-		return false;
-	}
-	for (states_read = 0; states_read < MIN(num_states, TEST_BENCH_SIZE); states_read++) {
-		bytes_read = fread(test_candidates->states[EVEN_STATE] + states_read, 1, sizeof(uint32_t), benchfile);
-		if (bytes_read != sizeof(uint32_t)) {
-			fclose(benchfile);
-			return false;
-		}
-	}
-	for (uint32_t i = states_read; i < TEST_BENCH_SIZE; i++) {
-		test_candidates->states[EVEN_STATE][i] = test_candidates->states[EVEN_STATE][i-states_read];
-	}
-	for (uint32_t i = states_read; i < num_states; i++) {
-		bytes_read = fread(&temp, 1, sizeof(uint32_t), benchfile);
-		if (bytes_read != sizeof(uint32_t)) {
-			fclose(benchfile);
-			return false;
-		}
-	}
-	for (states_read = 0; states_read < MIN(num_states, TEST_BENCH_SIZE); states_read++) {
-		bytes_read = fread(test_candidates->states[ODD_STATE] + states_read, 1, sizeof(uint32_t), benchfile);
-		if (bytes_read != sizeof(uint32_t)) {
-			fclose(benchfile);
-			return false;
-		}
-	}
-	for (uint32_t i = states_read; i < TEST_BENCH_SIZE; i++) {
-		test_candidates->states[ODD_STATE][i] = test_candidates->states[ODD_STATE][i-states_read];
-	}
+    FILE *benchfile = fopen(bench_file_path, "rb");
+    if (benchfile == NULL) {
+        return false;
+    }
+    bytes_read = fread(&nonces_to_bruteforce, 1, sizeof(nonces_to_bruteforce), benchfile);
+    if (bytes_read != sizeof(nonces_to_bruteforce)) {
+        fclose(benchfile);
+        return false;
+    }
+    for (uint16_t i = 0; i < nonces_to_bruteforce && i < 256; i++) {
+        bytes_read = fread(&bf_test_nonce[i], 1, sizeof(uint32_t), benchfile);
+        if (bytes_read != sizeof(uint32_t)) {
+            fclose(benchfile);
+            return false;
+        }
+        bf_test_nonce_2nd_byte[i] = (bf_test_nonce[i] >> 16) & 0xff;
+        bytes_read = fread(&bf_test_nonce_par[i], 1, sizeof(uint8_t), benchfile);
+        if (bytes_read != sizeof(uint8_t)) {
+            fclose(benchfile);
+            return false;
+        }
+    }
+    bytes_read = fread(&num_states, 1, sizeof(uint32_t), benchfile);
+    if (bytes_read != sizeof(uint32_t)) {
+        fclose(benchfile);
+        return false;
+    }
+    for (states_read = 0; states_read < MIN(num_states, TEST_BENCH_SIZE); states_read++) {
+        bytes_read = fread(test_candidates->states[EVEN_STATE] + states_read, 1, sizeof(uint32_t), benchfile);
+        if (bytes_read != sizeof(uint32_t)) {
+            fclose(benchfile);
+            return false;
+        }
+    }
+    for (uint32_t i = states_read; i < TEST_BENCH_SIZE; i++) {
+        test_candidates->states[EVEN_STATE][i] = test_candidates->states[EVEN_STATE][i-states_read];
+    }
+    for (uint32_t i = states_read; i < num_states; i++) {
+        bytes_read = fread(&temp, 1, sizeof(uint32_t), benchfile);
+        if (bytes_read != sizeof(uint32_t)) {
+            fclose(benchfile);
+            return false;
+        }
+    }
+    for (states_read = 0; states_read < MIN(num_states, TEST_BENCH_SIZE); states_read++) {
+        bytes_read = fread(test_candidates->states[ODD_STATE] + states_read, 1, sizeof(uint32_t), benchfile);
+        if (bytes_read != sizeof(uint32_t)) {
+            fclose(benchfile);
+            return false;
+        }
+    }
+    for (uint32_t i = states_read; i < TEST_BENCH_SIZE; i++) {
+        test_candidates->states[ODD_STATE][i] = test_candidates->states[ODD_STATE][i-states_read];
+    }
 
-	fclose(benchfile);
-	return true;
+    fclose(benchfile);
+    return true;
 }
 
 
 float brute_force_benchmark() {
-	statelist_t test_candidates[NUM_BRUTE_FORCE_THREADS];
+    statelist_t test_candidates[NUM_BRUTE_FORCE_THREADS];
 
-	test_candidates[0].states[ODD_STATE] = malloc((TEST_BENCH_SIZE+1) * sizeof(uint32_t));
-	test_candidates[0].states[EVEN_STATE] = malloc((TEST_BENCH_SIZE+1) * sizeof(uint32_t));
-	for (uint8_t i = 0; i < NUM_BRUTE_FORCE_THREADS - 1; i++){
-		test_candidates[i].next = test_candidates + i + 1;
-		test_candidates[i+1].states[ODD_STATE] = test_candidates[0].states[ODD_STATE];
-		test_candidates[i+1].states[EVEN_STATE] = test_candidates[0].states[EVEN_STATE];
-	}
-	test_candidates[NUM_BRUTE_FORCE_THREADS-1].next = NULL;
+    test_candidates[0].states[ODD_STATE] = malloc((TEST_BENCH_SIZE+1) * sizeof(uint32_t));
+    test_candidates[0].states[EVEN_STATE] = malloc((TEST_BENCH_SIZE+1) * sizeof(uint32_t));
+    for (uint8_t i = 0; i < NUM_BRUTE_FORCE_THREADS - 1; i++){
+        test_candidates[i].next = test_candidates + i + 1;
+        test_candidates[i+1].states[ODD_STATE] = test_candidates[0].states[ODD_STATE];
+        test_candidates[i+1].states[EVEN_STATE] = test_candidates[0].states[EVEN_STATE];
+    }
+    test_candidates[NUM_BRUTE_FORCE_THREADS-1].next = NULL;
 
-	if (!read_bench_data(test_candidates)) {
-		PrintAndLogEx(NORMAL, "Couldn't read benchmark data. Assuming brute force rate of %1.0f states per second", DEFAULT_BRUTE_FORCE_RATE);
-		return DEFAULT_BRUTE_FORCE_RATE;
-	}
+    if (!read_bench_data(test_candidates)) {
+        PrintAndLogEx(NORMAL, "Couldn't read benchmark data. Assuming brute force rate of %1.0f states per second", DEFAULT_BRUTE_FORCE_RATE);
+        return DEFAULT_BRUTE_FORCE_RATE;
+    }
 
-	for (uint8_t i = 0; i < NUM_BRUTE_FORCE_THREADS; i++) {
-		test_candidates[i].len[ODD_STATE] = TEST_BENCH_SIZE;
-		test_candidates[i].len[EVEN_STATE] = TEST_BENCH_SIZE;
-		test_candidates[i].states[ODD_STATE][TEST_BENCH_SIZE] = -1;
-		test_candidates[i].states[EVEN_STATE][TEST_BENCH_SIZE] = -1;
-	}
+    for (uint8_t i = 0; i < NUM_BRUTE_FORCE_THREADS; i++) {
+        test_candidates[i].len[ODD_STATE] = TEST_BENCH_SIZE;
+        test_candidates[i].len[EVEN_STATE] = TEST_BENCH_SIZE;
+        test_candidates[i].states[ODD_STATE][TEST_BENCH_SIZE] = -1;
+        test_candidates[i].states[EVEN_STATE][TEST_BENCH_SIZE] = -1;
+    }
 
-	uint64_t maximum_states = TEST_BENCH_SIZE*TEST_BENCH_SIZE*(uint64_t)NUM_BRUTE_FORCE_THREADS;
+    uint64_t maximum_states = TEST_BENCH_SIZE*TEST_BENCH_SIZE*(uint64_t)NUM_BRUTE_FORCE_THREADS;
 
-	float bf_rate;
-	uint64_t found_key = 0;
-	brute_force_bs(&bf_rate, test_candidates, 0, 0, maximum_states, NULL, 0, &found_key);
+    float bf_rate;
+    uint64_t found_key = 0;
+    brute_force_bs(&bf_rate, test_candidates, 0, 0, maximum_states, NULL, 0, &found_key);
 
-	free(test_candidates[0].states[ODD_STATE]);
-	free(test_candidates[0].states[EVEN_STATE]);
+    free(test_candidates[0].states[ODD_STATE]);
+    free(test_candidates[0].states[EVEN_STATE]);
 
-	return bf_rate;
+    return bf_rate;
 }
 
 
diff --git a/client/hardnested/hardnested_bruteforce.h b/client/hardnested/hardnested_bruteforce.h
index 68dc7442d..ad23c2a6f 100644
--- a/client/hardnested/hardnested_bruteforce.h
+++ b/client/hardnested/hardnested_bruteforce.h
@@ -22,9 +22,9 @@
 #include "cmdhfmfhard.h"
 
 typedef struct {
-	uint32_t *states[2];
-	uint32_t len[2];
-	void* next;
+    uint32_t *states[2];
+    uint32_t len[2];
+    void* next;
 } statelist_t;
 
 extern void prepare_bf_test_nonces(noncelist_t *nonces, uint8_t best_first_byte);
diff --git a/client/hardnested/hardnested_tables.c b/client/hardnested/hardnested_tables.c
index 9a520603b..1706f8452 100644
--- a/client/hardnested/hardnested_tables.c
+++ b/client/hardnested/hardnested_tables.c
@@ -29,36 +29,36 @@
 #include "parity.h"
 
 
-#define NUM_PART_SUMS 		9
-#define BITFLIP_2ND_BYTE	0x0200
+#define NUM_PART_SUMS       9
+#define BITFLIP_2ND_BYTE    0x0200
 
 typedef enum {
-	EVEN_STATE = 0,
-	ODD_STATE = 1
+    EVEN_STATE = 0,
+    ODD_STATE = 1
 } odd_even_t;
 
 
 static uint16_t PartialSumProperty(uint32_t state, odd_even_t odd_even)
 {
-	uint16_t sum = 0;
-	for (uint16_t j = 0; j < 16; j++) {
-		uint32_t st = state;
-		uint16_t part_sum = 0;
-		if (odd_even == ODD_STATE) {
-			for (uint16_t i = 0; i < 5; i++) {
-				part_sum ^= filter(st);
-				st = (st << 1) | ((j >> (3-i)) & 0x01) ;
-			}
-			part_sum ^= 1;		// XOR 1 cancelled out for the other 8 bits
-		} else {
-			for (uint16_t i = 0; i < 4; i++) {
-				st = (st << 1) | ((j >> (3-i)) & 0x01) ;
-				part_sum ^= filter(st);
-			}
-		}
-		sum += part_sum;
-	}
-	return sum;
+    uint16_t sum = 0;
+    for (uint16_t j = 0; j < 16; j++) {
+        uint32_t st = state;
+        uint16_t part_sum = 0;
+        if (odd_even == ODD_STATE) {
+            for (uint16_t i = 0; i < 5; i++) {
+                part_sum ^= filter(st);
+                st = (st << 1) | ((j >> (3-i)) & 0x01) ;
+            }
+            part_sum ^= 1; // XOR 1 cancelled out for the other 8 bits
+        } else {
+            for (uint16_t i = 0; i < 4; i++) {
+                st = (st << 1) | ((j >> (3-i)) & 0x01) ;
+                part_sum ^= filter(st);
+            }
+        }
+        sum += part_sum;
+    }
+    return sum;
 }
 
 
@@ -70,86 +70,86 @@ static uint16_t PartialSumProperty(uint32_t state, odd_even_t odd_even)
 
 static inline void clear_bitarray24(uint32_t *bitarray)
 {
-	memset(bitarray, 0x00, sizeof(uint32_t) * (1<<19));
+    memset(bitarray, 0x00, sizeof(uint32_t) * (1<<19));
 }
 
 
 static inline uint32_t test_bit24(uint32_t *bitarray, uint32_t index)
 {
-	return 	bitarray[index>>5] & (0x80000000>>(index&0x0000001f));
+    return bitarray[index>>5] & (0x80000000>>(index&0x0000001f));
 }
 
 
 static inline void set_bit24(uint32_t *bitarray, uint32_t index)
 {
-	bitarray[index>>5] |= 0x80000000>>(index&0x0000001f);
+    bitarray[index>>5] |= 0x80000000>>(index&0x0000001f);
 }
 
 
 static inline uint32_t next_state(uint32_t *bitset, uint32_t state)
 {
-	if (++state == 1<<24) return 1<<24;
-	uint32_t index = state >> 5;
-	uint_fast8_t bit = state & 0x1f;
-	uint32_t line = bitset[index] << bit;
-	while (bit <= 0x1f) {
-		if (line & 0x80000000) return state;
-		state++;
-		bit++;
-		line <<= 1;
-	}
-	index++;
-	while (bitset[index] == 0x00000000 && state < 1<<24) {
-		index++;
-		state += 0x20;
-	}
-	if (state >= 1<<24) return 1<<24;
+    if (++state == 1<<24) return 1<<24;
+    uint32_t index = state >> 5;
+    uint_fast8_t bit = state & 0x1f;
+    uint32_t line = bitset[index] << bit;
+    while (bit <= 0x1f) {
+        if (line & 0x80000000) return state;
+        state++;
+        bit++;
+        line <<= 1;
+    }
+    index++;
+    while (bitset[index] == 0x00000000 && state < 1<<24) {
+        index++;
+        state += 0x20;
+    }
+    if (state >= 1<<24) return 1<<24;
 #if defined __GNUC__
-	return state + __builtin_clz(bitset[index]);
+    return state + __builtin_clz(bitset[index]);
 #else
-	bit = 0x00;
-	line = bitset[index];
-	while (bit <= 0x1f) {
-		if (line & 0x80000000) return state;
-		state++;
-		bit++;
-		line <<= 1;
-	}
-	return 1<<24;
+    bit = 0x00;
+    line = bitset[index];
+    while (bit <= 0x1f) {
+        if (line & 0x80000000) return state;
+        state++;
+        bit++;
+        line <<= 1;
+    }
+    return 1<<24;
 #endif
 }
 
 
 static inline uint32_t next_not_state(uint32_t *bitset, uint32_t state)
 {
-	if (++state == 1<<24) return 1<<24;
-	uint32_t index = state >> 5;
-	uint_fast8_t bit = state & 0x1f;
-	uint32_t line = bitset[index] << bit;
-	while (bit <= 0x1f) {
-		if ((line & 0x80000000) == 0) return state;
-		state++;
-		bit++;
-		line <<= 1;
-	}
-	index++;
-	while (bitset[index] == 0xffffffff && state < 1<<24) {
-		index++;
-		state += 0x20;
-	}
-	if (state >= 1<<24) return 1<<24;
+    if (++state == 1<<24) return 1<<24;
+    uint32_t index = state >> 5;
+    uint_fast8_t bit = state & 0x1f;
+    uint32_t line = bitset[index] << bit;
+    while (bit <= 0x1f) {
+        if ((line & 0x80000000) == 0) return state;
+        state++;
+        bit++;
+        line <<= 1;
+    }
+    index++;
+    while (bitset[index] == 0xffffffff && state < 1<<24) {
+        index++;
+        state += 0x20;
+    }
+    if (state >= 1<<24) return 1<<24;
 #if defined __GNUC__
-	return state + __builtin_clz(~bitset[index]);
+    return state + __builtin_clz(~bitset[index]);
 #else
-	bit = 0x00;
-	line = bitset[index];
-	while (bit <= 0x1f) {
-		if ((line & 0x80000000) == 0) return state;
-		state++;
-		bit++;
-		line <<= 1;
-	}
-	return 1<<24;
+    bit = 0x00;
+    line = bitset[index];
+    while (bit <= 0x1f) {
+        if ((line & 0x80000000) == 0) return state;
+        state++;
+        bit++;
+        line <<= 1;
+    }
+    return 1<<24;
 #endif
 }
 
@@ -157,33 +157,33 @@ static inline uint32_t next_not_state(uint32_t *bitset, uint32_t state)
 static inline uint32_t bitcount(uint32_t a)
 {
 #if defined __GNUC__
-	return __builtin_popcountl(a);
+    return __builtin_popcountl(a);
 #else
-	a = a - ((a >> 1) & 0x55555555);
-	a = (a & 0x33333333) + ((a >> 2) & 0x33333333);
-	return (((a + (a >> 4)) & 0x0f0f0f0f) * 0x01010101) >> 24;
+    a = a - ((a >> 1) & 0x55555555);
+    a = (a & 0x33333333) + ((a >> 2) & 0x33333333);
+    return (((a + (a >> 4)) & 0x0f0f0f0f) * 0x01010101) >> 24;
 #endif
 }
 
 
 static inline uint32_t count_states(uint32_t *bitset)
 {
-	uint32_t count = 0;
-	for (uint32_t i = 0; i < (1<<19); i++) {
-		count += bitcount(bitset[i]);
-	}
-	return count;
+    uint32_t count = 0;
+    for (uint32_t i = 0; i < (1<<19); i++) {
+        count += bitcount(bitset[i]);
+    }
+    return count;
 }
 
 
 static void write_bitflips_file(odd_even_t odd_even, uint16_t bitflip, int sum_a0, uint32_t *bitset, uint32_t count)
 {
-	char filename[80];
-	sprintf(filename, "bitflip_%d_%03" PRIx16 "_sum%d_states.bin", odd_even, bitflip, sum_a0);
-	FILE *outfile = fopen(filename, "wb");
-	fwrite(&count, 1, sizeof(count), outfile);
-	fwrite(bitset, 1, sizeof(uint32_t)*(1<<19), outfile);
-	fclose(outfile);
+    char filename[80];
+    sprintf(filename, "bitflip_%d_%03" PRIx16 "_sum%d_states.bin", odd_even, bitflip, sum_a0);
+    FILE *outfile = fopen(filename, "wb");
+    fwrite(&count, 1, sizeof(count), outfile);
+    fwrite(bitset, 1, sizeof(uint32_t)*(1<<19), outfile);
+    fclose(outfile);
 }
 
 
@@ -191,402 +191,402 @@ uint32_t *restrict part_sum_a0_bitarrays[2][NUM_PART_SUMS];
 
 static void init_part_sum_bitarrays(void)
 {
-	printf("init_part_sum_bitarrays()...");
-	for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
-		for (uint16_t part_sum_a0 = 0; part_sum_a0 < NUM_PART_SUMS; part_sum_a0++) {
-			part_sum_a0_bitarrays[odd_even][part_sum_a0] = (uint32_t *)malloc_bitarray(sizeof(uint32_t) * (1<<19));
-			if (part_sum_a0_bitarrays[odd_even][part_sum_a0] == NULL) {
-				printf("Out of memory error in init_part_suma0_statelists(). Aborting...\n");
-				exit(4);
-			}
-			clear_bitarray24(part_sum_a0_bitarrays[odd_even][part_sum_a0]);
-		}
-	}
-	for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
-		//printf("(%d, %" PRIu16 ")...", odd_even, part_sum_a0);
-		for (uint32_t state = 0; state < (1<<20); state++) {
-			uint16_t part_sum_a0 = PartialSumProperty(state, odd_even) / 2;
-			for (uint16_t low_bits = 0; low_bits < 1<<4; low_bits++) {
-				set_bit24(part_sum_a0_bitarrays[odd_even][part_sum_a0], state<<4 | low_bits);
-			}
-		}
-	}
-	printf("done.\n");
+    printf("init_part_sum_bitarrays()...");
+    for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
+        for (uint16_t part_sum_a0 = 0; part_sum_a0 < NUM_PART_SUMS; part_sum_a0++) {
+            part_sum_a0_bitarrays[odd_even][part_sum_a0] = (uint32_t *)malloc_bitarray(sizeof(uint32_t) * (1<<19));
+            if (part_sum_a0_bitarrays[odd_even][part_sum_a0] == NULL) {
+                printf("Out of memory error in init_part_suma0_statelists(). Aborting...\n");
+                exit(4);
+            }
+            clear_bitarray24(part_sum_a0_bitarrays[odd_even][part_sum_a0]);
+        }
+    }
+    for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
+        //printf("(%d, %" PRIu16 ")...", odd_even, part_sum_a0);
+        for (uint32_t state = 0; state < (1<<20); state++) {
+            uint16_t part_sum_a0 = PartialSumProperty(state, odd_even) / 2;
+            for (uint16_t low_bits = 0; low_bits < 1<<4; low_bits++) {
+                set_bit24(part_sum_a0_bitarrays[odd_even][part_sum_a0], state<<4 | low_bits);
+            }
+        }
+    }
+    printf("done.\n");
 }
 
 
 static void free_part_sum_bitarrays(void)
 {
-	printf("free_part_sum_bitarrays()...");
-	for (int16_t part_sum_a0 = (NUM_PART_SUMS-1); part_sum_a0 >= 0; part_sum_a0--) {
-		free_bitarray(part_sum_a0_bitarrays[ODD_STATE][part_sum_a0]);
-	}
-	for (int16_t part_sum_a0 = (NUM_PART_SUMS-1); part_sum_a0 >= 0; part_sum_a0--) {
-		free_bitarray(part_sum_a0_bitarrays[EVEN_STATE][part_sum_a0]);
-	}
-	printf("done.\n");
+    printf("free_part_sum_bitarrays()...");
+    for (int16_t part_sum_a0 = (NUM_PART_SUMS-1); part_sum_a0 >= 0; part_sum_a0--) {
+        free_bitarray(part_sum_a0_bitarrays[ODD_STATE][part_sum_a0]);
+    }
+    for (int16_t part_sum_a0 = (NUM_PART_SUMS-1); part_sum_a0 >= 0; part_sum_a0--) {
+        free_bitarray(part_sum_a0_bitarrays[EVEN_STATE][part_sum_a0]);
+    }
+    printf("done.\n");
 }
 
 uint32_t *restrict sum_a0_bitarray[2];
 
 void init_sum_bitarray(uint16_t sum_a0)
 {
-	printf("init_sum_bitarray()...\n");
-	for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
-		sum_a0_bitarray[odd_even] = (uint32_t *)malloc_bitarray(sizeof(uint32_t) * (1<<19));
-		if (sum_a0_bitarray[odd_even] == NULL) {
-			printf("Out of memory error in init_sum_bitarrays(). Aborting...\n");
-			exit(4);
-		}
-		clear_bitarray24(sum_a0_bitarray[odd_even]);
-	}
-	for (uint8_t p = 0; p < NUM_PART_SUMS; p++) {
-		for (uint8_t q = 0; q < NUM_PART_SUMS; q++) {
-			if (sum_a0 == 2*p*(16-2*q) + (16-2*p)*2*q) {
-				for (uint32_t i = 0; i < (1<<19); i++) {
-					sum_a0_bitarray[EVEN_STATE][i] |= part_sum_a0_bitarrays[EVEN_STATE][q][i];
-					sum_a0_bitarray[ODD_STATE][i] |= part_sum_a0_bitarrays[ODD_STATE][p][i];
-				}
-			}
-		}
-	}
-	for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
-		uint32_t count = count_states(sum_a0_bitarray[odd_even]);
-		printf("sum_a0_bitarray[%s] has %d states (%5.2f%%)\n", odd_even==EVEN_STATE?"even":"odd ", count, (float)count/(1<<24)*100.0);
-	}
-	printf("done.\n");
+    printf("init_sum_bitarray()...\n");
+    for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
+        sum_a0_bitarray[odd_even] = (uint32_t *)malloc_bitarray(sizeof(uint32_t) * (1<<19));
+        if (sum_a0_bitarray[odd_even] == NULL) {
+            printf("Out of memory error in init_sum_bitarrays(). Aborting...\n");
+            exit(4);
+        }
+        clear_bitarray24(sum_a0_bitarray[odd_even]);
+    }
+    for (uint8_t p = 0; p < NUM_PART_SUMS; p++) {
+        for (uint8_t q = 0; q < NUM_PART_SUMS; q++) {
+            if (sum_a0 == 2*p*(16-2*q) + (16-2*p)*2*q) {
+                for (uint32_t i = 0; i < (1<<19); i++) {
+                    sum_a0_bitarray[EVEN_STATE][i] |= part_sum_a0_bitarrays[EVEN_STATE][q][i];
+                    sum_a0_bitarray[ODD_STATE][i] |= part_sum_a0_bitarrays[ODD_STATE][p][i];
+                }
+            }
+        }
+    }
+    for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
+        uint32_t count = count_states(sum_a0_bitarray[odd_even]);
+        printf("sum_a0_bitarray[%s] has %d states (%5.2f%%)\n", odd_even==EVEN_STATE?"even":"odd ", count, (float)count/(1<<24)*100.0);
+    }
+    printf("done.\n");
 }
 
 
 static void free_sum_bitarray(void)
 {
-	printf("free_sum_bitarray()...");
-	free_bitarray(sum_a0_bitarray[ODD_STATE]);
-	free_bitarray(sum_a0_bitarray[EVEN_STATE]);
-	printf("done.\n");
+    printf("free_sum_bitarray()...");
+    free_bitarray(sum_a0_bitarray[ODD_STATE]);
+    free_bitarray(sum_a0_bitarray[EVEN_STATE]);
+    printf("done.\n");
 }
 
 
 static void precalculate_bit0_bitflip_bitarrays(uint8_t const bitflip, uint16_t const sum_a0)
 {
-	// #define TEST_RUN
-	#ifdef TEST_RUN
-	#define NUM_TEST_STATES	(1<<10)
-	#else
-	#define NUM_TEST_STATES (1<<23)
-	#endif
+    // #define TEST_RUN
+    #ifdef TEST_RUN
+    #define NUM_TEST_STATES (1<<10)
+    #else
+    #define NUM_TEST_STATES (1<<23)
+    #endif
 
-	time_t start_time = time(NULL);
-	time_t last_check_time = start_time;
+    time_t start_time = time(NULL);
+    time_t last_check_time = start_time;
 
-	uint32_t *restrict test_bitarray[2];
-	uint32_t *restrict test_not_bitarray[2];
+    uint32_t *restrict test_bitarray[2];
+    uint32_t *restrict test_not_bitarray[2];
 
-	test_bitarray[EVEN_STATE] = malloc_bitarray(sizeof(uint32_t) * (1<<19));
-	clear_bitarray24(test_bitarray[EVEN_STATE]);
-	test_bitarray[ODD_STATE] = malloc_bitarray(sizeof(uint32_t) * (1<<19));
-	clear_bitarray24(test_bitarray[ODD_STATE]);
+    test_bitarray[EVEN_STATE] = malloc_bitarray(sizeof(uint32_t) * (1<<19));
+    clear_bitarray24(test_bitarray[EVEN_STATE]);
+    test_bitarray[ODD_STATE] = malloc_bitarray(sizeof(uint32_t) * (1<<19));
+    clear_bitarray24(test_bitarray[ODD_STATE]);
 
-	test_not_bitarray[EVEN_STATE] = malloc_bitarray(sizeof(uint32_t) * (1<<19));
-	clear_bitarray24(test_not_bitarray[EVEN_STATE]);
-	test_not_bitarray[ODD_STATE] = malloc_bitarray(sizeof(uint32_t) * (1<<19));
-	clear_bitarray24(test_not_bitarray[ODD_STATE]);
+    test_not_bitarray[EVEN_STATE] = malloc_bitarray(sizeof(uint32_t) * (1<<19));
+    clear_bitarray24(test_not_bitarray[EVEN_STATE]);
+    test_not_bitarray[ODD_STATE] = malloc_bitarray(sizeof(uint32_t) * (1<<19));
+    clear_bitarray24(test_not_bitarray[ODD_STATE]);
 
-	uint32_t count[2];
-	bool all_odd_states_are_possible_for_notbitflip = false;
+    uint32_t count[2];
+    bool all_odd_states_are_possible_for_notbitflip = false;
 
-	printf("\n\nStarting search for crypto1 states resulting in bitflip property 0x%03x...\n", bitflip);
-	for (uint32_t even_state = next_state(sum_a0_bitarray[EVEN_STATE], -1); even_state < NUM_TEST_STATES; even_state = next_state(sum_a0_bitarray[EVEN_STATE], even_state)) {
-		bool even_state_is_possible = false;
-		time_t time_now = time(NULL);
-		if (difftime(time_now, last_check_time) > 5*60) {	// print status every 5 minutes
-			float runtime = difftime(time_now, start_time);
-			float remaining_time = runtime * ((1<<23) - even_state) / even_state;
-			printf("\n%1.1f hours elapsed, expected completion in %1.1f hours (%1.1f days)", runtime/3600, remaining_time/3600, remaining_time/3600/24);
-			last_check_time = time_now;
-		}
-		for (uint32_t odd_state = next_state(sum_a0_bitarray[ODD_STATE], -1); odd_state < (1<<24); odd_state = next_state(test_bitarray[ODD_STATE], odd_state)) {
-			if (even_state_is_possible && test_bit24(test_bitarray[ODD_STATE], odd_state)) continue;
-			// load crypto1 state
-			struct Crypto1State cs;
-			cs.odd = odd_state >> 4;
-			cs.even = even_state >> 4;
+    printf("\n\nStarting search for crypto1 states resulting in bitflip property 0x%03x...\n", bitflip);
+    for (uint32_t even_state = next_state(sum_a0_bitarray[EVEN_STATE], -1); even_state < NUM_TEST_STATES; even_state = next_state(sum_a0_bitarray[EVEN_STATE], even_state)) {
+        bool even_state_is_possible = false;
+        time_t time_now = time(NULL);
+        if (difftime(time_now, last_check_time) > 5*60) { // print status every 5 minutes
+            float runtime = difftime(time_now, start_time);
+            float remaining_time = runtime * ((1<<23) - even_state) / even_state;
+            printf("\n%1.1f hours elapsed, expected completion in %1.1f hours (%1.1f days)", runtime/3600, remaining_time/3600, remaining_time/3600/24);
+            last_check_time = time_now;
+        }
+        for (uint32_t odd_state = next_state(sum_a0_bitarray[ODD_STATE], -1); odd_state < (1<<24); odd_state = next_state(test_bitarray[ODD_STATE], odd_state)) {
+            if (even_state_is_possible && test_bit24(test_bitarray[ODD_STATE], odd_state)) continue;
+            // load crypto1 state
+            struct Crypto1State cs;
+            cs.odd = odd_state >> 4;
+            cs.even = even_state >> 4;
 
-			// track flipping bits in state
-			struct Crypto1DeltaState {
-				uint_fast8_t odd;
-				uint_fast8_t even;
-			} cs_delta;
-			cs_delta.odd = 0;
-			cs_delta.even = 0;
+            // track flipping bits in state
+            struct Crypto1DeltaState {
+                uint_fast8_t odd;
+                uint_fast8_t even;
+            } cs_delta;
+            cs_delta.odd = 0;
+            cs_delta.even = 0;
 
-			uint_fast16_t keystream = 0;
+            uint_fast16_t keystream = 0;
 
-			// decrypt 9 bits
-			for (int i = 0; i < 9; i++) {
-				uint_fast8_t keystream_bit = filter(cs.odd & 0x000fffff) ^ filter((cs.odd & 0x000fffff) ^ cs_delta.odd);
-				keystream = keystream << 1 | keystream_bit;
-				uint_fast8_t nt_bit = BIT(bitflip, i) ^ keystream_bit;
-				uint_fast8_t LSFR_feedback = BIT(cs_delta.odd, 2) ^ BIT(cs_delta.even, 2) ^ BIT(cs_delta.odd, 3);
+            // decrypt 9 bits
+            for (int i = 0; i < 9; i++) {
+                uint_fast8_t keystream_bit = filter(cs.odd & 0x000fffff) ^ filter((cs.odd & 0x000fffff) ^ cs_delta.odd);
+                keystream = keystream << 1 | keystream_bit;
+                uint_fast8_t nt_bit = BIT(bitflip, i) ^ keystream_bit;
+                uint_fast8_t LSFR_feedback = BIT(cs_delta.odd, 2) ^ BIT(cs_delta.even, 2) ^ BIT(cs_delta.odd, 3);
 
-				cs_delta.even = cs_delta.even << 1 | (LSFR_feedback ^ nt_bit);
-				uint_fast8_t tmp = cs_delta.odd;
-				cs_delta.odd = cs_delta.even;
-				cs_delta.even = tmp;
+                cs_delta.even = cs_delta.even << 1 | (LSFR_feedback ^ nt_bit);
+                uint_fast8_t tmp = cs_delta.odd;
+                cs_delta.odd = cs_delta.even;
+                cs_delta.even = tmp;
 
-				cs.even = cs.odd;
-				if (i & 1) {
-					cs.odd = odd_state >> (7 - i) / 2;
-				} else {
-					cs.odd = even_state >> (7 - i) / 2;
-				}
-			}
+                cs.even = cs.odd;
+                if (i & 1) {
+                    cs.odd = odd_state >> (7 - i) / 2;
+                } else {
+                    cs.odd = even_state >> (7 - i) / 2;
+                }
+            }
 
-			if (evenparity32(keystream) == evenparity32(bitflip)) {
-				// found valid bitflip state
-				even_state_is_possible = true;
-				set_bit24(test_bitarray[EVEN_STATE], even_state);
-				set_bit24(test_bitarray[EVEN_STATE], 1 << 23 | even_state);
-				set_bit24(test_bitarray[ODD_STATE], odd_state);
-			} else {
-				// found valid !bitflip state
-				set_bit24(test_not_bitarray[EVEN_STATE], even_state);
-				set_bit24(test_not_bitarray[EVEN_STATE], 1 << 23 | even_state);
-				set_bit24(test_not_bitarray[ODD_STATE], odd_state);
-			}
-		}
-		if (!even_state_is_possible) {
-			all_odd_states_are_possible_for_notbitflip = true;
-		}
-	}
+            if (evenparity32(keystream) == evenparity32(bitflip)) {
+                // found valid bitflip state
+                even_state_is_possible = true;
+                set_bit24(test_bitarray[EVEN_STATE], even_state);
+                set_bit24(test_bitarray[EVEN_STATE], 1 << 23 | even_state);
+                set_bit24(test_bitarray[ODD_STATE], odd_state);
+            } else {
+                // found valid !bitflip state
+                set_bit24(test_not_bitarray[EVEN_STATE], even_state);
+                set_bit24(test_not_bitarray[EVEN_STATE], 1 << 23 | even_state);
+                set_bit24(test_not_bitarray[ODD_STATE], odd_state);
+            }
+        }
+        if (!even_state_is_possible) {
+            all_odd_states_are_possible_for_notbitflip = true;
+        }
+    }
 
-	printf("\nAnalysis completed. Checking for effective bitflip properties...\n");
-	for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
-		count[odd_even] = count_states(test_bitarray[odd_even]);
-		if (count[odd_even] != 1<<24) {
-			printf("Writing %d possible %s states for bitflip property %03x (%d (%1.2f%%) states eliminated)\n",
-				count[odd_even],
-				odd_even==EVEN_STATE?"even":"odd",
-				bitflip, (1<<24) - count[odd_even],
-				(float)((1<<24) - count[odd_even]) / (1<<24) * 100.0);
-			#ifndef TEST_RUN
-			write_bitflips_file(odd_even, bitflip, sum_a0, test_bitarray[odd_even], count[odd_even]);
-			#endif
-		} else {
-			printf("All %s states for bitflip property %03x are possible. No file written.\n", odd_even==EVEN_STATE?"even":"odd", bitflip);
-		}
-	}
-	uint32_t *restrict test_bitarray_2nd = malloc_bitarray(sizeof(uint32_t) * (1<<19));
-	clear_bitarray24(test_bitarray_2nd);
-	for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
-		if (count[odd_even] != 1<<24) {
-			for (uint32_t state = 0; state < (1<<24); state += 1<<4) {
-				uint32_t line = test_bitarray[odd_even][state>>5];
-				uint16_t half_line = state&0x000000010 ? line&0x0000ffff : line>>16;
-				if (half_line != 0) {
-					for (uint32_t low_bits = 0; low_bits < (1<<4); low_bits++) {
-						set_bit24(test_bitarray_2nd, low_bits << 20 | state >> 4);
-					}
-				}
-			}
-			count[odd_even] = count_states(test_bitarray_2nd);
-			if (count[odd_even] != 1<<24) {
-				printf("Writing %d possible %s states for bitflip property %03x (%d (%1.2f%%) states eliminated)\n",
-					count[odd_even],
-					odd_even==EVEN_STATE?"even":"odd",
-					bitflip | BITFLIP_2ND_BYTE, (1<<24) - count[odd_even],
-					(float)((1<<24) - count[odd_even]) / (1<<24) * 100.0);
-				#ifndef TEST_RUN
-				write_bitflips_file(odd_even, bitflip | BITFLIP_2ND_BYTE, sum_a0, test_bitarray_2nd, count[odd_even]);
-				#endif
-			} else {
-				printf("All %s states for bitflip property %03x are possible. No file written.\n", odd_even==EVEN_STATE?"even":"odd", bitflip | BITFLIP_2ND_BYTE);
-			}
-		} else {
-			printf("All %s states for bitflip property %03x are possible. No file written.\n", odd_even==EVEN_STATE?"even":"odd", bitflip | BITFLIP_2ND_BYTE);
-		}
-	}
+    printf("\nAnalysis completed. Checking for effective bitflip properties...\n");
+    for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
+        count[odd_even] = count_states(test_bitarray[odd_even]);
+        if (count[odd_even] != 1<<24) {
+            printf("Writing %d possible %s states for bitflip property %03x (%d (%1.2f%%) states eliminated)\n",
+                count[odd_even],
+                odd_even==EVEN_STATE?"even":"odd",
+                bitflip, (1<<24) - count[odd_even],
+                (float)((1<<24) - count[odd_even]) / (1<<24) * 100.0);
+            #ifndef TEST_RUN
+            write_bitflips_file(odd_even, bitflip, sum_a0, test_bitarray[odd_even], count[odd_even]);
+            #endif
+        } else {
+            printf("All %s states for bitflip property %03x are possible. No file written.\n", odd_even==EVEN_STATE?"even":"odd", bitflip);
+        }
+    }
+    uint32_t *restrict test_bitarray_2nd = malloc_bitarray(sizeof(uint32_t) * (1<<19));
+    clear_bitarray24(test_bitarray_2nd);
+    for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
+        if (count[odd_even] != 1<<24) {
+            for (uint32_t state = 0; state < (1<<24); state += 1<<4) {
+                uint32_t line = test_bitarray[odd_even][state>>5];
+                uint16_t half_line = state&0x000000010 ? line&0x0000ffff : line>>16;
+                if (half_line != 0) {
+                    for (uint32_t low_bits = 0; low_bits < (1<<4); low_bits++) {
+                        set_bit24(test_bitarray_2nd, low_bits << 20 | state >> 4);
+                    }
+                }
+            }
+            count[odd_even] = count_states(test_bitarray_2nd);
+            if (count[odd_even] != 1<<24) {
+                printf("Writing %d possible %s states for bitflip property %03x (%d (%1.2f%%) states eliminated)\n",
+                    count[odd_even],
+                    odd_even==EVEN_STATE?"even":"odd",
+                    bitflip | BITFLIP_2ND_BYTE, (1<<24) - count[odd_even],
+                    (float)((1<<24) - count[odd_even]) / (1<<24) * 100.0);
+                #ifndef TEST_RUN
+                write_bitflips_file(odd_even, bitflip | BITFLIP_2ND_BYTE, sum_a0, test_bitarray_2nd, count[odd_even]);
+                #endif
+            } else {
+                printf("All %s states for bitflip property %03x are possible. No file written.\n", odd_even==EVEN_STATE?"even":"odd", bitflip | BITFLIP_2ND_BYTE);
+            }
+        } else {
+            printf("All %s states for bitflip property %03x are possible. No file written.\n", odd_even==EVEN_STATE?"even":"odd", bitflip | BITFLIP_2ND_BYTE);
+        }
+    }
 
-	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	// second run for the remaining "not bitflip" states
-	printf("\n\nStarting search for crypto1 states resulting in bitflip property 0x%03x...", bitflip | 0x100);
-	start_time = time(NULL);
-	last_check_time = start_time;
-	for (uint32_t even_state = next_state(sum_a0_bitarray[EVEN_STATE], -1); even_state < NUM_TEST_STATES; even_state = next_state(sum_a0_bitarray[EVEN_STATE], even_state)) {
-		bool even_state_is_possible = test_bit24(test_not_bitarray[EVEN_STATE], even_state);
-		time_t time_now = time(NULL);
-		if (difftime(time_now, last_check_time) > 5*60) {	// print status every 5 minutes
-			float runtime = difftime(time_now, start_time);
-			float remaining_time = runtime * ((1<<23) - even_state) / even_state;
-			printf("\n%1.1f hours elapsed, expected completion in %1.1f hours (%1.1f days)", runtime/3600, remaining_time/3600, remaining_time/3600/24);
-			last_check_time = time_now;
-		}
-		for (uint32_t odd_state = next_state(sum_a0_bitarray[ODD_STATE], -1); odd_state < (1<<24); odd_state = next_state(sum_a0_bitarray[ODD_STATE], odd_state)) {
-			if (even_state_is_possible) {
-				if (all_odd_states_are_possible_for_notbitflip) break;
-				if (test_bit24(test_not_bitarray[ODD_STATE], odd_state)) continue;
-			}
-			// load crypto1 state
-			struct Crypto1State cs;
-			cs.odd = odd_state >> 4;
-			cs.even = even_state >> 4;
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // second run for the remaining "not bitflip" states
+    printf("\n\nStarting search for crypto1 states resulting in bitflip property 0x%03x...", bitflip | 0x100);
+    start_time = time(NULL);
+    last_check_time = start_time;
+    for (uint32_t even_state = next_state(sum_a0_bitarray[EVEN_STATE], -1); even_state < NUM_TEST_STATES; even_state = next_state(sum_a0_bitarray[EVEN_STATE], even_state)) {
+        bool even_state_is_possible = test_bit24(test_not_bitarray[EVEN_STATE], even_state);
+        time_t time_now = time(NULL);
+        if (difftime(time_now, last_check_time) > 5*60) { // print status every 5 minutes
+            float runtime = difftime(time_now, start_time);
+            float remaining_time = runtime * ((1<<23) - even_state) / even_state;
+            printf("\n%1.1f hours elapsed, expected completion in %1.1f hours (%1.1f days)", runtime/3600, remaining_time/3600, remaining_time/3600/24);
+            last_check_time = time_now;
+        }
+        for (uint32_t odd_state = next_state(sum_a0_bitarray[ODD_STATE], -1); odd_state < (1<<24); odd_state = next_state(sum_a0_bitarray[ODD_STATE], odd_state)) {
+            if (even_state_is_possible) {
+                if (all_odd_states_are_possible_for_notbitflip) break;
+                if (test_bit24(test_not_bitarray[ODD_STATE], odd_state)) continue;
+            }
+            // load crypto1 state
+            struct Crypto1State cs;
+            cs.odd = odd_state >> 4;
+            cs.even = even_state >> 4;
 
-			// track flipping bits in state
-			struct Crypto1DeltaState {
-				uint_fast8_t odd;
-				uint_fast8_t even;
-			} cs_delta;
-			cs_delta.odd = 0;
-			cs_delta.even = 0;
+            // track flipping bits in state
+            struct Crypto1DeltaState {
+                uint_fast8_t odd;
+                uint_fast8_t even;
+            } cs_delta;
+            cs_delta.odd = 0;
+            cs_delta.even = 0;
 
-			uint_fast16_t keystream = 0;
-			// uint_fast16_t nt = 0;
+            uint_fast16_t keystream = 0;
+            // uint_fast16_t nt = 0;
 
-			// decrypt 9 bits
-			for (int i = 0; i < 9; i++) {
-				uint_fast8_t keystream_bit = filter(cs.odd & 0x000fffff) ^ filter((cs.odd & 0x000fffff) ^ cs_delta.odd);
-				keystream = keystream << 1 | keystream_bit;
-				uint_fast8_t nt_bit = BIT(bitflip|0x100, i) ^ keystream_bit;
-				uint_fast8_t LSFR_feedback = BIT(cs_delta.odd, 2) ^ BIT(cs_delta.even, 2) ^ BIT(cs_delta.odd, 3);
+            // decrypt 9 bits
+            for (int i = 0; i < 9; i++) {
+                uint_fast8_t keystream_bit = filter(cs.odd & 0x000fffff) ^ filter((cs.odd & 0x000fffff) ^ cs_delta.odd);
+                keystream = keystream << 1 | keystream_bit;
+                uint_fast8_t nt_bit = BIT(bitflip|0x100, i) ^ keystream_bit;
+                uint_fast8_t LSFR_feedback = BIT(cs_delta.odd, 2) ^ BIT(cs_delta.even, 2) ^ BIT(cs_delta.odd, 3);
 
-				cs_delta.even = cs_delta.even << 1 | (LSFR_feedback ^ nt_bit);
-				uint_fast8_t tmp = cs_delta.odd;
-				cs_delta.odd = cs_delta.even;
-				cs_delta.even = tmp;
+                cs_delta.even = cs_delta.even << 1 | (LSFR_feedback ^ nt_bit);
+                uint_fast8_t tmp = cs_delta.odd;
+                cs_delta.odd = cs_delta.even;
+                cs_delta.even = tmp;
 
-				cs.even = cs.odd;
-				if (i & 1) {
-					cs.odd = odd_state >> (7 - i) / 2;
-				} else {
-					cs.odd = even_state >> (7 - i) / 2;
-				}
-			}
+                cs.even = cs.odd;
+                if (i & 1) {
+                    cs.odd = odd_state >> (7 - i) / 2;
+                } else {
+                    cs.odd = even_state >> (7 - i) / 2;
+                }
+            }
 
-			if (evenparity32(keystream) != evenparity32(bitflip)) {
-				// found valid !bitflip state
-				even_state_is_possible = true;
-				set_bit24(test_not_bitarray[EVEN_STATE], even_state);
-				set_bit24(test_not_bitarray[EVEN_STATE], 1 << 23 | even_state);
-				set_bit24(test_not_bitarray[ODD_STATE], odd_state);
-			}
-		}
-	}
+            if (evenparity32(keystream) != evenparity32(bitflip)) {
+                // found valid !bitflip state
+                even_state_is_possible = true;
+                set_bit24(test_not_bitarray[EVEN_STATE], even_state);
+                set_bit24(test_not_bitarray[EVEN_STATE], 1 << 23 | even_state);
+                set_bit24(test_not_bitarray[ODD_STATE], odd_state);
+            }
+        }
+    }
 
-	printf("\nAnalysis completed. Checking for effective !bitflip properties...\n");
-	for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
-		count[odd_even] = count_states(test_not_bitarray[odd_even]);
-		if (count[odd_even] != 1<<24) {
-			printf("Writing %d possible %s states for bitflip property %03x (%d (%1.2f%%) states eliminated)\n",
-				count[odd_even],
-				odd_even==EVEN_STATE?"even":"odd",
-				bitflip|0x100, (1<<24) - count[odd_even],
-				(float)((1<<24) - count[odd_even]) / (1<<24) * 100.0);
-			#ifndef TEST_RUN
-			write_bitflips_file(odd_even, bitflip|0x100, sum_a0, test_not_bitarray[odd_even], count[odd_even]);
-			#endif
-		} else {
-			printf("All %s states for bitflip property %03x are possible. No file written.\n", odd_even==EVEN_STATE?"even":"odd", bitflip|0x100);
-		}
-	}
+    printf("\nAnalysis completed. Checking for effective !bitflip properties...\n");
+    for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
+        count[odd_even] = count_states(test_not_bitarray[odd_even]);
+        if (count[odd_even] != 1<<24) {
+            printf("Writing %d possible %s states for bitflip property %03x (%d (%1.2f%%) states eliminated)\n",
+                count[odd_even],
+                odd_even==EVEN_STATE?"even":"odd",
+                bitflip|0x100, (1<<24) - count[odd_even],
+                (float)((1<<24) - count[odd_even]) / (1<<24) * 100.0);
+            #ifndef TEST_RUN
+            write_bitflips_file(odd_even, bitflip|0x100, sum_a0, test_not_bitarray[odd_even], count[odd_even]);
+            #endif
+        } else {
+            printf("All %s states for bitflip property %03x are possible. No file written.\n", odd_even==EVEN_STATE?"even":"odd", bitflip|0x100);
+        }
+    }
 
-	clear_bitarray24(test_bitarray_2nd);
-	for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
-		if (count[odd_even] != 1<<24) {
-			for (uint32_t state = 0; state < (1<<24); state += 1<<4) {
-				uint32_t line = test_not_bitarray[odd_even][state>>5];
-				uint16_t half_line = state&0x000000010 ? line&0x0000ffff : line>>16;
-				if (half_line != 0) {
-					for (uint32_t low_bits = 0; low_bits < (1<<4); low_bits++) {
-						set_bit24(test_bitarray_2nd, low_bits << 20 | state >> 4);
-					}
-				}
-			}
-			count[odd_even] = count_states(test_bitarray_2nd);
-			if (count[odd_even] != 1<<24) {
-				printf("Writing %d possible %s states for bitflip property %03x (%d (%1.2f%%) states eliminated)\n",
-					count[odd_even],
-					odd_even==EVEN_STATE?"even":"odd",
-					bitflip | 0x100| BITFLIP_2ND_BYTE, (1<<24) - count[odd_even],
-					(float)((1<<24) - count[odd_even]) / (1<<24) * 100.0);
-				#ifndef TEST_RUN
-				write_bitflips_file(odd_even, bitflip | 0x100 | BITFLIP_2ND_BYTE, sum_a0, test_bitarray_2nd, count[odd_even]);
-				#endif
-			} else {
-				printf("All %s states for bitflip property %03x are possible. No file written.\n", odd_even==EVEN_STATE?"even":"odd", bitflip | 0x100 | BITFLIP_2ND_BYTE);
-			}
-		} else {
-			printf("All %s states for bitflip property %03x are possible. No file written.\n", odd_even==EVEN_STATE?"even":"odd", bitflip | 0x100 | BITFLIP_2ND_BYTE);
-		}
-	}
+    clear_bitarray24(test_bitarray_2nd);
+    for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
+        if (count[odd_even] != 1<<24) {
+            for (uint32_t state = 0; state < (1<<24); state += 1<<4) {
+                uint32_t line = test_not_bitarray[odd_even][state>>5];
+                uint16_t half_line = state&0x000000010 ? line&0x0000ffff : line>>16;
+                if (half_line != 0) {
+                    for (uint32_t low_bits = 0; low_bits < (1<<4); low_bits++) {
+                        set_bit24(test_bitarray_2nd, low_bits << 20 | state >> 4);
+                    }
+                }
+            }
+            count[odd_even] = count_states(test_bitarray_2nd);
+            if (count[odd_even] != 1<<24) {
+                printf("Writing %d possible %s states for bitflip property %03x (%d (%1.2f%%) states eliminated)\n",
+                    count[odd_even],
+                    odd_even==EVEN_STATE?"even":"odd",
+                    bitflip | 0x100| BITFLIP_2ND_BYTE, (1<<24) - count[odd_even],
+                    (float)((1<<24) - count[odd_even]) / (1<<24) * 100.0);
+                #ifndef TEST_RUN
+                write_bitflips_file(odd_even, bitflip | 0x100 | BITFLIP_2ND_BYTE, sum_a0, test_bitarray_2nd, count[odd_even]);
+                #endif
+            } else {
+                printf("All %s states for bitflip property %03x are possible. No file written.\n", odd_even==EVEN_STATE?"even":"odd", bitflip | 0x100 | BITFLIP_2ND_BYTE);
+            }
+        } else {
+            printf("All %s states for bitflip property %03x are possible. No file written.\n", odd_even==EVEN_STATE?"even":"odd", bitflip | 0x100 | BITFLIP_2ND_BYTE);
+        }
+    }
 
-	free_bitarray(test_bitarray_2nd);
-	free_bitarray(test_not_bitarray[ODD_STATE]);
-	free_bitarray(test_not_bitarray[EVEN_STATE]);
-	free_bitarray(test_bitarray[ODD_STATE]);
-	free_bitarray(test_bitarray[EVEN_STATE]);
+    free_bitarray(test_bitarray_2nd);
+    free_bitarray(test_not_bitarray[ODD_STATE]);
+    free_bitarray(test_not_bitarray[EVEN_STATE]);
+    free_bitarray(test_bitarray[ODD_STATE]);
+    free_bitarray(test_bitarray[EVEN_STATE]);
 
-	exit(0);
+    exit(0);
 }
 
 
 int main (int argc, char *argv[]) {
 
-	unsigned int bitflip_in;
-	int sum_a0;
+    unsigned int bitflip_in;
+    int sum_a0;
 
-	printf("Create tables required by hardnested attack.\n");
-	printf("Expect a runtime in the range of days or weeks.\n");
-	printf("Single thread only. If you want to use several threads, start it multiple times :-)\n\n");
+    printf("Create tables required by hardnested attack.\n");
+    printf("Expect a runtime in the range of days or weeks.\n");
+    printf("Single thread only. If you want to use several threads, start it multiple times :-)\n\n");
 
-	if (argc != 2 && argc != 3) {
-		printf(" syntax: %s <bitflip property> [<Sum_a0>]\n\n", argv[0]);
-		printf(" example: %s 1f\n", argv[0]);
-		return 1;
-	}
+    if (argc != 2 && argc != 3) {
+        printf(" syntax: %s <bitflip property> [<Sum_a0>]\n\n", argv[0]);
+        printf(" example: %s 1f\n", argv[0]);
+        return 1;
+    }
 
-	sscanf(argv[1],"%x", &bitflip_in);
+    sscanf(argv[1],"%x", &bitflip_in);
 
-	if (bitflip_in > 255) {
-		printf("Bitflip property must be less than or equal to 0xff\n\n");
-		return 1;
-	}
+    if (bitflip_in > 255) {
+        printf("Bitflip property must be less than or equal to 0xff\n\n");
+        return 1;
+    }
 
-	if(argc == 3) {
-		sscanf(argv[2], "%d", &sum_a0);
-	}
+    if(argc == 3) {
+        sscanf(argv[2], "%d", &sum_a0);
+    }
 
-	switch (sum_a0) {
-		case 0:
-		case  32:
-		case  56:
-		case  64:
-		case  80:
-		case  96:
-		case  104:
-		case  112:
-		case  120:
-		case  128:
-		case  136:
-		case  144:
-		case  152:
-		case  160:
-		case  176:
-		case  192:
-		case  200:
-		case  224:
-		case  256: break;
-		default: sum_a0 = -1;
-	}
+    switch (sum_a0) {
+        case 0:
+        case  32:
+        case  56:
+        case  64:
+        case  80:
+        case  96:
+        case  104:
+        case  112:
+        case  120:
+        case  128:
+        case  136:
+        case  144:
+        case  152:
+        case  160:
+        case  176:
+        case  192:
+        case  200:
+        case  224:
+        case  256: break;
+        default: sum_a0 = -1;
+    }
 
-	printf("Calculating for bitflip = %02x, sum_a0 = %d\n", bitflip_in, sum_a0);
+    printf("Calculating for bitflip = %02x, sum_a0 = %d\n", bitflip_in, sum_a0);
 
-	init_part_sum_bitarrays();
-	init_sum_bitarray(sum_a0);
+    init_part_sum_bitarrays();
+    init_sum_bitarray(sum_a0);
 
-	precalculate_bit0_bitflip_bitarrays(bitflip_in, sum_a0);
+    precalculate_bit0_bitflip_bitarrays(bitflip_in, sum_a0);
 
-	free_sum_bitarray();
-	free_part_sum_bitarrays();
+    free_sum_bitarray();
+    free_part_sum_bitarrays();
 
-	return 0;
+    return 0;
 }
\ No newline at end of file
diff --git a/client/hid-flasher/elf.h b/client/hid-flasher/elf.h
index 90e203353..0551cbd76 100644
--- a/client/hid-flasher/elf.h
+++ b/client/hid-flasher/elf.h
@@ -10,33 +10,33 @@
 #define __ELF_H__
 
 typedef struct {
-	uint32_t p_type;
-	uint32_t p_offset;
-	uint32_t p_vaddr;
-	uint32_t p_paddr;
-	uint32_t p_filesz;
-	uint32_t p_memsz;
-	uint32_t p_flags;
-	uint32_t p_align;
+    uint32_t p_type;
+    uint32_t p_offset;
+    uint32_t p_vaddr;
+    uint32_t p_paddr;
+    uint32_t p_filesz;
+    uint32_t p_memsz;
+    uint32_t p_flags;
+    uint32_t p_align;
 } __attribute__((__packed__)) Elf32_Phdr;
 
 #define EI_NIDENT 16
 
 typedef struct {
-	unsigned char   e_ident[EI_NIDENT];
-	uint16_t e_type;
-	uint16_t e_machine;
-	uint32_t e_version;
-	uint32_t e_entry;
-	uint32_t e_phoff;
-	uint32_t e_shoff;
-	uint32_t e_flags;
-	uint16_t e_ehsize;
-	uint16_t e_phentsize;
-	uint16_t e_phnum;
-	uint16_t e_shentsize;
-	uint16_t e_shnum;
-	uint16_t e_shtrndx;
+    unsigned char   e_ident[EI_NIDENT];
+    uint16_t e_type;
+    uint16_t e_machine;
+    uint32_t e_version;
+    uint32_t e_entry;
+    uint32_t e_phoff;
+    uint32_t e_shoff;
+    uint32_t e_flags;
+    uint16_t e_ehsize;
+    uint16_t e_phentsize;
+    uint16_t e_phnum;
+    uint16_t e_shentsize;
+    uint16_t e_shnum;
+    uint16_t e_shtrndx;
 } __attribute__((__packed__)) Elf32_Ehdr;
 
 #define PT_NULL      0
diff --git a/client/hid-flasher/flash.c b/client/hid-flasher/flash.c
index c53e560d5..2277dd8a1 100644
--- a/client/hid-flasher/flash.c
+++ b/client/hid-flasher/flash.c
@@ -26,448 +26,448 @@
 #define BLOCK_SIZE             0x100
 
 static const uint8_t elf_ident[] = {
-	0x7f, 'E', 'L', 'F',
-	ELFCLASS32,
-	ELFDATA2LSB,
-	EV_CURRENT
+    0x7f, 'E', 'L', 'F',
+    ELFCLASS32,
+    ELFDATA2LSB,
+    EV_CURRENT
 };
 
 // Turn PHDRs into flasher segments, checking for PHDR sanity and merging adjacent
 // unaligned segments if needed
 static int build_segs_from_phdrs(flash_file_t *ctx, FILE *fd, Elf32_Phdr *phdrs, int num_phdrs)
 {
-	Elf32_Phdr *phdr = phdrs;
-	flash_seg_t *seg;
-	uint32_t last_end = 0;
+    Elf32_Phdr *phdr = phdrs;
+    flash_seg_t *seg;
+    uint32_t last_end = 0;
 
-	ctx->segments = calloc(sizeof(flash_seg_t) * num_phdrs, sizeof(uint8_t));
-	if (!ctx->segments) {
-		fprintf(stderr, "Out of memory\n");
-		return -1;
-	}
-	ctx->num_segs = 0;
-	seg = ctx->segments;
+    ctx->segments = calloc(sizeof(flash_seg_t) * num_phdrs, sizeof(uint8_t));
+    if (!ctx->segments) {
+        fprintf(stderr, "Out of memory\n");
+        return -1;
+    }
+    ctx->num_segs = 0;
+    seg = ctx->segments;
 
-	fprintf(stderr, "Loading usable ELF segments:\n");
-	for (int i = 0; i < num_phdrs; i++) {
-		if (le32(phdr->p_type) != PT_LOAD) {
-			phdr++;
-			continue;
-		}
-		uint32_t vaddr = le32(phdr->p_vaddr);
-		uint32_t paddr = le32(phdr->p_paddr);
-		uint32_t filesz = le32(phdr->p_filesz);
-		uint32_t memsz = le32(phdr->p_memsz);
-		uint32_t offset = le32(phdr->p_offset);
-		uint32_t flags = le32(phdr->p_flags);
-		if (!filesz) {
-			phdr++;
-			continue;
-		}
-		fprintf(stderr, "%d: V 0x%08x P 0x%08x (0x%08x->0x%08x) [%c%c%c] @0x%x\n",
-		        i, vaddr, paddr, filesz, memsz,
-		        flags & PF_R ? 'R' : ' ',
-		        flags & PF_W ? 'W' : ' ',
-		        flags & PF_X ? 'X' : ' ',
-		        offset);
-		if (filesz != memsz) {
-			fprintf(stderr, "Error: PHDR file size does not equal memory size\n"
-			                "(DATA+BSS PHDRs do not make sense on ROM platforms!)\n");
-			return -1;
-		}
-		if (paddr < last_end) {
-			fprintf(stderr, "Error: PHDRs not sorted or overlap\n");
-			return -1;
-		}
-		if (paddr < FLASH_START || (paddr+filesz) > FLASH_END) {
-			fprintf(stderr, "Error: PHDR is not contained in Flash\n");
-			return -1;
-		}
-		if (vaddr >= FLASH_START && vaddr < FLASH_END && (flags & PF_W)) {
-			fprintf(stderr, "Error: Flash VMA segment is writable\n");
-			return -1;
-		}
+    fprintf(stderr, "Loading usable ELF segments:\n");
+    for (int i = 0; i < num_phdrs; i++) {
+        if (le32(phdr->p_type) != PT_LOAD) {
+            phdr++;
+            continue;
+        }
+        uint32_t vaddr = le32(phdr->p_vaddr);
+        uint32_t paddr = le32(phdr->p_paddr);
+        uint32_t filesz = le32(phdr->p_filesz);
+        uint32_t memsz = le32(phdr->p_memsz);
+        uint32_t offset = le32(phdr->p_offset);
+        uint32_t flags = le32(phdr->p_flags);
+        if (!filesz) {
+            phdr++;
+            continue;
+        }
+        fprintf(stderr, "%d: V 0x%08x P 0x%08x (0x%08x->0x%08x) [%c%c%c] @0x%x\n",
+                i, vaddr, paddr, filesz, memsz,
+                flags & PF_R ? 'R' : ' ',
+                flags & PF_W ? 'W' : ' ',
+                flags & PF_X ? 'X' : ' ',
+                offset);
+        if (filesz != memsz) {
+            fprintf(stderr, "Error: PHDR file size does not equal memory size\n"
+                            "(DATA+BSS PHDRs do not make sense on ROM platforms!)\n");
+            return -1;
+        }
+        if (paddr < last_end) {
+            fprintf(stderr, "Error: PHDRs not sorted or overlap\n");
+            return -1;
+        }
+        if (paddr < FLASH_START || (paddr+filesz) > FLASH_END) {
+            fprintf(stderr, "Error: PHDR is not contained in Flash\n");
+            return -1;
+        }
+        if (vaddr >= FLASH_START && vaddr < FLASH_END && (flags & PF_W)) {
+            fprintf(stderr, "Error: Flash VMA segment is writable\n");
+            return -1;
+        }
 
-		uint8_t *data;
-		// make extra space if we need to move the data forward
-		data = calloc(filesz + BLOCK_SIZE, sizeof(uint8_t));
-		if (!data) {
-			fprintf(stderr, "Out of memory\n");
-			return -1;
-		}
-		if (fseek(fd, offset, SEEK_SET) < 0 || fread(data, 1, filesz, fd) != filesz) {
-			fprintf(stderr, "Error while reading PHDR payload\n");
-			free(data);
-			return -1;
-		}
+        uint8_t *data;
+        // make extra space if we need to move the data forward
+        data = calloc(filesz + BLOCK_SIZE, sizeof(uint8_t));
+        if (!data) {
+            fprintf(stderr, "Out of memory\n");
+            return -1;
+        }
+        if (fseek(fd, offset, SEEK_SET) < 0 || fread(data, 1, filesz, fd) != filesz) {
+            fprintf(stderr, "Error while reading PHDR payload\n");
+            free(data);
+            return -1;
+        }
 
-		uint32_t block_offset = paddr & (BLOCK_SIZE-1);
-		if (block_offset) {
-			if (ctx->num_segs) {
-				flash_seg_t *prev_seg = seg - 1;
-				uint32_t this_end = paddr + filesz;
-				uint32_t this_firstblock = paddr & ~(BLOCK_SIZE-1);
-				uint32_t prev_lastblock = (last_end - 1) & ~(BLOCK_SIZE-1);
+        uint32_t block_offset = paddr & (BLOCK_SIZE-1);
+        if (block_offset) {
+            if (ctx->num_segs) {
+                flash_seg_t *prev_seg = seg - 1;
+                uint32_t this_end = paddr + filesz;
+                uint32_t this_firstblock = paddr & ~(BLOCK_SIZE-1);
+                uint32_t prev_lastblock = (last_end - 1) & ~(BLOCK_SIZE-1);
 
-				if (this_firstblock == prev_lastblock) {
-					uint32_t new_length = this_end - prev_seg->start;
-					uint32_t this_offset = paddr - prev_seg->start;
-					uint32_t hole = this_offset - prev_seg->length;
-					uint8_t *new_data = calloc(new_length, sizeof(uint8_t));
-					if (!new_data) {
-						fprintf(stderr, "Out of memory\n");
-						free(data);
-						return -1;
-					}
-					memset(new_data, 0xff, new_length);
-					memcpy(new_data, prev_seg->data, prev_seg->length);
-					memcpy(new_data + this_offset, data, filesz);
-					fprintf(stderr, "Note: Extending previous segment from 0x%x to 0x%x bytes\n",
-					        prev_seg->length, new_length);
-					if (hole)
-						fprintf(stderr, "Note: 0x%x-byte hole created\n", hole);
-					free(data);
-					free(prev_seg->data);
-					prev_seg->data = new_data;
-					prev_seg->length = new_length;
-					last_end = this_end;
-					phdr++;
-					continue;
-				}
-			}
-			fprintf(stderr, "Warning: segment does not begin on a block boundary, will pad\n");
-			memmove(data + block_offset, data, filesz);
-			memset(data, 0xFF, block_offset);
-			filesz += block_offset;
-			paddr -= block_offset;
-		}
+                if (this_firstblock == prev_lastblock) {
+                    uint32_t new_length = this_end - prev_seg->start;
+                    uint32_t this_offset = paddr - prev_seg->start;
+                    uint32_t hole = this_offset - prev_seg->length;
+                    uint8_t *new_data = calloc(new_length, sizeof(uint8_t));
+                    if (!new_data) {
+                        fprintf(stderr, "Out of memory\n");
+                        free(data);
+                        return -1;
+                    }
+                    memset(new_data, 0xff, new_length);
+                    memcpy(new_data, prev_seg->data, prev_seg->length);
+                    memcpy(new_data + this_offset, data, filesz);
+                    fprintf(stderr, "Note: Extending previous segment from 0x%x to 0x%x bytes\n",
+                            prev_seg->length, new_length);
+                    if (hole)
+                        fprintf(stderr, "Note: 0x%x-byte hole created\n", hole);
+                    free(data);
+                    free(prev_seg->data);
+                    prev_seg->data = new_data;
+                    prev_seg->length = new_length;
+                    last_end = this_end;
+                    phdr++;
+                    continue;
+                }
+            }
+            fprintf(stderr, "Warning: segment does not begin on a block boundary, will pad\n");
+            memmove(data + block_offset, data, filesz);
+            memset(data, 0xFF, block_offset);
+            filesz += block_offset;
+            paddr -= block_offset;
+        }
 
-		seg->data = data;
-		seg->start = paddr;
-		seg->length = filesz;
-		seg++;
-		ctx->num_segs++;
+        seg->data = data;
+        seg->start = paddr;
+        seg->length = filesz;
+        seg++;
+        ctx->num_segs++;
 
-		last_end = paddr + filesz;
-		phdr++;
-	}
-	return 0;
+        last_end = paddr + filesz;
+        phdr++;
+    }
+    return 0;
 }
 
 // Sanity check segments and check for bootloader writes
 static int check_segs(flash_file_t *ctx, int can_write_bl) {
-	for (int i = 0; i < ctx->num_segs; i++) {
-		flash_seg_t *seg = &ctx->segments[i];
+    for (int i = 0; i < ctx->num_segs; i++) {
+        flash_seg_t *seg = &ctx->segments[i];
 
-		if (seg->start & (BLOCK_SIZE-1)) {
-			fprintf(stderr, "Error: Segment is not aligned\n");
-			return -1;
-		}
-		if (seg->start < FLASH_START) {
-			fprintf(stderr, "Error: Segment is outside of flash bounds\n");
-			return -1;
-		}
-		if (seg->start + seg->length > FLASH_END) {
-			fprintf(stderr, "Error: Segment is outside of flash bounds\n");
-			return -1;
-		}
-		if (!can_write_bl && seg->start < BOOTLOADER_END) {
-			fprintf(stderr, "Attempted to write bootloader but bootloader writes are not enabled\n");
-			return -1;
-		}
-	}
-	return 0;
+        if (seg->start & (BLOCK_SIZE-1)) {
+            fprintf(stderr, "Error: Segment is not aligned\n");
+            return -1;
+        }
+        if (seg->start < FLASH_START) {
+            fprintf(stderr, "Error: Segment is outside of flash bounds\n");
+            return -1;
+        }
+        if (seg->start + seg->length > FLASH_END) {
+            fprintf(stderr, "Error: Segment is outside of flash bounds\n");
+            return -1;
+        }
+        if (!can_write_bl && seg->start < BOOTLOADER_END) {
+            fprintf(stderr, "Attempted to write bootloader but bootloader writes are not enabled\n");
+            return -1;
+        }
+    }
+    return 0;
 }
 
 // Load an ELF file and prepare it for flashing
 int flash_load(flash_file_t *ctx, const char *name, int can_write_bl)
 {
-	FILE *fd = NULL;
-	Elf32_Ehdr ehdr;
-	Elf32_Phdr *phdrs = NULL;
-	int num_phdrs;
-	int res;
+    FILE *fd = NULL;
+    Elf32_Ehdr ehdr;
+    Elf32_Phdr *phdrs = NULL;
+    int num_phdrs;
+    int res;
 
-	fd = fopen(name, "rb");
-	if (!fd) {
-		fprintf(stderr, "Could not open file '%s': ", name);
-		perror(NULL);
-		goto fail;
-	}
+    fd = fopen(name, "rb");
+    if (!fd) {
+        fprintf(stderr, "Could not open file '%s': ", name);
+        perror(NULL);
+        goto fail;
+    }
 
-	fprintf(stderr, "Loading ELF file '%s'...\n", name);
+    fprintf(stderr, "Loading ELF file '%s'...\n", name);
 
-	if (fread(&ehdr, sizeof(ehdr), 1, fd) != 1) {
-		fprintf(stderr, "Error while reading ELF file header\n");
-		goto fail;
-	}
-	if (memcmp(ehdr.e_ident, elf_ident, sizeof(elf_ident))
-		|| le32(ehdr.e_version) != 1)
-	{
-		fprintf(stderr, "Not an ELF file or wrong ELF type\n");
-		goto fail;
-	}
-	if (le16(ehdr.e_type) != ET_EXEC) {
-		fprintf(stderr, "ELF is not executable\n");
-		goto fail;
-	}
-	if (le16(ehdr.e_machine) != EM_ARM) {
-		fprintf(stderr, "Wrong ELF architecture\n");
-		goto fail;
-	}
-	if (!ehdr.e_phnum || !ehdr.e_phoff) {
-		fprintf(stderr, "ELF has no PHDRs\n");
-		goto fail;
-	}
-	if (le16(ehdr.e_phentsize) != sizeof(Elf32_Phdr)) {
-		// could be a structure padding issue...
-		fprintf(stderr, "Either the ELF file or this code is made of fail\n");
-		goto fail;
-	}
-	num_phdrs = le16(ehdr.e_phnum);
+    if (fread(&ehdr, sizeof(ehdr), 1, fd) != 1) {
+        fprintf(stderr, "Error while reading ELF file header\n");
+        goto fail;
+    }
+    if (memcmp(ehdr.e_ident, elf_ident, sizeof(elf_ident))
+        || le32(ehdr.e_version) != 1)
+    {
+        fprintf(stderr, "Not an ELF file or wrong ELF type\n");
+        goto fail;
+    }
+    if (le16(ehdr.e_type) != ET_EXEC) {
+        fprintf(stderr, "ELF is not executable\n");
+        goto fail;
+    }
+    if (le16(ehdr.e_machine) != EM_ARM) {
+        fprintf(stderr, "Wrong ELF architecture\n");
+        goto fail;
+    }
+    if (!ehdr.e_phnum || !ehdr.e_phoff) {
+        fprintf(stderr, "ELF has no PHDRs\n");
+        goto fail;
+    }
+    if (le16(ehdr.e_phentsize) != sizeof(Elf32_Phdr)) {
+        // could be a structure padding issue...
+        fprintf(stderr, "Either the ELF file or this code is made of fail\n");
+        goto fail;
+    }
+    num_phdrs = le16(ehdr.e_phnum);
 
-	phdrs = calloc(le16(ehdr.e_phnum) * sizeof(Elf32_Phdr), sizeof(uint8_t));
-	if (!phdrs) {
-		fprintf(stderr, "Out of memory\n");
-		goto fail;
-	}
-	if (fseek(fd, le32(ehdr.e_phoff), SEEK_SET) < 0) {
-		fprintf(stderr, "Error while reading ELF PHDRs\n");
-		goto fail;
-	}
-	if (fread(phdrs, sizeof(Elf32_Phdr), num_phdrs, fd) != num_phdrs) {
-		fprintf(stderr, "Error while reading ELF PHDRs\n");
-		goto fail;
-	}
+    phdrs = calloc(le16(ehdr.e_phnum) * sizeof(Elf32_Phdr), sizeof(uint8_t));
+    if (!phdrs) {
+        fprintf(stderr, "Out of memory\n");
+        goto fail;
+    }
+    if (fseek(fd, le32(ehdr.e_phoff), SEEK_SET) < 0) {
+        fprintf(stderr, "Error while reading ELF PHDRs\n");
+        goto fail;
+    }
+    if (fread(phdrs, sizeof(Elf32_Phdr), num_phdrs, fd) != num_phdrs) {
+        fprintf(stderr, "Error while reading ELF PHDRs\n");
+        goto fail;
+    }
 
-	res = build_segs_from_phdrs(ctx, fd, phdrs, num_phdrs);
-	if (res < 0)
-		goto fail;
-	res = check_segs(ctx, can_write_bl);
-	if (res < 0)
-		goto fail;
+    res = build_segs_from_phdrs(ctx, fd, phdrs, num_phdrs);
+    if (res < 0)
+        goto fail;
+    res = check_segs(ctx, can_write_bl);
+    if (res < 0)
+        goto fail;
 
-	free(phdrs);
-	fclose(fd);
-	ctx->filename = name;
-	return 0;
+    free(phdrs);
+    fclose(fd);
+    ctx->filename = name;
+    return 0;
 
 fail:
-	if (phdrs)
-		free(phdrs);
-	if (fd)
-		fclose(fd);
-	flash_free(ctx);
-	return -1;
+    if (phdrs)
+        free(phdrs);
+    if (fd)
+        fclose(fd);
+    flash_free(ctx);
+    return -1;
 }
 
 // Get the state of the proxmark, backwards compatible
 static int get_proxmark_state(uint32_t *state)
 {
-	UsbCommand c = {CMD_DEVICE_INFO};
-	SendCommand(&c);
-	UsbCommand resp;
-	ReceiveCommand(&resp);
+    UsbCommand c = {CMD_DEVICE_INFO};
+    SendCommand(&c);
+    UsbCommand resp;
+    ReceiveCommand(&resp);
 
-	// Three outcomes:
-	// 1. The old bootrom code will ignore CMD_DEVICE_INFO, but respond with an ACK
-	// 2. The old os code will respond with CMD_DEBUG_PRINT_STRING and "unknown command"
-	// 3. The new bootrom and os codes will respond with CMD_DEVICE_INFO and flags
+    // Three outcomes:
+    // 1. The old bootrom code will ignore CMD_DEVICE_INFO, but respond with an ACK
+    // 2. The old os code will respond with CMD_DEBUG_PRINT_STRING and "unknown command"
+    // 3. The new bootrom and os codes will respond with CMD_DEVICE_INFO and flags
 
-	switch (resp.cmd) {
-		case CMD_ACK:
-			*state = DEVICE_INFO_FLAG_CURRENT_MODE_BOOTROM;
-			break;
-		case CMD_DEBUG_PRINT_STRING:
-			*state = DEVICE_INFO_FLAG_CURRENT_MODE_OS;
-			break;
-		case CMD_DEVICE_INFO:
-			*state = resp.arg[0];
-			break;
-		default:
-			fprintf(stderr, "Error: Couldn't get proxmark state, bad response type: 0x%04x\n", resp.cmd);
-			return -1;
-			break;
-	}
+    switch (resp.cmd) {
+        case CMD_ACK:
+            *state = DEVICE_INFO_FLAG_CURRENT_MODE_BOOTROM;
+            break;
+        case CMD_DEBUG_PRINT_STRING:
+            *state = DEVICE_INFO_FLAG_CURRENT_MODE_OS;
+            break;
+        case CMD_DEVICE_INFO:
+            *state = resp.arg[0];
+            break;
+        default:
+            fprintf(stderr, "Error: Couldn't get proxmark state, bad response type: 0x%04x\n", resp.cmd);
+            return -1;
+            break;
+    }
 
-	return 0;
+    return 0;
 }
 
 // Enter the bootloader to be able to start flashing
 static int enter_bootloader(void)
 {
-	uint32_t state;
+    uint32_t state;
 
-	if (get_proxmark_state(&state) < 0)
-		return -1;
+    if (get_proxmark_state(&state) < 0)
+        return -1;
 
-	if (state & DEVICE_INFO_FLAG_CURRENT_MODE_BOOTROM) {
-		/* Already in flash state, we're done. */
-		return 0;
-	}
+    if (state & DEVICE_INFO_FLAG_CURRENT_MODE_BOOTROM) {
+        /* Already in flash state, we're done. */
+        return 0;
+    }
 
-	if (state & DEVICE_INFO_FLAG_CURRENT_MODE_OS) {
-		fprintf(stderr,"Entering bootloader...\n");
-		UsbCommand c;
-		memset(&c, 0, sizeof (c));
+    if (state & DEVICE_INFO_FLAG_CURRENT_MODE_OS) {
+        fprintf(stderr,"Entering bootloader...\n");
+        UsbCommand c;
+        memset(&c, 0, sizeof (c));
 
-		if ((state & DEVICE_INFO_FLAG_BOOTROM_PRESENT)
-			&& (state & DEVICE_INFO_FLAG_OSIMAGE_PRESENT))
-		{
-			// New style handover: Send CMD_START_FLASH, which will reset the board
-			// and enter the bootrom on the next boot.
-			c.cmd = CMD_START_FLASH;
-			SendCommand(&c);
-			fprintf(stderr,"(Press and release the button only to abort)\n");
-		} else {
-			// Old style handover: Ask the user to press the button, then reset the board
-			c.cmd = CMD_HARDWARE_RESET;
-			SendCommand(&c);
-			fprintf(stderr,"Press and hold down button NOW if your bootloader requires it.\n");
-		}
-		fprintf(stderr,"Waiting for Proxmark to reappear on USB...");
+        if ((state & DEVICE_INFO_FLAG_BOOTROM_PRESENT)
+            && (state & DEVICE_INFO_FLAG_OSIMAGE_PRESENT))
+        {
+            // New style handover: Send CMD_START_FLASH, which will reset the board
+            // and enter the bootrom on the next boot.
+            c.cmd = CMD_START_FLASH;
+            SendCommand(&c);
+            fprintf(stderr,"(Press and release the button only to abort)\n");
+        } else {
+            // Old style handover: Ask the user to press the button, then reset the board
+            c.cmd = CMD_HARDWARE_RESET;
+            SendCommand(&c);
+            fprintf(stderr,"Press and hold down button NOW if your bootloader requires it.\n");
+        }
+        fprintf(stderr,"Waiting for Proxmark to reappear on USB...");
 
-		CloseProxmark();
-		msleep(1000);
-		while (!OpenProxmark(0)) {
-			msleep(1000);
-			fprintf(stderr, "."); fflush(stdout);
-		}
-		fprintf(stderr," Found.\n");
+        CloseProxmark();
+        msleep(1000);
+        while (!OpenProxmark(0)) {
+            msleep(1000);
+            fprintf(stderr, "."); fflush(stdout);
+        }
+        fprintf(stderr," Found.\n");
 
-		return 0;
-	}
+        return 0;
+    }
 
-	fprintf(stderr, "Error: Unknown Proxmark mode\n");
-	return -1;
+    fprintf(stderr, "Error: Unknown Proxmark mode\n");
+    return -1;
 }
 
 static int wait_for_ack(void)
 {
-	UsbCommand ack;
-	ReceiveCommand(&ack);
-	if (ack.cmd != CMD_ACK) {
-		printf("Error: Unexpected reply 0x%04x (expected ACK)\n", ack.cmd);
-		return -1;
-	}
-	return 0;
+    UsbCommand ack;
+    ReceiveCommand(&ack);
+    if (ack.cmd != CMD_ACK) {
+        printf("Error: Unexpected reply 0x%04x (expected ACK)\n", ack.cmd);
+        return -1;
+    }
+    return 0;
 }
 
 // Go into flashing mode
 int flash_start_flashing(int enable_bl_writes)
 {
-	uint32_t state;
+    uint32_t state;
 
-	if (enter_bootloader() < 0)
-		return -1;
+    if (enter_bootloader() < 0)
+        return -1;
 
-	if (get_proxmark_state(&state) < 0)
-		return -1;
+    if (get_proxmark_state(&state) < 0)
+        return -1;
 
-	if (state & DEVICE_INFO_FLAG_UNDERSTANDS_START_FLASH) {
-		// This command is stupid. Why the heck does it care which area we're
-		// flashing, as long as it's not the bootloader area? The mind boggles.
-		UsbCommand c = {CMD_START_FLASH};
+    if (state & DEVICE_INFO_FLAG_UNDERSTANDS_START_FLASH) {
+        // This command is stupid. Why the heck does it care which area we're
+        // flashing, as long as it's not the bootloader area? The mind boggles.
+        UsbCommand c = {CMD_START_FLASH};
 
-		if (enable_bl_writes) {
-			c.arg[0] = FLASH_START;
-			c.arg[1] = FLASH_END;
-			c.arg[2] = START_FLASH_MAGIC;
-		} else {
-			c.arg[0] = BOOTLOADER_END;
-			c.arg[1] = FLASH_END;
-			c.arg[2] = 0;
-		}
-		SendCommand(&c);
-		return wait_for_ack();
-	} else {
-		fprintf(stderr, "Note: Your bootloader does not understand the new START_FLASH command\n");
-		fprintf(stderr, "      It is recommended that you update your bootloader\n\n");
-	}
+        if (enable_bl_writes) {
+            c.arg[0] = FLASH_START;
+            c.arg[1] = FLASH_END;
+            c.arg[2] = START_FLASH_MAGIC;
+        } else {
+            c.arg[0] = BOOTLOADER_END;
+            c.arg[1] = FLASH_END;
+            c.arg[2] = 0;
+        }
+        SendCommand(&c);
+        return wait_for_ack();
+    } else {
+        fprintf(stderr, "Note: Your bootloader does not understand the new START_FLASH command\n");
+        fprintf(stderr, "      It is recommended that you update your bootloader\n\n");
+    }
 
-	return 0;
+    return 0;
 }
 
 static int write_block(uint32_t address, uint8_t *data, uint32_t length)
 {
-	uint8_t block_buf[BLOCK_SIZE];
+    uint8_t block_buf[BLOCK_SIZE];
 
-	memset(block_buf, 0xFF, BLOCK_SIZE);
-	memcpy(block_buf, data, length);
+    memset(block_buf, 0xFF, BLOCK_SIZE);
+    memcpy(block_buf, data, length);
 
-	UsbCommand c = {CMD_SETUP_WRITE};
-	for (int i = 0; i < 240; i += 48) {
-		memcpy(c.d.asBytes, block_buf + i, 48);
-		c.arg[0] = i / 4;
-		SendCommand(&c);
-		if (wait_for_ack() < 0)
-			return -1;
-	}
+    UsbCommand c = {CMD_SETUP_WRITE};
+    for (int i = 0; i < 240; i += 48) {
+        memcpy(c.d.asBytes, block_buf + i, 48);
+        c.arg[0] = i / 4;
+        SendCommand(&c);
+        if (wait_for_ack() < 0)
+            return -1;
+    }
 
-	c.cmd = CMD_FINISH_WRITE;
-	c.arg[0] = address;
-	memcpy(c.d.asBytes, block_buf+240, 16);
-	SendCommand(&c);
-	return wait_for_ack();
+    c.cmd = CMD_FINISH_WRITE;
+    c.arg[0] = address;
+    memcpy(c.d.asBytes, block_buf+240, 16);
+    SendCommand(&c);
+    return wait_for_ack();
 }
 
 // Write a file's segments to Flash
 int flash_write(flash_file_t *ctx)
 {
-	fprintf(stderr, "Writing segments for file: %s\n", ctx->filename);
-	for (int i = 0; i < ctx->num_segs; i++) {
-		flash_seg_t *seg = &ctx->segments[i];
+    fprintf(stderr, "Writing segments for file: %s\n", ctx->filename);
+    for (int i = 0; i < ctx->num_segs; i++) {
+        flash_seg_t *seg = &ctx->segments[i];
 
-		uint32_t length = seg->length;
-		uint32_t blocks = (length + BLOCK_SIZE - 1) / BLOCK_SIZE;
-		uint32_t end = seg->start + length;
+        uint32_t length = seg->length;
+        uint32_t blocks = (length + BLOCK_SIZE - 1) / BLOCK_SIZE;
+        uint32_t end = seg->start + length;
 
-		fprintf(stderr, " 0x%08x..0x%08x [0x%x / %d blocks]",
-		        seg->start, end - 1, length, blocks);
+        fprintf(stderr, " 0x%08x..0x%08x [0x%x / %d blocks]",
+                seg->start, end - 1, length, blocks);
 
-		int block = 0;
-		uint8_t *data = seg->data;
-		uint32_t baddr = seg->start;
+        int block = 0;
+        uint8_t *data = seg->data;
+        uint32_t baddr = seg->start;
 
-		while (length) {
-			uint32_t block_size = length;
-			if (block_size > BLOCK_SIZE)
-				block_size = BLOCK_SIZE;
+        while (length) {
+            uint32_t block_size = length;
+            if (block_size > BLOCK_SIZE)
+                block_size = BLOCK_SIZE;
 
-			if (write_block(baddr, data, block_size) < 0) {
-				fprintf(stderr, " ERROR\n");
-				fprintf(stderr, "Error writing block %d of %d\n", block, blocks);
-				return -1;
-			}
+            if (write_block(baddr, data, block_size) < 0) {
+                fprintf(stderr, " ERROR\n");
+                fprintf(stderr, "Error writing block %d of %d\n", block, blocks);
+                return -1;
+            }
 
-			data += block_size;
-			baddr += block_size;
-			length -= block_size;
-			block++;
-			fprintf(stderr, "."); fflush(stdout);
-		}
-		fprintf(stderr, " OK\n");
-	}
-	return 0;
+            data += block_size;
+            baddr += block_size;
+            length -= block_size;
+            block++;
+            fprintf(stderr, "."); fflush(stdout);
+        }
+        fprintf(stderr, " OK\n");
+    }
+    return 0;
 }
 
 // free a file context
 void flash_free(flash_file_t *ctx)
 {
-	if (!ctx)
-		return;
-	if (ctx->segments) {
-		for (int i = 0; i < ctx->num_segs; i++)
-			free(ctx->segments[i].data);
-		free(ctx->segments);
-		ctx->segments = NULL;
-		ctx->num_segs = 0;
-	}
+    if (!ctx)
+        return;
+    if (ctx->segments) {
+        for (int i = 0; i < ctx->num_segs; i++)
+            free(ctx->segments[i].data);
+        free(ctx->segments);
+        ctx->segments = NULL;
+        ctx->num_segs = 0;
+    }
 }
 
 // just reset the unit
 int flash_stop_flashing(void) {
-	UsbCommand c = {CMD_HARDWARE_RESET};
-	SendCommand(&c);
-	return 0;
+    UsbCommand c = {CMD_HARDWARE_RESET};
+    SendCommand(&c);
+    return 0;
 }
diff --git a/client/hid-flasher/flash.h b/client/hid-flasher/flash.h
index d5f47b9d4..edd742994 100644
--- a/client/hid-flasher/flash.h
+++ b/client/hid-flasher/flash.h
@@ -13,16 +13,16 @@
 #include "elf.h"
 
 typedef struct {
-	void *data;
-	uint32_t start;
-	uint32_t length;
+    void *data;
+    uint32_t start;
+    uint32_t length;
 } flash_seg_t;
 
 typedef struct {
-	const char *filename;
-	int can_write_bl;
-	int num_segs;
-	flash_seg_t *segments;
+    const char *filename;
+    int can_write_bl;
+    int num_segs;
+    flash_seg_t *segments;
 } flash_file_t;
 
 int flash_load(flash_file_t *ctx, const char *name, int can_write_bl);
diff --git a/client/hid-flasher/flasher.c b/client/hid-flasher/flasher.c
index f9cd7f0d2..4375476d6 100644
--- a/client/hid-flasher/flasher.c
+++ b/client/hid-flasher/flasher.c
@@ -15,79 +15,79 @@
 
 static void usage(char *argv0)
 {
-	fprintf(stderr, "Usage:   %s [-b] image.elf [image.elf...]\n\n", argv0);
-	fprintf(stderr, "\t-b\tEnable flashing of bootloader area (DANGEROUS)\n\n");
-	fprintf(stderr, "Example: %s path/to/osimage.elf path/to/fpgaimage.elf\n", argv0);
+    fprintf(stderr, "Usage:   %s [-b] image.elf [image.elf...]\n\n", argv0);
+    fprintf(stderr, "\t-b\tEnable flashing of bootloader area (DANGEROUS)\n\n");
+    fprintf(stderr, "Example: %s path/to/osimage.elf path/to/fpgaimage.elf\n", argv0);
 }
 
 #define MAX_FILES 4
 
 int main(int argc, char **argv)
 {
-	int can_write_bl = 0;
-	int num_files = 0;
-	int res;
-	flash_file_t files[MAX_FILES];
+    int can_write_bl = 0;
+    int num_files = 0;
+    int res;
+    flash_file_t files[MAX_FILES];
 
-	memset(files, 0, sizeof(files));
+    memset(files, 0, sizeof(files));
 
-	if (argc < 2) {
-		usage(argv[0]);
-		return -1;
-	}
+    if (argc < 2) {
+        usage(argv[0]);
+        return -1;
+    }
 
-	for (int i = 1; i < argc; i++) {
-		if (argv[i][0] == '-') {
-			if (!strcmp(argv[i], "-b")) {
-				can_write_bl = 1;
-			} else {
-				usage(argv[0]);
-				return -1;
-			}
-		} else {
-			res = flash_load(&files[num_files], argv[i], can_write_bl);
-			if (res < 0) {
-				fprintf(stderr, "Error while loading %s\n", argv[i]);
-				return -1;
-			}
-			fprintf(stderr, "\n");
-			num_files++;
-		}
-	}
+    for (int i = 1; i < argc; i++) {
+        if (argv[i][0] == '-') {
+            if (!strcmp(argv[i], "-b")) {
+                can_write_bl = 1;
+            } else {
+                usage(argv[0]);
+                return -1;
+            }
+        } else {
+            res = flash_load(&files[num_files], argv[i], can_write_bl);
+            if (res < 0) {
+                fprintf(stderr, "Error while loading %s\n", argv[i]);
+                return -1;
+            }
+            fprintf(stderr, "\n");
+            num_files++;
+        }
+    }
 
-	usb_init();
+    usb_init();
 
-	fprintf(stderr, "Waiting for Proxmark to appear on USB...");
-	while (!OpenProxmark(1)) {
-		msleep(1000);
-		fprintf(stderr, "."); fflush(stdout);
-	}
-	fprintf(stderr, " Found.\n");
+    fprintf(stderr, "Waiting for Proxmark to appear on USB...");
+    while (!OpenProxmark(1)) {
+        msleep(1000);
+        fprintf(stderr, "."); fflush(stdout);
+    }
+    fprintf(stderr, " Found.\n");
 
-	res = flash_start_flashing(can_write_bl);
-	if (res < 0)
-		return -1;
+    res = flash_start_flashing(can_write_bl);
+    if (res < 0)
+        return -1;
 
-	fprintf(stderr, "\nFlashing...\n");
+    fprintf(stderr, "\nFlashing...\n");
 
-	for (int i = 0; i < num_files; i++) {
-		res = flash_write(&files[i]);
-		if (res < 0)
-			return -1;
-		flash_free(&files[i]);
-		fprintf(stderr, "\n");
-	}
+    for (int i = 0; i < num_files; i++) {
+        res = flash_write(&files[i]);
+        if (res < 0)
+            return -1;
+        flash_free(&files[i]);
+        fprintf(stderr, "\n");
+    }
 
-	fprintf(stderr, "Resetting hardware...\n");
+    fprintf(stderr, "Resetting hardware...\n");
 
-	res = flash_stop_flashing();
-	if (res < 0)
-		return -1;
+    res = flash_stop_flashing();
+    if (res < 0)
+        return -1;
 
-	CloseProxmark();
+    CloseProxmark();
 
-	fprintf(stderr, "All done.\n\n");
-	fprintf(stderr, "Have a nice day!\n");
+    fprintf(stderr, "All done.\n\n");
+    fprintf(stderr, "Have a nice day!\n");
 
-	return 0;
+    return 0;
 }
diff --git a/client/hid-flasher/proxendian.h b/client/hid-flasher/proxendian.h
index 4f5a45194..751351c6c 100644
--- a/client/hid-flasher/proxendian.h
+++ b/client/hid-flasher/proxendian.h
@@ -34,12 +34,12 @@
 
 static inline uint16_t le16(uint16_t v)
 {
-	return (v>>8) | (v<<8);
+    return (v>>8) | (v<<8);
 }
 
 static inline uint32_t le32(uint32_t v)
 {
-	return (le16(v)<<16) | (le16(v>>16));
+    return (le16(v)<<16) | (le16(v>>16));
 }
 #endif // HOST_LITTLE_ENDIAN
 
diff --git a/client/hid-flasher/proxusb.c b/client/hid-flasher/proxusb.c
index 45100e9ed..8a2fe01e0 100644
--- a/client/hid-flasher/proxusb.c
+++ b/client/hid-flasher/proxusb.c
@@ -97,76 +97,76 @@ void ReceiveCommand(UsbCommand *c)
 
 usb_dev_handle* findProxmark(int verbose, unsigned int *iface)
 {
-	struct usb_bus *busses, *bus;
-	usb_dev_handle *handle = NULL;
-	struct prox_unit units[50];
-	int iUnit = 0;
+    struct usb_bus *busses, *bus;
+    usb_dev_handle *handle = NULL;
+    struct prox_unit units[50];
+    int iUnit = 0;
 
-	usb_find_busses();
-	usb_find_devices();
+    usb_find_busses();
+    usb_find_devices();
 
-	busses = usb_get_busses();
+    busses = usb_get_busses();
 
-	for (bus = busses; bus; bus = bus->next) {
-		struct usb_device *dev;
+    for (bus = busses; bus; bus = bus->next) {
+        struct usb_device *dev;
 
-		for (dev = bus->devices; dev; dev = dev->next) {
-			struct usb_device_descriptor *desc = &(dev->descriptor);
+        for (dev = bus->devices; dev; dev = dev->next) {
+            struct usb_device_descriptor *desc = &(dev->descriptor);
 
-			if ((desc->idProduct == 0x4b8f) && (desc->idVendor == 0x9ac4)) {
-				handle = usb_open(dev);
-				if (!handle) {
-					if (verbose)
-						fprintf(stderr, "open fabiled: %s!\n", usb_strerror());
-					//return NULL;
-					continue;
-				}
-				*iface = dev->config[0].interface[0].altsetting[0].bInterfaceNumber;
+            if ((desc->idProduct == 0x4b8f) && (desc->idVendor == 0x9ac4)) {
+                handle = usb_open(dev);
+                if (!handle) {
+                    if (verbose)
+                        fprintf(stderr, "open fabiled: %s!\n", usb_strerror());
+                    //return NULL;
+                    continue;
+                }
+                *iface = dev->config[0].interface[0].altsetting[0].bInterfaceNumber;
 
-				struct prox_unit unit = {handle, {0}};
-				usb_get_string_simple(handle, desc->iSerialNumber, unit.serial_number, sizeof(unit.serial_number));
-				units[iUnit++] = unit;
+                struct prox_unit unit = {handle, {0}};
+                usb_get_string_simple(handle, desc->iSerialNumber, unit.serial_number, sizeof(unit.serial_number));
+                units[iUnit++] = unit;
 
-				//return handle;
-			}
-		}
-	}
+                //return handle;
+            }
+        }
+    }
 
-	if (iUnit > 0) {
-		int iSelection = 0;
+    if (iUnit > 0) {
+        int iSelection = 0;
 
-		fprintf(stdout, "\nConnected units:\n");
+        fprintf(stdout, "\nConnected units:\n");
 
-		for (int i = 0; i < iUnit; i++) {
-			struct usb_device * dev = usb_device(units[i].handle);
-			fprintf(stdout, "\t%d. SN: %s [%s/%s]\n", i+1, units[i].serial_number, dev->bus->dirname, dev->filename);
-		}
-		if (iUnit > 1) {
-			while (iSelection < 1 || iSelection > iUnit) {
-				fprintf(stdout, "Which unit do you want to connect to? ");
-				int res = fscanf(stdin, "%d", &iSelection);
-				if ( res != 1 ) {
-					fprintf(stderr, "Input parse error");
-					fflush(stderr);
-					abort();
-				}
-			}
-		}
-		else {
-			iSelection = 1;
-		}
+        for (int i = 0; i < iUnit; i++) {
+            struct usb_device * dev = usb_device(units[i].handle);
+            fprintf(stdout, "\t%d. SN: %s [%s/%s]\n", i+1, units[i].serial_number, dev->bus->dirname, dev->filename);
+        }
+        if (iUnit > 1) {
+            while (iSelection < 1 || iSelection > iUnit) {
+                fprintf(stdout, "Which unit do you want to connect to? ");
+                int res = fscanf(stdin, "%d", &iSelection);
+                if ( res != 1 ) {
+                    fprintf(stderr, "Input parse error");
+                    fflush(stderr);
+                    abort();
+                }
+            }
+        }
+        else {
+            iSelection = 1;
+        }
 
-		iSelection --;
+        iSelection --;
 
-		for (int i = 0; i < iUnit; i++) {
-			if (iSelection == i) continue;
-			usb_close(units[i].handle);
-			units[i].handle = NULL;
-		}
+        for (int i = 0; i < iUnit; i++) {
+            if (iSelection == i) continue;
+            usb_close(units[i].handle);
+            units[i].handle = NULL;
+        }
 
-		return units[iSelection].handle;
-	}
-	return NULL;
+        return units[iSelection].handle;
+    }
+    return NULL;
 }
 
 usb_dev_handle* OpenProxmark(int verbose)
diff --git a/client/hid-flasher/usb_cmd.h b/client/hid-flasher/usb_cmd.h
index 002c41252..5e562c10b 100644
--- a/client/hid-flasher/usb_cmd.h
+++ b/client/hid-flasher/usb_cmd.h
@@ -24,12 +24,12 @@ typedef BYTE uint8_t;
 #endif
 
 typedef struct {
-	uint32_t	cmd;
-	uint32_t	arg[3];
-	union {
-		uint8_t		asBytes[48];
-		uint32_t	asDwords[12];
-	} d;
+    uint32_t    cmd;
+    uint32_t    arg[3];
+    union {
+        uint8_t     asBytes[48];
+        uint32_t    asDwords[12];
+    } d;
 } PACKED UsbCommand;
 
 // For the bootloader
@@ -50,19 +50,19 @@ typedef struct {
 #define CMD_BUFF_CLEAR                                                    0x0105
 #define CMD_READ_MEM                                                      0x0106
 #define CMD_VERSION                                                       0x0107
-#define CMD_STATUS														  0x0108
-#define CMD_PING														  0x0109
+#define CMD_STATUS                                                        0x0108
+#define CMD_PING                                                          0x0109
 
-#define CMD_DOWNLOAD_EML_BIGBUF											  0x0110
-#define CMD_DOWNLOADED_EML_BIGBUF										  0x0111
+#define CMD_DOWNLOAD_EML_BIGBUF                                           0x0110
+#define CMD_DOWNLOADED_EML_BIGBUF                                         0x0111
 
 // RDV40, Flash memory operations
-#define CMD_FLASHMEM_READ												  0x0120
-#define CMD_FLASHMEM_WRITE												  0x0121
-#define CMD_FLASHMEM_WIPE												  0x0122
-#define CMD_FLASHMEM_DOWNLOAD											  0x0123
-#define CMD_FLASHMEM_DOWNLOADED											  0x0124
-#define CMD_FLASHMEM_INFO												  0x0125
+#define CMD_FLASHMEM_READ                                                 0x0120
+#define CMD_FLASHMEM_WRITE                                                0x0121
+#define CMD_FLASHMEM_WIPE                                                 0x0122
+#define CMD_FLASHMEM_DOWNLOAD                                             0x0123
+#define CMD_FLASHMEM_DOWNLOADED                                           0x0124
+#define CMD_FLASHMEM_INFO                                                 0x0125
 
 // For low-frequency tags
 #define CMD_READ_TI_TYPE                                                  0x0202
@@ -72,7 +72,7 @@ typedef struct {
 #define CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K                         0x0206
 #define CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K                                 0x0207
 #define CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K                               0x0208
-#define CMD_UPLOAD_SIM_SAMPLES_125K		                                  0x0209
+#define CMD_UPLOAD_SIM_SAMPLES_125K                                       0x0209
 #define CMD_SIMULATE_TAG_125K                                             0x020A
 #define CMD_HID_DEMOD_FSK                                                 0x020B
 #define CMD_HID_SIM_TAG                                                   0x020C
@@ -87,7 +87,7 @@ typedef struct {
 #define CMD_T55XX_READ_BLOCK                                              0x0214
 #define CMD_T55XX_WRITE_BLOCK                                             0x0215
 #define CMD_T55XX_RESET_READ                                              0x0216
-#define CMD_T55XX_WAKEUP	                                              0x0224
+#define CMD_T55XX_WAKEUP                                                  0x0224
 
 #define CMD_PCF7931_READ                                                  0x0217
 #define CMD_PCF7931_WRITE                                                 0x0223
@@ -103,15 +103,15 @@ typedef struct {
 #define CMD_PSK_SIM_TAG                                                   0x0220
 #define CMD_AWID_DEMOD_FSK                                                0x0221
 #define CMD_VIKING_CLONE_TAG                                              0x0222
-#define CMD_T55XX_WAKEUP	                                              0x0224
-#define CMD_COTAG														  0x0225
-#define CMD_SET_LF_T55XX_CONFIG											  0x0226
+#define CMD_T55XX_WAKEUP                                                  0x0224
+#define CMD_COTAG                                                         0x0225
+#define CMD_SET_LF_T55XX_CONFIG                                           0x0226
 
 /* CMD_SET_ADC_MUX: ext1 is 0 for lopkd, 1 for loraw, 2 for hipkd, 3 for hiraw */
 
 // For the 13.56 MHz tags
 #define CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_15693                             0x0300
-#define CMD_READ_SRI_TAG                                               	  0x0303
+#define CMD_READ_SRI_TAG                                                  0x0303
 #define CMD_ISO_14443B_COMMAND                                            0x0305
 #define CMD_READER_ISO_15693                                              0x0310
 #define CMD_SIMTAG_ISO_15693                                              0x0311
@@ -128,12 +128,12 @@ typedef struct {
 
 // For HitagS
 #define CMD_SIMULATE_HITAG_S                                              0x0368
-#define CMD_TEST_HITAGS_TRACES											  0x0367
-#define CMD_READ_HITAG_S												  0x0373
-#define CMD_WR_HITAG_S													  0x0375
-#define CMD_EMU_HITAG_S													  0x0376
+#define CMD_TEST_HITAGS_TRACES                                            0x0367
+#define CMD_READ_HITAG_S                                                  0x0373
+#define CMD_WR_HITAG_S                                                    0x0375
+#define CMD_EMU_HITAG_S                                                   0x0376
 
-#define CMD_ANTIFUZZ_ISO_14443a											  0x0380
+#define CMD_ANTIFUZZ_ISO_14443a                                           0x0380
 #define CMD_SIMULATE_TAG_ISO_14443B                                       0x0381
 #define CMD_SNOOP_ISO_14443B                                              0x0382
 #define CMD_SNOOP_ISO_14443a                                              0x0383
@@ -147,15 +147,15 @@ typedef struct {
 #define CMD_EPA_PACE_COLLECT_NONCE                                        0x038A
 #define CMD_EPA_PACE_REPLAY                                               0x038B
 
-#define CMD_LEGIC_INFO													  0x03BC
-#define CMD_LEGIC_ESET													  0x03BD
-#define CMD_LEGIC_EGET													  0x03BE
+#define CMD_LEGIC_INFO                                                    0x03BC
+#define CMD_LEGIC_ESET                                                    0x03BD
+#define CMD_LEGIC_EGET                                                    0x03BE
 
 #define CMD_SNOOP_ICLASS                                                  0x0392
 #define CMD_SIMULATE_TAG_ICLASS                                           0x0393
 #define CMD_READER_ICLASS                                                 0x0394
 #define CMD_READER_ICLASS_REPLAY                                          0x0395
-#define CMD_ICLASS_ISO14443A_WRITE										  0x0397
+#define CMD_ICLASS_ISO14443A_WRITE                                        0x0397
 #define CMD_ICLASS_EML_MEMSET                                             0x0398
 
 // For measurements of the antenna tuning
@@ -183,7 +183,7 @@ typedef struct {
 
 #define CMD_READER_MIFARE                                                 0x0611
 #define CMD_MIFARE_NESTED                                                 0x0612
-#define	CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES                               0x0613
+#define    CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES                            0x0613
 
 
 #define CMD_MIFARE_READBL                                                 0x0620
@@ -191,8 +191,8 @@ typedef struct {
 #define CMD_MIFARE_READSC                                                 0x0621
 #define CMD_MIFAREU_READCARD                                              0x0721
 #define CMD_MIFARE_WRITEBL                                                0x0622
-#define CMD_MIFAREU_WRITEBL						                          0x0722
-#define CMD_MIFAREU_WRITEBL_COMPAT					                      0x0723
+#define CMD_MIFAREU_WRITEBL                                               0x0722
+#define CMD_MIFAREU_WRITEBL_COMPAT                                        0x0723
 
 #define CMD_MIFARE_CHKKEYS                                                0x0623
 #define CMD_MIFARE_SETMOD                                                 0x0624
@@ -213,44 +213,44 @@ typedef struct {
 #define CMD_MIFARE_DESFIRE_INFO                                           0x072d
 #define CMD_MIFARE_DESFIRE                                                0x072e
 
-#define CMD_MIFARE_COLLECT_NONCES										  0x072f
+#define CMD_MIFARE_COLLECT_NONCES                                         0x072f
 
 #define CMD_HF_SNIFFER                                                    0x0800
 
 #define CMD_UNKNOWN                                                       0xFFFF
 
 //Mifare simulation flags
-#define FLAG_INTERACTIVE		0x01
-#define FLAG_4B_UID_IN_DATA 	0x02
-#define FLAG_7B_UID_IN_DATA 	0x04
-#define FLAG_10B_UID_IN_DATA 	0x08
-#define FLAG_UID_IN_EMUL		0x10
-#define FLAG_NR_AR_ATTACK 		0x20
+#define FLAG_INTERACTIVE        0x01
+#define FLAG_4B_UID_IN_DATA     0x02
+#define FLAG_7B_UID_IN_DATA     0x04
+#define FLAG_10B_UID_IN_DATA    0x08
+#define FLAG_UID_IN_EMUL        0x10
+#define FLAG_NR_AR_ATTACK       0x20
 
 //Iclass reader flags
-#define FLAG_ICLASS_READER_ONLY_ONCE	0x01
-#define FLAG_ICLASS_READER_CC			0x02
-#define FLAG_ICLASS_READER_CSN			0x04
-#define FLAG_ICLASS_READER_CONF			0x08
-#define FLAG_ICLASS_READER_AIA			0x10
-#define FLAG_ICLASS_READER_ONE_TRY		0x20
+#define FLAG_ICLASS_READER_ONLY_ONCE    0x01
+#define FLAG_ICLASS_READER_CC           0x02
+#define FLAG_ICLASS_READER_CSN          0x04
+#define FLAG_ICLASS_READER_CONF         0x08
+#define FLAG_ICLASS_READER_AIA          0x10
+#define FLAG_ICLASS_READER_ONE_TRY      0x20
 
 
 // CMD_DEVICE_INFO response packet has flags in arg[0], flag definitions:
 /* Whether a bootloader that understands the common_area is present */
-#define DEVICE_INFO_FLAG_BOOTROM_PRESENT         	(1<<0)
+#define DEVICE_INFO_FLAG_BOOTROM_PRESENT             (1<<0)
 
 /* Whether a osimage that understands the common_area is present */
-#define DEVICE_INFO_FLAG_OSIMAGE_PRESENT         	(1<<1)
+#define DEVICE_INFO_FLAG_OSIMAGE_PRESENT             (1<<1)
 
 /* Set if the bootloader is currently executing */
-#define DEVICE_INFO_FLAG_CURRENT_MODE_BOOTROM    	(1<<2)
+#define DEVICE_INFO_FLAG_CURRENT_MODE_BOOTROM        (1<<2)
 
 /* Set if the OS is currently executing */
-#define DEVICE_INFO_FLAG_CURRENT_MODE_OS         	(1<<3)
+#define DEVICE_INFO_FLAG_CURRENT_MODE_OS             (1<<3)
 
 /* Set if this device understands the extend start flash command */
-#define DEVICE_INFO_FLAG_UNDERSTANDS_START_FLASH 	(1<<4)
+#define DEVICE_INFO_FLAG_UNDERSTANDS_START_FLASH     (1<<4)
 
 /* CMD_START_FLASH may have three arguments: start of area to flash,
    end of area to flash, optional magic.
diff --git a/client/jansson/error.c b/client/jansson/error.c
index 96b3b3fac..0d6124e6e 100644
--- a/client/jansson/error.c
+++ b/client/jansson/error.c
@@ -25,7 +25,7 @@ void jsonp_error_set_source(json_error_t *error, const char *source)
     length = strlen(source);
     if (length < JSON_ERROR_SOURCE_LENGTH) {
         strncpy(error->source, source, length);
-	} else {
+    } else {
         size_t extra = length - JSON_ERROR_SOURCE_LENGTH + 4;
         memcpy(error->source, "...", 3);
         strncpy(error->source + 3, source + extra, length - extra + 1);
diff --git a/client/jansson/jansson.h b/client/jansson/jansson.h
index 12f638bc3..774754118 100644
--- a/client/jansson/jansson.h
+++ b/client/jansson/jansson.h
@@ -141,7 +141,7 @@ void json_decrefp(json_t **json)
 {
     if(json) {
         json_decref(*json);
-	*json = NULL;
+    *json = NULL;
     }
 }
 
@@ -220,9 +220,9 @@ int json_object_iter_set_new(json_t *object, void *iter, json_t *value);
             n = json_object_iter_next(object, json_object_key_to_iter(key)))
 
 #define json_array_foreach(array, index, value) \
-	for(index = 0; \
-		index < json_array_size(array) && (value = json_array_get(array, index)); \
-		index++)
+    for(index = 0; \
+        index < json_array_size(array) && (value = json_array_get(array, index)); \
+        index++)
 
 static JSON_INLINE
 int json_object_set(json_t *object, const char *key, json_t *value)
diff --git a/client/loclass/cipher.c b/client/loclass/cipher.c
index bf921c452..ff7b08cf0 100644
--- a/client/loclass/cipher.c
+++ b/client/loclass/cipher.c
@@ -50,151 +50,151 @@
 /**
 * Definition 1 (Cipher state). A cipher state of iClass s is an element of F 40/2
 * consisting of the following four components:
-* 	1. the left register l = (l 0 . . . l 7 ) ∈ F 8/2 ;
-* 	2. the right register r = (r 0 . . . r 7 ) ∈ F 8/2 ;
-* 	3. the top register t = (t 0 . . . t 15 ) ∈ F 16/2 .
-* 	4. the bottom register b = (b 0 . . . b 7 ) ∈ F 8/2 .
+*   1. the left register l = (l 0 . . . l 7 ) ∈ F 8/2 ;
+*   2. the right register r = (r 0 . . . r 7 ) ∈ F 8/2 ;
+*   3. the top register t = (t 0 . . . t 15 ) ∈ F 16/2 .
+*   4. the bottom register b = (b 0 . . . b 7 ) ∈ F 8/2 .
 **/
 typedef struct {
-	uint8_t l;
-	uint8_t r;
-	uint8_t b;
-	uint16_t t;
+    uint8_t l;
+    uint8_t r;
+    uint8_t b;
+    uint16_t t;
 } State;
 
 /**
-*	Definition 2. The feedback function for the top register T : F 16/2 → F 2
-*	is defined as
-*	T (x 0 x 1 . . . . . . x 15 ) = x 0 ⊕ x 1 ⊕ x 5 ⊕ x 7 ⊕ x 10 ⊕ x 11 ⊕ x 14 ⊕ x 15 .
+*  Definition 2. The feedback function for the top register T : F 16/2 → F 2
+*  is defined as
+*  T (x 0 x 1 . . . . . . x 15 ) = x 0 ⊕ x 1 ⊕ x 5 ⊕ x 7 ⊕ x 10 ⊕ x 11 ⊕ x 14 ⊕ x 15 .
 **/
 bool T(State state)
 {
-	bool x0 = state.t & 0x8000;
-	bool x1 = state.t & 0x4000;
-	bool x5 = state.t & 0x0400;
-	bool x7 = state.t & 0x0100;
-	bool x10 = state.t & 0x0020;
-	bool x11 = state.t & 0x0010;
-	bool x14 = state.t & 0x0002;
-	bool x15 = state.t & 0x0001;
-	return x0 ^ x1 ^ x5 ^ x7 ^ x10 ^ x11 ^ x14 ^ x15;
+    bool x0 = state.t & 0x8000;
+    bool x1 = state.t & 0x4000;
+    bool x5 = state.t & 0x0400;
+    bool x7 = state.t & 0x0100;
+    bool x10 = state.t & 0x0020;
+    bool x11 = state.t & 0x0010;
+    bool x14 = state.t & 0x0002;
+    bool x15 = state.t & 0x0001;
+    return x0 ^ x1 ^ x5 ^ x7 ^ x10 ^ x11 ^ x14 ^ x15;
 }
 /**
-*	Similarly, the feedback function for the bottom register B : F 8/2 → F 2 is defined as
-*	B(x 0 x 1 . . . x 7 ) = x 1 ⊕ x 2 ⊕ x 3 ⊕ x 7 .
+*  Similarly, the feedback function for the bottom register B : F 8/2 → F 2 is defined as
+*  B(x 0 x 1 . . . x 7 ) = x 1 ⊕ x 2 ⊕ x 3 ⊕ x 7 .
 **/
 bool B(State state)
 {
-	bool x1 = state.b & 0x40;
-	bool x2 = state.b & 0x20;
-	bool x3 = state.b & 0x10;
-	bool x7 = state.b & 0x01;
+    bool x1 = state.b & 0x40;
+    bool x2 = state.b & 0x20;
+    bool x3 = state.b & 0x10;
+    bool x7 = state.b & 0x01;
 
-	return x1 ^ x2 ^ x3 ^ x7;
+    return x1 ^ x2 ^ x3 ^ x7;
 
 }
 
 
 /**
-*	Definition 3 (Selection function). The selection function select : F 2 × F 2 ×
-*	F 8/2 → F 3/2 is defined as select(x, y, r) = z 0 z 1 z 2 where
-*	z 0 = (r 0 ∧ r 2 ) ⊕ (r 1 ∧ r 3 ) ⊕ (r 2 ∨ r 4 )
-*	z 1 = (r 0 ∨ r 2 ) ⊕ (r 5 ∨ r 7 ) ⊕ r 1 ⊕ r 6 ⊕ x ⊕ y
-*	z 2 = (r 3 ∧ r 5 ) ⊕ (r 4 ∧ r 6 ) ⊕ r 7 ⊕ x
+*  Definition 3 (Selection function). The selection function select : F 2 × F 2 ×
+*  F 8/2 → F 3/2 is defined as select(x, y, r) = z 0 z 1 z 2 where
+*  z 0 = (r 0 ∧ r 2 ) ⊕ (r 1 ∧ r 3 ) ⊕ (r 2 ∨ r 4 )
+*  z 1 = (r 0 ∨ r 2 ) ⊕ (r 5 ∨ r 7 ) ⊕ r 1 ⊕ r 6 ⊕ x ⊕ y
+*  z 2 = (r 3 ∧ r 5 ) ⊕ (r 4 ∧ r 6 ) ⊕ r 7 ⊕ x
 **/
 uint8_t _select(bool x, bool y, uint8_t r)
 {
-	bool r0 = r >> 7 & 0x1;
-	bool r1 = r >> 6 & 0x1;
-	bool r2 = r >> 5 & 0x1;
-	bool r3 = r >> 4 & 0x1;
-	bool r4 = r >> 3 & 0x1;
-	bool r5 = r >> 2 & 0x1;
-	bool r6 = r >> 1 & 0x1;
-	bool r7 = r & 0x1;
+    bool r0 = r >> 7 & 0x1;
+    bool r1 = r >> 6 & 0x1;
+    bool r2 = r >> 5 & 0x1;
+    bool r3 = r >> 4 & 0x1;
+    bool r4 = r >> 3 & 0x1;
+    bool r5 = r >> 2 & 0x1;
+    bool r6 = r >> 1 & 0x1;
+    bool r7 = r & 0x1;
 
-	bool z0 = (r0 & r2) ^ (r1 & !r3) ^ (r2 | r4);
-	bool z1 = (r0 | r2) ^ ( r5 | r7) ^ r1 ^ r6 ^ x ^ y;
-	bool z2 = (r3 & !r5) ^ (r4 & r6 ) ^ r7 ^ x;
+    bool z0 = (r0 & r2) ^ (r1 & !r3) ^ (r2 | r4);
+    bool z1 = (r0 | r2) ^ ( r5 | r7) ^ r1 ^ r6 ^ x ^ y;
+    bool z2 = (r3 & !r5) ^ (r4 & r6 ) ^ r7 ^ x;
 
-	// The three bitz z0.. z1 are packed into a uint8_t:
-	// 00000ZZZ
-	//Return value is a uint8_t
-	uint8_t retval = 0;
-	retval |= (z0 << 2) & 4;
-	retval |= (z1 << 1) & 2;
-	retval |= z2 & 1;
+    // The three bitz z0.. z1 are packed into a uint8_t:
+    // 00000ZZZ
+    //Return value is a uint8_t
+    uint8_t retval = 0;
+    retval |= (z0 << 2) & 4;
+    retval |= (z1 << 1) & 2;
+    retval |= z2 & 1;
 
-	// Return value 0 <= retval <= 7
-	return retval;
+    // Return value 0 <= retval <= 7
+    return retval;
 }
 
 /**
-*	Definition 4 (Successor state). Let s = l, r, t, b be a cipher state, k ∈ (F 82 ) 8
-*	be a key and y ∈ F 2 be the input bit. Then, the successor cipher state s ′ =
-*	l ′ , r ′ , t ′ , b ′ is defined as
-*	t ′ := (T (t) ⊕ r 0 ⊕ r 4 )t 0 . . . t 14 l ′ := (k [select(T (t),y,r)] ⊕ b ′ ) ⊞ l ⊞ r
-*	b ′ := (B(b) ⊕ r 7 )b 0 . . . b 6 r ′ := (k [select(T (t),y,r)] ⊕ b ′ ) ⊞ l
+*  Definition 4 (Successor state). Let s = l, r, t, b be a cipher state, k ∈ (F 82 ) 8
+*  be a key and y ∈ F 2 be the input bit. Then, the successor cipher state s ′ =
+*  l ′ , r ′ , t ′ , b ′ is defined as
+*  t ′ := (T (t) ⊕ r 0 ⊕ r 4 )t 0 . . . t 14 l ′ := (k [select(T (t),y,r)] ⊕ b ′ ) ⊞ l ⊞ r
+*  b ′ := (B(b) ⊕ r 7 )b 0 . . . b 6 r ′ := (k [select(T (t),y,r)] ⊕ b ′ ) ⊞ l
 *
 * @param s - state
 * @param k - array containing 8 bytes
 **/
 State successor(uint8_t* k, State s, bool y)
 {
-	bool r0 = s.r >> 7 & 0x1;
-	bool r4 = s.r >> 3 & 0x1;
-	bool r7 = s.r & 0x1;
+    bool r0 = s.r >> 7 & 0x1;
+    bool r4 = s.r >> 3 & 0x1;
+    bool r7 = s.r & 0x1;
 
-	State successor = {0,0,0,0};
+    State successor = {0,0,0,0};
 
-	successor.t = s.t >> 1;
-	successor.t |= (T(s) ^ r0 ^ r4) << 15;
+    successor.t = s.t >> 1;
+    successor.t |= (T(s) ^ r0 ^ r4) << 15;
 
-	successor.b = s.b >> 1;
-	successor.b |= (B(s) ^ r7) << 7;
+    successor.b = s.b >> 1;
+    successor.b |= (B(s) ^ r7) << 7;
 
-	bool Tt = T(s);
+    bool Tt = T(s);
 
-	successor.l = ((k[_select(Tt,y,s.r)] ^ successor.b) + s.l+s.r ) & 0xFF;
-	successor.r = ((k[_select(Tt,y,s.r)] ^ successor.b) + s.l ) & 0xFF;
+    successor.l = ((k[_select(Tt,y,s.r)] ^ successor.b) + s.l+s.r ) & 0xFF;
+    successor.r = ((k[_select(Tt,y,s.r)] ^ successor.b) + s.l ) & 0xFF;
 
-	return successor;
+    return successor;
 }
 /**
-*	We define the successor function suc which takes a key k ∈ (F 82 ) 8 , a state s and
-*	an input y ∈ F 2 and outputs the successor state s ′ . We overload the function suc
-*	to multiple bit input x ∈ F n 2 which we define as
+*  We define the successor function suc which takes a key k ∈ (F 82 ) 8 , a state s and
+*  an input y ∈ F 2 and outputs the successor state s ′ . We overload the function suc
+*  to multiple bit input x ∈ F n 2 which we define as
 * @param k - array containing 8 bytes
 **/
 State suc(uint8_t* k,State s, BitstreamIn *bitstream)
 {
-	if(bitsLeft(bitstream) == 0)
-	{
-		return s;
-	}
-	bool lastbit = tailBit(bitstream);
-	return successor(k,suc(k,s,bitstream), lastbit);
+    if(bitsLeft(bitstream) == 0)
+    {
+        return s;
+    }
+    bool lastbit = tailBit(bitstream);
+    return successor(k,suc(k,s,bitstream), lastbit);
 }
 
 /**
-*	Definition 5 (Output). Define the function output which takes an internal
-*	state s =< l, r, t, b > and returns the bit r 5 . We also define the function output
-*	on multiple bits input which takes a key k, a state s and an input x ∈ F n 2 as
-*	output(k, s, ǫ) = ǫ
-*	output(k, s, x 0 . . . x n ) = output(s) · output(k, s ′ , x 1 . . . x n )
-*	where s ′ = suc(k, s, x 0 ).
+*  Definition 5 (Output). Define the function output which takes an internal
+*  state s =< l, r, t, b > and returns the bit r 5 . We also define the function output
+*  on multiple bits input which takes a key k, a state s and an input x ∈ F n 2 as
+*  output(k, s, ǫ) = ǫ
+*  output(k, s, x 0 . . . x n ) = output(s) · output(k, s ′ , x 1 . . . x n )
+*  where s ′ = suc(k, s, x 0 ).
 **/
 void output(uint8_t* k,State s, BitstreamIn* in,  BitstreamOut* out)
 {
-	if(bitsLeft(in) == 0)
-	{
-		return;
-	}
-	pushBit(out,(s.r >> 2) & 1);
-	//Remove first bit
-	uint8_t x0 = headBit(in);
-	State ss = successor(k,s,x0);
-	output(k,ss,in, out);
+    if(bitsLeft(in) == 0)
+    {
+        return;
+    }
+    pushBit(out,(s.r >> 2) & 1);
+    //Remove first bit
+    uint8_t x0 = headBit(in);
+    State ss = successor(k,s,x0);
+    output(k,ss,in, out);
 }
 
 /**
@@ -204,85 +204,85 @@ void output(uint8_t* k,State s, BitstreamIn* in,  BitstreamOut* out)
 
 State init(uint8_t* k)
 {
-	State s = {
-	((k[0] ^ 0x4c) + 0xEC) & 0xFF,// l
-	((k[0] ^ 0x4c) + 0x21) & 0xFF,// r
-	0x4c, // b
-	0xE012 // t
-	};
-	return s;
+    State s = {
+    ((k[0] ^ 0x4c) + 0xEC) & 0xFF,// l
+    ((k[0] ^ 0x4c) + 0x21) & 0xFF,// r
+    0x4c, // b
+    0xE012 // t
+    };
+    return s;
 }
 void MAC(uint8_t* k, BitstreamIn input, BitstreamOut out)
 {
-	uint8_t zeroes_32[] = {0,0,0,0};
-	BitstreamIn input_32_zeroes = {zeroes_32,sizeof(zeroes_32)*8,0};
-	State initState = suc(k,init(k),&input);
-	output(k,initState,&input_32_zeroes,&out);
+    uint8_t zeroes_32[] = {0,0,0,0};
+    BitstreamIn input_32_zeroes = {zeroes_32,sizeof(zeroes_32)*8,0};
+    State initState = suc(k,init(k),&input);
+    output(k,initState,&input_32_zeroes,&out);
 }
 
 void doMAC(uint8_t *cc_nr_p, uint8_t *div_key_p, uint8_t mac[4])
 {
-	uint8_t cc_nr[13] = { 0 };
+    uint8_t cc_nr[13] = { 0 };
     uint8_t div_key[8];
-	//cc_nr=(uint8_t*) calloc(length+1, sizeof(uint8_t));
+    //cc_nr=(uint8_t*) calloc(length+1, sizeof(uint8_t));
 
-	memcpy(cc_nr, cc_nr_p, 12);
+    memcpy(cc_nr, cc_nr_p, 12);
     memcpy(div_key, div_key_p, 8);
 
-	reverse_arraybytes(cc_nr, 12);
-	BitstreamIn bitstream = {cc_nr, 12 * 8, 0};
-	uint8_t dest []= {0,0,0,0,0,0,0,0};
-	BitstreamOut out = { dest, sizeof(dest)*8, 0 };
-	MAC(div_key,bitstream, out);
-	//The output MAC must also be reversed
-	reverse_arraybytes(dest, sizeof(dest));
-	memcpy(mac, dest, 4);
-	//free(cc_nr);
+    reverse_arraybytes(cc_nr, 12);
+    BitstreamIn bitstream = {cc_nr, 12 * 8, 0};
+    uint8_t dest []= {0,0,0,0,0,0,0,0};
+    BitstreamOut out = { dest, sizeof(dest)*8, 0 };
+    MAC(div_key,bitstream, out);
+    //The output MAC must also be reversed
+    reverse_arraybytes(dest, sizeof(dest));
+    memcpy(mac, dest, 4);
+    //free(cc_nr);
     return;
 }
 void doMAC_N(uint8_t *address_data_p, uint8_t address_data_size, uint8_t *div_key_p, uint8_t mac[4])
 {
-	uint8_t *address_data;
-	uint8_t div_key[8];
-	address_data = (uint8_t*) calloc(address_data_size, sizeof(uint8_t));
+    uint8_t *address_data;
+    uint8_t div_key[8];
+    address_data = (uint8_t*) calloc(address_data_size, sizeof(uint8_t));
 
-	memcpy(address_data, address_data_p, address_data_size);
-	memcpy(div_key, div_key_p, 8);
+    memcpy(address_data, address_data_p, address_data_size);
+    memcpy(div_key, div_key_p, 8);
 
-	reverse_arraybytes(address_data, address_data_size);
-	BitstreamIn bitstream = {address_data, address_data_size * 8, 0};
-	uint8_t dest []= {0,0,0,0,0,0,0,0};
-	BitstreamOut out = { dest, sizeof(dest)*8, 0 };
-	MAC(div_key, bitstream, out);
-	//The output MAC must also be reversed
-	reverse_arraybytes(dest, sizeof(dest));
-	memcpy(mac, dest, 4);
-	free(address_data);
-	return;
+    reverse_arraybytes(address_data, address_data_size);
+    BitstreamIn bitstream = {address_data, address_data_size * 8, 0};
+    uint8_t dest []= {0,0,0,0,0,0,0,0};
+    BitstreamOut out = { dest, sizeof(dest)*8, 0 };
+    MAC(div_key, bitstream, out);
+    //The output MAC must also be reversed
+    reverse_arraybytes(dest, sizeof(dest));
+    memcpy(mac, dest, 4);
+    free(address_data);
+    return;
 }
 
 #ifndef ON_DEVICE
 int testMAC()
 {
-	PrintAndLogDevice(SUCCESS, "Testing MAC calculation...");
+    PrintAndLogDevice(SUCCESS, "Testing MAC calculation...");
 
-	//From the "dismantling.IClass" paper:
-	uint8_t cc_nr[] = {0xFE,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0,0,0,0};
-	//From the paper
-	uint8_t div_key[8] = {0xE0,0x33,0xCA,0x41,0x9A,0xEE,0x43,0xF9};
-	uint8_t correct_MAC[4] = {0x1d,0x49,0xC9,0xDA};
+    //From the "dismantling.IClass" paper:
+    uint8_t cc_nr[] = {0xFE,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0,0,0,0};
+    //From the paper
+    uint8_t div_key[8] = {0xE0,0x33,0xCA,0x41,0x9A,0xEE,0x43,0xF9};
+    uint8_t correct_MAC[4] = {0x1d,0x49,0xC9,0xDA};
 
-	uint8_t calculated_mac[4] = {0};
-	doMAC(cc_nr,div_key, calculated_mac);
+    uint8_t calculated_mac[4] = {0};
+    doMAC(cc_nr,div_key, calculated_mac);
 
-	if (memcmp(calculated_mac, correct_MAC,4) == 0) {
-		PrintAndLogDevice(SUCCESS, "MAC calculation OK!");
-	} else {
-		PrintAndLogDevice(FAILED, "FAILED: MAC calculation failed:");
-		printarr("    Calculated_MAC", calculated_mac, 4);
-		printarr("    Correct_MAC   ", correct_MAC, 4);
-		return 1;
-	}
-	return 0;
+    if (memcmp(calculated_mac, correct_MAC,4) == 0) {
+        PrintAndLogDevice(SUCCESS, "MAC calculation OK!");
+    } else {
+        PrintAndLogDevice(FAILED, "FAILED: MAC calculation failed:");
+        printarr("    Calculated_MAC", calculated_mac, 4);
+        printarr("    Correct_MAC   ", correct_MAC, 4);
+        return 1;
+    }
+    return 0;
 }
 #endif
diff --git a/client/loclass/cipherutils.c b/client/loclass/cipherutils.c
index 43b892fd8..e3ed1cdbc 100644
--- a/client/loclass/cipherutils.c
+++ b/client/loclass/cipherutils.c
@@ -48,9 +48,9 @@
  */
 bool headBit( BitstreamIn *stream)
 {
-	int bytepos = stream->position >> 3; // divide by 8
-	int bitpos = (stream->position++) & 7; // mask out 00000111
-	return (*(stream->buffer + bytepos) >> (7-bitpos)) & 1;
+    int bytepos = stream->position >> 3; // divide by 8
+    int bitpos = (stream->position++) & 7; // mask out 00000111
+    return (*(stream->buffer + bytepos) >> (7-bitpos)) & 1;
 }
 /**
  * @brief Return and remove the last bit (xn) in the stream: <x0 x1 x2 ... xn>
@@ -59,11 +59,11 @@ bool headBit( BitstreamIn *stream)
  */
 bool tailBit( BitstreamIn *stream)
 {
-	int bitpos = stream->numbits -1 - (stream->position++);
+    int bitpos = stream->numbits -1 - (stream->position++);
 
-	int bytepos= bitpos >> 3;
-	bitpos &= 7;
-	return (*(stream->buffer + bytepos) >> (7-bitpos)) & 1;
+    int bytepos= bitpos >> 3;
+    bitpos &= 7;
+    return (*(stream->buffer + bytepos) >> (7-bitpos)) & 1;
 }
 /**
  * @brief Pushes bit onto the stream
@@ -72,11 +72,11 @@ bool tailBit( BitstreamIn *stream)
  */
 void pushBit( BitstreamOut* stream, bool bit)
 {
-	int bytepos = stream->position >> 3; // divide by 8
-	int bitpos = stream->position & 7;
-	*(stream->buffer+bytepos) |= (bit & 1) <<  (7 - bitpos);
-	stream->position++;
-	stream->numbits++;
+    int bytepos = stream->position >> 3; // divide by 8
+    int bitpos = stream->position & 7;
+    *(stream->buffer+bytepos) |= (bit & 1) <<  (7 - bitpos);
+    stream->position++;
+    stream->numbits++;
 }
 
 /**
@@ -87,12 +87,12 @@ void pushBit( BitstreamOut* stream, bool bit)
  */
 void push6bits( BitstreamOut* stream, uint8_t bits)
 {
-	pushBit(stream, bits & 0x20);
-	pushBit(stream, bits & 0x10);
-	pushBit(stream, bits & 0x08);
-	pushBit(stream, bits & 0x04);
-	pushBit(stream, bits & 0x02);
-	pushBit(stream, bits & 0x01);
+    pushBit(stream, bits & 0x20);
+    pushBit(stream, bits & 0x10);
+    pushBit(stream, bits & 0x08);
+    pushBit(stream, bits & 0x04);
+    pushBit(stream, bits & 0x02);
+    pushBit(stream, bits & 0x01);
 }
 
 /**
@@ -102,7 +102,7 @@ void push6bits( BitstreamOut* stream, uint8_t bits)
  */
 int bitsLeft( BitstreamIn *stream)
 {
-	return stream->numbits - stream->position;
+    return stream->numbits - stream->position;
 }
 /**
  * @brief numBits
@@ -111,88 +111,88 @@ int bitsLeft( BitstreamIn *stream)
  */
 int numBits(BitstreamOut *stream)
 {
-	return stream->numbits;
+    return stream->numbits;
 }
 
 void x_num_to_bytes(uint64_t n, size_t len, uint8_t* dest)
 {
-	while (len--) {
-		dest[len] = (uint8_t) n;
-		n >>= 8;
-	}
+    while (len--) {
+        dest[len] = (uint8_t) n;
+        n >>= 8;
+    }
 }
 
 uint64_t x_bytes_to_num(uint8_t* src, size_t len)
 {
-	uint64_t num = 0;
-	while (len--)
-	{
-		num = (num << 8) | (*src);
-		src++;
-	}
-	return num;
+    uint64_t num = 0;
+    while (len--)
+    {
+        num = (num << 8) | (*src);
+        src++;
+    }
+    return num;
 }
 uint8_t reversebytes(uint8_t b) {
-	b = (b & 0xF0) >> 4 | (b & 0x0F) << 4;
-	b = (b & 0xCC) >> 2 | (b & 0x33) << 2;
-	b = (b & 0xAA) >> 1 | (b & 0x55) << 1;
+    b = (b & 0xF0) >> 4 | (b & 0x0F) << 4;
+    b = (b & 0xCC) >> 2 | (b & 0x33) << 2;
+    b = (b & 0xAA) >> 1 | (b & 0x55) << 1;
    return b;
 }
 void reverse_arraybytes(uint8_t* arr, size_t len)
 {
-	uint8_t i;
-	for( i =0; i< len ; i++)
-	{
-		arr[i] = reversebytes(arr[i]);
-	}
+    uint8_t i;
+    for( i =0; i< len ; i++)
+    {
+        arr[i] = reversebytes(arr[i]);
+    }
 }
 void reverse_arraycopy(uint8_t* arr, uint8_t* dest, size_t len)
 {
-	uint8_t i;
-	for( i =0; i< len ; i++)
-	{
-		dest[i] = reversebytes(arr[i]);
-	}
+    uint8_t i;
+    for( i =0; i< len ; i++)
+    {
+        dest[i] = reversebytes(arr[i]);
+    }
 }
 
 void printarr(char * name, uint8_t* arr, int len) {
-	int cx, i;
-	size_t outsize = 40 + strlen(name) + len*5;
-	char* output = calloc(outsize, sizeof(char));
-	cx = snprintf(output,outsize, "uint8_t %s[] = {", name);
-	for (i=0; i < len; i++) {
-		cx += snprintf(output+cx,outsize-cx,"0x%02x,",*(arr+i));//5 bytes per byte
-	}
-	cx += snprintf(output+cx,outsize-cx,"};");
-	PrintAndLogDevice(NORMAL, output);
-	free(output);
+    int cx, i;
+    size_t outsize = 40 + strlen(name) + len*5;
+    char* output = calloc(outsize, sizeof(char));
+    cx = snprintf(output,outsize, "uint8_t %s[] = {", name);
+    for (i=0; i < len; i++) {
+        cx += snprintf(output+cx,outsize-cx,"0x%02x,",*(arr+i));//5 bytes per byte
+    }
+    cx += snprintf(output+cx,outsize-cx,"};");
+    PrintAndLogDevice(NORMAL, output);
+    free(output);
 }
 
 void printvar(char * name, uint8_t* arr, int len) {
-	int cx, i;
-	size_t outsize = 40 + strlen(name) + len*2;
-	char* output = calloc(outsize, sizeof(char));
-	cx = snprintf(output,outsize,"%s = ", name);
-	for (i=0; i < len; i++) {
-		cx += snprintf(output+cx,outsize-cx,"%02x",*(arr+i));//2 bytes per byte
-	}
+    int cx, i;
+    size_t outsize = 40 + strlen(name) + len*2;
+    char* output = calloc(outsize, sizeof(char));
+    cx = snprintf(output,outsize,"%s = ", name);
+    for (i=0; i < len; i++) {
+        cx += snprintf(output+cx,outsize-cx,"%02x",*(arr+i));//2 bytes per byte
+    }
 
-	PrintAndLogDevice(NORMAL, output);
-	free(output);
+    PrintAndLogDevice(NORMAL, output);
+    free(output);
 }
 
 void printarr_human_readable(char * title, uint8_t* arr, int len) {
-	int cx, i;
-	size_t outsize = 100 + strlen(title) + len*4;
-	char* output = calloc(outsize, sizeof(char));
-	cx = snprintf(output,outsize,  "\n\t%s\n", title);
-	for (i=0;  i < len; i++) {
-		if (i % 16 == 0)
-			cx += snprintf(output+cx,outsize-cx,"\n%02x| ", i );
-		cx += snprintf(output+cx,outsize-cx, "%02x ",*(arr+i));
-	}
-	PrintAndLogDevice(NORMAL, output);
-	free(output);
+    int cx, i;
+    size_t outsize = 100 + strlen(title) + len*4;
+    char* output = calloc(outsize, sizeof(char));
+    cx = snprintf(output,outsize,  "\n\t%s\n", title);
+    for (i=0;  i < len; i++) {
+        if (i % 16 == 0)
+            cx += snprintf(output+cx,outsize-cx,"\n%02x| ", i );
+        cx += snprintf(output+cx,outsize-cx, "%02x ",*(arr+i));
+    }
+    PrintAndLogDevice(NORMAL, output);
+    free(output);
 }
 
 //-----------------------------
@@ -202,69 +202,69 @@ void printarr_human_readable(char * title, uint8_t* arr, int len) {
 #ifndef ON_DEVICE
 int testBitStream()
 {
-	uint8_t input [] = {0xDE,0xAD,0xBE,0xEF,0xDE,0xAD,0xBE,0xEF};
-	uint8_t output [] = {0,0,0,0,0,0,0,0};
-	BitstreamIn in = { input, sizeof(input) * 8,0};
-	BitstreamOut out = { output, 0,0}
-					  ;
-	while (bitsLeft(&in) > 0) {
-		pushBit(&out, headBit(&in));
-		//printf("Bits left: %d\n", bitsLeft(&in));
-		//printf("Bits out: %d\n", numBits(&out));
-	}
+    uint8_t input [] = {0xDE,0xAD,0xBE,0xEF,0xDE,0xAD,0xBE,0xEF};
+    uint8_t output [] = {0,0,0,0,0,0,0,0};
+    BitstreamIn in = { input, sizeof(input) * 8,0};
+    BitstreamOut out = { output, 0,0}
+                      ;
+    while (bitsLeft(&in) > 0) {
+        pushBit(&out, headBit(&in));
+        //printf("Bits left: %d\n", bitsLeft(&in));
+        //printf("Bits out: %d\n", numBits(&out));
+    }
 
-	if(memcmp(input, output, sizeof(input)) == 0) {
-		PrintAndLogDevice(SUCCESS, "    Bitstream test 1 ok");
-	} else {
-		PrintAndLogDevice(FAILED, "    Bitstream test 1 failed");
-		uint8_t i;
-		for(i = 0 ; i < sizeof(input) ; i++)
-		{
-			PrintAndLogDevice(NORMAL, "    IN %02x, OUT %02x", input[i], output[i]);
-		}
-		return 1;
-	}
-	return 0;
+    if(memcmp(input, output, sizeof(input)) == 0) {
+        PrintAndLogDevice(SUCCESS, "    Bitstream test 1 ok");
+    } else {
+        PrintAndLogDevice(FAILED, "    Bitstream test 1 failed");
+        uint8_t i;
+        for(i = 0 ; i < sizeof(input) ; i++)
+        {
+            PrintAndLogDevice(NORMAL, "    IN %02x, OUT %02x", input[i], output[i]);
+        }
+        return 1;
+    }
+    return 0;
 }
 
 int testReversedBitstream()
 {
-	uint8_t input [] = {0xDE,0xAD,0xBE,0xEF,0xDE,0xAD,0xBE,0xEF};
-	uint8_t reverse [] = {0,0,0,0,0,0,0,0};
-	uint8_t output [] = {0,0,0,0,0,0,0,0};
-	BitstreamIn in = { input, sizeof(input) * 8,0};
-	BitstreamOut out = { output, 0,0};
-	BitstreamIn reversed_in = { reverse, sizeof(input)*8,0};
-	BitstreamOut reversed_out = { reverse,0 ,0};
+    uint8_t input [] = {0xDE,0xAD,0xBE,0xEF,0xDE,0xAD,0xBE,0xEF};
+    uint8_t reverse [] = {0,0,0,0,0,0,0,0};
+    uint8_t output [] = {0,0,0,0,0,0,0,0};
+    BitstreamIn in = { input, sizeof(input) * 8,0};
+    BitstreamOut out = { output, 0,0};
+    BitstreamIn reversed_in = { reverse, sizeof(input)*8,0};
+    BitstreamOut reversed_out = { reverse,0 ,0};
 
-	while (bitsLeft(&in) > 0) {
-		pushBit(&reversed_out, tailBit(&in));
-	}
+    while (bitsLeft(&in) > 0) {
+        pushBit(&reversed_out, tailBit(&in));
+    }
 
-	while (bitsLeft(&reversed_in) > 0) {
-		pushBit(&out, tailBit(&reversed_in));
-	}
+    while (bitsLeft(&reversed_in) > 0) {
+        pushBit(&out, tailBit(&reversed_in));
+    }
 
-	if (memcmp(input, output, sizeof(input)) == 0) {
-		PrintAndLogDevice(SUCCESS, "    Bitstream test 2 ok");
-	} else {
-		PrintAndLogDevice(FAILED, "    Bitstream test 2 failed");
-		uint8_t i;
-		for (i = 0 ; i < sizeof(input) ; i++) {
-			PrintAndLogDevice(NORMAL, "    IN %02x, MIDDLE: %02x, OUT %02x", input[i],reverse[i], output[i]);
-		}
-		return 1;
-	}
-	return 0;
+    if (memcmp(input, output, sizeof(input)) == 0) {
+        PrintAndLogDevice(SUCCESS, "    Bitstream test 2 ok");
+    } else {
+        PrintAndLogDevice(FAILED, "    Bitstream test 2 failed");
+        uint8_t i;
+        for (i = 0 ; i < sizeof(input) ; i++) {
+            PrintAndLogDevice(NORMAL, "    IN %02x, MIDDLE: %02x, OUT %02x", input[i],reverse[i], output[i]);
+        }
+        return 1;
+    }
+    return 0;
 }
 
 
 int testCipherUtils(void)
 {
-	PrintAndLogDevice(INFO, "Testing some internals...");
-	int retval = 0;
-	retval |= testBitStream();
-	retval |= testReversedBitstream();
-	return retval;
+    PrintAndLogDevice(INFO, "Testing some internals...");
+    int retval = 0;
+    retval |= testBitStream();
+    retval |= testReversedBitstream();
+    return retval;
 }
 #endif
diff --git a/client/loclass/cipherutils.h b/client/loclass/cipherutils.h
index bc40c560b..87a797d1a 100644
--- a/client/loclass/cipherutils.h
+++ b/client/loclass/cipherutils.h
@@ -43,15 +43,15 @@
 #include <stdlib.h>
 
 typedef struct {
-	uint8_t * buffer;
-	uint8_t numbits;
-	uint8_t position;
+    uint8_t * buffer;
+    uint8_t numbits;
+    uint8_t position;
 } BitstreamIn;
 
 typedef struct {
-	uint8_t * buffer;
-	uint8_t numbits;
-	uint8_t position;
+    uint8_t * buffer;
+    uint8_t numbits;
+    uint8_t position;
 } BitstreamOut;
 
 bool headBit( BitstreamIn *stream);
diff --git a/client/loclass/elite_crack.c b/client/loclass/elite_crack.c
index fa370a940..b4726fc71 100644
--- a/client/loclass/elite_crack.c
+++ b/client/loclass/elite_crack.c
@@ -50,37 +50,37 @@
 
 /**
  * @brief Permutes a key from standard NIST format to Iclass specific format
- *	from http://www.proxmark.org/forum/viewtopic.php?pid=11220#p11220
+ *  from http://www.proxmark.org/forum/viewtopic.php?pid=11220#p11220
  *
- *	If you permute [6c 8d 44 f9 2a 2d 01 bf]  you get  [8a 0d b9 88 bb a7 90 ea]  as shown below.
+ *  If you permute [6c 8d 44 f9 2a 2d 01 bf]  you get  [8a 0d b9 88 bb a7 90 ea]  as shown below.
  *
- * 	1 0 1 1 1 1 1 1  bf
- *	0 0 0 0 0 0 0 1  01
- *	0 0 1 0 1 1 0 1  2d
- *	0 0 1 0 1 0 1 0  2a
- *	1 1 1 1 1 0 0 1  f9
- *	0 1 0 0 0 1 0 0  44
- *	1 0 0 0 1 1 0 1  8d
- *	0 1 1 0 1 1 0 0  6c
+ *  1 0 1 1 1 1 1 1  bf
+ *  0 0 0 0 0 0 0 1  01
+ *  0 0 1 0 1 1 0 1  2d
+ *  0 0 1 0 1 0 1 0  2a
+ *  1 1 1 1 1 0 0 1  f9
+ *  0 1 0 0 0 1 0 0  44
+ *  1 0 0 0 1 1 0 1  8d
+ *  0 1 1 0 1 1 0 0  6c
  *
- *	8 0 b 8 b a 9 e
- *	a d 9 8 b 7 0 a
+ *  8 0 b 8 b a 9 e
+ *  a d 9 8 b 7 0 a
  *
  * @param key
  * @param dest
  */
 void permutekey(uint8_t key[8], uint8_t dest[8]) {
-	int i;
-	for(i = 0 ; i < 8 ; i++) {
-		dest[i] =	(((key[7] & (0x80 >> i)) >> (7-i)) << 7) |
-					(((key[6] & (0x80 >> i)) >> (7-i)) << 6) |
-					(((key[5] & (0x80 >> i)) >> (7-i)) << 5) |
-					(((key[4] & (0x80 >> i)) >> (7-i)) << 4) |
-					(((key[3] & (0x80 >> i)) >> (7-i)) << 3) |
-					(((key[2] & (0x80 >> i)) >> (7-i)) << 2) |
-					(((key[1] & (0x80 >> i)) >> (7-i)) << 1) |
-					(((key[0] & (0x80 >> i)) >> (7-i)) << 0);
-	}
+    int i;
+    for(i = 0 ; i < 8 ; i++) {
+        dest[i] =   (((key[7] & (0x80 >> i)) >> (7-i)) << 7) |
+                    (((key[6] & (0x80 >> i)) >> (7-i)) << 6) |
+                    (((key[5] & (0x80 >> i)) >> (7-i)) << 5) |
+                    (((key[4] & (0x80 >> i)) >> (7-i)) << 4) |
+                    (((key[3] & (0x80 >> i)) >> (7-i)) << 3) |
+                    (((key[2] & (0x80 >> i)) >> (7-i)) << 2) |
+                    (((key[1] & (0x80 >> i)) >> (7-i)) << 1) |
+                    (((key[0] & (0x80 >> i)) >> (7-i)) << 0);
+    }
 }
 /**
  * Permutes  a key from iclass specific format to NIST format
@@ -89,17 +89,17 @@ void permutekey(uint8_t key[8], uint8_t dest[8]) {
  * @param dest
  */
 void permutekey_rev(uint8_t key[8], uint8_t dest[8]) {
-	int i;
-	for(i = 0 ; i < 8 ; i++) {
-		dest[7-i] =	(((key[0] & (0x80 >> i)) >> (7-i)) << 7) |
-					(((key[1] & (0x80 >> i)) >> (7-i)) << 6) |
-					(((key[2] & (0x80 >> i)) >> (7-i)) << 5) |
-					(((key[3] & (0x80 >> i)) >> (7-i)) << 4) |
-					(((key[4] & (0x80 >> i)) >> (7-i)) << 3) |
-					(((key[5] & (0x80 >> i)) >> (7-i)) << 2) |
-					(((key[6] & (0x80 >> i)) >> (7-i)) << 1) |
-					(((key[7] & (0x80 >> i)) >> (7-i)) << 0);
-	}
+    int i;
+    for(i = 0 ; i < 8 ; i++) {
+        dest[7-i] = (((key[0] & (0x80 >> i)) >> (7-i)) << 7) |
+                    (((key[1] & (0x80 >> i)) >> (7-i)) << 6) |
+                    (((key[2] & (0x80 >> i)) >> (7-i)) << 5) |
+                    (((key[3] & (0x80 >> i)) >> (7-i)) << 4) |
+                    (((key[4] & (0x80 >> i)) >> (7-i)) << 3) |
+                    (((key[5] & (0x80 >> i)) >> (7-i)) << 2) |
+                    (((key[6] & (0x80 >> i)) >> (7-i)) << 1) |
+                    (((key[7] & (0x80 >> i)) >> (7-i)) << 0);
+    }
 }
 
 /**
@@ -109,7 +109,7 @@ void permutekey_rev(uint8_t key[8], uint8_t dest[8]) {
  * @return
  */
 inline uint8_t rr(uint8_t val) {
-	return val >> 1 | (( val & 1) << 7);
+    return val >> 1 | (( val & 1) << 7);
 }
 
 /**
@@ -129,7 +129,7 @@ inline uint8_t rl(uint8_t val) {
  * @return
  */
 inline uint8_t swap(uint8_t val) {
-	return ((val >> 4) & 0xFF) | ((val &0xFF) << 4);
+    return ((val >> 4) & 0xFF) | ((val &0xFF) << 4);
 }
 
 /**
@@ -139,23 +139,23 @@ inline uint8_t swap(uint8_t val) {
  * @param k output
  */
 void hash1(uint8_t csn[] , uint8_t k[]) {
-	k[0] = csn[0] ^ csn[1] ^ csn[2] ^ csn[3] ^ csn[4] ^ csn[5] ^ csn[6] ^ csn[7];
-	k[1] = csn[0] + csn[1] + csn[2] + csn[3] + csn[4] + csn[5] + csn[6] + csn[7];
-	k[2] = rr(swap( csn[2] + k[1] ));
-	k[3] = rl(swap( csn[3] + k[0] ));
-	k[4] = ~rr( csn[4] + k[2] ) + 1;
-	k[5] = ~rl( csn[5] + k[3] ) + 1;
-	k[6] = rr( csn[6] + (k[4] ^ 0x3c) );
-	k[7] = rl( csn[7] + (k[5] ^ 0xc3) );
+    k[0] = csn[0] ^ csn[1] ^ csn[2] ^ csn[3] ^ csn[4] ^ csn[5] ^ csn[6] ^ csn[7];
+    k[1] = csn[0] + csn[1] + csn[2] + csn[3] + csn[4] + csn[5] + csn[6] + csn[7];
+    k[2] = rr(swap( csn[2] + k[1] ));
+    k[3] = rl(swap( csn[3] + k[0] ));
+    k[4] = ~rr( csn[4] + k[2] ) + 1;
+    k[5] = ~rl( csn[5] + k[3] ) + 1;
+    k[6] = rr( csn[6] + (k[4] ^ 0x3c) );
+    k[7] = rl( csn[7] + (k[5] ^ 0xc3) );
 
-	k[7] &= 0x7F;
-	k[6] &= 0x7F;
-	k[5] &= 0x7F;
-	k[4] &= 0x7F;
-	k[3] &= 0x7F;
-	k[2] &= 0x7F;
-	k[1] &= 0x7F;
-	k[0] &= 0x7F;
+    k[7] &= 0x7F;
+    k[6] &= 0x7F;
+    k[5] &= 0x7F;
+    k[4] &= 0x7F;
+    k[3] &= 0x7F;
+    k[2] &= 0x7F;
+    k[1] &= 0x7F;
+    k[0] &= 0x7F;
 }
 /**
 Definition 14. Define the rotate key function rk : (F 82 ) 8 × N → (F 82 ) 8 as
@@ -168,7 +168,7 @@ void rk(uint8_t *key, uint8_t n, uint8_t *outp_key) {
     while (n-- > 0) {
         for (j=0; j < 8 ; j++)
             outp_key[j] = rl(outp_key[j]);
-	}
+    }
     return;
 }
 
@@ -253,12 +253,12 @@ void hash2(uint8_t *key64, uint8_t *outp_keytable) {
 /**
  * @brief Reads data from the iclass-reader-attack dump file.
  * @param dump, data from a iclass reader attack dump.  The format of the dumpdata is expected to be as follows:
- *		<8 byte CSN><8 byte CC><4 byte NR><4 byte MAC><8 byte HASH1><1 byte NUM_BYTES_TO_RECOVER><3 bytes BYTES_TO_RECOVER>
- *		.. N times...
+ *    <8 byte CSN><8 byte CC><4 byte NR><4 byte MAC><8 byte HASH1><1 byte NUM_BYTES_TO_RECOVER><3 bytes BYTES_TO_RECOVER>
+ *    .. N times...
  *
- *	So the first attack, with 3 bytes to recover would be : ... 03000145
- *	And a later attack, with 1 byte to recover (byte 0x5)would be : ...01050000
- *	And an attack, with 2 bytes to recover (byte 0x5 and byte 0x07 )would be : ...02050700
+ *  So the first attack, with 3 bytes to recover would be : ... 03000145
+ *  And a later attack, with 1 byte to recover (byte 0x5)would be : ...01050000
+ *  And an attack, with 2 bytes to recover (byte 0x5 and byte 0x07 )would be : ...02050700
  *
  * @param cc_nr an array to store cc_nr into (12 bytes)
  * @param csn an arracy ot store CSN into (8 bytes)
@@ -267,15 +267,15 @@ void hash2(uint8_t *key64, uint8_t *outp_keytable) {
  * @return
  */
 int _readFromDump(uint8_t dump[], dumpdata* item, uint8_t i) {
-	size_t itemsize = sizeof(dumpdata);
-	memcpy(item, dump+i*itemsize, itemsize);
+    size_t itemsize = sizeof(dumpdata);
+    memcpy(item, dump+i*itemsize, itemsize);
 
-	if (true) {
-		printvar("csn", item->csn, sizeof(item->csn));
-		printvar("cc_nr", item->cc_nr, sizeof(item->cc_nr));
-		printvar("mac", item->mac, sizeof(item->mac));
-	}
-	return 0;
+    if (true) {
+        printvar("csn", item->csn, sizeof(item->csn));
+        printvar("cc_nr", item->cc_nr, sizeof(item->cc_nr));
+        printvar("mac", item->mac, sizeof(item->mac));
+    }
+    return 0;
 }
 
 //static uint32_t startvalue = 0;
@@ -291,193 +291,193 @@ int _readFromDump(uint8_t dump[], dumpdata* item, uint8_t i) {
  * @return
  */
 int bruteforceItem(dumpdata item, uint16_t keytable[]) {
-	int errors = 0;
-	int found = false;
-	uint8_t key_sel_p[8] = {0};
-	uint8_t div_key[8] = {0};
-	uint8_t key_sel[8] = {0};
-	uint8_t calculated_MAC[4] = {0};
+    int errors = 0;
+    int found = false;
+    uint8_t key_sel_p[8] = {0};
+    uint8_t div_key[8] = {0};
+    uint8_t key_sel[8] = {0};
+    uint8_t calculated_MAC[4] = {0};
 
-	//Get the key index (hash1)
-	uint8_t key_index[8] = {0};
-	hash1(item.csn, key_index);
+    //Get the key index (hash1)
+    uint8_t key_index[8] = {0};
+    hash1(item.csn, key_index);
 
-	/*
-	 * Determine which bytes to retrieve. A hash is typically
-	 * 01010000454501
-	 * We go through that hash, and in the corresponding keytable, we put markers
-	 * on what state that particular index is:
-	 * - CRACKED (this has already been cracked)
-	 * - BEING_CRACKED (this is being bruteforced now)
-	 * - CRACK_FAILED (self-explaining...)
-	 *
-	 * The markers are placed in the high area of the 16 bit key-table.
-	 * Only the lower eight bits correspond to the (hopefully cracked) key-value.
-	 **/
-	uint8_t bytes_to_recover[3] = {0};
-	uint8_t numbytes_to_recover = 0 ;
-	int i;
-	for (i=0; i<8; i++)	{
-		if (keytable[key_index[i]] & (CRACKED | BEING_CRACKED)) continue;
+    /*
+     * Determine which bytes to retrieve. A hash is typically
+     * 01010000454501
+     * We go through that hash, and in the corresponding keytable, we put markers
+     * on what state that particular index is:
+     * - CRACKED (this has already been cracked)
+     * - BEING_CRACKED (this is being bruteforced now)
+     * - CRACK_FAILED (self-explaining...)
+     *
+     * The markers are placed in the high area of the 16 bit key-table.
+     * Only the lower eight bits correspond to the (hopefully cracked) key-value.
+     **/
+    uint8_t bytes_to_recover[3] = {0};
+    uint8_t numbytes_to_recover = 0 ;
+    int i;
+    for (i=0; i<8; i++) {
+        if (keytable[key_index[i]] & (CRACKED | BEING_CRACKED)) continue;
 
-		bytes_to_recover[numbytes_to_recover++] = key_index[i];
-		keytable[key_index[i]] |= BEING_CRACKED;
+        bytes_to_recover[numbytes_to_recover++] = key_index[i];
+        keytable[key_index[i]] |= BEING_CRACKED;
 
-		if (numbytes_to_recover > 3) {
-			PrintAndLogDevice(FAILED, "The CSN requires > 3 byte bruteforce, not supported");
-			printvar("[-] CSN", item.csn, 8);
-			printvar("[-] HASH1", key_index, 8);
-			PrintAndLogDevice(NORMAL, "");
-			//Before we exit, reset the 'BEING_CRACKED' to zero
-			keytable[bytes_to_recover[0]]  &= ~BEING_CRACKED;
-			keytable[bytes_to_recover[1]]  &= ~BEING_CRACKED;
-			keytable[bytes_to_recover[2]]  &= ~BEING_CRACKED;
-			return 1;
-		}
-	}
+        if (numbytes_to_recover > 3) {
+            PrintAndLogDevice(FAILED, "The CSN requires > 3 byte bruteforce, not supported");
+            printvar("[-] CSN", item.csn, 8);
+            printvar("[-] HASH1", key_index, 8);
+            PrintAndLogDevice(NORMAL, "");
+            //Before we exit, reset the 'BEING_CRACKED' to zero
+            keytable[bytes_to_recover[0]]  &= ~BEING_CRACKED;
+            keytable[bytes_to_recover[1]]  &= ~BEING_CRACKED;
+            keytable[bytes_to_recover[2]]  &= ~BEING_CRACKED;
+            return 1;
+        }
+    }
 
-	/*
-	 *A uint32 has room for 4 bytes, we'll only need 24 of those bits to bruteforce up to three bytes,
-	 */
-	//uint32_t brute = startvalue;
-	uint32_t brute = 0;
-	/*
-	   Determine where to stop the bruteforce. A 1-byte attack stops after 256 tries,
-	   (when brute reaches 0x100). And so on...
-	   bytes_to_recover = 1 --> endmask = 0x000000100
-	   bytes_to_recover = 2 --> endmask = 0x000010000
-	   bytes_to_recover = 3 --> endmask = 0x001000000
-	*/
+    /*
+     *A uint32 has room for 4 bytes, we'll only need 24 of those bits to bruteforce up to three bytes,
+     */
+    //uint32_t brute = startvalue;
+    uint32_t brute = 0;
+    /*
+       Determine where to stop the bruteforce. A 1-byte attack stops after 256 tries,
+       (when brute reaches 0x100). And so on...
+       bytes_to_recover = 1 --> endmask = 0x000000100
+       bytes_to_recover = 2 --> endmask = 0x000010000
+       bytes_to_recover = 3 --> endmask = 0x001000000
+    */
 
-	uint32_t endmask =  1 << 8*numbytes_to_recover;
-	PrintAndLogDevice(NORMAL, "----------------------------");
-	for (i =0 ; i < numbytes_to_recover && numbytes_to_recover > 1; i++)
-		PrintAndLogDevice(INFO, "Bruteforcing byte %d", bytes_to_recover[i]);
+    uint32_t endmask =  1 << 8*numbytes_to_recover;
+    PrintAndLogDevice(NORMAL, "----------------------------");
+    for (i =0 ; i < numbytes_to_recover && numbytes_to_recover > 1; i++)
+        PrintAndLogDevice(INFO, "Bruteforcing byte %d", bytes_to_recover[i]);
 
-	while (!found && !(brute & endmask)) {
+    while (!found && !(brute & endmask)) {
 
-		//Update the keytable with the brute-values
-		for (i=0; i < numbytes_to_recover; i++) {
-			keytable[bytes_to_recover[i]] &= 0xFF00;
-			keytable[bytes_to_recover[i]] |= (brute >> (i*8) & 0xFF);
-		}
+        //Update the keytable with the brute-values
+        for (i=0; i < numbytes_to_recover; i++) {
+            keytable[bytes_to_recover[i]] &= 0xFF00;
+            keytable[bytes_to_recover[i]] |= (brute >> (i*8) & 0xFF);
+        }
 
-		// Piece together the key
-		key_sel[0] = keytable[key_index[0]] & 0xFF;
-		key_sel[1] = keytable[key_index[1]] & 0xFF;
-		key_sel[2] = keytable[key_index[2]] & 0xFF;
-		key_sel[3] = keytable[key_index[3]] & 0xFF;
-		key_sel[4] = keytable[key_index[4]] & 0xFF;
-		key_sel[5] = keytable[key_index[5]] & 0xFF;
-		key_sel[6] = keytable[key_index[6]] & 0xFF;
-		key_sel[7] = keytable[key_index[7]] & 0xFF;
+        // Piece together the key
+        key_sel[0] = keytable[key_index[0]] & 0xFF;
+        key_sel[1] = keytable[key_index[1]] & 0xFF;
+        key_sel[2] = keytable[key_index[2]] & 0xFF;
+        key_sel[3] = keytable[key_index[3]] & 0xFF;
+        key_sel[4] = keytable[key_index[4]] & 0xFF;
+        key_sel[5] = keytable[key_index[5]] & 0xFF;
+        key_sel[6] = keytable[key_index[6]] & 0xFF;
+        key_sel[7] = keytable[key_index[7]] & 0xFF;
 
-		//Permute from iclass format to standard format
-		permutekey_rev(key_sel, key_sel_p);
-		//Diversify
-		diversifyKey(item.csn, key_sel_p, div_key);
-		//Calc mac
-		doMAC(item.cc_nr, div_key, calculated_MAC);
+        //Permute from iclass format to standard format
+        permutekey_rev(key_sel, key_sel_p);
+        //Diversify
+        diversifyKey(item.csn, key_sel_p, div_key);
+        //Calc mac
+        doMAC(item.cc_nr, div_key, calculated_MAC);
 
-		// success
-		if (memcmp(calculated_MAC, item.mac, 4) == 0) {
-			printf("\r\n");
-			for (i =0 ; i < numbytes_to_recover; i++) {
-				PrintAndLogDevice(INFO, "%d: 0x%02x", bytes_to_recover[i], 0xFF & keytable[bytes_to_recover[i]]);
-			}
-			found = true;
-			break;
-		}
+        // success
+        if (memcmp(calculated_MAC, item.mac, 4) == 0) {
+            printf("\r\n");
+            for (i =0 ; i < numbytes_to_recover; i++) {
+                PrintAndLogDevice(INFO, "%d: 0x%02x", bytes_to_recover[i], 0xFF & keytable[bytes_to_recover[i]]);
+            }
+            found = true;
+            break;
+        }
 
-		brute++;
-		if ((brute & 0xFFFF) == 0) {
-			printf("%3d,",(brute >> 16) & 0xFF);
-			if ( ((brute >> 16) % 0x10) == 0)
-				printf("\n");
-			fflush(stdout);
-		}
-	}
+        brute++;
+        if ((brute & 0xFFFF) == 0) {
+            printf("%3d,",(brute >> 16) & 0xFF);
+            if ( ((brute >> 16) % 0x10) == 0)
+                printf("\n");
+            fflush(stdout);
+        }
+    }
 
-	if (!found) {
-		PrintAndLogDevice(NORMAL, "\n"); PrintAndLogDevice(WARNING, "Failed to recover %d bytes using the following CSN", numbytes_to_recover);
-		printvar("[!] CSN", item.csn, 8);
-		errors++;
+    if (!found) {
+        PrintAndLogDevice(NORMAL, "\n"); PrintAndLogDevice(WARNING, "Failed to recover %d bytes using the following CSN", numbytes_to_recover);
+        printvar("[!] CSN", item.csn, 8);
+        errors++;
 
-		//Before we exit, reset the 'BEING_CRACKED' to zero
-		for (i=0; i < numbytes_to_recover; i++){
-			keytable[bytes_to_recover[i]]  &= 0xFF;
-			keytable[bytes_to_recover[i]]  |= CRACK_FAILED;
-		}
-	} else {
-		//PrintAndLogDevice(SUCCESS, "DES calcs: %u", brute);
-		for (i=0; i < numbytes_to_recover; i++){
-			keytable[bytes_to_recover[i]]  &= 0xFF;
-			keytable[bytes_to_recover[i]]  |= CRACKED;
-		}
-	}
-	return errors;
+        //Before we exit, reset the 'BEING_CRACKED' to zero
+        for (i=0; i < numbytes_to_recover; i++){
+            keytable[bytes_to_recover[i]]  &= 0xFF;
+            keytable[bytes_to_recover[i]]  |= CRACK_FAILED;
+        }
+    } else {
+        //PrintAndLogDevice(SUCCESS, "DES calcs: %u", brute);
+        for (i=0; i < numbytes_to_recover; i++){
+            keytable[bytes_to_recover[i]]  &= 0xFF;
+            keytable[bytes_to_recover[i]]  |= CRACKED;
+        }
+    }
+    return errors;
 }
 
 /**
  * From dismantling iclass-paper:
- *	Assume that an adversary somehow learns the first 16 bytes of hash2(K_cus ), i.e., y [0] and z [0] .
- *	Then he can simply recover the master custom key K_cus by computing
- *	K_cus = ~DES(z[0] , y[0] ) .
+ *  Assume that an adversary somehow learns the first 16 bytes of hash2(K_cus ), i.e., y [0] and z [0] .
+ *  Then he can simply recover the master custom key K_cus by computing
+ *  K_cus = ~DES(z[0] , y[0] ) .
  *
- *	Furthermore, the adversary is able to verify that he has the correct K cus by
- *	checking whether z [0] = DES enc (K_cus , ~K_cus ).
+ *  Furthermore, the adversary is able to verify that he has the correct K cus by
+ *  checking whether z [0] = DES enc (K_cus , ~K_cus ).
  * @param keytable an array (128 bytes) of hash2(kcus)
  * @param master_key where to put the master key
  * @return 0 for ok, 1 for failz
  */
 int calculateMasterKey(uint8_t first16bytes[], uint64_t master_key[] ){
-	mbedtls_des_context ctx_e;
+    mbedtls_des_context ctx_e;
 
-	uint8_t z_0[8] = {0};
-	uint8_t y_0[8] = {0};
-	uint8_t z_0_rev[8] = {0};
-	uint8_t key64[8] = {0};
-	uint8_t key64_negated[8] = {0};
-	uint8_t result[8] = {0};
+    uint8_t z_0[8] = {0};
+    uint8_t y_0[8] = {0};
+    uint8_t z_0_rev[8] = {0};
+    uint8_t key64[8] = {0};
+    uint8_t key64_negated[8] = {0};
+    uint8_t result[8] = {0};
 
-	// y_0 and z_0 are the first 16 bytes of the keytable
-	memcpy(y_0, first16bytes,8);
-	memcpy(z_0, first16bytes+8,8);
+    // y_0 and z_0 are the first 16 bytes of the keytable
+    memcpy(y_0, first16bytes,8);
+    memcpy(z_0, first16bytes+8,8);
 
-	// Our DES-implementation uses the standard NIST
-	// format for keys, thus must translate from iclass
-	// format to NIST-format
-	permutekey_rev(z_0, z_0_rev);
+    // Our DES-implementation uses the standard NIST
+    // format for keys, thus must translate from iclass
+    // format to NIST-format
+    permutekey_rev(z_0, z_0_rev);
 
-	// ~K_cus = DESenc(z[0], y[0])
-	mbedtls_des_setkey_enc( &ctx_e, z_0_rev );
-	mbedtls_des_crypt_ecb(&ctx_e, y_0, key64_negated);
+    // ~K_cus = DESenc(z[0], y[0])
+    mbedtls_des_setkey_enc( &ctx_e, z_0_rev );
+    mbedtls_des_crypt_ecb(&ctx_e, y_0, key64_negated);
 
-	int i;
-	for (i = 0; i < 8 ; i++)
- 		key64[i] = ~key64_negated[i];
+    int i;
+    for (i = 0; i < 8 ; i++)
+        key64[i] = ~key64_negated[i];
 
-	// Can we verify that the  key is correct?
-	// Once again, key is on iclass-format
-	uint8_t key64_stdformat[8] = {0};
-	permutekey_rev(key64, key64_stdformat);
+    // Can we verify that the  key is correct?
+    // Once again, key is on iclass-format
+    uint8_t key64_stdformat[8] = {0};
+    permutekey_rev(key64, key64_stdformat);
 
-	mbedtls_des_setkey_enc( &ctx_e, key64_stdformat );
-	mbedtls_des_crypt_ecb(&ctx_e, key64_negated, result);
-	PrintAndLogDevice(NORMAL, "\n"); PrintAndLogDevice(SUCCESS, "-- High security custom key (Kcus) --");
-	printvar("[+] Standard format   ", key64_stdformat, 8);
-	printvar("[+] iClass format     ", key64, 8);
+    mbedtls_des_setkey_enc( &ctx_e, key64_stdformat );
+    mbedtls_des_crypt_ecb(&ctx_e, key64_negated, result);
+    PrintAndLogDevice(NORMAL, "\n"); PrintAndLogDevice(SUCCESS, "-- High security custom key (Kcus) --");
+    printvar("[+] Standard format   ", key64_stdformat, 8);
+    printvar("[+] iClass format     ", key64, 8);
 
-	if (master_key != NULL)
-		memcpy(master_key, key64, 8);
+    if (master_key != NULL)
+        memcpy(master_key, key64, 8);
 
-	if (memcmp(z_0,result,4) != 0) {
-		PrintAndLogDevice(WARNING, "Failed to verify calculated master key (k_cus)! Something is wrong.");
-		return 1;
-	} else {
-		PrintAndLogDevice(NORMAL, "\n"); PrintAndLogDevice(SUCCESS, "Key verified ok!\n");
-	}
-	return 0;
+    if (memcmp(z_0,result,4) != 0) {
+        PrintAndLogDevice(WARNING, "Failed to verify calculated master key (k_cus)! Something is wrong.");
+        return 1;
+    } else {
+        PrintAndLogDevice(NORMAL, "\n"); PrintAndLogDevice(SUCCESS, "Key verified ok!\n");
+    }
+    return 0;
 }
 /**
  * @brief Same as bruteforcefile, but uses a an array of dumpdata instead
@@ -487,36 +487,36 @@ int calculateMasterKey(uint8_t first16bytes[], uint64_t master_key[] ){
  * @return
  */
 int bruteforceDump(uint8_t dump[], size_t dumpsize, uint16_t keytable[]) {
-	uint8_t i;
-	int errors = 0;
-	size_t itemsize = sizeof(dumpdata);
+    uint8_t i;
+    int errors = 0;
+    size_t itemsize = sizeof(dumpdata);
 
-	uint64_t t1 = msclock();
+    uint64_t t1 = msclock();
 
-	dumpdata* attack = (dumpdata* ) calloc(itemsize, sizeof(uint8_t));
+    dumpdata* attack = (dumpdata* ) calloc(itemsize, sizeof(uint8_t));
 
-	for (i = 0 ; i * itemsize < dumpsize ; i++ ) {
-		memcpy(attack, dump + i * itemsize, itemsize);
-		errors += bruteforceItem(*attack, keytable);
-	}
-	free(attack);
+    for (i = 0 ; i * itemsize < dumpsize ; i++ ) {
+        memcpy(attack, dump + i * itemsize, itemsize);
+        errors += bruteforceItem(*attack, keytable);
+    }
+    free(attack);
 
-	PrintAndLogDevice(SUCCESS, "time: %" PRIu64 " seconds", (msclock()-t1)/1000);
+    PrintAndLogDevice(SUCCESS, "time: %" PRIu64 " seconds", (msclock()-t1)/1000);
 
-	// Pick out the first 16 bytes of the keytable.
-	// The keytable is now in 16-bit ints, where the upper 8 bits
-	// indicate crack-status. Those must be discarded for the
-	// master key calculation
-	uint8_t first16bytes[16] = {0};
+    // Pick out the first 16 bytes of the keytable.
+    // The keytable is now in 16-bit ints, where the upper 8 bits
+    // indicate crack-status. Those must be discarded for the
+    // master key calculation
+    uint8_t first16bytes[16] = {0};
 
-	for (i = 0 ; i < 16 ; i++) {
-		first16bytes[i] = keytable[i] & 0xFF;
+    for (i = 0 ; i < 16 ; i++) {
+        first16bytes[i] = keytable[i] & 0xFF;
 
-		if (!(keytable[i] & CRACKED))
-			PrintAndLogDevice(WARNING, "error, we are missing byte %d, custom key calculation will fail...", i);
-	}
-	errors += calculateMasterKey(first16bytes, NULL);
-	return errors;
+        if (!(keytable[i] & CRACKED))
+            PrintAndLogDevice(WARNING, "error, we are missing byte %d, custom key calculation will fail...", i);
+    }
+    errors += calculateMasterKey(first16bytes, NULL);
+    return errors;
 }
 /**
  * Perform a bruteforce against a file which has been saved by pm3
@@ -526,39 +526,39 @@ int bruteforceDump(uint8_t dump[], size_t dumpsize, uint16_t keytable[]) {
  * @return
  */
 int bruteforceFile(const char *filename, uint16_t keytable[]) {
-	FILE *f = fopen(filename, "rb");
-	if (!f) {
-		PrintAndLogDevice(WARNING, "Failed to read from file '%s'", filename);
-		return 1;
-	}
+    FILE *f = fopen(filename, "rb");
+    if (!f) {
+        PrintAndLogDevice(WARNING, "Failed to read from file '%s'", filename);
+        return 1;
+    }
 
-	fseek(f, 0, SEEK_END);
-	long fsize = ftell(f);
-	fseek(f, 0, SEEK_SET);
+    fseek(f, 0, SEEK_END);
+    long fsize = ftell(f);
+    fseek(f, 0, SEEK_SET);
 
-	if (fsize < 0) {
-		PrintAndLogDevice(WARNING, "Error, when getting filesize");
-		fclose(f);
-		return 1;
-	}
+    if (fsize < 0) {
+        PrintAndLogDevice(WARNING, "Error, when getting filesize");
+        fclose(f);
+        return 1;
+    }
 
-	uint8_t *dump = calloc(fsize, sizeof(uint8_t));
-	if ( !dump ) {
-		PrintAndLogDevice(WARNING, "Failed to allocate memory");
-		fclose(f);
-		return 2;
-	}
-	size_t bytes_read = fread(dump, 1, fsize, f);
+    uint8_t *dump = calloc(fsize, sizeof(uint8_t));
+    if ( !dump ) {
+        PrintAndLogDevice(WARNING, "Failed to allocate memory");
+        fclose(f);
+        return 2;
+    }
+    size_t bytes_read = fread(dump, 1, fsize, f);
 
-	fclose(f);
+    fclose(f);
 
     if (bytes_read < fsize) {
         PrintAndLogDevice(WARNING, "Error, could only read %d bytes (should be %d)", bytes_read, fsize );
-	}
+    }
 
-	uint8_t res = bruteforceDump(dump, fsize, keytable);
-	free(dump);
-	return res;
+    uint8_t res = bruteforceDump(dump, fsize, keytable);
+    free(dump);
+    return res;
 }
 /**
  *
@@ -567,8 +567,8 @@ int bruteforceFile(const char *filename, uint16_t keytable[]) {
  * @return
  */
 int bruteforceFileNoKeys(const char *filename) {
-	uint16_t keytable[128] = {0};
-	return bruteforceFile(filename, keytable);
+    uint16_t keytable[128] = {0};
+    return bruteforceFile(filename, keytable);
 }
 
 // ---------------------------------------------------------------------------------
@@ -578,66 +578,66 @@ int bruteforceFileNoKeys(const char *filename) {
 // TEST CODE BELOW
 // ----------------------------------------------------------------------------
 int _testBruteforce() {
-	int errors = 0;
-	if (true) {
-		// First test
-		PrintAndLogDevice(INFO, "Testing crack from dumpfile...");
+    int errors = 0;
+    if (true) {
+        // First test
+        PrintAndLogDevice(INFO, "Testing crack from dumpfile...");
 
-		/**
-		  Expected values for the dumpfile:
-			High Security Key Table
+        /**
+          Expected values for the dumpfile:
+            High Security Key Table
 
-			00  F1 35 59 A1 0D 5A 26 7F 18 60 0B 96 8A C0 25 C1
-			10  BF A1 3B B0 FF 85 28 75 F2 1F C6 8F 0E 74 8F 21
-			20  14 7A 55 16 C8 A9 7D B3 13 0C 5D C9 31 8D A9 B2
-			30  A3 56 83 0F 55 7E DE 45 71 21 D2 6D C1 57 1C 9C
-			40  78 2F 64 51 42 7B 64 30 FA 26 51 76 D3 E0 FB B6
-			50  31 9F BF 2F 7E 4F 94 B4 BD 4F 75 91 E3 1B EB 42
-			60  3F 88 6F B8 6C 2C 93 0D 69 2C D5 20 3C C1 61 95
-			70  43 08 A0 2F FE B3 26 D7 98 0B 34 7B 47 70 A0 AB
+            00  F1 35 59 A1 0D 5A 26 7F 18 60 0B 96 8A C0 25 C1
+            10  BF A1 3B B0 FF 85 28 75 F2 1F C6 8F 0E 74 8F 21
+            20  14 7A 55 16 C8 A9 7D B3 13 0C 5D C9 31 8D A9 B2
+            30  A3 56 83 0F 55 7E DE 45 71 21 D2 6D C1 57 1C 9C
+            40  78 2F 64 51 42 7B 64 30 FA 26 51 76 D3 E0 FB B6
+            50  31 9F BF 2F 7E 4F 94 B4 BD 4F 75 91 E3 1B EB 42
+            60  3F 88 6F B8 6C 2C 93 0D 69 2C D5 20 3C C1 61 95
+            70  43 08 A0 2F FE B3 26 D7 98 0B 34 7B 47 70 A0 AB
 
-			**** The 64-bit HS Custom Key Value = 5B7C62C491C11B39 ****
-		**/
-		uint16_t keytable[128] = {0};
+            **** The 64-bit HS Custom Key Value = 5B7C62C491C11B39 ****
+        **/
+        uint16_t keytable[128] = {0};
 
-		//Test a few variants
-		if (fileExists("iclass_dump.bin")){
-			errors |= bruteforceFile("iclass_dump.bin", keytable);
-		} else if (fileExists("loclass/iclass_dump.bin")){
-			errors |= bruteforceFile("loclass/iclass_dump.bin", keytable);
-		} else if (fileExists("client/loclass/iclass_dump.bin")){
-			errors |= bruteforceFile("client/loclass/iclass_dump.bin", keytable);
-		} else {
-			PrintAndLogDevice(WARNING, "Error: The file iclass_dump.bin was not found!");
-		}
-	}
-	return errors;
+        //Test a few variants
+        if (fileExists("iclass_dump.bin")){
+            errors |= bruteforceFile("iclass_dump.bin", keytable);
+        } else if (fileExists("loclass/iclass_dump.bin")){
+            errors |= bruteforceFile("loclass/iclass_dump.bin", keytable);
+        } else if (fileExists("client/loclass/iclass_dump.bin")){
+            errors |= bruteforceFile("client/loclass/iclass_dump.bin", keytable);
+        } else {
+            PrintAndLogDevice(WARNING, "Error: The file iclass_dump.bin was not found!");
+        }
+    }
+    return errors;
 }
 
 int _test_iclass_key_permutation() {
-	uint8_t testcase[8] = {0x6c,0x8d,0x44,0xf9,0x2a,0x2d,0x01,0xbf};
-	uint8_t testcase_output[8] = {0};
-	uint8_t testcase_output_correct[8] = {0x8a,0x0d,0xb9,0x88,0xbb,0xa7,0x90,0xea};
-	uint8_t testcase_output_rev[8] = {0};
-	permutekey(testcase, testcase_output);
-	permutekey_rev(testcase_output, testcase_output_rev);
+    uint8_t testcase[8] = {0x6c,0x8d,0x44,0xf9,0x2a,0x2d,0x01,0xbf};
+    uint8_t testcase_output[8] = {0};
+    uint8_t testcase_output_correct[8] = {0x8a,0x0d,0xb9,0x88,0xbb,0xa7,0x90,0xea};
+    uint8_t testcase_output_rev[8] = {0};
+    permutekey(testcase, testcase_output);
+    permutekey_rev(testcase_output, testcase_output_rev);
 
-	if (memcmp(testcase_output, testcase_output_correct,8) != 0) {
-		PrintAndLogDevice(WARNING, "Error with iclass key permute!");
-		printarr("testcase_output", testcase_output, 8);
-		printarr("testcase_output_correct", testcase_output_correct, 8);
-		return 1;
+    if (memcmp(testcase_output, testcase_output_correct,8) != 0) {
+        PrintAndLogDevice(WARNING, "Error with iclass key permute!");
+        printarr("testcase_output", testcase_output, 8);
+        printarr("testcase_output_correct", testcase_output_correct, 8);
+        return 1;
 
-	}
-	if (memcmp(testcase, testcase_output_rev, 8) != 0) {
-		PrintAndLogDevice(WARNING, "Error with reverse iclass key permute");
-		printarr("testcase", testcase, 8);
-		printarr("testcase_output_rev", testcase_output_rev, 8);
-		return 1;
-	}
+    }
+    if (memcmp(testcase, testcase_output_rev, 8) != 0) {
+        PrintAndLogDevice(WARNING, "Error with reverse iclass key permute");
+        printarr("testcase", testcase, 8);
+        printarr("testcase_output_rev", testcase_output_rev, 8);
+        return 1;
+    }
 
-	PrintAndLogDevice(SUCCESS, "Iclass key permutation OK!");
-	return 0;
+    PrintAndLogDevice(SUCCESS, "Iclass key permutation OK!");
+    return 0;
 }
 
 int _testHash1() {
@@ -656,7 +656,7 @@ int _testHash1() {
 }
 
 int testElite() {
-	PrintAndLogDevice(INFO, "Testing iClass Elite functinality...");
+    PrintAndLogDevice(INFO, "Testing iClass Elite functinality...");
     PrintAndLogDevice(INFO, "Testing hash2");
     uint8_t k_cus[8] = {0x5B,0x7C,0x62,0xC4,0x91,0xC1,0x1B,0x39};
 
@@ -682,11 +682,11 @@ int testElite() {
         PrintAndLogDevice(SUCCESS, "Hash2 looks fine...");
     }
 
-	int errors = 0 ;
+    int errors = 0 ;
     PrintAndLogDevice(INFO, "Testing hash1...");
     errors += _testHash1();
     PrintAndLogDevice(INFO, "Testing key diversification ...");
     errors +=_test_iclass_key_permutation();
-	errors += _testBruteforce();
-	return errors;
+    errors += _testBruteforce();
+    return errors;
 }
\ No newline at end of file
diff --git a/client/loclass/elite_crack.h b/client/loclass/elite_crack.h
index f2cce1064..b3c748629 100644
--- a/client/loclass/elite_crack.h
+++ b/client/loclass/elite_crack.h
@@ -47,9 +47,9 @@ void permutekey(uint8_t key[8], uint8_t dest[8]);
  */
 void permutekey_rev(uint8_t key[8], uint8_t dest[8]);
 //Crack status, see below
-#define CRACKED			0x0100
-#define BEING_CRACKED	0x0200
-#define CRACK_FAILED	0x0400
+#define CRACKED         0x0100
+#define BEING_CRACKED   0x0200
+#define CRACK_FAILED    0x0400
 
 /**
  * Perform a bruteforce against a file which has been saved by pm3
@@ -81,9 +81,9 @@ int bruteforceDump(uint8_t dump[], size_t dumpsize, uint16_t keytable[]);
   This is how we expect each 'entry' in a dumpfile to look
 **/
 typedef struct {
-	uint8_t csn[8];
-	uint8_t cc_nr[12];
-	uint8_t mac[4];
+    uint8_t csn[8];
+    uint8_t cc_nr[12];
+    uint8_t mac[4];
 } dumpdata;
 
 /**
@@ -108,12 +108,12 @@ void hash1(uint8_t csn[] , uint8_t k[]);
 void hash2(uint8_t *key64, uint8_t *outp_keytable);
 /**
  * From dismantling iclass-paper:
- *	Assume that an adversary somehow learns the first 16 bytes of hash2(K_cus ), i.e., y [0] and z [0] .
- *	Then he can simply recover the master custom key K_cus by computing
- *	K_cus = ~DES(z[0] , y[0] ) .
+ *  Assume that an adversary somehow learns the first 16 bytes of hash2(K_cus ), i.e., y [0] and z [0] .
+ *  Then he can simply recover the master custom key K_cus by computing
+ *  K_cus = ~DES(z[0] , y[0] ) .
  *
- *	Furthermore, the adversary is able to verify that he has the correct K cus by
- *	checking whether z [0] = DES enc (K_cus , ~K_cus ).
+ *  Furthermore, the adversary is able to verify that he has the correct K cus by
+ *  checking whether z [0] = DES enc (K_cus , ~K_cus ).
  * @param keytable an array (128 bytes) of hash2(kcus)
  * @param master_key where to put the master key
  * @return 0 for ok, 1 for failz
@@ -127,8 +127,8 @@ int calculateMasterKey(uint8_t first16bytes[], uint64_t master_key[] );
 int testElite();
 
 /**
-	  Here are some pretty optimal values that can be used to recover necessary data in only
-	  eight auth attempts.
+      Here are some pretty optimal values that can be used to recover necessary data in only
+      eight auth attempts.
 // CSN                                        HASH1                                      Bytes recovered //
 { {0x00,0x0B,0x0F,0xFF,0xF7,0xFF,0x12,0xE0} , {0x01,0x01,0x00,0x00,0x45,0x01,0x45,0x45 } ,{0,1 }},
 { {0x00,0x13,0x94,0x7e,0x76,0xff,0x12,0xe0} , {0x02,0x0c,0x01,0x00,0x45,0x01,0x45,0x45} , {2,12}},
diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index c26bb2a5d..047a48188 100644
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -48,480 +48,480 @@
 int fileExists(const char *filename) {
 
 #ifdef _WIN32
-	struct _stat st;
-	int result = _stat(filename, &st);
+    struct _stat st;
+    int result = _stat(filename, &st);
 #else
-	struct stat st;
-	int result = stat(filename, &st);
+    struct stat st;
+    int result = stat(filename, &st);
 #endif
-	return result == 0;
+    return result == 0;
 }
 
 int saveFile(const char *preferredName, const char *suffix, const void* data, size_t datalen) {
-	int size = sizeof(char) * (strlen(preferredName) + strlen(suffix) + 10);
-	char * fileName = calloc(size, sizeof(char));
-	int num = 1;
-	sprintf(fileName,"%s.%s", preferredName, suffix);
-	while (fileExists(fileName)) {
-		sprintf(fileName,"%s-%d.%s", preferredName, num, suffix);
-		num++;
-	}
-	/* We should have a valid filename now, e.g. dumpdata-3.bin */
+    int size = sizeof(char) * (strlen(preferredName) + strlen(suffix) + 10);
+    char * fileName = calloc(size, sizeof(char));
+    int num = 1;
+    sprintf(fileName,"%s.%s", preferredName, suffix);
+    while (fileExists(fileName)) {
+        sprintf(fileName,"%s-%d.%s", preferredName, num, suffix);
+        num++;
+    }
+    /* We should have a valid filename now, e.g. dumpdata-3.bin */
 
-	/*Opening file for writing in binary mode*/
-	FILE *f = fopen(fileName, "wb");
-	if (!f) {
-		PrintAndLogDevice(WARNING, "file not found or locked. '" _YELLOW_(%s)"'", fileName);
-		free(fileName);
-		return 1;
-	}
-	fwrite(data, 1,	datalen, f);
-	fflush(f);
-	fclose(f);
-	PrintAndLogDevice(SUCCESS, "saved %u bytes to binary file " _YELLOW_(%s), datalen, fileName);
-	free(fileName);
-	return 0;
+    /*Opening file for writing in binary mode*/
+    FILE *f = fopen(fileName, "wb");
+    if (!f) {
+        PrintAndLogDevice(WARNING, "file not found or locked. '" _YELLOW_(%s)"'", fileName);
+        free(fileName);
+        return 1;
+    }
+    fwrite(data, 1, datalen, f);
+    fflush(f);
+    fclose(f);
+    PrintAndLogDevice(SUCCESS, "saved %u bytes to binary file " _YELLOW_(%s), datalen, fileName);
+    free(fileName);
+    return 0;
 }
 
 int saveFileEML(const char *preferredName, const char *suffix, uint8_t* data, size_t datalen, size_t blocksize) {
 
-	if ( preferredName == NULL ) return 1;
-	if ( suffix == NULL ) return 1;
-	if ( data == NULL ) return 1;
+    if ( preferredName == NULL ) return 1;
+    if ( suffix == NULL ) return 1;
+    if ( data == NULL ) return 1;
 
-	int retval = 0;
-	int blocks = datalen/blocksize;
-	uint16_t currblock = 1;
-	int i,j;
-	int size = sizeof(char) * (strlen(preferredName) + strlen(suffix) + 10);
-	char * fileName = calloc(size, sizeof(char));
-	int num = 1;
-	sprintf(fileName,"%s.%s", preferredName, suffix);
-	while (fileExists(fileName)) {
-		sprintf(fileName,"%s-%d.%s", preferredName, num, suffix);
-		num++;
-	}
+    int retval = 0;
+    int blocks = datalen/blocksize;
+    uint16_t currblock = 1;
+    int i,j;
+    int size = sizeof(char) * (strlen(preferredName) + strlen(suffix) + 10);
+    char * fileName = calloc(size, sizeof(char));
+    int num = 1;
+    sprintf(fileName,"%s.%s", preferredName, suffix);
+    while (fileExists(fileName)) {
+        sprintf(fileName,"%s-%d.%s", preferredName, num, suffix);
+        num++;
+    }
 
-	/* We should have a valid filename now, e.g. dumpdata-3.bin */
+    /* We should have a valid filename now, e.g. dumpdata-3.bin */
 
-	/*Opening file for writing in text mode*/
-	FILE *f = fopen(fileName, "w+");
-	if (!f) {
-		PrintAndLogDevice(WARNING, "file not found or locked. '" _YELLOW_(%s)"'", fileName);
-		retval =  1;
-		goto out;
-	}
+    /*Opening file for writing in text mode*/
+    FILE *f = fopen(fileName, "w+");
+    if (!f) {
+        PrintAndLogDevice(WARNING, "file not found or locked. '" _YELLOW_(%s)"'", fileName);
+        retval =  1;
+        goto out;
+    }
 
-	for (i = 0; i < datalen; i++) {
-		fprintf(f, "%02X", data[i] );
+    for (i = 0; i < datalen; i++) {
+        fprintf(f, "%02X", data[i] );
 
-		// no extra line in the end
-		if ( (i+1) % blocksize == 0 && currblock != blocks ) {
-			fprintf(f, "\n");
-			currblock++;
-		}
-	}
-	// left overs
-	if ( datalen % blocksize != 0) {
-		int index = blocks * blocksize;
-		for (j = 0; j < datalen % blocksize; j++) {
-			fprintf(f, "%02X", data[index + j] );
-		}
-	}
-	fflush(f);
-	fclose(f);
-	PrintAndLogDevice(SUCCESS, "saved %d blocks to text file " _YELLOW_(%s), blocks, fileName);
+        // no extra line in the end
+        if ( (i+1) % blocksize == 0 && currblock != blocks ) {
+            fprintf(f, "\n");
+            currblock++;
+        }
+    }
+    // left overs
+    if ( datalen % blocksize != 0) {
+        int index = blocks * blocksize;
+        for (j = 0; j < datalen % blocksize; j++) {
+            fprintf(f, "%02X", data[index + j] );
+        }
+    }
+    fflush(f);
+    fclose(f);
+    PrintAndLogDevice(SUCCESS, "saved %d blocks to text file " _YELLOW_(%s), blocks, fileName);
 
 out:
-	free(fileName);
-	return retval;
+    free(fileName);
+    return retval;
 }
 
 int saveFileJSON(const char *preferredName, const char *suffix, JSONFileType ftype, uint8_t* data, size_t datalen) {
-	if ( preferredName == NULL ) return 1;
-	if ( suffix == NULL ) return 1;
-	if ( data == NULL ) return 1;
+    if ( preferredName == NULL ) return 1;
+    if ( suffix == NULL ) return 1;
+    if ( data == NULL ) return 1;
 
-	int retval = 0;
-	int size = sizeof(char) * (strlen(preferredName) + strlen(suffix) + 10);
-	char * fileName = calloc(size, sizeof(char));
-	int num = 1;
-	sprintf(fileName,"%s.%s", preferredName, suffix);
-	while (fileExists(fileName)) {
-		sprintf(fileName,"%s-%d.%s", preferredName, num, suffix);
-		num++;
-	}
+    int retval = 0;
+    int size = sizeof(char) * (strlen(preferredName) + strlen(suffix) + 10);
+    char * fileName = calloc(size, sizeof(char));
+    int num = 1;
+    sprintf(fileName,"%s.%s", preferredName, suffix);
+    while (fileExists(fileName)) {
+        sprintf(fileName,"%s-%d.%s", preferredName, num, suffix);
+        num++;
+    }
 
-	json_t *root = json_object();
-	JsonSaveStr(root, "Created", "proxmark3");
-	switch(ftype) {
-		case jsfRaw:
-			JsonSaveStr(root, "FileType", "raw");
-			JsonSaveBufAsHexCompact(root, "raw", data, datalen);
-			break;
-		case jsfCardMemory:
-			JsonSaveStr(root, "FileType", "mfcard");
-			for (int i = 0; i < (datalen / 16); i++) {
-				char path[PATH_MAX_LENGTH] = {0};
-				sprintf(path, "$.blocks.%d", i);
-				JsonSaveBufAsHexCompact(root, path, &data[i * 16], 16);
+    json_t *root = json_object();
+    JsonSaveStr(root, "Created", "proxmark3");
+    switch(ftype) {
+        case jsfRaw:
+            JsonSaveStr(root, "FileType", "raw");
+            JsonSaveBufAsHexCompact(root, "raw", data, datalen);
+            break;
+        case jsfCardMemory:
+            JsonSaveStr(root, "FileType", "mfcard");
+            for (int i = 0; i < (datalen / 16); i++) {
+                char path[PATH_MAX_LENGTH] = {0};
+                sprintf(path, "$.blocks.%d", i);
+                JsonSaveBufAsHexCompact(root, path, &data[i * 16], 16);
 
-				if (i == 0) {
-					JsonSaveBufAsHexCompact(root, "$.Card.UID", &data[0], 4);
-					JsonSaveBufAsHexCompact(root, "$.Card.SAK", &data[5], 1);
-					JsonSaveBufAsHexCompact(root, "$.Card.ATQA", &data[6], 2);
-				}
+                if (i == 0) {
+                    JsonSaveBufAsHexCompact(root, "$.Card.UID", &data[0], 4);
+                    JsonSaveBufAsHexCompact(root, "$.Card.SAK", &data[5], 1);
+                    JsonSaveBufAsHexCompact(root, "$.Card.ATQA", &data[6], 2);
+                }
 
-				if (mfIsSectorTrailer(i)) {
-					memset(path, 0x00, sizeof(path));
-					sprintf(path, "$.SectorKeys.%d.KeyA", mfSectorNum(i));
-					JsonSaveBufAsHexCompact(root, path, &data[i * 16], 6);
+                if (mfIsSectorTrailer(i)) {
+                    memset(path, 0x00, sizeof(path));
+                    sprintf(path, "$.SectorKeys.%d.KeyA", mfSectorNum(i));
+                    JsonSaveBufAsHexCompact(root, path, &data[i * 16], 6);
 
-					memset(path, 0x00, sizeof(path));
-					sprintf(path, "$.SectorKeys.%d.KeyB", mfSectorNum(i));
-					JsonSaveBufAsHexCompact(root, path, &data[i * 16 + 10], 6);
+                    memset(path, 0x00, sizeof(path));
+                    sprintf(path, "$.SectorKeys.%d.KeyB", mfSectorNum(i));
+                    JsonSaveBufAsHexCompact(root, path, &data[i * 16 + 10], 6);
 
-					memset(path, 0x00, sizeof(path));
-					uint8_t *adata = &data[i * 16 + 6];
-					sprintf(path, "$.SectorKeys.%d.AccessConditions", mfSectorNum(i));
-					JsonSaveBufAsHexCompact(root, path, &data[i * 16 + 6], 4);
+                    memset(path, 0x00, sizeof(path));
+                    uint8_t *adata = &data[i * 16 + 6];
+                    sprintf(path, "$.SectorKeys.%d.AccessConditions", mfSectorNum(i));
+                    JsonSaveBufAsHexCompact(root, path, &data[i * 16 + 6], 4);
 
-					memset(path, 0x00, sizeof(path));
-					sprintf(path, "$.SectorKeys.%d.AccessConditionsText.block%d", mfSectorNum(i), i - 3);
-					JsonSaveStr(root, path, mfGetAccessConditionsDesc(0, adata));
+                    memset(path, 0x00, sizeof(path));
+                    sprintf(path, "$.SectorKeys.%d.AccessConditionsText.block%d", mfSectorNum(i), i - 3);
+                    JsonSaveStr(root, path, mfGetAccessConditionsDesc(0, adata));
 
-					memset(path, 0x00, sizeof(path));
-					sprintf(path, "$.SectorKeys.%d.AccessConditionsText.block%d", mfSectorNum(i), i - 2);
-					JsonSaveStr(root, path, mfGetAccessConditionsDesc(1, adata));
+                    memset(path, 0x00, sizeof(path));
+                    sprintf(path, "$.SectorKeys.%d.AccessConditionsText.block%d", mfSectorNum(i), i - 2);
+                    JsonSaveStr(root, path, mfGetAccessConditionsDesc(1, adata));
 
-					memset(path, 0x00, sizeof(path));
-					sprintf(path, "$.SectorKeys.%d.AccessConditionsText.block%d", mfSectorNum(i), i - 1);
-					JsonSaveStr(root, path, mfGetAccessConditionsDesc(2, adata));
+                    memset(path, 0x00, sizeof(path));
+                    sprintf(path, "$.SectorKeys.%d.AccessConditionsText.block%d", mfSectorNum(i), i - 1);
+                    JsonSaveStr(root, path, mfGetAccessConditionsDesc(2, adata));
 
-					memset(path, 0x00, sizeof(path));
-					sprintf(path, "$.SectorKeys.%d.AccessConditionsText.block%d", mfSectorNum(i), i);
-					JsonSaveStr(root, path, mfGetAccessConditionsDesc(3, adata));
+                    memset(path, 0x00, sizeof(path));
+                    sprintf(path, "$.SectorKeys.%d.AccessConditionsText.block%d", mfSectorNum(i), i);
+                    JsonSaveStr(root, path, mfGetAccessConditionsDesc(3, adata));
 
-					memset(path, 0x00, sizeof(path));
-					sprintf(path, "$.SectorKeys.%d.AccessConditionsText.UserData", mfSectorNum(i));
-					JsonSaveBufAsHexCompact(root, path, &adata[3], 1);
-				}
-			}
-			break;
-		case jsfMfuMemory:
-			JsonSaveStr(root, "FileType", "mfu");
+                    memset(path, 0x00, sizeof(path));
+                    sprintf(path, "$.SectorKeys.%d.AccessConditionsText.UserData", mfSectorNum(i));
+                    JsonSaveBufAsHexCompact(root, path, &adata[3], 1);
+                }
+            }
+            break;
+        case jsfMfuMemory:
+            JsonSaveStr(root, "FileType", "mfu");
 
-			mfu_dump_t* tmp = (mfu_dump_t*)data;
+            mfu_dump_t* tmp = (mfu_dump_t*)data;
 
-			uint8_t uid[7] = {0};
-			memcpy(uid, tmp->data, 3);
-			memcpy(uid+3, tmp->data+4, 4);
+            uint8_t uid[7] = {0};
+            memcpy(uid, tmp->data, 3);
+            memcpy(uid+3, tmp->data+4, 4);
 
-			JsonSaveBufAsHexCompact(root, "$.Card.UID", uid, sizeof(uid));
-			JsonSaveBufAsHexCompact(root, "$.Card.Version", tmp->version, sizeof(tmp->version));
-			JsonSaveBufAsHexCompact(root, "$.Card.TBO_0", tmp->tbo, sizeof(tmp->tbo));
-			JsonSaveBufAsHexCompact(root, "$.Card.Tearing", tmp->tearing, sizeof(tmp->tearing));
-			JsonSaveBufAsHexCompact(root, "$.Card.Pack",  tmp->pack, sizeof(tmp->pack));
-			JsonSaveBufAsHexCompact(root, "$.Card.TBO_1", tmp->tbo1, sizeof(tmp->tbo1));
-			JsonSaveBufAsHexCompact(root, "$.Card.Signature", tmp->signature, sizeof(tmp->signature));
-			JsonSaveStr(root, "$.Card.Counter", "N/A");
+            JsonSaveBufAsHexCompact(root, "$.Card.UID", uid, sizeof(uid));
+            JsonSaveBufAsHexCompact(root, "$.Card.Version", tmp->version, sizeof(tmp->version));
+            JsonSaveBufAsHexCompact(root, "$.Card.TBO_0", tmp->tbo, sizeof(tmp->tbo));
+            JsonSaveBufAsHexCompact(root, "$.Card.Tearing", tmp->tearing, sizeof(tmp->tearing));
+            JsonSaveBufAsHexCompact(root, "$.Card.Pack",  tmp->pack, sizeof(tmp->pack));
+            JsonSaveBufAsHexCompact(root, "$.Card.TBO_1", tmp->tbo1, sizeof(tmp->tbo1));
+            JsonSaveBufAsHexCompact(root, "$.Card.Signature", tmp->signature, sizeof(tmp->signature));
+            JsonSaveStr(root, "$.Card.Counter", "N/A");
 
-			// size of header 48b
-			size_t len = (datalen - DUMP_PREFIX_LENGTH) / 4;
+            // size of header 48b
+            size_t len = (datalen - DUMP_PREFIX_LENGTH) / 4;
 
-			for (int i = 0; i < len; i++) {
+            for (int i = 0; i < len; i++) {
 
-				char path[PATH_MAX_LENGTH] = {0};
-				sprintf(path, "$.blocks.%d", i);
-				JsonSaveBufAsHexCompact(root, path, tmp->data + (i * 4), 4);
-			}
-		break;
-	}
+                char path[PATH_MAX_LENGTH] = {0};
+                sprintf(path, "$.blocks.%d", i);
+                JsonSaveBufAsHexCompact(root, path, tmp->data + (i * 4), 4);
+            }
+        break;
+    }
 
-	int res = json_dump_file(root, fileName, JSON_INDENT(2));
-	if (res) {
-		PrintAndLogDevice(FAILED, "error: can't save the file: " _YELLOW_(%s), fileName);
-		json_decref(root);
-		retval = 200;
-		goto out;
-	}
-	PrintAndLogDevice(SUCCESS, "saved to json file " _YELLOW_(%s), fileName);
-	json_decref(root);
+    int res = json_dump_file(root, fileName, JSON_INDENT(2));
+    if (res) {
+        PrintAndLogDevice(FAILED, "error: can't save the file: " _YELLOW_(%s), fileName);
+        json_decref(root);
+        retval = 200;
+        goto out;
+    }
+    PrintAndLogDevice(SUCCESS, "saved to json file " _YELLOW_(%s), fileName);
+    json_decref(root);
 
 out:
-	free(fileName);
-	return retval;
+    free(fileName);
+    return retval;
 }
 
 int loadFile(const char *preferredName, const char *suffix, void* data, size_t* datalen) {
 
-	if ( preferredName == NULL ) return 1;
-	if ( suffix == NULL ) return 1;
-	if ( data == NULL ) return 1;
+    if ( preferredName == NULL ) return 1;
+    if ( suffix == NULL ) return 1;
+    if ( data == NULL ) return 1;
 
-	int retval = 0;
-	int size = sizeof(char) * (strlen(preferredName) + strlen(suffix) + 10);
-	char * fileName = calloc(size, sizeof(char));
-	sprintf(fileName,"%s.%s", preferredName, suffix);
+    int retval = 0;
+    int size = sizeof(char) * (strlen(preferredName) + strlen(suffix) + 10);
+    char * fileName = calloc(size, sizeof(char));
+    sprintf(fileName,"%s.%s", preferredName, suffix);
 
-	FILE *f = fopen(fileName, "rb");
-	if ( !f ) {
-		PrintAndLogDevice(WARNING, "file not found or locked. '" _YELLOW_(%s)"'", fileName);
-		free(fileName);
-		return 1;
-	}
+    FILE *f = fopen(fileName, "rb");
+    if ( !f ) {
+        PrintAndLogDevice(WARNING, "file not found or locked. '" _YELLOW_(%s)"'", fileName);
+        free(fileName);
+        return 1;
+    }
 
-	// get filesize in order to malloc memory
-	fseek(f, 0, SEEK_END);
-	long fsize = ftell(f);
-	fseek(f, 0, SEEK_SET);
+    // get filesize in order to malloc memory
+    fseek(f, 0, SEEK_END);
+    long fsize = ftell(f);
+    fseek(f, 0, SEEK_SET);
 
-	if ( fsize < 0 ) {
-		PrintAndLogDevice(FAILED, "error, when getting filesize");
-		retval = 1;
-		goto out;
-	}
+    if ( fsize < 0 ) {
+        PrintAndLogDevice(FAILED, "error, when getting filesize");
+        retval = 1;
+        goto out;
+    }
 
-	uint8_t *dump = calloc(fsize, sizeof(uint8_t));
-	if ( !dump ) {
-		PrintAndLogDevice(FAILED, "error, cannot allocate memory");
-		retval = 2;
-		goto out;
-	}
+    uint8_t *dump = calloc(fsize, sizeof(uint8_t));
+    if ( !dump ) {
+        PrintAndLogDevice(FAILED, "error, cannot allocate memory");
+        retval = 2;
+        goto out;
+    }
 
-	size_t bytes_read = fread(dump, 1, fsize, f);
+    size_t bytes_read = fread(dump, 1, fsize, f);
 
-	if ( bytes_read != fsize ) {
-		PrintAndLogDevice(FAILED, "error, bytes read mismatch file size");
-		free(dump);
-		retval = 3;
-		goto out;
-	}
+    if ( bytes_read != fsize ) {
+        PrintAndLogDevice(FAILED, "error, bytes read mismatch file size");
+        free(dump);
+        retval = 3;
+        goto out;
+    }
 
-	memcpy( (data), dump, bytes_read);
-	free(dump);
+    memcpy( (data), dump, bytes_read);
+    free(dump);
 
-	PrintAndLogDevice(SUCCESS, "loaded %d bytes from binary file " _YELLOW_(%s), bytes_read, fileName);
+    PrintAndLogDevice(SUCCESS, "loaded %d bytes from binary file " _YELLOW_(%s), bytes_read, fileName);
 
-	*datalen = bytes_read;
+    *datalen = bytes_read;
 
 out:
-	fclose(f);
-	free(fileName);
+    fclose(f);
+    free(fileName);
 
-	return retval;
+    return retval;
 }
 
 int loadFileEML(const char *preferredName, const char *suffix, void* data, size_t* datalen) {
 
-	if ( preferredName == NULL ) return 1;
-	if ( suffix == NULL ) return 1;
-	if ( data == NULL ) return 1;
+    if ( preferredName == NULL ) return 1;
+    if ( suffix == NULL ) return 1;
+    if ( data == NULL ) return 1;
 
     size_t counter = 0;
-	int retval = 0, hexlen = 0;
-	int size = sizeof(char) * (strlen(preferredName) + strlen(suffix) + 10);
-	char * fileName = calloc(size, sizeof(char));
-	sprintf(fileName,"%s.%s", preferredName, suffix);
+    int retval = 0, hexlen = 0;
+    int size = sizeof(char) * (strlen(preferredName) + strlen(suffix) + 10);
+    char * fileName = calloc(size, sizeof(char));
+    sprintf(fileName,"%s.%s", preferredName, suffix);
 
-	FILE *f = fopen(fileName, "r");
-	if ( !f ) {
-		PrintAndLogDevice(WARNING, "file not found or locked. '" _YELLOW_(%s)"'", fileName);
-		retval = 1;
-		goto out;
-	}
+    FILE *f = fopen(fileName, "r");
+    if ( !f ) {
+        PrintAndLogDevice(WARNING, "file not found or locked. '" _YELLOW_(%s)"'", fileName);
+        retval = 1;
+        goto out;
+    }
 
-	// 128 + 2 newline chars + 1 null terminator
-	char line[131];
-	memset(line, 0, sizeof(line));
-	uint8_t buf[64] = {0x00};
+    // 128 + 2 newline chars + 1 null terminator
+    char line[131];
+    memset(line, 0, sizeof(line));
+    uint8_t buf[64] = {0x00};
 
-	while ( !feof(f) ) {
+    while ( !feof(f) ) {
 
-		memset(line, 0, sizeof(line));
+        memset(line, 0, sizeof(line));
 
-		if (fgets(line, sizeof(line), f) == NULL){
-			fclose(f);
-			PrintAndLogEx(FAILED, "File reading error.");
-			retval = 2;
-			goto out;
-		}
+        if (fgets(line, sizeof(line), f) == NULL){
+            fclose(f);
+            PrintAndLogEx(FAILED, "File reading error.");
+            retval = 2;
+            goto out;
+        }
 
-		if ( line[0] == '#' )
-			continue;
+        if ( line[0] == '#' )
+            continue;
 
-		int res = param_gethex_to_eol(line, 0, buf, sizeof(buf), &hexlen);
-		if (res == 0 || res == 1) {
-			memcpy(data + counter, buf, hexlen);
-			counter += hexlen;
-		}
-	}
-	fclose(f);
-	PrintAndLogDevice(SUCCESS, "loaded %d bytes from text file " _YELLOW_(%s), counter, fileName);
+        int res = param_gethex_to_eol(line, 0, buf, sizeof(buf), &hexlen);
+        if (res == 0 || res == 1) {
+            memcpy(data + counter, buf, hexlen);
+            counter += hexlen;
+        }
+    }
+    fclose(f);
+    PrintAndLogDevice(SUCCESS, "loaded %d bytes from text file " _YELLOW_(%s), counter, fileName);
 
-	if ( datalen )
-		*datalen = counter;
+    if ( datalen )
+        *datalen = counter;
 
 out:
-	free(fileName);
-	return retval;
+    free(fileName);
+    return retval;
 }
 
 int loadFileJSON(const char *preferredName, const char *suffix, void* data, size_t maxdatalen, size_t* datalen) {
 
-	if ( preferredName == NULL ) return 1;
-	if ( suffix == NULL ) return 1;
-	if ( data == NULL ) return 1;
+    if ( preferredName == NULL ) return 1;
+    if ( suffix == NULL ) return 1;
+    if ( data == NULL ) return 1;
 
-	*datalen = 0;
-	json_t *root;
-	json_error_t error;
+    *datalen = 0;
+    json_t *root;
+    json_error_t error;
 
-	int retval = 0;
-	int size = sizeof(char) * (strlen(preferredName) + strlen(suffix) + 10);
-	char * fileName = calloc(size, sizeof(char));
-	sprintf(fileName,"%s.%s", preferredName, suffix);
+    int retval = 0;
+    int size = sizeof(char) * (strlen(preferredName) + strlen(suffix) + 10);
+    char * fileName = calloc(size, sizeof(char));
+    sprintf(fileName,"%s.%s", preferredName, suffix);
 
-	root = json_load_file(fileName, 0, &error);
-	if (!root) {
-		PrintAndLog("ERROR: json " _YELLOW_(%s) " error on line %d: %s", fileName, error.line, error.text);
-		retval = 2;
-		goto out;
-	}
+    root = json_load_file(fileName, 0, &error);
+    if (!root) {
+        PrintAndLog("ERROR: json " _YELLOW_(%s) " error on line %d: %s", fileName, error.line, error.text);
+        retval = 2;
+        goto out;
+    }
 
-	if (!json_is_object(root)) {
-		PrintAndLog("ERROR: Invalid json " _YELLOW_(%s) " format. root must be an object.", fileName);
-		retval = 3;
-		goto out;
-	}
+    if (!json_is_object(root)) {
+        PrintAndLog("ERROR: Invalid json " _YELLOW_(%s) " format. root must be an object.", fileName);
+        retval = 3;
+        goto out;
+    }
 
-	uint8_t *udata = (uint8_t *)data;
-	char ctype[100] = {0};
-	JsonLoadStr(root, "$.FileType", ctype);
+    uint8_t *udata = (uint8_t *)data;
+    char ctype[100] = {0};
+    JsonLoadStr(root, "$.FileType", ctype);
 
-	if (!strcmp(ctype, "raw")) {
-		JsonLoadBufAsHex(root, "$.raw", udata, maxdatalen, datalen);
-	}
+    if (!strcmp(ctype, "raw")) {
+        JsonLoadBufAsHex(root, "$.raw", udata, maxdatalen, datalen);
+    }
 
-	if (!strcmp(ctype, "mfcard")) {
-		size_t sptr = 0;
-		for (int i = 0; i < 256; i++) {
-			if (sptr + 16 > maxdatalen) {
-				retval = 5;
-				goto out;
-			}
+    if (!strcmp(ctype, "mfcard")) {
+        size_t sptr = 0;
+        for (int i = 0; i < 256; i++) {
+            if (sptr + 16 > maxdatalen) {
+                retval = 5;
+                goto out;
+            }
 
-			char path[30] = {0};
-			sprintf(path, "$.blocks.%d", i);
+            char path[30] = {0};
+            sprintf(path, "$.blocks.%d", i);
 
-			size_t len = 0;
-			JsonLoadBufAsHex(root, path, &udata[sptr], 16, &len);
-			if (!len)
-				break;
+            size_t len = 0;
+            JsonLoadBufAsHex(root, path, &udata[sptr], 16, &len);
+            if (!len)
+                break;
 
-			sptr += len;
-		}
+            sptr += len;
+        }
 
-		*datalen = sptr;
-	}
+        *datalen = sptr;
+    }
 
-	if (!strcmp(ctype, "mfu")) {
-		size_t sptr = 0;
-		for (int i = 0; i < 256; i++) {
-			if (sptr + 4 > maxdatalen) {
-				retval = 5;
-				goto out;
-			}
+    if (!strcmp(ctype, "mfu")) {
+        size_t sptr = 0;
+        for (int i = 0; i < 256; i++) {
+            if (sptr + 4 > maxdatalen) {
+                retval = 5;
+                goto out;
+            }
 
-			char path[30] = {0};
-			sprintf(path, "$.blocks.%d", i);
+            char path[30] = {0};
+            sprintf(path, "$.blocks.%d", i);
 
-			size_t len = 0;
-			JsonLoadBufAsHex(root, path, &udata[sptr], 4, &len);
-			if (!len)
-				break;
+            size_t len = 0;
+            JsonLoadBufAsHex(root, path, &udata[sptr], 4, &len);
+            if (!len)
+                break;
 
-			sptr += len;
-		}
+            sptr += len;
+        }
 
-		*datalen = sptr;
-	}
+        *datalen = sptr;
+    }
 
 
-	PrintAndLog("loaded from JSON file " _YELLOW_(%s), fileName);
+    PrintAndLog("loaded from JSON file " _YELLOW_(%s), fileName);
 out:
-	json_decref(root);
-	free(fileName);
-	return retval;
+    json_decref(root);
+    free(fileName);
+    return retval;
 }
 
 int loadFileDICTIONARY(const char *preferredName, const char *suffix, void* data, size_t* datalen, uint8_t keylen, uint16_t* keycnt ) {
 
-	if ( preferredName == NULL ) return 1;
-	if ( suffix == NULL ) return 1;
-	if ( data == NULL ) return 1;
+    if ( preferredName == NULL ) return 1;
+    if ( suffix == NULL ) return 1;
+    if ( data == NULL ) return 1;
 
-	// t5577 == 4bytes
-	// mifare == 6 bytes
-	// iclass == 8 bytes
-	// default to 6 bytes.
-	if (keylen != 4 && keylen != 6 && keylen != 8) {
-		keylen = 6;
-	}
+    // t5577 == 4bytes
+    // mifare == 6 bytes
+    // iclass == 8 bytes
+    // default to 6 bytes.
+    if (keylen != 4 && keylen != 6 && keylen != 8) {
+        keylen = 6;
+    }
 
-	// double up since its chars
-	keylen <<= 1;
+    // double up since its chars
+    keylen <<= 1;
 
-	char line[255];
+    char line[255];
 
     size_t counter = 0;
-	int retval = 0;
-	int size = sizeof(char) * (strlen(preferredName) + strlen(suffix) + 10);
-	char * fileName = calloc(size, sizeof(char));
-	sprintf(fileName,"%s.%s", preferredName, suffix);
+    int retval = 0;
+    int size = sizeof(char) * (strlen(preferredName) + strlen(suffix) + 10);
+    char * fileName = calloc(size, sizeof(char));
+    sprintf(fileName,"%s.%s", preferredName, suffix);
 
-	FILE *f = fopen(fileName, "r");
-	if ( !f ) {
-		PrintAndLogDevice(WARNING, "file not found or locked. '" _YELLOW_(%s)"'", fileName);
-		retval = 1;
-		goto out;
-	}
+    FILE *f = fopen(fileName, "r");
+    if ( !f ) {
+        PrintAndLogDevice(WARNING, "file not found or locked. '" _YELLOW_(%s)"'", fileName);
+        retval = 1;
+        goto out;
+    }
 
-	// read file
-	while ( fgets(line, sizeof(line), f) ) {
+    // read file
+    while ( fgets(line, sizeof(line), f) ) {
 
-		// add null terminator
-		line[keylen] = 0;
+        // add null terminator
+        line[keylen] = 0;
 
-		// smaller keys than expected is skipped
-		if (strlen(line) < keylen)
-			continue;
+        // smaller keys than expected is skipped
+        if (strlen(line) < keylen)
+            continue;
 
 
-		// The line start with # is comment, skip
-		if( line[0] == '#' )
-			continue;
+        // The line start with # is comment, skip
+        if( line[0] == '#' )
+            continue;
 
-		if (!isxdigit(line[0])){
-			PrintAndLogEx(FAILED, "file content error. '%s' must include " _BLUE_(%2d) "HEX symbols", line, keylen);
-			continue;
-		}
+        if (!isxdigit(line[0])){
+            PrintAndLogEx(FAILED, "file content error. '%s' must include " _BLUE_(%2d) "HEX symbols", line, keylen);
+            continue;
+        }
 
-		uint64_t key = strtoull(line, NULL, 16);
+        uint64_t key = strtoull(line, NULL, 16);
 
-		num_to_bytes(key, keylen >> 1, data + counter);
-		(*keycnt)++;
-		memset(line, 0, sizeof(line));
-		counter += (keylen >> 1);
-	}
-	fclose(f);
-	PrintAndLogDevice(SUCCESS, "loaded " _GREEN_(%2d) "keys from dictionary file " _YELLOW_(%s), *keycnt, fileName);
+        num_to_bytes(key, keylen >> 1, data + counter);
+        (*keycnt)++;
+        memset(line, 0, sizeof(line));
+        counter += (keylen >> 1);
+    }
+    fclose(f);
+    PrintAndLogDevice(SUCCESS, "loaded " _GREEN_(%2d) "keys from dictionary file " _YELLOW_(%s), *keycnt, fileName);
 
-	if ( datalen )
-		*datalen = counter;
+    if ( datalen )
+        *datalen = counter;
 out:
-	free(fileName);
-	return retval;
+    free(fileName);
+    return retval;
 }
 
 #else //if we're on ARM
diff --git a/client/loclass/fileutils.h b/client/loclass/fileutils.h
index 94bc18e94..591630dfe 100644
--- a/client/loclass/fileutils.h
+++ b/client/loclass/fileutils.h
@@ -52,9 +52,9 @@
 #include "cmdhfmfu.h"
 
 typedef enum {
-	jsfRaw,
-	jsfCardMemory,
-	jsfMfuMemory,
+    jsfRaw,
+    jsfCardMemory,
+    jsfMfuMemory,
 } JSONFileType;
 
 int fileExists(const char *filename);
@@ -155,7 +155,7 @@ extern int loadFileDICTIONARY(const char *preferredName, const char *suffix, voi
 #define PrintAndLogDevice(level, format, args...)  PrintAndLogEx(level, format , ## args)
 #else
 
-	/**
+    /**
  * Utility function to print to console. This is used consistently within the library instead
  * of printf, but it actually only calls printf. The reason to have this method is to
  *make it simple to plug this library into proxmark, which has this function already to
diff --git a/client/loclass/ikeys.c b/client/loclass/ikeys.c
index 847f90729..e754a5f52 100644
--- a/client/loclass/ikeys.c
+++ b/client/loclass/ikeys.c
@@ -39,23 +39,23 @@
 
 
 From "Dismantling iclass":
-	This section describes in detail the built-in key diversification algorithm of iClass.
-	Besides the obvious purpose of deriving a card key from a master key, this
-	algorithm intends to circumvent weaknesses in the cipher by preventing the
-	usage of certain ‘weak’ keys. In order to compute a diversified key, the iClass
-	reader first encrypts the card identity id with the master key K, using single
-	DES. The resulting ciphertext is then input to a function called hash0 which
-	outputs the diversified key k.
+    This section describes in detail the built-in key diversification algorithm of iClass.
+    Besides the obvious purpose of deriving a card key from a master key, this
+    algorithm intends to circumvent weaknesses in the cipher by preventing the
+    usage of certain ‘weak’ keys. In order to compute a diversified key, the iClass
+    reader first encrypts the card identity id with the master key K, using single
+    DES. The resulting ciphertext is then input to a function called hash0 which
+    outputs the diversified key k.
 
-	k = hash0(DES enc (id, K))
+    k = hash0(DES enc (id, K))
 
-	Here the DES encryption of id with master key K outputs a cryptogram c
-	of 64 bits. These 64 bits are divided as c = x, y, z [0] , . . . , z [7] ∈ F 82 × F 82 × (F 62 ) 8
-	which is used as input to the hash0 function. This function introduces some
-	obfuscation by performing a number of permutations, complement and modulo
-	operations, see Figure 2.5. Besides that, it checks for and removes patterns like
-	similar key bytes, which could produce a strong bias in the cipher. Finally, the
-	output of hash0 is the diversified card key k = k [0] , . . . , k [7] ∈ (F 82 ) 8 .
+    Here the DES encryption of id with master key K outputs a cryptogram c
+    of 64 bits. These 64 bits are divided as c = x, y, z [0] , . . . , z [7] ∈ F 82 × F 82 × (F 62 ) 8
+    which is used as input to the hash0 function. This function introduces some
+    obfuscation by performing a number of permutations, complement and modulo
+    operations, see Figure 2.5. Besides that, it checks for and removes patterns like
+    similar key bytes, which could produce a strong bias in the cipher. Finally, the
+    output of hash0 is the diversified card key k = k [0] , . . . , k [7] ∈ (F 82 ) 8 .
 
 **/
 #include <stdint.h>
@@ -87,7 +87,7 @@ static int debug_print = 0;
  */
 uint8_t getSixBitByte(uint64_t c, int n)
 {
-	return (c >> (42-6*n)) & 0x3F;
+    return (c >> (42-6*n)) & 0x3F;
 }
 
 /**
@@ -98,21 +98,21 @@ uint8_t getSixBitByte(uint64_t c, int n)
  */
 void pushbackSixBitByte(uint64_t *c, uint8_t z, int n)
 {
-	//0x XXXX YYYY ZZZZ ZZZZ ZZZZ
-	//             ^z0         ^z7
-	//z0:  1111 1100 0000 0000
+    //0x XXXX YYYY ZZZZ ZZZZ ZZZZ
+    //             ^z0         ^z7
+    //z0:  1111 1100 0000 0000
 
-	uint64_t masked = z & 0x3F;
-	uint64_t eraser = 0x3F;
-	masked <<= 42-6*n;
-	eraser <<= 42-6*n;
+    uint64_t masked = z & 0x3F;
+    uint64_t eraser = 0x3F;
+    masked <<= 42-6*n;
+    eraser <<= 42-6*n;
 
-	//masked <<= 6*n;
-	//eraser <<= 6*n;
+    //masked <<= 6*n;
+    //eraser <<= 6*n;
 
-	eraser = ~eraser;
-	(*c) &= eraser;
-	(*c) |= masked;
+    eraser = ~eraser;
+    (*c) &= eraser;
+    (*c) |= masked;
 
 }
 /**
@@ -124,17 +124,17 @@ void pushbackSixBitByte(uint64_t *c, uint8_t z, int n)
  */
 uint64_t swapZvalues(uint64_t c)
 {
-	uint64_t newz = 0;
-	pushbackSixBitByte(&newz, getSixBitByte(c,0),7);
-	pushbackSixBitByte(&newz, getSixBitByte(c,1),6);
-	pushbackSixBitByte(&newz, getSixBitByte(c,2),5);
-	pushbackSixBitByte(&newz, getSixBitByte(c,3),4);
-	pushbackSixBitByte(&newz, getSixBitByte(c,4),3);
-	pushbackSixBitByte(&newz, getSixBitByte(c,5),2);
-	pushbackSixBitByte(&newz, getSixBitByte(c,6),1);
-	pushbackSixBitByte(&newz, getSixBitByte(c,7),0);
-	newz |= (c & 0xFFFF000000000000);
-	return newz;
+    uint64_t newz = 0;
+    pushbackSixBitByte(&newz, getSixBitByte(c,0),7);
+    pushbackSixBitByte(&newz, getSixBitByte(c,1),6);
+    pushbackSixBitByte(&newz, getSixBitByte(c,2),5);
+    pushbackSixBitByte(&newz, getSixBitByte(c,3),4);
+    pushbackSixBitByte(&newz, getSixBitByte(c,4),3);
+    pushbackSixBitByte(&newz, getSixBitByte(c,5),2);
+    pushbackSixBitByte(&newz, getSixBitByte(c,6),1);
+    pushbackSixBitByte(&newz, getSixBitByte(c,7),0);
+    newz |= (c & 0xFFFF000000000000);
+    return newz;
 }
 
 /**
@@ -142,115 +142,115 @@ uint64_t swapZvalues(uint64_t c)
 */
 uint64_t ck(int i, int j, uint64_t z)
 {
-	if (i == 1 && j == -1) {
-		// ck(1, −1, z [0] . . . z [3] ) = z [0] . . . z [3]
-		return z;
-	} else if( j == -1) {
-		// ck(i, −1, z [0] . . . z [3] ) = ck(i − 1, i − 2, z [0] . . . z [3] )
-		return ck(i-1,i-2, z);
-	}
+    if (i == 1 && j == -1) {
+        // ck(1, −1, z [0] . . . z [3] ) = z [0] . . . z [3]
+        return z;
+    } else if( j == -1) {
+        // ck(i, −1, z [0] . . . z [3] ) = ck(i − 1, i − 2, z [0] . . . z [3] )
+        return ck(i-1,i-2, z);
+    }
 
-	if (getSixBitByte(z,i) == getSixBitByte(z,j))
-	{
-		//ck(i, j − 1, z [0] . . . z [i] ← j . . . z [3] )
-		uint64_t newz = 0;
-		int c;
-		for(c = 0; c < 4; c++) {
-			uint8_t val = getSixBitByte(z,c);
-			if (c == i)
-				pushbackSixBitByte(&newz, j, c);
-			else
-				pushbackSixBitByte(&newz, val, c);
-		}
-		return ck(i,j-1,newz);
-	} else {
-		return ck(i,j-1,z);
-	}
+    if (getSixBitByte(z,i) == getSixBitByte(z,j))
+    {
+        //ck(i, j − 1, z [0] . . . z [i] ← j . . . z [3] )
+        uint64_t newz = 0;
+        int c;
+        for(c = 0; c < 4; c++) {
+            uint8_t val = getSixBitByte(z,c);
+            if (c == i)
+                pushbackSixBitByte(&newz, j, c);
+            else
+                pushbackSixBitByte(&newz, val, c);
+        }
+        return ck(i,j-1,newz);
+    } else {
+        return ck(i,j-1,z);
+    }
 }
 /**
 
-	Definition 8.
-	Let the function check : (F 62 ) 8 → (F 62 ) 8 be defined as
-	check(z [0] . . . z [7] ) = ck(3, 2, z [0] . . . z [3] ) · ck(3, 2, z [4] . . . z [7] )
+    Definition 8.
+    Let the function check : (F 62 ) 8 → (F 62 ) 8 be defined as
+    check(z [0] . . . z [7] ) = ck(3, 2, z [0] . . . z [3] ) · ck(3, 2, z [4] . . . z [7] )
 
-	where ck : N × N × (F 62 ) 4 → (F 62 ) 4 is defined as
+    where ck : N × N × (F 62 ) 4 → (F 62 ) 4 is defined as
 
-		ck(1, −1, z [0] . . . z [3] ) = z [0] . . . z [3]
-		ck(i, −1, z [0] . . . z [3] ) = ck(i − 1, i − 2, z [0] . . . z [3] )
-		ck(i, j, z [0] . . . z [3] ) =
-		ck(i, j − 1, z [0] . . . z [i] ← j . . . z [3] ),  if z [i] = z [j] ;
-		ck(i, j − 1, z [0] . . . z [3] ), otherwise
+        ck(1, −1, z [0] . . . z [3] ) = z [0] . . . z [3]
+        ck(i, −1, z [0] . . . z [3] ) = ck(i − 1, i − 2, z [0] . . . z [3] )
+        ck(i, j, z [0] . . . z [3] ) =
+        ck(i, j − 1, z [0] . . . z [i] ← j . . . z [3] ),  if z [i] = z [j] ;
+        ck(i, j − 1, z [0] . . . z [3] ), otherwise
 
-	otherwise.
+    otherwise.
 **/
 
 uint64_t check(uint64_t z)
 {
-	//These 64 bits are divided as c = x, y, z [0] , . . . , z [7]
+    //These 64 bits are divided as c = x, y, z [0] , . . . , z [7]
 
-	// ck(3, 2, z [0] . . . z [3] )
-	uint64_t ck1 = ck(3,2, z );
+    // ck(3, 2, z [0] . . . z [3] )
+    uint64_t ck1 = ck(3,2, z );
 
-	// ck(3, 2, z [4] . . . z [7] )
-	uint64_t ck2 = ck(3,2, z << 24);
+    // ck(3, 2, z [4] . . . z [7] )
+    uint64_t ck2 = ck(3,2, z << 24);
 
-	//The ck function will place the values
-	// in the middle of z.
-	ck1 &= 0x00000000FFFFFF000000;
-	ck2 &= 0x00000000FFFFFF000000;
+    //The ck function will place the values
+    // in the middle of z.
+    ck1 &= 0x00000000FFFFFF000000;
+    ck2 &= 0x00000000FFFFFF000000;
 
-	return ck1 | ck2 >> 24;
+    return ck1 | ck2 >> 24;
 
 }
 
 void permute(BitstreamIn *p_in, uint64_t z,int l,int r, BitstreamOut* out)
 {
-	if(bitsLeft(p_in) == 0)
-		return;
+    if(bitsLeft(p_in) == 0)
+        return;
 
-	bool pn = tailBit(p_in);
-	if( pn ) // pn = 1
-	{
-		uint8_t zl = getSixBitByte(z,l);
+    bool pn = tailBit(p_in);
+    if( pn ) // pn = 1
+    {
+        uint8_t zl = getSixBitByte(z,l);
 
-		push6bits(out, zl+1);
-		permute(p_in, z, l+1,r, out);
-	}else // otherwise
-	{
-		uint8_t zr = getSixBitByte(z,r);
+        push6bits(out, zl+1);
+        permute(p_in, z, l+1,r, out);
+    }else // otherwise
+    {
+        uint8_t zr = getSixBitByte(z,r);
 
-		push6bits(out, zr);
-		permute(p_in,z,l,r+1,out);
-	}
+        push6bits(out, zr);
+        permute(p_in,z,l,r+1,out);
+    }
 }
 void printbegin() {
-	if (debug_print < 2)
-		return;
+    if (debug_print < 2)
+        return;
 
-	PrintAndLogDevice(NORMAL, "          | x| y|z0|z1|z2|z3|z4|z5|z6|z7|");
+    PrintAndLogDevice(NORMAL, "          | x| y|z0|z1|z2|z3|z4|z5|z6|z7|");
 }
 
 void printState(char* desc, uint64_t c)
 {
-	if(debug_print < 2)
-		return;
+    if(debug_print < 2)
+        return;
 
-	printf("%s : ", desc);
-	uint8_t x = 	(c & 0xFF00000000000000 ) >> 56;
-	uint8_t y = 	(c & 0x00FF000000000000 ) >> 48;
-	printf("  %02x %02x", x,y);
-	int i;
-	for(i = 0; i < 8; i++)
-		printf(" %02x", getSixBitByte(c,i));
-	printf("\n");
+    printf("%s : ", desc);
+    uint8_t x = (c & 0xFF00000000000000 ) >> 56;
+    uint8_t y = (c & 0x00FF000000000000 ) >> 48;
+    printf("  %02x %02x", x,y);
+    int i;
+    for(i = 0; i < 8; i++)
+        printf(" %02x", getSixBitByte(c,i));
+    printf("\n");
 }
 
 /**
  * @brief
  *Definition 11. Let the function hash0 : F 82 × F 82 × (F 62 ) 8 → (F 82 ) 8 be defined as
- *	hash0(x, y, z [0] . . . z [7] ) = k [0] . . . k [7] where
- * z'[i] = (z[i] mod (63-i)) + i	i =  0...3
- * z'[i+4] = (z[i+4] mod (64-i)) + i	i =  0...3
+ *  hash0(x, y, z [0] . . . z [7] ) = k [0] . . . k [7] where
+ * z'[i] = (z[i] mod (63-i)) + i      i =  0...3
+ * z'[i+4] = (z[i+4] mod (64-i)) + i  i =  0...3
  * ẑ = check(z');
  * @param c
  * @param k this is where the diversified key is put (should be 8 bytes)
@@ -258,108 +258,108 @@ void printState(char* desc, uint64_t c)
  */
 void hash0(uint64_t c, uint8_t k[8])
 {
-	c = swapZvalues(c);
+    c = swapZvalues(c);
 
-	printbegin();
-	printState("origin",c);
-	//These 64 bits are divided as c = x, y, z [0] , . . . , z [7]
-	// x = 8 bits
-	// y = 8 bits
-	// z0-z7 6 bits each : 48 bits
-	uint8_t x = 	(c & 0xFF00000000000000 ) >> 56;
-	uint8_t y = 	(c & 0x00FF000000000000 ) >> 48;
-	int n;
-	uint8_t zn, zn4, _zn, _zn4;
-	uint64_t zP = 0;
+    printbegin();
+    printState("origin",c);
+    //These 64 bits are divided as c = x, y, z [0] , . . . , z [7]
+    // x = 8 bits
+    // y = 8 bits
+    // z0-z7 6 bits each : 48 bits
+    uint8_t x = (c & 0xFF00000000000000 ) >> 56;
+    uint8_t y = (c & 0x00FF000000000000 ) >> 48;
+    int n;
+    uint8_t zn, zn4, _zn, _zn4;
+    uint64_t zP = 0;
 
-	for(n = 0;  n < 4 ; n++)
-	{
-		zn = getSixBitByte(c,n);
+    for(n = 0;  n < 4 ; n++)
+    {
+        zn = getSixBitByte(c,n);
 
-		zn4 = getSixBitByte(c,n+4);
+        zn4 = getSixBitByte(c,n+4);
 
-		_zn = (zn % (63-n)) + n;
-		_zn4 = (zn4 % (64-n)) + n;
+        _zn = (zn % (63-n)) + n;
+        _zn4 = (zn4 % (64-n)) + n;
 
-		pushbackSixBitByte(&zP, _zn,n);
-		pushbackSixBitByte(&zP, _zn4,n+4);
-	}
+        pushbackSixBitByte(&zP, _zn,n);
+        pushbackSixBitByte(&zP, _zn4,n+4);
+    }
 
-	printState("0|0|z'",zP);
+    printState("0|0|z'",zP);
 
-	uint64_t zCaret = check(zP);
-	printState("0|0|z^",zP);
+    uint64_t zCaret = check(zP);
+    printState("0|0|z^",zP);
 
-	uint8_t p = pi[x % 35];
+    uint8_t p = pi[x % 35];
 
-	if(x & 1) //Check if x7 is 1
-		p = ~p;
+    if(x & 1) //Check if x7 is 1
+        p = ~p;
 
-	if(debug_print >= 2) PrintAndLogDevice(DEBUG, "p:%02x", p);
+    if(debug_print >= 2) PrintAndLogDevice(DEBUG, "p:%02x", p);
 
-	BitstreamIn p_in = { &p, 8,0 };
-	uint8_t outbuffer[] = {0,0,0,0,0,0,0,0};
-	BitstreamOut out = {outbuffer,0,0};
-	permute(&p_in,zCaret,0,4,&out);//returns 48 bits? or 6 8-bytes
+    BitstreamIn p_in = { &p, 8,0 };
+    uint8_t outbuffer[] = {0,0,0,0,0,0,0,0};
+    BitstreamOut out = {outbuffer,0,0};
+    permute(&p_in,zCaret,0,4,&out);//returns 48 bits? or 6 8-bytes
 
-	//Out is now a buffer containing six-bit bytes, should be 48 bits
-	// if all went well
-	//Shift z-values down onto the lower segment
+    //Out is now a buffer containing six-bit bytes, should be 48 bits
+    // if all went well
+    //Shift z-values down onto the lower segment
 
     uint64_t zTilde = x_bytes_to_num(outbuffer,8);
 
-	zTilde >>= 16;
+    zTilde >>= 16;
 
-	printState("0|0|z~", zTilde);
+    printState("0|0|z~", zTilde);
 
-	int i;
-	int zerocounter =0 ;
-	for(i = 0; i < 8; i++)
-	{
-		// the key on index i is first a bit from y
-		// then six bits from z,
-		// then a bit from p
+    int i;
+    int zerocounter =0 ;
+    for(i = 0; i < 8; i++)
+    {
+        // the key on index i is first a bit from y
+        // then six bits from z,
+        // then a bit from p
 
-		// Init with zeroes
-		k[i] = 0;
-		// First, place yi leftmost in k
-		//k[i] |= (y  << i) & 0x80 ;
+        // Init with zeroes
+        k[i] = 0;
+        // First, place yi leftmost in k
+        //k[i] |= (y  << i) & 0x80 ;
 
-		// First, place y(7-i) leftmost in k
-		k[i] |= (y  << (7-i)) & 0x80 ;
+        // First, place y(7-i) leftmost in k
+        k[i] |= (y  << (7-i)) & 0x80 ;
 
 
 
-		uint8_t zTilde_i = getSixBitByte(zTilde, i);
-		// zTildeI is now on the form 00XXXXXX
-		// with one leftshift, it'll be
-		// 0XXXXXX0
-		// So after leftshift, we can OR it into k
-		// However, when doing complement, we need to
-		// again MASK 0XXXXXX0 (0x7E)
-		zTilde_i <<= 1;
+        uint8_t zTilde_i = getSixBitByte(zTilde, i);
+        // zTildeI is now on the form 00XXXXXX
+        // with one leftshift, it'll be
+        // 0XXXXXX0
+        // So after leftshift, we can OR it into k
+        // However, when doing complement, we need to
+        // again MASK 0XXXXXX0 (0x7E)
+        zTilde_i <<= 1;
 
-		//Finally, add bit from p or p-mod
-		//Shift bit i into rightmost location (mask only after complement)
-		uint8_t p_i = p >> i & 0x1;
+        //Finally, add bit from p or p-mod
+        //Shift bit i into rightmost location (mask only after complement)
+        uint8_t p_i = p >> i & 0x1;
 
-		if( k[i] )// yi = 1
-		{
-			//printf("k[%d] +1\n", i);
-			k[i] |= ~zTilde_i & 0x7E;
-			k[i] |= p_i & 1;
-			k[i] += 1;
+        if( k[i] )// yi = 1
+        {
+            //printf("k[%d] +1\n", i);
+            k[i] |= ~zTilde_i & 0x7E;
+            k[i] |= p_i & 1;
+            k[i] += 1;
 
-		}else // otherwise
-		{
-			k[i] |= zTilde_i & 0x7E;
-			k[i] |= (~p_i) & 1;
-		}
-		if ((k[i] & 1 )== 0)
-		{
-			zerocounter++;
-		}
-	}
+        }else // otherwise
+        {
+            k[i] |= zTilde_i & 0x7E;
+            k[i] |= (~p_i) & 1;
+        }
+        if ((k[i] & 1 )== 0)
+        {
+            zerocounter++;
+        }
+    }
 }
 /**
  * @brief Performs Elite-class key diversification
@@ -369,274 +369,274 @@ void hash0(uint64_t c, uint8_t k[8])
  */
 void diversifyKey(uint8_t csn[8], uint8_t key[8], uint8_t div_key[8])
 {
-	// Prepare the DES key
-	mbedtls_des_setkey_enc( &ctx_enc, key);
+    // Prepare the DES key
+    mbedtls_des_setkey_enc( &ctx_enc, key);
 
-	uint8_t crypted_csn[8] = {0};
+    uint8_t crypted_csn[8] = {0};
 
-	// Calculate DES(CSN, KEY)
-	mbedtls_des_crypt_ecb(&ctx_enc,csn, crypted_csn);
+    // Calculate DES(CSN, KEY)
+    mbedtls_des_crypt_ecb(&ctx_enc,csn, crypted_csn);
 
-	//Calculate HASH0(DES))
+    //Calculate HASH0(DES))
     uint64_t crypt_csn = x_bytes_to_num(crypted_csn, 8);
     //uint64_t crypted_csn_swapped = swapZvalues(crypt_csn);
 
-	hash0(crypt_csn,div_key);
+    hash0(crypt_csn,div_key);
 }
 
 void testPermute()
 {
-	uint64_t x = 0;
-	pushbackSixBitByte(&x,0x00,0);
-	pushbackSixBitByte(&x,0x01,1);
-	pushbackSixBitByte(&x,0x02,2);
-	pushbackSixBitByte(&x,0x03,3);
-	pushbackSixBitByte(&x,0x04,4);
-	pushbackSixBitByte(&x,0x05,5);
-	pushbackSixBitByte(&x,0x06,6);
-	pushbackSixBitByte(&x,0x07,7);
+    uint64_t x = 0;
+    pushbackSixBitByte(&x,0x00,0);
+    pushbackSixBitByte(&x,0x01,1);
+    pushbackSixBitByte(&x,0x02,2);
+    pushbackSixBitByte(&x,0x03,3);
+    pushbackSixBitByte(&x,0x04,4);
+    pushbackSixBitByte(&x,0x05,5);
+    pushbackSixBitByte(&x,0x06,6);
+    pushbackSixBitByte(&x,0x07,7);
 
-	uint8_t mres[8] = { getSixBitByte(x, 0),
-						getSixBitByte(x, 1),
-						getSixBitByte(x, 2),
-						getSixBitByte(x, 3),
-						getSixBitByte(x, 4),
-						getSixBitByte(x, 5),
-						getSixBitByte(x, 6),
-						getSixBitByte(x, 7)};
-	printarr("input_perm", mres,8);
+    uint8_t mres[8] = { getSixBitByte(x, 0),
+                        getSixBitByte(x, 1),
+                        getSixBitByte(x, 2),
+                        getSixBitByte(x, 3),
+                        getSixBitByte(x, 4),
+                        getSixBitByte(x, 5),
+                        getSixBitByte(x, 6),
+                        getSixBitByte(x, 7)};
+    printarr("input_perm", mres,8);
 
-	uint8_t p = ~pi[0];
-	BitstreamIn p_in = { &p, 8,0 };
-	uint8_t outbuffer[] = {0,0,0,0,0,0,0,0};
-	BitstreamOut out = {outbuffer,0,0};
+    uint8_t p = ~pi[0];
+    BitstreamIn p_in = { &p, 8,0 };
+    uint8_t outbuffer[] = {0,0,0,0,0,0,0,0};
+    BitstreamOut out = {outbuffer,0,0};
 
-	permute(&p_in, x,0,4, &out);
+    permute(&p_in, x,0,4, &out);
 
     uint64_t permuted = x_bytes_to_num(outbuffer,8);
-	//printf("zTilde 0x%"PRIX64"\n", zTilde);
-	permuted >>= 16;
+    //printf("zTilde 0x%"PRIX64"\n", zTilde);
+    permuted >>= 16;
 
-	uint8_t res[8] = { getSixBitByte(permuted, 0),
-						getSixBitByte(permuted, 1),
-						getSixBitByte(permuted, 2),
-						getSixBitByte(permuted, 3),
-						getSixBitByte(permuted, 4),
-						getSixBitByte(permuted, 5),
-						getSixBitByte(permuted, 6),
-						getSixBitByte(permuted, 7)};
-	printarr("permuted", res, 8);
+    uint8_t res[8] = { getSixBitByte(permuted, 0),
+                        getSixBitByte(permuted, 1),
+                        getSixBitByte(permuted, 2),
+                        getSixBitByte(permuted, 3),
+                        getSixBitByte(permuted, 4),
+                        getSixBitByte(permuted, 5),
+                        getSixBitByte(permuted, 6),
+                        getSixBitByte(permuted, 7)};
+    printarr("permuted", res, 8);
 }
 
 // These testcases are
 // { UID , TEMP_KEY, DIV_KEY} using the specific key
 typedef struct
 {
-	uint8_t uid[8];
-	uint8_t t_key[8];
-	uint8_t div_key[8];
+    uint8_t uid[8];
+    uint8_t t_key[8];
+    uint8_t div_key[8];
 } Testcase;
 
 int testDES(Testcase testcase, mbedtls_des_context ctx_enc, mbedtls_des_context ctx_dec)
 {
-	uint8_t des_encrypted_csn[8] = {0};
-	uint8_t decrypted[8] = {0};
-	uint8_t div_key[8] = {0};
-	int retval = mbedtls_des_crypt_ecb(&ctx_enc, testcase.uid, des_encrypted_csn);
-	retval |= mbedtls_des_crypt_ecb(&ctx_dec, des_encrypted_csn, decrypted);
+    uint8_t des_encrypted_csn[8] = {0};
+    uint8_t decrypted[8] = {0};
+    uint8_t div_key[8] = {0};
+    int retval = mbedtls_des_crypt_ecb(&ctx_enc, testcase.uid, des_encrypted_csn);
+    retval |= mbedtls_des_crypt_ecb(&ctx_dec, des_encrypted_csn, decrypted);
 
-	if (memcmp(testcase.uid, decrypted, 8) != 0) {
-		//Decryption fail
-		PrintAndLogDevice(FAILED, "Encryption <-> Decryption FAIL");
-		printarr("Input", testcase.uid, 8);
-		printarr("Decrypted", decrypted, 8);
-		retval = 1;
-	}
+    if (memcmp(testcase.uid, decrypted, 8) != 0) {
+        //Decryption fail
+        PrintAndLogDevice(FAILED, "Encryption <-> Decryption FAIL");
+        printarr("Input", testcase.uid, 8);
+        printarr("Decrypted", decrypted, 8);
+        retval = 1;
+    }
 
-	if (memcmp(des_encrypted_csn, testcase.t_key, 8) != 0) {
-		//Encryption fail
-		PrintAndLogDevice(FAILED, "Encryption != Expected result");
-		printarr("Output", des_encrypted_csn, 8);
-		printarr("Expected", testcase.t_key, 8);
-		retval = 1;
-	}
+    if (memcmp(des_encrypted_csn, testcase.t_key, 8) != 0) {
+        //Encryption fail
+        PrintAndLogDevice(FAILED, "Encryption != Expected result");
+        printarr("Output", des_encrypted_csn, 8);
+        printarr("Expected", testcase.t_key, 8);
+        retval = 1;
+    }
     uint64_t crypted_csn = x_bytes_to_num(des_encrypted_csn,8);
-	hash0(crypted_csn, div_key);
+    hash0(crypted_csn, div_key);
 
-	if (memcmp(div_key, testcase.div_key, 8) != 0) {
-		//Key diversification fail
-		PrintAndLogDevice(FAILED, "Div key != expected result");
-		printarr("  csn   ", testcase.uid,8);
-		printarr("{csn}   ", des_encrypted_csn,8);
-		printarr("hash0   ", div_key, 8);
-		printarr("Expected", testcase.div_key, 8);
-		retval = 1;
-	}
-	return retval;
+    if (memcmp(div_key, testcase.div_key, 8) != 0) {
+        //Key diversification fail
+        PrintAndLogDevice(FAILED, "Div key != expected result");
+        printarr("  csn   ", testcase.uid,8);
+        printarr("{csn}   ", des_encrypted_csn,8);
+        printarr("hash0   ", div_key, 8);
+        printarr("Expected", testcase.div_key, 8);
+        retval = 1;
+    }
+    return retval;
 }
 bool des_getParityBitFromKey(uint8_t key)
 { // The top 7 bits is used
-	bool parity = ((key & 0x80) >> 7)
-			^ ((key & 0x40) >> 6) ^ ((key & 0x20) >> 5)
-			^ ((key & 0x10) >> 4) ^ ((key & 0x08) >> 3)
-			^ ((key & 0x04) >> 2) ^ ((key & 0x02) >> 1);
-	return !parity;
+    bool parity = ((key & 0x80) >> 7)
+            ^ ((key & 0x40) >> 6) ^ ((key & 0x20) >> 5)
+            ^ ((key & 0x10) >> 4) ^ ((key & 0x08) >> 3)
+            ^ ((key & 0x04) >> 2) ^ ((key & 0x02) >> 1);
+    return !parity;
 }
 
 void des_checkParity(uint8_t* key) {
-	int i;
-	int fails = 0;
-	for (i = 0; i < 8; i++) {
-		bool parity = des_getParityBitFromKey(key[i]);
-		if (parity != (key[i] & 0x1)) {
-			fails++;
-			PrintAndLogDevice(FAILED, "parity1 fail, byte %d [%02x] was %d, should be %d", i, key[i], (key[i] & 0x1), parity);
-		}
-	}
-	if (fails) {
-		PrintAndLogDevice(FAILED, "parity fails: %d", fails);
-	} else {
-		PrintAndLogDevice(SUCCESS, "Key syntax is with parity bits inside each byte");
-	}
+    int i;
+    int fails = 0;
+    for (i = 0; i < 8; i++) {
+        bool parity = des_getParityBitFromKey(key[i]);
+        if (parity != (key[i] & 0x1)) {
+            fails++;
+            PrintAndLogDevice(FAILED, "parity1 fail, byte %d [%02x] was %d, should be %d", i, key[i], (key[i] & 0x1), parity);
+        }
+    }
+    if (fails) {
+        PrintAndLogDevice(FAILED, "parity fails: %d", fails);
+    } else {
+        PrintAndLogDevice(SUCCESS, "Key syntax is with parity bits inside each byte");
+    }
 }
 
 Testcase testcases[] ={
 
-	{{0x8B,0xAC,0x60,0x1F,0x53,0xB8,0xED,0x11},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x05,0x07}},
-	{{0xAE,0x51,0xE5,0x62,0xE7,0x9A,0x99,0x39},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01},{0x04,0x02,0x06,0x08,0x01,0x03,0x05,0x07}},
-	{{0x9B,0x21,0xE4,0x31,0x6A,0x00,0x29,0x62},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02},{0x06,0x04,0x02,0x08,0x01,0x03,0x05,0x07}},
-	{{0x65,0x24,0x0C,0x41,0x4F,0xC2,0x21,0x93},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04},{0x0A,0x04,0x06,0x08,0x01,0x03,0x05,0x07}},
-	{{0x7F,0xEB,0xAE,0x93,0xE5,0x30,0x08,0xBD},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08},{0x12,0x04,0x06,0x08,0x01,0x03,0x05,0x07}},
-	{{0x49,0x7B,0x70,0x74,0x9B,0x35,0x1B,0x83},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10},{0x22,0x04,0x06,0x08,0x01,0x03,0x05,0x07}},
-	{{0x02,0x3C,0x15,0x6B,0xED,0xA5,0x64,0x6C},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20},{0x42,0x04,0x06,0x08,0x01,0x03,0x05,0x07}},
-	{{0xE8,0x37,0xE0,0xE2,0xC6,0x45,0x24,0xF3},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x40},{0x02,0x06,0x04,0x08,0x01,0x03,0x05,0x07}},
-	{{0xAB,0xBD,0x30,0x05,0x29,0xC8,0xF7,0x12},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80},{0x02,0x08,0x06,0x04,0x01,0x03,0x05,0x07}},
-	{{0x17,0xE8,0x97,0xF0,0x99,0xB6,0x79,0x31},{0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00},{0x02,0x0C,0x06,0x08,0x01,0x03,0x05,0x07}},
-	{{0x49,0xA4,0xF0,0x8F,0x5F,0x96,0x83,0x16},{0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00},{0x02,0x14,0x06,0x08,0x01,0x03,0x05,0x07}},
-	{{0x60,0xF5,0x7E,0x54,0xAA,0x41,0x83,0xD4},{0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x00},{0x02,0x24,0x06,0x08,0x01,0x03,0x05,0x07}},
-	{{0x1D,0xF6,0x3B,0x6B,0x85,0x55,0xF0,0x4B},{0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x00},{0x02,0x44,0x06,0x08,0x01,0x03,0x05,0x07}},
-	{{0x1F,0xDC,0x95,0x1A,0xEA,0x6B,0x4B,0xB4},{0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00},{0x02,0x04,0x08,0x06,0x01,0x03,0x05,0x07}},
-	{{0xEC,0x93,0x72,0xF0,0x3B,0xA9,0xF5,0x0B},{0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00},{0x02,0x04,0x0A,0x08,0x01,0x03,0x05,0x07}},
-	{{0xDE,0x57,0x5C,0xBE,0x2D,0x55,0x03,0x12},{0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x00},{0x02,0x04,0x0E,0x08,0x01,0x03,0x05,0x07}},
-	{{0x1E,0xD2,0xB5,0xCE,0x90,0xC9,0xC1,0xCC},{0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00},{0x02,0x04,0x16,0x08,0x01,0x03,0x05,0x07}},
-	{{0xD8,0x65,0x96,0x4E,0xE7,0x74,0x99,0xB8},{0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00},{0x02,0x04,0x26,0x08,0x01,0x03,0x05,0x07}},
-	{{0xE3,0x7A,0x29,0x83,0x31,0xD5,0x3A,0x54},{0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x00},{0x02,0x04,0x46,0x08,0x01,0x03,0x05,0x07}},
-	{{0x3A,0xB5,0x1A,0x34,0x34,0x25,0x12,0xF0},{0x00,0x00,0x00,0x00,0x00,0x04,0x00,0x00},{0x02,0x04,0x06,0x0A,0x01,0x03,0x05,0x07}},
-	{{0xF2,0x88,0xEE,0x6F,0x70,0x6F,0xC2,0x52},{0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x00},{0x02,0x04,0x06,0x0C,0x01,0x03,0x05,0x07}},
-	{{0x76,0xEF,0xEB,0x80,0x52,0x43,0x83,0x57},{0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x00},{0x02,0x04,0x06,0x10,0x01,0x03,0x05,0x07}},
-	{{0x1C,0x09,0x8E,0x3B,0x23,0x23,0x52,0xB5},{0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00},{0x02,0x04,0x06,0x18,0x01,0x03,0x05,0x07}},
-	{{0xA9,0x13,0xA2,0xBE,0xCF,0x1A,0xC4,0x9A},{0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x00},{0x02,0x04,0x06,0x28,0x01,0x03,0x05,0x07}},
-	{{0x25,0x56,0x4B,0xB0,0xC8,0x2A,0xD4,0x27},{0x00,0x00,0x00,0x00,0x00,0x80,0x00,0x00},{0x02,0x04,0x06,0x48,0x01,0x03,0x05,0x07}},
-	{{0xB1,0x04,0x57,0x3F,0xA7,0x16,0x62,0xD4},{0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x03,0x01,0x05,0x07}},
-	{{0x45,0x46,0xED,0xCC,0xE7,0xD3,0x8E,0xA3},{0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x05,0x03,0x01,0x07}},
-	{{0x22,0x6D,0xB5,0x35,0xE0,0x5A,0xE0,0x90},{0x00,0x00,0x00,0x00,0x04,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x09,0x03,0x05,0x07}},
-	{{0xB8,0xF5,0xE5,0x44,0xC5,0x98,0x4A,0xBD},{0x00,0x00,0x00,0x00,0x08,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x11,0x03,0x05,0x07}},
-	{{0xAC,0x78,0x0A,0x23,0x9E,0xF6,0xBC,0xA0},{0x00,0x00,0x00,0x00,0x10,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x21,0x03,0x05,0x07}},
-	{{0x46,0x6B,0x2D,0x70,0x41,0x17,0xBF,0x3D},{0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x41,0x03,0x05,0x07}},
-	{{0x64,0x44,0x24,0x71,0xA2,0x56,0xDF,0xB5},{0x00,0x00,0x00,0x00,0x40,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x05,0x03,0x07}},
-	{{0xC4,0x00,0x52,0x24,0xA2,0xD6,0x16,0x7A},{0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x07,0x05,0x03}},
-	{{0xD8,0x4A,0x80,0x1E,0x95,0x5B,0x70,0xC4},{0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x0B,0x05,0x07}},
-	{{0x08,0x56,0x6E,0xB5,0x64,0xD6,0x47,0x4E},{0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x13,0x05,0x07}},
-	{{0x41,0x6F,0xBA,0xA4,0xEB,0xAE,0xA0,0x55},{0x00,0x00,0x00,0x04,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x23,0x05,0x07}},
-	{{0x62,0x9D,0xDE,0x72,0x84,0x4A,0x53,0xD5},{0x00,0x00,0x00,0x08,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x43,0x05,0x07}},
-	{{0x39,0xD3,0x2B,0x66,0xB8,0x08,0x40,0x2E},{0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x07,0x05}},
-	{{0xAF,0x67,0xA9,0x18,0x57,0x21,0xAF,0x8D},{0x00,0x00,0x00,0x20,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x09,0x07}},
-	{{0x34,0xBC,0x9D,0xBC,0xC4,0xC2,0x3B,0xC8},{0x00,0x00,0x00,0x40,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x0D,0x07}},
-	{{0xB6,0x50,0xF9,0x81,0xF6,0xBF,0x90,0x3C},{0x00,0x00,0x00,0x80,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x15,0x07}},
-	{{0x71,0x41,0x93,0xA1,0x59,0x81,0xA5,0x52},{0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x25,0x07}},
-	{{0x6B,0x00,0xBD,0x74,0x1C,0x3C,0xE0,0x1A},{0x00,0x00,0x02,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x45,0x07}},
-	{{0x76,0xFD,0x0B,0xD0,0x41,0xD2,0x82,0x5D},{0x00,0x00,0x04,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x05,0x09}},
-	{{0xC6,0x3A,0x1C,0x25,0x63,0x5A,0x2F,0x0E},{0x00,0x00,0x08,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x05,0x0B}},
-	{{0xD9,0x0E,0xD7,0x30,0xE2,0xAD,0xA9,0x87},{0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x05,0x0F}},
-	{{0x6B,0x81,0xC6,0xD1,0x05,0x09,0x87,0x1E},{0x00,0x00,0x20,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x05,0x17}},
-	{{0xB4,0xA7,0x1E,0x02,0x54,0x37,0x43,0x35},{0x00,0x00,0x40,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x05,0x27}},
-	{{0x45,0x14,0x7C,0x7F,0xE0,0xDE,0x09,0x65},{0x00,0x00,0x80,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x05,0x47}},
-	{{0x78,0xB0,0xF5,0x20,0x8B,0x7D,0xF3,0xDD},{0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00},{0xFE,0x04,0x06,0x08,0x01,0x03,0x05,0x07}},
-	{{0x88,0xB3,0x3C,0xE1,0xF7,0x87,0x42,0xA1},{0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00},{0x02,0xFC,0x06,0x08,0x01,0x03,0x05,0x07}},
-	{{0x11,0x2F,0xB2,0xF7,0xE2,0xB2,0x4F,0x6E},{0x00,0x04,0x00,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0xFA,0x08,0x01,0x03,0x05,0x07}},
-	{{0x25,0x56,0x4E,0xC6,0xEB,0x2D,0x74,0x5B},{0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0xF8,0x01,0x03,0x05,0x07}},
-	{{0x7E,0x98,0x37,0xF9,0x80,0x8F,0x09,0x82},{0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0xFF,0x03,0x05,0x07}},
-	{{0xF9,0xB5,0x62,0x3B,0xD8,0x7B,0x3C,0x3F},{0x00,0x20,0x00,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0xFD,0x05,0x07}},
-	{{0x29,0xC5,0x2B,0xFA,0xD1,0xFC,0x5C,0xC7},{0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0xFB,0x07}},
-	{{0xC1,0xA3,0x09,0x71,0xBD,0x8E,0xAF,0x2F},{0x00,0x80,0x00,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x05,0xF9}},
-	{{0xB6,0xDD,0xD1,0xAD,0xAA,0x15,0x6F,0x29},{0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x01,0x03,0x05,0x02,0x07,0x04,0x06,0x08}},
-	{{0x65,0x34,0x03,0x19,0x17,0xB3,0xA3,0x96},{0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x01,0x06,0x08,0x03,0x05,0x07}},
-	{{0xF9,0x38,0x43,0x56,0x52,0xE5,0xB1,0xA9},{0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x01,0x02,0x04,0x06,0x08,0x03,0x05,0x07}},
+    {{0x8B,0xAC,0x60,0x1F,0x53,0xB8,0xED,0x11},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x05,0x07}},
+    {{0xAE,0x51,0xE5,0x62,0xE7,0x9A,0x99,0x39},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01},{0x04,0x02,0x06,0x08,0x01,0x03,0x05,0x07}},
+    {{0x9B,0x21,0xE4,0x31,0x6A,0x00,0x29,0x62},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02},{0x06,0x04,0x02,0x08,0x01,0x03,0x05,0x07}},
+    {{0x65,0x24,0x0C,0x41,0x4F,0xC2,0x21,0x93},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04},{0x0A,0x04,0x06,0x08,0x01,0x03,0x05,0x07}},
+    {{0x7F,0xEB,0xAE,0x93,0xE5,0x30,0x08,0xBD},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08},{0x12,0x04,0x06,0x08,0x01,0x03,0x05,0x07}},
+    {{0x49,0x7B,0x70,0x74,0x9B,0x35,0x1B,0x83},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10},{0x22,0x04,0x06,0x08,0x01,0x03,0x05,0x07}},
+    {{0x02,0x3C,0x15,0x6B,0xED,0xA5,0x64,0x6C},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20},{0x42,0x04,0x06,0x08,0x01,0x03,0x05,0x07}},
+    {{0xE8,0x37,0xE0,0xE2,0xC6,0x45,0x24,0xF3},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x40},{0x02,0x06,0x04,0x08,0x01,0x03,0x05,0x07}},
+    {{0xAB,0xBD,0x30,0x05,0x29,0xC8,0xF7,0x12},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80},{0x02,0x08,0x06,0x04,0x01,0x03,0x05,0x07}},
+    {{0x17,0xE8,0x97,0xF0,0x99,0xB6,0x79,0x31},{0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00},{0x02,0x0C,0x06,0x08,0x01,0x03,0x05,0x07}},
+    {{0x49,0xA4,0xF0,0x8F,0x5F,0x96,0x83,0x16},{0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00},{0x02,0x14,0x06,0x08,0x01,0x03,0x05,0x07}},
+    {{0x60,0xF5,0x7E,0x54,0xAA,0x41,0x83,0xD4},{0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x00},{0x02,0x24,0x06,0x08,0x01,0x03,0x05,0x07}},
+    {{0x1D,0xF6,0x3B,0x6B,0x85,0x55,0xF0,0x4B},{0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x00},{0x02,0x44,0x06,0x08,0x01,0x03,0x05,0x07}},
+    {{0x1F,0xDC,0x95,0x1A,0xEA,0x6B,0x4B,0xB4},{0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00},{0x02,0x04,0x08,0x06,0x01,0x03,0x05,0x07}},
+    {{0xEC,0x93,0x72,0xF0,0x3B,0xA9,0xF5,0x0B},{0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00},{0x02,0x04,0x0A,0x08,0x01,0x03,0x05,0x07}},
+    {{0xDE,0x57,0x5C,0xBE,0x2D,0x55,0x03,0x12},{0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x00},{0x02,0x04,0x0E,0x08,0x01,0x03,0x05,0x07}},
+    {{0x1E,0xD2,0xB5,0xCE,0x90,0xC9,0xC1,0xCC},{0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00},{0x02,0x04,0x16,0x08,0x01,0x03,0x05,0x07}},
+    {{0xD8,0x65,0x96,0x4E,0xE7,0x74,0x99,0xB8},{0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00},{0x02,0x04,0x26,0x08,0x01,0x03,0x05,0x07}},
+    {{0xE3,0x7A,0x29,0x83,0x31,0xD5,0x3A,0x54},{0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x00},{0x02,0x04,0x46,0x08,0x01,0x03,0x05,0x07}},
+    {{0x3A,0xB5,0x1A,0x34,0x34,0x25,0x12,0xF0},{0x00,0x00,0x00,0x00,0x00,0x04,0x00,0x00},{0x02,0x04,0x06,0x0A,0x01,0x03,0x05,0x07}},
+    {{0xF2,0x88,0xEE,0x6F,0x70,0x6F,0xC2,0x52},{0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x00},{0x02,0x04,0x06,0x0C,0x01,0x03,0x05,0x07}},
+    {{0x76,0xEF,0xEB,0x80,0x52,0x43,0x83,0x57},{0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x00},{0x02,0x04,0x06,0x10,0x01,0x03,0x05,0x07}},
+    {{0x1C,0x09,0x8E,0x3B,0x23,0x23,0x52,0xB5},{0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00},{0x02,0x04,0x06,0x18,0x01,0x03,0x05,0x07}},
+    {{0xA9,0x13,0xA2,0xBE,0xCF,0x1A,0xC4,0x9A},{0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x00},{0x02,0x04,0x06,0x28,0x01,0x03,0x05,0x07}},
+    {{0x25,0x56,0x4B,0xB0,0xC8,0x2A,0xD4,0x27},{0x00,0x00,0x00,0x00,0x00,0x80,0x00,0x00},{0x02,0x04,0x06,0x48,0x01,0x03,0x05,0x07}},
+    {{0xB1,0x04,0x57,0x3F,0xA7,0x16,0x62,0xD4},{0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x03,0x01,0x05,0x07}},
+    {{0x45,0x46,0xED,0xCC,0xE7,0xD3,0x8E,0xA3},{0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x05,0x03,0x01,0x07}},
+    {{0x22,0x6D,0xB5,0x35,0xE0,0x5A,0xE0,0x90},{0x00,0x00,0x00,0x00,0x04,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x09,0x03,0x05,0x07}},
+    {{0xB8,0xF5,0xE5,0x44,0xC5,0x98,0x4A,0xBD},{0x00,0x00,0x00,0x00,0x08,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x11,0x03,0x05,0x07}},
+    {{0xAC,0x78,0x0A,0x23,0x9E,0xF6,0xBC,0xA0},{0x00,0x00,0x00,0x00,0x10,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x21,0x03,0x05,0x07}},
+    {{0x46,0x6B,0x2D,0x70,0x41,0x17,0xBF,0x3D},{0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x41,0x03,0x05,0x07}},
+    {{0x64,0x44,0x24,0x71,0xA2,0x56,0xDF,0xB5},{0x00,0x00,0x00,0x00,0x40,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x05,0x03,0x07}},
+    {{0xC4,0x00,0x52,0x24,0xA2,0xD6,0x16,0x7A},{0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x07,0x05,0x03}},
+    {{0xD8,0x4A,0x80,0x1E,0x95,0x5B,0x70,0xC4},{0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x0B,0x05,0x07}},
+    {{0x08,0x56,0x6E,0xB5,0x64,0xD6,0x47,0x4E},{0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x13,0x05,0x07}},
+    {{0x41,0x6F,0xBA,0xA4,0xEB,0xAE,0xA0,0x55},{0x00,0x00,0x00,0x04,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x23,0x05,0x07}},
+    {{0x62,0x9D,0xDE,0x72,0x84,0x4A,0x53,0xD5},{0x00,0x00,0x00,0x08,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x43,0x05,0x07}},
+    {{0x39,0xD3,0x2B,0x66,0xB8,0x08,0x40,0x2E},{0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x07,0x05}},
+    {{0xAF,0x67,0xA9,0x18,0x57,0x21,0xAF,0x8D},{0x00,0x00,0x00,0x20,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x09,0x07}},
+    {{0x34,0xBC,0x9D,0xBC,0xC4,0xC2,0x3B,0xC8},{0x00,0x00,0x00,0x40,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x0D,0x07}},
+    {{0xB6,0x50,0xF9,0x81,0xF6,0xBF,0x90,0x3C},{0x00,0x00,0x00,0x80,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x15,0x07}},
+    {{0x71,0x41,0x93,0xA1,0x59,0x81,0xA5,0x52},{0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x25,0x07}},
+    {{0x6B,0x00,0xBD,0x74,0x1C,0x3C,0xE0,0x1A},{0x00,0x00,0x02,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x45,0x07}},
+    {{0x76,0xFD,0x0B,0xD0,0x41,0xD2,0x82,0x5D},{0x00,0x00,0x04,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x05,0x09}},
+    {{0xC6,0x3A,0x1C,0x25,0x63,0x5A,0x2F,0x0E},{0x00,0x00,0x08,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x05,0x0B}},
+    {{0xD9,0x0E,0xD7,0x30,0xE2,0xAD,0xA9,0x87},{0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x05,0x0F}},
+    {{0x6B,0x81,0xC6,0xD1,0x05,0x09,0x87,0x1E},{0x00,0x00,0x20,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x05,0x17}},
+    {{0xB4,0xA7,0x1E,0x02,0x54,0x37,0x43,0x35},{0x00,0x00,0x40,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x05,0x27}},
+    {{0x45,0x14,0x7C,0x7F,0xE0,0xDE,0x09,0x65},{0x00,0x00,0x80,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x05,0x47}},
+    {{0x78,0xB0,0xF5,0x20,0x8B,0x7D,0xF3,0xDD},{0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00},{0xFE,0x04,0x06,0x08,0x01,0x03,0x05,0x07}},
+    {{0x88,0xB3,0x3C,0xE1,0xF7,0x87,0x42,0xA1},{0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00},{0x02,0xFC,0x06,0x08,0x01,0x03,0x05,0x07}},
+    {{0x11,0x2F,0xB2,0xF7,0xE2,0xB2,0x4F,0x6E},{0x00,0x04,0x00,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0xFA,0x08,0x01,0x03,0x05,0x07}},
+    {{0x25,0x56,0x4E,0xC6,0xEB,0x2D,0x74,0x5B},{0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0xF8,0x01,0x03,0x05,0x07}},
+    {{0x7E,0x98,0x37,0xF9,0x80,0x8F,0x09,0x82},{0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0xFF,0x03,0x05,0x07}},
+    {{0xF9,0xB5,0x62,0x3B,0xD8,0x7B,0x3C,0x3F},{0x00,0x20,0x00,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0xFD,0x05,0x07}},
+    {{0x29,0xC5,0x2B,0xFA,0xD1,0xFC,0x5C,0xC7},{0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0xFB,0x07}},
+    {{0xC1,0xA3,0x09,0x71,0xBD,0x8E,0xAF,0x2F},{0x00,0x80,0x00,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x05,0xF9}},
+    {{0xB6,0xDD,0xD1,0xAD,0xAA,0x15,0x6F,0x29},{0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x01,0x03,0x05,0x02,0x07,0x04,0x06,0x08}},
+    {{0x65,0x34,0x03,0x19,0x17,0xB3,0xA3,0x96},{0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x01,0x06,0x08,0x03,0x05,0x07}},
+    {{0xF9,0x38,0x43,0x56,0x52,0xE5,0xB1,0xA9},{0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x01,0x02,0x04,0x06,0x08,0x03,0x05,0x07}},
 
-	{{0xA4,0xA0,0xAF,0xDA,0x48,0xB0,0xA1,0x10},{0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x01,0x02,0x04,0x06,0x03,0x08,0x05,0x07}},
-	{{0x55,0x15,0x8A,0x0D,0x48,0x29,0x01,0xD8},{0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x01,0x06,0x03,0x05,0x08,0x07}},
-	{{0xC4,0x81,0x96,0x7D,0xA3,0xB7,0x73,0x50},{0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x01,0x02,0x03,0x05,0x04,0x06,0x08,0x07}},
-	{{0x36,0x73,0xDF,0xC1,0x1B,0x98,0xA8,0x1D},{0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x01,0x02,0x03,0x04,0x05,0x06,0x08,0x07}},
-	{{0xCE,0xE0,0xB3,0x1B,0x41,0xEB,0x15,0x12},{0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x01,0x02,0x03,0x04,0x06,0x05,0x08,0x07}},
-	{{0},{0},{0}}
+    {{0xA4,0xA0,0xAF,0xDA,0x48,0xB0,0xA1,0x10},{0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x01,0x02,0x04,0x06,0x03,0x08,0x05,0x07}},
+    {{0x55,0x15,0x8A,0x0D,0x48,0x29,0x01,0xD8},{0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x01,0x06,0x03,0x05,0x08,0x07}},
+    {{0xC4,0x81,0x96,0x7D,0xA3,0xB7,0x73,0x50},{0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x01,0x02,0x03,0x05,0x04,0x06,0x08,0x07}},
+    {{0x36,0x73,0xDF,0xC1,0x1B,0x98,0xA8,0x1D},{0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x01,0x02,0x03,0x04,0x05,0x06,0x08,0x07}},
+    {{0xCE,0xE0,0xB3,0x1B,0x41,0xEB,0x15,0x12},{0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x01,0x02,0x03,0x04,0x06,0x05,0x08,0x07}},
+    {{0},{0},{0}}
 };
 
 int testKeyDiversificationWithMasterkeyTestcases() {
-	int i, error = 0;
-	uint8_t empty[8] = {0};
+    int i, error = 0;
+    uint8_t empty[8] = {0};
 
-	PrintAndLogDevice(INFO, "Testing encryption/decryption");
+    PrintAndLogDevice(INFO, "Testing encryption/decryption");
 
-	for (i = 0; memcmp(testcases+i, empty, 8); i++)
-		error += testDES(testcases[i], ctx_enc, ctx_dec);
+    for (i = 0; memcmp(testcases+i, empty, 8); i++)
+        error += testDES(testcases[i], ctx_enc, ctx_dec);
 
-	if (error)
-		PrintAndLogDevice(FAILED, "%d errors occurred (%d testcases)", error, i);
-	else
-		PrintAndLogDevice(SUCCESS, "Hashing seems to work (%d testcases)", i);
-	return error;
+    if (error)
+        PrintAndLogDevice(FAILED, "%d errors occurred (%d testcases)", error, i);
+    else
+        PrintAndLogDevice(SUCCESS, "Hashing seems to work (%d testcases)", i);
+    return error;
 }
 
 void print64bits(char*name, uint64_t val) {
-	printf("%s%08x%08x\n", name, (uint32_t) (val >> 32) ,(uint32_t) (val & 0xFFFFFFFF));
+    printf("%s%08x%08x\n", name, (uint32_t) (val >> 32) ,(uint32_t) (val & 0xFFFFFFFF));
 }
 
 uint64_t testCryptedCSN(uint64_t crypted_csn, uint64_t expected)
 {
-	int retval = 0;
-	uint8_t result[8] = {0};
-	if (debug_print) PrintAndLogDevice(DEBUG, "debug_print %d", debug_print);
-	if (debug_print) print64bits("    {csn}      ", crypted_csn );
+    int retval = 0;
+    uint8_t result[8] = {0};
+    if (debug_print) PrintAndLogDevice(DEBUG, "debug_print %d", debug_print);
+    if (debug_print) print64bits("    {csn}      ", crypted_csn );
 
-	uint64_t crypted_csn_swapped = swapZvalues(crypted_csn);
+    uint64_t crypted_csn_swapped = swapZvalues(crypted_csn);
 
-	if (debug_print) print64bits("    {csn-revz} ", crypted_csn_swapped);
+    if (debug_print) print64bits("    {csn-revz} ", crypted_csn_swapped);
 
-	hash0(crypted_csn, result);
+    hash0(crypted_csn, result);
     uint64_t resultbyte = x_bytes_to_num(result,8 );
-	if (debug_print) print64bits("    hash0      " , resultbyte );
+    if (debug_print) print64bits("    hash0      " , resultbyte );
 
-	if (resultbyte != expected ) {
-		if (debug_print) {
-			PrintAndLogDevice(NORMAL, "\n"); PrintAndLogDevice(FAILED, "FAIL!");
-			print64bits("    expected       " ,  expected );
-		}
-		retval = 1;
-	} else {
-		if (debug_print) PrintAndLogDevice(SUCCESS, "[OK]");
-	}
-	return retval;
+    if (resultbyte != expected ) {
+        if (debug_print) {
+            PrintAndLogDevice(NORMAL, "\n"); PrintAndLogDevice(FAILED, "FAIL!");
+            print64bits("    expected       " ,  expected );
+        }
+        retval = 1;
+    } else {
+        if (debug_print) PrintAndLogDevice(SUCCESS, "[OK]");
+    }
+    return retval;
 }
 
 int testDES2(uint64_t csn, uint64_t expected) {
-	uint8_t result[8] = {0};
-	uint8_t input[8] = {0};
+    uint8_t result[8] = {0};
+    uint8_t input[8] = {0};
 
-	print64bits("   csn ", csn);
+    print64bits("   csn ", csn);
     x_num_to_bytes(csn, 8, input);
 
-	mbedtls_des_crypt_ecb(&ctx_enc, input, result);
+    mbedtls_des_crypt_ecb(&ctx_enc, input, result);
 
     uint64_t crypt_csn = x_bytes_to_num(result, 8);
-	print64bits("   {csn}    ", crypt_csn );
-	print64bits("   expected ", expected );
+    print64bits("   {csn}    ", crypt_csn );
+    print64bits("   expected ", expected );
 
-	if( expected == crypt_csn ) {
-		PrintAndLogDevice(SUCCESS, "OK");
-		return 0;
-	} else {
-		return 1;
-	}
+    if( expected == crypt_csn ) {
+        PrintAndLogDevice(SUCCESS, "OK");
+        return 0;
+    } else {
+        return 1;
+    }
 }
 
 /**
@@ -645,94 +645,94 @@ int testDES2(uint64_t csn, uint64_t expected) {
  * @return
  */
 int doTestsWithKnownInputs() {
-	// KSel from http://www.proxmark.org/forum/viewtopic.php?pid=10977#p10977
-	int errors = 0;
-	PrintAndLogDevice(SUCCESS, "Testing DES encryption");
-	uint8_t key[8] = {0x6c,0x8d,0x44,0xf9,0x2a,0x2d,0x01,0xbf};
+    // KSel from http://www.proxmark.org/forum/viewtopic.php?pid=10977#p10977
+    int errors = 0;
+    PrintAndLogDevice(SUCCESS, "Testing DES encryption");
+    uint8_t key[8] = {0x6c,0x8d,0x44,0xf9,0x2a,0x2d,0x01,0xbf};
 
-	mbedtls_des_setkey_enc( &ctx_enc, key);
-	testDES2(0xbbbbaaaabbbbeeee,0xd6ad3ca619659e6b);
+    mbedtls_des_setkey_enc( &ctx_enc, key);
+    testDES2(0xbbbbaaaabbbbeeee,0xd6ad3ca619659e6b);
 
-	PrintAndLogDevice(SUCCESS, "Testing hashing algorithm");
+    PrintAndLogDevice(SUCCESS, "Testing hashing algorithm");
 
-	errors += testCryptedCSN(0x0102030405060708,0x0bdd6512073c460a);
-	errors += testCryptedCSN(0x1020304050607080,0x0208211405f3381f);
-	errors += testCryptedCSN(0x1122334455667788,0x2bee256d40ac1f3a);
-	errors += testCryptedCSN(0xabcdabcdabcdabcd,0xa91c9ec66f7da592);
-	errors += testCryptedCSN(0xbcdabcdabcdabcda,0x79ca5796a474e19b);
-	errors += testCryptedCSN(0xcdabcdabcdabcdab,0xa8901b9f7ec76da4);
-	errors += testCryptedCSN(0xdabcdabcdabcdabc,0x357aa8e0979a5b8d);
-	errors += testCryptedCSN(0x21ba6565071f9299,0x34e80f88d5cf39ea);
-	errors += testCryptedCSN(0x14e2adfc5bb7e134,0x6ac90c6508bd9ea3);
+    errors += testCryptedCSN(0x0102030405060708,0x0bdd6512073c460a);
+    errors += testCryptedCSN(0x1020304050607080,0x0208211405f3381f);
+    errors += testCryptedCSN(0x1122334455667788,0x2bee256d40ac1f3a);
+    errors += testCryptedCSN(0xabcdabcdabcdabcd,0xa91c9ec66f7da592);
+    errors += testCryptedCSN(0xbcdabcdabcdabcda,0x79ca5796a474e19b);
+    errors += testCryptedCSN(0xcdabcdabcdabcdab,0xa8901b9f7ec76da4);
+    errors += testCryptedCSN(0xdabcdabcdabcdabc,0x357aa8e0979a5b8d);
+    errors += testCryptedCSN(0x21ba6565071f9299,0x34e80f88d5cf39ea);
+    errors += testCryptedCSN(0x14e2adfc5bb7e134,0x6ac90c6508bd9ea3);
 
-	if (errors)
-		PrintAndLogDevice(FAILED, "%d errors occurred (9 testcases)", errors);
-	else
-		PrintAndLogDevice(SUCCESS, "Hashing seems to work (9 testcases)" );
-	return errors;
+    if (errors)
+        PrintAndLogDevice(FAILED, "%d errors occurred (9 testcases)", errors);
+    else
+        PrintAndLogDevice(SUCCESS, "Hashing seems to work (9 testcases)" );
+    return errors;
 }
 
 static bool readKeyFile(uint8_t key[8]) {
-	bool retval = false;
+    bool retval = false;
 
-	//Test a few variants
-	char filename[30] = {0};
+    //Test a few variants
+    char filename[30] = {0};
 
-	if (fileExists("iclass_key.bin")){
-		sprintf(filename, "%s.bin", "iclass_key");
-	} else if (fileExists("loclass/iclass_key.bin")){
-		sprintf(filename, "%s.bin", "loclass/iclass_key");
-	} else if (fileExists("client/loclass/iclass_key.bin")){
-		sprintf(filename, "%s.bin", "client/loclass/iclass_key");
-	}
+    if (fileExists("iclass_key.bin")){
+        sprintf(filename, "%s.bin", "iclass_key");
+    } else if (fileExists("loclass/iclass_key.bin")){
+        sprintf(filename, "%s.bin", "loclass/iclass_key");
+    } else if (fileExists("client/loclass/iclass_key.bin")){
+        sprintf(filename, "%s.bin", "client/loclass/iclass_key");
+    }
 
-	if ( strlen(filename) == 0 )
-		return retval;
+    if ( strlen(filename) == 0 )
+        return retval;
 
-	FILE *f = fopen(filename, "rb");
-	if (!f)
-		return retval;
+    FILE *f = fopen(filename, "rb");
+    if (!f)
+        return retval;
 
-	size_t bytes_read = fread(key, sizeof(uint8_t), 8, f);
-	if ( bytes_read == 8)
-		retval = true;
+    size_t bytes_read = fread(key, sizeof(uint8_t), 8, f);
+    if ( bytes_read == 8)
+        retval = true;
 
-	if (f)
-		fclose(f);
-	return retval;
+    if (f)
+        fclose(f);
+    return retval;
 }
 
 int doKeyTests(uint8_t debuglevel) {
-	debug_print = debuglevel;
+    debug_print = debuglevel;
 
-	PrintAndLogDevice(INFO, "Checking if the master key is present (iclass_key.bin)...");
-	uint8_t key[8] = {0};
-	if (!readKeyFile(key)) {
-		PrintAndLogDevice(FAILED, "Master key not present, will not be able to do all testcases");
-	} else {
+    PrintAndLogDevice(INFO, "Checking if the master key is present (iclass_key.bin)...");
+    uint8_t key[8] = {0};
+    if (!readKeyFile(key)) {
+        PrintAndLogDevice(FAILED, "Master key not present, will not be able to do all testcases");
+    } else {
 
-		//Test if it's the right key...
-		uint8_t i;
-		uint8_t j = 0;
-		for (i = 0; i < sizeof(key); i++)
-			j += key[i];
+        //Test if it's the right key...
+        uint8_t i;
+        uint8_t j = 0;
+        for (i = 0; i < sizeof(key); i++)
+            j += key[i];
 
-		if (j != 185) {
-			PrintAndLogDevice(INFO, "A key was loaded, but it does not seem to be the correct one. Aborting these tests");
-		} else {
-			PrintAndLogDevice(SUCCESS, "Key present");
-			PrintAndLogDevice(SUCCESS, "Checking key parity...");
-			des_checkParity(key);
-			mbedtls_des_setkey_enc( &ctx_enc, key);
-			mbedtls_des_setkey_dec( &ctx_dec, key);
-			// Test hashing functions
-			PrintAndLogDevice(SUCCESS, "The following tests require the correct 8-byte master key");
-			testKeyDiversificationWithMasterkeyTestcases();
-		}
-	}
-	PrintAndLogDevice(SUCCESS, "Testing key diversification with non-sensitive keys...");
-	doTestsWithKnownInputs();
-	return 0;
+        if (j != 185) {
+            PrintAndLogDevice(INFO, "A key was loaded, but it does not seem to be the correct one. Aborting these tests");
+        } else {
+            PrintAndLogDevice(SUCCESS, "Key present");
+            PrintAndLogDevice(SUCCESS, "Checking key parity...");
+            des_checkParity(key);
+            mbedtls_des_setkey_enc( &ctx_enc, key);
+            mbedtls_des_setkey_dec( &ctx_dec, key);
+            // Test hashing functions
+            PrintAndLogDevice(SUCCESS, "The following tests require the correct 8-byte master key");
+            testKeyDiversificationWithMasterkeyTestcases();
+        }
+    }
+    PrintAndLogDevice(SUCCESS, "Testing key diversification with non-sensitive keys...");
+    doTestsWithKnownInputs();
+    return 0;
 }
 
 /**
@@ -740,87 +740,87 @@ int doKeyTests(uint8_t debuglevel) {
 void checkParity2(uint8_t* key)
 {
 
-	uint8_t stored_parity = key[7];
-	printf("Parity byte: 0x%02x\n", stored_parity);
-	int i;
-	int byte;
-	int fails =0;
-	BitstreamIn bits = {key, 56, 0};
+    uint8_t stored_parity = key[7];
+    printf("Parity byte: 0x%02x\n", stored_parity);
+    int i;
+    int byte;
+    int fails =0;
+    BitstreamIn bits = {key, 56, 0};
 
-	bool parity = 0;
+    bool parity = 0;
 
-	for(i =0 ; i  < 56; i++)
-	{
+    for(i =0 ; i  < 56; i++)
+    {
 
-		if ( i > 0 && i % 7 == 0)
-		{
-			parity = !parity;
-			bool pbit = stored_parity & (0x80 >> (byte));
-			if(parity != pbit)
-			{
-				printf("parity2 fail byte %d, should be %d, was %d\n", (i / 7), parity, pbit);
-				fails++;
-			}
-			parity =0 ;
-			byte = i / 7;
-		}
-		parity = parity ^ headBit(&bits);
-	}
-	if(fails)
-	{
-		printf("parity2 fails: %d\n", fails);
-	}else
-	{
-		printf("Key syntax is with parity bits grouped in the last byte!\n");
-	}
+        if ( i > 0 && i % 7 == 0)
+        {
+            parity = !parity;
+            bool pbit = stored_parity & (0x80 >> (byte));
+            if(parity != pbit)
+            {
+                printf("parity2 fail byte %d, should be %d, was %d\n", (i / 7), parity, pbit);
+                fails++;
+            }
+            parity =0 ;
+            byte = i / 7;
+        }
+        parity = parity ^ headBit(&bits);
+    }
+    if(fails)
+    {
+        printf("parity2 fails: %d\n", fails);
+    }else
+    {
+        printf("Key syntax is with parity bits grouped in the last byte!\n");
+    }
 }
 void modifyKey_put_parity_last(uint8_t * key, uint8_t* output)
 {
-	uint8_t paritybits = 0;
-	bool parity =0;
-	BitstreamOut out = { output, 0,0};
-	unsigned int bbyte, bbit;
-	for(bbyte=0; bbyte <8 ; bbyte++ )
-	{
-		for(bbit =0 ; bbit< 7 ; bbit++)
-		{
-			bool bit = *(key+bbyte) & (1 << (7-bbit));
-			pushBit(&out,bit);
-			parity ^= bit;
-		}
-		bool paritybit = *(key+bbyte) & 1;
-		paritybits |= paritybit << (7-bbyte);
-		parity = 0;
+    uint8_t paritybits = 0;
+    bool parity =0;
+    BitstreamOut out = { output, 0,0};
+    unsigned int bbyte, bbit;
+    for(bbyte=0; bbyte <8 ; bbyte++ )
+    {
+        for(bbit =0 ; bbit< 7 ; bbit++)
+        {
+            bool bit = *(key+bbyte) & (1 << (7-bbit));
+            pushBit(&out,bit);
+            parity ^= bit;
+        }
+        bool paritybit = *(key+bbyte) & 1;
+        paritybits |= paritybit << (7-bbyte);
+        parity = 0;
 
-	}
-	output[7] = paritybits;
-	printf("Parity byte: %02x\n", paritybits);
+    }
+    output[7] = paritybits;
+    printf("Parity byte: %02x\n", paritybits);
 }
 
  * @brief Modifies a key with parity bits last, so that it is formed with parity
- *		bits inside each byte
+ *    bits inside each byte
  * @param key
  * @param output
 
 void modifyKey_put_parity_allover(uint8_t * key, uint8_t* output)
 {
-	bool parity =0;
-	BitstreamOut out = { output, 0,0};
-	BitstreamIn in = {key, 0,0};
-	unsigned int bbyte, bbit;
-	for(bbit =0 ; bbit < 56 ; bbit++) {
-		if( bbit > 0 && bbit % 7 == 0) {
-			pushBit(&out,!parity);
-			parity = 0;
-		}
-		bool bit = headBit(&in);
-		pushBit(&out,bit );
-		parity ^= bit;
-	}
-	pushBit(&out, !parity);
+    bool parity =0;
+    BitstreamOut out = { output, 0,0};
+    BitstreamIn in = {key, 0,0};
+    unsigned int bbyte, bbit;
+    for(bbit =0 ; bbit < 56 ; bbit++) {
+        if( bbit > 0 && bbit % 7 == 0) {
+            pushBit(&out,!parity);
+            parity = 0;
+        }
+        bool bit = headBit(&in);
+        pushBit(&out,bit );
+        parity ^= bit;
+    }
+    pushBit(&out, !parity);
 
-	if(	des_key_check_key_parity(output))
-		printf("modifyKey_put_parity_allover fail, DES key invalid parity!");
+    if( des_key_check_key_parity(output))
+        printf("modifyKey_put_parity_allover fail, DES key invalid parity!");
 }
 */
 
diff --git a/client/loclass/ikeys.h b/client/loclass/ikeys.h
index 7de3c582e..29d285639 100644
--- a/client/loclass/ikeys.h
+++ b/client/loclass/ikeys.h
@@ -42,9 +42,9 @@
 /**
  * @brief
  *Definition 11. Let the function hash0 : F 82 × F 82 × (F 62 ) 8 → (F 82 ) 8 be defined as
- *	hash0(x, y, z [0] . . . z [7] ) = k [0] . . . k [7] where
- * z'[i] = (z[i] mod (63-i)) + i	i =  0...3
- * z'[i+4] = (z[i+4] mod (64-i)) + i	i =  0...3
+ *  hash0(x, y, z [0] . . . z [7] ) = k [0] . . . k [7] where
+ * z'[i] = (z[i] mod (63-i)) + i        i =  0...3
+ * z'[i+4] = (z[i+4] mod (64-i)) + i    i =  0...3
  * ẑ = check(z');
  * @param c
  * @param k this is where the diversified key is put (should be 8 bytes)
diff --git a/client/loclass/main.c b/client/loclass/main.c
index e77cc8103..c82c7f6be 100644
--- a/client/loclass/main.c
+++ b/client/loclass/main.c
@@ -50,76 +50,76 @@
 
 int unitTests()
 {
-	int errors = testCipherUtils();
-	errors += testMAC();
-	errors += doKeyTests(0);
-	errors += testElite();
+    int errors = testCipherUtils();
+    errors += testMAC();
+    errors += doKeyTests(0);
+    errors += testElite();
     if(errors)
     {
         PrintAndLogDevice(NORMAL, "OBS! There were errors!!!");
     }
-	return errors;
+    return errors;
 }
 int showHelp()
 {
     PrintAndLogDevice(NORMAL, "Usage: loclass [options]");
-	PrintAndLogDevice(NORMAL, "Options:");
-	PrintAndLogDevice(NORMAL, "-t                 Perform self-test");
-	PrintAndLogDevice(NORMAL, "-h                 Show this help");
-	PrintAndLogDevice(NORMAL, "-f <filename>      Bruteforce iclass dumpfile");
-	PrintAndLogDevice(NORMAL, "                   An iclass dumpfile is assumed to consist of an arbitrary number of malicious CSNs, and their protocol responses");
-	PrintAndLogDevice(NORMAL, "                   The binary format of the file is expected to be as follows: ");
-	PrintAndLogDevice(NORMAL, "                   <8 byte CSN><8 byte CC><4 byte NR><4 byte MAC>");
-	PrintAndLogDevice(NORMAL, "                   <8 byte CSN><8 byte CC><4 byte NR><4 byte MAC>");
-	PrintAndLogDevice(NORMAL, "                   <8 byte CSN><8 byte CC><4 byte NR><4 byte MAC>");
-	PrintAndLogDevice(NORMAL, "                  ... totalling N*24 bytes");
-	PrintAndLogDevice(NORMAL, "                  Check iclass_dump.bin for an example");
+    PrintAndLogDevice(NORMAL, "Options:");
+    PrintAndLogDevice(NORMAL, "-t                 Perform self-test");
+    PrintAndLogDevice(NORMAL, "-h                 Show this help");
+    PrintAndLogDevice(NORMAL, "-f <filename>      Bruteforce iclass dumpfile");
+    PrintAndLogDevice(NORMAL, "                   An iclass dumpfile is assumed to consist of an arbitrary number of malicious CSNs, and their protocol responses");
+    PrintAndLogDevice(NORMAL, "                   The binary format of the file is expected to be as follows: ");
+    PrintAndLogDevice(NORMAL, "                   <8 byte CSN><8 byte CC><4 byte NR><4 byte MAC>");
+    PrintAndLogDevice(NORMAL, "                   <8 byte CSN><8 byte CC><4 byte NR><4 byte MAC>");
+    PrintAndLogDevice(NORMAL, "                   <8 byte CSN><8 byte CC><4 byte NR><4 byte MAC>");
+    PrintAndLogDevice(NORMAL, "                  ... totalling N*24 bytes");
+    PrintAndLogDevice(NORMAL, "                  Check iclass_dump.bin for an example");
 
-	return 0;
+    return 0;
 }
 
 int main (int argc, char **argv)
 {
-	PrintAndLogDevice(NORMAL, "IClass Cipher version 1.2, Copyright (C) 2014 Martin Holst Swende\n");
-	PrintAndLogDevice(NORMAL, "Comes with ABSOLUTELY NO WARRANTY");
-	PrintAndLogDevice(NORMAL, "Released as GPLv2\n");
-	PrintAndLogDevice(NORMAL, "WARNING");
-	PrintAndLogDevice(NORMAL, "");
-	PrintAndLogDevice(NORMAL, "THIS TOOL IS CREATED FOR EXPERIMENTATION AND EDUCATIONAL USE ONLY. ");
-	PrintAndLogDevice(NORMAL, "");
-	PrintAndLogDevice(NORMAL, "USAGE OF THIS TOOL IN OTHER WAYS MAY INFRINGE UPON THE INTELLECTUAL ");
-	PrintAndLogDevice(NORMAL, "PROPERTY OF OTHER PARTIES, SUCH AS INSIDE SECURE AND HID GLOBAL, ");
-	PrintAndLogDevice(NORMAL, "AND MAY EXPOSE YOU TO AN INFRINGEMENT ACTION FROM THOSE PARTIES. ");
-	PrintAndLogDevice(NORMAL, "");
-	PrintAndLogDevice(NORMAL, "THIS TOOL SHOULD NEVER BE USED TO INFRINGE PATENTS OR INTELLECTUAL PROPERTY RIGHTS. ");
+    PrintAndLogDevice(NORMAL, "IClass Cipher version 1.2, Copyright (C) 2014 Martin Holst Swende\n");
+    PrintAndLogDevice(NORMAL, "Comes with ABSOLUTELY NO WARRANTY");
+    PrintAndLogDevice(NORMAL, "Released as GPLv2\n");
+    PrintAndLogDevice(NORMAL, "WARNING");
+    PrintAndLogDevice(NORMAL, "");
+    PrintAndLogDevice(NORMAL, "THIS TOOL IS CREATED FOR EXPERIMENTATION AND EDUCATIONAL USE ONLY. ");
+    PrintAndLogDevice(NORMAL, "");
+    PrintAndLogDevice(NORMAL, "USAGE OF THIS TOOL IN OTHER WAYS MAY INFRINGE UPON THE INTELLECTUAL ");
+    PrintAndLogDevice(NORMAL, "PROPERTY OF OTHER PARTIES, SUCH AS INSIDE SECURE AND HID GLOBAL, ");
+    PrintAndLogDevice(NORMAL, "AND MAY EXPOSE YOU TO AN INFRINGEMENT ACTION FROM THOSE PARTIES. ");
+    PrintAndLogDevice(NORMAL, "");
+    PrintAndLogDevice(NORMAL, "THIS TOOL SHOULD NEVER BE USED TO INFRINGE PATENTS OR INTELLECTUAL PROPERTY RIGHTS. ");
 
 
-	char *fileName = NULL;
-	int c;
-	while ((c = getopt (argc, argv, "thf:")) != -1)
-	  switch (c)
-		{
-		case 't':
-		  return unitTests();
-		case 'h':
-		  return showHelp();
-		case 'f':
-		  fileName = optarg;
-		  return bruteforceFileNoKeys(fileName);
-		case '?':
-		  if (optopt == 'f')
-			fprintf (stderr, "Option -%c requires an argument.\n", optopt);
-		  else if (isprint (optopt))
-			fprintf (stderr, "Unknown option `-%c'.\n", optopt);
-		  else
-			fprintf (stderr,
-					 "Unknown option character `\\x%x'.\n",
-					 optopt);
-		  return 1;
-		//default:
-		  //showHelp();
-		}
-	showHelp();
-	return 0;
+    char *fileName = NULL;
+    int c;
+    while ((c = getopt (argc, argv, "thf:")) != -1)
+      switch (c)
+        {
+        case 't':
+          return unitTests();
+        case 'h':
+          return showHelp();
+        case 'f':
+          fileName = optarg;
+          return bruteforceFileNoKeys(fileName);
+        case '?':
+          if (optopt == 'f')
+            fprintf (stderr, "Option -%c requires an argument.\n", optopt);
+          else if (isprint (optopt))
+            fprintf (stderr, "Unknown option `-%c'.\n", optopt);
+          else
+            fprintf (stderr,
+                     "Unknown option character `\\x%x'.\n",
+                     optopt);
+          return 1;
+        //default:
+          //showHelp();
+        }
+    showHelp();
+    return 0;
 }
 
diff --git a/client/mifare/mad.c b/client/mifare/mad.c
index d2df7780c..964379d3f 100644
--- a/client/mifare/mad.c
+++ b/client/mifare/mad.c
@@ -15,242 +15,242 @@
 
 // https://www.nxp.com/docs/en/application-note/AN10787.pdf
 static madAIDDescr madKnownAIDs[] = {
-	{0x0000, "free"},
-	{0x0001, "defect, e.g. access keys are destroyed or unknown"},
-	{0x0002, "reserved"},
-	{0x0003, "contains additional directory info"},
-	{0x0004, "contains card holder information in ASCII format."},
-	{0x0005, "not applicable (above memory size)"},
+    {0x0000, "free"},
+    {0x0001, "defect, e.g. access keys are destroyed or unknown"},
+    {0x0002, "reserved"},
+    {0x0003, "contains additional directory info"},
+    {0x0004, "contains card holder information in ASCII format."},
+    {0x0005, "not applicable (above memory size)"},
 
-	{0x03e1, "NDEF"},
+    {0x03e1, "NDEF"},
 };
 
 static madAIDDescr madKnownClusterCodes[] = {
-	{0x00, "cluster: card administration"},
-	{0x01, "cluster: miscellaneous applications"},
-	{0x02, "cluster: miscellaneous applications"},
-	{0x03, "cluster: miscellaneous applications"},
-	{0x04, "cluster: miscellaneous applications"},
-	{0x05, "cluster: miscellaneous applications"},
-	{0x06, "cluster: miscellaneous applications"},
-	{0x07, "cluster: miscellaneous applications"},
-	{0x08, "cluster: airlines"},
-	{0x09, "cluster: ferry traffic"},
-	{0x10, "cluster: railway services"},
-	{0x11, "cluster: miscellaneous applications"},
-	{0x12, "cluster: transport"},
-	{0x14, "cluster: security solutions"},
-	{0x18, "cluster: city traffic"},
-	{0x19, "cluster: Czech Railways"},
-	{0x20, "cluster: bus services"},
-	{0x21, "cluster: multi modal transit"},
-	{0x28, "cluster: taxi"},
-	{0x30, "cluster: road toll"},
-	{0x31, "cluster: generic transport"},
-	{0x38, "cluster: company services"},
-	{0x40, "cluster: city card services"},
-	{0x47, "cluster: access control & security"},
-	{0x48, "cluster: access control & security"},
-	{0x49, "cluster: VIGIK"},
-	{0x4A, "cluster: Ministry of Defence, Netherlands"},
-	{0x4B, "cluster: Bosch Telecom, Germany"},
-	{0x4C, "cluster: European Union Institutions"},
-	{0x50, "cluster: ski ticketing"},
-	{0x51, "cluster: access control & security"},
-	{0x52, "cluster: access control & security"},
-	{0x53, "cluster: access control & security"},
-	{0x54, "cluster: access control & security"},
-	{0x55, "cluster: SOAA standard for offline access standard"},
-	{0x56, "cluster: access control & security"},
-	{0x58, "cluster: academic services"},
-	{0x60, "cluster: food"},
-	{0x68, "cluster: non-food trade"},
-	{0x70, "cluster: hotel"},
-	{0x71, "cluster: loyalty"},
-	{0x75, "cluster: airport services"},
-	{0x78, "cluster: car rental"},
-	{0x79, "cluster: Dutch government"},
-	{0x80, "cluster: administration services"},
-	{0x88, "cluster: electronic purse"},
-	{0x90, "cluster: television"},
-	{0x91, "cluster: cruise ship"},
-	{0x95, "cluster: IOPTA"},
-	{0x97, "cluster: metering"},
-	{0x98, "cluster: telephone"},
-	{0xA0, "cluster: health services"},
-	{0xA8, "cluster: warehouse"},
-	{0xB0, "cluster: electronic trade"},
-	{0xB8, "cluster: banking"},
-	{0xC0, "cluster: entertainment & sports"},
-	{0xC8, "cluster: car parking"},
-	{0xC9, "cluster: fleet management"},
-	{0xD0, "cluster: fuel, gasoline"},
-	{0xD8, "cluster: info services"},
-	{0xE0, "cluster: press"},
-	{0xE1, "cluster: NFC Forum"},
-	{0xE8, "cluster: computer"},
-	{0xF0, "cluster: mail"},
-	{0xF8, "cluster: miscellaneous applications"},
+    {0x00, "cluster: card administration"},
+    {0x01, "cluster: miscellaneous applications"},
+    {0x02, "cluster: miscellaneous applications"},
+    {0x03, "cluster: miscellaneous applications"},
+    {0x04, "cluster: miscellaneous applications"},
+    {0x05, "cluster: miscellaneous applications"},
+    {0x06, "cluster: miscellaneous applications"},
+    {0x07, "cluster: miscellaneous applications"},
+    {0x08, "cluster: airlines"},
+    {0x09, "cluster: ferry traffic"},
+    {0x10, "cluster: railway services"},
+    {0x11, "cluster: miscellaneous applications"},
+    {0x12, "cluster: transport"},
+    {0x14, "cluster: security solutions"},
+    {0x18, "cluster: city traffic"},
+    {0x19, "cluster: Czech Railways"},
+    {0x20, "cluster: bus services"},
+    {0x21, "cluster: multi modal transit"},
+    {0x28, "cluster: taxi"},
+    {0x30, "cluster: road toll"},
+    {0x31, "cluster: generic transport"},
+    {0x38, "cluster: company services"},
+    {0x40, "cluster: city card services"},
+    {0x47, "cluster: access control & security"},
+    {0x48, "cluster: access control & security"},
+    {0x49, "cluster: VIGIK"},
+    {0x4A, "cluster: Ministry of Defence, Netherlands"},
+    {0x4B, "cluster: Bosch Telecom, Germany"},
+    {0x4C, "cluster: European Union Institutions"},
+    {0x50, "cluster: ski ticketing"},
+    {0x51, "cluster: access control & security"},
+    {0x52, "cluster: access control & security"},
+    {0x53, "cluster: access control & security"},
+    {0x54, "cluster: access control & security"},
+    {0x55, "cluster: SOAA standard for offline access standard"},
+    {0x56, "cluster: access control & security"},
+    {0x58, "cluster: academic services"},
+    {0x60, "cluster: food"},
+    {0x68, "cluster: non-food trade"},
+    {0x70, "cluster: hotel"},
+    {0x71, "cluster: loyalty"},
+    {0x75, "cluster: airport services"},
+    {0x78, "cluster: car rental"},
+    {0x79, "cluster: Dutch government"},
+    {0x80, "cluster: administration services"},
+    {0x88, "cluster: electronic purse"},
+    {0x90, "cluster: television"},
+    {0x91, "cluster: cruise ship"},
+    {0x95, "cluster: IOPTA"},
+    {0x97, "cluster: metering"},
+    {0x98, "cluster: telephone"},
+    {0xA0, "cluster: health services"},
+    {0xA8, "cluster: warehouse"},
+    {0xB0, "cluster: electronic trade"},
+    {0xB8, "cluster: banking"},
+    {0xC0, "cluster: entertainment & sports"},
+    {0xC8, "cluster: car parking"},
+    {0xC9, "cluster: fleet management"},
+    {0xD0, "cluster: fuel, gasoline"},
+    {0xD8, "cluster: info services"},
+    {0xE0, "cluster: press"},
+    {0xE1, "cluster: NFC Forum"},
+    {0xE8, "cluster: computer"},
+    {0xF0, "cluster: mail"},
+    {0xF8, "cluster: miscellaneous applications"},
 };
 
 static const char unknownAID[] = "";
 
 static const char *GetAIDDescription(uint16_t AID) {
-	for(int i = 0; i < ARRAYLEN(madKnownAIDs); i++)
-		if (madKnownAIDs[i].AID == AID)
-			return madKnownAIDs[i].Description;
+    for(int i = 0; i < ARRAYLEN(madKnownAIDs); i++)
+        if (madKnownAIDs[i].AID == AID)
+            return madKnownAIDs[i].Description;
 
-	for(int i = 0; i < ARRAYLEN(madKnownClusterCodes); i++)
-		if (madKnownClusterCodes[i].AID == (AID >> 8)) // high byte - cluster code
-			return madKnownClusterCodes[i].Description;
+    for(int i = 0; i < ARRAYLEN(madKnownClusterCodes); i++)
+        if (madKnownClusterCodes[i].AID == (AID >> 8)) // high byte - cluster code
+            return madKnownClusterCodes[i].Description;
 
-	return unknownAID;
+    return unknownAID;
 }
 
 int madCRCCheck(uint8_t *sector, bool verbose, int MADver) {
-	if (MADver == 1) {
-		uint8_t crc = CRC8Mad(&sector[16 + 1], 15 + 16);
-		if (crc != sector[16]) {
-			PrintAndLogEx(WARNING, "Wrong MAD%d CRC. Calculated: 0x%02x, from card: 0x%02x", MADver, crc, sector[16]);
-			return 3;
-		};
-	} else {
-		uint8_t crc = CRC8Mad(&sector[1], 15 + 16 + 16);
-		if (crc != sector[0]) {
-			PrintAndLogEx(WARNING, "Wrong MAD%d CRC. Calculated: 0x%02x, from card: 0x%02x", MADver, crc, sector[16]);
-			return 3;
-		};
-	}
+    if (MADver == 1) {
+        uint8_t crc = CRC8Mad(&sector[16 + 1], 15 + 16);
+        if (crc != sector[16]) {
+            PrintAndLogEx(WARNING, "Wrong MAD%d CRC. Calculated: 0x%02x, from card: 0x%02x", MADver, crc, sector[16]);
+            return 3;
+        };
+    } else {
+        uint8_t crc = CRC8Mad(&sector[1], 15 + 16 + 16);
+        if (crc != sector[0]) {
+            PrintAndLogEx(WARNING, "Wrong MAD%d CRC. Calculated: 0x%02x, from card: 0x%02x", MADver, crc, sector[16]);
+            return 3;
+        };
+    }
 
-	return 0;
+    return 0;
 }
 
 uint16_t madGetAID(uint8_t *sector, int MADver, int sectorNo) {
-	if (MADver == 1)
-		return (sector[16 + 2 + (sectorNo - 1) * 2] << 8) + (sector[16 + 2 + (sectorNo - 1) * 2 + 1]);
-	else
-		return (sector[2 + (sectorNo - 1) * 2] << 8) + (sector[2 + (sectorNo - 1) * 2 + 1]);
+    if (MADver == 1)
+        return (sector[16 + 2 + (sectorNo - 1) * 2] << 8) + (sector[16 + 2 + (sectorNo - 1) * 2 + 1]);
+    else
+        return (sector[2 + (sectorNo - 1) * 2] << 8) + (sector[2 + (sectorNo - 1) * 2 + 1]);
 }
 
 int MADCheck(uint8_t *sector0, uint8_t *sector10, bool verbose, bool *haveMAD2) {
-	int res = 0;
+    int res = 0;
 
-	if (!sector0)
-		return 1;
+    if (!sector0)
+        return 1;
 
-	uint8_t GPB = sector0[3 * 16 + 9];
-	if (verbose)
-		PrintAndLogEx(NORMAL, "GPB: 0x%02x", GPB);
+    uint8_t GPB = sector0[3 * 16 + 9];
+    if (verbose)
+        PrintAndLogEx(NORMAL, "GPB: 0x%02x", GPB);
 
-	// DA (MAD available)
-	if (!(GPB & 0x80)) {
-		PrintAndLogEx(ERR, "DA=0! MAD not available.");
-		return 1;
-	}
+    // DA (MAD available)
+    if (!(GPB & 0x80)) {
+        PrintAndLogEx(ERR, "DA=0! MAD not available.");
+        return 1;
+    }
 
-	// MA (multi-application card)
-	if (verbose) {
-		if (GPB & 0x40)
-			PrintAndLogEx(NORMAL, "Multi application card.");
-		else
-			PrintAndLogEx(NORMAL, "Single application card.");
-	}
+    // MA (multi-application card)
+    if (verbose) {
+        if (GPB & 0x40)
+            PrintAndLogEx(NORMAL, "Multi application card.");
+        else
+            PrintAndLogEx(NORMAL, "Single application card.");
+    }
 
-	uint8_t MADVer = GPB & 0x03;
-	if (verbose)
-		PrintAndLogEx(NORMAL, "MAD version: %d", MADVer);
+    uint8_t MADVer = GPB & 0x03;
+    if (verbose)
+        PrintAndLogEx(NORMAL, "MAD version: %d", MADVer);
 
-	//  MAD version
-	if ((MADVer != 0x01) && (MADVer != 0x02)) {
-		PrintAndLogEx(ERR, "Wrong MAD version: 0x%02x", MADVer);
-		return 2;
-	};
+    //  MAD version
+    if ((MADVer != 0x01) && (MADVer != 0x02)) {
+        PrintAndLogEx(ERR, "Wrong MAD version: 0x%02x", MADVer);
+        return 2;
+    };
 
-	if (haveMAD2)
-		*haveMAD2 = (MADVer == 2);
+    if (haveMAD2)
+        *haveMAD2 = (MADVer == 2);
 
-	res = madCRCCheck(sector0, true, 1);
+    res = madCRCCheck(sector0, true, 1);
 
-	if (verbose && !res)
-		PrintAndLogEx(NORMAL, "CRC8-MAD1 OK.");
+    if (verbose && !res)
+        PrintAndLogEx(NORMAL, "CRC8-MAD1 OK.");
 
-	if (MADVer == 2 && sector10) {
-		int res2 = madCRCCheck(sector10, true, 2);
-		if (!res)
-			res = res2;
+    if (MADVer == 2 && sector10) {
+        int res2 = madCRCCheck(sector10, true, 2);
+        if (!res)
+            res = res2;
 
-		if (verbose & !res2)
-			PrintAndLogEx(NORMAL, "CRC8-MAD2 OK.");
-	}
+        if (verbose & !res2)
+            PrintAndLogEx(NORMAL, "CRC8-MAD2 OK.");
+    }
 
-	return res;
+    return res;
 }
 
 int MADDecode(uint8_t *sector0, uint8_t *sector10, uint16_t *mad, size_t *madlen) {
-	*madlen = 0;
-	bool haveMAD2 = false;
-	MADCheck(sector0, sector10, false, &haveMAD2);
+    *madlen = 0;
+    bool haveMAD2 = false;
+    MADCheck(sector0, sector10, false, &haveMAD2);
 
-	for (int i = 1; i < 16; i++) {
-		mad[*madlen] = madGetAID(sector0, 1, i);
-		(*madlen)++;
-	}
+    for (int i = 1; i < 16; i++) {
+        mad[*madlen] = madGetAID(sector0, 1, i);
+        (*madlen)++;
+    }
 
-	if (haveMAD2) {
-		// mad2 sector (0x10 == 16dec) here
-		mad[*madlen] = 0x0005;
-		(*madlen)++;
+    if (haveMAD2) {
+        // mad2 sector (0x10 == 16dec) here
+        mad[*madlen] = 0x0005;
+        (*madlen)++;
 
-		for (int i = 1; i < 24; i++) {
-			mad[*madlen] = madGetAID(sector10, 2, i);
-			(*madlen)++;
-		}
-	}
+        for (int i = 1; i < 24; i++) {
+            mad[*madlen] = madGetAID(sector10, 2, i);
+            (*madlen)++;
+        }
+    }
 
-	return 0;
+    return 0;
 }
 
 
 int MAD1DecodeAndPrint(uint8_t *sector, bool verbose, bool *haveMAD2) {
 
-	// check MAD1 only
-	MADCheck(sector, NULL, verbose, haveMAD2);
+    // check MAD1 only
+    MADCheck(sector, NULL, verbose, haveMAD2);
 
-	// info byte
-	uint8_t InfoByte = sector[16 + 1] & 0x3f;
-	if (InfoByte) {
-		PrintAndLogEx(NORMAL, "Card publisher sector: 0x%02x", InfoByte);
-	} else {
-		if (verbose)
-			PrintAndLogEx(NORMAL, "Card publisher sector not present.");
-	}
-	if (InfoByte == 0x10 || InfoByte >= 0x28)
-		PrintAndLogEx(WARNING, "Info byte error");
+    // info byte
+    uint8_t InfoByte = sector[16 + 1] & 0x3f;
+    if (InfoByte) {
+        PrintAndLogEx(NORMAL, "Card publisher sector: 0x%02x", InfoByte);
+    } else {
+        if (verbose)
+            PrintAndLogEx(NORMAL, "Card publisher sector not present.");
+    }
+    if (InfoByte == 0x10 || InfoByte >= 0x28)
+        PrintAndLogEx(WARNING, "Info byte error");
 
-	PrintAndLogEx(NORMAL, "00 MAD1");
-	for(int i = 1; i < 16; i++) {
-		uint16_t AID = madGetAID(sector, 1, i);
-		PrintAndLogEx(NORMAL, "%02d [%04X] %s", i, AID, GetAIDDescription(AID));
-	};
+    PrintAndLogEx(NORMAL, "00 MAD1");
+    for(int i = 1; i < 16; i++) {
+        uint16_t AID = madGetAID(sector, 1, i);
+        PrintAndLogEx(NORMAL, "%02d [%04X] %s", i, AID, GetAIDDescription(AID));
+    };
 
-	return 0;
+    return 0;
 };
 
 int MAD2DecodeAndPrint(uint8_t *sector, bool verbose) {
-	PrintAndLogEx(NORMAL, "16 MAD2");
+    PrintAndLogEx(NORMAL, "16 MAD2");
 
-	int res = madCRCCheck(sector, true, 2);
+    int res = madCRCCheck(sector, true, 2);
 
-	if (verbose && !res)
-		PrintAndLogEx(NORMAL, "CRC8-MAD2 OK.");
+    if (verbose && !res)
+        PrintAndLogEx(NORMAL, "CRC8-MAD2 OK.");
 
-	uint8_t InfoByte = sector[1] & 0x3f;
-	PrintAndLogEx(NORMAL, "MAD2 Card publisher sector: 0x%02x", InfoByte);
+    uint8_t InfoByte = sector[1] & 0x3f;
+    PrintAndLogEx(NORMAL, "MAD2 Card publisher sector: 0x%02x", InfoByte);
 
-	for(int i = 1; i < 8 + 8 + 7 + 1; i++) {
-		uint16_t AID = madGetAID(sector, 2, i);
-		PrintAndLogEx(NORMAL, "%02d [%04X] %s", i + 16, AID, GetAIDDescription(AID));
-	};
+    for(int i = 1; i < 8 + 8 + 7 + 1; i++) {
+        uint16_t AID = madGetAID(sector, 2, i);
+        PrintAndLogEx(NORMAL, "%02d [%04X] %s", i + 16, AID, GetAIDDescription(AID));
+    };
 
-	return 0;
+    return 0;
 };
diff --git a/client/mifare/mad.h b/client/mifare/mad.h
index d9dd3ff53..89fcd795c 100644
--- a/client/mifare/mad.h
+++ b/client/mifare/mad.h
@@ -16,8 +16,8 @@
 #include <stddef.h>
 
 typedef struct {
-	uint16_t AID;
-	const char *Description;
+    uint16_t AID;
+    const char *Description;
 } madAIDDescr;
 
 extern int MADCheck(uint8_t *sector0, uint8_t *sector10, bool verbose, bool *haveMAD2);
diff --git a/client/mifare/mfkey.c b/client/mifare/mfkey.c
index e463c4505..86df4bdd0 100644
--- a/client/mifare/mfkey.c
+++ b/client/mifare/mfkey.c
@@ -13,161 +13,161 @@
 
 // MIFARE
 int compare_uint64(const void *a, const void *b) {
-	if (*(uint64_t*)b == *(uint64_t*)a) return 0;
-	if (*(uint64_t*)b < *(uint64_t*)a) return 1;
-	return -1;
+    if (*(uint64_t*)b == *(uint64_t*)a) return 0;
+    if (*(uint64_t*)b < *(uint64_t*)a) return 1;
+    return -1;
 }
 
 // create the intersection (common members) of two sorted lists. Lists are terminated by -1. Result will be in list1. Number of elements is returned.
 uint32_t intersection(uint64_t *listA, uint64_t *listB) {
-	if (listA == NULL || listB == NULL)
-		return 0;
+    if (listA == NULL || listB == NULL)
+        return 0;
 
-	uint64_t *p1, *p2, *p3;
-	p1 = p3 = listA;
-	p2 = listB;
+    uint64_t *p1, *p2, *p3;
+    p1 = p3 = listA;
+    p2 = listB;
 
-	while ( *p1 != -1 && *p2 != -1 ) {
-		if (compare_uint64(p1, p2) == 0) {
-			*p3++ = *p1++;
-			p2++;
-		}
-		else {
-			while (compare_uint64(p1, p2) < 0) ++p1;
-			while (compare_uint64(p1, p2) > 0) ++p2;
-		}
-	}
-	*p3 = -1;
-	return p3 - listA;
+    while ( *p1 != -1 && *p2 != -1 ) {
+        if (compare_uint64(p1, p2) == 0) {
+            *p3++ = *p1++;
+            p2++;
+        }
+        else {
+            while (compare_uint64(p1, p2) < 0) ++p1;
+            while (compare_uint64(p1, p2) > 0) ++p2;
+        }
+    }
+    *p3 = -1;
+    return p3 - listA;
 }
 
 // Darkside attack (hf mf mifare)
 // if successful it will return a list of keys, not just one.
 uint32_t nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint32_t ar, uint64_t par_info, uint64_t ks_info, uint64_t **keys) {
-	struct Crypto1State *states;
-	uint32_t i, pos;
-	uint8_t bt, ks3x[8], par[8][8];
-	uint64_t key_recovered;
-	uint64_t *keylist;
+    struct Crypto1State *states;
+    uint32_t i, pos;
+    uint8_t bt, ks3x[8], par[8][8];
+    uint64_t key_recovered;
+    uint64_t *keylist;
 
-	// Reset the last three significant bits of the reader nonce
-	nr &= 0xFFFFFF1F;
+    // Reset the last three significant bits of the reader nonce
+    nr &= 0xFFFFFF1F;
 
-	for ( pos = 0; pos < 8; pos++ ) {
-		ks3x[7-pos] = (ks_info >> (pos*8)) & 0x0F;
-		bt = (par_info >> (pos*8)) & 0xFF;
+    for ( pos = 0; pos < 8; pos++ ) {
+        ks3x[7-pos] = (ks_info >> (pos*8)) & 0x0F;
+        bt = (par_info >> (pos*8)) & 0xFF;
 
-		par[7-pos][0] = (bt >> 0) & 1;
-		par[7-pos][1] = (bt >> 1) & 1;
-		par[7-pos][2] = (bt >> 2) & 1;
-		par[7-pos][3] = (bt >> 3) & 1;
-		par[7-pos][4] = (bt >> 4) & 1;
-		par[7-pos][5] = (bt >> 5) & 1;
-		par[7-pos][6] = (bt >> 6) & 1;
-		par[7-pos][7] = (bt >> 7) & 1;
-	}
+        par[7-pos][0] = (bt >> 0) & 1;
+        par[7-pos][1] = (bt >> 1) & 1;
+        par[7-pos][2] = (bt >> 2) & 1;
+        par[7-pos][3] = (bt >> 3) & 1;
+        par[7-pos][4] = (bt >> 4) & 1;
+        par[7-pos][5] = (bt >> 5) & 1;
+        par[7-pos][6] = (bt >> 6) & 1;
+        par[7-pos][7] = (bt >> 7) & 1;
+    }
 
-	states = lfsr_common_prefix(nr, ar, ks3x, par, (par_info == 0));
+    states = lfsr_common_prefix(nr, ar, ks3x, par, (par_info == 0));
 
-	if (!states) {
-		*keys = NULL;
-		return 0;
-	}
+    if (!states) {
+        *keys = NULL;
+        return 0;
+    }
 
-	keylist = (uint64_t*)states;
+    keylist = (uint64_t*)states;
 
-	for (i = 0; keylist[i]; i++) {
-		lfsr_rollback_word(states+i, uid ^ nt, 0);
-		crypto1_get_lfsr(states+i, &key_recovered);
-		keylist[i] = key_recovered;
-	}
-	keylist[i] = -1;
+    for (i = 0; keylist[i]; i++) {
+        lfsr_rollback_word(states+i, uid ^ nt, 0);
+        crypto1_get_lfsr(states+i, &key_recovered);
+        keylist[i] = key_recovered;
+    }
+    keylist[i] = -1;
 
-	*keys = keylist;
-	return i;
+    *keys = keylist;
+    return i;
 }
 
 // recover key from 2 different reader responses on same tag challenge
 bool mfkey32(nonces_t data, uint64_t *outputkey) {
-	struct Crypto1State *s,*t;
-	uint64_t outkey = 0;
-	uint64_t key = 0;     // recovered key
-	bool isSuccess = false;
-	uint8_t counter = 0;
+    struct Crypto1State *s,*t;
+    uint64_t outkey = 0;
+    uint64_t key = 0;     // recovered key
+    bool isSuccess = false;
+    uint8_t counter = 0;
 
-	uint32_t p640 = prng_successor(data.nonce, 64);
-	uint32_t p641 = prng_successor(data.nonce2, 64);
-	s = lfsr_recovery32(data.ar ^ p640, 0);
+    uint32_t p640 = prng_successor(data.nonce, 64);
+    uint32_t p641 = prng_successor(data.nonce2, 64);
+    s = lfsr_recovery32(data.ar ^ p640, 0);
 
-	for(t = s; t->odd | t->even; ++t) {
-		lfsr_rollback_word(t, 0, 0);
-		lfsr_rollback_word(t, data.nr, 1);
-		lfsr_rollback_word(t, data.cuid ^ data.nonce, 0);
-		crypto1_get_lfsr(t, &key);
-		crypto1_word(t, data.cuid ^ data.nonce, 0);
-		crypto1_word(t, data.nr2, 1);
-		if (data.ar2 == (crypto1_word(t, 0, 0) ^ p641)) {
-			outkey = key;
-			counter++;
-			if (counter == 20) break;
-		}
-	}
-	isSuccess = (counter == 1);
-	*outputkey = ( isSuccess ) ? outkey : 0;
-	crypto1_destroy(s);
-	return isSuccess;
+    for(t = s; t->odd | t->even; ++t) {
+        lfsr_rollback_word(t, 0, 0);
+        lfsr_rollback_word(t, data.nr, 1);
+        lfsr_rollback_word(t, data.cuid ^ data.nonce, 0);
+        crypto1_get_lfsr(t, &key);
+        crypto1_word(t, data.cuid ^ data.nonce, 0);
+        crypto1_word(t, data.nr2, 1);
+        if (data.ar2 == (crypto1_word(t, 0, 0) ^ p641)) {
+            outkey = key;
+            counter++;
+            if (counter == 20) break;
+        }
+    }
+    isSuccess = (counter == 1);
+    *outputkey = ( isSuccess ) ? outkey : 0;
+    crypto1_destroy(s);
+    return isSuccess;
 }
 
 // recover key from 2 reader responses on 2 different tag challenges
 // skip "several found keys".  Only return true if ONE key is found
 bool mfkey32_moebius(nonces_t data, uint64_t *outputkey) {
-	struct Crypto1State *s, *t;
-	uint64_t outkey  = 0;
-	uint64_t key 	   = 0;			// recovered key
-	bool isSuccess = false;
-	int counter = 0;
-	uint32_t p640 = prng_successor(data.nonce, 64);
-	uint32_t p641 = prng_successor(data.nonce2, 64);
+    struct Crypto1State *s, *t;
+    uint64_t outkey  = 0;
+    uint64_t key     = 0; // recovered key
+    bool isSuccess = false;
+    int counter = 0;
+    uint32_t p640 = prng_successor(data.nonce, 64);
+    uint32_t p641 = prng_successor(data.nonce2, 64);
 
-	s = lfsr_recovery32(data.ar ^ p640, 0);
+    s = lfsr_recovery32(data.ar ^ p640, 0);
 
-	for(t = s; t->odd | t->even; ++t) {
-		lfsr_rollback_word(t, 0, 0);
-		lfsr_rollback_word(t, data.nr, 1);
-		lfsr_rollback_word(t, data.cuid ^ data.nonce, 0);
-		crypto1_get_lfsr(t, &key);
+    for(t = s; t->odd | t->even; ++t) {
+        lfsr_rollback_word(t, 0, 0);
+        lfsr_rollback_word(t, data.nr, 1);
+        lfsr_rollback_word(t, data.cuid ^ data.nonce, 0);
+        crypto1_get_lfsr(t, &key);
 
-		crypto1_word(t, data.cuid ^ data.nonce2, 0);
-		crypto1_word(t, data.nr2, 1);
-		if (data.ar2 == (crypto1_word(t, 0, 0) ^ p641)) {
-			outkey = key;
-			++counter;
-			if (counter == 20) break;
-		}
-	}
-	isSuccess	= (counter == 1);
-	*outputkey = ( isSuccess ) ? outkey : 0;
-	crypto1_destroy(s);
-	return isSuccess;
+        crypto1_word(t, data.cuid ^ data.nonce2, 0);
+        crypto1_word(t, data.nr2, 1);
+        if (data.ar2 == (crypto1_word(t, 0, 0) ^ p641)) {
+            outkey = key;
+            ++counter;
+            if (counter == 20) break;
+        }
+    }
+    isSuccess  = (counter == 1);
+    *outputkey = ( isSuccess ) ? outkey : 0;
+    crypto1_destroy(s);
+    return isSuccess;
 }
 
 // recover key from reader response and tag response of one authentication sequence
 int mfkey64(nonces_t data, uint64_t *outputkey){
-	uint64_t key = 0;				// recovered key
-	uint32_t ks2;    				// keystream used to encrypt reader response
-	uint32_t ks3;    				// keystream used to encrypt tag response
-	struct Crypto1State *revstate;
+    uint64_t key = 0;  // recovered key
+    uint32_t ks2;      // keystream used to encrypt reader response
+    uint32_t ks3;      // keystream used to encrypt tag response
+    struct Crypto1State *revstate;
 
-	// Extract the keystream from the messages
-	ks2 = data.ar ^ prng_successor(data.nonce, 64);
-	ks3 = data.at ^ prng_successor(data.nonce, 96);
-	revstate = lfsr_recovery64(ks2, ks3);
-	lfsr_rollback_word(revstate, 0, 0);
-	lfsr_rollback_word(revstate, 0, 0);
-	lfsr_rollback_word(revstate, data.nr, 1);
-	lfsr_rollback_word(revstate, data.cuid ^ data.nonce, 0);
-	crypto1_get_lfsr(revstate, &key);
-	crypto1_destroy(revstate);
-	*outputkey = key;
-	return 0;
+    // Extract the keystream from the messages
+    ks2 = data.ar ^ prng_successor(data.nonce, 64);
+    ks3 = data.at ^ prng_successor(data.nonce, 96);
+    revstate = lfsr_recovery64(ks2, ks3);
+    lfsr_rollback_word(revstate, 0, 0);
+    lfsr_rollback_word(revstate, 0, 0);
+    lfsr_rollback_word(revstate, data.nr, 1);
+    lfsr_rollback_word(revstate, data.cuid ^ data.nonce, 0);
+    crypto1_get_lfsr(revstate, &key);
+    crypto1_destroy(revstate);
+    *outputkey = key;
+    return 0;
 }
diff --git a/client/mifare/mifare4.c b/client/mifare/mifare4.c
index b829c564a..e5051743d 100644
--- a/client/mifare/mifare4.c
+++ b/client/mifare/mifare4.c
@@ -19,451 +19,451 @@
 
 static bool VerboseMode = false;
 void mfpSetVerboseMode(bool verbose) {
-	VerboseMode = verbose;
+    VerboseMode = verbose;
 }
 
 typedef struct {
-	uint8_t Code;
-	const char *Description;
+    uint8_t Code;
+    const char *Description;
 } PlusErrorsElm;
 
 static const PlusErrorsElm PlusErrors[] = {
-	{0xFF, ""},
-	{0x00, "Transfer cannot be granted within the current authentication."},
-	{0x06, "Access Conditions not fulfilled. Block does not exist, block is not a value block."},
-	{0x07, "Too many read or write commands in the session or in the transaction."},
-	{0x08, "Invalid MAC in command or response"},
-	{0x09, "Block Number is not valid"},
-	{0x0a, "Invalid block number, not existing block number"},
-	{0x0b, "The current command code not available at the current card state."},
-	{0x0c, "Length error"},
-	{0x0f, "General Manipulation Error. Failure in the operation of the PICC (cannot write to the data block), etc."},
-	{0x90, "OK"},
+    {0xFF, ""},
+    {0x00, "Transfer cannot be granted within the current authentication."},
+    {0x06, "Access Conditions not fulfilled. Block does not exist, block is not a value block."},
+    {0x07, "Too many read or write commands in the session or in the transaction."},
+    {0x08, "Invalid MAC in command or response"},
+    {0x09, "Block Number is not valid"},
+    {0x0a, "Invalid block number, not existing block number"},
+    {0x0b, "The current command code not available at the current card state."},
+    {0x0c, "Length error"},
+    {0x0f, "General Manipulation Error. Failure in the operation of the PICC (cannot write to the data block), etc."},
+    {0x90, "OK"},
 };
 int PlusErrorsLen = sizeof(PlusErrors) / sizeof(PlusErrorsElm);
 
 const char * mfpGetErrorDescription(uint8_t errorCode) {
-	for(int i = 0; i < PlusErrorsLen; i++)
-		if (errorCode == PlusErrors[i].Code)
-			return PlusErrors[i].Description;
+    for(int i = 0; i < PlusErrorsLen; i++)
+        if (errorCode == PlusErrors[i].Code)
+            return PlusErrors[i].Description;
 
-	return PlusErrors[0].Description;
+    return PlusErrors[0].Description;
 }
 
 AccessConditions_t MFAccessConditions[] = {
-	{0x00, "rdAB wrAB incAB dectrAB"},
-	{0x01, "rdAB dectrAB"},
-	{0x02, "rdAB"},
-	{0x03, "rdB wrB"},
-	{0x04, "rdAB wrB"},
-	{0x05, "rdB"},
-	{0x06, "rdAB wrB incB dectrAB"},
-	{0x07, "none"}
+    {0x00, "rdAB wrAB incAB dectrAB"},
+    {0x01, "rdAB dectrAB"},
+    {0x02, "rdAB"},
+    {0x03, "rdB wrB"},
+    {0x04, "rdAB wrB"},
+    {0x05, "rdB"},
+    {0x06, "rdAB wrB incB dectrAB"},
+    {0x07, "none"}
 };
 
 AccessConditions_t MFAccessConditionsTrailer[] = {
-	{0x00, "rdAbyA rdCbyA rdBbyA wrBbyA"},
-	{0x01, "wrAbyA rdCbyA wrCbyA rdBbyA wrBbyA"},
-	{0x02, "rdCbyA rdBbyA"},
-	{0x03, "wrAbyB rdCbyAB wrCbyB wrBbyB"},
-	{0x04, "wrAbyB rdCbyAB wrBbyB"},
-	{0x05, "rdCbyAB wrCbyB"},
-	{0x06, "rdCbyAB"},
-	{0x07, "rdCbyAB"}
+    {0x00, "rdAbyA rdCbyA rdBbyA wrBbyA"},
+    {0x01, "wrAbyA rdCbyA wrCbyA rdBbyA wrBbyA"},
+    {0x02, "rdCbyA rdBbyA"},
+    {0x03, "wrAbyB rdCbyAB wrCbyB wrBbyB"},
+    {0x04, "wrAbyB rdCbyAB wrBbyB"},
+    {0x05, "rdCbyAB wrCbyB"},
+    {0x06, "rdCbyAB"},
+    {0x07, "rdCbyAB"}
 };
 
 char *mfGetAccessConditionsDesc(uint8_t blockn, uint8_t *data) {
-	static char StaticNone[] = "none";
+    static char StaticNone[] = "none";
 
-	uint8_t data1 = ((data[1] >> 4) & 0x0f) >> blockn;
-	uint8_t data2 = ((data[2]) & 0x0f) >> blockn;
-	uint8_t data3 = ((data[2] >> 4) & 0x0f) >> blockn;
+    uint8_t data1 = ((data[1] >> 4) & 0x0f) >> blockn;
+    uint8_t data2 = ((data[2]) & 0x0f) >> blockn;
+    uint8_t data3 = ((data[2] >> 4) & 0x0f) >> blockn;
 
-	uint8_t cond = (data1 & 0x01) << 2 | (data2 & 0x01) << 1 | (data3 & 0x01);
+    uint8_t cond = (data1 & 0x01) << 2 | (data2 & 0x01) << 1 | (data3 & 0x01);
 
-	if (blockn == 3) {
-		for (int i = 0; i < ARRAYLEN(MFAccessConditionsTrailer); i++)
-			if (MFAccessConditionsTrailer[i].cond == cond) {
-				return MFAccessConditionsTrailer[i].description;
-			}
-	} else {
-		for (int i = 0; i < ARRAYLEN(MFAccessConditions); i++)
-			if (MFAccessConditions[i].cond == cond) {
-				return MFAccessConditions[i].description;
-			}
-	};
+    if (blockn == 3) {
+        for (int i = 0; i < ARRAYLEN(MFAccessConditionsTrailer); i++)
+            if (MFAccessConditionsTrailer[i].cond == cond) {
+                return MFAccessConditionsTrailer[i].description;
+            }
+    } else {
+        for (int i = 0; i < ARRAYLEN(MFAccessConditions); i++)
+            if (MFAccessConditions[i].cond == cond) {
+                return MFAccessConditions[i].description;
+            }
+    };
 
-	return StaticNone;
+    return StaticNone;
 };
 
 int CalculateEncIVCommand(mf4Session *session, uint8_t *iv, bool verbose) {
-	memcpy(&iv[0], session->TI, 4);
-	memcpy(&iv[4], &session->R_Ctr, 2);
-	memcpy(&iv[6], &session->W_Ctr, 2);
-	memcpy(&iv[8], &session->R_Ctr, 2);
-	memcpy(&iv[10], &session->W_Ctr, 2);
-	memcpy(&iv[12], &session->R_Ctr, 2);
-	memcpy(&iv[14], &session->W_Ctr, 2);
+    memcpy(&iv[0], session->TI, 4);
+    memcpy(&iv[4], &session->R_Ctr, 2);
+    memcpy(&iv[6], &session->W_Ctr, 2);
+    memcpy(&iv[8], &session->R_Ctr, 2);
+    memcpy(&iv[10], &session->W_Ctr, 2);
+    memcpy(&iv[12], &session->R_Ctr, 2);
+    memcpy(&iv[14], &session->W_Ctr, 2);
 
-	return 0;
+    return 0;
 }
 
 int CalculateEncIVResponse(mf4Session *session, uint8_t *iv, bool verbose) {
-	memcpy(&iv[0], &session->R_Ctr, 2);
-	memcpy(&iv[2], &session->W_Ctr, 2);
-	memcpy(&iv[4], &session->R_Ctr, 2);
-	memcpy(&iv[6], &session->W_Ctr, 2);
-	memcpy(&iv[8], &session->R_Ctr, 2);
-	memcpy(&iv[10], &session->W_Ctr, 2);
-	memcpy(&iv[12], session->TI, 4);
+    memcpy(&iv[0], &session->R_Ctr, 2);
+    memcpy(&iv[2], &session->W_Ctr, 2);
+    memcpy(&iv[4], &session->R_Ctr, 2);
+    memcpy(&iv[6], &session->W_Ctr, 2);
+    memcpy(&iv[8], &session->R_Ctr, 2);
+    memcpy(&iv[10], &session->W_Ctr, 2);
+    memcpy(&iv[12], session->TI, 4);
 
-	return 0;
+    return 0;
 }
 
 
 int CalculateMAC(mf4Session *session, MACType_t mtype, uint8_t blockNum, uint8_t blockCount, uint8_t *data, int datalen, uint8_t *mac, bool verbose) {
-	if (!session || !session->Authenticated || !mac || !data || !datalen || datalen < 1)
-		return 1;
+    if (!session || !session->Authenticated || !mac || !data || !datalen || datalen < 1)
+        return 1;
 
-	memset(mac, 0x00, 8);
+    memset(mac, 0x00, 8);
 
-	uint16_t ctr = session->R_Ctr;
-	switch(mtype) {
-	case mtypWriteCmd:
-	case mtypWriteResp:
-		ctr = session->W_Ctr;
-		break;
-	case mtypReadCmd:
-	case mtypReadResp:
-		break;
-	}
+    uint16_t ctr = session->R_Ctr;
+    switch(mtype) {
+    case mtypWriteCmd:
+    case mtypWriteResp:
+        ctr = session->W_Ctr;
+        break;
+    case mtypReadCmd:
+    case mtypReadResp:
+        break;
+    }
 
-	uint8_t macdata[2049] = {data[0], (ctr & 0xFF), (ctr >> 8), 0};
-	int macdatalen = datalen;
-	memcpy(&macdata[3], session->TI, 4);
+    uint8_t macdata[2049] = {data[0], (ctr & 0xFF), (ctr >> 8), 0};
+    int macdatalen = datalen;
+    memcpy(&macdata[3], session->TI, 4);
 
-	switch(mtype) {
-	case mtypReadCmd:
-		memcpy(&macdata[7], &data[1], datalen - 1);
-		macdatalen = datalen + 6;
-		break;
-	case mtypReadResp:
-		macdata[7] = blockNum;
-		macdata[8] = 0;
-		macdata[9] = blockCount;
-		memcpy(&macdata[10], &data[1], datalen - 1);
-		macdatalen = datalen + 9;
-		break;
-	case mtypWriteCmd:
-		memcpy(&macdata[7], &data[1], datalen - 1);
-		macdatalen = datalen + 6;
-		break;
-	case mtypWriteResp:
-		macdatalen = 1 + 6;
-		break;
-	}
+    switch(mtype) {
+    case mtypReadCmd:
+        memcpy(&macdata[7], &data[1], datalen - 1);
+        macdatalen = datalen + 6;
+        break;
+    case mtypReadResp:
+        macdata[7] = blockNum;
+        macdata[8] = 0;
+        macdata[9] = blockCount;
+        memcpy(&macdata[10], &data[1], datalen - 1);
+        macdatalen = datalen + 9;
+        break;
+    case mtypWriteCmd:
+        memcpy(&macdata[7], &data[1], datalen - 1);
+        macdatalen = datalen + 6;
+        break;
+    case mtypWriteResp:
+        macdatalen = 1 + 6;
+        break;
+    }
 
-	if (verbose)
-		PrintAndLog("MAC data[%d]: %s", macdatalen, sprint_hex(macdata, macdatalen));
+    if (verbose)
+        PrintAndLog("MAC data[%d]: %s", macdatalen, sprint_hex(macdata, macdatalen));
 
-	return aes_cmac8(NULL, session->Kmac, macdata, mac, macdatalen);
+    return aes_cmac8(NULL, session->Kmac, macdata, mac, macdatalen);
 }
 
 int MifareAuth4(mf4Session *session, uint8_t *keyn, uint8_t *key, bool activateField, bool leaveSignalON, bool verbose) {
-	uint8_t data[257] = {0};
-	int datalen = 0;
+    uint8_t data[257] = {0};
+    int datalen = 0;
 
-	uint8_t RndA[17] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x00};
-	uint8_t RndB[17] = {0};
+    uint8_t RndA[17] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x00};
+    uint8_t RndB[17] = {0};
 
-	if (session)
-		session->Authenticated = false;
+    if (session)
+        session->Authenticated = false;
 
-	uint8_t cmd1[] = {0x70, keyn[1], keyn[0], 0x00};
-	int res = ExchangeRAW14a(cmd1, sizeof(cmd1), activateField, true, data, sizeof(data), &datalen);
-	if (res) {
-		PrintAndLogEx(ERR, "Exchande raw error: %d", res);
-		DropField();
-		return 2;
-	}
+    uint8_t cmd1[] = {0x70, keyn[1], keyn[0], 0x00};
+    int res = ExchangeRAW14a(cmd1, sizeof(cmd1), activateField, true, data, sizeof(data), &datalen);
+    if (res) {
+        PrintAndLogEx(ERR, "Exchande raw error: %d", res);
+        DropField();
+        return 2;
+    }
 
-	if (verbose)
-		PrintAndLogEx(INFO, "<phase1: %s", sprint_hex(data, datalen));
+    if (verbose)
+        PrintAndLogEx(INFO, "<phase1: %s", sprint_hex(data, datalen));
 
-	if (datalen < 1) {
-		PrintAndLogEx(ERR, "Card response wrong length: %d", datalen);
-		DropField();
-		return 3;
-	}
+    if (datalen < 1) {
+        PrintAndLogEx(ERR, "Card response wrong length: %d", datalen);
+        DropField();
+        return 3;
+    }
 
-	if (data[0] != 0x90) {
-		PrintAndLogEx(ERR, "Card response error: %02x", data[2]);
-		DropField();
-		return 3;
-	}
+    if (data[0] != 0x90) {
+        PrintAndLogEx(ERR, "Card response error: %02x", data[2]);
+        DropField();
+        return 3;
+    }
 
-	if (datalen != 19) { // code 1b + 16b + crc 2b
-		PrintAndLogEx(ERR, "Card response must be 19 bytes long instead of: %d", datalen);
-		DropField();
-		return 3;
-	}
+    if (datalen != 19) { // code 1b + 16b + crc 2b
+        PrintAndLogEx(ERR, "Card response must be 19 bytes long instead of: %d", datalen);
+        DropField();
+        return 3;
+    }
 
     aes_decode(NULL, key, &data[1], RndB, 16);
-	RndB[16] = RndB[0];
-	if (verbose)
-		PrintAndLogEx(INFO, "RndB: %s", sprint_hex(RndB, 16));
+    RndB[16] = RndB[0];
+    if (verbose)
+        PrintAndLogEx(INFO, "RndB: %s", sprint_hex(RndB, 16));
 
-	uint8_t cmd2[33] = {0};
-	cmd2[0] = 0x72;
+    uint8_t cmd2[33] = {0};
+    cmd2[0] = 0x72;
 
-	uint8_t raw[32] = {0};
-	memmove(raw, RndA, 16);
-	memmove(&raw[16], &RndB[1], 16);
+    uint8_t raw[32] = {0};
+    memmove(raw, RndA, 16);
+    memmove(&raw[16], &RndB[1], 16);
 
-	aes_encode(NULL, key, raw, &cmd2[1], 32);
-	if (verbose)
-		PrintAndLogEx(INFO, ">phase2: %s", sprint_hex(cmd2, 33));
+    aes_encode(NULL, key, raw, &cmd2[1], 32);
+    if (verbose)
+        PrintAndLogEx(INFO, ">phase2: %s", sprint_hex(cmd2, 33));
 
-	res = ExchangeRAW14a(cmd2, sizeof(cmd2), false, true, data, sizeof(data), &datalen);
-	if (res) {
-		PrintAndLogEx(ERR, "Exchande raw error: %d", res);
-		DropField();
-		return 4;
-	}
+    res = ExchangeRAW14a(cmd2, sizeof(cmd2), false, true, data, sizeof(data), &datalen);
+    if (res) {
+        PrintAndLogEx(ERR, "Exchande raw error: %d", res);
+        DropField();
+        return 4;
+    }
 
-	if (verbose)
-		PrintAndLogEx(INFO, "<phase2: %s", sprint_hex(data, datalen));
+    if (verbose)
+        PrintAndLogEx(INFO, "<phase2: %s", sprint_hex(data, datalen));
 
-	aes_decode(NULL, key, &data[1], raw, 32);
+    aes_decode(NULL, key, &data[1], raw, 32);
 
-	if (verbose) {
-		PrintAndLogEx(INFO, "res: %s", sprint_hex(raw, 32));
-		PrintAndLogEx(INFO, "RndA`: %s", sprint_hex(&raw[4], 16));
-	}
+    if (verbose) {
+        PrintAndLogEx(INFO, "res: %s", sprint_hex(raw, 32));
+        PrintAndLogEx(INFO, "RndA`: %s", sprint_hex(&raw[4], 16));
+    }
 
-	if (memcmp(&raw[4], &RndA[1], 16)) {
-		PrintAndLogEx(ERR, "\nAuthentication FAILED. rnd not equal");
-		if (verbose) {
-			PrintAndLogEx(ERR, "RndA reader: %s", sprint_hex(&RndA[1], 16));
-			PrintAndLogEx(ERR, "RndA   card: %s", sprint_hex(&raw[4], 16));
-		}
-		DropField();
-		return 5;
-	}
+    if (memcmp(&raw[4], &RndA[1], 16)) {
+        PrintAndLogEx(ERR, "\nAuthentication FAILED. rnd not equal");
+        if (verbose) {
+            PrintAndLogEx(ERR, "RndA reader: %s", sprint_hex(&RndA[1], 16));
+            PrintAndLogEx(ERR, "RndA   card: %s", sprint_hex(&raw[4], 16));
+        }
+        DropField();
+        return 5;
+    }
 
-	if (verbose) {
-		PrintAndLogEx(INFO, " TI: %s", sprint_hex(raw, 4));
-		PrintAndLogEx(INFO, "pic: %s", sprint_hex(&raw[20], 6));
-		PrintAndLogEx(INFO, "pcd: %s", sprint_hex(&raw[26], 6));
-	}
+    if (verbose) {
+        PrintAndLogEx(INFO, " TI: %s", sprint_hex(raw, 4));
+        PrintAndLogEx(INFO, "pic: %s", sprint_hex(&raw[20], 6));
+        PrintAndLogEx(INFO, "pcd: %s", sprint_hex(&raw[26], 6));
+    }
 
-	uint8_t kenc[16] = {0};
-	memcpy(&kenc[0], &RndA[11], 5);
-	memcpy(&kenc[5], &RndB[11], 5);
-	for(int i = 0; i < 5; i++)
-		kenc[10 + i] = RndA[4 + i] ^ RndB[4 + i];
-	kenc[15] = 0x11;
+    uint8_t kenc[16] = {0};
+    memcpy(&kenc[0], &RndA[11], 5);
+    memcpy(&kenc[5], &RndB[11], 5);
+    for(int i = 0; i < 5; i++)
+        kenc[10 + i] = RndA[4 + i] ^ RndB[4 + i];
+    kenc[15] = 0x11;
 
-	aes_encode(NULL, key, kenc, kenc, 16);
-	if (verbose) {
-		PrintAndLogEx(INFO, "kenc: %s", sprint_hex(kenc, 16));
-	}
+    aes_encode(NULL, key, kenc, kenc, 16);
+    if (verbose) {
+        PrintAndLogEx(INFO, "kenc: %s", sprint_hex(kenc, 16));
+    }
 
-	uint8_t kmac[16] = {0};
-	memcpy(&kmac[0], &RndA[7], 5);
-	memcpy(&kmac[5], &RndB[7], 5);
-	for(int i = 0; i < 5; i++)
-		kmac[10 + i] = RndA[0 + i] ^ RndB[0 + i];
-	kmac[15] = 0x22;
+    uint8_t kmac[16] = {0};
+    memcpy(&kmac[0], &RndA[7], 5);
+    memcpy(&kmac[5], &RndB[7], 5);
+    for(int i = 0; i < 5; i++)
+        kmac[10 + i] = RndA[0 + i] ^ RndB[0 + i];
+    kmac[15] = 0x22;
 
-	aes_encode(NULL, key, kmac, kmac, 16);
-	if (verbose) {
-		PrintAndLogEx(INFO, "kmac: %s", sprint_hex(kmac, 16));
-	}
+    aes_encode(NULL, key, kmac, kmac, 16);
+    if (verbose) {
+        PrintAndLogEx(INFO, "kmac: %s", sprint_hex(kmac, 16));
+    }
 
-	if (!leaveSignalON)
-		DropField();
+    if (!leaveSignalON)
+        DropField();
 
-	if (verbose)
-		PrintAndLog("");
+    if (verbose)
+        PrintAndLog("");
 
-	if (session) {
-		session->Authenticated = true;
-		session->R_Ctr = 0;
-		session->W_Ctr = 0;
-		session->KeyNum = keyn[1] + (keyn[0] << 8);
-		memmove(session->RndA, RndA, 16);
-		memmove(session->RndB, RndB, 16);
-		memmove(session->Key, key, 16);
-		memmove(session->TI, raw, 4);
-		memmove(session->PICCap2, &raw[20], 6);
-		memmove(session->PCDCap2, &raw[26], 6);
-		memmove(session->Kenc, kenc, 16);
-		memmove(session->Kmac, kmac, 16);
-	}
+    if (session) {
+        session->Authenticated = true;
+        session->R_Ctr = 0;
+        session->W_Ctr = 0;
+        session->KeyNum = keyn[1] + (keyn[0] << 8);
+        memmove(session->RndA, RndA, 16);
+        memmove(session->RndB, RndB, 16);
+        memmove(session->Key, key, 16);
+        memmove(session->TI, raw, 4);
+        memmove(session->PICCap2, &raw[20], 6);
+        memmove(session->PCDCap2, &raw[26], 6);
+        memmove(session->Kenc, kenc, 16);
+        memmove(session->Kmac, kmac, 16);
+    }
 
-	if (verbose)
-		PrintAndLogEx(INFO, "Authentication OK");
+    if (verbose)
+        PrintAndLogEx(INFO, "Authentication OK");
 
-	return 0;
+    return 0;
 }
 
 int intExchangeRAW14aPlus(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
-	if(VerboseMode)
-		PrintAndLogEx(INFO, ">>> %s", sprint_hex(datain, datainlen));
+    if(VerboseMode)
+        PrintAndLogEx(INFO, ">>> %s", sprint_hex(datain, datainlen));
 
-	int res = ExchangeRAW14a(datain, datainlen, activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
+    int res = ExchangeRAW14a(datain, datainlen, activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
 
-	if(VerboseMode)
-		PrintAndLogEx(INFO, "<<< %s", sprint_hex(dataout, *dataoutlen));
+    if(VerboseMode)
+        PrintAndLogEx(INFO, "<<< %s", sprint_hex(dataout, *dataoutlen));
 
-	return res;
+    return res;
 }
 
 int MFPWritePerso(uint8_t *keyNum, uint8_t *key, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
-	uint8_t rcmd[3 + 16] = {0xa8, keyNum[1], keyNum[0], 0x00};
-	memmove(&rcmd[3], key, 16);
+    uint8_t rcmd[3 + 16] = {0xa8, keyNum[1], keyNum[0], 0x00};
+    memmove(&rcmd[3], key, 16);
 
-	return intExchangeRAW14aPlus(rcmd, sizeof(rcmd), activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
+    return intExchangeRAW14aPlus(rcmd, sizeof(rcmd), activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
 }
 
 int MFPCommitPerso(bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
-	uint8_t rcmd[1] = {0xaa};
+    uint8_t rcmd[1] = {0xaa};
 
-	return intExchangeRAW14aPlus(rcmd, sizeof(rcmd), activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
+    return intExchangeRAW14aPlus(rcmd, sizeof(rcmd), activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
 }
 
 int MFPReadBlock(mf4Session *session, bool plain, uint8_t blockNum, uint8_t blockCount, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen, uint8_t *mac) {
-	uint8_t rcmd[4 + 8] = {(plain?(0x37):(0x33)), blockNum, 0x00, blockCount};
-	if (!plain && session)
-		CalculateMAC(session, mtypReadCmd, blockNum, blockCount, rcmd, 4, &rcmd[4], VerboseMode);
+    uint8_t rcmd[4 + 8] = {(plain?(0x37):(0x33)), blockNum, 0x00, blockCount};
+    if (!plain && session)
+        CalculateMAC(session, mtypReadCmd, blockNum, blockCount, rcmd, 4, &rcmd[4], VerboseMode);
 
-	int res = intExchangeRAW14aPlus(rcmd, plain?4:sizeof(rcmd), activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
-	if(res)
-		return res;
+    int res = intExchangeRAW14aPlus(rcmd, plain?4:sizeof(rcmd), activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
+    if(res)
+        return res;
 
-	if (session)
-		session->R_Ctr++;
+    if (session)
+        session->R_Ctr++;
 
-	if(session && mac && *dataoutlen > 11)
-		CalculateMAC(session, mtypReadResp, blockNum, blockCount, dataout, *dataoutlen - 8 - 2, mac, VerboseMode);
+    if(session && mac && *dataoutlen > 11)
+        CalculateMAC(session, mtypReadResp, blockNum, blockCount, dataout, *dataoutlen - 8 - 2, mac, VerboseMode);
 
-	return 0;
+    return 0;
 }
 
 int MFPWriteBlock(mf4Session *session, uint8_t blockNum, uint8_t *data, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen, uint8_t *mac) {
-	uint8_t rcmd[1 + 2 + 16 + 8] = {0xA3, blockNum, 0x00};
-	memmove(&rcmd[3], data, 16);
-	if (session)
-		CalculateMAC(session, mtypWriteCmd, blockNum, 1, rcmd, 19, &rcmd[19], VerboseMode);
+    uint8_t rcmd[1 + 2 + 16 + 8] = {0xA3, blockNum, 0x00};
+    memmove(&rcmd[3], data, 16);
+    if (session)
+        CalculateMAC(session, mtypWriteCmd, blockNum, 1, rcmd, 19, &rcmd[19], VerboseMode);
 
-	int res = intExchangeRAW14aPlus(rcmd, sizeof(rcmd), activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
-	if(res)
-		return res;
+    int res = intExchangeRAW14aPlus(rcmd, sizeof(rcmd), activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
+    if(res)
+        return res;
 
-	if (session)
-		session->W_Ctr++;
+    if (session)
+        session->W_Ctr++;
 
-	if(session && mac && *dataoutlen > 3)
-		CalculateMAC(session, mtypWriteResp, blockNum, 1, dataout, *dataoutlen, mac, VerboseMode);
+    if(session && mac && *dataoutlen > 3)
+        CalculateMAC(session, mtypWriteResp, blockNum, 1, dataout, *dataoutlen, mac, VerboseMode);
 
-	return 0;
+    return 0;
 }
 
 int mfpReadSector(uint8_t sectorNo, uint8_t keyType, uint8_t *key, uint8_t *dataout, bool verbose){
-	uint8_t keyn[2] = {0};
-	bool plain = false;
+    uint8_t keyn[2] = {0};
+    bool plain = false;
 
-	uint16_t uKeyNum = 0x4000 + sectorNo * 2 + (keyType ? 1 : 0);
-	keyn[0] = uKeyNum >> 8;
-	keyn[1] = uKeyNum & 0xff;
-	if (verbose)
-		PrintAndLogEx(INFO, "--sector[%d]:%02x key:%04x", mfNumBlocksPerSector(sectorNo), sectorNo, uKeyNum);
+    uint16_t uKeyNum = 0x4000 + sectorNo * 2 + (keyType ? 1 : 0);
+    keyn[0] = uKeyNum >> 8;
+    keyn[1] = uKeyNum & 0xff;
+    if (verbose)
+        PrintAndLogEx(INFO, "--sector[%d]:%02x key:%04x", mfNumBlocksPerSector(sectorNo), sectorNo, uKeyNum);
 
-	mf4Session session;
-	int res = MifareAuth4(&session, keyn, key, true, true, verbose);
-	if (res) {
-		PrintAndLogEx(ERR, "Sector %d authentication error: %d", sectorNo, res);
-		return res;
-	}
+    mf4Session session;
+    int res = MifareAuth4(&session, keyn, key, true, true, verbose);
+    if (res) {
+        PrintAndLogEx(ERR, "Sector %d authentication error: %d", sectorNo, res);
+        return res;
+    }
 
-	uint8_t data[250] = {0};
-	int datalen = 0;
-	uint8_t mac[8] = {0};
-	uint8_t firstBlockNo = mfFirstBlockOfSector(sectorNo);
-	for(int n = firstBlockNo; n < firstBlockNo + mfNumBlocksPerSector(sectorNo); n++) {
-		res = MFPReadBlock(&session, plain, n & 0xff, 1, false, true, data, sizeof(data), &datalen, mac);
-		if (res) {
-			PrintAndLogEx(ERR, "Sector %d read error: %d", sectorNo, res);
-			DropField();
-			return res;
-		}
+    uint8_t data[250] = {0};
+    int datalen = 0;
+    uint8_t mac[8] = {0};
+    uint8_t firstBlockNo = mfFirstBlockOfSector(sectorNo);
+    for(int n = firstBlockNo; n < firstBlockNo + mfNumBlocksPerSector(sectorNo); n++) {
+        res = MFPReadBlock(&session, plain, n & 0xff, 1, false, true, data, sizeof(data), &datalen, mac);
+        if (res) {
+            PrintAndLogEx(ERR, "Sector %d read error: %d", sectorNo, res);
+            DropField();
+            return res;
+        }
 
-		if (datalen && data[0] != 0x90) {
-			PrintAndLogEx(ERR, "Sector %d card read error: %02x %s", sectorNo, data[0], mfpGetErrorDescription(data[0]));
-			DropField();
-			return 5;
-		}
-		if (datalen != 1 + 16 + 8 + 2) {
-			PrintAndLogEx(ERR, "Sector %d error returned data length:%d", sectorNo, datalen);
-			DropField();
-			return 6;
-		}
+        if (datalen && data[0] != 0x90) {
+            PrintAndLogEx(ERR, "Sector %d card read error: %02x %s", sectorNo, data[0], mfpGetErrorDescription(data[0]));
+            DropField();
+            return 5;
+        }
+        if (datalen != 1 + 16 + 8 + 2) {
+            PrintAndLogEx(ERR, "Sector %d error returned data length:%d", sectorNo, datalen);
+            DropField();
+            return 6;
+        }
 
-		memcpy(&dataout[(n - firstBlockNo) * 16], &data[1], 16);
+        memcpy(&dataout[(n - firstBlockNo) * 16], &data[1], 16);
 
-		if (verbose)
-			PrintAndLogEx(INFO, "data[%03d]: %s", n, sprint_hex(&data[1], 16));
+        if (verbose)
+            PrintAndLogEx(INFO, "data[%03d]: %s", n, sprint_hex(&data[1], 16));
 
-		if (memcmp(&data[1 + 16], mac, 8)) {
-			PrintAndLogEx(WARNING, "WARNING: mac on block %d not equal...", n);
-			PrintAndLogEx(WARNING, "MAC   card: %s", sprint_hex(&data[1 + 16], 8));
-			PrintAndLogEx(WARNING, "MAC reader: %s", sprint_hex(mac, 8));
+        if (memcmp(&data[1 + 16], mac, 8)) {
+            PrintAndLogEx(WARNING, "WARNING: mac on block %d not equal...", n);
+            PrintAndLogEx(WARNING, "MAC   card: %s", sprint_hex(&data[1 + 16], 8));
+            PrintAndLogEx(WARNING, "MAC reader: %s", sprint_hex(mac, 8));
 
-			if (!verbose)
-				return 7;
-		} else {
-			if(verbose)
-				PrintAndLogEx(INFO, "MAC: %s", sprint_hex(&data[1 + 16], 8));
-		}
-	}
-	DropField();
+            if (!verbose)
+                return 7;
+        } else {
+            if(verbose)
+                PrintAndLogEx(INFO, "MAC: %s", sprint_hex(&data[1 + 16], 8));
+        }
+    }
+    DropField();
 
-	return 0;
+    return 0;
 }
 
 // Mifare Memory Structure: up to 32 Sectors with 4 blocks each (1k and 2k cards),
 // plus evtl. 8 sectors with 16 blocks each (4k cards)
 uint8_t mfNumBlocksPerSector(uint8_t sectorNo) {
-	if (sectorNo < 32)
-		return 4;
-	else
-		return 16;
+    if (sectorNo < 32)
+        return 4;
+    else
+        return 16;
 }
 
 uint8_t mfFirstBlockOfSector(uint8_t sectorNo) {
-	if (sectorNo < 32)
-		return sectorNo * 4;
-	else
-		return 32 * 4 + (sectorNo - 32) * 16;
+    if (sectorNo < 32)
+        return sectorNo * 4;
+    else
+        return 32 * 4 + (sectorNo - 32) * 16;
 }
 
 uint8_t mfSectorTrailer(uint8_t blockNo) {
-	if (blockNo < 32*4) {
-		return (blockNo | 0x03);
-	} else {
-		return (blockNo | 0x0f);
-	}
+    if (blockNo < 32*4) {
+        return (blockNo | 0x03);
+    } else {
+        return (blockNo | 0x0f);
+    }
 }
 
 bool mfIsSectorTrailer(uint8_t blockNo) {
-	return (blockNo == mfSectorTrailer(blockNo));
+    return (blockNo == mfSectorTrailer(blockNo));
 }
 
 uint8_t mfSectorNum(uint8_t blockNo) {
-	if (blockNo < 32 * 4)
-		return blockNo / 4;
-	else
-		return 32 + (blockNo - 32 * 4) / 16;
+    if (blockNo < 32 * 4)
+        return blockNo / 4;
+    else
+        return 32 + (blockNo - 32 * 4) / 16;
 
 }
diff --git a/client/mifare/mifare4.h b/client/mifare/mifare4.h
index c41c05d2e..c33cb7889 100644
--- a/client/mifare/mifare4.h
+++ b/client/mifare/mifare4.h
@@ -17,30 +17,30 @@
 #include <stddef.h>
 
 typedef struct {
-	bool Authenticated;
-	uint8_t Key[16];
-	uint16_t KeyNum;
-	uint8_t RndA[16];
-	uint8_t RndB[16];
-	uint8_t TI[4];
-	uint8_t PICCap2[6];
-	uint8_t PCDCap2[6];
-	uint8_t Kenc[16];
-	uint8_t Kmac[16];
-	uint16_t R_Ctr;
-	uint16_t W_Ctr;
+    bool Authenticated;
+    uint8_t Key[16];
+    uint16_t KeyNum;
+    uint8_t RndA[16];
+    uint8_t RndB[16];
+    uint8_t TI[4];
+    uint8_t PICCap2[6];
+    uint8_t PCDCap2[6];
+    uint8_t Kenc[16];
+    uint8_t Kmac[16];
+    uint16_t R_Ctr;
+    uint16_t W_Ctr;
 }mf4Session;
 
 typedef enum {
-	mtypReadCmd,
-	mtypReadResp,
-	mtypWriteCmd,
-	mtypWriteResp,
+    mtypReadCmd,
+    mtypReadResp,
+    mtypWriteCmd,
+    mtypWriteResp,
 } MACType_t;
 
 typedef struct {
-	uint8_t cond;
-	char *description;
+    uint8_t cond;
+    char *description;
 } AccessConditions_t;
 
 extern void mfpSetVerboseMode(bool verbose);
diff --git a/client/mifare/mifaredefault.h b/client/mifare/mifaredefault.h
index b12a57c03..e7cd3852e 100644
--- a/client/mifare/mifaredefault.h
+++ b/client/mifare/mifaredefault.h
@@ -17,29 +17,29 @@
 
 static const uint64_t g_mifare_default_keys[] =
 {
-	0xffffffffffff, // Default key (first key used by program if no user defined key)
-	0x000000000000, // Blank key
-	0xa0a1a2a3a4a5, // NFCForum MAD key
-	0xb0b1b2b3b4b5,
-	0xc0c1c2c3c4c5,
-	0xd0d1d2d3d4d5,
-	0xaabbccddeeff,
-	0x1a2b3c4d5e6f,
-	0x123456789abc,
-	0x010203040506,
-	0x123456abcdef,
-	0xabcdef123456,
-	0x4d3a99c351dd,
-	0x1a982c7e459a,
-	0xd3f7d3f7d3f7, // NDEF public key
-	0x714c5c886e97,
-	0x587ee5f9350f,
-	0xa0478cc39091,
-	0x533cb6c723f6,
-	0x8fd0a4f256e9,
-	0x0000014b5c31,
-	0xb578f38a5c61,
-	0x96a301bce267
+    0xffffffffffff, // Default key (first key used by program if no user defined key)
+    0x000000000000, // Blank key
+    0xa0a1a2a3a4a5, // NFCForum MAD key
+    0xb0b1b2b3b4b5,
+    0xc0c1c2c3c4c5,
+    0xd0d1d2d3d4d5,
+    0xaabbccddeeff,
+    0x1a2b3c4d5e6f,
+    0x123456789abc,
+    0x010203040506,
+    0x123456abcdef,
+    0xabcdef123456,
+    0x4d3a99c351dd,
+    0x1a982c7e459a,
+    0xd3f7d3f7d3f7, // NDEF public key
+    0x714c5c886e97,
+    0x587ee5f9350f,
+    0xa0478cc39091,
+    0x533cb6c723f6,
+    0x8fd0a4f256e9,
+    0x0000014b5c31,
+    0xb578f38a5c61,
+    0x96a301bce267
 };
 
 static const uint8_t g_mifare_mad_key[] =  {0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5};
diff --git a/client/mifare/mifarehost.c b/client/mifare/mifarehost.c
index 1d1da1d1c..cef876d18 100644
--- a/client/mifare/mifarehost.c
+++ b/client/mifare/mifarehost.c
@@ -11,126 +11,126 @@
 #include "cmdmain.h"
 
 int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
-	uint32_t uid = 0;
-	uint32_t nt = 0, nr = 0, ar = 0;
-	uint64_t par_list = 0, ks_list = 0;
-	uint64_t *keylist = NULL, *last_keylist = NULL;
-	uint32_t keycount = 0;
-	int16_t isOK = 0;
+    uint32_t uid = 0;
+    uint32_t nt = 0, nr = 0, ar = 0;
+    uint64_t par_list = 0, ks_list = 0;
+    uint64_t *keylist = NULL, *last_keylist = NULL;
+    uint32_t keycount = 0;
+    int16_t isOK = 0;
 
-	UsbCommand c = {CMD_READER_MIFARE, {true, blockno, key_type}};
+    UsbCommand c = {CMD_READER_MIFARE, {true, blockno, key_type}};
 
-	// message
-	PrintAndLogEx(NORMAL, "--------------------------------------------------------------------------------\n");
-	PrintAndLogEx(NORMAL, "executing Darkside attack. Expected execution time: 25sec on average");
-	PrintAndLogEx(NORMAL, "press pm3-button on the proxmark3 device to abort both proxmark3 and client.");
-	PrintAndLogEx(NORMAL, "--------------------------------------------------------------------------------\n");
+    // message
+    PrintAndLogEx(NORMAL, "--------------------------------------------------------------------------------\n");
+    PrintAndLogEx(NORMAL, "executing Darkside attack. Expected execution time: 25sec on average");
+    PrintAndLogEx(NORMAL, "press pm3-button on the proxmark3 device to abort both proxmark3 and client.");
+    PrintAndLogEx(NORMAL, "--------------------------------------------------------------------------------\n");
 
-	while (true) {
-		clearCommandBuffer();
-		SendCommand(&c);
+    while (true) {
+        clearCommandBuffer();
+        SendCommand(&c);
 
-		//flush queue
-		while (ukbhit()) {
-			int gc = getchar(); (void)gc;
-			return -5;
-		}
+        //flush queue
+        while (ukbhit()) {
+            int gc = getchar(); (void)gc;
+            return -5;
+        }
 
-		// wait cycle
-		while (true) {
-			printf("."); fflush(stdout);
-			if (ukbhit()) {
-				int gc = getchar(); (void)gc;
-				return -5;
-			}
+        // wait cycle
+        while (true) {
+            printf("."); fflush(stdout);
+            if (ukbhit()) {
+                int gc = getchar(); (void)gc;
+                return -5;
+            }
 
-			UsbCommand resp;
-			if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
-				isOK  = resp.arg[0];
-				if (isOK < 0)
-					return isOK;
+            UsbCommand resp;
+            if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
+                isOK  = resp.arg[0];
+                if (isOK < 0)
+                    return isOK;
 
-				uid = (uint32_t)bytes_to_num(resp.d.asBytes +  0, 4);
-				nt = (uint32_t)bytes_to_num(resp.d.asBytes +  4, 4);
-				par_list = bytes_to_num(resp.d.asBytes +  8, 8);
-				ks_list = bytes_to_num(resp.d.asBytes +  16, 8);
-				nr = (uint32_t)bytes_to_num(resp.d.asBytes + 24, 4);
-				ar = (uint32_t)bytes_to_num(resp.d.asBytes + 28, 4);
-				break;
-			}
-		}
-		PrintAndLogEx(NORMAL, "\n");
+                uid = (uint32_t)bytes_to_num(resp.d.asBytes +  0, 4);
+                nt = (uint32_t)bytes_to_num(resp.d.asBytes +  4, 4);
+                par_list = bytes_to_num(resp.d.asBytes +  8, 8);
+                ks_list = bytes_to_num(resp.d.asBytes +  16, 8);
+                nr = (uint32_t)bytes_to_num(resp.d.asBytes + 24, 4);
+                ar = (uint32_t)bytes_to_num(resp.d.asBytes + 28, 4);
+                break;
+            }
+        }
+        PrintAndLogEx(NORMAL, "\n");
 
-		if (par_list == 0 && c.arg[0] == true) {
-			PrintAndLogEx(SUCCESS, "Parity is all zero. Most likely this card sends NACK on every authentication.");
-		}
-		c.arg[0] = false;
+        if (par_list == 0 && c.arg[0] == true) {
+            PrintAndLogEx(SUCCESS, "Parity is all zero. Most likely this card sends NACK on every authentication.");
+        }
+        c.arg[0] = false;
 
-		keycount = nonce2key(uid, nt, nr, ar, par_list, ks_list, &keylist);
+        keycount = nonce2key(uid, nt, nr, ar, par_list, ks_list, &keylist);
 
-		if (keycount == 0) {
-			PrintAndLogEx(FAILED, "key not found (lfsr_common_prefix list is null). Nt=%08x", nt);
-			PrintAndLogEx(FAILED, "this is expected to happen in 25%% of all cases. Trying again with a different reader nonce...");
-			continue;
-		}
+        if (keycount == 0) {
+            PrintAndLogEx(FAILED, "key not found (lfsr_common_prefix list is null). Nt=%08x", nt);
+            PrintAndLogEx(FAILED, "this is expected to happen in 25%% of all cases. Trying again with a different reader nonce...");
+            continue;
+        }
 
-		// only parity zero attack
-		if (par_list == 0 ) {
-			qsort(keylist, keycount, sizeof(*keylist), compare_uint64);
-			keycount = intersection(last_keylist, keylist);
-			if (keycount == 0) {
-				free(last_keylist);
-				last_keylist = keylist;
-				PrintAndLogEx(FAILED, "no candidates found, trying again");
-				continue;
-			}
-		}
+        // only parity zero attack
+        if (par_list == 0 ) {
+            qsort(keylist, keycount, sizeof(*keylist), compare_uint64);
+            keycount = intersection(last_keylist, keylist);
+            if (keycount == 0) {
+                free(last_keylist);
+                last_keylist = keylist;
+                PrintAndLogEx(FAILED, "no candidates found, trying again");
+                continue;
+            }
+        }
 
-		PrintAndLogEx(SUCCESS, "found %u candidate key%s\n", keycount, (keycount > 1) ? "s." : ".");
+        PrintAndLogEx(SUCCESS, "found %u candidate key%s\n", keycount, (keycount > 1) ? "s." : ".");
 
-		*key = -1;
-		uint8_t keyBlock[USB_CMD_DATA_SIZE];
-		int max_keys = USB_CMD_DATA_SIZE / 6;
-		for (int i = 0; i < keycount; i += max_keys) {
+        *key = -1;
+        uint8_t keyBlock[USB_CMD_DATA_SIZE];
+        int max_keys = USB_CMD_DATA_SIZE / 6;
+        for (int i = 0; i < keycount; i += max_keys) {
 
-			int size = keycount - i > max_keys ? max_keys : keycount - i;
-			for (int j = 0; j < size; j++) {
-				if (par_list == 0) {
-					num_to_bytes(last_keylist[i*max_keys + j], 6, keyBlock+(j*6));
-				} else {
-					num_to_bytes(keylist[i*max_keys + j], 6, keyBlock+(j*6));
-				}
-			}
+            int size = keycount - i > max_keys ? max_keys : keycount - i;
+            for (int j = 0; j < size; j++) {
+                if (par_list == 0) {
+                    num_to_bytes(last_keylist[i*max_keys + j], 6, keyBlock+(j*6));
+                } else {
+                    num_to_bytes(keylist[i*max_keys + j], 6, keyBlock+(j*6));
+                }
+            }
 
-			if (!mfCheckKeys(blockno, key_type - 0x60, false, size, keyBlock, key)) {
-				break;
-			}
-		}
+            if (!mfCheckKeys(blockno, key_type - 0x60, false, size, keyBlock, key)) {
+                break;
+            }
+        }
 
-		if (*key != -1) {
-			break;
-		} else {
-			PrintAndLogEx(FAILED, "all candidate keys failed. Restarting darkside attack");
-			free(last_keylist);
-			last_keylist = keylist;
-			c.arg[0] = true;
-		}
-	}
-	free(last_keylist);
-	free(keylist);
-	return 0;
+        if (*key != -1) {
+            break;
+        } else {
+            PrintAndLogEx(FAILED, "all candidate keys failed. Restarting darkside attack");
+            free(last_keylist);
+            last_keylist = keylist;
+            c.arg[0] = true;
+        }
+    }
+    free(last_keylist);
+    free(keylist);
+    return 0;
 }
 int mfCheckKeys(uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t keycnt, uint8_t * keyBlock, uint64_t * key){
-	*key = -1;
-	UsbCommand c = {CMD_MIFARE_CHKKEYS, { (blockNo | (keyType << 8)), clear_trace, keycnt}};
-	memcpy(c.d.asBytes, keyBlock, 6 * keycnt);
-	clearCommandBuffer();
-	SendCommand(&c);
-	UsbCommand resp;
-	if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) return 1;
-	if ((resp.arg[0] & 0xff) != 0x01) return 2;
-	*key = bytes_to_num(resp.d.asBytes, 6);
-	return 0;
+    *key = -1;
+    UsbCommand c = {CMD_MIFARE_CHKKEYS, { (blockNo | (keyType << 8)), clear_trace, keycnt}};
+    memcpy(c.d.asBytes, keyBlock, 6 * keycnt);
+    clearCommandBuffer();
+    SendCommand(&c);
+    UsbCommand resp;
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) return 1;
+    if ((resp.arg[0] & 0xff) != 0x01) return 2;
+    *key = bytes_to_num(resp.d.asBytes, 6);
+    return 0;
 }
 
 // Sends chunks of keys to device.
@@ -138,132 +138,132 @@ int mfCheckKeys(uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t keyc
 // 1 ==
 // 2 == Time-out, aborting
 int mfCheckKeys_fast( uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk, uint8_t strategy,
-						uint32_t size, uint8_t *keyBlock, sector_t *e_sector, bool use_flashmemory) {
+                        uint32_t size, uint8_t *keyBlock, sector_t *e_sector, bool use_flashmemory) {
 
-	uint64_t t2 = msclock();
-	uint32_t timeout = 0;
+    uint64_t t2 = msclock();
+    uint32_t timeout = 0;
 
-	// send keychunk
-	UsbCommand c = {CMD_MIFARE_CHKKEYS_FAST, { (sectorsCnt | (firstChunk << 8) | (lastChunk << 12) ), ((use_flashmemory << 8) | strategy), size}};
-	memcpy(c.d.asBytes, keyBlock, 6 * size);
-	clearCommandBuffer();
-	SendCommand(&c);
-	UsbCommand resp;
+    // send keychunk
+    UsbCommand c = {CMD_MIFARE_CHKKEYS_FAST, { (sectorsCnt | (firstChunk << 8) | (lastChunk << 12) ), ((use_flashmemory << 8) | strategy), size}};
+    memcpy(c.d.asBytes, keyBlock, 6 * size);
+    clearCommandBuffer();
+    SendCommand(&c);
+    UsbCommand resp;
 
-	while ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
-		timeout++;
-		printf("."); fflush(stdout);
-		// max timeout for one chunk of 85keys, 60*3sec = 180seconds
-		// s70 with 40*2 keys to check, 80*85 = 6800 auth.
-		// takes about 97s, still some margin before abort
-		if (timeout > 180) {
-			PrintAndLogEx(WARNING, "\nno response from Proxmark. Aborting...");
-			return 2;
-		}
-	}
-	t2 = msclock() - t2;
+    while ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
+        timeout++;
+        printf("."); fflush(stdout);
+        // max timeout for one chunk of 85keys, 60*3sec = 180seconds
+        // s70 with 40*2 keys to check, 80*85 = 6800 auth.
+        // takes about 97s, still some margin before abort
+        if (timeout > 180) {
+            PrintAndLogEx(WARNING, "\nno response from Proxmark. Aborting...");
+            return 2;
+        }
+    }
+    t2 = msclock() - t2;
 
-	// time to convert the returned data.
-	uint8_t curr_keys = resp.arg[0];
+    // time to convert the returned data.
+    uint8_t curr_keys = resp.arg[0];
 
-	PrintAndLogEx(SUCCESS, "\nChunk: %.1fs | found %u/%u keys (%u)", (float)(t2/1000.0), curr_keys, (sectorsCnt<<1), size);
+    PrintAndLogEx(SUCCESS, "\nChunk: %.1fs | found %u/%u keys (%u)", (float)(t2/1000.0), curr_keys, (sectorsCnt<<1), size);
 
-	// all keys?
-	if ( curr_keys == sectorsCnt*2 || lastChunk ) {
+    // all keys?
+    if ( curr_keys == sectorsCnt*2 || lastChunk ) {
 
-		// success array. each byte is status of key
-		uint8_t arr[80];
-		uint64_t foo = 0;
-		uint16_t bar = 0;
-		foo = bytes_to_num(resp.d.asBytes+480, 8);
-		bar = (resp.d.asBytes[489]  << 8 | resp.d.asBytes[488]);
+        // success array. each byte is status of key
+        uint8_t arr[80];
+        uint64_t foo = 0;
+        uint16_t bar = 0;
+        foo = bytes_to_num(resp.d.asBytes+480, 8);
+        bar = (resp.d.asBytes[489]  << 8 | resp.d.asBytes[488]);
 
-		for (uint8_t i = 0; i < 64; i++)
-			arr[i] = (foo >> i) & 0x1;
+        for (uint8_t i = 0; i < 64; i++)
+            arr[i] = (foo >> i) & 0x1;
 
-		for (uint8_t i = 0; i < 16; i++)
-			arr[i+64] = (bar >> i) & 0x1;
+        for (uint8_t i = 0; i < 16; i++)
+            arr[i+64] = (bar >> i) & 0x1;
 
-		// initialize storage for found keys
-		icesector_t *tmp = calloc(sectorsCnt, sizeof(icesector_t));
-		if (tmp == NULL)
-			return 1;
-		memcpy(tmp, resp.d.asBytes, sectorsCnt * sizeof(icesector_t) );
+        // initialize storage for found keys
+        icesector_t *tmp = calloc(sectorsCnt, sizeof(icesector_t));
+        if (tmp == NULL)
+            return 1;
+        memcpy(tmp, resp.d.asBytes, sectorsCnt * sizeof(icesector_t) );
 
-		for ( int i = 0; i < sectorsCnt; i++) {
-			// key A
-			if ( !e_sector[i].foundKey[0] ) {
-				e_sector[i].Key[0] =  bytes_to_num( tmp[i].keyA, 6);
-				e_sector[i].foundKey[0] = arr[ (i*2) ];
-			}
-			// key B
-			if ( !e_sector[i].foundKey[1] ) {
-				e_sector[i].Key[1] =  bytes_to_num( tmp[i].keyB, 6);
-				e_sector[i].foundKey[1] = arr[ (i*2) + 1 ];
-			}
-		}
-		free(tmp);
+        for ( int i = 0; i < sectorsCnt; i++) {
+            // key A
+            if ( !e_sector[i].foundKey[0] ) {
+                e_sector[i].Key[0] =  bytes_to_num( tmp[i].keyA, 6);
+                e_sector[i].foundKey[0] = arr[ (i*2) ];
+            }
+            // key B
+            if ( !e_sector[i].foundKey[1] ) {
+                e_sector[i].Key[1] =  bytes_to_num( tmp[i].keyB, 6);
+                e_sector[i].foundKey[1] = arr[ (i*2) + 1 ];
+            }
+        }
+        free(tmp);
 
-		if ( curr_keys == sectorsCnt*2 )
-			return 0;
-		if ( lastChunk )
-			return 1;
-	}
-	return 1;
+        if ( curr_keys == sectorsCnt*2 )
+            return 0;
+        if ( lastChunk )
+            return 1;
+    }
+    return 1;
 }
 
 // PM3 imp of J-Run mf_key_brute (part 2)
 // ref: https://github.com/J-Run/mf_key_brute
 int mfKeyBrute(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint64_t *resultkey){
 
-	#define KEYS_IN_BLOCK 85
-	#define KEYBLOCK_SIZE 510
-	#define CANDIDATE_SIZE 0xFFFF * 6
-	uint8_t found = false;
-	uint64_t key64 = 0;
-	uint8_t candidates[CANDIDATE_SIZE] = {0x00};
-	uint8_t keyBlock[KEYBLOCK_SIZE] = {0x00};
+    #define KEYS_IN_BLOCK 85
+    #define KEYBLOCK_SIZE 510
+    #define CANDIDATE_SIZE 0xFFFF * 6
+    uint8_t found = false;
+    uint64_t key64 = 0;
+    uint8_t candidates[CANDIDATE_SIZE] = {0x00};
+    uint8_t keyBlock[KEYBLOCK_SIZE] = {0x00};
 
-	memset(candidates, 0, sizeof(candidates));
-	memset(keyBlock, 0, sizeof(keyBlock));
+    memset(candidates, 0, sizeof(candidates));
+    memset(keyBlock, 0, sizeof(keyBlock));
 
-	// Generate all possible keys for the first two unknown bytes.
-	for (uint16_t i = 0; i < 0xFFFF; ++i) {
-		uint32_t j = i * 6;
-		candidates[0 + j] = i >> 8;
-		candidates[1 + j] = i;
-		candidates[2 + j] = key[2];
-		candidates[3 + j] = key[3];
-		candidates[4 + j] = key[4];
-		candidates[5 + j] = key[5];
-	}
-	uint32_t counter, i;
-	for ( i = 0, counter = 1; i < CANDIDATE_SIZE; i += KEYBLOCK_SIZE, ++counter){
+    // Generate all possible keys for the first two unknown bytes.
+    for (uint16_t i = 0; i < 0xFFFF; ++i) {
+        uint32_t j = i * 6;
+        candidates[0 + j] = i >> 8;
+        candidates[1 + j] = i;
+        candidates[2 + j] = key[2];
+        candidates[3 + j] = key[3];
+        candidates[4 + j] = key[4];
+        candidates[5 + j] = key[5];
+    }
+    uint32_t counter, i;
+    for ( i = 0, counter = 1; i < CANDIDATE_SIZE; i += KEYBLOCK_SIZE, ++counter){
 
-		key64 = 0;
+        key64 = 0;
 
-		// copy candidatekeys to test key block
-		memcpy(keyBlock, candidates + i, KEYBLOCK_SIZE);
+        // copy candidatekeys to test key block
+        memcpy(keyBlock, candidates + i, KEYBLOCK_SIZE);
 
-		// check a block of generated candidate keys.
-		if (!mfCheckKeys(blockNo, keyType, true, KEYS_IN_BLOCK, keyBlock, &key64)) {
-			*resultkey = key64;
-			found = true;
-			break;
-		}
+        // check a block of generated candidate keys.
+        if (!mfCheckKeys(blockNo, keyType, true, KEYS_IN_BLOCK, keyBlock, &key64)) {
+            *resultkey = key64;
+            found = true;
+            break;
+        }
 
-		// progress
-		if ( counter % 20 == 0 )
-			PrintAndLogEx(SUCCESS, "tried : %s.. \t %u keys", sprint_hex(candidates + i, 6),  counter * KEYS_IN_BLOCK  );
-	}
-	return found;
+        // progress
+        if ( counter % 20 == 0 )
+            PrintAndLogEx(SUCCESS, "tried : %s.. \t %u keys", sprint_hex(candidates + i, 6),  counter * KEYS_IN_BLOCK  );
+    }
+    return found;
 }
 
 // Compare 16 Bits out of cryptostate
 int Compare16Bits(const void * a, const void * b) {
-	if ((*(uint64_t*)b & 0x00ff000000ff0000) == (*(uint64_t*)a & 0x00ff000000ff0000)) return 0;
-	if ((*(uint64_t*)b & 0x00ff000000ff0000) > (*(uint64_t*)a & 0x00ff000000ff0000)) return 1;
-	return -1;
+    if ((*(uint64_t*)b & 0x00ff000000ff0000) == (*(uint64_t*)a & 0x00ff000000ff0000)) return 0;
+    if ((*(uint64_t*)b & 0x00ff000000ff0000) > (*(uint64_t*)a & 0x00ff000000ff0000)) return 1;
+    return -1;
 }
 
 // wrapper function for multi-threaded lfsr_recovery32
@@ -274,266 +274,266 @@ __attribute__((force_align_arg_pointer))
 #endif
 #endif
 *nested_worker_thread(void *arg) {
-	struct Crypto1State *p1;
-	StateList_t *statelist = arg;
-	statelist->head.slhead = lfsr_recovery32(statelist->ks1, statelist->nt ^ statelist->uid);
+    struct Crypto1State *p1;
+    StateList_t *statelist = arg;
+    statelist->head.slhead = lfsr_recovery32(statelist->ks1, statelist->nt ^ statelist->uid);
 
-	for (p1 = statelist->head.slhead; *(uint64_t *)p1 != 0; p1++) {};
+    for (p1 = statelist->head.slhead; *(uint64_t *)p1 != 0; p1++) {};
 
-	statelist->len = p1 - statelist->head.slhead;
-	statelist->tail.sltail = --p1;
-	qsort(statelist->head.slhead, statelist->len, sizeof(uint64_t), Compare16Bits);
+    statelist->len = p1 - statelist->head.slhead;
+    statelist->tail.sltail = --p1;
+    qsort(statelist->head.slhead, statelist->len, sizeof(uint64_t), Compare16Bits);
 
-	return statelist->head.slhead;
+    return statelist->head.slhead;
 }
 
 int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t * resultKey, bool calibrate) {
-	uint16_t i;
-	uint32_t uid;
-	UsbCommand resp;
-	StateList_t statelists[2];
-	struct Crypto1State *p1, *p2, *p3, *p4;
+    uint16_t i;
+    uint32_t uid;
+    UsbCommand resp;
+    StateList_t statelists[2];
+    struct Crypto1State *p1, *p2, *p3, *p4;
 
-	UsbCommand c = {CMD_MIFARE_NESTED, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, calibrate}};
-	memcpy(c.d.asBytes, key, 6);
-	clearCommandBuffer();
-	SendCommand(&c);
-	if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return -1;
+    UsbCommand c = {CMD_MIFARE_NESTED, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, calibrate}};
+    memcpy(c.d.asBytes, key, 6);
+    clearCommandBuffer();
+    SendCommand(&c);
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return -1;
 
-	// error during nested
-	if (resp.arg[0]) return resp.arg[0];
+    // error during nested
+    if (resp.arg[0]) return resp.arg[0];
 
-	memcpy(&uid, resp.d.asBytes, 4);
+    memcpy(&uid, resp.d.asBytes, 4);
 
-	for (i = 0; i < 2; i++) {
-		statelists[i].blockNo = resp.arg[2] & 0xff;
-		statelists[i].keyType = (resp.arg[2] >> 8) & 0xff;
-		statelists[i].uid = uid;
-		memcpy(&statelists[i].nt,  (void *)(resp.d.asBytes + 4 + i * 8 + 0), 4);
-		memcpy(&statelists[i].ks1, (void *)(resp.d.asBytes + 4 + i * 8 + 4), 4);
-	}
+    for (i = 0; i < 2; i++) {
+        statelists[i].blockNo = resp.arg[2] & 0xff;
+        statelists[i].keyType = (resp.arg[2] >> 8) & 0xff;
+        statelists[i].uid = uid;
+        memcpy(&statelists[i].nt,  (void *)(resp.d.asBytes + 4 + i * 8 + 0), 4);
+        memcpy(&statelists[i].ks1, (void *)(resp.d.asBytes + 4 + i * 8 + 4), 4);
+    }
 
-	// calc keys
-	pthread_t thread_id[2];
+    // calc keys
+    pthread_t thread_id[2];
 
-	// create and run worker threads
-	for (i = 0; i < 2; i++)
-		pthread_create(thread_id + i, NULL, nested_worker_thread, &statelists[i]);
+    // create and run worker threads
+    for (i = 0; i < 2; i++)
+        pthread_create(thread_id + i, NULL, nested_worker_thread, &statelists[i]);
 
-	// wait for threads to terminate:
-	for (i = 0; i < 2; i++)
-		pthread_join(thread_id[i], (void*)&statelists[i].head.slhead);
+    // wait for threads to terminate:
+    for (i = 0; i < 2; i++)
+        pthread_join(thread_id[i], (void*)&statelists[i].head.slhead);
 
-	// the first 16 Bits of the cryptostate already contain part of our key.
-	// Create the intersection of the two lists based on these 16 Bits and
-	// roll back the cryptostate
-	p1 = p3 = statelists[0].head.slhead;
-	p2 = p4 = statelists[1].head.slhead;
+    // the first 16 Bits of the cryptostate already contain part of our key.
+    // Create the intersection of the two lists based on these 16 Bits and
+    // roll back the cryptostate
+    p1 = p3 = statelists[0].head.slhead;
+    p2 = p4 = statelists[1].head.slhead;
 
-	while (p1 <= statelists[0].tail.sltail && p2 <= statelists[1].tail.sltail) {
-		if (Compare16Bits(p1, p2) == 0) {
+    while (p1 <= statelists[0].tail.sltail && p2 <= statelists[1].tail.sltail) {
+        if (Compare16Bits(p1, p2) == 0) {
 
-			struct Crypto1State savestate, *savep = &savestate;
-			savestate = *p1;
-			while(Compare16Bits(p1, savep) == 0 && p1 <= statelists[0].tail.sltail) {
-				*p3 = *p1;
-				lfsr_rollback_word(p3, statelists[0].nt ^ statelists[0].uid, 0);
-				p3++;
-				p1++;
-			}
-			savestate = *p2;
-			while(Compare16Bits(p2, savep) == 0 && p2 <= statelists[1].tail.sltail) {
-				*p4 = *p2;
-				lfsr_rollback_word(p4, statelists[1].nt ^ statelists[1].uid, 0);
-				p4++;
-				p2++;
-			}
-		}
-		else {
-			while (Compare16Bits(p1, p2) == -1) p1++;
-			while (Compare16Bits(p1, p2) == 1) p2++;
-		}
-	}
+            struct Crypto1State savestate, *savep = &savestate;
+            savestate = *p1;
+            while(Compare16Bits(p1, savep) == 0 && p1 <= statelists[0].tail.sltail) {
+                *p3 = *p1;
+                lfsr_rollback_word(p3, statelists[0].nt ^ statelists[0].uid, 0);
+                p3++;
+                p1++;
+            }
+            savestate = *p2;
+            while(Compare16Bits(p2, savep) == 0 && p2 <= statelists[1].tail.sltail) {
+                *p4 = *p2;
+                lfsr_rollback_word(p4, statelists[1].nt ^ statelists[1].uid, 0);
+                p4++;
+                p2++;
+            }
+        }
+        else {
+            while (Compare16Bits(p1, p2) == -1) p1++;
+            while (Compare16Bits(p1, p2) == 1) p2++;
+        }
+    }
 
-	*(uint64_t*)p3 = -1;
-	*(uint64_t*)p4 = -1;
-	statelists[0].len = p3 - statelists[0].head.slhead;
-	statelists[1].len = p4 - statelists[1].head.slhead;
-	statelists[0].tail.sltail = --p3;
-	statelists[1].tail.sltail = --p4;
+    *(uint64_t*)p3 = -1;
+    *(uint64_t*)p4 = -1;
+    statelists[0].len = p3 - statelists[0].head.slhead;
+    statelists[1].len = p4 - statelists[1].head.slhead;
+    statelists[0].tail.sltail = --p3;
+    statelists[1].tail.sltail = --p4;
 
-	// the statelists now contain possible keys. The key we are searching for must be in the
-	// intersection of both lists
-	qsort(statelists[0].head.keyhead, statelists[0].len, sizeof(uint64_t), compare_uint64);
-	qsort(statelists[1].head.keyhead, statelists[1].len, sizeof(uint64_t), compare_uint64);
-	// Create the intersection
-	statelists[0].len = intersection(statelists[0].head.keyhead, statelists[1].head.keyhead);
+    // the statelists now contain possible keys. The key we are searching for must be in the
+    // intersection of both lists
+    qsort(statelists[0].head.keyhead, statelists[0].len, sizeof(uint64_t), compare_uint64);
+    qsort(statelists[1].head.keyhead, statelists[1].len, sizeof(uint64_t), compare_uint64);
+    // Create the intersection
+    statelists[0].len = intersection(statelists[0].head.keyhead, statelists[1].head.keyhead);
 
-	//statelists[0].tail.keytail = --p7;
-	uint32_t keycnt = statelists[0].len;
-	if ( keycnt == 0 ) goto out;
+    //statelists[0].tail.keytail = --p7;
+    uint32_t keycnt = statelists[0].len;
+    if ( keycnt == 0 ) goto out;
 
-	memset(resultKey, 0, 6);
-	uint64_t key64 = -1;
+    memset(resultKey, 0, 6);
+    uint64_t key64 = -1;
 
-	// The list may still contain several key candidates. Test each of them with mfCheckKeys
-	uint32_t max_keys = keycnt > (USB_CMD_DATA_SIZE/6) ? (USB_CMD_DATA_SIZE/6) : keycnt;
-	uint8_t keyBlock[USB_CMD_DATA_SIZE] = {0x00};
+    // The list may still contain several key candidates. Test each of them with mfCheckKeys
+    uint32_t max_keys = keycnt > (USB_CMD_DATA_SIZE/6) ? (USB_CMD_DATA_SIZE/6) : keycnt;
+    uint8_t keyBlock[USB_CMD_DATA_SIZE] = {0x00};
 
-	for (int i = 0; i < keycnt; i += max_keys) {
+    for (int i = 0; i < keycnt; i += max_keys) {
 
-		int size = keycnt - i > max_keys ? max_keys : keycnt - i;
+        int size = keycnt - i > max_keys ? max_keys : keycnt - i;
 
-		for (int j = 0; j < size; j++) {
-			crypto1_get_lfsr(statelists[0].head.slhead + i, &key64);
-			num_to_bytes(key64, 6, keyBlock + i * 6);
-		}
+        for (int j = 0; j < size; j++) {
+            crypto1_get_lfsr(statelists[0].head.slhead + i, &key64);
+            num_to_bytes(key64, 6, keyBlock + i * 6);
+        }
 
-		if (!mfCheckKeys(statelists[0].blockNo, statelists[0].keyType, false, size, keyBlock, &key64)) {
-			free(statelists[0].head.slhead);
-			free(statelists[1].head.slhead);
-			num_to_bytes(key64, 6, resultKey);
+        if (!mfCheckKeys(statelists[0].blockNo, statelists[0].keyType, false, size, keyBlock, &key64)) {
+            free(statelists[0].head.slhead);
+            free(statelists[1].head.slhead);
+            num_to_bytes(key64, 6, resultKey);
 
-			PrintAndLogEx(SUCCESS, "target block:%3u key type: %c  -- found valid key [%012" PRIx64 "]",
-				(uint16_t)resp.arg[2] & 0xff,
-				(resp.arg[2] >> 8) ? 'B' : 'A',
-				key64
-			);
-			return -5;
-		}
-	}
+            PrintAndLogEx(SUCCESS, "target block:%3u key type: %c  -- found valid key [%012" PRIx64 "]",
+                (uint16_t)resp.arg[2] & 0xff,
+                (resp.arg[2] >> 8) ? 'B' : 'A',
+                key64
+            );
+            return -5;
+        }
+    }
 
 out:
-	PrintAndLogEx(SUCCESS, "target block:%3u key type: %c",
-			(uint16_t)resp.arg[2] & 0xff,
-			(resp.arg[2] >> 8) ? 'B' : 'A'
-	);
+    PrintAndLogEx(SUCCESS, "target block:%3u key type: %c",
+            (uint16_t)resp.arg[2] & 0xff,
+            (resp.arg[2] >> 8) ? 'B' : 'A'
+    );
 
-	free(statelists[0].head.slhead);
-	free(statelists[1].head.slhead);
-	return -4;
+    free(statelists[0].head.slhead);
+    free(statelists[1].head.slhead);
+    return -4;
 }
 
 // MIFARE
 int mfReadSector(uint8_t sectorNo, uint8_t keyType, uint8_t *key, uint8_t *data) {
 
-	UsbCommand c = {CMD_MIFARE_READSC, {sectorNo, keyType, 0}};
-	memcpy(c.d.asBytes, key, 6);
-	clearCommandBuffer();
-	SendCommand(&c);
+    UsbCommand c = {CMD_MIFARE_READSC, {sectorNo, keyType, 0}};
+    memcpy(c.d.asBytes, key, 6);
+    clearCommandBuffer();
+    SendCommand(&c);
 
-	UsbCommand resp;
-	if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-		uint8_t isOK  = resp.arg[0] & 0xff;
+    UsbCommand resp;
+    if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
+        uint8_t isOK  = resp.arg[0] & 0xff;
 
-		if (isOK) {
-			memcpy(data, resp.d.asBytes, mfNumBlocksPerSector(sectorNo) * 16);
-			return 0;
-		} else {
-			return 1;
-		}
-	} else {
-		PrintAndLogEx(ERR, "Command execute timeout");
-		return 2;
-	}
+        if (isOK) {
+            memcpy(data, resp.d.asBytes, mfNumBlocksPerSector(sectorNo) * 16);
+            return 0;
+        } else {
+            return 1;
+        }
+    } else {
+        PrintAndLogEx(ERR, "Command execute timeout");
+        return 2;
+    }
 
-	return 0;
+    return 0;
 }
 
 // EMULATOR
 int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount) {
-	UsbCommand c = {CMD_MIFARE_EML_MEMGET, {blockNum, blocksCount, 0}};
-	clearCommandBuffer();
- 	SendCommand(&c);
-	UsbCommand resp;
-	if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return 1;
-	memcpy(data, resp.d.asBytes, blocksCount * 16);
-	return 0;
+    UsbCommand c = {CMD_MIFARE_EML_MEMGET, {blockNum, blocksCount, 0}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    UsbCommand resp;
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return 1;
+    memcpy(data, resp.d.asBytes, blocksCount * 16);
+    return 0;
 }
 
 int mfEmlSetMem(uint8_t *data, int blockNum, int blocksCount) {
-	return mfEmlSetMem_xt(data, blockNum, blocksCount, 16);
+    return mfEmlSetMem_xt(data, blockNum, blocksCount, 16);
 }
 
 int mfEmlSetMem_xt(uint8_t *data, int blockNum, int blocksCount, int blockBtWidth) {
-	UsbCommand c = {CMD_MIFARE_EML_MEMSET, {blockNum, blocksCount, blockBtWidth}};
-	memcpy(c.d.asBytes, data, blocksCount * blockBtWidth);
-	clearCommandBuffer();
-	SendCommand(&c);
-	return 0;
+    UsbCommand c = {CMD_MIFARE_EML_MEMSET, {blockNum, blocksCount, blockBtWidth}};
+    memcpy(c.d.asBytes, data, blocksCount * blockBtWidth);
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
 }
 
 // "MAGIC" CARD
 int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, uint8_t wipecard) {
 
-	uint8_t params = MAGIC_SINGLE;
-	uint8_t block0[16];
-	memset(block0, 0x00, sizeof(block0));
+    uint8_t params = MAGIC_SINGLE;
+    uint8_t block0[16];
+    memset(block0, 0x00, sizeof(block0));
 
-	int old = mfCGetBlock(0, block0, params);
-	if (old == 0)
-		PrintAndLogEx(SUCCESS, "old block 0:  %s", sprint_hex(block0, sizeof(block0)));
-	else
-		PrintAndLogEx(FAILED, "couldn't get old data. Will write over the last bytes of Block 0.");
+    int old = mfCGetBlock(0, block0, params);
+    if (old == 0)
+        PrintAndLogEx(SUCCESS, "old block 0:  %s", sprint_hex(block0, sizeof(block0)));
+    else
+        PrintAndLogEx(FAILED, "couldn't get old data. Will write over the last bytes of Block 0.");
 
-	// fill in the new values
-	// UID
-	memcpy(block0, uid, 4);
-	// Mifare UID BCC
-	block0[4] = block0[0] ^ block0[1] ^ block0[2] ^ block0[3];
-	// mifare classic SAK(byte 5) and ATQA(byte 6 and 7, reversed)
-	if ( sak != NULL )
-		block0[5] = sak[0];
+    // fill in the new values
+    // UID
+    memcpy(block0, uid, 4);
+    // Mifare UID BCC
+    block0[4] = block0[0] ^ block0[1] ^ block0[2] ^ block0[3];
+    // mifare classic SAK(byte 5) and ATQA(byte 6 and 7, reversed)
+    if ( sak != NULL )
+        block0[5] = sak[0];
 
-	if ( atqa != NULL ) {
-		block0[6] = atqa[1];
-		block0[7] = atqa[0];
-	}
-	PrintAndLogEx(SUCCESS, "new block 0:  %s", sprint_hex(block0,16));
+    if ( atqa != NULL ) {
+        block0[6] = atqa[1];
+        block0[7] = atqa[0];
+    }
+    PrintAndLogEx(SUCCESS, "new block 0:  %s", sprint_hex(block0,16));
 
-	if ( wipecard )		 params |= MAGIC_WIPE;
-	if ( oldUID == NULL) params |= MAGIC_UID;
+    if ( wipecard )      params |= MAGIC_WIPE;
+    if ( oldUID == NULL) params |= MAGIC_UID;
 
-	return mfCSetBlock(0, block0, oldUID, params);
+    return mfCSetBlock(0, block0, oldUID, params);
 }
 
 int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, uint8_t params) {
 
-	uint8_t isOK = 0;
-	UsbCommand c = {CMD_MIFARE_CSETBLOCK, {params, blockNo, 0}};
-	memcpy(c.d.asBytes, data, 16);
-	clearCommandBuffer();
-	SendCommand(&c);
-	UsbCommand resp;
-	if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-		isOK  = resp.arg[0] & 0xff;
-		if (uid != NULL)
-			memcpy(uid, resp.d.asBytes, 4);
-		if (!isOK)
-			return 2;
-	} else {
-		PrintAndLogEx(WARNING, "command execute timeout");
-		return 1;
-	}
-	return 0;
+    uint8_t isOK = 0;
+    UsbCommand c = {CMD_MIFARE_CSETBLOCK, {params, blockNo, 0}};
+    memcpy(c.d.asBytes, data, 16);
+    clearCommandBuffer();
+    SendCommand(&c);
+    UsbCommand resp;
+    if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
+        isOK  = resp.arg[0] & 0xff;
+        if (uid != NULL)
+            memcpy(uid, resp.d.asBytes, 4);
+        if (!isOK)
+            return 2;
+    } else {
+        PrintAndLogEx(WARNING, "command execute timeout");
+        return 1;
+    }
+    return 0;
 }
 
 int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params) {
-	uint8_t isOK = 0;
-	UsbCommand c = {CMD_MIFARE_CGETBLOCK, {params, blockNo, 0}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	UsbCommand resp;
-	if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-		isOK  = resp.arg[0] & 0xff;
-		if (!isOK)
-			return 2;
-		memcpy(data, resp.d.asBytes, 16);
-	} else {
-		PrintAndLogEx(WARNING, "command execute timeout");
-		return 1;
-	}
-	return 0;
+    uint8_t isOK = 0;
+    UsbCommand c = {CMD_MIFARE_CGETBLOCK, {params, blockNo, 0}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    UsbCommand resp;
+    if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
+        isOK  = resp.arg[0] & 0xff;
+        if (!isOK)
+            return 2;
+        memcpy(data, resp.d.asBytes, 16);
+    } else {
+        PrintAndLogEx(WARNING, "command execute timeout");
+        return 1;
+    }
+    return 0;
 }
 
 // SNIFFER
@@ -563,356 +563,356 @@ uint32_t ar_enc = 0;  // encrypted reader response
 uint32_t at_enc = 0;  // encrypted tag response
 
 int isTraceCardEmpty(void) {
-	return ((traceCard[0] == 0) && (traceCard[1] == 0) && (traceCard[2] == 0) && (traceCard[3] == 0));
+    return ((traceCard[0] == 0) && (traceCard[1] == 0) && (traceCard[2] == 0) && (traceCard[3] == 0));
 }
 
 int isBlockEmpty(int blockN) {
-	for (int i = 0; i < 16; i++)
-		if (traceCard[blockN * 16 + i] != 0) return 0;
+    for (int i = 0; i < 16; i++)
+        if (traceCard[blockN * 16 + i] != 0) return 0;
 
-	return 1;
+    return 1;
 }
 
 int isBlockTrailer(int blockN) {
-	return ((blockN & 0x03) == 0x03);
+    return ((blockN & 0x03) == 0x03);
 }
 
 int loadTraceCard(uint8_t *tuid, uint8_t uidlen) {
-	FILE * f;
-	char buf[64] = {0x00};
-	uint8_t buf8[64] = {0x00};
-	int i, blockNum;
-	uint32_t tmp;
+    FILE * f;
+    char buf[64] = {0x00};
+    uint8_t buf8[64] = {0x00};
+    int i, blockNum;
+    uint32_t tmp;
 
-	if (!isTraceCardEmpty())
-		saveTraceCard();
+    if (!isTraceCardEmpty())
+        saveTraceCard();
 
-	memset(traceCard, 0x00, 4096);
-	memcpy(traceCard, tuid, uidlen);
+    memset(traceCard, 0x00, 4096);
+    memcpy(traceCard, tuid, uidlen);
 
-	FillFileNameByUID(traceFileName, tuid, ".eml", uidlen);
+    FillFileNameByUID(traceFileName, tuid, ".eml", uidlen);
 
-	f = fopen(traceFileName, "r");
-	if (!f) return 1;
+    f = fopen(traceFileName, "r");
+    if (!f) return 1;
 
-	blockNum = 0;
+    blockNum = 0;
 
-	while (!feof(f)){
+    while (!feof(f)){
 
-		memset(buf, 0, sizeof(buf));
-		if (fgets(buf, sizeof(buf), f) == NULL) {
-			PrintAndLogEx(FAILED, "No trace file found or reading error.");
-			if (f) {
-				fclose(f);
-			}
-			return 2;
-		}
+        memset(buf, 0, sizeof(buf));
+        if (fgets(buf, sizeof(buf), f) == NULL) {
+            PrintAndLogEx(FAILED, "No trace file found or reading error.");
+            if (f) {
+                fclose(f);
+            }
+            return 2;
+        }
 
-		if (strlen(buf) < 32){
-			if (feof(f)) break;
-			PrintAndLogEx(FAILED, "File content error. Block data must include 32 HEX symbols");
-			if (f) {
-				fclose(f);
-			}
-			return 2;
-		}
-		for (i = 0; i < 32; i += 2) {
-			sscanf(&buf[i], "%02X", &tmp);
-			buf8[i / 2] = tmp & 0xFF;
-		}
+        if (strlen(buf) < 32){
+            if (feof(f)) break;
+            PrintAndLogEx(FAILED, "File content error. Block data must include 32 HEX symbols");
+            if (f) {
+                fclose(f);
+            }
+            return 2;
+        }
+        for (i = 0; i < 32; i += 2) {
+            sscanf(&buf[i], "%02X", &tmp);
+            buf8[i / 2] = tmp & 0xFF;
+        }
 
-		memcpy(traceCard + blockNum * 16, buf8, 16);
+        memcpy(traceCard + blockNum * 16, buf8, 16);
 
-		blockNum++;
-	}
-	if (f) {
-		fclose(f);
-	}
-	return 0;
+        blockNum++;
+    }
+    if (f) {
+        fclose(f);
+    }
+    return 0;
 }
 
 int saveTraceCard(void) {
 
-	if ((!strlen(traceFileName)) || (isTraceCardEmpty())) return 0;
+    if ((!strlen(traceFileName)) || (isTraceCardEmpty())) return 0;
 
-	FILE * f;
-	f = fopen(traceFileName, "w+");
-	if ( !f ) return 1;
+    FILE * f;
+    f = fopen(traceFileName, "w+");
+    if ( !f ) return 1;
 
-	// given 4096 tracecard size,  these loop will only match a 1024, 1kb card memory
-	// 4086/16 == 256blocks.
-	for (uint16_t i = 0; i < 256; i++) {  // blocks
-		for (uint8_t j = 0; j < 16; j++)  // bytes
-			fprintf(f, "%02X", *(traceCard + i * 16 + j));
+    // given 4096 tracecard size,  these loop will only match a 1024, 1kb card memory
+    // 4086/16 == 256blocks.
+    for (uint16_t i = 0; i < 256; i++) {  // blocks
+        for (uint8_t j = 0; j < 16; j++)  // bytes
+            fprintf(f, "%02X", *(traceCard + i * 16 + j));
 
-		// no extra line in the end
-		if ( i < 255 )
-			fprintf(f, "\n");
-	}
-	fflush(f);
-	fclose(f);
-	return 0;
+        // no extra line in the end
+        if ( i < 255 )
+            fprintf(f, "\n");
+    }
+    fflush(f);
+    fclose(f);
+    return 0;
 }
 //
 int mfTraceInit(uint8_t *tuid, uint8_t uidlen, uint8_t *atqa, uint8_t sak, bool wantSaveToEmlFile) {
 
-	if (traceCrypto1)
-		crypto1_destroy(traceCrypto1);
+    if (traceCrypto1)
+        crypto1_destroy(traceCrypto1);
 
-	traceCrypto1 = NULL;
+    traceCrypto1 = NULL;
 
-	if (wantSaveToEmlFile)
-		loadTraceCard(tuid, uidlen);
+    if (wantSaveToEmlFile)
+        loadTraceCard(tuid, uidlen);
 
-	traceCard[4] = traceCard[0] ^ traceCard[1] ^ traceCard[2] ^ traceCard[3];
-	traceCard[5] = sak;
-	memcpy(&traceCard[6], atqa, 2);
-	traceCurBlock = 0;
-	cuid = bytes_to_num(tuid + (uidlen-4), 4);
-	traceState = TRACE_IDLE;
-	return 0;
+    traceCard[4] = traceCard[0] ^ traceCard[1] ^ traceCard[2] ^ traceCard[3];
+    traceCard[5] = sak;
+    memcpy(&traceCard[6], atqa, 2);
+    traceCurBlock = 0;
+    cuid = bytes_to_num(tuid + (uidlen-4), 4);
+    traceState = TRACE_IDLE;
+    return 0;
 }
 
 void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len, bool isEncrypted){
-	uint8_t	bt = 0;
-	int i;
+    uint8_t bt = 0;
+    int i;
 
-	if (len != 1) {
-		for (i = 0; i < len; i++)
-			data[i] = crypto1_byte(pcs, 0x00, isEncrypted) ^ data[i];
-	} else {
-		bt = 0;
-		bt |= (crypto1_bit(pcs, 0, isEncrypted) ^ BIT(data[0], 0)) << 0;
-		bt |= (crypto1_bit(pcs, 0, isEncrypted) ^ BIT(data[0], 1)) << 1;
-		bt |= (crypto1_bit(pcs, 0, isEncrypted) ^ BIT(data[0], 2)) << 2;
-		bt |= (crypto1_bit(pcs, 0, isEncrypted) ^ BIT(data[0], 3)) << 3;
-		data[0] = bt;
-	}
+    if (len != 1) {
+        for (i = 0; i < len; i++)
+            data[i] = crypto1_byte(pcs, 0x00, isEncrypted) ^ data[i];
+    } else {
+        bt = 0;
+        bt |= (crypto1_bit(pcs, 0, isEncrypted) ^ BIT(data[0], 0)) << 0;
+        bt |= (crypto1_bit(pcs, 0, isEncrypted) ^ BIT(data[0], 1)) << 1;
+        bt |= (crypto1_bit(pcs, 0, isEncrypted) ^ BIT(data[0], 2)) << 2;
+        bt |= (crypto1_bit(pcs, 0, isEncrypted) ^ BIT(data[0], 3)) << 3;
+        data[0] = bt;
+    }
 }
 
 int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
 
-	if (traceState == TRACE_ERROR)
-		return 1;
+    if (traceState == TRACE_ERROR)
+        return 1;
 
-	if (len > 255) {
-		traceState = TRACE_ERROR;
-		return 1;
-	}
+    if (len > 255) {
+        traceState = TRACE_ERROR;
+        return 1;
+    }
 
-	uint8_t data[255];
-	memset(data, 0x00, sizeof(data));
+    uint8_t data[255];
+    memset(data, 0x00, sizeof(data));
 
-	memcpy(data, data_src, len);
+    memcpy(data, data_src, len);
 
-	if ((traceCrypto1) && ((traceState == TRACE_IDLE) || (traceState > TRACE_AUTH_OK))) {
-		mf_crypto1_decrypt(traceCrypto1, data, len, 0);
-		PrintAndLogEx(NORMAL, "DEC| %s", sprint_hex(data, len));
-		AddLogHex(logHexFileName, "DEC| ", data, len);
-	}
+    if ((traceCrypto1) && ((traceState == TRACE_IDLE) || (traceState > TRACE_AUTH_OK))) {
+        mf_crypto1_decrypt(traceCrypto1, data, len, 0);
+        PrintAndLogEx(NORMAL, "DEC| %s", sprint_hex(data, len));
+        AddLogHex(logHexFileName, "DEC| ", data, len);
+    }
 
-	switch (traceState) {
-	case TRACE_IDLE:
-		// check packet crc16!
-		if ((len >= 4) && (!check_crc(CRC_14443_A, data, len))) {
-			PrintAndLogEx(NORMAL, "DEC| CRC ERROR!!!");
-			AddLogLine(logHexFileName, "DEC| ", "CRC ERROR!!!");
-			traceState = TRACE_ERROR;  // do not decrypt the next commands
-			return 1;
-		}
+    switch (traceState) {
+    case TRACE_IDLE:
+        // check packet crc16!
+        if ((len >= 4) && (!check_crc(CRC_14443_A, data, len))) {
+            PrintAndLogEx(NORMAL, "DEC| CRC ERROR!!!");
+            AddLogLine(logHexFileName, "DEC| ", "CRC ERROR!!!");
+            traceState = TRACE_ERROR;  // do not decrypt the next commands
+            return 1;
+        }
 
-		// AUTHENTICATION
-		if ((len == 4) && ((data[0] == MIFARE_AUTH_KEYA) || (data[0] == MIFARE_AUTH_KEYB))) {
-			traceState = TRACE_AUTH1;
-			traceCurBlock = data[1];
-			traceCurKey = data[0] == 60 ? 1:0;
-			return 0;
-		}
+        // AUTHENTICATION
+        if ((len == 4) && ((data[0] == MIFARE_AUTH_KEYA) || (data[0] == MIFARE_AUTH_KEYB))) {
+            traceState = TRACE_AUTH1;
+            traceCurBlock = data[1];
+            traceCurKey = data[0] == 60 ? 1:0;
+            return 0;
+        }
 
-		// READ
-		if ((len == 4) && ((data[0] == ISO14443A_CMD_READBLOCK))) {
-			traceState = TRACE_READ_DATA;
-			traceCurBlock = data[1];
-			return 0;
-		}
+        // READ
+        if ((len == 4) && ((data[0] == ISO14443A_CMD_READBLOCK))) {
+            traceState = TRACE_READ_DATA;
+            traceCurBlock = data[1];
+            return 0;
+        }
 
-		// WRITE
-		if ((len == 4) && ((data[0] == ISO14443A_CMD_WRITEBLOCK))) {
-			traceState = TRACE_WRITE_OK;
-			traceCurBlock = data[1];
-			return 0;
-		}
+        // WRITE
+        if ((len == 4) && ((data[0] == ISO14443A_CMD_WRITEBLOCK))) {
+            traceState = TRACE_WRITE_OK;
+            traceCurBlock = data[1];
+            return 0;
+        }
 
-		// HALT
-		if ((len == 4) && ((data[0] == ISO14443A_CMD_HALT) && (data[1] == 0x00))) {
-			traceState = TRACE_ERROR;  // do not decrypt the next commands
-			return 0;
-		}
-		return 0;
+        // HALT
+        if ((len == 4) && ((data[0] == ISO14443A_CMD_HALT) && (data[1] == 0x00))) {
+            traceState = TRACE_ERROR;  // do not decrypt the next commands
+            return 0;
+        }
+        return 0;
 
-	case TRACE_READ_DATA:
-		if (len == 18) {
-			traceState = TRACE_IDLE;
+    case TRACE_READ_DATA:
+        if (len == 18) {
+            traceState = TRACE_IDLE;
 
-			if (isBlockTrailer(traceCurBlock)) {
-				memcpy(traceCard + traceCurBlock * 16 + 6, data + 6, 4);
-			} else {
-				memcpy(traceCard + traceCurBlock * 16, data, 16);
-			}
-			if (wantSaveToEmlFile) saveTraceCard();
-			return 0;
-		} else {
-			traceState = TRACE_ERROR;
-			return 1;
-		}
-		break;
-	case TRACE_WRITE_OK:
-		if ((len == 1) && (data[0] == 0x0a)) {
-			traceState = TRACE_WRITE_DATA;
-			return 0;
-		} else {
-			traceState = TRACE_ERROR;
-			return 1;
-		}
-		break;
-	case TRACE_WRITE_DATA:
-		if (len == 18) {
-			traceState = TRACE_IDLE;
-			memcpy(traceCard + traceCurBlock * 16, data, 16);
-			if (wantSaveToEmlFile) saveTraceCard();
-			return 0;
-		} else {
-			traceState = TRACE_ERROR;
-			return 1;
-		}
-		break;
-	case TRACE_AUTH1:
-		if (len == 4) {
-			traceState = TRACE_AUTH2;
-			nt = bytes_to_num(data, 4);
-			return 0;
-		} else {
-			traceState = TRACE_ERROR;
-			return 1;
-		}
-		break;
-	case TRACE_AUTH2:
-		if (len == 8) {
-			traceState = TRACE_AUTH_OK;
-			nr_enc = bytes_to_num(data, 4);
-			ar_enc = bytes_to_num(data + 4, 4);
-			return 0;
-		} else {
-			traceState = TRACE_ERROR;
-			return 1;
-		}
-		break;
-	case TRACE_AUTH_OK:
-		if (len == 4) {
-			traceState = TRACE_IDLE;
-			at_enc = bytes_to_num(data, 4);
+            if (isBlockTrailer(traceCurBlock)) {
+                memcpy(traceCard + traceCurBlock * 16 + 6, data + 6, 4);
+            } else {
+                memcpy(traceCard + traceCurBlock * 16, data, 16);
+            }
+            if (wantSaveToEmlFile) saveTraceCard();
+            return 0;
+        } else {
+            traceState = TRACE_ERROR;
+            return 1;
+        }
+        break;
+    case TRACE_WRITE_OK:
+        if ((len == 1) && (data[0] == 0x0a)) {
+            traceState = TRACE_WRITE_DATA;
+            return 0;
+        } else {
+            traceState = TRACE_ERROR;
+            return 1;
+        }
+        break;
+    case TRACE_WRITE_DATA:
+        if (len == 18) {
+            traceState = TRACE_IDLE;
+            memcpy(traceCard + traceCurBlock * 16, data, 16);
+            if (wantSaveToEmlFile) saveTraceCard();
+            return 0;
+        } else {
+            traceState = TRACE_ERROR;
+            return 1;
+        }
+        break;
+    case TRACE_AUTH1:
+        if (len == 4) {
+            traceState = TRACE_AUTH2;
+            nt = bytes_to_num(data, 4);
+            return 0;
+        } else {
+            traceState = TRACE_ERROR;
+            return 1;
+        }
+        break;
+    case TRACE_AUTH2:
+        if (len == 8) {
+            traceState = TRACE_AUTH_OK;
+            nr_enc = bytes_to_num(data, 4);
+            ar_enc = bytes_to_num(data + 4, 4);
+            return 0;
+        } else {
+            traceState = TRACE_ERROR;
+            return 1;
+        }
+        break;
+    case TRACE_AUTH_OK:
+        if (len == 4) {
+            traceState = TRACE_IDLE;
+            at_enc = bytes_to_num(data, 4);
 
-			//  mfkey64 recover key.
-			ks2 = ar_enc ^ prng_successor(nt, 64);
-			ks3 = at_enc ^ prng_successor(nt, 96);
-			revstate = lfsr_recovery64(ks2, ks3);
-			lfsr_rollback_word(revstate, 0, 0);
-			lfsr_rollback_word(revstate, 0, 0);
-			lfsr_rollback_word(revstate, nr_enc, 1);
-			lfsr_rollback_word(revstate, cuid ^ nt, 0);
-			crypto1_get_lfsr(revstate, &key);
-			PrintAndLogEx(SUCCESS, "found Key: [%012" PRIx64 "]", key);
+            //  mfkey64 recover key.
+            ks2 = ar_enc ^ prng_successor(nt, 64);
+            ks3 = at_enc ^ prng_successor(nt, 96);
+            revstate = lfsr_recovery64(ks2, ks3);
+            lfsr_rollback_word(revstate, 0, 0);
+            lfsr_rollback_word(revstate, 0, 0);
+            lfsr_rollback_word(revstate, nr_enc, 1);
+            lfsr_rollback_word(revstate, cuid ^ nt, 0);
+            crypto1_get_lfsr(revstate, &key);
+            PrintAndLogEx(SUCCESS, "found Key: [%012" PRIx64 "]", key);
 
-			//if ( tryMfk64(cuid, nt, nr_enc, ar_enc, at_enc, &key) )
-			AddLogUint64(logHexFileName, "Found Key: ", key);
+            //if ( tryMfk64(cuid, nt, nr_enc, ar_enc, at_enc, &key) )
+            AddLogUint64(logHexFileName, "Found Key: ", key);
 
-			int blockShift = ((traceCurBlock & 0xFC) + 3) * 16;
-			if (isBlockEmpty((traceCurBlock & 0xFC) + 3))
-				memcpy(traceCard + blockShift + 6, trailerAccessBytes, 4);
+            int blockShift = ((traceCurBlock & 0xFC) + 3) * 16;
+            if (isBlockEmpty((traceCurBlock & 0xFC) + 3))
+                memcpy(traceCard + blockShift + 6, trailerAccessBytes, 4);
 
-			// keytype A/B
-			if (traceCurKey)
-				num_to_bytes(key, 6, traceCard + blockShift + 10);
-			else
-				num_to_bytes(key, 6, traceCard + blockShift);
+            // keytype A/B
+            if (traceCurKey)
+                num_to_bytes(key, 6, traceCard + blockShift + 10);
+            else
+                num_to_bytes(key, 6, traceCard + blockShift);
 
-			if (wantSaveToEmlFile)
-				saveTraceCard();
+            if (wantSaveToEmlFile)
+                saveTraceCard();
 
-			if (traceCrypto1)
-				crypto1_destroy(traceCrypto1);
+            if (traceCrypto1)
+                crypto1_destroy(traceCrypto1);
 
-			// set cryptosystem state
-			traceCrypto1 = lfsr_recovery64(ks2, ks3);
+            // set cryptosystem state
+            traceCrypto1 = lfsr_recovery64(ks2, ks3);
 
-		} else {
-			PrintAndLogEx(NORMAL, "[!] nested key recovery not implemented!\n");
-			at_enc = bytes_to_num(data, 4);
-			crypto1_destroy(traceCrypto1);
-			traceState = TRACE_ERROR;
-		}
-		break;
-	default:
-		traceState = TRACE_ERROR;
-		return 1;
-	}
-	return 0;
+        } else {
+            PrintAndLogEx(NORMAL, "[!] nested key recovery not implemented!\n");
+            at_enc = bytes_to_num(data, 4);
+            crypto1_destroy(traceCrypto1);
+            traceState = TRACE_ERROR;
+        }
+        break;
+    default:
+        traceState = TRACE_ERROR;
+        return 1;
+    }
+    return 0;
 }
 
 int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t *data, int len){
-	PrintAndLogEx(SUCCESS, "\nencrypted data: [%s]", sprint_hex(data, len) );
-	struct Crypto1State *s;
-	ks2 = ar_enc ^ prng_successor(nt, 64);
-	ks3 = at_enc ^ prng_successor(nt, 96);
-	s = lfsr_recovery64(ks2, ks3);
-	mf_crypto1_decrypt(s, data, len, false);
-	PrintAndLogEx(SUCCESS, "decrypted data: [%s]", sprint_hex(data, len) );
-	crypto1_destroy(s);
-	return 0;
+    PrintAndLogEx(SUCCESS, "\nencrypted data: [%s]", sprint_hex(data, len) );
+    struct Crypto1State *s;
+    ks2 = ar_enc ^ prng_successor(nt, 64);
+    ks3 = at_enc ^ prng_successor(nt, 96);
+    s = lfsr_recovery64(ks2, ks3);
+    mf_crypto1_decrypt(s, data, len, false);
+    PrintAndLogEx(SUCCESS, "decrypted data: [%s]", sprint_hex(data, len) );
+    crypto1_destroy(s);
+    return 0;
 }
 
 /* Detect Tag Prng,
 * function performs a partial AUTH,  where it tries to authenticate against block0, key A, but only collects tag nonce.
 * the tag nonce is check to see if it has a predictable PRNG.
 * @returns
-*	TRUE if tag uses WEAK prng (ie Now the NACK bug also needs to be present for Darkside attack)
+*   TRUE if tag uses WEAK prng (ie Now the NACK bug also needs to be present for Darkside attack)
 *   FALSE is tag uses HARDEND prng (ie hardnested attack possible, with known key)
 */
 int detect_classic_prng(void){
 
-	UsbCommand resp, respA;
-	uint8_t cmd[] = {MIFARE_AUTH_KEYA, 0x00};
-	uint32_t flags = ISO14A_CONNECT | ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_RATS;
+    UsbCommand resp, respA;
+    uint8_t cmd[] = {MIFARE_AUTH_KEYA, 0x00};
+    uint32_t flags = ISO14A_CONNECT | ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_RATS;
 
-	UsbCommand c = {CMD_READER_ISO_14443a, {flags, sizeof(cmd), 0}};
-	memcpy(c.d.asBytes, cmd, sizeof(cmd));
+    UsbCommand c = {CMD_READER_ISO_14443a, {flags, sizeof(cmd), 0}};
+    memcpy(c.d.asBytes, cmd, sizeof(cmd));
 
-	clearCommandBuffer();
-	SendCommand(&c);
+    clearCommandBuffer();
+    SendCommand(&c);
 
-	if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
         PrintAndLogEx(WARNING, "PRNG UID: Reply timeout.");
-		return -1;
-	}
+        return -1;
+    }
 
-	// if select tag failed.
-	if ( resp.arg[0] == 0 ) {
-		PrintAndLogEx(WARNING, "error:  selecting tag failed,  can't detect prng\n");
-		return -2;
-	}
-	if (!WaitForResponseTimeout(CMD_ACK, &respA, 2500)) {
+    // if select tag failed.
+    if ( resp.arg[0] == 0 ) {
+        PrintAndLogEx(WARNING, "error:  selecting tag failed,  can't detect prng\n");
+        return -2;
+    }
+    if (!WaitForResponseTimeout(CMD_ACK, &respA, 2500)) {
         PrintAndLogEx(WARNING, "PRNG data: Reply timeout.");
-		return -3;
-	}
+        return -3;
+    }
 
-	// check respA
-	if (respA.arg[0] != 4) {
-		PrintAndLogEx(WARNING, "PRNG data error: Wrong length: %d", respA.arg[0]);
-		return -4;
-	}
+    // check respA
+    if (respA.arg[0] != 4) {
+        PrintAndLogEx(WARNING, "PRNG data error: Wrong length: %d", respA.arg[0]);
+        return -4;
+    }
 
-	uint32_t nonce = bytes_to_num(respA.d.asBytes, respA.arg[0]);
-	return validate_prng_nonce(nonce);
+    uint32_t nonce = bytes_to_num(respA.d.asBytes, respA.arg[0]);
+    return validate_prng_nonce(nonce);
 }
 /* Detect Mifare Classic NACK bug
 
@@ -924,92 +924,92 @@ returns:
 */
 int detect_classic_nackbug(bool verbose){
 
-	UsbCommand c = {CMD_MIFARE_NACK_DETECT, {0, 0, 0}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	UsbCommand resp;
+    UsbCommand c = {CMD_MIFARE_NACK_DETECT, {0, 0, 0}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    UsbCommand resp;
 
-	if ( verbose )
-		PrintAndLogEx(SUCCESS, "press pm3-button on the proxmark3 device to abort both proxmark3 and client.\n");
+    if ( verbose )
+        PrintAndLogEx(SUCCESS, "press pm3-button on the proxmark3 device to abort both proxmark3 and client.\n");
 
-	// for nice animation
-	bool term = !isatty(STDIN_FILENO);
+    // for nice animation
+    bool term = !isatty(STDIN_FILENO);
 #if defined(__linux__) || (__APPLE__)
-	char star[] = {'-', '\\', '|', '/'};
-	uint8_t staridx = 0;
+    char star[] = {'-', '\\', '|', '/'};
+    uint8_t staridx = 0;
 #endif
 
-	while (true) {
+    while (true) {
 
-		if (term) {
-			printf(".");
-		} else {
-			printf(
-			#if defined(__linux__) || (__APPLE__)
-			"\e[32m\e[s%c\e[u\e[0m", star[ (staridx++ % 4) ]
-			#else
-			"."
-			#endif
-			);
-		}
-		fflush(stdout);
-		if (ukbhit()) {
-			int gc = getchar(); (void)gc;
-			return -1;
-			break;
-		}
+        if (term) {
+            printf(".");
+        } else {
+            printf(
+            #if defined(__linux__) || (__APPLE__)
+            "\e[32m\e[s%c\e[u\e[0m", star[ (staridx++ % 4) ]
+            #else
+            "."
+            #endif
+            );
+        }
+        fflush(stdout);
+        if (ukbhit()) {
+            int gc = getchar(); (void)gc;
+            return -1;
+            break;
+        }
 
-		if (WaitForResponseTimeout(CMD_ACK, &resp, 500)) {
-			int32_t ok = resp.arg[0];
-			uint32_t nacks = resp.arg[1];
-			uint32_t auths = resp.arg[2];
-			PrintAndLogEx(NORMAL, "");
+        if (WaitForResponseTimeout(CMD_ACK, &resp, 500)) {
+            int32_t ok = resp.arg[0];
+            uint32_t nacks = resp.arg[1];
+            uint32_t auths = resp.arg[2];
+            PrintAndLogEx(NORMAL, "");
 
-			if ( verbose ) {
-				PrintAndLogEx(SUCCESS, "num of auth requests  : %u", auths);
-				PrintAndLogEx(SUCCESS, "num of received NACK  : %u", nacks);
-			}
-			switch( ok ) {
-				case 99 : PrintAndLogEx(WARNING, "button pressed. Aborted."); return 0;
-				case 96 :
-				case 98 : {
-							if (verbose)
-								PrintAndLogEx(FAILED, "card random number generator is not predictable.");
-							PrintAndLogEx(WARNING, "detection failed");
-							return 2;
-						}
-				case 97 : {
-							if (verbose) {
-								PrintAndLogEx(FAILED, "card random number generator seems to be based on the well-known generating polynomial");
-								PrintAndLogEx(NORMAL, "[- ]with 16 effective bits only, but shows unexpected behavior, try again.");
-							}
-							return 2;
-						}
-				case  2 : PrintAndLogEx(SUCCESS, _GREEN_(always leak NACK detected)); return 3;
-				case  1 : PrintAndLogEx(SUCCESS, _GREEN_(NACK bug detected)); return 1;
-				case  0 : PrintAndLogEx(SUCCESS, "No NACK bug detected"); return 2;
-				default : PrintAndLogEx(WARNING, "errorcode from device [%i]", ok); return 0;
-			}
-			break;
-		}
-	}
-	return 0;
+            if ( verbose ) {
+                PrintAndLogEx(SUCCESS, "num of auth requests  : %u", auths);
+                PrintAndLogEx(SUCCESS, "num of received NACK  : %u", nacks);
+            }
+            switch( ok ) {
+                case 99 : PrintAndLogEx(WARNING, "button pressed. Aborted."); return 0;
+                case 96 :
+                case 98 : {
+                            if (verbose)
+                                PrintAndLogEx(FAILED, "card random number generator is not predictable.");
+                            PrintAndLogEx(WARNING, "detection failed");
+                            return 2;
+                        }
+                case 97 : {
+                            if (verbose) {
+                                PrintAndLogEx(FAILED, "card random number generator seems to be based on the well-known generating polynomial");
+                                PrintAndLogEx(NORMAL, "[- ]with 16 effective bits only, but shows unexpected behavior, try again.");
+                            }
+                            return 2;
+                        }
+                case  2 : PrintAndLogEx(SUCCESS, _GREEN_(always leak NACK detected)); return 3;
+                case  1 : PrintAndLogEx(SUCCESS, _GREEN_(NACK bug detected)); return 1;
+                case  0 : PrintAndLogEx(SUCCESS, "No NACK bug detected"); return 2;
+                default : PrintAndLogEx(WARNING, "errorcode from device [%i]", ok); return 0;
+            }
+            break;
+        }
+    }
+    return 0;
 }
 /* try to see if card responses to "chinese magic backdoor" commands. */
 void detect_classic_magic(void) {
 
-	uint8_t isGeneration = 0;
-	UsbCommand resp;
-	UsbCommand c = {CMD_MIFARE_CIDENT, {0, 0, 0}};
-	clearCommandBuffer();
-	SendCommand(&c);
-	if (WaitForResponseTimeout(CMD_ACK, &resp, 1500))
-		isGeneration = resp.arg[0] & 0xff;
+    uint8_t isGeneration = 0;
+    UsbCommand resp;
+    UsbCommand c = {CMD_MIFARE_CIDENT, {0, 0, 0}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    if (WaitForResponseTimeout(CMD_ACK, &resp, 1500))
+        isGeneration = resp.arg[0] & 0xff;
 
-	switch( isGeneration ){
-		case 1: PrintAndLogEx(SUCCESS, "Answers to magic commands (GEN 1a): " _GREEN_(YES)); break;
-		case 2: PrintAndLogEx(SUCCESS, "Answers to magic commands (GEN 1b): " _GREEN_(YES)); break;
-		//case 4: PrintAndLogEx(SUCCESS, "Answers to magic commands (GEN 2): "  _GREEN_(YES)); break;
-		default: PrintAndLogEx(INFO, "Answers to magic commands: " _YELLOW_(NO)); break;
-	}
+    switch( isGeneration ){
+        case 1: PrintAndLogEx(SUCCESS, "Answers to magic commands (GEN 1a): " _GREEN_(YES)); break;
+        case 2: PrintAndLogEx(SUCCESS, "Answers to magic commands (GEN 1b): " _GREEN_(YES)); break;
+        //case 4: PrintAndLogEx(SUCCESS, "Answers to magic commands (GEN 2): "  _GREEN_(YES)); break;
+        default: PrintAndLogEx(INFO, "Answers to magic commands: " _YELLOW_(NO)); break;
+    }
 }
\ No newline at end of file
diff --git a/client/mifare/mifarehost.h b/client/mifare/mifarehost.h
index e0f4eaadd..eb2042778 100644
--- a/client/mifare/mifarehost.h
+++ b/client/mifare/mifarehost.h
@@ -16,10 +16,10 @@
 #include <string.h>
 #include <pthread.h>
 
-#include "proxmark3.h"	// time_t
+#include "proxmark3.h"  // time_t
 #include "common.h"
-#include "util.h"		// FILE_PATH_SIZE
-#include "ui.h"			// PrintAndLog...
+#include "util.h"       // FILE_PATH_SIZE
+#include "ui.h"         // PrintAndLog...
 #include "crapto1/crapto1.h"
 #include "crc16.h"
 #include "protocols.h"
@@ -30,41 +30,41 @@
 #define MIFARE_SECTOR_RETRY     10
 
 // mifare tracer flags
-#define TRACE_IDLE		 		0x00
-#define TRACE_AUTH1		 		0x01
-#define TRACE_AUTH2		 		0x02
-#define TRACE_AUTH_OK	 		0x03
-#define TRACE_READ_DATA 		0x04
-#define TRACE_WRITE_OK			0x05
-#define TRACE_WRITE_DATA		0x06
-#define TRACE_ERROR		 		0xFF
+#define TRACE_IDLE              0x00
+#define TRACE_AUTH1             0x01
+#define TRACE_AUTH2             0x02
+#define TRACE_AUTH_OK           0x03
+#define TRACE_READ_DATA         0x04
+#define TRACE_WRITE_OK          0x05
+#define TRACE_WRITE_DATA        0x06
+#define TRACE_ERROR             0xFF
 
 typedef struct {
-		union {
-			struct Crypto1State *slhead;
-			uint64_t *keyhead;
-		} head;
-		union {
-			struct Crypto1State *sltail;
-			uint64_t *keytail;
-		} tail;
-		uint32_t len;
-		uint32_t uid;
-		uint32_t blockNo;
-		uint32_t keyType;
-		uint32_t nt;
-		uint32_t ks1;
+        union {
+            struct Crypto1State *slhead;
+            uint64_t *keyhead;
+        } head;
+        union {
+            struct Crypto1State *sltail;
+            uint64_t *keytail;
+        } tail;
+        uint32_t len;
+        uint32_t uid;
+        uint32_t blockNo;
+        uint32_t keyType;
+        uint32_t nt;
+        uint32_t ks1;
 } StateList_t;
 
 typedef struct {
-	uint64_t Key[2];
-	uint8_t foundKey[2];
+    uint64_t Key[2];
+    uint8_t foundKey[2];
 } sector_t;
 
 typedef struct {
-	uint8_t keyA[6];
-	uint8_t keyB[6];
-	//uint8_t foundKey[2];
+    uint8_t keyA[6];
+    uint8_t keyB[6];
+    //uint8_t foundKey[2];
 } icesector_t;
 
 extern char logHexFileName[FILE_PATH_SIZE];
@@ -73,7 +73,7 @@ extern int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key);
 extern int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t * ResultKeys, bool calibrate);
 extern int mfCheckKeys (uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t keycnt, uint8_t * keyBlock, uint64_t * key);
 extern int mfCheckKeys_fast( uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk,
-						uint8_t strategy, uint32_t size, uint8_t *keyBlock, sector_t *e_sector, bool use_flashmemory);
+                        uint8_t strategy, uint32_t size, uint8_t *keyBlock, sector_t *e_sector, bool use_flashmemory);
 extern int mfKeyBrute(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint64_t *resultkey);
 
 extern int mfReadSector(uint8_t sectorNo, uint8_t keyType, uint8_t *key, uint8_t *data);
diff --git a/client/mifare/ndef.c b/client/mifare/ndef.c
index e8edc19da..21b0bdda1 100644
--- a/client/mifare/ndef.c
+++ b/client/mifare/ndef.c
@@ -16,342 +16,342 @@
 #define STRBOOL(p) ((p) ? "+" : "-")
 
 static const char *TypeNameFormat_s[] = {
-	"Empty Record",
-	"Well Known Record",
-	"MIME Media Record",
-	"Absolute URI Record",
-	"External Record",
-	"Unknown Record",
-	"Unchanged Record",
-	"n/a"
+    "Empty Record",
+    "Well Known Record",
+    "MIME Media Record",
+    "Absolute URI Record",
+    "External Record",
+    "Unknown Record",
+    "Unchanged Record",
+    "n/a"
 };
 
 static const char *ndefSigType_s[] = {
-	"Not present",                   // No signature present
-	"RSASSA_PSS_SHA_1",              // PKCS_1
-	"RSASSA_PKCS1_v1_5_WITH_SHA_1",  // PKCS_1
-	"DSA",
-	"ECDSA",
-	"n/a"
+    "Not present",                   // No signature present
+    "RSASSA_PSS_SHA_1",              // PKCS_1
+    "RSASSA_PKCS1_v1_5_WITH_SHA_1",  // PKCS_1
+    "DSA",
+    "ECDSA",
+    "n/a"
 };
 
 static const char *ndefCertificateFormat_s[] = {
-	"X_509",
-	"X9_68",
-	"n/a"
+    "X_509",
+    "X9_68",
+    "n/a"
 };
 
 static const char *URI_s[] = {
-	"",                           // 0x00
-	"http://www.",                // 0x01
-	"https://www.",               // 0x02
-	"http://",                    // 0x03
-	"https://",                   // 0x04
-	"tel:",                       // 0x05
-	"mailto:",                    // 0x06
-	"ftp://anonymous:anonymous@", // 0x07
-	"ftp://ftp.",                 // 0x08
-	"ftps://",                    // 0x09
-	"sftp://",                    // 0x0A
-	"smb://",                     // 0x0B
-	"nfs://",                     // 0x0C
-	"ftp://",                     // 0x0D
-	"dav://",                     // 0x0E
-	"news:",                      // 0x0F
-	"telnet://",                  // 0x10
-	"imap:",                      // 0x11
-	"rtsp://",                    // 0x12
-	"urn:",                       // 0x13
-	"pop:",                       // 0x14
-	"sip:",                       // 0x15
-	"sips:",                      // 0x16
-	"tftp:",                      // 0x17
-	"btspp://",                   // 0x18
-	"btl2cap://",                 // 0x19
-	"btgoep://",                  // 0x1A
-	"tcpobex://",                 // 0x1B
-	"irdaobex://",                // 0x1C
-	"file://",                    // 0x1D
-	"urn:epc:id:",                // 0x1E
-	"urn:epc:tag:",               // 0x1F
-	"urn:epc:pat:",               // 0x20
-	"urn:epc:raw:",               // 0x21
-	"urn:epc:",                   // 0x22
-	"urn:nfc:"                    // 0x23
+    "",                           // 0x00
+    "http://www.",                // 0x01
+    "https://www.",               // 0x02
+    "http://",                    // 0x03
+    "https://",                   // 0x04
+    "tel:",                       // 0x05
+    "mailto:",                    // 0x06
+    "ftp://anonymous:anonymous@", // 0x07
+    "ftp://ftp.",                 // 0x08
+    "ftps://",                    // 0x09
+    "sftp://",                    // 0x0A
+    "smb://",                     // 0x0B
+    "nfs://",                     // 0x0C
+    "ftp://",                     // 0x0D
+    "dav://",                     // 0x0E
+    "news:",                      // 0x0F
+    "telnet://",                  // 0x10
+    "imap:",                      // 0x11
+    "rtsp://",                    // 0x12
+    "urn:",                       // 0x13
+    "pop:",                       // 0x14
+    "sip:",                       // 0x15
+    "sips:",                      // 0x16
+    "tftp:",                      // 0x17
+    "btspp://",                   // 0x18
+    "btl2cap://",                 // 0x19
+    "btgoep://",                  // 0x1A
+    "tcpobex://",                 // 0x1B
+    "irdaobex://",                // 0x1C
+    "file://",                    // 0x1D
+    "urn:epc:id:",                // 0x1E
+    "urn:epc:tag:",               // 0x1F
+    "urn:epc:pat:",               // 0x20
+    "urn:epc:raw:",               // 0x21
+    "urn:epc:",                   // 0x22
+    "urn:nfc:"                    // 0x23
 };
 
 uint16_t ndefTLVGetLength(uint8_t *data, size_t *indx) {
-	uint16_t len = 0;
-	if (data[0] == 0xff) {
-		len = (data[1] << 8) + data[2];
-		*indx += 3;
-	} else {
-		len = data[0];
-		*indx += 1;
-	}
+    uint16_t len = 0;
+    if (data[0] == 0xff) {
+        len = (data[1] << 8) + data[2];
+        *indx += 3;
+    } else {
+        len = data[0];
+        *indx += 1;
+    }
 
-	return len;
+    return len;
 }
 
 int ndefDecodeHeader(uint8_t *data, size_t datalen, NDEFHeader_t *header) {
-	header->Type = NULL;
-	header->Payload = NULL;
-	header->ID = NULL;
+    header->Type = NULL;
+    header->Payload = NULL;
+    header->ID = NULL;
 
-	header->MessageBegin	= data[0] & 0x80;
-	header->MessageEnd		= data[0] & 0x40;
-	header->ChunkFlag		= data[0] & 0x20;
-	header->ShortRecordBit	= data[0] & 0x10;
-	header->IDLenPresent	= data[0] & 0x08;
-	header->TypeNameFormat	= data[0] & 0x07;
-	header->len				= 1 + 1 + (header->ShortRecordBit ? 1 : 4) + (header->IDLenPresent ? 1 : 0); // header + typelen + payloadlen + idlen
-	if (header->len > datalen)
-		return 1;
+    header->MessageBegin    = data[0] & 0x80;
+    header->MessageEnd      = data[0] & 0x40;
+    header->ChunkFlag       = data[0] & 0x20;
+    header->ShortRecordBit  = data[0] & 0x10;
+    header->IDLenPresent    = data[0] & 0x08;
+    header->TypeNameFormat  = data[0] & 0x07;
+    header->len             = 1 + 1 + (header->ShortRecordBit ? 1 : 4) + (header->IDLenPresent ? 1 : 0); // header + typelen + payloadlen + idlen
+    if (header->len > datalen)
+        return 1;
 
-	header->TypeLen = data[1];
-	header->Type = data + header->len;
+    header->TypeLen = data[1];
+    header->Type = data + header->len;
 
-	header->PayloadLen = (header->ShortRecordBit ? (data[2]) : ((data[2] << 24) + (data[3] << 16) + (data[4] << 8) + data[5]));
+    header->PayloadLen = (header->ShortRecordBit ? (data[2]) : ((data[2] << 24) + (data[3] << 16) + (data[4] << 8) + data[5]));
 
-	if (header->IDLenPresent) {
-		header->IDLen = (header->ShortRecordBit ? (data[3]) : (data[6]));
-		header->Payload = header->Type + header->TypeLen;
-	} else {
-		header->IDLen = 0;
-	}
+    if (header->IDLenPresent) {
+        header->IDLen = (header->ShortRecordBit ? (data[3]) : (data[6]));
+        header->Payload = header->Type + header->TypeLen;
+    } else {
+        header->IDLen = 0;
+    }
 
-	header->Payload = header->Type + header->TypeLen + header->IDLen;
+    header->Payload = header->Type + header->TypeLen + header->IDLen;
 
-	header->RecLen = header->len + header->TypeLen + header->PayloadLen + header->IDLen;
+    header->RecLen = header->len + header->TypeLen + header->PayloadLen + header->IDLen;
 
-	if (header->RecLen > datalen)
-		return 3;
+    if (header->RecLen > datalen)
+        return 3;
 
-	return 0;
+    return 0;
 }
 
 int ndefPrintHeader(NDEFHeader_t *header) {
-	PrintAndLogEx(INFO, "Header:");
+    PrintAndLogEx(INFO, "Header:");
 
-	PrintAndLogEx(NORMAL, "\tMessage Begin:    %s", STRBOOL(header->MessageBegin));
-	PrintAndLogEx(NORMAL, "\tMessage End:      %s", STRBOOL(header->MessageEnd));
-	PrintAndLogEx(NORMAL, "\tChunk Flag:       %s", STRBOOL(header->ChunkFlag));
-	PrintAndLogEx(NORMAL, "\tShort Record Bit: %s", STRBOOL(header->ShortRecordBit));
-	PrintAndLogEx(NORMAL, "\tID Len Present:   %s", STRBOOL(header->IDLenPresent));
-	PrintAndLogEx(NORMAL, "\tType Name Format: [0x%02x] %s", header->TypeNameFormat, TypeNameFormat_s[header->TypeNameFormat]);
+    PrintAndLogEx(NORMAL, "\tMessage Begin:    %s", STRBOOL(header->MessageBegin));
+    PrintAndLogEx(NORMAL, "\tMessage End:      %s", STRBOOL(header->MessageEnd));
+    PrintAndLogEx(NORMAL, "\tChunk Flag:       %s", STRBOOL(header->ChunkFlag));
+    PrintAndLogEx(NORMAL, "\tShort Record Bit: %s", STRBOOL(header->ShortRecordBit));
+    PrintAndLogEx(NORMAL, "\tID Len Present:   %s", STRBOOL(header->IDLenPresent));
+    PrintAndLogEx(NORMAL, "\tType Name Format: [0x%02x] %s", header->TypeNameFormat, TypeNameFormat_s[header->TypeNameFormat]);
 
-	PrintAndLogEx(NORMAL, "\tHeader length    : %d", header->len);
-	PrintAndLogEx(NORMAL, "\tType length      : %d", header->TypeLen);
-	PrintAndLogEx(NORMAL, "\tPayload length   : %d", header->PayloadLen);
-	PrintAndLogEx(NORMAL, "\tID length        : %d", header->IDLen);
-	PrintAndLogEx(NORMAL, "\tRecord length    : %d", header->RecLen);
+    PrintAndLogEx(NORMAL, "\tHeader length    : %d", header->len);
+    PrintAndLogEx(NORMAL, "\tType length      : %d", header->TypeLen);
+    PrintAndLogEx(NORMAL, "\tPayload length   : %d", header->PayloadLen);
+    PrintAndLogEx(NORMAL, "\tID length        : %d", header->IDLen);
+    PrintAndLogEx(NORMAL, "\tRecord length    : %d", header->RecLen);
 
-	return 0;
+    return 0;
 }
 
 int ndefDecodeSig(uint8_t *sig, size_t siglen) {
-	size_t indx = 0;
-	PrintAndLogEx(NORMAL, "\tsignature version: 0x%02x", sig[0]);
-	if (sig[0] != 0x01) {
-		PrintAndLogEx(ERR, "signature version unknown.");
-		return 1;
-	}
-	indx++;
+    size_t indx = 0;
+    PrintAndLogEx(NORMAL, "\tsignature version: 0x%02x", sig[0]);
+    if (sig[0] != 0x01) {
+        PrintAndLogEx(ERR, "signature version unknown.");
+        return 1;
+    }
+    indx++;
 
-	uint8_t sigType = sig[indx] & 0x7f;
-	bool sigURI = sig[indx] & 0x80;
+    uint8_t sigType = sig[indx] & 0x7f;
+    bool sigURI = sig[indx] & 0x80;
 
-	PrintAndLogEx(NORMAL, "\tsignature type: %s", ((sigType < stNA) ? ndefSigType_s[sigType] : ndefSigType_s[stNA]));
-	PrintAndLogEx(NORMAL, "\tsignature uri: %s", (sigURI ? "present" : "not present"));
+    PrintAndLogEx(NORMAL, "\tsignature type: %s", ((sigType < stNA) ? ndefSigType_s[sigType] : ndefSigType_s[stNA]));
+    PrintAndLogEx(NORMAL, "\tsignature uri: %s", (sigURI ? "present" : "not present"));
 
-	size_t intsiglen = (sig[indx + 1] << 8) + sig[indx + 2];
-	// ecdsa 0x04
-	if (sigType == stECDSA) {
-		indx += 3;
-		PrintAndLogEx(NORMAL, "\tsignature [%d]: %s", intsiglen, sprint_hex_inrow(&sig[indx], intsiglen));
+    size_t intsiglen = (sig[indx + 1] << 8) + sig[indx + 2];
+    // ecdsa 0x04
+    if (sigType == stECDSA) {
+        indx += 3;
+        PrintAndLogEx(NORMAL, "\tsignature [%d]: %s", intsiglen, sprint_hex_inrow(&sig[indx], intsiglen));
 
-		uint8_t rval[300] = {0};
-		uint8_t sval[300] = {0};
-		int res = ecdsa_asn1_get_signature(&sig[indx], intsiglen, rval, sval);
-		if (!res) {
-			PrintAndLogEx(NORMAL ,"\t\tr: %s", sprint_hex(rval, 32));
-			PrintAndLogEx(NORMAL ,"\t\ts: %s", sprint_hex(sval, 32));
-		}
-	}
-	indx += intsiglen;
+        uint8_t rval[300] = {0};
+        uint8_t sval[300] = {0};
+        int res = ecdsa_asn1_get_signature(&sig[indx], intsiglen, rval, sval);
+        if (!res) {
+            PrintAndLogEx(NORMAL ,"\t\tr: %s", sprint_hex(rval, 32));
+            PrintAndLogEx(NORMAL ,"\t\ts: %s", sprint_hex(sval, 32));
+        }
+    }
+    indx += intsiglen;
 
-	if (sigURI) {
-		size_t intsigurilen = (sig[indx] << 8) + sig[indx + 1];
-		indx += 2;
-		PrintAndLogEx(NORMAL, "\tsignature uri [%d]: %.*s", intsigurilen, intsigurilen, &sig[indx]);
-		indx += intsigurilen;
-	}
+    if (sigURI) {
+        size_t intsigurilen = (sig[indx] << 8) + sig[indx + 1];
+        indx += 2;
+        PrintAndLogEx(NORMAL, "\tsignature uri [%d]: %.*s", intsigurilen, intsigurilen, &sig[indx]);
+        indx += intsigurilen;
+    }
 
-	uint8_t certFormat = (sig[indx] >> 4) & 0x07;
-	uint8_t certCount = sig[indx] & 0x0f;
-	bool certURI = sig[indx] & 0x80;
+    uint8_t certFormat = (sig[indx] >> 4) & 0x07;
+    uint8_t certCount = sig[indx] & 0x0f;
+    bool certURI = sig[indx] & 0x80;
 
-	PrintAndLogEx(NORMAL, "\tcertificate format: %s", ((certFormat < sfNA) ? ndefCertificateFormat_s[certFormat] : ndefCertificateFormat_s[sfNA]));
-	PrintAndLogEx(NORMAL, "\tcertificates count: %d", certCount);
+    PrintAndLogEx(NORMAL, "\tcertificate format: %s", ((certFormat < sfNA) ? ndefCertificateFormat_s[certFormat] : ndefCertificateFormat_s[sfNA]));
+    PrintAndLogEx(NORMAL, "\tcertificates count: %d", certCount);
 
-	// print certificates
-	indx++;
-	for (int i = 0; i < certCount; i++) {
-		size_t intcertlen = (sig[indx + 1] << 8) + sig[indx + 2];
-		indx += 2;
+    // print certificates
+    indx++;
+    for (int i = 0; i < certCount; i++) {
+        size_t intcertlen = (sig[indx + 1] << 8) + sig[indx + 2];
+        indx += 2;
 
-		PrintAndLogEx(NORMAL, "\tcertificate %d [%d]: %s", i + 1, intcertlen, sprint_hex_inrow(&sig[indx], intcertlen));
-		indx += intcertlen;
-	}
+        PrintAndLogEx(NORMAL, "\tcertificate %d [%d]: %s", i + 1, intcertlen, sprint_hex_inrow(&sig[indx], intcertlen));
+        indx += intcertlen;
+    }
 
-	// have certificate uri
-	if ((indx <= siglen) && certURI) {
-		size_t inturilen = (sig[indx] << 8) + sig[indx + 1];
-		indx += 2;
-		PrintAndLogEx(NORMAL, "\tcertificate uri [%d]: %.*s", inturilen, inturilen, &sig[indx]);
-		indx += inturilen;
-	}
+    // have certificate uri
+    if ((indx <= siglen) && certURI) {
+        size_t inturilen = (sig[indx] << 8) + sig[indx + 1];
+        indx += 2;
+        PrintAndLogEx(NORMAL, "\tcertificate uri [%d]: %.*s", inturilen, inturilen, &sig[indx]);
+        indx += inturilen;
+    }
 
-	return 0;
+    return 0;
 };
 
 int ndefDecodePayload(NDEFHeader_t *ndef) {
 
-	switch(ndef->TypeNameFormat) {
-	case tnfWellKnownRecord:
-		PrintAndLogEx(INFO, "Well Known Record");
-		PrintAndLogEx(NORMAL, "\ttype:    %.*s", ndef->TypeLen, ndef->Type);
+    switch(ndef->TypeNameFormat) {
+    case tnfWellKnownRecord:
+        PrintAndLogEx(INFO, "Well Known Record");
+        PrintAndLogEx(NORMAL, "\ttype:    %.*s", ndef->TypeLen, ndef->Type);
 
-		if (!strncmp((char *)ndef->Type, "T", ndef->TypeLen)) {
-			PrintAndLogEx(NORMAL, "\ttext   : %.*s", ndef->PayloadLen, ndef->Payload);
-		}
+        if (!strncmp((char *)ndef->Type, "T", ndef->TypeLen)) {
+            PrintAndLogEx(NORMAL, "\ttext   : %.*s", ndef->PayloadLen, ndef->Payload);
+        }
 
-		if (!strncmp((char *)ndef->Type, "U", ndef->TypeLen)) {
-			PrintAndLogEx(NORMAL, "\turi    : %s%.*s", (ndef->Payload[0] <= 0x23 ? URI_s[ndef->Payload[0]] : "[err]"), ndef->PayloadLen, &ndef->Payload[1]);
-		}
+        if (!strncmp((char *)ndef->Type, "U", ndef->TypeLen)) {
+            PrintAndLogEx(NORMAL, "\turi    : %s%.*s", (ndef->Payload[0] <= 0x23 ? URI_s[ndef->Payload[0]] : "[err]"), ndef->PayloadLen, &ndef->Payload[1]);
+        }
 
-		if (!strncmp((char *)ndef->Type, "Sig", ndef->TypeLen)) {
-			ndefDecodeSig(ndef->Payload, ndef->PayloadLen);
-		}
+        if (!strncmp((char *)ndef->Type, "Sig", ndef->TypeLen)) {
+            ndefDecodeSig(ndef->Payload, ndef->PayloadLen);
+        }
 
-		break;
-	case tnfAbsoluteURIRecord:
-		PrintAndLogEx(INFO, "Absolute URI Record");
-		PrintAndLogEx(NORMAL, "\ttype:    %.*s", ndef->TypeLen, ndef->Type);
-		PrintAndLogEx(NORMAL, "\tpayload: %.*s", ndef->PayloadLen, ndef->Payload);
-		break;
-	default:
-		break;
-	}
-	return 0;
+        break;
+    case tnfAbsoluteURIRecord:
+        PrintAndLogEx(INFO, "Absolute URI Record");
+        PrintAndLogEx(NORMAL, "\ttype:    %.*s", ndef->TypeLen, ndef->Type);
+        PrintAndLogEx(NORMAL, "\tpayload: %.*s", ndef->PayloadLen, ndef->Payload);
+        break;
+    default:
+        break;
+    }
+    return 0;
 }
 
 int ndefRecordDecodeAndPrint(uint8_t *ndefRecord, size_t ndefRecordLen) {
-	NDEFHeader_t NDEFHeader = {0};
-	int res = ndefDecodeHeader(ndefRecord, ndefRecordLen, &NDEFHeader);
-	if (res)
-		return res;
+    NDEFHeader_t NDEFHeader = {0};
+    int res = ndefDecodeHeader(ndefRecord, ndefRecordLen, &NDEFHeader);
+    if (res)
+        return res;
 
-	ndefPrintHeader(&NDEFHeader);
+    ndefPrintHeader(&NDEFHeader);
 
-	if (NDEFHeader.TypeLen) {
-		PrintAndLogEx(INFO, "Type data:");
-		dump_buffer(NDEFHeader.Type, NDEFHeader.TypeLen, stdout, 1);
-	}
-	if (NDEFHeader.IDLen) {
-		PrintAndLogEx(INFO, "ID data:");
-		dump_buffer(NDEFHeader.ID, NDEFHeader.IDLen, stdout, 1);
-	}
-	if (NDEFHeader.PayloadLen) {
-		PrintAndLogEx(INFO, "Payload data:");
-		dump_buffer(NDEFHeader.Payload, NDEFHeader.PayloadLen, stdout, 1);
-		if (NDEFHeader.TypeLen)
-			ndefDecodePayload(&NDEFHeader);
-	}
+    if (NDEFHeader.TypeLen) {
+        PrintAndLogEx(INFO, "Type data:");
+        dump_buffer(NDEFHeader.Type, NDEFHeader.TypeLen, stdout, 1);
+    }
+    if (NDEFHeader.IDLen) {
+        PrintAndLogEx(INFO, "ID data:");
+        dump_buffer(NDEFHeader.ID, NDEFHeader.IDLen, stdout, 1);
+    }
+    if (NDEFHeader.PayloadLen) {
+        PrintAndLogEx(INFO, "Payload data:");
+        dump_buffer(NDEFHeader.Payload, NDEFHeader.PayloadLen, stdout, 1);
+        if (NDEFHeader.TypeLen)
+            ndefDecodePayload(&NDEFHeader);
+    }
 
-	return 0;
+    return 0;
 }
 
 int ndefRecordsDecodeAndPrint(uint8_t *ndefRecord, size_t ndefRecordLen) {
-	bool firstRec = true;
-	size_t len = 0;
+    bool firstRec = true;
+    size_t len = 0;
 
-	while (len < ndefRecordLen) {
-		NDEFHeader_t NDEFHeader = {0};
-		int res = ndefDecodeHeader(&ndefRecord[len], ndefRecordLen - len, &NDEFHeader);
-		if (res)
-			return res;
+    while (len < ndefRecordLen) {
+        NDEFHeader_t NDEFHeader = {0};
+        int res = ndefDecodeHeader(&ndefRecord[len], ndefRecordLen - len, &NDEFHeader);
+        if (res)
+            return res;
 
-		if (firstRec) {
-			if (!NDEFHeader.MessageBegin) {
-				PrintAndLogEx(ERR, "NDEF first record have MessageBegin=false!");
-				return 1;
-			}
-			firstRec = false;
-		}
+        if (firstRec) {
+            if (!NDEFHeader.MessageBegin) {
+                PrintAndLogEx(ERR, "NDEF first record have MessageBegin=false!");
+                return 1;
+            }
+            firstRec = false;
+        }
 
-		if (NDEFHeader.MessageEnd && len + NDEFHeader.RecLen != ndefRecordLen) {
-			PrintAndLogEx(ERR, "NDEF records have wrong length. Must be %d, calculated %d", ndefRecordLen, len + NDEFHeader.RecLen);
-			return 1;
-		}
+        if (NDEFHeader.MessageEnd && len + NDEFHeader.RecLen != ndefRecordLen) {
+            PrintAndLogEx(ERR, "NDEF records have wrong length. Must be %d, calculated %d", ndefRecordLen, len + NDEFHeader.RecLen);
+            return 1;
+        }
 
-		ndefRecordDecodeAndPrint(&ndefRecord[len], NDEFHeader.RecLen);
+        ndefRecordDecodeAndPrint(&ndefRecord[len], NDEFHeader.RecLen);
 
-		len += NDEFHeader.RecLen;
+        len += NDEFHeader.RecLen;
 
-		if (NDEFHeader.MessageEnd)
-			break;
-	}
+        if (NDEFHeader.MessageEnd)
+            break;
+    }
 
-	return 0;
+    return 0;
 }
 
 int NDEFDecodeAndPrint(uint8_t *ndef, size_t ndefLen, bool verbose) {
 
-	size_t indx = 0;
+    size_t indx = 0;
 
-	PrintAndLogEx(INFO, "NDEF decoding:");
-	while (indx < ndefLen) {
-		switch (ndef[indx]) {
-			case 0x00: {
-				indx++;
-				uint16_t len = ndefTLVGetLength(&ndef[indx], &indx);
-				PrintAndLogEx(INFO, "-- NDEF NULL block.");
-				if (len)
-					PrintAndLogEx(WARNING, "NDEF NULL block size must be 0 instead of %d.", len);
-				indx += len;
-				break;
-			}
-			case 0x03: {
-				indx++;
-				uint16_t len = ndefTLVGetLength(&ndef[indx], &indx);
-				PrintAndLogEx(INFO, "-- NDEF message. len: %d", len);
+    PrintAndLogEx(INFO, "NDEF decoding:");
+    while (indx < ndefLen) {
+        switch (ndef[indx]) {
+            case 0x00: {
+                indx++;
+                uint16_t len = ndefTLVGetLength(&ndef[indx], &indx);
+                PrintAndLogEx(INFO, "-- NDEF NULL block.");
+                if (len)
+                    PrintAndLogEx(WARNING, "NDEF NULL block size must be 0 instead of %d.", len);
+                indx += len;
+                break;
+            }
+            case 0x03: {
+                indx++;
+                uint16_t len = ndefTLVGetLength(&ndef[indx], &indx);
+                PrintAndLogEx(INFO, "-- NDEF message. len: %d", len);
 
-				int res = ndefRecordsDecodeAndPrint(&ndef[indx], len);
-				if (res)
-					return res;
+                int res = ndefRecordsDecodeAndPrint(&ndef[indx], len);
+                if (res)
+                    return res;
 
-				indx += len;
-				break;
-			}
-			case 0xfd: {
-				indx++;
-				uint16_t len = ndefTLVGetLength(&ndef[indx], &indx);
-				PrintAndLogEx(INFO, "-- NDEF proprietary info. Skipped %d bytes.", len);
-				indx += len;
-				break;
-			}
-			case 0xfe: {
-				PrintAndLogEx(INFO, "-- NDEF Terminator. Done.");
-				return 0;
-				break;
-			}
-			default: {
-				PrintAndLogEx(ERR, "unknown tag 0x%02x", ndef[indx]);
-				return 1;
-			}
-		}
-	}
+                indx += len;
+                break;
+            }
+            case 0xfd: {
+                indx++;
+                uint16_t len = ndefTLVGetLength(&ndef[indx], &indx);
+                PrintAndLogEx(INFO, "-- NDEF proprietary info. Skipped %d bytes.", len);
+                indx += len;
+                break;
+            }
+            case 0xfe: {
+                PrintAndLogEx(INFO, "-- NDEF Terminator. Done.");
+                return 0;
+                break;
+            }
+            default: {
+                PrintAndLogEx(ERR, "unknown tag 0x%02x", ndef[indx]);
+                return 1;
+            }
+        }
+    }
 
-	return 0;
+    return 0;
 }
diff --git a/client/mifare/ndef.h b/client/mifare/ndef.h
index ca16fecd3..1130ebba7 100644
--- a/client/mifare/ndef.h
+++ b/client/mifare/ndef.h
@@ -16,45 +16,45 @@
 #include <stddef.h>
 
 typedef enum {
-	tnfEmptyRecord			= 0x00,
-	tnfWellKnownRecord		= 0x01,
-	tnfMIMEMediaRecord		= 0x02,
-	tnfAbsoluteURIRecord	= 0x03,
-	tnfExternalRecord		= 0x04,
-	tnfUnknownRecord		= 0x05,
-	tnfUnchangedRecord		= 0x06
+    tnfEmptyRecord          = 0x00,
+    tnfWellKnownRecord      = 0x01,
+    tnfMIMEMediaRecord      = 0x02,
+    tnfAbsoluteURIRecord    = 0x03,
+    tnfExternalRecord       = 0x04,
+    tnfUnknownRecord        = 0x05,
+    tnfUnchangedRecord      = 0x06
 } TypeNameFormat_t;
 
 typedef enum {
-	stNotPresent			= 0x00,
-	stRSASSA_PSS_SHA_1		= 0x01,
-	stRSASSA_PKCS1_v1_5_WITH_SHA_1 = 0x02,
-	stDSA					= 0x03,
-	stECDSA					= 0x04,
-	stNA					= 0x05
+    stNotPresent            = 0x00,
+    stRSASSA_PSS_SHA_1      = 0x01,
+    stRSASSA_PKCS1_v1_5_WITH_SHA_1 = 0x02,
+    stDSA                   = 0x03,
+    stECDSA                 = 0x04,
+    stNA                    = 0x05
 } ndefSigType_t;
 
 typedef enum {
-	sfX_509 = 0x00,
-	sfX9_68 = 0x01,
-	sfNA    = 0x02
+    sfX_509 = 0x00,
+    sfX9_68 = 0x01,
+    sfNA    = 0x02
 } ndefCertificateFormat_t;
 
 typedef struct {
-	bool MessageBegin;
-	bool MessageEnd;
-	bool ChunkFlag;
-	bool ShortRecordBit;
-	bool IDLenPresent;
-	TypeNameFormat_t TypeNameFormat;
-	size_t TypeLen;
-	size_t PayloadLen;
-	size_t IDLen;
-	size_t len;
-	size_t RecLen;
-	uint8_t *Type;
-	uint8_t *Payload;
-	uint8_t *ID;
+    bool MessageBegin;
+    bool MessageEnd;
+    bool ChunkFlag;
+    bool ShortRecordBit;
+    bool IDLenPresent;
+    TypeNameFormat_t TypeNameFormat;
+    size_t TypeLen;
+    size_t PayloadLen;
+    size_t IDLen;
+    size_t len;
+    size_t RecLen;
+    uint8_t *Type;
+    uint8_t *Payload;
+    uint8_t *ID;
 } NDEFHeader_t;
 
 extern int NDEFDecodeAndPrint(uint8_t *ndef, size_t ndefLen, bool verbose);
diff --git a/client/pm3_binlib.c b/client/pm3_binlib.c
index 99729c0ca..332714fed 100644
--- a/client/pm3_binlib.c
+++ b/client/pm3_binlib.c
@@ -8,25 +8,25 @@
 * Roberto Ierusalimschy <roberto@inf.puc-rio.br>.
 */
 
-#define	OP_ZSTRING	'z'		/* zero-terminated string */
-#define	OP_BSTRING	'p'		/* string preceded by length byte */
-#define	OP_WSTRING	'P'		/* string preceded by length word */
-#define	OP_SSTRING	'a'		/* string preceded by length size_t */
-#define	OP_STRING	'A'		/* string */
-#define	OP_FLOAT	'f'		/* float */
-#define	OP_DOUBLE	'd'		/* double */
-#define	OP_NUMBER	'n'		/* Lua number */
-#define	OP_CHAR		'c'		/* char (1-byte int) */
-#define	OP_BYTE		'C'		/* byte = unsigned char (1-byte unsigned int) */
-#define	OP_SHORT	's'		/* short (2-byte int) */
-#define	OP_USHORT	'S'		/* unsigned short (2-byte unsigned int) */
-#define	OP_INT		'i'		/* int (4-byte int) */
-#define	OP_UINT		'I'		/* unsigned int (4-byte unsigned int) */
-#define	OP_LONG		'l'		/* long (8-byte int) */
-#define	OP_ULONG	'L'		/* unsigned long (8-byte unsigned int) */
-#define	OP_LITTLEENDIAN	'<'		/* little endian */
-#define	OP_BIGENDIAN	'>'		/* big endian */
-#define	OP_NATIVE	'='		/* native endian */
+#define    OP_ZSTRING      'z'        /* zero-terminated string */
+#define    OP_BSTRING      'p'        /* string preceded by length byte */
+#define    OP_WSTRING      'P'        /* string preceded by length word */
+#define    OP_SSTRING      'a'        /* string preceded by length size_t */
+#define    OP_STRING       'A'        /* string */
+#define    OP_FLOAT        'f'        /* float */
+#define    OP_DOUBLE       'd'        /* double */
+#define    OP_NUMBER       'n'        /* Lua number */
+#define    OP_CHAR         'c'        /* char (1-byte int) */
+#define    OP_BYTE         'C'        /* byte = unsigned char (1-byte unsigned int) */
+#define    OP_SHORT        's'        /* short (2-byte int) */
+#define    OP_USHORT       'S'        /* unsigned short (2-byte unsigned int) */
+#define    OP_INT          'i'        /* int (4-byte int) */
+#define    OP_UINT         'I'        /* unsigned int (4-byte unsigned int) */
+#define    OP_LONG         'l'        /* long (8-byte int) */
+#define    OP_ULONG        'L'        /* unsigned long (8-byte unsigned int) */
+#define    OP_LITTLEENDIAN '<'        /* little endian */
+#define    OP_BIGENDIAN    '>'        /* big endian */
+#define    OP_NATIVE       '='        /* native endian */
 
 #define OP_HEX 'H'
 
@@ -69,40 +69,40 @@ static void doswap(int swap, void *p, size_t n)
  }
 }
 
-#define UNPACKNUMBER(OP,T)		\
-   case OP:				\
-   {					\
-    T a;				\
-    int m=sizeof(a);			\
-    if (i+m>len) { done = 1;	break;}	\
-    memcpy(&a,s+i,m);			\
-    i+=m;				\
-    doswap(swap,&a,m);			\
-    lua_pushnumber(L,(lua_Number)a);	\
-    ++n;				\
-    break;				\
+#define UNPACKNUMBER(OP,T)                      \
+   case OP:                                     \
+   {                                            \
+    T a;                                        \
+    int m=sizeof(a);                            \
+    if (i+m>len) { done = 1;    break;}         \
+    memcpy(&a,s+i,m);                           \
+    i+=m;                                       \
+    doswap(swap,&a,m);                          \
+    lua_pushnumber(L,(lua_Number)a);            \
+    ++n;                                        \
+    break;                                      \
    }
 
-#define UNPACKSTRING(OP,T)		\
-   case OP:				\
-   {					\
-    T l;				\
-    int m = sizeof(l);			\
-    if (i + m > len) { done = 1;	break; }	\
-    memcpy(&l, s+i, m);			\
-    doswap(swap,&l,m);			\
-    if (i + m + l > len) { done = 1; break;}		\
-    i += m;				\
-    lua_pushlstring(L,s+i,l);		\
-    i += l;				\
-    ++n;				\
-    break;				\
+#define UNPACKSTRING(OP,T)                      \
+   case OP:                                     \
+   {                                            \
+    T l;                                        \
+    int m = sizeof(l);                          \
+    if (i + m > len) { done = 1;    break; }    \
+    memcpy(&l, s+i, m);                         \
+    doswap(swap,&l,m);                          \
+    if (i + m + l > len) { done = 1; break;}    \
+    i += m;                                     \
+    lua_pushlstring(L,s+i,l);                   \
+    i += l;                                     \
+    ++n;                                        \
+    break;                                      \
    }
 
 #define HEXDIGITS(DIG) \
  "0123456789ABCDEF"[DIG]
 
-static int l_unpack(lua_State *L) 		/** unpack(f,s, [init]) */
+static int l_unpack(lua_State *L)         /** unpack(f,s, [init]) */
 {
  size_t len;
  const char *s=luaL_checklstring(L,2,&len); /* switched s and f */
@@ -211,28 +211,28 @@ static int l_unpack(lua_State *L) 		/** unpack(f,s, [init]) */
  return n+1;
 }
 
-#define PACKNUMBER(OP,T)			\
-   case OP:					\
-   {						\
-    T a=(T)luaL_checknumber(L,i++);		\
-    doswap(swap,&a,sizeof(a));			\
-    luaL_addlstring(&b,(char*)&a,sizeof(a));	\
-    break;					\
+#define PACKNUMBER(OP,T)                        \
+   case OP:                                     \
+   {                                            \
+    T a=(T)luaL_checknumber(L,i++);             \
+    doswap(swap,&a,sizeof(a));                  \
+    luaL_addlstring(&b,(char*)&a,sizeof(a));    \
+    break;                                      \
    }
 
-#define PACKSTRING(OP,T)			\
-   case OP:					\
-   {						\
-    size_t l;					\
-    const char *a=luaL_checklstring(L,i++,&l);	\
-    T ll=(T)l;					\
-    doswap(swap,&ll,sizeof(ll));		\
-    luaL_addlstring(&b,(char*)&ll,sizeof(ll));	\
-    luaL_addlstring(&b,a,l);			\
-    break;					\
+#define PACKSTRING(OP,T)                        \
+   case OP:                                     \
+   {                                            \
+    size_t l;                                   \
+    const char *a=luaL_checklstring(L,i++,&l);  \
+    T ll=(T)l;                                  \
+    doswap(swap,&ll,sizeof(ll));                \
+    luaL_addlstring(&b,(char*)&ll,sizeof(ll));  \
+    luaL_addlstring(&b,a,l);                    \
+    break;                                      \
    }
 
-static int l_pack(lua_State *L) 		/** pack(f,...) */
+static int l_pack(lua_State *L)         /** pack(f,...) */
 {
  int i = 2;
  const char *f = luaL_checkstring(L,1);
@@ -330,9 +330,9 @@ static int l_pack(lua_State *L) 		/** pack(f,...) */
 
 static const luaL_Reg binlib[] =
 {
-	{"pack",	l_pack},
-	{"unpack",	l_unpack},
-	{NULL,	NULL}
+    {"pack",   l_pack},
+    {"unpack", l_unpack},
+    {NULL,     NULL}
 };
 
 LUALIB_API int luaopen_binlib (lua_State *L) {
diff --git a/client/pm3_bitlib.c b/client/pm3_bitlib.c
index 29fc49f1f..ad00f3b58 100644
--- a/client/pm3_bitlib.c
+++ b/client/pm3_bitlib.c
@@ -126,11 +126,11 @@ static const struct luaL_Reg bitlib[] = {
 };
 
 LUALIB_API int luaopen_bit (lua_State *L) {
-	luaL_newlib(L, bitlib);
-	//luaL_register(L, "bit", bitlib);
-	lua_pushnumber(L, BIT_BITS);
-	lua_setfield(L, -2, "bits");
-	return 1;
+    luaL_newlib(L, bitlib);
+    //luaL_register(L, "bit", bitlib);
+    lua_pushnumber(L, BIT_BITS);
+    lua_setfield(L, -2, "bits");
+    return 1;
 }
 
 /**
diff --git a/client/proxendian.h b/client/proxendian.h
index 866ea2507..3ef073292 100644
--- a/client/proxendian.h
+++ b/client/proxendian.h
@@ -37,12 +37,12 @@
 
 static inline uint16_t le16(uint16_t v)
 {
-	return (v>>8) | (v<<8);
+    return (v>>8) | (v<<8);
 }
 
 static inline uint32_t le32(uint32_t v)
 {
-	return (le16(v)<<16) | (le16(v>>16));
+    return (le16(v)<<16) | (le16(v>>16));
 }
 #endif // HOST_LITTLE_ENDIAN
 
diff --git a/client/proxgui.cpp b/client/proxgui.cpp
index b71ca59e3..cfe7bc794 100644
--- a/client/proxgui.cpp
+++ b/client/proxgui.cpp
@@ -24,56 +24,56 @@ WorkerThread::~WorkerThread()
 }
 
 void WorkerThread::run() {
-	main_loop(script_cmds_file, script_cmd, usb_present);
+    main_loop(script_cmds_file, script_cmd, usb_present);
 }
 
 extern "C" void ShowGraphWindow(void)
 {
-	if (!gui)
-		return;
+    if (!gui)
+        return;
 
-	gui->ShowGraphWindow();
+    gui->ShowGraphWindow();
 }
 
 extern "C" void HideGraphWindow(void)
 {
-	if (!gui)
-		return;
+    if (!gui)
+        return;
 
-	gui->HideGraphWindow();
+    gui->HideGraphWindow();
 }
 
 extern "C" void RepaintGraphWindow(void)
 {
-	if (!gui)
-		return;
+    if (!gui)
+        return;
 
-	gui->RepaintGraphWindow();
+    gui->RepaintGraphWindow();
 }
 
 extern "C" void MainGraphics(void)
 {
-	if (!gui)
-		return;
+    if (!gui)
+        return;
 
-	gui->MainLoop();
+    gui->MainLoop();
 }
 
 extern "C" void InitGraphics(int argc, char **argv, char *script_cmds_file, char *script_cmd, bool usb_present)
 {
 #ifdef Q_WS_X11
-	if (getenv("DISPLAY") == NULL)
-		return;
+    if (getenv("DISPLAY") == NULL)
+        return;
 #endif
-	main_loop_thread = new WorkerThread(script_cmds_file, script_cmd, usb_present);
-	gui = new ProxGuiQT(argc, argv, main_loop_thread);
+    main_loop_thread = new WorkerThread(script_cmds_file, script_cmd, usb_present);
+    gui = new ProxGuiQT(argc, argv, main_loop_thread);
 }
 
 extern "C" void ExitGraphics(void)
 {
-	if (!gui)
-		return;
+    if (!gui)
+        return;
 
-	gui->Exit();
-	gui = NULL;
+    gui->Exit();
+    gui = NULL;
 }
diff --git a/client/proxguiqt.cpp b/client/proxguiqt.cpp
index f5bdc0243..8460253ad 100644
--- a/client/proxguiqt.cpp
+++ b/client/proxguiqt.cpp
@@ -38,224 +38,224 @@ int PageWidth;
 int unlockStart = 0;
 
 void ProxGuiQT::ShowGraphWindow(void) {
-	emit ShowGraphWindowSignal();
+    emit ShowGraphWindowSignal();
 }
 
 void ProxGuiQT::RepaintGraphWindow(void) {
-	emit RepaintGraphWindowSignal();
+    emit RepaintGraphWindowSignal();
 }
 
 void ProxGuiQT::HideGraphWindow(void) {
-	emit HideGraphWindowSignal();
+    emit HideGraphWindowSignal();
 }
 
 void ProxGuiQT::Exit(void) {
-	emit ExitSignal();
+    emit ExitSignal();
 }
 
 void ProxGuiQT::_ShowGraphWindow(void) {
-	if(!plotapp)
-		return;
+    if(!plotapp)
+        return;
 
-	if (!plotwidget) {
+    if (!plotwidget) {
 
 #if defined(__MACH__) && defined(__APPLE__)
-		makeFocusable();
+        makeFocusable();
 #endif
 
-		plotwidget = new ProxWidget();
-	}
-	plotwidget->show();
+        plotwidget = new ProxWidget();
+    }
+    plotwidget->show();
 }
 
 void ProxGuiQT::_RepaintGraphWindow(void) {
-	if (!plotapp || !plotwidget)
-		return;
+    if (!plotapp || !plotwidget)
+        return;
 
-	plotwidget->update();
+    plotwidget->update();
 }
 
 void ProxGuiQT::_HideGraphWindow(void) {
-	if (!plotapp || !plotwidget)
-		return;
+    if (!plotapp || !plotwidget)
+        return;
 
-	plotwidget->hide();
+    plotwidget->hide();
 }
 
 void ProxGuiQT::_Exit(void) {
-	delete this;
+    delete this;
 }
 
 void ProxGuiQT::_StartProxmarkThread(void) {
-	if (!proxmarkThread)
-		return;
+    if (!proxmarkThread)
+        return;
 
-	// if thread finished delete self and delete application
-	QObject::connect(proxmarkThread, SIGNAL(finished()), proxmarkThread, SLOT(deleteLater()));
-	QObject::connect(proxmarkThread, SIGNAL(finished()), this, SLOT(_Exit()));
-	// start proxmark thread
-	proxmarkThread->start();
+    // if thread finished delete self and delete application
+    QObject::connect(proxmarkThread, SIGNAL(finished()), proxmarkThread, SLOT(deleteLater()));
+    QObject::connect(proxmarkThread, SIGNAL(finished()), this, SLOT(_Exit()));
+    // start proxmark thread
+    proxmarkThread->start();
 }
 
 void ProxGuiQT::MainLoop()
 {
-	plotapp = new QApplication(argc, argv);
+    plotapp = new QApplication(argc, argv);
 
-	connect(this, SIGNAL(ShowGraphWindowSignal()), this, SLOT(_ShowGraphWindow()));
-	connect(this, SIGNAL(RepaintGraphWindowSignal()), this, SLOT(_RepaintGraphWindow()));
-	connect(this, SIGNAL(HideGraphWindowSignal()), this, SLOT(_HideGraphWindow()));
-	connect(this, SIGNAL(ExitSignal()), this, SLOT(_Exit()));
+    connect(this, SIGNAL(ShowGraphWindowSignal()), this, SLOT(_ShowGraphWindow()));
+    connect(this, SIGNAL(RepaintGraphWindowSignal()), this, SLOT(_RepaintGraphWindow()));
+    connect(this, SIGNAL(HideGraphWindowSignal()), this, SLOT(_HideGraphWindow()));
+    connect(this, SIGNAL(ExitSignal()), this, SLOT(_Exit()));
 
-	//start proxmark thread after starting event loop
-	QTimer::singleShot(200, this, SLOT(_StartProxmarkThread()));
+    //start proxmark thread after starting event loop
+    QTimer::singleShot(200, this, SLOT(_StartProxmarkThread()));
 
 #if defined(__MACH__) && defined(__APPLE__)
-	//Prevent the terminal from loosing focus during launch by making the client unfocusable
-	makeUnfocusable();
+    //Prevent the terminal from loosing focus during launch by making the client unfocusable
+    makeUnfocusable();
 #endif
 
 
-	plotapp->exec();
+    plotapp->exec();
 }
 
 ProxGuiQT::ProxGuiQT(int argc, char **argv, WorkerThread *wthread) : plotapp(NULL), plotwidget(NULL),
-	argc(argc), argv(argv), proxmarkThread(wthread)
+    argc(argc), argv(argv), proxmarkThread(wthread)
 {
 }
 
 ProxGuiQT::~ProxGuiQT(void) {
-	if (plotapp) {
-		plotapp->quit();
-		plotapp = NULL;
-	}
+    if (plotapp) {
+        plotapp->quit();
+        plotapp = NULL;
+    }
 }
 
 //--------------------
 void ProxWidget::applyOperation() {
-	//printf("ApplyOperation()");
-	save_restoreGB(GRAPH_SAVE);
-	memcpy(GraphBuffer, s_Buff, sizeof(int) * GraphTraceLen);
-	RepaintGraphWindow();
+    //printf("ApplyOperation()");
+    save_restoreGB(GRAPH_SAVE);
+    memcpy(GraphBuffer, s_Buff, sizeof(int) * GraphTraceLen);
+    RepaintGraphWindow();
 }
 void ProxWidget::stickOperation() {
-	save_restoreGB(GRAPH_RESTORE);
-	//printf("stickOperation()");
+    save_restoreGB(GRAPH_RESTORE);
+    //printf("stickOperation()");
 }
 void ProxWidget::vchange_autocorr(int v) {
-	int ans = AutoCorrelate(GraphBuffer, s_Buff, GraphTraceLen, v, true, false);
-	if (g_debugMode) printf("vchange_autocorr(w:%d): %d\n", v, ans);
-	g_useOverlays = true;
-	RepaintGraphWindow();
+    int ans = AutoCorrelate(GraphBuffer, s_Buff, GraphTraceLen, v, true, false);
+    if (g_debugMode) printf("vchange_autocorr(w:%d): %d\n", v, ans);
+    g_useOverlays = true;
+    RepaintGraphWindow();
 }
 void ProxWidget::vchange_askedge(int v) {
-	//extern int AskEdgeDetect(const int *in, int *out, int len, int threshold);
-	int ans = AskEdgeDetect(GraphBuffer, s_Buff, GraphTraceLen, v);
-	if (g_debugMode) printf("vchange_askedge(w:%d)%d\n", v, ans);
-	g_useOverlays = true;
-	RepaintGraphWindow();
+    //extern int AskEdgeDetect(const int *in, int *out, int len, int threshold);
+    int ans = AskEdgeDetect(GraphBuffer, s_Buff, GraphTraceLen, v);
+    if (g_debugMode) printf("vchange_askedge(w:%d)%d\n", v, ans);
+    g_useOverlays = true;
+    RepaintGraphWindow();
 }
 void ProxWidget::vchange_dthr_up(int v) {
-	int down = opsController->horizontalSlider_dirthr_down->value();
-	directionalThreshold(GraphBuffer, s_Buff, GraphTraceLen, v, down);
-	//printf("vchange_dthr_up(%d)", v);
-	g_useOverlays = true;
-	RepaintGraphWindow();
+    int down = opsController->horizontalSlider_dirthr_down->value();
+    directionalThreshold(GraphBuffer, s_Buff, GraphTraceLen, v, down);
+    //printf("vchange_dthr_up(%d)", v);
+    g_useOverlays = true;
+    RepaintGraphWindow();
 }
 void ProxWidget::vchange_dthr_down(int v) {
-	//printf("vchange_dthr_down(%d)", v);
-	int up = opsController->horizontalSlider_dirthr_up->value();
-	directionalThreshold(GraphBuffer,s_Buff, GraphTraceLen, v, up);
-	g_useOverlays = true;
-	RepaintGraphWindow();
+    //printf("vchange_dthr_down(%d)", v);
+    int up = opsController->horizontalSlider_dirthr_up->value();
+    directionalThreshold(GraphBuffer,s_Buff, GraphTraceLen, v, up);
+    g_useOverlays = true;
+    RepaintGraphWindow();
 }
 ProxWidget::ProxWidget(QWidget *parent, ProxGuiQT *master) : QWidget(parent) {
-	this->master = master;
-	resize(800, 400);
+    this->master = master;
+    resize(800, 400);
 
-	// Setup the controller widget
-	controlWidget = new QWidget();
-	opsController = new Ui::Form();
-	opsController->setupUi(controlWidget);
-	//Due to quirks in QT Designer, we need to fiddle a bit
-	opsController->horizontalSlider_dirthr_down->setMinimum(-128);
-	opsController->horizontalSlider_dirthr_down->setMaximum(0);
-	opsController->horizontalSlider_dirthr_down->setValue(-20);
-	opsController->horizontalSlider_dirthr_up->setMinimum(-40);
-	opsController->horizontalSlider_dirthr_up->setMaximum(128);
-	opsController->horizontalSlider_dirthr_up->setValue(20);
-	opsController->horizontalSlider_askedge->setValue(25);
-	opsController->horizontalSlider_window->setValue(4000);
+    // Setup the controller widget
+    controlWidget = new QWidget();
+    opsController = new Ui::Form();
+    opsController->setupUi(controlWidget);
+    //Due to quirks in QT Designer, we need to fiddle a bit
+    opsController->horizontalSlider_dirthr_down->setMinimum(-128);
+    opsController->horizontalSlider_dirthr_down->setMaximum(0);
+    opsController->horizontalSlider_dirthr_down->setValue(-20);
+    opsController->horizontalSlider_dirthr_up->setMinimum(-40);
+    opsController->horizontalSlider_dirthr_up->setMaximum(128);
+    opsController->horizontalSlider_dirthr_up->setValue(20);
+    opsController->horizontalSlider_askedge->setValue(25);
+    opsController->horizontalSlider_window->setValue(4000);
 
 
-	QObject::connect(opsController->pushButton_apply, SIGNAL(clicked()), this, SLOT(applyOperation()));
-	QObject::connect(opsController->pushButton_sticky, SIGNAL(clicked()), this, SLOT(stickOperation()));
-	QObject::connect(opsController->horizontalSlider_window, SIGNAL(valueChanged(int)), this, SLOT(vchange_autocorr(int)));
-	QObject::connect(opsController->horizontalSlider_dirthr_up, SIGNAL(valueChanged(int)), this, SLOT(vchange_dthr_up(int)));
-	QObject::connect(opsController->horizontalSlider_dirthr_down, SIGNAL(valueChanged(int)), this, SLOT(vchange_dthr_down(int)));
-	QObject::connect(opsController->horizontalSlider_askedge, SIGNAL(valueChanged(int)), this, SLOT(vchange_askedge(int)));
+    QObject::connect(opsController->pushButton_apply, SIGNAL(clicked()), this, SLOT(applyOperation()));
+    QObject::connect(opsController->pushButton_sticky, SIGNAL(clicked()), this, SLOT(stickOperation()));
+    QObject::connect(opsController->horizontalSlider_window, SIGNAL(valueChanged(int)), this, SLOT(vchange_autocorr(int)));
+    QObject::connect(opsController->horizontalSlider_dirthr_up, SIGNAL(valueChanged(int)), this, SLOT(vchange_dthr_up(int)));
+    QObject::connect(opsController->horizontalSlider_dirthr_down, SIGNAL(valueChanged(int)), this, SLOT(vchange_dthr_down(int)));
+    QObject::connect(opsController->horizontalSlider_askedge, SIGNAL(valueChanged(int)), this, SLOT(vchange_askedge(int)));
 
-	// Set up the plot widget, which does the actual plotting
-	plot = new Plot(this);
-	QVBoxLayout *layout = new QVBoxLayout;
-	layout->addWidget(plot);
-	setLayout(layout);
-	show(); // places the window on the screen.
+    // Set up the plot widget, which does the actual plotting
+    plot = new Plot(this);
+    QVBoxLayout *layout = new QVBoxLayout;
+    layout->addWidget(plot);
+    setLayout(layout);
+    show(); // places the window on the screen.
 
-	// Move controller widget below plot
-	controlWidget->move(x(),y()+frameSize().height());
-	controlWidget->resize(size().width(), 200);
-	controlWidget->show();
+    // Move controller widget below plot
+    controlWidget->move(x(),y()+frameSize().height());
+    controlWidget->resize(size().width(), 200);
+    controlWidget->show();
 }
 
 // not 100% sure what i need in this block
 // feel free to fix - marshmellow...
 ProxWidget::~ProxWidget(void) {
-	if (controlWidget) {
-		controlWidget->close();
-		delete controlWidget;
-		controlWidget = NULL;
-	}
+    if (controlWidget) {
+        controlWidget->close();
+        delete controlWidget;
+        controlWidget = NULL;
+    }
 
-	if (opsController) {
-		delete opsController;
-		opsController = NULL;
-	}
+    if (opsController) {
+        delete opsController;
+        opsController = NULL;
+    }
 
-	if (plot) {
-		plot->close();
-		delete plot;
-		plot = NULL;
-	}
+    if (plot) {
+        plot->close();
+        delete plot;
+        plot = NULL;
+    }
 }
 void ProxWidget::closeEvent(QCloseEvent *event) {
-	event->ignore();
-	this->hide();
-	g_useOverlays = false;
+    event->ignore();
+    this->hide();
+    g_useOverlays = false;
 }
 void ProxWidget::hideEvent(QHideEvent *event) {
-	controlWidget->hide();
-	plot->hide();
+    controlWidget->hide();
+    plot->hide();
 }
 void ProxWidget::showEvent(QShowEvent *event) {
-	controlWidget->show();
-	plot->show();
+    controlWidget->show();
+    plot->show();
 }
 
 //----------- Plotting
 
 int Plot::xCoordOf(int i, QRect r ) {
-	return r.left() + (int)((i - GraphStart) * GraphPixelsPerPoint);
+    return r.left() + (int)((i - GraphStart) * GraphPixelsPerPoint);
 }
 
 int Plot::yCoordOf(int v, QRect r, int maxVal) {
-	int z = (r.bottom() - r.top()) / 2;
-	if ( maxVal == 0 ) ++maxVal;
-	return -(z * v) / maxVal + z;
+    int z = (r.bottom() - r.top()) / 2;
+    if ( maxVal == 0 ) ++maxVal;
+    return -(z * v) / maxVal + z;
 }
 
 int Plot::valueOf_yCoord(int y, QRect r, int maxVal) {
-	int z = (r.bottom() - r.top())/2;
-	return (y-z) * maxVal / z;
+    int z = (r.bottom() - r.top())/2;
+    return (y-z) * maxVal / z;
 }
 
 static const QColor GREEN = QColor(100,255,100);
@@ -265,199 +265,199 @@ static const QColor GRAY = QColor(240,240,240);
 
 QColor Plot::getColor(int graphNum)
 {
-	switch (graphNum) {
-	case 0: return GREEN;  //Green
-	case 1: return RED;    //Red
-	case 2: return BLUE;   //Blue
-	default: return GRAY;  //Gray
-	}
+    switch (graphNum) {
+    case 0: return GREEN;  //Green
+    case 1: return RED;    //Red
+    case 2: return BLUE;   //Blue
+    default: return GRAY;  //Gray
+    }
 }
 
 void Plot::setMaxAndStart(int *buffer, int len, QRect plotRect)
 {
-	if (len == 0) return;
-	startMax = (len - (int)((plotRect.right() - plotRect.left() - 40) / GraphPixelsPerPoint));
-	if (startMax < 0) {
-		startMax = 0;
-	}
-	if (GraphStart > startMax) {
-		GraphStart = startMax;
-	}
-	if (GraphStart > len) return;
-	int vMin = INT_MAX, vMax = INT_MIN, v = 0;
-	int sample_index = GraphStart ;
-	for ( ; sample_index < len && xCoordOf(sample_index,plotRect) < plotRect.right() ; sample_index++) {
+    if (len == 0) return;
+    startMax = (len - (int)((plotRect.right() - plotRect.left() - 40) / GraphPixelsPerPoint));
+    if (startMax < 0) {
+        startMax = 0;
+    }
+    if (GraphStart > startMax) {
+        GraphStart = startMax;
+    }
+    if (GraphStart > len) return;
+    int vMin = INT_MAX, vMax = INT_MIN, v = 0;
+    int sample_index = GraphStart ;
+    for ( ; sample_index < len && xCoordOf(sample_index,plotRect) < plotRect.right() ; sample_index++) {
 
-		v = buffer[sample_index];
-		if (v < vMin) vMin = v;
-		if (v > vMax) vMax = v;
-	}
+        v = buffer[sample_index];
+        if (v < vMin) vMin = v;
+        if (v > vMax) vMax = v;
+    }
 
-	g_absVMax = 0;
-	if (fabs( (double) vMin) > g_absVMax) g_absVMax = (int)fabs( (double) vMin);
-	if (fabs( (double) vMax) > g_absVMax) g_absVMax = (int)fabs( (double) vMax);
-	g_absVMax = (int)(g_absVMax * 1.25 + 1);
+    g_absVMax = 0;
+    if (fabs( (double) vMin) > g_absVMax) g_absVMax = (int)fabs( (double) vMin);
+    if (fabs( (double) vMax) > g_absVMax) g_absVMax = (int)fabs( (double) vMax);
+    g_absVMax = (int)(g_absVMax * 1.25 + 1);
 }
 
 void Plot::PlotDemod(uint8_t *buffer, size_t len, QRect plotRect, QRect annotationRect, QPainter *painter, int graphNum, int plotOffset)
 {
-	if (len == 0 || PlotGridX <= 0) return;
-	//clock_t begin = clock();
-	QPainterPath penPath;
+    if (len == 0 || PlotGridX <= 0) return;
+    //clock_t begin = clock();
+    QPainterPath penPath;
 
-	int grid_delta_x = PlotGridX;
-	int first_delta_x = grid_delta_x; //(plotOffset > 0) ? PlotGridX : (PlotGridX +);
-	if (GraphStart > plotOffset) first_delta_x -= (GraphStart-plotOffset);
-	int DemodStart = GraphStart;
-	if (plotOffset > GraphStart) DemodStart = plotOffset;
+    int grid_delta_x = PlotGridX;
+    int first_delta_x = grid_delta_x; //(plotOffset > 0) ? PlotGridX : (PlotGridX +);
+    if (GraphStart > plotOffset) first_delta_x -= (GraphStart-plotOffset);
+    int DemodStart = GraphStart;
+    if (plotOffset > GraphStart) DemodStart = plotOffset;
 
-	int BitStart = 0;
-	// round down
-	if (DemodStart-plotOffset > 0) BitStart = (int)(((DemodStart-plotOffset)+(PlotGridX-1))/PlotGridX)-1;
-	first_delta_x += BitStart * PlotGridX;
-	if (BitStart > (int)len) return;
-	int delta_x = 0;
-	int v = 0;
-	//printf("first_delta_x %i, grid_delta_x %i, DemodStart %i, BitStart %i\n",first_delta_x,grid_delta_x,DemodStart, BitStart);
+    int BitStart = 0;
+    // round down
+    if (DemodStart-plotOffset > 0) BitStart = (int)(((DemodStart-plotOffset)+(PlotGridX-1))/PlotGridX)-1;
+    first_delta_x += BitStart * PlotGridX;
+    if (BitStart > (int)len) return;
+    int delta_x = 0;
+    int v = 0;
+    //printf("first_delta_x %i, grid_delta_x %i, DemodStart %i, BitStart %i\n",first_delta_x,grid_delta_x,DemodStart, BitStart);
 
-	painter->setPen(getColor(graphNum));
-	char str[5];
+    painter->setPen(getColor(graphNum));
+    char str[5];
   int absVMax = (int)(100*1.05+1);
-	int x = xCoordOf(DemodStart, plotRect);
-	int y = yCoordOf((buffer[BitStart]*200-100)*-1,plotRect,absVMax);
-	penPath.moveTo(x, y);
-	delta_x = 0;
-	int clk = first_delta_x;
-	for(int i = BitStart; i < (int)len && xCoordOf(delta_x+DemodStart, plotRect) < plotRect.right(); i++) {
-		for (int ii = 0; ii < (clk) && i < (int)len && xCoordOf(DemodStart+delta_x+ii, plotRect) < plotRect.right() ; ii++ ) {
-			x = xCoordOf(DemodStart+delta_x+ii, plotRect);
-			v = buffer[i]*200-100;
+    int x = xCoordOf(DemodStart, plotRect);
+    int y = yCoordOf((buffer[BitStart]*200-100)*-1,plotRect,absVMax);
+    penPath.moveTo(x, y);
+    delta_x = 0;
+    int clk = first_delta_x;
+    for(int i = BitStart; i < (int)len && xCoordOf(delta_x+DemodStart, plotRect) < plotRect.right(); i++) {
+        for (int ii = 0; ii < (clk) && i < (int)len && xCoordOf(DemodStart+delta_x+ii, plotRect) < plotRect.right() ; ii++ ) {
+            x = xCoordOf(DemodStart+delta_x+ii, plotRect);
+            v = buffer[i]*200-100;
 
-			y = yCoordOf( v, plotRect, absVMax);
+            y = yCoordOf( v, plotRect, absVMax);
 
-			penPath.lineTo(x, y);
+            penPath.lineTo(x, y);
 
-			if(GraphPixelsPerPoint > 10) {
-				QRect f(QPoint(x - 3, y - 3),QPoint(x + 3, y + 3));
-				painter->fillRect(f, QColor(100, 255, 100));
-			}
-			if (ii == (int)clk/2) {
-				//print label
-				sprintf(str, "%u",buffer[i]);
-				painter->drawText(x-8, y + ((buffer[i] > 0) ? 18 : -6), str);
-			}
-		}
-		delta_x += clk;
-		clk = grid_delta_x;
-	}
+            if(GraphPixelsPerPoint > 10) {
+                QRect f(QPoint(x - 3, y - 3),QPoint(x + 3, y + 3));
+                painter->fillRect(f, QColor(100, 255, 100));
+            }
+            if (ii == (int)clk/2) {
+                //print label
+                sprintf(str, "%u",buffer[i]);
+                painter->drawText(x-8, y + ((buffer[i] > 0) ? 18 : -6), str);
+            }
+        }
+        delta_x += clk;
+        clk = grid_delta_x;
+    }
 
-	// Graph annotations
-	painter->drawPath(penPath);
+    // Graph annotations
+    painter->drawPath(penPath);
 }
 
 void Plot::PlotGraph(int *buffer, int len, QRect plotRect, QRect annotationRect, QPainter *painter, int graphNum) {
-	if (len == 0) return;
-	// clock_t begin = clock();
-	QPainterPath penPath;
-	int vMin = INT_MAX, vMax = INT_MIN, vMean = 0, v = 0, i = 0;
-	int x = xCoordOf(GraphStart, plotRect);
-	int y = yCoordOf(buffer[GraphStart], plotRect, g_absVMax);
-	penPath.moveTo(x, y);
-	for(i = GraphStart; i < len && xCoordOf(i, plotRect) < plotRect.right(); i++) {
+    if (len == 0) return;
+    // clock_t begin = clock();
+    QPainterPath penPath;
+    int vMin = INT_MAX, vMax = INT_MIN, vMean = 0, v = 0, i = 0;
+    int x = xCoordOf(GraphStart, plotRect);
+    int y = yCoordOf(buffer[GraphStart], plotRect, g_absVMax);
+    penPath.moveTo(x, y);
+    for(i = GraphStart; i < len && xCoordOf(i, plotRect) < plotRect.right(); i++) {
 
-		x = xCoordOf(i, plotRect);
-		v = buffer[i];
+        x = xCoordOf(i, plotRect);
+        v = buffer[i];
 
-		y = yCoordOf( v, plotRect, g_absVMax);
+        y = yCoordOf( v, plotRect, g_absVMax);
 
-		penPath.lineTo(x, y);
+        penPath.lineTo(x, y);
 
-		if (GraphPixelsPerPoint > 10) {
-			QRect f(QPoint(x - 3, y - 3),QPoint(x + 3, y + 3));
-			painter->fillRect(f, QColor(100, 255, 100));
-		}
-		// catch stats
-		if (v < vMin) vMin = v;
-		if (v > vMax) vMax = v;
-		vMean += v;
-	}
-	vMean /= (i - GraphStart);
+        if (GraphPixelsPerPoint > 10) {
+            QRect f(QPoint(x - 3, y - 3),QPoint(x + 3, y + 3));
+            painter->fillRect(f, QColor(100, 255, 100));
+        }
+        // catch stats
+        if (v < vMin) vMin = v;
+        if (v > vMax) vMax = v;
+        vMean += v;
+    }
+    vMean /= (i - GraphStart);
 
-	painter->setPen(getColor(graphNum));
+    painter->setPen(getColor(graphNum));
 
-	// Draw y-axis
-	int xo = 5 + (graphNum * 40);
-	painter->drawLine(xo, plotRect.top(),xo, plotRect.bottom());
+    // Draw y-axis
+    int xo = 5 + (graphNum * 40);
+    painter->drawLine(xo, plotRect.top(),xo, plotRect.bottom());
 
-	int vMarkers = (g_absVMax - (g_absVMax % 10)) / 5;
-	int minYDist = 40; // Minimum pixel-distance between markers
+    int vMarkers = (g_absVMax - (g_absVMax % 10)) / 5;
+    int minYDist = 40; // Minimum pixel-distance between markers
 
-	char yLbl[20];
+    char yLbl[20];
 
-	int n = 0;
-	int lasty0 = 65535;
+    int n = 0;
+    int lasty0 = 65535;
 
-	for (v = vMarkers; yCoordOf(v, plotRect, g_absVMax) > plotRect.top() && n < 20; v+= vMarkers ,n++) {
-		int y0 = yCoordOf(v, plotRect, g_absVMax);
-		int y1 = yCoordOf(-v, plotRect, g_absVMax);
+    for (v = vMarkers; yCoordOf(v, plotRect, g_absVMax) > plotRect.top() && n < 20; v+= vMarkers ,n++) {
+        int y0 = yCoordOf(v, plotRect, g_absVMax);
+        int y1 = yCoordOf(-v, plotRect, g_absVMax);
 
-		if(lasty0 - y0 < minYDist) continue;
+        if(lasty0 - y0 < minYDist) continue;
 
-		painter->drawLine(xo-5,y0, xo+5, y0);
+        painter->drawLine(xo-5,y0, xo+5, y0);
 
-		sprintf(yLbl, "%d", v);
-		painter->drawText(xo+8, y0+7, yLbl);
+        sprintf(yLbl, "%d", v);
+        painter->drawText(xo+8, y0+7, yLbl);
 
-		painter->drawLine(xo-5, y1, xo+5, y1);
-		sprintf(yLbl, "%d", -v);
-		painter->drawText(xo+8, y1+5 , yLbl);
-		lasty0 = y0;
-	}
+        painter->drawLine(xo-5, y1, xo+5, y1);
+        sprintf(yLbl, "%d", -v);
+        painter->drawText(xo+8, y1+5 , yLbl);
+        lasty0 = y0;
+    }
 
-	//Graph annotations
-	painter->drawPath(penPath);
-	char str[200];
-	sprintf(str, "max=%d  min=%d  mean=%d  n=%d/%d  CursorAVal=[%d]  CursorBVal=[%d]",
-			vMax, vMin, vMean, i, len, buffer[CursorAPos], buffer[CursorBPos]);
-	painter->drawText(20, annotationRect.bottom() - 23 - 20 * graphNum, str);
+    //Graph annotations
+    painter->drawPath(penPath);
+    char str[200];
+    sprintf(str, "max=%d  min=%d  mean=%d  n=%d/%d  CursorAVal=[%d]  CursorBVal=[%d]",
+            vMax, vMin, vMean, i, len, buffer[CursorAPos], buffer[CursorBPos]);
+    painter->drawText(20, annotationRect.bottom() - 23 - 20 * graphNum, str);
 
-	//clock_t end = clock();
-	//double elapsed_secs = double(end - begin) / CLOCKS_PER_SEC;
-	//printf("Plot time %f\n", elapsed_secs);
+    //clock_t end = clock();
+    //double elapsed_secs = double(end - begin) / CLOCKS_PER_SEC;
+    //printf("Plot time %f\n", elapsed_secs);
 }
 
 void Plot::plotGridLines(QPainter* painter, QRect r) {
 
-	// set GridOffset
-	if (PlotGridX <= 0) return;
+    // set GridOffset
+    if (PlotGridX <= 0) return;
 
-	int offset = GridOffset;
-	if (GridLocked && PlotGridX) {
-		offset = GridOffset + PlotGridX - (GraphStart % PlotGridX);
-	} else if (!GridLocked && GraphStart > 0 && PlotGridX) {
-		offset = PlotGridX-((GraphStart - offset) % PlotGridX) + GraphStart - unlockStart;
-	}
-	offset %= PlotGridX;
-	if (offset < 0) offset += PlotGridX;
+    int offset = GridOffset;
+    if (GridLocked && PlotGridX) {
+        offset = GridOffset + PlotGridX - (GraphStart % PlotGridX);
+    } else if (!GridLocked && GraphStart > 0 && PlotGridX) {
+        offset = PlotGridX-((GraphStart - offset) % PlotGridX) + GraphStart - unlockStart;
+    }
+    offset %= PlotGridX;
+    if (offset < 0) offset += PlotGridX;
 
-	int i;
-	int grid_delta_x = (int) (PlotGridX * GraphPixelsPerPoint);
-	int grid_delta_y = PlotGridY;
+    int i;
+    int grid_delta_x = (int) (PlotGridX * GraphPixelsPerPoint);
+    int grid_delta_y = PlotGridY;
 
-	if ((PlotGridX > 0) && ((PlotGridX * GraphPixelsPerPoint) > 1)) {
-		for (i = (offset * GraphPixelsPerPoint); i < r.right(); i += grid_delta_x) {
-			painter->drawLine(r.left()+i, r.top(), r.left()+i, r.bottom());
-		}
-	}
+    if ((PlotGridX > 0) && ((PlotGridX * GraphPixelsPerPoint) > 1)) {
+        for (i = (offset * GraphPixelsPerPoint); i < r.right(); i += grid_delta_x) {
+            painter->drawLine(r.left()+i, r.top(), r.left()+i, r.bottom());
+        }
+    }
 
-	if (PlotGridY > 0) {
-		for (i = 0; yCoordOf(i, r, g_absVMax) > r.top(); i += grid_delta_y) {
-			// line above mid
-			painter->drawLine( r.left(), yCoordOf(i, r, g_absVMax), r.right(), yCoordOf(i, r, g_absVMax) );
-			// line below mid
-			painter->drawLine( r.left(), yCoordOf(-i, r, g_absVMax), r.right(), yCoordOf(-i, r, g_absVMax) );
-		}
-	}
+    if (PlotGridY > 0) {
+        for (i = 0; yCoordOf(i, r, g_absVMax) > r.top(); i += grid_delta_y) {
+            // line above mid
+            painter->drawLine( r.left(), yCoordOf(i, r, g_absVMax), r.right(), yCoordOf(i, r, g_absVMax) );
+            // line below mid
+            painter->drawLine( r.left(), yCoordOf(-i, r, g_absVMax), r.right(), yCoordOf(-i, r, g_absVMax) );
+        }
+    }
 }
 
 #define HEIGHT_INFO 60
@@ -465,231 +465,231 @@ void Plot::plotGridLines(QPainter* painter, QRect r) {
 
 void Plot::paintEvent(QPaintEvent *event)
 {
-	QPainter painter(this);
-	QBrush brush(QColor(100, 255, 100));
-	QPen pen(QColor(100, 255, 100));
+    QPainter painter(this);
+    QBrush brush(QColor(100, 255, 100));
+    QPen pen(QColor(100, 255, 100));
 
-	painter.setFont(QFont("Courier New", 10));
+    painter.setFont(QFont("Courier New", 10));
 
-	if(GraphStart < 0)
-		GraphStart = 0;
+    if(GraphStart < 0)
+        GraphStart = 0;
 
-	if (CursorAPos > GraphTraceLen)
-		CursorAPos= 0;
-	if (CursorBPos > GraphTraceLen)
-		CursorBPos= 0;
-	if (CursorCPos > GraphTraceLen)
-		CursorCPos= 0;
-	if (CursorDPos > GraphTraceLen)
-		CursorDPos= 0;
+    if (CursorAPos > GraphTraceLen)
+        CursorAPos= 0;
+    if (CursorBPos > GraphTraceLen)
+        CursorBPos= 0;
+    if (CursorCPos > GraphTraceLen)
+        CursorCPos= 0;
+    if (CursorDPos > GraphTraceLen)
+        CursorDPos= 0;
 
-	QRect plotRect(WIDTH_AXES, 0, width()-WIDTH_AXES, height()-HEIGHT_INFO);
-	QRect infoRect(0, height()-HEIGHT_INFO, width(), HEIGHT_INFO);
+    QRect plotRect(WIDTH_AXES, 0, width()-WIDTH_AXES, height()-HEIGHT_INFO);
+    QRect infoRect(0, height()-HEIGHT_INFO, width(), HEIGHT_INFO);
 
-	//Grey background
-	painter.fillRect(rect(), QColor(60, 60, 60));
-	//Black foreground
-	painter.fillRect(plotRect, QColor(0, 0, 0));
+    //Grey background
+    painter.fillRect(rect(), QColor(60, 60, 60));
+    //Black foreground
+    painter.fillRect(plotRect, QColor(0, 0, 0));
 
-	//init graph variables
-	setMaxAndStart(GraphBuffer,GraphTraceLen,plotRect);
+    //init graph variables
+    setMaxAndStart(GraphBuffer,GraphTraceLen,plotRect);
 
-	// center line
-	int zeroHeight = plotRect.top() + (plotRect.bottom() - plotRect.top()) / 2;
-	painter.setPen(QColor(100, 100, 100));
-	painter.drawLine(plotRect.left(), zeroHeight, plotRect.right(), zeroHeight);
-	// plot X and Y grid lines
-	plotGridLines(&painter, plotRect);
+    // center line
+    int zeroHeight = plotRect.top() + (plotRect.bottom() - plotRect.top()) / 2;
+    painter.setPen(QColor(100, 100, 100));
+    painter.drawLine(plotRect.left(), zeroHeight, plotRect.right(), zeroHeight);
+    // plot X and Y grid lines
+    plotGridLines(&painter, plotRect);
 
-	//Start painting graph
-	PlotGraph(GraphBuffer, GraphTraceLen,plotRect,infoRect,&painter,0);
-	if (showDemod && DemodBufferLen	> 8) {
-		PlotDemod(DemodBuffer, DemodBufferLen,plotRect,infoRect,&painter,2,g_DemodStartIdx);
-	}
-	if (g_useOverlays) {
-		//init graph variables
-		setMaxAndStart(s_Buff,GraphTraceLen,plotRect);
-		PlotGraph(s_Buff, GraphTraceLen,plotRect,infoRect,&painter,1);
-	}
-	// End graph drawing
+    //Start painting graph
+    PlotGraph(GraphBuffer, GraphTraceLen,plotRect,infoRect,&painter,0);
+    if (showDemod && DemodBufferLen > 8) {
+        PlotDemod(DemodBuffer, DemodBufferLen,plotRect,infoRect,&painter,2,g_DemodStartIdx);
+    }
+    if (g_useOverlays) {
+        //init graph variables
+        setMaxAndStart(s_Buff,GraphTraceLen,plotRect);
+        PlotGraph(s_Buff, GraphTraceLen,plotRect,infoRect,&painter,1);
+    }
+    // End graph drawing
 
-	//Draw the cursors
-	if (CursorAPos > GraphStart && xCoordOf(CursorAPos, plotRect) < plotRect.right()) {
-		painter.setPen(QColor(255, 255, 0));
-		painter.drawLine(xCoordOf(CursorAPos, plotRect),plotRect.top(),xCoordOf(CursorAPos, plotRect),plotRect.bottom());
-	}
-	if (CursorBPos > GraphStart && xCoordOf(CursorBPos, plotRect) < plotRect.right()) {
-		painter.setPen(QColor(255, 0, 255));
-		painter.drawLine(xCoordOf(CursorBPos, plotRect),plotRect.top(),xCoordOf(CursorBPos, plotRect),plotRect.bottom());
-	}
-	if (CursorCPos > GraphStart && xCoordOf(CursorCPos, plotRect) < plotRect.right()) {
-		painter.setPen(QColor(255, 153, 0)); //orange
-		painter.drawLine(xCoordOf(CursorCPos, plotRect),plotRect.top(),xCoordOf(CursorCPos, plotRect),plotRect.bottom());
-	}
-	if (CursorDPos > GraphStart && xCoordOf(CursorDPos, plotRect) < plotRect.right()) {
-		painter.setPen(QColor(0, 0, 205)); //light blue
-		painter.drawLine(xCoordOf(CursorDPos, plotRect),plotRect.top(),xCoordOf(CursorDPos, plotRect),plotRect.bottom());
-	}
+    //Draw the cursors
+    if (CursorAPos > GraphStart && xCoordOf(CursorAPos, plotRect) < plotRect.right()) {
+        painter.setPen(QColor(255, 255, 0));
+        painter.drawLine(xCoordOf(CursorAPos, plotRect),plotRect.top(),xCoordOf(CursorAPos, plotRect),plotRect.bottom());
+    }
+    if (CursorBPos > GraphStart && xCoordOf(CursorBPos, plotRect) < plotRect.right()) {
+        painter.setPen(QColor(255, 0, 255));
+        painter.drawLine(xCoordOf(CursorBPos, plotRect),plotRect.top(),xCoordOf(CursorBPos, plotRect),plotRect.bottom());
+    }
+    if (CursorCPos > GraphStart && xCoordOf(CursorCPos, plotRect) < plotRect.right()) {
+        painter.setPen(QColor(255, 153, 0)); //orange
+        painter.drawLine(xCoordOf(CursorCPos, plotRect),plotRect.top(),xCoordOf(CursorCPos, plotRect),plotRect.bottom());
+    }
+    if (CursorDPos > GraphStart && xCoordOf(CursorDPos, plotRect) < plotRect.right()) {
+        painter.setPen(QColor(0, 0, 205)); //light blue
+        painter.drawLine(xCoordOf(CursorDPos, plotRect),plotRect.top(),xCoordOf(CursorDPos, plotRect),plotRect.bottom());
+    }
 
-	//Draw annotations
-	char str[200];
-	sprintf(str, "@%d  dt=%d [%2.2f] zoom=%2.2f  CursorAPos=%d  CursorBPos=%d  GridX=%d  GridY=%d (%s) GridXoffset=%d",
-			GraphStart,
-			CursorBPos - CursorAPos,
-			(CursorBPos - CursorAPos)/CursorScaleFactor,
-			GraphPixelsPerPoint,
-			CursorAPos,
-			CursorBPos,
-			PlotGridXdefault,
-			PlotGridYdefault,
-			GridLocked ? "Locked" : "Unlocked",
-			GridOffset
-		);
-	painter.setPen(QColor(255, 255, 255));
-	painter.drawText(20, infoRect.bottom() - 3, str);
+    //Draw annotations
+    char str[200];
+    sprintf(str, "@%d  dt=%d [%2.2f] zoom=%2.2f  CursorAPos=%d  CursorBPos=%d  GridX=%d  GridY=%d (%s) GridXoffset=%d",
+            GraphStart,
+            CursorBPos - CursorAPos,
+            (CursorBPos - CursorAPos)/CursorScaleFactor,
+            GraphPixelsPerPoint,
+            CursorAPos,
+            CursorBPos,
+            PlotGridXdefault,
+            PlotGridYdefault,
+            GridLocked ? "Locked" : "Unlocked",
+            GridOffset
+        );
+    painter.setPen(QColor(255, 255, 255));
+    painter.drawText(20, infoRect.bottom() - 3, str);
 }
 
 Plot::Plot(QWidget *parent) : QWidget(parent), GraphStart(0), GraphPixelsPerPoint(1)
 {
-	//Need to set this, otherwise we don't receive keypress events
-	setFocusPolicy( Qt::StrongFocus);
-	resize(400, 200);
+    //Need to set this, otherwise we don't receive keypress events
+    setFocusPolicy( Qt::StrongFocus);
+    resize(400, 200);
 
-	QPalette palette(QColor(0,0,0,0));
-	palette.setColor(QPalette::WindowText, QColor(255,255,255));
-	palette.setColor(QPalette::Text, QColor(255,255,255));
-	palette.setColor(QPalette::Button, QColor(100, 100, 100));
-	setPalette(palette);
-	setAutoFillBackground(true);
-	CursorAPos = 0;
-	CursorBPos = 0;
+    QPalette palette(QColor(0,0,0,0));
+    palette.setColor(QPalette::WindowText, QColor(255,255,255));
+    palette.setColor(QPalette::Text, QColor(255,255,255));
+    palette.setColor(QPalette::Button, QColor(100, 100, 100));
+    setPalette(palette);
+    setAutoFillBackground(true);
+    CursorAPos = 0;
+    CursorBPos = 0;
 
-	setWindowTitle(tr("Sliders"));
+    setWindowTitle(tr("Sliders"));
 
-	master = parent;
+    master = parent;
 }
 
 void Plot::closeEvent(QCloseEvent *event)
 {
-	event->ignore();
-	this->hide();
-	g_useOverlays = false;
+    event->ignore();
+    this->hide();
+    g_useOverlays = false;
 }
 
 void Plot::mouseMoveEvent(QMouseEvent *event)
 {
-	int x = event->x();
-	x -= WIDTH_AXES;
-	x = (int)(x / GraphPixelsPerPoint);
-	x += GraphStart;
-	if ((event->buttons() & Qt::LeftButton)) {
-		CursorAPos = x;
-	} else if (event->buttons() & Qt::RightButton) {
-		CursorBPos = x;
-	}
-	this->update();
+    int x = event->x();
+    x -= WIDTH_AXES;
+    x = (int)(x / GraphPixelsPerPoint);
+    x += GraphStart;
+    if ((event->buttons() & Qt::LeftButton)) {
+        CursorAPos = x;
+    } else if (event->buttons() & Qt::RightButton) {
+        CursorBPos = x;
+    }
+    this->update();
 }
 
 void Plot::keyPressEvent(QKeyEvent *event)
 {
-	int	offset;
+    int offset;
 
-	if (event->modifiers() & Qt::ShiftModifier) {
-		if (PlotGridX)
-			offset = PageWidth - (PageWidth % PlotGridX);
-		else
-			offset = PageWidth;
-	} else {
-		if (event->modifiers() & Qt::ControlModifier)
-			offset = 1;
-		else
-			offset = (int)(20 / GraphPixelsPerPoint);
-	}
+    if (event->modifiers() & Qt::ShiftModifier) {
+        if (PlotGridX)
+            offset = PageWidth - (PageWidth % PlotGridX);
+        else
+            offset = PageWidth;
+    } else {
+        if (event->modifiers() & Qt::ControlModifier)
+            offset = 1;
+        else
+            offset = (int)(20 / GraphPixelsPerPoint);
+    }
 
-	switch(event->key()) {
-		case Qt::Key_Down:
-			if (GraphPixelsPerPoint <= 50) {
-				GraphPixelsPerPoint *= 2;
-			}
-			break;
+    switch(event->key()) {
+        case Qt::Key_Down:
+            if (GraphPixelsPerPoint <= 50) {
+                GraphPixelsPerPoint *= 2;
+            }
+            break;
 
-		case Qt::Key_Up:
-			if (GraphPixelsPerPoint >= 0.02) {
-				GraphPixelsPerPoint /= 2;
-			}
-			break;
+        case Qt::Key_Up:
+            if (GraphPixelsPerPoint >= 0.02) {
+                GraphPixelsPerPoint /= 2;
+            }
+            break;
 
-		case Qt::Key_Right:
-			if (GraphPixelsPerPoint < 20) {
-				GraphStart += offset;
-			} else {
-				GraphStart++;
-			}
-			break;
+        case Qt::Key_Right:
+            if (GraphPixelsPerPoint < 20) {
+                GraphStart += offset;
+            } else {
+                GraphStart++;
+            }
+            break;
 
-		case Qt::Key_Left:
-			if (GraphPixelsPerPoint < 20) {
-				GraphStart -= offset;
-			} else {
-				GraphStart--;
-			}
-			break;
+        case Qt::Key_Left:
+            if (GraphPixelsPerPoint < 20) {
+                GraphStart -= offset;
+            } else {
+                GraphStart--;
+            }
+            break;
 
-		case Qt::Key_G:
-			if (PlotGridX || PlotGridY) {
-				PlotGridX = 0;
-				PlotGridY = 0;
-			} else {
-				if ( PlotGridXdefault < 0  )
-					PlotGridXdefault = 64;
-				if ( PlotGridYdefault < 0 )
-					PlotGridYdefault = 0;
+        case Qt::Key_G:
+            if (PlotGridX || PlotGridY) {
+                PlotGridX = 0;
+                PlotGridY = 0;
+            } else {
+                if ( PlotGridXdefault < 0  )
+                    PlotGridXdefault = 64;
+                if ( PlotGridYdefault < 0 )
+                    PlotGridYdefault = 0;
 
-				PlotGridX = PlotGridXdefault;
-				PlotGridY = PlotGridYdefault;
-			}
-			break;
+                PlotGridX = PlotGridXdefault;
+                PlotGridY = PlotGridYdefault;
+            }
+            break;
 
-		case Qt::Key_H:
+        case Qt::Key_H:
 
-			puts("\n-----------------------------------------------------------------------");
-			puts("PLOT window keystrokes");
-			puts("\tKey                      Action");
-			puts("-----------------------------------------------------------------------");
-			puts("\tUP                       Zoom out");
-			puts("\tDOWN                     Zoom in");
-			puts("\tG                        Toggle grid display");
-			puts("\tH                        Show help");
-			puts("\tL                        Toggle lock grid relative to samples");
-			puts("\tQ                        Hide window");
-			puts("\tLEFT                     Move left");
-			puts("\t<CTLR> LEFT              Move left 1 sample");
-			puts("\t<SHIFT> LEFT             Page left");
-			puts("\tLEFT MOUSE CLICK         Set yellow cursor");
-			puts("\tRIGHT                    Move right");
-			puts("\t<CTLR> RIGHT             Move right 1 sample");
-			puts("\t<SHIFT> RIGHT            Page right");
-			puts("\tRIGHT MOUSE CLICK        Set purple cursor");
-			puts("-----------------------------------------------------------------------");
-			break;
+            puts("\n-----------------------------------------------------------------------");
+            puts("PLOT window keystrokes");
+            puts("\tKey                      Action");
+            puts("-----------------------------------------------------------------------");
+            puts("\tUP                       Zoom out");
+            puts("\tDOWN                     Zoom in");
+            puts("\tG                        Toggle grid display");
+            puts("\tH                        Show help");
+            puts("\tL                        Toggle lock grid relative to samples");
+            puts("\tQ                        Hide window");
+            puts("\tLEFT                     Move left");
+            puts("\t<CTLR> LEFT              Move left 1 sample");
+            puts("\t<SHIFT> LEFT             Page left");
+            puts("\tLEFT MOUSE CLICK         Set yellow cursor");
+            puts("\tRIGHT                    Move right");
+            puts("\t<CTLR> RIGHT             Move right 1 sample");
+            puts("\t<SHIFT> RIGHT            Page right");
+            puts("\tRIGHT MOUSE CLICK        Set purple cursor");
+            puts("-----------------------------------------------------------------------");
+            break;
 
-		case Qt::Key_L:
-			GridLocked = !GridLocked;
-			if (GridLocked)
-				GridOffset += (GraphStart - unlockStart);
-			else
-				unlockStart = GraphStart;
-			break;
+        case Qt::Key_L:
+            GridLocked = !GridLocked;
+            if (GridLocked)
+                GridOffset += (GraphStart - unlockStart);
+            else
+                unlockStart = GraphStart;
+            break;
 
-		case Qt::Key_Q:
-			master->hide();
-			break;
+        case Qt::Key_Q:
+            master->hide();
+            break;
 
-		default:
-			QWidget::keyPressEvent(event);
-			return;
-			break;
-	}
+        default:
+            QWidget::keyPressEvent(event);
+            return;
+            break;
+    }
 
-	this->update();
+    this->update();
 }
diff --git a/client/proxguiqt.h b/client/proxguiqt.h
index dbd2a9983..6ad6f4f7c 100644
--- a/client/proxguiqt.h
+++ b/client/proxguiqt.h
@@ -30,30 +30,30 @@ class ProxWidget;
  */
 class Plot: public QWidget
 {
-	private:
-		QWidget *master;
-		int GraphStart;
-		double GraphPixelsPerPoint;
-		int CursorAPos;
-		int CursorBPos;
-		void PlotGraph(int *buffer, int len, QRect r,QRect r2, QPainter* painter, int graphNum);
-		void PlotDemod(uint8_t *buffer, size_t len, QRect r,QRect r2, QPainter* painter, int graphNum, int plotOffset);
-		void plotGridLines(QPainter* painter,QRect r);
-		int xCoordOf(int i, QRect r );
-		int yCoordOf(int v, QRect r, int maxVal);
-		int valueOf_yCoord(int y, QRect r, int maxVal);
-		void setMaxAndStart(int *buffer, int len, QRect plotRect);
-		QColor getColor(int graphNum);
+    private:
+        QWidget *master;
+        int GraphStart;
+        double GraphPixelsPerPoint;
+        int CursorAPos;
+        int CursorBPos;
+        void PlotGraph(int *buffer, int len, QRect r,QRect r2, QPainter* painter, int graphNum);
+        void PlotDemod(uint8_t *buffer, size_t len, QRect r,QRect r2, QPainter* painter, int graphNum, int plotOffset);
+        void plotGridLines(QPainter* painter,QRect r);
+        int xCoordOf(int i, QRect r );
+        int yCoordOf(int v, QRect r, int maxVal);
+        int valueOf_yCoord(int y, QRect r, int maxVal);
+        void setMaxAndStart(int *buffer, int len, QRect plotRect);
+        QColor getColor(int graphNum);
 
-	public:
-		Plot(QWidget *parent = 0);
+    public:
+        Plot(QWidget *parent = 0);
 
-	protected:
-		void paintEvent(QPaintEvent *event);
-		void closeEvent(QCloseEvent *event);
-		void mouseMoveEvent(QMouseEvent *event);
-		void mousePressEvent(QMouseEvent *event) { mouseMoveEvent(event); }
-		void keyPressEvent(QKeyEvent *event);
+    protected:
+        void paintEvent(QPaintEvent *event);
+        void closeEvent(QCloseEvent *event);
+        void mouseMoveEvent(QMouseEvent *event);
+        void mousePressEvent(QMouseEvent *event) { mouseMoveEvent(event); }
+        void keyPressEvent(QKeyEvent *event);
 };
 class ProxGuiQT;
 
@@ -62,81 +62,81 @@ class ProxGuiQT;
  */
 class ProxWidget : public QWidget
 {
-	Q_OBJECT; //needed for slot/signal classes
+    Q_OBJECT; //needed for slot/signal classes
 
-	private:
-		ProxGuiQT *master;
-		Plot *plot;
-		Ui::Form *opsController;
-		QWidget* controlWidget;
+    private:
+        ProxGuiQT *master;
+        Plot *plot;
+        Ui::Form *opsController;
+        QWidget* controlWidget;
 
-	public:
-		ProxWidget(QWidget *parent = 0, ProxGuiQT *master = NULL);
-		~ProxWidget(void);
-		//OpsShow(void);
+    public:
+        ProxWidget(QWidget *parent = 0, ProxGuiQT *master = NULL);
+        ~ProxWidget(void);
+        //OpsShow(void);
 
-	protected:
-	//	void paintEvent(QPaintEvent *event);
-		void closeEvent(QCloseEvent *event);
-		void showEvent(QShowEvent *event);
-		void hideEvent(QHideEvent *event);
-	//	void mouseMoveEvent(QMouseEvent *event);
-	//	void mousePressEvent(QMouseEvent *event) { mouseMoveEvent(event); }
-	//	void keyPressEvent(QKeyEvent *event);
-	public slots:
-		void applyOperation();
-		void stickOperation();
-		void vchange_autocorr(int v);
-		void vchange_askedge(int v);
-		void vchange_dthr_up(int v);
-		void vchange_dthr_down(int v);
+    protected:
+    //  void paintEvent(QPaintEvent *event);
+        void closeEvent(QCloseEvent *event);
+        void showEvent(QShowEvent *event);
+        void hideEvent(QHideEvent *event);
+    //  void mouseMoveEvent(QMouseEvent *event);
+    //  void mousePressEvent(QMouseEvent *event) { mouseMoveEvent(event); }
+    //  void keyPressEvent(QKeyEvent *event);
+    public slots:
+        void applyOperation();
+        void stickOperation();
+        void vchange_autocorr(int v);
+        void vchange_askedge(int v);
+        void vchange_dthr_up(int v);
+        void vchange_dthr_down(int v);
 };
 
 class WorkerThread : public QThread {
-		Q_OBJECT;
-	public:
-		WorkerThread(char*, char*, bool);
-		~WorkerThread();
-		void run();
-	private:
-		char *script_cmds_file = NULL;
-		char *script_cmd = NULL;
-		bool usb_present;
+        Q_OBJECT;
+    public:
+        WorkerThread(char*, char*, bool);
+        ~WorkerThread();
+        void run();
+    private:
+        char *script_cmds_file = NULL;
+        char *script_cmd = NULL;
+        bool usb_present;
 };
 
 class ProxGuiQT : public QObject
 {
-	Q_OBJECT;
+    Q_OBJECT;
 
-	private:
-		QApplication *plotapp;
-		ProxWidget *plotwidget;
-		int argc;
-		char **argv;
-		//void (*main_func)(void);
-		WorkerThread *proxmarkThread;
+    private:
+        QApplication *plotapp;
+        ProxWidget *plotwidget;
+        int argc;
+        char **argv;
+        //void (*main_func)(void);
+        WorkerThread *proxmarkThread;
 
-	public:
-		ProxGuiQT(int argc, char **argv, WorkerThread *wthread);
-		~ProxGuiQT(void);
-		void ShowGraphWindow(void);
-		void RepaintGraphWindow(void);
-		void HideGraphWindow(void);
-		void MainLoop(void);
-		void Exit(void);
+    public:
+        ProxGuiQT(int argc, char **argv, WorkerThread *wthread);
+        ~ProxGuiQT(void);
+        void ShowGraphWindow(void);
+        void RepaintGraphWindow(void);
+        void HideGraphWindow(void);
+        void MainLoop(void);
+        void Exit(void);
 
-	private slots:
-		void _ShowGraphWindow(void);
-		void _RepaintGraphWindow(void);
-		void _HideGraphWindow(void);
-		void _Exit(void);
-		void _StartProxmarkThread(void);
+    private slots:
+        void _ShowGraphWindow(void);
+        void _RepaintGraphWindow(void);
+        void _HideGraphWindow(void);
+        void _Exit(void);
+        void _StartProxmarkThread(void);
 
-	signals:
-		void ShowGraphWindowSignal(void);
-		void RepaintGraphWindowSignal(void);
-		void HideGraphWindowSignal(void);
-		void ExitSignal(void);
+    signals:
+        void ShowGraphWindowSignal(void);
+        void RepaintGraphWindowSignal(void);
+        void HideGraphWindowSignal(void);
+        void ExitSignal(void);
 };
 
 #endif // PROXGUI_QT
diff --git a/client/proxmark3.c b/client/proxmark3.c
index 45ed2b47a..f931ef9af 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -30,17 +30,17 @@
 
 #if defined(__linux__) || (__APPLE__)
 static void showBanner(void){
-	printf("\n\n");
-	printf("\e[34m██████╗ ███╗   ███╗ ████╗\e[0m     ...iceman fork\n");
-	printf("\e[34m██╔══██╗████╗ ████║   ══█║\e[0m      ...dedicated to \e[34mRDV40\e[0m\n");
-	printf("\e[34m██████╔╝██╔████╔██║ ████╔╝\e[0m\n");
-	printf("\e[34m██╔═══╝ ██║╚██╔╝██║   ══█║\e[0m    iceman@icesql.net\n");
-	printf("\e[34m██║     ██║ ╚═╝ ██║ ████╔╝\e[0m  https://github.com/iceman1001/proxmark3\n");
-	printf("\e[34m╚═╝     ╚═╝     ╚═╝ ╚═══╝\e[0m pre v4.0\n");
-	printf("\nKeep iceman fork alive with a donation!           https://paypal.me/iceman1001/");
-	printf("\nMONERO: 43mNJLpgBVaTvyZmX9ajcohpvVkaRy1kbZPm8tqAb7itZgfuYecgkRF36rXrKFUkwEGeZedPsASRxgv4HPBHvJwyJdyvQuP");
-	printf("\n\n\n");
-	fflush(stdout);
+    printf("\n\n");
+    printf("\e[34m██████╗ ███╗   ███╗ ████╗\e[0m     ...iceman fork\n");
+    printf("\e[34m██╔══██╗████╗ ████║   ══█║\e[0m      ...dedicated to \e[34mRDV40\e[0m\n");
+    printf("\e[34m██████╔╝██╔████╔██║ ████╔╝\e[0m\n");
+    printf("\e[34m██╔═══╝ ██║╚██╔╝██║   ══█║\e[0m    iceman@icesql.net\n");
+    printf("\e[34m██║     ██║ ╚═╝ ██║ ████╔╝\e[0m  https://github.com/iceman1001/proxmark3\n");
+    printf("\e[34m╚═╝     ╚═╝     ╚═╝ ╚═══╝\e[0m pre v4.0\n");
+    printf("\nKeep iceman fork alive with a donation!           https://paypal.me/iceman1001/");
+    printf("\nMONERO: 43mNJLpgBVaTvyZmX9ajcohpvVkaRy1kbZPm8tqAb7itZgfuYecgkRF36rXrKFUkwEGeZedPsASRxgv4HPBHvJwyJdyvQuP");
+    printf("\n\n\n");
+    fflush(stdout);
 }
 #endif
 
@@ -52,338 +52,338 @@ __attribute__((force_align_arg_pointer))
 #endif
 main_loop(char *script_cmds_file, char *script_cmd, bool usb_present) {
 
-	char *cmd = NULL;
-	bool execCommand = (script_cmd != NULL);
-	bool stdinOnPipe = !isatty(STDIN_FILENO);
-	FILE *sf = NULL;
-	char script_cmd_buf[256] = {0x00};  // iceman, needs lua script the same file_path_buffer as the rest
+    char *cmd = NULL;
+    bool execCommand = (script_cmd != NULL);
+    bool stdinOnPipe = !isatty(STDIN_FILENO);
+    FILE *sf = NULL;
+    char script_cmd_buf[256] = {0x00};  // iceman, needs lua script the same file_path_buffer as the rest
 
-	PrintAndLogEx(DEBUG, "ISATTY/STDIN_FILENO == %s\n", (stdinOnPipe) ? "true" : "false");
+    PrintAndLogEx(DEBUG, "ISATTY/STDIN_FILENO == %s\n", (stdinOnPipe) ? "true" : "false");
 
-	if (usb_present) {
-		SetOffline(false);
-		// cache Version information now:
-		if ( execCommand || script_cmds_file || stdinOnPipe)
-			CmdVersion("s");
-		else
-			CmdVersion("");
-	} else {
-		SetOffline(true);
-	}
+    if (usb_present) {
+        SetOffline(false);
+        // cache Version information now:
+        if ( execCommand || script_cmds_file || stdinOnPipe)
+            CmdVersion("s");
+        else
+            CmdVersion("");
+    } else {
+        SetOffline(true);
+    }
 
-	if (script_cmds_file) {
+    if (script_cmds_file) {
 
-		sf = fopen(script_cmds_file, "r");
-		if (sf)
-			PrintAndLogEx(SUCCESS, "executing commands from file: %s\n", script_cmds_file);
-	}
+        sf = fopen(script_cmds_file, "r");
+        if (sf)
+            PrintAndLogEx(SUCCESS, "executing commands from file: %s\n", script_cmds_file);
+    }
 
-	read_history(".history");
+    read_history(".history");
 
-	// loops every time enter is pressed...
-	while (1) {
+    // loops every time enter is pressed...
+    while (1) {
 
-		// this should hook up the PM3 again.
-		/*
-		if ( IsOffline() ) {
+        // this should hook up the PM3 again.
+        /*
+        if ( IsOffline() ) {
 
-			// sets the global variable, SP and offline)
-			usb_present = hookUpPM3();
+            // sets the global variable, SP and offline)
+            usb_present = hookUpPM3();
 
-			// usb and the reader_thread is NULL,  create a new reader thread.
-			if (usb_present && !IsOffline() ) {
-				rarg.run = 1;
-				pthread_create(&reader_thread, NULL, &uart_receiver, &rarg);
-				// cache Version information now:
-				if ( execCommand || script_cmds_file || stdinOnPipe)
-					CmdVersion("s");
-				else
-					CmdVersion("");
-			}
-		}
-		*/
+            // usb and the reader_thread is NULL,  create a new reader thread.
+            if (usb_present && !IsOffline() ) {
+                rarg.run = 1;
+                pthread_create(&reader_thread, NULL, &uart_receiver, &rarg);
+                // cache Version information now:
+                if ( execCommand || script_cmds_file || stdinOnPipe)
+                    CmdVersion("s");
+                else
+                    CmdVersion("");
+            }
+        }
+        */
 
-		// If there is a script file
-		if (sf) {
+        // If there is a script file
+        if (sf) {
 
-			// clear array
-			memset(script_cmd_buf, 0, sizeof(script_cmd_buf));
+            // clear array
+            memset(script_cmd_buf, 0, sizeof(script_cmd_buf));
 
-			// read script file
-			if (!fgets(script_cmd_buf, sizeof(script_cmd_buf), sf)) {
-				fclose(sf);
-				sf = NULL;
-			} else {
+            // read script file
+            if (!fgets(script_cmd_buf, sizeof(script_cmd_buf), sf)) {
+                fclose(sf);
+                sf = NULL;
+            } else {
 
-				// remove linebreaks
-				strcleanrn(script_cmd_buf, sizeof(script_cmd_buf));
+                // remove linebreaks
+                strcleanrn(script_cmd_buf, sizeof(script_cmd_buf));
 
-				if ((cmd = strmcopy(script_cmd_buf)) != NULL)
-					PrintAndLogEx(NORMAL, PROXPROMPT"%s\n", cmd);
-			}
-		} else {
-			// If there is a script command
-			if (execCommand){
+                if ((cmd = strmcopy(script_cmd_buf)) != NULL)
+                    PrintAndLogEx(NORMAL, PROXPROMPT"%s\n", cmd);
+            }
+        } else {
+            // If there is a script command
+            if (execCommand){
 
-				if ((cmd = strmcopy(script_cmd)) != NULL)
-					PrintAndLogEx(NORMAL, PROXPROMPT"%s", cmd);
+                if ((cmd = strmcopy(script_cmd)) != NULL)
+                    PrintAndLogEx(NORMAL, PROXPROMPT"%s", cmd);
 
-				execCommand = false;
-			} else {
-				// exit after exec command
-				if (script_cmd)
-					break;
+                execCommand = false;
+            } else {
+                // exit after exec command
+                if (script_cmd)
+                    break;
 
-				// if there is a pipe from stdin
-				if (stdinOnPipe) {
+                // if there is a pipe from stdin
+                if (stdinOnPipe) {
 
-					// clear array
-					memset(script_cmd_buf, 0, sizeof(script_cmd_buf));
-					// get
-					if (!fgets(script_cmd_buf, sizeof(script_cmd_buf), stdin)) {
-						PrintAndLogEx(ERR, "STDIN unexpected end, exit...");
-						break;
-					}
-					// remove linebreaks
-					strcleanrn(script_cmd_buf, sizeof(script_cmd_buf));
+                    // clear array
+                    memset(script_cmd_buf, 0, sizeof(script_cmd_buf));
+                    // get
+                    if (!fgets(script_cmd_buf, sizeof(script_cmd_buf), stdin)) {
+                        PrintAndLogEx(ERR, "STDIN unexpected end, exit...");
+                        break;
+                    }
+                    // remove linebreaks
+                    strcleanrn(script_cmd_buf, sizeof(script_cmd_buf));
 
-					if ((cmd = strmcopy(script_cmd_buf)) != NULL)
-						PrintAndLogEx(NORMAL, PROXPROMPT"%s", cmd);
+                    if ((cmd = strmcopy(script_cmd_buf)) != NULL)
+                        PrintAndLogEx(NORMAL, PROXPROMPT"%s", cmd);
 
-				} else {
-					cmd = readline(PROXPROMPT);
-					fflush(NULL);
-				}
-			}
-		}
+                } else {
+                    cmd = readline(PROXPROMPT);
+                    fflush(NULL);
+                }
+            }
+        }
 
-		// execute command
-		if (cmd) {
+        // execute command
+        if (cmd) {
 
-			// rtrim
-			size_t l = strlen(cmd);
-			if ( l > 0 && isspace(cmd[l - 1]))
-				cmd[l-1] = 0x00;
+            // rtrim
+            size_t l = strlen(cmd);
+            if ( l > 0 && isspace(cmd[l - 1]))
+                cmd[l-1] = 0x00;
 
-			if (cmd[0] != 0x00) {
-				int ret = CommandReceived(cmd);
-				HIST_ENTRY * entry = history_get(history_length);
-				if ((!entry) || (strcmp(entry->line, cmd) != 0))
-					add_history(cmd);
+            if (cmd[0] != 0x00) {
+                int ret = CommandReceived(cmd);
+                HIST_ENTRY * entry = history_get(history_length);
+                if ((!entry) || (strcmp(entry->line, cmd) != 0))
+                    add_history(cmd);
 
-				// exit or quit
-				if (ret == 99)
-					break;
-			}
-			free(cmd);
-			cmd = NULL;
-		} else {
-			PrintAndLogEx(NORMAL, "\n");
-			break;
-		}
-	} // end while
+                // exit or quit
+                if (ret == 99)
+                    break;
+            }
+            free(cmd);
+            cmd = NULL;
+        } else {
+            PrintAndLogEx(NORMAL, "\n");
+            break;
+        }
+    } // end while
 
-	if (sf)
-		fclose(sf);
+    if (sf)
+        fclose(sf);
 
-	write_history(".history");
+    write_history(".history");
 
-	if (cmd) {
-		free(cmd);
-		cmd = NULL;
-	}
+    if (cmd) {
+        free(cmd);
+        cmd = NULL;
+    }
 }
 
 static void dumpAllHelp(int markdown) {
-	PrintAndLogEx(NORMAL, "\n%sProxmark3 command dump%s\n\n", markdown ? "# " : "", markdown ? "" : "\n======================");
-	PrintAndLogEx(NORMAL, "Some commands are available only if a Proxmark is actually connected.%s\n", markdown ? "  " : "");
-	PrintAndLogEx(NORMAL, "Check column \"offline\" for their availability.\n");
-	PrintAndLogEx(NORMAL, "\n");
-	command_t *cmds = getTopLevelCommandTable();
-	dumpCommandsRecursive(cmds, markdown);
+    PrintAndLogEx(NORMAL, "\n%sProxmark3 command dump%s\n\n", markdown ? "# " : "", markdown ? "" : "\n======================");
+    PrintAndLogEx(NORMAL, "Some commands are available only if a Proxmark is actually connected.%s\n", markdown ? "  " : "");
+    PrintAndLogEx(NORMAL, "Check column \"offline\" for their availability.\n");
+    PrintAndLogEx(NORMAL, "\n");
+    command_t *cmds = getTopLevelCommandTable();
+    dumpCommandsRecursive(cmds, markdown);
 }
 
 static char *my_executable_path = NULL;
 static char *my_executable_directory = NULL;
 
 const char *get_my_executable_path(void) {
-	return my_executable_path;
+    return my_executable_path;
 }
 
 const char *get_my_executable_directory(void) {
-	return my_executable_directory;
+    return my_executable_directory;
 }
 
 static void set_my_executable_path(void) {
-	int path_length = wai_getExecutablePath(NULL, 0, NULL);
-	if (path_length != -1) {
-		my_executable_path = (char*)calloc(path_length + 1, sizeof(uint8_t));
-		int dirname_length = 0;
-		if (wai_getExecutablePath(my_executable_path, path_length, &dirname_length) != -1) {
-			my_executable_path[path_length] = '\0';
-			my_executable_directory = (char *)calloc(dirname_length + 2, sizeof(uint8_t));
-			strncpy(my_executable_directory, my_executable_path, dirname_length+1);
-			my_executable_directory[dirname_length+1] = '\0';
-		}
-	}
+    int path_length = wai_getExecutablePath(NULL, 0, NULL);
+    if (path_length != -1) {
+        my_executable_path = (char*)calloc(path_length + 1, sizeof(uint8_t));
+        int dirname_length = 0;
+        if (wai_getExecutablePath(my_executable_path, path_length, &dirname_length) != -1) {
+            my_executable_path[path_length] = '\0';
+            my_executable_directory = (char *)calloc(dirname_length + 2, sizeof(uint8_t));
+            strncpy(my_executable_directory, my_executable_path, dirname_length+1);
+            my_executable_directory[dirname_length+1] = '\0';
+        }
+    }
 }
 
 static void show_help(bool showFullHelp, char *command_line){
-	PrintAndLogEx(NORMAL, "syntax: %s <port> [-h | -help | -m | -f | -flush | -w | -wait | -c | -command | -l | -lua] [cmd_script_file_name] [command][lua_script_name]\n", command_line);
-	PrintAndLogEx(NORMAL, "\texample:'%s "SERIAL_PORT_H"'\n\n", command_line);
+    PrintAndLogEx(NORMAL, "syntax: %s <port> [-h | -help | -m | -f | -flush | -w | -wait | -c | -command | -l | -lua] [cmd_script_file_name] [command][lua_script_name]\n", command_line);
+    PrintAndLogEx(NORMAL, "\texample:'%s "SERIAL_PORT_H"'\n\n", command_line);
 
-	if (showFullHelp){
-		PrintAndLogEx(NORMAL, "help: <-h|-help> Dump all interactive command's help at once.\n");
-		PrintAndLogEx(NORMAL, "\t%s  -h\n\n", command_line);
-		PrintAndLogEx(NORMAL, "markdown: <-m> Dump all interactive help at once in markdown syntax\n");
-		PrintAndLogEx(NORMAL, "\t%s -m\n\n", command_line);
-		PrintAndLogEx(NORMAL, "flush: <-f|-flush> Output will be flushed after every print.\n");
-		PrintAndLogEx(NORMAL, "\t%s -f\n\n", command_line);
-		PrintAndLogEx(NORMAL, "wait: <-w|-wait> 20sec waiting the serial port to appear in the OS\n");
-		PrintAndLogEx(NORMAL, "\t%s "SERIAL_PORT_H" -w\n\n", command_line);
-		PrintAndLogEx(NORMAL, "script: A script file with one proxmark3 command per line.\n\n");
-		PrintAndLogEx(NORMAL, "command: <-c|-command> Execute one proxmark3 command.\n");
-		PrintAndLogEx(NORMAL, "\t%s "SERIAL_PORT_H" -c \"hf mf chk 1* ?\"\n", command_line);
-		PrintAndLogEx(NORMAL, "\t%s "SERIAL_PORT_H" -command \"hf mf nested 1 *\"\n\n", command_line);
-		PrintAndLogEx(NORMAL, "lua: <-l|-lua> Execute lua script.\n");
-		PrintAndLogEx(NORMAL, "\t%s "SERIAL_PORT_H" -l hf_read\n\n", command_line);
-	}
+    if (showFullHelp){
+        PrintAndLogEx(NORMAL, "help: <-h|-help> Dump all interactive command's help at once.\n");
+        PrintAndLogEx(NORMAL, "\t%s  -h\n\n", command_line);
+        PrintAndLogEx(NORMAL, "markdown: <-m> Dump all interactive help at once in markdown syntax\n");
+        PrintAndLogEx(NORMAL, "\t%s -m\n\n", command_line);
+        PrintAndLogEx(NORMAL, "flush: <-f|-flush> Output will be flushed after every print.\n");
+        PrintAndLogEx(NORMAL, "\t%s -f\n\n", command_line);
+        PrintAndLogEx(NORMAL, "wait: <-w|-wait> 20sec waiting the serial port to appear in the OS\n");
+        PrintAndLogEx(NORMAL, "\t%s "SERIAL_PORT_H" -w\n\n", command_line);
+        PrintAndLogEx(NORMAL, "script: A script file with one proxmark3 command per line.\n\n");
+        PrintAndLogEx(NORMAL, "command: <-c|-command> Execute one proxmark3 command.\n");
+        PrintAndLogEx(NORMAL, "\t%s "SERIAL_PORT_H" -c \"hf mf chk 1* ?\"\n", command_line);
+        PrintAndLogEx(NORMAL, "\t%s "SERIAL_PORT_H" -command \"hf mf nested 1 *\"\n\n", command_line);
+        PrintAndLogEx(NORMAL, "lua: <-l|-lua> Execute lua script.\n");
+        PrintAndLogEx(NORMAL, "\t%s "SERIAL_PORT_H" -l hf_read\n\n", command_line);
+    }
 }
 
 int main(int argc, char* argv[]) {
-	srand(time(0));
+    srand(time(0));
 
-	bool usb_present = false;
-	bool waitCOMPort = false;
-	bool executeCommand = false;
-	bool addLuaExec = false;
-	char *script_cmds_file = NULL;
-	char *script_cmd = NULL;
+    bool usb_present = false;
+    bool waitCOMPort = false;
+    bool executeCommand = false;
+    bool addLuaExec = false;
+    char *script_cmds_file = NULL;
+    char *script_cmd = NULL;
 
-	 /* initialize history */
-	using_history();
+     /* initialize history */
+    using_history();
 
 #ifdef RL_STATE_READCMD
-  	rl_extend_line_buffer(1024);
+    rl_extend_line_buffer(1024);
 #endif
 
-	if (argc < 2) {
-		show_help(true, argv[0]);
-		return 1;
-	}
+    if (argc < 2) {
+        show_help(true, argv[0]);
+        return 1;
+    }
 
-	for (int i = 1; i < argc; i++) {
+    for (int i = 1; i < argc; i++) {
 
-		// helptext
-		if (strcmp(argv[i], "-h") == 0 || strcmp(argv[i], "-help") == 0) {
-			show_help(false, argv[0]);
-			dumpAllHelp(0);
-			return 0;
-		}
+        // helptext
+        if (strcmp(argv[i], "-h") == 0 || strcmp(argv[i], "-help") == 0) {
+            show_help(false, argv[0]);
+            dumpAllHelp(0);
+            return 0;
+        }
 
-		// dump markup
-		if (strcmp(argv[i], "-m") == 0) {
-			dumpAllHelp(1);
-			return 0;
-		}
+        // dump markup
+        if (strcmp(argv[i], "-m") == 0) {
+            dumpAllHelp(1);
+            return 0;
+        }
 
-		// flush output
-		if (strcmp(argv[i], "-f") == 0 || strcmp(argv[i], "-flush") == 0){
-			SetFlushAfterWrite(true);
-			PrintAndLogEx(INFO, "Output will be flushed after every print.\n");
-		}
+        // flush output
+        if (strcmp(argv[i], "-f") == 0 || strcmp(argv[i], "-flush") == 0){
+            SetFlushAfterWrite(true);
+            PrintAndLogEx(INFO, "Output will be flushed after every print.\n");
+        }
 
-		// wait for comport
-		if (strcmp(argv[i], "-w") == 0 || strcmp(argv[i], "-wait") == 0){
-			waitCOMPort = true;
-		}
+        // wait for comport
+        if (strcmp(argv[i], "-w") == 0 || strcmp(argv[i], "-wait") == 0){
+            waitCOMPort = true;
+        }
 
-		// execute pm3 command
-		if (strcmp(argv[i], "-c") == 0 || strcmp(argv[i], "-command") == 0){
-			executeCommand = true;
-		}
+        // execute pm3 command
+        if (strcmp(argv[i], "-c") == 0 || strcmp(argv[i], "-command") == 0){
+            executeCommand = true;
+        }
 
-		// execute lua script
-		if (strcmp(argv[i], "-l") == 0 || strcmp(argv[i], "-lua") == 0){
-			executeCommand = true;
-			addLuaExec = true;
-		}
-	}
+        // execute lua script
+        if (strcmp(argv[i], "-l") == 0 || strcmp(argv[i], "-lua") == 0){
+            executeCommand = true;
+            addLuaExec = true;
+        }
+    }
 
-	// If the user passed the filename of the 'script' to execute, get it from last parameter
-	if (argc > 2 && argv[argc - 1] && argv[argc - 1][0] != '-') {
-		if (executeCommand){
-			script_cmd = argv[argc - 1];
+    // If the user passed the filename of the 'script' to execute, get it from last parameter
+    if (argc > 2 && argv[argc - 1] && argv[argc - 1][0] != '-') {
+        if (executeCommand){
+            script_cmd = argv[argc - 1];
 
-			while (script_cmd[strlen(script_cmd) - 1] == ' ')
-				script_cmd[strlen(script_cmd) - 1] = 0x00;
+            while (script_cmd[strlen(script_cmd) - 1] == ' ')
+                script_cmd[strlen(script_cmd) - 1] = 0x00;
 
-			if (strlen(script_cmd) == 0) {
-				script_cmd = NULL;
-			} else {
-				if (addLuaExec){
-					// add "script run " to command
-					int len = strlen(script_cmd) + 11 + 1;
-					char *ctmp = (char*) calloc(len, sizeof(uint8_t));
-					if (ctmp != NULL) {
-						memset(ctmp, 0, len);
-						strcpy(ctmp, "script run ");
-						strcpy(&ctmp[11], script_cmd);
-						script_cmd = ctmp;
-					}
-				}
+            if (strlen(script_cmd) == 0) {
+                script_cmd = NULL;
+            } else {
+                if (addLuaExec){
+                    // add "script run " to command
+                    int len = strlen(script_cmd) + 11 + 1;
+                    char *ctmp = (char*) calloc(len, sizeof(uint8_t));
+                    if (ctmp != NULL) {
+                        memset(ctmp, 0, len);
+                        strcpy(ctmp, "script run ");
+                        strcpy(&ctmp[11], script_cmd);
+                        script_cmd = ctmp;
+                    }
+                }
 
-				PrintAndLogEx(SUCCESS, "execute command from commandline: %s\n", script_cmd);
-			}
-		} else {
-			script_cmds_file = argv[argc - 1];
-		}
-	}
+                PrintAndLogEx(SUCCESS, "execute command from commandline: %s\n", script_cmd);
+            }
+        } else {
+            script_cmds_file = argv[argc - 1];
+        }
+    }
 
-	// check command
-	if (executeCommand && (!script_cmd || strlen(script_cmd) == 0)){
-		PrintAndLogEx(WARNING, "ERROR: execute command: command not found.\n");
-		return 2;
-	}
+    // check command
+    if (executeCommand && (!script_cmd || strlen(script_cmd) == 0)){
+        PrintAndLogEx(WARNING, "ERROR: execute command: command not found.\n");
+        return 2;
+    }
 
 #if defined(__linux__) || (__APPLE__)
 // ascii art doesn't work well on mingw :(
 
-	bool stdinOnPipe = !isatty(STDIN_FILENO);
-	if ( !executeCommand && !script_cmds_file && !stdinOnPipe )
-		showBanner();
+    bool stdinOnPipe = !isatty(STDIN_FILENO);
+    if ( !executeCommand && !script_cmds_file && !stdinOnPipe )
+        showBanner();
 #endif
 
-	// set global variables
-	set_my_executable_path();
+    // set global variables
+    set_my_executable_path();
 
-	// try to open USB connection to Proxmark
-	usb_present = OpenProxmark(argv[1], waitCOMPort, 20, false);
+    // try to open USB connection to Proxmark
+    usb_present = OpenProxmark(argv[1], waitCOMPort, 20, false);
 
 #ifdef HAVE_GUI
 
 #  ifdef _WIN32
-	InitGraphics(argc, argv, script_cmds_file, script_cmd, usb_present);
-	MainGraphics();
+    InitGraphics(argc, argv, script_cmds_file, script_cmd, usb_present);
+    MainGraphics();
 #  else
-	// for *nix distro's,  check enviroment variable to verify a display
-	char* display = getenv("DISPLAY");
-	if (display && strlen(display) > 1) {
-		InitGraphics(argc, argv, script_cmds_file, script_cmd, usb_present);
-		MainGraphics();
-	} else {
-		main_loop(script_cmds_file, script_cmd, usb_present);
-	}
+    // for *nix distro's,  check enviroment variable to verify a display
+    char* display = getenv("DISPLAY");
+    if (display && strlen(display) > 1) {
+        InitGraphics(argc, argv, script_cmds_file, script_cmd, usb_present);
+        MainGraphics();
+    } else {
+        main_loop(script_cmds_file, script_cmd, usb_present);
+    }
 #  endif
 
 #else
-	main_loop(script_cmds_file, script_cmd, usb_present);
+    main_loop(script_cmds_file, script_cmd, usb_present);
 #endif
 
- 	// Clean up the port
-	if (usb_present) {
-		CloseProxmark();
-	}
+    // Clean up the port
+    if (usb_present) {
+        CloseProxmark();
+    }
 
-	exit(0);
+    exit(0);
 }
diff --git a/client/reveng/bmpbit.c b/client/reveng/bmpbit.c
index b67334adf..9325b6d99 100644
--- a/client/reveng/bmpbit.c
+++ b/client/reveng/bmpbit.c
@@ -42,46 +42,46 @@ int bmpsub;
 
 void
 setbmp(void) {
-	/* Initialise BMP_BIT and BMP_SUB for the local architecture. */
-	bmp_t bmpmax = ~(bmp_t) 0;
+    /* Initialise BMP_BIT and BMP_SUB for the local architecture. */
+    bmp_t bmpmax = ~(bmp_t) 0;
 
-	bmpbit = 0; bmpsub = 1;
+    bmpbit = 0; bmpsub = 1;
 
-	while(bmpmax) {
-		bmpmax <<= 1;
-		++bmpbit;
-	}
+    while(bmpmax) {
+        bmpmax <<= 1;
+        ++bmpbit;
+    }
 
-	while((bmpsub | (bmpsub - 1)) < bmpbit - 1)
-		bmpsub <<= 1;
+    while((bmpsub | (bmpsub - 1)) < bmpbit - 1)
+        bmpsub <<= 1;
 }
 #endif
 
 #ifdef BMPTST
 int
 main(int argc, char *argv[]) {
-	/* check the compile-time bitmap width is correct, otherwise
-	 * searches run forever. */
+    /* check the compile-time bitmap width is correct, otherwise
+     * searches run forever. */
 #  if BMP_BIT > 0
-	setbmp();
-	if(BMP_BIT != bmpbit || BMP_SUB != bmpsub) {
-		fprintf(stderr,"reveng: configuration fault.  Update "
-			"config.h with these definitions and "
-			"recompile:\n"
-			"\t#define BMP_BIT   %d\n"
-			"\t#define BMP_SUB   %d\n",
-			bmpbit, bmpsub);
-		exit(EXIT_FAILURE);
-	}
+    setbmp();
+    if(BMP_BIT != bmpbit || BMP_SUB != bmpsub) {
+        fprintf(stderr,"reveng: configuration fault.  Update "
+            "config.h with these definitions and "
+            "recompile:\n"
+            "\t#define BMP_BIT   %d\n"
+            "\t#define BMP_SUB   %d\n",
+            bmpbit, bmpsub);
+        exit(EXIT_FAILURE);
+    }
 #  endif /* BMP_BIT > 0 */
-	/* check the bitmap constant macro */
-	if(~(bmp_t) 0 != ~BMP_C(0)) {
-		fprintf(stderr, "reveng: configuration fault.  Edit "
-			"the definition of BMP_C() in config.h to "
-			"match BMP_T and recompile.\n");
-		exit(EXIT_FAILURE);
-	}
-	exit(EXIT_SUCCESS);
+    /* check the bitmap constant macro */
+    if(~(bmp_t) 0 != ~BMP_C(0)) {
+        fprintf(stderr, "reveng: configuration fault.  Edit "
+            "the definition of BMP_C() in config.h to "
+            "match BMP_T and recompile.\n");
+        exit(EXIT_FAILURE);
+    }
+    exit(EXIT_SUCCESS);
 }
 
 #endif /* BMPTST */
diff --git a/client/reveng/cli.c b/client/reveng/cli.c
index 562b2d084..eb857e5b9 100644
--- a/client/reveng/cli.c
+++ b/client/reveng/cli.c
@@ -71,567 +71,567 @@ static void usage(void);
 static const char *myname = "reveng"; /* name of our program */
 
 int reveng_main(int argc, char *argv[]) {
-	/* Command-line interface for CRC RevEng.
-	 * Process options and switches in the argument list and
-	 * run the required function.
-	 */
+    /* Command-line interface for CRC RevEng.
+     * Process options and switches in the argument list and
+     * run the required function.
+     */
 
-	/* default values */
-	model_t model = MZERO;
-	int ibperhx = 8, obperhx = 8;
-	int rflags = 0, uflags = 0; /* search and UI flags */
+    /* default values */
+    model_t model = MZERO;
+    int ibperhx = 8, obperhx = 8;
+    int rflags = 0, uflags = 0; /* search and UI flags */
 
-	unsigned long width = 0UL;
-	int c, mode = 0, args, psets, pass;
-	poly_t apoly, crc, qpoly = PZERO, *apolys, *pptr = NULL, *qptr = NULL;
-	model_t pset = model, *candmods, *mptr;
-	char *string;
+    unsigned long width = 0UL;
+    int c, mode = 0, args, psets, pass;
+    poly_t apoly, crc, qpoly = PZERO, *apolys, *pptr = NULL, *qptr = NULL;
+    model_t pset = model, *candmods, *mptr;
+    char *string;
 
-	myname = argv[0];
+    myname = argv[0];
 
-	/* stdin must be binary */
+    /* stdin must be binary */
 #ifdef _WIN32
-	_setmode(STDIN_FILENO, _O_BINARY);
+    _setmode(STDIN_FILENO, _O_BINARY);
 #endif /* _WIN32 */
 
-	SETBMP();
+    SETBMP();
 
-//	pos=0; --- not in this ver of getopt
-	optind=1;
-	do {
-		c=getopt(argc, argv, "?A:BDFGLMP:SVXa:bcdefhi:k:lm:p:q:rstuvw:x:yz");
-		switch(c) {
-			case 'A': /* A: bits per output character */
-			case 'a': /* a: bits per character */
-				if((obperhx = atoi(optarg)) > BMP_BIT) {
-					fprintf(stderr,"%s: argument to -%c must be between 1 and %d\n", myname, c, BMP_BIT);
-					return 0;
-					//exit(EXIT_FAILURE);
-				}
-				if(c == 'a') ibperhx = obperhx;
-				break;
-			case 'b': /* b  big-endian (RefIn = false, RefOut = false ) */
-				model.flags &= ~P_REFIN;
-				rflags |= R_HAVERI;
-				/* fall through: */
-			case 'B': /* B  big-endian output (RefOut = false) */
-				model.flags &= ~P_REFOUT;
-				rflags |= R_HAVERO;
-				mnovel(&model);
-				/* fall through: */
-			case 'r': /* r  right-justified */
-				model.flags |= P_RTJUST;
-				break;
-			case 'c': /* c  calculate CRC */
-			case 'D': /* D  list primary model names */
-			case 'd': /* d  dump CRC model */
-			case 'e': /* e  echo arguments */
-			case 's': /* s  search for algorithm */
-			case 'v': /* v  calculate reversed CRC */
-				if(mode) {
-					fprintf(stderr,"%s: more than one mode switch specified.  Use %s -h for help.\n", myname, myname);
-					return 0;
-					//exit(EXIT_FAILURE);
-				}
-				mode = c;
-				break;
-			case 'F': /* F  skip preset model check pass */
+//  pos=0; --- not in this ver of getopt
+    optind=1;
+    do {
+        c=getopt(argc, argv, "?A:BDFGLMP:SVXa:bcdefhi:k:lm:p:q:rstuvw:x:yz");
+        switch(c) {
+            case 'A': /* A: bits per output character */
+            case 'a': /* a: bits per character */
+                if((obperhx = atoi(optarg)) > BMP_BIT) {
+                    fprintf(stderr,"%s: argument to -%c must be between 1 and %d\n", myname, c, BMP_BIT);
+                    return 0;
+                    //exit(EXIT_FAILURE);
+                }
+                if(c == 'a') ibperhx = obperhx;
+                break;
+            case 'b': /* b  big-endian (RefIn = false, RefOut = false ) */
+                model.flags &= ~P_REFIN;
+                rflags |= R_HAVERI;
+                /* fall through: */
+            case 'B': /* B  big-endian output (RefOut = false) */
+                model.flags &= ~P_REFOUT;
+                rflags |= R_HAVERO;
+                mnovel(&model);
+                /* fall through: */
+            case 'r': /* r  right-justified */
+                model.flags |= P_RTJUST;
+                break;
+            case 'c': /* c  calculate CRC */
+            case 'D': /* D  list primary model names */
+            case 'd': /* d  dump CRC model */
+            case 'e': /* e  echo arguments */
+            case 's': /* s  search for algorithm */
+            case 'v': /* v  calculate reversed CRC */
+                if(mode) {
+                    fprintf(stderr,"%s: more than one mode switch specified.  Use %s -h for help.\n", myname, myname);
+                    return 0;
+                    //exit(EXIT_FAILURE);
+                }
+                mode = c;
+                break;
+            case 'F': /* F  skip preset model check pass */
 #ifndef ALWPCK
-				uflags |= C_NOPCK;
+                uflags |= C_NOPCK;
 #endif
-				break;
-			case 'f': /* f  arguments are filenames */
-				uflags |= C_INFILE;
-				break;
-			case 'G': /* G  skip brute force search pass */
-				uflags |= C_NOBFS;
-				break;
-			case 'h': /* h  get help / usage */
-			case 'u': /* u  get help / usage */
-			case '?': /* ?  get help / usage */
-			default:
-				usage();
-				return 0;
-				//exit(EXIT_FAILURE);
-				break;
-			case 'i': /* i: Init value */
-				pptr = &model.init;
-				rflags |= R_HAVEI;
-				goto ipqx;
-			case 'k': /* k: polynomial in Koopman notation */
-			case 'P': /* P: reversed polynomial */
-				pfree(&model.spoly);
-				model.spoly = strtop(optarg, 0, 4);
-				pkchop(&model.spoly);
-				width = plen(model.spoly);
-				rflags |= R_HAVEP;
-				if(c == 'P')
-					prcp(&model.spoly);
-				mnovel(&model);
-				break;
-			case 'l': /* l  little-endian input and output */
-				model.flags |= P_REFIN;
-				rflags |= R_HAVERI;
-				/* fall through: */
-			case 'L': /* L  little-endian output */
-				model.flags |= P_REFOUT;
-				rflags |= R_HAVERO;
-				mnovel(&model);
-				/* fall through: */
-			case 't': /* t  left-justified */
-				model.flags &= ~P_RTJUST;
-				break;
-			case 'm': /* m: select preset CRC model */
-				if(!(c = mbynam(&model, optarg))) {
-					fprintf(stderr,"%s: preset model '%s' not found.  Use %s -D to list presets.\n", myname, optarg, myname);
-					return 0;
-					//exit(EXIT_FAILURE);
-				}
-				if(c < 0){
-					uerror("no preset models available");
-					return 0;
-				}
-				/* must set width so that parameter to -ipx is not zeroed */
-				width = plen(model.spoly);
-				rflags |= R_HAVEP | R_HAVEI | R_HAVERI | R_HAVERO | R_HAVEX;
-				break;
-			case 'M': /* M  non-augmenting algorithm */
-				model.flags &= ~P_MULXN;
-				break;
-			case 'p': /* p: polynomial */
-				pptr = &model.spoly;
-				rflags &= ~R_HAVEQ;
-				rflags |= R_HAVEP;
+                break;
+            case 'f': /* f  arguments are filenames */
+                uflags |= C_INFILE;
+                break;
+            case 'G': /* G  skip brute force search pass */
+                uflags |= C_NOBFS;
+                break;
+            case 'h': /* h  get help / usage */
+            case 'u': /* u  get help / usage */
+            case '?': /* ?  get help / usage */
+            default:
+                usage();
+                return 0;
+                //exit(EXIT_FAILURE);
+                break;
+            case 'i': /* i: Init value */
+                pptr = &model.init;
+                rflags |= R_HAVEI;
+                goto ipqx;
+            case 'k': /* k: polynomial in Koopman notation */
+            case 'P': /* P: reversed polynomial */
+                pfree(&model.spoly);
+                model.spoly = strtop(optarg, 0, 4);
+                pkchop(&model.spoly);
+                width = plen(model.spoly);
+                rflags |= R_HAVEP;
+                if(c == 'P')
+                    prcp(&model.spoly);
+                mnovel(&model);
+                break;
+            case 'l': /* l  little-endian input and output */
+                model.flags |= P_REFIN;
+                rflags |= R_HAVERI;
+                /* fall through: */
+            case 'L': /* L  little-endian output */
+                model.flags |= P_REFOUT;
+                rflags |= R_HAVERO;
+                mnovel(&model);
+                /* fall through: */
+            case 't': /* t  left-justified */
+                model.flags &= ~P_RTJUST;
+                break;
+            case 'm': /* m: select preset CRC model */
+                if(!(c = mbynam(&model, optarg))) {
+                    fprintf(stderr,"%s: preset model '%s' not found.  Use %s -D to list presets.\n", myname, optarg, myname);
+                    return 0;
+                    //exit(EXIT_FAILURE);
+                }
+                if(c < 0){
+                    uerror("no preset models available");
+                    return 0;
+                }
+                /* must set width so that parameter to -ipx is not zeroed */
+                width = plen(model.spoly);
+                rflags |= R_HAVEP | R_HAVEI | R_HAVERI | R_HAVERO | R_HAVEX;
+                break;
+            case 'M': /* M  non-augmenting algorithm */
+                model.flags &= ~P_MULXN;
+                break;
+            case 'p': /* p: polynomial */
+                pptr = &model.spoly;
+                rflags &= ~R_HAVEQ;
+                rflags |= R_HAVEP;
 ipqx:
-				pfree(pptr);
-				*pptr = strtop(optarg, 0, 4);
-				pright(pptr, width);
-				mnovel(&model);
-				break;
-			case 'q': /* q: range end polynomial */
-				pptr = &qpoly;
-				rflags &= ~R_HAVEP;
-				rflags |= R_HAVEQ;
-				goto ipqx;
-			case 'S': /* s  space between output characters */
-				model.flags |= P_SPACE;
-				break;
-			case 'V': /* v  reverse algorithm */
-				/* Distinct from the -v switch as the
-				 * user will have to reverse his or her
-				 * own arguments.  The user cannot dump
-				 * the model generated by -v either.
-				 */
-				mrev(&model);
-				break;
-			case 'w': /* w: CRC width = order - 1 */
-				/* no validation, WONTFIX */
-				width = (unsigned long) atol(optarg);
-				break;
-			case 'X': /* X  print uppercase hex */
-				model.flags |= P_UPPER;
-				break;
-			case 'x': /* x: XorOut value */
-				pptr = &model.xorout;
-				rflags |= R_HAVEX;
-				goto ipqx;
-			case 'y': /* y  little-endian byte order in files */
-				model.flags |= P_LTLBYT;
-				break;
-			case 'z': /* z  raw binary arguments */
-				model.flags |= P_DIRECT;
-				break;
-			case -1: /* no more options, continue */
-				;
-		}
-	} while(c != -1);
+                pfree(pptr);
+                *pptr = strtop(optarg, 0, 4);
+                pright(pptr, width);
+                mnovel(&model);
+                break;
+            case 'q': /* q: range end polynomial */
+                pptr = &qpoly;
+                rflags &= ~R_HAVEP;
+                rflags |= R_HAVEQ;
+                goto ipqx;
+            case 'S': /* s  space between output characters */
+                model.flags |= P_SPACE;
+                break;
+            case 'V': /* v  reverse algorithm */
+                /* Distinct from the -v switch as the
+                 * user will have to reverse his or her
+                 * own arguments.  The user cannot dump
+                 * the model generated by -v either.
+                 */
+                mrev(&model);
+                break;
+            case 'w': /* w: CRC width = order - 1 */
+                /* no validation, WONTFIX */
+                width = (unsigned long) atol(optarg);
+                break;
+            case 'X': /* X  print uppercase hex */
+                model.flags |= P_UPPER;
+                break;
+            case 'x': /* x: XorOut value */
+                pptr = &model.xorout;
+                rflags |= R_HAVEX;
+                goto ipqx;
+            case 'y': /* y  little-endian byte order in files */
+                model.flags |= P_LTLBYT;
+                break;
+            case 'z': /* z  raw binary arguments */
+                model.flags |= P_DIRECT;
+                break;
+            case -1: /* no more options, continue */
+                ;
+        }
+    } while(c != -1);
 
-	/* canonicalise the model, so the one we dump is the one we
-	 * calculate with (not with -s, spoly may be blank which will
-	 * normalise to zero and clear init and xorout.)
-	 */
-	if(mode != 's')
-		mcanon(&model);
+    /* canonicalise the model, so the one we dump is the one we
+     * calculate with (not with -s, spoly may be blank which will
+     * normalise to zero and clear init and xorout.)
+     */
+    if(mode != 's')
+        mcanon(&model);
 
-	switch(mode) {
-		case 'v': /* v  calculate reversed CRC */
-			/* Distinct from the -V switch as this causes
-			 * the arguments and output to be reversed as well.
-			 */
-			/* reciprocate Poly */
-			prcp(&model.spoly);
+    switch(mode) {
+        case 'v': /* v  calculate reversed CRC */
+            /* Distinct from the -V switch as this causes
+             * the arguments and output to be reversed as well.
+             */
+            /* reciprocate Poly */
+            prcp(&model.spoly);
 
-			/* mrev() does:
-			 *   if(refout) prev(init); else prev(xorout);
-			 * but here the entire argument polynomial is
-			 * reflected, not just the characters, so RefIn
-			 * and RefOut are not inverted as with -V.
-			 * Consequently Init is the mirror image of the
-			 * one resulting from -V, and so we have:
-			 */
-			if(~model.flags & P_REFOUT) {
-				prev(&model.init);
-				prev(&model.xorout);
-			}
+            /* mrev() does:
+             *   if(refout) prev(init); else prev(xorout);
+             * but here the entire argument polynomial is
+             * reflected, not just the characters, so RefIn
+             * and RefOut are not inverted as with -V.
+             * Consequently Init is the mirror image of the
+             * one resulting from -V, and so we have:
+             */
+            if(~model.flags & P_REFOUT) {
+                prev(&model.init);
+                prev(&model.xorout);
+            }
 
-			/* swap init and xorout */
-			apoly = model.init;
-			model.init = model.xorout;
-			model.xorout = apoly;
+            /* swap init and xorout */
+            apoly = model.init;
+            model.init = model.xorout;
+            model.xorout = apoly;
 
-			/* fall through: */
-		case 'c': /* c  calculate CRC */
+            /* fall through: */
+        case 'c': /* c  calculate CRC */
 
-			/* validate inputs */
-			/* if(plen(model.spoly) == 0) {
-			 *	fprintf(stderr,"%s: no polynomial specified for -%c (add -w WIDTH -p POLY)\n", myname, mode);
-			 *	exit(EXIT_FAILURE);
-			 * }
-			 */
+            /* validate inputs */
+            /* if(plen(model.spoly) == 0) {
+             *  fprintf(stderr,"%s: no polynomial specified for -%c (add -w WIDTH -p POLY)\n", myname, mode);
+             *  exit(EXIT_FAILURE);
+             * }
+             */
 
-			/* in the Williams model, xorout is applied after the refout stage.
-			 * as refout is part of ptostr(), we reverse xorout here.
-			 */
-			if(model.flags & P_REFOUT)
-				prev(&model.xorout);
+            /* in the Williams model, xorout is applied after the refout stage.
+             * as refout is part of ptostr(), we reverse xorout here.
+             */
+            if(model.flags & P_REFOUT)
+                prev(&model.xorout);
 
-			for(; optind < argc; ++optind) {
-				if(uflags & C_INFILE)
-					apoly = rdpoly(argv[optind], model.flags, ibperhx);
-				else
-					apoly = strtop(argv[optind], model.flags, ibperhx);
+            for(; optind < argc; ++optind) {
+                if(uflags & C_INFILE)
+                    apoly = rdpoly(argv[optind], model.flags, ibperhx);
+                else
+                    apoly = strtop(argv[optind], model.flags, ibperhx);
 
-				if(mode == 'v')
-					prev(&apoly);
+                if(mode == 'v')
+                    prev(&apoly);
 
-				crc = pcrc(apoly, model.spoly, model.init, model.xorout, model.flags);
+                crc = pcrc(apoly, model.spoly, model.init, model.xorout, model.flags);
 
-				if(mode == 'v')
-					prev(&crc);
+                if(mode == 'v')
+                    prev(&crc);
 
-				string = ptostr(crc, model.flags, obperhx);
-				puts(string);
-				free(string);
-				pfree(&crc);
-				pfree(&apoly);
-			}
-			break;
-		case 'D': /* D  dump all models */
-			args = mcount();
-			if(!args){
-				uerror("no preset models available");
-				return 0;
-			}
-			do {
-				mbynum(&model, --args);
-				ufound(&model);
-			} while(args);
-			break;
-		case 'd': /* d  dump CRC model */
-			/* maybe we don't want to do this:
-			 * either attaching names to arbitrary models or forcing to a preset
-			 * mmatch(&model, M_OVERWR);
-			 */
-			if(~model.flags & P_MULXN){
-				uerror("not a Williams model compliant algorithm");
-				return 0;
-			}
-			string = mtostr(&model);
-			puts(string);
-			free(string);
-			break;
-		case 'e': /* e  echo arguments */
-			for(; optind < argc; ++optind) {
-				if(uflags & C_INFILE)
-					apoly = rdpoly(argv[optind], model.flags, ibperhx);
-				else
-					apoly = strtop(argv[optind], model.flags, ibperhx);
+                string = ptostr(crc, model.flags, obperhx);
+                puts(string);
+                free(string);
+                pfree(&crc);
+                pfree(&apoly);
+            }
+            break;
+        case 'D': /* D  dump all models */
+            args = mcount();
+            if(!args){
+                uerror("no preset models available");
+                return 0;
+            }
+            do {
+                mbynum(&model, --args);
+                ufound(&model);
+            } while(args);
+            break;
+        case 'd': /* d  dump CRC model */
+            /* maybe we don't want to do this:
+             * either attaching names to arbitrary models or forcing to a preset
+             * mmatch(&model, M_OVERWR);
+             */
+            if(~model.flags & P_MULXN){
+                uerror("not a Williams model compliant algorithm");
+                return 0;
+            }
+            string = mtostr(&model);
+            puts(string);
+            free(string);
+            break;
+        case 'e': /* e  echo arguments */
+            for(; optind < argc; ++optind) {
+                if(uflags & C_INFILE)
+                    apoly = rdpoly(argv[optind], model.flags, ibperhx);
+                else
+                    apoly = strtop(argv[optind], model.flags, ibperhx);
 
-				psum(&apoly, model.init, 0UL);
-				string = ptostr(apoly, model.flags, obperhx);
-				puts(string);
-				free(string);
-				pfree(&apoly);
-			}
-			break;
-		case 's': /* s  search for algorithm */
-			if(!width){
-				uerror("must specify positive -k or -w before -s");
-				return 0;
-			}
-			if(~model.flags & P_MULXN){
-				uerror("cannot search for non-Williams compliant models");
-				return 0;
-			}
-			praloc(&model.spoly, width);
-			praloc(&model.init, width);
-			praloc(&model.xorout, width);
-			if(!plen(model.spoly))
-				palloc(&model.spoly, width);
-			else
-				width = plen(model.spoly);
+                psum(&apoly, model.init, 0UL);
+                string = ptostr(apoly, model.flags, obperhx);
+                puts(string);
+                free(string);
+                pfree(&apoly);
+            }
+            break;
+        case 's': /* s  search for algorithm */
+            if(!width){
+                uerror("must specify positive -k or -w before -s");
+                return 0;
+            }
+            if(~model.flags & P_MULXN){
+                uerror("cannot search for non-Williams compliant models");
+                return 0;
+            }
+            praloc(&model.spoly, width);
+            praloc(&model.init, width);
+            praloc(&model.xorout, width);
+            if(!plen(model.spoly))
+                palloc(&model.spoly, width);
+            else
+                width = plen(model.spoly);
 
-			/* special case if qpoly is zero, search to end of range */
-			if(!ptst(qpoly))
-				rflags &= ~R_HAVEQ;
+            /* special case if qpoly is zero, search to end of range */
+            if(!ptst(qpoly))
+                rflags &= ~R_HAVEQ;
 
-			/* allocate argument array */
-			args = argc - optind;
+            /* allocate argument array */
+            args = argc - optind;
 
-			apolys = calloc(args * sizeof(poly_t), sizeof(char));
-			if ( !apolys ){
-				uerror("cannot allocate memory for argument list");
-				return 0;
-			}
+            apolys = calloc(args * sizeof(poly_t), sizeof(char));
+            if ( !apolys ){
+                uerror("cannot allocate memory for argument list");
+                return 0;
+            }
 
-			for(pptr = apolys; optind < argc; ++optind) {
-				if(uflags & C_INFILE)
-					*pptr++ = rdpoly(argv[optind], model.flags, ibperhx);
-				else
-					*pptr++ = strtop(argv[optind], model.flags, ibperhx);
-			}
-			/* exit value of pptr is used hereafter! */
+            for(pptr = apolys; optind < argc; ++optind) {
+                if(uflags & C_INFILE)
+                    *pptr++ = rdpoly(argv[optind], model.flags, ibperhx);
+                else
+                    *pptr++ = strtop(argv[optind], model.flags, ibperhx);
+            }
+            /* exit value of pptr is used hereafter! */
 
-			/* if endianness not specified, try
-			 * little-endian then big-endian.
-			 * NB: crossed-endian algorithms will not be
-			 * searched.
-			 */
+            /* if endianness not specified, try
+             * little-endian then big-endian.
+             * NB: crossed-endian algorithms will not be
+             * searched.
+             */
 
-			/* scan against preset models */
-			if(~uflags & C_NOPCK) {
-				pass = 0;
-				do {
-					psets = mcount();
-					while(psets) {
-						mbynum(&pset, --psets);
-						/* skip if different width, or refin or refout don't match */
-						if(plen(pset.spoly) != width || (model.flags ^ pset.flags) & (P_REFIN | P_REFOUT))
-							continue;
-						/* skip if the preset doesn't match specified parameters */
-						if(rflags & R_HAVEP && pcmp(&model.spoly, &pset.spoly))
-							continue;
-						if(rflags & R_HAVEI && psncmp(&model.init, &pset.init))
-							continue;
-						if(rflags & R_HAVEX && psncmp(&model.xorout, &pset.xorout))
-							continue;
-						apoly = pclone(pset.xorout);
-						if(pset.flags & P_REFOUT)
-							prev(&apoly);
-						for(qptr = apolys; qptr < pptr; ++qptr) {
-							crc = pcrc(*qptr, pset.spoly, pset.init, apoly, 0);
-							if(ptst(crc)) {
-								pfree(&crc);
-								break;
-							} else
-								pfree(&crc);
-						}
-						pfree(&apoly);
-						if(qptr == pptr) {
-							/* the selected model solved all arguments */
-							ufound(&pset);
-							uflags |= C_RESULT;
-						}
-					}
-					mfree(&pset);
+            /* scan against preset models */
+            if(~uflags & C_NOPCK) {
+                pass = 0;
+                do {
+                    psets = mcount();
+                    while(psets) {
+                        mbynum(&pset, --psets);
+                        /* skip if different width, or refin or refout don't match */
+                        if(plen(pset.spoly) != width || (model.flags ^ pset.flags) & (P_REFIN | P_REFOUT))
+                            continue;
+                        /* skip if the preset doesn't match specified parameters */
+                        if(rflags & R_HAVEP && pcmp(&model.spoly, &pset.spoly))
+                            continue;
+                        if(rflags & R_HAVEI && psncmp(&model.init, &pset.init))
+                            continue;
+                        if(rflags & R_HAVEX && psncmp(&model.xorout, &pset.xorout))
+                            continue;
+                        apoly = pclone(pset.xorout);
+                        if(pset.flags & P_REFOUT)
+                            prev(&apoly);
+                        for(qptr = apolys; qptr < pptr; ++qptr) {
+                            crc = pcrc(*qptr, pset.spoly, pset.init, apoly, 0);
+                            if(ptst(crc)) {
+                                pfree(&crc);
+                                break;
+                            } else
+                                pfree(&crc);
+                        }
+                        pfree(&apoly);
+                        if(qptr == pptr) {
+                            /* the selected model solved all arguments */
+                            ufound(&pset);
+                            uflags |= C_RESULT;
+                        }
+                    }
+                    mfree(&pset);
 
-					/* toggle refIn/refOut and reflect arguments */
-					if(~rflags & R_HAVERI) {
-						model.flags ^= P_REFIN | P_REFOUT;
-						for(qptr = apolys; qptr < pptr; ++qptr)
-							prevch(qptr, ibperhx);
-					}
-				} while(~rflags & R_HAVERI && ++pass < 2);
-			}
-			if(uflags & C_RESULT) {
-				for(qptr = apolys; qptr < pptr; ++qptr)
-					pfree(qptr);
-				return 1;
-				//exit(EXIT_SUCCESS);
-			}
-			if(uflags & C_NOBFS && ~rflags & R_HAVEP) {
-				uerror("no models found");
-				return 0;
-				//break;
-			}
-			if(!(model.flags & P_REFIN) != !(model.flags & P_REFOUT)){
-				uerror("cannot search for crossed-endian models");
-				return 0;
-			}
-			pass = 0;
-			do {
-				mptr = candmods = reveng(&model, qpoly, rflags, args, apolys);
-				if(mptr && plen(mptr->spoly))
-					uflags |= C_RESULT;
-				while(mptr && plen(mptr->spoly)) {
-					/* results were printed by the callback
-					 * string = mtostr(mptr);
-					 * puts(string);
-					 * free(string);
-					 */
-					mfree(mptr++);
-				}
-				free(candmods);
-				if(~rflags & R_HAVERI) {
-					model.flags ^= P_REFIN | P_REFOUT;
-					for(qptr = apolys; qptr < pptr; ++qptr)
-						prevch(qptr, ibperhx);
-				}
-			} while(~rflags & R_HAVERI && ++pass < 2);
-			for(qptr = apolys; qptr < pptr; ++qptr)
-				pfree(qptr);
-			free(apolys);
-			if(~uflags & C_RESULT)
-				uerror("no models found");
-			break;
-		default:  /* no mode specified */
-			fprintf(stderr, "%s: no mode switch specified. Use %s -h for help.\n", myname, myname);
-			return 0;
-			//exit(EXIT_FAILURE);
-	}
+                    /* toggle refIn/refOut and reflect arguments */
+                    if(~rflags & R_HAVERI) {
+                        model.flags ^= P_REFIN | P_REFOUT;
+                        for(qptr = apolys; qptr < pptr; ++qptr)
+                            prevch(qptr, ibperhx);
+                    }
+                } while(~rflags & R_HAVERI && ++pass < 2);
+            }
+            if(uflags & C_RESULT) {
+                for(qptr = apolys; qptr < pptr; ++qptr)
+                    pfree(qptr);
+                return 1;
+                //exit(EXIT_SUCCESS);
+            }
+            if(uflags & C_NOBFS && ~rflags & R_HAVEP) {
+                uerror("no models found");
+                return 0;
+                //break;
+            }
+            if(!(model.flags & P_REFIN) != !(model.flags & P_REFOUT)){
+                uerror("cannot search for crossed-endian models");
+                return 0;
+            }
+            pass = 0;
+            do {
+                mptr = candmods = reveng(&model, qpoly, rflags, args, apolys);
+                if(mptr && plen(mptr->spoly))
+                    uflags |= C_RESULT;
+                while(mptr && plen(mptr->spoly)) {
+                    /* results were printed by the callback
+                     * string = mtostr(mptr);
+                     * puts(string);
+                     * free(string);
+                     */
+                    mfree(mptr++);
+                }
+                free(candmods);
+                if(~rflags & R_HAVERI) {
+                    model.flags ^= P_REFIN | P_REFOUT;
+                    for(qptr = apolys; qptr < pptr; ++qptr)
+                        prevch(qptr, ibperhx);
+                }
+            } while(~rflags & R_HAVERI && ++pass < 2);
+            for(qptr = apolys; qptr < pptr; ++qptr)
+                pfree(qptr);
+            free(apolys);
+            if(~uflags & C_RESULT)
+                uerror("no models found");
+            break;
+        default:  /* no mode specified */
+            fprintf(stderr, "%s: no mode switch specified. Use %s -h for help.\n", myname, myname);
+            return 0;
+            //exit(EXIT_FAILURE);
+    }
 
-	return 1;
-	//exit(EXIT_SUCCESS);
+    return 1;
+    //exit(EXIT_SUCCESS);
 }
 
 void
 ufound(const model_t *model) {
-	/* Callback function to report each model found */
-	char *string;
+    /* Callback function to report each model found */
+    char *string;
 
-	if(!model) return;
-	/* generated models will be canonical */
-	string = mtostr(model);
-	puts(string);
-	free(string);
+    if(!model) return;
+    /* generated models will be canonical */
+    string = mtostr(model);
+    puts(string);
+    free(string);
 }
 
 void
 uerror(const char *msg) {
-	/* Callback function to report fatal errors */
-	fprintf(stderr, "%s: %s\n", myname, msg);
-	//exit(EXIT_FAILURE);
+    /* Callback function to report fatal errors */
+    fprintf(stderr, "%s: %s\n", myname, msg);
+    //exit(EXIT_FAILURE);
 }
 
 void
 uprog(const poly_t gpoly, int flags, unsigned long seq) {
-	/* Callback function to report search progress */
-	char *string;
+    /* Callback function to report search progress */
+    char *string;
 
-	/* Suppress first report in CLI */
-	if(!seq)
-		return;
-	string = ptostr(gpoly, P_RTJUST, 4);
-	fprintf(stderr, "%s: searching: width=%ld  poly=0x%s  refin=%s  refout=%s\n",
-			myname, plen(gpoly), string,
-			(flags & P_REFIN ? "true" : "false"),
-			(flags & P_REFOUT ? "true" : "false")
-			);
-	free(string);
+    /* Suppress first report in CLI */
+    if(!seq)
+        return;
+    string = ptostr(gpoly, P_RTJUST, 4);
+    fprintf(stderr, "%s: searching: width=%ld  poly=0x%s  refin=%s  refout=%s\n",
+            myname, plen(gpoly), string,
+            (flags & P_REFIN ? "true" : "false"),
+            (flags & P_REFOUT ? "true" : "false")
+            );
+    free(string);
 }
 
 static poly_t
 rdpoly(const char *name, int flags, int bperhx) {
-	/* read poly from file in chunks and report errors */
+    /* read poly from file in chunks and report errors */
 
-	poly_t apoly = PZERO, chunk = PZERO;
-	FILE *input;
+    poly_t apoly = PZERO, chunk = PZERO;
+    FILE *input;
 
-	input = oread(name);
-	while(!feof(input) && !ferror(input)) {
-		chunk = filtop(input, BUFFER, flags, bperhx);
-		psum(&apoly, chunk, plen(apoly));
-		pfree(&chunk);
-	}
-	if(ferror(input)) {
-		fprintf(stderr,"%s: error condition on file '%s'\n", myname, name);
-		exit(EXIT_FAILURE);
-	}
-	/* close file unless stdin */
-	if(input == stdin)
-		/* reset EOF condition */
-		clearerr(input);
-	else if(fclose(input)) {
-		fprintf(stderr,"%s: error closing file '%s'\n", myname, name);
-		exit(EXIT_FAILURE);
-	}
-	return(apoly);
+    input = oread(name);
+    while(!feof(input) && !ferror(input)) {
+        chunk = filtop(input, BUFFER, flags, bperhx);
+        psum(&apoly, chunk, plen(apoly));
+        pfree(&chunk);
+    }
+    if(ferror(input)) {
+        fprintf(stderr,"%s: error condition on file '%s'\n", myname, name);
+        exit(EXIT_FAILURE);
+    }
+    /* close file unless stdin */
+    if(input == stdin)
+        /* reset EOF condition */
+        clearerr(input);
+    else if(fclose(input)) {
+        fprintf(stderr,"%s: error closing file '%s'\n", myname, name);
+        exit(EXIT_FAILURE);
+    }
+    return(apoly);
 }
 
 static FILE *
 oread(const char *name) {
-	/* open file for reading and report errors */
-	FILE *handle;
+    /* open file for reading and report errors */
+    FILE *handle;
 
-	/* recognise special name '-' as standard input */
-	if(*name == '-' && name[1] == '\0')
-		return(stdin);
-	if(!(handle = fopen(name, "rb"))) {
-		fprintf(stderr, "%s: cannot open '%s' for reading\n", myname, name);
-		return 0;
-		//exit(EXIT_FAILURE);
-	}
-	return(handle);
+    /* recognise special name '-' as standard input */
+    if(*name == '-' && name[1] == '\0')
+        return(stdin);
+    if(!(handle = fopen(name, "rb"))) {
+        fprintf(stderr, "%s: cannot open '%s' for reading\n", myname, name);
+        return 0;
+        //exit(EXIT_FAILURE);
+    }
+    return(handle);
 }
 
 static void
 usage(void) {
-	/* print usage if asked, or if syntax incorrect */
-	fprintf(stderr,
-			"CRC RevEng: arbitrary-precision CRC calculator and algorithm finder\n"
-			"Usage:\t");
-	fputs(myname, stderr);
-	fprintf(stderr,
-			"\t-cdDesvhu? [-bBfFGlLMrStVXyz]\n"
-			"\t\t[-a BITS] [-A OBITS] [-i INIT] [-k KPOLY] [-m MODEL] [-p POLY]\n"
-			"\t\t[-p POLY] [-P RPOLY] [-q QPOLY] [-w WIDTH] [-x XOROUT] [STRING...]\n"
-			"Options:\n"
-			"\t-a BITS\t\tbits per character (1 to %d)\n"
-			"\t-A OBITS\tbits per output character (1 to %d)\n"
-			"\t-i INIT\t\tinitial register value\n"
-			"\t-k KPOLY\tgenerator in Koopman notation (implies WIDTH)\n"
-			"\t-m MODEL\tpreset CRC algorithm\n"
-			"\t-p POLY\t\tgenerator or search range start polynomial\n"
-			"\t-P RPOLY\treversed generator polynomial (implies WIDTH)\n",
-			BMP_BIT, BMP_BIT);
-	fprintf(stderr,
-			"\t-q QPOLY\tsearch range end polynomial\n"
-			"\t-w WIDTH\tregister size, in bits\n"
-			"\t-x XOROUT\tfinal register XOR value\n"
-			"Modifier switches:\n"
-			"\t-b big-endian CRC\t\t-B big-endian CRC output\n"
-			"\t-f read files named in STRINGs\t-F skip preset model check pass\n"
-			"\t-G skip brute force search pass\t-l little-endian CRC\n"
-			"\t-L little-endian CRC output\t-M non-augmenting algorithm\n"
-			"\t-r right-justified output\t-S print spaces between characters\n"
-			"\t-t left-justified output\t-V reverse algorithm only\n"
-			"\t-X print uppercase hexadecimal\t-y low bytes first in files\n"
-			"\t-z raw binary STRINGs\n");
-	fprintf(stderr,
-			"Mode switches:\n"
-			"\t-c calculate CRCs\t\t-d dump algorithm parameters\n"
-			"\t-D list preset algorithms\t-e echo (and reformat) input\n"
-			"\t-s search for algorithm\t\t-v calculate reversed CRCs\n"
-			"\t-g search for alg given hex+crc\n"
-			"\t-h | -u | -? show this help\n"
-			"Common Use Examples:\n"
-			"\t   reveng -g 01020304e3\n"
-			"\t      Searches for a known/common crc preset that computes the crc\n"
-			"\t      on the end of the given hex string\n"
-			"\t   reveng -w 8 -s 01020304e3 010204039d\n"
-			"\t      Searches for any possible 8 bit width crc calc that computes\n"
-			"\t      the crc on the end of the given hex string(s)\n"
-			"\t   reveng -m CRC-8 -c 01020304\n"
-			"\t      Calculates the crc-8 of the given hex string\n"
-			"\t   reveng -D\n"
-			"\t      Outputs a list of all known/common crc models with their\n"
-			"\t      preset values\n"
-			"\n"
-			"Copyright (C)\n"
-			"2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018  Gregory Cook\n"
-			"This is free software; see the source for copying conditions.  There is NO\n"
-			"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
-			"Version "
-			VERSION
-			"\t\t\t\t  <http://reveng.sourceforge.net/>\n");
+    /* print usage if asked, or if syntax incorrect */
+    fprintf(stderr,
+            "CRC RevEng: arbitrary-precision CRC calculator and algorithm finder\n"
+            "Usage:\t");
+    fputs(myname, stderr);
+    fprintf(stderr,
+            "\t-cdDesvhu? [-bBfFGlLMrStVXyz]\n"
+            "\t\t[-a BITS] [-A OBITS] [-i INIT] [-k KPOLY] [-m MODEL] [-p POLY]\n"
+            "\t\t[-p POLY] [-P RPOLY] [-q QPOLY] [-w WIDTH] [-x XOROUT] [STRING...]\n"
+            "Options:\n"
+            "\t-a BITS\t\tbits per character (1 to %d)\n"
+            "\t-A OBITS\tbits per output character (1 to %d)\n"
+            "\t-i INIT\t\tinitial register value\n"
+            "\t-k KPOLY\tgenerator in Koopman notation (implies WIDTH)\n"
+            "\t-m MODEL\tpreset CRC algorithm\n"
+            "\t-p POLY\t\tgenerator or search range start polynomial\n"
+            "\t-P RPOLY\treversed generator polynomial (implies WIDTH)\n",
+            BMP_BIT, BMP_BIT);
+    fprintf(stderr,
+            "\t-q QPOLY\tsearch range end polynomial\n"
+            "\t-w WIDTH\tregister size, in bits\n"
+            "\t-x XOROUT\tfinal register XOR value\n"
+            "Modifier switches:\n"
+            "\t-b big-endian CRC\t\t-B big-endian CRC output\n"
+            "\t-f read files named in STRINGs\t-F skip preset model check pass\n"
+            "\t-G skip brute force search pass\t-l little-endian CRC\n"
+            "\t-L little-endian CRC output\t-M non-augmenting algorithm\n"
+            "\t-r right-justified output\t-S print spaces between characters\n"
+            "\t-t left-justified output\t-V reverse algorithm only\n"
+            "\t-X print uppercase hexadecimal\t-y low bytes first in files\n"
+            "\t-z raw binary STRINGs\n");
+    fprintf(stderr,
+            "Mode switches:\n"
+            "\t-c calculate CRCs\t\t-d dump algorithm parameters\n"
+            "\t-D list preset algorithms\t-e echo (and reformat) input\n"
+            "\t-s search for algorithm\t\t-v calculate reversed CRCs\n"
+            "\t-g search for alg given hex+crc\n"
+            "\t-h | -u | -? show this help\n"
+            "Common Use Examples:\n"
+            "\t   reveng -g 01020304e3\n"
+            "\t      Searches for a known/common crc preset that computes the crc\n"
+            "\t      on the end of the given hex string\n"
+            "\t   reveng -w 8 -s 01020304e3 010204039d\n"
+            "\t      Searches for any possible 8 bit width crc calc that computes\n"
+            "\t      the crc on the end of the given hex string(s)\n"
+            "\t   reveng -m CRC-8 -c 01020304\n"
+            "\t      Calculates the crc-8 of the given hex string\n"
+            "\t   reveng -D\n"
+            "\t      Outputs a list of all known/common crc models with their\n"
+            "\t      preset values\n"
+            "\n"
+            "Copyright (C)\n"
+            "2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018  Gregory Cook\n"
+            "This is free software; see the source for copying conditions.  There is NO\n"
+            "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+            "Version "
+            VERSION
+            "\t\t\t\t  <http://reveng.sourceforge.net/>\n");
 }
diff --git a/client/reveng/config.h b/client/reveng/config.h
index 715eb53df..8fe8b6c7a 100644
--- a/client/reveng/config.h
+++ b/client/reveng/config.h
@@ -26,9 +26,9 @@
 #define CONFIG_H 1
 
 /*****************************************
- *					 *
+ *                                       *
  *  Start of user configuration options  *
- *					 *
+ *                                       *
  *****************************************/
 
 /* A type to contain polynomial coefficient bitmaps.
@@ -85,9 +85,9 @@
 #define BMP_SUB   16
 
 /*****************************************
- *					 *
+ *                                       *
  *   End of user configuration options   *
- *					 *
+ *                                       *
  *****************************************/
 
 #endif /* CONFIG_H */
diff --git a/client/reveng/getopt.c b/client/reveng/getopt.c
index 7987d8e6b..eb4f57a28 100644
--- a/client/reveng/getopt.c
+++ b/client/reveng/getopt.c
@@ -37,45 +37,45 @@ int getopt(int argc, char *argv[], const char *optstring)
     char *str;
 
     if (pos == 0) {
-	if ((optind >= argc) || (*argv[optind] != '-'))
-	    return EOF;
-	pos = 1;
-	if (argv[optind][pos] == '\0')
-	    return EOF;
+    if ((optind >= argc) || (*argv[optind] != '-'))
+        return EOF;
+    pos = 1;
+    if (argv[optind][pos] == '\0')
+        return EOF;
     }
 
     str = strchr(optstring, argv[optind][pos]);
     if (str == NULL) {
-	optopt = argv[optind][pos];
-	if (opterr)
-	    fprintf(stderr, "%s: illegal option -- %c\n", argv[0],
-		    optopt);
-	return '?';
+    optopt = argv[optind][pos];
+    if (opterr)
+        fprintf(stderr, "%s: illegal option -- %c\n", argv[0],
+            optopt);
+    return '?';
     }
 
     if (str[1] == ':') {
-	if (argv[optind][pos+1] != '\0') {
-	    optarg = &argv[optind][pos+1];
-	    return *str;
-	}
-	optind++;
-	if (optind >= argc) {
-	    optopt = *str;
-	    if (opterr)
-		fprintf(stderr, "%s: option requires an argument -- %c\n",
-			argv[0], optopt);
-	    return '?';
-	}
-	optarg = argv[optind];
-	optind++; pos = 0;
-	return *str;
+    if (argv[optind][pos+1] != '\0') {
+        optarg = &argv[optind][pos+1];
+        return *str;
+    }
+    optind++;
+    if (optind >= argc) {
+        optopt = *str;
+        if (opterr)
+        fprintf(stderr, "%s: option requires an argument -- %c\n",
+            argv[0], optopt);
+        return '?';
+    }
+    optarg = argv[optind];
+    optind++; pos = 0;
+    return *str;
     }
     else {
-	pos++;
-	if (argv[optind][pos] == '\0') {
-	    optind++;
-	    pos = 0;
-	}
-	return *str;
+    pos++;
+    if (argv[optind][pos] == '\0') {
+        optind++;
+        pos = 0;
+    }
+    return *str;
     }
 }
diff --git a/client/reveng/model.c b/client/reveng/model.c
index 2c58d695a..d15c86e09 100644
--- a/client/reveng/model.c
+++ b/client/reveng/model.c
@@ -48,200 +48,200 @@ static const poly_t pzero = PZERO;
 /* Definitions */
 
 void mcpy(model_t *dest, const model_t *src) {
-	/* Copies the parameters of src to dest.
-	 * dest must be an initialised model.
-	 */
-	if (!dest || !src) return;
-	pcpy(&dest->spoly, src->spoly);
-	pcpy(&dest->init, src->init);
-	pcpy(&dest->xorout, src->xorout);
-	pcpy(&dest->check, src->check);
-	pcpy(&dest->magic, src->magic);
-	dest->flags = src->flags;
-	/* link to the name as it is static */
-	dest->name = src->name;
+    /* Copies the parameters of src to dest.
+     * dest must be an initialised model.
+     */
+    if (!dest || !src) return;
+    pcpy(&dest->spoly, src->spoly);
+    pcpy(&dest->init, src->init);
+    pcpy(&dest->xorout, src->xorout);
+    pcpy(&dest->check, src->check);
+    pcpy(&dest->magic, src->magic);
+    dest->flags = src->flags;
+    /* link to the name as it is static */
+    dest->name = src->name;
 }
 
 void mfree(model_t *model) {
-	/* Frees the parameters of model. */
-	if (!model) return;
-	pfree(&model->spoly);
-	pfree(&model->init);
-	pfree(&model->xorout);
-	pfree(&model->check);
-	pfree(&model->magic);
-	/* not name as it is static */
-	/* not model either, it might point to an array! */
+    /* Frees the parameters of model. */
+    if (!model) return;
+    pfree(&model->spoly);
+    pfree(&model->init);
+    pfree(&model->xorout);
+    pfree(&model->check);
+    pfree(&model->magic);
+    /* not name as it is static */
+    /* not model either, it might point to an array! */
 }
 
 int mcmp(const model_t *a, const model_t *b) {
-	/* Compares a and b for identical effect, i.e. disregarding
-	 * trailing zeroes in parameter polys.
-	 * Intended for bsearch().
-	 */
-	int result;
-	if (!a || !b) return (!b - !a);
-	if ((result = psncmp(&a->spoly, &b->spoly))) return (result);
-	if ((result = psncmp(&a->init, &b->init))) return (result);
-	if ((a->flags & P_REFIN) && (~b->flags & P_REFIN)) return (1);
-	if ((~a->flags & P_REFIN) && (b->flags & P_REFIN)) return (-1);
-	if ((a->flags & P_REFOUT) && (~b->flags & P_REFOUT)) return (1);
-	if ((~a->flags & P_REFOUT) && (b->flags & P_REFOUT)) return (-1);
-	return (psncmp(&a->xorout, &b->xorout));
+    /* Compares a and b for identical effect, i.e. disregarding
+     * trailing zeroes in parameter polys.
+     * Intended for bsearch().
+     */
+    int result;
+    if (!a || !b) return (!b - !a);
+    if ((result = psncmp(&a->spoly, &b->spoly))) return (result);
+    if ((result = psncmp(&a->init, &b->init))) return (result);
+    if ((a->flags & P_REFIN) && (~b->flags & P_REFIN)) return (1);
+    if ((~a->flags & P_REFIN) && (b->flags & P_REFIN)) return (-1);
+    if ((a->flags & P_REFOUT) && (~b->flags & P_REFOUT)) return (1);
+    if ((~a->flags & P_REFOUT) && (b->flags & P_REFOUT)) return (-1);
+    return (psncmp(&a->xorout, &b->xorout));
 }
 
 char * mtostr(const model_t *model) {
-	/* Returns a malloc()-ed string containing a Williams model
-	 * record representing the input model.
-	 * mcanon() should be called on the argument before printing.
-	 */
-	size_t size;
-	char *polystr, *initstr, *xorotstr, *checkstr, *magicstr,
-		strbuf[512], *string = NULL;
+    /* Returns a malloc()-ed string containing a Williams model
+     * record representing the input model.
+     * mcanon() should be called on the argument before printing.
+     */
+    size_t size;
+    char *polystr, *initstr, *xorotstr, *checkstr, *magicstr,
+        strbuf[512], *string = NULL;
 
-	if (!model) return(NULL);
-	polystr = ptostr(model->spoly, P_RTJUST, 4);
-	initstr = ptostr(model->init, P_RTJUST, 4);
-	xorotstr = ptostr(model->xorout, P_RTJUST, 4);
-	checkstr = ptostr(model->check, P_RTJUST, 4);
-	magicstr = ptostr(model->magic, P_RTJUST, 4);
+    if (!model) return(NULL);
+    polystr = ptostr(model->spoly, P_RTJUST, 4);
+    initstr = ptostr(model->init, P_RTJUST, 4);
+    xorotstr = ptostr(model->xorout, P_RTJUST, 4);
+    checkstr = ptostr(model->check, P_RTJUST, 4);
+    magicstr = ptostr(model->magic, P_RTJUST, 4);
 
-	sprintf(strbuf, "%lu", plen(model->spoly));
-	size =
-		82
-		+ strlen(strbuf)
-		+ (polystr && *polystr ? strlen(polystr) : 6)
-		+ (initstr && *initstr ? strlen(initstr) : 6)
-		+ (model->flags & P_REFIN ? 4 : 5)
-		+ (model->flags & P_REFOUT ? 4 : 5)
-		+ (xorotstr && *xorotstr ? strlen(xorotstr) : 6)
-		+ (checkstr && *checkstr ? strlen(checkstr) : 6)
-		+ (magicstr && *magicstr ? strlen(magicstr) : 6)
-		+ (model->name && *model->name ? 2 + strlen(model->name) : 6);
-	if ((string = calloc(size, sizeof(uint8_t)))) {
-		sprintf(strbuf, "\"%s\"", model->name);
-		sprintf(string,
-				"width=%lu  "
-				"poly=0x%s  "
-				"init=0x%s  "
-				"refin=%s  "
-				"refout=%s  "
-				"xorout=0x%s  "
-				"check=0x%s  "
-				"residue=0x%s  "
-				"name=%s",
-				plen(model->spoly),
-				polystr && *polystr ? polystr : "(none)",
-				initstr && *initstr ? initstr :  "(none)",
-				(model->flags & P_REFIN) ? "true" : "false",
-				(model->flags & P_REFOUT) ? "true" : "false",
-				xorotstr && *xorotstr ? xorotstr : "(none)",
-				checkstr && *checkstr ? checkstr : "(none)",
-				magicstr && *magicstr ? magicstr : "(none)",
-				(model->name && *model->name) ? strbuf : "(none)");
-	}
-	free(polystr);
-	free(initstr);
-	free(xorotstr);
-	free(checkstr);
-	free(magicstr);
-	if(!string)
-		uerror("cannot allocate memory for model description");
-	return(string);
+    sprintf(strbuf, "%lu", plen(model->spoly));
+    size =
+        82
+        + strlen(strbuf)
+        + (polystr && *polystr ? strlen(polystr) : 6)
+        + (initstr && *initstr ? strlen(initstr) : 6)
+        + (model->flags & P_REFIN ? 4 : 5)
+        + (model->flags & P_REFOUT ? 4 : 5)
+        + (xorotstr && *xorotstr ? strlen(xorotstr) : 6)
+        + (checkstr && *checkstr ? strlen(checkstr) : 6)
+        + (magicstr && *magicstr ? strlen(magicstr) : 6)
+        + (model->name && *model->name ? 2 + strlen(model->name) : 6);
+    if ((string = calloc(size, sizeof(uint8_t)))) {
+        sprintf(strbuf, "\"%s\"", model->name);
+        sprintf(string,
+                "width=%lu  "
+                "poly=0x%s  "
+                "init=0x%s  "
+                "refin=%s  "
+                "refout=%s  "
+                "xorout=0x%s  "
+                "check=0x%s  "
+                "residue=0x%s  "
+                "name=%s",
+                plen(model->spoly),
+                polystr && *polystr ? polystr : "(none)",
+                initstr && *initstr ? initstr :  "(none)",
+                (model->flags & P_REFIN) ? "true" : "false",
+                (model->flags & P_REFOUT) ? "true" : "false",
+                xorotstr && *xorotstr ? xorotstr : "(none)",
+                checkstr && *checkstr ? checkstr : "(none)",
+                magicstr && *magicstr ? magicstr : "(none)",
+                (model->name && *model->name) ? strbuf : "(none)");
+    }
+    free(polystr);
+    free(initstr);
+    free(xorotstr);
+    free(checkstr);
+    free(magicstr);
+    if(!string)
+        uerror("cannot allocate memory for model description");
+    return(string);
 }
 
 void mcanon(model_t *model) {
-	/* canonicalise a model */
-	unsigned long dlen;
+    /* canonicalise a model */
+    unsigned long dlen;
 
-	if (!model) return;
+    if (!model) return;
 
-	/* extending on the right here. This preserves the functionality
-	 * of a presumed working model.
-	 */
-	psnorm(&model->spoly);
-	dlen = plen(model->spoly);
-	praloc(&model->init, dlen);
-	praloc(&model->xorout, dlen);
+    /* extending on the right here. This preserves the functionality
+     * of a presumed working model.
+     */
+    psnorm(&model->spoly);
+    dlen = plen(model->spoly);
+    praloc(&model->init, dlen);
+    praloc(&model->xorout, dlen);
 
-	/* only calculate Check if missing.  Relying on all functions
-	 * changing parameters to call mnovel().  This is to ensure that
-	 * the Check value stored in the preset table is printed when
-	 * the model is dumped.  If something goes wrong with the
-	 * calculator then the discrepancy with the stored Check value
-	 * might be noticed.  Storing the Check value with each preset
-	 * is highly preferred.
-	 */
-	if (!(plen(model->check) && plen(model->magic)))
-		mcheck(model);
+    /* only calculate Check if missing.  Relying on all functions
+     * changing parameters to call mnovel().  This is to ensure that
+     * the Check value stored in the preset table is printed when
+     * the model is dumped.  If something goes wrong with the
+     * calculator then the discrepancy with the stored Check value
+     * might be noticed.  Storing the Check value with each preset
+     * is highly preferred.
+     */
+    if (!(plen(model->check) && plen(model->magic)))
+        mcheck(model);
 }
 
 void mcheck(model_t *model) {
-	/* calculate a check for the model */
-	poly_t checkstr, check, xorout, magic;
+    /* calculate a check for the model */
+    poly_t checkstr, check, xorout, magic;
 
-	/* erase existing check and magic.  Models with these
-	 * fields recalculated should have no name.
-	 */
-	mnovel(model);
+    /* erase existing check and magic.  Models with these
+     * fields recalculated should have no name.
+     */
+    mnovel(model);
 
-	/* generate the check string with the correct bit order */
-	checkstr = strtop("313233343536373839", model->flags, 8);
-	check = pcrc(checkstr, model->spoly, model->init, pzero, model->flags);
-	pfree(&checkstr);
-	if (model->flags & P_REFOUT)
-		prev(&check);
-	psum(&check, model->xorout, 0UL);
-	model->check = check;
+    /* generate the check string with the correct bit order */
+    checkstr = strtop("313233343536373839", model->flags, 8);
+    check = pcrc(checkstr, model->spoly, model->init, pzero, model->flags);
+    pfree(&checkstr);
+    if (model->flags & P_REFOUT)
+        prev(&check);
+    psum(&check, model->xorout, 0UL);
+    model->check = check;
 
-	/* calculate residue by emulating receipt of error-free message
-	 * The residue of a crossed-endian model is calculated assuming
-	 * that the characters of the received CRC are specially
-	 * reflected before submitting the codeword.
-	 */
-	xorout=pclone(model->xorout);
-	if (model->flags & P_REFOUT)
-		prev(&xorout);
-	magic = pcrc(xorout, model->spoly, pzero, pzero, model->flags);
-	pfree(&xorout);
-	if (model->flags & P_REFIN)
-		prev(&magic);
-	model->magic = magic;
+    /* calculate residue by emulating receipt of error-free message
+     * The residue of a crossed-endian model is calculated assuming
+     * that the characters of the received CRC are specially
+     * reflected before submitting the codeword.
+     */
+    xorout=pclone(model->xorout);
+    if (model->flags & P_REFOUT)
+        prev(&xorout);
+    magic = pcrc(xorout, model->spoly, pzero, pzero, model->flags);
+    pfree(&xorout);
+    if (model->flags & P_REFIN)
+        prev(&magic);
+    model->magic = magic;
 }
 
 void mrev(model_t *model) {
-	/* reverse the model to calculate reversed CRCs */
-	/* Here we invert RefIn and RefOut so that the user need only
-	 * reverse the order of characters in the arguments, not the
-	 * characters themselves.  If RefOut=True, the mirror image of
-	 * Init seen through RefOut becomes XorOut, and as RefOut
-	 * becomes false, the XorOut value moved to Init stays upright.
-	 * If RefOut=False, Init transfers to XorOut without reflection
-	 * but the new Init must be reflected to present the same image,
-	 * as RefOut becomes true.
-	 */
-	poly_t temp;
+    /* reverse the model to calculate reversed CRCs */
+    /* Here we invert RefIn and RefOut so that the user need only
+     * reverse the order of characters in the arguments, not the
+     * characters themselves.  If RefOut=True, the mirror image of
+     * Init seen through RefOut becomes XorOut, and as RefOut
+     * becomes false, the XorOut value moved to Init stays upright.
+     * If RefOut=False, Init transfers to XorOut without reflection
+     * but the new Init must be reflected to present the same image,
+     * as RefOut becomes true.
+     */
+    poly_t temp;
 
-	prcp(&model->spoly);
-	if (model->flags & P_REFOUT)
-		prev(&model->init);
-	else
-		prev(&model->xorout);
+    prcp(&model->spoly);
+    if (model->flags & P_REFOUT)
+        prev(&model->init);
+    else
+        prev(&model->xorout);
 
-	/* exchange init and xorout */
-	temp = model->init;
-	model->init = model->xorout;
-	model->xorout = temp;
+    /* exchange init and xorout */
+    temp = model->init;
+    model->init = model->xorout;
+    model->xorout = temp;
 
-	/* invert refin and refout */
-	model->flags ^= P_REFIN | P_REFOUT;
+    /* invert refin and refout */
+    model->flags ^= P_REFIN | P_REFOUT;
 
-	mnovel(model);
+    mnovel(model);
 }
 
 void mnovel(model_t *model) {
-	/* remove name and check string from modified model */
-	model->name = NULL;
-	pfree(&model->check);
-	pfree(&model->magic);
+    /* remove name and check string from modified model */
+    model->name = NULL;
+    pfree(&model->check);
+    pfree(&model->magic);
 }
diff --git a/client/reveng/poly.c b/client/reveng/poly.c
index 7056c118a..8abe6ff75 100644
--- a/client/reveng/poly.c
+++ b/client/reveng/poly.c
@@ -38,9 +38,9 @@
  * 2011-08-27: fixed zero test in piter()
  * 2011-01-17: fixed ANSI C warnings, uses bmp_t type
  * 2011-01-15: palloc() and praloc() gracefully handle lengths slightly
- *	       less than ULONG_MAX
+ *         less than ULONG_MAX
  * 2011-01-15: strtop() error on invalid argument. pkchop() special case
- *	       when argument all zeroes
+ *         when argument all zeroes
  * 2011-01-14: added pkchop()
  * 2011-01-04: fixed bogus final length calculation in wide pcrc()
  * 2011-01-02: faster, more robust prcp()
@@ -128,1085 +128,1085 @@ static const poly_t pzero = PZERO;
 
 poly_t
 filtop(FILE *input, unsigned long length, int flags, int bperhx) {
-	/* reads binary data from input into a poly_t until EOF or until
-	 * length bits are read.  Characters are read until
-	 * ceil(bperhx / CHAR_BIT) bits are collected; if P_LTLBYT is
-	 * set in flags then the first character contains the LSB,
-	 * otherwise the last one does.  The least significant bperhx
-	 * bits are taken, reflected (if P_REFIN) and appended to the
-	 * result, then more characters are read.  The maximum number of
-	 * characters read is
-	 *   floor(length / bperhx) * ceil(bperhx / * CHAR_BIT).
-	 * The returned poly_t is CLEAN.
-	 */
+    /* reads binary data from input into a poly_t until EOF or until
+     * length bits are read.  Characters are read until
+     * ceil(bperhx / CHAR_BIT) bits are collected; if P_LTLBYT is
+     * set in flags then the first character contains the LSB,
+     * otherwise the last one does.  The least significant bperhx
+     * bits are taken, reflected (if P_REFIN) and appended to the
+     * result, then more characters are read.  The maximum number of
+     * characters read is
+     *   floor(length / bperhx) * ceil(bperhx / * CHAR_BIT).
+     * The returned poly_t is CLEAN.
+     */
 
-	bmp_t accu = BMP_C(0);
-	bmp_t mask = bperhx == BMP_BIT ? ~BMP_C(0) : (BMP_C(1) << bperhx) - BMP_C(1);
-	unsigned long iter = 0UL, idx;
-	int cmask = (1 << CHAR_BIT) - 1, c;
-	int count = 0, ofs;
-	poly_t poly = PZERO;
-	if(bperhx == 0) return(poly);
+    bmp_t accu = BMP_C(0);
+    bmp_t mask = bperhx == BMP_BIT ? ~BMP_C(0) : (BMP_C(1) << bperhx) - BMP_C(1);
+    unsigned long iter = 0UL, idx;
+    int cmask = (1 << CHAR_BIT) - 1, c;
+    int count = 0, ofs;
+    poly_t poly = PZERO;
+    if(bperhx == 0) return(poly);
 
-	length -= length % bperhx;
-	palloc(&poly, length); /* >= 0 */
+    length -= length % bperhx;
+    palloc(&poly, length); /* >= 0 */
 
-	while(iter < length && (c = fgetc(input)) != EOF) {
-		if(flags & P_LTLBYT)
-			accu |= (bmp_t) (c & cmask) << count;
-		else
-			accu = (accu << CHAR_BIT) | (bmp_t) (c & cmask);
-		count += CHAR_BIT;
-		if(count >= bperhx) {
-			/* the low bperhx bits of accu contain bits of the poly.*/
-			iter += bperhx;
-			count = 0;
-			if(flags & P_REFIN)
-				accu = rev(accu, bperhx);
-			accu &= mask;
+    while(iter < length && (c = fgetc(input)) != EOF) {
+        if(flags & P_LTLBYT)
+            accu |= (bmp_t) (c & cmask) << count;
+        else
+            accu = (accu << CHAR_BIT) | (bmp_t) (c & cmask);
+        count += CHAR_BIT;
+        if(count >= bperhx) {
+            /* the low bperhx bits of accu contain bits of the poly.*/
+            iter += bperhx;
+            count = 0;
+            if(flags & P_REFIN)
+                accu = rev(accu, bperhx);
+            accu &= mask;
 
-			/* iter >= bperhx > 0 */
-			idx = IDX(iter - 1UL);
-			ofs = OFS(iter - 1UL);
-			poly.bitmap[idx] |= accu << ofs;
-			if(ofs + bperhx > BMP_BIT) {
-				poly.bitmap[idx-1] |= accu >> (BMP_BIT - ofs);
-			}
-			accu = BMP_C(0); /* only needed for P_LTLBYT */
-		}
-	}
-	praloc(&poly, iter);
-	return(poly);
+            /* iter >= bperhx > 0 */
+            idx = IDX(iter - 1UL);
+            ofs = OFS(iter - 1UL);
+            poly.bitmap[idx] |= accu << ofs;
+            if(ofs + bperhx > BMP_BIT) {
+                poly.bitmap[idx-1] |= accu >> (BMP_BIT - ofs);
+            }
+            accu = BMP_C(0); /* only needed for P_LTLBYT */
+        }
+    }
+    praloc(&poly, iter);
+    return(poly);
 }
 
 poly_t
 strtop(const char *string, int flags, int bperhx) {
-	/* Converts a hex or character string to a poly_t.
-	 * Each character is converted to a hex nibble yielding 4 bits
-	 * unless P_DIRECT, when each character yields CHAR_BIT bits.
-	 * Nibbles and characters are accumulated left-to-right
-	 * unless P_DIRECT && P_LTLBYT, when they are accumulated
-	 * right-to-left without reflection.
-	 * As soon as at least bperhx bits are accumulated, the
-	 * rightmost bperhx bits are reflected (if P_REFIN)
-	 * and appended to the poly.  When !P_DIRECT:
-	 * bperhx=8 reads hex nibbles in pairs
-	 * bperhx=7 reads hex nibbles in pairs and discards
-	 *   b3 of first nibble
-	 * bperhx=4 reads hex nibbles singly
-	 * bperhx=3 reads octal
-	 * bperhx=1 reads longhand binary
-	 * in theory if !P_REFIN, bperhx can be any multiple of 4
-	 * with equal effect
-	 * The returned poly_t is CLEAN.
-	 */
+    /* Converts a hex or character string to a poly_t.
+     * Each character is converted to a hex nibble yielding 4 bits
+     * unless P_DIRECT, when each character yields CHAR_BIT bits.
+     * Nibbles and characters are accumulated left-to-right
+     * unless P_DIRECT && P_LTLBYT, when they are accumulated
+     * right-to-left without reflection.
+     * As soon as at least bperhx bits are accumulated, the
+     * rightmost bperhx bits are reflected (if P_REFIN)
+     * and appended to the poly.  When !P_DIRECT:
+     * bperhx=8 reads hex nibbles in pairs
+     * bperhx=7 reads hex nibbles in pairs and discards
+     *   b3 of first nibble
+     * bperhx=4 reads hex nibbles singly
+     * bperhx=3 reads octal
+     * bperhx=1 reads longhand binary
+     * in theory if !P_REFIN, bperhx can be any multiple of 4
+     * with equal effect
+     * The returned poly_t is CLEAN.
+     */
 
-	/* make two passes, one to determine the poly size
-	 * one to populate the bitmap
-	 */
-	unsigned long length = 1UL, idx;
-	bmp_t accu;
-	bmp_t mask = bperhx == BMP_BIT ? ~BMP_C(0) : (BMP_C(1) << bperhx) - BMP_C(1);
-	int pass, count, ofs;
-	int cmask = (1 << CHAR_BIT) - 1 , c;
-	const char *s;
+    /* make two passes, one to determine the poly size
+     * one to populate the bitmap
+     */
+    unsigned long length = 1UL, idx;
+    bmp_t accu;
+    bmp_t mask = bperhx == BMP_BIT ? ~BMP_C(0) : (BMP_C(1) << bperhx) - BMP_C(1);
+    int pass, count, ofs;
+    int cmask = (1 << CHAR_BIT) - 1 , c;
+    const char *s;
 
-	poly_t poly = PZERO;
-	if(bperhx > BMP_BIT || bperhx <= 0 || string == NULL || *string == '\0')
-		return(poly);
+    poly_t poly = PZERO;
+    if(bperhx > BMP_BIT || bperhx <= 0 || string == NULL || *string == '\0')
+        return(poly);
 
-	if(~flags & P_DIRECT) {
-		if(*string == '$' || *string == '&')
-			++string;
-		else if(*string == '0'
-			&& (string[1] == 'x' || string[1] == 'X'))
-			string += 2;
-	}
-	length = (*string != '\0');
+    if(~flags & P_DIRECT) {
+        if(*string == '$' || *string == '&')
+            ++string;
+        else if(*string == '0'
+            && (string[1] == 'x' || string[1] == 'X'))
+            string += 2;
+    }
+    length = (*string != '\0');
 
-	for(pass=0; pass<2 && length > 0UL; ++pass) {
-		s = string;
-		length = 0UL;
-		count = 0;
-		accu = BMP_C(0);
-		while((c = *s++)) {
-			if(flags & P_DIRECT) {
-				if(flags & P_LTLBYT)
-					accu |= (bmp_t) (c & cmask) << count;
-				else
-					accu = (accu << CHAR_BIT) | (bmp_t) (c & cmask);
-				count += CHAR_BIT;
-			} else {
-				if(c == ' ' || c == '\t' || c == '\r' || c == '\n') continue;
-				accu <<= 4;
-				count += 4;
-				switch(c) {
-					case '0':
-					case '1':
-					case '2':
-					case '3':
-					case '4':
-					case '5':
-					case '6':
-					case '7':
-					case '8':
-					case '9':
-						accu |= (bmp_t) c - '0';
-						break;
-					case 'A':
-					case 'a':
-						accu |= BMP_C(0xa);
-						break;
-					case 'B':
-					case 'b':
-						accu |= BMP_C(0xb);
-						break;
-					case 'C':
-					case 'c':
-						accu |= BMP_C(0xc);
-						break;
-					case 'D':
-					case 'd':
-						accu |= BMP_C(0xd);
-						break;
-					case 'E':
-					case 'e':
-						accu |= BMP_C(0xe);
-						break;
-					case 'F':
-					case 'f':
-						accu |= BMP_C(0xf);
-						break;
-					default:
-						uerror("invalid character in hexadecimal argument");
-				}
-			}
+    for(pass=0; pass<2 && length > 0UL; ++pass) {
+        s = string;
+        length = 0UL;
+        count = 0;
+        accu = BMP_C(0);
+        while((c = *s++)) {
+            if(flags & P_DIRECT) {
+                if(flags & P_LTLBYT)
+                    accu |= (bmp_t) (c & cmask) << count;
+                else
+                    accu = (accu << CHAR_BIT) | (bmp_t) (c & cmask);
+                count += CHAR_BIT;
+            } else {
+                if(c == ' ' || c == '\t' || c == '\r' || c == '\n') continue;
+                accu <<= 4;
+                count += 4;
+                switch(c) {
+                    case '0':
+                    case '1':
+                    case '2':
+                    case '3':
+                    case '4':
+                    case '5':
+                    case '6':
+                    case '7':
+                    case '8':
+                    case '9':
+                        accu |= (bmp_t) c - '0';
+                        break;
+                    case 'A':
+                    case 'a':
+                        accu |= BMP_C(0xa);
+                        break;
+                    case 'B':
+                    case 'b':
+                        accu |= BMP_C(0xb);
+                        break;
+                    case 'C':
+                    case 'c':
+                        accu |= BMP_C(0xc);
+                        break;
+                    case 'D':
+                    case 'd':
+                        accu |= BMP_C(0xd);
+                        break;
+                    case 'E':
+                    case 'e':
+                        accu |= BMP_C(0xe);
+                        break;
+                    case 'F':
+                    case 'f':
+                        accu |= BMP_C(0xf);
+                        break;
+                    default:
+                        uerror("invalid character in hexadecimal argument");
+                }
+            }
 
-			if(count >= bperhx) {
-				/* the low bperhx bits of accu contain bits of the poly.
-				 * in pass 0, increment length by bperhx.
-				 * in pass 1, put the low bits of accu into the bitmap. */
-				length += bperhx;
-				count = 0;
-				if(pass == 1) {
-					if(flags & P_REFIN)
-						accu = rev(accu, bperhx);
-					accu &= mask;
+            if(count >= bperhx) {
+                /* the low bperhx bits of accu contain bits of the poly.
+                 * in pass 0, increment length by bperhx.
+                 * in pass 1, put the low bits of accu into the bitmap. */
+                length += bperhx;
+                count = 0;
+                if(pass == 1) {
+                    if(flags & P_REFIN)
+                        accu = rev(accu, bperhx);
+                    accu &= mask;
 
-					/* length >= bperhx > 0 */
-					idx = IDX(length - 1);
-					ofs = OFS(length - 1);
-					poly.bitmap[idx] |= accu << ofs;
-					if(ofs + bperhx > BMP_BIT)
-						poly.bitmap[idx-1] |= accu >> (BMP_BIT - ofs);
-					accu = BMP_C(0); /* only needed for P_LTLBYT */
-				}
-			}
-		}
-		if(pass == 0) palloc(&poly, length);
-	}
-	return(poly);
+                    /* length >= bperhx > 0 */
+                    idx = IDX(length - 1);
+                    ofs = OFS(length - 1);
+                    poly.bitmap[idx] |= accu << ofs;
+                    if(ofs + bperhx > BMP_BIT)
+                        poly.bitmap[idx-1] |= accu >> (BMP_BIT - ofs);
+                    accu = BMP_C(0); /* only needed for P_LTLBYT */
+                }
+            }
+        }
+        if(pass == 0) palloc(&poly, length);
+    }
+    return(poly);
 }
 
 char *
 ptostr(const poly_t poly, int flags, int bperhx) {
-	/* Returns a malloc()-ed string containing a hexadecimal
-	 * representation of poly. See phxsubs().
-	 */
-	return(pxsubs(poly, flags, bperhx, 0UL, poly.length));
+    /* Returns a malloc()-ed string containing a hexadecimal
+     * representation of poly. See phxsubs().
+     */
+    return(pxsubs(poly, flags, bperhx, 0UL, poly.length));
 }
 
 char *
 pxsubs(const poly_t poly, int flags, int bperhx, unsigned long start, unsigned long end) {
-	/* Returns a malloc()-ed string containing a hexadecimal
-	 * representation of a portion of poly, from bit offset start to
-	 * (end - 1) inclusive.  The output is grouped into words of
-	 * bperhx bits each.  If P_RTJUST then the first word is padded
-	 * with zeroes at the MSB end to make a whole number of words,
-	 * otherwise the last word is padded at the LSB end.  After
-	 * justification the bperhx bits of each word are reversed (if
-	 * P_REFOUT) and printed as a hex sequence, with words
-	 * optionally separated by spaces (P_SPACE).
-	 * If end exceeds the length of poly then zero bits are appended
-	 * to make up the difference, in which case poly must be CLEAN.
-	 */
-	char *string, *sptr;
-	unsigned long size, iter;
-	bmp_t accu;
-	bmp_t mask = bperhx == BMP_BIT ? ~BMP_C(0) : (BMP_C(1) << bperhx) - BMP_C(1);
-	int cperhx, part;
+    /* Returns a malloc()-ed string containing a hexadecimal
+     * representation of a portion of poly, from bit offset start to
+     * (end - 1) inclusive.  The output is grouped into words of
+     * bperhx bits each.  If P_RTJUST then the first word is padded
+     * with zeroes at the MSB end to make a whole number of words,
+     * otherwise the last word is padded at the LSB end.  After
+     * justification the bperhx bits of each word are reversed (if
+     * P_REFOUT) and printed as a hex sequence, with words
+     * optionally separated by spaces (P_SPACE).
+     * If end exceeds the length of poly then zero bits are appended
+     * to make up the difference, in which case poly must be CLEAN.
+     */
+    char *string, *sptr;
+    unsigned long size, iter;
+    bmp_t accu;
+    bmp_t mask = bperhx == BMP_BIT ? ~BMP_C(0) : (BMP_C(1) << bperhx) - BMP_C(1);
+    int cperhx, part;
 
-	if(bperhx <= 0 || bperhx > BMP_BIT) return(NULL);
+    if(bperhx <= 0 || bperhx > BMP_BIT) return(NULL);
 
-	if(start > poly.length) start = poly.length;
-	if(end > poly.length) end = poly.length;
-	if(end < start) end = start;
+    if(start > poly.length) start = poly.length;
+    if(end > poly.length) end = poly.length;
+    if(end < start) end = start;
 
-	cperhx = (bperhx + 3) >> 2;
-	if(flags & P_SPACE) ++cperhx;
+    cperhx = (bperhx + 3) >> 2;
+    if(flags & P_SPACE) ++cperhx;
 
-	size = (end - start + bperhx - 1UL) / bperhx;
-	size *= cperhx;
-	if(!size || ~flags & P_SPACE) ++size; /* for trailing null */
+    size = (end - start + bperhx - 1UL) / bperhx;
+    size *= cperhx;
+    if(!size || ~flags & P_SPACE) ++size; /* for trailing null */
 
-	if(!(sptr = string = (char *) calloc(size, sizeof(char))))
-		uerror("cannot allocate memory for string");
+    if(!(sptr = string = (char *) calloc(size, sizeof(char))))
+        uerror("cannot allocate memory for string");
 
-	size = end - start;
-	part = (int) size % bperhx;
-	if(part && flags & P_RTJUST) {
-		iter = start + part;
-		accu = getwrd(poly, iter - 1UL) & ((BMP_C(1) << part) - BMP_C(1));
-		if(flags & P_REFOUT)
-			/* best to reverse over bperhx rather than part, I think
-			 * e.g. converting a 7-bit poly to 8-bit little-endian hex
-			 */
-			accu = rev(accu, bperhx);
-		prhex(&sptr, accu, flags, bperhx);
-		if(flags & P_SPACE && size > iter) *sptr++ = ' ';
-	} else {
-		iter = start;
-	}
+    size = end - start;
+    part = (int) size % bperhx;
+    if(part && flags & P_RTJUST) {
+        iter = start + part;
+        accu = getwrd(poly, iter - 1UL) & ((BMP_C(1) << part) - BMP_C(1));
+        if(flags & P_REFOUT)
+            /* best to reverse over bperhx rather than part, I think
+             * e.g. converting a 7-bit poly to 8-bit little-endian hex
+             */
+            accu = rev(accu, bperhx);
+        prhex(&sptr, accu, flags, bperhx);
+        if(flags & P_SPACE && size > iter) *sptr++ = ' ';
+    } else {
+        iter = start;
+    }
 
-	while((iter+=bperhx) <= end) {
-		accu = getwrd(poly, iter - 1UL) & mask;
-		if(flags & P_REFOUT)
-			accu = rev(accu, bperhx);
-		prhex(&sptr, accu, flags, bperhx);
-		if(flags & P_SPACE && size > iter) *sptr++ = ' ';
-	}
+    while((iter+=bperhx) <= end) {
+        accu = getwrd(poly, iter - 1UL) & mask;
+        if(flags & P_REFOUT)
+            accu = rev(accu, bperhx);
+        prhex(&sptr, accu, flags, bperhx);
+        if(flags & P_SPACE && size > iter) *sptr++ = ' ';
+    }
 
-	if(part && ~flags & P_RTJUST) {
-		accu = getwrd(poly, end - 1UL);
-		if(flags & P_REFOUT)
-			accu = rev(accu, part);
-		else
-			accu = accu << (bperhx - part) & mask;
-		prhex(&sptr, accu, flags, bperhx);
-	}
-	*sptr = '\0';
-	return(string);
+    if(part && ~flags & P_RTJUST) {
+        accu = getwrd(poly, end - 1UL);
+        if(flags & P_REFOUT)
+            accu = rev(accu, part);
+        else
+            accu = accu << (bperhx - part) & mask;
+        prhex(&sptr, accu, flags, bperhx);
+    }
+    *sptr = '\0';
+    return(string);
 }
 
 poly_t
 pclone(const poly_t poly) {
-	/* Returns a freestanding copy of poly.  Does not clean poly or
-	 * the result.
-	 */
-	poly_t clone = PZERO;
+    /* Returns a freestanding copy of poly.  Does not clean poly or
+     * the result.
+     */
+    poly_t clone = PZERO;
 
-	pcpy(&clone, poly);
-	return(clone);
+    pcpy(&clone, poly);
+    return(clone);
 }
 
 void
 pcpy(poly_t *dest, const poly_t src) {
-	/* Assigns (copies) src into dest.  Does not clean src or dest.
-	 */
-	unsigned long iter, idx;
+    /* Assigns (copies) src into dest.  Does not clean src or dest.
+     */
+    unsigned long iter, idx;
 
-	praloc(dest, src.length);
-	for(iter=0UL, idx=0UL; iter < src.length; iter += BMP_BIT, ++idx)
-		dest->bitmap[idx] = src.bitmap[idx];
+    praloc(dest, src.length);
+    for(iter=0UL, idx=0UL; iter < src.length; iter += BMP_BIT, ++idx)
+        dest->bitmap[idx] = src.bitmap[idx];
 }
 
 void
 pcanon(poly_t *poly) {
-	/* Converts poly into a CLEAN object by freeing unused bitmap words
-	 * and clearing any bits in the last word beyond the last bit.
-	 * The length field has absolute priority over the contents of the bitmap.
-	 * Canonicalisation differs from normalisation in that leading and trailing
-	 * zero terms are significant and preserved.
-	 * poly may or may not be WELL-FORMED.
-	 */
-	praloc(poly, poly->length);
+    /* Converts poly into a CLEAN object by freeing unused bitmap words
+     * and clearing any bits in the last word beyond the last bit.
+     * The length field has absolute priority over the contents of the bitmap.
+     * Canonicalisation differs from normalisation in that leading and trailing
+     * zero terms are significant and preserved.
+     * poly may or may not be WELL-FORMED.
+     */
+    praloc(poly, poly->length);
 }
 
 void
 pnorm(poly_t *poly) {
-	/* Converts poly into a NORMALISED object by removing leading
-	 * and trailing zeroes, so that the polynomial starts and ends
-	 * with significant terms.
-	 * poly may or may not be WELL-FORMED.
-	 */
-	unsigned long first;
+    /* Converts poly into a NORMALISED object by removing leading
+     * and trailing zeroes, so that the polynomial starts and ends
+     * with significant terms.
+     * poly may or may not be WELL-FORMED.
+     */
+    unsigned long first;
 
-	/* call pcanon() here so pfirst() and plast() return the correct
-	 * results
-	 */
-	pcanon(poly);
-	first = pfirst(*poly);
-	if(first)
-		pshift(poly, *poly, 0UL, first, plast(*poly), 0UL);
-	else
-		praloc(poly, plast(*poly));
+    /* call pcanon() here so pfirst() and plast() return the correct
+     * results
+     */
+    pcanon(poly);
+    first = pfirst(*poly);
+    if(first)
+        pshift(poly, *poly, 0UL, first, plast(*poly), 0UL);
+    else
+        praloc(poly, plast(*poly));
 }
 
 void
 psnorm(poly_t *poly) {
-	/* Converts poly into a SEMI-NORMALISED object by removing
-	 * trailing zeroes, so that the polynomial ends with a
-	 * significant term.
-	 * poly may or may not be WELL-FORMED.
-	 */
+    /* Converts poly into a SEMI-NORMALISED object by removing
+     * trailing zeroes, so that the polynomial ends with a
+     * significant term.
+     * poly may or may not be WELL-FORMED.
+     */
 
-	/* call pcanon() here so plast() returns the correct result */
-	pcanon(poly);
-	praloc(poly, plast(*poly));
+    /* call pcanon() here so plast() returns the correct result */
+    pcanon(poly);
+    praloc(poly, plast(*poly));
 }
 
 void
 pchop(poly_t *poly) {
-	/* Normalise poly, then chop off the highest significant term
-	 * (produces a SEMI-NORMALISED object).  poly becomes a suitable
-	 * divisor for pcrc().
-	 * poly may or may not be WELL-FORMED.
-	 */
+    /* Normalise poly, then chop off the highest significant term
+     * (produces a SEMI-NORMALISED object).  poly becomes a suitable
+     * divisor for pcrc().
+     * poly may or may not be WELL-FORMED.
+     */
 
-	 /* call pcanon() here so pfirst() and plast() return correct
-	  * results
-	  */
-	pcanon(poly);
-	pshift(poly, *poly, 0UL, pfirst(*poly) + 1UL, plast(*poly), 0UL);
+     /* call pcanon() here so pfirst() and plast() return correct
+      * results
+      */
+    pcanon(poly);
+    pshift(poly, *poly, 0UL, pfirst(*poly) + 1UL, plast(*poly), 0UL);
 }
 
 void
 pkchop(poly_t *poly) {
-	/* Convert poly from Koopman notation to chopped form (produces
-	 * a SEMI-NORMALISED object).  poly becomes a suitable divisor
-	 * for pcrc().
-	 * poly may or may not be WELL-FORMED.
-	 */
-	unsigned long first;
+    /* Convert poly from Koopman notation to chopped form (produces
+     * a SEMI-NORMALISED object).  poly becomes a suitable divisor
+     * for pcrc().
+     * poly may or may not be WELL-FORMED.
+     */
+    unsigned long first;
 
-	/* call pcanon() here so pfirst() returns the correct result */
-	pcanon(poly);
-	first = pfirst(*poly);
-	if(first >= poly->length) {
-		pfree(poly);
-		return;
-	}
-	pshift(poly, *poly, 0UL, first + 1UL, poly->length, 1UL);
-	piter(poly);
+    /* call pcanon() here so pfirst() returns the correct result */
+    pcanon(poly);
+    first = pfirst(*poly);
+    if(first >= poly->length) {
+        pfree(poly);
+        return;
+    }
+    pshift(poly, *poly, 0UL, first + 1UL, poly->length, 1UL);
+    piter(poly);
 }
 
 unsigned long
 plen(const poly_t poly) {
-	/* Return length of polynomial.
-	 * poly may or may not be WELL-FORMED.
-	 */
-	return(poly.length);
+    /* Return length of polynomial.
+     * poly may or may not be WELL-FORMED.
+     */
+    return(poly.length);
 }
 
 int
 pcmp(const poly_t *a, const poly_t *b) {
-	/* Compares poly_t objects for identical sizes and contents.
-	 * a and b must be CLEAN.
-	 * Defines a total order relation for sorting, etc. although
-	 * mathematically, polynomials of equal degree are no greater or
-	 * less than one another.
-	 */
-	unsigned long iter;
-	bmp_t *aptr, *bptr;
+    /* Compares poly_t objects for identical sizes and contents.
+     * a and b must be CLEAN.
+     * Defines a total order relation for sorting, etc. although
+     * mathematically, polynomials of equal degree are no greater or
+     * less than one another.
+     */
+    unsigned long iter;
+    bmp_t *aptr, *bptr;
 
-	if(!a || !b) return(!b - !a);
-	if(a->length < b->length) return(-1);
-	if(a->length > b->length) return(1);
-	aptr = a->bitmap;
-	bptr = b->bitmap;
-	if(aptr == bptr)
-		return(0);
-	for(iter=0UL; iter < a->length; iter += BMP_BIT) {
-		if(*aptr < *bptr)
-			return(-1);
-		if(*aptr++ > *bptr++)
-			return(1);
-	}
-	return(0);
+    if(!a || !b) return(!b - !a);
+    if(a->length < b->length) return(-1);
+    if(a->length > b->length) return(1);
+    aptr = a->bitmap;
+    bptr = b->bitmap;
+    if(aptr == bptr)
+        return(0);
+    for(iter=0UL; iter < a->length; iter += BMP_BIT) {
+        if(*aptr < *bptr)
+            return(-1);
+        if(*aptr++ > *bptr++)
+            return(1);
+    }
+    return(0);
 }
 
 int
 psncmp(const poly_t *a, const poly_t *b) {
-	/* Compares polys for identical effect, i.e. as though the
-	 * shorter poly were padded with zeroes to the length of the
-	 * longer.
-	 * a and b must still be CLEAN, therefore psncmp() is *not*
-	 * identical to pcmp() on semi-normalised polys as psnorm()
-	 * clears the slack space.
-	 */
-	unsigned long length, iter, idx;
-	bmp_t aword, bword;
-	if(!a || !b) return(!b - !a);
-	length = (a->length > b->length) ? a->length : b->length;
-	for(iter = 0UL, idx = 0UL; iter < length; iter += BMP_BIT, ++idx) {
-		aword = (iter < a->length) ? a->bitmap[idx] : BMP_C(0);
-		bword = (iter < b->length) ? b->bitmap[idx] : BMP_C(0);
-		if(aword < bword)
-			return(-1);
-		if(aword > bword)
-			return(1);
-	}
-	return(0);
+    /* Compares polys for identical effect, i.e. as though the
+     * shorter poly were padded with zeroes to the length of the
+     * longer.
+     * a and b must still be CLEAN, therefore psncmp() is *not*
+     * identical to pcmp() on semi-normalised polys as psnorm()
+     * clears the slack space.
+     */
+    unsigned long length, iter, idx;
+    bmp_t aword, bword;
+    if(!a || !b) return(!b - !a);
+    length = (a->length > b->length) ? a->length : b->length;
+    for(iter = 0UL, idx = 0UL; iter < length; iter += BMP_BIT, ++idx) {
+        aword = (iter < a->length) ? a->bitmap[idx] : BMP_C(0);
+        bword = (iter < b->length) ? b->bitmap[idx] : BMP_C(0);
+        if(aword < bword)
+            return(-1);
+        if(aword > bword)
+            return(1);
+    }
+    return(0);
 }
 
 
 int
 ptst(const poly_t poly) {
-	/* Tests whether a polynomial equals zero.  Returns 0 if equal,
-	 * a nonzero value otherwise.
-	 * poly must be CLEAN.
-	 */
-	unsigned long iter;
-	bmp_t *bptr;
-	if(!poly.bitmap) return(0);
-	for(iter = 0UL, bptr = poly.bitmap; iter < poly.length; iter += BMP_BIT)
-		if(*bptr++) return(1);
-	return(0);
+    /* Tests whether a polynomial equals zero.  Returns 0 if equal,
+     * a nonzero value otherwise.
+     * poly must be CLEAN.
+     */
+    unsigned long iter;
+    bmp_t *bptr;
+    if(!poly.bitmap) return(0);
+    for(iter = 0UL, bptr = poly.bitmap; iter < poly.length; iter += BMP_BIT)
+        if(*bptr++) return(1);
+    return(0);
 }
 
 unsigned long
 pfirst(const poly_t poly) {
-	/* Returns the index of the first nonzero term in poly.  If none
-	 * is found, returns the length of poly.
-	 * poly must be CLEAN.
-	 */
-	unsigned long idx = 0UL, size = SIZE(poly.length);
-	bmp_t accu = BMP_C(0); /* initialiser for Acorn C */
-	unsigned int probe = BMP_SUB, ofs = 0;
+    /* Returns the index of the first nonzero term in poly.  If none
+     * is found, returns the length of poly.
+     * poly must be CLEAN.
+     */
+    unsigned long idx = 0UL, size = SIZE(poly.length);
+    bmp_t accu = BMP_C(0); /* initialiser for Acorn C */
+    unsigned int probe = BMP_SUB, ofs = 0;
 
-	while(idx < size && !(accu = poly.bitmap[idx])) ++idx;
-	if(idx >= size) return(poly.length);
-	while(probe) {
+    while(idx < size && !(accu = poly.bitmap[idx])) ++idx;
+    if(idx >= size) return(poly.length);
+    while(probe) {
 #ifndef BMP_POF2
-		while((ofs | probe) >= (unsigned int) BMP_BIT) probe >>= 1;
+        while((ofs | probe) >= (unsigned int) BMP_BIT) probe >>= 1;
 #endif
-		if(accu >> (ofs | probe)) ofs |= probe;
-		probe >>= 1;
-	}
+        if(accu >> (ofs | probe)) ofs |= probe;
+        probe >>= 1;
+    }
 
-	return(BMP_BIT - 1UL - ofs + idx * BMP_BIT);
+    return(BMP_BIT - 1UL - ofs + idx * BMP_BIT);
 }
 
 unsigned long
 plast(const poly_t poly) {
-	/* Returns 1 plus the index of the last nonzero term in poly.
-	 * If none is found, returns zero.
-	 * poly must be CLEAN.
-	 */
-	unsigned long idx, size = SIZE(poly.length);
-	bmp_t accu;
-	unsigned int probe = BMP_SUB, ofs = 0;
+    /* Returns 1 plus the index of the last nonzero term in poly.
+     * If none is found, returns zero.
+     * poly must be CLEAN.
+     */
+    unsigned long idx, size = SIZE(poly.length);
+    bmp_t accu;
+    unsigned int probe = BMP_SUB, ofs = 0;
 
-	if(!poly.length) return(0UL);
-	idx = size - 1UL;
-	while(idx && !(accu = poly.bitmap[idx])) --idx;
-	if(!idx && !(accu = poly.bitmap[idx])) return(0UL);
-	/* now accu == poly.bitmap[idx] and contains last significant term */
-	while(probe) {
+    if(!poly.length) return(0UL);
+    idx = size - 1UL;
+    while(idx && !(accu = poly.bitmap[idx])) --idx;
+    if(!idx && !(accu = poly.bitmap[idx])) return(0UL);
+    /* now accu == poly.bitmap[idx] and contains last significant term */
+    while(probe) {
 #ifndef BMP_POF2
-		while((ofs | probe) >= (unsigned int) BMP_BIT) probe >>= 1;
+        while((ofs | probe) >= (unsigned int) BMP_BIT) probe >>= 1;
 #endif
-		if(accu << (ofs | probe)) ofs |= probe;
-		probe >>= 1;
-	}
+        if(accu << (ofs | probe)) ofs |= probe;
+        probe >>= 1;
+    }
 
-	return(idx * BMP_BIT + ofs + 1UL);
+    return(idx * BMP_BIT + ofs + 1UL);
 }
 
 poly_t
 psubs(const poly_t src, unsigned long head, unsigned long start, unsigned long end, unsigned long tail) {
-	poly_t dest = PZERO;
-	pshift(&dest, src, head, start, end, tail);
-	return(dest);
+    poly_t dest = PZERO;
+    pshift(&dest, src, head, start, end, tail);
+    return(dest);
 }
 
 void
 pright(poly_t *poly, unsigned long length) {
-	/* Trims or extends poly to length at the left edge, prepending
-	 * zeroes if necessary.  Analogous to praloc() except the
-	 * rightmost terms of poly are preserved.
-	 * On entry, poly may or may not be WELL-FORMED.
-	 * On exit, poly is CLEAN.
-	 */
+    /* Trims or extends poly to length at the left edge, prepending
+     * zeroes if necessary.  Analogous to praloc() except the
+     * rightmost terms of poly are preserved.
+     * On entry, poly may or may not be WELL-FORMED.
+     * On exit, poly is CLEAN.
+     */
 
-	if(length > poly->length)
-		pshift(poly, *poly, length - poly->length, 0UL, poly->length, 0UL);
-	else if(length < poly->length)
-		pshift(poly, *poly, 0UL, poly->length - length, poly->length, 0UL);
-	else
-		praloc(poly, poly->length);
+    if(length > poly->length)
+        pshift(poly, *poly, length - poly->length, 0UL, poly->length, 0UL);
+    else if(length < poly->length)
+        pshift(poly, *poly, 0UL, poly->length - length, poly->length, 0UL);
+    else
+        praloc(poly, poly->length);
 }
 
 void
 pshift(poly_t *dest, const poly_t src, unsigned long head, unsigned long start, unsigned long end, unsigned long tail) {
-	/* copies bits start to end-1 of src to dest, plus the number of leading and trailing zeroes given by head and tail.
-	 * end may exceed the length of src in which case more zeroes are appended.
-	 * dest may point to src, in which case the poly is edited in place.
-	 * src must be CLEAN.
-	 * On exit, dest is CLEAN.
-	 */
+    /* copies bits start to end-1 of src to dest, plus the number of leading and trailing zeroes given by head and tail.
+     * end may exceed the length of src in which case more zeroes are appended.
+     * dest may point to src, in which case the poly is edited in place.
+     * src must be CLEAN.
+     * On exit, dest is CLEAN.
+     */
 
-	unsigned long length, fulllength, size, fullsize, iter, idx, datidx;
-	/* condition inputs; end, head and tail may be any value */
-	if(end < start) end = start;
+    unsigned long length, fulllength, size, fullsize, iter, idx, datidx;
+    /* condition inputs; end, head and tail may be any value */
+    if(end < start) end = start;
 
-	length = end - start + head;
-	fulllength = length + tail;
-	if(fulllength > src.length)
-		praloc(dest, fulllength);
-	else
-		praloc(dest, src.length);
+    length = end - start + head;
+    fulllength = length + tail;
+    if(fulllength > src.length)
+        praloc(dest, fulllength);
+    else
+        praloc(dest, src.length);
 
-	/* number of words in new poly */
-	size = SIZE(length);
-	fullsize = SIZE(fulllength);
-	/* array index of first word ending up with source material */
-	datidx = IDX(head);
+    /* number of words in new poly */
+    size = SIZE(length);
+    fullsize = SIZE(fulllength);
+    /* array index of first word ending up with source material */
+    datidx = IDX(head);
 
-	if(head > start && end > start) {
-		/* shifting right, size > 0 */
-		/* index of the source bit ending up in the LSB of the last word
-		 * size * BMP_BIT >= length > head > 0 */
-		iter = size * BMP_BIT - head - 1UL;
-		for(idx = size - 1UL; idx > datidx; iter -= BMP_BIT, --idx)
-			dest->bitmap[idx] = getwrd(src, iter);
-		dest->bitmap[idx] = getwrd(src, iter);
-		/* iter == size * BMP_BIT - head - 1 - BMP_BIT * (size - 1 - datidx)
-		 *      == BMP_BIT * (size - size + 1 + datidx) - head - 1
-		 *      == BMP_BIT * (1 + head / BMP_BIT) - head - 1
-		 *      == BMP_BIT + head - head % BMP_BIT - head - 1
-		 *      == BMP_BIT - head % BMP_BIT - 1
-		 *      >= 0
-		 */
-	} else if(head <= start) {
-		/* shifting left or copying */
-		/* index of the source bit ending up in the LSB of bitmap[idx] */
-		iter = start - head + BMP_BIT - 1UL;
-		for(idx = datidx; idx < size; iter += BMP_BIT, ++idx)
-			dest->bitmap[idx] = getwrd(src, iter);
-	}
+    if(head > start && end > start) {
+        /* shifting right, size > 0 */
+        /* index of the source bit ending up in the LSB of the last word
+         * size * BMP_BIT >= length > head > 0 */
+        iter = size * BMP_BIT - head - 1UL;
+        for(idx = size - 1UL; idx > datidx; iter -= BMP_BIT, --idx)
+            dest->bitmap[idx] = getwrd(src, iter);
+        dest->bitmap[idx] = getwrd(src, iter);
+        /* iter == size * BMP_BIT - head - 1 - BMP_BIT * (size - 1 - datidx)
+         *      == BMP_BIT * (size - size + 1 + datidx) - head - 1
+         *      == BMP_BIT * (1 + head / BMP_BIT) - head - 1
+         *      == BMP_BIT + head - head % BMP_BIT - head - 1
+         *      == BMP_BIT - head % BMP_BIT - 1
+         *      >= 0
+         */
+    } else if(head <= start) {
+        /* shifting left or copying */
+        /* index of the source bit ending up in the LSB of bitmap[idx] */
+        iter = start - head + BMP_BIT - 1UL;
+        for(idx = datidx; idx < size; iter += BMP_BIT, ++idx)
+            dest->bitmap[idx] = getwrd(src, iter);
+    }
 
-	/* clear head */
-	for(idx = 0UL; idx < datidx; ++idx)
-		dest->bitmap[idx] = BMP_C(0);
-	if(size)
-		dest->bitmap[datidx] &= ~BMP_C(0) >> LOFS(head);
+    /* clear head */
+    for(idx = 0UL; idx < datidx; ++idx)
+        dest->bitmap[idx] = BMP_C(0);
+    if(size)
+        dest->bitmap[datidx] &= ~BMP_C(0) >> LOFS(head);
 
-	/* clear tail */
-	if(LOFS(length))
-		dest->bitmap[size - 1UL] &= ~(~BMP_C(0) >> LOFS(length));
-	for(idx = size; idx < fullsize; ++idx)
-		dest->bitmap[idx] = BMP_C(0);
+    /* clear tail */
+    if(LOFS(length))
+        dest->bitmap[size - 1UL] &= ~(~BMP_C(0) >> LOFS(length));
+    for(idx = size; idx < fullsize; ++idx)
+        dest->bitmap[idx] = BMP_C(0);
 
-	/* call praloc to shrink poly if required */
-	if(dest->length > fulllength)
-		praloc(dest, fulllength);
+    /* call praloc to shrink poly if required */
+    if(dest->length > fulllength)
+        praloc(dest, fulllength);
 }
 
 void
 ppaste(poly_t *dest, const poly_t src, unsigned long skip, unsigned long seek, unsigned long end, unsigned long fulllength) {
-	/* pastes terms of src, starting from skip, to positions seek to end-1 of dest
-	 * then sets length of dest to fulllength (>= end)
-	 * to paste n terms of src, give end = seek + n
-	 * to truncate dest at end of paste, set fulllength = end
-	 * to avoid truncating, set fulllength = plen(*dest)
-	 * dest may point to src, in which case the poly is edited in place.
-	 * src must be CLEAN in the case that the end is overrun.
-	 * On exit, dest is CLEAN.
-	 */
-	bmp_t mask;
-	unsigned long seekidx, endidx, iter;
-	int seekofs;
-	if(end < seek) end = seek;
-	if(fulllength < end) fulllength = end;
+    /* pastes terms of src, starting from skip, to positions seek to end-1 of dest
+     * then sets length of dest to fulllength (>= end)
+     * to paste n terms of src, give end = seek + n
+     * to truncate dest at end of paste, set fulllength = end
+     * to avoid truncating, set fulllength = plen(*dest)
+     * dest may point to src, in which case the poly is edited in place.
+     * src must be CLEAN in the case that the end is overrun.
+     * On exit, dest is CLEAN.
+     */
+    bmp_t mask;
+    unsigned long seekidx, endidx, iter;
+    int seekofs;
+    if(end < seek) end = seek;
+    if(fulllength < end) fulllength = end;
 
-	/* expand dest if necessary. don't shrink as dest may be src */
-	if(fulllength > dest->length)
-		praloc(dest, fulllength);
-	seekidx = IDX(seek);
-	endidx = IDX(end);
-	seekofs = OFS(seek);
-	/* index of the source bit ending up in the LSB of the first modified word */
-	iter = skip + seekofs;
-	if(seekidx == endidx) {
-		/* paste affects one word (traps end = seek case) */
-		mask = ((BMP_C(1) << seekofs) - (BMP_C(1) << OFS(end))) << 1;
-		dest->bitmap[seekidx] = (dest->bitmap[seekidx] & ~mask) | (getwrd(src, iter) & mask);
-	} else if(seek > skip) {
-		/* shifting right */
-		/* index of the source bit ending up in the LSB of the last modified word */
-		iter += (endidx - seekidx) * BMP_BIT;
-		mask = ~BMP_C(0) >> LOFS(end);
-		dest->bitmap[endidx] = (dest->bitmap[endidx] & mask) | (getwrd(src, iter) & ~mask);
-		for(iter -= BMP_BIT, --endidx; endidx > seekidx; iter -= BMP_BIT, --endidx)
-			dest->bitmap[endidx] = getwrd(src, iter);
-		mask = ~BMP_C(0) >> LOFS(seek);
-		dest->bitmap[endidx] = (dest->bitmap[endidx] & ~mask) | (getwrd(src, iter) & mask);
-		/* iter == skip + seekofs + (endidx - seekidx) * BMP_BIT - BMP_BIT * (endidx - seekidx)
-		 *      == skip + seekofs + BMP_BIT * (endidx - seekidx - endidx + seekidx)
-		 *      == skip + seekofs
-		 *      >= 0
-		 */
-	} else {
-		/* shifting left or copying */
-		mask = ~BMP_C(0) >> LOFS(seek);
-		dest->bitmap[seekidx] = (dest->bitmap[seekidx] & ~mask) | (getwrd(src, iter) & mask);
-		for(iter += BMP_BIT, ++seekidx; seekidx < endidx; iter += BMP_BIT, ++seekidx)
-			dest->bitmap[seekidx] = getwrd(src, iter);
-		mask = ~BMP_C(0) >> LOFS(end);
-		dest->bitmap[seekidx] = (dest->bitmap[seekidx] & mask) | (getwrd(src, iter) & ~mask);
-	}
-	/* shrink poly if required */
-	if(dest->length > fulllength)
-		praloc(dest, fulllength);
+    /* expand dest if necessary. don't shrink as dest may be src */
+    if(fulllength > dest->length)
+        praloc(dest, fulllength);
+    seekidx = IDX(seek);
+    endidx = IDX(end);
+    seekofs = OFS(seek);
+    /* index of the source bit ending up in the LSB of the first modified word */
+    iter = skip + seekofs;
+    if(seekidx == endidx) {
+        /* paste affects one word (traps end = seek case) */
+        mask = ((BMP_C(1) << seekofs) - (BMP_C(1) << OFS(end))) << 1;
+        dest->bitmap[seekidx] = (dest->bitmap[seekidx] & ~mask) | (getwrd(src, iter) & mask);
+    } else if(seek > skip) {
+        /* shifting right */
+        /* index of the source bit ending up in the LSB of the last modified word */
+        iter += (endidx - seekidx) * BMP_BIT;
+        mask = ~BMP_C(0) >> LOFS(end);
+        dest->bitmap[endidx] = (dest->bitmap[endidx] & mask) | (getwrd(src, iter) & ~mask);
+        for(iter -= BMP_BIT, --endidx; endidx > seekidx; iter -= BMP_BIT, --endidx)
+            dest->bitmap[endidx] = getwrd(src, iter);
+        mask = ~BMP_C(0) >> LOFS(seek);
+        dest->bitmap[endidx] = (dest->bitmap[endidx] & ~mask) | (getwrd(src, iter) & mask);
+        /* iter == skip + seekofs + (endidx - seekidx) * BMP_BIT - BMP_BIT * (endidx - seekidx)
+         *      == skip + seekofs + BMP_BIT * (endidx - seekidx - endidx + seekidx)
+         *      == skip + seekofs
+         *      >= 0
+         */
+    } else {
+        /* shifting left or copying */
+        mask = ~BMP_C(0) >> LOFS(seek);
+        dest->bitmap[seekidx] = (dest->bitmap[seekidx] & ~mask) | (getwrd(src, iter) & mask);
+        for(iter += BMP_BIT, ++seekidx; seekidx < endidx; iter += BMP_BIT, ++seekidx)
+            dest->bitmap[seekidx] = getwrd(src, iter);
+        mask = ~BMP_C(0) >> LOFS(end);
+        dest->bitmap[seekidx] = (dest->bitmap[seekidx] & mask) | (getwrd(src, iter) & ~mask);
+    }
+    /* shrink poly if required */
+    if(dest->length > fulllength)
+        praloc(dest, fulllength);
 }
 
 void
 pdiff(poly_t *dest, const poly_t src, unsigned long ofs) {
-	/* Subtract src from dest (modulo 2) at offset ofs.
-	 * In modulo 2 arithmetic, subtraction is equivalent to addition
-	 * We include an alias for those who wish to retain the distinction
-	 * src and dest must be CLEAN.
-	 */
-	psum(dest, src, ofs);
+    /* Subtract src from dest (modulo 2) at offset ofs.
+     * In modulo 2 arithmetic, subtraction is equivalent to addition
+     * We include an alias for those who wish to retain the distinction
+     * src and dest must be CLEAN.
+     */
+    psum(dest, src, ofs);
 }
 
 void
 psum(poly_t *dest, const poly_t src, unsigned long ofs) {
-	/* Adds src to dest (modulo 2) at offset ofs.
-	 * When ofs == dest->length, catenates src on to dest.
-	 * src and dest must be CLEAN.
-	 */
-	unsigned long fulllength, idx, iter, end;
+    /* Adds src to dest (modulo 2) at offset ofs.
+     * When ofs == dest->length, catenates src on to dest.
+     * src and dest must be CLEAN.
+     */
+    unsigned long fulllength, idx, iter, end;
 
-	fulllength = ofs + src.length;
-	if(fulllength > dest->length)
-		praloc(dest, fulllength);
-	/* array index of first word in dest to be modified */
-	idx = IDX(ofs);
-	/* index of bit in src to be added to LSB of dest->bitmap[idx] */
-	iter = OFS(ofs);
-	/* stop value for iter */
-	end = BMP_BIT - 1UL + src.length;
-	for(; iter < end; iter += BMP_BIT, ++idx)
-		dest->bitmap[idx] ^= getwrd(src, iter);
+    fulllength = ofs + src.length;
+    if(fulllength > dest->length)
+        praloc(dest, fulllength);
+    /* array index of first word in dest to be modified */
+    idx = IDX(ofs);
+    /* index of bit in src to be added to LSB of dest->bitmap[idx] */
+    iter = OFS(ofs);
+    /* stop value for iter */
+    end = BMP_BIT - 1UL + src.length;
+    for(; iter < end; iter += BMP_BIT, ++idx)
+        dest->bitmap[idx] ^= getwrd(src, iter);
 }
 
 void
 prev(poly_t *poly) {
-	/* Reverse or reciprocate a polynomial.
-	 * On exit, poly is CLEAN.
-	 */
-	unsigned long leftidx = 0UL, rightidx = SIZE(poly->length);
-	unsigned long ofs = LOFS(BMP_BIT - LOFS(poly->length));
-	unsigned long fulllength = poly->length + ofs;
-	bmp_t accu;
+    /* Reverse or reciprocate a polynomial.
+     * On exit, poly is CLEAN.
+     */
+    unsigned long leftidx = 0UL, rightidx = SIZE(poly->length);
+    unsigned long ofs = LOFS(BMP_BIT - LOFS(poly->length));
+    unsigned long fulllength = poly->length + ofs;
+    bmp_t accu;
 
-	if(ofs) {
-		/* removable optimisation */
-		if(poly->length < (unsigned long) BMP_BIT) {
-			*poly->bitmap = rev(*poly->bitmap >> ofs, (int) poly->length) << ofs;
-			return;
-		}
+    if(ofs) {
+        /* removable optimisation */
+        if(poly->length < (unsigned long) BMP_BIT) {
+            *poly->bitmap = rev(*poly->bitmap >> ofs, (int) poly->length) << ofs;
+            return;
+        }
 
-		/* claim remaining bits of last word (as we use public function pshift()) */
-		poly->length = fulllength;
-	}
+        /* claim remaining bits of last word (as we use public function pshift()) */
+        poly->length = fulllength;
+    }
 
-	/* reverse and swap words in the array, leaving it right-justified */
-	while(leftidx < rightidx) {
-		/* rightidx > 0 */
-		accu = rev(poly->bitmap[--rightidx], BMP_BIT);
-		poly->bitmap[rightidx] = rev(poly->bitmap[leftidx], BMP_BIT);
-		poly->bitmap[leftidx++] = accu;
-	}
-	/* shift polynomial to left edge if required */
-	if(ofs)
-		pshift(poly, *poly, 0UL, ofs, fulllength, 0UL);
+    /* reverse and swap words in the array, leaving it right-justified */
+    while(leftidx < rightidx) {
+        /* rightidx > 0 */
+        accu = rev(poly->bitmap[--rightidx], BMP_BIT);
+        poly->bitmap[rightidx] = rev(poly->bitmap[leftidx], BMP_BIT);
+        poly->bitmap[leftidx++] = accu;
+    }
+    /* shift polynomial to left edge if required */
+    if(ofs)
+        pshift(poly, *poly, 0UL, ofs, fulllength, 0UL);
 }
 
 void
 prevch(poly_t *poly, int bperhx) {
-	/* Reverse each group of bperhx bits in a polynomial.
-	 * Does not clean poly.
-	 */
-	unsigned long iter = 0, idx, ofs;
-	bmp_t mask, accu;
+    /* Reverse each group of bperhx bits in a polynomial.
+     * Does not clean poly.
+     */
+    unsigned long iter = 0, idx, ofs;
+    bmp_t mask, accu;
 
-	if(bperhx < 2 || bperhx > BMP_BIT)
-		return;
-	if(poly->length % bperhx)
-		praloc(poly, bperhx - (poly->length % bperhx) + poly->length);
-	mask = ~BMP_C(0) >> (BMP_BIT - bperhx);
-	for(iter = (unsigned long) (bperhx - 1); iter < poly->length; iter += bperhx) {
-		accu = getwrd(*poly, iter) & mask;
-		accu ^= rev(accu, bperhx);
-		idx = IDX(iter);
-		ofs = OFS(iter);
-		poly->bitmap[idx] ^= accu << ofs;
-		if(ofs + bperhx > (unsigned int) BMP_BIT)
-			/* (BMP_BIT - 1UL - (iter) % BMP_BIT) + bperhx > BMP_BIT
-			 * (-1UL - (iter) % BMP_BIT) + bperhx > 0
-			 * (- (iter % BMP_BIT)) + bperhx > 1
-			 * - (iter % BMP_BIT) > 1 - bperhx
-			 * iter % BMP_BIT < bperhx - 1, iter >= bperhx - 1
-			 * iter >= BMP_BIT
-			 * idx >= 1
-			 */
-			poly->bitmap[idx-1] ^= accu >> (BMP_BIT - ofs);
-	}
+    if(bperhx < 2 || bperhx > BMP_BIT)
+        return;
+    if(poly->length % bperhx)
+        praloc(poly, bperhx - (poly->length % bperhx) + poly->length);
+    mask = ~BMP_C(0) >> (BMP_BIT - bperhx);
+    for(iter = (unsigned long) (bperhx - 1); iter < poly->length; iter += bperhx) {
+        accu = getwrd(*poly, iter) & mask;
+        accu ^= rev(accu, bperhx);
+        idx = IDX(iter);
+        ofs = OFS(iter);
+        poly->bitmap[idx] ^= accu << ofs;
+        if(ofs + bperhx > (unsigned int) BMP_BIT)
+            /* (BMP_BIT - 1UL - (iter) % BMP_BIT) + bperhx > BMP_BIT
+             * (-1UL - (iter) % BMP_BIT) + bperhx > 0
+             * (- (iter % BMP_BIT)) + bperhx > 1
+             * - (iter % BMP_BIT) > 1 - bperhx
+             * iter % BMP_BIT < bperhx - 1, iter >= bperhx - 1
+             * iter >= BMP_BIT
+             * idx >= 1
+             */
+            poly->bitmap[idx-1] ^= accu >> (BMP_BIT - ofs);
+    }
 }
 
 void
 prcp(poly_t *poly) {
-	/* Reciprocate a chopped polynomial.  Use prev() on whole
-	 * polynomials.
-	 * On exit, poly is SEMI-NORMALISED.
-	 */
-	unsigned long first;
+    /* Reciprocate a chopped polynomial.  Use prev() on whole
+     * polynomials.
+     * On exit, poly is SEMI-NORMALISED.
+     */
+    unsigned long first;
 
-	praloc(poly, RNDUP(poly->length));
-	prev(poly);
-	first = pfirst(*poly);
-	if(first >= poly->length) {
-		pfree(poly);
-		return;
-	}
-	pshift(poly, *poly, 0UL, first + 1UL, poly->length, 1UL);
-	piter(poly);
+    praloc(poly, RNDUP(poly->length));
+    prev(poly);
+    first = pfirst(*poly);
+    if(first >= poly->length) {
+        pfree(poly);
+        return;
+    }
+    pshift(poly, *poly, 0UL, first + 1UL, poly->length, 1UL);
+    piter(poly);
 }
 
 void
 pinv(poly_t *poly) {
-	/* Invert a polynomial, i.e. add 1 (modulo 2) to the coefficient of each term
-	 * on exit, poly is CLEAN.
-	 */
-	unsigned long idx, size = SIZE(poly->length);
+    /* Invert a polynomial, i.e. add 1 (modulo 2) to the coefficient of each term
+     * on exit, poly is CLEAN.
+     */
+    unsigned long idx, size = SIZE(poly->length);
 
-	for(idx = 0UL; idx<size; ++idx)
-		poly->bitmap[idx] = ~poly->bitmap[idx];
-	if(LOFS(poly->length))
-		poly->bitmap[size - 1UL] &= ~(~BMP_C(0) >> LOFS(poly->length));
+    for(idx = 0UL; idx<size; ++idx)
+        poly->bitmap[idx] = ~poly->bitmap[idx];
+    if(LOFS(poly->length))
+        poly->bitmap[size - 1UL] &= ~(~BMP_C(0) >> LOFS(poly->length));
 }
 
 poly_t
 pmod(const poly_t dividend, const poly_t divisor) {
-	/* Divide dividend by normalised divisor and return the remainder
-	 * This function generates a temporary 'chopped' divisor for pcrc()
-	 * If calling repeatedly with a constant divisor, produce a chopped copy
-	 * with pchop() and call pcrc() directly for higher efficiency.
-	 * dividend and divisor must be CLEAN.
-	 */
+    /* Divide dividend by normalised divisor and return the remainder
+     * This function generates a temporary 'chopped' divisor for pcrc()
+     * If calling repeatedly with a constant divisor, produce a chopped copy
+     * with pchop() and call pcrc() directly for higher efficiency.
+     * dividend and divisor must be CLEAN.
+     */
 
-	/* perhaps generate an error if divisor is zero */
-	poly_t subdivisor = psubs(divisor, 0UL, pfirst(divisor) + 1UL, plast(divisor), 0UL);
-	poly_t result = pcrc(dividend, subdivisor, pzero, pzero, 0);
-	pfree(&subdivisor);
-	return(result);
+    /* perhaps generate an error if divisor is zero */
+    poly_t subdivisor = psubs(divisor, 0UL, pfirst(divisor) + 1UL, plast(divisor), 0UL);
+    poly_t result = pcrc(dividend, subdivisor, pzero, pzero, 0);
+    pfree(&subdivisor);
+    return(result);
 }
 
 poly_t
 pcrc(const poly_t message, const poly_t divisor, const poly_t init, const poly_t xorout, int flags) {
-	/* Divide message by divisor and return the remainder.
-	 * init is added to divisor, highest terms aligned, before
-	 * division.
-	 * xorout is added to the remainder, highest terms aligned.
-	 * If P_MULXN is set in flags, message is multiplied by x^n
-	 * (i.e. trailing zeroes equal to the CRC width are appended)
-	 * before adding init and division.  Set P_MULXN for most CRC
-	 * calculations.
-	 * All inputs must be CLEAN.
-	 * If all inputs are CLEAN, the returned poly_t will be CLEAN.
-	 */
-	unsigned long max = 0UL, iter, ofs, resiter;
-	bmp_t probe, rem, dvsr, *rptr, *sptr;
-	const bmp_t *bptr, *eptr;
-	poly_t result = PZERO;
+    /* Divide message by divisor and return the remainder.
+     * init is added to divisor, highest terms aligned, before
+     * division.
+     * xorout is added to the remainder, highest terms aligned.
+     * If P_MULXN is set in flags, message is multiplied by x^n
+     * (i.e. trailing zeroes equal to the CRC width are appended)
+     * before adding init and division.  Set P_MULXN for most CRC
+     * calculations.
+     * All inputs must be CLEAN.
+     * If all inputs are CLEAN, the returned poly_t will be CLEAN.
+     */
+    unsigned long max = 0UL, iter, ofs, resiter;
+    bmp_t probe, rem, dvsr, *rptr, *sptr;
+    const bmp_t *bptr, *eptr;
+    poly_t result = PZERO;
 
-	if(flags & P_MULXN)
-		max = message.length;
-	else if(message.length > divisor.length)
-		max = message.length - divisor.length;
-	bptr=message.bitmap;
-	eptr=message.bitmap+SIZE(message.length);
-	probe=~(~BMP_C(0) >> 1);
-	if(divisor.length <= (unsigned long) BMP_BIT
-		&& init.length <= (unsigned long) BMP_BIT) {
-		rem = init.length ? *init.bitmap : BMP_C(0);
-		dvsr = divisor.length ? *divisor.bitmap : BMP_C(0);
-		for(iter = 0UL, ofs = 0UL; iter < max; ++iter, --ofs) {
-			if(!ofs) {
-				ofs = BMP_BIT;
-				rem ^= *bptr++;
-			}
-			if(rem & probe)
-				rem = (rem << 1) ^ dvsr;
-			else
-				rem <<= 1;
-		}
-		if(bptr < eptr)
-			/* max < message.length */
-			rem ^= *bptr >> OFS(BMP_BIT - 1UL + max);
-		if(init.length > max && init.length - max > divisor.length) {
-			palloc(&result, init.length - max);
-			*result.bitmap = rem;
-		} else if(divisor.length) {
-			palloc(&result, divisor.length);
-			*result.bitmap = rem;
-		}
-	} else {
-		/* allocate maximum size plus one word for shifted divisors and one word containing zero.
-		 * This also ensures that result[1] exists
-		 */
-		palloc(&result, (init.length > divisor.length ? init.length : divisor.length) + (unsigned long) (BMP_BIT << 1));
-		/*if there is content in init, there will be an extra word in result to clear it */
-		psum(&result, init, 0UL);
-		if(max)
-			*result.bitmap ^= *bptr++;
-		for(iter = 0UL, ofs = 0UL; iter < max; ++iter, probe >>= 1) {
-			if(!probe) {
-				probe = ~(~BMP_C(0) >> 1);
-				ofs = 0UL;
-				sptr = rptr = result.bitmap;
-				++sptr;
-				/* iter < max <= message.length, so bptr is valid
-				 * shift result one word to the left, splicing in a message word
-				 * and clearing the last active word
-				 */
-				*rptr++ = *sptr++ ^ *bptr++;
-				for(resiter = (unsigned long) (BMP_BIT << 1); resiter < result.length; resiter += BMP_BIT)
-					*rptr++ = *sptr++;
-			}
-			++ofs;
-			if(*result.bitmap & probe)
-				psum(&result, divisor, ofs);
-		}
-		rptr = result.bitmap;
-		++rptr;
-		while(bptr < eptr)
-			*rptr++ ^= *bptr++;
-		/* 0 <= ofs <= BMP_BIT, location of the first bit of the result */
-		pshift(&result, result, 0UL, ofs, (init.length > max + divisor.length ? init.length - max - divisor.length : 0UL) + divisor.length + ofs, 0UL);
-	}
-	psum(&result, xorout, 0UL);
-	return(result);
+    if(flags & P_MULXN)
+        max = message.length;
+    else if(message.length > divisor.length)
+        max = message.length - divisor.length;
+    bptr=message.bitmap;
+    eptr=message.bitmap+SIZE(message.length);
+    probe=~(~BMP_C(0) >> 1);
+    if(divisor.length <= (unsigned long) BMP_BIT
+        && init.length <= (unsigned long) BMP_BIT) {
+        rem = init.length ? *init.bitmap : BMP_C(0);
+        dvsr = divisor.length ? *divisor.bitmap : BMP_C(0);
+        for(iter = 0UL, ofs = 0UL; iter < max; ++iter, --ofs) {
+            if(!ofs) {
+                ofs = BMP_BIT;
+                rem ^= *bptr++;
+            }
+            if(rem & probe)
+                rem = (rem << 1) ^ dvsr;
+            else
+                rem <<= 1;
+        }
+        if(bptr < eptr)
+            /* max < message.length */
+            rem ^= *bptr >> OFS(BMP_BIT - 1UL + max);
+        if(init.length > max && init.length - max > divisor.length) {
+            palloc(&result, init.length - max);
+            *result.bitmap = rem;
+        } else if(divisor.length) {
+            palloc(&result, divisor.length);
+            *result.bitmap = rem;
+        }
+    } else {
+        /* allocate maximum size plus one word for shifted divisors and one word containing zero.
+         * This also ensures that result[1] exists
+         */
+        palloc(&result, (init.length > divisor.length ? init.length : divisor.length) + (unsigned long) (BMP_BIT << 1));
+        /*if there is content in init, there will be an extra word in result to clear it */
+        psum(&result, init, 0UL);
+        if(max)
+            *result.bitmap ^= *bptr++;
+        for(iter = 0UL, ofs = 0UL; iter < max; ++iter, probe >>= 1) {
+            if(!probe) {
+                probe = ~(~BMP_C(0) >> 1);
+                ofs = 0UL;
+                sptr = rptr = result.bitmap;
+                ++sptr;
+                /* iter < max <= message.length, so bptr is valid
+                 * shift result one word to the left, splicing in a message word
+                 * and clearing the last active word
+                 */
+                *rptr++ = *sptr++ ^ *bptr++;
+                for(resiter = (unsigned long) (BMP_BIT << 1); resiter < result.length; resiter += BMP_BIT)
+                    *rptr++ = *sptr++;
+            }
+            ++ofs;
+            if(*result.bitmap & probe)
+                psum(&result, divisor, ofs);
+        }
+        rptr = result.bitmap;
+        ++rptr;
+        while(bptr < eptr)
+            *rptr++ ^= *bptr++;
+        /* 0 <= ofs <= BMP_BIT, location of the first bit of the result */
+        pshift(&result, result, 0UL, ofs, (init.length > max + divisor.length ? init.length - max - divisor.length : 0UL) + divisor.length + ofs, 0UL);
+    }
+    psum(&result, xorout, 0UL);
+    return(result);
 }
 
 int
 piter(poly_t *poly) {
-	/* Replace poly with the 'next' polynomial of equal length.
-	 * Returns zero if the next polynomial is all zeroes, a nonzero
-	 * value otherwise.
-	 * Does not clean poly.
-	 */
-	bmp_t *bptr;
-	if(!poly->length) return(0);
+    /* Replace poly with the 'next' polynomial of equal length.
+     * Returns zero if the next polynomial is all zeroes, a nonzero
+     * value otherwise.
+     * Does not clean poly.
+     */
+    bmp_t *bptr;
+    if(!poly->length) return(0);
 
-	bptr = poly->bitmap + IDX(poly->length - 1UL);
-	*bptr += BMP_C(1) << OFS(poly->length - 1UL);
-	while(bptr != poly->bitmap && !*bptr)
-		++(*--bptr);
-	return(*bptr != BMP_C(0));
+    bptr = poly->bitmap + IDX(poly->length - 1UL);
+    *bptr += BMP_C(1) << OFS(poly->length - 1UL);
+    while(bptr != poly->bitmap && !*bptr)
+        ++(*--bptr);
+    return(*bptr != BMP_C(0));
 }
 
 void
 palloc(poly_t *poly, unsigned long length) {
-	/* Replaces poly with a CLEAN object of the specified length,
-	 * consisting of all zeroes.
-	 * It is safe to call with length = 0, in which case the object
-	 * is freed.
-	 * poly may or may not be WELL-FORMED.
-	 * On exit, poly is CLEAN.
-	 */
-	unsigned long size = SIZE(length);
+    /* Replaces poly with a CLEAN object of the specified length,
+     * consisting of all zeroes.
+     * It is safe to call with length = 0, in which case the object
+     * is freed.
+     * poly may or may not be WELL-FORMED.
+     * On exit, poly is CLEAN.
+     */
+    unsigned long size = SIZE(length);
 
-	poly->length = 0UL;
-	free(poly->bitmap);
-	poly->bitmap = NULL;
-	if(!length) return;
-	if(!size)
-		size = IDX(length) + 1UL;
-	poly->bitmap = (bmp_t *) calloc(size, sizeof(bmp_t));
-	if(poly->bitmap) {
-		poly->length = length;
-	} else
-		uerror("cannot allocate memory for poly");
+    poly->length = 0UL;
+    free(poly->bitmap);
+    poly->bitmap = NULL;
+    if(!length) return;
+    if(!size)
+        size = IDX(length) + 1UL;
+    poly->bitmap = (bmp_t *) calloc(size, sizeof(bmp_t));
+    if(poly->bitmap) {
+        poly->length = length;
+    } else
+        uerror("cannot allocate memory for poly");
 }
 
 void
 pfree(poly_t *poly) {
-	/* Frees poly's bitmap storage and sets poly equal to the empty
-	 * polynomial (PZERO).
-	 * poly may or may not be WELL-FORMED.
-	 * On exit, poly is CLEAN.
-	 */
+    /* Frees poly's bitmap storage and sets poly equal to the empty
+     * polynomial (PZERO).
+     * poly may or may not be WELL-FORMED.
+     * On exit, poly is CLEAN.
+     */
 
-	/* palloc(poly, 0UL); */
+    /* palloc(poly, 0UL); */
 
-	poly->length = 0UL;
-	free(poly->bitmap);
-	poly->bitmap = NULL;
+    poly->length = 0UL;
+    free(poly->bitmap);
+    poly->bitmap = NULL;
 }
 
 void
 praloc(poly_t *poly, unsigned long length) {
-	/* Trims or extends poly to length at the right edge, appending
-	 * zeroes if necessary.
-	 * On entry, poly may or may not be WELL-FORMED.
-	 * On exit, poly is CLEAN.
-	 */
-	unsigned long oldsize, size = SIZE(length);
-	if(!poly) return;
-	if(!length) {
-		poly->length = 0UL;
-		free(poly->bitmap);
-		poly->bitmap = NULL;
-		return;
-	}
-	if(!size)
-		size = IDX(length) + 1UL;
-	if(!poly->bitmap)
-		poly->length = 0UL;
-	oldsize = SIZE(poly->length);
-	if(oldsize != size)
-		/* reallocate if array pointer is null or array resized */
-		poly->bitmap = (bmp_t *) realloc((void *)poly->bitmap, size * sizeof(bmp_t));
-	if(poly->bitmap) {
-		if(poly->length < length) {
-			/* poly->length >= 0, length > 0, size > 0.
-			 * poly expanded. clear old last word and all new words
-			 */
-			if(LOFS(poly->length))
-				poly->bitmap[oldsize - 1UL] &= ~(~BMP_C(0) >> LOFS(poly->length));
-			while(oldsize < size)
-				poly->bitmap[oldsize++] = BMP_C(0);
-		} else if(LOFS(length))
-			/* poly->length >= length > 0.
-			 * poly shrunk. clear new last word
-			 */
-			poly->bitmap[size - 1UL] &= ~(~BMP_C(0) >> LOFS(length));
-		poly->length = length;
-	} else
-		uerror("cannot reallocate memory for poly");
+    /* Trims or extends poly to length at the right edge, appending
+     * zeroes if necessary.
+     * On entry, poly may or may not be WELL-FORMED.
+     * On exit, poly is CLEAN.
+     */
+    unsigned long oldsize, size = SIZE(length);
+    if(!poly) return;
+    if(!length) {
+        poly->length = 0UL;
+        free(poly->bitmap);
+        poly->bitmap = NULL;
+        return;
+    }
+    if(!size)
+        size = IDX(length) + 1UL;
+    if(!poly->bitmap)
+        poly->length = 0UL;
+    oldsize = SIZE(poly->length);
+    if(oldsize != size)
+        /* reallocate if array pointer is null or array resized */
+        poly->bitmap = (bmp_t *) realloc((void *)poly->bitmap, size * sizeof(bmp_t));
+    if(poly->bitmap) {
+        if(poly->length < length) {
+            /* poly->length >= 0, length > 0, size > 0.
+             * poly expanded. clear old last word and all new words
+             */
+            if(LOFS(poly->length))
+                poly->bitmap[oldsize - 1UL] &= ~(~BMP_C(0) >> LOFS(poly->length));
+            while(oldsize < size)
+                poly->bitmap[oldsize++] = BMP_C(0);
+        } else if(LOFS(length))
+            /* poly->length >= length > 0.
+             * poly shrunk. clear new last word
+             */
+            poly->bitmap[size - 1UL] &= ~(~BMP_C(0) >> LOFS(length));
+        poly->length = length;
+    } else
+        uerror("cannot reallocate memory for poly");
 }
 
 int
 pmpar(const poly_t poly, const poly_t mask) {
-	/* Return even parity of poly masked with mask.
-	 * Poly and mask must be CLEAN.
-	 */
-	bmp_t res = BMP_C(0);
-	int i = BMP_SUB;
-	const bmp_t *pptr = poly.bitmap, *mptr = mask.bitmap;
-	const bmp_t *const pend = poly.bitmap + SIZE(poly.length);
-	const bmp_t *const mend = mask.bitmap + SIZE(mask.length);
+    /* Return even parity of poly masked with mask.
+     * Poly and mask must be CLEAN.
+     */
+    bmp_t res = BMP_C(0);
+    int i = BMP_SUB;
+    const bmp_t *pptr = poly.bitmap, *mptr = mask.bitmap;
+    const bmp_t *const pend = poly.bitmap + SIZE(poly.length);
+    const bmp_t *const mend = mask.bitmap + SIZE(mask.length);
 
-	while(pptr < pend && mptr < mend)
-		res ^= *pptr++ & *mptr++;
-	do
-		res ^= res >> i;
-	while(i >>= 1);
+    while(pptr < pend && mptr < mend)
+        res ^= *pptr++ & *mptr++;
+    do
+        res ^= res >> i;
+    while(i >>= 1);
 
-	return((int) (res & BMP_C(1)));
+    return((int) (res & BMP_C(1)));
 }
 
 int
 pident(const poly_t a, const poly_t b) {
-	/* Return nonzero if a and b have the same length
-	 * and point to the same bitmap.
-	 * a and b need not be CLEAN.
-	 */
-	return(a.length == b.length && a.bitmap == b.bitmap);
+    /* Return nonzero if a and b have the same length
+     * and point to the same bitmap.
+     * a and b need not be CLEAN.
+     */
+    return(a.length == b.length && a.bitmap == b.bitmap);
 }
 
 /* Private functions */
 
 static bmp_t
 getwrd(const poly_t poly, unsigned long iter) {
-	/* Fetch unaligned word from poly where LSB of result is
-	 * bit iter of the bitmap (counting from zero).  If iter exceeds
-	 * the length of poly then zeroes are appended as necessary.
-	 * Factored from ptostr().
-	 * poly must be CLEAN.
-	 */
-	bmp_t accu = BMP_C(0);
-	unsigned long idx, size;
-	int ofs;
+    /* Fetch unaligned word from poly where LSB of result is
+     * bit iter of the bitmap (counting from zero).  If iter exceeds
+     * the length of poly then zeroes are appended as necessary.
+     * Factored from ptostr().
+     * poly must be CLEAN.
+     */
+    bmp_t accu = BMP_C(0);
+    unsigned long idx, size;
+    int ofs;
 
-	idx = IDX(iter);
-	ofs = OFS(iter);
-	size = SIZE(poly.length);
+    idx = IDX(iter);
+    ofs = OFS(iter);
+    size = SIZE(poly.length);
 
-	if(idx < size)
-		accu |= poly.bitmap[idx] >> ofs;
-	if(idx && idx <= size && ofs > 0)
-		accu |= poly.bitmap[idx - 1UL] << (BMP_BIT - ofs);
-	return(accu);
+    if(idx < size)
+        accu |= poly.bitmap[idx] >> ofs;
+    if(idx && idx <= size && ofs > 0)
+        accu |= poly.bitmap[idx - 1UL] << (BMP_BIT - ofs);
+    return(accu);
 }
 
 static bmp_t
 rev(bmp_t accu, int bits) {
-	/* Returns the bitmap word argument with the given number of
-	 * least significant bits reversed and the rest cleared.
-	 */
-	static const unsigned char revtab[256] = {
-		0x00,0x80,0x40,0xc0,0x20,0xa0,0x60,0xe0,
-		0x10,0x90,0x50,0xd0,0x30,0xb0,0x70,0xf0,
-		0x08,0x88,0x48,0xc8,0x28,0xa8,0x68,0xe8,
-		0x18,0x98,0x58,0xd8,0x38,0xb8,0x78,0xf8,
-		0x04,0x84,0x44,0xc4,0x24,0xa4,0x64,0xe4,
-		0x14,0x94,0x54,0xd4,0x34,0xb4,0x74,0xf4,
-		0x0c,0x8c,0x4c,0xcc,0x2c,0xac,0x6c,0xec,
-		0x1c,0x9c,0x5c,0xdc,0x3c,0xbc,0x7c,0xfc,
-		0x02,0x82,0x42,0xc2,0x22,0xa2,0x62,0xe2,
-		0x12,0x92,0x52,0xd2,0x32,0xb2,0x72,0xf2,
-		0x0a,0x8a,0x4a,0xca,0x2a,0xaa,0x6a,0xea,
-		0x1a,0x9a,0x5a,0xda,0x3a,0xba,0x7a,0xfa,
-		0x06,0x86,0x46,0xc6,0x26,0xa6,0x66,0xe6,
-		0x16,0x96,0x56,0xd6,0x36,0xb6,0x76,0xf6,
-		0x0e,0x8e,0x4e,0xce,0x2e,0xae,0x6e,0xee,
-		0x1e,0x9e,0x5e,0xde,0x3e,0xbe,0x7e,0xfe,
-		0x01,0x81,0x41,0xc1,0x21,0xa1,0x61,0xe1,
-		0x11,0x91,0x51,0xd1,0x31,0xb1,0x71,0xf1,
-		0x09,0x89,0x49,0xc9,0x29,0xa9,0x69,0xe9,
-		0x19,0x99,0x59,0xd9,0x39,0xb9,0x79,0xf9,
-		0x05,0x85,0x45,0xc5,0x25,0xa5,0x65,0xe5,
-		0x15,0x95,0x55,0xd5,0x35,0xb5,0x75,0xf5,
-		0x0d,0x8d,0x4d,0xcd,0x2d,0xad,0x6d,0xed,
-		0x1d,0x9d,0x5d,0xdd,0x3d,0xbd,0x7d,0xfd,
-		0x03,0x83,0x43,0xc3,0x23,0xa3,0x63,0xe3,
-		0x13,0x93,0x53,0xd3,0x33,0xb3,0x73,0xf3,
-		0x0b,0x8b,0x4b,0xcb,0x2b,0xab,0x6b,0xeb,
-		0x1b,0x9b,0x5b,0xdb,0x3b,0xbb,0x7b,0xfb,
-		0x07,0x87,0x47,0xc7,0x27,0xa7,0x67,0xe7,
-		0x17,0x97,0x57,0xd7,0x37,0xb7,0x77,0xf7,
-		0x0f,0x8f,0x4f,0xcf,0x2f,0xaf,0x6f,0xef,
-		0x1f,0x9f,0x5f,0xdf,0x3f,0xbf,0x7f,0xff
-	};
-	bmp_t result = BMP_C(0);
-	while(bits > 8) {
-		bits -= 8;
-		result = result << 8 | revtab[accu & 0xff];
-		accu >>= 8;
-	}
-	result = result << bits | (bmp_t) (revtab[accu & 0xff] >> (8 - bits));
-	return(result);
+    /* Returns the bitmap word argument with the given number of
+     * least significant bits reversed and the rest cleared.
+     */
+    static const unsigned char revtab[256] = {
+        0x00,0x80,0x40,0xc0,0x20,0xa0,0x60,0xe0,
+        0x10,0x90,0x50,0xd0,0x30,0xb0,0x70,0xf0,
+        0x08,0x88,0x48,0xc8,0x28,0xa8,0x68,0xe8,
+        0x18,0x98,0x58,0xd8,0x38,0xb8,0x78,0xf8,
+        0x04,0x84,0x44,0xc4,0x24,0xa4,0x64,0xe4,
+        0x14,0x94,0x54,0xd4,0x34,0xb4,0x74,0xf4,
+        0x0c,0x8c,0x4c,0xcc,0x2c,0xac,0x6c,0xec,
+        0x1c,0x9c,0x5c,0xdc,0x3c,0xbc,0x7c,0xfc,
+        0x02,0x82,0x42,0xc2,0x22,0xa2,0x62,0xe2,
+        0x12,0x92,0x52,0xd2,0x32,0xb2,0x72,0xf2,
+        0x0a,0x8a,0x4a,0xca,0x2a,0xaa,0x6a,0xea,
+        0x1a,0x9a,0x5a,0xda,0x3a,0xba,0x7a,0xfa,
+        0x06,0x86,0x46,0xc6,0x26,0xa6,0x66,0xe6,
+        0x16,0x96,0x56,0xd6,0x36,0xb6,0x76,0xf6,
+        0x0e,0x8e,0x4e,0xce,0x2e,0xae,0x6e,0xee,
+        0x1e,0x9e,0x5e,0xde,0x3e,0xbe,0x7e,0xfe,
+        0x01,0x81,0x41,0xc1,0x21,0xa1,0x61,0xe1,
+        0x11,0x91,0x51,0xd1,0x31,0xb1,0x71,0xf1,
+        0x09,0x89,0x49,0xc9,0x29,0xa9,0x69,0xe9,
+        0x19,0x99,0x59,0xd9,0x39,0xb9,0x79,0xf9,
+        0x05,0x85,0x45,0xc5,0x25,0xa5,0x65,0xe5,
+        0x15,0x95,0x55,0xd5,0x35,0xb5,0x75,0xf5,
+        0x0d,0x8d,0x4d,0xcd,0x2d,0xad,0x6d,0xed,
+        0x1d,0x9d,0x5d,0xdd,0x3d,0xbd,0x7d,0xfd,
+        0x03,0x83,0x43,0xc3,0x23,0xa3,0x63,0xe3,
+        0x13,0x93,0x53,0xd3,0x33,0xb3,0x73,0xf3,
+        0x0b,0x8b,0x4b,0xcb,0x2b,0xab,0x6b,0xeb,
+        0x1b,0x9b,0x5b,0xdb,0x3b,0xbb,0x7b,0xfb,
+        0x07,0x87,0x47,0xc7,0x27,0xa7,0x67,0xe7,
+        0x17,0x97,0x57,0xd7,0x37,0xb7,0x77,0xf7,
+        0x0f,0x8f,0x4f,0xcf,0x2f,0xaf,0x6f,0xef,
+        0x1f,0x9f,0x5f,0xdf,0x3f,0xbf,0x7f,0xff
+    };
+    bmp_t result = BMP_C(0);
+    while(bits > 8) {
+        bits -= 8;
+        result = result << 8 | revtab[accu & 0xff];
+        accu >>= 8;
+    }
+    result = result << bits | (bmp_t) (revtab[accu & 0xff] >> (8 - bits));
+    return(result);
 }
 
 static void
 prhex(char **spp, bmp_t bits, int flags, int bperhx) {
-	/* Appends a hexadecimal string representing the bperhx least
-	 * significant bits of bits to an external string.
-	 * spp points to a character pointer that in turn points to the
-	 * end of a hex string being built.  prhex() advances this
-	 * second pointer by the number of characters written.
-	 * The unused MSBs of bits MUST be cleared.
-	 * Set P_UPPER in flags to write A-F in uppercase.
-	 */
-	static const char hex[] = "0123456789abcdef0123456789ABCDEF";
-	const int upper = (flags & P_UPPER ? 0x10 : 0);
-	while(bperhx > 0) {
-		bperhx -= ((bperhx + 3) & 3) + 1;
-		*(*spp)++ = hex[(bits >> bperhx & BMP_C(0xf)) | upper];
-	}
+    /* Appends a hexadecimal string representing the bperhx least
+     * significant bits of bits to an external string.
+     * spp points to a character pointer that in turn points to the
+     * end of a hex string being built.  prhex() advances this
+     * second pointer by the number of characters written.
+     * The unused MSBs of bits MUST be cleared.
+     * Set P_UPPER in flags to write A-F in uppercase.
+     */
+    static const char hex[] = "0123456789abcdef0123456789ABCDEF";
+    const int upper = (flags & P_UPPER ? 0x10 : 0);
+    while(bperhx > 0) {
+        bperhx -= ((bperhx + 3) & 3) + 1;
+        *(*spp)++ = hex[(bits >> bperhx & BMP_C(0xf)) | upper];
+    }
 }
diff --git a/client/reveng/preset.c b/client/reveng/preset.c
index dd093a6f3..e09c07ff0 100644
--- a/client/reveng/preset.c
+++ b/client/reveng/preset.c
@@ -76,19 +76,19 @@
 struct malias;
 
 struct mpreset {
-	const unsigned long width;		/* width of CRC algorithm */
-	const bmp_t *const bspoly;		/* polynomial with highest-order term removed. length determines CRC width */
-	const bmp_t *const binit;		/* initial register value. length == poly.length */
-	const int flags;			/* P_REFIN and P_REFOUT indicate reflected input/output */
-	const bmp_t *const bxorout;		/* final register XOR mask. length == poly.length */
-	const bmp_t *const bcheck;		/* optional check value, the CRC of the UTF-8 string "123456789" */
-	const bmp_t *const bmagic;		/* optional magic check value, the residue of a valid codeword */
-	const struct malias *const alias;	/* optional canonical name of the model */
+    const unsigned long width;         /* width of CRC algorithm */
+    const bmp_t *const bspoly;         /* polynomial with highest-order term removed. length determines CRC width */
+    const bmp_t *const binit;          /* initial register value. length == poly.length */
+    const int flags;                   /* P_REFIN and P_REFOUT indicate reflected input/output */
+    const bmp_t *const bxorout;        /* final register XOR mask. length == poly.length */
+    const bmp_t *const bcheck;         /* optional check value, the CRC of the UTF-8 string "123456789" */
+    const bmp_t *const bmagic;         /* optional magic check value, the residue of a valid codeword */
+    const struct malias *const alias;  /* optional canonical name of the model */
 };
 
 struct malias {
-	const char *const name;			/* name of alias */
-	const struct mpreset *const model;	/* corresponding model */
+    const char *const name;            /* name of alias */
+    const struct mpreset *const model; /* corresponding model */
 };
 
 #ifdef PRESETS
@@ -122,136 +122,136 @@ struct malias {
 /* BEGIN AUTO-GENERATED CONSTANTS */
 #    if BMP_BIT >= 40
 static const bmp_t b40[] = {
-	BMP_C(0x0004820009) << (BMP_BIT - 40),
+    BMP_C(0x0004820009) << (BMP_BIT - 40),
 };
 static const bmp_t b40a[] = {
-	BMP_C(0xffffffffff) << (BMP_BIT - 40),
+    BMP_C(0xffffffffff) << (BMP_BIT - 40),
 };
 static const bmp_t b40b[] = {
-	BMP_C(0xd4164fc646) << (BMP_BIT - 40),
+    BMP_C(0xd4164fc646) << (BMP_BIT - 40),
 };
 static const bmp_t b40c[] = {
-	BMP_C(0xc4ff8071ff) << (BMP_BIT - 40),
+    BMP_C(0xc4ff8071ff) << (BMP_BIT - 40),
 };
 #    else /* BMP_BIT */
 static const bmp_t b40[] = {
-	BMP_C(0x00048200) << (BMP_BIT - 32) | BMP_C(0x04) >> (39 - BMP_BIT),
-	BMP_C(0x09) << (BMP_BIT * 2 - 40),
+    BMP_C(0x00048200) << (BMP_BIT - 32) | BMP_C(0x04) >> (39 - BMP_BIT),
+    BMP_C(0x09) << (BMP_BIT * 2 - 40),
 };
 static const bmp_t b40a[] = {
-	BMP_C(0xffffffff) << (BMP_BIT - 32) | BMP_C(0x7f) >> (39 - BMP_BIT),
-	BMP_C(0xff) << (BMP_BIT * 2 - 40),
+    BMP_C(0xffffffff) << (BMP_BIT - 32) | BMP_C(0x7f) >> (39 - BMP_BIT),
+    BMP_C(0xff) << (BMP_BIT * 2 - 40),
 };
 static const bmp_t b40b[] = {
-	BMP_C(0xd4164fc6) << (BMP_BIT - 32) | BMP_C(0x23) >> (39 - BMP_BIT),
-	BMP_C(0x46) << (BMP_BIT * 2 - 40),
+    BMP_C(0xd4164fc6) << (BMP_BIT - 32) | BMP_C(0x23) >> (39 - BMP_BIT),
+    BMP_C(0x46) << (BMP_BIT * 2 - 40),
 };
 static const bmp_t b40c[] = {
-	BMP_C(0xc4ff8071) << (BMP_BIT - 32) | BMP_C(0x7f) >> (39 - BMP_BIT),
-	BMP_C(0xff) << (BMP_BIT * 2 - 40),
+    BMP_C(0xc4ff8071) << (BMP_BIT - 32) | BMP_C(0x7f) >> (39 - BMP_BIT),
+    BMP_C(0xff) << (BMP_BIT * 2 - 40),
 };
 #    endif /* BMP_BIT */
 
 #    if BMP_BIT >= 64
 static const bmp_t b64[] = {
-	BMP_C(0x000000000000001b) << (BMP_BIT - 64),
+    BMP_C(0x000000000000001b) << (BMP_BIT - 64),
 };
 static const bmp_t b64a[] = {
-	BMP_C(0xffffffffffffffff) << (BMP_BIT - 64),
+    BMP_C(0xffffffffffffffff) << (BMP_BIT - 64),
 };
 static const bmp_t b64b[] = {
-	BMP_C(0xb90956c775a41001) << (BMP_BIT - 64),
+    BMP_C(0xb90956c775a41001) << (BMP_BIT - 64),
 };
 static const bmp_t b64c[] = {
-	BMP_C(0x5300000000000000) << (BMP_BIT - 64),
+    BMP_C(0x5300000000000000) << (BMP_BIT - 64),
 };
 static const bmp_t b64d[] = {
-	BMP_C(0x42f0e1eba9ea3693) << (BMP_BIT - 64),
+    BMP_C(0x42f0e1eba9ea3693) << (BMP_BIT - 64),
 };
 static const bmp_t b64e[] = {
-	BMP_C(0x6c40df5f0b497347) << (BMP_BIT - 64),
+    BMP_C(0x6c40df5f0b497347) << (BMP_BIT - 64),
 };
 static const bmp_t b64f[] = {
-	BMP_C(0x62ec59e3f1a4f00a) << (BMP_BIT - 64),
+    BMP_C(0x62ec59e3f1a4f00a) << (BMP_BIT - 64),
 };
 static const bmp_t b64g[] = {
-	BMP_C(0xfcacbebd5931a992) << (BMP_BIT - 64),
+    BMP_C(0xfcacbebd5931a992) << (BMP_BIT - 64),
 };
 static const bmp_t b64h[] = {
-	BMP_C(0x995dc9bbdf1939fa) << (BMP_BIT - 64),
+    BMP_C(0x995dc9bbdf1939fa) << (BMP_BIT - 64),
 };
 static const bmp_t b64i[] = {
-	BMP_C(0x49958c9abd7d353f) << (BMP_BIT - 64),
+    BMP_C(0x49958c9abd7d353f) << (BMP_BIT - 64),
 };
 #    else /* BMP_BIT */
 static const bmp_t b64[] = {
-	BMP_C(0x00000000) << (BMP_BIT - 32) | BMP_C(0x0000000d) >> (63 - BMP_BIT),
-	BMP_C(0x0000001b) << (BMP_BIT * 2 - 64),
+    BMP_C(0x00000000) << (BMP_BIT - 32) | BMP_C(0x0000000d) >> (63 - BMP_BIT),
+    BMP_C(0x0000001b) << (BMP_BIT * 2 - 64),
 };
 static const bmp_t b64a[] = {
-	BMP_C(0xffffffff) << (BMP_BIT - 32) | BMP_C(0x7fffffff) >> (63 - BMP_BIT),
-	BMP_C(0xffffffff) << (BMP_BIT * 2 - 64),
+    BMP_C(0xffffffff) << (BMP_BIT - 32) | BMP_C(0x7fffffff) >> (63 - BMP_BIT),
+    BMP_C(0xffffffff) << (BMP_BIT * 2 - 64),
 };
 static const bmp_t b64b[] = {
-	BMP_C(0xb90956c7) << (BMP_BIT - 32) | BMP_C(0x3ad20800) >> (63 - BMP_BIT),
-	BMP_C(0x75a41001) << (BMP_BIT * 2 - 64),
+    BMP_C(0xb90956c7) << (BMP_BIT - 32) | BMP_C(0x3ad20800) >> (63 - BMP_BIT),
+    BMP_C(0x75a41001) << (BMP_BIT * 2 - 64),
 };
 static const bmp_t b64c[] = {
-	BMP_C(0x53000000) << (BMP_BIT - 32) | BMP_C(0x00000000) >> (63 - BMP_BIT),
-	BMP_C(0x00000000) << (BMP_BIT * 2 - 64),
+    BMP_C(0x53000000) << (BMP_BIT - 32) | BMP_C(0x00000000) >> (63 - BMP_BIT),
+    BMP_C(0x00000000) << (BMP_BIT * 2 - 64),
 };
 static const bmp_t b64d[] = {
-	BMP_C(0x42f0e1eb) << (BMP_BIT - 32) | BMP_C(0x54f51b49) >> (63 - BMP_BIT),
-	BMP_C(0xa9ea3693) << (BMP_BIT * 2 - 64),
+    BMP_C(0x42f0e1eb) << (BMP_BIT - 32) | BMP_C(0x54f51b49) >> (63 - BMP_BIT),
+    BMP_C(0xa9ea3693) << (BMP_BIT * 2 - 64),
 };
 static const bmp_t b64e[] = {
-	BMP_C(0x6c40df5f) << (BMP_BIT - 32) | BMP_C(0x05a4b9a3) >> (63 - BMP_BIT),
-	BMP_C(0x0b497347) << (BMP_BIT * 2 - 64),
+    BMP_C(0x6c40df5f) << (BMP_BIT - 32) | BMP_C(0x05a4b9a3) >> (63 - BMP_BIT),
+    BMP_C(0x0b497347) << (BMP_BIT * 2 - 64),
 };
 static const bmp_t b64f[] = {
-	BMP_C(0x62ec59e3) << (BMP_BIT - 32) | BMP_C(0x78d27805) >> (63 - BMP_BIT),
-	BMP_C(0xf1a4f00a) << (BMP_BIT * 2 - 64),
+    BMP_C(0x62ec59e3) << (BMP_BIT - 32) | BMP_C(0x78d27805) >> (63 - BMP_BIT),
+    BMP_C(0xf1a4f00a) << (BMP_BIT * 2 - 64),
 };
 static const bmp_t b64g[] = {
-	BMP_C(0xfcacbebd) << (BMP_BIT - 32) | BMP_C(0x2c98d4c9) >> (63 - BMP_BIT),
-	BMP_C(0x5931a992) << (BMP_BIT * 2 - 64),
+    BMP_C(0xfcacbebd) << (BMP_BIT - 32) | BMP_C(0x2c98d4c9) >> (63 - BMP_BIT),
+    BMP_C(0x5931a992) << (BMP_BIT * 2 - 64),
 };
 static const bmp_t b64h[] = {
-	BMP_C(0x995dc9bb) << (BMP_BIT - 32) | BMP_C(0x6f8c9cfd) >> (63 - BMP_BIT),
-	BMP_C(0xdf1939fa) << (BMP_BIT * 2 - 64),
+    BMP_C(0x995dc9bb) << (BMP_BIT - 32) | BMP_C(0x6f8c9cfd) >> (63 - BMP_BIT),
+    BMP_C(0xdf1939fa) << (BMP_BIT * 2 - 64),
 };
 static const bmp_t b64i[] = {
-	BMP_C(0x49958c9a) << (BMP_BIT - 32) | BMP_C(0x5ebe9a9f) >> (63 - BMP_BIT),
-	BMP_C(0xbd7d353f) << (BMP_BIT * 2 - 64),
+    BMP_C(0x49958c9a) << (BMP_BIT - 32) | BMP_C(0x5ebe9a9f) >> (63 - BMP_BIT),
+    BMP_C(0xbd7d353f) << (BMP_BIT * 2 - 64),
 };
 #    endif /* BMP_BIT */
 
 #    if BMP_BIT >= 82
 static const bmp_t b82[] = {
-	BMP_C(0x0308c0111011401440411) << (BMP_BIT - 82),
+    BMP_C(0x0308c0111011401440411) << (BMP_BIT - 82),
 };
 static const bmp_t b82a[] = {
-	BMP_C(0x09ea83f625023801fd612) << (BMP_BIT - 82),
+    BMP_C(0x09ea83f625023801fd612) << (BMP_BIT - 82),
 };
 #    elif BMP_BIT >= 41
 static const bmp_t b82[] = {
-	BMP_C(0x01846008880) << (BMP_BIT - 41) | BMP_C(0x08a00a20208) >> (81 - BMP_BIT),
-	BMP_C(0x11401440411) << (BMP_BIT * 2 - 82),
+    BMP_C(0x01846008880) << (BMP_BIT - 41) | BMP_C(0x08a00a20208) >> (81 - BMP_BIT),
+    BMP_C(0x11401440411) << (BMP_BIT * 2 - 82),
 };
 static const bmp_t b82a[] = {
-	BMP_C(0x04f541fb128) << (BMP_BIT - 41) | BMP_C(0x011c00feb09) >> (81 - BMP_BIT),
-	BMP_C(0x023801fd612) << (BMP_BIT * 2 - 82),
+    BMP_C(0x04f541fb128) << (BMP_BIT - 41) | BMP_C(0x011c00feb09) >> (81 - BMP_BIT),
+    BMP_C(0x023801fd612) << (BMP_BIT * 2 - 82),
 };
 #    else /* BMP_BIT */
 static const bmp_t b82[] = {
-	BMP_C(0x0c230044) << (BMP_BIT - 32) | BMP_C(0x040) >> (40 - BMP_BIT),
-	BMP_C(0x40450051) << (BMP_BIT * 2 - 64) | BMP_C(0x00104) >> (80 - BMP_BIT * 2),
-	BMP_C(0x00411) << (BMP_BIT * 3 - 82),
+    BMP_C(0x0c230044) << (BMP_BIT - 32) | BMP_C(0x040) >> (40 - BMP_BIT),
+    BMP_C(0x40450051) << (BMP_BIT * 2 - 64) | BMP_C(0x00104) >> (80 - BMP_BIT * 2),
+    BMP_C(0x00411) << (BMP_BIT * 3 - 82),
 };
 static const bmp_t b82a[] = {
-	BMP_C(0x27aa0fd8) << (BMP_BIT - 32) | BMP_C(0x094) >> (40 - BMP_BIT),
-	BMP_C(0x9408e007) << (BMP_BIT * 2 - 64) | BMP_C(0x0f584) >> (80 - BMP_BIT * 2),
-	BMP_C(0x3d612) << (BMP_BIT * 3 - 82),
+    BMP_C(0x27aa0fd8) << (BMP_BIT - 32) | BMP_C(0x094) >> (40 - BMP_BIT),
+    BMP_C(0x9408e007) << (BMP_BIT * 2 - 64) | BMP_C(0x0f584) >> (80 - BMP_BIT * 2),
+    BMP_C(0x3d612) << (BMP_BIT * 3 - 82),
 };
 #    endif /* BMP_BIT */
 
@@ -260,214 +260,214 @@ static const bmp_t b82a[] = {
 
 /* Array of the polynomial bitmaps used in the model table. */
 static const bmp_t b32[] = {
-	BMP_C(0x000000af) << (BMP_BIT - 32),	/*   0 -- 32,000000af */
-	BMP_C(0x00010000) << (BMP_BIT - 32),	/*   1 -- 16,    0001 */
-	BMP_C(0x00020000) << (BMP_BIT - 32),	/*   2 -- 15,    0001 */
-	BMP_C(0x00065b00) << (BMP_BIT - 32),	/*   3 -- 24,  00065b */
-	BMP_C(0x007e0000) << (BMP_BIT - 32),	/*   4 -- 16,    007e */
-	BMP_C(0x007f0000) << (BMP_BIT - 32),	/*   5 -- 16,    007f */
-	BMP_C(0x03400000) << (BMP_BIT - 32),	/*   6 -- 11,     01a */
-	BMP_C(0x0376e6e7) << (BMP_BIT - 32),	/*   7 -- 32,0376e6e7 */
-	BMP_C(0x04c11db7) << (BMP_BIT - 32),	/*   8 -- 32,04c11db7 */
-	BMP_C(0x05890000) << (BMP_BIT - 32),	/*   9 -- 16,    0589 */
-	BMP_C(0x07000000) << (BMP_BIT - 32),	/*  10 --  8,      07 */
-	BMP_C(0x080b0000) << (BMP_BIT - 32),	/*  11 -- 16,    080b */
-	BMP_C(0x09823b6e) << (BMP_BIT - 32),	/*  12 -- 31,04c11db7 */
-	BMP_C(0x0b3c0000) << (BMP_BIT - 32),	/*  13 -- 15,    059e */
-	BMP_C(0x0c000000) << (BMP_BIT - 32),	/*  14 --  6,      03 */
-	BMP_C(0x0c200000) << (BMP_BIT - 32),	/*  15 -- 11,     061 */
-	BMP_C(0x0c780000) << (BMP_BIT - 32),	/*  16 -- 14,    031e */
-	BMP_C(0x0fb30000) << (BMP_BIT - 32),	/*  17 -- 16,    0fb3 */
-	BMP_C(0x10210000) << (BMP_BIT - 32),	/*  18 -- 16,    1021 */
-	BMP_C(0x12000000) << (BMP_BIT - 32),	/*  19 --  7,      09 */
-	BMP_C(0x130d2afc) << (BMP_BIT - 32),	/*  20 -- 30,04c34abf */
-	BMP_C(0x144e6300) << (BMP_BIT - 32),	/*  21 -- 24,  144e63 */
-	BMP_C(0x15000000) << (BMP_BIT - 32),	/*  22 --  8,      15 */
-	BMP_C(0x1697d06a) << (BMP_BIT - 32),	/*  23 -- 32,1697d06a */
-	BMP_C(0x17800000) << (BMP_BIT - 32),	/*  24 -- 12,     178 */
-	BMP_C(0x18000000) << (BMP_BIT - 32),	/*  25 --  6,      06 */
-	BMP_C(0x19d3c8d8) << (BMP_BIT - 32),	/*  26 -- 31,0ce9e46c */
-	BMP_C(0x1c000000) << (BMP_BIT - 32),	/*  27 --  6,      07 */
-	BMP_C(0x1d000000) << (BMP_BIT - 32),	/*  28 --  8,      1d */
-	BMP_C(0x1d0f0000) << (BMP_BIT - 32),	/*  29 -- 16,    1d0f */
-	BMP_C(0x1dcf0000) << (BMP_BIT - 32),	/*  30 -- 16,    1dcf */
-	BMP_C(0x1edc6f41) << (BMP_BIT - 32),	/*  31 -- 32,1edc6f41 */
-	BMP_C(0x1f23b800) << (BMP_BIT - 32),	/*  32 -- 24,  1f23b8 */
-	BMP_C(0x20000000) << (BMP_BIT - 32),	/*  33 --  4,       2 */
-	BMP_C(0x200fa500) << (BMP_BIT - 32),	/*  34 -- 24,  200fa5 */
-	BMP_C(0x20140000) << (BMP_BIT - 32),	/*  35 -- 14,    0805 */
-	BMP_C(0x20b40000) << (BMP_BIT - 32),	/*  36 -- 14,    082d */
-	BMP_C(0x20fe0000) << (BMP_BIT - 32),	/*  37 -- 16,    20fe */
-	BMP_C(0x21890000) << (BMP_BIT - 32),	/*  38 -- 16,    2189 */
-	BMP_C(0x21cf0200) << (BMP_BIT - 32),	/*  39 -- 24,  21cf02 */
-	BMP_C(0x23ef5200) << (BMP_BIT - 32),	/*  40 -- 24,  23ef52 */
-	BMP_C(0x25000000) << (BMP_BIT - 32),	/*  41 --  8,      25 */
-	BMP_C(0x26000000) << (BMP_BIT - 32),	/*  42 --  8,      26 */
-	BMP_C(0x26b10000) << (BMP_BIT - 32),	/*  43 -- 16,    26b1 */
-	BMP_C(0x27818000) << (BMP_BIT - 32),	/*  44 -- 17,   04f03 */
-	BMP_C(0x27d00000) << (BMP_BIT - 32),	/*  45 -- 13,    04fa */
-	BMP_C(0x28000000) << (BMP_BIT - 32),	/*  46 --  5,      05 */
-	BMP_C(0x29b10000) << (BMP_BIT - 32),	/*  47 -- 16,    29b1 */
-	BMP_C(0x2f000000) << (BMP_BIT - 32),	/*  48 --  8,      2f */
-	BMP_C(0x30000000) << (BMP_BIT - 32),	/*  49 --  4, 3/ 5, 6 */
-	BMP_C(0x3010bf7f) << (BMP_BIT - 32),	/*  50 -- 32,3010bf7f */
-	BMP_C(0x31000000) << (BMP_BIT - 32),	/*  51 --  8,      31 */
-	BMP_C(0x31800000) << (BMP_BIT - 32),	/*  52 -- 10,     0c6 */
-	BMP_C(0x31c30000) << (BMP_BIT - 32),	/*  53 -- 16,    31c3 */
-	BMP_C(0x328b6300) << (BMP_BIT - 32),	/*  54 -- 24,  328b63 */
-	BMP_C(0x34000000) << (BMP_BIT - 32),	/*  55 --  6,      0d */
-	BMP_C(0x340bc6d9) << (BMP_BIT - 32),	/*  56 -- 32,340bc6d9 */
-	BMP_C(0x37000000) << (BMP_BIT - 32),	/*  57 --  8,      37 */
-	BMP_C(0x38000000) << (BMP_BIT - 32),	/*  58 --  5,      07 */
-	BMP_C(0x39000000) << (BMP_BIT - 32),	/*  59 --  8,      39 */
-	BMP_C(0x3d650000) << (BMP_BIT - 32),	/*  60 -- 16,    3d65 */
-	BMP_C(0x3e000000) << (BMP_BIT - 32),	/*  61 --  8,      3e */
-	BMP_C(0x40000000) << (BMP_BIT - 32),	/*  62 --  3,       2 */
-	BMP_C(0x42000000) << (BMP_BIT - 32),	/*  63 --  8,      42 */
-	BMP_C(0x44c20000) << (BMP_BIT - 32),	/*  64 -- 16,    44c2 */
-	BMP_C(0x45270551) << (BMP_BIT - 32),	/*  65 -- 32,45270551 */
-	BMP_C(0x48000000) << (BMP_BIT - 32),	/*  66 --  5,      09 */
-	BMP_C(0x49000000) << (BMP_BIT - 32),	/*  67 --  8,      49 */
-	BMP_C(0x4a800000) << (BMP_BIT - 32),	/*  68 -- 10,     12a */
-	BMP_C(0x4acc0000) << (BMP_BIT - 32),	/*  69 -- 15,    2566 */
-	BMP_C(0x4b000000) << (BMP_BIT - 32),	/*  70 --  8,      4b */
-	BMP_C(0x4b370000) << (BMP_BIT - 32),	/*  71 -- 16,    4b37 */
-	BMP_C(0x4c000000) << (BMP_BIT - 32),	/*  72 --  6,      13 */
-	BMP_C(0x4c060000) << (BMP_BIT - 32),	/*  73 -- 16,    4c06 */
-	BMP_C(0x53000000) << (BMP_BIT - 32),	/*  74 --  8,      53 */
-	BMP_C(0x55000000) << (BMP_BIT - 32),	/*  75 --  8,      55 */
-	BMP_C(0x55555500) << (BMP_BIT - 32),	/*  76 -- 24,  555555 */
-	BMP_C(0x59350000) << (BMP_BIT - 32),	/*  77 -- 16,    5935 */
-	BMP_C(0x5d380000) << (BMP_BIT - 32),	/*  78 -- 16,    5d38 */
-	BMP_C(0x5d400000) << (BMP_BIT - 32),	/*  79 -- 10,     175 */
-	BMP_C(0x5d6dcb00) << (BMP_BIT - 32),	/*  80 -- 24,  5d6dcb */
-	BMP_C(0x60000000) << (BMP_BIT - 32),	/*  81 --  3,       3 */
-	BMP_C(0x60e00000) << (BMP_BIT - 32),	/*  82 -- 11,     307 */
-	BMP_C(0x63d00000) << (BMP_BIT - 32),	/*  83 -- 16,    63d0 */
-	BMP_C(0x64000000) << (BMP_BIT - 32),	/*  84 --  6,      19 */
-	BMP_C(0x66400000) << (BMP_BIT - 32),	/*  85 -- 10,     199 */
-	BMP_C(0x66c50000) << (BMP_BIT - 32),	/*  86 -- 16,    66c5 */
-	BMP_C(0x6f630000) << (BMP_BIT - 32),	/*  87 -- 16,    6f63 */
-	BMP_C(0x6f910000) << (BMP_BIT - 32),	/*  88 -- 16,    6f91 */
-	BMP_C(0x70000000) << (BMP_BIT - 32),	/*  89 --  4,       7 */
-	BMP_C(0x70a00000) << (BMP_BIT - 32),	/*  90 -- 11,     385 */
-	BMP_C(0x755b0000) << (BMP_BIT - 32),	/*  91 -- 16,    755b */
-	BMP_C(0x765e7680) << (BMP_BIT - 32),	/*  92 -- 32,765e7680 */
-	BMP_C(0x76c20800) << (BMP_BIT - 32),	/*  93 -- 32,  0ed841 */
-	BMP_C(0x7979bd00) << (BMP_BIT - 32),	/*  94 -- 24,  7979bd */
-	BMP_C(0x7e000000) << (BMP_BIT - 32),	/*  95 --  8,      7e */
-	BMP_C(0x80000000) << (BMP_BIT - 32),	/*  96 --  3,       4 */
-	BMP_C(0x80006300) << (BMP_BIT - 32),	/*  97 -- 24,  800063 */
-	BMP_C(0x80050000) << (BMP_BIT - 32),	/*  98 -- 16,    8005 */
-	BMP_C(0x800d0000) << (BMP_BIT - 32),	/*  99 -- 16,    800d */
-	BMP_C(0x800fe300) << (BMP_BIT - 32),	/* 100 -- 24,  800fe3 */
-	BMP_C(0x80b40000) << (BMP_BIT - 32),	/* 101 -- 14,    202d */
-	BMP_C(0x80c2e71c) << (BMP_BIT - 32),	/* 102 -- 30,2030b9c7 */
-	BMP_C(0x80f00000) << (BMP_BIT - 32),	/* 103 -- 12,     80f */
-	BMP_C(0x814141ab) << (BMP_BIT - 32),	/* 104 -- 32,814141ab */
-	BMP_C(0x8144c800) << (BMP_BIT - 32),	/* 105 -- 21,  102899 */
-	BMP_C(0x864cfb00) << (BMP_BIT - 32),	/* 106 -- 24,  864cfb */
-	BMP_C(0x87315576) << (BMP_BIT - 32),	/* 107 -- 32,87315576 */
-	BMP_C(0x89ec0000) << (BMP_BIT - 32),	/* 108 -- 16,    89ec */
-	BMP_C(0x8a000000) << (BMP_BIT - 32),	/* 109 --  7,      45 */
-	BMP_C(0x8b320000) << (BMP_BIT - 32),	/* 110 -- 15,    4599 */
-	BMP_C(0x8bb70000) << (BMP_BIT - 32),	/* 111 -- 16,    8bb7 */
-	BMP_C(0x8cc00000) << (BMP_BIT - 32),	/* 112 -- 10,     233 */
-	BMP_C(0x904cddbf) << (BMP_BIT - 32),	/* 113 -- 32,904cddbf */
-	BMP_C(0x906e0000) << (BMP_BIT - 32),	/* 114 -- 16,    906e */
-	BMP_C(0x94000000) << (BMP_BIT - 32),	/* 115 --  8,      94 */
-	BMP_C(0x97000000) << (BMP_BIT - 32),	/* 116 --  8,      97 */
-	BMP_C(0x98000000) << (BMP_BIT - 32),	/* 117 --  6,      26 */
-	BMP_C(0x9b000000) << (BMP_BIT - 32),	/* 118 --  8,      9b */
-	BMP_C(0x9c000000) << (BMP_BIT - 32),	/* 119 --  6,      27 */
-	BMP_C(0x9d5e4de2) << (BMP_BIT - 32),	/* 120 -- 31,4eaf26f1 */
-	BMP_C(0x9e000000) << (BMP_BIT - 32),	/* 121 --  7,      4f */
-	BMP_C(0x9ecf0000) << (BMP_BIT - 32),	/* 122 -- 16,    9ecf */
-	BMP_C(0xa0660000) << (BMP_BIT - 32),	/* 123 -- 16,    a066 */
-	BMP_C(0xa0970000) << (BMP_BIT - 32),	/* 124 -- 16,    a097 */
-	BMP_C(0xa1000000) << (BMP_BIT - 32),	/* 125 --  8,      a1 */
-	BMP_C(0xa3660000) << (BMP_BIT - 32),	/* 126 -- 16,    a366 */
-	BMP_C(0xa6000000) << (BMP_BIT - 32),	/* 127 --  7,      53 */
-	BMP_C(0xa7000000) << (BMP_BIT - 32),	/* 128 --  8,      a7 */
-	BMP_C(0xa8000000) << (BMP_BIT - 32),	/* 129 --  5,      15 */
-	BMP_C(0xa8190000) << (BMP_BIT - 32),	/* 130 -- 16,    a819 */
-	BMP_C(0xa833982b) << (BMP_BIT - 32),	/* 131 -- 32,a833982b */
-	BMP_C(0xabcdef00) << (BMP_BIT - 32),	/* 132 -- 24,  abcdef */
-	BMP_C(0xac000000) << (BMP_BIT - 32),	/* 133 --  8,      ac */
-	BMP_C(0xaee70000) << (BMP_BIT - 32),	/* 134 -- 16,    aee7 */
-	BMP_C(0xb0000000) << (BMP_BIT - 32),	/* 135 --  4,       b */
-	BMP_C(0xb0010000) << (BMP_BIT - 32),	/* 136 -- 16,    b001 */
-	BMP_C(0xb2aa0000) << (BMP_BIT - 32),	/* 137 -- 16,    b2aa */
-	BMP_C(0xb3400000) << (BMP_BIT - 32),	/* 138 -- 12,     b34 */
-	BMP_C(0xb42d8000) << (BMP_BIT - 32),	/* 139 -- 17,   1685b */
-	BMP_C(0xb4600000) << (BMP_BIT - 32),	/* 140 -- 11,     5a3 */
-	BMP_C(0xb4c80000) << (BMP_BIT - 32),	/* 141 -- 16,    b4c8 */
-	BMP_C(0xb4f3e600) << (BMP_BIT - 32),	/* 142 -- 24,  b4f3e6 */
-	BMP_C(0xb704ce00) << (BMP_BIT - 32),	/* 143 -- 24,  b704ce */
-	BMP_C(0xb798b438) << (BMP_BIT - 32),	/* 144 -- 32,b798b438 */
-	BMP_C(0xbb3d0000) << (BMP_BIT - 32),	/* 145 -- 16,    bb3d */
-	BMP_C(0xbc000000) << (BMP_BIT - 32),	/* 146 --  6,2f/ 8,bc */
-	BMP_C(0xbd0be338) << (BMP_BIT - 32),	/* 147 -- 32,bd0be338 */
-	BMP_C(0xbdf40000) << (BMP_BIT - 32),	/* 148 -- 16,    bdf4 */
-	BMP_C(0xbf050000) << (BMP_BIT - 32),	/* 149 -- 16,    bf05 */
-	BMP_C(0xc0000000) << (BMP_BIT - 32),	/* 150 --  3,       6 */
-	BMP_C(0xc2000000) << (BMP_BIT - 32),	/* 151 --  7,      61 */
-	BMP_C(0xc25a5600) << (BMP_BIT - 32),	/* 152 -- 24,  c25a56 */
-	BMP_C(0xc2b70000) << (BMP_BIT - 32),	/* 153 -- 16,    c2b7 */
-	BMP_C(0xc2b80000) << (BMP_BIT - 32),	/* 154 -- 14,    30ae */
-	BMP_C(0xc4000000) << (BMP_BIT - 32),	/* 155 --  8,      c4 */
-	BMP_C(0xc6c60000) << (BMP_BIT - 32),	/* 156 -- 16,    c6c6 */
-	BMP_C(0xc704dd7b) << (BMP_BIT - 32),	/* 157 -- 32,c704dd7b */
-	BMP_C(0xc8000000) << (BMP_BIT - 32),	/* 158 --  5,      19 */
-	BMP_C(0xc8670000) << (BMP_BIT - 32),	/* 159 -- 16,    c867 */
-	BMP_C(0xcbf43926) << (BMP_BIT - 32),	/* 160 -- 32,cbf43926 */
-	BMP_C(0xcde70300) << (BMP_BIT - 32),	/* 161 -- 24,  cde703 */
-	BMP_C(0xce3c0000) << (BMP_BIT - 32),	/* 162 -- 16,    ce3c */
-	BMP_C(0xd0000000) << (BMP_BIT - 32),	/* 163 --  8,      d0 */
-	BMP_C(0xd02a0000) << (BMP_BIT - 32),	/* 164 -- 15,    6815 */
-	BMP_C(0xd0db0000) << (BMP_BIT - 32),	/* 165 -- 16,    d0db */
-	BMP_C(0xd3100000) << (BMP_BIT - 32),	/* 166 -- 12,     d31 */
-	BMP_C(0xd3be9568) << (BMP_BIT - 32),	/* 167 -- 30,34efa55a */
-	BMP_C(0xd4d00000) << (BMP_BIT - 32),	/* 168 -- 12,     d4d */
-	BMP_C(0xd5000000) << (BMP_BIT - 32),	/* 169 --  8,      d5 */
-	BMP_C(0xd64e0000) << (BMP_BIT - 32),	/* 170 -- 16,    d64e */
-	BMP_C(0xda000000) << (BMP_BIT - 32),	/* 171 --  8,      da */
-	BMP_C(0xdaf00000) << (BMP_BIT - 32),	/* 172 -- 12,     daf */
-	BMP_C(0xdebb20e3) << (BMP_BIT - 32),	/* 173 -- 32,debb20e3 */
-	BMP_C(0xdf000000) << (BMP_BIT - 32),	/* 174 --  8,      df */
-	BMP_C(0xe0000000) << (BMP_BIT - 32),	/* 175 --  3,       7 */
-	BMP_C(0xe3069283) << (BMP_BIT - 32),	/* 176 -- 32,e3069283 */
-	BMP_C(0xe3940000) << (BMP_BIT - 32),	/* 177 -- 16,    e394 */
-	BMP_C(0xe5cc0000) << (BMP_BIT - 32),	/* 178 -- 16,    e5cc */
-	BMP_C(0xe7a80000) << (BMP_BIT - 32),	/* 179 -- 13,    1cf5 */
-	BMP_C(0xe8000000) << (BMP_BIT - 32),	/* 180 --  6,      3a */
-	BMP_C(0xea000000) << (BMP_BIT - 32),	/* 181 --  7,      75 */
-	BMP_C(0xea820000) << (BMP_BIT - 32),	/* 182 -- 16,    ea82 */
-	BMP_C(0xec000000) << (BMP_BIT - 32),	/* 183 --  6,      3b */
-	BMP_C(0xf0000000) << (BMP_BIT - 32),	/* 184 --  4,       f */
-	BMP_C(0xf0b80000) << (BMP_BIT - 32),	/* 185 -- 16,    f0b8 */
-	BMP_C(0xf1300000) << (BMP_BIT - 32),	/* 186 -- 12,     f13 */
-	BMP_C(0xf4000000) << (BMP_BIT - 32),	/* 187 --  8,      f4 */
-	BMP_C(0xf4acfb13) << (BMP_BIT - 32),	/* 188 -- 32,f4acfb13 */
-	BMP_C(0xf5b00000) << (BMP_BIT - 32),	/* 189 -- 12,     f5b */
-	BMP_C(0xf6400000) << (BMP_BIT - 32),	/* 190 -- 10,     3d9 */
-	BMP_C(0xf7000000) << (BMP_BIT - 32),	/* 191 --  8,      f7 */
-	BMP_C(0xf8000000) << (BMP_BIT - 32),	/* 192 --  5,      1f */
-	BMP_C(0xfc000000) << (BMP_BIT - 32),	/* 193 --  6,      3f */
-	BMP_C(0xfc891918) << (BMP_BIT - 32),	/* 194 -- 32,fc891918 */
-	BMP_C(0xfd000000) << (BMP_BIT - 32),	/* 195 --  8,      fd */
-	BMP_C(0xfe000000) << (BMP_BIT - 32),	/* 196 --  7,      7f */
-	BMP_C(0xfedcba00) << (BMP_BIT - 32),	/* 197 -- 24,  fedcba */
-	BMP_C(0xfee80000) << (BMP_BIT - 32),	/* 198 -- 16,    fee8 */
-	BMP_C(0xff000000) << (BMP_BIT - 32),	/* 199 --  8,      ff */
-	BMP_C(0xffc00000) << (BMP_BIT - 32),	/* 200 -- 10,     3ff */
-	BMP_C(0xfff00000) << (BMP_BIT - 32),	/* 201 -- 12,     fff */
-	BMP_C(0xfffc0000) << (BMP_BIT - 32),	/* 202 -- 14,    3fff */
-	BMP_C(0xffff0000) << (BMP_BIT - 32),	/* 203 -- 16,    ffff */
-	BMP_C(0xffffff00) << (BMP_BIT - 32),	/* 204 -- 24,  ffffff */
-	BMP_C(0xfffffffc) << (BMP_BIT - 32),	/* 205 -- 30,3fffffff */
-	BMP_C(0xfffffffe) << (BMP_BIT - 32),	/* 206 -- 31,7fffffff */
-	BMP_C(0xffffffff) << (BMP_BIT - 32),	/* 207 -- 32,ffffffff */
+    BMP_C(0x000000af) << (BMP_BIT - 32),    /*   0 -- 32,000000af */
+    BMP_C(0x00010000) << (BMP_BIT - 32),    /*   1 -- 16,    0001 */
+    BMP_C(0x00020000) << (BMP_BIT - 32),    /*   2 -- 15,    0001 */
+    BMP_C(0x00065b00) << (BMP_BIT - 32),    /*   3 -- 24,  00065b */
+    BMP_C(0x007e0000) << (BMP_BIT - 32),    /*   4 -- 16,    007e */
+    BMP_C(0x007f0000) << (BMP_BIT - 32),    /*   5 -- 16,    007f */
+    BMP_C(0x03400000) << (BMP_BIT - 32),    /*   6 -- 11,     01a */
+    BMP_C(0x0376e6e7) << (BMP_BIT - 32),    /*   7 -- 32,0376e6e7 */
+    BMP_C(0x04c11db7) << (BMP_BIT - 32),    /*   8 -- 32,04c11db7 */
+    BMP_C(0x05890000) << (BMP_BIT - 32),    /*   9 -- 16,    0589 */
+    BMP_C(0x07000000) << (BMP_BIT - 32),    /*  10 --  8,      07 */
+    BMP_C(0x080b0000) << (BMP_BIT - 32),    /*  11 -- 16,    080b */
+    BMP_C(0x09823b6e) << (BMP_BIT - 32),    /*  12 -- 31,04c11db7 */
+    BMP_C(0x0b3c0000) << (BMP_BIT - 32),    /*  13 -- 15,    059e */
+    BMP_C(0x0c000000) << (BMP_BIT - 32),    /*  14 --  6,      03 */
+    BMP_C(0x0c200000) << (BMP_BIT - 32),    /*  15 -- 11,     061 */
+    BMP_C(0x0c780000) << (BMP_BIT - 32),    /*  16 -- 14,    031e */
+    BMP_C(0x0fb30000) << (BMP_BIT - 32),    /*  17 -- 16,    0fb3 */
+    BMP_C(0x10210000) << (BMP_BIT - 32),    /*  18 -- 16,    1021 */
+    BMP_C(0x12000000) << (BMP_BIT - 32),    /*  19 --  7,      09 */
+    BMP_C(0x130d2afc) << (BMP_BIT - 32),    /*  20 -- 30,04c34abf */
+    BMP_C(0x144e6300) << (BMP_BIT - 32),    /*  21 -- 24,  144e63 */
+    BMP_C(0x15000000) << (BMP_BIT - 32),    /*  22 --  8,      15 */
+    BMP_C(0x1697d06a) << (BMP_BIT - 32),    /*  23 -- 32,1697d06a */
+    BMP_C(0x17800000) << (BMP_BIT - 32),    /*  24 -- 12,     178 */
+    BMP_C(0x18000000) << (BMP_BIT - 32),    /*  25 --  6,      06 */
+    BMP_C(0x19d3c8d8) << (BMP_BIT - 32),    /*  26 -- 31,0ce9e46c */
+    BMP_C(0x1c000000) << (BMP_BIT - 32),    /*  27 --  6,      07 */
+    BMP_C(0x1d000000) << (BMP_BIT - 32),    /*  28 --  8,      1d */
+    BMP_C(0x1d0f0000) << (BMP_BIT - 32),    /*  29 -- 16,    1d0f */
+    BMP_C(0x1dcf0000) << (BMP_BIT - 32),    /*  30 -- 16,    1dcf */
+    BMP_C(0x1edc6f41) << (BMP_BIT - 32),    /*  31 -- 32,1edc6f41 */
+    BMP_C(0x1f23b800) << (BMP_BIT - 32),    /*  32 -- 24,  1f23b8 */
+    BMP_C(0x20000000) << (BMP_BIT - 32),    /*  33 --  4,       2 */
+    BMP_C(0x200fa500) << (BMP_BIT - 32),    /*  34 -- 24,  200fa5 */
+    BMP_C(0x20140000) << (BMP_BIT - 32),    /*  35 -- 14,    0805 */
+    BMP_C(0x20b40000) << (BMP_BIT - 32),    /*  36 -- 14,    082d */
+    BMP_C(0x20fe0000) << (BMP_BIT - 32),    /*  37 -- 16,    20fe */
+    BMP_C(0x21890000) << (BMP_BIT - 32),    /*  38 -- 16,    2189 */
+    BMP_C(0x21cf0200) << (BMP_BIT - 32),    /*  39 -- 24,  21cf02 */
+    BMP_C(0x23ef5200) << (BMP_BIT - 32),    /*  40 -- 24,  23ef52 */
+    BMP_C(0x25000000) << (BMP_BIT - 32),    /*  41 --  8,      25 */
+    BMP_C(0x26000000) << (BMP_BIT - 32),    /*  42 --  8,      26 */
+    BMP_C(0x26b10000) << (BMP_BIT - 32),    /*  43 -- 16,    26b1 */
+    BMP_C(0x27818000) << (BMP_BIT - 32),    /*  44 -- 17,   04f03 */
+    BMP_C(0x27d00000) << (BMP_BIT - 32),    /*  45 -- 13,    04fa */
+    BMP_C(0x28000000) << (BMP_BIT - 32),    /*  46 --  5,      05 */
+    BMP_C(0x29b10000) << (BMP_BIT - 32),    /*  47 -- 16,    29b1 */
+    BMP_C(0x2f000000) << (BMP_BIT - 32),    /*  48 --  8,      2f */
+    BMP_C(0x30000000) << (BMP_BIT - 32),    /*  49 --  4, 3/ 5, 6 */
+    BMP_C(0x3010bf7f) << (BMP_BIT - 32),    /*  50 -- 32,3010bf7f */
+    BMP_C(0x31000000) << (BMP_BIT - 32),    /*  51 --  8,      31 */
+    BMP_C(0x31800000) << (BMP_BIT - 32),    /*  52 -- 10,     0c6 */
+    BMP_C(0x31c30000) << (BMP_BIT - 32),    /*  53 -- 16,    31c3 */
+    BMP_C(0x328b6300) << (BMP_BIT - 32),    /*  54 -- 24,  328b63 */
+    BMP_C(0x34000000) << (BMP_BIT - 32),    /*  55 --  6,      0d */
+    BMP_C(0x340bc6d9) << (BMP_BIT - 32),    /*  56 -- 32,340bc6d9 */
+    BMP_C(0x37000000) << (BMP_BIT - 32),    /*  57 --  8,      37 */
+    BMP_C(0x38000000) << (BMP_BIT - 32),    /*  58 --  5,      07 */
+    BMP_C(0x39000000) << (BMP_BIT - 32),    /*  59 --  8,      39 */
+    BMP_C(0x3d650000) << (BMP_BIT - 32),    /*  60 -- 16,    3d65 */
+    BMP_C(0x3e000000) << (BMP_BIT - 32),    /*  61 --  8,      3e */
+    BMP_C(0x40000000) << (BMP_BIT - 32),    /*  62 --  3,       2 */
+    BMP_C(0x42000000) << (BMP_BIT - 32),    /*  63 --  8,      42 */
+    BMP_C(0x44c20000) << (BMP_BIT - 32),    /*  64 -- 16,    44c2 */
+    BMP_C(0x45270551) << (BMP_BIT - 32),    /*  65 -- 32,45270551 */
+    BMP_C(0x48000000) << (BMP_BIT - 32),    /*  66 --  5,      09 */
+    BMP_C(0x49000000) << (BMP_BIT - 32),    /*  67 --  8,      49 */
+    BMP_C(0x4a800000) << (BMP_BIT - 32),    /*  68 -- 10,     12a */
+    BMP_C(0x4acc0000) << (BMP_BIT - 32),    /*  69 -- 15,    2566 */
+    BMP_C(0x4b000000) << (BMP_BIT - 32),    /*  70 --  8,      4b */
+    BMP_C(0x4b370000) << (BMP_BIT - 32),    /*  71 -- 16,    4b37 */
+    BMP_C(0x4c000000) << (BMP_BIT - 32),    /*  72 --  6,      13 */
+    BMP_C(0x4c060000) << (BMP_BIT - 32),    /*  73 -- 16,    4c06 */
+    BMP_C(0x53000000) << (BMP_BIT - 32),    /*  74 --  8,      53 */
+    BMP_C(0x55000000) << (BMP_BIT - 32),    /*  75 --  8,      55 */
+    BMP_C(0x55555500) << (BMP_BIT - 32),    /*  76 -- 24,  555555 */
+    BMP_C(0x59350000) << (BMP_BIT - 32),    /*  77 -- 16,    5935 */
+    BMP_C(0x5d380000) << (BMP_BIT - 32),    /*  78 -- 16,    5d38 */
+    BMP_C(0x5d400000) << (BMP_BIT - 32),    /*  79 -- 10,     175 */
+    BMP_C(0x5d6dcb00) << (BMP_BIT - 32),    /*  80 -- 24,  5d6dcb */
+    BMP_C(0x60000000) << (BMP_BIT - 32),    /*  81 --  3,       3 */
+    BMP_C(0x60e00000) << (BMP_BIT - 32),    /*  82 -- 11,     307 */
+    BMP_C(0x63d00000) << (BMP_BIT - 32),    /*  83 -- 16,    63d0 */
+    BMP_C(0x64000000) << (BMP_BIT - 32),    /*  84 --  6,      19 */
+    BMP_C(0x66400000) << (BMP_BIT - 32),    /*  85 -- 10,     199 */
+    BMP_C(0x66c50000) << (BMP_BIT - 32),    /*  86 -- 16,    66c5 */
+    BMP_C(0x6f630000) << (BMP_BIT - 32),    /*  87 -- 16,    6f63 */
+    BMP_C(0x6f910000) << (BMP_BIT - 32),    /*  88 -- 16,    6f91 */
+    BMP_C(0x70000000) << (BMP_BIT - 32),    /*  89 --  4,       7 */
+    BMP_C(0x70a00000) << (BMP_BIT - 32),    /*  90 -- 11,     385 */
+    BMP_C(0x755b0000) << (BMP_BIT - 32),    /*  91 -- 16,    755b */
+    BMP_C(0x765e7680) << (BMP_BIT - 32),    /*  92 -- 32,765e7680 */
+    BMP_C(0x76c20800) << (BMP_BIT - 32),    /*  93 -- 32,  0ed841 */
+    BMP_C(0x7979bd00) << (BMP_BIT - 32),    /*  94 -- 24,  7979bd */
+    BMP_C(0x7e000000) << (BMP_BIT - 32),    /*  95 --  8,      7e */
+    BMP_C(0x80000000) << (BMP_BIT - 32),    /*  96 --  3,       4 */
+    BMP_C(0x80006300) << (BMP_BIT - 32),    /*  97 -- 24,  800063 */
+    BMP_C(0x80050000) << (BMP_BIT - 32),    /*  98 -- 16,    8005 */
+    BMP_C(0x800d0000) << (BMP_BIT - 32),    /*  99 -- 16,    800d */
+    BMP_C(0x800fe300) << (BMP_BIT - 32),    /* 100 -- 24,  800fe3 */
+    BMP_C(0x80b40000) << (BMP_BIT - 32),    /* 101 -- 14,    202d */
+    BMP_C(0x80c2e71c) << (BMP_BIT - 32),    /* 102 -- 30,2030b9c7 */
+    BMP_C(0x80f00000) << (BMP_BIT - 32),    /* 103 -- 12,     80f */
+    BMP_C(0x814141ab) << (BMP_BIT - 32),    /* 104 -- 32,814141ab */
+    BMP_C(0x8144c800) << (BMP_BIT - 32),    /* 105 -- 21,  102899 */
+    BMP_C(0x864cfb00) << (BMP_BIT - 32),    /* 106 -- 24,  864cfb */
+    BMP_C(0x87315576) << (BMP_BIT - 32),    /* 107 -- 32,87315576 */
+    BMP_C(0x89ec0000) << (BMP_BIT - 32),    /* 108 -- 16,    89ec */
+    BMP_C(0x8a000000) << (BMP_BIT - 32),    /* 109 --  7,      45 */
+    BMP_C(0x8b320000) << (BMP_BIT - 32),    /* 110 -- 15,    4599 */
+    BMP_C(0x8bb70000) << (BMP_BIT - 32),    /* 111 -- 16,    8bb7 */
+    BMP_C(0x8cc00000) << (BMP_BIT - 32),    /* 112 -- 10,     233 */
+    BMP_C(0x904cddbf) << (BMP_BIT - 32),    /* 113 -- 32,904cddbf */
+    BMP_C(0x906e0000) << (BMP_BIT - 32),    /* 114 -- 16,    906e */
+    BMP_C(0x94000000) << (BMP_BIT - 32),    /* 115 --  8,      94 */
+    BMP_C(0x97000000) << (BMP_BIT - 32),    /* 116 --  8,      97 */
+    BMP_C(0x98000000) << (BMP_BIT - 32),    /* 117 --  6,      26 */
+    BMP_C(0x9b000000) << (BMP_BIT - 32),    /* 118 --  8,      9b */
+    BMP_C(0x9c000000) << (BMP_BIT - 32),    /* 119 --  6,      27 */
+    BMP_C(0x9d5e4de2) << (BMP_BIT - 32),    /* 120 -- 31,4eaf26f1 */
+    BMP_C(0x9e000000) << (BMP_BIT - 32),    /* 121 --  7,      4f */
+    BMP_C(0x9ecf0000) << (BMP_BIT - 32),    /* 122 -- 16,    9ecf */
+    BMP_C(0xa0660000) << (BMP_BIT - 32),    /* 123 -- 16,    a066 */
+    BMP_C(0xa0970000) << (BMP_BIT - 32),    /* 124 -- 16,    a097 */
+    BMP_C(0xa1000000) << (BMP_BIT - 32),    /* 125 --  8,      a1 */
+    BMP_C(0xa3660000) << (BMP_BIT - 32),    /* 126 -- 16,    a366 */
+    BMP_C(0xa6000000) << (BMP_BIT - 32),    /* 127 --  7,      53 */
+    BMP_C(0xa7000000) << (BMP_BIT - 32),    /* 128 --  8,      a7 */
+    BMP_C(0xa8000000) << (BMP_BIT - 32),    /* 129 --  5,      15 */
+    BMP_C(0xa8190000) << (BMP_BIT - 32),    /* 130 -- 16,    a819 */
+    BMP_C(0xa833982b) << (BMP_BIT - 32),    /* 131 -- 32,a833982b */
+    BMP_C(0xabcdef00) << (BMP_BIT - 32),    /* 132 -- 24,  abcdef */
+    BMP_C(0xac000000) << (BMP_BIT - 32),    /* 133 --  8,      ac */
+    BMP_C(0xaee70000) << (BMP_BIT - 32),    /* 134 -- 16,    aee7 */
+    BMP_C(0xb0000000) << (BMP_BIT - 32),    /* 135 --  4,       b */
+    BMP_C(0xb0010000) << (BMP_BIT - 32),    /* 136 -- 16,    b001 */
+    BMP_C(0xb2aa0000) << (BMP_BIT - 32),    /* 137 -- 16,    b2aa */
+    BMP_C(0xb3400000) << (BMP_BIT - 32),    /* 138 -- 12,     b34 */
+    BMP_C(0xb42d8000) << (BMP_BIT - 32),    /* 139 -- 17,   1685b */
+    BMP_C(0xb4600000) << (BMP_BIT - 32),    /* 140 -- 11,     5a3 */
+    BMP_C(0xb4c80000) << (BMP_BIT - 32),    /* 141 -- 16,    b4c8 */
+    BMP_C(0xb4f3e600) << (BMP_BIT - 32),    /* 142 -- 24,  b4f3e6 */
+    BMP_C(0xb704ce00) << (BMP_BIT - 32),    /* 143 -- 24,  b704ce */
+    BMP_C(0xb798b438) << (BMP_BIT - 32),    /* 144 -- 32,b798b438 */
+    BMP_C(0xbb3d0000) << (BMP_BIT - 32),    /* 145 -- 16,    bb3d */
+    BMP_C(0xbc000000) << (BMP_BIT - 32),    /* 146 --  6,2f/ 8,bc */
+    BMP_C(0xbd0be338) << (BMP_BIT - 32),    /* 147 -- 32,bd0be338 */
+    BMP_C(0xbdf40000) << (BMP_BIT - 32),    /* 148 -- 16,    bdf4 */
+    BMP_C(0xbf050000) << (BMP_BIT - 32),    /* 149 -- 16,    bf05 */
+    BMP_C(0xc0000000) << (BMP_BIT - 32),    /* 150 --  3,       6 */
+    BMP_C(0xc2000000) << (BMP_BIT - 32),    /* 151 --  7,      61 */
+    BMP_C(0xc25a5600) << (BMP_BIT - 32),    /* 152 -- 24,  c25a56 */
+    BMP_C(0xc2b70000) << (BMP_BIT - 32),    /* 153 -- 16,    c2b7 */
+    BMP_C(0xc2b80000) << (BMP_BIT - 32),    /* 154 -- 14,    30ae */
+    BMP_C(0xc4000000) << (BMP_BIT - 32),    /* 155 --  8,      c4 */
+    BMP_C(0xc6c60000) << (BMP_BIT - 32),    /* 156 -- 16,    c6c6 */
+    BMP_C(0xc704dd7b) << (BMP_BIT - 32),    /* 157 -- 32,c704dd7b */
+    BMP_C(0xc8000000) << (BMP_BIT - 32),    /* 158 --  5,      19 */
+    BMP_C(0xc8670000) << (BMP_BIT - 32),    /* 159 -- 16,    c867 */
+    BMP_C(0xcbf43926) << (BMP_BIT - 32),    /* 160 -- 32,cbf43926 */
+    BMP_C(0xcde70300) << (BMP_BIT - 32),    /* 161 -- 24,  cde703 */
+    BMP_C(0xce3c0000) << (BMP_BIT - 32),    /* 162 -- 16,    ce3c */
+    BMP_C(0xd0000000) << (BMP_BIT - 32),    /* 163 --  8,      d0 */
+    BMP_C(0xd02a0000) << (BMP_BIT - 32),    /* 164 -- 15,    6815 */
+    BMP_C(0xd0db0000) << (BMP_BIT - 32),    /* 165 -- 16,    d0db */
+    BMP_C(0xd3100000) << (BMP_BIT - 32),    /* 166 -- 12,     d31 */
+    BMP_C(0xd3be9568) << (BMP_BIT - 32),    /* 167 -- 30,34efa55a */
+    BMP_C(0xd4d00000) << (BMP_BIT - 32),    /* 168 -- 12,     d4d */
+    BMP_C(0xd5000000) << (BMP_BIT - 32),    /* 169 --  8,      d5 */
+    BMP_C(0xd64e0000) << (BMP_BIT - 32),    /* 170 -- 16,    d64e */
+    BMP_C(0xda000000) << (BMP_BIT - 32),    /* 171 --  8,      da */
+    BMP_C(0xdaf00000) << (BMP_BIT - 32),    /* 172 -- 12,     daf */
+    BMP_C(0xdebb20e3) << (BMP_BIT - 32),    /* 173 -- 32,debb20e3 */
+    BMP_C(0xdf000000) << (BMP_BIT - 32),    /* 174 --  8,      df */
+    BMP_C(0xe0000000) << (BMP_BIT - 32),    /* 175 --  3,       7 */
+    BMP_C(0xe3069283) << (BMP_BIT - 32),    /* 176 -- 32,e3069283 */
+    BMP_C(0xe3940000) << (BMP_BIT - 32),    /* 177 -- 16,    e394 */
+    BMP_C(0xe5cc0000) << (BMP_BIT - 32),    /* 178 -- 16,    e5cc */
+    BMP_C(0xe7a80000) << (BMP_BIT - 32),    /* 179 -- 13,    1cf5 */
+    BMP_C(0xe8000000) << (BMP_BIT - 32),    /* 180 --  6,      3a */
+    BMP_C(0xea000000) << (BMP_BIT - 32),    /* 181 --  7,      75 */
+    BMP_C(0xea820000) << (BMP_BIT - 32),    /* 182 -- 16,    ea82 */
+    BMP_C(0xec000000) << (BMP_BIT - 32),    /* 183 --  6,      3b */
+    BMP_C(0xf0000000) << (BMP_BIT - 32),    /* 184 --  4,       f */
+    BMP_C(0xf0b80000) << (BMP_BIT - 32),    /* 185 -- 16,    f0b8 */
+    BMP_C(0xf1300000) << (BMP_BIT - 32),    /* 186 -- 12,     f13 */
+    BMP_C(0xf4000000) << (BMP_BIT - 32),    /* 187 --  8,      f4 */
+    BMP_C(0xf4acfb13) << (BMP_BIT - 32),    /* 188 -- 32,f4acfb13 */
+    BMP_C(0xf5b00000) << (BMP_BIT - 32),    /* 189 -- 12,     f5b */
+    BMP_C(0xf6400000) << (BMP_BIT - 32),    /* 190 -- 10,     3d9 */
+    BMP_C(0xf7000000) << (BMP_BIT - 32),    /* 191 --  8,      f7 */
+    BMP_C(0xf8000000) << (BMP_BIT - 32),    /* 192 --  5,      1f */
+    BMP_C(0xfc000000) << (BMP_BIT - 32),    /* 193 --  6,      3f */
+    BMP_C(0xfc891918) << (BMP_BIT - 32),    /* 194 -- 32,fc891918 */
+    BMP_C(0xfd000000) << (BMP_BIT - 32),    /* 195 --  8,      fd */
+    BMP_C(0xfe000000) << (BMP_BIT - 32),    /* 196 --  7,      7f */
+    BMP_C(0xfedcba00) << (BMP_BIT - 32),    /* 197 -- 24,  fedcba */
+    BMP_C(0xfee80000) << (BMP_BIT - 32),    /* 198 -- 16,    fee8 */
+    BMP_C(0xff000000) << (BMP_BIT - 32),    /* 199 --  8,      ff */
+    BMP_C(0xffc00000) << (BMP_BIT - 32),    /* 200 -- 10,     3ff */
+    BMP_C(0xfff00000) << (BMP_BIT - 32),    /* 201 -- 12,     fff */
+    BMP_C(0xfffc0000) << (BMP_BIT - 32),    /* 202 -- 14,    3fff */
+    BMP_C(0xffff0000) << (BMP_BIT - 32),    /* 203 -- 16,    ffff */
+    BMP_C(0xffffff00) << (BMP_BIT - 32),    /* 204 -- 24,  ffffff */
+    BMP_C(0xfffffffc) << (BMP_BIT - 32),    /* 205 -- 30,3fffffff */
+    BMP_C(0xfffffffe) << (BMP_BIT - 32),    /* 206 -- 31,7fffffff */
+    BMP_C(0xffffffff) << (BMP_BIT - 32),    /* 207 -- 32,ffffffff */
 };
 
 static const struct malias aliases[];
@@ -476,295 +476,295 @@ static const struct malias aliases[];
  * Sorted by left-justified polynomial for bsearch().
  */
 static const struct mpreset models[] = {
-	{64UL, b64,     b64a,    P_LE   | P_CONFIR, b64a,    b64b,    b64c,    aliases+130},	/*   0 */
-	{32UL, b32+  0, 0,       P_BE   | P_CONFIR, 0,       b32+147, 0,       aliases+107},	/*   1 */
-	{40UL, b40,     0,       P_BE   | P_ACADEM, b40a,    b40b,    b40c,    aliases+115},	/*   2 */
-	{24UL, b32+  3, b32+ 76, P_LE   | P_ATTEST, 0,       b32+152, 0,       aliases+ 77},	/*   3 */
-	{32UL, b32+  8, 0,       P_BE   | P_ATTEST, b32+207, b32+ 92, b32+157, aliases+ 98},	/*   4 */
-	{32UL, b32+  8, b32+207, P_BE   | P_ATTEST, 0,       b32+  7, 0,       aliases+104},	/*   5 */
-	{32UL, b32+  8, b32+207, P_BE   | P_ATTEST, b32+207, b32+194, b32+157, aliases+ 96},	/*   6 */
-	{32UL, b32+  8, b32+207, P_LE   | P_CONFIR, 0,       b32+ 56, 0,       aliases+103},	/*   7 */
-	{32UL, b32+  8, b32+207, P_LE   | P_ATTEST, b32+207, b32+160, b32+173, aliases+102},	/*   8 */
-	{16UL, b32+  9, 0,       P_BE   | P_ATTEST, 0,       b32+  5, 0,       aliases+ 36},	/*   9 */
-	{16UL, b32+  9, 0,       P_BE   | P_ATTEST, b32+  1, b32+  4, b32+  9, aliases+ 35},	/*  10 */
-	{ 8UL, b32+ 10, 0,       P_BE   | P_ATTEST, 0,       b32+187, 0,       aliases+157},	/*  11 */
-	{ 8UL, b32+ 10, 0,       P_BE   | P_ACADEM, b32+ 75, b32+125, b32+133, aliases+147},	/*  12 */
-	{ 8UL, b32+ 10, b32+199, P_LE   | P_ACADEM, 0,       b32+163, 0,       aliases+155},	/*  13 */
-	{16UL, b32+ 11, b32+203, P_LE   | P_ATTEST, 0,       b32+123, 0,       aliases+ 58},	/*  14 */
-	{31UL, b32+ 12, b32+206, P_BE   | P_CONFIR, b32+206, b32+ 26, b32+120, aliases+ 88},	/*  15 */
-	{ 6UL, b32+ 14, 0,       P_LE   | P_ACADEM, 0,       b32+ 25, 0,       aliases+124},	/*  16 */
-	{82UL, b82,     0,       P_LE   | P_ATTEST, 0,       b82a,    0,       aliases+160},	/*  17 */
-	{16UL, b32+ 18, 0,       P_BE   | P_ATTEST, 0,       b32+ 53, 0,       aliases+ 73},	/*  18 */
-	{16UL, b32+ 18, 0,       P_BE   | P_ACADEM, b32+203, b32+162, b32+ 29, aliases+ 42},	/*  19 */
-	{16UL, b32+ 18, 0,       P_LE   | P_ATTEST, 0,       b32+ 38, 0,       aliases+ 50},	/*  20 */
-	{16UL, b32+ 18, b32+ 29, P_BE   | P_ATTEST, 0,       b32+178, 0,       aliases+ 63},	/*  21 */
-	{16UL, b32+ 18, b32+108, P_LE   | P_ATTEST, 0,       b32+ 43, 0,       aliases+ 66},	/*  22 */
-	{16UL, b32+ 18, b32+137, P_LE   | P_THIRDP, 0,       b32+ 83, 0,       aliases+ 62},	/*  23 */
-	{16UL, b32+ 18, b32+156, P_LE   | P_ATTEST, 0,       b32+149, 0,       aliases+ 48},	/*  24 */
-	{16UL, b32+ 18, b32+203, P_BE   | P_ATTEST, 0,       b32+ 47, 0,       aliases+ 44},	/*  25 */
-	{16UL, b32+ 18, b32+203, P_BE   | P_ATTEST, b32+203, b32+170, b32+ 29, aliases+ 41},	/*  26 */
-	{16UL, b32+ 18, b32+203, P_LE   | P_ATTEST, 0,       b32+ 88, 0,       aliases+ 56},	/*  27 */
-	{16UL, b32+ 18, b32+203, P_LE   | P_ATTEST, b32+203, b32+114, b32+185, aliases+ 45},	/*  28 */
-	{ 7UL, b32+ 19, 0,       P_BE   | P_ACADEM, 0,       b32+181, 0,       aliases+134},	/*  29 */
-	{ 6UL, b32+ 27, b32+193, P_BE   | P_ACADEM, 0,       b32+183, 0,       aliases+122},	/*  30 */
-	{ 8UL, b32+ 28, 0,       P_BE   | P_ACADEM, 0,       b32+ 57, 0,       aliases+145},	/*  31 */
-	{ 8UL, b32+ 28, b32+195, P_BE   | P_ATTEST, 0,       b32+ 95, 0,       aliases+148},	/*  32 */
-	{ 8UL, b32+ 28, b32+199, P_BE   | P_ATTEST, b32+199, b32+ 70, b32+155, aliases+156},	/*  33 */
-	{ 8UL, b32+ 28, b32+199, P_LE   | P_ATTEST, 0,       b32+116, 0,       aliases+158},	/*  34 */
-	{16UL, b32+ 30, b32+203, P_BE   | P_ATTEST, b32+203, b32+130, b32+177, aliases+ 61},	/*  35 */
-	{32UL, b32+ 31, b32+207, P_LE   | P_ATTEST, b32+207, b32+176, b32+144, aliases+101},	/*  36 */
-	{14UL, b32+ 35, 0,       P_LE   | P_ATTEST, 0,       b32+ 36, 0,       aliases+ 17},	/*  37 */
-	{ 5UL, b32+ 46, b32+192, P_LE   | P_THIRDP, b32+192, b32+158, b32+ 49, aliases+120},	/*  38 */
-	{ 8UL, b32+ 48, 0,       P_BE   | P_ATTEST, 0,       b32+ 61, 0,       aliases+154},	/*  39 */
-	{ 8UL, b32+ 48, b32+199, P_BE   | P_ATTEST, b32+199, b32+174, b32+ 63, aliases+139},	/*  40 */
-	{ 4UL, b32+ 49, 0,       P_LE   | P_ACADEM, 0,       b32+ 89, 0,       aliases+112},	/*  41 */
-	{ 4UL, b32+ 49, b32+184, P_BE   | P_ACADEM, b32+184, b32+135, b32+ 33, aliases+113},	/*  42 */
-	{ 8UL, b32+ 51, 0,       P_LE   | P_ATTEST, 0,       b32+125, 0,       aliases+152},	/*  43 */
-	{ 8UL, b32+ 51, b32+199, P_BE   | P_ATTEST, 0,       b32+191, 0,       aliases+153},	/*  44 */
-	{24UL, b32+ 54, b32+204, P_BE   | P_ACADEM, b32+204, b32+142, b32+ 21, aliases+ 80},	/*  45 */
-	{ 8UL, b32+ 59, 0,       P_LE   | P_ATTEST, 0,       b32+ 22, 0,       aliases+142},	/*  46 */
-	{16UL, b32+ 60, 0,       P_BE   | P_CONFIR, b32+203, b32+153, b32+126, aliases+ 38},	/*  47 */
-	{16UL, b32+ 60, 0,       P_LE   | P_CONFIR, b32+203, b32+182, b32+ 86, aliases+ 37},	/*  48 */
-	{64UL, b64d,    0,       P_BE   | P_ACADEM, 0,       b64e,    0,       aliases+128},	/*  49 */
-	{64UL, b64d,    b64a,    P_BE   | P_CONFIR, b64a,    b64f,    b64g,    aliases+131},	/*  50 */
-	{64UL, b64d,    b64a,    P_LE   | P_ATTEST, b64a,    b64h,    b64i,    aliases+132},	/*  51 */
-	{ 5UL, b32+ 66, b32+ 66, P_BE   | P_ATTEST, 0,       0,       0,       aliases+117},	/*  52 */
-	{ 8UL, b32+ 67, 0,       P_BE   | P_ACADEM, b32+199, b32+115, b32+ 74, aliases+146},	/*  53 */
-	{16UL, b32+ 77, 0,       P_BE   | P_ATTEST, 0,       b32+ 78, 0,       aliases+ 59},	/*  54 */
-	{10UL, b32+ 79, 0,       P_BE   | P_ACADEM, b32+200, b32+ 68, b32+ 52, aliases+  6},	/*  55 */
-	{24UL, b32+ 80, b32+132, P_BE   | P_ATTEST, 0,       b32+ 32, 0,       aliases+ 79},	/*  56 */
-	{24UL, b32+ 80, b32+197, P_BE   | P_ATTEST, 0,       b32+ 94, 0,       aliases+ 78},	/*  57 */
-	{ 3UL, b32+ 81, 0,       P_BE   | P_ACADEM, b32+175, b32+ 96, b32+ 62, aliases+ 85},	/*  58 */
-	{ 3UL, b32+ 81, b32+175, P_LE   | P_ACADEM, 0,       b32+150, 0,       aliases+ 86},	/*  59 */
-	{11UL, b32+ 82, 0,       P_BE   | P_ACADEM, 0,       b32+ 15, 0,       aliases+ 10},	/*  60 */
-	{ 6UL, b32+ 84, 0,       P_LE   | P_ATTEST, 0,       b32+117, 0,       aliases+123},	/*  61 */
-	{16UL, b32+ 87, 0,       P_BE   | P_THIRDP, 0,       b32+148, 0,       aliases+ 52},	/*  62 */
-	{11UL, b32+ 90, b32+  6, P_BE   | P_ATTEST, 0,       b32+140, 0,       aliases+  9},	/*  63 */
-	{16UL, b32+ 91, 0,       P_BE   | P_ATTEST, 0,       b32+ 37, 0,       aliases+ 60},	/*  64 */
-	{24UL, b32+ 97, 0,       P_BE   | P_ACADEM, 0,       b32+ 40, 0,       aliases+ 82},	/*  65 */
-	{24UL, b32+ 97, b32+204, P_BE   | P_ATTEST, b32+204, b32+ 34, b32+100, aliases+ 84},	/*  66 */
-	{16UL, b32+ 98, 0,       P_BE   | P_ATTEST, 0,       b32+198, 0,       aliases+ 67},	/*  67 */
-	{16UL, b32+ 98, 0,       P_LE   | P_CONFIR, 0,       b32+145, 0,       aliases+ 24},	/*  68 */
-	{16UL, b32+ 98, 0,       P_LE   | P_ATTEST, b32+203, b32+ 64, b32+136, aliases+ 55},	/*  69 */
-	{16UL, b32+ 98, b32+ 99, P_BE   | P_ATTEST, 0,       b32+122, 0,       aliases+ 34},	/*  70 */
-	{16UL, b32+ 98, b32+203, P_BE   | P_THIRDP, 0,       b32+134, 0,       aliases+ 32},	/*  71 */
-	{16UL, b32+ 98, b32+203, P_LE   | P_ATTEST, 0,       b32+ 71, 0,       aliases+ 57},	/*  72 */
-	{16UL, b32+ 98, b32+203, P_LE   | P_THIRDP, b32+203, b32+141, b32+136, aliases+ 68},	/*  73 */
-	{14UL, b32+101, 0,       P_BE   | P_ACADEM, b32+202, b32+154, b32+ 16, aliases+ 18},	/*  74 */
-	{30UL, b32+102, b32+205, P_BE   | P_ACADEM, b32+205, b32+ 20, b32+167, aliases+ 87},	/*  75 */
-	{12UL, b32+103, 0,       P_BE   | P_ACADEM, 0,       b32+189, 0,       aliases+ 13},	/*  76 */
-	{12UL, b32+103, 0,       P_BELE | P_ACADEM, 0,       b32+172, 0,       aliases+ 15},	/*  77 */
-	{32UL, b32+104, 0,       P_BE   | P_ATTEST, 0,       b32+ 50, 0,       aliases+ 92},	/*  78 */
-	{21UL, b32+105, 0,       P_BE   | P_ACADEM, 0,       b32+ 93, 0,       aliases+ 75},	/*  79 */
-	{24UL, b32+106, 0,       P_BE   | P_ACADEM, 0,       b32+161, 0,       aliases+ 81},	/*  80 */
-	{24UL, b32+106, b32+143, P_BE   | P_ATTEST, 0,       b32+ 39, 0,       aliases+ 83},	/*  81 */
-	{ 7UL, b32+109, 0,       P_BE   | P_ACADEM, 0,       b32+151, 0,       aliases+136},	/*  82 */
-	{15UL, b32+110, 0,       P_BE   | P_ACADEM, 0,       b32+ 13, 0,       aliases+ 20},	/*  83 */
-	{16UL, b32+111, 0,       P_BE   | P_ATTEST, 0,       b32+165, 0,       aliases+ 64},	/*  84 */
-	{10UL, b32+112, 0,       P_BE   | P_ATTEST, 0,       b32+ 85, 0,       aliases+  4},	/*  85 */
-	{ 8UL, b32+118, 0,       P_BE   | P_ACADEM, 0,       b32+181, 0,       aliases+150},	/*  86 */
-	{ 8UL, b32+118, 0,       P_LE   | P_THIRDP, 0,       b32+ 41, 0,       aliases+159},	/*  87 */
-	{ 8UL, b32+118, b32+199, P_BE   | P_ACADEM, 0,       b32+171, 0,       aliases+141},	/*  88 */
-	{ 6UL, b32+119, b32+193, P_BE   | P_ATTEST, 0,       b32+ 55, 0,       aliases+121},	/*  89 */
-	{ 7UL, b32+121, b32+196, P_LE   | P_ACADEM, 0,       b32+127, 0,       aliases+135},	/*  90 */
-	{16UL, b32+124, 0,       P_BE   | P_CONFIR, 0,       b32+ 17, 0,       aliases+ 65},	/*  91 */
-	{ 8UL, b32+128, 0,       P_LE   | P_ATTEST, 0,       b32+ 42, 0,       aliases+140},	/*  92 */
-	{ 5UL, b32+129, 0,       P_LE   | P_ACADEM, 0,       b32+ 58, 0,       aliases+118},	/*  93 */
-	{32UL, b32+131, b32+207, P_LE   | P_CONFIR, b32+207, b32+107, b32+ 65, aliases+ 95},	/*  94 */
-	{17UL, b32+139, 0,       P_BE   | P_ACADEM, 0,       b32+ 44, 0,       aliases+ 74},	/*  95 */
-	{ 6UL, b32+146, 0,       P_BE   | P_ACADEM, b32+193, b32+ 72, b32+180, aliases+125},	/*  96 */
-	{16UL, b32+159, b32+203, P_BE   | P_ACADEM, 0,       b32+ 73, 0,       aliases+ 31},	/*  97 */
-	{15UL, b32+164, 0,       P_BE   | P_ATTEST, b32+  2, b32+ 69, b32+164, aliases+ 21},	/*  98 */
-	{12UL, b32+166, 0,       P_BE   | P_ACADEM, b32+201, b32+138, b32+ 24, aliases+ 14},	/*  99 */
-	{ 8UL, b32+169, 0,       P_BE   | P_ACADEM, 0,       b32+146, 0,       aliases+143},	/* 100 */
-	{13UL, b32+179, 0,       P_BE   | P_ATTEST, 0,       b32+ 45, 0,       aliases+ 16},	/* 101 */
-	{12UL, b32+186, b32+201, P_BE   | P_ACADEM, 0,       b32+168, 0,       aliases+ 12},	/* 102 */
-	{32UL, b32+188, b32+207, P_LE   | P_ATTEST, b32+207, b32+ 23, b32+113, aliases+ 93},	/* 103 */
-	{10UL, b32+190, b32+200, P_BE   | P_ACADEM, 0,       b32+112, 0,       aliases+  5},	/* 104 */
-	{ 0UL, 0,       0,       P_BE   | P_UNDFCL, 0,       0,       0,       NULL       },	/* terminating entry */
+    {64UL, b64,     b64a,    P_LE   | P_CONFIR, b64a,    b64b,    b64c,    aliases+130},    /*   0 */
+    {32UL, b32+  0, 0,       P_BE   | P_CONFIR, 0,       b32+147, 0,       aliases+107},    /*   1 */
+    {40UL, b40,     0,       P_BE   | P_ACADEM, b40a,    b40b,    b40c,    aliases+115},    /*   2 */
+    {24UL, b32+  3, b32+ 76, P_LE   | P_ATTEST, 0,       b32+152, 0,       aliases+ 77},    /*   3 */
+    {32UL, b32+  8, 0,       P_BE   | P_ATTEST, b32+207, b32+ 92, b32+157, aliases+ 98},    /*   4 */
+    {32UL, b32+  8, b32+207, P_BE   | P_ATTEST, 0,       b32+  7, 0,       aliases+104},    /*   5 */
+    {32UL, b32+  8, b32+207, P_BE   | P_ATTEST, b32+207, b32+194, b32+157, aliases+ 96},    /*   6 */
+    {32UL, b32+  8, b32+207, P_LE   | P_CONFIR, 0,       b32+ 56, 0,       aliases+103},    /*   7 */
+    {32UL, b32+  8, b32+207, P_LE   | P_ATTEST, b32+207, b32+160, b32+173, aliases+102},    /*   8 */
+    {16UL, b32+  9, 0,       P_BE   | P_ATTEST, 0,       b32+  5, 0,       aliases+ 36},    /*   9 */
+    {16UL, b32+  9, 0,       P_BE   | P_ATTEST, b32+  1, b32+  4, b32+  9, aliases+ 35},    /*  10 */
+    { 8UL, b32+ 10, 0,       P_BE   | P_ATTEST, 0,       b32+187, 0,       aliases+157},    /*  11 */
+    { 8UL, b32+ 10, 0,       P_BE   | P_ACADEM, b32+ 75, b32+125, b32+133, aliases+147},    /*  12 */
+    { 8UL, b32+ 10, b32+199, P_LE   | P_ACADEM, 0,       b32+163, 0,       aliases+155},    /*  13 */
+    {16UL, b32+ 11, b32+203, P_LE   | P_ATTEST, 0,       b32+123, 0,       aliases+ 58},    /*  14 */
+    {31UL, b32+ 12, b32+206, P_BE   | P_CONFIR, b32+206, b32+ 26, b32+120, aliases+ 88},    /*  15 */
+    { 6UL, b32+ 14, 0,       P_LE   | P_ACADEM, 0,       b32+ 25, 0,       aliases+124},    /*  16 */
+    {82UL, b82,     0,       P_LE   | P_ATTEST, 0,       b82a,    0,       aliases+160},    /*  17 */
+    {16UL, b32+ 18, 0,       P_BE   | P_ATTEST, 0,       b32+ 53, 0,       aliases+ 73},    /*  18 */
+    {16UL, b32+ 18, 0,       P_BE   | P_ACADEM, b32+203, b32+162, b32+ 29, aliases+ 42},    /*  19 */
+    {16UL, b32+ 18, 0,       P_LE   | P_ATTEST, 0,       b32+ 38, 0,       aliases+ 50},    /*  20 */
+    {16UL, b32+ 18, b32+ 29, P_BE   | P_ATTEST, 0,       b32+178, 0,       aliases+ 63},    /*  21 */
+    {16UL, b32+ 18, b32+108, P_LE   | P_ATTEST, 0,       b32+ 43, 0,       aliases+ 66},    /*  22 */
+    {16UL, b32+ 18, b32+137, P_LE   | P_THIRDP, 0,       b32+ 83, 0,       aliases+ 62},    /*  23 */
+    {16UL, b32+ 18, b32+156, P_LE   | P_ATTEST, 0,       b32+149, 0,       aliases+ 48},    /*  24 */
+    {16UL, b32+ 18, b32+203, P_BE   | P_ATTEST, 0,       b32+ 47, 0,       aliases+ 44},    /*  25 */
+    {16UL, b32+ 18, b32+203, P_BE   | P_ATTEST, b32+203, b32+170, b32+ 29, aliases+ 41},    /*  26 */
+    {16UL, b32+ 18, b32+203, P_LE   | P_ATTEST, 0,       b32+ 88, 0,       aliases+ 56},    /*  27 */
+    {16UL, b32+ 18, b32+203, P_LE   | P_ATTEST, b32+203, b32+114, b32+185, aliases+ 45},    /*  28 */
+    { 7UL, b32+ 19, 0,       P_BE   | P_ACADEM, 0,       b32+181, 0,       aliases+134},    /*  29 */
+    { 6UL, b32+ 27, b32+193, P_BE   | P_ACADEM, 0,       b32+183, 0,       aliases+122},    /*  30 */
+    { 8UL, b32+ 28, 0,       P_BE   | P_ACADEM, 0,       b32+ 57, 0,       aliases+145},    /*  31 */
+    { 8UL, b32+ 28, b32+195, P_BE   | P_ATTEST, 0,       b32+ 95, 0,       aliases+148},    /*  32 */
+    { 8UL, b32+ 28, b32+199, P_BE   | P_ATTEST, b32+199, b32+ 70, b32+155, aliases+156},    /*  33 */
+    { 8UL, b32+ 28, b32+199, P_LE   | P_ATTEST, 0,       b32+116, 0,       aliases+158},    /*  34 */
+    {16UL, b32+ 30, b32+203, P_BE   | P_ATTEST, b32+203, b32+130, b32+177, aliases+ 61},    /*  35 */
+    {32UL, b32+ 31, b32+207, P_LE   | P_ATTEST, b32+207, b32+176, b32+144, aliases+101},    /*  36 */
+    {14UL, b32+ 35, 0,       P_LE   | P_ATTEST, 0,       b32+ 36, 0,       aliases+ 17},    /*  37 */
+    { 5UL, b32+ 46, b32+192, P_LE   | P_THIRDP, b32+192, b32+158, b32+ 49, aliases+120},    /*  38 */
+    { 8UL, b32+ 48, 0,       P_BE   | P_ATTEST, 0,       b32+ 61, 0,       aliases+154},    /*  39 */
+    { 8UL, b32+ 48, b32+199, P_BE   | P_ATTEST, b32+199, b32+174, b32+ 63, aliases+139},    /*  40 */
+    { 4UL, b32+ 49, 0,       P_LE   | P_ACADEM, 0,       b32+ 89, 0,       aliases+112},    /*  41 */
+    { 4UL, b32+ 49, b32+184, P_BE   | P_ACADEM, b32+184, b32+135, b32+ 33, aliases+113},    /*  42 */
+    { 8UL, b32+ 51, 0,       P_LE   | P_ATTEST, 0,       b32+125, 0,       aliases+152},    /*  43 */
+    { 8UL, b32+ 51, b32+199, P_BE   | P_ATTEST, 0,       b32+191, 0,       aliases+153},    /*  44 */
+    {24UL, b32+ 54, b32+204, P_BE   | P_ACADEM, b32+204, b32+142, b32+ 21, aliases+ 80},    /*  45 */
+    { 8UL, b32+ 59, 0,       P_LE   | P_ATTEST, 0,       b32+ 22, 0,       aliases+142},    /*  46 */
+    {16UL, b32+ 60, 0,       P_BE   | P_CONFIR, b32+203, b32+153, b32+126, aliases+ 38},    /*  47 */
+    {16UL, b32+ 60, 0,       P_LE   | P_CONFIR, b32+203, b32+182, b32+ 86, aliases+ 37},    /*  48 */
+    {64UL, b64d,    0,       P_BE   | P_ACADEM, 0,       b64e,    0,       aliases+128},    /*  49 */
+    {64UL, b64d,    b64a,    P_BE   | P_CONFIR, b64a,    b64f,    b64g,    aliases+131},    /*  50 */
+    {64UL, b64d,    b64a,    P_LE   | P_ATTEST, b64a,    b64h,    b64i,    aliases+132},    /*  51 */
+    { 5UL, b32+ 66, b32+ 66, P_BE   | P_ATTEST, 0,       0,       0,       aliases+117},    /*  52 */
+    { 8UL, b32+ 67, 0,       P_BE   | P_ACADEM, b32+199, b32+115, b32+ 74, aliases+146},    /*  53 */
+    {16UL, b32+ 77, 0,       P_BE   | P_ATTEST, 0,       b32+ 78, 0,       aliases+ 59},    /*  54 */
+    {10UL, b32+ 79, 0,       P_BE   | P_ACADEM, b32+200, b32+ 68, b32+ 52, aliases+  6},    /*  55 */
+    {24UL, b32+ 80, b32+132, P_BE   | P_ATTEST, 0,       b32+ 32, 0,       aliases+ 79},    /*  56 */
+    {24UL, b32+ 80, b32+197, P_BE   | P_ATTEST, 0,       b32+ 94, 0,       aliases+ 78},    /*  57 */
+    { 3UL, b32+ 81, 0,       P_BE   | P_ACADEM, b32+175, b32+ 96, b32+ 62, aliases+ 85},    /*  58 */
+    { 3UL, b32+ 81, b32+175, P_LE   | P_ACADEM, 0,       b32+150, 0,       aliases+ 86},    /*  59 */
+    {11UL, b32+ 82, 0,       P_BE   | P_ACADEM, 0,       b32+ 15, 0,       aliases+ 10},    /*  60 */
+    { 6UL, b32+ 84, 0,       P_LE   | P_ATTEST, 0,       b32+117, 0,       aliases+123},    /*  61 */
+    {16UL, b32+ 87, 0,       P_BE   | P_THIRDP, 0,       b32+148, 0,       aliases+ 52},    /*  62 */
+    {11UL, b32+ 90, b32+  6, P_BE   | P_ATTEST, 0,       b32+140, 0,       aliases+  9},    /*  63 */
+    {16UL, b32+ 91, 0,       P_BE   | P_ATTEST, 0,       b32+ 37, 0,       aliases+ 60},    /*  64 */
+    {24UL, b32+ 97, 0,       P_BE   | P_ACADEM, 0,       b32+ 40, 0,       aliases+ 82},    /*  65 */
+    {24UL, b32+ 97, b32+204, P_BE   | P_ATTEST, b32+204, b32+ 34, b32+100, aliases+ 84},    /*  66 */
+    {16UL, b32+ 98, 0,       P_BE   | P_ATTEST, 0,       b32+198, 0,       aliases+ 67},    /*  67 */
+    {16UL, b32+ 98, 0,       P_LE   | P_CONFIR, 0,       b32+145, 0,       aliases+ 24},    /*  68 */
+    {16UL, b32+ 98, 0,       P_LE   | P_ATTEST, b32+203, b32+ 64, b32+136, aliases+ 55},    /*  69 */
+    {16UL, b32+ 98, b32+ 99, P_BE   | P_ATTEST, 0,       b32+122, 0,       aliases+ 34},    /*  70 */
+    {16UL, b32+ 98, b32+203, P_BE   | P_THIRDP, 0,       b32+134, 0,       aliases+ 32},    /*  71 */
+    {16UL, b32+ 98, b32+203, P_LE   | P_ATTEST, 0,       b32+ 71, 0,       aliases+ 57},    /*  72 */
+    {16UL, b32+ 98, b32+203, P_LE   | P_THIRDP, b32+203, b32+141, b32+136, aliases+ 68},    /*  73 */
+    {14UL, b32+101, 0,       P_BE   | P_ACADEM, b32+202, b32+154, b32+ 16, aliases+ 18},    /*  74 */
+    {30UL, b32+102, b32+205, P_BE   | P_ACADEM, b32+205, b32+ 20, b32+167, aliases+ 87},    /*  75 */
+    {12UL, b32+103, 0,       P_BE   | P_ACADEM, 0,       b32+189, 0,       aliases+ 13},    /*  76 */
+    {12UL, b32+103, 0,       P_BELE | P_ACADEM, 0,       b32+172, 0,       aliases+ 15},    /*  77 */
+    {32UL, b32+104, 0,       P_BE   | P_ATTEST, 0,       b32+ 50, 0,       aliases+ 92},    /*  78 */
+    {21UL, b32+105, 0,       P_BE   | P_ACADEM, 0,       b32+ 93, 0,       aliases+ 75},    /*  79 */
+    {24UL, b32+106, 0,       P_BE   | P_ACADEM, 0,       b32+161, 0,       aliases+ 81},    /*  80 */
+    {24UL, b32+106, b32+143, P_BE   | P_ATTEST, 0,       b32+ 39, 0,       aliases+ 83},    /*  81 */
+    { 7UL, b32+109, 0,       P_BE   | P_ACADEM, 0,       b32+151, 0,       aliases+136},    /*  82 */
+    {15UL, b32+110, 0,       P_BE   | P_ACADEM, 0,       b32+ 13, 0,       aliases+ 20},    /*  83 */
+    {16UL, b32+111, 0,       P_BE   | P_ATTEST, 0,       b32+165, 0,       aliases+ 64},    /*  84 */
+    {10UL, b32+112, 0,       P_BE   | P_ATTEST, 0,       b32+ 85, 0,       aliases+  4},    /*  85 */
+    { 8UL, b32+118, 0,       P_BE   | P_ACADEM, 0,       b32+181, 0,       aliases+150},    /*  86 */
+    { 8UL, b32+118, 0,       P_LE   | P_THIRDP, 0,       b32+ 41, 0,       aliases+159},    /*  87 */
+    { 8UL, b32+118, b32+199, P_BE   | P_ACADEM, 0,       b32+171, 0,       aliases+141},    /*  88 */
+    { 6UL, b32+119, b32+193, P_BE   | P_ATTEST, 0,       b32+ 55, 0,       aliases+121},    /*  89 */
+    { 7UL, b32+121, b32+196, P_LE   | P_ACADEM, 0,       b32+127, 0,       aliases+135},    /*  90 */
+    {16UL, b32+124, 0,       P_BE   | P_CONFIR, 0,       b32+ 17, 0,       aliases+ 65},    /*  91 */
+    { 8UL, b32+128, 0,       P_LE   | P_ATTEST, 0,       b32+ 42, 0,       aliases+140},    /*  92 */
+    { 5UL, b32+129, 0,       P_LE   | P_ACADEM, 0,       b32+ 58, 0,       aliases+118},    /*  93 */
+    {32UL, b32+131, b32+207, P_LE   | P_CONFIR, b32+207, b32+107, b32+ 65, aliases+ 95},    /*  94 */
+    {17UL, b32+139, 0,       P_BE   | P_ACADEM, 0,       b32+ 44, 0,       aliases+ 74},    /*  95 */
+    { 6UL, b32+146, 0,       P_BE   | P_ACADEM, b32+193, b32+ 72, b32+180, aliases+125},    /*  96 */
+    {16UL, b32+159, b32+203, P_BE   | P_ACADEM, 0,       b32+ 73, 0,       aliases+ 31},    /*  97 */
+    {15UL, b32+164, 0,       P_BE   | P_ATTEST, b32+  2, b32+ 69, b32+164, aliases+ 21},    /*  98 */
+    {12UL, b32+166, 0,       P_BE   | P_ACADEM, b32+201, b32+138, b32+ 24, aliases+ 14},    /*  99 */
+    { 8UL, b32+169, 0,       P_BE   | P_ACADEM, 0,       b32+146, 0,       aliases+143},    /* 100 */
+    {13UL, b32+179, 0,       P_BE   | P_ATTEST, 0,       b32+ 45, 0,       aliases+ 16},    /* 101 */
+    {12UL, b32+186, b32+201, P_BE   | P_ACADEM, 0,       b32+168, 0,       aliases+ 12},    /* 102 */
+    {32UL, b32+188, b32+207, P_LE   | P_ATTEST, b32+207, b32+ 23, b32+113, aliases+ 93},    /* 103 */
+    {10UL, b32+190, b32+200, P_BE   | P_ACADEM, 0,       b32+112, 0,       aliases+  5},    /* 104 */
+    { 0UL, 0,       0,       P_BE   | P_UNDFCL, 0,       0,       0,       NULL       },    /* terminating entry */
 };
 #    define NPRESETS 105
 
 /* List of names with pointers to models, pre-sorted for use with bsearch() */
 static const struct malias aliases[] = {
-	{"ARC",					models+ 68},	/*   0 */
-	{"B-CRC-32",			models+  6},	/*   1 */
-	{"CKSUM",				models+  4},	/*   2 */
-	{"CRC-10",				models+ 85},	/*   3 */
-	{"CRC-10/ATM",			models+ 85},	/*   4 */
-	{"CRC-10/CDMA2000",		models+104},	/*   5 */
-	{"CRC-10/GSM",			models+ 55},	/*   6 */
-	{"CRC-10/I-610",		models+ 85},	/*   7 */
-	{"CRC-11",				models+ 63},	/*   8 */
-	{"CRC-11/FLEXRAY",		models+ 63},	/*   9 */
-	{"CRC-11/UMTS",			models+ 60},	/*  10 */
-	{"CRC-12/3GPP",			models+ 77},	/*  11 */
-	{"CRC-12/CDMA2000",		models+102},	/*  12 */
-	{"CRC-12/DECT",			models+ 76},	/*  13 */
-	{"CRC-12/GSM",			models+ 99},	/*  14 */
-	{"CRC-12/UMTS",			models+ 77},	/*  15 */
-	{"CRC-13/BBC",			models+101},	/*  16 */
-	{"CRC-14/DARC",			models+ 37},	/*  17 */
-	{"CRC-14/GSM",			models+ 74},	/*  18 */
-	{"CRC-15",				models+ 83},	/*  19 */
-	{"CRC-15/CAN",			models+ 83},	/*  20 */
-	{"CRC-15/MPT1327",		models+ 98},	/*  21 */
-	{"CRC-16",				models+ 68},	/*  22 */
-	{"CRC-16/ACORN",		models+ 18},	/*  23 */
-	{"CRC-16/ARC",			models+ 68},	/*  24 */
-	{"CRC-16/AUG-CCITT",	models+ 21},	/*  25 */
-	{"CRC-16/AUTOSAR",		models+ 25},	/*  26 */
-	{"CRC-16/BUYPASS",		models+ 67},	/*  27 */
-	{"CRC-16/CCITT",		models+ 20},	/*  28 */
-	{"CRC-16/CCITT-FALSE",	models+ 25},	/*  29 */
-	{"CRC-16/CCITT-TRUE",	models+ 20},	/*  30 */
-	{"CRC-16/CDMA2000",		models+ 97},	/*  31 */
-	{"CRC-16/CMS",			models+ 71},	/*  32 */
-	{"CRC-16/DARC",			models+ 26},	/*  33 */
-	{"CRC-16/DDS-110",		models+ 70},	/*  34 */
-	{"CRC-16/DECT-R",		models+ 10},	/*  35 */
-	{"CRC-16/DECT-X",		models+  9},	/*  36 */
-	{"CRC-16/DNP",			models+ 48},	/*  37 */
-	{"CRC-16/EN-13757",		models+ 47},	/*  38 */
-	{"CRC-16/EPC",			models+ 26},	/*  39 */
-	{"CRC-16/EPC-C1G2",		models+ 26},	/*  40 */
-	{"CRC-16/GENIBUS",		models+ 26},	/*  41 */
-	{"CRC-16/GSM",			models+ 19},	/*  42 */
-	{"CRC-16/I-CODE",		models+ 26},	/*  43 */
-	{"CRC-16/IBM-3740",		models+ 25},	/*  44 */
-	{"CRC-16/IBM-SDLC",		models+ 28},	/*  45 */
-	{"CRC-16/IEC-61158-2",	models+ 35},	/*  46 */
-	{"CRC-16/ISO-HDLC",		models+ 28},	/*  47 */
-	{"CRC-16/ISO-IEC-14443-3-A",	models+ 24},	/*  48 */
-	{"CRC-16/ISO-IEC-14443-3-B",	models+ 28},	/*  49 */
-	{"CRC-16/KERMIT",		models+ 20},	/*  50 */
-	{"CRC-16/LHA",			models+ 68},	/*  51 */
-	{"CRC-16/LJ1200",		models+ 62},	/*  52 */
-	{"CRC-16/LTE",			models+ 18},	/*  53 */
-	{"CRC-16/MAXIM",		models+ 69},	/*  54 */
-	{"CRC-16/MAXIM-DOW",	models+ 69},	/*  55 */
-	{"CRC-16/MCRF4XX",		models+ 27},	/*  56 */
-	{"CRC-16/MODBUS",		models+ 72},	/*  57 */
-	{"CRC-16/NRSC-5",		models+ 14},	/*  58 */
-	{"CRC-16/OPENSAFETY-A",	models+ 54},	/*  59 */
-	{"CRC-16/OPENSAFETY-B",	models+ 64},	/*  60 */
-	{"CRC-16/PROFIBUS",		models+ 35},	/*  61 */
-	{"CRC-16/RIELLO",		models+ 23},	/*  62 */
-	{"CRC-16/SPI-FUJITSU",	models+ 21},	/*  63 */
-	{"CRC-16/T10-DIF",		models+ 84},	/*  64 */
-	{"CRC-16/TELEDISK",		models+ 91},	/*  65 */
-	{"CRC-16/TMS37157",		models+ 22},	/*  66 */
-	{"CRC-16/UMTS",			models+ 67},	/*  67 */
-	{"CRC-16/USB",			models+ 73},	/*  68 */
-	{"CRC-16/V-41-LSB",		models+ 20},	/*  69 */
-	{"CRC-16/V-41-MSB",		models+ 18},	/*  70 */
-	{"CRC-16/VERIFONE",		models+ 67},	/*  71 */
-	{"CRC-16/X-25",			models+ 28},	/*  72 */
-	{"CRC-16/XMODEM",		models+ 18},	/*  73 */
-	{"CRC-17/CAN-FD",		models+ 95},	/*  74 */
-	{"CRC-21/CAN-FD",		models+ 79},	/*  75 */
-	{"CRC-24",				models+ 81},	/*  76 */
-	{"CRC-24/BLE",			models+  3},	/*  77 */
-	{"CRC-24/FLEXRAY-A",	models+ 57},	/*  78 */
-	{"CRC-24/FLEXRAY-B",	models+ 56},	/*  79 */
-	{"CRC-24/INTERLAKEN",	models+ 45},	/*  80 */
-	{"CRC-24/LTE-A",		models+ 80},	/*  81 */
-	{"CRC-24/LTE-B",		models+ 65},	/*  82 */
-	{"CRC-24/OPENPGP",		models+ 81},	/*  83 */
-	{"CRC-24/OS-9",			models+ 66},	/*  84 */
-	{"CRC-3/GSM",			models+ 58},	/*  85 */
-	{"CRC-3/ROHC",			models+ 59},	/*  86 */
-	{"CRC-30/CDMA",			models+ 75},	/*  87 */
-	{"CRC-31/PHILIPS",		models+ 15},	/*  88 */
-	{"CRC-32",				models+  8},	/*  89 */
-	{"CRC-32/AAL5",			models+  6},	/*  90 */
-	{"CRC-32/ADCCP",		models+  8},	/*  91 */
-	{"CRC-32/AIXM",			models+ 78},	/*  92 */
-	{"CRC-32/AUTOSAR",		models+103},	/*  93 */
-	{"CRC-32/BASE91-C",		models+ 36},	/*  94 */
-	{"CRC-32/BASE91-D",		models+ 94},	/*  95 */
-	{"CRC-32/BZIP2",		models+  6},	/*  96 */
-	{"CRC-32/CASTAGNOLI",	models+ 36},	/*  97 */
-	{"CRC-32/CKSUM",		models+  4},	/*  98 */
-	{"CRC-32/DECT-B",		models+  6},	/*  99 */
-	{"CRC-32/INTERLAKEN",	models+ 36},	/* 100 */
-	{"CRC-32/ISCSI",		models+ 36},	/* 101 */
-	{"CRC-32/ISO-HDLC",		models+  8},	/* 102 */
-	{"CRC-32/JAMCRC",		models+  7},	/* 103 */
-	{"CRC-32/MPEG-2",		models+  5},	/* 104 */
-	{"CRC-32/POSIX",		models+  4},	/* 105 */
-	{"CRC-32/V-42",			models+  8},	/* 106 */
-	{"CRC-32/XFER",			models+  1},	/* 107 */
-	{"CRC-32/XZ",			models+  8},	/* 108 */
-	{"CRC-32C",				models+ 36},	/* 109 */
-	{"CRC-32D",				models+ 94},	/* 110 */
-	{"CRC-32Q",				models+ 78},	/* 111 */
-	{"CRC-4/G-704",			models+ 41},	/* 112 */
-	{"CRC-4/INTERLAKEN",	models+ 42},	/* 113 */
-	{"CRC-4/ITU",			models+ 41},	/* 114 */
-	{"CRC-40/GSM",			models+  2},	/* 115 */
-	{"CRC-5/EPC",			models+ 52},	/* 116 */
-	{"CRC-5/EPC-C1G2",		models+ 52},	/* 117 */
-	{"CRC-5/G-704",			models+ 93},	/* 118 */
-	{"CRC-5/ITU",			models+ 93},	/* 119 */
-	{"CRC-5/USB",			models+ 38},	/* 120 */
-	{"CRC-6/CDMA2000-A",	models+ 89},	/* 121 */
-	{"CRC-6/CDMA2000-B",	models+ 30},	/* 122 */
-	{"CRC-6/DARC",			models+ 61},	/* 123 */
-	{"CRC-6/G-704",			models+ 16},	/* 124 */
-	{"CRC-6/GSM",			models+ 96},	/* 125 */
-	{"CRC-6/ITU",			models+ 16},	/* 126 */
-	{"CRC-64",				models+ 49},	/* 127 */
-	{"CRC-64/ECMA-182",		models+ 49},	/* 128 */
-	{"CRC-64/GO-ECMA",		models+ 51},	/* 129 */
-	{"CRC-64/GO-ISO",		models+  0},	/* 130 */
-	{"CRC-64/WE",			models+ 50},	/* 131 */
-	{"CRC-64/XZ",			models+ 51},	/* 132 */
-	{"CRC-7",				models+ 29},	/* 133 */
-	{"CRC-7/MMC",			models+ 29},	/* 134 */
-	{"CRC-7/ROHC",			models+ 90},	/* 135 */
-	{"CRC-7/UMTS",			models+ 82},	/* 136 */
-	{"CRC-8",				models+ 11},	/* 137 */
-	{"CRC-8/AES",			models+ 34},	/* 138 */
-	{"CRC-8/AUTOSAR",		models+ 40},	/* 139 */
-	{"CRC-8/BLUETOOTH",		models+ 92},	/* 140 */
-	{"CRC-8/CDMA2000",		models+ 88},	/* 141 */
-	{"CRC-8/DARC",			models+ 46},	/* 142 */
-	{"CRC-8/DVB-S2",		models+100},	/* 143 */
-	{"CRC-8/EBU",			models+ 34},	/* 144 */
-	{"CRC-8/GSM-A",			models+ 31},	/* 145 */
-	{"CRC-8/GSM-B",			models+ 53},	/* 146 */
-	{"CRC-8/I-432-1",		models+ 12},	/* 147 */
-	{"CRC-8/I-CODE",		models+ 32},	/* 148 */
-	{"CRC-8/ITU",			models+ 12},	/* 149 */
-	{"CRC-8/LTE",			models+ 86},	/* 150 */
-	{"CRC-8/MAXIM",			models+ 43},	/* 151 */
-	{"CRC-8/MAXIM-DOW",		models+ 43},	/* 152 */
-	{"CRC-8/NRSC-5",		models+ 44},	/* 153 */
-	{"CRC-8/OPENSAFETY",	models+ 39},	/* 154 */
-	{"CRC-8/ROHC",			models+ 13},	/* 155 */
-	{"CRC-8/SAE-J1850",		models+ 33},	/* 156 */
-	{"CRC-8/SMBUS",			models+ 11},	/* 157 */
-	{"CRC-8/TECH-3250",		models+ 34},	/* 158 */
-	{"CRC-8/WCDMA",			models+ 87},	/* 159 */
-	{"CRC-82/DARC",			models+ 17},	/* 160 */
-	{"CRC-A",				models+ 24},	/* 161 */
-	{"CRC-B",				models+ 28},	/* 162 */
-	{"CRC-CCITT",			models+ 20},	/* 163 */
-	{"CRC-IBM",				models+ 68},	/* 164 */
-	{"DOW-CRC",				models+ 43},	/* 165 */
-	{"JAMCRC",				models+  7},	/* 166 */
-	{"KERMIT",				models+ 20},	/* 167 */
-	{"MODBUS",				models+ 72},	/* 168 */
-	{"PKZIP",				models+  8},	/* 169 */
-	{"R-CRC-16",			models+ 10},	/* 170 */
-	{"X-25",				models+ 28},	/* 171 */
-	{"X-CRC-12",			models+ 76},	/* 172 */
-	{"X-CRC-16",			models+  9},	/* 173 */
-	{"XFER",				models+  1},	/* 174 */
-	{"XMODEM",				models+ 18},	/* 175 */
-	{"ZMODEM",				models+ 18},	/* 176 */
-	{NULL,					NULL     },	/* terminating entry */
+    {"ARC",                 models+ 68},    /*   0 */
+    {"B-CRC-32",            models+  6},    /*   1 */
+    {"CKSUM",               models+  4},    /*   2 */
+    {"CRC-10",              models+ 85},    /*   3 */
+    {"CRC-10/ATM",          models+ 85},    /*   4 */
+    {"CRC-10/CDMA2000",     models+104},    /*   5 */
+    {"CRC-10/GSM",          models+ 55},    /*   6 */
+    {"CRC-10/I-610",        models+ 85},    /*   7 */
+    {"CRC-11",              models+ 63},    /*   8 */
+    {"CRC-11/FLEXRAY",      models+ 63},    /*   9 */
+    {"CRC-11/UMTS",         models+ 60},    /*  10 */
+    {"CRC-12/3GPP",         models+ 77},    /*  11 */
+    {"CRC-12/CDMA2000",     models+102},    /*  12 */
+    {"CRC-12/DECT",         models+ 76},    /*  13 */
+    {"CRC-12/GSM",          models+ 99},    /*  14 */
+    {"CRC-12/UMTS",         models+ 77},    /*  15 */
+    {"CRC-13/BBC",          models+101},    /*  16 */
+    {"CRC-14/DARC",         models+ 37},    /*  17 */
+    {"CRC-14/GSM",          models+ 74},    /*  18 */
+    {"CRC-15",              models+ 83},    /*  19 */
+    {"CRC-15/CAN",          models+ 83},    /*  20 */
+    {"CRC-15/MPT1327",      models+ 98},    /*  21 */
+    {"CRC-16",              models+ 68},    /*  22 */
+    {"CRC-16/ACORN",        models+ 18},    /*  23 */
+    {"CRC-16/ARC",          models+ 68},    /*  24 */
+    {"CRC-16/AUG-CCITT",    models+ 21},    /*  25 */
+    {"CRC-16/AUTOSAR",      models+ 25},    /*  26 */
+    {"CRC-16/BUYPASS",      models+ 67},    /*  27 */
+    {"CRC-16/CCITT",        models+ 20},    /*  28 */
+    {"CRC-16/CCITT-FALSE",  models+ 25},    /*  29 */
+    {"CRC-16/CCITT-TRUE",   models+ 20},    /*  30 */
+    {"CRC-16/CDMA2000",     models+ 97},    /*  31 */
+    {"CRC-16/CMS",          models+ 71},    /*  32 */
+    {"CRC-16/DARC",         models+ 26},    /*  33 */
+    {"CRC-16/DDS-110",      models+ 70},    /*  34 */
+    {"CRC-16/DECT-R",       models+ 10},    /*  35 */
+    {"CRC-16/DECT-X",       models+  9},    /*  36 */
+    {"CRC-16/DNP",          models+ 48},    /*  37 */
+    {"CRC-16/EN-13757",     models+ 47},    /*  38 */
+    {"CRC-16/EPC",          models+ 26},    /*  39 */
+    {"CRC-16/EPC-C1G2",     models+ 26},    /*  40 */
+    {"CRC-16/GENIBUS",      models+ 26},    /*  41 */
+    {"CRC-16/GSM",          models+ 19},    /*  42 */
+    {"CRC-16/I-CODE",       models+ 26},    /*  43 */
+    {"CRC-16/IBM-3740",     models+ 25},    /*  44 */
+    {"CRC-16/IBM-SDLC",     models+ 28},    /*  45 */
+    {"CRC-16/IEC-61158-2",  models+ 35},    /*  46 */
+    {"CRC-16/ISO-HDLC",     models+ 28},    /*  47 */
+    {"CRC-16/ISO-IEC-14443-3-A",    models+ 24},    /*  48 */
+    {"CRC-16/ISO-IEC-14443-3-B",    models+ 28},    /*  49 */
+    {"CRC-16/KERMIT",       models+ 20},    /*  50 */
+    {"CRC-16/LHA",          models+ 68},    /*  51 */
+    {"CRC-16/LJ1200",       models+ 62},    /*  52 */
+    {"CRC-16/LTE",          models+ 18},    /*  53 */
+    {"CRC-16/MAXIM",        models+ 69},    /*  54 */
+    {"CRC-16/MAXIM-DOW",    models+ 69},    /*  55 */
+    {"CRC-16/MCRF4XX",      models+ 27},    /*  56 */
+    {"CRC-16/MODBUS",       models+ 72},    /*  57 */
+    {"CRC-16/NRSC-5",       models+ 14},    /*  58 */
+    {"CRC-16/OPENSAFETY-A", models+ 54},    /*  59 */
+    {"CRC-16/OPENSAFETY-B", models+ 64},    /*  60 */
+    {"CRC-16/PROFIBUS",     models+ 35},    /*  61 */
+    {"CRC-16/RIELLO",       models+ 23},    /*  62 */
+    {"CRC-16/SPI-FUJITSU",  models+ 21},    /*  63 */
+    {"CRC-16/T10-DIF",      models+ 84},    /*  64 */
+    {"CRC-16/TELEDISK",     models+ 91},    /*  65 */
+    {"CRC-16/TMS37157",     models+ 22},    /*  66 */
+    {"CRC-16/UMTS",         models+ 67},    /*  67 */
+    {"CRC-16/USB",          models+ 73},    /*  68 */
+    {"CRC-16/V-41-LSB",     models+ 20},    /*  69 */
+    {"CRC-16/V-41-MSB",     models+ 18},    /*  70 */
+    {"CRC-16/VERIFONE",     models+ 67},    /*  71 */
+    {"CRC-16/X-25",         models+ 28},    /*  72 */
+    {"CRC-16/XMODEM",       models+ 18},    /*  73 */
+    {"CRC-17/CAN-FD",       models+ 95},    /*  74 */
+    {"CRC-21/CAN-FD",       models+ 79},    /*  75 */
+    {"CRC-24",              models+ 81},    /*  76 */
+    {"CRC-24/BLE",          models+  3},    /*  77 */
+    {"CRC-24/FLEXRAY-A",    models+ 57},    /*  78 */
+    {"CRC-24/FLEXRAY-B",    models+ 56},    /*  79 */
+    {"CRC-24/INTERLAKEN",   models+ 45},    /*  80 */
+    {"CRC-24/LTE-A",        models+ 80},    /*  81 */
+    {"CRC-24/LTE-B",        models+ 65},    /*  82 */
+    {"CRC-24/OPENPGP",      models+ 81},    /*  83 */
+    {"CRC-24/OS-9",         models+ 66},    /*  84 */
+    {"CRC-3/GSM",           models+ 58},    /*  85 */
+    {"CRC-3/ROHC",          models+ 59},    /*  86 */
+    {"CRC-30/CDMA",         models+ 75},    /*  87 */
+    {"CRC-31/PHILIPS",      models+ 15},    /*  88 */
+    {"CRC-32",              models+  8},    /*  89 */
+    {"CRC-32/AAL5",         models+  6},    /*  90 */
+    {"CRC-32/ADCCP",        models+  8},    /*  91 */
+    {"CRC-32/AIXM",         models+ 78},    /*  92 */
+    {"CRC-32/AUTOSAR",      models+103},    /*  93 */
+    {"CRC-32/BASE91-C",     models+ 36},    /*  94 */
+    {"CRC-32/BASE91-D",     models+ 94},    /*  95 */
+    {"CRC-32/BZIP2",        models+  6},    /*  96 */
+    {"CRC-32/CASTAGNOLI",   models+ 36},    /*  97 */
+    {"CRC-32/CKSUM",        models+  4},    /*  98 */
+    {"CRC-32/DECT-B",       models+  6},    /*  99 */
+    {"CRC-32/INTERLAKEN",   models+ 36},    /* 100 */
+    {"CRC-32/ISCSI",        models+ 36},    /* 101 */
+    {"CRC-32/ISO-HDLC",     models+  8},    /* 102 */
+    {"CRC-32/JAMCRC",       models+  7},    /* 103 */
+    {"CRC-32/MPEG-2",       models+  5},    /* 104 */
+    {"CRC-32/POSIX",        models+  4},    /* 105 */
+    {"CRC-32/V-42",         models+  8},    /* 106 */
+    {"CRC-32/XFER",         models+  1},    /* 107 */
+    {"CRC-32/XZ",           models+  8},    /* 108 */
+    {"CRC-32C",             models+ 36},    /* 109 */
+    {"CRC-32D",             models+ 94},    /* 110 */
+    {"CRC-32Q",             models+ 78},    /* 111 */
+    {"CRC-4/G-704",         models+ 41},    /* 112 */
+    {"CRC-4/INTERLAKEN",    models+ 42},    /* 113 */
+    {"CRC-4/ITU",           models+ 41},    /* 114 */
+    {"CRC-40/GSM",          models+  2},    /* 115 */
+    {"CRC-5/EPC",           models+ 52},    /* 116 */
+    {"CRC-5/EPC-C1G2",      models+ 52},    /* 117 */
+    {"CRC-5/G-704",         models+ 93},    /* 118 */
+    {"CRC-5/ITU",           models+ 93},    /* 119 */
+    {"CRC-5/USB",           models+ 38},    /* 120 */
+    {"CRC-6/CDMA2000-A",    models+ 89},    /* 121 */
+    {"CRC-6/CDMA2000-B",    models+ 30},    /* 122 */
+    {"CRC-6/DARC",          models+ 61},    /* 123 */
+    {"CRC-6/G-704",         models+ 16},    /* 124 */
+    {"CRC-6/GSM",           models+ 96},    /* 125 */
+    {"CRC-6/ITU",           models+ 16},    /* 126 */
+    {"CRC-64",              models+ 49},    /* 127 */
+    {"CRC-64/ECMA-182",     models+ 49},    /* 128 */
+    {"CRC-64/GO-ECMA",      models+ 51},    /* 129 */
+    {"CRC-64/GO-ISO",       models+  0},    /* 130 */
+    {"CRC-64/WE",           models+ 50},    /* 131 */
+    {"CRC-64/XZ",           models+ 51},    /* 132 */
+    {"CRC-7",               models+ 29},    /* 133 */
+    {"CRC-7/MMC",           models+ 29},    /* 134 */
+    {"CRC-7/ROHC",          models+ 90},    /* 135 */
+    {"CRC-7/UMTS",          models+ 82},    /* 136 */
+    {"CRC-8",               models+ 11},    /* 137 */
+    {"CRC-8/AES",           models+ 34},    /* 138 */
+    {"CRC-8/AUTOSAR",       models+ 40},    /* 139 */
+    {"CRC-8/BLUETOOTH",     models+ 92},    /* 140 */
+    {"CRC-8/CDMA2000",      models+ 88},    /* 141 */
+    {"CRC-8/DARC",          models+ 46},    /* 142 */
+    {"CRC-8/DVB-S2",        models+100},    /* 143 */
+    {"CRC-8/EBU",           models+ 34},    /* 144 */
+    {"CRC-8/GSM-A",         models+ 31},    /* 145 */
+    {"CRC-8/GSM-B",         models+ 53},    /* 146 */
+    {"CRC-8/I-432-1",       models+ 12},    /* 147 */
+    {"CRC-8/I-CODE",        models+ 32},    /* 148 */
+    {"CRC-8/ITU",           models+ 12},    /* 149 */
+    {"CRC-8/LTE",           models+ 86},    /* 150 */
+    {"CRC-8/MAXIM",         models+ 43},    /* 151 */
+    {"CRC-8/MAXIM-DOW",     models+ 43},    /* 152 */
+    {"CRC-8/NRSC-5",        models+ 44},    /* 153 */
+    {"CRC-8/OPENSAFETY",    models+ 39},    /* 154 */
+    {"CRC-8/ROHC",          models+ 13},    /* 155 */
+    {"CRC-8/SAE-J1850",     models+ 33},    /* 156 */
+    {"CRC-8/SMBUS",         models+ 11},    /* 157 */
+    {"CRC-8/TECH-3250",     models+ 34},    /* 158 */
+    {"CRC-8/WCDMA",         models+ 87},    /* 159 */
+    {"CRC-82/DARC",         models+ 17},    /* 160 */
+    {"CRC-A",               models+ 24},    /* 161 */
+    {"CRC-B",               models+ 28},    /* 162 */
+    {"CRC-CCITT",           models+ 20},    /* 163 */
+    {"CRC-IBM",             models+ 68},    /* 164 */
+    {"DOW-CRC",             models+ 43},    /* 165 */
+    {"JAMCRC",              models+  7},    /* 166 */
+    {"KERMIT",              models+ 20},    /* 167 */
+    {"MODBUS",              models+ 72},    /* 168 */
+    {"PKZIP",               models+  8},    /* 169 */
+    {"R-CRC-16",            models+ 10},    /* 170 */
+    {"X-25",                models+ 28},    /* 171 */
+    {"X-CRC-12",            models+ 76},    /* 172 */
+    {"X-CRC-16",            models+  9},    /* 173 */
+    {"XFER",                models+  1},    /* 174 */
+    {"XMODEM",              models+ 18},    /* 175 */
+    {"ZMODEM",              models+ 18},    /* 176 */
+    {NULL,                  NULL      },    /* terminating entry */
 };
 #    define NALIASES 177
 
@@ -772,12 +772,12 @@ static const struct malias aliases[] = {
 #else /* PRESETS */
 
 static const struct mpreset models[] = {
-	{ 0UL, 0,       0,       P_BE   | P_UNDFCL, 0,       0,       0,       NULL       },	/* terminating entry */
+    { 0UL, 0,       0,       P_BE   | P_UNDFCL, 0,       0,       0,       NULL       },    /* terminating entry */
 };
 #  define NPRESETS 0
 
 static const struct malias aliases[] = {
-	{NULL, NULL },	/* terminating entry */
+    {NULL, NULL },    /* terminating entry */
 };
 #  define NALIASES 0
 
@@ -788,13 +788,13 @@ static void munpack(model_t *, const struct mpreset *);
 /* copy a parameter of a preset to a poly */
 
 #define PUNPACK(poly, preset, field) {\
-	unsigned long iter, idx; \
-	palloc((poly), (preset)->width); \
-	if((preset)->field) \
-		for(iter=0UL, idx=0UL; \
-			iter < (poly)->length; \
-			iter += BMP_BIT, ++idx) \
-		(poly)->bitmap[idx] = (preset)->field[idx]; \
+    unsigned long iter, idx; \
+    palloc((poly), (preset)->width); \
+    if((preset)->field) \
+        for(iter=0UL, idx=0UL; \
+            iter < (poly)->length; \
+            iter += BMP_BIT, ++idx) \
+        (poly)->bitmap[idx] = (preset)->field[idx]; \
 }
 
 /* copy a parameter of a preset into a model */
@@ -803,140 +803,140 @@ static void munpack(model_t *, const struct mpreset *);
 /* Definitions */
 
 int mbynam(model_t *dest, const char *key) {
-	/* Sets parameters in dest according to the model named by key.
-	 */
-	size_t left = 0, right = NALIASES, middle = 0;
-	int cmp = 1;
-	char *ukey, *uptr;
+    /* Sets parameters in dest according to the model named by key.
+     */
+    size_t left = 0, right = NALIASES, middle = 0;
+    int cmp = 1;
+    char *ukey, *uptr;
 
-	if (!aliases->name)
-		return(-1);
+    if (!aliases->name)
+        return(-1);
 
-	ukey = calloc((size_t) 1 + strlen(key) + 1, sizeof(char));
-	if (!ukey) {
-		uerror("[!] cannot allocate memory for comparison string");
-		return(0);
-	}
-	uptr = ukey;
-	do
-		*uptr++ = toupper(*key);
-	while (*key++);
+    ukey = calloc((size_t) 1 + strlen(key) + 1, sizeof(char));
+    if (!ukey) {
+        uerror("[!] cannot allocate memory for comparison string");
+        return(0);
+    }
+    uptr = ukey;
+    do
+        *uptr++ = toupper(*key);
+    while (*key++);
 
-	while (left < right && cmp) {
-		middle = (left >> 1) + (right >> 1);
-		cmp = strcmp(ukey, aliases[middle].name);
-		if (cmp < 0) right = middle;
-		else if (cmp > 0) left = middle + 1;
-	}
-	free(ukey);
+    while (left < right && cmp) {
+        middle = (left >> 1) + (right >> 1);
+        cmp = strcmp(ukey, aliases[middle].name);
+        if (cmp < 0) right = middle;
+        else if (cmp > 0) left = middle + 1;
+    }
+    free(ukey);
 
-	if (cmp)
-		return(0);
-	munpack(dest, aliases[middle].model);
-	return(1);
+    if (cmp)
+        return(0);
+    munpack(dest, aliases[middle].model);
+    return(1);
 }
 
 void mbynum(model_t *dest, int num) {
-	/* Sets parameters in dest according to the model indexed by num. */
-	if (num > NPRESETS)
-		num = NPRESETS;
-	munpack(dest, num+models);
+    /* Sets parameters in dest according to the model indexed by num. */
+    if (num > NPRESETS)
+        num = NPRESETS;
+    munpack(dest, num+models);
 }
 
 int mcount(void) {
-	/* Returns the number of preset models. */
-	return (NPRESETS);
+    /* Returns the number of preset models. */
+    return (NPRESETS);
 }
 
 char * mnames(void) {
-	/* Returns a malloc()-ed string of the names of all preset
-	 * models, separated by newlines and terminated by NULL.
-	 * Aliases are not listed.
-	 */
-	size_t size = 0;
-	char *string, *sptr;
-	const struct malias *aptr = aliases;
+    /* Returns a malloc()-ed string of the names of all preset
+     * models, separated by newlines and terminated by NULL.
+     * Aliases are not listed.
+     */
+    size_t size = 0;
+    char *string, *sptr;
+    const struct malias *aptr = aliases;
 
-	while (aptr->name) {
-		if (aptr == aptr->model->alias)
-			size += strlen(aptr->name) + 1;
-		++aptr;
-	}
-	if (!size) return(NULL);
+    while (aptr->name) {
+        if (aptr == aptr->model->alias)
+            size += strlen(aptr->name) + 1;
+        ++aptr;
+    }
+    if (!size) return(NULL);
 
-	string = calloc(size, sizeof(char));
-	if (string) {
-		aptr = aliases;
-		sptr = string;
-		while (aptr->name) {
-			if (aptr == aptr->model->alias) {
-				strcpy(sptr, aptr->name);
-				sptr += strlen(aptr->name);
-				*sptr++ = '\n';
-			}
-			++aptr;
-		}
-		*--sptr = '\0';
-	} else
-		uerror("cannot allocate memory for list of models");
+    string = calloc(size, sizeof(char));
+    if (string) {
+        aptr = aliases;
+        sptr = string;
+        while (aptr->name) {
+            if (aptr == aptr->model->alias) {
+                strcpy(sptr, aptr->name);
+                sptr += strlen(aptr->name);
+                *sptr++ = '\n';
+            }
+            ++aptr;
+        }
+        *--sptr = '\0';
+    } else
+        uerror("cannot allocate memory for list of models");
 
-	return(string);
+    return(string);
 }
 
 void mmatch(model_t *model, int flags) {
-	/* searches models[] for a model matching the argument, and links a name if found
-	 * if flags & M_OVERWR, copies the found model onto the argument. */
-	size_t left = 0, right = NPRESETS, middle = 0;
-	poly_t poly = PZERO;
-	int cmp = 1;
-	if (!model) return;
+    /* searches models[] for a model matching the argument, and links a name if found
+     * if flags & M_OVERWR, copies the found model onto the argument. */
+    size_t left = 0, right = NPRESETS, middle = 0;
+    poly_t poly = PZERO;
+    int cmp = 1;
+    if (!model) return;
 
-	while (left < right && cmp) {
-		middle = (left >> 1) + (right >> 1);
-		PUNPACK(&poly, models+middle, bspoly);
-		cmp = psncmp(&model->spoly, &poly);
-		if (!cmp) {
-			PUNPACK(&poly, models+middle, binit);
-			cmp = psncmp(&model->init, &poly);
-		}
-		if (!cmp) {
-			if ((model->flags & P_REFIN) && (~models[middle].flags & P_REFIN))
-				cmp = 1;
-			else if ((~model->flags & P_REFIN) && (models[middle].flags & P_REFIN))
-				cmp = -1;
-			else if ((model->flags & P_REFOUT) && (~models[middle].flags & P_REFOUT))
-				cmp = 1;
-			else if ((~model->flags & P_REFOUT) && (models[middle].flags & P_REFOUT))
-				cmp = -1;
-			else {
-				PUNPACK(&poly, models+middle, bxorout);
-				cmp = psncmp(&model->xorout, &poly);
-			}
-		}
-		if (cmp < 0) right = middle;
-		else if (cmp > 0) left = middle + 1;
-	}
-	pfree(&poly);
+    while (left < right && cmp) {
+        middle = (left >> 1) + (right >> 1);
+        PUNPACK(&poly, models+middle, bspoly);
+        cmp = psncmp(&model->spoly, &poly);
+        if (!cmp) {
+            PUNPACK(&poly, models+middle, binit);
+            cmp = psncmp(&model->init, &poly);
+        }
+        if (!cmp) {
+            if ((model->flags & P_REFIN) && (~models[middle].flags & P_REFIN))
+                cmp = 1;
+            else if ((~model->flags & P_REFIN) && (models[middle].flags & P_REFIN))
+                cmp = -1;
+            else if ((model->flags & P_REFOUT) && (~models[middle].flags & P_REFOUT))
+                cmp = 1;
+            else if ((~model->flags & P_REFOUT) && (models[middle].flags & P_REFOUT))
+                cmp = -1;
+            else {
+                PUNPACK(&poly, models+middle, bxorout);
+                cmp = psncmp(&model->xorout, &poly);
+            }
+        }
+        if (cmp < 0) right = middle;
+        else if (cmp > 0) left = middle + 1;
+    }
+    pfree(&poly);
 
-	if (!cmp) {
-		model->name = models[middle].alias->name;
-		if (flags & M_OVERWR)
-			munpack(model, models+middle);
-	}
+    if (!cmp) {
+        model->name = models[middle].alias->name;
+        if (flags & M_OVERWR)
+            munpack(model, models+middle);
+    }
 }
 
 /* Private functions */
 static void munpack(model_t *dest, const struct mpreset *src) {
-	/* Copies the parameters of src to dest.
-	 * dest must be an initialised model.
-	 */
-	if (!dest || !src) return;
-	MUNPACK(spoly);
-	MUNPACK(init);
-	MUNPACK(xorout);
-	MUNPACK(check);
-	MUNPACK(magic);
-	dest->flags = src->flags;
-	/* link to the name as it is static */
-	dest->name = (src->alias) ? src->alias->name : NULL;
+    /* Copies the parameters of src to dest.
+     * dest must be an initialised model.
+     */
+    if (!dest || !src) return;
+    MUNPACK(spoly);
+    MUNPACK(init);
+    MUNPACK(xorout);
+    MUNPACK(check);
+    MUNPACK(magic);
+    dest->flags = src->flags;
+    /* link to the name as it is static */
+    dest->name = (src->alias) ? src->alias->name : NULL;
 }
\ No newline at end of file
diff --git a/client/reveng/reveng.c b/client/reveng/reveng.c
index 1525bb265..af4f2985b 100644
--- a/client/reveng/reveng.c
+++ b/client/reveng/reveng.c
@@ -32,9 +32,9 @@
  * 2011-01-17: fixed ANSI C warnings
  * 2011-01-08: fixed calini(), modini() caters for crossed-endian algos
  * 2011-01-04: renamed functions, added calini(), factored pshres();
- *	       rewrote engini() and implemented quick Init search
+ *         rewrote engini() and implemented quick Init search
  * 2011-01-01: reveng() initialises terminating entry, addparms()
- *	       initialises all fields
+ *         initialises all fields
  * 2010-12-26: renamed CRC RevEng. right results, rejects polys faster
  * 2010-12-24: completed, first tests (unsuccessful)
  * 2010-12-21: completed modulate(), partial sketch of reveng()
@@ -63,438 +63,438 @@ static const poly_t pzero = PZERO;
 
 model_t *
 reveng(const model_t *guess, const poly_t qpoly, int rflags, int args, const poly_t *argpolys) {
-	/* Complete the parameters of a model by calculation or brute search. */
-	poly_t *pworks, *wptr, rem, gpoly;
-	model_t *result = NULL, *rptr;
-	int resc = 0;
-	unsigned long spin = 0, seq = 0;
+    /* Complete the parameters of a model by calculation or brute search. */
+    poly_t *pworks, *wptr, rem, gpoly;
+    model_t *result = NULL, *rptr;
+    int resc = 0;
+    unsigned long spin = 0, seq = 0;
 
-	if(~rflags & R_HAVEP) {
-		/* The poly is not known.
-		 * Produce a list of differences between the arguments.
-		 */
-		pworks = modpol(guess->init, rflags, args, argpolys);
-		if(!pworks || !plen(*pworks)) {
-			free(pworks);
-			goto requit;
-		}
-		/* Initialise the guessed poly to the starting value. */
-		gpoly = pclone(guess->spoly);
-		/* Clear the least significant term, to be set in the
-		 * loop. qpoly does not need fixing as it is only
-		 * compared with odd polys.
-		 */
-		if(plen(gpoly))
-			pshift(&gpoly, gpoly, 0UL, 0UL, plen(gpoly) - 1UL, 1UL);
+    if(~rflags & R_HAVEP) {
+        /* The poly is not known.
+         * Produce a list of differences between the arguments.
+         */
+        pworks = modpol(guess->init, rflags, args, argpolys);
+        if(!pworks || !plen(*pworks)) {
+            free(pworks);
+            goto requit;
+        }
+        /* Initialise the guessed poly to the starting value. */
+        gpoly = pclone(guess->spoly);
+        /* Clear the least significant term, to be set in the
+         * loop. qpoly does not need fixing as it is only
+         * compared with odd polys.
+         */
+        if(plen(gpoly))
+            pshift(&gpoly, gpoly, 0UL, 0UL, plen(gpoly) - 1UL, 1UL);
 
-		while(piter(&gpoly) && (~rflags & R_HAVEQ || pcmp(&gpoly, &qpoly) < 0)) {
-			/* For each possible poly of this size, try
-			 * dividing all the differences in the list.
-			 */
-			if(!(spin++ & R_SPMASK)) {
-				uprog(gpoly, guess->flags, seq++);
-			}
-			for(wptr = pworks; plen(*wptr); ++wptr) {
-				/* straight divide message by poly, don't multiply by x^n */
-				rem = pcrc(*wptr, gpoly, pzero, pzero, 0);
-				if(ptst(rem)) {
-					pfree(&rem);
-					break;
-				} else
-					pfree(&rem);
-			}
-			/* If gpoly divides all the differences, it is a
-			 * candidate.  Search for an Init value for this
-			 * poly or if Init is known, log the result.
-			 */
-			if(!plen(*wptr)) {
-				/* gpoly is a candidate poly */
-				if(rflags & R_HAVEI && rflags & R_HAVEX)
-					chkres(&resc, &result, gpoly, guess->init, guess->flags, guess->xorout, args, argpolys);
-				else if(rflags & R_HAVEI)
-					calout(&resc, &result, gpoly, guess->init, guess->flags, args, argpolys);
-				else if(rflags & R_HAVEX)
-					calini(&resc, &result, gpoly, guess->flags, guess->xorout, args, argpolys);
-				else
-					engini(&resc, &result, gpoly, guess->flags, args, argpolys);
-			}
-			if(!piter(&gpoly))
-				break;
-		}
-		/* Finished with gpoly and the differences list, free them.
-		 */
-		pfree(&gpoly);
-		for(wptr = pworks; plen(*wptr); ++wptr)
-			pfree(wptr);
-		free(pworks);
-	}
-	else if(rflags & R_HAVEI && rflags & R_HAVEX)
-		/* All parameters are known!  Submit the result if we get here */
-		chkres(&resc, &result, guess->spoly, guess->init, guess->flags, guess->xorout, args, argpolys);
-	else if(rflags & R_HAVEI)
-		/* Poly and Init are known, calculate XorOut */
-		calout(&resc, &result, guess->spoly, guess->init, guess->flags, args, argpolys);
-	else if(rflags & R_HAVEX)
-		/* Poly and XorOut are known, calculate Init */
-		calini(&resc, &result, guess->spoly, guess->flags, guess->xorout, args, argpolys);
-	else
-		/* Poly is known but not Init; search for Init. */
-		engini(&resc, &result, guess->spoly, guess->flags, args, argpolys);
+        while(piter(&gpoly) && (~rflags & R_HAVEQ || pcmp(&gpoly, &qpoly) < 0)) {
+            /* For each possible poly of this size, try
+             * dividing all the differences in the list.
+             */
+            if(!(spin++ & R_SPMASK)) {
+                uprog(gpoly, guess->flags, seq++);
+            }
+            for(wptr = pworks; plen(*wptr); ++wptr) {
+                /* straight divide message by poly, don't multiply by x^n */
+                rem = pcrc(*wptr, gpoly, pzero, pzero, 0);
+                if(ptst(rem)) {
+                    pfree(&rem);
+                    break;
+                } else
+                    pfree(&rem);
+            }
+            /* If gpoly divides all the differences, it is a
+             * candidate.  Search for an Init value for this
+             * poly or if Init is known, log the result.
+             */
+            if(!plen(*wptr)) {
+                /* gpoly is a candidate poly */
+                if(rflags & R_HAVEI && rflags & R_HAVEX)
+                    chkres(&resc, &result, gpoly, guess->init, guess->flags, guess->xorout, args, argpolys);
+                else if(rflags & R_HAVEI)
+                    calout(&resc, &result, gpoly, guess->init, guess->flags, args, argpolys);
+                else if(rflags & R_HAVEX)
+                    calini(&resc, &result, gpoly, guess->flags, guess->xorout, args, argpolys);
+                else
+                    engini(&resc, &result, gpoly, guess->flags, args, argpolys);
+            }
+            if(!piter(&gpoly))
+                break;
+        }
+        /* Finished with gpoly and the differences list, free them.
+         */
+        pfree(&gpoly);
+        for(wptr = pworks; plen(*wptr); ++wptr)
+            pfree(wptr);
+        free(pworks);
+    }
+    else if(rflags & R_HAVEI && rflags & R_HAVEX)
+        /* All parameters are known!  Submit the result if we get here */
+        chkres(&resc, &result, guess->spoly, guess->init, guess->flags, guess->xorout, args, argpolys);
+    else if(rflags & R_HAVEI)
+        /* Poly and Init are known, calculate XorOut */
+        calout(&resc, &result, guess->spoly, guess->init, guess->flags, args, argpolys);
+    else if(rflags & R_HAVEX)
+        /* Poly and XorOut are known, calculate Init */
+        calini(&resc, &result, guess->spoly, guess->flags, guess->xorout, args, argpolys);
+    else
+        /* Poly is known but not Init; search for Init. */
+        engini(&resc, &result, guess->spoly, guess->flags, args, argpolys);
 
 requit:
-	if(!(result = realloc(result, ++resc * sizeof(model_t)))) {
-		uerror("cannot reallocate result array");
-		return NULL;
-	}
-	rptr = result + resc - 1;
-	rptr->spoly  = pzero;
-	rptr->init   = pzero;
-	rptr->flags  = 0;
-	rptr->xorout = pzero;
-	rptr->check  = pzero;
-	rptr->magic  = pzero;
-	rptr->name   = NULL;
+    if(!(result = realloc(result, ++resc * sizeof(model_t)))) {
+        uerror("cannot reallocate result array");
+        return NULL;
+    }
+    rptr = result + resc - 1;
+    rptr->spoly  = pzero;
+    rptr->init   = pzero;
+    rptr->flags  = 0;
+    rptr->xorout = pzero;
+    rptr->check  = pzero;
+    rptr->magic  = pzero;
+    rptr->name   = NULL;
 
-	return(result);
+    return(result);
 }
 
 static poly_t *
 modpol(const poly_t init, int rflags, int args, const poly_t *argpolys) {
-	/* Produce, in ascending length order, a list of differences
-	 * between the arguments in the list by summing pairs of arguments.
-	 * If R_HAVEI is not set in rflags, only pairs of equal length are
-	 * summed.
-	 * Otherwise, sums of right-aligned pairs are also returned, with
-	 * the supplied init poly added to the leftmost terms of each
-	 * poly of the pair.
-	 */
-	poly_t work, swap, *result, *rptr, *iptr;
-	const poly_t *aptr, *bptr, *eptr = argpolys + args;
-	unsigned long alen, blen;
+    /* Produce, in ascending length order, a list of differences
+     * between the arguments in the list by summing pairs of arguments.
+     * If R_HAVEI is not set in rflags, only pairs of equal length are
+     * summed.
+     * Otherwise, sums of right-aligned pairs are also returned, with
+     * the supplied init poly added to the leftmost terms of each
+     * poly of the pair.
+     */
+    poly_t work, swap, *result, *rptr, *iptr;
+    const poly_t *aptr, *bptr, *eptr = argpolys + args;
+    unsigned long alen, blen;
 
-	if(args < 2) return(NULL);
+    if(args < 2) return(NULL);
 
-	result = calloc(((((args - 1) * args) >> 1) + 1) * sizeof(poly_t), sizeof(char));
-	if(!result)
-		uerror("cannot allocate memory for codeword table");
+    result = calloc(((((args - 1) * args) >> 1) + 1) * sizeof(poly_t), sizeof(char));
+    if(!result)
+        uerror("cannot allocate memory for codeword table");
 
-	rptr = result;
+    rptr = result;
 
-	for(aptr = argpolys; aptr < eptr; ++aptr) {
-		alen = plen(*aptr);
-		for(bptr = aptr + 1; bptr < eptr; ++bptr) {
-			blen = plen(*bptr);
-			if(alen == blen) {
-				work = pclone(*aptr);
-				psum(&work, *bptr, 0UL);
-			} else if(rflags & R_HAVEI && alen < blen) {
-				work = pclone(*bptr);
-				psum(&work, *aptr, blen - alen);
-				psum(&work, init, 0UL);
-				psum(&work, init, blen - alen);
-			} else if(rflags & R_HAVEI /* && alen > blen */) {
-				work = pclone(*aptr);
-				psum(&work, *bptr, alen - blen);
-				psum(&work, init, 0UL);
-				psum(&work, init, alen - blen);
-			} else
-				work = pzero;
+    for(aptr = argpolys; aptr < eptr; ++aptr) {
+        alen = plen(*aptr);
+        for(bptr = aptr + 1; bptr < eptr; ++bptr) {
+            blen = plen(*bptr);
+            if(alen == blen) {
+                work = pclone(*aptr);
+                psum(&work, *bptr, 0UL);
+            } else if(rflags & R_HAVEI && alen < blen) {
+                work = pclone(*bptr);
+                psum(&work, *aptr, blen - alen);
+                psum(&work, init, 0UL);
+                psum(&work, init, blen - alen);
+            } else if(rflags & R_HAVEI /* && alen > blen */) {
+                work = pclone(*aptr);
+                psum(&work, *bptr, alen - blen);
+                psum(&work, init, 0UL);
+                psum(&work, init, alen - blen);
+            } else
+                work = pzero;
 
-			if(plen(work))
-				pnorm(&work);
-			if((blen = plen(work))) {
-				/* insert work into result[] in ascending order of length */
-				for(iptr = result; iptr < rptr; ++iptr) {
-					if(plen(work) < plen(*iptr)) {
-						swap = *iptr;
-						*iptr = work;
-						work = swap;
-					}
-					else if(plen(*iptr) == blen && !pcmp(&work, iptr)) {
-						pfree(&work);
-						work = *--rptr;
-						break;
-					}
-				}
-				*rptr++ = work;
-			}
-		}
-	}
-	*rptr = pzero;
-	return(result);
+            if(plen(work))
+                pnorm(&work);
+            if((blen = plen(work))) {
+                /* insert work into result[] in ascending order of length */
+                for(iptr = result; iptr < rptr; ++iptr) {
+                    if(plen(work) < plen(*iptr)) {
+                        swap = *iptr;
+                        *iptr = work;
+                        work = swap;
+                    }
+                    else if(plen(*iptr) == blen && !pcmp(&work, iptr)) {
+                        pfree(&work);
+                        work = *--rptr;
+                        break;
+                    }
+                }
+                *rptr++ = work;
+            }
+        }
+    }
+    *rptr = pzero;
+    return(result);
 }
 
 static void
 engini(int *resc, model_t **result, const poly_t divisor, int flags, int args, const poly_t *argpolys) {
-	/* Search for init values implied by the arguments.
-	 * Method from: Ewing, Gregory C. (March 2010).
-	 * "Reverse-Engineering a CRC Algorithm". Christchurch:
-	 * University of Canterbury.
-	 * <http://www.cosc.canterbury.ac.nz/greg.ewing/essays/
-	 * CRC-Reverse-Engineering.html>
-	 */
-	poly_t apoly = PZERO, bpoly, pone = PZERO, *mat, *jptr;
-	const poly_t *aptr, *bptr, *iptr;
-	unsigned long alen, blen, dlen, ilen, i, j;
-	int cy;
+    /* Search for init values implied by the arguments.
+     * Method from: Ewing, Gregory C. (March 2010).
+     * "Reverse-Engineering a CRC Algorithm". Christchurch:
+     * University of Canterbury.
+     * <http://www.cosc.canterbury.ac.nz/greg.ewing/essays/
+     * CRC-Reverse-Engineering.html>
+     */
+    poly_t apoly = PZERO, bpoly, pone = PZERO, *mat, *jptr;
+    const poly_t *aptr, *bptr, *iptr;
+    unsigned long alen, blen, dlen, ilen, i, j;
+    int cy;
 
-	dlen = plen(divisor);
+    dlen = plen(divisor);
 
-	/* Allocate the CRC matrix */
-	mat = (poly_t *) calloc((dlen << 1) * sizeof(poly_t), sizeof(char));
-	if(!mat)
-		uerror("cannot allocate memory for CRC matrix");
+    /* Allocate the CRC matrix */
+    mat = (poly_t *) calloc((dlen << 1) * sizeof(poly_t), sizeof(char));
+    if(!mat)
+        uerror("cannot allocate memory for CRC matrix");
 
-	/* Find arguments of the two shortest lengths */
-	alen = blen = plen(*(aptr = bptr = iptr = argpolys));
-	for(++iptr; iptr < argpolys + args; ++iptr) {
-		ilen = plen(*iptr);
-		if(ilen < alen) {
-			bptr = aptr; blen = alen;
-			aptr = iptr; alen = ilen;
-		} else if(ilen > alen && (aptr == bptr || ilen < blen)) {
-			bptr = iptr; blen = ilen;
-		}
-	}
-	if(aptr == bptr) {
-		/* if no arguments are suitable, calculate Init with an
-		 * assumed XorOut of 0.  Create a padded XorOut
-		 */
-		palloc(&apoly, dlen);
-		calini(resc, result, divisor, flags, apoly, args, argpolys);
-		pfree(&apoly);
-		free(mat);
-		return;
-	}
+    /* Find arguments of the two shortest lengths */
+    alen = blen = plen(*(aptr = bptr = iptr = argpolys));
+    for(++iptr; iptr < argpolys + args; ++iptr) {
+        ilen = plen(*iptr);
+        if(ilen < alen) {
+            bptr = aptr; blen = alen;
+            aptr = iptr; alen = ilen;
+        } else if(ilen > alen && (aptr == bptr || ilen < blen)) {
+            bptr = iptr; blen = ilen;
+        }
+    }
+    if(aptr == bptr) {
+        /* if no arguments are suitable, calculate Init with an
+         * assumed XorOut of 0.  Create a padded XorOut
+         */
+        palloc(&apoly, dlen);
+        calini(resc, result, divisor, flags, apoly, args, argpolys);
+        pfree(&apoly);
+        free(mat);
+        return;
+    }
 
-	/* Find the potential contribution of the bottom bit of Init */
-	palloc(&pone, 1UL);
-	piter(&pone);
-	if(blen < (dlen << 1)) {
-		palloc(&apoly, dlen); /* >= 1 */
-		psum(&apoly, pone, (dlen << 1) - 1UL - blen); /* >= 0 */
-		psum(&apoly, pone, (dlen << 1) - 1UL - alen); /* >= 1 */
-	} else {
-		palloc(&apoly, blen - dlen + 1UL); /* > dlen */
-		psum(&apoly, pone, 0UL);
-		psum(&apoly, pone, blen - alen); /* >= 1 */
-	}
-	if(plen(apoly) > dlen) {
-		mat[dlen] = pcrc(apoly, divisor, pzero, pzero, 0);
-		pfree(&apoly);
-	} else {
-		mat[dlen] = apoly;
-	}
+    /* Find the potential contribution of the bottom bit of Init */
+    palloc(&pone, 1UL);
+    piter(&pone);
+    if(blen < (dlen << 1)) {
+        palloc(&apoly, dlen); /* >= 1 */
+        psum(&apoly, pone, (dlen << 1) - 1UL - blen); /* >= 0 */
+        psum(&apoly, pone, (dlen << 1) - 1UL - alen); /* >= 1 */
+    } else {
+        palloc(&apoly, blen - dlen + 1UL); /* > dlen */
+        psum(&apoly, pone, 0UL);
+        psum(&apoly, pone, blen - alen); /* >= 1 */
+    }
+    if(plen(apoly) > dlen) {
+        mat[dlen] = pcrc(apoly, divisor, pzero, pzero, 0);
+        pfree(&apoly);
+    } else {
+        mat[dlen] = apoly;
+    }
 
-	/* Find the actual contribution of Init */
-	apoly = pcrc(*aptr, divisor, pzero, pzero, 0);
-	bpoly = pcrc(*bptr, divisor, pzero, apoly, 0);
+    /* Find the actual contribution of Init */
+    apoly = pcrc(*aptr, divisor, pzero, pzero, 0);
+    bpoly = pcrc(*bptr, divisor, pzero, apoly, 0);
 
-	/* Populate the matrix */
-	palloc(&apoly, 1UL);
-	for(jptr=mat; jptr<mat+dlen; ++jptr)
-		*jptr = pzero;
-	for(iptr = jptr++; jptr < mat + (dlen << 1); iptr = jptr++)
-		*jptr = pcrc(apoly, divisor, *iptr, pzero, P_MULXN);
-	pfree(&apoly);
+    /* Populate the matrix */
+    palloc(&apoly, 1UL);
+    for(jptr=mat; jptr<mat+dlen; ++jptr)
+        *jptr = pzero;
+    for(iptr = jptr++; jptr < mat + (dlen << 1); iptr = jptr++)
+        *jptr = pcrc(apoly, divisor, *iptr, pzero, P_MULXN);
+    pfree(&apoly);
 
-	/* Transpose the matrix, augment with the Init contribution
-	 * and convert to row echelon form
-	 */
-	for(i=0UL; i<dlen; ++i) {
-		apoly = pzero;
-		iptr = mat + (dlen << 1);
-		for(j=0UL; j<dlen; ++j)
-			ppaste(&apoly, *--iptr, i, j, j + 1UL, dlen + 1UL);
-		if(ptst(apoly))
-			ppaste(&apoly, bpoly, i, dlen, dlen + 1UL, dlen + 1UL);
-		j = pfirst(apoly);
-		while(j < dlen && !pident(mat[j], pzero)) {
-			psum(&apoly, mat[j], 0UL); /* pfirst(apoly) > j */
-			j = pfirst(apoly);
-		}
-		if(j < dlen)
-			mat[j] = apoly; /* pident(mat[j], pzero) || pfirst(mat[j]) == j */
-		else
-			pfree(&apoly);
-	}
-	palloc(&bpoly, dlen + 1UL);
-	psum(&bpoly, pone, dlen);
+    /* Transpose the matrix, augment with the Init contribution
+     * and convert to row echelon form
+     */
+    for(i=0UL; i<dlen; ++i) {
+        apoly = pzero;
+        iptr = mat + (dlen << 1);
+        for(j=0UL; j<dlen; ++j)
+            ppaste(&apoly, *--iptr, i, j, j + 1UL, dlen + 1UL);
+        if(ptst(apoly))
+            ppaste(&apoly, bpoly, i, dlen, dlen + 1UL, dlen + 1UL);
+        j = pfirst(apoly);
+        while(j < dlen && !pident(mat[j], pzero)) {
+            psum(&apoly, mat[j], 0UL); /* pfirst(apoly) > j */
+            j = pfirst(apoly);
+        }
+        if(j < dlen)
+            mat[j] = apoly; /* pident(mat[j], pzero) || pfirst(mat[j]) == j */
+        else
+            pfree(&apoly);
+    }
+    palloc(&bpoly, dlen + 1UL);
+    psum(&bpoly, pone, dlen);
 
-	/* Iterate through all solutions */
-	do {
-		/* Solve the matrix by Gaussian elimination.
-		 * The parity of the result, masked by each row, should be even.
-		 */
-		cy = 1;
-		apoly = pclone(bpoly);
-		jptr = mat + dlen;
-		for(i=0UL; i<dlen; ++i) {
-			/* Compute next bit of Init */
-			if(pmpar(apoly, *--jptr))
-				psum(&apoly, pone, dlen - 1UL - i);
-			/* Toggle each zero row with carry, for next iteration */
-			if(cy) {
-			       if(pident(*jptr, pzero)) {
-				       /* 0 to 1, no carry */
-				       *jptr = bpoly;
-				       cy = 0;
-			       } else if(pident(*jptr, bpoly)) {
-				       /* 1 to 0, carry forward */
-				       *jptr = pzero;
-			       }
-			}
-		}
+    /* Iterate through all solutions */
+    do {
+        /* Solve the matrix by Gaussian elimination.
+         * The parity of the result, masked by each row, should be even.
+         */
+        cy = 1;
+        apoly = pclone(bpoly);
+        jptr = mat + dlen;
+        for(i=0UL; i<dlen; ++i) {
+            /* Compute next bit of Init */
+            if(pmpar(apoly, *--jptr))
+                psum(&apoly, pone, dlen - 1UL - i);
+            /* Toggle each zero row with carry, for next iteration */
+            if(cy) {
+                   if(pident(*jptr, pzero)) {
+                       /* 0 to 1, no carry */
+                       *jptr = bpoly;
+                       cy = 0;
+                   } else if(pident(*jptr, bpoly)) {
+                       /* 1 to 0, carry forward */
+                       *jptr = pzero;
+                   }
+            }
+        }
 
-		/* Trim the augment mask bit */
-		praloc(&apoly, dlen);
+        /* Trim the augment mask bit */
+        praloc(&apoly, dlen);
 
-		/* Test the Init value and add to results if correct */
-		calout(resc, result, divisor, apoly, flags, args, argpolys);
-		pfree(&apoly);
-	} while(!cy);
-	pfree(&pone);
-	pfree(&bpoly);
+        /* Test the Init value and add to results if correct */
+        calout(resc, result, divisor, apoly, flags, args, argpolys);
+        pfree(&apoly);
+    } while(!cy);
+    pfree(&pone);
+    pfree(&bpoly);
 
-	/* Free the matrix. */
-	for(jptr=mat; jptr < mat + (dlen << 1); ++jptr)
-		pfree(jptr);
-	free(mat);
+    /* Free the matrix. */
+    for(jptr=mat; jptr < mat + (dlen << 1); ++jptr)
+        pfree(jptr);
+    free(mat);
 }
 
 static void
 calout(int *resc, model_t **result, const poly_t divisor, const poly_t init, int flags, int args, const poly_t *argpolys) {
-	/* Calculate Xorout, check it against all the arguments and
-	 * add to results if consistent.
-	 */
-	poly_t xorout;
-	const poly_t *aptr, *iptr;
-	unsigned long alen, ilen;
+    /* Calculate Xorout, check it against all the arguments and
+     * add to results if consistent.
+     */
+    poly_t xorout;
+    const poly_t *aptr, *iptr;
+    unsigned long alen, ilen;
 
-	if(args < 1) return;
+    if(args < 1) return;
 
-	/* find argument of the shortest length */
-	alen = plen(*(aptr = iptr = argpolys));
-	for(++iptr; iptr < argpolys + args; ++iptr) {
-		ilen = plen(*iptr);
-		if(ilen < alen) {
-			aptr = iptr; alen = ilen;
-		}
-	}
+    /* find argument of the shortest length */
+    alen = plen(*(aptr = iptr = argpolys));
+    for(++iptr; iptr < argpolys + args; ++iptr) {
+        ilen = plen(*iptr);
+        if(ilen < alen) {
+            aptr = iptr; alen = ilen;
+        }
+    }
 
-	xorout = pcrc(*aptr, divisor, init, pzero, 0);
-	/* On little-endian algorithms, the calculations yield
-	 * the reverse of the actual xorout: in the Williams
-	 * model, the refout stage intervenes between init and
-	 * xorout.
-	 */
-	if(flags & P_REFOUT)
-		prev(&xorout);
+    xorout = pcrc(*aptr, divisor, init, pzero, 0);
+    /* On little-endian algorithms, the calculations yield
+     * the reverse of the actual xorout: in the Williams
+     * model, the refout stage intervenes between init and
+     * xorout.
+     */
+    if(flags & P_REFOUT)
+        prev(&xorout);
 
-	/* Submit the model to the results table.
-	 * Could skip the shortest argument but we wish to check our
-	 * calculation.
-	 */
-	chkres(resc, result, divisor, init, flags, xorout, args, argpolys);
-	pfree(&xorout);
+    /* Submit the model to the results table.
+     * Could skip the shortest argument but we wish to check our
+     * calculation.
+     */
+    chkres(resc, result, divisor, init, flags, xorout, args, argpolys);
+    pfree(&xorout);
 }
 
 static void
 calini(int *resc, model_t **result, const poly_t divisor, int flags, const poly_t xorout, int args, const poly_t *argpolys) {
-	/* Calculate Init, check it against all the arguments and add to
-	 * results if consistent.
-	 */
-	poly_t rcpdiv, rxor, arg, init;
-	const poly_t *aptr, *iptr;
-	unsigned long alen, ilen;
+    /* Calculate Init, check it against all the arguments and add to
+     * results if consistent.
+     */
+    poly_t rcpdiv, rxor, arg, init;
+    const poly_t *aptr, *iptr;
+    unsigned long alen, ilen;
 
-	if(args < 1) return;
+    if(args < 1) return;
 
-	/* find argument of the shortest length */
-	alen = plen(*(aptr = iptr = argpolys));
-	for(++iptr; iptr < argpolys + args; ++iptr) {
-		ilen = plen(*iptr);
-		if(ilen < alen) {
-			aptr = iptr; alen = ilen;
-		}
-	}
+    /* find argument of the shortest length */
+    alen = plen(*(aptr = iptr = argpolys));
+    for(++iptr; iptr < argpolys + args; ++iptr) {
+        ilen = plen(*iptr);
+        if(ilen < alen) {
+            aptr = iptr; alen = ilen;
+        }
+    }
 
-	rcpdiv = pclone(divisor);
-	prcp(&rcpdiv);
-	/* If the algorithm is reflected, an ordinary CRC requires the
-	 * model's XorOut to be reversed, as XorOut follows the RefOut
-	 * stage.  To reverse the CRC calculation we need rxor to be the
-	 * mirror image of the forward XorOut.
-	 */
-	rxor = pclone(xorout);
-	if(~flags & P_REFOUT)
-		prev(&rxor);
-	arg = pclone(*aptr);
-	prev(&arg);
+    rcpdiv = pclone(divisor);
+    prcp(&rcpdiv);
+    /* If the algorithm is reflected, an ordinary CRC requires the
+     * model's XorOut to be reversed, as XorOut follows the RefOut
+     * stage.  To reverse the CRC calculation we need rxor to be the
+     * mirror image of the forward XorOut.
+     */
+    rxor = pclone(xorout);
+    if(~flags & P_REFOUT)
+        prev(&rxor);
+    arg = pclone(*aptr);
+    prev(&arg);
 
-	init = pcrc(arg, rcpdiv, rxor, pzero, 0);
-	pfree(&arg);
-	pfree(&rxor);
-	pfree(&rcpdiv);
-	prev(&init);
+    init = pcrc(arg, rcpdiv, rxor, pzero, 0);
+    pfree(&arg);
+    pfree(&rxor);
+    pfree(&rcpdiv);
+    prev(&init);
 
-	/* Submit the model to the results table.
-	 * Could skip the shortest argument but we wish to check our
-	 * calculation.
-	 */
-	chkres(resc, result, divisor, init, flags, xorout, args, argpolys);
-	pfree(&init);
+    /* Submit the model to the results table.
+     * Could skip the shortest argument but we wish to check our
+     * calculation.
+     */
+    chkres(resc, result, divisor, init, flags, xorout, args, argpolys);
+    pfree(&init);
 }
 
 static void
 chkres(int *resc, model_t **result, const poly_t divisor, const poly_t init, int flags, const poly_t xorout, int args, const poly_t *argpolys) {
-	/* Checks a model against the argument list, and adds to the
-	 * external results table if consistent.
-	 * Extends the result array and updates the external pointer if
-	 * necessary.
-	 */
-	model_t *rptr;
-	poly_t xor, crc;
-	const poly_t *aptr = argpolys, *const eptr = argpolys + args;
+    /* Checks a model against the argument list, and adds to the
+     * external results table if consistent.
+     * Extends the result array and updates the external pointer if
+     * necessary.
+     */
+    model_t *rptr;
+    poly_t xor, crc;
+    const poly_t *aptr = argpolys, *const eptr = argpolys + args;
 
-	/* If the algorithm is reflected, an ordinary CRC requires the
-	 * model's XorOut to be reversed, as XorOut follows the RefOut
-	 * stage.
-	 */
-	xor = pclone(xorout);
-	if(flags & P_REFOUT)
-		prev(&xor);
+    /* If the algorithm is reflected, an ordinary CRC requires the
+     * model's XorOut to be reversed, as XorOut follows the RefOut
+     * stage.
+     */
+    xor = pclone(xorout);
+    if(flags & P_REFOUT)
+        prev(&xor);
 
-	for(; aptr < eptr; ++aptr) {
-		crc = pcrc(*aptr, divisor, init, xor, 0);
-		if(ptst(crc)) {
-			pfree(&crc);
-			break;
-		} else {
-			pfree(&crc);
-		}
-	}
-	pfree(&xor);
-	if(aptr != eptr) return;
+    for(; aptr < eptr; ++aptr) {
+        crc = pcrc(*aptr, divisor, init, xor, 0);
+        if(ptst(crc)) {
+            pfree(&crc);
+            break;
+        } else {
+            pfree(&crc);
+        }
+    }
+    pfree(&xor);
+    if(aptr != eptr) return;
 
-	*result = realloc(*result, ++*resc * sizeof(model_t));
-	if (!*result) {
-		uerror("cannot reallocate result array");
-		return;
-	}
+    *result = realloc(*result, ++*resc * sizeof(model_t));
+    if (!*result) {
+        uerror("cannot reallocate result array");
+        return;
+    }
 
-	rptr = *result + *resc - 1;
-	rptr->spoly  = pclone(divisor);
-	rptr->init   = pclone(init);
-	rptr->flags  = flags;
-	rptr->xorout = pclone(xorout);
-	rptr->check  = pzero;
-	rptr->magic  = pzero;
-	rptr->name   = NULL;
+    rptr = *result + *resc - 1;
+    rptr->spoly  = pclone(divisor);
+    rptr->init   = pclone(init);
+    rptr->flags  = flags;
+    rptr->xorout = pclone(xorout);
+    rptr->check  = pzero;
+    rptr->magic  = pzero;
+    rptr->name   = NULL;
 
-	/* compute check value for this model */
-	mcheck(rptr);
+    /* compute check value for this model */
+    mcheck(rptr);
 
-	/* callback to notify new model */
-	ufound(rptr);
+    /* callback to notify new model */
+    ufound(rptr);
 }
diff --git a/client/reveng/reveng.h b/client/reveng/reveng.h
index 70f594072..7489d2da4 100644
--- a/client/reveng/reveng.h
+++ b/client/reveng/reveng.h
@@ -134,9 +134,9 @@ extern void setbmp(void);
 #define PZERO {0UL, (bmp_t *) 0}
 
 typedef struct {
-	unsigned long length;	/* number of significant bits */
-	bmp_t *bitmap;		/* bitmap, MSB first, */
-				/* left-justified in each word */
+    unsigned long length; /* number of significant bits */
+    bmp_t *bitmap;        /* bitmap, MSB first, */
+                          /* left-justified in each word */
 } poly_t;
 
 extern poly_t filtop(FILE *input, unsigned long length, int flags, int bperhx);
@@ -181,13 +181,13 @@ extern int pident(const poly_t a, const poly_t b);
 #define MZERO {PZERO, PZERO, P_BE, PZERO, PZERO, PZERO, NULL}
 
 typedef struct {
-	poly_t spoly;		/* polynomial with highest-order term removed. length determines CRC width */
-	poly_t init;		/* initial register value. length == spoly.length */
-	int flags;		/* P_REFIN and P_REFOUT indicate reflected input/output */
-	poly_t xorout;		/* final register XOR mask. length == spoly.length */
-	poly_t check;		/* optional check value, the CRC of the UTF-8 string "123456789" */
-	poly_t magic;		/* optional magic check value, the residue of a valid codeword */
-	const char *name;	/* optional canonical name of the model */
+    poly_t spoly;       /* polynomial with highest-order term removed. length determines CRC width */
+    poly_t init;        /* initial register value. length == spoly.length */
+    int flags;          /* P_REFIN and P_REFOUT indicate reflected input/output */
+    poly_t xorout;      /* final register XOR mask. length == spoly.length */
+    poly_t check;       /* optional check value, the CRC of the UTF-8 string "123456789" */
+    poly_t magic;       /* optional magic check value, the residue of a valid codeword */
+    const char *name;   /* optional canonical name of the model */
 } model_t;
 
 extern void mcpy(model_t *dest, const model_t *src);
diff --git a/client/scandir.c b/client/scandir.c
index d7cb0e9d6..e0986e4d2 100644
--- a/client/scandir.c
+++ b/client/scandir.c
@@ -19,65 +19,65 @@
 extern "C" {
 #endif
 int scandir (const char *dir,
-	 struct dirent ***namelist,
-	 int (*select) (const struct dirent *),
-	 int (*compar) (const struct dirent **, const struct dirent **))
+     struct dirent ***namelist,
+     int (*select) (const struct dirent *),
+     int (*compar) (const struct dirent **, const struct dirent **))
 {
-	DIR *dirp;
-	struct dirent *ent, *etmp, **nl = NULL, **ntmp;
-	int count = 0;
-	int allocated = 0;
-	int err_no = 0;
+    DIR *dirp;
+    struct dirent *ent, *etmp, **nl = NULL, **ntmp;
+    int count = 0;
+    int allocated = 0;
+    int err_no = 0;
 
-	if (!(dirp = opendir (dir)))
-		return -1;
+    if (!(dirp = opendir (dir)))
+        return -1;
 
-	while ((ent = readdir (dirp))) {
-		if (!select || select (ent)) {
+    while ((ent = readdir (dirp))) {
+        if (!select || select (ent)) {
 
-			err_no =0;
+            err_no =0;
 
-			if (count == allocated) {
-				if (allocated == 0)
-					allocated = 10;
-				else
-					allocated *= 2;
+            if (count == allocated) {
+                if (allocated == 0)
+                    allocated = 10;
+                else
+                    allocated *= 2;
 
-				ntmp = (struct dirent **) realloc (nl, allocated * sizeof *nl);
-				if (!ntmp) {
-					err_no = 1;
-					break;
-				}
-				nl = ntmp;
-			}
+                ntmp = (struct dirent **) realloc (nl, allocated * sizeof *nl);
+                if (!ntmp) {
+                    err_no = 1;
+                    break;
+                }
+                nl = ntmp;
+            }
 
-			etmp = (struct dirent *) calloc (sizeof *ent, sizeof(char));
-			if (!etmp) {
-				err_no = 1;
-				break;
-			}
-			*etmp = *ent;
-			nl[count++] = etmp;
-		}
-	}
+            etmp = (struct dirent *) calloc (sizeof *ent, sizeof(char));
+            if (!etmp) {
+                err_no = 1;
+                break;
+            }
+            *etmp = *ent;
+            nl[count++] = etmp;
+        }
+    }
 
-	if (err_no != 0) {
-		closedir (dirp);
-		if (nl)	{
-			while (count > 0) {
-				free (nl[--count]);
-			}
-			free (nl);
-		}
-		return -1;
-	}
+    if (err_no != 0) {
+        closedir (dirp);
+        if (nl) {
+            while (count > 0) {
+                free (nl[--count]);
+            }
+            free (nl);
+        }
+        return -1;
+    }
 
-	closedir (dirp);
+    closedir (dirp);
 
-	qsort (nl, count, sizeof *nl, (int (*)(const void *, const void *)) compar);
-	if (namelist)
-		*namelist = nl;
-	return count;
+    qsort (nl, count, sizeof *nl, (int (*)(const void *, const void *)) compar);
+    if (namelist)
+        *namelist = nl;
+    return count;
 }
 #ifdef __cplusplus
 }
@@ -88,7 +88,7 @@ extern "C" {
 #endif
 int alphasort (const struct dirent **a, const struct dirent **b)
 {
-	return strcoll ((*a)->d_name, (*b)->d_name);
+    return strcoll ((*a)->d_name, (*b)->d_name);
 }
 #ifdef __cplusplus
 }
diff --git a/client/scripting.c b/client/scripting.c
index 5f01f6afe..2df14888a 100644
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -36,7 +36,7 @@ static int l_SendCommand(lua_State *L){
     size_t size;
     const char *data = luaL_checklstring(L, 1, &size);
     if (size != sizeof(UsbCommand)) {
-		printf("Got data size %d, expected %d" , (int) size,(int) sizeof(UsbCommand));
+        printf("Got data size %d, expected %d" , (int) size,(int) sizeof(UsbCommand));
         lua_pushstring(L,"Wrong data size");
         return 1;
     }
@@ -55,7 +55,7 @@ static int l_SendCommand(lua_State *L){
  */
 static int l_GetFromBigBuf(lua_State *L){
 
-	int len = 0, startindex = 0;
+    int len = 0, startindex = 0;
 
     //Check number of arguments
     int n = lua_gettop(L);
@@ -67,28 +67,28 @@ static int l_GetFromBigBuf(lua_State *L){
     }
     if (n >= 2) {
         startindex = luaL_checknumber(L, 1);
-		len = luaL_checknumber(L, 2);
+        len = luaL_checknumber(L, 2);
     }
 
-	uint8_t *data = calloc(len, sizeof(uint8_t));
-	if ( !data ) {
+    uint8_t *data = calloc(len, sizeof(uint8_t));
+    if ( !data ) {
         //signal error by returning Nil, errorstring
         lua_pushnil(L);
         lua_pushstring(L,"Allocating memory failed");
         return 2; // two return values
-	}
+    }
 
-	if ( !GetFromDevice(BIG_BUF, data, len, startindex, NULL, 2500, false)) {
-		free(data);
-		lua_pushnil(L);
+    if ( !GetFromDevice(BIG_BUF, data, len, startindex, NULL, 2500, false)) {
+        free(data);
+        lua_pushnil(L);
         lua_pushstring(L, "command execution time out");
-		return 2;
-	}
+        return 2;
+    }
 
-	//Push it as a string
-	lua_pushlstring(L,(const char *)data, len);
-	free(data);
-	return 1;// return 1 to signal one return value
+    //Push it as a string
+    lua_pushlstring(L,(const char *)data, len);
+    free(data);
+    return 1;// return 1 to signal one return value
 }
 
 /**
@@ -102,11 +102,11 @@ static int l_GetFromBigBuf(lua_State *L){
 static int l_GetFromFlashMem(lua_State *L){
 
 #ifndef WITH_FLASH
-	lua_pushnil(L);
-	lua_pushstring(L, "Not compiled with FLASH MEM support");
-	return 2;
+    lua_pushnil(L);
+    lua_pushstring(L, "Not compiled with FLASH MEM support");
+    return 2;
 #else
-	int len = 0, startindex = 0;
+    int len = 0, startindex = 0;
 
     int n = lua_gettop(L);
     if (n == 0) {
@@ -116,26 +116,26 @@ static int l_GetFromFlashMem(lua_State *L){
     }
     if (n >= 2) {
         startindex = luaL_checknumber(L, 1);
-		len = luaL_checknumber(L, 2);
+        len = luaL_checknumber(L, 2);
     }
 
-	uint8_t *data = calloc(len, sizeof(uint8_t));
-	if ( !data ) {
+    uint8_t *data = calloc(len, sizeof(uint8_t));
+    if ( !data ) {
         lua_pushnil(L);
         lua_pushstring(L, "Allocating memory failed");
         return 2;
-	}
+    }
 
-	if ( !GetFromDevice(FLASH_MEM, data, len, startindex, NULL, -1, false)) {
-		free(data);
-		lua_pushnil(L);
+    if ( !GetFromDevice(FLASH_MEM, data, len, startindex, NULL, -1, false)) {
+        free(data);
+        lua_pushnil(L);
         lua_pushstring(L, "command execution time out");
-		return 2;
-	}
+        return 2;
+    }
 
-	lua_pushlstring(L,(const char *)data, len);
-	free(data);
-	return 1;
+    lua_pushlstring(L,(const char *)data, len);
+    free(data);
+    return 1;
 #endif
 }
 
@@ -161,11 +161,11 @@ static int l_WaitForResponseTimeout(lua_State *L){
         return 2;
     }
 
-	// extract first param.  cmd byte to look for
+    // extract first param.  cmd byte to look for
     if (n >= 1) {
         cmd = luaL_checkunsigned(L, 1);
     }
-	// extract second param. timeout value
+    // extract second param. timeout value
     if(n >= 2){
         ms_timeout = luaL_checkunsigned(L, 2);
     }
@@ -178,7 +178,7 @@ static int l_WaitForResponseTimeout(lua_State *L){
     } else {
         //signal error by returning Nil, errorstring
         lua_pushnil(L);
-		lua_pushstring(L, "No response from the device");
+        lua_pushstring(L, "No response from the device");
         return 2;
     }
 }
@@ -197,29 +197,29 @@ static int returnToLuaWithError(lua_State *L, const char* fmt, ...) {
 
 static int l_mfDarkside(lua_State *L){
 
-	uint32_t blockno = 0;
-	uint32_t keytype = MIFARE_AUTH_KEYA;
-	uint64_t key = 0;
-	size_t size;
+    uint32_t blockno = 0;
+    uint32_t keytype = MIFARE_AUTH_KEYA;
+    uint64_t key = 0;
+    size_t size;
 
     //Check number of arguments
     int n = lua_gettop(L);
-	switch (n) {
-		case 2:{
-			const char *p_keytype = luaL_checklstring(L, 2, &size);
-			if (size != 2)  return returnToLuaWithError(L,"Wrong size of keytype, got %d bytes, expected 1", (int) size);
-			sscanf(p_keytype, "%x", &keytype);
-		}
-		case 1: {
-			const char *p_blockno = luaL_checklstring(L, 1, &size);
-			if (size != 2)  return returnToLuaWithError(L,"Wrong size of blockno, got %d bytes, expected 2", (int) size);
-			sscanf(p_blockno, "%02x", &blockno);
-			break;
-		}
-		default : break;
-	}
+    switch (n) {
+        case 2:{
+            const char *p_keytype = luaL_checklstring(L, 2, &size);
+            if (size != 2)  return returnToLuaWithError(L,"Wrong size of keytype, got %d bytes, expected 1", (int) size);
+            sscanf(p_keytype, "%x", &keytype);
+        }
+        case 1: {
+            const char *p_blockno = luaL_checklstring(L, 1, &size);
+            if (size != 2)  return returnToLuaWithError(L,"Wrong size of blockno, got %d bytes, expected 2", (int) size);
+            sscanf(p_blockno, "%02x", &blockno);
+            break;
+        }
+        default : break;
+    }
 
-	int retval = mfDarkside(blockno & 0xFF, keytype & 0xFF, &key);
+    int retval = mfDarkside(blockno & 0xFF, keytype & 0xFF, &key);
 
     uint8_t dest_key[8];
     num_to_bytes(key, sizeof(dest_key), dest_key);
@@ -280,35 +280,35 @@ static int l_CmdConsole(lua_State *L) {
 }
 
 static int l_iso15693_crc(lua_State *L) {
-	uint32_t tmp;
-	unsigned char buf[USB_CMD_DATA_SIZE] = {0x00};
+    uint32_t tmp;
+    unsigned char buf[USB_CMD_DATA_SIZE] = {0x00};
     size_t size = 0;
     const char *data = luaL_checklstring(L, 1, &size);
 
-	for (int i = 0; i < size; i += 2) {
-		sscanf(&data[i], "%02x", &tmp);
-		buf[i / 2] = tmp & 0xFF;
-	}
+    for (int i = 0; i < size; i += 2) {
+        sscanf(&data[i], "%02x", &tmp);
+        buf[i / 2] = tmp & 0xFF;
+    }
 
-	size /= 2;
-	compute_crc(CRC_15693, buf, size, &buf[size], &buf[size+1]);
+    size /= 2;
+    compute_crc(CRC_15693, buf, size, &buf[size], &buf[size+1]);
     lua_pushlstring(L, (const char *)&buf, size+2);
     return 1;
 }
 
 static int l_iso14443b_crc(lua_State *L) {
-	uint32_t tmp;
-	unsigned char buf[USB_CMD_DATA_SIZE] = {0x00};
+    uint32_t tmp;
+    unsigned char buf[USB_CMD_DATA_SIZE] = {0x00};
     size_t size = 0;
     const char *data = luaL_checklstring(L, 1, &size);
 
-	for (int i = 0; i < size; i += 2) {
-		sscanf(&data[i], "%02x", &tmp);
-		buf[i / 2] = tmp & 0xFF;
-	}
+    for (int i = 0; i < size; i += 2) {
+        sscanf(&data[i], "%02x", &tmp);
+        buf[i / 2] = tmp & 0xFF;
+    }
 
-	size /= 2;
-	compute_crc(CRC_14443_B, buf, size, &buf[size], &buf[size+1]);
+    size /= 2;
+    compute_crc(CRC_14443_B, buf, size, &buf[size], &buf[size+1]);
     lua_pushlstring(L, (const char *)&buf, size+2);
     return 1;
 }
@@ -318,195 +318,195 @@ static int l_iso14443b_crc(lua_State *L) {
  params:  key, input
 */
 static int l_aes128decrypt_cbc(lua_State *L) {
-	//Check number of arguments
-	int i;
-	uint32_t tmp;
+    //Check number of arguments
+    int i;
+    uint32_t tmp;
     size_t size;
     const char *p_key = luaL_checklstring(L, 1, &size);
     if (size != 32)  return returnToLuaWithError(L,"Wrong size of key, got %d bytes, expected 32", (int) size);
 
     const char *p_encTxt = luaL_checklstring(L, 2, &size);
 
-	unsigned char indata[16] = {0x00};
-	unsigned char outdata[16] = {0x00};
+    unsigned char indata[16] = {0x00};
+    unsigned char outdata[16] = {0x00};
     unsigned char aes_key[16] = {0x00};
-	unsigned char iv[16] = {0x00};
+    unsigned char iv[16] = {0x00};
 
-	// convert key to bytearray and convert input to bytearray
-	for (i = 0; i < 32; i += 2) {
-		sscanf(&p_encTxt[i], "%02x", &tmp);
-		indata[i / 2] = tmp & 0xFF;
-		sscanf(&p_key[i], "%02x", &tmp);
-		aes_key[i / 2] = tmp & 0xFF;
-	}
+    // convert key to bytearray and convert input to bytearray
+    for (i = 0; i < 32; i += 2) {
+        sscanf(&p_encTxt[i], "%02x", &tmp);
+        indata[i / 2] = tmp & 0xFF;
+        sscanf(&p_key[i], "%02x", &tmp);
+        aes_key[i / 2] = tmp & 0xFF;
+    }
 
     mbedtls_aes_context ctx;
     mbedtls_aes_init(&ctx);
-	mbedtls_aes_setkey_dec(&ctx, aes_key, 128);
-	mbedtls_aes_crypt_cbc(&ctx, MBEDTLS_AES_DECRYPT, sizeof(indata), iv, indata, outdata );
+    mbedtls_aes_setkey_dec(&ctx, aes_key, 128);
+    mbedtls_aes_crypt_cbc(&ctx, MBEDTLS_AES_DECRYPT, sizeof(indata), iv, indata, outdata );
     //Push decrypted array as a string
-	lua_pushlstring(L,(const char *)&outdata, sizeof(outdata));
-	return 1;// return 1 to signal one return value
+    lua_pushlstring(L,(const char *)&outdata, sizeof(outdata));
+    return 1;// return 1 to signal one return value
 }
 static int l_aes128decrypt_ecb(lua_State *L) {
-	//Check number of arguments
-	int i;
-	uint32_t tmp;
+    //Check number of arguments
+    int i;
+    uint32_t tmp;
     size_t size;
     const char *p_key = luaL_checklstring(L, 1, &size);
     if (size != 32)  return returnToLuaWithError(L,"Wrong size of key, got %d bytes, expected 32", (int) size);
 
     const char *p_encTxt = luaL_checklstring(L, 2, &size);
 
-	unsigned char indata[16] = {0x00};
-	unsigned char outdata[16] = {0x00};
+    unsigned char indata[16] = {0x00};
+    unsigned char outdata[16] = {0x00};
     unsigned char aes_key[16] = {0x00};
 
-	// convert key to bytearray and convert input to bytearray
-	for (i = 0; i < 32; i += 2) {
-		sscanf(&p_encTxt[i], "%02x", &tmp);
-		indata[i / 2] = tmp & 0xFF;
-		sscanf(&p_key[i], "%02x", &tmp);
-		aes_key[i / 2] = tmp & 0xFF;
-	}
+    // convert key to bytearray and convert input to bytearray
+    for (i = 0; i < 32; i += 2) {
+        sscanf(&p_encTxt[i], "%02x", &tmp);
+        indata[i / 2] = tmp & 0xFF;
+        sscanf(&p_key[i], "%02x", &tmp);
+        aes_key[i / 2] = tmp & 0xFF;
+    }
     mbedtls_aes_context ctx;
     mbedtls_aes_init(&ctx);
-	mbedtls_aes_setkey_dec(&ctx, aes_key, 128);
-	mbedtls_aes_crypt_ecb(&ctx, MBEDTLS_AES_DECRYPT, indata, outdata );
+    mbedtls_aes_setkey_dec(&ctx, aes_key, 128);
+    mbedtls_aes_crypt_ecb(&ctx, MBEDTLS_AES_DECRYPT, indata, outdata );
 
     //Push decrypted array as a string
-	lua_pushlstring(L,(const char *)&outdata, sizeof(outdata));
-	return 1;// return 1 to signal one return value
+    lua_pushlstring(L,(const char *)&outdata, sizeof(outdata));
+    return 1;// return 1 to signal one return value
 }
 
 static int l_aes128encrypt_cbc(lua_State *L) {
-	//Check number of arguments
-	int i;
-	uint32_t tmp;
+    //Check number of arguments
+    int i;
+    uint32_t tmp;
     size_t size;
     const char *p_key = luaL_checklstring(L, 1, &size);
     if (size != 32)  return returnToLuaWithError(L,"Wrong size of key, got %d bytes, expected 32", (int) size);
 
     const char *p_txt = luaL_checklstring(L, 2, &size);
 
-	unsigned char indata[16] = {0x00};
-	unsigned char outdata[16] = {0x00};
+    unsigned char indata[16] = {0x00};
+    unsigned char outdata[16] = {0x00};
     unsigned char aes_key[16] = {0x00};
-	unsigned char iv[16] = {0x00};
+    unsigned char iv[16] = {0x00};
 
-	for (i = 0; i < 32; i += 2) {
-		sscanf(&p_txt[i], "%02x", &tmp);
-		indata[i / 2] = tmp & 0xFF;
-		sscanf(&p_key[i], "%02x", &tmp);
-		aes_key[i / 2] = tmp & 0xFF;
-	}
+    for (i = 0; i < 32; i += 2) {
+        sscanf(&p_txt[i], "%02x", &tmp);
+        indata[i / 2] = tmp & 0xFF;
+        sscanf(&p_key[i], "%02x", &tmp);
+        aes_key[i / 2] = tmp & 0xFF;
+    }
 
     mbedtls_aes_context ctx;
     mbedtls_aes_init(&ctx);
-	mbedtls_aes_setkey_enc(&ctx, aes_key, 128);
-	mbedtls_aes_crypt_cbc(&ctx, MBEDTLS_AES_ENCRYPT, sizeof(indata), iv, indata, outdata );
-	//Push encrypted array as a string
-	lua_pushlstring(L,(const char *)&outdata, sizeof(outdata));
-	return 1;// return 1 to signal one return value
+    mbedtls_aes_setkey_enc(&ctx, aes_key, 128);
+    mbedtls_aes_crypt_cbc(&ctx, MBEDTLS_AES_ENCRYPT, sizeof(indata), iv, indata, outdata );
+    //Push encrypted array as a string
+    lua_pushlstring(L,(const char *)&outdata, sizeof(outdata));
+    return 1;// return 1 to signal one return value
 }
 
 static int l_aes128encrypt_ecb(lua_State *L) {
-	//Check number of arguments
-	int i;
-	uint32_t tmp;
+    //Check number of arguments
+    int i;
+    uint32_t tmp;
     size_t size;
     const char *p_key = luaL_checklstring(L, 1, &size);
     if (size != 32) return returnToLuaWithError(L,"Wrong size of key, got %d bytes, expected 32", (int) size);
 
     const char *p_txt = luaL_checklstring(L, 2, &size);
 
-	unsigned char indata[16] = {0x00};
-	unsigned char outdata[16] = {0x00};
+    unsigned char indata[16] = {0x00};
+    unsigned char outdata[16] = {0x00};
     unsigned char aes_key[16] = {0x00};
 
-	for (i = 0; i < 32; i += 2) {
-		sscanf(&p_txt[i], "%02x", &tmp);
-		indata[i / 2] = tmp & 0xFF;
-		sscanf(&p_key[i], "%02x", &tmp);
-		aes_key[i / 2] = tmp & 0xFF;
-	}
+    for (i = 0; i < 32; i += 2) {
+        sscanf(&p_txt[i], "%02x", &tmp);
+        indata[i / 2] = tmp & 0xFF;
+        sscanf(&p_key[i], "%02x", &tmp);
+        aes_key[i / 2] = tmp & 0xFF;
+    }
     mbedtls_aes_context ctx;
     mbedtls_aes_init(&ctx);
-	mbedtls_aes_setkey_enc(&ctx, aes_key, 128);
-	mbedtls_aes_crypt_ecb(&ctx, MBEDTLS_AES_ENCRYPT, indata, outdata );
-	//Push encrypted array as a string
-	lua_pushlstring(L,(const char *)&outdata, sizeof(outdata));
-	return 1;// return 1 to signal one return value
+    mbedtls_aes_setkey_enc(&ctx, aes_key, 128);
+    mbedtls_aes_crypt_ecb(&ctx, MBEDTLS_AES_ENCRYPT, indata, outdata );
+    //Push encrypted array as a string
+    lua_pushlstring(L,(const char *)&outdata, sizeof(outdata));
+    return 1;// return 1 to signal one return value
 }
 
 static int l_crc8legic(lua_State *L) {
-	size_t size;
-	const char *p_str = luaL_checklstring(L, 1, &size);
+    size_t size;
+    const char *p_str = luaL_checklstring(L, 1, &size);
 
-	uint16_t retval = CRC8Legic( (uint8_t*) p_str, size);
+    uint16_t retval = CRC8Legic( (uint8_t*) p_str, size);
     lua_pushunsigned(L, retval);
     return 1;
 }
 
 static int l_crc16(lua_State *L) {
-	size_t size;
-	const char *p_str = luaL_checklstring(L, 1, &size);
+    size_t size;
+    const char *p_str = luaL_checklstring(L, 1, &size);
 
-	uint16_t checksum = crc(CRC_CCITT,  (uint8_t*) p_str, size);
+    uint16_t checksum = crc(CRC_CCITT,  (uint8_t*) p_str, size);
     lua_pushunsigned(L, checksum);
     return 1;
 }
 
 static int l_crc64(lua_State *L) {
-	size_t size;
-	uint64_t crc = 0;
-	unsigned char outdata[8] = {0x00};
+    size_t size;
+    uint64_t crc = 0;
+    unsigned char outdata[8] = {0x00};
 
-	const char *p_str = luaL_checklstring(L, 1, &size);
+    const char *p_str = luaL_checklstring(L, 1, &size);
 
-	crc64( (uint8_t*) p_str, size, &crc);
+    crc64( (uint8_t*) p_str, size, &crc);
 
-	outdata[0] = (uint8_t)(crc >> 56) & 0xff;
-	outdata[1] = (uint8_t)(crc >> 48) & 0xff;
-	outdata[2] = (uint8_t)(crc >> 40) & 0xff;
-	outdata[3] = (uint8_t)(crc >> 32) & 0xff;
-	outdata[4] = (uint8_t)(crc >> 24) & 0xff;
-	outdata[5] = (uint8_t)(crc >> 16) & 0xff;
-	outdata[6] = (uint8_t)(crc >> 8) & 0xff;
-	outdata[7] = crc & 0xff;
-	lua_pushlstring(L,(const char *)&outdata, sizeof(outdata));
-	return 1;
+    outdata[0] = (uint8_t)(crc >> 56) & 0xff;
+    outdata[1] = (uint8_t)(crc >> 48) & 0xff;
+    outdata[2] = (uint8_t)(crc >> 40) & 0xff;
+    outdata[3] = (uint8_t)(crc >> 32) & 0xff;
+    outdata[4] = (uint8_t)(crc >> 24) & 0xff;
+    outdata[5] = (uint8_t)(crc >> 16) & 0xff;
+    outdata[6] = (uint8_t)(crc >> 8) & 0xff;
+    outdata[7] = crc & 0xff;
+    lua_pushlstring(L,(const char *)&outdata, sizeof(outdata));
+    return 1;
 }
 
 static int l_crc64_ecma182(lua_State *L) {
-	//size_t size;
-	uint64_t crc = 0;
-	unsigned char outdata[8] = {0x00};
-	//const char *p_str = luaL_checklstring(L, 1, &size);
+    //size_t size;
+    uint64_t crc = 0;
+    unsigned char outdata[8] = {0x00};
+    //const char *p_str = luaL_checklstring(L, 1, &size);
 
-	//init
-	//crc64_ecma182(NULL, 0, &crc);
-	crc = 0x338103260CC4;
+    //init
+    //crc64_ecma182(NULL, 0, &crc);
+    crc = 0x338103260CC4;
 
-	// calc hash
-	//crc64_ecma182((uint8_t*) p_str, size, &crc);
+    // calc hash
+    //crc64_ecma182((uint8_t*) p_str, size, &crc);
 
-	outdata[0] = (uint8_t)(crc >> 56) & 0xff;
-	outdata[1] = (uint8_t)(crc >> 48) & 0xff;
-	outdata[2] = (uint8_t)(crc >> 40) & 0xff;
-	outdata[3] = (uint8_t)(crc >> 32) & 0xff;
-	outdata[4] = (uint8_t)(crc >> 24) & 0xff;
-	outdata[5] = (uint8_t)(crc >> 16) & 0xff;
-	outdata[6] = (uint8_t)(crc >> 8) & 0xff;
-	outdata[7] = crc & 0xff;
-	lua_pushlstring(L, (const char *)&outdata, sizeof(outdata));
-	return 1;
+    outdata[0] = (uint8_t)(crc >> 56) & 0xff;
+    outdata[1] = (uint8_t)(crc >> 48) & 0xff;
+    outdata[2] = (uint8_t)(crc >> 40) & 0xff;
+    outdata[3] = (uint8_t)(crc >> 32) & 0xff;
+    outdata[4] = (uint8_t)(crc >> 24) & 0xff;
+    outdata[5] = (uint8_t)(crc >> 16) & 0xff;
+    outdata[6] = (uint8_t)(crc >> 8) & 0xff;
+    outdata[7] = crc & 0xff;
+    lua_pushlstring(L, (const char *)&outdata, sizeof(outdata));
+    return 1;
 }
 
 static int l_sha1(lua_State *L) {
-	size_t size;
-	const char *p_str = luaL_checklstring(L, 1, &size);
-	unsigned char outdata[20] = {0x00};
+    size_t size;
+    const char *p_str = luaL_checklstring(L, 1, &size);
+    unsigned char outdata[20] = {0x00};
     mbedtls_sha1( (uint8_t*) p_str, size, outdata);
     lua_pushlstring(L, (const char *)&outdata, sizeof(outdata));
     return 1;
@@ -517,26 +517,26 @@ static int l_reveng_models(lua_State *L){
 // This array needs to be adjusted if RevEng adds more crc-models.
 #define NMODELS 105
 
-	int count = 0;
-	uint8_t in_width = luaL_checkunsigned(L, 1);
-	if ( in_width > 89 ) return returnToLuaWithError(L,"Width cannot exceed 89, got %d", in_width);
+    int count = 0;
+    uint8_t in_width = luaL_checkunsigned(L, 1);
+    if ( in_width > 89 ) return returnToLuaWithError(L,"Width cannot exceed 89, got %d", in_width);
 
-	uint8_t width[NMODELS];
-	memset(width, 0, sizeof(width));
-	char *models[NMODELS];
+    uint8_t width[NMODELS];
+    memset(width, 0, sizeof(width));
+    char *models[NMODELS];
 
-	width[0] = in_width;
+    width[0] = in_width;
 
-	if (!GetModels(models, &count, width))
-		return returnToLuaWithError(L, "didn't find any models");
+    if (!GetModels(models, &count, width))
+        return returnToLuaWithError(L, "didn't find any models");
 
-	lua_newtable(L);
-	for (int i = 0; i < count; i++){
-		lua_pushstring(L,  (const char*)models[i]);
-		lua_rawseti(L,-2,i+1);
-		free(models[i]);
-	}
-	return 1;
+    lua_newtable(L);
+    for (int i = 0; i < count; i++){
+        lua_pushstring(L,  (const char*)models[i]);
+        lua_rawseti(L,-2,i+1);
+        free(models[i]);
+    }
+    return 1;
 }
 
 //Called with 4 parameters.
@@ -547,40 +547,40 @@ static int l_reveng_models(lua_State *L){
 //
 // outputs:  string with hex representation of the CRC result
 static int l_reveng_RunModel(lua_State *L){
-	//-c || -v
-	//inModel = valid model name string - CRC-8
-	//inHexStr = input hex string to calculate crc on
-	//reverse = reverse calc option if true
-	//endian = {0 = calc default endian input and output, b = big endian input and output, B = big endian output, r = right justified
-	//          l = little endian input and output, L = little endian output only, t = left justified}
-	//result = calculated crc hex string
-	char result[50];
+    //-c || -v
+    //inModel = valid model name string - CRC-8
+    //inHexStr = input hex string to calculate crc on
+    //reverse = reverse calc option if true
+    //endian = {0 = calc default endian input and output, b = big endian input and output, B = big endian output, r = right justified
+    //          l = little endian input and output, L = little endian output only, t = left justified}
+    //result = calculated crc hex string
+    char result[50];
 
-	const char *inModel = luaL_checkstring(L, 1);
-	const char *inHexStr = luaL_checkstring(L, 2);
+    const char *inModel = luaL_checkstring(L, 1);
+    const char *inHexStr = luaL_checkstring(L, 2);
     bool reverse =  lua_toboolean(L, 3);
-	const char endian = luaL_checkstring(L, 4)[0];
+    const char endian = luaL_checkstring(L, 4)[0];
 
-	int ans = RunModel( (char *)inModel, (char *)inHexStr, reverse, endian, result);
-	if (!ans)
-		return returnToLuaWithError(L,"Reveng failed");
+    int ans = RunModel( (char *)inModel, (char *)inHexStr, reverse, endian, result);
+    if (!ans)
+        return returnToLuaWithError(L,"Reveng failed");
 
-	lua_pushstring(L, (const char*)result);
-	return 1;
+    lua_pushstring(L, (const char*)result);
+    return 1;
 }
 
 static int l_hardnested(lua_State *L){
 
-	bool haveTarget = true;
+    bool haveTarget = true;
     size_t size;
-	uint32_t tmp;
+    uint32_t tmp;
     const char *p_blockno = luaL_checklstring(L, 1, &size);
     if(size != 2)  return returnToLuaWithError(L,"Wrong size of blockNo, got %d bytes, expected 2", (int) size);
 
     const char *p_keytype = luaL_checklstring(L, 2, &size);
     if(size != 1)  return returnToLuaWithError(L,"Wrong size of keyType, got %d bytes, expected 1", (int) size);
 
-	const char *p_key = luaL_checklstring(L, 3, &size);
+    const char *p_key = luaL_checklstring(L, 3, &size);
     if(size != 12)  return returnToLuaWithError(L,"Wrong size of key, got %d bytes, expected 12", (int) size);
 
     const char *p_trg_blockno = luaL_checklstring(L, 4, &size);
@@ -591,53 +591,53 @@ static int l_hardnested(lua_State *L){
 
     const char *p_trgkey = luaL_checklstring(L, 6, &size);
     if(size != 12)
-		haveTarget = false;
+        haveTarget = false;
 
-	const char *p_nonce_file_read = luaL_checklstring(L, 7, &size);
+    const char *p_nonce_file_read = luaL_checklstring(L, 7, &size);
     if(size != 1)  return returnToLuaWithError(L,"Wrong size of nonce_file_read, got %d bytes, expected 1", (int) size);
 
-	const char *p_nonce_file_write = luaL_checklstring(L, 8, &size);
+    const char *p_nonce_file_write = luaL_checklstring(L, 8, &size);
     if(size != 1)  return returnToLuaWithError(L,"Wrong size of nonce_file_write, got %d bytes, expected 1", (int) size);
 
-	const char *p_slow = luaL_checklstring(L, 9, &size);
+    const char *p_slow = luaL_checklstring(L, 9, &size);
     if(size != 1)  return returnToLuaWithError(L,"Wrong size of slow, got %d bytes, expected 1", (int) size);
 
-	const char *p_tests = luaL_checklstring(L, 10, &size);
+    const char *p_tests = luaL_checklstring(L, 10, &size);
     if(size != 1)  return returnToLuaWithError(L,"Wrong size of tests, got %d bytes, expected 1", (int) size);
 
-	char filename[FILE_PATH_SIZE]="nonces.bin";
-	const char *p_filename = luaL_checklstring(L, 11, &size);
-	if(size != 0)
-		memcpy(filename, p_filename, FILE_PATH_SIZE-1);
+    char filename[FILE_PATH_SIZE]="nonces.bin";
+    const char *p_filename = luaL_checklstring(L, 11, &size);
+    if(size != 0)
+        memcpy(filename, p_filename, FILE_PATH_SIZE-1);
 
-	uint32_t blockNo = 0, keyType = 0;
-	uint32_t trgBlockNo = 0, trgKeyType = 0;
-	uint32_t slow = 0, tests = 0;
-	uint32_t nonce_file_read = 0, nonce_file_write = 0;
+    uint32_t blockNo = 0, keyType = 0;
+    uint32_t trgBlockNo = 0, trgKeyType = 0;
+    uint32_t slow = 0, tests = 0;
+    uint32_t nonce_file_read = 0, nonce_file_write = 0;
     sscanf(p_blockno, "%02x", &blockNo);
-	sscanf(p_keytype, "%x", &keyType);
+    sscanf(p_keytype, "%x", &keyType);
     sscanf(p_trg_blockno, "%02x", &trgBlockNo);
-	sscanf(p_trg_keytype, "%x", &trgKeyType);
-	sscanf(p_nonce_file_read, "%x", &nonce_file_read);
-	sscanf(p_nonce_file_write, "%x", &nonce_file_write);
+    sscanf(p_trg_keytype, "%x", &trgKeyType);
+    sscanf(p_nonce_file_read, "%x", &nonce_file_read);
+    sscanf(p_nonce_file_write, "%x", &nonce_file_write);
 
-	sscanf(p_slow, "%x", &slow);
-	sscanf(p_tests, "%x", &tests);
+    sscanf(p_slow, "%x", &slow);
+    sscanf(p_tests, "%x", &tests);
 
-	uint8_t key[6] = {0,0,0,0,0,0};
+    uint8_t key[6] = {0,0,0,0,0,0};
     uint8_t trgkey[6] = {0,0,0,0,0,0};
-	for (int i = 0; i < 32; i += 2) {
-		sscanf(&p_key[i], "%02x", &tmp);
-		key[i / 2] = tmp & 0xFF;
-		if (haveTarget) {
-			sscanf(&p_trgkey[i], "%02x", &tmp);
-			trgkey[i / 2] = tmp & 0xFF;
-		}
-	}
+    for (int i = 0; i < 32; i += 2) {
+        sscanf(&p_key[i], "%02x", &tmp);
+        key[i / 2] = tmp & 0xFF;
+        if (haveTarget) {
+            sscanf(&p_trgkey[i], "%02x", &tmp);
+            trgkey[i / 2] = tmp & 0xFF;
+        }
+    }
 
     uint64_t foundkey = 0;
-	int retval = mfnestedhard(blockNo, keyType, key, trgBlockNo, trgKeyType, haveTarget ? trgkey : NULL, nonce_file_read,  nonce_file_write,  slow,  tests, &foundkey, filename);
-	DropField();
+    int retval = mfnestedhard(blockNo, keyType, key, trgBlockNo, trgKeyType, haveTarget ? trgkey : NULL, nonce_file_read,  nonce_file_write,  slow,  tests, &foundkey, filename);
+    DropField();
 
     //Push the key onto the stack
     uint8_t dest_key[6];
@@ -656,9 +656,9 @@ static int l_hardnested(lua_State *L){
  * @return
  */
 static int l_detect_prng(lua_State *L) {
-	int res = detect_classic_prng();
-	lua_pushinteger(L, res);
-	return 1;
+    int res = detect_classic_prng();
+    lua_pushinteger(L, res);
+    return 1;
 }
 /*
  * @brief l_keygen_algoD is a function to calculate pwd/pack using UID, by algo D
@@ -666,24 +666,24 @@ static int l_detect_prng(lua_State *L) {
  * @return
  */
 static int l_keygen_algoD(lua_State *L) {
-	size_t size;
-	uint32_t tmp;
+    size_t size;
+    uint32_t tmp;
     const char *p_uid = luaL_checklstring(L, 1, &size);
-	if (size != 14) return returnToLuaWithError(L,"Wrong size of UID, got %d bytes, expected 14", (int) size);
+    if (size != 14) return returnToLuaWithError(L,"Wrong size of UID, got %d bytes, expected 14", (int) size);
 
-	uint8_t uid[7] = {0,0,0,0,0,0,0};
+    uint8_t uid[7] = {0,0,0,0,0,0,0};
 
-	for (int i = 0; i < 14; i += 2) {
-		sscanf(&p_uid[i], "%02x", &tmp);
-		uid[i / 2] = tmp & 0xFF;
-	}
+    for (int i = 0; i < 14; i += 2) {
+        sscanf(&p_uid[i], "%02x", &tmp);
+        uid[i / 2] = tmp & 0xFF;
+    }
 
-	uint32_t pwd = ul_ev1_pwdgenD(uid);
-	uint16_t pack = ul_ev1_packgenD(uid);
+    uint32_t pwd = ul_ev1_pwdgenD(uid);
+    uint16_t pack = ul_ev1_packgenD(uid);
 
-	lua_pushunsigned(L, pwd);
-	lua_pushunsigned(L, pack);
-	return 2;
+    lua_pushunsigned(L, pwd);
+    lua_pushunsigned(L, pack);
+    return 2;
 }
 
 /**
@@ -705,40 +705,40 @@ int setLuaPath( lua_State* L, const char* path ) {
     lua_pushstring( L, buf ); // push the new one
     lua_setfield( L, -2, "path" ); // set the field "path" in table at -2 with value at top of stack
     lua_pop( L, 1 ); // get rid of package table from top of stack
-	free(buf);
-	return 0; // all done!
+    free(buf);
+    return 0; // all done!
 }
 
 int set_pm3_libraries(lua_State *L) {
     static const luaL_Reg libs[] = {
         {"SendCommand",                 l_SendCommand},
-		{"GetFromBigBuf",               l_GetFromBigBuf},
-		{"GetFromFlashMem",            	l_GetFromFlashMem},
+        {"GetFromBigBuf",               l_GetFromBigBuf},
+        {"GetFromFlashMem",             l_GetFromFlashMem},
         {"WaitForResponseTimeout",      l_WaitForResponseTimeout},
-		{"mfDarkside",                  l_mfDarkside},
+        {"mfDarkside",                  l_mfDarkside},
         {"foobar",                      l_foobar},
         {"ukbhit",                      l_ukbhit},
         {"clearCommandBuffer",          l_clearCommandBuffer},
-		{"console",                     l_CmdConsole},
-		{"iso15693_crc",                l_iso15693_crc},
-		{"iso14443b_crc",				l_iso14443b_crc},
-		{"aes128_decrypt",              l_aes128decrypt_cbc},
-		{"aes128_decrypt_ecb",          l_aes128decrypt_ecb},
-		{"aes128_encrypt",              l_aes128encrypt_cbc},
-		{"aes128_encrypt_ecb",          l_aes128encrypt_ecb},
-		{"crc8legic",					l_crc8legic},
-		{"crc16",                       l_crc16},
-		{"crc64",                       l_crc64},
-		{"crc64_ecma182",				l_crc64_ecma182},
-		{"sha1",						l_sha1},
-		{"reveng_models",				l_reveng_models},
-		{"reveng_runmodel",				l_reveng_RunModel},
-		{"hardnested",					l_hardnested},
-		{"detect_prng",					l_detect_prng},
-//		{"keygen.algoA",				l_keygen_algoA},
-//		{"keygen.algoB",				l_keygen_algoB},
-//		{"keygen.algoC",				l_keygen_algoC},
-		{"keygen_algo_d",				l_keygen_algoD},
+        {"console",                     l_CmdConsole},
+        {"iso15693_crc",                l_iso15693_crc},
+        {"iso14443b_crc",               l_iso14443b_crc},
+        {"aes128_decrypt",              l_aes128decrypt_cbc},
+        {"aes128_decrypt_ecb",          l_aes128decrypt_ecb},
+        {"aes128_encrypt",              l_aes128encrypt_cbc},
+        {"aes128_encrypt_ecb",          l_aes128encrypt_ecb},
+        {"crc8legic",                   l_crc8legic},
+        {"crc16",                       l_crc16},
+        {"crc64",                       l_crc64},
+        {"crc64_ecma182",               l_crc64_ecma182},
+        {"sha1",                        l_sha1},
+        {"reveng_models",               l_reveng_models},
+        {"reveng_runmodel",             l_reveng_RunModel},
+        {"hardnested",                  l_hardnested},
+        {"detect_prng",                 l_detect_prng},
+//        {"keygen.algoA",                l_keygen_algoA},
+//        {"keygen.algoB",                l_keygen_algoB},
+//        {"keygen.algoC",                l_keygen_algoC},
+        {"keygen_algo_d",               l_keygen_algoD},
         {NULL, NULL}
     };
 
@@ -759,20 +759,20 @@ int set_pm3_libraries(lua_State *L) {
     lua_pop(L, 1);
 
 
-	//--add to the LUA_PATH (package.path in lua)
+    //--add to the LUA_PATH (package.path in lua)
     // so we can load scripts from the ./scripts/ - directory
-	char scripts_path[strlen(get_my_executable_directory()) + strlen(LUA_SCRIPTS_DIRECTORY) + strlen(LUA_LIBRARIES_WILDCARD) + 1];
-	strcpy(scripts_path, get_my_executable_directory());
-	strcat(scripts_path, LUA_SCRIPTS_DIRECTORY);
-	strcat(scripts_path, LUA_LIBRARIES_WILDCARD);
-	setLuaPath(L, scripts_path);
+    char scripts_path[strlen(get_my_executable_directory()) + strlen(LUA_SCRIPTS_DIRECTORY) + strlen(LUA_LIBRARIES_WILDCARD) + 1];
+    strcpy(scripts_path, get_my_executable_directory());
+    strcat(scripts_path, LUA_SCRIPTS_DIRECTORY);
+    strcat(scripts_path, LUA_LIBRARIES_WILDCARD);
+    setLuaPath(L, scripts_path);
 
     //-- Last but not least, add to the LUA_PATH (package.path in lua)
     // so we can load libraries from the ./lualib/ - directory
-	char libraries_path[strlen(get_my_executable_directory()) + strlen(LUA_LIBRARIES_DIRECTORY) + strlen(LUA_LIBRARIES_WILDCARD) + 1];
-	strcpy(libraries_path, get_my_executable_directory());
-	strcat(libraries_path, LUA_LIBRARIES_DIRECTORY);
-	strcat(libraries_path, LUA_LIBRARIES_WILDCARD);
-	setLuaPath(L, libraries_path);
+    char libraries_path[strlen(get_my_executable_directory()) + strlen(LUA_LIBRARIES_DIRECTORY) + strlen(LUA_LIBRARIES_WILDCARD) + 1];
+    strcpy(libraries_path, get_my_executable_directory());
+    strcat(libraries_path, LUA_LIBRARIES_DIRECTORY);
+    strcat(libraries_path, LUA_LIBRARIES_WILDCARD);
+    setLuaPath(L, libraries_path);
     return 1;
 }
\ No newline at end of file
diff --git a/client/scripting.h b/client/scripting.h
index 81b95cbe0..ca405f43f 100644
--- a/client/scripting.h
+++ b/client/scripting.h
@@ -30,9 +30,9 @@
 #include "cmdhfmfu.h"
 #include "protocols.h"
 
-#define LUA_LIBRARIES_DIRECTORY 	"lualibs/"
-#define LUA_SCRIPTS_DIRECTORY 		"scripts/"
-#define LUA_LIBRARIES_WILDCARD 		"?.lua"
+#define LUA_LIBRARIES_DIRECTORY "lualibs/"
+#define LUA_SCRIPTS_DIRECTORY   "scripts/"
+#define LUA_LIBRARIES_WILDCARD  "?.lua"
 
 /**
  * @brief set_libraries loads the core components of pm3 into the 'pm3'
diff --git a/client/ui.c b/client/ui.c
index 96049f6cf..c2b7db003 100644
--- a/client/ui.c
+++ b/client/ui.c
@@ -22,188 +22,188 @@ pthread_mutex_t print_lock = PTHREAD_MUTEX_INITIALIZER;
 static char *logfilename = "proxmark3.log";
 
 void PrintAndLogOptions(char *str[][2], size_t size, size_t space) {
-	char buff[2000] = "Options:\n";
-	char format[2000] = "";
-	size_t counts[2] = {0, 0};
-	for (int i = 0; i < size; i++)
-		for (int j = 0 ; j < 2 ; j++)
-			if (counts[j] < strlen(str[i][j])) {
-				counts[j] = strlen(str[i][j]);
-			}
-	for (int i = 0; i < size; i++) {
-		for (int j = 0; j < 2; j++) {
-			if (j == 0)
-			    snprintf(format, sizeof(format), "%%%zus%%%zus", space, counts[j]);
+    char buff[2000] = "Options:\n";
+    char format[2000] = "";
+    size_t counts[2] = {0, 0};
+    for (int i = 0; i < size; i++)
+        for (int j = 0 ; j < 2 ; j++)
+            if (counts[j] < strlen(str[i][j])) {
+                counts[j] = strlen(str[i][j]);
+            }
+    for (int i = 0; i < size; i++) {
+        for (int j = 0; j < 2; j++) {
+            if (j == 0)
+                snprintf(format, sizeof(format), "%%%zus%%%zus", space, counts[j]);
             else
                 snprintf(format, sizeof(format), "%%%zus%%-%zus", space, counts[j]);
-			snprintf(buff + strlen(buff), sizeof(buff) - strlen(buff), format, " ", str[i][j]);
-		}
-		if (i < size-1)
-			strncat(buff, "\n", sizeof(buff)-strlen(buff) -1);
+            snprintf(buff + strlen(buff), sizeof(buff) - strlen(buff), format, " ", str[i][j]);
+        }
+        if (i < size-1)
+            strncat(buff, "\n", sizeof(buff)-strlen(buff) -1);
     }
     PrintAndLogEx(NORMAL, "%s", buff);
 }
 void PrintAndLogEx(logLevel_t level, char *fmt, ...) {
 
-	// skip debug messages if client debugging is turned off i.e. 'DATA SETDEBUG 0'
-	if (g_debugMode	== 0 && level == DEBUG)
-		return;
+    // skip debug messages if client debugging is turned off i.e. 'DATA SETDEBUG 0'
+    if (g_debugMode == 0 && level == DEBUG)
+        return;
 
-	char prefix[20] = {0};
-	char buffer[MAX_PRINT_BUFFER] = {0};
-	char buffer2[MAX_PRINT_BUFFER+20] = {0};
-	char *token = NULL;
-	int size = 0;
-						//   {NORMAL, SUCCESS, INFO, FAILED, WARNING, ERR, DEBUG}
-	static char *prefixes[7] = { "", "[+] ", "[=] ", "[-] ", "[!] ", "[!!] ", "[#] "};
+    char prefix[20] = {0};
+    char buffer[MAX_PRINT_BUFFER] = {0};
+    char buffer2[MAX_PRINT_BUFFER+20] = {0};
+    char *token = NULL;
+    int size = 0;
+                        //   {NORMAL, SUCCESS, INFO, FAILED, WARNING, ERR, DEBUG}
+    static char *prefixes[7] = { "", "[+] ", "[=] ", "[-] ", "[!] ", "[!!] ", "[#] "};
 
-	switch( level ) {
-		case ERR:
-			strncpy(prefix,_RED_([!!] ), sizeof(prefix)-1);
-			break;
-		case FAILED:
-			strncpy(prefix,_RED_([-] ), sizeof(prefix)-1);
-			break;
-		case DEBUG:
-			strncpy(prefix,_BLUE_([#] ), sizeof(prefix)-1);
-			break;
-		case SUCCESS:
-			strncpy(prefix,_GREEN_([+] ), sizeof(prefix)-1);
-			break;
-		case WARNING:
-			strncpy(prefix,_CYAN_([!] ), sizeof(prefix)-1);
-			break;
-		default:
-			strncpy(prefix, prefixes[level], sizeof(prefix)-1);
-			break;
-	}
+    switch( level ) {
+        case ERR:
+            strncpy(prefix,_RED_([!!] ), sizeof(prefix)-1);
+            break;
+        case FAILED:
+            strncpy(prefix,_RED_([-] ), sizeof(prefix)-1);
+            break;
+        case DEBUG:
+            strncpy(prefix,_BLUE_([#] ), sizeof(prefix)-1);
+            break;
+        case SUCCESS:
+            strncpy(prefix,_GREEN_([+] ), sizeof(prefix)-1);
+            break;
+        case WARNING:
+            strncpy(prefix,_CYAN_([!] ), sizeof(prefix)-1);
+            break;
+        default:
+            strncpy(prefix, prefixes[level], sizeof(prefix)-1);
+            break;
+    }
 
-	va_list args;
-	va_start(args, fmt);
-	vsnprintf(buffer, sizeof(buffer), fmt, args);
-	va_end(args);
+    va_list args;
+    va_start(args, fmt);
+    vsnprintf(buffer, sizeof(buffer), fmt, args);
+    va_end(args);
 
-	// no prefixes for normal
-	if ( level == NORMAL ) {
-		PrintAndLog("%s", buffer);
-		return;
-	}
+    // no prefixes for normal
+    if ( level == NORMAL ) {
+        PrintAndLog("%s", buffer);
+        return;
+    }
 
-	if (strchr(buffer, '\n')) {
+    if (strchr(buffer, '\n')) {
 
-		const char delim[2] = "\n";
+        const char delim[2] = "\n";
 
-		// line starts with newline
-		if (buffer[0] == '\n')
-			PrintAndLog("");
+        // line starts with newline
+        if (buffer[0] == '\n')
+            PrintAndLog("");
 
-		token = strtok(buffer, delim);
+        token = strtok(buffer, delim);
 
-		while (token != NULL) {
+        while (token != NULL) {
 
-			size = strlen(buffer2);
+            size = strlen(buffer2);
 
-			if (strlen(token))
-				snprintf(buffer2+size, sizeof(buffer2)-size, "%s%s\n", prefix, token);
-			else
-				snprintf(buffer2+size, sizeof(buffer2)-size, "\n");
+            if (strlen(token))
+                snprintf(buffer2+size, sizeof(buffer2)-size, "%s%s\n", prefix, token);
+            else
+                snprintf(buffer2+size, sizeof(buffer2)-size, "\n");
 
-			token = strtok(NULL, delim);
-		}
-		PrintAndLog("%s", buffer2);
-	} else {
-		snprintf(buffer2, sizeof(buffer2), "%s%s", prefix, buffer);
-		PrintAndLog("%s", buffer2);
-	}
+            token = strtok(NULL, delim);
+        }
+        PrintAndLog("%s", buffer2);
+    } else {
+        snprintf(buffer2, sizeof(buffer2), "%s%s", prefix, buffer);
+        PrintAndLog("%s", buffer2);
+    }
 }
 
 void PrintAndLog(char *fmt, ...) {
-	char *saved_line;
-	int saved_point;
-	va_list argptr, argptr2;
-	static FILE *logfile = NULL;
-	static int logging = 1;
+    char *saved_line;
+    int saved_point;
+    va_list argptr, argptr2;
+    static FILE *logfile = NULL;
+    static int logging = 1;
 
-	// lock this section to avoid interlacing prints from different threads
-	pthread_mutex_lock(&print_lock);
+    // lock this section to avoid interlacing prints from different threads
+    pthread_mutex_lock(&print_lock);
 
-	if (logging && !logfile) {
-		logfile = fopen(logfilename, "a");
-		if (!logfile) {
-			fprintf(stderr, "Can't open logfile, logging disabled!\n");
-			logging = 0;
-		}
-	}
+    if (logging && !logfile) {
+        logfile = fopen(logfilename, "a");
+        if (!logfile) {
+            fprintf(stderr, "Can't open logfile, logging disabled!\n");
+            logging = 0;
+        }
+    }
 
 
 // If there is an incoming message from the hardware (eg: lf hid read) in
 // the background (while the prompt is displayed and accepting user input),
 // stash the prompt and bring it back later.
 #ifdef RL_STATE_READCMD
-	// We are using GNU readline. libedit (OSX) doesn't support this flag.
-	int need_hack = (rl_readline_state & RL_STATE_READCMD) > 0;
+    // We are using GNU readline. libedit (OSX) doesn't support this flag.
+    int need_hack = (rl_readline_state & RL_STATE_READCMD) > 0;
 
-	if (need_hack) {
-		saved_point = rl_point;
-		saved_line = rl_copy_text(0, rl_end);
-		rl_save_prompt();
-		rl_replace_line("", 0);
-		rl_redisplay();
-	}
+    if (need_hack) {
+        saved_point = rl_point;
+        saved_line = rl_copy_text(0, rl_end);
+        rl_save_prompt();
+        rl_replace_line("", 0);
+        rl_redisplay();
+    }
 #endif
 
-	va_start(argptr, fmt);
-	va_copy(argptr2, argptr);
-	vprintf(fmt, argptr);
-	printf("          "); // cleaning prompt
-	va_end(argptr);
-	printf("\n");
+    va_start(argptr, fmt);
+    va_copy(argptr2, argptr);
+    vprintf(fmt, argptr);
+    printf("          "); // cleaning prompt
+    va_end(argptr);
+    printf("\n");
 
 #ifdef RL_STATE_READCMD
-	// We are using GNU readline. libedit (OSX) doesn't support this flag.
-	if (need_hack) {
-		rl_restore_prompt();
-		rl_replace_line(saved_line, 0);
-		rl_point = saved_point;
-		rl_redisplay();
-		free(saved_line);
-	}
+    // We are using GNU readline. libedit (OSX) doesn't support this flag.
+    if (need_hack) {
+        rl_restore_prompt();
+        rl_replace_line(saved_line, 0);
+        rl_point = saved_point;
+        rl_redisplay();
+        free(saved_line);
+    }
 #endif
 
-	if (logging && logfile) {
-		vfprintf(logfile, fmt, argptr2);
-		fprintf(logfile, "\n");
-		fflush(logfile);
-	}
-	va_end(argptr2);
+    if (logging && logfile) {
+        vfprintf(logfile, fmt, argptr2);
+        fprintf(logfile, "\n");
+        fflush(logfile);
+    }
+    va_end(argptr2);
 
-	if (flushAfterWrite)
-		fflush(stdout);
+    if (flushAfterWrite)
+        fflush(stdout);
 
-	//release lock
-	pthread_mutex_unlock(&print_lock);
+    //release lock
+    pthread_mutex_unlock(&print_lock);
 }
 
 void SetLogFilename(char *fn) {
-	logfilename = fn;
+    logfilename = fn;
 }
 
 void SetFlushAfterWrite(bool value) {
-	flushAfterWrite = value;
+    flushAfterWrite = value;
 }
 
  void iceIIR_Butterworth(int *data, const size_t len){
 
-	int i,j;
+    int i,j;
 
-	int * output =  (int* ) calloc(sizeof(int) * len, sizeof(uint8_t));
-	if ( !output ) return;
+    int * output =  (int* ) calloc(sizeof(int) * len, sizeof(uint8_t));
+    if ( !output ) return;
 
-	// clear mem
-	memset(output, 0x00, len);
+    // clear mem
+    memset(output, 0x00, len);
 
-	size_t adjustedLen = len;
-	float fc = 0.1125f;          // center frequency
+    size_t adjustedLen = len;
+    float fc = 0.1125f;          // center frequency
 
     // create very simple low-pass filter to remove images (2nd-order Butterworth)
     float complex iir_buf[3] = {0,0,0};
@@ -214,9 +214,9 @@ void SetFlushAfterWrite(bool value) {
     float complex x_prime  = 1.0f;   // save sample for estimating frequency
     float complex x;
 
-	for (i = 0; i < adjustedLen; ++i) {
+    for (i = 0; i < adjustedLen; ++i) {
 
-		sample = data[i];
+        sample = data[i];
 
         // remove DC offset and mix to complex baseband
         x = (sample - 127.5f) * cexpf( _Complex_I * 2 * M_PI * fc * i );
@@ -234,15 +234,15 @@ void SetFlushAfterWrite(bool value) {
         float freq = cargf(x * conjf(x_prime));
         x_prime = x;    // retain this sample for next iteration
 
-		output[i] =(freq > 0) ? 127 : -127;
+        output[i] =(freq > 0) ? 127 : -127;
     }
 
-	// show data
-	//memcpy(data, output, adjustedLen);
-	for (j=0; j<adjustedLen; ++j)
-		data[j] = output[j];
+    // show data
+    //memcpy(data, output, adjustedLen);
+    for (j=0; j<adjustedLen; ++j)
+        data[j] = output[j];
 
-	free(output);
+    free(output);
 }
 
 void iceSimple_Filter(int *data, const size_t len, uint8_t k){
@@ -250,20 +250,20 @@ void iceSimple_Filter(int *data, const size_t len, uint8_t k){
 // parameter K
 #define FILTER_SHIFT 4
 
-	int32_t filter_reg = 0;
-	int16_t input, output;
-	int8_t shift = (k <=8 ) ? k : FILTER_SHIFT;
+    int32_t filter_reg = 0;
+    int16_t input, output;
+    int8_t shift = (k <=8 ) ? k : FILTER_SHIFT;
 
-	for (int i = 0; i < len; ++i){
+    for (int i = 0; i < len; ++i){
 
-		input = data[i];
-		// Update filter with current sample
-		filter_reg = filter_reg - (filter_reg >> shift) + input;
+        input = data[i];
+        // Update filter with current sample
+        filter_reg = filter_reg - (filter_reg >> shift) + input;
 
-		// Scale output for unity gain
-		output = filter_reg >> shift;
-		data[i] = output;
-	}
+        // Scale output for unity gain
+        output = filter_reg >> shift;
+        data[i] = output;
+    }
 }
 
 float complex cexpf (float complex Z) {
diff --git a/client/usb_cmd_h2lua.awk b/client/usb_cmd_h2lua.awk
index 8e003562a..e18bea523 100644
--- a/client/usb_cmd_h2lua.awk
+++ b/client/usb_cmd_h2lua.awk
@@ -1,15 +1,15 @@
 BEGIN {
-	print "--[["
-	print "These are Proxmark command definitions."
-	print "This file is automatically generated from usb_cmd.h - DON'T EDIT MANUALLY."
-	print "--]]"
-	print "local __commands = {"
+    print "--[["
+    print "These are Proxmark command definitions."
+    print "This file is automatically generated from usb_cmd.h - DON'T EDIT MANUALLY."
+    print "--]]"
+    print "local __commands = {"
 }
 
 #$1 ~ /#define/ && $2 ~ /^CMD_([[:alnum:]_])+/ { print $2, "=", $3, "," }
 $1 ~ /#define/ && $2 ~ /^CMD_[A-Za-z0-9_]+/ { sub(/\r/, ""); print $2, "=", $3 "," }
 
 END {
-	print "}"
-	print "return __commands"
+    print "}"
+    print "return __commands"
 }
diff --git a/client/util.c b/client/util.c
index 99c44ff13..2adb2bf4d 100644
--- a/client/util.c
+++ b/client/util.c
@@ -26,32 +26,32 @@ uint8_t g_debugMode = 0;
 #include <stdarg.h>
 
 int ukbhit(void) {
-	int cnt = 0;
-	int error;
-	static struct termios Otty, Ntty;
+    int cnt = 0;
+    int error;
+    static struct termios Otty, Ntty;
 
-	if ( tcgetattr(STDIN_FILENO, &Otty) == -1) return -1;
+    if ( tcgetattr(STDIN_FILENO, &Otty) == -1) return -1;
 
-	Ntty = Otty;
+    Ntty = Otty;
 
-	Ntty.c_iflag          = 0x0000;   // input mode
-	Ntty.c_oflag          = 0x0000;   // output mode
-	Ntty.c_lflag		&= ~ICANON;	// control mode = raw
-	Ntty.c_cc[VMIN]		= 1;		// return if at least 1 character is in the queue
-	Ntty.c_cc[VTIME]	= 0;		// no timeout. Wait forever
+    Ntty.c_iflag          = 0x0000;   // input mode
+    Ntty.c_oflag          = 0x0000;   // output mode
+    Ntty.c_lflag          &= ~ICANON; // control mode = raw
+    Ntty.c_cc[VMIN]       = 1;        // return if at least 1 character is in the queue
+    Ntty.c_cc[VTIME]      = 0;        // no timeout. Wait forever
 
-	if (0 == (error = tcsetattr(STDIN_FILENO, TCSANOW, &Ntty))) {	// set new attributes
-		error += ioctl(STDIN_FILENO, FIONREAD, &cnt);				// get number of characters available
-		error += tcsetattr(STDIN_FILENO, TCSANOW, &Otty);			// reset attributes
-	}
-	return ( error == 0 ? cnt : -1 );
+    if (0 == (error = tcsetattr(STDIN_FILENO, TCSANOW, &Ntty))) {  // set new attributes
+        error += ioctl(STDIN_FILENO, FIONREAD, &cnt);              // get number of characters available
+        error += tcsetattr(STDIN_FILENO, TCSANOW, &Otty);          // reset attributes
+    }
+    return ( error == 0 ? cnt : -1 );
 }
 
 #else
 
 #include <conio.h>
 int ukbhit(void) {
-	return kbhit();
+    return kbhit();
 }
 #endif
 
@@ -59,46 +59,46 @@ int ukbhit(void) {
 
 // open, appped and close logfile
 void AddLogLine(char *fn, char *data, char *c) {
-	FILE *f = NULL;
+    FILE *f = NULL;
     char filename[FILE_PATH_SIZE] = {0x00};
     int len = 0;
 
     len = strlen(fn);
     if (len > FILE_PATH_SIZE)
-		len = FILE_PATH_SIZE;
+        len = FILE_PATH_SIZE;
     memcpy(filename, fn, len);
 
-	f = fopen(filename, "a");
-	if (!f) {
-		printf("Could not append log file %s", filename);
-		return;
-	}
+    f = fopen(filename, "a");
+    if (!f) {
+        printf("Could not append log file %s", filename);
+        return;
+    }
 
-	fprintf(f, "%s", data);
-	fprintf(f, "%s\n", c);
-	fflush(f);
-	fclose(f);
+    fprintf(f, "%s", data);
+    fprintf(f, "%s\n", c);
+    fflush(f);
+    fclose(f);
 }
 
 void AddLogHex(char *fn, char *extData, const uint8_t * data, const size_t len){
-	AddLogLine(fn, extData, sprint_hex(data, len));
+    AddLogLine(fn, extData, sprint_hex(data, len));
 }
 
 void AddLogUint64(char *fn, char *data, const uint64_t value) {
-	char buf[20] = {0};
-	memset(buf, 0x00, sizeof(buf));
-	sprintf(buf, "%016" PRIx64 "", value);
-	AddLogLine(fn, data, buf);
+    char buf[20] = {0};
+    memset(buf, 0x00, sizeof(buf));
+    sprintf(buf, "%016" PRIx64 "", value);
+    AddLogLine(fn, data, buf);
 }
 
 void AddLogCurrentDT(char *fn) {
-	char buf[20];
-	memset(buf, 0x00, sizeof(buf));
-	struct tm *curTime;
-	time_t now = time(0);
-	curTime = gmtime(&now);
-	strftime (buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", curTime);
-	AddLogLine(fn, "\nanticollision: ", buf);
+    char buf[20];
+    memset(buf, 0x00, sizeof(buf));
+    struct tm *curTime;
+    time_t now = time(0);
+    curTime = gmtime(&now);
+    strftime (buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", curTime);
+    AddLogLine(fn, "\nanticollision: ", buf);
 }
 
 // create filename on hex uid.
@@ -107,290 +107,290 @@ void AddLogCurrentDT(char *fn) {
 // param *ext  -  ".log"
 // param uidlen - length of uid array.
 void FillFileNameByUID(char *filenamePrefix, uint8_t *uid, const char *ext, int uidlen) {
-	if ( filenamePrefix == NULL || uid == NULL || ext == NULL ){
-		printf("[!] error parameter is NULL\n");
-		return;
-	}
+    if ( filenamePrefix == NULL || uid == NULL || ext == NULL ){
+        printf("[!] error parameter is NULL\n");
+        return;
+    }
 
-	int len = 0;
-	len = strlen(filenamePrefix);
-	//memset(fn, 0x00, FILE_PATH_SIZE);
+    int len = 0;
+    len = strlen(filenamePrefix);
+    //memset(fn, 0x00, FILE_PATH_SIZE);
 
-	for (int j = 0; j < uidlen; j++)
-		sprintf(filenamePrefix + len + j * 2, "%02X", uid[j]);
-	strcat(filenamePrefix, ext);
+    for (int j = 0; j < uidlen; j++)
+        sprintf(filenamePrefix + len + j * 2, "%02X", uid[j]);
+    strcat(filenamePrefix, ext);
 }
 
 // fill buffer from structure [{uint8_t data, size_t length},...]
 int FillBuffer(uint8_t *data, size_t maxDataLength, size_t *dataLength, ...) {
-	*dataLength = 0;
-	va_list valist;
-	va_start(valist, dataLength);
+    *dataLength = 0;
+    va_list valist;
+    va_start(valist, dataLength);
 
-	uint8_t *vdata = NULL;
-	size_t vlength = 0;
-	do{
-		vdata = va_arg(valist, uint8_t *);
-		if (!vdata)
-			break;
+    uint8_t *vdata = NULL;
+    size_t vlength = 0;
+    do{
+        vdata = va_arg(valist, uint8_t *);
+        if (!vdata)
+            break;
 
-		vlength = va_arg(valist, size_t);
-		if (*dataLength + vlength >  maxDataLength) {
-			va_end(valist);
-			return 1;
-		}
+        vlength = va_arg(valist, size_t);
+        if (*dataLength + vlength >  maxDataLength) {
+            va_end(valist);
+            return 1;
+        }
 
-		memcpy(&data[*dataLength], vdata, vlength);
-		*dataLength += vlength;
+        memcpy(&data[*dataLength], vdata, vlength);
+        *dataLength += vlength;
 
-	} while (vdata);
+    } while (vdata);
 
-	va_end(valist);
+    va_end(valist);
 
-	return 0;
+    return 0;
 }
 
 bool CheckStringIsHEXValue(const char *value) {
-	for (int i = 0; i < strlen(value); i++)
-		if (!isxdigit(value[i]))
-			return false;
+    for (int i = 0; i < strlen(value); i++)
+        if (!isxdigit(value[i]))
+            return false;
 
-	if (strlen(value) % 2)
-		return false;
+    if (strlen(value) % 2)
+        return false;
 
-	return true;
+    return true;
 }
 
 void hex_to_buffer(const uint8_t *buf, const uint8_t *hex_data, const size_t hex_len, const size_t hex_max_len,
-	const size_t min_str_len, const size_t spaces_between, bool uppercase) {
+    const size_t min_str_len, const size_t spaces_between, bool uppercase) {
 
-	char *tmp = (char *)buf;
-	size_t i;
-	memset(tmp, 0x00, hex_max_len);
+    char *tmp = (char *)buf;
+    size_t i;
+    memset(tmp, 0x00, hex_max_len);
 
-	int maxLen = ( hex_len > hex_max_len) ? hex_max_len : hex_len;
+    int maxLen = ( hex_len > hex_max_len) ? hex_max_len : hex_len;
 
-	for (i = 0; i < maxLen; ++i, tmp += 2 + spaces_between) {
-		sprintf(tmp, (uppercase) ? "%02X" : "%02x", (unsigned int) hex_data[i]);
+    for (i = 0; i < maxLen; ++i, tmp += 2 + spaces_between) {
+        sprintf(tmp, (uppercase) ? "%02X" : "%02x", (unsigned int) hex_data[i]);
 
-		for (int j = 0; j < spaces_between; j++)
-			sprintf(tmp + 2 + j, " ");
-	}
+        for (int j = 0; j < spaces_between; j++)
+            sprintf(tmp + 2 + j, " ");
+    }
 
-	i *= (2 + spaces_between);
-	int minStrLen = min_str_len > i ? min_str_len : 0;
-	if (minStrLen > hex_max_len)
-		minStrLen = hex_max_len;
-	for(; i < minStrLen; i++, tmp += 1)
-		sprintf(tmp, " ");
+    i *= (2 + spaces_between);
+    int minStrLen = min_str_len > i ? min_str_len : 0;
+    if (minStrLen > hex_max_len)
+        minStrLen = hex_max_len;
+    for(; i < minStrLen; i++, tmp += 1)
+        sprintf(tmp, " ");
 
-	return;
+    return;
 }
 
 // printing and converting functions
 void print_hex(const uint8_t *data, const size_t len) {
-	size_t i;
-	for (i=0; i < len; i++)
-		printf("%02x ", data[i]);
-	printf("\n");
+    size_t i;
+    for (i=0; i < len; i++)
+        printf("%02x ", data[i]);
+    printf("\n");
 }
 
 void print_hex_break(const uint8_t *data, const size_t len, uint8_t breaks) {
-	int rownum = 0;
-	printf("[%02d] | ", rownum);
-	for (int i = 0; i < len; ++i) {
+    int rownum = 0;
+    printf("[%02d] | ", rownum);
+    for (int i = 0; i < len; ++i) {
 
-		printf("%02X ", data[i]);
+        printf("%02X ", data[i]);
 
-		// check if a line break is needed
-		if ( breaks > 0 && !((i+1) % breaks) && (i+1 < len) ) {
-			++rownum;
-			printf("\n[%02d] | ", rownum);
-		}
-	}
-	printf("\n");
+        // check if a line break is needed
+        if ( breaks > 0 && !((i+1) % breaks) && (i+1 < len) ) {
+            ++rownum;
+            printf("\n[%02d] | ", rownum);
+        }
+    }
+    printf("\n");
 }
 
 char *sprint_hex(const uint8_t *data, const size_t len) {
-	static char buf[UTIL_BUFFER_SIZE_SPRINT - 3] = {0};
-	hex_to_buffer((uint8_t *)buf, data, len, sizeof(buf) - 1, 0, 1, true);
-	return buf;
+    static char buf[UTIL_BUFFER_SIZE_SPRINT - 3] = {0};
+    hex_to_buffer((uint8_t *)buf, data, len, sizeof(buf) - 1, 0, 1, true);
+    return buf;
 }
 
 char *sprint_hex_inrow_ex(const uint8_t *data, const size_t len, const size_t min_str_len) {
-	static char buf[UTIL_BUFFER_SIZE_SPRINT] = {0};
-	hex_to_buffer((uint8_t *)buf, data, len, sizeof(buf) - 1, min_str_len, 0, true);
-	return buf;
+    static char buf[UTIL_BUFFER_SIZE_SPRINT] = {0};
+    hex_to_buffer((uint8_t *)buf, data, len, sizeof(buf) - 1, min_str_len, 0, true);
+    return buf;
 }
 
 char *sprint_hex_inrow(const uint8_t *data, const size_t len) {
-	return sprint_hex_inrow_ex(data, len, 0);
+    return sprint_hex_inrow_ex(data, len, 0);
 }
 char *sprint_hex_inrow_spaces(const uint8_t *data, const size_t len, size_t spaces_between) {
-	static char buf[UTIL_BUFFER_SIZE_SPRINT] = {0};
-	hex_to_buffer((uint8_t *)buf, data, len, sizeof(buf) - 1, 0, spaces_between, true);
-	return buf;
+    static char buf[UTIL_BUFFER_SIZE_SPRINT] = {0};
+    hex_to_buffer((uint8_t *)buf, data, len, sizeof(buf) - 1, 0, spaces_between, true);
+    return buf;
 }
 
 char *sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t breaks) {
 
-	// make sure we don't go beyond our char array memory
-	size_t in_index = 0, out_index = 0;
+    // make sure we don't go beyond our char array memory
+    size_t in_index = 0, out_index = 0;
 
-	int rowlen = (len > MAX_BIN_BREAK_LENGTH ) ? MAX_BIN_BREAK_LENGTH : len;
+    int rowlen = (len > MAX_BIN_BREAK_LENGTH ) ? MAX_BIN_BREAK_LENGTH : len;
 
-	if ( breaks > 0 && len % breaks != 0)
-		rowlen = ( len+(len/breaks) > MAX_BIN_BREAK_LENGTH ) ? MAX_BIN_BREAK_LENGTH : len+(len/breaks);
+    if ( breaks > 0 && len % breaks != 0)
+        rowlen = ( len+(len/breaks) > MAX_BIN_BREAK_LENGTH ) ? MAX_BIN_BREAK_LENGTH : len+(len/breaks);
 
-	//printf("(sprint_bin_break) rowlen %d\n", rowlen);
+    //printf("(sprint_bin_break) rowlen %d\n", rowlen);
 
-	static char buf[MAX_BIN_BREAK_LENGTH]; // 3072 + end of line characters if broken at 8 bits
-	//clear memory
-	memset(buf, 0x00, sizeof(buf));
-	char *tmp = buf;
+    static char buf[MAX_BIN_BREAK_LENGTH]; // 3072 + end of line characters if broken at 8 bits
+    //clear memory
+    memset(buf, 0x00, sizeof(buf));
+    char *tmp = buf;
 
-	// loop through the out_index to make sure we don't go too far
-	for (out_index=0; out_index < rowlen; out_index++) {
-		// set character
-		sprintf(tmp++, "%u", data[in_index]);
-		// check if a line break is needed and we have room to print it in our array
-		if ( (breaks > 0) && !((in_index+1) % breaks) && (out_index+1 != rowlen) ) {
-			// increment and print line break
-			out_index++;
-			sprintf(tmp++, "%s","\n");
-		}
-		in_index++;
-	}
+    // loop through the out_index to make sure we don't go too far
+    for (out_index=0; out_index < rowlen; out_index++) {
+        // set character
+        sprintf(tmp++, "%u", data[in_index]);
+        // check if a line break is needed and we have room to print it in our array
+        if ( (breaks > 0) && !((in_index+1) % breaks) && (out_index+1 != rowlen) ) {
+            // increment and print line break
+            out_index++;
+            sprintf(tmp++, "%s","\n");
+        }
+        in_index++;
+    }
 
-	return buf;
+    return buf;
 }
 /*
 void sprint_bin_break_ex(uint8_t *src, size_t srclen, char *dest , uint8_t breaks) {
-	if ( src == NULL ) return;
-	if ( srclen < 1 ) return;
+    if ( src == NULL ) return;
+    if ( srclen < 1 ) return;
 
-	// make sure we don't go beyond our char array memory
-	size_t in_index = 0, out_index = 0;
-	int rowlen;
-	if (breaks==0)
-		rowlen = ( len > MAX_BIN_BREAK_LENGTH ) ? MAX_BIN_BREAK_LENGTH : len;
-	else
-		rowlen = ( len+(len/breaks) > MAX_BIN_BREAK_LENGTH ) ? MAX_BIN_BREAK_LENGTH : len+(len/breaks);
+    // make sure we don't go beyond our char array memory
+    size_t in_index = 0, out_index = 0;
+    int rowlen;
+    if (breaks==0)
+        rowlen = ( len > MAX_BIN_BREAK_LENGTH ) ? MAX_BIN_BREAK_LENGTH : len;
+    else
+        rowlen = ( len+(len/breaks) > MAX_BIN_BREAK_LENGTH ) ? MAX_BIN_BREAK_LENGTH : len+(len/breaks);
 
-	printf("(sprint_bin_break) rowlen %d\n", rowlen);
+    printf("(sprint_bin_break) rowlen %d\n", rowlen);
 
-	// 3072 + end of line characters if broken at 8 bits
-	dest = (char *)calloc(MAX_BIN_BREAK_LENGTH, sizeof(uint8_t));
-	if (dest == NULL) return;
+    // 3072 + end of line characters if broken at 8 bits
+    dest = (char *)calloc(MAX_BIN_BREAK_LENGTH, sizeof(uint8_t));
+    if (dest == NULL) return;
 
-	//clear memory
-	memset(dest, 0x00, sizeof(dest));
+    //clear memory
+    memset(dest, 0x00, sizeof(dest));
 
-	// loop through the out_index to make sure we don't go too far
-	for (out_index=0; out_index < rowlen-1; out_index++) {
-		// set character
-		sprintf(dest++, "%u", src[in_index]);
-		// check if a line break is needed and we have room to print it in our array
-		if ( (breaks > 0) && !((in_index+1) % breaks) && (out_index+1 != rowlen) ) {
-			// increment and print line break
-			out_index++;
-			sprintf(dest++, "%s","\n");
-		}
-		in_index++;
-	}
-	// last char.
-	sprintf(dest++, "%u", src[in_index]);
+    // loop through the out_index to make sure we don't go too far
+    for (out_index=0; out_index < rowlen-1; out_index++) {
+        // set character
+        sprintf(dest++, "%u", src[in_index]);
+        // check if a line break is needed and we have room to print it in our array
+        if ( (breaks > 0) && !((in_index+1) % breaks) && (out_index+1 != rowlen) ) {
+            // increment and print line break
+            out_index++;
+            sprintf(dest++, "%s","\n");
+        }
+        in_index++;
+    }
+    // last char.
+    sprintf(dest++, "%u", src[in_index]);
 }
 */
 
 char *sprint_bin(const uint8_t *data, const size_t len) {
-	return sprint_bin_break(data, len, 0);
+    return sprint_bin_break(data, len, 0);
 }
 
 char *sprint_hex_ascii(const uint8_t *data, const size_t len) {
-	static char buf[UTIL_BUFFER_SIZE_SPRINT];
-	char *tmp = buf;
-	memset(buf, 0x00, UTIL_BUFFER_SIZE_SPRINT);
-	size_t max_len = (len > 1010) ? 1010 : len;
+    static char buf[UTIL_BUFFER_SIZE_SPRINT];
+    char *tmp = buf;
+    memset(buf, 0x00, UTIL_BUFFER_SIZE_SPRINT);
+    size_t max_len = (len > 1010) ? 1010 : len;
 
-	snprintf(tmp, UTIL_BUFFER_SIZE_SPRINT, "%s| ", sprint_hex(data, max_len) );
+    snprintf(tmp, UTIL_BUFFER_SIZE_SPRINT, "%s| ", sprint_hex(data, max_len) );
 
-	size_t i = 0;
-	size_t pos = (max_len * 3) + 2;
-	while (i < max_len){
-		char c = data[i];
-		if ( (c < 32) || (c == 127))
-			c = '.';
-		sprintf(tmp+pos+i, "%c",  c);
-		++i;
-	}
-	return buf;
+    size_t i = 0;
+    size_t pos = (max_len * 3) + 2;
+    while (i < max_len){
+        char c = data[i];
+        if ( (c < 32) || (c == 127))
+            c = '.';
+        sprintf(tmp+pos+i, "%c",  c);
+        ++i;
+    }
+    return buf;
 }
 
 char *sprint_ascii_ex(const uint8_t *data, const size_t len, const size_t min_str_len) {
-	static char buf[UTIL_BUFFER_SIZE_SPRINT];
-	char *tmp = buf;
-	memset(buf, 0x00, UTIL_BUFFER_SIZE_SPRINT);
-	size_t max_len = (len > 1010) ? 1010 : len;
-	size_t i = 0;
-	while(i < max_len){
-		char c = data[i];
-		tmp[i] = ((c < 32) || (c == 127)) ? '.' : c;
-		++i;
-	}
+    static char buf[UTIL_BUFFER_SIZE_SPRINT];
+    char *tmp = buf;
+    memset(buf, 0x00, UTIL_BUFFER_SIZE_SPRINT);
+    size_t max_len = (len > 1010) ? 1010 : len;
+    size_t i = 0;
+    while(i < max_len){
+        char c = data[i];
+        tmp[i] = ((c < 32) || (c == 127)) ? '.' : c;
+        ++i;
+    }
 
-	int m = min_str_len > i ? min_str_len : 0;
-	for(; i < m; ++i)
-		tmp[i] = ' ';
+    int m = min_str_len > i ? min_str_len : 0;
+    for(; i < m; ++i)
+        tmp[i] = ' ';
 
-	return buf;
+    return buf;
 }
 char *sprint_ascii(const uint8_t *data, const size_t len) {
-	return sprint_ascii_ex(data, len, 0);
+    return sprint_ascii_ex(data, len, 0);
 }
 
 void print_blocks(uint32_t *data, size_t len) {
-	PrintAndLogEx(NORMAL, "Blk | Data ");
-	PrintAndLogEx(NORMAL, "----+------------");
+    PrintAndLogEx(NORMAL, "Blk | Data ");
+    PrintAndLogEx(NORMAL, "----+------------");
 
-	if ( !data ) {
-		PrintAndLogEx(ERR, "..empty data");
-	} else {
-		for (uint8_t i=0; i<len; i++)
-			PrintAndLogEx(NORMAL, "%02d | 0x%08X", i, data[i]);
-	}
+    if ( !data ) {
+        PrintAndLogEx(ERR, "..empty data");
+    } else {
+        for (uint8_t i=0; i<len; i++)
+            PrintAndLogEx(NORMAL, "%02d | 0x%08X", i, data[i]);
+    }
 }
 
 void num_to_bytes(uint64_t n, size_t len, uint8_t* dest) {
-	while (len--) {
-		dest[len] = n & 0xFF;
-		n >>= 8;
-	}
+    while (len--) {
+        dest[len] = n & 0xFF;
+        n >>= 8;
+    }
 }
 
 uint64_t bytes_to_num(uint8_t* src, size_t len) {
-	uint64_t num = 0;
-	while (len--) {
-		num = (num << 8) | (*src);
-		src++;
-	}
-	return num;
+    uint64_t num = 0;
+    while (len--) {
+        num = (num << 8) | (*src);
+        src++;
+    }
+    return num;
 }
 
 // takes a number (uint64_t) and creates a binarray in dest.
 void num_to_bytebits(uint64_t n, size_t len, uint8_t *dest) {
-	while (len--) {
-		dest[len] = n & 1;
-		n >>= 1;
-	}
+    while (len--) {
+        dest[len] = n & 1;
+        n >>= 1;
+    }
 }
 
 //least significant bit first
 void num_to_bytebitsLSBF(uint64_t n, size_t len, uint8_t *dest) {
-	for(int i = 0 ; i < len ; ++i) {
-		dest[i] =  n & 1;
-		n >>= 1;
-	}
+    for(int i = 0 ; i < len ; ++i) {
+        dest[i] =  n & 1;
+        n >>= 1;
+    }
 }
 
 // aa,bb,cc,dd,ee,ff,gg,hh, ii,jj,kk,ll,mm,nn,oo,pp
@@ -398,25 +398,25 @@ void num_to_bytebitsLSBF(uint64_t n, size_t len, uint8_t *dest) {
 // hh,gg,ff,ee,dd,cc,bb,aa, pp,oo,nn,mm,ll,kk,jj,ii
 // up to 64 bytes or 512 bits
 uint8_t *SwapEndian64(const uint8_t *src, const size_t len, const uint8_t blockSize){
-	static uint8_t buf[64];
-	memset(buf, 0x00, 64);
-	uint8_t *tmp = buf;
-	for (uint8_t block=0; block < (uint8_t)(len/blockSize); block++){
-		for (size_t i = 0; i < blockSize; i++){
-			tmp[i+(blockSize*block)] = src[(blockSize-1-i)+(blockSize*block)];
-		}
-	}
-	return buf;
+    static uint8_t buf[64];
+    memset(buf, 0x00, 64);
+    uint8_t *tmp = buf;
+    for (uint8_t block=0; block < (uint8_t)(len/blockSize); block++){
+        for (size_t i = 0; i < blockSize; i++){
+            tmp[i+(blockSize*block)] = src[(blockSize-1-i)+(blockSize*block)];
+        }
+    }
+    return buf;
 }
 
 // takes a uint8_t src array, for len items and reverses the byte order in blocksizes (8,16,32,64),
 // returns: the dest array contains the reordered src array.
 void SwapEndian64ex(const uint8_t *src, const size_t len, const uint8_t blockSize, uint8_t *dest){
-	for (uint8_t block=0; block < (uint8_t)(len/blockSize); block++){
-		for (size_t i = 0; i < blockSize; i++){
-			dest[i+(blockSize*block)] = src[(blockSize-1-i)+(blockSize*block)];
-		}
-	}
+    for (uint8_t block=0; block < (uint8_t)(len/blockSize); block++){
+        for (size_t i = 0; i < blockSize; i++){
+            dest[i+(blockSize*block)] = src[(blockSize-1-i)+(blockSize*block)];
+        }
+    }
 }
 
 //  -------------------------------------------------------------------------
@@ -430,60 +430,60 @@ void SwapEndian64ex(const uint8_t *src, const size_t len, const uint8_t blockSiz
 //  -------------------------------------------------------------------------
 int param_getptr(const char *line, int *bg, int *en, int paramnum)
 {
-	int i;
-	int len = strlen(line);
+    int i;
+    int len = strlen(line);
 
-	*bg = 0;
-	*en = 0;
+    *bg = 0;
+    *en = 0;
 
   // skip spaces
-	while (line[*bg] ==' ' || line[*bg]=='\t') (*bg)++;
-	if (*bg >= len) {
-		return 1;
-	}
+    while (line[*bg] ==' ' || line[*bg]=='\t') (*bg)++;
+    if (*bg >= len) {
+        return 1;
+    }
 
-	for (i = 0; i < paramnum; i++) {
-		while (line[*bg]!=' ' && line[*bg]!='\t' && line[*bg] != '\0') (*bg)++;
-		while (line[*bg]==' ' || line[*bg]=='\t') (*bg)++;
+    for (i = 0; i < paramnum; i++) {
+        while (line[*bg]!=' ' && line[*bg]!='\t' && line[*bg] != '\0') (*bg)++;
+        while (line[*bg]==' ' || line[*bg]=='\t') (*bg)++;
 
-		if (line[*bg] == '\0') return 1;
-	}
+        if (line[*bg] == '\0') return 1;
+    }
 
-	*en = *bg;
-	while (line[*en] != ' ' && line[*en] != '\t' && line[*en] != '\0') (*en)++;
+    *en = *bg;
+    while (line[*en] != ' ' && line[*en] != '\t' && line[*en] != '\0') (*en)++;
 
-	(*en)--;
+    (*en)--;
 
-	return 0;
+    return 0;
 }
 
 int param_getlength(const char *line, int paramnum)
 {
-	int bg, en;
+    int bg, en;
 
-	if (param_getptr(line, &bg, &en, paramnum)) return 0;
+    if (param_getptr(line, &bg, &en, paramnum)) return 0;
 
-	return en - bg + 1;
+    return en - bg + 1;
 }
 
 char param_getchar(const char *line, int paramnum) {
-	return param_getchar_indx(line, 0, paramnum);
+    return param_getchar_indx(line, 0, paramnum);
 }
 
 char param_getchar_indx(const char *line, int indx, int paramnum) {
-	int bg, en;
+    int bg, en;
 
-	if (param_getptr(line, &bg, &en, paramnum)) return 0x00;
+    if (param_getptr(line, &bg, &en, paramnum)) return 0x00;
 
-	if (bg + indx > en)
-		return '\0';
+    if (bg + indx > en)
+        return '\0';
 
-	return line[bg + indx];
+    return line[bg + indx];
 }
 
 uint8_t param_get8(const char *line, int paramnum)
 {
-	return param_get8ex(line, paramnum, 0, 10);
+    return param_get8ex(line, paramnum, 0, 10);
 }
 
 /**
@@ -494,10 +494,10 @@ uint8_t param_get8(const char *line, int paramnum)
  */
 uint8_t param_getdec(const char *line, int paramnum, uint8_t *destination)
 {
-	uint8_t val =  param_get8ex(line, paramnum, 255, 10);
-	if( (int8_t) val == -1) return 1;
-	(*destination) = val;
-	return 0;
+    uint8_t val =  param_get8ex(line, paramnum, 255, 10);
+    if( (int8_t) val == -1) return 1;
+    (*destination) = val;
+    return 0;
 }
 /**
  * @brief Checks if param is decimal
@@ -507,144 +507,144 @@ uint8_t param_getdec(const char *line, int paramnum, uint8_t *destination)
  */
 uint8_t param_isdec(const char *line, int paramnum)
 {
-	int bg, en;
-	//TODO, check more thorougly
-	if (!param_getptr(line, &bg, &en, paramnum)) return 1;
-		//		return strtoul(&line[bg], NULL, 10) & 0xff;
+    int bg, en;
+    //TODO, check more thorougly
+    if (!param_getptr(line, &bg, &en, paramnum)) return 1;
+        // return strtoul(&line[bg], NULL, 10) & 0xff;
 
-	return 0;
+    return 0;
 }
 
 uint8_t param_get8ex(const char *line, int paramnum, int deflt, int base)
 {
-	int bg, en;
-	if (!param_getptr(line, &bg, &en, paramnum))
-		return strtoul(&line[bg], NULL, base) & 0xff;
-	else
-		return deflt;
+    int bg, en;
+    if (!param_getptr(line, &bg, &en, paramnum))
+        return strtoul(&line[bg], NULL, base) & 0xff;
+    else
+        return deflt;
 }
 
 uint32_t param_get32ex(const char *line, int paramnum, int deflt, int base)
 {
-	int bg, en;
-	if (!param_getptr(line, &bg, &en, paramnum))
-		return strtoul(&line[bg], NULL, base);
-	else
-		return deflt;
+    int bg, en;
+    if (!param_getptr(line, &bg, &en, paramnum))
+        return strtoul(&line[bg], NULL, base);
+    else
+        return deflt;
 }
 
 uint64_t param_get64ex(const char *line, int paramnum, int deflt, int base)
 {
-	int bg, en;
-	if (!param_getptr(line, &bg, &en, paramnum))
-		return strtoull(&line[bg], NULL, base);
-	else
-		return deflt;
+    int bg, en;
+    if (!param_getptr(line, &bg, &en, paramnum))
+        return strtoull(&line[bg], NULL, base);
+    else
+        return deflt;
 }
 
 int param_gethex(const char *line, int paramnum, uint8_t * data, int hexcnt) {
-	int bg, en, i;
-	uint32_t temp;
+    int bg, en, i;
+    uint32_t temp;
 
-	if (hexcnt & 1) return 1;
+    if (hexcnt & 1) return 1;
 
-	if (param_getptr(line, &bg, &en, paramnum)) return 1;
+    if (param_getptr(line, &bg, &en, paramnum)) return 1;
 
-	if (en - bg + 1 != hexcnt) return 1;
+    if (en - bg + 1 != hexcnt) return 1;
 
-	for(i = 0; i < hexcnt; i += 2) {
-		if (!(isxdigit(line[bg + i]) && isxdigit(line[bg + i + 1])) ) return 1;
+    for(i = 0; i < hexcnt; i += 2) {
+        if (!(isxdigit(line[bg + i]) && isxdigit(line[bg + i + 1])) ) return 1;
 
-		sscanf((char[]){line[bg + i], line[bg + i + 1], 0}, "%X", &temp);
-		data[i / 2] = temp & 0xff;
-	}
+        sscanf((char[]){line[bg + i], line[bg + i + 1], 0}, "%X", &temp);
+        data[i / 2] = temp & 0xff;
+    }
 
-	return 0;
+    return 0;
 }
 int param_gethex_ex(const char *line, int paramnum, uint8_t * data, int *hexcnt) {
-	int bg, en, i;
-	uint32_t temp;
+    int bg, en, i;
+    uint32_t temp;
 
-	if (param_getptr(line, &bg, &en, paramnum)) return 1;
+    if (param_getptr(line, &bg, &en, paramnum)) return 1;
 
-	*hexcnt = en - bg + 1;
-	if (*hexcnt % 2) //error if not complete hex bytes
-		return 1;
+    *hexcnt = en - bg + 1;
+    if (*hexcnt % 2) //error if not complete hex bytes
+        return 1;
 
-	for(i = 0; i < *hexcnt; i += 2) {
-		if (!(isxdigit(line[bg + i]) && isxdigit(line[bg + i + 1])) ) return 1;
+    for(i = 0; i < *hexcnt; i += 2) {
+        if (!(isxdigit(line[bg + i]) && isxdigit(line[bg + i + 1])) ) return 1;
 
-		sscanf((char[]){line[bg + i], line[bg + i + 1], 0}, "%X", &temp);
-		data[i / 2] = temp & 0xff;
-	}
+        sscanf((char[]){line[bg + i], line[bg + i + 1], 0}, "%X", &temp);
+        data[i / 2] = temp & 0xff;
+    }
 
-	return 0;
+    return 0;
 }
 
 int param_gethex_to_eol(const char *line, int paramnum, uint8_t * data, int maxdatalen, int *datalen) {
-	int bg, en;
-	uint32_t temp;
-	char buf[5] = {0};
+    int bg, en;
+    uint32_t temp;
+    char buf[5] = {0};
 
-	if (param_getptr(line, &bg, &en, paramnum)) return 1;
+    if (param_getptr(line, &bg, &en, paramnum)) return 1;
 
-	*datalen = 0;
+    *datalen = 0;
 
-	int indx = bg;
-	while (line[indx]) {
-		if (line[indx] == '\t' || line[indx] == ' ') {
-			indx++;
-			continue;
-		}
+    int indx = bg;
+    while (line[indx]) {
+        if (line[indx] == '\t' || line[indx] == ' ') {
+            indx++;
+            continue;
+        }
 
-		if (isxdigit(line[indx])) {
-			buf[strlen(buf) + 1] = 0x00;
-			buf[strlen(buf)] = line[indx];
-		} else {
-			// if we have symbols other than spaces and hex
-			return 1;
-		}
+        if (isxdigit(line[indx])) {
+            buf[strlen(buf) + 1] = 0x00;
+            buf[strlen(buf)] = line[indx];
+        } else {
+            // if we have symbols other than spaces and hex
+            return 1;
+        }
 
-		if (*datalen >= maxdatalen) {
-			// if we dont have space in buffer and have symbols to translate
-			return 2;
-		}
+        if (*datalen >= maxdatalen) {
+            // if we dont have space in buffer and have symbols to translate
+            return 2;
+        }
 
-		if (strlen(buf) >= 2) {
-			sscanf(buf, "%x", &temp);
-			data[*datalen] = (uint8_t)(temp & 0xff);
-			*buf = 0;
-			(*datalen)++;
-		}
+        if (strlen(buf) >= 2) {
+            sscanf(buf, "%x", &temp);
+            data[*datalen] = (uint8_t)(temp & 0xff);
+            *buf = 0;
+            (*datalen)++;
+        }
 
-		indx++;
-	}
+        indx++;
+    }
 
-	if (strlen(buf) > 0)
-		//error when not completed hex bytes
-		return 3;
+    if (strlen(buf) > 0)
+        //error when not completed hex bytes
+        return 3;
 
-	return 0;
+    return 0;
 }
 
 int param_getstr(const char *line, int paramnum, char * str, size_t buffersize)
 {
-	int bg, en;
+    int bg, en;
 
-	if (param_getptr(line, &bg, &en, paramnum)) {
-		return 0;
-	}
+    if (param_getptr(line, &bg, &en, paramnum)) {
+        return 0;
+    }
 
-	// Prevent out of bounds errors
-	if (en - bg + 1 >= buffersize) {
-		printf("out of bounds error: want %d bytes have %zu bytes\n", en - bg + 1 + 1, buffersize);
-		return 0;
-	}
+    // Prevent out of bounds errors
+    if (en - bg + 1 >= buffersize) {
+        printf("out of bounds error: want %d bytes have %zu bytes\n", en - bg + 1 + 1, buffersize);
+        return 0;
+    }
 
-	memcpy(str, line + bg, en - bg + 1);
-	str[en - bg + 1] = 0;
+    memcpy(str, line + bg, en - bg + 1);
+    str[en - bg + 1] = 0;
 
-	return en - bg + 1;
+    return en - bg + 1;
 }
 
 /*
@@ -673,7 +673,7 @@ int hextobinarray(char *target, char *source)
         else if (x >= 'A' && x <= 'F')
             x -= 'A' - 10;
         else {
-        	printf("Discovered unknown character %c %d at idx %d of %s\n", x, x, (int16_t)(source - start), start);
+            printf("Discovered unknown character %c %d at idx %d of %s\n", x, x, (int16_t)(source - start), start);
             return 0;
         }
         // output
@@ -758,16 +758,16 @@ int32_t le24toh (uint8_t data[3]) {
 // Pack a bitarray into a uint32_t.
 uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits) {
 
-	if (len > 32) return 0;
+    if (len > 32) return 0;
 
-	int i = start;
-	int j = len-1;
-	uint32_t tmp = 0;
+    int i = start;
+    int j = len-1;
+    uint32_t tmp = 0;
 
-	for (; j >= 0; --j, ++i)
-		tmp	|= bits[i] << j;
+    for (; j >= 0; --j, ++i)
+        tmp |= bits[i] << j;
 
-	return tmp;
+    return tmp;
 }
 
 // RotateLeft - Ultralight, Desfire, works on byte level
@@ -782,14 +782,14 @@ void rol(uint8_t *data, const size_t len){
 
 /*
 uint8_t pw_rev_A(uint8_t b) {
-	b = (b & 0xF0) >> 4 | (b & 0x0F) << 4;
-	b = (b & 0xCC) >> 2 | (b & 0x33) << 2;
-	b = (b & 0xAA) >> 1 | (b & 0x55) << 1;
-	return b;
+    b = (b & 0xF0) >> 4 | (b & 0x0F) << 4;
+    b = (b & 0xCC) >> 2 | (b & 0x33) << 2;
+    b = (b & 0xAA) >> 1 | (b & 0x55) << 1;
+    return b;
 }
 */
 uint8_t reflect8(uint8_t b) {
-	return ((b * 0x80200802ULL) & 0x0884422110ULL) * 0x0101010101ULL >> 32;
+    return ((b * 0x80200802ULL) & 0x0884422110ULL) * 0x0101010101ULL >> 32;
 }
 uint16_t reflect16(uint16_t b) {
     uint16_t v = 0;
@@ -818,15 +818,15 @@ uint16_t reflect16(uint16_t b) {
  Example: reflect(0x3e23L,3) == 0x3e26
 */
 uint32_t reflect(uint32_t v, int b) {
-	uint32_t t = v;
-	for ( int i = 0; i < b; ++i) {
-		if (t & 1)
-			v |=  BITMASK((b-1)-i);
-		else
-			v &= ~BITMASK((b-1)-i);
-		t>>=1;
-	}
-	return v;
+    uint32_t t = v;
+    for ( int i = 0; i < b; ++i) {
+        if (t & 1)
+            v |=  BITMASK((b-1)-i);
+        else
+            v &= ~BITMASK((b-1)-i);
+        t>>=1;
+    }
+    return v;
 }
 
 uint64_t HornerScheme(uint64_t num, uint64_t divider, uint64_t factor) {
@@ -841,21 +841,21 @@ uint64_t HornerScheme(uint64_t num, uint64_t divider, uint64_t factor) {
 // determine number of logical CPU cores (use for multithreaded functions)
 extern int num_CPUs(void) {
 #if defined(_WIN32)
-	#include <sysinfoapi.h>
-	SYSTEM_INFO sysinfo;
-	GetSystemInfo(&sysinfo);
-	return sysinfo.dwNumberOfProcessors;
+    #include <sysinfoapi.h>
+    SYSTEM_INFO sysinfo;
+    GetSystemInfo(&sysinfo);
+    return sysinfo.dwNumberOfProcessors;
 #elif defined(__linux__) || defined(__APPLE__)
-	#include <unistd.h>
-	return sysconf(_SC_NPROCESSORS_ONLN);
+    #include <unistd.h>
+    return sysconf(_SC_NPROCESSORS_ONLN);
 #else
-	return 1;
+    return 1;
 #endif
 }
 
 extern void str_lower(char *s ){
-	for(int i=0; i < strlen(s); i++)
-		s[i] = tolower( s[i] );
+    for(int i=0; i < strlen(s); i++)
+        s[i] = tolower( s[i] );
 }
 extern bool str_startswith(const char *s,  const char *pre) {
     return strncmp(pre, s, strlen(pre)) == 0;
@@ -871,8 +871,8 @@ extern void clean_ascii(unsigned char *buf, size_t len) {
 
 // replace \r \n to \0
 extern void strcleanrn(char *buf, size_t len) {
-	strcreplace(buf, len, '\n', '\0');
-	strcreplace(buf, len, '\r', '\0');
+    strcreplace(buf, len, '\n', '\0');
+    strcreplace(buf, len, '\r', '\0');
 }
 
 // replace char in buffer
@@ -884,10 +884,10 @@ extern void strcreplace(char *buf, size_t len, char from, char to) {
 }
 
 extern char *strmcopy(char *buf) {
-	char* str = (char*) calloc(strlen(buf) + 1, sizeof(uint8_t));
-	if (str != NULL) {
-		memset(str, 0, strlen(buf) + 1);
-		strcpy(str, buf);
-	}
-	return str;
+    char* str = (char*) calloc(strlen(buf) + 1, sizeof(uint8_t));
+    if (str != NULL) {
+        memset(str, 0, strlen(buf) + 1);
+        strcpy(str, buf);
+    }
+    return str;
 }
\ No newline at end of file
diff --git a/client/util.h b/client/util.h
index ec99a4903..5c4251b3a 100644
--- a/client/util.h
+++ b/client/util.h
@@ -10,7 +10,7 @@
 #ifndef __UTIL_H_
 #define __UTIL_H_
 
-#include <stdint.h>		//included in data.h
+#include <stdint.h> //included in data.h
 #include <stddef.h>
 #include <inttypes.h>
 #include <string.h>
@@ -18,7 +18,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <time.h>
-#include "ui.h"			// PrintAndLog
+#include "ui.h"     // PrintAndLog
 
 #ifdef ANDROID
   #include <endian.h>
@@ -43,63 +43,63 @@
 
 // endian change for 64bit
 #ifdef __GNUC__
-	#ifndef BSWAP_64
-		#define BSWAP_64(x) __builtin_bswap64(x)
-	#endif
+    #ifndef BSWAP_64
+        #define BSWAP_64(x) __builtin_bswap64(x)
+    #endif
 #else
-	#ifdef _MSC_VER
-		#ifndef BSWAP_64
-			#define BSWAP_64(x) _byteswap_uint64(x)
-		#endif
-	#else
-	#ifndef BSWAP_64
-		#define	BSWAP_64(x) \
-			(((uint64_t)(x) << 56) | \
-			(((uint64_t)(x) << 40) & 0xff000000000000ULL) | \
-			(((uint64_t)(x) << 24) & 0xff0000000000ULL) | \
-			(((uint64_t)(x) << 8)  & 0xff00000000ULL) | \
-			(((uint64_t)(x) >> 8)  & 0xff000000ULL) | \
-			(((uint64_t)(x) >> 24) & 0xff0000ULL) | \
-			(((uint64_t)(x) >> 40) & 0xff00ULL) | \
-			((uint64_t)(x)  >> 56))
-		#endif
-	#endif
+    #ifdef _MSC_VER
+        #ifndef BSWAP_64
+            #define BSWAP_64(x) _byteswap_uint64(x)
+        #endif
+    #else
+    #ifndef BSWAP_64
+        #define BSWAP_64(x) \
+            (((uint64_t)(x) << 56) | \
+            (((uint64_t)(x) << 40) & 0xff000000000000ULL) | \
+            (((uint64_t)(x) << 24) & 0xff0000000000ULL) | \
+            (((uint64_t)(x) << 8)  & 0xff00000000ULL) | \
+            (((uint64_t)(x) >> 8)  & 0xff000000ULL) | \
+            (((uint64_t)(x) >> 24) & 0xff0000ULL) | \
+            (((uint64_t)(x) >> 40) & 0xff00ULL) | \
+            ((uint64_t)(x)  >> 56))
+        #endif
+    #endif
 #endif
 
 // endian change for 32bit
 #ifdef __GNUC__
-	#ifndef BSWAP_32
-		#define BSWAP_32(x) __builtin_bswap32(x)
-	#endif
+    #ifndef BSWAP_32
+        #define BSWAP_32(x) __builtin_bswap32(x)
+    #endif
 #else
-	#ifdef _MSC_VER
-		#ifndef BSWAP_32
-			#define BSWAP_32(x) _byteswap_ulong(x)
-		#endif
-	#else
-		#ifndef BSWAP_32
-			# define BSWAP_32(x) \
-			 ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >>  8) | \
-			  (((x) & 0x0000ff00) <<  8) | (((x) & 0x000000ff) << 24))
-		#endif
-	#endif
+    #ifdef _MSC_VER
+        #ifndef BSWAP_32
+            #define BSWAP_32(x) _byteswap_ulong(x)
+        #endif
+    #else
+        #ifndef BSWAP_32
+            # define BSWAP_32(x) \
+             ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >>  8) | \
+              (((x) & 0x0000ff00) <<  8) | (((x) & 0x000000ff) << 24))
+        #endif
+    #endif
 #endif
 
 // endian change for 16bit
 #ifdef __GNUC__
-	#ifndef BSWAP_16
-		#define BSWAP_16(x) __builtin_bswap16(x)
-	#endif
+    #ifndef BSWAP_16
+        #define BSWAP_16(x) __builtin_bswap16(x)
+    #endif
 #else
-	#ifdef _MSC_VER
-		#ifndef BSWAP_16
-			#define BSWAP_16(x) _byteswap_ushort(x)
-		#endif
-	#else
-		#ifndef BSWAP_16
-			# define BSWAP_16(x) ((( ((x) & 0xFF00 ) >> 8))| ( (((x) & 0x00FF) << 8)))
-		#endif
-	#endif
+    #ifdef _MSC_VER
+        #ifndef BSWAP_16
+            #define BSWAP_16(x) _byteswap_ushort(x)
+        #endif
+    #else
+        #ifndef BSWAP_16
+            # define BSWAP_16(x) ((( ((x) & 0xFF00 ) >> 8))| ( (((x) & 0x00FF) << 8)))
+        #endif
+    #endif
 #endif
 
 #define EVEN                        0
@@ -136,37 +136,37 @@
 # define ARRAYLEN(x) (sizeof(x)/sizeof((x)[0]))
 #endif
 
-#if defined(__linux__)	|| (__APPLE__)
+#if defined(__linux__) || (__APPLE__)
 # define _BLUE_(s) "\x1b[34m" #s "\x1b[0m "
 #else
 # define _BLUE_(s) #s " "
 #endif
 
-#if defined(__linux__)	|| (__APPLE__)
+#if defined(__linux__) || (__APPLE__)
 # define _RED_(s) "\x1b[31m" #s "\x1b[0m "
 #else
 # define _RED_(s) #s " "
 #endif
 
-#if defined(__linux__)	|| (__APPLE__)
+#if defined(__linux__) || (__APPLE__)
 # define _GREEN_(s) "\x1b[32m" #s "\x1b[0m "
 #else
 # define _GREEN_(s) #s " "
 #endif
 
-#if defined(__linux__)	|| (__APPLE__)
+#if defined(__linux__) || (__APPLE__)
 # define _YELLOW_(s) "\x1b[33m" #s "\x1b[0m "
 #else
 # define _YELLOW_(s) #s " "
 #endif
 
-#if defined(__linux__)	|| (__APPLE__)
+#if defined(__linux__) || (__APPLE__)
 # define _MAGENTA_(s) "\x1b[35m" #s "\x1b[0m "
 #else
 # define _MAGENTA_(s) #s " "
 #endif
 
-#if defined(__linux__)	|| (__APPLE__)
+#if defined(__linux__) || (__APPLE__)
 # define _CYAN_(s) "\x1b[36m" #s "\x1b[0m "
 #else
 # define _CYAN_(s) #s " "
@@ -174,15 +174,15 @@
 
 #ifndef DropField
 #define DropField() { \
-	UsbCommand c = {CMD_READER_ISO_14443a, {0,0,0}}; clearCommandBuffer(); SendCommand(&c); \
+    UsbCommand c = {CMD_READER_ISO_14443a, {0,0,0}}; clearCommandBuffer(); SendCommand(&c); \
 }
 #endif
 
 #ifndef DropFieldEx
 #define DropFieldEx(x) { \
-	if ( (x) == ECC_CONTACTLESS) { \
-		DropField(); \
-	} \
+    if ( (x) == ECC_CONTACTLESS) { \
+        DropField(); \
+    } \
 }
 #endif
 
@@ -200,8 +200,8 @@ extern int FillBuffer(uint8_t *data, size_t maxDataLength, size_t *dataLength, .
 
 extern bool CheckStringIsHEXValue(const char *value);
 extern void hex_to_buffer(const uint8_t *buf, const uint8_t *hex_data, const size_t hex_len,
-						  const size_t hex_max_len, const size_t min_str_len, const size_t spaces_between,
-						  bool uppercase);
+                          const size_t hex_max_len, const size_t min_str_len, const size_t spaces_between,
+                          bool uppercase);
 
 extern void print_hex(const uint8_t * data, const size_t len);
 extern void print_hex_break(const uint8_t *data, const size_t len, const uint8_t breaks);
@@ -252,13 +252,13 @@ extern int32_t le24toh (uint8_t data[3]);
 extern uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits);
 extern void rol(uint8_t *data, const size_t len);
 extern uint32_t reflect(uint32_t v, int b);
-extern uint8_t reflect8(uint8_t b);		// dedicated 8bit reversal
-extern uint16_t reflect16(uint16_t b);	// dedicated 16bit reversal
+extern uint8_t reflect8(uint8_t b); // dedicated 8bit reversal
+extern uint16_t reflect16(uint16_t b); // dedicated 16bit reversal
 extern uint64_t HornerScheme(uint64_t num, uint64_t divider, uint64_t factor);
 
-extern int num_CPUs(void);			// number of logical CPUs
+extern int num_CPUs(void); // number of logical CPUs
 
-extern void str_lower(char* s);	 // converts string to lower case
+extern void str_lower(char* s); // converts string to lower case
 extern bool str_startswith(const char *s,  const char *pre);  // check for prefix in string
 extern void strcleanrn(char *buf, size_t len);
 extern void strcreplace(char *buf, size_t len, char from, char to);
diff --git a/client/util_darwin.m b/client/util_darwin.m
index 9d7583903..a22ac54f6 100644
--- a/client/util_darwin.m
+++ b/client/util_darwin.m
@@ -19,20 +19,20 @@ static id activity = nil;
 //OS X Version 10.10 is defined in OS X 10.10 and later
 #if defined(MAC_OS_X_VERSION_10_10)
 void disableAppNap(const char* reason) {
-	if(activity == nil) {
-		//NSLog(@"disableAppNap: %@", @(reason));
-		activity = [[NSProcessInfo processInfo] beginActivityWithOptions:NSActivityBackground reason:@(reason)];
-		[activity retain];
-	}
+    if(activity == nil) {
+        //NSLog(@"disableAppNap: %@", @(reason));
+        activity = [[NSProcessInfo processInfo] beginActivityWithOptions:NSActivityBackground reason:@(reason)];
+        [activity retain];
+    }
 }
 
 void enableAppNap() {
-	if(activity != nil) {
-		//NSLog(@"enableAppNap");
-		[[NSProcessInfo processInfo] endActivity:activity];
-		[activity release];
-		activity = nil;
-	}
+    if(activity != nil) {
+        //NSLog(@"enableAppNap");
+        [[NSProcessInfo processInfo] endActivity:activity];
+        [activity release];
+        activity = nil;
+    }
 }
 
 #else
@@ -44,10 +44,10 @@ void enableAppNap() { }
 //OS X Version 10.6 is defined in OS X 10.6 and later
 #if defined(MAC_OS_X_VERSION_10_6)
 void makeUnfocusable() {
-	[NSApp setActivationPolicy:NSApplicationActivationPolicyProhibited];
+    [NSApp setActivationPolicy:NSApplicationActivationPolicyProhibited];
 }
 void makeFocusable() {
-	[NSApp setActivationPolicy:NSApplicationActivationPolicyRegular];
+    [NSApp setActivationPolicy:NSApplicationActivationPolicyRegular];
 }
 #else
 void makeUnfocusable() { }
diff --git a/client/util_posix.c b/client/util_posix.c
index 5ecc50d13..915b46d26 100644
--- a/client/util_posix.c
+++ b/client/util_posix.c
@@ -9,7 +9,7 @@
 //-----------------------------------------------------------------------------
 
 #if !defined(_WIN32)
-#define _POSIX_C_SOURCE	199309L			// need nanosleep()
+#define _POSIX_C_SOURCE 199309L // need nanosleep()
 #else
 #include <windows.h>
 #endif
@@ -24,86 +24,86 @@
 #include <errno.h>
 
 static void nsleep(uint64_t n) {
-	struct timespec timeout;
-	timeout.tv_sec = n/1000000000;
-	timeout.tv_nsec = n%1000000000;
-	while (nanosleep(&timeout, &timeout) && errno == EINTR);
+    struct timespec timeout;
+    timeout.tv_sec = n/1000000000;
+    timeout.tv_nsec = n%1000000000;
+    while (nanosleep(&timeout, &timeout) && errno == EINTR);
 }
 
 void msleep(uint32_t n) {
-	nsleep(1000000 * (uint64_t)n);
+    nsleep(1000000 * (uint64_t)n);
 }
 #endif // _WIN32
 
 #ifdef __APPLE__
 
 #ifndef CLOCK_MONOTONIC
-	#define CLOCK_MONOTONIC (1)
+    #define CLOCK_MONOTONIC (1)
 #endif
 #ifndef CLOCK_REALTIME
-	#define CLOCK_REALTIME (2)
+    #define CLOCK_REALTIME (2)
 #endif
 
-	#include <sys/time.h>
-	#include <mach/clock.h>
-	#include <mach/mach.h>
-	#include <mach/mach_time.h>
+    #include <sys/time.h>
+    #include <mach/clock.h>
+    #include <mach/mach.h>
+    #include <mach/mach_time.h>
 
-	/* clock_gettime is not implemented on OSX prior to 10.12 */
-	int _civet_clock_gettime(int clk_id, struct timespec *t);
+    /* clock_gettime is not implemented on OSX prior to 10.12 */
+    int _civet_clock_gettime(int clk_id, struct timespec *t);
 
-	int _civet_clock_gettime(int clk_id, struct timespec *t)
-	{
-		memset(t, 0, sizeof(*t));
-		if (clk_id == CLOCK_REALTIME) {
-			struct timeval now;
-			int rv = gettimeofday(&now, NULL);
-			if (rv) {
-				return rv;
-			}
-			t->tv_sec = now.tv_sec;
-			t->tv_nsec = now.tv_usec * 1000;
-			return 0;
+    int _civet_clock_gettime(int clk_id, struct timespec *t)
+    {
+        memset(t, 0, sizeof(*t));
+        if (clk_id == CLOCK_REALTIME) {
+            struct timeval now;
+            int rv = gettimeofday(&now, NULL);
+            if (rv) {
+                return rv;
+            }
+            t->tv_sec = now.tv_sec;
+            t->tv_nsec = now.tv_usec * 1000;
+            return 0;
 
-		} else if (clk_id == CLOCK_MONOTONIC) {
-			static uint64_t clock_start_time = 0;
-			static mach_timebase_info_data_t timebase_info = {0, 0};
+        } else if (clk_id == CLOCK_MONOTONIC) {
+            static uint64_t clock_start_time = 0;
+            static mach_timebase_info_data_t timebase_info = {0, 0};
 
-			uint64_t now = mach_absolute_time();
+            uint64_t now = mach_absolute_time();
 
-			if (clock_start_time == 0) {
+            if (clock_start_time == 0) {
 
-				mach_timebase_info(&timebase_info);
-				clock_start_time = now;
-			}
+                mach_timebase_info(&timebase_info);
+                clock_start_time = now;
+            }
 
-			now = (uint64_t)((double)(now - clock_start_time)
-			                 * (double)timebase_info.numer
-			                 / (double)timebase_info.denom);
+            now = (uint64_t)((double)(now - clock_start_time)
+                             * (double)timebase_info.numer
+                             / (double)timebase_info.denom);
 
-			t->tv_sec = now / 1000000000;
-			t->tv_nsec = now % 1000000000;
-			return 0;
-		}
-		return -1; // EINVAL - Clock ID is unknown
-	}
+            t->tv_sec = now / 1000000000;
+            t->tv_nsec = now % 1000000000;
+            return 0;
+        }
+        return -1; // EINVAL - Clock ID is unknown
+    }
 
-	/* if clock_gettime is declared, then __CLOCK_AVAILABILITY will be defined */
-	#ifdef __CLOCK_AVAILABILITY
-		/* If we compiled with Mac OSX 10.12 or later, then clock_gettime will be declared
-		 * but it may be NULL at runtime. So we need to check before using it. */
-		int _civet_safe_clock_gettime(int clk_id, struct timespec *t);
+    /* if clock_gettime is declared, then __CLOCK_AVAILABILITY will be defined */
+    #ifdef __CLOCK_AVAILABILITY
+        /* If we compiled with Mac OSX 10.12 or later, then clock_gettime will be declared
+         * but it may be NULL at runtime. So we need to check before using it. */
+        int _civet_safe_clock_gettime(int clk_id, struct timespec *t);
 
-		int _civet_safe_clock_gettime(int clk_id, struct timespec *t) {
-			if( clock_gettime ) {
-				return clock_gettime(clk_id, t);
-			}
-			return _civet_clock_gettime(clk_id, t);
-		}
-		#define clock_gettime _civet_safe_clock_gettime
-	#else
-		#define clock_gettime _civet_clock_gettime
-	#endif
+        int _civet_safe_clock_gettime(int clk_id, struct timespec *t) {
+            if( clock_gettime ) {
+                return clock_gettime(clk_id, t);
+            }
+            return _civet_clock_gettime(clk_id, t);
+        }
+        #define clock_gettime _civet_safe_clock_gettime
+    #else
+        #define clock_gettime _civet_clock_gettime
+    #endif
 
 #endif
 
@@ -111,26 +111,26 @@ void msleep(uint32_t n) {
 // a milliseconds timer for performance measurement
 uint64_t msclock(void) {
 #if defined(_WIN32)
-	#include <sys/types.h>
+    #include <sys/types.h>
 
-	// WORKAROUND FOR MinGW (some versions - use if normal code does not compile)
-	// It has no _ftime_s and needs explicit inclusion of timeb.h
-	#include <sys/timeb.h>
-	struct _timeb t;
-	_ftime(&t);
-	return 1000 * (uint64_t)t.time + t.millitm;
+    // WORKAROUND FOR MinGW (some versions - use if normal code does not compile)
+    // It has no _ftime_s and needs explicit inclusion of timeb.h
+    #include <sys/timeb.h>
+    struct _timeb t;
+    _ftime(&t);
+    return 1000 * (uint64_t)t.time + t.millitm;
 
 // NORMAL CODE (use _ftime_s)
-	//struct _timeb t;
-	//if (_ftime_s(&t)) {
-	//	return 0;
-	//} else {
-	//	return 1000 * t.time + t.millitm;
-	//}
+    //struct _timeb t;
+    //if (_ftime_s(&t)) {
+    //  return 0;
+    //} else {
+    //  return 1000 * t.time + t.millitm;
+    //}
 #else
-	struct timespec t;
-	clock_gettime(CLOCK_MONOTONIC, &t);
-	return ( 1000 * (uint64_t)t.tv_sec + t.tv_nsec / 1000000);
+    struct timespec t;
+    clock_gettime(CLOCK_MONOTONIC, &t);
+    return ( 1000 * (uint64_t)t.tv_sec + t.tv_nsec / 1000000);
 #endif
 }
 
diff --git a/client/util_posix.h b/client/util_posix.h
index dcf9d99aa..d4fecc723 100644
--- a/client/util_posix.h
+++ b/client/util_posix.h
@@ -18,9 +18,9 @@
 # define sleep(n) Sleep(1000 *(n))
 # define msleep(n) Sleep((n))
 #else
-extern void msleep(uint32_t n);		// sleep n milliseconds
+extern void msleep(uint32_t n); // sleep n milliseconds
 #endif // _WIN32
 
-extern uint64_t msclock(); 			// a milliseconds clock
+extern uint64_t msclock();      // a milliseconds clock
 
 #endif
diff --git a/client/whereami.c b/client/whereami.c
index 127e49504..83d178535 100644
--- a/client/whereami.c
+++ b/client/whereami.c
@@ -580,7 +580,7 @@ int WAI_PREFIX(getExecutablePath)(char* out, int capacity, int* dirname_length)
 #else
     int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
 #endif
-	size_t size = sizeof(buffer1);
+    size_t size = sizeof(buffer1);
 
     if (sysctl(mib, (u_int)(sizeof(mib) / sizeof(mib[0])), path, &size, NULL, 0) != 0)
         break;
diff --git a/common/protocols.h b/common/protocols.h
index 50e6e0b46..8091ca7ba 100644
--- a/common/protocols.h
+++ b/common/protocols.h
@@ -350,11 +350,11 @@ ISO 7816-4 Basic interindustry commands. For command APDU's.
 
 // LEGIC Commands
 #define LEGIC_MIM_22                    0x0D
-#define	LEGIC_MIM_256                   0x1D
-#define	LEGIC_MIM_1024                  0x3D
+#define LEGIC_MIM_256                   0x1D
+#define LEGIC_MIM_1024                  0x3D
 #define LEGIC_ACK_22                    0x19
 #define LEGIC_ACK_256                   0x39
-#define	LEGIC_READ                      0x01
+#define LEGIC_READ                      0x01
 #define LEGIC_WRITE                     0x00
 
 void printIclassDumpInfo(uint8_t* iclass_dump);

From 0373696662b0372bf1e1512b8c788990fc0bbd4c Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 10 Mar 2019 00:00:59 +0100
Subject: [PATCH 0715/1938] make style

---
 Makefile                                     |    5 +
 armsrc/BigBuf.c                              |   65 +-
 armsrc/BigBuf.h                              |    2 +-
 armsrc/LCD.c                                 |   82 +-
 armsrc/LCD.h                                 |    4 +-
 armsrc/Standalone/hf_bog.c                   |   50 +-
 armsrc/Standalone/hf_colin.c                 |  657 ++---
 armsrc/Standalone/hf_mattyrun.c              |   91 +-
 armsrc/Standalone/hf_young.c                 |   27 +-
 armsrc/Standalone/lf_hidbrute.c              |   41 +-
 armsrc/Standalone/lf_hidbrute.h              |    2 +-
 armsrc/Standalone/lf_proxbrute.c             |   13 +-
 armsrc/Standalone/lf_samyrun.c               |    9 +-
 armsrc/aes.c                                 |  154 +-
 armsrc/aes.h                                 |   10 +-
 armsrc/appmain.c                             |  371 +--
 armsrc/apps.h                                |   62 +-
 armsrc/buzzer.c                              |   49 +-
 armsrc/buzzer.h                              |    2 +-
 armsrc/des.c                                 |  307 ++-
 armsrc/des.h                                 |   14 +-
 armsrc/desfire_crypto.c                      |  773 +++---
 armsrc/desfire_key.c                         |  149 +-
 armsrc/desfire_key.h                         |   22 +-
 armsrc/epa.c                                 |   74 +-
 armsrc/felica.c                              |  194 +-
 armsrc/flashmem.c                            |  175 +-
 armsrc/fonts.c                               |  194 +-
 armsrc/fpgaloader.c                          |  162 +-
 armsrc/hfsnoop.c                             |   19 +-
 armsrc/hitag2.c                              |  847 +++---
 armsrc/hitagS.c                              | 1164 ++++----
 armsrc/iclass.c                              |  535 ++--
 armsrc/iso14443a.c                           | 1046 +++----
 armsrc/iso14443a.h                           |    8 +-
 armsrc/iso14443b.c                           |  315 ++-
 armsrc/iso14443b.h                           |    6 +-
 armsrc/iso15693.c                            |  174 +-
 armsrc/legicrf.c                             |  644 ++---
 armsrc/legicrfsim.c                          |  608 +++--
 armsrc/lfops.c                               |  769 +++---
 armsrc/lfsampling.c                          |  135 +-
 armsrc/lfsampling.h                          |    2 +-
 armsrc/mifarecmd.c                           |  597 ++--
 armsrc/mifaredesfire.c                       |  195 +-
 armsrc/mifaresniff.c                         |   65 +-
 armsrc/mifareutil.c                          |  265 +-
 armsrc/mifareutil.h                          |   10 +-
 armsrc/optimized_cipher.c                    |   92 +-
 armsrc/optimized_cipher.h                    |    2 +-
 armsrc/pcf7931.c                             |  257 +-
 armsrc/pcf7931.h                             |    8 +-
 armsrc/printf.c                              |  535 ++--
 armsrc/printf.h                              |    6 +-
 armsrc/start.c                               |    4 +-
 armsrc/string.c                              |   23 +-
 armsrc/string.h                              |    2 +-
 armsrc/ticks.c                               |  103 +-
 armsrc/util.c                                |  198 +-
 armsrc/util.h                                |    8 +-
 armsrc/vtsend.c                              |   54 +-
 armsrc/vtsend.h                              |    8 +-
 bootrom/bootrom.c                            |  144 +-
 client/amiitool/amiibo.c                     |   69 +-
 client/amiitool/amiibo.h                     |    8 +-
 client/amiitool/amiitool.c                   |   49 +-
 client/amiitool/drbg.c                       |   12 +-
 client/amiitool/drbg.h                       |    8 +-
 client/amiitool/keygen.c                     |    8 +-
 client/amiitool/keygen.h                     |    2 +-
 client/cli.c                                 |   73 +-
 client/cliparser/argtable3.c                 | 2332 ++++++++--------
 client/cliparser/argtable3.h                 |  281 +-
 client/cliparser/cliparser.c                 |   49 +-
 client/cliparser/cliparser.h                 |    6 +-
 client/cliparser/getopt.h                    |   10 +-
 client/cmdanalyse.c                          |  461 ++--
 client/cmdcrc.c                              |  117 +-
 client/cmddata.c                             |  728 ++---
 client/cmddata.h                             |    4 +-
 client/cmdflashmem.c                         |  359 +--
 client/cmdflashmem.h                         |    6 +-
 client/cmdhf.c                               |   23 +-
 client/cmdhf14a.c                            |  443 +--
 client/cmdhf14a.h                            |    6 +-
 client/cmdhf14b.c                            |  540 ++--
 client/cmdhf14b.h                            |    4 +-
 client/cmdhf15.c                             |  502 ++--
 client/cmdhf15.h                             |    4 +-
 client/cmdhfepa.c                            |   18 +-
 client/cmdhffelica.c                         |  329 ++-
 client/cmdhffido.c                           |  147 +-
 client/cmdhficlass.c                         | 1675 ++++++------
 client/cmdhficlass.h                         |   10 +-
 client/cmdhflegic.c                          |  677 ++---
 client/cmdhflist.c                           |  991 +++++--
 client/cmdhflist.h                           |   32 +-
 client/cmdhfmf.c                             | 1481 +++++-----
 client/cmdhfmf.h                             |   56 +-
 client/cmdhfmfdes.c                          |  384 +--
 client/cmdhfmfdes.h                          |   74 +-
 client/cmdhfmfdesfire.c                      |  151 +-
 client/cmdhfmfhard.c                         |  483 ++--
 client/cmdhfmfp.c                            |  157 +-
 client/cmdhfmfu.c                            | 1358 +++++----
 client/cmdhfmfu.h                            |   24 +-
 client/cmdhftopaz.c                          |  155 +-
 client/cmdhw.c                               |  419 ++-
 client/cmdlf.c                               |  350 +--
 client/cmdlfawid.c                           |  217 +-
 client/cmdlfcotag.c                          |   35 +-
 client/cmdlfem4x.c                           |  604 ++--
 client/cmdlfem4x.h                           |    2 +-
 client/cmdlffdx.c                            |  124 +-
 client/cmdlfguard.c                          |   90 +-
 client/cmdlfhid.c                            |  382 +--
 client/cmdlfhitag.c                          |  166 +-
 client/cmdlfindala.c                         |  145 +-
 client/cmdlfio.c                             |  103 +-
 client/cmdlfjablotron.c                      |   94 +-
 client/cmdlfkeri.c                           |   68 +-
 client/cmdlfnedap.c                          |  156 +-
 client/cmdlfnexwatch.c                       |   61 +-
 client/cmdlfnoralsy.c                        |   91 +-
 client/cmdlfpac.c                            |   33 +-
 client/cmdlfparadox.c                        |   59 +-
 client/cmdlfpcf7931.c                        |   64 +-
 client/cmdlfpcf7931.h                        |    2 +-
 client/cmdlfpresco.c                         |   83 +-
 client/cmdlfpyramid.c                        |  122 +-
 client/cmdlfsecurakey.c                      |   45 +-
 client/cmdlft55xx.c                          | 1283 +++++----
 client/cmdlft55xx.h                          |   20 +-
 client/cmdlfti.c                             |  176 +-
 client/cmdlfviking.c                         |   76 +-
 client/cmdlfvisa2000.c                       |   85 +-
 client/cmdmain.c                             |   20 +-
 client/cmdmain.h                             |    2 +-
 client/cmdparser.c                           |   41 +-
 client/cmdparser.h                           |   11 +-
 client/cmdscript.c                           |   41 +-
 client/cmdsmartcard.c                        |  442 +--
 client/cmdsmartcard.h                        |    6 +-
 client/cmdtrace.c                            |  426 +--
 client/comms.c                               |   82 +-
 client/comms.h                               |    8 +-
 client/crypto/asn1dump.c                     |  110 +-
 client/crypto/asn1utils.c                    |   11 +-
 client/crypto/libpcrypto.c                   |   52 +-
 client/crypto/libpcrypto.h                   |    2 +-
 client/emv/apduinfo.c                        |   11 +-
 client/emv/apduinfo.h                        |    4 +-
 client/emv/cmdemv.c                          |  288 +-
 client/emv/crypto_polarssl.c                 |   29 +-
 client/emv/dump.c                            |    2 +-
 client/emv/emv_pk.c                          |   92 +-
 client/emv/emv_pki.c                         |  205 +-
 client/emv/emv_pki.h                         |   18 +-
 client/emv/emv_pki_priv.c                    |   68 +-
 client/emv/emv_pki_priv.h                    |    4 +-
 client/emv/emv_roca.c                        |   56 +-
 client/emv/emv_roca.h                        |    4 +-
 client/emv/emv_tags.c                        |  370 +--
 client/emv/emvcore.c                         |  379 +--
 client/emv/emvcore.h                         |    2 +-
 client/emv/emvjson.c                         |  137 +-
 client/emv/emvjson.h                         |    2 +-
 client/emv/test/cda_test.c                   |   78 +-
 client/emv/test/crypto_test.c                |   20 +-
 client/emv/test/crypto_test.h                |    2 +-
 client/emv/test/cryptotest.c                 |    7 +-
 client/emv/test/dda_test.c                   |   68 +-
 client/emv/test/sda_test.c                   |   52 +-
 client/emv/tlv.c                             |   45 +-
 client/fido/additional_ca.c                  |  106 +-
 client/fido/cbortools.c                      |  298 +-
 client/fido/cose.c                           |   52 +-
 client/fido/fidocore.c                       |   82 +-
 client/flash.c                               |   61 +-
 client/flash.h                               |    2 +-
 client/flasher.c                             |   15 +-
 client/fpga_compress.c                       |  136 +-
 client/graph.c                               |   62 +-
 client/hardnested/hardnested_bf_core.c       |  234 +-
 client/hardnested/hardnested_bitarray_core.c |  254 +-
 client/hardnested/hardnested_bruteforce.c    |   80 +-
 client/hardnested/hardnested_bruteforce.h    |    2 +-
 client/hardnested/hardnested_tables.c        |  191 +-
 client/hid-flasher/flash.c                   |   44 +-
 client/hid-flasher/flasher.c                 |    3 +-
 client/hid-flasher/proxendian.h              |    4 +-
 client/hid-flasher/proxusb.c                 |  169 +-
 client/hid-flasher/proxusb.h                 |    8 +-
 client/jansson/dump.c                        |  217 +-
 client/jansson/error.c                       |    2 +-
 client/jansson/hashtable.c                   |   69 +-
 client/jansson/hashtable_seed.c              |   30 +-
 client/jansson/jansson.h                     |   15 +-
 client/jansson/jansson_private.h             |    2 +-
 client/jansson/load.c                        |  338 ++-
 client/jansson/lookup3.h                     |  412 +--
 client/jansson/memory.c                      |    6 +-
 client/jansson/pack_unpack.c                 |  219 +-
 client/jansson/path.c                        |    8 +-
 client/jansson/strbuffer.c                   |   14 +-
 client/jansson/strconv.c                     |   29 +-
 client/jansson/utf.c                         |   94 +-
 client/jansson/value.c                       |  220 +-
 client/loclass/cipher.c                      |   72 +-
 client/loclass/cipher.h                      |    2 +-
 client/loclass/cipherutils.c                 |  116 +-
 client/loclass/cipherutils.h                 |   28 +-
 client/loclass/elite_crack.c                 |  255 +-
 client/loclass/elite_crack.h                 |    4 +-
 client/loclass/fileutils.c                   |  176 +-
 client/loclass/fileutils.h                   |   28 +-
 client/loclass/hash1_brute.c                 |   54 +-
 client/loclass/ikeys.c                       |  423 +--
 client/loclass/main.c                        |   48 +-
 client/mifare/mad.c                          |   29 +-
 client/mifare/mfkey.c                        |   65 +-
 client/mifare/mifare4.c                      |  136 +-
 client/mifare/mifare4.h                      |    4 +-
 client/mifare/mifaredefault.h                |    3 +-
 client/mifare/mifarehost.c                   |  552 ++--
 client/mifare/mifarehost.h                   |   36 +-
 client/mifare/ndef.c                         |   70 +-
 client/pm3_binlib.c                          |  521 ++--
 client/pm3_binlib.h                          |    2 +-
 client/pm3_bitlib.c                          |  102 +-
 client/pm3_bitlib.h                          |    2 +-
 client/proxendian.h                          |    4 +-
 client/proxgui.cpp                           |    3 +-
 client/proxgui.h                             |    2 +-
 client/proxguiqt.cpp                         |  224 +-
 client/proxguiqt.h                           |  157 +-
 client/proxmark3.c                           |   64 +-
 client/reveng/bmpbit.c                       |   33 +-
 client/reveng/cli.c                          |  173 +-
 client/reveng/config.h                       |    2 +-
 client/reveng/getopt.c                       |   62 +-
 client/reveng/model.c                        |   34 +-
 client/reveng/poly.c                         |  532 ++--
 client/reveng/preset.c                       | 1074 ++++----
 client/reveng/reveng.c                       |  177 +-
 client/reveng/reveng.h                       |    2 +-
 client/scandir.c                             |   34 +-
 client/scandir.h                             |    4 +-
 client/scripting.c                           |  241 +-
 client/snooper.c                             |   44 +-
 client/tinycbor/cbor.h                       |   22 +-
 client/tinycbor/cborencoder.c                |    6 +-
 client/tinycbor/cborerrorstrings.c           |  132 +-
 client/tinycbor/cborinternal_p.h             |    6 +-
 client/tinycbor/cborjson.h                   |    3 +-
 client/tinycbor/cborparser.c                 |   60 +-
 client/tinycbor/cborpretty.c                 |  386 +--
 client/tinycbor/cbortojson.c                 |  300 +-
 client/tinycbor/cborvalidation.c             |  172 +-
 client/tinycbor/open_memstream.c             |    3 +-
 client/ui.c                                  |   90 +-
 client/ui.h                                  |    2 +-
 client/util.c                                |  330 ++-
 client/util.h                                |  144 +-
 client/util_darwin.h                         |    2 +-
 client/util_posix.c                          |  132 +-
 client/whereami.c                            |  737 +++--
 client/whereami.h                            |    6 +-
 common/bucketsort.c                          |    4 +-
 common/bucketsort.h                          |   10 +-
 common/cmd.c                                 |   13 +-
 common/cmd.h                                 |    2 +-
 common/crapto1/crapto1.c                     |  125 +-
 common/crapto1/crapto1.h                     |   22 +-
 common/crapto1/crypto1.c                     |   12 +-
 common/crc.c                                 |   45 +-
 common/crc.h                                 |   16 +-
 common/crc16.c                               |  166 +-
 common/crc16.h                               |    2 +-
 common/crc32.c                               |   17 +-
 common/crc32.h                               |    2 +-
 common/crc64.c                               |  131 +-
 common/crc64.h                               |    2 +-
 common/default_version.c                     |   10 +-
 common/emvtags.h                             |    6 +-
 common/fpga.h                                |    2 +-
 common/i2c.c                                 |  240 +-
 common/iso14443crc.c                         |    8 +-
 common/iso15693tools.c                       |   11 +-
 common/iso15693tools.h                       |   72 +-
 common/legic_prng.c                          |   23 +-
 common/lfdemod.c                             |  840 +++---
 common/lfdemod.h                             |    2 +-
 common/mbedtls/aes.c                         | 1749 ++++++------
 common/mbedtls/aes.h                         |  144 +-
 common/mbedtls/arc4.c                        |   85 +-
 common/mbedtls/arc4.h                        |   17 +-
 common/mbedtls/asn1.h                        |   82 +-
 common/mbedtls/asn1parse.c                   |  315 ++-
 common/mbedtls/asn1write.c                   |  301 +-
 common/mbedtls/asn1write.h                   |   54 +-
 common/mbedtls/base64.c                      |  164 +-
 common/mbedtls/base64.h                      |   10 +-
 common/mbedtls/bignum.c                      | 1846 ++++++-------
 common/mbedtls/bignum.h                      |  201 +-
 common/mbedtls/blowfish.c                    |  307 +--
 common/mbedtls/blowfish.h                    |   59 +-
 common/mbedtls/bn_mul.h                      |  962 +++----
 common/mbedtls/camellia.c                    | 1106 ++++----
 common/mbedtls/camellia.h                    |   65 +-
 common/mbedtls/certs.c                       |  526 ++--
 common/mbedtls/certs.h                       |   16 +-
 common/mbedtls/cipher.c                      |  854 +++---
 common/mbedtls/cipher.h                      |  124 +-
 common/mbedtls/cipher_internal.h             |   58 +-
 common/mbedtls/cipher_wrap.c                 |  640 +++--
 common/mbedtls/cmac.c                        |  668 +++--
 common/mbedtls/cmac.h                        |   33 +-
 common/mbedtls/ctr_drbg.c                    |  489 ++--
 common/mbedtls/ctr_drbg.h                    |   61 +-
 common/mbedtls/des.c                         |  716 +++--
 common/mbedtls/des.h                         |   82 +-
 common/mbedtls/ecdsa.c                       |  317 ++-
 common/mbedtls/ecdsa.h                       |   52 +-
 common/mbedtls/ecp.c                         | 1626 +++++------
 common/mbedtls/ecp.h                         |  121 +-
 common/mbedtls/ecp_curves.c                  | 1231 +++++----
 common/mbedtls/ecp_internal.h                |   46 +-
 common/mbedtls/entropy.c                     |  428 ++-
 common/mbedtls/entropy.h                     |   38 +-
 common/mbedtls/entropy_poll.c                |  140 +-
 common/mbedtls/entropy_poll.h                |   24 +-
 common/mbedtls/error.c                       | 1003 ++++---
 common/mbedtls/error.h                       |    2 +-
 common/mbedtls/md.c                          |  363 ++-
 common/mbedtls/md.h                          |   77 +-
 common/mbedtls/md5.c                         |  433 +--
 common/mbedtls/md5.h                         |   57 +-
 common/mbedtls/md_internal.h                 |   23 +-
 common/mbedtls/md_wrap.c                     |  334 +--
 common/mbedtls/oid.c                         |  291 +-
 common/mbedtls/oid.h                         |   49 +-
 common/mbedtls/pem.c                         |  372 ++-
 common/mbedtls/pem.h                         |   21 +-
 common/mbedtls/pk.c                          |  285 +-
 common/mbedtls/pk.h                          |  146 +-
 common/mbedtls/pk_internal.h                 |   50 +-
 common/mbedtls/pk_wrap.c                     |  354 ++-
 common/mbedtls/pkcs12.c                      |  252 +-
 common/mbedtls/pkcs12.h                      |   26 +-
 common/mbedtls/pkcs5.c                       |  322 ++-
 common/mbedtls/pkcs5.h                       |   18 +-
 common/mbedtls/pkparse.c                     | 1132 ++++----
 common/mbedtls/pkwrite.c                     |  336 ++-
 common/mbedtls/platform.c                    |  165 +-
 common/mbedtls/platform.h                    |   51 +-
 common/mbedtls/platform_util.c               |    6 +-
 common/mbedtls/platform_util.h               |    2 +-
 common/mbedtls/rsa.c                         | 1849 ++++++-------
 common/mbedtls/rsa.h                         |  299 +-
 common/mbedtls/rsa_internal.c                |  327 +--
 common/mbedtls/rsa_internal.h                |   36 +-
 common/mbedtls/sha1.c                        |  470 ++--
 common/mbedtls/sha1.h                        |   57 +-
 common/mbedtls/sha256.c                      |  429 ++-
 common/mbedtls/sha256.h                      |   63 +-
 common/mbedtls/sha512.c                      |  456 ++--
 common/mbedtls/sha512.h                      |   75 +-
 common/mbedtls/threading.c                   |   76 +-
 common/mbedtls/threading.h                   |   21 +-
 common/mbedtls/timing.c                      |  272 +-
 common/mbedtls/timing.h                      |   18 +-
 common/mbedtls/x509.c                        |  741 +++--
 common/mbedtls/x509.h                        |   83 +-
 common/mbedtls/x509_crl.c                    |  569 ++--
 common/mbedtls/x509_crl.h                    |   22 +-
 common/mbedtls/x509_crt.c                    | 1751 ++++++------
 common/mbedtls/x509_crt.h                    |  131 +-
 common/parity.c                              |   64 +-
 common/parity.h                              |    6 +-
 common/prng.c                                |   16 +-
 common/prng.h                                |    8 +-
 common/protocols.c                           |   85 +-
 common/protocols.h                           |    2 +-
 common/radixsort.c                           |   27 +-
 common/radixsort.h                           |    2 +-
 common/random.c                              |   11 +-
 common/tea.c                                 |   34 +-
 common/usart.c                               |   19 +-
 common/usb_cdc.c                             |  423 +--
 common/usb_cdc.h                             |    4 +-
 common/wiegand.c                             |   68 +-
 common/wiegand.h                             |    2 +-
 include/common.h                             |   30 +-
 include/hitagS.h                             |   15 +-
 include/mifare.h                             |   70 +-
 include/proxmark3.h                          |    4 +-
 include/usb_cmd.h                            |   30 +-
 liblua/lapi.c                                | 2007 +++++++-------
 liblua/lapi.h                                |    4 +-
 liblua/lauxlib.c                             | 1289 ++++-----
 liblua/lauxlib.h                             |  144 +-
 liblua/lbaselib.c                            |  769 +++---
 liblua/lbitlib.c                             |  290 +-
 liblua/lcode.c                               | 1633 +++++------
 liblua/lcode.h                               |   80 +-
 liblua/lcorolib.c                            |  247 +-
 liblua/lctype.c                              |   66 +-
 liblua/ldblib.c                              |  679 ++---
 liblua/ldebug.c                              |  954 ++++---
 liblua/ldebug.h                              |   18 +-
 liblua/ldo.c                                 |  980 +++----
 liblua/ldo.h                                 |   32 +-
 liblua/ldump.c                               |  211 +-
 liblua/lfunc.c                               |  216 +-
 liblua/lfunc.h                               |   20 +-
 liblua/lgc.c                                 | 1628 +++++------
 liblua/lgc.h                                 |   40 +-
 liblua/linit.c                               |   53 +-
 liblua/liolib.c                              |  832 +++---
 liblua/llex.c                                |  810 +++---
 liblua/llex.h                                |   66 +-
 liblua/llimits.h                             |   18 +-
 liblua/lmathlib.c                            |  398 +--
 liblua/lmem.c                                |   80 +-
 liblua/lmem.h                                |   26 +-
 liblua/loadlib.c                             |  845 +++---
 liblua/lobject.c                             |  397 +--
 liblua/lobject.h                             |  242 +-
 liblua/lopcodes.c                            |  166 +-
 liblua/lopcodes.h                            |  112 +-
 liblua/loslib.c                              |  396 +--
 liblua/lparser.c                             | 2583 +++++++++---------
 liblua/lparser.h                             |  116 +-
 liblua/lstate.c                              |  386 +--
 liblua/lstate.h                              |  180 +-
 liblua/lstring.c                             |  212 +-
 liblua/lstring.h                             |   16 +-
 liblua/lstrlib.c                             | 1627 +++++------
 liblua/ltable.c                              |  794 +++---
 liblua/ltable.h                              |   28 +-
 liblua/ltablib.c                             |  409 +--
 liblua/ltm.c                                 |   78 +-
 liblua/ltm.h                                 |   46 +-
 liblua/lua.c                                 |  672 ++---
 liblua/lua.h                                 |  236 +-
 liblua/luac.c                                |  662 ++---
 liblua/luaconf.h                             |   12 +-
 liblua/lualib.h                              |   22 +-
 liblua/lundump.c                             |  324 ++-
 liblua/lundump.h                             |    6 +-
 liblua/lvm.c                                 | 1488 +++++-----
 liblua/lvm.h                                 |   30 +-
 liblua/lzio.c                                |   88 +-
 liblua/lzio.h                                |   28 +-
 tools/mfkey/crapto1.c                        |  164 +-
 tools/mfkey/crapto1.h                        |   38 +-
 tools/mfkey/crypto1.c                        |   12 +-
 tools/mfkey/mfkey32.c                        |   38 +-
 tools/mfkey/mfkey32v2.c                      |   42 +-
 tools/mfkey/mfkey64.c                        |   35 +-
 tools/nonce2key/crapto1.c                    |  164 +-
 tools/nonce2key/crapto1.h                    |   38 +-
 tools/nonce2key/crypto1.c                    |   12 +-
 tools/nonce2key/nonce2key.c                  |   35 +-
 uart/uart.h                                  |    8 +-
 uart/uart_posix.c                            |  220 +-
 uart/uart_win32.c                            |   48 +-
 zlib/adler32.c                               |   24 +-
 zlib/deflate.c                               |  527 ++--
 zlib/deflate.h                               |   62 +-
 zlib/inffast.c                               |   37 +-
 zlib/inffixed.h                              |  182 +-
 zlib/inflate.c                               | 1121 ++++----
 zlib/inflate.h                               |   42 +-
 zlib/inftrees.c                              |   61 +-
 zlib/inftrees.h                              |    4 +-
 zlib/trees.c                                 |  419 +--
 zlib/trees.h                                 |  218 +-
 zlib/zconf.h                                 |   70 +-
 zlib/zlib.h                                  |   94 +-
 zlib/zutil.c                                 |  153 +-
 zlib/zutil.h                                 |   60 +-
 483 files changed, 56514 insertions(+), 52451 deletions(-)

diff --git a/Makefile b/Makefile
index bf298e652..fa3bcf3bc 100644
--- a/Makefile
+++ b/Makefile
@@ -90,6 +90,11 @@ print-%: ; @echo $* = $($*)
 
 style:
 	find . \( -name "*.[ch]" -or -name "*.cpp" -or -name "*.lua" \) -exec perl -pi -e 's/[ \t\r]+$$//' {} \;
+	find . \( -name "*.[ch]" -or -name "*.cpp" \) -exec astyle --formatted --mode=c --suffix=none \
+	    --indent=spaces=4 --indent-switches --indent-preprocessor \
+	    --keep-one-line-blocks --max-instatement-indent=60 \
+	    --style=linux --pad-oper --unpad-paren --pad-header \
+	    --align-pointer=name {} \;
 
 # Dummy target to test for GNU make availability
 _test:
diff --git a/armsrc/BigBuf.c b/armsrc/BigBuf.c
index 26421732c..fcbf898ab 100644
--- a/armsrc/BigBuf.c
+++ b/armsrc/BigBuf.c
@@ -13,7 +13,7 @@
 // BigBuf is the large multi-purpose buffer, typically used to hold A/D samples or traces.
 // Also used to hold various smaller buffers and the Mifare Emulator Memory.
 // declare it as uint32_t to achieve alignment to 4 Byte boundary
-static uint32_t BigBuf[BIGBUF_SIZE/sizeof(uint32_t)];
+static uint32_t BigBuf[BIGBUF_SIZE / sizeof(uint32_t)];
 
 /* BigBuf memory layout:
 Pointer to highest available memory: BigBuf_hi
@@ -34,12 +34,14 @@ static uint32_t traceLen = 0;
 static bool tracing = true; //todo static?
 
 // get the address of BigBuf
-uint8_t *BigBuf_get_addr(void) {
+uint8_t *BigBuf_get_addr(void)
+{
     return (uint8_t *)BigBuf;
 }
 
 // get the address of the emulator memory. Allocate part of Bigbuf for it, if not yet done
-uint8_t *BigBuf_get_EM_addr(void) {
+uint8_t *BigBuf_get_EM_addr(void)
+{
     // not yet allocated
     if (emulator_memory == NULL)
         emulator_memory = BigBuf_malloc(CARD_MEMORY_SIZE);
@@ -48,28 +50,33 @@ uint8_t *BigBuf_get_EM_addr(void) {
 }
 
 // clear ALL of BigBuf
-void BigBuf_Clear(void) {
+void BigBuf_Clear(void)
+{
     BigBuf_Clear_ext(true);
 }
 
 // clear ALL of BigBuf
-void BigBuf_Clear_ext(bool verbose) {
+void BigBuf_Clear_ext(bool verbose)
+{
     memset(BigBuf, 0, BIGBUF_SIZE);
     if (verbose)
         Dbprintf("Buffer cleared (%i bytes)", BIGBUF_SIZE);
 }
 
-void BigBuf_Clear_EM(void) {
+void BigBuf_Clear_EM(void)
+{
     memset(BigBuf_get_EM_addr(), 0, CARD_MEMORY_SIZE);
 }
 
-void BigBuf_Clear_keep_EM(void) {
+void BigBuf_Clear_keep_EM(void)
+{
     memset(BigBuf, 0, BigBuf_hi);
 }
 
 // allocate a chunk of memory from BigBuf. We allocate high memory first. The unallocated memory
 // at the beginning of BigBuf is always for traces/samples
-uint8_t *BigBuf_malloc(uint16_t chunksize) {
+uint8_t *BigBuf_malloc(uint16_t chunksize)
+{
     if (BigBuf_hi - chunksize < 0)
         return NULL; // no memory left
 
@@ -79,14 +86,16 @@ uint8_t *BigBuf_malloc(uint16_t chunksize) {
 }
 
 // free ALL allocated chunks. The whole BigBuf is available for traces or samples again.
-void BigBuf_free(void){
+void BigBuf_free(void)
+{
     BigBuf_hi = BIGBUF_SIZE;
     emulator_memory = NULL;
     // shouldn't this empty BigBuf also?
 }
 
 // free allocated chunks EXCEPT the emulator memory
-void BigBuf_free_keep_EM(void) {
+void BigBuf_free_keep_EM(void)
+{
     if (emulator_memory != NULL)
         BigBuf_hi = emulator_memory - (uint8_t *)BigBuf;
     else
@@ -95,7 +104,8 @@ void BigBuf_free_keep_EM(void) {
     // shouldn't this empty BigBuf also?
 }
 
-void BigBuf_print_status(void) {
+void BigBuf_print_status(void)
+{
     Dbprintf("Memory");
     Dbprintf("  BIGBUF_SIZE.............%d", BIGBUF_SIZE);
     Dbprintf("  Available memory........%d", BigBuf_hi);
@@ -105,21 +115,26 @@ void BigBuf_print_status(void) {
 }
 
 // return the maximum trace length (i.e. the unallocated size of BigBuf)
-uint16_t BigBuf_max_traceLen(void) {
+uint16_t BigBuf_max_traceLen(void)
+{
     return BigBuf_hi;
 }
 
-void clear_trace(void) {
+void clear_trace(void)
+{
     traceLen = 0;
 }
-void set_tracelen(uint32_t value) {
+void set_tracelen(uint32_t value)
+{
     traceLen = value;
 }
-void set_tracing(bool enable) {
+void set_tracing(bool enable)
+{
     tracing = enable;
 }
 
-bool get_tracing(void) {
+bool get_tracing(void)
+{
     return tracing;
 }
 
@@ -127,7 +142,8 @@ bool get_tracing(void) {
  * Get the number of bytes traced
  * @return
  */
-uint32_t BigBuf_get_traceLen(void) {
+uint32_t BigBuf_get_traceLen(void)
+{
     return traceLen;
 }
 
@@ -137,12 +153,13 @@ uint32_t BigBuf_get_traceLen(void) {
   by 'hf list raw', alternatively 'hf list <proto>' for protocol-specific
   annotation of commands/responses.
 **/
-bool RAMFUNC LogTrace(const uint8_t *btBytes, uint16_t iLen, uint32_t timestamp_start, uint32_t timestamp_end, uint8_t *parity, bool readerToTag) {
+bool RAMFUNC LogTrace(const uint8_t *btBytes, uint16_t iLen, uint32_t timestamp_start, uint32_t timestamp_end, uint8_t *parity, bool readerToTag)
+{
     if (!tracing) return false;
 
     uint8_t *trace = BigBuf_get_addr();
 
-    uint32_t num_paritybytes = (iLen-1)/8 + 1; // number of valid paritybytes in *parity
+    uint32_t num_paritybytes = (iLen - 1) / 8 + 1; // number of valid paritybytes in *parity
     uint32_t duration = timestamp_end - timestamp_start;
 
     // Return when trace is full
@@ -195,7 +212,8 @@ bool RAMFUNC LogTrace(const uint8_t *btBytes, uint16_t iLen, uint32_t timestamp_
     return true;
 }
 
-int LogTraceHitag(const uint8_t * btBytes, int iBits, int iSamples, uint32_t dwParity, int readerToTag) {
+int LogTraceHitag(const uint8_t *btBytes, int iBits, int iSamples, uint32_t dwParity, int readerToTag)
+{
     /**
       Todo, rewrite the logger to use the generic functionality instead. It should be noted, however,
       that this logger takes number of bits as argument, not number of bytes.
@@ -237,10 +255,11 @@ int LogTraceHitag(const uint8_t * btBytes, int iBits, int iSamples, uint32_t dwP
 }
 
 // Emulator memory
-uint8_t emlSet(uint8_t *data, uint32_t offset, uint32_t length){
-    uint8_t* mem = BigBuf_get_EM_addr();
+uint8_t emlSet(uint8_t *data, uint32_t offset, uint32_t length)
+{
+    uint8_t *mem = BigBuf_get_EM_addr();
     if (offset + length < CARD_MEMORY_SIZE) {
-        memcpy(mem+offset, data, length);
+        memcpy(mem + offset, data, length);
         return 0;
     }
     Dbprintf("Error, trying to set memory outside of bounds! %d  > %d", (offset + length), CARD_MEMORY_SIZE);
diff --git a/armsrc/BigBuf.h b/armsrc/BigBuf.h
index e9a7b8098..995451b9b 100644
--- a/armsrc/BigBuf.h
+++ b/armsrc/BigBuf.h
@@ -42,6 +42,6 @@ extern void set_tracing(bool enable);
 extern void set_tracelen(uint32_t value);
 extern bool get_tracing(void);
 extern bool RAMFUNC LogTrace(const uint8_t *btBytes, uint16_t iLen, uint32_t timestamp_start, uint32_t timestamp_end, uint8_t *parity, bool readerToTag);
-extern int LogTraceHitag(const uint8_t * btBytes, int iBits, int iSamples, uint32_t dwParity, int bReader);
+extern int LogTraceHitag(const uint8_t *btBytes, int iBits, int iSamples, uint32_t dwParity, int bReader);
 extern uint8_t emlSet(uint8_t *data, uint32_t offset, uint32_t length);
 #endif /* __BIGBUF_H */
diff --git a/armsrc/LCD.c b/armsrc/LCD.c
index 7987da188..05c09964b 100644
--- a/armsrc/LCD.c
+++ b/armsrc/LCD.c
@@ -13,7 +13,7 @@ void LCDSend(unsigned int data)
     while ((AT91C_BASE_SPI->SPI_SR & AT91C_SPI_TXEMPTY) == 0);    // wait for the transfer to complete
     // For clarity's sake we pass data with 9th bit clear and commands with 9th
     // bit set since they're implemented as defines, se we need to invert bit
-    AT91C_BASE_SPI->SPI_TDR = data^0x100;                         // Send the data/command
+    AT91C_BASE_SPI->SPI_TDR = data ^ 0x100;                       // Send the data/command
 }
 
 void LCDSetXY(unsigned char x, unsigned char y)
@@ -29,29 +29,28 @@ void LCDSetXY(unsigned char x, unsigned char y)
 
 void LCDSetPixel(unsigned char x, unsigned char y, unsigned char color)
 {
-    LCDSetXY(x,y);              // Set position
+    LCDSetXY(x, y);             // Set position
     LCDSend(PRAMWR);            // Now write the pixel to the display
     LCDSend(color);             // Write the data in the specified Color
 }
 
-void LCDFill (unsigned char xs,unsigned char ys,unsigned char width,unsigned char height, unsigned char color)
+void LCDFill(unsigned char xs, unsigned char ys, unsigned char width, unsigned char height, unsigned char color)
 {
-    unsigned char i,j;
+    unsigned char i, j;
 
-    for (i=0;i < height;i++)    // Number of horizontal lines
-    {
-        LCDSetXY(xs,ys+i);      // Goto start of fill area (Top Left)
+    for (i = 0; i < height; i++) { // Number of horizontal lines
+        LCDSetXY(xs, ys + i);   // Goto start of fill area (Top Left)
         LCDSend(PRAMWR);        // Write to display
 
-        for (j=0;j < width;j++) // pixels per line
+        for (j = 0; j < width; j++) // pixels per line
             LCDSend(color);
     }
 }
 
-void LCDString (char *lcd_string, const char *font_style,unsigned char x, unsigned char y, unsigned char fcolor, unsigned char bcolor)
+void LCDString(char *lcd_string, const char *font_style, unsigned char x, unsigned char y, unsigned char fcolor, unsigned char bcolor)
 {
     unsigned int  i;
-    unsigned char mask=0, px, py, xme, yme, offset;
+    unsigned char mask = 0, px, py, xme, yme, offset;
     const char *data;
 
     data = font_style;          // point to the start of the font table
@@ -62,29 +61,28 @@ void LCDString (char *lcd_string, const char *font_style,unsigned char x, unsign
     data++;
     offset = *data;             // get data bytes per font
 
-    do
-    {
+    do {
         // point to data in table to be loaded
-        data =  (font_style + offset) + (offset * (int)(*lcd_string - 32));
+        data = (font_style + offset) + (offset * (int)(*lcd_string - 32));
 
-        for (i=0;i < yme;i++) {
-            mask |=0x80;
+        for (i = 0; i < yme; i++) {
+            mask |= 0x80;
 
-            for (px=x; px < (x + xme); px++) {
-                py= y + i;
+            for (px = x; px < (x + xme); px++) {
+                py = y + i;
 
-                if (*data & mask)    LCDSetPixel (px,py,fcolor);
-                else                 LCDSetPixel (px,py,bcolor);
+                if (*data & mask)    LCDSetPixel(px, py, fcolor);
+                else                 LCDSetPixel(px, py, bcolor);
 
-                mask>>=1;
+                mask >>= 1;
             }
             data++;
         }
-        x+=xme;
+        x += xme;
 
         lcd_string++;                       // next character in string
 
-    } while(*lcd_string !='\0');            // keep spitting chars out until end of string
+    } while (*lcd_string != '\0');          // keep spitting chars out until end of string
 }
 
 void LCDReset(void)
@@ -121,29 +119,29 @@ void LCDInit(void)
     LCDSend(0xDC);
 
     // clear display
-    LCDSetXY(0,0);
+    LCDSetXY(0, 0);
     LCDSend(PRAMWR);            // Write to display
-    i=LCD_XRES*LCD_YRES;
-    while(i--) LCDSend(WHITE);
+    i = LCD_XRES * LCD_YRES;
+    while (i--) LCDSend(WHITE);
 
-  // test text on different colored backgrounds
-    LCDString(" The quick brown fox  ",    (char *)&FONT6x8,1,1+8*0,WHITE  ,BLACK );
-    LCDString("  jumped over the     ",    (char *)&FONT6x8,1,1+8*1,BLACK  ,WHITE );
-    LCDString("     lazy dog.        ",    (char *)&FONT6x8,1,1+8*2,YELLOW ,RED   );
-    LCDString(" AaBbCcDdEeFfGgHhIiJj ",    (char *)&FONT6x8,1,1+8*3,RED    ,GREEN );
-    LCDString(" KkLlMmNnOoPpQqRrSsTt ",    (char *)&FONT6x8,1,1+8*4,MAGENTA,BLUE  );
-    LCDString("UuVvWwXxYyZz0123456789",    (char *)&FONT6x8,1,1+8*5,BLUE   ,YELLOW);
-    LCDString("`-=[]_;',./~!@#$%^&*()",    (char *)&FONT6x8,1,1+8*6,BLACK  ,CYAN  );
-    LCDString("     _+{}|:\\\"<>?     ",   (char *)&FONT6x8,1,1+8*7,BLUE  ,MAGENTA);
+    // test text on different colored backgrounds
+    LCDString(" The quick brown fox  ", (char *)&FONT6x8, 1, 1 + 8 * 0, WHITE, BLACK);
+    LCDString("  jumped over the     ", (char *)&FONT6x8, 1, 1 + 8 * 1, BLACK, WHITE);
+    LCDString("     lazy dog.        ", (char *)&FONT6x8, 1, 1 + 8 * 2, YELLOW, RED);
+    LCDString(" AaBbCcDdEeFfGgHhIiJj ", (char *)&FONT6x8, 1, 1 + 8 * 3, RED, GREEN);
+    LCDString(" KkLlMmNnOoPpQqRrSsTt ", (char *)&FONT6x8, 1, 1 + 8 * 4, MAGENTA, BLUE);
+    LCDString("UuVvWwXxYyZz0123456789", (char *)&FONT6x8, 1, 1 + 8 * 5, BLUE, YELLOW);
+    LCDString("`-=[]_;',./~!@#$%^&*()", (char *)&FONT6x8, 1, 1 + 8 * 6, BLACK, CYAN);
+    LCDString("     _+{}|:\\\"<>?     ", (char *)&FONT6x8, 1, 1 + 8 * 7, BLUE, MAGENTA);
 
     // color bands
-    LCDFill(0, 1+8* 8, 132, 8, BLACK);
-    LCDFill(0, 1+8* 9, 132, 8, WHITE);
-    LCDFill(0, 1+8*10, 132, 8, RED);
-    LCDFill(0, 1+8*11, 132, 8, GREEN);
-    LCDFill(0, 1+8*12, 132, 8, BLUE);
-    LCDFill(0, 1+8*13, 132, 8, YELLOW);
-    LCDFill(0, 1+8*14, 132, 8, CYAN);
-    LCDFill(0, 1+8*15, 132, 8, MAGENTA);
+    LCDFill(0, 1 + 8 * 8, 132, 8, BLACK);
+    LCDFill(0, 1 + 8 * 9, 132, 8, WHITE);
+    LCDFill(0, 1 + 8 * 10, 132, 8, RED);
+    LCDFill(0, 1 + 8 * 11, 132, 8, GREEN);
+    LCDFill(0, 1 + 8 * 12, 132, 8, BLUE);
+    LCDFill(0, 1 + 8 * 13, 132, 8, YELLOW);
+    LCDFill(0, 1 + 8 * 14, 132, 8, CYAN);
+    LCDFill(0, 1 + 8 * 15, 132, 8, MAGENTA);
 
 }
diff --git a/armsrc/LCD.h b/armsrc/LCD.h
index a21c3eeff..968c90246 100644
--- a/armsrc/LCD.h
+++ b/armsrc/LCD.h
@@ -124,7 +124,7 @@ void LCDInit(void);
 void LCDReset(void);
 void LCDSetXY(unsigned char x, unsigned char y);
 void LCDSetPixel(unsigned char x, unsigned char y, unsigned char color);
-void LCDString (char *lcd_string, const char *font_style,unsigned char x, unsigned char y, unsigned char fcolor, unsigned char bcolor);
-void LCDFill (unsigned char xs,unsigned char ys,unsigned char width,unsigned char height, unsigned char color);
+void LCDString(char *lcd_string, const char *font_style, unsigned char x, unsigned char y, unsigned char fcolor, unsigned char bcolor);
+void LCDFill(unsigned char xs, unsigned char ys, unsigned char width, unsigned char height, unsigned char color);
 
 #endif
diff --git a/armsrc/Standalone/hf_bog.c b/armsrc/Standalone/hf_bog.c
index 826fab0ee..a1197bdbe 100644
--- a/armsrc/Standalone/hf_bog.c
+++ b/armsrc/Standalone/hf_bog.c
@@ -27,13 +27,13 @@ from the client to view the stored quadlets.
 // Maximum number of auth attempts per standalone session
 #define MAX_PWDS_PER_SESSION 64
 
-uint8_t FindOffsetInFlash() {
+uint8_t FindOffsetInFlash()
+{
     uint8_t mem[4] = { 0x00, 0x00, 0x00, 0x00 };
     uint8_t eom[4] = { 0xFF, 0xFF, 0xFF, 0xFF };
     uint8_t memcnt = 0;
 
-    while (memcnt < 0xFF)
-    {
+    while (memcnt < 0xFF) {
         Flash_ReadData(memcnt, mem, 4);
         if (memcmp(mem, eom, 4) == 0) {
             return memcnt;
@@ -44,14 +44,15 @@ uint8_t FindOffsetInFlash() {
     return 0; // wrap-around
 }
 
-void EraseMemory() {
-    if (!FlashInit()){
+void EraseMemory()
+{
+    if (!FlashInit()) {
         return;
     }
 
     Flash_CheckBusy(BUSY_TIMEOUT);
     Flash_WriteEnable();
-    Flash_Erase4k(0,0);
+    Flash_Erase4k(0, 0);
 
     if (MF_DBGLEVEL > 1) Dbprintf("[!] Erased flash!");
     FlashStop();
@@ -59,13 +60,15 @@ void EraseMemory() {
 }
 
 // This is actually copied from SniffIso14443a
-void RAMFUNC SniffAndStore(uint8_t param) {
+void RAMFUNC SniffAndStore(uint8_t param)
+{
 
     iso14443a_setup(FPGA_HF_ISO14443A_SNIFFER);
 
     // Allocate memory from BigBuf for some buffers
     // free all previous allocations first
-    BigBuf_free(); BigBuf_Clear_ext(false);
+    BigBuf_free();
+    BigBuf_Clear_ext(false);
     clear_trace();
     set_tracing(true);
 
@@ -96,13 +99,13 @@ void RAMFUNC SniffAndStore(uint8_t param) {
     UartInit(receivedCmd, receivedCmdPar);
 
     // Setup and start DMA.
-    if ( !FpgaSetupSscDma((uint8_t*) dmaBuf, DMA_BUFFER_SIZE) ){
+    if (!FpgaSetupSscDma((uint8_t *) dmaBuf, DMA_BUFFER_SIZE)) {
         if (MF_DBGLEVEL > 1) Dbprintf("FpgaSetupSscDma failed. Exiting");
         return;
     }
 
-    tUart* uart = GetUart();
-    tDemod* demod = GetDemod();
+    tUart *uart = GetUart();
+    tDemod *demod = GetDemod();
 
     // We won't start recording the frames that we acquire until we trigger;
     // a good trigger condition to get started is probably when we see a
@@ -155,7 +158,7 @@ void RAMFUNC SniffAndStore(uint8_t param) {
 
             if (!TagIsActive) { // no need to try decoding reader data if the tag is sending
                 uint8_t readerdata = (previous_data & 0xF0) | (*data >> 4);
-                if (MillerDecoding(readerdata, (rsamples-1)*4)) {
+                if (MillerDecoding(readerdata, (rsamples - 1) * 4)) {
                     LED_C_ON();
 
                     // check - if there is a short 7bit request from reader
@@ -166,14 +169,14 @@ void RAMFUNC SniffAndStore(uint8_t param) {
                             if (MF_DBGLEVEL > 1) Dbprintf("PWD-AUTH KEY: 0x%02x%02x%02x%02x", receivedCmd[1], receivedCmd[2], receivedCmd[3], receivedCmd[4]);
 
                             // temporarily save the captured pwd in our array
-                            memcpy(&capturedPwds[4 * auth_attempts], receivedCmd+1, 4);
+                            memcpy(&capturedPwds[4 * auth_attempts], receivedCmd + 1, 4);
                             auth_attempts++;
                         }
 
                         if (!LogTrace(receivedCmd,
                                       uart->len,
-                                      uart->startTime*16 - DELAY_READER_AIR2ARM_AS_SNIFFER,
-                                      uart->endTime*16 - DELAY_READER_AIR2ARM_AS_SNIFFER,
+                                      uart->startTime * 16 - DELAY_READER_AIR2ARM_AS_SNIFFER,
+                                      uart->endTime * 16 - DELAY_READER_AIR2ARM_AS_SNIFFER,
                                       uart->parity,
                                       true)) break;
                     }
@@ -190,13 +193,13 @@ void RAMFUNC SniffAndStore(uint8_t param) {
             // no need to try decoding tag data if the reader is sending - and we cannot afford the time
             if (!ReaderIsActive) {
                 uint8_t tagdata = (previous_data << 4) | (*data & 0x0F);
-                if (ManchesterDecoding(tagdata, 0, (rsamples-1)*4)) {
+                if (ManchesterDecoding(tagdata, 0, (rsamples - 1) * 4)) {
                     LED_B_ON();
 
                     if (!LogTrace(receivedResp,
                                   demod->len,
-                                  demod->startTime*16 - DELAY_TAG_AIR2ARM_AS_SNIFFER,
-                                  demod->endTime*16 - DELAY_TAG_AIR2ARM_AS_SNIFFER,
+                                  demod->startTime * 16 - DELAY_TAG_AIR2ARM_AS_SNIFFER,
+                                  demod->endTime * 16 - DELAY_TAG_AIR2ARM_AS_SNIFFER,
                                   demod->parity,
                                   false)) break;
 
@@ -239,8 +242,7 @@ void RAMFUNC SniffAndStore(uint8_t param) {
         uint8_t memoffset = FindOffsetInFlash();
         if (MF_DBGLEVEL > 1) Dbprintf("[!] Memory offset = %u", memoffset);
 
-        if ((memoffset + 4 * auth_attempts) > 0xFF)
-        {
+        if ((memoffset + 4 * auth_attempts) > 0xFF) {
             // We opt to keep the new data only
             memoffset = 0;
             if (MF_DBGLEVEL > 1) Dbprintf("[!] Size of total data > 256 bytes. Discarding the old data.");
@@ -248,8 +250,7 @@ void RAMFUNC SniffAndStore(uint8_t param) {
 
         // Get previous data from flash mem
         uint8_t *previousdata = BigBuf_malloc(memoffset);
-        if (memoffset > 0)
-        {
+        if (memoffset > 0) {
             uint16_t readlen = Flash_ReadData(0, previousdata, memoffset);
             if (MF_DBGLEVEL > 1) Dbprintf("[!] Read %u bytes from flash mem", readlen);
         }
@@ -271,7 +272,7 @@ void RAMFUNC SniffAndStore(uint8_t param) {
         uint16_t writelen = Flash_WriteData(0, total_data, memoffset + 4 * auth_attempts);
         if (MF_DBGLEVEL > 1) Dbprintf("[!] Wrote %u bytes into flash mem", writelen);
 
-                // If pwd saved successfully, blink led A three times
+        // If pwd saved successfully, blink led A three times
         if (writelen > 0) {
             SpinErr(0, 200, 5); // blink led A
         }
@@ -283,7 +284,8 @@ void RAMFUNC SniffAndStore(uint8_t param) {
     }
 }
 
-void RunMod() {
+void RunMod()
+{
 
     StandAloneMode();
 
diff --git a/armsrc/Standalone/hf_colin.c b/armsrc/Standalone/hf_colin.c
index 229236376..335269c71 100644
--- a/armsrc/Standalone/hf_colin.c
+++ b/armsrc/Standalone/hf_colin.c
@@ -112,16 +112,12 @@ void ReadLastTagFromFlash()
     uint32_t end_time;
     uint32_t start_time = end_time = GetTickCount();
 
-    for (size_t i = 0; i < len; i += size)
-    {
+    for (size_t i = 0; i < len; i += size) {
         len = MIN((len - i), size);
         isok = Flash_ReadDataCont(startidx + i, mem, len);
-        if (isok == len)
-        {
+        if (isok == len) {
             emlSetMem(mem, 0, 64);
-        }
-        else
-        {
+        } else {
             DbprintfEx(FLAG_NOLOG, "FlashMem reading failed | %d | %d", len, isok);
             cjSetCursLeft();
             FlashStop();
@@ -153,24 +149,23 @@ void WriteTagToFlash(uint8_t index, size_t size)
     uint32_t bytes_sent = 0;
     uint32_t bytes_remaining = len;
 
-    uint8_t data[(size * (16 * 64))/1024];
+    uint8_t data[(size * (16 * 64)) / 1024];
     uint8_t buff[PAGESIZE];
 
-    emlGetMem(data, 0, (size * 64)/1024);
+    emlGetMem(data, 0, (size * 64) / 1024);
 
-    if (!FlashInit()){
+    if (!FlashInit()) {
         return;
     }
 
     Flash_CheckBusy(BUSY_TIMEOUT);
     Flash_WriteEnable();
-    Flash_Erase4k(0,0);
+    Flash_Erase4k(0, 0);
 
     uint32_t end_time;
     uint32_t start_time = end_time = GetTickCount();
 
-    while (bytes_remaining > 0)
-    {
+    while (bytes_remaining > 0) {
         Flash_CheckBusy(BUSY_TIMEOUT);
         Flash_WriteEnable();
 
@@ -184,8 +179,7 @@ void WriteTagToFlash(uint8_t index, size_t size)
 
         isok = (res == bytes_in_packet) ? 1 : 0;
 
-        if (!isok)
-        {
+        if (!isok) {
             DbprintfEx(FLAG_NOLOG, "FlashMem write FAILEd [offset %u]", bytes_sent);
             cjSetCursLeft();
             SpinOff(100);
@@ -223,40 +217,40 @@ void RunMod()
     uint8_t *keyBlock = NULL; // Where the keys will be held in memory.
 
     /* VIGIK EXPIRED DUMP FOR STUDY
-Sector 0
-121C7F730208040001FA33F5CB2D021D
-44001049164916491649000000000000
-00000000000000000000000000000000
-A0A1A2A3A4A579678800010203040506
-Sector 1
-0F000000000000000000000000000000
-AA0700002102080000740C110600AF13
-000000000000000001740C1108220000
-314B4947495679678800010203040506
-Sector 2
-24E572B923A3D243B402D60CAB576956
-216D6501FC8618B6C426762511AC2DEE
-25BF4CEC3618D0BAB3A6E9210D887746
-314B4947495679678800010203040506
-Sector 3
-0FBC41A5D95398E76A1B2029E8EA9735
-088BA2CE732653D0C1147596AFCF94D7
-77B4D91F0442182273A29DEAF7A2D095
-314B4947495679678800010203040506
-Sector 4
-4CEE715866E508CDBC95C640EC9D1E58
-E800457CF8B079414E1B45DD3E6C9317
-77B4D91F0442182273A29DEAF7A2D095
-314B4947495679678800010203040506
-010203040506  0
-Sector 5-0F
-00000000000000000000000000000000
-00000000000000000000000000000000
-00000000000000000000000000000000
-FFFFFFFFFFFFFF078069FFFFFFFFFFFF
-KEY A : 1KGIV ;
-ACCBITS : 796788[00]+VALUE
-*/
+    Sector 0
+    121C7F730208040001FA33F5CB2D021D
+    44001049164916491649000000000000
+    00000000000000000000000000000000
+    A0A1A2A3A4A579678800010203040506
+    Sector 1
+    0F000000000000000000000000000000
+    AA0700002102080000740C110600AF13
+    000000000000000001740C1108220000
+    314B4947495679678800010203040506
+    Sector 2
+    24E572B923A3D243B402D60CAB576956
+    216D6501FC8618B6C426762511AC2DEE
+    25BF4CEC3618D0BAB3A6E9210D887746
+    314B4947495679678800010203040506
+    Sector 3
+    0FBC41A5D95398E76A1B2029E8EA9735
+    088BA2CE732653D0C1147596AFCF94D7
+    77B4D91F0442182273A29DEAF7A2D095
+    314B4947495679678800010203040506
+    Sector 4
+    4CEE715866E508CDBC95C640EC9D1E58
+    E800457CF8B079414E1B45DD3E6C9317
+    77B4D91F0442182273A29DEAF7A2D095
+    314B4947495679678800010203040506
+    010203040506  0
+    Sector 5-0F
+    00000000000000000000000000000000
+    00000000000000000000000000000000
+    00000000000000000000000000000000
+    FFFFFFFFFFFFFF078069FFFFFFFFFFFF
+    KEY A : 1KGIV ;
+    ACCBITS : 796788[00]+VALUE
+    */
 
     //----------------------------
     //   Set of keys to be used.
@@ -310,8 +304,7 @@ ACCBITS : 796788[00]+VALUE
     keyBlock = BigBuf_malloc(STKEYS * 6);
     int mfKeysCnt = sizeof(mfKeys) / sizeof(uint64_t);
 
-    for (int mfKeyCounter = 0; mfKeyCounter < mfKeysCnt; mfKeyCounter++)
-    {
+    for (int mfKeyCounter = 0; mfKeyCounter < mfKeysCnt; mfKeyCounter++) {
         num_to_bytes(mfKeys[mfKeyCounter], 6, (uint8_t *)(keyBlock + mfKeyCounter * 6));
     }
 
@@ -319,10 +312,8 @@ ACCBITS : 796788[00]+VALUE
     //   and why not a simple memset abuse to 0xffize the whole space in one go ?
     // uint8_t foundKey[2][40][6]; //= [ {0xff} ]; /* C99 abusal 6.7.8.21
     uint8_t foundKey[2][40][6];
-    for (uint16_t t = 0; t < 2; t++)
-    {
-        for (uint16_t sectorNo = 0; sectorNo < sectorsCnt; sectorNo++)
-        {
+    for (uint16_t t = 0; t < 2; t++) {
+        for (uint16_t sectorNo = 0; sectorNo < sectorsCnt; sectorNo++) {
             foundKey[t][sectorNo][0] = 0xFF;
             foundKey[t][sectorNo][1] = 0xFF;
             foundKey[t][sectorNo][2] = 0xFF;
@@ -363,18 +354,15 @@ failtag:
     LED_A_ON();
     uint8_t ticker = 0;
     //while (!BUTTON_PRESS() && !iso14443a_select_card(cjuid, NULL, &cjcuid, true, 0, true))
-    while (!iso14443a_select_card(cjuid, NULL, &cjcuid, true, 0, true))
-    {
+    while (!iso14443a_select_card(cjuid, NULL, &cjcuid, true, 0, true)) {
         WDT_HIT();
 
         ticker++;
-        if (ticker % 64 == 0)
-        {
+        if (ticker % 64 == 0) {
             LED_A_INV();
         }
 
-        if (BUTTON_HELD(10) > 0)
-        {
+        if (BUTTON_HELD(10) > 0) {
             WDT_HIT();
             DbprintfEx(FLAG_NOLOG, "\t\t\t[    READING FLASH   ]");
             ReadLastTagFromFlash();
@@ -393,8 +381,7 @@ failtag:
 
     DbprintfEx(FLAG_NOLOG, "\t%sGOT TAG :%s %08x%s", _RED_, _CYAN_, cjcuid, _WHITE_);
 
-    if (cjcuid == 0)
-    {
+    if (cjcuid == 0) {
         cjSetCursLeft();
         DbprintfEx(FLAG_NOLOG, "%s>>%s BUG: 0000_CJCUID! Retrying...", _RED_, _WHITE_);
         SpinErr(0, 100, 8);
@@ -441,29 +428,22 @@ failtag:
     // also we could avoid first UID check for every block
 
     // then let’s expose this “optimal case” of “well known vigik schemes” :
-    for (uint8_t type = 0; type < 2 && !err && !trapped; type++)
-    {
-        for (int sec = 0; sec < sectorsCnt && !err && !trapped; ++sec)
-        {
+    for (uint8_t type = 0; type < 2 && !err && !trapped; type++) {
+        for (int sec = 0; sec < sectorsCnt && !err && !trapped; ++sec) {
             key = cjat91_saMifareChkKeys(sec * 4, type, NULL, size, &keyBlock[0], &key64);
 
-            if (key == -1)
-            {
+            if (key == -1) {
                 err = 1;
                 allKeysFound = false;
                 // used in “portable” imlementation on microcontroller: it reports back the fail and open the standalone lock
                 // cmd_send(CMD_CJB_FSMSTATE_MENU, 0, 0, 0, 0, 0);
                 break;
-            }
-            else if (key == -2)
-            {
+            } else if (key == -2) {
                 err = 1; // Can't select card.
                 allKeysFound = false;
                 // cmd_send(CMD_CJB_FSMSTATE_MENU, 0, 0, 0, 0, 0);
                 break;
-            }
-            else
-            {
+            } else {
                 /*  BRACE YOURSELF : AS LONG AS WE TRAP A KNOWN KEY, WE STOP CHECKING AND ENFORCE KNOWN SCHEMES */
                 // uint8_t tosendkey[13];
                 char tosendkey[13];
@@ -471,243 +451,236 @@ failtag:
                 cjSetCursRight();
                 DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %012" PRIx64 " ; TYP: %i", sec, key64, type);
                 /*cmd_send(CMD_CJB_INFORM_CLIENT_KEY, 12, sec, type, tosendkey, 12);*/
-                switch (key64)
-                {
-                /////////////////////////////////////////////////////////
-                // COMMON SCHEME 1  : INFINITRON/HEXACT
-                case 0x484558414354:
-                    cjSetCursLeft();
-                    DbprintfEx(FLAG_NOLOG, "%s>>>>>>>>>>>>!*STOP*!<<<<<<<<<<<<<<%s", _RED_, _WHITE_);
-                    cjSetCursLeft();
+                switch (key64) {
+                    /////////////////////////////////////////////////////////
+                    // COMMON SCHEME 1  : INFINITRON/HEXACT
+                    case 0x484558414354:
+                        cjSetCursLeft();
+                        DbprintfEx(FLAG_NOLOG, "%s>>>>>>>>>>>>!*STOP*!<<<<<<<<<<<<<<%s", _RED_, _WHITE_);
+                        cjSetCursLeft();
 
-                    DbprintfEx(FLAG_NOLOG, "    .TAG SEEMS %sDETERMINISTIC%s.     ", _GREEN_, _WHITE_);
-                    cjSetCursLeft();
+                        DbprintfEx(FLAG_NOLOG, "    .TAG SEEMS %sDETERMINISTIC%s.     ", _GREEN_, _WHITE_);
+                        cjSetCursLeft();
 
-                    DbprintfEx(FLAG_NOLOG, "%sDetected: %s INFI_HEXACT_VIGIK_TAG%s", _ORANGE_, _CYAN_, _WHITE_);
-                    cjSetCursLeft();
+                        DbprintfEx(FLAG_NOLOG, "%sDetected: %s INFI_HEXACT_VIGIK_TAG%s", _ORANGE_, _CYAN_, _WHITE_);
+                        cjSetCursLeft();
 
-                    DbprintfEx(FLAG_NOLOG, "...%s[%sKey_derivation_schemeTest%s]%s...", _YELLOW_, _GREEN_, _YELLOW_, _GREEN_);
-                    cjSetCursLeft();
+                        DbprintfEx(FLAG_NOLOG, "...%s[%sKey_derivation_schemeTest%s]%s...", _YELLOW_, _GREEN_, _YELLOW_, _GREEN_);
+                        cjSetCursLeft();
 
-                    DbprintfEx(FLAG_NOLOG, "%s>>>>>>>>>>>>!*DONE*!<<<<<<<<<<<<<<%s", _GREEN_, _WHITE_);
-                    ;
-                    // Type 0 / A first
-                    uint16_t t = 0;
-                    for (uint16_t sectorNo = 0; sectorNo < sectorsCnt; sectorNo++)
-                    {
+                        DbprintfEx(FLAG_NOLOG, "%s>>>>>>>>>>>>!*DONE*!<<<<<<<<<<<<<<%s", _GREEN_, _WHITE_);
+                        ;
+                        // Type 0 / A first
+                        uint16_t t = 0;
+                        for (uint16_t sectorNo = 0; sectorNo < sectorsCnt; sectorNo++) {
+                            num_to_bytes(0x484558414354, 6, foundKey[t][sectorNo]);
+                            sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
+                                    foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
+                            cjSetCursRight();
+                            DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
+                        }
+                        t = 1;
+                        uint16_t sectorNo = 0;
+                        num_to_bytes(0xa22ae129c013, 6, foundKey[t][sectorNo]);
+                        sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
+                                foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
+                        cjSetCursRight();
+
+                        DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
+                        sectorNo = 1;
+                        num_to_bytes(0x49fae4e3849f, 6, foundKey[t][sectorNo]);
+                        sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
+                                foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
+                        cjSetCursRight();
+
+                        DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
+                        sectorNo = 2;
+                        num_to_bytes(0x38fcf33072e0, 6, foundKey[t][sectorNo]);
+                        sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
+                                foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
+                        cjSetCursRight();
+
+                        DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
+                        sectorNo = 3;
+                        num_to_bytes(0x8ad5517b4b18, 6, foundKey[t][sectorNo]);
+                        sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
+                                foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
+                        cjSetCursRight();
+
+                        DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
+                        sectorNo = 4;
+                        num_to_bytes(0x509359f131b1, 6, foundKey[t][sectorNo]);
+                        sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
+                                foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
+                        cjSetCursRight();
+
+                        DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
+                        sectorNo = 5;
+                        num_to_bytes(0x6c78928e1317, 6, foundKey[t][sectorNo]);
+                        sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
+                                foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
+                        cjSetCursRight();
+
+                        DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
+                        sectorNo = 6;
+                        num_to_bytes(0xaa0720018738, 6, foundKey[t][sectorNo]);
+                        sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
+                                foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
+                        cjSetCursRight();
+
+                        DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
+                        sectorNo = 7;
+                        num_to_bytes(0xa6cac2886412, 6, foundKey[t][sectorNo]);
+                        sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
+                                foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
+                        cjSetCursRight();
+
+                        DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
+                        sectorNo = 8;
+                        num_to_bytes(0x62d0c424ed8e, 6, foundKey[t][sectorNo]);
+                        sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
+                                foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
+                        cjSetCursRight();
+
+                        DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
+                        sectorNo = 9;
+                        num_to_bytes(0xe64a986a5d94, 6, foundKey[t][sectorNo]);
+                        sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
+                                foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
+                        cjSetCursRight();
+
+                        DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
+                        sectorNo = 10;
+                        num_to_bytes(0x8fa1d601d0a2, 6, foundKey[t][sectorNo]);
+                        sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
+                                foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
+                        cjSetCursRight();
+
+                        DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
+                        sectorNo = 11;
+                        num_to_bytes(0x89347350bd36, 6, foundKey[t][sectorNo]);
+                        sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
+                                foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
+                        cjSetCursRight();
+
+                        DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
+                        sectorNo = 12;
+                        num_to_bytes(0x66d2b7dc39ef, 6, foundKey[t][sectorNo]);
+                        sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
+                                foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
+                        cjSetCursRight();
+
+                        DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
+                        sectorNo = 13;
+                        num_to_bytes(0x6bc1e1ae547d, 6, foundKey[t][sectorNo]);
+                        sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
+                                foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
+                        cjSetCursRight();
+
+                        DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
+                        sectorNo = 14;
+                        num_to_bytes(0x22729a9bd40f, 6, foundKey[t][sectorNo]);
+                        sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
+                                foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
+                        cjSetCursRight();
+
+                        DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
+                        sectorNo = 15;
                         num_to_bytes(0x484558414354, 6, foundKey[t][sectorNo]);
                         sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
                                 foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
                         cjSetCursRight();
+
                         DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
-                    }
-                    t = 1;
-                    uint16_t sectorNo = 0;
-                    num_to_bytes(0xa22ae129c013, 6, foundKey[t][sectorNo]);
-                    sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
-                            foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
-                    cjSetCursRight();
+                        trapped = 1;
+                        break;
+                    ////////////////END OF SCHEME 1//////////////////////////////
 
-                    DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
-                    sectorNo = 1;
-                    num_to_bytes(0x49fae4e3849f, 6, foundKey[t][sectorNo]);
-                    sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
-                            foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
-                    cjSetCursRight();
+                    ///////////////////////////////////////
+                    // COMMON SCHEME 2  : URMET CAPTIVE / COGELEC!/?
+                    case 0x8829da9daf76:
+                        cjSetCursLeft();
 
-                    DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
-                    sectorNo = 2;
-                    num_to_bytes(0x38fcf33072e0, 6, foundKey[t][sectorNo]);
-                    sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
-                            foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
-                    cjSetCursRight();
+                        DbprintfEx(FLAG_NOLOG, "%s>>>>>>>>>>>>!*STOP*!<<<<<<<<<<<<<<%s", _RED_, _WHITE_);
+                        cjSetCursLeft();
 
-                    DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
-                    sectorNo = 3;
-                    num_to_bytes(0x8ad5517b4b18, 6, foundKey[t][sectorNo]);
-                    sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
-                            foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
-                    cjSetCursRight();
+                        DbprintfEx(FLAG_NOLOG, "    .TAG SEEMS %sDETERMINISTIC%s.     ", _GREEN_, _WHITE_);
+                        cjSetCursLeft();
 
-                    DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
-                    sectorNo = 4;
-                    num_to_bytes(0x509359f131b1, 6, foundKey[t][sectorNo]);
-                    sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
-                            foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
-                    cjSetCursRight();
+                        DbprintfEx(FLAG_NOLOG, "%sDetected :%sURMET_CAPTIVE_VIGIK_TAG%s", _ORANGE_, _CYAN_, _WHITE_);
+                        cjSetCursLeft();
 
-                    DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
-                    sectorNo = 5;
-                    num_to_bytes(0x6c78928e1317, 6, foundKey[t][sectorNo]);
-                    sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
-                            foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
-                    cjSetCursRight();
+                        DbprintfEx(FLAG_NOLOG, "...%s[%sKey_derivation_schemeTest%s]%s...", _YELLOW_, _GREEN_, _YELLOW_, _GREEN_);
+                        cjSetCursLeft();
 
-                    DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
-                    sectorNo = 6;
-                    num_to_bytes(0xaa0720018738, 6, foundKey[t][sectorNo]);
-                    sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
-                            foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
-                    cjSetCursRight();
+                        DbprintfEx(FLAG_NOLOG, "%s>>>>>>>>>>>>!*DONE*!<<<<<<<<<<<<<<%s", _GREEN_, _WHITE_);
+                        cjSetCursLeft();
 
-                    DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
-                    sectorNo = 7;
-                    num_to_bytes(0xa6cac2886412, 6, foundKey[t][sectorNo]);
-                    sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
-                            foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
-                    cjSetCursRight();
+                        // emlClearMem();
+                        // A very weak one...
+                        for (uint16_t t = 0; t < 2; t++) {
+                            for (uint16_t sectorNo = 0; sectorNo < sectorsCnt; sectorNo++) {
+                                num_to_bytes(key64, 6, foundKey[t][sectorNo]);
+                                sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
+                                        foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
+                                cjSetCursRight();
 
-                    DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
-                    sectorNo = 8;
-                    num_to_bytes(0x62d0c424ed8e, 6, foundKey[t][sectorNo]);
-                    sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
-                            foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
-                    cjSetCursRight();
+                                DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
+                            }
+                        }
+                        trapped = 1;
+                        break;
+                    ////////////////END OF SCHEME 2//////////////////////////////
 
-                    DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
-                    sectorNo = 9;
-                    num_to_bytes(0xe64a986a5d94, 6, foundKey[t][sectorNo]);
-                    sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
-                            foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
-                    cjSetCursRight();
+                    ///////////////////////////////////////
+                    // COMMON SCHEME 3  : NORALSY "A-LARON & B-LARON . . . NORAL-B & NORAL-A"
+                    case 0x414c41524f4e: // Thumbs up to the guy who had the idea of such a "mnemotechnical" key pair
+                    case 0x424c41524f4e:
+                        cjSetCursLeft();
 
-                    DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
-                    sectorNo = 10;
-                    num_to_bytes(0x8fa1d601d0a2, 6, foundKey[t][sectorNo]);
-                    sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
-                            foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
-                    cjSetCursRight();
+                        DbprintfEx(FLAG_NOLOG, "%s>>>>>>>>>>>>!*STOP*!<<<<<<<<<<<<<<%s", _RED_, _WHITE_);
+                        cjSetCursLeft();
 
-                    DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
-                    sectorNo = 11;
-                    num_to_bytes(0x89347350bd36, 6, foundKey[t][sectorNo]);
-                    sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
-                            foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
-                    cjSetCursRight();
+                        DbprintfEx(FLAG_NOLOG, "    .TAG SEEMS %sDETERMINISTIC%s.     ", _GREEN_, _WHITE_);
+                        cjSetCursLeft();
 
-                    DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
-                    sectorNo = 12;
-                    num_to_bytes(0x66d2b7dc39ef, 6, foundKey[t][sectorNo]);
-                    sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
-                            foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
-                    cjSetCursRight();
+                        DbprintfEx(FLAG_NOLOG, "%s  Detected :%sNORALSY_VIGIK_TAG %s", _ORANGE_, _CYAN_, _WHITE_);
+                        cjSetCursLeft();
 
-                    DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
-                    sectorNo = 13;
-                    num_to_bytes(0x6bc1e1ae547d, 6, foundKey[t][sectorNo]);
-                    sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
-                            foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
-                    cjSetCursRight();
+                        DbprintfEx(FLAG_NOLOG, "...%s[%sKey_derivation_schemeTest%s]%s...", _YELLOW_, _GREEN_, _YELLOW_, _GREEN_);
+                        cjSetCursLeft();
 
-                    DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
-                    sectorNo = 14;
-                    num_to_bytes(0x22729a9bd40f, 6, foundKey[t][sectorNo]);
-                    sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
-                            foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
-                    cjSetCursRight();
+                        DbprintfEx(FLAG_NOLOG, "%s>>>>>>>>>>>>!*DONE*!<<<<<<<<<<<<<<%s", _GREEN_, _WHITE_);
+                        ;
+                        t = 0;
+                        for (uint16_t sectorNo = 0; sectorNo < sectorsCnt; sectorNo++) {
+                            num_to_bytes(0x414c41524f4e, 6, foundKey[t][sectorNo]);
+                            sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
+                                    foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
+                            cjSetCursRight();
 
-                    DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
-                    sectorNo = 15;
-                    num_to_bytes(0x484558414354, 6, foundKey[t][sectorNo]);
-                    sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
-                            foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
-                    cjSetCursRight();
-
-                    DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
-                    trapped = 1;
-                    break;
-                ////////////////END OF SCHEME 1//////////////////////////////
-
-                ///////////////////////////////////////
-                // COMMON SCHEME 2  : URMET CAPTIVE / COGELEC!/?
-                case 0x8829da9daf76:
-                    cjSetCursLeft();
-
-                    DbprintfEx(FLAG_NOLOG, "%s>>>>>>>>>>>>!*STOP*!<<<<<<<<<<<<<<%s", _RED_, _WHITE_);
-                    cjSetCursLeft();
-
-                    DbprintfEx(FLAG_NOLOG, "    .TAG SEEMS %sDETERMINISTIC%s.     ", _GREEN_, _WHITE_);
-                    cjSetCursLeft();
-
-                    DbprintfEx(FLAG_NOLOG, "%sDetected :%sURMET_CAPTIVE_VIGIK_TAG%s", _ORANGE_, _CYAN_, _WHITE_);
-                    cjSetCursLeft();
-
-                    DbprintfEx(FLAG_NOLOG, "...%s[%sKey_derivation_schemeTest%s]%s...", _YELLOW_, _GREEN_, _YELLOW_, _GREEN_);
-                    cjSetCursLeft();
-
-                    DbprintfEx(FLAG_NOLOG, "%s>>>>>>>>>>>>!*DONE*!<<<<<<<<<<<<<<%s", _GREEN_, _WHITE_);
-                    cjSetCursLeft();
-
-                    // emlClearMem();
-                    // A very weak one...
-                    for (uint16_t t = 0; t < 2; t++)
-                    {
-                        for (uint16_t sectorNo = 0; sectorNo < sectorsCnt; sectorNo++)
-                        {
-                            num_to_bytes(key64, 6, foundKey[t][sectorNo]);
+                            DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
+                            ;
+                        }
+                        t = 1;
+                        for (uint16_t sectorNo = 0; sectorNo < sectorsCnt; sectorNo++) {
+                            num_to_bytes(0x424c41524f4e, 6, foundKey[t][sectorNo]);
                             sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
                                     foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
                             cjSetCursRight();
 
                             DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
                         }
-                    }
-                    trapped = 1;
-                    break;
-                ////////////////END OF SCHEME 2//////////////////////////////
-
-                ///////////////////////////////////////
-                // COMMON SCHEME 3  : NORALSY "A-LARON & B-LARON . . . NORAL-B & NORAL-A"
-                case 0x414c41524f4e: // Thumbs up to the guy who had the idea of such a "mnemotechnical" key pair
-                case 0x424c41524f4e:
-                    cjSetCursLeft();
-
-                    DbprintfEx(FLAG_NOLOG, "%s>>>>>>>>>>>>!*STOP*!<<<<<<<<<<<<<<%s", _RED_, _WHITE_);
-                    cjSetCursLeft();
-
-                    DbprintfEx(FLAG_NOLOG, "    .TAG SEEMS %sDETERMINISTIC%s.     ", _GREEN_, _WHITE_);
-                    cjSetCursLeft();
-
-                    DbprintfEx(FLAG_NOLOG, "%s  Detected :%sNORALSY_VIGIK_TAG %s", _ORANGE_, _CYAN_, _WHITE_);
-                    cjSetCursLeft();
-
-                    DbprintfEx(FLAG_NOLOG, "...%s[%sKey_derivation_schemeTest%s]%s...", _YELLOW_, _GREEN_, _YELLOW_, _GREEN_);
-                    cjSetCursLeft();
-
-                    DbprintfEx(FLAG_NOLOG, "%s>>>>>>>>>>>>!*DONE*!<<<<<<<<<<<<<<%s", _GREEN_, _WHITE_);
-                    ;
-                    t = 0;
-                    for (uint16_t sectorNo = 0; sectorNo < sectorsCnt; sectorNo++)
-                    {
-                        num_to_bytes(0x414c41524f4e, 6, foundKey[t][sectorNo]);
-                        sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
-                                foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
-                        cjSetCursRight();
-
-                        DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
-                        ;
-                    }
-                    t = 1;
-                    for (uint16_t sectorNo = 0; sectorNo < sectorsCnt; sectorNo++)
-                    {
-                        num_to_bytes(0x424c41524f4e, 6, foundKey[t][sectorNo]);
-                        sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
-                                foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
-                        cjSetCursRight();
-
-                        DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
-                    }
-                    trapped = 1;
-                    break;
-                    ////////////////END OF SCHEME 3//////////////////////////////
+                        trapped = 1;
+                        break;
+                        ////////////////END OF SCHEME 3//////////////////////////////
                 }
                 /* etc etc for testing schemes quick schemes */
             }
         }
     }
 
-    if (!allKeysFound)
-    {
+    if (!allKeysFound) {
         cjSetCursLeft();
         cjTabulize();
         DbprintfEx(FLAG_NOLOG, "%s[ FAIL ]%s\r\n->did not found all the keys :'(", _RED_, _WHITE_);
@@ -720,11 +693,9 @@ failtag:
     /* Settings keys to emulator */
     emlClearMem();
     uint8_t mblock[16];
-    for (uint8_t sectorNo = 0; sectorNo < sectorsCnt; sectorNo++)
-    {
+    for (uint8_t sectorNo = 0; sectorNo < sectorsCnt; sectorNo++) {
         emlGetMem(mblock, FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 1);
-        for (uint8_t t = 0; t < 2; t++)
-        {
+        for (uint8_t t = 0; t < 2; t++) {
             memcpy(mblock + t * 10, foundKey[t][sectorNo], 6);
         }
         emlSetMem(mblock, FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 1);
@@ -739,16 +710,14 @@ failtag:
 
     DbprintfEx(FLAG_NOLOG, "%s>>%s Filling Emulator <- from A keys...", _YELLOW_, _WHITE_);
     e_MifareECardLoad(sectorsCnt, 0, 0, &filled);
-    if (filled != 1)
-    {
+    if (filled != 1) {
         cjSetCursLeft();
 
         DbprintfEx(FLAG_NOLOG, "%s>>%s W_FAILURE ! %sTrying fallback B keys....", _RED_, _ORANGE_, _WHITE_);
 
         /* no trace, no dbg  */
         e_MifareECardLoad(sectorsCnt, 1, 0, &filled);
-        if (filled != 1)
-        {
+        if (filled != 1) {
             cjSetCursLeft();
 
             DbprintfEx(FLAG_NOLOG, "FATAL:EML_FALLBACKFILL_B");
@@ -856,30 +825,23 @@ void e_MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *dat
 
     bool isOK = true;
 
-    if (!iso14443a_select_card(cjuid, NULL, &cjcuid, true, 0, true))
-    {
+    if (!iso14443a_select_card(cjuid, NULL, &cjcuid, true, 0, true)) {
         isOK = false;
         if (MF_DBGLEVEL >= 1)
             DbprintfEx(FLAG_RAWPRINT, "Can't select card");
     }
 
-    for (uint8_t sectorNo = 0; isOK && sectorNo < numSectors; sectorNo++)
-    {
+    for (uint8_t sectorNo = 0; isOK && sectorNo < numSectors; sectorNo++) {
         ui64Key = emlGetKey(sectorNo, keyType);
-        if (sectorNo == 0)
-        {
-            if (isOK && mifare_classic_auth(pcs, cjcuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_FIRST))
-            {
+        if (sectorNo == 0) {
+            if (isOK && mifare_classic_auth(pcs, cjcuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_FIRST)) {
                 isOK = false;
                 if (MF_DBGLEVEL >= 1)
                     DbprintfEx(FLAG_NOLOG, "Sector[%2d]. Auth error", sectorNo);
                 break;
             }
-        }
-        else
-        {
-            if (isOK && mifare_classic_auth(pcs, cjcuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_NESTED))
-            {
+        } else {
+            if (isOK && mifare_classic_auth(pcs, cjcuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_NESTED)) {
                 isOK = false;
                 if (MF_DBGLEVEL >= 1)
                     DbprintfEx(FLAG_NOLOG, "Sector[%2d]. Auth nested error", sectorNo);
@@ -887,38 +849,30 @@ void e_MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *dat
             }
         }
 
-        for (uint8_t blockNo = 0; isOK && blockNo < NumBlocksPerSector(sectorNo); blockNo++)
-        {
-            if (isOK && mifare_classic_readblock(pcs, cjcuid, FirstBlockOfSector(sectorNo) + blockNo, dataoutbuf))
-            {
+        for (uint8_t blockNo = 0; isOK && blockNo < NumBlocksPerSector(sectorNo); blockNo++) {
+            if (isOK && mifare_classic_readblock(pcs, cjcuid, FirstBlockOfSector(sectorNo) + blockNo, dataoutbuf)) {
                 isOK = false;
                 if (MF_DBGLEVEL >= 1)
                     DbprintfEx(FLAG_NOLOG, "Error reading sector %2d block %2d", sectorNo, blockNo);
                 break;
             };
-            if (isOK)
-            {
+            if (isOK) {
                 *datain = 1;
-                if (blockNo < NumBlocksPerSector(sectorNo) - 1)
-                {
+                if (blockNo < NumBlocksPerSector(sectorNo) - 1) {
                     emlSetMem(dataoutbuf, FirstBlockOfSector(sectorNo) + blockNo, 1);
-                }
-                else
-                { // sector trailer, keep the keys, set only the AC
+                } else {
+                    // sector trailer, keep the keys, set only the AC
                     emlGetMem(dataoutbuf2, FirstBlockOfSector(sectorNo) + blockNo, 1);
                     memcpy(&dataoutbuf2[6], &dataoutbuf[6], 4);
                     emlSetMem(dataoutbuf2, FirstBlockOfSector(sectorNo) + blockNo, 1);
                 }
-            }
-            else
-            {
+            } else {
                 *datain = 0;
             }
         }
     }
 
-    if (mifare_classic_halt(pcs, cjcuid))
-    {
+    if (mifare_classic_halt(pcs, cjcuid)) {
         if (MF_DBGLEVEL >= 1)
             DbprintfEx(FLAG_NOLOG, "Halt error");
     };
@@ -944,21 +898,18 @@ int cjat91_saMifareChkKeys(uint8_t blockNo, uint8_t keyType, bool clearTrace, ui
     struct Crypto1State *pcs;
     pcs = &mpcs;
 
-    for (int i = 0; i < keyCount; ++i)
-    {
+    for (int i = 0; i < keyCount; ++i) {
 
         /* no need for anticollision. just verify tag is still here */
         // if (!iso14443a_fast_select_card(cjuid, 0)) {
-        if (!iso14443a_select_card(cjuid, NULL, &cjcuid, true, 0, true))
-        {
+        if (!iso14443a_select_card(cjuid, NULL, &cjcuid, true, 0, true)) {
             cjSetCursLeft();
             DbprintfEx(FLAG_NOLOG, "%sFATAL%s : E_MF_LOSTTAG", _RED_, _WHITE_);
             return -1;
         }
 
         uint64_t ui64Key = bytes_to_num(datain + i * 6, 6);
-        if (mifare_classic_auth(pcs, cjcuid, blockNo, keyType, ui64Key, AUTH_FIRST))
-        {
+        if (mifare_classic_auth(pcs, cjcuid, blockNo, keyType, ui64Key, AUTH_FIRST)) {
             uint8_t dummy_answer = 0;
             ReaderTransmit(&dummy_answer, 1, NULL);
             // wait for the card to become ready again
@@ -990,8 +941,7 @@ void saMifareMakeTag(void)
 
     DbprintfEx(FLAG_NOLOG, ">> Write to Special:");
     int flags = 0;
-    for (int blockNum = 0; blockNum < 16 * 4; blockNum++)
-    {
+    for (int blockNum = 0; blockNum < 16 * 4; blockNum++) {
         uint8_t mblock[16];
         // cnt = 0;
         emlGetMem(mblock, blockNum, 1);
@@ -1007,12 +957,11 @@ void saMifareMakeTag(void)
         if (blockNum == 16 * 4 - 1)
             flags = 0x04 + 0x10;
 
-        if (saMifareCSetBlock(0, flags & 0xFE, blockNum, mblock))
-        { //&& cnt <= retry) {
+        if (saMifareCSetBlock(0, flags & 0xFE, blockNum, mblock)) {
+            //&& cnt <= retry) {
             // cnt++;
             cjSetCursFRight();
-            if (currfline > 53)
-            {
+            if (currfline > 53) {
                 currfline = 54;
             }
             DbprintfEx(FLAG_NOLOG, "Block :%02x %sOK%s", blockNum, _GREEN_, _WHITE_);
@@ -1020,9 +969,7 @@ void saMifareMakeTag(void)
             //                                                      cfail=1;
             // return;
             continue;
-        }
-        else
-        {
+        } else {
             cjSetCursLeft();
             cjSetCursLeft();
 
@@ -1041,8 +988,7 @@ void saMifareMakeTag(void)
                 break;
         } */
     }
-    if (cfail == 0)
-    {
+    if (cfail == 0) {
         SpinUp(50);
         SpinUp(50);
         SpinUp(50);
@@ -1078,52 +1024,43 @@ int saMifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *data
     uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];
 
     // reset FPGA and LED
-    if (workFlags & 0x08)
-    {
+    if (workFlags & 0x08) {
         iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
         //  clear_trace();
         set_tracing(FALSE);
     }
 
-    while (true)
-    {
+    while (true) {
         cjSetCursLeft();
 
         // get UID from chip
-        if (workFlags & 0x01)
-        {
-            if (!iso14443a_select_card(cjuid, NULL, &cjcuid, true, 0, true))
-            {
+        if (workFlags & 0x01) {
+            if (!iso14443a_select_card(cjuid, NULL, &cjcuid, true, 0, true)) {
                 DbprintfEx(FLAG_NOLOG, "Can't select card");
                 break;
             };
 
-            if (mifare_classic_halt(NULL, cjcuid))
-            {
+            if (mifare_classic_halt(NULL, cjcuid)) {
                 DbprintfEx(FLAG_NOLOG, "Halt error");
                 break;
             };
         };
 
         // reset chip
-        if (needWipe)
-        {
+        if (needWipe) {
             ReaderTransmitBitsPar(wupC1, 7, 0, NULL);
-            if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a))
-            {
+            if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
                 DbprintfEx(FLAG_NOLOG, "wupC1 error");
                 break;
             };
 
             ReaderTransmit(wipeC, sizeof(wipeC), NULL);
-            if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a))
-            {
+            if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
                 DbprintfEx(FLAG_NOLOG, "wipeC error");
                 break;
             };
 
-            if (mifare_classic_halt(NULL, cjcuid))
-            {
+            if (mifare_classic_halt(NULL, cjcuid)) {
                 DbprintfEx(FLAG_NOLOG, "Halt error");
                 break;
             };
@@ -1131,25 +1068,21 @@ int saMifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *data
 
         // chaud
         // write block
-        if (workFlags & 0x02)
-        {
+        if (workFlags & 0x02) {
             ReaderTransmitBitsPar(wupC1, 7, 0, NULL);
-            if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a))
-            {
+            if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
                 DbprintfEx(FLAG_NOLOG, "wupC1 error");
                 break;
             };
 
             ReaderTransmit(wupC2, sizeof(wupC2), NULL);
-            if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a))
-            {
+            if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
                 DbprintfEx(FLAG_NOLOG, "wupC2 errorv");
                 break;
             };
         }
 
-        if ((mifare_sendcmd_short(NULL, 0, 0xA0, blockNo, receivedAnswer, receivedAnswerPar, NULL) != 1) || (receivedAnswer[0] != 0x0a))
-        {
+        if ((mifare_sendcmd_short(NULL, 0, 0xA0, blockNo, receivedAnswer, receivedAnswerPar, NULL) != 1) || (receivedAnswer[0] != 0x0a)) {
             DbprintfEx(FLAG_NOLOG, "write block send command error");
             break;
         };
@@ -1157,16 +1090,13 @@ int saMifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *data
         memcpy(d_block, datain, 16);
         AddCrc14A(d_block, 16);
         ReaderTransmit(d_block, sizeof(d_block), NULL);
-        if ((ReaderReceive(receivedAnswer, receivedAnswerPar) != 1) || (receivedAnswer[0] != 0x0a))
-        {
+        if ((ReaderReceive(receivedAnswer, receivedAnswerPar) != 1) || (receivedAnswer[0] != 0x0a)) {
             DbprintfEx(FLAG_NOLOG, "write block send data error");
             break;
         };
 
-        if (workFlags & 0x04)
-        {
-            if (mifare_classic_halt(NULL, cjcuid))
-            {
+        if (workFlags & 0x04) {
+            if (mifare_classic_halt(NULL, cjcuid)) {
                 cjSetCursFRight();
 
                 DbprintfEx(FLAG_NOLOG, "Halt error");
@@ -1178,8 +1108,7 @@ int saMifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *data
         break;
     }
 
-    if ((workFlags & 0x10) || (!isOK))
-    {
+    if ((workFlags & 0x10) || (!isOK)) {
         FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     }
 
diff --git a/armsrc/Standalone/hf_mattyrun.c b/armsrc/Standalone/hf_mattyrun.c
index 1061d9bfe..a6caecef5 100644
--- a/armsrc/Standalone/hf_mattyrun.c
+++ b/armsrc/Standalone/hf_mattyrun.c
@@ -67,49 +67,40 @@ static int saMifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_
     uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];
 
     // reset FPGA and LED
-    if (workFlags & 0x08)
-    {
+    if (workFlags & 0x08) {
         iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
         set_tracing(false);
     }
 
-    while (true)
-    {
+    while (true) {
         // get UID from chip
-        if (workFlags & 0x01)
-        {
-            if (!iso14443a_select_card(uid, NULL, &cuid, true, 0, true))
-            {
+        if (workFlags & 0x01) {
+            if (!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
                 DbprintfEx(FLAG_NOLOG, "Can't select card");
                 break;
             };
 
-            if (mifare_classic_halt(NULL, cuid))
-            {
+            if (mifare_classic_halt(NULL, cuid)) {
                 DbprintfEx(FLAG_NOLOG, "Halt error");
                 break;
             };
         };
 
         // reset chip
-        if (needWipe)
-        {
+        if (needWipe) {
             ReaderTransmitBitsPar(wupC1, 7, 0, NULL);
-            if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a))
-            {
+            if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
                 DbprintfEx(FLAG_NOLOG, "wupC1 error");
                 break;
             };
 
             ReaderTransmit(wipeC, sizeof(wipeC), NULL);
-            if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a))
-            {
+            if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
                 DbprintfEx(FLAG_NOLOG, "wipeC error");
                 break;
             };
 
-            if (mifare_classic_halt(NULL, cuid))
-            {
+            if (mifare_classic_halt(NULL, cuid)) {
                 DbprintfEx(FLAG_NOLOG, "Halt error");
                 break;
             };
@@ -117,25 +108,21 @@ static int saMifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_
 
         // chaud
         // write block
-        if (workFlags & 0x02)
-        {
+        if (workFlags & 0x02) {
             ReaderTransmitBitsPar(wupC1, 7, 0, NULL);
-            if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a))
-            {
+            if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
                 DbprintfEx(FLAG_NOLOG, "wupC1 error");
                 break;
             };
 
             ReaderTransmit(wupC2, sizeof(wupC2), NULL);
-            if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a))
-            {
+            if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
                 DbprintfEx(FLAG_NOLOG, "wupC2 errorv");
                 break;
             };
         }
 
-        if ((mifare_sendcmd_short(NULL, 0, 0xA0, blockNo, receivedAnswer, receivedAnswerPar, NULL) != 1) || (receivedAnswer[0] != 0x0a))
-        {
+        if ((mifare_sendcmd_short(NULL, 0, 0xA0, blockNo, receivedAnswer, receivedAnswerPar, NULL) != 1) || (receivedAnswer[0] != 0x0a)) {
             DbprintfEx(FLAG_NOLOG, "write block send command error");
             break;
         };
@@ -143,16 +130,13 @@ static int saMifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_
         memcpy(d_block, datain, 16);
         AddCrc14A(d_block, 16);
         ReaderTransmit(d_block, sizeof(d_block), NULL);
-        if ((ReaderReceive(receivedAnswer, receivedAnswerPar) != 1) || (receivedAnswer[0] != 0x0a))
-        {
+        if ((ReaderReceive(receivedAnswer, receivedAnswerPar) != 1) || (receivedAnswer[0] != 0x0a)) {
             DbprintfEx(FLAG_NOLOG, "write block send data error");
             break;
         };
 
-        if (workFlags & 0x04)
-        {
-            if (mifare_classic_halt(NULL, cuid))
-            {
+        if (workFlags & 0x04) {
+            if (mifare_classic_halt(NULL, cuid)) {
                 DbprintfEx(FLAG_NOLOG, "Halt error");
                 break;
             };
@@ -162,8 +146,7 @@ static int saMifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_
         break;
     }
 
-    if ((workFlags & 0x10) || (!isOK))
-    {
+    if ((workFlags & 0x10) || (!isOK)) {
         FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     }
 
@@ -182,20 +165,17 @@ static int saMifareChkKeys(uint8_t blockNo, uint8_t keyType, bool clearTrace, ui
     struct Crypto1State *pcs;
     pcs = &mpcs;
 
-    for (int i = 0; i < keyCount; ++i)
-    {
+    for (int i = 0; i < keyCount; ++i) {
 
         /* no need for anticollision. just verify tag is still here */
         // if (!iso14443a_fast_select_card(cjuid, 0)) {
-        if (!iso14443a_select_card(uid, NULL, &cuid, true, 0, true))
-        {
+        if (!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
             DbprintfEx(FLAG_NOLOG, "FATAL : E_MF_LOSTTAG");
             return -1;
         }
 
         uint64_t ui64Key = bytes_to_num(datain + i * 6, 6);
-        if (mifare_classic_auth(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST))
-        {
+        if (mifare_classic_auth(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST)) {
             uint8_t dummy_answer = 0;
             ReaderTransmit(&dummy_answer, 1, NULL);
             // wait for the card to become ready again
@@ -214,7 +194,8 @@ static int saMifareChkKeys(uint8_t blockNo, uint8_t keyType, bool clearTrace, ui
 }
 
 
-void RunMod() {
+void RunMod()
+{
     StandAloneMode();
     Dbprintf(">>  Matty mifare chk/dump/sim  a.k.a MattyRun Started  <<");
     FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
@@ -249,7 +230,7 @@ void RunMod() {
     uint16_t mifare_size = 1024;    // Mifare 1k (only 1k supported for now)
     uint8_t sectorSize = 64;        // 1k's sector size is 64 bytes.
     uint8_t blockNo = 3;            // Security block is number 3 for each sector.
-    uint8_t sectorsCnt = (mifare_size/sectorSize);
+    uint8_t sectorsCnt = (mifare_size / sectorSize);
     uint8_t keyType = 2;            // Keytype buffer
     uint64_t key64;                 // Defines current key
     uint8_t *keyBlock = NULL;       // Where the keys will be held in memory.
@@ -284,7 +265,7 @@ void RunMod() {
     int mfKeysCnt = sizeof(mfKeys) / sizeof(uint64_t);
 
     for (int mfKeyCounter = 0; mfKeyCounter < mfKeysCnt; mfKeyCounter++) {
-        num_to_bytes(mfKeys[mfKeyCounter], 6, (uint8_t*)(keyBlock + mfKeyCounter * 6));
+        num_to_bytes(mfKeys[mfKeyCounter], 6, (uint8_t *)(keyBlock + mfKeyCounter * 6));
     }
 
     /*
@@ -294,8 +275,8 @@ void RunMod() {
         Dbprintf("[+] Printing mf keys");
         for (uint8_t keycnt = 0; keycnt < mfKeysCnt; keycnt++)
             Dbprintf("[-] chk mf key[%2d] %02x%02x%02x%02x%02x%02x", keycnt,
-                (keyBlock + 6*keycnt)[0], (keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2],
-                (keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4], (keyBlock + 6*keycnt)[5], 6);
+                     (keyBlock + 6 * keycnt)[0], (keyBlock + 6 * keycnt)[1], (keyBlock + 6 * keycnt)[2],
+                     (keyBlock + 6 * keycnt)[3], (keyBlock + 6 * keycnt)[4], (keyBlock + 6 * keycnt)[5], 6);
         DbpString("--------------------------------------------------------");
     }
 
@@ -327,7 +308,7 @@ void RunMod() {
     for (int type = !keyType; type < 2 && !err; keyType == 2 ? (type++) : (type = 2)) {
         block = blockNo;
         for (int sec = 0; sec < sectorsCnt && !err; ++sec) {
-            Dbprintf("\tCurrent sector:%3d, block:%3d, key type: %c, key count: %i ", sec, block, type ? 'B':'A', mfKeysCnt);
+            Dbprintf("\tCurrent sector:%3d, block:%3d, key type: %c, key count: %i ", sec, block, type ? 'B' : 'A', mfKeysCnt);
             key = saMifareChkKeys(block, type, true, size, &keyBlock[0], &key64);
             if (key == -1) {
                 LED(LED_RED, 50); //red
@@ -342,9 +323,9 @@ void RunMod() {
                 validKey[type][sec] = true;
                 keyFound = true;
                 Dbprintf("\t✓ Found valid key: [%02x%02x%02x%02x%02x%02x]\n",
-                    (keyBlock + 6*key)[0], (keyBlock + 6*key)[1], (keyBlock + 6*key)[2],
-                    (keyBlock + 6*key)[3], (keyBlock + 6*key)[4], (keyBlock + 6*key)[5]
-                );
+                         (keyBlock + 6 * key)[0], (keyBlock + 6 * key)[1], (keyBlock + 6 * key)[2],
+                         (keyBlock + 6 * key)[3], (keyBlock + 6 * key)[4], (keyBlock + 6 * key)[5]
+                        );
             }
 
             block < 127 ? (block += 4) : (block += 16);
@@ -378,14 +359,14 @@ void RunMod() {
         for (uint16_t sectorNo = 0; sectorNo < sectorsCnt; sectorNo++) {
             if (validKey[0][sectorNo] || validKey[1][sectorNo]) {
                 emlGetMem(mblock, FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 1); // data, block num, blocks count (max 4)
-                    for (uint16_t t = 0; t < 2; t++) {
-                        if (validKey[t][sectorNo]) {
-                            memcpy(mblock + t*10, foundKey[t][sectorNo], 6);
-                        }
+                for (uint16_t t = 0; t < 2; t++) {
+                    if (validKey[t][sectorNo]) {
+                        memcpy(mblock + t * 10, foundKey[t][sectorNo], 6);
                     }
-                    emlSetMem(mblock, FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 1);
                 }
+                emlSetMem(mblock, FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 1);
             }
+        }
         Dbprintf("\t✓ Found keys have been transferred to the emulator memory.");
         if (ecfill) {
 
@@ -409,7 +390,7 @@ void RunMod() {
 
                 LED_B_ON(); // green
                 // assuming arg0==0,  use hardcoded uid 0xdeadbeaf
-                Mifare1ksim( FLAG_4B_UID_IN_DATA | FLAG_UID_IN_EMUL, 0, 0, uid);
+                Mifare1ksim(FLAG_4B_UID_IN_DATA | FLAG_UID_IN_EMUL, 0, 0, uid);
                 LED_B_OFF();
 
                 /*
diff --git a/armsrc/Standalone/hf_young.c b/armsrc/Standalone/hf_young.c
index 76c7b8c30..d5dfd69bd 100644
--- a/armsrc/Standalone/hf_young.c
+++ b/armsrc/Standalone/hf_young.c
@@ -18,7 +18,8 @@ typedef struct {
 } __attribute__((__packed__)) card_clone_t;
 
 
-void RunMod() {
+void RunMod()
+{
     StandAloneMode();
     Dbprintf(">>  Craig Young Mifare sniff UID/clone uid 2 magic/sim  a.k.a YoungRun Started  <<");
     FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
@@ -59,9 +60,9 @@ void RunMod() {
                     if (cardRead[selected]) {
                         Dbprintf("Button press detected -- replaying card in bank[%d]", selected);
                         break;
-                    } else if (cardRead[(selected+1) % OPTS]) {
-                        Dbprintf("Button press detected but no card in bank[%d] so playing from bank[%d]", selected, (selected+1)%OPTS);
-                        selected = (selected+1) % OPTS;
+                    } else if (cardRead[(selected + 1) % OPTS]) {
+                        Dbprintf("Button press detected but no card in bank[%d] so playing from bank[%d]", selected, (selected + 1) % OPTS);
+                        selected = (selected + 1) % OPTS;
                         break; // playing = 1;
                     } else {
                         Dbprintf("Button press detected but no stored tag to play. (Ignoring button)");
@@ -75,12 +76,12 @@ void RunMod() {
                     Dbprintf("Read UID:");
                     Dbhexdump(card[selected].uidlen, card[selected].uid, 0);
 
-                    if (memcmp(uids[(selected+1)%OPTS].uid, card[selected].uid, card[selected].uidlen ) == 0 ) {
+                    if (memcmp(uids[(selected + 1) % OPTS].uid, card[selected].uid, card[selected].uidlen) == 0) {
                         Dbprintf("Card selected has same UID as what is stored in the other bank. Skipping.");
                     } else {
                         uids[selected].sak = card[selected].sak;
                         uids[selected].uidlen = card[selected].uidlen;
-                        memcpy(uids[selected].uid , card[selected].uid, uids[selected].uidlen);
+                        memcpy(uids[selected].uid, card[selected].uid, uids[selected].uidlen);
                         memcpy(uids[selected].atqa, card[selected].atqa, 2);
 
                         if (uids[selected].uidlen > 4)
@@ -110,8 +111,8 @@ void RunMod() {
         }
 
         /* MF Classic UID clone */
-        else if (iGotoClone==1) {
-            iGotoClone=0;
+        else if (iGotoClone == 1) {
+            iGotoClone = 0;
             LEDsoff();
             LED(selected + 1, 0);
             LED(LED_ORANGE, 250);
@@ -176,7 +177,7 @@ void RunMod() {
                 MifareCSetBlock(params, 0, newBlock0);
                 MifareCGetBlock(params, 0, testBlock0);
 
-                if (memcmp(testBlock0, newBlock0, 16)==0) {
+                if (memcmp(testBlock0, newBlock0, 16) == 0) {
                     DbpString("Cloned successfull!");
                     cardRead[selected] = 0; // Only if the card was cloned successfully should we clear it
                     playing = 0;
@@ -193,19 +194,19 @@ void RunMod() {
 
         // Change where to record (or begin playing)
         // button_pressed == BUTTON_SINGLE_CLICK && cardRead[selected])
-        else if (playing==1) {
+        else if (playing == 1) {
             LEDsoff();
             LED(selected + 1, 0);
 
             // Begin transmitting
             LED(LED_GREEN, 0);
             DbpString("Playing");
-            for ( ; ; ) {
+            for (; ;) {
                 // exit from Standalone Mode,   send a usbcommand.
                 if (usb_poll_validate_length()) return;
 
                 int button_action = BUTTON_HELD(1000);
-                if ( button_action == 0) { // No button action, proceed with sim
+                if (button_action == 0) {  // No button action, proceed with sim
 
                     uint8_t flags = FLAG_4B_UID_IN_DATA;
                     uint8_t data[USB_CMD_DATA_SIZE] = {0}; // in case there is a read command received we shouldn't break
@@ -214,7 +215,7 @@ void RunMod() {
 
                     uint64_t tmpuid = bytes_to_num(uids[selected].uid, uids[selected].uidlen);
 
-                    if (  uids[selected].uidlen == 7 ) {
+                    if (uids[selected].uidlen == 7) {
                         flags = FLAG_7B_UID_IN_DATA;
                         Dbprintf("Simulating ISO14443a tag with uid: %014" PRIx64 " [Bank: %d]", tmpuid, selected);
                     } else {
diff --git a/armsrc/Standalone/lf_hidbrute.c b/armsrc/Standalone/lf_hidbrute.c
index b730246fa..ce5b7d337 100644
--- a/armsrc/Standalone/lf_hidbrute.c
+++ b/armsrc/Standalone/lf_hidbrute.c
@@ -27,7 +27,8 @@
 #include "lf_hidbrute.h"
 
 // samy's sniff and repeat routine for LF
-void RunMod() {
+void RunMod()
+{
     StandAloneMode();
     Dbprintf(">>  LF HID corporate bruteforce a.k.a CorporateBrute Started  <<");
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
@@ -60,7 +61,7 @@ void RunMod() {
             DbpString("[=] starting recording");
 
             // wait for button to be released
-            while(BUTTON_PRESS())
+            while (BUTTON_PRESS())
                 WDT_HIT();
 
             /* need this delay to prevent catching some weird data */
@@ -76,8 +77,7 @@ void RunMod() {
             // so next button push begins playing what we recorded
             playing = 0;
             cardRead = 1;
-        }
-        else if (button_pressed > 0 && cardRead == 1) {
+        } else if (button_pressed > 0 && cardRead == 1) {
             LEDsoff();
             LED(selected + 1, 0);
             LED(LED_ORANGE, 0);
@@ -86,7 +86,7 @@ void RunMod() {
             Dbprintf("[=] cloning %x %x %08x", selected, high[selected], low[selected]);
 
             // wait for button to be released
-            while(BUTTON_PRESS())
+            while (BUTTON_PRESS())
                 WDT_HIT();
 
             /* need this delay to prevent catching some weird data */
@@ -141,15 +141,13 @@ void RunMod() {
                 playing = !playing;
                 LEDsoff();
                 LED(selected + 1, 0);
-            }
-            else if (playing && selected == 2)
-            {
+            } else if (playing && selected == 2) {
                 // Now it work only with HID Corporate 1000 (35bit), but is easily extensible to others RFID.
                 // It is necessary only to calculate the correct parity.
 
                 // Brute force code
                 // Check if the badge is an HID Corporate 1000
-                if( (high[selected] & 0xFFFFFFF8) != 0x28 ) {
+                if ((high[selected] & 0xFFFFFFF8) != 0x28) {
                     DbpString("[-] Card is not a HID Corporate 1000. Skipping bruteforce.");
                     continue;
                 }
@@ -162,7 +160,7 @@ void RunMod() {
 
                 // Calculate Facility Code and Card Number from high and low
                 uint32_t cardnum = (low[selected] >> 1) & 0xFFFFF;
-                uint32_t fc = ((high[selected] & 1 ) << 11 ) | (low[selected] >> 21);
+                uint32_t fc = ((high[selected] & 1) << 11) | (low[selected] >> 21);
                 uint32_t original_cardnum = cardnum;
 
                 Dbprintf("[=] Proxbrute - starting decrementing card number");
@@ -235,7 +233,7 @@ void RunMod() {
                 LED(selected + 1, 0);
 
             } else {
-                while(BUTTON_PRESS())
+                while (BUTTON_PRESS())
                     WDT_HIT();
             }
         }
@@ -247,7 +245,8 @@ out:
 }
 
 // Function that calculate next value for the brutforce of HID corporate 1000
-void hid_corporate_1000_calculate_checksum_and_set( uint32_t *high, uint32_t *low, uint32_t cardnum, uint32_t fc) {
+void hid_corporate_1000_calculate_checksum_and_set(uint32_t *high, uint32_t *low, uint32_t cardnum, uint32_t fc)
+{
 
     uint32_t new_high = 0;
     uint32_t new_low = 0;
@@ -264,8 +263,8 @@ void hid_corporate_1000_calculate_checksum_and_set( uint32_t *high, uint32_t *lo
     uint32_t parity_bit_34_low = new_low & 0xB6DB6DB6;
     n_ones = 0;
     // Calculate number of ones in low number
-    for ( i = 1; i != 0; i <<= 1) {
-        if( parity_bit_34_low & i )
+    for (i = 1; i != 0; i <<= 1) {
+        if (parity_bit_34_low & i)
             n_ones++;
     }
     // Calculate number of ones in high number
@@ -282,15 +281,15 @@ void hid_corporate_1000_calculate_checksum_and_set( uint32_t *high, uint32_t *lo
     n_ones = 0;
 
     // Calculate number of ones in low number
-    for ( i=1; i != 0; i <<= 1) {
-        if( parity_bit_1_low & i )
+    for (i = 1; i != 0; i <<= 1) {
+        if (parity_bit_1_low & i)
             n_ones++;
     }
     // Calculate number of ones in high number
-    if ( new_high & 0x1)
+    if (new_high & 0x1)
         n_ones++;
 
-    if ( new_high & 0x2)
+    if (new_high & 0x2)
         n_ones++;
 
     // Set parity bit (Odd parity)
@@ -301,14 +300,14 @@ void hid_corporate_1000_calculate_checksum_and_set( uint32_t *high, uint32_t *lo
     n_ones = 0;
     // Calculate number of ones in low number (all bit of low, bitmask unnecessary)
     for (i = 1; i != 0; i <<= 1) {
-        if ( new_low & i )
+        if (new_low & i)
             n_ones++;
     }
     // Calculate number of ones in high number
-    if ( new_high & 0x1)
+    if (new_high & 0x1)
         n_ones++;
 
-    if ( new_high & 0x2)
+    if (new_high & 0x2)
         n_ones++;
 
     // Set parity bit (Odd parity)
diff --git a/armsrc/Standalone/lf_hidbrute.h b/armsrc/Standalone/lf_hidbrute.h
index 4cd2d5631..bc1cf2e31 100644
--- a/armsrc/Standalone/lf_hidbrute.h
+++ b/armsrc/Standalone/lf_hidbrute.h
@@ -19,6 +19,6 @@
 
 #define OPTS 3
 
-void hid_corporate_1000_calculate_checksum_and_set( uint32_t *high, uint32_t *low, uint32_t cardnum, uint32_t fc);
+void hid_corporate_1000_calculate_checksum_and_set(uint32_t *high, uint32_t *low, uint32_t cardnum, uint32_t fc);
 
 #endif /* __LF_HIDBRUTE_H */
\ No newline at end of file
diff --git a/armsrc/Standalone/lf_proxbrute.c b/armsrc/Standalone/lf_proxbrute.c
index 7d1bdd35d..baa7fe72a 100644
--- a/armsrc/Standalone/lf_proxbrute.c
+++ b/armsrc/Standalone/lf_proxbrute.c
@@ -12,7 +12,8 @@
 #include "lf_proxbrute.h"
 
 // samy's sniff and repeat routine for LF
-void RunMod() {
+void RunMod()
+{
     StandAloneMode();
     Dbprintf(">>  LF HID proxII bruteforce a.k.a ProxBrute Started (Brad Antoniewicz) <<");
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
@@ -61,8 +62,7 @@ void RunMod() {
             // so next button push begins playing what we recorded
             playing = 0;
             cardRead = 1;
-        }
-        else if (button_pressed > 0 && cardRead == 1) {
+        } else if (button_pressed > 0 && cardRead == 1) {
             LEDsoff();
             LED(selected + 1, 0);
             LED(LED_ORANGE, 0);
@@ -119,12 +119,12 @@ void RunMod() {
                 worked or not, so its a crap shoot. One option is to time how long
                 it takes to get a valid ID then start from scratch every time.
                 */
-                if ( selected == 1 ) {
+                if (selected == 1) {
                     DbpString("[=] entering ProxBrute Mode");
                     Dbprintf("[=] current Tag: Selected = %x Facility = %08x ID = %08x", selected, high[selected], low[selected]);
                     LED(LED_ORANGE, 0);
                     LED(LED_RED, 0);
-                    for (uint16_t i = low[selected]-1; i > 0; i--) {
+                    for (uint16_t i = low[selected] - 1; i > 0; i--) {
                         if (BUTTON_PRESS()) {
                             DbpString("[-] told to stop");
                             break;
@@ -156,8 +156,7 @@ void RunMod() {
                 playing = !playing;
                 LEDsoff();
                 LED(selected + 1, 0);
-            }
-            else {
+            } else {
                 while (BUTTON_PRESS())
                     WDT_HIT();
             }
diff --git a/armsrc/Standalone/lf_samyrun.c b/armsrc/Standalone/lf_samyrun.c
index 8536260ff..4f4545374 100644
--- a/armsrc/Standalone/lf_samyrun.c
+++ b/armsrc/Standalone/lf_samyrun.c
@@ -11,7 +11,8 @@
 #include "lf_samyrun.h"
 
 // samy's sniff and repeat routine for LF
-void RunMod() {
+void RunMod()
+{
     StandAloneMode();
     Dbprintf(">>  LF HID Read/Clone/Sim a.k.a SamyRun Started  <<");
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
@@ -64,8 +65,7 @@ void RunMod() {
             cardRead = 1;
 
             gotCard = true;
-        }
-        else if (button_pressed > 0 && cardRead == 1) {
+        } else if (button_pressed > 0 && cardRead == 1) {
             LEDsoff();
             LED(selected + 1, 0);
             LED(LED_ORANGE, 0);
@@ -129,8 +129,7 @@ void RunMod() {
                 playing = !playing;
                 LEDsoff();
                 LED(selected + 1, 0);
-            }
-            else {
+            } else {
                 while (BUTTON_PRESS())
                     WDT_HIT();
             }
diff --git a/armsrc/aes.c b/armsrc/aes.c
index dc89a1cf0..fd6543745 100644
--- a/armsrc/aes.c
+++ b/armsrc/aes.c
@@ -672,9 +672,9 @@ static const unsigned int rcon[] = {
                     ((unsigned int)(pt)[3]))
 
 #define PUTU32(ct, st) { (ct)[0] = (unsigned char)((st) >> 24); \
-                         (ct)[1] = (unsigned char)((st) >> 16); \
-                         (ct)[2] = (unsigned char)((st) >>  8); \
-                         (ct)[3] = (unsigned char)(st); }
+        (ct)[1] = (unsigned char)((st) >> 16); \
+        (ct)[2] = (unsigned char)((st) >>  8); \
+        (ct)[3] = (unsigned char)(st); }
 
 /*
 * Expand the cipher key into the encryption key schedule and return the
@@ -685,7 +685,7 @@ int aes_setkey_enc(unsigned int rk[], const unsigned char cipherKey[], int keyBy
     int i = 0;
     unsigned int temp;
 
-    rk[0] = GETU32(cipherKey     );
+    rk[0] = GETU32(cipherKey);
     rk[1] = GETU32(cipherKey +  4);
     rk[2] = GETU32(cipherKey +  8);
     rk[3] = GETU32(cipherKey + 12);
@@ -693,11 +693,11 @@ int aes_setkey_enc(unsigned int rk[], const unsigned char cipherKey[], int keyBy
         for (;;) {
             temp  = rk[3];
             rk[4] = rk[0] ^
-                (Te4[(temp >> 16) & 0xff] & 0xff000000) ^
-                (Te4[(temp >>  8) & 0xff] & 0x00ff0000) ^
-                (Te4[(temp      ) & 0xff] & 0x0000ff00) ^
-                (Te4[(temp >> 24)       ] & 0x000000ff) ^
-                rcon[i];
+                    (Te4[(temp >> 16) & 0xff] & 0xff000000) ^
+                    (Te4[(temp >>  8) & 0xff] & 0x00ff0000) ^
+                    (Te4[(temp) & 0xff] & 0x0000ff00) ^
+                    (Te4[(temp >> 24)       ] & 0x000000ff) ^
+                    rcon[i];
             rk[5] = rk[1] ^ rk[4];
             rk[6] = rk[2] ^ rk[5];
             rk[7] = rk[3] ^ rk[6];
@@ -713,11 +713,11 @@ int aes_setkey_enc(unsigned int rk[], const unsigned char cipherKey[], int keyBy
         for (;;) {
             temp = rk[ 5];
             rk[ 6] = rk[ 0] ^
-                (Te4[(temp >> 16) & 0xff] & 0xff000000) ^
-                (Te4[(temp >>  8) & 0xff] & 0x00ff0000) ^
-                (Te4[(temp      ) & 0xff] & 0x0000ff00) ^
-                (Te4[(temp >> 24)       ] & 0x000000ff) ^
-                rcon[i];
+                     (Te4[(temp >> 16) & 0xff] & 0xff000000) ^
+                     (Te4[(temp >>  8) & 0xff] & 0x00ff0000) ^
+                     (Te4[(temp) & 0xff] & 0x0000ff00) ^
+                     (Te4[(temp >> 24)       ] & 0x000000ff) ^
+                     rcon[i];
             rk[ 7] = rk[ 1] ^ rk[ 6];
             rk[ 8] = rk[ 2] ^ rk[ 7];
             rk[ 9] = rk[ 3] ^ rk[ 8];
@@ -735,11 +735,11 @@ int aes_setkey_enc(unsigned int rk[], const unsigned char cipherKey[], int keyBy
         for (;;) {
             temp = rk[ 7];
             rk[ 8] = rk[ 0] ^
-                (Te4[(temp >> 16) & 0xff] & 0xff000000) ^
-                (Te4[(temp >>  8) & 0xff] & 0x00ff0000) ^
-                (Te4[(temp      ) & 0xff] & 0x0000ff00) ^
-                (Te4[(temp >> 24)       ] & 0x000000ff) ^
-                rcon[i];
+                     (Te4[(temp >> 16) & 0xff] & 0xff000000) ^
+                     (Te4[(temp >>  8) & 0xff] & 0x00ff0000) ^
+                     (Te4[(temp) & 0xff] & 0x0000ff00) ^
+                     (Te4[(temp >> 24)       ] & 0x000000ff) ^
+                     rcon[i];
             rk[ 9] = rk[ 1] ^ rk[ 8];
             rk[10] = rk[ 2] ^ rk[ 9];
             rk[11] = rk[ 3] ^ rk[10];
@@ -748,10 +748,10 @@ int aes_setkey_enc(unsigned int rk[], const unsigned char cipherKey[], int keyBy
             }
             temp = rk[11];
             rk[12] = rk[ 4] ^
-                (Te4[(temp >> 24)       ] & 0xff000000) ^
-                (Te4[(temp >> 16) & 0xff] & 0x00ff0000) ^
-                (Te4[(temp >>  8) & 0xff] & 0x0000ff00) ^
-                (Te4[(temp      ) & 0xff] & 0x000000ff);
+                     (Te4[(temp >> 24)       ] & 0xff000000) ^
+                     (Te4[(temp >> 16) & 0xff] & 0x00ff0000) ^
+                     (Te4[(temp >>  8) & 0xff] & 0x0000ff00) ^
+                     (Te4[(temp) & 0xff] & 0x000000ff);
             rk[13] = rk[ 5] ^ rk[12];
             rk[14] = rk[ 6] ^ rk[13];
             rk[15] = rk[ 7] ^ rk[14];
@@ -779,10 +779,10 @@ int AesGenKeySched(unsigned int rk[], unsigned int rrk[], const unsigned char ci
     rrk[2] = rk[2];
     rrk[3] = rk[3];
 
-   /*
-    * apply the inverse MixColumn transform to all round keys but the first
-    * and the last
-    */
+    /*
+     * apply the inverse MixColumn transform to all round keys but the first
+     * and the last
+     */
     for (i = 1; i < Nr; i++) {
         rrk -= 4;
         rk += 4;
@@ -790,22 +790,22 @@ int AesGenKeySched(unsigned int rk[], unsigned int rrk[], const unsigned char ci
             Td0[Te4[(rk[0] >> 24)       ] & 0xff] ^
             Td1[Te4[(rk[0] >> 16) & 0xff] & 0xff] ^
             Td2[Te4[(rk[0] >>  8) & 0xff] & 0xff] ^
-            Td3[Te4[(rk[0]      ) & 0xff] & 0xff];
+            Td3[Te4[(rk[0]) & 0xff] & 0xff];
         rrk[1] =
             Td0[Te4[(rk[1] >> 24)       ] & 0xff] ^
             Td1[Te4[(rk[1] >> 16) & 0xff] & 0xff] ^
             Td2[Te4[(rk[1] >>  8) & 0xff] & 0xff] ^
-            Td3[Te4[(rk[1]      ) & 0xff] & 0xff];
+            Td3[Te4[(rk[1]) & 0xff] & 0xff];
         rrk[2] =
             Td0[Te4[(rk[2] >> 24)       ] & 0xff] ^
             Td1[Te4[(rk[2] >> 16) & 0xff] & 0xff] ^
             Td2[Te4[(rk[2] >>  8) & 0xff] & 0xff] ^
-            Td3[Te4[(rk[2]      ) & 0xff] & 0xff];
+            Td3[Te4[(rk[2]) & 0xff] & 0xff];
         rrk[3] =
             Td0[Te4[(rk[3] >> 24)       ] & 0xff] ^
             Td1[Te4[(rk[3] >> 16) & 0xff] & 0xff] ^
             Td2[Te4[(rk[3] >>  8) & 0xff] & 0xff] ^
-            Td3[Te4[(rk[3]      ) & 0xff] & 0xff];
+            Td3[Te4[(rk[3]) & 0xff] & 0xff];
     }
     // invert the order of the last round keys
     rrk -= 4;
@@ -833,7 +833,7 @@ void AesEncBlk(AesCtx *pCtx, const unsigned char pt[], unsigned char ct[])
      * map byte array block to cipher state
      * and add initial round key:
      */
-    s0 = GETU32(pt     ) ^ rk[0];
+    s0 = GETU32(pt) ^ rk[0];
     s1 = GETU32(pt +  4) ^ rk[1];
     s2 = GETU32(pt +  8) ^ rk[2];
     s3 = GETU32(pt + 12) ^ rk[3];
@@ -852,25 +852,25 @@ void AesEncBlk(AesCtx *pCtx, const unsigned char pt[], unsigned char ct[])
             Te0[(s0 >> 24)       ] ^
             Te1[(s1 >> 16) & 0xff] ^
             Te2[(s2 >>  8) & 0xff] ^
-            Te3[(s3      ) & 0xff] ^
+            Te3[(s3) & 0xff] ^
             rk[4];
         t1 =
             Te0[(s1 >> 24)       ] ^
             Te1[(s2 >> 16) & 0xff] ^
             Te2[(s3 >>  8) & 0xff] ^
-            Te3[(s0      ) & 0xff] ^
+            Te3[(s0) & 0xff] ^
             rk[5];
         t2 =
             Te0[(s2 >> 24)       ] ^
             Te1[(s3 >> 16) & 0xff] ^
             Te2[(s0 >>  8) & 0xff] ^
-            Te3[(s1      ) & 0xff] ^
+            Te3[(s1) & 0xff] ^
             rk[6];
         t3 =
             Te0[(s3 >> 24)       ] ^
             Te1[(s0 >> 16) & 0xff] ^
             Te2[(s1 >>  8) & 0xff] ^
-            Te3[(s2      ) & 0xff] ^
+            Te3[(s2) & 0xff] ^
             rk[7];
 
         rk += 8;
@@ -882,25 +882,25 @@ void AesEncBlk(AesCtx *pCtx, const unsigned char pt[], unsigned char ct[])
             Te0[(t0 >> 24)       ] ^
             Te1[(t1 >> 16) & 0xff] ^
             Te2[(t2 >>  8) & 0xff] ^
-            Te3[(t3      ) & 0xff] ^
+            Te3[(t3) & 0xff] ^
             rk[0];
         s1 =
             Te0[(t1 >> 24)       ] ^
             Te1[(t2 >> 16) & 0xff] ^
             Te2[(t3 >>  8) & 0xff] ^
-            Te3[(t0      ) & 0xff] ^
+            Te3[(t0) & 0xff] ^
             rk[1];
         s2 =
             Te0[(t2 >> 24)       ] ^
             Te1[(t3 >> 16) & 0xff] ^
             Te2[(t0 >>  8) & 0xff] ^
-            Te3[(t1      ) & 0xff] ^
+            Te3[(t1) & 0xff] ^
             rk[2];
         s3 =
             Te0[(t3 >> 24)       ] ^
             Te1[(t0 >> 16) & 0xff] ^
             Te2[(t1 >>  8) & 0xff] ^
-            Te3[(t2      ) & 0xff] ^
+            Te3[(t2) & 0xff] ^
             rk[3];
     }
     /*
@@ -911,28 +911,28 @@ void AesEncBlk(AesCtx *pCtx, const unsigned char pt[], unsigned char ct[])
         (Te4[(t0 >> 24)       ] & 0xff000000) ^
         (Te4[(t1 >> 16) & 0xff] & 0x00ff0000) ^
         (Te4[(t2 >>  8) & 0xff] & 0x0000ff00) ^
-        (Te4[(t3      ) & 0xff] & 0x000000ff) ^
+        (Te4[(t3) & 0xff] & 0x000000ff) ^
         rk[0];
-    PUTU32(ct     , s0);
+    PUTU32(ct, s0);
     s1 =
         (Te4[(t1 >> 24)       ] & 0xff000000) ^
         (Te4[(t2 >> 16) & 0xff] & 0x00ff0000) ^
         (Te4[(t3 >>  8) & 0xff] & 0x0000ff00) ^
-        (Te4[(t0      ) & 0xff] & 0x000000ff) ^
+        (Te4[(t0) & 0xff] & 0x000000ff) ^
         rk[1];
     PUTU32(ct +  4, s1);
     s2 =
         (Te4[(t2 >> 24)       ] & 0xff000000) ^
         (Te4[(t3 >> 16) & 0xff] & 0x00ff0000) ^
         (Te4[(t0 >>  8) & 0xff] & 0x0000ff00) ^
-        (Te4[(t1      ) & 0xff] & 0x000000ff) ^
+        (Te4[(t1) & 0xff] & 0x000000ff) ^
         rk[2];
     PUTU32(ct +  8, s2);
     s3 =
         (Te4[(t3 >> 24)       ] & 0xff000000) ^
         (Te4[(t0 >> 16) & 0xff] & 0x00ff0000) ^
         (Te4[(t1 >>  8) & 0xff] & 0x0000ff00) ^
-        (Te4[(t2      ) & 0xff] & 0x000000ff) ^
+        (Te4[(t2) & 0xff] & 0x000000ff) ^
         rk[3];
     PUTU32(ct + 12, s3);
 
@@ -959,10 +959,14 @@ void AesDecBlk(AesCtx *pCtx, const unsigned char ct[], unsigned char pt[])
      * map byte array block to cipher state
      * and add initial round key:
      */
-    v0 = GETU32(ct     );    s0 = v0 ^ rk[0];
-    v1 = GETU32(ct +  4);    s1 = v1 ^ rk[1];
-    v2 = GETU32(ct +  8);    s2 = v2 ^ rk[2];
-    v3 = GETU32(ct + 12);    s3 = v3 ^ rk[3];
+    v0 = GETU32(ct);
+    s0 = v0 ^ rk[0];
+    v1 = GETU32(ct +  4);
+    s1 = v1 ^ rk[1];
+    v2 = GETU32(ct +  8);
+    s2 = v2 ^ rk[2];
+    v3 = GETU32(ct + 12);
+    s3 = v3 ^ rk[3];
     /*
      * Nr - 1 full rounds:
      */
@@ -972,25 +976,25 @@ void AesDecBlk(AesCtx *pCtx, const unsigned char ct[], unsigned char pt[])
             Td0[(s0 >> 24)       ] ^
             Td1[(s3 >> 16) & 0xff] ^
             Td2[(s2 >>  8) & 0xff] ^
-            Td3[(s1      ) & 0xff] ^
+            Td3[(s1) & 0xff] ^
             rk[4];
         t1 =
             Td0[(s1 >> 24)       ] ^
             Td1[(s0 >> 16) & 0xff] ^
             Td2[(s3 >>  8) & 0xff] ^
-            Td3[(s2      ) & 0xff] ^
+            Td3[(s2) & 0xff] ^
             rk[5];
         t2 =
             Td0[(s2 >> 24)       ] ^
             Td1[(s1 >> 16) & 0xff] ^
             Td2[(s0 >>  8) & 0xff] ^
-            Td3[(s3      ) & 0xff] ^
+            Td3[(s3) & 0xff] ^
             rk[6];
         t3 =
             Td0[(s3 >> 24)       ] ^
             Td1[(s2 >> 16) & 0xff] ^
             Td2[(s1 >>  8) & 0xff] ^
-            Td3[(s0      ) & 0xff] ^
+            Td3[(s0) & 0xff] ^
             rk[7];
 
         rk += 8;
@@ -1002,25 +1006,25 @@ void AesDecBlk(AesCtx *pCtx, const unsigned char ct[], unsigned char pt[])
             Td0[(t0 >> 24)       ] ^
             Td1[(t3 >> 16) & 0xff] ^
             Td2[(t2 >>  8) & 0xff] ^
-            Td3[(t1      ) & 0xff] ^
+            Td3[(t1) & 0xff] ^
             rk[0];
         s1 =
             Td0[(t1 >> 24)       ] ^
             Td1[(t0 >> 16) & 0xff] ^
             Td2[(t3 >>  8) & 0xff] ^
-            Td3[(t2      ) & 0xff] ^
+            Td3[(t2) & 0xff] ^
             rk[1];
         s2 =
             Td0[(t2 >> 24)       ] ^
             Td1[(t1 >> 16) & 0xff] ^
             Td2[(t0 >>  8) & 0xff] ^
-            Td3[(t3      ) & 0xff] ^
+            Td3[(t3) & 0xff] ^
             rk[2];
         s3 =
             Td0[(t3 >> 24)       ] ^
             Td1[(t2 >> 16) & 0xff] ^
             Td2[(t1 >>  8) & 0xff] ^
-            Td3[(t0      ) & 0xff] ^
+            Td3[(t0) & 0xff] ^
             rk[3];
     }
     /*
@@ -1031,35 +1035,39 @@ void AesDecBlk(AesCtx *pCtx, const unsigned char ct[], unsigned char pt[])
         (Td4[(t0 >> 24)       ] & 0xff000000) ^
         (Td4[(t3 >> 16) & 0xff] & 0x00ff0000) ^
         (Td4[(t2 >>  8) & 0xff] & 0x0000ff00) ^
-        (Td4[(t1      ) & 0xff] & 0x000000ff) ^
+        (Td4[(t1) & 0xff] & 0x000000ff) ^
         rk[0];
     s1 =
         (Td4[(t1 >> 24)       ] & 0xff000000) ^
         (Td4[(t0 >> 16) & 0xff] & 0x00ff0000) ^
         (Td4[(t3 >>  8) & 0xff] & 0x0000ff00) ^
-        (Td4[(t2      ) & 0xff] & 0x000000ff) ^
+        (Td4[(t2) & 0xff] & 0x000000ff) ^
         rk[1];
     s2 =
         (Td4[(t2 >> 24)       ] & 0xff000000) ^
         (Td4[(t1 >> 16) & 0xff] & 0x00ff0000) ^
         (Td4[(t0 >>  8) & 0xff] & 0x0000ff00) ^
-        (Td4[(t3      ) & 0xff] & 0x000000ff) ^
+        (Td4[(t3) & 0xff] & 0x000000ff) ^
         rk[2];
     s3 =
         (Td4[(t3 >> 24)       ] & 0xff000000) ^
         (Td4[(t2 >> 16) & 0xff] & 0x00ff0000) ^
         (Td4[(t1 >>  8) & 0xff] & 0x0000ff00) ^
-        (Td4[(t0      ) & 0xff] & 0x000000ff) ^
+        (Td4[(t0) & 0xff] & 0x000000ff) ^
         rk[3];
 
     if (pCtx->Mode) {
-        s0 = s0 ^ iv[0];    iv[0] = v0;
-        s1 = s1 ^ iv[1];    iv[1] = v1;
-        s2 = s2 ^ iv[2];    iv[2] = v2;
-        s3 = s3 ^ iv[3];    iv[3] = v3;
+        s0 = s0 ^ iv[0];
+        iv[0] = v0;
+        s1 = s1 ^ iv[1];
+        iv[1] = v1;
+        s2 = s2 ^ iv[2];
+        iv[2] = v2;
+        s3 = s3 ^ iv[3];
+        iv[3] = v3;
     }
 
-    PUTU32(pt     , s0);
+    PUTU32(pt, s0);
     PUTU32(pt +  4, s1);
     PUTU32(pt +  8, s2);
     PUTU32(pt + 12, s3);
@@ -1082,9 +1090,9 @@ int AesCtxIni(AesCtx *pCtx, unsigned char *pIV, unsigned char *pKey, unsigned in
 
     // initialize IV
     if (pIV != 0) {
-        pCtx->Iv[0] = GETU32(pIV     );
-        pCtx->Iv[1] = GETU32(pIV + 4 );
-        pCtx->Iv[2] = GETU32(pIV + 8 );
+        pCtx->Iv[0] = GETU32(pIV);
+        pCtx->Iv[1] = GETU32(pIV + 4);
+        pCtx->Iv[2] = GETU32(pIV + 8);
         pCtx->Iv[3] = GETU32(pIV + 12);
     }
 
@@ -1149,18 +1157,18 @@ int main()
 
     // initialize context and encrypt data at one end
 
-    if( AesCtxIni(&ctx, iv, key, KEY128, CBC) < 0)
+    if (AesCtxIni(&ctx, iv, key, KEY128, CBC) < 0)
         printf("init error\n");
 
-    if (AesEncrypt(&ctx, databuf, databuf, sizeof(databuf) ) < 0)
+    if (AesEncrypt(&ctx, databuf, databuf, sizeof(databuf)) < 0)
         printf("error in encryption\n");
 
     // initialize context and decrypt cipher at other end
 
-    if( AesCtxIni(&ctx, iv, key, KEY128, CBC) < 0)
+    if (AesCtxIni(&ctx, iv, key, KEY128, CBC) < 0)
         printf("init error\n");
 
-    if (AesDecrypt(&ctx, databuf, databuf, sizeof(databuf) ) < 0)
+    if (AesDecrypt(&ctx, databuf, databuf, sizeof(databuf)) < 0)
         printf("error in decryption\n");
 
     printf("%s\n", databuf);
diff --git a/armsrc/aes.h b/armsrc/aes.h
index 6934d690c..afe7e5e4e 100644
--- a/armsrc/aes.h
+++ b/armsrc/aes.h
@@ -8,11 +8,11 @@
 
 // AES context structure
 typedef struct {
- unsigned int Ek[60];
- unsigned int Dk[60];
- unsigned int Iv[4];
- unsigned char Nr;
- unsigned char Mode;
+    unsigned int Ek[60];
+    unsigned int Dk[60];
+    unsigned int Iv[4];
+    unsigned char Nr;
+    unsigned char Mode;
 } AesCtx;
 
 // key length in bytes
diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 2d8730cd7..1982c57a7 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -27,7 +27,7 @@
 #define DEBUG 1
 
 #ifdef WITH_LCD
- #include "LCD.h"
+#include "LCD.h"
 #endif
 
 #ifdef WITH_SMARTCARD
@@ -54,55 +54,59 @@ int ToSendMax = -1;
 static int ToSendBit;
 struct common_area common_area __attribute__((section(".commonarea")));
 
-void ToSendReset(void) {
+void ToSendReset(void)
+{
     ToSendMax = -1;
     ToSendBit = 8;
 }
 
-void ToSendStuffBit(int b) {
-    if(ToSendBit >= 8) {
+void ToSendStuffBit(int b)
+{
+    if (ToSendBit >= 8) {
         ToSendMax++;
         ToSend[ToSendMax] = 0;
         ToSendBit = 0;
     }
 
-    if(b)
+    if (b)
         ToSend[ToSendMax] |= (1 << (7 - ToSendBit));
 
     ToSendBit++;
 
-    if(ToSendMax >= sizeof(ToSend)) {
+    if (ToSendMax >= sizeof(ToSend)) {
         ToSendBit = 0;
         DbpString("ToSendStuffBit overflowed!");
     }
 }
 
-void PrintToSendBuffer(void) {
+void PrintToSendBuffer(void)
+{
     DbpString("Printing ToSendBuffer:");
     Dbhexdump(ToSendMax, ToSend, 0);
 }
 
-void print_result(char *name, uint8_t *buf, size_t len) {
+void print_result(char *name, uint8_t *buf, size_t len)
+{
 
     uint8_t *p = buf;
     uint16_t tmp = len & 0xFFF0;
 
-    for(; p-buf < tmp; p += 16) {
+    for (; p - buf < tmp; p += 16) {
         Dbprintf("[%s: %02d/%02d] %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x",
-                name,
-                p-buf,
-                len,
-                p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7],p[8], p[9], p[10], p[11], p[12], p[13], p[14], p[15]
-            );
+                 name,
+                 p - buf,
+                 len,
+                 p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7], p[8], p[9], p[10], p[11], p[12], p[13], p[14], p[15]
+                );
     }
     if (len % 16 != 0) {
         char s[46] = {0};
         char *sp = s;
-        for (; p-buf < len; p++ ) {
-            sprintf(sp, "%02x ", p[0] );
+        for (; p - buf < len; p++) {
+            sprintf(sp, "%02x ", p[0]);
             sp += 3;
         }
-        Dbprintf("[%s: %02d/%02d] %s", name, p-buf, len, s);
+        Dbprintf("[%s: %02d/%02d] %s", name, p - buf, len, s);
     }
 }
 
@@ -110,25 +114,29 @@ void print_result(char *name, uint8_t *buf, size_t len) {
 // Debug print functions, to go out over USB, to the usual PC-side client.
 //=============================================================================
 
-void DbpStringEx(char *str, uint32_t cmd) {
+void DbpStringEx(char *str, uint32_t cmd)
+{
 #if DEBUG
     uint8_t len = strlen(str);
-    cmd_send(CMD_DEBUG_PRINT_STRING, len, cmd, 0, (uint8_t*)str, len);
+    cmd_send(CMD_DEBUG_PRINT_STRING, len, cmd, 0, (uint8_t *)str, len);
 #endif
 }
 
-void DbpString(char *str) {
+void DbpString(char *str)
+{
 #if DEBUG
     DbpStringEx(str, 0);
 #endif
 }
 
 #if 0
-void DbpIntegers(int x1, int x2, int x3) {
-    cmd_send(CMD_DEBUG_PRINT_INTEGERS,x1,x2,x3,0,0);
+void DbpIntegers(int x1, int x2, int x3)
+{
+    cmd_send(CMD_DEBUG_PRINT_INTEGERS, x1, x2, x3, 0, 0);
 }
 #endif
-void DbprintfEx(uint32_t cmd, const char *fmt, ...) {
+void DbprintfEx(uint32_t cmd, const char *fmt, ...)
+{
 #if DEBUG
     // should probably limit size here; oh well, let's just use a big buffer
     char output_string[128] = {0x00};
@@ -141,7 +149,8 @@ void DbprintfEx(uint32_t cmd, const char *fmt, ...) {
 #endif
 }
 
-void Dbprintf(const char *fmt, ...) {
+void Dbprintf(const char *fmt, ...)
+{
 #if DEBUG
     // should probably limit size here; oh well, let's just use a big buffer
     char output_string[128] = {0x00};
@@ -156,9 +165,10 @@ void Dbprintf(const char *fmt, ...) {
 }
 
 // prints HEX & ASCII
-void Dbhexdump(int len, uint8_t *d, bool bAsci) {
+void Dbhexdump(int len, uint8_t *d, bool bAsci)
+{
 #if DEBUG
-    int l=0, i;
+    int l = 0, i;
     char ascii[9];
 
     while (len > 0) {
@@ -169,7 +179,7 @@ void Dbhexdump(int len, uint8_t *d, bool bAsci) {
         ascii[l] = 0;
 
         // filter safe ascii
-        for (i=0; i<l; i++) {
+        for (i = 0; i < l; i++) {
             if (ascii[i] < 32 || ascii[i] > 126) {
                 ascii[i] = '.';
             }
@@ -191,7 +201,8 @@ void Dbhexdump(int len, uint8_t *d, bool bAsci) {
 // in ADC units (0 to 1023). Also a routine to average 32 samples and
 // return that.
 //-----------------------------------------------------------------------------
-static uint16_t ReadAdc(int ch) {
+static uint16_t ReadAdc(int ch)
+{
 
     // Note: ADC_MODE_PRESCALE and ADC_MODE_SAMPLE_HOLD_TIME are set to the maximum allowed value.
     // AMPL_HI is are high impedance (10MOhm || 1MOhm) output, the input capacitance of the ADC is 12pF (typical). This results in a time constant
@@ -204,9 +215,9 @@ static uint16_t ReadAdc(int ch) {
 
     AT91C_BASE_ADC->ADC_CR = AT91C_ADC_SWRST;
     AT91C_BASE_ADC->ADC_MR =
-                  ADC_MODE_PRESCALE(63)          // ADC_CLK = MCK / ((63+1) * 2) = 48MHz / 128 = 375kHz
-                | ADC_MODE_STARTUP_TIME(1)       // Startup Time = (1+1) * 8 / ADC_CLK = 16 / 375kHz = 42,7us   Note: must be > 20us
-                | ADC_MODE_SAMPLE_HOLD_TIME(15); // Sample & Hold Time SHTIM = 15 / ADC_CLK = 15 / 375kHz = 40us
+        ADC_MODE_PRESCALE(63)          // ADC_CLK = MCK / ((63+1) * 2) = 48MHz / 128 = 375kHz
+        | ADC_MODE_STARTUP_TIME(1)       // Startup Time = (1+1) * 8 / ADC_CLK = 16 / 375kHz = 42,7us   Note: must be > 20us
+        | ADC_MODE_SAMPLE_HOLD_TIME(15); // Sample & Hold Time SHTIM = 15 / ADC_CLK = 15 / 375kHz = 40us
 
     AT91C_BASE_ADC->ADC_CHER = ADC_CHANNEL(ch);
     AT91C_BASE_ADC->ADC_CR = AT91C_ADC_START;
@@ -217,16 +228,18 @@ static uint16_t ReadAdc(int ch) {
 }
 
 // was static - merlok
-uint16_t AvgAdc(int ch) {
+uint16_t AvgAdc(int ch)
+{
     uint16_t a = 0;
-    for(uint8_t i = 0; i < 32; i++)
+    for (uint8_t i = 0; i < 32; i++)
         a += ReadAdc(ch);
 
     //division by 32
     return (a + 15) >> 5;
 }
 
-void MeasureAntennaTuning(void) {
+void MeasureAntennaTuning(void)
+{
 
     uint8_t LF_Results[256];
     uint32_t i, adcval = 0, peak = 0, peakv = 0, peakf = 0;
@@ -235,20 +248,20 @@ void MeasureAntennaTuning(void) {
     memset(LF_Results, 0, sizeof(LF_Results));
     LED_B_ON();
 
-/*
- * Sweeps the useful LF range of the proxmark from
- * 46.8kHz (divisor=255) to 600kHz (divisor=19) and
- * read the voltage in the antenna, the result left
- * in the buffer is a graph which should clearly show
- * the resonating frequency of your LF antenna
- * ( hopefully around 95 if it is tuned to 125kHz!)
- */
+    /*
+     * Sweeps the useful LF range of the proxmark from
+     * 46.8kHz (divisor=255) to 600kHz (divisor=19) and
+     * read the voltage in the antenna, the result left
+     * in the buffer is a graph which should clearly show
+     * the resonating frequency of your LF antenna
+     * ( hopefully around 95 if it is tuned to 125kHz!)
+     */
 
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
     FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | FPGA_LF_ADC_READER_FIELD);
     SpinDelay(50);
 
-    for  (i = 255; i >= 19; i--) {
+    for (i = 255; i >= 19; i--) {
         WDT_HIT();
         FpgaSendCommand(FPGA_CMD_SET_DIVISOR, i);
         SpinDelay(20);
@@ -259,7 +272,7 @@ void MeasureAntennaTuning(void) {
             v_lf134 = adcval; // voltage at 134Khz
 
         LF_Results[i] = adcval >> 9; // scale int to fit in byte for graphing purposes
-        if(LF_Results[i] > peak) {
+        if (LF_Results[i] > peak) {
             peakv = adcval;
             peakf = i;
             peak = LF_Results[i];
@@ -274,7 +287,7 @@ void MeasureAntennaTuning(void) {
     v_hf = (MAX_ADC_HF_VOLTAGE * AvgAdc(ADC_CHAN_HF)) >> 10;
 
     // RDV40 will hit the roof, try other ADC channel used in that hardware revision.
-    if ( v_hf > MAX_ADC_HF_VOLTAGE-300 ) {
+    if (v_hf > MAX_ADC_HF_VOLTAGE - 300) {
         v_hf = (MAX_ADC_HF_VOLTAGE_RDV40 * AvgAdc(ADC_CHAN_HF_RDV40)) >> 10;
     }
 
@@ -291,29 +304,31 @@ void MeasureAntennaTuning(void) {
     LEDsoff();
 }
 
-void MeasureAntennaTuningHf(void) {
+void MeasureAntennaTuningHf(void)
+{
     uint16_t volt = 0; // in mV
     // Let the FPGA drive the high-frequency antenna around 13.56 MHz.
     FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
     FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
     SpinDelay(50);
     volt = (MAX_ADC_HF_VOLTAGE * AvgAdc(ADC_CHAN_HF)) >> 10;
-    bool use_high = ( volt > MAX_ADC_HF_VOLTAGE-300 );
+    bool use_high = (volt > MAX_ADC_HF_VOLTAGE - 300);
 
-    while( !BUTTON_PRESS() ){
+    while (!BUTTON_PRESS()) {
         SpinDelay(20);
-        if ( !use_high ) {
+        if (!use_high) {
             volt = (MAX_ADC_HF_VOLTAGE * AvgAdc(ADC_CHAN_HF)) >> 10;
         } else {
             volt = (MAX_ADC_HF_VOLTAGE_RDV40 * AvgAdc(ADC_CHAN_HF_RDV40)) >> 10;
         }
-        DbprintfEx(FLAG_NONEWLINE, "%u mV / %5u V", volt, (uint16_t)(volt/1000));
+        DbprintfEx(FLAG_NONEWLINE, "%u mV / %5u V", volt, (uint16_t)(volt / 1000));
     }
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     DbprintfEx(FLAG_NOOPT, "\n[+] cancelled", 1);
 }
 
-void ReadMem(int addr) {
+void ReadMem(int addr)
+{
     const uint8_t *data = ((uint8_t *)addr);
 
     Dbprintf("%x: %02x %02x %02x %02x %02x %02x %02x %02x", addr, data[0], data[1], data[2], data[3], data[4], data[5], data[6], data[7]);
@@ -323,7 +338,8 @@ void ReadMem(int addr) {
 extern struct version_information version_information;
 /* bootrom version information is pointed to from _bootphase1_version_pointer */
 extern char *_bootphase1_version_pointer, _flash_start, _flash_end, _bootrom_start, _bootrom_end, __data_src_start__;
-void SendVersion(void) {
+void SendVersion(void)
+{
     char temp[USB_CMD_DATA_SIZE]; /* Limited data payload in USB packets */
     char VersionString[USB_CMD_DATA_SIZE] = { '\0' };
 
@@ -331,11 +347,11 @@ void SendVersion(void) {
      * symbol _bootphase1_version_pointer, perform slight sanity checks on the
      * pointer, then use it.
      */
-    char *bootrom_version = *(char**)&_bootphase1_version_pointer;
+    char *bootrom_version = *(char **)&_bootphase1_version_pointer;
 
     strncat(VersionString, " [ ARM ]\n", sizeof(VersionString) - strlen(VersionString) - 1);
 
-    if( bootrom_version < &_flash_start || bootrom_version >= &_flash_end ) {
+    if (bootrom_version < &_flash_start || bootrom_version >= &_flash_end) {
         strcat(VersionString, "bootrom version information appears invalid\n");
     } else {
         FormatVersionInformation(temp, sizeof(temp), " bootrom: ", bootrom_version);
@@ -361,11 +377,12 @@ void SendVersion(void) {
 
 // measure the USB Speed by sending SpeedTestBufferSize bytes to client and measuring the elapsed time.
 // Note: this mimics GetFromBigbuf(), i.e. we have the overhead of the UsbCommand structure included.
-void printUSBSpeed(void) {
+void printUSBSpeed(void)
+{
     Dbprintf("USB Speed");
     Dbprintf("  Sending USB packets to client...");
 
-    #define USB_SPEED_TEST_MIN_TIME 1500 // in milliseconds
+#define USB_SPEED_TEST_MIN_TIME 1500 // in milliseconds
     uint8_t *test_data = BigBuf_get_addr();
     uint32_t end_time;
 
@@ -388,7 +405,8 @@ void printUSBSpeed(void) {
 /**
   * Prints runtime information about the PM3.
 **/
-void SendStatus(void) {
+void SendStatus(void)
+{
     BigBuf_print_status();
     Fpga_print_status();
 #ifdef WITH_FLASH
@@ -412,7 +430,8 @@ void SendStatus(void) {
 }
 
 // Show some leds in a pattern to identify StandAlone mod is running
-void StandAloneMode(void) {
+void StandAloneMode(void)
+{
 
     DbpString("Stand-alone mode! No PC necessary.");
 
@@ -425,7 +444,8 @@ void StandAloneMode(void) {
 }
 // detection of which Standalone Modes is installed
 // (iceman)
-void printStandAloneModes(void) {
+void printStandAloneModes(void)
+{
 
     DbpString("Installed StandAlone Mode");
 
@@ -492,18 +512,19 @@ at the same place! :-)
 LIGHT SCHEME USED:
 */
 static const char LIGHT_SCHEME[] = {
-        0x0, /* ----     | No field detected */
-        0x1, /* X---     | 14% of maximum current detected */
-        0x2, /* -X--     | 29% of maximum current detected */
-        0x4, /* --X-     | 43% of maximum current detected */
-        0x8, /* ---X     | 57% of maximum current detected */
-        0xC, /* --XX     | 71% of maximum current detected */
-        0xE, /* -XXX     | 86% of maximum current detected */
-        0xF, /* XXXX     | 100% of maximum current detected */
+    0x0, /* ----     | No field detected */
+    0x1, /* X---     | 14% of maximum current detected */
+    0x2, /* -X--     | 29% of maximum current detected */
+    0x4, /* --X-     | 43% of maximum current detected */
+    0x8, /* ---X     | 57% of maximum current detected */
+    0xC, /* --XX     | 71% of maximum current detected */
+    0xE, /* -XXX     | 86% of maximum current detected */
+    0xF, /* XXXX     | 100% of maximum current detected */
 };
-static const int LIGHT_LEN = sizeof(LIGHT_SCHEME)/sizeof(LIGHT_SCHEME[0]);
+static const int LIGHT_LEN = sizeof(LIGHT_SCHEME) / sizeof(LIGHT_SCHEME[0]);
 
-void ListenReaderField(int limit) {
+void ListenReaderField(int limit)
+{
 #define LF_ONLY 1
 #define HF_ONLY 2
 #define REPORT_CHANGE 10    // report new values only if they have changed at least by REPORT_CHANGE
@@ -530,8 +551,8 @@ void ListenReaderField(int limit) {
 
     // iceman,  useless,  since we are measuring readerfield,  not our field.  My tests shows a max of 20v from a reader.
     // RDV40 will hit the roof, try other ADC channel used in that hardware revision.
-    bool use_high = ( ((MAX_ADC_HF_VOLTAGE * hf_max) >> 10) > MAX_ADC_HF_VOLTAGE-300 );
-    if ( use_high ) {
+    bool use_high = (((MAX_ADC_HF_VOLTAGE * hf_max) >> 10) > MAX_ADC_HF_VOLTAGE - 300);
+    if (use_high) {
         hf_av = hf_max = AvgAdc(ADC_CHAN_HF_RDV40);
     }
 
@@ -540,7 +561,7 @@ void ListenReaderField(int limit) {
         hf_baseline = hf_av;
     }
 
-    for(;;) {
+    for (;;) {
         // Switch modes with button
         if (BUTTON_PRESS()) {
             SpinDelay(500);
@@ -560,7 +581,7 @@ void ListenReaderField(int limit) {
         WDT_HIT();
 
         if (limit != HF_ONLY) {
-            if(mode == 1) {
+            if (mode == 1) {
                 if (ABS(lf_av - lf_baseline) > REPORT_CHANGE)
                     LED_D_ON();
                 else
@@ -578,7 +599,7 @@ void ListenReaderField(int limit) {
         }
 
         if (limit != LF_ONLY) {
-            if (mode == 1){
+            if (mode == 1) {
                 if (ABS(hf_av - hf_baseline) > REPORT_CHANGE)
                     LED_B_ON();
                 else
@@ -588,7 +609,7 @@ void ListenReaderField(int limit) {
             hf_av_new = (use_high) ? AvgAdc(ADC_CHAN_HF_RDV40) :  AvgAdc(ADC_CHAN_HF);
 
             // see if there's a significant change
-            if(ABS(hf_av - hf_av_new) > REPORT_CHANGE) {
+            if (ABS(hf_av - hf_av_new) > REPORT_CHANGE) {
                 Dbprintf("HF 13.56MHz Field Change: %5dmV", (MAX_ADC_HF_VOLTAGE * hf_av_new) >> 10);
                 hf_av = hf_av_new;
                 if (hf_av > hf_max)
@@ -604,7 +625,7 @@ void ListenReaderField(int limit) {
                 display_val = hf_av;
                 display_max = hf_max;
             } else { /* Pick one at random */
-                if( (hf_max - hf_baseline) > (lf_max - lf_baseline) ) {
+                if ((hf_max - hf_baseline) > (lf_max - lf_baseline)) {
                     display_val = hf_av;
                     display_max = hf_max;
                 } else {
@@ -612,12 +633,16 @@ void ListenReaderField(int limit) {
                     display_max = lf_max;
                 }
             }
-            for (i=0; i<LIGHT_LEN; i++) {
-                if (display_val >= ((display_max/LIGHT_LEN)*i) && display_val <= ((display_max/LIGHT_LEN)*(i+1))) {
-                    if (LIGHT_SCHEME[i] & 0x1) LED_C_ON(); else LED_C_OFF();
-                    if (LIGHT_SCHEME[i] & 0x2) LED_A_ON(); else LED_A_OFF();
-                    if (LIGHT_SCHEME[i] & 0x4) LED_B_ON(); else LED_B_OFF();
-                    if (LIGHT_SCHEME[i] & 0x8) LED_D_ON(); else LED_D_OFF();
+            for (i = 0; i < LIGHT_LEN; i++) {
+                if (display_val >= ((display_max / LIGHT_LEN)*i) && display_val <= ((display_max / LIGHT_LEN) * (i + 1))) {
+                    if (LIGHT_SCHEME[i] & 0x1) LED_C_ON();
+                    else LED_C_OFF();
+                    if (LIGHT_SCHEME[i] & 0x2) LED_A_ON();
+                    else LED_A_OFF();
+                    if (LIGHT_SCHEME[i] & 0x4) LED_B_ON();
+                    else LED_B_OFF();
+                    if (LIGHT_SCHEME[i] & 0x8) LED_D_ON();
+                    else LED_D_OFF();
                     break;
                 }
             }
@@ -625,15 +650,16 @@ void ListenReaderField(int limit) {
     }
 }
 
-void UsbPacketReceived(uint8_t *packet, int len) {
+void UsbPacketReceived(uint8_t *packet, int len)
+{
     UsbCommand *c = (UsbCommand *)packet;
 
     //Dbprintf("received %d bytes, with command: 0x%04x and args: %d %d %d", len, c->cmd, c->arg[0], c->arg[1], c->arg[2]);
 
-    switch(c->cmd) {
+    switch (c->cmd) {
 #ifdef WITH_LF
         case CMD_SET_LF_T55XX_CONFIG:
-            setT55xxConfig( c->arg[0], (t55xx_config *) c->d.asBytes);
+            setT55xxConfig(c->arg[0], (t55xx_config *) c->d.asBytes);
             break;
         case CMD_SET_LF_SAMPLING_CONFIG:
             setSamplingConfig((sample_config *) c->d.asBytes);
@@ -692,7 +718,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
             ReadTItag();
             break;
         case CMD_WRITE_TI_TYPE:
-            WriteTItag(c->arg[0],c->arg[1],c->arg[2]);
+            WriteTItag(c->arg[0], c->arg[1], c->arg[2]);
             break;
         case CMD_SIMULATE_TAG_125K:
             LED_A_ON();
@@ -709,7 +735,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
             CopyIndala224toT55x7(
                 c->d.asDwords[0], c->d.asDwords[1], c->d.asDwords[2], c->d.asDwords[3],
                 c->d.asDwords[4], c->d.asDwords[5], c->d.asDwords[6]
-                );
+            );
             break;
         case CMD_T55XX_READ_BLOCK: {
             T55xxReadBlock(c->arg[0], c->arg[1], c->arg[2]);
@@ -738,7 +764,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
                 c->arg[0],
                 c->arg[1],
                 c->arg[2]
-                );
+            );
             break;
         case CMD_EM4X_READ_WORD:
             EM4xReadWord(c->arg[0], c->arg[1], c->arg[2]);
@@ -765,25 +791,25 @@ void UsbPacketReceived(uint8_t *packet, int len) {
             SnoopHitag(c->arg[0]);
             break;
         case CMD_SIMULATE_HITAG: // Simulate Hitag tag, args = memory content
-            SimulateHitagTag((bool)c->arg[0],(byte_t*)c->d.asBytes);
+            SimulateHitagTag((bool)c->arg[0], (byte_t *)c->d.asBytes);
             break;
         case CMD_READER_HITAG: // Reader for Hitag tags, args = type and function
-            ReaderHitag((hitag_function)c->arg[0],(hitag_data*)c->d.asBytes);
+            ReaderHitag((hitag_function)c->arg[0], (hitag_data *)c->d.asBytes);
             break;
         case CMD_SIMULATE_HITAG_S:// Simulate Hitag s tag, args = memory content
-            SimulateHitagSTag((bool)c->arg[0],(byte_t*)c->d.asBytes);
+            SimulateHitagSTag((bool)c->arg[0], (byte_t *)c->d.asBytes);
             break;
         case CMD_TEST_HITAGS_TRACES:// Tests every challenge within the given file
-            check_challenges((bool)c->arg[0],(byte_t*)c->d.asBytes);
+            check_challenges((bool)c->arg[0], (byte_t *)c->d.asBytes);
             break;
         case CMD_READ_HITAG_S: //Reader for only Hitag S tags, args = key or challenge
-            ReadHitagS((hitag_function)c->arg[0],(hitag_data*)c->d.asBytes);
+            ReadHitagS((hitag_function)c->arg[0], (hitag_data *)c->d.asBytes);
             break;
         case CMD_WR_HITAG_S: //writer for Hitag tags args=data to write,page and key or challenge
             if ((hitag_function)c->arg[0] < 10) {
-                WritePageHitagS((hitag_function)c->arg[0],(hitag_data*)c->d.asBytes,c->arg[2]);
+                WritePageHitagS((hitag_function)c->arg[0], (hitag_data *)c->d.asBytes, c->arg[2]);
             } else if ((hitag_function)c->arg[0] >= 10) {
-              WriterHitag((hitag_function)c->arg[0],(hitag_data*)c->d.asBytes, c->arg[2]);
+                WriterHitag((hitag_function)c->arg[0], (hitag_data *)c->d.asBytes, c->arg[2]);
             }
             break;
 #endif
@@ -892,10 +918,10 @@ void UsbPacketReceived(uint8_t *packet, int len) {
             MifareReadBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
             break;
         case CMD_MIFAREU_READBL:
-            MifareUReadBlock(c->arg[0],c->arg[1], c->d.asBytes);
+            MifareUReadBlock(c->arg[0], c->arg[1], c->d.asBytes);
             break;
         case CMD_MIFAREUC_AUTH:
-            MifareUC_Auth(c->arg[0],c->d.asBytes);
+            MifareUC_Auth(c->arg[0], c->d.asBytes);
             break;
         case CMD_MIFAREU_READCARD:
             MifareUReadCard(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
@@ -910,8 +936,8 @@ void UsbPacketReceived(uint8_t *packet, int len) {
             MifareWriteBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
             break;
         //case CMD_MIFAREU_WRITEBL_COMPAT:
-            //MifareUWriteBlockCompat(c->arg[0], c->d.asBytes);
-            //break;
+        //MifareUWriteBlockCompat(c->arg[0], c->d.asBytes);
+        //break;
         case CMD_MIFAREU_WRITEBL:
             MifareUWriteBlock(c->arg[0], c->arg[1], c->d.asBytes);
             break;
@@ -1050,11 +1076,11 @@ void UsbPacketReceived(uint8_t *packet, int len) {
             SmartCardAtr();
             break;
         }
-        case CMD_SMART_SETBAUD:{
+        case CMD_SMART_SETBAUD: {
             SmartCardSetBaud(c->arg[0]);
             break;
         }
-        case CMD_SMART_SETCLOCK:{
+        case CMD_SMART_SETCLOCK: {
             SmartCardSetClock(c->arg[0]);
             break;
         }
@@ -1065,8 +1091,8 @@ void UsbPacketReceived(uint8_t *packet, int len) {
         case CMD_SMART_UPLOAD: {
             // upload file from client
             uint8_t *mem = BigBuf_get_addr();
-            memcpy( mem + c->arg[0], c->d.asBytes, USB_CMD_DATA_SIZE);
-            cmd_send(CMD_ACK,1,0,0,0,0);
+            memcpy(mem + c->arg[0], c->d.asBytes, USB_CMD_DATA_SIZE);
+            cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
             break;
         }
         case CMD_SMART_UPGRADE: {
@@ -1101,14 +1127,14 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 
 
             char dest[USB_CMD_DATA_SIZE] = { '\0' };
-            static const char* welcome = "Proxmark3 Serial interface via FPC ready\n";
+            static const char *welcome = "Proxmark3 Serial interface via FPC ready\n";
             strncat(dest, welcome, sizeof(dest) - strlen(dest) - 1);
             sprintf(dest + strlen(dest) - 1, "| bytes 0x%02x 0x%02x 0x%02x 0x%02x \n"
-                        , c->d.asBytes[0]
-                        , c->d.asBytes[1]
-                        , c->d.asBytes[2]
-                        , c->d.asBytes[3]
-                        );
+                    , c->d.asBytes[0]
+                    , c->d.asBytes[1]
+                    , c->d.asBytes[2]
+                    , c->d.asBytes[3]
+                   );
 
             UsbCommand txcmd = { CMD_DEBUG_PRINT_STRING, { strlen(dest), 0, 0 } };
             memcpy(txcmd.d.asBytes, dest, sizeof(dest));
@@ -1116,7 +1142,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
             LED_A_ON();
 
             usart_init();
-            usart_writebuffer((uint8_t*)&txcmd, sizeof(UsbCommand));
+            usart_writebuffer((uint8_t *)&txcmd, sizeof(UsbCommand));
 
             //usb
             cmd_send(CMD_DEBUG_PRINT_STRING, strlen(dest), 0, 0, dest, strlen(dest));
@@ -1140,7 +1166,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 
             //cmd_send(CMD_DEBUG_PRINT_STRING, strlen(dest), 0, 0, dest, strlen(dest));
 
-            cmd_send(CMD_ACK,0,0,0,0,0);
+            cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
             StopTicks();
             break;
         }
@@ -1180,11 +1206,11 @@ void UsbPacketReceived(uint8_t *packet, int len) {
             // arg2 = BigBuf tracelen
             //Dbprintf("transfer to client parameters: %" PRIu32 " | %" PRIu32 " | %" PRIu32, startidx, numofbytes, c->arg[2]);
 
-            for(size_t i = 0; i < numofbytes; i += USB_CMD_DATA_SIZE) {
-                len = MIN( (numofbytes - i), USB_CMD_DATA_SIZE);
+            for (size_t i = 0; i < numofbytes; i += USB_CMD_DATA_SIZE) {
+                len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);
                 isok = cmd_send(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K, i, len, BigBuf_get_traceLen(), mem + startidx + i, len);
                 if (isok != 0)
-                    Dbprintf("transfer to client failed ::  | bytes between %d - %d (%d)", i, i+len, len);
+                    Dbprintf("transfer to client failed ::  | bytes between %d - %d (%d)", i, i + len, len);
             }
             // Trigger a finish downloading signal with an ACK frame
             // iceman,  when did sending samplingconfig array got attached here?!?
@@ -1202,15 +1228,15 @@ void UsbPacketReceived(uint8_t *packet, int len) {
             // to be able to use this one for uploading data to device
             // arg1 = 0 upload for LF usage
             //        1 upload for HF usage
-            #define FPGA_LF 1
-            if ( c->arg[1] == FPGA_LF )
+#define FPGA_LF 1
+            if (c->arg[1] == FPGA_LF)
                 FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
             else
                 FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
 
             uint8_t *mem = BigBuf_get_addr();
-            memcpy( mem + c->arg[0], c->d.asBytes, USB_CMD_DATA_SIZE);
-            cmd_send(CMD_ACK,1,0,0,0,0);
+            memcpy(mem + c->arg[0], c->d.asBytes, USB_CMD_DATA_SIZE);
+            cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
             break;
         }
         case CMD_DOWNLOAD_EML_BIGBUF: {
@@ -1229,7 +1255,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
                 len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);
                 isok = cmd_send(CMD_DOWNLOADED_EML_BIGBUF, i, len, 0, mem + startidx + i, len);
                 if (isok != 0)
-                    Dbprintf("transfer to client failed ::  | bytes between %d - %d (%d)", i, i+len, len);
+                    Dbprintf("transfer to client failed ::  | bytes between %d - %d (%d)", i, i + len, len);
             }
             // Trigger a finish downloading signal with an ACK frame
             cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
@@ -1259,12 +1285,12 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 
             uint8_t *mem = BigBuf_malloc(size);
 
-            for(size_t i = 0; i < len; i += size) {
+            for (size_t i = 0; i < len; i += size) {
                 len = MIN((len - i), size);
 
                 Dbprintf("FlashMem reading  | %d | %d | %d |", startidx + i, i, len);
                 isok = Flash_ReadDataCont(startidx + i, mem, len);
-                if ( isok == len ) {
+                if (isok == len) {
                     print_result("Chunk: ", mem, len);
                 } else {
                     Dbprintf("FlashMem reading failed | %d | %d", len, isok);
@@ -1282,7 +1308,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
             uint16_t res = 0;
             uint32_t startidx = c->arg[0];
             uint16_t len = c->arg[1];
-            uint8_t* data = c->d.asBytes;
+            uint8_t *data = c->d.asBytes;
 
             uint32_t tmp = startidx + len;
 
@@ -1293,9 +1319,9 @@ void UsbPacketReceived(uint8_t *packet, int len) {
             Flash_CheckBusy(BUSY_TIMEOUT);
             Flash_WriteEnable();
 
-            if ( startidx == DEFAULT_T55XX_KEYS_OFFSET  )
+            if (startidx == DEFAULT_T55XX_KEYS_OFFSET)
                 Flash_Erase4k(3, 0xC);
-            else if (startidx ==  DEFAULT_MF_KEYS_OFFSET )
+            else if (startidx ==  DEFAULT_MF_KEYS_OFFSET)
                 Flash_Erase4k(3, 0xB);
             else if (startidx == DEFAULT_ICLASS_KEYS_OFFSET)
                 Flash_Erase4k(3, 0xA);
@@ -1304,29 +1330,29 @@ void UsbPacketReceived(uint8_t *packet, int len) {
             Flash_WriteEnable();
 
             // inside 256b page?
-            if ( (tmp & 0xFF) != 0) {
+            if ((tmp & 0xFF) != 0) {
 
-                    // is offset+len larger than a page
-                    tmp =  (startidx & 0xFF ) + len;
-                    if (tmp > 0xFF ) {
+                // is offset+len larger than a page
+                tmp = (startidx & 0xFF) + len;
+                if (tmp > 0xFF) {
 
-                        // data spread over two pages.
+                    // data spread over two pages.
 
-                        // offset xxxx10,
-                        uint8_t first_len =  (~startidx & 0xFF)+1;
+                    // offset xxxx10,
+                    uint8_t first_len = (~startidx & 0xFF) + 1;
 
-                        // first mem page
-                        res = Flash_WriteDataCont(startidx, data, first_len);
+                    // first mem page
+                    res = Flash_WriteDataCont(startidx, data, first_len);
 
-                        // second mem page
-                        res = Flash_WriteDataCont(startidx + first_len, data + first_len, len - first_len);
+                    // second mem page
+                    res = Flash_WriteDataCont(startidx + first_len, data + first_len, len - first_len);
 
-                        isok = (res == (len - first_len)) ? 1 : 0;
+                    isok = (res == (len - first_len)) ? 1 : 0;
 
-                    } else {
-                        res = Flash_WriteDataCont(startidx, data, len);
-                        isok = (res == len) ? 1 : 0;
-                    }
+                } else {
+                    res = Flash_WriteDataCont(startidx, data, len);
+                    isok = (res == len) ? 1 : 0;
+                }
             } else {
                 res = Flash_WriteDataCont(startidx, data, len);
                 isok = (res == len) ? 1 : 0;
@@ -1342,13 +1368,13 @@ void UsbPacketReceived(uint8_t *packet, int len) {
             uint8_t page = c->arg[0];
             uint8_t initalwipe = c->arg[1];
             bool isok = false;
-            if ( initalwipe ) {
+            if (initalwipe) {
                 isok = Flash_WipeMemory();
                 cmd_send(CMD_ACK, isok, 0, 0, 0, 0);
                 LED_B_OFF();
                 break;
             }
-            if ( page < 3)
+            if (page < 3)
                 isok = Flash_WipeMemoryPage(page);
 
             cmd_send(CMD_ACK, isok, 0, 0, 0, 0);
@@ -1375,14 +1401,14 @@ void UsbPacketReceived(uint8_t *packet, int len) {
                 len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);
 
                 isok = Flash_ReadDataCont(startidx + i, mem, len);
-                if (!isok )
+                if (!isok)
                     Dbprintf("reading flash memory failed ::  | bytes between %d - %d", i, len);
 
                 isok = cmd_send(CMD_FLASHMEM_DOWNLOADED, i, len, 0, mem, len);
                 if (isok != 0)
                     Dbprintf("transfer to client failed ::  | bytes between %d - %d", i, len);
             }
-                FlashStop();
+            FlashStop();
 
             cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
             LED_B_OFF();
@@ -1391,12 +1417,12 @@ void UsbPacketReceived(uint8_t *packet, int len) {
         case CMD_FLASHMEM_INFO: {
 
             LED_B_ON();
-            rdv40_validation_t *info = (rdv40_validation_t*)BigBuf_malloc( sizeof(rdv40_validation_t) );
+            rdv40_validation_t *info = (rdv40_validation_t *)BigBuf_malloc(sizeof(rdv40_validation_t));
 
             bool isok = Flash_ReadData(FLASH_MEM_SIGNATURE_OFFSET, info->signature, FLASH_MEM_SIGNATURE_LEN);
 
             if (FlashInit()) {
-                Flash_UniqueID( info->flashid);
+                Flash_UniqueID(info->flashid);
                 FlashStop();
             }
             cmd_send(CMD_ACK, isok, 0, 0, info, sizeof(rdv40_validation_t));
@@ -1412,14 +1438,22 @@ void UsbPacketReceived(uint8_t *packet, int len) {
             break;
 
         case CMD_SET_ADC_MUX:
-            switch(c->arg[0]) {
-                case 0: SetAdcMuxFor(GPIO_MUXSEL_LOPKD); break;
-                case 2: SetAdcMuxFor(GPIO_MUXSEL_HIPKD); break;
+            switch (c->arg[0]) {
+                case 0:
+                    SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
+                    break;
+                case 2:
+                    SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
+                    break;
 #ifndef WITH_FPC
-                case 1: SetAdcMuxFor(GPIO_MUXSEL_LORAW); break;
-                case 3: SetAdcMuxFor(GPIO_MUXSEL_HIRAW); break;
+                case 1:
+                    SetAdcMuxFor(GPIO_MUXSEL_LORAW);
+                    break;
+                case 3:
+                    SetAdcMuxFor(GPIO_MUXSEL_HIRAW);
+                    break;
 #endif
-                }
+            }
             break;
 
         case CMD_VERSION:
@@ -1429,7 +1463,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
             SendStatus();
             break;
         case CMD_PING:
-            cmd_send(CMD_ACK,0,0,0,0,0);
+            cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
             break;
 #ifdef WITH_LCD
         case CMD_LCD_RESET:
@@ -1448,17 +1482,17 @@ void UsbPacketReceived(uint8_t *packet, int len) {
             SpinDelay(1000);
             AT91C_BASE_RSTC->RSTC_RCR = RST_CONTROL_KEY | AT91C_RSTC_PROCRST;
             // We're going to reset, and the bootrom will take control.
-            for(;;) {}
+            for (;;) {}
             break;
 
         case CMD_START_FLASH:
-            if(common_area.flags.bootrom_present) {
+            if (common_area.flags.bootrom_present) {
                 common_area.command = COMMON_AREA_COMMAND_ENTER_FLASH_MODE;
             }
             usb_disable();
             AT91C_BASE_RSTC->RSTC_RCR = RST_CONTROL_KEY | AT91C_RSTC_PROCRST;
             // We're going to flash, and the bootrom will take control.
-            for(;;) {}
+            for (;;) {}
             break;
 
         case CMD_DEVICE_INFO: {
@@ -1466,21 +1500,22 @@ void UsbPacketReceived(uint8_t *packet, int len) {
             if (common_area.flags.bootrom_present) {
                 dev_info |= DEVICE_INFO_FLAG_BOOTROM_PRESENT;
             }
-            cmd_send(CMD_DEVICE_INFO,dev_info,0,0,0,0);
+            cmd_send(CMD_DEVICE_INFO, dev_info, 0, 0, 0, 0);
             break;
-            }
+        }
         default:
-            Dbprintf("%s: 0x%04x","unknown command:", c->cmd);
+            Dbprintf("%s: 0x%04x", "unknown command:", c->cmd);
             break;
     }
 }
 
-void  __attribute__((noreturn)) AppMain(void) {
+void  __attribute__((noreturn)) AppMain(void)
+{
 
     SpinDelay(100);
     clear_trace();
 
-    if(common_area.magic != COMMON_AREA_MAGIC || common_area.version != 1) {
+    if (common_area.magic != COMMON_AREA_MAGIC || common_area.version != 1) {
         /* Initialize common area */
         memset(&common_area, 0, sizeof(common_area));
         common_area.magic = COMMON_AREA_MAGIC;
@@ -1537,12 +1572,12 @@ void  __attribute__((noreturn)) AppMain(void) {
 
     uint8_t rx[sizeof(UsbCommand)];
 
-    for(;;) {
+    for (;;) {
         WDT_HIT();
 
         // Check if there is a usb packet available
         if (usb_poll_validate_length()) {
-            if (usb_read(rx, sizeof(rx)) )
+            if (usb_read(rx, sizeof(rx)))
                 UsbPacketReceived(rx, sizeof(rx));
         }
 #ifdef WITH_FPC
@@ -1558,11 +1593,11 @@ void  __attribute__((noreturn)) AppMain(void) {
         // Press button for one second to enter a possible standalone mode
         if (BUTTON_HELD(1000) > 0) {
 
-/*
-* So this is the trigger to execute a standalone mod.  Generic entrypoint by following the standalone/standalone.h headerfile
-* All standalone mod "main loop" should be the RunMod() function.
-* Since the standalone is either LF or HF, the somewhat bisarr defines below exists.
-*/
+            /*
+            * So this is the trigger to execute a standalone mod.  Generic entrypoint by following the standalone/standalone.h headerfile
+            * All standalone mod "main loop" should be the RunMod() function.
+            * Since the standalone is either LF or HF, the somewhat bisarr defines below exists.
+            */
 #if defined (WITH_LF) && ( defined (WITH_LF_SAMYRUN) || defined (WITH_LF_HIDBRUTE) || defined (WITH_LF_PROXBRUTE) )
             RunMod();
 #endif
diff --git a/armsrc/apps.h b/armsrc/apps.h
index 4a775702a..36c865900 100644
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -110,7 +110,7 @@ void EM4xReadWord(uint8_t addr, uint32_t pwd, uint8_t usepwd);
 void EM4xWriteWord(uint32_t flag, uint32_t data, uint32_t pwd);
 void Cotag(uint32_t arg0);
 void setT55xxConfig(uint8_t arg0, t55xx_config *c);
-t55xx_config * getT55xxConfig(void);
+t55xx_config *getT55xxConfig(void);
 void printT55xxConfig(void);
 void loadT55xxConfig(void);
 
@@ -133,11 +133,11 @@ void ReaderIso14443a(UsbCommand *c);
 void GetParity(const uint8_t *pbtCmd, uint16_t len, uint8_t *parity);
 void iso14a_set_trigger(bool enable);
 // also used in emv
-bool prepare_allocated_tag_modulation(tag_response_info_t * response_info);
+bool prepare_allocated_tag_modulation(tag_response_info_t *response_info);
 int GetIso14443aCommandFromReader(uint8_t *received, uint8_t *parity, int *len);
 
 // epa.h
-void EPA_PACE_Collect_Nonce(UsbCommand * c);
+void EPA_PACE_Collect_Nonce(UsbCommand *c);
 void EPA_PACE_Replay(UsbCommand *c);
 
 // mifarecmd.h
@@ -169,35 +169,35 @@ void OnSuccessMagic();
 void OnErrorMagic(uint8_t reason);
 
 int32_t dist_nt(uint32_t nt1, uint32_t nt2);
-void ReaderMifare(bool first_try, uint8_t block, uint8_t keytype );
+void ReaderMifare(bool first_try, uint8_t block, uint8_t keytype);
 //void RAMFUNC SniffMifare(uint8_t param);
 
 //desfire
-void Mifare_DES_Auth1(uint8_t arg0,uint8_t *datain);
+void Mifare_DES_Auth1(uint8_t arg0, uint8_t *datain);
 void Mifare_DES_Auth2(uint32_t arg0, uint8_t *datain);
 
 // mifaredesfire.h
 bool InitDesfireCard();
-void MifareSendCommand(uint8_t arg0,uint8_t arg1, uint8_t *datain);
+void MifareSendCommand(uint8_t arg0, uint8_t arg1, uint8_t *datain);
 void MifareDesfireGetInformation();
-void MifareDES_Auth1(uint8_t arg0,uint8_t arg1,uint8_t arg2, uint8_t *datain);
-void ReaderMifareDES(uint32_t param, uint32_t param2, uint8_t * datain);
+void MifareDES_Auth1(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain);
+void ReaderMifareDES(uint32_t param, uint32_t param2, uint8_t *datain);
 int DesfireAPDU(uint8_t *cmd, size_t cmd_len, uint8_t *dataout);
-size_t CreateAPDU( uint8_t *datain, size_t len, uint8_t *dataout);
+size_t CreateAPDU(uint8_t *datain, size_t len, uint8_t *dataout);
 void OnSuccess();
 void OnError(uint8_t reason);
 
 // desfire_crypto.h
-void *mifare_cryto_preprocess_data (desfiretag_t tag, void *data, size_t *nbytes, size_t offset, int communication_settings);
-void *mifare_cryto_postprocess_data (desfiretag_t tag, void *data, size_t *nbytes, int communication_settings);
-void mifare_cypher_single_block (desfirekey_t  key, uint8_t *data, uint8_t *ivect, MifareCryptoDirection direction, MifareCryptoOperation operation, size_t block_size);
-void mifare_cypher_blocks_chained (desfiretag_t tag, desfirekey_t key, uint8_t *ivect, uint8_t *data, size_t data_size, MifareCryptoDirection direction, MifareCryptoOperation operation);
-size_t key_block_size (const desfirekey_t  key);
-size_t padded_data_length (const size_t nbytes, const size_t block_size);
-size_t maced_data_length (const desfirekey_t  key, const size_t nbytes);
-size_t enciphered_data_length (const desfiretag_t tag, const size_t nbytes, int communication_settings);
-void cmac_generate_subkeys (desfirekey_t key);
-void cmac (const desfirekey_t  key, uint8_t *ivect, const uint8_t *data, size_t len, uint8_t *cmac);
+void *mifare_cryto_preprocess_data(desfiretag_t tag, void *data, size_t *nbytes, size_t offset, int communication_settings);
+void *mifare_cryto_postprocess_data(desfiretag_t tag, void *data, size_t *nbytes, int communication_settings);
+void mifare_cypher_single_block(desfirekey_t  key, uint8_t *data, uint8_t *ivect, MifareCryptoDirection direction, MifareCryptoOperation operation, size_t block_size);
+void mifare_cypher_blocks_chained(desfiretag_t tag, desfirekey_t key, uint8_t *ivect, uint8_t *data, size_t data_size, MifareCryptoDirection direction, MifareCryptoOperation operation);
+size_t key_block_size(const desfirekey_t  key);
+size_t padded_data_length(const size_t nbytes, const size_t block_size);
+size_t maced_data_length(const desfirekey_t  key, const size_t nbytes);
+size_t enciphered_data_length(const desfiretag_t tag, const size_t nbytes, int communication_settings);
+void cmac_generate_subkeys(desfirekey_t key);
+void cmac(const desfirekey_t  key, uint8_t *ivect, const uint8_t *data, size_t len, uint8_t *cmac);
 
 // iso15693.h
 void RecordRawAdcSamplesIso15693(void);
@@ -205,14 +205,14 @@ void AcquireRawAdcSamplesIso15693(void);
 void ReaderIso15693(uint32_t parameter); // Simulate an ISO15693 reader - greg
 void SimTagIso15693(uint32_t parameter, uint8_t *uid); // simulate an ISO15693 tag - greg
 void BruteforceIso15693Afi(uint32_t speed); // find an AFI of a tag - atrox
-void DirectTag15693Command(uint32_t datalen,uint32_t speed, uint32_t recv, uint8_t *data); // send arbitrary commands from CLI - atrox
+void DirectTag15693Command(uint32_t datalen, uint32_t speed, uint32_t recv, uint8_t *data); // send arbitrary commands from CLI - atrox
 void Iso15693InitReader(void);
 
 // iclass.h
 void RAMFUNC SniffIClass(void);
 void SimulateIClass(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain);
 void ReaderIClass(uint8_t arg0);
-void ReaderIClass_Replay(uint8_t arg0,uint8_t *MAC);
+void ReaderIClass_Replay(uint8_t arg0, uint8_t *MAC);
 void iClass_Authentication(uint8_t *MAC);
 void iClass_Authentication_fast(uint64_t arg0, uint64_t arg1, uint8_t *datain);
 void iClass_WriteBlock(uint8_t blockNo, uint8_t *data);
@@ -224,22 +224,22 @@ void iClass_ReadCheck(uint8_t blockNo, uint8_t keyType);
 
 // hitag2.h
 void SnoopHitag(uint32_t type);
-void SimulateHitagTag(bool tag_mem_supplied, byte_t* data);
-void ReaderHitag(hitag_function htf, hitag_data* htd);
-void WriterHitag(hitag_function htf, hitag_data* htd, int page);
+void SimulateHitagTag(bool tag_mem_supplied, byte_t *data);
+void ReaderHitag(hitag_function htf, hitag_data *htd);
+void WriterHitag(hitag_function htf, hitag_data *htd, int page);
 
 //hitagS.h
-void SimulateHitagSTag(bool tag_mem_supplied, byte_t* data);
-void ReadHitagS(hitag_function htf, hitag_data* htd);
-void WritePageHitagS(hitag_function htf, hitag_data* htd,int page);
-void check_challenges(bool file_given, byte_t* data);
+void SimulateHitagSTag(bool tag_mem_supplied, byte_t *data);
+void ReadHitagS(hitag_function htf, hitag_data *htd);
+void WritePageHitagS(hitag_function htf, hitag_data *htd, int page);
+void check_challenges(bool file_given, byte_t *data);
 
 // cmd.h
-uint8_t cmd_receive(UsbCommand* cmd);
-uint8_t cmd_send(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void* data, size_t len);
+uint8_t cmd_receive(UsbCommand *cmd);
+uint8_t cmd_send(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
 
 // util.h
-void HfSnoop(int , int);
+void HfSnoop(int, int);
 
 //felica.c
 extern void felica_sendraw(UsbCommand *c);
diff --git a/armsrc/buzzer.c b/armsrc/buzzer.c
index 987d8fade..a06b1adbb 100644
--- a/armsrc/buzzer.c
+++ b/armsrc/buzzer.c
@@ -1,41 +1,46 @@
 #include "buzzer.h"
 
-void Ring_BEE_ONCE(uint16_t music_note) {
+void Ring_BEE_ONCE(uint16_t music_note)
+{
     BEE_ON();
     SpinDelayUs(music_note);
     BEE_OFF();
     SpinDelayUs(music_note);
 }
 
-void ring_2_7khz(uint16_t count) {
-   Ring_BEE_TIME(n_2_7khz,count);
+void ring_2_7khz(uint16_t count)
+{
+    Ring_BEE_TIME(n_2_7khz, count);
 }
 
-void Ring_BEE_TIME(uint16_t music_note,uint16_t count) {
-    for(uint16_t i=0 ; i < count; i++)
+void Ring_BEE_TIME(uint16_t music_note, uint16_t count)
+{
+    for (uint16_t i = 0 ; i < count; i++)
         Ring_BEE_ONCE(music_note);
     SpinDelay(9);
 }
 
-void Ring_ALL(uint16_t count) {
-   Ring_BEE_TIME(note_1, count);
-   Ring_BEE_TIME(note_2, count);
-   Ring_BEE_TIME(note_3, count);
-   Ring_BEE_TIME(note_4, count);
-   Ring_BEE_TIME(note_5, count);
-   Ring_BEE_TIME(note_6, count);
-   Ring_BEE_TIME(note_7, count);
-   SpinDelay(10);
+void Ring_ALL(uint16_t count)
+{
+    Ring_BEE_TIME(note_1, count);
+    Ring_BEE_TIME(note_2, count);
+    Ring_BEE_TIME(note_3, count);
+    Ring_BEE_TIME(note_4, count);
+    Ring_BEE_TIME(note_5, count);
+    Ring_BEE_TIME(note_6, count);
+    Ring_BEE_TIME(note_7, count);
+    SpinDelay(10);
 }
 
-void Ring_Little_Star(uint16_t count) {
-    Ring_BEE_TIME(note_1,count);
-    Ring_BEE_TIME(note_1,count);
-    Ring_BEE_TIME(note_5,count);
-    Ring_BEE_TIME(note_5,count);
-    Ring_BEE_TIME(note_6,count);
-    Ring_BEE_TIME(note_6,count);
-    Ring_BEE_TIME(note_5,2*count);
+void Ring_Little_Star(uint16_t count)
+{
+    Ring_BEE_TIME(note_1, count);
+    Ring_BEE_TIME(note_1, count);
+    Ring_BEE_TIME(note_5, count);
+    Ring_BEE_TIME(note_5, count);
+    Ring_BEE_TIME(note_6, count);
+    Ring_BEE_TIME(note_6, count);
+    Ring_BEE_TIME(note_5, 2 * count);
     LED_A_ON();
     /*
     Ring_BEE_TIME(note_4,count);
diff --git a/armsrc/buzzer.h b/armsrc/buzzer.h
index e253977cf..801b35a21 100644
--- a/armsrc/buzzer.h
+++ b/armsrc/buzzer.h
@@ -21,7 +21,7 @@
 #define note_8          0
 
 extern void Ring_BEE_ONCE(uint16_t music_note);
-extern void Ring_BEE_TIME(uint16_t music_note,uint16_t count);
+extern void Ring_BEE_TIME(uint16_t music_note, uint16_t count);
 extern void ring_2_7khz(uint16_t count);
 extern void Ring_ALL(uint16_t count);
 extern void Ring_Little_Star(uint16_t count);
diff --git a/armsrc/des.c b/armsrc/des.c
index a8c416f06..2e9cfaef1 100644
--- a/armsrc/des.c
+++ b/armsrc/des.c
@@ -29,53 +29,53 @@
 #include "des.h"
 
 const uint8_t sbox[256]  = {
-  /* S-box 1 */
-  0xE4, 0xD1, 0x2F, 0xB8, 0x3A, 0x6C, 0x59, 0x07,
-  0x0F, 0x74, 0xE2, 0xD1, 0xA6, 0xCB, 0x95, 0x38,
-  0x41, 0xE8, 0xD6, 0x2B, 0xFC, 0x97, 0x3A, 0x50,
-  0xFC, 0x82, 0x49, 0x17, 0x5B, 0x3E, 0xA0, 0x6D,
-  /* S-box 2 */
-  0xF1, 0x8E, 0x6B, 0x34, 0x97, 0x2D, 0xC0, 0x5A,
-  0x3D, 0x47, 0xF2, 0x8E, 0xC0, 0x1A, 0x69, 0xB5,
-  0x0E, 0x7B, 0xA4, 0xD1, 0x58, 0xC6, 0x93, 0x2F,
-  0xD8, 0xA1, 0x3F, 0x42, 0xB6, 0x7C, 0x05, 0xE9,
-  /* S-box 3 */
-  0xA0, 0x9E, 0x63, 0xF5, 0x1D, 0xC7, 0xB4, 0x28,
-  0xD7, 0x09, 0x34, 0x6A, 0x28, 0x5E, 0xCB, 0xF1,
-  0xD6, 0x49, 0x8F, 0x30, 0xB1, 0x2C, 0x5A, 0xE7,
-  0x1A, 0xD0, 0x69, 0x87, 0x4F, 0xE3, 0xB5, 0x2C,
-  /* S-box 4 */
-  0x7D, 0xE3, 0x06, 0x9A, 0x12, 0x85, 0xBC, 0x4F,
-  0xD8, 0xB5, 0x6F, 0x03, 0x47, 0x2C, 0x1A, 0xE9,
-  0xA6, 0x90, 0xCB, 0x7D, 0xF1, 0x3E, 0x52, 0x84,
-  0x3F, 0x06, 0xA1, 0xD8, 0x94, 0x5B, 0xC7, 0x2E,
-  /* S-box 5 */
-  0x2C, 0x41, 0x7A, 0xB6, 0x85, 0x3F, 0xD0, 0xE9,
-  0xEB, 0x2C, 0x47, 0xD1, 0x50, 0xFA, 0x39, 0x86,
-  0x42, 0x1B, 0xAD, 0x78, 0xF9, 0xC5, 0x63, 0x0E,
-  0xB8, 0xC7, 0x1E, 0x2D, 0x6F, 0x09, 0xA4, 0x53,
-  /* S-box 6 */
-  0xC1, 0xAF, 0x92, 0x68, 0x0D, 0x34, 0xE7, 0x5B,
-  0xAF, 0x42, 0x7C, 0x95, 0x61, 0xDE, 0x0B, 0x38,
-  0x9E, 0xF5, 0x28, 0xC3, 0x70, 0x4A, 0x1D, 0xB6,
-  0x43, 0x2C, 0x95, 0xFA, 0xBE, 0x17, 0x60, 0x8D,
-  /* S-box 7 */
-  0x4B, 0x2E, 0xF0, 0x8D, 0x3C, 0x97, 0x5A, 0x61,
-  0xD0, 0xB7, 0x49, 0x1A, 0xE3, 0x5C, 0x2F, 0x86,
-  0x14, 0xBD, 0xC3, 0x7E, 0xAF, 0x68, 0x05, 0x92,
-  0x6B, 0xD8, 0x14, 0xA7, 0x95, 0x0F, 0xE2, 0x3C,
-  /* S-box 8 */
-  0xD2, 0x84, 0x6F, 0xB1, 0xA9, 0x3E, 0x50, 0xC7,
-  0x1F, 0xD8, 0xA3, 0x74, 0xC5, 0x6B, 0x0E, 0x92,
-  0x7B, 0x41, 0x9C, 0xE2, 0x06, 0xAD, 0xF3, 0x58,
-  0x21, 0xE7, 0x4A, 0x8D, 0xFC, 0x90, 0x35, 0x6B
+    /* S-box 1 */
+    0xE4, 0xD1, 0x2F, 0xB8, 0x3A, 0x6C, 0x59, 0x07,
+    0x0F, 0x74, 0xE2, 0xD1, 0xA6, 0xCB, 0x95, 0x38,
+    0x41, 0xE8, 0xD6, 0x2B, 0xFC, 0x97, 0x3A, 0x50,
+    0xFC, 0x82, 0x49, 0x17, 0x5B, 0x3E, 0xA0, 0x6D,
+    /* S-box 2 */
+    0xF1, 0x8E, 0x6B, 0x34, 0x97, 0x2D, 0xC0, 0x5A,
+    0x3D, 0x47, 0xF2, 0x8E, 0xC0, 0x1A, 0x69, 0xB5,
+    0x0E, 0x7B, 0xA4, 0xD1, 0x58, 0xC6, 0x93, 0x2F,
+    0xD8, 0xA1, 0x3F, 0x42, 0xB6, 0x7C, 0x05, 0xE9,
+    /* S-box 3 */
+    0xA0, 0x9E, 0x63, 0xF5, 0x1D, 0xC7, 0xB4, 0x28,
+    0xD7, 0x09, 0x34, 0x6A, 0x28, 0x5E, 0xCB, 0xF1,
+    0xD6, 0x49, 0x8F, 0x30, 0xB1, 0x2C, 0x5A, 0xE7,
+    0x1A, 0xD0, 0x69, 0x87, 0x4F, 0xE3, 0xB5, 0x2C,
+    /* S-box 4 */
+    0x7D, 0xE3, 0x06, 0x9A, 0x12, 0x85, 0xBC, 0x4F,
+    0xD8, 0xB5, 0x6F, 0x03, 0x47, 0x2C, 0x1A, 0xE9,
+    0xA6, 0x90, 0xCB, 0x7D, 0xF1, 0x3E, 0x52, 0x84,
+    0x3F, 0x06, 0xA1, 0xD8, 0x94, 0x5B, 0xC7, 0x2E,
+    /* S-box 5 */
+    0x2C, 0x41, 0x7A, 0xB6, 0x85, 0x3F, 0xD0, 0xE9,
+    0xEB, 0x2C, 0x47, 0xD1, 0x50, 0xFA, 0x39, 0x86,
+    0x42, 0x1B, 0xAD, 0x78, 0xF9, 0xC5, 0x63, 0x0E,
+    0xB8, 0xC7, 0x1E, 0x2D, 0x6F, 0x09, 0xA4, 0x53,
+    /* S-box 6 */
+    0xC1, 0xAF, 0x92, 0x68, 0x0D, 0x34, 0xE7, 0x5B,
+    0xAF, 0x42, 0x7C, 0x95, 0x61, 0xDE, 0x0B, 0x38,
+    0x9E, 0xF5, 0x28, 0xC3, 0x70, 0x4A, 0x1D, 0xB6,
+    0x43, 0x2C, 0x95, 0xFA, 0xBE, 0x17, 0x60, 0x8D,
+    /* S-box 7 */
+    0x4B, 0x2E, 0xF0, 0x8D, 0x3C, 0x97, 0x5A, 0x61,
+    0xD0, 0xB7, 0x49, 0x1A, 0xE3, 0x5C, 0x2F, 0x86,
+    0x14, 0xBD, 0xC3, 0x7E, 0xAF, 0x68, 0x05, 0x92,
+    0x6B, 0xD8, 0x14, 0xA7, 0x95, 0x0F, 0xE2, 0x3C,
+    /* S-box 8 */
+    0xD2, 0x84, 0x6F, 0xB1, 0xA9, 0x3E, 0x50, 0xC7,
+    0x1F, 0xD8, 0xA3, 0x74, 0xC5, 0x6B, 0x0E, 0x92,
+    0x7B, 0x41, 0x9C, 0xE2, 0x06, 0xAD, 0xF3, 0x58,
+    0x21, 0xE7, 0x4A, 0x8D, 0xFC, 0x90, 0x35, 0x6B
 };
 
-const uint8_t e_permtab[] ={
-     4,  6,                     /* 4 bytes in 6 bytes out*/
+const uint8_t e_permtab[] = {
+    4,  6,                     /* 4 bytes in 6 bytes out*/
     32,  1,  2,  3,  4,  5,
-     4,  5,  6,  7,  8,  9,
-     8,  9, 10, 11, 12, 13,
+    4,  5,  6,  7,  8,  9,
+    8,  9, 10, 11, 12, 13,
     12, 13, 14, 15, 16, 17,
     16, 17, 18, 19, 20, 21,
     20, 21, 22, 23, 24, 25,
@@ -83,20 +83,20 @@ const uint8_t e_permtab[] ={
     28, 29, 30, 31, 32,  1
 };
 
-const uint8_t p_permtab[] ={
-     4,  4,                     /* 32 bit -> 32 bit */
+const uint8_t p_permtab[] = {
+    4,  4,                     /* 32 bit -> 32 bit */
     16,  7, 20, 21,
     29, 12, 28, 17,
-     1, 15, 23, 26,
-     5, 18, 31, 10,
-     2,  8, 24, 14,
+    1, 15, 23, 26,
+    5, 18, 31, 10,
+    2,  8, 24, 14,
     32, 27,  3,  9,
     19, 13, 30,  6,
     22, 11,  4, 25
 };
 
-const uint8_t ip_permtab[] ={
-     8,  8,                     /* 64 bit -> 64 bit */
+const uint8_t ip_permtab[] = {
+    8,  8,                     /* 64 bit -> 64 bit */
     58, 50, 42, 34, 26, 18, 10, 2,
     60, 52, 44, 36, 28, 20, 12, 4,
     62, 54, 46, 38, 30, 22, 14, 6,
@@ -107,8 +107,8 @@ const uint8_t ip_permtab[] ={
     63, 55, 47, 39, 31, 23, 15, 7
 };
 
-const uint8_t inv_ip_permtab[] ={
-     8, 8,                      /* 64 bit -> 64 bit */
+const uint8_t inv_ip_permtab[] = {
+    8, 8,                      /* 64 bit -> 64 bit */
     40, 8, 48, 16, 56, 24, 64, 32,
     39, 7, 47, 15, 55, 23, 63, 31,
     38, 6, 46, 14, 54, 22, 62, 30,
@@ -119,22 +119,22 @@ const uint8_t inv_ip_permtab[] ={
     33, 1, 41,  9, 49, 17, 57, 25
 };
 
-const uint8_t pc1_permtab[] ={
-     8,  7,                     /* 64 bit -> 56 bit*/
+const uint8_t pc1_permtab[] = {
+    8,  7,                     /* 64 bit -> 56 bit*/
     57, 49, 41, 33, 25, 17,  9,
-     1, 58, 50, 42, 34, 26, 18,
+    1, 58, 50, 42, 34, 26, 18,
     10,  2, 59, 51, 43, 35, 27,
     19, 11,  3, 60, 52, 44, 36,
     63, 55, 47, 39, 31, 23, 15,
-     7, 62, 54, 46, 38, 30, 22,
+    7, 62, 54, 46, 38, 30, 22,
     14,  6, 61, 53, 45, 37, 29,
     21, 13,  5, 28, 20, 12,  4
 };
 
-const uint8_t pc2_permtab[] ={
-     7,  6,                     /* 56 bit -> 48 bit */
+const uint8_t pc2_permtab[] = {
+    7,  6,                     /* 56 bit -> 48 bit */
     14, 17, 11, 24,  1,  5,
-     3, 28, 15,  6, 21, 10,
+    3, 28, 15,  6, 21, 10,
     23, 19, 12,  4, 26,  8,
     16,  7, 27, 20, 13,  2,
     41, 52, 31, 37, 47, 55,
@@ -144,7 +144,7 @@ const uint8_t pc2_permtab[] ={
 };
 
 const uint8_t splitin6bitword_permtab[] = {
-     8,  8,                     /* 64 bit -> 64 bit */
+    8,  8,                     /* 64 bit -> 64 bit */
     64, 64,  1,  6,  2,  3,  4,  5,
     64, 64,  7, 12,  8,  9, 10, 11,
     64, 64, 13, 18, 14, 15, 16, 17,
@@ -156,8 +156,8 @@ const uint8_t splitin6bitword_permtab[] = {
 };
 
 const uint8_t shiftkey_permtab[] = {
-     7,  7,                     /* 56 bit -> 56 bit */
-     2,  3,  4,  5,  6,  7,  8,  9,
+    7,  7,                     /* 56 bit -> 56 bit */
+    2,  3,  4,  5,  6,  7,  8,  9,
     10, 11, 12, 13, 14, 15, 16, 17,
     18, 19, 20, 21, 22, 23, 24, 25,
     26, 27, 28,  1,
@@ -168,9 +168,9 @@ const uint8_t shiftkey_permtab[] = {
 };
 
 const uint8_t shiftkeyinv_permtab[] = {
-     7,  7,
+    7,  7,
     28,  1,  2,  3,  4,  5,  6,  7,
-     8,  9, 10, 11, 12, 13, 14, 15,
+    8,  9, 10, 11, 12, 13, 14, 15,
     16, 17, 18, 19, 20, 21, 22, 23,
     24, 25, 26, 27,
     56, 29, 30, 31, 32, 33, 34, 35,
@@ -202,27 +202,29 @@ const uint8_t shiftkeyinv_permtab[] = {
 #define ROTTABLE_INV  0x3F7E
 /******************************************************************************/
 
-void permute(const uint8_t *ptable, const uint8_t *in, uint8_t *out){
+void permute(const uint8_t *ptable, const uint8_t *in, uint8_t *out)
+{
     uint8_t ob; /* in-bytes and out-bytes */
     uint8_t byte, bit; /* counter for bit and byte */
     ob = ptable[1];
     ptable = &(ptable[2]);
-    for(byte=0; byte<ob; ++byte){
-        uint8_t x,t=0;
-        for(bit=0; bit<8; ++bit){
+    for (byte = 0; byte < ob; ++byte) {
+        uint8_t x, t = 0;
+        for (bit = 0; bit < 8; ++bit) {
             x = *ptable++ - 1;
-                t<<=1;
-            if((in[x/8]) & (0x80>>(x%8)) ){
-                t|=0x01;
+            t <<= 1;
+            if ((in[x / 8]) & (0x80 >> (x % 8))) {
+                t |= 0x01;
             }
         }
-        out[byte]=t;
+        out[byte] = t;
     }
 }
 
 /******************************************************************************/
 
-void changeendian32(uint32_t * a){
+void changeendian32(uint32_t *a)
+{
     *a = (*a & 0x000000FF) << 24 |
          (*a & 0x0000FF00) <<  8 |
          (*a & 0x00FF0000) >>  8 |
@@ -231,65 +233,70 @@ void changeendian32(uint32_t * a){
 
 /******************************************************************************/
 static inline
-void shiftkey(uint8_t *key){
+void shiftkey(uint8_t *key)
+{
     uint8_t k[7];
     memcpy(k, key, 7);
-    permute((uint8_t*)shiftkey_permtab, k, key);
+    permute((uint8_t *)shiftkey_permtab, k, key);
 }
 
 /******************************************************************************/
 static inline
-void shiftkey_inv(uint8_t *key){
+void shiftkey_inv(uint8_t *key)
+{
     uint8_t k[7];
     memcpy(k, key, 7);
-    permute((uint8_t*)shiftkeyinv_permtab, k, key);
+    permute((uint8_t *)shiftkeyinv_permtab, k, key);
 
 }
 
 /******************************************************************************/
 static inline
-uint64_t splitin6bitwords(uint64_t a){
-    uint64_t ret=0;
+uint64_t splitin6bitwords(uint64_t a)
+{
+    uint64_t ret = 0;
     a &= 0x0000ffffffffffffLL;
-    permute((uint8_t*)splitin6bitword_permtab, (uint8_t*)&a, (uint8_t*)&ret);
+    permute((uint8_t *)splitin6bitword_permtab, (uint8_t *)&a, (uint8_t *)&ret);
     return ret;
 }
 
 /******************************************************************************/
 
 static inline
-uint8_t substitute(uint8_t a, uint8_t * sbp){
+uint8_t substitute(uint8_t a, uint8_t *sbp)
+{
     uint8_t x;
-    x = sbp[a>>1];
-    x = (a&1)?x&0x0F:x>>4;
+    x = sbp[a >> 1];
+    x = (a & 1) ? x & 0x0F : x >> 4;
     return x;
 
 }
 
 /******************************************************************************/
 
-uint32_t des_f(uint32_t r, uint8_t* kr){
+uint32_t des_f(uint32_t r, uint8_t *kr)
+{
     uint8_t i;
-    uint32_t t=0,ret;
+    uint32_t t = 0, ret;
     uint64_t data;
     uint8_t *sbp; /* sboxpointer */
-    permute((uint8_t*)e_permtab, (uint8_t*)&r, (uint8_t*)&data);
-    for(i=0; i<6; ++i)
-        ((uint8_t*)&data)[i] ^= kr[i];
+    permute((uint8_t *)e_permtab, (uint8_t *)&r, (uint8_t *)&data);
+    for (i = 0; i < 6; ++i)
+        ((uint8_t *)&data)[i] ^= kr[i];
 
     /* Sbox substitution */
     data = splitin6bitwords(data);
-    sbp=(uint8_t*)sbox;
-    for(i=0; i<8; ++i){
+    sbp = (uint8_t *)sbox;
+    for (i = 0; i < 8; ++i) {
         uint8_t x;
-        x = substitute(((uint8_t*)&data)[i], sbp);
-        t<<=4;
+        x = substitute(((uint8_t *)&data)[i], sbp);
+        t <<= 4;
         t |= x;
         sbp += 32;
     }
     changeendian32(&t);
 
-    permute((uint8_t*)p_permtab,(uint8_t*)&t, (uint8_t*)&ret);
+    permute((uint8_t *)p_permtab, (uint8_t *)&t, (uint8_t *)&ret);
 
     return ret;
 }
@@ -305,26 +312,27 @@ typedef struct {
 #define R (data.d.v32[1])
 #define L (data.d.v32[0])
 
-void des_enc(void* out, const void* in, const void* key){
+void des_enc(void *out, const void *in, const void *key)
+{
 
     uint8_t kr[6], k[7];
     uint8_t i;
     data_t data;
 
-    permute((uint8_t*)ip_permtab, (uint8_t*)in, data.d.v8);
-    permute((uint8_t*)pc1_permtab, (const uint8_t*)key, k);
+    permute((uint8_t *)ip_permtab, (uint8_t *)in, data.d.v8);
+    permute((uint8_t *)pc1_permtab, (const uint8_t *)key, k);
 
-    for(i=0; i<8; ++i){
+    for (i = 0; i < 8; ++i) {
         shiftkey(k);
-        if(ROTTABLE&((1<<((i<<1)+0))) )
+        if (ROTTABLE & ((1 << ((i << 1) + 0))))
             shiftkey(k);
-        permute((uint8_t*)pc2_permtab, k, kr);
+        permute((uint8_t *)pc2_permtab, k, kr);
         L ^= des_f(R, kr);
 
         shiftkey(k);
-        if(ROTTABLE&((1<<((i<<1)+1))) )
+        if (ROTTABLE & ((1 << ((i << 1) + 1))))
             shiftkey(k);
-        permute((uint8_t*)pc2_permtab, k, kr);
+        permute((uint8_t *)pc2_permtab, k, kr);
         R ^= des_f(L, kr);
 
     }
@@ -333,32 +341,33 @@ void des_enc(void* out, const void* in, const void* key){
     L ^= R;
     R ^= L;
 
-    permute((uint8_t*)inv_ip_permtab, data.d.v8, (uint8_t*)out);
+    permute((uint8_t *)inv_ip_permtab, data.d.v8, (uint8_t *)out);
 }
 
 /******************************************************************************/
 
-void des_dec(void* out, const void* in, const uint8_t* key){
+void des_dec(void *out, const void *in, const uint8_t *key)
+{
 
-    uint8_t kr[6],k[7];
+    uint8_t kr[6], k[7];
     int8_t i;
     data_t data;
 
-    permute((uint8_t*)ip_permtab, (uint8_t*)in, data.d.v8);
-    permute((uint8_t*)pc1_permtab, (const uint8_t*)key, k);
-    for(i=7; i>=0; --i){
+    permute((uint8_t *)ip_permtab, (uint8_t *)in, data.d.v8);
+    permute((uint8_t *)pc1_permtab, (const uint8_t *)key, k);
+    for (i = 7; i >= 0; --i) {
 
-        permute((uint8_t*)pc2_permtab, k, kr);
+        permute((uint8_t *)pc2_permtab, k, kr);
         L ^= des_f(R, kr);
         shiftkey_inv(k);
-        if(ROTTABLE&((1<<((i<<1)+1))) ){
+        if (ROTTABLE & ((1 << ((i << 1) + 1)))) {
             shiftkey_inv(k);
         }
 
-        permute((uint8_t*)pc2_permtab, k, kr);
+        permute((uint8_t *)pc2_permtab, k, kr);
         R ^= des_f(L, kr);
         shiftkey_inv(k);
-        if(ROTTABLE&((1<<((i<<1)+0))) ){
+        if (ROTTABLE & ((1 << ((i << 1) + 0)))) {
             shiftkey_inv(k);
         }
 
@@ -368,77 +377,79 @@ void des_dec(void* out, const void* in, const uint8_t* key){
     L ^= R;
     R ^= L;
 
-    permute((uint8_t*)inv_ip_permtab, data.d.v8, (uint8_t*)out);
+    permute((uint8_t *)inv_ip_permtab, data.d.v8, (uint8_t *)out);
 }
 
 /******************************************************************************/
 
-void tdes_enc(void* out, void* in, const void* key){
-    des_enc(out,  in, (uint8_t*)key + 0);
-    des_dec(out, out, (uint8_t*)key + 8);
-    des_enc(out, out, (uint8_t*)key +16);
+void tdes_enc(void *out, void *in, const void *key)
+{
+    des_enc(out,  in, (uint8_t *)key + 0);
+    des_dec(out, out, (uint8_t *)key + 8);
+    des_enc(out, out, (uint8_t *)key + 16);
 }
 
 /******************************************************************************/
 
-void tdes_dec(void* out, void* in, const uint8_t* key){
-    des_dec(out,  in, (uint8_t*)key +16);
-    des_enc(out, out, (uint8_t*)key + 8);
-    des_dec(out, out, (uint8_t*)key + 0);
+void tdes_dec(void *out, void *in, const uint8_t *key)
+{
+    des_dec(out,  in, (uint8_t *)key + 16);
+    des_enc(out, out, (uint8_t *)key + 8);
+    des_dec(out, out, (uint8_t *)key + 0);
 }
 
- void tdes_2key_enc(void* out, const void* in, size_t length, const void* key, unsigned char iv[8]){
+void tdes_2key_enc(void *out, const void *in, size_t length, const void *key, unsigned char iv[8])
+{
 
-    if( length % 8 ) return;
+    if (length % 8) return;
 
     uint8_t i;
-    uint8_t* tin = (uint8_t*) in;
-    uint8_t* tout = (uint8_t*) out;
+    uint8_t *tin = (uint8_t *) in;
+    uint8_t *tout = (uint8_t *) out;
 
-    while( length > 0 )
-    {
-        for( i = 0; i < 8; i++ )
-                tout[i] = (unsigned char)( tin[i] ^ iv[i] );
+    while (length > 0) {
+        for (i = 0; i < 8; i++)
+            tout[i] = (unsigned char)(tin[i] ^ iv[i]);
 
-        des_enc(tout,  tin, (uint8_t*)key + 0);
-        des_dec(tout, tout, (uint8_t*)key + 8);
-        des_enc(tout, tout, (uint8_t*)key + 0);
+        des_enc(tout,  tin, (uint8_t *)key + 0);
+        des_dec(tout, tout, (uint8_t *)key + 8);
+        des_enc(tout, tout, (uint8_t *)key + 0);
 
-        memcpy( iv, tout, 8 );
+        memcpy(iv, tout, 8);
 
         tin  += 8;
         tout += 8;
         length -= 8;
     }
- }
+}
 
- void tdes_2key_dec(void* out, const void* in, size_t length, const void* key, unsigned char iv[8]){
+void tdes_2key_dec(void *out, const void *in, size_t length, const void *key, unsigned char iv[8])
+{
 
-    if( length % 8 ) return;
+    if (length % 8) return;
 
     uint8_t i;
     unsigned char temp[8];
-    uint8_t* tin = (uint8_t*) in;
-    uint8_t* tout = (uint8_t*) out;
+    uint8_t *tin = (uint8_t *) in;
+    uint8_t *tout = (uint8_t *) out;
 
-    while( length > 0 )
-    {
-        memcpy( temp, tin, 8 );
+    while (length > 0) {
+        memcpy(temp, tin, 8);
 
-        des_dec(tout,  tin, (uint8_t*)key + 0);
-        des_enc(tout, tout, (uint8_t*)key + 8);
-        des_dec(tout, tout, (uint8_t*)key + 0);
+        des_dec(tout,  tin, (uint8_t *)key + 0);
+        des_enc(tout, tout, (uint8_t *)key + 8);
+        des_dec(tout, tout, (uint8_t *)key + 0);
 
-        for( i = 0; i < 8; i++ )
-            tout[i] = (unsigned char)( tout[i] ^ iv[i] );
+        for (i = 0; i < 8; i++)
+            tout[i] = (unsigned char)(tout[i] ^ iv[i]);
 
-        memcpy( iv, temp, 8 );
+        memcpy(iv, temp, 8);
 
         tin  += 8;
         tout += 8;
         length -= 8;
     }
- }
+}
 
 
 /******************************************************************************/
diff --git a/armsrc/des.h b/armsrc/des.h
index 2afe39b14..0d2cceefb 100644
--- a/armsrc/des.h
+++ b/armsrc/des.h
@@ -56,7 +56,7 @@
  * \param in  pointer to the block (64 bit = 8 byte) where the plaintext is read from
  * \param key pointer to the key (64 bit = 8 byte)
  */
-void des_enc(void* out, const void* in, const void* key);
+void des_enc(void *out, const void *in, const void *key);
 
 /** \fn void des_dec(void* out, const void* in, const void* key)
  * \brief decrypt a block with DES
@@ -71,7 +71,7 @@ void des_enc(void* out, const void* in, const void* key);
  * \param key pointer to the key (64 bit = 8 byte)
  */
 //void des_dec(void* out, const void* in, const void* key);
-void des_dec(void* out, const void* in, const uint8_t* key);
+void des_dec(void *out, const void *in, const uint8_t *key);
 
 /** \fn void tdes_enc(void* out, const void* in, const void* key)
  * \brief encrypt a block with Tripple-DES
@@ -86,7 +86,7 @@ void des_dec(void* out, const void* in, const uint8_t* key);
  * \param key pointer to the key (192 bit = 24 byte)
  */
 //void tdes_enc(void* out, const void* in, const void* key);
-void tdes_enc(void* out, void* in, const void* key);
+void tdes_enc(void *out, void *in, const void *key);
 
 /** \fn void tdes_dec(void* out, const void* in, const void* key)
  * \brief decrypt a block with Tripple-DES
@@ -100,11 +100,11 @@ void tdes_enc(void* out, void* in, const void* key);
  * \param in  pointer to the block (64 bit = 8 byte) where the ciphertext is read from
  * \param key pointer to the key (192 bit = 24 byte)
  */
- //void tdes_dec(void* out, const void* in, const void* key);
- void tdes_dec(void* out, void* in, const uint8_t* key);
+//void tdes_dec(void* out, const void* in, const void* key);
+void tdes_dec(void *out, void *in, const uint8_t *key);
 
- void tdes_2key_enc(void* out, const void* in, size_t length, const void* key, unsigned char iv[8]);
- void tdes_2key_dec(void* out, const void* in, size_t length, const void* key, unsigned char iv[8]);
+void tdes_2key_enc(void *out, const void *in, size_t length, const void *key, unsigned char iv[8]);
+void tdes_2key_dec(void *out, const void *in, size_t length, const void *key, unsigned char iv[8]);
 
 // Copied from des.h in desfire imp.
 typedef unsigned long DES_KS[16][2];   /* Single-key DES key schedule */
diff --git a/armsrc/desfire_crypto.c b/armsrc/desfire_crypto.c
index dd958d3ea..55dde9c4c 100644
--- a/armsrc/desfire_crypto.c
+++ b/armsrc/desfire_crypto.c
@@ -27,68 +27,72 @@
  */
 #include "desfire_crypto.h"
 
-static void xor (const uint8_t *ivect, uint8_t *data, const size_t len);
-static size_t key_macing_length (desfirekey_t key);
+static void xor(const uint8_t *ivect, uint8_t *data, const size_t len);
+static size_t key_macing_length(desfirekey_t key);
 
 // iceman,  see memxor inside string.c, dest/src swapped..
-static void xor (const uint8_t *ivect, uint8_t *data, const size_t len) {
+static void xor(const uint8_t *ivect, uint8_t *data, const size_t len)
+{
     for (size_t i = 0; i < len; i++) {
         data[i] ^= ivect[i];
     }
 }
 
-void cmac_generate_subkeys ( desfirekey_t key) {
-    int kbs = key_block_size (key);
+void cmac_generate_subkeys(desfirekey_t key)
+{
+    int kbs = key_block_size(key);
     const uint8_t R = (kbs == 8) ? 0x1B : 0x87;
 
     uint8_t l[kbs];
-    memset (l, 0, kbs);
+    memset(l, 0, kbs);
 
     uint8_t ivect[kbs];
-    memset (ivect, 0, kbs);
+    memset(ivect, 0, kbs);
 
-    mifare_cypher_blocks_chained (NULL, key, ivect, l, kbs, MCD_RECEIVE, MCO_ENCYPHER);
+    mifare_cypher_blocks_chained(NULL, key, ivect, l, kbs, MCD_RECEIVE, MCO_ENCYPHER);
 
     bool xor = false;
 
     // Used to compute CMAC on complete blocks
-    memcpy (key->cmac_sk1, l, kbs);
+    memcpy(key->cmac_sk1, l, kbs);
     xor = l[0] & 0x80;
-    lsl (key->cmac_sk1, kbs);
+    lsl(key->cmac_sk1, kbs);
     if (xor)
-        key->cmac_sk1[kbs-1] ^= R;
+        key->cmac_sk1[kbs - 1] ^= R;
 
     // Used to compute CMAC on the last block if non-complete
-    memcpy (key->cmac_sk2, key->cmac_sk1, kbs);
+    memcpy(key->cmac_sk2, key->cmac_sk1, kbs);
     xor = key->cmac_sk1[0] & 0x80;
-    lsl (key->cmac_sk2, kbs);
+    lsl(key->cmac_sk2, kbs);
     if (xor)
-        key->cmac_sk2[kbs-1] ^= R;
+        key->cmac_sk2[kbs - 1] ^= R;
 }
 
-void cmac (const desfirekey_t key, uint8_t *ivect, const uint8_t *data, size_t len, uint8_t *cmac) {
-    int kbs = key_block_size (key);
-    uint8_t *buffer = malloc (padded_data_length (len, kbs));
+void cmac(const desfirekey_t key, uint8_t *ivect, const uint8_t *data, size_t len, uint8_t *cmac)
+{
+    int kbs = key_block_size(key);
+    uint8_t *buffer = malloc(padded_data_length(len, kbs));
 
-    memcpy (buffer, data, len);
+    memcpy(buffer, data, len);
 
     if ((!len) || (len % kbs)) {
         buffer[len++] = 0x80;
         while (len % kbs) {
             buffer[len++] = 0x00;
         }
-        xor (key->cmac_sk2, buffer + len - kbs, kbs);
+        xor(key->cmac_sk2, buffer + len - kbs, kbs);
     } else {
-        xor (key->cmac_sk1, buffer + len - kbs, kbs);
+        xor(key->cmac_sk1, buffer + len - kbs, kbs);
     }
 
-    mifare_cypher_blocks_chained (NULL, key, ivect, buffer, len, MCD_SEND, MCO_ENCYPHER);
+    mifare_cypher_blocks_chained(NULL, key, ivect, buffer, len, MCD_SEND, MCO_ENCYPHER);
 
-    memcpy (cmac, ivect, kbs);
+    memcpy(cmac, ivect, kbs);
     free(buffer);
 }
 
-size_t key_block_size (const desfirekey_t key) {
+size_t key_block_size(const desfirekey_t key)
+{
     size_t block_size = 8;
     switch (key->type) {
         case T_DES:
@@ -106,17 +110,18 @@ size_t key_block_size (const desfirekey_t key) {
 /*
  * Size of MACing produced with the key.
  */
-static size_t key_macing_length (const desfirekey_t key) {
+static size_t key_macing_length(const desfirekey_t key)
+{
     size_t mac_length = MAC_LENGTH;
     switch (key->type) {
-    case T_DES:
-    case T_3DES:
-        mac_length = MAC_LENGTH;
-        break;
-    case T_3K3DES:
-    case T_AES:
-        mac_length = CMAC_LENGTH;
-        break;
+        case T_DES:
+        case T_3DES:
+            mac_length = MAC_LENGTH;
+            break;
+        case T_3K3DES:
+        case T_AES:
+            mac_length = CMAC_LENGTH;
+            break;
     }
     return mac_length;
 }
@@ -124,7 +129,8 @@ static size_t key_macing_length (const desfirekey_t key) {
 /*
  * Size required to store nbytes of data in a buffer of size n*block_size.
  */
-size_t padded_data_length (const size_t nbytes, const size_t block_size) {
+size_t padded_data_length(const size_t nbytes, const size_t block_size)
+{
     if ((!nbytes) || (nbytes % block_size))
         return ((nbytes / block_size) + 1) * block_size;
     else
@@ -134,31 +140,34 @@ size_t padded_data_length (const size_t nbytes, const size_t block_size) {
 /*
  * Buffer size required to MAC nbytes of data
  */
-size_t maced_data_length (const desfirekey_t key, const size_t nbytes) {
-    return nbytes + key_macing_length (key);
+size_t maced_data_length(const desfirekey_t key, const size_t nbytes)
+{
+    return nbytes + key_macing_length(key);
 }
 /*
  * Buffer size required to encipher nbytes of data and a two bytes CRC.
  */
-size_t enciphered_data_length (const desfiretag_t tag, const size_t nbytes, int communication_settings) {
+size_t enciphered_data_length(const desfiretag_t tag, const size_t nbytes, int communication_settings)
+{
     size_t crc_length = 0;
     if (!(communication_settings & NO_CRC)) {
         switch (DESFIRE(tag)->authentication_scheme) {
-        case AS_LEGACY:
-            crc_length = 2;
-            break;
-        case AS_NEW:
-            crc_length = 4;
-            break;
+            case AS_LEGACY:
+                crc_length = 2;
+                break;
+            case AS_NEW:
+                crc_length = 4;
+                break;
         }
     }
 
-    size_t block_size = DESFIRE(tag)->session_key ? key_block_size (DESFIRE(tag)->session_key) : 1;
+    size_t block_size = DESFIRE(tag)->session_key ? key_block_size(DESFIRE(tag)->session_key) : 1;
 
-    return padded_data_length (nbytes + crc_length, block_size);
+    return padded_data_length(nbytes + crc_length, block_size);
 }
 
-void* mifare_cryto_preprocess_data (desfiretag_t tag, void *data, size_t *nbytes, size_t offset, int communication_settings) {
+void *mifare_cryto_preprocess_data(desfiretag_t tag, void *data, size_t *nbytes, size_t offset, int communication_settings)
+{
     uint8_t *res = data;
     uint8_t mac[4];
     size_t edl;
@@ -169,124 +178,124 @@ void* mifare_cryto_preprocess_data (desfiretag_t tag, void *data, size_t *nbytes
         return data;
 
     switch (communication_settings & MDCM_MASK) {
-    case MDCM_PLAIN:
-        if (AS_LEGACY == DESFIRE(tag)->authentication_scheme)
-            break;
+        case MDCM_PLAIN:
+            if (AS_LEGACY == DESFIRE(tag)->authentication_scheme)
+                break;
 
-        /*
-         * When using new authentication methods, PLAIN data transmission from
-         * the PICC to the PCD are CMACed, so we have to maintain the
-         * cryptographic initialisation vector up-to-date to check data
-         * integrity later.
-         *
-         * The only difference with CMACed data transmission is that the CMAC
-         * is not apended to the data send by the PCD to the PICC.
-         */
+            /*
+             * When using new authentication methods, PLAIN data transmission from
+             * the PICC to the PCD are CMACed, so we have to maintain the
+             * cryptographic initialisation vector up-to-date to check data
+             * integrity later.
+             *
+             * The only difference with CMACed data transmission is that the CMAC
+             * is not apended to the data send by the PCD to the PICC.
+             */
 
-        append_mac = false;
+            append_mac = false;
 
         /* pass through */
-    case MDCM_MACED:
-        switch (DESFIRE(tag)->authentication_scheme) {
-        case AS_LEGACY:
-            if (!(communication_settings & MAC_COMMAND))
-                break;
+        case MDCM_MACED:
+            switch (DESFIRE(tag)->authentication_scheme) {
+                case AS_LEGACY:
+                    if (!(communication_settings & MAC_COMMAND))
+                        break;
 
-            /* pass through */
-            edl = padded_data_length (*nbytes - offset, key_block_size (DESFIRE(tag)->session_key)) + offset;
+                    /* pass through */
+                    edl = padded_data_length(*nbytes - offset, key_block_size(DESFIRE(tag)->session_key)) + offset;
 
-            // Fill in the crypto buffer with data ...
-            memcpy (res, data, *nbytes);
-            // ... and 0 padding
-            memset (res + *nbytes, 0, edl - *nbytes);
+                    // Fill in the crypto buffer with data ...
+                    memcpy(res, data, *nbytes);
+                    // ... and 0 padding
+                    memset(res + *nbytes, 0, edl - *nbytes);
 
-            mifare_cypher_blocks_chained (tag, NULL, NULL, res + offset, edl - offset, MCD_SEND, MCO_ENCYPHER);
+                    mifare_cypher_blocks_chained(tag, NULL, NULL, res + offset, edl - offset, MCD_SEND, MCO_ENCYPHER);
 
-            memcpy (mac, res + edl - 8, 4);
+                    memcpy(mac, res + edl - 8, 4);
 
-            // Copy again provided data (was overwritten by mifare_cypher_blocks_chained)
-            memcpy (res, data, *nbytes);
+                    // Copy again provided data (was overwritten by mifare_cypher_blocks_chained)
+                    memcpy(res, data, *nbytes);
 
-            if (!(communication_settings & MAC_COMMAND))
-                break;
-            // Append MAC
-            size_t bla = maced_data_length (DESFIRE(tag)->session_key, *nbytes - offset) + offset;
-            bla++;
+                    if (!(communication_settings & MAC_COMMAND))
+                        break;
+                    // Append MAC
+                    size_t bla = maced_data_length(DESFIRE(tag)->session_key, *nbytes - offset) + offset;
+                    bla++;
 
-            memcpy (res + *nbytes, mac, 4);
+                    memcpy(res + *nbytes, mac, 4);
 
-            *nbytes += 4;
-            break;
-        case AS_NEW:
-            if (!(communication_settings & CMAC_COMMAND))
-                break;
-            cmac (key, DESFIRE (tag)->ivect, res, *nbytes, DESFIRE (tag)->cmac);
+                    *nbytes += 4;
+                    break;
+                case AS_NEW:
+                    if (!(communication_settings & CMAC_COMMAND))
+                        break;
+                    cmac(key, DESFIRE(tag)->ivect, res, *nbytes, DESFIRE(tag)->cmac);
 
-            if (append_mac) {
-                size_t len = maced_data_length (key, *nbytes);
-                ++len;
-                memcpy (res, data, *nbytes);
-                memcpy (res + *nbytes, DESFIRE (tag)->cmac, CMAC_LENGTH);
-                *nbytes += CMAC_LENGTH;
+                    if (append_mac) {
+                        size_t len = maced_data_length(key, *nbytes);
+                        ++len;
+                        memcpy(res, data, *nbytes);
+                        memcpy(res + *nbytes, DESFIRE(tag)->cmac, CMAC_LENGTH);
+                        *nbytes += CMAC_LENGTH;
+                    }
+                    break;
             }
-            break;
-        }
 
-        break;
-    case MDCM_ENCIPHERED:
-        /*  |<-------------- data -------------->|
-         *  |<--- offset -->|                    |
-         *  +---------------+--------------------+-----+---------+
-         *  | CMD + HEADERS | DATA TO BE SECURED | CRC | PADDING |
-         *  +---------------+--------------------+-----+---------+ ----------------
-         *  |               |<~~~~v~~~~~~~~~~~~~>|  ^  |         |   (DES / 3DES)
-         *  |               |     `---- crc16() ----'  |         |
-         *  |               |                    |  ^  |         | ----- *or* -----
-         *  |<~~~~~~~~~~~~~~~~~~~~v~~~~~~~~~~~~~>|  ^  |         |  (3K3DES / AES)
-         *                  |     `---- crc32() ----'  |         |
-         *                  |                                    | ---- *then* ----
-         *                  |<---------------------------------->|
-         *                            encypher()/decypher()
-         */
+            break;
+        case MDCM_ENCIPHERED:
+            /*  |<-------------- data -------------->|
+             *  |<--- offset -->|                    |
+             *  +---------------+--------------------+-----+---------+
+             *  | CMD + HEADERS | DATA TO BE SECURED | CRC | PADDING |
+             *  +---------------+--------------------+-----+---------+ ----------------
+             *  |               |<~~~~v~~~~~~~~~~~~~>|  ^  |         |   (DES / 3DES)
+             *  |               |     `---- crc16() ----'  |         |
+             *  |               |                    |  ^  |         | ----- *or* -----
+             *  |<~~~~~~~~~~~~~~~~~~~~v~~~~~~~~~~~~~>|  ^  |         |  (3K3DES / AES)
+             *                  |     `---- crc32() ----'  |         |
+             *                  |                                    | ---- *then* ----
+             *                  |<---------------------------------->|
+             *                            encypher()/decypher()
+             */
 
             if (!(communication_settings & ENC_COMMAND))
                 break;
-            edl = enciphered_data_length (tag, *nbytes - offset, communication_settings) + offset;
+            edl = enciphered_data_length(tag, *nbytes - offset, communication_settings) + offset;
 
             // Fill in the crypto buffer with data ...
-            memcpy (res, data, *nbytes);
+            memcpy(res, data, *nbytes);
             if (!(communication_settings & NO_CRC)) {
                 // ... CRC ...
-                switch (DESFIRE (tag)->authentication_scheme) {
-                case AS_LEGACY:
-                    AddCrc14A(res + offset, *nbytes - offset);
-                    *nbytes += 2;
-                    break;
-                case AS_NEW:
-                    crc32_append (res, *nbytes);
-                    *nbytes += 4;
-                    break;
+                switch (DESFIRE(tag)->authentication_scheme) {
+                    case AS_LEGACY:
+                        AddCrc14A(res + offset, *nbytes - offset);
+                        *nbytes += 2;
+                        break;
+                    case AS_NEW:
+                        crc32_append(res, *nbytes);
+                        *nbytes += 4;
+                        break;
                 }
             }
             // ... and padding
-            memset (res + *nbytes, 0, edl - *nbytes);
+            memset(res + *nbytes, 0, edl - *nbytes);
 
             *nbytes = edl;
 
-            mifare_cypher_blocks_chained (tag, NULL, NULL, res + offset, *nbytes - offset, MCD_SEND, (AS_NEW == DESFIRE(tag)->authentication_scheme) ? MCO_ENCYPHER : MCO_DECYPHER);
-        break;
-    default:
+            mifare_cypher_blocks_chained(tag, NULL, NULL, res + offset, *nbytes - offset, MCD_SEND, (AS_NEW == DESFIRE(tag)->authentication_scheme) ? MCO_ENCYPHER : MCO_DECYPHER);
+            break;
+        default:
 
-        *nbytes = -1;
-        res = NULL;
-        break;
+            *nbytes = -1;
+            res = NULL;
+            break;
     }
 
     return res;
 
 }
 
-void* mifare_cryto_postprocess_data (desfiretag_t tag, void *data, size_t *nbytes, int communication_settings)
+void *mifare_cryto_postprocess_data(desfiretag_t tag, void *data, size_t *nbytes, int communication_settings)
 {
     void *res = data;
     size_t edl;
@@ -303,300 +312,297 @@ void* mifare_cryto_postprocess_data (desfiretag_t tag, void *data, size_t *nbyte
         return res;
 
     switch (communication_settings & MDCM_MASK) {
-    case MDCM_PLAIN:
+        case MDCM_PLAIN:
 
-        if (AS_LEGACY == DESFIRE(tag)->authentication_scheme)
-            break;
+            if (AS_LEGACY == DESFIRE(tag)->authentication_scheme)
+                break;
 
         /* pass through */
-    case MDCM_MACED:
-        switch (DESFIRE (tag)->authentication_scheme) {
-        case AS_LEGACY:
-            if (communication_settings & MAC_VERIFY) {
-                *nbytes -= key_macing_length (key);
-                if (*nbytes <= 0) {
-                    *nbytes = -1;
-                    res = NULL;
+        case MDCM_MACED:
+            switch (DESFIRE(tag)->authentication_scheme) {
+                case AS_LEGACY:
+                    if (communication_settings & MAC_VERIFY) {
+                        *nbytes -= key_macing_length(key);
+                        if (*nbytes <= 0) {
+                            *nbytes = -1;
+                            res = NULL;
 #ifdef WITH_DEBUG
-                    Dbprintf ("No room for MAC!");
+                            Dbprintf("No room for MAC!");
 #endif
+                            break;
+                        }
+
+                        edl = enciphered_data_length(tag, *nbytes - 1, communication_settings);
+                        edata = malloc(edl);
+
+                        memcpy(edata, data, *nbytes - 1);
+                        memset((uint8_t *)edata + *nbytes - 1, 0, edl - *nbytes + 1);
+
+                        mifare_cypher_blocks_chained(tag, NULL, NULL, edata, edl, MCD_SEND, MCO_ENCYPHER);
+
+                        if (0 != memcmp((uint8_t *)data + *nbytes - 1, (uint8_t *)edata + edl - 8, 4)) {
+#ifdef WITH_DEBUG
+                            Dbprintf("MACing not verified");
+                            hexdump((uint8_t *)data + *nbytes - 1, key_macing_length(key), "Expect ", 0);
+                            hexdump((uint8_t *)edata + edl - 8, key_macing_length(key), "Actual ", 0);
+#endif
+                            DESFIRE(tag)->last_pcd_error = CRYPTO_ERROR;
+                            *nbytes = -1;
+                            res = NULL;
+                        }
+                    }
                     break;
-                }
+                case AS_NEW:
+                    if (!(communication_settings & CMAC_COMMAND))
+                        break;
+                    if (communication_settings & CMAC_VERIFY) {
+                        if (*nbytes < 9) {
+                            *nbytes = -1;
+                            res = NULL;
+                            break;
+                        }
+                        first_cmac_byte = ((uint8_t *)data)[*nbytes - 9];
+                        ((uint8_t *)data)[*nbytes - 9] = ((uint8_t *)data)[*nbytes - 1];
+                    }
 
-                edl = enciphered_data_length (tag, *nbytes - 1, communication_settings);
-                edata = malloc (edl);
+                    int n = (communication_settings & CMAC_VERIFY) ? 8 : 0;
+                    cmac(key, DESFIRE(tag)->ivect, ((uint8_t *)data), *nbytes - n, DESFIRE(tag)->cmac);
 
-                memcpy (edata, data, *nbytes - 1);
-                memset ((uint8_t *)edata + *nbytes - 1, 0, edl - *nbytes + 1);
-
-                mifare_cypher_blocks_chained (tag, NULL, NULL, edata, edl, MCD_SEND, MCO_ENCYPHER);
-
-                if (0 != memcmp ((uint8_t *)data + *nbytes - 1, (uint8_t *)edata + edl - 8, 4)) {
+                    if (communication_settings & CMAC_VERIFY) {
+                        ((uint8_t *)data)[*nbytes - 9] = first_cmac_byte;
+                        if (0 != memcmp(DESFIRE(tag)->cmac, (uint8_t *)data + *nbytes - 9, 8)) {
 #ifdef WITH_DEBUG
-                    Dbprintf ("MACing not verified");
-                    hexdump ((uint8_t *)data + *nbytes - 1, key_macing_length (key), "Expect ", 0);
-                    hexdump ((uint8_t *)edata + edl - 8, key_macing_length (key), "Actual ", 0);
+                            Dbprintf("CMAC NOT verified :-(");
+                            hexdump((uint8_t *)data + *nbytes - 9, 8, "Expect ", 0);
+                            hexdump(DESFIRE(tag)->cmac, 8, "Actual ", 0);
 #endif
-                    DESFIRE (tag)->last_pcd_error = CRYPTO_ERROR;
-                    *nbytes = -1;
-                    res = NULL;
-                }
+                            DESFIRE(tag)->last_pcd_error = CRYPTO_ERROR;
+                            *nbytes = -1;
+                            res = NULL;
+                        } else {
+                            *nbytes -= 8;
+                        }
+                    }
+                    break;
             }
+
+            free(edata);
+
             break;
-        case AS_NEW:
-            if (!(communication_settings & CMAC_COMMAND))
-                break;
-            if (communication_settings & CMAC_VERIFY) {
-                if (*nbytes < 9) {
-                    *nbytes = -1;
-                    res = NULL;
+        case MDCM_ENCIPHERED:
+            (*nbytes)--;
+            bool verified = false;
+            int crc_pos = 0x00;
+            int end_crc_pos = 0x00;
+            uint8_t x;
+
+            /*
+             * AS_LEGACY:
+             * ,-----------------+-------------------------------+--------+
+             * \     BLOCK n-1   |              BLOCK n          | STATUS |
+             * /  PAYLOAD | CRC0 | CRC1 | 0x80? | 0x000000000000 | 0x9100 |
+             * `-----------------+-------------------------------+--------+
+             *
+             *         <------------ DATA ------------>
+             * FRAME = PAYLOAD + CRC(PAYLOAD) + PADDING
+             *
+             * AS_NEW:
+             * ,-------------------------------+-----------------------------------------------+--------+
+             * \                 BLOCK n-1     |                  BLOCK n                      | STATUS |
+             * /  PAYLOAD | CRC0 | CRC1 | CRC2 | CRC3 | 0x80? | 0x0000000000000000000000000000 | 0x9100 |
+             * `-------------------------------+-----------------------------------------------+--------+
+             * <----------------------------------- DATA ------------------------------------->|
+             *
+             *         <----------------- DATA ---------------->
+             * FRAME = PAYLOAD + CRC(PAYLOAD + STATUS) + PADDING + STATUS
+             *                                    `------------------'
+             */
+
+            mifare_cypher_blocks_chained(tag, NULL, NULL, res, *nbytes, MCD_RECEIVE, MCO_DECYPHER);
+
+            /*
+             * Look for the CRC and ensure it is followed by NULL padding.  We
+             * can't start by the end because the CRC is supposed to be 0 when
+             * verified, and accumulating 0's in it should not change it.
+             */
+            switch (DESFIRE(tag)->authentication_scheme) {
+                case AS_LEGACY:
+                    crc_pos = *nbytes - 8 - 1; // The CRC can be over two blocks
+                    if (crc_pos < 0) {
+                        /* Single block */
+                        crc_pos = 0;
+                    }
+                    break;
+                case AS_NEW:
+                    /* Move status between payload and CRC */
+                    res = DESFIRE(tag)->crypto_buffer;
+                    memcpy(res, data, *nbytes);
+
+                    crc_pos = (*nbytes) - 16 - 3;
+                    if (crc_pos < 0) {
+                        /* Single block */
+                        crc_pos = 0;
+                    }
+                    memcpy((uint8_t *)res + crc_pos + 1, (uint8_t *)res + crc_pos, *nbytes - crc_pos);
+                    ((uint8_t *)res)[crc_pos] = 0x00;
+                    crc_pos++;
+                    *nbytes += 1;
                     break;
-                }
-                first_cmac_byte = ((uint8_t *)data)[*nbytes - 9];
-                ((uint8_t *)data)[*nbytes - 9] = ((uint8_t *)data)[*nbytes-1];
             }
 
-            int n = (communication_settings & CMAC_VERIFY) ? 8 : 0;
-            cmac (key, DESFIRE (tag)->ivect, ((uint8_t *)data), *nbytes - n, DESFIRE (tag)->cmac);
+            do {
+                uint16_t crc16 = 0x00;
+                uint32_t crc;
+                switch (DESFIRE(tag)->authentication_scheme) {
+                    case AS_LEGACY:
+                        AddCrc14A((uint8_t *)res, end_crc_pos);
+                        end_crc_pos = crc_pos + 2;
+                        //
 
-            if (communication_settings & CMAC_VERIFY) {
-                ((uint8_t *)data)[*nbytes - 9] = first_cmac_byte;
-                if (0 != memcmp (DESFIRE (tag)->cmac, (uint8_t *)data + *nbytes - 9, 8)) {
-#ifdef WITH_DEBUG
-                    Dbprintf ("CMAC NOT verified :-(");
-                    hexdump ((uint8_t *)data + *nbytes - 9, 8, "Expect ", 0);
-                    hexdump (DESFIRE (tag)->cmac, 8, "Actual ", 0);
-#endif
-                    DESFIRE (tag)->last_pcd_error = CRYPTO_ERROR;
-                    *nbytes = -1;
-                    res = NULL;
+
+                        crc = crc16;
+                        break;
+                    case AS_NEW:
+                        end_crc_pos = crc_pos + 4;
+                        crc32_ex(res, end_crc_pos, (uint8_t *)&crc);
+                        break;
+                }
+                if (!crc) {
+                    verified = true;
+                    for (int n = end_crc_pos; n < *nbytes - 1; n++) {
+                        uint8_t byte = ((uint8_t *)res)[n];
+                        if (!((0x00 == byte) || ((0x80 == byte) && (n == end_crc_pos))))
+                            verified = false;
+                    }
+                }
+                if (verified) {
+                    *nbytes = crc_pos;
+                    switch (DESFIRE(tag)->authentication_scheme) {
+                        case AS_LEGACY:
+                            ((uint8_t *)data)[(*nbytes)++] = 0x00;
+                            break;
+                        case AS_NEW:
+                            /* The status byte was already before the CRC */
+                            break;
+                    }
                 } else {
-                    *nbytes -= 8;
+                    switch (DESFIRE(tag)->authentication_scheme) {
+                        case AS_LEGACY:
+                            break;
+                        case AS_NEW:
+                            x = ((uint8_t *)res)[crc_pos - 1];
+                            ((uint8_t *)res)[crc_pos - 1] = ((uint8_t *)res)[crc_pos];
+                            ((uint8_t *)res)[crc_pos] = x;
+                            break;
+                    }
+                    crc_pos++;
                 }
-            }
-            break;
-        }
+            } while (!verified && (end_crc_pos < *nbytes));
 
-        free (edata);
-
-        break;
-    case MDCM_ENCIPHERED:
-        (*nbytes)--;
-        bool verified = false;
-        int crc_pos = 0x00;
-        int end_crc_pos = 0x00;
-        uint8_t x;
-
-        /*
-         * AS_LEGACY:
-         * ,-----------------+-------------------------------+--------+
-         * \     BLOCK n-1   |              BLOCK n          | STATUS |
-         * /  PAYLOAD | CRC0 | CRC1 | 0x80? | 0x000000000000 | 0x9100 |
-         * `-----------------+-------------------------------+--------+
-         *
-         *         <------------ DATA ------------>
-         * FRAME = PAYLOAD + CRC(PAYLOAD) + PADDING
-         *
-         * AS_NEW:
-         * ,-------------------------------+-----------------------------------------------+--------+
-         * \                 BLOCK n-1     |                  BLOCK n                      | STATUS |
-         * /  PAYLOAD | CRC0 | CRC1 | CRC2 | CRC3 | 0x80? | 0x0000000000000000000000000000 | 0x9100 |
-         * `-------------------------------+-----------------------------------------------+--------+
-         * <----------------------------------- DATA ------------------------------------->|
-         *
-         *         <----------------- DATA ---------------->
-         * FRAME = PAYLOAD + CRC(PAYLOAD + STATUS) + PADDING + STATUS
-         *                                    `------------------'
-         */
-
-        mifare_cypher_blocks_chained (tag, NULL, NULL, res, *nbytes, MCD_RECEIVE, MCO_DECYPHER);
-
-        /*
-         * Look for the CRC and ensure it is followed by NULL padding.  We
-         * can't start by the end because the CRC is supposed to be 0 when
-         * verified, and accumulating 0's in it should not change it.
-         */
-        switch (DESFIRE (tag)->authentication_scheme) {
-        case AS_LEGACY:
-            crc_pos = *nbytes - 8 - 1; // The CRC can be over two blocks
-            if (crc_pos < 0) {
-                /* Single block */
-                crc_pos = 0;
-            }
-            break;
-        case AS_NEW:
-            /* Move status between payload and CRC */
-            res = DESFIRE (tag)->crypto_buffer;
-            memcpy (res, data, *nbytes);
-
-            crc_pos = (*nbytes) - 16 - 3;
-            if (crc_pos < 0) {
-                /* Single block */
-                crc_pos = 0;
-            }
-            memcpy ((uint8_t *)res + crc_pos + 1, (uint8_t *)res + crc_pos, *nbytes - crc_pos);
-            ((uint8_t *)res)[crc_pos] = 0x00;
-            crc_pos++;
-            *nbytes += 1;
-            break;
-        }
-
-        do {
-            uint16_t crc16 =0x00;
-            uint32_t crc;
-            switch (DESFIRE (tag)->authentication_scheme) {
-            case AS_LEGACY:
-                AddCrc14A( (uint8_t*)res, end_crc_pos);
-                end_crc_pos = crc_pos + 2;
-                //
-
-
-                crc = crc16;
-                break;
-            case AS_NEW:
-                end_crc_pos = crc_pos + 4;
-                crc32_ex (res, end_crc_pos, (uint8_t *)&crc);
-                break;
-            }
-            if (!crc) {
-                verified = true;
-                for (int n = end_crc_pos; n < *nbytes - 1; n++) {
-                    uint8_t byte = ((uint8_t *)res)[n];
-                    if (!( (0x00 == byte) || ((0x80 == byte) && (n == end_crc_pos)) ))
-                        verified = false;
-                }
-            }
-            if (verified) {
-                *nbytes = crc_pos;
-                switch (DESFIRE (tag)->authentication_scheme) {
-                case AS_LEGACY:
-                    ((uint8_t *)data)[(*nbytes)++] = 0x00;
-                    break;
-                case AS_NEW:
-                    /* The status byte was already before the CRC */
-                    break;
-                }
-            } else {
-                switch (DESFIRE (tag)->authentication_scheme) {
-                case AS_LEGACY:
-                    break;
-                case AS_NEW:
-                    x = ((uint8_t *)res)[crc_pos - 1];
-                    ((uint8_t *)res)[crc_pos - 1] = ((uint8_t *)res)[crc_pos];
-                    ((uint8_t *)res)[crc_pos] = x;
-                    break;
-                }
-                crc_pos++;
-            }
-        } while (!verified && (end_crc_pos < *nbytes));
-
-        if (!verified) {
+            if (!verified) {
 #ifdef WITH_DEBUG
-            /* FIXME In some configurations, the file is transmitted PLAIN */
-            Dbprintf("CRC not verified in decyphered stream");
+                /* FIXME In some configurations, the file is transmitted PLAIN */
+                Dbprintf("CRC not verified in decyphered stream");
 #endif
-            DESFIRE (tag)->last_pcd_error = CRYPTO_ERROR;
+                DESFIRE(tag)->last_pcd_error = CRYPTO_ERROR;
+                *nbytes = -1;
+                res = NULL;
+            }
+
+            break;
+        default:
+            Dbprintf("Unknown communication settings");
             *nbytes = -1;
             res = NULL;
-        }
-
-        break;
-    default:
-        Dbprintf("Unknown communication settings");
-        *nbytes = -1;
-        res = NULL;
-        break;
+            break;
 
     }
     return res;
 }
 
 
-void mifare_cypher_single_block (desfirekey_t key, uint8_t *data, uint8_t *ivect, MifareCryptoDirection direction, MifareCryptoOperation operation, size_t block_size)
+void mifare_cypher_single_block(desfirekey_t key, uint8_t *data, uint8_t *ivect, MifareCryptoDirection direction, MifareCryptoOperation operation, size_t block_size)
 {
     uint8_t ovect[MAX_CRYPTO_BLOCK_SIZE];
 
     if (direction == MCD_SEND) {
-        xor (ivect, data, block_size);
+        xor(ivect, data, block_size);
     } else {
-        memcpy (ovect, data, block_size);
+        memcpy(ovect, data, block_size);
     }
 
     uint8_t edata[MAX_CRYPTO_BLOCK_SIZE];
 
     switch (key->type) {
-    case T_DES:
-        switch (operation) {
-        case MCO_ENCYPHER:
-            //DES_ecb_encrypt ((DES_cblock *) data, (DES_cblock *) edata, &(key->ks1), DES_ENCRYPT);
-            des_enc(edata, data, key->data);
-            break;
-        case MCO_DECYPHER:
-            //DES_ecb_encrypt ((DES_cblock *) data, (DES_cblock *) edata, &(key->ks1), DES_DECRYPT);
-            des_dec(edata, data, key->data);
-            break;
-        }
-        break;
-    case T_3DES:
-        switch (operation) {
-        case MCO_ENCYPHER:
-            // DES_ecb_encrypt ((DES_cblock *) data,  (DES_cblock *) edata, &(key->ks1), DES_ENCRYPT);
-            // DES_ecb_encrypt ((DES_cblock *) edata, (DES_cblock *) data,  &(key->ks2), DES_DECRYPT);
-            // DES_ecb_encrypt ((DES_cblock *) data,  (DES_cblock *) edata, &(key->ks1), DES_ENCRYPT);
-            tdes_enc(edata,data, key->data);
-            break;
-        case MCO_DECYPHER:
-            // DES_ecb_encrypt ((DES_cblock *) data,  (DES_cblock *) edata, &(key->ks1), DES_DECRYPT);
-            // DES_ecb_encrypt ((DES_cblock *) edata, (DES_cblock *) data,  &(key->ks2), DES_ENCRYPT);
-            // DES_ecb_encrypt ((DES_cblock *) data,  (DES_cblock *) edata, &(key->ks1), DES_DECRYPT);
-            tdes_dec(data, edata, key->data);
-            break;
-        }
-        break;
-    case T_3K3DES:
-        switch (operation) {
-        case MCO_ENCYPHER:
-            tdes_enc(edata,data, key->data);
-            // DES_ecb_encrypt ((DES_cblock *) data,  (DES_cblock *) edata, &(key->ks1), DES_ENCRYPT);
-            // DES_ecb_encrypt ((DES_cblock *) edata, (DES_cblock *) data,  &(key->ks2), DES_DECRYPT);
-            // DES_ecb_encrypt ((DES_cblock *) data,  (DES_cblock *) edata, &(key->ks3), DES_ENCRYPT);
-            break;
-        case MCO_DECYPHER:
-            tdes_dec(data, edata, key->data);
-            // DES_ecb_encrypt ((DES_cblock *) data,  (DES_cblock *) edata, &(key->ks3), DES_DECRYPT);
-            // DES_ecb_encrypt ((DES_cblock *) edata, (DES_cblock *) data,  &(key->ks2), DES_ENCRYPT);
-            // DES_ecb_encrypt ((DES_cblock *) data,  (DES_cblock *) edata, &(key->ks1), DES_DECRYPT);
-            break;
-        }
-        break;
-    case T_AES:
-        switch (operation)
-        {
-            case MCO_ENCYPHER:
-            {
-                AesCtx ctx;
-                AesCtxIni(&ctx, ivect, key->data, KEY128,CBC);
-                AesEncrypt(&ctx, data, edata, sizeof(edata) );
-                break;
+        case T_DES:
+            switch (operation) {
+                case MCO_ENCYPHER:
+                    //DES_ecb_encrypt ((DES_cblock *) data, (DES_cblock *) edata, &(key->ks1), DES_ENCRYPT);
+                    des_enc(edata, data, key->data);
+                    break;
+                case MCO_DECYPHER:
+                    //DES_ecb_encrypt ((DES_cblock *) data, (DES_cblock *) edata, &(key->ks1), DES_DECRYPT);
+                    des_dec(edata, data, key->data);
+                    break;
             }
-            case MCO_DECYPHER:
-            {
-                AesCtx ctx;
-                AesCtxIni(&ctx, ivect, key->data, KEY128,CBC);
-                AesDecrypt(&ctx, edata, data, sizeof(edata));
-                break;
+            break;
+        case T_3DES:
+            switch (operation) {
+                case MCO_ENCYPHER:
+                    // DES_ecb_encrypt ((DES_cblock *) data,  (DES_cblock *) edata, &(key->ks1), DES_ENCRYPT);
+                    // DES_ecb_encrypt ((DES_cblock *) edata, (DES_cblock *) data,  &(key->ks2), DES_DECRYPT);
+                    // DES_ecb_encrypt ((DES_cblock *) data,  (DES_cblock *) edata, &(key->ks1), DES_ENCRYPT);
+                    tdes_enc(edata, data, key->data);
+                    break;
+                case MCO_DECYPHER:
+                    // DES_ecb_encrypt ((DES_cblock *) data,  (DES_cblock *) edata, &(key->ks1), DES_DECRYPT);
+                    // DES_ecb_encrypt ((DES_cblock *) edata, (DES_cblock *) data,  &(key->ks2), DES_ENCRYPT);
+                    // DES_ecb_encrypt ((DES_cblock *) data,  (DES_cblock *) edata, &(key->ks1), DES_DECRYPT);
+                    tdes_dec(data, edata, key->data);
+                    break;
             }
-        }
-        break;
+            break;
+        case T_3K3DES:
+            switch (operation) {
+                case MCO_ENCYPHER:
+                    tdes_enc(edata, data, key->data);
+                    // DES_ecb_encrypt ((DES_cblock *) data,  (DES_cblock *) edata, &(key->ks1), DES_ENCRYPT);
+                    // DES_ecb_encrypt ((DES_cblock *) edata, (DES_cblock *) data,  &(key->ks2), DES_DECRYPT);
+                    // DES_ecb_encrypt ((DES_cblock *) data,  (DES_cblock *) edata, &(key->ks3), DES_ENCRYPT);
+                    break;
+                case MCO_DECYPHER:
+                    tdes_dec(data, edata, key->data);
+                    // DES_ecb_encrypt ((DES_cblock *) data,  (DES_cblock *) edata, &(key->ks3), DES_DECRYPT);
+                    // DES_ecb_encrypt ((DES_cblock *) edata, (DES_cblock *) data,  &(key->ks2), DES_ENCRYPT);
+                    // DES_ecb_encrypt ((DES_cblock *) data,  (DES_cblock *) edata, &(key->ks1), DES_DECRYPT);
+                    break;
+            }
+            break;
+        case T_AES:
+            switch (operation) {
+                case MCO_ENCYPHER: {
+                    AesCtx ctx;
+                    AesCtxIni(&ctx, ivect, key->data, KEY128, CBC);
+                    AesEncrypt(&ctx, data, edata, sizeof(edata));
+                    break;
+                }
+                case MCO_DECYPHER: {
+                    AesCtx ctx;
+                    AesCtxIni(&ctx, ivect, key->data, KEY128, CBC);
+                    AesDecrypt(&ctx, edata, data, sizeof(edata));
+                    break;
+                }
+            }
+            break;
     }
 
-    memcpy (data, edata, block_size);
+    memcpy(data, edata, block_size);
 
     if (direction == MCD_SEND) {
-        memcpy (ivect, data, block_size);
+        memcpy(ivect, data, block_size);
     } else {
-        xor (ivect, data, block_size);
-        memcpy (ivect, ovect, block_size);
+        xor(ivect, data, block_size);
+        memcpy(ivect, ovect, block_size);
     }
 }
 
@@ -610,29 +616,30 @@ void mifare_cypher_single_block (desfirekey_t key, uint8_t *data, uint8_t *ivect
  * Because the tag may contain additional data, one may need to call this
  * function with tag, key and ivect defined.
  */
-void mifare_cypher_blocks_chained (desfiretag_t tag, desfirekey_t key, uint8_t *ivect, uint8_t *data, size_t data_size, MifareCryptoDirection direction, MifareCryptoOperation operation) {
+void mifare_cypher_blocks_chained(desfiretag_t tag, desfirekey_t key, uint8_t *ivect, uint8_t *data, size_t data_size, MifareCryptoDirection direction, MifareCryptoOperation operation)
+{
     size_t block_size;
 
     if (tag) {
         if (!key)
-            key = DESFIRE (tag)->session_key;
+            key = DESFIRE(tag)->session_key;
         if (!ivect)
-            ivect = DESFIRE (tag)->ivect;
+            ivect = DESFIRE(tag)->ivect;
 
-        switch (DESFIRE (tag)->authentication_scheme) {
+        switch (DESFIRE(tag)->authentication_scheme) {
             case AS_LEGACY:
-                memset (ivect, 0, MAX_CRYPTO_BLOCK_SIZE);
+                memset(ivect, 0, MAX_CRYPTO_BLOCK_SIZE);
                 break;
             case AS_NEW:
                 break;
         }
     }
 
-    block_size = key_block_size (key);
+    block_size = key_block_size(key);
 
     size_t offset = 0;
     while (offset < data_size) {
-        mifare_cypher_single_block (key, data + offset, ivect, direction, operation, block_size);
+        mifare_cypher_single_block(key, data + offset, ivect, direction, operation, block_size);
         offset += block_size;
     }
 }
\ No newline at end of file
diff --git a/armsrc/desfire_key.c b/armsrc/desfire_key.c
index f8ea8c794..1123225bb 100644
--- a/armsrc/desfire_key.c
+++ b/armsrc/desfire_key.c
@@ -19,82 +19,92 @@
 
 #include "desfire_key.h"
 
-static inline void update_key_schedules (desfirekey_t key);
+static inline void update_key_schedules(desfirekey_t key);
 
-static inline void update_key_schedules (desfirekey_t key) {
+static inline void update_key_schedules(desfirekey_t key)
+{
     // DES_set_key ((DES_cblock *)key->data, &(key->ks1));
     // DES_set_key ((DES_cblock *)(key->data + 8), &(key->ks2));
     // if (T_3K3DES == key->type) {
-        // DES_set_key ((DES_cblock *)(key->data + 16), &(key->ks3));
+    // DES_set_key ((DES_cblock *)(key->data + 16), &(key->ks3));
     // }
 }
 
-void Desfire_des_key_new (const uint8_t value[8], desfirekey_t key) {
+void Desfire_des_key_new(const uint8_t value[8], desfirekey_t key)
+{
     uint8_t data[8];
-    memcpy (data, value, 8);
-    for (int n=0; n < 8; n++)
+    memcpy(data, value, 8);
+    for (int n = 0; n < 8; n++)
         data[n] &= 0xfe;
-    Desfire_des_key_new_with_version (data, key);
+    Desfire_des_key_new_with_version(data, key);
 }
 
-void Desfire_des_key_new_with_version (const uint8_t value[8], desfirekey_t key) {
-    if ( key != NULL) {
+void Desfire_des_key_new_with_version(const uint8_t value[8], desfirekey_t key)
+{
+    if (key != NULL) {
         key->type = T_DES;
-        memcpy (key->data, value, 8);
-        memcpy (key->data+8, value, 8);
-        update_key_schedules (key);
+        memcpy(key->data, value, 8);
+        memcpy(key->data + 8, value, 8);
+        update_key_schedules(key);
     }
 }
 
-void Desfire_3des_key_new (const uint8_t value[16], desfirekey_t key) {
+void Desfire_3des_key_new(const uint8_t value[16], desfirekey_t key)
+{
     uint8_t data[16];
-    memcpy (data, value, 16);
-    for (int n=0; n < 8; n++)
+    memcpy(data, value, 16);
+    for (int n = 0; n < 8; n++)
         data[n] &= 0xfe;
-    for (int n=8; n < 16; n++)
+    for (int n = 8; n < 16; n++)
         data[n] |= 0x01;
-    Desfire_3des_key_new_with_version (data, key);
+    Desfire_3des_key_new_with_version(data, key);
 }
 
-void Desfire_3des_key_new_with_version (const uint8_t value[16], desfirekey_t key) {
-    if ( key != NULL ){
+void Desfire_3des_key_new_with_version(const uint8_t value[16], desfirekey_t key)
+{
+    if (key != NULL) {
         key->type = T_3DES;
-        memcpy (key->data, value, 16);
-        memcpy (key->data + 16, value, 8);
-        update_key_schedules (key);
+        memcpy(key->data, value, 16);
+        memcpy(key->data + 16, value, 8);
+        update_key_schedules(key);
     }
 }
 
-void Desfire_3k3des_key_new (const uint8_t value[24], desfirekey_t key) {
+void Desfire_3k3des_key_new(const uint8_t value[24], desfirekey_t key)
+{
     uint8_t data[24];
-    memcpy (data, value, 24);
-    for (int n=0; n < 8; n++)
+    memcpy(data, value, 24);
+    for (int n = 0; n < 8; n++)
         data[n] &= 0xfe;
-    Desfire_3k3des_key_new_with_version (data, key);
+    Desfire_3k3des_key_new_with_version(data, key);
 }
 
-void Desfire_3k3des_key_new_with_version (const uint8_t value[24], desfirekey_t key) {
-    if ( key != NULL){
+void Desfire_3k3des_key_new_with_version(const uint8_t value[24], desfirekey_t key)
+{
+    if (key != NULL) {
         key->type = T_3K3DES;
-        memcpy (key->data, value, 24);
-        update_key_schedules (key);
+        memcpy(key->data, value, 24);
+        update_key_schedules(key);
     }
 }
 
- void Desfire_aes_key_new (const uint8_t value[16], desfirekey_t key) {
-    Desfire_aes_key_new_with_version (value, 0, key);
+void Desfire_aes_key_new(const uint8_t value[16], desfirekey_t key)
+{
+    Desfire_aes_key_new_with_version(value, 0, key);
 }
 
- void Desfire_aes_key_new_with_version (const uint8_t value[16], uint8_t version, desfirekey_t key) {
+void Desfire_aes_key_new_with_version(const uint8_t value[16], uint8_t version, desfirekey_t key)
+{
 
     if (key != NULL) {
-        memcpy (key->data, value, 16);
+        memcpy(key->data, value, 16);
         key->type = T_AES;
         key->aes_version = version;
     }
 }
 
-uint8_t Desfire_key_get_version (desfirekey_t key) {
+uint8_t Desfire_key_get_version(desfirekey_t key)
+{
     uint8_t version = 0;
 
     for (int n = 0; n < 8; n++) {
@@ -103,54 +113,55 @@ uint8_t Desfire_key_get_version (desfirekey_t key) {
     return version;
 }
 
-void Desfire_key_set_version (desfirekey_t key, uint8_t version)
+void Desfire_key_set_version(desfirekey_t key, uint8_t version)
 {
     for (int n = 0; n < 8; n++) {
-        uint8_t version_bit = ((version & (1 << (7-n))) >> (7-n));
+        uint8_t version_bit = ((version & (1 << (7 - n))) >> (7 - n));
         key->data[n] &= 0xfe;
         key->data[n] |= version_bit;
         if (key->type == T_DES) {
-            key->data[n+8] = key->data[n];
+            key->data[n + 8] = key->data[n];
         } else {
             // Write ~version to avoid turning a 3DES key into a DES key
-            key->data[n+8] &= 0xfe;
-            key->data[n+8] |= ~version_bit;
+            key->data[n + 8] &= 0xfe;
+            key->data[n + 8] |= ~version_bit;
         }
     }
 }
 
-void Desfire_session_key_new (const uint8_t rnda[], const uint8_t rndb[], desfirekey_t authkey, desfirekey_t key) {
+void Desfire_session_key_new(const uint8_t rnda[], const uint8_t rndb[], desfirekey_t authkey, desfirekey_t key)
+{
 
     uint8_t buffer[24];
 
     switch (authkey->type) {
-    case T_DES:
-        memcpy (buffer, rnda, 4);
-        memcpy (buffer+4, rndb, 4);
-        Desfire_des_key_new_with_version (buffer, key);
-        break;
-    case T_3DES:
-        memcpy (buffer, rnda, 4);
-        memcpy (buffer+4, rndb, 4);
-        memcpy (buffer+8, rnda+4, 4);
-        memcpy (buffer+12, rndb+4, 4);
-        Desfire_3des_key_new_with_version (buffer, key);
-        break;
-    case T_3K3DES:
-        memcpy (buffer, rnda, 4);
-        memcpy (buffer+4, rndb, 4);
-        memcpy (buffer+8, rnda+6, 4);
-        memcpy (buffer+12, rndb+6, 4);
-        memcpy (buffer+16, rnda+12, 4);
-        memcpy (buffer+20, rndb+12, 4);
-        Desfire_3k3des_key_new (buffer, key);
-        break;
-    case T_AES:
-        memcpy (buffer, rnda, 4);
-        memcpy (buffer+4, rndb, 4);
-        memcpy (buffer+8, rnda+12, 4);
-        memcpy (buffer+12, rndb+12, 4);
-        Desfire_aes_key_new (buffer, key);
-        break;
+        case T_DES:
+            memcpy(buffer, rnda, 4);
+            memcpy(buffer + 4, rndb, 4);
+            Desfire_des_key_new_with_version(buffer, key);
+            break;
+        case T_3DES:
+            memcpy(buffer, rnda, 4);
+            memcpy(buffer + 4, rndb, 4);
+            memcpy(buffer + 8, rnda + 4, 4);
+            memcpy(buffer + 12, rndb + 4, 4);
+            Desfire_3des_key_new_with_version(buffer, key);
+            break;
+        case T_3K3DES:
+            memcpy(buffer, rnda, 4);
+            memcpy(buffer + 4, rndb, 4);
+            memcpy(buffer + 8, rnda + 6, 4);
+            memcpy(buffer + 12, rndb + 6, 4);
+            memcpy(buffer + 16, rnda + 12, 4);
+            memcpy(buffer + 20, rndb + 12, 4);
+            Desfire_3k3des_key_new(buffer, key);
+            break;
+        case T_AES:
+            memcpy(buffer, rnda, 4);
+            memcpy(buffer + 4, rndb, 4);
+            memcpy(buffer + 8, rnda + 12, 4);
+            memcpy(buffer + 12, rndb + 12, 4);
+            Desfire_aes_key_new(buffer, key);
+            break;
     }
 }
\ No newline at end of file
diff --git a/armsrc/desfire_key.h b/armsrc/desfire_key.h
index cb0e8b250..adbda9c42 100644
--- a/armsrc/desfire_key.h
+++ b/armsrc/desfire_key.h
@@ -6,15 +6,15 @@
 #include "iso14443a.h"
 #include "desfire.h"
 //#include "mifare.h" // iso14a_card_select_t struct
-void Desfire_des_key_new (const uint8_t value[8], desfirekey_t key);
-void Desfire_3des_key_new (const uint8_t value[16], desfirekey_t key);
-void Desfire_des_key_new_with_version (const uint8_t value[8], desfirekey_t key);
-void Desfire_3des_key_new_with_version (const uint8_t value[16], desfirekey_t key);
-void Desfire_3k3des_key_new (const uint8_t value[24], desfirekey_t key);
-void Desfire_3k3des_key_new_with_version (const uint8_t value[24], desfirekey_t key);
-void Desfire_aes_key_new (const uint8_t value[16], desfirekey_t key);
-void Desfire_aes_key_new_with_version (const uint8_t value[16], uint8_t version,desfirekey_t key);
-uint8_t Desfire_key_get_version (desfirekey_t key);
-void Desfire_key_set_version (desfirekey_t key, uint8_t version);
-void Desfire_session_key_new (const uint8_t rnda[], const uint8_t rndb[], desfirekey_t authkey, desfirekey_t key);
+void Desfire_des_key_new(const uint8_t value[8], desfirekey_t key);
+void Desfire_3des_key_new(const uint8_t value[16], desfirekey_t key);
+void Desfire_des_key_new_with_version(const uint8_t value[8], desfirekey_t key);
+void Desfire_3des_key_new_with_version(const uint8_t value[16], desfirekey_t key);
+void Desfire_3k3des_key_new(const uint8_t value[24], desfirekey_t key);
+void Desfire_3k3des_key_new_with_version(const uint8_t value[24], desfirekey_t key);
+void Desfire_aes_key_new(const uint8_t value[16], desfirekey_t key);
+void Desfire_aes_key_new_with_version(const uint8_t value[16], uint8_t version, desfirekey_t key);
+uint8_t Desfire_key_get_version(desfirekey_t key);
+void Desfire_key_set_version(desfirekey_t key, uint8_t version);
+void Desfire_session_key_new(const uint8_t rnda[], const uint8_t rndb[], desfirekey_t authkey, desfirekey_t key);
 #endif
\ No newline at end of file
diff --git a/armsrc/epa.c b/armsrc/epa.c
index 63a57d46b..0f09980ee 100644
--- a/armsrc/epa.c
+++ b/armsrc/epa.c
@@ -105,8 +105,7 @@ static char iso_type = 0;
 //-----------------------------------------------------------------------------
 int EPA_APDU(uint8_t *apdu, size_t length, uint8_t *response)
 {
-    switch(iso_type)
-    {
+    switch (iso_type) {
         case 'a':
             return iso14_apdu(apdu, (uint16_t) length, false, response, NULL);
             break;
@@ -156,7 +155,7 @@ size_t EPA_Parse_CardAccess(uint8_t *data,
             index += 2;
             // check for extended length
             if ((data[index - 1] & 0x80) != 0) {
-                index += (data[index-1] & 0x7F);
+                index += (data[index - 1] & 0x7F);
             }
         }
         // OID
@@ -166,8 +165,7 @@ size_t EPA_Parse_CardAccess(uint8_t *data,
                 && memcmp(data + index + 2,
                           oid_pace_start,
                           sizeof(oid_pace_start)) == 0 // content matches
-                && pace_info != NULL)
-            {
+                && pace_info != NULL) {
                 // first, clear the pace_info struct
                 memset(pace_info, 0, sizeof(pace_version_info_t));
                 memcpy(pace_info->oid, data + index + 2, sizeof(pace_info->oid));
@@ -176,8 +174,7 @@ size_t EPA_Parse_CardAccess(uint8_t *data,
                 if (data[index] == 02 && data[index + 1] == 01) {
                     pace_info->version = data[index + 2];
                     index += 3;
-                }
-                else {
+                } else {
                     return index;
                 }
                 // after that there might(!) be the parameter ID
@@ -185,8 +182,7 @@ size_t EPA_Parse_CardAccess(uint8_t *data,
                     pace_info->parameter_id = data[index + 2];
                     index += 3;
                 }
-            }
-            else {
+            } else {
                 // skip this OID
                 index += 2 + data[index + 1];
             }
@@ -195,8 +191,7 @@ size_t EPA_Parse_CardAccess(uint8_t *data,
         // TODO: This needs to be extended to support long tags
         else if (data[index + 1] == 0) {
             return index;
-        }
-        else {
+        } else {
             // skip this part
             // TODO: This needs to be extended to support long tags
             // TODO: This needs to be extended to support unknown elements with
@@ -225,24 +220,22 @@ int EPA_Read_CardAccess(uint8_t *buffer, size_t max_length)
 
     // select the file EF.CardAccess
     rapdu_length = EPA_APDU((uint8_t *)apdu_select_binary_cardaccess,
-                              sizeof(apdu_select_binary_cardaccess),
-                              response_apdu);
+                            sizeof(apdu_select_binary_cardaccess),
+                            response_apdu);
     if (rapdu_length < 6
         || response_apdu[rapdu_length - 4] != 0x90
-        || response_apdu[rapdu_length - 3] != 0x00)
-    {
+        || response_apdu[rapdu_length - 3] != 0x00) {
         DbpString("Failed to select EF.CardAccess!");
         return -1;
     }
 
     // read the file
     rapdu_length = EPA_APDU((uint8_t *)apdu_read_binary,
-                              sizeof(apdu_read_binary),
-                              response_apdu);
+                            sizeof(apdu_read_binary),
+                            response_apdu);
     if (rapdu_length <= 6
         || response_apdu[rapdu_length - 4] != 0x90
-        || response_apdu[rapdu_length - 3] != 0x00)
-    {
+        || response_apdu[rapdu_length - 3] != 0x00) {
         Dbprintf("Failed to read EF.CardAccess!");
         return -1;
     }
@@ -251,7 +244,7 @@ int EPA_Read_CardAccess(uint8_t *buffer, size_t max_length)
     // length of data available: apdu_length - 4 (ISO frame) - 2 (SW)
     size_t to_copy = rapdu_length - 6;
     to_copy = to_copy < max_length ? to_copy : max_length;
-    memcpy(buffer, response_apdu+2, to_copy);
+    memcpy(buffer, response_apdu + 2, to_copy);
     return to_copy;
 }
 
@@ -265,7 +258,7 @@ static void EPA_PACE_Collect_Nonce_Abort(uint8_t step, int func_return)
     EPA_Finish();
 
     // send the USB packet
-    cmd_send(CMD_ACK,step,func_return,0,0,0);
+    cmd_send(CMD_ACK, step, func_return, 0, 0, 0);
 }
 
 //-----------------------------------------------------------------------------
@@ -324,8 +317,7 @@ void EPA_PACE_Collect_Nonce(UsbCommand *c)
     uint8_t requested_size = (uint8_t)c->arg[0];
     func_return = EPA_PACE_Get_Nonce(requested_size, nonce);
     // check if the command succeeded
-    if (func_return < 0)
-    {
+    if (func_return < 0) {
         EPA_PACE_Collect_Nonce_Abort(4, func_return);
         return;
     }
@@ -334,7 +326,7 @@ void EPA_PACE_Collect_Nonce(UsbCommand *c)
     EPA_Finish();
 
     // save received information
-    cmd_send(CMD_ACK,0,func_return,0,nonce,func_return);
+    cmd_send(CMD_ACK, 0, func_return, 0, nonce, func_return);
 }
 
 //-----------------------------------------------------------------------------
@@ -359,26 +351,23 @@ int EPA_PACE_Get_Nonce(uint8_t requested_length, uint8_t *nonce)
     // send it
     uint8_t response_apdu[262];
     int send_return = EPA_APDU(apdu,
-                                 sizeof(apdu),
-                                 response_apdu);
+                               sizeof(apdu),
+                               response_apdu);
     // check if the command succeeded
     if (send_return < 6
         || response_apdu[send_return - 4] != 0x90
-        || response_apdu[send_return - 3] != 0x00)
-    {
+        || response_apdu[send_return - 3] != 0x00) {
         return -1;
     }
 
     // if there is no nonce in the RAPDU, return here
-    if (send_return < 10)
-    {
+    if (send_return < 10) {
         // no error
         return 0;
     }
     // get the actual length of the nonce
     uint8_t nonce_length = response_apdu[5];
-    if (nonce_length > send_return - 10)
-    {
+    if (nonce_length > send_return - 10) {
         nonce_length = send_return - 10;
     }
     // copy the nonce
@@ -430,13 +419,12 @@ int EPA_PACE_MSE_Set_AT(pace_version_info_t pace_version_info, uint8_t password)
     // send it
     uint8_t response_apdu[6];
     int send_return = EPA_APDU(apdu,
-                                 apdu_length,
-                                 response_apdu);
+                               apdu_length,
+                               response_apdu);
     // check if the command succeeded
     if (send_return != 6
         || response_apdu[send_return - 4] != 0x90
-        || response_apdu[send_return - 3] != 0x00)
-    {
+        || response_apdu[send_return - 3] != 0x00) {
         return 1;
     }
     return 0;
@@ -452,8 +440,7 @@ void EPA_PACE_Replay(UsbCommand *c)
     // if an APDU has been passed, save it
     if (c->arg[0] != 0) {
         // make sure it's not too big
-        if(c->arg[2] > apdus_replay[c->arg[0] - 1].len)
-        {
+        if (c->arg[2] > apdus_replay[c->arg[0] - 1].len) {
             cmd_send(CMD_ACK, 1, 0, 0, NULL, 0);
         }
         memcpy(apdus_replay[c->arg[0] - 1].data + c->arg[1],
@@ -490,22 +477,21 @@ void EPA_PACE_Replay(UsbCommand *c)
     for (int i = 0; i < sizeof(apdu_lengths_replay); i++) {
         StartCountUS();
         func_return = EPA_APDU(apdus_replay[i].data,
-                                 apdu_lengths_replay[i],
-                                 response_apdu);
+                               apdu_lengths_replay[i],
+                               response_apdu);
         timings[i] = GetCountUS();
         // every step but the last one should succeed
         if (i < sizeof(apdu_lengths_replay) - 1
             && (func_return < 6
                 || response_apdu[func_return - 4] != 0x90
-                || response_apdu[func_return - 3] != 0x00))
-        {
+                || response_apdu[func_return - 3] != 0x00)) {
             EPA_Finish();
             cmd_send(CMD_ACK, 3 + i, func_return, 0, timings, 20);
             return;
         }
     }
     EPA_Finish();
-    cmd_send(CMD_ACK,0,0,0,timings,20);
+    cmd_send(CMD_ACK, 0, 0, 0, timings, 20);
     return;
 }
 
@@ -543,7 +529,7 @@ int EPA_Setup()
     // power up the field
     iso14443b_setup();
     // select the card
-    return_code = iso14443b_select_card( &card_b_info );
+    return_code = iso14443b_select_card(&card_b_info);
     if (return_code == 0) {
         Dbprintf("ISO 14443 Type B");
         iso_type = 'b';
diff --git a/armsrc/felica.c b/armsrc/felica.c
index 07aa763c9..1d3ef781e 100644
--- a/armsrc/felica.c
+++ b/armsrc/felica.c
@@ -31,23 +31,25 @@ static uint32_t felica_lasttime_prox2air_start;
 
 static void iso18092_setup(uint8_t fpga_minor_mode);
 static uint8_t felica_select_card(felica_card_select_t *card);
-static void TransmitFor18092_AsReader(uint8_t * frame, int len, uint32_t *timing, uint8_t power, uint8_t highspeed);
+static void TransmitFor18092_AsReader(uint8_t *frame, int len, uint32_t *timing, uint8_t power, uint8_t highspeed);
 bool WaitForFelicaReply(uint16_t maxbytes);
 
-void iso18092_set_timeout(uint32_t timeout) {
-    felica_timeout = timeout + (DELAY_AIR2ARM_AS_READER + DELAY_ARM2AIR_AS_READER)/(16*8) + 2;
+void iso18092_set_timeout(uint32_t timeout)
+{
+    felica_timeout = timeout + (DELAY_AIR2ARM_AS_READER + DELAY_ARM2AIR_AS_READER) / (16 * 8) + 2;
 }
 
-uint32_t iso18092_get_timeout(void) {
-    return felica_timeout - (DELAY_AIR2ARM_AS_READER + DELAY_ARM2AIR_AS_READER)/(16*8) - 2;
+uint32_t iso18092_get_timeout(void)
+{
+    return felica_timeout - (DELAY_AIR2ARM_AS_READER + DELAY_ARM2AIR_AS_READER) / (16 * 8) - 2;
 }
 
 #ifndef FELICA_MAX_FRAME_SIZE
- #define FELICA_MAX_FRAME_SIZE 260
+#define FELICA_MAX_FRAME_SIZE 260
 #endif
 
 //structure to hold outgoing NFC frame
-static uint8_t frameSpace[FELICA_MAX_FRAME_SIZE+4];
+static uint8_t frameSpace[FELICA_MAX_FRAME_SIZE + 4];
 
 //structure to hold incoming NFC frame, used for ISO/IEC 18092-compatible frames
 static struct {
@@ -67,8 +69,8 @@ static struct {
     uint16_t  len;
     uint8_t   byte_offset;
     uint8_t   *framebytes;
- //should be enough. maxlen is 255, 254 for data, 2 for sync, 2 for crc
- // 0,1 -> SYNC, 2 - len,  3-(len+1)->data, then crc
+//should be enough. maxlen is 255, 254 for data, 2 for sync, 2 for crc
+// 0,1 -> SYNC, 2 - len,  3-(len+1)->data, then crc
 } FelicaFrame;
 
 //b2 4d is SYNC, 45645 in 16-bit notation, 10110010 01001101 binary. Frame will not start filling until this is shifted in
@@ -77,33 +79,37 @@ static struct {
 # define SYNC_16BIT 0xB24D
 #endif
 
-static void FelicaFrameReset() {
+static void FelicaFrameReset()
+{
     FelicaFrame.state = STATE_UNSYNCD;
     FelicaFrame.posCnt = 0;
     FelicaFrame.crc_ok = false;
     FelicaFrame.byte_offset = 0;
 }
-static void FelicaFrameinit(uint8_t *data) {
+static void FelicaFrameinit(uint8_t *data)
+{
     FelicaFrame.framebytes = data;
     FelicaFrameReset();
 }
 
 //shift byte into frame, reversing it at the same time
-static void shiftInByte(uint8_t bt) {
+static void shiftInByte(uint8_t bt)
+{
     uint8_t j;
-    for(j=0; j < FelicaFrame.byte_offset; j++) {
-        FelicaFrame.framebytes[FelicaFrame.posCnt] = ( FelicaFrame.framebytes[FelicaFrame.posCnt]<<1 ) + (bt & 1);
+    for (j = 0; j < FelicaFrame.byte_offset; j++) {
+        FelicaFrame.framebytes[FelicaFrame.posCnt] = (FelicaFrame.framebytes[FelicaFrame.posCnt] << 1) + (bt & 1);
         bt >>= 1;
     }
     FelicaFrame.posCnt++;
     FelicaFrame.rem_len--;
-    for(j = FelicaFrame.byte_offset; j<8; j++) {
-        FelicaFrame.framebytes[FelicaFrame.posCnt] = (FelicaFrame.framebytes[FelicaFrame.posCnt]<<1 ) + (bt & 1);
+    for (j = FelicaFrame.byte_offset; j < 8; j++) {
+        FelicaFrame.framebytes[FelicaFrame.posCnt] = (FelicaFrame.framebytes[FelicaFrame.posCnt] << 1) + (bt & 1);
         bt >>= 1;
     }
 }
 
-static void Process18092Byte(uint8_t bt) {
+static void Process18092Byte(uint8_t bt)
+{
     switch (FelicaFrame.state) {
         case STATE_UNSYNCD: {
             //almost any nonzero byte can be start of SYNC. SYNC should be preceded by zeros, but that is not alsways the case
@@ -119,7 +125,7 @@ static void Process18092Byte(uint8_t bt) {
                 FelicaFrame.shiftReg = bt;
                 FelicaFrame.state = STATE_UNSYNCD;
             } else {
-                for (uint8_t i=0; i<8; i++) {
+                for (uint8_t i = 0; i < 8; i++) {
 
                     if (FelicaFrame.shiftReg == SYNC_16BIT) {
                         //SYNC done!
@@ -128,13 +134,13 @@ static void Process18092Byte(uint8_t bt) {
                         FelicaFrame.framebytes[1] = 0x4d;
                         FelicaFrame.byte_offset = i;
                         //shift in remaining byte, slowly...
-                        for(uint8_t j=i; j<8; j++) {
+                        for (uint8_t j = i; j < 8; j++) {
                             FelicaFrame.framebytes[2] = (FelicaFrame.framebytes[2] << 1) + (bt & 1);
                             bt >>= 1;
                         }
 
                         FelicaFrame.posCnt = 2;
-                        if (i==0)
+                        if (i == 0)
                             break;
                     }
                     FelicaFrame.shiftReg = (FelicaFrame.shiftReg << 1) + (bt & 1);
@@ -171,12 +177,12 @@ static void Process18092Byte(uint8_t bt) {
         case STATE_GET_CRC: {
             shiftInByte(bt);
 
-            if ( FelicaFrame.rem_len <= 0 ) {
+            if (FelicaFrame.rem_len <= 0) {
                 // skip sync 2bytes. IF ok, residue should be 0x0000
-                FelicaFrame.crc_ok = check_crc(CRC_FELICA, FelicaFrame.framebytes+2, FelicaFrame.len-2);
+                FelicaFrame.crc_ok = check_crc(CRC_FELICA, FelicaFrame.framebytes + 2, FelicaFrame.len - 2);
                 FelicaFrame.state = STATE_FULL;
                 FelicaFrame.rem_len = 0;
-                if (MF_DBGLEVEL > 3) Dbprintf("[+] got 2 crc bytes [%s]", (FelicaFrame.crc_ok) ? "OK" : "No" );
+                if (MF_DBGLEVEL > 3) Dbprintf("[+] got 2 crc bytes [%s]", (FelicaFrame.crc_ok) ? "OK" : "No");
             }
             break;
         }
@@ -190,7 +196,8 @@ static void Process18092Byte(uint8_t bt) {
  * Currently does NOT do any collision handling.
  * It expects 0-1 cards in the device's range.
  */
-static uint8_t felica_select_card(felica_card_select_t *card) {
+static uint8_t felica_select_card(felica_card_select_t *card)
+{
 
     // POLL command
     // 0xB2 0x4B = sync code
@@ -205,7 +212,7 @@ static uint8_t felica_select_card(felica_card_select_t *card) {
     // b0    = fc/64 (212kbps)
     // 0x00 = timeslot
     // 0x09 0x21 = crc
-    static uint8_t poll[10] = {0xb2,0x4d,0x06,FELICA_POLL_REQ,0xFF,0xFF,0x00,0x00,0x09,0x21};
+    static uint8_t poll[10] = {0xb2, 0x4d, 0x06, FELICA_POLL_REQ, 0xFF, 0xFF, 0x00, 0x00, 0x09, 0x21};
 
     int len = 20;
 
@@ -225,7 +232,7 @@ static uint8_t felica_select_card(felica_card_select_t *card) {
     } while (--len);
 
     // timed-out
-    if ( len == 0 )
+    if (len == 0)
         return 1;
 
     // wrong answer
@@ -233,7 +240,7 @@ static uint8_t felica_select_card(felica_card_select_t *card) {
         return 2;
 
     // VALIDATE CRC   residue is 0, hence if crc is a value it failed.
-    if (!check_crc(CRC_FELICA, FelicaFrame.framebytes+2, FelicaFrame.len-2))
+    if (!check_crc(CRC_FELICA, FelicaFrame.framebytes + 2, FelicaFrame.len - 2))
         return 3;
 
     // copy UID
@@ -245,7 +252,7 @@ static uint8_t felica_select_card(felica_card_select_t *card) {
         memcpy(card->code, card->IDm, 2);
         memcpy(card->uid, card->IDm + 2, 6);
         memcpy(card->iccode, card->PMm, 2);
-        memcpy(card->mrt, card->PMm+2, 6);
+        memcpy(card->mrt, card->PMm + 2, 6);
 
     }
     // more status bytes?
@@ -264,7 +271,8 @@ static uint8_t felica_select_card(felica_card_select_t *card) {
 // Felica standard has a different file system, AFAIK,
 // 8-byte IDm, number of blocks, blocks numbers
 // number of blocks limited to 4 for FelicaLite(S)
-static void BuildFliteRdblk(uint8_t* idm, int blocknum, uint16_t *blocks ) {
+static void BuildFliteRdblk(uint8_t *idm, int blocknum, uint16_t *blocks)
+{
 
     if (blocknum > 4 || blocknum <= 0)
         Dbprintf("Invalid number of blocks, %d != 4", blocknum);
@@ -298,13 +306,13 @@ static void BuildFliteRdblk(uint8_t* idm, int blocknum, uint16_t *blocks ) {
     //number of blocks
     frameSpace[c++] = blocknum;
 
-    for (i=0; i < blocknum; i++) {
+    for (i = 0; i < blocknum; i++) {
 
         //3-byte block
         if (blocks[i] >= 256) {
-           frameSpace[c++] = 0x00;
-           frameSpace[c++] = (blocks[i] >> 8); //block number, little endian....
-           frameSpace[c++] = (blocks[i] & 0xff);
+            frameSpace[c++] = 0x00;
+            frameSpace[c++] = (blocks[i] >> 8); //block number, little endian....
+            frameSpace[c++] = (blocks[i] & 0xff);
         } else {
             frameSpace[c++] = 0x80;
             frameSpace[c++] = blocks[i];
@@ -312,15 +320,16 @@ static void BuildFliteRdblk(uint8_t* idm, int blocknum, uint16_t *blocks ) {
     }
 
     //set length
-    frameSpace[2] = c-2;
-    AddCrc(frameSpace, c-2);
+    frameSpace[2] = c - 2;
+    AddCrc(frameSpace, c - 2);
 }
 
-static void TransmitFor18092_AsReader(uint8_t * frame, int len, uint32_t *timing, uint8_t power, uint8_t highspeed) {
+static void TransmitFor18092_AsReader(uint8_t *frame, int len, uint32_t *timing, uint8_t power, uint8_t highspeed)
+{
 
     uint8_t flags = FPGA_MAJOR_MODE_ISO18092;
 
-    if ( power )
+    if (power)
         flags |= FPGA_HF_ISO18092_FLAG_READER;
     if (highspeed)
         flags |= FPGA_HF_ISO18092_FLAG_424K;
@@ -356,31 +365,32 @@ static void TransmitFor18092_AsReader(uint8_t * frame, int len, uint32_t *timing
         }
     }
 
-/**/
+    /**/
     while (!(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY))) {};
     AT91C_BASE_SSC->SSC_THR = 0x00; //minimum delay
 
     while (!(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY))) {};
     AT91C_BASE_SSC->SSC_THR = 0x00; //spin
-/**/
+    /**/
 
     // log
     LogTrace(
         frame,
         len,
-        (felica_lasttime_prox2air_start<<4) + DELAY_ARM2AIR_AS_READER,
-        ((felica_lasttime_prox2air_start + felica_lasttime_prox2air_start)<<4) + DELAY_ARM2AIR_AS_READER,
+        (felica_lasttime_prox2air_start << 4) + DELAY_ARM2AIR_AS_READER,
+        ((felica_lasttime_prox2air_start + felica_lasttime_prox2air_start) << 4) + DELAY_ARM2AIR_AS_READER,
         NULL,
         true
     );
 
-    felica_nexttransfertime = MAX(felica_nexttransfertime ,felica_lasttime_prox2air_start + FELICA_REQUEST_GUARD_TIME);
+    felica_nexttransfertime = MAX(felica_nexttransfertime, felica_lasttime_prox2air_start + FELICA_REQUEST_GUARD_TIME);
 }
 
 // Wait for tag reply
 // stop when button is pressed
 // or return TRUE when command is captured
-bool WaitForFelicaReply(uint16_t maxbytes) {
+bool WaitForFelicaReply(uint16_t maxbytes)
+{
 
     uint32_t c = 0;
 
@@ -393,7 +403,7 @@ bool WaitForFelicaReply(uint16_t maxbytes) {
     uint8_t b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
 
     uint32_t timeout = iso18092_get_timeout();
-    for(;;) {
+    for (;;) {
         WDT_HIT();
 
         if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
@@ -403,15 +413,15 @@ bool WaitForFelicaReply(uint16_t maxbytes) {
                 felica_nexttransfertime =
                     MAX(
                         felica_nexttransfertime,
-                        (GetCountSspClk() & 0xfffffff8) - (DELAY_AIR2ARM_AS_READER + DELAY_ARM2AIR_AS_READER)/16 + FELICA_FRAME_DELAY_TIME
+                        (GetCountSspClk() & 0xfffffff8) - (DELAY_AIR2ARM_AS_READER + DELAY_ARM2AIR_AS_READER) / 16 + FELICA_FRAME_DELAY_TIME
                     )
-                ;
+                    ;
 
                 LogTrace(
                     FelicaFrame.framebytes,
                     FelicaFrame.len,
-                    ((GetCountSspClk() & 0xfffffff8)<<4) - DELAY_AIR2ARM_AS_READER - timeout,
-                    ((GetCountSspClk() & 0xfffffff8)<<4) - DELAY_AIR2ARM_AS_READER,
+                    ((GetCountSspClk() & 0xfffffff8) << 4) - DELAY_AIR2ARM_AS_READER - timeout,
+                    ((GetCountSspClk() & 0xfffffff8) << 4) - DELAY_AIR2ARM_AS_READER,
                     NULL,
                     false
                 );
@@ -430,13 +440,15 @@ bool WaitForFelicaReply(uint16_t maxbytes) {
 
 // Set up FeliCa communication (similar to iso14443a_setup)
 // field is setup for "Sending as Reader"
-static void iso18092_setup(uint8_t fpga_minor_mode) {
+static void iso18092_setup(uint8_t fpga_minor_mode)
+{
 
     LEDsoff();
     FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
 
     // allocate command receive buffer
-    BigBuf_free(); BigBuf_Clear_ext(false);
+    BigBuf_free();
+    BigBuf_Clear_ext(false);
 
     // Initialize Demod and Uart structs
     //DemodInit(BigBuf_malloc(MAX_FRAME_SIZE));
@@ -473,7 +485,8 @@ static void iso18092_setup(uint8_t fpga_minor_mode) {
 // arg0 FeliCa flags
 // arg1 len of commandbytes
 // d.asBytes command bytes to send
-void felica_sendraw(UsbCommand *c) {
+void felica_sendraw(UsbCommand *c)
+{
 
     if (MF_DBGLEVEL > 3) Dbprintf("FeliCa_sendraw Enter");
 
@@ -494,10 +507,10 @@ void felica_sendraw(UsbCommand *c) {
 
         // notify client selecting status.
         // if failed selecting, turn off antenna and quite.
-        if( !(param & FELICA_NO_SELECT) ) {
+        if (!(param & FELICA_NO_SELECT)) {
             arg0 = felica_select_card(&card);
             cmd_send(CMD_ACK, arg0, sizeof(card.uid), 0, &card, sizeof(felica_card_select_t));
-            if ( arg0 > 0 )
+            if (arg0 > 0)
                 goto OUT;
         }
     }
@@ -505,26 +518,26 @@ void felica_sendraw(UsbCommand *c) {
     if ((param & FELICA_RAW)) {
 
         // 2 sync, 1 len, 2crc == 5
-        uint8_t *buf = BigBuf_malloc(len+5);
+        uint8_t *buf = BigBuf_malloc(len + 5);
         // add sync bits
         buf[0] = 0xb2;
         buf[1] = 0x4d;
         buf[2] = len;
 
         // copy command
-        memcpy(buf+2, cmd, len);
+        memcpy(buf + 2, cmd, len);
 
         if ((param & FELICA_APPEND_CRC)) {
             // Don't append crc on empty bytearray...
-            if ( len > 0 ) {
+            if (len > 0) {
                 AddCrc(buf, len);
                 len += 2;
             }
         }
 
-        TransmitFor18092_AsReader(buf, buf[2]+4, NULL, 1, 0);
+        TransmitFor18092_AsReader(buf, buf[2] + 4, NULL, 1, 0);
         arg0 = !WaitForFelicaReply(1024);
-        cmd_send(CMD_ACK, arg0, 0, 0, FelicaFrame.framebytes+2, FelicaFrame.len-2);
+        cmd_send(CMD_ACK, arg0, 0, 0, FelicaFrame.framebytes + 2, FelicaFrame.len - 2);
     }
 
     if ((param & FELICA_NO_DISCONNECT))
@@ -539,25 +552,26 @@ OUT:
     if (MF_DBGLEVEL > 3) Dbprintf("FeliCa_sendraw Exit");
 }
 
-void felica_sniff(uint32_t samplesToSkip, uint32_t triggersToSkip) {
+void felica_sniff(uint32_t samplesToSkip, uint32_t triggersToSkip)
+{
 
     int remFrames = (samplesToSkip) ? samplesToSkip : 0;
 
     Dbprintf("Snoop FelicaLiteS: Getting first %d frames, Skipping %d triggers.\n", samplesToSkip, triggersToSkip);
 
-    iso18092_setup( FPGA_HF_ISO18092_FLAG_NOMOD);
+    iso18092_setup(FPGA_HF_ISO18092_FLAG_NOMOD);
 
     //the frame bits are slow enough.
     int n = BigBuf_max_traceLen() / sizeof(uint8_t); // take all memory
     int numbts = 0;
     uint8_t *dest = (uint8_t *)BigBuf_get_addr();
-    uint8_t *destend = dest + n-2;
+    uint8_t *destend = dest + n - 2;
 
     uint32_t endframe = GetCountSspClk();
 
     while (dest <= destend) {
         WDT_HIT();
-        if( BUTTON_PRESS()) break;
+        if (BUTTON_PRESS()) break;
 
         if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
             uint8_t dist = (uint8_t)(AT91C_BASE_SSC->SSC_RHR);
@@ -566,7 +580,7 @@ void felica_sniff(uint32_t samplesToSkip, uint32_t triggersToSkip) {
             //to be sure we are in frame
             if (FelicaFrame.state == STATE_GET_LENGTH) {
                 //length is after 48 (PRE)+16 (SYNC) - 64 ticks +maybe offset? not 100%
-                uint16_t distance = GetCountSspClk() - endframe - 64 + (FelicaFrame.byte_offset > 0 ? (8-FelicaFrame.byte_offset) : 0);
+                uint16_t distance = GetCountSspClk() - endframe - 64 + (FelicaFrame.byte_offset > 0 ? (8 - FelicaFrame.byte_offset) : 0);
                 *dest = distance >> 8;
                 dest++;
                 *dest = (distance & 0xff);
@@ -577,16 +591,16 @@ void felica_sniff(uint32_t samplesToSkip, uint32_t triggersToSkip) {
                 endframe = GetCountSspClk();
                 //*dest = FelicaFrame.crc_ok; //kind of wasteful
                 dest++;
-                for(int i=0; i < FelicaFrame.len; i++) {
+                for (int i = 0; i < FelicaFrame.len; i++) {
                     *dest = FelicaFrame.framebytes[i];
                     dest++;
-                    if (dest >= destend ) break;
+                    if (dest >= destend) break;
 
                 }
 
                 remFrames--;
                 if (remFrames <= 0) break;
-                if (dest >= destend ) break;
+                if (dest >= destend) break;
 
                 numbts += FelicaFrame.len;
 
@@ -602,7 +616,7 @@ void felica_sniff(uint32_t samplesToSkip, uint32_t triggersToSkip) {
     set_tracelen(numbts);
 
     Dbprintf("Felica sniffing done, tracelen: %i, use hf list felica for annotations", BigBuf_get_traceLen());
-    cmd_send(CMD_ACK,1, numbts,0,0,0);
+    cmd_send(CMD_ACK, 1, numbts, 0, 0, 0);
 }
 
 #define R_POLL0_LEN    0x16
@@ -610,7 +624,8 @@ void felica_sniff(uint32_t samplesToSkip, uint32_t triggersToSkip) {
 #define R_READBLK_LEN  0x21
 //simulate NFC Tag3 card - for now only poll response works
 // second half (4 bytes)  of NDEF2 goes into nfcid2_0, first into nfcid2_1
-void felica_sim_lite(uint64_t nfcid) {
+void felica_sim_lite(uint64_t nfcid)
+{
 
     int i, curlen = 0;
     uint8_t *curresp = 0;
@@ -619,21 +634,21 @@ void felica_sim_lite(uint64_t nfcid) {
     num_to_bytes(nfcid, 8, ndef);
 
     //prepare our 3 responses...
-    uint8_t resp_poll0[R_POLL0_LEN] = { 0xb2,0x4d,0x12,FELICA_POLL_ACK,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf1,0x00,0x00,0x00,0x01,0x43,0x00,0xb3,0x7f};
-    uint8_t resp_poll1[R_POLL1_LEN] = { 0xb2,0x4d,0x14,FELICA_POLL_ACK,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf1,0x00,0x00,0x00,0x01,0x43,0x00, 0x88,0xb4,0xb3,0x7f};
-    uint8_t resp_readblk[R_READBLK_LEN] = { 0xb2,0x4d,0x1d,FELICA_RDBLK_ACK,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x10,0x04,0x01,0x00,0x0d,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x23,0xcb,0x6e};
+    uint8_t resp_poll0[R_POLL0_LEN] = { 0xb2, 0x4d, 0x12, FELICA_POLL_ACK, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf1, 0x00, 0x00, 0x00, 0x01, 0x43, 0x00, 0xb3, 0x7f};
+    uint8_t resp_poll1[R_POLL1_LEN] = { 0xb2, 0x4d, 0x14, FELICA_POLL_ACK, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf1, 0x00, 0x00, 0x00, 0x01, 0x43, 0x00, 0x88, 0xb4, 0xb3, 0x7f};
+    uint8_t resp_readblk[R_READBLK_LEN] = { 0xb2, 0x4d, 0x1d, FELICA_RDBLK_ACK, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x10, 0x04, 0x01, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x23, 0xcb, 0x6e};
 
     //NFC tag 3/ ISo technically. Many overlapping standards
     DbpString("Felica Lite-S sim start");
     Dbprintf("NDEF2 UID: %02x %02x %02x %02x %02x %02x %02x %02x",
-        ndef[0], ndef[1], ndef[2], ndef[3], ndef[4], ndef[5], ndef[6], ndef[7]
-    );
+             ndef[0], ndef[1], ndef[2], ndef[3], ndef[4], ndef[5], ndef[6], ndef[7]
+            );
 
     //fill in blanks
-    for( i=0; i<8; i++) {
-        resp_poll0[i+4] = ndef[i];
-        resp_poll1[i+4] = ndef[i];
-        resp_readblk[i+4] = ndef[i];
+    for (i = 0; i < 8; i++) {
+        resp_poll0[i + 4] = ndef[i];
+        resp_poll1[i + 4] = ndef[i];
+        resp_readblk[i + 4] = ndef[i];
     }
 
     //calculate and set CRC
@@ -641,12 +656,12 @@ void felica_sim_lite(uint64_t nfcid) {
     AddCrc(resp_poll1, resp_poll1[2]);
     AddCrc(resp_readblk, resp_readblk[2]);
 
-    iso18092_setup( FPGA_HF_ISO18092_FLAG_NOMOD);
+    iso18092_setup(FPGA_HF_ISO18092_FLAG_NOMOD);
 
     bool listenmode = true;
     //uint32_t frtm = GetCountSspClk();
-    for(;;) {
-        if( BUTTON_PRESS()) break;
+    for (;;) {
+        if (BUTTON_PRESS()) break;
         WDT_HIT();
 
         if (listenmode) {
@@ -716,11 +731,12 @@ void felica_sim_lite(uint64_t nfcid) {
     DbpString("Felica Lite-S sim end");
 }
 
-void felica_dump_lite_s() {
+void felica_dump_lite_s()
+{
 
     uint8_t ndef[8];
-    uint8_t poll[10] = { 0xb2,0x4d,0x06,FELICA_POLL_REQ,0xff,0xff,0x00,0x00,0x09,0x21};
-    uint16_t liteblks[28] = {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x90,0x91,0x92,0xa0};
+    uint8_t poll[10] = { 0xb2, 0x4d, 0x06, FELICA_POLL_REQ, 0xff, 0xff, 0x00, 0x00, 0x09, 0x21};
+    uint16_t liteblks[28] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x90, 0x91, 0x92, 0xa0};
 
     // setup device.
     iso18092_setup(FPGA_HF_ISO18092_FLAG_READER | FPGA_HF_ISO18092_FLAG_NOMOD);
@@ -743,15 +759,15 @@ void felica_dump_lite_s() {
             // copy 8bytes to ndef.
             memcpy(ndef, FelicaFrame.framebytes + 4, 8);
             // for (c=0; c < 8; c++)
-                // ndef[c] = FelicaFrame.framebytes[c+4];
+            // ndef[c] = FelicaFrame.framebytes[c+4];
 
-            for (blknum=0; blknum < sizeof(liteblks); ) {
+            for (blknum = 0; blknum < sizeof(liteblks);) {
 
                 // block to read.
                 BuildFliteRdblk(ndef, 1, &liteblks[blknum]);
 
                 //TransmitFor18092_AsReader(frameSpace, frameSpace[2]+4, GetCountSspClk()+512, 1, 0);
-                TransmitFor18092_AsReader(frameSpace, frameSpace[2]+4, NULL, 1, 0);
+                TransmitFor18092_AsReader(frameSpace, frameSpace[2] + 4, NULL, 1, 0);
 
                 // read block
                 if (WaitForFelicaReply(1024) && FelicaFrame.framebytes[3] == FELICA_RDBLK_ACK) {
@@ -764,15 +780,15 @@ void felica_dump_lite_s() {
 
                     //memcpy(dest+cnt, FelicaFrame.framebytes + 15, 16);
                     //cnt += 16;
-                    for(uint8_t j=0; j < 16; j++)
-                        dest[cnt++] = fb[15+j];
+                    for (uint8_t j = 0; j < 16; j++)
+                        dest[cnt++] = fb[15 + j];
 
                     blknum++;
                     cntfails = 0;
 
                     // // print raw log.
                     // Dbprintf("LEN %u | Dump bytes count %u ", FelicaFrame.len, cnt);
-                    Dbhexdump(FelicaFrame.len, FelicaFrame.framebytes+15, 0);
+                    Dbhexdump(FelicaFrame.len, FelicaFrame.framebytes + 15, 0);
                 } else {
                     cntfails++;
                     if (cntfails > 12) {
diff --git a/armsrc/flashmem.c b/armsrc/flashmem.c
index 1c9304c43..6773af444 100644
--- a/armsrc/flashmem.c
+++ b/armsrc/flashmem.c
@@ -13,13 +13,15 @@
 
 uint32_t FLASHMEM_SPIBAUDRATE = FLASH_BAUD;
 
-void FlashmemSetSpiBaudrate(uint32_t baudrate){
-   FLASHMEM_SPIBAUDRATE = baudrate;
-   Dbprintf("Spi Baudrate : %dMhz", FLASHMEM_SPIBAUDRATE/1000000);
+void FlashmemSetSpiBaudrate(uint32_t baudrate)
+{
+    FLASHMEM_SPIBAUDRATE = baudrate;
+    Dbprintf("Spi Baudrate : %dMhz", FLASHMEM_SPIBAUDRATE / 1000000);
 }
 
 // initialize
-bool FlashInit() {
+bool FlashInit()
+{
     FlashSetup(FLASHMEM_SPIBAUDRATE);
 
     StartTicks();
@@ -32,8 +34,9 @@ bool FlashInit() {
     return true;
 }
 
-void FlashSetup(uint32_t baudrate){
-   //WDT_DISABLE
+void FlashSetup(uint32_t baudrate)
+{
+    //WDT_DISABLE
     AT91C_BASE_WDTC->WDTC_WDMR = AT91C_WDTC_WDDIS;
 
     // PA10 -> SPI_NCS2 chip select (FLASHMEM)
@@ -68,13 +71,13 @@ void FlashSetup(uint32_t baudrate){
     // NPCS2 Mode 0
     AT91C_BASE_SPI->SPI_MR =
         (0 << 24)            | // Delay between chip selects = DYLBCS/MCK BUT:
-                               // If DLYBCS is less than or equal to six, six MCK periods
-                               // will be inserted by default.
+        // If DLYBCS is less than or equal to six, six MCK periods
+        // will be inserted by default.
         SPI_PCS(SPI_CSR_NUM) | // Peripheral Chip Select (selects SPI_NCS2 or PA10)
-        ( 0 << 7)            | // Disable LLB (1=MOSI2MISO test mode)
-        ( 1 << 4)            | // Disable ModeFault Protection
-        ( 0 << 3)            | // makes spi operate at MCK (1 is MCK/2)
-        ( 0 << 2)            | // Chip selects connected directly to peripheral
+        (0 << 7)            |  // Disable LLB (1=MOSI2MISO test mode)
+        (1 << 4)            |  // Disable ModeFault Protection
+        (0 << 3)            |  // makes spi operate at MCK (1 is MCK/2)
+        (0 << 2)            |  // Chip selects connected directly to peripheral
         AT91C_SPI_PS_FIXED   | // Fixed Peripheral Select
         AT91C_SPI_MSTR;        // Master Mode
 
@@ -87,17 +90,17 @@ void FlashSetup(uint32_t baudrate){
     }
 
     AT91C_BASE_SPI->SPI_CSR[2] =
-        SPI_DLYBCT(dlybct,MCK)| // Delay between Consecutive Transfers (32 MCK periods)
-        SPI_DLYBS(0,MCK)      | // Delay Beforce SPCK CLock
-        SPI_SCBR(baudrate,MCK)| // SPI Baudrate Selection
+        SPI_DLYBCT(dlybct, MCK) | // Delay between Consecutive Transfers (32 MCK periods)
+        SPI_DLYBS(0, MCK)      | // Delay Beforce SPCK CLock
+        SPI_SCBR(baudrate, MCK) | // SPI Baudrate Selection
         AT91C_SPI_BITS_8      | // Bits per Transfer (8 bits)
         //AT91C_SPI_CSAAT       | // Chip Select inactive after transfer
-                            // 40.4.6.2 SPI: Bad tx_ready Behavior when CSAAT = 1 and SCBR = 1
-                            // If the SPI is programmed with CSAAT = 1, SCBR(baudrate) = 1 and two transfers are performed consecutively on
-                            // the same slave with an IDLE state between them, the tx_ready signal does not rise after the second data has been
-                            // transferred in the shifter. This can imply for example, that the second data is sent twice.
-                            // COLIN :: For now we STILL use CSAAT=1 to avoid having to (de)assert  NPCS manually via PIO lines and we deal with delay
-        ( csaat << 3)         |
+        // 40.4.6.2 SPI: Bad tx_ready Behavior when CSAAT = 1 and SCBR = 1
+        // If the SPI is programmed with CSAAT = 1, SCBR(baudrate) = 1 and two transfers are performed consecutively on
+        // the same slave with an IDLE state between them, the tx_ready signal does not rise after the second data has been
+        // transferred in the shifter. This can imply for example, that the second data is sent twice.
+        // COLIN :: For now we STILL use CSAAT=1 to avoid having to (de)assert  NPCS manually via PIO lines and we deal with delay
+        (csaat << 3)         |
         /* Spi modes:
             Mode CPOL CPHA NCPHA
             0    0    0    1       clock normally low    read on rising edge
@@ -120,14 +123,15 @@ void FlashSetup(uint32_t baudrate){
             2    1    0    0       clock normally high   read on falling edge
             3    1    1    1       clock normally high   read on rising edge
         */
-        ( 0 << 1)             | // Clock Phase data captured on leading edge, changes on following edge
-        ( 0 << 0);              // Clock Polarity inactive state is logic 0
+        (0 << 1)             |  // Clock Phase data captured on leading edge, changes on following edge
+        (0 << 0);               // Clock Polarity inactive state is logic 0
 
     // read first, empty buffer
     if (AT91C_BASE_SPI->SPI_RDR == 0) {};
 }
 
-void FlashStop(void) {
+void FlashStop(void)
+{
     //Bof
     //* Reset all the Chip Select register
     AT91C_BASE_SPI->SPI_CSR[0] = 0;
@@ -144,13 +148,14 @@ void FlashStop(void) {
     // SPI disable
     AT91C_BASE_SPI->SPI_CR = AT91C_SPI_SPIDIS;
 
-    if ( MF_DBGLEVEL > 3 ) Dbprintf("FlashStop");
+    if (MF_DBGLEVEL > 3) Dbprintf("FlashStop");
 
     StopTicks();
 }
 
 // send one byte over SPI
-uint16_t FlashSendByte(uint32_t data) {
+uint16_t FlashSendByte(uint32_t data)
+{
 
     // wait until SPI is ready for transfer
     //if you are checking for incoming data returned then the TXEMPTY flag is redundant
@@ -162,19 +167,21 @@ uint16_t FlashSendByte(uint32_t data) {
     //while ((AT91C_BASE_SPI->SPI_SR & AT91C_SPI_TDRE) == 0){};
 
     // wait recive transfer is complete
-    while ((AT91C_BASE_SPI->SPI_SR & AT91C_SPI_RDRF) == 0){};
+    while ((AT91C_BASE_SPI->SPI_SR & AT91C_SPI_RDRF) == 0) {};
 
     // reading incoming data
     return ((AT91C_BASE_SPI->SPI_RDR) & 0xFFFF);
 }
 
 // send last byte over SPI
-uint16_t FlashSendLastByte(uint32_t data) {
+uint16_t FlashSendLastByte(uint32_t data)
+{
     return FlashSendByte(data | AT91C_SPI_LASTXFER);
 }
 
 // read state register 1
-uint8_t Flash_ReadStat1(void) {
+uint8_t Flash_ReadStat1(void)
+{
     FlashSendByte(READSTAT1);
     return FlashSendLastByte(0xFF);
 }
@@ -185,18 +192,15 @@ bool Flash_CheckBusy(uint32_t timeout)
     StartCountUS();
     uint32_t _time = GetCountUS();
 
-    if ( MF_DBGLEVEL > 3 ) Dbprintf("Checkbusy in...");
+    if (MF_DBGLEVEL > 3) Dbprintf("Checkbusy in...");
 
-    do
-    {
-        if (!(Flash_ReadStat1() & BUSY))
-        {
+    do {
+        if (!(Flash_ReadStat1() & BUSY)) {
             return false;
         }
     } while ((GetCountUS() - _time) < timeout);
 
-    if (timeout <= (GetCountUS() - _time))
-    {
+    if (timeout <= (GetCountUS() - _time)) {
         return true;
     }
 
@@ -204,7 +208,8 @@ bool Flash_CheckBusy(uint32_t timeout)
 }
 
 // read ID out
-uint8_t Flash_ReadID(void) {
+uint8_t Flash_ReadID(void)
+{
 
     if (Flash_CheckBusy(BUSY_TIMEOUT)) return 0;
 
@@ -217,16 +222,17 @@ uint8_t Flash_ReadID(void) {
     uint8_t man_id = FlashSendByte(0xFF);
     uint8_t dev_id = FlashSendLastByte(0xFF);
 
-    if ( MF_DBGLEVEL > 3 ) Dbprintf("Flash ReadID  |  Man ID %02x | Device ID %02x", man_id, dev_id);
+    if (MF_DBGLEVEL > 3) Dbprintf("Flash ReadID  |  Man ID %02x | Device ID %02x", man_id, dev_id);
 
-    if ( (man_id == WINBOND_MANID ) && (dev_id == WINBOND_DEVID) )
+    if ((man_id == WINBOND_MANID) && (dev_id == WINBOND_DEVID))
         return dev_id;
 
     return 0;
 }
 
 // read unique id for chip.
-void Flash_UniqueID(uint8_t *uid) {
+void Flash_UniqueID(uint8_t *uid)
+{
 
     if (Flash_CheckBusy(BUSY_TIMEOUT)) return;
 
@@ -247,7 +253,8 @@ void Flash_UniqueID(uint8_t *uid) {
     uid[0] = FlashSendLastByte(0xFF);
 }
 
-uint16_t Flash_ReadData(uint32_t address, uint8_t *out, uint16_t len) {
+uint16_t Flash_ReadData(uint32_t address, uint8_t *out, uint16_t len)
+{
 
     if (!FlashInit()) return 0;
 
@@ -259,7 +266,7 @@ uint16_t Flash_ReadData(uint32_t address, uint8_t *out, uint16_t len) {
     FlashSendByte(cmd);
     Flash_TransferAdresse(address);
 
-    if (FASTFLASH){
+    if (FASTFLASH) {
         FlashSendByte(DUMMYBYTE);
     }
 
@@ -272,14 +279,16 @@ uint16_t Flash_ReadData(uint32_t address, uint8_t *out, uint16_t len) {
     return len;
 }
 
-void Flash_TransferAdresse(uint32_t address){
+void Flash_TransferAdresse(uint32_t address)
+{
     FlashSendByte((address >> 16) & 0xFF);
     FlashSendByte((address >> 8) & 0xFF);
     FlashSendByte((address >> 0) & 0xFF);
 }
 
 /* This ensure we can ReadData without having to cycle through initialization everytime */
-uint16_t Flash_ReadDataCont(uint32_t address, uint8_t *out, uint16_t len) {
+uint16_t Flash_ReadDataCont(uint32_t address, uint8_t *out, uint16_t len)
+{
 
     // length should never be zero
     if (!len) return 0;
@@ -289,7 +298,7 @@ uint16_t Flash_ReadDataCont(uint32_t address, uint8_t *out, uint16_t len) {
     FlashSendByte(cmd);
     Flash_TransferAdresse(address);
 
-    if (FASTFLASH){
+    if (FASTFLASH) {
         FlashSendByte(DUMMYBYTE);
     }
 
@@ -305,7 +314,8 @@ uint16_t Flash_ReadDataCont(uint32_t address, uint8_t *out, uint16_t len) {
 ////////////////////////////////////////
 // Write data can only program one page. A page has 256 bytes.
 // if len > 256, it might wrap around and overwrite pos 0.
-uint16_t Flash_WriteData(uint32_t address, uint8_t *in, uint16_t len) {
+uint16_t Flash_WriteData(uint32_t address, uint8_t *in, uint16_t len)
+{
 
     // length should never be zero
     if (!len)
@@ -313,18 +323,18 @@ uint16_t Flash_WriteData(uint32_t address, uint8_t *in, uint16_t len) {
 
     // Max 256 bytes write
     if (((address & 0xFF) + len) > 256) {
-        Dbprintf("Flash_WriteData 256 fail [ 0x%02x ] [ %u ]", (address & 0xFF)+len, len );
+        Dbprintf("Flash_WriteData 256 fail [ 0x%02x ] [ %u ]", (address & 0xFF) + len, len);
         return 0;
     }
 
     // out-of-range
-    if ( (( address >> 16 ) & 0xFF ) > MAX_BLOCKS) {
+    if (((address >> 16) & 0xFF) > MAX_BLOCKS) {
         Dbprintf("Flash_WriteData,  block out-of-range");
         return 0;
     }
 
     if (!FlashInit()) {
-        if ( MF_DBGLEVEL > 3 ) Dbprintf("Flash_WriteData init fail");
+        if (MF_DBGLEVEL > 3) Dbprintf("Flash_WriteData init fail");
         return 0;
     }
 
@@ -351,17 +361,18 @@ uint16_t Flash_WriteData(uint32_t address, uint8_t *in, uint16_t len) {
 // length should never be zero
 // Max 256 bytes write
 // out-of-range
-uint16_t Flash_WriteDataCont(uint32_t address, uint8_t *in, uint16_t len) {
+uint16_t Flash_WriteDataCont(uint32_t address, uint8_t *in, uint16_t len)
+{
 
     if (!len)
         return 0;
 
     if (((address & 0xFF) + len) > 256) {
-        Dbprintf("Flash_WriteDataCont 256 fail [ 0x%02x ] [ %u ]", (address & 0xFF)+len, len );
+        Dbprintf("Flash_WriteDataCont 256 fail [ 0x%02x ] [ %u ]", (address & 0xFF) + len, len);
         return 0;
     }
 
-    if ( (( address >> 16 ) & 0xFF ) > MAX_BLOCKS) {
+    if (((address >> 16) & 0xFF) > MAX_BLOCKS) {
         Dbprintf("Flash_WriteDataCont,  block out-of-range");
         return 0;
     }
@@ -381,7 +392,8 @@ uint16_t Flash_WriteDataCont(uint32_t address, uint8_t *in, uint16_t len) {
 
 // assumes valid start 256 based 00 address
 //
-uint16_t Flash_Write(uint32_t address, uint8_t *in, uint16_t len) {
+uint16_t Flash_Write(uint32_t address, uint8_t *in, uint16_t len)
+{
 
     bool isok;
     uint16_t res, bytes_sent = 0, bytes_remaining = len;
@@ -412,47 +424,61 @@ out:
 }
 
 
-bool Flash_WipeMemoryPage(uint8_t page) {
+bool Flash_WipeMemoryPage(uint8_t page)
+{
     if (!FlashInit()) {
-        if ( MF_DBGLEVEL > 3 ) Dbprintf("Flash_WriteData init fail");
+        if (MF_DBGLEVEL > 3) Dbprintf("Flash_WriteData init fail");
         return false;
     }
     Flash_ReadStat1();
 
     // Each block is 64Kb. One block erase takes 1s ( 1000ms )
-    Flash_WriteEnable(); Flash_Erase64k(page); Flash_CheckBusy(BUSY_TIMEOUT);
+    Flash_WriteEnable();
+    Flash_Erase64k(page);
+    Flash_CheckBusy(BUSY_TIMEOUT);
 
     FlashStop();
     return true;
 }
 // Wipes flash memory completely, fills with 0xFF
-bool Flash_WipeMemory() {
+bool Flash_WipeMemory()
+{
     if (!FlashInit()) {
-        if ( MF_DBGLEVEL > 3 ) Dbprintf("Flash_WriteData init fail");
+        if (MF_DBGLEVEL > 3) Dbprintf("Flash_WriteData init fail");
         return false;
     }
     Flash_ReadStat1();
 
     // Each block is 64Kb.  Four blocks
     // one block erase takes 1s ( 1000ms )
-    Flash_WriteEnable(); Flash_Erase64k(0); Flash_CheckBusy(BUSY_TIMEOUT);
-    Flash_WriteEnable(); Flash_Erase64k(1); Flash_CheckBusy(BUSY_TIMEOUT);
-    Flash_WriteEnable(); Flash_Erase64k(2); Flash_CheckBusy(BUSY_TIMEOUT);
-    Flash_WriteEnable(); Flash_Erase64k(3); Flash_CheckBusy(BUSY_TIMEOUT);
+    Flash_WriteEnable();
+    Flash_Erase64k(0);
+    Flash_CheckBusy(BUSY_TIMEOUT);
+    Flash_WriteEnable();
+    Flash_Erase64k(1);
+    Flash_CheckBusy(BUSY_TIMEOUT);
+    Flash_WriteEnable();
+    Flash_Erase64k(2);
+    Flash_CheckBusy(BUSY_TIMEOUT);
+    Flash_WriteEnable();
+    Flash_Erase64k(3);
+    Flash_CheckBusy(BUSY_TIMEOUT);
 
     FlashStop();
     return true;
 }
 
 // enable the flash write
-void Flash_WriteEnable() {
+void Flash_WriteEnable()
+{
     FlashSendLastByte(WRITEENABLE);
-    if ( MF_DBGLEVEL > 3 ) Dbprintf("Flash Write enabled");
+    if (MF_DBGLEVEL > 3) Dbprintf("Flash Write enabled");
 }
 
 // erase 4K at one time
 // execution time: 0.8ms / 800us
-bool Flash_Erase4k(uint8_t block, uint8_t sector) {
+bool Flash_Erase4k(uint8_t block, uint8_t sector)
+{
 
     if (block > MAX_BLOCKS  || sector > MAX_SECTORS) return false;
 
@@ -487,7 +513,8 @@ bool Flash_Erase32k(uint32_t address) {
 // 0x01 00 00  -- 0x 01 FF FF  == block 1
 // 0x02 00 00  -- 0x 02 FF FF  == block 2
 // 0x03 00 00  -- 0x 03 FF FF  == block 3
-bool Flash_Erase64k(uint8_t block) {
+bool Flash_Erase64k(uint8_t block)
+{
 
     if (block > MAX_BLOCKS) return false;
 
@@ -499,13 +526,15 @@ bool Flash_Erase64k(uint8_t block) {
 }
 
 // Erase chip
-void Flash_EraseChip(void) {
+void Flash_EraseChip(void)
+{
     FlashSendLastByte(CHIPERASE);
 }
 
-void Flashmem_print_status(void) {
+void Flashmem_print_status(void)
+{
     DbpString("Flash memory");
-    Dbprintf("  Baudrate................%dMHz",FLASHMEM_SPIBAUDRATE/1000000);
+    Dbprintf("  Baudrate................%dMHz", FLASHMEM_SPIBAUDRATE / 1000000);
 
     if (!FlashInit()) {
         DbpString("  Init....................FAIL");
@@ -529,12 +558,12 @@ void Flashmem_print_status(void) {
             break;
     }
 
-    uint8_t uid[8] = {0,0,0,0,0,0,0,0};
+    uint8_t uid[8] = {0, 0, 0, 0, 0, 0, 0, 0};
     Flash_UniqueID(uid);
     Dbprintf("  Unique ID...............0x%02x%02x%02x%02x%02x%02x%02x%02x",
-            uid[7], uid[6], uid[5], uid[4],
-            uid[3], uid[2], uid[1], uid[0]
-    );
+             uid[7], uid[6], uid[5], uid[4],
+             uid[3], uid[2], uid[1], uid[0]
+            );
 
     FlashStop();
 }
diff --git a/armsrc/fonts.c b/armsrc/fonts.c
index 1e4b418c9..78b96e238 100644
--- a/armsrc/fonts.c
+++ b/armsrc/fonts.c
@@ -7,103 +7,103 @@
 //-----------------------------------------------------------------------------
 
 const char FONT6x8[97][8] = {
-    {0x06,0x08,0x08,0x00,0x00,0x00,0x00,0x00},  // columns, rows, bytes per char
-    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},  // space
-    {0x20,0x20,0x20,0x20,0x20,0x00,0x20,0x00},  // !
-    {0x50,0x50,0x50,0x00,0x00,0x00,0x00,0x00},  // "
-    {0x50,0x50,0xF8,0x50,0xF8,0x50,0x50,0x00},  // #
-    {0x20,0x78,0xA0,0x70,0x28,0xF0,0x20,0x00},  // $
-    {0xC0,0xC8,0x10,0x20,0x40,0x98,0x18,0x00},  // %
-    {0x40,0xA0,0xA0,0x40,0xA8,0x90,0x68,0x00},  // &
-    {0x30,0x30,0x20,0x40,0x00,0x00,0x00,0x00},  // '
-    {0x10,0x20,0x40,0x40,0x40,0x20,0x10,0x00},  // (
-    {0x40,0x20,0x10,0x10,0x10,0x20,0x40,0x00},  // )
-    {0x00,0x20,0xA8,0x70,0x70,0xA8,0x20,0x00},  // *
-    {0x00,0x20,0x20,0xF8,0x20,0x20,0x00,0x00},  // +
-    {0x00,0x00,0x00,0x00,0x30,0x30,0x20,0x40},  // ,
-    {0x00,0x00,0x00,0xF8,0x00,0x00,0x00,0x00},  // -
-    {0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x00},  // .
-    {0x00,0x08,0x10,0x20,0x40,0x80,0x00,0x00},  // /
-    {0x70,0x88,0x88,0xA8,0x88,0x88,0x70,0x00},  // 0
-    {0x20,0x60,0x20,0x20,0x20,0x20,0x70,0x00},  // 1
-    {0x70,0x88,0x08,0x70,0x80,0x80,0xF8,0x00},  // 2
-    {0xF8,0x08,0x10,0x30,0x08,0x88,0x70,0x00},  // 3
-    {0x10,0x30,0x50,0x90,0xF8,0x10,0x10,0x00},  // 4
-    {0xF8,0x80,0xF0,0x08,0x08,0x88,0x70,0x00},  // 5
-    {0x38,0x40,0x80,0xF0,0x88,0x88,0x70,0x00},  // 6
-    {0xF8,0x08,0x08,0x10,0x20,0x40,0x80,0x00},  // 7
-    {0x70,0x88,0x88,0x70,0x88,0x88,0x70,0x00},  // 8
-    {0x70,0x88,0x88,0x78,0x08,0x10,0xE0,0x00},  // 9
-    {0x00,0x00,0x20,0x00,0x20,0x00,0x00,0x00},  // :
-    {0x00,0x00,0x20,0x00,0x20,0x20,0x40,0x00},  // ;
-    {0x08,0x10,0x20,0x40,0x20,0x10,0x08,0x00},  // <
-    {0x00,0x00,0xF8,0x00,0xF8,0x00,0x00,0x00},  // =
-    {0x40,0x20,0x10,0x08,0x10,0x20,0x40,0x00},  // >
-    {0x70,0x88,0x08,0x30,0x20,0x00,0x20,0x00},  // ?
-    {0x70,0x88,0xA8,0xB8,0xB0,0x80,0x78,0x00},  // @
-    {0x20,0x50,0x88,0x88,0xF8,0x88,0x88,0x00},  // A
-    {0xF0,0x88,0x88,0xF0,0x88,0x88,0xF0,0x00},  // B
-    {0x70,0x88,0x80,0x80,0x80,0x88,0x70,0x00},  // C
-    {0xF0,0x88,0x88,0x88,0x88,0x88,0xF0,0x00},  // D
-    {0xF8,0x80,0x80,0xF0,0x80,0x80,0xF8,0x00},  // E
-    {0xF8,0x80,0x80,0xF0,0x80,0x80,0x80,0x00},  // F
-    {0x78,0x88,0x80,0x80,0x98,0x88,0x78,0x00},  // G
-    {0x88,0x88,0x88,0xF8,0x88,0x88,0x88,0x00},  // H
-    {0x70,0x20,0x20,0x20,0x20,0x20,0x70,0x00},  // I
-    {0x38,0x10,0x10,0x10,0x10,0x90,0x60,0x00},  // J
-    {0x88,0x90,0xA0,0xC0,0xA0,0x90,0x88,0x00},  // K
-    {0x80,0x80,0x80,0x80,0x80,0x80,0xF8,0x00},  // L
-    {0x88,0xD8,0xA8,0xA8,0xA8,0x88,0x88,0x00},  // M
-    {0x88,0x88,0xC8,0xA8,0x98,0x88,0x88,0x00},  // N
-    {0x70,0x88,0x88,0x88,0x88,0x88,0x70,0x00},  // O
-    {0xF0,0x88,0x88,0xF0,0x80,0x80,0x80,0x00},  // P
-    {0x70,0x88,0x88,0x88,0xA8,0x90,0x68,0x00},  // Q
-    {0xF0,0x88,0x88,0xF0,0xA0,0x90,0x88,0x00},  // R
-    {0x70,0x88,0x80,0x70,0x08,0x88,0x70,0x00},  // S
-    {0xF8,0xA8,0x20,0x20,0x20,0x20,0x20,0x00},  // T
-    {0x88,0x88,0x88,0x88,0x88,0x88,0x70,0x00},  // U
-    {0x88,0x88,0x88,0x88,0x88,0x50,0x20,0x00},  // V
-    {0x88,0x88,0x88,0xA8,0xA8,0xA8,0x50,0x00},  // W
-    {0x88,0x88,0x50,0x20,0x50,0x88,0x88,0x00},  // X
-    {0x88,0x88,0x50,0x20,0x20,0x20,0x20,0x00},  // Y
-    {0xF8,0x08,0x10,0x70,0x40,0x80,0xF8,0x00},  // Z
-    {0x78,0x40,0x40,0x40,0x40,0x40,0x78,0x00},  // [
-    {0x00,0x80,0x40,0x20,0x10,0x08,0x00,0x00},  // backslash
-    {0x78,0x08,0x08,0x08,0x08,0x08,0x78,0x00},  // ]
-    {0x20,0x50,0x88,0x00,0x00,0x00,0x00,0x00},  // ^
-    {0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0x00},  // _
-    {0x60,0x60,0x20,0x10,0x00,0x00,0x00,0x00},  // `
-    {0x00,0x00,0x60,0x10,0x70,0x90,0x78,0x00},  // a
-    {0x80,0x80,0xB0,0xC8,0x88,0xC8,0xB0,0x00},  // b
-    {0x00,0x00,0x70,0x88,0x80,0x88,0x70,0x00},  // c
-    {0x08,0x08,0x68,0x98,0x88,0x98,0x68,0x00},  // d
-    {0x00,0x00,0x70,0x88,0xF8,0x80,0x70,0x00},  // e
-    {0x10,0x28,0x20,0x70,0x20,0x20,0x20,0x00},  // f
-    {0x00,0x00,0x70,0x98,0x98,0x68,0x08,0x70},  // g
-    {0x80,0x80,0xB0,0xC8,0x88,0x88,0x88,0x00},  // h
-    {0x20,0x00,0x60,0x20,0x20,0x20,0x70,0x00},  // i
-    {0x10,0x00,0x10,0x10,0x10,0x90,0x60,0x00},  // j
-    {0x80,0x80,0x90,0xA0,0xC0,0xA0,0x90,0x00},  // k
-    {0x60,0x20,0x20,0x20,0x20,0x20,0x70,0x00},  // l
-    {0x00,0x00,0xD0,0xA8,0xA8,0xA8,0xA8,0x00},  // m
-    {0x00,0x00,0xB0,0xC8,0x88,0x88,0x88,0x00},  // n
-    {0x00,0x00,0x70,0x88,0x88,0x88,0x70,0x00},  // o
-    {0x00,0x00,0xB0,0xC8,0xC8,0xB0,0x80,0x80},  // p
-    {0x00,0x00,0x68,0x98,0x98,0x68,0x08,0x08},  // q
-    {0x00,0x00,0xB0,0xC8,0x80,0x80,0x80,0x00},  // r
-    {0x00,0x00,0x78,0x80,0x70,0x08,0xF0,0x00},  // s
-    {0x20,0x20,0xF8,0x20,0x20,0x28,0x10,0x00},  // t
-    {0x00,0x00,0x88,0x88,0x88,0x98,0x68,0x00},  // u
-    {0x00,0x00,0x88,0x88,0x88,0x50,0x20,0x00},  // v
-    {0x00,0x00,0x88,0x88,0xA8,0xA8,0x50,0x00},  // w
-    {0x00,0x00,0x88,0x50,0x20,0x50,0x88,0x00},  // x
-    {0x00,0x00,0x88,0x88,0x78,0x08,0x88,0x70},  // y
-    {0x00,0x00,0xF8,0x10,0x20,0x40,0xF8,0x00},  // z
-    {0x10,0x20,0x20,0x40,0x20,0x20,0x10,0x00},  // {
-    {0x20,0x20,0x20,0x00,0x20,0x20,0x20,0x00},  // |
-    {0x40,0x20,0x20,0x10,0x20,0x20,0x40,0x00},  // }
-    {0x40,0xA8,0x10,0x00,0x00,0x00,0x00,0x00},  // ~
-    {0x70,0xD8,0xD8,0x70,0x00,0x00,0x00,0x00}   // DEL
+    {0x06, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00}, // columns, rows, bytes per char
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // space
+    {0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x20, 0x00}, // !
+    {0x50, 0x50, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00}, // "
+    {0x50, 0x50, 0xF8, 0x50, 0xF8, 0x50, 0x50, 0x00}, // #
+    {0x20, 0x78, 0xA0, 0x70, 0x28, 0xF0, 0x20, 0x00}, // $
+    {0xC0, 0xC8, 0x10, 0x20, 0x40, 0x98, 0x18, 0x00}, // %
+    {0x40, 0xA0, 0xA0, 0x40, 0xA8, 0x90, 0x68, 0x00}, // &
+    {0x30, 0x30, 0x20, 0x40, 0x00, 0x00, 0x00, 0x00}, // '
+    {0x10, 0x20, 0x40, 0x40, 0x40, 0x20, 0x10, 0x00}, // (
+    {0x40, 0x20, 0x10, 0x10, 0x10, 0x20, 0x40, 0x00}, // )
+    {0x00, 0x20, 0xA8, 0x70, 0x70, 0xA8, 0x20, 0x00}, // *
+    {0x00, 0x20, 0x20, 0xF8, 0x20, 0x20, 0x00, 0x00}, // +
+    {0x00, 0x00, 0x00, 0x00, 0x30, 0x30, 0x20, 0x40}, // ,
+    {0x00, 0x00, 0x00, 0xF8, 0x00, 0x00, 0x00, 0x00}, // -
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x30, 0x00}, // .
+    {0x00, 0x08, 0x10, 0x20, 0x40, 0x80, 0x00, 0x00}, // /
+    {0x70, 0x88, 0x88, 0xA8, 0x88, 0x88, 0x70, 0x00}, // 0
+    {0x20, 0x60, 0x20, 0x20, 0x20, 0x20, 0x70, 0x00}, // 1
+    {0x70, 0x88, 0x08, 0x70, 0x80, 0x80, 0xF8, 0x00}, // 2
+    {0xF8, 0x08, 0x10, 0x30, 0x08, 0x88, 0x70, 0x00}, // 3
+    {0x10, 0x30, 0x50, 0x90, 0xF8, 0x10, 0x10, 0x00}, // 4
+    {0xF8, 0x80, 0xF0, 0x08, 0x08, 0x88, 0x70, 0x00}, // 5
+    {0x38, 0x40, 0x80, 0xF0, 0x88, 0x88, 0x70, 0x00}, // 6
+    {0xF8, 0x08, 0x08, 0x10, 0x20, 0x40, 0x80, 0x00}, // 7
+    {0x70, 0x88, 0x88, 0x70, 0x88, 0x88, 0x70, 0x00}, // 8
+    {0x70, 0x88, 0x88, 0x78, 0x08, 0x10, 0xE0, 0x00}, // 9
+    {0x00, 0x00, 0x20, 0x00, 0x20, 0x00, 0x00, 0x00}, // :
+    {0x00, 0x00, 0x20, 0x00, 0x20, 0x20, 0x40, 0x00}, // ;
+    {0x08, 0x10, 0x20, 0x40, 0x20, 0x10, 0x08, 0x00}, // <
+    {0x00, 0x00, 0xF8, 0x00, 0xF8, 0x00, 0x00, 0x00}, // =
+    {0x40, 0x20, 0x10, 0x08, 0x10, 0x20, 0x40, 0x00}, // >
+    {0x70, 0x88, 0x08, 0x30, 0x20, 0x00, 0x20, 0x00}, // ?
+    {0x70, 0x88, 0xA8, 0xB8, 0xB0, 0x80, 0x78, 0x00}, // @
+    {0x20, 0x50, 0x88, 0x88, 0xF8, 0x88, 0x88, 0x00}, // A
+    {0xF0, 0x88, 0x88, 0xF0, 0x88, 0x88, 0xF0, 0x00}, // B
+    {0x70, 0x88, 0x80, 0x80, 0x80, 0x88, 0x70, 0x00}, // C
+    {0xF0, 0x88, 0x88, 0x88, 0x88, 0x88, 0xF0, 0x00}, // D
+    {0xF8, 0x80, 0x80, 0xF0, 0x80, 0x80, 0xF8, 0x00}, // E
+    {0xF8, 0x80, 0x80, 0xF0, 0x80, 0x80, 0x80, 0x00}, // F
+    {0x78, 0x88, 0x80, 0x80, 0x98, 0x88, 0x78, 0x00}, // G
+    {0x88, 0x88, 0x88, 0xF8, 0x88, 0x88, 0x88, 0x00}, // H
+    {0x70, 0x20, 0x20, 0x20, 0x20, 0x20, 0x70, 0x00}, // I
+    {0x38, 0x10, 0x10, 0x10, 0x10, 0x90, 0x60, 0x00}, // J
+    {0x88, 0x90, 0xA0, 0xC0, 0xA0, 0x90, 0x88, 0x00}, // K
+    {0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xF8, 0x00}, // L
+    {0x88, 0xD8, 0xA8, 0xA8, 0xA8, 0x88, 0x88, 0x00}, // M
+    {0x88, 0x88, 0xC8, 0xA8, 0x98, 0x88, 0x88, 0x00}, // N
+    {0x70, 0x88, 0x88, 0x88, 0x88, 0x88, 0x70, 0x00}, // O
+    {0xF0, 0x88, 0x88, 0xF0, 0x80, 0x80, 0x80, 0x00}, // P
+    {0x70, 0x88, 0x88, 0x88, 0xA8, 0x90, 0x68, 0x00}, // Q
+    {0xF0, 0x88, 0x88, 0xF0, 0xA0, 0x90, 0x88, 0x00}, // R
+    {0x70, 0x88, 0x80, 0x70, 0x08, 0x88, 0x70, 0x00}, // S
+    {0xF8, 0xA8, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00}, // T
+    {0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x70, 0x00}, // U
+    {0x88, 0x88, 0x88, 0x88, 0x88, 0x50, 0x20, 0x00}, // V
+    {0x88, 0x88, 0x88, 0xA8, 0xA8, 0xA8, 0x50, 0x00}, // W
+    {0x88, 0x88, 0x50, 0x20, 0x50, 0x88, 0x88, 0x00}, // X
+    {0x88, 0x88, 0x50, 0x20, 0x20, 0x20, 0x20, 0x00}, // Y
+    {0xF8, 0x08, 0x10, 0x70, 0x40, 0x80, 0xF8, 0x00}, // Z
+    {0x78, 0x40, 0x40, 0x40, 0x40, 0x40, 0x78, 0x00}, // [
+    {0x00, 0x80, 0x40, 0x20, 0x10, 0x08, 0x00, 0x00}, // backslash
+    {0x78, 0x08, 0x08, 0x08, 0x08, 0x08, 0x78, 0x00}, // ]
+    {0x20, 0x50, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00}, // ^
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8, 0x00}, // _
+    {0x60, 0x60, 0x20, 0x10, 0x00, 0x00, 0x00, 0x00}, // `
+    {0x00, 0x00, 0x60, 0x10, 0x70, 0x90, 0x78, 0x00}, // a
+    {0x80, 0x80, 0xB0, 0xC8, 0x88, 0xC8, 0xB0, 0x00}, // b
+    {0x00, 0x00, 0x70, 0x88, 0x80, 0x88, 0x70, 0x00}, // c
+    {0x08, 0x08, 0x68, 0x98, 0x88, 0x98, 0x68, 0x00}, // d
+    {0x00, 0x00, 0x70, 0x88, 0xF8, 0x80, 0x70, 0x00}, // e
+    {0x10, 0x28, 0x20, 0x70, 0x20, 0x20, 0x20, 0x00}, // f
+    {0x00, 0x00, 0x70, 0x98, 0x98, 0x68, 0x08, 0x70}, // g
+    {0x80, 0x80, 0xB0, 0xC8, 0x88, 0x88, 0x88, 0x00}, // h
+    {0x20, 0x00, 0x60, 0x20, 0x20, 0x20, 0x70, 0x00}, // i
+    {0x10, 0x00, 0x10, 0x10, 0x10, 0x90, 0x60, 0x00}, // j
+    {0x80, 0x80, 0x90, 0xA0, 0xC0, 0xA0, 0x90, 0x00}, // k
+    {0x60, 0x20, 0x20, 0x20, 0x20, 0x20, 0x70, 0x00}, // l
+    {0x00, 0x00, 0xD0, 0xA8, 0xA8, 0xA8, 0xA8, 0x00}, // m
+    {0x00, 0x00, 0xB0, 0xC8, 0x88, 0x88, 0x88, 0x00}, // n
+    {0x00, 0x00, 0x70, 0x88, 0x88, 0x88, 0x70, 0x00}, // o
+    {0x00, 0x00, 0xB0, 0xC8, 0xC8, 0xB0, 0x80, 0x80}, // p
+    {0x00, 0x00, 0x68, 0x98, 0x98, 0x68, 0x08, 0x08}, // q
+    {0x00, 0x00, 0xB0, 0xC8, 0x80, 0x80, 0x80, 0x00}, // r
+    {0x00, 0x00, 0x78, 0x80, 0x70, 0x08, 0xF0, 0x00}, // s
+    {0x20, 0x20, 0xF8, 0x20, 0x20, 0x28, 0x10, 0x00}, // t
+    {0x00, 0x00, 0x88, 0x88, 0x88, 0x98, 0x68, 0x00}, // u
+    {0x00, 0x00, 0x88, 0x88, 0x88, 0x50, 0x20, 0x00}, // v
+    {0x00, 0x00, 0x88, 0x88, 0xA8, 0xA8, 0x50, 0x00}, // w
+    {0x00, 0x00, 0x88, 0x50, 0x20, 0x50, 0x88, 0x00}, // x
+    {0x00, 0x00, 0x88, 0x88, 0x78, 0x08, 0x88, 0x70}, // y
+    {0x00, 0x00, 0xF8, 0x10, 0x20, 0x40, 0xF8, 0x00}, // z
+    {0x10, 0x20, 0x20, 0x40, 0x20, 0x20, 0x10, 0x00}, // {
+    {0x20, 0x20, 0x20, 0x00, 0x20, 0x20, 0x20, 0x00}, // |
+    {0x40, 0x20, 0x20, 0x10, 0x20, 0x20, 0x40, 0x00}, // }
+    {0x40, 0xA8, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00}, // ~
+    {0x70, 0xD8, 0xD8, 0x70, 0x00, 0x00, 0x00, 0x00} // DEL
 };
 /*
 const char FONT8x8F[97][8] = {
diff --git a/armsrc/fpgaloader.c b/armsrc/fpgaloader.c
index 2af6fd0ec..76a33bd9e 100644
--- a/armsrc/fpgaloader.c
+++ b/armsrc/fpgaloader.c
@@ -28,7 +28,8 @@ static uint32_t uncompressed_bytes_cnt;
 // Used to write the FPGA config word
 // May also be used to write to other SPI attached devices like an LCD
 //-----------------------------------------------------------------------------
-static void DisableSpi(void) {
+static void DisableSpi(void)
+{
     //* Reset all the Chip Select register
     AT91C_BASE_SPI->SPI_CSR[0] = 0;
     AT91C_BASE_SPI->SPI_CSR[1] = 0;
@@ -45,7 +46,8 @@ static void DisableSpi(void) {
     AT91C_BASE_SPI->SPI_CR = AT91C_SPI_SPIDIS;
 }
 
-void SetupSpi(int mode) {
+void SetupSpi(int mode)
+{
     // PA1  -> SPI_NCS3 chip select (MEM)
     // PA10 -> SPI_NCS2 chip select (LCD)
     // PA11 -> SPI_NCS0 chip select (FPGA)
@@ -70,44 +72,44 @@ void SetupSpi(int mode) {
     switch (mode) {
         case SPI_FPGA_MODE:
             AT91C_BASE_SPI->SPI_MR =
-                ( 0 << 24)          | // Delay between chip selects (take default: 6 MCK periods)
+                (0 << 24)          |  // Delay between chip selects (take default: 6 MCK periods)
                 (0xE << 16)         | // Peripheral Chip Select (selects FPGA SPI_NCS0 or PA11)
-                ( 0 << 7)           | // Local Loopback Disabled
+                (0 << 7)           |  // Local Loopback Disabled
                 AT91C_SPI_MODFDIS   | // Mode Fault Detection disabled
-                ( 0 << 2)           | // Chip selects connected directly to peripheral
+                (0 << 2)           |  // Chip selects connected directly to peripheral
                 AT91C_SPI_PS_FIXED  | // Fixed Peripheral Select
                 AT91C_SPI_MSTR;       // Master Mode
 
             AT91C_BASE_SPI->SPI_CSR[0] =
-                ( 1 << 24)          | // Delay between Consecutive Transfers (32 MCK periods)
-                ( 1 << 16)          | // Delay Before SPCK (1 MCK period)
-                ( 6 << 8)           | // Serial Clock Baud Rate (baudrate = MCK/6 = 24Mhz/6 = 4M baud
+                (1 << 24)          |  // Delay between Consecutive Transfers (32 MCK periods)
+                (1 << 16)          |  // Delay Before SPCK (1 MCK period)
+                (6 << 8)           |  // Serial Clock Baud Rate (baudrate = MCK/6 = 24Mhz/6 = 4M baud
                 AT91C_SPI_BITS_16   | // Bits per Transfer (16 bits)
-                ( 0 << 3)           | // Chip Select inactive after transfer
+                (0 << 3)           |  // Chip Select inactive after transfer
                 AT91C_SPI_NCPHA     | // Clock Phase data captured on leading edge, changes on following edge
-                ( 0 << 0);            // Clock Polarity inactive state is logic 0
+                (0 << 0);             // Clock Polarity inactive state is logic 0
             break;
-/*
-            case SPI_LCD_MODE:
-            AT91C_BASE_SPI->SPI_MR =
-                ( 0 << 24)          | // Delay between chip selects (take default: 6 MCK periods)
-                (0xB << 16)         | // Peripheral Chip Select (selects LCD SPI_NCS2 or PA10)
-                ( 0 << 7)           | // Local Loopback Disabled
-                ( 1 << 4)           | // Mode Fault Detection disabled
-                ( 0 << 2)           | // Chip selects connected directly to peripheral
-                ( 0 << 1)           | // Fixed Peripheral Select
-                ( 1 << 0);            // Master Mode
+        /*
+                    case SPI_LCD_MODE:
+                    AT91C_BASE_SPI->SPI_MR =
+                        ( 0 << 24)          | // Delay between chip selects (take default: 6 MCK periods)
+                        (0xB << 16)         | // Peripheral Chip Select (selects LCD SPI_NCS2 or PA10)
+                        ( 0 << 7)           | // Local Loopback Disabled
+                        ( 1 << 4)           | // Mode Fault Detection disabled
+                        ( 0 << 2)           | // Chip selects connected directly to peripheral
+                        ( 0 << 1)           | // Fixed Peripheral Select
+                        ( 1 << 0);            // Master Mode
 
-            AT91C_BASE_SPI->SPI_CSR[2] =
-                ( 1 << 24)          | // Delay between Consecutive Transfers (32 MCK periods)
-                ( 1 << 16)          | // Delay Before SPCK (1 MCK period)
-                ( 6 << 8)           | // Serial Clock Baud Rate (baudrate = MCK/6 = 24Mhz/6 = 4M baud
-                AT91C_SPI_BITS_9    | // Bits per Transfer (9 bits)
-                ( 0 << 3)           | // Chip Select inactive after transfer
-                ( 1 << 1)           | // Clock Phase data captured on leading edge, changes on following edge
-                ( 0 << 0);            // Clock Polarity inactive state is logic 0
-            break;
-*/
+                    AT91C_BASE_SPI->SPI_CSR[2] =
+                        ( 1 << 24)          | // Delay between Consecutive Transfers (32 MCK periods)
+                        ( 1 << 16)          | // Delay Before SPCK (1 MCK period)
+                        ( 6 << 8)           | // Serial Clock Baud Rate (baudrate = MCK/6 = 24Mhz/6 = 4M baud
+                        AT91C_SPI_BITS_9    | // Bits per Transfer (9 bits)
+                        ( 0 << 3)           | // Chip Select inactive after transfer
+                        ( 1 << 1)           | // Clock Phase data captured on leading edge, changes on following edge
+                        ( 0 << 0);            // Clock Polarity inactive state is logic 0
+                    break;
+        */
         default:
             DisableSpi();
             break;
@@ -118,7 +120,8 @@ void SetupSpi(int mode) {
 // Set up the synchronous serial port, with the one set of options that we
 // always use when we are talking to the FPGA. Both RX and TX are enabled.
 //-----------------------------------------------------------------------------
-void FpgaSetupSsc(void) {
+void FpgaSetupSsc(void)
+{
     // First configure the GPIOs, and get ourselves a clock.
     AT91C_BASE_PIOA->PIO_ASR =
         GPIO_SSC_FRAME  |
@@ -127,7 +130,7 @@ void FpgaSetupSsc(void) {
         GPIO_SSC_CLK;
     AT91C_BASE_PIOA->PIO_PDR = GPIO_SSC_DOUT;
 
-        AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_SSC);
+    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_SSC);
 
     // Now set up the SSC proper, starting from a known state.
     AT91C_BASE_SSC->SSC_CR = AT91C_SSC_SWRST;
@@ -156,7 +159,8 @@ void FpgaSetupSsc(void) {
 // ourselves, not to another buffer). The stuff to manipulate those buffers
 // is in apps.h, because it should be inlined, for speed.
 //-----------------------------------------------------------------------------
-bool FpgaSetupSscDma(uint8_t *buf, int len) {
+bool FpgaSetupSscDma(uint8_t *buf, int len)
+{
     if (buf == NULL) return false;
 
     FpgaDisableSscDma();
@@ -172,7 +176,8 @@ bool FpgaSetupSscDma(uint8_t *buf, int len) {
 // Uncompress (inflate) the FPGA data. Returns one decompressed byte with
 // each call.
 //----------------------------------------------------------------------------
-static int get_from_fpga_combined_stream(z_streamp compressed_fpga_stream, uint8_t *output_buffer) {
+static int get_from_fpga_combined_stream(z_streamp compressed_fpga_stream, uint8_t *output_buffer)
+{
     if (fpga_image_ptr == compressed_fpga_stream->next_out) { // need more data
         compressed_fpga_stream->next_out = output_buffer;
         compressed_fpga_stream->avail_out = OUTPUT_BUFFER_LEN;
@@ -194,8 +199,9 @@ static int get_from_fpga_combined_stream(z_streamp compressed_fpga_stream, uint8
 // are combined into one big file:
 // 288 bytes from FPGA file 1, followed by 288 bytes from FGPA file 2, etc.
 //----------------------------------------------------------------------------
-static int get_from_fpga_stream(int bitstream_version, z_streamp compressed_fpga_stream, uint8_t *output_buffer) {
-    while((uncompressed_bytes_cnt / FPGA_INTERLEAVE_SIZE) % fpga_bitstream_num != (bitstream_version - 1)) {
+static int get_from_fpga_stream(int bitstream_version, z_streamp compressed_fpga_stream, uint8_t *output_buffer)
+{
+    while ((uncompressed_bytes_cnt / FPGA_INTERLEAVE_SIZE) % fpga_bitstream_num != (bitstream_version - 1)) {
         // skip undesired data belonging to other bitstream_versions
         get_from_fpga_combined_stream(compressed_fpga_stream, output_buffer);
     }
@@ -203,19 +209,23 @@ static int get_from_fpga_stream(int bitstream_version, z_streamp compressed_fpga
     return get_from_fpga_combined_stream(compressed_fpga_stream, output_buffer);
 }
 
-static voidpf fpga_inflate_malloc(voidpf opaque, uInt items, uInt size) {
-    return BigBuf_malloc(items*size);
+static voidpf fpga_inflate_malloc(voidpf opaque, uInt items, uInt size)
+{
+    return BigBuf_malloc(items * size);
 }
 
 // free eventually allocated BigBuf memory
-static void fpga_inflate_free(voidpf opaque, voidpf address) {
-    BigBuf_free(); BigBuf_Clear_ext(false);
+static void fpga_inflate_free(voidpf opaque, voidpf address)
+{
+    BigBuf_free();
+    BigBuf_Clear_ext(false);
 }
 
 //----------------------------------------------------------------------------
 // Initialize decompression of the respective (HF or LF) FPGA stream
 //----------------------------------------------------------------------------
-static bool reset_fpga_stream(int bitstream_version, z_streamp compressed_fpga_stream, uint8_t *output_buffer) {
+static bool reset_fpga_stream(int bitstream_version, z_streamp compressed_fpga_stream, uint8_t *output_buffer)
+{
     uint8_t header[FPGA_BITSTREAM_FIXED_HEADER_SIZE];
 
     uncompressed_bytes_cnt = 0;
@@ -242,7 +252,8 @@ static bool reset_fpga_stream(int bitstream_version, z_streamp compressed_fpga_s
     return false;
 }
 
-static void DownloadFPGA_byte( uint8_t w) {
+static void DownloadFPGA_byte(uint8_t w)
+{
 #define SEND_BIT(x) { if(w & (1<<x) ) HIGH(GPIO_FPGA_DIN); else LOW(GPIO_FPGA_DIN); HIGH(GPIO_FPGA_CCLK); LOW(GPIO_FPGA_CCLK); }
     SEND_BIT(7);
     SEND_BIT(6);
@@ -255,7 +266,8 @@ static void DownloadFPGA_byte( uint8_t w) {
 }
 
 // Download the fpga image starting at current stream position with length FpgaImageLen bytes
-static void DownloadFPGA(int bitstream_version, int FpgaImageLen, z_streamp compressed_fpga_stream, uint8_t *output_buffer) {
+static void DownloadFPGA(int bitstream_version, int FpgaImageLen, z_streamp compressed_fpga_stream, uint8_t *output_buffer)
+{
     int i = 0;
 
     AT91C_BASE_PIOA->PIO_OER = GPIO_FPGA_ON;
@@ -296,12 +308,12 @@ static void DownloadFPGA(int bitstream_version, int FpgaImageLen, z_streamp comp
 
     i = 100000;
     // wait for FPGA ready to accept data signal
-    while ((i) && ( !(AT91C_BASE_PIOA->PIO_PDSR & GPIO_FPGA_NINIT ) ) ) {
+    while ((i) && (!(AT91C_BASE_PIOA->PIO_PDSR & GPIO_FPGA_NINIT))) {
         i--;
     }
 
     // crude error indicator, leave both red LEDs on and return
-    if (i==0){
+    if (i == 0) {
         LED_C_ON();
         LED_D_ON();
         return;
@@ -318,12 +330,12 @@ static void DownloadFPGA(int bitstream_version, int FpgaImageLen, z_streamp comp
 
     // continue to clock FPGA until ready signal goes high
     i = 100000;
-    while ( (i--) && ( !(AT91C_BASE_PIOA->PIO_PDSR & GPIO_FPGA_DONE ) ) ) {
+    while ((i--) && (!(AT91C_BASE_PIOA->PIO_PDSR & GPIO_FPGA_DONE))) {
         HIGH(GPIO_FPGA_CCLK);
         LOW(GPIO_FPGA_CCLK);
     }
     // crude error indicator, leave both red LEDs on and return
-    if (i==0){
+    if (i == 0) {
         LED_C_ON();
         LED_D_ON();
         return;
@@ -337,11 +349,12 @@ static void DownloadFPGA(int bitstream_version, int FpgaImageLen, z_streamp comp
  * (big endian), <length> bytes content. Except for section 'e' which has 4 bytes
  * length.
  */
-static int bitparse_find_section(int bitstream_version, char section_name, uint32_t *section_length, z_streamp compressed_fpga_stream, uint8_t *output_buffer) {
+static int bitparse_find_section(int bitstream_version, char section_name, uint32_t *section_length, z_streamp compressed_fpga_stream, uint8_t *output_buffer)
+{
     int result = 0;
-    #define MAX_FPGA_BIT_STREAM_HEADER_SEARCH 100  // maximum number of bytes to search for the requested section
+#define MAX_FPGA_BIT_STREAM_HEADER_SEARCH 100  // maximum number of bytes to search for the requested section
     uint16_t numbytes = 0;
-    while(numbytes < MAX_FPGA_BIT_STREAM_HEADER_SEARCH) {
+    while (numbytes < MAX_FPGA_BIT_STREAM_HEADER_SEARCH) {
         char current_name = get_from_fpga_stream(bitstream_version, compressed_fpga_stream, output_buffer);
         numbytes++;
         uint32_t current_length = 0;
@@ -351,15 +364,15 @@ static int bitparse_find_section(int bitstream_version, char section_name, uint3
         }
         current_length = 0;
         switch (current_name) {
-        case 'e':
-            /* Four byte length field */
-            current_length += get_from_fpga_stream(bitstream_version, compressed_fpga_stream, output_buffer) << 24;
-            current_length += get_from_fpga_stream(bitstream_version, compressed_fpga_stream, output_buffer) << 16;
-            numbytes += 2;
-        default: /* Fall through, two byte length field */
-            current_length += get_from_fpga_stream(bitstream_version, compressed_fpga_stream, output_buffer) << 8;
-            current_length += get_from_fpga_stream(bitstream_version, compressed_fpga_stream, output_buffer) << 0;
-            numbytes += 2;
+            case 'e':
+                /* Four byte length field */
+                current_length += get_from_fpga_stream(bitstream_version, compressed_fpga_stream, output_buffer) << 24;
+                current_length += get_from_fpga_stream(bitstream_version, compressed_fpga_stream, output_buffer) << 16;
+                numbytes += 2;
+            default: /* Fall through, two byte length field */
+                current_length += get_from_fpga_stream(bitstream_version, compressed_fpga_stream, output_buffer) << 8;
+                current_length += get_from_fpga_stream(bitstream_version, compressed_fpga_stream, output_buffer) << 0;
+                numbytes += 2;
         }
 
         if (current_name != 'e' && current_length > 255) {
@@ -386,7 +399,8 @@ static int bitparse_find_section(int bitstream_version, char section_name, uint3
 // Check which FPGA image is currently loaded (if any). If necessary
 // decompress and load the correct (HF or LF) image to the FPGA
 //----------------------------------------------------------------------------
-void FpgaDownloadAndGo(int bitstream_version) {
+void FpgaDownloadAndGo(int bitstream_version)
+{
 
     // check whether or not the bitstream is already loaded
     if (downloaded_bitstream == bitstream_version)
@@ -398,7 +412,8 @@ void FpgaDownloadAndGo(int bitstream_version) {
     bool verbose = (MF_DBGLEVEL > 3);
 
     // make sure that we have enough memory to decompress
-    BigBuf_free(); BigBuf_Clear_ext(verbose);
+    BigBuf_free();
+    BigBuf_Clear_ext(verbose);
 
     if (!reset_fpga_stream(bitstream_version, &compressed_fpga_stream, output_buffer))
         return;
@@ -415,7 +430,8 @@ void FpgaDownloadAndGo(int bitstream_version) {
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 
     // free eventually allocated BigBuf memory
-    BigBuf_free(); BigBuf_Clear_ext(false);
+    BigBuf_free();
+    BigBuf_Clear_ext(false);
 }
 
 //-----------------------------------------------------------------------------
@@ -423,7 +439,8 @@ void FpgaDownloadAndGo(int bitstream_version) {
 // The bit format is:  C3 C2 C1 C0 D11 D10 D9 D8 D7 D6 D5 D4 D3 D2 D1 D0
 // where C is the 4 bit command and D is the 12 bit data
 //-----------------------------------------------------------------------------
-void FpgaSendCommand(uint16_t cmd, uint16_t v) {
+void FpgaSendCommand(uint16_t cmd, uint16_t v)
+{
     SetupSpi(SPI_FPGA_MODE);
     while ((AT91C_BASE_SPI->SPI_SR & AT91C_SPI_TXEMPTY) == 0); // wait for the transfer to complete
     AT91C_BASE_SPI->SPI_TDR = AT91C_SPI_LASTXFER | cmd | v;    // send the data
@@ -434,7 +451,8 @@ void FpgaSendCommand(uint16_t cmd, uint16_t v) {
 // vs. clone vs. etc.). This is now a special case of FpgaSendCommand() to
 // avoid changing this function's occurence everywhere in the source code.
 //-----------------------------------------------------------------------------
-void FpgaWriteConfWord(uint8_t v) {
+void FpgaWriteConfWord(uint8_t v)
+{
     FpgaSendCommand(FPGA_CMD_SET_CONFREG, v);
 }
 
@@ -443,7 +461,8 @@ void FpgaWriteConfWord(uint8_t v) {
 // closable, but should only close one at a time. Not an FPGA thing, but
 // the samples from the ADC always flow through the FPGA.
 //-----------------------------------------------------------------------------
-void SetAdcMuxFor(uint32_t whichGpio) {
+void SetAdcMuxFor(uint32_t whichGpio)
+{
     AT91C_BASE_PIOA->PIO_OER =
         GPIO_MUXSEL_HIPKD |
         GPIO_MUXSEL_LOPKD |
@@ -466,12 +485,14 @@ void SetAdcMuxFor(uint32_t whichGpio) {
     HIGH(whichGpio);
 }
 
-void Fpga_print_status(void) {
+void Fpga_print_status(void)
+{
     Dbprintf("Currently loaded FPGA image");
-    Dbprintf("  mode....................%s", fpga_version_information[downloaded_bitstream-1]);
+    Dbprintf("  mode....................%s", fpga_version_information[downloaded_bitstream - 1]);
 }
 
-int FpgaGetCurrent(void) {
+int FpgaGetCurrent(void)
+{
     return downloaded_bitstream;
 }
 
@@ -479,10 +500,11 @@ int FpgaGetCurrent(void) {
 // log message
 // if HF,  Disable SSC DMA
 // turn off trace and leds off.
-void switch_off(void) {
+void switch_off(void)
+{
     if (MF_DBGLEVEL > 3) Dbprintf("switch_off");
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-    if (downloaded_bitstream == FPGA_BITSTREAM_HF )
+    if (downloaded_bitstream == FPGA_BITSTREAM_HF)
         FpgaDisableSscDma();
     set_tracing(false);
     LEDsoff();
diff --git a/armsrc/hfsnoop.c b/armsrc/hfsnoop.c
index 117e064e8..9400b6b3d 100644
--- a/armsrc/hfsnoop.c
+++ b/armsrc/hfsnoop.c
@@ -11,22 +11,23 @@ static void RAMFUNC optimizedSnoop(void)
     int n = BigBuf_max_traceLen() / sizeof(uint16_t); // take all memory
 
     uint16_t *dest = (uint16_t *)BigBuf_get_addr();
-    uint16_t *destend = dest + n-1;
+    uint16_t *destend = dest + n - 1;
 
     // Reading data loop
-    while(dest <= destend) {
-        if(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
+    while (dest <= destend) {
+        if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
             *dest = (uint16_t)(AT91C_BASE_SSC->SSC_RHR);
             dest++;
         }
     }
     //setting tracelen - important!  it was set by buffer overflow before
-    set_tracelen( BigBuf_max_traceLen());
+    set_tracelen(BigBuf_max_traceLen());
 }
 
 void HfSnoop(int samplesToSkip, int triggersToSkip)
 {
-    BigBuf_free(); BigBuf_Clear();
+    BigBuf_free();
+    BigBuf_Clear();
 
     Dbprintf("Skipping first %d sample pairs, Skipping %d triggers.\n", samplesToSkip, triggersToSkip);
     int trigger_cnt = 0;
@@ -47,7 +48,7 @@ void HfSnoop(int samplesToSkip, int triggersToSkip)
     SpinDelay(100);
 
     uint16_t r = 0;
-    while (!BUTTON_PRESS() && !usb_poll_validate_length() ) {
+    while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
         WDT_HIT();
 
         if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
@@ -55,16 +56,16 @@ void HfSnoop(int samplesToSkip, int triggersToSkip)
             r = MAX(r & 0xff, r >> 8);
             if (r >= 180) {  // 0xB4 ??
                 if (++trigger_cnt > triggersToSkip)
-                break;
+                    break;
             }
         }
     }
 
     if (!BUTTON_PRESS()) {
         int waitcount = samplesToSkip; // lets wait 40000 ticks of pck0
-        while(waitcount != 0) {
+        while (waitcount != 0) {
 
-            if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY))
+            if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY))
                 waitcount--;
         }
         optimizedSnoop();
diff --git a/armsrc/hitag2.c b/armsrc/hitag2.c
index 913ea92ab..4bbc8fc6b 100644
--- a/armsrc/hitag2.c
+++ b/armsrc/hitag2.c
@@ -33,7 +33,7 @@ struct hitag2_tag {
     uint32_t uid;
     enum {
         TAG_STATE_RESET      = 0x01,       // Just powered up, awaiting GetSnr
-        TAG_STATE_ACTIVATING = 0x02 ,      // In activation phase (password mode), sent UID, awaiting reader password
+        TAG_STATE_ACTIVATING = 0x02,       // In activation phase (password mode), sent UID, awaiting reader password
         TAG_STATE_ACTIVATED  = 0x03,       // Activation complete, awaiting read/write commands
         TAG_STATE_WRITING    = 0x04,       // In write command, awaiting sector contents to be written
     } state;
@@ -71,7 +71,7 @@ static enum {
 // ToDo: define a meaningful maximum size for auth_table. The bigger this is, the lower will be the available memory for traces.
 // Historically it used to be FREE_BUFFER_SIZE, which was 2744.
 #define AUTH_TABLE_LENGTH 2744
-static uint8_t* auth_table;
+static uint8_t *auth_table;
 static size_t auth_table_pos = 0;
 static size_t auth_table_len = AUTH_TABLE_LENGTH;
 
@@ -108,44 +108,43 @@ static const u32 ht2_f4a = 0x2C79;     // 0010 1100 0111 1001
 static const u32 ht2_f4b = 0x6671;     // 0110 0110 0111 0001
 static const u32 ht2_f5c = 0x7907287B; // 0111 1001 0000 0111 0010 1000 0111 1011
 
-static u32 _f20 (const u64 x)
+static u32 _f20(const u64 x)
 {
     u32 i5;
 
-    i5 = ((ht2_f4a >> i4 (x, 1, 2, 4, 5)) & 1)* 1
-       + ((ht2_f4b >> i4 (x, 7,11,13,14)) & 1)* 2
-       + ((ht2_f4b >> i4 (x,16,20,22,25)) & 1)* 4
-       + ((ht2_f4b >> i4 (x,27,28,30,32)) & 1)* 8
-       + ((ht2_f4a >> i4 (x,33,42,43,45)) & 1)*16;
+    i5 = ((ht2_f4a >> i4(x, 1, 2, 4, 5)) & 1) * 1
+         + ((ht2_f4b >> i4(x, 7, 11, 13, 14)) & 1) * 2
+         + ((ht2_f4b >> i4(x, 16, 20, 22, 25)) & 1) * 4
+         + ((ht2_f4b >> i4(x, 27, 28, 30, 32)) & 1) * 8
+         + ((ht2_f4a >> i4(x, 33, 42, 43, 45)) & 1) * 16;
 
     return (ht2_f5c >> i5) & 1;
 }
 
-static u64 _hitag2_init (const u64 key, const u32 serial, const u32 IV)
+static u64 _hitag2_init(const u64 key, const u32 serial, const u32 IV)
 {
     u32 i;
     u64 x = ((key & 0xFFFF) << 32) + serial;
 
-    for (i = 0; i < 32; i++)
-    {
+    for (i = 0; i < 32; i++) {
         x >>= 1;
-        x += (u64) (_f20 (x) ^ (((IV >> i) ^ (key >> (i+16))) & 1)) << 47;
+        x += (u64)(_f20(x) ^ (((IV >> i) ^ (key >> (i + 16))) & 1)) << 47;
     }
     return x;
 }
 
-static u64 _hitag2_round (u64 *state)
+static u64 _hitag2_round(u64 *state)
 {
     u64 x = *state;
 
     x = (x >>  1) +
-     ((((x >>  0) ^ (x >>  2) ^ (x >>  3) ^ (x >>  6)
-      ^ (x >>  7) ^ (x >>  8) ^ (x >> 16) ^ (x >> 22)
-      ^ (x >> 23) ^ (x >> 26) ^ (x >> 30) ^ (x >> 41)
-      ^ (x >> 42) ^ (x >> 43) ^ (x >> 46) ^ (x >> 47)) & 1) << 47);
+        ((((x >>  0) ^ (x >>  2) ^ (x >>  3) ^ (x >>  6)
+           ^ (x >>  7) ^ (x >>  8) ^ (x >> 16) ^ (x >> 22)
+           ^ (x >> 23) ^ (x >> 26) ^ (x >> 30) ^ (x >> 41)
+           ^ (x >> 42) ^ (x >> 43) ^ (x >> 46) ^ (x >> 47)) & 1) << 47);
 
     *state = x;
-    return _f20 (x);
+    return _f20(x);
 }
 
 // "MIKRON"             =  O  N  M  I  K  R
@@ -158,45 +157,47 @@ static u64 _hitag2_round (u64 *state)
 // The inverse of the first 4 bytes is sent to the tag to authenticate.
 // The rest is encrypted by XORing it with the subsequent keystream.
 
-static u32 _hitag2_byte (u64 * x)
+static u32 _hitag2_byte(u64 *x)
 {
     u32 i, c;
 
-    for (i = 0, c = 0; i < 8; i++) c += (u32) _hitag2_round (x) << (i^7);
+    for (i = 0, c = 0; i < 8; i++) c += (u32) _hitag2_round(x) << (i ^ 7);
     return c;
 }
 
-static int hitag2_reset(void) {
+static int hitag2_reset(void)
+{
     tag.state = TAG_STATE_RESET;
     tag.crypto_active = 0;
     return 0;
 }
 
-static int hitag2_init(void) {
+static int hitag2_init(void)
+{
     hitag2_reset();
     return 0;
 }
 
 static void hitag2_cipher_reset(struct hitag2_tag *tag, const uint8_t *iv)
 {
-    uint64_t key =  ((uint64_t)tag->sectors[2][2]) |
-                  ((uint64_t)tag->sectors[2][3] << 8) |
-                  ((uint64_t)tag->sectors[1][0] << 16) |
-                  ((uint64_t)tag->sectors[1][1] << 24) |
-                  ((uint64_t)tag->sectors[1][2] << 32) |
-                  ((uint64_t)tag->sectors[1][3] << 40);
-    uint32_t uid =  ((uint32_t)tag->sectors[0][0]) |
-                  ((uint32_t)tag->sectors[0][1] << 8) |
-                  ((uint32_t)tag->sectors[0][2] << 16) |
-                  ((uint32_t)tag->sectors[0][3] << 24);
+    uint64_t key = ((uint64_t)tag->sectors[2][2]) |
+                   ((uint64_t)tag->sectors[2][3] << 8) |
+                   ((uint64_t)tag->sectors[1][0] << 16) |
+                   ((uint64_t)tag->sectors[1][1] << 24) |
+                   ((uint64_t)tag->sectors[1][2] << 32) |
+                   ((uint64_t)tag->sectors[1][3] << 40);
+    uint32_t uid = ((uint32_t)tag->sectors[0][0]) |
+                   ((uint32_t)tag->sectors[0][1] << 8) |
+                   ((uint32_t)tag->sectors[0][2] << 16) |
+                   ((uint32_t)tag->sectors[0][3] << 24);
     uint32_t iv_ = (((uint32_t)(iv[0]))) |
-            (((uint32_t)(iv[1])) << 8) |
-            (((uint32_t)(iv[2])) << 16) |
-            (((uint32_t)(iv[3])) << 24);
+                   (((uint32_t)(iv[1])) << 8) |
+                   (((uint32_t)(iv[2])) << 16) |
+                   (((uint32_t)(iv[3])) << 24);
     tag->cs = _hitag2_init(rev64(key), rev32(uid), rev32(iv_));
 }
 
-static int hitag2_cipher_authenticate(uint64_t* cs, const uint8_t *authenticator_is)
+static int hitag2_cipher_authenticate(uint64_t *cs, const uint8_t *authenticator_is)
 {
     uint8_t authenticator_should[4];
     authenticator_should[0] = ~_hitag2_byte(cs);
@@ -206,11 +207,11 @@ static int hitag2_cipher_authenticate(uint64_t* cs, const uint8_t *authenticator
     return (memcmp(authenticator_should, authenticator_is, 4) == 0);
 }
 
-static int hitag2_cipher_transcrypt(uint64_t* cs, uint8_t *data, unsigned int bytes, unsigned int bits)
+static int hitag2_cipher_transcrypt(uint64_t *cs, uint8_t *data, unsigned int bytes, unsigned int bits)
 {
     int i;
-    for(i=0; i<bytes; i++) data[i] ^= _hitag2_byte(cs);
-    for(i=0; i<bits; i++) data[bytes] ^= _hitag2_round(cs) << (7-i);
+    for (i = 0; i < bytes; i++) data[i] ^= _hitag2_byte(cs);
+    for (i = 0; i < bits; i++) data[bytes] ^= _hitag2_round(cs) << (7 - i);
     return 0;
 }
 
@@ -249,38 +250,39 @@ static int hitag2_cipher_transcrypt(uint64_t* cs, uint8_t *data, unsigned int by
 #define HITAG_T_TAG_CAPTURE_FOUR_HALF   57
 
 
-static void hitag_send_bit(int bit) {
+static void hitag_send_bit(int bit)
+{
     LED_A_ON();
     // Reset clock for the next bit
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;
 
     // Fixed modulation, earlier proxmark version used inverted signal
-    if(bit == 0) {
+    if (bit == 0) {
         // Manchester: Unloaded, then loaded |__--|
         LOW(GPIO_SSC_DOUT);
-        while(AT91C_BASE_TC0->TC_CV < T0*HITAG_T_TAG_HALF_PERIOD);
+        while (AT91C_BASE_TC0->TC_CV < T0 * HITAG_T_TAG_HALF_PERIOD);
         HIGH(GPIO_SSC_DOUT);
-        while(AT91C_BASE_TC0->TC_CV < T0*HITAG_T_TAG_FULL_PERIOD);
+        while (AT91C_BASE_TC0->TC_CV < T0 * HITAG_T_TAG_FULL_PERIOD);
     } else {
         // Manchester: Loaded, then unloaded |--__|
         HIGH(GPIO_SSC_DOUT);
-        while(AT91C_BASE_TC0->TC_CV < T0*HITAG_T_TAG_HALF_PERIOD);
+        while (AT91C_BASE_TC0->TC_CV < T0 * HITAG_T_TAG_HALF_PERIOD);
         LOW(GPIO_SSC_DOUT);
-        while(AT91C_BASE_TC0->TC_CV < T0*HITAG_T_TAG_FULL_PERIOD);
+        while (AT91C_BASE_TC0->TC_CV < T0 * HITAG_T_TAG_FULL_PERIOD);
     }
     LED_A_OFF();
 }
 
-static void hitag_send_frame(const uint8_t* frame, size_t frame_len)
+static void hitag_send_frame(const uint8_t *frame, size_t frame_len)
 {
     // Send start of frame
-    for(size_t i=0; i<5; i++) {
+    for (size_t i = 0; i < 5; i++) {
         hitag_send_bit(1);
     }
 
     // Send the content of the frame
-    for(size_t i=0; i<frame_len; i++) {
-        hitag_send_bit((frame[i/8] >> (7-(i%8)))&1);
+    for (size_t i = 0; i < frame_len; i++) {
+        hitag_send_bit((frame[i / 8] >> (7 - (i % 8))) & 1);
     }
 
     // Drop the modulation
@@ -288,15 +290,15 @@ static void hitag_send_frame(const uint8_t* frame, size_t frame_len)
 }
 
 
-static void hitag2_handle_reader_command(uint8_t* rx, const size_t rxlen, uint8_t* tx, size_t* txlen)
+static void hitag2_handle_reader_command(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t *txlen)
 {
     uint8_t rx_air[HITAG_FRAME_LEN];
 
     // Copy the (original) received frame how it is send over the air
-    memcpy(rx_air,rx,nbytes(rxlen));
+    memcpy(rx_air, rx, nbytes(rxlen));
 
-    if(tag.crypto_active) {
-        hitag2_cipher_transcrypt(&(tag.cs),rx,rxlen/8,rxlen%8);
+    if (tag.crypto_active) {
+        hitag2_cipher_transcrypt(&(tag.cs), rx, rxlen / 8, rxlen % 8);
     }
 
     // Reset the transmission frame length
@@ -307,21 +309,21 @@ static void hitag2_handle_reader_command(uint8_t* rx, const size_t rxlen, uint8_
         // Received 11000 from the reader, request for UID, send UID
         case 05: {
             // Always send over the air in the clear plaintext mode
-            if(rx_air[0] != 0xC0) {
+            if (rx_air[0] != 0xC0) {
                 // Unknown frame ?
                 return;
             }
             *txlen = 32;
-            memcpy(tx,tag.sectors[0],4);
+            memcpy(tx, tag.sectors[0], 4);
             tag.crypto_active = 0;
         }
         break;
 
         // Read/Write command: ..xx x..y  yy with yyy == ~xxx, xxx is sector number
         case 10: {
-            unsigned int sector = (~( ((rx[0]<<2)&0x04) | ((rx[1]>>6)&0x03) ) & 0x07);
+            unsigned int sector = (~(((rx[0] << 2) & 0x04) | ((rx[1] >> 6) & 0x03)) & 0x07);
             // Verify complement of sector index
-            if(sector != ((rx[0]>>3)&0x07)) {
+            if (sector != ((rx[0] >> 3) & 0x07)) {
                 //DbpString("Transmission error (read/write)");
                 return;
             }
@@ -329,51 +331,51 @@ static void hitag2_handle_reader_command(uint8_t* rx, const size_t rxlen, uint8_
             switch (rx[0] & 0xC6) {
                 // Read command: 11xx x00y
                 case 0xC0:
-                    memcpy(tx,tag.sectors[sector],4);
+                    memcpy(tx, tag.sectors[sector], 4);
                     *txlen = 32;
-                break;
+                    break;
 
-                 // Inverted Read command: 01xx x10y
+                // Inverted Read command: 01xx x10y
                 case 0x44:
-                    for (size_t i=0; i<4; i++) {
+                    for (size_t i = 0; i < 4; i++) {
                         tx[i] = tag.sectors[sector][i] ^ 0xff;
                     }
                     *txlen = 32;
-                break;
+                    break;
 
                 // Write command: 10xx x01y
                 case 0x82:
                     // Prepare write, acknowledge by repeating command
-                    memcpy(tx,rx,nbytes(rxlen));
+                    memcpy(tx, rx, nbytes(rxlen));
                     *txlen = rxlen;
                     tag.active_sector = sector;
-                    tag.state=TAG_STATE_WRITING;
-                break;
+                    tag.state = TAG_STATE_WRITING;
+                    break;
 
                 // Unknown command
                 default:
-                    Dbprintf("Unknown command: %02x %02x",rx[0],rx[1]);
+                    Dbprintf("Unknown command: %02x %02x", rx[0], rx[1]);
                     return;
-                break;
+                    break;
             }
         }
         break;
 
         // Writing data or Reader password
         case 32: {
-            if(tag.state == TAG_STATE_WRITING) {
+            if (tag.state == TAG_STATE_WRITING) {
                 // These are the sector contents to be written. We don't have to do anything else.
-                memcpy(tag.sectors[tag.active_sector],rx,nbytes(rxlen));
-                tag.state=TAG_STATE_RESET;
+                memcpy(tag.sectors[tag.active_sector], rx, nbytes(rxlen));
+                tag.state = TAG_STATE_RESET;
                 return;
             } else {
                 // Received RWD password, respond with configuration and our password
-                if(memcmp(rx,tag.sectors[1],4) != 0) {
+                if (memcmp(rx, tag.sectors[1], 4) != 0) {
                     DbpString("Reader password is wrong");
                     return;
                 }
                 *txlen = 32;
-                memcpy(tx,tag.sectors[3],4);
+                memcpy(tx, tag.sectors[3], 4);
             }
         }
         break;
@@ -381,17 +383,17 @@ static void hitag2_handle_reader_command(uint8_t* rx, const size_t rxlen, uint8_
         // Received RWD authentication challenge and respnse
         case 64: {
             // Store the authentication attempt
-            if (auth_table_len < (AUTH_TABLE_LENGTH-8)) {
-                memcpy(auth_table+auth_table_len,rx,8);
+            if (auth_table_len < (AUTH_TABLE_LENGTH - 8)) {
+                memcpy(auth_table + auth_table_len, rx, 8);
                 auth_table_len += 8;
             }
 
             // Reset the cipher state
-            hitag2_cipher_reset(&tag,rx);
+            hitag2_cipher_reset(&tag, rx);
             // Check if the authentication was correct
-            if(!hitag2_cipher_authenticate(&(tag.cs),rx+4)) {
+            if (!hitag2_cipher_authenticate(&(tag.cs), rx + 4)) {
                 // The reader failed to authenticate, do nothing
-                Dbprintf("auth: %02x%02x%02x%02x%02x%02x%02x%02x Failed!",rx[0],rx[1],rx[2],rx[3],rx[4],rx[5],rx[6],rx[7]);
+                Dbprintf("auth: %02x%02x%02x%02x%02x%02x%02x%02x Failed!", rx[0], rx[1], rx[2], rx[3], rx[4], rx[5], rx[6], rx[7]);
                 return;
             }
             // Succesful, but commented out reporting back to the Host, this may delay to much.
@@ -401,7 +403,7 @@ static void hitag2_handle_reader_command(uint8_t* rx, const size_t rxlen, uint8_
             tag.crypto_active = 1;
 
             // Use the tag password as response
-            memcpy(tx,tag.sectors[3],4);
+            memcpy(tx, tag.sectors[3], 4);
             *txlen = 32;
         }
         break;
@@ -410,12 +412,13 @@ static void hitag2_handle_reader_command(uint8_t* rx, const size_t rxlen, uint8_
 // LogTraceHitag(rx,rxlen,0,0,false);
 // LogTraceHitag(tx,*txlen,0,0,true);
 
-    if(tag.crypto_active) {
-        hitag2_cipher_transcrypt(&(tag.cs), tx, *txlen/8, *txlen%8);
+    if (tag.crypto_active) {
+        hitag2_cipher_transcrypt(&(tag.cs), tx, *txlen / 8, *txlen % 8);
     }
 }
 
-static void hitag_reader_send_bit(int bit) {
+static void hitag_reader_send_bit(int bit)
+{
     LED_A_ON();
     // Reset clock for the next bit
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;
@@ -427,43 +430,44 @@ static void hitag_reader_send_bit(int bit) {
     HIGH(GPIO_SSC_DOUT);
 
     // Wait for 4-10 times the carrier period
-    while(AT91C_BASE_TC0->TC_CV < T0*6);
+    while (AT91C_BASE_TC0->TC_CV < T0 * 6);
     // SpinDelayUs(8*8);
 
     // Disable modulation, just activates the field again
     LOW(GPIO_SSC_DOUT);
 
-    if(bit == 0) {
+    if (bit == 0) {
         // Zero bit: |_-|
-        while (AT91C_BASE_TC0->TC_CV < T0*22) {};
+        while (AT91C_BASE_TC0->TC_CV < T0 * 22) {};
 
     } else {
         // One bit: |_--|
-        while (AT91C_BASE_TC0->TC_CV < T0*28) {};
+        while (AT91C_BASE_TC0->TC_CV < T0 * 28) {};
     }
     LED_A_OFF();
 }
 
 
-static void hitag_reader_send_frame(const uint8_t* frame, size_t frame_len)
+static void hitag_reader_send_frame(const uint8_t *frame, size_t frame_len)
 {
     // Send the content of the frame
-    for(size_t i=0; i<frame_len; i++) {
-        hitag_reader_send_bit((frame[i/8] >> (7-(i%8)))&1);
+    for (size_t i = 0; i < frame_len; i++) {
+        hitag_reader_send_bit((frame[i / 8] >> (7 - (i % 8))) & 1);
     }
     // Send EOF
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;
     // Enable modulation, which means, drop the field
     HIGH(GPIO_SSC_DOUT);
     // Wait for 4-10 times the carrier period
-    while(AT91C_BASE_TC0->TC_CV < T0*6);
+    while (AT91C_BASE_TC0->TC_CV < T0 * 6);
     // Disable modulation, just activates the field again
     LOW(GPIO_SSC_DOUT);
 }
 
 size_t blocknr;
 
-static bool hitag2_password(uint8_t* rx, const size_t rxlen, uint8_t* tx, size_t* txlen) {
+static bool hitag2_password(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t *txlen)
+{
     // Reset the transmission frame length
     *txlen = 0;
 
@@ -477,24 +481,25 @@ static bool hitag2_password(uint8_t* rx, const size_t rxlen, uint8_t* tx, size_t
                 return false;
             }
             *txlen = 5;
-            memcpy(tx,"\xc0",nbytes(*txlen));
-        } break;
+            memcpy(tx, "\xc0", nbytes(*txlen));
+        }
+        break;
 
         // Received UID, tag password
         case 32: {
             if (!bPwd) {
                 *txlen = 32;
-                memcpy(tx,password,4);
+                memcpy(tx, password, 4);
                 bPwd = true;
-                memcpy(tag.sectors[blocknr],rx,4);
+                memcpy(tag.sectors[blocknr], rx, 4);
                 blocknr++;
             } else {
 
-                if(blocknr == 1){
+                if (blocknr == 1) {
                     //store password in block1, the TAG answers with Block3, but we need the password in memory
-                    memcpy(tag.sectors[blocknr],tx,4);
+                    memcpy(tag.sectors[blocknr], tx, 4);
                 } else {
-                    memcpy(tag.sectors[blocknr],rx,4);
+                    memcpy(tag.sectors[blocknr], rx, 4);
                 }
 
                 blocknr++;
@@ -504,68 +509,71 @@ static bool hitag2_password(uint8_t* rx, const size_t rxlen, uint8_t* tx, size_t
                     return false;
                 }
                 *txlen = 10;
-                tx[0] = 0xc0 | (blocknr << 3) | ((blocknr^7) >> 2);
-                tx[1] = ((blocknr^7) << 6);
+                tx[0] = 0xc0 | (blocknr << 3) | ((blocknr ^ 7) >> 2);
+                tx[1] = ((blocknr ^ 7) << 6);
             }
-        } break;
+        }
+        break;
 
         // Unexpected response
-    default: {
-            Dbprintf("Uknown frame length: %d",rxlen);
+        default: {
+            Dbprintf("Uknown frame length: %d", rxlen);
             return false;
-        } break;
+        }
+        break;
     }
     return true;
 }
 
-static bool hitag2_write_page(uint8_t* rx, const size_t rxlen, uint8_t* tx, size_t* txlen)
+static bool hitag2_write_page(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t *txlen)
 {
     switch (writestate) {
-    case WRITE_STATE_START:
-        *txlen = 10;
-        tx[0] = 0x82 | (blocknr << 3) | ((blocknr^7) >> 2);
-        tx[1] = ((blocknr^7) << 6);
-        writestate = WRITE_STATE_PAGENUM_WRITTEN;
-        break;
-    case WRITE_STATE_PAGENUM_WRITTEN:
-        // Check if page number was received correctly
-        if ((rxlen == 10) &&
-            (rx[0] == (0x82 | (blocknr << 3) | ((blocknr^7) >> 2))) &&
-            (rx[1] == (((blocknr & 0x3) ^ 0x3) << 6))) {
-            *txlen = 32;
-            memset(tx, 0, HITAG_FRAME_LEN);
-            memcpy(tx, writedata, 4);
-            writestate = WRITE_STATE_PROG;
-        } else {
-            Dbprintf("hitag2_write_page: Page number was not received correctly: rxlen=%d rx=%02x%02x%02x%02x",
-                 rxlen, rx[0], rx[1], rx[2], rx[3]);
+        case WRITE_STATE_START:
+            *txlen = 10;
+            tx[0] = 0x82 | (blocknr << 3) | ((blocknr ^ 7) >> 2);
+            tx[1] = ((blocknr ^ 7) << 6);
+            writestate = WRITE_STATE_PAGENUM_WRITTEN;
+            break;
+        case WRITE_STATE_PAGENUM_WRITTEN:
+            // Check if page number was received correctly
+            if ((rxlen == 10) &&
+                (rx[0] == (0x82 | (blocknr << 3) | ((blocknr ^ 7) >> 2))) &&
+                (rx[1] == (((blocknr & 0x3) ^ 0x3) << 6))) {
+                *txlen = 32;
+                memset(tx, 0, HITAG_FRAME_LEN);
+                memcpy(tx, writedata, 4);
+                writestate = WRITE_STATE_PROG;
+            } else {
+                Dbprintf("hitag2_write_page: Page number was not received correctly: rxlen=%d rx=%02x%02x%02x%02x",
+                         rxlen, rx[0], rx[1], rx[2], rx[3]);
+                bSuccessful = false;
+                return false;
+            }
+            break;
+        case WRITE_STATE_PROG:
+            if (rxlen == 0) {
+                bSuccessful = true;
+            } else {
+                bSuccessful = false;
+                Dbprintf("hitag2_write_page: unexpected rx data (%d) after page write", rxlen);
+            }
+            return false;
+        default:
+            DbpString("hitag2_write_page: Unknown state %d");
             bSuccessful = false;
             return false;
-        }
-        break;
-    case WRITE_STATE_PROG:
-        if (rxlen == 0) {
-            bSuccessful = true;
-        } else {
-            bSuccessful = false;
-            Dbprintf("hitag2_write_page: unexpected rx data (%d) after page write", rxlen);
-        }
-        return false;
-    default:
-        DbpString("hitag2_write_page: Unknown state %d");
-        bSuccessful = false;
-        return false;
     }
 
     return true;
 }
 
-static bool hitag2_crypto(uint8_t* rx, const size_t rxlen, uint8_t* tx, size_t* txlen, bool write) {
+static bool hitag2_crypto(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t *txlen, bool write)
+{
     // Reset the transmission frame length
     *txlen = 0;
 
-  if(bCrypto) {
-        hitag2_cipher_transcrypt(&cipher_state,rx,rxlen/8,rxlen%8);
+    if (bCrypto) {
+        hitag2_cipher_transcrypt(&cipher_state, rx, rxlen / 8, rxlen % 8);
     }
 
     if (bCrypto && !bAuthenticating && write) {
@@ -574,92 +582,94 @@ static bool hitag2_crypto(uint8_t* rx, const size_t rxlen, uint8_t* tx, size_t*
         }
     } else {
 
-    // Try to find out which command was send by selecting on length (in bits)
-    switch (rxlen) {
-      // No answer, try to resurrect
-        case 0: {
-            // Stop if there is no answer while we are in crypto mode (after sending NrAr)
-            if (bCrypto) {
-        // Failed during authentication
-        if (bAuthenticating) {
-          DbpString("Authentication failed!");
-          return false;
-        } else {
-          // Failed reading a block, could be (read/write) locked, skip block and re-authenticate
-          if (blocknr == 1) {
-            // Write the low part of the key in memory
-            memcpy(tag.sectors[1],key+2,4);
-          } else if (blocknr == 2) {
-            // Write the high part of the key in memory
-            tag.sectors[2][0] = 0x00;
-            tag.sectors[2][1] = 0x00;
-            tag.sectors[2][2] = key[0];
-            tag.sectors[2][3] = key[1];
-          } else {
-            // Just put zero's in the memory (of the unreadable block)
-            memset(tag.sectors[blocknr],0x00,4);
-          }
-          blocknr++;
-          bCrypto = false;
-        }
-            } else {
-                *txlen = 5;
-                memcpy(tx,"\xc0",nbytes(*txlen));
-            }
-    break;
-    }
-      // Received UID, crypto tag answer
-        case 32: {
-            if (!bCrypto) {
-        uint64_t ui64key = key[0] | ((uint64_t)key[1]) << 8 | ((uint64_t)key[2]) << 16 | ((uint64_t)key[3]) << 24 | ((uint64_t)key[4]) << 32 | ((uint64_t)key[5]) << 40;
-        uint32_t ui32uid = rx[0] | ((uint32_t)rx[1]) << 8 | ((uint32_t)rx[2]) << 16 | ((uint32_t)rx[3]) << 24;
-            Dbprintf("hitag2_crypto: key=0x%x%x uid=0x%x", (uint32_t) ((rev64(ui64key)) >> 32), (uint32_t) ((rev64(ui64key)) & 0xffffffff), rev32(ui32uid));
-        cipher_state = _hitag2_init(rev64(ui64key), rev32(ui32uid), 0);
-        memset(tx,0x00,4);
-        memset(tx+4,0xff,4);
-        hitag2_cipher_transcrypt(&cipher_state,tx+4,4,0);
-                *txlen = 64;
-                bCrypto = true;
-                bAuthenticating = true;
-            } else {
-        // Check if we received answer tag (at)
-        if (bAuthenticating) {
-            bAuthenticating = false;
-                if (write) {
-                    if (!hitag2_write_page(rx, rxlen, tx, txlen)) {
+        // Try to find out which command was send by selecting on length (in bits)
+        switch (rxlen) {
+            // No answer, try to resurrect
+            case 0: {
+                // Stop if there is no answer while we are in crypto mode (after sending NrAr)
+                if (bCrypto) {
+                    // Failed during authentication
+                    if (bAuthenticating) {
+                        DbpString("Authentication failed!");
                         return false;
+                    } else {
+                        // Failed reading a block, could be (read/write) locked, skip block and re-authenticate
+                        if (blocknr == 1) {
+                            // Write the low part of the key in memory
+                            memcpy(tag.sectors[1], key + 2, 4);
+                        } else if (blocknr == 2) {
+                            // Write the high part of the key in memory
+                            tag.sectors[2][0] = 0x00;
+                            tag.sectors[2][1] = 0x00;
+                            tag.sectors[2][2] = key[0];
+                            tag.sectors[2][3] = key[1];
+                        } else {
+                            // Just put zero's in the memory (of the unreadable block)
+                            memset(tag.sectors[blocknr], 0x00, 4);
+                        }
+                        blocknr++;
+                        bCrypto = false;
                     }
-                    break;
+                } else {
+                    *txlen = 5;
+                    memcpy(tx, "\xc0", nbytes(*txlen));
                 }
-        } else {
-            // Store the received block
-            memcpy(tag.sectors[blocknr],rx,4);
-            blocknr++;
-        }
-        if (blocknr > 7) {
-            DbpString("Read succesful!");
-            bSuccessful = true;
-            return false;
-            } else {
-        *txlen = 10;
-        tx[0] = 0xc0 | (blocknr << 3) | ((blocknr^7) >> 2);
-        tx[1] = ((blocknr^7) << 6);
+                break;
             }
+            // Received UID, crypto tag answer
+            case 32: {
+                if (!bCrypto) {
+                    uint64_t ui64key = key[0] | ((uint64_t)key[1]) << 8 | ((uint64_t)key[2]) << 16 | ((uint64_t)key[3]) << 24 | ((uint64_t)key[4]) << 32 | ((uint64_t)key[5]) << 40;
+                    uint32_t ui32uid = rx[0] | ((uint32_t)rx[1]) << 8 | ((uint32_t)rx[2]) << 16 | ((uint32_t)rx[3]) << 24;
+                    Dbprintf("hitag2_crypto: key=0x%x%x uid=0x%x", (uint32_t)((rev64(ui64key)) >> 32), (uint32_t)((rev64(ui64key)) & 0xffffffff), rev32(ui32uid));
+                    cipher_state = _hitag2_init(rev64(ui64key), rev32(ui32uid), 0);
+                    memset(tx, 0x00, 4);
+                    memset(tx + 4, 0xff, 4);
+                    hitag2_cipher_transcrypt(&cipher_state, tx + 4, 4, 0);
+                    *txlen = 64;
+                    bCrypto = true;
+                    bAuthenticating = true;
+                } else {
+                    // Check if we received answer tag (at)
+                    if (bAuthenticating) {
+                        bAuthenticating = false;
+                        if (write) {
+                            if (!hitag2_write_page(rx, rxlen, tx, txlen)) {
+                                return false;
+                            }
+                            break;
+                        }
+                    } else {
+                        // Store the received block
+                        memcpy(tag.sectors[blocknr], rx, 4);
+                        blocknr++;
+                    }
+                    if (blocknr > 7) {
+                        DbpString("Read succesful!");
+                        bSuccessful = true;
+                        return false;
+                    } else {
+                        *txlen = 10;
+                        tx[0] = 0xc0 | (blocknr << 3) | ((blocknr ^ 7) >> 2);
+                        tx[1] = ((blocknr ^ 7) << 6);
+                    }
+                }
+            }
+            break;
+
+            // Unexpected response
+            default: {
+                Dbprintf("Uknown frame length: %d", rxlen);
+                return false;
+            }
+            break;
         }
-        } break;
-
-      // Unexpected response
-        default: {
-            Dbprintf("Uknown frame length: %d",rxlen);
-            return false;
-        } break;
-    }
     }
 
-    if(bCrypto) {
+    if (bCrypto) {
         // We have to return now to avoid double encryption
         if (!bAuthenticating) {
-          hitag2_cipher_transcrypt(&cipher_state, tx, *txlen/8, *txlen%8);
+            hitag2_cipher_transcrypt(&cipher_state, tx, *txlen / 8, *txlen % 8);
         }
     }
 
@@ -667,7 +677,8 @@ static bool hitag2_crypto(uint8_t* rx, const size_t rxlen, uint8_t* tx, size_t*
 }
 
 
-static bool hitag2_authenticate(uint8_t* rx, const size_t rxlen, uint8_t* tx, size_t* txlen) {
+static bool hitag2_authenticate(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t *txlen)
+{
     // Reset the transmission frame length
     *txlen = 0;
 
@@ -681,8 +692,9 @@ static bool hitag2_authenticate(uint8_t* rx, const size_t rxlen, uint8_t* tx, si
                 return false;
             }
             *txlen = 5;
-            memcpy(tx,"\xc0", nbytes(*txlen));
-        } break;
+            memcpy(tx, "\xc0", nbytes(*txlen));
+        }
+        break;
 
         // Received UID, crypto tag answer
         case 32: {
@@ -694,34 +706,37 @@ static bool hitag2_authenticate(uint8_t* rx, const size_t rxlen, uint8_t* tx, si
                 DbpString("Authentication succesful!");
                 return true;
             }
-        } break;
+        }
+        break;
 
         // Unexpected response
         default: {
             Dbprintf("Uknown frame length: %d", rxlen);
             return false;
-        } break;
+        }
+        break;
     }
 
     return true;
 }
 
 
-static bool hitag2_test_auth_attempts(uint8_t* rx, const size_t rxlen, uint8_t* tx, size_t* txlen) {
+static bool hitag2_test_auth_attempts(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t *txlen)
+{
 
     // Reset the transmission frame length
     *txlen = 0;
 
     // Try to find out which command was send by selecting on length (in bits)
     switch (rxlen) {
-            // No answer, try to resurrect
+        // No answer, try to resurrect
         case 0: {
             // Stop if there is no answer while we are in crypto mode (after sending NrAr)
             if (bCrypto) {
-                Dbprintf("auth: %02x%02x%02x%02x%02x%02x%02x%02x Failed, removed entry!",NrAr[0],NrAr[1],NrAr[2],NrAr[3],NrAr[4],NrAr[5],NrAr[6],NrAr[7]);
+                Dbprintf("auth: %02x%02x%02x%02x%02x%02x%02x%02x Failed, removed entry!", NrAr[0], NrAr[1], NrAr[2], NrAr[3], NrAr[4], NrAr[5], NrAr[6], NrAr[7]);
 
                 // Removing failed entry from authentiations table
-                memcpy(auth_table+auth_table_pos,auth_table+auth_table_pos+8,8);
+                memcpy(auth_table + auth_table_pos, auth_table + auth_table_pos + 8, 8);
                 auth_table_len -= 8;
 
                 // Return if we reached the end of the authentications table
@@ -731,39 +746,43 @@ static bool hitag2_test_auth_attempts(uint8_t* rx, const size_t rxlen, uint8_t*
                 }
 
                 // Copy the next authentication attempt in row (at the same position, b/c we removed last failed entry)
-                memcpy(NrAr,auth_table+auth_table_pos,8);
+                memcpy(NrAr, auth_table + auth_table_pos, 8);
             }
             *txlen = 5;
-            memcpy(tx,"\xc0",nbytes(*txlen));
-        } break;
+            memcpy(tx, "\xc0", nbytes(*txlen));
+        }
+        break;
 
-            // Received UID, crypto tag answer, or read block response
+        // Received UID, crypto tag answer, or read block response
         case 32: {
             if (!bCrypto) {
                 *txlen = 64;
-                memcpy(tx,NrAr,8);
+                memcpy(tx, NrAr, 8);
                 bCrypto = true;
             } else {
-                Dbprintf("auth: %02x%02x%02x%02x%02x%02x%02x%02x OK",NrAr[0],NrAr[1],NrAr[2],NrAr[3],NrAr[4],NrAr[5],NrAr[6],NrAr[7]);
+                Dbprintf("auth: %02x%02x%02x%02x%02x%02x%02x%02x OK", NrAr[0], NrAr[1], NrAr[2], NrAr[3], NrAr[4], NrAr[5], NrAr[6], NrAr[7]);
                 bCrypto = false;
-                if ((auth_table_pos+8) == auth_table_len) {
+                if ((auth_table_pos + 8) == auth_table_len) {
                     return false;
                 }
                 auth_table_pos += 8;
-                memcpy(NrAr,auth_table+auth_table_pos,8);
+                memcpy(NrAr, auth_table + auth_table_pos, 8);
             }
-        } break;
+        }
+        break;
 
         default: {
-            Dbprintf("Uknown frame length: %d",rxlen);
+            Dbprintf("Uknown frame length: %d", rxlen);
             return false;
-        } break;
+        }
+        break;
     }
 
     return true;
 }
 
-static bool hitag2_read_uid(uint8_t* rx, const size_t rxlen, uint8_t* tx, size_t* txlen) {
+static bool hitag2_read_uid(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t *txlen)
+{
     // Reset the transmission frame length
     *txlen = 0;
 
@@ -773,8 +792,9 @@ static bool hitag2_read_uid(uint8_t* rx, const size_t rxlen, uint8_t* tx, size_t
         case 0: {
             // Just starting or if there is no answer
             *txlen = 5;
-            memcpy(tx, "\xC0", nbytes(*txlen) );
-        } break;
+            memcpy(tx, "\xC0", nbytes(*txlen));
+        }
+        break;
         // Received UID
         case 32: {
             // Check if we received answer tag (at)
@@ -790,17 +810,20 @@ static bool hitag2_read_uid(uint8_t* rx, const size_t rxlen, uint8_t* tx, size_t
                 bSuccessful = true;
                 return false;
             }
-        } break;
+        }
+        break;
         // Unexpected response
         default: {
             Dbprintf("Uknown frame length: %d", rxlen);
             return false;
-        } break;
+        }
+        break;
     }
     return true;
 }
 
-void SnoopHitag(uint32_t type) {
+void SnoopHitag(uint32_t type)
+{
     int frame_count;
     int response;
     int overflow;
@@ -810,12 +833,13 @@ void SnoopHitag(uint32_t type) {
     bool bSkip;
     int tag_sof;
     uint8_t rx[HITAG_FRAME_LEN];
-    size_t rxlen=0;
+    size_t rxlen = 0;
 
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
 
     // free eventually allocated BigBuf memory
-    BigBuf_free(); BigBuf_Clear_ext(false);
+    BigBuf_free();
+    BigBuf_Clear_ext(false);
 
     // Clean up trace and prepare it for storing frames
     clear_trace();
@@ -869,16 +893,16 @@ void SnoopHitag(uint32_t type) {
     bSkip = true;
     tag_sof = 4;
 
-    while(!BUTTON_PRESS() && !usb_poll_validate_length()) {
+    while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
         // Watchdog hit
         WDT_HIT();
 
         // Receive frame, watch for at most T0*EOF periods
-        while (AT91C_BASE_TC1->TC_CV < T0*HITAG_T_EOF) {
+        while (AT91C_BASE_TC1->TC_CV < T0 * HITAG_T_EOF) {
             // Check if rising edge in modulation is detected
-            if(AT91C_BASE_TC1->TC_SR & AT91C_TC_LDRAS) {
+            if (AT91C_BASE_TC1->TC_SR & AT91C_TC_LDRAS) {
                 // Retrieve the new timing values
-                int ra = (AT91C_BASE_TC1->TC_RA/T0);
+                int ra = (AT91C_BASE_TC1->TC_RA / T0);
 
                 // Find out if we are dealing with a rising or falling edge
                 rising_edge = (AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_FRAME) > 0;
@@ -888,13 +912,13 @@ void SnoopHitag(uint32_t type) {
                     // Switch from tag to reader capture
                     LED_C_OFF();
                     reader_frame = true;
-                    memset(rx,0x00,sizeof(rx));
+                    memset(rx, 0x00, sizeof(rx));
                     rxlen = 0;
                 }
 
                 // Only handle if reader frame and rising edge, or tag frame and falling edge
                 if (reader_frame != rising_edge) {
-                  overflow += ra;
+                    overflow += ra;
                     continue;
                 }
 
@@ -905,19 +929,19 @@ void SnoopHitag(uint32_t type) {
                 if (reader_frame) {
                     LED_B_ON();
                     // Capture reader frame
-                    if(ra >= HITAG_T_STOP) {
+                    if (ra >= HITAG_T_STOP) {
                         if (rxlen != 0) {
                             //DbpString("wierd0?");
                         }
                         // Capture the T0 periods that have passed since last communication or field drop (reset)
                         response = (ra - HITAG_T_LOW);
-                    } else if(ra >= HITAG_T_1_MIN ) {
+                    } else if (ra >= HITAG_T_1_MIN) {
                         // '1' bit
-                        rx[rxlen / 8] |= 1 << (7-(rxlen%8));
+                        rx[rxlen / 8] |= 1 << (7 - (rxlen % 8));
                         rxlen++;
-                    } else if(ra >= HITAG_T_0_MIN) {
+                    } else if (ra >= HITAG_T_0_MIN) {
                         // '0' bit
-                        rx[rxlen / 8] |= 0 << (7-(rxlen%8));
+                        rx[rxlen / 8] |= 0 << (7 - (rxlen % 8));
                         rxlen++;
                     } else {
                         // Ignore wierd value, is to small to mean anything
@@ -925,38 +949,38 @@ void SnoopHitag(uint32_t type) {
                 } else {
                     LED_C_ON();
                     // Capture tag frame (manchester decoding using only falling edges)
-                    if(ra >= HITAG_T_EOF) {
+                    if (ra >= HITAG_T_EOF) {
                         if (rxlen != 0) {
                             //DbpString("wierd1?");
                         }
                         // Capture the T0 periods that have passed since last communication or field drop (reset)
                         // We always recieve a 'one' first, which has the falling edge after a half period |-_|
-                        response = ra-HITAG_T_TAG_HALF_PERIOD;
-                    } else if(ra >= HITAG_T_TAG_CAPTURE_FOUR_HALF) {
+                        response = ra - HITAG_T_TAG_HALF_PERIOD;
+                    } else if (ra >= HITAG_T_TAG_CAPTURE_FOUR_HALF) {
                         // Manchester coding example |-_|_-|-_| (101)
-                        rx[rxlen / 8] |= 0 << (7-(rxlen%8));
+                        rx[rxlen / 8] |= 0 << (7 - (rxlen % 8));
                         rxlen++;
-                        rx[rxlen / 8] |= 1 << (7-(rxlen%8));
+                        rx[rxlen / 8] |= 1 << (7 - (rxlen % 8));
                         rxlen++;
-                    } else if(ra >= HITAG_T_TAG_CAPTURE_THREE_HALF) {
+                    } else if (ra >= HITAG_T_TAG_CAPTURE_THREE_HALF) {
                         // Manchester coding example |_-|...|_-|-_| (0...01)
-                        rx[rxlen / 8] |= 0 << (7-(rxlen%8));
+                        rx[rxlen / 8] |= 0 << (7 - (rxlen % 8));
                         rxlen++;
                         // We have to skip this half period at start and add the 'one' the second time
                         if (!bSkip) {
-                            rx[rxlen / 8] |= 1 << (7-(rxlen%8));
+                            rx[rxlen / 8] |= 1 << (7 - (rxlen % 8));
                             rxlen++;
                         }
                         lastbit = !lastbit;
                         bSkip = !bSkip;
-                    } else if(ra >= HITAG_T_TAG_CAPTURE_TWO_HALF) {
+                    } else if (ra >= HITAG_T_TAG_CAPTURE_TWO_HALF) {
                         // Manchester coding example |_-|_-| (00) or |-_|-_| (11)
                         if (tag_sof) {
                             // Ignore bits that are transmitted during SOF
                             tag_sof--;
                         } else {
                             // bit is same as last bit
-                            rx[rxlen / 8] |= lastbit << (7-(rxlen%8));
+                            rx[rxlen / 8] |= lastbit << (7 - (rxlen % 8));
                             rxlen++;
                         }
                     } else {
@@ -967,9 +991,9 @@ void SnoopHitag(uint32_t type) {
         }
 
         // Check if frame was captured
-        if(rxlen > 0) {
+        if (rxlen > 0) {
             frame_count++;
-            if (!LogTraceHitag(rx,rxlen,response,0,reader_frame)) {
+            if (!LogTraceHitag(rx, rxlen, response, 0, reader_frame)) {
                 DbpString("Trace full");
                 break;
             }
@@ -977,14 +1001,14 @@ void SnoopHitag(uint32_t type) {
             // Check if we recognize a valid authentication attempt
             if (nbytes(rxlen) == 8) {
                 // Store the authentication attempt
-                if (auth_table_len < (AUTH_TABLE_LENGTH-8)) {
-                    memcpy(auth_table+auth_table_len,rx,8);
+                if (auth_table_len < (AUTH_TABLE_LENGTH - 8)) {
+                    memcpy(auth_table + auth_table_len, rx, 8);
                     auth_table_len += 8;
                 }
             }
 
             // Reset the received frame and response timing info
-            memset(rx,0x00,sizeof(rx));
+            memset(rx, 0x00, sizeof(rx));
             response = 0;
             reader_frame = false;
             lastbit = 1;
@@ -996,7 +1020,7 @@ void SnoopHitag(uint32_t type) {
             LED_C_OFF();
         } else {
             // Save the timer overflow, will be 0 when frame was received
-            overflow += (AT91C_BASE_TC1->TC_CV/T0);
+            overflow += (AT91C_BASE_TC1->TC_CV / T0);
         }
         // Reset the frame length
         rxlen = 0;
@@ -1017,21 +1041,23 @@ void SnoopHitag(uint32_t type) {
 // DbpString("All done");
 }
 
-void SimulateHitagTag(bool tag_mem_supplied, uint8_t* data) {
+void SimulateHitagTag(bool tag_mem_supplied, uint8_t *data)
+{
     int frame_count;
     int response;
     int overflow;
     uint8_t rx[HITAG_FRAME_LEN];
-    size_t rxlen=0;
+    size_t rxlen = 0;
     uint8_t tx[HITAG_FRAME_LEN];
-    size_t txlen=0;
+    size_t txlen = 0;
     bool bQuitTraceFull = false;
     bQuiet = false;
 
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
 
     // free eventually allocated BigBuf memory
-    BigBuf_free(); BigBuf_Clear_ext(false);
+    BigBuf_free();
+    BigBuf_Clear_ext(false);
 
     // Clean up trace and prepare it for storing frames
     clear_trace();
@@ -1039,7 +1065,7 @@ void SimulateHitagTag(bool tag_mem_supplied, uint8_t* data) {
 
     auth_table_len = 0;
     auth_table_pos = 0;
-    uint8_t* auth_table;
+    uint8_t *auth_table;
 
     auth_table = (uint8_t *)BigBuf_malloc(AUTH_TABLE_LENGTH);
     memset(auth_table, 0x00, AUTH_TABLE_LENGTH);
@@ -1050,16 +1076,16 @@ void SimulateHitagTag(bool tag_mem_supplied, uint8_t* data) {
 
     if (tag_mem_supplied) {
         DbpString("Loading hitag2 memory...");
-        memcpy((uint8_t*)tag.sectors,data,48);
+        memcpy((uint8_t *)tag.sectors, data, 48);
     }
 
     uint32_t block = 0;
-    for (size_t i=0; i<12; i++) {
-        for (size_t j=0; j<4; j++) {
+    for (size_t i = 0; i < 12; i++) {
+        for (size_t j = 0; j < 4; j++) {
             block <<= 8;
             block |= tag.sectors[i][j];
         }
-        Dbprintf("| %d | %08x |",i,block);
+        Dbprintf("| %d | %08x |", i, block);
     }
 
     // Set up simulator mode, frequency divisor which will drive the FPGA
@@ -1092,7 +1118,7 @@ void SimulateHitagTag(bool tag_mem_supplied, uint8_t* data) {
     AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK | AT91C_TC_ETRGEDG_RISING | AT91C_TC_ABETRG | AT91C_TC_LDRA_RISING;
 
     // Reset the received frame, frame count and timing info
-    memset(rx,0x00,sizeof(rx));
+    memset(rx, 0x00, sizeof(rx));
     frame_count = 0;
     response = 0;
     overflow = 0;
@@ -1100,16 +1126,16 @@ void SimulateHitagTag(bool tag_mem_supplied, uint8_t* data) {
     // Enable and reset counter
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
-    while(!BUTTON_PRESS() && !usb_poll_validate_length()) {
+    while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
         // Watchdog hit
         WDT_HIT();
 
         // Receive frame, watch for at most T0*EOF periods
-        while (AT91C_BASE_TC1->TC_CV < T0*HITAG_T_EOF) {
+        while (AT91C_BASE_TC1->TC_CV < T0 * HITAG_T_EOF) {
             // Check if rising edge in modulation is detected
-            if(AT91C_BASE_TC1->TC_SR & AT91C_TC_LDRAS) {
+            if (AT91C_BASE_TC1->TC_SR & AT91C_TC_LDRAS) {
                 // Retrieve the new timing values
-                int ra = (AT91C_BASE_TC1->TC_RA/T0) + overflow;
+                int ra = (AT91C_BASE_TC1->TC_RA / T0) + overflow;
                 overflow = 0;
 
                 // Reset timer every frame, we have to capture the last edge for timing
@@ -1118,19 +1144,19 @@ void SimulateHitagTag(bool tag_mem_supplied, uint8_t* data) {
                 LED_B_ON();
 
                 // Capture reader frame
-                if(ra >= HITAG_T_STOP) {
+                if (ra >= HITAG_T_STOP) {
                     if (rxlen != 0) {
                         //DbpString("wierd0?");
                     }
                     // Capture the T0 periods that have passed since last communication or field drop (reset)
                     response = (ra - HITAG_T_LOW);
-                } else if(ra >= HITAG_T_1_MIN ) {
+                } else if (ra >= HITAG_T_1_MIN) {
                     // '1' bit
-                    rx[rxlen / 8] |= 1 << (7-(rxlen%8));
+                    rx[rxlen / 8] |= 1 << (7 - (rxlen % 8));
                     rxlen++;
-                } else if(ra >= HITAG_T_0_MIN) {
+                } else if (ra >= HITAG_T_0_MIN) {
                     // '0' bit
-                    rx[rxlen / 8] |= 0 << (7-(rxlen%8));
+                    rx[rxlen / 8] |= 0 << (7 - (rxlen % 8));
                     rxlen++;
                 } else {
                     // Ignore wierd value, is to small to mean anything
@@ -1139,10 +1165,10 @@ void SimulateHitagTag(bool tag_mem_supplied, uint8_t* data) {
         }
 
         // Check if frame was captured
-        if(rxlen > 4) {
+        if (rxlen > 4) {
             frame_count++;
             if (!bQuiet) {
-                if (!LogTraceHitag(rx,rxlen,response,0,true)) {
+                if (!LogTraceHitag(rx, rxlen, response, 0, true)) {
                     DbpString("Trace full");
                     if (bQuitTraceFull) {
                         break;
@@ -1156,22 +1182,22 @@ void SimulateHitagTag(bool tag_mem_supplied, uint8_t* data) {
             AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 
             // Process the incoming frame (rx) and prepare the outgoing frame (tx)
-            hitag2_handle_reader_command(rx,rxlen,tx,&txlen);
+            hitag2_handle_reader_command(rx, rxlen, tx, &txlen);
 
             // Wait for HITAG_T_WAIT_1 carrier periods after the last reader bit,
             // not that since the clock counts since the rising edge, but T_Wait1 is
             // with respect to the falling edge, we need to wait actually (T_Wait1 - T_Low)
             // periods. The gap time T_Low varies (4..10). All timer values are in
             // terms of T0 units
-            while(AT91C_BASE_TC0->TC_CV < T0*(HITAG_T_WAIT_1-HITAG_T_LOW));
+            while (AT91C_BASE_TC0->TC_CV < T0 * (HITAG_T_WAIT_1 - HITAG_T_LOW));
 
             // Send and store the tag answer (if there is any)
             if (txlen) {
                 // Transmit the tag frame
-                hitag_send_frame(tx,txlen);
+                hitag_send_frame(tx, txlen);
                 // Store the frame in the trace
                 if (!bQuiet) {
-                    if (!LogTraceHitag(tx,txlen,0,0,false)) {
+                    if (!LogTraceHitag(tx, txlen, 0, 0, false)) {
                         DbpString("Trace full");
                         if (bQuitTraceFull) {
                             break;
@@ -1183,7 +1209,7 @@ void SimulateHitagTag(bool tag_mem_supplied, uint8_t* data) {
             }
 
             // Reset the received frame and response timing info
-            memset(rx,0x00,sizeof(rx));
+            memset(rx, 0x00, sizeof(rx));
             response = 0;
 
             // Enable and reset external trigger in timer for capturing future frames
@@ -1193,7 +1219,7 @@ void SimulateHitagTag(bool tag_mem_supplied, uint8_t* data) {
         // Reset the frame length
         rxlen = 0;
         // Save the timer overflow, will be 0 when frame was received
-        overflow += (AT91C_BASE_TC1->TC_CV/T0);
+        overflow += (AT91C_BASE_TC1->TC_CV / T0);
         // Reset the timer to restart while-loop that receives frames
         AT91C_BASE_TC1->TC_CCR = AT91C_TC_SWTRG;
     }
@@ -1207,13 +1233,14 @@ void SimulateHitagTag(bool tag_mem_supplied, uint8_t* data) {
     set_tracing(false);
 }
 
-void ReaderHitag(hitag_function htf, hitag_data* htd) {
+void ReaderHitag(hitag_function htf, hitag_data *htd)
+{
     int frame_count = 0;
     int response = 0;
     uint8_t rx[HITAG_FRAME_LEN];
     size_t rxlen = 0;
     uint8_t txbuf[HITAG_FRAME_LEN];
-    uint8_t* tx = txbuf;
+    uint8_t *tx = txbuf;
     size_t txlen = 0;
     int lastbit = 1;
     bool bSkip;
@@ -1237,54 +1264,60 @@ void ReaderHitag(hitag_function htf, hitag_data* htd) {
     switch (htf) {
         case RHT2F_PASSWORD: {
             Dbprintf("List identifier in password mode");
-            memcpy(password,htd->pwd.password, 4);
+            memcpy(password, htd->pwd.password, 4);
             blocknr = 0;
             bQuitTraceFull = false;
             bQuiet = false;
             bPwd = false;
-        } break;
+        }
+        break;
 
         case RHT2F_AUTHENTICATE: {
             DbpString("Authenticating using nr,ar pair:");
-            memcpy(NrAr,htd->auth.NrAr, 8);
-            Dbhexdump(8,NrAr,false);
+            memcpy(NrAr, htd->auth.NrAr, 8);
+            Dbhexdump(8, NrAr, false);
             bQuiet = false;
             bCrypto = false;
             bAuthenticating = false;
             bQuitTraceFull = true;
-        } break;
+        }
+        break;
 
         case RHT2F_CRYPTO: {
             DbpString("Authenticating using key:");
-            memcpy(key,htd->crypto.key, 6);   //HACK; 4 or 6??  I read both in the code.
-            Dbhexdump(6,key,false);
+            memcpy(key, htd->crypto.key, 6);  //HACK; 4 or 6??  I read both in the code.
+            Dbhexdump(6, key, false);
             blocknr = 0;
             bQuiet = false;
             bCrypto = false;
             bAuthenticating = false;
             bQuitTraceFull = true;
-        } break;
+        }
+        break;
 
         case RHT2F_TEST_AUTH_ATTEMPTS: {
-            Dbprintf("Testing %d authentication attempts",(auth_table_len/8));
+            Dbprintf("Testing %d authentication attempts", (auth_table_len / 8));
             auth_table_pos = 0;
             memcpy(NrAr, auth_table, 8);
             bQuitTraceFull = false;
             bQuiet = false;
             bCrypto = false;
-        } break;
+        }
+        break;
         case RHT2F_UID_ONLY: {
             blocknr = 0;
             bQuiet = false;
             bCrypto = false;
             bAuthenticating = false;
             bQuitTraceFull = true;
-        } break;
+        }
+        break;
         default: {
-            Dbprintf("Error, unknown function: %d",htf);
+            Dbprintf("Error, unknown function: %d", htf);
             set_tracing(false);
             return;
-        } break;
+        }
+        break;
     }
 
     LED_D_ON();
@@ -1328,28 +1361,28 @@ void ReaderHitag(hitag_function htf, hitag_data* htd) {
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
     // Tag specific configuration settings (sof, timings, etc.)
-    if (htf < 10){
+    if (htf < 10) {
         // hitagS settings
         reset_sof = 1;
         t_wait = 200;
-    // DbpString("Configured for hitagS reader");
+        // DbpString("Configured for hitagS reader");
     } else if (htf < 20) {
         // hitag1 settings
         reset_sof = 1;
         t_wait = 200;
-    // DbpString("Configured for hitag1 reader");
+        // DbpString("Configured for hitag1 reader");
     } else if (htf < 30) {
         // hitag2 settings
         reset_sof = 4;
         t_wait = HITAG_T_WAIT_2;
-    // DbpString("Configured for hitag2 reader");
+        // DbpString("Configured for hitag2 reader");
     } else {
-        Dbprintf("Error, unknown hitag reader type: %d",htf);
+        Dbprintf("Error, unknown hitag reader type: %d", htf);
         set_tracing(false);
         LED_D_OFF();
         return;
     }
-    uint8_t attempt_count=0;
+    uint8_t attempt_count = 0;
     while (!bStop && !BUTTON_PRESS()) {
         // Watchdog hit
         WDT_HIT();
@@ -1358,7 +1391,7 @@ void ReaderHitag(hitag_function htf, hitag_data* htd) {
         if (rxlen > 0) {
             frame_count++;
             if (!bQuiet) {
-                if (!LogTraceHitag(rx,rxlen, response, 0, false)) {
+                if (!LogTraceHitag(rx, rxlen, response, 0, false)) {
                     DbpString("Trace full");
                     if (bQuitTraceFull)
                         break;
@@ -1372,29 +1405,35 @@ void ReaderHitag(hitag_function htf, hitag_data* htd) {
         tx = txbuf;
         switch (htf) {
             case RHT2F_PASSWORD: {
-                bStop = !hitag2_password(rx,rxlen,tx,&txlen);
-            } break;
+                bStop = !hitag2_password(rx, rxlen, tx, &txlen);
+            }
+            break;
             case RHT2F_AUTHENTICATE: {
-                bStop = !hitag2_authenticate(rx,rxlen,tx,&txlen);
-            } break;
+                bStop = !hitag2_authenticate(rx, rxlen, tx, &txlen);
+            }
+            break;
             case RHT2F_CRYPTO: {
-            bStop = !hitag2_crypto(rx,rxlen,tx,&txlen, false);
-            } break;
+                bStop = !hitag2_crypto(rx, rxlen, tx, &txlen, false);
+            }
+            break;
             case RHT2F_TEST_AUTH_ATTEMPTS: {
-                bStop = !hitag2_test_auth_attempts(rx,rxlen,tx,&txlen);
-            } break;
+                bStop = !hitag2_test_auth_attempts(rx, rxlen, tx, &txlen);
+            }
+            break;
             case RHT2F_UID_ONLY: {
                 bStop = !hitag2_read_uid(rx, rxlen, tx, &txlen);
                 attempt_count++; //attempt 3 times to get uid then quit
                 if (!bStop && attempt_count == 3)
                     bStop = true;
-            } break;
+            }
+            break;
             default: {
-                Dbprintf("Error, unknown function: %d",htf);
+                Dbprintf("Error, unknown function: %d", htf);
                 set_tracing(false);
                 LED_D_OFF();
                 return;
-            } break;
+            }
+            break;
         }
 
         // Send and store the reader command
@@ -1443,7 +1482,7 @@ void ReaderHitag(hitag_function htf, hitag_data* htd) {
             // Check if falling edge in tag modulation is detected
             if (AT91C_BASE_TC1->TC_SR & AT91C_TC_LDRAS) {
                 // Retrieve the new timing values
-                int ra = (AT91C_BASE_TC1->TC_RA/T0);
+                int ra = (AT91C_BASE_TC1->TC_RA / T0);
 
                 // Reset timer every frame, we have to capture the last edge for timing
                 AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;
@@ -1454,20 +1493,20 @@ void ReaderHitag(hitag_function htf, hitag_data* htd) {
                 if (ra >= HITAG_T_EOF) {
                     // Capture the T0 periods that have passed since last communication or field drop (reset)
                     // We always recieve a 'one' first, which has the falling edge after a half period |-_|
-                    response = ra-HITAG_T_TAG_HALF_PERIOD;
+                    response = ra - HITAG_T_TAG_HALF_PERIOD;
                 } else if (ra >= HITAG_T_TAG_CAPTURE_FOUR_HALF) {
                     // Manchester coding example |-_|_-|-_| (101)
-                    rx[rxlen / 8] |= 0 << (7-(rxlen%8));
+                    rx[rxlen / 8] |= 0 << (7 - (rxlen % 8));
                     rxlen++;
-                    rx[rxlen / 8] |= 1 << (7-(rxlen%8));
+                    rx[rxlen / 8] |= 1 << (7 - (rxlen % 8));
                     rxlen++;
                 } else if (ra >= HITAG_T_TAG_CAPTURE_THREE_HALF) {
                     // Manchester coding example |_-|...|_-|-_| (0...01)
-                    rx[rxlen / 8] |= 0 << (7-(rxlen%8));
+                    rx[rxlen / 8] |= 0 << (7 - (rxlen % 8));
                     rxlen++;
                     // We have to skip this half period at start and add the 'one' the second time
                     if (!bSkip) {
-                        rx[rxlen / 8] |= 1 << (7-(rxlen%8));
+                        rx[rxlen / 8] |= 1 << (7 - (rxlen % 8));
                         rxlen++;
                     }
                     lastbit = !lastbit;
@@ -1479,19 +1518,19 @@ void ReaderHitag(hitag_function htf, hitag_data* htd) {
                         tag_sof--;
                     } else {
                         // bit is same as last bit
-                        rx[rxlen / 8] |= lastbit << (7-(rxlen%8));
+                        rx[rxlen / 8] |= lastbit << (7 - (rxlen % 8));
                         rxlen++;
                     }
                 } else {
-                        //Dbprintf("DEBUG: Wierd2");
-                        errorCount++;
+                    //Dbprintf("DEBUG: Wierd2");
+                    errorCount++;
                     // Ignore wierd value, is to small to mean anything
                 }
             }
             //if we saw over 100 wierd values break it probably isn't hitag...
             if (errorCount > 100) break;
             // We can break this loop if we received the last bit from a frame
-            if (AT91C_BASE_TC1->TC_CV > T0*HITAG_T_EOF) {
+            if (AT91C_BASE_TC1->TC_CV > T0 * HITAG_T_EOF) {
                 if (rxlen > 0) break;
             }
         }
@@ -1503,20 +1542,21 @@ void ReaderHitag(hitag_function htf, hitag_data* htd) {
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     set_tracing(false);
 
-    if ( bSuccessful )
-        cmd_send(CMD_ACK, bSuccessful, 0, 0, (uint8_t*)tag.sectors, 48);
+    if (bSuccessful)
+        cmd_send(CMD_ACK, bSuccessful, 0, 0, (uint8_t *)tag.sectors, 48);
     else
         cmd_send(CMD_ACK, bSuccessful, 0, 0, 0, 0);
 }
 
-void WriterHitag(hitag_function htf, hitag_data* htd, int page) {
+void WriterHitag(hitag_function htf, hitag_data *htd, int page)
+{
     int frame_count;
     int response;
     uint8_t rx[HITAG_FRAME_LEN];
-    size_t rxlen=0;
+    size_t rxlen = 0;
     uint8_t txbuf[HITAG_FRAME_LEN];
-    uint8_t* tx = txbuf;
-    size_t txlen=0;
+    uint8_t *tx = txbuf;
+    size_t txlen = 0;
     int lastbit;
     bool bSkip;
     int reset_sof;
@@ -1536,23 +1576,25 @@ void WriterHitag(hitag_function htf, hitag_data* htd, int page) {
     // DbpString("Starting Hitag reader family");
 
     // Check configuration
-    switch(htf) {
-    case WHT2F_CRYPTO: {
-        DbpString("Authenticating using key:");
-        memcpy(key,htd->crypto.key,6);   //HACK; 4 or 6??  I read both in the code.
-        memcpy(writedata, htd->crypto.data, 4);
-        Dbhexdump(6,key,false);
-        blocknr = page;
-        bQuiet = false;
-        bCrypto = false;
-        bAuthenticating = false;
-        bQuitTraceFull = true;
-        writestate = WRITE_STATE_START;
-    } break;
-    default: {
-        Dbprintf("Error, unknown function: %d",htf);
-        return;
-    } break;
+    switch (htf) {
+        case WHT2F_CRYPTO: {
+            DbpString("Authenticating using key:");
+            memcpy(key, htd->crypto.key, 6); //HACK; 4 or 6??  I read both in the code.
+            memcpy(writedata, htd->crypto.data, 4);
+            Dbhexdump(6, key, false);
+            blocknr = page;
+            bQuiet = false;
+            bCrypto = false;
+            bAuthenticating = false;
+            bQuitTraceFull = true;
+            writestate = WRITE_STATE_START;
+        }
+        break;
+        default: {
+            Dbprintf("Error, unknown function: %d", htf);
+            return;
+        }
+        break;
     }
 
     LED_D_ON();
@@ -1601,7 +1643,7 @@ void WriterHitag(hitag_function htf, hitag_data* htd, int page) {
     bStop = false;
 
     // Tag specific configuration settings (sof, timings, etc.)
-    if (htf < 10){
+    if (htf < 10) {
         // hitagS settings
         reset_sof = 1;
         t_wait = 200;
@@ -1617,18 +1659,18 @@ void WriterHitag(hitag_function htf, hitag_data* htd, int page) {
         t_wait = HITAG_T_WAIT_2;
         // DbpString("Configured for hitag2 reader");
     } else {
-        Dbprintf("Error, unknown hitag reader type: %d",htf);
+        Dbprintf("Error, unknown hitag reader type: %d", htf);
         return;
     }
-    while(!bStop && !BUTTON_PRESS()) {
+    while (!bStop && !BUTTON_PRESS()) {
         // Watchdog hit
         WDT_HIT();
 
         // Check if frame was captured and store it
-        if(rxlen > 0) {
+        if (rxlen > 0) {
             frame_count++;
             if (!bQuiet) {
-                if (!LogTraceHitag(rx,rxlen,response,0,false)) {
+                if (!LogTraceHitag(rx, rxlen, response, 0, false)) {
                     DbpString("Trace full");
                     if (bQuitTraceFull) {
                         break;
@@ -1641,14 +1683,16 @@ void WriterHitag(hitag_function htf, hitag_data* htd, int page) {
 
         // By default reset the transmission buffer
         tx = txbuf;
-        switch(htf) {
-        case WHT2F_CRYPTO: {
-            bStop = !hitag2_crypto(rx,rxlen,tx,&txlen, true);
-        } break;
-        default: {
-            Dbprintf("Error, unknown function: %d",htf);
-            return;
-        } break;
+        switch (htf) {
+            case WHT2F_CRYPTO: {
+                bStop = !hitag2_crypto(rx, rxlen, tx, &txlen, true);
+            }
+            break;
+            default: {
+                Dbprintf("Error, unknown function: %d", htf);
+                return;
+            }
+            break;
         }
 
         // Send and store the reader command
@@ -1660,22 +1704,22 @@ void WriterHitag(hitag_function htf, hitag_data* htd, int page) {
         // falling edge occured halfway the period. with respect to this falling edge,
         // we need to wait (T_Wait2 + half_tag_period) when the last was a 'one'.
         // All timer values are in terms of T0 units
-        while(AT91C_BASE_TC0->TC_CV < T0*(t_wait+(HITAG_T_TAG_HALF_PERIOD*lastbit)));
+        while (AT91C_BASE_TC0->TC_CV < T0 * (t_wait + (HITAG_T_TAG_HALF_PERIOD * lastbit)));
 
         // Dbprintf("DEBUG: Sending reader frame");
 
         // Transmit the reader frame
-        hitag_reader_send_frame(tx,txlen);
+        hitag_reader_send_frame(tx, txlen);
 
         // Enable and reset external trigger in timer for capturing future frames
         AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
         // Add transmitted frame to total count
-        if(txlen > 0) {
+        if (txlen > 0) {
             frame_count++;
             if (!bQuiet) {
                 // Store the frame in the trace
-                if (!LogTraceHitag(tx,txlen,HITAG_T_WAIT_2,0,true)) {
+                if (!LogTraceHitag(tx, txlen, HITAG_T_WAIT_2, 0, true)) {
                     if (bQuitTraceFull) {
                         break;
                     } else {
@@ -1686,7 +1730,7 @@ void WriterHitag(hitag_function htf, hitag_data* htd, int page) {
         }
 
         // Reset values for receiving frames
-        memset(rx,0x00,sizeof(rx));
+        memset(rx, 0x00, sizeof(rx));
         rxlen = 0;
         lastbit = 1;
         bSkip = true;
@@ -1696,11 +1740,11 @@ void WriterHitag(hitag_function htf, hitag_data* htd, int page) {
         uint32_t errorCount = 0;
 
         // Receive frame, watch for at most T0*EOF periods
-        while (AT91C_BASE_TC1->TC_CV < T0*HITAG_T_WAIT_MAX) {
+        while (AT91C_BASE_TC1->TC_CV < T0 * HITAG_T_WAIT_MAX) {
             // Check if falling edge in tag modulation is detected
-            if(AT91C_BASE_TC1->TC_SR & AT91C_TC_LDRAS) {
+            if (AT91C_BASE_TC1->TC_SR & AT91C_TC_LDRAS) {
                 // Retrieve the new timing values
-                int ra = (AT91C_BASE_TC1->TC_RA/T0);
+                int ra = (AT91C_BASE_TC1->TC_RA / T0);
 
                 // Reset timer every frame, we have to capture the last edge for timing
                 AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;
@@ -1708,41 +1752,41 @@ void WriterHitag(hitag_function htf, hitag_data* htd, int page) {
                 LED_B_ON();
 
                 // Capture tag frame (manchester decoding using only falling edges)
-                if(ra >= HITAG_T_EOF) {
+                if (ra >= HITAG_T_EOF) {
                     if (rxlen != 0) {
                         //Dbprintf("DEBUG: Wierd1");
                     }
                     // Capture the T0 periods that have passed since last communication or field drop (reset)
                     // We always recieve a 'one' first, which has the falling edge after a half period |-_|
-                    response = ra-HITAG_T_TAG_HALF_PERIOD;
-                } else if(ra >= HITAG_T_TAG_CAPTURE_FOUR_HALF) {
+                    response = ra - HITAG_T_TAG_HALF_PERIOD;
+                } else if (ra >= HITAG_T_TAG_CAPTURE_FOUR_HALF) {
                     // Manchester coding example |-_|_-|-_| (101)
 
                     // need to test to verify we don't exceed memory...
                     // if ( ((rxlen+2) / 8) > HITAG_FRAME_LEN) {
                     //     break;
                     // }
-                    rx[rxlen / 8] |= 0 << (7-(rxlen%8));
+                    rx[rxlen / 8] |= 0 << (7 - (rxlen % 8));
                     rxlen++;
-                    rx[rxlen / 8] |= 1 << (7-(rxlen%8));
+                    rx[rxlen / 8] |= 1 << (7 - (rxlen % 8));
                     rxlen++;
-                } else if(ra >= HITAG_T_TAG_CAPTURE_THREE_HALF) {
+                } else if (ra >= HITAG_T_TAG_CAPTURE_THREE_HALF) {
                     // Manchester coding example |_-|...|_-|-_| (0...01)
 
                     // need to test to verify we don't exceed memory...
                     // if ( ((rxlen+2) / 8) > HITAG_FRAME_LEN) {
                     //     break;
                     // }
-                    rx[rxlen / 8] |= 0 << (7-(rxlen%8));
+                    rx[rxlen / 8] |= 0 << (7 - (rxlen % 8));
                     rxlen++;
                     // We have to skip this half period at start and add the 'one' the second time
                     if (!bSkip) {
-                        rx[rxlen / 8] |= 1 << (7-(rxlen%8));
+                        rx[rxlen / 8] |= 1 << (7 - (rxlen % 8));
                         rxlen++;
                     }
                     lastbit = !lastbit;
                     bSkip = !bSkip;
-                } else if(ra >= HITAG_T_TAG_CAPTURE_TWO_HALF) {
+                } else if (ra >= HITAG_T_TAG_CAPTURE_TWO_HALF) {
                     // Manchester coding example |_-|_-| (00) or |-_|-_| (11)
 
                     // need to test to verify we don't exceed memory...
@@ -1754,7 +1798,7 @@ void WriterHitag(hitag_function htf, hitag_data* htd, int page) {
                         tag_sof--;
                     } else {
                         // bit is same as last bit
-                        rx[rxlen / 8] |= lastbit << (7-(rxlen%8));
+                        rx[rxlen / 8] |= lastbit << (7 - (rxlen % 8));
                         rxlen++;
                     }
                 } else {
@@ -1764,18 +1808,17 @@ void WriterHitag(hitag_function htf, hitag_data* htd, int page) {
                 }
             }
             // if we saw over 100 wierd values break it probably isn't hitag...
-            if (errorCount >100) break;
+            if (errorCount > 100) break;
             // We can break this loop if we received the last bit from a frame
-            if (AT91C_BASE_TC1->TC_CV > T0*HITAG_T_EOF) {
-                if (rxlen>0) break;
+            if (AT91C_BASE_TC1->TC_CV > T0 * HITAG_T_EOF) {
+                if (rxlen > 0) break;
             }
         }
 
         // Wait some extra time for flash to be programmed
-        if ((rxlen == 0) && (writestate == WRITE_STATE_PROG))
-        {
+        if ((rxlen == 0) && (writestate == WRITE_STATE_PROG)) {
             AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;
-            while(AT91C_BASE_TC0->TC_CV < T0*(HITAG_T_PROG - HITAG_T_WAIT_MAX));
+            while (AT91C_BASE_TC0->TC_CV < T0 * (HITAG_T_PROG - HITAG_T_WAIT_MAX));
         }
     }
     // Dbprintf("DEBUG: Done waiting for frame");
@@ -1787,5 +1830,5 @@ void WriterHitag(hitag_function htf, hitag_data* htd, int page) {
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     // Dbprintf("frame received: %d",frame_count);
     // DbpString("All done");
-    cmd_send(CMD_ACK,bSuccessful,0,0,(uint8_t*)tag.sectors,48);
+    cmd_send(CMD_ACK, bSuccessful, 0, 0, (uint8_t *)tag.sectors, 48);
 }
diff --git a/armsrc/hitagS.c b/armsrc/hitagS.c
index 544dbf086..33028b777 100644
--- a/armsrc/hitagS.c
+++ b/armsrc/hitagS.c
@@ -53,7 +53,7 @@ static byte_t pwdh0, pwdl0, pwdl1; //password bytes
 static uint32_t rnd = 0x74124485;  //randomnumber
 static int test = 0;
 size_t blocknr;
-bool end=false;
+bool end = false;
 
 // Single bit Hitag2 functions:
 #define i4(x,a,b,c,d)       ((u32)((((x)>>(a))&1)+(((x)>>(b))&1)*2+(((x)>>(c))&1)*4+(((x)>>(d))&1)*8))
@@ -65,39 +65,43 @@ static const u32 ht2_f5c = 0x7907287B;        // 0111 1001 0000 0111 0010 1000 0
 #define ht2bs_5c(a,b,c,d,e) (~((((((c^e)|d)&a)^b)&(c^b))^(((d^e)|a)&((d^b)|c))))
 #define uf20bs              u32
 
-static u32 f20(const u64 x) {
+static u32 f20(const u64 x)
+{
     u32 i5;
 
     i5 = ((ht2_f4a >> i4(x, 1, 2, 4, 5)) & 1) * 1
-            + ((ht2_f4b >> i4(x, 7, 11, 13, 14)) & 1) * 2
-            + ((ht2_f4b >> i4(x, 16, 20, 22, 25)) & 1) * 4
-            + ((ht2_f4b >> i4(x, 27, 28, 30, 32)) & 1) * 8
-            + ((ht2_f4a >> i4(x, 33, 42, 43, 45)) & 1) * 16;
+         + ((ht2_f4b >> i4(x, 7, 11, 13, 14)) & 1) * 2
+         + ((ht2_f4b >> i4(x, 16, 20, 22, 25)) & 1) * 4
+         + ((ht2_f4b >> i4(x, 27, 28, 30, 32)) & 1) * 8
+         + ((ht2_f4a >> i4(x, 33, 42, 43, 45)) & 1) * 16;
 
     return (ht2_f5c >> i5) & 1;
 }
-static u64 hitag2_round(u64 *state) {
+static u64 hitag2_round(u64 *state)
+{
     u64 x = *state;
 
     x = (x >> 1)
-            + ((((x >> 0) ^ (x >> 2) ^ (x >> 3) ^ (x >> 6) ^ (x >> 7) ^ (x >> 8)
-                    ^ (x >> 16) ^ (x >> 22) ^ (x >> 23) ^ (x >> 26) ^ (x >> 30)
-                    ^ (x >> 41) ^ (x >> 42) ^ (x >> 43) ^ (x >> 46) ^ (x >> 47))
-                    & 1) << 47);
+        + ((((x >> 0) ^ (x >> 2) ^ (x >> 3) ^ (x >> 6) ^ (x >> 7) ^ (x >> 8)
+             ^ (x >> 16) ^ (x >> 22) ^ (x >> 23) ^ (x >> 26) ^ (x >> 30)
+             ^ (x >> 41) ^ (x >> 42) ^ (x >> 43) ^ (x >> 46) ^ (x >> 47))
+            & 1) << 47);
 
     *state = x;
     return f20(x);
 }
-static u64 hitag2_init(const u64 key, const u32 serial, const u32 IV) {
+static u64 hitag2_init(const u64 key, const u32 serial, const u32 IV)
+{
     u32 i;
     u64 x = ((key & 0xFFFF) << 32) + serial;
     for (i = 0; i < 32; i++) {
         x >>= 1;
-        x += (u64) (f20(x) ^ (((IV >> i) ^ (key >> (i + 16))) & 1)) << 47;
+        x += (u64)(f20(x) ^ (((IV >> i) ^ (key >> (i + 16))) & 1)) << 47;
     }
     return x;
 }
-static u32 hitag2_byte(u64 *x) {
+static u32 hitag2_byte(u64 *x)
+{
     u32 i, c;
 
     for (i = 0, c = 0; i < 8; i++)
@@ -144,11 +148,11 @@ static u32 hitag2_byte(u64 *x) {
  * Implementation of the crc8 calculation from Hitag S
  * from http://www.proxmark.org/files/Documents/125%20kHz%20-%20Hitag/HitagS.V11.pdf
  */
-void calc_crc(unsigned char * crc, unsigned char data, unsigned char Bitcount) {
+void calc_crc(unsigned char *crc, unsigned char data, unsigned char Bitcount)
+{
     *crc ^= data; // crc = crc (exor) data
     do {
-        if (*crc & 0x80) // if (MSB-CRC == 1)
-                {
+        if (*crc & 0x80) { // if (MSB-CRC == 1)
             *crc <<= 1; // CRC = CRC Bit-shift left
             *crc ^= CRC_POLYNOM; // CRC = CRC (exor) CRC_POLYNOM
         } else {
@@ -157,109 +161,111 @@ void calc_crc(unsigned char * crc, unsigned char data, unsigned char Bitcount) {
     } while (--Bitcount);
 }
 
-static void hitag_send_bit(int bit) {
+static void hitag_send_bit(int bit)
+{
     LED_A_ON();
     // Reset clock for the next bit
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;
 
     switch (m) {
-    case AC2K:
-        if (bit == 0) {
-            // AC Coding --__
-            HIGH(GPIO_SSC_DOUT);
-            while (AT91C_BASE_TC0->TC_CV < T0 * 32) {};
+        case AC2K:
+            if (bit == 0) {
+                // AC Coding --__
+                HIGH(GPIO_SSC_DOUT);
+                while (AT91C_BASE_TC0->TC_CV < T0 * 32) {};
 
-            LOW(GPIO_SSC_DOUT);
-            while (AT91C_BASE_TC0->TC_CV < T0 * 64)  {};
+                LOW(GPIO_SSC_DOUT);
+                while (AT91C_BASE_TC0->TC_CV < T0 * 64)  {};
 
-        } else {
-            // AC coding -_-_
-            HIGH(GPIO_SSC_DOUT);
-            while (AT91C_BASE_TC0->TC_CV < T0 * 16) {};
+            } else {
+                // AC coding -_-_
+                HIGH(GPIO_SSC_DOUT);
+                while (AT91C_BASE_TC0->TC_CV < T0 * 16) {};
 
-            LOW(GPIO_SSC_DOUT);
-            while (AT91C_BASE_TC0->TC_CV < T0 * 32) {};
+                LOW(GPIO_SSC_DOUT);
+                while (AT91C_BASE_TC0->TC_CV < T0 * 32) {};
 
-            HIGH(GPIO_SSC_DOUT);
-            while (AT91C_BASE_TC0->TC_CV < T0 * 48) {};
+                HIGH(GPIO_SSC_DOUT);
+                while (AT91C_BASE_TC0->TC_CV < T0 * 48) {};
 
-            LOW(GPIO_SSC_DOUT);
-            while (AT91C_BASE_TC0->TC_CV < T0 * 64) {};
+                LOW(GPIO_SSC_DOUT);
+                while (AT91C_BASE_TC0->TC_CV < T0 * 64) {};
 
-        }
-        LED_A_OFF();
-        break;
-    case AC4K:
-        if (bit == 0) {
-            // AC Coding --__
-            HIGH(GPIO_SSC_DOUT);
-            while (AT91C_BASE_TC0->TC_CV < T0 * HITAG_T_TAG_HALF_PERIOD) {};
+            }
+            LED_A_OFF();
+            break;
+        case AC4K:
+            if (bit == 0) {
+                // AC Coding --__
+                HIGH(GPIO_SSC_DOUT);
+                while (AT91C_BASE_TC0->TC_CV < T0 * HITAG_T_TAG_HALF_PERIOD) {};
 
-            LOW(GPIO_SSC_DOUT);
-            while (AT91C_BASE_TC0->TC_CV < T0 * HITAG_T_TAG_FULL_PERIOD) {};
+                LOW(GPIO_SSC_DOUT);
+                while (AT91C_BASE_TC0->TC_CV < T0 * HITAG_T_TAG_FULL_PERIOD) {};
 
-        } else {
-            // AC coding -_-_
-            HIGH(GPIO_SSC_DOUT);
-            while (AT91C_BASE_TC0->TC_CV < T0 * 8) {};
+            } else {
+                // AC coding -_-_
+                HIGH(GPIO_SSC_DOUT);
+                while (AT91C_BASE_TC0->TC_CV < T0 * 8) {};
 
-            LOW(GPIO_SSC_DOUT);
-            while (AT91C_BASE_TC0->TC_CV < T0 * 16) {};
+                LOW(GPIO_SSC_DOUT);
+                while (AT91C_BASE_TC0->TC_CV < T0 * 16) {};
 
-            HIGH(GPIO_SSC_DOUT);
-            while (AT91C_BASE_TC0->TC_CV < T0 * 24) {};
+                HIGH(GPIO_SSC_DOUT);
+                while (AT91C_BASE_TC0->TC_CV < T0 * 24) {};
 
-            LOW(GPIO_SSC_DOUT);
-            while (AT91C_BASE_TC0->TC_CV < T0 * 32) {};
-        }
-        LED_A_OFF();
-        break;
-    case MC4K:
-        if (bit == 0) {
-            // Manchester: Unloaded, then loaded |__--|
-            LOW(GPIO_SSC_DOUT);
-            while (AT91C_BASE_TC0->TC_CV < T0 * 16) {};
+                LOW(GPIO_SSC_DOUT);
+                while (AT91C_BASE_TC0->TC_CV < T0 * 32) {};
+            }
+            LED_A_OFF();
+            break;
+        case MC4K:
+            if (bit == 0) {
+                // Manchester: Unloaded, then loaded |__--|
+                LOW(GPIO_SSC_DOUT);
+                while (AT91C_BASE_TC0->TC_CV < T0 * 16) {};
 
-            HIGH(GPIO_SSC_DOUT);
-            while (AT91C_BASE_TC0->TC_CV < T0 * 32) {};
+                HIGH(GPIO_SSC_DOUT);
+                while (AT91C_BASE_TC0->TC_CV < T0 * 32) {};
 
-        } else {
-            // Manchester: Loaded, then unloaded |--__|
-            HIGH(GPIO_SSC_DOUT);
-            while (AT91C_BASE_TC0->TC_CV < T0 * 16) {};
+            } else {
+                // Manchester: Loaded, then unloaded |--__|
+                HIGH(GPIO_SSC_DOUT);
+                while (AT91C_BASE_TC0->TC_CV < T0 * 16) {};
 
-            LOW(GPIO_SSC_DOUT);
-            while (AT91C_BASE_TC0->TC_CV < T0 * 32) {};
+                LOW(GPIO_SSC_DOUT);
+                while (AT91C_BASE_TC0->TC_CV < T0 * 32) {};
 
-        }
-        LED_A_OFF();
-        break;
-    case MC8K:
-        if (bit == 0) {
-            // Manchester: Unloaded, then loaded |__--|
-            LOW(GPIO_SSC_DOUT);
-            while (AT91C_BASE_TC0->TC_CV < T0 * 8) {};
+            }
+            LED_A_OFF();
+            break;
+        case MC8K:
+            if (bit == 0) {
+                // Manchester: Unloaded, then loaded |__--|
+                LOW(GPIO_SSC_DOUT);
+                while (AT91C_BASE_TC0->TC_CV < T0 * 8) {};
 
-            HIGH(GPIO_SSC_DOUT);
-            while (AT91C_BASE_TC0->TC_CV < T0 * 16) {};
+                HIGH(GPIO_SSC_DOUT);
+                while (AT91C_BASE_TC0->TC_CV < T0 * 16) {};
 
-        } else {
-            // Manchester: Loaded, then unloaded |--__|
-            HIGH(GPIO_SSC_DOUT);
-            while (AT91C_BASE_TC0->TC_CV < T0 * 8) {};
+            } else {
+                // Manchester: Loaded, then unloaded |--__|
+                HIGH(GPIO_SSC_DOUT);
+                while (AT91C_BASE_TC0->TC_CV < T0 * 8) {};
 
-            LOW(GPIO_SSC_DOUT);
-            while (AT91C_BASE_TC0->TC_CV < T0 * 16) {};
+                LOW(GPIO_SSC_DOUT);
+                while (AT91C_BASE_TC0->TC_CV < T0 * 16) {};
 
-        }
-        LED_A_OFF();
-        break;
-    default:
-        break;
+            }
+            LED_A_OFF();
+            break;
+        default:
+            break;
     }
 }
 
-static void hitag_send_frame(const byte_t* frame, size_t frame_len) {
+static void hitag_send_frame(const byte_t *frame, size_t frame_len)
+{
 // Send start of frame
 
     for (size_t i = 0; i < sof_bits; i++) {
@@ -274,7 +280,8 @@ static void hitag_send_frame(const byte_t* frame, size_t frame_len) {
     LOW(GPIO_SSC_DOUT);
 }
 
-static void hitag_reader_send_bit(int bit) {
+static void hitag_reader_send_bit(int bit)
+{
 //Dbprintf("BIT: %d",bit);
     LED_A_ON();
 // Reset clock for the next bit
@@ -330,7 +337,8 @@ static void hitag_reader_send_bit(int bit) {
     LED_A_OFF();
 }
 
-static void hitag_reader_send_frame(const byte_t* frame, size_t frame_len) {
+static void hitag_reader_send_frame(const byte_t *frame, size_t frame_len)
+{
 // Send the content of the frame
     for (size_t i = 0; i < frame_len; i++) {
         if (frame[0] == 0xf8) {
@@ -352,7 +360,8 @@ static void hitag_reader_send_frame(const byte_t* frame, size_t frame_len) {
 /*
  * to check if the right uid was selected
  */
-static int check_select(byte_t* rx, uint32_t uid) {
+static int check_select(byte_t *rx, uint32_t uid)
+{
     unsigned char resp[48];
     int i;
     uint32_t ans = 0x0;
@@ -372,8 +381,9 @@ static int check_select(byte_t* rx, uint32_t uid) {
 /*
  * handles all commands from a reader
  */
-static void hitagS_handle_reader_command(byte_t* rx, const size_t rxlen,
-        byte_t* tx, size_t* txlen) {
+static void hitagS_handle_reader_command(byte_t *rx, const size_t rxlen,
+                                         byte_t *tx, size_t *txlen)
+{
     byte_t rx_air[HITAG_FRAME_LEN];
     byte_t page;
     int i;
@@ -386,347 +396,344 @@ static void hitagS_handle_reader_command(byte_t* rx, const size_t rxlen,
     *txlen = 0;
 // Try to find out which command was send by selecting on length (in bits)
     switch (rxlen) {
-    case 5: {
-        //UID request with a selected response protocol mode
-        tag.pstate = HT_READY;
-        tag.tstate = HT_NO_OP;
-        if ((rx[0] & 0xf0) == 0x30) {
-            tag.mode = HT_STANDARD;
-            sof_bits = 1;
-            m = AC2K;
-        }
-        if ((rx[0] & 0xf0) == 0xc0) {
-            tag.mode = HT_ADVANCED;
-            sof_bits = 3;
-            m = AC2K;
-        }
-
-        if ((rx[0] & 0xf0) == 0xd0) {
-            tag.mode = HT_FAST_ADVANCED;
-            sof_bits = 3;
-            m = AC4K;
-        }
-        //send uid as a response
-        *txlen = 32;
-        for (i = 0; i < 4; i++)
-            tx[i] = (tag.uid >> (24 - (i * 8))) & 0xff;
-    }
-        break;
-    case 45: {
-        //select command from reader received
-        if (check_select(rx, tag.uid) == 1) {
-            //if the right tag was selected
-            *txlen = 32;
-            switch (tag.mode) {
-            case HT_STANDARD:
+        case 5: {
+            //UID request with a selected response protocol mode
+            tag.pstate = HT_READY;
+            tag.tstate = HT_NO_OP;
+            if ((rx[0] & 0xf0) == 0x30) {
+                tag.mode = HT_STANDARD;
                 sof_bits = 1;
-                m = MC4K;
-                break;
-            case HT_ADVANCED:
-                sof_bits = 6;
-                m = MC4K;
-                break;
-            case HT_FAST_ADVANCED:
-                sof_bits = 6;
-                m = MC8K;
-                break;
-            default:
-                break;
+                m = AC2K;
+            }
+            if ((rx[0] & 0xf0) == 0xc0) {
+                tag.mode = HT_ADVANCED;
+                sof_bits = 3;
+                m = AC2K;
             }
 
-            //send configuration
+            if ((rx[0] & 0xf0) == 0xd0) {
+                tag.mode = HT_FAST_ADVANCED;
+                sof_bits = 3;
+                m = AC4K;
+            }
+            //send uid as a response
+            *txlen = 32;
             for (i = 0; i < 4; i++)
-                tx[i] = (tag.pages[0][1] >> (i * 8)) & 0xff;
-            tx[3] = 0xff;
-            if (tag.mode != HT_STANDARD) {
-                *txlen = 40;
-                crc = CRC_PRESET;
+                tx[i] = (tag.uid >> (24 - (i * 8))) & 0xff;
+        }
+        break;
+        case 45: {
+            //select command from reader received
+            if (check_select(rx, tag.uid) == 1) {
+                //if the right tag was selected
+                *txlen = 32;
+                switch (tag.mode) {
+                    case HT_STANDARD:
+                        sof_bits = 1;
+                        m = MC4K;
+                        break;
+                    case HT_ADVANCED:
+                        sof_bits = 6;
+                        m = MC4K;
+                        break;
+                    case HT_FAST_ADVANCED:
+                        sof_bits = 6;
+                        m = MC8K;
+                        break;
+                    default:
+                        break;
+                }
+
+                //send configuration
                 for (i = 0; i < 4; i++)
-                    calc_crc(&crc, tx[i], 8);
-                tx[4] = crc;
+                    tx[i] = (tag.pages[0][1] >> (i * 8)) & 0xff;
+                tx[3] = 0xff;
+                if (tag.mode != HT_STANDARD) {
+                    *txlen = 40;
+                    crc = CRC_PRESET;
+                    for (i = 0; i < 4; i++)
+                        calc_crc(&crc, tx[i], 8);
+                    tx[4] = crc;
+                }
             }
         }
-    }
         break;
-    case 64: {
-        //challenge message received
-        Dbprintf("Challenge for UID: %X", temp_uid);
-        temp2++;
-        *txlen = 32;
-        state = hitag2_init(rev64(tag.key), rev32(tag.pages[0][0]),
-                rev32(((rx[3] << 24) + (rx[2] << 16) + (rx[1] << 8) + rx[0])));
-        Dbprintf(
+        case 64: {
+            //challenge message received
+            Dbprintf("Challenge for UID: %X", temp_uid);
+            temp2++;
+            *txlen = 32;
+            state = hitag2_init(rev64(tag.key), rev32(tag.pages[0][0]),
+                                rev32(((rx[3] << 24) + (rx[2] << 16) + (rx[1] << 8) + rx[0])));
+            Dbprintf(
                 ",{0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X}",
                 rx[0], rx[1], rx[2], rx[3], rx[4], rx[5], rx[6], rx[7]);
-        switch (tag.mode) {
-        case HT_STANDARD:
-            sof_bits = 1;
-            m = MC4K;
-            break;
-        case HT_ADVANCED:
-            sof_bits = 6;
-            m = MC4K;
-            break;
-        case HT_FAST_ADVANCED:
-            sof_bits = 6;
-            m = MC8K;
-            break;
-        default:
-            break;
-        }
-
-        for (i = 0; i < 4; i++)
-            hitag2_byte(&state);
-        //send con2,pwdh0,pwdl0,pwdl1 encrypted as a response
-        tx[0] = hitag2_byte(&state) ^ ((tag.pages[0][1] >> 16) & 0xff);
-        tx[1] = hitag2_byte(&state) ^ tag.pwdh0;
-        tx[2] = hitag2_byte(&state) ^ tag.pwdl0;
-        tx[3] = hitag2_byte(&state) ^ tag.pwdl1;
-        if (tag.mode != HT_STANDARD) {
-            //add crc8
-            *txlen = 40;
-            crc = CRC_PRESET;
-            calc_crc(&crc, ((tag.pages[0][1] >> 16) & 0xff), 8);
-            calc_crc(&crc, tag.pwdh0, 8);
-            calc_crc(&crc, tag.pwdl0, 8);
-            calc_crc(&crc, tag.pwdl1, 8);
-            tx[4] = (crc ^ hitag2_byte(&state));
-        }
-        /*
-         * some readers do not allow to authenticate multiple times in a row with the same tag.
-         * use this to change the uid between authentications.
-         */
-
-        /*
-         if (temp2 % 2 == 0) {
-         tag.uid = 0x11223344;
-         tag.pages[0][0] = 0x44332211;
-         } else {
-         tag.uid = 0x55667788;
-         tag.pages[0][0] = 0x88776655;
-         }
-         */
-    }
-    case 40:
-        //data received to be written
-        if (tag.tstate == HT_WRITING_PAGE_DATA) {
-            tag.tstate = HT_NO_OP;
-            tag.pages[page_to_be_written / 4][page_to_be_written % 4] = (rx[0]
-                    << 0) + (rx[1] << 8) + (rx[2] << 16) + (rx[3] << 24);
-            //send ack
-            *txlen = 2;
-            tx[0] = 0x40;
-            page_to_be_written = 0;
             switch (tag.mode) {
-            case HT_STANDARD:
-                sof_bits = 1;
-                m = MC4K;
-                break;
-            case HT_ADVANCED:
-                sof_bits = 6;
-                m = MC4K;
-                break;
-            case HT_FAST_ADVANCED:
-                sof_bits = 6;
-                m = MC8K;
-                break;
-            default:
-                break;
-            }
-        } else if (tag.tstate == HT_WRITING_BLOCK_DATA) {
-            tag.pages[page_to_be_written / 4][page_to_be_written % 4] = (rx[0]
-                    << 24) + (rx[1] << 16) + (rx[2] << 8) + rx[3];
-            //send ack
-            *txlen = 2;
-            tx[0] = 0x40;
-            switch (tag.mode) {
-            case HT_STANDARD:
-                sof_bits = 1;
-                m = MC4K;
-                break;
-            case HT_ADVANCED:
-                sof_bits = 6;
-                m = MC4K;
-                break;
-            case HT_FAST_ADVANCED:
-                sof_bits = 6;
-                m = MC8K;
-                break;
-            default:
-                break;
-            }
-            page_to_be_written++;
-            block_data_left--;
-            if (block_data_left == 0) {
-                tag.tstate = HT_NO_OP;
-                page_to_be_written = 0;
-            }
-        }
-        break;
-    case 20: {
-        //write page, write block, read page or read block command received
-        if ((rx[0] & 0xf0) == 0xc0) //read page
-                {
-            //send page data
-            page = ((rx[0] & 0x0f) * 16) + ((rx[1] & 0xf0) / 16);
-            *txlen = 32;
-            tx[0] = (tag.pages[page / 4][page % 4]) & 0xff;
-            tx[1] = (tag.pages[page / 4][page % 4] >> 8) & 0xff;
-            tx[2] = (tag.pages[page / 4][page % 4] >> 16) & 0xff;
-            tx[3] = (tag.pages[page / 4][page % 4] >> 24) & 0xff;
-            if (tag.LKP && page == 1)
-                tx[3] = 0xff;
-
-            switch (tag.mode) {
-            case HT_STANDARD:
-                sof_bits = 1;
-                m = MC4K;
-                break;
-            case HT_ADVANCED:
-                sof_bits = 6;
-                m = MC4K;
-                break;
-            case HT_FAST_ADVANCED:
-                sof_bits = 6;
-                m = MC8K;
-                break;
-            default:
-                break;
+                case HT_STANDARD:
+                    sof_bits = 1;
+                    m = MC4K;
+                    break;
+                case HT_ADVANCED:
+                    sof_bits = 6;
+                    m = MC4K;
+                    break;
+                case HT_FAST_ADVANCED:
+                    sof_bits = 6;
+                    m = MC8K;
+                    break;
+                default:
+                    break;
             }
 
+            for (i = 0; i < 4; i++)
+                hitag2_byte(&state);
+            //send con2,pwdh0,pwdl0,pwdl1 encrypted as a response
+            tx[0] = hitag2_byte(&state) ^ ((tag.pages[0][1] >> 16) & 0xff);
+            tx[1] = hitag2_byte(&state) ^ tag.pwdh0;
+            tx[2] = hitag2_byte(&state) ^ tag.pwdl0;
+            tx[3] = hitag2_byte(&state) ^ tag.pwdl1;
             if (tag.mode != HT_STANDARD) {
                 //add crc8
                 *txlen = 40;
                 crc = CRC_PRESET;
-                for (i = 0; i < 4; i++)
-                    calc_crc(&crc, tx[i], 8);
-                tx[4] = crc;
+                calc_crc(&crc, ((tag.pages[0][1] >> 16) & 0xff), 8);
+                calc_crc(&crc, tag.pwdh0, 8);
+                calc_crc(&crc, tag.pwdl0, 8);
+                calc_crc(&crc, tag.pwdl1, 8);
+                tx[4] = (crc ^ hitag2_byte(&state));
             }
+            /*
+             * some readers do not allow to authenticate multiple times in a row with the same tag.
+             * use this to change the uid between authentications.
+             */
 
-            if (tag.LKP && (page == 2 || page == 3)) {
-                //if reader asks for key or password and the LKP-mark is set do not respond
-                sof_bits = 0;
-                *txlen = 0;
-            }
-        } else if ((rx[0] & 0xf0) == 0xd0) //read block
-                {
-            page = ((rx[0] & 0x0f) * 16) + ((rx[1] & 0xf0) / 16);
-            *txlen = 32 * 4;
-            //send page,...,page+3 data
-            for (i = 0; i < 4; i++) {
-                tx[0 + i * 4] = (tag.pages[page / 4][page % 4]) & 0xff;
-                tx[1 + i * 4] = (tag.pages[page / 4][page % 4] >> 8) & 0xff;
-                tx[2 + i * 4] = (tag.pages[page / 4][page % 4] >> 16) & 0xff;
-                tx[3 + i * 4] = (tag.pages[page / 4][page % 4] >> 24) & 0xff;
-                page++;
+            /*
+             if (temp2 % 2 == 0) {
+             tag.uid = 0x11223344;
+             tag.pages[0][0] = 0x44332211;
+             } else {
+             tag.uid = 0x55667788;
+             tag.pages[0][0] = 0x88776655;
+             }
+             */
+        }
+        case 40:
+            //data received to be written
+            if (tag.tstate == HT_WRITING_PAGE_DATA) {
+                tag.tstate = HT_NO_OP;
+                tag.pages[page_to_be_written / 4][page_to_be_written % 4] = (rx[0]
+                                                                            << 0) + (rx[1] << 8) + (rx[2] << 16) + (rx[3] << 24);
+                //send ack
+                *txlen = 2;
+                tx[0] = 0x40;
+                page_to_be_written = 0;
+                switch (tag.mode) {
+                    case HT_STANDARD:
+                        sof_bits = 1;
+                        m = MC4K;
+                        break;
+                    case HT_ADVANCED:
+                        sof_bits = 6;
+                        m = MC4K;
+                        break;
+                    case HT_FAST_ADVANCED:
+                        sof_bits = 6;
+                        m = MC8K;
+                        break;
+                    default:
+                        break;
+                }
+            } else if (tag.tstate == HT_WRITING_BLOCK_DATA) {
+                tag.pages[page_to_be_written / 4][page_to_be_written % 4] = (rx[0]
+                                                                            << 24) + (rx[1] << 16) + (rx[2] << 8) + rx[3];
+                //send ack
+                *txlen = 2;
+                tx[0] = 0x40;
+                switch (tag.mode) {
+                    case HT_STANDARD:
+                        sof_bits = 1;
+                        m = MC4K;
+                        break;
+                    case HT_ADVANCED:
+                        sof_bits = 6;
+                        m = MC4K;
+                        break;
+                    case HT_FAST_ADVANCED:
+                        sof_bits = 6;
+                        m = MC8K;
+                        break;
+                    default:
+                        break;
+                }
+                page_to_be_written++;
+                block_data_left--;
+                if (block_data_left == 0) {
+                    tag.tstate = HT_NO_OP;
+                    page_to_be_written = 0;
+                }
             }
+            break;
+        case 20: {
+            //write page, write block, read page or read block command received
+            if ((rx[0] & 0xf0) == 0xc0) { //read page
+                //send page data
+                page = ((rx[0] & 0x0f) * 16) + ((rx[1] & 0xf0) / 16);
+                *txlen = 32;
+                tx[0] = (tag.pages[page / 4][page % 4]) & 0xff;
+                tx[1] = (tag.pages[page / 4][page % 4] >> 8) & 0xff;
+                tx[2] = (tag.pages[page / 4][page % 4] >> 16) & 0xff;
+                tx[3] = (tag.pages[page / 4][page % 4] >> 24) & 0xff;
+                if (tag.LKP && page == 1)
+                    tx[3] = 0xff;
 
-            switch (tag.mode) {
-            case HT_STANDARD:
-                sof_bits = 1;
-                m = MC4K;
-                break;
-            case HT_ADVANCED:
-                sof_bits = 6;
-                m = MC4K;
-                break;
-            case HT_FAST_ADVANCED:
-                sof_bits = 6;
-                m = MC8K;
-                break;
-            default:
-                break;
-            }
+                switch (tag.mode) {
+                    case HT_STANDARD:
+                        sof_bits = 1;
+                        m = MC4K;
+                        break;
+                    case HT_ADVANCED:
+                        sof_bits = 6;
+                        m = MC4K;
+                        break;
+                    case HT_FAST_ADVANCED:
+                        sof_bits = 6;
+                        m = MC8K;
+                        break;
+                    default:
+                        break;
+                }
 
-            if (tag.mode != HT_STANDARD) {
-                //add crc8
-                *txlen = 32 * 4 + 8;
-                crc = CRC_PRESET;
-                for (i = 0; i < 16; i++)
-                    calc_crc(&crc, tx[i], 8);
-                tx[16] = crc;
-            }
+                if (tag.mode != HT_STANDARD) {
+                    //add crc8
+                    *txlen = 40;
+                    crc = CRC_PRESET;
+                    for (i = 0; i < 4; i++)
+                        calc_crc(&crc, tx[i], 8);
+                    tx[4] = crc;
+                }
 
-            if ((page - 4) % 4 != 0 || (tag.LKP && (page - 4) == 0)) {
-                sof_bits = 0;
-                *txlen = 0;
-            }
-        } else if ((rx[0] & 0xf0) == 0x80) //write page
-                {
-            page = ((rx[0] & 0x0f) * 16) + ((rx[1] & 0xf0) / 16);
+                if (tag.LKP && (page == 2 || page == 3)) {
+                    //if reader asks for key or password and the LKP-mark is set do not respond
+                    sof_bits = 0;
+                    *txlen = 0;
+                }
+            } else if ((rx[0] & 0xf0) == 0xd0) { //read block
+                page = ((rx[0] & 0x0f) * 16) + ((rx[1] & 0xf0) / 16);
+                *txlen = 32 * 4;
+                //send page,...,page+3 data
+                for (i = 0; i < 4; i++) {
+                    tx[0 + i * 4] = (tag.pages[page / 4][page % 4]) & 0xff;
+                    tx[1 + i * 4] = (tag.pages[page / 4][page % 4] >> 8) & 0xff;
+                    tx[2 + i * 4] = (tag.pages[page / 4][page % 4] >> 16) & 0xff;
+                    tx[3 + i * 4] = (tag.pages[page / 4][page % 4] >> 24) & 0xff;
+                    page++;
+                }
 
-            switch (tag.mode) {
-            case HT_STANDARD:
-                sof_bits = 1;
-                m = MC4K;
-                break;
-            case HT_ADVANCED:
-                sof_bits = 6;
-                m = MC4K;
-                break;
-            case HT_FAST_ADVANCED:
-                sof_bits = 6;
-                m = MC8K;
-                break;
-            default:
-                break;
-            }
-            if ((tag.LCON && page == 1)
+                switch (tag.mode) {
+                    case HT_STANDARD:
+                        sof_bits = 1;
+                        m = MC4K;
+                        break;
+                    case HT_ADVANCED:
+                        sof_bits = 6;
+                        m = MC4K;
+                        break;
+                    case HT_FAST_ADVANCED:
+                        sof_bits = 6;
+                        m = MC8K;
+                        break;
+                    default:
+                        break;
+                }
+
+                if (tag.mode != HT_STANDARD) {
+                    //add crc8
+                    *txlen = 32 * 4 + 8;
+                    crc = CRC_PRESET;
+                    for (i = 0; i < 16; i++)
+                        calc_crc(&crc, tx[i], 8);
+                    tx[16] = crc;
+                }
+
+                if ((page - 4) % 4 != 0 || (tag.LKP && (page - 4) == 0)) {
+                    sof_bits = 0;
+                    *txlen = 0;
+                }
+            } else if ((rx[0] & 0xf0) == 0x80) { //write page
+                page = ((rx[0] & 0x0f) * 16) + ((rx[1] & 0xf0) / 16);
+
+                switch (tag.mode) {
+                    case HT_STANDARD:
+                        sof_bits = 1;
+                        m = MC4K;
+                        break;
+                    case HT_ADVANCED:
+                        sof_bits = 6;
+                        m = MC4K;
+                        break;
+                    case HT_FAST_ADVANCED:
+                        sof_bits = 6;
+                        m = MC8K;
+                        break;
+                    default:
+                        break;
+                }
+                if ((tag.LCON && page == 1)
                     || (tag.LKP && (page == 2 || page == 3))) {
-                //deny
-                *txlen = 0;
-            } else {
-                //allow
-                *txlen = 2;
-                tx[0] = 0x40;
-                page_to_be_written = page;
-                tag.tstate = HT_WRITING_PAGE_DATA;
-            }
+                    //deny
+                    *txlen = 0;
+                } else {
+                    //allow
+                    *txlen = 2;
+                    tx[0] = 0x40;
+                    page_to_be_written = page;
+                    tag.tstate = HT_WRITING_PAGE_DATA;
+                }
 
-        } else if ((rx[0] & 0xf0) == 0x90) //write block
-                {
-            page = ((rx[0] & 0x0f) * 6) + ((rx[1] & 0xf0) / 16);
-            switch (tag.mode) {
-            case HT_STANDARD:
-                sof_bits = 1;
-                m = MC4K;
-                break;
-            case HT_ADVANCED:
-                sof_bits = 6;
-                m = MC4K;
-                break;
-            case HT_FAST_ADVANCED:
-                sof_bits = 6;
-                m = MC8K;
-                break;
-            default:
-                break;
-            }
-            if (page % 4 != 0 || page == 0) {
-                //deny
-                *txlen = 0;
-            } else {
-                //allow
-                *txlen = 2;
-                tx[0] = 0x40;
-                page_to_be_written = page;
-                block_data_left = 4;
-                tag.tstate = HT_WRITING_BLOCK_DATA;
+            } else if ((rx[0] & 0xf0) == 0x90) { //write block
+                page = ((rx[0] & 0x0f) * 6) + ((rx[1] & 0xf0) / 16);
+                switch (tag.mode) {
+                    case HT_STANDARD:
+                        sof_bits = 1;
+                        m = MC4K;
+                        break;
+                    case HT_ADVANCED:
+                        sof_bits = 6;
+                        m = MC4K;
+                        break;
+                    case HT_FAST_ADVANCED:
+                        sof_bits = 6;
+                        m = MC8K;
+                        break;
+                    default:
+                        break;
+                }
+                if (page % 4 != 0 || page == 0) {
+                    //deny
+                    *txlen = 0;
+                } else {
+                    //allow
+                    *txlen = 2;
+                    tx[0] = 0x40;
+                    page_to_be_written = page;
+                    block_data_left = 4;
+                    tag.tstate = HT_WRITING_BLOCK_DATA;
+                }
             }
         }
-    }
         break;
-    default:
+        default:
 
-        break;
+            break;
     }
 }
 
 /*
  * to autenticate to a tag with the given key or challenge
  */
-static int hitagS_handle_tag_auth(hitag_function htf,uint64_t key, uint64_t NrAr, byte_t* rx, const size_t rxlen, byte_t* tx,
-        size_t* txlen) {
+static int hitagS_handle_tag_auth(hitag_function htf, uint64_t key, uint64_t NrAr, byte_t *rx, const size_t rxlen, byte_t *tx,
+                                  size_t *txlen)
+{
     byte_t rx_air[HITAG_FRAME_LEN];
     int response_bit[200];
     int i, j, z, k;
@@ -742,7 +749,7 @@ static int hitagS_handle_tag_auth(hitag_function htf,uint64_t key, uint64_t NrAr
 
     if (tag.pstate == HT_READY && rxlen >= 67) {
         //received uid
-        if(end==true) {
+        if (end == true) {
             Dbprintf("authentication failed!");
             return -1;
         }
@@ -763,13 +770,13 @@ static int hitagS_handle_tag_auth(hitag_function htf,uint64_t key, uint64_t NrAr
                 break;
         }
         uid1 = (uid[0] << 7) | (uid[1] << 6) | (uid[2] << 5) | (uid[3] << 4)
-                | (uid[4] << 3) | (uid[5] << 2) | (uid[6] << 1) | uid[7];
+               | (uid[4] << 3) | (uid[5] << 2) | (uid[6] << 1) | uid[7];
         uid2 = (uid[8] << 7) | (uid[9] << 6) | (uid[10] << 5) | (uid[11] << 4)
-                | (uid[12] << 3) | (uid[13] << 2) | (uid[14] << 1) | uid[15];
+               | (uid[12] << 3) | (uid[13] << 2) | (uid[14] << 1) | uid[15];
         uid3 = (uid[16] << 7) | (uid[17] << 6) | (uid[18] << 5) | (uid[19] << 4)
-                | (uid[20] << 3) | (uid[21] << 2) | (uid[22] << 1) | uid[23];
+               | (uid[20] << 3) | (uid[21] << 2) | (uid[22] << 1) | uid[23];
         uid4 = (uid[24] << 7) | (uid[25] << 6) | (uid[26] << 5) | (uid[27] << 4)
-                | (uid[28] << 3) | (uid[29] << 2) | (uid[30] << 1) | uid[31];
+               | (uid[28] << 3) | (uid[29] << 2) | (uid[30] << 1) | uid[31];
         if (DEBUG)
             Dbprintf("UID: %02X %02X %02X %02X", uid1, uid2, uid3, uid4);
         tag.uid = (uid4 << 24 | uid3 << 16 | uid2 << 8 | uid1);
@@ -818,9 +825,9 @@ static int hitagS_handle_tag_auth(hitag_function htf,uint64_t key, uint64_t NrAr
             }
         }
         conf_pages[0] = ((response_bit[4] << 7) | (response_bit[5] << 6)
-                | (response_bit[6] << 5) | (response_bit[7] << 4)
-                | (response_bit[8] << 3) | (response_bit[9] << 2)
-                | (response_bit[10] << 1) | response_bit[11]);
+                         | (response_bit[6] << 5) | (response_bit[7] << 4)
+                         | (response_bit[8] << 3) | (response_bit[9] << 2)
+                         | (response_bit[10] << 1) | response_bit[11]);
         //check wich memorysize this tag has
         if (response_bit[10] == 0 && response_bit[11] == 0)
             tag.max_page = 32 / 32;
@@ -829,9 +836,9 @@ static int hitagS_handle_tag_auth(hitag_function htf,uint64_t key, uint64_t NrAr
         if (response_bit[10] == 1 && response_bit[11] == 0)
             tag.max_page = 2048 / 32;
         conf_pages[1] = ((response_bit[12] << 7) | (response_bit[13] << 6)
-                | (response_bit[14] << 5) | (response_bit[15] << 4)
-                | (response_bit[16] << 3) | (response_bit[17] << 2)
-                | (response_bit[18] << 1) | response_bit[19]);
+                         | (response_bit[14] << 5) | (response_bit[15] << 4)
+                         | (response_bit[16] << 3) | (response_bit[17] << 2)
+                         | (response_bit[18] << 1) | response_bit[19]);
         tag.auth = response_bit[12];
         tag.TTFC = response_bit[13];
         //tag.TTFDR in response_bit[14] and response_bit[15]
@@ -839,9 +846,9 @@ static int hitagS_handle_tag_auth(hitag_function htf,uint64_t key, uint64_t NrAr
         tag.LCON = response_bit[18];
         tag.LKP = response_bit[19];
         conf_pages[2] = ((response_bit[20] << 7) | (response_bit[21] << 6)
-                | (response_bit[22] << 5) | (response_bit[23] << 4)
-                | (response_bit[24] << 3) | (response_bit[25] << 2)
-                | (response_bit[26] << 1) | response_bit[27]);
+                         | (response_bit[22] << 5) | (response_bit[23] << 4)
+                         | (response_bit[24] << 3) | (response_bit[25] << 2)
+                         | (response_bit[26] << 1) | response_bit[27]);
         tag.LCK7 = response_bit[20];
         tag.LCK6 = response_bit[21];
         tag.LCK5 = response_bit[22];
@@ -853,14 +860,14 @@ static int hitagS_handle_tag_auth(hitag_function htf,uint64_t key, uint64_t NrAr
 
         if (DEBUG)
             Dbprintf("conf0: %02X conf1: %02X conf2: %02X", conf_pages[0],
-                    conf_pages[1], conf_pages[2]);
+                     conf_pages[1], conf_pages[2]);
         if (tag.auth == 1) {
             //if the tag is in authentication mode try the key or challenge
             *txlen = 64;
-            if(end!=true){
-                if(htf==02||htf==04){ //RHTS_KEY //WHTS_KEY
+            if (end != true) {
+                if (htf == 02 || htf == 04) { //RHTS_KEY //WHTS_KEY
                     state = hitag2_init(rev64(key), rev32(tag.uid),
-                            rev32(rnd));
+                                        rev32(rnd));
 
                     for (i = 0; i < 4; i++) {
                         auth_ks[i] = hitag2_byte(&state) ^ 0xff;
@@ -877,12 +884,12 @@ static int hitagS_handle_tag_auth(hitag_function htf,uint64_t key, uint64_t NrAr
                     tx[7] = auth_ks[3];
                     if (DEBUG)
                         Dbprintf("%02X %02X %02X %02X %02X %02X %02X %02X", tx[0],
-                                tx[1], tx[2], tx[3], tx[4], tx[5], tx[6], tx[7]);
-                } else if(htf==01 || htf==03) { //RHTS_CHALLENGE //WHTS_CHALLENGE
+                                 tx[1], tx[2], tx[3], tx[4], tx[5], tx[6], tx[7]);
+                } else if (htf == 01 || htf == 03) { //RHTS_CHALLENGE //WHTS_CHALLENGE
                     for (i = 0; i < 8; i++)
-                        tx[i]=((NrAr>>(56-(i*8)))&0xff);
+                        tx[i] = ((NrAr >> (56 - (i * 8))) & 0xff);
                 }
-                end=true;
+                end = true;
                 tag.pstate = HT_AUTHENTICATE;
             } else {
                 Dbprintf("authentication failed!");
@@ -906,29 +913,29 @@ static int hitagS_handle_tag_auth(hitag_function htf,uint64_t key, uint64_t NrAr
         }
 
         //decrypt password
-        pwdh0=0;
-        pwdl0=0;
-        pwdl1=0;
-        if(htf==02 || htf==04){ //RHTS_KEY //WHTS_KEY
-        {
-            state = hitag2_init(rev64(key), rev32(tag.uid), rev32(rnd));
-            for (i = 0; i < 5; i++)
-                hitag2_byte(&state);
-            pwdh0 = ((rx[1] & 0x0f) * 16 + ((rx[2] & 0xf0) / 16))
-                    ^ hitag2_byte(&state);
-            pwdl0 = ((rx[2] & 0x0f) * 16 + ((rx[3] & 0xf0) / 16))
-                    ^ hitag2_byte(&state);
-            pwdl1 = ((rx[3] & 0x0f) * 16 + ((rx[4] & 0xf0) / 16))
-                    ^ hitag2_byte(&state);
+        pwdh0 = 0;
+        pwdl0 = 0;
+        pwdl1 = 0;
+        if (htf == 02 || htf == 04) { //RHTS_KEY //WHTS_KEY
+            {
+                state = hitag2_init(rev64(key), rev32(tag.uid), rev32(rnd));
+                for (i = 0; i < 5; i++)
+                    hitag2_byte(&state);
+                pwdh0 = ((rx[1] & 0x0f) * 16 + ((rx[2] & 0xf0) / 16))
+                        ^ hitag2_byte(&state);
+                pwdl0 = ((rx[2] & 0x0f) * 16 + ((rx[3] & 0xf0) / 16))
+                        ^ hitag2_byte(&state);
+                pwdl1 = ((rx[3] & 0x0f) * 16 + ((rx[4] & 0xf0) / 16))
+                        ^ hitag2_byte(&state);
+            }
+
+            if (DEBUG)
+                Dbprintf("pwdh0 %02X pwdl0 %02X pwdl1 %02X", pwdh0, pwdl0, pwdl1);
+
+
+            //Dbprintf("%X %02X", rnd, ((rx[4] & 0x0f) * 16) + ((rx[5] & 0xf0) / 16));
+            //rnd += 1;
         }
-
-        if (DEBUG)
-            Dbprintf("pwdh0 %02X pwdl0 %02X pwdl1 %02X", pwdh0, pwdl0, pwdl1);
-
-
-        //Dbprintf("%X %02X", rnd, ((rx[4] & 0x0f) * 16) + ((rx[5] & 0xf0) / 16));
-        //rnd += 1;
-    }
         tag.pstate = HT_SELECTED; //tag is now ready for read/write commands
     }
     return 0;
@@ -938,7 +945,8 @@ static int hitagS_handle_tag_auth(hitag_function htf,uint64_t key, uint64_t NrAr
 /*
  * Emulates a Hitag S Tag with the given data from the .hts file
  */
-void SimulateHitagSTag(bool tag_mem_supplied, byte_t* data) {
+void SimulateHitagSTag(bool tag_mem_supplied, byte_t *data)
+{
     int frame_count;
     int response;
     int overflow;
@@ -948,10 +956,11 @@ void SimulateHitagSTag(bool tag_mem_supplied, byte_t* data) {
     //bool bQuitTraceFull = false;
     bQuiet = false;
     byte_t txbuf[HITAG_FRAME_LEN];
-    byte_t* tx = txbuf;
+    byte_t *tx = txbuf;
     size_t txlen = 0;
     // free eventually allocated BigBuf memory
-    BigBuf_free(); BigBuf_Clear_ext(false);
+    BigBuf_free();
+    BigBuf_Clear_ext(false);
 
     // Clean up trace and prepare it for storing frames
     set_tracing(true);
@@ -968,58 +977,58 @@ void SimulateHitagSTag(bool tag_mem_supplied, byte_t* data) {
     //read tag data into memory
     if (tag_mem_supplied) {
         DbpString("Loading hitagS memory...");
-        memcpy((byte_t*)tag.pages,data,4*64);
+        memcpy((byte_t *)tag.pages, data, 4 * 64);
     }
-    tag.uid=(uint32_t)tag.pages[0];
+    tag.uid = (uint32_t)tag.pages[0];
     Dbprintf("Hitag S simulation started");
-    tag.key=(intptr_t)tag.pages[3];
-    tag.key<<=16;
-    tag.key+=((tag.pages[2][0])<<8)+tag.pages[2][1];
-    tag.pwdl0=tag.pages[2][3];
-    tag.pwdl1=tag.pages[2][2];
-    tag.pwdh0=tag.pages[1][0];
+    tag.key = (intptr_t)tag.pages[3];
+    tag.key <<= 16;
+    tag.key += ((tag.pages[2][0]) << 8) + tag.pages[2][1];
+    tag.pwdl0 = tag.pages[2][3];
+    tag.pwdl1 = tag.pages[2][2];
+    tag.pwdh0 = tag.pages[1][0];
     //con0
-    tag.max_page=64;
-    if((tag.pages[1][3]&0x2)==0 && (tag.pages[1][3]&0x1)==1)
-        tag.max_page=8;
-    if((tag.pages[1][3]&0x2)==0 && (tag.pages[1][3]&0x1)==0)
-        tag.max_page=0;
+    tag.max_page = 64;
+    if ((tag.pages[1][3] & 0x2) == 0 && (tag.pages[1][3] & 0x1) == 1)
+        tag.max_page = 8;
+    if ((tag.pages[1][3] & 0x2) == 0 && (tag.pages[1][3] & 0x1) == 0)
+        tag.max_page = 0;
     //con1
-    tag.auth=0;
-    if((tag.pages[1][2]&0x80) == 0x80)
-        tag.auth=1;
-    tag.LCON=0;
-    if((tag.pages[1][2]&0x2) == 0x02)
-        tag.LCON=1;
-    tag.LKP=0;
-    if((tag.pages[1][2]&0x1) == 0x01)
-        tag.LKP=1;
+    tag.auth = 0;
+    if ((tag.pages[1][2] & 0x80) == 0x80)
+        tag.auth = 1;
+    tag.LCON = 0;
+    if ((tag.pages[1][2] & 0x2) == 0x02)
+        tag.LCON = 1;
+    tag.LKP = 0;
+    if ((tag.pages[1][2] & 0x1) == 0x01)
+        tag.LKP = 1;
     //con2
     //0=read write 1=read only
-    tag.LCK7=0;
-    if((tag.pages[1][1]&0x80) == 0x80)
-        tag.LCK7=1;
-    tag.LCK6=0;
-    if((tag.pages[1][1]&0x40) == 0x040)
-        tag.LCK6=1;
-    tag.LCK5=0;
-    if((tag.pages[1][1]&0x20) == 0x20)
-        tag.LCK5=1;
-    tag.LCK4=0;
-    if((tag.pages[1][1]&0x10) == 0x10)
-        tag.LCK4=1;
-    tag.LCK3=0;
-    if((tag.pages[1][1]&0x8) == 0x08)
-        tag.LCK3=1;
-    tag.LCK2=0;
-    if((tag.pages[1][1]&0x4) == 0x04)
-        tag.LCK2=1;
-    tag.LCK1=0;
-    if((tag.pages[1][1]&0x2) == 0x02)
-        tag.LCK1=1;
-    tag.LCK0=0;
-    if((tag.pages[1][1]&0x1) == 0x01)
-        tag.LCK0=1;
+    tag.LCK7 = 0;
+    if ((tag.pages[1][1] & 0x80) == 0x80)
+        tag.LCK7 = 1;
+    tag.LCK6 = 0;
+    if ((tag.pages[1][1] & 0x40) == 0x040)
+        tag.LCK6 = 1;
+    tag.LCK5 = 0;
+    if ((tag.pages[1][1] & 0x20) == 0x20)
+        tag.LCK5 = 1;
+    tag.LCK4 = 0;
+    if ((tag.pages[1][1] & 0x10) == 0x10)
+        tag.LCK4 = 1;
+    tag.LCK3 = 0;
+    if ((tag.pages[1][1] & 0x8) == 0x08)
+        tag.LCK3 = 1;
+    tag.LCK2 = 0;
+    if ((tag.pages[1][1] & 0x4) == 0x04)
+        tag.LCK2 = 1;
+    tag.LCK1 = 0;
+    if ((tag.pages[1][1] & 0x2) == 0x02)
+        tag.LCK1 = 1;
+    tag.LCK0 = 0;
+    if ((tag.pages[1][1] & 0x1) == 0x01)
+        tag.LCK0 = 1;
 
 // Set up simulator mode, frequency divisor which will drive the FPGA
 // and analog mux selection.
@@ -1050,7 +1059,7 @@ void SimulateHitagSTag(bool tag_mem_supplied, byte_t* data) {
 // Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
 // external trigger rising edge, load RA on rising edge of TIOA.
     AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK
-            | AT91C_TC_ETRGEDG_RISING | AT91C_TC_ABETRG | AT91C_TC_LDRA_RISING;
+                             | AT91C_TC_ETRGEDG_RISING | AT91C_TC_ABETRG | AT91C_TC_LDRA_RISING;
 
 // Reset the received frame, frame count and timing info
     memset(rx, 0x00, sizeof(rx));
@@ -1163,7 +1172,8 @@ void SimulateHitagSTag(bool tag_mem_supplied, byte_t* data) {
  * If the key was given the password will be decrypted.
  * Reads every page of a hitag S transpoder.
  */
-void ReadHitagS(hitag_function htf, hitag_data* htd) {
+void ReadHitagS(hitag_function htf, hitag_data *htd)
+{
     int i, j, z, k;
     int frame_count;
     int response_bit[200];
@@ -1171,7 +1181,7 @@ void ReadHitagS(hitag_function htf, hitag_data* htd) {
     byte_t rx[HITAG_FRAME_LEN];
     size_t rxlen = 0;
     byte_t txbuf[HITAG_FRAME_LEN];
-    byte_t* tx = txbuf;
+    byte_t *tx = txbuf;
     size_t txlen = 0;
     int lastbit;
     bool bSkip;
@@ -1197,18 +1207,21 @@ void ReadHitagS(hitag_function htf, hitag_data* htd) {
             memcpy(NrAr_, htd->auth.NrAr, 8);
             Dbhexdump(8, NrAr_, false);
             NrAr = NrAr_[7] | ((uint64_t)NrAr_[6]) << 8 | ((uint64_t)NrAr_[5]) << 16 | ((uint64_t)NrAr_[4]) << 24 | ((uint64_t)NrAr_[3]) << 32 |
-                        ((uint64_t)NrAr_[2]) << 40| ((uint64_t)NrAr_[1]) << 48 | ((uint64_t)NrAr_[0]) << 56;
-        } break;
+                   ((uint64_t)NrAr_[2]) << 40 | ((uint64_t)NrAr_[1]) << 48 | ((uint64_t)NrAr_[0]) << 56;
+        }
+        break;
         case 02: { //RHTS_KEY
             DbpString("Authenticating using key:");
             memcpy(key_, htd->crypto.key, 6);
             Dbhexdump(6, key_, false);
             key = key_[5] | ((uint64_t)key_[4]) << 8 | ((uint64_t)key_[3]) << 16 | ((uint64_t)key_[2]) << 24 | ((uint64_t)key_[1]) << 32 | ((uint64_t)key_[0]) << 40;
-        } break;
+        }
+        break;
         default: {
-            Dbprintf("Error , unknown function: %d",htf);
+            Dbprintf("Error , unknown function: %d", htf);
             return;
-        } break;
+        }
+        break;
     }
 
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
@@ -1230,7 +1243,7 @@ void ReadHitagS(hitag_function htf, hitag_data* htd) {
 
     // Set fpga in edge detect with reader field, we can modulate as reader now
     FpgaWriteConfWord(
-    FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_READER_FIELD);
+        FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_READER_FIELD);
 
     // Set Frequency divisor which will drive the FPGA and analog mux selection
     FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
@@ -1304,7 +1317,7 @@ void ReadHitagS(hitag_function htf, hitag_data* htd) {
             tag.pstate = HT_READY;
             tag.tstate = HT_NO_OP;
         } else if (tag.pstate != HT_SELECTED) {
-            if (hitagS_handle_tag_auth(htf, key,NrAr,rx, rxlen, tx, &txlen) == -1)
+            if (hitagS_handle_tag_auth(htf, key, NrAr, rx, rxlen, tx, &txlen) == -1)
                 bStop = !false;
         }
         if (tag.pstate == HT_SELECTED && tag.tstate == HT_NO_OP && rxlen > 0) {
@@ -1318,7 +1331,7 @@ void ReadHitagS(hitag_function htf, hitag_data* htd) {
             tx[1] = 0x00 + ((sendNum % 16) * 16) + (crc / 16);
             tx[2] = 0x00 + (crc % 16) * 16;
         } else if (tag.pstate == HT_SELECTED && tag.tstate == HT_READING_PAGE
-                && rxlen > 0) {
+                   && rxlen > 0) {
             //save received data
             z = 0;
             for (i = 0; i < 5; i++) {
@@ -1338,25 +1351,25 @@ void ReadHitagS(hitag_function htf, hitag_data* htd) {
                 tag.pages[sendNum / 4][sendNum % 4] = 0x0;
             for (i = 0; i < 4; i++) {
                 tag.pages[sendNum / 4][sendNum % 4] += ((pageData[i * 8] << 7)
-                        | (pageData[1 + (i * 8)] << 6)
-                        | (pageData[2 + (i * 8)] << 5)
-                        | (pageData[3 + (i * 8)] << 4)
-                        | (pageData[4 + (i * 8)] << 3)
-                        | (pageData[5 + (i * 8)] << 2)
-                        | (pageData[6 + (i * 8)] << 1) | pageData[7 + (i * 8)])
-                        << (i * 8);
+                                                        | (pageData[1 + (i * 8)] << 6)
+                                                        | (pageData[2 + (i * 8)] << 5)
+                                                        | (pageData[3 + (i * 8)] << 4)
+                                                        | (pageData[4 + (i * 8)] << 3)
+                                                        | (pageData[5 + (i * 8)] << 2)
+                                                        | (pageData[6 + (i * 8)] << 1) | pageData[7 + (i * 8)])
+                                                       << (i * 8);
             }
             if (tag.auth && tag.LKP && sendNum == 1) {
                 Dbprintf("Page[%2d]: %02X %02X %02X %02X", sendNum, pwdh0,
-                        (tag.pages[sendNum / 4][sendNum % 4] >> 16) & 0xff,
-                        (tag.pages[sendNum / 4][sendNum % 4] >> 8) & 0xff,
-                        tag.pages[sendNum / 4][sendNum % 4] & 0xff);
+                         (tag.pages[sendNum / 4][sendNum % 4] >> 16) & 0xff,
+                         (tag.pages[sendNum / 4][sendNum % 4] >> 8) & 0xff,
+                         tag.pages[sendNum / 4][sendNum % 4] & 0xff);
             } else {
                 Dbprintf("Page[%2d]: %02X %02X %02X %02X", sendNum,
-                        (tag.pages[sendNum / 4][sendNum % 4] >> 24) & 0xff,
-                        (tag.pages[sendNum / 4][sendNum % 4] >> 16) & 0xff,
-                        (tag.pages[sendNum / 4][sendNum % 4] >> 8) & 0xff,
-                        tag.pages[sendNum / 4][sendNum % 4] & 0xff);
+                         (tag.pages[sendNum / 4][sendNum % 4] >> 24) & 0xff,
+                         (tag.pages[sendNum / 4][sendNum % 4] >> 16) & 0xff,
+                         (tag.pages[sendNum / 4][sendNum % 4] >> 8) & 0xff,
+                         tag.pages[sendNum / 4][sendNum % 4] & 0xff);
             }
 
             sendNum++;
@@ -1364,13 +1377,13 @@ void ReadHitagS(hitag_function htf, hitag_data* htd) {
             if (sendNum == 2 && tag.auth == 1 && tag.LKP) {
                 if (htf == 02) { //RHTS_KEY
                     Dbprintf("Page[ 2]: %02X %02X %02X %02X",
-                            (byte_t)(key >> 8) & 0xff,
-                            (byte_t) key & 0xff, pwdl1, pwdl0);
+                             (byte_t)(key >> 8) & 0xff,
+                             (byte_t) key & 0xff, pwdl1, pwdl0);
                     Dbprintf("Page[ 3]: %02X %02X %02X %02X",
-                            (byte_t)(key >> 40) & 0xff,
-                            (byte_t)(key >> 32) & 0xff,
-                            (byte_t)(key >> 24) & 0xff,
-                            (byte_t)(key >> 16) & 0xff);
+                             (byte_t)(key >> 40) & 0xff,
+                             (byte_t)(key >> 32) & 0xff,
+                             (byte_t)(key >> 24) & 0xff,
+                             (byte_t)(key >> 16) & 0xff);
                 } else {
                     //if the authentication is done with a challenge the key and password are unknown
                     Dbprintf("Page[ 2]: __ __ __ __");
@@ -1505,13 +1518,14 @@ void ReadHitagS(hitag_function htf, hitag_data* htd) {
  * Authenticates to the Tag with the given Key or Challenge.
  * Writes the given 32Bit data into page_
  */
-void WritePageHitagS(hitag_function htf, hitag_data* htd,int page_) {
+void WritePageHitagS(hitag_function htf, hitag_data *htd, int page_)
+{
     int frame_count;
     int response;
     byte_t rx[HITAG_FRAME_LEN];
     size_t rxlen = 0;
     byte_t txbuf[HITAG_FRAME_LEN];
-    byte_t* tx = txbuf;
+    byte_t *tx = txbuf;
     size_t txlen = 0;
     int lastbit;
     bool bSkip;
@@ -1522,36 +1536,39 @@ void WritePageHitagS(hitag_function htf, hitag_data* htd,int page_) {
     bool bQuitTraceFull = false;
     int page = page_;
     unsigned char crc;
-    byte_t data[4]= {0,0,0,0};
+    byte_t data[4] = {0, 0, 0, 0};
 
     //read given key/challenge, the page and the data
     byte_t NrAr_[8];
-    uint64_t key=0;
-    uint64_t NrAr=0;
+    uint64_t key = 0;
+    uint64_t NrAr = 0;
     byte_t key_[6];
-    switch(htf) {
+    switch (htf) {
         case 03: { //WHTS_CHALLENGE
-            memcpy(data,htd->auth.data,4);
+            memcpy(data, htd->auth.data, 4);
             DbpString("Authenticating using nr,ar pair:");
-            memcpy(NrAr_,htd->auth.NrAr,8);
-            Dbhexdump(8,NrAr_,false);
-            NrAr=NrAr_[7] | ((uint64_t)NrAr_[6]) << 8 | ((uint64_t)NrAr_[5]) << 16 | ((uint64_t)NrAr_[4]) << 24 | ((uint64_t)NrAr_[3]) << 32 |
-                        ((uint64_t)NrAr_[2]) << 40| ((uint64_t)NrAr_[1]) << 48 | ((uint64_t)NrAr_[0]) << 56;
-        } break;
+            memcpy(NrAr_, htd->auth.NrAr, 8);
+            Dbhexdump(8, NrAr_, false);
+            NrAr = NrAr_[7] | ((uint64_t)NrAr_[6]) << 8 | ((uint64_t)NrAr_[5]) << 16 | ((uint64_t)NrAr_[4]) << 24 | ((uint64_t)NrAr_[3]) << 32 |
+                   ((uint64_t)NrAr_[2]) << 40 | ((uint64_t)NrAr_[1]) << 48 | ((uint64_t)NrAr_[0]) << 56;
+        }
+        break;
         case 04: { //WHTS_KEY
-            memcpy(data,htd->crypto.data,4);
+            memcpy(data, htd->crypto.data, 4);
             DbpString("Authenticating using key:");
-            memcpy(key_,htd->crypto.key,6);
-            Dbhexdump(6,key_,false);
-            key=key_[5] | ((uint64_t)key_[4]) << 8 | ((uint64_t)key_[3]) << 16 | ((uint64_t)key_[2]) << 24 | ((uint64_t)key_[1]) << 32 | ((uint64_t)key_[0]) << 40;
-        } break;
+            memcpy(key_, htd->crypto.key, 6);
+            Dbhexdump(6, key_, false);
+            key = key_[5] | ((uint64_t)key_[4]) << 8 | ((uint64_t)key_[3]) << 16 | ((uint64_t)key_[2]) << 24 | ((uint64_t)key_[1]) << 32 | ((uint64_t)key_[0]) << 40;
+        }
+        break;
         default: {
-            Dbprintf("Error , unknown function: %d",htf);
+            Dbprintf("Error , unknown function: %d", htf);
             return;
-        } break;
+        }
+        break;
     }
 
-    Dbprintf("Page: %d",page_);
+    Dbprintf("Page: %d", page_);
     Dbprintf("DATA: %02X %02X %02X %02X", data[0], data[1], data[2], data[3]);
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
 // Reset the return status
@@ -1575,7 +1592,7 @@ void WritePageHitagS(hitag_function htf, hitag_data* htd,int page_) {
 
 // Set fpga in edge detect with reader field, we can modulate as reader now
     FpgaWriteConfWord(
-    FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_READER_FIELD);
+        FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_READER_FIELD);
 
 // Set Frequency divisor which will drive the FPGA and analog mux selection
     FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
@@ -1601,8 +1618,8 @@ void WritePageHitagS(hitag_function htf, hitag_data* htd,int page_) {
 // Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
 // external trigger rising edge, load RA on falling edge of TIOA.
     AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK
-            | AT91C_TC_ETRGEDG_FALLING | AT91C_TC_ABETRG
-            | AT91C_TC_LDRA_FALLING;
+                             | AT91C_TC_ETRGEDG_FALLING | AT91C_TC_ABETRG
+                             | AT91C_TC_LDRA_FALLING;
 
 // Enable and reset counters
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
@@ -1639,7 +1656,7 @@ void WritePageHitagS(hitag_function htf, hitag_data* htd,int page_) {
         //check for valid input
         if (page == 0) {
             Dbprintf(
-                    "usage: lf hitag writer [03 | 04] [CHALLENGE | KEY] [page] [byte0] [byte1] [byte2] [byte3]");
+                "usage: lf hitag writer [03 | 04] [CHALLENGE | KEY] [page] [byte0] [byte1] [byte2] [byte3]");
             bStop = !false;
         }
 
@@ -1659,7 +1676,7 @@ void WritePageHitagS(hitag_function htf, hitag_data* htd,int page_) {
             tag.tstate = HT_NO_OP;
         } else if (tag.pstate != HT_SELECTED) {
             //try to authenticate with the given key or challenge
-            if (hitagS_handle_tag_auth(htf,key,NrAr,rx, rxlen, tx, &txlen) == -1)
+            if (hitagS_handle_tag_auth(htf, key, NrAr, rx, rxlen, tx, &txlen) == -1)
                 bStop = !false;
         }
         if (tag.pstate == HT_SELECTED && tag.tstate == HT_NO_OP && rxlen > 0) {
@@ -1678,7 +1695,7 @@ void WritePageHitagS(hitag_function htf, hitag_data* htd,int page_) {
             tx[1] = 0x00 + ((page % 16) * 16) + (crc / 16);
             tx[2] = 0x00 + (crc % 16) * 16;
         } else if (tag.pstate == HT_SELECTED && tag.tstate == HT_WRITING_PAGE_ACK
-                && rxlen == 6 && rx[0] == 0xf4) {
+                   && rxlen == 6 && rx[0] == 0xf4) {
             //ACK recieved to write the page. send data
             tag.tstate = HT_WRITING_PAGE_DATA;
             txlen = 40;
@@ -1693,7 +1710,7 @@ void WritePageHitagS(hitag_function htf, hitag_data* htd,int page_) {
             tx[3] = data[0];
             tx[4] = crc;
         } else if (tag.pstate == HT_SELECTED && tag.tstate == HT_WRITING_PAGE_DATA
-                && rxlen == 6 && rx[0] == 0xf4) {
+                   && rxlen == 6 && rx[0] == 0xf4) {
             //received ACK
             Dbprintf("Successful!");
             bStop = !false;
@@ -1710,7 +1727,7 @@ void WritePageHitagS(hitag_function htf, hitag_data* htd,int page_) {
         // All timer values are in terms of T0 units
 
         while (AT91C_BASE_TC0->TC_CV
-                < T0 * (t_wait + (HITAG_T_TAG_HALF_PERIOD * lastbit)))
+               < T0 * (t_wait + (HITAG_T_TAG_HALF_PERIOD * lastbit)))
             ;
 
         // Transmit the reader frame
@@ -1802,7 +1819,7 @@ void WritePageHitagS(hitag_function htf, hitag_data* htd,int page_) {
             }
         }
     }
-    end=false;
+    end = false;
     LED_B_OFF();
     LED_D_OFF();
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
@@ -1818,7 +1835,8 @@ void WritePageHitagS(hitag_function htf, hitag_data* htd,int page_) {
  * is not received correctly due to Antenna problems. This function
  * detects these challenges.
  */
-void check_challenges(bool file_given, byte_t* data) {
+void check_challenges(bool file_given, byte_t *data)
+{
     int i, j, z, k;
     byte_t uid_byte[4];
     int frame_count;
@@ -1828,7 +1846,7 @@ void check_challenges(bool file_given, byte_t* data) {
     int u1 = 0;
     size_t rxlen = 0;
     byte_t txbuf[HITAG_FRAME_LEN];
-    byte_t* tx = txbuf;
+    byte_t *tx = txbuf;
     size_t txlen = 0;
     int lastbit;
     bool bSkip;
@@ -1889,7 +1907,7 @@ void check_challenges(bool file_given, byte_t* data) {
 // external trigger rising edge, load RA on falling edge of TIOA.
     AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK
 
-    | AT91C_TC_ETRGEDG_FALLING | AT91C_TC_ABETRG | AT91C_TC_LDRA_FALLING;
+                             | AT91C_TC_ETRGEDG_FALLING | AT91C_TC_ABETRG | AT91C_TC_LDRA_FALLING;
 
 // Enable and reset counters
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
@@ -1906,7 +1924,7 @@ void check_challenges(bool file_given, byte_t* data) {
 
     if (file_given) {
         DbpString("Loading challenges...");
-        memcpy((byte_t*)unlocker,data,60*8);
+        memcpy((byte_t *)unlocker, data, 60 * 8);
     }
 
     while (file_given && !bStop && !BUTTON_PRESS()) {
@@ -1934,10 +1952,10 @@ void check_challenges(bool file_given, byte_t* data) {
             if (STATE == 2)
                 // challenge failed
                 Dbprintf("Challenge failed: %02X %02X %02X %02X %02X %02X %02X %02X",
-                        unlocker[u1 - 1][0], unlocker[u1 - 1][1],
-                        unlocker[u1 - 1][2], unlocker[u1 - 1][3],
-                        unlocker[u1 - 1][4], unlocker[u1 - 1][5],
-                        unlocker[u1 - 1][6], unlocker[u1 - 1][7]);
+                         unlocker[u1 - 1][0], unlocker[u1 - 1][1],
+                         unlocker[u1 - 1][2], unlocker[u1 - 1][3],
+                         unlocker[u1 - 1][4], unlocker[u1 - 1][5],
+                         unlocker[u1 - 1][6], unlocker[u1 - 1][7]);
             STATE = 0;
             txlen = 5;
             //start new authentication
@@ -1961,17 +1979,17 @@ void check_challenges(bool file_given, byte_t* data) {
                     break;
             }
             uid_byte[0] = (uid[0] << 7) | (uid[1] << 6) | (uid[2] << 5)
-                    | (uid[3] << 4) | (uid[4] << 3) | (uid[5] << 2)
-                    | (uid[6] << 1) | uid[7];
+                          | (uid[3] << 4) | (uid[4] << 3) | (uid[5] << 2)
+                          | (uid[6] << 1) | uid[7];
             uid_byte[1] = (uid[8] << 7) | (uid[9] << 6) | (uid[10] << 5)
-                    | (uid[11] << 4) | (uid[12] << 3) | (uid[13] << 2)
-                    | (uid[14] << 1) | uid[15];
+                          | (uid[11] << 4) | (uid[12] << 3) | (uid[13] << 2)
+                          | (uid[14] << 1) | uid[15];
             uid_byte[2] = (uid[16] << 7) | (uid[17] << 6) | (uid[18] << 5)
-                    | (uid[19] << 4) | (uid[20] << 3) | (uid[21] << 2)
-                    | (uid[22] << 1) | uid[23];
+                          | (uid[19] << 4) | (uid[20] << 3) | (uid[21] << 2)
+                          | (uid[22] << 1) | uid[23];
             uid_byte[3] = (uid[24] << 7) | (uid[25] << 6) | (uid[26] << 5)
-                    | (uid[27] << 4) | (uid[28] << 3) | (uid[29] << 2)
-                    | (uid[30] << 1) | uid[31];
+                          | (uid[27] << 4) | (uid[28] << 3) | (uid[29] << 2)
+                          | (uid[30] << 1) | uid[31];
             //Dbhexdump(10, rx, rxlen);
             STATE = 1;
             txlen = 45;
@@ -2042,7 +2060,7 @@ void check_challenges(bool file_given, byte_t* data) {
         // All timer values are in terms of T0 units
 
         while (AT91C_BASE_TC0->TC_CV
-                < T0 * (t_wait + (HITAG_T_TAG_HALF_PERIOD * lastbit)))
+               < T0 * (t_wait + (HITAG_T_TAG_HALF_PERIOD * lastbit)))
             ;
 
         // Transmit the reader frame
diff --git a/armsrc/iclass.c b/armsrc/iclass.c
index 7b529a999..d5f908a12 100644
--- a/armsrc/iclass.c
+++ b/armsrc/iclass.c
@@ -61,7 +61,7 @@ int doIClassSimulation(int simulationMode, uint8_t *reader_mac_buf);
 // The length of a received command will in most cases be no more than 18 bytes.
 // 32 should be enough!
 #ifndef ICLASS_BUFFER_SIZE
-    #define ICLASS_BUFFER_SIZE 32
+#define ICLASS_BUFFER_SIZE 32
 #endif
 
 #define AddCrc(data, len) compute_crc(CRC_ICLASS, (data), (len), (data)+(len), (data)+(len)+1)
@@ -141,16 +141,19 @@ typedef struct {
 } tUart;
 static tUart Uart;
 
-static void uart_reset(void){
+static void uart_reset(void)
+{
     Uart.frame_done = false;
     Uart.synced = false;
     Uart.frame = false;
 }
-static void uart_init(uint8_t *data){
+static void uart_init(uint8_t *data)
+{
     Uart.buf = data;
     uart_reset();
 }
-static void uart_bit(uint8_t bit) {
+static void uart_bit(uint8_t bit)
+{
     static uint8_t buf = 0xff;
     static uint8_t n_buf;
     static uint8_t msg_byte;
@@ -173,13 +176,13 @@ static void uart_bit(uint8_t bit) {
                 case 0xbf:    // 0 - 1011 1111
                     break;
                 case 0xef:    // 1 - 1110 1111
-                    msg_byte |= (1<<6);
+                    msg_byte |= (1 << 6);
                     break;
                 case 0xfb:    // 2 - 1111 1011
-                    msg_byte |= (2<<6);
+                    msg_byte |= (2 << 6);
                     break;
                 case 0xfe:    // 3 - 1111 1110
-                    msg_byte |= (3<<6);
+                    msg_byte |= (3 << 6);
                     break;
                 case 0xdf:    // eof - 1101 1111
                     Uart.frame = false;
@@ -205,7 +208,8 @@ static void uart_bit(uint8_t bit) {
     }
 }
 
-static void uart_samples(uint8_t byte) {
+static void uart_samples(uint8_t byte)
+{
     static uint32_t buf;
     static int window;
     static int drop_next = 0;
@@ -426,23 +430,23 @@ static RAMFUNC int OutOfNDecoding(int bit) {
                 }
             }
 */
-            /*if (error) {
-                Uart.output[Uart.byteCnt] = 0xAA;
-                Uart.byteCnt++;
-                Uart.output[Uart.byteCnt] = error & 0xFF;
-                Uart.byteCnt++;
-                Uart.output[Uart.byteCnt] = 0xAA;
-                Uart.byteCnt++;
-                Uart.output[Uart.byteCnt] = (Uart.bitBuffer >> 8) & 0xFF;
-                Uart.byteCnt++;
-                Uart.output[Uart.byteCnt] = Uart.bitBuffer & 0xFF;
-                Uart.byteCnt++;
-                Uart.output[Uart.byteCnt] = (Uart.syncBit >> 3) & 0xFF;
-                Uart.byteCnt++;
-                Uart.output[Uart.byteCnt] = 0xAA;
-                Uart.byteCnt++;
-                return true;
-            }*/
+/*if (error) {
+    Uart.output[Uart.byteCnt] = 0xAA;
+    Uart.byteCnt++;
+    Uart.output[Uart.byteCnt] = error & 0xFF;
+    Uart.byteCnt++;
+    Uart.output[Uart.byteCnt] = 0xAA;
+    Uart.byteCnt++;
+    Uart.output[Uart.byteCnt] = (Uart.bitBuffer >> 8) & 0xFF;
+    Uart.byteCnt++;
+    Uart.output[Uart.byteCnt] = Uart.bitBuffer & 0xFF;
+    Uart.byteCnt++;
+    Uart.output[Uart.byteCnt] = (Uart.syncBit >> 3) & 0xFF;
+    Uart.byteCnt++;
+    Uart.output[Uart.byteCnt] = 0xAA;
+    Uart.byteCnt++;
+    return true;
+}*/
 /*
         }
     } else {
@@ -500,7 +504,8 @@ static RAMFUNC int OutOfNDecoding(int bit) {
 // Manchester
 //=============================================================================
 static tDemod Demod;
-static void DemodReset() {
+static void DemodReset()
+{
     Demod.bitCount = 0;
     Demod.posCount = 0;
     Demod.syncBit = 0;
@@ -514,7 +519,8 @@ static void DemodReset() {
     Demod.sub = SUB_NONE;
     Demod.state = DEMOD_UNSYNCD;
 }
-static void DemodInit(uint8_t *data) {
+static void DemodInit(uint8_t *data)
+{
     Demod.output = data;
     DemodReset();
 }
@@ -540,7 +546,8 @@ Recorded Activity (TraceLen = 162 bytes)
        2720 |       2720 | Rdr |0c                                                               |     | IDENTIFY
        3232 |       3232 | Tag |bb! d4! bb! 02  02  08  04  bb!                                  |  ok |
 */
-static void uart_debug(int error, int bit) {
+static void uart_debug(int error, int bit)
+{
     Demod.output[Demod.len] = 0xBB;
     Demod.len++;
     Demod.output[Demod.len] = error & 0xFF;
@@ -576,7 +583,8 @@ static void uart_debug(int error, int bit) {
 *
 *  So for current implementation in ISO15693, its 330 µs from end of reader, to start of card.
 */
-static RAMFUNC int ManchesterDecoding_iclass( uint32_t v) {
+static RAMFUNC int ManchesterDecoding_iclass(uint32_t v)
+{
     int bit;
     int modulation;
     int error = 0;
@@ -629,10 +637,18 @@ static RAMFUNC int ManchesterDecoding_iclass( uint32_t v) {
             if (Demod.posCount) {
 
                 switch (Demod.syncBit) {
-                    case 0x08: Demod.samples = 3; break;
-                    case 0x04: Demod.samples = 2; break;
-                    case 0x02: Demod.samples = 1; break;
-                    case 0x01: Demod.samples = 0; break;
+                    case 0x08:
+                        Demod.samples = 3;
+                        break;
+                    case 0x04:
+                        Demod.samples = 2;
+                        break;
+                    case 0x02:
+                        Demod.samples = 1;
+                        break;
+                    case 0x01:
+                        Demod.samples = 0;
+                        break;
                 }
                 // SOF must be long burst... otherwise stay unsynced!!!
                 if (!(Demod.buffer & Demod.syncBit) || !(Demod.buffer2 & Demod.syncBit))
@@ -790,7 +806,8 @@ static RAMFUNC int ManchesterDecoding_iclass( uint32_t v) {
 // Finally, a `sniffer' for iClass communication
 // Both sides of communication!
 //=============================================================================
-static void iclass_setup_sniff(void){
+static void iclass_setup_sniff(void)
+{
     if (MF_DBGLEVEL > 3) Dbprintf("iclass_setup_sniff Enter");
 
     LEDsoff();
@@ -805,7 +822,8 @@ static void iclass_setup_sniff(void){
     // Set up the synchronous serial port
     FpgaSetupSsc();
 
-    BigBuf_free(); BigBuf_Clear_ext(false);
+    BigBuf_free();
+    BigBuf_Clear_ext(false);
     clear_trace();
     set_tracing(true);
 
@@ -842,7 +860,8 @@ static void iclass_setup_sniff(void){
 // near the reader.
 //-----------------------------------------------------------------------------
 // turn off afterwards
-void RAMFUNC SniffIClass(void) {
+void RAMFUNC SniffIClass(void)
+{
 
     //int datalen = 0;
     uint32_t previous_data = 0;
@@ -860,7 +879,7 @@ void RAMFUNC SniffIClass(void) {
     uint8_t *data = dmaBuf;
 
     // Setup and start DMA.
-    if ( !FpgaSetupSscDma(dmaBuf, ICLASS_DMA_BUFFER_SIZE) ){
+    if (!FpgaSetupSscDma(dmaBuf, ICLASS_DMA_BUFFER_SIZE)) {
         if (MF_DBGLEVEL > 1) DbpString("[-] FpgaSetupSscDma failed. Exiting");
         return;
     }
@@ -891,7 +910,7 @@ void RAMFUNC SniffIClass(void) {
             AT91C_BASE_PDC_SSC->PDC_RNCR = ICLASS_DMA_BUFFER_SIZE;
         }
 
-        if ( *data & 0xF) {
+        if (*data & 0xF) {
             //tag_byte <<= 1;
             tag_byte ^= (1 << 4);
             foo ^= (1 << (3 - div));
@@ -910,7 +929,7 @@ void RAMFUNC SniffIClass(void) {
                 uart_samples(reader_byte);
                 if (Uart.frame_done) {
                     time_stop = GetCountSspClk() - time_0;
-                    LogTrace( Uart.buf, Uart.len, time_start, time_stop, NULL, true);
+                    LogTrace(Uart.buf, Uart.len, time_start, time_stop, NULL, true);
                     DemodReset();
                     uart_reset();
                 } else {
@@ -920,7 +939,7 @@ void RAMFUNC SniffIClass(void) {
             }
         }
         // every four sample
-        if ( (sniffCounter % 4) == 0) {
+        if ((sniffCounter % 4) == 0) {
             // need two samples to feed Manchester
             // no need to try decoding tag data if the reader is sending - and we cannot afford the time
             // CARD TO READER
@@ -959,15 +978,16 @@ void RAMFUNC SniffIClass(void) {
     if (MF_DBGLEVEL >= 1) {
         DbpString("[+] Sniff statistics:");
         Dbhexdump(ICLASS_DMA_BUFFER_SIZE, data, false);
-        }
+    }
 
     switch_off();
 }
 
-void rotateCSN(uint8_t* originalCSN, uint8_t* rotatedCSN) {
+void rotateCSN(uint8_t *originalCSN, uint8_t *rotatedCSN)
+{
     int i;
-    for(i = 0; i < 8; i++)
-        rotatedCSN[i] = (originalCSN[i] >> 3) | (originalCSN[(i+1)%8] << 5);
+    for (i = 0; i < 8; i++)
+        rotatedCSN[i] = (originalCSN[i] >> 3) | (originalCSN[(i + 1) % 8] << 5);
 }
 
 //-----------------------------------------------------------------------------
@@ -976,7 +996,8 @@ void rotateCSN(uint8_t* originalCSN, uint8_t* rotatedCSN) {
 // Stop when button is pressed
 // Or return TRUE when command is captured
 //-----------------------------------------------------------------------------
-static bool GetIClassCommandFromReader(uint8_t *received, int *len, int maxLen) {
+static bool GetIClassCommandFromReader(uint8_t *received, int *len, int maxLen)
+{
     // Set FPGA mode to "simulated ISO 14443 tag", no modulation (listen
     // only, since we are receiving, not transmitting).
     // Signal field is off with the appropriate LED
@@ -990,7 +1011,7 @@ static bool GetIClassCommandFromReader(uint8_t *received, int *len, int maxLen)
     while (!BUTTON_PRESS()) {
         WDT_HIT();
 
-         // keep tx buffer in a defined state anyway.
+        // keep tx buffer in a defined state anyway.
         if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY))
             AT91C_BASE_SSC->SSC_THR = 0x00;
 
@@ -1008,7 +1029,8 @@ static bool GetIClassCommandFromReader(uint8_t *received, int *len, int maxLen)
     return false;
 }
 
-static uint8_t encode4Bits(const uint8_t b) {
+static uint8_t encode4Bits(const uint8_t b)
+{
     // OTA, the least significant bits first
     // Manchester encoding added
     //         The columns are
@@ -1019,30 +1041,47 @@ static uint8_t encode4Bits(const uint8_t b) {
 
     uint8_t c = b & 0xF;
     switch (c) {
-                            //  1       2         3         4
-      case 15: return 0x55; // 1111 -> 1111 -> 01010101 -> 0x55
-      case 14: return 0x95; // 1110 -> 0111 -> 10010101 -> 0x95
-      case 13: return 0x65; // 1101 -> 1011 -> 01100101 -> 0x65
-      case 12: return 0xa5; // 1100 -> 0011 -> 10100101 -> 0xa5
-      case 11: return 0x59; // 1011 -> 1101 -> 01011001 -> 0x59
-      case 10: return 0x99; // 1010 -> 0101 -> 10011001 -> 0x99
-      case 9:  return 0x69; // 1001 -> 1001 -> 01101001 -> 0x69
-      case 8:  return 0xa9; // 1000 -> 0001 -> 10101001 -> 0xa9
-      case 7:  return 0x56; // 0111 -> 1110 -> 01010110 -> 0x56
-      case 6:  return 0x96; // 0110 -> 0110 -> 10010110 -> 0x96
-      case 5:  return 0x66; // 0101 -> 1010 -> 01100110 -> 0x66
-      case 4:  return 0xa6; // 0100 -> 0010 -> 10100110 -> 0xa6
-      case 3:  return 0x5a; // 0011 -> 1100 -> 01011010 -> 0x5a
-      case 2:  return 0x9a; // 0010 -> 0100 -> 10011010 -> 0x9a
-      case 1:  return 0x6a; // 0001 -> 1000 -> 01101010 -> 0x6a
-      default: return 0xaa; // 0000 -> 0000 -> 10101010 -> 0xaa
+        //  1       2         3         4
+        case 15:
+            return 0x55; // 1111 -> 1111 -> 01010101 -> 0x55
+        case 14:
+            return 0x95; // 1110 -> 0111 -> 10010101 -> 0x95
+        case 13:
+            return 0x65; // 1101 -> 1011 -> 01100101 -> 0x65
+        case 12:
+            return 0xa5; // 1100 -> 0011 -> 10100101 -> 0xa5
+        case 11:
+            return 0x59; // 1011 -> 1101 -> 01011001 -> 0x59
+        case 10:
+            return 0x99; // 1010 -> 0101 -> 10011001 -> 0x99
+        case 9:
+            return 0x69; // 1001 -> 1001 -> 01101001 -> 0x69
+        case 8:
+            return 0xa9; // 1000 -> 0001 -> 10101001 -> 0xa9
+        case 7:
+            return 0x56; // 0111 -> 1110 -> 01010110 -> 0x56
+        case 6:
+            return 0x96; // 0110 -> 0110 -> 10010110 -> 0x96
+        case 5:
+            return 0x66; // 0101 -> 1010 -> 01100110 -> 0x66
+        case 4:
+            return 0xa6; // 0100 -> 0010 -> 10100110 -> 0xa6
+        case 3:
+            return 0x5a; // 0011 -> 1100 -> 01011010 -> 0x5a
+        case 2:
+            return 0x9a; // 0010 -> 0100 -> 10011010 -> 0x9a
+        case 1:
+            return 0x6a; // 0001 -> 1000 -> 01101010 -> 0x6a
+        default:
+            return 0xaa; // 0000 -> 0000 -> 10101010 -> 0xaa
     }
 }
 
 //-----------------------------------------------------------------------------
 // Prepare tag messages
 //-----------------------------------------------------------------------------
-static void CodeIClassTagAnswer(const uint8_t *cmd, int len) {
+static void CodeIClassTagAnswer(const uint8_t *cmd, int len)
+{
     /*
      * SOF comprises 3 parts;
      * * An unmodulated time of 56.64 us
@@ -1082,7 +1121,7 @@ static void CodeIClassTagAnswer(const uint8_t *cmd, int len) {
     ToSend[++ToSendMax] = 0x1D;
 
     int i;
-    for(i = 0; i < len; i++) {
+    for (i = 0; i < len; i++) {
         uint8_t b = cmd[i];
         ToSend[++ToSendMax] = encode4Bits(b & 0xF); // least significant half
         ToSend[++ToSendMax] = encode4Bits((b >> 4) & 0xF); // most significant half
@@ -1096,7 +1135,8 @@ static void CodeIClassTagAnswer(const uint8_t *cmd, int len) {
 }
 
 // Only SOF
-static void CodeIClassTagSOF() {
+static void CodeIClassTagSOF()
+{
     //So far a dummy implementation, not used
     //int lastProxToAirDuration =0;
 
@@ -1122,7 +1162,8 @@ static void CodeIClassTagSOF() {
  * @param datain
  */
 // turn off afterwards
-void SimulateIClass(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain) {
+void SimulateIClass(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)
+{
 
     if (MF_DBGLEVEL > 3) Dbprintf("[+] iClass_simulate Enter");
 
@@ -1161,14 +1202,14 @@ void SimulateIClass(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain
         // In this mode, a number of csns are within datain. We'll simulate each one, one at a time
         // in order to collect MAC's from the reader. This can later be used in an offlne-attack
         // in order to obtain the keys, as in the "dismantling iclass"-paper.
-        #define EPURSE_MAC_SIZE 16
+#define EPURSE_MAC_SIZE 16
         int i = 0;
         for (; i < numberOfCSNS && i * EPURSE_MAC_SIZE + 8 < USB_CMD_DATA_SIZE; i++) {
             // The usb data is 512 bytes, fitting 65 8-byte CSNs in there.
 
-            memcpy(emulator, datain + (i*8), 8);
+            memcpy(emulator, datain + (i * 8), 8);
 
-            if (doIClassSimulation(MODE_EXIT_AFTER_MAC, mac_responses+i * EPURSE_MAC_SIZE)) {
+            if (doIClassSimulation(MODE_EXIT_AFTER_MAC, mac_responses + i * EPURSE_MAC_SIZE)) {
                 // Button pressed
                 cmd_send(CMD_ACK, CMD_SIMULATE_TAG_ICLASS, i, 0, mac_responses, i * EPURSE_MAC_SIZE);
                 goto out;
@@ -1176,11 +1217,11 @@ void SimulateIClass(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain
         }
         cmd_send(CMD_ACK, CMD_SIMULATE_TAG_ICLASS, i, 0, mac_responses, i * EPURSE_MAC_SIZE);
 
-    } else if (simType == 3){
+    } else if (simType == 3) {
         //This is 'full sim' mode, where we use the emulator storage for data.
         //ie:  BigBuf_get_EM_addr should be previously filled with data from the "eload" command
         doIClassSimulation(MODE_FULLSIM, NULL);
-    } else if (simType == 4){
+    } else if (simType == 4) {
 
         // This is the KEYROLL version of sim 2.
         // the collected data (mac_response) is doubled out since we are trying to collect both keys in the keyroll process.
@@ -1197,24 +1238,24 @@ void SimulateIClass(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain
         // The usb data is 512 bytes, fitting 65 8-byte CSNs in there.  iceman fork uses 9 CSNS
         for (; i < numberOfCSNS && i * EPURSE_MAC_SIZE + 8 < USB_CMD_DATA_SIZE; i++) {
 
-            memcpy(emulator, datain + (i*8), 8);
+            memcpy(emulator, datain + (i * 8), 8);
 
             // keyroll 1
-            if (doIClassSimulation(MODE_EXIT_AFTER_MAC, mac_responses + i * EPURSE_MAC_SIZE )) {
-                cmd_send(CMD_ACK, CMD_SIMULATE_TAG_ICLASS, i*2, 0, mac_responses, i * EPURSE_MAC_SIZE * 2);
+            if (doIClassSimulation(MODE_EXIT_AFTER_MAC, mac_responses + i * EPURSE_MAC_SIZE)) {
+                cmd_send(CMD_ACK, CMD_SIMULATE_TAG_ICLASS, i * 2, 0, mac_responses, i * EPURSE_MAC_SIZE * 2);
                 // Button pressed
                 goto out;
             }
 
             // keyroll 2
-            if (doIClassSimulation(MODE_EXIT_AFTER_MAC, mac_responses + (i + numberOfCSNS) * EPURSE_MAC_SIZE )) {
-                cmd_send(CMD_ACK, CMD_SIMULATE_TAG_ICLASS, i*2, 0, mac_responses, i * EPURSE_MAC_SIZE* 2);
+            if (doIClassSimulation(MODE_EXIT_AFTER_MAC, mac_responses + (i + numberOfCSNS) * EPURSE_MAC_SIZE)) {
+                cmd_send(CMD_ACK, CMD_SIMULATE_TAG_ICLASS, i * 2, 0, mac_responses, i * EPURSE_MAC_SIZE * 2);
                 // Button pressed
                 goto out;
             }
         }
         // double the amount of collected data.
-        cmd_send(CMD_ACK, CMD_SIMULATE_TAG_ICLASS, i*2, 0, mac_responses, i * EPURSE_MAC_SIZE * 2 );
+        cmd_send(CMD_ACK, CMD_SIMULATE_TAG_ICLASS, i * 2, 0, mac_responses, i * EPURSE_MAC_SIZE * 2);
 
     } else {
         // We may want a mode here where we hardcode the csns to use (from proxclone).
@@ -1232,7 +1273,8 @@ out:
  * @param csn - csn to use
  * @param breakAfterMacReceived if true, returns after reader MAC has been received.
  */
-int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf) {
+int doIClassSimulation(int simulationMode, uint8_t *reader_mac_buf)
+{
 
     // free eventually allocated BigBuf memory
     BigBuf_free_keep_EM();
@@ -1257,15 +1299,15 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf) {
 
     uint8_t diversified_key[8] = { 0 };
     // e-Purse
-    uint8_t card_challenge_data[8] = { 0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff };
+    uint8_t card_challenge_data[8] = { 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
     //uint8_t card_challenge_data[8] = { 0 };
     if (simulationMode == MODE_FULLSIM) {
         //The diversified key should be stored on block 3
         //Get the diversified key from emulator memory
-        memcpy(diversified_key, emulator+(8*3),8);
+        memcpy(diversified_key, emulator + (8 * 3), 8);
 
         //Card challenge, a.k.a e-purse is on block 2
-        memcpy(card_challenge_data, emulator + (8 * 2) ,8);
+        memcpy(card_challenge_data, emulator + (8 * 2), 8);
         //Precalculate the cipher state, feeding it the CC
         cipher_state = opt_doTagMAC_1(card_challenge_data, diversified_key);
     }
@@ -1284,7 +1326,7 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf) {
 
     uint8_t *modulated_response;
     int modulated_response_size = 0;
-    uint8_t* trace_data = NULL;
+    uint8_t *trace_data = NULL;
     int trace_data_size = 0;
 
     // Respond SOF -- takes 1 bytes
@@ -1304,7 +1346,7 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf) {
     // configuration  picopass 2ks
     uint8_t *resp_conf = BigBuf_malloc(28);
     int resp_conf_len;
-    uint8_t conf_data[10] = {0x12,0xFF,0xFF,0xFF,0x7F,0x1F,0xFF,0x3C,0x00,0x00};
+    uint8_t conf_data[10] = {0x12, 0xFF, 0xFF, 0xFF, 0x7F, 0x1F, 0xFF, 0x3C, 0x00, 0x00};
     AddCrc(conf_data, 8);
 
     // e-Purse
@@ -1315,7 +1357,7 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf) {
     // Application Issuer Area
     uint8_t *resp_aia = BigBuf_malloc(28);
     int resp_aia_len;
-    uint8_t aia_data[10] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x00,0x00};
+    uint8_t aia_data[10] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00};
     AddCrc(aia_data, 8);
 
     // receive command
@@ -1327,27 +1369,33 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf) {
 
     // First card answer: SOF
     CodeIClassTagSOF();
-    memcpy(resp_sof, ToSend, ToSendMax); resp_sof_Len = ToSendMax;
+    memcpy(resp_sof, ToSend, ToSendMax);
+    resp_sof_Len = ToSendMax;
 
     // Anticollision CSN
     CodeIClassTagAnswer(anticoll_data, sizeof(anticoll_data));
-    memcpy(resp_anticoll, ToSend, ToSendMax); resp_anticoll_len = ToSendMax;
+    memcpy(resp_anticoll, ToSend, ToSendMax);
+    resp_anticoll_len = ToSendMax;
 
     // CSN
     CodeIClassTagAnswer(csn_data, sizeof(csn_data));
-    memcpy(resp_csn, ToSend, ToSendMax); resp_csn_len = ToSendMax;
+    memcpy(resp_csn, ToSend, ToSendMax);
+    resp_csn_len = ToSendMax;
 
     // Configuration
     CodeIClassTagAnswer(conf_data, sizeof(conf_data));
-    memcpy(resp_conf, ToSend, ToSendMax); resp_conf_len = ToSendMax;
+    memcpy(resp_conf, ToSend, ToSendMax);
+    resp_conf_len = ToSendMax;
 
     // e-Purse
     CodeIClassTagAnswer(card_challenge_data, sizeof(card_challenge_data));
-    memcpy(resp_cc, ToSend, ToSendMax); resp_cc_len = ToSendMax;
+    memcpy(resp_cc, ToSend, ToSendMax);
+    resp_cc_len = ToSendMax;
 
     // Application Issuer Area
     CodeIClassTagAnswer(aia_data, sizeof(aia_data));
-    memcpy(resp_aia, ToSend, ToSendMax); resp_aia_len = ToSendMax;
+    memcpy(resp_aia, ToSend, ToSendMax);
+    resp_aia_len = ToSendMax;
 
     //This is used for responding to READ-block commands or other data which is dynamically generated
     //First the 'trace'-data, not encoded for FPGA
@@ -1355,7 +1403,7 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf) {
 
     //Then storage for the modulated data
     //Each bit is doubled when modulated for FPGA, and we also have SOF and EOF (2 bytes)
-    uint8_t *data_response = BigBuf_malloc( (8+2) * 2 + 2);
+    uint8_t *data_response = BigBuf_malloc((8 + 2) * 2 + 2);
 
     FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_TAGSIM_LISTEN);
     SpinDelay(100);
@@ -1373,7 +1421,8 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf) {
         WDT_HIT();
 
         //Signal tracer, can be used to get a trigger for an oscilloscope..
-        LED_B_OFF(); LED_C_OFF();
+        LED_B_OFF();
+        LED_C_OFF();
 
         r2t_stime = (GetCountSspClk() - time_0) << 4;
         if (!GetIClassCommandFromReader(receivedCmd, &len, 0)) {
@@ -1381,15 +1430,16 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf) {
             exitLoop = true;
             continue;
         }
-        r2t_etime = ((GetCountSspClk() - time_0) << 4 ) - r2t_stime;
+        r2t_etime = ((GetCountSspClk() - time_0) << 4) - r2t_stime;
 
         // 330us normal wait,  adjusted for our execution
 
         LED_C_ON(); //Signal tracer
 
-        if (receivedCmd[0] == ICLASS_CMD_ACTALL ) {  // 0x0A
+        if (receivedCmd[0] == ICLASS_CMD_ACTALL) {   // 0x0A
             // Reader in anticollission phase
-            modulated_response = resp_sof; modulated_response_size = resp_sof_Len; //order = 1;
+            modulated_response = resp_sof;
+            modulated_response_size = resp_sof_Len; //order = 1;
             trace_data = sof_data;
             trace_data_size = sizeof(sof_data);
             // adjusted for 330 + (160*num of slot)
@@ -1397,26 +1447,30 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf) {
         } else if (receivedCmd[0] == ICLASS_CMD_READ_OR_IDENTIFY) { // 0x0C
             if (len == 1) {
                 // Reader asks for anticollission CSN
-                modulated_response = resp_anticoll; modulated_response_size = resp_anticoll_len; //order = 2;
+                modulated_response = resp_anticoll;
+                modulated_response_size = resp_anticoll_len; //order = 2;
                 trace_data = anticoll_data;
                 trace_data_size = sizeof(anticoll_data);
                 goto send;
             }
-            if (len == 4){
+            if (len == 4) {
                 // block0,1,2,5 is always readable.
-                switch (receivedCmd[1]){
+                switch (receivedCmd[1]) {
                     case 0: // csn (0c 00)
-                        modulated_response = resp_csn; modulated_response_size = resp_csn_len;
+                        modulated_response = resp_csn;
+                        modulated_response_size = resp_csn_len;
                         trace_data = csn_data;
                         trace_data_size = sizeof(csn_data);
                         break;
                     case 1: // configuration (0c 01)
-                        modulated_response = resp_conf; modulated_response_size = resp_conf_len;
+                        modulated_response = resp_conf;
+                        modulated_response_size = resp_conf_len;
                         trace_data = conf_data;
                         trace_data_size = sizeof(conf_data);
                         break;
                     case 2: // e-purse (0c 02)
-                        modulated_response = resp_cc; modulated_response_size = resp_cc_len;
+                        modulated_response = resp_cc;
+                        modulated_response_size = resp_cc_len;
                         trace_data = card_challenge_data;
                         trace_data_size = sizeof(card_challenge_data);
                         // set epurse of sim2,4 attack
@@ -1425,11 +1479,13 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf) {
                         }
                         break;
                     case 5:// Application Issuer Area (0c 05)
-                        modulated_response = resp_aia; modulated_response_size = resp_aia_len;
+                        modulated_response = resp_aia;
+                        modulated_response_size = resp_aia_len;
                         trace_data = aia_data;
                         trace_data_size = sizeof(aia_data);
                         break;
-                    default: break;
+                    default:
+                        break;
                 }
                 goto send;
             }
@@ -1437,20 +1493,23 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf) {
         } else if (receivedCmd[0] == ICLASS_CMD_SELECT) { // 0x81
             // Reader selects anticollission CSN.
             // Tag sends the corresponding real CSN
-            modulated_response = resp_csn; modulated_response_size = resp_csn_len; //order = 3;
+            modulated_response = resp_csn;
+            modulated_response_size = resp_csn_len; //order = 3;
             trace_data = csn_data;
             trace_data_size = sizeof(csn_data);
             goto send;
         } else if (receivedCmd[0] == ICLASS_CMD_READCHECK_KD) { // 0x88
             // Read e-purse (88 02)
-            modulated_response = resp_cc; modulated_response_size = resp_cc_len; //order = 4;
+            modulated_response = resp_cc;
+            modulated_response_size = resp_cc_len; //order = 4;
             trace_data = card_challenge_data;
             trace_data_size = sizeof(card_challenge_data);
             LED_B_ON();
             goto send;
         } else if (receivedCmd[0] == ICLASS_CMD_READCHECK_KC) { // 0x18
             // Read e-purse (18 02)
-            modulated_response = resp_cc; modulated_response_size = resp_cc_len; //order = 4;
+            modulated_response = resp_cc;
+            modulated_response_size = resp_cc_len; //order = 4;
             trace_data = card_challenge_data;
             trace_data_size = sizeof(card_challenge_data);
             LED_B_ON();
@@ -1459,34 +1518,35 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf) {
             // Reader random and reader MAC!!!
             if (simulationMode == MODE_FULLSIM) {
                 // NR, from reader, is in receivedCmd +1
-                opt_doTagMAC_2(cipher_state, receivedCmd+1, data_generic_trace, diversified_key);
+                opt_doTagMAC_2(cipher_state, receivedCmd + 1, data_generic_trace, diversified_key);
 
                 trace_data = data_generic_trace;
                 trace_data_size = 4;
-                CodeIClassTagAnswer(trace_data , trace_data_size);
+                CodeIClassTagAnswer(trace_data, trace_data_size);
                 memcpy(data_response, ToSend, ToSendMax);
                 modulated_response = data_response;
                 modulated_response_size = ToSendMax;
             } else {
                 // Not fullsim, we don't respond
                 // We do not know what to answer, so lets keep quiet
-                modulated_response = resp_sof; modulated_response_size = 0;
+                modulated_response = resp_sof;
+                modulated_response_size = 0;
                 trace_data = NULL;
                 trace_data_size = 0;
 
                 if (simulationMode == MODE_EXIT_AFTER_MAC) {
 
-                    if ( MF_DBGLEVEL ==  MF_DBG_EXTENDED) {
+                    if (MF_DBGLEVEL ==  MF_DBG_EXTENDED) {
                         Dbprintf("[+] CSN: %02x %02x %02x %02x %02x %02x %02x %02x", csn[0], csn[1], csn[2], csn[3], csn[4], csn[5], csn[6], csn[7]);
                         Dbprintf("[+] RDR:  (len=%02d): %02x %02x %02x %02x %02x %02x %02x %02x %02x", len,
-                            receivedCmd[0], receivedCmd[1], receivedCmd[2],
-                            receivedCmd[3], receivedCmd[4], receivedCmd[5],
-                            receivedCmd[6], receivedCmd[7], receivedCmd[8]);
+                                 receivedCmd[0], receivedCmd[1], receivedCmd[2],
+                                 receivedCmd[3], receivedCmd[4], receivedCmd[5],
+                                 receivedCmd[6], receivedCmd[7], receivedCmd[8]);
                     } else {
                         Dbprintf("[+] CSN: %02x .... %02x OK", csn[0], csn[7]);
                     }
                     if (reader_mac_buf != NULL) {
-                        memcpy(reader_mac_buf + 8, receivedCmd+1, 8);
+                        memcpy(reader_mac_buf + 8, receivedCmd + 1, 8);
                     }
                     exitLoop = true;
                 }
@@ -1494,19 +1554,20 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf) {
             goto send;
         } else if (receivedCmd[0] == ICLASS_CMD_HALT && len == 1) {
             // Reader ends the session
-            modulated_response = resp_sof; modulated_response_size = 0; //order = 0;
+            modulated_response = resp_sof;
+            modulated_response_size = 0; //order = 0;
             trace_data = NULL;
             trace_data_size = 0;
             goto send;
-        } else if (simulationMode == MODE_FULLSIM && receivedCmd[0] == ICLASS_CMD_READ_OR_IDENTIFY && len == 4){ // 0x0C
+        } else if (simulationMode == MODE_FULLSIM && receivedCmd[0] == ICLASS_CMD_READ_OR_IDENTIFY && len == 4) { // 0x0C
             //Read block
             uint16_t blk = receivedCmd[1];
             //Take the data...
-            memcpy(data_generic_trace, emulator+(blk << 3),8);
+            memcpy(data_generic_trace, emulator + (blk << 3), 8);
             AddCrc(data_generic_trace, 8);
             trace_data = data_generic_trace;
             trace_data_size = 10;
-            CodeIClassTagAnswer(trace_data , trace_data_size);
+            CodeIClassTagAnswer(trace_data, trace_data_size);
             memcpy(data_response, ToSend, ToSendMax);
             modulated_response = data_response;
             modulated_response_size = ToSendMax;
@@ -1519,7 +1580,7 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf) {
             //receivedcmd is now UPDATE 1b | ADDRESS 1b| DATA 8b| Signature 4b or CRC 2b|
 
             //Take the data...
-            memcpy(data_generic_trace, receivedCmd+2, 8);
+            memcpy(data_generic_trace, receivedCmd + 2, 8);
             AddCrc(data_generic_trace, 8);
             trace_data = data_generic_trace;
             trace_data_size = 10;
@@ -1540,7 +1601,7 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf) {
         } else {
             //#db# Unknown command received from reader (len=5): 26 1 0 f6 a 44 44 44 44
             // Never seen this command before
-            if ( MF_DBGLEVEL ==  MF_DBG_EXTENDED)
+            if (MF_DBGLEVEL ==  MF_DBG_EXTENDED)
                 print_result("[-] Unhandled command received ", receivedCmd, len);
 
             // Do not respond
@@ -1557,7 +1618,7 @@ send:
         if (modulated_response_size > 0) {
             t2r_stime = (GetCountSspClk() - time_0) << 4;
             SendIClassAnswer(modulated_response, modulated_response_size, 0);
-            t2r_etime = ((GetCountSspClk() - time_0) << 4 ) - t2r_stime;
+            t2r_etime = ((GetCountSspClk() - time_0) << 4) - t2r_stime;
         }
 
         LogTrace(receivedCmd, len, r2t_stime, r2t_etime, NULL, true);
@@ -1580,7 +1641,8 @@ send:
  * @param respLen
  * @param delay
  */
-static int SendIClassAnswer(uint8_t *resp, int respLen, uint16_t delay) {
+static int SendIClassAnswer(uint8_t *resp, int respLen, uint16_t delay)
+{
     int i = 0;
     volatile uint8_t b = 0;
 
@@ -1591,14 +1653,15 @@ static int SendIClassAnswer(uint8_t *resp, int respLen, uint16_t delay) {
     while (!BUTTON_PRESS()) {
 
         // Prevent rx holding register from overflowing
-        if ( (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY)){
-            b = AT91C_BASE_SSC->SSC_RHR; (void) b;
+        if ((AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY)) {
+            b = AT91C_BASE_SSC->SSC_RHR;
+            (void) b;
         }
 
         // Put byte into tx holding register as soon as it is ready
-        if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)){
+        if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
             b = 0x00;
-            if ( i < respLen){
+            if (i < respLen) {
                 b = resp[i];
                 //Hack
                 //b = 0xAC;
@@ -1617,7 +1680,8 @@ static int SendIClassAnswer(uint8_t *resp, int respLen, uint16_t delay) {
 //-----------------------------------------------------------------------------
 // Transmit the command (to the tag) that was placed in ToSend[].
 //-----------------------------------------------------------------------------
-static void TransmitIClassCommand(const uint8_t *cmd, int len, int *samples, int *wait) {
+static void TransmitIClassCommand(const uint8_t *cmd, int len, int *samples, int *wait)
+{
 
     int c = 0;
     volatile uint32_t b;
@@ -1627,8 +1691,8 @@ static void TransmitIClassCommand(const uint8_t *cmd, int len, int *samples, int
     FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD);
     AT91C_BASE_SSC->SSC_THR = 0x00;
 
-     // make sure we timeout previous comms.
-    if ( *wait )
+    // make sure we timeout previous comms.
+    if (*wait)
         SpinDelayUs(*wait);
 
     for (;;) {
@@ -1657,7 +1721,8 @@ static void TransmitIClassCommand(const uint8_t *cmd, int len, int *samples, int
 
         // Prevent rx holding register from overflowing
         if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
-            b = AT91C_BASE_SSC->SSC_RHR; (void)b;
+            b = AT91C_BASE_SSC->SSC_RHR;
+            (void)b;
         }
     }
 
@@ -1672,7 +1737,8 @@ static void TransmitIClassCommand(const uint8_t *cmd, int len, int *samples, int
 //-----------------------------------------------------------------------------
 // Prepare iClass reader command to send to FPGA
 //-----------------------------------------------------------------------------
-void CodeIClassCommand(const uint8_t* cmd, int len) {
+void CodeIClassCommand(const uint8_t *cmd, int len)
+{
     int i, j, k;
     uint8_t b;
 
@@ -1709,7 +1775,8 @@ void CodeIClassCommand(const uint8_t* cmd, int len) {
     ToSendMax++;
 }
 
-void ReaderTransmitIClass_ext(uint8_t* frame, int len, int wait) {
+void ReaderTransmitIClass_ext(uint8_t *frame, int len, int wait)
+{
 
     int samples = 0;
 
@@ -1725,7 +1792,8 @@ void ReaderTransmitIClass_ext(uint8_t* frame, int len, int wait) {
 
     LogTrace(frame, len, rsamples, rsamples, NULL, true);
 }
-void ReaderTransmitIClass(uint8_t* frame, int len) {
+void ReaderTransmitIClass(uint8_t *frame, int len)
+{
     ReaderTransmitIClass_ext(frame, len, 330);
 }
 
@@ -1734,7 +1802,8 @@ void ReaderTransmitIClass(uint8_t* frame, int len) {
 //  If a response is captured return TRUE
 //  If it takes too long return FALSE
 //-----------------------------------------------------------------------------
-static int GetIClassAnswer(uint8_t* receivedResponse, int maxLen, int *samples, int *elapsed) {
+static int GetIClassAnswer(uint8_t *receivedResponse, int maxLen, int *samples, int *elapsed)
+{
     // buffer needs to be 512 bytes
     // maxLen is not used...
 
@@ -1757,11 +1826,11 @@ static int GetIClassAnswer(uint8_t* receivedResponse, int maxLen, int *samples,
     while (!BUTTON_PRESS()) {
         WDT_HIT();
 
-         // keep tx buffer in a defined state anyway.
+        // keep tx buffer in a defined state anyway.
         if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
             AT91C_BASE_SSC->SSC_THR = 0x00;
             // To make use of exact timing of next command from reader!!
-            if (elapsed) (*elapsed)++;
+            if (elapsed)(*elapsed)++;
         }
 
         // Wait for byte be become available in rx holding register
@@ -1785,7 +1854,8 @@ static int GetIClassAnswer(uint8_t* receivedResponse, int maxLen, int *samples,
     return false;
 }
 
-int ReaderReceiveIClass(uint8_t* receivedAnswer) {
+int ReaderReceiveIClass(uint8_t *receivedAnswer)
+{
     int samples = 0;
 
     if (!GetIClassAnswer(receivedAnswer, 0, &samples, NULL))
@@ -1801,7 +1871,8 @@ int ReaderReceiveIClass(uint8_t* receivedAnswer) {
     return Demod.len;
 }
 
-void setupIclassReader() {
+void setupIclassReader()
+{
 
     LEDsoff();
 
@@ -1828,7 +1899,8 @@ void setupIclassReader() {
     LED_A_ON();
 }
 
-bool sendCmdGetResponseWithRetries(uint8_t* command, size_t cmdsize, uint8_t* resp, uint8_t expected_size, uint8_t retries) {
+bool sendCmdGetResponseWithRetries(uint8_t *command, size_t cmdsize, uint8_t *resp, uint8_t expected_size, uint8_t retries)
+{
     uint8_t got_n = 0;
     while (retries-- > 0) {
 
@@ -1839,7 +1911,7 @@ bool sendCmdGetResponseWithRetries(uint8_t* command, size_t cmdsize, uint8_t* re
         got_n = ReaderReceiveIClass(resp);
 
         // 0xBB is the internal debug separator byte..
-        if ( expected_size != got_n|| (resp[0] == 0xBB || resp[7] == 0xBB || resp[2] == 0xBB)) {
+        if (expected_size != got_n || (resp[0] == 0xBB || resp[7] == 0xBB || resp[2] == 0xBB)) {
             //try again
             continue;
         }
@@ -1857,7 +1929,8 @@ bool sendCmdGetResponseWithRetries(uint8_t* command, size_t cmdsize, uint8_t* re
  *         1 = Got CSN
  *         2 = Got CSN and CC
  */
-uint8_t handshakeIclassTag_ext(uint8_t *card_data, bool use_credit_key) {
+uint8_t handshakeIclassTag_ext(uint8_t *card_data, bool use_credit_key)
+{
 
     // act_all...
     static uint8_t act_all[]      = { ICLASS_CMD_ACTALL };
@@ -1872,7 +1945,7 @@ uint8_t handshakeIclassTag_ext(uint8_t *card_data, bool use_credit_key) {
     uint8_t read_status = 0;
 
     // Send act_all
-    ReaderTransmitIClass_ext(act_all, 1, 330+160);
+    ReaderTransmitIClass_ext(act_all, 1, 330 + 160);
     // Card present?
     if (!ReaderReceiveIClass(resp)) return read_status;//Fail
 
@@ -1903,29 +1976,31 @@ uint8_t handshakeIclassTag_ext(uint8_t *card_data, bool use_credit_key) {
     // Card selected, now read e-purse (cc) (block2) (only 8 bytes no CRC)
     // ReaderTransmitIClass(readcheck_cc, sizeof(readcheck_cc));
     // if (ReaderReceiveIClass(resp) == 8) {
-        // //Save CC (e-purse) in response data
-        // memcpy(card_data+8, resp, 8);
-        // read_status++;
+    // //Save CC (e-purse) in response data
+    // memcpy(card_data+8, resp, 8);
+    // read_status++;
     // }
 
     bool isOK = sendCmdGetResponseWithRetries(readcheck_cc, sizeof(readcheck_cc), resp, 8, 3);
     if (!isOK) return read_status;
 
     //Save CC (e-purse) in response data
-    memcpy(card_data+8, resp, 8);
+    memcpy(card_data + 8, resp, 8);
     read_status++;
     return read_status;
 }
-uint8_t handshakeIclassTag(uint8_t *card_data){
+uint8_t handshakeIclassTag(uint8_t *card_data)
+{
     return handshakeIclassTag_ext(card_data, false);
 }
 
 // Reader iClass Anticollission
 // turn off afterwards
-void ReaderIClass(uint8_t arg0) {
+void ReaderIClass(uint8_t arg0)
+{
 
     uint8_t card_data[6 * 8] = {0};
-    uint8_t last_csn[8] = {0,0,0,0,0,0,0,0};
+    uint8_t last_csn[8] = {0, 0, 0, 0, 0, 0, 0, 0};
     uint8_t resp[ICLASS_BUFFER_SIZE];
 
     memset(card_data, 0xFF, sizeof(card_data));
@@ -1973,13 +2048,13 @@ void ReaderIClass(uint8_t arg0) {
         // handshakeIclass returns CSN|CC, but the actual block
         // layout is CSN|CONFIG|CC, so here we reorder the data,
         // moving CC forward 8 bytes
-        memcpy(card_data+16, card_data+8, 8);
+        memcpy(card_data + 16, card_data + 8, 8);
 
         //Read block 1, config
         if (flagReadConfig) {
             if (sendCmdGetResponseWithRetries(readConf, sizeof(readConf), resp, 10, 5)) {
                 result_status |= FLAG_ICLASS_READER_CONF;
-                memcpy(card_data+8, resp, 8);
+                memcpy(card_data + 8, resp, 8);
             } else {
                 if (MF_DBGLEVEL > 1) DbpString("Failed to dump config block");
             }
@@ -1989,7 +2064,7 @@ void ReaderIClass(uint8_t arg0) {
         if (flagReadAIA) {
             if (sendCmdGetResponseWithRetries(readAA, sizeof(readAA), resp, 10, 5)) {
                 result_status |= FLAG_ICLASS_READER_AIA;
-                memcpy(card_data+(8*5), resp, 8);
+                memcpy(card_data + (8 * 5), resp, 8);
             } else {
                 if (MF_DBGLEVEL > 1) DbpString("Failed to dump AA block");
             }
@@ -2012,34 +2087,34 @@ void ReaderIClass(uint8_t arg0) {
             // If caller requires that we get Conf, CC, AA, continue until we got it
             if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
                 Dbprintf("STATUS %02X | CSN %c | CONF %c | CC %c | AIA %c | ONCE %c | 1TRY %c",
-                    result_status,
-                    (result_status & FLAG_ICLASS_READER_CSN) ? 'Y':'N',
-                    (result_status & FLAG_ICLASS_READER_CONF)? 'Y':'N',
-                    (result_status & FLAG_ICLASS_READER_CC)  ? 'Y':'N',
-                    (result_status & FLAG_ICLASS_READER_AIA) ? 'Y':'N'
-                );
+                         result_status,
+                         (result_status & FLAG_ICLASS_READER_CSN) ? 'Y' : 'N',
+                         (result_status & FLAG_ICLASS_READER_CONF) ? 'Y' : 'N',
+                         (result_status & FLAG_ICLASS_READER_CC)  ? 'Y' : 'N',
+                         (result_status & FLAG_ICLASS_READER_AIA) ? 'Y' : 'N'
+                        );
                 Dbprintf(" aar %c | to %c, | uc %c | frc %c | fra %c | cc %c",
-                    abort_after_read  ? 'Y':'N',
-                    try_once ? 'Y':'N',
-                    use_credit_key ? 'Y':'N',
-                    flagReadConfig ? 'Y':'N',
-                    flagReadAIA ? 'Y':'N',
-                    flagReadCC ? 'Y':'N'
-                    );
+                         abort_after_read  ? 'Y' : 'N',
+                         try_once ? 'Y' : 'N',
+                         use_credit_key ? 'Y' : 'N',
+                         flagReadConfig ? 'Y' : 'N',
+                         flagReadAIA ? 'Y' : 'N',
+                         flagReadCC ? 'Y' : 'N'
+                        );
             }
 
-            bool send = (result_status & FLAG_ICLASS_READER_CSN );
+            bool send = (result_status & FLAG_ICLASS_READER_CSN);
             if (flagReadCC)
-                send |= (result_status & FLAG_ICLASS_READER_CC );
+                send |= (result_status & FLAG_ICLASS_READER_CC);
             if (flagReadAIA)
-                send |= (result_status & FLAG_ICLASS_READER_AIA );
+                send |= (result_status & FLAG_ICLASS_READER_AIA);
             if (flagReadConfig)
-                send |= (result_status & FLAG_ICLASS_READER_CONF );
+                send |= (result_status & FLAG_ICLASS_READER_CONF);
 
-            if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("SEND %c",  send?'y':'n');
+            if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("SEND %c",  send ? 'y' : 'n');
 
-            if ( send ) {
-                cmd_send(CMD_ACK, result_status, 0, 0, card_data, sizeof(card_data) );
+            if (send) {
+                cmd_send(CMD_ACK, result_status, 0, 0, card_data, sizeof(card_data));
                 if (abort_after_read) {
                     LED_B_OFF();
                     return;
@@ -2061,7 +2136,8 @@ void ReaderIClass(uint8_t arg0) {
 }
 
 // turn off afterwards
-void ReaderIClass_Replay(uint8_t arg0, uint8_t *MAC) {
+void ReaderIClass_Replay(uint8_t arg0, uint8_t *MAC)
+{
 
     uint8_t cardsize = 0;
     uint8_t mem = 0;
@@ -2070,12 +2146,12 @@ void ReaderIClass_Replay(uint8_t arg0, uint8_t *MAC) {
     uint8_t card_data[USB_CMD_DATA_SIZE] = {0};
     uint8_t resp[ICLASS_BUFFER_SIZE] = {0};
 
-    static struct memory_t{
-      int k16;
-      int book;
-      int k2;
-      int lockauth;
-      int keyaccess;
+    static struct memory_t {
+        int k16;
+        int book;
+        int k2;
+        int lockauth;
+        int keyaccess;
     } memory;
 
     setupIclassReader();
@@ -2088,7 +2164,7 @@ void ReaderIClass_Replay(uint8_t arg0, uint8_t *MAC) {
         if (read_status < 2) continue;
 
         //for now replay captured auth (as cc not updated)
-        memcpy(check+5, MAC, 4);
+        memcpy(check + 5, MAC, 4);
 
         if (!sendCmdGetResponseWithRetries(check, sizeof(check), resp, 4, 5)) {
             DbpString("Error: Authentication Fail!");
@@ -2097,7 +2173,7 @@ void ReaderIClass_Replay(uint8_t arg0, uint8_t *MAC) {
 
         //first get configuration block (block 1)
         read[1] = 1;
-        AddCrc( read+1, 1 );
+        AddCrc(read + 1, 1);
 
         if (!sendCmdGetResponseWithRetries(read, sizeof(read), resp, 10, 5)) {
             DbpString("Dump config (block 1) failed");
@@ -2120,17 +2196,17 @@ void ReaderIClass_Replay(uint8_t arg0, uint8_t *MAC) {
         uint32_t stored_data_length = 0;
 
         //then loop around remaining blocks
-        for ( uint16_t block=0; block < cardsize; block++) {
+        for (uint16_t block = 0; block < cardsize; block++) {
 
             read[1] = block;
-            AddCrc( read+1, 1 );
+            AddCrc(read + 1, 1);
 
             if (sendCmdGetResponseWithRetries(read, sizeof(read), resp, 10, 5)) {
                 Dbprintf("     %02x: %02x %02x %02x %02x %02x %02x %02x %02x",
-                    block, resp[0], resp[1], resp[2],
-                    resp[3], resp[4], resp[5],
-                    resp[6], resp[7]
-                );
+                         block, resp[0], resp[1], resp[2],
+                         resp[3], resp[4], resp[5],
+                         resp[6], resp[7]
+                        );
 
                 //Fill up the buffer
                 memcpy(card_data + stored_data_length, resp, 8);
@@ -2143,7 +2219,7 @@ void ReaderIClass_Replay(uint8_t arg0, uint8_t *MAC) {
                              0,//Not used ATM
                              card_data,
                              stored_data_length
-                    );
+                            );
                     //reset
                     stored_data_length = 0;
                     failedRead = 0;
@@ -2163,7 +2239,7 @@ void ReaderIClass_Replay(uint8_t arg0, uint8_t *MAC) {
                      0,//Not used ATM
                      card_data,
                      stored_data_length
-            );
+                    );
         }
         //If we got here, let's break
         break;
@@ -2175,24 +2251,26 @@ void ReaderIClass_Replay(uint8_t arg0, uint8_t *MAC) {
              0,//Not used ATM
              card_data,
              0
-    );
+            );
     switch_off();
 }
 
 // not used. ?!? ( CMD_ICLASS_READCHECK)
 // turn off afterwards
-void iClass_ReadCheck(uint8_t blockNo, uint8_t keyType) {
+void iClass_ReadCheck(uint8_t blockNo, uint8_t keyType)
+{
     uint8_t readcheck[] = { keyType, blockNo };
-    uint8_t resp[] = {0,0,0,0,0,0,0,0};
+    uint8_t resp[] = {0, 0, 0, 0, 0, 0, 0, 0};
     size_t isOK = 0;
     isOK = sendCmdGetResponseWithRetries(readcheck, sizeof(readcheck), resp, sizeof(resp), 6);
-    cmd_send(CMD_ACK,isOK,0,0,0,0);
+    cmd_send(CMD_ACK, isOK, 0, 0, 0, 0);
     switch_off();
 }
 
 // used with function select_and_auth (cmdhficlass.c)
 // which needs to authenticate before doing more things like read/write
-void iClass_Authentication(uint8_t *mac) {
+void iClass_Authentication(uint8_t *mac)
+{
     uint8_t check[] = { ICLASS_CMD_CHECK, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
     uint8_t resp[ICLASS_BUFFER_SIZE];
 
@@ -2205,7 +2283,7 @@ void iClass_Authentication(uint8_t *mac) {
 
     // 6 retries
     bool isOK = sendCmdGetResponseWithRetries(check, sizeof(check), resp, 4, 6);
-    cmd_send(CMD_ACK,isOK,0,0,0,0);
+    cmd_send(CMD_ACK, isOK, 0, 0, 0, 0);
 }
 
 typedef struct iclass_premac {
@@ -2219,16 +2297,17 @@ typedef struct iclass_premac {
 * - key loop only test one type of authtication key. Ie two calls needed
 *   to cover debit and credit key. (AA1/AA2)
 */
-void iClass_Authentication_fast(uint64_t arg0, uint64_t arg1, uint8_t *datain) {
+void iClass_Authentication_fast(uint64_t arg0, uint64_t arg1, uint8_t *datain)
+{
     uint8_t i = 0, isOK = 0;
     uint8_t lastChunk = ((arg0 >> 8) & 0xFF);
-    bool use_credit_key =((arg0 >> 16) & 0xFF);
+    bool use_credit_key = ((arg0 >> 16) & 0xFF);
     uint8_t keyCount = arg1 & 0xFF;
     uint8_t check[] = { ICLASS_CMD_CHECK, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
     uint8_t resp[ICLASS_BUFFER_SIZE];
     uint8_t readcheck_cc[] = { ICLASS_CMD_READCHECK_KD, 0x02 };
 
-    if  (use_credit_key)
+    if (use_credit_key)
         readcheck_cc[0] = ICLASS_CMD_READCHECK_KC;
 
     // select card / e-purse
@@ -2245,12 +2324,12 @@ void iClass_Authentication_fast(uint64_t arg0, uint64_t arg1, uint8_t *datain) {
 
     int read_status = 0;
     uint8_t startup_limit = 10;
-    while ( read_status != 2) {
+    while (read_status != 2) {
 
         if (BUTTON_PRESS() && !usb_poll_validate_length()) goto out;
 
         read_status = handshakeIclassTag_ext(card_data, use_credit_key);
-        if ( startup_limit-- == 0 ) {
+        if (startup_limit-- == 0) {
             Dbprintf("[-] Handshake status | %d (fail 10)", read_status);
             isOK = 99;
             goto out;
@@ -2275,7 +2354,7 @@ void iClass_Authentication_fast(uint64_t arg0, uint64_t arg1, uint8_t *datain) {
 
         // expect 4bytes, 3 retries times..
         isOK = sendCmdGetResponseWithRetries(check, sizeof(check), resp, 4, 3);
-        if ( isOK )
+        if (isOK)
             goto out;
 
         SpinDelayUs(400);  //iClass (iso15693-2) should timeout after 330us.
@@ -2291,7 +2370,7 @@ out:
     // send keyindex.
     cmd_send(CMD_ACK, isOK, i, 0, 0, 0);
 
-    if ( isOK >= 1 || lastChunk ) {
+    if (isOK >= 1 || lastChunk) {
         switch_off();
         LED_A_OFF();
     }
@@ -2302,10 +2381,11 @@ out:
 
 // Tries to read block.
 // retries 10times.
-bool iClass_ReadBlock(uint8_t blockNo, uint8_t *data, uint8_t len) {
+bool iClass_ReadBlock(uint8_t blockNo, uint8_t *data, uint8_t len)
+{
     uint8_t resp[10];
     uint8_t cmd[] = {ICLASS_CMD_READ_OR_IDENTIFY, blockNo, 0x00, 0x00};
-    AddCrc( cmd+1, 1 );
+    AddCrc(cmd + 1, 1);
     // expect size 10,  retry 5times
     bool isOK = sendCmdGetResponseWithRetries(cmd, sizeof(cmd), resp, 10, 5);
     memcpy(data, resp, len);
@@ -2314,30 +2394,32 @@ bool iClass_ReadBlock(uint8_t blockNo, uint8_t *data, uint8_t len) {
 
 // turn off afterwards
 // readblock 8 + 2.  only want 8.
-void iClass_ReadBlk(uint8_t blockno) {
-    uint8_t data[] = {0,0,0,0,0,0,0,0,0,0};
+void iClass_ReadBlk(uint8_t blockno)
+{
+    uint8_t data[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
     bool isOK = iClass_ReadBlock(blockno, data, sizeof(data));
     cmd_send(CMD_ACK, isOK, 0, 0, data, sizeof(data));
     switch_off();
 }
 
 // turn off afterwards
-void iClass_Dump(uint8_t blockno, uint8_t numblks) {
-    uint8_t blockdata[] = {0,0,0,0,0,0,0,0,0,0};
+void iClass_Dump(uint8_t blockno, uint8_t numblks)
+{
+    uint8_t blockdata[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
     bool isOK = false;
     uint8_t blkCnt = 0;
 
     BigBuf_free();
-    uint8_t *dataout = BigBuf_malloc(255*8);
-    if (dataout == NULL){
+    uint8_t *dataout = BigBuf_malloc(255 * 8);
+    if (dataout == NULL) {
         DbpString("[!] out of memory");
         OnError(1);
         return;
     }
     // fill mem with 0xFF
-    memset(dataout, 0xFF, 255*8);
+    memset(dataout, 0xFF, 255 * 8);
 
-    for (;blkCnt < numblks; blkCnt++) {
+    for (; blkCnt < numblks; blkCnt++) {
         isOK = iClass_ReadBlock(blockno + blkCnt, blockdata, sizeof(blockdata));
 
         // 0xBB is the internal debug separator byte..
@@ -2356,12 +2438,13 @@ void iClass_Dump(uint8_t blockno, uint8_t numblks) {
     BigBuf_free();
 }
 
-bool iClass_WriteBlock_ext(uint8_t blockNo, uint8_t *data) {
+bool iClass_WriteBlock_ext(uint8_t blockNo, uint8_t *data)
+{
 
-    uint8_t resp[] = {0,0,0,0,0,0,0,0,0,0};
+    uint8_t resp[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
     uint8_t write[] = { ICLASS_CMD_UPDATE, blockNo, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
-    memcpy(write+2, data, 12); // data + mac
-    AddCrc(write+1, 13);
+    memcpy(write + 2, data, 12); // data + mac
+    AddCrc(write + 1, 13);
 
     bool isOK = sendCmdGetResponseWithRetries(write, sizeof(write), resp, sizeof(resp), 5);
     if (isOK) { //if reader responded correctly
@@ -2379,23 +2462,25 @@ bool iClass_WriteBlock_ext(uint8_t blockNo, uint8_t *data) {
 }
 
 // turn off afterwards
-void iClass_WriteBlock(uint8_t blockNo, uint8_t *data) {
+void iClass_WriteBlock(uint8_t blockNo, uint8_t *data)
+{
     bool isOK = iClass_WriteBlock_ext(blockNo, data);
-    cmd_send(CMD_ACK,isOK,0,0,0,0);
+    cmd_send(CMD_ACK, isOK, 0, 0, 0, 0);
     switch_off();
 }
 
 // turn off afterwards
-void iClass_Clone(uint8_t startblock, uint8_t endblock, uint8_t *data) {
+void iClass_Clone(uint8_t startblock, uint8_t endblock, uint8_t *data)
+{
     int i, written = 0;
     int total_block = (endblock - startblock) + 1;
-    for (i = 0; i < total_block; i++){
+    for (i = 0; i < total_block; i++) {
         // block number
-        if (iClass_WriteBlock_ext(i + startblock, data + ( i*12 ) )){
+        if (iClass_WriteBlock_ext(i + startblock, data + (i * 12))) {
             Dbprintf("Write block [%02x] successful", i + startblock);
             written++;
         } else {
-            if (iClass_WriteBlock_ext(i + startblock, data + ( i*12 ) )){
+            if (iClass_WriteBlock_ext(i + startblock, data + (i * 12))) {
                 Dbprintf("Write block [%02x] successful", i + startblock);
                 written++;
             } else {
@@ -2408,6 +2493,6 @@ void iClass_Clone(uint8_t startblock, uint8_t endblock, uint8_t *data) {
     else
         DbpString("Clone incomplete");
 
-    cmd_send(CMD_ACK,1,0,0,0,0);
+    cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
     switch_off();
 }
\ No newline at end of file
diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index e44af5fe3..4469ca402 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -22,7 +22,7 @@ int rsamples = 0;
 uint8_t trigger = 0;
 // the block number for the ISO14443-4 PCB
 static uint8_t iso14_pcb_blocknum = 0;
-static uint8_t* free_buffer_pointer;
+static uint8_t *free_buffer_pointer;
 
 //
 // ISO14443 timing:
@@ -120,29 +120,33 @@ static uint32_t LastProxToAirDuration;
 #define SEC_Y 0x00
 #define SEC_Z 0xc0
 
-void iso14a_set_trigger(bool enable) {
+void iso14a_set_trigger(bool enable)
+{
     trigger = enable;
 }
 
-void iso14a_set_timeout(uint32_t timeout) {
-    iso14a_timeout = timeout + (DELAY_AIR2ARM_AS_READER + DELAY_ARM2AIR_AS_READER)/(16*8) + 2;
+void iso14a_set_timeout(uint32_t timeout)
+{
+    iso14a_timeout = timeout + (DELAY_AIR2ARM_AS_READER + DELAY_ARM2AIR_AS_READER) / (16 * 8) + 2;
 }
 
-uint32_t iso14a_get_timeout(void) {
-    return iso14a_timeout - (DELAY_AIR2ARM_AS_READER + DELAY_ARM2AIR_AS_READER)/(16*8) - 2;
+uint32_t iso14a_get_timeout(void)
+{
+    return iso14a_timeout - (DELAY_AIR2ARM_AS_READER + DELAY_ARM2AIR_AS_READER) / (16 * 8) - 2;
 }
 
 //-----------------------------------------------------------------------------
 // Generate the parity value for a byte sequence
 //-----------------------------------------------------------------------------
-void GetParity(const uint8_t *pbtCmd, uint16_t iLen, uint8_t *par) {
+void GetParity(const uint8_t *pbtCmd, uint16_t iLen, uint8_t *par)
+{
     uint16_t paritybit_cnt = 0;
     uint16_t paritybyte_cnt = 0;
     uint8_t parityBits = 0;
 
     for (uint16_t i = 0; i < iLen; i++) {
         // Generate the parity bits
-        parityBits |= ((oddparity8(pbtCmd[i])) << (7-paritybit_cnt));
+        parityBits |= ((oddparity8(pbtCmd[i])) << (7 - paritybit_cnt));
         if (paritybit_cnt == 7) {
             par[paritybyte_cnt] = parityBits; // save 8 Bits parity
             parityBits = 0;                   // and advance to next Parity Byte
@@ -189,11 +193,13 @@ const bool Mod_Miller_LUT[] = {
 #define IsMillerModulationNibble1(b) (Mod_Miller_LUT[(b & 0x000000F0) >> 4])
 #define IsMillerModulationNibble2(b) (Mod_Miller_LUT[(b & 0x0000000F)])
 
-tUart* GetUart() {
+tUart *GetUart()
+{
     return &Uart;
 }
 
-void UartReset(void) {
+void UartReset(void)
+{
     Uart.state = STATE_UNSYNCD;
     Uart.bitCount = 0;
     Uart.len = 0;                       // number of decoded data bytes
@@ -207,18 +213,20 @@ void UartReset(void) {
     Uart.syncBit = 9999;
 }
 
-void UartInit(uint8_t *data, uint8_t *parity) {
+void UartInit(uint8_t *data, uint8_t *parity)
+{
     Uart.output = data;
     Uart.parity = parity;
     UartReset();
 }
 
 // use parameter non_real_time to provide a timestamp. Set to 0 if the decoder should measure real time
-RAMFUNC bool MillerDecoding(uint8_t bit, uint32_t non_real_time) {
+RAMFUNC bool MillerDecoding(uint8_t bit, uint32_t non_real_time)
+{
     Uart.fourBits = (Uart.fourBits << 8) | bit;
 
     if (Uart.state == STATE_UNSYNCD) {                                           // not yet synced
-            Uart.syncBit = 9999;                                                 // not set
+        Uart.syncBit = 9999;                                                 // not set
 
         // 00x11111 2|3 ticks pause followed by 6|5 ticks unmodulated         Sequence Z (a "0" or "start of communication")
         // 11111111 8 ticks unmodulation                                      Sequence Y (a "0" or "end of communication" or "no information")
@@ -228,9 +236,9 @@ RAMFUNC bool MillerDecoding(uint8_t bit, uint32_t non_real_time) {
         // Sequence X followed by Sequence Y followed by Sequence Z     (111100x1 11111111 00x11111)
         // we therefore look for a ...xx1111 11111111 00x11111xxxxxx... pattern
         // (12 '1's followed by 2 '0's, eventually followed by another '0', followed by 5 '1's)
-        #define ISO14443A_STARTBIT_MASK       0x07FFEF80                            // mask is    00000111 11111111 11101111 10000000
-        #define ISO14443A_STARTBIT_PATTERN    0x07FF8F80                            // pattern is 00000111 11111111 10001111 10000000
-        if      ((Uart.fourBits & (ISO14443A_STARTBIT_MASK >> 0)) == ISO14443A_STARTBIT_PATTERN >> 0) Uart.syncBit = 7;
+#define ISO14443A_STARTBIT_MASK       0x07FFEF80                            // mask is    00000111 11111111 11101111 10000000
+#define ISO14443A_STARTBIT_PATTERN    0x07FF8F80                            // pattern is 00000111 11111111 10001111 10000000
+        if ((Uart.fourBits & (ISO14443A_STARTBIT_MASK >> 0)) == ISO14443A_STARTBIT_PATTERN >> 0) Uart.syncBit = 7;
         else if ((Uart.fourBits & (ISO14443A_STARTBIT_MASK >> 1)) == ISO14443A_STARTBIT_PATTERN >> 1) Uart.syncBit = 6;
         else if ((Uart.fourBits & (ISO14443A_STARTBIT_MASK >> 2)) == ISO14443A_STARTBIT_PATTERN >> 2) Uart.syncBit = 5;
         else if ((Uart.fourBits & (ISO14443A_STARTBIT_MASK >> 3)) == ISO14443A_STARTBIT_PATTERN >> 3) Uart.syncBit = 4;
@@ -297,11 +305,11 @@ RAMFUNC bool MillerDecoding(uint8_t bit, uint32_t non_real_time) {
                         Uart.shiftReg >>= (9 - Uart.bitCount);                   // right align them
                         Uart.output[Uart.len++] = (Uart.shiftReg & 0xff);        // add last byte to the output
                         Uart.parityBits <<= 1;                                   // add a (void) parity bit
-                        Uart.parityBits <<= (8 - (Uart.len&0x0007));             // left align parity bits
+                        Uart.parityBits <<= (8 - (Uart.len & 0x0007));           // left align parity bits
                         Uart.parity[Uart.parityLen++] = Uart.parityBits;         // and store it
                         return true;
                     } else if (Uart.len & 0x0007) {                              // there are some parity bits to store
-                        Uart.parityBits <<= (8 - (Uart.len&0x0007));             // left align remaining parity bits
+                        Uart.parityBits <<= (8 - (Uart.len & 0x0007));           // left align remaining parity bits
                         Uart.parity[Uart.parityLen++] = Uart.parityBits;         // and store them
                     }
                     if (Uart.len) {
@@ -361,10 +369,12 @@ const bool Mod_Manchester_LUT[] = {
 #define IsManchesterModulationNibble1(b) (Mod_Manchester_LUT[(b & 0x00F0) >> 4])
 #define IsManchesterModulationNibble2(b) (Mod_Manchester_LUT[(b & 0x000F)])
 
-tDemod* GetDemod() {
+tDemod *GetDemod()
+{
     return &Demod;
 }
-void DemodReset(void) {
+void DemodReset(void)
+{
     Demod.state = DEMOD_UNSYNCD;
     Demod.len = 0;                       // number of decoded data bytes
     Demod.parityLen = 0;
@@ -380,14 +390,16 @@ void DemodReset(void) {
     Demod.samples = 0;
 }
 
-void DemodInit(uint8_t *data, uint8_t *parity) {
+void DemodInit(uint8_t *data, uint8_t *parity)
+{
     Demod.output = data;
     Demod.parity = parity;
     DemodReset();
 }
 
 // use parameter non_real_time to provide a timestamp. Set to 0 if the decoder should measure real time
-RAMFUNC int ManchesterDecoding(uint8_t bit, uint16_t offset, uint32_t non_real_time) {
+RAMFUNC int ManchesterDecoding(uint8_t bit, uint16_t offset, uint32_t non_real_time)
+{
     Demod.twoBits = (Demod.twoBits << 8) | bit;
 
     if (Demod.state == DEMOD_UNSYNCD) {
@@ -400,7 +412,7 @@ RAMFUNC int ManchesterDecoding(uint8_t bit, uint16_t offset, uint32_t non_real_t
             }
         } else {
             Demod.syncBit = 0xFFFF;            // not set
-            if         ((Demod.twoBits & 0x7700) == 0x7000) Demod.syncBit = 7;
+            if ((Demod.twoBits & 0x7700) == 0x7000) Demod.syncBit = 7;
             else if ((Demod.twoBits & 0x3B80) == 0x3800) Demod.syncBit = 6;
             else if ((Demod.twoBits & 0x1DC0) == 0x1C00) Demod.syncBit = 5;
             else if ((Demod.twoBits & 0x0EE0) == 0x0E00) Demod.syncBit = 4;
@@ -454,15 +466,15 @@ RAMFUNC int ManchesterDecoding(uint8_t bit, uint16_t offset, uint32_t non_real_t
                 }
                 Demod.endTime = Demod.startTime + 8 * (9 * Demod.len + Demod.bitCount + 1);
             } else {                                                    // no modulation in both halves - End of communication
-                if(Demod.bitCount > 0) {                                // there are some remaining data bits
+                if (Demod.bitCount > 0) {                               // there are some remaining data bits
                     Demod.shiftReg >>= (9 - Demod.bitCount);            // right align the decoded bits
                     Demod.output[Demod.len++] = Demod.shiftReg & 0xff;  // and add them to the output
                     Demod.parityBits <<= 1;                             // add a (void) parity bit
-                    Demod.parityBits <<= (8 - (Demod.len&0x0007));      // left align remaining parity bits
+                    Demod.parityBits <<= (8 - (Demod.len & 0x0007));    // left align remaining parity bits
                     Demod.parity[Demod.parityLen++] = Demod.parityBits; // and store them
                     return true;
                 } else if (Demod.len & 0x0007) {                        // there are some parity bits to store
-                    Demod.parityBits <<= (8 - (Demod.len&0x0007));      // left align remaining parity bits
+                    Demod.parityBits <<= (8 - (Demod.len & 0x0007));    // left align remaining parity bits
                     Demod.parity[Demod.parityLen++] = Demod.parityBits; // and store them
                 }
                 if (Demod.len) {
@@ -487,7 +499,8 @@ RAMFUNC int ManchesterDecoding(uint8_t bit, uint16_t offset, uint32_t non_real_t
 // near the reader.
 // "hf 14a sniff"
 //-----------------------------------------------------------------------------
-void RAMFUNC SniffIso14443a(uint8_t param) {
+void RAMFUNC SniffIso14443a(uint8_t param)
+{
     LEDsoff();
     // param:
     // bit 0 - trigger from first card answer
@@ -496,7 +509,8 @@ void RAMFUNC SniffIso14443a(uint8_t param) {
 
     // Allocate memory from BigBuf for some buffers
     // free all previous allocations first
-    BigBuf_free(); BigBuf_Clear_ext(false);
+    BigBuf_free();
+    BigBuf_Clear_ext(false);
     clear_trace();
     set_tracing(true);
 
@@ -525,7 +539,7 @@ void RAMFUNC SniffIso14443a(uint8_t param) {
     UartInit(receivedCmd, receivedCmdPar);
 
     // Setup and start DMA.
-    if ( !FpgaSetupSscDma((uint8_t*) dmaBuf, DMA_BUFFER_SIZE) ){
+    if (!FpgaSetupSscDma((uint8_t *) dmaBuf, DMA_BUFFER_SIZE)) {
         if (MF_DBGLEVEL > 1) Dbprintf("FpgaSetupSscDma failed. Exiting");
         return;
     }
@@ -581,7 +595,7 @@ void RAMFUNC SniffIso14443a(uint8_t param) {
 
             if (!TagIsActive) {        // no need to try decoding reader data if the tag is sending
                 uint8_t readerdata = (previous_data & 0xF0) | (*data >> 4);
-                if (MillerDecoding(readerdata, (rsamples-1)*4)) {
+                if (MillerDecoding(readerdata, (rsamples - 1) * 4)) {
                     LED_C_ON();
 
                     // check - if there is a short 7bit request from reader
@@ -589,11 +603,11 @@ void RAMFUNC SniffIso14443a(uint8_t param) {
 
                     if (triggered) {
                         if (!LogTrace(receivedCmd,
-                                        Uart.len,
-                                        Uart.startTime*16 - DELAY_READER_AIR2ARM_AS_SNIFFER,
-                                        Uart.endTime*16 - DELAY_READER_AIR2ARM_AS_SNIFFER,
-                                        Uart.parity,
-                                        true)) break;
+                                      Uart.len,
+                                      Uart.startTime * 16 - DELAY_READER_AIR2ARM_AS_SNIFFER,
+                                      Uart.endTime * 16 - DELAY_READER_AIR2ARM_AS_SNIFFER,
+                                      Uart.parity,
+                                      true)) break;
                     }
                     /* ready to receive another command. */
                     UartReset();
@@ -608,15 +622,15 @@ void RAMFUNC SniffIso14443a(uint8_t param) {
             // no need to try decoding tag data if the reader is sending - and we cannot afford the time
             if (!ReaderIsActive) {
                 uint8_t tagdata = (previous_data << 4) | (*data & 0x0F);
-                if (ManchesterDecoding(tagdata, 0, (rsamples-1)*4)) {
+                if (ManchesterDecoding(tagdata, 0, (rsamples - 1) * 4)) {
                     LED_B_ON();
 
                     if (!LogTrace(receivedResp,
-                                    Demod.len,
-                                    Demod.startTime*16 - DELAY_TAG_AIR2ARM_AS_SNIFFER,
-                                    Demod.endTime*16 - DELAY_TAG_AIR2ARM_AS_SNIFFER,
-                                    Demod.parity,
-                                    false)) break;
+                                  Demod.len,
+                                  Demod.startTime * 16 - DELAY_TAG_AIR2ARM_AS_SNIFFER,
+                                  Demod.endTime * 16 - DELAY_TAG_AIR2ARM_AS_SNIFFER,
+                                  Demod.parity,
+                                  false)) break;
 
                     if ((!triggered) && (param & 0x01)) triggered = true;
 
@@ -649,7 +663,8 @@ void RAMFUNC SniffIso14443a(uint8_t param) {
 //-----------------------------------------------------------------------------
 // Prepare tag messages
 //-----------------------------------------------------------------------------
-static void CodeIso14443aAsTagPar(const uint8_t *cmd, uint16_t len, uint8_t *parity, bool collision) {
+static void CodeIso14443aAsTagPar(const uint8_t *cmd, uint16_t len, uint8_t *parity, bool collision)
+{
 
     //uint8_t localCol = 0;
     ToSendReset();
@@ -668,11 +683,11 @@ static void CodeIso14443aAsTagPar(const uint8_t *cmd, uint16_t len, uint8_t *par
     ToSend[++ToSendMax] = SEC_D;
     LastProxToAirDuration = 8 * ToSendMax - 4;
 
-    for(uint16_t i = 0; i < len; i++) {
+    for (uint16_t i = 0; i < len; i++) {
         uint8_t b = cmd[i];
 
         // Data bits
-        for(uint16_t j = 0; j < 8; j++) {
+        for (uint16_t j = 0; j < 8; j++) {
             //if (collision && (localCol >= colpos)){
             if (collision) {
                 ToSend[++ToSendMax] = SEC_COLL;
@@ -692,7 +707,7 @@ static void CodeIso14443aAsTagPar(const uint8_t *cmd, uint16_t len, uint8_t *par
             LastProxToAirDuration = 8 * ToSendMax;
         } else {
             // Get the parity bit
-            if (parity[i>>3] & (0x80>>(i&0x0007))) {
+            if (parity[i >> 3] & (0x80 >> (i & 0x0007))) {
                 ToSend[++ToSendMax] = SEC_D;
                 LastProxToAirDuration = 8 * ToSendMax - 4;
             } else {
@@ -709,16 +724,19 @@ static void CodeIso14443aAsTagPar(const uint8_t *cmd, uint16_t len, uint8_t *par
     ToSendMax++;
 }
 
-static void CodeIso14443aAsTagEx(const uint8_t *cmd, uint16_t len, bool collision) {
+static void CodeIso14443aAsTagEx(const uint8_t *cmd, uint16_t len, bool collision)
+{
     uint8_t par[MAX_PARITY_SIZE] = {0};
     GetParity(cmd, len, par);
     CodeIso14443aAsTagPar(cmd, len, par, collision);
 }
-static void CodeIso14443aAsTag(const uint8_t *cmd, uint16_t len) {
+static void CodeIso14443aAsTag(const uint8_t *cmd, uint16_t len)
+{
     CodeIso14443aAsTagEx(cmd, len, false);
 }
 
-static void Code4bitAnswerAsTag(uint8_t cmd) {
+static void Code4bitAnswerAsTag(uint8_t cmd)
+{
     uint8_t b = cmd;
 
     ToSendReset();
@@ -736,8 +754,8 @@ static void Code4bitAnswerAsTag(uint8_t cmd) {
     // Send startbit
     ToSend[++ToSendMax] = SEC_D;
 
-    for(uint8_t i = 0; i < 4; i++) {
-        if(b & 1) {
+    for (uint8_t i = 0; i < 4; i++) {
+        if (b & 1) {
             ToSend[++ToSendMax] = SEC_D;
             LastProxToAirDuration = 8 * ToSendMax - 4;
         } else {
@@ -759,7 +777,8 @@ static void Code4bitAnswerAsTag(uint8_t cmd) {
 // stop when button is pressed
 // or return TRUE when command is captured
 //-----------------------------------------------------------------------------
-int GetIso14443aCommandFromReader(uint8_t *received, uint8_t *parity, int *len) {
+int GetIso14443aCommandFromReader(uint8_t *received, uint8_t *parity, int *len)
+{
     // Set FPGA mode to "simulated ISO 14443 tag", no modulation (listen
     // only, since we are receiving, not transmitting).
     // Signal field is off with the appropriate LED
@@ -781,12 +800,13 @@ int GetIso14443aCommandFromReader(uint8_t *received, uint8_t *parity, int *len)
                 *len = Uart.len;
                 return true;
             }
-         }
+        }
     }
     return false;
 }
 
-bool prepare_tag_modulation(tag_response_info_t* response_info, size_t max_buffer_size) {
+bool prepare_tag_modulation(tag_response_info_t *response_info, size_t max_buffer_size)
+{
     // Example response, answer to MIFARE Classic read block will be 16 bytes + 2 CRC = 18 bytes
     // This will need the following byte array for a modulation sequence
     //    144        data bits (18 * 8)
@@ -798,7 +818,7 @@ bool prepare_tag_modulation(tag_response_info_t* response_info, size_t max_buffe
     //    166 bytes, since every bit that needs to be send costs us a byte
     //
     // Prepare the tag modulation bits from the message
-    CodeIso14443aAsTag(response_info->response,response_info->response_n);
+    CodeIso14443aAsTag(response_info->response, response_info->response_n);
 
     // Make sure we do not exceed the free buffer space
     if (ToSendMax > max_buffer_size) {
@@ -824,7 +844,8 @@ bool prepare_tag_modulation(tag_response_info_t* response_info, size_t max_buffe
 // 47 * 8 data bits, 47 * 1 parity bits, 10 start bits, 10 stop bits, 10 correction bits
 #define ALLOCATED_TAG_MODULATION_BUFFER_SIZE 453
 
-bool prepare_allocated_tag_modulation(tag_response_info_t* response_info) {
+bool prepare_allocated_tag_modulation(tag_response_info_t *response_info)
+{
     // Retrieve and store the current buffer index
     response_info->modulation = free_buffer_pointer;
 
@@ -846,21 +867,22 @@ bool prepare_allocated_tag_modulation(tag_response_info_t* response_info) {
 // response to send, and send it.
 // 'hf 14a sim'
 //-----------------------------------------------------------------------------
-void SimulateIso14443aTag(int tagType, int flags, uint8_t* data) {
+void SimulateIso14443aTag(int tagType, int flags, uint8_t *data)
+{
 
-    #define ATTACK_KEY_COUNT 8 // keep same as define in cmdhfmf.c -> readerAttack()
+#define ATTACK_KEY_COUNT 8 // keep same as define in cmdhfmf.c -> readerAttack()
 
     uint8_t sak = 0;
     uint32_t cuid = 0;
     uint32_t nonce = 0;
 
     // PACK response to PWD AUTH for EV1/NTAG
-    uint8_t response8[4] = {0,0,0,0};
+    uint8_t response8[4] = {0, 0, 0, 0};
     // Counter for EV1/NTAG
-    uint32_t counters[] = {0,0,0};
+    uint32_t counters[] = {0, 0, 0};
 
     // The first response contains the ATQA (note: bytes are transmitted in reverse order).
-    uint8_t response1[] = {0,0};
+    uint8_t response1[] = {0, 0};
 
     // Here, we collect CUID, block1, keytype1, NT1, NR1, AR1, CUID, block2, keytyp2, NT2, NR2, AR2
     // it should also collect block, keytype.
@@ -876,29 +898,35 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t* data) {
         case 1: { // MIFARE Classic 1k
             response1[0] = 0x04;
             sak = 0x08;
-        } break;
+        }
+        break;
         case 2: { // MIFARE Ultralight
             response1[0] = 0x44;
             sak = 0x00;
-        } break;
+        }
+        break;
         case 3: { // MIFARE DESFire
             response1[0] = 0x04;
             response1[1] = 0x03;
             sak = 0x20;
-        } break;
+        }
+        break;
         case 4: { // ISO/IEC 14443-4 - javacard (JCOP)
             response1[0] = 0x04;
             sak = 0x28;
-        } break;
+        }
+        break;
         case 5: { // MIFARE TNP3XXX
             response1[0] = 0x01;
             response1[1] = 0x0f;
             sak = 0x01;
-        } break;
+        }
+        break;
         case 6: { // MIFARE Mini 320b
             response1[0] = 0x44;
             sak = 0x09;
-        } break;
+        }
+        break;
         case 7: { // NTAG
             response1[0] = 0x44;
             sak = 0x00;
@@ -907,28 +935,31 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t* data) {
             response8[1] = 0x80;
             compute_crc(CRC_14443_A, response8, 2, &response8[2], &response8[3]);
             // uid not supplied then get from emulator memory
-            if (data[0]==0) {
-                uint16_t start = 4 * (0+12);
+            if (data[0] == 0) {
+                uint16_t start = 4 * (0 + 12);
                 uint8_t emdata[8];
-                emlGetMemBt( emdata, start, sizeof(emdata));
+                emlGetMemBt(emdata, start, sizeof(emdata));
                 memcpy(data, emdata, 3); // uid bytes 0-2
-                memcpy(data+3, emdata+4, 4); // uid bytes 3-7
+                memcpy(data + 3, emdata + 4, 4); // uid bytes 3-7
                 flags |= FLAG_7B_UID_IN_DATA;
             }
-        } break;
+        }
+        break;
         case 8: { // MIFARE Classic 4k
             response1[0] = 0x02;
             sak = 0x18;
-        } break;
+        }
+        break;
         case 9 : { // FM11RF005SH (Shanghai Metro)
             response1[0] = 0x03;
             response1[1] = 0x00;
             sak = 0x0A;
         }
         default: {
-            Dbprintf("Error: unkown tagtype (%d)",tagType);
+            Dbprintf("Error: unkown tagtype (%d)", tagType);
             return;
-        } break;
+        }
+        break;
     }
 
     // The second response contains the (mandatory) first 24 bits of the UID
@@ -937,7 +968,7 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t* data) {
     // For UID size 7,
     uint8_t response2a[5] = {0x00};
 
-    if ( (flags & FLAG_7B_UID_IN_DATA) == FLAG_7B_UID_IN_DATA ) {
+    if ((flags & FLAG_7B_UID_IN_DATA) == FLAG_7B_UID_IN_DATA) {
         response2[0] = 0x88;  // Cascade Tag marker
         response2[1] = data[0];
         response2[2] = data[1];
@@ -953,7 +984,7 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t* data) {
         response1[0] |= 0x40;
         sak |= 0x04;
 
-        cuid = bytes_to_num(data+3, 4);
+        cuid = bytes_to_num(data + 3, 4);
     } else {
         memcpy(response2, data, 4);
         // Configure the ATQA and SAK accordingly
@@ -991,7 +1022,7 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t* data) {
     // Prepare CHK_TEARING
     // uint8_t response9[] =  {0xBD,0x90,0x3f};
 
-    #define TAG_RESPONSE_COUNT 10
+#define TAG_RESPONSE_COUNT 10
     tag_response_info_t responses[TAG_RESPONSE_COUNT] = {
         { .response = response1,  .response_n = sizeof(response1)  },  // Answer to request - respond with card type
         { .response = response2,  .response_n = sizeof(response2)  },  // Anticollision cascade1 - respond with uid
@@ -1003,14 +1034,14 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t* data) {
 
         { .response = response8,   .response_n = sizeof(response8) }  // EV1/NTAG PACK response
     };
-        // { .response = response7_NTAG, .response_n = sizeof(response7_NTAG)}, // EV1/NTAG GET_VERSION response
-        // { .response = response9,      .response_n = sizeof(response9)     }  // EV1/NTAG CHK_TEAR response
+    // { .response = response7_NTAG, .response_n = sizeof(response7_NTAG)}, // EV1/NTAG GET_VERSION response
+    // { .response = response9,      .response_n = sizeof(response9)     }  // EV1/NTAG CHK_TEAR response
 
 
     // Allocate 512 bytes for the dynamic modulation, created when the reader queries for it
     // Such a response is less time critical, so we can prepare them on the fly
-    #define DYNAMIC_RESPONSE_BUFFER_SIZE 64
-    #define DYNAMIC_MODULATION_BUFFER_SIZE 512
+#define DYNAMIC_RESPONSE_BUFFER_SIZE 64
+#define DYNAMIC_MODULATION_BUFFER_SIZE 512
     uint8_t dynamic_response_buffer[DYNAMIC_RESPONSE_BUFFER_SIZE];
     uint8_t dynamic_modulation_buffer[DYNAMIC_MODULATION_BUFFER_SIZE];
     tag_response_info_t dynamic_response_info = {
@@ -1034,7 +1065,7 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t* data) {
 
     // Prepare the responses of the anticollision phase
     // there will be not enough time to do this at the moment the reader sends it REQA
-    for (size_t i=0; i<TAG_RESPONSE_COUNT; i++)
+    for (size_t i = 0; i < TAG_RESPONSE_COUNT; i++)
         prepare_allocated_tag_modulation(&responses[i]);
 
     int len = 0;
@@ -1047,7 +1078,7 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t* data) {
     int happened = 0;
     int happened2 = 0;
     int cmdsRecvd = 0;
-    tag_response_info_t* p_response;
+    tag_response_info_t *p_response;
 
     LED_A_ON();
     for (;;) {
@@ -1063,37 +1094,43 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t* data) {
         // Okay, look at the command now.
         lastorder = order;
         if (receivedCmd[0] == ISO14443A_CMD_REQA) { // Received a REQUEST
-            p_response = &responses[0]; order = 1;
+            p_response = &responses[0];
+            order = 1;
         } else if (receivedCmd[0] == ISO14443A_CMD_WUPA) { // Received a WAKEUP
-            p_response = &responses[0]; order = 6;
+            p_response = &responses[0];
+            order = 6;
         } else if (receivedCmd[1] == 0x20 && receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT) {    // Received request for UID (cascade 1)
-            p_response = &responses[1]; order = 2;
+            p_response = &responses[1];
+            order = 2;
         } else if (receivedCmd[1] == 0x20 && receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2) {  // Received request for UID (cascade 2)
-            p_response = &responses[2]; order = 20;
+            p_response = &responses[2];
+            order = 20;
         } else if (receivedCmd[1] == 0x70 && receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT) {    // Received a SELECT (cascade 1)
-            p_response = &responses[3]; order = 3;
+            p_response = &responses[3];
+            order = 3;
         } else if (receivedCmd[1] == 0x70 && receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2) {  // Received a SELECT (cascade 2)
-            p_response = &responses[4]; order = 30;
+            p_response = &responses[4];
+            order = 30;
         } else if (receivedCmd[0] == ISO14443A_CMD_READBLOCK) {    // Received a (plain) READ
             uint8_t block = receivedCmd[1];
             // if Ultralight or NTAG (4 byte blocks)
-            if ( tagType == 7 || tagType == 2 ) {
+            if (tagType == 7 || tagType == 2) {
                 // first 12 blocks of emu are [getversion answer - check tearing - pack - 0x00 - signature]
-                uint16_t start = 4 * (block+12);
+                uint16_t start = 4 * (block + 12);
                 uint8_t emdata[MAX_MIFARE_FRAME_SIZE];
-                emlGetMemBt( emdata, start, 16);
+                emlGetMemBt(emdata, start, 16);
                 AddCrc14A(emdata, 16);
                 EmSendCmd(emdata, sizeof(emdata));
                 // We already responded, do not send anything with the EmSendCmd14443aRaw() that is called below
                 p_response = NULL;
-            } else if ( tagType == 9 && block == 1 ) {
+            } else if (tagType == 9 && block == 1) {
                 // FM11005SH.   16blocks,  4bytes / block.
                 //   block0 = 2byte Customer ID (CID), 2byte Manufacture ID (MID)
                 //   block1 = 4byte UID.
                 p_response = &responses[1];
             } else { // all other tags (16 byte block tags)
                 uint8_t emdata[MAX_MIFARE_FRAME_SIZE];
-                emlGetMemBt( emdata, block, 16);
+                emlGetMemBt(emdata, block, 16);
                 AddCrc14A(emdata, 16);
                 EmSendCmd(emdata, sizeof(emdata));
                 // EmSendCmd(data+(4*receivedCmd[1]),16);
@@ -1104,17 +1141,17 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t* data) {
         } else if (receivedCmd[0] == MIFARE_ULEV1_FASTREAD) {    // Received a FAST READ (ranged read)
             uint8_t emdata[MAX_FRAME_SIZE];
             // first 12 blocks of emu are [getversion answer - check tearing - pack - 0x00 - signature]
-            int start =  (receivedCmd[1]+12) * 4;
+            int start = (receivedCmd[1] + 12) * 4;
             int len   = (receivedCmd[2] - receivedCmd[1] + 1) * 4;
-            emlGetMemBt( emdata, start, len);
+            emlGetMemBt(emdata, start, len);
             AddCrc14A(emdata, len);
-            EmSendCmd(emdata, len+2);
+            EmSendCmd(emdata, len + 2);
             p_response = NULL;
         } else if (receivedCmd[0] == MIFARE_ULEV1_READSIG && tagType == 7) {    // Received a READ SIGNATURE --
             // first 12 blocks of emu are [getversion answer - check tearing - pack - 0x00 - signature]
             uint16_t start = 4 * 4;
             uint8_t emdata[34];
-            emlGetMemBt( emdata, start, 32);
+            emlGetMemBt(emdata, start, 32);
             AddCrc14A(emdata, 32);
             EmSendCmd(emdata, sizeof(emdata));
             p_response = NULL;
@@ -1123,34 +1160,34 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t* data) {
             if (index > 2) {
                 // send NACK 0x0 == invalid argument
                 uint8_t nack[] = {0x00};
-                EmSendCmd(nack,sizeof(nack));
+                EmSendCmd(nack, sizeof(nack));
             } else {
-            uint8_t cmd[] =  {0x00,0x00,0x00,0x14,0xa5};
+                uint8_t cmd[] =  {0x00, 0x00, 0x00, 0x14, 0xa5};
                 num_to_bytes(counters[index], 3, cmd);
-                AddCrc14A(cmd, sizeof(cmd)-2);
-            EmSendCmd(cmd,sizeof(cmd));
+                AddCrc14A(cmd, sizeof(cmd) - 2);
+                EmSendCmd(cmd, sizeof(cmd));
             }
             p_response = NULL;
         } else if (receivedCmd[0] == MIFARE_ULEV1_INCR_CNT && tagType == 7) {    // Received a INC COUNTER --
             uint8_t index = receivedCmd[1];
-            if ( index > 2) {
-                   // send NACK 0x0 == invalid argument
+            if (index > 2) {
+                // send NACK 0x0 == invalid argument
                 uint8_t nack[] = {0x00};
-                EmSendCmd(nack,sizeof(nack));
+                EmSendCmd(nack, sizeof(nack));
             } else {
 
-            uint32_t val = bytes_to_num(receivedCmd+2,4);
+                uint32_t val = bytes_to_num(receivedCmd + 2, 4);
 
                 // if new value + old value is bigger 24bits,  fail
-                if ( val + counters[index] > 0xFFFFFF ) {
+                if (val + counters[index] > 0xFFFFFF) {
                     // send NACK 0x4 == counter overflow
                     uint8_t nack[] = {0x04};
-                    EmSendCmd(nack,sizeof(nack));
+                    EmSendCmd(nack, sizeof(nack));
                 } else {
                     counters[index] = val;
-            // send ACK
-            uint8_t ack[] = {0x0a};
-            EmSendCmd(ack,sizeof(ack));
+                    // send ACK
+                    uint8_t ack[] = {0x0a};
+                    EmSendCmd(ack, sizeof(ack));
                 }
             }
             p_response = NULL;
@@ -1158,24 +1195,24 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t* data) {
             // first 12 blocks of emu are [getversion answer - check tearing - pack - 0x00 - signature]
             uint8_t emdata[3];
             uint8_t index = receivedCmd[1];
-            if ( index > 2) {
-                   // send NACK 0x0 == invalid argument
+            if (index > 2) {
+                // send NACK 0x0 == invalid argument
                 uint8_t nack[] = {0x00};
-                EmSendCmd(nack,sizeof(nack));
+                EmSendCmd(nack, sizeof(nack));
             } else {
-                emlGetMemBt( emdata, 10+index, 1);
-            AddCrc14A(emdata, sizeof(emdata)-2);
-            EmSendCmd(emdata, sizeof(emdata));
+                emlGetMemBt(emdata, 10 + index, 1);
+                AddCrc14A(emdata, sizeof(emdata) - 2);
+                EmSendCmd(emdata, sizeof(emdata));
             }
             p_response = NULL;
         } else if (receivedCmd[0] == ISO14443A_CMD_HALT) {    // Received a HALT
-            LogTrace(receivedCmd, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+            LogTrace(receivedCmd, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
             p_response = NULL;
         } else if (receivedCmd[0] == MIFARE_AUTH_KEYA || receivedCmd[0] == MIFARE_AUTH_KEYB) {    // Received an authentication request
-            if ( tagType == 7 ) {   // IF NTAG /EV1  0x60 == GET_VERSION, not a authentication request.
+            if (tagType == 7) {     // IF NTAG /EV1  0x60 == GET_VERSION, not a authentication request.
                 uint8_t emdata[10];
-                emlGetMemBt( emdata, 0, 8 );
-                AddCrc14A(emdata, sizeof(emdata)-2);
+                emlGetMemBt(emdata, 0, 8);
+                AddCrc14A(emdata, sizeof(emdata) - 2);
                 EmSendCmd(emdata, sizeof(emdata));
                 p_response = NULL;
             } else {
@@ -1184,7 +1221,7 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t* data) {
                 cardAUTHSC = receivedCmd[1] / 4; // received block num
 
                 // incease nonce at AUTH requests. this is time consuming.
-                nonce = prng_successor( GetTickCount(), 32 );
+                nonce = prng_successor(GetTickCount(), 32);
                 //num_to_bytes(nonce, 4, response5);
                 num_to_bytes(nonce, 4, dynamic_response_info.response);
                 dynamic_response_info.response_n = 4;
@@ -1200,30 +1237,31 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t* data) {
                 EmSend4bit(CARD_NACK_NA);
                 p_response = NULL;
             } else {
-                p_response = &responses[6]; order = 70;
+                p_response = &responses[6];
+                order = 70;
             }
         } else if (order == 7 && len == 8) { // Received {nr] and {ar} (part of authentication)
-            LogTrace(receivedCmd, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
-            uint32_t nr = bytes_to_num(receivedCmd,4);
-            uint32_t ar = bytes_to_num(receivedCmd+4,4);
+            LogTrace(receivedCmd, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+            uint32_t nr = bytes_to_num(receivedCmd, 4);
+            uint32_t ar = bytes_to_num(receivedCmd + 4, 4);
 
             // Collect AR/NR per keytype & sector
-            if ( (flags & FLAG_NR_AR_ATTACK) == FLAG_NR_AR_ATTACK ) {
+            if ((flags & FLAG_NR_AR_ATTACK) == FLAG_NR_AR_ATTACK) {
 
                 int8_t index = -1;
                 int8_t empty = -1;
                 for (uint8_t i = 0; i < ATTACK_KEY_COUNT; i++) {
                     // find which index to use
-                    if ( (cardAUTHSC == ar_nr_nonces[i].sector) &&  (cardAUTHKEY == ar_nr_nonces[i].keytype))
+                    if ((cardAUTHSC == ar_nr_nonces[i].sector) && (cardAUTHKEY == ar_nr_nonces[i].keytype))
                         index = i;
 
                     // keep track of empty slots.
-                    if ( ar_nr_nonces[i].state == EMPTY)
+                    if (ar_nr_nonces[i].state == EMPTY)
                         empty = i;
                 }
                 // if no empty slots.  Choose first and overwrite.
-                if ( index == -1 ) {
-                    if ( empty == -1 ) {
+                if (index == -1) {
+                    if (empty == -1) {
                         index = 0;
                         ar_nr_nonces[index].state = EMPTY;
                     } else {
@@ -1231,7 +1269,7 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t* data) {
                     }
                 }
 
-                switch(ar_nr_nonces[index].state) {
+                switch (ar_nr_nonces[index].state) {
                     case EMPTY: {
                         // first nonce collect
                         ar_nr_nonces[index].cuid = cuid;
@@ -1260,23 +1298,24 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t* data) {
                         moebius_count++;
                         break;
                     }
-                    default: break;
+                    default:
+                        break;
                 }
             }
             p_response = NULL;
 
-        } else if (receivedCmd[0] == MIFARE_ULC_AUTH_1 ) { // ULC authentication, or Desfire Authentication
+        } else if (receivedCmd[0] == MIFARE_ULC_AUTH_1) {  // ULC authentication, or Desfire Authentication
         } else if (receivedCmd[0] == MIFARE_ULEV1_AUTH) { // NTAG / EV-1 authentication
-            if ( tagType == 7 ) {
+            if (tagType == 7) {
                 uint16_t start = 13; // first 4 blocks of emu are [getversion answer - check tearing - pack - 0x00]
                 uint8_t emdata[4];
-                emlGetMemBt( emdata, start, 2);
+                emlGetMemBt(emdata, start, 2);
                 AddCrc14A(emdata, 2);
                 EmSendCmd(emdata, sizeof(emdata));
                 p_response = NULL;
-                uint32_t pwd = bytes_to_num(receivedCmd+1,4);
+                uint32_t pwd = bytes_to_num(receivedCmd + 1, 4);
 
-                if ( MF_DBGLEVEL >= 3) Dbprintf("Auth attempt: %08x", pwd);
+                if (MF_DBGLEVEL >= 3) Dbprintf("Auth attempt: %08x", pwd);
             }
         } else {
             // Check for ISO 14443A-4 compliant commands, look at left nibble
@@ -1287,49 +1326,56 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t* data) {
                     dynamic_response_info.response[1] = 0x90;
                     dynamic_response_info.response[2] = 0x00;
                     dynamic_response_info.response_n = 3;
-                } break;
+                }
+                break;
                 case 0x0B:
                 case 0x0A: { // IBlock (command CID)
-                  dynamic_response_info.response[0] = receivedCmd[0];
-                  dynamic_response_info.response[1] = 0x00;
-                  dynamic_response_info.response[2] = 0x90;
-                  dynamic_response_info.response[3] = 0x00;
-                  dynamic_response_info.response_n = 4;
-                } break;
+                    dynamic_response_info.response[0] = receivedCmd[0];
+                    dynamic_response_info.response[1] = 0x00;
+                    dynamic_response_info.response[2] = 0x90;
+                    dynamic_response_info.response[3] = 0x00;
+                    dynamic_response_info.response_n = 4;
+                }
+                break;
 
                 case 0x1A:
                 case 0x1B: { // Chaining command
-                  dynamic_response_info.response[0] = 0xaa | ((receivedCmd[0]) & 1);
-                  dynamic_response_info.response_n = 2;
-                } break;
+                    dynamic_response_info.response[0] = 0xaa | ((receivedCmd[0]) & 1);
+                    dynamic_response_info.response_n = 2;
+                }
+                break;
 
                 case 0xAA:
                 case 0xBB: {
-                  dynamic_response_info.response[0] = receivedCmd[0] ^ 0x11;
-                  dynamic_response_info.response_n = 2;
-                } break;
+                    dynamic_response_info.response[0] = receivedCmd[0] ^ 0x11;
+                    dynamic_response_info.response_n = 2;
+                }
+                break;
 
                 case 0xBA: { // ping / pong
                     dynamic_response_info.response[0] = 0xAB;
                     dynamic_response_info.response[1] = 0x00;
                     dynamic_response_info.response_n = 2;
-                } break;
+                }
+                break;
 
                 case 0xCA:
                 case 0xC2: { // Readers sends deselect command
                     dynamic_response_info.response[0] = 0xCA;
                     dynamic_response_info.response[1] = 0x00;
                     dynamic_response_info.response_n = 2;
-                } break;
+                }
+                break;
 
                 default: {
                     // Never seen this command before
-                    LogTrace(receivedCmd, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
-                    Dbprintf("Received unknown command (len=%d):",len);
-                    Dbhexdump(len,receivedCmd,false);
+                    LogTrace(receivedCmd, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                    Dbprintf("Received unknown command (len=%d):", len);
+                    Dbhexdump(len, receivedCmd, false);
                     // Do not respond
                     dynamic_response_info.response_n = 0;
-                } break;
+                }
+                break;
             }
 
             if (dynamic_response_info.response_n > 0) {
@@ -1340,9 +1386,9 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t* data) {
                 AddCrc14A(dynamic_response_info.response, dynamic_response_info.response_n);
                 dynamic_response_info.response_n += 2;
 
-                if (prepare_tag_modulation(&dynamic_response_info,DYNAMIC_MODULATION_BUFFER_SIZE) == false) {
+                if (prepare_tag_modulation(&dynamic_response_info, DYNAMIC_MODULATION_BUFFER_SIZE) == false) {
                     DbpString("Error preparing tag response");
-                    LogTrace(receivedCmd, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                    LogTrace(receivedCmd, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
                     break;
                 }
                 p_response = &dynamic_response_info;
@@ -1364,24 +1410,24 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t* data) {
             GetParity(p_response->response, p_response->response_n, par);
 
             EmLogTrace(Uart.output,
-                        Uart.len,
-                        Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG,
-                        Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG,
-                        Uart.parity,
-                        p_response->response,
-                        p_response->response_n,
-                        LastTimeProxToAirStart*16 + DELAY_ARM2AIR_AS_TAG,
-                        (LastTimeProxToAirStart + p_response->ProxToAirDuration)*16 + DELAY_ARM2AIR_AS_TAG,
-                        par);
+                       Uart.len,
+                       Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG,
+                       Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG,
+                       Uart.parity,
+                       p_response->response,
+                       p_response->response_n,
+                       LastTimeProxToAirStart * 16 + DELAY_ARM2AIR_AS_TAG,
+                       (LastTimeProxToAirStart + p_response->ProxToAirDuration) * 16 + DELAY_ARM2AIR_AS_TAG,
+                       par);
         }
     }
 
-    cmd_send(CMD_ACK,1,0,0,0,0);
+    cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
     switch_off();
 
     BigBuf_free_keep_EM();
 
-    if (MF_DBGLEVEL >= 4){
+    if (MF_DBGLEVEL >= 4) {
         Dbprintf("-[ Wake ups after halt  [%d]", happened);
         Dbprintf("-[ Messages after halt  [%d]", happened2);
         Dbprintf("-[ Num of received cmd  [%d]", cmdsRecvd);
@@ -1391,7 +1437,8 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t* data) {
 
 // prepare a delayed transfer. This simply shifts ToSend[] by a number
 // of bits specified in the delay parameter.
-void PrepareDelayedTransfer(uint16_t delay) {
+void PrepareDelayedTransfer(uint16_t delay)
+{
     delay &= 0x07;
     if (!delay) return;
 
@@ -1406,12 +1453,12 @@ void PrepareDelayedTransfer(uint16_t delay) {
     ToSend[ToSendMax++] = 0x00;
 
     for (i = 0; i < ToSendMax; i++) {
-            bits_to_shift = ToSend[i] & bitmask;
-            ToSend[i] = ToSend[i] >> delay;
-            ToSend[i] = ToSend[i] | (bits_shifted << (8 - delay));
-            bits_shifted = bits_to_shift;
-        }
+        bits_to_shift = ToSend[i] & bitmask;
+        ToSend[i] = ToSend[i] >> delay;
+        ToSend[i] = ToSend[i] | (bits_shifted << (8 - delay));
+        bits_shifted = bits_to_shift;
     }
+}
 
 
 //-------------------------------------------------------------------------------------
@@ -1422,7 +1469,8 @@ void PrepareDelayedTransfer(uint16_t delay) {
 // if == 0:    transfer immediately and return time of transfer
 // if != 0: delay transfer until time specified
 //-------------------------------------------------------------------------------------
-static void TransmitFor14443a(const uint8_t *cmd, uint16_t len, uint32_t *timing) {
+static void TransmitFor14443a(const uint8_t *cmd, uint16_t len, uint32_t *timing)
+{
 
     FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD);
 
@@ -1432,7 +1480,7 @@ static void TransmitFor14443a(const uint8_t *cmd, uint16_t len, uint32_t *timing
         else
             PrepareDelayedTransfer(*timing & 0x00000007);        // Delay transfer (fine tuning - up to 7 MF clock ticks)
 
-        if(MF_DBGLEVEL >= 4 && GetCountSspClk() >= (*timing & 0xfffffff8))
+        if (MF_DBGLEVEL >= 4 && GetCountSspClk() >= (*timing & 0xfffffff8))
             Dbprintf("TransmitFor14443a: Missed timing");
         while (GetCountSspClk() < (*timing & 0xfffffff8)) {};    // Delay transfer (multiple of 8 MF clock ticks)
         LastTimeProxToAirStart = *timing;
@@ -1452,12 +1500,13 @@ static void TransmitFor14443a(const uint8_t *cmd, uint16_t len, uint32_t *timing
     volatile uint8_t b;
     uint16_t c = 0;
     while (c < len) {
-        if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
+        if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
             AT91C_BASE_SSC->SSC_THR = cmd[c++];
         }
         //iceman test
         if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
-            b = (uint16_t)(AT91C_BASE_SSC->SSC_RHR); (void)b;
+            b = (uint16_t)(AT91C_BASE_SSC->SSC_RHR);
+            (void)b;
         }
     }
 
@@ -1467,7 +1516,8 @@ static void TransmitFor14443a(const uint8_t *cmd, uint16_t len, uint32_t *timing
 //-----------------------------------------------------------------------------
 // Prepare reader command (in bits, support short frames) to send to FPGA
 //-----------------------------------------------------------------------------
-void CodeIso14443aBitsAsReaderPar(const uint8_t *cmd, uint16_t bits, const uint8_t *parity) {
+void CodeIso14443aBitsAsReaderPar(const uint8_t *cmd, uint16_t bits, const uint8_t *parity)
+{
     int i, j;
     int last = 0;
     uint8_t b;
@@ -1476,26 +1526,26 @@ void CodeIso14443aBitsAsReaderPar(const uint8_t *cmd, uint16_t bits, const uint8
 
     // Start of Communication (Seq. Z)
     ToSend[++ToSendMax] = SEC_Z;
-    LastProxToAirDuration = 8 * (ToSendMax+1) - 6;
+    LastProxToAirDuration = 8 * (ToSendMax + 1) - 6;
 
     size_t bytecount = nbytes(bits);
     // Generate send structure for the data bits
     for (i = 0; i < bytecount; i++) {
         // Get the current byte to send
         b = cmd[i];
-        size_t bitsleft = MIN((bits-(i*8)),8);
+        size_t bitsleft = MIN((bits - (i * 8)), 8);
 
         for (j = 0; j < bitsleft; j++) {
             if (b & 1) {
                 // Sequence X
                 ToSend[++ToSendMax] = SEC_X;
-                LastProxToAirDuration = 8 * (ToSendMax+1) - 2;
+                LastProxToAirDuration = 8 * (ToSendMax + 1) - 2;
                 last = 1;
             } else {
                 if (last == 0) {
-                // Sequence Z
-                ToSend[++ToSendMax] = SEC_Z;
-                LastProxToAirDuration = 8 * (ToSendMax+1) - 6;
+                    // Sequence Z
+                    ToSend[++ToSendMax] = SEC_Z;
+                    LastProxToAirDuration = 8 * (ToSendMax + 1) - 6;
                 } else {
                     // Sequence Y
                     ToSend[++ToSendMax] = SEC_Y;
@@ -1508,16 +1558,16 @@ void CodeIso14443aBitsAsReaderPar(const uint8_t *cmd, uint16_t bits, const uint8
         // Only transmit parity bit if we transmitted a complete byte
         if (j == 8 && parity != NULL) {
             // Get the parity bit
-            if (parity[i>>3] & (0x80 >> (i&0x0007))) {
+            if (parity[i >> 3] & (0x80 >> (i & 0x0007))) {
                 // Sequence X
                 ToSend[++ToSendMax] = SEC_X;
-                LastProxToAirDuration = 8 * (ToSendMax+1) - 2;
+                LastProxToAirDuration = 8 * (ToSendMax + 1) - 2;
                 last = 1;
             } else {
                 if (last == 0) {
                     // Sequence Z
                     ToSend[++ToSendMax] = SEC_Z;
-                    LastProxToAirDuration = 8 * (ToSendMax+1) - 6;
+                    LastProxToAirDuration = 8 * (ToSendMax + 1) - 6;
                 } else {
                     // Sequence Y
                     ToSend[++ToSendMax] = SEC_Y;
@@ -1531,7 +1581,7 @@ void CodeIso14443aBitsAsReaderPar(const uint8_t *cmd, uint16_t bits, const uint8
     if (last == 0) {
         // Sequence Z
         ToSend[++ToSendMax] = SEC_Z;
-        LastProxToAirDuration = 8 * (ToSendMax+1) - 6;
+        LastProxToAirDuration = 8 * (ToSendMax + 1) - 6;
     } else {
         // Sequence Y
         ToSend[++ToSendMax] = SEC_Y;
@@ -1546,8 +1596,9 @@ void CodeIso14443aBitsAsReaderPar(const uint8_t *cmd, uint16_t bits, const uint8
 //-----------------------------------------------------------------------------
 // Prepare reader command to send to FPGA
 //-----------------------------------------------------------------------------
-void CodeIso14443aAsReaderPar(const uint8_t *cmd, uint16_t len, const uint8_t *parity) {
-  CodeIso14443aBitsAsReaderPar(cmd, len*8, parity);
+void CodeIso14443aAsReaderPar(const uint8_t *cmd, uint16_t len, const uint8_t *parity)
+{
+    CodeIso14443aBitsAsReaderPar(cmd, len * 8, parity);
 }
 
 //-----------------------------------------------------------------------------
@@ -1555,7 +1606,8 @@ void CodeIso14443aAsReaderPar(const uint8_t *cmd, uint16_t len, const uint8_t *p
 // Stop when button is pressed (return 1) or field was gone (return 2)
 // Or return 0 when command is captured
 //-----------------------------------------------------------------------------
-int EmGetCmd(uint8_t *received, uint16_t *len, uint8_t *parity) {
+int EmGetCmd(uint8_t *received, uint16_t *len, uint8_t *parity)
+{
     *len = 0;
 
     uint32_t timer = 0, vtime = 0;
@@ -1571,9 +1623,9 @@ int EmGetCmd(uint8_t *received, uint16_t *len, uint8_t *parity) {
     // Set ADC to read field strength
     AT91C_BASE_ADC->ADC_CR = AT91C_ADC_SWRST;
     AT91C_BASE_ADC->ADC_MR =
-                ADC_MODE_PRESCALE(63) |
-                ADC_MODE_STARTUP_TIME(1) |
-                ADC_MODE_SAMPLE_HOLD_TIME(15);
+        ADC_MODE_PRESCALE(63) |
+        ADC_MODE_STARTUP_TIME(1) |
+        ADC_MODE_SAMPLE_HOLD_TIME(15);
     AT91C_BASE_ADC->ADC_CHER = ADC_CHANNEL(ADC_CHAN_HF);
     // start ADC
     AT91C_BASE_ADC->ADC_CR = AT91C_ADC_START;
@@ -1584,7 +1636,7 @@ int EmGetCmd(uint8_t *received, uint16_t *len, uint8_t *parity) {
     // Clear RXRDY:
     uint8_t b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
 
-    for(;;) {
+    for (;;) {
         WDT_HIT();
 
         if (BUTTON_PRESS()) return 1;
@@ -1600,17 +1652,16 @@ int EmGetCmd(uint8_t *received, uint16_t *len, uint8_t *parity) {
                     if (!timer) timer = vtime;
                     // 50ms no field --> card to idle state
                     if (vtime - timer > 50) return 2;
-                } else
-                    if (timer) timer = 0;
+                } else if (timer) timer = 0;
                 analogCnt = 0;
                 analogAVG = 0;
             }
         }
 
         // receive and test the miller decoding
-        if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
+        if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
             b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
-            if(MillerDecoding(b, 0)) {
+            if (MillerDecoding(b, 0)) {
                 *len = Uart.len;
                 return 0;
             }
@@ -1618,7 +1669,8 @@ int EmGetCmd(uint8_t *received, uint16_t *len, uint8_t *parity) {
     }
 }
 
-int EmSendCmd14443aRaw(uint8_t *resp, uint16_t respLen) {
+int EmSendCmd14443aRaw(uint8_t *resp, uint16_t respLen)
+{
     volatile uint8_t b;
     uint16_t i = 0;
     uint32_t ThisTransferTime;
@@ -1628,28 +1680,27 @@ int EmSendCmd14443aRaw(uint8_t *resp, uint16_t respLen) {
     FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_TAGSIM_MOD);
 
     // Include correction bit if necessary
-    if (Uart.bitCount == 7)
-    {
+    if (Uart.bitCount == 7) {
         // Short tags (7 bits) don't have parity, determine the correct value from MSB
         correctionNeeded = Uart.output[0] & 0x40;
-    }
-    else
-    {
+    } else {
         // The parity bits are left-aligned
-        correctionNeeded = Uart.parity[(Uart.len-1)/8] & (0x80 >> ((Uart.len-1) & 7));
+        correctionNeeded = Uart.parity[(Uart.len - 1) / 8] & (0x80 >> ((Uart.len - 1) & 7));
     }
     // 1236, so correction bit needed
     i = (correctionNeeded) ? 0 : 1;
 
-     // clear receiving shift register and holding register
-    while(!(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY));
-    b = AT91C_BASE_SSC->SSC_RHR; (void) b;
-    while(!(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY));
-    b = AT91C_BASE_SSC->SSC_RHR; (void) b;
+    // clear receiving shift register and holding register
+    while (!(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY));
+    b = AT91C_BASE_SSC->SSC_RHR;
+    (void) b;
+    while (!(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY));
+    b = AT91C_BASE_SSC->SSC_RHR;
+    (void) b;
 
     // wait for the FPGA to signal fdt_indicator == 1 (the FPGA is ready to queue new data in its delay line)
     for (uint8_t j = 0; j < 5; j++) {    // allow timeout - better late than never
-        while(!(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY));
+        while (!(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY));
         if (AT91C_BASE_SSC->SSC_RHR) break;
     }
 
@@ -1659,22 +1710,23 @@ int EmSendCmd14443aRaw(uint8_t *resp, uint16_t respLen) {
     AT91C_BASE_SSC->SSC_THR = SEC_F;
 
     // send cycle
-    for(; i < respLen; ) {
-        if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
+    for (; i < respLen;) {
+        if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
             AT91C_BASE_SSC->SSC_THR = resp[i++];
             FpgaSendQueueDelay = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
         }
 
         if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
-            b = (uint16_t)(AT91C_BASE_SSC->SSC_RHR); (void)b;
+            b = (uint16_t)(AT91C_BASE_SSC->SSC_RHR);
+            (void)b;
         }
-        if(BUTTON_PRESS()) break;
+        if (BUTTON_PRESS()) break;
     }
 
     // Ensure that the FPGA Delay Queue is empty before we switch to TAGSIM_LISTEN again:
     uint8_t fpga_queued_bits = FpgaSendQueueDelay >> 3;
-    for (i = 0; i <= fpga_queued_bits/8 + 1; ) {
-        if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
+    for (i = 0; i <= fpga_queued_bits / 8 + 1;) {
+        if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
             AT91C_BASE_SSC->SSC_THR = SEC_F;
             FpgaSendQueueDelay = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
             i++;
@@ -1684,68 +1736,73 @@ int EmSendCmd14443aRaw(uint8_t *resp, uint16_t respLen) {
     return 0;
 }
 
-int EmSend4bit(uint8_t resp){
+int EmSend4bit(uint8_t resp)
+{
     Code4bitAnswerAsTag(resp);
     int res = EmSendCmd14443aRaw(ToSend, ToSendMax);
     // do the tracing for the previous reader request and this tag answer:
     uint8_t par[1] = {0x00};
     GetParity(&resp, 1, par);
     EmLogTrace(Uart.output,
-                Uart.len,
-                Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG,
-                Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG,
-                Uart.parity,
-                &resp,
-                1,
-                LastTimeProxToAirStart*16 + DELAY_ARM2AIR_AS_TAG,
-                (LastTimeProxToAirStart + LastProxToAirDuration)*16 + DELAY_ARM2AIR_AS_TAG,
-                par);
+               Uart.len,
+               Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG,
+               Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG,
+               Uart.parity,
+               &resp,
+               1,
+               LastTimeProxToAirStart * 16 + DELAY_ARM2AIR_AS_TAG,
+               (LastTimeProxToAirStart + LastProxToAirDuration) * 16 + DELAY_ARM2AIR_AS_TAG,
+               par);
     return res;
 }
-int EmSendCmdPar(uint8_t *resp, uint16_t respLen, uint8_t *par) {
+int EmSendCmdPar(uint8_t *resp, uint16_t respLen, uint8_t *par)
+{
     return EmSendCmdParEx(resp, respLen, par, false);
 }
-int EmSendCmdParEx(uint8_t *resp, uint16_t respLen, uint8_t *par, bool collision){
+int EmSendCmdParEx(uint8_t *resp, uint16_t respLen, uint8_t *par, bool collision)
+{
     CodeIso14443aAsTagPar(resp, respLen, par, collision);
     int res = EmSendCmd14443aRaw(ToSend, ToSendMax);
     // do the tracing for the previous reader request and this tag answer:
     EmLogTrace(Uart.output,
-                Uart.len,
-                Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG,
-                Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG,
-                Uart.parity,
-                resp,
-                respLen,
-                LastTimeProxToAirStart*16 + DELAY_ARM2AIR_AS_TAG,
-                (LastTimeProxToAirStart + LastProxToAirDuration)*16 + DELAY_ARM2AIR_AS_TAG,
-                par);
+               Uart.len,
+               Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG,
+               Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG,
+               Uart.parity,
+               resp,
+               respLen,
+               LastTimeProxToAirStart * 16 + DELAY_ARM2AIR_AS_TAG,
+               (LastTimeProxToAirStart + LastProxToAirDuration) * 16 + DELAY_ARM2AIR_AS_TAG,
+               par);
     return res;
 }
-int EmSendCmd(uint8_t *resp, uint16_t respLen){
+int EmSendCmd(uint8_t *resp, uint16_t respLen)
+{
     return EmSendCmdEx(resp, respLen, false);
 }
-int EmSendCmdEx(uint8_t *resp, uint16_t respLen, bool collision){
+int EmSendCmdEx(uint8_t *resp, uint16_t respLen, bool collision)
+{
     uint8_t par[MAX_PARITY_SIZE] = {0x00};
     GetParity(resp, respLen, par);
     return EmSendCmdParEx(resp, respLen, par, collision);
 }
 
 bool EmLogTrace(uint8_t *reader_data, uint16_t reader_len, uint32_t reader_StartTime, uint32_t reader_EndTime, uint8_t *reader_Parity,
-                 uint8_t *tag_data, uint16_t tag_len, uint32_t tag_StartTime, uint32_t tag_EndTime, uint8_t *tag_Parity)
+                uint8_t *tag_data, uint16_t tag_len, uint32_t tag_StartTime, uint32_t tag_EndTime, uint8_t *tag_Parity)
 {
     // we cannot exactly measure the end and start of a received command from reader. However we know that the delay from
     // end of the received command to start of the tag's (simulated by us) answer is n*128+20 or n*128+84 resp.
     // with n >= 9. The start of the tags answer can be measured and therefore the end of the received command be calculated:
     uint16_t reader_modlen = reader_EndTime - reader_StartTime;
     uint16_t approx_fdt = tag_StartTime - reader_EndTime;
-    uint16_t exact_fdt = (approx_fdt - 20 + 32)/64 * 64 + 20;
+    uint16_t exact_fdt = (approx_fdt - 20 + 32) / 64 * 64 + 20;
     reader_EndTime = tag_StartTime - exact_fdt;
     reader_StartTime = reader_EndTime - reader_modlen;
 
     if (!LogTrace(reader_data, reader_len, reader_StartTime, reader_EndTime, reader_Parity, true))
         return false;
     else
-        return(!LogTrace(tag_data, tag_len, tag_StartTime, tag_EndTime, tag_Parity, false));
+        return (!LogTrace(tag_data, tag_len, tag_StartTime, tag_EndTime, tag_Parity, false));
 
 }
 
@@ -1754,7 +1811,8 @@ bool EmLogTrace(uint8_t *reader_data, uint16_t reader_len, uint32_t reader_Start
 //  If a response is captured return TRUE
 //  If it takes too long return FALSE
 //-----------------------------------------------------------------------------
-static int GetIso14443aAnswerFromTag(uint8_t *receivedResponse, uint8_t *receivedResponsePar, uint16_t offset) {
+static int GetIso14443aAnswerFromTag(uint8_t *receivedResponse, uint8_t *receivedResponsePar, uint16_t offset)
+{
     uint32_t c = 0;
 
     // Set FPGA mode to "reader listen mode", no modulation (listen
@@ -1770,13 +1828,13 @@ static int GetIso14443aAnswerFromTag(uint8_t *receivedResponse, uint8_t *receive
     uint8_t b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
 
     uint32_t timeout = iso14a_get_timeout();
-    for(;;) {
+    for (;;) {
         WDT_HIT();
 
         if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
             b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
             if (ManchesterDecoding(b, offset, 0)) {
-                NextTransferTime = MAX(NextTransferTime, Demod.endTime - (DELAY_AIR2ARM_AS_READER + DELAY_ARM2AIR_AS_READER)/16 + FRAME_DELAY_TIME_PICC_TO_PCD);
+                NextTransferTime = MAX(NextTransferTime, Demod.endTime - (DELAY_AIR2ARM_AS_READER + DELAY_ARM2AIR_AS_READER) / 16 + FRAME_DELAY_TIME_PICC_TO_PCD);
                 return true;
             } else if (c++ > timeout && Demod.state == DEMOD_UNSYNCD) {
                 return false;
@@ -1785,52 +1843,59 @@ static int GetIso14443aAnswerFromTag(uint8_t *receivedResponse, uint8_t *receive
     }
 }
 
-void ReaderTransmitBitsPar(uint8_t* frame, uint16_t bits, uint8_t *par, uint32_t *timing) {
+void ReaderTransmitBitsPar(uint8_t *frame, uint16_t bits, uint8_t *par, uint32_t *timing)
+{
 
     CodeIso14443aBitsAsReaderPar(frame, bits, par);
     // Send command to tag
     TransmitFor14443a(ToSend, ToSendMax, timing);
-    if(trigger) LED_A_ON();
+    if (trigger) LED_A_ON();
 
-    LogTrace(frame, nbytes(bits), (LastTimeProxToAirStart<<4) + DELAY_ARM2AIR_AS_READER, ((LastTimeProxToAirStart + LastProxToAirDuration)<<4) + DELAY_ARM2AIR_AS_READER, par, true);
+    LogTrace(frame, nbytes(bits), (LastTimeProxToAirStart << 4) + DELAY_ARM2AIR_AS_READER, ((LastTimeProxToAirStart + LastProxToAirDuration) << 4) + DELAY_ARM2AIR_AS_READER, par, true);
 }
 
-void ReaderTransmitPar(uint8_t* frame, uint16_t len, uint8_t *par, uint32_t *timing) {
-  ReaderTransmitBitsPar(frame, len*8, par, timing);
+void ReaderTransmitPar(uint8_t *frame, uint16_t len, uint8_t *par, uint32_t *timing)
+{
+    ReaderTransmitBitsPar(frame, len * 8, par, timing);
 }
 
-void ReaderTransmitBits(uint8_t* frame, uint16_t len, uint32_t *timing) {
+void ReaderTransmitBits(uint8_t *frame, uint16_t len, uint32_t *timing)
+{
     // Generate parity and redirect
     uint8_t par[MAX_PARITY_SIZE] = {0x00};
-    GetParity(frame, len/8, par);
+    GetParity(frame, len / 8, par);
     ReaderTransmitBitsPar(frame, len, par, timing);
 }
 
-void ReaderTransmit(uint8_t* frame, uint16_t len, uint32_t *timing) {
+void ReaderTransmit(uint8_t *frame, uint16_t len, uint32_t *timing)
+{
     // Generate parity and redirect
     uint8_t par[MAX_PARITY_SIZE] = {0x00};
     GetParity(frame, len, par);
-    ReaderTransmitBitsPar(frame, len*8, par, timing);
+    ReaderTransmitBitsPar(frame, len * 8, par, timing);
 }
 
-int ReaderReceiveOffset(uint8_t* receivedAnswer, uint16_t offset, uint8_t *parity) {
+int ReaderReceiveOffset(uint8_t *receivedAnswer, uint16_t offset, uint8_t *parity)
+{
     if (!GetIso14443aAnswerFromTag(receivedAnswer, parity, offset))
         return false;
-    LogTrace(receivedAnswer, Demod.len, Demod.startTime*16 - DELAY_AIR2ARM_AS_READER, Demod.endTime*16 - DELAY_AIR2ARM_AS_READER, parity, false);
+    LogTrace(receivedAnswer, Demod.len, Demod.startTime * 16 - DELAY_AIR2ARM_AS_READER, Demod.endTime * 16 - DELAY_AIR2ARM_AS_READER, parity, false);
     return Demod.len;
 }
 
-int ReaderReceive(uint8_t *receivedAnswer, uint8_t *parity) {
+int ReaderReceive(uint8_t *receivedAnswer, uint8_t *parity)
+{
     if (!GetIso14443aAnswerFromTag(receivedAnswer, parity, 0))
         return false;
-    LogTrace(receivedAnswer, Demod.len, Demod.startTime*16 - DELAY_AIR2ARM_AS_READER, Demod.endTime*16 - DELAY_AIR2ARM_AS_READER, parity, false);
+    LogTrace(receivedAnswer, Demod.len, Demod.startTime * 16 - DELAY_AIR2ARM_AS_READER, Demod.endTime * 16 - DELAY_AIR2ARM_AS_READER, parity, false);
     return Demod.len;
 }
 
 // This function misstreats the ISO 14443a anticollision procedure.
 // by fooling the reader there is a collision and forceing the reader to
 // increase the uid bytes.   The might be an overflow, DoS will occure.
-void iso14443a_antifuzz(uint32_t flags){
+void iso14443a_antifuzz(uint32_t flags)
+{
 
     // We need to listen to the high-frequency, peak-detected path.
     iso14443a_setup(FPGA_HF_ISO14443A_TAGSIM_LISTEN);
@@ -1846,7 +1911,7 @@ void iso14443a_antifuzz(uint32_t flags){
     uint8_t *receivedPar = BigBuf_malloc(MAX_PARITY_SIZE);
     uint8_t *resp = BigBuf_malloc(20);
 
-    memset(resp, 0xFF , 20);
+    memset(resp, 0xFF, 20);
 
     LED_A_ON();
     for (;;) {
@@ -1857,16 +1922,16 @@ void iso14443a_antifuzz(uint32_t flags){
             Dbprintf("Anti-fuzz stopped. Trace length: %d ", BigBuf_get_traceLen());
             break;
         }
-        if ( received[0] == ISO14443A_CMD_WUPA || received[0] == ISO14443A_CMD_REQA) {
-                resp[0] = 0x04;
-                resp[1] = 0x00;
+        if (received[0] == ISO14443A_CMD_WUPA || received[0] == ISO14443A_CMD_REQA) {
+            resp[0] = 0x04;
+            resp[1] = 0x00;
 
-                if ( (flags & FLAG_7B_UID_IN_DATA) == FLAG_7B_UID_IN_DATA ) {
-                    resp[0] = 0x44;
-                }
+            if ((flags & FLAG_7B_UID_IN_DATA) == FLAG_7B_UID_IN_DATA) {
+                resp[0] = 0x44;
+            }
 
-                EmSendCmd(resp, 2);
-                continue;
+            EmSendCmd(resp, 2);
+            continue;
         }
 
         // Received request for UID (cascade 1)
@@ -1879,7 +1944,7 @@ void iso14443a_antifuzz(uint32_t flags){
             resp[4] =  resp[0] ^ resp[1] ^ resp[2] ^ resp[3];
             colpos = 0;
 
-            if ( (flags & FLAG_7B_UID_IN_DATA) == FLAG_7B_UID_IN_DATA ) {
+            if ((flags & FLAG_7B_UID_IN_DATA) == FLAG_7B_UID_IN_DATA) {
                 resp[0] = 0x88;
                 colpos = 8;
             }
@@ -1898,12 +1963,13 @@ void iso14443a_antifuzz(uint32_t flags){
         }
     }
 
-    cmd_send(CMD_ACK,1,0,0,0,0);
+    cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
     switch_off();
     BigBuf_free_keep_EM();
 }
 
-static void iso14a_set_ATS_times(uint8_t *ats) {
+static void iso14a_set_ATS_times(uint8_t *ats)
+{
 
     uint8_t tb1;
     uint8_t fwi, sfgi;
@@ -1919,24 +1985,25 @@ static void iso14a_set_ATS_times(uint8_t *ats) {
             fwi = (tb1 & 0xf0) >> 4;            // frame waiting time integer (FWI)
             if (fwi != 15) {
                 fwt = 256 * 16 * (1 << fwi);    // frame waiting time (FWT) in 1/fc
-                iso14a_set_timeout(fwt/(8*16));
+                iso14a_set_timeout(fwt / (8 * 16));
             }
             sfgi = tb1 & 0x0f;                  // startup frame guard time integer (SFGI)
             if (sfgi != 0 && sfgi != 15) {
                 sfgt = 256 * 16 * (1 << sfgi);  // startup frame guard time (SFGT) in 1/fc
-                NextTransferTime = MAX(NextTransferTime, Demod.endTime + (sfgt - DELAY_AIR2ARM_AS_READER - DELAY_ARM2AIR_AS_READER)/16);
+                NextTransferTime = MAX(NextTransferTime, Demod.endTime + (sfgt - DELAY_AIR2ARM_AS_READER - DELAY_ARM2AIR_AS_READER) / 16);
             }
         }
     }
 }
 
-static int GetATQA(uint8_t *resp, uint8_t *resp_par) {
+static int GetATQA(uint8_t *resp, uint8_t *resp_par)
+{
 
 #define WUPA_RETRY_TIMEOUT 10    // 10ms
     uint8_t wupa[] = { ISO14443A_CMD_WUPA };  // 0x26 - REQA  0x52 - WAKE-UP
 
     uint32_t save_iso14a_timeout = iso14a_get_timeout();
-    iso14a_set_timeout(1236/(16*8)+1);        // response to WUPA is expected at exactly 1236/fc. No need to wait longer.
+    iso14a_set_timeout(1236 / (16 * 8) + 1);  // response to WUPA is expected at exactly 1236/fc. No need to wait longer.
 
     uint32_t start_time = GetTickCount();
     int len;
@@ -1959,11 +2026,12 @@ static int GetATQA(uint8_t *resp, uint8_t *resp_par) {
 // if anticollision is false, then the UID must be provided in uid_ptr[]
 // and num_cascades must be set (1: 4 Byte UID, 2: 7 Byte UID, 3: 10 Byte UID)
 // requests ATS unless no_rats is true
-int iso14443a_select_card(byte_t *uid_ptr, iso14a_card_select_t *p_card, uint32_t *cuid_ptr, bool anticollision, uint8_t num_cascades, bool no_rats) {
+int iso14443a_select_card(byte_t *uid_ptr, iso14a_card_select_t *p_card, uint32_t *cuid_ptr, bool anticollision, uint8_t num_cascades, bool no_rats)
+{
 
-    uint8_t sel_all[]    = { ISO14443A_CMD_ANTICOLL_OR_SELECT,0x20 };
-    uint8_t sel_uid[]    = { ISO14443A_CMD_ANTICOLL_OR_SELECT,0x70,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-    uint8_t rats[]       = { ISO14443A_CMD_RATS,0x80,0x00,0x00 }; // FSD=256, FSDI=8, CID=0
+    uint8_t sel_all[]    = { ISO14443A_CMD_ANTICOLL_OR_SELECT, 0x20 };
+    uint8_t sel_uid[]    = { ISO14443A_CMD_ANTICOLL_OR_SELECT, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+    uint8_t rats[]       = { ISO14443A_CMD_RATS, 0x80, 0x00, 0x00 }; // FSD=256, FSDI=8, CID=0
     uint8_t resp[MAX_FRAME_SIZE] = {0}; // theoretically. A usual RATS will be much smaller
     uint8_t resp_par[MAX_PARITY_SIZE] = {0};
     uint8_t uid_resp[4] = {0};
@@ -2000,12 +2068,12 @@ int iso14443a_select_card(byte_t *uid_ptr, iso14a_card_select_t *p_card, uint32_
     // OK we will select at least at cascade 1, lets see if first byte of UID was 0x88 in
     // which case we need to make a cascade 2 request and select - this is a long UID
     // While the UID is not complete, the 3nd bit (from the right) is set in the SAK.
-    for(; sak & 0x04; cascade_level++) {
+    for (; sak & 0x04; cascade_level++) {
         // SELECT_* (L1: 0x93, L2: 0x95, L3: 0x97)
         sel_uid[0] = sel_all[0] = 0x93 + cascade_level * 2;
 
         if (anticollision) {
-        // SELECT_ALL
+            // SELECT_ALL
             ReaderTransmit(sel_all, sizeof(sel_all), NULL);
             if (!ReaderReceive(resp, resp_par)) return 0;
 
@@ -2017,24 +2085,24 @@ int iso14443a_select_card(byte_t *uid_ptr, iso14a_card_select_t *p_card, uint32_
                 while (Demod.collisionPos) {
                     Dbprintf("Multiple tags detected. Collision after Bit %d", Demod.collisionPos);
                     for (uint16_t i = collision_answer_offset; i < Demod.collisionPos; i++, uid_resp_bits++) {    // add valid UID bits before collision point
-                        uint16_t UIDbit = (resp[i/8] >> (i % 8)) & 0x01;
+                        uint16_t UIDbit = (resp[i / 8] >> (i % 8)) & 0x01;
                         uid_resp[uid_resp_bits / 8] |= UIDbit << (uid_resp_bits % 8);
                     }
-                    uid_resp[uid_resp_bits/8] |= 1 << (uid_resp_bits % 8);                    // next time select the card(s) with a 1 in the collision position
+                    uid_resp[uid_resp_bits / 8] |= 1 << (uid_resp_bits % 8);                  // next time select the card(s) with a 1 in the collision position
                     uid_resp_bits++;
                     // construct anticollosion command:
-                    sel_uid[1] = ((2 + uid_resp_bits/8) << 4) | (uid_resp_bits & 0x07);       // length of data in bytes and bits
-                    for (uint16_t i = 0; i <= uid_resp_bits/8; i++) {
-                        sel_uid[2+i] = uid_resp[i];
+                    sel_uid[1] = ((2 + uid_resp_bits / 8) << 4) | (uid_resp_bits & 0x07);     // length of data in bytes and bits
+                    for (uint16_t i = 0; i <= uid_resp_bits / 8; i++) {
+                        sel_uid[2 + i] = uid_resp[i];
                     }
-                    collision_answer_offset = uid_resp_bits%8;
+                    collision_answer_offset = uid_resp_bits % 8;
                     ReaderTransmitBits(sel_uid, 16 + uid_resp_bits, NULL);
                     if (!ReaderReceiveOffset(resp, collision_answer_offset, resp_par)) return 0;
                 }
                 // finally, add the last bits and BCC of the UID
-                for (uint16_t i = collision_answer_offset; i < (Demod.len-1)*8; i++, uid_resp_bits++) {
-                    uint16_t UIDbit = (resp[i/8] >> (i%8)) & 0x01;
-                    uid_resp[uid_resp_bits/8] |= UIDbit << (uid_resp_bits % 8);
+                for (uint16_t i = collision_answer_offset; i < (Demod.len - 1) * 8; i++, uid_resp_bits++) {
+                    uint16_t UIDbit = (resp[i / 8] >> (i % 8)) & 0x01;
+                    uid_resp[uid_resp_bits / 8] |= UIDbit << (uid_resp_bits % 8);
                 }
 
             } else {        // no collision, use the response to SELECT_ALL as current uid
@@ -2044,20 +2112,20 @@ int iso14443a_select_card(byte_t *uid_ptr, iso14a_card_select_t *p_card, uint32_
         } else {
             if (cascade_level < num_cascades - 1) {
                 uid_resp[0] = 0x88;
-                memcpy(uid_resp+1, uid_ptr+cascade_level*3, 3);
+                memcpy(uid_resp + 1, uid_ptr + cascade_level * 3, 3);
             } else {
-                memcpy(uid_resp, uid_ptr+cascade_level*3, 4);
+                memcpy(uid_resp, uid_ptr + cascade_level * 3, 4);
             }
         }
         uid_resp_len = 4;
 
         // calculate crypto UID. Always use last 4 Bytes.
-        if(cuid_ptr)
+        if (cuid_ptr)
             *cuid_ptr = bytes_to_num(uid_resp, 4);
 
         // Construct SELECT UID command
         sel_uid[1] = 0x70;                                              // transmitting a full UID (1 Byte cmd, 1 Byte NVB, 4 Byte UID, 1 Byte BCC, 2 Bytes CRC)
-        memcpy(sel_uid+2, uid_resp, 4);                                 // the UID received during anticollision, or the provided UID
+        memcpy(sel_uid + 2, uid_resp, 4);                               // the UID received during anticollision, or the provided UID
         sel_uid[6] = sel_uid[2] ^ sel_uid[3] ^ sel_uid[4] ^ sel_uid[5]; // calculate and add BCC
         AddCrc14A(sel_uid, 7);                                          // calculate and add CRC
         ReaderTransmit(sel_uid, sizeof(sel_uid), NULL);
@@ -2077,11 +2145,11 @@ int iso14443a_select_card(byte_t *uid_ptr, iso14a_card_select_t *p_card, uint32_
             uid_resp_len = 3;
         }
 
-        if(uid_ptr && anticollision)
-            memcpy(uid_ptr + (cascade_level*3), uid_resp, uid_resp_len);
+        if (uid_ptr && anticollision)
+            memcpy(uid_ptr + (cascade_level * 3), uid_resp, uid_resp_len);
 
-        if(p_card) {
-            memcpy(p_card->uid + (cascade_level*3), uid_resp, uid_resp_len);
+        if (p_card) {
+            memcpy(p_card->uid + (cascade_level * 3), uid_resp, uid_resp_len);
             p_card->uidlen += uid_resp_len;
         }
     }
@@ -2091,10 +2159,10 @@ int iso14443a_select_card(byte_t *uid_ptr, iso14a_card_select_t *p_card, uint32_
     }
 
     // PICC compilant with iso14443a-4 ---> (SAK & 0x20 != 0)
-    if( (sak & 0x20) == 0) return 2;
+    if ((sak & 0x20) == 0) return 2;
 
     // RATS, Request for answer to select
-    if ( !no_rats ) {
+    if (!no_rats) {
 
         AddCrc14A(rats, 2);
         ReaderTransmit(rats, sizeof(rats), NULL);
@@ -2116,9 +2184,10 @@ int iso14443a_select_card(byte_t *uid_ptr, iso14a_card_select_t *p_card, uint32_
     return 1;
 }
 
-int iso14443a_fast_select_card(uint8_t *uid_ptr, uint8_t num_cascades) {
-    uint8_t sel_all[]    = { ISO14443A_CMD_ANTICOLL_OR_SELECT,0x20 };
-    uint8_t sel_uid[]    = { ISO14443A_CMD_ANTICOLL_OR_SELECT,0x70,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+int iso14443a_fast_select_card(uint8_t *uid_ptr, uint8_t num_cascades)
+{
+    uint8_t sel_all[]    = { ISO14443A_CMD_ANTICOLL_OR_SELECT, 0x20 };
+    uint8_t sel_uid[]    = { ISO14443A_CMD_ANTICOLL_OR_SELECT, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
     uint8_t resp[5] = {0}; // theoretically. A usual RATS will be much smaller
     uint8_t resp_par[1] = {0};
     uint8_t uid_resp[4] = {0};
@@ -2133,20 +2202,20 @@ int iso14443a_fast_select_card(uint8_t *uid_ptr, uint8_t num_cascades) {
     // OK we will select at least at cascade 1, lets see if first byte of UID was 0x88 in
     // which case we need to make a cascade 2 request and select - this is a long UID
     // While the UID is not complete, the 3nd bit (from the right) is set in the SAK.
-    for(; sak & 0x04; cascade_level++) {
+    for (; sak & 0x04; cascade_level++) {
         // SELECT_* (L1: 0x93, L2: 0x95, L3: 0x97)
         sel_uid[0] = sel_all[0] = 0x93 + cascade_level * 2;
 
         if (cascade_level < num_cascades - 1) {
             uid_resp[0] = 0x88;
-            memcpy(uid_resp+1, uid_ptr+cascade_level*3, 3);
+            memcpy(uid_resp + 1, uid_ptr + cascade_level * 3, 3);
         } else {
-            memcpy(uid_resp, uid_ptr+cascade_level*3, 4);
+            memcpy(uid_resp, uid_ptr + cascade_level * 3, 4);
         }
 
         // Construct SELECT UID command
         //sel_uid[1] = 0x70;                                            // transmitting a full UID (1 Byte cmd, 1 Byte NVB, 4 Byte UID, 1 Byte BCC, 2 Bytes CRC)
-        memcpy(sel_uid+2, uid_resp, 4);                                 // the UID received during anticollision, or the provided UID
+        memcpy(sel_uid + 2, uid_resp, 4);                               // the UID received during anticollision, or the provided UID
         sel_uid[6] = sel_uid[2] ^ sel_uid[3] ^ sel_uid[4] ^ sel_uid[5]; // calculate and add BCC
         AddCrc14A(sel_uid, 7);                                          // calculate and add CRC
         ReaderTransmit(sel_uid, sizeof(sel_uid), NULL);
@@ -2168,7 +2237,8 @@ int iso14443a_fast_select_card(uint8_t *uid_ptr, uint8_t num_cascades) {
     return 1;
 }
 
-void iso14443a_setup(uint8_t fpga_minor_mode) {
+void iso14443a_setup(uint8_t fpga_minor_mode)
+{
 
     FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
     // Set up the synchronous serial port
@@ -2219,7 +2289,8 @@ b8 b7 b6 b5 b4 b3 b2 b1
 b5,b6 = 00 - DESELECT
         11 - WTX
 */
-int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, bool send_chaining, void *data, uint8_t *res) {
+int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, bool send_chaining, void *data, uint8_t *res)
+{
     uint8_t parity[MAX_PARITY_SIZE] = {0x00};
     uint8_t real_cmd[cmd_len + 4];
 
@@ -2246,12 +2317,12 @@ int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, bool send_chaining, void *data, u
 
     if (!len) {
         return 0; //DATA LINK ERROR
-    } else{
+    } else {
         // S-Block WTX
-        while(len && ((data_bytes[0] & 0xF2) == 0xF2)) {
+        while (len && ((data_bytes[0] & 0xF2) == 0xF2)) {
             uint32_t save_iso14a_timeout = iso14a_get_timeout();
             // temporarily increase timeout
-            iso14a_set_timeout( MAX((data_bytes[1] & 0x3f) * save_iso14a_timeout, MAX_ISO14A_TIMEOUT) );
+            iso14a_set_timeout(MAX((data_bytes[1] & 0x3f) * save_iso14a_timeout, MAX_ISO14A_TIMEOUT));
             // Transmit WTX back
             // byte1 - WTXM [1..59]. command FWT=FWT*WTXM
             data_bytes[1] = data_bytes[1] & 0x3f; // 2 high bits mandatory set to 0b
@@ -2269,10 +2340,9 @@ int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, bool send_chaining, void *data, u
         // if we received an I- or R(ACK)-Block with a block number equal to the
         // current block number, toggle the current block number
         if (len >= 3 // PCB+CRC = 3 bytes
-             && ((data_bytes[0] & 0xC0) == 0 // I-Block
-                 || (data_bytes[0] & 0xD0) == 0x80) // R-Block with ACK bit set to 0
-             && (data_bytes[0] & 0x01) == iso14_pcb_blocknum) // equal block numbers
-        {
+            && ((data_bytes[0] & 0xC0) == 0 // I-Block
+                || (data_bytes[0] & 0xD0) == 0x80) // R-Block with ACK bit set to 0
+            && (data_bytes[0] & 0x01) == iso14_pcb_blocknum) { // equal block numbers
             iso14_pcb_blocknum ^= 1;
         }
 
@@ -2306,7 +2376,8 @@ int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, bool send_chaining, void *data, u
 //             low  ::  len of commandbytes
 // arg2         timeout
 // d.asBytes command bytes to send
-void ReaderIso14443a(UsbCommand *c) {
+void ReaderIso14443a(UsbCommand *c)
+{
     iso14a_command_t param = c->arg[0];
     size_t len = c->arg[1] & 0xffff;
     size_t lenbits = c->arg[1] >> 16;
@@ -2329,11 +2400,11 @@ void ReaderIso14443a(UsbCommand *c) {
 
         // notify client selecting status.
         // if failed selecting, turn off antenna and quite.
-        if( !(param & ISO14A_NO_SELECT) ) {
-            iso14a_card_select_t *card = (iso14a_card_select_t*)buf;
-            arg0 = iso14443a_select_card(NULL, card, NULL, true, 0, param & ISO14A_NO_RATS );
+        if (!(param & ISO14A_NO_SELECT)) {
+            iso14a_card_select_t *card = (iso14a_card_select_t *)buf;
+            arg0 = iso14443a_select_card(NULL, card, NULL, true, 0, param & ISO14A_NO_RATS);
             cmd_send(CMD_ACK, arg0, card->uidlen, 0, buf, sizeof(iso14a_card_select_t));
-            if ( arg0 == 0 )
+            if (arg0 == 0)
                 goto OUT;
         }
     }
@@ -2351,7 +2422,7 @@ void ReaderIso14443a(UsbCommand *c) {
 
         if ((param & ISO14A_APPEND_CRC)) {
             // Don't append crc on empty bytearray...
-            if ( len > 0 ) {
+            if (len > 0) {
                 if ((param & ISO14A_TOPAZMODE))
                     AddCrc14B(cmd, len);
                 else
@@ -2373,7 +2444,7 @@ void ReaderIso14443a(UsbCommand *c) {
                     bits_to_send -= 8;
                 }
             } else {
-                GetParity(cmd, lenbits/8, par);
+                GetParity(cmd, lenbits / 8, par);
                 ReaderTransmitBitsPar(cmd, lenbits, par, NULL);                         // bytes are 8 bit with odd parity
             }
         } else {                    // want to send complete bytes only
@@ -2406,7 +2477,8 @@ OUT:
 // Determine the distance between two nonces.
 // Assume that the difference is small, but we don't know which is first.
 // Therefore try in alternating directions.
-int32_t dist_nt(uint32_t nt1, uint32_t nt2) {
+int32_t dist_nt(uint32_t nt1, uint32_t nt2)
+{
 
     if (nt1 == nt2) return 0;
 
@@ -2421,7 +2493,7 @@ int32_t dist_nt(uint32_t nt1, uint32_t nt2) {
         if (nttmp2 == nt1) return -i;
     }
 
-    return(-99999); // either nt1 or nt2 are invalid nonces
+    return (-99999); // either nt1 or nt2 are invalid nonces
 }
 
 
@@ -2435,19 +2507,21 @@ int32_t dist_nt(uint32_t nt1, uint32_t nt2) {
 // Cloning MiFare Classic Rail and Building Passes, Anywhere, Anytime"
 // (article by Nicolas T. Courtois, 2009)
 //-----------------------------------------------------------------------------
-void ReaderMifare(bool first_try, uint8_t block, uint8_t keytype ) {
+void ReaderMifare(bool first_try, uint8_t block, uint8_t keytype)
+{
 
     iso14443a_setup(FPGA_HF_ISO14443A_READER_MOD);
 
-    BigBuf_free(); BigBuf_Clear_ext(false);
+    BigBuf_free();
+    BigBuf_Clear_ext(false);
     clear_trace();
     set_tracing(true);
 
     uint8_t mf_auth[]     = { keytype, block, 0x00, 0x00 };
-    uint8_t mf_nr_ar[]    = {0,0,0,0,0,0,0,0};
-    uint8_t uid[10]       = {0,0,0,0,0,0,0,0,0,0};
-    uint8_t par_list[8]   = {0,0,0,0,0,0,0,0};
-    uint8_t ks_list[8]    = {0,0,0,0,0,0,0,0};
+    uint8_t mf_nr_ar[]    = {0, 0, 0, 0, 0, 0, 0, 0};
+    uint8_t uid[10]       = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+    uint8_t par_list[8]   = {0, 0, 0, 0, 0, 0, 0, 0};
+    uint8_t ks_list[8]    = {0, 0, 0, 0, 0, 0, 0, 0};
     uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};
     uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0x00};
     uint8_t par[1] = {0};    // maximum 8 Bytes to be sent here, 1 byte parity is therefore enough
@@ -2512,10 +2586,17 @@ void ReaderMifare(bool first_try, uint8_t block, uint8_t keytype ) {
                 continue;
             }
             switch (card_info.uidlen) {
-                case 4 : cascade_levels = 1; break;
-                case 7 : cascade_levels = 2; break;
-                case 10: cascade_levels = 3; break;
-                default: break;
+                case 4 :
+                    cascade_levels = 1;
+                    break;
+                case 7 :
+                    cascade_levels = 2;
+                    break;
+                case 10:
+                    cascade_levels = 3;
+                    break;
+                default:
+                    break;
             }
             have_uid = true;
         } else { // no need for anticollision. We can directly select the card
@@ -2528,15 +2609,15 @@ void ReaderMifare(bool first_try, uint8_t block, uint8_t keytype ) {
         elapsed_prng_sequences = 1;
 
         // Sending timeslot of ISO14443a frame
-        sync_time = (sync_time & 0xfffffff8 ) + sync_cycles + catch_up_cycles;
+        sync_time = (sync_time & 0xfffffff8) + sync_cycles + catch_up_cycles;
         catch_up_cycles = 0;
 
-        #define SYNC_TIME_BUFFER        16        // if there is only SYNC_TIME_BUFFER left before next planned sync, wait for next PRNG cycle
+#define SYNC_TIME_BUFFER        16        // if there is only SYNC_TIME_BUFFER left before next planned sync, wait for next PRNG cycle
 
         // if we missed the sync time already or are about to miss it, advance to the next nonce repeat
-        while ( sync_time < GetCountSspClk() + SYNC_TIME_BUFFER) {
+        while (sync_time < GetCountSspClk() + SYNC_TIME_BUFFER) {
             ++elapsed_prng_sequences;
-            sync_time = (sync_time & 0xfffffff8 ) + sync_cycles;
+            sync_time = (sync_time & 0xfffffff8) + sync_cycles;
         }
 
         // Transmit MIFARE_CLASSIC_AUTH at synctime. Should result in returning the same tag nonce (== nt_attacked)
@@ -2581,13 +2662,13 @@ void ReaderMifare(bool first_try, uint8_t block, uint8_t keytype ) {
                     break;
                 }
 
-                sync_cycles = (sync_cycles - nt_distance)/elapsed_prng_sequences;
+                sync_cycles = (sync_cycles - nt_distance) / elapsed_prng_sequences;
 
                 // no negative sync_cycles
                 if (sync_cycles <= 0) sync_cycles += PRNG_SEQUENCE_LENGTH;
 
                 // reset sync_cycles
-                if (sync_cycles > PRNG_SEQUENCE_LENGTH * 2 ) {
+                if (sync_cycles > PRNG_SEQUENCE_LENGTH * 2) {
                     sync_cycles = PRNG_SEQUENCE_LENGTH;
                     sync_time = GetCountSspClk() & 0xfffffff8;
                 }
@@ -2601,7 +2682,7 @@ void ReaderMifare(bool first_try, uint8_t block, uint8_t keytype ) {
         }
         LED_B_OFF();
 
-        if ( (nt != nt_attacked) && nt_attacked) {     // we somehow lost sync. Try to catch up again...
+        if ((nt != nt_attacked) && nt_attacked) {      // we somehow lost sync. Try to catch up again...
 
             catch_up_cycles = -dist_nt(nt_attacked, nt);
             if (catch_up_cycles == 99999) {            // invalid nonce received. Don't resync on that one.
@@ -2685,7 +2766,7 @@ void ReaderMifare(bool first_try, uint8_t block, uint8_t keytype ) {
     memcpy(buf + 16, ks_list, 8);
     memcpy(buf + 24, mf_nr_ar, 8);
 
-    cmd_send(CMD_ACK, isOK, 0, 0, buf, sizeof(buf) );
+    cmd_send(CMD_ACK, isOK, 0, 0, buf, sizeof(buf));
 
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     LEDsoff();
@@ -2696,10 +2777,11 @@ void ReaderMifare(bool first_try, uint8_t block, uint8_t keytype ) {
 *  Mifare Classic NACK-bug detection
 *  Thanks to @doegox for the feedback and new approaches.
 */
-void DetectNACKbug() {
+void DetectNACKbug()
+{
     uint8_t mf_auth[]     = {0x60, 0x00, 0xF5, 0x7B};
-    uint8_t mf_nr_ar[]    = {0,0,0,0,0,0,0,0};
-    uint8_t uid[10]       = {0,0,0,0,0,0,0,0,0,0};
+    uint8_t mf_nr_ar[]    = {0, 0, 0, 0, 0, 0, 0, 0};
+    uint8_t uid[10]       = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
     uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};
     uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0x00};
     uint8_t par[1] = {0};    // maximum 8 Bytes to be sent here, 1 byte parity is therefore enough
@@ -2718,7 +2800,8 @@ void DetectNACKbug() {
     // Mifare Classic's random generator repeats every 2^16 cycles (and so do the nonces).
     uint32_t sync_cycles = PRNG_SEQUENCE_LENGTH;
 
-    BigBuf_free(); BigBuf_Clear_ext(false);
+    BigBuf_free();
+    BigBuf_Clear_ext(false);
     clear_trace();
     set_tracing(true);
     iso14443a_setup(FPGA_HF_ISO14443A_READER_MOD);
@@ -2732,7 +2815,7 @@ void DetectNACKbug() {
         received_nack = false;
 
         // Cards always leaks a NACK, no matter the parity
-        if ((i==10) && (num_nacks == i-1)) {
+        if ((i == 10) && (num_nacks == i - 1)) {
             isOK = 2;
             break;
         }
@@ -2753,10 +2836,17 @@ void DetectNACKbug() {
                 continue;
             }
             switch (card_info.uidlen) {
-                case 4 : cascade_levels = 1; break;
-                case 7 : cascade_levels = 2; break;
-                case 10: cascade_levels = 3; break;
-                default: break;
+                case 4 :
+                    cascade_levels = 1;
+                    break;
+                case 7 :
+                    cascade_levels = 2;
+                    break;
+                case 10:
+                    cascade_levels = 3;
+                    break;
+                default:
+                    break;
             }
             have_uid = true;
         } else { // no need for anticollision. We can directly select the card
@@ -2769,13 +2859,13 @@ void DetectNACKbug() {
         elapsed_prng_sequences = 1;
 
         // Sending timeslot of ISO14443a frame
-        sync_time = (sync_time & 0xfffffff8 ) + sync_cycles + catch_up_cycles;
+        sync_time = (sync_time & 0xfffffff8) + sync_cycles + catch_up_cycles;
         catch_up_cycles = 0;
 
         // if we missed the sync time already, advance to the next nonce repeat
-        while ( GetCountSspClk() > sync_time) {
+        while (GetCountSspClk() > sync_time) {
             ++elapsed_prng_sequences;
-            sync_time = (sync_time & 0xfffffff8 ) + sync_cycles;
+            sync_time = (sync_time & 0xfffffff8) + sync_cycles;
         }
 
         // Transmit MIFARE_CLASSIC_AUTH at synctime. Should result in returning the same tag nonce (== nt_attacked)
@@ -2795,7 +2885,7 @@ void DetectNACKbug() {
             received_nack = true;
             num_nacks++;
             // ALWAYS leak Detection.
-            if ( i == num_nacks ) {
+            if (i == num_nacks) {
                 continue;
             }
         }
@@ -2812,7 +2902,7 @@ void DetectNACKbug() {
             } else {
                 if (nt_distance == -99999) { // invalid nonce received
                     unexpected_random++;
-                    if (unexpected_random > MAX_UNEXPECTED_RANDOM ) {
+                    if (unexpected_random > MAX_UNEXPECTED_RANDOM) {
                         // Card has an unpredictable PRNG. Give up
                         isOK = 98;
                         break;
@@ -2829,12 +2919,12 @@ void DetectNACKbug() {
                     break;
                 }
 
-                sync_cycles = (sync_cycles - nt_distance)/elapsed_prng_sequences;
+                sync_cycles = (sync_cycles - nt_distance) / elapsed_prng_sequences;
 
                 if (sync_cycles <= 0)
                     sync_cycles += PRNG_SEQUENCE_LENGTH;
 
-                if (sync_cycles > PRNG_SEQUENCE_LENGTH * 2 ) {
+                if (sync_cycles > PRNG_SEQUENCE_LENGTH * 2) {
                     isOK = 96;             // Card's PRNG runs at an unexpected frequency or resets unexpectedly
                     break;
                 }
@@ -2846,7 +2936,7 @@ void DetectNACKbug() {
             }
         }
 
-        if ( (nt != nt_attacked) && nt_attacked) {
+        if ((nt != nt_attacked) && nt_attacked) {
             // we somehow lost sync. Try to catch up again...
             catch_up_cycles = -dist_nt(nt_attacked, nt);
 
@@ -2874,7 +2964,7 @@ void DetectNACKbug() {
 
                 if (MF_DBGLEVEL >= 4) {
                     Dbprintf("Lost sync in cycle %d for the fourth time consecutively (nt_distance = %d). Adjusting sync_cycles to %d.\n", i, catch_up_cycles, sync_cycles);
-                    Dbprintf("nt [%08x] attacted [%08x]", nt, nt_attacked );
+                    Dbprintf("nt [%08x] attacted [%08x]", nt, nt_attacked);
                 }
                 last_catch_up = 0;
                 catch_up_cycles = 0;
@@ -2892,7 +2982,7 @@ void DetectNACKbug() {
 
         // tried all 256 possible parities without success.
         if (par[0] == 0) {
-            if ( num_nacks == 1 )
+            if (num_nacks == 1)
                 isOK = 1;
             break;
         }
@@ -2903,7 +2993,7 @@ void DetectNACKbug() {
 
     // num_nacks = number of nacks recieved. should be only 1. if not its a clone card which always sends NACK (parity == 0) ?
     // i  =  number of authentications sent.  Not always 256, since we are trying to sync but close to it.
-    cmd_send(CMD_ACK, isOK, num_nacks, i, 0, 0 );
+    cmd_send(CMD_ACK, isOK, num_nacks, i, 0, 0);
 
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     LEDsoff();
@@ -2923,7 +3013,8 @@ void DetectNACKbug() {
   *@param exitAfterNReads, exit simulation after n blocks have been read, 0 is inifite
 * (unless reader attack mode enabled then it runs util it gets enough nonces to recover all keys attmpted)
   */
-void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *datain) {
+void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *datain)
+{
 
     int cardSTATE = MFEMUL_NOFIELD;
     int _UID_LEN = 0;  // 4, 7, 10
@@ -2960,7 +3051,7 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
 
     // TAG Nonce - Authenticate response
     uint8_t rAUTH_NT[4];
-    uint32_t nonce = prng_successor( GetTickCount(), 32 );
+    uint32_t nonce = prng_successor(GetTickCount(), 32);
     num_to_bytes(nonce, 4, rAUTH_NT);
 
     // uint8_t rAUTH_NT[] = {0x55, 0x41, 0x49, 0x92};// nonce from nested? why this?
@@ -2974,20 +3065,20 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
     // -- Determine the UID
     // Can be set from emulator memory or incoming data
     // Length: 4,7,or 10 bytes
-    if ( (flags & FLAG_UID_IN_EMUL) == FLAG_UID_IN_EMUL)
+    if ((flags & FLAG_UID_IN_EMUL) == FLAG_UID_IN_EMUL)
         emlGetMemBt(datain, 0, 10);  // load 10bytes from EMUL to the datain pointer. to be used below.
 
-    if ( (flags & FLAG_4B_UID_IN_DATA) == FLAG_4B_UID_IN_DATA) {
+    if ((flags & FLAG_4B_UID_IN_DATA) == FLAG_4B_UID_IN_DATA) {
         memcpy(rUIDBCC1, datain, 4);
         _UID_LEN = 4;
-    } else if ( (flags & FLAG_7B_UID_IN_DATA) == FLAG_7B_UID_IN_DATA) {
+    } else if ((flags & FLAG_7B_UID_IN_DATA) == FLAG_7B_UID_IN_DATA) {
         memcpy(&rUIDBCC1[1], datain,   3);
-        memcpy( rUIDBCC2,    datain+3, 4);
+        memcpy(rUIDBCC2,    datain + 3, 4);
         _UID_LEN = 7;
-    } else if ( (flags & FLAG_10B_UID_IN_DATA) == FLAG_10B_UID_IN_DATA) {
+    } else if ((flags & FLAG_10B_UID_IN_DATA) == FLAG_10B_UID_IN_DATA) {
         memcpy(&rUIDBCC1[1], datain,   3);
-        memcpy(&rUIDBCC2[1], datain+3, 3);
-        memcpy( rUIDBCC3,    datain+6, 4);
+        memcpy(&rUIDBCC2[1], datain + 3, 3);
+        memcpy(rUIDBCC3,    datain + 6, 4);
         _UID_LEN = 10;
     }
 
@@ -3000,11 +3091,11 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
             rUIDBCC1[4] = rUIDBCC1[0] ^ rUIDBCC1[1] ^ rUIDBCC1[2] ^ rUIDBCC1[3];
             if (MF_DBGLEVEL >= 2)    {
                 Dbprintf("4B UID: %02x%02x%02x%02x",
-                    rUIDBCC1[0],
-                    rUIDBCC1[1],
-                    rUIDBCC1[2],
-                    rUIDBCC1[3]
-                );
+                         rUIDBCC1[0],
+                         rUIDBCC1[1],
+                         rUIDBCC1[2],
+                         rUIDBCC1[3]
+                        );
             }
             break;
         case 7:
@@ -3012,21 +3103,21 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
             sak_7[0] &= 0xFB;
             // save CUID
             cuid = bytes_to_num(rUIDBCC2, 4);
-             // CascadeTag, CT
+            // CascadeTag, CT
             rUIDBCC1[0] = 0x88;
             // BCC
             rUIDBCC1[4] = rUIDBCC1[0] ^ rUIDBCC1[1] ^ rUIDBCC1[2] ^ rUIDBCC1[3];
             rUIDBCC2[4] = rUIDBCC2[0] ^ rUIDBCC2[1] ^ rUIDBCC2[2] ^ rUIDBCC2[3];
             if (MF_DBGLEVEL >= 2)    {
                 Dbprintf("7B UID: %02x %02x %02x %02x %02x %02x %02x",
-                    rUIDBCC1[1],
-                    rUIDBCC1[2],
-                    rUIDBCC1[3],
-                    rUIDBCC2[0],
-                    rUIDBCC2[1],
-                    rUIDBCC2[2],
-                    rUIDBCC2[3]
-                );
+                         rUIDBCC1[1],
+                         rUIDBCC1[2],
+                         rUIDBCC1[3],
+                         rUIDBCC2[0],
+                         rUIDBCC2[1],
+                         rUIDBCC2[2],
+                         rUIDBCC2[3]
+                        );
             }
             break;
         case 10:
@@ -3034,7 +3125,7 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
             sak_10[0] &= 0xFB;
             // save CUID
             cuid = bytes_to_num(rUIDBCC3, 4);
-             // CascadeTag, CT
+            // CascadeTag, CT
             rUIDBCC1[0] = 0x88;
             rUIDBCC2[0] = 0x88;
             // BCC
@@ -3044,17 +3135,17 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
 
             if (MF_DBGLEVEL >= 2)    {
                 Dbprintf("10B UID: %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x",
-                    rUIDBCC1[1],
-                    rUIDBCC1[2],
-                    rUIDBCC1[3],
-                    rUIDBCC2[1],
-                    rUIDBCC2[2],
-                    rUIDBCC2[3],
-                    rUIDBCC3[0],
-                    rUIDBCC3[1],
-                    rUIDBCC3[2],
-                    rUIDBCC3[3]
-                );
+                         rUIDBCC1[1],
+                         rUIDBCC1[2],
+                         rUIDBCC1[3],
+                         rUIDBCC2[1],
+                         rUIDBCC2[2],
+                         rUIDBCC2[3],
+                         rUIDBCC3[0],
+                         rUIDBCC3[1],
+                         rUIDBCC3[2],
+                         rUIDBCC3[3]
+                        );
             }
             break;
         default:
@@ -3114,11 +3205,11 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
         switch (cardSTATE) {
             case MFEMUL_NOFIELD:
             case MFEMUL_HALTED:
-            case MFEMUL_IDLE:{
-                LogTrace(Uart.output, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+            case MFEMUL_IDLE: {
+                LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
                 break;
             }
-            case MFEMUL_SELECT1:{
+            case MFEMUL_SELECT1: {
                 if (len == 2 && (receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT && receivedCmd[1] == 0x20)) {
                     if (MF_DBGLEVEL >= 4)    Dbprintf("SELECT ALL received");
                     EmSendCmd(rUIDBCC1, sizeof(rUIDBCC1));
@@ -3126,13 +3217,13 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
                 }
                 // select card
                 if (len == 9 &&
-                        ( receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT &&
-                          receivedCmd[1] == 0x70 &&
-                          memcmp(&receivedCmd[2], rUIDBCC1, 4) == 0)) {
+                    (receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT &&
+                     receivedCmd[1] == 0x70 &&
+                     memcmp(&receivedCmd[2], rUIDBCC1, 4) == 0)) {
 
                     // SAK 4b
                     EmSendCmd(sak_4, sizeof(sak_4));
-                    switch(_UID_LEN){
+                    switch (_UID_LEN) {
                         case 4:
                             cardSTATE = MFEMUL_WORK;
                             LED_B_ON();
@@ -3142,16 +3233,17 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
                         case 10:
                             cardSTATE = MFEMUL_SELECT2;
                             continue;
-                        default:break;
+                        default:
+                            break;
                     }
                 } else {
                     cardSTATE_TO_IDLE();
                 }
                 break;
             }
-            case MFEMUL_SELECT2:{
+            case MFEMUL_SELECT2: {
                 if (!len) {
-                    LogTrace(Uart.output, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                    LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
                     break;
                 }
                 if (len == 2 && (receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2 && receivedCmd[1] == 0x20)) {
@@ -3159,12 +3251,12 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
                     break;
                 }
                 if (len == 9 &&
-                        (receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2 &&
-                         receivedCmd[1] == 0x70 &&
-                         memcmp(&receivedCmd[2], rUIDBCC2, 4) == 0) ) {
+                    (receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2 &&
+                     receivedCmd[1] == 0x70 &&
+                     memcmp(&receivedCmd[2], rUIDBCC2, 4) == 0)) {
 
                     EmSendCmd(sak_7, sizeof(sak_7));
-                    switch(_UID_LEN){
+                    switch (_UID_LEN) {
                         case 7:
                             cardSTATE = MFEMUL_WORK;
                             LED_B_ON();
@@ -3173,15 +3265,16 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
                         case 10:
                             cardSTATE = MFEMUL_SELECT3;
                             continue;
-                        default:break;
+                        default:
+                            break;
                     }
                 }
                 cardSTATE_TO_IDLE();
                 break;
             }
-            case MFEMUL_SELECT3:{
+            case MFEMUL_SELECT3: {
                 if (!len) {
-                    LogTrace(Uart.output, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                    LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
                     break;
                 }
                 if (len == 2 && (receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_3 && receivedCmd[1] == 0x20)) {
@@ -3189,9 +3282,9 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
                     break;
                 }
                 if (len == 9 &&
-                        (receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_3 &&
-                         receivedCmd[1] == 0x70 &&
-                         memcmp(&receivedCmd[2], rUIDBCC3, 4) == 0) ) {
+                    (receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_3 &&
+                     receivedCmd[1] == 0x70 &&
+                     memcmp(&receivedCmd[2], rUIDBCC3, 4) == 0)) {
 
                     EmSendCmd(sak_10, sizeof(sak_10));
                     cardSTATE = MFEMUL_WORK;
@@ -3202,10 +3295,10 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
                 cardSTATE_TO_IDLE();
                 break;
             }
-            case MFEMUL_AUTH1:{
-                if( len != 8) {
+            case MFEMUL_AUTH1: {
+                if (len != 8) {
                     cardSTATE_TO_IDLE();
-                    LogTrace(Uart.output, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                    LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
                     break;
                 }
 
@@ -3213,22 +3306,22 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
                 uint32_t ar = bytes_to_num(&receivedCmd[4], 4);
 
                 // Collect AR/NR per keytype & sector
-                if ( (flags & FLAG_NR_AR_ATTACK) == FLAG_NR_AR_ATTACK ) {
+                if ((flags & FLAG_NR_AR_ATTACK) == FLAG_NR_AR_ATTACK) {
 
                     int8_t index = -1;
                     int8_t empty = -1;
                     for (uint8_t i = 0; i < ATTACK_KEY_COUNT; i++) {
                         // find which index to use
-                        if ( (cardAUTHSC == ar_nr_nonces[i].sector) &&  (cardAUTHKEY == ar_nr_nonces[i].keytype))
+                        if ((cardAUTHSC == ar_nr_nonces[i].sector) && (cardAUTHKEY == ar_nr_nonces[i].keytype))
                             index = i;
 
                         // keep track of empty slots.
-                        if ( ar_nr_nonces[i].state == EMPTY)
+                        if (ar_nr_nonces[i].state == EMPTY)
                             empty = i;
                     }
                     // if no empty slots.  Choose first and overwrite.
-                    if ( index == -1 ) {
-                        if ( empty == -1 ) {
+                    if (index == -1) {
+                        if (empty == -1) {
                             index = 0;
                             ar_nr_nonces[index].state = EMPTY;
                         } else {
@@ -3236,7 +3329,7 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
                         }
                     }
 
-                    switch(ar_nr_nonces[index].state) {
+                    switch (ar_nr_nonces[index].state) {
                         case EMPTY: {
                             // first nonce collect
                             ar_nr_nonces[index].cuid = cuid;
@@ -3263,32 +3356,33 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
                             ar_nr_nonces[index].keytype = 0;
                             break;
                         }
-                        default: break;
+                        default:
+                            break;
                     }
                 }
 
-                crypto1_word(pcs, nr , 1);
+                crypto1_word(pcs, nr, 1);
                 uint32_t cardRr = ar ^ crypto1_word(pcs, 0, 0);
 
                 //test if auth OK
-                if (cardRr != prng_successor(nonce, 64)){
+                if (cardRr != prng_successor(nonce, 64)) {
 
                     if (MF_DBGLEVEL >= 3) {
                         Dbprintf("AUTH FAILED for sector %d with key %c. [nr=%08x  cardRr=%08x] [nt=%08x succ=%08x]"
-                            , cardAUTHSC
-                            , (cardAUTHKEY == 0) ? 'A' : 'B'
-                            , nr
-                            , cardRr
-                            , nonce // nt
-                            , prng_successor(nonce, 64)
-                        );
+                                 , cardAUTHSC
+                                 , (cardAUTHKEY == 0) ? 'A' : 'B'
+                                 , nr
+                                 , cardRr
+                                 , nonce // nt
+                                 , prng_successor(nonce, 64)
+                                );
                     }
                     // Shouldn't we respond anything here?
                     // Right now, we don't nack or anything, which causes the
                     // reader to do a WUPA after a while. /Martin
                     // -- which is the correct response. /piwi
                     cardSTATE_TO_IDLE();
-                    LogTrace(Uart.output, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                    LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
                     break;
                 }
 
@@ -3299,26 +3393,26 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
 
                 if (MF_DBGLEVEL >= 3) {
                     Dbprintf("AUTH COMPLETED for sector %d with key %c. time=%d",
-                        cardAUTHSC,
-                        cardAUTHKEY == 0 ? 'A' : 'B',
-                        GetTickCount() - authTimer
-                    );
+                             cardAUTHSC,
+                             cardAUTHKEY == 0 ? 'A' : 'B',
+                             GetTickCount() - authTimer
+                            );
                 }
                 cardSTATE = MFEMUL_WORK;
                 break;
             }
-            case MFEMUL_WORK:{
+            case MFEMUL_WORK: {
                 if (len == 0) {
-                    LogTrace(Uart.output, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                    LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
                     break;
                 }
                 bool encrypted_data = (cardAUTHKEY != 0xFF) ;
 
-                if(encrypted_data)
+                if (encrypted_data)
                     mf_crypto1_decrypt(pcs, receivedCmd, len);
 
                 if (len == 4 && (receivedCmd[0] == MIFARE_AUTH_KEYA ||
-                                 receivedCmd[0] == MIFARE_AUTH_KEYB)  ) {
+                                 receivedCmd[0] == MIFARE_AUTH_KEYB)) {
 
                     authTimer = GetTickCount();
                     cardAUTHSC = receivedCmd[1] / 4;  // received block -> sector
@@ -3359,27 +3453,27 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
                     break;
                 }
 
-                if(len != 4) {
-                    LogTrace(Uart.output, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                if (len != 4) {
+                    LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
                     break;
                 }
 
-                if ( receivedCmd[0] == ISO14443A_CMD_READBLOCK ||
-                     receivedCmd[0] == ISO14443A_CMD_WRITEBLOCK ||
-                     receivedCmd[0] == MIFARE_CMD_INC ||
-                     receivedCmd[0] == MIFARE_CMD_DEC ||
-                     receivedCmd[0] == MIFARE_CMD_RESTORE ||
-                     receivedCmd[0] == MIFARE_CMD_TRANSFER ) {
+                if (receivedCmd[0] == ISO14443A_CMD_READBLOCK ||
+                    receivedCmd[0] == ISO14443A_CMD_WRITEBLOCK ||
+                    receivedCmd[0] == MIFARE_CMD_INC ||
+                    receivedCmd[0] == MIFARE_CMD_DEC ||
+                    receivedCmd[0] == MIFARE_CMD_RESTORE ||
+                    receivedCmd[0] == MIFARE_CMD_TRANSFER) {
 
                     if (receivedCmd[1] >= 16 * 4) {
                         EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
-                        if (MF_DBGLEVEL >= 4) Dbprintf("Reader tried to operate (0x%02) on out of range block: %d (0x%02x), nacking",receivedCmd[0],receivedCmd[1],receivedCmd[1]);
+                        if (MF_DBGLEVEL >= 4) Dbprintf("Reader tried to operate (0x%02) on out of range block: %d (0x%02x), nacking", receivedCmd[0], receivedCmd[1], receivedCmd[1]);
                         break;
                     }
 
                     if (receivedCmd[1] / 4 != cardAUTHSC) {
                         EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
-                        if (MF_DBGLEVEL >= 4) Dbprintf("Reader tried to operate (0x%02) on block (0x%02x) not authenticated for (0x%02x), nacking",receivedCmd[0],receivedCmd[1],cardAUTHSC);
+                        if (MF_DBGLEVEL >= 4) Dbprintf("Reader tried to operate (0x%02) on block (0x%02x) not authenticated for (0x%02x), nacking", receivedCmd[0], receivedCmd[1], cardAUTHSC);
                         break;
                     }
                 }
@@ -3392,7 +3486,7 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
                     mf_crypto1_encrypt(pcs, response, 18, response_par);
                     EmSendCmdPar(response, 18, response_par);
                     numReads++;
-                    if(exitAfterNReads > 0 && numReads >= exitAfterNReads) {
+                    if (exitAfterNReads > 0 && numReads >= exitAfterNReads) {
                         Dbprintf("%d reads done, exiting", numReads);
                         finished = true;
                     }
@@ -3407,11 +3501,11 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
                     break;
                 }
                 // increment, decrement, restore
-                if ( receivedCmd[0] == MIFARE_CMD_INC ||
-                     receivedCmd[0] == MIFARE_CMD_DEC ||
-                     receivedCmd[0] == MIFARE_CMD_RESTORE) {
+                if (receivedCmd[0] == MIFARE_CMD_INC ||
+                    receivedCmd[0] == MIFARE_CMD_DEC ||
+                    receivedCmd[0] == MIFARE_CMD_RESTORE) {
 
-                     if (MF_DBGLEVEL >= 4) Dbprintf("RECV 0x%02x inc(0xC1)/dec(0xC0)/restore(0xC2) block %d (%02x)",receivedCmd[0], receivedCmd[1], receivedCmd[1]);
+                    if (MF_DBGLEVEL >= 4) Dbprintf("RECV 0x%02x inc(0xC1)/dec(0xC0)/restore(0xC2) block %d (%02x)", receivedCmd[0], receivedCmd[1], receivedCmd[1]);
 
                     if (emlCheckValBl(receivedCmd[1])) {
                         if (MF_DBGLEVEL >= 4) Dbprintf("Reader tried to operate on block, but emlCheckValBl failed, nacking");
@@ -3440,7 +3534,7 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
                     LED_C_OFF();
                     cardSTATE = MFEMUL_HALTED;
                     if (MF_DBGLEVEL >= 4)    Dbprintf("--> HALTED. Selected time: %d ms",  GetTickCount() - selTimer);
-                    LogTrace(Uart.output, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                    LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
                     break;
                 }
                 // RATS
@@ -3453,7 +3547,7 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
                 EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
                 break;
             }
-            case MFEMUL_WRITEBL2:{
+            case MFEMUL_WRITEBL2: {
                 if (len == 18) {
                     mf_crypto1_decrypt(pcs, receivedCmd, len);
                     emlSetMem(receivedCmd, cardWRBL, 1);
@@ -3461,11 +3555,11 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
                     cardSTATE = MFEMUL_WORK;
                 } else {
                     cardSTATE_TO_IDLE();
-                    LogTrace(Uart.output, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                    LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
                 }
                 break;
             }
-            case MFEMUL_INTREG_INC:{
+            case MFEMUL_INTREG_INC: {
                 mf_crypto1_decrypt(pcs, receivedCmd, len);
                 memcpy(&ans, receivedCmd, 4);
                 if (emlGetValBl(&cardINTREG, &cardINTBLOCK, cardWRBL)) {
@@ -3473,12 +3567,12 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
                     cardSTATE_TO_IDLE();
                     break;
                 }
-                LogTrace(Uart.output, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
                 cardINTREG = cardINTREG + ans;
                 cardSTATE = MFEMUL_WORK;
                 break;
             }
-            case MFEMUL_INTREG_DEC:{
+            case MFEMUL_INTREG_DEC: {
                 mf_crypto1_decrypt(pcs, receivedCmd, len);
                 memcpy(&ans, receivedCmd, 4);
                 if (emlGetValBl(&cardINTREG, &cardINTBLOCK, cardWRBL)) {
@@ -3486,12 +3580,12 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
                     cardSTATE_TO_IDLE();
                     break;
                 }
-                LogTrace(Uart.output, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
                 cardINTREG = cardINTREG - ans;
                 cardSTATE = MFEMUL_WORK;
                 break;
             }
-            case MFEMUL_INTREG_REST:{
+            case MFEMUL_INTREG_REST: {
                 mf_crypto1_decrypt(pcs, receivedCmd, len);
                 memcpy(&ans, receivedCmd, 4);
                 if (emlGetValBl(&cardINTREG, &cardINTBLOCK, cardWRBL)) {
@@ -3499,7 +3593,7 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
                     cardSTATE_TO_IDLE();
                     break;
                 }
-                LogTrace(Uart.output, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
                 cardSTATE = MFEMUL_WORK;
                 break;
             }
@@ -3509,7 +3603,7 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
     if (MF_DBGLEVEL >= 1)
         Dbprintf("Emulator stopped. Trace length: %d ", BigBuf_get_traceLen());
 
-    cmd_send(CMD_ACK,1,0,0,0,0);
+    cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     LEDsoff();
     set_tracing(false);
diff --git a/armsrc/iso14443a.h b/armsrc/iso14443a.h
index 38d0b99e1..4d28a8dfb 100644
--- a/armsrc/iso14443a.h
+++ b/armsrc/iso14443a.h
@@ -70,7 +70,7 @@ typedef struct {
         STATE_MILLER_Z,
         // DROP_NONE,
         // DROP_FIRST_HALF,
-        } state;
+    } state;
     uint16_t shiftReg;
     int16_t bitCount;
     uint16_t len;
@@ -95,10 +95,10 @@ typedef struct {
 
 extern void GetParity(const uint8_t *pbtCmd, uint16_t len, uint8_t *par);
 
-extern tDemod* GetDemod(void);
+extern tDemod *GetDemod(void);
 extern void DemodReset(void);
 extern void DemodInit(uint8_t *data, uint8_t *parity);
-extern tUart* GetUart(void);
+extern tUart *GetUart(void);
 extern void UartReset(void);
 extern void UartInit(uint8_t *data, uint8_t *parity);
 extern RAMFUNC bool MillerDecoding(uint8_t bit, uint32_t non_real_time);
@@ -133,7 +133,7 @@ bool EmLogTrace(uint8_t *reader_data, uint16_t reader_len, uint32_t reader_Start
 
 //extern bool prepare_allocated_tag_modulation(tag_response_info_t *response_info, uint8_t **buffer, size_t *buffer_size);
 
-void ReaderMifare(bool first_try, uint8_t block, uint8_t keytype );
+void ReaderMifare(bool first_try, uint8_t block, uint8_t keytype);
 void DetectNACKbug();
 
 #ifdef __cplusplus
diff --git a/armsrc/iso14443b.c b/armsrc/iso14443b.c
index 2e2aec7cd..5041d9b3f 100644
--- a/armsrc/iso14443b.c
+++ b/armsrc/iso14443b.c
@@ -38,7 +38,7 @@
 // 4sample
 #define SEND4STUFFBIT(x) ToSendStuffBit(x);ToSendStuffBit(x);ToSendStuffBit(x);ToSendStuffBit(x);
 //#define SEND4STUFFBIT(x) ToSendStuffBit(x);
- // iceman, this threshold value,  what makes 8 a good amplitude for this IQ values?
+// iceman, this threshold value,  what makes 8 a good amplitude for this IQ values?
 #ifndef SUBCARRIER_DETECT_THRESHOLD
 # define SUBCARRIER_DETECT_THRESHOLD 8
 #endif
@@ -77,7 +77,8 @@ static struct {
     uint8_t  *output;
 } Uart;
 
-static void UartReset() {
+static void UartReset()
+{
     Uart.state = STATE_UNSYNCD;
     Uart.shiftReg = 0;
     Uart.bitCnt = 0;
@@ -86,7 +87,8 @@ static void UartReset() {
     Uart.posCnt = 0;
 }
 
-static void UartInit(uint8_t *data) {
+static void UartInit(uint8_t *data)
+{
     Uart.output = data;
     UartReset();
 // memset(Uart.output, 0x00, MAX_FRAME_SIZE);
@@ -107,10 +109,10 @@ static struct {
     uint16_t bitCount;
     int      posCount;
     int      thisBit;
-/* this had been used to add RSSI (Received Signal Strength Indication) to traces. Currently not implemented.
-    int     metric;
-    int     metricN;
-*/
+    /* this had been used to add RSSI (Received Signal Strength Indication) to traces. Currently not implemented.
+        int     metric;
+        int     metricN;
+    */
     uint16_t shiftReg;
     uint8_t  *output;
     uint16_t len;
@@ -120,7 +122,8 @@ static struct {
 } Demod;
 
 // Clear out the state of the "UART" that receives from the tag.
-static void DemodReset() {
+static void DemodReset()
+{
     Demod.state = DEMOD_UNSYNCD;
     Demod.bitCount = 0;
     Demod.posCount = 0;
@@ -133,7 +136,8 @@ static void DemodReset() {
     Demod.endTime = 0;
 }
 
-static void DemodInit(uint8_t *data) {
+static void DemodInit(uint8_t *data)
+{
     Demod.output = data;
     DemodReset();
     // memset(Demod.output, 0x00, MAX_FRAME_SIZE);
@@ -153,20 +157,22 @@ static void DemodInit(uint8_t *data) {
 *    13560000000 / 384000 = 35312 FWT
 * @param timeout is in frame wait time, fwt, measured in ETUs
 */
-static void iso14b_set_timeout(uint32_t timeout) {
-    #define MAX_TIMEOUT 40542464  // 13560000Hz * 1000ms / (2^32-1) * (8*16)
-    if(timeout > MAX_TIMEOUT)
+static void iso14b_set_timeout(uint32_t timeout)
+{
+#define MAX_TIMEOUT 40542464  // 13560000Hz * 1000ms / (2^32-1) * (8*16)
+    if (timeout > MAX_TIMEOUT)
         timeout = MAX_TIMEOUT;
 
     iso14b_timeout = timeout;
-    if(MF_DBGLEVEL >= 3) Dbprintf("ISO14443B Timeout set to %ld fwt", iso14b_timeout);
+    if (MF_DBGLEVEL >= 3) Dbprintf("ISO14443B Timeout set to %ld fwt", iso14b_timeout);
 }
-static void iso14b_set_maxframesize(uint16_t size) {
+static void iso14b_set_maxframesize(uint16_t size)
+{
     if (size > 256)
         size = MAX_FRAME_SIZE;
 
     Uart.byteCntMax = size;
-    if(MF_DBGLEVEL >= 3) Dbprintf("ISO14443B Max frame size set to %d bytes", Uart.byteCntMax);
+    if (MF_DBGLEVEL >= 3) Dbprintf("ISO14443B Max frame size set to %d bytes", Uart.byteCntMax);
 }
 
 //-----------------------------------------------------------------------------
@@ -174,7 +180,8 @@ static void iso14b_set_maxframesize(uint16_t size) {
 // that here) so that they can be transmitted to the reader. Doesn't transmit
 // them yet, just leaves them ready to send in ToSend[].
 //-----------------------------------------------------------------------------
-static void CodeIso14443bAsTag(const uint8_t *cmd, int len) {
+static void CodeIso14443bAsTag(const uint8_t *cmd, int len)
+{
     /* ISO 14443 B
     *
     * Reader to card | ASK  - Amplitude Shift Keying Modulation (PCD to PICC for Type B) (NRZ-L encodig)
@@ -237,7 +244,7 @@ static void CodeIso14443bAsTag(const uint8_t *cmd, int len) {
     *
     */
 
-    int i,j;
+    int i, j;
     uint8_t b;
 
     ToSendReset();
@@ -252,15 +259,15 @@ static void CodeIso14443bAsTag(const uint8_t *cmd, int len) {
 
     // Send SOF.
     // 10-11 ETU * 4times samples ZEROS
-    for(i = 0; i < 10; i++) { SEND4STUFFBIT(0); }
+    for (i = 0; i < 10; i++) { SEND4STUFFBIT(0); }
     //for(i = 0; i < 10; i++) { ToSendStuffBit(0); }
 
     // 2-3 ETU * 4times samples ONES
-    for(i = 0; i < 3; i++)  { SEND4STUFFBIT(1); }
+    for (i = 0; i < 3; i++)  { SEND4STUFFBIT(1); }
     //for(i = 0; i < 3; i++)  { ToSendStuffBit(1); }
 
     // data
-    for(i = 0; i < len; ++i) {
+    for (i = 0; i < len; ++i) {
 
         // Start bit
         SEND4STUFFBIT(0);
@@ -268,15 +275,15 @@ static void CodeIso14443bAsTag(const uint8_t *cmd, int len) {
 
         // Data bits
         b = cmd[i];
-        for(j = 0; j < 8; ++j) {
+        for (j = 0; j < 8; ++j) {
             // if(b & 1) {
-                // SEND4STUFFBIT(1);
-                // //ToSendStuffBit(1);
+            // SEND4STUFFBIT(1);
+            // //ToSendStuffBit(1);
             // } else {
-                // SEND4STUFFBIT(0);
-                // //ToSendStuffBit(0);
+            // SEND4STUFFBIT(0);
+            // //ToSendStuffBit(0);
             // }
-            SEND4STUFFBIT( b & 1 );
+            SEND4STUFFBIT(b & 1);
             b >>= 1;
         }
 
@@ -292,11 +299,11 @@ static void CodeIso14443bAsTag(const uint8_t *cmd, int len) {
 
     // Send EOF.
     // 10-11 ETU * 4 sample rate = ZEROS
-    for(i = 0; i < 10; i++) { SEND4STUFFBIT(0); }
+    for (i = 0; i < 10; i++) { SEND4STUFFBIT(0); }
     //for(i = 0; i < 10; i++) { ToSendStuffBit(0); }
 
     // why this?
-    for(i = 0; i < 40; i++) { SEND4STUFFBIT(1); }
+    for (i = 0; i < 40; i++) { SEND4STUFFBIT(1); }
     //for(i = 0; i < 40; i++) { ToSendStuffBit(1); }
 
     // Convert from last byte pos to length
@@ -316,7 +323,8 @@ static void CodeIso14443bAsTag(const uint8_t *cmd, int len) {
  * Returns: true if we received a EOF
  *          false if we are still waiting for some more
  */
-static RAMFUNC int Handle14443bReaderUartBit(uint8_t bit) {
+static RAMFUNC int Handle14443bReaderUartBit(uint8_t bit)
+{
     switch (Uart.state) {
         case STATE_UNSYNCD:
             if (!bit) {
@@ -358,7 +366,7 @@ static RAMFUNC int Handle14443bReaderUartBit(uint8_t bit) {
         case STATE_AWAITING_START_BIT:
             Uart.posCnt++;
             if (bit) {
-                if (Uart.posCnt > 50/2) { // max 57us between characters = 49 1/fs, max 3 etus after low phase of SOF = 24 1/fs
+                if (Uart.posCnt > 50 / 2) { // max 57us between characters = 49 1/fs, max 3 etus after low phase of SOF = 24 1/fs
                     // stayed high for too long between characters, error
                     Uart.state = STATE_UNSYNCD;
                 }
@@ -385,8 +393,7 @@ static RAMFUNC int Handle14443bReaderUartBit(uint8_t bit) {
                 Uart.posCnt = 0;
             }
             if (Uart.bitCnt == 10) {
-                if ((Uart.shiftReg & 0x200) && !(Uart.shiftReg & 0x001))
-                {
+                if ((Uart.shiftReg & 0x200) && !(Uart.shiftReg & 0x001)) {
                     // this is a data byte, with correct
                     // start and stop bits
                     Uart.output[Uart.byteCnt] = (Uart.shiftReg >> 1) & 0xff;
@@ -433,7 +440,8 @@ static RAMFUNC int Handle14443bReaderUartBit(uint8_t bit) {
 // Assume that we're called with the SSC (to the FPGA) and ADC path set
 // correctly.
 //-----------------------------------------------------------------------------
-static int GetIso14443bCommandFromReader(uint8_t *received, uint16_t *len) {
+static int GetIso14443bCommandFromReader(uint8_t *received, uint16_t *len)
+{
     // Set FPGA mode to "simulated ISO 14443B tag", no modulation (listen
     // only, since we are receiving, not transmitting).
     // Signal field is off with the appropriate LED
@@ -447,21 +455,21 @@ static int GetIso14443bCommandFromReader(uint8_t *received, uint16_t *len) {
     // clear receiving shift register and holding register
     // What does this loop do? Is it TR1?
     // loop is a wait/delay  ?
-/*
-    for(uint8_t c = 0; c < 10;) {
+    /*
+        for(uint8_t c = 0; c < 10;) {
 
-        // keep tx buffer in a defined state anyway.
-        if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
-            AT91C_BASE_SSC->SSC_THR = 0xFF;
-            ++c;
+            // keep tx buffer in a defined state anyway.
+            if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
+                AT91C_BASE_SSC->SSC_THR = 0xFF;
+                ++c;
+            }
         }
-    }
-    */
+        */
     // Now run a `software UART' on the stream of incoming samples.
     UartInit(received);
 
     uint8_t mask;
-    while( !BUTTON_PRESS() ) {
+    while (!BUTTON_PRESS()) {
         WDT_HIT();
 
         // keep tx buffer in a defined state anyway.
@@ -470,12 +478,12 @@ static int GetIso14443bCommandFromReader(uint8_t *received, uint16_t *len) {
         }
 
         // Wait for byte be become available in rx holding register
-        if ( AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY ) {
+        if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
 
             b = (uint8_t) AT91C_BASE_SSC->SSC_RHR;
 
-            for ( mask = 0x80; mask != 0; mask >>= 1) {
-                if ( Handle14443bReaderUartBit(b & mask)) {
+            for (mask = 0x80; mask != 0; mask >>= 1) {
+                if (Handle14443bReaderUartBit(b & mask)) {
                     *len = Uart.byteCnt;
                     return true;
                 }
@@ -485,18 +493,21 @@ static int GetIso14443bCommandFromReader(uint8_t *received, uint16_t *len) {
     return false;
 }
 
-void ClearFpgaShiftingRegisters(void){
+void ClearFpgaShiftingRegisters(void)
+{
 
     volatile uint8_t b;
 
     // clear receiving shift register and holding register
-    while(!(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY)) {};
+    while (!(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY)) {};
 
-    b = AT91C_BASE_SSC->SSC_RHR; (void) b;
+    b = AT91C_BASE_SSC->SSC_RHR;
+    (void) b;
 
-    while(!(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY)) {};
+    while (!(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY)) {};
 
-    b = AT91C_BASE_SSC->SSC_RHR; (void) b;
+    b = AT91C_BASE_SSC->SSC_RHR;
+    (void) b;
 
     // wait for the FPGA to signal fdt_indicator == 1 (the FPGA is ready to queue new data in its delay line)
     for (uint8_t j = 0; j < 5; j++) { // allow timeout - better late than never
@@ -508,18 +519,20 @@ void ClearFpgaShiftingRegisters(void){
     //AT91C_BASE_SSC->SSC_THR = 0xFF;
 }
 
-void WaitForFpgaDelayQueueIsEmpty( uint16_t delay ){
+void WaitForFpgaDelayQueueIsEmpty(uint16_t delay)
+{
     // Ensure that the FPGA Delay Queue is empty before we switch to TAGSIM_LISTEN again:
     uint8_t fpga_queued_bits = delay >> 3;  // twich /8 ??   >>3,
-    for (uint8_t i = 0; i <= fpga_queued_bits/8 + 1; ) {
-        if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
+    for (uint8_t i = 0; i <= fpga_queued_bits / 8 + 1;) {
+        if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
             AT91C_BASE_SSC->SSC_THR = 0xFF;
             i++;
         }
     }
 }
 
-static void TransmitFor14443b_AsTag( uint8_t *response, uint16_t len) {
+static void TransmitFor14443b_AsTag(uint8_t *response, uint16_t len)
+{
 
     volatile uint32_t b;
 
@@ -536,16 +549,17 @@ static void TransmitFor14443b_AsTag( uint8_t *response, uint16_t len) {
     FpgaSetupSsc();
 
     // Transmit the response.
-    for(uint16_t i = 0; i < len;) {
+    for (uint16_t i = 0; i < len;) {
 
-         // Put byte into tx holding register as soon as it is ready
-        if(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_TXRDY) {
+        // Put byte into tx holding register as soon as it is ready
+        if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_TXRDY) {
             AT91C_BASE_SSC->SSC_THR = response[++i];
         }
 
         // Prevent rx holding register from overflowing
-        if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
-            b = AT91C_BASE_SSC->SSC_RHR;(void)b;
+        if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
+            b = AT91C_BASE_SSC->SSC_RHR;
+            (void)b;
         }
     }
 
@@ -556,7 +570,8 @@ static void TransmitFor14443b_AsTag( uint8_t *response, uint16_t len) {
 // Main loop of simulated tag: receive commands from reader, decide what
 // response to send, and send it.
 //-----------------------------------------------------------------------------
-void SimulateIso14443bTag(uint32_t pupi) {
+void SimulateIso14443bTag(uint32_t pupi)
+{
 
     // setup device.
     FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
@@ -566,7 +581,8 @@ void SimulateIso14443bTag(uint32_t pupi) {
     FpgaSetupSsc();
 
     // allocate command receive buffer
-    BigBuf_free(); BigBuf_Clear_ext(false);
+    BigBuf_free();
+    BigBuf_Clear_ext(false);
 
     clear_trace(); //sim
     set_tracing(true);
@@ -590,14 +606,15 @@ void SimulateIso14443bTag(uint32_t pupi) {
     // supports only 106kBit/s in both directions, max frame size = 32Bytes,
     // supports ISO14443-4, FWI=8 (77ms), NAD supported, CID not supported:
     uint8_t respATQB[] = {  0x50, 0x82, 0x0d, 0xe1, 0x74, 0x20, 0x38, 0x19,
-                            0x22, 0x00, 0x21, 0x85, 0x5e, 0xd7 };
+                            0x22, 0x00, 0x21, 0x85, 0x5e, 0xd7
+                         };
 
     // response to HLTB and ATTRIB
     static const uint8_t respOK[] = {0x00, 0x78, 0xF0};
 
     // ...PUPI/UID supplied from user. Adjust ATQB response accordingly
-    if ( pupi > 0 ) {
-        num_to_bytes(pupi, 4, respATQB+1);
+    if (pupi > 0) {
+        num_to_bytes(pupi, 4, respATQB + 1);
         AddCrc14B(respATQB, 12);
     }
 
@@ -621,7 +638,7 @@ void SimulateIso14443bTag(uint32_t pupi) {
         // find reader field
         if (cardSTATE == SIM_NOFIELD) {
             vHf = (MAX_ADC_HF_VOLTAGE * AvgAdc(ADC_CHAN_HF)) >> 10;
-            if ( vHf > MF_MINFIELDV ) {
+            if (vHf > MF_MINFIELDV) {
                 cardSTATE = SIM_IDLE;
                 LED_A_ON();
             }
@@ -637,9 +654,9 @@ void SimulateIso14443bTag(uint32_t pupi) {
         // ISO14443-B protocol states:
         // REQ or WUP request in ANY state
         // WUP in HALTED state
-        if (len == 5 ) {
-                if ( (receivedCmd[0] == ISO14443B_REQB && (receivedCmd[2] & 0x8)== 0x8 && cardSTATE == SIM_HALTED) ||
-                      receivedCmd[0] == ISO14443B_REQB ){
+        if (len == 5) {
+            if ((receivedCmd[0] == ISO14443B_REQB && (receivedCmd[2] & 0x8) == 0x8 && cardSTATE == SIM_HALTED) ||
+                receivedCmd[0] == ISO14443B_REQB) {
                 LogTrace(receivedCmd, len, 0, 0, NULL, true);
                 cardSTATE = SIM_SELECTING;
             }
@@ -663,27 +680,27 @@ void SimulateIso14443bTag(uint32_t pupi) {
                 break;
             }
             case SIM_SELECTING: {
-                TransmitFor14443b_AsTag( encodedATQB, encodedATQBLen );
+                TransmitFor14443b_AsTag(encodedATQB, encodedATQBLen);
                 LogTrace(respATQB, sizeof(respATQB), 0, 0, NULL, false);
                 cardSTATE = SIM_WORK;
                 break;
             }
             case SIM_HALTING: {
-                TransmitFor14443b_AsTag( encodedOK, encodedOKLen );
+                TransmitFor14443b_AsTag(encodedOK, encodedOKLen);
                 LogTrace(respOK, sizeof(respOK), 0, 0, NULL, false);
                 cardSTATE = SIM_HALTED;
                 break;
             }
             case SIM_ACKNOWLEDGE: {
-                TransmitFor14443b_AsTag( encodedOK, encodedOKLen );
+                TransmitFor14443b_AsTag(encodedOK, encodedOKLen);
                 LogTrace(respOK, sizeof(respOK), 0, 0, NULL, false);
                 cardSTATE = SIM_IDLE;
                 break;
             }
             case SIM_WORK: {
-                if ( len == 7 && receivedCmd[0] == ISO14443B_HALT ) {
+                if (len == 7 && receivedCmd[0] == ISO14443B_HALT) {
                     cardSTATE = SIM_HALTED;
-                } else if ( len == 11 && receivedCmd[0] == ISO14443B_ATTRIB ) {
+                } else if (len == 11 && receivedCmd[0] == ISO14443B_ATTRIB) {
                     cardSTATE = SIM_ACKNOWLEDGE;
                 } else {
                     // Todo:
@@ -693,7 +710,7 @@ void SimulateIso14443bTag(uint32_t pupi) {
                     Dbprintf("new cmd from reader: len=%d, cmdsRecvd=%d", len, cmdsReceived);
 
                     // CRC Check
-                    if (len >= 3){ // if crc exists
+                    if (len >= 3) { // if crc exists
 
                         if (!check_crc(CRC_14443_B, receivedCmd, len))
                             DbpString("+++CRC fail");
@@ -704,7 +721,8 @@ void SimulateIso14443bTag(uint32_t pupi) {
                 }
                 break;
             }
-            default: break;
+            default:
+                break;
         }
 
         ++cmdsReceived;
@@ -735,7 +753,8 @@ void SimulateIso14443bTag(uint32_t pupi) {
  *          false if we are still waiting for some more
  *
  */
-static RAMFUNC int Handle14443bTagSamplesDemod(int ci, int cq) {
+static RAMFUNC int Handle14443bTagSamplesDemod(int ci, int cq)
+{
     int v = 0, myI = ABS(ci), myQ = ABS(cq);
 
 // The soft decision on the bit uses an estimate of just the
@@ -790,7 +809,7 @@ static RAMFUNC int Handle14443bTagSamplesDemod(int ci, int cq) {
 //note: couldn't we just use MAX(ABS(ci),ABS(cq)) + (MIN(ABS(ci),ABS(cq))/2) from common.h - marshmellow
 #define CHECK_FOR_SUBCARRIER() { v = MAX(myI, myQ) + (MIN(myI, myQ) >> 1); }
 
-    switch(Demod.state) {
+    switch (Demod.state) {
         case DEMOD_UNSYNCD:
 
             CHECK_FOR_SUBCARRIER();
@@ -834,7 +853,7 @@ static RAMFUNC int Handle14443bTagSamplesDemod(int ci, int cq) {
                 Demod.posCount = 0; // start of SOF sequence
             } else {
                 // maximum length of TR1 = 200 1/fs
-                if (Demod.posCount > 200/4) Demod.state = DEMOD_UNSYNCD;
+                if (Demod.posCount > 200 / 4) Demod.state = DEMOD_UNSYNCD;
             }
             Demod.posCount++;
             break;
@@ -846,7 +865,7 @@ static RAMFUNC int Handle14443bTagSamplesDemod(int ci, int cq) {
 
             if (v > 0) {
                 // low phase of SOF too short (< 9 etu). Note: spec is >= 10, but FPGA tends to "smear" edges
-                if (Demod.posCount < 9*2) {
+                if (Demod.posCount < 9 * 2) {
                     Demod.state = DEMOD_UNSYNCD;
                 } else {
                     LED_C_ON(); // Got SOF
@@ -856,7 +875,7 @@ static RAMFUNC int Handle14443bTagSamplesDemod(int ci, int cq) {
                 }
             } else {
                 // low phase of SOF too long (> 12 etu)
-                if (Demod.posCount > 14*2) {
+                if (Demod.posCount > 14 * 2) {
                     Demod.state = DEMOD_UNSYNCD;
                     LED_C_OFF();
                 }
@@ -869,7 +888,7 @@ static RAMFUNC int Handle14443bTagSamplesDemod(int ci, int cq) {
             MAKE_SOFT_DECISION();
 
             if (v > 0) {
-                if (Demod.posCount > 6*2) {     // max 19us between characters = 16 1/fs, max 3 etu after low phase of SOF = 24 1/fs
+                if (Demod.posCount > 6 * 2) {   // max 19us between characters = 16 1/fs, max 3 etu after low phase of SOF = 24 1/fs
                     Demod.state = DEMOD_UNSYNCD;
                     LED_C_OFF();
                 }
@@ -907,7 +926,7 @@ static RAMFUNC int Handle14443bTagSamplesDemod(int ci, int cq) {
                     uint16_t s = Demod.shiftReg;
 
                     // stop bit == '1', start bit == '0'
-                    if ((s & 0x200) && (s & 0x001) == 0 ) {
+                    if ((s & 0x200) && (s & 0x001) == 0) {
                         // left shift to drop the startbit
                         uint8_t b = (s >> 1);
                         Demod.output[Demod.len] = b;
@@ -939,7 +958,8 @@ static RAMFUNC int Handle14443bTagSamplesDemod(int ci, int cq) {
  *  Demodulate the samples we received from the tag, also log to tracebuffer
  *  quiet: set to 'TRUE' to disable debug output
  */
-static void GetTagSamplesFor14443bDemod() {
+static void GetTagSamplesFor14443bDemod()
+{
     bool gotFrame = false, finished = false;
     int lastRxCounter = ISO14443B_DMA_BUFFER_SIZE;
     int ci = 0, cq = 0;
@@ -951,11 +971,11 @@ static void GetTagSamplesFor14443bDemod() {
     DemodInit(BigBuf_malloc(MAX_FRAME_SIZE));
 
     // The DMA buffer, used to stream samples from the FPGA
-    int8_t *dmaBuf = (int8_t*) BigBuf_malloc(ISO14443B_DMA_BUFFER_SIZE);
+    int8_t *dmaBuf = (int8_t *) BigBuf_malloc(ISO14443B_DMA_BUFFER_SIZE);
     int8_t *upTo = dmaBuf;
 
     // Setup and start DMA.
-    if ( !FpgaSetupSscDma((uint8_t*) dmaBuf, ISO14443B_DMA_BUFFER_SIZE) ){
+    if (!FpgaSetupSscDma((uint8_t *) dmaBuf, ISO14443B_DMA_BUFFER_SIZE)) {
         if (MF_DBGLEVEL > 1) Dbprintf("FpgaSetupSscDma failed. Exiting");
         return;
     }
@@ -967,7 +987,7 @@ static void GetTagSamplesFor14443bDemod() {
     time_0 = GetCountSspClk();
 
     // rx counter - dma counter? (how much?) & (mod) mask > 2. (since 2bytes at the time is read)
-    while ( !finished ) {
+    while (!finished) {
 
         LED_A_INV();
         WDT_HIT();
@@ -979,7 +999,7 @@ static void GetTagSamplesFor14443bDemod() {
         lastRxCounter -= 2;
 
         // restart DMA buffer to receive again.
-        if(upTo >= dmaBuf + ISO14443B_DMA_BUFFER_SIZE) {
+        if (upTo >= dmaBuf + ISO14443B_DMA_BUFFER_SIZE) {
             upTo = dmaBuf;
             lastRxCounter = ISO14443B_DMA_BUFFER_SIZE;
             AT91C_BASE_PDC_SSC->PDC_RNPR = (uint32_t) upTo;
@@ -995,17 +1015,18 @@ static void GetTagSamplesFor14443bDemod() {
 
     FpgaDisableSscDma();
 
-    if ( upTo )
+    if (upTo)
         upTo = NULL;
 
-    if ( Demod.len > 0 )
+    if (Demod.len > 0)
         LogTrace(Demod.output, Demod.len, time_0, time_stop, NULL, false);
 }
 
 //-----------------------------------------------------------------------------
 // Transmit the command (to the tag) that was placed in ToSend[].
 //-----------------------------------------------------------------------------
-static void TransmitFor14443b_AsReader(void) {
+static void TransmitFor14443b_AsReader(void)
+{
     int c;
 
     FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_TX | FPGA_HF_READER_TX_SHALLOW_MOD);
@@ -1016,16 +1037,16 @@ static void TransmitFor14443b_AsReader(void) {
     // loop 10 * 8 = 80 ETU of delay, with a non modulated signal.  why?
     // 80*9 = 720us.
 
-    for(c = 0; c < 50;) {
+    for (c = 0; c < 50;) {
 
-        if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
+        if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
             AT91C_BASE_SSC->SSC_THR = 0xFF;
             c++;
         }
     }
 
     // Send frame loop
-    for(c = 0; c < ToSendMax;) {
+    for (c = 0; c < ToSendMax;) {
 
         // Put byte into tx holding register as soon as it is ready
         if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
@@ -1039,7 +1060,8 @@ static void TransmitFor14443b_AsReader(void) {
 // Code a layer 2 command (string of octets, including CRC) into ToSend[],
 // so that it is ready to transmit to the tag using TransmitFor14443b().
 //-----------------------------------------------------------------------------
-static void CodeIso14443bAsReader(const uint8_t *cmd, int len) {
+static void CodeIso14443bAsReader(const uint8_t *cmd, int len)
+{
     /*
     *  Reader data transmission:
     *   - no modulation ONES
@@ -1061,7 +1083,7 @@ static void CodeIso14443bAsReader(const uint8_t *cmd, int len) {
 
     // Send SOF
     // 10-11 ETUs of ZERO
-    for(i = 0; i < 10; ++i) ToSendStuffBit(0);
+    for (i = 0; i < 10; ++i) ToSendStuffBit(0);
 
     // 2-3 ETUs of ONE
     ToSendStuffBit(1);
@@ -1070,7 +1092,7 @@ static void CodeIso14443bAsReader(const uint8_t *cmd, int len) {
 
     // Sending cmd, LSB
     // from here we add BITS
-    for(i = 0; i < len; ++i) {
+    for (i = 0; i < len; ++i) {
         // Start bit
         ToSendStuffBit(0);
         // Data bits
@@ -1084,14 +1106,14 @@ static void CodeIso14443bAsReader(const uint8_t *cmd, int len) {
         // if ( (b>>6) & 1) ToSendStuffBit(1); else ToSendStuffBit(0);
         // if ( (b>>7) & 1) ToSendStuffBit(1); else ToSendStuffBit(0);
 
-        ToSendStuffBit(  b & 1);
-        ToSendStuffBit( (b>>1) & 1);
-        ToSendStuffBit( (b>>2) & 1);
-        ToSendStuffBit( (b>>3) & 1);
-        ToSendStuffBit( (b>>4) & 1);
-        ToSendStuffBit( (b>>5) & 1);
-        ToSendStuffBit( (b>>6) & 1);
-        ToSendStuffBit( (b>>7) & 1);
+        ToSendStuffBit(b & 1);
+        ToSendStuffBit((b >> 1) & 1);
+        ToSendStuffBit((b >> 2) & 1);
+        ToSendStuffBit((b >> 3) & 1);
+        ToSendStuffBit((b >> 4) & 1);
+        ToSendStuffBit((b >> 5) & 1);
+        ToSendStuffBit((b >> 6) & 1);
+        ToSendStuffBit((b >> 7) & 1);
 
         // Stop bit
         ToSendStuffBit(1);
@@ -1104,13 +1126,13 @@ static void CodeIso14443bAsReader(const uint8_t *cmd, int len) {
 
     // Send EOF
     // 10-11 ETUs of ZERO
-    for(i = 0; i < 10; ++i) ToSendStuffBit(0);
+    for (i = 0; i < 10; ++i) ToSendStuffBit(0);
 
     // Transition time. TR0 - guard time
     // 8ETUS minum?
     // Per specification, Subcarrier must be stopped no later than 2 ETUs after EOF.
     // I'm guessing this is for the FPGA to be able to send all bits before we switch to listening mode
-    for(i = 0; i < 24 ; ++i) ToSendStuffBit(1);
+    for (i = 0; i < 24 ; ++i) ToSendStuffBit(1);
 
     // TR1 - Synchronization time
     // Convert from last character reference to length
@@ -1120,7 +1142,8 @@ static void CodeIso14443bAsReader(const uint8_t *cmd, int len) {
 /*
 *  Convenience function to encode, transmit and trace iso 14443b comms
 */
-static void CodeAndTransmit14443bAsReader(const uint8_t *cmd, int len) {
+static void CodeAndTransmit14443bAsReader(const uint8_t *cmd, int len)
+{
 
     uint32_t time_start = GetCountSspClk();
 
@@ -1128,15 +1151,16 @@ static void CodeAndTransmit14443bAsReader(const uint8_t *cmd, int len) {
 
     TransmitFor14443b_AsReader();
 
-    if(trigger) LED_A_ON();
+    if (trigger) LED_A_ON();
 
-    LogTrace(cmd, len, time_start, GetCountSspClk()-time_start, NULL, true);
+    LogTrace(cmd, len, time_start, GetCountSspClk() - time_start, NULL, true);
 }
 
 /* Sends an APDU to the tag
  * TODO: check CRC and preamble
  */
-uint8_t iso14443b_apdu(uint8_t const *message, size_t message_length, uint8_t *response) {
+uint8_t iso14443b_apdu(uint8_t const *message, size_t message_length, uint8_t *response)
+{
 
     uint8_t message_frame[message_length + 4];
     // PCB
@@ -1152,16 +1176,16 @@ uint8_t iso14443b_apdu(uint8_t const *message, size_t message_length, uint8_t *r
     CodeAndTransmit14443bAsReader(message_frame, message_length + 4); //no
     // get response
     GetTagSamplesFor14443bDemod(); //no
-    if(Demod.len < 3)
+    if (Demod.len < 3)
         return 0;
 
     // VALIDATE CRC
-    if (!check_crc(CRC_14443_B, Demod.output, Demod.len)){
+    if (!check_crc(CRC_14443_B, Demod.output, Demod.len)) {
         if (MF_DBGLEVEL > 3) Dbprintf("crc fail ICE");
         return 0;
     }
     // copy response contents
-    if(response != NULL)
+    if (response != NULL)
         memcpy(response, Demod.output, Demod.len);
 
     return Demod.len;
@@ -1170,7 +1194,8 @@ uint8_t iso14443b_apdu(uint8_t const *message, size_t message_length, uint8_t *r
 /**
 * SRx Initialise.
 */
-uint8_t iso14443b_select_srx_card(iso14b_card_select_t *card ) {
+uint8_t iso14443b_select_srx_card(iso14b_card_select_t *card)
+{
     // INITIATE command: wake up the tag using the INITIATE
     static const uint8_t init_srx[] = { ISO14443B_INITIATE, 0x00, 0x97, 0x5b };
     // SELECT command (with space for CRC)
@@ -1230,7 +1255,8 @@ uint8_t iso14443b_select_srx_card(iso14b_card_select_t *card ) {
  * TODO: Support multiple cards (perform anticollision)
  * TODO: Verify CRC checksums
  */
-uint8_t iso14443b_select_card(iso14b_card_select_t *card ) {
+uint8_t iso14443b_select_card(iso14b_card_select_t *card)
+{
     // WUPB command (including CRC)
     // Note: WUPB wakes up all tags, REQB doesn't wake up tags in HALT state
     static const uint8_t wupb[] = { ISO14443B_REQB, 0x00, 0x08, 0x39, 0x73 };
@@ -1251,8 +1277,8 @@ uint8_t iso14443b_select_card(iso14b_card_select_t *card ) {
 
     if (card) {
         card->uidlen = 4;
-        memcpy(card->uid, Demod.output+1, 4);
-        memcpy(card->atqb, Demod.output+5, 7);
+        memcpy(card->uid, Demod.output + 1, 4);
+        memcpy(card->atqb, Demod.output + 5, 7);
     }
 
     // copy the PUPI to ATTRIB  ( PUPI == UID )
@@ -1266,11 +1292,11 @@ uint8_t iso14443b_select_card(iso14b_card_select_t *card ) {
     GetTagSamplesFor14443bDemod();//select_card
 
     // Answer to ATTRIB too short?
-    if(Demod.len < 3)
+    if (Demod.len < 3)
         return 2;
 
     // VALIDATE CRC
-    if (!check_crc(CRC_14443_B, Demod.output, Demod.len) )
+    if (!check_crc(CRC_14443_B, Demod.output, Demod.len))
         return 3;
 
     if (card) {
@@ -1290,9 +1316,9 @@ uint8_t iso14443b_select_card(iso14b_card_select_t *card ) {
 
         // FWT
         uint8_t fwt = card->atqb[6] >> 4;
-        if ( fwt < 16 ){
+        if (fwt < 16) {
             uint32_t fwt_time = (302 << fwt);
-            iso14b_set_timeout( fwt_time);
+            iso14b_set_timeout(fwt_time);
         }
     }
     // reset PCB block number
@@ -1302,7 +1328,8 @@ uint8_t iso14443b_select_card(iso14b_card_select_t *card ) {
 
 // Set up ISO 14443 Type B communication (similar to iso14443a_setup)
 // field is setup for "Sending as Reader"
-void iso14443b_setup() {
+void iso14443b_setup()
+{
     LEDsoff();
     FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
 
@@ -1335,7 +1362,8 @@ void iso14443b_setup() {
 //
 // I tried to be systematic and check every answer of the tag, every CRC, etc...
 //-----------------------------------------------------------------------------
-static bool ReadSTBlock(uint8_t block) {
+static bool ReadSTBlock(uint8_t block)
+{
     uint8_t cmd[] = {ISO14443B_READ_BLK, block, 0x00, 0x00};
     AddCrc14B(cmd, 2);
     CodeAndTransmit14443bAsReader(cmd, sizeof(cmd));
@@ -1353,7 +1381,8 @@ static bool ReadSTBlock(uint8_t block) {
     }
     return true;
 }
-void ReadSTMemoryIso14443b(uint8_t numofblocks) {
+void ReadSTMemoryIso14443b(uint8_t numofblocks)
+{
     // Make sure that we start from off, since the tags are stateful;
     // confusing things will happen if we don't reset them between reads.
     //switch_off();
@@ -1363,11 +1392,11 @@ void ReadSTMemoryIso14443b(uint8_t numofblocks) {
 
     iso14443b_setup();
 
-    iso14b_card_select_t *card = (iso14b_card_select_t*)buf;
+    iso14b_card_select_t *card = (iso14b_card_select_t *)buf;
     uint8_t res = iso14443b_select_srx_card(card);
 
     // 0: OK 2: attrib fail, 3:crc fail,
-    if ( res > 0 ) goto out;
+    if (res > 0) goto out;
 
     Dbprintf("[+] Tag memory dump, block 0 to %d", numofblocks);
 
@@ -1390,8 +1419,8 @@ void ReadSTMemoryIso14443b(uint8_t numofblocks) {
 
         // Now print out the memory location:
         Dbprintf("Address=%02x, Contents=%08x, CRC=%04x", i,
-                (Demod.output[3]<<24) + (Demod.output[2]<<16) + (Demod.output[1]<<8) + Demod.output[0],
-                (Demod.output[4]<<8)+Demod.output[5]);
+                 (Demod.output[3] << 24) + (Demod.output[2] << 16) + (Demod.output[1] << 8) + Demod.output[0],
+                 (Demod.output[4] << 8) + Demod.output[5]);
 
         if (i == 0xff) break;
         ++i;
@@ -1402,7 +1431,8 @@ out:
     SpinDelay(20);
 }
 
-static void iso1444b_setup_sniff(void){
+static void iso1444b_setup_sniff(void)
+{
 
     LEDsoff();
     FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
@@ -1455,7 +1485,8 @@ static void iso1444b_setup_sniff(void){
  * DMA Buffer - ISO14443B_DMA_BUFFER_SIZE
  * Demodulated samples received - all the rest
  */
-void RAMFUNC SniffIso14443b(void) {
+void RAMFUNC SniffIso14443b(void)
+{
 
     uint32_t time_0 = 0, time_start = 0, time_stop = 0;
     int ci = 0, cq = 0;
@@ -1469,11 +1500,11 @@ void RAMFUNC SniffIso14443b(void) {
     iso1444b_setup_sniff();
 
     // The DMA buffer, used to stream samples from the FPGA
-    int8_t *dmaBuf = (int8_t*) BigBuf_malloc(ISO14443B_DMA_BUFFER_SIZE);
+    int8_t *dmaBuf = (int8_t *) BigBuf_malloc(ISO14443B_DMA_BUFFER_SIZE);
     int8_t *data = dmaBuf;
 
     // Setup and start DMA.
-    if ( !FpgaSetupSscDma((uint8_t*) dmaBuf, ISO14443B_DMA_BUFFER_SIZE) ){
+    if (!FpgaSetupSscDma((uint8_t *) dmaBuf, ISO14443B_DMA_BUFFER_SIZE)) {
         if (MF_DBGLEVEL > 1) Dbprintf("[!] FpgaSetupSscDma failed. Exiting");
         BigBuf_free();
         return;
@@ -1547,7 +1578,8 @@ void RAMFUNC SniffIso14443b(void) {
     switch_off();
 }
 
-void iso14b_set_trigger(bool enable) {
+void iso14b_set_trigger(bool enable)
+{
     trigger = enable;
 }
 
@@ -1562,7 +1594,8 @@ void iso14b_set_trigger(bool enable) {
  * none
  *
  */
-void SendRawCommand14443B_Ex(UsbCommand *c) {
+void SendRawCommand14443B_Ex(UsbCommand *c)
+{
     iso14b_command_t param = c->arg[0];
     size_t len = c->arg[1] & 0xffff;
     uint8_t *cmd = c->d.asBytes;
@@ -1570,7 +1603,7 @@ void SendRawCommand14443B_Ex(UsbCommand *c) {
     uint32_t sendlen = sizeof(iso14b_card_select_t);
     uint8_t buf[USB_CMD_DATA_SIZE] = {0x00};
 
-    if (MF_DBGLEVEL > 3) Dbprintf("14b raw: param, %04x", param );
+    if (MF_DBGLEVEL > 3) Dbprintf("14b raw: param, %04x", param);
 
     // turn on trigger (LED_A)
     if ((param & ISO14B_REQUEST_TRIGGER) == ISO14B_REQUEST_TRIGGER)
@@ -1584,19 +1617,19 @@ void SendRawCommand14443B_Ex(UsbCommand *c) {
     set_tracing(true);
 
     if ((param & ISO14B_SELECT_STD) == ISO14B_SELECT_STD) {
-        iso14b_card_select_t *card = (iso14b_card_select_t*)buf;
+        iso14b_card_select_t *card = (iso14b_card_select_t *)buf;
         status = iso14443b_select_card(card);
         cmd_send(CMD_ACK, status, sendlen, 0, buf, sendlen);
         // 0: OK 2: attrib fail, 3:crc fail,
-        if ( status > 0 ) goto out;
+        if (status > 0) goto out;
     }
 
     if ((param & ISO14B_SELECT_SR) == ISO14B_SELECT_SR) {
-        iso14b_card_select_t *card = (iso14b_card_select_t*)buf;
+        iso14b_card_select_t *card = (iso14b_card_select_t *)buf;
         status = iso14443b_select_srx_card(card);
         cmd_send(CMD_ACK, status, sendlen, 0, buf, sendlen);
         // 0: OK 2: demod fail, 3:crc fail,
-        if ( status > 0 ) goto out;
+        if (status > 0) goto out;
     }
 
     if ((param & ISO14B_APDU) == ISO14B_APDU) {
@@ -1605,7 +1638,7 @@ void SendRawCommand14443B_Ex(UsbCommand *c) {
     }
 
     if ((param & ISO14B_RAW) == ISO14B_RAW) {
-        if((param & ISO14B_APPEND_CRC) == ISO14B_APPEND_CRC) {
+        if ((param & ISO14B_APPEND_CRC) == ISO14B_APPEND_CRC) {
             AddCrc14B(cmd, len);
             len += 2;
         }
@@ -1614,7 +1647,7 @@ void SendRawCommand14443B_Ex(UsbCommand *c) {
         GetTagSamplesFor14443bDemod(); // raw
 
         sendlen = MIN(Demod.len, USB_CMD_DATA_SIZE);
-        status =  (Demod.len > 0) ? 0 : 1;
+        status = (Demod.len > 0) ? 0 : 1;
         cmd_send(CMD_ACK, status, sendlen, 0, Demod.output, sendlen);
     }
 
diff --git a/armsrc/iso14443b.h b/armsrc/iso14443b.h
index c7e98f182..e3c6c1dc8 100644
--- a/armsrc/iso14443b.h
+++ b/armsrc/iso14443b.h
@@ -37,11 +37,11 @@ extern "C" {
 extern void SendRawCommand14443B_Ex(UsbCommand *c);
 extern void iso14443b_setup();
 extern uint8_t iso14443b_apdu(uint8_t const *message, size_t message_length, uint8_t *response);
-extern uint8_t iso14443b_select_card(iso14b_card_select_t* card);
-extern uint8_t iso14443b_select_card_srx(iso14b_card_select_t* card);
+extern uint8_t iso14443b_select_card(iso14b_card_select_t *card);
+extern uint8_t iso14443b_select_card_srx(iso14b_card_select_t *card);
 
 // testfunctions
-extern void WaitForFpgaDelayQueueIsEmpty( uint16_t delay );
+extern void WaitForFpgaDelayQueueIsEmpty(uint16_t delay);
 extern void ClearFpgaShiftingRegisters(void);
 
 // States for 14B SIM command
diff --git a/armsrc/iso15693.c b/armsrc/iso15693.c
index 1afaac95f..5702ddcac 100644
--- a/armsrc/iso15693.c
+++ b/armsrc/iso15693.c
@@ -99,13 +99,14 @@ static void BuildInventoryResponse(uint8_t *cmdout, uint8_t *uid);
 // resulting data rate is 26,48 kbit/s (fc/512)
 // cmd ... data
 // n ... length of data
-static void CodeIso15693AsReader(uint8_t *cmd, int n) {
+static void CodeIso15693AsReader(uint8_t *cmd, int n)
+{
     int i, j;
 
     ToSendReset();
 
     // Give it a bit of slack at the beginning
-    for(i = 0; i < 24; i++)
+    for (i = 0; i < 24; i++)
         ToSendStuffBit(1);
 
     // SOF for 1of4
@@ -117,10 +118,10 @@ static void CodeIso15693AsReader(uint8_t *cmd, int n) {
     ToSendStuffBit(0);
     ToSendStuffBit(1);
     ToSendStuffBit(1);
-    for(i = 0; i < n; i++) {
-        for(j = 0; j < 8; j += 2) {
+    for (i = 0; i < n; i++) {
+        for (j = 0; j < 8; j += 2) {
             int these = (cmd[i] >> j) & 3;
-            switch(these) {
+            switch (these) {
                 case 0:
                     ToSendStuffBit(1);
                     ToSendStuffBit(0);
@@ -171,20 +172,21 @@ static void CodeIso15693AsReader(uint8_t *cmd, int n) {
     ToSendStuffBit(1);
 
     // And slack at the end, too.
-    for(i = 0; i < 24; i++)
+    for (i = 0; i < 24; i++)
         ToSendStuffBit(1);
 }
 
 // encode data using "1 out of 256" sheme
 // data rate is 1,66 kbit/s (fc/8192)
 // is designed for more robust communication over longer distances
-static void CodeIso15693AsReader256(uint8_t *cmd, int n) {
+static void CodeIso15693AsReader256(uint8_t *cmd, int n)
+{
     int i, j;
 
     ToSendReset();
 
     // Give it a bit of slack at the beginning
-    for(i = 0; i < 24; i++)
+    for (i = 0; i < 24; i++)
         ToSendStuffBit(1);
 
     // SOF for 1of256
@@ -197,7 +199,7 @@ static void CodeIso15693AsReader256(uint8_t *cmd, int n) {
     ToSendStuffBit(1);
     ToSendStuffBit(0);
 
-    for(i = 0; i < n; i++) {
+    for (i = 0; i < n; i++) {
         for (j = 0; j <= 255; j++) {
             if (cmd[i] == j) {
                 ToSendStuffBit(1);
@@ -215,12 +217,13 @@ static void CodeIso15693AsReader256(uint8_t *cmd, int n) {
     ToSendStuffBit(1);
 
     // And slack at the end, too.
-    for(i = 0; i < 24; i++)
+    for (i = 0; i < 24; i++)
         ToSendStuffBit(1);
 }
 
 // Transmit the command (to the tag) that was placed in ToSend[].
-static void TransmitTo15693Tag(const uint8_t *cmd, int len, int *samples, int *wait) {
+static void TransmitTo15693Tag(const uint8_t *cmd, int len, int *samples, int *wait)
+{
 
     int c;
     FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_TX);
@@ -236,10 +239,10 @@ static void TransmitTo15693Tag(const uint8_t *cmd, int len, int *samples, int *w
     }
 
     c = 0;
-    for(;;) {
+    for (;;) {
         if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
             AT91C_BASE_SSC->SSC_THR = cmd[c];
-            if( ++c >= len) break;
+            if (++c >= len) break;
         }
         WDT_HIT();
     }
@@ -255,7 +258,8 @@ static void TransmitTo15693Tag(const uint8_t *cmd, int len, int *samples, int *w
 //-----------------------------------------------------------------------------
 // Transmit the command (to the reader) that was placed in ToSend[].
 //-----------------------------------------------------------------------------
-static void TransmitTo15693Reader(const uint8_t *cmd, int len, int *samples, int *wait) {
+static void TransmitTo15693Reader(const uint8_t *cmd, int len, int *samples, int *wait)
+{
     int c = 0;
     FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_SIMULATOR | FPGA_HF_SIMULATOR_MODULATE_424K);
 
@@ -270,10 +274,10 @@ static void TransmitTo15693Reader(const uint8_t *cmd, int len, int *samples, int
     }
 
     c = 0;
-    for(;;) {
-        if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
+    for (;;) {
+        if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
             AT91C_BASE_SSC->SSC_THR = cmd[c];
-            if( ++c >= len) break;
+            if (++c >= len) break;
         }
         WDT_HIT();
     }
@@ -288,7 +292,8 @@ static void TransmitTo15693Reader(const uint8_t *cmd, int len, int *samples, int
 //-----------------------------------------------------------------------------
 // DEMODULATE tag answer
 //-----------------------------------------------------------------------------
-static int DemodAnswer(uint8_t *received, uint8_t *dest, uint16_t samplecount) {
+static int DemodAnswer(uint8_t *received, uint8_t *dest, uint16_t samplecount)
+{
 
     int i, j;
     int max = 0, maxPos = 0, skip = 4;
@@ -297,8 +302,8 @@ static int DemodAnswer(uint8_t *received, uint8_t *dest, uint16_t samplecount) {
     // First, correlate for SOF
     for (i = 0; i < samplecount; i++) {
         int corr = 0;
-        for ( j = 0; j < ARRAYLEN(FrameSOF); j += skip) {
-            corr += FrameSOF[j] * dest[i+(j/skip)];
+        for (j = 0; j < ARRAYLEN(FrameSOF); j += skip) {
+            corr += FrameSOF[j] * dest[i + (j / skip)];
         }
         if (corr > max) {
             max = corr;
@@ -308,7 +313,7 @@ static int DemodAnswer(uint8_t *received, uint8_t *dest, uint16_t samplecount) {
     // DbpString("SOF at %d, correlation %d", maxPos,max/(ARRAYLEN(FrameSOF)/skip));
 
     // greg - If correlation is less than 1 then there's little point in continuing
-    if ((max / (ARRAYLEN(FrameSOF)/skip) ) < 1)
+    if ((max / (ARRAYLEN(FrameSOF) / skip)) < 1)
         return k;
 
     i = maxPos + ARRAYLEN(FrameSOF) / skip;
@@ -316,22 +321,22 @@ static int DemodAnswer(uint8_t *received, uint8_t *dest, uint16_t samplecount) {
     uint8_t outBuf[ISO15_MAX_FRAME];
     memset(outBuf, 0, sizeof(outBuf));
     uint8_t mask = 0x01;
-    for(;;) {
+    for (;;) {
         int corr0 = 0, corr1 = 0, corrEOF = 0;
         for (j = 0; j < ARRAYLEN(Logic0); j += skip) {
-            corr0 += Logic0[j] * dest[i+(j/skip)];
+            corr0 += Logic0[j] * dest[i + (j / skip)];
         }
         for (j = 0; j < ARRAYLEN(Logic1); j += skip) {
-            corr1 += Logic1[j] * dest[i+(j/skip)];
+            corr1 += Logic1[j] * dest[i + (j / skip)];
         }
         for (j = 0; j < ARRAYLEN(FrameEOF); j += skip) {
-            corrEOF += FrameEOF[j] * dest[i+(j/skip)];
+            corrEOF += FrameEOF[j] * dest[i + (j / skip)];
         }
         // Even things out by the length of the target waveform.
         corr0 *= 4;
         corr1 *= 4;
         // if (MF_DBGLEVEL >= MF_DBG_EXTENDED)
-            // Dbprintf("Corr1 %d, Corr0 %d, CorrEOF %d", corr1, corr0, corrEOF);
+        // Dbprintf("Corr1 %d, Corr0 %d, CorrEOF %d", corr1, corr0, corrEOF);
 
         if (corrEOF > corr1 && corrEOF > corr0)
             break;
@@ -350,7 +355,7 @@ static int DemodAnswer(uint8_t *received, uint8_t *dest, uint16_t samplecount) {
             mask = 0x01;
         }
 
-        if ( ( i + (int)ARRAYLEN(FrameEOF)) >= samplecount-1) {
+        if ((i + (int)ARRAYLEN(FrameEOF)) >= samplecount - 1) {
             //Dbprintf("[!] ran off end!  %d | %d",( i + (int)ARRAYLEN(FrameEOF)), samplecount-1);
             break;
         }
@@ -366,7 +371,7 @@ static int DemodAnswer(uint8_t *received, uint8_t *dest, uint16_t samplecount) {
         // 0x08 is an assumption - but works quite often
     }
 
-    for(i = 0; i < k; i++)
+    for (i = 0; i < k; i++)
         received[i] = outBuf[i];
 
     // return the number of bytes demodulated
@@ -381,7 +386,8 @@ static int DemodAnswer(uint8_t *received, uint8_t *dest, uint16_t samplecount) {
 // returns:
 //  number of decoded bytes
 // logging enabled
-static int GetIso15693AnswerFromTag(uint8_t *received, int *elapsed) {
+static int GetIso15693AnswerFromTag(uint8_t *received, int *elapsed)
+{
 
 #define SIGNAL_BUFF_SIZE 15000
     // get current clock
@@ -395,13 +401,13 @@ static int GetIso15693AnswerFromTag(uint8_t *received, int *elapsed) {
 
     FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
 
-    for(;;) {
+    for (;;) {
         WDT_HIT();
 
         if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
             AT91C_BASE_SSC->SSC_THR = 0x00; //0x43;
             // To make use of exact timing of next command from reader!!
-            if (elapsed) (*elapsed)++;
+            if (elapsed)(*elapsed)++;
         }
         if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
 
@@ -415,7 +421,7 @@ static int GetIso15693AnswerFromTag(uint8_t *received, int *elapsed) {
             // iceman 2016, amplitude sqrt(abs(i) + abs(q))
             if (getNext) {
 
-                buf[counter++] = (uint8_t)(MAX(ci,cq) + (MIN(ci, cq) >> 1));
+                buf[counter++] = (uint8_t)(MAX(ci, cq) + (MIN(ci, cq) >> 1));
 
                 if (counter >= SIGNAL_BUFF_SIZE)
                     break;
@@ -435,7 +441,8 @@ static int GetIso15693AnswerFromTag(uint8_t *received, int *elapsed) {
 
 // Now the GetISO15693 message from sniffing command
 // logging enable,
-static int GetIso15693AnswerFromSniff(uint8_t *received, int *samples, int *elapsed) {
+static int GetIso15693AnswerFromSniff(uint8_t *received, int *samples, int *elapsed)
+{
 
     bool getNext = false;
     int counter = 0, ci = 0, cq = 0;
@@ -447,7 +454,7 @@ static int GetIso15693AnswerFromSniff(uint8_t *received, int *samples, int *elap
 
     FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
 
-    for(;;) {
+    for (;;) {
         WDT_HIT();
 
         if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
@@ -461,12 +468,12 @@ static int GetIso15693AnswerFromSniff(uint8_t *received, int *samples, int *elap
             // close to what we want.
             if (getNext) {
 
-                buf[counter++] = (uint8_t)(MAX(ci,cq) + (MIN(ci, cq) >> 1));
+                buf[counter++] = (uint8_t)(MAX(ci, cq) + (MIN(ci, cq) >> 1));
 
-                if(counter >= 20000)
+                if (counter >= 20000)
                     break;
             } else {
-                 cq = ci;
+                cq = ci;
             }
             getNext = !getNext;
         }
@@ -483,7 +490,8 @@ static int GetIso15693AnswerFromSniff(uint8_t *received, int *samples, int *elap
 // for the response. The response is not demodulated, just left in the buffer
 // so that it can be downloaded to a PC and processed there.
 //-----------------------------------------------------------------------------
-void AcquireRawAdcSamplesIso15693(void) {
+void AcquireRawAdcSamplesIso15693(void)
+{
     int c = 0, getNext = false;
     int ci = 0, cq = 0;
 
@@ -503,13 +511,13 @@ void AcquireRawAdcSamplesIso15693(void) {
 
     // sending command
     c = 0;
-    for(;;) {
+    for (;;) {
         WDT_HIT();
 
-        if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
+        if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
             AT91C_BASE_SSC->SSC_THR = ToSend[c];
             c++;
-            if(c == ToSendMax + 3) {
+            if (c == ToSendMax + 3) {
                 break;
             }
         }
@@ -521,7 +529,7 @@ void AcquireRawAdcSamplesIso15693(void) {
     FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
 
     c = 0;
-    for(;;) {
+    for (;;) {
         WDT_HIT();
 
         if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
@@ -536,7 +544,7 @@ void AcquireRawAdcSamplesIso15693(void) {
             // iceman 2016, amplitude sqrt(abs(i) + abs(q))
             if (getNext) {
 
-                buf[c++] = (uint8_t)(MAX(ci,cq) + (MIN(ci, cq) >> 1));
+                buf[c++] = (uint8_t)(MAX(ci, cq) + (MIN(ci, cq) >> 1));
 
                 if (c >= 7000) break;
 
@@ -549,7 +557,8 @@ void AcquireRawAdcSamplesIso15693(void) {
 }
 
 // switch_off,  initreader, no logging
-void RecordRawAdcSamplesIso15693(void) {
+void RecordRawAdcSamplesIso15693(void)
+{
 
     int c = 0, getNext = false;
     int ci = 0, cq = 0;
@@ -558,7 +567,7 @@ void RecordRawAdcSamplesIso15693(void) {
 
     uint8_t *buf = BigBuf_get_addr();
 
-    for(;;) {
+    for (;;) {
         WDT_HIT();
 
         if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
@@ -571,9 +580,9 @@ void RecordRawAdcSamplesIso15693(void) {
             // close to what we want.
             if (getNext) {
 
-                buf[c++] = (uint8_t)(MAX(ci,cq) + (MIN(ci, cq) >> 1));
+                buf[c++] = (uint8_t)(MAX(ci, cq) + (MIN(ci, cq) >> 1));
 
-                if(c >= 7000)
+                if (c >= 7000)
                     break;
             } else {
                 cq = ci;
@@ -589,7 +598,8 @@ void RecordRawAdcSamplesIso15693(void) {
 
 // Initialize the proxmark as iso15k reader
 // (this might produces glitches that confuse some tags
-void Iso15693InitReader(void) {
+void Iso15693InitReader(void)
+{
     LEDsoff();
     clear_trace();
     set_tracing(true);
@@ -621,7 +631,8 @@ void Iso15693InitReader(void) {
 
 // Encode (into the ToSend buffers) an identify request, which is the first
 // thing that you must send to a tag to get a response.
-static void BuildIdentifyRequest(uint8_t *out) {
+static void BuildIdentifyRequest(uint8_t *out)
+{
 
     uint8_t cmd[CMD_ID_RESP] = {0, ISO15_CMD_INVENTORY, 0, 0, 0};
     // flags
@@ -665,9 +676,10 @@ static void BuildReadBlockRequest(uint8_t **out, uint8_t *uid, uint8_t blockNumb
 */
 
 // Now the VICC>VCD responses when we are simulating a tag
-static void BuildInventoryResponse(uint8_t *out, uint8_t *uid) {
+static void BuildInventoryResponse(uint8_t *out, uint8_t *uid)
+{
 
-    uint8_t cmd[CMD_INV_RESP] = {0,0,0,0,0,0,0,0,0,0,0,0};
+    uint8_t cmd[CMD_INV_RESP] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 
     // one sub-carrier, inventory, 1 slot, fast rate
     // AFI is at bit 5 (1<<4) when doing an INVENTORY
@@ -696,7 +708,8 @@ static void BuildInventoryResponse(uint8_t *out, uint8_t *uid) {
 //  If you do not need the answer use NULL for *recv[]
 //  return: lenght of received data
 // logging enabled
-int SendDataTag(uint8_t *send, int sendlen, bool init, int speed, uint8_t *outdata) {
+int SendDataTag(uint8_t *send, int sendlen, bool init, int speed, uint8_t *outdata)
+{
 
     int t_samples = 0, wait = 0, elapsed = 0, answer_len = 0;
 
@@ -734,11 +747,12 @@ int SendDataTag(uint8_t *send, int sendlen, bool init, int speed, uint8_t *outda
 
 // Decodes a message from a tag and displays its metadata and content
 #define DBD15STATLEN 48
-void DbdecodeIso15693Answer(int len, uint8_t *d) {
-    char status[DBD15STATLEN+1] = {0};
+void DbdecodeIso15693Answer(int len, uint8_t *d)
+{
+    char status[DBD15STATLEN + 1] = {0};
 
     if (len > 3) {
-        if (d[0] & ( 1 << 3 ))
+        if (d[0] & (1 << 3))
             strncat(status, "ProtExt ", DBD15STATLEN);
         if (d[0] & 1) {
             // error
@@ -774,9 +788,9 @@ void DbdecodeIso15693Answer(int len, uint8_t *d) {
                 default:
                     strncat(status, "unknown error", DBD15STATLEN);
             }
-            strncat(status ," " ,DBD15STATLEN);
+            strncat(status, " ", DBD15STATLEN);
         } else {
-            strncat(status ,"No error ", DBD15STATLEN);
+            strncat(status, "No error ", DBD15STATLEN);
         }
 
         if (CheckCrc(d, len))
@@ -784,7 +798,7 @@ void DbdecodeIso15693Answer(int len, uint8_t *d) {
         else
             strncat(status, "[!] crc fail", DBD15STATLEN);
 
-        if ( MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("%s", status);
+        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("%s", status);
     }
 }
 
@@ -798,11 +812,12 @@ void DbdecodeIso15693Answer(int len, uint8_t *d) {
 //-----------------------------------------------------------------------------
 // ok
 // parameter is unused !?!
-void ReaderIso15693(uint32_t parameter) {
+void ReaderIso15693(uint32_t parameter)
+{
     int answerLen1 = 0;
     int tsamples = 0, wait = 0, elapsed = 0;
 
-    uint8_t uid[8] = {0,0,0,0,0,0,0,0};
+    uint8_t uid[8] = {0, 0, 0, 0, 0, 0, 0, 0};
 
     // set up device/fpga
     Iso15693InitReader();
@@ -819,7 +834,7 @@ void ReaderIso15693(uint32_t parameter) {
     // THIS MEANS WE CAN PRE-BUILD REQUESTS TO SAVE CPU TIME
     uint32_t time_start = GetCountSspClk();
     uint8_t cmd[CMD_ID_RESP] = {0};
-    BuildIdentifyRequest( cmd );
+    BuildIdentifyRequest(cmd);
     TransmitTo15693Tag(ToSend, ToSendMax, &tsamples, &wait);
     LogTrace(cmd, CMD_ID_RESP, time_start << 4, (GetCountSspClk() - time_start) << 4, NULL, true);
 
@@ -837,11 +852,11 @@ void ReaderIso15693(uint32_t parameter) {
         uid[6] = answer1[3];
         uid[7] = answer1[2];
 
-        if ( MF_DBGLEVEL >= MF_DBG_EXTENDED) {
+        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
             Dbprintf("[+] UID = %02X%02X%02X%02X%02X%02X%02X%02X",
-                uid[0], uid[1], uid[2], uid[3],
-                uid[4], uid[5], uid[5], uid[6]
-            );
+                     uid[0], uid[1], uid[2], uid[3],
+                     uid[4], uid[5], uid[5], uid[6]
+                    );
         }
         // send UID back to client.
         // arg0 = 1 = OK
@@ -851,7 +866,7 @@ void ReaderIso15693(uint32_t parameter) {
         cmd_send(CMD_ACK, 1, sizeof(uid), 0, uid, sizeof(uid));
     }
 
-    if ( MF_DBGLEVEL >= MF_DBG_EXTENDED) {
+    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
         Dbprintf("[+] %d octets read from IDENTIFY request:", answerLen1);
         DbdecodeIso15693Answer(answerLen1, answer1);
         Dbhexdump(answerLen1, answer1, true);
@@ -862,7 +877,8 @@ void ReaderIso15693(uint32_t parameter) {
 
 // Simulate an ISO15693 TAG, perform anti-collision and then print any reader commands
 // all demodulation performed in arm rather than host. - greg
-void SimTagIso15693(uint32_t parameter, uint8_t *uid) {
+void SimTagIso15693(uint32_t parameter, uint8_t *uid)
+{
 
     LEDsoff();
     FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
@@ -890,14 +906,14 @@ void SimTagIso15693(uint32_t parameter, uint8_t *uid) {
     uint8_t cmd[CMD_INV_RESP] = {0};
     BuildInventoryResponse(cmd, uid);
 
-    while (!BUTTON_PRESS() && !usb_poll_validate_length() ) {
+    while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
         WDT_HIT();
 
         // Listen to reader
         ans = GetIso15693AnswerFromSniff(buf, &samples, &elapsed) ;
 
         // we should do a better check than this
-        if (ans >= 1 ) {
+        if (ans >= 1) {
 
             time_start = GetCountSspClk();
             TransmitTo15693Reader(ToSend, ToSendMax, &tsamples, &wait);
@@ -905,9 +921,9 @@ void SimTagIso15693(uint32_t parameter, uint8_t *uid) {
 
             if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
                 Dbprintf("[+] %d octets read from reader command: %x %x %x %x %x %x %x %x", ans,
-                    buf[0], buf[1], buf[2], buf[3],
-                    buf[4], buf[5], buf[6], buf[7]
-                );
+                         buf[0], buf[1], buf[2], buf[3],
+                         buf[4], buf[5], buf[6], buf[7]
+                        );
             }
         }
     }
@@ -916,9 +932,10 @@ void SimTagIso15693(uint32_t parameter, uint8_t *uid) {
 
 // Since there is no standardized way of reading the AFI out of a tag, we will brute force it
 // (some manufactures offer a way to read the AFI, though)
-void BruteforceIso15693Afi(uint32_t speed) {
+void BruteforceIso15693Afi(uint32_t speed)
+{
 
-    uint8_t data[7] = {0,0,0,0,0,0,0};
+    uint8_t data[7] = {0, 0, 0, 0, 0, 0, 0};
     uint8_t buf[ISO15_MAX_FRAME];
     memset(buf, 0x00, sizeof(buf));
     int datalen = 0, recvlen = 0;
@@ -939,7 +956,7 @@ void BruteforceIso15693Afi(uint32_t speed) {
     WDT_HIT();
 
     if (recvlen >= 12) {
-        Dbprintf("NoAFI UID = %s", sprintUID(NULL, buf + 2) );
+        Dbprintf("NoAFI UID = %s", sprintUID(NULL, buf + 2));
     }
 
     // now with AFI
@@ -955,7 +972,7 @@ void BruteforceIso15693Afi(uint32_t speed) {
         recvlen = SendDataTag(data, datalen, false, speed, buf);
         WDT_HIT();
         if (recvlen >= 12) {
-            Dbprintf("AFI = %i  UID = %s", i, sprintUID(NULL, buf + 2) );
+            Dbprintf("AFI = %i  UID = %s", i, sprintUID(NULL, buf + 2));
         }
 
         if (BUTTON_PRESS()) {
@@ -970,7 +987,8 @@ void BruteforceIso15693Afi(uint32_t speed) {
 
 // Allows to directly send commands to the tag via the client
 // Has to increase dialog between device and client.
-void DirectTag15693Command(uint32_t datalen, uint32_t speed, uint32_t recv, uint8_t *data) {
+void DirectTag15693Command(uint32_t datalen, uint32_t speed, uint32_t recv, uint8_t *data)
+{
 
     bool init = true;
     int buflen = 0;
@@ -997,6 +1015,6 @@ void DirectTag15693Command(uint32_t datalen, uint32_t speed, uint32_t recv, uint
             Dbhexdump(buflen, buf, true);
         }
     } else {
-        cmd_send(CMD_ACK,1,0,0,0,0);
+        cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
     }
 }
\ No newline at end of file
diff --git a/armsrc/legicrf.c b/armsrc/legicrf.c
index 958d3421a..eef626ff7 100644
--- a/armsrc/legicrf.c
+++ b/armsrc/legicrf.c
@@ -16,7 +16,7 @@
 #include "legic_prng.h"         /* legic PRNG impl */
 #include "legic.h"              /* legic_card_select_t struct */
 
-static uint8_t* legic_mem;      /* card memory, used for read, write */
+static uint8_t *legic_mem;      /* card memory, used for read, write */
 static legic_card_select_t card;/* metadata of currently selected card */
 static crc_t legic_crc;
 
@@ -50,21 +50,22 @@ static uint32_t last_frame_end; /* ts of last bit of previews rx or tx frame */
 #define WRITE_LOWERLIMIT      4 /* UID and MCC are not writable */
 
 #define INPUT_THRESHOLD       8 /* heuristically determined, lower values */
-                                /* lead to detecting false ack during write */
+/* lead to detecting false ack during write */
 
 //-----------------------------------------------------------------------------
 // I/O interface abstraction (FPGA -> ARM)
 //-----------------------------------------------------------------------------
 
-static inline uint8_t rx_byte_from_fpga() {
-  for(;;) {
-    WDT_HIT();
+static inline uint8_t rx_byte_from_fpga()
+{
+    for (;;) {
+        WDT_HIT();
 
-    // wait for byte be become available in rx holding register
-    if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
-      return AT91C_BASE_SSC->SSC_RHR;
+        // wait for byte be become available in rx holding register
+        if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
+            return AT91C_BASE_SSC->SSC_RHR;
+        }
     }
-  }
 }
 
 //-----------------------------------------------------------------------------
@@ -83,11 +84,14 @@ static inline uint8_t rx_byte_from_fpga() {
 //
 // Note: The SSC receiver is never synchronized the calculation may be performed
 // on a i/q pair from two subsequent correlations, but does not matter.
-static inline int32_t sample_power() {
-  int32_t q = (int8_t)rx_byte_from_fpga(); q = ABS(q);
-  int32_t i = (int8_t)rx_byte_from_fpga(); i = ABS(i);
+static inline int32_t sample_power()
+{
+    int32_t q = (int8_t)rx_byte_from_fpga();
+    q = ABS(q);
+    int32_t i = (int8_t)rx_byte_from_fpga();
+    i = ABS(i);
 
-  return MAX(i, q) + (MIN(i, q) >> 1);
+    return MAX(i, q) + (MIN(i, q) >> 1);
 }
 
 // Returns a demedulated bit
@@ -97,14 +101,15 @@ static inline int32_t sample_power() {
 //
 // Note: The demodulator would be drifting (18.9us * 5 != 100us), rx_frame
 // has a delay loop that aligns rx_bit calls to the TAG tx timeslots.
-static inline bool rx_bit() {
-  int32_t power;
+static inline bool rx_bit()
+{
+    int32_t power;
 
-  for (size_t i = 0; i<5; ++i) {
-    power = sample_power();
-  }
+    for (size_t i = 0; i < 5; ++i) {
+        power = sample_power();
+    }
 
-  return (power > INPUT_THRESHOLD);
+    return (power > INPUT_THRESHOLD);
 }
 
 //-----------------------------------------------------------------------------
@@ -116,16 +121,17 @@ static inline bool rx_bit() {
 // be circumvented, but the adventage over bitbang would be little.
 //-----------------------------------------------------------------------------
 
-static inline void tx_bit(bool bit) {
-  // insert pause
-  LOW(GPIO_SSC_DOUT);
-  last_frame_end += RWD_TIME_PAUSE;
-  while (GET_TICKS < last_frame_end) { };
-  HIGH(GPIO_SSC_DOUT);
+static inline void tx_bit(bool bit)
+{
+    // insert pause
+    LOW(GPIO_SSC_DOUT);
+    last_frame_end += RWD_TIME_PAUSE;
+    while (GET_TICKS < last_frame_end) { };
+    HIGH(GPIO_SSC_DOUT);
 
-  // return to high, wait for bit periode to end
-  last_frame_end += (bit ? RWD_TIME_1 : RWD_TIME_0) - RWD_TIME_PAUSE;
-  while (GET_TICKS < last_frame_end) { };
+    // return to high, wait for bit periode to end
+    last_frame_end += (bit ? RWD_TIME_1 : RWD_TIME_0) - RWD_TIME_PAUSE;
+    while (GET_TICKS < last_frame_end) { };
 }
 
 //-----------------------------------------------------------------------------
@@ -138,163 +144,168 @@ static inline void tx_bit(bool bit) {
 // present.
 //-----------------------------------------------------------------------------
 
-static void tx_frame(uint32_t frame, uint8_t len) {
-  FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_TX);
+static void tx_frame(uint32_t frame, uint8_t len)
+{
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_TX);
 
-  // wait for next tx timeslot
-  last_frame_end += RWD_FRAME_WAIT;
-  while (GET_TICKS < last_frame_end) { };
-
-  // backup ts for trace log
-  uint32_t last_frame_start = last_frame_end;
-
-  // transmit frame, MSB first
-  for (uint8_t i = 0; i < len; ++i) {
-    bool bit = (frame >> i) & 0x01;
-    tx_bit(bit ^ legic_prng_get_bit());
-    legic_prng_forward(1);
-  };
-
-  // add pause to mark end of the frame
-  LOW(GPIO_SSC_DOUT);
-  last_frame_end += RWD_TIME_PAUSE;
-  while (GET_TICKS < last_frame_end) { };
-  HIGH(GPIO_SSC_DOUT);
-
-  // log
-  uint8_t cmdbytes[] = {len, BYTEx(frame, 0), BYTEx(frame, 1), BYTEx(frame, 2)};
-  LogTrace(cmdbytes, sizeof(cmdbytes), last_frame_start, last_frame_end, NULL, true);
-}
-
-static uint32_t rx_frame(uint8_t len) {
-  FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR
-                  | FPGA_HF_READER_RX_XCORR_848_KHZ
-                  | FPGA_HF_READER_RX_XCORR_QUARTER);
-
-  // hold sampling until card is expected to respond
-  last_frame_end += TAG_FRAME_WAIT;
-  while (GET_TICKS < last_frame_end) { };
-
-  // backup ts for trace log
-  uint32_t last_frame_start = last_frame_end;
-
-  uint32_t frame = 0;
-  for (uint8_t i = 0; i < len; ++i) {
-    frame |= (rx_bit() ^ legic_prng_get_bit()) << i;
-    legic_prng_forward(1);
-
-    // rx_bit runs only 95us, resync to TAG_BIT_PERIOD
-    last_frame_end += TAG_BIT_PERIOD;
-    while (GET_TICKS < last_frame_end) { };
-  }
-
-  // log
-  uint8_t cmdbytes[] = {len, BYTEx(frame, 0), BYTEx(frame, 1)};
-  LogTrace(cmdbytes, sizeof(cmdbytes), last_frame_start, last_frame_end, NULL, false);
-
-  return frame;
-}
-
-static bool rx_ack() {
-  // change fpga into rx mode
-  FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR
-                  | FPGA_HF_READER_RX_XCORR_848_KHZ
-                  | FPGA_HF_READER_RX_XCORR_QUARTER);
-
-  // hold sampling until card is expected to respond
-  last_frame_end += TAG_FRAME_WAIT;
-  while (GET_TICKS < last_frame_end) { };
-
-  // backup ts for trace log
-  uint32_t last_frame_start = last_frame_end;
-
-  uint32_t ack = 0;
-  for (uint8_t i = 0; i < TAG_WRITE_TIMEOUT; ++i) {
-    // sample bit
-    ack = rx_bit();
-    legic_prng_forward(1);
-
-    // rx_bit runs only 95us, resync to TAG_BIT_PERIOD
-    last_frame_end += TAG_BIT_PERIOD;
+    // wait for next tx timeslot
+    last_frame_end += RWD_FRAME_WAIT;
     while (GET_TICKS < last_frame_end) { };
 
-    // check if it was an ACK
-    if (ack) {
-      break;
+    // backup ts for trace log
+    uint32_t last_frame_start = last_frame_end;
+
+    // transmit frame, MSB first
+    for (uint8_t i = 0; i < len; ++i) {
+        bool bit = (frame >> i) & 0x01;
+        tx_bit(bit ^ legic_prng_get_bit());
+        legic_prng_forward(1);
+    };
+
+    // add pause to mark end of the frame
+    LOW(GPIO_SSC_DOUT);
+    last_frame_end += RWD_TIME_PAUSE;
+    while (GET_TICKS < last_frame_end) { };
+    HIGH(GPIO_SSC_DOUT);
+
+    // log
+    uint8_t cmdbytes[] = {len, BYTEx(frame, 0), BYTEx(frame, 1), BYTEx(frame, 2)};
+    LogTrace(cmdbytes, sizeof(cmdbytes), last_frame_start, last_frame_end, NULL, true);
+}
+
+static uint32_t rx_frame(uint8_t len)
+{
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR
+                      | FPGA_HF_READER_RX_XCORR_848_KHZ
+                      | FPGA_HF_READER_RX_XCORR_QUARTER);
+
+    // hold sampling until card is expected to respond
+    last_frame_end += TAG_FRAME_WAIT;
+    while (GET_TICKS < last_frame_end) { };
+
+    // backup ts for trace log
+    uint32_t last_frame_start = last_frame_end;
+
+    uint32_t frame = 0;
+    for (uint8_t i = 0; i < len; ++i) {
+        frame |= (rx_bit() ^ legic_prng_get_bit()) << i;
+        legic_prng_forward(1);
+
+        // rx_bit runs only 95us, resync to TAG_BIT_PERIOD
+        last_frame_end += TAG_BIT_PERIOD;
+        while (GET_TICKS < last_frame_end) { };
     }
-  }
 
-  // log
-  uint8_t cmdbytes[] = {1, BYTEx(ack, 0)};
-  LogTrace(cmdbytes, sizeof(cmdbytes), last_frame_start, last_frame_end, NULL, false);
+    // log
+    uint8_t cmdbytes[] = {len, BYTEx(frame, 0), BYTEx(frame, 1)};
+    LogTrace(cmdbytes, sizeof(cmdbytes), last_frame_start, last_frame_end, NULL, false);
 
-  return ack;
+    return frame;
+}
+
+static bool rx_ack()
+{
+    // change fpga into rx mode
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR
+                      | FPGA_HF_READER_RX_XCORR_848_KHZ
+                      | FPGA_HF_READER_RX_XCORR_QUARTER);
+
+    // hold sampling until card is expected to respond
+    last_frame_end += TAG_FRAME_WAIT;
+    while (GET_TICKS < last_frame_end) { };
+
+    // backup ts for trace log
+    uint32_t last_frame_start = last_frame_end;
+
+    uint32_t ack = 0;
+    for (uint8_t i = 0; i < TAG_WRITE_TIMEOUT; ++i) {
+        // sample bit
+        ack = rx_bit();
+        legic_prng_forward(1);
+
+        // rx_bit runs only 95us, resync to TAG_BIT_PERIOD
+        last_frame_end += TAG_BIT_PERIOD;
+        while (GET_TICKS < last_frame_end) { };
+
+        // check if it was an ACK
+        if (ack) {
+            break;
+        }
+    }
+
+    // log
+    uint8_t cmdbytes[] = {1, BYTEx(ack, 0)};
+    LogTrace(cmdbytes, sizeof(cmdbytes), last_frame_start, last_frame_end, NULL, false);
+
+    return ack;
 }
 
 //-----------------------------------------------------------------------------
 // Legic Reader
 //-----------------------------------------------------------------------------
 
-static int init_card(uint8_t cardtype, legic_card_select_t *p_card) {
-  p_card->tagtype = cardtype;
+static int init_card(uint8_t cardtype, legic_card_select_t *p_card)
+{
+    p_card->tagtype = cardtype;
 
-  switch(p_card->tagtype) {
-    case 0x0d:
-      p_card->cmdsize = 6;
-      p_card->addrsize = 5;
-      p_card->cardsize = 22;
-      break;
-    case 0x1d:
-      p_card->cmdsize = 9;
-      p_card->addrsize = 8;
-      p_card->cardsize = 256;
-      break;
-    case 0x3d:
-      p_card->cmdsize = 11;
-      p_card->addrsize = 10;
-      p_card->cardsize = 1024;
-      break;
-    default:
-      p_card->cmdsize = 0;
-      p_card->addrsize = 0;
-      p_card->cardsize = 0;
-      return 2;
-  }
-  return 0;
+    switch (p_card->tagtype) {
+        case 0x0d:
+            p_card->cmdsize = 6;
+            p_card->addrsize = 5;
+            p_card->cardsize = 22;
+            break;
+        case 0x1d:
+            p_card->cmdsize = 9;
+            p_card->addrsize = 8;
+            p_card->cardsize = 256;
+            break;
+        case 0x3d:
+            p_card->cmdsize = 11;
+            p_card->addrsize = 10;
+            p_card->cardsize = 1024;
+            break;
+        default:
+            p_card->cmdsize = 0;
+            p_card->addrsize = 0;
+            p_card->cardsize = 0;
+            return 2;
+    }
+    return 0;
 }
 
-static void init_reader(bool clear_mem) {
-  // configure FPGA
-  FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-  FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR
-                  | FPGA_HF_READER_RX_XCORR_848_KHZ
-                  | FPGA_HF_READER_RX_XCORR_QUARTER);
-  SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
-  LED_A_ON();
+static void init_reader(bool clear_mem)
+{
+    // configure FPGA
+    FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR
+                      | FPGA_HF_READER_RX_XCORR_848_KHZ
+                      | FPGA_HF_READER_RX_XCORR_QUARTER);
+    SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
+    LED_A_ON();
 
-  // configure SSC with defaults
-  FpgaSetupSsc();
+    // configure SSC with defaults
+    FpgaSetupSsc();
 
-  // re-claim GPIO_SSC_DOUT as GPIO and enable output
-  AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
-  AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
-  HIGH(GPIO_SSC_DOUT);
+    // re-claim GPIO_SSC_DOUT as GPIO and enable output
+    AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
+    AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
+    HIGH(GPIO_SSC_DOUT);
 
-  // reserve a cardmem, meaning we can use the tracelog function in bigbuff easier.
-  legic_mem = BigBuf_get_EM_addr();
-  if (legic_mem) {
-    memset(legic_mem, 0x00, LEGIC_CARD_MEMSIZE);
-  }
+    // reserve a cardmem, meaning we can use the tracelog function in bigbuff easier.
+    legic_mem = BigBuf_get_EM_addr();
+    if (legic_mem) {
+        memset(legic_mem, 0x00, LEGIC_CARD_MEMSIZE);
+    }
 
-  // start trace
-  clear_trace();
-  set_tracing(true);
+    // start trace
+    clear_trace();
+    set_tracing(true);
 
-  // init crc calculator
-  crc_init(&legic_crc, 4, 0x19 >> 1, 0x05, 0);
+    // init crc calculator
+    crc_init(&legic_crc, 4, 0x19 >> 1, 0x05, 0);
 
-  // start us timer
-  StartTicks();
+    // start us timer
+    StartTicks();
 }
 
 // Setup reader to card connection
@@ -303,89 +314,93 @@ static void init_reader(bool clear_mem) {
 //  - Transmit initialisation vector 7 bits
 //  - Receive card type 6 bits
 //  - Transmit Acknowledge 6 bits
-static uint32_t setup_phase(uint8_t iv) {
-  // init coordination timestamp
-  last_frame_end = GET_TICKS;
+static uint32_t setup_phase(uint8_t iv)
+{
+    // init coordination timestamp
+    last_frame_end = GET_TICKS;
 
-  // Switch on carrier and let the card charge for 5ms.
-  last_frame_end += 7500;
-  while (GET_TICKS < last_frame_end) { };
+    // Switch on carrier and let the card charge for 5ms.
+    last_frame_end += 7500;
+    while (GET_TICKS < last_frame_end) { };
 
-  legic_prng_init(0);
-  tx_frame(iv, 7);
+    legic_prng_init(0);
+    tx_frame(iv, 7);
 
-  // configure prng
-  legic_prng_init(iv);
-  legic_prng_forward(2);
+    // configure prng
+    legic_prng_init(iv);
+    legic_prng_forward(2);
 
-  // receive card type
-  int32_t card_type = rx_frame(6);
-  legic_prng_forward(3);
+    // receive card type
+    int32_t card_type = rx_frame(6);
+    legic_prng_forward(3);
 
-  // send obsfuscated acknowledgment frame
-  switch (card_type) {
-    case 0x0D:
-      tx_frame(0x19, 6); // MIM22 | READCMD = 0x18 | 0x01
-      break;
-    case 0x1D:
-    case 0x3D:
-      tx_frame(0x39, 6); // MIM256 | READCMD = 0x38 | 0x01
-      break;
-  }
+    // send obsfuscated acknowledgment frame
+    switch (card_type) {
+        case 0x0D:
+            tx_frame(0x19, 6); // MIM22 | READCMD = 0x18 | 0x01
+            break;
+        case 0x1D:
+        case 0x3D:
+            tx_frame(0x39, 6); // MIM256 | READCMD = 0x38 | 0x01
+            break;
+    }
 
-  return card_type;
+    return card_type;
 }
 
-static uint8_t calc_crc4(uint16_t cmd, uint8_t cmd_sz, uint8_t value) {
-  crc_clear(&legic_crc);
-  crc_update(&legic_crc, (value << cmd_sz) | cmd, 8 + cmd_sz);
-  return crc_finish(&legic_crc);
+static uint8_t calc_crc4(uint16_t cmd, uint8_t cmd_sz, uint8_t value)
+{
+    crc_clear(&legic_crc);
+    crc_update(&legic_crc, (value << cmd_sz) | cmd, 8 + cmd_sz);
+    return crc_finish(&legic_crc);
 }
 
-static int16_t read_byte(uint16_t index, uint8_t cmd_sz) {
-  uint16_t cmd = (index << 1) | LEGIC_READ;
+static int16_t read_byte(uint16_t index, uint8_t cmd_sz)
+{
+    uint16_t cmd = (index << 1) | LEGIC_READ;
 
-  // read one byte
-  LED_B_ON();
-  legic_prng_forward(2);
-  tx_frame(cmd, cmd_sz);
-  legic_prng_forward(2);
-  uint32_t frame = rx_frame(12);
-  LED_B_OFF();
+    // read one byte
+    LED_B_ON();
+    legic_prng_forward(2);
+    tx_frame(cmd, cmd_sz);
+    legic_prng_forward(2);
+    uint32_t frame = rx_frame(12);
+    LED_B_OFF();
 
-  // split frame into data and crc
-  uint8_t byte = BYTEx(frame, 0);
-  uint8_t crc = BYTEx(frame, 1);
+    // split frame into data and crc
+    uint8_t byte = BYTEx(frame, 0);
+    uint8_t crc = BYTEx(frame, 1);
 
-  // check received against calculated crc
-  uint8_t calc_crc = calc_crc4(cmd, cmd_sz, byte);
-  if (calc_crc != crc) {
-    Dbprintf("!!! crc mismatch: %x != %x !!!",  calc_crc, crc);
-    return -1;
-  }
+    // check received against calculated crc
+    uint8_t calc_crc = calc_crc4(cmd, cmd_sz, byte);
+    if (calc_crc != crc) {
+        Dbprintf("!!! crc mismatch: %x != %x !!!",  calc_crc, crc);
+        return -1;
+    }
 
-  legic_prng_forward(1);
+    legic_prng_forward(1);
 
-  return byte;
+    return byte;
 }
 
 // Transmit write command, wait until (3.6ms) the tag sends back an unencrypted
 // ACK ('1' bit) and forward the prng time based.
-bool write_byte(uint16_t index, uint8_t byte, uint8_t addr_sz) {
-  uint32_t cmd = index << 1 | LEGIC_WRITE;          // prepare command
-  uint8_t  crc = calc_crc4(cmd, addr_sz + 1, byte); // calculate crc
-  cmd |= byte << (addr_sz + 1);                     // append value
-  cmd |= (crc & 0xF) << (addr_sz + 1 + 8);          // and crc
+bool write_byte(uint16_t index, uint8_t byte, uint8_t addr_sz)
+{
+    uint32_t cmd = index << 1 | LEGIC_WRITE;          // prepare command
+    uint8_t  crc = calc_crc4(cmd, addr_sz + 1, byte); // calculate crc
+    cmd |= byte << (addr_sz + 1);                     // append value
+    cmd |= (crc & 0xF) << (addr_sz + 1 + 8);          // and crc
 
-  // send write command
-  LED_C_ON();
-  legic_prng_forward(2);
-  tx_frame(cmd, addr_sz + 1 + 8 + 4); // cmd_sz = addr_sz + cmd + data + crc
-  legic_prng_forward(3);
-  LED_C_OFF();
+    // send write command
+    LED_C_ON();
+    legic_prng_forward(2);
+    tx_frame(cmd, addr_sz + 1 + 8 + 4); // cmd_sz = addr_sz + cmd + data + crc
+    legic_prng_forward(3);
+    LED_C_OFF();
 
-  // wait for ack
-  return rx_ack();
+    // wait for ack
+    return rx_ack();
 }
 
 //-----------------------------------------------------------------------------
@@ -393,111 +408,114 @@ bool write_byte(uint16_t index, uint8_t byte, uint8_t addr_sz) {
 //
 // Only this functions are public / called from appmain.c
 //-----------------------------------------------------------------------------
-void LegicRfInfo(void) {
-  // configure ARM and FPGA
-  init_reader(false);
+void LegicRfInfo(void)
+{
+    // configure ARM and FPGA
+    init_reader(false);
 
-  // establish shared secret and detect card type
-  uint8_t card_type = setup_phase(0x01);
-  if (init_card(card_type, &card) != 0) {
-    cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
-    goto OUT;
-  }
-
-  // read UID
-  for (uint8_t i = 0; i < sizeof(card.uid); ++i) {
-    int16_t byte = read_byte(i, card.cmdsize);
-    if (byte == -1) {
-      cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
-      goto OUT;
+    // establish shared secret and detect card type
+    uint8_t card_type = setup_phase(0x01);
+    if (init_card(card_type, &card) != 0) {
+        cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
+        goto OUT;
     }
-    card.uid[i] = byte & 0xFF;
-  }
 
-  // read MCC and check against UID
-  int16_t mcc = read_byte(4, card.cmdsize);
-  int16_t calc_mcc = CRC8Legic(card.uid, 4);;
-  if (mcc != calc_mcc) {
-    cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
-    goto OUT;
-  }
+    // read UID
+    for (uint8_t i = 0; i < sizeof(card.uid); ++i) {
+        int16_t byte = read_byte(i, card.cmdsize);
+        if (byte == -1) {
+            cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
+            goto OUT;
+        }
+        card.uid[i] = byte & 0xFF;
+    }
 
-  // OK
-  cmd_send(CMD_ACK, 1, 0, 0, (uint8_t*)&card, sizeof(legic_card_select_t));
+    // read MCC and check against UID
+    int16_t mcc = read_byte(4, card.cmdsize);
+    int16_t calc_mcc = CRC8Legic(card.uid, 4);;
+    if (mcc != calc_mcc) {
+        cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
+        goto OUT;
+    }
+
+    // OK
+    cmd_send(CMD_ACK, 1, 0, 0, (uint8_t *)&card, sizeof(legic_card_select_t));
 
 OUT:
-  switch_off();
-  StopTicks();
+    switch_off();
+    StopTicks();
 }
 
-void LegicRfReader(uint16_t offset, uint16_t len, uint8_t iv) {
-  // configure ARM and FPGA
-  init_reader(false);
+void LegicRfReader(uint16_t offset, uint16_t len, uint8_t iv)
+{
+    // configure ARM and FPGA
+    init_reader(false);
 
-  // establish shared secret and detect card type
-  uint8_t card_type = setup_phase(iv);
-  if (init_card(card_type, &card) != 0) {
-    cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
-    goto OUT;
-  }
-
-  // do not read beyond card memory
-  if (len + offset > card.cardsize) {
-    len = card.cardsize - offset;
-  }
-
-  for (uint16_t i = 0; i < len; ++i) {
-    int16_t byte = read_byte(offset + i, card.cmdsize);
-    if (byte == -1) {
-      cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
-      goto OUT;
+    // establish shared secret and detect card type
+    uint8_t card_type = setup_phase(iv);
+    if (init_card(card_type, &card) != 0) {
+        cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
+        goto OUT;
     }
-    legic_mem[i] = byte;
-  }
 
-  // OK
-  cmd_send(CMD_ACK, 1, len, 0, legic_mem, len);
+    // do not read beyond card memory
+    if (len + offset > card.cardsize) {
+        len = card.cardsize - offset;
+    }
+
+    for (uint16_t i = 0; i < len; ++i) {
+        int16_t byte = read_byte(offset + i, card.cmdsize);
+        if (byte == -1) {
+            cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
+            goto OUT;
+        }
+        legic_mem[i] = byte;
+    }
+
+    // OK
+    cmd_send(CMD_ACK, 1, len, 0, legic_mem, len);
 
 OUT:
-  switch_off();
-  StopTicks();
+    switch_off();
+    StopTicks();
 }
 
-void LegicRfWriter(uint16_t offset, uint16_t len, uint8_t iv, uint8_t *data) {
-  // configure ARM and FPGA
-  init_reader(false);
+void LegicRfWriter(uint16_t offset, uint16_t len, uint8_t iv, uint8_t *data)
+{
+    // configure ARM and FPGA
+    init_reader(false);
 
-  // uid is not writeable
-  if (offset <= WRITE_LOWERLIMIT) {
-    cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
-    goto OUT;
-  }
-
-  // establish shared secret and detect card type
-  uint8_t card_type = setup_phase(iv);
-  if (init_card(card_type, &card) != 0) {
-    cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
-    goto OUT;
-  }
-
-  // do not write beyond card memory
-  if (len + offset > card.cardsize) {
-    len = card.cardsize - offset;
-  }
-
-  // write in reverse order, only then is DCF (decremental field) writable
-  while (len-- > 0 && !BUTTON_PRESS()) {
-    if (!write_byte(len + offset, data[len], card.addrsize)) {
-      Dbprintf("operation failed | %02X | %02X | %02X", len + offset, len, data[len]);
-      cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
-      goto OUT;
+    // uid is not writeable
+    if (offset <= WRITE_LOWERLIMIT) {
+        cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
+        goto OUT;
     }
-  }
 
-  // OK
-  cmd_send(CMD_ACK, 1, len, 0, legic_mem, len);
+    // establish shared secret and detect card type
+    uint8_t card_type = setup_phase(iv);
+    if (init_card(card_type, &card) != 0) {
+        cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
+        goto OUT;
+    }
+
+    // do not write beyond card memory
+    if (len + offset > card.cardsize) {
+        len = card.cardsize - offset;
+    }
+
+    // write in reverse order, only then is DCF (decremental field) writable
+    while (len-- > 0 && !BUTTON_PRESS()) {
+        if (!write_byte(len + offset, data[len], card.addrsize)) {
+            Dbprintf("operation failed | %02X | %02X | %02X", len + offset, len, data[len]);
+            cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
+            goto OUT;
+        }
+    }
+
+    // OK
+    cmd_send(CMD_ACK, 1, len, 0, legic_mem, len);
 
 OUT:
-  switch_off();
-  StopTicks();
+    switch_off();
+    StopTicks();
 }
diff --git a/armsrc/legicrfsim.c b/armsrc/legicrfsim.c
index 86448275f..a855401a4 100644
--- a/armsrc/legicrfsim.c
+++ b/armsrc/legicrfsim.c
@@ -16,7 +16,7 @@
 #include "legic_prng.h"         /* legic PRNG impl */
 #include "legic.h"              /* legic_card_select_t struct */
 
-static uint8_t* legic_mem;      /* card memory, used for sim */
+static uint8_t *legic_mem;      /* card memory, used for sim */
 static legic_card_select_t card;/* metadata of currently selected card */
 static crc_t legic_crc;
 
@@ -58,13 +58,14 @@ static uint32_t last_frame_end; /* ts of last bit of previews rx or tx frame */
 //-----------------------------------------------------------------------------
 
 // Returns true if a pulse/pause is received within timeout
-static inline bool wait_for(bool value, const uint32_t timeout) {
-  while ((bool)(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_DIN) != value) {
-    if (GetCountSspClk() > timeout) {
-      return false;
+static inline bool wait_for(bool value, const uint32_t timeout)
+{
+    while ((bool)(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_DIN) != value) {
+        if (GetCountSspClk() > timeout) {
+            return false;
+        }
     }
-  }
-  return true;
+    return true;
 }
 
 // Returns a demedulated bit or -1 on code violation
@@ -76,30 +77,31 @@ static inline bool wait_for(bool value, const uint32_t timeout) {
 //  - A bit length >80.2us is a 1
 //  - A bit length <80.2us is a 0
 //  - A bit length >148.6us is a code violation
-static inline int8_t rx_bit() {
-  // backup ts for threshold calculation
-  uint32_t bit_start = last_frame_end;
+static inline int8_t rx_bit()
+{
+    // backup ts for threshold calculation
+    uint32_t bit_start = last_frame_end;
 
-  // wait for pause to end
-  if (!wait_for(RWD_PULSE, bit_start + RWD_TIME_1*3/2)) {
-    return -1;
-  }
+    // wait for pause to end
+    if (!wait_for(RWD_PULSE, bit_start + RWD_TIME_1 * 3 / 2)) {
+        return -1;
+    }
 
-  // wait for next pause
-  if (!wait_for(RWD_PAUSE, bit_start + RWD_TIME_1*3/2)) {
-    return -1;
-  }
+    // wait for next pause
+    if (!wait_for(RWD_PAUSE, bit_start + RWD_TIME_1 * 3 / 2)) {
+        return -1;
+    }
 
-  // update bit and frame end
-  last_frame_end = GetCountSspClk();
+    // update bit and frame end
+    last_frame_end = GetCountSspClk();
 
-  // check for code violation (bit to short)
-  if (last_frame_end - bit_start < RWD_TIME_PAUSE) {
-    return -1;
-  }
+    // check for code violation (bit to short)
+    if (last_frame_end - bit_start < RWD_TIME_PAUSE) {
+        return -1;
+    }
 
-  // apply threshold (average of RWD_TIME_0 and )
-  return (last_frame_end - bit_start > (RWD_TIME_0 + RWD_TIME_1) / 2);
+    // apply threshold (average of RWD_TIME_0 and )
+    return (last_frame_end - bit_start > (RWD_TIME_0 + RWD_TIME_1) / 2);
 }
 
 //-----------------------------------------------------------------------------
@@ -119,21 +121,22 @@ static inline int8_t rx_bit() {
 // Note: The Subcarrier is not disabled during bits to prevent glitches. This is
 //       not mandatory but results in a cleaner signal. tx_frame will disable
 //       the subcarrier when the frame is done.
-static inline void tx_bit(bool bit) {
-  LED_C_ON();
+static inline void tx_bit(bool bit)
+{
+    LED_C_ON();
 
-  if (bit) {
-    // modulate subcarrier
-    HIGH(GPIO_SSC_DOUT);
-  } else {
-    // do not modulate subcarrier
-    LOW(GPIO_SSC_DOUT);
-  }
+    if (bit) {
+        // modulate subcarrier
+        HIGH(GPIO_SSC_DOUT);
+    } else {
+        // do not modulate subcarrier
+        LOW(GPIO_SSC_DOUT);
+    }
 
-  // wait for tx timeslot to end
-  last_frame_end += TAG_BIT_PERIOD;
-  while (GetCountSspClk() < last_frame_end) { };
-  LED_C_OFF();
+    // wait for tx timeslot to end
+    last_frame_end += TAG_BIT_PERIOD;
+    while (GetCountSspClk() < last_frame_end) { };
+    LED_C_OFF();
 }
 
 //-----------------------------------------------------------------------------
@@ -146,49 +149,51 @@ static inline void tx_bit(bool bit) {
 // and depends only the command received (IV, ACK, READ or WRITE).
 //-----------------------------------------------------------------------------
 
-static void tx_frame(uint32_t frame, uint8_t len) {
-  // wait for next tx timeslot
-  last_frame_end += TAG_FRAME_WAIT;
-  legic_prng_forward(TAG_FRAME_WAIT/TAG_BIT_PERIOD - 1);
-  while (GetCountSspClk() < last_frame_end) { };
+static void tx_frame(uint32_t frame, uint8_t len)
+{
+    // wait for next tx timeslot
+    last_frame_end += TAG_FRAME_WAIT;
+    legic_prng_forward(TAG_FRAME_WAIT / TAG_BIT_PERIOD - 1);
+    while (GetCountSspClk() < last_frame_end) { };
 
-  // backup ts for trace log
-  uint32_t last_frame_start = last_frame_end;
+    // backup ts for trace log
+    uint32_t last_frame_start = last_frame_end;
 
-  // transmit frame, MSB first
-  for (uint8_t i = 0; i < len; ++i) {
-    bool bit = (frame >> i) & 0x01;
-    tx_bit(bit ^ legic_prng_get_bit());
-    legic_prng_forward(1);
-  };
+    // transmit frame, MSB first
+    for (uint8_t i = 0; i < len; ++i) {
+        bool bit = (frame >> i) & 0x01;
+        tx_bit(bit ^ legic_prng_get_bit());
+        legic_prng_forward(1);
+    };
 
-  // disable subcarrier
-  LOW(GPIO_SSC_DOUT);
+    // disable subcarrier
+    LOW(GPIO_SSC_DOUT);
 
-  // log
-  uint8_t cmdbytes[] = {len, BYTEx(frame, 0), BYTEx(frame, 1)};
-  LogTrace(cmdbytes, sizeof(cmdbytes), last_frame_start, last_frame_end, NULL, false);
+    // log
+    uint8_t cmdbytes[] = {len, BYTEx(frame, 0), BYTEx(frame, 1)};
+    LogTrace(cmdbytes, sizeof(cmdbytes), last_frame_start, last_frame_end, NULL, false);
 }
 
-static void tx_ack() {
-  // wait for ack timeslot
-  last_frame_end += TAG_ACK_WAIT;
-  legic_prng_forward(TAG_ACK_WAIT/TAG_BIT_PERIOD - 1);
-  while (GetCountSspClk() < last_frame_end) { };
+static void tx_ack()
+{
+    // wait for ack timeslot
+    last_frame_end += TAG_ACK_WAIT;
+    legic_prng_forward(TAG_ACK_WAIT / TAG_BIT_PERIOD - 1);
+    while (GetCountSspClk() < last_frame_end) { };
 
-  // backup ts for trace log
-  uint32_t last_frame_start = last_frame_end;
+    // backup ts for trace log
+    uint32_t last_frame_start = last_frame_end;
 
-  // transmit ack (ack is not encrypted)
-  tx_bit(true);
-  legic_prng_forward(1);
+    // transmit ack (ack is not encrypted)
+    tx_bit(true);
+    legic_prng_forward(1);
 
-  // disable subcarrier
-  LOW(GPIO_SSC_DOUT);
+    // disable subcarrier
+    LOW(GPIO_SSC_DOUT);
 
-  // log
-  uint8_t cmdbytes[] = {1, 1};
-  LogTrace(cmdbytes, sizeof(cmdbytes), last_frame_start, last_frame_end, NULL, false);
+    // log
+    uint8_t cmdbytes[] = {1, 1};
+    LogTrace(cmdbytes, sizeof(cmdbytes), last_frame_start, last_frame_end, NULL, false);
 }
 
 // Returns a demedulated frame or -1 on code violation
@@ -198,126 +203,129 @@ static void tx_ack() {
 //  - forward prng based on ts/TAG_BIT_PERIOD
 //  - receive the frame
 //  - detect end of frame (last pause)
-static int32_t rx_frame(uint8_t *len) {
-  int32_t frame = 0;
+static int32_t rx_frame(uint8_t *len)
+{
+    int32_t frame = 0;
 
-  // add 2 SSP clock cycles (1 for tx and 1 for rx pipeline delay)
-  // those will be substracted at the end of the rx phase
-  last_frame_end -= 2;
+    // add 2 SSP clock cycles (1 for tx and 1 for rx pipeline delay)
+    // those will be substracted at the end of the rx phase
+    last_frame_end -= 2;
 
-  // wait for first pause (start of frame)
-  for (uint8_t i = 0; true; ++i) {
-    // increment prng every TAG_BIT_PERIOD
-    last_frame_end += TAG_BIT_PERIOD;
-    legic_prng_forward(1);
+    // wait for first pause (start of frame)
+    for (uint8_t i = 0; true; ++i) {
+        // increment prng every TAG_BIT_PERIOD
+        last_frame_end += TAG_BIT_PERIOD;
+        legic_prng_forward(1);
 
-    // if start of frame was received exit delay loop
-    if (wait_for(RWD_PAUSE, last_frame_end)) {
-      last_frame_end = GetCountSspClk();
-      break;
+        // if start of frame was received exit delay loop
+        if (wait_for(RWD_PAUSE, last_frame_end)) {
+            last_frame_end = GetCountSspClk();
+            break;
+        }
+
+        // check for code violation
+        if (i > RWD_CMD_TIMEOUT) {
+            return -1;
+        }
     }
 
-    // check for code violation
-    if (i > RWD_CMD_TIMEOUT) {
-      return -1;
-    }
-  }
+    // backup ts for trace log
+    uint32_t last_frame_start = last_frame_end;
 
-  // backup ts for trace log
-  uint32_t last_frame_start = last_frame_end;
+    // receive frame
+    for (*len = 0; true; ++(*len)) {
+        // receive next bit
+        LED_B_ON();
+        int8_t bit = rx_bit();
+        LED_B_OFF();
 
-  // receive frame
-  for (*len = 0; true; ++(*len)) {
-    // receive next bit
-    LED_B_ON();
-    int8_t bit = rx_bit();
-    LED_B_OFF();
+        // check for code violation and to short / long frame
+        if ((bit < 0) && ((*len < RWD_MIN_FRAME_LEN) || (*len > RWD_MAX_FRAME_LEN))) {
+            return -1;
+        }
 
-    // check for code violation and to short / long frame
-    if ((bit < 0) && ((*len < RWD_MIN_FRAME_LEN) || (*len > RWD_MAX_FRAME_LEN))) {
-      return -1;
+        // check for code violation caused by end of frame
+        if (bit < 0) {
+            break;
+        }
+
+        // append bit
+        frame |= (bit ^ legic_prng_get_bit()) << (*len);
+        legic_prng_forward(1);
     }
 
-    // check for code violation caused by end of frame
-    if (bit < 0) {
-      break;
-    }
+    // rx_bit sets coordination timestamp to start of pause, append pause duration
+    // and substract 2 SSP clock cycles (1 for rx and 1 for tx pipeline delay) to
+    // obtain exact end of frame.
+    last_frame_end += RWD_TIME_PAUSE - 2;
 
-    // append bit
-    frame |= (bit ^ legic_prng_get_bit()) << (*len);
-    legic_prng_forward(1);
-  }
-
-  // rx_bit sets coordination timestamp to start of pause, append pause duration
-  // and substract 2 SSP clock cycles (1 for rx and 1 for tx pipeline delay) to
-  // obtain exact end of frame.
-  last_frame_end += RWD_TIME_PAUSE - 2;
-
-  // log
-  uint8_t cmdbytes[] = {*len, BYTEx(frame, 0), BYTEx(frame, 1), BYTEx(frame, 2)};
-  LogTrace(cmdbytes, sizeof(cmdbytes), last_frame_start, last_frame_end, NULL, true);
-  return frame;
+    // log
+    uint8_t cmdbytes[] = {*len, BYTEx(frame, 0), BYTEx(frame, 1), BYTEx(frame, 2)};
+    LogTrace(cmdbytes, sizeof(cmdbytes), last_frame_start, last_frame_end, NULL, true);
+    return frame;
 }
 
 //-----------------------------------------------------------------------------
 // Legic Simulator
 //-----------------------------------------------------------------------------
 
-static int32_t init_card(uint8_t cardtype, legic_card_select_t *p_card) {
-  p_card->tagtype = cardtype;
+static int32_t init_card(uint8_t cardtype, legic_card_select_t *p_card)
+{
+    p_card->tagtype = cardtype;
 
-  switch (p_card->tagtype) {
-    case 0:
-      p_card->cmdsize = 6;
-      p_card->addrsize = 5;
-      p_card->cardsize = 22;
-      break;
-    case 1:
-      p_card->cmdsize = 9;
-      p_card->addrsize = 8;
-      p_card->cardsize = 256;
-      break;
-    case 2:
-      p_card->cmdsize = 11;
-      p_card->addrsize = 10;
-      p_card->cardsize = 1024;
-      break;
-    default:
-      p_card->cmdsize = 0;
-      p_card->addrsize = 0;
-      p_card->cardsize = 0;
-      return 2;
-  }
-  return 0;
+    switch (p_card->tagtype) {
+        case 0:
+            p_card->cmdsize = 6;
+            p_card->addrsize = 5;
+            p_card->cardsize = 22;
+            break;
+        case 1:
+            p_card->cmdsize = 9;
+            p_card->addrsize = 8;
+            p_card->cardsize = 256;
+            break;
+        case 2:
+            p_card->cmdsize = 11;
+            p_card->addrsize = 10;
+            p_card->cardsize = 1024;
+            break;
+        default:
+            p_card->cmdsize = 0;
+            p_card->addrsize = 0;
+            p_card->cardsize = 0;
+            return 2;
+    }
+    return 0;
 }
 
-static void init_tag() {
-  // configure FPGA
-  FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-  FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_SIMULATOR
-                  | FPGA_HF_SIMULATOR_MODULATE_212K);
-  SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
+static void init_tag()
+{
+    // configure FPGA
+    FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_SIMULATOR
+                      | FPGA_HF_SIMULATOR_MODULATE_212K);
+    SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
 
-  // configure SSC with defaults
-  FpgaSetupSsc();
+    // configure SSC with defaults
+    FpgaSetupSsc();
 
-  // first pull output to low to prevent glitches then re-claim GPIO_SSC_DOUT
-  LOW(GPIO_SSC_DOUT);
-  AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
-  AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
+    // first pull output to low to prevent glitches then re-claim GPIO_SSC_DOUT
+    LOW(GPIO_SSC_DOUT);
+    AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
+    AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
 
-  // reserve a cardmem, meaning we can use the tracelog function in bigbuff easier.
-  legic_mem = BigBuf_get_EM_addr();
+    // reserve a cardmem, meaning we can use the tracelog function in bigbuff easier.
+    legic_mem = BigBuf_get_EM_addr();
 
-  // start trace
-  clear_trace();
-  set_tracing(true);
+    // start trace
+    clear_trace();
+    set_tracing(true);
 
-  // init crc calculator
-  crc_init(&legic_crc, 4, 0x19 >> 1, 0x05, 0);
+    // init crc calculator
+    crc_init(&legic_crc, 4, 0x19 >> 1, 0x05, 0);
 
-  // start 212kHz timer (running from SSP Clock)
-  StartCountSspClk();
+    // start 212kHz timer (running from SSP Clock)
+    StartCountSspClk();
 }
 
 // Setup reader to card connection
@@ -326,119 +334,122 @@ static void init_tag() {
 //  - Receive initialisation vector 7 bits
 //  - Transmit card type 6 bits
 //  - Receive Acknowledge 6 bits
-static int32_t setup_phase(legic_card_select_t *p_card) {
-  uint8_t len = 0;
+static int32_t setup_phase(legic_card_select_t *p_card)
+{
+    uint8_t len = 0;
 
-  // init coordination timestamp
-  last_frame_end = GetCountSspClk();
+    // init coordination timestamp
+    last_frame_end = GetCountSspClk();
 
-  // reset prng
-  legic_prng_init(0);
+    // reset prng
+    legic_prng_init(0);
 
-  // wait for iv
-  int32_t iv = rx_frame(&len);
-  if ((len != 7) || (iv < 0)) {
-    return -1;
-  }
-
-  // configure prng
-  legic_prng_init(iv);
-
-  // reply with card type
-  switch (p_card->tagtype) {
-    case 0:
-      tx_frame(0x0D, 6);
-      break;
-    case 1:
-      tx_frame(0x1D, 6);
-      break;
-    case 2:
-      tx_frame(0x3D, 6);
-      break;
-  }
-
-  // wait for ack
-  int32_t ack = rx_frame(&len);
-  if ((len != 6) || (ack < 0)) {
-    return -1;
-  }
-
-  // validate data
-  switch (p_card->tagtype) {
-    case 0:
-      if(ack != 0x19) return -1;
-      break;
-    case 1:
-      if(ack != 0x39) return -1;
-      break;
-    case 2:
-      if(ack != 0x39) return -1;
-      break;
-  }
-
-  // During rx the prng is clocked using the variable reader period.
-  // Since rx_frame detects end of frame by detecting a code violation,
-  // the prng is off by one bit period after each rx phase. Hence, tx
-  // code advances the prng by (TAG_FRAME_WAIT/TAG_BIT_PERIOD - 1).
-  // This is not possible for back to back rx, so this quirk reduces
-  // the gap by one period.
-  last_frame_end += TAG_BIT_PERIOD;
-
-  return 0;
-}
-
-static uint8_t calc_crc4(uint16_t cmd, uint8_t cmd_sz, uint8_t value) {
-  crc_clear(&legic_crc);
-  crc_update(&legic_crc, (value << cmd_sz) | cmd, 8 + cmd_sz);
-  return crc_finish(&legic_crc);
-}
-
-static int32_t connected_phase(legic_card_select_t *p_card) {
-  uint8_t len = 0;
-
-  // wait for command
-  int32_t cmd = rx_frame(&len);
-  if (cmd < 0) {
-    return -1;
-  }
-
-  // check if command is LEGIC_READ
-  if (len == p_card->cmdsize) {
-    // prepare data
-    uint8_t byte = legic_mem[cmd >> 1];
-    uint8_t crc = calc_crc4(cmd, p_card->cmdsize, byte);
-
-    // transmit data
-    tx_frame((crc << 8) | byte, 12);
-
-    return 0;
-  }
-
-  // check if command is LEGIC_WRITE
-  if (len == p_card->cmdsize + 8 + 4) {
-    // decode data
-    uint16_t mask = (1 << p_card->addrsize) - 1;
-    uint16_t addr = (cmd >> 1) & mask;
-    uint8_t  byte = (cmd >> p_card->cmdsize) & 0xff;
-    uint8_t  crc  = (cmd >> (p_card->cmdsize + 8)) & 0xf;
-
-    // check received against calculated crc
-    uint8_t calc_crc = calc_crc4(addr << 1, p_card->cmdsize, byte);
-    if (calc_crc != crc) {
-      Dbprintf("!!! crc mismatch: %x != %x !!!",  calc_crc, crc);
-      return -1;
+    // wait for iv
+    int32_t iv = rx_frame(&len);
+    if ((len != 7) || (iv < 0)) {
+        return -1;
     }
 
-    // store data
-    legic_mem[addr] = byte;
+    // configure prng
+    legic_prng_init(iv);
 
-    // transmit ack
-    tx_ack();
+    // reply with card type
+    switch (p_card->tagtype) {
+        case 0:
+            tx_frame(0x0D, 6);
+            break;
+        case 1:
+            tx_frame(0x1D, 6);
+            break;
+        case 2:
+            tx_frame(0x3D, 6);
+            break;
+    }
+
+    // wait for ack
+    int32_t ack = rx_frame(&len);
+    if ((len != 6) || (ack < 0)) {
+        return -1;
+    }
+
+    // validate data
+    switch (p_card->tagtype) {
+        case 0:
+            if (ack != 0x19) return -1;
+            break;
+        case 1:
+            if (ack != 0x39) return -1;
+            break;
+        case 2:
+            if (ack != 0x39) return -1;
+            break;
+    }
+
+    // During rx the prng is clocked using the variable reader period.
+    // Since rx_frame detects end of frame by detecting a code violation,
+    // the prng is off by one bit period after each rx phase. Hence, tx
+    // code advances the prng by (TAG_FRAME_WAIT/TAG_BIT_PERIOD - 1).
+    // This is not possible for back to back rx, so this quirk reduces
+    // the gap by one period.
+    last_frame_end += TAG_BIT_PERIOD;
 
     return 0;
-  }
+}
 
-  return -1;
+static uint8_t calc_crc4(uint16_t cmd, uint8_t cmd_sz, uint8_t value)
+{
+    crc_clear(&legic_crc);
+    crc_update(&legic_crc, (value << cmd_sz) | cmd, 8 + cmd_sz);
+    return crc_finish(&legic_crc);
+}
+
+static int32_t connected_phase(legic_card_select_t *p_card)
+{
+    uint8_t len = 0;
+
+    // wait for command
+    int32_t cmd = rx_frame(&len);
+    if (cmd < 0) {
+        return -1;
+    }
+
+    // check if command is LEGIC_READ
+    if (len == p_card->cmdsize) {
+        // prepare data
+        uint8_t byte = legic_mem[cmd >> 1];
+        uint8_t crc = calc_crc4(cmd, p_card->cmdsize, byte);
+
+        // transmit data
+        tx_frame((crc << 8) | byte, 12);
+
+        return 0;
+    }
+
+    // check if command is LEGIC_WRITE
+    if (len == p_card->cmdsize + 8 + 4) {
+        // decode data
+        uint16_t mask = (1 << p_card->addrsize) - 1;
+        uint16_t addr = (cmd >> 1) & mask;
+        uint8_t  byte = (cmd >> p_card->cmdsize) & 0xff;
+        uint8_t  crc  = (cmd >> (p_card->cmdsize + 8)) & 0xf;
+
+        // check received against calculated crc
+        uint8_t calc_crc = calc_crc4(addr << 1, p_card->cmdsize, byte);
+        if (calc_crc != crc) {
+            Dbprintf("!!! crc mismatch: %x != %x !!!",  calc_crc, crc);
+            return -1;
+        }
+
+        // store data
+        legic_mem[addr] = byte;
+
+        // transmit ack
+        tx_ack();
+
+        return 0;
+    }
+
+    return -1;
 }
 
 //-----------------------------------------------------------------------------
@@ -447,39 +458,40 @@ static int32_t connected_phase(legic_card_select_t *p_card) {
 // Only this function is public / called from appmain.c
 //-----------------------------------------------------------------------------
 
-void LegicRfSimulate(uint8_t cardtype) {
-  // configure ARM and FPGA
-  init_tag();
+void LegicRfSimulate(uint8_t cardtype)
+{
+    // configure ARM and FPGA
+    init_tag();
 
-  // verify command line input
-  if (init_card(cardtype, &card) != 0) {
-    DbpString("Unknown tagtype.");
-    goto OUT;
-  }
-
-  LED_A_ON();
-  DbpString("Starting Legic emulator, press button to end");
-  while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
-    WDT_HIT();
-
-    // wait for carrier, restart after timeout
-    if (!wait_for(RWD_PULSE, GetCountSspClk() + TAG_BIT_PERIOD)) {
-      continue;
+    // verify command line input
+    if (init_card(cardtype, &card) != 0) {
+        DbpString("Unknown tagtype.");
+        goto OUT;
     }
 
-    // wait for connection, restart on error
-    if (setup_phase(&card)) {
-      continue;
-    }
+    LED_A_ON();
+    DbpString("Starting Legic emulator, press button to end");
+    while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
+        WDT_HIT();
 
-    // conection is established, process commands until one fails
-    while (!connected_phase(&card)) {
-      WDT_HIT();
+        // wait for carrier, restart after timeout
+        if (!wait_for(RWD_PULSE, GetCountSspClk() + TAG_BIT_PERIOD)) {
+            continue;
+        }
+
+        // wait for connection, restart on error
+        if (setup_phase(&card)) {
+            continue;
+        }
+
+        // conection is established, process commands until one fails
+        while (!connected_phase(&card)) {
+            WDT_HIT();
+        }
     }
-  }
 
 OUT:
-  DbpString("Stopped");
-  switch_off();
-  StopTicks();
+    DbpString("Stopped");
+    switch_off();
+    StopTicks();
 }
diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index bd34e46df..87a0bcfb9 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -59,18 +59,20 @@ Default LF T55xx config is set to:
     write_1 = 47*8
     read_gap = 15*8
 */
-t55xx_config t_config = { 29*8, 17*8, 15*8, 47*8, 15*8 } ;
+t55xx_config t_config = { 29 * 8, 17 * 8, 15 * 8, 47 * 8, 15 * 8 } ;
 
-void printT55xxConfig(void) {
+void printT55xxConfig(void)
+{
     Dbprintf("LF T55XX config");
-    Dbprintf("  [a] startgap............%d*8 (%d)", t_config.start_gap/8, t_config.start_gap);
-    Dbprintf("  [b] writegap............%d*8 (%d)", t_config.write_gap/8, t_config.write_gap);
-    Dbprintf("  [c] write_0.............%d*8 (%d)", t_config.write_0/8,   t_config.write_0);
-    Dbprintf("  [d] write_1.............%d*8 (%d)", t_config.write_1/8,   t_config.write_1);
-    Dbprintf("  [e] readgap.............%d*8 (%d)", t_config.read_gap/8,  t_config.read_gap);
+    Dbprintf("  [a] startgap............%d*8 (%d)", t_config.start_gap / 8, t_config.start_gap);
+    Dbprintf("  [b] writegap............%d*8 (%d)", t_config.write_gap / 8, t_config.write_gap);
+    Dbprintf("  [c] write_0.............%d*8 (%d)", t_config.write_0 / 8,   t_config.write_0);
+    Dbprintf("  [d] write_1.............%d*8 (%d)", t_config.write_1 / 8,   t_config.write_1);
+    Dbprintf("  [e] readgap.............%d*8 (%d)", t_config.read_gap / 8,  t_config.read_gap);
 }
 
-void setT55xxConfig(uint8_t arg0, t55xx_config *c) {
+void setT55xxConfig(uint8_t arg0, t55xx_config *c)
+{
 
     if (c->start_gap != 0) t_config.start_gap = c->start_gap;
     if (c->write_gap != 0) t_config.write_gap = c->write_gap;
@@ -93,7 +95,7 @@ void setT55xxConfig(uint8_t arg0, t55xx_config *c) {
     uint8_t *buf = BigBuf_malloc(T55XX_CONFIG_LEN);
     Flash_CheckBusy(BUSY_TIMEOUT);
     uint16_t res = Flash_ReadDataCont(T55XX_CONFIG_OFFSET, buf, T55XX_CONFIG_LEN);
-    if ( res == 0) {
+    if (res == 0) {
         FlashStop();
         BigBuf_free();
         return;
@@ -106,7 +108,7 @@ void setT55xxConfig(uint8_t arg0, t55xx_config *c) {
     Flash_Erase4k(3, 0xD);
     res = Flash_Write(T55XX_CONFIG_OFFSET, buf, T55XX_CONFIG_LEN);
 
-    if ( res == T55XX_CONFIG_LEN && MF_DBGLEVEL > 1) {
+    if (res == T55XX_CONFIG_LEN && MF_DBGLEVEL > 1) {
         DbpString("T55XX Config save success");
     }
 
@@ -114,11 +116,13 @@ void setT55xxConfig(uint8_t arg0, t55xx_config *c) {
 #endif
 }
 
-t55xx_config* getT55xxConfig(void) {
+t55xx_config *getT55xxConfig(void)
+{
     return &t_config;
 }
 
-void loadT55xxConfig(void) {
+void loadT55xxConfig(void)
+{
 #ifdef WITH_FLASH
     if (!FlashInit()) {
         return;
@@ -132,18 +136,18 @@ void loadT55xxConfig(void) {
 
     // verify read mem is actual data.
     uint8_t cntA = T55XX_CONFIG_LEN, cntB = T55XX_CONFIG_LEN;
-    for (int i=0; i< T55XX_CONFIG_LEN; i++) {
-        if ( buf[i] == 0xFF) cntA--;
-        if ( buf[i] == 0x00) cntB--;
+    for (int i = 0; i < T55XX_CONFIG_LEN; i++) {
+        if (buf[i] == 0xFF) cntA--;
+        if (buf[i] == 0x00) cntB--;
     }
-    if ( !cntA || !cntB ) {
+    if (!cntA || !cntB) {
         BigBuf_free();
         return;
     }
 
     memcpy((uint8_t *)&t_config, buf, T55XX_CONFIG_LEN);
 
-    if ( isok == T55XX_CONFIG_LEN) {
+    if (isok == T55XX_CONFIG_LEN) {
         if (MF_DBGLEVEL > 1) DbpString("T55XX Config load success");
     }
 #endif
@@ -156,7 +160,8 @@ void loadT55xxConfig(void) {
  * @param period_1
  * @param command (in binary char array)
  */
-void ModThenAcquireRawAdcSamples125k(uint32_t delay_off, uint32_t period_0, uint32_t period_1, uint8_t *command) {
+void ModThenAcquireRawAdcSamples125k(uint32_t delay_off, uint32_t period_0, uint32_t period_1, uint8_t *command)
+{
 
     // start timer
     StartTicks();
@@ -197,7 +202,7 @@ void ModThenAcquireRawAdcSamples125k(uint32_t delay_off, uint32_t period_0, uint
 
         // prime cmd_len to save time comparing strings while modulating
         int cmd_len = 0;
-        while(command[cmd_len] != '\0' && command[cmd_len] != ' ')
+        while (command[cmd_len] != '\0' && command[cmd_len] != ' ')
             cmd_len++;
 
         int counter = 0;
@@ -213,7 +218,7 @@ void ModThenAcquireRawAdcSamples125k(uint32_t delay_off, uint32_t period_0, uint
                 }
                 // note we appear to take about 7us to switch over (or run the if statements/loop...)
                 WaitUS(period_0 - hack_cnt);
-            // else if cmd = 1 then turn field on
+                // else if cmd = 1 then turn field on
             } else {
                 // if field already on leave alone (affects timing otherwise)
                 if (off) {
@@ -226,7 +231,7 @@ void ModThenAcquireRawAdcSamples125k(uint32_t delay_off, uint32_t period_0, uint
             }
         }
     } else { // old mode of cmd read using delay as off period
-        while(*command != '\0' && *command != ' ') {
+        while (*command != '\0' && *command != ' ') {
             LED_D_ON();
             if (*(command++) == '0')
                 TurnReadLFOn(period_0);
@@ -249,7 +254,7 @@ void ModThenAcquireRawAdcSamples125k(uint32_t delay_off, uint32_t period_0, uint
     // Turn off antenna
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     // tell client we are done
-    cmd_send(CMD_ACK,0,0,0,0,0);
+    cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
 }
 
 /* blank r/w tag data stream
@@ -268,20 +273,20 @@ void ReadTItag(void)
     // when we read a TI tag we sample the zerocross line at 2Mhz
     // TI tags modulate a 1 as 16 cycles of 123.2Khz
     // TI tags modulate a 0 as 16 cycles of 134.2Khz
-    #define FSAMPLE 2000000
-    #define FREQLO 123200
-    #define FREQHI 134200
+#define FSAMPLE 2000000
+#define FREQLO 123200
+#define FREQHI 134200
 
     signed char *dest = (signed char *)BigBuf_get_addr();
     uint16_t n = BigBuf_max_traceLen();
     // 128 bit shift register [shift3:shift2:shift1:shift0]
     uint32_t shift3 = 0, shift2 = 0, shift1 = 0, shift0 = 0;
 
-    int i, cycles=0, samples=0;
+    int i, cycles = 0, samples = 0;
     // how many sample points fit in 16 cycles of each frequency
-    uint32_t sampleslo = (FSAMPLE<<4)/FREQLO, sampleshi = (FSAMPLE<<4)/FREQHI;
+    uint32_t sampleslo = (FSAMPLE << 4) / FREQLO, sampleshi = (FSAMPLE << 4) / FREQHI;
     // when to tell if we're close enough to one freq or another
-    uint32_t threshold = (sampleslo - sampleshi + 1)>>1;
+    uint32_t threshold = (sampleslo - sampleshi + 1) >> 1;
 
     // TI tags charge at 134.2Khz
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
@@ -298,28 +303,28 @@ void ReadTItag(void)
 
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 
-    for (i=0; i<n-1; i++) {
+    for (i = 0; i < n - 1; i++) {
         // count cycles by looking for lo to hi zero crossings
-        if ( (dest[i]<0) && (dest[i+1]>0) ) {
+        if ((dest[i] < 0) && (dest[i + 1] > 0)) {
             cycles++;
             // after 16 cycles, measure the frequency
-            if (cycles>15) {
-                cycles=0;
-                samples=i-samples; // number of samples in these 16 cycles
+            if (cycles > 15) {
+                cycles = 0;
+                samples = i - samples; // number of samples in these 16 cycles
 
                 // TI bits are coming to us lsb first so shift them
                 // right through our 128 bit right shift register
-                shift0 = (shift0>>1) | (shift1 << 31);
-                shift1 = (shift1>>1) | (shift2 << 31);
-                shift2 = (shift2>>1) | (shift3 << 31);
+                shift0 = (shift0 >> 1) | (shift1 << 31);
+                shift1 = (shift1 >> 1) | (shift2 << 31);
+                shift2 = (shift2 >> 1) | (shift3 << 31);
                 shift3 >>= 1;
 
                 // check if the cycles fall close to the number
                 // expected for either the low or high frequency
-                if ( (samples>(sampleslo-threshold)) && (samples<(sampleslo+threshold)) ) {
+                if ((samples > (sampleslo - threshold)) && (samples < (sampleslo + threshold))) {
                     // low frequency represents a 1
-                    shift3 |= (1<<31);
-                } else if ( (samples>(sampleshi-threshold)) && (samples<(sampleshi+threshold)) ) {
+                    shift3 |= (1 << 31);
+                } else if ((samples > (sampleshi - threshold)) && (samples < (sampleshi + threshold))) {
                     // high frequency represents a 0
                 } else {
                     // probably detected a gay waveform or noise
@@ -332,9 +337,9 @@ void ReadTItag(void)
 
                 // if we see 17 zeroes followed by 6 ones, we might have a tag
                 // remember the bits are backwards
-                if ( ((shift0 & 0x7fffff) == 0x7e0000) ) {
+                if (((shift0 & 0x7fffff) == 0x7e0000)) {
                     // if start and end bytes match, we have a tag so break out of the loop
-                    if ( ((shift0>>16)&0xff) == ((shift3>>8)&0xff) ) {
+                    if (((shift0 >> 16) & 0xff) == ((shift3 >> 8) & 0xff)) {
                         cycles = 0xF0B; //use this as a flag (ugly but whatever)
                         break;
                     }
@@ -344,21 +349,21 @@ void ReadTItag(void)
     }
 
     // if flag is set we have a tag
-    if (cycles!=0xF0B) {
+    if (cycles != 0xF0B) {
         DbpString("Info: No valid tag detected.");
     } else {
         // put 64 bit data into shift1 and shift0
-        shift0 = (shift0>>24) | (shift1 << 8);
-        shift1 = (shift1>>24) | (shift2 << 8);
+        shift0 = (shift0 >> 24) | (shift1 << 8);
+        shift1 = (shift1 >> 24) | (shift2 << 8);
 
         // align 16 bit crc into lower half of shift2
-        shift2 = ((shift2>>24) | (shift3 << 8)) & 0x0ffff;
+        shift2 = ((shift2 >> 24) | (shift3 << 8)) & 0x0ffff;
 
         // if r/w tag, check ident match
-        if (shift3 & (1<<15) ) {
+        if (shift3 & (1 << 15)) {
             DbpString("Info: TI tag is rewriteable");
             // only 15 bits compare, last bit of ident is not valid
-            if (((shift3 >> 16) ^ shift0) & 0x7fff ) {
+            if (((shift3 >> 16) ^ shift0) & 0x7fff) {
                 DbpString("Error: Ident mismatch!");
             } else {
                 DbpString("Info: TI tag ident is valid");
@@ -371,19 +376,19 @@ void ReadTItag(void)
         // i'm 99% sure the crc algorithm is correct, but it may need to eat the
         // bytes in reverse or something
         // calculate CRC
-        uint32_t crc=0;
+        uint32_t crc = 0;
 
-        crc = update_crc16(crc, (shift0)&0xff);
-        crc = update_crc16(crc, (shift0>>8)&0xff);
-        crc = update_crc16(crc, (shift0>>16)&0xff);
-        crc = update_crc16(crc, (shift0>>24)&0xff);
-        crc = update_crc16(crc, (shift1)&0xff);
-        crc = update_crc16(crc, (shift1>>8)&0xff);
-        crc = update_crc16(crc, (shift1>>16)&0xff);
-        crc = update_crc16(crc, (shift1>>24)&0xff);
+        crc = update_crc16(crc, (shift0) & 0xff);
+        crc = update_crc16(crc, (shift0 >> 8) & 0xff);
+        crc = update_crc16(crc, (shift0 >> 16) & 0xff);
+        crc = update_crc16(crc, (shift0 >> 24) & 0xff);
+        crc = update_crc16(crc, (shift1) & 0xff);
+        crc = update_crc16(crc, (shift1 >> 8) & 0xff);
+        crc = update_crc16(crc, (shift1 >> 16) & 0xff);
+        crc = update_crc16(crc, (shift1 >> 24) & 0xff);
 
         Dbprintf("Info: Tag data: %x%08x, crc=%x", (unsigned int)shift1, (unsigned int)shift0, (unsigned int)shift2 & 0xFFFF);
-        if (crc != (shift2&0xffff)) {
+        if (crc != (shift2 & 0xffff)) {
             Dbprintf("Error: CRC mismatch, expected %x", (unsigned int)crc);
         } else {
             DbpString("Info: CRC is good");
@@ -397,9 +402,8 @@ void WriteTIbyte(uint8_t b)
     int i = 0;
 
     // modulate 8 bits out to the antenna
-    for (i=0; i<8; i++)
-    {
-        if ( b & ( 1 << i ) ) {
+    for (i = 0; i < 8; i++) {
+        if (b & (1 << i)) {
             // stop modulating antenna 1ms
             LOW(GPIO_SSC_DOUT);
             WaitUS(1000);
@@ -422,7 +426,7 @@ void AcquireTiType(void)
     int i, j, n;
     // tag transmission is <20ms, sampling at 2M gives us 40K samples max
     // each sample is 1 bit stuffed into a uint32_t so we need 1250 uint32_t
-    #define TIBUFLEN 1250
+#define TIBUFLEN 1250
 
     // clear buffer
     uint32_t *buf = (uint32_t *)BigBuf_get_addr();
@@ -483,9 +487,9 @@ void AcquireTiType(void)
     n = TIBUFLEN * 32;
 
     // unpack buffer
-    for (i = TIBUFLEN-1; i >= 0; i--) {
+    for (i = TIBUFLEN - 1; i >= 0; i--) {
         for (j = 0; j < 32; j++) {
-            if(buf[i] & (1 << j)) {
+            if (buf[i] & (1 << j)) {
                 dest[--n] = 1;
             } else {
                 dest[--n] = -1;
@@ -503,15 +507,15 @@ void AcquireTiType(void)
 void WriteTItag(uint32_t idhi, uint32_t idlo, uint16_t crc)
 {
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-    if(crc == 0) {
-        crc = update_crc16(crc, (idlo)&0xff);
-        crc = update_crc16(crc, (idlo>>8)&0xff);
-        crc = update_crc16(crc, (idlo>>16)&0xff);
-        crc = update_crc16(crc, (idlo>>24)&0xff);
-        crc = update_crc16(crc, (idhi)&0xff);
-        crc = update_crc16(crc, (idhi>>8)&0xff);
-        crc = update_crc16(crc, (idhi>>16)&0xff);
-        crc = update_crc16(crc, (idhi>>24)&0xff);
+    if (crc == 0) {
+        crc = update_crc16(crc, (idlo) & 0xff);
+        crc = update_crc16(crc, (idlo >> 8) & 0xff);
+        crc = update_crc16(crc, (idlo >> 16) & 0xff);
+        crc = update_crc16(crc, (idlo >> 24) & 0xff);
+        crc = update_crc16(crc, (idhi) & 0xff);
+        crc = update_crc16(crc, (idhi >> 8) & 0xff);
+        crc = update_crc16(crc, (idhi >> 16) & 0xff);
+        crc = update_crc16(crc, (idhi >> 24) & 0xff);
     }
     Dbprintf("Writing to tag: %x%08x, crc=%x", idhi, idlo, crc);
 
@@ -546,16 +550,16 @@ void WriteTItag(uint32_t idhi, uint32_t idlo, uint16_t crc)
 
     WriteTIbyte(0xbb); // keyword
     WriteTIbyte(0xeb); // password
-    WriteTIbyte( (idlo    )&0xff );
-    WriteTIbyte( (idlo>>8 )&0xff );
-    WriteTIbyte( (idlo>>16)&0xff );
-    WriteTIbyte( (idlo>>24)&0xff );
-    WriteTIbyte( (idhi    )&0xff );
-    WriteTIbyte( (idhi>>8 )&0xff );
-    WriteTIbyte( (idhi>>16)&0xff );
-    WriteTIbyte( (idhi>>24)&0xff ); // data hi to lo
-    WriteTIbyte( (crc     )&0xff ); // crc lo
-    WriteTIbyte( (crc>>8  )&0xff ); // crc hi
+    WriteTIbyte((idlo) & 0xff);
+    WriteTIbyte((idlo >> 8) & 0xff);
+    WriteTIbyte((idlo >> 16) & 0xff);
+    WriteTIbyte((idlo >> 24) & 0xff);
+    WriteTIbyte((idhi) & 0xff);
+    WriteTIbyte((idhi >> 8) & 0xff);
+    WriteTIbyte((idhi >> 16) & 0xff);
+    WriteTIbyte((idhi >> 24) & 0xff); // data hi to lo
+    WriteTIbyte((crc) & 0xff);      // crc lo
+    WriteTIbyte((crc >> 8) & 0xff); // crc hi
     WriteTIbyte(0x00); // write frame lo
     WriteTIbyte(0x03); // write frame hi
     HIGH(GPIO_SSC_DOUT);
@@ -573,7 +577,8 @@ void WriteTItag(uint32_t idhi, uint32_t idlo, uint16_t crc)
 
 // note:   a call to FpgaDownloadAndGo(FPGA_BITSTREAM_LF) must be done before, but
 //  this may destroy the bigbuf so be sure this is called before calling SimulateTagLowFrequencyEx
-void SimulateTagLowFrequencyEx(int period, int gap, int ledcontrol, int numcycles) {
+void SimulateTagLowFrequencyEx(int period, int gap, int ledcontrol, int numcycles)
+{
 
     // start us timer
     StartTicks();
@@ -588,7 +593,7 @@ void SimulateTagLowFrequencyEx(int period, int gap, int ledcontrol, int numcycle
     // set frequency,  get values from 'lf config' command
     sample_config *sc = getSamplingConfig();
 
-    if ( (sc->divisor == 1) || (sc->divisor < 0) || (sc->divisor > 255) )
+    if ((sc->divisor == 1) || (sc->divisor < 0) || (sc->divisor > 255))
         FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 88); //134.8Khz
     else if (sc->divisor == 0)
         FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
@@ -601,10 +606,10 @@ void SimulateTagLowFrequencyEx(int period, int gap, int ledcontrol, int numcycle
 
     uint8_t check = 1;
 
-    for(;;) {
+    for (;;) {
 
-        if ( numcycles > -1 ) {
-            if ( x != numcycles ) {
+        if (numcycles > -1) {
+            if (x != numcycles) {
                 ++x;
             } else {
                 // exit without turning of field
@@ -618,8 +623,8 @@ void SimulateTagLowFrequencyEx(int period, int gap, int ledcontrol, int numcycle
         // used as a simple detection of a reader field?
         while (!(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_CLK)) {
             WDT_HIT();
-            if ( !check ) {
-                if ( usb_poll_validate_length() || BUTTON_PRESS() )
+            if (!check) {
+                if (usb_poll_validate_length() || BUTTON_PRESS())
                     goto OUT;
             }
             ++check;
@@ -633,8 +638,8 @@ void SimulateTagLowFrequencyEx(int period, int gap, int ledcontrol, int numcycle
         //wait until SSC_CLK goes LOW
         while (AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_CLK) {
             WDT_HIT();
-            if ( !check ) {
-                if ( usb_poll_validate_length() || BUTTON_PRESS() )
+            if (!check) {
+                if (usb_poll_validate_length() || BUTTON_PRESS())
                     goto OUT;
             }
             ++check;
@@ -657,7 +662,8 @@ OUT:
     LED_D_OFF();
 }
 
-void SimulateTagLowFrequency(int period, int gap, int ledcontrol) {
+void SimulateTagLowFrequency(int period, int gap, int ledcontrol)
+{
     SimulateTagLowFrequencyEx(period, gap, ledcontrol, -1);
 }
 
@@ -689,7 +695,7 @@ static void fc(int c, int *n)
 
     // an fc/8  encoded bit is a bit pattern of  11110000  x6 = 48 samples
     if (c == 8) {
-        for (idx=0; idx < 6; idx++) {
+        for (idx = 0; idx < 6; idx++) {
             dest[((*n)++)] = 1;
             dest[((*n)++)] = 1;
             dest[((*n)++)] = 1;
@@ -720,11 +726,16 @@ static void fc(int c, int *n)
 
 // special start of frame marker containing invalid bit sequences
 // this one is focused on HID,  with manchester encoding.
-static void fcSTT(int *n) {
-    fc(8,  n); fc(8,  n); // invalid
-    fc(8,  n); fc(10, n); // logical 0
-    fc(10, n); fc(10, n); // invalid
-    fc(8,  n); fc(10, n); // logical 0
+static void fcSTT(int *n)
+{
+    fc(8,  n);
+    fc(8,  n); // invalid
+    fc(8,  n);
+    fc(10, n); // logical 0
+    fc(10, n);
+    fc(10, n); // invalid
+    fc(8,  n);
+    fc(10, n); // logical 0
 }
 
 // compose fc/X fc/Y waveform (FSKx)
@@ -732,28 +743,28 @@ static void fcAll(uint8_t fc, int *n, uint8_t clock, uint16_t *modCnt)
 {
     uint8_t *dest = BigBuf_get_addr();
     uint8_t halfFC = fc >> 1;
-    uint8_t wavesPerClock = clock/fc;
+    uint8_t wavesPerClock = clock / fc;
     uint8_t mod = clock % fc;    //modifier
-    uint8_t modAdj = fc/mod;     //how often to apply modifier
+    uint8_t modAdj = fc / mod;   //how often to apply modifier
     bool modAdjOk = !(fc % mod); //if (fc % mod==0) modAdjOk = true;
 
     // loop through clock - step field clock
-    for (uint8_t idx=0; idx < wavesPerClock; idx++){
+    for (uint8_t idx = 0; idx < wavesPerClock; idx++) {
         // put 1/2 FC length 1's and 1/2 0's per field clock wave (to create the wave)
         memset(dest + (*n), 0, fc - halfFC);  //in case of odd number use extra here
         memset(dest + (*n) + (fc - halfFC), 1, halfFC);
         *n += fc;
     }
-    if (mod > 0) (*modCnt)++;
+    if (mod > 0)(*modCnt)++;
 
-    if ((mod > 0) && modAdjOk){  //fsk2
-        if ((*modCnt % modAdj) == 0){ //if 4th 8 length wave in a rf/50 add extra 8 length wave
+    if ((mod > 0) && modAdjOk) { //fsk2
+        if ((*modCnt % modAdj) == 0) { //if 4th 8 length wave in a rf/50 add extra 8 length wave
             memset(dest + (*n), 0, fc - halfFC);
-            memset(dest + (*n) + ( fc - halfFC), 1, halfFC);
+            memset(dest + (*n) + (fc - halfFC), 1, halfFC);
             *n += fc;
         }
     }
-    if (mod > 0 && !modAdjOk){  //fsk1
+    if (mod > 0 && !modAdjOk) { //fsk1
         memset(dest + (*n), 0, mod - (mod >> 1));
         memset(dest + (*n) + (mod - (mod >> 1)), 1, mod >> 1);
         *n += mod;
@@ -762,7 +773,8 @@ static void fcAll(uint8_t fc, int *n, uint8_t clock, uint16_t *modCnt)
 
 // prepare a waveform pattern in the buffer based on the ID given then
 // simulate a HID tag until the button is pressed
-void CmdHIDsimTAGEx( uint32_t hi, uint32_t lo, int ledcontrol, int numcycles) {
+void CmdHIDsimTAGEx(uint32_t hi, uint32_t lo, int ledcontrol, int numcycles)
+{
 
     if (hi > 0xFFF) {
         DbpString("[!] tags can only have 44 bits. - USE lf simfsk for larger tags");
@@ -798,9 +810,11 @@ void CmdHIDsimTAGEx( uint32_t hi, uint32_t lo, int ledcontrol, int numcycles) {
         if ((i % 4) == 3) fc(0, &n);
 
         if ((hi >> i) & 1) {
-            fc(10, &n); fc(8,  &n); // low-high transition
+            fc(10, &n);
+            fc(8,  &n); // low-high transition
         } else {
-            fc(8,  &n); fc(10, &n); // high-low transition
+            fc(8,  &n);
+            fc(10, &n); // high-low transition
         }
     }
 
@@ -809,10 +823,12 @@ void CmdHIDsimTAGEx( uint32_t hi, uint32_t lo, int ledcontrol, int numcycles) {
 
         if ((i % 4) == 3) fc(0, &n);
 
-        if (( lo >> i ) & 1) {
-            fc(10, &n); fc(8,  &n); // low-high transition
+        if ((lo >> i) & 1) {
+            fc(10, &n);
+            fc(8,  &n); // low-high transition
         } else {
-            fc(8,  &n); fc(10, &n); // high-low transition
+            fc(8,  &n);
+            fc(10, &n); // high-low transition
         }
     }
 
@@ -821,19 +837,22 @@ void CmdHIDsimTAGEx( uint32_t hi, uint32_t lo, int ledcontrol, int numcycles) {
     if (ledcontrol) LED_A_OFF();
 }
 
-void CmdHIDsimTAG( uint32_t hi, uint32_t lo, int ledcontrol) {
-    CmdHIDsimTAGEx( hi, lo, ledcontrol, -1);
+void CmdHIDsimTAG(uint32_t hi, uint32_t lo, int ledcontrol)
+{
+    CmdHIDsimTAGEx(hi, lo, ledcontrol, -1);
     DbpString("[!] simulation finished");
 }
 
 // prepare a waveform pattern in the buffer based on the ID given then
 // simulate a FSK tag until the button is pressed
 // arg1 contains fcHigh and fcLow, arg2 contains STT marker and clock
-void CmdFSKsimTAG(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *bits) {
+void CmdFSKsimTAG(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *bits)
+{
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
 
     // free eventually allocated BigBuf memory
-    BigBuf_free(); BigBuf_Clear_ext(false);
+    BigBuf_free();
+    BigBuf_Clear_ext(false);
     clear_trace();
     set_tracing(false);
 
@@ -844,12 +863,12 @@ void CmdFSKsimTAG(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *bits) {
     uint8_t clk = arg2 & 0xFF;
     uint8_t stt = (arg2 >> 8) & 1;
 
-    if ( stt ) {
+    if (stt) {
         //int fsktype = ( fcHigh == 8 && fcLow == 5) ? 1 : 2;
         //fcSTT(&n);
     }
 
-    for (i=0; i<size; i++){
+    for (i = 0; i < size; i++) {
         if (bits[i])
             fcAll(fcLow, &n, clk, &modCnt);
         else
@@ -869,13 +888,13 @@ void CmdFSKsimTAG(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *bits) {
 static void askSimBit(uint8_t c, int *n, uint8_t clock, uint8_t manchester)
 {
     uint8_t *dest = BigBuf_get_addr();
-    uint8_t halfClk = clock/2;
+    uint8_t halfClk = clock / 2;
     // c = current bit 1 or 0
-    if (manchester==1){
-        memset(dest+(*n), c, halfClk);
-        memset(dest+(*n) + halfClk, c^1, halfClk);
+    if (manchester == 1) {
+        memset(dest + (*n), c, halfClk);
+        memset(dest + (*n) + halfClk, c ^ 1, halfClk);
     } else {
-        memset(dest+(*n), c, clock);
+        memset(dest + (*n), c, clock);
     }
     *n += clock;
 }
@@ -883,27 +902,28 @@ static void askSimBit(uint8_t c, int *n, uint8_t clock, uint8_t manchester)
 static void biphaseSimBit(uint8_t c, int *n, uint8_t clock, uint8_t *phase)
 {
     uint8_t *dest = BigBuf_get_addr();
-    uint8_t halfClk = clock/2;
-    if (c){
-        memset(dest+(*n), c ^ 1 ^ *phase, halfClk);
-        memset(dest+(*n) + halfClk, c ^ *phase, halfClk);
+    uint8_t halfClk = clock / 2;
+    if (c) {
+        memset(dest + (*n), c ^ 1 ^ *phase, halfClk);
+        memset(dest + (*n) + halfClk, c ^ *phase, halfClk);
     } else {
-        memset(dest+(*n), c ^ *phase, clock);
+        memset(dest + (*n), c ^ *phase, clock);
         *phase ^= 1;
     }
     *n += clock;
 }
 
-static void stAskSimBit(int *n, uint8_t clock) {
+static void stAskSimBit(int *n, uint8_t clock)
+{
     uint8_t *dest = BigBuf_get_addr();
-    uint8_t halfClk = clock/2;
+    uint8_t halfClk = clock / 2;
     //ST = .5 high .5 low 1.5 high .5 low 1 high
-    memset(dest+(*n), 1, halfClk);
-    memset(dest+(*n) + halfClk, 0, halfClk);
-    memset(dest+(*n) + clock, 1, clock + halfClk);
-    memset(dest+(*n) + clock*2 + halfClk, 0, halfClk);
-    memset(dest+(*n) + clock*3, 1, clock);
-    *n += clock*4;
+    memset(dest + (*n), 1, halfClk);
+    memset(dest + (*n) + halfClk, 0, halfClk);
+    memset(dest + (*n) + clock, 1, clock + halfClk);
+    memset(dest + (*n) + clock * 2 + halfClk, 0, halfClk);
+    memset(dest + (*n) + clock * 3, 1, clock);
+    *n += clock * 4;
 }
 
 // args clock, ask/man or askraw, invert, transmission separator
@@ -918,34 +938,34 @@ void CmdASKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream)
     uint8_t separator = arg2 & 1;
     uint8_t invert = (arg2 >> 8) & 1;
 
-    if (encoding == 2){  //biphase
+    if (encoding == 2) { //biphase
         uint8_t phase = 0;
-        for (i=0; i<size; i++){
+        for (i = 0; i < size; i++) {
             biphaseSimBit(BitStream[i]^invert, &n, clk, &phase);
         }
         if (phase == 1) { //run a second set inverted to keep phase in check
-            for (i=0; i<size; i++){
+            for (i = 0; i < size; i++) {
                 biphaseSimBit(BitStream[i]^invert, &n, clk, &phase);
             }
         }
     } else {  // ask/manchester || ask/raw
-        for (i=0; i<size; i++){
+        for (i = 0; i < size; i++) {
             askSimBit(BitStream[i]^invert, &n, clk, encoding);
         }
-        if (encoding==0 && BitStream[0]==BitStream[size-1]){ //run a second set inverted (for ask/raw || biphase phase)
-            for (i=0; i<size; i++){
-                askSimBit(BitStream[i]^invert^1, &n, clk, encoding);
+        if (encoding == 0 && BitStream[0] == BitStream[size - 1]) { //run a second set inverted (for ask/raw || biphase phase)
+            for (i = 0; i < size; i++) {
+                askSimBit(BitStream[i]^invert ^ 1, &n, clk, encoding);
             }
         }
     }
-    if (separator==1 && encoding == 1)
+    if (separator == 1 && encoding == 1)
         stAskSimBit(&n, clk);
-    else if (separator==1)
+    else if (separator == 1)
         Dbprintf("sorry but separator option not yet available");
 
     WDT_HIT();
 
-    Dbprintf("Simulating with clk: %d, invert: %d, encoding: %d, separator: %d, n: %d",clk, invert, encoding, separator, n);
+    Dbprintf("Simulating with clk: %d, invert: %d, encoding: %d, separator: %d, n: %d", clk, invert, encoding, separator, n);
 
     if (ledcontrol) LED_A_ON();
     SimulateTagLowFrequency(n, 0, ledcontrol);
@@ -956,21 +976,21 @@ void CmdASKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream)
 static void pskSimBit(uint8_t waveLen, int *n, uint8_t clk, uint8_t *curPhase, bool phaseChg)
 {
     uint8_t *dest = BigBuf_get_addr();
-    uint8_t halfWave = waveLen/2;
+    uint8_t halfWave = waveLen / 2;
     //uint8_t idx;
     int i = 0;
-    if (phaseChg){
+    if (phaseChg) {
         // write phase change
-        memset(dest+(*n), *curPhase^1, halfWave);
-        memset(dest+(*n) + halfWave, *curPhase, halfWave);
+        memset(dest + (*n), *curPhase ^ 1, halfWave);
+        memset(dest + (*n) + halfWave, *curPhase, halfWave);
         *n += waveLen;
         *curPhase ^= 1;
         i += waveLen;
     }
     //write each normal clock wave for the clock duration
-    for (; i < clk; i+=waveLen){
-        memset(dest+(*n), *curPhase, halfWave);
-        memset(dest+(*n) + halfWave, *curPhase^1, halfWave);
+    for (; i < clk; i += waveLen) {
+        memset(dest + (*n), *curPhase, halfWave);
+        memset(dest + (*n) + halfWave, *curPhase ^ 1, halfWave);
         *n += waveLen;
     }
 }
@@ -986,8 +1006,8 @@ void CmdPSKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream)
     uint8_t carrier = arg1 & 0xFF;
     uint8_t invert = arg2 & 0xFF;
     uint8_t curPhase = 0;
-    for (i=0; i<size; i++){
-        if (BitStream[i] == curPhase){
+    for (i = 0; i < size; i++) {
+        if (BitStream[i] == curPhase) {
             pskSimBit(carrier, &n, clk, &curPhase, false);
         } else {
             pskSimBit(carrier, &n, clk, &curPhase, true);
@@ -996,7 +1016,7 @@ void CmdPSKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream)
 
     WDT_HIT();
 
-    Dbprintf("Simulating with Carrier: %d, clk: %d, invert: %d, n: %d",carrier, clk, invert, n);
+    Dbprintf("Simulating with Carrier: %d, clk: %d, invert: %d, n: %d", carrier, clk, invert, n);
 
     if (ledcontrol) LED_A_ON();
     SimulateTagLowFrequency(n, 0, ledcontrol);
@@ -1004,7 +1024,8 @@ void CmdPSKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream)
 }
 
 // loop to get raw HID waveform then FSK demodulate the TAG ID from it
-void CmdHIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol) {
+void CmdHIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol)
+{
     uint8_t *dest = BigBuf_get_addr();
     size_t size = 0;
     uint32_t hi2 = 0, hi = 0, lo = 0;
@@ -1016,64 +1037,63 @@ void CmdHIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol)
     //clear read buffer
     BigBuf_Clear_keep_EM();
 
-    while( !BUTTON_PRESS() && !usb_poll_validate_length()) {
+    while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
 
         WDT_HIT();
         if (ledcontrol) LED_A_ON();
 
         DoAcquisition_default(-1, true);
         // FSK demodulator
-        size = 50*128*2; //big enough to catch 2 sequences of largest format
+        size = 50 * 128 * 2; //big enough to catch 2 sequences of largest format
         idx = HIDdemodFSK(dest, &size, &hi2, &hi, &lo, &dummyIdx);
-        if ( idx < 0 ) continue;
+        if (idx < 0) continue;
 
-        if (idx > 0 && lo > 0 && (size == 96 || size == 192)){
+        if (idx > 0 && lo > 0 && (size == 96 || size == 192)) {
             // go over previously decoded manchester data and decode into usable tag ID
-            if (hi2 != 0){ //extra large HID tags  88/192 bits
+            if (hi2 != 0) { //extra large HID tags  88/192 bits
                 Dbprintf("TAG ID: %x%08x%08x (%d)",
-                    hi2,
-                    hi,
-                    lo,
-                    (lo >> 1) & 0xFFFF
-                );
+                         hi2,
+                         hi,
+                         lo,
+                         (lo >> 1) & 0xFFFF
+                        );
             } else {  //standard HID tags 44/96 bits
                 uint8_t bitlen = 0;
                 uint32_t fc = 0;
                 uint32_t cardnum = 0;
 
-                if (((hi >> 5) & 1) == 1){//if bit 38 is set then < 37 bit format is used
+                if (((hi >> 5) & 1) == 1) { //if bit 38 is set then < 37 bit format is used
                     uint32_t lo2 = 0;
-                    lo2=(((hi & 31) << 12) | (lo>>20)); //get bits 21-37 to check for format len bit
+                    lo2 = (((hi & 31) << 12) | (lo >> 20)); //get bits 21-37 to check for format len bit
                     uint8_t idx3 = 1;
-                    while (lo2 > 1){ //find last bit set to 1 (format len bit)
+                    while (lo2 > 1) { //find last bit set to 1 (format len bit)
                         lo2 >>= 1;
                         idx3++;
                     }
                     bitlen = idx3 + 19;
                     fc = 0;
                     cardnum = 0;
-                    if (bitlen == 26){
+                    if (bitlen == 26) {
                         cardnum = (lo >> 1) & 0xFFFF;
                         fc = (lo >> 17) & 0xFF;
                     }
-                    if (bitlen == 37){
-                        cardnum = (lo >> 1 ) & 0x7FFFF;
+                    if (bitlen == 37) {
+                        cardnum = (lo >> 1) & 0x7FFFF;
                         fc = ((hi & 0xF) << 12) | (lo >> 20);
                     }
-                    if (bitlen == 34){
+                    if (bitlen == 34) {
                         cardnum = (lo >> 1) & 0xFFFF;
                         fc = ((hi & 1) << 15) | (lo >> 17);
                     }
-                    if (bitlen == 35){
+                    if (bitlen == 35) {
                         cardnum = (lo >> 1) & 0xFFFFF;
-                        fc = ((hi & 1) << 11)|(lo >> 21);
+                        fc = ((hi & 1) << 11) | (lo >> 21);
                     }
-                }
-                else { //if bit 38 is not set then 37 bit format is used
-                    bitlen= 37;
+                } else { //if bit 38 is not set then 37 bit format is used
+                    bitlen = 37;
                     fc = 0;
                     cardnum = 0;
-                    if (bitlen == 37){
+                    if (bitlen == 37) {
                         cardnum = (lo >> 1) & 0x7FFFF;
                         fc = ((hi & 0xF) << 12) | (lo >> 20);
                     }
@@ -1085,9 +1105,9 @@ void CmdHIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol)
                          bitlen,
                          fc,
                          cardnum
-                    );
+                        );
             }
-            if (findone){
+            if (findone) {
                 *high = hi;
                 *low = lo;
                 break;
@@ -1102,7 +1122,8 @@ void CmdHIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol)
 }
 
 // loop to get raw HID waveform then FSK demodulate the TAG ID from it
-void CmdAWIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol) {
+void CmdAWIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol)
+{
 
     uint8_t *dest = BigBuf_get_addr();
 
@@ -1140,11 +1161,11 @@ void CmdAWIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol)
         // (26 bit format shown)
 
         //get raw ID before removing parities
-        uint32_t rawLo = bytebits_to_byte(dest+idx+64, 32);
-        uint32_t rawHi = bytebits_to_byte(dest+idx+32, 32);
-        uint32_t rawHi2 = bytebits_to_byte(dest+idx, 32);
+        uint32_t rawLo = bytebits_to_byte(dest + idx + 64, 32);
+        uint32_t rawHi = bytebits_to_byte(dest + idx + 32, 32);
+        uint32_t rawHi2 = bytebits_to_byte(dest + idx, 32);
 
-        size = removeParity(dest, idx+8, 4, 1, 88);
+        size = removeParity(dest, idx + 8, 4, 1, 88);
         if (size != 66) continue;
         // ok valid card found!
 
@@ -1166,23 +1187,23 @@ void CmdAWIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol)
         uint32_t code1 = 0;
         uint32_t code2 = 0;
         uint8_t fmtLen = bytebits_to_byte(dest, 8);
-        if (fmtLen == 26){
-            fc = bytebits_to_byte(dest+9, 8);
-            cardnum = bytebits_to_byte(dest+17, 16);
-            code1 = bytebits_to_byte(dest+8, fmtLen);
+        if (fmtLen == 26) {
+            fc = bytebits_to_byte(dest + 9, 8);
+            cardnum = bytebits_to_byte(dest + 17, 16);
+            code1 = bytebits_to_byte(dest + 8, fmtLen);
             Dbprintf("AWID Found - BitLength: %d, FC: %d, Card: %d - Wiegand: %x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, rawHi2, rawHi, rawLo);
         } else {
-            cardnum = bytebits_to_byte(dest+8+(fmtLen-17), 16);
-            if (fmtLen > 32){
-                code1 = bytebits_to_byte(dest+8, fmtLen-32);
-                code2 = bytebits_to_byte(dest+8+(fmtLen-32), 32);
+            cardnum = bytebits_to_byte(dest + 8 + (fmtLen - 17), 16);
+            if (fmtLen > 32) {
+                code1 = bytebits_to_byte(dest + 8, fmtLen - 32);
+                code2 = bytebits_to_byte(dest + 8 + (fmtLen - 32), 32);
                 Dbprintf("AWID Found - BitLength: %d -unknown BitLength- (%d) - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, cardnum, code1, code2, rawHi2, rawHi, rawLo);
-            } else{
-                code1 = bytebits_to_byte(dest+8, fmtLen);
+            } else {
+                code1 = bytebits_to_byte(dest + 8, fmtLen);
                 Dbprintf("AWID Found - BitLength: %d -unknown BitLength- (%d) - Wiegand: %x, Raw: %08x%08x%08x", fmtLen, cardnum, code1, rawHi2, rawHi, rawLo);
             }
         }
-        if (findone){
+        if (findone) {
             if (ledcontrol) LED_A_OFF();
             *high = rawHi;
             *low = rawLo;
@@ -1197,7 +1218,8 @@ void CmdAWIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol)
     if (ledcontrol) LED_A_OFF();
 }
 
-void CmdEM410xdemod(int findone, uint32_t *high, uint64_t *low, int ledcontrol) {
+void CmdEM410xdemod(int findone, uint32_t *high, uint64_t *low, int ledcontrol)
+{
     uint8_t *dest = BigBuf_get_addr();
 
     size_t size = 0, idx = 0;
@@ -1209,7 +1231,7 @@ void CmdEM410xdemod(int findone, uint32_t *high, uint64_t *low, int ledcontrol)
 
     LFSetupFPGAForADC(95, true);
 
-    while(!BUTTON_PRESS() && !usb_poll_validate_length()) {
+    while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
 
         WDT_HIT();
         if (ledcontrol) LED_A_ON();
@@ -1224,26 +1246,26 @@ void CmdEM410xdemod(int findone, uint32_t *high, uint64_t *low, int ledcontrol)
 
         if (errCnt < 0) continue;
 
-            errCnt = Em410xDecode(dest, &size, &idx, &hi, &lo);
-            if (errCnt == 1){
-                if (size == 128){
-                    Dbprintf("EM XL TAG ID: %06x%08x%08x - (%05d_%03d_%08d)",
-                      hi,
-                      (uint32_t)(lo >> 32),
-                      (uint32_t)lo,
-                      (uint32_t)(lo & 0xFFFF),
-                      (uint32_t)((lo >> 16LL) & 0xFF),
-                      (uint32_t)(lo & 0xFFFFFF));
-                } else {
-                    Dbprintf("EM TAG ID: %02x%08x - (%05d_%03d_%08d)",
-                      (uint32_t)(lo >> 32),
-                      (uint32_t)lo,
-                      (uint32_t)(lo & 0xFFFF),
-                      (uint32_t)((lo >> 16LL) & 0xFF),
-                      (uint32_t)(lo & 0xFFFFFF));
-                }
+        errCnt = Em410xDecode(dest, &size, &idx, &hi, &lo);
+        if (errCnt == 1) {
+            if (size == 128) {
+                Dbprintf("EM XL TAG ID: %06x%08x%08x - (%05d_%03d_%08d)",
+                         hi,
+                         (uint32_t)(lo >> 32),
+                         (uint32_t)lo,
+                         (uint32_t)(lo & 0xFFFF),
+                         (uint32_t)((lo >> 16LL) & 0xFF),
+                         (uint32_t)(lo & 0xFFFFFF));
+            } else {
+                Dbprintf("EM TAG ID: %02x%08x - (%05d_%03d_%08d)",
+                         (uint32_t)(lo >> 32),
+                         (uint32_t)lo,
+                         (uint32_t)(lo & 0xFFFF),
+                         (uint32_t)((lo >> 16LL) & 0xFF),
+                         (uint32_t)(lo & 0xFFFFFF));
+            }
 
-            if (findone){
+            if (findone) {
                 if (ledcontrol) LED_A_OFF();
                 *high = hi;
                 *low = lo;
@@ -1259,7 +1281,8 @@ void CmdEM410xdemod(int findone, uint32_t *high, uint64_t *low, int ledcontrol)
     if (ledcontrol) LED_A_OFF();
 }
 
-void CmdIOdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol) {
+void CmdIOdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol)
+{
 
     uint8_t *dest = BigBuf_get_addr();
 
@@ -1285,61 +1308,61 @@ void CmdIOdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol) {
         WDT_HIT();
         idx = detectIOProx(dest, &size, &dummyIdx);
         if (idx < 0) continue;
-            //valid tag found
+        //valid tag found
 
-            //Index map
-            //0           10          20          30          40          50          60
-            //|           |           |           |           |           |           |
-            //01234567 8 90123456 7 89012345 6 78901234 5 67890123 4 56789012 3 45678901 23
-            //-----------------------------------------------------------------------------
-            //00000000 0 11110000 1 facility 1 version* 1 code*one 1 code*two 1 checksum 11
-            //
-            //Checksum:
-            //00000000 0 11110000 1 11100000 1 00000001 1 00000011 1 10110110 1 01110101 11
-            //preamble      F0         E0         01         03         B6         75
-            // How to calc checksum,
-            // http://www.proxmark.org/forum/viewtopic.php?id=364&p=6
-            //   F0 + E0 + 01 + 03 + B6 = 28A
-            //   28A & FF = 8A
-            //   FF - 8A = 75
-            // Checksum: 0x75
-            //XSF(version)facility:codeone+codetwo
-            //Handle the data
-            // if(findone){ //only print binary if we are doing one
-                // Dbprintf("%d%d%d%d%d%d%d%d %d",dest[idx],   dest[idx+1],   dest[idx+2],dest[idx+3],dest[idx+4],dest[idx+5],dest[idx+6],dest[idx+7],dest[idx+8]);
-                // Dbprintf("%d%d%d%d%d%d%d%d %d",dest[idx+9], dest[idx+10],dest[idx+11],dest[idx+12],dest[idx+13],dest[idx+14],dest[idx+15],dest[idx+16],dest[idx+17]);
-                // Dbprintf("%d%d%d%d%d%d%d%d %d",dest[idx+18],dest[idx+19],dest[idx+20],dest[idx+21],dest[idx+22],dest[idx+23],dest[idx+24],dest[idx+25],dest[idx+26]);
-                // Dbprintf("%d%d%d%d%d%d%d%d %d",dest[idx+27],dest[idx+28],dest[idx+29],dest[idx+30],dest[idx+31],dest[idx+32],dest[idx+33],dest[idx+34],dest[idx+35]);
-                // Dbprintf("%d%d%d%d%d%d%d%d %d",dest[idx+36],dest[idx+37],dest[idx+38],dest[idx+39],dest[idx+40],dest[idx+41],dest[idx+42],dest[idx+43],dest[idx+44]);
-                // Dbprintf("%d%d%d%d%d%d%d%d %d",dest[idx+45],dest[idx+46],dest[idx+47],dest[idx+48],dest[idx+49],dest[idx+50],dest[idx+51],dest[idx+52],dest[idx+53]);
-                // Dbprintf("%d%d%d%d%d%d%d%d %d%d",dest[idx+54],dest[idx+55],dest[idx+56],dest[idx+57],dest[idx+58],dest[idx+59],dest[idx+60],dest[idx+61],dest[idx+62],dest[idx+63]);
-            // }
-            code = bytebits_to_byte(dest+idx, 32);
-            code2 = bytebits_to_byte(dest+idx+32, 32);
-            version = bytebits_to_byte(dest+idx+27, 8); //14,4
-            facilitycode = bytebits_to_byte(dest+idx+18, 8);
-            number = (bytebits_to_byte(dest+idx+36, 8) << 8) | (bytebits_to_byte(dest+idx+45, 8)); //36,9
+        //Index map
+        //0           10          20          30          40          50          60
+        //|           |           |           |           |           |           |
+        //01234567 8 90123456 7 89012345 6 78901234 5 67890123 4 56789012 3 45678901 23
+        //-----------------------------------------------------------------------------
+        //00000000 0 11110000 1 facility 1 version* 1 code*one 1 code*two 1 checksum 11
+        //
+        //Checksum:
+        //00000000 0 11110000 1 11100000 1 00000001 1 00000011 1 10110110 1 01110101 11
+        //preamble      F0         E0         01         03         B6         75
+        // How to calc checksum,
+        // http://www.proxmark.org/forum/viewtopic.php?id=364&p=6
+        //   F0 + E0 + 01 + 03 + B6 = 28A
+        //   28A & FF = 8A
+        //   FF - 8A = 75
+        // Checksum: 0x75
+        //XSF(version)facility:codeone+codetwo
+        //Handle the data
+        // if(findone){ //only print binary if we are doing one
+        // Dbprintf("%d%d%d%d%d%d%d%d %d",dest[idx],   dest[idx+1],   dest[idx+2],dest[idx+3],dest[idx+4],dest[idx+5],dest[idx+6],dest[idx+7],dest[idx+8]);
+        // Dbprintf("%d%d%d%d%d%d%d%d %d",dest[idx+9], dest[idx+10],dest[idx+11],dest[idx+12],dest[idx+13],dest[idx+14],dest[idx+15],dest[idx+16],dest[idx+17]);
+        // Dbprintf("%d%d%d%d%d%d%d%d %d",dest[idx+18],dest[idx+19],dest[idx+20],dest[idx+21],dest[idx+22],dest[idx+23],dest[idx+24],dest[idx+25],dest[idx+26]);
+        // Dbprintf("%d%d%d%d%d%d%d%d %d",dest[idx+27],dest[idx+28],dest[idx+29],dest[idx+30],dest[idx+31],dest[idx+32],dest[idx+33],dest[idx+34],dest[idx+35]);
+        // Dbprintf("%d%d%d%d%d%d%d%d %d",dest[idx+36],dest[idx+37],dest[idx+38],dest[idx+39],dest[idx+40],dest[idx+41],dest[idx+42],dest[idx+43],dest[idx+44]);
+        // Dbprintf("%d%d%d%d%d%d%d%d %d",dest[idx+45],dest[idx+46],dest[idx+47],dest[idx+48],dest[idx+49],dest[idx+50],dest[idx+51],dest[idx+52],dest[idx+53]);
+        // Dbprintf("%d%d%d%d%d%d%d%d %d%d",dest[idx+54],dest[idx+55],dest[idx+56],dest[idx+57],dest[idx+58],dest[idx+59],dest[idx+60],dest[idx+61],dest[idx+62],dest[idx+63]);
+        // }
+        code = bytebits_to_byte(dest + idx, 32);
+        code2 = bytebits_to_byte(dest + idx + 32, 32);
+        version = bytebits_to_byte(dest + idx + 27, 8); //14,4
+        facilitycode = bytebits_to_byte(dest + idx + 18, 8);
+        number = (bytebits_to_byte(dest + idx + 36, 8) << 8) | (bytebits_to_byte(dest + idx + 45, 8)); //36,9
 
-            crc = bytebits_to_byte(dest+idx+54, 8);
-            for (uint8_t i=1; i<6; ++i)
-                calccrc += bytebits_to_byte(dest+idx+9*i, 8);
-            calccrc &= 0xff;
-            calccrc = 0xff - calccrc;
+        crc = bytebits_to_byte(dest + idx + 54, 8);
+        for (uint8_t i = 1; i < 6; ++i)
+            calccrc += bytebits_to_byte(dest + idx + 9 * i, 8);
+        calccrc &= 0xff;
+        calccrc = 0xff - calccrc;
 
-            char *crcStr = (crc == calccrc) ? "ok" : "!crc";
+        char *crcStr = (crc == calccrc) ? "ok" : "!crc";
 
-            Dbprintf("IO Prox XSF(%02d)%02x:%05d (%08x%08x)  [%02x %s]", version, facilitycode, number, code, code2, crc, crcStr);
-            // if we're only looking for one tag
-            if (findone){
-                if (ledcontrol) LED_A_OFF();
-                *high = code;
-                *low = code2;
-                break;
-            }
-            code = code2 = 0;
-            version = facilitycode = 0;
-            number = 0;
-            idx = 0;
+        Dbprintf("IO Prox XSF(%02d)%02x:%05d (%08x%08x)  [%02x %s]", version, facilitycode, number, code, code2, crc, crcStr);
+        // if we're only looking for one tag
+        if (findone) {
+            if (ledcontrol) LED_A_OFF();
+            *high = code;
+            *low = code2;
+            break;
+        }
+        code = code2 = 0;
+        version = facilitycode = 0;
+        number = 0;
+        idx = 0;
 
         WDT_HIT();
     }
@@ -1359,20 +1382,23 @@ void CmdIOdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol) {
  * Q5 tags seems to have issues when these values changes.
  */
 
-void TurnReadLFOn(uint32_t delay) {
+void TurnReadLFOn(uint32_t delay)
+{
     FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | FPGA_LF_ADC_READER_FIELD);
 
     // measure antenna strength.
     //int adcval = ((MAX_ADC_LF_VOLTAGE * AvgAdc(ADC_CHAN_LF)) >> 10);
     WaitUS(delay);
 }
-void TurnReadLF_off(uint32_t delay) {
+void TurnReadLF_off(uint32_t delay)
+{
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     WaitUS(delay);
 }
 
 // Write one bit to card
-void T55xxWriteBit(int bit) {
+void T55xxWriteBit(int bit)
+{
     if (!bit)
         TurnReadLFOn(t_config.write_0);
     else
@@ -1382,7 +1408,8 @@ void T55xxWriteBit(int bit) {
 }
 
 // Send T5577 reset command then read stream (see if we can identify the start of the stream)
-void T55xxResetRead(void) {
+void T55xxResetRead(void)
+{
     LED_A_ON();
     //clear buffer now so it does not interfere with timing later
     BigBuf_Clear_keep_EM();
@@ -1409,15 +1436,16 @@ void T55xxResetRead(void) {
 
     // Turn the field off
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); // field off
-    cmd_send(CMD_ACK,0,0,0,0,0);
+    cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
     LED_A_OFF();
 }
 
 // Write one card block in page 0, no lock
-void T55xxWriteBlockExt(uint32_t Data, uint8_t Block, uint32_t Pwd, uint8_t arg) {
+void T55xxWriteBlockExt(uint32_t Data, uint8_t Block, uint32_t Pwd, uint8_t arg)
+{
     LED_A_ON();
     bool PwdMode = arg & 0x1;
-    uint8_t Page = (arg & 0x2)>>1;
+    uint8_t Page = (arg & 0x2) >> 1;
     bool testMode = arg & 0x4;
     uint32_t i = 0;
 
@@ -1437,7 +1465,7 @@ void T55xxWriteBlockExt(uint32_t Data, uint8_t Block, uint32_t Pwd, uint8_t arg)
     T55xxWriteBit(testMode ? 0 : 1);
     T55xxWriteBit(testMode ? 1 : Page); //Page 0
 
-    if (PwdMode){
+    if (PwdMode) {
         // Send Pwd
         for (i = 0x80000000; i != 0; i >>= 1)
             T55xxWriteBit(Pwd & i);
@@ -1488,16 +1516,18 @@ void T55xxWriteBlockExt(uint32_t Data, uint8_t Block, uint32_t Pwd, uint8_t arg)
 }
 
 // Write one card block in page 0, no lock
-void T55xxWriteBlock(uint32_t Data, uint8_t Block, uint32_t Pwd, uint8_t arg) {
+void T55xxWriteBlock(uint32_t Data, uint8_t Block, uint32_t Pwd, uint8_t arg)
+{
     T55xxWriteBlockExt(Data, Block, Pwd, arg);
-    cmd_send(CMD_ACK,0,0,0,0,0);
+    cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
 }
 
 // Read one card block in page [page]
-void T55xxReadBlock(uint16_t arg0, uint8_t Block, uint32_t Pwd) {
+void T55xxReadBlock(uint16_t arg0, uint8_t Block, uint32_t Pwd)
+{
     LED_A_ON();
     bool PwdMode =    arg0 & 0x1;
-    uint8_t Page =  ( arg0 & 0x2 ) >> 1;
+    uint8_t Page = (arg0 & 0x2) >> 1;
     bool brute_mem =  arg0 & 0x4;
 
     uint32_t i = 0;
@@ -1507,7 +1537,7 @@ void T55xxReadBlock(uint16_t arg0, uint8_t Block, uint32_t Pwd) {
 
     uint8_t start_wait = 4;
     size_t samples = 12000;
-    if ( brute_mem ) {
+    if (brute_mem) {
         start_wait = 0;
         samples = 1024;
     }
@@ -1533,7 +1563,7 @@ void T55xxReadBlock(uint16_t arg0, uint8_t Block, uint32_t Pwd) {
     T55xxWriteBit(1);
     T55xxWriteBit(Page); //Page 0
 
-    if (PwdMode){
+    if (PwdMode) {
         // Send Pwd
         for (i = 0x80000000; i != 0; i >>= 1)
             T55xxWriteBit(Pwd & i);
@@ -1549,21 +1579,22 @@ void T55xxReadBlock(uint16_t arg0, uint8_t Block, uint32_t Pwd) {
     // Turn field on to read the response
     // 137*8 seems to get to the start of data pretty well...
     // but we want to go past the start and let the repeating data settle in...
-    TurnReadLFOn(200*8);
+    TurnReadLFOn(200 * 8);
 
     // Acquisition
     // Now do the acquisition
     DoPartialAcquisition(0, true, samples, 0);
 
     // Turn the field off
-    if ( !brute_mem ) {
+    if (!brute_mem) {
         FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-        cmd_send(CMD_ACK,0,0,0,0,0);
+        cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
         LED_A_OFF();
     }
 }
 
-void T55xx_ChkPwds() {
+void T55xx_ChkPwds()
+{
 
     DbpString("[+] T55XX Check pwds using flashmemory starting");
 
@@ -1579,7 +1610,7 @@ void T55xx_ChkPwds() {
     while (x--) {
         b1 = 0;
         T55xxReadBlock(4, 1, 0);
-        for (uint16_t j=0; j < 1024; ++j)
+        for (uint16_t j = 0; j < 1024; ++j)
             b1 += buf[j];
 
         b1 *= b1;
@@ -1597,21 +1628,21 @@ void T55xx_ChkPwds() {
 
 #ifdef WITH_FLASH
     bool use_flashmem = true;
-    if ( use_flashmem ) {
+    if (use_flashmem) {
         BigBuf_Clear_EM();
         uint16_t isok = 0;
         uint8_t counter[2] = {0x00, 0x00};
-        isok = Flash_ReadData(DEFAULT_T55XX_KEYS_OFFSET, counter, sizeof(counter) );
-        if ( isok != sizeof(counter) )
+        isok = Flash_ReadData(DEFAULT_T55XX_KEYS_OFFSET, counter, sizeof(counter));
+        if (isok != sizeof(counter))
             goto OUT;
 
         pwdCount = counter[1] << 8 | counter[0];
 
-        if ( pwdCount == 0 && pwdCount == 0xFFFF)
+        if (pwdCount == 0 && pwdCount == 0xFFFF)
             goto OUT;
 
-        isok = Flash_ReadData(DEFAULT_T55XX_KEYS_OFFSET+2, pwds, pwdCount * 4);
-        if ( isok != pwdCount * 4 )
+        isok = Flash_ReadData(DEFAULT_T55XX_KEYS_OFFSET + 2, pwds, pwdCount * 4);
+        if (isok != pwdCount * 4)
             goto OUT;
 
         Dbprintf("[=] Password dictionary count %d ", pwdCount);
@@ -1619,7 +1650,7 @@ void T55xx_ChkPwds() {
 #endif
 
     uint32_t pwd = 0, curr = 0, prev = 0;
-    for (uint16_t i =0; i< pwdCount; ++i) {
+    for (uint16_t i = 0; i < pwdCount; ++i) {
 
         if (BUTTON_PRESS() && !usb_poll_validate_length()) {
             goto OUT;
@@ -1632,7 +1663,7 @@ void T55xx_ChkPwds() {
 
         // calc mean of BigBuf 1024 samples.
         uint32_t sum = 0;
-        for (uint16_t j=0; j<1024; ++j) {
+        for (uint16_t j = 0; j < 1024; ++j) {
             sum += buf[j];
         }
 
@@ -1642,27 +1673,28 @@ void T55xx_ChkPwds() {
         int32_t tmp = (sum - baseline);
         curr = ABS(tmp);
 
-        Dbprintf("[=] Pwd %08X  | ABS %u", pwd, curr );
+        Dbprintf("[=] Pwd %08X  | ABS %u", pwd, curr);
 
-        if ( curr > prev ) {
+        if (curr > prev) {
 
 
-            Dbprintf("[=]  --> ABS %u  Candidate %08X <--", curr, pwd );
+            Dbprintf("[=]  --> ABS %u  Candidate %08X <--", curr, pwd);
             candidate = pwd;
             prev = curr;
         }
     }
 
-    if ( candidate )
+    if (candidate)
         ret = 1;
 
 OUT:
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-    cmd_send(CMD_ACK,ret,candidate,0,0,0);
+    cmd_send(CMD_ACK, ret, candidate, 0, 0, 0);
     LEDsoff();
 }
 
-void T55xxWakeUp(uint32_t Pwd){
+void T55xxWakeUp(uint32_t Pwd)
+{
     LED_B_ON();
     uint32_t i = 0;
 
@@ -1686,22 +1718,24 @@ void T55xxWakeUp(uint32_t Pwd){
         T55xxWriteBit(Pwd & i);
 
     // Turn and leave field on to let the begin repeating transmission
-    TurnReadLFOn(20*1000);
+    TurnReadLFOn(20 * 1000);
 }
 
 /*-------------- Cloning routines -----------*/
-void WriteT55xx(uint32_t *blockdata, uint8_t startblock, uint8_t numblocks) {
+void WriteT55xx(uint32_t *blockdata, uint8_t startblock, uint8_t numblocks)
+{
     // write last block first and config block last (if included)
-    for (uint8_t i = numblocks+startblock; i > startblock; i--)
-        T55xxWriteBlockExt(blockdata[i-1], i-1, 0, 0);
+    for (uint8_t i = numblocks + startblock; i > startblock; i--)
+        T55xxWriteBlockExt(blockdata[i - 1], i - 1, 0, 0);
 }
 
 // Copy HID id to card and setup block 0 config
-void CopyHIDtoT55x7(uint32_t hi2, uint32_t hi, uint32_t lo, uint8_t longFMT) {
-    uint32_t data[] = {0,0,0,0,0,0,0};
+void CopyHIDtoT55x7(uint32_t hi2, uint32_t hi, uint32_t lo, uint8_t longFMT)
+{
+    uint32_t data[] = {0, 0, 0, 0, 0, 0, 0};
     uint8_t last_block = 0;
 
-    if (longFMT){
+    if (longFMT) {
         // Ensure no more than 84 bits supplied
         if (hi2 > 0xFFFFF) {
             DbpString("Tags can only have 84 bits.");
@@ -1737,11 +1771,12 @@ void CopyHIDtoT55x7(uint32_t hi2, uint32_t hi, uint32_t lo, uint8_t longFMT) {
     // data[0] = T5555_SET_BITRATE(50) | T5555_MODULATION_FSK2 | T5555_INVERT_OUTPUT | last_block << T5555_MAXBLOCK_SHIFT;
 
     LED_D_ON();
-    WriteT55xx(data, 0, last_block+1);
+    WriteT55xx(data, 0, last_block + 1);
     LED_D_OFF();
 }
 
-void CopyIOtoT55x7(uint32_t hi, uint32_t lo) {
+void CopyIOtoT55x7(uint32_t hi, uint32_t lo)
+{
     uint32_t data[] = {T55x7_BITRATE_RF_64 | T55x7_MODULATION_FSK2a | (2 << T55x7_MAXBLOCK_SHIFT), hi, lo};
     //TODO add selection of chip for Q5 or T55x7
     // data[0] = T5555_SET_BITRATE(64) | T5555_MODULATION_FSK2 | T5555_INVERT_OUTPUT | 2 << T5555_MAXBLOCK_SHIFT;
@@ -1754,7 +1789,8 @@ void CopyIOtoT55x7(uint32_t hi, uint32_t lo) {
 }
 
 // Clone Indala 64-bit tag by UID to T55x7
-void CopyIndala64toT55x7(uint32_t hi, uint32_t lo) {
+void CopyIndala64toT55x7(uint32_t hi, uint32_t lo)
+{
     //Program the 2 data blocks for supplied 64bit UID
     // and the Config for Indala 64 format (RF/32;PSK2 with RF/2;Maxblock=2)
     uint32_t data[] = { T55x7_BITRATE_RF_32 | T55x7_MODULATION_PSK2 | (2 << T55x7_MAXBLOCK_SHIFT), hi, lo};
@@ -1766,7 +1802,8 @@ void CopyIndala64toT55x7(uint32_t hi, uint32_t lo) {
     // T5567WriteBlock(0x603E1042,0);
 }
 // Clone Indala 224-bit tag by UID to T55x7
-void CopyIndala224toT55x7(uint32_t uid1, uint32_t uid2, uint32_t uid3, uint32_t uid4, uint32_t uid5, uint32_t uid6, uint32_t uid7) {
+void CopyIndala224toT55x7(uint32_t uid1, uint32_t uid2, uint32_t uid3, uint32_t uid4, uint32_t uid5, uint32_t uid6, uint32_t uid7)
+{
     //Program the 7 data blocks for supplied 224bit UID
     uint32_t data[] = {0, uid1, uid2, uid3, uid4, uid5, uid6, uid7};
     // and the block 0 for Indala224 format
@@ -1779,20 +1816,22 @@ void CopyIndala224toT55x7(uint32_t uid1, uint32_t uid2, uint32_t uid3, uint32_t
     // T5567WriteBlock(0x603E10E2,0);
 }
 // clone viking tag to T55xx
-void CopyVikingtoT55xx(uint32_t block1, uint32_t block2, uint8_t Q5) {
+void CopyVikingtoT55xx(uint32_t block1, uint32_t block2, uint8_t Q5)
+{
     uint32_t data[] = {T55x7_BITRATE_RF_32 | T55x7_MODULATION_MANCHESTER | (2 << T55x7_MAXBLOCK_SHIFT), block1, block2};
     if (Q5) data[0] = T5555_SET_BITRATE(32) | T5555_MODULATION_MANCHESTER | 2 << T5555_MAXBLOCK_SHIFT;
     // Program the data blocks for supplied ID and the block 0 config
     WriteT55xx(data, 0, 3);
     LED_D_OFF();
-    cmd_send(CMD_ACK,0,0,0,0,0);
+    cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
 }
 
 // Define 9bit header for EM410x tags
 #define EM410X_HEADER    0x1FF
 #define EM410X_ID_LENGTH 40
 
-void WriteEM410x(uint32_t card, uint32_t id_hi, uint32_t id_lo) {
+void WriteEM410x(uint32_t card, uint32_t id_hi, uint32_t id_lo)
+{
     int i, id_bit;
     uint64_t id = EM410X_HEADER;
     uint64_t rev_id = 0; // reversed ID
@@ -1848,11 +1887,11 @@ void WriteEM410x(uint32_t card, uint32_t id_hi, uint32_t id_lo) {
     // Add stop bit
     id <<= 1;
 
-    Dbprintf("Started writing %s tag ...", card ? "T55x7":"T5555");
+    Dbprintf("Started writing %s tag ...", card ? "T55x7" : "T5555");
     LED_D_ON();
 
     // Write EM410x ID
-    uint32_t data[] = {0, (uint32_t)(id>>32), (uint32_t)(id & 0xFFFFFFFF)};
+    uint32_t data[] = {0, (uint32_t)(id >> 32), (uint32_t)(id & 0xFFFFFFFF)};
 
     clock = (card & 0xFF00) >> 8;
     clock = (clock == 0) ? 64 : clock;
@@ -1872,9 +1911,9 @@ void WriteEM410x(uint32_t card, uint32_t id_hi, uint32_t id_lo) {
 
     LED_D_OFF();
     Dbprintf("Tag %s written with 0x%08x%08x\n",
-            card ? "T55x7":"T5555",
-            (uint32_t)(id >> 32),
-            (uint32_t)id);
+             card ? "T55x7" : "T5555",
+             (uint32_t)(id >> 32),
+             (uint32_t)id);
 }
 
 //-----------------------------------
@@ -1888,9 +1927,9 @@ void WriteEM410x(uint32_t card, uint32_t id_hi, uint32_t id_lo) {
 #define FWD_CMD_DISABLE 0x5
 
 uint8_t forwardLink_data[64]; //array of forwarded bits
-uint8_t * forward_ptr; //ptr for forward message preparation
+uint8_t *forward_ptr;  //ptr for forward message preparation
 uint8_t fwd_bit_sz; //forwardlink bit counter
-uint8_t * fwd_write_ptr; //forwardlink bit pointer
+uint8_t *fwd_write_ptr;  //forwardlink bit pointer
 
 //====================================================================
 // prepares command bits
@@ -1905,7 +1944,8 @@ uint8_t * fwd_write_ptr; //forwardlink bit pointer
 //  These timings work for 4469/4269/4305 (with the 55*8 above)
 //  WRITE_0 = 23*8 , 9*8
 
-uint8_t Prepare_Cmd( uint8_t cmd ) {
+uint8_t Prepare_Cmd(uint8_t cmd)
+{
 
     *forward_ptr++ = 0; //start bit
     *forward_ptr++ = 0; //second pause for 4050 code
@@ -1925,13 +1965,14 @@ uint8_t Prepare_Cmd( uint8_t cmd ) {
 // prepares address bits
 // see EM4469 spec
 //====================================================================
-uint8_t Prepare_Addr( uint8_t addr ) {
+uint8_t Prepare_Addr(uint8_t addr)
+{
 
     register uint8_t line_parity;
 
     uint8_t i;
     line_parity = 0;
-    for( i=0; i<6; i++ ) {
+    for (i = 0; i < 6; i++) {
         *forward_ptr++ = addr;
         line_parity ^= addr;
         addr >>= 1;
@@ -1946,7 +1987,8 @@ uint8_t Prepare_Addr( uint8_t addr ) {
 // prepares data bits intreleaved with parity bits
 // see EM4469 spec
 //====================================================================
-uint8_t Prepare_Data( uint16_t data_low, uint16_t data_hi) {
+uint8_t Prepare_Data(uint16_t data_low, uint16_t data_hi)
+{
 
     register uint8_t line_parity;
     register uint8_t column_parity;
@@ -1956,20 +1998,20 @@ uint8_t Prepare_Data( uint16_t data_low, uint16_t data_hi) {
     data = data_low;
     column_parity = 0;
 
-    for(i=0; i<4; i++) {
+    for (i = 0; i < 4; i++) {
         line_parity = 0;
-        for(j=0; j<8; j++) {
+        for (j = 0; j < 8; j++) {
             line_parity ^= data;
             column_parity ^= (data & 1) << j;
             *forward_ptr++ = data;
             data >>= 1;
         }
         *forward_ptr++ = line_parity;
-        if(i == 1)
+        if (i == 1)
             data = data_hi;
     }
 
-    for(j=0; j<8; j++) {
+    for (j = 0; j < 8; j++) {
         *forward_ptr++ = column_parity;
         column_parity >>= 1;
     }
@@ -1983,7 +2025,8 @@ uint8_t Prepare_Data( uint16_t data_low, uint16_t data_hi) {
 // Requires: forwarLink_data filled with valid bits (1 bit per byte)
 // fwd_bit_count set with number of bits to be sent
 //====================================================================
-void SendForward(uint8_t fwd_bit_count) {
+void SendForward(uint8_t fwd_bit_count)
+{
 
 // iceman,   21.3us increments for the USclock verification.
 // 55FC * 8us == 440us / 21.3 === 20.65 steps.  could be too short. Go for 56FC instead
@@ -2004,24 +2047,25 @@ void SendForward(uint8_t fwd_bit_count) {
     fwd_write_ptr++;
 
     TurnReadLF_off(EM_START_GAP);
-    TurnReadLFOn(18*8);
+    TurnReadLFOn(18 * 8);
 
     // now start writting with bitbanging the antenna.
-    while(fwd_bit_sz-- > 0) { //prepare next bit modulation
-        if(((*fwd_write_ptr++) & 1) == 1) {
-            WaitUS(32*8);
+    while (fwd_bit_sz-- > 0) { //prepare next bit modulation
+        if (((*fwd_write_ptr++) & 1) == 1) {
+            WaitUS(32 * 8);
         } else {
-            TurnReadLF_off(23*8);
-            TurnReadLFOn(18*8);
+            TurnReadLF_off(23 * 8);
+            TurnReadLFOn(18 * 8);
         }
     }
 }
 
-void EM4xLogin(uint32_t pwd) {
+void EM4xLogin(uint32_t pwd)
+{
     uint8_t len;
     forward_ptr = forwardLink_data;
-    len = Prepare_Cmd( FWD_CMD_LOGIN );
-    len += Prepare_Data( pwd & 0xFFFF, pwd >> 16 );
+    len = Prepare_Cmd(FWD_CMD_LOGIN);
+    len += Prepare_Data(pwd & 0xFFFF, pwd >> 16);
     SendForward(len);
     //WaitUS(20); // no wait for login command.
     // should receive
@@ -2029,7 +2073,8 @@ void EM4xLogin(uint32_t pwd) {
     // 0000 0001 fail
 }
 
-void EM4xReadWord(uint8_t addr, uint32_t pwd, uint8_t usepwd) {
+void EM4xReadWord(uint8_t addr, uint32_t pwd, uint8_t usepwd)
+{
 
     LED_A_ON();
     uint8_t len;
@@ -2047,8 +2092,8 @@ void EM4xReadWord(uint8_t addr, uint32_t pwd, uint8_t usepwd) {
     if (usepwd) EM4xLogin(pwd);
 
     forward_ptr = forwardLink_data;
-    len = Prepare_Cmd( FWD_CMD_READ );
-    len += Prepare_Addr( addr );
+    len = Prepare_Cmd(FWD_CMD_READ);
+    len += Prepare_Addr(addr);
 
     SendForward(len);
 
@@ -2057,11 +2102,12 @@ void EM4xReadWord(uint8_t addr, uint32_t pwd, uint8_t usepwd) {
     DoPartialAcquisition(20, true, 6000, 1000);
 
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-    cmd_send(CMD_ACK,0,0,0,0,0);
+    cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
     LED_A_OFF();
 }
 
-void EM4xWriteWord(uint32_t flag, uint32_t data, uint32_t pwd) {
+void EM4xWriteWord(uint32_t flag, uint32_t data, uint32_t pwd)
+{
 
     LED_A_ON();
 
@@ -2081,9 +2127,9 @@ void EM4xWriteWord(uint32_t flag, uint32_t data, uint32_t pwd) {
     if (usePwd) EM4xLogin(pwd);
 
     forward_ptr = forwardLink_data;
-    len = Prepare_Cmd( FWD_CMD_WRITE );
-    len += Prepare_Addr( addr );
-    len += Prepare_Data( data & 0xFFFF, data >> 16 );
+    len = Prepare_Cmd(FWD_CMD_WRITE);
+    len += Prepare_Addr(addr);
+    len += Prepare_Data(data & 0xFFFF, data >> 16);
 
     SendForward(len);
 
@@ -2093,7 +2139,7 @@ void EM4xWriteWord(uint32_t flag, uint32_t data, uint32_t pwd) {
     DoPartialAcquisition(20, true, 6000, 1000);
 
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-    cmd_send(CMD_ACK,0,0,0,0,0);
+    cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
     LED_A_OFF();
 }
 
@@ -2111,7 +2157,8 @@ pulse 3.6 msecs
 
 This triggers a COTAG tag to response
 */
-void Cotag(uint32_t arg0) {
+void Cotag(uint32_t arg0)
+{
 #ifndef OFF
 # define OFF(x)  { FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); WaitUS((x)); }
 #endif
@@ -2133,15 +2180,21 @@ void Cotag(uint32_t arg0) {
     ON(740)  OFF(2035)
     ON(1000)
 
-    switch(rawsignal) {
-        case 0: doCotagAcquisition(50000); break;
-        case 1: doCotagAcquisitionManchester(); break;
-        case 2: DoAcquisition_config(true, 0); break;
+    switch (rawsignal) {
+        case 0:
+            doCotagAcquisition(50000);
+            break;
+        case 1:
+            doCotagAcquisitionManchester();
+            break;
+        case 2:
+            DoAcquisition_config(true, 0);
+            break;
     }
 
     // Turn the field off
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); // field off
-    cmd_send(CMD_ACK,0,0,0,0,0);
+    cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
     LEDsoff();
 }
 
diff --git a/armsrc/lfsampling.c b/armsrc/lfsampling.c
index 93ba535b6..086b60d2f 100644
--- a/armsrc/lfsampling.c
+++ b/armsrc/lfsampling.c
@@ -18,9 +18,10 @@ Default LF config is set to:
     */
 sample_config config = { 1, 8, 1, 95, 0 } ;
 
-void printConfig() {
+void printConfig()
+{
     Dbprintf("LF Sampling config");
-    Dbprintf("  [q] divisor.............%d (%d KHz)", config.divisor, 12000 / (config.divisor+1));
+    Dbprintf("  [q] divisor.............%d (%d KHz)", config.divisor, 12000 / (config.divisor + 1));
     Dbprintf("  [b] bps.................%d", config.bits_per_sample);
     Dbprintf("  [d] decimation..........%d", config.decimation);
     Dbprintf("  [a] averaging...........%s", (config.averaging) ? "Yes" : "No");
@@ -38,24 +39,26 @@ void printConfig() {
  * @brief setSamplingConfig
  * @param sc
  */
-void setSamplingConfig(sample_config *sc) {
-    if(sc->divisor != 0) config.divisor = sc->divisor;
-    if(sc->bits_per_sample != 0) config.bits_per_sample = sc->bits_per_sample;
-    if(sc->trigger_threshold != -1) config.trigger_threshold = sc->trigger_threshold;
+void setSamplingConfig(sample_config *sc)
+{
+    if (sc->divisor != 0) config.divisor = sc->divisor;
+    if (sc->bits_per_sample != 0) config.bits_per_sample = sc->bits_per_sample;
+    if (sc->trigger_threshold != -1) config.trigger_threshold = sc->trigger_threshold;
 
     config.decimation = (sc->decimation != 0) ? sc->decimation : 1;
     config.averaging = sc->averaging;
-    if(config.bits_per_sample > 8) config.bits_per_sample = 8;
+    if (config.bits_per_sample > 8) config.bits_per_sample = 8;
 
     printConfig();
 }
 
-sample_config* getSamplingConfig() {
+sample_config *getSamplingConfig()
+{
     return &config;
 }
 
 struct BitstreamOut {
-    uint8_t * buffer;
+    uint8_t *buffer;
     uint32_t numbits;
     uint32_t position;
 };
@@ -65,10 +68,11 @@ struct BitstreamOut {
  * @param stream
  * @param bit
  */
-void pushBit( BitstreamOut* stream, uint8_t bit) {
+void pushBit(BitstreamOut *stream, uint8_t bit)
+{
     int bytepos = stream->position >> 3; // divide by 8
     int bitpos = stream->position & 7;
-    *(stream->buffer+bytepos) |= (bit > 0) <<  (7 - bitpos);
+    *(stream->buffer + bytepos) |= (bit > 0) << (7 - bitpos);
     stream->position++;
     stream->numbits++;
 }
@@ -80,9 +84,10 @@ void pushBit( BitstreamOut* stream, uint8_t bit) {
 *                  0 or 95 ==> 125 KHz
 *
 **/
-void LFSetupFPGAForADC(int divisor, bool lf_field) {
+void LFSetupFPGAForADC(int divisor, bool lf_field)
+{
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-    if ( (divisor == 1) || (divisor < 0) || (divisor > 255) )
+    if ((divisor == 1) || (divisor < 0) || (divisor > 255))
         FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 88); //134.8Khz
     else if (divisor == 0)
         FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
@@ -116,7 +121,8 @@ void LFSetupFPGAForADC(int divisor, bool lf_field) {
  * @param silent - is true, now outputs are made. If false, dbprints the status
  * @return the number of bits occupied by the samples.
  */
-uint32_t DoAcquisition(uint8_t decimation, uint32_t bits_per_sample, bool averaging, int trigger_threshold, bool silent, int bufsize, uint32_t cancel_after) {
+uint32_t DoAcquisition(uint8_t decimation, uint32_t bits_per_sample, bool averaging, int trigger_threshold, bool silent, int bufsize, uint32_t cancel_after)
+{
 
     uint8_t *dest = BigBuf_get_addr();
     bufsize = (bufsize > 0 && bufsize < BigBuf_max_traceLen()) ? bufsize : BigBuf_max_traceLen();
@@ -127,17 +133,17 @@ uint32_t DoAcquisition(uint8_t decimation, uint32_t bits_per_sample, bool averag
     if (decimation < 1) decimation = 1;
 
     // use a bit stream to handle the output
-    BitstreamOut data = { dest , 0, 0};
+    BitstreamOut data = { dest, 0, 0};
     int sample_counter = 0;
     uint8_t sample = 0;
 
     // if we want to do averaging
-    uint32_t sample_sum =0 ;
+    uint32_t sample_sum = 0 ;
     uint32_t sample_total_numbers = 0;
     uint32_t sample_total_saved = 0;
     uint32_t cancel_counter = 0;
 
-    while (!BUTTON_PRESS() && !usb_poll_validate_length() ) {
+    while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
         WDT_HIT();
 
         if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
@@ -172,13 +178,13 @@ uint32_t DoAcquisition(uint8_t decimation, uint32_t bits_per_sample, bool averag
             // averaging
             if (averaging && decimation > 1) {
                 sample = sample_sum / decimation;
-                sample_sum =0;
+                sample_sum = 0;
             }
 
             // store the sample
             sample_total_saved ++;
             if (bits_per_sample == 8) {
-                dest[sample_total_saved-1] = sample;
+                dest[sample_total_saved - 1] = sample;
 
                 // Get the return value correct
                 data.numbits = sample_total_saved << 3;
@@ -201,7 +207,7 @@ uint32_t DoAcquisition(uint8_t decimation, uint32_t bits_per_sample, bool averag
     if (!silent) {
         Dbprintf("Done, saved %d out of %d seen samples at %d bits/sample", sample_total_saved, sample_total_numbers, bits_per_sample);
         Dbprintf("buffer samples: %02x %02x %02x %02x %02x %02x %02x %02x ...",
-                    dest[0], dest[1], dest[2], dest[3], dest[4], dest[5], dest[6], dest[7]);
+                 dest[0], dest[1], dest[2], dest[3], dest[4], dest[5], dest[6], dest[7]);
     }
 
     // Ensure that DC offset removal and noise check is performed for any device-side processing
@@ -218,24 +224,28 @@ uint32_t DoAcquisition(uint8_t decimation, uint32_t bits_per_sample, bool averag
  * @param silent
  * @return number of bits sampled
  */
-uint32_t DoAcquisition_default(int trigger_threshold, bool silent) {
-    return DoAcquisition(1, 8, 0,trigger_threshold, silent, 0, 0);
+uint32_t DoAcquisition_default(int trigger_threshold, bool silent)
+{
+    return DoAcquisition(1, 8, 0, trigger_threshold, silent, 0, 0);
 }
-uint32_t DoAcquisition_config( bool silent, int sample_size) {
+uint32_t DoAcquisition_config(bool silent, int sample_size)
+{
     return DoAcquisition(config.decimation
-                  ,config.bits_per_sample
-                  ,config.averaging
-                  ,config.trigger_threshold
-                  ,silent
-                  ,sample_size
-                  ,0);
+                         , config.bits_per_sample
+                         , config.averaging
+                         , config.trigger_threshold
+                         , silent
+                         , sample_size
+                         , 0);
 }
 
-uint32_t DoPartialAcquisition(int trigger_threshold, bool silent, int sample_size, uint32_t cancel_after) {
+uint32_t DoPartialAcquisition(int trigger_threshold, bool silent, int sample_size, uint32_t cancel_after)
+{
     return DoAcquisition(1, 8, 0, trigger_threshold, silent, sample_size, cancel_after);
 }
 
-uint32_t ReadLF(bool activeField, bool silent, int sample_size) {
+uint32_t ReadLF(bool activeField, bool silent, int sample_size)
+{
     if (!silent)
         printConfig();
     LFSetupFPGAForADC(config.divisor, activeField);
@@ -246,7 +256,8 @@ uint32_t ReadLF(bool activeField, bool silent, int sample_size) {
 * Initializes the FPGA for reader-mode (field on), and acquires the samples.
 * @return number of bits sampled
 **/
-uint32_t SampleLF(bool printCfg, int sample_size) {
+uint32_t SampleLF(bool printCfg, int sample_size)
+{
     BigBuf_Clear_ext(false);
     uint32_t ret = ReadLF(true, printCfg, sample_size);
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
@@ -256,7 +267,8 @@ uint32_t SampleLF(bool printCfg, int sample_size) {
 * Initializes the FPGA for snoop-mode (field off), and acquires the samples.
 * @return number of bits sampled
 **/
-uint32_t SnoopLF() {
+uint32_t SnoopLF()
+{
     BigBuf_Clear_ext(false);
     uint32_t ret = ReadLF(false, true, 0);
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
@@ -267,16 +279,17 @@ uint32_t SnoopLF() {
 * acquisition of T55x7 LF signal. Similar to other LF, but adjusted with @marshmellows thresholds
 * the data is collected in BigBuf.
 **/
-void doT55x7Acquisition(size_t sample_size) {
+void doT55x7Acquisition(size_t sample_size)
+{
 
-    #define T55xx_READ_UPPER_THRESHOLD 128+60  // 60 grph
-    #define T55xx_READ_LOWER_THRESHOLD 128-60  // -60 grph
-    #define T55xx_READ_TOL   5
+#define T55xx_READ_UPPER_THRESHOLD 128+60  // 60 grph
+#define T55xx_READ_LOWER_THRESHOLD 128-60  // -60 grph
+#define T55xx_READ_TOL   5
 
     uint8_t *dest = BigBuf_get_addr();
     uint16_t bufsize = BigBuf_max_traceLen();
 
-    if ( bufsize > sample_size )
+    if (bufsize > sample_size)
         bufsize = sample_size;
 
     uint8_t curSample = 0, lastSample = 0;
@@ -285,7 +298,7 @@ void doT55x7Acquisition(size_t sample_size) {
     bool highFound = false;
     bool lowFound = false;
 
-    while(!BUTTON_PRESS() && !usb_poll_validate_length() && skipCnt < 1000 && (i < bufsize) ) {
+    while (!BUTTON_PRESS() && !usb_poll_validate_length() && skipCnt < 1000 && (i < bufsize)) {
         WDT_HIT();
 
 
@@ -313,7 +326,7 @@ void doT55x7Acquisition(size_t sample_size) {
             }
 
             // skip until first high samples begin to change
-            if (startFound || curSample > T55xx_READ_LOWER_THRESHOLD + T55xx_READ_TOL){
+            if (startFound || curSample > T55xx_READ_LOWER_THRESHOLD + T55xx_READ_TOL) {
                 // if just found start - recover last sample
                 if (!startFound) {
                     dest[i++] = lastSample;
@@ -337,12 +350,13 @@ void doT55x7Acquisition(size_t sample_size) {
 #ifndef COTAG_BITS
 #define COTAG_BITS 264
 #endif
-void doCotagAcquisition(size_t sample_size) {
+void doCotagAcquisition(size_t sample_size)
+{
 
     uint8_t *dest = BigBuf_get_addr();
     uint16_t bufsize = BigBuf_max_traceLen();
 
-    if ( bufsize > sample_size )
+    if (bufsize > sample_size)
         bufsize = sample_size;
 
     dest[0] = 0;
@@ -350,7 +364,7 @@ void doCotagAcquisition(size_t sample_size) {
     uint16_t i = 0;
     uint16_t noise_counter = 0;
 
-    while (!BUTTON_PRESS() && !usb_poll_validate_length() && (i < bufsize) && (noise_counter < (COTAG_T1 << 1)) ) {
+    while (!BUTTON_PRESS() && !usb_poll_validate_length() && (i < bufsize) && (noise_counter < (COTAG_T1 << 1))) {
         WDT_HIT();
 
         if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
@@ -358,7 +372,7 @@ void doCotagAcquisition(size_t sample_size) {
             LED_D_OFF();
 
             // find first peak
-            if ( !firsthigh ) {
+            if (!firsthigh) {
                 if (sample < COTAG_ONE_THRESHOLD) {
                     noise_counter++;
                     continue;
@@ -366,8 +380,8 @@ void doCotagAcquisition(size_t sample_size) {
                 noise_counter = 0;
                 firsthigh = 1;
             }
-            if ( !firstlow ){
-                if (sample > COTAG_ZERO_THRESHOLD ) {
+            if (!firstlow) {
+                if (sample > COTAG_ZERO_THRESHOLD) {
                     noise_counter++;
                     continue;
                 }
@@ -377,22 +391,23 @@ void doCotagAcquisition(size_t sample_size) {
 
             ++i;
 
-            if ( sample > COTAG_ONE_THRESHOLD)
+            if (sample > COTAG_ONE_THRESHOLD)
                 dest[i] = 255;
-            else if ( sample < COTAG_ZERO_THRESHOLD)
+            else if (sample < COTAG_ZERO_THRESHOLD)
                 dest[i] = 0;
             else
-                dest[i] = dest[i-1];
+                dest[i] = dest[i - 1];
         }
     }
 }
 
-uint32_t doCotagAcquisitionManchester() {
+uint32_t doCotagAcquisitionManchester()
+{
 
     uint8_t *dest = BigBuf_get_addr();
     uint16_t bufsize = BigBuf_max_traceLen();
 
-    if ( bufsize > COTAG_BITS )
+    if (bufsize > COTAG_BITS)
         bufsize = COTAG_BITS;
 
     dest[0] = 0;
@@ -401,7 +416,7 @@ uint32_t doCotagAcquisitionManchester() {
     uint8_t curr = 0, prev = 0;
     uint16_t noise_counter = 0;
 
-    while (!BUTTON_PRESS() && !usb_poll_validate_length() && (sample_counter < bufsize)  && (noise_counter < (COTAG_T1 << 1)) ) {
+    while (!BUTTON_PRESS() && !usb_poll_validate_length() && (sample_counter < bufsize)  && (noise_counter < (COTAG_T1 << 1))) {
         WDT_HIT();
 
         if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
@@ -409,7 +424,7 @@ uint32_t doCotagAcquisitionManchester() {
             LED_D_OFF();
 
             // find first peak
-            if ( !firsthigh ) {
+            if (!firsthigh) {
                 if (sample < COTAG_ONE_THRESHOLD) {
                     noise_counter++;
                     continue;
@@ -418,8 +433,8 @@ uint32_t doCotagAcquisitionManchester() {
                 firsthigh = 1;
             }
 
-            if ( !firstlow ){
-                if (sample > COTAG_ZERO_THRESHOLD ) {
+            if (!firstlow) {
+                if (sample > COTAG_ZERO_THRESHOLD) {
                     noise_counter++;
                     continue;
                 }
@@ -428,20 +443,18 @@ uint32_t doCotagAcquisitionManchester() {
             }
 
             // set sample 255, 0,  or previous
-            if ( sample > COTAG_ONE_THRESHOLD){
+            if (sample > COTAG_ONE_THRESHOLD) {
                 prev = curr;
                 curr = 1;
-            }
-            else if ( sample < COTAG_ZERO_THRESHOLD) {
+            } else if (sample < COTAG_ZERO_THRESHOLD) {
                 prev = curr;
                 curr = 0;
-            }
-            else {
+            } else {
                 curr = prev;
             }
 
             // full T1 periods,
-            if ( period > 0 ) {
+            if (period > 0) {
                 --period;
                 continue;
             }
diff --git a/armsrc/lfsampling.h b/armsrc/lfsampling.h
index 15510198a..94c370ed9 100644
--- a/armsrc/lfsampling.h
+++ b/armsrc/lfsampling.h
@@ -78,7 +78,7 @@ void LFSetupFPGAForADC(int divisor, bool lf_field);
  */
 void setSamplingConfig(sample_config *sc);
 
-sample_config * getSamplingConfig();
+sample_config *getSamplingConfig();
 
 void printConfig();
 
diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index 4889afce0..c4710d936 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -26,10 +26,10 @@
 // send an incomplete dummy response in order to trigger the card's authentication failure timeout
 #ifndef CHK_TIMEOUT
 # define CHK_TIMEOUT() { \
-    ReaderTransmit(&dummy_answer, 1, NULL); \
-    uint32_t timeout = GetCountSspClk() + HARDNESTED_AUTHENTICATION_TIMEOUT; \
-    while (GetCountSspClk() < timeout) {}; \
- }
+        ReaderTransmit(&dummy_answer, 1, NULL); \
+        uint32_t timeout = GetCountSspClk() + HARDNESTED_AUTHENTICATION_TIMEOUT; \
+        while (GetCountSspClk() < timeout) {}; \
+    }
 #endif
 
 static uint8_t dummy_answer = 0;
@@ -40,7 +40,7 @@ static uint8_t dummy_answer = 0;
 //-----------------------------------------------------------------------------
 void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
 {
-  // params
+    // params
     uint8_t blockNo = arg0;
     uint8_t keyType = arg1;
     uint64_t ui64Key = 0;
@@ -65,22 +65,22 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
     LED_C_OFF();
 
     while (true) {
-        if(!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
+        if (!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
             if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
             break;
         };
 
-        if(mifare_classic_auth(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST)) {
+        if (mifare_classic_auth(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST)) {
             if (MF_DBGLEVEL >= 1) Dbprintf("Auth error");
             break;
         };
 
-        if(mifare_classic_readblock(pcs, cuid, blockNo, dataoutbuf)) {
+        if (mifare_classic_readblock(pcs, cuid, blockNo, dataoutbuf)) {
             if (MF_DBGLEVEL >= 1) Dbprintf("Read block error");
             break;
         };
 
-        if(mifare_classic_halt(pcs, cuid)) {
+        if (mifare_classic_halt(pcs, cuid)) {
             if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
             break;
         };
@@ -94,31 +94,34 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
     if (MF_DBGLEVEL >= 2) DbpString("READ BLOCK FINISHED");
 
     LED_B_ON();
-    cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,16);
+    cmd_send(CMD_ACK, isOK, 0, 0, dataoutbuf, 16);
     LED_B_OFF();
 
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     LEDsoff();
 }
 
-void MifareUC_Auth(uint8_t arg0, uint8_t *keybytes){
+void MifareUC_Auth(uint8_t arg0, uint8_t *keybytes)
+{
 
     bool turnOffField = (arg0 == 1);
 
-    LED_A_ON(); LED_B_OFF(); LED_C_OFF();
+    LED_A_ON();
+    LED_B_OFF();
+    LED_C_OFF();
 
     iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
 
     clear_trace();
     set_tracing(true);
 
-    if(!iso14443a_select_card(NULL, NULL, NULL, true, 0, true)) {
+    if (!iso14443a_select_card(NULL, NULL, NULL, true, 0, true)) {
         if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card");
         OnError(0);
         return;
     };
 
-    if(!mifare_ultra_auth(keybytes)){
+    if (!mifare_ultra_auth(keybytes)) {
         if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication failed");
         OnError(1);
         return;
@@ -128,7 +131,7 @@ void MifareUC_Auth(uint8_t arg0, uint8_t *keybytes){
         FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
         LEDsoff();
     }
-    cmd_send(CMD_ACK,1,0,0,0,0);
+    cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
 }
 
 // Arg0 = BlockNo,
@@ -149,47 +152,47 @@ void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)
     set_tracing(true);
 
     int len = iso14443a_select_card(NULL, NULL, NULL, true, 0, true);
-    if(!len) {
-        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card (RC:%02X)",len);
+    if (!len) {
+        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card (RC:%02X)", len);
         OnError(1);
         return;
     }
 
     // UL-C authentication
-    if ( useKey ) {
+    if (useKey) {
         uint8_t key[16] = {0x00};
-        memcpy(key, datain, sizeof(key) );
+        memcpy(key, datain, sizeof(key));
 
-        if ( !mifare_ultra_auth(key) ) {
+        if (!mifare_ultra_auth(key)) {
             OnError(1);
             return;
         }
     }
 
     // UL-EV1 / NTAG authentication
-    if ( usePwd ) {
+    if (usePwd) {
         uint8_t pwd[4] = {0x00};
         memcpy(pwd, datain, 4);
-        uint8_t pack[4] = {0,0,0,0};
+        uint8_t pack[4] = {0, 0, 0, 0};
         if (!mifare_ul_ev1_auth(pwd, pack)) {
             OnError(1);
             return;
         }
     }
 
-    if( mifare_ultra_readblock(blockNo, dataout) ) {
+    if (mifare_ultra_readblock(blockNo, dataout)) {
         if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Read block error");
         OnError(2);
         return;
     }
 
-    if( mifare_ultra_halt() ) {
+    if (mifare_ultra_halt()) {
         if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Halt error");
         OnError(3);
         return;
     }
 
-    cmd_send(CMD_ACK,1,0,0,dataout,16);
+    cmd_send(CMD_ACK, 1, 0, 0, dataout, 16);
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     LEDsoff();
 }
@@ -200,7 +203,7 @@ void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)
 //-----------------------------------------------------------------------------
 void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
 {
-  // params
+    // params
     uint8_t sectorNo = arg0;
     uint8_t keyType = arg1;
     uint64_t ui64Key = 0;
@@ -225,26 +228,26 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
     LED_C_OFF();
 
     isOK = 1;
-    if(!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
+    if (!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
         isOK = 0;
         if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
     }
 
 
-    if(isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_FIRST)) {
+    if (isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_FIRST)) {
         isOK = 0;
         if (MF_DBGLEVEL >= 1) Dbprintf("Auth error");
     }
 
     for (uint8_t blockNo = 0; isOK && blockNo < NumBlocksPerSector(sectorNo); blockNo++) {
-        if(mifare_classic_readblock(pcs, cuid, FirstBlockOfSector(sectorNo) + blockNo, dataoutbuf + 16 * blockNo)) {
+        if (mifare_classic_readblock(pcs, cuid, FirstBlockOfSector(sectorNo) + blockNo, dataoutbuf + 16 * blockNo)) {
             isOK = 0;
             if (MF_DBGLEVEL >= 1) Dbprintf("Read sector %2d block %2d error", sectorNo, blockNo);
             break;
         }
     }
 
-    if(mifare_classic_halt(pcs, cuid)) {
+    if (mifare_classic_halt(pcs, cuid)) {
         if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
     }
 
@@ -253,7 +256,7 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
     crypto1_destroy(pcs);
 
     LED_B_ON();
-    cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,16*NumBlocksPerSector(sectorNo));
+    cmd_send(CMD_ACK, isOK, 0, 0, dataoutbuf, 16 * NumBlocksPerSector(sectorNo));
     LED_B_OFF();
 
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
@@ -272,7 +275,8 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
     iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
 
     // free eventually allocated BigBuf memory
-    BigBuf_free(); BigBuf_Clear_ext(false);
+    BigBuf_free();
+    BigBuf_Clear_ext(false);
     clear_trace();
     set_tracing(true);
 
@@ -283,7 +287,7 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
     bool usePwd = (arg2 == 2); //UL_EV1/NTAG
     uint32_t countblocks = 0;
     uint8_t *dataout = BigBuf_malloc(CARD_MEMORY_SIZE);
-    if (dataout == NULL){
+    if (dataout == NULL) {
         Dbprintf("out of memory");
         OnError(1);
         return;
@@ -291,17 +295,17 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
 
     int len = iso14443a_select_card(NULL, NULL, NULL, true, 0, true);
     if (!len) {
-        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card (RC:%d)",len);
+        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card (RC:%d)", len);
         OnError(1);
         return;
     }
 
     // UL-C authentication
-    if ( useKey ) {
+    if (useKey) {
         uint8_t key[16] = {0x00};
-        memcpy(key, datain, sizeof(key) );
+        memcpy(key, datain, sizeof(key));
 
-        if ( !mifare_ultra_auth(key) ) {
+        if (!mifare_ultra_auth(key)) {
             OnError(1);
             return;
         }
@@ -311,16 +315,16 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
     if (usePwd) {
         uint8_t pwd[4] = {0x00};
         memcpy(pwd, datain, sizeof(pwd));
-        uint8_t pack[4] = {0,0,0,0};
+        uint8_t pack[4] = {0, 0, 0, 0};
 
-        if (!mifare_ul_ev1_auth(pwd, pack)){
+        if (!mifare_ul_ev1_auth(pwd, pack)) {
             OnError(1);
             return;
         }
     }
 
-    for (int i = 0; i < blocks; i++){
-        if ((i*4) + 4 >= CARD_MEMORY_SIZE) {
+    for (int i = 0; i < blocks; i++) {
+        if ((i * 4) + 4 >= CARD_MEMORY_SIZE) {
             Dbprintf("Data exceeds buffer!!");
             break;
         }
@@ -328,7 +332,7 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
         len = mifare_ultra_readblock(blockNo + i, dataout + 4 * i);
 
         if (len) {
-            if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Read block %d error",i);
+            if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Read block %d error", i);
             // if no blocks read - error out
             if (i == 0) {
                 OnError(2);
@@ -393,22 +397,22 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
     LED_C_OFF();
 
     while (true) {
-        if(!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
+        if (!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
             if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
             break;
         };
 
-        if(mifare_classic_auth(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST)) {
+        if (mifare_classic_auth(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST)) {
             if (MF_DBGLEVEL >= 1) Dbprintf("Auth error");
             break;
         };
 
-        if(mifare_classic_writeblock(pcs, cuid, blockNo, blockdata)) {
+        if (mifare_classic_writeblock(pcs, cuid, blockNo, blockdata)) {
             if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
             break;
         };
 
-        if(mifare_classic_halt(pcs, cuid)) {
+        if (mifare_classic_halt(pcs, cuid)) {
             if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
             break;
         };
@@ -421,7 +425,7 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
 
     if (MF_DBGLEVEL >= 2) DbpString("WRITE BLOCK FINISHED");
 
-    cmd_send(CMD_ACK,isOK,0,0,0,0);
+    cmd_send(CMD_ACK, isOK, 0, 0, 0, 0);
 
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     LEDsoff();
@@ -498,11 +502,11 @@ void MifareUWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)
     };
 
     // UL-C authentication
-    if ( useKey ) {
+    if (useKey) {
         uint8_t key[16] = {0x00};
-        memcpy(key, datain+4, sizeof(key) );
+        memcpy(key, datain + 4, sizeof(key));
 
-        if ( !mifare_ultra_auth(key) ) {
+        if (!mifare_ultra_auth(key)) {
             OnError(1);
             return;
         }
@@ -511,8 +515,8 @@ void MifareUWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)
     // UL-EV1 / NTAG authentication
     if (usePwd) {
         uint8_t pwd[4] = {0x00};
-        memcpy(pwd, datain+4, 4);
-        uint8_t pack[4] = {0,0,0,0};
+        memcpy(pwd, datain + 4, 4);
+        uint8_t pack[4] = {0, 0, 0, 0};
         if (!mifare_ul_ev1_auth(pwd, pack)) {
             OnError(1);
             return;
@@ -533,20 +537,23 @@ void MifareUWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)
 
     if (MF_DBGLEVEL >= 2) DbpString("WRITE BLOCK FINISHED");
 
-    cmd_send(CMD_ACK,1,0,0,0,0);
+    cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     LEDsoff();
     set_tracing(false);
 }
 
-void MifareUSetPwd(uint8_t arg0, uint8_t *datain){
+void MifareUSetPwd(uint8_t arg0, uint8_t *datain)
+{
 
     uint8_t pwd[16] = {0x00};
     byte_t blockdata[4] = {0x00};
 
     memcpy(pwd, datain, 16);
 
-    LED_A_ON(); LED_B_OFF(); LED_C_OFF();
+    LED_A_ON();
+    LED_B_OFF();
+    LED_C_OFF();
     iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
 
     clear_trace();
@@ -562,7 +569,7 @@ void MifareUSetPwd(uint8_t arg0, uint8_t *datain){
     blockdata[1] = pwd[6];
     blockdata[2] = pwd[5];
     blockdata[3] = pwd[4];
-    if (mifare_ultra_writeblock( 44, blockdata)) {
+    if (mifare_ultra_writeblock(44, blockdata)) {
         if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
         OnError(44);
         return;
@@ -572,7 +579,7 @@ void MifareUSetPwd(uint8_t arg0, uint8_t *datain){
     blockdata[1] = pwd[2];
     blockdata[2] = pwd[1];
     blockdata[3] = pwd[0];
-    if (mifare_ultra_writeblock( 45, blockdata)) {
+    if (mifare_ultra_writeblock(45, blockdata)) {
         if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
         OnError(45);
         return;
@@ -582,7 +589,7 @@ void MifareUSetPwd(uint8_t arg0, uint8_t *datain){
     blockdata[1] = pwd[14];
     blockdata[2] = pwd[13];
     blockdata[3] = pwd[12];
-    if (mifare_ultra_writeblock( 46, blockdata)) {
+    if (mifare_ultra_writeblock(46, blockdata)) {
         if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
         OnError(46);
         return;
@@ -592,7 +599,7 @@ void MifareUSetPwd(uint8_t arg0, uint8_t *datain){
     blockdata[1] = pwd[10];
     blockdata[2] = pwd[9];
     blockdata[3] = pwd[8];
-    if (mifare_ultra_writeblock( 47, blockdata)) {
+    if (mifare_ultra_writeblock(47, blockdata)) {
         if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
         OnError(47);
         return;
@@ -604,20 +611,22 @@ void MifareUSetPwd(uint8_t arg0, uint8_t *datain){
         return;
     };
 
-    cmd_send(CMD_ACK,1,0,0,0,0);
+    cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     LEDsoff();
     set_tracing(false);
 }
 
 // Return 1 if the nonce is invalid else return 0
-int valid_nonce(uint32_t Nt, uint32_t NtEnc, uint32_t Ks1, uint8_t *parity) {
-    return ((oddparity8((Nt >> 24) & 0xFF) == ((parity[0]) ^ oddparity8((NtEnc >> 24) & 0xFF) ^ BIT(Ks1,16))) & \
-    (oddparity8((Nt >> 16) & 0xFF) == ((parity[1]) ^ oddparity8((NtEnc >> 16) & 0xFF) ^ BIT(Ks1,8))) & \
-    (oddparity8((Nt >> 8) & 0xFF) == ((parity[2]) ^ oddparity8((NtEnc >> 8) & 0xFF) ^ BIT(Ks1,0)))) ? 1 : 0;
+int valid_nonce(uint32_t Nt, uint32_t NtEnc, uint32_t Ks1, uint8_t *parity)
+{
+    return ((oddparity8((Nt >> 24) & 0xFF) == ((parity[0]) ^ oddparity8((NtEnc >> 24) & 0xFF) ^ BIT(Ks1, 16))) & \
+            (oddparity8((Nt >> 16) & 0xFF) == ((parity[1]) ^ oddparity8((NtEnc >> 16) & 0xFF) ^ BIT(Ks1, 8))) & \
+            (oddparity8((Nt >> 8) & 0xFF) == ((parity[2]) ^ oddparity8((NtEnc >> 8) & 0xFF) ^ BIT(Ks1, 0)))) ? 1 : 0;
 }
 
-void MifareAcquireNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *datain) {
+void MifareAcquireNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *datain)
+{
 
     uint8_t uid[10] = {0x00};
     uint8_t answer[MAX_MIFARE_FRAME_SIZE] = {0x00};
@@ -636,7 +645,8 @@ void MifareAcquireNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *
     LED_A_ON();
     LED_C_OFF();
 
-    BigBuf_free(); BigBuf_Clear_ext(false);
+    BigBuf_free();
+    BigBuf_Clear_ext(false);
     clear_trace();
     set_tracing(true);
 
@@ -645,7 +655,7 @@ void MifareAcquireNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *
 
     LED_C_ON();
 
-    for (uint16_t i = 0; i <= USB_CMD_DATA_SIZE-4; i += 4 ) {
+    for (uint16_t i = 0; i <= USB_CMD_DATA_SIZE - 4; i += 4) {
 
         // Test if the action was cancelled
         if (BUTTON_PRESS()) {
@@ -661,10 +671,17 @@ void MifareAcquireNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *
                 continue;
             }
             switch (card_info.uidlen) {
-                case 4 : cascade_levels = 1; break;
-                case 7 : cascade_levels = 2; break;
-                case 10: cascade_levels = 3; break;
-                default: break;
+                case 4 :
+                    cascade_levels = 1;
+                    break;
+                case 7 :
+                    cascade_levels = 2;
+                    break;
+                case 10:
+                    cascade_levels = 3;
+                    break;
+                default:
+                    break;
             }
             have_uid = true;
         } else { // no need for anticollision. We can directly select the card
@@ -692,14 +709,14 @@ void MifareAcquireNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *
 
         // Save the tag nonce (nt)
         buf[i]   = answer[0];
-        buf[i+1] = answer[1];
-        buf[i+2] = answer[2];
-        buf[i+3] = answer[3];
+        buf[i + 1] = answer[1];
+        buf[i + 2] = answer[2];
+        buf[i + 3] = answer[3];
     }
 
     LED_C_OFF();
     LED_B_ON();
-    cmd_send(CMD_ACK, isOK, cuid, num_nonces-1, buf, sizeof(buf));
+    cmd_send(CMD_ACK, isOK, cuid, num_nonces - 1, buf, sizeof(buf));
     LED_B_OFF();
 
     if (MF_DBGLEVEL >= 3) DbpString("AcquireNonces finished");
@@ -717,7 +734,8 @@ void MifareAcquireNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *
 // Mifare Classic Cards" in Proceedings of the 22nd ACM SIGSAC Conference on
 // Computer and Communications Security, 2015
 //-----------------------------------------------------------------------------
-void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *datain) {
+void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *datain)
+{
 
     struct Crypto1State mpcs = {0, 0};
     struct Crypto1State *pcs;
@@ -746,7 +764,8 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
     LED_A_ON();
     LED_C_OFF();
 
-    BigBuf_free(); BigBuf_Clear_ext(false);
+    BigBuf_free();
+    BigBuf_Clear_ext(false);
     clear_trace();
     set_tracing(false);
 
@@ -755,10 +774,10 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
 
     LED_C_ON();
 
-    for (uint16_t i = 0; i <= USB_CMD_DATA_SIZE - 9; ) {
+    for (uint16_t i = 0; i <= USB_CMD_DATA_SIZE - 9;) {
 
         // Test if the action was cancelled
-        if(BUTTON_PRESS()) {
+        if (BUTTON_PRESS()) {
             isOK = 2;
             field_off = true;
             break;
@@ -766,15 +785,22 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
 
         if (!have_uid) { // need a full select cycle to get the uid first
             iso14a_card_select_t card_info;
-            if(!iso14443a_select_card(uid, &card_info, &cuid, true, 0, true)) {
+            if (!iso14443a_select_card(uid, &card_info, &cuid, true, 0, true)) {
                 if (MF_DBGLEVEL >= 1) Dbprintf("AcquireNonces: Can't select card (ALL)");
                 continue;
             }
             switch (card_info.uidlen) {
-                case 4 : cascade_levels = 1; break;
-                case 7 : cascade_levels = 2; break;
-                case 10: cascade_levels = 3; break;
-                default: break;
+                case 4 :
+                    cascade_levels = 1;
+                    break;
+                case 7 :
+                    cascade_levels = 2;
+                    break;
+                case 10:
+                    cascade_levels = 3;
+                    break;
+                default:
+                    break;
             }
             have_uid = true;
         } else { // no need for anticollision. We can directly select the card
@@ -806,12 +832,12 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
 
         num_nonces++;
         if (num_nonces % 2) {
-            memcpy(buf+i, receivedAnswer, 4);
+            memcpy(buf + i, receivedAnswer, 4);
             nt_par_enc = par_enc[0] & 0xf0;
         } else {
             nt_par_enc |= par_enc[0]  >> 4;
-            memcpy(buf+i+4, receivedAnswer, 4);
-            memcpy(buf+i+8, &nt_par_enc, 1);
+            memcpy(buf + i + 4, receivedAnswer, 4);
+            memcpy(buf + i + 8, &nt_par_enc, 1);
             i += 9;
         }
     }
@@ -871,14 +897,15 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
     iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
 
     // free eventually allocated BigBuf memory
-    BigBuf_free(); BigBuf_Clear_ext(false);
+    BigBuf_free();
+    BigBuf_Clear_ext(false);
 
     if (calibrate) clear_trace();
     set_tracing(true);
 
     // statistics on nonce distance
     int16_t isOK = 0;
-    #define NESTED_MAX_TRIES 12
+#define NESTED_MAX_TRIES 12
     uint16_t unsuccessfull_tries = 0;
     if (calibrate) { // for first call only. Otherwise reuse previous calibration
         LED_B_ON();
@@ -891,33 +918,33 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
         for (rtr = 0; rtr < 17; rtr++) {
 
             // Test if the action was cancelled
-            if(BUTTON_PRESS()) {
+            if (BUTTON_PRESS()) {
                 isOK = -2;
                 break;
             }
 
             // prepare next select. No need to power down the card.
-            if(mifare_classic_halt(pcs, cuid)) {
+            if (mifare_classic_halt(pcs, cuid)) {
                 if (MF_DBGLEVEL >= 2) Dbprintf("Nested: Halt error");
                 rtr--;
                 continue;
             }
 
-            if(!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
+            if (!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
                 if (MF_DBGLEVEL >= 2) Dbprintf("Nested: Can't select card");
                 rtr--;
                 continue;
             };
 
             auth1_time = 0;
-            if(mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1, &auth1_time)) {
+            if (mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1, &auth1_time)) {
                 if (MF_DBGLEVEL >= 2) Dbprintf("Nested: Auth1 error");
                 rtr--;
                 continue;
             };
             auth2_time = (delta_time) ? auth1_time + delta_time : 0;
 
-            if(mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_NESTED, &nt2, &auth2_time)) {
+            if (mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_NESTED, &nt2, &auth2_time)) {
                 if (MF_DBGLEVEL >= 2) Dbprintf("Nested: Auth2 error");
                 rtr--;
                 continue;
@@ -934,8 +961,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
                     davg += i;
                     dmin = MIN(dmin, i);
                     dmax = MAX(dmax, i);
-                }
-                else {
+                } else {
                     delta_time = auth2_time - auth1_time + 32;  // allow some slack for proper timing
                 }
                 if (MF_DBGLEVEL >= 3) Dbprintf("Nested: calibrating... ntdist=%d", i);
@@ -947,7 +973,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
             }
         }
 
-        davg = (davg + (rtr - 1)/2) / (rtr - 1);
+        davg = (davg + (rtr - 1) / 2) / (rtr - 1);
 
         if (MF_DBGLEVEL >= 3) Dbprintf("rtr=%d isOK=%d min=%d max=%d avg=%d, delta_time=%d", rtr, isOK, dmin, dmax, davg, delta_time);
 
@@ -961,24 +987,24 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
     LED_C_ON();
 
     //  get crypted nonces for target sector
-    for(i=0; i < 2 && !isOK; i++) { // look for exactly two different nonces
+    for (i = 0; i < 2 && !isOK; i++) { // look for exactly two different nonces
 
         target_nt[i] = 0;
-        while(target_nt[i] == 0) { // continue until we have an unambiguous nonce
+        while (target_nt[i] == 0) { // continue until we have an unambiguous nonce
 
             // prepare next select. No need to power down the card.
-            if(mifare_classic_halt(pcs, cuid)) {
+            if (mifare_classic_halt(pcs, cuid)) {
                 if (MF_DBGLEVEL >= 2) Dbprintf("Nested: Halt error");
                 continue;
             }
 
-            if(!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
+            if (!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
                 if (MF_DBGLEVEL >= 2) Dbprintf("Nested: Can't select card");
                 continue;
             };
 
             auth1_time = 0;
-            if(mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1, &auth1_time)) {
+            if (mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1, &auth1_time)) {
                 if (MF_DBGLEVEL >= 2) Dbprintf("Nested: Auth1 error");
                 continue;
             };
@@ -993,11 +1019,11 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
             };
 
             nt2 = bytes_to_num(receivedAnswer, 4);
-            if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: Testing nt1=%08x nt2enc=%08x nt2par=%02x", i+1, nt1, nt2, par[0]);
+            if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: Testing nt1=%08x nt2enc=%08x nt2par=%02x", i + 1, nt1, nt2, par[0]);
 
             // Parity validity check
             for (j = 0; j < 4; j++) {
-                par_array[j] = (oddparity8(receivedAnswer[j]) != ((par[0] >> (7-j)) & 0x01));
+                par_array[j] = (oddparity8(receivedAnswer[j]) != ((par[0] >> (7 - j)) & 0x01));
             }
 
             ncount = 0;
@@ -1006,9 +1032,9 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
                 nttest = prng_successor(nttest, 1);
                 ks1 = nt2 ^ nttest;
 
-                if (valid_nonce(nttest, nt2, ks1, par_array)){
+                if (valid_nonce(nttest, nt2, ks1, par_array)) {
                     if (ncount > 0) { // we are only interested in disambiguous nonces, try again
-                        if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: dismissed (ambigous), ntdist=%d", i+1, j);
+                        if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: dismissed (ambigous), ntdist=%d", i + 1, j);
                         target_nt[i] = 0;
                         break;
                     }
@@ -1020,10 +1046,10 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
                         if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#2: dismissed (= nonce#1), ntdist=%d", j);
                         break;
                     }
-                    if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: valid, ntdist=%d", i+1, j);
+                    if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: valid, ntdist=%d", i + 1, j);
                 }
             }
-            if (target_nt[i] == 0 && j == dmax+1 && MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: dismissed (all invalid)", i+1);
+            if (target_nt[i] == 0 && j == dmax + 1 && MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: dismissed (all invalid)", i + 1);
         }
     }
 
@@ -1033,10 +1059,10 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
 
     uint8_t buf[4 + 4 * 4] = {0};
     memcpy(buf, &cuid, 4);
-    memcpy(buf+4, &target_nt[0], 4);
-    memcpy(buf+8, &target_ks[0], 4);
-    memcpy(buf+12, &target_nt[1], 4);
-    memcpy(buf+16, &target_ks[1], 4);
+    memcpy(buf + 4, &target_nt[0], 4);
+    memcpy(buf + 8, &target_ks[0], 4);
+    memcpy(buf + 12, &target_nt[1], 4);
+    memcpy(buf + 16, &target_ks[1], 4);
 
     LED_B_ON();
     cmd_send(CMD_ACK, isOK, 0, targetBlockNo + (targetKeyType * 0x100), buf, sizeof(buf));
@@ -1075,9 +1101,10 @@ typedef struct chk_t {
 //  2 = failed to select.
 //  1 = wrong key
 //  0 = correct key
-uint8_t chkKey( struct chk_t *c ) {
+uint8_t chkKey(struct chk_t *c)
+{
     uint8_t i = 0, res = 2;
-    while( i < 5 ) {
+    while (i < 5) {
         // this part is from Piwi's faster nonce collecting part in Hardnested.
         // assume: fast select
         if (!iso14443a_fast_select_card(c->uid, c->cl)) {
@@ -1090,28 +1117,29 @@ uint8_t chkKey( struct chk_t *c ) {
 
         // if successfull auth, send HALT
         // if ( !res )
-            // mifare_classic_halt_ex(c->pcs);
+        // mifare_classic_halt_ex(c->pcs);
         break;
     }
     return res;
 }
 
-uint8_t chkKey_readb(struct chk_t *c, uint8_t *keyb) {
+uint8_t chkKey_readb(struct chk_t *c, uint8_t *keyb)
+{
 
     if (!iso14443a_fast_select_card(c->uid, c->cl))
         return 2;
 
-    if ( mifare_classic_authex(c->pcs, c->cuid, c->block, 0, c->key, AUTH_FIRST, NULL, NULL) )
+    if (mifare_classic_authex(c->pcs, c->cuid, c->block, 0, c->key, AUTH_FIRST, NULL, NULL))
         return 1;
 
     uint8_t data[16] = {0x00};
     uint8_t res = mifare_classic_readblock(c->pcs, c->cuid, c->block, data);
 
     // successful read
-    if ( !res ) {
+    if (!res) {
         // data was something else than zeros.
-        if ( memcmp(data+10, "\x00\x00\x00\x00\x00\x00", 6) != 0) {
-            memcpy(keyb, data+10, 6);
+        if (memcmp(data + 10, "\x00\x00\x00\x00\x00\x00", 6) != 0) {
+            memcpy(keyb, data + 10, 6);
             res = 0;
         } else {
             res = 3;
@@ -1121,17 +1149,18 @@ uint8_t chkKey_readb(struct chk_t *c, uint8_t *keyb) {
     return res;
 }
 
-void chkKey_scanA(struct chk_t *c, struct sector_t *k_sector, uint8_t *found, uint8_t *sectorcnt, uint8_t *foundkeys) {
+void chkKey_scanA(struct chk_t *c, struct sector_t *k_sector, uint8_t *found, uint8_t *sectorcnt, uint8_t *foundkeys)
+{
     for (uint8_t s = 0; s < *sectorcnt; s++) {
 
         // skip already found A keys
-        if ( found[(s*2)] )
+        if (found[(s * 2)])
             continue;
 
-        c->block = FirstBlockOfSector( s );
-        if ( chkKey( c ) == 0 ) {
+        c->block = FirstBlockOfSector(s);
+        if (chkKey(c) == 0) {
             num_to_bytes(c->key, 6, k_sector[s].keyA);
-            found[(s*2)] = 1;
+            found[(s * 2)] = 1;
             ++*foundkeys;
 
             if (MF_DBGLEVEL >= 3) Dbprintf("ChkKeys_fast: Scan A found (%d)", c->block);
@@ -1139,17 +1168,18 @@ void chkKey_scanA(struct chk_t *c, struct sector_t *k_sector, uint8_t *found, ui
     }
 }
 
-void chkKey_scanB(struct chk_t *c, struct sector_t *k_sector, uint8_t *found, uint8_t *sectorcnt, uint8_t *foundkeys) {
+void chkKey_scanB(struct chk_t *c, struct sector_t *k_sector, uint8_t *found, uint8_t *sectorcnt, uint8_t *foundkeys)
+{
     for (uint8_t s = 0; s < *sectorcnt; s++) {
 
         // skip already found B keys
-        if ( found[(s*2)+1] )
+        if (found[(s * 2) + 1])
             continue;
 
-        c->block = FirstBlockOfSector( s );
-        if ( chkKey( c ) == 0 ) {
+        c->block = FirstBlockOfSector(s);
+        if (chkKey(c) == 0) {
             num_to_bytes(c->key, 6, k_sector[s].keyB);
-            found[(s*2)+1] = 1;
+            found[(s * 2) + 1] = 1;
             ++*foundkeys;
 
             if (MF_DBGLEVEL >= 3) Dbprintf("ChkKeys_fast: Scan B found (%d)", c->block);
@@ -1159,29 +1189,30 @@ void chkKey_scanB(struct chk_t *c, struct sector_t *k_sector, uint8_t *found, ui
 
 // loop all A keys,
 // when A is found but not B,  try to read B.
-void chkKey_loopBonly(struct chk_t *c, struct sector_t *k_sector, uint8_t *found, uint8_t *sectorcnt, uint8_t *foundkeys) {
+void chkKey_loopBonly(struct chk_t *c, struct sector_t *k_sector, uint8_t *found, uint8_t *sectorcnt, uint8_t *foundkeys)
+{
 
     // read Block B, if A is found.
     for (uint8_t s = 0; s < *sectorcnt; ++s) {
 
-        if ( found[(s*2)] && found[(s*2)+1] )
+        if (found[(s * 2)] && found[(s * 2) + 1])
             continue;
 
-        c->block = (FirstBlockOfSector( s ) + NumBlocksPerSector( s ) - 1);
+        c->block = (FirstBlockOfSector(s) + NumBlocksPerSector(s) - 1);
 
         // A but not B
-        if ( found[(s*2)]  &&  !found[(s*2)+1] ){
+        if (found[(s * 2)]  &&  !found[(s * 2) + 1]) {
             c->key = bytes_to_num(k_sector[s].keyA, 6);
             uint8_t status = chkKey_readb(c, k_sector[s].keyB);
-            if ( status == 0 ){
-                found[(s*2)+1] = 1;
+            if (status == 0) {
+                found[(s * 2) + 1] = 1;
                 ++*foundkeys;
 
                 if (MF_DBGLEVEL >= 3) Dbprintf("ChkKeys_fast: Reading B found (%d)", c->block);
 
                 // try quick find all B?
                 // assume: keys comes in groups. Find one B, test against all B.
-                c->key = bytes_to_num( k_sector[s].keyB, 6);
+                c->key = bytes_to_num(k_sector[s].keyB, 6);
                 c->keyType = 1;
                 chkKey_scanB(c, k_sector, found, sectorcnt, foundkeys);
             }
@@ -1197,7 +1228,8 @@ void chkKey_loopBonly(struct chk_t *c, struct sector_t *k_sector, uint8_t *found
 // arg1 = clear trace
 // arg2 = antal nycklar i keychunk
 // datain = keys as array
-void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain) {
+void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)
+{
 
     // first call or
     uint8_t sectorcnt = arg0 & 0xFF; // 16;
@@ -1223,25 +1255,25 @@ void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *da
     static uint8_t *uid;
 
 #ifdef WITH_FLASH
-    if ( use_flashmem ) {
+    if (use_flashmem) {
         BigBuf_free();
         uint16_t isok = 0;
         uint8_t size[2] = {0x00, 0x00};
         isok = Flash_ReadData(DEFAULT_MF_KEYS_OFFSET, size, 2);
-        if ( isok != 2 )
+        if (isok != 2)
             goto OUT;
 
         keyCount = size[1] << 8 | size[0];
 
-        if ( keyCount == 0 && keyCount == 0xFFFF)
+        if (keyCount == 0 && keyCount == 0xFFFF)
             goto OUT;
 
-        datain = BigBuf_malloc( keyCount * 6);
-        if (datain == NULL )
+        datain = BigBuf_malloc(keyCount * 6);
+        if (datain == NULL)
             goto OUT;
 
-        isok = Flash_ReadData(DEFAULT_MF_KEYS_OFFSET+2, datain, keyCount * 6);
-        if ( isok != keyCount * 6 )
+        isok = Flash_ReadData(DEFAULT_MF_KEYS_OFFSET + 2, datain, keyCount * 6);
+        if (isok != keyCount * 6)
             goto OUT;
 
     }
@@ -1249,7 +1281,7 @@ void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *da
 
     if (uid == NULL || firstchunk) {
         uid = BigBuf_malloc(10);
-        if (uid == NULL )
+        if (uid == NULL)
             goto OUT;
     }
 
@@ -1258,25 +1290,32 @@ void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *da
     LEDsoff();
     LED_A_ON();
 
-    if ( firstchunk ) {
+    if (firstchunk) {
         clear_trace();
         set_tracing(false);
 
-        memset(k_sector, 0x00, 480+10);
+        memset(k_sector, 0x00, 480 + 10);
         memset(found, 0x00, sizeof(found));
         foundkeys = 0;
 
         iso14a_card_select_t card_info;
-        if ( !iso14443a_select_card(uid, &card_info, &cuid, true, 0, true)) {
+        if (!iso14443a_select_card(uid, &card_info, &cuid, true, 0, true)) {
             if (MF_DBGLEVEL >= 1) Dbprintf("ChkKeys_fast: Can't select card (ALL)");
             goto OUT;
         }
 
         switch (card_info.uidlen) {
-            case 4 : cascade_levels = 1; break;
-            case 7 : cascade_levels = 2; break;
-            case 10: cascade_levels = 3; break;
-            default: break;
+            case 4 :
+                cascade_levels = 1;
+                break;
+            case 7 :
+                cascade_levels = 2;
+                break;
+            case 10:
+                cascade_levels = 3;
+                break;
+            default:
+                break;
         }
 
         CHK_TIMEOUT();
@@ -1290,7 +1329,7 @@ void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *da
     chk_data.block = 0;
 
     // keychunk loop - depth first one sector.
-    if ( strategy == 1 || use_flashmem) {
+    if (strategy == 1 || use_flashmem) {
 
         uint8_t newfound = foundkeys;
 
@@ -1300,7 +1339,7 @@ void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *da
         // keep track of how many sectors on card.
         for (uint8_t s = 0; s < sectorcnt; ++s) {
 
-            if ( found[(s*2)] && found[(s*2)+1] )
+            if (found[(s * 2)] && found[(s * 2) + 1])
                 continue;
 
             for (uint16_t i = s_point; i < keyCount; ++i) {
@@ -1313,40 +1352,40 @@ void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *da
                 }
 
                 // found all keys?
-                if ( foundkeys == allkeys )
+                if (foundkeys == allkeys)
                     goto OUT;
 
                 WDT_HIT();
 
                 // assume: block0,1,2 has more read rights in accessbits than the sectortrailer. authenticating against block0 in each sector
-                chk_data.block = FirstBlockOfSector( s );
+                chk_data.block = FirstBlockOfSector(s);
 
                 // new key
                 chk_data.key = bytes_to_num(datain + i * 6, 6);
 
                 // skip already found A keys
-                if( !found[(s*2)] ) {
+                if (!found[(s * 2)]) {
                     chk_data.keyType = 0;
-                    status = chkKey( &chk_data);
-                    if ( status == 0 ) {
+                    status = chkKey(&chk_data);
+                    if (status == 0) {
                         memcpy(k_sector[s].keyA, datain + i * 6, 6);
-                        found[(s*2)] = 1;
+                        found[(s * 2)] = 1;
                         ++foundkeys;
 
                         chkKey_scanA(&chk_data, k_sector, found, &sectorcnt, &foundkeys);
 
                         // read Block B, if A is found.
-                        chkKey_loopBonly( &chk_data, k_sector, found, &sectorcnt, &foundkeys);
+                        chkKey_loopBonly(&chk_data, k_sector, found, &sectorcnt, &foundkeys);
 
                         chk_data.keyType = 1;
                         chkKey_scanB(&chk_data, k_sector, found, &sectorcnt, &foundkeys);
 
                         chk_data.keyType = 0;
-                        chk_data.block = FirstBlockOfSector( s );
+                        chk_data.block = FirstBlockOfSector(s);
 
-                        if ( use_flashmem ) {
-                            if ( lastpos != i && lastpos != 0) {
-                                if ( i - lastpos < 0xF) {
+                        if (use_flashmem) {
+                            if (lastpos != i && lastpos != 0) {
+                                if (i - lastpos < 0xF) {
                                     s_point = i & 0xFFF0;
                                 }
                             } else {
@@ -1357,20 +1396,20 @@ void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *da
                 }
 
                 // skip already found B keys
-                if( !found[(s*2)+1] ) {
+                if (!found[(s * 2) + 1]) {
                     chk_data.keyType = 1;
-                    status = chkKey( &chk_data);
-                    if ( status == 0 ) {
+                    status = chkKey(&chk_data);
+                    if (status == 0) {
                         memcpy(k_sector[s].keyB, datain + i * 6, 6);
-                        found[(s*2)+1] = 1;
+                        found[(s * 2) + 1] = 1;
                         ++foundkeys;
 
                         chkKey_scanB(&chk_data, k_sector, found, &sectorcnt, &foundkeys);
 
-                        if ( use_flashmem ) {
-                            if ( lastpos != i && lastpos != 0) {
+                        if (use_flashmem) {
+                            if (lastpos != i && lastpos != 0) {
 
-                                if ( i - lastpos < 0xF)
+                                if (i - lastpos < 0xF)
                                     s_point = i & 0xFFF0;
                             } else {
                                 lastpos = i;
@@ -1379,22 +1418,22 @@ void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *da
                     }
                 }
 
-                if ( found[(s*2)] && found[(s*2)+1] )
+                if (found[(s * 2)] && found[(s * 2) + 1])
                     break;
 
             } // end keys test loop - depth first
 
             // assume1. if no keys found in first sector, get next keychunk from client
-            if ( !use_flashmem && (newfound-foundkeys == 0) )
+            if (!use_flashmem && (newfound - foundkeys == 0))
                 goto OUT;
 
         } // end loop - sector
     } // end strategy 1
 
-    if ( foundkeys == allkeys )
+    if (foundkeys == allkeys)
         goto OUT;
 
-    if ( strategy == 2 || use_flashmem ) {
+    if (strategy == 2 || use_flashmem) {
 
         // Keychunk loop
         for (uint16_t i = 0; i < keyCount; i++) {
@@ -1403,7 +1442,7 @@ void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *da
             if (BUTTON_PRESS() && !usb_poll_validate_length()) break;
 
             // found all keys?
-            if ( foundkeys == allkeys )
+            if (foundkeys == allkeys)
                 goto OUT;
 
             WDT_HIT();
@@ -1415,40 +1454,40 @@ void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *da
             // keep track of how many sectors on card.
             for (uint8_t s = 0; s < sectorcnt; ++s) {
 
-                if ( found[(s*2)] && found[(s*2)+1] ) continue;
+                if (found[(s * 2)] && found[(s * 2) + 1]) continue;
 
                 // found all keys?
-                if ( foundkeys == allkeys )
+                if (foundkeys == allkeys)
                     goto OUT;
 
                 // assume: block0,1,2 has more read rights in accessbits than the sectortrailer. authenticating against block0 in each sector
-                chk_data.block = FirstBlockOfSector( s );
+                chk_data.block = FirstBlockOfSector(s);
 
                 // skip already found A keys
-                if( !found[(s*2)] ) {
+                if (!found[(s * 2)]) {
                     chk_data.keyType = 0;
-                    status = chkKey( &chk_data);
-                    if ( status == 0 ) {
+                    status = chkKey(&chk_data);
+                    if (status == 0) {
                         memcpy(k_sector[s].keyA, datain + i * 6, 6);
-                        found[(s*2)] = 1;
+                        found[(s * 2)] = 1;
                         ++foundkeys;
 
-                        chkKey_scanA( &chk_data, k_sector, found, &sectorcnt, &foundkeys);
+                        chkKey_scanA(&chk_data, k_sector, found, &sectorcnt, &foundkeys);
 
                         // read Block B, if A is found.
-                        chkKey_loopBonly( &chk_data, k_sector, found, &sectorcnt, &foundkeys);
+                        chkKey_loopBonly(&chk_data, k_sector, found, &sectorcnt, &foundkeys);
 
-                        chk_data.block = FirstBlockOfSector( s );
+                        chk_data.block = FirstBlockOfSector(s);
                     }
                 }
 
                 // skip already found B keys
-                if( !found[(s*2)+1] ) {
+                if (!found[(s * 2) + 1]) {
                     chk_data.keyType = 1;
-                    status = chkKey( &chk_data);
-                    if ( status == 0 ) {
+                    status = chkKey(&chk_data);
+                    if (status == 0) {
                         memcpy(k_sector[s].keyB, datain + i * 6, 6);
-                        found[(s*2)+1] = 1;
+                        found[(s * 2) + 1] = 1;
                         ++foundkeys;
 
                         chkKey_scanB(&chk_data, k_sector, found, &sectorcnt, &foundkeys);
@@ -1463,7 +1502,7 @@ OUT:
     crypto1_destroy(pcs);
 
     // All keys found, send to client, or last keychunk from client
-    if (foundkeys == allkeys || lastchunk ) {
+    if (foundkeys == allkeys || lastchunk) {
 
         uint64_t foo = 0;
         for (uint8_t m = 0; m < 64; m++) {
@@ -1472,28 +1511,30 @@ OUT:
 
         uint16_t bar = 0;
         uint8_t j = 0;
-        for (uint8_t m=64; m < sizeof(found); m++) {
+        for (uint8_t m = 64; m < sizeof(found); m++) {
             bar |= ((uint16_t)(found[m] & 1) << j++);
         }
 
-        uint8_t *tmp =  BigBuf_malloc(480+10);
-        memcpy(tmp, k_sector, sectorcnt * sizeof(sector_t) );
-        num_to_bytes(foo, 8, tmp+480);
+        uint8_t *tmp =  BigBuf_malloc(480 + 10);
+        memcpy(tmp, k_sector, sectorcnt * sizeof(sector_t));
+        num_to_bytes(foo, 8, tmp + 480);
         tmp[488] = bar & 0xFF;
         tmp[489] = bar >> 8 & 0xFF;
 
-        cmd_send(CMD_ACK, foundkeys, 0, 0, tmp, 480+10);
+        cmd_send(CMD_ACK, foundkeys, 0, 0, tmp, 480 + 10);
 
         set_tracing(false);
         FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-        BigBuf_free(); BigBuf_Clear_ext(false);
+        BigBuf_free();
+        BigBuf_Clear_ext(false);
     } else {
         // partial/none keys found
         cmd_send(CMD_ACK, foundkeys, 0, 0, 0, 0);
     }
 }
 
-void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) {
+void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
+{
 
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 
@@ -1535,10 +1576,17 @@ void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) {
                 continue;
             }
             switch (card_info.uidlen) {
-                case 4 : cascade_levels = 1; break;
-                case 7 : cascade_levels = 2; break;
-                case 10: cascade_levels = 3; break;
-                default: break;
+                case 4 :
+                    cascade_levels = 1;
+                    break;
+                case 7 :
+                    cascade_levels = 2;
+                    break;
+                case 10:
+                    cascade_levels = 3;
+                    break;
+                default:
+                    break;
             }
             have_uid = true;
         } else { // no need for anticollision. We can directly select the card
@@ -1575,7 +1623,8 @@ void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) {
 // MIFARE commands set debug level
 //
 //-----------------------------------------------------------------------------
-void MifareSetDbgLvl(uint16_t arg0){
+void MifareSetDbgLvl(uint16_t arg0)
+{
     MF_DBGLEVEL = arg0;
     Dbprintf("Debug level: %d", MF_DBGLEVEL);
 }
@@ -1588,24 +1637,27 @@ void MifareSetDbgLvl(uint16_t arg0){
 // destroy the Emulator Memory.
 //-----------------------------------------------------------------------------
 
-void MifareEMemClr(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){
+void MifareEMemClr(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)
+{
     FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
     emlClearMem();
 }
 
-void MifareEMemSet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){
+void MifareEMemSet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)
+{
     FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-    if (arg2==0) arg2 = 16; // backwards compat... default bytewidth
+    if (arg2 == 0) arg2 = 16; // backwards compat... default bytewidth
     emlSetMem_xt(datain, arg0, arg1, arg2); // data, block num, blocks count, block byte width
 }
 
-void MifareEMemGet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){
+void MifareEMemGet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)
+{
     FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
     byte_t buf[USB_CMD_DATA_SIZE] = {0x00};
     emlGetMem(buf, arg0, arg1); // data, block num, blocks count (max 4)
 
     LED_B_ON();
-    cmd_send(CMD_ACK,arg0,arg1,0,buf,USB_CMD_DATA_SIZE);
+    cmd_send(CMD_ACK, arg0, arg1, 0, buf, USB_CMD_DATA_SIZE);
     LED_B_OFF();
 }
 
@@ -1613,7 +1665,8 @@ void MifareEMemGet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)
 // Load a card into the emulator memory
 //
 //-----------------------------------------------------------------------------
-void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){
+void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)
+{
     uint8_t numSectors = arg0;
     uint8_t keyType = arg1;
     uint64_t ui64Key = 0;
@@ -1637,21 +1690,21 @@ void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
 
     bool isOK = true;
 
-    if(!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
+    if (!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
         isOK = false;
         if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
     }
 
     for (uint8_t sectorNo = 0; isOK && sectorNo < numSectors; sectorNo++) {
         ui64Key = emlGetKey(sectorNo, keyType);
-        if (sectorNo == 0){
-            if(isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_FIRST)) {
+        if (sectorNo == 0) {
+            if (isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_FIRST)) {
                 isOK = false;
                 if (MF_DBGLEVEL >= 1) Dbprintf("Sector[%2d]. Auth error", sectorNo);
                 break;
             }
         } else {
-            if(isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_NESTED)) {
+            if (isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_NESTED)) {
                 isOK = false;
                 if (MF_DBGLEVEL >= 1) Dbprintf("Sector[%2d]. Auth nested error", sectorNo);
                 break;
@@ -1659,7 +1712,7 @@ void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
         }
 
         for (uint8_t blockNo = 0; isOK && blockNo < NumBlocksPerSector(sectorNo); blockNo++) {
-            if(isOK && mifare_classic_readblock(pcs, cuid, FirstBlockOfSector(sectorNo) + blockNo, dataoutbuf)) {
+            if (isOK && mifare_classic_readblock(pcs, cuid, FirstBlockOfSector(sectorNo) + blockNo, dataoutbuf)) {
                 isOK = false;
                 if (MF_DBGLEVEL >= 1) Dbprintf("Error reading sector %2d block %2d", sectorNo, blockNo);
                 break;
@@ -1677,7 +1730,7 @@ void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
 
     }
 
-    if(mifare_classic_halt(pcs, cuid))
+    if (mifare_classic_halt(pcs, cuid))
         if (MF_DBGLEVEL >= 1)
             Dbprintf("Halt error");
 
@@ -1710,7 +1763,8 @@ uint8_t wupC1[] = { MIFARE_MAGICWUPC1 };
 uint8_t wupC2[] = { MIFARE_MAGICWUPC2 };
 uint8_t wipeC[] = { MIFARE_MAGICWIPEC };
 
-void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){
+void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain)
+{
 
     // params
     uint8_t workFlags = arg0;
@@ -1741,7 +1795,7 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){
     while (true) {
         // read UID and return to client with write
         if (workFlags & MAGIC_UID) {
-            if(!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
+            if (!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
                 if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card");
                 errormsg = MAGIC_UID;
             }
@@ -1750,16 +1804,16 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){
         }
 
         // wipe tag, fill it with zeros
-        if (workFlags & MAGIC_WIPE){
+        if (workFlags & MAGIC_WIPE) {
             ReaderTransmitBitsPar(wupC1, 7, NULL, NULL);
-            if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
+            if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
                 if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("wupC1 error");
                 errormsg = MAGIC_WIPE;
                 break;
             }
 
             ReaderTransmit(wipeC, sizeof(wipeC), NULL);
-            if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
+            if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
                 if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("wipeC error");
                 errormsg = MAGIC_WIPE;
                 break;
@@ -1771,15 +1825,15 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){
         // write block
         if (workFlags & MAGIC_WUPC) {
             ReaderTransmitBitsPar(wupC1, 7, NULL, NULL);
-            if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
+            if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
                 if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("wupC1 error");
                 errormsg = MAGIC_WUPC;
                 break;
             }
 
-            if ( !is1b ) {
+            if (!is1b) {
                 ReaderTransmit(wupC2, sizeof(wupC2), NULL);
-                if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
+                if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
                     if (MF_DBGLEVEL >= MF_DBG_ALL) Dbprintf("Assuming Magic Gen 1B tag. [wupC2 failed]");
                     is1b = true;
                     continue;
@@ -1811,8 +1865,8 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){
 
     } // end while
 
-    if (isOK )
-        cmd_send(CMD_ACK,1,0,0,uid,sizeof(uid));
+    if (isOK)
+        cmd_send(CMD_ACK, 1, 0, 0, uid, sizeof(uid));
     else
         OnErrorMagic(errormsg);
 
@@ -1820,7 +1874,8 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){
         OnSuccessMagic();
 }
 
-void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){
+void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain)
+{
 
     uint8_t workFlags = arg0;
     uint8_t blockNo = arg1;
@@ -1849,15 +1904,15 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){
     while (true) {
         if (workFlags & MAGIC_WUPC) {
             ReaderTransmitBitsPar(wupC1, 7, NULL, NULL);
-            if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
+            if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
                 if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("wupC1 error");
                 errormsg = MAGIC_WUPC;
                 break;
             }
 
-            if ( !is1b )  {
+            if (!is1b)  {
                 ReaderTransmit(wupC2, sizeof(wupC2), NULL);
-                if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
+                if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
                     if (MF_DBGLEVEL >= MF_DBG_ALL) Dbprintf("Assuming Magic Gen 1B tag. [wupC2 failed]");
                     is1b = true;
                     continue;
@@ -1887,7 +1942,7 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){
             memcpy(datain, data, sizeof(data));
     } else {
         if (isOK)
-            cmd_send(CMD_ACK,1,0,0,data,sizeof(data));
+            cmd_send(CMD_ACK, 1, 0, 0, data, sizeof(data));
         else
             OnErrorMagic(errormsg);
     }
@@ -1896,10 +1951,11 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){
         OnSuccessMagic();
 }
 
-void MifareCIdent(){
-    #define GEN_1A 1
-    #define GEN_1B 2
-    #define GEN_2  4
+void MifareCIdent()
+{
+#define GEN_1A 1
+#define GEN_1B 2
+#define GEN_2  4
     // variables
     uint8_t isGen = 0;
     uint8_t rec[1] = {0x00};
@@ -1909,38 +1965,40 @@ void MifareCIdent(){
 
     // Generation 1 test
     ReaderTransmitBitsPar(wupC1, 7, NULL, NULL);
-    if(!ReaderReceive(rec, recpar) || (rec[0] != 0x0a)) {
+    if (!ReaderReceive(rec, recpar) || (rec[0] != 0x0a)) {
         goto TEST2;
     };
     isGen = GEN_1B;
 
     ReaderTransmit(wupC2, sizeof(wupC2), NULL);
-    if(!ReaderReceive(rec, recpar) || (rec[0] != 0x0a)) {
+    if (!ReaderReceive(rec, recpar) || (rec[0] != 0x0a)) {
         goto OUT;
     };
     isGen = GEN_1A;
     goto OUT;
 
-TEST2:;
-/*
-    // Generation 2 test
+TEST2:
+    ;
+    /*
+        // Generation 2 test
 
-    // halt previous.
-    mifare_classic_halt(NULL, 0);
+        // halt previous.
+        mifare_classic_halt(NULL, 0);
 
-    //select
-    if (!iso14443a_select_card(NULL, NULL, NULL, true, 0, true)) {
-        goto OUT;
-    };
+        //select
+        if (!iso14443a_select_card(NULL, NULL, NULL, true, 0, true)) {
+            goto OUT;
+        };
 
-    // MIFARE_CLASSIC_WRITEBLOCK 0xA0
-    // ACK 0x0a
-    uint16_t len = mifare_sendcmd_short(null, 1, 0xA0, 0, rec, recpar, NULL);
-    if ((len != 1) || (rec[0] != 0x0A)) {
-        isGen = GEN_2;
-    };
-    */
-OUT:;
+        // MIFARE_CLASSIC_WRITEBLOCK 0xA0
+        // ACK 0x0a
+        uint16_t len = mifare_sendcmd_short(null, 1, 0xA0, 0, rec, recpar, NULL);
+        if ((len != 1) || (rec[0] != 0x0A)) {
+            isGen = GEN_2;
+        };
+        */
+OUT:
+    ;
     // removed the if,  since some magic tags misbehavies and send an answer to it.
     mifare_classic_halt_ex(NULL);
     cmd_send(CMD_ACK, isGen, 0, 0, 0, 0);
@@ -1948,18 +2006,21 @@ OUT:;
     OnSuccessMagic();
 }
 
-void OnSuccessMagic(){
+void OnSuccessMagic()
+{
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     LEDsoff();
     set_tracing(false);
 }
-void OnErrorMagic(uint8_t reason){
+void OnErrorMagic(uint8_t reason)
+{
     //          ACK, ISOK, reason,0,0,0
-    cmd_send(CMD_ACK,0,reason,0,0,0);
+    cmd_send(CMD_ACK, 0, reason, 0, 0, 0);
     OnSuccessMagic();
 }
 
-void MifareSetMod(uint8_t mod, uint8_t *key) {
+void MifareSetMod(uint8_t mod, uint8_t *key)
+{
     uint64_t ui64Key = bytes_to_num(key, 6);
 
     // variables
@@ -1982,12 +2043,12 @@ void MifareSetMod(uint8_t mod, uint8_t *key) {
     LED_C_OFF();
 
     while (true) {
-        if(!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
+        if (!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
             if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
             break;
         }
 
-        if(mifare_classic_auth(pcs, cuid, 0, 0, ui64Key, AUTH_FIRST)) {
+        if (mifare_classic_auth(pcs, cuid, 0, 0, ui64Key, AUTH_FIRST)) {
             if (MF_DBGLEVEL >= 1) Dbprintf("Auth error");
             break;
         }
@@ -1997,7 +2058,7 @@ void MifareSetMod(uint8_t mod, uint8_t *key) {
             break;
         }
 
-        if(mifare_classic_halt(pcs, cuid)) {
+        if (mifare_classic_halt(pcs, cuid)) {
             if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
             break;
         }
@@ -2019,7 +2080,8 @@ void MifareSetMod(uint8_t mod, uint8_t *key) {
 //
 // DESFIRE
 //
-void Mifare_DES_Auth1(uint8_t arg0, uint8_t *datain){
+void Mifare_DES_Auth1(uint8_t arg0, uint8_t *datain)
+{
     byte_t dataout[12] = {0x00};
     uint8_t uid[10] = {0x00};
     uint32_t cuid = 0;
@@ -2029,13 +2091,13 @@ void Mifare_DES_Auth1(uint8_t arg0, uint8_t *datain){
     set_tracing(true);
 
     int len = iso14443a_select_card(uid, NULL, &cuid, true, 0, false);
-    if(!len) {
+    if (!len) {
         if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card");
         OnError(1);
         return;
     };
 
-    if(mifare_desfire_des_auth1(cuid, dataout)){
+    if (mifare_desfire_des_auth1(cuid, dataout)) {
         if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication part1: Fail.");
         OnError(4);
         return;
@@ -2045,7 +2107,8 @@ void Mifare_DES_Auth1(uint8_t arg0, uint8_t *datain){
     cmd_send(CMD_ACK, 1, cuid, 0, dataout, sizeof(dataout));
 }
 
-void Mifare_DES_Auth2(uint32_t arg0, uint8_t *datain){
+void Mifare_DES_Auth2(uint32_t arg0, uint8_t *datain)
+{
     uint32_t cuid = arg0;
     uint8_t key[16] = {0x00};
     byte_t dataout[12] = {0x00};
@@ -2055,7 +2118,7 @@ void Mifare_DES_Auth2(uint32_t arg0, uint8_t *datain){
 
     isOK = mifare_desfire_des_auth2(cuid, key, dataout);
 
-    if( isOK) {
+    if (isOK) {
         if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Authentication part2: Failed");
         OnError(4);
         return;
diff --git a/armsrc/mifaredesfire.c b/armsrc/mifaredesfire.c
index e53ac0f59..55dbb4646 100644
--- a/armsrc/mifaredesfire.c
+++ b/armsrc/mifaredesfire.c
@@ -10,13 +10,14 @@
 // the block number for the ISO14443-4 PCB
 uint8_t pcb_blocknum = 0;
 // Deselect card by sending a s-block. the crc is precalced for speed
-static  uint8_t deselect_cmd[] = {0xc2,0xe0,0xb4};
+static  uint8_t deselect_cmd[] = {0xc2, 0xe0, 0xb4};
 
 //static uint8_t __msg[MAX_FRAME_SIZE] = { 0x0A, 0x00, 0x00, /* ..., */ 0x00 };
 /*                                       PCB   CID   CMD    PAYLOAD    */
 //static uint8_t __res[MAX_FRAME_SIZE];
 
-bool InitDesfireCard(){
+bool InitDesfireCard()
+{
 
     iso14a_card_select_t card;
 
@@ -33,14 +34,15 @@ bool InitDesfireCard(){
 
 // ARG0 flag enums
 enum  {
- NONE       = 0x00,
- INIT       = 0x01,
- DISCONNECT = 0x02,
- CLEARTRACE = 0x04,
- BAR        = 0x08,
+    NONE       = 0x00,
+    INIT       = 0x01,
+    DISCONNECT = 0x02,
+    CLEARTRACE = 0x04,
+    BAR        = 0x08,
 } CmdOptions ;
 
-void MifareSendCommand(uint8_t arg0, uint8_t arg1, uint8_t *datain){
+void MifareSendCommand(uint8_t arg0, uint8_t arg1, uint8_t *datain)
+{
 
     /* ARG0 contains flags.
         0x01 = init card.
@@ -50,7 +52,7 @@ void MifareSendCommand(uint8_t arg0, uint8_t arg1, uint8_t *datain){
     uint8_t flags = arg0;
     size_t datalen = arg1;
     uint8_t resp[RECEIVE_SIZE];
-    memset(resp,0,sizeof(resp));
+    memset(resp, 0, sizeof(resp));
 
     if (MF_DBGLEVEL >= 4) {
         Dbprintf(" flags : %02X", flags);
@@ -58,11 +60,11 @@ void MifareSendCommand(uint8_t arg0, uint8_t arg1, uint8_t *datain){
         print_result(" RX    : ", datain, datalen);
     }
 
-    if ( flags & CLEARTRACE )
+    if (flags & CLEARTRACE)
         clear_trace();
 
-    if ( flags & INIT ){
-        if ( !InitDesfireCard() )
+    if (flags & INIT) {
+        if (!InitDesfireCard())
             return;
     }
 
@@ -70,7 +72,7 @@ void MifareSendCommand(uint8_t arg0, uint8_t arg1, uint8_t *datain){
     if (MF_DBGLEVEL >= 4)
         print_result("ERR <--: ", resp, len);
 
-    if ( !len ) {
+    if (!len) {
         OnError(2);
         return;
     }
@@ -78,13 +80,14 @@ void MifareSendCommand(uint8_t arg0, uint8_t arg1, uint8_t *datain){
     // reset the pcb_blocknum,
     pcb_blocknum = 0;
 
-    if ( flags & DISCONNECT )
+    if (flags & DISCONNECT)
         OnSuccess();
 
-    cmd_send(CMD_ACK,1,len,0,resp,len);
+    cmd_send(CMD_ACK, 1, len, 0, resp, len);
 }
 
-void MifareDesfireGetInformation(){
+void MifareDesfireGetInformation()
+{
 
     int len = 0;
     iso14a_card_select_t card;
@@ -105,13 +108,13 @@ void MifareDesfireGetInformation(){
     iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
 
     // card select - information
-    if ( !iso14443a_select_card(NULL, &card, NULL, true, 0, false) ) {
+    if (!iso14443a_select_card(NULL, &card, NULL, true, 0, false)) {
         if (MF_DBGLEVEL >= MF_DBG_ERROR) DbpString("Can't select card");
         OnError(1);
         return;
     }
 
-    if ( card.uidlen != 7 ) {
+    if (card.uidlen != 7) {
         if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Wrong UID size. Expected 7byte got %d", card.uidlen);
         OnError(2);
         return;
@@ -127,7 +130,7 @@ void MifareDesfireGetInformation(){
     size_t cmd_len = sizeof(cmd);
 
     len =  DesfireAPDU(cmd, cmd_len, resp);
-    if ( !len ) {
+    if (!len) {
         print_result("ERROR <--: ", resp, len);
         OnError(3);
         return;
@@ -135,12 +138,12 @@ void MifareDesfireGetInformation(){
 
     LED_A_OFF();
     LED_B_ON();
-    memcpy(dataout+7,resp+3,7);
+    memcpy(dataout + 7, resp + 3, 7);
 
     // ADDITION_FRAME 1
     cmd[0] = ADDITIONAL_FRAME;
     len =  DesfireAPDU(cmd, cmd_len, resp);
-    if ( !len ) {
+    if (!len) {
         print_result("ERROR <--: ", resp, len);
         OnError(3);
         return;
@@ -148,30 +151,31 @@ void MifareDesfireGetInformation(){
 
     LED_B_OFF();
     LED_C_ON();
-    memcpy(dataout+7+7,resp+3,7);
+    memcpy(dataout + 7 + 7, resp + 3, 7);
 
     // ADDITION_FRAME 2
     len =  DesfireAPDU(cmd, cmd_len, resp);
-    if ( !len ) {
+    if (!len) {
         print_result("ERROR <--: ", resp, len);
         OnError(3);
         return;
     }
 
-    memcpy(dataout+7+7+7,resp+3,14);
+    memcpy(dataout + 7 + 7 + 7, resp + 3, 14);
 
-    cmd_send(CMD_ACK,1,0,0,dataout,sizeof(dataout));
+    cmd_send(CMD_ACK, 1, 0, 0, dataout, sizeof(dataout));
 
     // reset the pcb_blocknum,
     pcb_blocknum = 0;
     OnSuccess();
 }
 
-void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain){
+void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain)
+{
 
     int len = 0;
     //uint8_t PICC_MASTER_KEY8[8] = { 0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47};
-    uint8_t PICC_MASTER_KEY16[16] = { 0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4a,0x4b,0x4c,0x4d,0x4e,0x4f };
+    uint8_t PICC_MASTER_KEY16[16] = { 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f };
     uint8_t null_key_data8[8] = {0x00};
     //uint8_t null_key_data16[16] = {0x00};
     //uint8_t new_key_data8[8]  = { 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77};
@@ -200,25 +204,25 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
     // 3 olika kommunikations s�tt,   PLAIN,MAC,CRYPTO
 
     // des, nyckel 0,
-    switch (mode){
-        case 1:{
+    switch (mode) {
+        case 1: {
             uint8_t keybytes[16];
             uint8_t RndA[8] = {0x00};
             uint8_t RndB[8] = {0x00};
 
             if (algo == 2) {
-            if (datain[1] == 0xff){
-                    memcpy(keybytes,PICC_MASTER_KEY16,16);
+                if (datain[1] == 0xff) {
+                    memcpy(keybytes, PICC_MASTER_KEY16, 16);
                 } else {
-                    memcpy(keybytes, datain+1, datalen);
+                    memcpy(keybytes, datain + 1, datalen);
                 }
             } else {
                 if (algo == 1) {
-                    if (datain[1] == 0xff){
-                memcpy(keybytes,null_key_data8,8);
-            } else{
-                memcpy(keybytes, datain+1, datalen);
-            }
+                    if (datain[1] == 0xff) {
+                        memcpy(keybytes, null_key_data8, 8);
+                    } else {
+                        memcpy(keybytes, datain + 1, datalen);
+                    }
                 }
             }
 
@@ -227,13 +231,13 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
 
             if (algo == 2)
                 Desfire_3des_key_new_with_version(keybytes, key);
-            else if (algo ==1)
-            Desfire_des_key_new(keybytes, key);
+            else if (algo == 1)
+                Desfire_des_key_new(keybytes, key);
 
             cmd[0] = AUTHENTICATE;
             cmd[1] = keyno;  //keynumber
             len = DesfireAPDU(cmd, 2, resp);
-            if ( !len ) {
+            if (!len) {
                 if (MF_DBGLEVEL >= MF_DBG_ERROR) {
                     DbpString("Authentication failed. Card timeout.");
                 }
@@ -241,21 +245,21 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
                 return;
             }
 
-            if ( resp[2] == 0xaf ){
+            if (resp[2] == 0xaf) {
             } else {
                 DbpString("Authentication failed. Invalid key number.");
                 OnError(3);
                 return;
             }
 
-            memcpy( encRndB, resp+3, 8);
+            memcpy(encRndB, resp + 3, 8);
             if (algo == 2)
                 tdes_dec(&decRndB, &encRndB, key->data);
             else if (algo == 1)
-            des_dec(&decRndB, &encRndB, key->data);
+                des_dec(&decRndB, &encRndB, key->data);
 
             memcpy(RndB, decRndB, 8);
-            rol(decRndB,8);
+            rol(decRndB, 8);
 
             // This should be random
             uint8_t decRndA[8] = {0x00};
@@ -265,7 +269,7 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
             if (algo == 2)
                 tdes_dec(&encRndA, &decRndA, key->data);
             else if (algo == 1)
-            des_dec(&encRndA, &decRndA, key->data);
+                des_dec(&encRndA, &decRndA, key->data);
 
             memcpy(both, encRndA, 8);
 
@@ -277,15 +281,15 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
             if (algo == 2)
                 tdes_dec(&encRndB, &decRndB, key->data);
             else if (algo == 1)
-            des_dec(&encRndB, &decRndB, key->data);
+                des_dec(&encRndB, &decRndB, key->data);
 
             memcpy(both + 8, encRndB, 8);
 
             cmd[0] = ADDITIONAL_FRAME;
-            memcpy(cmd+1, both, 16 );
+            memcpy(cmd + 1, both, 16);
 
             len = DesfireAPDU(cmd, 17, resp);
-            if ( !len ) {
+            if (!len) {
                 if (MF_DBGLEVEL >= MF_DBG_ERROR) {
                     DbpString("Authentication failed. Card timeout.");
                 }
@@ -293,21 +297,21 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
                 return;
             }
 
-            if ( resp[2] == 0x00 ){
+            if (resp[2] == 0x00) {
 
                 struct desfire_key sessionKey = {0};
                 desfirekey_t skey = &sessionKey;
-                Desfire_session_key_new( RndA, RndB , key, skey );
+                Desfire_session_key_new(RndA, RndB, key, skey);
                 //print_result("SESSION : ", skey->data, 8);
 
-                memcpy(encRndA, resp+3, 8);
+                memcpy(encRndA, resp + 3, 8);
 
                 if (algo == 2)
                     tdes_dec(&encRndA, &encRndA, key->data);
                 else if (algo == 1)
-                des_dec(&encRndA, &encRndA, key->data);
+                    des_dec(&encRndA, &encRndA, key->data);
 
-                rol(decRndA,8);
+                rol(decRndA, 8);
                 for (int x = 0; x < 8; x++) {
                     if (decRndA[x] != encRndA[x]) {
                         DbpString("Authentication failed. Cannot varify PICC.");
@@ -407,36 +411,36 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
 
                 OnSuccess();
                 if (algo == 2)
-                    cmd_send(CMD_ACK,1,0,0,skey->data,16);
+                    cmd_send(CMD_ACK, 1, 0, 0, skey->data, 16);
                 else if (algo == 1)
-                cmd_send(CMD_ACK,1,0,0,skey->data,8);
+                    cmd_send(CMD_ACK, 1, 0, 0, skey->data, 8);
             } else {
                 DbpString("Authentication failed.");
                 OnError(6);
                 return;
             }
-            }
-            break;
+        }
+        break;
         case 2:
             //SendDesfireCommand(AUTHENTICATE_ISO, &keyno, resp);
             break;
-        case 3:{
+        case 3: {
 
             //defaultkey
             uint8_t keybytes[16] = {0x00};
-            if (datain[1] == 0xff){
-                memcpy(keybytes,PICC_MASTER_KEY16,16);
-            } else{
-                memcpy(keybytes, datain+1, datalen);
+            if (datain[1] == 0xff) {
+                memcpy(keybytes, PICC_MASTER_KEY16, 16);
+            } else {
+                memcpy(keybytes, datain + 1, datalen);
             }
 
             struct desfire_key defaultkey = {0x00};
             desfirekey_t key = &defaultkey;
-            Desfire_aes_key_new( keybytes, key);
+            Desfire_aes_key_new(keybytes, key);
 
             AesCtx ctx;
-            if ( AesCtxIni(&ctx, IV, key->data, KEY128, CBC) < 0 ){
-                if( MF_DBGLEVEL >= 4) {
+            if (AesCtxIni(&ctx, IV, key->data, KEY128, CBC) < 0) {
+                if (MF_DBGLEVEL >= 4) {
                     DbpString("AES context failed to init");
                 }
                 OnError(7);
@@ -446,7 +450,7 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
             cmd[0] = AUTHENTICATE_AES;
             cmd[1] = 0x00;  //keynumber
             len = DesfireAPDU(cmd, 2, resp);
-            if ( !len ) {
+            if (!len) {
                 if (MF_DBGLEVEL >= MF_DBG_ERROR) {
                     DbpString("Authentication failed. Card timeout.");
                 }
@@ -454,20 +458,20 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
                 return;
             }
 
-            memcpy( encRndB, resp+3, 16);
+            memcpy(encRndB, resp + 3, 16);
 
             // dekryptera tagnonce.
             AesDecrypt(&ctx, encRndB, decRndB, 16);
-            rol(decRndB,16);
-            memcpy(both, nonce,16);
-            memcpy(both+16, decRndB ,16 );
-            AesEncrypt(&ctx, both, encBoth, 32 );
+            rol(decRndB, 16);
+            memcpy(both, nonce, 16);
+            memcpy(both + 16, decRndB, 16);
+            AesEncrypt(&ctx, both, encBoth, 32);
 
             cmd[0] = ADDITIONAL_FRAME;
-            memcpy(cmd+1, encBoth, 32 );
+            memcpy(cmd + 1, encBoth, 32);
 
             len = DesfireAPDU(cmd, 33, resp);  // 1 + 32 == 33
-            if ( !len ) {
+            if (!len) {
                 if (MF_DBGLEVEL >= MF_DBG_ERROR) {
                     DbpString("Authentication failed. Card timeout.");
                 }
@@ -475,11 +479,11 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
                 return;
             }
 
-            if ( resp[2] == 0x00 ){
+            if (resp[2] == 0x00) {
                 // Create AES Session key
                 struct desfire_key sessionKey = {0};
                 desfirekey_t skey = &sessionKey;
-                Desfire_session_key_new( nonce, decRndB , key, skey );
+                Desfire_session_key_new(nonce, decRndB, key, skey);
                 print_result("SESSION : ", skey->data, 16);
             } else {
                 DbpString("Authentication failed.");
@@ -492,14 +496,15 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
     }
 
     OnSuccess();
-    cmd_send(CMD_ACK,1,len,0,resp,len);
+    cmd_send(CMD_ACK, 1, len, 0, resp, len);
 }
 
 // 3 olika ISO s�tt att skicka data till DESFIRE (direkt, inkapslat, inkapslat ISO)
 // cmd  =  cmd bytes to send
 // cmd_len = length of cmd
 // dataout = pointer to response data array
-int DesfireAPDU(uint8_t *cmd, size_t cmd_len, uint8_t *dataout){
+int DesfireAPDU(uint8_t *cmd, size_t cmd_len, uint8_t *dataout)
+{
 
     size_t len = 0;
     size_t wrappedLen = 0;
@@ -507,15 +512,15 @@ int DesfireAPDU(uint8_t *cmd, size_t cmd_len, uint8_t *dataout){
     uint8_t resp[MAX_FRAME_SIZE];
     uint8_t par[MAX_PARITY_SIZE];
 
-    wrappedLen = CreateAPDU( cmd, cmd_len, wCmd);
+    wrappedLen = CreateAPDU(cmd, cmd_len, wCmd);
 
     if (MF_DBGLEVEL >= 4)
         print_result("WCMD <--: ", wCmd, wrappedLen);
 
-    ReaderTransmit( wCmd, wrappedLen, NULL);
+    ReaderTransmit(wCmd, wrappedLen, NULL);
 
     len = ReaderReceive(resp, par);
-    if ( !len ) {
+    if (!len) {
         if (MF_DBGLEVEL >= 4) Dbprintf("fukked");
         return false; //DATA LINK ERROR
     }
@@ -524,8 +529,7 @@ int DesfireAPDU(uint8_t *cmd, size_t cmd_len, uint8_t *dataout){
     else if (len >= 4 // PCB+CID+CRC = 4 bytes
              && ((resp[0] & 0xC0) == 0 // I-Block
                  || (resp[0] & 0xD0) == 0x80) // R-Block with ACK bit set to 0
-             && (resp[0] & 0x01) == pcb_blocknum) // equal block numbers
-    {
+             && (resp[0] & 0x01) == pcb_blocknum) { // equal block numbers
         pcb_blocknum ^= 1;  //toggle next block
     }
 
@@ -534,9 +538,10 @@ int DesfireAPDU(uint8_t *cmd, size_t cmd_len, uint8_t *dataout){
 }
 
 // CreateAPDU
-size_t CreateAPDU( uint8_t *datain, size_t len, uint8_t *dataout){
+size_t CreateAPDU(uint8_t *datain, size_t len, uint8_t *dataout)
+{
 
-    size_t cmdlen = MIN(len+4, USB_CMD_DATA_SIZE-1);
+    size_t cmdlen = MIN(len + 4, USB_CMD_DATA_SIZE - 1);
 
     uint8_t cmd[cmdlen];
     memset(cmd, 0, cmdlen);
@@ -545,27 +550,29 @@ size_t CreateAPDU( uint8_t *datain, size_t len, uint8_t *dataout){
     cmd[0] |= pcb_blocknum; // OR the block number into the PCB
     cmd[1] = 0x00;  //  CID: 0x00 //TODO: allow multiple selected cards
 
-    memcpy(cmd+2, datain, len);
-    AddCrc14A(cmd, len+2);
+    memcpy(cmd + 2, datain, len);
+    AddCrc14A(cmd, len + 2);
 
     memcpy(dataout, cmd, cmdlen);
 
     return cmdlen;
 }
 
-    // crc_update(&desfire_crc32, 0, 1); /* CMD_WRITE */
-    // crc_update(&desfire_crc32, addr, addr_sz);
-    // crc_update(&desfire_crc32, byte, 8);
-    // uint32_t crc = crc_finish(&desfire_crc32);
+// crc_update(&desfire_crc32, 0, 1); /* CMD_WRITE */
+// crc_update(&desfire_crc32, addr, addr_sz);
+// crc_update(&desfire_crc32, byte, 8);
+// uint32_t crc = crc_finish(&desfire_crc32);
 
-void OnSuccess(){
+void OnSuccess()
+{
     pcb_blocknum = 0;
-    ReaderTransmit(deselect_cmd, 3 , NULL);
+    ReaderTransmit(deselect_cmd, 3, NULL);
     mifare_ultra_halt();
     switch_off();
 }
 
-void OnError(uint8_t reason){
-    cmd_send(CMD_ACK,0,reason,0,0,0);
+void OnError(uint8_t reason)
+{
+    cmd_send(CMD_ACK, 0, reason, 0, 0, 0);
     OnSuccess();
 }
diff --git a/armsrc/mifaresniff.c b/armsrc/mifaresniff.c
index cbdf3a99d..2a32e268e 100644
--- a/armsrc/mifaresniff.c
+++ b/armsrc/mifaresniff.c
@@ -12,8 +12,8 @@
 
 //static int sniffState = SNF_INIT;
 static uint8_t sniffUIDType = 0;
-static uint8_t sniffUID[10] = {0,0,0,0,0,0,0,0,0,0};
-static uint8_t sniffATQA[2] = {0,0};
+static uint8_t sniffUID[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+static uint8_t sniffATQA[2] = {0, 0};
 static uint8_t sniffSAK = 0;
 static uint8_t sniffBuf[17];
 static uint32_t timerData = 0;
@@ -24,7 +24,8 @@ static uint32_t timerData = 0;
 // if no activity for 2sec, it sends the collected data to the client.
 //-----------------------------------------------------------------------------
 // "hf mf sniff"
-void RAMFUNC SniffMifare(uint8_t param) {
+void RAMFUNC SniffMifare(uint8_t param)
+{
     // param:
     // bit 0 - trigger from first card answer
     // bit 1 - trigger from first reader 7-bit request
@@ -35,7 +36,8 @@ void RAMFUNC SniffMifare(uint8_t param) {
 
     // Allocate memory from BigBuf for some buffers
     // free all previous allocations first
-    BigBuf_free(); BigBuf_Clear_ext(false);
+    BigBuf_free();
+    BigBuf_Clear_ext(false);
     clear_trace();
     set_tracing(true);
 
@@ -71,13 +73,13 @@ void RAMFUNC SniffMifare(uint8_t param) {
 
     // Setup and start DMA.
     // set transfer address and number of bytes. Start transfer.
-    if ( !FpgaSetupSscDma(dmaBuf, DMA_BUFFER_SIZE) ){
+    if (!FpgaSetupSscDma(dmaBuf, DMA_BUFFER_SIZE)) {
         if (MF_DBGLEVEL > 1) Dbprintf("[!] FpgaSetupSscDma failed. Exiting");
         return;
     }
 
-    tUart* uart = GetUart();
-    tDemod* demod = GetDemod();
+    tUart *uart = GetUart();
+    tDemod *demod = GetDemod();
 
     MfSniffInit();
 
@@ -86,23 +88,23 @@ void RAMFUNC SniffMifare(uint8_t param) {
     while (!BUTTON_PRESS()) {
         WDT_HIT();
         LED_A_ON();
-/*
-        if ((sniffCounter & 0x0000FFFF) == 0) { // from time to time
-            // check if a transaction is completed (timeout after 2000ms).
-            // if yes, stop the DMA transfer and send what we have so far to the client
-            if (BigBuf_get_traceLen()) {
-                MfSniffSend();
-                // Reset everything - we missed some sniffed data anyway while the DMA was stopped
-                sniffCounter = 0;
-                dmaBuf = BigBuf_malloc(DMA_BUFFER_SIZE);
-                data = dmaBuf;
-                maxDataLen = 0;
-                ReaderIsActive = false;
-                TagIsActive = false;
-                FpgaSetupSscDma((uint8_t *)dmaBuf, DMA_BUFFER_SIZE); // set transfer address and number of bytes. Start transfer.
-            }
-        }
-        */
+        /*
+                if ((sniffCounter & 0x0000FFFF) == 0) { // from time to time
+                    // check if a transaction is completed (timeout after 2000ms).
+                    // if yes, stop the DMA transfer and send what we have so far to the client
+                    if (BigBuf_get_traceLen()) {
+                        MfSniffSend();
+                        // Reset everything - we missed some sniffed data anyway while the DMA was stopped
+                        sniffCounter = 0;
+                        dmaBuf = BigBuf_malloc(DMA_BUFFER_SIZE);
+                        data = dmaBuf;
+                        maxDataLen = 0;
+                        ReaderIsActive = false;
+                        TagIsActive = false;
+                        FpgaSetupSscDma((uint8_t *)dmaBuf, DMA_BUFFER_SIZE); // set transfer address and number of bytes. Start transfer.
+                    }
+                }
+                */
 
         // number of bytes we have processed so far
         int register readBufDataP = data - dmaBuf;
@@ -143,7 +145,7 @@ void RAMFUNC SniffMifare(uint8_t param) {
             // no need to try decoding tag data if the reader is sending
             if (!TagIsActive) {
                 uint8_t readerbyte = (previous_data & 0xF0) | (*data >> 4);
-                if (MillerDecoding(readerbyte, (sniffCounter-1)*4)) {
+                if (MillerDecoding(readerbyte, (sniffCounter - 1) * 4)) {
                     LogTrace(receivedCmd, uart->len, 0, 0, NULL, true);
                     DemodReset();
                     UartReset();
@@ -154,7 +156,7 @@ void RAMFUNC SniffMifare(uint8_t param) {
             // no need to try decoding tag data if the reader is sending
             if (!ReaderIsActive) {
                 uint8_t tagbyte = (previous_data << 4) | (*data & 0x0F);
-                if (ManchesterDecoding(tagbyte, 0, (sniffCounter-1)*4)) {
+                if (ManchesterDecoding(tagbyte, 0, (sniffCounter - 1) * 4)) {
                     LogTrace(receivedResp,  demod->len, 0, 0, NULL, false);
                     DemodReset();
                     UartReset();
@@ -175,7 +177,8 @@ void RAMFUNC SniffMifare(uint8_t param) {
     switch_off();
 }
 
-void MfSniffInit(void){
+void MfSniffInit(void)
+{
     memset(sniffUID, 0x00, sizeof(sniffUID));
     memset(sniffATQA, 0x00, sizeof(sniffATQA));
     memset(sniffBuf, 0x00, sizeof(sniffBuf));
@@ -184,9 +187,10 @@ void MfSniffInit(void){
     timerData = 0;
 }
 
-void MfSniffEnd(void){
+void MfSniffEnd(void)
+{
     LED_B_ON();
-    cmd_send(CMD_ACK,0,0,0,0,0);
+    cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
     LED_B_OFF();
 }
 
@@ -304,7 +308,8 @@ bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint8_t *parity, ui
 }
 */
 
-void RAMFUNC MfSniffSend() {
+void RAMFUNC MfSniffSend()
+{
     uint16_t tracelen = BigBuf_get_traceLen();
     uint16_t chunksize = 0;
     int packlen = tracelen; // total number of bytes to send
diff --git a/armsrc/mifareutil.c b/armsrc/mifareutil.c
index f15d13dec..42e69113d 100644
--- a/armsrc/mifareutil.c
+++ b/armsrc/mifareutil.c
@@ -13,7 +13,8 @@
 int MF_DBGLEVEL = MF_DBG_ERROR;
 
 // crypto1 helpers
-void mf_crypto1_decryptEx(struct Crypto1State *pcs, uint8_t *data_in, int len, uint8_t *data_out){
+void mf_crypto1_decryptEx(struct Crypto1State *pcs, uint8_t *data_in, int len, uint8_t *data_out)
+{
     uint8_t bt = 0;
     int i;
 
@@ -30,11 +31,13 @@ void mf_crypto1_decryptEx(struct Crypto1State *pcs, uint8_t *data_in, int len, u
     return;
 }
 
-void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len){
+void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len)
+{
     mf_crypto1_decryptEx(pcs, data, len, data);
 }
 
-void mf_crypto1_encrypt(struct Crypto1State *pcs, uint8_t *data, uint16_t len, uint8_t *par) {
+void mf_crypto1_encrypt(struct Crypto1State *pcs, uint8_t *data, uint16_t len, uint8_t *par)
+{
     uint8_t bt = 0;
     int i;
     par[0] = 0;
@@ -42,13 +45,14 @@ void mf_crypto1_encrypt(struct Crypto1State *pcs, uint8_t *data, uint16_t len, u
     for (i = 0; i < len; i++) {
         bt = data[i];
         data[i] = crypto1_byte(pcs, 0x00, 0) ^ data[i];
-        if ( ( i & 0x0007 ) == 0)
+        if ((i & 0x0007) == 0)
             par[ i >> 3 ] = 0;
-        par[ i >> 3 ] |= (((filter(pcs->odd) ^ oddparity8(bt)) & 0x01)<<(7-(i&0x0007)));
+        par[ i >> 3 ] |= (((filter(pcs->odd) ^ oddparity8(bt)) & 0x01) << (7 - (i & 0x0007)));
     }
 }
 
-uint8_t mf_crypto1_encrypt4bit(struct Crypto1State *pcs, uint8_t data) {
+uint8_t mf_crypto1_encrypt4bit(struct Crypto1State *pcs, uint8_t data)
+{
     uint8_t bt = 0;
     bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data, 0)) << 0;
     bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data, 1)) << 1;
@@ -58,22 +62,24 @@ uint8_t mf_crypto1_encrypt4bit(struct Crypto1State *pcs, uint8_t data) {
 }
 
 // send X byte basic commands
-int mifare_sendcmd(uint8_t cmd, uint8_t* data, uint8_t data_size, uint8_t* answer, uint8_t *answer_parity, uint32_t *timing) {
-    uint8_t dcmd[data_size+3];
+int mifare_sendcmd(uint8_t cmd, uint8_t *data, uint8_t data_size, uint8_t *answer, uint8_t *answer_parity, uint32_t *timing)
+{
+    uint8_t dcmd[data_size + 3];
     dcmd[0] = cmd;
-    memcpy(dcmd+1, data, data_size);
-    AddCrc14A(dcmd, data_size+1);
+    memcpy(dcmd + 1, data, data_size);
+    AddCrc14A(dcmd, data_size + 1);
     ReaderTransmit(dcmd, sizeof(dcmd), timing);
     int len = ReaderReceive(answer, answer_parity);
-    if(!len) {
+    if (!len) {
         if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("%02X Cmd failed. Card timeout.", cmd);
-        len = ReaderReceive(answer,answer_parity);
+        len = ReaderReceive(answer, answer_parity);
     }
     return len;
 }
 
 // send 2 byte commands
-int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t data, uint8_t *answer, uint8_t *answer_parity, uint32_t *timing) {
+int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t data, uint8_t *answer, uint8_t *answer_parity, uint32_t *timing)
+{
     uint16_t pos, res;
     uint8_t dcmd[4] = {cmd, data, 0x00, 0x00};
     uint8_t ecmd[4] = {0x00, 0x00, 0x00, 0x00};
@@ -85,7 +91,7 @@ int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd,
         par[0] = 0;
         for (pos = 0; pos < 4; pos++) {
             ecmd[pos] = crypto1_byte(pcs, 0x00, 0) ^ dcmd[pos];
-            par[0] |= (((filter(pcs->odd) ^ oddparity8(dcmd[pos])) & 0x01) << (7-pos));
+            par[0] |= (((filter(pcs->odd) ^ oddparity8(dcmd[pos])) & 0x01) << (7 - pos));
         }
         ReaderTransmitPar(ecmd, sizeof(ecmd), par, timing);
     } else {
@@ -113,21 +119,23 @@ int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd,
 }
 
 // mifare classic commands
-int mifare_classic_auth(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint8_t isNested) {
+int mifare_classic_auth(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint8_t isNested)
+{
     return mifare_classic_authex(pcs, uid, blockNo, keyType, ui64Key, isNested, NULL, NULL);
 }
 
-int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint8_t isNested, uint32_t *ntptr, uint32_t *timing) {
+int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint8_t isNested, uint32_t *ntptr, uint32_t *timing)
+{
     int len;
     uint32_t pos, nt, ntpp; // Supplied tag nonce
     uint8_t par[1] = {0x00};
     uint8_t nr[4];
-    uint8_t mf_nr_ar[] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 };
+    uint8_t mf_nr_ar[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
     uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};
     uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0x00};
 
     // "random" reader nonce:
-    num_to_bytes( prng_successor( GetTickCount(), 32), 4, nr);
+    num_to_bytes(prng_successor(GetTickCount(), 32), 4, nr);
 
     // Transmit MIFARE_CLASSIC_AUTH
     len = mifare_sendcmd_short(pcs, isNested, 0x60 + (keyType & 0x01), blockNo, receivedAnswer, receivedAnswerPar, timing);
@@ -163,7 +171,7 @@ int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockN
     par[0] = 0;
     for (pos = 0; pos < 4; pos++) {
         mf_nr_ar[pos] = crypto1_byte(pcs, nr[pos], 0) ^ nr[pos];
-        par[0] |= (((filter(pcs->odd) ^ oddparity8(nr[pos])) & 0x01) << (7-pos));
+        par[0] |= (((filter(pcs->odd) ^ oddparity8(nr[pos])) & 0x01) << (7 - pos));
     }
 
     // Skip 32 bits in pseudo random generator
@@ -171,9 +179,9 @@ int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockN
 
     //  ar+parity
     for (pos = 4; pos < 8; pos++) {
-        nt = prng_successor(nt,8);
-        mf_nr_ar[pos] = crypto1_byte(pcs,0x00,0) ^ (nt & 0xff);
-        par[0] |= (((filter(pcs->odd) ^ oddparity8(nt & 0xff)) & 0x01) << (7-pos));
+        nt = prng_successor(nt, 8);
+        mf_nr_ar[pos] = crypto1_byte(pcs, 0x00, 0) ^ (nt & 0xff);
+        par[0] |= (((filter(pcs->odd) ^ oddparity8(nt & 0xff)) & 0x01) << (7 - pos));
     }
 
     // Transmit reader nonce and reader answer
@@ -186,7 +194,7 @@ int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockN
         return 2;
     }
 
-    ntpp = prng_successor(nt, 32) ^ crypto1_word(pcs, 0,0);
+    ntpp = prng_successor(nt, 32) ^ crypto1_word(pcs, 0, 0);
 
     if (ntpp != bytes_to_num(receivedAnswer, 4)) {
         if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Authentication failed. Error card response.");
@@ -195,7 +203,8 @@ int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockN
     return 0;
 }
 
-int mifare_classic_readblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData) {
+int mifare_classic_readblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData)
+{
 
     int len;
     uint8_t bt[2] = {0x00, 0x00};
@@ -224,7 +233,8 @@ int mifare_classic_readblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blo
 }
 
 // mifare ultralight commands
-int mifare_ul_ev1_auth(uint8_t *keybytes, uint8_t *pack){
+int mifare_ul_ev1_auth(uint8_t *keybytes, uint8_t *pack)
+{
 
     uint16_t len = 0;
     uint8_t resp[4] = {0x00, 0x00, 0x00, 0x00};
@@ -243,16 +253,17 @@ int mifare_ul_ev1_auth(uint8_t *keybytes, uint8_t *pack){
     }
 
     if (MF_DBGLEVEL >= MF_DBG_EXTENDED)
-        Dbprintf("Auth Resp: %02x%02x%02x%02x", resp[0],resp[1],resp[2],resp[3]);
+        Dbprintf("Auth Resp: %02x%02x%02x%02x", resp[0], resp[1], resp[2], resp[3]);
 
     memcpy(pack, resp, 4);
     return 1;
 }
 
-int mifare_ultra_auth(uint8_t *keybytes){
+int mifare_ultra_auth(uint8_t *keybytes)
+{
 
     /// 3des2k
-    uint8_t random_a[8] = {1,1,1,1,1,1,1,1};
+    uint8_t random_a[8] = {1, 1, 1, 1, 1, 1, 1, 1};
     uint8_t random_b[8] = {0x00};
     uint8_t enc_random_b[8] = {0x00};
     uint8_t rnd_ab[16] = {0x00};
@@ -262,36 +273,36 @@ int mifare_ultra_auth(uint8_t *keybytes){
 
     uint16_t len = 0;
     uint8_t resp[19] = {0x00};
-    uint8_t respPar[3] = {0,0,0};
+    uint8_t respPar[3] = {0, 0, 0};
 
     // REQUEST AUTHENTICATION
-    len = mifare_sendcmd_short(NULL, 1, MIFARE_ULC_AUTH_1, 0x00, resp, respPar ,NULL);
+    len = mifare_sendcmd_short(NULL, 1, MIFARE_ULC_AUTH_1, 0x00, resp, respPar, NULL);
     if (len != 11) {
         if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", resp[0]);
         return 0;
     }
 
     // tag nonce.
-    memcpy(enc_random_b,resp+1,8);
+    memcpy(enc_random_b, resp + 1, 8);
 
     // decrypt nonce.
-    tdes_2key_dec((void*)random_b, (void*)enc_random_b, sizeof(random_b), (const void*)key, IV );
-    rol(random_b,8);
-    memcpy(rnd_ab  ,random_a,8);
-    memcpy(rnd_ab+8,random_b,8);
+    tdes_2key_dec((void *)random_b, (void *)enc_random_b, sizeof(random_b), (const void *)key, IV);
+    rol(random_b, 8);
+    memcpy(rnd_ab, random_a, 8);
+    memcpy(rnd_ab + 8, random_b, 8);
 
     if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
         Dbprintf("enc_B: %02x %02x %02x %02x %02x %02x %02x %02x",
-            enc_random_b[0],enc_random_b[1],enc_random_b[2],enc_random_b[3],enc_random_b[4],enc_random_b[5],enc_random_b[6],enc_random_b[7]);
+                 enc_random_b[0], enc_random_b[1], enc_random_b[2], enc_random_b[3], enc_random_b[4], enc_random_b[5], enc_random_b[6], enc_random_b[7]);
 
         Dbprintf("    B: %02x %02x %02x %02x %02x %02x %02x %02x",
-            random_b[0],random_b[1],random_b[2],random_b[3],random_b[4],random_b[5],random_b[6],random_b[7]);
+                 random_b[0], random_b[1], random_b[2], random_b[3], random_b[4], random_b[5], random_b[6], random_b[7]);
 
         Dbprintf("rnd_ab: %02x %02x %02x %02x %02x %02x %02x %02x",
-                rnd_ab[0],rnd_ab[1],rnd_ab[2],rnd_ab[3],rnd_ab[4],rnd_ab[5],rnd_ab[6],rnd_ab[7]);
+                 rnd_ab[0], rnd_ab[1], rnd_ab[2], rnd_ab[3], rnd_ab[4], rnd_ab[5], rnd_ab[6], rnd_ab[7]);
 
         Dbprintf("rnd_ab: %02x %02x %02x %02x %02x %02x %02x %02x",
-                rnd_ab[8],rnd_ab[9],rnd_ab[10],rnd_ab[11],rnd_ab[12],rnd_ab[13],rnd_ab[14],rnd_ab[15] );
+                 rnd_ab[8], rnd_ab[9], rnd_ab[10], rnd_ab[11], rnd_ab[12], rnd_ab[13], rnd_ab[14], rnd_ab[15]);
     }
 
     // encrypt    out, in, length, key, iv
@@ -303,38 +314,39 @@ int mifare_ultra_auth(uint8_t *keybytes){
         return 0;
     }
 
-    uint8_t enc_resp[8] = { 0,0,0,0,0,0,0,0 };
-    uint8_t resp_random_a[8] = { 0,0,0,0,0,0,0,0 };
-    memcpy(enc_resp, resp+1, 8);
+    uint8_t enc_resp[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
+    uint8_t resp_random_a[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
+    memcpy(enc_resp, resp + 1, 8);
 
     // decrypt    out, in, length, key, iv
     tdes_2key_dec(resp_random_a, enc_resp, 8, key, enc_random_b);
-    if ( memcmp(resp_random_a, random_a, 8) != 0 ) {
+    if (memcmp(resp_random_a, random_a, 8) != 0) {
         if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("failed authentication");
         return 0;
     }
 
     if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
         Dbprintf("e_AB: %02x %02x %02x %02x %02x %02x %02x %02x",
-                rnd_ab[0],rnd_ab[1],rnd_ab[2],rnd_ab[3],
-                rnd_ab[4],rnd_ab[5],rnd_ab[6],rnd_ab[7]);
+                 rnd_ab[0], rnd_ab[1], rnd_ab[2], rnd_ab[3],
+                 rnd_ab[4], rnd_ab[5], rnd_ab[6], rnd_ab[7]);
 
         Dbprintf("e_AB: %02x %02x %02x %02x %02x %02x %02x %02x",
-                rnd_ab[8],rnd_ab[9],rnd_ab[10],rnd_ab[11],
-                rnd_ab[12],rnd_ab[13],rnd_ab[14],rnd_ab[15]);
+                 rnd_ab[8], rnd_ab[9], rnd_ab[10], rnd_ab[11],
+                 rnd_ab[12], rnd_ab[13], rnd_ab[14], rnd_ab[15]);
 
         Dbprintf("a: %02x %02x %02x %02x %02x %02x %02x %02x",
-                random_a[0],random_a[1],random_a[2],random_a[3],
-                random_a[4],random_a[5],random_a[6],random_a[7]);
+                 random_a[0], random_a[1], random_a[2], random_a[3],
+                 random_a[4], random_a[5], random_a[6], random_a[7]);
 
         Dbprintf("b: %02x %02x %02x %02x %02x %02x %02x %02x",
-                resp_random_a[0],resp_random_a[1],resp_random_a[2],resp_random_a[3],
-                resp_random_a[4],resp_random_a[5],resp_random_a[6],resp_random_a[7]);
+                 resp_random_a[0], resp_random_a[1], resp_random_a[2], resp_random_a[3],
+                 resp_random_a[4], resp_random_a[5], resp_random_a[6], resp_random_a[7]);
     }
     return 1;
 }
 
-int mifare_ultra_readblockEx(uint8_t blockNo, uint8_t *blockData) {
+int mifare_ultra_readblockEx(uint8_t blockNo, uint8_t *blockData)
+{
     uint16_t len = 0;
     uint8_t bt[2] = {0x00, 0x00};
     uint8_t receivedAnswer[MAX_FRAME_SIZE] = {0x00};
@@ -360,15 +372,16 @@ int mifare_ultra_readblockEx(uint8_t blockNo, uint8_t *blockData) {
     memcpy(blockData, receivedAnswer, 14);
     return 0;
 }
-int mifare_ultra_readblock(uint8_t blockNo, uint8_t *blockData) {
-    #define MFU_MAX_RETRIES 5
+int mifare_ultra_readblock(uint8_t blockNo, uint8_t *blockData)
+{
+#define MFU_MAX_RETRIES 5
     uint8_t res;
 
     for (uint8_t retries = 0; retries < MFU_MAX_RETRIES; ++retries) {
         res = mifare_ultra_readblockEx(blockNo, blockData);
 
         // break if OK,  or NACK.
-        switch ( res ) {
+        switch (res) {
             case 0:
             case 1:
                 return res;
@@ -379,7 +392,8 @@ int mifare_ultra_readblock(uint8_t blockNo, uint8_t *blockData) {
     return res;
 }
 
-int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData) {
+int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData)
+{
     // variables
     uint16_t len = 0;
     uint32_t pos = 0;
@@ -404,7 +418,7 @@ int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t bl
     // crypto
     for (pos = 0; pos < 18; pos++) {
         d_block_enc[pos] = crypto1_byte(pcs, 0x00, 0) ^ d_block[pos];
-        par[pos>>3] |= (((filter(pcs->odd) ^ oddparity8(d_block[pos])) & 0x01) << (7 - (pos&0x0007)));
+        par[pos >> 3] |= (((filter(pcs->odd) ^ oddparity8(d_block[pos])) & 0x01) << (7 - (pos & 0x0007)));
     }
 
     ReaderTransmitPar(d_block_enc, sizeof(d_block_enc), par, NULL);
@@ -457,25 +471,27 @@ int mifare_ultra_writeblock_compat(uint8_t blockNo, uint8_t *blockData) {
 }
 */
 
-int mifare_ultra_writeblock(uint8_t blockNo, uint8_t *blockData) {
+int mifare_ultra_writeblock(uint8_t blockNo, uint8_t *blockData)
+{
     uint16_t len = 0;
     uint8_t block[5] = {blockNo, 0x00, 0x00, 0x00, 0x00 };
     uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};
     uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0x00};
 
     // command MIFARE_CLASSIC_WRITEBLOCK
-    memcpy(block+1, blockData, 4);
+    memcpy(block + 1, blockData, 4);
 
-    len = mifare_sendcmd( MIFARE_ULC_WRITE, block, sizeof(block), receivedAnswer, receivedAnswerPar, NULL);
+    len = mifare_sendcmd(MIFARE_ULC_WRITE, block, sizeof(block), receivedAnswer, receivedAnswerPar, NULL);
 
     if (receivedAnswer[0] != 0x0A) {   //  0x0a - ACK
         if (MF_DBGLEVEL >= MF_DBG_ERROR)
-            Dbprintf("Cmd Send Error: %02x %d", receivedAnswer[0],len);
+            Dbprintf("Cmd Send Error: %02x %d", receivedAnswer[0], len);
         return 1;
     }
     return 0;
 }
-int mifare_classic_halt_ex(struct Crypto1State *pcs) {
+int mifare_classic_halt_ex(struct Crypto1State *pcs)
+{
     uint8_t receivedAnswer[4] = {0x00, 0x00, 0x00, 0x00};
     uint16_t len = mifare_sendcmd_short(pcs, (pcs == NULL) ? CRYPT_NONE : CRYPT_ALL, ISO14443A_CMD_HALT, 0x00, receivedAnswer, NULL, NULL);
     if (len != 0) {
@@ -484,11 +500,13 @@ int mifare_classic_halt_ex(struct Crypto1State *pcs) {
     }
     return 0;
 }
-int mifare_classic_halt(struct Crypto1State *pcs, uint32_t uid) {
+int mifare_classic_halt(struct Crypto1State *pcs, uint32_t uid)
+{
     return mifare_classic_halt_ex(pcs);
 }
 
-int mifare_ultra_halt() {
+int mifare_ultra_halt()
+{
     uint16_t len = 0;
     uint8_t receivedAnswer[4] = {0x00, 0x00, 0x00, 0x00};
     len = mifare_sendcmd_short(NULL, CRYPT_NONE, ISO14443A_CMD_HALT, 0x00, receivedAnswer, NULL, NULL);
@@ -502,56 +520,64 @@ int mifare_ultra_halt() {
 
 // Mifare Memory Structure: up to 32 Sectors with 4 blocks each (1k and 2k cards),
 // plus evtl. 8 sectors with 16 blocks each (4k cards)
-uint8_t NumBlocksPerSector(uint8_t sectorNo) {
+uint8_t NumBlocksPerSector(uint8_t sectorNo)
+{
     return (sectorNo < 32) ? 4 : 16;
 }
 
-uint8_t FirstBlockOfSector(uint8_t sectorNo) {
+uint8_t FirstBlockOfSector(uint8_t sectorNo)
+{
     if (sectorNo < 32)
         return sectorNo * 4;
     else
-        return 32*4 + (sectorNo - 32) * 16;
+        return 32 * 4 + (sectorNo - 32) * 16;
 
 }
 
 // work with emulator memory
-void emlSetMem(uint8_t *data, int blockNum, int blocksCount) {
+void emlSetMem(uint8_t *data, int blockNum, int blocksCount)
+{
     emlSetMem_xt(data, blockNum, blocksCount, 16);
 }
 
-void emlSetMem_xt(uint8_t *data, int blockNum, int blocksCount, int blockBtWidth) {
-    uint8_t* emCARD = BigBuf_get_EM_addr();
+void emlSetMem_xt(uint8_t *data, int blockNum, int blocksCount, int blockBtWidth)
+{
+    uint8_t *emCARD = BigBuf_get_EM_addr();
     memcpy(emCARD + blockNum * blockBtWidth, data, blocksCount * blockBtWidth);
 }
 
-void emlGetMem(uint8_t *data, int blockNum, int blocksCount) {
-    uint8_t* emCARD = BigBuf_get_EM_addr();
+void emlGetMem(uint8_t *data, int blockNum, int blocksCount)
+{
+    uint8_t *emCARD = BigBuf_get_EM_addr();
     memcpy(data, emCARD + blockNum * 16, blocksCount * 16);
 }
 
-void emlGetMemBt(uint8_t *data, int bytePtr, int byteCount) {
-    uint8_t* emCARD = BigBuf_get_EM_addr();
+void emlGetMemBt(uint8_t *data, int bytePtr, int byteCount)
+{
+    uint8_t *emCARD = BigBuf_get_EM_addr();
     memcpy(data, emCARD + bytePtr, byteCount);
 }
 
-int emlCheckValBl(int blockNum) {
-    uint8_t* emCARD = BigBuf_get_EM_addr();
-    uint8_t* data = emCARD + blockNum * 16;
+int emlCheckValBl(int blockNum)
+{
+    uint8_t *emCARD = BigBuf_get_EM_addr();
+    uint8_t *data = emCARD + blockNum * 16;
 
     if ((data[0] != (data[4] ^ 0xff)) || (data[0] != data[8]) ||
-            (data[1] != (data[5] ^ 0xff)) || (data[1] != data[9]) ||
-            (data[2] != (data[6] ^ 0xff)) || (data[2] != data[10]) ||
-            (data[3] != (data[7] ^ 0xff)) || (data[3] != data[11]) ||
-            (data[12] != (data[13] ^ 0xff)) || (data[12] != data[14]) ||
-            (data[12] != (data[15] ^ 0xff))
-         )
+        (data[1] != (data[5] ^ 0xff)) || (data[1] != data[9]) ||
+        (data[2] != (data[6] ^ 0xff)) || (data[2] != data[10]) ||
+        (data[3] != (data[7] ^ 0xff)) || (data[3] != data[11]) ||
+        (data[12] != (data[13] ^ 0xff)) || (data[12] != data[14]) ||
+        (data[12] != (data[15] ^ 0xff))
+       )
         return 1;
     return 0;
 }
 
-int emlGetValBl(uint32_t *blReg, uint8_t *blBlock, int blockNum) {
-    uint8_t* emCARD = BigBuf_get_EM_addr();
-    uint8_t* data = emCARD + blockNum * 16;
+int emlGetValBl(uint32_t *blReg, uint8_t *blBlock, int blockNum)
+{
+    uint8_t *emCARD = BigBuf_get_EM_addr();
+    uint8_t *data = emCARD + blockNum * 16;
 
     if (emlCheckValBl(blockNum))
         return 1;
@@ -561,9 +587,10 @@ int emlGetValBl(uint32_t *blReg, uint8_t *blBlock, int blockNum) {
     return 0;
 }
 
-int emlSetValBl(uint32_t blReg, uint8_t blBlock, int blockNum) {
-    uint8_t* emCARD = BigBuf_get_EM_addr();
-    uint8_t* data = emCARD + blockNum * 16;
+int emlSetValBl(uint32_t blReg, uint8_t blBlock, int blockNum)
+{
+    uint8_t *emCARD = BigBuf_get_EM_addr();
+    uint8_t *data = emCARD + blockNum * 16;
 
     memcpy(data + 0, &blReg, 4);
     memcpy(data + 8, &blReg, 4);
@@ -578,21 +605,23 @@ int emlSetValBl(uint32_t blReg, uint8_t blBlock, int blockNum) {
     return 0;
 }
 
-uint64_t emlGetKey(int sectorNum, int keyType) {
+uint64_t emlGetKey(int sectorNum, int keyType)
+{
     uint8_t key[6] = {0x00};
-    uint8_t* emCARD = BigBuf_get_EM_addr();
+    uint8_t *emCARD = BigBuf_get_EM_addr();
     memcpy(key, emCARD + 16 * (FirstBlockOfSector(sectorNum) + NumBlocksPerSector(sectorNum) - 1) + keyType * 10, 6);
     return bytes_to_num(key, 6);
 }
 
-void emlClearMem(void) {
+void emlClearMem(void)
+{
     const uint8_t trailer[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0x80, 0x69, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
     const uint8_t uid[]   =   {0xe6, 0x84, 0x87, 0xf3, 0x16, 0x88, 0x04, 0x00, 0x46, 0x8e, 0x45, 0x55, 0x4d, 0x70, 0x41, 0x04};
-    uint8_t* emCARD = BigBuf_get_EM_addr();
+    uint8_t *emCARD = BigBuf_get_EM_addr();
     memset(emCARD, 0, CARD_MEMORY_SIZE);
 
     // fill sectors trailer data
-    for(uint16_t b = 3; b < 256; ((b < 127) ? (b += 4) : (b += 16)))
+    for (uint16_t b = 3; b < 256; ((b < 127) ? (b += 4) : (b += 16)))
         emlSetMem((uint8_t *)trailer, b, 1);
 
     // uid
@@ -602,43 +631,46 @@ void emlClearMem(void) {
 
 
 // Mifare desfire commands
-int mifare_sendcmd_special(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t* data, uint8_t* answer, uint8_t *answer_parity, uint32_t *timing) {
+int mifare_sendcmd_special(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t *data, uint8_t *answer, uint8_t *answer_parity, uint32_t *timing)
+{
     uint8_t dcmd[5] = {cmd, data[0], data[1], 0x00, 0x00};
     AddCrc14A(dcmd, 3);
 
     ReaderTransmit(dcmd, sizeof(dcmd), NULL);
     int len = ReaderReceive(answer, answer_parity);
-    if(!len) {
+    if (!len) {
         if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication failed. Card timeout.");
         return 1;
     }
     return len;
 }
 
-int mifare_sendcmd_special2(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t* data, uint8_t* answer,uint8_t *answer_parity, uint32_t *timing) {
+int mifare_sendcmd_special2(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t *data, uint8_t *answer, uint8_t *answer_parity, uint32_t *timing)
+{
     uint8_t dcmd[20] = {0x00};
     dcmd[0] = cmd;
-    memcpy(dcmd+1,data,17);
+    memcpy(dcmd + 1, data, 17);
     AddCrc14A(dcmd, 18);
 
     ReaderTransmit(dcmd, sizeof(dcmd), NULL);
     int len = ReaderReceive(answer, answer_parity);
-    if(!len){
+    if (!len) {
         if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication failed. Card timeout.");
         return 1;
     }
     return len;
 }
 
-int mifare_desfire_des_auth1(uint32_t uid, uint8_t *blockData){
+int mifare_desfire_des_auth1(uint32_t uid, uint8_t *blockData)
+{
 
     int len;
     // load key, keynumber
-    uint8_t data[2]={MFDES_AUTHENTICATE, 0x00};
+    uint8_t data[2] = {MFDES_AUTHENTICATE, 0x00};
     uint8_t receivedAnswer[MAX_FRAME_SIZE] = {0x00};
     uint8_t receivedAnswerPar[MAX_PARITY_SIZE] = {0x00};
 
-    len = mifare_sendcmd_special(NULL, 1, 0x02, data, receivedAnswer,receivedAnswerPar,NULL);
+    len = mifare_sendcmd_special(NULL, 1, 0x02, data, receivedAnswer, receivedAnswerPar, NULL);
     if (len == 1) {
         if (MF_DBGLEVEL >= MF_DBG_ERROR)
             Dbprintf("Cmd Error: %02x", receivedAnswer[0]);
@@ -648,26 +680,27 @@ int mifare_desfire_des_auth1(uint32_t uid, uint8_t *blockData){
     if (len == 12) {
         if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
             Dbprintf("Auth1 Resp: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
-                receivedAnswer[0],receivedAnswer[1],receivedAnswer[2],receivedAnswer[3],receivedAnswer[4],
-                receivedAnswer[5],receivedAnswer[6],receivedAnswer[7],receivedAnswer[8],receivedAnswer[9],
-                receivedAnswer[10],receivedAnswer[11]);
-            }
-            memcpy(blockData, receivedAnswer, 12);
-            return 0;
+                     receivedAnswer[0], receivedAnswer[1], receivedAnswer[2], receivedAnswer[3], receivedAnswer[4],
+                     receivedAnswer[5], receivedAnswer[6], receivedAnswer[7], receivedAnswer[8], receivedAnswer[9],
+                     receivedAnswer[10], receivedAnswer[11]);
+        }
+        memcpy(blockData, receivedAnswer, 12);
+        return 0;
     }
     return 1;
 }
 
-int mifare_desfire_des_auth2(uint32_t uid, uint8_t *key, uint8_t *blockData){
+int mifare_desfire_des_auth2(uint32_t uid, uint8_t *key, uint8_t *blockData)
+{
 
     int len;
     uint8_t data[17] = {MFDES_AUTHENTICATION_FRAME};
-    memcpy(data+1,key,16);
+    memcpy(data + 1, key, 16);
 
     uint8_t receivedAnswer[MAX_FRAME_SIZE] = {0x00};
     uint8_t receivedAnswerPar[MAX_PARITY_SIZE] = {0x00};
 
-    len = mifare_sendcmd_special2(NULL, 1, 0x03, data, receivedAnswer, receivedAnswerPar ,NULL);
+    len = mifare_sendcmd_special2(NULL, 1, 0x03, data, receivedAnswer, receivedAnswerPar, NULL);
 
     if ((receivedAnswer[0] == 0x03) && (receivedAnswer[1] == 0xae)) {
         if (MF_DBGLEVEL >= MF_DBG_ERROR)
@@ -675,13 +708,13 @@ int mifare_desfire_des_auth2(uint32_t uid, uint8_t *key, uint8_t *blockData){
         return 1;
     }
 
-    if (len == 12){
+    if (len == 12) {
         if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
             Dbprintf("Auth2 Resp: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
-                receivedAnswer[0],receivedAnswer[1],receivedAnswer[2],receivedAnswer[3],receivedAnswer[4],
-                receivedAnswer[5],receivedAnswer[6],receivedAnswer[7],receivedAnswer[8],receivedAnswer[9],
-                receivedAnswer[10],receivedAnswer[11]);
-            }
+                     receivedAnswer[0], receivedAnswer[1], receivedAnswer[2], receivedAnswer[3], receivedAnswer[4],
+                     receivedAnswer[5], receivedAnswer[6], receivedAnswer[7], receivedAnswer[8], receivedAnswer[9],
+                     receivedAnswer[10], receivedAnswer[11]);
+        }
         memcpy(blockData, receivedAnswer, 12);
         return 0;
     }
diff --git a/armsrc/mifareutil.h b/armsrc/mifareutil.h
index ad01a7078..971ba77f9 100644
--- a/armsrc/mifareutil.h
+++ b/armsrc/mifareutil.h
@@ -58,12 +58,12 @@
 #define cardSTATE_TO_IDLE() cardSTATE = MFEMUL_IDLE; LED_B_OFF(); LED_C_OFF();
 
 //functions
-int mifare_sendcmd(uint8_t cmd, uint8_t *data, uint8_t data_size, uint8_t* answer, uint8_t *answer_parity, uint32_t *timing);
-int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t data, uint8_t* answer, uint8_t *answer_parity, uint32_t *timing);
+int mifare_sendcmd(uint8_t cmd, uint8_t *data, uint8_t data_size, uint8_t *answer, uint8_t *answer_parity, uint32_t *timing);
+int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t data, uint8_t *answer, uint8_t *answer_parity, uint32_t *timing);
 
 // mifare classic
 int mifare_classic_auth(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint8_t isNested);
-int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint8_t isNested, uint32_t * ntptr, uint32_t *timing);
+int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint8_t isNested, uint32_t *ntptr, uint32_t *timing);
 int mifare_classic_readblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData);
 int mifare_classic_halt(struct Crypto1State *pcs, uint32_t uid);
 int mifare_classic_halt_ex(struct Crypto1State *pcs);
@@ -78,8 +78,8 @@ int mifare_ultra_writeblock(uint8_t blockNo, uint8_t *blockData);
 int mifare_ultra_halt();
 
 // desfire
-int mifare_sendcmd_special(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t* data, uint8_t* answer, uint8_t *answer_parity, uint32_t *timing);
-int mifare_sendcmd_special2(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t* data, uint8_t* answer,uint8_t *answer_parity, uint32_t *timing);
+int mifare_sendcmd_special(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t *data, uint8_t *answer, uint8_t *answer_parity, uint32_t *timing);
+int mifare_sendcmd_special2(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t *data, uint8_t *answer, uint8_t *answer_parity, uint32_t *timing);
 int mifare_desfire_des_auth1(uint32_t uid, uint8_t *blockData);
 int mifare_desfire_des_auth2(uint32_t uid, uint8_t *key, uint8_t *blockData);
 
diff --git a/armsrc/optimized_cipher.c b/armsrc/optimized_cipher.c
index f8ddc19d2..377e6f439 100644
--- a/armsrc/optimized_cipher.c
+++ b/armsrc/optimized_cipher.c
@@ -96,7 +96,8 @@ uint8_t xopt__select(bool x, bool y, uint8_t r)
 }
 */
 
-void opt_successor(const uint8_t* k, State *s, bool y, State* successor) {
+void opt_successor(const uint8_t *k, State *s, bool y, State *successor)
+{
     uint8_t Tt = 1 & opt_T(s);
 
     successor->t = (s->t >> 1);
@@ -105,11 +106,12 @@ void opt_successor(const uint8_t* k, State *s, bool y, State* successor) {
     successor->b = s->b >> 1;
     successor->b |= (opt_B(s) ^ (s->r & 0x1)) << 7;
 
-    successor->r = (k[opt__select(Tt,y,s->r)] ^ successor->b) + s->l ;
-    successor->l = successor->r+s->r;
+    successor->r = (k[opt__select(Tt, y, s->r)] ^ successor->b) + s->l ;
+    successor->l = successor->r + s->r;
 }
 
-void opt_suc(const uint8_t* k,State* s, uint8_t *in, uint8_t length, bool add32Zeroes) {
+void opt_suc(const uint8_t *k, State *s, uint8_t *in, uint8_t length, bool add32Zeroes)
+{
     State x2;
     int i;
     uint8_t head = 0;
@@ -148,12 +150,13 @@ void opt_suc(const uint8_t* k,State* s, uint8_t *in, uint8_t length, bool add32Z
     }
 }
 
-void opt_output(const uint8_t* k,State* s,  uint8_t *buffer) {
+void opt_output(const uint8_t *k, State *s,  uint8_t *buffer)
+{
     uint8_t times = 0;
     uint8_t bout = 0;
-    State temp = {0,0,0,0};
-    for ( ; times < 4; times++) {
-        bout =0;
+    State temp = {0, 0, 0, 0};
+    for (; times < 4; times++) {
+        bout = 0;
         bout |= (s->r & 0x4) << 5;
         opt_successor(k, s, 0, &temp);
         bout |= (temp.r & 0x4) << 4;
@@ -174,54 +177,59 @@ void opt_output(const uint8_t* k,State* s,  uint8_t *buffer) {
     }
 }
 
-void opt_MAC(uint8_t* k, uint8_t* input, uint8_t* out) {
+void opt_MAC(uint8_t *k, uint8_t *input, uint8_t *out)
+{
     State _init  =  {
-            ((k[0] ^ 0x4c) + 0xEC) & 0xFF,// l
-            ((k[0] ^ 0x4c) + 0x21) & 0xFF,// r
-            0x4c, // b
-            0xE012 // t
-            };
+        ((k[0] ^ 0x4c) + 0xEC) & 0xFF,// l
+        ((k[0] ^ 0x4c) + 0x21) & 0xFF,// r
+        0x4c, // b
+        0xE012 // t
+    };
 
-    opt_suc(k,&_init,input,12, false);
-    opt_output(k,&_init, out);
+    opt_suc(k, &_init, input, 12, false);
+    opt_output(k, &_init, out);
 }
 
-uint8_t rev_byte(uint8_t b) {
+uint8_t rev_byte(uint8_t b)
+{
     b = (b & 0xF0) >> 4 | (b & 0x0F) << 4;
     b = (b & 0xCC) >> 2 | (b & 0x33) << 2;
     b = (b & 0xAA) >> 1 | (b & 0x55) << 1;
-   return b;
+    return b;
 }
 
-void opt_reverse_arraybytecpy(uint8_t* dest, uint8_t *src, size_t len) {
+void opt_reverse_arraybytecpy(uint8_t *dest, uint8_t *src, size_t len)
+{
     uint8_t i;
-    for ( i =0; i< len ; i++)
+    for (i = 0; i < len ; i++)
         dest[i] = rev_byte(src[i]);
 }
 
-void opt_doReaderMAC(uint8_t *cc_nr_p, uint8_t *div_key_p, uint8_t mac[4]) {
+void opt_doReaderMAC(uint8_t *cc_nr_p, uint8_t *div_key_p, uint8_t mac[4])
+{
     static uint8_t cc_nr[12];
     opt_reverse_arraybytecpy(cc_nr, cc_nr_p, 12);
-    uint8_t dest [] = {0,0,0,0,0,0,0,0};
+    uint8_t dest [] = {0, 0, 0, 0, 0, 0, 0, 0};
     opt_MAC(div_key_p, cc_nr, dest);
     //The output MAC must also be reversed
     opt_reverse_arraybytecpy(mac, dest, 4);
     return;
 }
-void opt_doTagMAC(uint8_t *cc_p, const uint8_t *div_key_p, uint8_t mac[4]) {
-    static uint8_t cc_nr[8+4+4];
+void opt_doTagMAC(uint8_t *cc_p, const uint8_t *div_key_p, uint8_t mac[4])
+{
+    static uint8_t cc_nr[8 + 4 + 4];
     opt_reverse_arraybytecpy(cc_nr, cc_p, 12);
     State _init  =  {
-            ((div_key_p[0] ^ 0x4c) + 0xEC) & 0xFF,// l
-            ((div_key_p[0] ^ 0x4c) + 0x21) & 0xFF,// r
-            0x4c, // b
-            0xE012 // t
-            };
+        ((div_key_p[0] ^ 0x4c) + 0xEC) & 0xFF,// l
+        ((div_key_p[0] ^ 0x4c) + 0x21) & 0xFF,// r
+        0x4c, // b
+        0xE012 // t
+    };
     opt_suc(div_key_p, &_init, cc_nr, 12, true);
-    uint8_t dest [] = {0,0,0,0};
+    uint8_t dest [] = {0, 0, 0, 0};
     opt_output(div_key_p, &_init, dest);
     //The output MAC must also be reversed
-    opt_reverse_arraybytecpy(mac, dest,4);
+    opt_reverse_arraybytecpy(mac, dest, 4);
     return;
 
 }
@@ -233,15 +241,16 @@ void opt_doTagMAC(uint8_t *cc_p, const uint8_t *div_key_p, uint8_t mac[4]) {
  * @param div_key_p
  * @return the cipher state
  */
-State opt_doTagMAC_1(uint8_t *cc_p, const uint8_t *div_key_p) {
+State opt_doTagMAC_1(uint8_t *cc_p, const uint8_t *div_key_p)
+{
     static uint8_t cc_nr[8];
     opt_reverse_arraybytecpy(cc_nr, cc_p, 8);
     State _init  =  {
-            ((div_key_p[0] ^ 0x4c) + 0xEC) & 0xFF,// l
-            ((div_key_p[0] ^ 0x4c) + 0x21) & 0xFF,// r
-            0x4c, // b
-            0xE012 // t
-            };
+        ((div_key_p[0] ^ 0x4c) + 0xEC) & 0xFF,// l
+        ((div_key_p[0] ^ 0x4c) + 0x21) & 0xFF,// r
+        0x4c, // b
+        0xE012 // t
+    };
     opt_suc(div_key_p, &_init, cc_nr, 8, false);
     return _init;
 }
@@ -254,14 +263,15 @@ State opt_doTagMAC_1(uint8_t *cc_p, const uint8_t *div_key_p) {
  * @param mac - where to store the MAC
  * @param div_key_p - the key to use
  */
-void opt_doTagMAC_2(State _init,  uint8_t* nr, uint8_t mac[4], const uint8_t* div_key_p) {
+void opt_doTagMAC_2(State _init,  uint8_t *nr, uint8_t mac[4], const uint8_t *div_key_p)
+{
     static uint8_t _nr[4];
     opt_reverse_arraybytecpy(_nr, nr, 4);
-    opt_suc(div_key_p, &_init,_nr, 4, true);
+    opt_suc(div_key_p, &_init, _nr, 4, true);
 
-    uint8_t dest [] = {0,0,0,0};
+    uint8_t dest [] = {0, 0, 0, 0};
     opt_output(div_key_p, &_init, dest);
     //The output MAC must also be reversed
-    opt_reverse_arraybytecpy(mac, dest,4);
+    opt_reverse_arraybytecpy(mac, dest, 4);
     return;
 }
diff --git a/armsrc/optimized_cipher.h b/armsrc/optimized_cipher.h
index ad4649d3f..9bf0516de 100644
--- a/armsrc/optimized_cipher.h
+++ b/armsrc/optimized_cipher.h
@@ -46,6 +46,6 @@ State opt_doTagMAC_1(uint8_t *cc_p, const uint8_t *div_key_p);
  * @param mac - where to store the MAC
  * @param div_key_p - the key to use
  */
-void opt_doTagMAC_2(State _init, uint8_t* nr, uint8_t mac[4], const uint8_t* div_key_p);
+void opt_doTagMAC_2(State _init, uint8_t *nr, uint8_t mac[4], const uint8_t *div_key_p);
 
 #endif // OPTIMIZED_CIPHER_H
diff --git a/armsrc/pcf7931.c b/armsrc/pcf7931.c
index be56bc37f..568083d7d 100644
--- a/armsrc/pcf7931.c
+++ b/armsrc/pcf7931.c
@@ -3,13 +3,14 @@
 #define T0_PCF 8 //period for the pcf7931 in us
 #define ALLOC 16
 
-size_t DemodPCF7931(uint8_t **outBlocks) {
+size_t DemodPCF7931(uint8_t **outBlocks)
+{
     uint8_t bits[256] = {0x00};
     uint8_t blocks[8][16];
     uint8_t *dest = BigBuf_get_addr();
 
     int GraphTraceLen = BigBuf_max_traceLen();
-    if (  GraphTraceLen > 18000 )
+    if (GraphTraceLen > 18000)
         GraphTraceLen = 18000;
 
     int i, j, lastval, bitidx, half_switch;
@@ -18,7 +19,7 @@ size_t DemodPCF7931(uint8_t **outBlocks) {
     int pmc, block_done;
     int lc, warnings = 0;
     size_t num_blocks = 0;
-    int lmin=128, lmax=128;
+    int lmin = 128, lmax = 128;
     uint8_t dir;
     //clear read buffer
     BigBuf_Clear_keep_EM();
@@ -32,16 +33,16 @@ size_t DemodPCF7931(uint8_t **outBlocks) {
     i = 2;
 
     /* Find first local max/min */
-    if(dest[1] > dest[0]) {
-        while(i < GraphTraceLen) {
-            if( !(dest[i] > dest[i-1]) && dest[i] > lmax)
+    if (dest[1] > dest[0]) {
+        while (i < GraphTraceLen) {
+            if (!(dest[i] > dest[i - 1]) && dest[i] > lmax)
                 break;
             i++;
         }
         dir = 0;
     } else {
-        while(i < GraphTraceLen) {
-            if( !(dest[i] < dest[i-1]) && dest[i] < lmin)
+        while (i < GraphTraceLen) {
+            if (!(dest[i] < dest[i - 1]) && dest[i] < lmin)
                 break;
             i++;
         }
@@ -54,38 +55,37 @@ size_t DemodPCF7931(uint8_t **outBlocks) {
     block_done = 0;
 
     for (bitidx = 0; i < GraphTraceLen; i++) {
-        if ((dest[i-1] > dest[i] && dir == 1 && dest[i] > lmax) || (dest[i-1] < dest[i] && dir == 0 && dest[i] < lmin)) {
+        if ((dest[i - 1] > dest[i] && dir == 1 && dest[i] > lmax) || (dest[i - 1] < dest[i] && dir == 0 && dest[i] < lmin)) {
             lc = i - lastval;
             lastval = i;
 
             // Switch depending on lc length:
             // Tolerance is 1/8 of clock rate (arbitrary)
-            if (ABS(lc-clock/4) < tolerance) {
+            if (ABS(lc - clock / 4) < tolerance) {
                 // 16T0
-                if((i - pmc) == lc) { /* 16T0 was previous one */
+                if ((i - pmc) == lc) { /* 16T0 was previous one */
                     /* It's a PMC ! */
-                    i += (128+127+16+32+33+16)-1;
+                    i += (128 + 127 + 16 + 32 + 33 + 16) - 1;
                     lastval = i;
                     pmc = 0;
                     block_done = 1;
                 } else {
                     pmc = i;
                 }
-            } else if (ABS(lc-clock/2) < tolerance) {
+            } else if (ABS(lc - clock / 2) < tolerance) {
                 // 32TO
-                if((i - pmc) == lc) { /* 16T0 was previous one */
+                if ((i - pmc) == lc) { /* 16T0 was previous one */
                     /* It's a PMC ! */
-                    i += (128+127+16+32+33)-1;
+                    i += (128 + 127 + 16 + 32 + 33) - 1;
                     lastval = i;
                     pmc = 0;
                     block_done = 1;
-                } else if(half_switch == 1) {
+                } else if (half_switch == 1) {
                     bits[bitidx++] = 0;
                     half_switch = 0;
-                }
-                else
+                } else
                     half_switch++;
-            } else if (ABS(lc-clock) < tolerance) {
+            } else if (ABS(lc - clock) < tolerance) {
                 // 64TO
                 bits[bitidx++] = 1;
             } else {
@@ -96,19 +96,19 @@ size_t DemodPCF7931(uint8_t **outBlocks) {
                 }
             }
 
-            if(block_done == 1) {
-                if(bitidx == 128) {
-                    for(j = 0; j < 16; ++j) {
+            if (block_done == 1) {
+                if (bitidx == 128) {
+                    for (j = 0; j < 16; ++j) {
                         blocks[num_blocks][j] =
-                            128 * bits[j*8 + 7]+
-                                64*bits[j*8+6]+
-                                32*bits[j*8+5]+
-                                16*bits[j*8+4]+
-                                8*bits[j*8+3]+
-                                4*bits[j*8+2]+
-                                2*bits[j*8+1]+
-                            bits[j*8]
-                        ;
+                            128 * bits[j * 8 + 7] +
+                            64 * bits[j * 8 + 6] +
+                            32 * bits[j * 8 + 5] +
+                            16 * bits[j * 8 + 4] +
+                            8 * bits[j * 8 + 3] +
+                            4 * bits[j * 8 + 2] +
+                            2 * bits[j * 8 + 1] +
+                            bits[j * 8]
+                            ;
                     }
                     num_blocks++;
                 }
@@ -116,44 +116,44 @@ size_t DemodPCF7931(uint8_t **outBlocks) {
                 block_done = 0;
                 half_switch = 0;
             }
-            if(i < GraphTraceLen)
-                dir =(dest[i-1] > dest[i]) ? 0 : 1;
+            if (i < GraphTraceLen)
+                dir = (dest[i - 1] > dest[i]) ? 0 : 1;
         }
-        if(bitidx==255)
-            bitidx=0;
+        if (bitidx == 255)
+            bitidx = 0;
         warnings = 0;
-        if(num_blocks == 4) break;
+        if (num_blocks == 4) break;
     }
-    memcpy(outBlocks, blocks, 16*num_blocks);
+    memcpy(outBlocks, blocks, 16 * num_blocks);
     return num_blocks;
 }
 
-bool IsBlock0PCF7931(uint8_t *block) {
+bool IsBlock0PCF7931(uint8_t *block)
+{
     // assuming all RFU bits are set to 0
     // if PAC is enabled password is set to 0
-    if (block[7] == 0x01)
-    {
-        if (!memcmp(block, "\x00\x00\x00\x00\x00\x00\x00", 7) && !memcmp(block+9, "\x00\x00\x00\x00\x00\x00\x00", 7))
+    if (block[7] == 0x01) {
+        if (!memcmp(block, "\x00\x00\x00\x00\x00\x00\x00", 7) && !memcmp(block + 9, "\x00\x00\x00\x00\x00\x00\x00", 7))
             return true;
-    }
-    else if (block[7] == 0x00)
-    {
-        if (!memcmp(block+9, "\x00\x00\x00\x00\x00\x00\x00", 7))
+    } else if (block[7] == 0x00) {
+        if (!memcmp(block + 9, "\x00\x00\x00\x00\x00\x00\x00", 7))
             return true;
     }
     return false;
 }
 
-bool IsBlock1PCF7931(uint8_t *block) {
+bool IsBlock1PCF7931(uint8_t *block)
+{
     // assuming all RFU bits are set to 0
     if (block[10] == 0 && block[11] == 0 && block[12] == 0 && block[13] == 0)
-        if((block[14] & 0x7f) <= 9 && block[15] <= 9)
+        if ((block[14] & 0x7f) <= 9 && block[15] <= 9)
             return true;
 
     return false;
 }
 
-void ReadPCF7931() {
+void ReadPCF7931()
+{
     int found_blocks = 0; // successfully read blocks
     int max_blocks = 8;   // readable blocks
     uint8_t memory_blocks[8][17]; // PCF content
@@ -168,17 +168,17 @@ void ReadPCF7931() {
     int errors = 0; // error counter
     int tries = 0; // tries counter
 
-    memset(memory_blocks, 0, 8*17*sizeof(uint8_t));
-    memset(single_blocks, 0, 8*17*sizeof(uint8_t));
+    memset(memory_blocks, 0, 8 * 17 * sizeof(uint8_t));
+    memset(single_blocks, 0, 8 * 17 * sizeof(uint8_t));
 
     int i = 0, j = 0;
 
     do {
         i = 0;
 
-        memset(tmp_blocks, 0, 4*16*sizeof(uint8_t));
-        n = DemodPCF7931((uint8_t**)tmp_blocks);
-        if(!n)
+        memset(tmp_blocks, 0, 4 * 16 * sizeof(uint8_t));
+        n = DemodPCF7931((uint8_t **)tmp_blocks);
+        if (!n)
             ++errors;
 
         // exit if no block is received
@@ -187,7 +187,7 @@ void ReadPCF7931() {
             return;
         }
         // exit if too many errors during reading
-        if (tries > 50 && (2*errors > tries)) {
+        if (tries > 50 && (2 * errors > tries)) {
             Dbprintf("Error reading the tag");
             Dbprintf("Here is the partial content");
             goto end;
@@ -218,12 +218,12 @@ void ReadPCF7931() {
         Dbprintf("(dbg) got %d blocks (%d/%d found) (%d tries, %d errors)", n, found_blocks, (max_blocks == 0 ? found_blocks : max_blocks), tries, errors);
 
         i = 0;
-        if(!found_0_1) {
+        if (!found_0_1) {
             while (i < n - 1) {
-                if (IsBlock0PCF7931(tmp_blocks[i]) && IsBlock1PCF7931(tmp_blocks[i+1])) {
+                if (IsBlock0PCF7931(tmp_blocks[i]) && IsBlock1PCF7931(tmp_blocks[i + 1])) {
                     found_0_1 = 1;
                     memcpy(memory_blocks[0], tmp_blocks[i], 16);
-                    memcpy(memory_blocks[1], tmp_blocks[i+1], 16);
+                    memcpy(memory_blocks[1], tmp_blocks[i + 1], 16);
                     memory_blocks[0][ALLOC] = memory_blocks[1][ALLOC] = 1;
                     // block 1 tells how many blocks are going to be sent
                     max_blocks = MAX((memory_blocks[1][14] & 0x7f), memory_blocks[1][15]) + 1;
@@ -244,26 +244,26 @@ void ReadPCF7931() {
         } else {
             // Trying to re-order blocks
             // Look for identical block in memory blocks
-            while (i < n-1) {
+            while (i < n - 1) {
                 // skip all zeroes blocks
                 if (memcmp(tmp_blocks[i], "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", 16)) {
                     for (j = 1; j < max_blocks - 1; ++j) {
-                        if (!memcmp(tmp_blocks[i], memory_blocks[j], 16) && !memory_blocks[j+1][ALLOC]) {
-                            memcpy(memory_blocks[j+1], tmp_blocks[i+1], 16);
-                            memory_blocks[j+1][ALLOC] = 1;
+                        if (!memcmp(tmp_blocks[i], memory_blocks[j], 16) && !memory_blocks[j + 1][ALLOC]) {
+                            memcpy(memory_blocks[j + 1], tmp_blocks[i + 1], 16);
+                            memory_blocks[j + 1][ALLOC] = 1;
                             if (++found_blocks >= max_blocks) goto end;
                         }
                     }
                 }
-                if (memcmp(tmp_blocks[i+1], "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", 16)) {
+                if (memcmp(tmp_blocks[i + 1], "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", 16)) {
                     for (j = 0; j < max_blocks; ++j) {
-                        if (!memcmp(tmp_blocks[i+1], memory_blocks[j], 16) && !memory_blocks[(j == 0 ? max_blocks : j) -1][ALLOC]) {
+                        if (!memcmp(tmp_blocks[i + 1], memory_blocks[j], 16) && !memory_blocks[(j == 0 ? max_blocks : j) - 1][ALLOC]) {
                             if (j == 0) {
                                 memcpy(memory_blocks[max_blocks - 1], tmp_blocks[i], 16);
                                 memory_blocks[max_blocks - 1][ALLOC] = 1;
                             } else {
-                                memcpy(memory_blocks[j-1], tmp_blocks[i], 16);
-                                memory_blocks[j-1][ALLOC] = 1;
+                                memcpy(memory_blocks[j - 1], tmp_blocks[i], 16);
+                                memory_blocks[j - 1][ALLOC] = 1;
                             }
                             if (++found_blocks >= max_blocks) goto end;
                         }
@@ -277,10 +277,9 @@ void ReadPCF7931() {
             Dbprintf("Button pressed, stopping.");
             goto end;
         }
-    }
-    while (found_blocks != max_blocks);
+    } while (found_blocks != max_blocks);
 
- end:
+end:
     Dbprintf("-----------------------------------------");
     Dbprintf("Memory content:");
     Dbprintf("-----------------------------------------");
@@ -301,10 +300,11 @@ void ReadPCF7931() {
 
         Dbprintf("-----------------------------------------");
     }
-    cmd_send(CMD_ACK,0,0,0,0,0);
+    cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
 }
 
-static void RealWritePCF7931(uint8_t *pass, uint16_t init_delay, int32_t l, int32_t p, uint8_t address, uint8_t byte, uint8_t data) {
+static void RealWritePCF7931(uint8_t *pass, uint16_t init_delay, int32_t l, int32_t p, uint8_t address, uint8_t byte, uint8_t data)
+{
     uint32_t tab[1024] = {0}; // data times frame
     uint32_t u = 0;
     uint8_t parity = 0;
@@ -312,8 +312,8 @@ static void RealWritePCF7931(uint8_t *pass, uint16_t init_delay, int32_t l, int3
 
     //BUILD OF THE DATA FRAME
     //alimentation of the tag (time for initializing)
-    AddPatternPCF7931(init_delay, 0, 8192/2*T0_PCF, tab);
-    AddPatternPCF7931(8192/2*T0_PCF + 319*T0_PCF+70, 3*T0_PCF, 29*T0_PCF, tab);
+    AddPatternPCF7931(init_delay, 0, 8192 / 2 * T0_PCF, tab);
+    AddPatternPCF7931(8192 / 2 * T0_PCF + 319 * T0_PCF + 70, 3 * T0_PCF, 29 * T0_PCF, tab);
     //password indication bit
     AddBitPCF7931(1, tab, l, p);
     //password (on 56 bits)
@@ -329,35 +329,31 @@ static void RealWritePCF7931(uint8_t *pass, uint16_t init_delay, int32_t l, int3
 
     //block adress on 6 bits
     for (u = 0; u < 6; ++u) {
-        if (address&(1<<u)) { // bit 1
-             ++parity;
-             AddBitPCF7931(1, tab, l, p);
-        } else{               // bit 0
-             AddBitPCF7931(0, tab, l, p);
+        if (address & (1 << u)) { // bit 1
+            ++parity;
+            AddBitPCF7931(1, tab, l, p);
+        } else {              // bit 0
+            AddBitPCF7931(0, tab, l, p);
         }
     }
 
     //byte address on 4 bits
-    for (u = 0; u < 4; ++u)
-    {
-        if (byte&(1<<u)) {    // bit 1
-             parity++;
-             AddBitPCF7931(1, tab, l, p);
-        }
-        else                  // bit 0
-             AddBitPCF7931(0, tab, l, p);
+    for (u = 0; u < 4; ++u) {
+        if (byte & (1 << u)) { // bit 1
+            parity++;
+            AddBitPCF7931(1, tab, l, p);
+        } else                // bit 0
+            AddBitPCF7931(0, tab, l, p);
     }
 
     //data on 8 bits
-    for (u=0; u<8; u++)
-    {
-        if (data&(1<<u)) {    // bit 1
-             parity++;
-             AddBitPCF7931(1, tab, l, p);
-        }
-        else                  //bit 0
-             AddBitPCF7931(0, tab, l, p);
-        }
+    for (u = 0; u < 8; u++) {
+        if (data & (1 << u)) { // bit 1
+            parity++;
+            AddBitPCF7931(1, tab, l, p);
+        } else                //bit 0
+            AddBitPCF7931(0, tab, l, p);
+    }
 
     //parity bit
     if ((parity % 2) == 0)
@@ -366,21 +362,21 @@ static void RealWritePCF7931(uint8_t *pass, uint16_t init_delay, int32_t l, int3
         AddBitPCF7931(1, tab, l, p);//odd parity
 
     //time access memory
-    AddPatternPCF7931(5120+2680, 0, 0, tab);
+    AddPatternPCF7931(5120 + 2680, 0, 0, tab);
 
     //conversion of the scale time
     for (u = 0; u < 500; ++u)
-        tab[u]=(tab[u] * 3)/2;
+        tab[u] = (tab[u] * 3) / 2;
 
     //compensation of the counter reload
-    while (!comp){
+    while (!comp) {
         comp = 1;
         for (u = 0; tab[u] != 0; ++u)
-            if(tab[u] > 0xFFFF){
-              tab[u] -= 0xFFFF;
-              comp = 0;
+            if (tab[u] > 0xFFFF) {
+                tab[u] -= 0xFFFF;
+                comp = 0;
             }
-        }
+    }
 
     SendCmdPCF7931(tab);
 }
@@ -390,7 +386,8 @@ static void RealWritePCF7931(uint8_t *pass, uint16_t init_delay, int32_t l, int3
    @param byte : address of the byte to write
     @param data : data to write
  */
-void WritePCF7931(uint8_t pass1, uint8_t pass2, uint8_t pass3, uint8_t pass4, uint8_t pass5, uint8_t pass6, uint8_t pass7, uint16_t init_delay, int32_t l, int32_t p, uint8_t address, uint8_t byte, uint8_t data) {
+void WritePCF7931(uint8_t pass1, uint8_t pass2, uint8_t pass3, uint8_t pass4, uint8_t pass5, uint8_t pass6, uint8_t pass7, uint16_t init_delay, int32_t l, int32_t p, uint8_t address, uint8_t byte, uint8_t data)
+{
     Dbprintf("Initialization delay : %d us", init_delay);
     Dbprintf("Offsets : %d us on the low pulses width, %d us on the low pulses positions", l, p);
     Dbprintf("Password (LSB first on each byte): %02x %02x %02x %02x %02x %02x %02x", pass1, pass2, pass3, pass4, pass5, pass6, pass7);
@@ -400,7 +397,7 @@ void WritePCF7931(uint8_t pass1, uint8_t pass2, uint8_t pass3, uint8_t pass4, ui
 
     uint8_t password[7] = {pass1, pass2, pass3, pass4, pass5, pass6, pass7};
 
-    RealWritePCF7931 (password, init_delay, l, p, address, byte, data);
+    RealWritePCF7931(password, init_delay, l, p, address, byte, data);
 }
 
 
@@ -408,14 +405,15 @@ void WritePCF7931(uint8_t pass1, uint8_t pass2, uint8_t pass3, uint8_t pass4, ui
  * @param tab : array of the data frame
  */
 
-void SendCmdPCF7931(uint32_t * tab){
-    uint16_t u=0, tempo=0;
+void SendCmdPCF7931(uint32_t *tab)
+{
+    uint16_t u = 0, tempo = 0;
 
     Dbprintf("Sending data frame...");
 
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
     FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
-    FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_PASSTHRU );
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_PASSTHRU);
 
     LED_A_ON();
 
@@ -432,7 +430,7 @@ void SendCmdPCF7931(uint32_t * tab){
     AT91C_BASE_TCB->TCB_BCR = 1;
 
     tempo = AT91C_BASE_TC0->TC_CV;
-    for( u = 0; tab[u] != 0; u += 3){
+    for (u = 0; tab[u] != 0; u += 3) {
         // modulate antenna
         HIGH(GPIO_SSC_DOUT);
         while (tempo !=  tab[u])
@@ -440,12 +438,12 @@ void SendCmdPCF7931(uint32_t * tab){
 
         // stop modulating antenna
         LOW(GPIO_SSC_DOUT);
-        while (tempo !=  tab[u+1])
+        while (tempo !=  tab[u + 1])
             tempo = AT91C_BASE_TC0->TC_CV;
 
         // modulate antenna
         HIGH(GPIO_SSC_DOUT);
-        while (tempo !=  tab[u+2])
+        while (tempo !=  tab[u + 2])
             tempo = AT91C_BASE_TC0->TC_CV;
     }
 
@@ -464,13 +462,14 @@ void SendCmdPCF7931(uint32_t * tab){
  * @param l : offset on low pulse width
  * @param p : offset on low pulse positioning
  */
-bool AddBytePCF7931(uint8_t byte, uint32_t * tab, int32_t l, int32_t p){
+bool AddBytePCF7931(uint8_t byte, uint32_t *tab, int32_t l, int32_t p)
+{
     uint32_t u;
     for (u = 0; u < 8; ++u) {
         if (byte & (1 << u)) { //bit is 1
-            if( AddBitPCF7931(1, tab, l, p)==1) return 1;
+            if (AddBitPCF7931(1, tab, l, p) == 1) return 1;
         } else { //bit is 0
-            if (AddBitPCF7931(0, tab, l, p)==1) return 1;
+            if (AddBitPCF7931(0, tab, l, p) == 1) return 1;
         }
     }
 
@@ -483,30 +482,31 @@ bool AddBytePCF7931(uint8_t byte, uint32_t * tab, int32_t l, int32_t p){
  * @param l : offset on low pulse width
  * @param p : offset on low pulse positioning
  */
-bool AddBitPCF7931(bool b, uint32_t * tab, int32_t l, int32_t p){
+bool AddBitPCF7931(bool b, uint32_t *tab, int32_t l, int32_t p)
+{
     uint8_t u = 0;
 
     //we put the cursor at the last value of the array
-    for ( u = 0; tab[u] != 0; u += 3 ) { }
+    for (u = 0; tab[u] != 0; u += 3) { }
 
-    if ( b == 1 ) { //add a bit 1
-        if ( u == 0 )
+    if (b == 1) {   //add a bit 1
+        if (u == 0)
             tab[u] = 34 * T0_PCF + p;
         else
-            tab[u] = 34 * T0_PCF + tab[u-1] + p;
+            tab[u] = 34 * T0_PCF + tab[u - 1] + p;
 
-        tab[u+1] =  6 * T0_PCF + tab[u] + l;
-        tab[u+2] = 88 * T0_PCF + tab[u+1] - l - p;
+        tab[u + 1] =  6 * T0_PCF + tab[u] + l;
+        tab[u + 2] = 88 * T0_PCF + tab[u + 1] - l - p;
         return 0;
     } else { //add a bit 0
 
-        if ( u == 0 )
+        if (u == 0)
             tab[u] = 98 * T0_PCF + p;
         else
-            tab[u] = 98 * T0_PCF + tab[u-1] + p;
+            tab[u] = 98 * T0_PCF + tab[u - 1] + p;
 
-        tab[u+1] =  6 * T0_PCF + tab[u] + l;
-        tab[u+2] = 24 * T0_PCF + tab[u+1] - l - p;
+        tab[u + 1] =  6 * T0_PCF + tab[u] + l;
+        tab[u + 2] = 24 * T0_PCF + tab[u + 1] - l - p;
         return 0;
     }
     return 1;
@@ -518,13 +518,14 @@ bool AddBitPCF7931(bool b, uint32_t * tab, int32_t l, int32_t p){
  * @param c : delay of the last high pulse
  * @param tab : array of the data frame
  */
-bool AddPatternPCF7931(uint32_t a, uint32_t b, uint32_t c, uint32_t * tab){
+bool AddPatternPCF7931(uint32_t a, uint32_t b, uint32_t c, uint32_t *tab)
+{
     uint32_t u = 0;
-    for(u = 0; tab[u] != 0; u += 3){} //we put the cursor at the last value of the array
+    for (u = 0; tab[u] != 0; u += 3) {} //we put the cursor at the last value of the array
 
-    tab[u]   = (u == 0) ? a : a + tab[u-1];
-    tab[u+1] = b + tab[u];
-    tab[u+2] = c + tab[u+1];
+    tab[u]   = (u == 0) ? a : a + tab[u - 1];
+    tab[u + 1] = b + tab[u];
+    tab[u + 2] = c + tab[u + 1];
 
     return 0;
 }
\ No newline at end of file
diff --git a/armsrc/pcf7931.h b/armsrc/pcf7931.h
index d87082b0f..bed33dadc 100644
--- a/armsrc/pcf7931.h
+++ b/armsrc/pcf7931.h
@@ -11,10 +11,10 @@ size_t DemodPCF7931(uint8_t **outBlocks);
 bool IsBlock0PCF7931(uint8_t *Block);
 bool IsBlock1PCF7931(uint8_t *Block);
 void ReadPCF7931();
-void SendCmdPCF7931(uint32_t * tab);
-bool AddBytePCF7931(uint8_t byte, uint32_t * tab, int32_t l, int32_t p);
-bool AddBitPCF7931(bool b, uint32_t * tab, int32_t l, int32_t p);
-bool AddPatternPCF7931(uint32_t a, uint32_t b, uint32_t c, uint32_t * tab);
+void SendCmdPCF7931(uint32_t *tab);
+bool AddBytePCF7931(uint8_t byte, uint32_t *tab, int32_t l, int32_t p);
+bool AddBitPCF7931(bool b, uint32_t *tab, int32_t l, int32_t p);
+bool AddPatternPCF7931(uint32_t a, uint32_t b, uint32_t c, uint32_t *tab);
 void WritePCF7931(uint8_t pass1, uint8_t pass2, uint8_t pass3, uint8_t pass4, uint8_t pass5, uint8_t pass6, uint8_t pass7, uint16_t init_delay, int32_t l, int32_t p, uint8_t address, uint8_t byte, uint8_t data);
 
 #endif
\ No newline at end of file
diff --git a/armsrc/printf.c b/armsrc/printf.c
index ff48dec1c..a355fe2ff 100644
--- a/armsrc/printf.c
+++ b/armsrc/printf.c
@@ -128,282 +128,301 @@ kvsprintf(char const *fmt, void *arg, int radix, va_list ap)
     for (;;) {
         padc = ' ';
         width = 0;
-        while ((ch = (u_char)*fmt++) != '%' || stop) {
+        while ((ch = (u_char) * fmt++) != '%' || stop) {
             PCHAR(ch);
             if (ch == '\0')
                 return (retval);
         }
         percent = fmt - 1;
-        qflag = 0; lflag = 0; ladjust = 0; sharpflag = 0; neg = 0;
-        sign = 0; dot = 0; dwidth = 0; upper = 0;
-        cflag = 0; hflag = 0; jflag = 0; tflag = 0; zflag = 0;
-reswitch: switch (ch = (u_char)*fmt++) {
-        case '.':
-            dot = 1;
-            goto reswitch;
-        case '#':
-            sharpflag = 1;
-            goto reswitch;
-        case '+':
-            sign = 1;
-            goto reswitch;
-        case '-':
-            ladjust = 1;
-            goto reswitch;
-        case '%':
-            PCHAR(ch);
-            break;
-        case '*':
-            if (!dot) {
-                width = va_arg(ap, int);
-                if (width < 0) {
-                    ladjust = !ladjust;
-                    width = -width;
-                }
-            } else {
-                dwidth = va_arg(ap, int);
-            }
-            goto reswitch;
-        case '0':
-            if (!dot) {
-                padc = '0';
+        qflag = 0;
+        lflag = 0;
+        ladjust = 0;
+        sharpflag = 0;
+        neg = 0;
+        sign = 0;
+        dot = 0;
+        dwidth = 0;
+        upper = 0;
+        cflag = 0;
+        hflag = 0;
+        jflag = 0;
+        tflag = 0;
+        zflag = 0;
+reswitch:
+        switch (ch = (u_char) * fmt++) {
+            case '.':
+                dot = 1;
                 goto reswitch;
-            }
-        case '1': case '2': case '3': case '4':
-        case '5': case '6': case '7': case '8': case '9':
+            case '#':
+                sharpflag = 1;
+                goto reswitch;
+            case '+':
+                sign = 1;
+                goto reswitch;
+            case '-':
+                ladjust = 1;
+                goto reswitch;
+            case '%':
+                PCHAR(ch);
+                break;
+            case '*':
+                if (!dot) {
+                    width = va_arg(ap, int);
+                    if (width < 0) {
+                        ladjust = !ladjust;
+                        width = -width;
+                    }
+                } else {
+                    dwidth = va_arg(ap, int);
+                }
+                goto reswitch;
+            case '0':
+                if (!dot) {
+                    padc = '0';
+                    goto reswitch;
+                }
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
                 for (n = 0;; ++fmt) {
                     n = n * 10 + ch - '0';
                     ch = *fmt;
                     if (ch < '0' || ch > '9')
                         break;
                 }
-            if (dot)
-                dwidth = n;
-            else
-                width = n;
-            goto reswitch;
-        case 'b':
-            num = (u_int)va_arg(ap, int);
-            p = va_arg(ap, char *);
-            for (q = ksprintn(nbuf, num, *p++, NULL, 0); *q;)
-                PCHAR(*q--);
+                if (dot)
+                    dwidth = n;
+                else
+                    width = n;
+                goto reswitch;
+            case 'b':
+                num = (u_int)va_arg(ap, int);
+                p = va_arg(ap, char *);
+                for (q = ksprintn(nbuf, num, *p++, NULL, 0); *q;)
+                    PCHAR(*q--);
 
-            if (num == 0)
-                break;
+                if (num == 0)
+                    break;
 
-            for (tmp = 0; *p;) {
-                n = *p++;
-                if (num & (1 << (n - 1))) {
-                    PCHAR(tmp ? ',' : '<');
-                    for (; (n = *p) > ' '; ++p)
-                        PCHAR(n);
-                    tmp = 1;
-                } else
-                    for (; *p > ' '; ++p)
-                        continue;
-            }
-            if (tmp)
-                PCHAR('>');
-            break;
-        case 'c':
-            PCHAR(va_arg(ap, int));
-            break;
-        case 'D':
-            up = va_arg(ap, u_char *);
-            p = va_arg(ap, char *);
-            if (!width)
-                width = 16;
-            while(width--) {
-                PCHAR(hex2ascii(*up >> 4));
-                PCHAR(hex2ascii(*up & 0x0f));
-                up++;
-                if (width)
-                    for (q=p;*q;q++)
-                        PCHAR(*q);
-            }
-            break;
-        case 'd':
-        case 'i':
-            base = 10;
-            sign = 1;
-            goto handle_sign;
-        case 'h':
-            if (hflag) {
-                hflag = 0;
-                cflag = 1;
-            } else
-                hflag = 1;
-            goto reswitch;
-        case 'j':
-            jflag = 1;
-            goto reswitch;
-        case 'l':
-            if (lflag) {
-                lflag = 0;
-                qflag = 1;
-            } else
-                lflag = 1;
-            goto reswitch;
-        case 'n':
-            if (jflag)
-                *(va_arg(ap, intmax_t *)) = retval;
-            else if (qflag)
-                *(va_arg(ap, quad_t *)) = retval;
-            else if (lflag)
-                *(va_arg(ap, long *)) = retval;
-            else if (zflag)
-                *(va_arg(ap, size_t *)) = retval;
-            else if (hflag)
-                *(va_arg(ap, short *)) = retval;
-            else if (cflag)
-                *(va_arg(ap, char *)) = retval;
-            else
-                *(va_arg(ap, int *)) = retval;
-            break;
-        case 'o':
-            base = 8;
-            goto handle_nosign;
-        case 'p':
-            base = 16;
-            sharpflag = (width == 0);
-            sign = 0;
-            num = (uintptr_t)va_arg(ap, void *);
-            goto number;
-        case 'q':
-            qflag = 1;
-            goto reswitch;
-        case 'r':
-            base = radix;
-            if (sign)
-                goto handle_sign;
-            goto handle_nosign;
-        case 's':
-            p = va_arg(ap, char *);
-            if (p == NULL)
-                p = "(null)";
-            if (!dot)
-                n = strlen (p);
-            else
-                for (n = 0; n < dwidth && p[n]; n++)
-                    continue;
-
-            width -= n;
-
-            if (!ladjust && width > 0)
-                while (width--)
-                    PCHAR(padc);
-            while (n--)
-                PCHAR(*p++);
-            if (ladjust && width > 0)
-                while (width--)
-                    PCHAR(padc);
-            break;
-        case 't':
-            tflag = 1;
-            goto reswitch;
-        case 'u':
-            base = 10;
-            goto handle_nosign;
-        case 'X':
-            upper = 1;
-        case 'x':
-            base = 16;
-            goto handle_nosign;
-        case 'y':
-            base = 16;
-            sign = 1;
-            goto handle_sign;
-        case 'z':
-            zflag = 1;
-            goto reswitch;
-handle_nosign:
-            sign = 0;
-            if (jflag)
-                num = va_arg(ap, uintmax_t);
-            else if (qflag)
-                num = va_arg(ap, u_quad_t);
-            else if (tflag)
-                num = va_arg(ap, ptrdiff_t);
-            else if (lflag)
-                num = va_arg(ap, u_long);
-            else if (zflag)
-                num = va_arg(ap, size_t);
-            else if (hflag)
-                num = (u_short)va_arg(ap, int);
-            else if (cflag)
-                num = (u_char)va_arg(ap, int);
-            else
-                num = va_arg(ap, u_int);
-            goto number;
-handle_sign:
-            if (jflag)
-                num = va_arg(ap, intmax_t);
-            else if (qflag)
-                num = va_arg(ap, quad_t);
-            else if (tflag)
-                num = va_arg(ap, ptrdiff_t);
-            else if (lflag)
-                num = va_arg(ap, long);
-            else if (zflag)
-                num = va_arg(ap, ssize_t);
-            else if (hflag)
-                num = (short)va_arg(ap, int);
-            else if (cflag)
-                num = (char)va_arg(ap, int);
-            else
-                num = va_arg(ap, int);
-number:
-            if (sign && (intmax_t)num < 0) {
-                neg = 1;
-                num = -(intmax_t)num;
-            }
-            p = ksprintn(nbuf, num, base, &tmp, upper);
-            if (sharpflag && num != 0) {
-                if (base == 8)
-                    tmp++;
-                else if (base == 16)
-                    tmp += 2;
-            }
-            if (neg)
-                tmp++;
-
-            if (!ladjust && padc != '0' && width
-                && (width -= tmp) > 0)
-                while (width--)
-                    PCHAR(padc);
-            if (neg)
-                PCHAR('-');
-            if (sharpflag && num != 0) {
-                if (base == 8) {
-                    PCHAR('0');
-                } else if (base == 16) {
-                    PCHAR('0');
-                    PCHAR('x');
+                for (tmp = 0; *p;) {
+                    n = *p++;
+                    if (num & (1 << (n - 1))) {
+                        PCHAR(tmp ? ',' : '<');
+                        for (; (n = *p) > ' '; ++p)
+                            PCHAR(n);
+                        tmp = 1;
+                    } else
+                        for (; *p > ' '; ++p)
+                            continue;
                 }
-            }
-            if (!ladjust && width && (width -= tmp) > 0)
-                while (width--)
-                    PCHAR(padc);
+                if (tmp)
+                    PCHAR('>');
+                break;
+            case 'c':
+                PCHAR(va_arg(ap, int));
+                break;
+            case 'D':
+                up = va_arg(ap, u_char *);
+                p = va_arg(ap, char *);
+                if (!width)
+                    width = 16;
+                while (width--) {
+                    PCHAR(hex2ascii(*up >> 4));
+                    PCHAR(hex2ascii(*up & 0x0f));
+                    up++;
+                    if (width)
+                        for (q = p; *q; q++)
+                            PCHAR(*q);
+                }
+                break;
+            case 'd':
+            case 'i':
+                base = 10;
+                sign = 1;
+                goto handle_sign;
+            case 'h':
+                if (hflag) {
+                    hflag = 0;
+                    cflag = 1;
+                } else
+                    hflag = 1;
+                goto reswitch;
+            case 'j':
+                jflag = 1;
+                goto reswitch;
+            case 'l':
+                if (lflag) {
+                    lflag = 0;
+                    qflag = 1;
+                } else
+                    lflag = 1;
+                goto reswitch;
+            case 'n':
+                if (jflag)
+                    *(va_arg(ap, intmax_t *)) = retval;
+                else if (qflag)
+                    *(va_arg(ap, quad_t *)) = retval;
+                else if (lflag)
+                    *(va_arg(ap, long *)) = retval;
+                else if (zflag)
+                    *(va_arg(ap, size_t *)) = retval;
+                else if (hflag)
+                    *(va_arg(ap, short *)) = retval;
+                else if (cflag)
+                    *(va_arg(ap, char *)) = retval;
+                else
+                    *(va_arg(ap, int *)) = retval;
+                break;
+            case 'o':
+                base = 8;
+                goto handle_nosign;
+            case 'p':
+                base = 16;
+                sharpflag = (width == 0);
+                sign = 0;
+                num = (uintptr_t)va_arg(ap, void *);
+                goto number;
+            case 'q':
+                qflag = 1;
+                goto reswitch;
+            case 'r':
+                base = radix;
+                if (sign)
+                    goto handle_sign;
+                goto handle_nosign;
+            case 's':
+                p = va_arg(ap, char *);
+                if (p == NULL)
+                    p = "(null)";
+                if (!dot)
+                    n = strlen(p);
+                else
+                    for (n = 0; n < dwidth && p[n]; n++)
+                        continue;
 
-            while (*p)
-                PCHAR(*p--);
+                width -= n;
 
-            if (ladjust && width && (width -= tmp) > 0)
-                while (width--)
-                    PCHAR(padc);
+                if (!ladjust && width > 0)
+                    while (width--)
+                        PCHAR(padc);
+                while (n--)
+                    PCHAR(*p++);
+                if (ladjust && width > 0)
+                    while (width--)
+                        PCHAR(padc);
+                break;
+            case 't':
+                tflag = 1;
+                goto reswitch;
+            case 'u':
+                base = 10;
+                goto handle_nosign;
+            case 'X':
+                upper = 1;
+            case 'x':
+                base = 16;
+                goto handle_nosign;
+            case 'y':
+                base = 16;
+                sign = 1;
+                goto handle_sign;
+            case 'z':
+                zflag = 1;
+                goto reswitch;
+handle_nosign:
+                sign = 0;
+                if (jflag)
+                    num = va_arg(ap, uintmax_t);
+                else if (qflag)
+                    num = va_arg(ap, u_quad_t);
+                else if (tflag)
+                    num = va_arg(ap, ptrdiff_t);
+                else if (lflag)
+                    num = va_arg(ap, u_long);
+                else if (zflag)
+                    num = va_arg(ap, size_t);
+                else if (hflag)
+                    num = (u_short)va_arg(ap, int);
+                else if (cflag)
+                    num = (u_char)va_arg(ap, int);
+                else
+                    num = va_arg(ap, u_int);
+                goto number;
+handle_sign:
+                if (jflag)
+                    num = va_arg(ap, intmax_t);
+                else if (qflag)
+                    num = va_arg(ap, quad_t);
+                else if (tflag)
+                    num = va_arg(ap, ptrdiff_t);
+                else if (lflag)
+                    num = va_arg(ap, long);
+                else if (zflag)
+                    num = va_arg(ap, ssize_t);
+                else if (hflag)
+                    num = (short)va_arg(ap, int);
+                else if (cflag)
+                    num = (char)va_arg(ap, int);
+                else
+                    num = va_arg(ap, int);
+number:
+                if (sign && (intmax_t)num < 0) {
+                    neg = 1;
+                    num = -(intmax_t)num;
+                }
+                p = ksprintn(nbuf, num, base, &tmp, upper);
+                if (sharpflag && num != 0) {
+                    if (base == 8)
+                        tmp++;
+                    else if (base == 16)
+                        tmp += 2;
+                }
+                if (neg)
+                    tmp++;
 
-            break;
-        default:
-            while (percent < fmt)
-                PCHAR(*percent++);
-            /*
-             * Since we ignore an formatting argument it is no
-             * longer safe to obey the remaining formatting
-             * arguments as the arguments will no longer match
-             * the format specs.
-             */
-            stop = 1;
-            break;
+                if (!ladjust && padc != '0' && width
+                    && (width -= tmp) > 0)
+                    while (width--)
+                        PCHAR(padc);
+                if (neg)
+                    PCHAR('-');
+                if (sharpflag && num != 0) {
+                    if (base == 8) {
+                        PCHAR('0');
+                    } else if (base == 16) {
+                        PCHAR('0');
+                        PCHAR('x');
+                    }
+                }
+                if (!ladjust && width && (width -= tmp) > 0)
+                    while (width--)
+                        PCHAR(padc);
+
+                while (*p)
+                    PCHAR(*p--);
+
+                if (ladjust && width && (width -= tmp) > 0)
+                    while (width--)
+                        PCHAR(padc);
+
+                break;
+            default:
+                while (percent < fmt)
+                    PCHAR(*percent++);
+                /*
+                 * Since we ignore an formatting argument it is no
+                 * longer safe to obey the remaining formatting
+                 * arguments as the arguments will no longer match
+                 * the format specs.
+                 */
+                stop = 1;
+                break;
         }
     }
     PCHAR(0);
diff --git a/armsrc/printf.h b/armsrc/printf.h
index 4060fcd1c..21d9c8fa4 100644
--- a/armsrc/printf.h
+++ b/armsrc/printf.h
@@ -15,8 +15,8 @@
 #include <stddef.h>
 #include "string.h"
 
-int kvsprintf(const char *format, void *arg, int radix, va_list ap) __attribute__ ((format (printf, 1, 0)));
-int vsprintf(char *str, const char *format, va_list ap) __attribute__ ((format (printf, 2, 0)));
-int sprintf(char *str, const char *format, ...) __attribute__ ((format (printf, 2, 3)));
+int kvsprintf(const char *format, void *arg, int radix, va_list ap) __attribute__((format(printf, 1, 0)));
+int vsprintf(char *str, const char *format, va_list ap) __attribute__((format(printf, 2, 0)));
+int sprintf(char *str, const char *format, ...) __attribute__((format(printf, 2, 3)));
 
 #endif
diff --git a/armsrc/start.c b/armsrc/start.c
index dcec6f59a..df5e30506 100644
--- a/armsrc/start.c
+++ b/armsrc/start.c
@@ -26,7 +26,7 @@ static voidpf inflate_malloc(voidpf opaque, uInt items, uInt size)
     uint8_t *allocated_memory;
 
     allocated_memory = next_free_memory;
-    next_free_memory += items*size;
+    next_free_memory += items * size;
     return allocated_memory;
 }
 
@@ -71,7 +71,7 @@ void __attribute__((section(".startos"))) Vector(void)
     /* Set up (that is: clear) BSS. */
     dst = &__bss_start__;
     end = &__bss_end__;
-    while(dst < end) *dst++ = 0;
+    while (dst < end) *dst++ = 0;
 
     // Set up data segment: Copy from flash to ram
     // src = &__data_src_start__;
diff --git a/armsrc/string.c b/armsrc/string.c
index e63ba4b05..5f188fbc4 100644
--- a/armsrc/string.c
+++ b/armsrc/string.c
@@ -13,7 +13,7 @@ void *memcpy(void *dest, const void *src, int len)
 {
     uint8_t *d = dest;
     const uint8_t *s = src;
-    while((len--) > 0) {
+    while ((len--) > 0) {
         *d = *s;
         d++;
         s++;
@@ -24,7 +24,7 @@ void *memcpy(void *dest, const void *src, int len)
 void *memset(void *dest, int c, int len)
 {
     uint8_t *d = dest;
-    while((len--) > 0) {
+    while ((len--) > 0) {
         *d = c;
         d++;
     }
@@ -36,8 +36,8 @@ int memcmp(const void *av, const void *bv, int len)
     const uint8_t *a = av;
     const uint8_t *b = bv;
 
-    while((len--) > 0) {
-        if(*a != *b) {
+    while ((len--) > 0) {
+        if (*a != *b) {
             return *a - *b;
         }
         a++;
@@ -46,22 +46,23 @@ int memcmp(const void *av, const void *bv, int len)
     return 0;
 }
 
-void memxor(uint8_t * dest, uint8_t * src, size_t len) {
-   for( ; len > 0; len--,dest++,src++)
-       *dest ^= *src;
+void memxor(uint8_t *dest, uint8_t *src, size_t len)
+{
+    for (; len > 0; len--, dest++, src++)
+        *dest ^= *src;
 }
 
 int strlen(const char *str)
 {
     int l = 0;
-    while(*str) {
+    while (*str) {
         l++;
         str++;
     }
     return l;
 }
 
-char* strncat(char *dest, const char *src, unsigned int n)
+char *strncat(char *dest, const char *src, unsigned int n)
 {
     unsigned int dest_len = strlen(dest);
     unsigned int i;
@@ -73,7 +74,7 @@ char* strncat(char *dest, const char *src, unsigned int n)
     return dest;
 }
 
-char* strcat(char *dest, const char *src)
+char *strcat(char *dest, const char *src)
 {
     unsigned int dest_len = strlen(dest);
     unsigned int i;
@@ -91,7 +92,7 @@ void strreverse(char s[])
 {
     int c, i, j;
 
-    for (i = 0, j = strlen(s)-1; i<j; i++, j--) {
+    for (i = 0, j = strlen(s) - 1; i < j; i++, j--) {
         c = s[i];
         s[i] = s[j];
         s[j] = c;
diff --git a/armsrc/string.h b/armsrc/string.h
index a3e75c0c5..de8f3ac20 100644
--- a/armsrc/string.h
+++ b/armsrc/string.h
@@ -18,7 +18,7 @@ int strlen(const char *str);
 void *memcpy(void *dest, const void *src, int len);
 void *memset(void *dest, int c, int len);
 int memcmp(const void *av, const void *bv, int len);
-void memxor(uint8_t * dest, uint8_t * src, size_t len);
+void memxor(uint8_t *dest, uint8_t *src, size_t len);
 char *strncat(char *dest, const char *src, unsigned int n);
 char *strcat(char *dest, const char *src);
 void strreverse(char s[]);
diff --git a/armsrc/ticks.c b/armsrc/ticks.c
index 7445781bf..f30916003 100644
--- a/armsrc/ticks.c
+++ b/armsrc/ticks.c
@@ -11,7 +11,8 @@
 #include "ticks.h"
 // attempt at high resolution microsecond timer
 // beware: timer counts in 21.3uS increments (1024/48Mhz)
-void SpinDelayUs(int us) {
+void SpinDelayUs(int us)
+{
     int ticks = (48 * us) >> 10;
 
     // Borrow a PWM unit for my real-time clock
@@ -24,7 +25,7 @@ void SpinDelayUs(int us) {
 
     uint16_t start = AT91C_BASE_PWMC_CH0->PWMC_CCNTR;
 
-    for(;;) {
+    for (;;) {
         uint16_t now = AT91C_BASE_PWMC_CH0->PWMC_CCNTR;
         if (now == (uint16_t)(start + ticks))
             return;
@@ -33,9 +34,10 @@ void SpinDelayUs(int us) {
     }
 }
 
-void SpinDelay(int ms) {
-  // convert to uS and call microsecond delay function
-    SpinDelayUs(ms*1000);
+void SpinDelay(int ms)
+{
+    // convert to uS and call microsecond delay function
+    SpinDelayUs(ms * 1000);
 }
 //  -------------------------------------------------------------------------
 //  timer lib
@@ -46,26 +48,29 @@ void SpinDelay(int ms) {
 //    SpinDelay(1000);
 //    ti = GetTickCount() - ti;
 //    Dbprintf("timer(1s): %d t=%d", ti, GetTickCount());
-void StartTickCount(void) {
+void StartTickCount(void)
+{
     // This timer is based on the slow clock. The slow clock frequency is between 22kHz and 40kHz.
     // We can determine the actual slow clock frequency by looking at the Main Clock Frequency Register.
     uint16_t mainf = AT91C_BASE_PMC->PMC_MCFR & 0xffff;        // = 16 * main clock frequency (16MHz) / slow clock frequency
     // set RealTimeCounter divider to count at 1kHz:
-    AT91C_BASE_RTTC->RTTC_RTMR = AT91C_RTTC_RTTRST | ((256000 + (mainf/2)) / mainf);
+    AT91C_BASE_RTTC->RTTC_RTMR = AT91C_RTTC_RTTRST | ((256000 + (mainf / 2)) / mainf);
     // note: worst case precision is approx 2.5%
 }
 
 /*
 * Get the current count.
 */
-uint32_t RAMFUNC GetTickCount(void){
+uint32_t RAMFUNC GetTickCount(void)
+{
     return AT91C_BASE_RTTC->RTTC_RTVR;// was * 2;
 }
 
 //  -------------------------------------------------------------------------
 //  microseconds timer
 //  -------------------------------------------------------------------------
-void StartCountUS(void) {
+void StartCountUS(void)
+{
     AT91C_BASE_PMC->PMC_PCER |= (1 << AT91C_ID_TC0) | (1 << AT91C_ID_TC1);
     AT91C_BASE_TCB->TCB_BMR = AT91C_TCB_TC0XC0S_NONE | AT91C_TCB_TC1XC1S_TIOA0 | AT91C_TCB_TC2XC2S_NONE;
 
@@ -73,8 +78,8 @@ void StartCountUS(void) {
     // tick=1.5mks
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS; // timer disable
     AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV3_CLOCK | // MCK(48MHz) / 32
-                                AT91C_TC_WAVE | AT91C_TC_WAVESEL_UP_AUTO | AT91C_TC_ACPA_CLEAR |
-                                AT91C_TC_ACPC_SET | AT91C_TC_ASWTRG_SET;
+                             AT91C_TC_WAVE | AT91C_TC_WAVESEL_UP_AUTO | AT91C_TC_ACPA_CLEAR |
+                             AT91C_TC_ACPC_SET | AT91C_TC_ASWTRG_SET;
     AT91C_BASE_TC0->TC_RA = 1;
     AT91C_BASE_TC0->TC_RC = 0xBFFF + 1; // 0xC000
 
@@ -88,7 +93,8 @@ void StartCountUS(void) {
     while (AT91C_BASE_TC1->TC_CV > 0);
 }
 
-uint32_t RAMFUNC GetCountUS(void){
+uint32_t RAMFUNC GetCountUS(void)
+{
     //return (AT91C_BASE_TC1->TC_CV * 0x8000) + ((AT91C_BASE_TC0->TC_CV / 15) * 10);
     //  By suggestion from PwPiwi, http://www.proxmark.org/forum/viewtopic.php?pid=17548#p17548
     return ((uint32_t)AT91C_BASE_TC1->TC_CV) * 0x8000 + (((uint32_t)AT91C_BASE_TC0->TC_CV) * 2) / 3;
@@ -97,40 +103,41 @@ uint32_t RAMFUNC GetCountUS(void){
 //  -------------------------------------------------------------------------
 //  Timer for iso14443 commands. Uses ssp_clk from FPGA
 //  -------------------------------------------------------------------------
-void StartCountSspClk(void) {
+void StartCountSspClk(void)
+{
     AT91C_BASE_PMC->PMC_PCER |= (1 << AT91C_ID_TC0) | (1 << AT91C_ID_TC1) | (1 << AT91C_ID_TC2);  // Enable Clock to all timers
     AT91C_BASE_TCB->TCB_BMR = AT91C_TCB_TC0XC0S_TIOA1       // XC0 Clock = TIOA1
-                            | AT91C_TCB_TC1XC1S_NONE        // XC1 Clock = none
-                            | AT91C_TCB_TC2XC2S_TIOA0;      // XC2 Clock = TIOA0
+                              | AT91C_TCB_TC1XC1S_NONE        // XC1 Clock = none
+                              | AT91C_TCB_TC2XC2S_TIOA0;      // XC2 Clock = TIOA0
 
     // configure TC1 to create a short pulse on TIOA1 when a rising edge on TIOB1 (= ssp_clk from FPGA) occurs:
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;               // disable TC1
     AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK // TC1 Clock = MCK(48MHz)/2 = 24MHz
-                            | AT91C_TC_CPCSTOP              // Stop clock on RC compare
-                            | AT91C_TC_EEVTEDG_RISING       // Trigger on rising edge of Event
-                            | AT91C_TC_EEVT_TIOB            // Event-Source: TIOB1 (= ssp_clk from FPGA = 13,56MHz/16)
-                            | AT91C_TC_ENETRG               // Enable external trigger event
-                            | AT91C_TC_WAVESEL_UP           // Upmode without automatic trigger on RC compare
-                            | AT91C_TC_WAVE                 // Waveform Mode
-                            | AT91C_TC_AEEVT_SET            // Set TIOA1 on external event
-                            | AT91C_TC_ACPC_CLEAR;          // Clear TIOA1 on RC Compare
+                             | AT91C_TC_CPCSTOP              // Stop clock on RC compare
+                             | AT91C_TC_EEVTEDG_RISING       // Trigger on rising edge of Event
+                             | AT91C_TC_EEVT_TIOB            // Event-Source: TIOB1 (= ssp_clk from FPGA = 13,56MHz/16)
+                             | AT91C_TC_ENETRG               // Enable external trigger event
+                             | AT91C_TC_WAVESEL_UP           // Upmode without automatic trigger on RC compare
+                             | AT91C_TC_WAVE                 // Waveform Mode
+                             | AT91C_TC_AEEVT_SET            // Set TIOA1 on external event
+                             | AT91C_TC_ACPC_CLEAR;          // Clear TIOA1 on RC Compare
     AT91C_BASE_TC1->TC_RC = 0x04;                           // RC Compare value = 0x04
 
     // use TC0 to count TIOA1 pulses
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;               // disable TC0
     AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_XC0              // TC0 clock = XC0 clock = TIOA1
-                            | AT91C_TC_WAVE                 // Waveform Mode
-                            | AT91C_TC_WAVESEL_UP           // just count
-                            | AT91C_TC_ACPA_CLEAR           // Clear TIOA0 on RA Compare
-                            | AT91C_TC_ACPC_SET;            // Set TIOA0 on RC Compare
+                             | AT91C_TC_WAVE                 // Waveform Mode
+                             | AT91C_TC_WAVESEL_UP           // just count
+                             | AT91C_TC_ACPA_CLEAR           // Clear TIOA0 on RA Compare
+                             | AT91C_TC_ACPC_SET;            // Set TIOA0 on RC Compare
     AT91C_BASE_TC0->TC_RA = 1;                              // RA Compare value = 1; pulse width to TC2
     AT91C_BASE_TC0->TC_RC = 0;                              // RC Compare value = 0; increment TC2 on overflow
 
     // use TC2 to count TIOA0 pulses (giving us a 32bit counter (TC0/TC2) clocked by ssp_clk)
     AT91C_BASE_TC2->TC_CCR = AT91C_TC_CLKDIS;               // disable TC2
     AT91C_BASE_TC2->TC_CMR = AT91C_TC_CLKS_XC2              // TC2 clock = XC2 clock = TIOA0
-                            | AT91C_TC_WAVE                 // Waveform Mode
-                            | AT91C_TC_WAVESEL_UP;          // just count
+                             | AT91C_TC_WAVE                 // Waveform Mode
+                             | AT91C_TC_WAVESEL_UP;          // just count
 
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;                // enable and reset TC0
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;                // enable and reset TC1
@@ -138,9 +145,9 @@ void StartCountSspClk(void) {
 
     // synchronize the counter with the ssp_frame signal.
     // Note: FPGA must be in any iso14443 mode, otherwise the frame signal would not be present
-    while(!(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_FRAME));   // wait for ssp_frame to go high (start of frame)
-    while(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_FRAME);      // wait for ssp_frame to be low
-    while(!(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_CLK));     // wait for ssp_clk to go high
+    while (!(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_FRAME));  // wait for ssp_frame to go high (start of frame)
+    while (AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_FRAME);     // wait for ssp_frame to be low
+    while (!(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_CLK));    // wait for ssp_clk to go high
 
     // note: up to now two ssp_clk rising edges have passed since the rising edge of ssp_frame
     // it is now safe to assert a sync signal. This sets all timers to 0 on next active clock edge
@@ -154,14 +161,16 @@ void StartCountSspClk(void) {
     // Therefore need to wait quite some time before we can use the counter.
     while (AT91C_BASE_TC2->TC_CV > 0);
 }
-void ResetSspClk(void) {
+void ResetSspClk(void)
+{
     //enable clock of timer and software trigger
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
     AT91C_BASE_TC2->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
     while (AT91C_BASE_TC2->TC_CV > 0);
 }
-uint32_t RAMFUNC GetCountSspClk(void) {
+uint32_t RAMFUNC GetCountSspClk(void)
+{
     uint32_t tmp_count = (AT91C_BASE_TC2->TC_CV << 16) | AT91C_BASE_TC0->TC_CV;
     if ((tmp_count & 0x0000ffff) == 0)  //small chance that we may have missed an increment in TC2
         return (AT91C_BASE_TC2->TC_CV << 16);
@@ -172,7 +181,8 @@ uint32_t RAMFUNC GetCountSspClk(void) {
 //  Timer for bitbanging, or LF stuff when you need a very precis timer
 //  1us = 1.5ticks
 //  -------------------------------------------------------------------------
-void StartTicks(void){
+void StartTicks(void)
+{
     // initialization of the timer
     AT91C_BASE_PMC->PMC_PCER |= (1 << AT91C_ID_TC0) | (1 << AT91C_ID_TC1);
     AT91C_BASE_TCB->TCB_BMR   = AT91C_TCB_TC0XC0S_NONE | AT91C_TCB_TC1XC1S_TIOA0 | AT91C_TCB_TC2XC2S_NONE;
@@ -205,36 +215,41 @@ void StartTicks(void){
     while (AT91C_BASE_TC0->TC_CV > 0);
 }
 
-uint32_t GetTicks(void) {
+uint32_t GetTicks(void)
+{
     uint32_t hi, lo;
 
     do {
         hi = AT91C_BASE_TC1->TC_CV;
         lo = AT91C_BASE_TC0->TC_CV;
-    } while(hi != AT91C_BASE_TC1->TC_CV);
+    } while (hi != AT91C_BASE_TC1->TC_CV);
 
     return (hi << 16) | lo;
 }
 
 // Wait - Spindelay in ticks.
 // if called with a high number, this will trigger the WDT...
-void WaitTicks(uint32_t ticks){
-    if ( ticks == 0 ) return;
+void WaitTicks(uint32_t ticks)
+{
+    if (ticks == 0) return;
     ticks += GetTicks();
     while (GetTicks() < ticks);
 }
 
 // Wait / Spindelay in us (microseconds)
 // 1us = 1.5ticks.
-void WaitUS(uint16_t us){
-    WaitTicks( (uint32_t)us * 3/2 );
+void WaitUS(uint16_t us)
+{
+    WaitTicks((uint32_t)us * 3 / 2);
 }
-void WaitMS(uint16_t ms){
-    WaitTicks( (uint32_t)ms * 1500 );
+void WaitMS(uint16_t ms)
+{
+    WaitTicks((uint32_t)ms * 1500);
 }
 
 // stop clock
-void StopTicks(void){
+void StopTicks(void)
+{
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 }
diff --git a/armsrc/util.c b/armsrc/util.c
index e3027c997..76b5d96cb 100644
--- a/armsrc/util.c
+++ b/armsrc/util.c
@@ -9,8 +9,9 @@
 //-----------------------------------------------------------------------------
 #include "util.h"
 
-size_t nbytes(size_t nbits) {
-    return (nbits >> 3)+((nbits % 8) > 0);
+size_t nbytes(size_t nbits)
+{
+    return (nbits >> 3) + ((nbits % 8) > 0);
 }
 
 /*
@@ -18,22 +19,25 @@ size_t nbytes(size_t nbits) {
  Returns the value v with the bottom b [0,32] bits reflected.
  Example: reflect(0x3e23L,3) == 0x3e26
 */
-uint32_t reflect(uint32_t v, int b) {
+uint32_t reflect(uint32_t v, int b)
+{
     uint32_t t = v;
-    for ( int i = 0; i < b; ++i) {
+    for (int i = 0; i < b; ++i) {
         if (t & 1)
-            v |=  BITMASK((b-1)-i);
+            v |=  BITMASK((b - 1) - i);
         else
-            v &= ~BITMASK((b-1)-i);
-        t>>=1;
+            v &= ~BITMASK((b - 1) - i);
+        t >>= 1;
     }
     return v;
 }
 
-uint8_t reflect8(uint8_t b) {
+uint8_t reflect8(uint8_t b)
+{
     return ((b * 0x80200802ULL) & 0x0884422110ULL) * 0x0101010101ULL >> 32;
 }
-uint16_t reflect16(uint16_t b) {
+uint16_t reflect16(uint16_t b)
+{
     uint16_t v = 0;
     v |= (b & 0x8000) >> 15;
     v |= (b & 0x4000) >> 13;
@@ -55,14 +59,16 @@ uint16_t reflect16(uint16_t b) {
     return v;
 }
 
-void num_to_bytes(uint64_t n, size_t len, uint8_t* dest) {
+void num_to_bytes(uint64_t n, size_t len, uint8_t *dest)
+{
     while (len--) {
         dest[len] = (uint8_t) n;
         n >>= 8;
     }
 }
 
-uint64_t bytes_to_num(uint8_t* src, size_t len) {
+uint64_t bytes_to_num(uint8_t *src, size_t len)
+{
     uint64_t num = 0;
     while (len--) {
         num = (num << 8) | (*src);
@@ -72,56 +78,93 @@ uint64_t bytes_to_num(uint8_t* src, size_t len) {
 }
 
 // RotateLeft - Ultralight, Desfire
-void rol(uint8_t *data, const size_t len) {
+void rol(uint8_t *data, const size_t len)
+{
     uint8_t first = data[0];
-    for (size_t i = 0; i < len-1; i++) {
-        data[i] = data[i+1];
+    for (size_t i = 0; i < len - 1; i++) {
+        data[i] = data[i + 1];
     }
-    data[len-1] = first;
+    data[len - 1] = first;
 }
 
-void lsl (uint8_t *data, size_t len) {
+void lsl(uint8_t *data, size_t len)
+{
     for (size_t n = 0; n < len - 1; n++) {
-        data[n] = (data[n] << 1) | (data[n+1] >> 7);
+        data[n] = (data[n] << 1) | (data[n + 1] >> 7);
     }
     data[len - 1] <<= 1;
 }
 
-int32_t le24toh (uint8_t data[3]) {
+int32_t le24toh(uint8_t data[3])
+{
     return (data[2] << 16) | (data[1] << 8) | data[0];
 }
 
 //convert hex digit to integer
-uint8_t hex2int(char hexchar){
-    switch(hexchar){
-        case '0': return 0; break;
-        case '1': return 1; break;
-        case '2': return 2; break;
-        case '3': return 3; break;
-        case '4': return 4; break;
-        case '5': return 5; break;
-        case '6': return 6; break;
-        case '7': return 7; break;
-        case '8': return 8; break;
-        case '9': return 9; break;
+uint8_t hex2int(char hexchar)
+{
+    switch (hexchar) {
+        case '0':
+            return 0;
+            break;
+        case '1':
+            return 1;
+            break;
+        case '2':
+            return 2;
+            break;
+        case '3':
+            return 3;
+            break;
+        case '4':
+            return 4;
+            break;
+        case '5':
+            return 5;
+            break;
+        case '6':
+            return 6;
+            break;
+        case '7':
+            return 7;
+            break;
+        case '8':
+            return 8;
+            break;
+        case '9':
+            return 9;
+            break;
         case 'a':
-        case 'A': return 10; break;
+        case 'A':
+            return 10;
+            break;
         case 'b':
-        case 'B': return 11; break;
+        case 'B':
+            return 11;
+            break;
         case 'c':
-        case 'C': return 12; break;
+        case 'C':
+            return 12;
+            break;
         case 'd':
-        case 'D': return 13; break;
+        case 'D':
+            return 13;
+            break;
         case 'e':
-        case 'E': return 14; break;
+        case 'E':
+            return 14;
+            break;
         case 'f':
-        case 'F': return 15; break;
+        case 'F':
+            return 15;
+            break;
         default:
             return 0;
     }
 }
 
-void LEDsoff() {
+void LEDsoff()
+{
     LED_A_OFF();
     LED_B_OFF();
     LED_C_OFF();
@@ -129,7 +172,8 @@ void LEDsoff() {
 }
 
 // LEDs: R(C) O(A) G(B) -- R(D) [1, 2, 4 and 8]
-void LED(int led, int ms) {
+void LED(int led, int ms)
+{
     if (led & LED_RED)
         LED_C_ON();
     if (led & LED_ORANGE)
@@ -154,7 +198,8 @@ void LED(int led, int ms) {
         LED_D_OFF();
 }
 
-void SpinOff(uint32_t pause) {
+void SpinOff(uint32_t pause)
+{
     LED_A_OFF();
     LED_B_OFF();
     LED_C_OFF();
@@ -163,29 +208,30 @@ void SpinOff(uint32_t pause) {
 }
 
 // 0=A, 1=B, 2=C, 3=D
-void SpinErr(uint8_t led, uint32_t speed, uint8_t times) {
+void SpinErr(uint8_t led, uint32_t speed, uint8_t times)
+{
     SpinOff(speed);
-    NTIME(times)
-    {
+    NTIME(times) {
         switch (led) {
-        case 0:
-            LED_A_INV();
-            break;
-        case 1:
-            LED_B_INV();
-            break;
-        case 2:
-            LED_C_INV();
-            break;
-        case 3:
-            LED_D_INV();
-            break;
+            case 0:
+                LED_A_INV();
+                break;
+            case 1:
+                LED_B_INV();
+                break;
+            case 2:
+                LED_C_INV();
+                break;
+            case 3:
+                LED_D_INV();
+                break;
         }
         SpinDelay(speed);
     }
 }
 
-void SpinDown(uint32_t speed) {
+void SpinDown(uint32_t speed)
+{
     SpinOff(speed);
     LED_D_ON();
     SpinDelay(speed);
@@ -201,7 +247,8 @@ void SpinDown(uint32_t speed) {
     LED_A_OFF();
 }
 
-void SpinUp(uint32_t speed) {
+void SpinUp(uint32_t speed)
+{
     SpinOff(speed);
     LED_A_ON();
     SpinDelay(speed);
@@ -222,7 +269,8 @@ void SpinUp(uint32_t speed) {
 // not clicked, or held down (for ms || 1sec)
 // In general, don't use this function unless you expect a
 // double click, otherwise it will waste 500ms -- use BUTTON_HELD instead
-int BUTTON_CLICKED(int ms) {
+int BUTTON_CLICKED(int ms)
+{
     // Up to 500ms in between clicks to mean a double click
     int ticks = (48000 * (ms ? ms : 1000)) >> 10;
 
@@ -240,16 +288,13 @@ int BUTTON_CLICKED(int ms) {
     uint16_t start = AT91C_BASE_PWMC_CH0->PWMC_CCNTR;
 
     int letoff = 0;
-    for(;;)
-    {
+    for (;;) {
         uint16_t now = AT91C_BASE_PWMC_CH0->PWMC_CCNTR;
 
         // We haven't let off the button yet
-        if (!letoff)
-        {
+        if (!letoff) {
             // We just let it off!
-            if (!BUTTON_PRESS())
-            {
+            if (!BUTTON_PRESS()) {
                 letoff = 1;
 
                 // reset our timer for 500ms
@@ -270,11 +315,10 @@ int BUTTON_CLICKED(int ms) {
             if (BUTTON_PRESS())
                 return BUTTON_DOUBLE_CLICK;
 
-            // Have we ran out of time to double click?
-            else
-                if (now == (uint16_t)(start + ticks))
-                    // At least we did a single click
-                    return BUTTON_SINGLE_CLICK;
+        // Have we ran out of time to double click?
+            else if (now == (uint16_t)(start + ticks))
+                // At least we did a single click
+                return BUTTON_SINGLE_CLICK;
 
         WDT_HIT();
     }
@@ -284,7 +328,8 @@ int BUTTON_CLICKED(int ms) {
 }
 
 // Determine if a button is held down
-int BUTTON_HELD(int ms) {
+int BUTTON_HELD(int ms)
+{
     // If button is held for one second
     int ticks = (48000 * (ms ? ms : 1000)) >> 10;
 
@@ -301,8 +346,7 @@ int BUTTON_HELD(int ms) {
 
     uint16_t start = AT91C_BASE_PWMC_CH0->PWMC_CCNTR;
 
-    for(;;)
-    {
+    for (;;) {
         uint16_t now = AT91C_BASE_PWMC_CH0->PWMC_CCNTR;
 
         // As soon as our button let go, we didn't hold long enough
@@ -310,9 +354,8 @@ int BUTTON_HELD(int ms) {
             return BUTTON_SINGLE_CLICK;
 
         // Have we waited the full second?
-        else
-            if (now == (uint16_t)(start + ticks))
-                return BUTTON_HOLD;
+        else if (now == (uint16_t)(start + ticks))
+            return BUTTON_HOLD;
 
         WDT_HIT();
     }
@@ -326,10 +369,11 @@ int BUTTON_HELD(int ms) {
  * verifies the magic properties, then stores a formatted string, prefixed by
  * prefix in dst.
  */
-void FormatVersionInformation(char *dst, int len, const char *prefix, void *version_information) {
-    struct version_information *v = (struct version_information*)version_information;
+void FormatVersionInformation(char *dst, int len, const char *prefix, void *version_information)
+{
+    struct version_information *v = (struct version_information *)version_information;
     dst[0] = 0;
-    strncat(dst, prefix, len-1);
+    strncat(dst, prefix, len - 1);
     if (v->magic != VERSION_INFORMATION_MAGIC) {
         strncat(dst, "Missing/Invalid version information\n", len - strlen(dst) - 1);
         return;
diff --git a/armsrc/util.h b/armsrc/util.h
index bca073273..19b104f51 100644
--- a/armsrc/util.h
+++ b/armsrc/util.h
@@ -49,11 +49,11 @@ extern uint32_t reflect(uint32_t v, int b); // used in crc.c ...
 extern uint8_t reflect8(uint8_t b);         // dedicated 8bit reversal
 extern uint16_t reflect16(uint16_t b);      // dedicated 16bit reversal
 
-void num_to_bytes(uint64_t n, size_t len, uint8_t* dest);
-uint64_t bytes_to_num(uint8_t* src, size_t len);
+void num_to_bytes(uint64_t n, size_t len, uint8_t *dest);
+uint64_t bytes_to_num(uint8_t *src, size_t len);
 void rol(uint8_t *data, const size_t len);
-void lsl (uint8_t *data, size_t len);
-int32_t le24toh (uint8_t data[3]);
+void lsl(uint8_t *data, size_t len);
+int32_t le24toh(uint8_t data[3]);
 uint8_t hex2int(char hexchar);
 
 void LED(int led, int ms);
diff --git a/armsrc/vtsend.c b/armsrc/vtsend.c
index e851d4334..666e1aef7 100644
--- a/armsrc/vtsend.c
+++ b/armsrc/vtsend.c
@@ -37,13 +37,15 @@
 //#define UART_WRITE(P, BUF, SIZ)   (P)->uart_write(BUF, SIZ, (P)->extobj)
 #define UART_WRITE(BUF) DbprintfEx(FLAG_RAWPRINT, "%s", BUF)
 
-int vtsend_init(vtsend_t *p, VTSEND_SERIAL_WRITE uart_write, void *extobj) {
+int vtsend_init(vtsend_t *p, VTSEND_SERIAL_WRITE uart_write, void *extobj)
+{
     p->uart_write = uart_write;
     p->extobj = extobj;
     return 0;
 }
 
-int vtsend_cursor_position(vtsend_t *p, const int column, const int line) {
+int vtsend_cursor_position(vtsend_t *p, const int column, const int line)
+{
     char buf[1 + 8];
     buf[0] = ESC;
     buf[1] = '[';
@@ -58,7 +60,8 @@ int vtsend_cursor_position(vtsend_t *p, const int column, const int line) {
     return 0;
 }
 
-int vtsend_cursor_up(vtsend_t *p, const int n) {
+int vtsend_cursor_up(vtsend_t *p, const int n)
+{
     char buf[1 + 5];
     buf[0] = ESC;
     buf[1] = '[';
@@ -71,7 +74,8 @@ int vtsend_cursor_up(vtsend_t *p, const int n) {
     return 0;
 }
 
-int vtsend_cursor_down(vtsend_t *p, const int n) {
+int vtsend_cursor_down(vtsend_t *p, const int n)
+{
     char buf[1 + 5];
     buf[0] = ESC;
     buf[1] = '[';
@@ -84,7 +88,8 @@ int vtsend_cursor_down(vtsend_t *p, const int n) {
     return 0;
 }
 
-int vtsend_cursor_forward(vtsend_t *p, const int n) {
+int vtsend_cursor_forward(vtsend_t *p, const int n)
+{
     char buf[1 + 5];
     buf[0] = ESC;
     buf[1] = '[';
@@ -97,7 +102,8 @@ int vtsend_cursor_forward(vtsend_t *p, const int n) {
     return 0;
 }
 
-int vtsend_cursor_backward(vtsend_t *p, const int n) {
+int vtsend_cursor_backward(vtsend_t *p, const int n)
+{
     char buf[1 + 5];
     buf[0] = ESC;
     buf[1] = '[';
@@ -110,7 +116,8 @@ int vtsend_cursor_backward(vtsend_t *p, const int n) {
     return 0;
 }
 
-int vtsend_cursor_position_save(vtsend_t *p) {
+int vtsend_cursor_position_save(vtsend_t *p)
+{
     char buf[1 + 3];
     buf[0] = ESC;
     buf[1] = '[';
@@ -121,7 +128,8 @@ int vtsend_cursor_position_save(vtsend_t *p) {
     return 0;
 }
 
-int vtsend_cursor_position_restore(vtsend_t *p) {
+int vtsend_cursor_position_restore(vtsend_t *p)
+{
     char buf[1 + 3];
     buf[0] = ESC;
     buf[1] = '[';
@@ -132,7 +140,8 @@ int vtsend_cursor_position_restore(vtsend_t *p) {
     return 0;
 }
 
-int vtsend_erase_display(vtsend_t *p) {
+int vtsend_erase_display(vtsend_t *p)
+{
     char buf[1 + 4];
     buf[0] = ESC;
     buf[1] = '[';
@@ -144,7 +153,8 @@ int vtsend_erase_display(vtsend_t *p) {
     return 0;
 }
 
-int vtsend_erase_line(vtsend_t *p) {
+int vtsend_erase_line(vtsend_t *p)
+{
     char buf[1 + 4];
     buf[0] = ESC;
     buf[1] = '[';
@@ -156,7 +166,8 @@ int vtsend_erase_line(vtsend_t *p) {
     return 0;
 }
 
-int vtsend_set_color_foreground(vtsend_t *p, const int color) {
+int vtsend_set_color_foreground(vtsend_t *p, const int color)
+{
     char buf[1 + 5];
     buf[0] = ESC;
     buf[1] = '[';
@@ -169,7 +180,8 @@ int vtsend_set_color_foreground(vtsend_t *p, const int color) {
     return 0;
 }
 
-int vtsend_set_color_background(vtsend_t *p, const int color) {
+int vtsend_set_color_background(vtsend_t *p, const int color)
+{
     char buf[1 + 5];
     buf[0] = ESC;
     buf[1] = '[';
@@ -182,7 +194,8 @@ int vtsend_set_color_background(vtsend_t *p, const int color) {
     return 0;
 }
 
-int vtsend_set_attribute(vtsend_t *p, const int attr) {
+int vtsend_set_attribute(vtsend_t *p, const int attr)
+{
     char buf[1 + 5];
     buf[0] = ESC;
     buf[1] = '[';
@@ -195,7 +208,8 @@ int vtsend_set_attribute(vtsend_t *p, const int attr) {
     return 0;
 }
 
-int vtsend_set_scroll_region(vtsend_t *p, const int top, const int bottom) {
+int vtsend_set_scroll_region(vtsend_t *p, const int top, const int bottom)
+{
     char buf[1 + 8];
     buf[0] = ESC;
     buf[1] = '[';
@@ -211,7 +225,8 @@ int vtsend_set_scroll_region(vtsend_t *p, const int top, const int bottom) {
     return 0;
 }
 
-int vtsend_set_cursor(vtsend_t *p, const int visible) {
+int vtsend_set_cursor(vtsend_t *p, const int visible)
+{
     if (visible) {
         char buf[1 + 6];
         buf[0] = ESC;
@@ -238,7 +253,8 @@ int vtsend_set_cursor(vtsend_t *p, const int visible) {
     return 0;
 }
 
-int vtsend_reset(vtsend_t *p) {
+int vtsend_reset(vtsend_t *p)
+{
     char buf[1 + 2];
     buf[0] = ESC;
     buf[1] = 'c';
@@ -248,7 +264,8 @@ int vtsend_reset(vtsend_t *p) {
     return 0;
 }
 
-int vtsend_draw_box(vtsend_t *p, const int x1, const int y1, const int x2, const int y2) {
+int vtsend_draw_box(vtsend_t *p, const int x1, const int y1, const int x2, const int y2)
+{
     int i;
 
     vtsend_cursor_position(p, x1, y1);
@@ -268,7 +285,8 @@ int vtsend_draw_box(vtsend_t *p, const int x1, const int y1, const int x2, const
     return 0;
 }
 
-int vtsend_fill_box(vtsend_t *p, const int x1, const int y1, const int x2, const int y2) {
+int vtsend_fill_box(vtsend_t *p, const int x1, const int y1, const int x2, const int y2)
+{
     int i, j;
     for (i = y1; i <= y2; i++) {
         vtsend_cursor_position(p, x1, i);
diff --git a/armsrc/vtsend.h b/armsrc/vtsend.h
index 784ff3ebc..4dcb0c62b 100644
--- a/armsrc/vtsend.h
+++ b/armsrc/vtsend.h
@@ -78,11 +78,11 @@ int vtsend_set_cursor(vtsend_t *p, const int visible);
 int vtsend_reset(vtsend_t *p);
 
 int vtsend_draw_box(
-        vtsend_t *p,
-        const int x1, const int y1, const int x2, const int y2);
+    vtsend_t *p,
+    const int x1, const int y1, const int x2, const int y2);
 int vtsend_fill_box(
-        vtsend_t *p,
-        const int x1, const int y1, const int x2, const int y2);
+    vtsend_t *p,
+    const int x1, const int y1, const int x2, const int y2);
 
 #ifdef __cplusplus
 }
diff --git a/bootrom/bootrom.c b/bootrom/bootrom.c
index fda79f905..ec1922cb5 100644
--- a/bootrom/bootrom.c
+++ b/bootrom/bootrom.c
@@ -15,15 +15,17 @@ unsigned int start_addr, end_addr, bootrom_unlocked;
 extern char _bootrom_start, _bootrom_end, _flash_start, _flash_end;
 extern uint32_t _osimage_entry;
 
-void DbpString(char *str) {
+void DbpString(char *str)
+{
     byte_t len = 0;
     while (str[len] != 0x00)
         len++;
 
-    cmd_send(CMD_DEBUG_PRINT_STRING, len, 0, 0, (byte_t*)str, len);
+    cmd_send(CMD_DEBUG_PRINT_STRING, len, 0, 0, (byte_t *)str, len);
 }
 
-static void ConfigClocks(void) {
+static void ConfigClocks(void)
+{
     // we are using a 16 MHz crystal as the basis for everything
     // slow clock runs at 32Khz typical regardless of crystal
 
@@ -32,12 +34,12 @@ static void ConfigClocks(void) {
 
     // enable the clock to the following peripherals
     AT91C_BASE_PMC->PMC_PCER =
-        (1<<AT91C_ID_PIOA)   |
-        (1<<AT91C_ID_ADC)    |
-        (1<<AT91C_ID_SPI)    |
-        (1<<AT91C_ID_SSC)    |
-        (1<<AT91C_ID_PWMC)   |
-        (1<<AT91C_ID_UDP);
+        (1 << AT91C_ID_PIOA)   |
+        (1 << AT91C_ID_ADC)    |
+        (1 << AT91C_ID_SPI)    |
+        (1 << AT91C_ID_SSC)    |
+        (1 << AT91C_ID_PWMC)   |
+        (1 << AT91C_ID_UDP);
 
     // worst case scenario, with MAINCK = 16Mhz xtal, startup delay is 1.4ms
     // if SLCK slow clock runs at its worst case (max) frequency of 42khz
@@ -49,7 +51,7 @@ static void ConfigClocks(void) {
         PMC_MAIN_OSC_STARTUP_DELAY(8);
 
     // wait for main oscillator to stabilize
-    while ( !(AT91C_BASE_PMC->PMC_SR & AT91C_PMC_MOSCS) ) {};
+    while (!(AT91C_BASE_PMC->PMC_SR & AT91C_PMC_MOSCS)) {};
 
     // PLL output clock frequency in range  80 - 160 MHz needs CKGR_PLL = 00
     // PLL output clock frequency in range 150 - 180 MHz needs CKGR_PLL = 10
@@ -63,7 +65,7 @@ static void ConfigClocks(void) {
         PMC_PLL_USB_DIVISOR(1);
 
     // wait for PLL to lock
-    while ( !(AT91C_BASE_PMC->PMC_SR & AT91C_PMC_LOCK) ) {};
+    while (!(AT91C_BASE_PMC->PMC_SR & AT91C_PMC_LOCK)) {};
 
     // we want a master clock (MCK) to be PLL clock / 2 = 96Mhz / 2 = 48Mhz
     // datasheet recommends that this register is programmed in two operations
@@ -71,84 +73,90 @@ static void ConfigClocks(void) {
     AT91C_BASE_PMC->PMC_MCKR = AT91C_PMC_PRES_CLK_2;
 
     // wait for main clock ready signal
-    while ( !(AT91C_BASE_PMC->PMC_SR & AT91C_PMC_MCKRDY) ) {};
+    while (!(AT91C_BASE_PMC->PMC_SR & AT91C_PMC_MCKRDY)) {};
 
     // set the source to PLL
     AT91C_BASE_PMC->PMC_MCKR = AT91C_PMC_PRES_CLK_2 | AT91C_PMC_CSS_PLL_CLK;
 
     // wait for main clock ready signal
-    while ( !(AT91C_BASE_PMC->PMC_SR & AT91C_PMC_MCKRDY) ) {};
+    while (!(AT91C_BASE_PMC->PMC_SR & AT91C_PMC_MCKRDY)) {};
 }
 
-static void Fatal(void) {
-  for(;;) {};
+static void Fatal(void)
+{
+    for (;;) {};
 }
 
-void UsbPacketReceived(uint8_t *packet, int len) {
+void UsbPacketReceived(uint8_t *packet, int len)
+{
     int i, dont_ack = 0;
-    UsbCommand* c = (UsbCommand *)packet;
+    UsbCommand *c = (UsbCommand *)packet;
     volatile uint32_t *p;
 
     //if ( len != sizeof(UsbCommand)) Fatal();
 
     uint32_t arg0 = (uint32_t)c->arg[0];
 
-    switch(c->cmd) {
+    switch (c->cmd) {
         case CMD_DEVICE_INFO: {
             dont_ack = 1;
             arg0 = DEVICE_INFO_FLAG_BOOTROM_PRESENT | DEVICE_INFO_FLAG_CURRENT_MODE_BOOTROM |
-            DEVICE_INFO_FLAG_UNDERSTANDS_START_FLASH;
-            if(common_area.flags.osimage_present)
+                   DEVICE_INFO_FLAG_UNDERSTANDS_START_FLASH;
+            if (common_area.flags.osimage_present)
                 arg0 |= DEVICE_INFO_FLAG_OSIMAGE_PRESENT;
 
-            cmd_send(CMD_DEVICE_INFO,arg0,1,2,0,0);
-        } break;
+            cmd_send(CMD_DEVICE_INFO, arg0, 1, 2, 0, 0);
+        }
+        break;
 
         case CMD_SETUP_WRITE: {
             /* The temporary write buffer of the embedded flash controller is mapped to the
             * whole memory region, only the last 8 bits are decoded.
             */
             p = (volatile uint32_t *)&_flash_start;
-            for(i = 0; i < 12; i++)
-                p[i+arg0] = c->d.asDwords[i];
-        } break;
+            for (i = 0; i < 12; i++)
+                p[i + arg0] = c->d.asDwords[i];
+        }
+        break;
 
         case CMD_FINISH_WRITE: {
-            uint32_t* flash_mem = (uint32_t*)(&_flash_start);
-            for ( int j=0; j<2; j++) {
-                for(i = 0+(64*j); i < 64+(64*j); i++) {
+            uint32_t *flash_mem = (uint32_t *)(&_flash_start);
+            for (int j = 0; j < 2; j++) {
+                for (i = 0 + (64 * j); i < 64 + (64 * j); i++) {
                     flash_mem[i] = c->d.asDwords[i];
                 }
 
-                uint32_t flash_address = arg0 + (0x100*j);
+                uint32_t flash_address = arg0 + (0x100 * j);
 
                 /* Check that the address that we are supposed to write to is within our allowed region */
-                if( ((flash_address + AT91C_IFLASH_PAGE_SIZE - 1) >= end_addr) || (flash_address < start_addr) ) {
+                if (((flash_address + AT91C_IFLASH_PAGE_SIZE - 1) >= end_addr) || (flash_address < start_addr)) {
                     /* Disallow write */
                     dont_ack = 1;
-                    cmd_send(CMD_NACK,0,0,0,0,0);
+                    cmd_send(CMD_NACK, 0, 0, 0, 0, 0);
                 } else {
                     uint32_t page_n = (flash_address - ((uint32_t)flash_mem)) / AT91C_IFLASH_PAGE_SIZE;
                     /* Translate address to flash page and do flash, update here for the 512k part */
                     AT91C_BASE_EFC0->EFC_FCR = MC_FLASH_COMMAND_KEY |
-                    MC_FLASH_COMMAND_PAGEN(page_n) |
-                    AT91C_MC_FCMD_START_PROG;
+                                               MC_FLASH_COMMAND_PAGEN(page_n) |
+                                               AT91C_MC_FCMD_START_PROG;
                 }
 
                 // Wait until flashing of page finishes
                 uint32_t sr;
-                while(!((sr = AT91C_BASE_EFC0->EFC_FSR) & AT91C_MC_FRDY));
-                if(sr & (AT91C_MC_LOCKE | AT91C_MC_PROGE)) {
+                while (!((sr = AT91C_BASE_EFC0->EFC_FSR) & AT91C_MC_FRDY));
+                if (sr & (AT91C_MC_LOCKE | AT91C_MC_PROGE)) {
                     dont_ack = 1;
-                    cmd_send(CMD_NACK,sr,0,0,0,0);
+                    cmd_send(CMD_NACK, sr, 0, 0, 0, 0);
                 }
             }
-        } break;
+        }
+        break;
 
         case CMD_HARDWARE_RESET: {
             usb_disable();
             AT91C_BASE_RSTC->RSTC_RCR = RST_CONTROL_KEY | AT91C_RSTC_PROCRST;
-        } break;
+        }
+        break;
 
         case CMD_START_FLASH: {
             if (c->arg[2] == START_FLASH_MAGIC)
@@ -166,28 +174,31 @@ void UsbPacketReceived(uint8_t *packet, int len) {
             /* Only allow command if the bootrom is unlocked, or the parameters are outside of the protected
             * bootrom area. In any case they must be within the flash area.
             */
-            if( (bootrom_unlocked || ((cmd_start >= prot_end) || (cmd_end < prot_start))) &&
+            if ((bootrom_unlocked || ((cmd_start >= prot_end) || (cmd_end < prot_start))) &&
                 (cmd_start >= allow_start) &&
-                (cmd_end <= allow_end) ) {
+                (cmd_end <= allow_end)) {
                 start_addr = cmd_start;
                 end_addr = cmd_end;
             } else {
                 start_addr = end_addr = 0;
                 dont_ack = 1;
-                cmd_send(CMD_NACK,0,0,0,0,0);
+                cmd_send(CMD_NACK, 0, 0, 0, 0, 0);
             }
-        } break;
+        }
+        break;
 
         default: {
             Fatal();
-        } break;
+        }
+        break;
     }
 
     if (!dont_ack)
-        cmd_send(CMD_ACK,arg0,0,0,0,0);
+        cmd_send(CMD_ACK, arg0, 0, 0, 0, 0);
 }
 
-static void flash_mode(int externally_entered) {
+static void flash_mode(int externally_entered)
+{
     start_addr = 0;
     end_addr = 0;
     bootrom_unlocked = 0;
@@ -196,14 +207,14 @@ static void flash_mode(int externally_entered) {
     usb_enable();
 
     // wait for reset to be complete?
-    for (volatile size_t i=0; i<0x100000; i++) {};
+    for (volatile size_t i = 0; i < 0x100000; i++) {};
 
-    for(;;) {
+    for (;;) {
         WDT_HIT();
 
         // Check if there is a usb packet available
         if (usb_poll_validate_length()) {
-            if (usb_read(rx, sizeof(rx)) )
+            if (usb_read(rx, sizeof(rx)))
                 UsbPacketReceived(rx, sizeof(rx));
         }
 
@@ -212,7 +223,7 @@ static void flash_mode(int externally_entered) {
             usb_disable();
             LED_B_ON();
             AT91C_BASE_RSTC->RSTC_RCR = RST_CONTROL_KEY | AT91C_RSTC_PROCRST;
-            for(;;) {};
+            for (;;) {};
         }
         if (externally_entered && BUTTON_PRESS()) {
             /* Let the user's button press override the automatic leave */
@@ -221,7 +232,8 @@ static void flash_mode(int externally_entered) {
     }
 }
 
-void BootROM(void) {
+void BootROM(void)
+{
     //------------
     // First set up all the I/O pins; GPIOs configured directly, other ones
     // just need to be assigned to the appropriate peripheral.
@@ -246,7 +258,7 @@ void BootROM(void) {
         GPIO_MUXSEL_LORAW   |
         GPIO_RELAY          |
         GPIO_NVDD_ON;
-        // (and add GPIO_FPGA_ON)
+    // (and add GPIO_FPGA_ON)
     // These pins are outputs
     AT91C_BASE_PIOA->PIO_OER =
         GPIO_LED_A          |
@@ -274,8 +286,8 @@ void BootROM(void) {
     AT91C_BASE_EFC0->EFC_FMR = AT91C_MC_FWS_1FWS | MC_FLASH_MODE_MASTER_CLK_IN_MHZ(48);
 
     // 9 = 256, 10+ is 512kb
-    uint8_t id = ( *(AT91C_DBGU_CIDR) & 0xF00) >> 8;
-    if ( id > 9 )
+    uint8_t id = (*(AT91C_DBGU_CIDR) & 0xF00) >> 8;
+    if (id > 9)
         AT91C_BASE_EFC1->EFC_FMR = AT91C_MC_FWS_1FWS | MC_FLASH_MODE_MASTER_CLK_IN_MHZ(48);
 
     // Initialize all system clocks
@@ -285,23 +297,23 @@ void BootROM(void) {
 
     int common_area_present = 0;
     switch (AT91C_BASE_RSTC->RSTC_RSR & AT91C_RSTC_RSTTYP) {
-    case AT91C_RSTC_RSTTYP_WATCHDOG:
-    case AT91C_RSTC_RSTTYP_SOFTWARE:
-    case AT91C_RSTC_RSTTYP_USER:
-        /* In these cases the common_area in RAM should be ok, retain it if it's there */
-        if(common_area.magic == COMMON_AREA_MAGIC && common_area.version == 1)
-            common_area_present = 1;
-        break;
-    default: /* Otherwise, initialize it from scratch */
-        break;
+        case AT91C_RSTC_RSTTYP_WATCHDOG:
+        case AT91C_RSTC_RSTTYP_SOFTWARE:
+        case AT91C_RSTC_RSTTYP_USER:
+            /* In these cases the common_area in RAM should be ok, retain it if it's there */
+            if (common_area.magic == COMMON_AREA_MAGIC && common_area.version == 1)
+                common_area_present = 1;
+            break;
+        default: /* Otherwise, initialize it from scratch */
+            break;
     }
 
-    if (!common_area_present){
+    if (!common_area_present) {
         /* Common area not ok, initialize it */
         int i;
         /* Makeshift memset, no need to drag util.c into this */
-        for(i=0; i<sizeof(common_area); i++)
-            ((char*)&common_area)[i] = 0;
+        for (i = 0; i < sizeof(common_area); i++)
+            ((char *)&common_area)[i] = 0;
 
         common_area.magic = COMMON_AREA_MAGIC;
         common_area.version = 1;
@@ -318,6 +330,6 @@ void BootROM(void) {
         flash_mode(1);
     } else {
         // jump to Flash address of the osimage entry point (LSBit set for thumb mode)
-        __asm("bx %0\n" : : "r" ( ((int)&_osimage_entry) | 0x1 ) );
+        __asm("bx %0\n" : : "r"(((int)&_osimage_entry) | 0x1));
     }
 }
diff --git a/client/amiitool/amiibo.c b/client/amiitool/amiibo.c
index 24a9f158d..34038fba3 100644
--- a/client/amiitool/amiibo.c
+++ b/client/amiitool/amiibo.c
@@ -12,7 +12,8 @@
 #define HMAC_POS_DATA 0x008
 #define HMAC_POS_TAG 0x1B4
 
-void nfc3d_amiibo_calc_seed(const uint8_t * dump, uint8_t * key) {
+void nfc3d_amiibo_calc_seed(const uint8_t *dump, uint8_t *key)
+{
     memcpy(key + 0x00, dump + 0x029, 0x02);
     memset(key + 0x02, 0x00, 0x0E);
     memcpy(key + 0x10, dump + 0x1D4, 0x08);
@@ -20,24 +21,26 @@ void nfc3d_amiibo_calc_seed(const uint8_t * dump, uint8_t * key) {
     memcpy(key + 0x20, dump + 0x1E8, 0x20);
 }
 
-void nfc3d_amiibo_keygen(const nfc3d_keygen_masterkeys * masterKeys, const uint8_t * dump, nfc3d_keygen_derivedkeys * derivedKeys) {
+void nfc3d_amiibo_keygen(const nfc3d_keygen_masterkeys *masterKeys, const uint8_t *dump, nfc3d_keygen_derivedkeys *derivedKeys)
+{
     uint8_t seed[NFC3D_KEYGEN_SEED_SIZE];
 
     nfc3d_amiibo_calc_seed(dump, seed);
     nfc3d_keygen(masterKeys, seed, derivedKeys);
 }
 
-void nfc3d_amiibo_cipher(const nfc3d_keygen_derivedkeys * keys, const uint8_t * in, uint8_t * out) {
+void nfc3d_amiibo_cipher(const nfc3d_keygen_derivedkeys *keys, const uint8_t *in, uint8_t *out)
+{
     mbedtls_aes_context aes;
     size_t nc_off = 0;
     unsigned char nonce_counter[16];
     unsigned char stream_block[16];
 
-    mbedtls_aes_setkey_enc( &aes, keys->aesKey, 128 );
+    mbedtls_aes_setkey_enc(&aes, keys->aesKey, 128);
     memset(nonce_counter, 0, sizeof(nonce_counter));
     memset(stream_block, 0, sizeof(stream_block));
     memcpy(nonce_counter, keys->aesIV, sizeof(nonce_counter));
-    mbedtls_aes_crypt_ctr( &aes, 0x188, &nc_off, nonce_counter, stream_block, in + 0x02C, out + 0x02C );
+    mbedtls_aes_crypt_ctr(&aes, 0x188, &nc_off, nonce_counter, stream_block, in + 0x02C, out + 0x02C);
 
     memcpy(out + 0x000, in + 0x000, 0x008);
     // Data signature NOT copied
@@ -46,7 +49,8 @@ void nfc3d_amiibo_cipher(const nfc3d_keygen_derivedkeys * keys, const uint8_t *
     memcpy(out + 0x1D4, in + 0x1D4, 0x034);
 }
 
-void nfc3d_amiibo_tag_to_internal(const uint8_t * tag, uint8_t * intl) {
+void nfc3d_amiibo_tag_to_internal(const uint8_t *tag, uint8_t *intl)
+{
     memcpy(intl + 0x000, tag + 0x008, 0x008);
     memcpy(intl + 0x008, tag + 0x080, 0x020);
     memcpy(intl + 0x028, tag + 0x010, 0x024);
@@ -56,7 +60,8 @@ void nfc3d_amiibo_tag_to_internal(const uint8_t * tag, uint8_t * intl) {
     memcpy(intl + 0x1DC, tag + 0x054, 0x02C);
 }
 
-void nfc3d_amiibo_internal_to_tag(const uint8_t * intl, uint8_t * tag) {
+void nfc3d_amiibo_internal_to_tag(const uint8_t *intl, uint8_t *tag)
+{
     memcpy(tag + 0x008, intl + 0x000, 0x008);
     memcpy(tag + 0x080, intl + 0x008, 0x020);
     memcpy(tag + 0x010, intl + 0x028, 0x024);
@@ -66,7 +71,8 @@ void nfc3d_amiibo_internal_to_tag(const uint8_t * intl, uint8_t * tag) {
     memcpy(tag + 0x054, intl + 0x1DC, 0x02C);
 }
 
-bool nfc3d_amiibo_unpack(const nfc3d_amiibo_keys * amiiboKeys, const uint8_t * tag, uint8_t * plain) {
+bool nfc3d_amiibo_unpack(const nfc3d_amiibo_keys *amiiboKeys, const uint8_t *tag, uint8_t *plain)
+{
     uint8_t internal[NFC3D_AMIIBO_SIZE];
     nfc3d_keygen_derivedkeys dataKeys;
     nfc3d_keygen_derivedkeys tagKeys;
@@ -82,19 +88,20 @@ bool nfc3d_amiibo_unpack(const nfc3d_amiibo_keys * amiiboKeys, const uint8_t * t
     nfc3d_amiibo_cipher(&dataKeys, internal, plain);
 
     // Regenerate tag HMAC. Note: order matters, data HMAC depends on tag HMAC!
-    mbedtls_md_hmac( mbedtls_md_info_from_type(MBEDTLS_MD_SHA256), tagKeys.hmacKey, sizeof(tagKeys.hmacKey),
-             plain + 0x1D4, 0x34, plain + HMAC_POS_TAG );
+    mbedtls_md_hmac(mbedtls_md_info_from_type(MBEDTLS_MD_SHA256), tagKeys.hmacKey, sizeof(tagKeys.hmacKey),
+                    plain + 0x1D4, 0x34, plain + HMAC_POS_TAG);
 
     // Regenerate data HMAC
-    mbedtls_md_hmac( mbedtls_md_info_from_type(MBEDTLS_MD_SHA256), dataKeys.hmacKey, sizeof(dataKeys.hmacKey),
-             plain + 0x029, 0x1DF, plain + HMAC_POS_DATA );
+    mbedtls_md_hmac(mbedtls_md_info_from_type(MBEDTLS_MD_SHA256), dataKeys.hmacKey, sizeof(dataKeys.hmacKey),
+                    plain + 0x029, 0x1DF, plain + HMAC_POS_DATA);
 
     return
-            memcmp(plain + HMAC_POS_DATA, internal + HMAC_POS_DATA, 32) == 0 &&
-            memcmp(plain + HMAC_POS_TAG, internal + HMAC_POS_TAG, 32) == 0;
+        memcmp(plain + HMAC_POS_DATA, internal + HMAC_POS_DATA, 32) == 0 &&
+        memcmp(plain + HMAC_POS_TAG, internal + HMAC_POS_TAG, 32) == 0;
 }
 
-void nfc3d_amiibo_pack(const nfc3d_amiibo_keys * amiiboKeys, const uint8_t * plain, uint8_t * tag) {
+void nfc3d_amiibo_pack(const nfc3d_amiibo_keys *amiiboKeys, const uint8_t *plain, uint8_t *tag)
+{
     uint8_t cipher[NFC3D_AMIIBO_SIZE];
     nfc3d_keygen_derivedkeys tagKeys;
     nfc3d_keygen_derivedkeys dataKeys;
@@ -104,24 +111,24 @@ void nfc3d_amiibo_pack(const nfc3d_amiibo_keys * amiiboKeys, const uint8_t * pla
     nfc3d_amiibo_keygen(&amiiboKeys->data, plain, &dataKeys);
 
     // Generate tag HMAC
-    mbedtls_md_hmac( mbedtls_md_info_from_type(MBEDTLS_MD_SHA256), tagKeys.hmacKey, sizeof(tagKeys.hmacKey),
-             plain + 0x1D4, 0x34, cipher + HMAC_POS_TAG );
+    mbedtls_md_hmac(mbedtls_md_info_from_type(MBEDTLS_MD_SHA256), tagKeys.hmacKey, sizeof(tagKeys.hmacKey),
+                    plain + 0x1D4, 0x34, cipher + HMAC_POS_TAG);
 
     // Init mbedtls HMAC context
     mbedtls_md_context_t ctx;
-    mbedtls_md_init( &ctx );
-    mbedtls_md_setup( &ctx, mbedtls_md_info_from_type(MBEDTLS_MD_SHA256), 1 );
+    mbedtls_md_init(&ctx);
+    mbedtls_md_setup(&ctx, mbedtls_md_info_from_type(MBEDTLS_MD_SHA256), 1);
 
     // Generate data HMAC
-    mbedtls_md_hmac_starts( &ctx, dataKeys.hmacKey, sizeof(dataKeys.hmacKey) );
-    mbedtls_md_hmac_update( &ctx, plain + 0x029, 0x18B ); // Data
-    mbedtls_md_hmac_update( &ctx, cipher + HMAC_POS_TAG, 0x20 ); // Tag HMAC
-    mbedtls_md_hmac_update( &ctx, plain + 0x1D4, 0x34 ); // Here be dragons
+    mbedtls_md_hmac_starts(&ctx, dataKeys.hmacKey, sizeof(dataKeys.hmacKey));
+    mbedtls_md_hmac_update(&ctx, plain + 0x029, 0x18B);   // Data
+    mbedtls_md_hmac_update(&ctx, cipher + HMAC_POS_TAG, 0x20);   // Tag HMAC
+    mbedtls_md_hmac_update(&ctx, plain + 0x1D4, 0x34);   // Here be dragons
 
-    mbedtls_md_hmac_finish( &ctx, cipher + HMAC_POS_DATA );
+    mbedtls_md_hmac_finish(&ctx, cipher + HMAC_POS_DATA);
 
     // HMAC cleanup
-    mbedtls_md_free( &ctx );
+    mbedtls_md_free(&ctx);
 
     // Encrypt
     nfc3d_amiibo_cipher(&dataKeys, plain, cipher);
@@ -130,8 +137,9 @@ void nfc3d_amiibo_pack(const nfc3d_amiibo_keys * amiiboKeys, const uint8_t * pla
     nfc3d_amiibo_internal_to_tag(cipher, tag);
 }
 
-bool nfc3d_amiibo_load_keys(nfc3d_amiibo_keys * amiiboKeys, const char * path) {
-    FILE * f = fopen(path, "rb");
+bool nfc3d_amiibo_load_keys(nfc3d_amiibo_keys *amiiboKeys, const char *path)
+{
+    FILE *f = fopen(path, "rb");
     if (!f) {
         return false;
     }
@@ -152,7 +160,8 @@ bool nfc3d_amiibo_load_keys(nfc3d_amiibo_keys * amiiboKeys, const char * path) {
     return true;
 }
 
-void nfc3d_amiibo_copy_app_data(const uint8_t * src, uint8_t * dst) {
+void nfc3d_amiibo_copy_app_data(const uint8_t *src, uint8_t *dst)
+{
 
 
     //uint16_t *ami_nb_wr = (uint16_t*)(dst + 0x29);
@@ -162,8 +171,8 @@ void nfc3d_amiibo_copy_app_data(const uint8_t * src, uint8_t * dst) {
     //*ami_nb_wr = htobe16(be16toh(*ami_nb_wr) + 1);
     //*cfg_nb_wr = htobe16(be16toh(*cfg_nb_wr) + 1);
 
-    uint16_t ami_nb_wr =  ((uint16_t)bytes_to_num(dst + 0x29, 2)) + 1;
-    uint16_t cfg_nb_wr =  ((uint16_t)bytes_to_num(dst + 0xB4, 2)) + 1;
+    uint16_t ami_nb_wr = ((uint16_t)bytes_to_num(dst + 0x29, 2)) + 1;
+    uint16_t cfg_nb_wr = ((uint16_t)bytes_to_num(dst + 0xB4, 2)) + 1;
 
     num_to_bytes(ami_nb_wr, 2, dst + 0x29);
     num_to_bytes(cfg_nb_wr, 2, dst + 0xB4);
diff --git a/client/amiitool/amiibo.h b/client/amiitool/amiibo.h
index 5b45e9b98..7b56a2c0a 100644
--- a/client/amiitool/amiibo.h
+++ b/client/amiitool/amiibo.h
@@ -24,9 +24,9 @@ typedef struct {
 } nfc3d_amiibo_keys;
 #pragma pack()
 
-bool nfc3d_amiibo_unpack(const nfc3d_amiibo_keys * amiiboKeys, const uint8_t * tag, uint8_t * plain);
-void nfc3d_amiibo_pack(const nfc3d_amiibo_keys * amiiboKeys, const uint8_t * plain, uint8_t * tag);
-bool nfc3d_amiibo_load_keys(nfc3d_amiibo_keys * amiiboKeys, const char * path);
-void nfc3d_amiibo_copy_app_data(const uint8_t * src, uint8_t * dst);
+bool nfc3d_amiibo_unpack(const nfc3d_amiibo_keys *amiiboKeys, const uint8_t *tag, uint8_t *plain);
+void nfc3d_amiibo_pack(const nfc3d_amiibo_keys *amiiboKeys, const uint8_t *plain, uint8_t *tag);
+bool nfc3d_amiibo_load_keys(nfc3d_amiibo_keys *amiiboKeys, const char *path);
+void nfc3d_amiibo_copy_app_data(const uint8_t *src, uint8_t *dst);
 
 #endif
diff --git a/client/amiitool/amiitool.c b/client/amiitool/amiitool.c
index 2643ffa36..9d30e4cb7 100644
--- a/client/amiitool/amiitool.c
+++ b/client/amiitool/amiitool.c
@@ -12,27 +12,29 @@
 
 #define NTAG215_SIZE 540
 
-static char * self;
+static char *self;
 
-void amiitool_usage() {
+void amiitool_usage()
+{
     fprintf(stderr,
-        "amiitool build %i (commit %s-%08x)\n"
-        "by Marcos Del Sol Vives <marcos@dracon.es>\n"
-        "\n"
-        "Usage: %s (-e|-d|-c) -k keyfile [-i input] [-s input2] [-o output]\n"
-        "   -e encrypt and sign amiibo\n"
-        "   -d decrypt and test amiibo\n"
-        "   -c decrypt, copy AppData and encrypt amiibo\n"
-        "   -k key set file. For retail amiibo, use \"retail unfixed\" key set\n"
-        "   -i input file. If not specified, stdin will be used.\n"
-        "   -s input save file, save from this file will replace input file ones.\n"
-        "   -o output file. If not specified, stdout will be used.\n"
-        "   -l decrypt files with invalid signatures.\n",
-        , self
-    );
+            "amiitool build %i (commit %s-%08x)\n"
+            "by Marcos Del Sol Vives <marcos@dracon.es>\n"
+            "\n"
+            "Usage: %s (-e|-d|-c) -k keyfile [-i input] [-s input2] [-o output]\n"
+            "   -e encrypt and sign amiibo\n"
+            "   -d decrypt and test amiibo\n"
+            "   -c decrypt, copy AppData and encrypt amiibo\n"
+            "   -k key set file. For retail amiibo, use \"retail unfixed\" key set\n"
+            "   -i input file. If not specified, stdin will be used.\n"
+            "   -s input save file, save from this file will replace input file ones.\n"
+            "   -o output file. If not specified, stdout will be used.\n"
+            "   -l decrypt files with invalid signatures.\n",
+            , self
+           );
 }
 
-static bool LoadAmiikey(nfc3d_amiibo_keys keys, char* keyfile) {
+static bool LoadAmiikey(nfc3d_amiibo_keys keys, char *keyfile)
+{
 
     if (!nfc3d_amiibo_load_keys(&keys, keyfile)) {
         PrintAndLogEx(ERR, "Could not load keys from '%s'", keyfile);
@@ -41,13 +43,14 @@ static bool LoadAmiikey(nfc3d_amiibo_keys keys, char* keyfile) {
     return true;
 }
 
-int main(int argc, char ** argv) {
+int main(int argc, char **argv)
+{
     self = argv[0];
 
-    char * infile = NULL;
-    char * savefile = NULL;
-    char * outfile = NULL;
-    char * keyfile = NULL;
+    char *infile = NULL;
+    char *savefile = NULL;
+    char *outfile = NULL;
+    char *keyfile = NULL;
     char op = '\0';
     bool lenient = false;
 
@@ -88,7 +91,7 @@ int main(int argc, char ** argv) {
     uint8_t original[NTAG215_SIZE];
     uint8_t modified[NFC3D_AMIIBO_SIZE];
 
-    FILE * f = stdin;
+    FILE *f = stdin;
     if (infile) {
         f = fopen(infile, "rb");
         if (!f) {
diff --git a/client/amiitool/drbg.c b/client/amiitool/drbg.c
index aaf0acef5..e350ffdf3 100644
--- a/client/amiitool/drbg.c
+++ b/client/amiitool/drbg.c
@@ -10,7 +10,8 @@
 #include <string.h>
 #include <mbedtls/md.h>
 
-void nfc3d_drbg_init(nfc3d_drbg_ctx * ctx, const uint8_t * hmacKey, size_t hmacKeySize, const uint8_t * seed, size_t seedSize) {
+void nfc3d_drbg_init(nfc3d_drbg_ctx *ctx, const uint8_t *hmacKey, size_t hmacKeySize, const uint8_t *seed, size_t seedSize)
+{
     assert(ctx != NULL);
     assert(hmacKey != NULL);
     assert(seed != NULL);
@@ -30,7 +31,8 @@ void nfc3d_drbg_init(nfc3d_drbg_ctx * ctx, const uint8_t * hmacKey, size_t hmacK
     mbedtls_md_hmac_starts(&ctx->hmacCtx, hmacKey, hmacKeySize);
 }
 
-void nfc3d_drbg_step(nfc3d_drbg_ctx * ctx, uint8_t * output) {
+void nfc3d_drbg_step(nfc3d_drbg_ctx *ctx, uint8_t *output)
+{
     assert(ctx != NULL);
     assert(output != NULL);
 
@@ -51,12 +53,14 @@ void nfc3d_drbg_step(nfc3d_drbg_ctx * ctx, uint8_t * output) {
     mbedtls_md_hmac_finish(&ctx->hmacCtx, output);
 }
 
-void nfc3d_drbg_cleanup(nfc3d_drbg_ctx * ctx) {
+void nfc3d_drbg_cleanup(nfc3d_drbg_ctx *ctx)
+{
     assert(ctx != NULL);
     mbedtls_md_free(&ctx->hmacCtx);
 }
 
-void nfc3d_drbg_generate_bytes(const uint8_t * hmacKey, size_t hmacKeySize, const uint8_t * seed, size_t seedSize, uint8_t * output, size_t outputSize) {
+void nfc3d_drbg_generate_bytes(const uint8_t *hmacKey, size_t hmacKeySize, const uint8_t *seed, size_t seedSize, uint8_t *output, size_t outputSize)
+{
     uint8_t temp[NFC3D_DRBG_OUTPUT_SIZE];
 
     nfc3d_drbg_ctx rngCtx;
diff --git a/client/amiitool/drbg.h b/client/amiitool/drbg.h
index 7b5bddc86..d77d030ac 100644
--- a/client/amiitool/drbg.h
+++ b/client/amiitool/drbg.h
@@ -24,10 +24,10 @@ typedef struct {
     size_t bufferSize;
 } nfc3d_drbg_ctx;
 
-void nfc3d_drbg_init(nfc3d_drbg_ctx * ctx, const uint8_t * hmacKey, size_t hmacKeySize, const uint8_t * seed, size_t seedSize);
-void nfc3d_drbg_step(nfc3d_drbg_ctx * ctx, uint8_t * output);
-void nfc3d_drbg_cleanup(nfc3d_drbg_ctx * ctx);
-void nfc3d_drbg_generate_bytes(const uint8_t * hmacKey, size_t hmacKeySize, const uint8_t * seed, size_t seedSize, uint8_t * output, size_t outputSize);
+void nfc3d_drbg_init(nfc3d_drbg_ctx *ctx, const uint8_t *hmacKey, size_t hmacKeySize, const uint8_t *seed, size_t seedSize);
+void nfc3d_drbg_step(nfc3d_drbg_ctx *ctx, uint8_t *output);
+void nfc3d_drbg_cleanup(nfc3d_drbg_ctx *ctx);
+void nfc3d_drbg_generate_bytes(const uint8_t *hmacKey, size_t hmacKeySize, const uint8_t *seed, size_t seedSize, uint8_t *output, size_t outputSize);
 
 #endif
 
diff --git a/client/amiitool/keygen.c b/client/amiitool/keygen.c
index 1c0a91344..52f9c0069 100644
--- a/client/amiitool/keygen.c
+++ b/client/amiitool/keygen.c
@@ -10,13 +10,14 @@
 #include <stdio.h>
 #include <string.h>
 
-void nfc3d_keygen_prepare_seed(const nfc3d_keygen_masterkeys * baseKeys, const uint8_t * baseSeed, uint8_t * output, size_t * outputSize) {
+void nfc3d_keygen_prepare_seed(const nfc3d_keygen_masterkeys *baseKeys, const uint8_t *baseSeed, uint8_t *output, size_t *outputSize)
+{
     assert(baseKeys != NULL);
     assert(baseSeed != NULL);
     assert(output != NULL);
     assert(outputSize != NULL);
 
-    uint8_t * start = output;
+    uint8_t *start = output;
 
     // 1: Copy whole type string
     output = memccpy(output, baseKeys->typeString, '\0', sizeof(baseKeys->typeString));
@@ -44,7 +45,8 @@ void nfc3d_keygen_prepare_seed(const nfc3d_keygen_masterkeys * baseKeys, const u
     *outputSize = output - start;
 }
 
-void nfc3d_keygen(const nfc3d_keygen_masterkeys * baseKeys, const uint8_t * baseSeed, nfc3d_keygen_derivedkeys * derivedKeys) {
+void nfc3d_keygen(const nfc3d_keygen_masterkeys *baseKeys, const uint8_t *baseSeed, nfc3d_keygen_derivedkeys *derivedKeys)
+{
     uint8_t preparedSeed[NFC3D_DRBG_MAX_SEED_SIZE];
     size_t preparedSeedSize;
 
diff --git a/client/amiitool/keygen.h b/client/amiitool/keygen.h
index 5e371074e..4d1c21cea 100644
--- a/client/amiitool/keygen.h
+++ b/client/amiitool/keygen.h
@@ -29,6 +29,6 @@ typedef struct {
 } nfc3d_keygen_derivedkeys;
 #pragma pack()
 
-void nfc3d_keygen(const nfc3d_keygen_masterkeys * baseKeys, const uint8_t * baseSeed, nfc3d_keygen_derivedkeys * derivedKeys);
+void nfc3d_keygen(const nfc3d_keygen_masterkeys *baseKeys, const uint8_t *baseSeed, nfc3d_keygen_derivedkeys *derivedKeys);
 
 #endif
diff --git a/client/cli.c b/client/cli.c
index e7f8324ca..66c24b6db 100644
--- a/client/cli.c
+++ b/client/cli.c
@@ -13,46 +13,45 @@
 #include "cmdmain.h"
 
 #define HANDLE_ERROR if (error_occured) { \
-  error_occured = 0;\
-  break;\
-}
+        error_occured = 0;\
+        break;\
+    }
 
 int main(int argc, char **argv)
 {
-  if (argc != 3 && argc != 4)
-  {
-    printf("\n\tusage: cli <command 1> <command 2> [logfile (default cli.log)]\n");
-    printf("\n");
-    printf("\texample: cli hi14asnoop hi14alist h14a.log\n");
-    printf("\n");
-    return -1;
-  }
-
-  usb_init();
-  if (argc == 4)
-    SetLogFilename(argv[3]);
-  else
-    SetLogFilename("cli.log");
-
-  return_on_error = 1;
-
-  while (1) {
-    while (!OpenProxmark()) { sleep(1); }
-    while (1) {
-      UsbCommand cmdbuf;
-      CommandReceived(argv[1]);
-      HANDLE_ERROR;
-      ReceiveCommand(&cmdbuf);
-      HANDLE_ERROR;
-      for (int i = 0; i < 5; ++i) {
-        ReceiveCommandPoll(&cmdbuf);
-      }
-      HANDLE_ERROR;
-      CommandReceived(argv[2]);
-      HANDLE_ERROR;
+    if (argc != 3 && argc != 4) {
+        printf("\n\tusage: cli <command 1> <command 2> [logfile (default cli.log)]\n");
+        printf("\n");
+        printf("\texample: cli hi14asnoop hi14alist h14a.log\n");
+        printf("\n");
+        return -1;
     }
-  }
 
-  CloseProxmark();
-  return 0;
+    usb_init();
+    if (argc == 4)
+        SetLogFilename(argv[3]);
+    else
+        SetLogFilename("cli.log");
+
+    return_on_error = 1;
+
+    while (1) {
+        while (!OpenProxmark()) { sleep(1); }
+        while (1) {
+            UsbCommand cmdbuf;
+            CommandReceived(argv[1]);
+            HANDLE_ERROR;
+            ReceiveCommand(&cmdbuf);
+            HANDLE_ERROR;
+            for (int i = 0; i < 5; ++i) {
+                ReceiveCommandPoll(&cmdbuf);
+            }
+            HANDLE_ERROR;
+            CommandReceived(argv[2]);
+            HANDLE_ERROR;
+        }
+    }
+
+    CloseProxmark();
+    return 0;
 }
diff --git a/client/cliparser/argtable3.c b/client/cliparser/argtable3.c
index 63e847be1..a982c4084 100644
--- a/client/cliparser/argtable3.c
+++ b/client/cliparser/argtable3.c
@@ -34,9 +34,9 @@
 // so you have to use _istspace instead of space
 #ifdef UNICODE
 #include <tchar.h>
-    #define ISSPACE _istspace
+#define ISSPACE _istspace
 #else
-    #define ISSPACE isspace
+#define ISSPACE isspace
 #endif
 
 /*******************************************************************************
@@ -79,8 +79,7 @@
 extern "C" {
 #endif
 
-enum
-{
+enum {
     EMINCOUNT = 1,
     EMAXCOUNT,
     EBADINT,
@@ -101,13 +100,13 @@ enum
     __pragma(warning(push)) \
     __pragma(warning(disable:4127)) \
     do { if (ARG_ENABLE_TRACE) dbg_printf x; } while (0) \
-    __pragma(warning(pop))
+        __pragma(warning(pop))
 
 #define ARG_LOG(x) \
     __pragma(warning(push)) \
     __pragma(warning(disable:4127)) \
     do { if (ARG_ENABLE_LOG) dbg_printf x; } while (0) \
-    __pragma(warning(pop))
+        __pragma(warning(pop))
 #else
 #define ARG_TRACE(x) \
     do { if (ARG_ENABLE_TRACE) dbg_printf x; } while (0)
@@ -254,12 +253,12 @@ char *optarg;           /* argument associated with option */
 
 #define EMSG            ""
 
-static int getopt_internal(int, char * const *, const char *,
-               const struct option *, int *, int);
-static int parse_long_options(char * const *, const char *,
-                  const struct option *, int *, int);
+static int getopt_internal(int, char *const *, const char *,
+                           const struct option *, int *, int);
+static int parse_long_options(char *const *, const char *,
+                              const struct option *, int *, int);
 static int gcd(int, int);
-static void permute_args(int, int, int, char * const *);
+static void permute_args(int, int, int, char *const *);
 
 static char *place = EMSG; /* option letter processing */
 
@@ -344,7 +343,7 @@ gcd(int a, int b)
  */
 static void
 permute_args(int panonopt_start, int panonopt_end, int opt_end,
-    char * const *nargv)
+             char *const *nargv)
 {
     int cstart, cyclelen, i, j, ncycle, nnonopts, nopts, pos;
     char *swap;
@@ -358,7 +357,7 @@ permute_args(int panonopt_start, int panonopt_end, int opt_end,
     cyclelen = (opt_end - panonopt_start) / ncycle;
 
     for (i = 0; i < ncycle; i++) {
-        cstart = panonopt_end+i;
+        cstart = panonopt_end + i;
         pos = cstart;
         for (j = 0; j < cyclelen; j++) {
             if (pos >= panonopt_end)
@@ -380,8 +379,8 @@ permute_args(int panonopt_start, int panonopt_end, int opt_end,
  * Returns -1 if short_too is set and the option does not match long_options.
  */
 static int
-parse_long_options(char * const *nargv, const char *options,
-    const struct option *long_options, int *idx, int short_too)
+parse_long_options(char *const *nargv, const char *options,
+                   const struct option *long_options, int *idx, int short_too)
 {
     char *current_argv, *has_equal;
     size_t current_argv_len;
@@ -402,7 +401,7 @@ parse_long_options(char * const *nargv, const char *options,
     for (i = 0; long_options[i].name; i++) {
         /* find matching long option */
         if (strncmp(current_argv, long_options[i].name,
-            current_argv_len))
+                    current_argv_len))
             continue;
 
         if (strlen(long_options[i].name) == current_argv_len) {
@@ -423,7 +422,7 @@ parse_long_options(char * const *nargv, const char *options,
             /* ambiguous abbreviation */
             if (PRINT_ERROR)
                 warnx(ambig, (int)current_argv_len,
-                     current_argv);
+                      current_argv);
             optopt = 0;
             return (BADCH);
         }
@@ -433,7 +432,7 @@ parse_long_options(char * const *nargv, const char *options,
             && has_equal) {
             if (PRINT_ERROR)
                 warnx(noarg, (int)current_argv_len,
-                     current_argv);
+                      current_argv);
             /*
              * XXX: GNU sets optopt to val regardless of flag
              */
@@ -448,7 +447,7 @@ parse_long_options(char * const *nargv, const char *options,
             if (has_equal)
                 optarg = has_equal;
             else if (long_options[match].has_arg ==
-                required_argument) {
+                     required_argument) {
                 /*
                  * optional argument doesn't use next nargv
                  */
@@ -463,7 +462,7 @@ parse_long_options(char * const *nargv, const char *options,
              */
             if (PRINT_ERROR)
                 warnx(recargstring,
-                    current_argv);
+                      current_argv);
             /*
              * XXX: GNU sets optopt to val regardless of flag
              */
@@ -498,14 +497,14 @@ parse_long_options(char * const *nargv, const char *options,
  * Parse argc/argv argument vector.  Called by user level routines.
  */
 static int
-getopt_internal(int nargc, char * const *nargv, const char *options,
-    const struct option *long_options, int *idx, int flags)
+getopt_internal(int nargc, char *const *nargv, const char *options,
+                const struct option *long_options, int *idx, int flags)
 {
     char *oli; /* option letter list index */
     int optchar, short_too;
     static int posixly_correct = -1;
 #ifdef __STDC_WANT_SECURE_LIB__
-    char* buffer = NULL;
+    char *buffer = NULL;
     size_t buffer_size = 0;
     errno_t err = 0;
 #endif
@@ -522,7 +521,7 @@ getopt_internal(int nargc, char * const *nargv, const char *options,
     if (posixly_correct == -1) {
         err = _dupenv_s(&buffer, &buffer_size, "POSIXLY_CORRECT") == 0;
         posixly_correct = buffer != NULL;
-        if(buffer != NULL && err == 0) {
+        if (buffer != NULL && err == 0) {
             free(buffer);
         }
     }
@@ -555,10 +554,9 @@ start:
             if (nonopt_end != -1) {
                 /* do permutation, if we have to */
                 permute_args(nonopt_start, nonopt_end,
-                    optind, nargv);
+                             optind, nargv);
                 optind -= nonopt_end - nonopt_start;
-            }
-            else if (nonopt_start != -1) {
+            } else if (nonopt_start != -1) {
                 /*
                  * If we skipped non-options, set optind
                  * to the first of them.
@@ -591,9 +589,9 @@ start:
                 nonopt_start = optind;
             else if (nonopt_end != -1) {
                 permute_args(nonopt_start, nonopt_end,
-                    optind, nargv);
+                             optind, nargv);
                 nonopt_start = optind -
-                    (nonopt_end - nonopt_start);
+                               (nonopt_end - nonopt_start);
                 nonopt_end = -1;
             }
             optind++;
@@ -615,7 +613,7 @@ start:
              */
             if (nonopt_end != -1) {
                 permute_args(nonopt_start, nonopt_end,
-                    optind, nargv);
+                             optind, nargv);
                 optind -= nonopt_end - nonopt_start;
             }
             nonopt_start = nonopt_end = -1;
@@ -638,14 +636,14 @@ start:
             short_too = 1; /* could be short option too */
 
         optchar = parse_long_options(nargv, options, long_options,
-            idx, short_too);
+                                     idx, short_too);
         if (optchar != -1) {
             place = EMSG;
             return (optchar);
         }
     }
 
-    if ((optchar = (int)*place++) == (int)':' ||
+    if ((optchar = (int) * place++) == (int)':' ||
         (optchar == (int)'-' && *place != '\0') ||
         (oli = strchr(options, optchar)) == NULL) {
         /*
@@ -675,7 +673,7 @@ start:
         } else                        /* white space */
             place = nargv[optind];
         optchar = parse_long_options(nargv, options, long_options,
-            idx, 0);
+                                     idx, 0);
         place = EMSG;
         return (optchar);
     }
@@ -711,7 +709,7 @@ start:
  * [eventually this will replace the BSD getopt]
  */
 int
-getopt(int nargc, char * const *nargv, const char *options)
+getopt(int nargc, char *const *nargv, const char *options)
 {
 
     /*
@@ -731,12 +729,12 @@ getopt(int nargc, char * const *nargv, const char *options)
  * Parse argc/argv argument vector.
  */
 int
-getopt_long(int nargc, char * const *nargv, const char *options,
-    const struct option *long_options, int *idx)
+getopt_long(int nargc, char *const *nargv, const char *options,
+            const struct option *long_options, int *idx)
 {
 
     return (getopt_internal(nargc, nargv, options, long_options, idx,
-        FLAG_PERMUTE));
+                            FLAG_PERMUTE));
 }
 
 /*
@@ -744,12 +742,12 @@ getopt_long(int nargc, char * const *nargv, const char *options,
  * Parse argc/argv argument vector.
  */
 int
-getopt_long_only(int nargc, char * const *nargv, const char *options,
-    const struct option *long_options, int *idx)
+getopt_long_only(int nargc, char *const *nargv, const char *options,
+                 const struct option *long_options, int *idx)
 {
 
     return (getopt_internal(nargc, nargv, options, long_options, idx,
-        FLAG_PERMUTE|FLAG_LONGONLY));
+                            FLAG_PERMUTE | FLAG_LONGONLY));
 }
 /*******************************************************************************
  * This file is part of the argtable3 library.
@@ -787,7 +785,7 @@ getopt_long_only(int nargc, char * const *nargv, const char *options,
 #include "argtable3.h"
 
 
-char * arg_strptime(const char *buf, const char *fmt, struct tm *tm);
+char *arg_strptime(const char *buf, const char *fmt, struct tm *tm);
 
 
 static void arg_date_resetfn(struct arg_date *parent)
@@ -801,17 +799,12 @@ static int arg_date_scanfn(struct arg_date *parent, const char *argval)
 {
     int errorcode = 0;
 
-    if (parent->count == parent->hdr.maxcount)
-    {
+    if (parent->count == parent->hdr.maxcount) {
         errorcode = EMAXCOUNT;
-    }
-    else if (!argval)
-    {
+    } else if (!argval) {
         /* no argument value was given, leave parent->tmval[] unaltered but still count it */
         parent->count++;
-    }
-    else
-    {
+    } else {
         const char *pend;
         struct tm tm = parent->tmval[parent->count];
 
@@ -852,38 +845,36 @@ static void arg_date_errorfn(
     argval = argval ? argval : "";
 
     fprintf(fp, "%s: ", progname);
-    switch(errorcode)
-    {
-    case EMINCOUNT:
-        fputs("missing option ", fp);
-        arg_print_option(fp, shortopts, longopts, datatype, "\n");
-        break;
+    switch (errorcode) {
+        case EMINCOUNT:
+            fputs("missing option ", fp);
+            arg_print_option(fp, shortopts, longopts, datatype, "\n");
+            break;
 
-    case EMAXCOUNT:
-        fputs("excess option ", fp);
-        arg_print_option(fp, shortopts, longopts, argval, "\n");
-        break;
+        case EMAXCOUNT:
+            fputs("excess option ", fp);
+            arg_print_option(fp, shortopts, longopts, argval, "\n");
+            break;
 
-    case EBADDATE:
-    {
-        struct tm tm;
-        char buff[200];
+        case EBADDATE: {
+            struct tm tm;
+            char buff[200];
 
-        fprintf(fp, "illegal timestamp format \"%s\"\n", argval);
-        memset(&tm, 0, sizeof(tm));
-        arg_strptime("1999-12-31 23:59:59", "%F %H:%M:%S", &tm);
-        strftime(buff, sizeof(buff), parent->format, &tm);
-        printf("correct format is \"%s\"\n", buff);
-        break;
-    }
+            fprintf(fp, "illegal timestamp format \"%s\"\n", argval);
+            memset(&tm, 0, sizeof(tm));
+            arg_strptime("1999-12-31 23:59:59", "%F %H:%M:%S", &tm);
+            strftime(buff, sizeof(buff), parent->format, &tm);
+            printf("correct format is \"%s\"\n", buff);
+            break;
+        }
     }
 }
 
 
-struct arg_date * arg_date0(
-    const char * shortopts,
-    const char * longopts,
-    const char * format,
+struct arg_date *arg_date0(
+    const char *shortopts,
+    const char *longopts,
+    const char *format,
     const char *datatype,
     const char *glossary)
 {
@@ -891,10 +882,10 @@ struct arg_date * arg_date0(
 }
 
 
-struct arg_date * arg_date1(
-    const char * shortopts,
-    const char * longopts,
-    const char * format,
+struct arg_date *arg_date1(
+    const char *shortopts,
+    const char *longopts,
+    const char *format,
     const char *datatype,
     const char *glossary)
 {
@@ -902,10 +893,10 @@ struct arg_date * arg_date1(
 }
 
 
-struct arg_date * arg_daten(
-    const char * shortopts,
-    const char * longopts,
-    const char * format,
+struct arg_date *arg_daten(
+    const char *shortopts,
+    const char *longopts,
+    const char *format,
     const char *datatype,
     int mincount,
     int maxcount,
@@ -922,13 +913,12 @@ struct arg_date * arg_daten(
         format = "%x";
 
     nbytes = sizeof(struct arg_date)         /* storage for struct arg_date */
-        + maxcount * sizeof(struct tm);    /* storage for tmval[maxcount] array */
+             + maxcount * sizeof(struct tm);    /* storage for tmval[maxcount] array */
 
     /* allocate storage for the arg_date struct + tmval[] array.    */
     /* we use calloc because we want the tmval[] array zero filled. */
     result = (struct arg_date *)calloc(1, nbytes);
-    if (result)
-    {
+    if (result) {
         /* init the arg_hdr struct */
         result->hdr.flag      = ARG_HASVALUE;
         result->hdr.shortopts = shortopts;
@@ -1038,12 +1028,10 @@ static int arg_strcasecmp(const char *s1, const char *s2)
 
 static int arg_strncasecmp(const char *s1, const char *s2, size_t n)
 {
-    if (n != 0)
-    {
+    if (n != 0) {
         const unsigned char *us1 = (const unsigned char *)s1;
         const unsigned char *us2 = (const unsigned char *)s2;
-        do
-        {
+        do {
             if (tolower(*us1) != tolower(*us2++))
                 return tolower(*us1) - tolower(*--us2);
 
@@ -1056,7 +1044,7 @@ static int arg_strncasecmp(const char *s1, const char *s2, size_t n)
 }
 
 
-char * arg_strptime(const char *buf, const char *fmt, struct tm *tm)
+char *arg_strptime(const char *buf, const char *fmt, struct tm *tm)
 {
     char c;
     const char *bp;
@@ -1083,275 +1071,274 @@ char * arg_strptime(const char *buf, const char *fmt, struct tm *tm)
 
 
 again:
-        switch (c = *fmt++)
-        {
-        case '%': /* "%%" is converted to "%". */
+        switch (c = *fmt++) {
+            case '%': /* "%%" is converted to "%". */
 literal:
-            if (c != *bp++)
-                return (0);
-            break;
-
-        /*
-         * "Alternative" modifiers. Just set the appropriate flag
-         * and start over again.
-         */
-        case 'E': /* "%E?" alternative conversion modifier. */
-            LEGAL_ALT(0);
-            alt_format |= ALT_E;
-            goto again;
-
-        case 'O': /* "%O?" alternative conversion modifier. */
-            LEGAL_ALT(0);
-            alt_format |= ALT_O;
-            goto again;
-
-        /*
-         * "Complex" conversion rules, implemented through recursion.
-         */
-        case 'c': /* Date and time, using the locale's format. */
-            LEGAL_ALT(ALT_E);
-            bp = arg_strptime(bp, "%x %X", tm);
-            if (!bp)
-                return (0);
-            break;
-
-        case 'D': /* The date as "%m/%d/%y". */
-            LEGAL_ALT(0);
-            bp = arg_strptime(bp, "%m/%d/%y", tm);
-            if (!bp)
-                return (0);
-            break;
-
-        case 'R': /* The time as "%H:%M". */
-            LEGAL_ALT(0);
-            bp = arg_strptime(bp, "%H:%M", tm);
-            if (!bp)
-                return (0);
-            break;
-
-        case 'r': /* The time in 12-hour clock representation. */
-            LEGAL_ALT(0);
-            bp = arg_strptime(bp, "%I:%M:%S %p", tm);
-            if (!bp)
-                return (0);
-            break;
-
-        case 'T': /* The time as "%H:%M:%S". */
-            LEGAL_ALT(0);
-            bp = arg_strptime(bp, "%H:%M:%S", tm);
-            if (!bp)
-                return (0);
-            break;
-
-        case 'X': /* The time, using the locale's format. */
-            LEGAL_ALT(ALT_E);
-            bp = arg_strptime(bp, "%H:%M:%S", tm);
-            if (!bp)
-                return (0);
-            break;
-
-        case 'x': /* The date, using the locale's format. */
-            LEGAL_ALT(ALT_E);
-            bp = arg_strptime(bp, "%m/%d/%y", tm);
-            if (!bp)
-                return (0);
-            break;
-
-        /*
-         * "Elementary" conversion rules.
-         */
-        case 'A': /* The day of week, using the locale's form. */
-        case 'a':
-            LEGAL_ALT(0);
-            for (i = 0; i < 7; i++) {
-                /* Full name. */
-                len = strlen(day[i]);
-                if (arg_strncasecmp(day[i], bp, len) == 0)
-                    break;
-
-                /* Abbreviated name. */
-                len = strlen(abday[i]);
-                if (arg_strncasecmp(abday[i], bp, len) == 0)
-                    break;
-            }
-
-            /* Nothing matched. */
-            if (i == 7)
-                return (0);
-
-            tm->tm_wday = i;
-            bp += len;
-            break;
-
-        case 'B': /* The month, using the locale's form. */
-        case 'b':
-        case 'h':
-            LEGAL_ALT(0);
-            for (i = 0; i < 12; i++) {
-                /* Full name. */
-                len = strlen(mon[i]);
-                if (arg_strncasecmp(mon[i], bp, len) == 0)
-                    break;
-
-                /* Abbreviated name. */
-                len = strlen(abmon[i]);
-                if (arg_strncasecmp(abmon[i], bp, len) == 0)
-                    break;
-            }
-
-            /* Nothing matched. */
-            if (i == 12)
-                return (0);
-
-            tm->tm_mon = i;
-            bp += len;
-            break;
-
-        case 'C': /* The century number. */
-            LEGAL_ALT(ALT_E);
-            if (!(conv_num(&bp, &i, 0, 99)))
-                return (0);
-
-            if (split_year) {
-                tm->tm_year = (tm->tm_year % 100) + (i * 100);
-            } else {
-                tm->tm_year = i * 100;
-                split_year = 1;
-            }
-            break;
-
-        case 'd': /* The day of month. */
-        case 'e':
-            LEGAL_ALT(ALT_O);
-            if (!(conv_num(&bp, &tm->tm_mday, 1, 31)))
-                return (0);
-            break;
-
-        case 'k': /* The hour (24-hour clock representation). */
-            LEGAL_ALT(0);
-        /* FALLTHROUGH */
-        case 'H':
-            LEGAL_ALT(ALT_O);
-            if (!(conv_num(&bp, &tm->tm_hour, 0, 23)))
-                return (0);
-            break;
-
-        case 'l': /* The hour (12-hour clock representation). */
-            LEGAL_ALT(0);
-        /* FALLTHROUGH */
-        case 'I':
-            LEGAL_ALT(ALT_O);
-            if (!(conv_num(&bp, &tm->tm_hour, 1, 12)))
-                return (0);
-            if (tm->tm_hour == 12)
-                tm->tm_hour = 0;
-            break;
-
-        case 'j': /* The day of year. */
-            LEGAL_ALT(0);
-            if (!(conv_num(&bp, &i, 1, 366)))
-                return (0);
-            tm->tm_yday = i - 1;
-            break;
-
-        case 'M': /* The minute. */
-            LEGAL_ALT(ALT_O);
-            if (!(conv_num(&bp, &tm->tm_min, 0, 59)))
-                return (0);
-            break;
-
-        case 'm': /* The month. */
-            LEGAL_ALT(ALT_O);
-            if (!(conv_num(&bp, &i, 1, 12)))
-                return (0);
-            tm->tm_mon = i - 1;
-            break;
-
-        case 'p': /* The locale's equivalent of AM/PM. */
-            LEGAL_ALT(0);
-            /* AM? */
-            if (arg_strcasecmp(am_pm[0], bp) == 0) {
-                if (tm->tm_hour > 11)
+                if (c != *bp++)
                     return (0);
-
-                bp += strlen(am_pm[0]);
                 break;
-            }
-            /* PM? */
-            else if (arg_strcasecmp(am_pm[1], bp) == 0) {
-                if (tm->tm_hour > 11)
-                    return (0);
 
-                tm->tm_hour += 12;
-                bp += strlen(am_pm[1]);
-                break;
-            }
-
-            /* Nothing matched. */
-            return (0);
-
-        case 'S': /* The seconds. */
-            LEGAL_ALT(ALT_O);
-            if (!(conv_num(&bp, &tm->tm_sec, 0, 61)))
-                return (0);
-            break;
-
-        case 'U': /* The week of year, beginning on sunday. */
-        case 'W': /* The week of year, beginning on monday. */
-            LEGAL_ALT(ALT_O);
             /*
-             * XXX This is bogus, as we can not assume any valid
-             * information present in the tm structure at this
-             * point to calculate a real value, so just check the
-             * range for now.
+             * "Alternative" modifiers. Just set the appropriate flag
+             * and start over again.
              */
-            if (!(conv_num(&bp, &i, 0, 53)))
-                return (0);
-            break;
+            case 'E': /* "%E?" alternative conversion modifier. */
+                LEGAL_ALT(0);
+                alt_format |= ALT_E;
+                goto again;
 
-        case 'w': /* The day of week, beginning on sunday. */
-            LEGAL_ALT(ALT_O);
-            if (!(conv_num(&bp, &tm->tm_wday, 0, 6)))
-                return (0);
-            break;
+            case 'O': /* "%O?" alternative conversion modifier. */
+                LEGAL_ALT(0);
+                alt_format |= ALT_O;
+                goto again;
 
-        case 'Y': /* The year. */
-            LEGAL_ALT(ALT_E);
-            if (!(conv_num(&bp, &i, 0, 9999)))
-                return (0);
-
-            tm->tm_year = i - TM_YEAR_BASE;
-            break;
-
-        case 'y': /* The year within 100 years of the epoch. */
-            LEGAL_ALT(ALT_E | ALT_O);
-            if (!(conv_num(&bp, &i, 0, 99)))
-                return (0);
-
-            if (split_year) {
-                tm->tm_year = ((tm->tm_year / 100) * 100) + i;
+            /*
+             * "Complex" conversion rules, implemented through recursion.
+             */
+            case 'c': /* Date and time, using the locale's format. */
+                LEGAL_ALT(ALT_E);
+                bp = arg_strptime(bp, "%x %X", tm);
+                if (!bp)
+                    return (0);
                 break;
-            }
-            split_year = 1;
-            if (i <= 68)
-                tm->tm_year = i + 2000 - TM_YEAR_BASE;
-            else
-                tm->tm_year = i + 1900 - TM_YEAR_BASE;
-            break;
 
-        /*
-         * Miscellaneous conversions.
-         */
-        case 'n': /* Any kind of white-space. */
-        case 't':
-            LEGAL_ALT(0);
-            while (ISSPACE(*bp))
-                bp++;
-            break;
+            case 'D': /* The date as "%m/%d/%y". */
+                LEGAL_ALT(0);
+                bp = arg_strptime(bp, "%m/%d/%y", tm);
+                if (!bp)
+                    return (0);
+                break;
+
+            case 'R': /* The time as "%H:%M". */
+                LEGAL_ALT(0);
+                bp = arg_strptime(bp, "%H:%M", tm);
+                if (!bp)
+                    return (0);
+                break;
+
+            case 'r': /* The time in 12-hour clock representation. */
+                LEGAL_ALT(0);
+                bp = arg_strptime(bp, "%I:%M:%S %p", tm);
+                if (!bp)
+                    return (0);
+                break;
+
+            case 'T': /* The time as "%H:%M:%S". */
+                LEGAL_ALT(0);
+                bp = arg_strptime(bp, "%H:%M:%S", tm);
+                if (!bp)
+                    return (0);
+                break;
+
+            case 'X': /* The time, using the locale's format. */
+                LEGAL_ALT(ALT_E);
+                bp = arg_strptime(bp, "%H:%M:%S", tm);
+                if (!bp)
+                    return (0);
+                break;
+
+            case 'x': /* The date, using the locale's format. */
+                LEGAL_ALT(ALT_E);
+                bp = arg_strptime(bp, "%m/%d/%y", tm);
+                if (!bp)
+                    return (0);
+                break;
+
+            /*
+             * "Elementary" conversion rules.
+             */
+            case 'A': /* The day of week, using the locale's form. */
+            case 'a':
+                LEGAL_ALT(0);
+                for (i = 0; i < 7; i++) {
+                    /* Full name. */
+                    len = strlen(day[i]);
+                    if (arg_strncasecmp(day[i], bp, len) == 0)
+                        break;
+
+                    /* Abbreviated name. */
+                    len = strlen(abday[i]);
+                    if (arg_strncasecmp(abday[i], bp, len) == 0)
+                        break;
+                }
+
+                /* Nothing matched. */
+                if (i == 7)
+                    return (0);
+
+                tm->tm_wday = i;
+                bp += len;
+                break;
+
+            case 'B': /* The month, using the locale's form. */
+            case 'b':
+            case 'h':
+                LEGAL_ALT(0);
+                for (i = 0; i < 12; i++) {
+                    /* Full name. */
+                    len = strlen(mon[i]);
+                    if (arg_strncasecmp(mon[i], bp, len) == 0)
+                        break;
+
+                    /* Abbreviated name. */
+                    len = strlen(abmon[i]);
+                    if (arg_strncasecmp(abmon[i], bp, len) == 0)
+                        break;
+                }
+
+                /* Nothing matched. */
+                if (i == 12)
+                    return (0);
+
+                tm->tm_mon = i;
+                bp += len;
+                break;
+
+            case 'C': /* The century number. */
+                LEGAL_ALT(ALT_E);
+                if (!(conv_num(&bp, &i, 0, 99)))
+                    return (0);
+
+                if (split_year) {
+                    tm->tm_year = (tm->tm_year % 100) + (i * 100);
+                } else {
+                    tm->tm_year = i * 100;
+                    split_year = 1;
+                }
+                break;
+
+            case 'd': /* The day of month. */
+            case 'e':
+                LEGAL_ALT(ALT_O);
+                if (!(conv_num(&bp, &tm->tm_mday, 1, 31)))
+                    return (0);
+                break;
+
+            case 'k': /* The hour (24-hour clock representation). */
+                LEGAL_ALT(0);
+            /* FALLTHROUGH */
+            case 'H':
+                LEGAL_ALT(ALT_O);
+                if (!(conv_num(&bp, &tm->tm_hour, 0, 23)))
+                    return (0);
+                break;
+
+            case 'l': /* The hour (12-hour clock representation). */
+                LEGAL_ALT(0);
+            /* FALLTHROUGH */
+            case 'I':
+                LEGAL_ALT(ALT_O);
+                if (!(conv_num(&bp, &tm->tm_hour, 1, 12)))
+                    return (0);
+                if (tm->tm_hour == 12)
+                    tm->tm_hour = 0;
+                break;
+
+            case 'j': /* The day of year. */
+                LEGAL_ALT(0);
+                if (!(conv_num(&bp, &i, 1, 366)))
+                    return (0);
+                tm->tm_yday = i - 1;
+                break;
+
+            case 'M': /* The minute. */
+                LEGAL_ALT(ALT_O);
+                if (!(conv_num(&bp, &tm->tm_min, 0, 59)))
+                    return (0);
+                break;
+
+            case 'm': /* The month. */
+                LEGAL_ALT(ALT_O);
+                if (!(conv_num(&bp, &i, 1, 12)))
+                    return (0);
+                tm->tm_mon = i - 1;
+                break;
+
+            case 'p': /* The locale's equivalent of AM/PM. */
+                LEGAL_ALT(0);
+                /* AM? */
+                if (arg_strcasecmp(am_pm[0], bp) == 0) {
+                    if (tm->tm_hour > 11)
+                        return (0);
+
+                    bp += strlen(am_pm[0]);
+                    break;
+                }
+                /* PM? */
+                else if (arg_strcasecmp(am_pm[1], bp) == 0) {
+                    if (tm->tm_hour > 11)
+                        return (0);
+
+                    tm->tm_hour += 12;
+                    bp += strlen(am_pm[1]);
+                    break;
+                }
+
+                /* Nothing matched. */
+                return (0);
+
+            case 'S': /* The seconds. */
+                LEGAL_ALT(ALT_O);
+                if (!(conv_num(&bp, &tm->tm_sec, 0, 61)))
+                    return (0);
+                break;
+
+            case 'U': /* The week of year, beginning on sunday. */
+            case 'W': /* The week of year, beginning on monday. */
+                LEGAL_ALT(ALT_O);
+                /*
+                 * XXX This is bogus, as we can not assume any valid
+                 * information present in the tm structure at this
+                 * point to calculate a real value, so just check the
+                 * range for now.
+                 */
+                if (!(conv_num(&bp, &i, 0, 53)))
+                    return (0);
+                break;
+
+            case 'w': /* The day of week, beginning on sunday. */
+                LEGAL_ALT(ALT_O);
+                if (!(conv_num(&bp, &tm->tm_wday, 0, 6)))
+                    return (0);
+                break;
+
+            case 'Y': /* The year. */
+                LEGAL_ALT(ALT_E);
+                if (!(conv_num(&bp, &i, 0, 9999)))
+                    return (0);
+
+                tm->tm_year = i - TM_YEAR_BASE;
+                break;
+
+            case 'y': /* The year within 100 years of the epoch. */
+                LEGAL_ALT(ALT_E | ALT_O);
+                if (!(conv_num(&bp, &i, 0, 99)))
+                    return (0);
+
+                if (split_year) {
+                    tm->tm_year = ((tm->tm_year / 100) * 100) + i;
+                    break;
+                }
+                split_year = 1;
+                if (i <= 68)
+                    tm->tm_year = i + 2000 - TM_YEAR_BASE;
+                else
+                    tm->tm_year = i + 1900 - TM_YEAR_BASE;
+                break;
+
+            /*
+             * Miscellaneous conversions.
+             */
+            case 'n': /* Any kind of white-space. */
+            case 't':
+                LEGAL_ALT(0);
+                while (ISSPACE(*bp))
+                    bp++;
+                break;
 
 
-        default: /* Unknown/unsupported conversion. */
-            return (0);
+            default: /* Unknown/unsupported conversion. */
+                return (0);
         }
 
 
@@ -1430,20 +1417,15 @@ static int arg_dbl_scanfn(struct arg_dbl *parent, const char *argval)
 {
     int errorcode = 0;
 
-    if (parent->count == parent->hdr.maxcount)
-    {
+    if (parent->count == parent->hdr.maxcount) {
         /* maximum number of arguments exceeded */
         errorcode = EMAXCOUNT;
-    }
-    else if (!argval)
-    {
+    } else if (!argval) {
         /* a valid argument with no argument value was given. */
         /* This happens when an optional argument value was invoked. */
         /* leave parent argument value unaltered but still count the argument. */
         parent->count++;
-    }
-    else
-    {
+    } else {
         double val;
         char *end;
 
@@ -1486,29 +1468,28 @@ static void arg_dbl_errorfn(
     argval = argval ? argval : "";
 
     fprintf(fp, "%s: ", progname);
-    switch(errorcode)
-    {
-    case EMINCOUNT:
-        fputs("missing option ", fp);
-        arg_print_option(fp, shortopts, longopts, datatype, "\n");
-        break;
+    switch (errorcode) {
+        case EMINCOUNT:
+            fputs("missing option ", fp);
+            arg_print_option(fp, shortopts, longopts, datatype, "\n");
+            break;
 
-    case EMAXCOUNT:
-        fputs("excess option ", fp);
-        arg_print_option(fp, shortopts, longopts, argval, "\n");
-        break;
+        case EMAXCOUNT:
+            fputs("excess option ", fp);
+            arg_print_option(fp, shortopts, longopts, argval, "\n");
+            break;
 
-    case EBADDOUBLE:
-        fprintf(fp, "invalid argument \"%s\" to option ", argval);
-        arg_print_option(fp, shortopts, longopts, datatype, "\n");
-        break;
+        case EBADDOUBLE:
+            fprintf(fp, "invalid argument \"%s\" to option ", argval);
+            arg_print_option(fp, shortopts, longopts, datatype, "\n");
+            break;
     }
 }
 
 
-struct arg_dbl * arg_dbl0(
-    const char * shortopts,
-    const char * longopts,
+struct arg_dbl *arg_dbl0(
+    const char *shortopts,
+    const char *longopts,
     const char *datatype,
     const char *glossary)
 {
@@ -1516,9 +1497,9 @@ struct arg_dbl * arg_dbl0(
 }
 
 
-struct arg_dbl * arg_dbl1(
-    const char * shortopts,
-    const char * longopts,
+struct arg_dbl *arg_dbl1(
+    const char *shortopts,
+    const char *longopts,
     const char *datatype,
     const char *glossary)
 {
@@ -1526,9 +1507,9 @@ struct arg_dbl * arg_dbl1(
 }
 
 
-struct arg_dbl * arg_dbln(
-    const char * shortopts,
-    const char * longopts,
+struct arg_dbl *arg_dbln(
+    const char *shortopts,
+    const char *longopts,
     const char *datatype,
     int mincount,
     int maxcount,
@@ -1544,8 +1525,7 @@ struct arg_dbl * arg_dbln(
              + (maxcount + 1) * sizeof(double); /* storage for dval[maxcount] array plus one extra for padding to memory boundary */
 
     result = (struct arg_dbl *)malloc(nbytes);
-    if (result)
-    {
+    if (result) {
         size_t addr;
         size_t rem;
 
@@ -1634,33 +1614,32 @@ static void arg_end_errorfn(
     argval = argval ? argval : "";
 
     fprintf(fp, "%s: ", progname);
-    switch(error)
-    {
-    case ARG_ELIMIT:
-        fputs("too many errors to display", fp);
-        break;
-    case ARG_EMALLOC:
-        fputs("insufficent memory", fp);
-        break;
-    case ARG_ENOMATCH:
-        fprintf(fp, "unexpected argument \"%s\"", argval);
-        break;
-    case ARG_EMISSARG:
-        fprintf(fp, "option \"%s\" requires an argument", argval);
-        break;
-    case ARG_ELONGOPT:
-        fprintf(fp, "invalid option \"%s\"", argval);
-        break;
-    default:
-        fprintf(fp, "invalid option \"-%c\"", error);
-        break;
+    switch (error) {
+        case ARG_ELIMIT:
+            fputs("too many errors to display", fp);
+            break;
+        case ARG_EMALLOC:
+            fputs("insufficent memory", fp);
+            break;
+        case ARG_ENOMATCH:
+            fprintf(fp, "unexpected argument \"%s\"", argval);
+            break;
+        case ARG_EMISSARG:
+            fprintf(fp, "option \"%s\" requires an argument", argval);
+            break;
+        case ARG_ELONGOPT:
+            fprintf(fp, "invalid option \"%s\"", argval);
+            break;
+        default:
+            fprintf(fp, "invalid option \"-%c\"", error);
+            break;
     }
 
     fputc('\n', fp);
 }
 
 
-struct arg_end * arg_end(int maxcount)
+struct arg_end *arg_end(int maxcount)
 {
     size_t nbytes;
     struct arg_end *result;
@@ -1671,8 +1650,7 @@ struct arg_end * arg_end(int maxcount)
              + maxcount * sizeof(char *); /* storage for char* argval[maxcount] array */
 
     result = (struct arg_end *)malloc(nbytes);
-    if (result)
-    {
+    if (result) {
         /* init the arg_hdr struct */
         result->hdr.flag      = ARG_TERMINATOR;
         result->hdr.shortopts = NULL;
@@ -1691,10 +1669,10 @@ struct arg_end * arg_end(int maxcount)
         result->error = (int *)(result + 1);
 
         /* store parent[maxcount] array immediately after error[] array */
-        result->parent = (void * *)(result->error + maxcount );
+        result->parent = (void * *)(result->error + maxcount);
 
         /* store argval[maxcount] array immediately after parent[] array */
-        result->argval = (const char * *)(result->parent + maxcount );
+        result->argval = (const char * *)(result->parent + maxcount);
     }
 
     ARG_TRACE(("arg_end(%d) returns %p\n", maxcount, result));
@@ -1702,12 +1680,11 @@ struct arg_end * arg_end(int maxcount)
 }
 
 
-void arg_print_errors(FILE * fp, struct arg_end * end, const char * progname)
+void arg_print_errors(FILE *fp, struct arg_end *end, const char *progname)
 {
     int i;
     ARG_TRACE(("arg_errors()\n"));
-    for (i = 0; i < end->count; i++)
-    {
+    for (i = 0; i < end->count; i++) {
         struct arg_hdr *errorparent = (struct arg_hdr *)(end->parent[i]);
         if (errorparent->errorfn)
             errorparent->errorfn(end->parent[i],
@@ -1769,7 +1746,7 @@ static void arg_file_resetfn(struct arg_file *parent)
 
 
 /* Returns ptr to the base filename within *filename */
-static const char * arg_basename(const char *filename)
+static const char *arg_basename(const char *filename)
 {
     const char *result = NULL, *result1, *result2;
 
@@ -1789,7 +1766,7 @@ static const char * arg_basename(const char *filename)
         result = filename;  /* neither file separator was found so basename is the whole filename */
 
     /* special cases of "." and ".." are not considered basenames */
-    if (result && ( strcmp(".", result) == 0 || strcmp("..", result) == 0 ))
+    if (result && (strcmp(".", result) == 0 || strcmp("..", result) == 0))
         result = filename + strlen(filename);
 
     return result;
@@ -1797,7 +1774,7 @@ static const char * arg_basename(const char *filename)
 
 
 /* Returns ptr to the file extension within *basename */
-static const char * arg_extension(const char *basename)
+static const char *arg_extension(const char *basename)
 {
     /* find the last occurrence of '.' in basename */
     const char *result = (basename ? strrchr(basename, '.') : NULL);
@@ -1822,20 +1799,15 @@ static int arg_file_scanfn(struct arg_file *parent, const char *argval)
 {
     int errorcode = 0;
 
-    if (parent->count == parent->hdr.maxcount)
-    {
+    if (parent->count == parent->hdr.maxcount) {
         /* maximum number of arguments exceeded */
         errorcode = EMAXCOUNT;
-    }
-    else if (!argval)
-    {
+    } else if (!argval) {
         /* a valid argument with no argument value was given. */
         /* This happens when an optional argument value was invoked. */
         /* leave parent arguiment value unaltered but still count the argument. */
         parent->count++;
-    }
-    else
-    {
+    } else {
         parent->filename[parent->count]  = argval;
         parent->basename[parent->count]  = arg_basename(argval);
         parent->extension[parent->count] =
@@ -1872,27 +1844,26 @@ static void arg_file_errorfn(
     argval = argval ? argval : "";
 
     fprintf(fp, "%s: ", progname);
-    switch(errorcode)
-    {
-    case EMINCOUNT:
-        fputs("missing option ", fp);
-        arg_print_option(fp, shortopts, longopts, datatype, "\n");
-        break;
+    switch (errorcode) {
+        case EMINCOUNT:
+            fputs("missing option ", fp);
+            arg_print_option(fp, shortopts, longopts, datatype, "\n");
+            break;
 
-    case EMAXCOUNT:
-        fputs("excess option ", fp);
-        arg_print_option(fp, shortopts, longopts, argval, "\n");
-        break;
+        case EMAXCOUNT:
+            fputs("excess option ", fp);
+            arg_print_option(fp, shortopts, longopts, argval, "\n");
+            break;
 
-    default:
-        fprintf(fp, "unknown error at \"%s\"\n", argval);
+        default:
+            fprintf(fp, "unknown error at \"%s\"\n", argval);
     }
 }
 
 
-struct arg_file * arg_file0(
-    const char * shortopts,
-    const char * longopts,
+struct arg_file *arg_file0(
+    const char *shortopts,
+    const char *longopts,
     const char *datatype,
     const char *glossary)
 {
@@ -1900,9 +1871,9 @@ struct arg_file * arg_file0(
 }
 
 
-struct arg_file * arg_file1(
-    const char * shortopts,
-    const char * longopts,
+struct arg_file *arg_file1(
+    const char *shortopts,
+    const char *longopts,
     const char *datatype,
     const char *glossary)
 {
@@ -1910,9 +1881,9 @@ struct arg_file * arg_file1(
 }
 
 
-struct arg_file * arg_filen(
-    const char * shortopts,
-    const char * longopts,
+struct arg_file *arg_filen(
+    const char *shortopts,
+    const char *longopts,
     const char *datatype,
     int mincount,
     int maxcount,
@@ -1930,8 +1901,7 @@ struct arg_file * arg_filen(
              + sizeof(char *) * maxcount; /* storage for extension[maxcount] array */
 
     result = (struct arg_file *)malloc(nbytes);
-    if (result)
-    {
+    if (result) {
         int i;
 
         /* init the arg_hdr struct */
@@ -1955,8 +1925,7 @@ struct arg_file * arg_filen(
         result->count = 0;
 
         /* foolproof the string pointers by initialising them with empty strings */
-        for (i = 0; i < maxcount; i++)
-        {
+        for (i = 0; i < maxcount; i++) {
             result->filename[i] = "";
             result->basename[i] = "";
             result->extension[i] = "";
@@ -2020,7 +1989,7 @@ static void arg_int_resetfn(struct arg_int *parent)
 /* eg: to parse oct str="+0o12324", specify X='O' and base=8.       */
 /* eg: to parse bin str="-0B01010", specify X='B' and base=2.       */
 /* Failure of conversion is indicated by result where *endptr==str. */
-static long int strtol0X(const char * str,
+static long int strtol0X(const char *str,
                          const char * *endptr,
                          char X,
                          int base)
@@ -2035,32 +2004,29 @@ static long int strtol0X(const char * str,
     /* printf("1) %s\n",ptr); */
 
     /* scan optional sign character */
-    switch (*ptr)
-    {
-    case '+':
-        ptr++;
-        s = 1;
-        break;
-    case '-':
-        ptr++;
-        s = -1;
-        break;
-    default:
-        s = 1;
-        break;
+    switch (*ptr) {
+        case '+':
+            ptr++;
+            s = 1;
+            break;
+        case '-':
+            ptr++;
+            s = -1;
+            break;
+        default:
+            s = 1;
+            break;
     }
     /* printf("2) %s\n",ptr); */
 
     /* '0X' prefix */
-    if ((*ptr++) != '0')
-    {
+    if ((*ptr++) != '0') {
         /* printf("failed to detect '0'\n"); */
         *endptr = str;
         return 0;
     }
     /* printf("3) %s\n",ptr); */
-    if (toupper(*ptr++) != toupper(X))
-    {
+    if (toupper(*ptr++) != toupper(X)) {
         /* printf("failed to detect '%c'\n",X); */
         *endptr = str;
         return 0;
@@ -2069,8 +2035,7 @@ static long int strtol0X(const char * str,
 
     /* attempt conversion on remainder of string using strtol() */
     val = strtol(ptr, (char * *)endptr, base);
-    if (*endptr == ptr)
-    {
+    if (*endptr == ptr) {
         /* conversion failed */
         *endptr = str;
         return 0;
@@ -2086,8 +2051,7 @@ static long int strtol0X(const char * str,
 static int detectsuffix(const char *str, const char *suffix)
 {
     /* scan pairwise through strings until mismatch detected */
-    while( toupper(*str) == toupper(*suffix) )
-    {
+    while (toupper(*str) == toupper(*suffix)) {
         /* printf("'%c' '%c'\n", *str, *suffix); */
 
         /* return 1 (success) if match persists until the string terminator */
@@ -2117,39 +2081,30 @@ static int arg_int_scanfn(struct arg_int *parent, const char *argval)
 {
     int errorcode = 0;
 
-    if (parent->count == parent->hdr.maxcount)
-    {
+    if (parent->count == parent->hdr.maxcount) {
         /* maximum number of arguments exceeded */
         errorcode = EMAXCOUNT;
-    }
-    else if (!argval)
-    {
+    } else if (!argval) {
         /* a valid argument with no argument value was given. */
         /* This happens when an optional argument value was invoked. */
         /* leave parent arguiment value unaltered but still count the argument. */
         parent->count++;
-    }
-    else
-    {
+    } else {
         long int val;
         const char *end;
 
         /* attempt to extract hex integer (eg: +0x123) from argval into val conversion */
         val = strtol0X(argval, &end, 'X', 16);
-        if (end == argval)
-        {
+        if (end == argval) {
             /* hex failed, attempt octal conversion (eg +0o123) */
             val = strtol0X(argval, &end, 'O', 8);
-            if (end == argval)
-            {
+            if (end == argval) {
                 /* octal failed, attempt binary conversion (eg +0B101) */
                 val = strtol0X(argval, &end, 'B', 2);
-                if (end == argval)
-                {
+                if (end == argval) {
                     /* binary failed, attempt decimal conversion with no prefix (eg 1234) */
                     val = strtol(argval, (char * *)&end, 10);
-                    if (end == argval)
-                    {
+                    if (end == argval) {
                         /* all supported number formats failed */
                         return EBADINT;
                     }
@@ -2159,7 +2114,7 @@ static int arg_int_scanfn(struct arg_int *parent, const char *argval)
 
         /* Safety check for integer overflow. WARNING: this check    */
         /* achieves nothing on machines where size(int)==size(long). */
-        if ( val > INT_MAX || val < INT_MIN )
+        if (val > INT_MAX || val < INT_MIN)
 #ifdef __STDC_WANT_SECURE_LIB__
             errorcode = EOVERFLOW_;
 #else
@@ -2168,9 +2123,8 @@ static int arg_int_scanfn(struct arg_int *parent, const char *argval)
 
         /* Detect any suffixes (KB,MB,GB) and multiply argument value appropriately. */
         /* We need to be mindful of integer overflows when using such big numbers.   */
-        if (detectsuffix(end, "KB"))             /* kilobytes */
-        {
-            if ( val > (INT_MAX / 1024) || val < (INT_MIN / 1024) )
+        if (detectsuffix(end, "KB")) {           /* kilobytes */
+            if (val > (INT_MAX / 1024) || val < (INT_MIN / 1024))
 #ifdef __STDC_WANT_SECURE_LIB__
                 errorcode = EOVERFLOW_;          /* Overflow would occur if we proceed */
 #else
@@ -2178,10 +2132,8 @@ static int arg_int_scanfn(struct arg_int *parent, const char *argval)
 #endif
             else
                 val *= 1024;                    /* 1KB = 1024 */
-        }
-        else if (detectsuffix(end, "MB"))        /* megabytes */
-        {
-            if ( val > (INT_MAX / 1048576) || val < (INT_MIN / 1048576) )
+        } else if (detectsuffix(end, "MB")) {    /* megabytes */
+            if (val > (INT_MAX / 1048576) || val < (INT_MIN / 1048576))
 #ifdef __STDC_WANT_SECURE_LIB__
                 errorcode = EOVERFLOW_;          /* Overflow would occur if we proceed */
 #else
@@ -2189,10 +2141,8 @@ static int arg_int_scanfn(struct arg_int *parent, const char *argval)
 #endif
             else
                 val *= 1048576;                 /* 1MB = 1024*1024 */
-        }
-        else if (detectsuffix(end, "GB"))        /* gigabytes */
-        {
-            if ( val > (INT_MAX / 1073741824) || val < (INT_MIN / 1073741824) )
+        } else if (detectsuffix(end, "GB")) {    /* gigabytes */
+            if (val > (INT_MAX / 1073741824) || val < (INT_MIN / 1073741824))
 #ifdef __STDC_WANT_SECURE_LIB__
                 errorcode = EOVERFLOW_;          /* Overflow would occur if we proceed */
 #else
@@ -2200,8 +2150,7 @@ static int arg_int_scanfn(struct arg_int *parent, const char *argval)
 #endif
             else
                 val *= 1073741824;              /* 1GB = 1024*1024*1024 */
-        }
-        else if (!detectsuffix(end, ""))
+        } else if (!detectsuffix(end, ""))
             errorcode = EBADINT;                /* invalid suffix detected */
 
         /* if success then store result in parent->ival[] array */
@@ -2237,37 +2186,36 @@ static void arg_int_errorfn(
     argval = argval ? argval : "";
 
     fprintf(fp, "%s: ", progname);
-    switch(errorcode)
-    {
-    case EMINCOUNT:
-        fputs("missing option ", fp);
-        arg_print_option(fp, shortopts, longopts, datatype, "\n");
-        break;
+    switch (errorcode) {
+        case EMINCOUNT:
+            fputs("missing option ", fp);
+            arg_print_option(fp, shortopts, longopts, datatype, "\n");
+            break;
 
-    case EMAXCOUNT:
-        fputs("excess option ", fp);
-        arg_print_option(fp, shortopts, longopts, argval, "\n");
-        break;
+        case EMAXCOUNT:
+            fputs("excess option ", fp);
+            arg_print_option(fp, shortopts, longopts, argval, "\n");
+            break;
 
-    case EBADINT:
-        fprintf(fp, "invalid argument \"%s\" to option ", argval);
-        arg_print_option(fp, shortopts, longopts, datatype, "\n");
-        break;
+        case EBADINT:
+            fprintf(fp, "invalid argument \"%s\" to option ", argval);
+            arg_print_option(fp, shortopts, longopts, datatype, "\n");
+            break;
 
 #ifdef __STDC_WANT_SECURE_LIB__
-    case EOVERFLOW_:
+        case EOVERFLOW_:
 #else
-    case EOVERFLOW:
+        case EOVERFLOW:
 #endif
-        fputs("integer overflow at option ", fp);
-        arg_print_option(fp, shortopts, longopts, datatype, " ");
-        fprintf(fp, "(%s is too large)\n", argval);
-        break;
+            fputs("integer overflow at option ", fp);
+            arg_print_option(fp, shortopts, longopts, datatype, " ");
+            fprintf(fp, "(%s is too large)\n", argval);
+            break;
     }
 }
 
 
-struct arg_int * arg_int0(
+struct arg_int *arg_int0(
     const char *shortopts,
     const char *longopts,
     const char *datatype,
@@ -2277,7 +2225,7 @@ struct arg_int * arg_int0(
 }
 
 
-struct arg_int * arg_int1(
+struct arg_int *arg_int1(
     const char *shortopts,
     const char *longopts,
     const char *datatype,
@@ -2287,7 +2235,7 @@ struct arg_int * arg_int1(
 }
 
 
-struct arg_int * arg_intn(
+struct arg_int *arg_intn(
     const char *shortopts,
     const char *longopts,
     const char *datatype,
@@ -2305,8 +2253,7 @@ struct arg_int * arg_intn(
              + maxcount * sizeof(int); /* storage for ival[maxcount] array */
 
     result = (struct arg_int *)malloc(nbytes);
-    if (result)
-    {
+    if (result) {
         /* init the arg_hdr struct */
         result->hdr.flag      = ARG_HASVALUE;
         result->hdr.shortopts = shortopts;
@@ -2374,7 +2321,7 @@ static void arg_lit_resetfn(struct arg_lit *parent)
 static int arg_lit_scanfn(struct arg_lit *parent, const char *argval)
 {
     int errorcode = 0;
-    if (parent->count < parent->hdr.maxcount )
+    if (parent->count < parent->hdr.maxcount)
         parent->count++;
     else
         errorcode = EMAXCOUNT;
@@ -2404,18 +2351,17 @@ static void arg_lit_errorfn(
     const char *longopts  = parent->hdr.longopts;
     const char *datatype  = parent->hdr.datatype;
 
-    switch(errorcode)
-    {
-    case EMINCOUNT:
-        fprintf(fp, "%s: missing option ", progname);
-        arg_print_option(fp, shortopts, longopts, datatype, "\n");
-        fprintf(fp, "\n");
-        break;
+    switch (errorcode) {
+        case EMINCOUNT:
+            fprintf(fp, "%s: missing option ", progname);
+            arg_print_option(fp, shortopts, longopts, datatype, "\n");
+            fprintf(fp, "\n");
+            break;
 
-    case EMAXCOUNT:
-        fprintf(fp, "%s: extraneous option ", progname);
-        arg_print_option(fp, shortopts, longopts, datatype, "\n");
-        break;
+        case EMAXCOUNT:
+            fprintf(fp, "%s: extraneous option ", progname);
+            arg_print_option(fp, shortopts, longopts, datatype, "\n");
+            break;
     }
 
     ARG_TRACE(("%s:errorfn(%p, %p, %d, %s, %s)\n", __FILE__, parent, fp,
@@ -2423,16 +2369,16 @@ static void arg_lit_errorfn(
 }
 
 
-struct arg_lit * arg_lit0(
-    const char * shortopts,
-    const char * longopts,
-    const char * glossary)
+struct arg_lit *arg_lit0(
+    const char *shortopts,
+    const char *longopts,
+    const char *glossary)
 {
     return arg_litn(shortopts, longopts, 0, 1, glossary);
 }
 
 
-struct arg_lit * arg_lit1(
+struct arg_lit *arg_lit1(
     const char *shortopts,
     const char *longopts,
     const char *glossary)
@@ -2441,7 +2387,7 @@ struct arg_lit * arg_lit1(
 }
 
 
-struct arg_lit * arg_litn(
+struct arg_lit *arg_litn(
     const char *shortopts,
     const char *longopts,
     int mincount,
@@ -2454,8 +2400,7 @@ struct arg_lit * arg_litn(
     maxcount = (maxcount < mincount) ? mincount : maxcount;
 
     result = (struct arg_lit *)malloc(sizeof(struct arg_lit));
-    if (result)
-    {
+    if (result) {
         /* init the arg_hdr struct */
         result->hdr.flag      = 0;
         result->hdr.shortopts = shortopts;
@@ -2514,8 +2459,7 @@ struct arg_lit * arg_litn(
 struct arg_rem *arg_rem(const char *datatype, const char *glossary)
 {
     struct arg_rem *result = (struct arg_rem *)malloc(sizeof(struct arg_rem));
-    if (result)
-    {
+    if (result) {
         result->hdr.flag = 0;
         result->hdr.shortopts = NULL;
         result->hdr.longopts = NULL;
@@ -2636,11 +2580,11 @@ typedef struct {
 
 TREX_API TRex *trex_compile(const TRexChar *pattern, const TRexChar **error, int flags);
 TREX_API void trex_free(TRex *exp);
-TREX_API TRexBool trex_match(TRex* exp, const TRexChar* text);
-TREX_API TRexBool trex_search(TRex* exp, const TRexChar* text, const TRexChar** out_begin, const TRexChar** out_end);
-TREX_API TRexBool trex_searchrange(TRex* exp, const TRexChar* text_begin, const TRexChar* text_end, const TRexChar** out_begin, const TRexChar** out_end);
-TREX_API int trex_getsubexpcount(TRex* exp);
-TREX_API TRexBool trex_getsubexp(TRex* exp, int n, TRexMatch *subexp);
+TREX_API TRexBool trex_match(TRex *exp, const TRexChar *text);
+TREX_API TRexBool trex_search(TRex *exp, const TRexChar *text, const TRexChar **out_begin, const TRexChar **out_end);
+TREX_API TRexBool trex_searchrange(TRex *exp, const TRexChar *text_begin, const TRexChar *text_end, const TRexChar **out_begin, const TRexChar **out_end);
+TREX_API int trex_getsubexpcount(TRex *exp);
+TREX_API TRexBool trex_getsubexp(TRex *exp, int n, TRexMatch *subexp);
 
 #ifdef __cplusplus
 }
@@ -2650,8 +2594,7 @@ TREX_API TRexBool trex_getsubexp(TRex* exp, int n, TRexMatch *subexp);
 
 
 
-struct privhdr
-{
+struct privhdr {
     const char *pattern;
     int flags;
 };
@@ -2670,20 +2613,15 @@ static int arg_rex_scanfn(struct arg_rex *parent, const char *argval)
     TRex *rex = NULL;
     TRexBool is_match = TRex_False;
 
-    if (parent->count == parent->hdr.maxcount )
-    {
+    if (parent->count == parent->hdr.maxcount) {
         /* maximum number of arguments exceeded */
         errorcode = EMAXCOUNT;
-    }
-    else if (!argval)
-    {
+    } else if (!argval) {
         /* a valid argument with no argument value was given. */
         /* This happens when an optional argument value was invoked. */
         /* leave parent argument value unaltered but still count the argument. */
         parent->count++;
-    }
-    else
-    {
+    } else {
         struct privhdr *priv = (struct privhdr *)parent->hdr.priv;
 
         /* test the current argument value for a match with the regular expression */
@@ -2699,7 +2637,7 @@ static int arg_rex_scanfn(struct arg_rex *parent, const char *argval)
         trex_free(rex);
     }
 
-    ARG_TRACE(("%s:scanfn(%p) returns %d\n",__FILE__,parent,errorcode));
+    ARG_TRACE(("%s:scanfn(%p) returns %d\n", __FILE__, parent, errorcode));
     return errorcode;
 }
 
@@ -2716,10 +2654,10 @@ static int arg_rex_checkfn(struct arg_rex *parent)
 }
 
 static void arg_rex_errorfn(struct arg_rex *parent,
-                    FILE *fp,
-                    int errorcode,
-                    const char *argval,
-                    const char *progname)
+                            FILE *fp,
+                            int errorcode,
+                            const char *argval,
+                            const char *progname)
 {
     const char *shortopts = parent->hdr.shortopts;
     const char *longopts  = parent->hdr.longopts;
@@ -2729,40 +2667,38 @@ static void arg_rex_errorfn(struct arg_rex *parent,
     argval = argval ? argval : "";
 
     fprintf(fp, "%s: ", progname);
-    switch(errorcode)
-    {
-    case EMINCOUNT:
-        fputs("missing option ", fp);
-        arg_print_option(fp, shortopts, longopts, datatype, "\n");
-        break;
+    switch (errorcode) {
+        case EMINCOUNT:
+            fputs("missing option ", fp);
+            arg_print_option(fp, shortopts, longopts, datatype, "\n");
+            break;
 
-    case EMAXCOUNT:
-        fputs("excess option ", fp);
-        arg_print_option(fp, shortopts, longopts, argval, "\n");
-        break;
+        case EMAXCOUNT:
+            fputs("excess option ", fp);
+            arg_print_option(fp, shortopts, longopts, argval, "\n");
+            break;
 
-    case EREGNOMATCH:
-        fputs("illegal value  ", fp);
-        arg_print_option(fp, shortopts, longopts, argval, "\n");
-        break;
+        case EREGNOMATCH:
+            fputs("illegal value  ", fp);
+            arg_print_option(fp, shortopts, longopts, argval, "\n");
+            break;
 
-    default:
-    {
-        //char errbuff[256];
-        //regerror(errorcode, NULL, errbuff, sizeof(errbuff));
-        //printf("%s\n", errbuff);
-    }
-    break;
+        default: {
+            //char errbuff[256];
+            //regerror(errorcode, NULL, errbuff, sizeof(errbuff));
+            //printf("%s\n", errbuff);
+        }
+        break;
     }
 }
 
 
-struct arg_rex * arg_rex0(const char * shortopts,
-                          const char * longopts,
-                          const char * pattern,
-                          const char *datatype,
-                          int flags,
-                          const char *glossary)
+struct arg_rex *arg_rex0(const char *shortopts,
+                         const char *longopts,
+                         const char *pattern,
+                         const char *datatype,
+                         int flags,
+                         const char *glossary)
 {
     return arg_rexn(shortopts,
                     longopts,
@@ -2774,12 +2710,12 @@ struct arg_rex * arg_rex0(const char * shortopts,
                     glossary);
 }
 
-struct arg_rex * arg_rex1(const char * shortopts,
-                          const char * longopts,
-                          const char * pattern,
-                          const char *datatype,
-                          int flags,
-                          const char *glossary)
+struct arg_rex *arg_rex1(const char *shortopts,
+                         const char *longopts,
+                         const char *pattern,
+                         const char *datatype,
+                         int flags,
+                         const char *glossary)
 {
     return arg_rexn(shortopts,
                     longopts,
@@ -2792,14 +2728,14 @@ struct arg_rex * arg_rex1(const char * shortopts,
 }
 
 
-struct arg_rex * arg_rexn(const char * shortopts,
-                          const char * longopts,
-                          const char * pattern,
-                          const char *datatype,
-                          int mincount,
-                          int maxcount,
-                          int flags,
-                          const char *glossary)
+struct arg_rex *arg_rexn(const char *shortopts,
+                         const char *longopts,
+                         const char *pattern,
+                         const char *datatype,
+                         int mincount,
+                         int maxcount,
+                         int flags,
+                         const char *glossary)
 {
     size_t nbytes;
     struct arg_rex *result;
@@ -2808,8 +2744,7 @@ struct arg_rex * arg_rexn(const char * shortopts,
     const TRexChar *error = NULL;
     TRex *rex = NULL;
 
-    if (!pattern)
-    {
+    if (!pattern) {
         printf(
             "argtable: ERROR - illegal regular expression pattern \"(NULL)\"\n");
         printf("argtable: Bad argument table.\n");
@@ -2862,8 +2797,7 @@ struct arg_rex * arg_rexn(const char * shortopts,
      */
 
     rex = trex_compile(priv->pattern, &error, priv->flags);
-    if (rex == NULL)
-    {
+    if (rex == NULL) {
         ARG_LOG(("argtable: %s \"%s\"\n", error ? error : _TREXC("undefined"), priv->pattern));
         ARG_LOG(("argtable: Bad argument table.\n"));
     }
@@ -2897,12 +2831,11 @@ struct arg_rex * arg_rexn(const char * shortopts,
 #ifdef _DEBUG
 #include <stdio.h>
 
-static const TRexChar *g_nnames[] =
-{
-    _SC("NONE"),_SC("OP_GREEDY"), _SC("OP_OR"),
-    _SC("OP_EXPR"),_SC("OP_NOCAPEXPR"),_SC("OP_DOT"), _SC("OP_CLASS"),
-    _SC("OP_CCLASS"),_SC("OP_NCLASS"),_SC("OP_RANGE"),_SC("OP_CHAR"),
-    _SC("OP_EOL"),_SC("OP_BOL"),_SC("OP_WB")
+static const TRexChar *g_nnames[] = {
+    _SC("NONE"), _SC("OP_GREEDY"), _SC("OP_OR"),
+    _SC("OP_EXPR"), _SC("OP_NOCAPEXPR"), _SC("OP_DOT"), _SC("OP_CLASS"),
+    _SC("OP_CCLASS"), _SC("OP_NCLASS"), _SC("OP_RANGE"), _SC("OP_CHAR"),
+    _SC("OP_EOL"), _SC("OP_BOL"), _SC("OP_WB")
 };
 
 #endif
@@ -2932,14 +2865,14 @@ static const TRexChar *g_nnames[] =
 
 typedef int TRexNodeType;
 
-typedef struct tagTRexNode{
+typedef struct tagTRexNode {
     TRexNodeType type;
     int left;
     int right;
     int next;
-}TRexNode;
+} TRexNode;
 
-struct TRex{
+struct TRex {
     const TRexChar *_eol;
     const TRexChar *_bol;
     const TRexChar *_p;
@@ -2964,9 +2897,9 @@ static int trex_newnode(TRex *exp, TRexNodeType type)
     int newid;
     n.type = type;
     n.next = n.right = n.left = -1;
-    if(type == OP_EXPR)
+    if (type == OP_EXPR)
         n.right = exp->_nsubexpr++;
-    if(exp->_nallocated < (exp->_nsize + 1)) {
+    if (exp->_nallocated < (exp->_nsize + 1)) {
         exp->_nallocated *= 2;
         exp->_nodes = (TRexNode *)realloc(exp->_nodes, exp->_nallocated * sizeof(TRexNode));
     }
@@ -2975,117 +2908,151 @@ static int trex_newnode(TRex *exp, TRexNodeType type)
     return (int)newid;
 }
 
-static void trex_error(TRex *exp,const TRexChar *error)
+static void trex_error(TRex *exp, const TRexChar *error)
 {
-    if(exp->_error) *exp->_error = error;
-    longjmp(*((jmp_buf*)exp->_jmpbuf),-1);
+    if (exp->_error) *exp->_error = error;
+    longjmp(*((jmp_buf *)exp->_jmpbuf), -1);
 }
 
-static void trex_expect(TRex *exp, int n){
-    if((*exp->_p) != n)
+static void trex_expect(TRex *exp, int n)
+{
+    if ((*exp->_p) != n)
         trex_error(exp, _SC("expected paren"));
     exp->_p++;
 }
 
 static TRexChar trex_escapechar(TRex *exp)
 {
-    if(*exp->_p == TREX_SYMBOL_ESCAPE_CHAR){
+    if (*exp->_p == TREX_SYMBOL_ESCAPE_CHAR) {
         exp->_p++;
-        switch(*exp->_p) {
-        case 'v': exp->_p++; return '\v';
-        case 'n': exp->_p++; return '\n';
-        case 't': exp->_p++; return '\t';
-        case 'r': exp->_p++; return '\r';
-        case 'f': exp->_p++; return '\f';
-        default: return (*exp->_p++);
+        switch (*exp->_p) {
+            case 'v':
+                exp->_p++;
+                return '\v';
+            case 'n':
+                exp->_p++;
+                return '\n';
+            case 't':
+                exp->_p++;
+                return '\t';
+            case 'r':
+                exp->_p++;
+                return '\r';
+            case 'f':
+                exp->_p++;
+                return '\f';
+            default:
+                return (*exp->_p++);
         }
-    } else if(!scisprint(*exp->_p)) trex_error(exp,_SC("letter expected"));
+    } else if (!scisprint(*exp->_p)) trex_error(exp, _SC("letter expected"));
     return (*exp->_p++);
 }
 
-static int trex_charclass(TRex *exp,int classid)
+static int trex_charclass(TRex *exp, int classid)
 {
-    int n = trex_newnode(exp,OP_CCLASS);
+    int n = trex_newnode(exp, OP_CCLASS);
     exp->_nodes[n].left = classid;
     return n;
 }
 
-static int trex_charnode(TRex *exp,TRexBool isclass)
+static int trex_charnode(TRex *exp, TRexBool isclass)
 {
     TRexChar t;
-    if(*exp->_p == TREX_SYMBOL_ESCAPE_CHAR) {
+    if (*exp->_p == TREX_SYMBOL_ESCAPE_CHAR) {
         exp->_p++;
-        switch(*exp->_p) {
-            case 'n': exp->_p++; return trex_newnode(exp,'\n');
-            case 't': exp->_p++; return trex_newnode(exp,'\t');
-            case 'r': exp->_p++; return trex_newnode(exp,'\r');
-            case 'f': exp->_p++; return trex_newnode(exp,'\f');
-            case 'v': exp->_p++; return trex_newnode(exp,'\v');
-            case 'a': case 'A': case 'w': case 'W': case 's': case 'S':
-            case 'd': case 'D': case 'x': case 'X': case 'c': case 'C':
-            case 'p': case 'P': case 'l': case 'u':
-                {
-                t = *exp->_p; exp->_p++;
-                return trex_charclass(exp,t);
-                }
+        switch (*exp->_p) {
+            case 'n':
+                exp->_p++;
+                return trex_newnode(exp, '\n');
+            case 't':
+                exp->_p++;
+                return trex_newnode(exp, '\t');
+            case 'r':
+                exp->_p++;
+                return trex_newnode(exp, '\r');
+            case 'f':
+                exp->_p++;
+                return trex_newnode(exp, '\f');
+            case 'v':
+                exp->_p++;
+                return trex_newnode(exp, '\v');
+            case 'a':
+            case 'A':
+            case 'w':
+            case 'W':
+            case 's':
+            case 'S':
+            case 'd':
+            case 'D':
+            case 'x':
+            case 'X':
+            case 'c':
+            case 'C':
+            case 'p':
+            case 'P':
+            case 'l':
+            case 'u': {
+                t = *exp->_p;
+                exp->_p++;
+                return trex_charclass(exp, t);
+            }
             case 'b':
             case 'B':
-                if(!isclass) {
-                    int node = trex_newnode(exp,OP_WB);
+                if (!isclass) {
+                    int node = trex_newnode(exp, OP_WB);
                     exp->_nodes[node].left = *exp->_p;
                     exp->_p++;
                     return node;
                 } //else default
             default:
-                t = *exp->_p; exp->_p++;
-                return trex_newnode(exp,t);
+                t = *exp->_p;
+                exp->_p++;
+                return trex_newnode(exp, t);
         }
-    }
-    else if(!scisprint(*exp->_p)) {
+    } else if (!scisprint(*exp->_p)) {
 
-        trex_error(exp,_SC("letter expected"));
+        trex_error(exp, _SC("letter expected"));
     }
-    t = *exp->_p; exp->_p++;
-    return trex_newnode(exp,t);
+    t = *exp->_p;
+    exp->_p++;
+    return trex_newnode(exp, t);
 }
 static int trex_class(TRex *exp)
 {
     int ret = -1;
-    int first = -1,chain;
-    if(*exp->_p == TREX_SYMBOL_BEGINNING_OF_STRING){
-        ret = trex_newnode(exp,OP_NCLASS);
+    int first = -1, chain;
+    if (*exp->_p == TREX_SYMBOL_BEGINNING_OF_STRING) {
+        ret = trex_newnode(exp, OP_NCLASS);
         exp->_p++;
-    }else ret = trex_newnode(exp,OP_CLASS);
+    } else ret = trex_newnode(exp, OP_CLASS);
 
-    if(*exp->_p == ']') trex_error(exp,_SC("empty class"));
+    if (*exp->_p == ']') trex_error(exp, _SC("empty class"));
     chain = ret;
-    while(*exp->_p != ']' && exp->_p != exp->_eol) {
-        if(*exp->_p == '-' && first != -1){
-            int r,t;
-            if(*exp->_p++ == ']') trex_error(exp,_SC("unfinished range"));
-            r = trex_newnode(exp,OP_RANGE);
-            if(first>*exp->_p) trex_error(exp,_SC("invalid range"));
-            if(exp->_nodes[first].type == OP_CCLASS) trex_error(exp,_SC("cannot use character classes in ranges"));
+    while (*exp->_p != ']' && exp->_p != exp->_eol) {
+        if (*exp->_p == '-' && first != -1) {
+            int r, t;
+            if (*exp->_p++ == ']') trex_error(exp, _SC("unfinished range"));
+            r = trex_newnode(exp, OP_RANGE);
+            if (first > *exp->_p) trex_error(exp, _SC("invalid range"));
+            if (exp->_nodes[first].type == OP_CCLASS) trex_error(exp, _SC("cannot use character classes in ranges"));
             exp->_nodes[r].left = exp->_nodes[first].type;
             t = trex_escapechar(exp);
             exp->_nodes[r].right = t;
             exp->_nodes[chain].next = r;
             chain = r;
             first = -1;
-        }
-        else{
-            if(first!=-1){
+        } else {
+            if (first != -1) {
                 int c = first;
                 exp->_nodes[chain].next = c;
                 chain = c;
-                first = trex_charnode(exp,TRex_True);
-            }
-            else{
-                first = trex_charnode(exp,TRex_True);
+                first = trex_charnode(exp, TRex_True);
+            } else {
+                first = trex_charnode(exp, TRex_True);
             }
         }
     }
-    if(first!=-1){
+    if (first != -1) {
         int c = first;
         exp->_nodes[chain].next = c;
         chain = c;
@@ -3099,12 +3066,12 @@ static int trex_class(TRex *exp)
 
 static int trex_parsenumber(TRex *exp)
 {
-    int ret = *exp->_p-'0';
+    int ret = *exp->_p - '0';
     int positions = 10;
     exp->_p++;
-    while(isdigit(*exp->_p)) {
-        ret = ret*10+(*exp->_p++-'0');
-        if(positions==1000000000) trex_error(exp,_SC("overflow in numeric constant"));
+    while (isdigit(*exp->_p)) {
+        ret = ret * 10 + (*exp->_p++ -'0');
+        if (positions == 1000000000) trex_error(exp, _SC("overflow in numeric constant"));
         positions *= 10;
     };
     return ret;
@@ -3113,78 +3080,98 @@ static int trex_parsenumber(TRex *exp)
 static int trex_element(TRex *exp)
 {
     int ret = -1;
-    switch(*exp->_p)
-    {
-    case '(': {
-        int expr,newn;
-        exp->_p++;
-
-
-        if(*exp->_p =='?') {
+    switch (*exp->_p) {
+        case '(': {
+            int expr, newn;
             exp->_p++;
-            trex_expect(exp,':');
-            expr = trex_newnode(exp,OP_NOCAPEXPR);
+
+
+            if (*exp->_p == '?') {
+                exp->_p++;
+                trex_expect(exp, ':');
+                expr = trex_newnode(exp, OP_NOCAPEXPR);
+            } else
+                expr = trex_newnode(exp, OP_EXPR);
+            newn = trex_list(exp);
+            exp->_nodes[expr].left = newn;
+            ret = expr;
+            trex_expect(exp, ')');
         }
-        else
-            expr = trex_newnode(exp,OP_EXPR);
-        newn = trex_list(exp);
-        exp->_nodes[expr].left = newn;
-        ret = expr;
-        trex_expect(exp,')');
-              }
-              break;
-    case '[':
-        exp->_p++;
-        ret = trex_class(exp);
-        trex_expect(exp,']');
-        break;
-    case TREX_SYMBOL_END_OF_STRING: exp->_p++; ret = trex_newnode(exp,OP_EOL);break;
-    case TREX_SYMBOL_ANY_CHAR: exp->_p++; ret = trex_newnode(exp,OP_DOT);break;
-    default:
-        ret = trex_charnode(exp,TRex_False);
         break;
+        case '[':
+            exp->_p++;
+            ret = trex_class(exp);
+            trex_expect(exp, ']');
+            break;
+        case TREX_SYMBOL_END_OF_STRING:
+            exp->_p++;
+            ret = trex_newnode(exp, OP_EOL);
+            break;
+        case TREX_SYMBOL_ANY_CHAR:
+            exp->_p++;
+            ret = trex_newnode(exp, OP_DOT);
+            break;
+        default:
+            ret = trex_charnode(exp, TRex_False);
+            break;
     }
 
     {
         TRexBool isgreedy = TRex_False;
         unsigned short p0 = 0, p1 = 0;
-        switch(*exp->_p){
-            case TREX_SYMBOL_GREEDY_ZERO_OR_MORE: p0 = 0; p1 = 0xFFFF; exp->_p++; isgreedy = TRex_True; break;
-            case TREX_SYMBOL_GREEDY_ONE_OR_MORE: p0 = 1; p1 = 0xFFFF; exp->_p++; isgreedy = TRex_True; break;
-            case TREX_SYMBOL_GREEDY_ZERO_OR_ONE: p0 = 0; p1 = 1; exp->_p++; isgreedy = TRex_True; break;
+        switch (*exp->_p) {
+            case TREX_SYMBOL_GREEDY_ZERO_OR_MORE:
+                p0 = 0;
+                p1 = 0xFFFF;
+                exp->_p++;
+                isgreedy = TRex_True;
+                break;
+            case TREX_SYMBOL_GREEDY_ONE_OR_MORE:
+                p0 = 1;
+                p1 = 0xFFFF;
+                exp->_p++;
+                isgreedy = TRex_True;
+                break;
+            case TREX_SYMBOL_GREEDY_ZERO_OR_ONE:
+                p0 = 0;
+                p1 = 1;
+                exp->_p++;
+                isgreedy = TRex_True;
+                break;
             case '{':
                 exp->_p++;
-                if(!isdigit(*exp->_p)) trex_error(exp,_SC("number expected"));
+                if (!isdigit(*exp->_p)) trex_error(exp, _SC("number expected"));
                 p0 = (unsigned short)trex_parsenumber(exp);
                 /*******************************/
-                switch(*exp->_p) {
-            case '}':
-                p1 = p0; exp->_p++;
-                break;
-            case ',':
-                exp->_p++;
-                p1 = 0xFFFF;
-                if(isdigit(*exp->_p)){
-                    p1 = (unsigned short)trex_parsenumber(exp);
+                switch (*exp->_p) {
+                    case '}':
+                        p1 = p0;
+                        exp->_p++;
+                        break;
+                    case ',':
+                        exp->_p++;
+                        p1 = 0xFFFF;
+                        if (isdigit(*exp->_p)) {
+                            p1 = (unsigned short)trex_parsenumber(exp);
+                        }
+                        trex_expect(exp, '}');
+                        break;
+                    default:
+                        trex_error(exp, _SC(", or } expected"));
                 }
-                trex_expect(exp,'}');
+                /*******************************/
+                isgreedy = TRex_True;
                 break;
-            default:
-                trex_error(exp,_SC(", or } expected"));
-        }
-        /*******************************/
-        isgreedy = TRex_True;
-        break;
 
         }
-        if(isgreedy) {
-            int nnode = trex_newnode(exp,OP_GREEDY);
+        if (isgreedy) {
+            int nnode = trex_newnode(exp, OP_GREEDY);
             exp->_nodes[nnode].left = ret;
-            exp->_nodes[nnode].right = ((p0)<<16)|p1;
+            exp->_nodes[nnode].right = ((p0) << 16) | p1;
             ret = nnode;
         }
     }
-    if((*exp->_p != TREX_SYMBOL_BRANCH) && (*exp->_p != ')') && (*exp->_p != TREX_SYMBOL_GREEDY_ZERO_OR_MORE) && (*exp->_p != TREX_SYMBOL_GREEDY_ONE_OR_MORE) && (*exp->_p != '\0')) {
+    if ((*exp->_p != TREX_SYMBOL_BRANCH) && (*exp->_p != ')') && (*exp->_p != TREX_SYMBOL_GREEDY_ZERO_OR_MORE) && (*exp->_p != TREX_SYMBOL_GREEDY_ONE_OR_MORE) && (*exp->_p != '\0')) {
         int nnode = trex_element(exp);
         exp->_nodes[ret].next = nnode;
     }
@@ -3194,21 +3181,20 @@ static int trex_element(TRex *exp)
 
 static int trex_list(TRex *exp)
 {
-    int ret=-1,e;
-    if(*exp->_p == TREX_SYMBOL_BEGINNING_OF_STRING) {
+    int ret = -1, e;
+    if (*exp->_p == TREX_SYMBOL_BEGINNING_OF_STRING) {
         exp->_p++;
-        ret = trex_newnode(exp,OP_BOL);
+        ret = trex_newnode(exp, OP_BOL);
     }
     e = trex_element(exp);
-    if(ret != -1) {
+    if (ret != -1) {
         exp->_nodes[ret].next = e;
-    }
-    else ret = e;
+    } else ret = e;
 
-    if(*exp->_p == TREX_SYMBOL_BRANCH) {
-        int temp,tright;
+    if (*exp->_p == TREX_SYMBOL_BRANCH) {
+        int temp, tright;
         exp->_p++;
-        temp = trex_newnode(exp,OP_OR);
+        temp = trex_newnode(exp, OP_OR);
         exp->_nodes[temp].left = ret;
         tright = trex_list(exp);
         exp->_nodes[temp].right = tright;
@@ -3217,143 +3203,151 @@ static int trex_list(TRex *exp)
     return ret;
 }
 
-static TRexBool trex_matchcclass(int cclass,TRexChar c)
+static TRexBool trex_matchcclass(int cclass, TRexChar c)
 {
-    switch(cclass) {
-    case 'a': return isalpha(c)?TRex_True:TRex_False;
-    case 'A': return !isalpha(c)?TRex_True:TRex_False;
-    case 'w': return (isalnum(c) || c == '_')?TRex_True:TRex_False;
-    case 'W': return (!isalnum(c) && c != '_')?TRex_True:TRex_False;
-    case 's': return ISSPACE(c)?TRex_True:TRex_False;
-    case 'S': return !ISSPACE(c)?TRex_True:TRex_False;
-    case 'd': return isdigit(c)?TRex_True:TRex_False;
-    case 'D': return !isdigit(c)?TRex_True:TRex_False;
-    case 'x': return isxdigit(c)?TRex_True:TRex_False;
-    case 'X': return !isxdigit(c)?TRex_True:TRex_False;
-    case 'c': return iscntrl(c)?TRex_True:TRex_False;
-    case 'C': return !iscntrl(c)?TRex_True:TRex_False;
-    case 'p': return ispunct(c)?TRex_True:TRex_False;
-    case 'P': return !ispunct(c)?TRex_True:TRex_False;
-    case 'l': return islower(c)?TRex_True:TRex_False;
-    case 'u': return isupper(c)?TRex_True:TRex_False;
+    switch (cclass) {
+        case 'a':
+            return isalpha(c) ? TRex_True : TRex_False;
+        case 'A':
+            return !isalpha(c) ? TRex_True : TRex_False;
+        case 'w':
+            return (isalnum(c) || c == '_') ? TRex_True : TRex_False;
+        case 'W':
+            return (!isalnum(c) && c != '_') ? TRex_True : TRex_False;
+        case 's':
+            return ISSPACE(c) ? TRex_True : TRex_False;
+        case 'S':
+            return !ISSPACE(c) ? TRex_True : TRex_False;
+        case 'd':
+            return isdigit(c) ? TRex_True : TRex_False;
+        case 'D':
+            return !isdigit(c) ? TRex_True : TRex_False;
+        case 'x':
+            return isxdigit(c) ? TRex_True : TRex_False;
+        case 'X':
+            return !isxdigit(c) ? TRex_True : TRex_False;
+        case 'c':
+            return iscntrl(c) ? TRex_True : TRex_False;
+        case 'C':
+            return !iscntrl(c) ? TRex_True : TRex_False;
+        case 'p':
+            return ispunct(c) ? TRex_True : TRex_False;
+        case 'P':
+            return !ispunct(c) ? TRex_True : TRex_False;
+        case 'l':
+            return islower(c) ? TRex_True : TRex_False;
+        case 'u':
+            return isupper(c) ? TRex_True : TRex_False;
     }
     return TRex_False; /*cannot happen*/
 }
 
-static TRexBool trex_matchclass(TRex* exp,TRexNode *node,TRexChar c)
+static TRexBool trex_matchclass(TRex *exp, TRexNode *node, TRexChar c)
 {
     do {
-        switch(node->type) {
+        switch (node->type) {
             case OP_RANGE:
-                if (exp->_flags & TREX_ICASE)
-                {
-                    if(c >= toupper(node->left) && c <= toupper(node->right)) return TRex_True;
-                    if(c >= tolower(node->left) && c <= tolower(node->right)) return TRex_True;
-                }
-                else
-                {
-                    if(c >= node->left && c <= node->right) return TRex_True;
+                if (exp->_flags & TREX_ICASE) {
+                    if (c >= toupper(node->left) && c <= toupper(node->right)) return TRex_True;
+                    if (c >= tolower(node->left) && c <= tolower(node->right)) return TRex_True;
+                } else {
+                    if (c >= node->left && c <= node->right) return TRex_True;
                 }
                 break;
             case OP_CCLASS:
-                if(trex_matchcclass(node->left,c)) return TRex_True;
+                if (trex_matchcclass(node->left, c)) return TRex_True;
                 break;
             default:
-                if (exp->_flags & TREX_ICASE)
-                {
+                if (exp->_flags & TREX_ICASE) {
                     if (c == tolower(node->type) || c == toupper(node->type)) return TRex_True;
-                }
-                else
-                {
-                    if(c == node->type)return TRex_True;
+                } else {
+                    if (c == node->type)return TRex_True;
                 }
 
         }
-    } while((node->next != -1) && (node = &exp->_nodes[node->next]));
+    } while ((node->next != -1) && (node = &exp->_nodes[node->next]));
     return TRex_False;
 }
 
-static const TRexChar *trex_matchnode(TRex* exp,TRexNode *node,const TRexChar *str,TRexNode *next)
+static const TRexChar *trex_matchnode(TRex *exp, TRexNode *node, const TRexChar *str, TRexNode *next)
 {
 
     TRexNodeType type = node->type;
-    switch(type) {
-    case OP_GREEDY: {
-        //TRexNode *greedystop = (node->next != -1) ? &exp->_nodes[node->next] : NULL;
-        TRexNode *greedystop = NULL;
-        int p0 = (node->right >> 16)&0x0000FFFF, p1 = node->right&0x0000FFFF, nmaches = 0;
-        const TRexChar *s=str, *good = str;
+    switch (type) {
+        case OP_GREEDY: {
+            //TRexNode *greedystop = (node->next != -1) ? &exp->_nodes[node->next] : NULL;
+            TRexNode *greedystop = NULL;
+            int p0 = (node->right >> 16) & 0x0000FFFF, p1 = node->right & 0x0000FFFF, nmaches = 0;
+            const TRexChar *s = str, *good = str;
 
-        if(node->next != -1) {
-            greedystop = &exp->_nodes[node->next];
-        }
-        else {
-            greedystop = next;
-        }
-
-        while((nmaches == 0xFFFF || nmaches < p1)) {
-
-            const TRexChar *stop;
-            if(!(s = trex_matchnode(exp,&exp->_nodes[node->left],s,greedystop)))
-                break;
-            nmaches++;
-            good=s;
-            if(greedystop) {
-                //checks that 0 matches satisfy the expression(if so skips)
-                //if not would always stop(for instance if is a '?')
-                if(greedystop->type != OP_GREEDY ||
-                (greedystop->type == OP_GREEDY && ((greedystop->right >> 16)&0x0000FFFF) != 0))
-                {
-                    TRexNode *gnext = NULL;
-                    if(greedystop->next != -1) {
-                        gnext = &exp->_nodes[greedystop->next];
-                    }else if(next && next->next != -1){
-                        gnext = &exp->_nodes[next->next];
-                    }
-                    stop = trex_matchnode(exp,greedystop,s,gnext);
-                    if(stop) {
-                        //if satisfied stop it
-                        if(p0 == p1 && p0 == nmaches) break;
-                        else if(nmaches >= p0 && p1 == 0xFFFF) break;
-                        else if(nmaches >= p0 && nmaches <= p1) break;
-                    }
-                }
+            if (node->next != -1) {
+                greedystop = &exp->_nodes[node->next];
+            } else {
+                greedystop = next;
             }
 
-            if(s >= exp->_eol)
-                break;
+            while ((nmaches == 0xFFFF || nmaches < p1)) {
+
+                const TRexChar *stop;
+                if (!(s = trex_matchnode(exp, &exp->_nodes[node->left], s, greedystop)))
+                    break;
+                nmaches++;
+                good = s;
+                if (greedystop) {
+                    //checks that 0 matches satisfy the expression(if so skips)
+                    //if not would always stop(for instance if is a '?')
+                    if (greedystop->type != OP_GREEDY ||
+                        (greedystop->type == OP_GREEDY && ((greedystop->right >> 16) & 0x0000FFFF) != 0)) {
+                        TRexNode *gnext = NULL;
+                        if (greedystop->next != -1) {
+                            gnext = &exp->_nodes[greedystop->next];
+                        } else if (next && next->next != -1) {
+                            gnext = &exp->_nodes[next->next];
+                        }
+                        stop = trex_matchnode(exp, greedystop, s, gnext);
+                        if (stop) {
+                            //if satisfied stop it
+                            if (p0 == p1 && p0 == nmaches) break;
+                            else if (nmaches >= p0 && p1 == 0xFFFF) break;
+                            else if (nmaches >= p0 && nmaches <= p1) break;
+                        }
+                    }
+                }
+
+                if (s >= exp->_eol)
+                    break;
+            }
+            if (p0 == p1 && p0 == nmaches) return good;
+            else if (nmaches >= p0 && p1 == 0xFFFF) return good;
+            else if (nmaches >= p0 && nmaches <= p1) return good;
+            return NULL;
         }
-        if(p0 == p1 && p0 == nmaches) return good;
-        else if(nmaches >= p0 && p1 == 0xFFFF) return good;
-        else if(nmaches >= p0 && nmaches <= p1) return good;
-        return NULL;
-    }
-    case OP_OR: {
+        case OP_OR: {
             const TRexChar *asd = str;
-            TRexNode *temp=&exp->_nodes[node->left];
-            while( (asd = trex_matchnode(exp,temp,asd,NULL)) ) {
-                if(temp->next != -1)
+            TRexNode *temp = &exp->_nodes[node->left];
+            while ((asd = trex_matchnode(exp, temp, asd, NULL))) {
+                if (temp->next != -1)
                     temp = &exp->_nodes[temp->next];
                 else
                     return asd;
             }
             asd = str;
             temp = &exp->_nodes[node->right];
-            while( (asd = trex_matchnode(exp,temp,asd,NULL)) ) {
-                if(temp->next != -1)
+            while ((asd = trex_matchnode(exp, temp, asd, NULL))) {
+                if (temp->next != -1)
                     temp = &exp->_nodes[temp->next];
                 else
                     return asd;
             }
             return NULL;
             break;
-    }
-    case OP_EXPR:
-    case OP_NOCAPEXPR:{
+        }
+        case OP_EXPR:
+        case OP_NOCAPEXPR: {
             TRexNode *n = &exp->_nodes[node->left];
             const TRexChar *cur = str;
             int capture = -1;
-            if(node->type != OP_NOCAPEXPR && node->right == exp->_currsubexp) {
+            if (node->type != OP_NOCAPEXPR && node->right == exp->_currsubexp) {
                 capture = exp->_currsubexp;
                 exp->_matches[capture].begin = cur;
                 exp->_currsubexp++;
@@ -3361,71 +3355,68 @@ static const TRexChar *trex_matchnode(TRex* exp,TRexNode *node,const TRexChar *s
 
             do {
                 TRexNode *subnext = NULL;
-                if(n->next != -1) {
+                if (n->next != -1) {
                     subnext = &exp->_nodes[n->next];
-                }else {
+                } else {
                     subnext = next;
                 }
-                if(!(cur = trex_matchnode(exp,n,cur,subnext))) {
-                    if(capture != -1){
+                if (!(cur = trex_matchnode(exp, n, cur, subnext))) {
+                    if (capture != -1) {
                         exp->_matches[capture].begin = 0;
                         exp->_matches[capture].len = 0;
                     }
                     return NULL;
                 }
-            } while((n->next != -1) && (n = &exp->_nodes[n->next]));
+            } while ((n->next != -1) && (n = &exp->_nodes[n->next]));
 
-            if(capture != -1)
+            if (capture != -1)
                 exp->_matches[capture].len = (int)(cur - exp->_matches[capture].begin);
             return cur;
-    }
-    case OP_WB:
-        if((str == exp->_bol && !ISSPACE(*str))
-         || ((str == exp->_eol && !ISSPACE(*(str-1))))
-         || ((!ISSPACE(*str) && ISSPACE(*(str+1))))
-         || ((ISSPACE(*str) && !ISSPACE(*(str+1)))) ) {
-            return (node->left == 'b')?str:NULL;
         }
-        return (node->left == 'b')?NULL:str;
-    case OP_BOL:
-        if(str == exp->_bol) return str;
-        return NULL;
-    case OP_EOL:
-        if(str == exp->_eol) return str;
-        return NULL;
-    case OP_DOT:
-        str++;
-        return str;
-    case OP_NCLASS:
-    case OP_CLASS:
-        if(trex_matchclass(exp,&exp->_nodes[node->left],*str)?(type == OP_CLASS?TRex_True:TRex_False):(type == OP_NCLASS?TRex_True:TRex_False)) {
-                        str++;
+        case OP_WB:
+            if ((str == exp->_bol && !ISSPACE(*str))
+                || ((str == exp->_eol && !ISSPACE(*(str - 1))))
+                || ((!ISSPACE(*str) && ISSPACE(*(str + 1))))
+                || ((ISSPACE(*str) && !ISSPACE(*(str + 1))))) {
+                return (node->left == 'b') ? str : NULL;
+            }
+            return (node->left == 'b') ? NULL : str;
+        case OP_BOL:
+            if (str == exp->_bol) return str;
+            return NULL;
+        case OP_EOL:
+            if (str == exp->_eol) return str;
+            return NULL;
+        case OP_DOT:
+            str++;
             return str;
-        }
-        return NULL;
-    case OP_CCLASS:
-        if(trex_matchcclass(node->left,*str)) {
-                        str++;
+        case OP_NCLASS:
+        case OP_CLASS:
+            if (trex_matchclass(exp, &exp->_nodes[node->left], *str) ? (type == OP_CLASS ? TRex_True : TRex_False) : (type == OP_NCLASS ? TRex_True : TRex_False)) {
+                str++;
+                return str;
+            }
+            return NULL;
+        case OP_CCLASS:
+            if (trex_matchcclass(node->left, *str)) {
+                str++;
+                return str;
+            }
+            return NULL;
+        default: /* char */
+            if (exp->_flags & TREX_ICASE) {
+                if (*str != tolower(node->type) && *str != toupper(node->type)) return NULL;
+            } else {
+                if (*str != node->type) return NULL;
+            }
+            str++;
             return str;
-        }
-        return NULL;
-    default: /* char */
-        if (exp->_flags & TREX_ICASE)
-        {
-            if(*str != tolower(node->type) && *str != toupper(node->type)) return NULL;
-        }
-        else
-        {
-            if (*str != node->type) return NULL;
-        }
-        str++;
-        return str;
     }
     return NULL;
 }
 
 /* public api */
-TRex *trex_compile(const TRexChar *pattern,const TRexChar **error,int flags)
+TRex *trex_compile(const TRexChar *pattern, const TRexChar **error, int flags)
 {
     TRex *exp = (TRex *)malloc(sizeof(TRex));
     exp->_eol = exp->_bol = NULL;
@@ -3435,36 +3426,35 @@ TRex *trex_compile(const TRexChar *pattern,const TRexChar **error,int flags)
     exp->_nsize = 0;
     exp->_matches = 0;
     exp->_nsubexpr = 0;
-    exp->_first = trex_newnode(exp,OP_EXPR);
+    exp->_first = trex_newnode(exp, OP_EXPR);
     exp->_error = error;
     exp->_jmpbuf = malloc(sizeof(jmp_buf));
     exp->_flags = flags;
-    if(setjmp(*((jmp_buf*)exp->_jmpbuf)) == 0) {
+    if (setjmp(*((jmp_buf *)exp->_jmpbuf)) == 0) {
         int res = trex_list(exp);
         exp->_nodes[exp->_first].left = res;
-        if(*exp->_p!='\0')
-            trex_error(exp,_SC("unexpected character"));
+        if (*exp->_p != '\0')
+            trex_error(exp, _SC("unexpected character"));
 #ifdef _DEBUG
         {
-            int nsize,i;
+            int nsize, i;
             TRexNode *t;
             nsize = exp->_nsize;
             t = &exp->_nodes[0];
             scprintf(_SC("\n"));
-            for(i = 0;i < nsize; i++) {
-                if(exp->_nodes[i].type>MAX_CHAR)
-                    scprintf(_SC("[%02d] %10s "),i,g_nnames[exp->_nodes[i].type-MAX_CHAR]);
+            for (i = 0; i < nsize; i++) {
+                if (exp->_nodes[i].type > MAX_CHAR)
+                    scprintf(_SC("[%02d] %10s "), i, g_nnames[exp->_nodes[i].type - MAX_CHAR]);
                 else
-                    scprintf(_SC("[%02d] %10c "),i,exp->_nodes[i].type);
-                scprintf(_SC("left %02d right %02d next %02d\n"),exp->_nodes[i].left,exp->_nodes[i].right,exp->_nodes[i].next);
+                    scprintf(_SC("[%02d] %10c "), i, exp->_nodes[i].type);
+                scprintf(_SC("left %02d right %02d next %02d\n"), exp->_nodes[i].left, exp->_nodes[i].right, exp->_nodes[i].next);
             }
             scprintf(_SC("\n"));
         }
 #endif
         exp->_matches = (TRexMatch *) malloc(exp->_nsubexpr * sizeof(TRexMatch));
-        memset(exp->_matches,0,exp->_nsubexpr * sizeof(TRexMatch));
-    }
-    else{
+        memset(exp->_matches, 0, exp->_nsubexpr * sizeof(TRexMatch));
+    } else {
         trex_free(exp);
         return NULL;
     }
@@ -3473,68 +3463,68 @@ TRex *trex_compile(const TRexChar *pattern,const TRexChar **error,int flags)
 
 void trex_free(TRex *exp)
 {
-    if(exp) {
-        if(exp->_nodes) free(exp->_nodes);
-        if(exp->_jmpbuf) free(exp->_jmpbuf);
-        if(exp->_matches) free(exp->_matches);
+    if (exp) {
+        if (exp->_nodes) free(exp->_nodes);
+        if (exp->_jmpbuf) free(exp->_jmpbuf);
+        if (exp->_matches) free(exp->_matches);
         free(exp);
     }
 }
 
-TRexBool trex_match(TRex* exp,const TRexChar* text)
+TRexBool trex_match(TRex *exp, const TRexChar *text)
 {
-    const TRexChar* res = NULL;
+    const TRexChar *res = NULL;
     exp->_bol = text;
     exp->_eol = text + scstrlen(text);
     exp->_currsubexp = 0;
-    res = trex_matchnode(exp,exp->_nodes,text,NULL);
-    if(res == NULL || res != exp->_eol)
+    res = trex_matchnode(exp, exp->_nodes, text, NULL);
+    if (res == NULL || res != exp->_eol)
         return TRex_False;
     return TRex_True;
 }
 
-TRexBool trex_searchrange(TRex* exp,const TRexChar* text_begin,const TRexChar* text_end,const TRexChar** out_begin, const TRexChar** out_end)
+TRexBool trex_searchrange(TRex *exp, const TRexChar *text_begin, const TRexChar *text_end, const TRexChar **out_begin, const TRexChar **out_end)
 {
     const TRexChar *cur = NULL;
     int node = exp->_first;
-    if(text_begin >= text_end) return TRex_False;
+    if (text_begin >= text_end) return TRex_False;
     exp->_bol = text_begin;
     exp->_eol = text_end;
     do {
         cur = text_begin;
-        while(node != -1) {
+        while (node != -1) {
             exp->_currsubexp = 0;
-            cur = trex_matchnode(exp,&exp->_nodes[node],cur,NULL);
-            if(!cur)
+            cur = trex_matchnode(exp, &exp->_nodes[node], cur, NULL);
+            if (!cur)
                 break;
             node = exp->_nodes[node].next;
         }
         text_begin++;
-    } while(cur == NULL && text_begin != text_end);
+    } while (cur == NULL && text_begin != text_end);
 
-    if(cur == NULL)
+    if (cur == NULL)
         return TRex_False;
 
     --text_begin;
 
-    if(out_begin) *out_begin = text_begin;
-    if(out_end) *out_end = cur;
+    if (out_begin) *out_begin = text_begin;
+    if (out_end) *out_end = cur;
     return TRex_True;
 }
 
-TRexBool trex_search(TRex* exp,const TRexChar* text, const TRexChar** out_begin, const TRexChar** out_end)
+TRexBool trex_search(TRex *exp, const TRexChar *text, const TRexChar **out_begin, const TRexChar **out_end)
 {
-    return trex_searchrange(exp,text,text + scstrlen(text),out_begin,out_end);
+    return trex_searchrange(exp, text, text + scstrlen(text), out_begin, out_end);
 }
 
-int trex_getsubexpcount(TRex* exp)
+int trex_getsubexpcount(TRex *exp)
 {
     return exp->_nsubexpr;
 }
 
-TRexBool trex_getsubexp(TRex* exp, int n, TRexMatch *subexp)
+TRexBool trex_getsubexp(TRex *exp, int n, TRexMatch *subexp)
 {
-    if( n<0 || n >= exp->_nsubexpr) return TRex_False;
+    if (n < 0 || n >= exp->_nsubexpr) return TRex_False;
     *subexp = exp->_matches[n];
     return TRex_True;
 }
@@ -3584,20 +3574,15 @@ static int arg_str_scanfn(struct arg_str *parent, const char *argval)
 {
     int errorcode = 0;
 
-    if (parent->count == parent->hdr.maxcount)
-    {
+    if (parent->count == parent->hdr.maxcount) {
         /* maximum number of arguments exceeded */
         errorcode = EMAXCOUNT;
-    }
-    else if (!argval)
-    {
+    } else if (!argval) {
         /* a valid argument with no argument value was given. */
         /* This happens when an optional argument value was invoked. */
         /* leave parent arguiment value unaltered but still count the argument. */
         parent->count++;
-    }
-    else
-    {
+    } else {
         parent->sval[parent->count++] = argval;
     }
 
@@ -3630,22 +3615,21 @@ static void arg_str_errorfn(
     argval = argval ? argval : "";
 
     fprintf(fp, "%s: ", progname);
-    switch(errorcode)
-    {
-    case EMINCOUNT:
-        fputs("missing option ", fp);
-        arg_print_option(fp, shortopts, longopts, datatype, "\n");
-        break;
+    switch (errorcode) {
+        case EMINCOUNT:
+            fputs("missing option ", fp);
+            arg_print_option(fp, shortopts, longopts, datatype, "\n");
+            break;
 
-    case EMAXCOUNT:
-        fputs("excess option ", fp);
-        arg_print_option(fp, shortopts, longopts, argval, "\n");
-        break;
+        case EMAXCOUNT:
+            fputs("excess option ", fp);
+            arg_print_option(fp, shortopts, longopts, argval, "\n");
+            break;
     }
 }
 
 
-struct arg_str * arg_str0(
+struct arg_str *arg_str0(
     const char *shortopts,
     const char *longopts,
     const char *datatype,
@@ -3655,7 +3639,7 @@ struct arg_str * arg_str0(
 }
 
 
-struct arg_str * arg_str1(
+struct arg_str *arg_str1(
     const char *shortopts,
     const char *longopts,
     const char *datatype,
@@ -3665,7 +3649,7 @@ struct arg_str * arg_str1(
 }
 
 
-struct arg_str * arg_strn(
+struct arg_str *arg_strn(
     const char *shortopts,
     const char *longopts,
     const char *datatype,
@@ -3685,8 +3669,7 @@ struct arg_str * arg_strn(
              + maxcount * sizeof(char *); /* storage for sval[maxcount] array */
 
     result = (struct arg_str *)malloc(nbytes);
-    if (result)
-    {
+    if (result) {
         int i;
 
         /* init the arg_hdr struct */
@@ -3759,15 +3742,12 @@ void arg_register_error(struct arg_end *end,
                         const char *argval)
 {
     /* printf("arg_register_error(%p,%p,%d,%s)\n",end,parent,error,argval); */
-    if (end->count < end->hdr.maxcount)
-    {
+    if (end->count < end->hdr.maxcount) {
         end->error[end->count] = error;
         end->parent[end->count] = parent;
         end->argval[end->count] = argval;
         end->count++;
-    }
-    else
-    {
+    } else {
         end->error[end->hdr.maxcount - 1]  = ARG_ELIMIT;
         end->parent[end->hdr.maxcount - 1] = end;
         end->argval[end->hdr.maxcount - 1] = NULL;
@@ -3783,8 +3763,7 @@ static
 int find_shortoption(struct arg_hdr * *table, char shortopt)
 {
     int tabindex;
-    for(tabindex = 0; !(table[tabindex]->flag & ARG_TERMINATOR); tabindex++)
-    {
+    for (tabindex = 0; !(table[tabindex]->flag & ARG_TERMINATOR); tabindex++) {
         if (table[tabindex]->shortopts &&
             strchr(table[tabindex]->shortopts, shortopt))
             return tabindex;
@@ -3793,8 +3772,7 @@ int find_shortoption(struct arg_hdr * *table, char shortopt)
 }
 
 
-struct longoptions
-{
+struct longoptions {
     int getoptval;
     int noptions;
     struct option *options;
@@ -3802,13 +3780,12 @@ struct longoptions
 
 #if 0
 static
-void dump_longoptions(struct longoptions * longoptions)
+void dump_longoptions(struct longoptions *longoptions)
 {
     int i;
     printf("getoptval = %d\n", longoptions->getoptval);
     printf("noptions  = %d\n", longoptions->noptions);
-    for (i = 0; i < longoptions->noptions; i++)
-    {
+    for (i = 0; i < longoptions->noptions; i++) {
         printf("options[%d].name    = \"%s\"\n",
                i,
                longoptions->options[i].name);
@@ -3820,7 +3797,7 @@ void dump_longoptions(struct longoptions * longoptions)
 #endif
 
 static
-struct longoptions * alloc_longoptions(struct arg_hdr * *table)
+struct longoptions *alloc_longoptions(struct arg_hdr * *table)
 {
     struct longoptions *result;
     size_t nbytes;
@@ -3839,16 +3816,14 @@ struct longoptions * alloc_longoptions(struct arg_hdr * *table)
      * and return that count in logoptlen.
      */
     tabindex = 0;
-    do
-    {
+    do {
         const char *longopts = table[tabindex]->longopts;
         longoptlen += (longopts ? strlen(longopts) : 0) + 1;
-        while (longopts)
-        {
+        while (longopts) {
             noptions++;
             longopts = strchr(longopts + 1, ',');
         }
-    } while(!(table[tabindex++]->flag & ARG_TERMINATOR));
+    } while (!(table[tabindex++]->flag & ARG_TERMINATOR));
     /*printf("%d long options consuming %d chars in total\n",noptions,longoptlen);*/
 
 
@@ -3858,8 +3833,7 @@ struct longoptions * alloc_longoptions(struct arg_hdr * *table)
              + sizeof(struct option) * noptions
              + longoptlen;
     result = (struct longoptions *)malloc(nbytes);
-    if (result)
-    {
+    if (result) {
         int option_index = 0;
         char *store;
 
@@ -3868,12 +3842,10 @@ struct longoptions * alloc_longoptions(struct arg_hdr * *table)
         result->options = (struct option *)(result + 1);
         store = (char *)(result->options + noptions);
 
-        for(tabindex = 0; !(table[tabindex]->flag & ARG_TERMINATOR); tabindex++)
-        {
+        for (tabindex = 0; !(table[tabindex]->flag & ARG_TERMINATOR); tabindex++) {
             const char *longopts = table[tabindex]->longopts;
 
-            while(longopts && *longopts)
-            {
+            while (longopts && *longopts) {
                 char *storestart = store;
 
                 /* copy progressive longopt strings into the store */
@@ -3909,34 +3881,30 @@ struct longoptions * alloc_longoptions(struct arg_hdr * *table)
 }
 
 static
-char * alloc_shortoptions(struct arg_hdr * *table)
+char *alloc_shortoptions(struct arg_hdr * *table)
 {
     char *result;
     size_t len = 2;
     int tabindex;
 
     /* determine the total number of option chars required */
-    for(tabindex = 0; !(table[tabindex]->flag & ARG_TERMINATOR); tabindex++)
-    {
+    for (tabindex = 0; !(table[tabindex]->flag & ARG_TERMINATOR); tabindex++) {
         struct arg_hdr *hdr = table[tabindex];
         len += 3 * (hdr->shortopts ? strlen(hdr->shortopts) : 0);
     }
 
     result = malloc(len);
-    if (result)
-    {
+    if (result) {
         char *res = result;
 
         /* add a leading ':' so getopt return codes distinguish    */
         /* unrecognised option and options missing argument values */
         *res++ = ':';
 
-        for(tabindex = 0; !(table[tabindex]->flag & ARG_TERMINATOR); tabindex++)
-        {
+        for (tabindex = 0; !(table[tabindex]->flag & ARG_TERMINATOR); tabindex++) {
             struct arg_hdr *hdr = table[tabindex];
             const char *shortopts = hdr->shortopts;
-            while(shortopts && *shortopts)
-            {
+            while (shortopts && *shortopts) {
                 *res++ = *shortopts++;
                 if (hdr->flag & ARG_HASVALUE)
                     *res++ = ':';
@@ -3980,8 +3948,7 @@ void arg_parse_tagged(int argc,
     /* if the allocs fail then put an error msg in the last table entry. */
     longoptions  = alloc_longoptions(table);
     shortoptions = alloc_shortoptions(table);
-    if (!longoptions || !shortoptions)
-    {
+    if (!longoptions || !shortoptions) {
         /* one or both memory allocs failed */
         arg_register_error(endtable, endtable, ARG_EMALLOC, NULL);
         /* free anything that was allocated (this is null safe) */
@@ -3997,92 +3964,81 @@ void arg_parse_tagged(int argc,
     opterr = 0;
 
     /* fetch and process args using getopt_long */
-    while( (copt =
+    while ((copt =
                 getopt_long(argc, argv, shortoptions, longoptions->options,
-                            NULL)) != -1)
-    {
+                            NULL)) != -1) {
         /*
            printf("optarg='%s'\n",optarg);
            printf("optind=%d\n",optind);
            printf("copt=%c\n",(char)copt);
            printf("optopt=%c (%d)\n",optopt, (int)(optopt));
          */
-        switch(copt)
-        {
-        case 0:
-        {
-            int tabindex = longoptions->getoptval;
-            void *parent  = table[tabindex]->parent;
-            /*printf("long option detected from argtable[%d]\n", tabindex);*/
-            if (optarg && optarg[0] == 0 &&
-                (table[tabindex]->flag & ARG_HASVALUE))
-            {
-                /* printf(": long option %s requires an argument\n",argv[optind-1]); */
-                arg_register_error(endtable, endtable, ARG_EMISSARG,
-                                   argv[optind - 1]);
-                /* continue to scan the (empty) argument value to enforce argument count checking */
-            }
-            if (table[tabindex]->scanfn)
-            {
-                int errorcode = table[tabindex]->scanfn(parent, optarg);
-                if (errorcode != 0)
-                    arg_register_error(endtable, parent, errorcode, optarg);
-            }
-        }
-        break;
-
-        case '?':
-            /*
-             * getopt_long() found an unrecognised short option.
-             * if it was a short option its value is in optopt
-             * if it was a long option then optopt=0
-             */
-            switch (optopt)
-            {
-            case 0:
-                /*printf("?0 unrecognised long option %s\n",argv[optind-1]);*/
-                arg_register_error(endtable, endtable, ARG_ELONGOPT,
-                                   argv[optind - 1]);
-                break;
-            default:
-                /*printf("?* unrecognised short option '%c'\n",optopt);*/
-                arg_register_error(endtable, endtable, optopt, NULL);
-                break;
-            }
-            break;
-
-        case ':':
-            /*
-             * getopt_long() found an option with its argument missing.
-             */
-            /*printf(": option %s requires an argument\n",argv[optind-1]); */
-            arg_register_error(endtable, endtable, ARG_EMISSARG,
-                               argv[optind - 1]);
-            break;
-
-        default:
-        {
-            /* getopt_long() found a valid short option */
-            int tabindex = find_shortoption(table, (char)copt);
-            /*printf("short option detected from argtable[%d]\n", tabindex);*/
-            if (tabindex == -1)
-            {
-                /* should never get here - but handle it just in case */
-                /*printf("unrecognised short option %d\n",copt);*/
-                arg_register_error(endtable, endtable, copt, NULL);
-            }
-            else
-            {
-                if (table[tabindex]->scanfn)
-                {
-                    void *parent  = table[tabindex]->parent;
+        switch (copt) {
+            case 0: {
+                int tabindex = longoptions->getoptval;
+                void *parent  = table[tabindex]->parent;
+                /*printf("long option detected from argtable[%d]\n", tabindex);*/
+                if (optarg && optarg[0] == 0 &&
+                    (table[tabindex]->flag & ARG_HASVALUE)) {
+                    /* printf(": long option %s requires an argument\n",argv[optind-1]); */
+                    arg_register_error(endtable, endtable, ARG_EMISSARG,
+                                       argv[optind - 1]);
+                    /* continue to scan the (empty) argument value to enforce argument count checking */
+                }
+                if (table[tabindex]->scanfn) {
                     int errorcode = table[tabindex]->scanfn(parent, optarg);
                     if (errorcode != 0)
                         arg_register_error(endtable, parent, errorcode, optarg);
                 }
             }
             break;
-        }
+
+            case '?':
+                /*
+                 * getopt_long() found an unrecognised short option.
+                 * if it was a short option its value is in optopt
+                 * if it was a long option then optopt=0
+                 */
+                switch (optopt) {
+                    case 0:
+                        /*printf("?0 unrecognised long option %s\n",argv[optind-1]);*/
+                        arg_register_error(endtable, endtable, ARG_ELONGOPT,
+                                           argv[optind - 1]);
+                        break;
+                    default:
+                        /*printf("?* unrecognised short option '%c'\n",optopt);*/
+                        arg_register_error(endtable, endtable, optopt, NULL);
+                        break;
+                }
+                break;
+
+            case ':':
+                /*
+                 * getopt_long() found an option with its argument missing.
+                 */
+                /*printf(": option %s requires an argument\n",argv[optind-1]); */
+                arg_register_error(endtable, endtable, ARG_EMISSARG,
+                                   argv[optind - 1]);
+                break;
+
+            default: {
+                /* getopt_long() found a valid short option */
+                int tabindex = find_shortoption(table, (char)copt);
+                /*printf("short option detected from argtable[%d]\n", tabindex);*/
+                if (tabindex == -1) {
+                    /* should never get here - but handle it just in case */
+                    /*printf("unrecognised short option %d\n",copt);*/
+                    arg_register_error(endtable, endtable, copt, NULL);
+                } else {
+                    if (table[tabindex]->scanfn) {
+                        void *parent  = table[tabindex]->parent;
+                        int errorcode = table[tabindex]->scanfn(parent, optarg);
+                        if (errorcode != 0)
+                            arg_register_error(endtable, parent, errorcode, optarg);
+                    }
+                }
+                break;
+            }
         }
     }
 
@@ -4103,29 +4059,25 @@ void arg_parse_untagged(int argc,
     void *parentlast = NULL;
 
     /*printf("arg_parse_untagged(%d,%p,%p,%p)\n",argc,argv,table,endtable);*/
-    while (!(table[tabindex]->flag & ARG_TERMINATOR))
-    {
+    while (!(table[tabindex]->flag & ARG_TERMINATOR)) {
         void *parent;
         int errorcode;
 
         /* if we have exhausted our argv[optind] entries then we have finished */
-        if (optind >= argc)
-        {
+        if (optind >= argc) {
             /*printf("arg_parse_untagged(): argv[] exhausted\n");*/
             return;
         }
 
         /* skip table entries with non-null long or short options (they are not untagged entries) */
-        if (table[tabindex]->longopts || table[tabindex]->shortopts)
-        {
+        if (table[tabindex]->longopts || table[tabindex]->shortopts) {
             /*printf("arg_parse_untagged(): skipping argtable[%d] (tagged argument)\n",tabindex);*/
             tabindex++;
             continue;
         }
 
         /* skip table entries with NULL scanfn */
-        if (!(table[tabindex]->scanfn))
-        {
+        if (!(table[tabindex]->scanfn)) {
             /*printf("arg_parse_untagged(): skipping argtable[%d] (NULL scanfn)\n",tabindex);*/
             tabindex++;
             continue;
@@ -4136,17 +4088,14 @@ void arg_parse_untagged(int argc,
         /* try again with the next table[] entry.                        */
         parent = table[tabindex]->parent;
         errorcode = table[tabindex]->scanfn(parent, argv[optind]);
-        if (errorcode == 0)
-        {
+        if (errorcode == 0) {
             /* success, move onto next argv[optind] but stay with same table[tabindex] */
             /*printf("arg_parse_untagged(): argtable[%d] successfully matched\n",tabindex);*/
             optind++;
 
             /* clear the last tentative error */
             errorlast = 0;
-        }
-        else
-        {
+        } else {
             /* failure, try same argv[optind] with next table[tabindex] entry */
             /*printf("arg_parse_untagged(): argtable[%d] failed match\n",tabindex);*/
             tabindex++;
@@ -4160,16 +4109,14 @@ void arg_parse_untagged(int argc,
     }
 
     /* if a tenative error still remains at this point then register it as a proper error */
-    if (errorlast)
-    {
+    if (errorlast) {
         arg_register_error(endtable, parentlast, errorlast, optarglast);
         optind++;
     }
 
     /* only get here when not all argv[] entries were consumed */
     /* register an error for each unused argv[] entry */
-    while (optind < argc)
-    {
+    while (optind < argc) {
         /*printf("arg_parse_untagged(): argv[%d]=\"%s\" not consumed\n",optind,argv[optind]);*/
         arg_register_error(endtable, endtable, ARG_ENOMATCH, argv[optind++]);
     }
@@ -4183,16 +4130,14 @@ void arg_parse_check(struct arg_hdr * *table, struct arg_end *endtable)
 {
     int tabindex = 0;
     /* printf("arg_parse_check()\n"); */
-    do
-    {
-        if (table[tabindex]->checkfn)
-        {
+    do {
+        if (table[tabindex]->checkfn) {
             void *parent  = table[tabindex]->parent;
             int errorcode = table[tabindex]->checkfn(parent);
             if (errorcode != 0)
                 arg_register_error(endtable, parent, errorcode, NULL);
         }
-    } while(!(table[tabindex++]->flag & ARG_TERMINATOR));
+    } while (!(table[tabindex++]->flag & ARG_TERMINATOR));
 }
 
 
@@ -4202,11 +4147,10 @@ void arg_reset(void * *argtable)
     struct arg_hdr * *table = (struct arg_hdr * *)argtable;
     int tabindex = 0;
     /*printf("arg_reset(%p)\n",argtable);*/
-    do
-    {
+    do {
         if (table[tabindex]->resetfn)
             table[tabindex]->resetfn(table[tabindex]->parent);
-    } while(!(table[tabindex++]->flag & ARG_TERMINATOR));
+    } while (!(table[tabindex++]->flag & ARG_TERMINATOR));
 }
 
 
@@ -4229,8 +4173,7 @@ int arg_parse(int argc, char * *argv, void * *argtable)
     /* Special case of argc==0.  This can occur on Texas Instruments DSP. */
     /* Failure to trap this case results in an unwanted NULL result from  */
     /* the malloc for argvcopy (next code block).                         */
-    if (argc == 0)
-    {
+    if (argc == 0) {
         /* We must still perform post-parse checks despite the absence of command line arguments */
         arg_parse_check(table, endtable);
 
@@ -4239,8 +4182,7 @@ int arg_parse(int argc, char * *argv, void * *argtable)
     }
 
     argvcopy = (char **)malloc(sizeof(char *) * (argc + 1));
-    if (argvcopy)
-    {
+    if (argvcopy) {
         int i;
 
         /*
@@ -4265,9 +4207,7 @@ int arg_parse(int argc, char * *argv, void * *argtable)
 
         /* release the local copt of argv[] */
         free(argvcopy);
-    }
-    else
-    {
+    } else {
         /* memory alloc failed */
         arg_register_error(endtable, endtable, ARG_EMALLOC, NULL);
     }
@@ -4303,11 +4243,11 @@ void arg_cat(char * *pdest, const char *src, size_t *pndest)
     char *end  = dest + *pndest;
 
     /*locate null terminator of dest string */
-    while(dest < end && *dest != 0)
+    while (dest < end && *dest != 0)
         dest++;
 
     /* concat src string to dest string */
-    while(dest < end && *src != 0)
+    while (dest < end && *src != 0)
         *dest++ = *src++;
 
     /* null terminate dest string */
@@ -4327,8 +4267,7 @@ void arg_cat_option(char *dest,
                     const char *datatype,
                     int optvalue)
 {
-    if (shortopts)
-    {
+    if (shortopts) {
         char option[3];
 
         /* note: option array[] is initialiazed dynamically here to satisfy   */
@@ -4338,21 +4277,16 @@ void arg_cat_option(char *dest,
         option[2] = 0;
 
         arg_cat(&dest, option, &ndest);
-        if (datatype)
-        {
+        if (datatype) {
             arg_cat(&dest, " ", &ndest);
-            if (optvalue)
-            {
+            if (optvalue) {
                 arg_cat(&dest, "[", &ndest);
                 arg_cat(&dest, datatype, &ndest);
                 arg_cat(&dest, "]", &ndest);
-            }
-            else
+            } else
                 arg_cat(&dest, datatype, &ndest);
         }
-    }
-    else if (longopts)
-    {
+    } else if (longopts) {
         size_t ncspn;
 
         /* add "--" tag prefix */
@@ -4366,28 +4300,21 @@ void arg_cat_option(char *dest,
         strncat(dest, longopts, (ncspn < ndest) ? ncspn : ndest);
 #endif
 
-        if (datatype)
-        {
+        if (datatype) {
             arg_cat(&dest, "=", &ndest);
-            if (optvalue)
-            {
+            if (optvalue) {
                 arg_cat(&dest, "[", &ndest);
                 arg_cat(&dest, datatype, &ndest);
                 arg_cat(&dest, "]", &ndest);
-            }
-            else
+            } else
                 arg_cat(&dest, datatype, &ndest);
         }
-    }
-    else if (datatype)
-    {
-        if (optvalue)
-        {
+    } else if (datatype) {
+        if (optvalue) {
             arg_cat(&dest, "[", &ndest);
             arg_cat(&dest, datatype, &ndest);
             arg_cat(&dest, "]", &ndest);
-        }
-        else
+        } else
             arg_cat(&dest, datatype, &ndest);
     }
 }
@@ -4403,11 +4330,9 @@ void arg_cat_optionv(char *dest,
 {
     separator = separator ? separator : "";
 
-    if (shortopts)
-    {
+    if (shortopts) {
         const char *c = shortopts;
-        while(*c)
-        {
+        while (*c) {
             /* "-a|-b|-c" */
             char shortopt[3];
 
@@ -4427,11 +4352,9 @@ void arg_cat_optionv(char *dest,
     if (shortopts && longopts)
         arg_cat(&dest, separator, &ndest);
 
-    if (longopts)
-    {
+    if (longopts) {
         const char *c = longopts;
-        while(*c)
-        {
+        while (*c) {
             size_t ncspn;
 
             /* add "--" tag prefix */
@@ -4447,28 +4370,24 @@ void arg_cat_optionv(char *dest,
             c += ncspn;
 
             /* add given separator in place of comma */
-            if (*c == ',')
-            {
+            if (*c == ',') {
                 arg_cat(&dest, separator, &ndest);
                 c++;
             }
         }
     }
 
-    if (datatype)
-    {
+    if (datatype) {
         if (longopts)
             arg_cat(&dest, "=", &ndest);
         else if (shortopts)
             arg_cat(&dest, " ", &ndest);
 
-        if (optvalue)
-        {
+        if (optvalue) {
             arg_cat(&dest, "[", &ndest);
             arg_cat(&dest, datatype, &ndest);
             arg_cat(&dest, "]", &ndest);
-        }
-        else
+        } else
             arg_cat(&dest, datatype, &ndest);
     }
 }
@@ -4512,10 +4431,9 @@ void arg_print_gnuswitch(FILE *fp, struct arg_hdr * *table)
     char *suffix = "";
 
     /* print all mandatory switches that are without argument values */
-    for(tabindex = 0;
-        table[tabindex] && !(table[tabindex]->flag & ARG_TERMINATOR);
-        tabindex++)
-    {
+    for (tabindex = 0;
+         table[tabindex] && !(table[tabindex]->flag & ARG_TERMINATOR);
+         tabindex++) {
         /* skip optional options */
         if (table[tabindex]->mincount < 1)
             continue;
@@ -4535,10 +4453,9 @@ void arg_print_gnuswitch(FILE *fp, struct arg_hdr * *table)
     }
 
     /* print all optional switches that are without argument values */
-    for(tabindex = 0;
-        table[tabindex] && !(table[tabindex]->flag & ARG_TERMINATOR);
-        tabindex++)
-    {
+    for (tabindex = 0;
+         table[tabindex] && !(table[tabindex]->flag & ARG_TERMINATOR);
+         tabindex++) {
         /* skip mandatory args */
         if (table[tabindex]->mincount > 0)
             continue;
@@ -4570,10 +4487,9 @@ void arg_print_syntax(FILE *fp, void * *argtable, const char *suffix)
     arg_print_gnuswitch(fp, table);
 
     /* print remaining options in abbreviated style */
-    for(tabindex = 0;
-        table[tabindex] && !(table[tabindex]->flag & ARG_TERMINATOR);
-        tabindex++)
-    {
+    for (tabindex = 0;
+         table[tabindex] && !(table[tabindex]->flag & ARG_TERMINATOR);
+         tabindex++) {
         char syntax[200] = "";
         const char *shortopts, *longopts, *datatype;
 
@@ -4592,26 +4508,24 @@ void arg_print_syntax(FILE *fp, void * *argtable, const char *suffix)
                        datatype,
                        table[tabindex]->flag & ARG_HASOPTVALUE);
 
-        if (strlen(syntax) > 0)
-        {
+        if (strlen(syntax) > 0) {
             /* print mandatory instances of this option */
             for (i = 0; i < table[tabindex]->mincount; i++)
                 fprintf(fp, " %s", syntax);
 
             /* print optional instances enclosed in "[..]" */
-            switch ( table[tabindex]->maxcount - table[tabindex]->mincount )
-            {
-            case 0:
-                break;
-            case 1:
-                fprintf(fp, " [%s]", syntax);
-                break;
-            case 2:
-                fprintf(fp, " [%s] [%s]", syntax, syntax);
-                break;
-            default:
-                fprintf(fp, " [%s]...", syntax);
-                break;
+            switch (table[tabindex]->maxcount - table[tabindex]->mincount) {
+                case 0:
+                    break;
+                case 1:
+                    fprintf(fp, " [%s]", syntax);
+                    break;
+                case 2:
+                    fprintf(fp, " [%s] [%s]", syntax, syntax);
+                    break;
+                default:
+                    fprintf(fp, " [%s]...", syntax);
+                    break;
             }
         }
     }
@@ -4627,10 +4541,9 @@ void arg_print_syntaxv(FILE *fp, void * *argtable, const char *suffix)
     int i, tabindex;
 
     /* print remaining options in abbreviated style */
-    for(tabindex = 0;
-        table[tabindex] && !(table[tabindex]->flag & ARG_TERMINATOR);
-        tabindex++)
-    {
+    for (tabindex = 0;
+         table[tabindex] && !(table[tabindex]->flag & ARG_TERMINATOR);
+         tabindex++) {
         char syntax[200] = "";
         const char *shortopts, *longopts, *datatype;
 
@@ -4650,19 +4563,18 @@ void arg_print_syntaxv(FILE *fp, void * *argtable, const char *suffix)
             fprintf(fp, " %s", syntax);
 
         /* print optional args enclosed in "[..]" */
-        switch ( table[tabindex]->maxcount - table[tabindex]->mincount )
-        {
-        case 0:
-            break;
-        case 1:
-            fprintf(fp, " [%s]", syntax);
-            break;
-        case 2:
-            fprintf(fp, " [%s] [%s]", syntax, syntax);
-            break;
-        default:
-            fprintf(fp, " [%s]...", syntax);
-            break;
+        switch (table[tabindex]->maxcount - table[tabindex]->mincount) {
+            case 0:
+                break;
+            case 1:
+                fprintf(fp, " [%s]", syntax);
+                break;
+            case 2:
+                fprintf(fp, " [%s] [%s]", syntax, syntax);
+                break;
+            default:
+                fprintf(fp, " [%s]...", syntax);
+                break;
         }
     }
 
@@ -4677,10 +4589,8 @@ void arg_print_glossary(FILE *fp, void * *argtable, const char *format)
     int tabindex;
 
     format = format ? format : "  %-20s %s\n";
-    for (tabindex = 0; !(table[tabindex]->flag & ARG_TERMINATOR); tabindex++)
-    {
-        if (table[tabindex]->glossary)
-        {
+    for (tabindex = 0; !(table[tabindex]->flag & ARG_TERMINATOR); tabindex++) {
+        if (table[tabindex]->glossary) {
             char syntax[200] = "";
             const char *shortopts = table[tabindex]->shortopts;
             const char *longopts  = table[tabindex]->longopts;
@@ -4732,35 +4642,34 @@ void arg_print_glossary(FILE *fp, void * *argtable, const char *format)
  * Author: Uli Fouquet
  */
 static
-void arg_print_formatted( FILE *fp,
-                          const unsigned lmargin,
-                          const unsigned rmargin,
-                          const char *text )
+void arg_print_formatted(FILE *fp,
+                         const unsigned lmargin,
+                         const unsigned rmargin,
+                         const char *text)
 {
-    const unsigned textlen = (unsigned)strlen( text );
+    const unsigned textlen = (unsigned)strlen(text);
     unsigned line_start = 0;
     unsigned line_end = textlen + 1;
     const unsigned colwidth = (rmargin - lmargin) + 1;
 
     /* Someone doesn't like us... */
-    if ( line_end < line_start )
-    { fprintf( fp, "%s\n", text ); }
+    if (line_end < line_start)
+    { fprintf(fp, "%s\n", text); }
 
-    while (line_end - 1 > line_start )
-    {
+    while (line_end - 1 > line_start) {
         /* Eat leading whitespaces. This is essential because while
            wrapping lines, there will often be a whitespace at beginning
            of line */
-        while ( ISSPACE(*(text + line_start)) )
+        while (ISSPACE(*(text + line_start)))
         { line_start++; }
 
-        if ((line_end - line_start) > colwidth )
+        if ((line_end - line_start) > colwidth)
         { line_end = line_start + colwidth; }
 
         /* Find last whitespace, that fits into line */
-        while ( ( line_end > line_start )
-                && ( line_end - line_start > colwidth )
-                && !ISSPACE(*(text + line_end)))
+        while ((line_end > line_start)
+               && (line_end - line_start > colwidth)
+               && !ISSPACE(*(text + line_end)))
         { line_end--; }
 
         /* Do not print trailing whitespace. If this text
@@ -4769,20 +4678,18 @@ void arg_print_formatted( FILE *fp,
         line_end--;
 
         /* Output line of text */
-        while ( line_start < line_end )
-        {
-            fputc(*(text + line_start), fp );
+        while (line_start < line_end) {
+            fputc(*(text + line_start), fp);
             line_start++;
         }
-        fputc( '\n', fp );
+        fputc('\n', fp);
 
         /* Initialize another line */
-        if ( line_end + 1 < textlen )
-        {
+        if (line_end + 1 < textlen) {
             unsigned i;
 
-            for (i = 0; i < lmargin; i++ )
-            { fputc( ' ', fp ); }
+            for (i = 0; i < lmargin; i++)
+            { fputc(' ', fp); }
 
             line_end = textlen;
         }
@@ -4802,25 +4709,22 @@ void arg_print_formatted( FILE *fp,
  *
  * Contributed by Uli Fouquet
  */
-void arg_print_glossary_gnu(FILE *fp, void * *argtable )
+void arg_print_glossary_gnu(FILE *fp, void * *argtable)
 {
     struct arg_hdr * *table = (struct arg_hdr * *)argtable;
     int tabindex;
 
-    for(tabindex = 0; !(table[tabindex]->flag & ARG_TERMINATOR); tabindex++)
-    {
-        if (table[tabindex]->glossary)
-        {
+    for (tabindex = 0; !(table[tabindex]->flag & ARG_TERMINATOR); tabindex++) {
+        if (table[tabindex]->glossary) {
             char syntax[200] = "";
             const char *shortopts = table[tabindex]->shortopts;
             const char *longopts  = table[tabindex]->longopts;
             const char *datatype  = table[tabindex]->datatype;
             const char *glossary  = table[tabindex]->glossary;
 
-            if ( !shortopts && longopts )
-            {
+            if (!shortopts && longopts) {
                 /* Indent trailing line by 4 spaces... */
-                memset( syntax, ' ', 4 );
+                memset(syntax, ' ', 4);
                 *(syntax + 4) = '\0';
             }
 
@@ -4833,18 +4737,17 @@ void arg_print_glossary_gnu(FILE *fp, void * *argtable )
                             ", ");
 
             /* If syntax fits not into column, print glossary in new line... */
-            if ( strlen(syntax) > 25 )
-            {
-                fprintf( fp, "  %-25s %s\n", syntax, "" );
+            if (strlen(syntax) > 25) {
+                fprintf(fp, "  %-25s %s\n", syntax, "");
                 *syntax = '\0';
             }
 
-            fprintf( fp, "  %-25s ", syntax );
-            arg_print_formatted( fp, 28, 79, glossary );
+            fprintf(fp, "  %-25s ", syntax);
+            arg_print_formatted(fp, 28, 79, glossary);
         }
     } /* for each table entry */
 
-    fputc( '\n', fp );
+    fputc('\n', fp);
 }
 
 
@@ -4862,12 +4765,11 @@ int arg_nullcheck(void * *argtable)
         return 1;
 
     tabindex = 0;
-    do
-    {
+    do {
         /*printf("argtable[%d]=%p\n",tabindex,argtable[tabindex]);*/
         if (!table[tabindex])
             return 1;
-    } while(!(table[tabindex++]->flag & ARG_TERMINATOR));
+    } while (!(table[tabindex++]->flag & ARG_TERMINATOR));
 
     return 0;
 }
@@ -4890,8 +4792,7 @@ void arg_free(void * *argtable)
     int tabindex = 0;
     int flag;
     /*printf("arg_free(%p)\n",argtable);*/
-    do
-    {
+    do {
         /*
            if we encounter a NULL entry then somewhat incorrectly we presume
            we have come to the end of the array. It isnt strictly true because
@@ -4905,7 +4806,7 @@ void arg_free(void * *argtable)
         free(table[tabindex]);
         table[tabindex++] = NULL;
 
-    } while(!(flag & ARG_TERMINATOR));
+    } while (!(flag & ARG_TERMINATOR));
 }
 
 /* frees each non-NULL element of argtable[], where n is the size of the number of entries in the array */
@@ -4914,8 +4815,7 @@ void arg_freetable(void * *argtable, size_t n)
     struct arg_hdr * *table = (struct arg_hdr * *)argtable;
     size_t tabindex = 0;
     /*printf("arg_freetable(%p)\n",argtable);*/
-    for (tabindex = 0; tabindex < n; tabindex++)
-    {
+    for (tabindex = 0; tabindex < n; tabindex++) {
         if (table[tabindex] == NULL)
             continue;
 
diff --git a/client/cliparser/argtable3.h b/client/cliparser/argtable3.h
index 452d0283a..a442ec0d5 100644
--- a/client/cliparser/argtable3.h
+++ b/client/cliparser/argtable3.h
@@ -41,16 +41,15 @@ extern "C" {
 #define ARG_REX_ICASE 1
 
 /* bit masks for arg_hdr.flag */
-enum
-{
-    ARG_TERMINATOR=0x1,
-    ARG_HASVALUE=0x2,
-    ARG_HASOPTVALUE=0x4
+enum {
+    ARG_TERMINATOR = 0x1,
+    ARG_HASVALUE = 0x2,
+    ARG_HASOPTVALUE = 0x4
 };
 
 typedef void (arg_resetfn)(void *parent);
-typedef int  (arg_scanfn)(void *parent, const char *argval);
-typedef int  (arg_checkfn)(void *parent);
+typedef int (arg_scanfn)(void *parent, const char *argval);
+typedef int (arg_checkfn)(void *parent);
 typedef void (arg_errorfn)(void *parent, FILE *fp, int error, const char *argval, const char *progname);
 
 
@@ -71,8 +70,7 @@ typedef void (arg_errorfn)(void *parent, FILE *fp, int error, const char *argval
 * if desired, but the original intention is for them to be set by the
 * constructor and left unaltered.
 */
-struct arg_hdr
-{
+struct arg_hdr {
     char         flag;        /* Modifier flags: ARG_TERMINATOR, ARG_HASVALUE. */
     const char  *shortopts;   /* String defining the short options */
     const char  *longopts;    /* String defiing the long options */
@@ -88,47 +86,40 @@ struct arg_hdr
     void        *priv;        /* Pointer to private header data for use by arg_xxx functions */
 };
 
-struct arg_rem
-{
+struct arg_rem {
     struct arg_hdr hdr;      /* The mandatory argtable header struct */
 };
 
-struct arg_lit
-{
+struct arg_lit {
     struct arg_hdr hdr;      /* The mandatory argtable header struct */
     int count;               /* Number of matching command line args */
 };
 
-struct arg_int
-{
+struct arg_int {
     struct arg_hdr hdr;      /* The mandatory argtable header struct */
     int count;               /* Number of matching command line args */
     int *ival;               /* Array of parsed argument values */
 };
 
-struct arg_dbl
-{
+struct arg_dbl {
     struct arg_hdr hdr;      /* The mandatory argtable header struct */
     int count;               /* Number of matching command line args */
     double *dval;            /* Array of parsed argument values */
 };
 
-struct arg_str
-{
+struct arg_str {
     struct arg_hdr hdr;      /* The mandatory argtable header struct */
     int count;               /* Number of matching command line args */
     const char **sval;       /* Array of parsed argument values */
 };
 
-struct arg_rex
-{
+struct arg_rex {
     struct arg_hdr hdr;      /* The mandatory argtable header struct */
     int count;               /* Number of matching command line args */
     const char **sval;       /* Array of parsed argument values */
 };
 
-struct arg_file
-{
+struct arg_file {
     struct arg_hdr hdr;      /* The mandatory argtable header struct */
     int count;               /* Number of matching command line args*/
     const char **filename;   /* Array of parsed filenames  (eg: /home/foo.bar) */
@@ -136,17 +127,15 @@ struct arg_file
     const char **extension;  /* Array of parsed extensions (eg: .bar) */
 };
 
-struct arg_date
-{
+struct arg_date {
     struct arg_hdr hdr;      /* The mandatory argtable header struct */
     const char *format;      /* strptime format string used to parse the date */
     int count;               /* Number of matching command line args */
     struct tm *tmval;        /* Array of parsed time values */
 };
 
-enum {ARG_ELIMIT=1, ARG_EMALLOC, ARG_ENOMATCH, ARG_ELONGOPT, ARG_EMISSARG};
-struct arg_end
-{
+enum {ARG_ELIMIT = 1, ARG_EMALLOC, ARG_ENOMATCH, ARG_ELONGOPT, ARG_EMISSARG};
+struct arg_end {
     struct arg_hdr hdr;      /* The mandatory argtable header struct */
     int count;               /* Number of errors encountered */
     int *error;              /* Array of error codes */
@@ -157,132 +146,132 @@ struct arg_end
 
 /**** arg_xxx constructor functions *********************************/
 
-struct arg_rem* arg_rem(const char* datatype, const char* glossary);
+struct arg_rem *arg_rem(const char *datatype, const char *glossary);
 
-struct arg_lit* arg_lit0(const char* shortopts,
-    const char* longopts,
-    const char* glossary);
-struct arg_lit* arg_lit1(const char* shortopts,
-    const char* longopts,
-    const char *glossary);
-struct arg_lit* arg_litn(const char* shortopts,
-    const char* longopts,
-    int mincount,
-    int maxcount,
-    const char *glossary);
+struct arg_lit *arg_lit0(const char *shortopts,
+                         const char *longopts,
+                         const char *glossary);
+struct arg_lit *arg_lit1(const char *shortopts,
+                         const char *longopts,
+                         const char *glossary);
+struct arg_lit *arg_litn(const char *shortopts,
+                         const char *longopts,
+                         int mincount,
+                         int maxcount,
+                         const char *glossary);
 
-struct arg_key* arg_key0(const char* keyword,
-    int flags,
-    const char* glossary);
-struct arg_key* arg_key1(const char* keyword,
-    int flags,
-    const char* glossary);
-struct arg_key* arg_keyn(const char* keyword,
-    int flags,
-    int mincount,
-    int maxcount,
-    const char* glossary);
+struct arg_key *arg_key0(const char *keyword,
+                         int flags,
+                         const char *glossary);
+struct arg_key *arg_key1(const char *keyword,
+                         int flags,
+                         const char *glossary);
+struct arg_key *arg_keyn(const char *keyword,
+                         int flags,
+                         int mincount,
+                         int maxcount,
+                         const char *glossary);
 
-struct arg_int* arg_int0(const char* shortopts,
-    const char* longopts,
-    const char* datatype,
-    const char* glossary);
-struct arg_int* arg_int1(const char* shortopts,
-    const char* longopts,
-    const char* datatype,
-    const char *glossary);
-struct arg_int* arg_intn(const char* shortopts,
-    const char* longopts,
-    const char *datatype,
-    int mincount,
-    int maxcount,
-    const char *glossary);
+struct arg_int *arg_int0(const char *shortopts,
+                         const char *longopts,
+                         const char *datatype,
+                         const char *glossary);
+struct arg_int *arg_int1(const char *shortopts,
+                         const char *longopts,
+                         const char *datatype,
+                         const char *glossary);
+struct arg_int *arg_intn(const char *shortopts,
+                         const char *longopts,
+                         const char *datatype,
+                         int mincount,
+                         int maxcount,
+                         const char *glossary);
 
-struct arg_dbl* arg_dbl0(const char* shortopts,
-    const char* longopts,
-    const char* datatype,
-    const char* glossary);
-struct arg_dbl* arg_dbl1(const char* shortopts,
-    const char* longopts,
-    const char* datatype,
-    const char *glossary);
-struct arg_dbl* arg_dbln(const char* shortopts,
-    const char* longopts,
-    const char *datatype,
-    int mincount,
-    int maxcount,
-    const char *glossary);
+struct arg_dbl *arg_dbl0(const char *shortopts,
+                         const char *longopts,
+                         const char *datatype,
+                         const char *glossary);
+struct arg_dbl *arg_dbl1(const char *shortopts,
+                         const char *longopts,
+                         const char *datatype,
+                         const char *glossary);
+struct arg_dbl *arg_dbln(const char *shortopts,
+                         const char *longopts,
+                         const char *datatype,
+                         int mincount,
+                         int maxcount,
+                         const char *glossary);
 
-struct arg_str* arg_str0(const char* shortopts,
-    const char* longopts,
-    const char* datatype,
-    const char* glossary);
-struct arg_str* arg_str1(const char* shortopts,
-    const char* longopts,
-    const char* datatype,
-    const char *glossary);
-struct arg_str* arg_strn(const char* shortopts,
-    const char* longopts,
-    const char* datatype,
-    int mincount,
-    int maxcount,
-    const char *glossary);
+struct arg_str *arg_str0(const char *shortopts,
+                         const char *longopts,
+                         const char *datatype,
+                         const char *glossary);
+struct arg_str *arg_str1(const char *shortopts,
+                         const char *longopts,
+                         const char *datatype,
+                         const char *glossary);
+struct arg_str *arg_strn(const char *shortopts,
+                         const char *longopts,
+                         const char *datatype,
+                         int mincount,
+                         int maxcount,
+                         const char *glossary);
 
-struct arg_rex* arg_rex0(const char* shortopts,
-    const char* longopts,
-    const char* pattern,
-    const char* datatype,
-    int flags,
-    const char* glossary);
-struct arg_rex* arg_rex1(const char* shortopts,
-    const char* longopts,
-    const char* pattern,
-    const char* datatype,
-    int flags,
-    const char *glossary);
-struct arg_rex* arg_rexn(const char* shortopts,
-    const char* longopts,
-    const char* pattern,
-    const char* datatype,
-    int mincount,
-    int maxcount,
-    int flags,
-    const char *glossary);
+struct arg_rex *arg_rex0(const char *shortopts,
+                         const char *longopts,
+                         const char *pattern,
+                         const char *datatype,
+                         int flags,
+                         const char *glossary);
+struct arg_rex *arg_rex1(const char *shortopts,
+                         const char *longopts,
+                         const char *pattern,
+                         const char *datatype,
+                         int flags,
+                         const char *glossary);
+struct arg_rex *arg_rexn(const char *shortopts,
+                         const char *longopts,
+                         const char *pattern,
+                         const char *datatype,
+                         int mincount,
+                         int maxcount,
+                         int flags,
+                         const char *glossary);
 
-struct arg_file* arg_file0(const char* shortopts,
-    const char* longopts,
-    const char* datatype,
-    const char* glossary);
-struct arg_file* arg_file1(const char* shortopts,
-    const char* longopts,
-    const char* datatype,
-    const char *glossary);
-struct arg_file* arg_filen(const char* shortopts,
-    const char* longopts,
-    const char* datatype,
-    int mincount,
-    int maxcount,
-    const char *glossary);
+struct arg_file *arg_file0(const char *shortopts,
+                           const char *longopts,
+                           const char *datatype,
+                           const char *glossary);
+struct arg_file *arg_file1(const char *shortopts,
+                           const char *longopts,
+                           const char *datatype,
+                           const char *glossary);
+struct arg_file *arg_filen(const char *shortopts,
+                           const char *longopts,
+                           const char *datatype,
+                           int mincount,
+                           int maxcount,
+                           const char *glossary);
 
-struct arg_date* arg_date0(const char* shortopts,
-    const char* longopts,
-    const char* format,
-    const char* datatype,
-    const char* glossary);
-struct arg_date* arg_date1(const char* shortopts,
-    const char* longopts,
-    const char* format,
-    const char* datatype,
-    const char *glossary);
-struct arg_date* arg_daten(const char* shortopts,
-    const char* longopts,
-    const char* format,
-    const char* datatype,
-    int mincount,
-    int maxcount,
-    const char *glossary);
+struct arg_date *arg_date0(const char *shortopts,
+                           const char *longopts,
+                           const char *format,
+                           const char *datatype,
+                           const char *glossary);
+struct arg_date *arg_date1(const char *shortopts,
+                           const char *longopts,
+                           const char *format,
+                           const char *datatype,
+                           const char *glossary);
+struct arg_date *arg_daten(const char *shortopts,
+                           const char *longopts,
+                           const char *format,
+                           const char *datatype,
+                           int mincount,
+                           int maxcount,
+                           const char *glossary);
 
-struct arg_end* arg_end(int maxerrors);
+struct arg_end *arg_end(int maxerrors);
 
 
 /**** other functions *******************************************/
@@ -293,7 +282,7 @@ void arg_print_syntax(FILE *fp, void **argtable, const char *suffix);
 void arg_print_syntaxv(FILE *fp, void **argtable, const char *suffix);
 void arg_print_glossary(FILE *fp, void **argtable, const char *format);
 void arg_print_glossary_gnu(FILE *fp, void **argtable);
-void arg_print_errors(FILE* fp, struct arg_end* end, const char* progname);
+void arg_print_errors(FILE *fp, struct arg_end *end, const char *progname);
 void arg_freetable(void **argtable, size_t n);
 
 /**** deprecated functions, for back-compatibility only ********/
diff --git a/client/cliparser/cliparser.c b/client/cliparser/cliparser.c
index e0c853d23..5383712b0 100644
--- a/client/cliparser/cliparser.c
+++ b/client/cliparser/cliparser.c
@@ -19,7 +19,8 @@ char *programHint = NULL;
 char *programHelp = NULL;
 char buf[500] = {0};
 
-int CLIParserInit(char *vprogramName, char *vprogramHint, char *vprogramHelp) {
+int CLIParserInit(char *vprogramName, char *vprogramHint, char *vprogramHelp)
+{
     argtable = NULL;
     argtableLen = 0;
     programName = vprogramName;
@@ -30,7 +31,8 @@ int CLIParserInit(char *vprogramName, char *vprogramHint, char *vprogramHelp) {
     return 0;
 }
 
-int CLIParserParseArg(int argc, char **argv, void* vargtable[], size_t vargtableLen, bool allowEmptyExec) {
+int CLIParserParseArg(int argc, char **argv, void *vargtable[], size_t vargtableLen, bool allowEmptyExec)
+{
     int nerrors;
 
     argtable = vargtable;
@@ -46,7 +48,7 @@ int CLIParserParseArg(int argc, char **argv, void* vargtable[], size_t vargtable
     nerrors = arg_parse(argc, argv, argtable);
 
     /* special case: '--help' takes precedence over error reporting */
-    if ((argc < 2 && !allowEmptyExec) ||((struct arg_lit *)argtable[0])->count > 0) { // help must be the first record
+    if ((argc < 2 && !allowEmptyExec) || ((struct arg_lit *)argtable[0])->count > 0) { // help must be the first record
         printf("Usage: %s", programName);
         arg_print_syntaxv(stdout, argtable, "\n");
         if (programHint)
@@ -79,11 +81,13 @@ enum ParserState {
 
 #define isSpace(c)(c == ' ' || c == '\t')
 
-int CLIParserParseString(const char* str, void* vargtable[], size_t vargtableLen, bool allowEmptyExec) {
+int CLIParserParseString(const char *str, void *vargtable[], size_t vargtableLen, bool allowEmptyExec)
+{
     return CLIParserParseStringEx(str, vargtable, vargtableLen, allowEmptyExec, false);
 }
 
-int CLIParserParseStringEx(const char* str, void* vargtable[], size_t vargtableLen, bool allowEmptyExec, bool clueData) {
+int CLIParserParseStringEx(const char *str, void *vargtable[], size_t vargtableLen, bool allowEmptyExec, bool clueData)
+{
     int argc = 0;
     char *argv[200] = {NULL};
 
@@ -101,9 +105,9 @@ int CLIParserParseStringEx(const char* str, void* vargtable[], size_t vargtableL
 
     // parse params
     for (int i = 0; i < len; i++) {
-        switch(state){
+        switch (state) {
             case PS_FIRST: // first char
-                if (!clueData || str[i] == '-'){ // first char before space is '-' - next element - option OR not "clueData" for not-option fields
+                if (!clueData || str[i] == '-') { // first char before space is '-' - next element - option OR not "clueData" for not-option fields
                     state = PS_OPTION;
 
                     if (spaceptr) {
@@ -125,7 +129,7 @@ int CLIParserParseStringEx(const char* str, void* vargtable[], size_t vargtableL
                 bufptr++;
                 break;
             case PS_OPTION:
-                if (isSpace(str[i])){
+                if (isSpace(str[i])) {
                     state = PS_FIRST;
 
                     *bufptr = 0x00;
@@ -143,7 +147,8 @@ int CLIParserParseStringEx(const char* str, void* vargtable[], size_t vargtableL
     return CLIParserParseArg(argc, argv, vargtable, vargtableLen, allowEmptyExec);
 }
 
-void CLIParserFree() {
+void CLIParserFree()
+{
     arg_freetable(argtable, argtableLen);
     argtable = NULL;
 
@@ -151,7 +156,8 @@ void CLIParserFree() {
 }
 
 // convertors
-int CLIParamHexToBuf(struct arg_str *argstr, uint8_t *data, int maxdatalen, int *datalen) {
+int CLIParamHexToBuf(struct arg_str *argstr, uint8_t *data, int maxdatalen, int *datalen)
+{
     *datalen = 0;
 
     int ibuf = 0;
@@ -160,22 +166,23 @@ int CLIParamHexToBuf(struct arg_str *argstr, uint8_t *data, int maxdatalen, int
     if (res || !ibuf)
         return res;
 
-    switch(param_gethex_to_eol((char *)buf, 0, data, maxdatalen, datalen)) {
-    case 1:
-        printf("Parameter error: Invalid HEX value.\n");
-        return 1;
-    case 2:
-        printf("Parameter error: parameter too large.\n");
-        return 2;
-    case 3:
-        printf("Parameter error: Hex string must have even number of digits.\n");
-        return 3;
+    switch (param_gethex_to_eol((char *)buf, 0, data, maxdatalen, datalen)) {
+        case 1:
+            printf("Parameter error: Invalid HEX value.\n");
+            return 1;
+        case 2:
+            printf("Parameter error: parameter too large.\n");
+            return 2;
+        case 3:
+            printf("Parameter error: Hex string must have even number of digits.\n");
+            return 3;
     }
 
     return 0;
 }
 
-int CLIParamStrToBuf(struct arg_str *argstr, uint8_t *data, int maxdatalen, int *datalen) {
+int CLIParamStrToBuf(struct arg_str *argstr, uint8_t *data, int maxdatalen, int *datalen)
+{
     *datalen = 0;
     if (!argstr->count)
         return 0;
diff --git a/client/cliparser/cliparser.h b/client/cliparser/cliparser.h
index 05910ea43..d42cd50b6 100644
--- a/client/cliparser/cliparser.h
+++ b/client/cliparser/cliparser.h
@@ -32,9 +32,9 @@
 #define CLIGetStrWithReturn(paramnum, data, datalen) if (CLIParamStrToBuf(arg_get_str(paramnum), data, sizeof(data), datalen)) {CLIParserFree();return 1;}
 
 extern int CLIParserInit(char *vprogramName, char *vprogramHint, char *vprogramHelp);
-extern int CLIParserParseString(const char* str, void* argtable[], size_t vargtableLen, bool allowEmptyExec);
-extern int CLIParserParseStringEx(const char* str, void* vargtable[], size_t vargtableLen, bool allowEmptyExec, bool clueData);
-extern int CLIParserParseArg(int argc, char **argv, void* argtable[], size_t vargtableLen, bool allowEmptyExec);
+extern int CLIParserParseString(const char *str, void *argtable[], size_t vargtableLen, bool allowEmptyExec);
+extern int CLIParserParseStringEx(const char *str, void *vargtable[], size_t vargtableLen, bool allowEmptyExec, bool clueData);
+extern int CLIParserParseArg(int argc, char **argv, void *argtable[], size_t vargtableLen, bool allowEmptyExec);
 extern void CLIParserFree();
 
 extern int CLIParamHexToBuf(struct arg_str *argstr, uint8_t *data, int maxdatalen, int *datalen);
diff --git a/client/cliparser/getopt.h b/client/cliparser/getopt.h
index c036ff686..308acf3ce 100644
--- a/client/cliparser/getopt.h
+++ b/client/cliparser/getopt.h
@@ -60,13 +60,13 @@ struct option {
 };
 
 __BEGIN_DECLS
-int getopt_long(int, char * const *, const char *,
-    const struct option *, int *);
-int getopt_long_only(int, char * const *, const char *,
-    const struct option *, int *);
+int getopt_long(int, char *const *, const char *,
+                const struct option *, int *);
+int getopt_long_only(int, char *const *, const char *,
+                     const struct option *, int *);
 #ifndef _GETOPT_DECLARED
 #define _GETOPT_DECLARED
-int getopt(int, char * const [], const char *);
+int getopt(int, char *const [], const char *);
 
 extern char *optarg; /* getopt(3) external variables */
 extern int optind, opterr, optopt;
diff --git a/client/cmdanalyse.c b/client/cmdanalyse.c
index c0e455fe2..9b326f961 100644
--- a/client/cmdanalyse.c
+++ b/client/cmdanalyse.c
@@ -11,7 +11,8 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_analyse_lcr(void) {
+int usage_analyse_lcr(void)
+{
     PrintAndLogEx(NORMAL, "Specifying the bytes of a UID with a known LRC will find the last byte value");
     PrintAndLogEx(NORMAL, "needed to generate that LRC with a rolling XOR. All bytes should be specified in HEX.");
     PrintAndLogEx(NORMAL, "");
@@ -25,7 +26,8 @@ int usage_analyse_lcr(void) {
     PrintAndLogEx(NORMAL, "expected output: Target (BA) requires final LRC XOR byte value: 5A");
     return 0;
 }
-int usage_analyse_checksum(void) {
+int usage_analyse_checksum(void)
+{
     PrintAndLogEx(NORMAL, "The bytes will be added with eachother and than limited with the applied mask");
     PrintAndLogEx(NORMAL, "Finally compute ones' complement of the least significant bytes");
     PrintAndLogEx(NORMAL, "");
@@ -41,7 +43,8 @@ int usage_analyse_checksum(void) {
     PrintAndLogEx(NORMAL, "expected output: 0x61");
     return 0;
 }
-int usage_analyse_crc(void){
+int usage_analyse_crc(void)
+{
     PrintAndLogEx(NORMAL, "A stub method to test different crc implementations inside the PM3 sourcecode. Just because you figured out the poly, doesn't mean you get the desired output");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  analyse crc [h] <bytes>");
@@ -53,7 +56,8 @@ int usage_analyse_crc(void){
     PrintAndLogEx(NORMAL, "      analyse crc 137AF00A0A0D");
     return 0;
 }
-int usage_analyse_nuid(void){
+int usage_analyse_nuid(void)
+{
     PrintAndLogEx(NORMAL, "Generate 4byte NUID from 7byte UID");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  analyse hid [h] <bytes>");
@@ -65,7 +69,8 @@ int usage_analyse_nuid(void){
     PrintAndLogEx(NORMAL, "      analyse nuid 11223344556677");
     return 0;
 }
-int usage_analyse_a(void) {
+int usage_analyse_a(void)
+{
     PrintAndLogEx(NORMAL, "Iceman's personal garbage test command");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  analyse a [h] d <bytes>");
@@ -78,7 +83,8 @@ int usage_analyse_a(void) {
     return 0;
 }
 
-static uint8_t calculateLRC( uint8_t* bytes, uint8_t len) {
+static uint8_t calculateLRC(uint8_t *bytes, uint8_t len)
+{
     uint8_t LRC = 0;
     for (uint8_t i = 0; i < len; i++)
         LRC ^= bytes[i];
@@ -102,7 +108,8 @@ static uint16_t shiftadd ( uint8_t* bytes, uint8_t len){
     return 0;
 }
 */
-static uint16_t calcSumCrumbAdd( uint8_t* bytes, uint8_t len, uint32_t mask) {
+static uint16_t calcSumCrumbAdd(uint8_t *bytes, uint8_t len, uint32_t mask)
+{
     uint16_t sum = 0;
     for (uint8_t i = 0; i < len; i++) {
         sum += CRUMB(bytes[i], 0);
@@ -113,10 +120,12 @@ static uint16_t calcSumCrumbAdd( uint8_t* bytes, uint8_t len, uint32_t mask) {
     sum &= mask;
     return sum;
 }
-static uint16_t calcSumCrumbAddOnes( uint8_t* bytes, uint8_t len, uint32_t mask) {
+static uint16_t calcSumCrumbAddOnes(uint8_t *bytes, uint8_t len, uint32_t mask)
+{
     return (~calcSumCrumbAdd(bytes, len, mask) & mask);
 }
-static uint16_t calcSumNibbleAdd( uint8_t* bytes, uint8_t len, uint32_t mask) {
+static uint16_t calcSumNibbleAdd(uint8_t *bytes, uint8_t len, uint32_t mask)
+{
     uint16_t sum = 0;
     for (uint8_t i = 0; i < len; i++) {
         sum += NIBBLE_LOW(bytes[i]);
@@ -125,10 +134,12 @@ static uint16_t calcSumNibbleAdd( uint8_t* bytes, uint8_t len, uint32_t mask) {
     sum &= mask;
     return sum;
 }
-static uint16_t calcSumNibbleAddOnes( uint8_t* bytes, uint8_t len, uint32_t mask){
+static uint16_t calcSumNibbleAddOnes(uint8_t *bytes, uint8_t len, uint32_t mask)
+{
     return (~calcSumNibbleAdd(bytes, len, mask) & mask);
 }
-static uint16_t calcSumCrumbXor(  uint8_t* bytes, uint8_t len, uint32_t mask) {
+static uint16_t calcSumCrumbXor(uint8_t *bytes, uint8_t len, uint32_t mask)
+{
     uint16_t sum = 0;
     for (uint8_t i = 0; i < len; i++) {
         sum ^= CRUMB(bytes[i], 0);
@@ -139,7 +150,8 @@ static uint16_t calcSumCrumbXor(  uint8_t* bytes, uint8_t len, uint32_t mask) {
     sum &= mask;
     return sum;
 }
-static uint16_t calcSumNibbleXor( uint8_t* bytes, uint8_t len, uint32_t mask) {
+static uint16_t calcSumNibbleXor(uint8_t *bytes, uint8_t len, uint32_t mask)
+{
     uint16_t sum = 0;
     for (uint8_t i = 0; i < len; i++) {
         sum ^= NIBBLE_LOW(bytes[i]);
@@ -148,7 +160,8 @@ static uint16_t calcSumNibbleXor( uint8_t* bytes, uint8_t len, uint32_t mask) {
     sum &= mask;
     return sum;
 }
-static uint16_t calcSumByteXor( uint8_t* bytes, uint8_t len, uint32_t mask) {
+static uint16_t calcSumByteXor(uint8_t *bytes, uint8_t len, uint32_t mask)
+{
     uint16_t sum = 0;
     for (uint8_t i = 0; i < len; i++) {
         sum ^= bytes[i];
@@ -156,7 +169,8 @@ static uint16_t calcSumByteXor( uint8_t* bytes, uint8_t len, uint32_t mask) {
     sum &= mask;
     return sum;
 }
-static uint16_t calcSumByteAdd( uint8_t* bytes, uint8_t len, uint32_t mask) {
+static uint16_t calcSumByteAdd(uint8_t *bytes, uint8_t len, uint32_t mask)
+{
     uint16_t sum = 0;
     for (uint8_t i = 0; i < len; i++) {
         sum += bytes[i];
@@ -165,11 +179,13 @@ static uint16_t calcSumByteAdd( uint8_t* bytes, uint8_t len, uint32_t mask) {
     return sum;
 }
 // Ones complement
-static uint16_t calcSumByteAddOnes( uint8_t* bytes, uint8_t len, uint32_t mask) {
+static uint16_t calcSumByteAddOnes(uint8_t *bytes, uint8_t len, uint32_t mask)
+{
     return (~calcSumByteAdd(bytes, len, mask) & mask);
 }
 
-static uint16_t calcSumByteSub( uint8_t* bytes, uint8_t len, uint32_t mask) {
+static uint16_t calcSumByteSub(uint8_t *bytes, uint8_t len, uint32_t mask)
+{
     uint8_t sum = 0;
     for (uint8_t i = 0; i < len; i++) {
         sum -= bytes[i];
@@ -177,10 +193,12 @@ static uint16_t calcSumByteSub( uint8_t* bytes, uint8_t len, uint32_t mask) {
     sum &= mask;
     return sum;
 }
-static uint16_t calcSumByteSubOnes( uint8_t* bytes, uint8_t len, uint32_t mask){
+static uint16_t calcSumByteSubOnes(uint8_t *bytes, uint8_t len, uint32_t mask)
+{
     return (~calcSumByteSub(bytes, len, mask) & mask);
 }
-static uint16_t calcSumNibbleSub( uint8_t* bytes, uint8_t len, uint32_t mask) {
+static uint16_t calcSumNibbleSub(uint8_t *bytes, uint8_t len, uint32_t mask)
+{
     uint8_t sum = 0;
     for (uint8_t i = 0; i < len; i++) {
         sum -= NIBBLE_LOW(bytes[i]);
@@ -189,14 +207,16 @@ static uint16_t calcSumNibbleSub( uint8_t* bytes, uint8_t len, uint32_t mask) {
     sum &= mask;
     return sum;
 }
-static uint16_t calcSumNibbleSubOnes( uint8_t* bytes, uint8_t len, uint32_t mask) {
+static uint16_t calcSumNibbleSubOnes(uint8_t *bytes, uint8_t len, uint32_t mask)
+{
     return (~calcSumNibbleSub(bytes, len, mask) & mask);
 }
 
 // BSD shift checksum 8bit version
-static uint16_t calcBSDchecksum8( uint8_t* bytes, uint8_t len, uint32_t mask){
+static uint16_t calcBSDchecksum8(uint8_t *bytes, uint8_t len, uint32_t mask)
+{
     uint16_t sum = 0;
-    for(uint8_t i = 0; i < len; i++){
+    for (uint8_t i = 0; i < len; i++) {
         sum = ((sum & 0xFF) >> 1) | ((sum & 0x1) << 7);   // rotate accumulator
         sum += bytes[i];  // add next byte
         sum &= 0xFF;  //
@@ -205,9 +225,10 @@ static uint16_t calcBSDchecksum8( uint8_t* bytes, uint8_t len, uint32_t mask){
     return sum;
 }
 // BSD shift checksum 4bit version
-static uint16_t calcBSDchecksum4( uint8_t* bytes, uint8_t len, uint32_t mask){
+static uint16_t calcBSDchecksum4(uint8_t *bytes, uint8_t len, uint32_t mask)
+{
     uint16_t sum = 0;
-    for(uint8_t i = 0; i < len; i++){
+    for (uint8_t i = 0; i < len; i++) {
         sum = ((sum & 0xF) >> 1) | ((sum & 0x1) << 3);   // rotate accumulator
         sum += NIBBLE_HIGH(bytes[i]);  // add high nibble
         sum &= 0xF;  //
@@ -220,7 +241,8 @@ static uint16_t calcBSDchecksum4( uint8_t* bytes, uint8_t len, uint32_t mask){
 }
 
 // measuring LFSR maximum length
-int CmdAnalyseLfsr(const char *Cmd){
+int CmdAnalyseLfsr(const char *Cmd)
+{
 
     uint16_t start_state = 0;  /* Any nonzero start state will work. */
     uint16_t lfsr = start_state;
@@ -230,7 +252,7 @@ int CmdAnalyseLfsr(const char *Cmd){
     uint8_t find = param_get8ex(Cmd, 1, 0, 16);
 
     PrintAndLogEx(NORMAL, "LEGIC LFSR IV 0x%02X: \n", iv);
-    PrintAndLogEx(NORMAL, " bit# | lfsr | ^0x40 |  0x%02X ^ lfsr \n",find);
+    PrintAndLogEx(NORMAL, " bit# | lfsr | ^0x40 |  0x%02X ^ lfsr \n", find);
 
     for (uint8_t i = 0x01; i < 0x30; i += 1) {
         //period = 0;
@@ -238,50 +260,52 @@ int CmdAnalyseLfsr(const char *Cmd){
         legic_prng_forward(i);
         lfsr = legic_prng_get_bits(12);
 
-        PrintAndLogEx(NORMAL, " %02X | %03X | %03X | %03X \n",i, lfsr, 0x40 ^ lfsr, find ^ lfsr);
+        PrintAndLogEx(NORMAL, " %02X | %03X | %03X | %03X \n", i, lfsr, 0x40 ^ lfsr, find ^ lfsr);
     }
     return 0;
 }
-int CmdAnalyseLCR(const char *Cmd) {
+int CmdAnalyseLCR(const char *Cmd)
+{
     uint8_t data[50];
     char cmdp = tolower(param_getchar(Cmd, 0));
-    if (strlen(Cmd) == 0|| cmdp == 'h') return usage_analyse_lcr();
+    if (strlen(Cmd) == 0 || cmdp == 'h') return usage_analyse_lcr();
 
     int len = 0;
     switch (param_gethex_to_eol(Cmd, 0, data, sizeof(data), &len)) {
-    case 1:
-        PrintAndLogEx(WARNING, "Invalid HEX value.");
-        return 1;
-    case 2:
-        PrintAndLogEx(WARNING, "Too many bytes.  Max %d bytes", sizeof(data));
-        return 1;
-    case 3:
-        PrintAndLogEx(WARNING, "Hex must have even number of digits.");
-        return 1;
+        case 1:
+            PrintAndLogEx(WARNING, "Invalid HEX value.");
+            return 1;
+        case 2:
+            PrintAndLogEx(WARNING, "Too many bytes.  Max %d bytes", sizeof(data));
+            return 1;
+        case 3:
+            PrintAndLogEx(WARNING, "Hex must have even number of digits.");
+            return 1;
     }
     uint8_t finalXor = calculateLRC(data, len);
-    PrintAndLogEx(NORMAL, "Target [%02X] requires final LRC XOR byte value: 0x%02X",data[len-1] ,finalXor);
+    PrintAndLogEx(NORMAL, "Target [%02X] requires final LRC XOR byte value: 0x%02X", data[len - 1], finalXor);
     return 0;
 }
-int CmdAnalyseCRC(const char *Cmd) {
+int CmdAnalyseCRC(const char *Cmd)
+{
 
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) == 0 || cmdp == 'h') return usage_analyse_crc();
 
     int len = strlen(Cmd);
-    if ( len & 1 ) return usage_analyse_crc();
+    if (len & 1) return usage_analyse_crc();
 
     // add 1 for null terminator.
-    uint8_t *data = calloc(len+1,  sizeof(uint8_t));
-    if ( !data ) return 1;
+    uint8_t *data = calloc(len + 1,  sizeof(uint8_t));
+    if (!data) return 1;
 
-    if ( param_gethex(Cmd, 0, data, len)) {
+    if (param_gethex(Cmd, 0, data, len)) {
         free(data);
         return usage_analyse_crc();
     }
     len >>= 1;
 
-    PrintAndLogEx(NORMAL, "\nTests with (%d) | %s",len, sprint_hex(data, len));
+    PrintAndLogEx(NORMAL, "\nTests with (%d) | %s", len, sprint_hex(data, len));
 
     // 51  f5  7a  d6
     uint8_t uid[] = {0x51, 0xf5, 0x7a, 0xd6}; //12 34 56
@@ -292,7 +316,7 @@ int CmdAnalyseCRC(const char *Cmd) {
     PrintAndLogEx(NORMAL, "FeliCa | %X ", crc16_xmodem(data, len));
 
     PrintAndLogEx(NORMAL, "\nTests of reflection. Current methods in source code");
-    PrintAndLogEx(NORMAL, "   reflect(0x3e23L,3) is %04X == 0x3e26", reflect(0x3e23L,3) );
+    PrintAndLogEx(NORMAL, "   reflect(0x3e23L,3) is %04X == 0x3e26", reflect(0x3e23L, 3));
     PrintAndLogEx(NORMAL, "       reflect8(0x80) is %02X == 0x01", reflect8(0x80));
     PrintAndLogEx(NORMAL, "    reflect16(0x8000) is %04X == 0x0001", reflect16(0xc6c6));
 
@@ -301,14 +325,14 @@ int CmdAnalyseCRC(const char *Cmd) {
     compute_crc(CRC_14443_B, data, len, &b1, &b2);
     uint16_t crcBB_1 = b1 << 8 | b2;
     uint16_t bbb = crc(CRC_14443_B, data, len);
-    PrintAndLogEx(NORMAL, "ISO14443 crc B  | %04x == %04x \n", crcBB_1, bbb );
+    PrintAndLogEx(NORMAL, "ISO14443 crc B  | %04x == %04x \n", crcBB_1, bbb);
 
 
     // Test of CRC16,  '123456789' string.
     //
 
     PrintAndLogEx(NORMAL, "\n\nStandard test with 31 32 33 34 35 36 37 38 39  '123456789'\n\n");
-    uint8_t dataStr[] = { 0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39 };
+    uint8_t dataStr[] = { 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39 };
     legic8 = CRC8Legic(dataStr, sizeof(dataStr));
 
     //these below has been tested OK.
@@ -323,33 +347,33 @@ int CmdAnalyseCRC(const char *Cmd) {
     // input from commandline
     PrintAndLogEx(NORMAL, "CCITT  | %X (29B1 expected)", crc(CRC_CCITT, dataStr, sizeof(dataStr)));
 
-    uint8_t poll[] = {0xb2,0x4d,0x12,0x01,0x01,0x2e,0x3d,0x17,0x26,0x47,0x80, 0x95,0x00,0xf1,0x00,0x00,0x00,0x01,0x43,0x00,0xb3,0x7f};
-    PrintAndLogEx(NORMAL, "FeliCa | %04X (B37F expected)", crc(CRC_FELICA, poll+2, sizeof(poll)-4));
-    PrintAndLogEx(NORMAL, "FeliCa | %04X (0000 expected)", crc(CRC_FELICA, poll+2, sizeof(poll)-2));
+    uint8_t poll[] = {0xb2, 0x4d, 0x12, 0x01, 0x01, 0x2e, 0x3d, 0x17, 0x26, 0x47, 0x80, 0x95, 0x00, 0xf1, 0x00, 0x00, 0x00, 0x01, 0x43, 0x00, 0xb3, 0x7f};
+    PrintAndLogEx(NORMAL, "FeliCa | %04X (B37F expected)", crc(CRC_FELICA, poll + 2, sizeof(poll) - 4));
+    PrintAndLogEx(NORMAL, "FeliCa | %04X (0000 expected)", crc(CRC_FELICA, poll + 2, sizeof(poll) - 2));
 
     uint8_t sel_corr[] = { 0x40, 0xe1, 0xe1, 0xff, 0xfe, 0x5f, 0x02, 0x3c, 0x43, 0x01};
-    PrintAndLogEx(NORMAL, "iCLASS | %04x (0143 expected)", crc(CRC_ICLASS, sel_corr, sizeof(sel_corr)-2));
+    PrintAndLogEx(NORMAL, "iCLASS | %04x (0143 expected)", crc(CRC_ICLASS, sel_corr, sizeof(sel_corr) - 2));
     PrintAndLogEx(NORMAL, "---------------------------------------------------------------\n\n\n");
 
     // ISO14443 crc A
     compute_crc(CRC_14443_A, dataStr, sizeof(dataStr), &b1, &b2);
     uint16_t crcAA = b1 << 8 | b2;
-    PrintAndLogEx(NORMAL, "ISO14443 crc A  | %04x or %04x (BF05 expected)\n", crcAA, crc(CRC_14443_A, dataStr, sizeof(dataStr)) );
+    PrintAndLogEx(NORMAL, "ISO14443 crc A  | %04x or %04x (BF05 expected)\n", crcAA, crc(CRC_14443_A, dataStr, sizeof(dataStr)));
 
     // ISO14443 crc B
     compute_crc(CRC_14443_B, dataStr, sizeof(dataStr), &b1, &b2);
     uint16_t crcBB = b1 << 8 | b2;
-    PrintAndLogEx(NORMAL, "ISO14443 crc B  | %04x or %04x (906E expected)\n", crcBB, crc(CRC_14443_B, dataStr, sizeof(dataStr)) );
+    PrintAndLogEx(NORMAL, "ISO14443 crc B  | %04x or %04x (906E expected)\n", crcBB, crc(CRC_14443_B, dataStr, sizeof(dataStr)));
 
     // ISO15693 crc  (x.25)
     compute_crc(CRC_15693, dataStr, sizeof(dataStr), &b1, &b2);
     uint16_t crcCC = b1 << 8 | b2;
-    PrintAndLogEx(NORMAL, "ISO15693 crc X25| %04x or %04x (906E expected)\n", crcCC, crc(CRC_15693, dataStr, sizeof(dataStr)) );
+    PrintAndLogEx(NORMAL, "ISO15693 crc X25| %04x or %04x (906E expected)\n", crcCC, crc(CRC_15693, dataStr, sizeof(dataStr)));
 
     // ICLASS
     compute_crc(CRC_ICLASS, dataStr, sizeof(dataStr), &b1, &b2);
     uint16_t crcDD = b1 << 8 | b2;
-    PrintAndLogEx(NORMAL, "ICLASS crc      | %04x or %04x\n", crcDD, crc(CRC_ICLASS, dataStr, sizeof(dataStr)) );
+    PrintAndLogEx(NORMAL, "ICLASS crc      | %04x or %04x\n", crcDD, crc(CRC_ICLASS, dataStr, sizeof(dataStr)));
 
     // FeliCa
     compute_crc(CRC_FELICA, dataStr, sizeof(dataStr), &b1, &b2);
@@ -359,7 +383,8 @@ int CmdAnalyseCRC(const char *Cmd) {
     free(data);
     return 0;
 }
-int CmdAnalyseCHKSUM(const char *Cmd){
+int CmdAnalyseCHKSUM(const char *Cmd)
+{
 
     uint8_t data[50];
     uint8_t cmdp = 0;
@@ -369,36 +394,36 @@ int CmdAnalyseCHKSUM(const char *Cmd){
     int len = 0;
     memset(data, 0x0, sizeof(data));
 
-    while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-        switch(param_getchar(Cmd, cmdp)) {
-        case 'b':
-        case 'B':
-            param_gethex_ex(Cmd, cmdp+1, data, &len);
-            if ( len%2 ) errors = true;
-            len >>= 1;
-            cmdp += 2;
-            break;
-        case 'm':
-        case 'M':
-            mask = param_get32ex(Cmd, cmdp+1, 0, 16);
-            cmdp += 2;
-            break;
-        case 'v':
-        case 'V':
-            useHeader = true;
-            cmdp++;
-            break;
-        case 'h':
-        case 'H':
-            return usage_analyse_checksum();
-        default:
-            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-            errors = true;
-            break;
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (param_getchar(Cmd, cmdp)) {
+            case 'b':
+            case 'B':
+                param_gethex_ex(Cmd, cmdp + 1, data, &len);
+                if (len % 2) errors = true;
+                len >>= 1;
+                cmdp += 2;
+                break;
+            case 'm':
+            case 'M':
+                mask = param_get32ex(Cmd, cmdp + 1, 0, 16);
+                cmdp += 2;
+                break;
+            case 'v':
+            case 'V':
+                useHeader = true;
+                cmdp++;
+                break;
+            case 'h':
+            case 'H':
+                return usage_analyse_checksum();
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                errors = true;
+                break;
         }
     }
     //Validations
-    if (errors || cmdp == 0 ) return usage_analyse_checksum();
+    if (errors || cmdp == 0) return usage_analyse_checksum();
 
     if (useHeader) {
         PrintAndLogEx(NORMAL, "     add          | sub         | add 1's compl    | sub 1's compl   | xor");
@@ -407,51 +432,53 @@ int CmdAnalyseCHKSUM(const char *Cmd){
     }
     PrintAndLogEx(NORMAL, "0x%X 0x%X   0x%X  | 0x%X 0x%X   | 0x%X 0x%X   0x%X | 0x%X 0x%X       | 0x%X 0x%X   0x%X  | 0x%X  0x%X |\n",
                   calcSumByteAdd(data, len, mask)
-                , calcSumNibbleAdd(data, len, mask)
-                , calcSumCrumbAdd(data, len, mask)
-                , calcSumByteSub(data, len, mask)
-                , calcSumNibbleSub(data, len, mask)
-                , calcSumByteAddOnes(data, len, mask)
-                , calcSumNibbleAddOnes(data, len, mask)
-                , calcSumCrumbAddOnes(data, len, mask)
-                , calcSumByteSubOnes(data, len, mask)
-                , calcSumNibbleSubOnes(data, len, mask)
-                , calcSumByteXor(data, len, mask)
-                , calcSumNibbleXor(data, len, mask)
-                , calcSumCrumbXor(data, len, mask)
-                , calcBSDchecksum8(data, len, mask)
-                , calcBSDchecksum4(data, len, mask)
-            );
+                  , calcSumNibbleAdd(data, len, mask)
+                  , calcSumCrumbAdd(data, len, mask)
+                  , calcSumByteSub(data, len, mask)
+                  , calcSumNibbleSub(data, len, mask)
+                  , calcSumByteAddOnes(data, len, mask)
+                  , calcSumNibbleAddOnes(data, len, mask)
+                  , calcSumCrumbAddOnes(data, len, mask)
+                  , calcSumByteSubOnes(data, len, mask)
+                  , calcSumNibbleSubOnes(data, len, mask)
+                  , calcSumByteXor(data, len, mask)
+                  , calcSumNibbleXor(data, len, mask)
+                  , calcSumCrumbXor(data, len, mask)
+                  , calcBSDchecksum8(data, len, mask)
+                  , calcBSDchecksum4(data, len, mask)
+                 );
     return 0;
 }
 
-int CmdAnalyseDates(const char *Cmd){
+int CmdAnalyseDates(const char *Cmd)
+{
     // look for datestamps in a given array of bytes
     PrintAndLogEx(NORMAL, "To be implemented. Feel free to contribute!");
     return 0;
 }
-int CmdAnalyseTEASelfTest(const char *Cmd){
+int CmdAnalyseTEASelfTest(const char *Cmd)
+{
 
     uint8_t v[8], v_le[8];
     memset(v, 0x00, sizeof(v));
     memset(v_le, 0x00, sizeof(v_le));
-    uint8_t* v_ptr = v_le;
+    uint8_t *v_ptr = v_le;
 
     uint8_t cmdlen = strlen(Cmd);
-    cmdlen = ( sizeof(v)<<2 < cmdlen ) ? sizeof(v)<<2 : cmdlen;
+    cmdlen = (sizeof(v) << 2 < cmdlen) ? sizeof(v) << 2 : cmdlen;
 
-    if ( param_gethex(Cmd, 0, v, cmdlen) > 0 ){
+    if (param_gethex(Cmd, 0, v, cmdlen) > 0) {
         PrintAndLogEx(WARNING, "Can't read hex chars, uneven? :: %u", cmdlen);
         return 1;
     }
 
-    SwapEndian64ex(v , 8, 4, v_ptr);
+    SwapEndian64ex(v, 8, 4, v_ptr);
 
     // ENCRYPTION KEY:
-    uint8_t key[16] = {0x55,0xFE,0xF6,0x30,0x62,0xBF,0x0B,0xC1,0xC9,0xB3,0x7C,0x34,0x97,0x3E,0x29,0xFB };
+    uint8_t key[16] = {0x55, 0xFE, 0xF6, 0x30, 0x62, 0xBF, 0x0B, 0xC1, 0xC9, 0xB3, 0x7C, 0x34, 0x97, 0x3E, 0x29, 0xFB };
     uint8_t keyle[16];
-    uint8_t* key_ptr = keyle;
-    SwapEndian64ex(key , sizeof(key), 4, key_ptr);
+    uint8_t *key_ptr = keyle;
+    SwapEndian64ex(key, sizeof(key), 4, key_ptr);
 
     PrintAndLogEx(NORMAL, "TEST LE enc| %s", sprint_hex(v_ptr, 8));
 
@@ -465,7 +492,8 @@ int CmdAnalyseTEASelfTest(const char *Cmd){
     return 0;
 }
 
-char* pb(uint32_t b) {
+char *pb(uint32_t b)
+{
     static char buf1[33] = {0};
     static char buf2[33] = {0};
     static char *s;
@@ -478,14 +506,15 @@ char* pb(uint32_t b) {
     memset(s, 0, sizeof(buf1));
 
     uint32_t mask = 0x80000000;
-    for (uint8_t i=0; i<32;i++) {
-        s[i] = (mask & b)?'1':'0';
+    for (uint8_t i = 0; i < 32; i++) {
+        s[i] = (mask & b) ? '1' : '0';
         mask >>= 1;
     }
     return s;
 }
 
-int CmdAnalyseA(const char *Cmd){
+int CmdAnalyseA(const char *Cmd)
+{
 
     int hexlen = 0;
     uint8_t cmdp = 0;
@@ -494,24 +523,24 @@ int CmdAnalyseA(const char *Cmd){
 
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
-        case 'd':
-            param_gethex_ex(Cmd, cmdp+1, data, &hexlen);
-            hexlen >>= 1;
-            if ( hexlen != sizeof(data) ) {
-                PrintAndLogEx(WARNING, "Read %d bytes of %u", hexlen, sizeof(data) );
-            }
-            cmdp += 2;
-            break;
-        case 'h':
-            return usage_analyse_a();
-        default:
-            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-            errors = true;
-            break;
+            case 'd':
+                param_gethex_ex(Cmd, cmdp + 1, data, &hexlen);
+                hexlen >>= 1;
+                if (hexlen != sizeof(data)) {
+                    PrintAndLogEx(WARNING, "Read %d bytes of %u", hexlen, sizeof(data));
+                }
+                cmdp += 2;
+                break;
+            case 'h':
+                return usage_analyse_a();
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                errors = true;
+                break;
         }
     }
     //Validations
-    if (errors || cmdp == 0 ) return usage_analyse_a();
+    if (errors || cmdp == 0) return usage_analyse_a();
 
 
     UsbCommand c = {CMD_FPC_SEND, {0, 0, 0}};
@@ -536,7 +565,7 @@ int CmdAnalyseA(const char *Cmd){
     // Sequence X followed by Sequence Y followed by Sequence Z     (111100x1 11111111 00x11111)
     // we therefore look for a ...xx1111 11111111 00x11111xxxxxx... pattern
     // (12 '1's followed by 2 '0's, eventually followed by another '0', followed by 5 '1's)
-    # define SYNC_16BIT 0xB24D
+# define SYNC_16BIT 0xB24D
     uint32_t shiftReg = param_get32ex(Cmd, 0, 0xb24d, 16);
     uint8_t bt = param_get8ex(Cmd, 1, 0xBB, 16);
     uint8_t byte_offset = 99;
@@ -550,100 +579,100 @@ int CmdAnalyseA(const char *Cmd){
 
     uint8_t n0 = 0, n1 = 0;
 
-    n0 = (rev & (uint8_t)(~(0xFF >> (8-4)))) >> 4;
+    n0 = (rev & (uint8_t)(~(0xFF >> (8 - 4)))) >> 4;
     n1 = (n1 << 4) | (rev & (uint8_t)(~(0xFF << 4)));
 
-    PrintAndLogEx(NORMAL, "rev %02X | %02X %s | %02X %s |\n", rev, n0, pb(n0), n1, pb(n1) );
+    PrintAndLogEx(NORMAL, "rev %02X | %02X %s | %02X %s |\n", rev, n0, pb(n0), n1, pb(n1));
 
-/*
-hex(0xb24d shr 0) 0xB24D 0b1011001001001101
-hex(0xb24d shr 1) 0x5926
-hex(0xb24d shr 2) 0x2C93
-*/
+    /*
+    hex(0xb24d shr 0) 0xB24D 0b1011001001001101
+    hex(0xb24d shr 1) 0x5926
+    hex(0xb24d shr 2) 0x2C93
+    */
 
-for ( int i =0; i< 16; i++) {
-    PrintAndLogEx(NORMAL, " (shiftReg >> %d) & 0xFFFF ==  %08x ---", i, (( shiftReg >> i) & 0xFFFF ));
+    for (int i = 0; i < 16; i++) {
+        PrintAndLogEx(NORMAL, " (shiftReg >> %d) & 0xFFFF ==  %08x ---", i, ((shiftReg >> i) & 0xFFFF));
 
-    // kolla om SYNC_PATTERN finns.
-    if ((( shiftReg >> 7) & 0xFFFF ) == SYNC_16BIT) byte_offset = 7;
-    else if ((( shiftReg >> 6) & 0xFFFF ) == SYNC_16BIT) byte_offset = 6;
-    else if ((( shiftReg >> 5) & 0xFFFF ) == SYNC_16BIT) byte_offset = 5;
-    else if ((( shiftReg >> 4) & 0xFFFF ) == SYNC_16BIT) byte_offset = 4;
-    else if ((( shiftReg >> 3) & 0xFFFF ) == SYNC_16BIT) byte_offset = 3;
-    else if ((( shiftReg >> 2) & 0xFFFF ) == SYNC_16BIT) byte_offset = 2;
-    else if ((( shiftReg >> 1) & 0xFFFF ) == SYNC_16BIT) byte_offset = 1;
-    else if ((( shiftReg >> 0) & 0xFFFF ) == SYNC_16BIT) byte_offset = 0;
+        // kolla om SYNC_PATTERN finns.
+        if (((shiftReg >> 7) & 0xFFFF) == SYNC_16BIT) byte_offset = 7;
+        else if (((shiftReg >> 6) & 0xFFFF) == SYNC_16BIT) byte_offset = 6;
+        else if (((shiftReg >> 5) & 0xFFFF) == SYNC_16BIT) byte_offset = 5;
+        else if (((shiftReg >> 4) & 0xFFFF) == SYNC_16BIT) byte_offset = 4;
+        else if (((shiftReg >> 3) & 0xFFFF) == SYNC_16BIT) byte_offset = 3;
+        else if (((shiftReg >> 2) & 0xFFFF) == SYNC_16BIT) byte_offset = 2;
+        else if (((shiftReg >> 1) & 0xFFFF) == SYNC_16BIT) byte_offset = 1;
+        else if (((shiftReg >> 0) & 0xFFFF) == SYNC_16BIT) byte_offset = 0;
 
-    PrintAndLogEx(NORMAL, "Offset  %u \n", byte_offset);
-    if ( byte_offset != 99 )
-        break;
+        PrintAndLogEx(NORMAL, "Offset  %u \n", byte_offset);
+        if (byte_offset != 99)
+            break;
 
-    shiftReg >>=1;
-}
+        shiftReg >>= 1;
+    }
 
     uint8_t p1 = (rev & (uint8_t)(~(0xFF << byte_offset)));
-    PrintAndLogEx(NORMAL, "Offset  %u  | leftovers  %02x  %s \n", byte_offset, p1, pb(p1) );
+    PrintAndLogEx(NORMAL, "Offset  %u  | leftovers  %02x  %s \n", byte_offset, p1, pb(p1));
 
 
 
     /*
-pm3 --> da hex2bin 4db2     0100110110110010
-*/
-    return 0;
-/*
-    // split byte into two parts.
-    uint8_t offset = 3, n0 = 0, n1 = 0;
-    rev = 0xB2;
-    for (uint8_t m=0; m<8; m++) {
-        offset = m;
-        n0 = (rev & (uint8_t)(~(0xFF >> (8-offset)))) >> offset;
-        n1 = (n1 << offset) | (rev & (uint8_t)(~(0xFF << offset)));
-
-        PrintAndLogEx(NORMAL, "rev %02X | %02X %s | %02X %s |\n", rev, n0, pb(n0), n1, pb(n1) );
-        n0 = 0, n1 = 0;
-        // PrintAndLogEx(NORMAL, " (0xFF >> offset) == %s |\n", pb( (0xFF >> offset)) );
-        //PrintAndLogEx(NORMAL, "~(0xFF >> (8-offset)) == %s |\n", pb(  (uint8_t)(~(0xFF >> (8-offset))) ) );
-        //PrintAndLogEx(NORMAL, " rev & xxx == %s\n\n", pb( (rev & (uint8_t)(~(0xFF << offset))) ));
-    }
-return 0;
-    // from A  -- x bits into B and the rest into C.
-
-    for ( uint8_t i=0; i<8; i++){
-        PrintAndLogEx(NORMAL, "%u | %02X %s | %02X %s |\n", i, a, pb(a), b, pb(b) );
-        b = a & (a & (0xFF >> (8-i)));
-        a >>=1;
-    }
-
+    pm3 --> da hex2bin 4db2     0100110110110010
     */
     return 0;
+    /*
+        // split byte into two parts.
+        uint8_t offset = 3, n0 = 0, n1 = 0;
+        rev = 0xB2;
+        for (uint8_t m=0; m<8; m++) {
+            offset = m;
+            n0 = (rev & (uint8_t)(~(0xFF >> (8-offset)))) >> offset;
+            n1 = (n1 << offset) | (rev & (uint8_t)(~(0xFF << offset)));
+
+            PrintAndLogEx(NORMAL, "rev %02X | %02X %s | %02X %s |\n", rev, n0, pb(n0), n1, pb(n1) );
+            n0 = 0, n1 = 0;
+            // PrintAndLogEx(NORMAL, " (0xFF >> offset) == %s |\n", pb( (0xFF >> offset)) );
+            //PrintAndLogEx(NORMAL, "~(0xFF >> (8-offset)) == %s |\n", pb(  (uint8_t)(~(0xFF >> (8-offset))) ) );
+            //PrintAndLogEx(NORMAL, " rev & xxx == %s\n\n", pb( (rev & (uint8_t)(~(0xFF << offset))) ));
+        }
+    return 0;
+        // from A  -- x bits into B and the rest into C.
+
+        for ( uint8_t i=0; i<8; i++){
+            PrintAndLogEx(NORMAL, "%u | %02X %s | %02X %s |\n", i, a, pb(a), b, pb(b) );
+            b = a & (a & (0xFF >> (8-i)));
+            a >>=1;
+        }
+
+        */
+    return 0;
 
     // 14443-A
     uint8_t u14_c[] = {0x09, 0x78, 0x00, 0x92, 0x02, 0x54, 0x13, 0x02, 0x04, 0x2d, 0xe8 }; // atqs w crc
     uint8_t u14_w[] = {0x09, 0x78, 0x00, 0x92, 0x02, 0x54, 0x13, 0x02, 0x04, 0x2d, 0xe7 }; // atqs w crc
-    PrintAndLogEx(FAILED, "14a check wrong crc      | %s\n", (check_crc(CRC_14443_A, u14_w, sizeof(u14_w))) ? "YES": "NO" );
-    PrintAndLogEx(SUCCESS, "14a check correct crc    | %s\n", (check_crc(CRC_14443_A, u14_c, sizeof(u14_c))) ? "YES": "NO" );
+    PrintAndLogEx(FAILED, "14a check wrong crc      | %s\n", (check_crc(CRC_14443_A, u14_w, sizeof(u14_w))) ? "YES" : "NO");
+    PrintAndLogEx(SUCCESS, "14a check correct crc    | %s\n", (check_crc(CRC_14443_A, u14_c, sizeof(u14_c))) ? "YES" : "NO");
 
     // 14443-B
-    uint8_t u14b[] = {0x05,0x00,0x08,0x39,0x73};
-    PrintAndLogEx(NORMAL, "14b check crc            | %s\n", (check_crc(CRC_14443_B, u14b, sizeof(u14b))) ? "YES": "NO");
+    uint8_t u14b[] = {0x05, 0x00, 0x08, 0x39, 0x73};
+    PrintAndLogEx(NORMAL, "14b check crc            | %s\n", (check_crc(CRC_14443_B, u14b, sizeof(u14b))) ? "YES" : "NO");
 
     // 15693 test
-    uint8_t u15_c[] = {0x05,0x00,0x08,0x39,0x73}; // correct
-    uint8_t u15_w[] = {0x05,0x00,0x08,0x39,0x72}; // wrong
-    PrintAndLogEx(FAILED, "15 check wrong crc       | %s\n", (check_crc(CRC_15693, u15_w, sizeof(u15_w))) ? "YES": "NO");
-    PrintAndLogEx(SUCCESS, "15 check correct crc     | %s\n", (check_crc(CRC_15693, u15_c, sizeof(u15_c))) ? "YES": "NO");
+    uint8_t u15_c[] = {0x05, 0x00, 0x08, 0x39, 0x73}; // correct
+    uint8_t u15_w[] = {0x05, 0x00, 0x08, 0x39, 0x72}; // wrong
+    PrintAndLogEx(FAILED, "15 check wrong crc       | %s\n", (check_crc(CRC_15693, u15_w, sizeof(u15_w))) ? "YES" : "NO");
+    PrintAndLogEx(SUCCESS, "15 check correct crc     | %s\n", (check_crc(CRC_15693, u15_c, sizeof(u15_c))) ? "YES" : "NO");
 
     // iCLASS test - wrong crc , swapped bytes.
     uint8_t iclass_w[] = { 0x40, 0xe1, 0xe1, 0xff, 0xfe, 0x5f, 0x02, 0x3c, 0x01, 0x43};
     uint8_t iclass_c[] = { 0x40, 0xe1, 0xe1, 0xff, 0xfe, 0x5f, 0x02, 0x3c, 0x43, 0x01};
-    PrintAndLogEx(FAILED, "iCLASS check wrong crc   | %s\n", (check_crc(CRC_ICLASS, iclass_w, sizeof(iclass_w))) ? "YES": "NO");
-    PrintAndLogEx(SUCCESS, "iCLASS check correct crc | %s\n", (check_crc(CRC_ICLASS, iclass_c, sizeof(iclass_c))) ? "YES": "NO");
+    PrintAndLogEx(FAILED, "iCLASS check wrong crc   | %s\n", (check_crc(CRC_ICLASS, iclass_w, sizeof(iclass_w))) ? "YES" : "NO");
+    PrintAndLogEx(SUCCESS, "iCLASS check correct crc | %s\n", (check_crc(CRC_ICLASS, iclass_c, sizeof(iclass_c))) ? "YES" : "NO");
 
     // FeliCa test
-    uint8_t felica_w[] = {0x12,0x01,0x01,0x2e,0x3d,0x17,0x26,0x47,0x80, 0x95,0x00,0xf1,0x00,0x00,0x00,0x01,0x43,0x00,0xb3,0x7e};
-    uint8_t felica_c[] = {0x12,0x01,0x01,0x2e,0x3d,0x17,0x26,0x47,0x80, 0x95,0x00,0xf1,0x00,0x00,0x00,0x01,0x43,0x00,0xb3,0x7f};
-    PrintAndLogEx(FAILED, "FeliCa check wrong crc   | %s\n", (check_crc(CRC_FELICA, felica_w, sizeof(felica_w))) ? "YES": "NO");
-    PrintAndLogEx(SUCCESS, "FeliCa check correct crc | %s\n", (check_crc(CRC_FELICA, felica_c, sizeof(felica_c))) ? "YES": "NO");
+    uint8_t felica_w[] = {0x12, 0x01, 0x01, 0x2e, 0x3d, 0x17, 0x26, 0x47, 0x80, 0x95, 0x00, 0xf1, 0x00, 0x00, 0x00, 0x01, 0x43, 0x00, 0xb3, 0x7e};
+    uint8_t felica_c[] = {0x12, 0x01, 0x01, 0x2e, 0x3d, 0x17, 0x26, 0x47, 0x80, 0x95, 0x00, 0xf1, 0x00, 0x00, 0x00, 0x01, 0x43, 0x00, 0xb3, 0x7f};
+    PrintAndLogEx(FAILED, "FeliCa check wrong crc   | %s\n", (check_crc(CRC_FELICA, felica_w, sizeof(felica_w))) ? "YES" : "NO");
+    PrintAndLogEx(SUCCESS, "FeliCa check correct crc | %s\n", (check_crc(CRC_FELICA, felica_c, sizeof(felica_c))) ? "YES" : "NO");
 
     PrintAndLogEx(NORMAL, "\n\n");
 
@@ -687,27 +716,35 @@ return 0;
 //uint64_t d1[] = {0x6e442129, 0x8f699195, 0x0000001, 0x090d0b0305020f02};
 //uint64_t d2[] = {0x6e442129, 0x8f699195, 0x0000004, 0x00040f0f0305030e};
 
-/*
-uid(3e172b29) nt(039b7bd2) ks(0c0e0f0505080800) nr(00000001)
-uid(3e172b29) nt(039b7bd2) ks(0e06090d03000b0f) nr(00000002)
-*/
+    /*
+    uid(3e172b29) nt(039b7bd2) ks(0c0e0f0505080800) nr(00000001)
+    uid(3e172b29) nt(039b7bd2) ks(0e06090d03000b0f) nr(00000002)
+    */
     uint64_t *keylistA = NULL, *keylistB = NULL;
     uint32_t keycountA = 0, keycountB = 0;
 //  uint64_t d1[] = {0x3e172b29, 0x039b7bd2, 0x0000001, 0, 0x0c0e0f0505080800};
 //  uint64_t d2[] = {0x3e172b29, 0x039b7bd2, 0x0000002, 0, 0x0e06090d03000b0f};
-uint64_t d1[] = {0x6e442129, 0x8f699195, 0x0000001, 0, 0x090d0b0305020f02};
-uint64_t d2[] = {0x6e442129, 0x8f699195, 0x0000004, 0, 0x00040f0f0305030e};
+    uint64_t d1[] = {0x6e442129, 0x8f699195, 0x0000001, 0, 0x090d0b0305020f02};
+    uint64_t d2[] = {0x6e442129, 0x8f699195, 0x0000004, 0, 0x00040f0f0305030e};
 
-    keycountA = nonce2key(d1[0], d1[1], d1[2], 0, d1[3], d1[4] ,&keylistA);
+    keycountA = nonce2key(d1[0], d1[1], d1[2], 0, d1[3], d1[4], &keylistA);
     keycountB = nonce2key(d2[0], d2[1], d2[2], 0, d2[3], d2[4], &keylistB);
 
     switch (keycountA) {
-        case 0: PrintAndLogEx(FAILED, "Key test A failed\n"); break;
-        case 1: PrintAndLogEx(SUCCESS, "KEY A | %012" PRIX64 " ", keylistA[0]); break;
+        case 0:
+            PrintAndLogEx(FAILED, "Key test A failed\n");
+            break;
+        case 1:
+            PrintAndLogEx(SUCCESS, "KEY A | %012" PRIX64 " ", keylistA[0]);
+            break;
     }
     switch (keycountB) {
-        case 0: PrintAndLogEx(FAILED, "Key test B failed\n"); break;
-        case 1: PrintAndLogEx(SUCCESS, "KEY B | %012" PRIX64 " ", keylistB[0]); break;
+        case 0:
+            PrintAndLogEx(FAILED, "Key test B failed\n");
+            break;
+        case 1:
+            PrintAndLogEx(SUCCESS, "KEY B | %012" PRIX64 " ", keylistB[0]);
+            break;
     }
 
     free(keylistA);
@@ -843,7 +880,8 @@ uint64_t d2[] = {0x6e442129, 0x8f699195, 0x0000004, 0, 0x00040f0f0305030e};
     return 0;
 }
 
-void generate4bNUID(uint8_t *uid, uint8_t *nuid){
+void generate4bNUID(uint8_t *uid, uint8_t *nuid)
+{
     uint16_t crc;
     uint8_t b1, b2;
 
@@ -857,12 +895,13 @@ void generate4bNUID(uint8_t *uid, uint8_t *nuid){
     nuid[3] = crc & 0xFF;
 }
 
-int CmdAnalyseNuid(const char *Cmd){
+int CmdAnalyseNuid(const char *Cmd)
+{
     uint8_t nuid[4] = {0};
     uint8_t uid[7] = {0};
     int len = 0;
     char cmdp = tolower(param_getchar(Cmd, 0));
-    if (strlen(Cmd) == 0|| cmdp == 'h') return usage_analyse_nuid();
+    if (strlen(Cmd) == 0 || cmdp == 'h') return usage_analyse_nuid();
 
     /* src: https://www.nxp.com/docs/en/application-note/AN10927.pdf */
     /* selftest1  UID 040D681AB52281  -> NUID 8F430FEF */
@@ -872,7 +911,7 @@ int CmdAnalyseNuid(const char *Cmd){
         generate4bNUID(uid, nuid);
 
         bool test1 = (0 == memcmp(nuid, "\x8f\x43\x0f\xef", 4));
-        PrintAndLogEx(SUCCESS, "Selftest1 %s\n",  test1 ? _GREEN_(OK): _RED_(Fail));
+        PrintAndLogEx(SUCCESS, "Selftest1 %s\n",  test1 ? _GREEN_(OK) : _RED_(Fail));
 
         memcpy(uid, "\x04\x18\x3f\x09\x32\x1b\x85", 7);
         generate4bNUID(uid, nuid);
@@ -882,7 +921,7 @@ int CmdAnalyseNuid(const char *Cmd){
     }
 
     param_gethex_ex(Cmd, 0, uid, &len);
-    if ( len%2  || len != 14) return usage_analyse_nuid();
+    if (len % 2  || len != 14) return usage_analyse_nuid();
 
     generate4bNUID(uid, nuid);
 
@@ -903,13 +942,15 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdAnalyse(const char *Cmd) {
+int CmdAnalyse(const char *Cmd)
+{
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
+int CmdHelp(const char *Cmd)
+{
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdcrc.c b/client/cmdcrc.c
index 38d5a2005..eb46a524d 100644
--- a/client/cmdcrc.c
+++ b/client/cmdcrc.c
@@ -11,17 +11,18 @@
 
 #define MAX_ARGS 20
 
-int split(char *str, char *arr[MAX_ARGS]){
+int split(char *str, char *arr[MAX_ARGS])
+{
     int beginIndex = 0;
     int endIndex;
     int maxWords = MAX_ARGS;
     int wordCnt = 0;
 
-    while(1){
-        while(isspace(str[beginIndex])) {
+    while (1) {
+        while (isspace(str[beginIndex])) {
             ++beginIndex;
         }
-        if(str[beginIndex] == '\0') {
+        if (str[beginIndex] == '\0') {
             break;
         }
         endIndex = beginIndex;
@@ -39,7 +40,8 @@ int split(char *str, char *arr[MAX_ARGS]){
     return wordCnt;
 }
 
-int CmdCrc(const char *Cmd) {
+int CmdCrc(const char *Cmd)
+{
     char name[] = {"reveng "};
     char Cmd2[100 + 7];
     memcpy(Cmd2, name, 7);
@@ -52,7 +54,7 @@ int CmdCrc(const char *Cmd) {
     } else {
         reveng_main(argc, argv);
     }
-    for(int i = 0; i < argc; ++i) {
+    for (int i = 0; i < argc; ++i) {
         free(argv[i]);
     }
     return 0;
@@ -60,7 +62,8 @@ int CmdCrc(const char *Cmd) {
 
 //returns array of model names and the count of models returning
 //  as well as a width array for the width of each model
-int GetModels(char *Models[], int *count, uint8_t *width){
+int GetModels(char *Models[], int *count, uint8_t *width)
+{
     /* default values */
     static model_t model = MZERO;
 
@@ -70,9 +73,9 @@ int GetModels(char *Models[], int *count, uint8_t *width){
     model_t pset = model, *candmods, *mptr;
 
     /* stdin must be binary */
-    #ifdef _WIN32
-        _setmode(STDIN_FILENO, _O_BINARY);
-    #endif /* _WIN32 */
+#ifdef _WIN32
+    _setmode(STDIN_FILENO, _O_BINARY);
+#endif /* _WIN32 */
 
     SETBMP();
 
@@ -80,7 +83,7 @@ int GetModels(char *Models[], int *count, uint8_t *width){
     int Cnt = 0;
     if (width[0] == 0) { //reveng -D
         *count = mcount();
-        if (!*count){
+        if (!*count) {
             PrintAndLogEx(WARNING, "no preset models available");
             return 0;
         }
@@ -88,8 +91,8 @@ int GetModels(char *Models[], int *count, uint8_t *width){
             mbynum(&model, mode);
             mcanon(&model);
             size_t size = (model.name && *model.name) ? strlen(model.name) : 7;
-            char *tmp = calloc(size+1, sizeof(char));
-            if (tmp==NULL){
+            char *tmp = calloc(size + 1, sizeof(char));
+            if (tmp == NULL) {
                 PrintAndLogEx(WARNING, "out of memory?");
                 return 0;
             }
@@ -100,9 +103,9 @@ int GetModels(char *Models[], int *count, uint8_t *width){
         mfree(&model);
     } else { //reveng -s
 
-        if (~model.flags & P_MULXN){
-             PrintAndLogEx(WARNING, "cannot search for non-Williams compliant models");
-             return 0;
+        if (~model.flags & P_MULXN) {
+            PrintAndLogEx(WARNING, "cannot search for non-Williams compliant models");
+            return 0;
         }
         praloc(&model.spoly, (unsigned long)width[0]);
         praloc(&model.init, (unsigned long)width[0]);
@@ -133,7 +136,7 @@ int GetModels(char *Models[], int *count, uint8_t *width){
                     mbynum(&pset, --psets);
 
                     /* skip if different width, or refin or refout don't match */
-                    if( plen(pset.spoly) != width[0] || (model.flags ^ pset.flags) & (P_REFIN | P_REFOUT))
+                    if (plen(pset.spoly) != width[0] || (model.flags ^ pset.flags) & (P_REFIN | P_REFOUT))
                         continue;
                     /* skip if the preset doesn't match specified parameters */
                     if (rflags & R_HAVEP && pcmp(&model.spoly, &pset.spoly))
@@ -167,8 +170,8 @@ int GetModels(char *Models[], int *count, uint8_t *width){
 
                         size_t size = (pset.name && *pset.name) ? strlen(pset.name) : 7;
                         //PrintAndLogEx(NORMAL, "Size: %d, %s, count: %d",size,pset.name, Cnt);
-                        char *tmp = calloc(size+1, sizeof(char));
-                        if (tmp == NULL){
+                        char *tmp = calloc(size + 1, sizeof(char));
+                        if (tmp == NULL) {
                             PrintAndLogEx(WARNING, "out of memory?");
                             return 0;
                         }
@@ -197,12 +200,12 @@ int GetModels(char *Models[], int *count, uint8_t *width){
                 pfree(qptr);
             }
         }
-        if(uflags & C_NOBFS && ~rflags & R_HAVEP) {
+        if (uflags & C_NOBFS && ~rflags & R_HAVEP) {
             PrintAndLogEx(WARNING, "no models found");
             return 0;
         }
 
-        if (!(model.flags & P_REFIN) != !(model.flags & P_REFOUT)){
+        if (!(model.flags & P_REFIN) != !(model.flags & P_REFOUT)) {
             PrintAndLogEx(WARNING, "cannot search for crossed-endian models");
             return 0;
         }
@@ -230,7 +233,7 @@ int GetModels(char *Models[], int *count, uint8_t *width){
         free(apolys);
         mfree(&model);
 
-        if (~uflags & C_RESULT){
+        if (~uflags & C_RESULT) {
             PrintAndLogEx(WARNING, "no models found");
             return 0;
         }
@@ -245,7 +248,8 @@ int GetModels(char *Models[], int *count, uint8_t *width){
 //endian = {0 = calc default endian input and output, b = big endian input and output, B = big endian output, r = right justified
 //          l = little endian input and output, L = little endian output only, t = left justified}
 //result = calculated crc hex string
-int RunModel(char *inModel, char *inHexStr, bool reverse, char endian, char *result){
+int RunModel(char *inModel, char *inHexStr, bool reverse, char endian, char *result)
+{
     /* default values */
     static model_t model = MZERO;
 
@@ -257,9 +261,9 @@ int RunModel(char *inModel, char *inHexStr, bool reverse, char endian, char *res
     char *string;
 
     // stdin must be binary
-    #ifdef _WIN32
-        _setmode(STDIN_FILENO, _O_BINARY);
-    #endif /* _WIN32 */
+#ifdef _WIN32
+    _setmode(STDIN_FILENO, _O_BINARY);
+#endif /* _WIN32 */
 
     SETBMP();
     //set model
@@ -268,7 +272,7 @@ int RunModel(char *inModel, char *inHexStr, bool reverse, char endian, char *res
         PrintAndLogEx(WARNING, "error: preset model '%s' not found.  Use reveng -D to list presets. [%d]", inModel, c);
         return 0;
     }
-    if (c < 0){
+    if (c < 0) {
         PrintAndLogEx(WARNING, "no preset models available");
         return 0;
     }
@@ -279,24 +283,24 @@ int RunModel(char *inModel, char *inHexStr, bool reverse, char endian, char *res
         case 'b': /* b  big-endian (RefIn = false, RefOut = false ) */
             model.flags &= ~P_REFIN;
             rflags |= R_HAVERI;
-            /* fall through: */
+        /* fall through: */
         case 'B': /* B  big-endian output (RefOut = false) */
             model.flags &= ~P_REFOUT;
             rflags |= R_HAVERO;
             mnovel(&model);
-            /* fall through: */
+        /* fall through: */
         case 'r': /* r  right-justified */
             model.flags |= P_RTJUST;
             break;
         case 'l': /* l  little-endian input and output */
             model.flags |= P_REFIN;
             rflags |= R_HAVERI;
-            /* fall through: */
+        /* fall through: */
         case 'L': /* L  little-endian output */
             model.flags |= P_REFOUT;
             rflags |= R_HAVERO;
             mnovel(&model);
-            /* fall through: */
+        /* fall through: */
         case 't': /* t  left-justified */
             model.flags &= ~P_RTJUST;
             break;
@@ -353,9 +357,9 @@ int RunModel(char *inModel, char *inHexStr, bool reverse, char endian, char *res
         prev(&crc);
 
     string = ptostr(crc, model.flags, obperhx);
-    for (int i = 0; i < 50; i++){
+    for (int i = 0; i < 50; i++) {
         result[i] = string[i];
-        if (result[i]==0) break;
+        if (result[i] == 0) break;
     }
     free(string);
     pfree(&crc);
@@ -364,7 +368,8 @@ int RunModel(char *inModel, char *inHexStr, bool reverse, char endian, char *res
 }
 
 //test call to RunModel
-int CmdrevengTestC(const char *Cmd){
+int CmdrevengTestC(const char *Cmd)
+{
     int cmdp = 0;
     char inModel[30] = {0x00};
     char inHexStr[30] = {0x00};
@@ -382,24 +387,26 @@ int CmdrevengTestC(const char *Cmd){
     int ans = RunModel(inModel, inHexStr, reverse, endian, result);
     if (!ans) return 0;
 
-    PrintAndLogEx(SUCCESS, "result: %s",result);
+    PrintAndLogEx(SUCCESS, "result: %s", result);
     return 1;
 }
 
 //returns a calloced string (needs to be freed)
-char *SwapEndianStr(const char *inStr, const size_t len, const uint8_t blockSize){
-    char *tmp = calloc(len+1, sizeof(char));
-    for (uint8_t block=0; block < (uint8_t)(len/blockSize); block++){
-        for (size_t i = 0; i < blockSize; i+=2){
-            tmp[i+(blockSize*block)] = inStr[(blockSize-1-i-1)+(blockSize*block)];
-            tmp[i+(blockSize*block)+1] = inStr[(blockSize-1-i)+(blockSize*block)];
+char *SwapEndianStr(const char *inStr, const size_t len, const uint8_t blockSize)
+{
+    char *tmp = calloc(len + 1, sizeof(char));
+    for (uint8_t block = 0; block < (uint8_t)(len / blockSize); block++) {
+        for (size_t i = 0; i < blockSize; i += 2) {
+            tmp[i + (blockSize * block)] = inStr[(blockSize - 1 - i - 1) + (blockSize * block)];
+            tmp[i + (blockSize * block) + 1] = inStr[(blockSize - 1 - i) + (blockSize * block)];
         }
     }
     return tmp;
 }
 
 // takes hex string in and searches for a matching result (hex string must include checksum)
-int CmdrevengSearch(const char *Cmd){
+int CmdrevengSearch(const char *Cmd)
+{
 
 #define NMODELS 105
 
@@ -420,35 +427,35 @@ int CmdrevengSearch(const char *Cmd){
     if (!ans) return 0;
 
     // try each model and get result
-    for (int i = 0; i < count; i++){
+    for (int i = 0; i < count; i++) {
         /*if (found) {
             free(Models[i]);
             continue;
         }*/
         // round up to # of characters in this model's crc
-        crcChars = ((width[i]+7)/8)*2;
+        crcChars = ((width[i] + 7) / 8) * 2;
         // can't test a model that has more crc digits than our data
         if (crcChars >= dataLen)
             continue;
         memset(result, 0, 30);
-        char *inCRC = calloc(crcChars+1, sizeof(char));
-        memcpy(inCRC, inHexStr+(dataLen-crcChars), crcChars);
+        char *inCRC = calloc(crcChars + 1, sizeof(char));
+        memcpy(inCRC, inHexStr + (dataLen - crcChars), crcChars);
 
-        char *outHex = calloc(dataLen-crcChars+1, sizeof(char));
-        memcpy(outHex, inHexStr, dataLen-crcChars);
+        char *outHex = calloc(dataLen - crcChars + 1, sizeof(char));
+        memcpy(outHex, inHexStr, dataLen - crcChars);
 
-        PrintAndLogEx(DEBUG, "DEBUG: dataLen: %d, crcChars: %d, Model: %s, CRC: %s, width: %d, outHex: %s",dataLen, crcChars, Models[i], inCRC, width[i], outHex);
+        PrintAndLogEx(DEBUG, "DEBUG: dataLen: %d, crcChars: %d, Model: %s, CRC: %s, width: %d, outHex: %s", dataLen, crcChars, Models[i], inCRC, width[i], outHex);
         ans = RunModel(Models[i], outHex, false, 0, result);
         if (ans) {
             // test for match
-            if (memcmp(result, inCRC, crcChars) == 0){
+            if (memcmp(result, inCRC, crcChars) == 0) {
                 PrintAndLogEx(SUCCESS, "\nfound possible match\nmodel: %s | value: %s\n", Models[i], result);
                 //optional - stop searching if found...
                 found = true;
             } else {
-                if (crcChars > 2){
+                if (crcChars > 2) {
                     char *swapEndian = SwapEndianStr(result, crcChars, crcChars);
-                    if (memcmp(swapEndian, inCRC, crcChars) == 0){
+                    if (memcmp(swapEndian, inCRC, crcChars) == 0) {
                         PrintAndLogEx(SUCCESS, "\nfound possible match\nmodel: %s | value endian swapped: %s\n", Models[i], swapEndian);
                         // optional - stop searching if found...
                         found = true;
@@ -460,14 +467,14 @@ int CmdrevengSearch(const char *Cmd){
         ans = RunModel(Models[i], outHex, true, 0, revResult);
         if (ans) {
             // test for match
-            if (memcmp(revResult, inCRC, crcChars) == 0){
+            if (memcmp(revResult, inCRC, crcChars) == 0) {
                 PrintAndLogEx(SUCCESS, "\nfound possible match\nmodel reversed: %s | value: %s\n", Models[i], revResult);
                 // optional - stop searching if found...
                 found = true;
             } else {
-                if (crcChars > 2){
+                if (crcChars > 2) {
                     char *swapEndian = SwapEndianStr(revResult, crcChars, crcChars);
-                    if (memcmp(swapEndian, inCRC, crcChars) == 0){
+                    if (memcmp(swapEndian, inCRC, crcChars) == 0) {
                         PrintAndLogEx(SUCCESS, "\nfound possible match\nmodel reversed: %s | value endian swapped: %s\n", Models[i], swapEndian);
                         // optional - stop searching if found...
                         found = true;
diff --git a/client/cmddata.c b/client/cmddata.c
index 9753701e5..1fd01a3ae 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -17,7 +17,8 @@ int g_DemodClock = 0;
 
 static int CmdHelp(const char *Cmd);
 
-int usage_data_printdemodbuf(void){
+int usage_data_printdemodbuf(void)
+{
     PrintAndLogEx(NORMAL, "Usage: data printdemodbuffer x o <offset> l <length>");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       h          This help");
@@ -26,7 +27,8 @@ int usage_data_printdemodbuf(void){
     PrintAndLogEx(NORMAL, "       l <length> enter length to print in # of bits or hex characters respectively");
     return 0;
 }
-int usage_data_manrawdecode(void){
+int usage_data_manrawdecode(void)
+{
     PrintAndLogEx(NORMAL, "Usage:  data manrawdecode [invert] [maxErr]");
     PrintAndLogEx(NORMAL, "     Takes 10 and 01 and converts to 0 and 1 respectively");
     PrintAndLogEx(NORMAL, "     --must have binary sequence in demodbuffer (run data askrawdemod first)");
@@ -36,7 +38,8 @@ int usage_data_manrawdecode(void){
     PrintAndLogEx(NORMAL, "   Example: data manrawdecode   = decode manchester bitstream from the demodbuffer");
     return 0;
 }
-int usage_data_biphaserawdecode(void){
+int usage_data_biphaserawdecode(void)
+{
     PrintAndLogEx(NORMAL, "Usage:  data biphaserawdecode [offset] [invert] [maxErr]");
     PrintAndLogEx(NORMAL, "     Converts 10 or 01 to 1 and 11 or 00 to 0");
     PrintAndLogEx(NORMAL, "     --must have binary sequence in demodbuffer (run data askrawdemod first)");
@@ -50,7 +53,8 @@ int usage_data_biphaserawdecode(void){
     PrintAndLogEx(NORMAL, "   Example: data biphaserawdecode 1 1 = decode biphase bitstream from the demodbuffer, set offset, and invert output");
     return 0;
 }
-int usage_data_rawdemod(void){
+int usage_data_rawdemod(void)
+{
     PrintAndLogEx(NORMAL, "Usage:  data rawdemod [modulation] <help>|<options>");
     PrintAndLogEx(NORMAL, "   [modulation] as 2 char, 'ab' for ask/biphase, 'am' for ask/manchester, 'ar' for ask/raw, 'fs' for fsk, ...");
     PrintAndLogEx(NORMAL, "         'nr' for nrz/direct, 'p1' for psk1, 'p2' for psk2");
@@ -67,7 +71,8 @@ int usage_data_rawdemod(void){
     PrintAndLogEx(NORMAL, "          : data rawdemod p2           = demod GraphBuffer using: psk2 - autodetect");
     return 0;
 }
-int usage_data_rawdemod_am(void){
+int usage_data_rawdemod_am(void)
+{
     PrintAndLogEx(NORMAL, "Usage:  data rawdemod am <s> [clock] <invert> [maxError] [maxLen] [amplify]");
     PrintAndLogEx(NORMAL, "     ['s'] optional, check for Sequence Terminator");
     PrintAndLogEx(NORMAL, "     [set clock as integer] optional, if not set, autodetect");
@@ -83,7 +88,8 @@ int usage_data_rawdemod_am(void){
     PrintAndLogEx(NORMAL, "          : data rawdemod am 64 1 0 = demod an ask/manchester tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors");
     return 0;
 }
-int usage_data_rawdemod_ab(void){
+int usage_data_rawdemod_ab(void)
+{
     PrintAndLogEx(NORMAL, "Usage:  data rawdemod ab [offset] [clock] <invert> [maxError] [maxLen] <amplify>");
     PrintAndLogEx(NORMAL, "     [offset], offset to begin biphase, default=0");
     PrintAndLogEx(NORMAL, "     [set clock as integer] optional, if not set, autodetect");
@@ -106,7 +112,8 @@ int usage_data_rawdemod_ab(void){
     PrintAndLogEx(NORMAL, "          : data rawdemod ab 0 64 1 0 0 a = demod an ask/biph tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors, and amp");
     return 0;
 }
-int usage_data_rawdemod_ar(void){
+int usage_data_rawdemod_ar(void)
+{
     PrintAndLogEx(NORMAL, "Usage:  data rawdemod ar [clock] <invert> [maxError] [maxLen] [amplify]");
     PrintAndLogEx(NORMAL, "     [set clock as integer] optional, if not set, autodetect");
     PrintAndLogEx(NORMAL, "     <invert>, 1 to invert output");
@@ -123,7 +130,8 @@ int usage_data_rawdemod_ar(void){
     PrintAndLogEx(NORMAL, "          : data rawdemod ar 64 1 0 0 a = demod an ask tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors, and amp");
     return 0;
 }
-int usage_data_rawdemod_fs(void){
+int usage_data_rawdemod_fs(void)
+{
     PrintAndLogEx(NORMAL, "Usage:  data rawdemod fs [clock] <invert> [fchigh] [fclow]");
     PrintAndLogEx(NORMAL, "     [set clock as integer] optional, omit for autodetect.");
     PrintAndLogEx(NORMAL, "     <invert>, 1 for invert output, can be used even if the clock is omitted");
@@ -139,7 +147,8 @@ int usage_data_rawdemod_fs(void){
     PrintAndLogEx(NORMAL, "          : data rawdemod fs 50 1 10 8 = demod an fsk2a RF/50 tag from GraphBuffer");
     return 0;
 }
-int usage_data_rawdemod_nr(void){
+int usage_data_rawdemod_nr(void)
+{
     PrintAndLogEx(NORMAL, "Usage:  data rawdemod nr [clock] <0|1> [maxError]");
     PrintAndLogEx(NORMAL, "     [set clock as integer] optional, if not set, autodetect.");
     PrintAndLogEx(NORMAL, "     <invert>, 1 for invert output");
@@ -152,7 +161,8 @@ int usage_data_rawdemod_nr(void){
     PrintAndLogEx(NORMAL, "          : data rawdemod nr 64 1 0 = demod a nrz/direct tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors");
     return 0;
 }
-int usage_data_rawdemod_p1(void){
+int usage_data_rawdemod_p1(void)
+{
     PrintAndLogEx(NORMAL, "Usage:  data rawdemod p1 [clock] <0|1> [maxError]");
     PrintAndLogEx(NORMAL, "     [set clock as integer] optional, if not set, autodetect.");
     PrintAndLogEx(NORMAL, "     <invert>, 1 for invert output");
@@ -165,7 +175,8 @@ int usage_data_rawdemod_p1(void){
     PrintAndLogEx(NORMAL, "          : data rawdemod p1 64 1 0 = demod a psk1 tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors");
     return 0;
 }
-int usage_data_rawdemod_p2(void){
+int usage_data_rawdemod_p2(void)
+{
     PrintAndLogEx(NORMAL, "Usage:  data rawdemod p2 [clock] <0|1> [maxError]");
     PrintAndLogEx(NORMAL, "     [set clock as integer] optional, if not set, autodetect.");
     PrintAndLogEx(NORMAL, "     <invert>, 1 for invert output");
@@ -178,7 +189,8 @@ int usage_data_rawdemod_p2(void){
     PrintAndLogEx(NORMAL, "          : data rawdemod p2 64 1 0  = demod a psk2 tag from GraphBuffer using a clock of RF/64, inverting output and allowing 0 demod errors");
     return 0;
 }
-int usage_data_autocorr(void) {
+int usage_data_autocorr(void)
+{
     PrintAndLogEx(NORMAL, "Autocorrelate is used to detect repeating sequences. We use it as detection of length in bits a message inside the signal is");
     PrintAndLogEx(NORMAL, "Usage: data autocorr w <window> [g]");
     PrintAndLogEx(NORMAL, "Options:");
@@ -187,7 +199,8 @@ int usage_data_autocorr(void) {
     PrintAndLogEx(NORMAL, "       g              save back to GraphBuffer (overwrite)");
     return 0;
 }
-int usage_data_undecimate(void){
+int usage_data_undecimate(void)
+{
     PrintAndLogEx(NORMAL, "Usage: data undec [factor]");
     PrintAndLogEx(NORMAL, "This function performs un-decimation, by repeating each sample N times");
     PrintAndLogEx(NORMAL, "Options:");
@@ -196,7 +209,8 @@ int usage_data_undecimate(void){
     PrintAndLogEx(NORMAL, "Example: 'data undec 3'");
     return 0;
 }
-int usage_data_detectclock(void){
+int usage_data_detectclock(void)
+{
     PrintAndLogEx(NORMAL, "Usage:  data detectclock [modulation] <clock>");
     PrintAndLogEx(NORMAL, "     [modulation as char], specify the modulation type you want to detect the clock of");
     PrintAndLogEx(NORMAL, "     <clock>             , specify the clock (optional - to get best start position only)");
@@ -208,39 +222,44 @@ int usage_data_detectclock(void){
     PrintAndLogEx(NORMAL, "            data detectclock n    = detect the clock of an nrz/direct modulated wave in the GraphBuffer");
     return 0;
 }
-int usage_data_hex2bin(void){
+int usage_data_hex2bin(void)
+{
     PrintAndLogEx(NORMAL, "Usage: data hex2bin <hex_digits>");
     PrintAndLogEx(NORMAL, "       This function will ignore all non-hexadecimal characters (but stop reading on whitespace)");
     return 0;
 }
-int usage_data_bin2hex(void){
+int usage_data_bin2hex(void)
+{
     PrintAndLogEx(NORMAL, "Usage: data bin2hex <binary_digits>");
     PrintAndLogEx(NORMAL, "       This function will ignore all characters not 1 or 0 (but stop reading on whitespace)");
     return 0;
 }
-int usage_data_buffclear(void){
+int usage_data_buffclear(void)
+{
     PrintAndLogEx(NORMAL, "This function clears the bigbuff on deviceside");
     PrintAndLogEx(NORMAL, "Usage: data buffclear [h]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       h              This help");
     return 0;
 }
-int usage_data_fsktonrz() {
-        PrintAndLogEx(NORMAL, "Usage: data fsktonrz c <clock> l <fc_low> f <fc_high>");
-        PrintAndLogEx(NORMAL, "Options:");
-        PrintAndLogEx(NORMAL, "       h            This help");
-        PrintAndLogEx(NORMAL, "       c <clock>    enter the a clock (omit to autodetect)");
-        PrintAndLogEx(NORMAL, "       l <fc_low>   enter a field clock (omit to autodetect)");
-        PrintAndLogEx(NORMAL, "       f <fc_high>  enter a field clock (omit to autodetect)");
-        return 0;
+int usage_data_fsktonrz()
+{
+    PrintAndLogEx(NORMAL, "Usage: data fsktonrz c <clock> l <fc_low> f <fc_high>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h            This help");
+    PrintAndLogEx(NORMAL, "       c <clock>    enter the a clock (omit to autodetect)");
+    PrintAndLogEx(NORMAL, "       l <fc_low>   enter a field clock (omit to autodetect)");
+    PrintAndLogEx(NORMAL, "       f <fc_high>  enter a field clock (omit to autodetect)");
+    return 0;
 }
 
 //set the demod buffer with given array of binary (one bit per byte)
 //by marshmellow
-void setDemodBuf(uint8_t *buf, size_t size, size_t start_idx) {
+void setDemodBuf(uint8_t *buf, size_t size, size_t start_idx)
+{
     if (buf == NULL) return;
 
-    if ( size > MAX_DEMOD_BUF_LEN - start_idx)
+    if (size > MAX_DEMOD_BUF_LEN - start_idx)
         size = MAX_DEMOD_BUF_LEN - start_idx;
 
     for (size_t i = 0; i < size; i++)
@@ -249,7 +268,8 @@ void setDemodBuf(uint8_t *buf, size_t size, size_t start_idx) {
     DemodBufferLen = size;
 }
 
-bool getDemodBuf(uint8_t *buf, size_t *size) {
+bool getDemodBuf(uint8_t *buf, size_t *size)
+{
     if (buf == NULL) return false;
     if (size == NULL) return false;
     if (*size == 0) return false;
@@ -262,49 +282,56 @@ bool getDemodBuf(uint8_t *buf, size_t *size) {
 
 // include <math.h>
 // Root mean square
-double rms(double *v, size_t n) {
+double rms(double *v, size_t n)
+{
     double sum = 0.0;
-    for(size_t i = 0; i < n; i++)
+    for (size_t i = 0; i < n; i++)
         sum += v[i] * v[i];
     return sqrt(sum / n);
 }
-int cmp_int( const void *a, const void *b) {
-    if (*(const int *)a < *(const int *)b)
+int cmp_int(const void *a, const void *b)
+{
+    if (*(const int *)a < * (const int *)b)
         return -1;
     else
         return *(const int *)a > *(const int *)b;
 }
-int cmp_uint8( const void *a, const void *b) {
-    if (*(const uint8_t *)a < *(const uint8_t *)b)
+int cmp_uint8(const void *a, const void *b)
+{
+    if (*(const uint8_t *)a < * (const uint8_t *)b)
         return -1;
     else
         return *(const uint8_t *)a > *(const uint8_t *)b;
 }
 // Median of a array of values
-double median_int( int *src, size_t size ) {
-    qsort( src, size, sizeof(int), cmp_int);
-    return 0.5 * ( src[size/2] + src[(size-1)/2]);
+double median_int(int *src, size_t size)
+{
+    qsort(src, size, sizeof(int), cmp_int);
+    return 0.5 * (src[size / 2] + src[(size - 1) / 2]);
 }
-double median_uint8( uint8_t *src, size_t size ) {
-    qsort( src, size, sizeof(uint8_t), cmp_uint8);
-    return 0.5 * ( src[size/2] + src[(size-1)/2]);
+double median_uint8(uint8_t *src, size_t size)
+{
+    qsort(src, size, sizeof(uint8_t), cmp_uint8);
+    return 0.5 * (src[size / 2] + src[(size - 1) / 2]);
 }
 // function to compute mean for a series
-static double compute_mean(const int *data, size_t n) {
+static double compute_mean(const int *data, size_t n)
+{
     double mean = 0.0;
-    for (size_t i=0; i < n; i++)
+    for (size_t i = 0; i < n; i++)
         mean += data[i];
     mean /= n;
     return mean;
 }
 
 //  function to compute variance for a series
-static double compute_variance(const int *data, size_t n) {
+static double compute_variance(const int *data, size_t n)
+{
     double variance = 0.0;
     double mean = compute_mean(data, n);
 
-    for (size_t i=0; i < n; i++)
-        variance += pow(( data[i] - mean), 2.0);
+    for (size_t i = 0; i < n; i++)
+        variance += pow((data[i] - mean), 2.0);
 
     variance /= n;
     return variance;
@@ -335,7 +362,8 @@ static double compute_autoc(const int *data, size_t n, int lag) {
 */
 
 // option '1' to save DemodBuffer any other to restore
-void save_restoreDB(uint8_t saveOpt) {
+void save_restoreDB(uint8_t saveOpt)
+{
     static uint8_t SavedDB[MAX_DEMOD_BUF_LEN];
     static size_t SavedDBlen;
     static bool DB_Saved = false;
@@ -358,7 +386,8 @@ void save_restoreDB(uint8_t saveOpt) {
     }
 }
 
-int CmdSetDebugMode(const char *Cmd) {
+int CmdSetDebugMode(const char *Cmd)
+{
     int demod = 0;
     sscanf(Cmd, "%i", &demod);
     g_debugMode = (uint8_t)demod;
@@ -367,7 +396,8 @@ int CmdSetDebugMode(const char *Cmd) {
 
 //by marshmellow
 // max output to 512 bits if we have more - should be plenty
-void printDemodBuff(void) {
+void printDemodBuff(void)
+{
     int len = DemodBufferLen;
     if (len < 1) {
         PrintAndLogEx(NORMAL, "(printDemodBuff) no bits found in demod buffer");
@@ -375,10 +405,11 @@ void printDemodBuff(void) {
     }
     if (len > 512) len = 512;
 
-    PrintAndLogEx(NORMAL, "%s", sprint_bin_break(DemodBuffer, len, 16) );
+    PrintAndLogEx(NORMAL, "%s", sprint_bin_break(DemodBuffer, len, 16));
 }
 
-int CmdPrintDemodBuff(const char *Cmd) {
+int CmdPrintDemodBuff(const char *Cmd)
+{
     char hex[512] = {0x00};
     bool hexMode = false;
     bool errors = false;
@@ -387,26 +418,26 @@ int CmdPrintDemodBuff(const char *Cmd) {
     char cmdp = 0;
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
-        case 'h':
-            return usage_data_printdemodbuf();
-        case 'x':
-            hexMode = true;
-            cmdp++;
-            break;
-        case 'o':
-            offset = param_get32ex(Cmd, cmdp+1, 0, 10);
-            if (!offset) errors = true;
-            cmdp += 2;
-            break;
-        case 'l':
-            length = param_get32ex(Cmd, cmdp+1, 512, 10);
-            if (!length) errors = true;
-            cmdp += 2;
-            break;
-        default:
-            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-            errors = true;
-            break;
+            case 'h':
+                return usage_data_printdemodbuf();
+            case 'x':
+                hexMode = true;
+                cmdp++;
+                break;
+            case 'o':
+                offset = param_get32ex(Cmd, cmdp + 1, 0, 10);
+                if (!offset) errors = true;
+                cmdp += 2;
+                break;
+            case 'l':
+                length = param_get32ex(Cmd, cmdp + 1, 512, 10);
+                if (!length) errors = true;
+                cmdp += 2;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                errors = true;
+                break;
         }
     }
     //Validations
@@ -416,11 +447,11 @@ int CmdPrintDemodBuff(const char *Cmd) {
         PrintAndLogEx(NORMAL, "Demodbuffer is empty");
         return 0;
     }
-    length = (length > (DemodBufferLen-offset)) ? DemodBufferLen-offset : length;
+    length = (length > (DemodBufferLen - offset)) ? DemodBufferLen - offset : length;
     int numBits = (length) & 0x00FFC; //make sure we don't exceed our string
 
-    if (hexMode){
-        char *buf = (char *) (DemodBuffer + offset);
+    if (hexMode) {
+        char *buf = (char *)(DemodBuffer + offset);
         numBits = (numBits > sizeof(hex)) ? sizeof(hex) : numBits;
         numBits = binarraytohex(hex, buf, numBits);
         if (numBits == 0) {
@@ -428,14 +459,15 @@ int CmdPrintDemodBuff(const char *Cmd) {
         }
         PrintAndLogEx(NORMAL, "DemodBuffer: %s", hex);
     } else {
-        PrintAndLogEx(NORMAL, "DemodBuffer:\n%s", sprint_bin_break(DemodBuffer+offset, numBits, 16));
+        PrintAndLogEx(NORMAL, "DemodBuffer:\n%s", sprint_bin_break(DemodBuffer + offset, numBits, 16));
     }
     return 1;
 }
 
 //by marshmellow
 //this function strictly converts >1 to 1 and <1 to 0 for each sample in the graphbuffer
-int CmdGetBitStream(const char *Cmd) {
+int CmdGetBitStream(const char *Cmd)
+{
     CmdHpf(Cmd);
     for (uint32_t i = 0; i < GraphTraceLen; i++)
         GraphBuffer[i] = (GraphBuffer[i] >= 1) ? 1 : 0;
@@ -450,7 +482,8 @@ int CmdGetBitStream(const char *Cmd) {
 //verbose will print results and demoding messages
 //emSearch will auto search for EM410x format in bitstream
 //askType switches decode: ask/raw = 0, ask/manchester = 1
-int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType, bool *stCheck) {
+int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType, bool *stCheck)
+{
     int invert = 0;
     int clk = 0;
     int maxErr = 100;
@@ -503,12 +536,12 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
     int startIdx = 0;
     int errCnt = askdemod_ext(bits, &BitLen, &clk, &invert, maxErr, askamp, askType, &startIdx);
 
-    if (errCnt < 0 || BitLen < 16){  //if fatal error (or -1)
-        PrintAndLogEx(DEBUG, "DEBUG: (ASKDemod_ext) No data found errors:%d, invert:%c, bitlen:%d, clock:%d", errCnt, (invert)?'Y':'N', BitLen, clk);
+    if (errCnt < 0 || BitLen < 16) { //if fatal error (or -1)
+        PrintAndLogEx(DEBUG, "DEBUG: (ASKDemod_ext) No data found errors:%d, invert:%c, bitlen:%d, clock:%d", errCnt, (invert) ? 'Y' : 'N', BitLen, clk);
         return 0;
     }
 
-    if (errCnt > maxErr){
+    if (errCnt > maxErr) {
         PrintAndLogEx(DEBUG, "DEBUG: (ASKDemod_ext) Too many errors found, errors:%d, bits:%d, clock:%d", errCnt, BitLen, clk);
         return 0;
     }
@@ -519,13 +552,13 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
     setDemodBuf(bits, BitLen, 0);
     setClockGrid(clk, startIdx);
 
-    if (verbose || g_debugMode){
+    if (verbose || g_debugMode) {
         if (errCnt > 0)
-            PrintAndLogEx(NORMAL, "# Errors during Demoding (shown as 7 in bit stream): %d",errCnt);
+            PrintAndLogEx(NORMAL, "# Errors during Demoding (shown as 7 in bit stream): %d", errCnt);
         if (askType)
-            PrintAndLogEx(NORMAL, "ASK/Manchester - Clock: %d - Decoded bitstream:",clk);
+            PrintAndLogEx(NORMAL, "ASK/Manchester - Clock: %d - Decoded bitstream:", clk);
         else
-            PrintAndLogEx(NORMAL, "ASK/Raw - Clock: %d - Decoded bitstream:",clk);
+            PrintAndLogEx(NORMAL, "ASK/Raw - Clock: %d - Decoded bitstream:", clk);
         // Now output the bitstream to the scrollback by line of 16 bits
         printDemodBuff();
     }
@@ -536,7 +569,8 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
 
     return 1;
 }
-int ASKDemod(const char *Cmd, bool verbose, bool emSearch, uint8_t askType) {
+int ASKDemod(const char *Cmd, bool verbose, bool emSearch, uint8_t askType)
+{
     bool st = false;
     return ASKDemod_ext(Cmd, verbose, emSearch, askType, &st);
 }
@@ -562,7 +596,8 @@ int Cmdaskmandemod(const char *Cmd)
 //by marshmellow
 //manchester decode
 //stricktly take 10 and 01 and convert to 0 and 1
-int Cmdmandecoderaw(const char *Cmd) {
+int Cmdmandecoderaw(const char *Cmd)
+{
     size_t size = 0;
     int high = 0, low = 0;
     int i = 0, errCnt = 0, invert = 0, maxErr = 20;
@@ -573,15 +608,15 @@ int Cmdmandecoderaw(const char *Cmd) {
 
     uint8_t bits[MAX_DEMOD_BUF_LEN] = {0};
 
-    for (; i < DemodBufferLen; ++i){
+    for (; i < DemodBufferLen; ++i) {
         if (DemodBuffer[i] > high)
             high = DemodBuffer[i];
-        else if(DemodBuffer[i] < low)
+        else if (DemodBuffer[i] < low)
             low = DemodBuffer[i];
         bits[i] = DemodBuffer[i];
     }
 
-    if (high > 7 || low < 0 ){
+    if (high > 7 || low < 0) {
         PrintAndLogEx(WARNING, "Error: please raw demod the wave first then manchester raw decode");
         return 0;
     }
@@ -590,19 +625,19 @@ int Cmdmandecoderaw(const char *Cmd) {
     size = i;
     uint8_t alignPos = 0;
     errCnt = manrawdecode(bits, &size, invert, &alignPos);
-    if (errCnt >= maxErr){
-        PrintAndLogEx(WARNING, "Too many errors: %d",errCnt);
+    if (errCnt >= maxErr) {
+        PrintAndLogEx(WARNING, "Too many errors: %d", errCnt);
         return 0;
     }
 
-    PrintAndLogEx(NORMAL, "Manchester Decoded - # errors:%d - data:",errCnt);
+    PrintAndLogEx(NORMAL, "Manchester Decoded - # errors:%d - data:", errCnt);
     PrintAndLogEx(NORMAL, "%s", sprint_bin_break(bits, size, 16));
 
-    if (errCnt == 0){
+    if (errCnt == 0) {
         uint64_t id = 0;
         uint32_t hi = 0;
         size_t idx = 0;
-        if (Em410xDecode(bits, &size, &idx, &hi, &id) == 1){
+        if (Em410xDecode(bits, &size, &idx, &hi, &id) == 1) {
             //need to adjust to set bitstream back to manchester encoded data
             //setDemodBuf(bits, size, idx);
             printEM410x(hi, id);
@@ -617,43 +652,44 @@ int Cmdmandecoderaw(const char *Cmd) {
 //takes 2 arguments "offset" default = 0 if 1 it will shift the decode by one bit
 // and "invert" default = 0 if 1 it will invert output
 //  the argument offset allows us to manually shift if the output is incorrect - [EDIT: now auto detects]
-int CmdBiphaseDecodeRaw(const char *Cmd) {
+int CmdBiphaseDecodeRaw(const char *Cmd)
+{
     size_t size = 0;
     int offset = 0, invert = 0, maxErr = 20, errCnt = 0;
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) > 3 || cmdp == 'h') return usage_data_biphaserawdecode();
 
     sscanf(Cmd, "%i %i %i", &offset, &invert, &maxErr);
-    if (DemodBufferLen == 0){
+    if (DemodBufferLen == 0) {
         PrintAndLogEx(NORMAL, "DemodBuffer Empty - run 'data rawdemod ar' first");
         return 0;
     }
 
     uint8_t bits[MAX_DEMOD_BUF_LEN] = {0};
     size = sizeof(bits);
-    if ( !getDemodBuf(bits, &size) ) return 0;
+    if (!getDemodBuf(bits, &size)) return 0;
 
     errCnt = BiphaseRawDecode(bits, &size, &offset, invert);
-    if (errCnt < 0){
+    if (errCnt < 0) {
         PrintAndLogEx(WARNING, "Error during decode:%d", errCnt);
         return 0;
     }
-    if (errCnt > maxErr){
-        PrintAndLogEx(WARNING, "Too many errors attempting to decode: %d",errCnt);
+    if (errCnt > maxErr) {
+        PrintAndLogEx(WARNING, "Too many errors attempting to decode: %d", errCnt);
         return 0;
     }
 
     if (errCnt > 0)
-        PrintAndLogEx(WARNING, "# Errors found during Demod (shown as 7 in bit stream): %d",errCnt);
+        PrintAndLogEx(WARNING, "# Errors found during Demod (shown as 7 in bit stream): %d", errCnt);
 
-    PrintAndLogEx(NORMAL, "Biphase Decoded using offset: %d - # invert:%d - data:",offset,invert);
+    PrintAndLogEx(NORMAL, "Biphase Decoded using offset: %d - # invert:%d - data:", offset, invert);
     PrintAndLogEx(NORMAL, "%s", sprint_bin_break(bits, size, 16));
 
     //remove first bit from raw demod
     if (offset)
-        setDemodBuf(DemodBuffer,DemodBufferLen-offset, offset);
+        setDemodBuf(DemodBuffer, DemodBufferLen - offset, offset);
 
-    setClockGrid(g_DemodClock, g_DemodStartIdx + g_DemodClock*offset/2);
+    setClockGrid(g_DemodClock, g_DemodStartIdx + g_DemodClock * offset / 2);
     return 1;
 }
 
@@ -662,26 +698,26 @@ int CmdBiphaseDecodeRaw(const char *Cmd) {
 int ASKbiphaseDemod(const char *Cmd, bool verbose)
 {
     //ask raw demod GraphBuffer first
-    int offset=0, clk=0, invert=0, maxErr=0;
+    int offset = 0, clk = 0, invert = 0, maxErr = 0;
     sscanf(Cmd, "%i %i %i %i", &offset, &clk, &invert, &maxErr);
 
     uint8_t BitStream[MAX_DEMOD_BUF_LEN];
     size_t size = getFromGraphBuf(BitStream);
-    if (size == 0 ) {
+    if (size == 0) {
         PrintAndLogEx(DEBUG, "DEBUG: no data in graphbuf");
         return 0;
     }
     int startIdx = 0;
     //invert here inverts the ask raw demoded bits which has no effect on the demod, but we need the pointer
     int errCnt = askdemod_ext(BitStream, &size, &clk, &invert, maxErr, 0, 0, &startIdx);
-    if ( errCnt < 0 || errCnt > maxErr ) {
+    if (errCnt < 0 || errCnt > maxErr) {
         PrintAndLogEx(DEBUG, "DEBUG: no data or error found %d, clock: %d", errCnt, clk);
         return 0;
     }
 
     //attempt to Biphase decode BitStream
     errCnt = BiphaseRawDecode(BitStream, &size, &offset, invert);
-    if (errCnt < 0){
+    if (errCnt < 0) {
         if (g_debugMode || verbose) PrintAndLogEx(DEBUG, "DEBUG: Error BiphaseRawDecode: %d", errCnt);
         return 0;
     }
@@ -691,9 +727,9 @@ int ASKbiphaseDemod(const char *Cmd, bool verbose)
     }
     //success set DemodBuffer and return
     setDemodBuf(BitStream, size, 0);
-    setClockGrid(clk, startIdx + clk*offset/2);
-    if (g_debugMode || verbose){
-        PrintAndLogEx(NORMAL, "Biphase Decoded using offset: %d - clock: %d - # errors:%d - data:",offset,clk,errCnt);
+    setClockGrid(clk, startIdx + clk * offset / 2);
+    if (g_debugMode || verbose) {
+        PrintAndLogEx(NORMAL, "Biphase Decoded using offset: %d - clock: %d - # errors:%d - data:", offset, clk, errCnt);
         printDemodBuff();
     }
     return 1;
@@ -716,9 +752,10 @@ int Cmdaskrawdemod(const char *Cmd)
     return ASKDemod(Cmd, true, false, 0);
 }
 
-int AutoCorrelate(const int *in, int *out, size_t len, int window, bool SaveGrph, bool verbose) {
+int AutoCorrelate(const int *in, int *out, size_t len, int window, bool SaveGrph, bool verbose)
+{
     // sanity check
-    if ( window > len ) window = len;
+    if (window > len) window = len;
 
     if (verbose) PrintAndLogEx(INFO, "performing %d correlations", GraphTraceLen - window);
 
@@ -738,8 +775,8 @@ int AutoCorrelate(const int *in, int *out, size_t len, int window, bool SaveGrph
 
     for (int i = 0; i < len - window; ++i) {
 
-        for (size_t j=0; j < (len - i); j++) {
-            autocv += (in[j] - mean) * (in[j+i] - mean);
+        for (size_t j = 0; j < (len - i); j++) {
+            autocv += (in[j] - mean) * (in[j + i] - mean);
         }
         autocv = (1.0 / (len - i)) * autocv;
 
@@ -749,8 +786,8 @@ int AutoCorrelate(const int *in, int *out, size_t len, int window, bool SaveGrph
         ac_value = autocv / variance;
 
         // keep track of which distance is repeating.
-        if ( ac_value > 1) {
-            correlation = i-lastmax;
+        if (ac_value > 1) {
+            correlation = i - lastmax;
             lastmax = i;
         }
     }
@@ -758,26 +795,26 @@ int AutoCorrelate(const int *in, int *out, size_t len, int window, bool SaveGrph
     //
     int hi = 0, idx = 0;
     int distance = 0, hi_1 = 0, idx_1 = 0;
-    for (int i = 0; i <= len; ++i){
-        if ( CorrelBuffer[i] > hi) {
+    for (int i = 0; i <= len; ++i) {
+        if (CorrelBuffer[i] > hi) {
             hi = CorrelBuffer[i];
             idx = i;
         }
     }
 
-    for (int i = idx+1; i <= window; ++i){
-        if ( CorrelBuffer[i] > hi_1 ) {
+    for (int i = idx + 1; i <= window; ++i) {
+        if (CorrelBuffer[i] > hi_1) {
             hi_1 = CorrelBuffer[i];
             idx_1 = i;
         }
     }
 
-    int foo = ABS(hi-hi_1);
-    int bar = (int)((int)((hi+hi_1) / 2) * 0.03);
-    if ( verbose && foo < bar ) {
+    int foo = ABS(hi - hi_1);
+    int bar = (int)((int)((hi + hi_1) / 2) * 0.03);
+    if (verbose && foo < bar) {
         distance = idx_1 - idx;
         PrintAndLogEx(SUCCESS, "possible 3% visible correlation %4d samples", distance);
-    } else if (verbose && ( correlation > 1 ) ) {
+    } else if (verbose && (correlation > 1)) {
         PrintAndLogEx(SUCCESS, "possible correlation %4d samples", correlation);
     } else {
         PrintAndLogEx(FAILED, "no repeating pattern found, try increasing window size");
@@ -787,15 +824,14 @@ int AutoCorrelate(const int *in, int *out, size_t len, int window, bool SaveGrph
     if (SaveGrph) {
         //GraphTraceLen = GraphTraceLen - window;
         memcpy(out, CorrelBuffer, len * sizeof(int));
-        if ( distance > 0) {
+        if (distance > 0) {
             setClockGrid(distance, idx);
             retval = distance;
-        }
-        else
+        } else
             setClockGrid(correlation, idx);
 
         CursorCPos = idx_1;
-        CursorDPos = idx_1+retval;
+        CursorDPos = idx_1 + retval;
         DemodBufferLen = 0;
         RepaintGraphWindow();
     }
@@ -803,7 +839,8 @@ int AutoCorrelate(const int *in, int *out, size_t len, int window, bool SaveGrph
     return retval;
 }
 
-int CmdAutoCorr(const char *Cmd) {
+int CmdAutoCorr(const char *Cmd)
+{
 
     uint32_t window = 4000;
     uint8_t cmdp = 0;
@@ -819,7 +856,7 @@ int CmdAutoCorr(const char *Cmd) {
                 cmdp++;
                 break;
             case 'w':
-                window = param_get32ex(Cmd, cmdp+1, 4000, 10);
+                window = param_get32ex(Cmd, cmdp + 1, 4000, 10);
                 if (window >= GraphTraceLen) {
                     PrintAndLogEx(WARNING, "window must be smaller than trace (%d samples)", GraphTraceLen);
                     errors = true;
@@ -833,7 +870,7 @@ int CmdAutoCorr(const char *Cmd) {
         }
     }
     //Validations
-    if (errors || cmdp == 0 ) return usage_data_autocorr();
+    if (errors || cmdp == 0) return usage_data_autocorr();
 
     return AutoCorrelate(GraphBuffer, GraphBuffer, GraphTraceLen, window, updateGrph, true);
 }
@@ -843,14 +880,14 @@ int CmdBitsamples(const char *Cmd)
     int cnt = 0;
     uint8_t got[12288];
 
-    if (!GetFromDevice(BIG_BUF, got, sizeof(got), 0, NULL, 2500 , false)) {
+    if (!GetFromDevice(BIG_BUF, got, sizeof(got), 0, NULL, 2500, false)) {
         PrintAndLogEx(WARNING, "command execution time out");
         return false;
     }
 
     for (int j = 0; j < sizeof(got); j++) {
         for (int k = 0; k < 8; k++) {
-            if(got[j] & (1 << (7 - k)))
+            if (got[j] & (1 << (7 - k)))
                 GraphBuffer[cnt++] = 1;
             else
                 GraphBuffer[cnt++] = 0;
@@ -866,7 +903,7 @@ int CmdBuffClear(const char *Cmd)
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_data_buffclear();
 
-    UsbCommand c = {CMD_BUFF_CLEAR, {0,0,0}};
+    UsbCommand c = {CMD_BUFF_CLEAR, {0, 0, 0}};
     clearCommandBuffer();
     SendCommand(&c);
     ClearGraph(true);
@@ -899,11 +936,10 @@ int CmdUndec(const char *Cmd)
     //We have memory, don't we?
     int swap[MAX_GRAPH_TRACE_LEN] = {0};
     uint32_t g_index = 0, s_index = 0;
-    while(g_index < GraphTraceLen && s_index + factor < MAX_GRAPH_TRACE_LEN)
-    {
+    while (g_index < GraphTraceLen && s_index + factor < MAX_GRAPH_TRACE_LEN) {
         int count = 0;
         for (count = 0; count < factor && s_index + count < MAX_GRAPH_TRACE_LEN; count++)
-            swap[s_index+count] = GraphBuffer[g_index];
+            swap[s_index + count] = GraphBuffer[g_index];
         s_index += count;
         g_index++;
     }
@@ -916,13 +952,14 @@ int CmdUndec(const char *Cmd)
 
 //by marshmellow
 //shift graph zero up or down based on input + or -
-int CmdGraphShiftZero(const char *Cmd) {
+int CmdGraphShiftZero(const char *Cmd)
+{
     int shift = 0, shiftedVal = 0;
     //set options from parameters entered with the command
     sscanf(Cmd, "%i", &shift);
 
-    for(int i = 0; i < GraphTraceLen; i++){
-        if ( i+shift >= GraphTraceLen)
+    for (int i = 0; i < GraphTraceLen; i++) {
+        if (i + shift >= GraphTraceLen)
             shiftedVal = GraphBuffer[i];
         else
             shiftedVal = GraphBuffer[i] + shift;
@@ -937,14 +974,15 @@ int CmdGraphShiftZero(const char *Cmd) {
     return 0;
 }
 
-int AskEdgeDetect(const int *in, int *out, int len, int threshold) {
+int AskEdgeDetect(const int *in, int *out, int len, int threshold)
+{
     int last = 0;
-    for(int i = 1; i<len; i++) {
-        if (in[i] - in[i-1] >= threshold) //large jump up
+    for (int i = 1; i < len; i++) {
+        if (in[i] - in[i - 1] >= threshold) //large jump up
             last = 127;
-        else if (in[i] - in[i-1] <= -1 * threshold) //large jump down
+        else if (in[i] - in[i - 1] <= -1 * threshold) //large jump down
             last = -127;
-        out[i-1] = last;
+        out[i - 1] = last;
     }
     return 0;
 }
@@ -953,7 +991,8 @@ int AskEdgeDetect(const int *in, int *out, int len, int threshold) {
 //use large jumps in read samples to identify edges of waves and then amplify that wave to max
 //similar to dirtheshold, threshold commands
 //takes a threshold length which is the measured length between two samples then determines an edge
-int CmdAskEdgeDetect(const char *Cmd) {
+int CmdAskEdgeDetect(const char *Cmd)
+{
     int thresLen = 25;
     int ans = 0;
     sscanf(Cmd, "%i", &thresLen);
@@ -966,15 +1005,16 @@ int CmdAskEdgeDetect(const char *Cmd) {
 /* Print our clock rate */
 // uses data from graphbuffer
 // adjusted to take char parameter for type of modulation to find the clock - by marshmellow.
-int CmdDetectClockRate(const char *Cmd) {
+int CmdDetectClockRate(const char *Cmd)
+{
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) > 6 || strlen(Cmd) == 0 || cmdp == 'h')
         return usage_data_detectclock();
 
     int clock = 0;
-    switch ( cmdp ) {
+    switch (cmdp) {
         case 'a' :
-            clock = GetAskClock(Cmd+1, true);
+            clock = GetAskClock(Cmd + 1, true);
             break;
         case 'f' :
             clock = GetFskClock("", true);
@@ -999,7 +1039,7 @@ char *GetFSKType(uint8_t fchigh, uint8_t fclow, uint8_t invert)
     memset(fType, 0x00, 8);
     char *fskType = fType;
 
-    if (fchigh == 10 && fclow == 8){
+    if (fchigh == 10 && fclow == 8) {
 
         if (invert)
             memcpy(fskType, "FSK2a", 5);
@@ -1023,7 +1063,8 @@ char *GetFSKType(uint8_t fchigh, uint8_t fclow, uint8_t invert)
 //fsk raw demod and print binary
 //takes 4 arguments - Clock, invert, fchigh, fclow
 //defaults: clock = 50, invert=1, fchigh=10, fclow=8 (RF/10 RF/8 (fsk2a))
-int FSKrawDemod(const char *Cmd, bool verbose) {
+int FSKrawDemod(const char *Cmd, bool verbose)
+{
     //raw fsk demod  no manchester decoding no start bit finding just get binary from wave
     uint8_t rfLen, invert, fchigh, fclow;
 
@@ -1089,7 +1130,8 @@ int FSKrawDemod(const char *Cmd, bool verbose) {
 //fsk raw demod and print binary
 //takes 4 arguments - Clock, invert, fchigh, fclow
 //defaults: clock = 50, invert=1, fchigh=10, fclow=8 (RF/10 RF/8 (fsk2a))
-int CmdFSKrawdemod(const char *Cmd) {
+int CmdFSKrawdemod(const char *Cmd)
+{
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) > 20 || cmdp == 'h') return usage_data_rawdemod_fs();
 
@@ -1098,7 +1140,8 @@ int CmdFSKrawdemod(const char *Cmd) {
 
 //by marshmellow
 //attempt to psk1 demod graph buffer
-int PSKDemod(const char *Cmd, bool verbose) {
+int PSKDemod(const char *Cmd, bool verbose)
+{
     int invert = 0, clk = 0, maxErr = 100;
     sscanf(Cmd, "%i %i %i", &clk, &invert, &maxErr);
     if (clk == 1) {
@@ -1119,17 +1162,17 @@ int PSKDemod(const char *Cmd, bool verbose) {
     int errCnt = 0;
     int startIdx = 0;
     errCnt = pskRawDemod_ext(BitStream, &BitLen, &clk, &invert, &startIdx);
-    if (errCnt > maxErr){
+    if (errCnt > maxErr) {
         if (g_debugMode || verbose) PrintAndLogEx(DEBUG, "DEBUG: (PSKdemod) Too many errors found, clk: %d, invert: %d, numbits: %d, errCnt: %d", clk, invert, BitLen, errCnt);
         return 0;
     }
-    if (errCnt < 0|| BitLen < 16){  //throw away static - allow 1 and -1 (in case of threshold command first)
+    if (errCnt < 0 || BitLen < 16) { //throw away static - allow 1 and -1 (in case of threshold command first)
         if (g_debugMode || verbose) PrintAndLogEx(DEBUG, "DEBUG: (PSKdemod) no data found, clk: %d, invert: %d, numbits: %d, errCnt: %d", clk, invert, BitLen, errCnt);
         return 0;
     }
-    if (verbose || g_debugMode){
-        PrintAndLogEx(DEBUG, "DEBUG: (PSKdemod) Using Clock:%d, invert:%d, Bits Found:%d",clk, invert, BitLen);
-        if (errCnt > 0){
+    if (verbose || g_debugMode) {
+        PrintAndLogEx(DEBUG, "DEBUG: (PSKdemod) Using Clock:%d, invert:%d, Bits Found:%d", clk, invert, BitLen);
+        if (errCnt > 0) {
             PrintAndLogEx(DEBUG, "DEBUG: (PSKdemod) errors during Demoding (shown as 7 in bit stream): %d", errCnt);
         }
     }
@@ -1139,7 +1182,8 @@ int PSKDemod(const char *Cmd, bool verbose) {
     return 1;
 }
 
-int CmdPSKIdteck(const char *Cmd) {
+int CmdPSKIdteck(const char *Cmd)
+{
 
     if (!PSKDemod("", false)) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - Idteck PSKDemod failed");
@@ -1149,7 +1193,7 @@ int CmdPSKIdteck(const char *Cmd) {
 
     //get binary from PSK1 wave
     int idx = detectIdteck(DemodBuffer, &size);
-    if (idx < 0){
+    if (idx < 0) {
 
         if (idx == -1)
             PrintAndLogEx(DEBUG, "DEBUG: Error - Idteck: not enough samples");
@@ -1160,7 +1204,7 @@ int CmdPSKIdteck(const char *Cmd) {
         else if (idx == -4)
             PrintAndLogEx(DEBUG, "DEBUG: Error - Idteck: size not correct: %d", size);
         else
-            PrintAndLogEx(DEBUG, "DEBUG: Error - Idteck: idx: %d",idx);
+            PrintAndLogEx(DEBUG, "DEBUG: Error - Idteck: idx: %d", idx);
 
         // if didn't find preamble try again inverting
         if (!PSKDemod("1", false)) {
@@ -1168,7 +1212,7 @@ int CmdPSKIdteck(const char *Cmd) {
             return 0;
         }
         idx = detectIdteck(DemodBuffer, &size);
-        if (idx < 0){
+        if (idx < 0) {
 
             if (idx == -1)
                 PrintAndLogEx(DEBUG, "DEBUG: Error - Idteck: not enough samples");
@@ -1179,7 +1223,7 @@ int CmdPSKIdteck(const char *Cmd) {
             else if (idx == -4)
                 PrintAndLogEx(DEBUG, "DEBUG: Error - Idteck: size not correct: %d", size);
             else
-                PrintAndLogEx(DEBUG, "DEBUG: Error - Idteck: idx: %d",idx);
+                PrintAndLogEx(DEBUG, "DEBUG: Error - Idteck: idx: %d", idx);
 
             return 0;
         }
@@ -1189,7 +1233,7 @@ int CmdPSKIdteck(const char *Cmd) {
     //got a good demod
     uint32_t id = 0;
     uint32_t raw1 = bytebits_to_byte(DemodBuffer, 32);
-    uint32_t raw2 = bytebits_to_byte(DemodBuffer+32, 32);
+    uint32_t raw2 = bytebits_to_byte(DemodBuffer + 32, 32);
 
     //parity check (TBD)
     //checksum check (TBD)
@@ -1203,12 +1247,13 @@ int CmdPSKIdteck(const char *Cmd) {
 // takes 3 arguments - clock, invert, maxErr as integers
 // attempts to demodulate nrz only
 // prints binary found and saves in demodbuffer for further commands
-int NRZrawDemod(const char *Cmd, bool verbose) {
+int NRZrawDemod(const char *Cmd, bool verbose)
+{
 
     int errCnt = 0, clkStartIdx = 0;
     int invert = 0, clk = 0, maxErr = 100;
     sscanf(Cmd, "%i %i %i", &clk, &invert, &maxErr);
-    if (clk == 1){
+    if (clk == 1) {
         invert = 1;
         clk = 0;
     }
@@ -1227,11 +1272,11 @@ int NRZrawDemod(const char *Cmd, bool verbose) {
     if (BitLen == 0) return 0;
 
     errCnt = nrzRawDemod(bits, &BitLen, &clk, &invert, &clkStartIdx);
-    if (errCnt > maxErr){
-        PrintAndLogEx(DEBUG, "DEBUG: (NRZrawDemod) Too many errors found, clk: %d, invert: %d, numbits: %d, errCnt: %d",clk,invert,BitLen,errCnt);
+    if (errCnt > maxErr) {
+        PrintAndLogEx(DEBUG, "DEBUG: (NRZrawDemod) Too many errors found, clk: %d, invert: %d, numbits: %d, errCnt: %d", clk, invert, BitLen, errCnt);
         return 0;
     }
-    if (errCnt < 0 || BitLen < 16){  //throw away static - allow 1 and -1 (in case of threshold command first)
+    if (errCnt < 0 || BitLen < 16) { //throw away static - allow 1 and -1 (in case of threshold command first)
         PrintAndLogEx(DEBUG, "DEBUG: (NRZrawDemod) no data found, clk: %d, invert: %d, numbits: %d, errCnt: %d", clk, invert, BitLen, errCnt);
         return 0;
     }
@@ -1250,7 +1295,8 @@ int NRZrawDemod(const char *Cmd, bool verbose) {
     return 1;
 }
 
-int CmdNRZrawDemod(const char *Cmd) {
+int CmdNRZrawDemod(const char *Cmd)
+{
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) > 16 || cmdp == 'h') return usage_data_rawdemod_nr();
 
@@ -1261,14 +1307,15 @@ int CmdNRZrawDemod(const char *Cmd) {
 // takes 3 arguments - clock, invert, maxErr as integers
 // attempts to demodulate psk only
 // prints binary found and saves in demodbuffer for further commands
-int CmdPSK1rawDemod(const char *Cmd) {
+int CmdPSK1rawDemod(const char *Cmd)
+{
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) > 16 || cmdp == 'h') return usage_data_rawdemod_p1();
 
     int ans = PSKDemod(Cmd, true);
     //output
-    if (!ans){
-        if (g_debugMode) PrintAndLogEx(WARNING, "Error demoding: %d",ans);
+    if (!ans) {
+        if (g_debugMode) PrintAndLogEx(WARNING, "Error demoding: %d", ans);
         return 0;
     }
     PrintAndLogEx(NORMAL, "PSK1 demoded bitstream:");
@@ -1279,13 +1326,14 @@ int CmdPSK1rawDemod(const char *Cmd) {
 
 // by marshmellow
 // takes same args as cmdpsk1rawdemod
-int CmdPSK2rawDemod(const char *Cmd) {
+int CmdPSK2rawDemod(const char *Cmd)
+{
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) > 16 || cmdp == 'h') return usage_data_rawdemod_p2();
 
     int ans = PSKDemod(Cmd, true);
-    if (!ans){
-        if (g_debugMode) PrintAndLogEx(WARNING, "Error demoding: %d",ans);
+    if (!ans) {
+        if (g_debugMode) PrintAndLogEx(WARNING, "Error demoding: %d", ans);
         return 0;
     }
     psk1TOpsk2(DemodBuffer, DemodBufferLen);
@@ -1296,27 +1344,29 @@ int CmdPSK2rawDemod(const char *Cmd) {
 }
 
 // by marshmellow - combines all raw demod functions into one menu command
-int CmdRawDemod(const char *Cmd) {
+int CmdRawDemod(const char *Cmd)
+{
     int ans = 0;
 
     if (strlen(Cmd) > 35 || strlen(Cmd) < 2)
         return usage_data_rawdemod();
 
-    str_lower( (char *)Cmd);
+    str_lower((char *)Cmd);
 
-    if (str_startswith(Cmd, "fs"))     ans = CmdFSKrawdemod(Cmd+2);
-    else if(str_startswith(Cmd, "ab")) ans = Cmdaskbiphdemod(Cmd+2);
-    else if(str_startswith(Cmd, "am")) ans = Cmdaskmandemod(Cmd+2);
-    else if(str_startswith(Cmd, "ar")) ans = Cmdaskrawdemod(Cmd+2);
-    else if(str_startswith(Cmd, "nr")) ans = CmdNRZrawDemod(Cmd+2);
-    else if(str_startswith(Cmd, "p1")) ans = CmdPSK1rawDemod(Cmd+2);
-    else if(str_startswith(Cmd, "p2")) ans = CmdPSK2rawDemod(Cmd+2);
+    if (str_startswith(Cmd, "fs"))     ans = CmdFSKrawdemod(Cmd + 2);
+    else if (str_startswith(Cmd, "ab")) ans = Cmdaskbiphdemod(Cmd + 2);
+    else if (str_startswith(Cmd, "am")) ans = Cmdaskmandemod(Cmd + 2);
+    else if (str_startswith(Cmd, "ar")) ans = Cmdaskrawdemod(Cmd + 2);
+    else if (str_startswith(Cmd, "nr")) ans = CmdNRZrawDemod(Cmd + 2);
+    else if (str_startswith(Cmd, "p1")) ans = CmdPSK1rawDemod(Cmd + 2);
+    else if (str_startswith(Cmd, "p2")) ans = CmdPSK2rawDemod(Cmd + 2);
     else PrintAndLogEx(WARNING, "Unknown modulation entered - see help ('h') for parameter structure");
 
     return ans;
 }
 
-void setClockGrid(int clk, int offset) {
+void setClockGrid(int clk, int offset)
+{
     g_DemodStartIdx = offset;
     g_DemodClock = clk;
     PrintAndLogEx(DEBUG, "DEBUG: (setClockGrid) demodoffset %d, clk %d", offset, clk);
@@ -1340,7 +1390,8 @@ void setClockGrid(int clk, int offset) {
     }
 }
 
-int CmdGrid(const char *Cmd) {
+int CmdGrid(const char *Cmd)
+{
     sscanf(Cmd, "%i %i", &PlotGridX, &PlotGridY);
     PlotGridXdefault = PlotGridX;
     PlotGridYdefault = PlotGridY;
@@ -1348,16 +1399,18 @@ int CmdGrid(const char *Cmd) {
     return 0;
 }
 
-int CmdSetGraphMarkers(const char *Cmd) {
+int CmdSetGraphMarkers(const char *Cmd)
+{
     sscanf(Cmd, "%i %i", &CursorCPos, &CursorDPos);
     RepaintGraphWindow();
     return 0;
 }
 
-int CmdHexsamples(const char *Cmd) {
+int CmdHexsamples(const char *Cmd)
+{
     int i, j, requested = 0, offset = 0;
     char string_buf[25];
-    char* string_ptr = string_buf;
+    char *string_ptr = string_buf;
     uint8_t got[BIGBUF_SIZE];
 
     sscanf(Cmd, "%i %i", &requested, &offset);
@@ -1371,7 +1424,7 @@ int CmdHexsamples(const char *Cmd) {
         return 0;
     }
 
-    if ( !GetFromDevice(BIG_BUF, got, requested, offset, NULL, 2500, false)) {
+    if (!GetFromDevice(BIG_BUF, got, requested, offset, NULL, 2500, false)) {
         PrintAndLogEx(WARNING, "command execution time out");
         return false;
     }
@@ -1396,13 +1449,15 @@ int CmdHexsamples(const char *Cmd) {
     return 0;
 }
 
-int CmdHide(const char *Cmd) {
+int CmdHide(const char *Cmd)
+{
     HideGraphWindow();
     return 0;
 }
 
 //zero mean GraphBuffer
-int CmdHpf(const char *Cmd) {
+int CmdHpf(const char *Cmd)
+{
     uint8_t bits[GraphTraceLen];
     size_t size = getFromGraphBuf(bits);
     removeSignalOffset(bits, size);
@@ -1415,34 +1470,37 @@ int CmdHpf(const char *Cmd) {
     return 0;
 }
 
-bool _headBit( BitstreamOut *stream) {
+bool _headBit(BitstreamOut *stream)
+{
     int bytepos = stream->position >> 3; // divide by 8
     int bitpos = (stream->position++) & 7; // mask out 00000111
-    return (*(stream->buffer + bytepos) >> (7-bitpos)) & 1;
+    return (*(stream->buffer + bytepos) >> (7 - bitpos)) & 1;
 }
 
-uint8_t getByte(uint8_t bits_per_sample, BitstreamOut* b) {
+uint8_t getByte(uint8_t bits_per_sample, BitstreamOut *b)
+{
     uint8_t val = 0;
-    for(int i = 0 ; i < bits_per_sample; i++)
-        val |= (_headBit(b) << (7-i));
+    for (int i = 0 ; i < bits_per_sample; i++)
+        val |= (_headBit(b) << (7 - i));
 
     return val;
 }
 
-int getSamples(int n, bool silent) {
+int getSamples(int n, bool silent)
+{
     //If we get all but the last byte in bigbuf,
     // we don't have to worry about remaining trash
     // in the last byte in case the bits-per-sample
     // does not line up on byte boundaries
-    uint8_t got[BIGBUF_SIZE-1] = { 0 };
+    uint8_t got[BIGBUF_SIZE - 1] = { 0 };
 
-    if ( n == 0 || n > sizeof(got))
+    if (n == 0 || n > sizeof(got))
         n = sizeof(got);
 
     if (!silent) PrintAndLogEx(NORMAL, "Reading %d bytes from device memory\n", n);
 
     UsbCommand response;
-    if ( !GetFromDevice(BIG_BUF, got, n, 0, &response, 10000, true) ) {
+    if (!GetFromDevice(BIG_BUF, got, n, 0, &response, 10000, true)) {
         PrintAndLogEx(WARNING, "timeout while waiting for reply.");
         return 1;
     }
@@ -1463,14 +1521,14 @@ int getSamples(int n, bool silent) {
         if (!silent) PrintAndLogEx(NORMAL, "Unpacking...");
 
         BitstreamOut bout = { got, bits_per_sample * n,  0};
-        int j =0;
+        int j = 0;
         for (j = 0; j * bits_per_sample < n * 8 && j < n; j++) {
             uint8_t sample = getByte(bits_per_sample, &bout);
-            GraphBuffer[j] = ((int) sample )- 128;
+            GraphBuffer[j] = ((int) sample) - 128;
         }
         GraphTraceLen = j;
 
-        if (!silent) PrintAndLogEx(NORMAL, "Unpacked %d samples" , j );
+        if (!silent) PrintAndLogEx(NORMAL, "Unpacked %d samples", j);
 
     } else {
         for (int j = 0; j < n; j++) {
@@ -1490,12 +1548,14 @@ int getSamples(int n, bool silent) {
     return 0;
 }
 
-int CmdSamples(const char *Cmd) {
+int CmdSamples(const char *Cmd)
+{
     int n = strtol(Cmd, NULL, 0);
     return getSamples(n, false);
 }
 
-int CmdTuneSamples(const char *Cmd) {
+int CmdTuneSamples(const char *Cmd)
+{
 #define NON_VOLTAGE     1000
 #define LF_UNUSABLE_V   2000
 #define LF_MARGINAL_V   10000
@@ -1512,13 +1572,14 @@ int CmdTuneSamples(const char *Cmd) {
     int timeout = 0;
     PrintAndLogEx(INFO, "\nmeasuring antenna characteristics, please wait...");
 
-    UsbCommand c = {CMD_MEASURE_ANTENNA_TUNING, {0,0,0}};
+    UsbCommand c = {CMD_MEASURE_ANTENNA_TUNING, {0, 0, 0}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
     while (!WaitForResponseTimeout(CMD_MEASURED_ANTENNA_TUNING, &resp, 2000)) {
         timeout++;
-        printf("."); fflush(stdout);
+        printf(".");
+        fflush(stdout);
         if (timeout > 7) {
             PrintAndLogEx(WARNING, "\nno response from Proxmark. Aborting...");
             return 1;
@@ -1533,45 +1594,45 @@ int CmdTuneSamples(const char *Cmd) {
     uint32_t peakf = resp.arg[2];
     uint32_t peakv = resp.arg[2] >> 32;
 
-    if ( v_lf125 > NON_VOLTAGE )
-        PrintAndLogEx(SUCCESS, "LF antenna: %5.2f V - 125.00 kHz", (v_lf125 * ANTENNA_ERROR)/1000.0);
-    if ( v_lf134 > NON_VOLTAGE )
-        PrintAndLogEx(SUCCESS, "LF antenna: %5.2f V - 134.00 kHz", (v_lf134 * ANTENNA_ERROR)/1000.0);
-    if ( peakv > NON_VOLTAGE && peakf > 0 )
-        PrintAndLogEx(SUCCESS, "LF optimal: %5.2f V - %6.2f kHz", (peakv * ANTENNA_ERROR)/1000.0, 12000.0/(peakf+1));
+    if (v_lf125 > NON_VOLTAGE)
+        PrintAndLogEx(SUCCESS, "LF antenna: %5.2f V - 125.00 kHz", (v_lf125 * ANTENNA_ERROR) / 1000.0);
+    if (v_lf134 > NON_VOLTAGE)
+        PrintAndLogEx(SUCCESS, "LF antenna: %5.2f V - 134.00 kHz", (v_lf134 * ANTENNA_ERROR) / 1000.0);
+    if (peakv > NON_VOLTAGE && peakf > 0)
+        PrintAndLogEx(SUCCESS, "LF optimal: %5.2f V - %6.2f kHz", (peakv * ANTENNA_ERROR) / 1000.0, 12000.0 / (peakf + 1));
 
     char judgement[20];
     memset(judgement, 0, sizeof(judgement));
     // LF evaluation
     if (peakv < LF_UNUSABLE_V)
-        sprintf(judgement, _RED_(UNUSABLE) );
+        sprintf(judgement, _RED_(UNUSABLE));
     else if (peakv < LF_MARGINAL_V)
-        sprintf(judgement, _YELLOW_(MARGINAL) );
+        sprintf(judgement, _YELLOW_(MARGINAL));
     else
-        sprintf(judgement, _GREEN_(OK) );
+        sprintf(judgement, _GREEN_(OK));
 
     PrintAndLogEx(NORMAL, "%sLF antenna is %s \n"
-            , (peakv < LF_UNUSABLE_V) ? _CYAN_([!]) : _GREEN_([+])
-            , judgement
-            );
+                  , (peakv < LF_UNUSABLE_V) ? _CYAN_([!]) : _GREEN_([+])
+                  , judgement
+                 );
 
     // HF evaluation
-    if ( v_hf > NON_VOLTAGE )
-        PrintAndLogEx(SUCCESS, "HF antenna: %5.2f V - 13.56 MHz", (v_hf * ANTENNA_ERROR)/1000.0);
+    if (v_hf > NON_VOLTAGE)
+        PrintAndLogEx(SUCCESS, "HF antenna: %5.2f V - 13.56 MHz", (v_hf * ANTENNA_ERROR) / 1000.0);
 
     memset(judgement, 0, sizeof(judgement));
 
     if (v_hf < HF_UNUSABLE_V)
-        sprintf(judgement, _RED_(UNUSABLE) );
+        sprintf(judgement, _RED_(UNUSABLE));
     else if (v_hf < HF_MARGINAL_V)
-        sprintf(judgement, _YELLOW_(MARGINAL) );
+        sprintf(judgement, _YELLOW_(MARGINAL));
     else
-        sprintf(judgement, _GREEN_(OK) );
+        sprintf(judgement, _GREEN_(OK));
 
     PrintAndLogEx(NORMAL, "%sHF antenna is %s"
-            , (v_hf < HF_UNUSABLE_V) ? _CYAN_([!]) : _GREEN_([+])
-            , judgement
-            );
+                  , (v_hf < HF_UNUSABLE_V) ? _CYAN_([!]) : _GREEN_([+])
+                  , judgement
+                 );
 
     // graph LF measurements
     // even here, these values has 3% error.
@@ -1580,7 +1641,7 @@ int CmdTuneSamples(const char *Cmd) {
         GraphBuffer[i] = resp.d.asBytes[i] - 128;
         test += resp.d.asBytes[i];
     }
-    if ( test > 0 ) {
+    if (test > 0) {
         PrintAndLogEx(SUCCESS, "\nDisplaying LF tuning graph. Divisor 89 is 134khz, 95 is 125khz.\n\n");
         GraphTraceLen = 256;
         ShowGraphWindow();
@@ -1593,7 +1654,8 @@ int CmdTuneSamples(const char *Cmd) {
     return 0;
 }
 
-int CmdLoad(const char *Cmd) {
+int CmdLoad(const char *Cmd)
+{
     char filename[FILE_PATH_SIZE] = {0x00};
     int len = 0;
 
@@ -1609,11 +1671,11 @@ int CmdLoad(const char *Cmd) {
 
     GraphTraceLen = 0;
     char line[80];
-    while (fgets(line, sizeof (line), f)) {
+    while (fgets(line, sizeof(line), f)) {
         GraphBuffer[GraphTraceLen] = atoi(line);
         GraphTraceLen++;
 
-        if ( GraphTraceLen >= MAX_GRAPH_TRACE_LEN )
+        if (GraphTraceLen >= MAX_GRAPH_TRACE_LEN)
             break;
     }
 
@@ -1629,20 +1691,21 @@ int CmdLoad(const char *Cmd) {
     setGraphBuf(bits, size);
     computeSignalProperties(bits, size);
 
-    setClockGrid(0,0);
+    setClockGrid(0, 0);
     DemodBufferLen = 0;
     RepaintGraphWindow();
     return 0;
 }
 
 // trim graph from the end
-int CmdLtrim(const char *Cmd) {
+int CmdLtrim(const char *Cmd)
+{
     // sanitycheck
     if (GraphTraceLen <= 0) return 1;
 
     int ds = atoi(Cmd);
     for (int i = ds; i < GraphTraceLen; ++i)
-        GraphBuffer[i-ds] = GraphBuffer[i];
+        GraphBuffer[i - ds] = GraphBuffer[i];
 
     GraphTraceLen -= ds;
     RepaintGraphWindow();
@@ -1650,7 +1713,8 @@ int CmdLtrim(const char *Cmd) {
 }
 
 // trim graph from the beginning
-int CmdRtrim(const char *Cmd) {
+int CmdRtrim(const char *Cmd)
+{
 
     int ds = atoi(Cmd);
 
@@ -1663,7 +1727,8 @@ int CmdRtrim(const char *Cmd) {
 }
 
 // trim graph (middle) piece
-int CmdMtrim(const char *Cmd) {
+int CmdMtrim(const char *Cmd)
+{
     int start = 0, stop = 0;
     sscanf(Cmd, "%i %i", &start, &stop);
 
@@ -1674,12 +1739,13 @@ int CmdMtrim(const char *Cmd) {
 
     GraphTraceLen = stop - start;
     for (int i = 0; i < GraphTraceLen; i++)
-        GraphBuffer[i] = GraphBuffer[start+i];
+        GraphBuffer[i] = GraphBuffer[start + i];
 
     return 0;
 }
 
-int CmdNorm(const char *Cmd) {
+int CmdNorm(const char *Cmd)
+{
     int i;
     int max = INT_MIN, min = INT_MAX;
 
@@ -1705,12 +1771,14 @@ int CmdNorm(const char *Cmd) {
     return 0;
 }
 
-int CmdPlot(const char *Cmd) {
+int CmdPlot(const char *Cmd)
+{
     ShowGraphWindow();
     return 0;
 }
 
-int CmdSave(const char *Cmd) {
+int CmdSave(const char *Cmd)
+{
 
     int len = 0;
     char filename[FILE_PATH_SIZE] = {0x00};
@@ -1720,7 +1788,7 @@ int CmdSave(const char *Cmd) {
     memcpy(filename, Cmd, len);
 
     FILE *f = fopen(filename, "w");
-    if(!f) {
+    if (!f) {
         PrintAndLogEx(WARNING, "couldn't open '%s'", filename);
         return 0;
     }
@@ -1735,7 +1803,8 @@ int CmdSave(const char *Cmd) {
     return 0;
 }
 
-int CmdScale(const char *Cmd) {
+int CmdScale(const char *Cmd)
+{
     CursorScaleFactor = atoi(Cmd);
     if (CursorScaleFactor == 0) {
         PrintAndLogEx(FAILED, "bad, can't have zero scale");
@@ -1745,7 +1814,8 @@ int CmdScale(const char *Cmd) {
     return 0;
 }
 
-int directionalThreshold(const int* in, int *out, size_t len, int8_t up, int8_t down) {
+int directionalThreshold(const int *in, int *out, size_t len, int8_t up, int8_t down)
+{
 
     int lastValue = in[0];
 
@@ -1755,21 +1825,17 @@ int directionalThreshold(const int* in, int *out, size_t len, int8_t up, int8_t
 
     for (size_t i = 1; i < len; ++i) {
         // Apply first threshold to samples heading up
-        if (in[i] >= up && in[i] > lastValue)
-        {
+        if (in[i] >= up && in[i] > lastValue) {
             lastValue = out[i]; // Buffer last value as we overwrite it.
             out[i] = 1;
         }
         // Apply second threshold to samples heading down
-        else if (in[i] <= down && in[i] < lastValue)
-        {
+        else if (in[i] <= down && in[i] < lastValue) {
             lastValue = out[i]; // Buffer last value as we overwrite it.
             out[i] = -1;
-        }
-        else
-        {
+        } else {
             lastValue = out[i]; // Buffer last value as we overwrite it.
-            out[i] = out[i-1];
+            out[i] = out[i - 1];
         }
     }
 
@@ -1778,7 +1844,8 @@ int directionalThreshold(const int* in, int *out, size_t len, int8_t up, int8_t
     return 0;
 }
 
-int CmdDirectionalThreshold(const char *Cmd) {
+int CmdDirectionalThreshold(const char *Cmd)
+{
     int8_t up = param_get8(Cmd, 0);
     int8_t down = param_get8(Cmd, 1);
 
@@ -1796,7 +1863,8 @@ int CmdDirectionalThreshold(const char *Cmd) {
     return 0;
 }
 
-int CmdZerocrossings(const char *Cmd) {
+int CmdZerocrossings(const char *Cmd)
+{
     // Zero-crossings aren't meaningful unless the signal is zero-mean.
     CmdHpf("");
 
@@ -1832,23 +1900,24 @@ int CmdZerocrossings(const char *Cmd) {
  * @param Cmd
  * @return
  */
-int Cmdbin2hex(const char *Cmd) {
+int Cmdbin2hex(const char *Cmd)
+{
     int bg = 0, en = 0;
     if (param_getptr(Cmd, &bg, &en, 0))
         return usage_data_bin2hex();
 
     //Number of digits supplied as argument
     size_t length = en - bg + 1;
-    size_t bytelen = (length+7) / 8;
-    uint8_t* arr = (uint8_t *) calloc(bytelen, sizeof(uint8_t));
+    size_t bytelen = (length + 7) / 8;
+    uint8_t *arr = (uint8_t *) calloc(bytelen, sizeof(uint8_t));
     memset(arr, 0, bytelen);
     BitstreamOut bout = { arr, 0, 0 };
 
     for (; bg <= en; bg++) {
         char c = Cmd[bg];
-        if( c == '1')
+        if (c == '1')
             pushBit(&bout, 1);
-        else if( c == '0')
+        else if (c == '0')
             pushBit(&bout, 0);
         else
             PrintAndLogEx(NORMAL, "Ignoring '%c'", c);
@@ -1862,11 +1931,12 @@ int Cmdbin2hex(const char *Cmd) {
     return 0;
 }
 
-int Cmdhex2bin(const char *Cmd) {
+int Cmdhex2bin(const char *Cmd)
+{
     int bg = 0, en = 0;
     if (param_getptr(Cmd, &bg, &en, 0)) return usage_data_hex2bin();
 
-    while (bg <= en ) {
+    while (bg <= en) {
         char x = Cmd[bg++];
         // capitalize
         if (x >= 'a' && x <= 'f')
@@ -1882,36 +1952,37 @@ int Cmdhex2bin(const char *Cmd) {
         //Uses printf instead of PrintAndLog since the latter
         // adds linebreaks to each printout - this way was more convenient since we don't have to
         // allocate a string and write to that first...
-        for(int i = 0 ; i < 4 ; ++i)
-            PrintAndLogEx(NORMAL, "%d",(x >> (3 - i)) & 1);
+        for (int i = 0 ; i < 4 ; ++i)
+            PrintAndLogEx(NORMAL, "%d", (x >> (3 - i)) & 1);
     }
     PrintAndLogEx(NORMAL, "\n");
     return 0;
 }
 
-    /* // example of FSK2 RF/50 Tones
-    static const int LowTone[]  = {
-    1,  1,  1,  1,  1, -1, -1, -1, -1, -1,
-    1,  1,  1,  1,  1, -1, -1, -1, -1, -1,
-    1,  1,  1,  1,  1, -1, -1, -1, -1, -1,
-    1,  1,  1,  1,  1, -1, -1, -1, -1, -1,
-    1,  1,  1,  1,  1, -1, -1, -1, -1, -1
-    };
-    static const int HighTone[] = {
-    1,  1,  1,  1,  1,     -1, -1, -1, -1, // note one extra 1 to padd due to 50/8 remainder (1/2 the remainder)
-    1,  1,  1,  1,         -1, -1, -1, -1,
-    1,  1,  1,  1,         -1, -1, -1, -1,
-    1,  1,  1,  1,         -1, -1, -1, -1,
-    1,  1,  1,  1,         -1, -1, -1, -1,
-    1,  1,  1,  1,     -1, -1, -1, -1, -1, // note one extra -1 to padd due to 50/8 remainder
-    };
-    */
-void GetHiLoTone(int *LowTone, int *HighTone, int clk, int LowToneFC, int HighToneFC) {
-    int i,j=0;
-    int Left_Modifier = ((clk % LowToneFC) % 2) + ((clk % LowToneFC)/2);
+/* // example of FSK2 RF/50 Tones
+static const int LowTone[]  = {
+1,  1,  1,  1,  1, -1, -1, -1, -1, -1,
+1,  1,  1,  1,  1, -1, -1, -1, -1, -1,
+1,  1,  1,  1,  1, -1, -1, -1, -1, -1,
+1,  1,  1,  1,  1, -1, -1, -1, -1, -1,
+1,  1,  1,  1,  1, -1, -1, -1, -1, -1
+};
+static const int HighTone[] = {
+1,  1,  1,  1,  1,     -1, -1, -1, -1, // note one extra 1 to padd due to 50/8 remainder (1/2 the remainder)
+1,  1,  1,  1,         -1, -1, -1, -1,
+1,  1,  1,  1,         -1, -1, -1, -1,
+1,  1,  1,  1,         -1, -1, -1, -1,
+1,  1,  1,  1,         -1, -1, -1, -1,
+1,  1,  1,  1,     -1, -1, -1, -1, -1, // note one extra -1 to padd due to 50/8 remainder
+};
+*/
+void GetHiLoTone(int *LowTone, int *HighTone, int clk, int LowToneFC, int HighToneFC)
+{
+    int i, j = 0;
+    int Left_Modifier = ((clk % LowToneFC) % 2) + ((clk % LowToneFC) / 2);
     int Right_Modifier = (clk % LowToneFC) / 2;
     //int HighToneMod = clk mod HighToneFC;
-    int LeftHalfFCCnt = (LowToneFC % 2) + (LowToneFC/2); //truncate
+    int LeftHalfFCCnt = (LowToneFC % 2) + (LowToneFC / 2); //truncate
     int FCs_per_clk = clk / LowToneFC;
 
     // need to correctly split up the clock to field clocks.
@@ -1927,21 +1998,21 @@ void GetHiLoTone(int *LowTone, int *HighTone, int clk, int LowToneFC, int HighTo
     for (i = 0; i < (FCs_per_clk); i++) {
         // loop # of samples per field clock
         for (j = 0; j < LowToneFC; j++) {
-            LowTone[ (i * LowToneFC) + Left_Modifier + j] = ( j < LeftHalfFCCnt ) ? 1 : -1;
+            LowTone[(i * LowToneFC) + Left_Modifier + j] = (j < LeftHalfFCCnt) ? 1 : -1;
         }
     }
 
     int k;
     // add last -1 modifiers
     for (k = 0; k < Right_Modifier; k++) {
-        LowTone[ ( (i-1) * LowToneFC) + Left_Modifier + j + k] = -1;
+        LowTone[((i - 1) * LowToneFC) + Left_Modifier + j + k] = -1;
     }
 
     // now do hightone
-    Left_Modifier = ((clk % HighToneFC) % 2) + ((clk % HighToneFC)/2);
+    Left_Modifier = ((clk % HighToneFC) % 2) + ((clk % HighToneFC) / 2);
     Right_Modifier = (clk % HighToneFC) / 2;
-    LeftHalfFCCnt = (HighToneFC % 2) + (HighToneFC/2); //truncate
-    FCs_per_clk = clk/HighToneFC;
+    LeftHalfFCCnt = (HighToneFC % 2) + (HighToneFC / 2); //truncate
+    FCs_per_clk = clk / HighToneFC;
 
     for (i = 0; i < Left_Modifier; i++) {
         HighTone[i] = 1;
@@ -1951,17 +2022,17 @@ void GetHiLoTone(int *LowTone, int *HighTone, int clk, int LowToneFC, int HighTo
     for (i = 0; i < (FCs_per_clk); i++) {
         // loop # of samples per field clock
         for (j = 0; j < HighToneFC; j++) {
-            HighTone[(i * HighToneFC) + Left_Modifier + j] = ( j < LeftHalfFCCnt ) ? 1 : -1;
+            HighTone[(i * HighToneFC) + Left_Modifier + j] = (j < LeftHalfFCCnt) ? 1 : -1;
         }
     }
 
     // add last -1 modifiers
     for (k = 0; k < Right_Modifier; k++) {
-        PrintAndLogEx(NORMAL, "(i-1)*HighToneFC+lm+j+k %i", ((i-1) * HighToneFC) + Left_Modifier + j + k);
-        HighTone[ ( (i-1) * HighToneFC) + Left_Modifier + j + k] = -1;
+        PrintAndLogEx(NORMAL, "(i-1)*HighToneFC+lm+j+k %i", ((i - 1) * HighToneFC) + Left_Modifier + j + k);
+        HighTone[((i - 1) * HighToneFC) + Left_Modifier + j + k] = -1;
     }
     if (g_debugMode == 2) {
-        for ( i = 0; i < clk; i++) {
+        for (i = 0; i < clk; i++) {
             PrintAndLogEx(NORMAL, "Low: %i,  High: %i", LowTone[i], HighTone[i]);
         }
     }
@@ -1969,19 +2040,20 @@ void GetHiLoTone(int *LowTone, int *HighTone, int clk, int LowToneFC, int HighTo
 
 //old CmdFSKdemod adapted by marshmellow
 //converts FSK to clear NRZ style wave.  (or demodulates)
-int FSKToNRZ(int *data, int *dataLen, int clk, int LowToneFC, int HighToneFC) {
+int FSKToNRZ(int *data, int *dataLen, int clk, int LowToneFC, int HighToneFC)
+{
     uint8_t ans = 0;
     if (clk == 0 || LowToneFC == 0 || HighToneFC == 0) {
-        int firstClockEdge=0;
+        int firstClockEdge = 0;
         ans = fskClocks((uint8_t *) &LowToneFC, (uint8_t *) &HighToneFC, (uint8_t *) &clk, &firstClockEdge);
         if (g_debugMode > 1) {
-            PrintAndLog ("DEBUG FSKtoNRZ: detected clocks: fc_low %i, fc_high %i, clk %i, firstClockEdge %i, ans %u", LowToneFC, HighToneFC, clk, firstClockEdge, ans);
+            PrintAndLog("DEBUG FSKtoNRZ: detected clocks: fc_low %i, fc_high %i, clk %i, firstClockEdge %i, ans %u", LowToneFC, HighToneFC, clk, firstClockEdge, ans);
         }
     }
     // currently only know fsk modulations with field clocks < 10 samples and > 4 samples. filter out to remove false positives (and possibly destroying ask/psk modulated waves...)
     if (ans == 0 || clk == 0 || LowToneFC == 0 || HighToneFC == 0 || LowToneFC > 10 || HighToneFC < 4) {
         if (g_debugMode > 1) {
-            PrintAndLog ("DEBUG FSKtoNRZ: no fsk clocks found");
+            PrintAndLog("DEBUG FSKtoNRZ: no fsk clocks found");
         }
         return 0;
     }
@@ -2010,15 +2082,15 @@ int FSKToNRZ(int *data, int *dataLen, int clk, int LowToneFC, int HighToneFC) {
     // now we have the abs( [average sample value per clk] * 100 ) for each tone
     //   loop through again [all samples] - clk - 16
     //                  note why 16???  is 16 the largest FC? changed to LowToneFC as that should be the > fc
-    for(i = 0; i < *dataLen - clk - LowToneFC; ++i) {
+    for (i = 0; i < *dataLen - clk - LowToneFC; ++i) {
         int lowTot = 0, highTot = 0;
 
         // sum a field clock width of abs( [average sample values per clk] * 100) for each tone
         for (j = 0; j < LowToneFC; ++j) {  //10 for fsk2
-          lowTot += (data[i + j] & 0xffff);
+            lowTot += (data[i + j] & 0xffff);
         }
         for (j = 0; j < HighToneFC; j++) {  //8 for fsk2
-          highTot += (data[i + j] >> 16);
+            highTot += (data[i + j] >> 16);
         }
 
         // subtract the sum of lowTone averages by the sum of highTone averages as it
@@ -2030,7 +2102,8 @@ int FSKToNRZ(int *data, int *dataLen, int clk, int LowToneFC, int HighToneFC) {
     return 0;
 }
 
-int CmdFSKToNRZ(const char *Cmd) {
+int CmdFSKToNRZ(const char *Cmd)
+{
     // take clk, fc_low, fc_high
     //   blank = auto;
     bool errors = false;
@@ -2038,26 +2111,26 @@ int CmdFSKToNRZ(const char *Cmd) {
     int  clk = 0, fc_low = 10, fc_high = 8;
     while (param_getchar(Cmd, cmdp) != 0x00) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
-        case 'h':
-            return usage_data_fsktonrz();
-        case 'c':
-            clk = param_get32ex(Cmd, cmdp+1, 0, 10);
-            cmdp += 2;
-            break;
-        case 'f':
-            fc_high = param_get32ex(Cmd, cmdp+1, 0, 10);
-            cmdp += 2;
-            break;
-        case 'l':
-            fc_low = param_get32ex(Cmd, cmdp+1, 0, 10);
-            cmdp += 2;
-            break;
-        default:
-            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-            errors = true;
-            break;
+            case 'h':
+                return usage_data_fsktonrz();
+            case 'c':
+                clk = param_get32ex(Cmd, cmdp + 1, 0, 10);
+                cmdp += 2;
+                break;
+            case 'f':
+                fc_high = param_get32ex(Cmd, cmdp + 1, 0, 10);
+                cmdp += 2;
+                break;
+            case 'l':
+                fc_low = param_get32ex(Cmd, cmdp + 1, 0, 10);
+                cmdp += 2;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                errors = true;
+                break;
         }
-        if(errors) break;
+        if (errors) break;
     }
     //Validations
     if (errors) return usage_data_fsktonrz();
@@ -2070,7 +2143,8 @@ int CmdFSKToNRZ(const char *Cmd) {
     return ans;
 }
 
-int CmdDataIIR(const char *Cmd){
+int CmdDataIIR(const char *Cmd)
+{
     uint8_t k = param_get8(Cmd, 0);
     //iceIIR_Butterworth(GraphBuffer, GraphTraceLen);
     iceSimple_Filter(GraphBuffer, GraphTraceLen, k);
@@ -2087,7 +2161,7 @@ static command_t CommandTable[] = {
     {"help",            CmdHelp,            1, "This help"},
     {"askedgedetect",   CmdAskEdgeDetect,   1, "[threshold] Adjust Graph for manual ASK demod using the length of sample differences to detect the edge of a wave (use 20-45, def:25)"},
     {"autocorr",        CmdAutoCorr,        1, "[window length] [g] -- Autocorrelation over window - g to save back to GraphBuffer (overwrite)"},
-    {"biphaserawdecode",CmdBiphaseDecodeRaw,1, "[offset] [invert<0|1>] [maxErr] -- Biphase decode bin stream in DemodBuffer (offset = 0|1 bits to shift the decode start)"},
+    {"biphaserawdecode", CmdBiphaseDecodeRaw, 1, "[offset] [invert<0|1>] [maxErr] -- Biphase decode bin stream in DemodBuffer (offset = 0|1 bits to shift the decode start)"},
     {"bin2hex",         Cmdbin2hex,         1, "<digits> -- Converts binary to hexadecimal"},
     {"bitsamples",      CmdBitsamples,      0, "Get raw samples as bitstring"},
     {"buffclear",       CmdBuffClear,       1, "Clears bigbuff on deviceside and graph window"},
@@ -2108,7 +2182,7 @@ static command_t CommandTable[] = {
     {"manrawdecode",    Cmdmandecoderaw,    1, "[invert] [maxErr] -- Manchester decode binary stream in DemodBuffer"},
     {"norm",            CmdNorm,            1, "Normalize max/min to +/-128"},
     {"plot",            CmdPlot,            1, "Show graph window (hit 'h' in window for keystroke help)"},
-    {"printdemodbuffer",CmdPrintDemodBuff,  1, "[x] [o] <offset> [l] <length> -- print the data in the DemodBuffer - 'x' for hex output"},
+    {"printdemodbuffer", CmdPrintDemodBuff,  1, "[x] [o] <offset> [l] <length> -- print the data in the DemodBuffer - 'x' for hex output"},
     {"rawdemod",        CmdRawDemod,        1, "[modulation] ... <options> -see help (h option) -- Demodulate the data in the GraphBuffer and output binary"},
     {"samples",         CmdSamples,         0, "[512 - 40000] -- Get raw samples for graph window (GraphBuffer)"},
     {"save",            CmdSave,            1, "<filename> -- Save trace (from graph window)"},
@@ -2124,13 +2198,15 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdData(const char *Cmd) {
+int CmdData(const char *Cmd)
+{
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
+int CmdHelp(const char *Cmd)
+{
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmddata.h b/client/cmddata.h
index 605bc3298..86f19d81d 100644
--- a/client/cmddata.h
+++ b/client/cmddata.h
@@ -32,7 +32,7 @@
 #include "loclass/cipherutils.h" // for decimating samples in getsamples
 #include "cmdlfem4x.h" // askem410xdecode
 
-command_t * CmdDataCommands();
+command_t *CmdDataCommands();
 
 int CmdData(const char *Cmd);
 void printDemodBuff(void);
@@ -83,7 +83,7 @@ int PSKDemod(const char *Cmd, bool verbose);
 int NRZrawDemod(const char *Cmd, bool verbose);
 int getSamples(int n, bool silent);
 void setClockGrid(int clk, int offset);
-int directionalThreshold(const int* in, int *out, size_t len, int8_t up, int8_t down);
+int directionalThreshold(const int *in, int *out, size_t len, int8_t up, int8_t down);
 extern int AskEdgeDetect(const int *in, int *out, int len, int threshold);
 
 int CmdDataIIR(const char *Cmd);
diff --git a/client/cmdflashmem.c b/client/cmdflashmem.c
index f6a6e8518..68faf826e 100644
--- a/client/cmdflashmem.c
+++ b/client/cmdflashmem.c
@@ -26,7 +26,8 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_flashmem_spibaud(void){
+int usage_flashmem_spibaud(void)
+{
     PrintAndLogEx(NORMAL, "Usage:  mem spibaud [h] <baudrate>");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "           h    this help");
@@ -40,7 +41,8 @@ int usage_flashmem_spibaud(void){
     return 0;
 }
 
-int usage_flashmem_read(void){
+int usage_flashmem_read(void)
+{
     PrintAndLogEx(NORMAL, "Read flash memory on device");
     PrintAndLogEx(NORMAL, "Usage:  mem read o <offset> l <len>");
     PrintAndLogEx(NORMAL, "  o <offset>    :      offset in memory");
@@ -51,7 +53,8 @@ int usage_flashmem_read(void){
     PrintAndLogEx(NORMAL, "        mem read o 1024 l 10"); // read 10 bytes starting at offset 1024
     return 0;
 }
-int usage_flashmem_load(void){
+int usage_flashmem_load(void)
+{
     PrintAndLogEx(NORMAL, "Loads binary file into flash memory on device");
     PrintAndLogEx(NORMAL, "Usage:  mem load o <offset> f <file name> m t i");
     PrintAndLogEx(NORMAL, "  o <offset>    :      offset in memory");
@@ -68,7 +71,8 @@ int usage_flashmem_load(void){
     PrintAndLogEx(NORMAL, "        mem load f default_iclass_keys i");
     return 0;
 }
-int usage_flashmem_save(void){
+int usage_flashmem_save(void)
+{
     PrintAndLogEx(NORMAL, "Saves flash memory on device into the file");
     PrintAndLogEx(NORMAL, " Usage:  mem save o <offset> l <length> f <file name>");
     PrintAndLogEx(NORMAL, "  o <offset>    :      offset in memory");
@@ -81,7 +85,8 @@ int usage_flashmem_save(void){
     PrintAndLogEx(NORMAL, "        mem save f myfile o 1024 l 4096");   // downlowd 4096 bytes from offset 1024 to file myfile
     return 0;
 }
-int usage_flashmem_wipe(void){
+int usage_flashmem_wipe(void)
+{
 
     PrintAndLogEx(WARNING, "[OBS] use with caution.");
     PrintAndLogEx(NORMAL, "Wipe flash memory on device, which fills memory with 0xFF\n");
@@ -95,7 +100,8 @@ int usage_flashmem_wipe(void){
     PrintAndLogEx(NORMAL, "        mem wipe p 0");  // wipes first page.
     return 0;
 }
-int usage_flashmem_info(void){
+int usage_flashmem_info(void)
+{
     PrintAndLogEx(NORMAL, "Collect signature and verify it from flash memory\n");
     PrintAndLogEx(NORMAL, " Usage:  mem info [h|s|w]");
     PrintAndLogEx(NORMAL, "  s    :      create a signature");
@@ -107,7 +113,8 @@ int usage_flashmem_info(void){
     return 0;
 }
 
-int CmdFlashMemRead(const char *Cmd) {
+int CmdFlashMemRead(const char *Cmd)
+{
 
     uint8_t cmdp = 0;
     bool errors = false;
@@ -115,25 +122,25 @@ int CmdFlashMemRead(const char *Cmd) {
 
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
-        case 'o':
-            start_index = param_get32ex(Cmd, cmdp+1, 0, 10);
-            cmdp += 2;
-            break;
-        case 'l':
-            len = param_get32ex(Cmd, cmdp+1, 0, 10);
-            cmdp += 2;
-            break;
-        case 'h':
-            return usage_flashmem_read();
-        default:
-            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-            errors = true;
-            break;
+            case 'o':
+                start_index = param_get32ex(Cmd, cmdp + 1, 0, 10);
+                cmdp += 2;
+                break;
+            case 'l':
+                len = param_get32ex(Cmd, cmdp + 1, 0, 10);
+                cmdp += 2;
+                break;
+            case 'h':
+                return usage_flashmem_read();
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                errors = true;
+                break;
         }
     }
 
     //Validations
-    if (errors || cmdp == 0 ) return usage_flashmem_read();
+    if (errors || cmdp == 0) return usage_flashmem_read();
 
     if (start_index + len > FLASH_MEM_MAX_SIZE) {
         PrintAndLogDevice(WARNING, "error, start_index + length is larger than available memory");
@@ -146,19 +153,21 @@ int CmdFlashMemRead(const char *Cmd) {
     return 0;
 }
 
-int CmdFlashmemSpiBaudrate(const char *Cmd) {
+int CmdFlashmemSpiBaudrate(const char *Cmd)
+{
 
     char ctmp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) < 1 || ctmp == 'h') return usage_flashmem_spibaud();
     uint32_t baudrate = param_get32ex(Cmd, 0, 0, 10);
     baudrate = baudrate * 1000000;
-    if (baudrate != FLASH_BAUD && baudrate != FLASH_MINBAUD ) return usage_flashmem_spibaud();
+    if (baudrate != FLASH_BAUD && baudrate != FLASH_MINBAUD) return usage_flashmem_spibaud();
     UsbCommand c = {CMD_FLASHMEM_SET_SPIBAUDRATE, {baudrate, 0, 0}};
     SendCommand(&c);
     return 0;
 }
 
-int CmdFlashMemLoad(const char *Cmd){
+int CmdFlashMemLoad(const char *Cmd)
+{
 
     uint32_t start_index = 0;
     char filename[FILE_PATH_SIZE] = {0};
@@ -168,41 +177,41 @@ int CmdFlashMemLoad(const char *Cmd){
 
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
-        case 'h':
-            return usage_flashmem_load();
-        case 'f':
-            if ( param_getstr(Cmd, cmdp+1, filename, FILE_PATH_SIZE) >= FILE_PATH_SIZE ) {
-                PrintAndLogEx(FAILED, "Filename too long");
+            case 'h':
+                return usage_flashmem_load();
+            case 'f':
+                if (param_getstr(Cmd, cmdp + 1, filename, FILE_PATH_SIZE) >= FILE_PATH_SIZE) {
+                    PrintAndLogEx(FAILED, "Filename too long");
+                    errors = true;
+                    break;
+                }
+                cmdp += 2;
+                break;
+            case 'o':
+                start_index = param_get32ex(Cmd, cmdp + 1, 0, 10);
+                cmdp += 2;
+                break;
+            case 'm':
+                d = DICTIONARY_MIFARE;
+                cmdp++;
+                break;
+            case 't':
+                d = DICTIONARY_T55XX;
+                cmdp++;
+                break;
+            case 'i':
+                d = DICTIONARY_ICLASS;
+                cmdp++;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
                 errors = true;
                 break;
-            }
-            cmdp += 2;
-            break;
-        case 'o':
-            start_index = param_get32ex(Cmd, cmdp+1, 0, 10);
-            cmdp += 2;
-            break;
-        case 'm':
-            d = DICTIONARY_MIFARE;
-            cmdp++;
-            break;
-        case 't':
-            d = DICTIONARY_T55XX;
-            cmdp++;
-            break;
-        case 'i':
-            d = DICTIONARY_ICLASS;
-            cmdp++;
-            break;
-        default:
-            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-            errors = true;
-            break;
         }
     }
 
     //Validations
-    if (errors || cmdp == 0 ) return usage_flashmem_load();
+    if (errors || cmdp == 0) return usage_flashmem_load();
 
     size_t datalen = 0;
     uint16_t keycount = 0;
@@ -212,8 +221,8 @@ int CmdFlashMemLoad(const char *Cmd){
     switch (d) {
         case DICTIONARY_MIFARE:
             start_index = DEFAULT_MF_KEYS_OFFSET;
-            res = loadFileDICTIONARY(filename, "dic", data+2, &datalen, 6, &keycount );
-            if ( res || !keycount) {
+            res = loadFileDICTIONARY(filename, "dic", data + 2, &datalen, 6, &keycount);
+            if (res || !keycount) {
                 free(data);
                 return 1;
             }
@@ -223,8 +232,8 @@ int CmdFlashMemLoad(const char *Cmd){
             break;
         case DICTIONARY_T55XX:
             start_index = DEFAULT_T55XX_KEYS_OFFSET;
-            res = loadFileDICTIONARY(filename, "dic", data+2, &datalen, 4, &keycount );
-            if ( res || !keycount) {
+            res = loadFileDICTIONARY(filename, "dic", data + 2, &datalen, 4, &keycount);
+            if (res || !keycount) {
                 free(data);
                 return 1;
             }
@@ -234,8 +243,8 @@ int CmdFlashMemLoad(const char *Cmd){
             break;
         case DICTIONARY_ICLASS:
             start_index = DEFAULT_ICLASS_KEYS_OFFSET;
-            res = loadFileDICTIONARY(filename, "dic", data+2, &datalen, 8, &keycount );
-            if ( res || !keycount) {
+            res = loadFileDICTIONARY(filename, "dic", data + 2, &datalen, 8, &keycount);
+            if (res || !keycount) {
                 free(data);
                 return 1;
             }
@@ -247,7 +256,7 @@ int CmdFlashMemLoad(const char *Cmd){
 
             res = loadFile(filename, "bin", data, &datalen);
             //int res = loadFileEML( filename, "eml", data, &datalen);
-            if ( res ) {
+            if (res) {
                 free(data);
                 return 1;
             }
@@ -266,7 +275,7 @@ int CmdFlashMemLoad(const char *Cmd){
     uint32_t bytes_sent = 0;
     uint32_t bytes_remaining = datalen;
 
-    while (bytes_remaining > 0){
+    while (bytes_remaining > 0) {
         uint32_t bytes_in_packet = MIN(FLASH_MEM_BLOCK_SIZE, bytes_remaining);
 
         UsbCommand c = {CMD_FLASHMEM_WRITE, {start_index + bytes_sent, bytes_in_packet, 0}};
@@ -279,7 +288,7 @@ int CmdFlashMemLoad(const char *Cmd){
         bytes_sent += bytes_in_packet;
 
         UsbCommand resp;
-        if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
+        if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
             PrintAndLogEx(WARNING, "timeout while waiting for reply.");
             free(data);
             return 1;
@@ -295,7 +304,8 @@ int CmdFlashMemLoad(const char *Cmd){
     PrintAndLogEx(SUCCESS, "Wrote %u bytes to offset %u", datalen, start_index);
     return 0;
 }
-int CmdFlashMemSave(const char *Cmd){
+int CmdFlashMemSave(const char *Cmd)
+{
 
     char filename[FILE_PATH_SIZE] = {0};
     uint8_t cmdp = 0;
@@ -304,42 +314,43 @@ int CmdFlashMemSave(const char *Cmd){
 
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
-        case 'h': return usage_flashmem_save();
-        case 'l':
-            len = param_get32ex(Cmd, cmdp+1, FLASH_MEM_MAX_SIZE, 10);
-            cmdp += 2;
-            break;
-        case 'o':
-            start_index = param_get32ex(Cmd, cmdp+1, 0, 10);
-            cmdp += 2;
-            break;
-        case 'f':
-            //File handling
-            if ( param_getstr(Cmd, cmdp+1, filename, FILE_PATH_SIZE) >= FILE_PATH_SIZE ) {
-                PrintAndLogEx(FAILED, "Filename too long");
+            case 'h':
+                return usage_flashmem_save();
+            case 'l':
+                len = param_get32ex(Cmd, cmdp + 1, FLASH_MEM_MAX_SIZE, 10);
+                cmdp += 2;
+                break;
+            case 'o':
+                start_index = param_get32ex(Cmd, cmdp + 1, 0, 10);
+                cmdp += 2;
+                break;
+            case 'f':
+                //File handling
+                if (param_getstr(Cmd, cmdp + 1, filename, FILE_PATH_SIZE) >= FILE_PATH_SIZE) {
+                    PrintAndLogEx(FAILED, "Filename too long");
+                    errors = true;
+                    break;
+                }
+                cmdp += 2;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
                 errors = true;
                 break;
-            }
-            cmdp += 2;
-            break;
-        default:
-            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-            errors = true;
-            break;
         }
     }
 
     //Validations
-    if (errors || cmdp == 0 ) return usage_flashmem_save();
+    if (errors || cmdp == 0) return usage_flashmem_save();
 
-    uint8_t* dump = calloc(len, sizeof(uint8_t));
+    uint8_t *dump = calloc(len, sizeof(uint8_t));
     if (!dump) {
         PrintAndLogDevice(WARNING, "error, cannot allocate memory ");
         return 1;
     }
 
     PrintAndLogEx(NORMAL, "downloading %u bytes from flashmem", len);
-    if ( !GetFromDevice(FLASH_MEM, dump, len, start_index, NULL, -1, true) ) {
+    if (!GetFromDevice(FLASH_MEM, dump, len, start_index, NULL, -1, true)) {
         PrintAndLogEx(FAILED, "ERROR; downloading flashmem");
         free(dump);
         return 1;
@@ -350,7 +361,8 @@ int CmdFlashMemSave(const char *Cmd){
     free(dump);
     return 0;
 }
-int CmdFlashMemWipe(const char *Cmd){
+int CmdFlashMemWipe(const char *Cmd)
+{
 
     uint8_t cmdp = 0;
     bool errors = false;
@@ -358,35 +370,36 @@ int CmdFlashMemWipe(const char *Cmd){
     uint8_t page = 0;
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
-        case 'h': return usage_flashmem_wipe();
-        case 'p':
-            page = param_get8ex(Cmd, cmdp+1, 0, 10);
-            if ( page > 2 ) {
-                PrintAndLogEx(WARNING, "page must be 0, 1 or 2");
+            case 'h':
+                return usage_flashmem_wipe();
+            case 'p':
+                page = param_get8ex(Cmd, cmdp + 1, 0, 10);
+                if (page > 2) {
+                    PrintAndLogEx(WARNING, "page must be 0, 1 or 2");
+                    errors = true;
+                    break;
+                }
+                cmdp += 2;
+                break;
+            case 'i':
+                initalwipe = true;
+                cmdp++;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
                 errors = true;
                 break;
-            }
-            cmdp += 2;
-            break;
-        case 'i':
-            initalwipe = true;
-            cmdp++;
-            break;
-        default:
-            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-            errors = true;
-            break;
         }
     }
 
     //Validations
-    if (errors || cmdp == 0 ) return usage_flashmem_wipe();
+    if (errors || cmdp == 0) return usage_flashmem_wipe();
 
     UsbCommand c = {CMD_FLASHMEM_WIPE, {page, initalwipe, 0}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
-    if ( !WaitForResponseTimeout(CMD_ACK, &resp, 8000) ) {
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 8000)) {
         PrintAndLogEx(WARNING, "timeout while waiting for reply.");
         return 1;
     }
@@ -398,7 +411,8 @@ int CmdFlashMemWipe(const char *Cmd){
 
     return 0;
 }
-int CmdFlashMemInfo(const char *Cmd){
+int CmdFlashMemInfo(const char *Cmd)
+{
 
     uint8_t sha_hash[20] = {0};
     mbedtls_rsa_context rsa;
@@ -407,31 +421,32 @@ int CmdFlashMemInfo(const char *Cmd){
     bool errors = false,  shall_write = false, shall_sign = false;
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
-        case 'h': return usage_flashmem_info();
-        case 's': {
-            shall_sign = true;
-            cmdp++;
-            break;
-        }
-        case 'w':
-            shall_write = true;
-            cmdp++;
-            break;
-        default:
-            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-            errors = true;
-            break;
+            case 'h':
+                return usage_flashmem_info();
+            case 's': {
+                shall_sign = true;
+                cmdp++;
+                break;
+            }
+            case 'w':
+                shall_write = true;
+                cmdp++;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                errors = true;
+                break;
         }
     }
 
     //Validations
-    if (errors ) return usage_flashmem_info();
+    if (errors) return usage_flashmem_info();
 
     UsbCommand c = {CMD_FLASHMEM_INFO, {0, 0, 0}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
-    if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2500) ) {
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         PrintAndLogEx(WARNING, "timeout while waiting for reply.");
         return 1;
     }
@@ -447,15 +462,15 @@ int CmdFlashMemInfo(const char *Cmd){
     memcpy(&mem, (rdv40_validation_t *)resp.d.asBytes, sizeof(rdv40_validation_t));
 
     // Flash ID hash (sha1)
-    mbedtls_sha1( mem.flashid, sizeof(mem.flashid), sha_hash );
+    mbedtls_sha1(mem.flashid, sizeof(mem.flashid), sha_hash);
 
     // print header
     PrintAndLogEx(INFO, "\n--- Flash memory Information ---------");
     PrintAndLogEx(INFO, "-------------------------------------------------------------");
-    PrintAndLogEx(INFO, "ID            | %s", sprint_hex(mem.flashid, sizeof(mem.flashid) ));
+    PrintAndLogEx(INFO, "ID            | %s", sprint_hex(mem.flashid, sizeof(mem.flashid)));
     PrintAndLogEx(INFO, "SHA1          | %s", sprint_hex(sha_hash, sizeof(sha_hash)));
     PrintAndLogEx(INFO, "RSA SIGNATURE |");
-    print_hex_break( mem.signature, sizeof(mem.signature), 32);
+    print_hex_break(mem.signature, sizeof(mem.signature), 32);
 
 //-------------------------------------------------------------------------------
 // Example RSA-1024 keypair, for test purposes  (from common/polarssl/rsa.c)
@@ -463,53 +478,53 @@ int CmdFlashMemInfo(const char *Cmd){
 
 // public key modulus N
 #define RSA_N   "9292758453063D803DD603D5E777D788" \
-                "8ED1D5BF35786190FA2F23EBC0848AEA" \
-                "DDA92CA6C3D80B32C4D109BE0F36D6AE" \
-                "7130B9CED7ACDF54CFC7555AC14EEBAB" \
-                "93A89813FBF3C4F8066D2D800F7C38A8" \
-                "1AE31942917403FF4946B0A83D3D3E05" \
-                "EE57C6F5F5606FB5D4BC6CD34EE0801A" \
-                "5E94BB77B07507233A0BC7BAC8F90F79"
+    "8ED1D5BF35786190FA2F23EBC0848AEA" \
+    "DDA92CA6C3D80B32C4D109BE0F36D6AE" \
+    "7130B9CED7ACDF54CFC7555AC14EEBAB" \
+    "93A89813FBF3C4F8066D2D800F7C38A8" \
+    "1AE31942917403FF4946B0A83D3D3E05" \
+    "EE57C6F5F5606FB5D4BC6CD34EE0801A" \
+    "5E94BB77B07507233A0BC7BAC8F90F79"
 
 // public key Exponent E
 #define RSA_E   "10001"
 
 // private key  Exponent D
 #define RSA_D   "24BF6185468786FDD303083D25E64EFC" \
-                "66CA472BC44D253102F8B4A9D3BFA750" \
-                "91386C0077937FE33FA3252D28855837" \
-                "AE1B484A8A9A45F7EE8C0C634F99E8CD" \
-                "DF79C5CE07EE72C7F123142198164234" \
-                "CABB724CF78B8173B9F880FC86322407" \
-                "AF1FEDFDDE2BEB674CA15F3E81A1521E" \
-                "071513A1E85B5DFA031F21ECAE91A34D"
+    "66CA472BC44D253102F8B4A9D3BFA750" \
+    "91386C0077937FE33FA3252D28855837" \
+    "AE1B484A8A9A45F7EE8C0C634F99E8CD" \
+    "DF79C5CE07EE72C7F123142198164234" \
+    "CABB724CF78B8173B9F880FC86322407" \
+    "AF1FEDFDDE2BEB674CA15F3E81A1521E" \
+    "071513A1E85B5DFA031F21ECAE91A34D"
 
 // prime P
 #define RSA_P   "C36D0EB7FCD285223CFB5AABA5BDA3D8" \
-                "2C01CAD19EA484A87EA4377637E75500" \
-                "FCB2005C5C7DD6EC4AC023CDA285D796" \
-                "C3D9E75E1EFC42488BB4F1D13AC30A57"
+    "2C01CAD19EA484A87EA4377637E75500" \
+    "FCB2005C5C7DD6EC4AC023CDA285D796" \
+    "C3D9E75E1EFC42488BB4F1D13AC30A57"
 
 // prime Q
 #define RSA_Q   "C000DF51A7C77AE8D7C7370C1FF55B69" \
-                "E211C2B9E5DB1ED0BF61D0D9899620F4" \
-                "910E4168387E3C30AA1E00C339A79508" \
-                "8452DD96A9A5EA5D9DCA68DA636032AF"
+    "E211C2B9E5DB1ED0BF61D0D9899620F4" \
+    "910E4168387E3C30AA1E00C339A79508" \
+    "8452DD96A9A5EA5D9DCA68DA636032AF"
 
 #define RSA_DP  "C1ACF567564274FB07A0BBAD5D26E298" \
-                "3C94D22288ACD763FD8E5600ED4A702D" \
-                "F84198A5F06C2E72236AE490C93F07F8" \
-                "3CC559CD27BC2D1CA488811730BB5725"
+    "3C94D22288ACD763FD8E5600ED4A702D" \
+    "F84198A5F06C2E72236AE490C93F07F8" \
+    "3CC559CD27BC2D1CA488811730BB5725"
 
 #define RSA_DQ  "4959CBF6F8FEF750AEE6977C155579C7" \
-                "D8AAEA56749EA28623272E4F7D0592AF" \
-                "7C1F1313CAC9471B5C523BFE592F517B" \
-                "407A1BD76C164B93DA2D32A383E58357"
+    "D8AAEA56749EA28623272E4F7D0592AF" \
+    "7C1F1313CAC9471B5C523BFE592F517B" \
+    "407A1BD76C164B93DA2D32A383E58357"
 
 #define RSA_QP  "9AE7FBC99546432DF71896FC239EADAE" \
-                "F38D18D2B2F0E2DD275AA977E2BF4411" \
-                "F5A3B2A5D33605AEBBCCBA7FEB9F2D2F" \
-                "A74206CEC169D74BF5A8C50D6F48EA08"
+    "F38D18D2B2F0E2DD275AA977E2BF4411" \
+    "F5A3B2A5D33605AEBBCCBA7FEB9F2D2F" \
+    "A74206CEC169D74BF5A8C50D6F48EA08"
 
 
 #define KEY_LEN 128
@@ -518,18 +533,18 @@ int CmdFlashMemInfo(const char *Cmd){
 
     rsa.len = KEY_LEN;
 
-    mbedtls_mpi_read_string( &rsa.N , 16, RSA_N  );
-    mbedtls_mpi_read_string( &rsa.E , 16, RSA_E  );
-    mbedtls_mpi_read_string( &rsa.D , 16, RSA_D  );
-    mbedtls_mpi_read_string( &rsa.P , 16, RSA_P  );
-    mbedtls_mpi_read_string( &rsa.Q , 16, RSA_Q  );
-    mbedtls_mpi_read_string( &rsa.DP, 16, RSA_DP );
-    mbedtls_mpi_read_string( &rsa.DQ, 16, RSA_DQ );
-    mbedtls_mpi_read_string( &rsa.QP, 16, RSA_QP );
+    mbedtls_mpi_read_string(&rsa.N, 16, RSA_N);
+    mbedtls_mpi_read_string(&rsa.E, 16, RSA_E);
+    mbedtls_mpi_read_string(&rsa.D, 16, RSA_D);
+    mbedtls_mpi_read_string(&rsa.P, 16, RSA_P);
+    mbedtls_mpi_read_string(&rsa.Q, 16, RSA_Q);
+    mbedtls_mpi_read_string(&rsa.DP, 16, RSA_DP);
+    mbedtls_mpi_read_string(&rsa.DQ, 16, RSA_DQ);
+    mbedtls_mpi_read_string(&rsa.QP, 16, RSA_QP);
 
     PrintAndLogEx(INFO, "KEY length   | %d", KEY_LEN);
 
-    bool is_keyok = ( mbedtls_rsa_check_pubkey(  &rsa ) == 0 || mbedtls_rsa_check_privkey( &rsa ) == 0 );
+    bool is_keyok = (mbedtls_rsa_check_pubkey(&rsa) == 0 || mbedtls_rsa_check_privkey(&rsa) == 0);
     if (is_keyok)
         PrintAndLogEx(SUCCESS, "RSA key validation ok");
     else
@@ -548,7 +563,7 @@ int CmdFlashMemInfo(const char *Cmd){
     // Signing (private key)
     if (shall_sign) {
 
-        int is_signed = mbedtls_rsa_pkcs1_sign( &rsa, NULL, NULL, MBEDTLS_RSA_PRIVATE, MBEDTLS_MD_SHA1, 20, sha_hash, sign );
+        int is_signed = mbedtls_rsa_pkcs1_sign(&rsa, NULL, NULL, MBEDTLS_RSA_PRIVATE, MBEDTLS_MD_SHA1, 20, sha_hash, sign);
         if (is_signed == 0)
             PrintAndLogEx(SUCCESS, "RSA Signing ok");
         else
@@ -556,11 +571,11 @@ int CmdFlashMemInfo(const char *Cmd){
 
         if (shall_write) {
             // save to mem
-            c = (UsbCommand){CMD_FLASHMEM_WRITE, {FLASH_MEM_SIGNATURE_OFFSET, FLASH_MEM_SIGNATURE_LEN, 0}};
+            c = (UsbCommand) {CMD_FLASHMEM_WRITE, {FLASH_MEM_SIGNATURE_OFFSET, FLASH_MEM_SIGNATURE_LEN, 0}};
             memcpy(c.d.asBytes, sign, sizeof(sign));
             clearCommandBuffer();
             SendCommand(&c);
-            if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
+            if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
                 PrintAndLogEx(WARNING, "timeout while waiting for reply.");
             } else {
 
@@ -572,11 +587,11 @@ int CmdFlashMemInfo(const char *Cmd){
             }
         }
         PrintAndLogEx(INFO, "Signed   | ");
-        print_hex_break( sign, sizeof(sign), 32);
+        print_hex_break(sign, sizeof(sign), 32);
     }
 
     // Verify (public key)
-    int is_verified = mbedtls_rsa_pkcs1_verify( &rsa, NULL, NULL, MBEDTLS_RSA_PUBLIC, MBEDTLS_MD_SHA1, 20, sha_hash, from_device );
+    int is_verified = mbedtls_rsa_pkcs1_verify(&rsa, NULL, NULL, MBEDTLS_RSA_PUBLIC, MBEDTLS_MD_SHA1, 20, sha_hash, from_device);
     if (is_verified == 0)
         PrintAndLogEx(SUCCESS, "RSA Verification ok");
     else
@@ -597,13 +612,15 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdFlashMem(const char *Cmd) {
+int CmdFlashMem(const char *Cmd)
+{
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
+int CmdHelp(const char *Cmd)
+{
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdflashmem.h b/client/cmdflashmem.h
index c7c6f8979..0a56ebed4 100644
--- a/client/cmdflashmem.h
+++ b/client/cmdflashmem.h
@@ -35,9 +35,9 @@ typedef enum {
 
 extern int CmdFlashMem(const char *Cmd);
 
-extern int CmdFlashMemRead(const char* cmd);
-extern int CmdFlashMemLoad(const char* cmd);
-extern int CmdFlashMemSave(const char* cmd);
+extern int CmdFlashMemRead(const char *cmd);
+extern int CmdFlashMemLoad(const char *cmd);
+extern int CmdFlashMemSave(const char *cmd);
 extern int CmdFlashMemWipe(const char *Cmd);
 extern int CmdFlashMemInfo(const char *Cmd);
 #endif
diff --git a/client/cmdhf.c b/client/cmdhf.c
index 475a2659d..a076d4e6d 100644
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -12,7 +12,8 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_hf_search(){
+int usage_hf_search()
+{
     PrintAndLogEx(NORMAL, "Usage: hf search");
     PrintAndLogEx(NORMAL, "Will try to find a HF read out of the unknown tag. Stops when found.");
     PrintAndLogEx(NORMAL, "Options:");
@@ -20,7 +21,8 @@ int usage_hf_search(){
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
-int usage_hf_snoop(){
+int usage_hf_snoop()
+{
     PrintAndLogEx(NORMAL, "Usage: hf snoop <skip pairs> <skip triggers>");
     PrintAndLogEx(NORMAL, "The high frequence snoop will assign all available memory on device for snooped data");
     PrintAndLogEx(NORMAL, "User the 'data samples' command to download from device,  and 'data plot' to look at it");
@@ -36,7 +38,8 @@ int usage_hf_snoop(){
     return 0;
 }
 
-int CmdHFSearch(const char *Cmd){
+int CmdHFSearch(const char *Cmd)
+{
 
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_hf_search();
@@ -52,7 +55,7 @@ int CmdHFSearch(const char *Cmd){
         return ans;
     }
     ans = HFLegicReader("", false);
-    if ( ans == 0) {
+    if (ans == 0) {
         PrintAndLogEx(SUCCESS, "\nValid LEGIC Tag Found\n");
         return 1;
     }
@@ -85,7 +88,8 @@ int CmdHFSearch(const char *Cmd){
     return 0;
 }
 
-int CmdHFTune(const char *Cmd) {
+int CmdHFTune(const char *Cmd)
+{
     PrintAndLogEx(SUCCESS, "Measuring HF antenna, press button to exit");
     UsbCommand c = {CMD_MEASURE_ANTENNA_TUNING_HF};
     clearCommandBuffer();
@@ -93,7 +97,8 @@ int CmdHFTune(const char *Cmd) {
     return 0;
 }
 
-int CmdHFSnoop(const char *Cmd) {
+int CmdHFSnoop(const char *Cmd)
+{
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_hf_snoop();
 
@@ -128,13 +133,15 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdHF(const char *Cmd) {
+int CmdHF(const char *Cmd)
+{
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
+int CmdHelp(const char *Cmd)
+{
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index d88746e3f..009ca4f8c 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -136,24 +136,26 @@ static const manufactureName manufactureMapping[] = {
 // get a product description based on the UID
 //  uid[8] tag uid
 // returns description of the best match
-char* getTagInfo(uint8_t uid) {
+char *getTagInfo(uint8_t uid)
+{
 
     int i;
     int len = sizeof(manufactureMapping) / sizeof(manufactureName);
 
-    for ( i = 0; i < len; ++i )
-        if ( uid == manufactureMapping[i].uid)
+    for (i = 0; i < len; ++i)
+        if (uid == manufactureMapping[i].uid)
             return manufactureMapping[i].desc;
 
     //No match, return default
-    return manufactureMapping[len-1].desc;
+    return manufactureMapping[len - 1].desc;
 }
 
 // iso14a apdu input frame length
 static uint16_t frameLength = 0;
 uint16_t atsFSC[] = {16, 24, 32, 40, 48, 64, 96, 128, 256};
 
-int usage_hf_14a_sim(void) {
+int usage_hf_14a_sim(void)
+{
 //  PrintAndLogEx(NORMAL, "\n Emulating ISO/IEC 14443 type A tag with 4,7 or 10 byte UID\n");
     PrintAndLogEx(NORMAL, "\n Emulating ISO/IEC 14443 type A tag with 4,7 byte UID\n");
     PrintAndLogEx(NORMAL, "Usage: hf 14a sim [h] t <type> u <uid> [x] [e] [v]");
@@ -180,7 +182,8 @@ int usage_hf_14a_sim(void) {
 //  PrintAndLogEx(NORMAL, "          hf 14a sim t 1 u 11223445566778899AA\n");
     return 0;
 }
-int usage_hf_14a_sniff(void) {
+int usage_hf_14a_sniff(void)
+{
     PrintAndLogEx(NORMAL, "It get data from the field and saves it into command buffer.");
     PrintAndLogEx(NORMAL, "Buffer accessible from command 'hf list 14a'");
     PrintAndLogEx(NORMAL, "Usage:  hf 14a sniff [c][r]");
@@ -190,7 +193,8 @@ int usage_hf_14a_sniff(void) {
     PrintAndLogEx(NORMAL, "        hf 14a sniff c r");
     return 0;
 }
-int usage_hf_14a_raw(void) {
+int usage_hf_14a_raw(void)
+{
     PrintAndLogEx(NORMAL, "Usage: hf 14a raw [-h] [-r] [-c] [-p] [-a] [-T] [-t] <milliseconds> [-b] <number of bits>  <0A 0B 0C ... hex>");
     PrintAndLogEx(NORMAL, "       -h    this help");
     PrintAndLogEx(NORMAL, "       -r    do not read response");
@@ -204,7 +208,8 @@ int usage_hf_14a_raw(void) {
     PrintAndLogEx(NORMAL, "       -3    ISO14443-3 select only (skip RATS)");
     return 0;
 }
-int usage_hf_14a_reader(void) {
+int usage_hf_14a_reader(void)
+{
     PrintAndLogEx(NORMAL, "Usage: hf 14a reader [k|s|x] [3]");
     PrintAndLogEx(NORMAL, "       k    keep the field active after command executed");
     PrintAndLogEx(NORMAL, "       s    silent (no messages)");
@@ -212,7 +217,8 @@ int usage_hf_14a_reader(void) {
     PrintAndLogEx(NORMAL, "       3    ISO14443-3 select only (skip RATS)");
     return 0;
 }
-int usage_hf_14a_info(void){
+int usage_hf_14a_info(void)
+{
     PrintAndLogEx(NORMAL, "This command makes more extensive tests against a ISO14443a tag in order to collect information");
     PrintAndLogEx(NORMAL, "Usage: hf 14a info [h|s]");
     PrintAndLogEx(NORMAL, "       s    silent (no messages)");
@@ -220,34 +226,36 @@ int usage_hf_14a_info(void){
     return 0;
 }
 
-int CmdHF14AList(const char *Cmd) {
+int CmdHF14AList(const char *Cmd)
+{
     //PrintAndLogEx(NORMAL, "Deprecated command, use 'hf list 14a' instead");
     CmdTraceList("14a");
     return 0;
 }
 
-int Hf14443_4aGetCardData(iso14a_card_select_t * card) {
+int Hf14443_4aGetCardData(iso14a_card_select_t *card)
+{
     UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT, 0, 0}};
     SendCommand(&c);
 
     UsbCommand resp;
-    WaitForResponse(CMD_ACK,&resp);
+    WaitForResponse(CMD_ACK, &resp);
 
     memcpy(card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
 
     uint64_t select_status = resp.arg[0]; // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
 
-    if(select_status == 0) {
+    if (select_status == 0) {
         PrintAndLog("E->iso14443a card select failed");
         return 1;
     }
 
-    if(select_status == 2) {
+    if (select_status == 2) {
         PrintAndLog("E->Card doesn't support iso14443-4 mode");
         return 1;
     }
 
-    if(select_status == 3) {
+    if (select_status == 3) {
         PrintAndLog("E->Card doesn't support standard iso14443-3 anticollision");
         PrintAndLog("\tATQA : %02x %02x", card->atqa[1], card->atqa[0]);
         return 1;
@@ -256,7 +264,7 @@ int Hf14443_4aGetCardData(iso14a_card_select_t * card) {
     PrintAndLog(" UID: %s", sprint_hex(card->uid, card->uidlen));
     PrintAndLog("ATQA: %02x %02x", card->atqa[1], card->atqa[0]);
     PrintAndLog(" SAK: %02x [%" PRIu64 "]", card->sak, resp.arg[0]);
-    if(card->ats_len < 3) { // a valid ATS consists of at least the length byte (TL) and 2 CRC bytes
+    if (card->ats_len < 3) { // a valid ATS consists of at least the length byte (TL) and 2 CRC bytes
         PrintAndLog("E-> Error ATS length(%d) : %s", card->ats_len, sprint_hex(card->ats, card->ats_len));
         return 1;
     }
@@ -265,7 +273,8 @@ int Hf14443_4aGetCardData(iso14a_card_select_t * card) {
     return 0;
 }
 
-int CmdHF14AReader(const char *Cmd) {
+int CmdHF14AReader(const char *Cmd)
+{
 
     uint32_t cm = ISO14A_CONNECT;
     bool disconnectAfter = true, silent = false;
@@ -273,23 +282,23 @@ int CmdHF14AReader(const char *Cmd) {
 
     while (param_getchar(Cmd, cmdp) != 0x00) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
-        case 'h':
-            return usage_hf_14a_reader();
-        case '3':
-            cm |= ISO14A_NO_RATS;
-            break;
-        case 'k':
-            disconnectAfter = false;
-            break;
-        case 's':
-            silent = true;
-            break;
-        case 'x':
-            cm &= ~ISO14A_CONNECT;
-            break;
-        default:
-            PrintAndLogEx(WARNING, "Unknown command.");
-            return 1;
+            case 'h':
+                return usage_hf_14a_reader();
+            case '3':
+                cm |= ISO14A_NO_RATS;
+                break;
+            case 'k':
+                disconnectAfter = false;
+                break;
+            case 's':
+                silent = true;
+                break;
+            case 'x':
+                cm &= ~ISO14A_CONNECT;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown command.");
+                return 1;
         }
         cmdp++;
     }
@@ -337,7 +346,7 @@ int CmdHF14AReader(const char *Cmd) {
         PrintAndLogEx(NORMAL, "ATQA : %02x %02x", card.atqa[1], card.atqa[0]);
         PrintAndLogEx(NORMAL, " SAK : %02x [%" PRIu64 "]", card.sak, resp.arg[0]);
 
-        if(card.ats_len >= 3) { // a valid ATS consists of at least the length byte (TL) and 2 CRC bytes
+        if (card.ats_len >= 3) { // a valid ATS consists of at least the length byte (TL) and 2 CRC bytes
             PrintAndLogEx(NORMAL, " ATS : %s", sprint_hex(card.ats, card.ats_len));
         }
 
@@ -353,7 +362,8 @@ int CmdHF14AReader(const char *Cmd) {
     return 0;
 }
 
-int CmdHF14AInfo(const char *Cmd) {
+int CmdHF14AInfo(const char *Cmd)
+{
 
     if (Cmd[0] == 'h' || Cmd[0] ==  'H') return usage_hf_14a_info();
 
@@ -425,30 +435,62 @@ int CmdHF14AInfo(const char *Cmd) {
 
             select_status = resp.arg[0]; // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS
 
-            if(select_status == 0) {
+            if (select_status == 0) {
                 DropField();
                 return 0;
             }
             break;
-        case 0x01: PrintAndLogEx(NORMAL, "TYPE : NXP TNP3xxx Activision Game Appliance"); break;
-        case 0x04: PrintAndLogEx(NORMAL, "TYPE : NXP MIFARE (various !DESFire !DESFire EV1)"); isMifareClassic = false; break;
-        case 0x08: PrintAndLogEx(NORMAL, "TYPE : NXP MIFARE CLASSIC 1k | Plus 2k SL1 | 1k Ev1"); break;
-        case 0x09: PrintAndLogEx(NORMAL, "TYPE : NXP MIFARE Mini 0.3k"); break;
-        case 0x0A: PrintAndLogEx(NORMAL, "TYPE : FM11RF005SH (Shanghai Metro)"); break;
-        case 0x10: PrintAndLogEx(NORMAL, "TYPE : NXP MIFARE Plus 2k SL2"); break;
-        case 0x11: PrintAndLogEx(NORMAL, "TYPE : NXP MIFARE Plus 4k SL2"); break;
-        case 0x18: PrintAndLogEx(NORMAL, "TYPE : NXP MIFARE Classic 4k | Plus 4k SL1 | 4k Ev1"); break;
-        case 0x20: PrintAndLogEx(NORMAL, "TYPE : NXP MIFARE DESFire 4k | DESFire EV1 2k/4k/8k | Plus 2k/4k SL3 | JCOP 31/41"); isMifareClassic = false; break;
-        case 0x24: PrintAndLogEx(NORMAL, "TYPE : NXP MIFARE DESFire | DESFire EV1"); isMifareClassic = false; break;
-        case 0x28: PrintAndLogEx(NORMAL, "TYPE : JCOP31 or JCOP41 v2.3.1"); break;
-        case 0x38: PrintAndLogEx(NORMAL, "TYPE : Nokia 6212 or 6131 MIFARE CLASSIC 4K"); break;
-        case 0x88: PrintAndLogEx(NORMAL, "TYPE : Infineon MIFARE CLASSIC 1K"); break;
-        case 0x98: PrintAndLogEx(NORMAL, "TYPE : Gemplus MPCOS"); break;
-        default: ;
+        case 0x01:
+            PrintAndLogEx(NORMAL, "TYPE : NXP TNP3xxx Activision Game Appliance");
+            break;
+        case 0x04:
+            PrintAndLogEx(NORMAL, "TYPE : NXP MIFARE (various !DESFire !DESFire EV1)");
+            isMifareClassic = false;
+            break;
+        case 0x08:
+            PrintAndLogEx(NORMAL, "TYPE : NXP MIFARE CLASSIC 1k | Plus 2k SL1 | 1k Ev1");
+            break;
+        case 0x09:
+            PrintAndLogEx(NORMAL, "TYPE : NXP MIFARE Mini 0.3k");
+            break;
+        case 0x0A:
+            PrintAndLogEx(NORMAL, "TYPE : FM11RF005SH (Shanghai Metro)");
+            break;
+        case 0x10:
+            PrintAndLogEx(NORMAL, "TYPE : NXP MIFARE Plus 2k SL2");
+            break;
+        case 0x11:
+            PrintAndLogEx(NORMAL, "TYPE : NXP MIFARE Plus 4k SL2");
+            break;
+        case 0x18:
+            PrintAndLogEx(NORMAL, "TYPE : NXP MIFARE Classic 4k | Plus 4k SL1 | 4k Ev1");
+            break;
+        case 0x20:
+            PrintAndLogEx(NORMAL, "TYPE : NXP MIFARE DESFire 4k | DESFire EV1 2k/4k/8k | Plus 2k/4k SL3 | JCOP 31/41");
+            isMifareClassic = false;
+            break;
+        case 0x24:
+            PrintAndLogEx(NORMAL, "TYPE : NXP MIFARE DESFire | DESFire EV1");
+            isMifareClassic = false;
+            break;
+        case 0x28:
+            PrintAndLogEx(NORMAL, "TYPE : JCOP31 or JCOP41 v2.3.1");
+            break;
+        case 0x38:
+            PrintAndLogEx(NORMAL, "TYPE : Nokia 6212 or 6131 MIFARE CLASSIC 4K");
+            break;
+        case 0x88:
+            PrintAndLogEx(NORMAL, "TYPE : Infineon MIFARE CLASSIC 1K");
+            break;
+        case 0x98:
+            PrintAndLogEx(NORMAL, "TYPE : Gemplus MPCOS");
+            break;
+        default:
+            ;
     }
 
     // Double & triple sized UID, can be mapped to a manufacturer.
-    if ( card.uidlen > 4 ) {
+    if (card.uidlen > 4) {
         PrintAndLogEx(NORMAL, "MANUFACTURER : %s", getTagInfo(card.uid[0]));
     }
 
@@ -461,13 +503,13 @@ int CmdHF14AInfo(const char *Cmd) {
         memcpy(c.d.asBytes, rats, 2);
         clearCommandBuffer();
         SendCommand(&c);
-        WaitForResponse(CMD_ACK,&resp);
+        WaitForResponse(CMD_ACK, &resp);
 
         memcpy(card.ats, resp.d.asBytes, resp.arg[0]);
         card.ats_len = resp.arg[0]; // note: ats_len includes CRC Bytes
     }
 
-    if(card.ats_len >= 3) {         // a valid ATS consists of at least the length byte (TL) and 2 CRC bytes
+    if (card.ats_len >= 3) {        // a valid ATS consists of at least the length byte (TL) and 2 CRC bytes
         bool ta1 = 0, tb1 = 0, tc1 = 0;
         int pos;
 
@@ -487,13 +529,13 @@ int CmdHF14AInfo(const char *Cmd) {
             int16_t fsci = card.ats[1] & 0x0f;
 
             PrintAndLogEx(NORMAL, "       -  T0 : TA1 is%s present, TB1 is%s present, "
-                    "TC1 is%s present, FSCI is %d (FSC = %ld)",
-                (ta1 ? "" : " NOT"),
-                (tb1 ? "" : " NOT"),
-                (tc1 ? "" : " NOT"),
-                fsci,
-                fsci < sizeof(atsFSC) ? atsFSC[fsci] : -1
-                );
+                          "TC1 is%s present, FSCI is %d (FSC = %ld)",
+                          (ta1 ? "" : " NOT"),
+                          (tb1 ? "" : " NOT"),
+                          (tc1 ? "" : " NOT"),
+                          fsci,
+                          fsci < sizeof(atsFSC) ? atsFSC[fsci] : -1
+                         );
         }
         pos = 2;
         if (ta1) {
@@ -508,29 +550,29 @@ int CmdHF14AInfo(const char *Cmd) {
             if (strlen(ds) != 0) ds[strlen(ds) - 2] = '\0';
             if (strlen(dr) != 0) dr[strlen(dr) - 2] = '\0';
             PrintAndLogEx(NORMAL, "       - TA1 : different divisors are%s supported, "
-                    "DR: [%s], DS: [%s]",
-                    (card.ats[pos] & 0x80 ? " NOT" : ""), dr, ds);
+                          "DR: [%s], DS: [%s]",
+                          (card.ats[pos] & 0x80 ? " NOT" : ""), dr, ds);
             pos++;
         }
         if (tb1) {
             uint32_t sfgi = card.ats[pos] & 0x0F;
             uint32_t fwi = card.ats[pos] >> 4;
             PrintAndLogEx(NORMAL, "       - TB1 : SFGI = %d (SFGT = %s%ld/fc), FWI = %d (FWT = %ld/fc)",
-                    (sfgi),
-                    sfgi ? "" : "(not needed) ",
-                    sfgi ? (1 << 12) << sfgi : 0,
-                    fwi,
-                    (1 << 12) << fwi
-                    );
+                          (sfgi),
+                          sfgi ? "" : "(not needed) ",
+                          sfgi ? (1 << 12) << sfgi : 0,
+                          fwi,
+                          (1 << 12) << fwi
+                         );
             pos++;
         }
         if (tc1) {
             PrintAndLogEx(NORMAL, "       - TC1 : NAD is%s supported, CID is%s supported",
-                    (card.ats[pos] & 0x01) ? "" : " NOT",
-                    (card.ats[pos] & 0x02) ? "" : " NOT");
+                          (card.ats[pos] & 0x01) ? "" : " NOT",
+                          (card.ats[pos] & 0x02) ? "" : " NOT");
             pos++;
         }
-        if (card.ats[0] > pos && card.ats[0] <  card.ats_len - 2 ) {
+        if (card.ats[0] > pos && card.ats[0] <  card.ats_len - 2) {
             char *tip = "";
             if (card.ats[0] - pos >= 7) {
                 if (memcmp(card.ats + pos, "\xC1\x05\x2F\x2F\x01\xBC\xD6", 7) == 0) {
@@ -544,29 +586,59 @@ int CmdHF14AInfo(const char *Cmd) {
                 PrintAndLogEx(NORMAL, "               c1 -> Mifare or (multiple) virtual cards of various type");
                 PrintAndLogEx(NORMAL, "                  %02x -> Length is %d bytes", card.ats[pos + 1], card.ats[pos + 1]);
                 switch (card.ats[pos + 2] & 0xf0) {
-                    case 0x10: PrintAndLogEx(NORMAL, "                     1x -> MIFARE DESFire"); break;
-                    case 0x20: PrintAndLogEx(NORMAL, "                     2x -> MIFARE Plus"); break;
+                    case 0x10:
+                        PrintAndLogEx(NORMAL, "                     1x -> MIFARE DESFire");
+                        break;
+                    case 0x20:
+                        PrintAndLogEx(NORMAL, "                     2x -> MIFARE Plus");
+                        break;
                 }
                 switch (card.ats[pos + 2] & 0x0f) {
-                    case 0x00: PrintAndLogEx(NORMAL, "                     x0 -> <1 kByte"); break;
-                    case 0x01: PrintAndLogEx(NORMAL, "                     x1 -> 1 kByte"); break;
-                    case 0x02: PrintAndLogEx(NORMAL, "                     x2 -> 2 kByte"); break;
-                    case 0x03: PrintAndLogEx(NORMAL, "                     x3 -> 4 kByte"); break;
-                    case 0x04: PrintAndLogEx(NORMAL, "                     x4 -> 8 kByte"); break;
+                    case 0x00:
+                        PrintAndLogEx(NORMAL, "                     x0 -> <1 kByte");
+                        break;
+                    case 0x01:
+                        PrintAndLogEx(NORMAL, "                     x1 -> 1 kByte");
+                        break;
+                    case 0x02:
+                        PrintAndLogEx(NORMAL, "                     x2 -> 2 kByte");
+                        break;
+                    case 0x03:
+                        PrintAndLogEx(NORMAL, "                     x3 -> 4 kByte");
+                        break;
+                    case 0x04:
+                        PrintAndLogEx(NORMAL, "                     x4 -> 8 kByte");
+                        break;
                 }
                 switch (card.ats[pos + 3] & 0xf0) {
-                    case 0x00: PrintAndLogEx(NORMAL, "                        0x -> Engineering sample"); break;
-                    case 0x20: PrintAndLogEx(NORMAL, "                        2x -> Released"); break;
+                    case 0x00:
+                        PrintAndLogEx(NORMAL, "                        0x -> Engineering sample");
+                        break;
+                    case 0x20:
+                        PrintAndLogEx(NORMAL, "                        2x -> Released");
+                        break;
                 }
                 switch (card.ats[pos + 3] & 0x0f) {
-                    case 0x00: PrintAndLogEx(NORMAL, "                        x0 -> Generation 1"); break;
-                    case 0x01: PrintAndLogEx(NORMAL, "                        x1 -> Generation 2"); break;
-                    case 0x02: PrintAndLogEx(NORMAL, "                        x2 -> Generation 3"); break;
+                    case 0x00:
+                        PrintAndLogEx(NORMAL, "                        x0 -> Generation 1");
+                        break;
+                    case 0x01:
+                        PrintAndLogEx(NORMAL, "                        x1 -> Generation 2");
+                        break;
+                    case 0x02:
+                        PrintAndLogEx(NORMAL, "                        x2 -> Generation 3");
+                        break;
                 }
                 switch (card.ats[pos + 4] & 0x0f) {
-                    case 0x00: PrintAndLogEx(NORMAL, "                           x0 -> Only VCSL supported"); break;
-                    case 0x01: PrintAndLogEx(NORMAL, "                           x1 -> VCS, VCSL, and SVC supported"); break;
-                    case 0x0E: PrintAndLogEx(NORMAL, "                           xE -> no VCS command supported"); break;
+                    case 0x00:
+                        PrintAndLogEx(NORMAL, "                           x0 -> Only VCSL supported");
+                        break;
+                    case 0x01:
+                        PrintAndLogEx(NORMAL, "                           x1 -> VCS, VCSL, and SVC supported");
+                        break;
+                    case 0x0E:
+                        PrintAndLogEx(NORMAL, "                           xE -> no VCS command supported");
+                        break;
                 }
             }
         }
@@ -578,14 +650,14 @@ int CmdHF14AInfo(const char *Cmd) {
 
     if (isMifareClassic) {
         int res = detect_classic_prng();
-        if ( res == 1 )
+        if (res == 1)
             PrintAndLogEx(SUCCESS, "Prng detection: " _GREEN_(WEAK));
-        else if (res == 0 )
+        else if (res == 0)
             PrintAndLogEx(SUCCESS, "Prng detection: " _YELLOW_(HARD));
         else
             PrintAndLogEx(FAILED, "prng detection:  " _RED_(failed));
 
-        if ( do_nack_test )
+        if (do_nack_test)
             detect_classic_nackbug(silent);
     }
 
@@ -593,7 +665,8 @@ int CmdHF14AInfo(const char *Cmd) {
 }
 
 // Collect ISO14443 Type A UIDs
-int CmdHF14ACUIDs(const char *Cmd) {
+int CmdHF14ACUIDs(const char *Cmd)
+{
     // requested number of UIDs
     int n = atoi(Cmd);
     // collect at least 1 (e.g. if no parameter was given)
@@ -606,7 +679,8 @@ int CmdHF14ACUIDs(const char *Cmd) {
     for (int i = 0; i < n; i++) {
 
         if (ukbhit()) {
-            int gc = getchar(); (void)gc;
+            int gc = getchar();
+            (void)gc;
             PrintAndLogEx(WARNING, "\n[!] aborted via keyboard!\n");
             break;
         }
@@ -616,7 +690,7 @@ int CmdHF14ACUIDs(const char *Cmd) {
         SendCommand(&c);
 
         UsbCommand resp;
-        WaitForResponse(CMD_ACK,&resp);
+        WaitForResponse(CMD_ACK, &resp);
 
         iso14a_card_select_t *card = (iso14a_card_select_t *) resp.d.asBytes;
 
@@ -626,37 +700,38 @@ int CmdHF14ACUIDs(const char *Cmd) {
         } else {
             char uid_string[20];
             for (uint16_t i = 0; i < card->uidlen; i++) {
-                sprintf(&uid_string[2*i], "%02X", card->uid[i]);
+                sprintf(&uid_string[2 * i], "%02X", card->uid[i]);
             }
             PrintAndLogEx(NORMAL, "%s", uid_string);
         }
     }
-    PrintAndLogEx(SUCCESS, "end: %" PRIu64 " seconds", (msclock()-t1)/1000);
+    PrintAndLogEx(SUCCESS, "end: %" PRIu64 " seconds", (msclock() - t1) / 1000);
     return 1;
 }
 
 // ## simulate iso14443a tag
-int CmdHF14ASim(const char *Cmd) {
+int CmdHF14ASim(const char *Cmd)
+{
     bool errors = false;
     uint8_t flags = 0;
     uint8_t tagtype = 1;
     uint8_t cmdp = 0;
-    uint8_t uid[10] = {0,0,0,0,0,0,0,0,0,0};
+    uint8_t uid[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
     int uidlen = 0;
     bool useUIDfromEML = true;
     bool setEmulatorMem = false;
     bool verbose = false;
     nonces_t data[1];
 
-    while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-        switch(param_getchar(Cmd, cmdp)) {
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (param_getchar(Cmd, cmdp)) {
             case 'h':
             case 'H':
                 return usage_hf_14a_sim();
             case 't':
             case 'T':
                 // Retrieve the tag type
-                tagtype = param_get8ex(Cmd, cmdp+1, 0, 10);
+                tagtype = param_get8ex(Cmd, cmdp + 1, 0, 10);
                 if (tagtype == 0)
                     errors = true;
                 cmdp += 2;
@@ -664,15 +739,21 @@ int CmdHF14ASim(const char *Cmd) {
             case 'u':
             case 'U':
                 // Retrieve the full 4,7,10 byte long uid
-                param_gethex_ex(Cmd, cmdp+1, uid, &uidlen);
-                switch(uidlen) {
+                param_gethex_ex(Cmd, cmdp + 1, uid, &uidlen);
+                switch (uidlen) {
                     //case 20: flags |= FLAG_10B_UID_IN_DATA; break;
-                    case 14: flags |= FLAG_7B_UID_IN_DATA; break;
-                    case  8: flags |= FLAG_4B_UID_IN_DATA; break;
-                    default: errors = true; break;
+                    case 14:
+                        flags |= FLAG_7B_UID_IN_DATA;
+                        break;
+                    case  8:
+                        flags |= FLAG_4B_UID_IN_DATA;
+                        break;
+                    default:
+                        errors = true;
+                        break;
                 }
                 if (!errors) {
-                    PrintAndLogEx(SUCCESS, "Emulating ISO/IEC 14443 type A tag with %d byte UID (%s)", uidlen>>1, sprint_hex(uid, uidlen>>1));
+                    PrintAndLogEx(SUCCESS, "Emulating ISO/IEC 14443 type A tag with %d byte UID (%s)", uidlen >> 1, sprint_hex(uid, uidlen >> 1));
                     useUIDfromEML = false;
                 }
                 cmdp += 2;
@@ -696,36 +777,37 @@ int CmdHF14ASim(const char *Cmd) {
                 PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
                 errors = true;
                 break;
-            }
+        }
     }
 
     //Validations
     if (errors || cmdp == 0) return usage_hf_14a_sim();
 
-    if ( useUIDfromEML )
+    if (useUIDfromEML)
         flags |= FLAG_UID_IN_EMUL;
 
-    UsbCommand c = {CMD_SIMULATE_TAG_ISO_14443a,{ tagtype, flags, 0 }};
-    memcpy(c.d.asBytes, uid, uidlen>>1);
+    UsbCommand c = {CMD_SIMULATE_TAG_ISO_14443a, { tagtype, flags, 0 }};
+    memcpy(c.d.asBytes, uid, uidlen >> 1);
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
 
     PrintAndLogEx(SUCCESS, "press pm3-button to abort simulation");
 
-    while( !ukbhit() ){
-        if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500) ) continue;
-        if ( !(flags & FLAG_NR_AR_ATTACK) ) break;
-        if ( (resp.arg[0] & 0xffff) != CMD_SIMULATE_MIFARE_CARD ) break;
+    while (!ukbhit()) {
+        if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) continue;
+        if (!(flags & FLAG_NR_AR_ATTACK)) break;
+        if ((resp.arg[0] & 0xffff) != CMD_SIMULATE_MIFARE_CARD) break;
 
-        memcpy(data, resp.d.asBytes, sizeof(data) );
+        memcpy(data, resp.d.asBytes, sizeof(data));
         readerAttack(data[0], setEmulatorMem, verbose);
     }
     showSectorTable();
     return 0;
 }
 
-int CmdHF14ASniff(const char *Cmd) {
+int CmdHF14ASniff(const char *Cmd)
+{
     int param = 0;
     uint8_t ctmp;
     for (int i = 0; i < 2; i++) {
@@ -740,7 +822,8 @@ int CmdHF14ASniff(const char *Cmd) {
     return 0;
 }
 
-int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
+int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen)
+{
     static bool responseNum = false;
     uint16_t cmdc = 0;
     *dataoutlen = 0;
@@ -803,7 +886,7 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
         recv = resp.d.asBytes;
         int iLen = resp.arg[0];
 
-        if(!iLen) {
+        if (!iLen) {
             PrintAndLogEx(ERR, "No card response.");
             return 1;
         }
@@ -839,7 +922,8 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
     return 0;
 }
 
-int SelectCard14443_4(bool disconnect, iso14a_card_select_t *card) {
+int SelectCard14443_4(bool disconnect, iso14a_card_select_t *card)
+{
     UsbCommand resp;
 
     frameLength = 0;
@@ -909,7 +993,8 @@ int SelectCard14443_4(bool disconnect, iso14a_card_select_t *card) {
     return 0;
 }
 
-int CmdExchangeAPDU(bool chainingin, uint8_t *datain, int datainlen, bool activateField, uint8_t *dataout, int maxdataoutlen, int *dataoutlen, bool *chainingout) {
+int CmdExchangeAPDU(bool chainingin, uint8_t *datain, int datainlen, bool activateField, uint8_t *dataout, int maxdataoutlen, int *dataoutlen, bool *chainingout)
+{
     *chainingout = false;
 
     if (activateField) {
@@ -956,7 +1041,7 @@ int CmdExchangeAPDU(bool chainingin, uint8_t *datain, int datainlen, bool activa
             return 0;
         }
 
-        if(!iLen) {
+        if (!iLen) {
             PrintAndLogEx(ERR, "APDU: No APDU response.");
             return 1;
         }
@@ -993,14 +1078,15 @@ int CmdExchangeAPDU(bool chainingin, uint8_t *datain, int datainlen, bool activa
     return 0;
 }
 
-int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
+int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen)
+{
     *dataoutlen = 0;
     bool chaining = false;
     int res;
 
     // 3 byte here - 1b framing header, 2b crc16
     if (APDUInFramingEnable &&
-        ( (frameLength && (datainlen > frameLength - 3)) || (datainlen > USB_CMD_DATA_SIZE - 3)) ) {
+        ((frameLength && (datainlen > frameLength - 3)) || (datainlen > USB_CMD_DATA_SIZE - 3))) {
         int clen = 0;
 
         bool vActivateField = activateField;
@@ -1063,7 +1149,8 @@ int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool lea
 }
 
 // ISO14443-4. 7. Half-duplex block transmission protocol
-int CmdHF14AAPDU(const char *cmd) {
+int CmdHF14AAPDU(const char *cmd)
+{
     uint8_t data[USB_CMD_DATA_SIZE];
     int datalen = 0;
     bool activateField = false;
@@ -1071,10 +1158,10 @@ int CmdHF14AAPDU(const char *cmd) {
     bool decodeTLV = false;
 
     CLIParserInit("hf 14a apdu",
-        "Sends an ISO 7816-4 APDU via ISO 14443-4 block transmission protocol (T=CL)",
-        "Sample:\n\thf 14a apdu -st 00A404000E325041592E5359532E444446303100\n");
+                  "Sends an ISO 7816-4 APDU via ISO 14443-4 block transmission protocol (T=CL)",
+                  "Sample:\n\thf 14a apdu -st 00A404000E325041592E5359532E444446303100\n");
 
-    void* argtable[] = {
+    void *argtable[] = {
         arg_param_begin,
         arg_lit0("sS",  "select",  "activate field and select card"),
         arg_lit0("kK",  "keep",    "leave the signal field ON after receive response"),
@@ -1087,11 +1174,11 @@ int CmdHF14AAPDU(const char *cmd) {
     activateField = arg_get_lit(1);
     leaveSignalON = arg_get_lit(2);
     decodeTLV = arg_get_lit(3);
-            // len = data + PCB(1b) + CRC(2b)
+    // len = data + PCB(1b) + CRC(2b)
     CLIGetHexBLessWithReturn(4, data, &datalen, 1 + 2);
 
-CLIParserFree();
-    PrintAndLogEx(NORMAL, ">>>>[%s%s%s] %s", activateField ? "sel ": "", leaveSignalON ? "keep ": "", decodeTLV ? "TLV": "", sprint_hex(data, datalen));
+    CLIParserFree();
+    PrintAndLogEx(NORMAL, ">>>>[%s%s%s] %s", activateField ? "sel " : "", leaveSignalON ? "keep " : "", decodeTLV ? "TLV" : "", sprint_hex(data, datalen));
 
     int res = ExchangeAPDU14a(data, datalen, activateField, leaveSignalON, data, USB_CMD_DATA_SIZE, &datalen);
 
@@ -1110,7 +1197,8 @@ CLIParserFree();
     return 0;
 }
 
-int CmdHF14ACmdRaw(const char *cmd) {
+int CmdHF14ACmdRaw(const char *cmd)
+{
     UsbCommand c = {CMD_READER_ISO_14443a, {0, 0, 0}};
     bool reply = 1;
     bool crc = false;
@@ -1122,7 +1210,7 @@ int CmdHF14ACmdRaw(const char *cmd) {
     bool bTimeout = false;
     uint32_t timeout = 0;
     bool topazmode = false;
-    char buf[5]="";
+    char buf[5] = "";
     int i = 0;
     uint8_t data[USB_CMD_DATA_SIZE];
     uint16_t datalen = 0;
@@ -1131,12 +1219,12 @@ int CmdHF14ACmdRaw(const char *cmd) {
     if (strlen(cmd) < 2) return usage_hf_14a_raw();
 
     // strip
-    while (*cmd==' ' || *cmd=='\t') cmd++;
+    while (*cmd == ' ' || *cmd == '\t') cmd++;
 
-    while (cmd[i]!='\0') {
-        if (cmd[i]==' ' || cmd[i]=='\t') { i++; continue; }
-        if (cmd[i]=='-') {
-            switch (cmd[i+1]) {
+    while (cmd[i] != '\0') {
+        if (cmd[i] == ' ' || cmd[i] == '\t') { i++; continue; }
+        if (cmd[i] == '-') {
+            switch (cmd[i + 1]) {
                 case 'H':
                 case 'h':
                     return usage_hf_14a_raw();
@@ -1156,19 +1244,19 @@ int CmdHF14ACmdRaw(const char *cmd) {
                     active_select = true;
                     break;
                 case 'b':
-                    sscanf(cmd+i+2, "%d", &temp);
+                    sscanf(cmd + i + 2, "%d", &temp);
                     numbits = temp & 0xFFFF;
-                    i+=3;
-                    while(cmd[i]!=' ' && cmd[i]!='\0') { i++; }
-                    i-=2;
+                    i += 3;
+                    while (cmd[i] != ' ' && cmd[i] != '\0') { i++; }
+                    i -= 2;
                     break;
                 case 't':
                     bTimeout = true;
-                    sscanf(cmd+i+2, "%d", &temp);
+                    sscanf(cmd + i + 2, "%d", &temp);
                     timeout = temp;
-                    i+=3;
-                    while(cmd[i]!=' ' && cmd[i]!='\0') { i++; }
-                    i-=2;
+                    i += 3;
+                    while (cmd[i] != ' ' && cmd[i] != '\0') { i++; }
+                    i -= 2;
                     break;
                 case 'T':
                     topazmode = true;
@@ -1182,10 +1270,10 @@ int CmdHF14ACmdRaw(const char *cmd) {
             i += 2;
             continue;
         }
-        if ((cmd[i]>='0' && cmd[i]<='9') ||
-            (cmd[i]>='a' && cmd[i]<='f') ||
-            (cmd[i]>='A' && cmd[i]<='F') ) {
-            buf[strlen(buf)+1] = 0;
+        if ((cmd[i] >= '0' && cmd[i] <= '9') ||
+            (cmd[i] >= 'a' && cmd[i] <= 'f') ||
+            (cmd[i] >= 'A' && cmd[i] <= 'F')) {
+            buf[strlen(buf) + 1] = 0;
             buf[strlen(buf)] = cmd[i];
             i++;
 
@@ -1193,7 +1281,7 @@ int CmdHF14ACmdRaw(const char *cmd) {
                 sscanf(buf, "%x", &temp);
                 data[datalen] = (uint8_t)(temp & 0xff);
                 *buf = 0;
-                if (++datalen >= sizeof(data)){
+                if (++datalen >= sizeof(data)) {
                     if (crc)
                         PrintAndLogEx(NORMAL, "Buffer is full, we can't add CRC to your data");
                     break;
@@ -1205,7 +1293,7 @@ int CmdHF14ACmdRaw(const char *cmd) {
         return 0;
     }
 
-    if (crc && datalen > 0 && datalen < sizeof(data)-2) {
+    if (crc && datalen > 0 && datalen < sizeof(data) - 2) {
         uint8_t first, second;
         if (topazmode) {
             compute_crc(CRC_14443_B, data, datalen, &first, &second);
@@ -1222,14 +1310,14 @@ int CmdHF14ACmdRaw(const char *cmd) {
             c.arg[0] |= ISO14A_NO_SELECT;
     }
 
-    if (bTimeout){
-        #define MAX_TIMEOUT 40542464 // = (2^32-1) * (8*16) / 13560000Hz * 1000ms/s
+    if (bTimeout) {
+#define MAX_TIMEOUT 40542464 // = (2^32-1) * (8*16) / 13560000Hz * 1000ms/s
         c.arg[0] |= ISO14A_SET_TIMEOUT;
-        if(timeout > MAX_TIMEOUT) {
+        if (timeout > MAX_TIMEOUT) {
             timeout = MAX_TIMEOUT;
             PrintAndLogEx(NORMAL, "Set timeout to 40542 seconds (11.26 hours). The max we can wait for response");
         }
-        c.arg[2] = 13560000 / 1000 / (8*16) * timeout; // timeout in ETUs (time to transfer 1 bit, approx. 9.4 us)
+        c.arg[2] = 13560000 / 1000 / (8 * 16) * timeout; // timeout in ETUs (time to transfer 1 bit, approx. 9.4 us)
     }
 
     if (power) {
@@ -1266,15 +1354,16 @@ int CmdHF14ACmdRaw(const char *cmd) {
     return 0;
 }
 
-static int waitCmd(uint8_t iSelect) {
+static int waitCmd(uint8_t iSelect)
+{
     UsbCommand resp;
     uint16_t len = 0;
 
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         len = (resp.arg[0] & 0xFFFF);
-        if (iSelect){
+        if (iSelect) {
             len = (resp.arg[1] & 0xFFFF);
-            if (len){
+            if (len) {
                 PrintAndLogEx(NORMAL, "Card selected. UID[%i]:", len);
             } else {
                 PrintAndLogEx(WARNING, "Can't select card.");
@@ -1286,7 +1375,7 @@ static int waitCmd(uint8_t iSelect) {
         if (!len)
             return 1;
 
-        PrintAndLogEx(NORMAL, "%s", sprint_hex(resp.d.asBytes, len) );
+        PrintAndLogEx(NORMAL, "%s", sprint_hex(resp.d.asBytes, len));
     } else {
         PrintAndLogEx(WARNING, "timeout while waiting for reply.");
         return 3;
@@ -1294,14 +1383,15 @@ static int waitCmd(uint8_t iSelect) {
     return 0;
 }
 
-int CmdHF14AAntiFuzz(const char *cmd) {
+int CmdHF14AAntiFuzz(const char *cmd)
+{
 
     CLIParserInit("hf 14a antifuzz",
-        "Tries to fuzz the ISO14443a anticollision phase",
-        "Usage:\n"
-        "\thf 14a antifuzz -4\n");
+                  "Tries to fuzz the ISO14443a anticollision phase",
+                  "Usage:\n"
+                  "\thf 14a antifuzz -4\n");
 
-    void* argtable[] = {
+    void *argtable[] = {
         arg_param_begin,
         arg_lit0("4",   NULL,  "4 byte uid"),
         arg_lit0("7",   NULL,  "7 byte uid"),
@@ -1323,15 +1413,16 @@ int CmdHF14AAntiFuzz(const char *cmd) {
     return 0;
 }
 
-int CmdHF14AChaining(const char *cmd) {
+int CmdHF14AChaining(const char *cmd)
+{
 
     CLIParserInit("hf 14a chaining",
-        "Enable/Disable ISO14443a input chaining. Maximum input length goes from ATS.",
-        "Usage:\n"
-        "\thf 14a chaining disable -> disable chaining\n"
-        "\thf 14a chaining         -> show chaining enable/disable state\n");
+                  "Enable/Disable ISO14443a input chaining. Maximum input length goes from ATS.",
+                  "Usage:\n"
+                  "\thf 14a chaining disable -> disable chaining\n"
+                  "\thf 14a chaining         -> show chaining enable/disable state\n");
 
-    void* argtable[] = {
+    void *argtable[] = {
         arg_param_begin,
         arg_str0(NULL, NULL,      "<enable/disable or 0/1>", NULL),
         arg_param_end
@@ -1369,13 +1460,15 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdHF14A(const char *Cmd) {
+int CmdHF14A(const char *Cmd)
+{
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
-  CmdsHelp(CommandTable);
-  return 0;
+int CmdHelp(const char *Cmd)
+{
+    CmdsHelp(CommandTable);
+    return 0;
 }
diff --git a/client/cmdhf14a.h b/client/cmdhf14a.h
index 73cbd069c..55b94bb08 100644
--- a/client/cmdhf14a.h
+++ b/client/cmdhf14a.h
@@ -36,7 +36,7 @@
 // structure and database for uid -> tagtype lookups
 typedef struct {
     uint8_t uid;
-    char* desc;
+    char *desc;
 } manufactureName;
 
 extern int CmdHF14A(const char *Cmd);
@@ -49,8 +49,8 @@ extern int CmdHF14ACmdRaw(const char *Cmd);
 extern int CmdHF14ACUIDs(const char *Cmd);
 extern int CmdHF14AAntiFuzz(const char *cmd);
 
-extern char* getTagInfo(uint8_t uid);
-extern int Hf14443_4aGetCardData(iso14a_card_select_t * card);
+extern char *getTagInfo(uint8_t uid);
+extern int Hf14443_4aGetCardData(iso14a_card_select_t *card);
 extern int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen);
 extern int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen);
 
diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c
index c3962a17f..0bff7a32d 100644
--- a/client/cmdhf14b.c
+++ b/client/cmdhf14b.c
@@ -14,7 +14,8 @@
 #define TIMEOUT 2000
 static int CmdHelp(const char *Cmd);
 
-int usage_hf_14b_info(void){
+int usage_hf_14b_info(void)
+{
     PrintAndLogEx(NORMAL, "Usage: hf 14b info [h] [s]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       h    this help");
@@ -23,7 +24,8 @@ int usage_hf_14b_info(void){
     PrintAndLogEx(NORMAL, "       hf 14b info");
     return 0;
 }
-int usage_hf_14b_reader(void){
+int usage_hf_14b_reader(void)
+{
     PrintAndLogEx(NORMAL, "Usage: hf 14b reader [h] [s]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       h    this help");
@@ -32,7 +34,8 @@ int usage_hf_14b_reader(void){
     PrintAndLogEx(NORMAL, "       hf 14b reader");
     return 0;
 }
-int usage_hf_14b_raw(void){
+int usage_hf_14b_raw(void)
+{
     PrintAndLogEx(NORMAL, "Usage: hf 14b raw [-h] [-r] [-c] [-p] [-s || -ss] <0A 0B 0C ... hex>");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       -h    this help");
@@ -45,7 +48,8 @@ int usage_hf_14b_raw(void){
     PrintAndLogEx(NORMAL, "       hf 14b raw -s -c -p 0200a40400");
     return 0;
 }
-int usage_hf_14b_sniff(void){
+int usage_hf_14b_sniff(void)
+{
     PrintAndLogEx(NORMAL, "It get data from the field and saves it into command buffer.");
     PrintAndLogEx(NORMAL, "Buffer accessible from command 'hf list 14b'");
     PrintAndLogEx(NORMAL, "Usage: hf 14b sniff [h]");
@@ -55,7 +59,8 @@ int usage_hf_14b_sniff(void){
     PrintAndLogEx(NORMAL, "       hf 14b sniff");
     return 0;
 }
-int usage_hf_14b_sim(void){
+int usage_hf_14b_sim(void)
+{
     PrintAndLogEx(NORMAL, "Emulating ISO/IEC 14443 type B tag with 4 UID / PUPI");
     PrintAndLogEx(NORMAL, "Usage: hf 14b sim [h] u <uid>");
     PrintAndLogEx(NORMAL, "Options:");
@@ -66,7 +71,8 @@ int usage_hf_14b_sim(void){
     PrintAndLogEx(NORMAL, "       hf 14b sim u 11223344");
     return 0;
 }
-int usage_hf_14b_read_srx(void){
+int usage_hf_14b_read_srx(void)
+{
     PrintAndLogEx(NORMAL, "Usage:  hf 14b sriread [h] <1|2>");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       h        this help");
@@ -76,7 +82,8 @@ int usage_hf_14b_read_srx(void){
     PrintAndLogEx(NORMAL, "       hf 14b sriread 2");
     return 0;
 }
-int usage_hf_14b_write_srx(void){
+int usage_hf_14b_write_srx(void)
+{
     PrintAndLogEx(NORMAL, "Usage:  hf 14b [h] sriwrite <1|2> <BLOCK> <DATA>");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       h        this help");
@@ -90,18 +97,19 @@ int usage_hf_14b_write_srx(void){
     PrintAndLogEx(NORMAL, "       hf 14b sriwrite 2 FF 11223344");
     return 0;
 }
-int usage_hf_14b_dump(void){
+int usage_hf_14b_dump(void)
+{
     PrintAndLogEx(NORMAL, "This command dumps the contents of a ISO-14443-B tag and save it to file\n"
-                          "\n"
-                          "Usage: hf 14b dump [h] [card memory] <f filname> \n"
-                          "Options:\n"
-                          "\th             this help\n"
-                          "\t[card memory] 1 = SRIX4K (default), 2 = SRI512"
-                          "\tf <name>      filename,  if no <name> UID will be used as filename\n"
-                          "\n"
-                          "Example:\n"
-                          "\thf 14b dump f\n"
-                          "\thf 14b dump 2 f mydump");
+                  "\n"
+                  "Usage: hf 14b dump [h] [card memory] <f filname> \n"
+                  "Options:\n"
+                  "\th             this help\n"
+                  "\t[card memory] 1 = SRIX4K (default), 2 = SRI512"
+                  "\tf <name>      filename,  if no <name> UID will be used as filename\n"
+                  "\n"
+                  "Example:\n"
+                  "\thf 14b dump f\n"
+                  "\thf 14b dump 2 f mydump");
     return 0;
 }
 
@@ -113,19 +121,22 @@ static void switch_on_field_14b(void) {
 }
 */
 
-static int switch_off_field_14b(void) {
+static int switch_off_field_14b(void)
+{
     UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_DISCONNECT, 0, 0}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
 }
 
-int CmdHF14BList(const char *Cmd) {
+int CmdHF14BList(const char *Cmd)
+{
     CmdTraceList("14b");
     return 0;
 }
 
-int CmdHF14BSim(const char *Cmd) {
+int CmdHF14BSim(const char *Cmd)
+{
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_hf_14b_sim();
 
@@ -140,7 +151,8 @@ int CmdHF14BSim(const char *Cmd) {
     return 0;
 }
 
-int CmdHF14BSniff(const char *Cmd) {
+int CmdHF14BSniff(const char *Cmd)
+{
 
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_hf_14b_sniff();
@@ -151,7 +163,8 @@ int CmdHF14BSniff(const char *Cmd) {
     return 0;
 }
 
-int CmdHF14BCmdRaw (const char *Cmd) {
+int CmdHF14BCmdRaw(const char *Cmd)
+{
     bool reply = true, power = false, select = false;
     char buf[5] = "";
     int i = 0;
@@ -160,15 +173,15 @@ int CmdHF14BCmdRaw (const char *Cmd) {
     uint32_t flags = ISO14B_CONNECT;
     uint32_t temp = 0;
 
-    if ( strlen(Cmd) < 3 ) return usage_hf_14b_raw();
+    if (strlen(Cmd) < 3) return usage_hf_14b_raw();
 
     // strip
-    while (*Cmd==' ' || *Cmd=='\t') ++Cmd;
+    while (*Cmd == ' ' || *Cmd == '\t') ++Cmd;
 
-    while (Cmd[i]!='\0') {
-        if (Cmd[i]==' ' || Cmd[i]=='\t') { ++i; continue; }
-        if (Cmd[i]=='-') {
-            switch (tolower(Cmd[i+1])) {
+    while (Cmd[i] != '\0') {
+        if (Cmd[i] == ' ' || Cmd[i] == '\t') { ++i; continue; }
+        if (Cmd[i] == '-') {
+            switch (tolower(Cmd[i + 1])) {
                 case 'h':
                     return usage_hf_14b_raw();
                 case 'r':
@@ -182,7 +195,7 @@ int CmdHF14BCmdRaw (const char *Cmd) {
                     break;
                 case 's':
                     select = true;
-                    if (tolower(Cmd[i+2]) == 's') {
+                    if (tolower(Cmd[i + 2]) == 's') {
                         flags |= ISO14B_SELECT_SR;
                         ++i;
                     } else {
@@ -192,20 +205,20 @@ int CmdHF14BCmdRaw (const char *Cmd) {
                 default:
                     return usage_hf_14b_raw();
             }
-            i+=2;
+            i += 2;
             continue;
         }
-        if ((Cmd[i]>='0' && Cmd[i]<='9') ||
-            (Cmd[i]>='a' && Cmd[i]<='f') ||
-            (Cmd[i]>='A' && Cmd[i]<='F') ) {
-            buf[strlen(buf)+1]=0;
-            buf[strlen(buf)]=Cmd[i];
+        if ((Cmd[i] >= '0' && Cmd[i] <= '9') ||
+            (Cmd[i] >= 'a' && Cmd[i] <= 'f') ||
+            (Cmd[i] >= 'A' && Cmd[i] <= 'F')) {
+            buf[strlen(buf) + 1] = 0;
+            buf[strlen(buf)] = Cmd[i];
             i++;
 
-            if (strlen(buf)>=2) {
-                sscanf(buf,"%x",&temp);
+            if (strlen(buf) >= 2) {
+                sscanf(buf, "%x", &temp);
                 data[datalen++] = (uint8_t)(temp & 0xff);
-                *buf=0;
+                *buf = 0;
                 memset(buf, 0x00, sizeof(buf));
             }
             continue;
@@ -236,12 +249,13 @@ int CmdHF14BCmdRaw (const char *Cmd) {
         success = waitCmd14b(false);
 
     // get back response from the raw bytes you sent.
-    if (success && datalen>0) waitCmd14b(true);
+    if (success && datalen > 0) waitCmd14b(true);
 
     return 1;
 }
 
-static bool get_14b_UID(iso14b_card_select_t *card) {
+static bool get_14b_UID(iso14b_card_select_t *card)
+{
 
     if (!card)
         return false;
@@ -258,7 +272,7 @@ static bool get_14b_UID(iso14b_card_select_t *card) {
         if (WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
 
             uint8_t status = resp.arg[0];
-            if ( status == 0) {
+            if (status == 0) {
                 memcpy(card, (iso14b_card_select_t *)resp.d.asBytes, sizeof(iso14b_card_select_t));
                 return true;
             }
@@ -276,14 +290,14 @@ static bool get_14b_UID(iso14b_card_select_t *card) {
         if (WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
 
             uint8_t status = resp.arg[0];
-            if ( status == 0) {
+            if (status == 0) {
                 memcpy(card, (iso14b_card_select_t *)resp.d.asBytes, sizeof(iso14b_card_select_t));
                 return true;
             }
         }
     } // retry
 
-    if ( retry <= 0 )
+    if (retry <= 0)
         PrintAndLogEx(WARNING, "timeout while waiting for reply.");
 
     return false;
@@ -295,10 +309,11 @@ static bool get_14b_UID(iso14b_card_select_t *card) {
 // 4       = bit rate capacity
 // 5       = max frame size / -4 info
 // 6       = FWI / Coding options
-static void print_atqb_resp(uint8_t *data, uint8_t cid){
+static void print_atqb_resp(uint8_t *data, uint8_t cid)
+{
     //PrintAndLogEx(NORMAL, "           UID: %s", sprint_hex(data+1,4));
-    PrintAndLogEx(NORMAL, "      App Data: %s", sprint_hex(data,4));
-    PrintAndLogEx(NORMAL, "      Protocol: %s", sprint_hex(data+4,3));
+    PrintAndLogEx(NORMAL, "      App Data: %s", sprint_hex(data, 4));
+    PrintAndLogEx(NORMAL, "      Protocol: %s", sprint_hex(data + 4, 3));
     uint8_t BitRate = data[4];
     if (!BitRate) PrintAndLogEx(NORMAL, "      Bit Rate: 106 kbit/s only PICC <-> PCD");
     if (BitRate & 0x10) PrintAndLogEx(NORMAL, "      Bit Rate: 212 kbit/s PICC -> PCD supported");
@@ -320,10 +335,10 @@ static void print_atqb_resp(uint8_t *data, uint8_t cid){
     PrintAndLogEx(NORMAL, "Max Frame Size: %u%s bytes", maxFrame, (maxFrame == 257) ? "+ RFU" : "");
 
     uint8_t protocolT = data[5] & 0xF;
-    PrintAndLogEx(NORMAL, " Protocol Type: Protocol is %scompliant with ISO/IEC 14443-4",(protocolT) ? "" : "not " );
+    PrintAndLogEx(NORMAL, " Protocol Type: Protocol is %scompliant with ISO/IEC 14443-4", (protocolT) ? "" : "not ");
 
-    uint8_t fwt = data[6]>>4;
-    if ( fwt < 16 ){
+    uint8_t fwt = data[6] >> 4;
+    if (fwt < 16) {
         uint32_t etus = (32 << fwt);
         uint32_t fwt_time = (302 << fwt);
         PrintAndLogEx(NORMAL, "Frame Wait Integer: %u - %u ETUs | %u us", fwt, etus, fwt_time);
@@ -331,86 +346,105 @@ static void print_atqb_resp(uint8_t *data, uint8_t cid){
         PrintAndLogEx(NORMAL, "Frame Wait Integer: %u - RFU", fwt);
     }
 
-    PrintAndLogEx(NORMAL, " App Data Code: Application is %s",(data[6]&4) ? "Standard" : "Proprietary");
-    PrintAndLogEx(NORMAL, " Frame Options: NAD is %ssupported",(data[6]&2) ? "" : "not ");
-    PrintAndLogEx(NORMAL, " Frame Options: CID is %ssupported",(data[6]&1) ? "" : "not ");
+    PrintAndLogEx(NORMAL, " App Data Code: Application is %s", (data[6] & 4) ? "Standard" : "Proprietary");
+    PrintAndLogEx(NORMAL, " Frame Options: NAD is %ssupported", (data[6] & 2) ? "" : "not ");
+    PrintAndLogEx(NORMAL, " Frame Options: CID is %ssupported", (data[6] & 1) ? "" : "not ");
     PrintAndLogEx(NORMAL, "Tag :");
-    PrintAndLogEx(NORMAL, "  Max Buf Length: %u (MBLI) %s", cid>>4, (cid & 0xF0) ? "" : "chained frames not supported");
+    PrintAndLogEx(NORMAL, "  Max Buf Length: %u (MBLI) %s", cid >> 4, (cid & 0xF0) ? "" : "chained frames not supported");
     PrintAndLogEx(NORMAL, "  CID : %u", cid & 0x0f);
     return;
 }
 
 // get SRx chip model (from UID) // from ST Microelectronics
-char *get_ST_Chip_Model(uint8_t data){
+char *get_ST_Chip_Model(uint8_t data)
+{
     static char model[20];
     char *retStr = model;
-    memset(model,0, sizeof(model));
+    memset(model, 0, sizeof(model));
 
     switch (data) {
-        case 0x0: sprintf(retStr, "SRIX4K (Special)"); break;
-        case 0x2: sprintf(retStr, "SR176"); break;
-        case 0x3: sprintf(retStr, "SRIX4K"); break;
-        case 0x4: sprintf(retStr, "SRIX512"); break;
-        case 0x6: sprintf(retStr, "SRI512"); break;
-        case 0x7: sprintf(retStr, "SRI4K"); break;
-        case 0xC: sprintf(retStr, "SRT512"); break;
-        default : sprintf(retStr, "Unknown"); break;
+        case 0x0:
+            sprintf(retStr, "SRIX4K (Special)");
+            break;
+        case 0x2:
+            sprintf(retStr, "SR176");
+            break;
+        case 0x3:
+            sprintf(retStr, "SRIX4K");
+            break;
+        case 0x4:
+            sprintf(retStr, "SRIX512");
+            break;
+        case 0x6:
+            sprintf(retStr, "SRI512");
+            break;
+        case 0x7:
+            sprintf(retStr, "SRI4K");
+            break;
+        case 0xC:
+            sprintf(retStr, "SRT512");
+            break;
+        default :
+            sprintf(retStr, "Unknown");
+            break;
     }
     return retStr;
 }
 
 // REMAKE:
-int print_ST_Lock_info(uint8_t model){
+int print_ST_Lock_info(uint8_t model)
+{
 
     // PrintAndLogEx(NORMAL, "Chip Write Protection Bits:");
     // // now interpret the data
     // switch (model){
-        // case 0x0: //fall through (SRIX4K special)
-        // case 0x3: //fall through (SRIx4K)
-        // case 0x7: //             (SRI4K)
-            // //only need data[3]
-            // blk1 = 9;
-            // PrintAndLogEx(NORMAL, "   raw: %s", sprint_bin(data+3, 1));
-            // PrintAndLogEx(NORMAL, " 07/08:%slocked", (data[3] & 1) ? " not " : " " );
-            // for (uint8_t i = 1; i<8; i++){
-                // PrintAndLogEx(NORMAL, "    %02u:%slocked", blk1, (data[3] & (1 << i)) ? " not " : " " );
-                // blk1++;
-            // }
-            // break;
-        // case 0x4: //fall through (SRIX512)
-        // case 0x6: //fall through (SRI512)
-        // case 0xC: //             (SRT512)
-            // //need data[2] and data[3]
-            // blk1 = 0;
-            // PrintAndLogEx(NORMAL, "   raw: %s", sprint_bin(data+2, 2));
-            // for (uint8_t b=2; b<4; b++){
-                // for (uint8_t i=0; i<8; i++){
-                    // PrintAndLogEx(NORMAL, "    %02u:%slocked", blk1, (data[b] & (1 << i)) ? " not " : " " );
-                    // blk1++;
-                // }
-            // }
-            // break;
-        // case 0x2: //             (SR176)
-            // //need data[2]
-            // blk1 = 0;
-            // PrintAndLogEx(NORMAL, "   raw: %s", sprint_bin(data+2, 1));
-            // for (uint8_t i = 0; i<8; i++){
-                // PrintAndLogEx(NORMAL, " %02u/%02u:%slocked", blk1, blk1+1, (data[2] & (1 << i)) ? " " : " not " );
-                // blk1+=2;
-            // }
-            // break;
-        // default:
-            // return rawClose();
+    // case 0x0: //fall through (SRIX4K special)
+    // case 0x3: //fall through (SRIx4K)
+    // case 0x7: //             (SRI4K)
+    // //only need data[3]
+    // blk1 = 9;
+    // PrintAndLogEx(NORMAL, "   raw: %s", sprint_bin(data+3, 1));
+    // PrintAndLogEx(NORMAL, " 07/08:%slocked", (data[3] & 1) ? " not " : " " );
+    // for (uint8_t i = 1; i<8; i++){
+    // PrintAndLogEx(NORMAL, "    %02u:%slocked", blk1, (data[3] & (1 << i)) ? " not " : " " );
+    // blk1++;
+    // }
+    // break;
+    // case 0x4: //fall through (SRIX512)
+    // case 0x6: //fall through (SRI512)
+    // case 0xC: //             (SRT512)
+    // //need data[2] and data[3]
+    // blk1 = 0;
+    // PrintAndLogEx(NORMAL, "   raw: %s", sprint_bin(data+2, 2));
+    // for (uint8_t b=2; b<4; b++){
+    // for (uint8_t i=0; i<8; i++){
+    // PrintAndLogEx(NORMAL, "    %02u:%slocked", blk1, (data[b] & (1 << i)) ? " not " : " " );
+    // blk1++;
+    // }
+    // }
+    // break;
+    // case 0x2: //             (SR176)
+    // //need data[2]
+    // blk1 = 0;
+    // PrintAndLogEx(NORMAL, "   raw: %s", sprint_bin(data+2, 1));
+    // for (uint8_t i = 0; i<8; i++){
+    // PrintAndLogEx(NORMAL, " %02u/%02u:%slocked", blk1, blk1+1, (data[2] & (1 << i)) ? " " : " not " );
+    // blk1+=2;
+    // }
+    // break;
+    // default:
+    // return rawClose();
     // }
     return 1;
 }
 
 // print UID info from SRx chips (ST Microelectronics)
-static void print_st_general_info(uint8_t *data, uint8_t len){
+static void print_st_general_info(uint8_t *data, uint8_t len)
+{
     //uid = first 8 bytes in data
-    PrintAndLogEx(NORMAL, " UID: %s", sprint_hex(SwapEndian64(data,8,8), len));
+    PrintAndLogEx(NORMAL, " UID: %s", sprint_hex(SwapEndian64(data, 8, 8), len));
     PrintAndLogEx(NORMAL, " MFG: %02X, %s", data[6], getTagInfo(data[6]));
-    PrintAndLogEx(NORMAL, "Chip: %02X, %s", data[5]>>2, get_ST_Chip_Model(data[5]>>2));
+    PrintAndLogEx(NORMAL, "Chip: %02X, %s", data[5] >> 2, get_ST_Chip_Model(data[5] >> 2));
     return;
 }
 
@@ -433,7 +467,8 @@ static void print_st_general_info(uint8_t *data, uint8_t len){
 //a2 = ?  (resp 02 [6a d3])
 
 // 14b get and print Full Info (as much as we know)
-bool HF14B_Std_Info(bool verbose){
+bool HF14B_Std_Info(bool verbose)
+{
 
     bool isSuccess = false;
 
@@ -446,7 +481,7 @@ bool HF14B_Std_Info(bool verbose){
     if (!WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
         if (verbose) PrintAndLogEx(WARNING, "command execution timeout");
         switch_off_field_14b();
-    return false;
+        return false;
     }
 
     iso14b_card_select_t card;
@@ -454,7 +489,7 @@ bool HF14B_Std_Info(bool verbose){
 
     uint64_t status = resp.arg[0];
 
-    switch( status ){
+    switch (status) {
         case 0:
             PrintAndLogEx(NORMAL, " UID    : %s", sprint_hex(card.uid, card.uidlen));
             PrintAndLogEx(NORMAL, " ATQB   : %s", sprint_hex(card.atqb, sizeof(card.atqb)));
@@ -477,7 +512,8 @@ bool HF14B_Std_Info(bool verbose){
 }
 
 // SRx get and print full info (needs more info...)
-bool HF14B_ST_Info(bool verbose){
+bool HF14B_ST_Info(bool verbose)
+{
 
     UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_SR | ISO14B_DISCONNECT, 0, 0}};
     clearCommandBuffer();
@@ -493,7 +529,7 @@ bool HF14B_ST_Info(bool verbose){
     memcpy(&card, (iso14b_card_select_t *)resp.d.asBytes, sizeof(iso14b_card_select_t));
 
     uint64_t status = resp.arg[0];
-    if ( status > 0 )
+    if (status > 0)
         return false;
 
     print_st_general_info(card.uid, card.uidlen);
@@ -506,16 +542,16 @@ bool HF14B_ST_Info(bool verbose){
 
     //
     // if (model == 0x2) { //SR176 has special command:
-        // data[1] = 0xf;
-        // resplen = 4;
+    // data[1] = 0xf;
+    // resplen = 4;
     // } else {
-        // data[1] = 0xff;
-        // resplen = 6;
+    // data[1] = 0xff;
+    // resplen = 6;
     // }
 
     // //std read cmd
     // if (HF14BCmdRaw(true, true, data, &datalen, false)==0)
-        // return rawClose();
+    // return rawClose();
 
     // if (datalen != resplen || !crc) return rawClose();
     //print_ST_Lock_info(data[5]>>2);
@@ -523,7 +559,8 @@ bool HF14B_ST_Info(bool verbose){
 }
 
 // get and print all info known about any known 14b tag
-bool HF14BInfo(bool verbose){
+bool HF14BInfo(bool verbose)
+{
 
     // try std 14b (atqb)
     if (HF14B_Std_Info(verbose)) return true;
@@ -538,7 +575,8 @@ bool HF14BInfo(bool verbose){
 }
 
 // menu command to get and print all info known about any known 14b tag
-int CmdHF14Binfo(const char *Cmd){
+int CmdHF14Binfo(const char *Cmd)
+{
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_hf_14b_info();
 
@@ -546,7 +584,8 @@ int CmdHF14Binfo(const char *Cmd){
     return HF14BInfo(verbose);
 }
 
-bool HF14B_ST_Reader(bool verbose){
+bool HF14B_ST_Reader(bool verbose)
+{
 
     bool isSuccess = false;
 
@@ -565,7 +604,7 @@ bool HF14B_ST_Reader(bool verbose){
 
     uint64_t status = resp.arg[0];
 
-    switch( status ){
+    switch (status) {
         case 0:
             print_st_general_info(card.uid, card.uidlen);
             isSuccess = true;
@@ -586,7 +625,8 @@ bool HF14B_ST_Reader(bool verbose){
     return isSuccess;
 }
 
-bool HF14B_Std_Reader(bool verbose){
+bool HF14B_Std_Reader(bool verbose)
+{
 
     bool isSuccess = false;
 
@@ -606,7 +646,7 @@ bool HF14B_Std_Reader(bool verbose){
 
     uint64_t status = resp.arg[0];
 
-    switch( status ){
+    switch (status) {
         case 0:
             PrintAndLogEx(NORMAL, " UID    : %s", sprint_hex(card.uid, card.uidlen));
             PrintAndLogEx(NORMAL, " ATQB   : %s", sprint_hex(card.atqb, sizeof(card.atqb)));
@@ -628,7 +668,8 @@ bool HF14B_Std_Reader(bool verbose){
 }
 
 // test for other 14b type tags (mimic another reader - don't have tags to identify)
-bool HF14B_Other_Reader(){
+bool HF14B_Other_Reader()
+{
 
     // uint8_t data[] = {0x00, 0x0b, 0x3f, 0x80};
     // uint8_t datalen = 4;
@@ -645,11 +686,11 @@ bool HF14B_Other_Reader(){
     // WaitForResponse(CMD_ACK,&resp);
 
     // if (datalen > 2 ) {
-        // PrintAndLogEx(NORMAL, "\n14443-3b tag found:");
-        // PrintAndLogEx(NORMAL, "unknown tag type answered to a 0x000b3f80 command ans:");
-        // //PrintAndLogEx(NORMAL, "%s", sprint_hex(data, datalen));
-        // rawclose();
-        // return true;
+    // PrintAndLogEx(NORMAL, "\n14443-3b tag found:");
+    // PrintAndLogEx(NORMAL, "unknown tag type answered to a 0x000b3f80 command ans:");
+    // //PrintAndLogEx(NORMAL, "%s", sprint_hex(data, datalen));
+    // rawclose();
+    // return true;
     // }
 
     // c.arg1 = 1;
@@ -660,11 +701,11 @@ bool HF14B_Other_Reader(){
     // WaitForResponse(CMD_ACK, &resp);
 
     // if (datalen > 0) {
-        // PrintAndLogEx(NORMAL, "\n14443-3b tag found:");
-        // PrintAndLogEx(NORMAL, "Unknown tag type answered to a 0x0A command ans:");
-        // // PrintAndLogEx(NORMAL, "%s", sprint_hex(data, datalen));
-        // rawClose();
-        // return true;
+    // PrintAndLogEx(NORMAL, "\n14443-3b tag found:");
+    // PrintAndLogEx(NORMAL, "Unknown tag type answered to a 0x0A command ans:");
+    // // PrintAndLogEx(NORMAL, "%s", sprint_hex(data, datalen));
+    // rawClose();
+    // return true;
     // }
 
     // c.arg1 = 1;
@@ -675,11 +716,11 @@ bool HF14B_Other_Reader(){
     // WaitForResponse(CMD_ACK, &resp);
 
     // if (datalen > 0) {
-        // PrintAndLogEx(NORMAL, "\n14443-3b tag found:");
-        // PrintAndLogEx(NORMAL, "Unknown tag type answered to a 0x0C command ans:");
-        // PrintAndLogEx(NORMAL, "%s", sprint_hex(data, datalen));
-        // rawClose();
-        // return true;
+    // PrintAndLogEx(NORMAL, "\n14443-3b tag found:");
+    // PrintAndLogEx(NORMAL, "Unknown tag type answered to a 0x0C command ans:");
+    // PrintAndLogEx(NORMAL, "%s", sprint_hex(data, datalen));
+    // rawClose();
+    // return true;
     // }
 
     // rawClose();
@@ -687,7 +728,8 @@ bool HF14B_Other_Reader(){
 }
 
 // get and print general info about all known 14b chips
-bool HF14BReader(bool verbose){
+bool HF14BReader(bool verbose)
+{
 
     // try std 14b (atqb)
     if (HF14B_Std_Reader(verbose)) return true;
@@ -704,7 +746,8 @@ bool HF14BReader(bool verbose){
 }
 
 // menu command to get and print general info about all known 14b chips
-int CmdHF14BReader(const char *Cmd){
+int CmdHF14BReader(const char *Cmd)
+{
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_hf_14b_reader();
 
@@ -716,7 +759,8 @@ int CmdHF14BReader(const char *Cmd){
  * SRI* tags are ISO14443-B modulated memory tags,
  * this command just dumps the contents of the memory/
  */
-int CmdHF14BReadSri(const char *Cmd){
+int CmdHF14BReadSri(const char *Cmd)
+{
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) < 1 || cmdp == 'h') return usage_hf_14b_read_srx();
 
@@ -729,17 +773,18 @@ int CmdHF14BReadSri(const char *Cmd){
     return 0;
 }
 // New command to write a SRI512/SRIX4K tag.
-int CmdHF14BWriteSri(const char *Cmd){
-/*
- * For SRIX4K  blocks 00 - 7F
- * hf 14b raw -c -p 09 $srix4kwblock $srix4kwdata
- *
- * For SR512  blocks 00 - 0F
- * hf 14b raw -c -p 09 $sr512wblock $sr512wdata
- *
- * Special block FF =  otp_lock_reg block.
- * Data len 4 bytes-
- */
+int CmdHF14BWriteSri(const char *Cmd)
+{
+    /*
+     * For SRIX4K  blocks 00 - 7F
+     * hf 14b raw -c -p 09 $srix4kwblock $srix4kwdata
+     *
+     * For SR512  blocks 00 - 0F
+     * hf 14b raw -c -p 09 $sr512wblock $sr512wdata
+     *
+     * Special block FF =  otp_lock_reg block.
+     * Data len 4 bytes-
+     */
     char cmdp = tolower(param_getchar(Cmd, 0));
     uint8_t blockno = -1;
     uint8_t data[4] = {0x00};
@@ -749,23 +794,23 @@ int CmdHF14BWriteSri(const char *Cmd){
 
     if (strlen(Cmd) < 1 || cmdp == 'h') return usage_hf_14b_write_srx();
 
-    if ( cmdp == '2' )
+    if (cmdp == '2')
         isSrix4k = false;
 
     //blockno = param_get8(Cmd, 1);
 
-    if ( param_gethex(Cmd, 1, &blockno, 2) ) {
+    if (param_gethex(Cmd, 1, &blockno, 2)) {
         PrintAndLogEx(WARNING, "block number must include 2 HEX symbols");
         return 0;
     }
 
-    if ( isSrix4k ){
-        if ( blockno > 0x7f && blockno != 0xff ){
+    if (isSrix4k) {
+        if (blockno > 0x7f && blockno != 0xff) {
             PrintAndLogEx(FAILED, "block number out of range");
             return 0;
         }
     } else {
-        if ( blockno > 0x0f && blockno != 0xff ){
+        if (blockno > 0x0f && blockno != 0xff) {
             PrintAndLogEx(FAILED, "block number out of range");
             return 0;
         }
@@ -776,18 +821,18 @@ int CmdHF14BWriteSri(const char *Cmd){
         return 0;
     }
 
-    if ( blockno == 0xff) {
+    if (blockno == 0xff) {
         PrintAndLogEx(SUCCESS, "[%s] Write special block %02X [ %s ]",
-            (isSrix4k) ? "SRIX4K":"SRI512",
-            blockno,
-            sprint_hex(data,4)
-        );
+                      (isSrix4k) ? "SRIX4K" : "SRI512",
+                      blockno,
+                      sprint_hex(data, 4)
+                     );
     } else {
         PrintAndLogEx(SUCCESS, "[%s] Write block %02X [ %s ]",
-            (isSrix4k) ? "SRIX4K":"SRI512",
-            blockno,
-            sprint_hex(data,4)
-        );
+                      (isSrix4k) ? "SRIX4K" : "SRI512",
+                      blockno,
+                      sprint_hex(data, 4)
+                     );
     }
 
     sprintf(str, "-ss -c %02x %02x %02x %02x %02x %02x", ISO14443B_WRITE_BLK, blockno, data[0], data[1], data[2], data[3]);
@@ -796,11 +841,12 @@ int CmdHF14BWriteSri(const char *Cmd){
 }
 
 // need to write to file
-int CmdHF14BDump(const char*Cmd) {
+int CmdHF14BDump(const char *Cmd)
+{
 
     uint8_t fileNameLen = 0;
     char filename[FILE_PATH_SIZE] = {0};
-    char * fptr = filename;
+    char *fptr = filename;
     bool errors = false;
     uint8_t cmdp = 0, cardtype = 1;
     uint16_t cardsize = 0;
@@ -809,35 +855,35 @@ int CmdHF14BDump(const char*Cmd) {
 
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
-        case 'h':
-            return usage_hf_14b_dump();
-        case 'f':
-            fileNameLen = param_getstr(Cmd, cmdp+1, filename, FILE_PATH_SIZE);
-            cmdp += 2;
-            break;
-        default:
-            if (cmdp == 0) {
-                cardtype = param_get8ex(Cmd, cmdp, 1, 10);
-                cmdp++;
-            } else {
-                PrintAndLogEx(WARNING, "Unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
-                errors = true;
+            case 'h':
+                return usage_hf_14b_dump();
+            case 'f':
+                fileNameLen = param_getstr(Cmd, cmdp + 1, filename, FILE_PATH_SIZE);
+                cmdp += 2;
                 break;
-            }
+            default:
+                if (cmdp == 0) {
+                    cardtype = param_get8ex(Cmd, cmdp, 1, 10);
+                    cmdp++;
+                } else {
+                    PrintAndLogEx(WARNING, "Unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
+                    errors = true;
+                    break;
+                }
         }
     }
 
     //Validations
     if (errors) return usage_hf_14b_dump();
 
-    switch (cardtype){
+    switch (cardtype) {
         case 2:
-            cardsize = (512/8) + 4;
+            cardsize = (512 / 8) + 4;
             blocks = 0x0F;
             break;
         case 1:
         default:
-            cardsize = (4096/8) + 4;
+            cardsize = (4096 / 8) + 4;
             blocks = 0x7F;
             break;
     }
@@ -891,21 +937,21 @@ int CmdHF14BDump(const char*Cmd) {
         if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
 
             uint8_t status = resp.arg[0] & 0xFF;
-            if ( status > 0 ) {
+            if (status > 0) {
                 continue;
             }
 
             uint16_t len = (resp.arg[1] & 0xFFFF);
             recv = resp.d.asBytes;
 
-            if ( !check_crc(CRC_14443_B, recv, len) ) {
+            if (!check_crc(CRC_14443_B, recv, len)) {
                 PrintAndLogEx(FAILED, "crc fail, retrying one more time");
                 continue;
             }
 
             memcpy(data + (blocknum * 4), resp.d.asBytes, 4);
 
-            if ( blocknum == 0xFF) {
+            if (blocknum == 0xFF) {
                 //last read.
                 break;
             }
@@ -913,16 +959,17 @@ int CmdHF14BDump(const char*Cmd) {
 
             retry = 0;
             blocknum++;
-            if ( blocknum > blocks ) {
+            if (blocknum > blocks) {
                 // read config block
                 blocknum = 0xFF;
             }
 
-            printf("."); fflush(stdout);
+            printf(".");
+            fflush(stdout);
         }
     }
 
-    if ( blocknum != 0xFF) {
+    if (blocknum != 0xFF) {
         PrintAndLogEx(NORMAL, "\n Dump failed");
         goto out;
     }
@@ -933,95 +980,102 @@ int CmdHF14BDump(const char*Cmd) {
 
     for (int i = 0; i <= blocks; i++) {
         PrintAndLogEx(NORMAL,
-            "%3d/0x%02X | %s | %s",
-            i,
-            i,
-            sprint_hex(data + (i*4), 4 ),
-            sprint_ascii(data + (i*4), 4)
-        );
+                      "%3d/0x%02X | %s | %s",
+                      i,
+                      i,
+                      sprint_hex(data + (i * 4), 4),
+                      sprint_ascii(data + (i * 4), 4)
+                     );
     }
 
     PrintAndLogEx(NORMAL, "\n");
 
 
-    size_t datalen = (blocks+1) * 4;
+    size_t datalen = (blocks + 1) * 4;
     saveFileEML(filename, "eml", data, datalen, 4);
     saveFile(filename, "bin", data, datalen);
 out:
     return switch_off_field_14b();
 }
 
-uint32_t srix4kEncode(uint32_t value) {
-/*
-// vv = value
-// pp = position
-//                vv vv vv pp
-4 bytes         : 00 1A 20 01
-*/
+uint32_t srix4kEncode(uint32_t value)
+{
+    /*
+    // vv = value
+    // pp = position
+    //                vv vv vv pp
+    4 bytes         : 00 1A 20 01
+    */
     // only the lower crumbs.
     uint8_t block = (value & 0xFF);
     uint8_t i = 0;
-    uint8_t valuebytes[] = {0,0,0};
+    uint8_t valuebytes[] = {0, 0, 0};
 
     num_to_bytes(value, 3, valuebytes);
 
     // Scrambled part
     // Crumb swapping of value.
-    uint8_t temp[] = {0,0};
-    temp[0] = (CRUMB(value, 22) << 4 | CRUMB(value, 14 ) << 2 | CRUMB(value, 6)) << 4;
-    temp[0] |= CRUMB(value, 20) << 4 | CRUMB(value, 12 ) << 2 | CRUMB(value, 4);
-    temp[1] = (CRUMB(value, 18) << 4 | CRUMB(value, 10 ) << 2 | CRUMB(value, 2)) << 4;
-    temp[1] |= CRUMB(value, 16) << 4 | CRUMB(value, 8  ) << 2 | CRUMB(value, 0);
+    uint8_t temp[] = {0, 0};
+    temp[0] = (CRUMB(value, 22) << 4 | CRUMB(value, 14) << 2 | CRUMB(value, 6)) << 4;
+    temp[0] |= CRUMB(value, 20) << 4 | CRUMB(value, 12) << 2 | CRUMB(value, 4);
+    temp[1] = (CRUMB(value, 18) << 4 | CRUMB(value, 10) << 2 | CRUMB(value, 2)) << 4;
+    temp[1] |= CRUMB(value, 16) << 4 | CRUMB(value, 8) << 2 | CRUMB(value, 0);
 
     // chksum part
     uint32_t chksum = 0xFF - block;
 
     // chksum is reduced by each nibbles of value.
-    for (i = 0; i < 3; ++i){
+    for (i = 0; i < 3; ++i) {
         chksum -= NIBBLE_HIGH(valuebytes[i]);
         chksum -= NIBBLE_LOW(valuebytes[i]);
     }
 
     // base4 conversion and left shift twice
     i = 3;
-    uint8_t base4[] = {0,0,0,0};
-    while( chksum !=0 ){
+    uint8_t base4[] = {0, 0, 0, 0};
+    while (chksum != 0) {
         base4[i--] = (chksum % 4 << 2);
         chksum /= 4;
     }
 
     // merge scambled and chksum parts
     uint32_t encvalue =
-        ( NIBBLE_LOW ( base4[0]) << 28 ) |
-        ( NIBBLE_HIGH( temp[0])  << 24 ) |
+        (NIBBLE_LOW(base4[0]) << 28) |
+        (NIBBLE_HIGH(temp[0])  << 24) |
 
-        ( NIBBLE_LOW ( base4[1]) << 20 ) |
-        ( NIBBLE_LOW ( temp[0])  << 16 ) |
+        (NIBBLE_LOW(base4[1]) << 20) |
+        (NIBBLE_LOW(temp[0])  << 16) |
 
-        ( NIBBLE_LOW ( base4[2]) << 12 ) |
-        ( NIBBLE_HIGH( temp[1])  << 8 ) |
+        (NIBBLE_LOW(base4[2]) << 12) |
+        (NIBBLE_HIGH(temp[1])  << 8) |
 
-        ( NIBBLE_LOW ( base4[3]) << 4 ) |
-          NIBBLE_LOW ( temp[1] );
+        (NIBBLE_LOW(base4[3]) << 4) |
+        NIBBLE_LOW(temp[1]);
 
     PrintAndLogEx(NORMAL, "ICE encoded | %08X -> %08X", value, encvalue);
     return encvalue;
 }
-uint32_t srix4kDecode(uint32_t value) {
-    switch(value) {
-        case 0xC04F42C5: return 0x003139;
-        case 0xC1484807: return 0x002943;
-        case 0xC0C60848: return 0x001A20;
+uint32_t srix4kDecode(uint32_t value)
+{
+    switch (value) {
+        case 0xC04F42C5:
+            return 0x003139;
+        case 0xC1484807:
+            return 0x002943;
+        case 0xC0C60848:
+            return 0x001A20;
     }
     return 0;
 }
-uint32_t srix4kDecodeCounter(uint32_t num) {
+uint32_t srix4kDecodeCounter(uint32_t num)
+{
     uint32_t value = ~num;
     ++value;
     return value;
 }
 
-uint32_t srix4kGetMagicbytes( uint64_t uid, uint32_t block6, uint32_t block18, uint32_t block19 ){
+uint32_t srix4kGetMagicbytes(uint64_t uid, uint32_t block6, uint32_t block18, uint32_t block19)
+{
 #define MASK 0xFFFFFFFF;
     uint32_t uid32 = uid & MASK;
     uint32_t counter = srix4kDecodeCounter(block6);
@@ -1033,7 +1087,8 @@ uint32_t srix4kGetMagicbytes( uint64_t uid, uint32_t block6, uint32_t block18, u
     PrintAndLogEx(SUCCESS, "Magic bytes | %08X", result);
     return result;
 }
-int srix4kValid(const char *Cmd){
+int srix4kValid(const char *Cmd)
+{
 
     uint64_t uid = 0xD00202501A4532F9;
     uint32_t block6 = 0xFFFFFFFF;
@@ -1044,14 +1099,15 @@ int srix4kValid(const char *Cmd){
     uint32_t test_b18 = 0x00313918;
     uint32_t test_b18_enc = srix4kEncode(test_b18);
     //uint32_t test_b18_dec = srix4kDecode(test_b18_enc);
-    PrintAndLogEx(SUCCESS, "ENCODE & CHECKSUM |  %08X -> %08X (%s)", test_b18, test_b18_enc , "");
+    PrintAndLogEx(SUCCESS, "ENCODE & CHECKSUM |  %08X -> %08X (%s)", test_b18, test_b18_enc, "");
 
     uint32_t magic = srix4kGetMagicbytes(uid, block6, block18, block19);
     PrintAndLogEx(SUCCESS, "BLOCK 21 |  %08X -> %08X (no XOR)", block21, magic ^ block21);
     return 0;
 }
 
-bool waitCmd14b(bool verbose) {
+bool waitCmd14b(bool verbose)
+{
 
     bool crc = false;
     uint8_t data[USB_CMD_DATA_SIZE] = {0x00};
@@ -1062,25 +1118,25 @@ bool waitCmd14b(bool verbose) {
     if (WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
 
         status = (resp.arg[0] & 0xFF);
-        if ( status > 0 ) return false;
+        if (status > 0) return false;
 
         len = (resp.arg[1] & 0xFFFF);
 
         memcpy(data, resp.d.asBytes, len);
 
         if (verbose) {
-            if ( len >= 3 ) {
+            if (len >= 3) {
                 crc = check_crc(CRC_14443_B, data, len);
 
                 PrintAndLogEx(NORMAL, "[LEN %u] %s[%02X %02X] %s",
-                    len,
-                    sprint_hex(data, len-2),
-                    data[len-2],
-                    data[len-1],
-                    (crc) ? "OK" : "FAIL"
-                );
+                              len,
+                              sprint_hex(data, len - 2),
+                              data[len - 2],
+                              data[len - 1],
+                              (crc) ? "OK" : "FAIL"
+                             );
             } else {
-                PrintAndLogEx(NORMAL, "[LEN %u] %s", len, sprint_hex(data, len) );
+                PrintAndLogEx(NORMAL, "[LEN %u] %s", len, sprint_hex(data, len));
             }
         }
         return true;
@@ -1105,13 +1161,15 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdHF14B(const char *Cmd) {
+int CmdHF14B(const char *Cmd)
+{
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
+int CmdHelp(const char *Cmd)
+{
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdhf14b.h b/client/cmdhf14b.h
index f77658c19..56114af94 100644
--- a/client/cmdhf14b.h
+++ b/client/cmdhf14b.h
@@ -42,14 +42,14 @@ extern int CmdHF14BList(const char *Cmd);
 extern int CmdHF14BInfo(const char *Cmd);
 extern int CmdHF14BSim(const char *Cmd);
 extern int CmdHF14BSniff(const char *Cmd);
-extern int CmdHF14BWrite( const char *cmd);
+extern int CmdHF14BWrite(const char *cmd);
 extern int CmdHF14BReader(const char *Cmd);
 
 extern int CmdHF14BDump(const char *Cmd);
 
 extern bool HF14BInfo(bool verbose);
 extern bool HF14BReader(bool verbose);
-extern int CmdHF14BCmdRaw (const char *Cmd);
+extern int CmdHF14BCmdRaw(const char *Cmd);
 
 // SRi  ST Microelectronics read/write
 extern int CmdHF14BReadSri(const char *Cmd);
diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index 9164ac70e..3a2fe28f0 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -39,7 +39,7 @@
 typedef struct {
     uint64_t uid;
     int mask; // how many MSB bits used
-    char* desc;
+    char *desc;
 } productName;
 
 const productName uidmapping[] = {
@@ -183,13 +183,14 @@ const productName uidmapping[] = {
     { 0xE042000000000000LL, 16, "3Alogics Inc Korea" },
     { 0xE043000000000000LL, 16, "Top TroniQ Asia Limited Hong Kong" },
     { 0xE044000000000000LL, 16, "Gentag Inc (USA) USA" },
-    { 0,0,"no tag-info available" } // must be the last entry
+    { 0, 0, "no tag-info available" } // must be the last entry
 };
 
 // fast method to just read the UID of a tag (collission detection not supported)
 //  *buf should be large enough to fit the 64bit uid
 // returns 1 if suceeded
-int getUID(uint8_t *buf) {
+int getUID(uint8_t *buf)
+{
 
     UsbCommand resp;
     UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}}; // len,speed,recv?
@@ -213,13 +214,13 @@ int getUID(uint8_t *buf) {
 
             uint8_t resplen = resp.arg[0];
             if (resplen >= 12 && CheckCrc(resp.d.asBytes, 12)) {
-               memcpy(buf, resp.d.asBytes + 2, 8);
-               return 1;
+                memcpy(buf, resp.d.asBytes + 2, 8);
+                return 1;
             }
         }
     } // retry
 
-    if ( retry >= 3 )
+    if (retry >= 3)
         PrintAndLogEx(WARNING, "timeout while waiting for reply.");
 
     return 0;
@@ -228,18 +229,19 @@ int getUID(uint8_t *buf) {
 // get a product description based on the UID
 // uid[8] tag uid
 // returns description of the best match
-static char* getTagInfo_15(uint8_t *uid) {
+static char *getTagInfo_15(uint8_t *uid)
+{
     uint64_t myuid, mask;
     int i = 0, best = -1;
     memcpy(&myuid, uid, sizeof(uint64_t));
     while (uidmapping[i].mask > 0) {
-        mask = (~0LL) << (64-uidmapping[i].mask);
+        mask = (~0LL) << (64 - uidmapping[i].mask);
         if ((myuid & mask) == uidmapping[i].uid) {
             if (best == -1) {
                 best = i;
             } else {
                 if (uidmapping[i].mask > uidmapping[best].mask) {
-                    best=i;
+                    best = i;
                 }
             }
         }
@@ -252,88 +254,108 @@ static char* getTagInfo_15(uint8_t *uid) {
 }
 
 // return a clear-text message to an errorcode
-static char* TagErrorStr(uint8_t error) {
+static char *TagErrorStr(uint8_t error)
+{
     switch (error) {
-        case 0x01: return "The command is not supported";
-        case 0x02: return "The command is not recognised";
-        case 0x03: return "The option is not supported.";
-        case 0x0f: return "Unknown error.";
-        case 0x10: return "The specified block is not available (doesn't exist).";
-        case 0x11: return "The specified block is already -locked and thus cannot be locked again";
-        case 0x12: return "The specified block is locked and its content cannot be changed.";
-        case 0x13: return "The specified block was not successfully programmed.";
-        case 0x14: return "The specified block was not successfully locked.";
-        default: return "Reserved for Future Use or Custom command error.";
+        case 0x01:
+            return "The command is not supported";
+        case 0x02:
+            return "The command is not recognised";
+        case 0x03:
+            return "The option is not supported.";
+        case 0x0f:
+            return "Unknown error.";
+        case 0x10:
+            return "The specified block is not available (doesn't exist).";
+        case 0x11:
+            return "The specified block is already -locked and thus cannot be locked again";
+        case 0x12:
+            return "The specified block is locked and its content cannot be changed.";
+        case 0x13:
+            return "The specified block was not successfully programmed.";
+        case 0x14:
+            return "The specified block was not successfully locked.";
+        default:
+            return "Reserved for Future Use or Custom command error.";
     }
 }
 
-int usage_15_demod(void){
+int usage_15_demod(void)
+{
     PrintAndLogEx(NORMAL, "Tries to demodulate / decode ISO15693, from downloaded samples.\n"
-                          "Gather samples with 'hf 15 read' / 'hf 15 record'");
+                  "Gather samples with 'hf 15 read' / 'hf 15 record'");
     return 0;
 }
-int usage_15_samples(void){
+int usage_15_samples(void)
+{
     PrintAndLogEx(NORMAL, "Acquire samples as Reader (enables carrier, send inquiry\n"
-                          "and download it to graphbuffer.  Try 'hf 15 demod'  to try to demodulate/decode signal");
+                  "and download it to graphbuffer.  Try 'hf 15 demod'  to try to demodulate/decode signal");
     return 0;
 }
-int usage_15_info(void){
+int usage_15_info(void)
+{
     PrintAndLogEx(NORMAL, "Uses the optional command 'get_systeminfo' 0x2B to try and extract information\n"
-                          "command may fail, depending on tag.\n"
-                          "defaults to '1 out of 4' mode\n"
-                          "\n"
-                          "Usage:  hf 15 info    [options] <uid|s|u|*>\n"
-                          "Options:\n"
-                          "\t-2        use slower '1 out of 256' mode\n"
-                          "\tuid (either): \n"
-                          "\t  <8B hex>  full UID eg E011223344556677\n"
-                          "\t  u         unaddressed mode\n"
-                          "\t  *         scan for tag\n"
-                          "Examples:\n"
-                          "\thf 15 info u");
+                  "command may fail, depending on tag.\n"
+                  "defaults to '1 out of 4' mode\n"
+                  "\n"
+                  "Usage:  hf 15 info    [options] <uid|s|u|*>\n"
+                  "Options:\n"
+                  "\t-2        use slower '1 out of 256' mode\n"
+                  "\tuid (either): \n"
+                  "\t  <8B hex>  full UID eg E011223344556677\n"
+                  "\t  u         unaddressed mode\n"
+                  "\t  *         scan for tag\n"
+                  "Examples:\n"
+                  "\thf 15 info u");
     return 0;
 }
-int usage_15_record(void){
+int usage_15_record(void)
+{
     PrintAndLogEx(NORMAL, "Record activity without enableing carrier");
     return 0;
 }
-int usage_15_reader(void){
+int usage_15_reader(void)
+{
     PrintAndLogEx(NORMAL, "This command identifies a ISO 15693 tag\n"
-                          "\n"
-                          "Usage: hf 15 reader [h]\n"
-                          "Options:\n"
-                          "\th             this help\n"
-                          "\n"
-                          "Example:\n"
-                          "\thf 15 reader");
+                  "\n"
+                  "Usage: hf 15 reader [h]\n"
+                  "Options:\n"
+                  "\th             this help\n"
+                  "\n"
+                  "Example:\n"
+                  "\thf 15 reader");
     return 0;
 }
-int usage_15_sim(void){
+int usage_15_sim(void)
+{
     PrintAndLogEx(NORMAL, "Usage:  hf 15 sim <UID>\n"
-                          "\n"
-                          "Example:\n"
-                          "\thf 15 sim E016240000000000");
+                  "\n"
+                  "Example:\n"
+                  "\thf 15 sim E016240000000000");
     return 0;
 }
-int usage_15_findafi(void){
+int usage_15_findafi(void)
+{
     PrintAndLogEx(NORMAL, "'hf 15 finafi' This command needs a helptext. Feel free to add one!");
     return 0;
 }
-int usage_15_dump(void){
+int usage_15_dump(void)
+{
     PrintAndLogEx(NORMAL, "This command dumps the contents of a ISO-15693 tag and save it to file\n"
-                          "\n"
-                          "Usage: hf 15 dump [h] <f filname> \n"
-                          "Options:\n"
-                          "\th             this help\n"
-                          "\tf <name>      filename,  if no <name> UID will be used as filename\n"
-                          "\n"
-                          "Example:\n"
-                          "\thf 15 dump f\n"
-                          "\thf 15 dump f mydump");
+                  "\n"
+                  "Usage: hf 15 dump [h] <f filname> \n"
+                  "Options:\n"
+                  "\th             this help\n"
+                  "\tf <name>      filename,  if no <name> UID will be used as filename\n"
+                  "\n"
+                  "Example:\n"
+                  "\thf 15 dump f\n"
+                  "\thf 15 dump f mydump");
     return 0;
 }
-int usage_15_restore(void){
-    char *options[][2]={
+int usage_15_restore(void)
+{
+    char *options[][2] = {
         {"h", "this help"},
         {"-2", "use slower '1 out of 256' mode"},
         {"-o", "set OPTION Flag (needed for TI)"},
@@ -346,8 +368,9 @@ int usage_15_restore(void){
     PrintAndLogOptions(options, 7, 3);
     return 0;
 }
-int usage_15_raw(void){
-    char *options[][2]={
+int usage_15_raw(void)
+{
+    char *options[][2] = {
         {"-r", "do not read response" },
         {"-2", "use slower '1 out of 256' mode" },
         {"-c", "calculate and append CRC" },
@@ -357,45 +380,49 @@ int usage_15_raw(void){
     PrintAndLogOptions(options, 4, 3);
     return 0;
 }
-int usage_15_read(void){
+int usage_15_read(void)
+{
     PrintAndLogEx(NORMAL, "Usage:  hf 15 read    [options] <uid|s|u|*> <page#>\n"
-                          "Options:\n"
-                          "\t-2        use slower '1 out of 256' mode\n"
-                          "\tuid (either): \n"
-                          "\t   <8B hex>  full UID eg E011223344556677\n"
-                          "\t   u         unaddressed mode\n"
-                          "\t   *         scan for tag\n"
-                          "\tpage#:        page number 0-255");
+                  "Options:\n"
+                  "\t-2        use slower '1 out of 256' mode\n"
+                  "\tuid (either): \n"
+                  "\t   <8B hex>  full UID eg E011223344556677\n"
+                  "\t   u         unaddressed mode\n"
+                  "\t   *         scan for tag\n"
+                  "\tpage#:        page number 0-255");
     return 0;
 }
-int usage_15_write(void){
+int usage_15_write(void)
+{
     PrintAndLogEx(NORMAL, "Usage:  hf 15 write    [options] <uid|s|u|*> <page#> <hexdata>\n"
-                          "Options:\n"
-                          "\t-2        use slower '1 out of 256' mode\n"
-                          "\t-o        set OPTION Flag (needed for TI)\n"
-                          "\tuid (either): \n"
-                          "\t   <8B hex>  full UID eg E011223344556677\n"
-                          "\t   u         unaddressed mode\n"
-                          "\t   *         scan for tag\n"
-                          "\tpage#:        page number 0-255\n"
-                          "\thexdata:      data to be written eg AA BB CC DD");
+                  "Options:\n"
+                  "\t-2        use slower '1 out of 256' mode\n"
+                  "\t-o        set OPTION Flag (needed for TI)\n"
+                  "\tuid (either): \n"
+                  "\t   <8B hex>  full UID eg E011223344556677\n"
+                  "\t   u         unaddressed mode\n"
+                  "\t   *         scan for tag\n"
+                  "\tpage#:        page number 0-255\n"
+                  "\thexdata:      data to be written eg AA BB CC DD");
     return 0;
 }
-int usage_15_readmulti(void){
+int usage_15_readmulti(void)
+{
     PrintAndLogEx(NORMAL, "Usage:  hf 15 readmulti  [options] <uid|s|u|*> <start#> <count#>\n"
-                          "Options:\n"
-                          "\t-2        use slower '1 out of 256' mode\n"
-                          "\tuid (either): \n"
-                          "\t   <8B hex>  full UID eg E011223344556677\n"
-                          "\t   u         unaddressed mode\n"
-                          "\t   *         scan for tag\n"
-                          "\tstart#:       page number to start 0-255\n"
-                          "\tcount#:       number of pages");
+                  "Options:\n"
+                  "\t-2        use slower '1 out of 256' mode\n"
+                  "\tuid (either): \n"
+                  "\t   <8B hex>  full UID eg E011223344556677\n"
+                  "\t   u         unaddressed mode\n"
+                  "\t   *         scan for tag\n"
+                  "\tstart#:       page number to start 0-255\n"
+                  "\tcount#:       number of pages");
     return 0;
 }
 // Mode 3
 //helptext
-int CmdHF15Demod(const char *Cmd) {
+int CmdHF15Demod(const char *Cmd)
+{
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_15_demod();
 
@@ -475,11 +502,12 @@ int CmdHF15Demod(const char *Cmd) {
 
 // * Acquire Samples as Reader (enables carrier, sends inquiry)
 //helptext
-int CmdHF15Samples(const char *Cmd) {
+int CmdHF15Samples(const char *Cmd)
+{
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_15_samples();
 
-    UsbCommand c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_15693, {0,0,0}};
+    UsbCommand c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_15693, {0, 0, 0}};
     clearCommandBuffer();
     SendCommand(&c);
 
@@ -491,10 +519,11 @@ int CmdHF15Samples(const char *Cmd) {
  * Commandline handling: HF15 CMD SYSINFO
  * get system information from tag/VICC
  */
-int CmdHF15Info(const char *Cmd) {
+int CmdHF15Info(const char *Cmd)
+{
 
     char cmdp = param_getchar(Cmd, 0);
-    if (strlen(Cmd)<1 || cmdp == 'h' || cmdp == 'H') return usage_15_info();
+    if (strlen(Cmd) < 1 || cmdp == 'h' || cmdp == 'H') return usage_15_info();
 
     UsbCommand resp;
     uint8_t *recv;
@@ -506,7 +535,7 @@ int CmdHF15Info(const char *Cmd) {
 
     strncpy(cmd, Cmd, 99);
 
-    if ( !prepareHF15Cmd(&cmd, &c, ISO15_CMD_SYSINFO) )
+    if (!prepareHF15Cmd(&cmd, &c, ISO15_CMD_SYSINFO))
         return 0;
 
     AddCrc(req,  c.arg[0]);
@@ -517,28 +546,28 @@ int CmdHF15Info(const char *Cmd) {
     clearCommandBuffer();
     SendCommand(&c);
 
-    if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
         PrintAndLogEx(WARNING, "iso15693 card select failed");
         return 1;
     }
 
     uint32_t status = resp.arg[0];
 
-    if ( status < 2 ) {
+    if (status < 2) {
         PrintAndLogEx(WARNING, "iso15693 card doesn't answer to systeminfo command");
         return 1;
     }
 
     recv = resp.d.asBytes;
 
-    if ( recv[0] & ISO15_RES_ERROR ) {
+    if (recv[0] & ISO15_RES_ERROR) {
         PrintAndLogEx(WARNING, "iso15693 card returned error %i: %s", recv[0], TagErrorStr(recv[0]));
         return 3;
     }
 
-    PrintAndLogEx(NORMAL, "  UID  : %s", sprintUID(NULL, recv+2));
-    PrintAndLogEx(NORMAL, "  TYPE : %s", getTagInfo_15(recv+2));
-    PrintAndLogEx(NORMAL, "  SYSINFO : %s", sprint_hex(recv, status-2));
+    PrintAndLogEx(NORMAL, "  UID  : %s", sprintUID(NULL, recv + 2));
+    PrintAndLogEx(NORMAL, "  TYPE : %s", getTagInfo_15(recv + 2));
+    PrintAndLogEx(NORMAL, "  SYSINFO : %s", sprint_hex(recv, status - 2));
 
     // DSFID
     if (recv[1] & 0x01)
@@ -561,9 +590,9 @@ int CmdHF15Info(const char *Cmd) {
     // memory
     if (recv[1] & 0x04) {
         PrintAndLogEx(NORMAL, "     - Tag provides info on memory layout (vendor dependent)");
-        uint8_t blocks = recv[12]+1;
+        uint8_t blocks = recv[12] + 1;
         uint8_t size = (recv[13] & 0x1F);
-        PrintAndLogEx(NORMAL, "           %u (or %u) bytes/blocks x %u blocks", size+1, size, blocks );
+        PrintAndLogEx(NORMAL, "           %u (or %u) bytes/blocks x %u blocks", size + 1, size, blocks);
     } else {
         PrintAndLogEx(NORMAL, "     - Tag does not provide information on memory layout");
     }
@@ -573,19 +602,21 @@ int CmdHF15Info(const char *Cmd) {
 
 // Record Activity without enabeling carrier
 //helptext
-int CmdHF15Record(const char *Cmd) {
+int CmdHF15Record(const char *Cmd)
+{
     char cmdp =  tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_15_record();
 
-    UsbCommand c = {CMD_RECORD_RAW_ADC_SAMPLES_ISO_15693, {0,0,0}};
+    UsbCommand c = {CMD_RECORD_RAW_ADC_SAMPLES_ISO_15693, {0, 0, 0}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
 }
 
 // used with 'hf search'
-int HF15Reader(const char *Cmd, bool verbose) {
-    uint8_t uid[8] = {0,0,0,0,0,0,0,0};
+int HF15Reader(const char *Cmd, bool verbose)
+{
+    uint8_t uid[8] = {0, 0, 0, 0, 0, 0, 0, 0};
     if (!getUID(uid)) {
         if (verbose) PrintAndLogEx(WARNING, "No tag found.");
         return 0;
@@ -596,7 +627,8 @@ int HF15Reader(const char *Cmd, bool verbose) {
     return 1;
 }
 
-int CmdHF15Reader(const char *Cmd) {
+int CmdHF15Reader(const char *Cmd)
+{
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_15_reader();
 
@@ -606,17 +638,18 @@ int CmdHF15Reader(const char *Cmd) {
 
 // Simulation is still not working very good
 // helptext
-int CmdHF15Sim(const char *Cmd) {
-    char cmdp =tolower(param_getchar(Cmd, 0));
+int CmdHF15Sim(const char *Cmd)
+{
+    char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) < 1 || cmdp == 'h') return usage_15_sim();
 
-    uint8_t uid[8] = {0,0,0,0,0,0,0,0};
+    uint8_t uid[8] = {0, 0, 0, 0, 0, 0, 0, 0};
     if (param_gethex(Cmd, 0, uid, 16)) {
         PrintAndLogEx(WARNING, "UID must include 16 HEX symbols");
         return 0;
     }
 
-    PrintAndLogEx(SUCCESS, "Starting simulating UID %s", sprint_hex(uid, sizeof(uid)) );
+    PrintAndLogEx(SUCCESS, "Starting simulating UID %s", sprint_hex(uid, sizeof(uid)));
 
     UsbCommand c = {CMD_SIMTAG_ISO_15693, {0, 0, 0}};
     memcpy(c.d.asBytes, uid, 8);
@@ -628,7 +661,8 @@ int CmdHF15Sim(const char *Cmd) {
 // finds the AFI (Application Family Idendifier) of a card, by trying all values
 // (There is no standard way of reading the AFI, allthough some tags support this)
 // helptext
-int CmdHF15Afi(const char *Cmd) {
+int CmdHF15Afi(const char *Cmd)
+{
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_15_findafi();
 
@@ -647,27 +681,28 @@ typedef struct {
 
 // Reads all memory pages
 // need to write to file
-int CmdHF15Dump(const char*Cmd) {
+int CmdHF15Dump(const char *Cmd)
+{
 
     uint8_t fileNameLen = 0;
     char filename[FILE_PATH_SIZE] = {0};
-    char * fptr = filename;
+    char *fptr = filename;
     bool errors = false;
     uint8_t cmdp = 0;
-    uint8_t uid[8] = {0,0,0,0,0,0,0,0};
+    uint8_t uid[8] = {0, 0, 0, 0, 0, 0, 0, 0};
 
-    while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
-        case 'h':
-            return usage_15_dump();
-        case 'f':
-            fileNameLen = param_getstr(Cmd, cmdp+1, filename, FILE_PATH_SIZE);
-            cmdp += 2;
-            break;
-        default:
-            PrintAndLogEx(WARNING, "Unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
-            errors = true;
-            break;
+            case 'h':
+                return usage_15_dump();
+            case 'f':
+                fileNameLen = param_getstr(Cmd, cmdp + 1, filename, FILE_PATH_SIZE);
+                cmdp += 2;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
+                errors = true;
+                break;
         }
     }
 
@@ -684,11 +719,11 @@ int CmdHF15Dump(const char*Cmd) {
         }
 
         fptr += sprintf(fptr, "hf-15-");
-        FillFileNameByUID(fptr,uid,"-dump",sizeof(uid));
+        FillFileNameByUID(fptr, uid, "-dump", sizeof(uid));
     }
     // detect blocksize from card :)
 
-    PrintAndLogEx(NORMAL, "Reading memory from tag UID " _YELLOW_(%s), sprintUID(NULL, uid));
+    PrintAndLogEx(NORMAL, "Reading memory from tag UID " _YELLOW_( % s), sprintUID(NULL, uid));
 
     int blocknum = 0;
     uint8_t *recv = NULL;
@@ -696,7 +731,7 @@ int CmdHF15Dump(const char*Cmd) {
     // memory.
     t15memory mem[256];
 
-    uint8_t data[256*4] = {0};
+    uint8_t data[256 * 4] = {0};
     memset(data, 0, sizeof(data));
 
     UsbCommand resp;
@@ -706,7 +741,7 @@ int CmdHF15Dump(const char*Cmd) {
     req[1] = ISO15_CMD_READ;
 
     // copy uid to read command
-    memcpy(req+2, uid, sizeof(uid));
+    memcpy(req + 2, uid, sizeof(uid));
 
     for (int retry = 0; retry < 5; retry++) {
 
@@ -720,20 +755,20 @@ int CmdHF15Dump(const char*Cmd) {
         if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
 
             uint8_t len = resp.arg[0];
-            if ( len < 2 ) {
+            if (len < 2) {
                 PrintAndLogEx(FAILED, "iso15693 card select failed");
                 continue;
             }
 
             recv = resp.d.asBytes;
 
-            if ( !CheckCrc(recv, len) ) {
+            if (!CheckCrc(recv, len)) {
                 PrintAndLogEx(FAILED, "crc fail");
                 continue;
             }
 
             if (recv[0] & ISO15_RES_ERROR) {
-                PrintAndLogEx(FAILED, "Tag returned Error %i: %s", recv[1], TagErrorStr(recv[1]) );
+                PrintAndLogEx(FAILED, "Tag returned Error %i: %s", recv[1], TagErrorStr(recv[1]));
                 break;
             }
 
@@ -744,7 +779,8 @@ int CmdHF15Dump(const char*Cmd) {
             retry = 0;
             blocknum++;
 
-            printf("."); fflush(stdout);
+            printf(".");
+            fflush(stdout);
         }
     }
     PrintAndLogEx(NORMAL, "\n");
@@ -752,7 +788,7 @@ int CmdHF15Dump(const char*Cmd) {
     PrintAndLogEx(NORMAL, "block#   | data         |lck| ascii");
     PrintAndLogEx(NORMAL, "---------+--------------+---+----------");
     for (int i = 0; i < blocknum; i++) {
-        PrintAndLogEx(NORMAL, "%3d/0x%02X | %s | %d | %s", i, i, sprint_hex(mem[i].block, 4 ), mem[i].lock, sprint_ascii(mem[i].block, 4) );
+        PrintAndLogEx(NORMAL, "%3d/0x%02X | %s | %d | %s", i, i, sprint_hex(mem[i].block, 4), mem[i].lock, sprint_ascii(mem[i].block, 4));
     }
     PrintAndLogEx(NORMAL, "\n");
 
@@ -762,53 +798,53 @@ int CmdHF15Dump(const char*Cmd) {
     return 0;
 }
 
-int CmdHF15Restore(const char*Cmd) {
+int CmdHF15Restore(const char *Cmd)
+{
     FILE *f;
 
-    uint8_t uid[8]={0x00};
+    uint8_t uid[8] = {0x00};
     char filename[FILE_PATH_SIZE] = {0x00};
     char buff[255] = {0x00};
-    size_t blocksize=4;
+    size_t blocksize = 4;
     uint8_t cmdp = 0;
     char newCmdPrefix[255] = {0x00}, tmpCmd[255] = {0x00};
-    char param[FILE_PATH_SIZE]="";
-    char hex[255]="";
+    char param[FILE_PATH_SIZE] = "";
+    char hex[255] = "";
     uint8_t retries = 3, tried = 0, i = 0;
-    int retval=0;
+    int retval = 0;
     size_t bytes_read;
 
-        while(param_getchar(Cmd, cmdp) != 0x00) {
-        switch(tolower(param_getchar(Cmd, cmdp))) {
+    while (param_getchar(Cmd, cmdp) != 0x00) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
             case '-':
                 param_getstr(Cmd, cmdp, param, sizeof(param));
-                switch(param[1])
-                {
+                switch (param[1]) {
                     case '2':
                     case 'o':
-                        strncpy(newCmdPrefix, " ", sizeof(newCmdPrefix)-1);
-                        strncat(newCmdPrefix, param, sizeof(newCmdPrefix)-1);
-                                break;
+                        strncpy(newCmdPrefix, " ", sizeof(newCmdPrefix) - 1);
+                        strncat(newCmdPrefix, param, sizeof(newCmdPrefix) - 1);
+                        break;
                     default:
                         PrintAndLogEx(WARNING, "Unknown parameter '%s'", param);
                         return usage_15_restore();
                 }
                 break;
             case 'f':
-                param_getstr(Cmd, cmdp+1, filename, FILE_PATH_SIZE);
+                param_getstr(Cmd, cmdp + 1, filename, FILE_PATH_SIZE);
                 cmdp++;
                 break;
             case 'r':
-                retries=param_get8ex(Cmd, cmdp+1, 3, 10);
+                retries = param_get8ex(Cmd, cmdp + 1, 3, 10);
                 cmdp++;
                 break;
             case 'b':
-                blocksize=param_get8ex(Cmd, cmdp+1, 4, 10);
+                blocksize = param_get8ex(Cmd, cmdp + 1, 4, 10);
                 cmdp++;
                 break;
             case 'u':
-                param_getstr(Cmd, cmdp+1, buff, FILE_PATH_SIZE);
+                param_getstr(Cmd, cmdp + 1, buff, FILE_PATH_SIZE);
                 cmdp++;
-                snprintf(filename,sizeof(filename),"hf-15-dump-%s-bin",buff);
+                snprintf(filename, sizeof(filename), "hf-15-dump-%s-bin", buff);
                 break;
             case 'h':
                 return usage_15_restore();
@@ -819,10 +855,10 @@ int CmdHF15Restore(const char*Cmd) {
         cmdp++;
     }
 
-    PrintAndLogEx(INFO,"Blocksize: %u",blocksize);
+    PrintAndLogEx(INFO, "Blocksize: %u", blocksize);
 
-    if ( !strlen(filename)) {
-        PrintAndLogEx(WARNING,"Please provide a filename");
+    if (!strlen(filename)) {
+        PrintAndLogEx(WARNING, "Please provide a filename");
         return usage_15_restore();
     }
 
@@ -842,32 +878,32 @@ int CmdHF15Restore(const char*Cmd) {
         hex[0] = 0x00;
         tmpCmd[0] = 0x00;
 
-        bytes_read = fread( buff, 1, blocksize, f );
-        if ( bytes_read == 0) {
+        bytes_read = fread(buff, 1, blocksize, f);
+        if (bytes_read == 0) {
             PrintAndLogEx(SUCCESS, "File reading done `%s`", filename);
             fclose(f);
             return 0;
-        } else if ( bytes_read != blocksize) {
+        } else if (bytes_read != blocksize) {
             PrintAndLogEx(WARNING, "File reading error (%s), %u bytes read instead of %u bytes.", filename, bytes_read, blocksize);
             fclose(f);
             return 2;
         }
 
-        for(int j=0; j < blocksize; j++)
-            snprintf(hex+j*2, 3, "%02X", buff[j]);
+        for (int j = 0; j < blocksize; j++)
+            snprintf(hex + j * 2, 3, "%02X", buff[j]);
 
-        for(int j=0; j < sizeof(uid)/sizeof(uid[0]); j++)
-            snprintf(buff+j*2,3,"%02X", uid[j]);
+        for (int j = 0; j < sizeof(uid) / sizeof(uid[0]); j++)
+            snprintf(buff + j * 2, 3, "%02X", uid[j]);
 
         //TODO: Addressed mode currently not work
         //snprintf(tmpCmd, sizeof(tmpCmd), "%s %s %d %s", newCmdPrefix, buff, i, hex);
         snprintf(tmpCmd, sizeof(tmpCmd), "%s u %u %s", newCmdPrefix, i, hex);
         PrintAndLogEx(DEBUG, "Command to be sent| %s", tmpCmd);
 
-        for(tried=0; tried < retries; tried++)
-            if(!(retval = CmdHF15Write(tmpCmd)))
+        for (tried = 0; tried < retries; tried++)
+            if (!(retval = CmdHF15Write(tmpCmd)))
                 break;
-        if(tried >= retries)
+        if (tried >= retries)
             return retval;
 
         i++;
@@ -875,16 +911,18 @@ int CmdHF15Restore(const char*Cmd) {
     fclose(f);
 }
 
-int CmdHF15List(const char *Cmd) {
+int CmdHF15List(const char *Cmd)
+{
     //PrintAndLogEx(WARNING, "Deprecated command, use 'hf list 15' instead");
     CmdTraceList("15");
     return 0;
 }
 
-int CmdHF15Raw(const char *Cmd) {
+int CmdHF15Raw(const char *Cmd)
+{
 
     char cmdp = param_getchar(Cmd, 0);
-    if (strlen(Cmd)<3 || cmdp == 'h' || cmdp == 'H') return usage_15_raw();
+    if (strlen(Cmd) < 3 || cmdp == 'h' || cmdp == 'H') return usage_15_raw();
 
     UsbCommand resp;
     UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}}; // len,speed,recv?
@@ -895,12 +933,12 @@ int CmdHF15Raw(const char *Cmd) {
     uint32_t datalen = 0, temp;
 
     // strip
-    while (*Cmd==' ' || *Cmd=='\t') Cmd++;
+    while (*Cmd == ' ' || *Cmd == '\t') Cmd++;
 
-    while (Cmd[i]!='\0') {
-        if (Cmd[i]==' ' || Cmd[i]=='\t') { i++; continue; }
-        if (Cmd[i]=='-') {
-            switch (Cmd[i+1]) {
+    while (Cmd[i] != '\0') {
+        if (Cmd[i] == ' ' || Cmd[i] == '\t') { i++; continue; }
+        if (Cmd[i] == '-') {
+            switch (Cmd[i + 1]) {
                 case 'r':
                 case 'R':
                     reply = 0;
@@ -916,13 +954,13 @@ int CmdHF15Raw(const char *Cmd) {
                     PrintAndLogEx(WARNING, "Invalid option");
                     return 0;
             }
-            i+=2;
+            i += 2;
             continue;
         }
-        if ((Cmd[i]>='0' && Cmd[i]<='9') ||
-            (Cmd[i]>='a' && Cmd[i]<='f') ||
-            (Cmd[i]>='A' && Cmd[i]<='F') ) {
-            buf[strlen(buf)+1] = 0;
+        if ((Cmd[i] >= '0' && Cmd[i] <= '9') ||
+            (Cmd[i] >= 'a' && Cmd[i] <= 'f') ||
+            (Cmd[i] >= 'A' && Cmd[i] <= 'F')) {
+            buf[strlen(buf) + 1] = 0;
             buf[strlen(buf)] = Cmd[i];
             i++;
 
@@ -955,7 +993,7 @@ int CmdHF15Raw(const char *Cmd) {
         if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
             uint8_t len = resp.arg[0];
             PrintAndLogEx(NORMAL, "received %i octets", len);
-            PrintAndLogEx(NORMAL, "%s", sprint_hex(resp.d.asBytes, len) );
+            PrintAndLogEx(NORMAL, "%s", sprint_hex(resp.d.asBytes, len));
         } else {
             PrintAndLogEx(WARNING, "timeout while waiting for reply.");
         }
@@ -968,14 +1006,15 @@ int CmdHF15Raw(const char *Cmd) {
  * Parameters:
  *  **cmd   command line
  */
-int prepareHF15Cmd(char **cmd, UsbCommand *c, uint8_t iso15cmd) {
+int prepareHF15Cmd(char **cmd, UsbCommand *c, uint8_t iso15cmd)
+{
     int temp;
     uint8_t *req = c->d.asBytes;
     uint8_t uid[8] = {0x00};
     uint32_t reqlen = 0;
 
     // strip
-    while (**cmd==' ' || **cmd=='\t') (*cmd)++;
+    while (**cmd == ' ' || **cmd == '\t')(*cmd)++;
 
     if (strstr(*cmd, "-2") == *cmd) {
         c->arg[1] = 0; // use 1of256
@@ -983,7 +1022,7 @@ int prepareHF15Cmd(char **cmd, UsbCommand *c, uint8_t iso15cmd) {
     }
 
     // strip
-    while (**cmd==' ' || **cmd=='\t') (*cmd)++;
+    while (**cmd == ' ' || **cmd == '\t')(*cmd)++;
 
     if (strstr(*cmd, "-o") == *cmd) {
         req[reqlen] = ISO15_REQ_OPTION;
@@ -991,7 +1030,7 @@ int prepareHF15Cmd(char **cmd, UsbCommand *c, uint8_t iso15cmd) {
     }
 
     // strip
-    while (**cmd == ' ' || **cmd == '\t') (*cmd)++;
+    while (**cmd == ' ' || **cmd == '\t')(*cmd)++;
 
     switch (**cmd) {
         case 0:
@@ -1022,9 +1061,9 @@ int prepareHF15Cmd(char **cmd, UsbCommand *c, uint8_t iso15cmd) {
             req[reqlen++] = iso15cmd;
 
             // parse UID
-            for (int i=0; i<8 && (*cmd)[i*2] && (*cmd)[i*2+1]; i++) {
-                sscanf((char[]){(*cmd)[i*2], (*cmd)[i*2+1],0}, "%X", &temp);
-                uid[7-i] = temp & 0xff;
+            for (int i = 0; i < 8 && (*cmd)[i * 2] && (*cmd)[i * 2 + 1]; i++) {
+                sscanf((char[]) {(*cmd)[i * 2], (*cmd)[i * 2 + 1], 0}, "%X", &temp);
+                uid[7 - i] = temp & 0xff;
             }
 
             PrintAndLogEx(NORMAL, "Using UID %s", sprintUID(NULL, uid));
@@ -1033,9 +1072,9 @@ int prepareHF15Cmd(char **cmd, UsbCommand *c, uint8_t iso15cmd) {
             break;
     }
     // skip to next space
-    while (**cmd!=' ' && **cmd!='\t') (*cmd)++;
+    while (**cmd != ' ' && **cmd != '\t')(*cmd)++;
     // skip over the space
-    while (**cmd==' ' || **cmd=='\t') (*cmd)++;
+    while (**cmd == ' ' || **cmd == '\t')(*cmd)++;
 
     c->arg[0] = reqlen;
     return 1;
@@ -1045,10 +1084,11 @@ int prepareHF15Cmd(char **cmd, UsbCommand *c, uint8_t iso15cmd) {
  * Commandline handling: HF15 CMD READMULTI
  * Read multiple blocks at once (not all tags support this)
  */
-int CmdHF15Readmulti(const char *Cmd) {
+int CmdHF15Readmulti(const char *Cmd)
+{
 
     char cmdp = param_getchar(Cmd, 0);
-    if (strlen(Cmd)<3 || cmdp == 'h' || cmdp == 'H') return usage_15_readmulti();
+    if (strlen(Cmd) < 3 || cmdp == 'h' || cmdp == 'H') return usage_15_readmulti();
 
     UsbCommand resp;
     uint8_t *recv;
@@ -1060,7 +1100,7 @@ int CmdHF15Readmulti(const char *Cmd) {
     char *cmd = cmdbuf;
     strncpy(cmd, Cmd, 99);
 
-    if ( !prepareHF15Cmd(&cmd, &c, ISO15_CMD_READMULTI) )
+    if (!prepareHF15Cmd(&cmd, &c, ISO15_CMD_READMULTI))
         return 0;
 
     // add OPTION flag, in order to get lock-info
@@ -1081,18 +1121,18 @@ int CmdHF15Readmulti(const char *Cmd) {
     req[reqlen++] = pagenum;
     req[reqlen++] = pagecount;
     AddCrc(req, reqlen);
-    c.arg[0] = reqlen+2;
+    c.arg[0] = reqlen + 2;
 
     clearCommandBuffer();
     SendCommand(&c);
 
-    if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
         PrintAndLogEx(FAILED, "iso15693 card select failed");
         return 1;
     }
 
     uint32_t status = resp.arg[0];
-    if ( status < 2 ) {
+    if (status < 2) {
         PrintAndLogEx(FAILED, "iso15693 card select failed");
         return 1;
     }
@@ -1104,20 +1144,20 @@ int CmdHF15Readmulti(const char *Cmd) {
         return 2;
     }
 
-    if ( recv[0] & ISO15_RES_ERROR ) {
+    if (recv[0] & ISO15_RES_ERROR) {
         PrintAndLogEx(FAILED, "iso15693 card returned error %i: %s", recv[0], TagErrorStr(recv[0]));
         return 3;
     }
 
     int start = 1;  // skip status byte
-    int stop = (pagecount+1) * 5;
+    int stop = (pagecount + 1) * 5;
     int currblock = pagenum;
     // print response
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "block#   | data         |lck| ascii");
     PrintAndLogEx(NORMAL, "---------+--------------+---+----------");
     for (int i = start; i < stop; i += 5) {
-        PrintAndLogEx(NORMAL, "%3d/0x%02X | %s | %d | %s", currblock, currblock, sprint_hex(recv+i+1, 4 ), recv[i], sprint_ascii(recv+i+1, 4) );
+        PrintAndLogEx(NORMAL, "%3d/0x%02X | %s | %d | %s", currblock, currblock, sprint_hex(recv + i + 1, 4), recv[i], sprint_ascii(recv + i + 1, 4));
         currblock++;
     }
 
@@ -1128,10 +1168,11 @@ int CmdHF15Readmulti(const char *Cmd) {
  * Commandline handling: HF15 CMD READ
  * Reads a single Block
  */
-int CmdHF15Read(const char *Cmd) {
+int CmdHF15Read(const char *Cmd)
+{
 
     char cmdp = param_getchar(Cmd, 0);
-    if (strlen(Cmd)<3 || cmdp == 'h' || cmdp == 'H')  return usage_15_read();
+    if (strlen(Cmd) < 3 || cmdp == 'h' || cmdp == 'H')  return usage_15_read();
 
     UsbCommand resp;
     uint8_t *recv;
@@ -1147,7 +1188,7 @@ int CmdHF15Read(const char *Cmd) {
     char *cmd = cmdbuf;
     strncpy(cmd, Cmd, 99);
 
-    if ( !prepareHF15Cmd(&cmd, &c, ISO15_CMD_READ) )
+    if (!prepareHF15Cmd(&cmd, &c, ISO15_CMD_READ))
         return 0;
 
     // add OPTION flag, in order to get lock-info
@@ -1161,39 +1202,39 @@ int CmdHF15Read(const char *Cmd) {
 
     AddCrc(req, reqlen);
 
-    c.arg[0] = reqlen+2;
+    c.arg[0] = reqlen + 2;
 
     clearCommandBuffer();
     SendCommand(&c);
 
-    if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
         PrintAndLogEx(NORMAL, "iso15693 card select failed");
         return 1;
     }
 
     uint32_t status = resp.arg[0];
-    if ( status < 2 ) {
+    if (status < 2) {
         PrintAndLogEx(NORMAL, "iso15693 card select failed");
         return 1;
     }
 
     recv = resp.d.asBytes;
 
-    if ( !CheckCrc(recv, status) ) {
+    if (!CheckCrc(recv, status)) {
         PrintAndLogEx(NORMAL, "CRC failed");
         return 2;
     }
 
-    if ( recv[0] & ISO15_RES_ERROR ) {
+    if (recv[0] & ISO15_RES_ERROR) {
         PrintAndLogEx(WARNING, "iso15693 card returned error %i: %s", recv[0], TagErrorStr(recv[0]));
         return 3;
     }
 
     // print response
     PrintAndLogEx(NORMAL, "");
-    PrintAndLogEx(NORMAL, "block #%3d  |lck| ascii", blocknum );
-    PrintAndLogEx(NORMAL, "------------+---+------" );
-    PrintAndLogEx(NORMAL, "%s| %d | %s", sprint_hex(recv+2, status-4), recv[1], sprint_ascii(recv+2, status-4) );
+    PrintAndLogEx(NORMAL, "block #%3d  |lck| ascii", blocknum);
+    PrintAndLogEx(NORMAL, "------------+---+------");
+    PrintAndLogEx(NORMAL, "%s| %d | %s", sprint_hex(recv + 2, status - 4), recv[1], sprint_ascii(recv + 2, status - 4));
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
@@ -1202,10 +1243,11 @@ int CmdHF15Read(const char *Cmd) {
  * Commandline handling: HF15 CMD WRITE
  * Writes a single Block - might run into timeout, even when successful
  */
-int CmdHF15Write(const char *Cmd) {
+int CmdHF15Write(const char *Cmd)
+{
 
     char cmdp = param_getchar(Cmd, 0);
-    if (strlen(Cmd)<3 || cmdp == 'h' || cmdp == 'H') return usage_15_write();
+    if (strlen(Cmd) < 3 || cmdp == 'h' || cmdp == 'H') return usage_15_write();
 
     UsbCommand resp;
     uint8_t *recv;
@@ -1218,14 +1260,14 @@ int CmdHF15Write(const char *Cmd) {
 
     strncpy(cmd, Cmd, 99);
 
-    if ( !prepareHF15Cmd(&cmd, &c, ISO15_CMD_WRITE) )
+    if (!prepareHF15Cmd(&cmd, &c, ISO15_CMD_WRITE))
         return 0;
 
     reqlen = c.arg[0];
 
     // *cmd -> page num ; *cmd2 -> data
-    cmd2=cmd;
-    while (*cmd2!=' ' && *cmd2!='\t' && *cmd2) cmd2++;
+    cmd2 = cmd;
+    while (*cmd2 != ' ' && *cmd2 != '\t' && *cmd2) cmd2++;
     *cmd2 = 0;
     cmd2++;
 
@@ -1234,41 +1276,41 @@ int CmdHF15Write(const char *Cmd) {
     req[reqlen++] = (uint8_t)pagenum;
 
     while (cmd2[0] && cmd2[1]) { // hexdata, read by 2 hexchars
-        if (*cmd2==' ') {
+        if (*cmd2 == ' ') {
             cmd2++;
             continue;
         }
-        sscanf((char[]){cmd2[0],cmd2[1],0},"%X",&temp);
-        req[reqlen++]=temp & 0xff;
-        cmd2+=2;
+        sscanf((char[]) {cmd2[0], cmd2[1], 0}, "%X", &temp);
+        req[reqlen++] = temp & 0xff;
+        cmd2 += 2;
     }
     AddCrc(req, reqlen);
-    c.arg[0] = reqlen+2;
+    c.arg[0] = reqlen + 2;
 
     PrintAndLogEx(NORMAL, "iso15693 writing to page %02d (0x%02X) | data ", pagenum, pagenum);
 
     clearCommandBuffer();
     SendCommand(&c);
 
-    if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
         PrintAndLogEx(FAILED, "iso15693 card timeout, data may be written anyway");
         return 1;
     }
 
     uint32_t status = resp.arg[0];
-    if ( status < 2 ) {
+    if (status < 2) {
         PrintAndLogEx(FAILED, "iso15693 card select failed");
         return 1;
     }
 
     recv = resp.d.asBytes;
 
-    if ( !CheckCrc(recv, status) ) {
+    if (!CheckCrc(recv, status)) {
         PrintAndLogEx(FAILED, "CRC failed");
         return 2;
     }
 
-    if ( recv[0] & ISO15_RES_ERROR ) {
+    if (recv[0] & ISO15_RES_ERROR) {
         PrintAndLogEx(NORMAL, "iso15693 card returned error %i: %s", recv[0], TagErrorStr(recv[0]));
         return 3;
     }
@@ -1296,13 +1338,15 @@ static command_t CommandTable15[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdHF15(const char *Cmd) {
+int CmdHF15(const char *Cmd)
+{
     clearCommandBuffer();
     CmdsParse(CommandTable15, Cmd);
     return 0;
 }
 
-int CmdHF15Help(const char *Cmd) {
+int CmdHF15Help(const char *Cmd)
+{
     CmdsHelp(CommandTable15);
     return 0;
 }
\ No newline at end of file
diff --git a/client/cmdhf15.h b/client/cmdhf15.h
index 38f4b7801..942fd2952 100644
--- a/client/cmdhf15.h
+++ b/client/cmdhf15.h
@@ -37,13 +37,13 @@ extern int CmdHF15Record(const char *Cmd);
 extern int CmdHF15Reader(const char *Cmd);
 extern int CmdHF15Sim(const char *Cmd);
 extern int CmdHF15Afi(const char *Cmd);
-extern int CmdHF15Dump(const char*Cmd);
+extern int CmdHF15Dump(const char *Cmd);
 extern int CmdHF15Raw(const char *cmd);
 extern int CmdHF15Readmulti(const char *Cmd);
 extern int CmdHF15Read(const char *Cmd);
 extern int CmdHF15Write(const char *Cmd);
 
-extern int CmdHF15Help(const char*Cmd);
+extern int CmdHF15Help(const char *Cmd);
 
 // usages
 extern int usage_15_demod(void);
diff --git a/client/cmdhfepa.c b/client/cmdhfepa.c
index be8771b86..3c2299d7f 100644
--- a/client/cmdhfepa.c
+++ b/client/cmdhfepa.c
@@ -28,7 +28,7 @@ int CmdHFEPACollectPACENonces(const char *Cmd)
     n = n > 0 ? n : 1;
 
     PrintAndLogEx(NORMAL, "Collecting %u %u byte nonces", n, m);
-    PrintAndLogEx(NORMAL, "Start: %" PRIu64, msclock()/1000);
+    PrintAndLogEx(NORMAL, "Start: %" PRIu64, msclock() / 1000);
     // repeat n times
     for (uint32_t i = 0; i < n; i++) {
         // execute PACE
@@ -36,15 +36,15 @@ int CmdHFEPACollectPACENonces(const char *Cmd)
         clearCommandBuffer();
         SendCommand(&c);
         UsbCommand resp;
-        WaitForResponse(CMD_ACK,&resp);
+        WaitForResponse(CMD_ACK, &resp);
 
         // check if command failed
         if (resp.arg[0] != 0) {
-            PrintAndLogEx(FAILED, "Error in step %d, Return code: %d",resp.arg[0],(int)resp.arg[1]);
+            PrintAndLogEx(FAILED, "Error in step %d, Return code: %d", resp.arg[0], (int)resp.arg[1]);
         } else {
             size_t nonce_length = resp.arg[1];
             char *nonce = (char *) calloc(2 * nonce_length + 1, sizeof(uint8_t));
-            for(int j = 0; j < nonce_length; j++) {
+            for (int j = 0; j < nonce_length; j++) {
                 sprintf(nonce + (2 * j), "%02X", resp.d.asBytes[j]);
             }
             // print nonce
@@ -55,7 +55,7 @@ int CmdHFEPACollectPACENonces(const char *Cmd)
             sleep(d);
         }
     }
-    PrintAndLogEx(NORMAL, "End: %" PRIu64, msclock()/1000);
+    PrintAndLogEx(NORMAL, "End: %" PRIu64, msclock() / 1000);
     return 1;
 }
 
@@ -83,7 +83,7 @@ int CmdHFEPAPACEReplay(const char *Cmd)
         while (Cmd[skip] != ' ' && Cmd[skip] != '\0') {
             // convert
             scan_return = sscanf(Cmd + skip, "%2X%n",
-                                 (unsigned int *) (apdus[i] + apdu_lengths[i]),
+                                 (unsigned int *)(apdus[i] + apdu_lengths[i]),
                                  &skip_add);
             if (scan_return < 1) {
                 PrintAndLogEx(NORMAL, (char *)usage_msg);
@@ -169,12 +169,14 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdHelp(const char *Cmd) {
+int CmdHelp(const char *Cmd)
+{
     CmdsHelp(CommandTable);
     return 0;
 }
 
-int CmdHFEPA(const char *Cmd) {
+int CmdHFEPA(const char *Cmd)
+{
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
diff --git a/client/cmdhffelica.c b/client/cmdhffelica.c
index 615f51049..06da1b8b4 100644
--- a/client/cmdhffelica.c
+++ b/client/cmdhffelica.c
@@ -11,7 +11,8 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_hf_felica_sim(void) {
+int usage_hf_felica_sim(void)
+{
     PrintAndLogEx(NORMAL, "\n Emulating ISO/18092 FeliCa tag \n");
     PrintAndLogEx(NORMAL, "Usage: hf felica sim [h] t <type> [v]");
     PrintAndLogEx(NORMAL, "Options:");
@@ -23,7 +24,8 @@ int usage_hf_felica_sim(void) {
     PrintAndLogEx(NORMAL, "          hf felica sim t 1 ");
     return 0;
 }
-int usage_hf_felica_sniff(void){
+int usage_hf_felica_sniff(void)
+{
     PrintAndLogEx(NORMAL, "It get data from the field and saves it into command buffer.");
     PrintAndLogEx(NORMAL, "Buffer accessible from command 'hf list felica'");
     PrintAndLogEx(NORMAL, "Usage:  hf felica sniff <s > <t>");
@@ -33,7 +35,8 @@ int usage_hf_felica_sniff(void){
     PrintAndLogEx(NORMAL, "          hf felica sniff s 1000");
     return 0;
 }
-int usage_hf_felica_simlite(void) {
+int usage_hf_felica_simlite(void)
+{
     PrintAndLogEx(NORMAL, "\n Emulating ISO/18092 FeliCa Lite tag \n");
     PrintAndLogEx(NORMAL, "Usage: hf felica litesim [h] u <uid>");
     PrintAndLogEx(NORMAL, "Options:");
@@ -43,7 +46,8 @@ int usage_hf_felica_simlite(void) {
     PrintAndLogEx(NORMAL, "          hf felica litesim 11223344556677");
     return 0;
 }
-int usage_hf_felica_dumplite(void) {
+int usage_hf_felica_dumplite(void)
+{
     PrintAndLogEx(NORMAL, "\n Dump ISO/18092 FeliCa Lite tag \n");
     PrintAndLogEx(NORMAL, "press button to abort run, otherwise it will loop for 200sec.");
     PrintAndLogEx(NORMAL, "Usage: hf felica litedump [h]");
@@ -53,7 +57,8 @@ int usage_hf_felica_dumplite(void) {
     PrintAndLogEx(NORMAL, "          hf felica litedump");
     return 0;
 }
-int usage_hf_felica_raw(void){
+int usage_hf_felica_raw(void)
+{
     PrintAndLogEx(NORMAL, "Usage: hf felica raw [-h] [-r] [-c] [-p] [-a] <0A 0B 0C ... hex>");
     PrintAndLogEx(NORMAL, "       -h    this help");
     PrintAndLogEx(NORMAL, "       -r    do not read response");
@@ -64,13 +69,15 @@ int usage_hf_felica_raw(void){
     return 0;
 }
 
-int CmdHFFelicaList(const char *Cmd) {
+int CmdHFFelicaList(const char *Cmd)
+{
     //PrintAndLogEx(NORMAL, "Deprecated command, use 'hf list felica' instead");
     CmdTraceList("felica");
     return 0;
 }
 
-int CmdHFFelicaReader(const char *Cmd) {
+int CmdHFFelicaReader(const char *Cmd)
+{
     bool silent = (Cmd[0] == 's' || Cmd[0] ==  'S');
     //UsbCommand cDisconnect = {CMD_FELICA_COMMAND, {0,0,0}};
     UsbCommand c = {CMD_FELICA_COMMAND, {FELICA_CONNECT, 0, 0}};
@@ -87,7 +94,7 @@ int CmdHFFelicaReader(const char *Cmd) {
     memcpy(&card, (felica_card_select_t *)resp.d.asBytes, sizeof(felica_card_select_t));
     uint64_t status = resp.arg[0];
 
-    switch(status) {
+    switch (status) {
         case 1: {
             if (!silent)
                 PrintAndLogEx(WARNING, "card timeout");
@@ -122,12 +129,13 @@ int CmdHFFelicaReader(const char *Cmd) {
 }
 
 // simulate iso18092 / FeliCa tag
-int CmdHFFelicaSim(const char *Cmd) {
+int CmdHFFelicaSim(const char *Cmd)
+{
     bool errors = false;
     uint8_t flags = 0;
     uint8_t tagtype = 1;
     uint8_t cmdp = 0;
-    uint8_t uid[10] = {0,0,0,0,0,0,0,0,0,0};
+    uint8_t uid[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
     int uidlen = 0;
     bool verbose =  false;
 
@@ -139,7 +147,7 @@ int CmdHFFelicaSim(const char *Cmd) {
             case 't':
             case 'T':
                 // Retrieve the tag type
-                tagtype = param_get8ex(Cmd, cmdp+1, 0, 10);
+                tagtype = param_get8ex(Cmd, cmdp + 1, 0, 10);
                 if (tagtype == 0)
                     errors = true;
                 cmdp += 2;
@@ -147,9 +155,9 @@ int CmdHFFelicaSim(const char *Cmd) {
             case 'u':
             case 'U':
                 // Retrieve the full 4,7,10 byte long uid
-                param_gethex_ex(Cmd, cmdp+1, uid, &uidlen);
+                param_gethex_ex(Cmd, cmdp + 1, uid, &uidlen);
                 if (!errors) {
-                    PrintAndLogEx(NORMAL, "Emulating ISO18092/FeliCa tag with %d byte UID (%s)", uidlen>>1, sprint_hex(uid, uidlen>>1));
+                    PrintAndLogEx(NORMAL, "Emulating ISO18092/FeliCa tag with %d byte UID (%s)", uidlen >> 1, sprint_hex(uid, uidlen >> 1));
                 }
                 cmdp += 2;
                 break;
@@ -166,53 +174,54 @@ int CmdHFFelicaSim(const char *Cmd) {
                 PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
                 errors = true;
                 break;
-            }
+        }
     }
 
     //Validations
     if (errors || cmdp == 0) return usage_hf_felica_sim();
 
-    UsbCommand c = {CMD_FELICA_SIMULATE_TAG,{ tagtype, flags, 0 }};
-    memcpy(c.d.asBytes, uid, uidlen>>1);
+    UsbCommand c = {CMD_FELICA_SIMULATE_TAG, { tagtype, flags, 0 }};
+    memcpy(c.d.asBytes, uid, uidlen >> 1);
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
 
-    if ( verbose )
+    if (verbose)
         PrintAndLogEx(NORMAL, "Press pm3-button to abort simulation");
 
-    while( !ukbhit() ){
-        if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500) ) continue;
+    while (!ukbhit()) {
+        if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) continue;
     }
     return 0;
 }
 
-int CmdHFFelicaSniff(const char *Cmd) {
+int CmdHFFelicaSniff(const char *Cmd)
+{
 
     uint8_t cmdp = 0;
     uint64_t samples2skip = 0;
     uint64_t triggers2skip = 0;
     bool errors = false;
 
-    while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-        switch(param_getchar(Cmd, cmdp)) {
-        case 'h':
-        case 'H':
-            return usage_hf_felica_sniff();
-        case 's':
-        case 'S':
-            samples2skip = param_get32ex(Cmd, cmdp+1, 0, 10);
-            cmdp += 2;
-            break;
-        case 't':
-        case 'T':
-            triggers2skip = param_get32ex(Cmd, cmdp+1, 0, 10);
-            cmdp += 2;
-            break;
-        default:
-            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-            errors = true;
-            break;
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (param_getchar(Cmd, cmdp)) {
+            case 'h':
+            case 'H':
+                return usage_hf_felica_sniff();
+            case 's':
+            case 'S':
+                samples2skip = param_get32ex(Cmd, cmdp + 1, 0, 10);
+                cmdp += 2;
+                break;
+            case 't':
+            case 'T':
+                triggers2skip = param_get32ex(Cmd, cmdp + 1, 0, 10);
+                cmdp += 2;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                errors = true;
+                break;
         }
     }
     //Validations
@@ -225,7 +234,8 @@ int CmdHFFelicaSniff(const char *Cmd) {
 }
 
 // uid  hex
-int CmdHFFelicaSimLite(const char *Cmd) {
+int CmdHFFelicaSimLite(const char *Cmd)
+{
 
     uint64_t uid = param_get64ex(Cmd, 0, 0, 16);
 
@@ -238,12 +248,14 @@ int CmdHFFelicaSimLite(const char *Cmd) {
     return 0;
 }
 
-static void printSep() {
+static void printSep()
+{
     PrintAndLogEx(NORMAL, "------------------------------------------------------------------------------------");
 }
 
-uint16_t PrintFliteBlock(uint16_t tracepos, uint8_t *trace, uint16_t tracelen) {
-    if (tracepos+19 >= tracelen)
+uint16_t PrintFliteBlock(uint16_t tracepos, uint8_t *trace, uint16_t tracelen)
+{
+    if (tracepos + 19 >= tracelen)
         return tracelen;
 
     trace += tracepos;
@@ -253,120 +265,163 @@ uint16_t PrintFliteBlock(uint16_t tracepos, uint8_t *trace, uint16_t tracelen) {
 
     char line[110] = {0};
     for (int j = 0; j < 16; j++) {
-        snprintf(line + (j * 4), sizeof(line) - 1 - (j*4) , "%02x  ", trace[j+3]);
+        snprintf(line + (j * 4), sizeof(line) - 1 - (j * 4), "%02x  ", trace[j + 3]);
     }
 
-    PrintAndLogEx(NORMAL, "block number %02x, status: %02x %02x",blocknum,status1, status2);
+    PrintAndLogEx(NORMAL, "block number %02x, status: %02x %02x", blocknum, status1, status2);
     switch (blocknum) {
-        case 0x00: PrintAndLogEx(NORMAL,  "S_PAD0: %s",line);break;
-        case 0x01: PrintAndLogEx(NORMAL,  "S_PAD1: %s",line);break;
-        case 0x02: PrintAndLogEx(NORMAL,  "S_PAD2: %s",line);break;
-        case 0x03: PrintAndLogEx(NORMAL,  "S_PAD3: %s",line);break;
-        case 0x04: PrintAndLogEx(NORMAL,  "S_PAD4: %s",line);break;
-        case 0x05: PrintAndLogEx(NORMAL,  "S_PAD5: %s",line);break;
-        case 0x06: PrintAndLogEx(NORMAL,  "S_PAD6: %s",line);break;
-        case 0x07: PrintAndLogEx(NORMAL,  "S_PAD7: %s",line);break;
-        case 0x08: PrintAndLogEx(NORMAL,  "S_PAD8: %s",line);break;
-        case 0x09: PrintAndLogEx(NORMAL,  "S_PAD9: %s",line);break;
-        case 0x0a: PrintAndLogEx(NORMAL,  "S_PAD10: %s",line);break;
-        case 0x0b: PrintAndLogEx(NORMAL,  "S_PAD11: %s",line);break;
-        case 0x0c: PrintAndLogEx(NORMAL,  "S_PAD12: %s",line);break;
-        case 0x0d: PrintAndLogEx(NORMAL,  "S_PAD13: %s",line);break;
+        case 0x00:
+            PrintAndLogEx(NORMAL,  "S_PAD0: %s", line);
+            break;
+        case 0x01:
+            PrintAndLogEx(NORMAL,  "S_PAD1: %s", line);
+            break;
+        case 0x02:
+            PrintAndLogEx(NORMAL,  "S_PAD2: %s", line);
+            break;
+        case 0x03:
+            PrintAndLogEx(NORMAL,  "S_PAD3: %s", line);
+            break;
+        case 0x04:
+            PrintAndLogEx(NORMAL,  "S_PAD4: %s", line);
+            break;
+        case 0x05:
+            PrintAndLogEx(NORMAL,  "S_PAD5: %s", line);
+            break;
+        case 0x06:
+            PrintAndLogEx(NORMAL,  "S_PAD6: %s", line);
+            break;
+        case 0x07:
+            PrintAndLogEx(NORMAL,  "S_PAD7: %s", line);
+            break;
+        case 0x08:
+            PrintAndLogEx(NORMAL,  "S_PAD8: %s", line);
+            break;
+        case 0x09:
+            PrintAndLogEx(NORMAL,  "S_PAD9: %s", line);
+            break;
+        case 0x0a:
+            PrintAndLogEx(NORMAL,  "S_PAD10: %s", line);
+            break;
+        case 0x0b:
+            PrintAndLogEx(NORMAL,  "S_PAD11: %s", line);
+            break;
+        case 0x0c:
+            PrintAndLogEx(NORMAL,  "S_PAD12: %s", line);
+            break;
+        case 0x0d:
+            PrintAndLogEx(NORMAL,  "S_PAD13: %s", line);
+            break;
         case 0x0E: {
             uint32_t regA = trace[3] | trace[4] << 8 | trace[5] << 16 | trace[ 6] << 24;
             uint32_t regB = trace[7] | trace[8] << 8 | trace[9] << 16 | trace[10] << 24;
             line[0] = 0;
             for (int j = 0; j < 8; j++)
-                snprintf(line + (j*2), sizeof(line)-1-(j*2), "%02x", trace[j+11]);
+                snprintf(line + (j * 2), sizeof(line) - 1 - (j * 2), "%02x", trace[j + 11]);
 
             PrintAndLogEx(NORMAL,  "REG: regA: %d regB: %d regC: %s ", regA, regB, line);
-            }
+        }
         break;
-        case 0x80: PrintAndLogEx(NORMAL,  "Random Challenge, WO:  %s ", line); break;
-        case 0x81: PrintAndLogEx(NORMAL,  "MAC, only set on dual read:  %s ", line); break;
+        case 0x80:
+            PrintAndLogEx(NORMAL,  "Random Challenge, WO:  %s ", line);
+            break;
+        case 0x81:
+            PrintAndLogEx(NORMAL,  "MAC, only set on dual read:  %s ", line);
+            break;
         case 0x82: {
             char idd[20];
             char idm[20];
             for (int j = 0; j < 8; j++)
-                snprintf(idd + (j*2), sizeof(idd)-1-(j*2), "%02x", trace[j+3]);
+                snprintf(idd + (j * 2), sizeof(idd) - 1 - (j * 2), "%02x", trace[j + 3]);
 
             for (int j = 0; j < 6; j++)
-                snprintf(idm + (j*2), sizeof(idm)-1-(j*2), "%02x", trace[j+13]);
+                snprintf(idm + (j * 2), sizeof(idm) - 1 - (j * 2), "%02x", trace[j + 13]);
 
             PrintAndLogEx(NORMAL,  "ID Block, IDd: 0x%s DFC: 0x%02x%02x Arb: %s ", idd, trace[11], trace [12], idm);
-            }
+        }
         break;
         case 0x83: {
             char idm[20];
             char pmm[20];
             for (int j = 0; j < 8; j++)
-                snprintf(idm + (j*2), sizeof(idm)-1-(j*2), "%02x", trace[j+3]);
+                snprintf(idm + (j * 2), sizeof(idm) - 1 - (j * 2), "%02x", trace[j + 3]);
 
             for (int j = 0; j < 8; j++)
-                snprintf(pmm + (j*2), sizeof(pmm)-1-(j*2), "%02x", trace[j+11]);
+                snprintf(pmm + (j * 2), sizeof(pmm) - 1 - (j * 2), "%02x", trace[j + 11]);
 
             PrintAndLogEx(NORMAL,  "DeviceId:  IDm: 0x%s PMm: 0x%s ", idm, pmm);
-            }
+        }
         break;
-        case 0x84: PrintAndLogEx(NORMAL,  "SER_C: 0x%02x%02x ", trace[3], trace[4]); break;
-        case 0x85: PrintAndLogEx(NORMAL,  "SYS_Cl 0x%02x%02x ", trace[3], trace[4]); break;
-        case 0x86: PrintAndLogEx(NORMAL,  "CKV (key version): 0x%02x%02x ", trace[3], trace[4]); break;
-        case 0x87: PrintAndLogEx(NORMAL,  "CK (card key), WO:   %s ", line); break;
+        case 0x84:
+            PrintAndLogEx(NORMAL,  "SER_C: 0x%02x%02x ", trace[3], trace[4]);
+            break;
+        case 0x85:
+            PrintAndLogEx(NORMAL,  "SYS_Cl 0x%02x%02x ", trace[3], trace[4]);
+            break;
+        case 0x86:
+            PrintAndLogEx(NORMAL,  "CKV (key version): 0x%02x%02x ", trace[3], trace[4]);
+            break;
+        case 0x87:
+            PrintAndLogEx(NORMAL,  "CK (card key), WO:   %s ", line);
+            break;
         case 0x88: {
             PrintAndLogEx(NORMAL,  "Memory Configuration (MC):");
-            PrintAndLogEx(NORMAL,  "MAC needed to write state: %s", trace[3+12]? "on" : "off");
+            PrintAndLogEx(NORMAL,  "MAC needed to write state: %s", trace[3 + 12] ? "on" : "off");
             //order might be off here...
-            PrintAndLogEx(NORMAL,  "Write with MAC for S_PAD  : %s ", sprint_bin(trace+3+10, 2) );
-            PrintAndLogEx(NORMAL,  "Write with AUTH for S_PAD : %s ", sprint_bin(trace+3+8, 2) );
-            PrintAndLogEx(NORMAL,  "Read after AUTH for S_PAD : %s ", sprint_bin(trace+3+6, 2) );
-            PrintAndLogEx(NORMAL,  "MAC needed to write CK and CKV: %s", trace[3+5] ? "on" : "off");
-            PrintAndLogEx(NORMAL,  "RF parameter: %02x", (trace[3+4] & 0x7) );
-            PrintAndLogEx(NORMAL,  "Compatible with NDEF: %s", trace[3+3] ? "yes" : "no");
-            PrintAndLogEx(NORMAL,  "Memory config writable : %s", (trace[3+2] == 0xff) ? "yes" : "no");
-            PrintAndLogEx(NORMAL,  "RW access for S_PAD : %s ", sprint_bin(trace+3, 2) );
-            }
+            PrintAndLogEx(NORMAL,  "Write with MAC for S_PAD  : %s ", sprint_bin(trace + 3 + 10, 2));
+            PrintAndLogEx(NORMAL,  "Write with AUTH for S_PAD : %s ", sprint_bin(trace + 3 + 8, 2));
+            PrintAndLogEx(NORMAL,  "Read after AUTH for S_PAD : %s ", sprint_bin(trace + 3 + 6, 2));
+            PrintAndLogEx(NORMAL,  "MAC needed to write CK and CKV: %s", trace[3 + 5] ? "on" : "off");
+            PrintAndLogEx(NORMAL,  "RF parameter: %02x", (trace[3 + 4] & 0x7));
+            PrintAndLogEx(NORMAL,  "Compatible with NDEF: %s", trace[3 + 3] ? "yes" : "no");
+            PrintAndLogEx(NORMAL,  "Memory config writable : %s", (trace[3 + 2] == 0xff) ? "yes" : "no");
+            PrintAndLogEx(NORMAL,  "RW access for S_PAD : %s ", sprint_bin(trace + 3, 2));
+        }
         break;
         case 0x90: {
             PrintAndLogEx(NORMAL,  "Write count, RO:   %02x %02x %02x ", trace[3], trace[4], trace[5]);
-            }
+        }
         break;
         case 0x91: {
             PrintAndLogEx(NORMAL,  "MAC_A, RW (auth):   %s ", line);
-           }
+        }
         break;
         case 0x92:
             PrintAndLogEx(NORMAL,  "State:");
-            PrintAndLogEx(NORMAL,  "Polling disabled: %s", trace[3+8] ? "yes" : "no");
+            PrintAndLogEx(NORMAL,  "Polling disabled: %s", trace[3 + 8] ? "yes" : "no");
             PrintAndLogEx(NORMAL,  "Authenticated: %s", trace[3] ? "yes" : "no");
             break;
         case 0xa0:
-            PrintAndLogEx(NORMAL,  "CRC of all bloacks match : %s", (trace[3+2]==0xff) ? "no" : "yes");
+            PrintAndLogEx(NORMAL,  "CRC of all bloacks match : %s", (trace[3 + 2] == 0xff) ? "no" : "yes");
             break;
         default:
             PrintAndLogEx(WARNING,  "INVALID %d: %s", blocknum, line);
-        break;
+            break;
     }
-    return tracepos+19;
+    return tracepos + 19;
 }
 
-int CmdHFFelicaDumpLite(const char *Cmd) {
+int CmdHFFelicaDumpLite(const char *Cmd)
+{
 
     char ctmp = tolower(param_getchar(Cmd, 0));
-    if ( ctmp == 'h') return usage_hf_felica_dumplite();
+    if (ctmp == 'h') return usage_hf_felica_dumplite();
 
     PrintAndLogEx(SUCCESS, "FeliCa lite - dump started");
     PrintAndLogEx(SUCCESS, "press pm3-button to cancel");
-    UsbCommand c = {CMD_FELICA_LITE_DUMP, {0,0,0}};
+    UsbCommand c = {CMD_FELICA_LITE_DUMP, {0, 0, 0}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
 
     uint8_t timeout = 0;
-    while ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
+    while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
         timeout++;
-        printf("."); fflush(stdout);
+        printf(".");
+        fflush(stdout);
         if (ukbhit()) {
-            int gc = getchar(); (void)gc;
+            int gc = getchar();
+            (void)gc;
             PrintAndLogEx(WARNING, "\n[!] aborted via keyboard!\n");
             DropField();
             return 1;
@@ -384,15 +439,15 @@ int CmdHFFelicaDumpLite(const char *Cmd) {
 
     uint64_t tracelen = resp.arg[1];
     uint8_t *trace = calloc(tracelen, sizeof(uint8_t));
-    if ( trace == NULL ) {
+    if (trace == NULL) {
         PrintAndLogEx(WARNING, "Cannot allocate memory for trace");
         return 1;
     }
 
     // only download data if there is any.
-    if ( tracelen > 0 ) {
+    if (tracelen > 0) {
 
-        if ( !GetFromDevice(BIG_BUF, trace, tracelen, 0, NULL, 2500, false) ){
+        if (!GetFromDevice(BIG_BUF, trace, tracelen, 0, NULL, 2500, false)) {
             PrintAndLogEx(WARNING, "command execution time out");
             free(trace);
             return 0;
@@ -414,7 +469,8 @@ int CmdHFFelicaDumpLite(const char *Cmd) {
     return 0;
 }
 
-int CmdHFFelicaCmdRaw(const char *cmd) {
+int CmdHFFelicaCmdRaw(const char *cmd)
+{
     UsbCommand c = {CMD_FELICA_COMMAND, {0, 0, 0}};
     bool reply = 1;
     bool crc = false;
@@ -422,7 +478,7 @@ int CmdHFFelicaCmdRaw(const char *cmd) {
     bool active = false;
     bool active_select = false;
     uint16_t numbits = 0;
-    char buf[5]="";
+    char buf[5] = "";
     int i = 0;
     uint8_t data[USB_CMD_DATA_SIZE];
     uint16_t datalen = 0;
@@ -431,12 +487,12 @@ int CmdHFFelicaCmdRaw(const char *cmd) {
     if (strlen(cmd) < 2) return usage_hf_felica_raw();
 
     // strip
-    while (*cmd==' ' || *cmd=='\t') cmd++;
+    while (*cmd == ' ' || *cmd == '\t') cmd++;
 
-    while (cmd[i]!='\0') {
-        if (cmd[i]==' ' || cmd[i]=='\t') { i++; continue; }
-        if (cmd[i]=='-') {
-            switch (cmd[i+1]) {
+    while (cmd[i] != '\0') {
+        if (cmd[i] == ' ' || cmd[i] == '\t') { i++; continue; }
+        if (cmd[i] == '-') {
+            switch (cmd[i + 1]) {
                 case 'H':
                 case 'h':
                     return usage_hf_felica_raw();
@@ -456,11 +512,11 @@ int CmdHFFelicaCmdRaw(const char *cmd) {
                     active_select = true;
                     break;
                 case 'b':
-                    sscanf(cmd+i+2, "%d", &temp);
+                    sscanf(cmd + i + 2, "%d", &temp);
                     numbits = temp & 0xFFFF;
-                    i+=3;
-                    while(cmd[i]!=' ' && cmd[i]!='\0') { i++; }
-                    i-=2;
+                    i += 3;
+                    while (cmd[i] != ' ' && cmd[i] != '\0') { i++; }
+                    i -= 2;
                     break;
                 default:
                     return usage_hf_felica_raw();
@@ -468,18 +524,18 @@ int CmdHFFelicaCmdRaw(const char *cmd) {
             i += 2;
             continue;
         }
-        if ((cmd[i]>='0' && cmd[i]<='9') ||
-            (cmd[i]>='a' && cmd[i]<='f') ||
-            (cmd[i]>='A' && cmd[i]<='F') ) {
-            buf[strlen(buf)+1]=0;
-            buf[strlen(buf)]=cmd[i];
+        if ((cmd[i] >= '0' && cmd[i] <= '9') ||
+            (cmd[i] >= 'a' && cmd[i] <= 'f') ||
+            (cmd[i] >= 'A' && cmd[i] <= 'F')) {
+            buf[strlen(buf) + 1] = 0;
+            buf[strlen(buf)] = cmd[i];
             i++;
 
-            if (strlen(buf)>=2) {
-                sscanf(buf,"%x",&temp);
-                data[datalen]=(uint8_t)(temp & 0xff);
-                *buf=0;
-                if (++datalen >= sizeof(data)){
+            if (strlen(buf) >= 2) {
+                sscanf(buf, "%x", &temp);
+                data[datalen] = (uint8_t)(temp & 0xff);
+                *buf = 0;
+                if (++datalen >= sizeof(data)) {
                     if (crc)
                         PrintAndLogEx(NORMAL, "Buffer is full, we can't add CRC to your data");
                     break;
@@ -491,7 +547,7 @@ int CmdHFFelicaCmdRaw(const char *cmd) {
         return 0;
     }
 
-    if (crc && datalen>0 && datalen < sizeof(data)-2) {
+    if (crc && datalen > 0 && datalen < sizeof(data) - 2) {
         uint8_t b1, b2;
         compute_crc(CRC_FELICA, data, datalen, &b1, &b2);
         data[datalen++] = b1;
@@ -500,7 +556,7 @@ int CmdHFFelicaCmdRaw(const char *cmd) {
 
     if (active || active_select) {
         c.arg[0] |= FELICA_CONNECT;
-        if(active)
+        if (active)
             c.arg[0] |= FELICA_NO_SELECT;
     }
 
@@ -530,41 +586,44 @@ int CmdHFFelicaCmdRaw(const char *cmd) {
     return 0;
 }
 
-void waitCmdFelica(uint8_t iSelect) {
+void waitCmdFelica(uint8_t iSelect)
+{
     UsbCommand resp;
     uint16_t len = 0;
 
     if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
         len = iSelect ? (resp.arg[1] & 0xffff) : (resp.arg[0]  & 0xffff);
         PrintAndLogEx(NORMAL, "received %i octets", len);
-        if(!len)
+        if (!len)
             return;
-        PrintAndLogEx(NORMAL, "%s", sprint_hex(resp.d.asBytes, len) );
+        PrintAndLogEx(NORMAL, "%s", sprint_hex(resp.d.asBytes, len));
     } else {
         PrintAndLogEx(WARNING, "timeout while waiting for reply.");
     }
 }
 
 static command_t CommandTable[] = {
-  {"help",      CmdHelp,              1, "This help"},
-  {"list",      CmdHFFelicaList,      0, "[Deprecated] List ISO 18092/FeliCa history"},
-  {"reader",    CmdHFFelicaReader,    0, "Act like an ISO18092/FeliCa reader"},
-  {"sim",       CmdHFFelicaSim,       0, "<UID> -- Simulate ISO 18092/FeliCa tag"},
-  {"sniff",     CmdHFFelicaSniff,     0, "sniff ISO 18092/Felica traffic"},
-  {"raw",       CmdHFFelicaCmdRaw,    0, "Send raw hex data to tag"},
+    {"help",      CmdHelp,              1, "This help"},
+    {"list",      CmdHFFelicaList,      0, "[Deprecated] List ISO 18092/FeliCa history"},
+    {"reader",    CmdHFFelicaReader,    0, "Act like an ISO18092/FeliCa reader"},
+    {"sim",       CmdHFFelicaSim,       0, "<UID> -- Simulate ISO 18092/FeliCa tag"},
+    {"sniff",     CmdHFFelicaSniff,     0, "sniff ISO 18092/Felica traffic"},
+    {"raw",       CmdHFFelicaCmdRaw,    0, "Send raw hex data to tag"},
 
-  {"litesim",   CmdHFFelicaSimLite,   0, "<NDEF2> - only reply to poll request"},
-  {"litedump",  CmdHFFelicaDumpLite,  0, "Wait for and try dumping FelicaLite"},
-  {NULL, NULL, 0, NULL}
+    {"litesim",   CmdHFFelicaSimLite,   0, "<NDEF2> - only reply to poll request"},
+    {"litedump",  CmdHFFelicaDumpLite,  0, "Wait for and try dumping FelicaLite"},
+    {NULL, NULL, 0, NULL}
 };
 
-int CmdHFFelica(const char *Cmd) {
+int CmdHFFelica(const char *Cmd)
+{
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
+int CmdHelp(const char *Cmd)
+{
     CmdsHelp(CommandTable);
     return 0;
 }
\ No newline at end of file
diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index 588c3b037..80d2416d7 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -49,7 +49,8 @@
 
 static int CmdHelp(const char *Cmd);
 
-int CmdHFFidoInfo(const char *cmd) {
+int CmdHFFidoInfo(const char *cmd)
+{
 
     if (cmd && strlen(cmd) > 0)
         PrintAndLog("WARNING: command don't have any parameters.\n");
@@ -104,7 +105,7 @@ int CmdHFFidoInfo(const char *cmd) {
         return 0;
     }
 
-    if(buf[0]) {
+    if (buf[0]) {
         PrintAndLog("FIDO2 ger version error: %d - %s", buf[0], fido2GetCmdErrorDescription(buf[0]));
         return 0;
     }
@@ -124,12 +125,13 @@ int CmdHFFidoInfo(const char *cmd) {
     return 0;
 }
 
-json_t *OpenJson(int paramnum, char *fname, void* argtable[], bool *err) {
+json_t *OpenJson(int paramnum, char *fname, void *argtable[], bool *err)
+{
     json_t *root = NULL;
     json_error_t error;
     *err = false;
 
-    uint8_t jsonname[250] ={0};
+    uint8_t jsonname[250] = {0};
     char *cjsonname = (char *)jsonname;
     int jsonnamelen = 0;
 
@@ -168,7 +170,8 @@ json_t *OpenJson(int paramnum, char *fname, void* argtable[], bool *err) {
     return root;
 }
 
-int CmdHFFidoRegister(const char *cmd) {
+int CmdHFFidoRegister(const char *cmd)
+{
     uint8_t data[64] = {0};
     int chlen = 0;
     uint8_t cdata[250] = {0};
@@ -177,12 +180,12 @@ int CmdHFFidoRegister(const char *cmd) {
     json_t *root = NULL;
 
     CLIParserInit("hf fido reg",
-        "Initiate a U2F token registration. Needs two 32-byte hash number. \nchallenge parameter (32b) and application parameter (32b).",
-        "Usage:\n\thf fido reg -> execute command with 2 parameters, filled 0x00\n"
-            "\thf fido reg 000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f 000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f -> execute command with parameters"
-            "\thf fido reg -p s0 s1 -> execute command with plain parameters");
+                  "Initiate a U2F token registration. Needs two 32-byte hash number. \nchallenge parameter (32b) and application parameter (32b).",
+                  "Usage:\n\thf fido reg -> execute command with 2 parameters, filled 0x00\n"
+                  "\thf fido reg 000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f 000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f -> execute command with parameters"
+                  "\thf fido reg -p s0 s1 -> execute command with plain parameters");
 
-    void* argtable[] = {
+    void *argtable[] = {
         arg_param_begin,
         arg_lit0("aA",  "apdu",     "show APDU reqests and responses"),
         arg_litn("vV",  "verbose",  0, 2, "show technical data. vv - show full certificates data"),
@@ -204,7 +207,7 @@ int CmdHFFidoRegister(const char *cmd) {
     char fname[250] = {0};
     bool err;
     root = OpenJson(5, fname, argtable, &err);
-    if(err)
+    if (err)
         return 1;
     if (root) {
         size_t jlen;
@@ -345,19 +348,19 @@ int CmdHFFidoRegister(const char *cmd) {
         uint8_t xbuf[4096] = {0};
         size_t xbuflen = 0;
         res = FillBuffer(xbuf, sizeof(xbuf), &xbuflen,
-            "\x00", 1,
-            &data[32], 32,           // application parameter
-            &data[0], 32,            // challenge parameter
-            &buf[67], keyHandleLen,  // keyHandle
-            &buf[1], 65,             // user public key
-            NULL, 0);
+                         "\x00", 1,
+                         &data[32], 32,           // application parameter
+                         &data[0], 32,            // challenge parameter
+                         &buf[67], keyHandleLen,  // keyHandle
+                         &buf[1], 65,             // user public key
+                         NULL, 0);
         //PrintAndLog("--xbuf(%d)[%d]: %s", res, xbuflen, sprint_hex(xbuf, xbuflen));
         res = ecdsa_signature_verify(public_key, xbuf, xbuflen, &buf[hashp], len - hashp);
         if (res) {
             if (res == -0x4e00) {
                 PrintAndLog("Signature is NOT VALID.");
             } else {
-                PrintAndLog("Other signature check error: %x %s", (res<0)?-res:res, ecdsa_get_error(res));
+                PrintAndLog("Other signature check error: %x %s", (res < 0) ? -res : res, ecdsa_get_error(res));
             }
         } else {
             PrintAndLog("Signature is OK.");
@@ -368,11 +371,11 @@ int CmdHFFidoRegister(const char *cmd) {
     }
 
     PrintAndLog("\nauth command: ");
-    printf("hf fido auth %s%s", paramsPlain?"-p ":"", sprint_hex_inrow(&buf[67], keyHandleLen));
-    if(chlen || applen)
-        printf(" %s", paramsPlain?(char *)cdata:sprint_hex_inrow(cdata, 32));
-    if(applen)
-        printf(" %s", paramsPlain?(char *)adata:sprint_hex_inrow(adata, 32));
+    printf("hf fido auth %s%s", paramsPlain ? "-p " : "", sprint_hex_inrow(&buf[67], keyHandleLen));
+    if (chlen || applen)
+        printf(" %s", paramsPlain ? (char *)cdata : sprint_hex_inrow(cdata, 32));
+    if (applen)
+        printf(" %s", paramsPlain ? (char *)adata : sprint_hex_inrow(adata, 32));
     printf("\n");
 
     if (root) {
@@ -397,7 +400,8 @@ int CmdHFFidoRegister(const char *cmd) {
     return 0;
 };
 
-int CmdHFFidoAuthenticate(const char *cmd) {
+int CmdHFFidoAuthenticate(const char *cmd)
+{
     uint8_t data[512] = {0};
     uint8_t hdata[250] = {0};
     bool public_key_loaded = false;
@@ -407,12 +411,12 @@ int CmdHFFidoAuthenticate(const char *cmd) {
     json_t *root = NULL;
 
     CLIParserInit("hf fido auth",
-        "Initiate a U2F token authentication. Needs key handle and two 32-byte hash number. \nkey handle(var 0..255), challenge parameter (32b) and application parameter (32b).",
-        "Usage:\n\thf fido auth 000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f -> execute command with 2 parameters, filled 0x00 and key handle\n"
-            "\thf fido auth 000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f "
-                "000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f 000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f -> execute command with parameters");
+                  "Initiate a U2F token authentication. Needs key handle and two 32-byte hash number. \nkey handle(var 0..255), challenge parameter (32b) and application parameter (32b).",
+                  "Usage:\n\thf fido auth 000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f -> execute command with 2 parameters, filled 0x00 and key handle\n"
+                  "\thf fido auth 000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f "
+                  "000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f 000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f -> execute command with parameters");
 
-    void* argtable[] = {
+    void *argtable[] = {
         arg_param_begin,
         arg_lit0("aA",  "apdu",     "show APDU reqests and responses"),
         arg_lit0("vV",  "verbose",  "show technical data"),
@@ -441,7 +445,7 @@ int CmdHFFidoAuthenticate(const char *cmd) {
     char fname[250] = {0};
     bool err;
     root = OpenJson(7, fname, argtable, &err);
-    if(err)
+    if (err)
         return 1;
     if (root) {
         size_t jlen;
@@ -554,8 +558,8 @@ int CmdHFFidoAuthenticate(const char *cmd) {
     }
 
     PrintAndLog("---------------------------------------------------------------");
-    PrintAndLog("User presence: %s", (buf[0]?"verified":"not verified"));
-    uint32_t cntr =  (uint32_t)bytes_to_num(&buf[1], 4);
+    PrintAndLog("User presence: %s", (buf[0] ? "verified" : "not verified"));
+    uint32_t cntr = (uint32_t)bytes_to_num(&buf[1], 4);
     PrintAndLog("Counter: %d", cntr);
     PrintAndLog("Hash[%d]: %s", len - 5, sprint_hex(&buf[5], len - 5));
 
@@ -572,18 +576,18 @@ int CmdHFFidoAuthenticate(const char *cmd) {
             uint8_t xbuf[4096] = {0};
             size_t xbuflen = 0;
             res = FillBuffer(xbuf, sizeof(xbuf), &xbuflen,
-                &data[32], 32, // application parameter
-                &buf[0], 1,    // user presence
-                &buf[1], 4,    // counter
-                data, 32,      // challenge parameter
-                NULL, 0);
+                             &data[32], 32, // application parameter
+                             &buf[0], 1,    // user presence
+                             &buf[1], 4,    // counter
+                             data, 32,      // challenge parameter
+                             NULL, 0);
             //PrintAndLog("--xbuf(%d)[%d]: %s", res, xbuflen, sprint_hex(xbuf, xbuflen));
             res = ecdsa_signature_verify(public_key, xbuf, xbuflen, &buf[5], len - 5);
             if (res) {
                 if (res == -0x4e00) {
                     PrintAndLog("Signature is NOT VALID.");
                 } else {
-                    PrintAndLog("Other signature check error: %x %s", (res<0)?-res:res, ecdsa_get_error(res));
+                    PrintAndLog("Other signature check error: %x %s", (res < 0) ? -res : res, ecdsa_get_error(res));
                 }
             } else {
                 PrintAndLog("Signature is OK.");
@@ -615,13 +619,15 @@ int CmdHFFidoAuthenticate(const char *cmd) {
     return 0;
 };
 
-void CheckSlash(char *fileName) {
+void CheckSlash(char *fileName)
+{
     if ((fileName[strlen(fileName) - 1] != '/') &&
         (fileName[strlen(fileName) - 1] != '\\'))
         strcat(fileName, "/");
 }
 
-int GetExistsFileNameJson(char *prefixDir, char *reqestedFileName, char *fileName) {
+int GetExistsFileNameJson(char *prefixDir, char *reqestedFileName, char *fileName)
+{
     fileName[0] = 0x00;
     strcpy(fileName, get_my_executable_directory());
     CheckSlash(fileName);
@@ -648,17 +654,18 @@ int GetExistsFileNameJson(char *prefixDir, char *reqestedFileName, char *fileNam
     return 0;
 }
 
-int CmdHFFido2MakeCredential(const char *cmd) {
+int CmdHFFido2MakeCredential(const char *cmd)
+{
     json_error_t error;
     json_t *root = NULL;
     char fname[300] = {0};
 
     CLIParserInit("hf fido make",
-        "Execute a FIDO2 Make Credentional command. Needs json file with parameters. Sample file `fido2.json`. File can be placed in proxmark directory or in `proxmark/fido` directory.",
-        "Usage:\n\thf fido make -> execute command default parameters file `fido2.json`\n"
-            "\thf fido make test.json -> execute command with parameters file `text.json`");
+                  "Execute a FIDO2 Make Credentional command. Needs json file with parameters. Sample file `fido2.json`. File can be placed in proxmark directory or in `proxmark/fido` directory.",
+                  "Usage:\n\thf fido make -> execute command default parameters file `fido2.json`\n"
+                  "\thf fido make test.json -> execute command with parameters file `text.json`");
 
-    void* argtable[] = {
+    void *argtable[] = {
         arg_param_begin,
         arg_lit0("aA",  "apdu",     "show APDU reqests and responses"),
         arg_litn("vV",  "verbose",  0, 2, "show technical data. vv - show full certificates data"),
@@ -675,7 +682,7 @@ int CmdHFFido2MakeCredential(const char *cmd) {
     bool showDERTLV = arg_get_lit(3);
     bool showCBOR = arg_get_lit(4);
 
-    uint8_t jsonname[250] ={0};
+    uint8_t jsonname[250] = {0};
     char *cjsonname = (char *)jsonname;
     int jsonnamelen = 0;
     CLIGetStrWithReturn(5, jsonname, &jsonnamelen);
@@ -690,7 +697,7 @@ int CmdHFFido2MakeCredential(const char *cmd) {
     SetAPDULogging(APDULogging);
 
     int res = GetExistsFileNameJson("fido", cjsonname, fname);
-    if(res) {
+    if (res) {
         PrintAndLog("ERROR: Can't found the json file.");
         return res;
     }
@@ -745,7 +752,7 @@ int CmdHFFido2MakeCredential(const char *cmd) {
         return 3;
     }
 
-    if(buf[0]) {
+    if (buf[0]) {
         PrintAndLog("FIDO2 make credential error: %d - %s", buf[0], fido2GetCmdErrorDescription(buf[0]));
         return 0;
     }
@@ -775,17 +782,18 @@ int CmdHFFido2MakeCredential(const char *cmd) {
     return 0;
 };
 
-int CmdHFFido2GetAssertion(const char *cmd) {
+int CmdHFFido2GetAssertion(const char *cmd)
+{
     json_error_t error;
     json_t *root = NULL;
     char fname[300] = {0};
 
     CLIParserInit("hf fido assert",
-        "Execute a FIDO2 Get Assertion command. Needs json file with parameters. Sample file `fido2.json`. File can be placed in proxmark directory or in `proxmark/fido` directory.",
-        "Usage:\n\thf fido assert -> execute command default parameters file `fido2.json`\n"
-            "\thf fido assert test.json -l -> execute command with parameters file `text.json` and add to request CredentialId");
+                  "Execute a FIDO2 Get Assertion command. Needs json file with parameters. Sample file `fido2.json`. File can be placed in proxmark directory or in `proxmark/fido` directory.",
+                  "Usage:\n\thf fido assert -> execute command default parameters file `fido2.json`\n"
+                  "\thf fido assert test.json -l -> execute command with parameters file `text.json` and add to request CredentialId");
 
-    void* argtable[] = {
+    void *argtable[] = {
         arg_param_begin,
         arg_lit0("aA",  "apdu",     "show APDU reqests and responses"),
         arg_litn("vV",  "verbose",  0, 2, "show technical data. vv - show full certificates data"),
@@ -802,7 +810,7 @@ int CmdHFFido2GetAssertion(const char *cmd) {
     bool showCBOR = arg_get_lit(3);
     bool createAllowList = arg_get_lit(4);
 
-    uint8_t jsonname[250] ={0};
+    uint8_t jsonname[250] = {0};
     char *cjsonname = (char *)jsonname;
     int jsonnamelen = 0;
     CLIGetStrWithReturn(5, jsonname, &jsonnamelen);
@@ -817,7 +825,7 @@ int CmdHFFido2GetAssertion(const char *cmd) {
     SetAPDULogging(APDULogging);
 
     int res = GetExistsFileNameJson("fido", "fido2", fname);
-    if(res) {
+    if (res) {
         PrintAndLog("ERROR: Can't found the json file.");
         return res;
     }
@@ -872,7 +880,7 @@ int CmdHFFido2GetAssertion(const char *cmd) {
         return 3;
     }
 
-    if(buf[0]) {
+    if (buf[0]) {
         PrintAndLog("FIDO2 get assertion error: %d - %s", buf[0], fido2GetCmdErrorDescription(buf[0]));
         return 0;
     }
@@ -902,24 +910,25 @@ int CmdHFFido2GetAssertion(const char *cmd) {
     return 0;
 };
 
-static command_t CommandTable[] =
-{
-  {"help",             CmdHelp,                    1, "This help."},
-  {"info",             CmdHFFidoInfo,              0, "Info about FIDO tag."},
-  {"reg",              CmdHFFidoRegister,          0, "FIDO U2F Registration Message."},
-  {"auth",             CmdHFFidoAuthenticate,      0, "FIDO U2F Authentication Message."},
-  {"make",             CmdHFFido2MakeCredential,   0, "FIDO2 MakeCredential command."},
-  {"assert",           CmdHFFido2GetAssertion,     0, "FIDO2 GetAssertion command."},
-  {NULL,               NULL,                       0, NULL}
+static command_t CommandTable[] = {
+    {"help",             CmdHelp,                    1, "This help."},
+    {"info",             CmdHFFidoInfo,              0, "Info about FIDO tag."},
+    {"reg",              CmdHFFidoRegister,          0, "FIDO U2F Registration Message."},
+    {"auth",             CmdHFFidoAuthenticate,      0, "FIDO U2F Authentication Message."},
+    {"make",             CmdHFFido2MakeCredential,   0, "FIDO2 MakeCredential command."},
+    {"assert",           CmdHFFido2GetAssertion,     0, "FIDO2 GetAssertion command."},
+    {NULL,               NULL,                       0, NULL}
 };
 
-int CmdHFFido(const char *Cmd) {
+int CmdHFFido(const char *Cmd)
+{
     (void)WaitForResponseTimeout(CMD_ACK, NULL, 100);
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
-  CmdsHelp(CommandTable);
-  return 0;
+int CmdHelp(const char *Cmd)
+{
+    CmdsHelp(CommandTable);
+    return 0;
 }
diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index 20bcfdf33..0fc95a586 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -19,17 +19,18 @@
 static int CmdHelp(const char *Cmd);
 
 static uint8_t iClass_Key_Table[ICLASS_KEYS_MAX][8] = {
-        { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },
-        { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },
-        { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },
-        { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },
-        { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },
-        { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },
-        { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },
-        { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }
 };
 
-int usage_hf_iclass_sim(void) {
+int usage_hf_iclass_sim(void)
+{
     PrintAndLogEx(NORMAL, "Usage:  hf iclass sim <option> [CSN]");
     PrintAndLogEx(NORMAL, "        options");
     PrintAndLogEx(NORMAL, "                0 <CSN> simulate the given CSN");
@@ -45,14 +46,16 @@ int usage_hf_iclass_sim(void) {
     PrintAndLogEx(NORMAL, "        hf iclass sim 4");
     return 0;
 }
-int usage_hf_iclass_eload(void) {
+int usage_hf_iclass_eload(void)
+{
     PrintAndLogEx(NORMAL, "Loads iclass tag-dump into emulator memory on device");
     PrintAndLogEx(NORMAL, "Usage:  hf iclass eload f <filename>");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "        hf iclass eload f iclass_tagdump-aa162d30f8ff12f1.bin");
     return 0;
 }
-int usage_hf_iclass_decrypt(void) {
+int usage_hf_iclass_decrypt(void)
+{
     PrintAndLogEx(NORMAL, "This is simple implementation, it tries to decrypt every block after block 6.");
     PrintAndLogEx(NORMAL, "Correct behaviour would be to decrypt only the application areas where the key is valid,");
     PrintAndLogEx(NORMAL, "which is defined by the configuration block.");
@@ -65,7 +68,8 @@ int usage_hf_iclass_decrypt(void) {
     PrintAndLogEx(NORMAL, "S       hf iclass decrypt f tagdump_12312342343.bin");
     return 0;
 }
-int usage_hf_iclass_encrypt(void) {
+int usage_hf_iclass_encrypt(void)
+{
     PrintAndLogEx(NORMAL, "OBS! In order to use this function, the file 'iclass_decryptionkey.bin' must reside");
     PrintAndLogEx(NORMAL, "in the working directory. The file should be 16 bytes binary data");
     PrintAndLogEx(NORMAL, "");
@@ -76,7 +80,8 @@ int usage_hf_iclass_encrypt(void) {
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
-int usage_hf_iclass_dump(void) {
+int usage_hf_iclass_dump(void)
+{
     PrintAndLogEx(NORMAL, "Usage:  hf iclass dump f <fileName> k <key> c <creditkey> [e|r|v]\n");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "  f <filename> : specify a filename to save dump to");
@@ -92,7 +97,8 @@ int usage_hf_iclass_dump(void) {
     PrintAndLogEx(NORMAL, "        hf iclass dump k AAAAAAAAAAAAAAAA e");
     return 0;
 }
-int usage_hf_iclass_clone(void) {
+int usage_hf_iclass_clone(void)
+{
     PrintAndLogEx(NORMAL, "Usage:  hf iclass clone f <tagfile.bin> b <first block> l <last block> k <KEY> c e|r");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "  f <filename>: specify a filename to clone from");
@@ -108,7 +114,8 @@ int usage_hf_iclass_clone(void) {
     PrintAndLogEx(NORMAL, "       hf iclass clone f iclass_tagdump-121345.bin b 06 l 19 k 0 e");
     return 0;
 }
-int usage_hf_iclass_writeblock(void) {
+int usage_hf_iclass_writeblock(void)
+{
     PrintAndLogEx(NORMAL, "Usage:  hf iclass writeblk b <block> d <data> k <key> [c|e|r|v]\n");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "  b <Block> : The block number as 2 hex symbols");
@@ -123,7 +130,8 @@ int usage_hf_iclass_writeblock(void) {
     PrintAndLogEx(NORMAL, "        hf iclass writeblk b 1B d AAAAAAAAAAAAAAAA k 001122334455667B c");
     return 0;
 }
-int usage_hf_iclass_readblock(void) {
+int usage_hf_iclass_readblock(void)
+{
     PrintAndLogEx(NORMAL, "Usage:  hf iclass readblk b <block> k <key> [c|e|r|v]\n");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "  b <block> : The block number as 2 hex symbols");
@@ -138,11 +146,13 @@ int usage_hf_iclass_readblock(void) {
     PrintAndLogEx(NORMAL, "        hf iclass readblk b 0A k 0");
     return 0;
 }
-int usage_hf_iclass_readtagfile() {
+int usage_hf_iclass_readtagfile()
+{
     PrintAndLogEx(NORMAL, "Usage: hf iclass readtagfile <filename> [startblock] [endblock]");
     return 0;
 }
-int usage_hf_iclass_calc_newkey(void) {
+int usage_hf_iclass_calc_newkey(void)
+{
     PrintAndLogEx(NORMAL, "Calculate new key for updating\n");
     PrintAndLogEx(NORMAL, "Usage:  hf iclass calc_newkey o <Old key> n <New key> s [csn] e");
     PrintAndLogEx(NORMAL, "Options:");
@@ -158,7 +168,8 @@ int usage_hf_iclass_calc_newkey(void) {
     PrintAndLogEx(NORMAL, "\nNOTE: * = required\n");
     return 0;
 }
-int usage_hf_iclass_managekeys(void) {
+int usage_hf_iclass_managekeys(void)
+{
     PrintAndLogEx(NORMAL, "HELP :  Manage iClass Keys in client memory:\n");
     PrintAndLogEx(NORMAL, "Usage:  hf iclass managekeys n [keynbr] k [key] f [filename] s l p\n");
     PrintAndLogEx(NORMAL, "Options:");
@@ -175,7 +186,8 @@ int usage_hf_iclass_managekeys(void) {
     PrintAndLogEx(NORMAL, " print keys   : hf iclass managekeys p\n");
     return 0;
 }
-int usage_hf_iclass_reader(void) {
+int usage_hf_iclass_reader(void)
+{
     PrintAndLogEx(NORMAL, "Act as a Iclass reader.  Look for iClass tags until a key or the pm3 button is pressed\n");
     PrintAndLogEx(NORMAL, "Usage:  hf iclass reader [h] [1]\n");
     PrintAndLogEx(NORMAL, "Options:");
@@ -185,7 +197,8 @@ int usage_hf_iclass_reader(void) {
     PrintAndLogEx(NORMAL, "        hf iclass reader 1");
     return 0;
 }
-int usage_hf_iclass_replay(void) {
+int usage_hf_iclass_replay(void)
+{
     PrintAndLogEx(NORMAL, "Replay a collected mac message");
     PrintAndLogEx(NORMAL, "Usage:  hf iclass replay [h] <mac>");
     PrintAndLogEx(NORMAL, "Options:");
@@ -195,14 +208,16 @@ int usage_hf_iclass_replay(void) {
     PrintAndLogEx(NORMAL, "        hf iclass replay 00112233");
     return 0;
 }
-int usage_hf_iclass_sniff(void) {
+int usage_hf_iclass_sniff(void)
+{
     PrintAndLogEx(NORMAL, "Sniff the communication between reader and tag");
     PrintAndLogEx(NORMAL, "Usage:  hf iclass sniff [h]");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "         hf iclass sniff");
     return 0;
 }
-int usage_hf_iclass_loclass(void) {
+int usage_hf_iclass_loclass(void)
+{
     PrintAndLogEx(NORMAL, "Usage: hf iclass loclass [options]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "h             Show this help");
@@ -217,7 +232,8 @@ int usage_hf_iclass_loclass(void) {
     PrintAndLogEx(NORMAL, "                  ... totalling N*24 bytes");
     return 0;
 }
-int usage_hf_iclass_chk(void) {
+int usage_hf_iclass_chk(void)
+{
     PrintAndLogEx(NORMAL, "Checkkeys loads a dictionary text file with 8byte hex keys to test authenticating against a iClass tag");
     PrintAndLogEx(NORMAL, "Usage: hf iclass chk [h|e|r] [f  (*.dic)]");
     PrintAndLogEx(NORMAL, "Options:");
@@ -231,7 +247,8 @@ int usage_hf_iclass_chk(void) {
     PrintAndLogEx(NORMAL, "         hf iclass chk f default_iclass_keys.dic e");
     return 0;
 }
-int usage_hf_iclass_lookup(void) {
+int usage_hf_iclass_lookup(void)
+{
     PrintAndLogEx(NORMAL, "Lookup keys takes some sniffed trace data and tries to verify what key was used against a dictionary file");
     PrintAndLogEx(NORMAL, "Usage: hf iclass lookup [h|e|r] [f  (*.dic)] [u <csn>] [p <epurse>] [m <macs>]");
     PrintAndLogEx(NORMAL, "Options:");
@@ -247,7 +264,8 @@ int usage_hf_iclass_lookup(void) {
     PrintAndLogEx(NORMAL, "        hf iclass lookup u 9655a400f8ff12e0 p f0ffffffffffffff m 0000000089cb984b f default_iclass_keys.dic e");
     return 0;
 }
-int usage_hf_iclass_permutekey(void){
+int usage_hf_iclass_permutekey(void)
+{
     PrintAndLogEx(NORMAL, "Permute function from 'heart of darkness' paper.");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  hf iclass permute [h] <r|f> <bytes>");
@@ -262,7 +280,8 @@ int usage_hf_iclass_permutekey(void){
     return 0;
 }
 
-int xorbits_8(uint8_t val) {
+int xorbits_8(uint8_t val)
+{
     uint8_t res = val ^ (val >> 1); //1st pass
     res = res ^ (res >> 1);         // 2nd pass
     res = res ^ (res >> 2);         // 3rd pass
@@ -270,21 +289,24 @@ int xorbits_8(uint8_t val) {
     return res & 1;
 }
 
-int CmdHFiClassList(const char *Cmd) {
+int CmdHFiClassList(const char *Cmd)
+{
     //PrintAndLogEx(NORMAL, "Deprecated command, use 'hf list iclass' instead");
     CmdTraceList("iclass");
     return 0;
 }
 
-int CmdHFiClassSniff(const char *Cmd) {
+int CmdHFiClassSniff(const char *Cmd)
+{
     char cmdp = tolower(param_getchar(Cmd, 0));
-    if (cmdp == 'h' ) return usage_hf_iclass_sniff();
+    if (cmdp == 'h') return usage_hf_iclass_sniff();
     UsbCommand c = {CMD_SNOOP_ICLASS};
     SendCommand(&c);
     return 0;
 }
 
-int CmdHFiClassSim(const char *Cmd) {
+int CmdHFiClassSim(const char *Cmd)
+{
 
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) < 1 || cmdp == 'h') return usage_hf_iclass_sim();
@@ -309,71 +331,71 @@ int CmdHFiClassSim(const char *Cmd) {
 
     uint8_t numberOfCSNs = 0;
 
-/*
-        // pre-defined 8 CSN by Holiman
-        uint8_t csns[8*NUM_CSNS] = {
-            0x00, 0x0B, 0x0F, 0xFF, 0xF7, 0xFF, 0x12, 0xE0,
-            0x00, 0x13, 0x94, 0x7E, 0x76, 0xFF, 0x12, 0xE0,
-            0x2A, 0x99, 0xAC, 0x79, 0xEC, 0xFF, 0x12, 0xE0,
-            0x17, 0x12, 0x01, 0xFD, 0xF7, 0xFF, 0x12, 0xE0,
-            0xCD, 0x56, 0x01, 0x7C, 0x6F, 0xFF, 0x12, 0xE0,
-            0x4B, 0x5E, 0x0B, 0x72, 0xEF, 0xFF, 0x12, 0xE0,
-            0x00, 0x73, 0xD8, 0x75, 0x58, 0xFF, 0x12, 0xE0,
-            0x0C, 0x90, 0x32, 0xF3, 0x5D, 0xFF, 0x12, 0xE0
-        };
-*/
-/*
-        pre-defined 9 CSN by iceman
-        only one csn depend on several others.
-        six depends only on the first csn,  (0,1, 0x45)
-*/
-        uint8_t csns[8*NUM_CSNS] = {
-            0x01, 0x0A, 0x0F, 0xFF, 0xF7, 0xFF, 0x12, 0xE0,
-            0x0C, 0x06, 0x0C, 0xFE, 0xF7, 0xFF, 0x12, 0xE0,
-            0x10, 0x97, 0x83, 0x7B, 0xF7, 0xFF, 0x12, 0xE0,
-            0x13, 0x97, 0x82, 0x7A, 0xF7, 0xFF, 0x12, 0xE0,
-            0x07, 0x0E, 0x0D, 0xF9, 0xF7, 0xFF, 0x12, 0xE0,
-            0x14, 0x96, 0x84, 0x76, 0xF7, 0xFF, 0x12, 0xE0,
-            0x17, 0x96, 0x85, 0x71, 0xF7, 0xFF, 0x12, 0xE0,
-            0xCE, 0xC5, 0x0F, 0x77, 0xF7, 0xFF, 0x12, 0xE0,
-            0xD2, 0x5A, 0x82, 0xF8, 0xF7, 0xFF, 0x12, 0xE0
-            //0x04, 0x08, 0x9F, 0x78, 0x6E, 0xFF, 0x12, 0xE0
-        };
-/*
-        // pre-defined 15 CSN by Carl55
-        // remember to change the define NUM_CSNS to match.
-        uint8_t csns[8*NUM_CSNS] = {
-            0x00, 0x0B, 0x0F, 0xFF, 0xF7, 0xFF, 0x12, 0xE0,
-            0x00, 0x04, 0x0E, 0x08, 0xF7, 0xFF, 0x12, 0xE0,
-            0x00, 0x09, 0x0D, 0x05, 0xF7, 0xFF, 0x12, 0xE0,
-            0x00, 0x0A, 0x0C, 0x06, 0xF7, 0xFF, 0x12, 0xE0,
-            0x00, 0x0F, 0x0B, 0x03, 0xF7, 0xFF, 0x12, 0xE0,
-            0x00, 0x08, 0x0A, 0x0C, 0xF7, 0xFF, 0x12, 0xE0,
-            0x00, 0x0D, 0x09, 0x09, 0xF7, 0xFF, 0x12, 0xE0,
-            0x00, 0x0E, 0x08, 0x0A, 0xF7, 0xFF, 0x12, 0xE0,
-            0x00, 0x03, 0x07, 0x17, 0xF7, 0xFF, 0x12, 0xE0,
-            0x00, 0x3C, 0x06, 0xE0, 0xF7, 0xFF, 0x12, 0xE0,
-            0x00, 0x01, 0x05, 0x1D, 0xF7, 0xFF, 0x12, 0xE0,
-            0x00, 0x02, 0x04, 0x1E, 0xF7, 0xFF, 0x12, 0xE0,
-            0x00, 0x07, 0x03, 0x1B, 0xF7, 0xFF, 0x12, 0xE0,
-            0x00, 0x00, 0x02, 0x24, 0xF7, 0xFF, 0x12, 0xE0,
-            0x00, 0x05, 0x01, 0x21, 0xF7, 0xFF, 0x12, 0xE0
-        };
-*/
+    /*
+            // pre-defined 8 CSN by Holiman
+            uint8_t csns[8*NUM_CSNS] = {
+                0x00, 0x0B, 0x0F, 0xFF, 0xF7, 0xFF, 0x12, 0xE0,
+                0x00, 0x13, 0x94, 0x7E, 0x76, 0xFF, 0x12, 0xE0,
+                0x2A, 0x99, 0xAC, 0x79, 0xEC, 0xFF, 0x12, 0xE0,
+                0x17, 0x12, 0x01, 0xFD, 0xF7, 0xFF, 0x12, 0xE0,
+                0xCD, 0x56, 0x01, 0x7C, 0x6F, 0xFF, 0x12, 0xE0,
+                0x4B, 0x5E, 0x0B, 0x72, 0xEF, 0xFF, 0x12, 0xE0,
+                0x00, 0x73, 0xD8, 0x75, 0x58, 0xFF, 0x12, 0xE0,
+                0x0C, 0x90, 0x32, 0xF3, 0x5D, 0xFF, 0x12, 0xE0
+            };
+    */
+    /*
+            pre-defined 9 CSN by iceman
+            only one csn depend on several others.
+            six depends only on the first csn,  (0,1, 0x45)
+    */
+    uint8_t csns[8 * NUM_CSNS] = {
+        0x01, 0x0A, 0x0F, 0xFF, 0xF7, 0xFF, 0x12, 0xE0,
+        0x0C, 0x06, 0x0C, 0xFE, 0xF7, 0xFF, 0x12, 0xE0,
+        0x10, 0x97, 0x83, 0x7B, 0xF7, 0xFF, 0x12, 0xE0,
+        0x13, 0x97, 0x82, 0x7A, 0xF7, 0xFF, 0x12, 0xE0,
+        0x07, 0x0E, 0x0D, 0xF9, 0xF7, 0xFF, 0x12, 0xE0,
+        0x14, 0x96, 0x84, 0x76, 0xF7, 0xFF, 0x12, 0xE0,
+        0x17, 0x96, 0x85, 0x71, 0xF7, 0xFF, 0x12, 0xE0,
+        0xCE, 0xC5, 0x0F, 0x77, 0xF7, 0xFF, 0x12, 0xE0,
+        0xD2, 0x5A, 0x82, 0xF8, 0xF7, 0xFF, 0x12, 0xE0
+        //0x04, 0x08, 0x9F, 0x78, 0x6E, 0xFF, 0x12, 0xE0
+    };
+    /*
+            // pre-defined 15 CSN by Carl55
+            // remember to change the define NUM_CSNS to match.
+            uint8_t csns[8*NUM_CSNS] = {
+                0x00, 0x0B, 0x0F, 0xFF, 0xF7, 0xFF, 0x12, 0xE0,
+                0x00, 0x04, 0x0E, 0x08, 0xF7, 0xFF, 0x12, 0xE0,
+                0x00, 0x09, 0x0D, 0x05, 0xF7, 0xFF, 0x12, 0xE0,
+                0x00, 0x0A, 0x0C, 0x06, 0xF7, 0xFF, 0x12, 0xE0,
+                0x00, 0x0F, 0x0B, 0x03, 0xF7, 0xFF, 0x12, 0xE0,
+                0x00, 0x08, 0x0A, 0x0C, 0xF7, 0xFF, 0x12, 0xE0,
+                0x00, 0x0D, 0x09, 0x09, 0xF7, 0xFF, 0x12, 0xE0,
+                0x00, 0x0E, 0x08, 0x0A, 0xF7, 0xFF, 0x12, 0xE0,
+                0x00, 0x03, 0x07, 0x17, 0xF7, 0xFF, 0x12, 0xE0,
+                0x00, 0x3C, 0x06, 0xE0, 0xF7, 0xFF, 0x12, 0xE0,
+                0x00, 0x01, 0x05, 0x1D, 0xF7, 0xFF, 0x12, 0xE0,
+                0x00, 0x02, 0x04, 0x1E, 0xF7, 0xFF, 0x12, 0xE0,
+                0x00, 0x07, 0x03, 0x1B, 0xF7, 0xFF, 0x12, 0xE0,
+                0x00, 0x00, 0x02, 0x24, 0xF7, 0xFF, 0x12, 0xE0,
+                0x00, 0x05, 0x01, 0x21, 0xF7, 0xFF, 0x12, 0xE0
+            };
+    */
 
-/* DUMPFILE FORMAT:
- *
- * <8-byte CSN><8-byte CC><4 byte NR><4 byte MAC>....
- * So, it should wind up as
- * 8 * 24 bytes.
- *
- * The returndata from the pm3 is on the following format
- * <4 byte NR><4 byte MAC>
- * CC are all zeroes, CSN is the same as was sent in
- **/
+    /* DUMPFILE FORMAT:
+     *
+     * <8-byte CSN><8-byte CC><4 byte NR><4 byte MAC>....
+     * So, it should wind up as
+     * 8 * 24 bytes.
+     *
+     * The returndata from the pm3 is on the following format
+     * <4 byte NR><4 byte MAC>
+     * CC are all zeroes, CSN is the same as was sent in
+     **/
     uint8_t tries = 0;
 
-    switch(simType) {
+    switch (simType) {
 
         case 2: {
             PrintAndLogEx(INFO, "Starting iCLASS sim 2 attack (elite mode)");
@@ -384,28 +406,29 @@ int CmdHFiClassSim(const char *Cmd) {
             clearCommandBuffer();
             SendCommand(&c);
 
-            while ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
+            while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
                 tries++;
                 if (ukbhit()) {
-                    int gc = getchar(); (void)gc;
+                    int gc = getchar();
+                    (void)gc;
                     PrintAndLogEx(WARNING, "\naborted via keyboard.");
                     return 0;
                 }
-                if ( tries > 20) {
+                if (tries > 20) {
                     PrintAndLogEx(WARNING, "\ntimeout while waiting for reply.");
                     return 0;
                 }
             }
             uint8_t num_mac  = resp.arg[1];
-            bool success = ( NUM_CSNS == num_mac );
-            PrintAndLogEx(NORMAL, "[%c] %d out of %d MAC obtained [%s]", (success) ? '+':'!', num_mac, NUM_CSNS, (success) ? "OK" : "FAIL");
+            bool success = (NUM_CSNS == num_mac);
+            PrintAndLogEx(NORMAL, "[%c] %d out of %d MAC obtained [%s]", (success) ? '+' : '!', num_mac, NUM_CSNS, (success) ? "OK" : "FAIL");
 
-            if ( num_mac == 0 )
+            if (num_mac == 0)
                 break;
 
             size_t datalen = NUM_CSNS * 24;
-            void* dump = calloc(datalen, sizeof(uint8_t));
-            if ( !dump ) {
+            void *dump = calloc(datalen, sizeof(uint8_t));
+            if (!dump) {
                 PrintAndLogEx(WARNING, "Failed to allocate memory");
                 return 2;
             }
@@ -415,11 +438,11 @@ int CmdHFiClassSim(const char *Cmd) {
             uint8_t i = 0;
             for (i = 0 ; i < NUM_CSNS ; i++) {
                 //copy CSN
-                memcpy(dump + i*24, csns + i*8, 8);
+                memcpy(dump + i * 24, csns + i * 8, 8);
                 //copy epurse
-                memcpy(dump + i*24 + 8, resp.d.asBytes + i*16, 8);
+                memcpy(dump + i * 24 + 8, resp.d.asBytes + i * 16, 8);
                 // NR_MAC (eight bytes from the response)  ( 8b csn + 8b epurse == 16)
-                memcpy(dump + i*24 + 16, resp.d.asBytes + i*16 + 8, 8);
+                memcpy(dump + i * 24 + 16, resp.d.asBytes + i * 16 + 8, 8);
             }
             /** Now, save to dumpfile **/
             saveFile("iclass_mac_attack", "bin", dump, datalen);
@@ -432,48 +455,49 @@ int CmdHFiClassSim(const char *Cmd) {
             PrintAndLogEx(INFO, "press keyboard to cancel");
             UsbCommand c = {CMD_SIMULATE_TAG_ICLASS, {simType, NUM_CSNS}};
             UsbCommand resp = {0};
-            memcpy(c.d.asBytes, csns, 8*NUM_CSNS);
+            memcpy(c.d.asBytes, csns, 8 * NUM_CSNS);
             clearCommandBuffer();
             SendCommand(&c);
 
-            while ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
+            while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
                 tries++;
                 if (ukbhit()) {
-                    int gc = getchar(); (void)gc;
+                    int gc = getchar();
+                    (void)gc;
                     PrintAndLogEx(WARNING, "\naborted via keyboard.");
                     return 0;
                 }
-                if ( tries > 20) {
+                if (tries > 20) {
                     PrintAndLogEx(WARNING, "\ntimeout while waiting for reply.");
                     return 0;
                 }
             }
             uint8_t num_mac = resp.arg[1];
-            bool success = ( (NUM_CSNS * 2) == num_mac );
-            PrintAndLogEx(NORMAL, "[%c] %d out of %d MAC obtained [%s]", (success) ? '+':'!', num_mac, NUM_CSNS*2, (success) ? "OK" : "FAIL");
+            bool success = ((NUM_CSNS * 2) == num_mac);
+            PrintAndLogEx(NORMAL, "[%c] %d out of %d MAC obtained [%s]", (success) ? '+' : '!', num_mac, NUM_CSNS * 2, (success) ? "OK" : "FAIL");
 
-            if ( num_mac == 0 )
+            if (num_mac == 0)
                 break;
 
             size_t datalen = NUM_CSNS * 24;
-            void* dump = calloc(datalen, sizeof(uint8_t));
-            if ( !dump ) {
+            void *dump = calloc(datalen, sizeof(uint8_t));
+            if (!dump) {
                 PrintAndLogEx(WARNING, "Failed to allocate memory");
                 return 2;
             }
 
-            #define MAC_ITEM_SIZE 24
+#define MAC_ITEM_SIZE 24
 
             //KEYROLL 1
             //Need zeroes for the CC-field
             memset(dump, 0, datalen);
             for (uint8_t i = 0; i < NUM_CSNS ; i++) {
                 // copy CSN
-                memcpy(dump + i*MAC_ITEM_SIZE, csns + i*8, 8); //CSN
+                memcpy(dump + i * MAC_ITEM_SIZE, csns + i * 8, 8); //CSN
                 // copy EPURSE
-                memcpy(dump + i*MAC_ITEM_SIZE + 8, resp.d.asBytes + i * 16, 8);
+                memcpy(dump + i * MAC_ITEM_SIZE + 8, resp.d.asBytes + i * 16, 8);
                 // copy NR_MAC (eight bytes from the response)  ( 8b csn + 8b epurse == 16)
-                memcpy(dump + i*MAC_ITEM_SIZE + 16, resp.d.asBytes + i * 16 + 8, 8);
+                memcpy(dump + i * MAC_ITEM_SIZE + 16, resp.d.asBytes + i * 16 + 8, 8);
             }
             saveFile("iclass_mac_attack_keyroll_A", "bin", dump, datalen);
 
@@ -481,13 +505,13 @@ int CmdHFiClassSim(const char *Cmd) {
             memset(dump, 0, datalen);
             uint8_t resp_index = 0;
             for (uint8_t i = 0; i < NUM_CSNS; i++) {
-                resp_index =  (i + NUM_CSNS) * 16;
+                resp_index = (i + NUM_CSNS) * 16;
                 // Copy CSN
-                memcpy(dump + i*MAC_ITEM_SIZE, csns + i*8, 8);
+                memcpy(dump + i * MAC_ITEM_SIZE, csns + i * 8, 8);
                 // copy EPURSE
-                memcpy(dump + i*MAC_ITEM_SIZE + 8, resp.d.asBytes + resp_index, 8);
+                memcpy(dump + i * MAC_ITEM_SIZE + 8, resp.d.asBytes + resp_index, 8);
                 // copy NR_MAC (eight bytes from the response)  ( 8b csn + 8 epurse == 16)
-                memcpy(dump + i*MAC_ITEM_SIZE + 16, resp.d.asBytes + resp_index + 8, 8);
+                memcpy(dump + i * MAC_ITEM_SIZE + 16, resp.d.asBytes + resp_index + 8, 8);
                 resp_index++;
             }
             saveFile("iclass_mac_attack_keyroll_B", "bin", dump, datalen);
@@ -507,27 +531,28 @@ int CmdHFiClassSim(const char *Cmd) {
     return 0;
 }
 
-int HFiClassReader(const char *Cmd, bool loop, bool verbose) {
+int HFiClassReader(const char *Cmd, bool loop, bool verbose)
+{
     bool tagFound = false;
 
     uint32_t flags = FLAG_ICLASS_READER_CSN | FLAG_ICLASS_READER_CC |  FLAG_ICLASS_READER_AIA |
-                    FLAG_ICLASS_READER_CONF | FLAG_ICLASS_READER_ONLY_ONCE |
-                    FLAG_ICLASS_READER_ONE_TRY;
+                     FLAG_ICLASS_READER_CONF | FLAG_ICLASS_READER_ONLY_ONCE |
+                     FLAG_ICLASS_READER_ONE_TRY;
 
     UsbCommand c = {CMD_READER_ICLASS, {flags, 0, 0}};
     // loop in client not device - else on windows have a communication error
     UsbCommand resp;
-    while (!ukbhit()){
+    while (!ukbhit()) {
 
         clearCommandBuffer();
         SendCommand(&c);
-        if (WaitForResponseTimeout(CMD_ACK,&resp, 4500)) {
+        if (WaitForResponseTimeout(CMD_ACK, &resp, 4500)) {
             uint8_t readStatus = resp.arg[0] & 0xff;
             uint8_t *data = resp.d.asBytes;
 
             if (verbose) PrintAndLogEx(NORMAL, "Readstatus:%02x", readStatus);
             // no tag found or button pressed
-            if ( (readStatus == 0 && !loop) || readStatus == 0xFF) {
+            if ((readStatus == 0 && !loop) || readStatus == 0xFF) {
                 // abort
                 if (verbose) {
                     PrintAndLogEx(FAILED, "Quitting...");
@@ -535,25 +560,25 @@ int HFiClassReader(const char *Cmd, bool loop, bool verbose) {
                     return 0;
                 }
             }
-            if( readStatus & FLAG_ICLASS_READER_CSN){
+            if (readStatus & FLAG_ICLASS_READER_CSN) {
                 PrintAndLogEx(NORMAL, "   CSN: %s", sprint_hex(data, 8));
                 tagFound = true;
             }
             if (readStatus & FLAG_ICLASS_READER_CC) {
-                PrintAndLogEx(NORMAL, "    CC: %s", sprint_hex(data+16, 8));
+                PrintAndLogEx(NORMAL, "    CC: %s", sprint_hex(data + 16, 8));
             }
             if (readStatus & FLAG_ICLASS_READER_CONF) {
                 printIclassDumpInfo(data);
             }
             if (readStatus & FLAG_ICLASS_READER_AIA) {
-                bool legacy = ( memcmp( (uint8_t *)(data + 8*5), "\xff\xff\xff\xff\xff\xff\xff\xff", 8) == 0 );
+                bool legacy = (memcmp((uint8_t *)(data + 8 * 5), "\xff\xff\xff\xff\xff\xff\xff\xff", 8) == 0);
 
-                bool se_enabled = ( memcmp( (uint8_t *)(data + 8*5), "\xff\xff\xff\x00\x06\xff\xff\xff", 8) == 0 );
+                bool se_enabled = (memcmp((uint8_t *)(data + 8 * 5), "\xff\xff\xff\x00\x06\xff\xff\xff", 8) == 0);
 
-                PrintAndLogEx(NORMAL, " App IA: %s", sprint_hex(data+8*5, 8));
-                if ( legacy )
+                PrintAndLogEx(NORMAL, " App IA: %s", sprint_hex(data + 8 * 5, 8));
+                if (legacy)
                     PrintAndLogEx(SUCCESS, "      : Possible iClass (legacy credential tag)");
-                else if( se_enabled )
+                else if (se_enabled)
                     PrintAndLogEx(SUCCESS, "      : Possible iClass (SE credential tag)");
                 else
                     PrintAndLogEx(WARNING, "      : Possible iClass (NOT legacy tag)");
@@ -573,17 +598,19 @@ int HFiClassReader(const char *Cmd, bool loop, bool verbose) {
     return 0;
 }
 
-int CmdHFiClassReader(const char *Cmd) {
+int CmdHFiClassReader(const char *Cmd)
+{
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_hf_iclass_reader();
     bool findone = (cmdp == '1') ? false : true;
     return HFiClassReader(Cmd, findone, true);
 }
 
-int CmdHFiClassReader_Replay(const char *Cmd) {
+int CmdHFiClassReader_Replay(const char *Cmd)
+{
 
     char cmdp = tolower(param_getchar(Cmd, 0));
-    if (strlen(Cmd)<1 || cmdp == 'h') return usage_hf_iclass_replay();
+    if (strlen(Cmd) < 1 || cmdp == 'h') return usage_hf_iclass_replay();
 
     uint8_t readerType = 0;
     uint8_t MAC[4] = {0x00, 0x00, 0x00, 0x00};
@@ -600,7 +627,8 @@ int CmdHFiClassReader_Replay(const char *Cmd) {
     return 0;
 }
 
-int iclassEmlSetMem(uint8_t *data, int blockNum, int blocksCount) {
+int iclassEmlSetMem(uint8_t *data, int blockNum, int blocksCount)
+{
     UsbCommand c = {CMD_MIFARE_EML_MEMSET, {blockNum, blocksCount, 0}};
     memcpy(c.d.asBytes, data, blocksCount * 16);
     clearCommandBuffer();
@@ -608,24 +636,25 @@ int iclassEmlSetMem(uint8_t *data, int blockNum, int blocksCount) {
     return 0;
 }
 
-int CmdHFiClassELoad(const char *Cmd) {
+int CmdHFiClassELoad(const char *Cmd)
+{
 
     char ctmp = tolower(param_getchar(Cmd, 0));
-    if (strlen(Cmd)< 1 || ctmp == 'h') return usage_hf_iclass_eload();
+    if (strlen(Cmd) < 1 || ctmp == 'h') return usage_hf_iclass_eload();
 
-    if ( ctmp != 'f' ) return usage_hf_iclass_eload();
+    if (ctmp != 'f') return usage_hf_iclass_eload();
 
     //File handling and reading
     char filename[FILE_PATH_SIZE];
 
-    if ( param_getstr(Cmd, 1, filename, FILE_PATH_SIZE) >= FILE_PATH_SIZE ) {
+    if (param_getstr(Cmd, 1, filename, FILE_PATH_SIZE) >= FILE_PATH_SIZE) {
         PrintAndLogEx(FAILED, "Filename too long");
         return 1;
     }
 
     FILE *f = fopen(filename, "rb");
-    if ( !f ){
-        PrintAndLogEx(FAILED, "File: " _YELLOW_(%s) ": not found or locked.", filename);
+    if (!f) {
+        PrintAndLogEx(FAILED, "File: " _YELLOW_( % s) ": not found or locked.", filename);
         return 1;
     }
 
@@ -654,7 +683,7 @@ int CmdHFiClassELoad(const char *Cmd) {
     //Validate
 
     if (bytes_read < fsize) {
-        PrintAndLogDevice(WARNING, "error, could only read %d bytes (should be %d)", bytes_read, fsize );
+        PrintAndLogDevice(WARNING, "error, could only read %d bytes (should be %d)", bytes_read, fsize);
         free(dump);
         return 1;
     }
@@ -662,7 +691,7 @@ int CmdHFiClassELoad(const char *Cmd) {
     uint32_t bytes_sent = 0;
     uint32_t bytes_remaining  = bytes_read;
 
-    while (bytes_remaining > 0){
+    while (bytes_remaining > 0) {
         uint32_t bytes_in_packet = MIN(USB_CMD_DATA_SIZE, bytes_remaining);
         UsbCommand c = {CMD_ICLASS_EML_MEMSET, {bytes_sent, bytes_in_packet, 0}};
         memcpy(c.d.asBytes, dump + bytes_sent, bytes_in_packet);
@@ -676,7 +705,8 @@ int CmdHFiClassELoad(const char *Cmd) {
     return 0;
 }
 
-static int readKeyfile(const char *filename, size_t len, uint8_t* buffer) {
+static int readKeyfile(const char *filename, size_t len, uint8_t *buffer)
+{
     FILE *f = fopen(filename, "rb");
     if (!f) {
         PrintAndLogEx(WARNING, "Failed to read from file '%s'", filename);
@@ -694,16 +724,17 @@ static int readKeyfile(const char *filename, size_t len, uint8_t* buffer) {
     }
 
     if (bytes_read != len) {
-        PrintAndLogEx(WARNING, "Warning, could only read %d bytes, expected %d" ,bytes_read, len);
+        PrintAndLogEx(WARNING, "Warning, could only read %d bytes, expected %d", bytes_read, len);
         return 1;
     }
     return 0;
 }
 
-int CmdHFiClassDecrypt(const char *Cmd) {
+int CmdHFiClassDecrypt(const char *Cmd)
+{
 
     char opt = tolower(param_getchar(Cmd, 0));
-    if (strlen(Cmd)<1 || opt == 'h') return usage_hf_iclass_decrypt();
+    if (strlen(Cmd) < 1 || opt == 'h') return usage_hf_iclass_decrypt();
 
     uint8_t key[16] = { 0 };
     if (readKeyfile("iclass_decryptionkey.bin", 16, key)) return usage_hf_iclass_decrypt();
@@ -713,7 +744,7 @@ int CmdHFiClassDecrypt(const char *Cmd) {
     //Open the tagdump-file
     FILE *f;
     char filename[FILE_PATH_SIZE];
-    if(opt == 'f' && param_getstr(Cmd, 1, filename, sizeof(filename)) > 0) {
+    if (opt == 'f' && param_getstr(Cmd, 1, filename, sizeof(filename)) > 0) {
         f = fopen(filename, "rb");
         if (!f) {
             PrintAndLogEx(WARNING, "could not find file %s", filename);
@@ -727,14 +758,14 @@ int CmdHFiClassDecrypt(const char *Cmd) {
     long fsize = ftell(f);
     fseek(f, 0, SEEK_SET);
 
-    if ( fsize < 0 ) {
+    if (fsize < 0) {
         PrintAndLogEx(WARNING, "error, when getting filesize");
         fclose(f);
         return 2;
     }
 
     uint8_t *decrypted = calloc(fsize, sizeof(uint8_t));
-    if ( !decrypted ) {
+    if (!decrypted) {
         PrintAndLogEx(WARNING, "Failed to allocate memory");
         fclose(f);
         return 1;
@@ -742,7 +773,7 @@ int CmdHFiClassDecrypt(const char *Cmd) {
 
     size_t bytes_read = fread(decrypted, 1, fsize, f);
     fclose(f);
-    if ( bytes_read == 0) {
+    if (bytes_read == 0) {
         PrintAndLogEx(WARNING, "file reading error");
         free(decrypted);
         return 3;
@@ -761,33 +792,34 @@ int CmdHFiClassDecrypt(const char *Cmd) {
     //Use the first block (CSN) for filename
     char outfilename[FILE_PATH_SIZE] = {0};
     snprintf(outfilename, FILE_PATH_SIZE, "iclass_tagdump-%02x%02x%02x%02x%02x%02x%02x%02x-decrypted",
-             hdr->csn[0],hdr->csn[1],hdr->csn[2],hdr->csn[3],
-             hdr->csn[4],hdr->csn[5],hdr->csn[6],hdr->csn[7]);
+             hdr->csn[0], hdr->csn[1], hdr->csn[2], hdr->csn[3],
+             hdr->csn[4], hdr->csn[5], hdr->csn[6], hdr->csn[7]);
 
     // tripledes
     mbedtls_des3_context ctx;
-    mbedtls_des3_set2key_dec( &ctx, key);
+    mbedtls_des3_set2key_dec(&ctx, key);
 
     uint8_t enc_dump[8] = {0};
-    uint8_t empty[8] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};
-    for(uint16_t blocknum=0; blocknum < applimit; ++blocknum) {
+    uint8_t empty[8] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
+    for (uint16_t blocknum = 0; blocknum < applimit; ++blocknum) {
 
-        uint8_t idx = blocknum*8;
+        uint8_t idx = blocknum * 8;
         memcpy(enc_dump, decrypted + idx, 8);
 
         // block 7 or higher,  and not empty 0xFF
-        if(blocknum > 6 &&  memcmp(enc_dump, empty, 8) != 0 ) {
-            mbedtls_des3_crypt_ecb(&ctx, enc_dump, decrypted + idx );
+        if (blocknum > 6 &&  memcmp(enc_dump, empty, 8) != 0) {
+            mbedtls_des3_crypt_ecb(&ctx, enc_dump, decrypted + idx);
         }
     }
 
     saveFile(outfilename, "bin", decrypted, fsize);
     free(decrypted);
-    printIclassDumpContents(decrypted, 1, (fsize/8), fsize);
+    printIclassDumpContents(decrypted, 1, (fsize / 8), fsize);
     return 0;
 }
 
-static int iClassEncryptBlkData(uint8_t *blkData) {
+static int iClassEncryptBlkData(uint8_t *blkData)
+{
     uint8_t key[16] = { 0 };
     if (readKeyfile("iclass_decryptionkey.bin", 16, key)) {
         usage_hf_iclass_encrypt();
@@ -797,17 +829,18 @@ static int iClassEncryptBlkData(uint8_t *blkData) {
     uint8_t encryptedData[16];
     uint8_t *encrypted = encryptedData;
     mbedtls_des3_context ctx;
-    mbedtls_des3_set2key_enc( &ctx, key);
+    mbedtls_des3_set2key_enc(&ctx, key);
 
-    mbedtls_des3_crypt_ecb(&ctx, blkData,encrypted);
-    memcpy(blkData,encrypted,8);
+    mbedtls_des3_crypt_ecb(&ctx, blkData, encrypted);
+    memcpy(blkData, encrypted, 8);
     return 1;
 }
 
-int CmdHFiClassEncryptBlk(const char *Cmd) {
+int CmdHFiClassEncryptBlk(const char *Cmd)
+{
     uint8_t blkData[8] = {0};
     char opt = tolower(param_getchar(Cmd, 0));
-    if (strlen(Cmd)<1 || opt == 'h') return usage_hf_iclass_encrypt();
+    if (strlen(Cmd) < 1 || opt == 'h') return usage_hf_iclass_encrypt();
 
     //get the bytes to encrypt
     if (param_gethex(Cmd, 0, blkData, 16)) {
@@ -820,14 +853,16 @@ int CmdHFiClassEncryptBlk(const char *Cmd) {
     return 1;
 }
 
-void Calc_wb_mac(uint8_t blockno, uint8_t *data, uint8_t *div_key, uint8_t MAC[4]) {
+void Calc_wb_mac(uint8_t blockno, uint8_t *data, uint8_t *div_key, uint8_t MAC[4])
+{
     uint8_t wb[9];
     wb[0] = blockno;
-    memcpy(wb + 1,data,8);
+    memcpy(wb + 1, data, 8);
     doMAC_N(wb, sizeof(wb), div_key, MAC);
 }
 
-static bool select_only(uint8_t *CSN, uint8_t *CCNR, bool use_credit_key, bool verbose) {
+static bool select_only(uint8_t *CSN, uint8_t *CCNR, bool use_credit_key, bool verbose)
+{
     UsbCommand resp;
     UsbCommand c = {CMD_READER_ICLASS, {0}};
     c.arg[0] = FLAG_ICLASS_READER_ONLY_ONCE | FLAG_ICLASS_READER_CC | FLAG_ICLASS_READER_ONE_TRY;
@@ -848,23 +883,24 @@ static bool select_only(uint8_t *CSN, uint8_t *CCNR, bool use_credit_key, bool v
     memcpy(CSN, data, 8);
 
     if (CCNR != NULL)
-        memcpy(CCNR, data+16, 8);
+        memcpy(CCNR, data + 16, 8);
 
     if (isOK > 0 && verbose) {
         PrintAndLogEx(SUCCESS, "CSN  | %s", sprint_hex(CSN, 8));
         PrintAndLogEx(SUCCESS, "CCNR | %s", sprint_hex(CCNR, 8));
     }
 
-    if (isOK <= 1){
+    if (isOK <= 1) {
         PrintAndLogEx(FAILED, "failed to obtain CC! Tag-select is aborting...  (%d)", isOK);
         return false;
     }
     return true;
 }
 
-static bool select_and_auth(uint8_t *KEY, uint8_t *MAC, uint8_t *div_key, bool use_credit_key, bool elite, bool rawkey, bool verbose) {
-    uint8_t CSN[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-    uint8_t CCNR[12] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+static bool select_and_auth(uint8_t *KEY, uint8_t *MAC, uint8_t *div_key, bool use_credit_key, bool elite, bool rawkey, bool verbose)
+{
+    uint8_t CSN[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+    uint8_t CCNR[12] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
     if (!select_only(CSN, CCNR, use_credit_key, verbose)) {
         if (verbose) PrintAndLogEx(FAILED, "selecting tag failed");
@@ -876,11 +912,11 @@ static bool select_and_auth(uint8_t *KEY, uint8_t *MAC, uint8_t *div_key, bool u
     else
         HFiClassCalcDivKey(CSN, KEY, div_key, elite);
 
-    if (verbose) PrintAndLogEx(SUCCESS, "authing with %s: %s", rawkey ? "raw key" : "diversified key", sprint_hex(div_key, 8) );
+    if (verbose) PrintAndLogEx(SUCCESS, "authing with %s: %s", rawkey ? "raw key" : "diversified key", sprint_hex(div_key, 8));
 
     doMAC(CCNR, div_key, MAC);
     UsbCommand resp;
-    UsbCommand d = {CMD_ICLASS_AUTHENTICATION, {0,0,0}};
+    UsbCommand d = {CMD_ICLASS_AUTHENTICATION, {0, 0, 0}};
     memcpy(d.d.asBytes, MAC, 4);
     clearCommandBuffer();
     SendCommand(&d);
@@ -896,18 +932,19 @@ static bool select_and_auth(uint8_t *KEY, uint8_t *MAC, uint8_t *div_key, bool u
     return true;
 }
 
-int CmdHFiClassReader_Dump(const char *Cmd) {
+int CmdHFiClassReader_Dump(const char *Cmd)
+{
 
-    uint8_t MAC[4] = {0x00,0x00,0x00,0x00};
-    uint8_t div_key[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-    uint8_t c_div_key[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+    uint8_t MAC[4] = {0x00, 0x00, 0x00, 0x00};
+    uint8_t div_key[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+    uint8_t c_div_key[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
     uint8_t blockno = 0;
     uint8_t numblks = 0;
     uint8_t maxBlk = 31;
     uint8_t app_areas = 1;
     uint8_t kb = 2;
-    uint8_t KEY[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-    uint8_t CreditKEY[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+    uint8_t KEY[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+    uint8_t CreditKEY[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
     uint8_t keyNbr = 0;
     uint8_t dataLen = 0;
     uint8_t fileNameLen = 0;
@@ -924,70 +961,70 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
 
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
-        case 'h':
-            return usage_hf_iclass_dump();
-        case 'c':
-            have_credit_key = true;
-            dataLen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
-            if (dataLen == 16) {
-                errors = param_gethex(tempStr, 0, CreditKEY, dataLen);
-            } else if (dataLen == 1) {
-                keyNbr = param_get8(Cmd, cmdp+1);
-                if (keyNbr < ICLASS_KEYS_MAX) {
-                    memcpy(CreditKEY, iClass_Key_Table[keyNbr], 8);
+            case 'h':
+                return usage_hf_iclass_dump();
+            case 'c':
+                have_credit_key = true;
+                dataLen = param_getstr(Cmd, cmdp + 1, tempStr, sizeof(tempStr));
+                if (dataLen == 16) {
+                    errors = param_gethex(tempStr, 0, CreditKEY, dataLen);
+                } else if (dataLen == 1) {
+                    keyNbr = param_get8(Cmd, cmdp + 1);
+                    if (keyNbr < ICLASS_KEYS_MAX) {
+                        memcpy(CreditKEY, iClass_Key_Table[keyNbr], 8);
+                    } else {
+                        PrintAndLogEx(WARNING, "\nERROR: Credit KeyNbr is invalid\n");
+                        errors = true;
+                    }
                 } else {
-                    PrintAndLogEx(WARNING, "\nERROR: Credit KeyNbr is invalid\n");
+                    PrintAndLogEx(WARNING, "\nERROR: Credit Key is incorrect length\n");
                     errors = true;
                 }
-            } else {
-                PrintAndLogEx(WARNING, "\nERROR: Credit Key is incorrect length\n");
-                errors = true;
-            }
-            cmdp += 2;
-            break;
-        case 'e':
-            elite = true;
-            cmdp++;
-            break;
-        case 'f':
-            fileNameLen = param_getstr(Cmd, cmdp+1, filename, sizeof(filename));
-            if (fileNameLen < 1) {
-                PrintAndLogEx(WARNING, "no filename found after f");
-                errors = true;
-            }
-            cmdp += 2;
-            break;
-        case 'k':
-            have_debit_key = true;
-            dataLen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
-            if (dataLen == 16) {
-                errors = param_gethex(tempStr, 0, KEY, dataLen);
-            } else if (dataLen == 1) {
-                keyNbr = param_get8(Cmd, cmdp+1);
-                if (keyNbr < ICLASS_KEYS_MAX) {
-                    memcpy(KEY, iClass_Key_Table[keyNbr], 8);
-                } else {
-                    PrintAndLogEx(WARNING, "\nERROR: Credit KeyNbr is invalid\n");
+                cmdp += 2;
+                break;
+            case 'e':
+                elite = true;
+                cmdp++;
+                break;
+            case 'f':
+                fileNameLen = param_getstr(Cmd, cmdp + 1, filename, sizeof(filename));
+                if (fileNameLen < 1) {
+                    PrintAndLogEx(WARNING, "no filename found after f");
                     errors = true;
                 }
-            } else {
-                PrintAndLogEx(WARNING, "\nERROR: Credit Key is incorrect length\n");
+                cmdp += 2;
+                break;
+            case 'k':
+                have_debit_key = true;
+                dataLen = param_getstr(Cmd, cmdp + 1, tempStr, sizeof(tempStr));
+                if (dataLen == 16) {
+                    errors = param_gethex(tempStr, 0, KEY, dataLen);
+                } else if (dataLen == 1) {
+                    keyNbr = param_get8(Cmd, cmdp + 1);
+                    if (keyNbr < ICLASS_KEYS_MAX) {
+                        memcpy(KEY, iClass_Key_Table[keyNbr], 8);
+                    } else {
+                        PrintAndLogEx(WARNING, "\nERROR: Credit KeyNbr is invalid\n");
+                        errors = true;
+                    }
+                } else {
+                    PrintAndLogEx(WARNING, "\nERROR: Credit Key is incorrect length\n");
+                    errors = true;
+                }
+                cmdp += 2;
+                break;
+            case 'r':
+                rawkey = true;
+                cmdp++;
+                break;
+            case 'v':
+                verbose = true;
+                cmdp++;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
                 errors = true;
-            }
-            cmdp += 2;
-            break;
-        case 'r':
-            rawkey = true;
-            cmdp++;
-            break;
-        case 'v':
-            verbose = true;
-            cmdp++;
-            break;
-        default:
-            PrintAndLogEx(WARNING, "Unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
-            errors = true;
-            break;
+                break;
         }
     }
     if (errors || cmdp < 2) return usage_hf_iclass_dump();
@@ -996,13 +1033,13 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
     if (!have_debit_key && have_credit_key) use_credit_key = true;
 
     uint32_t flags = FLAG_ICLASS_READER_CSN | FLAG_ICLASS_READER_CC |
-                    FLAG_ICLASS_READER_CONF | FLAG_ICLASS_READER_ONLY_ONCE |
-                    FLAG_ICLASS_READER_ONE_TRY;
+                     FLAG_ICLASS_READER_CONF | FLAG_ICLASS_READER_ONLY_ONCE |
+                     FLAG_ICLASS_READER_ONE_TRY;
 
     //get config and first 3 blocks
     UsbCommand c = {CMD_READER_ICLASS, {flags, 0, 0}};
     UsbCommand resp;
-    uint8_t tag_data[255*8];
+    uint8_t tag_data[255 * 8];
 
     clearCommandBuffer();
     SendCommand(&c);
@@ -1016,13 +1053,13 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
     uint8_t readStatus = resp.arg[0] & 0xff;
     uint8_t *data  = resp.d.asBytes;
 
-    if (readStatus == 0){
+    if (readStatus == 0) {
         PrintAndLogEx(FAILED, "no tag found");
         return 0;
     }
 
-    if( readStatus & (FLAG_ICLASS_READER_CSN | FLAG_ICLASS_READER_CONF | FLAG_ICLASS_READER_CC)){
-        memcpy(tag_data, data, 8*3);
+    if (readStatus & (FLAG_ICLASS_READER_CSN | FLAG_ICLASS_READER_CONF | FLAG_ICLASS_READER_CC)) {
+        memcpy(tag_data, data, 8 * 3);
         blockno += 2; // 2 to force re-read of block 2 later. (seems to respond differently..)
         numblks = data[8];
         getMemConfig(data[13], data[12], &maxBlk, &app_areas, &kb);
@@ -1031,10 +1068,10 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
     }
 
     // authenticate debit key and get div_key - later store in dump block 3
-    if (!select_and_auth(KEY, MAC, div_key, use_credit_key, elite, rawkey, verbose)){
+    if (!select_and_auth(KEY, MAC, div_key, use_credit_key, elite, rawkey, verbose)) {
         //try twice - for some reason it sometimes fails the first time...
         PrintAndLogEx(SUCCESS, "retry to select card");
-        if (!select_and_auth(KEY, MAC, div_key, use_credit_key, elite, rawkey, verbose)){
+        if (!select_and_auth(KEY, MAC, div_key, use_credit_key, elite, rawkey, verbose)) {
             PrintAndLogEx(WARNING, "failed authenticating with debit key");
             DropField();
             return 0;
@@ -1042,19 +1079,21 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
     }
 
     // begin dump
-    UsbCommand w = {CMD_ICLASS_DUMP, {blockno, numblks-blockno+1}};
+    UsbCommand w = {CMD_ICLASS_DUMP, {blockno, numblks - blockno + 1}};
     clearCommandBuffer();
     SendCommand(&w);
     while (true) {
-        printf("."); fflush(stdout);
+        printf(".");
+        fflush(stdout);
         if (ukbhit()) {
-            int gc = getchar(); (void)gc;
+            int gc = getchar();
+            (void)gc;
             PrintAndLogEx(WARNING, "\n[!] aborted via keyboard!\n");
             DropField();
             return 0;
         }
 
-        if (WaitForResponseTimeout(CMD_ACK, &resp, 2000) )
+        if (WaitForResponseTimeout(CMD_ACK, &resp, 2000))
             break;
     }
     // dump cmd switch off at device when finised.
@@ -1067,35 +1106,35 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
     }
 
     uint32_t startindex = resp.arg[2];
-    if (blocksRead*8 > sizeof(tag_data) - (blockno*8)) {
+    if (blocksRead * 8 > sizeof(tag_data) - (blockno * 8)) {
         PrintAndLogEx(FAILED, "data exceeded buffer size!");
-        blocksRead = (sizeof(tag_data)/8) - blockno;
+        blocksRead = (sizeof(tag_data) / 8) - blockno;
     }
 
     // response ok - now get bigbuf content of the dump
-    if ( !GetFromDevice(BIG_BUF, tag_data+(blockno*8), blocksRead*8, startindex, NULL, 2500, false) ) {
+    if (!GetFromDevice(BIG_BUF, tag_data + (blockno * 8), blocksRead * 8, startindex, NULL, 2500, false)) {
         PrintAndLogEx(WARNING, "command execution time out");
         return 0;
     }
 
-    size_t gotBytes = blocksRead*8 + blockno*8;
+    size_t gotBytes = blocksRead * 8 + blockno * 8;
 
     // try AA2
     if (have_credit_key) {
         //turn off hf field before authenticating with different key
         DropField();
-        memset(MAC,0,4);
+        memset(MAC, 0, 4);
         // AA2 authenticate credit key and git c_div_key - later store in dump block 4
-        if (!select_and_auth(CreditKEY, MAC, c_div_key, true, elite, rawkey, verbose)){
+        if (!select_and_auth(CreditKEY, MAC, c_div_key, true, elite, rawkey, verbose)) {
             //try twice - for some reason it sometimes fails the first time...
-            if (!select_and_auth(CreditKEY, MAC, c_div_key, true, elite, rawkey, verbose)){
+            if (!select_and_auth(CreditKEY, MAC, c_div_key, true, elite, rawkey, verbose)) {
                 PrintAndLogEx(WARNING, "failed authenticating with credit key");
                 DropField();
                 return 0;
             }
         }
         // do we still need to read more block?  (aa2 enabled?)
-        if (maxBlk > blockno+numblks+1) {
+        if (maxBlk > blockno + numblks + 1) {
             // setup dump and start
             w.arg[0] = blockno + blocksRead;
             w.arg[1] = maxBlk - (blockno + blocksRead);
@@ -1115,10 +1154,10 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
             startindex = resp.arg[2];
             if (blocksRead * 8 > sizeof(tag_data) - gotBytes) {
                 PrintAndLogEx(FAILED, "data exceeded buffer size!");
-                blocksRead = (sizeof(tag_data) - gotBytes)/8;
+                blocksRead = (sizeof(tag_data) - gotBytes) / 8;
             }
             // get dumped data from bigbuf
-            if ( !GetFromDevice(BIG_BUF, tag_data + gotBytes, blocksRead * 8, startindex, NULL, 2500, false)) {
+            if (!GetFromDevice(BIG_BUF, tag_data + gotBytes, blocksRead * 8, startindex, NULL, 2500, false)) {
                 PrintAndLogEx(WARNING, "command execution time out");
                 return 0;
             }
@@ -1130,35 +1169,36 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
     DropField();
 
     // add diversified keys to dump
-    if (have_debit_key) memcpy(tag_data+(3*8),div_key,8);
-    if (have_credit_key) memcpy(tag_data+(4*8),c_div_key,8);
+    if (have_debit_key) memcpy(tag_data + (3 * 8), div_key, 8);
+    if (have_credit_key) memcpy(tag_data + (4 * 8), c_div_key, 8);
 
     // print the dump
     PrintAndLogEx(NORMAL, "------+--+-------------------------+\n");
     PrintAndLogEx(NORMAL, "CSN   |00| %s|\n", sprint_hex(tag_data, 8));
-    printIclassDumpContents(tag_data, 1, (gotBytes/8), gotBytes);
+    printIclassDumpContents(tag_data, 1, (gotBytes / 8), gotBytes);
 
-    if (filename[0] == 0){
-        snprintf(filename, FILE_PATH_SIZE,"iclass_tagdump-%02x%02x%02x%02x%02x%02x%02x%02x",
-            tag_data[0],tag_data[1],tag_data[2],tag_data[3],
-            tag_data[4],tag_data[5],tag_data[6],tag_data[7]);
+    if (filename[0] == 0) {
+        snprintf(filename, FILE_PATH_SIZE, "iclass_tagdump-%02x%02x%02x%02x%02x%02x%02x%02x",
+                 tag_data[0], tag_data[1], tag_data[2], tag_data[3],
+                 tag_data[4], tag_data[5], tag_data[6], tag_data[7]);
     }
 
     // save the dump to .bin file
-    PrintAndLogEx(SUCCESS, "saving dump file - %d blocks read", gotBytes/8);
+    PrintAndLogEx(SUCCESS, "saving dump file - %d blocks read", gotBytes / 8);
     saveFile(filename, "bin", tag_data, gotBytes);
     return 1;
 }
 
-static int WriteBlock(uint8_t blockno, uint8_t *bldata, uint8_t *KEY, bool use_credit_key, bool elite, bool rawkey, bool verbose) {
-    uint8_t MAC[4] = {0x00,0x00,0x00,0x00};
-    uint8_t div_key[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+static int WriteBlock(uint8_t blockno, uint8_t *bldata, uint8_t *KEY, bool use_credit_key, bool elite, bool rawkey, bool verbose)
+{
+    uint8_t MAC[4] = {0x00, 0x00, 0x00, 0x00};
+    uint8_t div_key[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
     if (!select_and_auth(KEY, MAC, div_key, use_credit_key, elite, rawkey, verbose))
         return 0;
 
     UsbCommand resp;
 
-    Calc_wb_mac(blockno,bldata,div_key,MAC);
+    Calc_wb_mac(blockno, bldata, div_key, MAC);
     UsbCommand w = {CMD_ICLASS_WRITEBLOCK, {blockno}};
     memcpy(w.d.asBytes, bldata, 8);
     memcpy(w.d.asBytes + 8, MAC, 4);
@@ -1166,7 +1206,7 @@ static int WriteBlock(uint8_t blockno, uint8_t *bldata, uint8_t *KEY, bool use_c
     clearCommandBuffer();
     SendCommand(&w);
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 4500)) {
-        if ( verbose ) PrintAndLogEx(WARNING, "Write Command execute timeout");
+        if (verbose) PrintAndLogEx(WARNING, "Write Command execute timeout");
         return 0;
     }
     uint8_t isOK = resp.arg[0] & 0xff;
@@ -1177,10 +1217,11 @@ static int WriteBlock(uint8_t blockno, uint8_t *bldata, uint8_t *KEY, bool use_c
     return isOK;
 }
 
-int CmdHFiClass_WriteBlock(const char *Cmd) {
+int CmdHFiClass_WriteBlock(const char *Cmd)
+{
     uint8_t blockno = 0;
-    uint8_t bldata[8] = {0,0,0,0,0,0,0,0};
-    uint8_t KEY[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+    uint8_t bldata[8] = {0, 0, 0, 0, 0, 0, 0, 0};
+    uint8_t KEY[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
     uint8_t keyNbr = 0;
     uint8_t dataLen = 0;
     char tempStr[50] = {0};
@@ -1192,60 +1233,60 @@ int CmdHFiClass_WriteBlock(const char *Cmd) {
     uint8_t cmdp = 0;
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
-        case 'h':
-            return usage_hf_iclass_writeblock();
-        case 'b':
-            if (param_gethex(Cmd, cmdp+1, &blockno, 2)) {
-                PrintAndLogEx(WARNING, "Block No must include 2 HEX symbols\n");
-                errors = true;
-            }
-            cmdp += 2;
-            break;
-        case 'c':
-            use_credit_key = true;
-            cmdp++;
-            break;
-        case 'd':
-            if (param_gethex(Cmd, cmdp+1, bldata, 16)) {
-                PrintAndLogEx(WARNING, "Data must include 16 HEX symbols\n");
-                errors = true;
-            }
-            cmdp += 2;
-            break;
-        case 'e':
-            elite = true;
-            cmdp++;
-            break;
-        case 'k':
-            dataLen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
-            if (dataLen == 16) {
-                errors = param_gethex(tempStr, 0, KEY, dataLen);
-            } else if (dataLen == 1) {
-                keyNbr = param_get8(Cmd, cmdp+1);
-                if (keyNbr < ICLASS_KEYS_MAX) {
-                    memcpy(KEY, iClass_Key_Table[keyNbr], 8);
-                } else {
-                    PrintAndLogEx(WARNING, "\nERROR: Credit KeyNbr is invalid\n");
+            case 'h':
+                return usage_hf_iclass_writeblock();
+            case 'b':
+                if (param_gethex(Cmd, cmdp + 1, &blockno, 2)) {
+                    PrintAndLogEx(WARNING, "Block No must include 2 HEX symbols\n");
                     errors = true;
                 }
-            } else {
-                PrintAndLogEx(WARNING, "\nERROR: Credit Key is incorrect length\n");
+                cmdp += 2;
+                break;
+            case 'c':
+                use_credit_key = true;
+                cmdp++;
+                break;
+            case 'd':
+                if (param_gethex(Cmd, cmdp + 1, bldata, 16)) {
+                    PrintAndLogEx(WARNING, "Data must include 16 HEX symbols\n");
+                    errors = true;
+                }
+                cmdp += 2;
+                break;
+            case 'e':
+                elite = true;
+                cmdp++;
+                break;
+            case 'k':
+                dataLen = param_getstr(Cmd, cmdp + 1, tempStr, sizeof(tempStr));
+                if (dataLen == 16) {
+                    errors = param_gethex(tempStr, 0, KEY, dataLen);
+                } else if (dataLen == 1) {
+                    keyNbr = param_get8(Cmd, cmdp + 1);
+                    if (keyNbr < ICLASS_KEYS_MAX) {
+                        memcpy(KEY, iClass_Key_Table[keyNbr], 8);
+                    } else {
+                        PrintAndLogEx(WARNING, "\nERROR: Credit KeyNbr is invalid\n");
+                        errors = true;
+                    }
+                } else {
+                    PrintAndLogEx(WARNING, "\nERROR: Credit Key is incorrect length\n");
+                    errors = true;
+                }
+                cmdp += 2;
+                break;
+            case 'r':
+                rawkey = true;
+                cmdp++;
+                break;
+            case 'v':
+                verbose = true;
+                cmdp++;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
                 errors = true;
-            }
-            cmdp += 2;
-            break;
-        case 'r':
-            rawkey = true;
-            cmdp++;
-            break;
-        case 'v':
-            verbose = true;
-            cmdp++;
-            break;
-        default:
-            PrintAndLogEx(WARNING, "unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
-            errors = true;
-            break;
+                break;
         }
     }
     if (errors || cmdp < 6) return usage_hf_iclass_writeblock();
@@ -1255,10 +1296,11 @@ int CmdHFiClass_WriteBlock(const char *Cmd) {
     return ans;
 }
 
-int CmdHFiClassCloneTag(const char *Cmd) {
+int CmdHFiClassCloneTag(const char *Cmd)
+{
     char filename[FILE_PATH_SIZE] = { 0x00 };
     char tempStr[50] = {0};
-    uint8_t KEY[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+    uint8_t KEY[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
     uint8_t keyNbr = 0;
     uint8_t fileNameLen = 0;
     uint8_t startblock = 0;
@@ -1272,68 +1314,68 @@ int CmdHFiClassCloneTag(const char *Cmd) {
     uint8_t cmdp = 0;
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
-        case 'h':
-            return usage_hf_iclass_clone();
-        case 'b':
-            if (param_gethex(Cmd, cmdp+1, &startblock, 2)) {
-                PrintAndLogEx(WARNING, "start block No must include 2 HEX symbols\n");
-                errors = true;
-            }
-            cmdp += 2;
-            break;
-        case 'c':
-            use_credit_key = true;
-            cmdp++;
-            break;
-        case 'e':
-            elite = true;
-            cmdp++;
-            break;
-        case 'f':
-            fileNameLen = param_getstr(Cmd, cmdp+1, filename, sizeof(filename));
-            if (fileNameLen < 1) {
-                PrintAndLogEx(WARNING, "No filename found after f");
-                errors = true;
-            }
-            cmdp += 2;
-            break;
-        case 'k':
-            dataLen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
-            if (dataLen == 16) {
-                errors = param_gethex(tempStr, 0, KEY, dataLen);
-            } else if (dataLen == 1) {
-                keyNbr = param_get8(Cmd, cmdp+1);
-                if (keyNbr < ICLASS_KEYS_MAX) {
-                    memcpy(KEY, iClass_Key_Table[keyNbr], 8);
-                } else {
-                    PrintAndLogEx(WARNING, "\nERROR: Credit KeyNbr is invalid\n");
+            case 'h':
+                return usage_hf_iclass_clone();
+            case 'b':
+                if (param_gethex(Cmd, cmdp + 1, &startblock, 2)) {
+                    PrintAndLogEx(WARNING, "start block No must include 2 HEX symbols\n");
                     errors = true;
                 }
-            } else {
-                PrintAndLogEx(WARNING, "\nERROR: Credit Key is incorrect length\n");
+                cmdp += 2;
+                break;
+            case 'c':
+                use_credit_key = true;
+                cmdp++;
+                break;
+            case 'e':
+                elite = true;
+                cmdp++;
+                break;
+            case 'f':
+                fileNameLen = param_getstr(Cmd, cmdp + 1, filename, sizeof(filename));
+                if (fileNameLen < 1) {
+                    PrintAndLogEx(WARNING, "No filename found after f");
+                    errors = true;
+                }
+                cmdp += 2;
+                break;
+            case 'k':
+                dataLen = param_getstr(Cmd, cmdp + 1, tempStr, sizeof(tempStr));
+                if (dataLen == 16) {
+                    errors = param_gethex(tempStr, 0, KEY, dataLen);
+                } else if (dataLen == 1) {
+                    keyNbr = param_get8(Cmd, cmdp + 1);
+                    if (keyNbr < ICLASS_KEYS_MAX) {
+                        memcpy(KEY, iClass_Key_Table[keyNbr], 8);
+                    } else {
+                        PrintAndLogEx(WARNING, "\nERROR: Credit KeyNbr is invalid\n");
+                        errors = true;
+                    }
+                } else {
+                    PrintAndLogEx(WARNING, "\nERROR: Credit Key is incorrect length\n");
+                    errors = true;
+                }
+                cmdp += 2;
+                break;
+            case 'l':
+                if (param_gethex(Cmd, cmdp + 1, &endblock, 2)) {
+                    PrintAndLogEx(WARNING, "start Block No must include 2 HEX symbols\n");
+                    errors = true;
+                }
+                cmdp += 2;
+                break;
+            case 'r':
+                rawkey = true;
+                cmdp++;
+                break;
+            case 'v':
+                verbose = true;
+                cmdp++;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
                 errors = true;
-            }
-            cmdp += 2;
-            break;
-        case 'l':
-            if (param_gethex(Cmd, cmdp+1, &endblock, 2)) {
-                PrintAndLogEx(WARNING, "start Block No must include 2 HEX symbols\n");
-                errors = true;
-            }
-            cmdp += 2;
-            break;
-        case 'r':
-            rawkey = true;
-            cmdp++;
-            break;
-        case 'v':
-            verbose = true;
-            cmdp++;
-            break;
-        default:
-            PrintAndLogEx(WARNING, "unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
-            errors = true;
-            break;
+                break;
         }
     }
 
@@ -1341,14 +1383,14 @@ int CmdHFiClassCloneTag(const char *Cmd) {
 
     FILE *f;
 
-    iclass_block_t tag_data[USB_CMD_DATA_SIZE/12];
+    iclass_block_t tag_data[USB_CMD_DATA_SIZE / 12];
 
     if ((endblock - startblock + 1) * 12 > USB_CMD_DATA_SIZE) {
-        PrintAndLogEx(NORMAL, "Trying to write too many blocks at once.  Max: %d", USB_CMD_DATA_SIZE/8);
+        PrintAndLogEx(NORMAL, "Trying to write too many blocks at once.  Max: %d", USB_CMD_DATA_SIZE / 8);
     }
     // file handling and reading
     f = fopen(filename, "rb");
-    if(!f) {
+    if (!f) {
         PrintAndLogEx(WARNING, "failed to read file '%s'", filename);
         return 1;
     }
@@ -1363,39 +1405,39 @@ int CmdHFiClassCloneTag(const char *Cmd) {
     // then copy to usbcommand->asbytes; the max is 32 - 6 = 24 block 12 bytes each block 288 bytes then we can only accept to clone 21 blocks at the time,
     // else we have to create a share memory
     int i;
-    fseek(f, startblock*8, SEEK_SET);
-    size_t bytes_read = fread(tag_data, sizeof(iclass_block_t),endblock - startblock + 1, f);
-    if ( bytes_read == 0){
+    fseek(f, startblock * 8, SEEK_SET);
+    size_t bytes_read = fread(tag_data, sizeof(iclass_block_t), endblock - startblock + 1, f);
+    if (bytes_read == 0) {
         PrintAndLogEx(WARNING, "file reading error.");
         fclose(f);
         return 2;
     }
 
-    uint8_t MAC[4] = {0x00,0x00,0x00,0x00};
-    uint8_t div_key[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+    uint8_t MAC[4] = {0x00, 0x00, 0x00, 0x00};
+    uint8_t div_key[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
     if (!select_and_auth(KEY, MAC, div_key, use_credit_key, elite, rawkey, verbose))
         return 0;
 
-    UsbCommand w = {CMD_ICLASS_CLONE,{startblock,endblock}};
+    UsbCommand w = {CMD_ICLASS_CLONE, {startblock, endblock}};
     uint8_t *ptr;
     // calculate all mac for every the block we will write
-    for (i = startblock; i <= endblock; i++){
-        Calc_wb_mac(i,tag_data[i - startblock].d,div_key,MAC);
+    for (i = startblock; i <= endblock; i++) {
+        Calc_wb_mac(i, tag_data[i - startblock].d, div_key, MAC);
         // usb command d start pointer = d + (i - 6) * 12
         // memcpy(pointer,tag_data[i - 6],8) 8 bytes
         // memcpy(pointer + 8,mac,sizoof(mac) 4 bytes;
         // next one
         ptr = w.d.asBytes + (i - startblock) * 12;
         memcpy(ptr, &(tag_data[i - startblock].d[0]), 8);
-        memcpy(ptr + 8,MAC, 4);
+        memcpy(ptr + 8, MAC, 4);
     }
     uint8_t p[12];
-    for (i = 0; i <= endblock - startblock;i++){
-        memcpy(p,w.d.asBytes + (i * 12),12);
-        PrintAndLogEx(NORMAL, "Block |%02x|",i + startblock);
-        PrintAndLogEx(NORMAL, " %02x%02x%02x%02x%02x%02x%02x%02x |",p[0],p[1],p[2],p[3],p[4],p[5],p[6],p[7]);
-        PrintAndLogEx(NORMAL, " MAC |%02x%02x%02x%02x|\n",p[8],p[9],p[10],p[11]);
+    for (i = 0; i <= endblock - startblock; i++) {
+        memcpy(p, w.d.asBytes + (i * 12), 12);
+        PrintAndLogEx(NORMAL, "Block |%02x|", i + startblock);
+        PrintAndLogEx(NORMAL, " %02x%02x%02x%02x%02x%02x%02x%02x |", p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7]);
+        PrintAndLogEx(NORMAL, " MAC |%02x%02x%02x%02x|\n", p[8], p[9], p[10], p[11]);
     }
     UsbCommand resp;
     clearCommandBuffer();
@@ -1407,17 +1449,18 @@ int CmdHFiClassCloneTag(const char *Cmd) {
     return 1;
 }
 
-static int ReadBlock(uint8_t *KEY, uint8_t blockno, uint8_t keyType, bool elite, bool rawkey, bool verbose, bool auth) {
-    uint8_t MAC[4] = {0x00,0x00,0x00,0x00};
-    uint8_t div_key[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+static int ReadBlock(uint8_t *KEY, uint8_t blockno, uint8_t keyType, bool elite, bool rawkey, bool verbose, bool auth)
+{
+    uint8_t MAC[4] = {0x00, 0x00, 0x00, 0x00};
+    uint8_t div_key[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
     // block 0,1 should always be able to read,  and block 5 on some cards.
     if (auth || blockno >= 2) {
         if (!select_and_auth(KEY, MAC, div_key, (keyType == 0x18), elite, rawkey, verbose))
             return 0;
     } else {
-        uint8_t CSN[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-        uint8_t CCNR[12] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+        uint8_t CSN[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+        uint8_t CCNR[12] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
         if (!select_only(CSN, CCNR, (keyType == 0x18), verbose))
             return 0;
     }
@@ -1441,10 +1484,11 @@ static int ReadBlock(uint8_t *KEY, uint8_t blockno, uint8_t keyType, bool elite,
     return 1;
 }
 
-int CmdHFiClass_ReadBlock(const char *Cmd) {
+int CmdHFiClass_ReadBlock(const char *Cmd)
+{
     uint8_t blockno = 0;
     uint8_t keyType = 0x88; //debit key
-    uint8_t KEY[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+    uint8_t KEY[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
     uint8_t keyNbr = 0;
     uint8_t dataLen = 0;
     char tempStr[50] = {0};
@@ -1456,54 +1500,54 @@ int CmdHFiClass_ReadBlock(const char *Cmd) {
     uint8_t cmdp = 0;
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
-        case 'h':
-            return usage_hf_iclass_readblock();
-        case 'b':
-            if (param_gethex(Cmd, cmdp+1, &blockno, 2)) {
-                PrintAndLogEx(WARNING, "Block No must include 2 HEX symbols\n");
-                errors = true;
-            }
-            cmdp += 2;
-            break;
-        case 'c':
-            keyType = 0x18;
-            cmdp++;
-            break;
-        case 'e':
-            elite = true;
-            cmdp++;
-            break;
-        case 'k':
-            auth = true;
-            dataLen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
-            if (dataLen == 16) {
-                errors = param_gethex(tempStr, 0, KEY, dataLen);
-            } else if (dataLen == 1) {
-                keyNbr = param_get8(Cmd, cmdp+1);
-                if (keyNbr < ICLASS_KEYS_MAX) {
-                    memcpy(KEY, iClass_Key_Table[keyNbr], 8);
-                } else {
-                    PrintAndLogEx(WARNING, "\nERROR: Credit KeyNbr is invalid\n");
+            case 'h':
+                return usage_hf_iclass_readblock();
+            case 'b':
+                if (param_gethex(Cmd, cmdp + 1, &blockno, 2)) {
+                    PrintAndLogEx(WARNING, "Block No must include 2 HEX symbols\n");
                     errors = true;
                 }
-            } else {
-                PrintAndLogEx(WARNING, "\nERROR: Credit Key is incorrect length\n");
+                cmdp += 2;
+                break;
+            case 'c':
+                keyType = 0x18;
+                cmdp++;
+                break;
+            case 'e':
+                elite = true;
+                cmdp++;
+                break;
+            case 'k':
+                auth = true;
+                dataLen = param_getstr(Cmd, cmdp + 1, tempStr, sizeof(tempStr));
+                if (dataLen == 16) {
+                    errors = param_gethex(tempStr, 0, KEY, dataLen);
+                } else if (dataLen == 1) {
+                    keyNbr = param_get8(Cmd, cmdp + 1);
+                    if (keyNbr < ICLASS_KEYS_MAX) {
+                        memcpy(KEY, iClass_Key_Table[keyNbr], 8);
+                    } else {
+                        PrintAndLogEx(WARNING, "\nERROR: Credit KeyNbr is invalid\n");
+                        errors = true;
+                    }
+                } else {
+                    PrintAndLogEx(WARNING, "\nERROR: Credit Key is incorrect length\n");
+                    errors = true;
+                }
+                cmdp += 2;
+                break;
+            case 'r':
+                rawkey = true;
+                cmdp++;
+                break;
+            case 'v':
+                verbose = true;
+                cmdp++;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
                 errors = true;
-            }
-            cmdp += 2;
-            break;
-        case 'r':
-            rawkey = true;
-            cmdp++;
-            break;
-        case 'v':
-            verbose = true;
-            cmdp++;
-            break;
-        default:
-            PrintAndLogEx(WARNING, "unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
-            errors = true;
-            break;
+                break;
         }
     }
     if (errors || cmdp < 4) return usage_hf_iclass_readblock();
@@ -1513,10 +1557,11 @@ int CmdHFiClass_ReadBlock(const char *Cmd) {
     return ReadBlock(KEY, blockno, keyType, elite, rawkey, verbose, auth);
 }
 
-int CmdHFiClass_loclass(const char *Cmd) {
+int CmdHFiClass_loclass(const char *Cmd)
+{
     char opt = tolower(param_getchar(Cmd, 0));
 
-    if (strlen(Cmd)<1 || opt == 'h')
+    if (strlen(Cmd) < 1 || opt == 'h')
         usage_hf_iclass_loclass();
 
     char fileName[FILE_PATH_SIZE] = {0};
@@ -1527,8 +1572,7 @@ int CmdHFiClass_loclass(const char *Cmd) {
             PrintAndLogEx(WARNING, "You must specify a filename");
             return 0;
         }
-    }
-    else if (opt == 't') {
+    } else if (opt == 't') {
         int errors = testCipherUtils();
         errors += testMAC();
         errors += doKeyTests(0);
@@ -1539,9 +1583,10 @@ int CmdHFiClass_loclass(const char *Cmd) {
     return 0;
 }
 
-void printIclassDumpContents(uint8_t *iclass_dump, uint8_t startblock, uint8_t endblock, size_t filesize) {
+void printIclassDumpContents(uint8_t *iclass_dump, uint8_t startblock, uint8_t endblock, size_t filesize)
+{
     uint8_t mem_config;
-    memcpy(&mem_config, iclass_dump + 13,1);
+    memcpy(&mem_config, iclass_dump + 13, 1);
     uint8_t maxmemcount;
 
     uint8_t filemaxblock = filesize / 8;
@@ -1558,22 +1603,23 @@ void printIclassDumpContents(uint8_t *iclass_dump, uint8_t startblock, uint8_t e
         endblock = maxmemcount;
 
     // remember endblock needs to relate to zero-index arrays.
-    if (endblock > filemaxblock-1)
-        endblock = filemaxblock-1;
+    if (endblock > filemaxblock - 1)
+        endblock = filemaxblock - 1;
 
     //PrintAndLog ("startblock: %d, endblock: %d, filesize: %d, maxmemcount: %d, filemaxblock: %d",startblock, endblock,filesize, maxmemcount, filemaxblock);
 
     int i = startblock;
     PrintAndLogEx(NORMAL, "------+--+-------------------------+\n");
-    while (i <= endblock){
+    while (i <= endblock) {
         uint8_t *blk = iclass_dump + (i * 8);
-        PrintAndLogEx(NORMAL, "      |%02X| %s\n", i, sprint_hex_ascii(blk, 8) );
+        PrintAndLogEx(NORMAL, "      |%02X| %s\n", i, sprint_hex_ascii(blk, 8));
         i++;
     }
     PrintAndLogEx(NORMAL, "------+--+-------------------------+\n");
 }
 
-int CmdHFiClassReadTagFile(const char *Cmd) {
+int CmdHFiClassReadTagFile(const char *Cmd)
+{
     int startblock = 0;
     int endblock = 0;
     char tempnum[5];
@@ -1587,14 +1633,14 @@ int CmdHFiClassReadTagFile(const char *Cmd) {
     else
         sscanf(tempnum, "%d", &startblock);
 
-    if (param_getstr(Cmd,2, tempnum, sizeof(tempnum)) < 1)
+    if (param_getstr(Cmd, 2, tempnum, sizeof(tempnum)) < 1)
         endblock = 0;
     else
         sscanf(tempnum, "%d", &endblock);
 
     // file handling and reading
     f = fopen(filename, "rb");
-    if(!f) {
+    if (!f) {
         PrintAndLogEx(WARNING, "Failed to read from file '%s'", filename);
         return 1;
     }
@@ -1602,14 +1648,14 @@ int CmdHFiClassReadTagFile(const char *Cmd) {
     long fsize = ftell(f);
     fseek(f, 0, SEEK_SET);
 
-    if ( fsize < 0 ) {
+    if (fsize < 0) {
         PrintAndLogEx(WARNING, "Error, when getting filesize");
         fclose(f);
         return 1;
     }
 
     uint8_t *dump = calloc(fsize, sizeof(uint8_t));
-    if ( !dump ) {
+    if (!dump) {
         PrintAndLogEx(WARNING, "Failed to allocate memory");
         fclose(f);
         return 1;
@@ -1619,13 +1665,14 @@ int CmdHFiClassReadTagFile(const char *Cmd) {
 
     uint8_t *csn = dump;
     PrintAndLogEx(NORMAL, "------+--+-------------------------+\n");
-    PrintAndLogEx(NORMAL, "CSN   |00| %s|\n", sprint_hex(csn, 8) );
+    PrintAndLogEx(NORMAL, "CSN   |00| %s|\n", sprint_hex(csn, 8));
     printIclassDumpContents(dump, startblock, endblock, bytes_read);
     free(dump);
     return 0;
 }
 
-void HFiClassCalcDivKey(uint8_t *CSN, uint8_t *KEY, uint8_t *div_key, bool elite){
+void HFiClassCalcDivKey(uint8_t *CSN, uint8_t *KEY, uint8_t *div_key, bool elite)
+{
     uint8_t keytable[128] = {0};
     uint8_t key_index[8] = {0};
     if (elite) {
@@ -1633,7 +1680,7 @@ void HFiClassCalcDivKey(uint8_t *CSN, uint8_t *KEY, uint8_t *div_key, bool elite
         uint8_t key_sel_p[8] = { 0 };
         hash2(KEY, keytable);
         hash1(CSN, key_index);
-        for(uint8_t i = 0; i < 8 ; i++)
+        for (uint8_t i = 0; i < 8 ; i++)
             key_sel[i] = keytable[key_index[i]] & 0xFF;
 
         //Permute from iclass format to standard format
@@ -1647,30 +1694,32 @@ void HFiClassCalcDivKey(uint8_t *CSN, uint8_t *KEY, uint8_t *div_key, bool elite
 //when told CSN, oldkey, newkey, if new key is elite (elite), and if old key was elite (oldElite)
 //calculate and return xor_div_key (ready for a key write command)
 //print all div_keys if verbose
-static void HFiClassCalcNewKey(uint8_t *CSN, uint8_t *OLDKEY, uint8_t *NEWKEY, uint8_t *xor_div_key, bool elite, bool oldElite, bool verbose){
-    uint8_t old_div_key[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-    uint8_t new_div_key[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+static void HFiClassCalcNewKey(uint8_t *CSN, uint8_t *OLDKEY, uint8_t *NEWKEY, uint8_t *xor_div_key, bool elite, bool oldElite, bool verbose)
+{
+    uint8_t old_div_key[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+    uint8_t new_div_key[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
     //get old div key
     HFiClassCalcDivKey(CSN, OLDKEY, old_div_key, oldElite);
     //get new div key
     HFiClassCalcDivKey(CSN, NEWKEY, new_div_key, elite);
 
-    for (uint8_t i = 0; i < sizeof(old_div_key); i++){
+    for (uint8_t i = 0; i < sizeof(old_div_key); i++) {
         xor_div_key[i] = old_div_key[i] ^ new_div_key[i];
     }
     if (verbose) {
-        PrintAndLogEx(SUCCESS, "Old div key : %s\n",sprint_hex(old_div_key,8));
-        PrintAndLogEx(SUCCESS, "New div key : %s\n",sprint_hex(new_div_key,8));
-        PrintAndLogEx(SUCCESS, "Xor div key : %s\n",sprint_hex(xor_div_key,8));
+        PrintAndLogEx(SUCCESS, "Old div key : %s\n", sprint_hex(old_div_key, 8));
+        PrintAndLogEx(SUCCESS, "New div key : %s\n", sprint_hex(new_div_key, 8));
+        PrintAndLogEx(SUCCESS, "Xor div key : %s\n", sprint_hex(xor_div_key, 8));
     }
 }
 
-int CmdHFiClassCalcNewKey(const char *Cmd) {
-    uint8_t OLDKEY[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-    uint8_t NEWKEY[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-    uint8_t xor_div_key[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-    uint8_t CSN[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-    uint8_t CCNR[12] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+int CmdHFiClassCalcNewKey(const char *Cmd)
+{
+    uint8_t OLDKEY[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+    uint8_t NEWKEY[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+    uint8_t xor_div_key[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+    uint8_t CSN[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+    uint8_t CCNR[12] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
     uint8_t keyNbr = 0;
     uint8_t dataLen = 0;
     char tempStr[50] = {0};
@@ -1681,61 +1730,61 @@ int CmdHFiClassCalcNewKey(const char *Cmd) {
     uint8_t cmdp = 0;
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
-        case 'h':
-            return usage_hf_iclass_calc_newkey();
-        case 'e':
-            dataLen = param_getstr(Cmd, cmdp, tempStr, sizeof(tempStr));
-            if (dataLen==2)
-                oldElite = true;
-            elite = true;
-            cmdp++;
-            break;
-        case 'n':
-            dataLen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
-            if (dataLen == 16) {
-                errors = param_gethex(tempStr, 0, NEWKEY, dataLen);
-            } else if (dataLen == 1) {
-                keyNbr = param_get8(Cmd, cmdp+1);
-                if (keyNbr < ICLASS_KEYS_MAX) {
-                    memcpy(NEWKEY, iClass_Key_Table[keyNbr], 8);
-                } else {
-                    PrintAndLogEx(WARNING, "\nERROR: NewKey Nbr is invalid\n");
-                    errors = true;
-                }
-            } else {
-                PrintAndLogEx(WARNING, "\nERROR: NewKey is incorrect length\n");
-                errors = true;
-            }
-            cmdp += 2;
-            break;
-        case 'o':
-            dataLen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
-            if (dataLen == 16) {
-                errors = param_gethex(tempStr, 0, OLDKEY, dataLen);
-            } else if (dataLen == 1) {
-                keyNbr = param_get8(Cmd, cmdp+1);
-                if (keyNbr < ICLASS_KEYS_MAX) {
-                    memcpy(OLDKEY, iClass_Key_Table[keyNbr], 8);
-                } else {
-                    PrintAndLogEx(WARNING, "\nERROR: Credit KeyNbr is invalid\n");
-                    errors = true;
-                }
-            } else {
-                PrintAndLogEx(WARNING, "\nERROR: Credit Key is incorrect length\n");
-                errors = true;
-            }
-            cmdp += 2;
-            break;
-        case 's':
-            givenCSN = true;
-            if (param_gethex(Cmd, cmdp+1, CSN, 16))
+            case 'h':
                 return usage_hf_iclass_calc_newkey();
-            cmdp += 2;
-            break;
-        default:
-            PrintAndLogEx(WARNING, "unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
-            errors = true;
-            break;
+            case 'e':
+                dataLen = param_getstr(Cmd, cmdp, tempStr, sizeof(tempStr));
+                if (dataLen == 2)
+                    oldElite = true;
+                elite = true;
+                cmdp++;
+                break;
+            case 'n':
+                dataLen = param_getstr(Cmd, cmdp + 1, tempStr, sizeof(tempStr));
+                if (dataLen == 16) {
+                    errors = param_gethex(tempStr, 0, NEWKEY, dataLen);
+                } else if (dataLen == 1) {
+                    keyNbr = param_get8(Cmd, cmdp + 1);
+                    if (keyNbr < ICLASS_KEYS_MAX) {
+                        memcpy(NEWKEY, iClass_Key_Table[keyNbr], 8);
+                    } else {
+                        PrintAndLogEx(WARNING, "\nERROR: NewKey Nbr is invalid\n");
+                        errors = true;
+                    }
+                } else {
+                    PrintAndLogEx(WARNING, "\nERROR: NewKey is incorrect length\n");
+                    errors = true;
+                }
+                cmdp += 2;
+                break;
+            case 'o':
+                dataLen = param_getstr(Cmd, cmdp + 1, tempStr, sizeof(tempStr));
+                if (dataLen == 16) {
+                    errors = param_gethex(tempStr, 0, OLDKEY, dataLen);
+                } else if (dataLen == 1) {
+                    keyNbr = param_get8(Cmd, cmdp + 1);
+                    if (keyNbr < ICLASS_KEYS_MAX) {
+                        memcpy(OLDKEY, iClass_Key_Table[keyNbr], 8);
+                    } else {
+                        PrintAndLogEx(WARNING, "\nERROR: Credit KeyNbr is invalid\n");
+                        errors = true;
+                    }
+                } else {
+                    PrintAndLogEx(WARNING, "\nERROR: Credit Key is incorrect length\n");
+                    errors = true;
+                }
+                cmdp += 2;
+                break;
+            case 's':
+                givenCSN = true;
+                if (param_gethex(Cmd, cmdp + 1, CSN, 16))
+                    return usage_hf_iclass_calc_newkey();
+                cmdp += 2;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
+                errors = true;
+                break;
         }
     }
     if (errors || cmdp < 4) return usage_hf_iclass_calc_newkey();
@@ -1748,10 +1797,11 @@ int CmdHFiClassCalcNewKey(const char *Cmd) {
     return 0;
 }
 
-static int loadKeys(char *filename) {
+static int loadKeys(char *filename)
+{
     FILE *f;
     f = fopen(filename, "rb");
-    if(!f) {
+    if (!f) {
         PrintAndLogEx(WARNING, "Failed to read from file '%s'", filename);
         return 0;
     }
@@ -1759,43 +1809,44 @@ static int loadKeys(char *filename) {
     long fsize = ftell(f);
     fseek(f, 0, SEEK_SET);
 
-    if ( fsize < 0 ) {
+    if (fsize < 0) {
         PrintAndLogEx(WARNING, "Error, when getting filesize");
         fclose(f);
         return 1;
     }
 
     uint8_t *dump = calloc(fsize, sizeof(uint8_t));
-    if ( !dump ) {
+    if (!dump) {
         PrintAndLogEx(WARNING, "Failed to allocate memory");
         fclose(f);
         return 1;
     }
     size_t bytes_read = fread(dump, 1, fsize, f);
     fclose(f);
-    if (bytes_read > ICLASS_KEYS_MAX * 8){
+    if (bytes_read > ICLASS_KEYS_MAX * 8) {
         PrintAndLogEx(WARNING, "File is too long to load - bytes: %u", bytes_read);
         free(dump);
         return 0;
     }
     uint8_t i = 0;
-    for (; i < bytes_read/8; i++)
-        memcpy(iClass_Key_Table[i],dump+(i*8),8);
+    for (; i < bytes_read / 8; i++)
+        memcpy(iClass_Key_Table[i], dump + (i * 8), 8);
 
     free(dump);
     PrintAndLogEx(SUCCESS, "%u keys loaded", i);
     return 1;
 }
 
-static int saveKeys(char *filename) {
+static int saveKeys(char *filename)
+{
     FILE *f;
     f = fopen(filename, "wb");
     if (!f) {
-        PrintAndLogEx(NORMAL, "[!] error opening file %s\n",filename);
+        PrintAndLogEx(NORMAL, "[!] error opening file %s\n", filename);
         return 0;
     }
-    for (uint8_t i = 0; i < ICLASS_KEYS_MAX; i++){
-        if (fwrite(iClass_Key_Table[i],8,1,f) != 1){
+    for (uint8_t i = 0; i < ICLASS_KEYS_MAX; i++) {
+        if (fwrite(iClass_Key_Table[i], 8, 1, f) != 1) {
             PrintAndLogEx(WARNING, "save key failed to write to file: %s", filename);
             break;
         }
@@ -1804,15 +1855,17 @@ static int saveKeys(char *filename) {
     return 0;
 }
 
-static int printKeys(void) {
+static int printKeys(void)
+{
     PrintAndLogEx(NORMAL, "");
     for (uint8_t i = 0; i < ICLASS_KEYS_MAX; i++)
-        PrintAndLogEx(NORMAL, "%u: %s", i, sprint_hex(iClass_Key_Table[i],8));
+        PrintAndLogEx(NORMAL, "%u: %s", i, sprint_hex(iClass_Key_Table[i], 8));
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
 
-int CmdHFiClassManageKeys(const char *Cmd) {
+int CmdHFiClassManageKeys(const char *Cmd)
+{
     uint8_t keyNbr = 0;
     uint8_t dataLen = 0;
     uint8_t KEY[8] = {0};
@@ -1825,85 +1878,91 @@ int CmdHFiClassManageKeys(const char *Cmd) {
 
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
-        case 'h':
-            return usage_hf_iclass_managekeys();
-        case 'f':
-            fileNameLen = param_getstr(Cmd, cmdp+1, filename, sizeof(filename));
-            if (fileNameLen < 1) {
-                PrintAndLogEx(WARNING, "No filename found after f");
+            case 'h':
+                return usage_hf_iclass_managekeys();
+            case 'f':
+                fileNameLen = param_getstr(Cmd, cmdp + 1, filename, sizeof(filename));
+                if (fileNameLen < 1) {
+                    PrintAndLogEx(WARNING, "No filename found after f");
+                    errors = true;
+                }
+                cmdp += 2;
+                break;
+            case 'n':
+                keyNbr = param_get8(Cmd, cmdp + 1);
+                if (keyNbr >= ICLASS_KEYS_MAX) {
+                    PrintAndLogEx(WARNING, "Invalid block number");
+                    errors = true;
+                }
+                cmdp += 2;
+                break;
+            case 'k':
+                operation += 3; //set key
+                dataLen = param_getstr(Cmd, cmdp + 1, tempStr, sizeof(tempStr));
+                if (dataLen == 16) { //ul-c or ev1/ntag key length
+                    errors = param_gethex(tempStr, 0, KEY, dataLen);
+                } else {
+                    PrintAndLogEx(WARNING, "\nERROR: Key is incorrect length\n");
+                    errors = true;
+                }
+                cmdp += 2;
+                break;
+            case 'p':
+                operation += 4; //print keys in memory
+                cmdp++;
+                break;
+            case 'l':
+                operation += 5; //load keys from file
+                cmdp++;
+                break;
+            case 's':
+                operation += 6; //save keys to file
+                cmdp++;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
                 errors = true;
-            }
-            cmdp += 2;
-            break;
-        case 'n':
-            keyNbr = param_get8(Cmd, cmdp+1);
-            if (keyNbr >= ICLASS_KEYS_MAX) {
-                PrintAndLogEx(WARNING, "Invalid block number");
-                errors = true;
-            }
-            cmdp += 2;
-            break;
-        case 'k':
-            operation += 3; //set key
-            dataLen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
-            if (dataLen == 16) { //ul-c or ev1/ntag key length
-                errors = param_gethex(tempStr, 0, KEY, dataLen);
-            } else {
-                PrintAndLogEx(WARNING, "\nERROR: Key is incorrect length\n");
-                errors = true;
-            }
-            cmdp += 2;
-            break;
-        case 'p':
-            operation += 4; //print keys in memory
-            cmdp++;
-            break;
-        case 'l':
-            operation += 5; //load keys from file
-            cmdp++;
-            break;
-        case 's':
-            operation += 6; //save keys to file
-            cmdp++;
-            break;
-        default:
-            PrintAndLogEx(WARNING, "unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
-            errors = true;
-            break;
+                break;
         }
     }
     if (errors) return usage_hf_iclass_managekeys();
 
-    if (operation == 0){
+    if (operation == 0) {
         PrintAndLogEx(WARNING, "no operation specified (load, save, or print)\n");
         return usage_hf_iclass_managekeys();
     }
-    if (operation > 6){
+    if (operation > 6) {
         PrintAndLogEx(WARNING, "Too many operations specified\n");
         return usage_hf_iclass_managekeys();
     }
-    if (operation > 4 && fileNameLen == 0){
+    if (operation > 4 && fileNameLen == 0) {
         PrintAndLogEx(WARNING, "You must enter a filename when loading or saving\n");
         return usage_hf_iclass_managekeys();
     }
 
-    switch (operation){
-        case 3: memcpy(iClass_Key_Table[keyNbr], KEY, 8); return 1;
-        case 4: return printKeys();
-        case 5: return loadKeys(filename);
-        case 6: return saveKeys(filename);
-        break;
+    switch (operation) {
+        case 3:
+            memcpy(iClass_Key_Table[keyNbr], KEY, 8);
+            return 1;
+        case 4:
+            return printKeys();
+        case 5:
+            return loadKeys(filename);
+        case 6:
+            return saveKeys(filename);
+            break;
     }
     return 0;
 }
 
-int CmdHFiClassCheckKeys(const char *Cmd) {
+int CmdHFiClassCheckKeys(const char *Cmd)
+{
 
     // empty string
     if (strlen(Cmd) == 0) return usage_hf_iclass_chk();
 
-    uint8_t CSN[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-    uint8_t CCNR[12] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+    uint8_t CSN[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+    uint8_t CCNR[12] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
     // elite key,  raw key, standard key
     bool use_elite = false;
@@ -1926,33 +1985,33 @@ int CmdHFiClassCheckKeys(const char *Cmd) {
     uint64_t t1 = msclock();
 
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-        switch ( tolower(param_getchar(Cmd, cmdp))) {
-        case 'h':
-            return usage_hf_iclass_chk();
-        case 'f':
-            fileNameLen = param_getstr(Cmd, cmdp+1, filename, sizeof(filename));
-            if (fileNameLen < 1) {
-                PrintAndLogEx(WARNING, "no filename found after f");
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+            case 'h':
+                return usage_hf_iclass_chk();
+            case 'f':
+                fileNameLen = param_getstr(Cmd, cmdp + 1, filename, sizeof(filename));
+                if (fileNameLen < 1) {
+                    PrintAndLogEx(WARNING, "no filename found after f");
+                    errors = true;
+                }
+                cmdp += 2;
+                break;
+            case 'e':
+                use_elite = true;
+                cmdp++;
+                break;
+            case 'c':
+                use_credit_key = true;
+                cmdp++;
+                break;
+            case 'r':
+                use_raw = true;
+                cmdp++;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
                 errors = true;
-            }
-            cmdp += 2;
-            break;
-        case 'e':
-            use_elite = true;
-            cmdp++;
-            break;
-        case 'c':
-            use_credit_key = true;
-            cmdp++;
-            break;
-        case 'r':
-            use_raw = true;
-            cmdp++;
-            break;
-        default:
-            PrintAndLogEx(WARNING, "unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
-            errors = true;
-            break;
+                break;
         }
     }
     if (errors) return usage_hf_iclass_chk();
@@ -1960,7 +2019,7 @@ int CmdHFiClassCheckKeys(const char *Cmd) {
 
     // Get CSN / UID and CCNR
     PrintAndLogEx(SUCCESS, "Reading tag CSN");
-    for (uint8_t i=0; i<10 && !got_csn; i++) {
+    for (uint8_t i = 0; i < 10 && !got_csn; i++) {
         if (select_only(CSN, CCNR, false, false)) {
             got_csn = true;
         } else {
@@ -1968,20 +2027,20 @@ int CmdHFiClassCheckKeys(const char *Cmd) {
         }
     }
 
-    if ( !got_csn ) {
+    if (!got_csn) {
         PrintAndLogEx(WARNING, "can't select card, aborting...");
         return 1;
     }
 
     // load keys into keyblock
-    int res = LoadDictionaryKeyFile( filename, &keyBlock, &keycnt);
-    if ( res > 0) {
+    int res = LoadDictionaryKeyFile(filename, &keyBlock, &keycnt);
+    if (res > 0) {
         free(keyBlock);
         return 1;
     }
 
     pre = calloc(keycnt, sizeof(iclass_premac_t));
-    if ( !pre ) {
+    if (!pre) {
         free(keyBlock);
         return 1;
     }
@@ -1993,11 +2052,11 @@ int CmdHFiClassCheckKeys(const char *Cmd) {
         PrintAndLogEx(SUCCESS, "Using raw mode");
 
     PrintAndLogEx(SUCCESS, "Searching for %s key", (use_credit_key) ? "CREDIT" : "DEBIT");
-    PrintAndLogEx(SUCCESS,"Tag info");
-    PrintAndLogEx(SUCCESS, "CSN     | %s", sprint_hex( CSN, sizeof(CSN) ));
-    PrintAndLogEx(SUCCESS, "CCNR    | %s", sprint_hex( CCNR, sizeof(CCNR) ));
-    res = GenerateMacFromKeyFile( CSN, CCNR, use_raw, use_elite, keyBlock, keycnt, pre );
-    if ( res > 0) {
+    PrintAndLogEx(SUCCESS, "Tag info");
+    PrintAndLogEx(SUCCESS, "CSN     | %s", sprint_hex(CSN, sizeof(CSN)));
+    PrintAndLogEx(SUCCESS, "CCNR    | %s", sprint_hex(CCNR, sizeof(CCNR)));
+    res = GenerateMacFromKeyFile(CSN, CCNR, use_raw, use_elite, keyBlock, keycnt, pre);
+    if (res > 0) {
         free(keyBlock);
         free(pre);
         return 1;
@@ -2006,7 +2065,7 @@ int CmdHFiClassCheckKeys(const char *Cmd) {
     //PrintPreCalcMac(keyBlock, keycnt, pre);
 
     // max 42 keys inside USB_COMMAND.  512/4 = 103 mac
-    uint32_t chunksize = keycnt > (USB_CMD_DATA_SIZE/4) ? (USB_CMD_DATA_SIZE/4) : keycnt;
+    uint32_t chunksize = keycnt > (USB_CMD_DATA_SIZE / 4) ? (USB_CMD_DATA_SIZE / 4) : keycnt;
     bool lastChunk = false;
 
     // main keychunk loop
@@ -2016,7 +2075,8 @@ int CmdHFiClassCheckKeys(const char *Cmd) {
         uint8_t timeout = 0;
 
         if (ukbhit()) {
-            int gc = getchar(); (void)gc;
+            int gc = getchar();
+            (void)gc;
             PrintAndLogEx(WARNING, "\n[!] Aborted via keyboard!\n");
             goto out;
         }
@@ -2024,7 +2084,7 @@ int CmdHFiClassCheckKeys(const char *Cmd) {
         uint32_t keys = ((keycnt - i)  > chunksize) ? chunksize : keycnt - i;
 
         // last chunk?
-        if ( keys == keycnt - i)
+        if (keys == keycnt - i)
             lastChunk = true;
 
         UsbCommand c = {CMD_ICLASS_CHECK_KEYS, { (lastChunk << 8), keys, 0}};
@@ -2039,9 +2099,10 @@ int CmdHFiClassCheckKeys(const char *Cmd) {
         SendCommand(&c);
         UsbCommand resp;
 
-        while ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
+        while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
             timeout++;
-            printf("."); fflush(stdout);
+            printf(".");
+            fflush(stdout);
             if (timeout > 120) {
                 PrintAndLogEx(WARNING, "\nNo response from Proxmark. Aborting...");
                 goto out;
@@ -2052,36 +2113,37 @@ int CmdHFiClassCheckKeys(const char *Cmd) {
         uint8_t isOK = resp.arg[0] & 0xFF;
 
         t2 = msclock() - t2;
-        switch ( isOK ) {
+        switch (isOK) {
             case 1: {
                 found_debit = true;
 
                 PrintAndLogEx(NORMAL, "\n[-] Chunk [%d/%d]: %.1fs [%s]  found key  %s (index %u)"
-                        , i
-                        , keycnt
-                        , (float)(t2/1000.0)
-                        , (use_credit_key) ? "credit" : "debit"
-                        , sprint_hex(keyBlock + (i+found)*8, 8)
-                        , found
-                    );
+                              , i
+                              , keycnt
+                              , (float)(t2 / 1000.0)
+                              , (use_credit_key) ? "credit" : "debit"
+                              , sprint_hex(keyBlock + (i + found) * 8, 8)
+                              , found
+                             );
                 break;
             }
             case 0: {
                 PrintAndLogEx(NORMAL, "\n[-] Chunk [%d/%d] : %.1fs [%s]"
-                        , i
-                        , keycnt
-                        , (float)(t2/1000.0)
-                        , (use_credit_key) ? "credit" : "debit"
-                    );
+                              , i
+                              , keycnt
+                              , (float)(t2 / 1000.0)
+                              , (use_credit_key) ? "credit" : "debit"
+                             );
                 break;
             }
             case 99: {
             }
-            default: break;
+            default:
+                break;
         }
 
         // both keys found.
-        if ( found_debit ) {
+        if (found_debit) {
             PrintAndLogEx(SUCCESS, "All keys found, exiting");
             break;
         }
@@ -2091,7 +2153,7 @@ int CmdHFiClassCheckKeys(const char *Cmd) {
 out:
     t1 = msclock() - t1;
 
-    PrintAndLogEx(SUCCESS, "\nTime in iclass checkkeys: %.0f seconds\n", (float)t1/1000.0);
+    PrintAndLogEx(SUCCESS, "\nTime in iclass checkkeys: %.0f seconds\n", (float)t1 / 1000.0);
 
     DropField();
     free(pre);
@@ -2099,13 +2161,14 @@ out:
     return 0;
 }
 
-static int cmp_uint32( const void *a, const void *b) {
+static int cmp_uint32(const void *a, const void *b)
+{
 
-    const iclass_prekey_t* x = (const iclass_prekey_t *)a;
-    const iclass_prekey_t* y = (const iclass_prekey_t *)b;
+    const iclass_prekey_t *x = (const iclass_prekey_t *)a;
+    const iclass_prekey_t *y = (const iclass_prekey_t *)b;
 
-    uint32_t mx = bytes_to_num( (uint8_t*)x->mac, 4);
-    uint32_t my = bytes_to_num( (uint8_t*)y->mac, 4);
+    uint32_t mx = bytes_to_num((uint8_t *)x->mac, 4);
+    uint32_t my = bytes_to_num((uint8_t *)y->mac, 4);
 
     if (mx < my)
         return -1;
@@ -2115,13 +2178,14 @@ static int cmp_uint32( const void *a, const void *b) {
 
 // this method tries to identify in which configuration mode a iClass / iClass SE reader is in.
 // Standard or Elite / HighSecurity mode.  It uses a default key dictionary list in order to work.
-int CmdHFiClassLookUp(const char *Cmd) {
+int CmdHFiClassLookUp(const char *Cmd)
+{
 
     uint8_t CSN[8];
-    uint8_t EPURSE[8] = { 0,0,0,0,0,0,0,0 };
-    uint8_t MACS[8]= { 0,0,0,0,0,0,0,0 };
+    uint8_t EPURSE[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
+    uint8_t MACS[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
     uint8_t CCNR[12];
-    uint8_t MAC_TAG[4] = { 0,0,0,0 };
+    uint8_t MAC_TAG[4] = { 0, 0, 0, 0 };
 
     // elite key,  raw key, standard key
     bool use_elite = false;
@@ -2143,55 +2207,55 @@ int CmdHFiClassLookUp(const char *Cmd) {
 
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
-        case 'h':
-            return usage_hf_iclass_lookup();
-        case 'f':
-            fileNameLen = param_getstr(Cmd, cmdp+1, filename, sizeof(filename));
-            if (fileNameLen < 1) {
-                PrintAndLogEx(WARNING, "No filename found after f");
+            case 'h':
+                return usage_hf_iclass_lookup();
+            case 'f':
+                fileNameLen = param_getstr(Cmd, cmdp + 1, filename, sizeof(filename));
+                if (fileNameLen < 1) {
+                    PrintAndLogEx(WARNING, "No filename found after f");
+                    errors = true;
+                }
+                cmdp += 2;
+                break;
+            case 'u':
+                param_gethex_ex(Cmd, cmdp + 1, CSN, &len);
+                if (len >> 1 != sizeof(CSN)) {
+                    PrintAndLogEx(WARNING, "Wrong CSN length, expected %d got [%d]", sizeof(CSN), len >> 1);
+                    errors = true;
+                }
+                cmdp += 2;
+                break;
+            case 'm':
+                param_gethex_ex(Cmd, cmdp + 1, MACS, &len);
+                if (len >> 1 != sizeof(MACS)) {
+                    PrintAndLogEx(WARNING, "Wrong MACS length, expected %d got [%d]  ", sizeof(MACS), len >> 1);
+                    errors = true;
+                } else {
+                    memcpy(MAC_TAG, MACS + 4, 4);
+                }
+                cmdp += 2;
+                break;
+            case 'p':
+                param_gethex_ex(Cmd, cmdp + 1, EPURSE, &len);
+                if (len >> 1 != sizeof(EPURSE)) {
+                    PrintAndLogEx(WARNING, "Wrong EPURSE length, expected %d got [%d]  ", sizeof(EPURSE), len >> 1);
+                    errors = true;
+                }
+                cmdp += 2;
+                break;
+                break;
+            case 'e':
+                use_elite = true;
+                cmdp++;
+                break;
+            case 'r':
+                use_raw = true;
+                cmdp++;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
                 errors = true;
-            }
-            cmdp += 2;
-            break;
-        case 'u':
-            param_gethex_ex(Cmd, cmdp+1, CSN, &len);
-            if ( len>>1 != sizeof(CSN) ) {
-                PrintAndLogEx(WARNING, "Wrong CSN length, expected %d got [%d]", sizeof(CSN), len>>1);
-                errors = true;
-            }
-            cmdp += 2;
-            break;
-        case 'm':
-            param_gethex_ex(Cmd, cmdp+1, MACS, &len);
-            if ( len>>1 != sizeof(MACS) ) {
-                PrintAndLogEx(WARNING, "Wrong MACS length, expected %d got [%d]  ", sizeof(MACS), len>>1);
-                errors = true;
-            } else {
-                memcpy(MAC_TAG, MACS+4, 4);
-            }
-            cmdp += 2;
-            break;
-        case 'p':
-            param_gethex_ex(Cmd, cmdp+1, EPURSE, &len);
-            if ( len>>1 != sizeof(EPURSE) ) {
-                PrintAndLogEx(WARNING, "Wrong EPURSE length, expected %d got [%d]  ", sizeof(EPURSE), len>>1);
-                errors = true;
-            }
-            cmdp += 2;
-            break;
-        break;
-        case 'e':
-            use_elite = true;
-            cmdp++;
-            break;
-        case 'r':
-            use_raw = true;
-            cmdp++;
-            break;
-        default:
-            PrintAndLogEx(WARNING, "unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
-            errors = true;
-            break;
+                break;
         }
     }
 
@@ -2199,29 +2263,29 @@ int CmdHFiClassLookUp(const char *Cmd) {
 
     // stupid copy.. CCNR is a combo of epurse and reader nonce
     memcpy(CCNR, EPURSE, 8);
-    memcpy(CCNR+8, MACS, 4);
+    memcpy(CCNR + 8, MACS, 4);
 
-    PrintAndLogEx(SUCCESS, "CSN     | %s", sprint_hex( CSN, sizeof(CSN) ));
-    PrintAndLogEx(SUCCESS, "Epurse  | %s", sprint_hex( EPURSE, sizeof(EPURSE) ));
-    PrintAndLogEx(SUCCESS, "MACS    | %s", sprint_hex( MACS, sizeof(MACS) ));
-    PrintAndLogEx(SUCCESS, "CCNR    | %s", sprint_hex( CCNR, sizeof(CCNR) ));
-    PrintAndLogEx(SUCCESS, "MAC_TAG | %s", sprint_hex( MAC_TAG, sizeof(MAC_TAG) ));
+    PrintAndLogEx(SUCCESS, "CSN     | %s", sprint_hex(CSN, sizeof(CSN)));
+    PrintAndLogEx(SUCCESS, "Epurse  | %s", sprint_hex(EPURSE, sizeof(EPURSE)));
+    PrintAndLogEx(SUCCESS, "MACS    | %s", sprint_hex(MACS, sizeof(MACS)));
+    PrintAndLogEx(SUCCESS, "CCNR    | %s", sprint_hex(CCNR, sizeof(CCNR)));
+    PrintAndLogEx(SUCCESS, "MAC_TAG | %s", sprint_hex(MAC_TAG, sizeof(MAC_TAG)));
 
-    int res = LoadDictionaryKeyFile( filename, &keyBlock, &keycnt);
-    if ( res > 0) {
+    int res = LoadDictionaryKeyFile(filename, &keyBlock, &keycnt);
+    if (res > 0) {
         free(keyBlock);
         return 1;
     }
     //iclass_prekey_t
     prekey = calloc(keycnt, sizeof(iclass_prekey_t));
-    if ( !prekey ) {
+    if (!prekey) {
         free(keyBlock);
         return 1;
     }
 
     PrintAndLogEx(FAILED, "Generating diversified keys and MAC");
-    res = GenerateFromKeyFile( CSN, CCNR, use_raw, use_elite, keyBlock, keycnt, prekey );
-    if ( res > 0) {
+    res = GenerateFromKeyFile(CSN, CCNR, use_raw, use_elite, keyBlock, keycnt, prekey);
+    if (res > 0) {
         free(keyBlock);
         free(prekey);
         return 1;
@@ -2230,7 +2294,7 @@ int CmdHFiClassLookUp(const char *Cmd) {
     PrintAndLogEx(FAILED, "Sorting");
 
     // sort mac list.
-    qsort( prekey, keycnt, sizeof(iclass_prekey_t), cmp_uint32);
+    qsort(prekey, keycnt, sizeof(iclass_prekey_t), cmp_uint32);
 
     //PrintPreCalc(prekey, keycnt);
 
@@ -2240,31 +2304,32 @@ int CmdHFiClassLookUp(const char *Cmd) {
     memcpy(lookup.mac, MAC_TAG, 4);
 
     // binsearch
-    item = (iclass_prekey_t*) bsearch(&lookup, prekey, keycnt, sizeof(iclass_prekey_t), cmp_uint32);
-    if( item != NULL )
+    item = (iclass_prekey_t *) bsearch(&lookup, prekey, keycnt, sizeof(iclass_prekey_t), cmp_uint32);
+    if (item != NULL)
         PrintAndLogEx(SUCCESS, "\n[debit] found key %s", sprint_hex(item->key, 8));
 
     t1 = msclock() - t1;
-    PrintAndLogEx(NORMAL, "\nTime in iclass : %.0f seconds\n", (float)t1/1000.0);
+    PrintAndLogEx(NORMAL, "\nTime in iclass : %.0f seconds\n", (float)t1 / 1000.0);
     free(prekey);
     free(keyBlock);
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
 
-int LoadDictionaryKeyFile( char* filename, uint8_t **keys, int *keycnt) {
+int LoadDictionaryKeyFile(char *filename, uint8_t **keys, int *keycnt)
+{
 
     char buf[17];
-    FILE * f;
+    FILE *f;
     uint8_t *p;
     int keyitems = 0;
 
-    if ( !(f = fopen( filename , "r")) ) {
-        PrintAndLogEx(FAILED, "File: " _YELLOW_(%s) ": not found or locked.", filename);
+    if (!(f = fopen(filename, "r"))) {
+        PrintAndLogEx(FAILED, "File: " _YELLOW_( % s) ": not found or locked.", filename);
         return 1;
     }
 
-    while( fgets(buf, sizeof(buf), f) ){
+    while (fgets(buf, sizeof(buf), f)) {
         if (strlen(buf) < 16 || buf[15] == '\n')
             continue;
 
@@ -2272,11 +2337,11 @@ int LoadDictionaryKeyFile( char* filename, uint8_t **keys, int *keycnt) {
         while (fgetc(f) != '\n' && !feof(f)) {};
 
         //The line start with # is comment, skip
-        if( buf[0]=='#' )
+        if (buf[0] == '#')
             continue;
 
         // doesn't this only test first char only?
-        if (!isxdigit(buf[0])){
+        if (!isxdigit(buf[0])) {
             PrintAndLogEx(ERR, "file content error. '%s' must include 16 HEX symbols", buf);
             continue;
         }
@@ -2298,18 +2363,19 @@ int LoadDictionaryKeyFile( char* filename, uint8_t **keys, int *keycnt) {
         memset(buf, 0, sizeof(buf));
     }
     fclose(f);
-    PrintAndLogEx(SUCCESS, "Loaded " _GREEN_(%2d) " keys from %s", *keycnt, filename);
+    PrintAndLogEx(SUCCESS, "Loaded " _GREEN_( % 2d) " keys from %s", *keycnt, filename);
     return 0;
 }
 
 // precalc diversified keys and their MAC
-int GenerateMacFromKeyFile( uint8_t* CSN, uint8_t* CCNR, bool use_raw, bool use_elite, uint8_t* keys, int keycnt, iclass_premac_t* list ) {
-    uint8_t key[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-    uint8_t div_key[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+int GenerateMacFromKeyFile(uint8_t *CSN, uint8_t *CCNR, bool use_raw, bool use_elite, uint8_t *keys, int keycnt, iclass_premac_t *list)
+{
+    uint8_t key[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+    uint8_t div_key[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
-    for ( int i=0; i < keycnt; i++) {
+    for (int i = 0; i < keycnt; i++) {
 
-        memcpy(key, keys + 8 * i , 8);
+        memcpy(key, keys + 8 * i, 8);
 
         if (use_raw)
             memcpy(div_key, key, 8);
@@ -2321,13 +2387,14 @@ int GenerateMacFromKeyFile( uint8_t* CSN, uint8_t* CCNR, bool use_raw, bool use_
     return 0;
 }
 
-int GenerateFromKeyFile( uint8_t* CSN, uint8_t* CCNR, bool use_raw, bool use_elite, uint8_t* keys, int keycnt, iclass_prekey_t* list ) {
+int GenerateFromKeyFile(uint8_t *CSN, uint8_t *CCNR, bool use_raw, bool use_elite, uint8_t *keys, int keycnt, iclass_prekey_t *list)
+{
 
-    uint8_t div_key[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+    uint8_t div_key[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
-    for ( int i=0; i < keycnt; i++) {
+    for (int i = 0; i < keycnt; i++) {
 
-        memcpy(list[i].key, keys + 8 * i , 8);
+        memcpy(list[i].key, keys + 8 * i, 8);
 
         // generate diversifed key
         if (use_raw)
@@ -2342,52 +2409,55 @@ int GenerateFromKeyFile( uint8_t* CSN, uint8_t* CCNR, bool use_raw, bool use_eli
 }
 
 // print diversified keys
-void PrintPreCalcMac(uint8_t* keys, int keycnt, iclass_premac_t* pre_list) {
+void PrintPreCalcMac(uint8_t *keys, int keycnt, iclass_premac_t *pre_list)
+{
 
-    iclass_prekey_t* b =  calloc(keycnt, sizeof(iclass_prekey_t));
-    if ( !b )
+    iclass_prekey_t *b =  calloc(keycnt, sizeof(iclass_prekey_t));
+    if (!b)
         return;
 
-    for ( int i=0; i < keycnt; i++) {
-        memcpy(b[i].key, keys + 8 * i , 8);
+    for (int i = 0; i < keycnt; i++) {
+        memcpy(b[i].key, keys + 8 * i, 8);
         memcpy(b[i].mac, pre_list[i].mac, 4);
     }
     PrintPreCalc(b, keycnt);
     free(b);
 }
 
-void PrintPreCalc(iclass_prekey_t* list, int itemcnt) {
+void PrintPreCalc(iclass_prekey_t *list, int itemcnt)
+{
     PrintAndLogEx(NORMAL, "-----+------------------+---------");
     PrintAndLogEx(NORMAL, "#key | key              | mac");
     PrintAndLogEx(NORMAL, "-----+------------------+---------");
-    for ( int i=0; i < itemcnt; i++) {
+    for (int i = 0; i < itemcnt; i++) {
 
-        if (i < 10 ) {
-            PrintAndLogEx(NORMAL, "[%2d] | %016" PRIx64 " | %08" PRIx32, i, bytes_to_num(list[i].key, 8), bytes_to_num( list[i].mac, 4) );
-        } else if ( i == 10 ) {
+        if (i < 10) {
+            PrintAndLogEx(NORMAL, "[%2d] | %016" PRIx64 " | %08" PRIx32, i, bytes_to_num(list[i].key, 8), bytes_to_num(list[i].mac, 4));
+        } else if (i == 10) {
             PrintAndLogEx(SUCCESS, "... skip printing the rest");
         }
     }
 }
 
-static void permute(uint8_t *data, uint8_t len, uint8_t *output){
+static void permute(uint8_t *data, uint8_t len, uint8_t *output)
+{
 #define KEY_SIZE 8
 
-    if ( len > KEY_SIZE ) {
-        for(uint8_t m = 0; m < len; m += KEY_SIZE){
-            permute(data+m, KEY_SIZE, output+m);
+    if (len > KEY_SIZE) {
+        for (uint8_t m = 0; m < len; m += KEY_SIZE) {
+            permute(data + m, KEY_SIZE, output + m);
         }
         return;
     }
-    if ( len != KEY_SIZE ) {
+    if (len != KEY_SIZE) {
         PrintAndLogEx(NORMAL, "[!] wrong key size\n");
         return;
     }
-    uint8_t i,j,p, mask;
-    for( i=0; i < KEY_SIZE; ++i){
+    uint8_t i, j, p, mask;
+    for (i = 0; i < KEY_SIZE; ++i) {
         p = 0;
         mask = 0x80 >> i;
-        for( j=0; j < KEY_SIZE; ++j){
+        for (j = 0; j < KEY_SIZE; ++j) {
             p >>= 1;
             if (data[j] & mask)
                 p |= 0x80;
@@ -2395,16 +2465,18 @@ static void permute(uint8_t *data, uint8_t len, uint8_t *output){
         output[i] = p;
     }
 }
-static void permute_rev(uint8_t *data, uint8_t len, uint8_t *output){
+static void permute_rev(uint8_t *data, uint8_t len, uint8_t *output)
+{
     permute(data, len, output);
     permute(output, len, data);
     permute(data, len, output);
 }
-static void simple_crc(uint8_t *data, uint8_t len, uint8_t *output){
+static void simple_crc(uint8_t *data, uint8_t len, uint8_t *output)
+{
     uint8_t crc = 0;
-    for( uint8_t i=0; i < len; ++i){
+    for (uint8_t i = 0; i < len; ++i) {
         // seventh byte contains the crc.
-        if ( (i & 0x7) == 0x7 ) {
+        if ((i & 0x7) == 0x7) {
             output[i] = crc ^ 0xFF;
             crc = 0;
         } else {
@@ -2414,11 +2486,13 @@ static void simple_crc(uint8_t *data, uint8_t len, uint8_t *output){
     }
 }
 // DES doesn't use the MSB.
-static void shave(uint8_t *data, uint8_t len){
-    for (uint8_t i=0; i<len; ++i)
+static void shave(uint8_t *data, uint8_t len)
+{
+    for (uint8_t i = 0; i < len; ++i)
         data[i] &= 0xFE;
 }
-static void generate_rev(uint8_t *data, uint8_t len) {
+static void generate_rev(uint8_t *data, uint8_t len)
+{
     uint8_t *key = calloc(len, sizeof(uint8_t));
     PrintAndLogEx(SUCCESS, "input permuted key | %s \n", sprint_hex(data, len));
     permute_rev(data, len, key);
@@ -2427,19 +2501,21 @@ static void generate_rev(uint8_t *data, uint8_t len) {
     PrintAndLogEx(SUCCESS, "               key | %s \n", sprint_hex(key, len));
     free(key);
 }
-static void generate(uint8_t *data, uint8_t len) {
+static void generate(uint8_t *data, uint8_t len)
+{
     uint8_t *key = calloc(len, sizeof(uint8_t));
     uint8_t *pkey = calloc(len, sizeof(uint8_t));
     PrintAndLogEx(SUCCESS, "   input key | %s \n", sprint_hex(data, len));
     permute(data, len, pkey);
     PrintAndLogEx(SUCCESS, "permuted key | %s \n", sprint_hex(pkey, len));
-    simple_crc(pkey, len, key );
+    simple_crc(pkey, len, key);
     PrintAndLogEx(SUCCESS, "  CRC'ed key | %s \n", sprint_hex(key, len));
     free(key);
     free(pkey);
 }
 
-int CmdHFiClassPermuteKey(const char *Cmd) {
+int CmdHFiClassPermuteKey(const char *Cmd)
+{
 
     uint8_t key[8] = {0};
     uint8_t key_std_format[8] = {0};
@@ -2448,23 +2524,22 @@ int CmdHFiClassPermuteKey(const char *Cmd) {
     bool isReverse = false;
     int len = 0;
     char cmdp = tolower(param_getchar(Cmd, 0));
-    if (strlen(Cmd) == 0|| cmdp == 'h') return usage_hf_iclass_permutekey();
+    if (strlen(Cmd) == 0 || cmdp == 'h') return usage_hf_iclass_permutekey();
 
-    isReverse = ( cmdp == 'r' );
+    isReverse = (cmdp == 'r');
 
     param_gethex_ex(Cmd, 1, data, &len);
-    if ( len%2 ) return usage_hf_iclass_permutekey();
+    if (len % 2) return usage_hf_iclass_permutekey();
 
     len >>= 1;
 
     memcpy(key, data, 8);
 
-    if ( isReverse ) {
+    if (isReverse) {
         generate_rev(data, len);
         permutekey_rev(key, key_std_format);
         PrintAndLogEx(SUCCESS, "holiman iclass key | %s \n", sprint_hex(key_std_format, 8));
-    }
-    else {
+    } else {
         generate(data, len);
         permutekey(key, key_iclass_format);
         PrintAndLogEx(SUCCESS, "holiman std key | %s \n", sprint_hex(key_iclass_format, 8));
@@ -2496,13 +2571,15 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdHFiClass(const char *Cmd) {
+int CmdHFiClass(const char *Cmd)
+{
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
+int CmdHelp(const char *Cmd)
+{
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdhficlass.h b/client/cmdhficlass.h
index 1d49f029a..dff0d0b24 100644
--- a/client/cmdhficlass.h
+++ b/client/cmdhficlass.h
@@ -79,9 +79,9 @@ extern int CmdHFiClassPermuteKey(const char *Cmd);
 void printIclassDumpContents(uint8_t *iclass_dump, uint8_t startblock, uint8_t endblock, size_t filesize);
 void HFiClassCalcDivKey(uint8_t *CSN, uint8_t *KEY, uint8_t *div_key, bool elite);
 
-int LoadDictionaryKeyFile( char* filename, uint8_t **keys, int *keycnt);
-int GenerateMacFromKeyFile( uint8_t* CSN, uint8_t* CCNR, bool use_raw, bool use_elite, uint8_t* keys, int keycnt, iclass_premac_t* list );
-int GenerateFromKeyFile( uint8_t* CSN, uint8_t* CCNR, bool use_raw, bool use_elite, uint8_t* keys, int keycnt, iclass_prekey_t* list );
-void PrintPreCalcMac(uint8_t* keys, int keycnt, iclass_premac_t* pre_list);
-void PrintPreCalc(iclass_prekey_t* list, int itemcnt);
+int LoadDictionaryKeyFile(char *filename, uint8_t **keys, int *keycnt);
+int GenerateMacFromKeyFile(uint8_t *CSN, uint8_t *CCNR, bool use_raw, bool use_elite, uint8_t *keys, int keycnt, iclass_premac_t *list);
+int GenerateFromKeyFile(uint8_t *CSN, uint8_t *CCNR, bool use_raw, bool use_elite, uint8_t *keys, int keycnt, iclass_prekey_t *list);
+void PrintPreCalcMac(uint8_t *keys, int keycnt, iclass_premac_t *pre_list);
+void PrintPreCalc(iclass_prekey_t *list, int itemcnt);
 #endif
diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index c55b8f54b..a023f14a1 100644
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -13,7 +13,8 @@ static int CmdHelp(const char *Cmd);
 
 #define MAX_LENGTH 1024
 
-int usage_legic_calccrc(void){
+int usage_legic_calccrc(void)
+{
     PrintAndLogEx(NORMAL, "Calculates the legic crc8/crc16 on the given data.");
     PrintAndLogEx(NORMAL, "There must be an even number of hexsymbols as input.");
     PrintAndLogEx(NORMAL, "Usage:  hf legic crc [h] d <data> u <uidcrc> c <8|16>");
@@ -28,7 +29,8 @@ int usage_legic_calccrc(void){
     PrintAndLogEx(NORMAL, "      hf legic crc d deadbeef1122 u 9A c 16");
     return 0;
 }
-int usage_legic_rdmem(void){
+int usage_legic_rdmem(void)
+{
     PrintAndLogEx(NORMAL, "Read data from a legic tag.");
     PrintAndLogEx(NORMAL, "Usage:  hf legic rdmem [h] <offset> <length> <IV>");
     PrintAndLogEx(NORMAL, "Options:");
@@ -43,7 +45,8 @@ int usage_legic_rdmem(void){
     PrintAndLogEx(NORMAL, "      hf legic rdmem 0 100 55    - reads 0x100 bytes with IV 0x55");
     return 0;
 }
-int usage_legic_sim(void){
+int usage_legic_sim(void)
+{
     PrintAndLogEx(NORMAL, "Simulates a LEGIC Prime tag. MIM22, MIM256, MIM1024 types can be emulated");
     PrintAndLogEx(NORMAL, "Use ELOAD/ESAVE to upload a dump into emulator memory");
     PrintAndLogEx(NORMAL, "Usage:  hf legic sim [h] <tagtype>");
@@ -57,7 +60,8 @@ int usage_legic_sim(void){
     PrintAndLogEx(NORMAL, "      hf legic sim 2");
     return 0;
 }
-int usage_legic_write(void){
+int usage_legic_write(void)
+{
     PrintAndLogEx(NORMAL, "Write data to a LEGIC Prime tag. It autodetects tagsize to make sure size");
     PrintAndLogEx(NORMAL, "Usage:  hf legic write [h] o <offset> d <data (hex symbols)>");
     PrintAndLogEx(NORMAL, "Options:");
@@ -70,7 +74,8 @@ int usage_legic_write(void){
     PrintAndLogEx(NORMAL, "      hf legic write o 10 d 11223344    - Write 0x11223344 starting from offset 0x10");
     return 0;
 }
-int usage_legic_reader(void){
+int usage_legic_reader(void)
+{
     PrintAndLogEx(NORMAL, "Read UID and type information from a legic tag.");
     PrintAndLogEx(NORMAL, "Usage:  hf legic reader [h]");
     PrintAndLogEx(NORMAL, "Options:");
@@ -80,7 +85,8 @@ int usage_legic_reader(void){
     PrintAndLogEx(NORMAL, "      hf legic reader");
     return 0;
 }
-int usage_legic_info(void){
+int usage_legic_info(void)
+{
     PrintAndLogEx(NORMAL, "Reads information from a legic prime tag.");
     PrintAndLogEx(NORMAL, "Shows systemarea, user areas etc");
     PrintAndLogEx(NORMAL, "Usage:  hf legic info [h]");
@@ -91,7 +97,8 @@ int usage_legic_info(void){
     PrintAndLogEx(NORMAL, "      hf legic info");
     return 0;
 }
-int usage_legic_dump(void){
+int usage_legic_dump(void)
+{
     PrintAndLogEx(NORMAL, "Reads all pages from LEGIC Prime MIM22, MIM256, MIM1024");
     PrintAndLogEx(NORMAL, "and saves binary dump into the file `filename.bin` or `cardUID.bin`");
     PrintAndLogEx(NORMAL, "It autodetects card type.\n");
@@ -105,7 +112,8 @@ int usage_legic_dump(void){
     PrintAndLogEx(NORMAL, "      hf legic dump o myfile");
     return 0;
 }
-int usage_legic_restore(void){
+int usage_legic_restore(void)
+{
     PrintAndLogEx(NORMAL, "Reads binary file and it autodetects card type and verifies that the file has the same size");
     PrintAndLogEx(NORMAL, "Then write the data back to card. All bytes except the first 7bytes [UID(4) MCC(1) DCF(2)]\n");
     PrintAndLogEx(NORMAL, "Usage:   hf legic restore [h] i <filename w/o .bin>");
@@ -117,7 +125,8 @@ int usage_legic_restore(void){
     PrintAndLogEx(NORMAL, "      hf legic restore i myfile");
     return 0;
 }
-int usage_legic_eload(void){
+int usage_legic_eload(void)
+{
     PrintAndLogEx(NORMAL, "It loads binary dump from the file `filename.bin`");
     PrintAndLogEx(NORMAL, "Usage:  hf legic eload [h] [card memory] <file name w/o `.bin`>");
     PrintAndLogEx(NORMAL, "Options:");
@@ -131,7 +140,8 @@ int usage_legic_eload(void){
     PrintAndLogEx(NORMAL, "      hf legic eload 2 myfile");
     return 0;
 }
-int usage_legic_esave(void){
+int usage_legic_esave(void)
+{
     PrintAndLogEx(NORMAL, "It saves binary dump into the file `filename.bin` or `cardID.bin`");
     PrintAndLogEx(NORMAL, " Usage:  hf legic esave [h] [card memory] [file name w/o `.bin`]");
     PrintAndLogEx(NORMAL, "Options:");
@@ -145,7 +155,8 @@ int usage_legic_esave(void){
     PrintAndLogEx(NORMAL, "      hf legic esave 2 myfile");
     return 0;
 }
-int usage_legic_wipe(void){
+int usage_legic_wipe(void)
+{
     PrintAndLogEx(NORMAL, "Fills a legic tag memory with zeros. From byte7 and to the end.");
     PrintAndLogEx(NORMAL, " Usage:  hf legic wipe [h]");
     PrintAndLogEx(NORMAL, "Options:");
@@ -160,16 +171,17 @@ int usage_legic_wipe(void){
  *  This is based on information given in the talk held
  *  by Henryk Ploetz and Karsten Nohl at 26c3
  */
-int CmdLegicInfo(const char *Cmd) {
+int CmdLegicInfo(const char *Cmd)
+{
 
     char cmdp = tolower(param_getchar(Cmd, 0));
-    if ( cmdp == 'h' ) return usage_legic_info();
+    if (cmdp == 'h') return usage_legic_info();
 
     int i = 0, k = 0, segmentNum = 0, segment_len = 0, segment_flag = 0;
     int crc = 0, wrp = 0, wrc = 0;
     uint8_t stamp_len = 0;
     uint16_t datalen = 0;
-    char token_type[5] = {0,0,0,0,0};
+    char token_type[5] = {0, 0, 0, 0, 0};
     int dcf = 0;
     int bIsSegmented = 0;
 
@@ -184,13 +196,13 @@ int CmdLegicInfo(const char *Cmd) {
 
     // allocate receiver buffer
     uint8_t *data = calloc(card.cardsize, sizeof(uint8_t));
-     if (!data) {
+    if (!data) {
         PrintAndLogEx(WARNING, "Cannot allocate memory");
         return 2;
     }
 
     int status = legic_read_mem(0, card.cardsize, 0x55, data, &datalen);
-    if ( status > 0 ) {
+    if (status > 0) {
         PrintAndLogEx(WARNING, "Failed reading memory");
         free(data);
         return 3;
@@ -203,13 +215,13 @@ int CmdLegicInfo(const char *Cmd) {
     PrintAndLogEx(NORMAL, "\nCDF: System Area");
     PrintAndLogEx(NORMAL, "------------------------------------------------------");
     PrintAndLogEx(NORMAL, "MCD: %02x, MSN: %02x %02x %02x, MCC: %02x %s",
-        data[0],
-        data[1],
-        data[2],
-        data[3],
-        data[4],
-        (calc_crc == crc) ? "OK":"Fail"
-    );
+                  data[0],
+                  data[1],
+                  data[2],
+                  data[3],
+                  data[4],
+                  (calc_crc == crc) ? "OK" : "Fail"
+                 );
 
     // MCD = Manufacturer ID (should be list meaning something?)
 
@@ -220,10 +232,10 @@ int CmdLegicInfo(const char *Cmd) {
     if (dcf == 0xFFFF) {
 
         PrintAndLogEx(NORMAL, "DCF: %d (%02x %02x), Token Type=NM (New Media)",
-            dcf,
-            data[5],
-            data[6]
-        );
+                      dcf,
+                      data[5],
+                      data[6]
+                     );
 
     } else if (dcf > 60000) { // Master token?
 
@@ -235,32 +247,32 @@ int CmdLegicInfo(const char *Cmd) {
             stamp_len = 0x0c - (data[5] >> 4);
         } else {
             switch (data[5] & 0x7f) {
-            case 0x00 ... 0x2f:
-                strncpy(token_type, "IAM", sizeof(token_type));
-                fl = (0x2f - (data[5] & 0x7f)) + 1;
-                break;
-            case 0x30 ... 0x6f:
-                strncpy(token_type, "SAM", sizeof(token_type));
-                fl = (0x6f - (data[5] & 0x7f)) + 1;
-                break;
-            case 0x70 ... 0x7f:
-                strncpy(token_type, "GAM", sizeof(token_type));
-                fl = (0x7f - (data[5] & 0x7f)) + 1;
-                break;
+                case 0x00 ... 0x2f:
+                    strncpy(token_type, "IAM", sizeof(token_type));
+                    fl = (0x2f - (data[5] & 0x7f)) + 1;
+                    break;
+                case 0x30 ... 0x6f:
+                    strncpy(token_type, "SAM", sizeof(token_type));
+                    fl = (0x6f - (data[5] & 0x7f)) + 1;
+                    break;
+                case 0x70 ... 0x7f:
+                    strncpy(token_type, "GAM", sizeof(token_type));
+                    fl = (0x7f - (data[5] & 0x7f)) + 1;
+                    break;
             }
 
             stamp_len = 0xfc - data[6];
         }
 
         PrintAndLogEx(NORMAL, "DCF: %d (%02x %02x), Token Type=%s (OLE=%01u), OL=%02u, FL=%02u",
-            dcf,
-            data[5],
-            data[6],
-            token_type,
-            (data[5] & 0x80 )>> 7,
-            stamp_len,
-            fl
-        );
+                      dcf,
+                      data[5],
+                      data[6],
+                      token_type,
+                      (data[5] & 0x80) >> 7,
+                      stamp_len,
+                      fl
+                     );
 
     } else { // Is IM(-S) type of card...
 
@@ -272,12 +284,12 @@ int CmdLegicInfo(const char *Cmd) {
         }
 
         PrintAndLogEx(NORMAL, "DCF: %d (%02x %02x), Token Type=%s (OLE=%01u)",
-            dcf,
-            data[5],
-            data[6],
-            token_type,
-            (data[5]&0x80) >> 7
-        );
+                      dcf,
+                      data[5],
+                      data[6],
+                      token_type,
+                      (data[5] & 0x80) >> 7
+                     );
     }
 
     // Makes no sence to show this on blank media...
@@ -285,26 +297,26 @@ int CmdLegicInfo(const char *Cmd) {
 
         if (bIsSegmented) {
             PrintAndLogEx(NORMAL, "WRP=%02u, WRC=%01u, RD=%01u, SSC=%02x",
-                data[7] & 0x0f,
-                (data[7] & 0x70) >> 4,
-                (data[7] & 0x80) >> 7,
-                data[8]
-            );
+                          data[7] & 0x0f,
+                          (data[7] & 0x70) >> 4,
+                          (data[7] & 0x80) >> 7,
+                          data[8]
+                         );
         }
 
         // Header area is only available on IM-S cards, on master tokens this data is the master token data itself
         if (bIsSegmented || dcf > 60000) {
             if (dcf > 60000) {
                 PrintAndLogEx(NORMAL, "Master token data");
-                PrintAndLogEx(NORMAL, "%s", sprint_hex(data+8, 14));
+                PrintAndLogEx(NORMAL, "%s", sprint_hex(data + 8, 14));
             } else {
                 PrintAndLogEx(NORMAL, "Remaining Header Area");
-                PrintAndLogEx(NORMAL, "%s", sprint_hex(data+9, 13));
+                PrintAndLogEx(NORMAL, "%s", sprint_hex(data + 9, 13));
             }
         }
     }
 
-    uint8_t segCrcBytes[8] = {0,0,0,0,0,0,0,0};
+    uint8_t segCrcBytes[8] = {0, 0, 0, 0, 0, 0, 0, 0};
     uint32_t segCalcCRC = 0;
     uint32_t segCRC = 0;
 
@@ -315,18 +327,17 @@ int CmdLegicInfo(const char *Cmd) {
     PrintAndLogEx(NORMAL, "\nADF: User Area");
     PrintAndLogEx(NORMAL, "------------------------------------------------------");
 
-    if(bIsSegmented) {
+    if (bIsSegmented) {
 
         // Data start point on segmented cards
         i = 22;
 
         // decode segments
-        for (segmentNum=1; segmentNum < 128; segmentNum++ )
-        {
-            segment_len = ((data[i+1] ^ crc) & 0x0f) * 256 + (data[i] ^ crc);
-            segment_flag = ((data[i+1] ^ crc) & 0xf0) >> 4;
-            wrp = (data[i+2] ^ crc);
-            wrc = ((data[i+3] ^ crc) & 0x70) >> 4;
+        for (segmentNum = 1; segmentNum < 128; segmentNum++) {
+            segment_len = ((data[i + 1] ^ crc) & 0x0f) * 256 + (data[i] ^ crc);
+            segment_flag = ((data[i + 1] ^ crc) & 0xf0) >> 4;
+            wrp = (data[i + 2] ^ crc);
+            wrc = ((data[i + 3] ^ crc) & 0x70) >> 4;
 
             bool hasWRC = (wrc > 0);
             bool hasWRP = (wrp > wrc);
@@ -334,75 +345,75 @@ int CmdLegicInfo(const char *Cmd) {
             int remain_seg_payload_len = (segment_len - wrp - 5);
 
             // validate segment-crc
-            segCrcBytes[0]=data[0];           //uid0
-            segCrcBytes[1]=data[1];           //uid1
-            segCrcBytes[2]=data[2];           //uid2
-            segCrcBytes[3]=data[3];           //uid3
-            segCrcBytes[4]=(data[i] ^ crc);   //hdr0
-            segCrcBytes[5]=(data[i+1] ^ crc); //hdr1
-            segCrcBytes[6]=(data[i+2] ^ crc); //hdr2
-            segCrcBytes[7]=(data[i+3] ^ crc); //hdr3
+            segCrcBytes[0] = data[0];         //uid0
+            segCrcBytes[1] = data[1];         //uid1
+            segCrcBytes[2] = data[2];         //uid2
+            segCrcBytes[3] = data[3];         //uid3
+            segCrcBytes[4] = (data[i] ^ crc); //hdr0
+            segCrcBytes[5] = (data[i + 1] ^ crc); //hdr1
+            segCrcBytes[6] = (data[i + 2] ^ crc); //hdr2
+            segCrcBytes[7] = (data[i + 3] ^ crc); //hdr3
 
             segCalcCRC = CRC8Legic(segCrcBytes, 8);
-            segCRC = data[i+4] ^ crc;
+            segCRC = data[i + 4] ^ crc;
 
             PrintAndLogEx(NORMAL, "Segment %02u \nraw header | 0x%02X 0x%02X 0x%02X 0x%02X \nSegment len: %u,  Flag: 0x%X (valid:%01u, last:%01u), WRP: %02u, WRC: %02u, RD: %01u, CRC: 0x%02X (%s)",
-                segmentNum,
-                data[i] ^ crc,
-                data[i+1] ^ crc,
-                data[i+2] ^ crc,
-                data[i+3] ^ crc,
-                segment_len,
-                segment_flag,
-                (segment_flag & 0x4) >> 2,
-                (segment_flag & 0x8) >> 3,
-                wrp,
-                wrc,
-                ((data[i+3]^crc) & 0x80) >> 7,
-                segCRC,
-                ( segCRC == segCalcCRC ) ? "OK" : "fail"
-            );
+                          segmentNum,
+                          data[i] ^ crc,
+                          data[i + 1] ^ crc,
+                          data[i + 2] ^ crc,
+                          data[i + 3] ^ crc,
+                          segment_len,
+                          segment_flag,
+                          (segment_flag & 0x4) >> 2,
+                          (segment_flag & 0x8) >> 3,
+                          wrp,
+                          wrc,
+                          ((data[i + 3]^crc) & 0x80) >> 7,
+                          segCRC,
+                          (segCRC == segCalcCRC) ? "OK" : "fail"
+                         );
 
             i += 5;
 
-            if ( hasWRC ) {
+            if (hasWRC) {
                 PrintAndLogEx(NORMAL, "WRC protected area:   (I %d | K %d| WRC %d)", i, k, wrc);
                 PrintAndLogEx(NORMAL, "\nrow  | data");
                 PrintAndLogEx(NORMAL, "-----+------------------------------------------------");
 
-                for ( k=i; k < (i + wrc); ++k)
+                for (k = i; k < (i + wrc); ++k)
                     data[k] ^= crc;
 
-                print_hex_break( data+i, wrc, 16);
+                print_hex_break(data + i, wrc, 16);
 
                 i += wrc;
             }
 
-            if ( hasWRP ) {
-                PrintAndLogEx(NORMAL, "Remaining write protected area:  (I %d | K %d | WRC %d | WRP %d  WRP_LEN %d)",i, k, wrc, wrp, wrp_len);
+            if (hasWRP) {
+                PrintAndLogEx(NORMAL, "Remaining write protected area:  (I %d | K %d | WRC %d | WRP %d  WRP_LEN %d)", i, k, wrc, wrp, wrp_len);
                 PrintAndLogEx(NORMAL, "\nrow  | data");
                 PrintAndLogEx(NORMAL, "-----+------------------------------------------------");
 
-                for (k=i; k < (i+wrp_len); ++k)
+                for (k = i; k < (i + wrp_len); ++k)
                     data[k] ^= crc;
 
-                print_hex_break( data+i, wrp_len, 16);
+                print_hex_break(data + i, wrp_len, 16);
 
                 i += wrp_len;
 
                 // does this one work? (Answer: Only if KGH/BGH is used with BCD encoded card number! So maybe this will show just garbage...)
-                if( wrp_len == 8 )
-                    PrintAndLogEx(NORMAL, "Card ID: %2X%02X%02X", data[i-4]^crc, data[i-3]^crc, data[i-2]^crc);
+                if (wrp_len == 8)
+                    PrintAndLogEx(NORMAL, "Card ID: %2X%02X%02X", data[i - 4]^crc, data[i - 3]^crc, data[i - 2]^crc);
             }
 
             PrintAndLogEx(NORMAL, "Remaining segment payload:  (I %d | K %d | Remain LEN %d)", i, k, remain_seg_payload_len);
             PrintAndLogEx(NORMAL, "\nrow  | data");
             PrintAndLogEx(NORMAL, "-----+------------------------------------------------");
 
-            for ( k=i; k < (i+remain_seg_payload_len); ++k)
+            for (k = i; k < (i + remain_seg_payload_len); ++k)
                 data[k] ^= crc;
 
-            print_hex_break( data+i, remain_seg_payload_len, 16);
+            print_hex_break(data + i, remain_seg_payload_len, 16);
 
             i += remain_seg_payload_len;
 
@@ -428,35 +439,35 @@ int CmdLegicInfo(const char *Cmd) {
         int remain_seg_payload_len = (1024 - 22 - wrp); // Any chance to get physical card size here!?
 
         PrintAndLogEx(NORMAL, "Unsegmented card - WRP: %02u, WRC: %02u, RD: %01u",
-            wrp,
-            wrc,
-            (data[7] & 0x80) >> 7
-        );
+                      wrp,
+                      wrc,
+                      (data[7] & 0x80) >> 7
+                     );
 
-        if ( hasWRC ) {
+        if (hasWRC) {
             PrintAndLogEx(NORMAL, "WRC protected area:   (I %d | WRC %d)", i, wrc);
             PrintAndLogEx(NORMAL, "\nrow  | data");
             PrintAndLogEx(NORMAL, "-----+------------------------------------------------");
-            print_hex_break( data+i, wrc, 16);
+            print_hex_break(data + i, wrc, 16);
             i += wrc;
         }
 
-        if ( hasWRP ) {
+        if (hasWRP) {
             PrintAndLogEx(NORMAL, "Remaining write protected area:  (I %d | WRC %d | WRP %d | WRP_LEN %d)", i, wrc, wrp, wrp_len);
             PrintAndLogEx(NORMAL, "\nrow  | data");
             PrintAndLogEx(NORMAL, "-----+------------------------------------------------");
-            print_hex_break( data + i, wrp_len, 16);
+            print_hex_break(data + i, wrp_len, 16);
             i += wrp_len;
 
             // does this one work? (Answer: Only if KGH/BGH is used with BCD encoded card number! So maybe this will show just garbage...)
-            if( wrp_len == 8 )
-                PrintAndLogEx(NORMAL, "Card ID: %2X%02X%02X", data[i-4], data[i-3], data[i-2]);
+            if (wrp_len == 8)
+                PrintAndLogEx(NORMAL, "Card ID: %2X%02X%02X", data[i - 4], data[i - 3], data[i - 2]);
         }
 
         PrintAndLogEx(NORMAL, "Remaining segment payload:  (I %d | Remain LEN %d)", i, remain_seg_payload_len);
         PrintAndLogEx(NORMAL, "\nrow  | data");
         PrintAndLogEx(NORMAL, "-----+------------------------------------------------");
-        print_hex_break( data + i, remain_seg_payload_len, 16);
+        print_hex_break(data + i, remain_seg_payload_len, 16);
         i += remain_seg_payload_len;
 
         PrintAndLogEx(NORMAL, "-----+------------------------------------------------\n");
@@ -470,17 +481,18 @@ out:
 // params:
 // offset in data memory
 // number of bytes to read
-int CmdLegicRdmem(const char *Cmd) {
+int CmdLegicRdmem(const char *Cmd)
+{
 
     char cmdp = tolower(param_getchar(Cmd, 0));
-    if ( cmdp == 'h' ) return usage_legic_rdmem();
+    if (cmdp == 'h') return usage_legic_rdmem();
 
     uint32_t offset = 0, len = 0, iv = 1;
     uint16_t datalen = 0;
     sscanf(Cmd, "%x %x %x", &offset, &len, &iv);
 
     // sanity checks
-    if ( len + offset >= MAX_LENGTH ) {
+    if (len + offset >= MAX_LENGTH) {
         PrintAndLogEx(WARNING, "Out-of-bounds, Cardsize = %d, [offset+len = %d ]", MAX_LENGTH, len + offset);
         return -1;
     }
@@ -489,25 +501,26 @@ int CmdLegicRdmem(const char *Cmd) {
 
     // allocate receiver buffer
     uint8_t *data = calloc(len, sizeof(uint8_t));
-    if ( !data ){
+    if (!data) {
         PrintAndLogEx(WARNING, "Cannot allocate memory");
         return -2;
     }
 
     int status = legic_read_mem(offset, len, iv, data, &datalen);
-    if ( status == 0 ) {
-    PrintAndLogEx(NORMAL, "\n ##  |  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F");
-    PrintAndLogEx(NORMAL, "-----+------------------------------------------------------------------------------------------------");
+    if (status == 0) {
+        PrintAndLogEx(NORMAL, "\n ##  |  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F");
+        PrintAndLogEx(NORMAL, "-----+------------------------------------------------------------------------------------------------");
         print_hex_break(data, datalen, 32);
     }
     free(data);
     return status;
 }
 
-int CmdLegicRfSim(const char *Cmd) {
+int CmdLegicRfSim(const char *Cmd)
+{
 
     char cmdp = tolower(param_getchar(Cmd, 0));
-    if ( strlen(Cmd) == 0 || cmdp == 'h' ) return usage_legic_sim();
+    if (strlen(Cmd) == 0 || cmdp == 'h') return usage_legic_sim();
 
     UsbCommand c = {CMD_SIMULATE_TAG_LEGIC_RF, {1}};
     sscanf(Cmd, " %" SCNi64, &c.arg[0]);
@@ -516,7 +529,8 @@ int CmdLegicRfSim(const char *Cmd) {
     return 0;
 }
 
-int CmdLegicRfWrite(const char *Cmd) {
+int CmdLegicRfWrite(const char *Cmd)
+{
 
     uint8_t *data = NULL;
     uint8_t cmdp = 0;
@@ -526,65 +540,65 @@ int CmdLegicRfWrite(const char *Cmd) {
 
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
-        case 'd':
-            // peek at length of the input string so we can
-            // figure out how many elements to malloc in "data"
-            bg=en=0;
-            if (param_getptr(Cmd, &bg, &en, cmdp+1)) {
+            case 'd':
+                // peek at length of the input string so we can
+                // figure out how many elements to malloc in "data"
+                bg = en = 0;
+                if (param_getptr(Cmd, &bg, &en, cmdp + 1)) {
+                    errors = true;
+                    break;
+                }
+                len = (en - bg + 1);
+
+                // check that user entered even number of characters
+                // for hex data string
+                if (len & 1) {
+                    errors = true;
+                    break;
+                }
+
+                // limit number of bytes to write. This is not a 'restore' command.
+                if ((len >> 1) > 100) {
+                    PrintAndLogEx(WARNING, "Max bound on 100bytes to write a one time.");
+                    PrintAndLogEx(WARNING, "Use the 'hf legic restore' command if you want to write the whole tag at once");
+                    errors = true;
+                }
+
+                // it's possible for user to accidentally enter "b" parameter
+                // more than once - we have to clean previous malloc
+                if (data)
+                    free(data);
+
+                data = calloc(len >> 1, sizeof(uint8_t));
+                if (data == NULL) {
+                    PrintAndLogEx(WARNING, "Can't allocate memory. exiting");
+                    errors = true;
+                    break;
+                }
+
+                if (param_gethex(Cmd, cmdp + 1, data, len)) {
+                    errors = true;
+                    break;
+                }
+
+                len >>= 1;
+                cmdp += 2;
+                break;
+            case 'o':
+                offset = param_get32ex(Cmd, cmdp + 1, 4, 16);
+                cmdp += 2;
+                break;
+            case 'h':
                 errors = true;
                 break;
-            }
-            len = (en - bg + 1);
-
-            // check that user entered even number of characters
-            // for hex data string
-            if (len & 1) {
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
                 errors = true;
                 break;
-            }
-
-            // limit number of bytes to write. This is not a 'restore' command.
-            if ( (len >> 1) > 100 ){
-                PrintAndLogEx(WARNING, "Max bound on 100bytes to write a one time.");
-                PrintAndLogEx(WARNING, "Use the 'hf legic restore' command if you want to write the whole tag at once");
-                errors = true;
-            }
-
-            // it's possible for user to accidentally enter "b" parameter
-            // more than once - we have to clean previous malloc
-            if (data)
-                free(data);
-
-            data = calloc(len >> 1, sizeof(uint8_t));
-            if ( data == NULL ) {
-                PrintAndLogEx(WARNING, "Can't allocate memory. exiting");
-                errors = true;
-                break;
-            }
-
-            if (param_gethex(Cmd, cmdp+1, data, len)) {
-                errors = true;
-                break;
-            }
-
-            len >>= 1;
-            cmdp += 2;
-            break;
-        case 'o':
-            offset = param_get32ex(Cmd, cmdp+1, 4, 16);
-            cmdp += 2;
-            break;
-        case 'h':
-            errors = true;
-            break;
-        default:
-            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-            errors = true;
-            break;
         }
     }
     //Validations
-    if (errors || cmdp == 0){
+    if (errors || cmdp == 0) {
         if (data)
             free(data);
         return usage_legic_write();
@@ -601,12 +615,12 @@ int CmdLegicRfWrite(const char *Cmd) {
 
     // OUT-OF-BOUNDS checks
     // UID 4+1 bytes can't be written to.
-    if ( offset < 5 ) {
+    if (offset < 5) {
         PrintAndLogEx(WARNING, "Out-of-bounds, bytes 0-1-2-3-4 can't be written to. Offset = %d", offset);
         return -2;
     }
 
-    if ( len + offset >= card.cardsize ) {
+    if (len + offset >= card.cardsize) {
         PrintAndLogEx(WARNING, "Out-of-bounds, Cardsize = %d, [offset+len = %d ]", card.cardsize, len + offset);
         return -2;
     }
@@ -618,7 +632,7 @@ int CmdLegicRfWrite(const char *Cmd) {
         char *answer = NULL;
         answer = readline("do you really want to continue? y(es) n(o) : ");
         bool overwrite = (answer[0] == 'y' || answer[0] == 'Y');
-        if (!overwrite){
+        if (!overwrite) {
             PrintAndLogEx(NORMAL, "command cancelled");
             return 0;
         }
@@ -638,7 +652,8 @@ int CmdLegicRfWrite(const char *Cmd) {
     uint8_t timeout = 0;
     while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
         ++timeout;
-        printf("."); fflush(stdout);
+        printf(".");
+        fflush(stdout);
         if (timeout > 7) {
             PrintAndLogEx(WARNING, "\ncommand execution time out");
             return 1;
@@ -647,7 +662,7 @@ int CmdLegicRfWrite(const char *Cmd) {
     PrintAndLogEx(NORMAL, "\n");
 
     uint8_t isOK = resp.arg[0] & 0xFF;
-    if ( !isOK ) {
+    if (!isOK) {
         PrintAndLogEx(WARNING, "Failed writing tag");
         return 1;
     }
@@ -655,81 +670,82 @@ int CmdLegicRfWrite(const char *Cmd) {
     return 0;
 }
 
-int CmdLegicCalcCrc(const char *Cmd){
+int CmdLegicCalcCrc(const char *Cmd)
+{
 
     uint8_t *data = NULL;
-    uint8_t cmdp = 0, uidcrc = 0, type=0;
+    uint8_t cmdp = 0, uidcrc = 0, type = 0;
     bool errors = false;
     int len = 0;
     int bg, en;
 
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
-        case 'd':
-            // peek at length of the input string so we can
-            // figure out how many elements to malloc in "data"
-            bg=en=0;
-            if (param_getptr(Cmd, &bg, &en, cmdp+1)) {
+            case 'd':
+                // peek at length of the input string so we can
+                // figure out how many elements to malloc in "data"
+                bg = en = 0;
+                if (param_getptr(Cmd, &bg, &en, cmdp + 1)) {
+                    errors = true;
+                    break;
+                }
+                len = (en - bg + 1);
+
+                // check that user entered even number of characters
+                // for hex data string
+                if (len & 1) {
+                    errors = true;
+                    break;
+                }
+
+                // it's possible for user to accidentally enter "b" parameter
+                // more than once - we have to clean previous malloc
+                if (data) free(data);
+                data = calloc(len >> 1,  sizeof(uint8_t));
+                if (data == NULL) {
+                    PrintAndLogEx(WARNING, "Can't allocate memory. exiting");
+                    errors = true;
+                    break;
+                }
+
+                if (param_gethex(Cmd, cmdp + 1, data, len)) {
+                    errors = true;
+                    break;
+                }
+
+                len >>= 1;
+                cmdp += 2;
+                break;
+            case 'u':
+                uidcrc = param_get8ex(Cmd, cmdp + 1, 0, 16);
+                cmdp += 2;
+                break;
+            case 'c':
+                type = param_get8ex(Cmd, cmdp + 1, 0, 10);
+                cmdp += 2;
+                break;
+            case 'h':
                 errors = true;
                 break;
-            }
-            len = (en - bg + 1);
-
-            // check that user entered even number of characters
-            // for hex data string
-            if (len & 1) {
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
                 errors = true;
                 break;
-            }
-
-            // it's possible for user to accidentally enter "b" parameter
-            // more than once - we have to clean previous malloc
-            if (data) free(data);
-            data = calloc(len >> 1,  sizeof(uint8_t) );
-            if ( data == NULL ) {
-                PrintAndLogEx(WARNING, "Can't allocate memory. exiting");
-                errors = true;
-                break;
-            }
-
-            if (param_gethex(Cmd, cmdp+1, data, len)) {
-                errors = true;
-                break;
-            }
-
-            len >>= 1;
-            cmdp += 2;
-            break;
-        case 'u':
-            uidcrc = param_get8ex(Cmd, cmdp+1, 0, 16);
-            cmdp += 2;
-            break;
-        case 'c':
-            type = param_get8ex(Cmd, cmdp+1, 0, 10);
-            cmdp += 2;
-            break;
-        case 'h':
-            errors = true;
-            break;
-        default:
-            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-            errors = true;
-            break;
         }
     }
     //Validations
-    if (errors || cmdp == 0){
+    if (errors || cmdp == 0) {
         if (data) free(data);
         return usage_legic_calccrc();
     }
 
-    switch (type){
+    switch (type) {
         case 16:
             init_table(CRC_LEGIC);
             PrintAndLogEx(SUCCESS, "Legic crc16: %X", crc16_legic(data, len, uidcrc));
             break;
         default:
-            PrintAndLogEx(SUCCESS, "Legic crc8: %X",  CRC8Legic(data, len) );
+            PrintAndLogEx(SUCCESS, "Legic crc8: %X",  CRC8Legic(data, len));
             break;
     }
 
@@ -737,7 +753,8 @@ int CmdLegicCalcCrc(const char *Cmd){
     return 0;
 }
 
-int legic_read_mem(uint32_t offset, uint32_t len, uint32_t iv, uint8_t *out, uint16_t *outlen) {
+int legic_read_mem(uint32_t offset, uint32_t len, uint32_t iv, uint8_t *out, uint16_t *outlen)
+{
 
     legic_chk_iv(&iv);
 
@@ -749,7 +766,8 @@ int legic_read_mem(uint32_t offset, uint32_t len, uint32_t iv, uint8_t *out, uin
     uint8_t timeout = 0;
     while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
         ++timeout;
-        printf("."); fflush(stdout);
+        printf(".");
+        fflush(stdout);
         if (timeout > 7) {
             PrintAndLogEx(WARNING, "\ncommand execution time out");
             return 1;
@@ -759,42 +777,44 @@ int legic_read_mem(uint32_t offset, uint32_t len, uint32_t iv, uint8_t *out, uin
 
     uint8_t isOK = resp.arg[0] & 0xFF;
     *outlen = resp.arg[1];
-    if ( !isOK ) {
+    if (!isOK) {
         PrintAndLogEx(WARNING, "Failed reading tag");
         return 2;
     }
 
-    if ( *outlen != len )
+    if (*outlen != len)
         PrintAndLogEx(WARNING, "Fail, only managed to read %u bytes", *outlen);
 
     // copy data from device
-    if ( !GetFromDevice( BIG_BUF_EML, out, *outlen, 0, NULL, 2500, false) ) {
+    if (!GetFromDevice(BIG_BUF_EML, out, *outlen, 0, NULL, 2500, false)) {
         PrintAndLogEx(WARNING, "Fail, transfer from device time-out");
         return 4;
     }
     return 0;
 }
 
-int legic_print_type(uint32_t tagtype, uint8_t spaces){
+int legic_print_type(uint32_t tagtype, uint8_t spaces)
+{
     char spc[11] = "          ";
-    spc[10]=0x00;
-    char *spacer = spc + (10-spaces);
+    spc[10] = 0x00;
+    char *spacer = spc + (10 - spaces);
 
-    if ( tagtype == 22 )
+    if (tagtype == 22)
         PrintAndLogEx(SUCCESS, "%sTYPE : MIM%d card (outdated)", spacer, tagtype);
-    else if ( tagtype == 256 )
+    else if (tagtype == 256)
         PrintAndLogEx(SUCCESS, "%sTYPE : MIM%d card (234 bytes)", spacer, tagtype);
-    else if ( tagtype == 1024 )
+    else if (tagtype == 1024)
         PrintAndLogEx(SUCCESS, "%sTYPE : MIM%d card (1002 bytes)", spacer, tagtype);
     else
         PrintAndLogEx(INFO, "%sTYPE : Unknown %06x", spacer, tagtype);
     return 0;
 }
-int legic_get_type(legic_card_select_t *card){
+int legic_get_type(legic_card_select_t *card)
+{
 
-    if ( card == NULL ) return 1;
+    if (card == NULL) return 1;
 
-    UsbCommand c = {CMD_LEGIC_INFO, {0,0,0}};
+    UsbCommand c = {CMD_LEGIC_INFO, {0, 0, 0}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
@@ -802,64 +822,70 @@ int legic_get_type(legic_card_select_t *card){
         return 2;
 
     uint8_t isOK = resp.arg[0] & 0xFF;
-    if ( !isOK )
+    if (!isOK)
         return 3;
 
     memcpy(card, (legic_card_select_t *)resp.d.asBytes, sizeof(legic_card_select_t));
     return 0;
 }
-void legic_chk_iv(uint32_t *iv){
-    if ( (*iv & 0x7F) != *iv ){
+void legic_chk_iv(uint32_t *iv)
+{
+    if ((*iv & 0x7F) != *iv) {
         *iv &= 0x7F;
         PrintAndLogEx(INFO, "Truncating IV to 7bits, %u", *iv);
     }
     // IV must be odd
-    if ( (*iv & 1) == 0 ){
+    if ((*iv & 1) == 0) {
         *iv |= 0x01;
         PrintAndLogEx(INFO, "LSB of IV must be SET %u", *iv);
     }
 }
-void legic_seteml(uint8_t *src, uint32_t offset, uint32_t numofbytes) {
+void legic_seteml(uint8_t *src, uint32_t offset, uint32_t numofbytes)
+{
     size_t len = 0;
 
     UsbCommand c = {CMD_LEGIC_ESET, {0, 0, 0}};
-    for(size_t i = offset; i < numofbytes; i += USB_CMD_DATA_SIZE) {
+    for (size_t i = offset; i < numofbytes; i += USB_CMD_DATA_SIZE) {
 
         len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);
         c.arg[0] = i; // offset
         c.arg[1] = len; // number of bytes
-        memcpy(c.d.asBytes, src+i, len);
+        memcpy(c.d.asBytes, src + i, len);
         clearCommandBuffer();
         SendCommand(&c);
     }
 }
 
-int HFLegicReader(const char *Cmd, bool verbose) {
+int HFLegicReader(const char *Cmd, bool verbose)
+{
 
     char cmdp = tolower(param_getchar(Cmd, 0));
-    if ( cmdp == 'h' ) return usage_legic_reader();
+    if (cmdp == 'h') return usage_legic_reader();
 
     legic_card_select_t card;
-    switch (legic_get_type(&card)){
+    switch (legic_get_type(&card)) {
         case 1:
             return 2;
         case 2:
-            if ( verbose ) PrintAndLogEx(WARNING, "command execution time out");
+            if (verbose) PrintAndLogEx(WARNING, "command execution time out");
             return 1;
         case 3:
-            if ( verbose ) PrintAndLogEx(WARNING, "legic card select failed");
+            if (verbose) PrintAndLogEx(WARNING, "legic card select failed");
             return 2;
-        default: break;
+        default:
+            break;
     }
     PrintAndLogEx(SUCCESS, " UID : %s", sprint_hex(card.uid, sizeof(card.uid)));
     legic_print_type(card.cardsize, 0);
     return 0;
 }
-int CmdLegicReader(const char *Cmd){
+int CmdLegicReader(const char *Cmd)
+{
     return HFLegicReader(Cmd, true);
 }
 
-int CmdLegicDump(const char *Cmd){
+int CmdLegicDump(const char *Cmd)
+{
 
     FILE *f;
     char filename[FILE_PATH_SIZE] = {0x00};
@@ -876,11 +902,11 @@ int CmdLegicDump(const char *Cmd){
             case 'h':
                 return usage_legic_dump();
             case 'o':
-                fileNlen = param_getstr(Cmd, cmdp+1, filename, FILE_PATH_SIZE);
+                fileNlen = param_getstr(Cmd, cmdp + 1, filename, FILE_PATH_SIZE);
                 if (!fileNlen)
                     errors = true;
-                if (fileNlen > FILE_PATH_SIZE-5)
-                    fileNlen = FILE_PATH_SIZE-5;
+                if (fileNlen > FILE_PATH_SIZE - 5)
+                    fileNlen = FILE_PATH_SIZE - 5;
                 cmdp += 2;
                 break;
             default:
@@ -911,7 +937,8 @@ int CmdLegicDump(const char *Cmd){
     uint8_t timeout = 0;
     while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
         ++timeout;
-        printf("."); fflush(stdout);
+        printf(".");
+        fflush(stdout);
         if (timeout > 7) {
             PrintAndLogEx(WARNING, "\ncommand execution time out");
             return 1;
@@ -920,7 +947,7 @@ int CmdLegicDump(const char *Cmd){
     PrintAndLogEx(NORMAL, "\n");
 
     uint8_t isOK = resp.arg[0] & 0xFF;
-    if ( !isOK ) {
+    if (!isOK) {
         PrintAndLogEx(WARNING, "Failed dumping tag data");
         return 2;
     }
@@ -932,11 +959,11 @@ int CmdLegicDump(const char *Cmd){
         return 3;
     }
 
-    if ( readlen != dumplen )
+    if (readlen != dumplen)
         PrintAndLogEx(WARNING, "Fail, only managed to read 0x%02X bytes of 0x%02X", readlen, dumplen);
 
     // copy data from device
-    if (!GetFromDevice( BIG_BUF_EML, data, readlen, 0, NULL, 2500, false) ) {
+    if (!GetFromDevice(BIG_BUF_EML, data, readlen, 0, NULL, 2500, false)) {
         PrintAndLogEx(WARNING, "Fail, transfer from device time-out");
         free(data);
         return 4;
@@ -944,9 +971,9 @@ int CmdLegicDump(const char *Cmd){
 
     // user supplied filename?
     if (fileNlen < 1)
-        sprintf(fnameptr,"%02X%02X%02X%02X.bin", data[0], data[1], data[2], data[3]);
+        sprintf(fnameptr, "%02X%02X%02X%02X.bin", data[0], data[1], data[2], data[3]);
     else
-        sprintf(fnameptr + fileNlen,".bin");
+        sprintf(fnameptr + fileNlen, ".bin");
 
     f = fopen(filename, "wb");
     if (!f) {
@@ -963,7 +990,8 @@ int CmdLegicDump(const char *Cmd){
     return 0;
 }
 
-int CmdLegicRestore(const char *Cmd){
+int CmdLegicRestore(const char *Cmd)
+{
 
     FILE *f;
     char filename[FILE_PATH_SIZE] = {0x00};
@@ -981,12 +1009,12 @@ int CmdLegicRestore(const char *Cmd){
                 errors = true;
                 break;
             case 'i':
-                fileNlen = param_getstr(Cmd, cmdp+1, filename, FILE_PATH_SIZE);
+                fileNlen = param_getstr(Cmd, cmdp + 1, filename, FILE_PATH_SIZE);
                 if (!fileNlen)
                     errors = true;
 
-                if (fileNlen > FILE_PATH_SIZE-5)
-                    fileNlen = FILE_PATH_SIZE-5;
+                if (fileNlen > FILE_PATH_SIZE - 5)
+                    fileNlen = FILE_PATH_SIZE - 5;
                 cmdp += 2;
                 break;
             default:
@@ -1007,7 +1035,7 @@ int CmdLegicRestore(const char *Cmd){
     numofbytes = card.cardsize;
 
     // set up buffer
-    uint8_t *data = calloc(numofbytes, sizeof(uint8_t) );
+    uint8_t *data = calloc(numofbytes, sizeof(uint8_t));
     if (!data) {
         PrintAndLogEx(WARNING, "Fail, cannot allocate memory");
         return 2;
@@ -1019,7 +1047,7 @@ int CmdLegicRestore(const char *Cmd){
     fnameptr += fileNlen;
     sprintf(fnameptr, ".bin");
 
-    f = fopen(filename,"rb");
+    f = fopen(filename, "rb");
     if (!f) {
         PrintAndLogEx(WARNING, "File %s not found or locked", filename);
         free(data);
@@ -1031,7 +1059,7 @@ int CmdLegicRestore(const char *Cmd){
     size_t filesize = ftell(f); // get current file pointer
     fseek(f, 0, SEEK_SET); // seek back to beginning of file
 
-    if ( filesize != numofbytes) {
+    if (filesize != numofbytes) {
         PrintAndLogEx(WARNING, "Fail, filesize and cardsize is not equal. [%u != %u]", filesize, numofbytes);
         free(data);
         fclose(f);
@@ -1042,7 +1070,7 @@ int CmdLegicRestore(const char *Cmd){
     size_t bytes_read = fread(data, 1, numofbytes, f);
     fclose(f);
 
-    if ( bytes_read == 0){
+    if (bytes_read == 0) {
         PrintAndLogEx(WARNING, "File reading error");
         free(data);
         return 2;
@@ -1054,19 +1082,20 @@ int CmdLegicRestore(const char *Cmd){
     size_t len = 0;
     UsbCommand c = {CMD_WRITER_LEGIC_RF, {0, 0, 0x55}};
     UsbCommand resp;
-    for(size_t i = 7; i < numofbytes; i += USB_CMD_DATA_SIZE) {
+    for (size_t i = 7; i < numofbytes; i += USB_CMD_DATA_SIZE) {
 
         len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);
         c.arg[0] = i; // offset
         c.arg[1] = len; // number of bytes
-        memcpy(c.d.asBytes, data+i, len);
+        memcpy(c.d.asBytes, data + i, len);
         clearCommandBuffer();
         SendCommand(&c);
 
         uint8_t timeout = 0;
         while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
             ++timeout;
-            printf("."); fflush(stdout);
+            printf(".");
+            fflush(stdout);
             if (timeout > 7) {
                 PrintAndLogEx(WARNING, "\ncommand execution time out");
                 free(data);
@@ -1076,12 +1105,12 @@ int CmdLegicRestore(const char *Cmd){
         PrintAndLogEx(NORMAL, "\n");
 
         uint8_t isOK = resp.arg[0] & 0xFF;
-        if ( !isOK ) {
+        if (!isOK) {
             PrintAndLogEx(WARNING, "Failed writing tag [msg = %u]", resp.arg[1] & 0xFF);
             free(data);
             return 1;
         }
-        PrintAndLogEx(SUCCESS, "Wrote chunk [offset %d | len %d | total %d", i, len, i+len);
+        PrintAndLogEx(SUCCESS, "Wrote chunk [offset %d | len %d | total %d", i, len, i + len);
     }
 
     free(data);
@@ -1089,23 +1118,33 @@ int CmdLegicRestore(const char *Cmd){
     return 0;
 }
 
-int CmdLegicELoad(const char *Cmd) {
-    FILE * f;
+int CmdLegicELoad(const char *Cmd)
+{
+    FILE *f;
     char filename[FILE_PATH_SIZE];
     char *fnameptr = filename;
     int len, numofbytes;
     int nameParamNo = 1;
 
     char cmdp = tolower(param_getchar(Cmd, 0));
-    if ( cmdp == 'h' || cmdp == 0x00)
+    if (cmdp == 'h' || cmdp == 0x00)
         return usage_legic_eload();
 
     switch (cmdp) {
-        case '0' : numofbytes = 22; break;
+        case '0' :
+            numofbytes = 22;
+            break;
         case '1' :
-        case '\0': numofbytes = 256; break;
-        case '2' : numofbytes = 1024; break;
-        default  : numofbytes = 256;  nameParamNo = 0;break;
+        case '\0':
+            numofbytes = 256;
+            break;
+        case '2' :
+            numofbytes = 1024;
+            break;
+        default  :
+            numofbytes = 256;
+            nameParamNo = 0;
+            break;
     }
 
     // set up buffer
@@ -1123,7 +1162,7 @@ int CmdLegicELoad(const char *Cmd) {
     sprintf(fnameptr, ".bin");
 
     // open file
-    f = fopen(filename,"rb");
+    f = fopen(filename, "rb");
     if (!f) {
         PrintAndLogEx(WARNING, "File %s not found or locked", filename);
         free(data);
@@ -1132,7 +1171,7 @@ int CmdLegicELoad(const char *Cmd) {
 
     // load file
     size_t bytes_read = fread(data, 1, numofbytes, f);
-    if ( bytes_read == 0){
+    if (bytes_read == 0) {
         PrintAndLogEx(WARNING, "File reading error");
         free(data);
         fclose(f);
@@ -1150,7 +1189,8 @@ int CmdLegicELoad(const char *Cmd) {
     return 0;
 }
 
-int CmdLegicESave(const char *Cmd) {
+int CmdLegicESave(const char *Cmd)
+{
 
     char filename[FILE_PATH_SIZE];
     char *fnameptr = filename;
@@ -1160,15 +1200,24 @@ int CmdLegicESave(const char *Cmd) {
 
     char cmdp = tolower(param_getchar(Cmd, 0));
 
-    if ( cmdp == 'h' || cmdp == 0x00)
+    if (cmdp == 'h' || cmdp == 0x00)
         return usage_legic_esave();
 
     switch (cmdp) {
-        case '0' : numofbytes = 22; break;
+        case '0' :
+            numofbytes = 22;
+            break;
         case '1' :
-        case '\0': numofbytes = 256; break;
-        case '2' : numofbytes = 1024; break;
-        default  : numofbytes = 256; nameParamNo = 0; break;
+        case '\0':
+            numofbytes = 256;
+            break;
+        case '2' :
+            numofbytes = 1024;
+            break;
+        default  :
+            numofbytes = 256;
+            nameParamNo = 0;
+            break;
     }
 
     fileNlen = param_getstr(Cmd, nameParamNo, filename, FILE_PATH_SIZE);
@@ -1185,27 +1234,28 @@ int CmdLegicESave(const char *Cmd) {
 
     // download emulator memory
     PrintAndLogEx(SUCCESS, "Reading emulator memory...");
-    if (!GetFromDevice( BIG_BUF_EML, data, numofbytes, 0, NULL, 2500, false)) {
+    if (!GetFromDevice(BIG_BUF_EML, data, numofbytes, 0, NULL, 2500, false)) {
         PrintAndLogEx(WARNING, "Fail, transfer from device time-out");
         free(data);
         return 4;
     }
     // user supplied filename?
     if (fileNlen < 1)
-        sprintf(fnameptr,"%02X%02X%02X%02X.bin", data[0], data[1], data[2], data[3]);
+        sprintf(fnameptr, "%02X%02X%02X%02X.bin", data[0], data[1], data[2], data[3]);
     else
-        sprintf(fnameptr + fileNlen,".bin");
+        sprintf(fnameptr + fileNlen, ".bin");
 
     saveFileEML(filename, "eml", data, numofbytes, 8);
     saveFile(filename, "bin", data, numofbytes);
     return 0;
 }
 
-int CmdLegicWipe(const char *Cmd){
+int CmdLegicWipe(const char *Cmd)
+{
 
     char cmdp = tolower(param_getchar(Cmd, 0));
 
-    if ( cmdp == 'h') return usage_legic_wipe();
+    if (cmdp == 'h') return usage_legic_wipe();
 
     // tagtype
     legic_card_select_t card;
@@ -1229,20 +1279,22 @@ int CmdLegicWipe(const char *Cmd){
     size_t len = 0;
     UsbCommand c = {CMD_WRITER_LEGIC_RF, {0, 0, 0x55}};
     UsbCommand resp;
-    for(size_t i = 7; i < card.cardsize; i += USB_CMD_DATA_SIZE) {
+    for (size_t i = 7; i < card.cardsize; i += USB_CMD_DATA_SIZE) {
 
-        printf("."); fflush(stdout);
+        printf(".");
+        fflush(stdout);
         len = MIN((card.cardsize - i), USB_CMD_DATA_SIZE);
         c.arg[0] = i; // offset
         c.arg[1] = len; // number of bytes
-        memcpy(c.d.asBytes, data+i, len);
+        memcpy(c.d.asBytes, data + i, len);
         clearCommandBuffer();
         SendCommand(&c);
 
         uint8_t timeout = 0;
         while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
             ++timeout;
-            printf("."); fflush(stdout);
+            printf(".");
+            fflush(stdout);
             if (timeout > 7) {
                 PrintAndLogEx(WARNING, "\ncommand execution time out");
                 free(data);
@@ -1252,7 +1304,7 @@ int CmdLegicWipe(const char *Cmd){
         PrintAndLogEx(NORMAL, "\n");
 
         uint8_t isOK = resp.arg[0] & 0xFF;
-        if ( !isOK ) {
+        if (!isOK) {
             PrintAndLogEx(WARNING, "Failed writing tag [msg = %u]", resp.arg[1] & 0xFF);
             free(data);
             return 4;
@@ -1262,7 +1314,8 @@ int CmdLegicWipe(const char *Cmd){
     return 0;
 }
 
-int CmdLegicList(const char *Cmd) {
+int CmdLegicList(const char *Cmd)
+{
     CmdTraceList("legic");
     return 0;
 }
@@ -1284,13 +1337,15 @@ static command_t CommandTable[] =  {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdHFLegic(const char *Cmd) {
+int CmdHFLegic(const char *Cmd)
+{
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
+int CmdHelp(const char *Cmd)
+{
     CmdsHelp(CommandTable);
     return 0;
 }
\ No newline at end of file
diff --git a/client/cmdhflist.c b/client/cmdhflist.c
index 1dc6777b9..09de4d1ec 100644
--- a/client/cmdhflist.c
+++ b/client/cmdhflist.c
@@ -24,7 +24,8 @@ enum MifareAuthSeq {
 static enum MifareAuthSeq MifareAuthState;
 static TAuthData AuthData;
 
-void ClearAuthData() {
+void ClearAuthData()
+{
     AuthData.uid = 0;
     AuthData.nt = 0;
     AuthData.first_auth = true;
@@ -42,14 +43,16 @@ void ClearAuthData() {
  *          2 : Not crc-command
  */
 
-uint8_t iso14443A_CRC_check(bool isResponse, uint8_t* d, uint8_t n) {
+uint8_t iso14443A_CRC_check(bool isResponse, uint8_t *d, uint8_t n)
+{
     if (n < 3) return 2;
     if (isResponse & (n < 6)) return 2;
     return check_crc(CRC_14443_A, d, n);
 }
 
-uint8_t mifare_CRC_check(bool isResponse, uint8_t* data, uint8_t len) {
-    switch(MifareAuthState) {
+uint8_t mifare_CRC_check(bool isResponse, uint8_t *data, uint8_t len)
+{
+    switch (MifareAuthState) {
         case masNone:
         case masError:
             return iso14443A_CRC_check(isResponse, data, len);
@@ -66,11 +69,13 @@ uint8_t mifare_CRC_check(bool isResponse, uint8_t* data, uint8_t len) {
  *          1 : CRC-command, CRC ok
  *          2 : Not crc-command
  */
-uint8_t iso14443B_CRC_check(uint8_t* d, uint8_t n) {
+uint8_t iso14443B_CRC_check(uint8_t *d, uint8_t n)
+{
     return check_crc(CRC_14443_B, d, n);
 }
 
-uint8_t iso15693_CRC_check(uint8_t* d, uint8_t n) {
+uint8_t iso15693_CRC_check(uint8_t *d, uint8_t n)
+{
     return check_crc(CRC_15693, d, n);
 }
 
@@ -83,7 +88,8 @@ uint8_t iso15693_CRC_check(uint8_t* d, uint8_t n) {
  *          1 : CRC-command, CRC ok
  *          2 : Not crc-command
  */
-uint8_t iclass_CRC_check(bool isResponse, uint8_t* d, uint8_t n) {
+uint8_t iclass_CRC_check(bool isResponse, uint8_t *d, uint8_t n)
+{
     //CRC commands (and responses) are all at least 4 bytes
     if (n < 4) return 2;
 
@@ -100,7 +106,7 @@ uint8_t iclass_CRC_check(bool isResponse, uint8_t* d, uint8_t n) {
           **/
         //Covers three of them
         if (n == 4 || n == 12) {
-            return check_crc( CRC_ICLASS, d+1, n-1);
+            return check_crc(CRC_ICLASS, d + 1, n - 1);
         }
         return 2;
     }
@@ -127,200 +133,338 @@ uint8_t iclass_CRC_check(bool isResponse, uint8_t* d, uint8_t n) {
       **/
     if (n != 10 && n != 34) return true;
 
-    return check_crc( CRC_ICLASS, d, n);
+    return check_crc(CRC_ICLASS, d, n);
 }
 
-int applyIso14443a(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize) {
-    switch ( cmd[0] ){
-        case ISO14443A_CMD_WUPA:        snprintf(exp,size,"WUPA"); break;
-        case ISO14443A_CMD_ANTICOLL_OR_SELECT:{
+int applyIso14443a(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize)
+{
+    switch (cmd[0]) {
+        case ISO14443A_CMD_WUPA:
+            snprintf(exp, size, "WUPA");
+            break;
+        case ISO14443A_CMD_ANTICOLL_OR_SELECT: {
             // 93 20 = Anticollision (usage: 9320 - answer: 4bytes UID+1byte UID-bytes-xor)
             // 93 70 = Select (usage: 9370+5bytes 9320 answer - answer: 1byte SAK)
-            if(cmd[1] == 0x70)
-                snprintf(exp,size,"SELECT_UID");
+            if (cmd[1] == 0x70)
+                snprintf(exp, size, "SELECT_UID");
             else
-                snprintf(exp,size,"ANTICOLL");
+                snprintf(exp, size, "ANTICOLL");
             break;
         }
-        case ISO14443A_CMD_ANTICOLL_OR_SELECT_2:{
+        case ISO14443A_CMD_ANTICOLL_OR_SELECT_2: {
             //95 20 = Anticollision of cascade level2
             //95 70 = Select of cascade level2
-            if(cmd[2] == 0x70)
-                snprintf(exp,size,"SELECT_UID-2");
+            if (cmd[2] == 0x70)
+                snprintf(exp, size, "SELECT_UID-2");
             else
-                snprintf(exp,size,"ANTICOLL-2");
+                snprintf(exp, size, "ANTICOLL-2");
             break;
         }
-        case ISO14443A_CMD_REQA:        snprintf(exp,size,"REQA"); break;
-        case ISO14443A_CMD_READBLOCK:   snprintf(exp,size,"READBLOCK(%d)",cmd[1]); break;
-        case ISO14443A_CMD_WRITEBLOCK:  snprintf(exp,size,"WRITEBLOCK(%d)",cmd[1]); break;
+        case ISO14443A_CMD_REQA:
+            snprintf(exp, size, "REQA");
+            break;
+        case ISO14443A_CMD_READBLOCK:
+            snprintf(exp, size, "READBLOCK(%d)", cmd[1]);
+            break;
+        case ISO14443A_CMD_WRITEBLOCK:
+            snprintf(exp, size, "WRITEBLOCK(%d)", cmd[1]);
+            break;
         case ISO14443A_CMD_HALT:
-            snprintf(exp,size,"HALT");
+            snprintf(exp, size, "HALT");
             MifareAuthState = masNone;
             break;
-        case ISO14443A_CMD_RATS:        snprintf(exp,size,"RATS"); break;
-        case ISO14443A_CMD_OPTS:        snprintf(exp,size,"OPTIONAL TIMESLOT"); break;
-        case MIFARE_CMD_INC:            snprintf(exp,size,"INC(%d)",cmd[1]); break;
-        case MIFARE_CMD_DEC:            snprintf(exp,size,"DEC(%d)",cmd[1]); break;
-        case MIFARE_CMD_RESTORE:        snprintf(exp,size,"RESTORE(%d)",cmd[1]); break;
-        case MIFARE_CMD_TRANSFER:       snprintf(exp,size,"TRANSFER(%d)",cmd[1]); break;
-        case MIFARE_AUTH_KEYA:{
-            if ( cmdsize > 3) {
-                snprintf(exp,size,"AUTH-A(%d)",cmd[1]);
+        case ISO14443A_CMD_RATS:
+            snprintf(exp, size, "RATS");
+            break;
+        case ISO14443A_CMD_OPTS:
+            snprintf(exp, size, "OPTIONAL TIMESLOT");
+            break;
+        case MIFARE_CMD_INC:
+            snprintf(exp, size, "INC(%d)", cmd[1]);
+            break;
+        case MIFARE_CMD_DEC:
+            snprintf(exp, size, "DEC(%d)", cmd[1]);
+            break;
+        case MIFARE_CMD_RESTORE:
+            snprintf(exp, size, "RESTORE(%d)", cmd[1]);
+            break;
+        case MIFARE_CMD_TRANSFER:
+            snprintf(exp, size, "TRANSFER(%d)", cmd[1]);
+            break;
+        case MIFARE_AUTH_KEYA: {
+            if (cmdsize > 3) {
+                snprintf(exp, size, "AUTH-A(%d)", cmd[1]);
                 MifareAuthState = masNt;
             } else {
                 // case MIFARE_ULEV1_VERSION :  both 0x60.
-                snprintf(exp,size,"EV1 VERSION");
+                snprintf(exp, size, "EV1 VERSION");
             }
             break;
         }
         case MIFARE_AUTH_KEYB: {
             MifareAuthState = masNt;
-            snprintf(exp,size,"AUTH-B(%d)",cmd[1]);
+            snprintf(exp, size, "AUTH-B(%d)", cmd[1]);
             break;
         }
-        case MIFARE_MAGICWUPC1:         snprintf(exp,size,"MAGIC WUPC1"); break;
-        case MIFARE_MAGICWUPC2:         snprintf(exp,size,"MAGIC WUPC2"); break;
-        case MIFARE_MAGICWIPEC:         snprintf(exp,size,"MAGIC WIPEC"); break;
-        case MIFARE_ULC_AUTH_1:         snprintf(exp,size,"AUTH "); break;
-        case MIFARE_ULC_AUTH_2:         snprintf(exp,size,"AUTH_ANSW"); break;
+        case MIFARE_MAGICWUPC1:
+            snprintf(exp, size, "MAGIC WUPC1");
+            break;
+        case MIFARE_MAGICWUPC2:
+            snprintf(exp, size, "MAGIC WUPC2");
+            break;
+        case MIFARE_MAGICWIPEC:
+            snprintf(exp, size, "MAGIC WIPEC");
+            break;
+        case MIFARE_ULC_AUTH_1:
+            snprintf(exp, size, "AUTH ");
+            break;
+        case MIFARE_ULC_AUTH_2:
+            snprintf(exp, size, "AUTH_ANSW");
+            break;
         case MIFARE_ULEV1_AUTH:
-            if ( cmdsize == 7 )
-                snprintf(exp,size,"PWD-AUTH KEY: 0x%02x%02x%02x%02x", cmd[1], cmd[2], cmd[3], cmd[4] );
+            if (cmdsize == 7)
+                snprintf(exp, size, "PWD-AUTH KEY: 0x%02x%02x%02x%02x", cmd[1], cmd[2], cmd[3], cmd[4]);
             else
-                snprintf(exp,size,"PWD-AUTH");
+                snprintf(exp, size, "PWD-AUTH");
             break;
         case MIFARE_ULEV1_FASTREAD : {
-            if ( cmdsize >=3 && cmd[2] <= 0xE6)
-                snprintf(exp,size,"READ RANGE (%d-%d)",cmd[1],cmd[2]);
+            if (cmdsize >= 3 && cmd[2] <= 0xE6)
+                snprintf(exp, size, "READ RANGE (%d-%d)", cmd[1], cmd[2]);
             else
                 // outside limits, useful for some tags...
-                snprintf(exp,size,"READ RANGE (%d-%d) (?)",cmd[1], cmd[2]);
+                snprintf(exp, size, "READ RANGE (%d-%d) (?)", cmd[1], cmd[2]);
             break;
         }
         case MIFARE_ULC_WRITE : {
-            if ( cmd[1] < 0x21 )
-                snprintf(exp,size,"WRITEBLOCK(%d)",cmd[1]);
+            if (cmd[1] < 0x21)
+                snprintf(exp, size, "WRITEBLOCK(%d)", cmd[1]);
             else
                 // outside limits, useful for some tags...
                 snprintf(exp, size, "WRITEBLOCK(%d) (?)", cmd[1]);
             break;
         }
-        case MIFARE_ULEV1_READ_CNT :{
-            if ( cmd[1] < 5 )
-                snprintf(exp,size,"READ CNT(%d)",cmd[1]);
+        case MIFARE_ULEV1_READ_CNT : {
+            if (cmd[1] < 5)
+                snprintf(exp, size, "READ CNT(%d)", cmd[1]);
             else
-                snprintf(exp,size,"?");
+                snprintf(exp, size, "?");
             break;
         }
         case MIFARE_ULEV1_INCR_CNT : {
-            if ( cmd[1] < 5 )
-                snprintf(exp,size,"INCR(%d)",cmd[1]);
+            if (cmd[1] < 5)
+                snprintf(exp, size, "INCR(%d)", cmd[1]);
             else
-                snprintf(exp,size,"?");
+                snprintf(exp, size, "?");
             break;
         }
-        case MIFARE_ULEV1_READSIG:      snprintf(exp,size,"READ_SIG"); break;
-        case MIFARE_ULEV1_CHECKTEAR:    snprintf(exp,size,"CHK_TEARING(%d)",cmd[1]); break;
-        case MIFARE_ULEV1_VCSL:         snprintf(exp,size,"VCSL"); break;
-        default:                        return 0;
+        case MIFARE_ULEV1_READSIG:
+            snprintf(exp, size, "READ_SIG");
+            break;
+        case MIFARE_ULEV1_CHECKTEAR:
+            snprintf(exp, size, "CHK_TEARING(%d)", cmd[1]);
+            break;
+        case MIFARE_ULEV1_VCSL:
+            snprintf(exp, size, "VCSL");
+            break;
+        default:
+            return 0;
     }
     return 1;
 }
 
-void annotateIso14443a(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize) {
+void annotateIso14443a(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize)
+{
     applyIso14443a(exp, size, cmd, cmdsize);
 }
 
-void annotateIclass(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize) {
+void annotateIclass(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize)
+{
     switch (cmd[0]) {
-        case ICLASS_CMD_ACTALL:      snprintf(exp,size,"ACTALL"); break;
-        case ICLASS_CMD_READ_OR_IDENTIFY:{
-            if(cmdsize > 1){
-                snprintf(exp,size,"READ(%d)",cmd[1]);
-            }else{
-                snprintf(exp,size,"IDENTIFY");
+        case ICLASS_CMD_ACTALL:
+            snprintf(exp, size, "ACTALL");
+            break;
+        case ICLASS_CMD_READ_OR_IDENTIFY: {
+            if (cmdsize > 1) {
+                snprintf(exp, size, "READ(%d)", cmd[1]);
+            } else {
+                snprintf(exp, size, "IDENTIFY");
             }
             break;
         }
-        case ICLASS_CMD_SELECT:         snprintf(exp,size,"SELECT"); break;
-        case ICLASS_CMD_PAGESEL:        snprintf(exp,size,"PAGESEL(%d)", cmd[1]); break;
-        case ICLASS_CMD_READCHECK_KC:   snprintf(exp,size,"READCHECK[Kc](%d)", cmd[1]); break;
-        case ICLASS_CMD_READCHECK_KD:   snprintf(exp,size,"READCHECK[Kd](%d)", cmd[1]); break;
-        case ICLASS_CMD_CHECK:          snprintf(exp,size,"CHECK"); break;
-        case ICLASS_CMD_DETECT:         snprintf(exp,size,"DETECT"); break;
-        case ICLASS_CMD_HALT:           snprintf(exp,size,"HALT"); break;
-        case ICLASS_CMD_UPDATE:         snprintf(exp,size,"UPDATE(%d)",cmd[1]); break;
-        case ICLASS_CMD_ACT:            snprintf(exp,size,"ACT"); break;
-        case ICLASS_CMD_READ4:          snprintf(exp,size,"READ4(%d)",cmd[1]); break;
-        default:                        snprintf(exp,size,"?"); break;
+        case ICLASS_CMD_SELECT:
+            snprintf(exp, size, "SELECT");
+            break;
+        case ICLASS_CMD_PAGESEL:
+            snprintf(exp, size, "PAGESEL(%d)", cmd[1]);
+            break;
+        case ICLASS_CMD_READCHECK_KC:
+            snprintf(exp, size, "READCHECK[Kc](%d)", cmd[1]);
+            break;
+        case ICLASS_CMD_READCHECK_KD:
+            snprintf(exp, size, "READCHECK[Kd](%d)", cmd[1]);
+            break;
+        case ICLASS_CMD_CHECK:
+            snprintf(exp, size, "CHECK");
+            break;
+        case ICLASS_CMD_DETECT:
+            snprintf(exp, size, "DETECT");
+            break;
+        case ICLASS_CMD_HALT:
+            snprintf(exp, size, "HALT");
+            break;
+        case ICLASS_CMD_UPDATE:
+            snprintf(exp, size, "UPDATE(%d)", cmd[1]);
+            break;
+        case ICLASS_CMD_ACT:
+            snprintf(exp, size, "ACT");
+            break;
+        case ICLASS_CMD_READ4:
+            snprintf(exp, size, "READ4(%d)", cmd[1]);
+            break;
+        default:
+            snprintf(exp, size, "?");
+            break;
     }
     return;
 }
 
-void annotateIso15693(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize) {
+void annotateIso15693(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize)
+{
 
-    switch(cmd[1]){
-        case ISO15693_INVENTORY:            snprintf(exp, size, "INVENTORY");return;
-        case ISO15693_STAYQUIET:            snprintf(exp, size, "STAY_QUIET");return;
-        case ISO15693_READBLOCK:            snprintf(exp, size, "READBLOCK");return;
-        case ISO15693_WRITEBLOCK:           snprintf(exp, size, "WRITEBLOCK");return;
-        case ISO15693_LOCKBLOCK:            snprintf(exp, size, "LOCKBLOCK");return;
-        case ISO15693_READ_MULTI_BLOCK:     snprintf(exp, size, "READ_MULTI_BLOCK");return;
-        case ISO15693_SELECT:               snprintf(exp, size, "SELECT");return;
-        case ISO15693_RESET_TO_READY:       snprintf(exp, size, "RESET_TO_READY");return;
-        case ISO15693_WRITE_AFI:            snprintf(exp, size, "WRITE_AFI");return;
-        case ISO15693_LOCK_AFI:             snprintf(exp, size, "LOCK_AFI");return;
-        case ISO15693_WRITE_DSFID:          snprintf(exp, size, "WRITE_DSFID");return;
-        case ISO15693_LOCK_DSFID:           snprintf(exp, size, "LOCK_DSFID");return;
-        case ISO15693_GET_SYSTEM_INFO:      snprintf(exp, size, "GET_SYSTEM_INFO");return;
-        case ISO15693_READ_MULTI_SECSTATUS: snprintf(exp, size, "READ_MULTI_SECSTATUS");return;
-        default:                            break;
+    switch (cmd[1]) {
+        case ISO15693_INVENTORY:
+            snprintf(exp, size, "INVENTORY");
+            return;
+        case ISO15693_STAYQUIET:
+            snprintf(exp, size, "STAY_QUIET");
+            return;
+        case ISO15693_READBLOCK:
+            snprintf(exp, size, "READBLOCK");
+            return;
+        case ISO15693_WRITEBLOCK:
+            snprintf(exp, size, "WRITEBLOCK");
+            return;
+        case ISO15693_LOCKBLOCK:
+            snprintf(exp, size, "LOCKBLOCK");
+            return;
+        case ISO15693_READ_MULTI_BLOCK:
+            snprintf(exp, size, "READ_MULTI_BLOCK");
+            return;
+        case ISO15693_SELECT:
+            snprintf(exp, size, "SELECT");
+            return;
+        case ISO15693_RESET_TO_READY:
+            snprintf(exp, size, "RESET_TO_READY");
+            return;
+        case ISO15693_WRITE_AFI:
+            snprintf(exp, size, "WRITE_AFI");
+            return;
+        case ISO15693_LOCK_AFI:
+            snprintf(exp, size, "LOCK_AFI");
+            return;
+        case ISO15693_WRITE_DSFID:
+            snprintf(exp, size, "WRITE_DSFID");
+            return;
+        case ISO15693_LOCK_DSFID:
+            snprintf(exp, size, "LOCK_DSFID");
+            return;
+        case ISO15693_GET_SYSTEM_INFO:
+            snprintf(exp, size, "GET_SYSTEM_INFO");
+            return;
+        case ISO15693_READ_MULTI_SECSTATUS:
+            snprintf(exp, size, "READ_MULTI_SECSTATUS");
+            return;
+        default:
+            break;
     }
 
-    if ( cmd[1] >= 0x2D && cmd[1] <= 0x9F ) snprintf(exp, size, "Optional RFU");
-    else if ( cmd[1] >= 0xA0 && cmd[1] <= 0xDF ) snprintf(exp, size, "Cust IC MFG dependent");
-    else if ( cmd[1] >= 0xE0 && cmd[1] <= 0xFF ) snprintf(exp, size, "Proprietary IC MFG dependent");
+    if (cmd[1] >= 0x2D && cmd[1] <= 0x9F) snprintf(exp, size, "Optional RFU");
+    else if (cmd[1] >= 0xA0 && cmd[1] <= 0xDF) snprintf(exp, size, "Cust IC MFG dependent");
+    else if (cmd[1] >= 0xE0 && cmd[1] <= 0xFF) snprintf(exp, size, "Proprietary IC MFG dependent");
     else
         snprintf(exp, size, "?");
 }
 
-void annotateTopaz(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
-    switch(cmd[0]) {
-        case TOPAZ_REQA:                    snprintf(exp, size, "REQA");break;
-        case TOPAZ_WUPA:                    snprintf(exp, size, "WUPA");break;
-        case TOPAZ_RID:                     snprintf(exp, size, "RID");break;
-        case TOPAZ_RALL:                    snprintf(exp, size, "RALL");break;
-        case TOPAZ_READ:                    snprintf(exp, size, "READ");break;
-        case TOPAZ_WRITE_E:                 snprintf(exp, size, "WRITE-E");break;
-        case TOPAZ_WRITE_NE:                snprintf(exp, size, "WRITE-NE");break;
-        case TOPAZ_RSEG:                    snprintf(exp, size, "RSEG");break;
-        case TOPAZ_READ8:                   snprintf(exp, size, "READ8");break;
-        case TOPAZ_WRITE_E8:                snprintf(exp, size, "WRITE-E8");break;
-        case TOPAZ_WRITE_NE8:               snprintf(exp, size, "WRITE-NE8");break;
-        default:                            snprintf(exp,size,"?"); break;
+void annotateTopaz(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize)
+{
+    switch (cmd[0]) {
+        case TOPAZ_REQA:
+            snprintf(exp, size, "REQA");
+            break;
+        case TOPAZ_WUPA:
+            snprintf(exp, size, "WUPA");
+            break;
+        case TOPAZ_RID:
+            snprintf(exp, size, "RID");
+            break;
+        case TOPAZ_RALL:
+            snprintf(exp, size, "RALL");
+            break;
+        case TOPAZ_READ:
+            snprintf(exp, size, "READ");
+            break;
+        case TOPAZ_WRITE_E:
+            snprintf(exp, size, "WRITE-E");
+            break;
+        case TOPAZ_WRITE_NE:
+            snprintf(exp, size, "WRITE-NE");
+            break;
+        case TOPAZ_RSEG:
+            snprintf(exp, size, "RSEG");
+            break;
+        case TOPAZ_READ8:
+            snprintf(exp, size, "READ8");
+            break;
+        case TOPAZ_WRITE_E8:
+            snprintf(exp, size, "WRITE-E8");
+            break;
+        case TOPAZ_WRITE_NE8:
+            snprintf(exp, size, "WRITE-NE8");
+            break;
+        default:
+            snprintf(exp, size, "?");
+            break;
     }
 }
 
 // iso 7816-3
-void annotateIso7816(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
+void annotateIso7816(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize)
+{
     // S-block
-    if ( (cmd[0] & 0xC0) && (cmdsize == 3) ) {
-        switch ( (cmd[0] & 0x3f)  ) {
-            case 0x00   : snprintf(exp, size, "S-block RESYNCH req"); break;
-            case 0x20   : snprintf(exp, size, "S-block RESYNCH resp"); break;
-            case 0x01   : snprintf(exp, size, "S-block IFS req"); break;
-            case 0x21   : snprintf(exp, size, "S-block IFS resp"); break;
-            case 0x02   : snprintf(exp, size, "S-block ABORT req"); break;
-            case 0x22   : snprintf(exp, size, "S-block ABORT resp"); break;
-            case 0x03   : snprintf(exp, size, "S-block WTX reqt"); break;
-            case 0x23   : snprintf(exp, size, "S-block WTX resp"); break;
-            default     : snprintf(exp, size, "S-block"); break;
+    if ((cmd[0] & 0xC0) && (cmdsize == 3)) {
+        switch ((cmd[0] & 0x3f)) {
+            case 0x00   :
+                snprintf(exp, size, "S-block RESYNCH req");
+                break;
+            case 0x20   :
+                snprintf(exp, size, "S-block RESYNCH resp");
+                break;
+            case 0x01   :
+                snprintf(exp, size, "S-block IFS req");
+                break;
+            case 0x21   :
+                snprintf(exp, size, "S-block IFS resp");
+                break;
+            case 0x02   :
+                snprintf(exp, size, "S-block ABORT req");
+                break;
+            case 0x22   :
+                snprintf(exp, size, "S-block ABORT resp");
+                break;
+            case 0x03   :
+                snprintf(exp, size, "S-block WTX reqt");
+                break;
+            case 0x23   :
+                snprintf(exp, size, "S-block WTX resp");
+                break;
+            default     :
+                snprintf(exp, size, "S-block");
+                break;
         }
     }
     // R-block (ack)
-    else if ( ((cmd[0] & 0xD0) == 0x80) && ( cmdsize > 2) ) {
-        if ( (cmd[0] & 0x10) == 0 )
+    else if (((cmd[0] & 0xD0) == 0x80) && (cmdsize > 2)) {
+        if ((cmd[0] & 0x10) == 0)
             snprintf(exp, size, "R-block ACK");
         else
             snprintf(exp, size, "R-block NACK");
@@ -328,7 +472,7 @@ void annotateIso7816(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
     // I-block
     else {
         int pos = 0;
-        switch ( cmd[0] ) {
+        switch (cmd[0]) {
             case 2:
             case 3:
                 pos = 2;
@@ -340,99 +484,215 @@ void annotateIso7816(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
                 pos = 3;
                 break;
         }
-        switch ( cmd[pos] ){
-            case ISO7816_READ_BINARY:              snprintf(exp, size, "READ BIN");break;
-            case ISO7816_WRITE_BINARY:             snprintf(exp, size, "WRITE BIN");break;
-            case ISO7816_UPDATE_BINARY:            snprintf(exp, size, "UPDATE BIN");break;
-            case ISO7816_ERASE_BINARY:             snprintf(exp, size, "ERASE BIN");break;
-            case ISO7816_READ_RECORDS:             snprintf(exp, size, "READ RECORDS");break;
-            case ISO7816_WRITE_RECORDS:            snprintf(exp, size, "WRITE RECORDS");break;
-            case ISO7816_APPEND_RECORD:            snprintf(exp, size, "APPEND RECORD");break;
-            case ISO7816_UPDATE_RECORD:            snprintf(exp, size, "UPDATE RECORD");break;
-            case ISO7816_GET_DATA:                 snprintf(exp, size, "GET DATA");break;
-            case ISO7816_PUT_DATA:                 snprintf(exp, size, "PUT DATA");break;
-            case ISO7816_SELECT_FILE:              snprintf(exp, size, "SELECT FILE");break;
-            case ISO7816_VERIFY:                   snprintf(exp, size, "VERIFY");break;
-            case ISO7816_INTERNAL_AUTHENTICATION:  snprintf(exp, size, "INTERNAL AUTH");break;
-            case ISO7816_EXTERNAL_AUTHENTICATION:  snprintf(exp, size, "EXTERNAL AUTH");break;
-            case ISO7816_GET_CHALLENGE:            snprintf(exp, size, "GET CHALLENGE");break;
-            case ISO7816_MANAGE_CHANNEL:           snprintf(exp, size, "MANAGE CHANNEL");break;
-            case ISO7816_GET_RESPONSE:             snprintf(exp, size, "GET RESPONSE");break;
-            default:                               snprintf(exp,size,"?"); break;
+        switch (cmd[pos]) {
+            case ISO7816_READ_BINARY:
+                snprintf(exp, size, "READ BIN");
+                break;
+            case ISO7816_WRITE_BINARY:
+                snprintf(exp, size, "WRITE BIN");
+                break;
+            case ISO7816_UPDATE_BINARY:
+                snprintf(exp, size, "UPDATE BIN");
+                break;
+            case ISO7816_ERASE_BINARY:
+                snprintf(exp, size, "ERASE BIN");
+                break;
+            case ISO7816_READ_RECORDS:
+                snprintf(exp, size, "READ RECORDS");
+                break;
+            case ISO7816_WRITE_RECORDS:
+                snprintf(exp, size, "WRITE RECORDS");
+                break;
+            case ISO7816_APPEND_RECORD:
+                snprintf(exp, size, "APPEND RECORD");
+                break;
+            case ISO7816_UPDATE_RECORD:
+                snprintf(exp, size, "UPDATE RECORD");
+                break;
+            case ISO7816_GET_DATA:
+                snprintf(exp, size, "GET DATA");
+                break;
+            case ISO7816_PUT_DATA:
+                snprintf(exp, size, "PUT DATA");
+                break;
+            case ISO7816_SELECT_FILE:
+                snprintf(exp, size, "SELECT FILE");
+                break;
+            case ISO7816_VERIFY:
+                snprintf(exp, size, "VERIFY");
+                break;
+            case ISO7816_INTERNAL_AUTHENTICATION:
+                snprintf(exp, size, "INTERNAL AUTH");
+                break;
+            case ISO7816_EXTERNAL_AUTHENTICATION:
+                snprintf(exp, size, "EXTERNAL AUTH");
+                break;
+            case ISO7816_GET_CHALLENGE:
+                snprintf(exp, size, "GET CHALLENGE");
+                break;
+            case ISO7816_MANAGE_CHANNEL:
+                snprintf(exp, size, "MANAGE CHANNEL");
+                break;
+            case ISO7816_GET_RESPONSE:
+                snprintf(exp, size, "GET RESPONSE");
+                break;
+            default:
+                snprintf(exp, size, "?");
+                break;
         }
     }
 }
 
 // MIFARE DESFire
-void annotateMfDesfire(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
+void annotateMfDesfire(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize)
+{
 
     // it's basically a ISO14443a tag, so try annotation from there
-    if (!applyIso14443a(exp, size, cmd, cmdsize)){
+    if (!applyIso14443a(exp, size, cmd, cmdsize)) {
         // S-block 11xxx010
-        if ( (cmd[0] & 0xC0) && (cmdsize == 3) ) {
-            switch ( (cmd[0] & 0x30)  ) {
-                case 0x30:                         snprintf(exp, size, "S-block DESELECT"); break;
-                case 0x00:                         snprintf(exp, size, "S-block WTX"); break;
-                default:                           snprintf(exp, size, "S-block"); break;
+        if ((cmd[0] & 0xC0) && (cmdsize == 3)) {
+            switch ((cmd[0] & 0x30)) {
+                case 0x30:
+                    snprintf(exp, size, "S-block DESELECT");
+                    break;
+                case 0x00:
+                    snprintf(exp, size, "S-block WTX");
+                    break;
+                default:
+                    snprintf(exp, size, "S-block");
+                    break;
             }
         }
         // R-block (ack) 101xx01x
-        else if ( ((cmd[0] & 0xB0) == 0xA0) && ( cmdsize > 2) ) {
-            if ( (cmd[0] & 0x10) == 0 )
+        else if (((cmd[0] & 0xB0) == 0xA0) && (cmdsize > 2)) {
+            if ((cmd[0] & 0x10) == 0)
                 snprintf(exp, size, "R-block ACK(%d)", (cmd[0] & 0x01));
             else
                 snprintf(exp, size, "R-block NACK(%d)", (cmd[0] & 0x01));
         }
         // I-block 000xCN1x
-        else if ( (cmd[0] & 0xC0) == 0x00){
+        else if ((cmd[0] & 0xC0) == 0x00) {
             // PCB [CID] [NAD] [INF] CRC CRC
             int pos = 1;
-            if ( (cmd[0] & 0x08) == 0x08) // cid byte following
+            if ((cmd[0] & 0x08) == 0x08)  // cid byte following
                 pos = pos + 1;
-            if ( (cmd[0] & 0x04) == 0x04) // nad byte following
+            if ((cmd[0] & 0x04) == 0x04)  // nad byte following
                 pos = pos + 1;
-            switch ( cmd[pos] ){
-                case MFDES_CREATE_APPLICATION:        snprintf(exp, size, "CREATE APPLICATION");break;
-                case MFDES_DELETE_APPLICATION:        snprintf(exp, size, "DELETE APPLICATION");break;
-                case MFDES_GET_APPLICATION_IDS:       snprintf(exp, size, "GET APPLICATION IDS");break;
-                case MFDES_SELECT_APPLICATION:        snprintf(exp, size, "SELECT APPLICATION");break;
-                case MFDES_FORMAT_PICC:               snprintf(exp, size, "FORMAT PICC");break;
-                case MFDES_GET_VERSION:               snprintf(exp, size, "GET VERSION");break;
-                case MFDES_READ_DATA:                 snprintf(exp, size, "READ DATA");break;
-                case MFDES_WRITE_DATA:                snprintf(exp, size, "WRITE DATA");break;
-                case MFDES_GET_VALUE:                 snprintf(exp, size, "GET VALUE");break;
-                case MFDES_CREDIT:                    snprintf(exp, size, "CREDIT");break;
-                case MFDES_DEBIT:                     snprintf(exp, size, "DEBIT");break;
-                case MFDES_LIMITED_CREDIT:            snprintf(exp, size, "LIMITED CREDIT");break;
-                case MFDES_WRITE_RECORD:              snprintf(exp, size, "WRITE RECORD");break;
-                case MFDES_READ_RECORDS:              snprintf(exp, size, "READ RECORDS");break;
-                case MFDES_CLEAR_RECORD_FILE:         snprintf(exp, size, "CLEAR RECORD FILE");break;
-                case MFDES_COMMIT_TRANSACTION:        snprintf(exp, size, "COMMIT TRANSACTION");break;
-                case MFDES_ABORT_TRANSACTION:         snprintf(exp, size, "ABORT TRANSACTION");break;
-                case MFDES_GET_FREE_MEMORY:           snprintf(exp, size, "GET FREE MEMORY");break;
-                case MFDES_GET_FILE_IDS:              snprintf(exp, size, "GET FILE IDS");break;
-                case MFDES_GET_ISOFILE_IDS:           snprintf(exp, size, "GET ISOFILE IDS");break;
-                case MFDES_GET_FILE_SETTINGS:         snprintf(exp, size, "GET FILE SETTINGS");break;
-                case MFDES_CHANGE_FILE_SETTINGS:      snprintf(exp, size, "CHANGE FILE SETTINGS");break;
-                case MFDES_CREATE_STD_DATA_FILE:      snprintf(exp, size, "CREATE STD DATA FILE");break;
-                case MFDES_CREATE_BACKUP_DATA_FILE:   snprintf(exp, size, "CREATE BACKUP DATA FILE");break;
-                case MFDES_CREATE_VALUE_FILE:         snprintf(exp, size, "CREATE VALUE FILE");break;
-                case MFDES_CREATE_LINEAR_RECORD_FILE: snprintf(exp, size, "CREATE LINEAR RECORD FILE");break;
-                case MFDES_CREATE_CYCLIC_RECORD_FILE: snprintf(exp, size, "CREATE CYCLIC RECORD FILE");break;
-                case MFDES_DELETE_FILE:               snprintf(exp, size, "DELETE FILE");break;
-                case MFDES_AUTHENTICATE:              snprintf(exp, size, "AUTH NATIVE (keyNo %d)", cmd[pos+1]);break;  // AUTHENTICATE_NATIVE
-                case MFDES_AUTHENTICATE_ISO:          snprintf(exp, size, "AUTH ISO (keyNo %d)", cmd[pos+1]);break;  // AUTHENTICATE_STANDARD
-                case MFDES_AUTHENTICATE_AES:          snprintf(exp, size, "AUTH AES (keyNo %d)", cmd[pos+1]);break;
-                case MFDES_CHANGE_KEY_SETTINGS:       snprintf(exp, size, "CHANGE KEY SETTINGS");break;
-                case MFDES_GET_KEY_SETTINGS:          snprintf(exp, size, "GET KEY SETTINGS");break;
-                case MFDES_CHANGE_KEY:                snprintf(exp, size, "CHANGE KEY");break;
-                case MFDES_GET_KEY_VERSION:           snprintf(exp, size, "GET KEY VERSION");break;
-                case MFDES_AUTHENTICATION_FRAME:      snprintf(exp, size, "AUTH FRAME / NEXT FRAME");break;
-                default:                              break;
+            switch (cmd[pos]) {
+                case MFDES_CREATE_APPLICATION:
+                    snprintf(exp, size, "CREATE APPLICATION");
+                    break;
+                case MFDES_DELETE_APPLICATION:
+                    snprintf(exp, size, "DELETE APPLICATION");
+                    break;
+                case MFDES_GET_APPLICATION_IDS:
+                    snprintf(exp, size, "GET APPLICATION IDS");
+                    break;
+                case MFDES_SELECT_APPLICATION:
+                    snprintf(exp, size, "SELECT APPLICATION");
+                    break;
+                case MFDES_FORMAT_PICC:
+                    snprintf(exp, size, "FORMAT PICC");
+                    break;
+                case MFDES_GET_VERSION:
+                    snprintf(exp, size, "GET VERSION");
+                    break;
+                case MFDES_READ_DATA:
+                    snprintf(exp, size, "READ DATA");
+                    break;
+                case MFDES_WRITE_DATA:
+                    snprintf(exp, size, "WRITE DATA");
+                    break;
+                case MFDES_GET_VALUE:
+                    snprintf(exp, size, "GET VALUE");
+                    break;
+                case MFDES_CREDIT:
+                    snprintf(exp, size, "CREDIT");
+                    break;
+                case MFDES_DEBIT:
+                    snprintf(exp, size, "DEBIT");
+                    break;
+                case MFDES_LIMITED_CREDIT:
+                    snprintf(exp, size, "LIMITED CREDIT");
+                    break;
+                case MFDES_WRITE_RECORD:
+                    snprintf(exp, size, "WRITE RECORD");
+                    break;
+                case MFDES_READ_RECORDS:
+                    snprintf(exp, size, "READ RECORDS");
+                    break;
+                case MFDES_CLEAR_RECORD_FILE:
+                    snprintf(exp, size, "CLEAR RECORD FILE");
+                    break;
+                case MFDES_COMMIT_TRANSACTION:
+                    snprintf(exp, size, "COMMIT TRANSACTION");
+                    break;
+                case MFDES_ABORT_TRANSACTION:
+                    snprintf(exp, size, "ABORT TRANSACTION");
+                    break;
+                case MFDES_GET_FREE_MEMORY:
+                    snprintf(exp, size, "GET FREE MEMORY");
+                    break;
+                case MFDES_GET_FILE_IDS:
+                    snprintf(exp, size, "GET FILE IDS");
+                    break;
+                case MFDES_GET_ISOFILE_IDS:
+                    snprintf(exp, size, "GET ISOFILE IDS");
+                    break;
+                case MFDES_GET_FILE_SETTINGS:
+                    snprintf(exp, size, "GET FILE SETTINGS");
+                    break;
+                case MFDES_CHANGE_FILE_SETTINGS:
+                    snprintf(exp, size, "CHANGE FILE SETTINGS");
+                    break;
+                case MFDES_CREATE_STD_DATA_FILE:
+                    snprintf(exp, size, "CREATE STD DATA FILE");
+                    break;
+                case MFDES_CREATE_BACKUP_DATA_FILE:
+                    snprintf(exp, size, "CREATE BACKUP DATA FILE");
+                    break;
+                case MFDES_CREATE_VALUE_FILE:
+                    snprintf(exp, size, "CREATE VALUE FILE");
+                    break;
+                case MFDES_CREATE_LINEAR_RECORD_FILE:
+                    snprintf(exp, size, "CREATE LINEAR RECORD FILE");
+                    break;
+                case MFDES_CREATE_CYCLIC_RECORD_FILE:
+                    snprintf(exp, size, "CREATE CYCLIC RECORD FILE");
+                    break;
+                case MFDES_DELETE_FILE:
+                    snprintf(exp, size, "DELETE FILE");
+                    break;
+                case MFDES_AUTHENTICATE:
+                    snprintf(exp, size, "AUTH NATIVE (keyNo %d)", cmd[pos + 1]);
+                    break;  // AUTHENTICATE_NATIVE
+                case MFDES_AUTHENTICATE_ISO:
+                    snprintf(exp, size, "AUTH ISO (keyNo %d)", cmd[pos + 1]);
+                    break;  // AUTHENTICATE_STANDARD
+                case MFDES_AUTHENTICATE_AES:
+                    snprintf(exp, size, "AUTH AES (keyNo %d)", cmd[pos + 1]);
+                    break;
+                case MFDES_CHANGE_KEY_SETTINGS:
+                    snprintf(exp, size, "CHANGE KEY SETTINGS");
+                    break;
+                case MFDES_GET_KEY_SETTINGS:
+                    snprintf(exp, size, "GET KEY SETTINGS");
+                    break;
+                case MFDES_CHANGE_KEY:
+                    snprintf(exp, size, "CHANGE KEY");
+                    break;
+                case MFDES_GET_KEY_VERSION:
+                    snprintf(exp, size, "GET KEY VERSION");
+                    break;
+                case MFDES_AUTHENTICATION_FRAME:
+                    snprintf(exp, size, "AUTH FRAME / NEXT FRAME");
+                    break;
+                default:
+                    break;
             }
-        }else{
+        } else {
             // anything else
-            snprintf(exp,size,"?");
+            snprintf(exp, size, "?");
         }
     }
 }
@@ -447,36 +707,73 @@ void annotateMfDesfire(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
 0F = Completion
 0A 11 22 33 44 55 66 = Authenticate (11 22 33 44 55 66 = data to authenticate)
 **/
-void annotateIso14443b(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize) {
-    switch(cmd[0]){
+void annotateIso14443b(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize)
+{
+    switch (cmd[0]) {
         case ISO14443B_REQB           : {
 
-            switch ( cmd[2] & 0x07 ) {
-                case 0:  snprintf(exp, size,"1 slot ");break;
-                case 1:  snprintf(exp, size,"2 slots ");break;
-                case 2:  snprintf(exp, size,"4 slots ");break;
-                case 3:  snprintf(exp, size,"8 slots ");break;
-                default: snprintf(exp, size,"16 slots ");break;
+            switch (cmd[2] & 0x07) {
+                case 0:
+                    snprintf(exp, size, "1 slot ");
+                    break;
+                case 1:
+                    snprintf(exp, size, "2 slots ");
+                    break;
+                case 2:
+                    snprintf(exp, size, "4 slots ");
+                    break;
+                case 3:
+                    snprintf(exp, size, "8 slots ");
+                    break;
+                default:
+                    snprintf(exp, size, "16 slots ");
+                    break;
             }
-            if ( (cmd[2] & 0x8) )
-                snprintf(exp, size,"WUPB");
+            if ((cmd[2] & 0x8))
+                snprintf(exp, size, "WUPB");
             else
-                snprintf(exp, size,"REQB");
+                snprintf(exp, size, "REQB");
             break;
         }
-        case ISO14443B_ATTRIB:       snprintf(exp,size,"ATTRIB");break;
-        case ISO14443B_HALT:         snprintf(exp,size,"HALT");break;
-        case ISO14443B_INITIATE:     snprintf(exp,size,"INITIATE");break;
-        case ISO14443B_SELECT:       snprintf(exp,size,"SELECT(%d)",cmd[1]);break;
-        case ISO14443B_GET_UID:      snprintf(exp,size,"GET UID");break;
-        case ISO14443B_READ_BLK:     snprintf(exp,size,"READ_BLK(%d)", cmd[1]);break;
-        case ISO14443B_WRITE_BLK:    snprintf(exp,size,"WRITE_BLK(%d)",cmd[1]);break;
-        case ISO14443B_RESET:        snprintf(exp,size,"RESET");break;
-        case ISO14443B_COMPLETION:   snprintf(exp,size,"COMPLETION");break;
-        case ISO14443B_AUTHENTICATE: snprintf(exp,size,"AUTHENTICATE");break;
-        case ISO14443B_PING:         snprintf(exp,size,"PING");break;
-        case ISO14443B_PONG:         snprintf(exp,size,"PONG");break;
-        default:                     snprintf(exp,size ,"?");break;
+        case ISO14443B_ATTRIB:
+            snprintf(exp, size, "ATTRIB");
+            break;
+        case ISO14443B_HALT:
+            snprintf(exp, size, "HALT");
+            break;
+        case ISO14443B_INITIATE:
+            snprintf(exp, size, "INITIATE");
+            break;
+        case ISO14443B_SELECT:
+            snprintf(exp, size, "SELECT(%d)", cmd[1]);
+            break;
+        case ISO14443B_GET_UID:
+            snprintf(exp, size, "GET UID");
+            break;
+        case ISO14443B_READ_BLK:
+            snprintf(exp, size, "READ_BLK(%d)", cmd[1]);
+            break;
+        case ISO14443B_WRITE_BLK:
+            snprintf(exp, size, "WRITE_BLK(%d)", cmd[1]);
+            break;
+        case ISO14443B_RESET:
+            snprintf(exp, size, "RESET");
+            break;
+        case ISO14443B_COMPLETION:
+            snprintf(exp, size, "COMPLETION");
+            break;
+        case ISO14443B_AUTHENTICATE:
+            snprintf(exp, size, "AUTHENTICATE");
+            break;
+        case ISO14443B_PING:
+            snprintf(exp, size, "PING");
+            break;
+        case ISO14443B_PONG:
+            snprintf(exp, size, "PONG");
+            break;
+        default:
+            snprintf(exp, size, "?");
+            break;
     }
 }
 
@@ -484,20 +781,31 @@ void annotateIso14443b(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize) {
 // 1 = read
 // 0 = write
 // Quite simpel tag
-void annotateLegic(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
+void annotateLegic(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize)
+{
     uint8_t bitsend = cmd[0];
     uint8_t cmdBit = (cmd[1] & 1);
-    switch (bitsend){
+    switch (bitsend) {
         case 7:
             snprintf(exp, size, "IV 0x%02X", cmd[1]);
             break;
         case 6: {
-            switch ( cmd[1] ) {
-                case LEGIC_MIM_22:     snprintf(exp, size, "MIM22"); break;
-                case LEGIC_MIM_256:     snprintf(exp, size, "MIM256"); break;
-                case LEGIC_MIM_1024: snprintf(exp, size, "MIM1024"); break;
-                case LEGIC_ACK_22:     snprintf(exp, size, "ACK 22"); break;
-                case LEGIC_ACK_256:     snprintf(exp, size, "ACK 256/1024"); break;
+            switch (cmd[1]) {
+                case LEGIC_MIM_22:
+                    snprintf(exp, size, "MIM22");
+                    break;
+                case LEGIC_MIM_256:
+                    snprintf(exp, size, "MIM256");
+                    break;
+                case LEGIC_MIM_1024:
+                    snprintf(exp, size, "MIM1024");
+                    break;
+                case LEGIC_ACK_22:
+                    snprintf(exp, size, "ACK 22");
+                    break;
+                case LEGIC_ACK_256:
+                    snprintf(exp, size, "ACK 256/1024");
+                    break;
             }
             break;
         }
@@ -509,22 +817,22 @@ void annotateLegic(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
             if (cmdBit == LEGIC_READ)
                 snprintf(exp, size, "READ Byte(%d)", address);
 
-            if (cmdBit == LEGIC_WRITE )
+            if (cmdBit == LEGIC_WRITE)
                 snprintf(exp, size, "WRITE Byte(%d)", address);
             break;
         }
         case 21: {
-            if (cmdBit == LEGIC_WRITE ) {
+            if (cmdBit == LEGIC_WRITE) {
                 uint16_t address = ((cmd[2] << 7) | cmd[1] >> 1) & 0xFF;
-                uint8_t val = (cmd[3] & 1 ) << 7 | cmd[2] >> 1;
+                uint8_t val = (cmd[3] & 1) << 7 | cmd[2] >> 1;
                 snprintf(exp, size, "WRITE Byte(%d) %02X", address, val);
             }
             break;
         }
         case 23: {
-            if (cmdBit == LEGIC_WRITE ) {
+            if (cmdBit == LEGIC_WRITE) {
                 uint16_t address = ((cmd[2] << 7) | cmd[1] >> 1) & 0x3FF;
-                uint8_t val = (cmd[3] & 0x7 ) << 5 | cmd[2] >> 3;
+                uint8_t val = (cmd[3] & 0x7) << 5 | cmd[2] >> 3;
                 snprintf(exp, size, "WRITE Byte(%d) %02X", address, val);
             }
             break;
@@ -535,56 +843,140 @@ void annotateLegic(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
     }
 }
 
-void annotateFelica(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
+void annotateFelica(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize)
+{
 
-    switch(cmd[0]){
-        case FELICA_POLL_REQ: snprintf(exp,size ,"POLLING");break;
-        case FELICA_POLL_ACK: snprintf(exp,size ,"POLL ACK");break;
-        case FELICA_REQSRV_REQ: snprintf(exp,size ,"REQUEST SERVICE");break;
-        case FELICA_REQSRV_ACK: snprintf(exp,size ,"REQ SERV ACK");break;
-        case FELICA_REQRESP_REQ: snprintf(exp,size ,"REQUEST RESPONSE");break;
-        case FELICA_REQRESP_ACK: snprintf(exp,size ,"REQ RESP ACK");break;
-        case FELICA_RDBLK_REQ: snprintf(exp,size ,"READ BLK");break;
-        case FELICA_RDBLK_ACK: snprintf(exp,size ,"READ BLK ACK");break;
-        case FELICA_WRTBLK_REQ:    snprintf(exp,size ,"WRITE BLK");break;
-        case FELICA_WRTBLK_ACK: snprintf(exp,size ,"WRITE BLK ACK");break;
-        case FELICA_SRCHSYSCODE_REQ: snprintf(exp,size ,"SEARCH SERVICE CODE");break;
-        case FELICA_SRCHSYSCODE_ACK: snprintf(exp,size ,"SSC ACK");break;
-        case FELICA_REQSYSCODE_REQ: snprintf(exp,size ,"REQUEST SYSTEM CODE");break;
-        case FELICA_REQSYSCODE_ACK: snprintf(exp,size ,"RSC ACK");break;
-        case FELICA_AUTH1_REQ: snprintf(exp,size ,"AUTH 1");break;
-        case FELICA_AUTH1_ACK: snprintf(exp,size ,"AUTH 1 ACK");break;
-        case FELICA_AUTH2_REQ: snprintf(exp,size ,"AUTH 2");break;
-        case FELICA_AUTH2_ACK: snprintf(exp,size ,"AUTH 2 ACK");break;
-        case FELICA_RDSEC_REQ: snprintf(exp,size ,"READ");break;
-        case FELICA_RDSEC_ACK: snprintf(exp,size ,"READ ACK");break;
-        case FELICA_WRTSEC_REQ: snprintf(exp,size ,"WRITE");break;
-        case FELICA_WRTSEC_ACK: snprintf(exp,size ,"WRITE ACK");break;
-        case FELICA_REQSRV2_REQ: snprintf(exp,size ,"REQUEST SERVICE v2");break;
-        case FELICA_REQSRV2_ACK: snprintf(exp,size ,"REQ SERV v2 ACK");break;
-        case FELICA_GETSTATUS_REQ: snprintf(exp,size ,"GET STATUS");break;
-        case FELICA_GETSTATUS_ACK: snprintf(exp,size ,"GET STATUS ACK");break;
-        case FELICA_OSVER_REQ: snprintf(exp,size ,"REQUEST SPECIFIC VERSION");break;
-        case FELICA_OSVER_ACK: snprintf(exp,size ,"RSV ACK");break;
-        case FELICA_RESET_MODE_REQ: snprintf(exp,size ,"RESET MODE");break;
-        case FELICA_RESET_MODE_ACK: snprintf(exp,size ,"RESET MODE ACK");break;
-        case FELICA_AUTH1V2_REQ: snprintf(exp,size ,"AUTH 1 v2");break;
-        case FELICA_AUTH1V2_ACK: snprintf(exp,size ,"AUTH 1 v2 ACK");break;
-        case FELICA_AUTH2V2_REQ: snprintf(exp,size ,"AUTH 2 v2");break;
-        case FELICA_AUTH2V2_ACK: snprintf(exp,size ,"AUTH 2 v2 ACK");break;
-        case FELICA_RDSECV2_REQ: snprintf(exp,size ,"READ v2");break;
-        case FELICA_RDSECV2_ACK: snprintf(exp,size ,"READ v2 ACK");break;
-        case FELICA_WRTSECV2_REQ: snprintf(exp,size ,"WRITE v2");break;
-        case FELICA_WRTSECV2_ACK: snprintf(exp,size ,"WRITE v2 ACK");break;
-        case FELICA_UPDATE_RNDID_REQ: snprintf(exp,size ,"UPDATE RANDOM ID");break;
-        case FELICA_UPDATE_RNDID_ACK: snprintf(exp,size ,"URI ACK");break;
-        default                     : snprintf(exp,size ,"?");break;
+    switch (cmd[0]) {
+        case FELICA_POLL_REQ:
+            snprintf(exp, size, "POLLING");
+            break;
+        case FELICA_POLL_ACK:
+            snprintf(exp, size, "POLL ACK");
+            break;
+        case FELICA_REQSRV_REQ:
+            snprintf(exp, size, "REQUEST SERVICE");
+            break;
+        case FELICA_REQSRV_ACK:
+            snprintf(exp, size, "REQ SERV ACK");
+            break;
+        case FELICA_REQRESP_REQ:
+            snprintf(exp, size, "REQUEST RESPONSE");
+            break;
+        case FELICA_REQRESP_ACK:
+            snprintf(exp, size, "REQ RESP ACK");
+            break;
+        case FELICA_RDBLK_REQ:
+            snprintf(exp, size, "READ BLK");
+            break;
+        case FELICA_RDBLK_ACK:
+            snprintf(exp, size, "READ BLK ACK");
+            break;
+        case FELICA_WRTBLK_REQ:
+            snprintf(exp, size, "WRITE BLK");
+            break;
+        case FELICA_WRTBLK_ACK:
+            snprintf(exp, size, "WRITE BLK ACK");
+            break;
+        case FELICA_SRCHSYSCODE_REQ:
+            snprintf(exp, size, "SEARCH SERVICE CODE");
+            break;
+        case FELICA_SRCHSYSCODE_ACK:
+            snprintf(exp, size, "SSC ACK");
+            break;
+        case FELICA_REQSYSCODE_REQ:
+            snprintf(exp, size, "REQUEST SYSTEM CODE");
+            break;
+        case FELICA_REQSYSCODE_ACK:
+            snprintf(exp, size, "RSC ACK");
+            break;
+        case FELICA_AUTH1_REQ:
+            snprintf(exp, size, "AUTH 1");
+            break;
+        case FELICA_AUTH1_ACK:
+            snprintf(exp, size, "AUTH 1 ACK");
+            break;
+        case FELICA_AUTH2_REQ:
+            snprintf(exp, size, "AUTH 2");
+            break;
+        case FELICA_AUTH2_ACK:
+            snprintf(exp, size, "AUTH 2 ACK");
+            break;
+        case FELICA_RDSEC_REQ:
+            snprintf(exp, size, "READ");
+            break;
+        case FELICA_RDSEC_ACK:
+            snprintf(exp, size, "READ ACK");
+            break;
+        case FELICA_WRTSEC_REQ:
+            snprintf(exp, size, "WRITE");
+            break;
+        case FELICA_WRTSEC_ACK:
+            snprintf(exp, size, "WRITE ACK");
+            break;
+        case FELICA_REQSRV2_REQ:
+            snprintf(exp, size, "REQUEST SERVICE v2");
+            break;
+        case FELICA_REQSRV2_ACK:
+            snprintf(exp, size, "REQ SERV v2 ACK");
+            break;
+        case FELICA_GETSTATUS_REQ:
+            snprintf(exp, size, "GET STATUS");
+            break;
+        case FELICA_GETSTATUS_ACK:
+            snprintf(exp, size, "GET STATUS ACK");
+            break;
+        case FELICA_OSVER_REQ:
+            snprintf(exp, size, "REQUEST SPECIFIC VERSION");
+            break;
+        case FELICA_OSVER_ACK:
+            snprintf(exp, size, "RSV ACK");
+            break;
+        case FELICA_RESET_MODE_REQ:
+            snprintf(exp, size, "RESET MODE");
+            break;
+        case FELICA_RESET_MODE_ACK:
+            snprintf(exp, size, "RESET MODE ACK");
+            break;
+        case FELICA_AUTH1V2_REQ:
+            snprintf(exp, size, "AUTH 1 v2");
+            break;
+        case FELICA_AUTH1V2_ACK:
+            snprintf(exp, size, "AUTH 1 v2 ACK");
+            break;
+        case FELICA_AUTH2V2_REQ:
+            snprintf(exp, size, "AUTH 2 v2");
+            break;
+        case FELICA_AUTH2V2_ACK:
+            snprintf(exp, size, "AUTH 2 v2 ACK");
+            break;
+        case FELICA_RDSECV2_REQ:
+            snprintf(exp, size, "READ v2");
+            break;
+        case FELICA_RDSECV2_ACK:
+            snprintf(exp, size, "READ v2 ACK");
+            break;
+        case FELICA_WRTSECV2_REQ:
+            snprintf(exp, size, "WRITE v2");
+            break;
+        case FELICA_WRTSECV2_ACK:
+            snprintf(exp, size, "WRITE v2 ACK");
+            break;
+        case FELICA_UPDATE_RNDID_REQ:
+            snprintf(exp, size, "UPDATE RANDOM ID");
+            break;
+        case FELICA_UPDATE_RNDID_ACK:
+            snprintf(exp, size, "URI ACK");
+            break;
+        default                     :
+            snprintf(exp, size, "?");
+            break;
     }
 }
 
-void annotateMifare(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize, uint8_t* parity, uint8_t paritysize, bool isResponse) {
+void annotateMifare(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize, uint8_t *parity, uint8_t paritysize, bool isResponse)
+{
     if (!isResponse && cmdsize == 1) {
-        switch(cmd[0]) {
+        switch (cmd[0]) {
             case ISO14443A_CMD_WUPA:
             case ISO14443A_CMD_REQA:
                 MifareAuthState = masNone;
@@ -610,7 +1002,7 @@ void annotateMifare(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize, uint8
         }
     }
 
-    switch(MifareAuthState) {
+    switch (MifareAuthState) {
         case masNt:
             if (cmdsize == 4 && isResponse) {
                 snprintf(exp, size, "AUTH: nt %s", (AuthData.first_auth) ? "" : "(enc)");
@@ -658,7 +1050,8 @@ void annotateMifare(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize, uint8
 
 }
 
-bool DecodeMifareData(uint8_t *cmd, uint8_t cmdsize, uint8_t *parity, bool isResponse, uint8_t *mfData, size_t *mfDataLen) {
+bool DecodeMifareData(uint8_t *cmd, uint8_t cmdsize, uint8_t *parity, bool isResponse, uint8_t *mfData, size_t *mfDataLen)
+{
     static struct Crypto1State *traceCrypto1;
     static uint64_t mfLastKey;
 
@@ -684,9 +1077,9 @@ bool DecodeMifareData(uint8_t *cmd, uint8_t cmdsize, uint8_t *parity, bool isRes
 
             mfLastKey = GetCrypto1ProbableKey(&AuthData);
             PrintAndLogEx(NORMAL, "            |            |  *  |%49s %012"PRIx64" prng %s |     |",
-                "key",
-                mfLastKey,
-                validate_prng_nonce(AuthData.nt) ? _GREEN_(WEAK): _YELLOW_(HARD));
+                          "key",
+                          mfLastKey,
+                          validate_prng_nonce(AuthData.nt) ? _GREEN_(WEAK) : _YELLOW_(HARD));
 
             AuthData.first_auth = false;
 
@@ -707,7 +1100,7 @@ bool DecodeMifareData(uint8_t *cmd, uint8_t cmdsize, uint8_t *parity, bool isRes
 
             // check default keys
             if (!traceCrypto1) {
-                for (int i = 0; i < MIFARE_DEFAULTKEYS_SIZE; i++){
+                for (int i = 0; i < MIFARE_DEFAULTKEYS_SIZE; i++) {
                     if (NestedCheckKey(g_mifare_default_keys[i], &AuthData, cmd, cmdsize, parity)) {
                         PrintAndLogEx(NORMAL, "            |            |  *  |%61s %012"PRIx64"|     |", "key", g_mifare_default_keys[i]);
 
@@ -723,7 +1116,7 @@ bool DecodeMifareData(uint8_t *cmd, uint8_t cmdsize, uint8_t *parity, bool isRes
                 uint32_t ntx = prng_successor(AuthData.nt, 90);
                 for (int i = 0; i < 16383; i++) {
                     ntx = prng_successor(ntx, 1);
-                    if (NTParityChk(&AuthData, ntx)){
+                    if (NTParityChk(&AuthData, ntx)) {
 
                         uint32_t ks2 = AuthData.ar_enc ^ prng_successor(ntx, 64);
                         uint32_t ks3 = AuthData.at_enc ^ prng_successor(ntx, 96);
@@ -738,9 +1131,9 @@ bool DecodeMifareData(uint8_t *cmd, uint8_t cmdsize, uint8_t *parity, bool isRes
                             AuthData.nt = ntx;
                             mfLastKey = GetCrypto1ProbableKey(&AuthData);
                             PrintAndLogEx(NORMAL, "            |            |  *  | nested probable key:%012"PRIx64"      ks2:%08x ks3:%08x |     |",
-                                mfLastKey,
-                                AuthData.ks2,
-                                AuthData.ks3);
+                                          mfLastKey,
+                                          AuthData.ks2,
+                                          AuthData.ks3);
 
                             traceCrypto1 = lfsr_recovery64(AuthData.ks2, AuthData.ks3);
                             break;
@@ -790,12 +1183,13 @@ bool DecodeMifareData(uint8_t *cmd, uint8_t cmdsize, uint8_t *parity, bool isRes
     return *mfDataLen > 0;
 }
 
-bool NTParityChk(TAuthData *ad, uint32_t ntx) {
+bool NTParityChk(TAuthData *ad, uint32_t ntx)
+{
     if (
         (oddparity8(ntx >> 8 & 0xff) ^ (ntx & 0x01) ^ ((ad->nt_enc_par >> 5) & 0x01) ^ (ad->nt_enc & 0x01)) ||
         (oddparity8(ntx >> 16 & 0xff) ^ (ntx >> 8 & 0x01) ^ ((ad->nt_enc_par >> 6) & 0x01) ^ (ad->nt_enc >> 8 & 0x01)) ||
         (oddparity8(ntx >> 24 & 0xff) ^ (ntx >> 16 & 0x01) ^ ((ad->nt_enc_par >> 7) & 0x01) ^ (ad->nt_enc >> 16 & 0x01))
-        )
+    )
         return false;
 
     uint32_t ar = prng_successor(ntx, 64);
@@ -803,7 +1197,7 @@ bool NTParityChk(TAuthData *ad, uint32_t ntx) {
         (oddparity8(ar >> 8 & 0xff) ^ (ar & 0x01) ^ ((ad->ar_enc_par >> 5) & 0x01) ^ (ad->ar_enc & 0x01)) ||
         (oddparity8(ar >> 16 & 0xff) ^ (ar >> 8 & 0x01) ^ ((ad->ar_enc_par >> 6) & 0x01) ^ (ad->ar_enc >> 8 & 0x01)) ||
         (oddparity8(ar >> 24 & 0xff) ^ (ar >> 16 & 0x01) ^ ((ad->ar_enc_par >> 7) & 0x01) ^ (ad->ar_enc >> 16 & 0x01))
-        )
+    )
         return false;
 
     uint32_t at = prng_successor(ntx, 96);
@@ -812,13 +1206,14 @@ bool NTParityChk(TAuthData *ad, uint32_t ntx) {
         (oddparity8(at >> 8 & 0xff) ^ (at & 0x01) ^ ((ad->at_enc_par >> 5) & 0x01) ^ (ad->at_enc & 0x01)) ||
         (oddparity8(at >> 16 & 0xff) ^ (at >> 8 & 0x01) ^ ((ad->at_enc_par >> 6) & 0x01) ^ (ad->at_enc >> 8 & 0x01)) ||
         (oddparity8(at >> 24 & 0xff) ^ (at >> 16 & 0x01) ^ ((ad->at_enc_par >> 7) & 0x01) ^ (ad->at_enc >> 16 & 0x01))
-        )
+    )
         return false;
 
     return true;
 }
 
-bool NestedCheckKey(uint64_t key, TAuthData *ad, uint8_t *cmd, uint8_t cmdsize, uint8_t *parity) {
+bool NestedCheckKey(uint64_t key, TAuthData *ad, uint8_t *cmd, uint8_t cmdsize, uint8_t *parity)
+{
     uint8_t buf[32] = {0};
     struct Crypto1State *pcs;
 
@@ -856,7 +1251,8 @@ bool NestedCheckKey(uint64_t key, TAuthData *ad, uint8_t *cmd, uint8_t cmdsize,
     return true;
 }
 
-bool CheckCrypto1Parity(uint8_t *cmd_enc, uint8_t cmdsize, uint8_t *cmd, uint8_t *parity_enc) {
+bool CheckCrypto1Parity(uint8_t *cmd_enc, uint8_t cmdsize, uint8_t *cmd, uint8_t *parity_enc)
+{
     for (int i = 0; i < cmdsize - 1; i++) {
         if (oddparity8(cmd[i]) ^ (cmd[i + 1] & 0x01) ^ ((parity_enc[i / 8] >> (7 - i % 8)) & 0x01) ^ (cmd_enc[i + 1] & 0x01))
             return false;
@@ -866,7 +1262,8 @@ bool CheckCrypto1Parity(uint8_t *cmd_enc, uint8_t cmdsize, uint8_t *cmd, uint8_t
 
 // Another implementation of mfkey64 attack,  more "valid" than "probable"
 //
-uint64_t GetCrypto1ProbableKey(TAuthData *ad) {
+uint64_t GetCrypto1ProbableKey(TAuthData *ad)
+{
     struct Crypto1State *revstate = lfsr_recovery64(ad->ks2, ad->ks3);
     lfsr_rollback_word(revstate, 0, 0);
     lfsr_rollback_word(revstate, 0, 0);
diff --git a/client/cmdhflist.h b/client/cmdhflist.h
index 81e5af51b..a7edb51f6 100644
--- a/client/cmdhflist.h
+++ b/client/cmdhflist.h
@@ -53,24 +53,24 @@ typedef struct {
 } TAuthData;
 extern void ClearAuthData();
 
-extern uint8_t iso14443A_CRC_check(bool isResponse, uint8_t* data, uint8_t len);
-extern uint8_t iso14443B_CRC_check(uint8_t* d, uint8_t n);
-extern uint8_t mifare_CRC_check(bool isResponse, uint8_t* data, uint8_t len);
-extern uint8_t iso15693_CRC_check(uint8_t* d, uint8_t n);
-extern uint8_t iclass_CRC_check(bool isResponse, uint8_t* d, uint8_t n);
+extern uint8_t iso14443A_CRC_check(bool isResponse, uint8_t *data, uint8_t len);
+extern uint8_t iso14443B_CRC_check(uint8_t *d, uint8_t n);
+extern uint8_t mifare_CRC_check(bool isResponse, uint8_t *data, uint8_t len);
+extern uint8_t iso15693_CRC_check(uint8_t *d, uint8_t n);
+extern uint8_t iclass_CRC_check(bool isResponse, uint8_t *d, uint8_t n);
 
-int applyIso14443a(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize);
+int applyIso14443a(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize);
 
-extern void annotateIclass(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize);
-extern void annotateIso15693(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize);
-extern void annotateTopaz(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize);
-extern void annotateLegic(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize);
-extern void annotateFelica(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize);
-extern void annotateIso7816(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize);
-extern void annotateIso14443b(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize);
-extern void annotateIso14443a(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize);
-extern void annotateMfDesfire(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize);
-extern void annotateMifare(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize, uint8_t* parity, uint8_t paritysize, bool isResponse);
+extern void annotateIclass(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize);
+extern void annotateIso15693(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize);
+extern void annotateTopaz(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize);
+extern void annotateLegic(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize);
+extern void annotateFelica(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize);
+extern void annotateIso7816(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize);
+extern void annotateIso14443b(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize);
+extern void annotateIso14443a(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize);
+extern void annotateMfDesfire(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize);
+extern void annotateMifare(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize, uint8_t *parity, uint8_t paritysize, bool isResponse);
 
 extern bool DecodeMifareData(uint8_t *cmd, uint8_t cmdsize, uint8_t *parity, bool isResponse, uint8_t *mfData, size_t *mfDataLen);
 extern bool NTParityChk(TAuthData *ad, uint32_t ntx);
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index a15b79bc5..387f11538 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -28,31 +28,34 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_hf14_ice(void){
-        PrintAndLogEx(NORMAL, "Usage:   hf mf ice [l] <limit> [f] <name>");
-        PrintAndLogEx(NORMAL, "  h            this help");
-        PrintAndLogEx(NORMAL, "  l <limit>    nonces to be collected");
-        PrintAndLogEx(NORMAL, "  f <name>     save nonces to <name> instead of hf-mf-<UID>-nonces.bin");
-        PrintAndLogEx(NORMAL, "");
-        PrintAndLogEx(NORMAL, "Examples:");
-        PrintAndLogEx(NORMAL, "         hf mf ice");
-        PrintAndLogEx(NORMAL, "         hf mf ice f nonces.bin");
-        return 0;
+int usage_hf14_ice(void)
+{
+    PrintAndLogEx(NORMAL, "Usage:   hf mf ice [l] <limit> [f] <name>");
+    PrintAndLogEx(NORMAL, "  h            this help");
+    PrintAndLogEx(NORMAL, "  l <limit>    nonces to be collected");
+    PrintAndLogEx(NORMAL, "  f <name>     save nonces to <name> instead of hf-mf-<UID>-nonces.bin");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "         hf mf ice");
+    PrintAndLogEx(NORMAL, "         hf mf ice f nonces.bin");
+    return 0;
 }
 
-int usage_hf14_dump(void){
-        PrintAndLogEx(NORMAL, "Usage:   hf mf dump [card memory] k <name> f <name>");
-        PrintAndLogEx(NORMAL, "  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");
-        PrintAndLogEx(NORMAL, "  k <name>     : key filename, if no <name> given, UID will be used as filename");
-        PrintAndLogEx(NORMAL, "  f <name>     : data filename, if no <name> given, UID will be used as filename");
-        PrintAndLogEx(NORMAL, "");
-        PrintAndLogEx(NORMAL, "Examples:");
-        PrintAndLogEx(NORMAL, "         hf mf dump");
-        PrintAndLogEx(NORMAL, "         hf mf dump 4");
-        return 0;
+int usage_hf14_dump(void)
+{
+    PrintAndLogEx(NORMAL, "Usage:   hf mf dump [card memory] k <name> f <name>");
+    PrintAndLogEx(NORMAL, "  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");
+    PrintAndLogEx(NORMAL, "  k <name>     : key filename, if no <name> given, UID will be used as filename");
+    PrintAndLogEx(NORMAL, "  f <name>     : data filename, if no <name> given, UID will be used as filename");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "         hf mf dump");
+    PrintAndLogEx(NORMAL, "         hf mf dump 4");
+    return 0;
 }
 
-int usage_hf14_mifare(void){
+int usage_hf14_mifare(void)
+{
     PrintAndLogEx(NORMAL, "Usage:  hf mf darkside [h] <block number> <A|B>");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "      h               this help");
@@ -64,7 +67,8 @@ int usage_hf14_mifare(void){
     PrintAndLogEx(NORMAL, "           hf mf darkside 16 B");
     return 0;
 }
-int usage_hf14_mf1ksim(void){
+int usage_hf14_mf1ksim(void)
+{
     PrintAndLogEx(NORMAL, "Usage:  hf mf sim [h] u <uid> n <numreads> [i] [x] [e] [v]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "      h    this help");
@@ -81,7 +85,8 @@ int usage_hf14_mf1ksim(void){
     PrintAndLogEx(NORMAL, "           hf mf sim u 11223344 i x");
     return 0;
 }
-int usage_hf14_dbg(void){
+int usage_hf14_dbg(void)
+{
     PrintAndLogEx(NORMAL, "Usage:  hf mf dbg [h] <debug level>");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "           h    this help");
@@ -96,7 +101,8 @@ int usage_hf14_dbg(void){
     PrintAndLogEx(NORMAL, "           hf mf dbg 3");
     return 0;
 }
-int usage_hf14_sniff(void){
+int usage_hf14_sniff(void)
+{
     PrintAndLogEx(NORMAL, "It continuously gets data from the field and saves it to: log, emulator, emulator file.");
     PrintAndLogEx(NORMAL, "Usage:  hf mf sniff [h] [l] [d] [f]");
     PrintAndLogEx(NORMAL, "Options:");
@@ -109,7 +115,8 @@ int usage_hf14_sniff(void){
     PrintAndLogEx(NORMAL, "           hf mf sniff l d f");
     return 0;
 }
-int usage_hf14_nested(void){
+int usage_hf14_nested(void)
+{
     PrintAndLogEx(NORMAL, "Usage:");
     PrintAndLogEx(NORMAL, " all sectors:  hf mf nested  <card memory> <block number> <key A/B> <key (12 hex symbols)> [t,d]");
     PrintAndLogEx(NORMAL, " one sector:   hf mf nested  o <block number> <key A/B> <key (12 hex symbols)>");
@@ -127,7 +134,8 @@ int usage_hf14_nested(void){
     PrintAndLogEx(NORMAL, "      hf mf nested o 0 A FFFFFFFFFFFF 4 A");
     return 0;
 }
-int usage_hf14_hardnested(void){
+int usage_hf14_hardnested(void)
+{
     PrintAndLogEx(NORMAL, "Usage:");
     PrintAndLogEx(NORMAL, "      hf mf hardnested <block number> <key A|B> <key (12 hex symbols)>");
     PrintAndLogEx(NORMAL, "                       <target block number> <target key A|B> [known target key (12 hex symbols)] [w] [s]");
@@ -160,7 +168,8 @@ int usage_hf14_hardnested(void){
     PrintAndLogEx(NORMAL, "      hf mf hardnested 0 A A0A1A2A3A4A5 4 A FFFFFFFFFFFF");
     return 0;
 }
-int usage_hf14_chk(void){
+int usage_hf14_chk(void)
+{
     PrintAndLogEx(NORMAL, "Usage:  hf mf chk [h] <block number>|<*card memory> <key type (A/B/?)> [t|d] [<key (12 hex symbols)>] [<dic (*.dic)>]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "      h    this help");
@@ -178,7 +187,8 @@ int usage_hf14_chk(void){
     PrintAndLogEx(NORMAL, "      hf mf chk *1 ? d                        -- target all blocks, all keys, 1K, write to file");
     return 0;
 }
-int usage_hf14_chk_fast(void){
+int usage_hf14_chk_fast(void)
+{
     PrintAndLogEx(NORMAL, "This is a improved checkkeys method speedwise. It checks Mifare Classic tags sector keys against a dictionary file with keys");
     PrintAndLogEx(NORMAL, "Usage:  hf mf fchk [h] <card memory> [t|d|f] [<key (12 hex symbols)>] [<dic (*.dic)>]");
     PrintAndLogEx(NORMAL, "Options:");
@@ -201,7 +211,8 @@ int usage_hf14_chk_fast(void){
 #endif
     return 0;
 }
-int usage_hf14_keybrute(void){
+int usage_hf14_keybrute(void)
+{
     PrintAndLogEx(NORMAL, "J_Run's 2nd phase of multiple sector nested authentication key recovery");
     PrintAndLogEx(NORMAL, "You have a known 4 last bytes of a key recovered with mf_nonce_brute tool.");
     PrintAndLogEx(NORMAL, "First 2 bytes of key will be bruteforced");
@@ -218,7 +229,8 @@ int usage_hf14_keybrute(void){
     PrintAndLogEx(NORMAL, "           hf mf keybrute 1 A 000011223344");
     return 0;
 }
-int usage_hf14_restore(void){
+int usage_hf14_restore(void)
+{
     PrintAndLogEx(NORMAL, "Usage:   hf mf restore [card memory] u <UID> k <name> f <name>");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");
@@ -233,7 +245,8 @@ int usage_hf14_restore(void){
     PrintAndLogEx(NORMAL, "         hf mf restore 4                          -- read the UID from tag with 4K memory first, then restore from hf-mf-<UID>-key.bin and and hf-mf-<UID>-data.bin");
     return 0;
 }
-int usage_hf14_decryptbytes(void){
+int usage_hf14_decryptbytes(void)
+{
     PrintAndLogEx(NORMAL, "Decrypt Crypto-1 encrypted bytes given some known state of crypto. See tracelog to gather needed values\n");
     PrintAndLogEx(NORMAL, "Usage:   hf mf decrypt [h] <nt> <ar_enc> <at_enc> <data>");
     PrintAndLogEx(NORMAL, "Options:");
@@ -248,24 +261,28 @@ int usage_hf14_decryptbytes(void){
     return 0;
 }
 
-int usage_hf14_eget(void){
+int usage_hf14_eget(void)
+{
     PrintAndLogEx(NORMAL, "Usage:  hf mf eget <block number>");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "        hf mf eget 0 ");
     return 0;
 }
-int usage_hf14_eclr(void){
+int usage_hf14_eclr(void)
+{
     PrintAndLogEx(NORMAL, "It set card emulator memory to empty data blocks and key A/B FFFFFFFFFFFF \n");
     PrintAndLogEx(NORMAL, "Usage:  hf mf eclr");
     return 0;
 }
-int usage_hf14_eset(void){
+int usage_hf14_eset(void)
+{
     PrintAndLogEx(NORMAL, "Usage:  hf mf eset <block number> <block data (32 hex symbols)>");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "        hf mf eset 1 000102030405060708090a0b0c0d0e0f ");
     return 0;
 }
-int usage_hf14_eload(void){
+int usage_hf14_eload(void)
+{
     PrintAndLogEx(NORMAL, "It loads emul dump from the file `filename.eml`");
     PrintAndLogEx(NORMAL, "Usage:  hf mf eload [card memory] <file name w/o `.eml`> [numblocks]");
     PrintAndLogEx(NORMAL, "  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K, u = UL");
@@ -275,7 +292,8 @@ int usage_hf14_eload(void){
     PrintAndLogEx(NORMAL, "        hf mf eload 4 filename");
     return 0;
 }
-int usage_hf14_esave(void){
+int usage_hf14_esave(void)
+{
     PrintAndLogEx(NORMAL, "It saves emul dump into the file `filename.eml` or `cardID.eml`");
     PrintAndLogEx(NORMAL, " Usage:  hf mf esave [card memory] [file name w/o `.eml`]");
     PrintAndLogEx(NORMAL, "  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");
@@ -286,7 +304,8 @@ int usage_hf14_esave(void){
     PrintAndLogEx(NORMAL, "        hf mf esave 4 filename");
     return 0;
 }
-int usage_hf14_ecfill(void){
+int usage_hf14_ecfill(void)
+{
     PrintAndLogEx(NORMAL, "Read card and transfer its data to emulator memory.");
     PrintAndLogEx(NORMAL, "Keys must be laid in the emulator memory. \n");
     PrintAndLogEx(NORMAL, "Usage:  hf mf ecfill <key A/B> [card memory]");
@@ -297,7 +316,8 @@ int usage_hf14_ecfill(void){
     PrintAndLogEx(NORMAL, "        hf mf ecfill A 4");
     return 0;
 }
-int usage_hf14_ekeyprn(void){
+int usage_hf14_ekeyprn(void)
+{
     PrintAndLogEx(NORMAL, "It prints the keys loaded in the emulator memory");
     PrintAndLogEx(NORMAL, "Usage:  hf mf ekeyprn [card memory]");
     PrintAndLogEx(NORMAL, "  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");
@@ -307,7 +327,8 @@ int usage_hf14_ekeyprn(void){
     return 0;
 }
 
-int usage_hf14_csetuid(void){
+int usage_hf14_csetuid(void)
+{
     PrintAndLogEx(NORMAL, "Set UID, ATQA, and SAK for magic Chinese card. Only works with magic cards");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  hf mf csetuid [h] <UID 8 hex symbols> [ATQA 4 hex symbols] [SAK 2 hex symbols] [w]");
@@ -322,7 +343,8 @@ int usage_hf14_csetuid(void){
     PrintAndLogEx(NORMAL, "      hf mf csetuid 01020304 0004 08 w");
     return 0;
 }
-int usage_hf14_csetblk(void){
+int usage_hf14_csetblk(void)
+{
     PrintAndLogEx(NORMAL, "Set block data for magic Chinese card. Only works with magic cards");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  hf mf csetblk [h] <block number> <block data (32 hex symbols)> [w]");
@@ -336,7 +358,8 @@ int usage_hf14_csetblk(void){
     PrintAndLogEx(NORMAL, "       hf mf csetblk 1 01020304050607080910111213141516 w");
     return 0;
 }
-int usage_hf14_cload(void){
+int usage_hf14_cload(void)
+{
     PrintAndLogEx(NORMAL, "It loads magic Chinese card from the file `filename.eml`");
     PrintAndLogEx(NORMAL, "or from emulator memory");
     PrintAndLogEx(NORMAL, "");
@@ -352,7 +375,8 @@ int usage_hf14_cload(void){
     PrintAndLogEx(NORMAL, "       hf mf cload e");
     return 0;
 }
-int usage_hf14_cgetblk(void){
+int usage_hf14_cgetblk(void)
+{
     PrintAndLogEx(NORMAL, "Get block data from magic Chinese card. Only works with magic cards\n");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  hf mf cgetblk [h] <block number>");
@@ -363,7 +387,8 @@ int usage_hf14_cgetblk(void){
     PrintAndLogEx(NORMAL, "      hf mf cgetblk 1");
     return 0;
 }
-int usage_hf14_cgetsc(void){
+int usage_hf14_cgetsc(void)
+{
     PrintAndLogEx(NORMAL, "Get sector data from magic Chinese card. Only works with magic cards\n");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  hf mf cgetsc [h] <sector number>");
@@ -374,7 +399,8 @@ int usage_hf14_cgetsc(void){
     PrintAndLogEx(NORMAL, "      hf mf cgetsc 0");
     return 0;
 }
-int usage_hf14_csave(void){
+int usage_hf14_csave(void)
+{
     PrintAndLogEx(NORMAL, "It saves `magic Chinese` card dump into the file `filename.eml` or `cardID.eml`");
     PrintAndLogEx(NORMAL, "or into emulator memory");
     PrintAndLogEx(NORMAL, "");
@@ -392,7 +418,8 @@ int usage_hf14_csave(void){
     PrintAndLogEx(NORMAL, "       hf mf csave 4 o filename");
     return 0;
 }
-int usage_hf14_nack(void) {
+int usage_hf14_nack(void)
+{
     PrintAndLogEx(NORMAL, "Test a mifare classic based card for the NACK bug.");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  hf mf nack [h] [v]");
@@ -404,7 +431,8 @@ int usage_hf14_nack(void) {
     return 0;
 }
 
-int GetHFMF14AUID(uint8_t *uid, int *uidlen) {
+int GetHFMF14AUID(uint8_t *uid, int *uidlen)
+{
     UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT, 0, 0}};
     clearCommandBuffer();
     SendCommand(&c);
@@ -422,10 +450,11 @@ int GetHFMF14AUID(uint8_t *uid, int *uidlen) {
     return 1;
 }
 
-char * GenerateFilename(const char *prefix, const char *suffix){
-    uint8_t uid[10] = {0,0,0,0,0,0,0,0,0,0};
-    int uidlen=0;
-    char * fptr = calloc (sizeof (char) * (strlen(prefix) + strlen(suffix)) + sizeof(uid)*2 + 1,  sizeof(uint8_t));
+char *GenerateFilename(const char *prefix, const char *suffix)
+{
+    uint8_t uid[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+    int uidlen = 0;
+    char *fptr = calloc(sizeof(char) * (strlen(prefix) + strlen(suffix)) + sizeof(uid) * 2 + 1,  sizeof(uint8_t));
 
     GetHFMF14AUID(uid, &uidlen);
     if (!uidlen) {
@@ -439,12 +468,13 @@ char * GenerateFilename(const char *prefix, const char *suffix){
     return fptr;
 }
 
-int CmdHF14AMfDarkside(const char *Cmd) {
+int CmdHF14AMfDarkside(const char *Cmd)
+{
     uint8_t blockno = 0, key_type = MIFARE_AUTH_KEYA;
     uint64_t key = 0;
 
     char cmdp = tolower(param_getchar(Cmd, 0));
-    if ( cmdp == 'h' ) return usage_hf14_mifare();
+    if (cmdp == 'h') return usage_hf14_mifare();
 
     blockno = param_get8(Cmd, 0);
 
@@ -455,19 +485,32 @@ int CmdHF14AMfDarkside(const char *Cmd) {
     int isOK = mfDarkside(blockno, key_type, &key);
     PrintAndLogEx(NORMAL, "");
     switch (isOK) {
-        case -1 : PrintAndLogEx(WARNING, "button pressed. Aborted."); return 1;
-        case -2 : PrintAndLogEx(FAILED, "card is not vulnerable to Darkside attack (doesn't send NACK on authentication requests)."); return 1;
-        case -3 : PrintAndLogEx(FAILED, "card is not vulnerable to Darkside attack (its random number generator is not predictable)."); return 1;
-        case -4 : PrintAndLogEx(FAILED, "card is not vulnerable to Darkside attack (its random number generator seems to be based on the wellknown");
-                  PrintAndLogEx(FAILED, "generating polynomial with 16 effective bits only, but shows unexpected behaviour."); return 1;
-        case -5 : PrintAndLogEx(WARNING, "aborted via keyboard.");  return 1;
-        default : PrintAndLogEx(SUCCESS, "found valid key: %012" PRIx64 "\n", key); break;
+        case -1 :
+            PrintAndLogEx(WARNING, "button pressed. Aborted.");
+            return 1;
+        case -2 :
+            PrintAndLogEx(FAILED, "card is not vulnerable to Darkside attack (doesn't send NACK on authentication requests).");
+            return 1;
+        case -3 :
+            PrintAndLogEx(FAILED, "card is not vulnerable to Darkside attack (its random number generator is not predictable).");
+            return 1;
+        case -4 :
+            PrintAndLogEx(FAILED, "card is not vulnerable to Darkside attack (its random number generator seems to be based on the wellknown");
+            PrintAndLogEx(FAILED, "generating polynomial with 16 effective bits only, but shows unexpected behaviour.");
+            return 1;
+        case -5 :
+            PrintAndLogEx(WARNING, "aborted via keyboard.");
+            return 1;
+        default :
+            PrintAndLogEx(SUCCESS, "found valid key: %012" PRIx64 "\n", key);
+            break;
     }
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
 
-int CmdHF14AMfWrBl(const char *Cmd) {
+int CmdHF14AMfWrBl(const char *Cmd)
+{
     uint8_t blockNo = 0;
     uint8_t keyType = 0;
     uint8_t key[6] = {0, 0, 0, 0, 0, 0};
@@ -501,7 +544,7 @@ int CmdHF14AMfWrBl(const char *Cmd) {
         return 1;
     }
 
-    PrintAndLogEx(NORMAL, "--block no:%d, key type:%c, key:%s", blockNo, keyType?'B':'A', sprint_hex(key, 6));
+    PrintAndLogEx(NORMAL, "--block no:%d, key type:%c, key:%s", blockNo, keyType ? 'B' : 'A', sprint_hex(key, 6));
     PrintAndLogEx(NORMAL, "--data: %s", sprint_hex(bldata, 16));
 
     UsbCommand c = {CMD_MIFARE_WRITEBL, {blockNo, keyType, 0}};
@@ -521,13 +564,14 @@ int CmdHF14AMfWrBl(const char *Cmd) {
     return 0;
 }
 
-int CmdHF14AMfRdBl(const char *Cmd) {
+int CmdHF14AMfRdBl(const char *Cmd)
+{
     uint8_t blockNo = 0;
     uint8_t keyType = 0;
     uint8_t key[6] = {0, 0, 0, 0, 0, 0};
     char cmdp = 0x00;
 
-    if (strlen(Cmd)<3) {
+    if (strlen(Cmd) < 3) {
         PrintAndLogEx(NORMAL, "Usage:  hf mf rdbl    <block number> <key A/B> <key (12 hex symbols)>");
         PrintAndLogEx(NORMAL, "Examples:");
         PrintAndLogEx(NORMAL, "        hf mf rdbl 0 A FFFFFFFFFFFF ");
@@ -548,7 +592,7 @@ int CmdHF14AMfRdBl(const char *Cmd) {
         PrintAndLogEx(NORMAL, "Key must include 12 HEX symbols");
         return 1;
     }
-    PrintAndLogEx(NORMAL, "--block no:%d, key type:%c, key:%s ", blockNo, keyType?'B':'A', sprint_hex(key, 6));
+    PrintAndLogEx(NORMAL, "--block no:%d, key type:%c, key:%s ", blockNo, keyType ? 'B' : 'A', sprint_hex(key, 6));
 
     UsbCommand c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}};
     memcpy(c.d.asBytes, key, 6);
@@ -572,7 +616,7 @@ int CmdHF14AMfRdBl(const char *Cmd) {
             int bln = mfFirstBlockOfSector(mfSectorNum(blockNo));
             int blinc = (mfNumBlocksPerSector(mfSectorNum(blockNo)) > 4) ? 5 : 1;
             for (int i = 0; i < 4; i++) {
-                PrintAndLogEx(NORMAL, "Access block %d%s: %s", bln, ((blinc > 1) && (i < 3) ? "+" : "") , mfGetAccessConditionsDesc(i, &data[6]));
+                PrintAndLogEx(NORMAL, "Access block %d%s: %s", bln, ((blinc > 1) && (i < 3) ? "+" : ""), mfGetAccessConditionsDesc(i, &data[6]));
                 bln += blinc;
             }
             PrintAndLogEx(NORMAL, "UserData: %s", sprint_hex_inrow(&data[9], 1));
@@ -582,10 +626,11 @@ int CmdHF14AMfRdBl(const char *Cmd) {
         return 2;
     }
 
-  return 0;
+    return 0;
 }
 
-int CmdHF14AMfRdSc(const char *Cmd) {
+int CmdHF14AMfRdSc(const char *Cmd)
+{
     int i;
     uint8_t sectorNo = 0;
     uint8_t keyType = 0;
@@ -602,7 +647,7 @@ int CmdHF14AMfRdSc(const char *Cmd) {
     }
 
     sectorNo = param_get8(Cmd, 0);
-    if (sectorNo > MIFARE_4K_MAXSECTOR ) {
+    if (sectorNo > MIFARE_4K_MAXSECTOR) {
         PrintAndLogEx(NORMAL, "Sector number must be less than 40");
         return 1;
     }
@@ -620,7 +665,7 @@ int CmdHF14AMfRdSc(const char *Cmd) {
         PrintAndLogEx(NORMAL, "Key must include 12 HEX symbols");
         return 1;
     }
-    PrintAndLogEx(NORMAL, "--sector no:%d key type:%c key:%s ", sectorNo, keyType?'B':'A', sprint_hex(key, 6));
+    PrintAndLogEx(NORMAL, "--sector no:%d key type:%c key:%s ", sectorNo, keyType ? 'B' : 'A', sprint_hex(key, 6));
 
     UsbCommand c = {CMD_MIFARE_READSC, {sectorNo, keyType, 0}};
     memcpy(c.d.asBytes, key, 6);
@@ -635,47 +680,60 @@ int CmdHF14AMfRdSc(const char *Cmd) {
 
         PrintAndLogEx(NORMAL, "isOk:%02x", isOK);
         if (isOK) {
-            for (i = 0; i < (sectorNo<32?3:15); i++) {
+            for (i = 0; i < (sectorNo < 32 ? 3 : 15); i++) {
                 PrintAndLogEx(NORMAL, "data   : %s", sprint_hex(data + i * 16, 16));
             }
-            PrintAndLogEx(NORMAL, "trailer: %s", sprint_hex(data + (sectorNo<32?3:15) * 16, 16));
+            PrintAndLogEx(NORMAL, "trailer: %s", sprint_hex(data + (sectorNo < 32 ? 3 : 15) * 16, 16));
 
             PrintAndLogEx(NORMAL, "Trailer decoded:");
             int bln = mfFirstBlockOfSector(sectorNo);
             int blinc = (mfNumBlocksPerSector(sectorNo) > 4) ? 5 : 1;
             for (i = 0; i < 4; i++) {
-                PrintAndLogEx(NORMAL, "Access block %d%s: %s", bln, ((blinc > 1) && (i < 3) ? "+" : "") , mfGetAccessConditionsDesc(i, &(data + (sectorNo<32?3:15) * 16)[6]));
+                PrintAndLogEx(NORMAL, "Access block %d%s: %s", bln, ((blinc > 1) && (i < 3) ? "+" : ""), mfGetAccessConditionsDesc(i, &(data + (sectorNo < 32 ? 3 : 15) * 16)[6]));
                 bln += blinc;
             }
-            PrintAndLogEx(NORMAL, "UserData: %s", sprint_hex_inrow(&(data + (sectorNo<32?3:15) * 16)[9], 1));
+            PrintAndLogEx(NORMAL, "UserData: %s", sprint_hex_inrow(&(data + (sectorNo < 32 ? 3 : 15) * 16)[9], 1));
         }
     } else {
         PrintAndLogEx(WARNING, "Command execute timeout");
     }
 
-  return 0;
+    return 0;
 }
 
-uint16_t NumOfBlocks(char card){
-    switch(card){
-        case '0' : return MIFARE_MINI_MAXBLOCK;
-        case '1' : return MIFARE_1K_MAXBLOCK;
-        case '2' : return MIFARE_2K_MAXBLOCK;
-        case '4' : return MIFARE_4K_MAXBLOCK;
-        default  : return MIFARE_1K_MAXBLOCK;
+uint16_t NumOfBlocks(char card)
+{
+    switch (card) {
+        case '0' :
+            return MIFARE_MINI_MAXBLOCK;
+        case '1' :
+            return MIFARE_1K_MAXBLOCK;
+        case '2' :
+            return MIFARE_2K_MAXBLOCK;
+        case '4' :
+            return MIFARE_4K_MAXBLOCK;
+        default  :
+            return MIFARE_1K_MAXBLOCK;
     }
 }
-uint8_t NumOfSectors(char card){
-    switch(card){
-        case '0' : return MIFARE_MINI_MAXSECTOR;
-        case '1' : return MIFARE_1K_MAXSECTOR;
-        case '2' : return MIFARE_2K_MAXSECTOR;
-        case '4' : return MIFARE_4K_MAXSECTOR;
-        default  : return MIFARE_1K_MAXSECTOR;
+uint8_t NumOfSectors(char card)
+{
+    switch (card) {
+        case '0' :
+            return MIFARE_MINI_MAXSECTOR;
+        case '1' :
+            return MIFARE_1K_MAXSECTOR;
+        case '2' :
+            return MIFARE_2K_MAXSECTOR;
+        case '4' :
+            return MIFARE_4K_MAXSECTOR;
+        default  :
+            return MIFARE_1K_MAXSECTOR;
     }
 }
 
-uint8_t FirstBlockOfSector(uint8_t sectorNo) {
+uint8_t FirstBlockOfSector(uint8_t sectorNo)
+{
     if (sectorNo < 32) {
         return sectorNo * 4;
     } else {
@@ -683,7 +741,8 @@ uint8_t FirstBlockOfSector(uint8_t sectorNo) {
     }
 }
 
-uint8_t NumBlocksPerSector(uint8_t sectorNo) {
+uint8_t NumBlocksPerSector(uint8_t sectorNo)
+{
     if (sectorNo < 32) {
         return 4;
     } else {
@@ -691,7 +750,8 @@ uint8_t NumBlocksPerSector(uint8_t sectorNo) {
     }
 }
 
-int CmdHF14AMfDump(const char *Cmd) {
+int CmdHF14AMfDump(const char *Cmd)
+{
 
     uint8_t sectorNo, blockNo;
     uint8_t keyA[40][6];
@@ -703,7 +763,7 @@ int CmdHF14AMfDump(const char *Cmd) {
 
     char keyFilename[FILE_PATH_SIZE] = {0};
     char dataFilename[FILE_PATH_SIZE];
-    char * fptr;
+    char *fptr;
 
     memset(keyFilename, 0, sizeof(keyFilename));
     memset(dataFilename, 0, sizeof(dataFilename));
@@ -711,30 +771,30 @@ int CmdHF14AMfDump(const char *Cmd) {
     FILE *f;
     UsbCommand resp;
 
-    while(param_getchar(Cmd, cmdp) != 0x00) {
+    while (param_getchar(Cmd, cmdp) != 0x00) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
-        case 'h':
-            return usage_hf14_dump();
-        case 'k':
-            param_getstr(Cmd, cmdp+1, keyFilename, FILE_PATH_SIZE);
-            cmdp += 2;
-            break;
-        case 'f':
-            param_getstr(Cmd, cmdp+1, dataFilename, FILE_PATH_SIZE);
-            cmdp += 2;
-            break;
-        default:
-            if (cmdp == 0) {
-                numSectors = NumOfSectors(param_getchar(Cmd, cmdp));
-                cmdp++;
-            } else {
-                PrintAndLogEx(WARNING, "Unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
+            case 'h':
                 return usage_hf14_dump();
-            }
+            case 'k':
+                param_getstr(Cmd, cmdp + 1, keyFilename, FILE_PATH_SIZE);
+                cmdp += 2;
+                break;
+            case 'f':
+                param_getstr(Cmd, cmdp + 1, dataFilename, FILE_PATH_SIZE);
+                cmdp += 2;
+                break;
+            default:
+                if (cmdp == 0) {
+                    numSectors = NumOfSectors(param_getchar(Cmd, cmdp));
+                    cmdp++;
+                } else {
+                    PrintAndLogEx(WARNING, "Unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
+                    return usage_hf14_dump();
+                }
         }
     }
 
-    if ( keyFilename[0] == 0x00 ) {
+    if (keyFilename[0] == 0x00) {
         fptr = GenerateFilename("hf-mf-", "-key.bin");
         if (fptr == NULL)
             return 1;
@@ -743,15 +803,15 @@ int CmdHF14AMfDump(const char *Cmd) {
     }
 
     if ((f = fopen(keyFilename, "rb")) == NULL) {
-        PrintAndLogEx(WARNING, "Could not find file " _YELLOW_(%s), keyFilename);
+        PrintAndLogEx(WARNING, "Could not find file " _YELLOW_( % s), keyFilename);
         return 1;
     }
 
     // Read keys A from file
     size_t bytes_read;
-    for (sectorNo=0; sectorNo<numSectors; sectorNo++) {
-        bytes_read = fread( keyA[sectorNo], 1, 6, f );
-        if ( bytes_read != 6) {
+    for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
+        bytes_read = fread(keyA[sectorNo], 1, 6, f);
+        if (bytes_read != 6) {
             PrintAndLogEx(WARNING, "File reading error.");
             fclose(f);
             return 2;
@@ -759,9 +819,9 @@ int CmdHF14AMfDump(const char *Cmd) {
     }
 
     // Read keys B from file
-    for (sectorNo=0; sectorNo<numSectors; sectorNo++) {
-        bytes_read = fread( keyB[sectorNo], 1, 6, f );
-        if ( bytes_read != 6) {
+    for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
+        bytes_read = fread(keyB[sectorNo], 1, 6, f);
+        if (bytes_read != 6) {
             PrintAndLogEx(WARNING, "File reading error.");
             fclose(f);
             return 2;
@@ -785,7 +845,7 @@ int CmdHF14AMfDump(const char *Cmd) {
             if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
                 uint8_t isOK = resp.arg[0] & 0xff;
                 uint8_t *data = resp.d.asBytes;
-                if (isOK){
+                if (isOK) {
                     rights[sectorNo][0] = ((data[7] & 0x10) >> 2) | ((data[8] & 0x1) << 1) | ((data[8] & 0x10) >> 4); // C1C2C3 for data area 0
                     rights[sectorNo][1] = ((data[7] & 0x20) >> 3) | ((data[8] & 0x2) << 0) | ((data[8] & 0x20) >> 5); // C1C2C3 for data area 1
                     rights[sectorNo][2] = ((data[7] & 0x40) >> 4) | ((data[8] & 0x4) >> 1) | ((data[8] & 0x40) >> 6); // C1C2C3 for data area 2
@@ -820,7 +880,7 @@ int CmdHF14AMfDump(const char *Cmd) {
                     SendCommand(&c);
                     received = WaitForResponseTimeout(CMD_ACK, &resp, 1500);
                 } else {                                           // data block. Check if it can be read with key A or key B
-                    uint8_t data_area = (sectorNo < 32) ? blockNo : blockNo/5;
+                    uint8_t data_area = (sectorNo < 32) ? blockNo : blockNo / 5;
                     if ((rights[sectorNo][data_area] == 0x03) || (rights[sectorNo][data_area] == 0x05)) { // only key B would work
                         UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 1, 0}};
                         memcpy(c.d.asBytes, keyB[sectorNo], 6);
@@ -868,8 +928,7 @@ int CmdHF14AMfDump(const char *Cmd) {
                     PrintAndLogEx(FAILED, "could not read block %2d of sector %2d", blockNo, sectorNo);
                     break;
                 }
-            }
-            else {
+            } else {
                 isOK = false;
                 PrintAndLogEx(WARNING, "command execute timeout when trying to read block %2d of sector %2d.", blockNo, sectorNo);
                 break;
@@ -884,13 +943,13 @@ int CmdHF14AMfDump(const char *Cmd) {
 
     PrintAndLogEx(SUCCESS, "\nSuccedded in dumping all blocks");
 
-    if ( strlen(dataFilename) < 1 ) {
+    if (strlen(dataFilename) < 1) {
         fptr = dataFilename;
         fptr += sprintf(fptr, "hf-mf-");
         FillFileNameByUID(fptr, (uint8_t *)carddata, "-data", 4);
     }
 
-    uint16_t bytes = 16*(FirstBlockOfSector(numSectors - 1) + NumBlocksPerSector(numSectors - 1));
+    uint16_t bytes = 16 * (FirstBlockOfSector(numSectors - 1) + NumBlocksPerSector(numSectors - 1));
 
     saveFile(dataFilename, "bin", (uint8_t *)carddata, bytes);
     saveFileEML(dataFilename, "eml", (uint8_t *)carddata, bytes, MFBLOCK_SIZE);
@@ -898,10 +957,11 @@ int CmdHF14AMfDump(const char *Cmd) {
     return 0;
 }
 
-int CmdHF14AMfRestore(const char *Cmd) {
-    uint8_t sectorNo,blockNo;
+int CmdHF14AMfRestore(const char *Cmd)
+{
+    uint8_t sectorNo, blockNo;
     uint8_t keyType = 0;
-    uint8_t key[6] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};
+    uint8_t key[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
     uint8_t bldata[16] = {0x00};
     uint8_t keyA[40][6];
     uint8_t keyB[40][6];
@@ -909,42 +969,42 @@ int CmdHF14AMfRestore(const char *Cmd) {
     uint8_t cmdp = 0;
     char keyFilename[FILE_PATH_SIZE] = "";
     char dataFilename[FILE_PATH_SIZE] = "";
-    char szTemp[FILE_PATH_SIZE-20] = "";
+    char szTemp[FILE_PATH_SIZE - 20] = "";
     char *fptr;
     FILE *fdump, *fkeys;
 
-    while(param_getchar(Cmd, cmdp) != 0x00) {
-        switch(tolower(param_getchar(Cmd, cmdp))) {
-        case 'h':
-            return usage_hf14_restore();
-        case 'u':
-            param_getstr(Cmd, cmdp+1, szTemp, FILE_PATH_SIZE-20);
-            if(keyFilename[0]==0x00)
-                snprintf(keyFilename, FILE_PATH_SIZE, "hf-mf-%s-key.bin", szTemp);
-            if(dataFilename[0]==0x00)
-                snprintf(dataFilename, FILE_PATH_SIZE, "hf-mf-%s-data.bin", szTemp);
-            cmdp+=2;
-            break;
-        case 'k':
-            param_getstr(Cmd, cmdp+1, keyFilename, FILE_PATH_SIZE);
-            cmdp += 2;
-            break;
-        case 'f':
-            param_getstr(Cmd, cmdp+1, dataFilename, FILE_PATH_SIZE);
-            cmdp += 2;
-            break;
-        default:
-            if ( cmdp == 0 ) {
-                numSectors = NumOfSectors(param_getchar(Cmd, cmdp));
-                cmdp++;
-            } else {
-                PrintAndLogEx(WARNING, "Unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
+    while (param_getchar(Cmd, cmdp) != 0x00) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+            case 'h':
                 return usage_hf14_restore();
-            }
+            case 'u':
+                param_getstr(Cmd, cmdp + 1, szTemp, FILE_PATH_SIZE - 20);
+                if (keyFilename[0] == 0x00)
+                    snprintf(keyFilename, FILE_PATH_SIZE, "hf-mf-%s-key.bin", szTemp);
+                if (dataFilename[0] == 0x00)
+                    snprintf(dataFilename, FILE_PATH_SIZE, "hf-mf-%s-data.bin", szTemp);
+                cmdp += 2;
+                break;
+            case 'k':
+                param_getstr(Cmd, cmdp + 1, keyFilename, FILE_PATH_SIZE);
+                cmdp += 2;
+                break;
+            case 'f':
+                param_getstr(Cmd, cmdp + 1, dataFilename, FILE_PATH_SIZE);
+                cmdp += 2;
+                break;
+            default:
+                if (cmdp == 0) {
+                    numSectors = NumOfSectors(param_getchar(Cmd, cmdp));
+                    cmdp++;
+                } else {
+                    PrintAndLogEx(WARNING, "Unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
+                    return usage_hf14_restore();
+                }
         }
     }
 
-    if ( keyFilename[0] == 0x00 ) {
+    if (keyFilename[0] == 0x00) {
         fptr = GenerateFilename("hf-mf-", "-key.bin");
         if (fptr == NULL)
             return 1;
@@ -953,24 +1013,24 @@ int CmdHF14AMfRestore(const char *Cmd) {
     }
 
     if ((fkeys = fopen(keyFilename, "rb")) == NULL) {
-        PrintAndLogEx(WARNING, "Could not find file " _YELLOW_(%s), keyFilename);
+        PrintAndLogEx(WARNING, "Could not find file " _YELLOW_( % s), keyFilename);
         return 1;
     }
 
     size_t bytes_read;
     for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
-        bytes_read = fread( keyA[sectorNo], 1, 6, fkeys );
-        if ( bytes_read != 6 ) {
-            PrintAndLogEx(WARNING, "File reading error  " _YELLOW_(%s), keyFilename);
+        bytes_read = fread(keyA[sectorNo], 1, 6, fkeys);
+        if (bytes_read != 6) {
+            PrintAndLogEx(WARNING, "File reading error  " _YELLOW_( % s), keyFilename);
             fclose(fkeys);
             return 2;
         }
     }
 
     for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
-        bytes_read = fread( keyB[sectorNo], 1, 6, fkeys );
-        if ( bytes_read != 6 ) {
-            PrintAndLogEx(WARNING, "File reading error " _YELLOW_(%s), keyFilename);
+        bytes_read = fread(keyB[sectorNo], 1, 6, fkeys);
+        if (bytes_read != 6) {
+            PrintAndLogEx(WARNING, "File reading error " _YELLOW_( % s), keyFilename);
             fclose(fkeys);
             return 2;
         }
@@ -978,27 +1038,27 @@ int CmdHF14AMfRestore(const char *Cmd) {
 
     fclose(fkeys);
 
-    if ( dataFilename[0] == 0x00 ) {
+    if (dataFilename[0] == 0x00) {
         fptr = GenerateFilename("hf-mf-", "-data.bin");
         if (fptr == NULL)
             return 1;
 
-        strcpy(dataFilename,fptr);
+        strcpy(dataFilename, fptr);
     }
 
     if ((fdump = fopen(dataFilename, "rb")) == NULL) {
-        PrintAndLogEx(WARNING, "Could not find file " _YELLOW_(%s), dataFilename);
+        PrintAndLogEx(WARNING, "Could not find file " _YELLOW_( % s), dataFilename);
         return 1;
     }
-    PrintAndLogEx(INFO, "Restoring " _YELLOW_(%s)" to card", dataFilename);
+    PrintAndLogEx(INFO, "Restoring " _YELLOW_( % s)" to card", dataFilename);
 
     for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
         for (blockNo = 0; blockNo < NumBlocksPerSector(sectorNo); blockNo++) {
             UsbCommand c = {CMD_MIFARE_WRITEBL, {FirstBlockOfSector(sectorNo) + blockNo, keyType, 0}};
             memcpy(c.d.asBytes, key, 6);
             bytes_read = fread(bldata, 1, 16, fdump);
-            if ( bytes_read != 16) {
-                PrintAndLogEx(WARNING, "File reading error " _YELLOW_(%s), dataFilename);
+            if (bytes_read != 16) {
+                PrintAndLogEx(WARNING, "File reading error " _YELLOW_( % s), dataFilename);
                 fclose(fdump);
                 fdump = NULL;
                 return 2;
@@ -1026,7 +1086,7 @@ int CmdHF14AMfRestore(const char *Cmd) {
             SendCommand(&c);
 
             UsbCommand resp;
-            if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
+            if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
                 uint8_t isOK  = resp.arg[0] & 0xff;
                 PrintAndLogEx(SUCCESS, "isOk:%02x", isOK);
             } else {
@@ -1039,7 +1099,8 @@ int CmdHF14AMfRestore(const char *Cmd) {
     return 0;
 }
 
-int CmdHF14AMfNested(const char *Cmd) {
+int CmdHF14AMfNested(const char *Cmd)
+{
     int i, res, iterations;
     sector_t *e_sector = NULL;
     uint8_t blockNo = 0;
@@ -1048,7 +1109,7 @@ int CmdHF14AMfNested(const char *Cmd) {
     uint8_t trgKeyType = 0;
     uint8_t SectorsCnt = 0;
     uint8_t key[6] = {0, 0, 0, 0, 0, 0};
-    uint8_t keyBlock[(MIFARE_DEFAULTKEYS_SIZE + 1) *6];
+    uint8_t keyBlock[(MIFARE_DEFAULTKEYS_SIZE + 1) * 6];
     uint64_t key64 = 0;
     bool transferToEml = false;
     bool createDumpFile = false;
@@ -1092,7 +1153,7 @@ int CmdHF14AMfNested(const char *Cmd) {
     }
 
     uint8_t j = 4;
-    while ( ctmp != 0x00 ) {
+    while (ctmp != 0x00) {
 
         ctmp = tolower(param_getchar(Cmd, j));
         transferToEml |= (ctmp == 't');
@@ -1111,20 +1172,28 @@ int CmdHF14AMfNested(const char *Cmd) {
     if (cmdp == 'o') {
         int16_t isOK = mfnested(blockNo, keyType, key, trgBlockNo, trgKeyType, keyBlock, true);
         switch (isOK) {
-            case -1 : PrintAndLogEx(WARNING, "Error: No response from Proxmark.\n"); break;
-            case -2 : PrintAndLogEx(WARNING, "Button pressed. Aborted.\n"); break;
-            case -3 : PrintAndLogEx(FAILED, "Tag isn't vulnerable to Nested Attack (PRNG is not predictable).\n"); break;
-            case -4 : PrintAndLogEx(FAILED, "No valid key found"); break;
+            case -1 :
+                PrintAndLogEx(WARNING, "Error: No response from Proxmark.\n");
+                break;
+            case -2 :
+                PrintAndLogEx(WARNING, "Button pressed. Aborted.\n");
+                break;
+            case -3 :
+                PrintAndLogEx(FAILED, "Tag isn't vulnerable to Nested Attack (PRNG is not predictable).\n");
+                break;
+            case -4 :
+                PrintAndLogEx(FAILED, "No valid key found");
+                break;
             case -5 :
                 key64 = bytes_to_num(keyBlock, 6);
 
                 // transfer key to the emulator
                 if (transferToEml) {
                     uint8_t sectortrailer;
-                    if (trgBlockNo < 32*4) {    // 4 block sector
-                    sectortrailer = trgBlockNo | 0x03;
+                    if (trgBlockNo < 32 * 4) {  // 4 block sector
+                        sectortrailer = trgBlockNo | 0x03;
                     } else {                    // 16 block sector
-                    sectortrailer = trgBlockNo | 0x0f;
+                        sectortrailer = trgBlockNo | 0x0f;
                     }
                     mfEmlGetMem(keyBlock, sectortrailer, 1);
 
@@ -1136,11 +1205,11 @@ int CmdHF14AMfNested(const char *Cmd) {
                     PrintAndLogEx(SUCCESS, "Key transferred to emulator memory.");
                 }
                 return 0;
-            default : PrintAndLogEx(WARNING, "Unknown Error.\n");
+            default :
+                PrintAndLogEx(WARNING, "Unknown Error.\n");
         }
         return 2;
-    }
-    else { // ------------------------------------  multiple sectors working
+    } else { // ------------------------------------  multiple sectors working
         uint64_t t1 = msclock();
 
         e_sector = calloc(SectorsCnt, sizeof(sector_t));
@@ -1148,17 +1217,17 @@ int CmdHF14AMfNested(const char *Cmd) {
 
         //test current key and additional standard keys first
         // add parameter key
-        memcpy( keyBlock + (MIFARE_DEFAULTKEYS_SIZE * 6), key, 6 );
+        memcpy(keyBlock + (MIFARE_DEFAULTKEYS_SIZE * 6), key, 6);
 
-        for (int cnt = 0; cnt < MIFARE_DEFAULTKEYS_SIZE; cnt++){
-            num_to_bytes(g_mifare_default_keys[cnt], 6, (uint8_t*)(keyBlock + cnt * 6));
+        for (int cnt = 0; cnt < MIFARE_DEFAULTKEYS_SIZE; cnt++) {
+            num_to_bytes(g_mifare_default_keys[cnt], 6, (uint8_t *)(keyBlock + cnt * 6));
         }
 
         PrintAndLogEx(SUCCESS, "Testing known keys. Sector count=%d", SectorsCnt);
-        res = mfCheckKeys_fast( SectorsCnt, true, true, 1, MIFARE_DEFAULTKEYS_SIZE + 1, keyBlock, e_sector, false);
+        res = mfCheckKeys_fast(SectorsCnt, true, true, 1, MIFARE_DEFAULTKEYS_SIZE + 1, keyBlock, e_sector, false);
 
         uint64_t t2 = msclock() - t1;
-        PrintAndLogEx(SUCCESS, "Time to check %d known keys: %.0f seconds\n", MIFARE_DEFAULTKEYS_SIZE, (float)t2/1000.0 );
+        PrintAndLogEx(SUCCESS, "Time to check %d known keys: %.0f seconds\n", MIFARE_DEFAULTKEYS_SIZE, (float)t2 / 1000.0);
         PrintAndLogEx(SUCCESS, "enter nested attack");
 
         // nested sectors
@@ -1173,9 +1242,15 @@ int CmdHF14AMfNested(const char *Cmd) {
 
                     int16_t isOK = mfnested(blockNo, keyType, key, FirstBlockOfSector(sectorNo), trgKeyType, keyBlock, calibrate);
                     switch (isOK) {
-                        case -1 : PrintAndLogEx(WARNING, "error: No response from Proxmark.\n"); break;
-                        case -2 : PrintAndLogEx(WARNING, "button pressed. Aborted.\n"); break;
-                        case -3 : PrintAndLogEx(FAILED, "Tag isn't vulnerable to Nested Attack (PRNG is not predictable).\n"); break;
+                        case -1 :
+                            PrintAndLogEx(WARNING, "error: No response from Proxmark.\n");
+                            break;
+                        case -2 :
+                            PrintAndLogEx(WARNING, "button pressed. Aborted.\n");
+                            break;
+                        case -3 :
+                            PrintAndLogEx(FAILED, "Tag isn't vulnerable to Nested Attack (PRNG is not predictable).\n");
+                            break;
                         case -4 : //key not found
                             calibrate = false;
                             iterations++;
@@ -1186,10 +1261,11 @@ int CmdHF14AMfNested(const char *Cmd) {
                             e_sector[sectorNo].foundKey[trgKeyType] = 1;
                             e_sector[sectorNo].Key[trgKeyType] = bytes_to_num(keyBlock, 6);
 
-                            res = mfCheckKeys_fast( SectorsCnt, true, true, 2, 1, keyBlock, e_sector, false);
+                            res = mfCheckKeys_fast(SectorsCnt, true, true, 2, 1, keyBlock, e_sector, false);
                             continue;
 
-                        default : PrintAndLogEx(WARNING, "unknown Error.\n");
+                        default :
+                            PrintAndLogEx(WARNING, "unknown Error.\n");
                     }
                     free(e_sector);
                     return 2;
@@ -1198,14 +1274,14 @@ int CmdHF14AMfNested(const char *Cmd) {
         }
 
         t1 = msclock() - t1;
-        PrintAndLogEx(SUCCESS, "time in nested: %.0f seconds\n", (float)t1/1000.0);
+        PrintAndLogEx(SUCCESS, "time in nested: %.0f seconds\n", (float)t1 / 1000.0);
 
 
         // 20160116 If Sector A is found, but not Sector B,  try just reading it of the tag?
         PrintAndLogEx(INFO, "trying to read key B...");
         for (i = 0; i < SectorsCnt; i++) {
             // KEY A  but not KEY B
-            if ( e_sector[i].foundKey[0] && !e_sector[i].foundKey[1] ) {
+            if (e_sector[i].foundKey[0] && !e_sector[i].foundKey[1]) {
 
                 uint8_t sectrail = (FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1);
 
@@ -1217,15 +1293,15 @@ int CmdHF14AMfNested(const char *Cmd) {
                 SendCommand(&c);
 
                 UsbCommand resp;
-                if ( !WaitForResponseTimeout(CMD_ACK,&resp,1500)) continue;
+                if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) continue;
 
                 uint8_t isOK  = resp.arg[0] & 0xff;
                 if (!isOK) continue;
 
                 uint8_t *data = resp.d.asBytes;
-                key64 = bytes_to_num(data+10, 6);
+                key64 = bytes_to_num(data + 10, 6);
                 if (key64) {
-                    PrintAndLogEx(SUCCESS, "data: %s", sprint_hex(data+10, 6));
+                    PrintAndLogEx(SUCCESS, "data: %s", sprint_hex(data + 10, 6));
                     e_sector[i].foundKey[1] = true;
                     e_sector[i].Key[1] = key64;
                 }
@@ -1234,7 +1310,7 @@ int CmdHF14AMfNested(const char *Cmd) {
 
 
         //print them
-        printKeyTable( SectorsCnt, e_sector );
+        printKeyTable(SectorsCnt, e_sector);
 
         // transfer them to the emulator
         if (transferToEml) {
@@ -1258,26 +1334,26 @@ int CmdHF14AMfNested(const char *Cmd) {
             }
 
             if ((fkeys = fopen(fptr, "wb")) == NULL) {
-                PrintAndLogEx(WARNING, "could not create file " _YELLOW_(%s), fptr);
+                PrintAndLogEx(WARNING, "could not create file " _YELLOW_( % s), fptr);
                 free(e_sector);
                 return 1;
             }
 
-            PrintAndLogEx(SUCCESS, "saving keys to binary file " _YELLOW_(%s), fptr);
-            for (i=0; i<SectorsCnt; i++) {
-                if (e_sector[i].foundKey[0]){
+            PrintAndLogEx(SUCCESS, "saving keys to binary file " _YELLOW_( % s), fptr);
+            for (i = 0; i < SectorsCnt; i++) {
+                if (e_sector[i].foundKey[0]) {
                     num_to_bytes(e_sector[i].Key[0], 6, tempkey);
-                    fwrite ( tempkey, 1, 6, fkeys );
+                    fwrite(tempkey, 1, 6, fkeys);
                 } else {
-                    fwrite ( &standart, 1, 6, fkeys );
+                    fwrite(&standart, 1, 6, fkeys);
                 }
             }
-            for( i=0; i<SectorsCnt; i++) {
-                if (e_sector[i].foundKey[1]){
+            for (i = 0; i < SectorsCnt; i++) {
+                if (e_sector[i].foundKey[1]) {
                     num_to_bytes(e_sector[i].Key[1], 6, tempkey);
-                    fwrite ( tempkey, 1, 6, fkeys );
+                    fwrite(tempkey, 1, 6, fkeys);
                 } else {
-                    fwrite ( &standart, 1, 6, fkeys );
+                    fwrite(&standart, 1, 6, fkeys);
                 }
             }
             fflush(fkeys);
@@ -1290,16 +1366,17 @@ int CmdHF14AMfNested(const char *Cmd) {
     return 0;
 }
 
-int CmdHF14AMfNestedHard(const char *Cmd) {
+int CmdHF14AMfNestedHard(const char *Cmd)
+{
     uint8_t blockNo = 0;
     uint8_t keyType = 0;
     uint8_t trgBlockNo = 0;
     uint8_t trgKeyType = 0;
     uint8_t key[6] = {0, 0, 0, 0, 0, 0};
     uint8_t trgkey[6] = {0, 0, 0, 0, 0, 0};
-    uint8_t cmdp=0;
+    uint8_t cmdp = 0;
     char filename[FILE_PATH_SIZE], *fptr;
-    char szTemp[FILE_PATH_SIZE-20];
+    char szTemp[FILE_PATH_SIZE - 20];
     char ctmp;
 
     bool know_target_key = false;
@@ -1308,37 +1385,37 @@ int CmdHF14AMfNestedHard(const char *Cmd) {
     bool slow = false;
     int tests = 0;
 
-    switch(tolower(param_getchar(Cmd, cmdp))) {
-        case 'h': return usage_hf14_hardnested();
+    switch (tolower(param_getchar(Cmd, cmdp))) {
+        case 'h':
+            return usage_hf14_hardnested();
         case 'r':
-            fptr = GenerateFilename("hf-mf-","-nonces.bin");
+            fptr = GenerateFilename("hf-mf-", "-nonces.bin");
             if (fptr == NULL)
                 strncpy(filename, "nonces.bin", FILE_PATH_SIZE);
             else
-                strncpy(filename, fptr, FILE_PATH_SIZE-1);
+                strncpy(filename, fptr, FILE_PATH_SIZE - 1);
 
             nonce_file_read = true;
-            if (!param_gethex(Cmd, cmdp+1, trgkey, 12)) {
+            if (!param_gethex(Cmd, cmdp + 1, trgkey, 12)) {
                 know_target_key = true;
             }
             cmdp++;
             break;
         case 't':
-            tests = param_get32ex(Cmd, cmdp+1, 100, 10);
-            if (!param_gethex(Cmd, cmdp+2, trgkey, 12)) {
+            tests = param_get32ex(Cmd, cmdp + 1, 100, 10);
+            if (!param_gethex(Cmd, cmdp + 2, trgkey, 12)) {
                 know_target_key = true;
             }
             cmdp += 2;
             break;
         default:
-            if (param_getchar(Cmd, cmdp) == 0x00)
-            {
+            if (param_getchar(Cmd, cmdp) == 0x00) {
                 PrintAndLogEx(WARNING, "Block number is missing");
                 return 1;
 
             }
             blockNo = param_get8(Cmd, cmdp);
-            ctmp = tolower(param_getchar(Cmd, cmdp+1));
+            ctmp = tolower(param_getchar(Cmd, cmdp + 1));
             if (ctmp != 'a' && ctmp != 'b') {
                 PrintAndLogEx(WARNING, "Key type must be A or B");
                 return 1;
@@ -1348,20 +1425,19 @@ int CmdHF14AMfNestedHard(const char *Cmd) {
                 keyType = 1;
             }
 
-            if (param_gethex(Cmd, cmdp+2, key, 12)) {
+            if (param_gethex(Cmd, cmdp + 2, key, 12)) {
                 PrintAndLogEx(WARNING, "Key must include 12 HEX symbols");
                 return 1;
             }
 
-            if (param_getchar(Cmd, cmdp+3) == 0x00)
-            {
+            if (param_getchar(Cmd, cmdp + 3) == 0x00) {
                 PrintAndLogEx(WARNING, "Target block number is missing");
                 return 1;
             }
 
-            trgBlockNo = param_get8(Cmd, cmdp+3);
+            trgBlockNo = param_get8(Cmd, cmdp + 3);
 
-            ctmp = tolower(param_getchar(Cmd, cmdp+4));
+            ctmp = tolower(param_getchar(Cmd, cmdp + 4));
             if (ctmp != 'a' && ctmp != 'b') {
                 PrintAndLogEx(WARNING, "Target key type must be A or B");
                 return 1;
@@ -1377,64 +1453,64 @@ int CmdHF14AMfNestedHard(const char *Cmd) {
     }
 
     while ((ctmp = param_getchar(Cmd, cmdp))) {
-        switch(tolower(ctmp)) {
-        case 's':
-            slow = true;
-            break;
-        case 'w':
-            nonce_file_write = true;
-            fptr = GenerateFilename("hf-mf-","-nonces.bin");
-            if (fptr == NULL)
-                return 1;
-            strncpy(filename, fptr, FILE_PATH_SIZE-1);
-            break;
-        case 'u':
-            param_getstr(Cmd, cmdp+1, szTemp, FILE_PATH_SIZE-20);
-            snprintf(filename, FILE_PATH_SIZE, "hf-mf-%s-nonces.bin", szTemp);
-            cmdp++;
-            break;
-        case 'f':
-            param_getstr(Cmd, cmdp+1, szTemp, FILE_PATH_SIZE-20);
-            strncpy(filename, szTemp, FILE_PATH_SIZE-20);
-            cmdp++;
-            break;
-        case 'i':
-            SetSIMDInstr(SIMD_AUTO);
-            ctmp = tolower(param_getchar(Cmd, cmdp+1));
-            switch (ctmp) {
-                case '5':
-                    SetSIMDInstr(SIMD_AVX512);
-                    break;
-                case '2':
-                    SetSIMDInstr(SIMD_AVX2);
-                    break;
-                case 'a':
-                    SetSIMDInstr(SIMD_AVX);
-                    break;
-                case 's':
-                    SetSIMDInstr(SIMD_SSE2);
-                    break;
-                case 'm':
-                    SetSIMDInstr(SIMD_MMX);
-                    break;
-                case 'n':
-                    SetSIMDInstr(SIMD_NONE);
-                    break;
-                default:
-                    PrintAndLogEx(WARNING, "Unknown SIMD type. %c", ctmp);
+        switch (tolower(ctmp)) {
+            case 's':
+                slow = true;
+                break;
+            case 'w':
+                nonce_file_write = true;
+                fptr = GenerateFilename("hf-mf-", "-nonces.bin");
+                if (fptr == NULL)
                     return 1;
-            }
-            cmdp += 2;
-            break;
-        default:
-            PrintAndLogEx(WARNING, "Unknown parameter '%c'\n", ctmp);
-            usage_hf14_hardnested();
-            return 1;
+                strncpy(filename, fptr, FILE_PATH_SIZE - 1);
+                break;
+            case 'u':
+                param_getstr(Cmd, cmdp + 1, szTemp, FILE_PATH_SIZE - 20);
+                snprintf(filename, FILE_PATH_SIZE, "hf-mf-%s-nonces.bin", szTemp);
+                cmdp++;
+                break;
+            case 'f':
+                param_getstr(Cmd, cmdp + 1, szTemp, FILE_PATH_SIZE - 20);
+                strncpy(filename, szTemp, FILE_PATH_SIZE - 20);
+                cmdp++;
+                break;
+            case 'i':
+                SetSIMDInstr(SIMD_AUTO);
+                ctmp = tolower(param_getchar(Cmd, cmdp + 1));
+                switch (ctmp) {
+                    case '5':
+                        SetSIMDInstr(SIMD_AVX512);
+                        break;
+                    case '2':
+                        SetSIMDInstr(SIMD_AVX2);
+                        break;
+                    case 'a':
+                        SetSIMDInstr(SIMD_AVX);
+                        break;
+                    case 's':
+                        SetSIMDInstr(SIMD_SSE2);
+                        break;
+                    case 'm':
+                        SetSIMDInstr(SIMD_MMX);
+                        break;
+                    case 'n':
+                        SetSIMDInstr(SIMD_NONE);
+                        break;
+                    default:
+                        PrintAndLogEx(WARNING, "Unknown SIMD type. %c", ctmp);
+                        return 1;
+                }
+                cmdp += 2;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'\n", ctmp);
+                usage_hf14_hardnested();
+                return 1;
         }
         cmdp++;
     }
 
-    if ( !know_target_key ) {
+    if (!know_target_key) {
         uint64_t key64 = 0;
         // check if we can authenticate to sector
         int res = mfCheckKeys(blockNo, keyType, true, 1, key, &key64);
@@ -1445,13 +1521,13 @@ int CmdHF14AMfNestedHard(const char *Cmd) {
     }
 
     PrintAndLogEx(NORMAL, "--target block no:%3d, target key type:%c, known target key: 0x%02x%02x%02x%02x%02x%02x%s, file action: %s, Slow: %s, Tests: %d ",
-            trgBlockNo,
-            trgKeyType?'B':'A',
-            trgkey[0], trgkey[1], trgkey[2], trgkey[3], trgkey[4], trgkey[5],
-            know_target_key ? "" : " (not set)",
-            nonce_file_write ? "write": nonce_file_read ? "read" : "none",
-            slow ? "Yes" : "No",
-            tests);
+                  trgBlockNo,
+                  trgKeyType ? 'B' : 'A',
+                  trgkey[0], trgkey[1], trgkey[2], trgkey[3], trgkey[4], trgkey[5],
+                  know_target_key ? "" : " (not set)",
+                  nonce_file_write ? "write" : nonce_file_read ? "read" : "none",
+                  slow ? "Yes" : "No",
+                  tests);
 
     uint64_t foundkey = 0;
     int16_t isOK = mfnestedhard(blockNo, keyType, key, trgBlockNo, trgKeyType, know_target_key ? trgkey : NULL, nonce_file_read, nonce_file_write, slow, tests, &foundkey, filename);
@@ -1459,27 +1535,34 @@ int CmdHF14AMfNestedHard(const char *Cmd) {
     DropField();
     if (isOK) {
         switch (isOK) {
-            case 1 : PrintAndLogEx(WARNING, "Error: No response from Proxmark.\n"); break;
-            case 2 : PrintAndLogEx(NORMAL, "Button pressed. Aborted.\n"); break;
-            default : break;
+            case 1 :
+                PrintAndLogEx(WARNING, "Error: No response from Proxmark.\n");
+                break;
+            case 2 :
+                PrintAndLogEx(NORMAL, "Button pressed. Aborted.\n");
+                break;
+            default :
+                break;
         }
         return 2;
     }
     return 0;
 }
 
-int randInRange(int min, int max) {
-    return min + (int) (rand() / (double) (RAND_MAX) * (max - min + 1));
+int randInRange(int min, int max)
+{
+    return min + (int)(rand() / (double)(RAND_MAX) * (max - min + 1));
 }
 
 //Fisher–Yates shuffle
-void shuffle( uint8_t *array, uint16_t len) {
+void shuffle(uint8_t *array, uint16_t len)
+{
     uint8_t tmp[6];
     uint16_t x;
     time_t t;
     srand((unsigned) time(&t));
     while (len) {
-        x = randInRange(0, (len -= 6) ) | 0; // 0 = i < n
+        x = randInRange(0, (len -= 6)) | 0;  // 0 = i < n
         x %= 6;
         memcpy(tmp, array + x, 6);
         memcpy(array + x, array + len, 6);
@@ -1487,14 +1570,15 @@ void shuffle( uint8_t *array, uint16_t len) {
     }
 }
 
-int CmdHF14AMfChk_fast(const char *Cmd) {
+int CmdHF14AMfChk_fast(const char *Cmd)
+{
 
     char ctmp = 0x00;
     ctmp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) < 1 || ctmp == 'h') return usage_hf14_chk_fast();
 
-    FILE * f;
-    char filename[FILE_PATH_SIZE]={0};
+    FILE *f;
+    char filename[FILE_PATH_SIZE] = {0};
     char buf[13];
     char *fptr;
     uint8_t tempkey[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
@@ -1515,12 +1599,21 @@ int CmdHF14AMfChk_fast(const char *Cmd) {
         num_to_bytes(g_mifare_default_keys[cnt], 6, keyBlock + cnt * 6);
 
     // sectors
-    switch(ctmp) {
-        case '0': sectorsCnt =  MIFARE_MINI_MAXSECTOR; break;
-        case '1': sectorsCnt = MIFARE_1K_MAXSECTOR; break;
-        case '2': sectorsCnt = MIFARE_2K_MAXSECTOR; break;
-        case '4': sectorsCnt = MIFARE_4K_MAXSECTOR; break;
-        default:  sectorsCnt = MIFARE_1K_MAXSECTOR;
+    switch (ctmp) {
+        case '0':
+            sectorsCnt =  MIFARE_MINI_MAXSECTOR;
+            break;
+        case '1':
+            sectorsCnt = MIFARE_1K_MAXSECTOR;
+            break;
+        case '2':
+            sectorsCnt = MIFARE_2K_MAXSECTOR;
+            break;
+        case '4':
+            sectorsCnt = MIFARE_4K_MAXSECTOR;
+            break;
+        default:
+            sectorsCnt = MIFARE_1K_MAXSECTOR;
     }
 
     for (i = 1; param_getchar(Cmd, i); i++) {
@@ -1530,12 +1623,12 @@ int CmdHF14AMfChk_fast(const char *Cmd) {
 
         if (clen == 12) {
 
-            if ( param_gethex(Cmd, i, keyBlock + 6 * keycnt, 12) ){
+            if (param_gethex(Cmd, i, keyBlock + 6 * keycnt, 12)) {
                 PrintAndLogEx(FAILED, "not hex, skipping");
                 continue;
             }
 
-            if ( keyitems - keycnt < 2) {
+            if (keyitems - keycnt < 2) {
                 p = realloc(keyBlock, 6 * (keyitems += 64));
                 if (!p) {
                     PrintAndLogEx(FAILED, "Cannot allocate memory for Keys");
@@ -1544,43 +1637,43 @@ int CmdHF14AMfChk_fast(const char *Cmd) {
                 }
                 keyBlock = p;
             }
-            PrintAndLogEx(NORMAL, "[%2d] key %s", keycnt, sprint_hex( (keyBlock + 6*keycnt), 6 ) );
+            PrintAndLogEx(NORMAL, "[%2d] key %s", keycnt, sprint_hex((keyBlock + 6 * keycnt), 6));
             keycnt++;
-        } else if ( clen == 1) {
-            if (ctmp == 't' ) { transferToEml = 1; continue; }
-            if (ctmp == 'd' ) { createDumpFile = 1; continue; }
+        } else if (clen == 1) {
+            if (ctmp == 't') { transferToEml = 1; continue; }
+            if (ctmp == 'd') { createDumpFile = 1; continue; }
 #ifdef WITH_FLASH
-            if (ctmp == 'm' ) { use_flashmemory = true; continue; }
+            if (ctmp == 'm') { use_flashmemory = true; continue; }
 #endif
         } else {
             // May be a dic file
-            if ( param_getstr(Cmd, i, filename, FILE_PATH_SIZE) >= FILE_PATH_SIZE ) {
+            if (param_getstr(Cmd, i, filename, FILE_PATH_SIZE) >= FILE_PATH_SIZE) {
                 PrintAndLogEx(FAILED, "Filename too long");
                 continue;
             }
 
-            f = fopen( filename, "r");
-            if ( !f ){
-                PrintAndLogEx(FAILED, "File: " _YELLOW_(%s) ": not found or locked.", filename);
+            f = fopen(filename, "r");
+            if (!f) {
+                PrintAndLogEx(FAILED, "File: " _YELLOW_( % s) ": not found or locked.", filename);
                 continue;
             }
 
             // read file
-            while( fgets(buf, sizeof(buf), f) ){
+            while (fgets(buf, sizeof(buf), f)) {
                 if (strlen(buf) < 12 || buf[11] == '\n')
                     continue;
 
                 while (fgetc(f) != '\n' && !feof(f)) ;  //goto next line
 
-                if( buf[0]=='#' ) continue; //The line start with # is comment, skip
+                if (buf[0] == '#') continue; //The line start with # is comment, skip
 
-                if (!isxdigit(buf[0])){
-                    PrintAndLogEx(FAILED, "File content error. '" _YELLOW_(%s)"' must include 12 HEX symbols", buf);
+                if (!isxdigit(buf[0])) {
+                    PrintAndLogEx(FAILED, "File content error. '" _YELLOW_( % s)"' must include 12 HEX symbols", buf);
                     continue;
                 }
 
                 buf[12] = 0;
-                if ( keyitems - keycnt < 2) {
+                if (keyitems - keycnt < 2) {
                     p = realloc(keyBlock, 6 * (keyitems += 64));
                     if (!p) {
                         PrintAndLogEx(FAILED, "Cannot allocate memory for default keys");
@@ -1597,16 +1690,16 @@ int CmdHF14AMfChk_fast(const char *Cmd) {
                 memset(buf, 0, sizeof(buf));
             }
             fclose(f);
-            PrintAndLogEx(SUCCESS, "Loaded %2d keys from " _YELLOW_(%s), keycnt, filename);
+            PrintAndLogEx(SUCCESS, "Loaded %2d keys from " _YELLOW_( % s), keycnt, filename);
         }
     }
 
     if (keycnt == 0 && !use_flashmemory) {
         PrintAndLogEx(SUCCESS, "No key specified, trying default keys");
-        for (;keycnt < MIFARE_DEFAULTKEYS_SIZE; keycnt++)
+        for (; keycnt < MIFARE_DEFAULTKEYS_SIZE; keycnt++)
             PrintAndLogEx(NORMAL, "[%2d] %02x%02x%02x%02x%02x%02x", keycnt,
-                (keyBlock + 6*keycnt)[0],(keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2],
-                (keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4], (keyBlock + 6*keycnt)[5]);
+                          (keyBlock + 6 * keycnt)[0], (keyBlock + 6 * keycnt)[1], (keyBlock + 6 * keycnt)[2],
+                          (keyBlock + 6 * keycnt)[3], (keyBlock + 6 * keycnt)[4], (keyBlock + 6 * keycnt)[5]);
     }
 
     // // initialize storage for found keys
@@ -1616,78 +1709,79 @@ int CmdHF14AMfChk_fast(const char *Cmd) {
         return 1;
     }
 
-    uint32_t chunksize = keycnt > (USB_CMD_DATA_SIZE/6) ? (USB_CMD_DATA_SIZE/6) : keycnt;
+    uint32_t chunksize = keycnt > (USB_CMD_DATA_SIZE / 6) ? (USB_CMD_DATA_SIZE / 6) : keycnt;
     bool firstChunk = true, lastChunk = false;
 
     // time
     uint64_t t1 = msclock();
 
-    if ( use_flashmemory ) {
+    if (use_flashmemory) {
         PrintAndLogEx(SUCCESS, "Using dictionary in flash memory");
-        mfCheckKeys_fast( sectorsCnt, true, true, 1, 0, keyBlock, e_sector, use_flashmemory);
+        mfCheckKeys_fast(sectorsCnt, true, true, 1, 0, keyBlock, e_sector, use_flashmemory);
     } else {
 
         // strategys. 1= deep first on sector 0 AB,  2= width first on all sectors
         for (uint8_t strategy = 1; strategy < 3; strategy++) {
             PrintAndLogEx(SUCCESS, "Running strategy %u", strategy);
 
-                // main keychunk loop
-                for (uint32_t i = 0; i < keycnt; i += chunksize) {
+            // main keychunk loop
+            for (uint32_t i = 0; i < keycnt; i += chunksize) {
 
-                    if (ukbhit()) {
-                        int gc = getchar(); (void)gc;
-                        PrintAndLogEx(WARNING, "\naborted via keyboard!\n");
-                        goto out;
-                    }
+                if (ukbhit()) {
+                    int gc = getchar();
+                    (void)gc;
+                    PrintAndLogEx(WARNING, "\naborted via keyboard!\n");
+                    goto out;
+                }
 
-                    uint32_t size = ((keycnt - i)  > chunksize) ? chunksize : keycnt - i;
+                uint32_t size = ((keycnt - i)  > chunksize) ? chunksize : keycnt - i;
 
-                    // last chunk?
-                    if ( size == keycnt - i)
-                        lastChunk = true;
+                // last chunk?
+                if (size == keycnt - i)
+                    lastChunk = true;
 
-                    int res = mfCheckKeys_fast( sectorsCnt, firstChunk, lastChunk, strategy, size, keyBlock + (i * 6), e_sector, false);
+                int res = mfCheckKeys_fast(sectorsCnt, firstChunk, lastChunk, strategy, size, keyBlock + (i * 6), e_sector, false);
 
-                    if ( firstChunk )
-                        firstChunk = false;
+                if (firstChunk)
+                    firstChunk = false;
 
-                    // all keys,  aborted
-                    if ( res == 0 || res == 2 )
-                        goto out;
-                } // end chunks of keys
+                // all keys,  aborted
+                if (res == 0 || res == 2)
+                    goto out;
+            } // end chunks of keys
             firstChunk = true;
             lastChunk = false;
         } // end strategy
     }
 out:
     t1 = msclock() - t1;
-    PrintAndLogEx(SUCCESS, "Time in checkkeys (fast):  %.1fs\n", (float)(t1/1000.0));
+    PrintAndLogEx(SUCCESS, "Time in checkkeys (fast):  %.1fs\n", (float)(t1 / 1000.0));
 
     // check..
     uint8_t found_keys = 0;
     for (uint8_t i = 0; i < sectorsCnt; ++i) {
 
-        if ( e_sector[i].foundKey[0] )
+        if (e_sector[i].foundKey[0])
             found_keys++;
 
-        if ( e_sector[i].foundKey[1] )
+        if (e_sector[i].foundKey[1])
             found_keys++;
     }
 
-    if ( found_keys == 0 ) {
+    if (found_keys == 0) {
         PrintAndLogEx(WARNING, "No keys found");
     } else {
 
-        printKeyTable( sectorsCnt, e_sector );
+        printKeyTable(sectorsCnt, e_sector);
 
         if (transferToEml) {
             uint8_t block[16] = {0x00};
-            for (uint8_t i = 0; i < sectorsCnt; ++i ) {
+            for (uint8_t i = 0; i < sectorsCnt; ++i) {
                 mfEmlGetMem(block, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
                 if (e_sector[i].foundKey[0])
                     num_to_bytes(e_sector[i].Key[0], 6, block);
                 if (e_sector[i].foundKey[1])
-                    num_to_bytes(e_sector[i].Key[1], 6, block+10);
+                    num_to_bytes(e_sector[i].Key[1], 6, block + 10);
                 mfEmlSetMem(block, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
             }
             PrintAndLogEx(SUCCESS, "Found keys have been transferred to the emulator memory");
@@ -1700,25 +1794,25 @@ out:
 
             FILE *fkeys = fopen(fptr, "wb");
             if (fkeys == NULL) {
-                PrintAndLogEx(WARNING, "Could not create file " _YELLOW_(%s), fptr);
+                PrintAndLogEx(WARNING, "Could not create file " _YELLOW_( % s), fptr);
                 free(keyBlock);
                 free(e_sector);
                 return 1;
             }
-            PrintAndLogEx(SUCCESS, "Printing keys to binary file " _YELLOW_(%s)"...", fptr);
+            PrintAndLogEx(SUCCESS, "Printing keys to binary file " _YELLOW_( % s)"...", fptr);
 
-            for (i=0; i<sectorsCnt; i++) {
+            for (i = 0; i < sectorsCnt; i++) {
                 num_to_bytes(e_sector[i].Key[0], 6, tempkey);
-                fwrite (tempkey, 1, 6, fkeys);
+                fwrite(tempkey, 1, 6, fkeys);
             }
 
-            for (i=0; i<sectorsCnt; i++) {
+            for (i = 0; i < sectorsCnt; i++) {
                 num_to_bytes(e_sector[i].Key[1], 6, tempkey);
-                fwrite (tempkey, 1, 6, fkeys );
+                fwrite(tempkey, 1, 6, fkeys);
             }
 
             fclose(fkeys);
-            PrintAndLogEx(SUCCESS, "Found keys have been dumped to " _YELLOW_(%s)" --> 0xffffffffffff has been inserted for unknown keys.", fptr);
+            PrintAndLogEx(SUCCESS, "Found keys have been dumped to " _YELLOW_( % s)" --> 0xffffffffffff has been inserted for unknown keys.", fptr);
         }
     }
 
@@ -1728,12 +1822,13 @@ out:
     return 0;
 }
 
-int CmdHF14AMfChk(const char *Cmd) {
+int CmdHF14AMfChk(const char *Cmd)
+{
 
     char ctmp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) < 3 || ctmp == 'h') return usage_hf14_chk();
 
-    FILE * f;
+    FILE *f;
     char filename[FILE_PATH_SIZE] = {0};
     char buf[13];
     uint8_t *keyBlock = NULL, *p;
@@ -1755,11 +1850,11 @@ int CmdHF14AMfChk(const char *Cmd) {
     if (keyBlock == NULL) return 1;
 
     for (int cnt = 0; cnt < MIFARE_DEFAULTKEYS_SIZE; cnt++)
-        num_to_bytes(g_mifare_default_keys[cnt], 6, (uint8_t*)(keyBlock + cnt * 6));
+        num_to_bytes(g_mifare_default_keys[cnt], 6, (uint8_t *)(keyBlock + cnt * 6));
 
-    if (param_getchar(Cmd, 0)=='*') {
+    if (param_getchar(Cmd, 0) == '*') {
         blockNo = 3;
-        SectorsCnt = NumOfSectors( param_getchar(Cmd+1, 0) );
+        SectorsCnt = NumOfSectors(param_getchar(Cmd + 1, 0));
     } else {
         blockNo = param_get8(Cmd, 0);
     }
@@ -1768,19 +1863,19 @@ int CmdHF14AMfChk(const char *Cmd) {
     clen = param_getlength(Cmd, 1);
     if (clen == 1) {
         switch (ctmp) {
-        case 'a':
-            keyType = 0;
-            break;
-        case 'b':
-            keyType = 1;
-            break;
-        case '?':
-            keyType = 2;
-            break;
-        default:
-            PrintAndLogEx(FAILED, "Key type must be A , B or ?");
-            free(keyBlock);
-            return 1;
+            case 'a':
+                keyType = 0;
+                break;
+            case 'b':
+                keyType = 1;
+                break;
+            case '?':
+                keyType = 2;
+                break;
+            default:
+                PrintAndLogEx(FAILED, "Key type must be A , B or ?");
+                free(keyBlock);
+                return 1;
         };
     }
 
@@ -1791,12 +1886,12 @@ int CmdHF14AMfChk(const char *Cmd) {
 
         if (clen == 12) {
 
-            if ( param_gethex(Cmd, i, keyBlock + 6 * keycnt, 12) ){
+            if (param_gethex(Cmd, i, keyBlock + 6 * keycnt, 12)) {
                 PrintAndLogEx(FAILED, "not hex, skipping");
                 continue;
             }
 
-            if ( keyitems - keycnt < 2) {
+            if (keyitems - keycnt < 2) {
                 p = realloc(keyBlock, 6 * (keyitems += 64));
                 if (!p) {
                     PrintAndLogEx(FAILED, "cannot allocate memory for Keys");
@@ -1805,42 +1900,42 @@ int CmdHF14AMfChk(const char *Cmd) {
                 }
                 keyBlock = p;
             }
-            PrintAndLogEx(NORMAL, "[%2d] key %s", keycnt, sprint_hex( (keyBlock + 6*keycnt), 6 ) );;
+            PrintAndLogEx(NORMAL, "[%2d] key %s", keycnt, sprint_hex((keyBlock + 6 * keycnt), 6));;
             keycnt++;
-        } else if ( clen == 1 ) {
-            if (ctmp == 't' ) { transferToEml = 1; continue; }
-            if (ctmp == 'd' ) { createDumpFile = 1; continue; }
+        } else if (clen == 1) {
+            if (ctmp == 't') { transferToEml = 1; continue; }
+            if (ctmp == 'd') { createDumpFile = 1; continue; }
         } else {
             // May be a dic file
-            if ( param_getstr(Cmd, i, filename, sizeof(filename)) >= FILE_PATH_SIZE ) {
+            if (param_getstr(Cmd, i, filename, sizeof(filename)) >= FILE_PATH_SIZE) {
                 PrintAndLogEx(FAILED, "File name too long");
                 continue;
             }
 
-            f = fopen( filename , "r");
-            if ( !f ) {
-                PrintAndLogEx(FAILED, "File: " _YELLOW_(%s) ": not found or locked.", filename);
+            f = fopen(filename, "r");
+            if (!f) {
+                PrintAndLogEx(FAILED, "File: " _YELLOW_( % s) ": not found or locked.", filename);
                 continue;
             }
 
             // load keys from dictionary file
-            while( fgets(buf, sizeof(buf), f) ){
+            while (fgets(buf, sizeof(buf), f)) {
                 if (strlen(buf) < 12 || buf[11] == '\n')
                     continue;
 
                 while (fgetc(f) != '\n' && !feof(f)) ;  //goto next line
 
-                if( buf[0]=='#' ) continue; //The line start with # is comment, skip
+                if (buf[0] == '#') continue; //The line start with # is comment, skip
 
                 // codesmell, only checks first char?
-                if (!isxdigit(buf[0])){
-                    PrintAndLogEx(FAILED, "File content error. '" _YELLOW_(%s)"' must include 12 HEX symbols",buf);
+                if (!isxdigit(buf[0])) {
+                    PrintAndLogEx(FAILED, "File content error. '" _YELLOW_( % s)"' must include 12 HEX symbols", buf);
                     continue;
                 }
 
                 buf[12] = 0;
 
-                if ( keyitems - keycnt < 2) {
+                if (keyitems - keycnt < 2) {
                     p = realloc(keyBlock, 6 * (keyitems += 64));
                     if (!p) {
                         PrintAndLogEx(FAILED, "Cannot allocate memory for defKeys");
@@ -1851,22 +1946,22 @@ int CmdHF14AMfChk(const char *Cmd) {
                     keyBlock = p;
                 }
                 memset(keyBlock + 6 * keycnt, 0, 6);
-                num_to_bytes(strtoll(buf, NULL, 16), 6, keyBlock + 6*keycnt);
+                num_to_bytes(strtoll(buf, NULL, 16), 6, keyBlock + 6 * keycnt);
                 //PrintAndLogEx(NORMAL, "check key[%2d] %012" PRIx64, keycnt, bytes_to_num(keyBlock + 6*keycnt, 6));
                 keycnt++;
                 memset(buf, 0, sizeof(buf));
             }
             fclose(f);
-            PrintAndLogEx(SUCCESS, "Loaded %2d keys from " _YELLOW_(%s), keycnt, filename);
+            PrintAndLogEx(SUCCESS, "Loaded %2d keys from " _YELLOW_( % s), keycnt, filename);
         }
     }
 
     if (keycnt == 0) {
         PrintAndLogEx(INFO, "No key specified, trying default keys");
-        for (;keycnt < MIFARE_DEFAULTKEYS_SIZE; keycnt++)
+        for (; keycnt < MIFARE_DEFAULTKEYS_SIZE; keycnt++)
             PrintAndLogEx(NORMAL, "[%2d] %02x%02x%02x%02x%02x%02x", keycnt,
-                (keyBlock + 6*keycnt)[0],(keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2],
-                (keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4], (keyBlock + 6*keycnt)[5], 6);
+                          (keyBlock + 6 * keycnt)[0], (keyBlock + 6 * keycnt)[1], (keyBlock + 6 * keycnt)[2],
+                          (keyBlock + 6 * keycnt)[3], (keyBlock + 6 * keycnt)[4], (keyBlock + 6 * keycnt)[5], 6);
     }
 
     // initialize storage for found keys
@@ -1877,7 +1972,7 @@ int CmdHF14AMfChk(const char *Cmd) {
     }
 
     // empty e_sector
-    for(int i = 0; i < SectorsCnt; ++i){
+    for (int i = 0; i < SectorsCnt; ++i) {
         e_sector[i].Key[0] = 0xffffffffffff;
         e_sector[i].Key[1] = 0xffffffffffff;
         e_sector[i].foundKey[0] = false;
@@ -1886,14 +1981,14 @@ int CmdHF14AMfChk(const char *Cmd) {
 
 
     uint8_t trgKeyType = 0;
-    uint32_t max_keys = keycnt > (USB_CMD_DATA_SIZE/6) ? (USB_CMD_DATA_SIZE/6) : keycnt;
+    uint32_t max_keys = keycnt > (USB_CMD_DATA_SIZE / 6) ? (USB_CMD_DATA_SIZE / 6) : keycnt;
 
     // time
     uint64_t t1 = msclock();
 
 
     // check keys.
-    for (trgKeyType = (keyType==2)?0:keyType; trgKeyType < 2; (keyType==2) ? (++trgKeyType) : (trgKeyType=2) ) {
+    for (trgKeyType = (keyType == 2) ? 0 : keyType; trgKeyType < 2; (keyType == 2) ? (++trgKeyType) : (trgKeyType = 2)) {
 
         int b = blockNo;
         for (int i = 0; i < SectorsCnt; ++i) {
@@ -1903,16 +1998,18 @@ int CmdHF14AMfChk(const char *Cmd) {
 
             for (uint32_t c = 0; c < keycnt; c += max_keys) {
 
-                printf("."); fflush(stdout);
+                printf(".");
+                fflush(stdout);
                 if (ukbhit()) {
-                    int gc = getchar(); (void)gc;
+                    int gc = getchar();
+                    (void)gc;
                     PrintAndLogEx(INFO, "\naborted via keyboard!\n");
                     goto out;
                 }
 
-                uint32_t size = keycnt-c > max_keys ? max_keys : keycnt-c;
+                uint32_t size = keycnt - c > max_keys ? max_keys : keycnt - c;
 
-                res = mfCheckKeys(b, trgKeyType, true, size, &keyBlock[6*c], &key64);
+                res = mfCheckKeys(b, trgKeyType, true, size, &keyBlock[6 * c], &key64);
                 if (!res) {
                     e_sector[i].Key[trgKeyType] = key64;
                     e_sector[i].foundKey[trgKeyType] = true;
@@ -1921,19 +2018,19 @@ int CmdHF14AMfChk(const char *Cmd) {
 
 
             }
-            b < 127 ? ( b +=4 ) : ( b += 16 );
+            b < 127 ? (b += 4) : (b += 16);
         }
     }
     t1 = msclock() - t1;
-    PrintAndLogEx(SUCCESS, "\nTime in checkkeys: %.0f seconds\n", (float)t1/1000.0);
+    PrintAndLogEx(SUCCESS, "\nTime in checkkeys: %.0f seconds\n", (float)t1 / 1000.0);
 
 
     // 20160116 If Sector A is found, but not Sector B,  try just reading it of the tag?
-    if ( keyType != 1 ) {
+    if (keyType != 1) {
         PrintAndLogEx(INFO, "testing to read key B...");
         for (i = 0; i < SectorsCnt; i++) {
             // KEY A  but not KEY B
-            if ( e_sector[i].foundKey[0] && !e_sector[i].foundKey[1] ) {
+            if (e_sector[i].foundKey[0] && !e_sector[i].foundKey[1]) {
 
                 uint8_t sectrail = (FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1);
 
@@ -1945,15 +2042,15 @@ int CmdHF14AMfChk(const char *Cmd) {
                 SendCommand(&c);
 
                 UsbCommand resp;
-                if ( !WaitForResponseTimeout(CMD_ACK,&resp,1500)) continue;
+                if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) continue;
 
                 uint8_t isOK  = resp.arg[0] & 0xff;
                 if (!isOK) continue;
 
                 uint8_t *data = resp.d.asBytes;
-                key64 = bytes_to_num(data+10, 6);
+                key64 = bytes_to_num(data + 10, 6);
                 if (key64) {
-                    PrintAndLogEx(NORMAL, "Data:%s", sprint_hex(data+10, 6));
+                    PrintAndLogEx(NORMAL, "Data:%s", sprint_hex(data + 10, 6));
                     e_sector[i].foundKey[1] = 1;
                     e_sector[i].Key[1] = key64;
                 }
@@ -1964,16 +2061,16 @@ int CmdHF14AMfChk(const char *Cmd) {
 out:
 
     //print keys
-    printKeyTable( SectorsCnt, e_sector );
+    printKeyTable(SectorsCnt, e_sector);
 
     if (transferToEml) {
         uint8_t block[16] = {0x00};
-        for (uint8_t i = 0; i < SectorsCnt; ++i ) {
+        for (uint8_t i = 0; i < SectorsCnt; ++i) {
             mfEmlGetMem(block, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
             if (e_sector[i].foundKey[0])
                 num_to_bytes(e_sector[i].Key[0], 6, block);
             if (e_sector[i].foundKey[1])
-                num_to_bytes(e_sector[i].Key[1], 6, block+10);
+                num_to_bytes(e_sector[i].Key[1], 6, block + 10);
             mfEmlSetMem(block, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
         }
         PrintAndLogEx(SUCCESS, "Found keys have been transferred to the emulator memory");
@@ -1989,23 +2086,23 @@ out:
 
         FILE *fkeys = fopen(fptr, "wb");
         if (fkeys == NULL) {
-            PrintAndLogEx(WARNING, "Could not create file " _YELLOW_(%s), fptr);
+            PrintAndLogEx(WARNING, "Could not create file " _YELLOW_( % s), fptr);
             free(keyBlock);
             free(e_sector);
             return 1;
         }
-        PrintAndLogEx(INFO, "Printing keys to binary file " _YELLOW_(%s)"...", fptr);
+        PrintAndLogEx(INFO, "Printing keys to binary file " _YELLOW_( % s)"...", fptr);
 
-        for( i=0; i<SectorsCnt; i++) {
+        for (i = 0; i < SectorsCnt; i++) {
             num_to_bytes(e_sector[i].Key[0], 6, tempkey);
-            fwrite ( tempkey, 1, 6, fkeys );
+            fwrite(tempkey, 1, 6, fkeys);
         }
-        for(i=0; i<SectorsCnt; i++) {
+        for (i = 0; i < SectorsCnt; i++) {
             num_to_bytes(e_sector[i].Key[1], 6, tempkey);
-            fwrite ( tempkey, 1, 6, fkeys );
+            fwrite(tempkey, 1, 6, fkeys);
         }
         fclose(fkeys);
-        PrintAndLogEx(SUCCESS, "Found keys have been dumped to file " _YELLOW_(%s)". 0xffffffffffff has been inserted for unknown keys.", fptr);
+        PrintAndLogEx(SUCCESS, "Found keys have been dumped to file " _YELLOW_( % s)". 0xffffffffffff has been inserted for unknown keys.", fptr);
     }
 
     free(keyBlock);
@@ -2016,7 +2113,8 @@ out:
 
 sector_t *k_sector = NULL;
 uint8_t k_sectorsCount = 16;
-static void emptySectorTable(){
+static void emptySectorTable()
+{
 
     // initialize storage for found keys
     if (k_sector == NULL)
@@ -2025,7 +2123,7 @@ static void emptySectorTable(){
         return;
 
     // empty e_sector
-    for(int i = 0; i < k_sectorsCount; ++i){
+    for (int i = 0; i < k_sectorsCount; ++i) {
         k_sector[i].Key[0] = 0xffffffffffff;
         k_sector[i].Key[1] = 0xffffffffffff;
         k_sector[i].foundKey[0] = false;
@@ -2033,7 +2131,8 @@ static void emptySectorTable(){
     }
 }
 
-void showSectorTable(){
+void showSectorTable()
+{
     if (k_sector != NULL) {
         printKeyTable(k_sectorsCount, k_sector);
         free(k_sector);
@@ -2041,7 +2140,8 @@ void showSectorTable(){
     }
 }
 
-void readerAttack(nonces_t data, bool setEmulatorMem, bool verbose) {
+void readerAttack(nonces_t data, bool setEmulatorMem, bool verbose)
+{
 
     uint64_t key = 0;
     bool success = false;
@@ -2055,30 +2155,31 @@ void readerAttack(nonces_t data, bool setEmulatorMem, bool verbose) {
         uint8_t keytype = data.keytype;
 
         PrintAndLogEx(INFO, "Reader is trying authenticate with: Key %s, sector %02d: [%012" PRIx64 "]"
-            , keytype ? "B" : "A"
-            , sector
-            , key
-        );
+                      , keytype ? "B" : "A"
+                      , sector
+                      , key
+                     );
 
         k_sector[sector].Key[keytype] = key;
         k_sector[sector].foundKey[keytype] = true;
 
         //set emulator memory for keys
         if (setEmulatorMem) {
-            uint8_t memBlock[16] = {0,0,0,0,0,0, 0xff, 0x0F, 0x80, 0x69, 0,0,0,0,0,0};
-            num_to_bytes( k_sector[sector].Key[0], 6, memBlock);
-            num_to_bytes( k_sector[sector].Key[1], 6, memBlock+10);
+            uint8_t memBlock[16] = {0, 0, 0, 0, 0, 0, 0xff, 0x0F, 0x80, 0x69, 0, 0, 0, 0, 0, 0};
+            num_to_bytes(k_sector[sector].Key[0], 6, memBlock);
+            num_to_bytes(k_sector[sector].Key[1], 6, memBlock + 10);
             //iceman,  guessing this will not work so well for 4K tags.
             PrintAndLogEx(INFO, "Setting Emulator Memory Block %02d: [%s]"
-                , (sector*4) + 3
-                , sprint_hex( memBlock, sizeof(memBlock))
-                );
-            mfEmlSetMem( memBlock, (sector*4) + 3, 1);
+                          , (sector * 4) + 3
+                          , sprint_hex(memBlock, sizeof(memBlock))
+                         );
+            mfEmlSetMem(memBlock, (sector * 4) + 3, 1);
         }
     }
 }
 
-int CmdHF14AMf1kSim(const char *Cmd) {
+int CmdHF14AMf1kSim(const char *Cmd)
+{
 
     uint8_t uid[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
     uint8_t exitAfterNReads = 0;
@@ -2088,54 +2189,61 @@ int CmdHF14AMf1kSim(const char *Cmd) {
     bool errors = false, verbose = false, setEmulatorMem = false;
     nonces_t data[1];
 
-    while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-        switch( tolower(param_getchar(Cmd, cmdp))) {
-        case 'e':
-            setEmulatorMem = true;
-            cmdp++;
-            break;
-        case 'h':
-            return usage_hf14_mf1ksim();
-        case 'i':
-            flags |= FLAG_INTERACTIVE;
-            cmdp++;
-            break;
-        case 'n':
-            exitAfterNReads = param_get8(Cmd, cmdp+1);
-            cmdp += 2;
-            break;
-        case 'u':
-            param_gethex_ex(Cmd, cmdp+1, uid, &uidlen);
-            switch(uidlen) {
-                case 20: flags = FLAG_10B_UID_IN_DATA; break;
-                case 14: flags = FLAG_7B_UID_IN_DATA; break;
-                case  8: flags = FLAG_4B_UID_IN_DATA; break;
-                default: return usage_hf14_mf1ksim();
-            }
-            cmdp += 2;
-            break;
-        case 'v':
-            verbose = true;
-            cmdp++;
-            break;
-        case 'x':
-            flags |= FLAG_NR_AR_ATTACK;
-            cmdp++;
-            break;
-        default:
-            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-            errors = true;
-            break;
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+            case 'e':
+                setEmulatorMem = true;
+                cmdp++;
+                break;
+            case 'h':
+                return usage_hf14_mf1ksim();
+            case 'i':
+                flags |= FLAG_INTERACTIVE;
+                cmdp++;
+                break;
+            case 'n':
+                exitAfterNReads = param_get8(Cmd, cmdp + 1);
+                cmdp += 2;
+                break;
+            case 'u':
+                param_gethex_ex(Cmd, cmdp + 1, uid, &uidlen);
+                switch (uidlen) {
+                    case 20:
+                        flags = FLAG_10B_UID_IN_DATA;
+                        break;
+                    case 14:
+                        flags = FLAG_7B_UID_IN_DATA;
+                        break;
+                    case  8:
+                        flags = FLAG_4B_UID_IN_DATA;
+                        break;
+                    default:
+                        return usage_hf14_mf1ksim();
+                }
+                cmdp += 2;
+                break;
+            case 'v':
+                verbose = true;
+                cmdp++;
+                break;
+            case 'x':
+                flags |= FLAG_NR_AR_ATTACK;
+                cmdp++;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                errors = true;
+                break;
         }
     }
     //Validations
     if (errors) return usage_hf14_mf1ksim();
 
     PrintAndLogEx(NORMAL, " uid:%s, numreads:%d, flags:%d (0x%02x) "
-                , (uidlen == 0 ) ? "N/A" : sprint_hex(uid, uidlen>>1)
-                , exitAfterNReads
-                , flags
-                , flags);
+                  , (uidlen == 0) ? "N/A" : sprint_hex(uid, uidlen >> 1)
+                  , exitAfterNReads
+                  , flags
+                  , flags);
 
     UsbCommand c = {CMD_SIMULATE_MIFARE_CARD, {flags, exitAfterNReads, 0}};
     memcpy(c.d.asBytes, uid, sizeof(uid));
@@ -2143,13 +2251,13 @@ int CmdHF14AMf1kSim(const char *Cmd) {
     SendCommand(&c);
     UsbCommand resp;
 
-    if(flags & FLAG_INTERACTIVE) {
+    if (flags & FLAG_INTERACTIVE) {
         PrintAndLogEx(INFO, "Press pm3-button or send another cmd to abort simulation");
 
-        while( !ukbhit() ){
-            if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500) ) continue;
-            if ( !(flags & FLAG_NR_AR_ATTACK) ) break;
-            if ( (resp.arg[0] & 0xffff) != CMD_SIMULATE_MIFARE_CARD ) break;
+        while (!ukbhit()) {
+            if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) continue;
+            if (!(flags & FLAG_NR_AR_ATTACK)) break;
+            if ((resp.arg[0] & 0xffff) != CMD_SIMULATE_MIFARE_CARD) break;
 
             memcpy(data, resp.d.asBytes, sizeof(data));
             readerAttack(data[0], setEmulatorMem, verbose);
@@ -2159,7 +2267,8 @@ int CmdHF14AMf1kSim(const char *Cmd) {
     return 0;
 }
 
-int CmdHF14AMfSniff(const char *Cmd){
+int CmdHF14AMfSniff(const char *Cmd)
+{
     bool wantLogToFile = false;
     bool wantDecrypt = false;
     //bool wantSaveToEml = false; TODO
@@ -2181,7 +2290,7 @@ int CmdHF14AMfSniff(const char *Cmd){
     memset(uid, 0x00, sizeof(uid));
 
     char ctmp = tolower(param_getchar(Cmd, 0));
-    if ( ctmp == 'h') return usage_hf14_sniff();
+    if (ctmp == 'h') return usage_hf14_sniff();
 
     for (int i = 0; i < 4; i++) {
         ctmp = tolower(param_getchar(Cmd, i));
@@ -2205,14 +2314,16 @@ int CmdHF14AMfSniff(const char *Cmd){
 
     // wait cycle
     while (true) {
-        printf("."); fflush(stdout);
+        printf(".");
+        fflush(stdout);
         if (ukbhit()) {
-            int gc = getchar(); (void)gc;
+            int gc = getchar();
+            (void)gc;
             PrintAndLogEx(INFO, "\naborted via keyboard!\n");
             break;
         }
 
-        if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
+        if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
             continue;
         }
 
@@ -2261,7 +2372,7 @@ int CmdHF14AMfSniff(const char *Cmd){
             while (bufPtr - buf < blockLen) {
                 bufPtr += 6;                        // skip (void) timing information
                 len = *((uint16_t *)bufPtr);
-                if(len & 0x8000) {
+                if (len & 0x8000) {
                     isTag = true;
                     len &= 0x7fff;
                 } else {
@@ -2276,16 +2387,22 @@ int CmdHF14AMfSniff(const char *Cmd){
                     memcpy(uid, bufPtr + 2, 10);
                     memcpy(atqa, bufPtr + 2 + 10, 2);
                     switch (atqa[0] & 0xC0) {
-                        case 0x80: uid_len = 10; break;
-                        case 0x40: uid_len = 7; break;
-                        default:   uid_len = 4; break;
+                        case 0x80:
+                            uid_len = 10;
+                            break;
+                        case 0x40:
+                            uid_len = 7;
+                            break;
+                        default:
+                            uid_len = 4;
+                            break;
                     }
                     sak = bufPtr[14];
                     PrintAndLogEx(SUCCESS, "UID %s | ATQA %02x %02x | SAK 0x%02x",
-                        sprint_hex(uid, uid_len),
-                        atqa[1],
-                        atqa[0],
-                        sak);
+                                  sprint_hex(uid, uid_len),
+                                  atqa[1],
+                                  atqa[0],
+                                  sak);
                     if (wantLogToFile || wantDecrypt) {
                         FillFileNameByUID(logHexFileName, uid, ".log", uid_len);
                         AddLogCurrentDT(logHexFileName);
@@ -2296,13 +2413,13 @@ int CmdHF14AMfSniff(const char *Cmd){
                 } else {
                     PrintAndLogEx(NORMAL, "%03d| %s |%s", num, isTag ? "TAG" : "RDR", sprint_hex(bufPtr, len));
                     if (wantLogToFile)
-                        AddLogHex(logHexFileName, isTag ? "TAG| ":"RDR| ", bufPtr, len);
+                        AddLogHex(logHexFileName, isTag ? "TAG| " : "RDR| ", bufPtr, len);
                     if (wantDecrypt)
                         mfTraceDecode(bufPtr, len, wantSaveToEmlFile);
                     num++;
                 }
                 bufPtr += len;
-                bufPtr += ((len-1)/8+1); // ignore parity
+                bufPtr += ((len - 1) / 8 + 1); // ignore parity
             }
             pckNum = 0;
         }
@@ -2312,10 +2429,11 @@ int CmdHF14AMfSniff(const char *Cmd){
     return 0;
 }
 
-int CmdHF14AMfDbg(const char *Cmd) {
+int CmdHF14AMfDbg(const char *Cmd)
+{
 
     char ctmp = tolower(param_getchar(Cmd, 0));
-    if (strlen(Cmd) < 1 || ctmp == 'h' ) return usage_hf14_dbg();
+    if (strlen(Cmd) < 1 || ctmp == 'h') return usage_hf14_dbg();
 
     uint8_t dbgMode = param_get8ex(Cmd, 0, 0, 10);
     if (dbgMode > 4) return usage_hf14_dbg();
@@ -2325,40 +2443,42 @@ int CmdHF14AMfDbg(const char *Cmd) {
     return 0;
 }
 
-int CmdHF14AMfKeyBrute(const char *Cmd) {
+int CmdHF14AMfKeyBrute(const char *Cmd)
+{
 
     uint8_t blockNo = 0, keytype = 0;
     uint8_t key[6] = {0, 0, 0, 0, 0, 0};
     uint64_t foundkey = 0;
 
     char cmdp = tolower(param_getchar(Cmd, 0));
-    if ( cmdp == 'h' ) return usage_hf14_keybrute();
+    if (cmdp == 'h') return usage_hf14_keybrute();
 
     // block number
     blockNo = param_get8(Cmd, 0);
 
     // keytype
     cmdp = tolower(param_getchar(Cmd, 1));
-    if ( cmdp == 'b' ) keytype = 1;
+    if (cmdp == 'b') keytype = 1;
 
     // key
     if (param_gethex(Cmd, 2, key, 12)) return usage_hf14_keybrute();
 
     uint64_t t1 = msclock();
 
-    if (mfKeyBrute( blockNo, keytype, key, &foundkey))
+    if (mfKeyBrute(blockNo, keytype, key, &foundkey))
         PrintAndLogEx(SUCCESS, "found valid key: %012" PRIx64 " \n", foundkey);
     else
         PrintAndLogEx(FAILED, "key not found");
 
     t1 = msclock() - t1;
-    PrintAndLogEx(SUCCESS, "\ntime in keybrute: %.0f seconds\n", (float)t1/1000.0);
+    PrintAndLogEx(SUCCESS, "\ntime in keybrute: %.0f seconds\n", (float)t1 / 1000.0);
     return 0;
 }
 
-void printKeyTable( uint8_t sectorscnt, sector_t *e_sector ){
-    char strA[12+1] = {0};
-    char strB[12+1] = {0};
+void printKeyTable(uint8_t sectorscnt, sector_t *e_sector)
+{
+    char strA[12 + 1] = {0};
+    char strB[12 + 1] = {0};
     PrintAndLogEx(NORMAL, "|---|----------------|---|----------------|---|");
     PrintAndLogEx(NORMAL, "|sec|key A           |res|key B           |res|");
     PrintAndLogEx(NORMAL, "|---|----------------|---|----------------|---|");
@@ -2367,24 +2487,25 @@ void printKeyTable( uint8_t sectorscnt, sector_t *e_sector ){
         snprintf(strA, sizeof(strA), "------------");
         snprintf(strB, sizeof(strB), "------------");
 
-        if ( e_sector[i].foundKey[0] )
+        if (e_sector[i].foundKey[0])
             snprintf(strA, sizeof(strA), "%012" PRIx64, e_sector[i].Key[0]);
 
-        if ( e_sector[i].foundKey[1] )
+        if (e_sector[i].foundKey[1])
             snprintf(strB, sizeof(strB), "%012" PRIx64, e_sector[i].Key[1]);
 
 
         PrintAndLogEx(NORMAL, "|%03d|  %s  | %d |  %s  | %d |"
-            , i
-            , strA, e_sector[i].foundKey[0]
-            , strB, e_sector[i].foundKey[1]
-        );
+                      , i
+                      , strA, e_sector[i].foundKey[0]
+                      , strB, e_sector[i].foundKey[1]
+                     );
     }
     PrintAndLogEx(NORMAL, "|---|----------------|---|----------------|---|");
 }
 
 // EMULATOR COMMANDS
-int CmdHF14AMfEGet(const char *Cmd) {
+int CmdHF14AMfEGet(const char *Cmd)
+{
     uint8_t blockNo = 0;
     uint8_t data[16] = {0x00};
     char c = tolower(param_getchar(Cmd, 0));
@@ -2399,10 +2520,11 @@ int CmdHF14AMfEGet(const char *Cmd) {
     } else {
         PrintAndLogEx(WARNING, "Command execute timeout");
     }
-  return 0;
+    return 0;
 }
 
-int CmdHF14AMfEClear(const char *Cmd) {
+int CmdHF14AMfEClear(const char *Cmd)
+{
     char c = tolower(param_getchar(Cmd, 0));
     if (c == 'h') return usage_hf14_eclr();
 
@@ -2412,7 +2534,8 @@ int CmdHF14AMfEClear(const char *Cmd) {
     return 0;
 }
 
-int CmdHF14AMfESet(const char *Cmd) {
+int CmdHF14AMfESet(const char *Cmd)
+{
     char c = tolower(param_getchar(Cmd, 0));
     uint8_t memBlock[16];
     uint8_t blockNo = 0;
@@ -2432,7 +2555,8 @@ int CmdHF14AMfESet(const char *Cmd) {
     return mfEmlSetMem(memBlock, blockNo, 1);
 }
 
-int CmdHF14AMfELoad(const char *Cmd) {
+int CmdHF14AMfELoad(const char *Cmd)
+{
 
     size_t counter = 0;
     char filename[FILE_PATH_SIZE];
@@ -2440,16 +2564,27 @@ int CmdHF14AMfELoad(const char *Cmd) {
     uint8_t blockWidth = 16;
     char c = tolower(param_getchar(Cmd, 0));
 
-    if ( strlen(Cmd) < 2 &&  c == 'h' )
+    if (strlen(Cmd) < 2 &&  c == 'h')
         return usage_hf14_eload();
 
     switch (c) {
-        case '0' : numBlocks = MIFARE_MINI_MAXBLOCK; break;
+        case '0' :
+            numBlocks = MIFARE_MINI_MAXBLOCK;
+            break;
         case '1' :
-        case '\0': numBlocks = MIFARE_1K_MAXBLOCK; break;
-        case '2' : numBlocks = MIFARE_2K_MAXBLOCK; break;
-        case '4' : numBlocks = MIFARE_4K_MAXBLOCK; break;
-        case 'u' : numBlocks = 255; blockWidth = 4; break;
+        case '\0':
+            numBlocks = MIFARE_1K_MAXBLOCK;
+            break;
+        case '2' :
+            numBlocks = MIFARE_2K_MAXBLOCK;
+            break;
+        case '4' :
+            numBlocks = MIFARE_4K_MAXBLOCK;
+            break;
+        case 'u' :
+            numBlocks = 255;
+            blockWidth = 4;
+            break;
         default:  {
             numBlocks = MIFARE_1K_MAXBLOCK;
             nameParamNo = 0;
@@ -2464,14 +2599,14 @@ int CmdHF14AMfELoad(const char *Cmd) {
     uint8_t *data = calloc(4096, sizeof(uint8_t));
     size_t datalen = 0;
     //int res = loadFile(filename, "bin", data, &datalen);
-    int res = loadFileEML( filename, "eml", data, &datalen);
-    if ( res ) {
+    int res = loadFileEML(filename, "eml", data, &datalen);
+    if (res) {
         free(data);
         return 1;
     }
 
     // 64 or 256 blocks.
-    if ( (datalen % blockWidth) != 0 ) {
+    if ((datalen % blockWidth) != 0) {
         PrintAndLogEx(FAILED, "File content error. Size doesn't match blockwidth ");
         free(data);
         return 2;
@@ -2480,14 +2615,15 @@ int CmdHF14AMfELoad(const char *Cmd) {
     PrintAndLogEx(INFO, "Copying to emulator memory");
 
     blockNum = 0;
-    while ( datalen ) {
+    while (datalen) {
 
         if (mfEmlSetMem_xt(data + counter, blockNum, 1, blockWidth)) {
             PrintAndLogEx(FAILED, "Cant set emul block: %3d", blockNum);
             free(data);
             return 3;
         }
-        printf("."); fflush(stdout);
+        printf(".");
+        fflush(stdout);
 
         blockNum++;
         counter += blockWidth;
@@ -2496,7 +2632,7 @@ int CmdHF14AMfELoad(const char *Cmd) {
     PrintAndLogEx(NORMAL, "\n");
 
     // Ultralight /Ntag
-    if ( blockWidth == 4 ) {
+    if (blockWidth == 4) {
         if ((blockNum != numBlocks)) {
             PrintAndLogEx(FAILED, "Warning, Ultralight/Ntag file content, Loaded %d blocks into emulator memory", blockNum);
             free(data);
@@ -2509,15 +2645,16 @@ int CmdHF14AMfELoad(const char *Cmd) {
             return 4;
         }
     }
-    PrintAndLogEx(SUCCESS, "Loaded %d blocks from file: " _YELLOW_(%s), blockNum, filename);
+    PrintAndLogEx(SUCCESS, "Loaded %d blocks from file: " _YELLOW_( % s), blockNum, filename);
     free(data);
     return 0;
 }
 
-int CmdHF14AMfESave(const char *Cmd) {
+int CmdHF14AMfESave(const char *Cmd)
+{
 
     char filename[FILE_PATH_SIZE];
-    char * fnameptr = filename;
+    char *fnameptr = filename;
     uint8_t *dump;
     int len, bytes, nameParamNo = 1;
     uint16_t blocks;
@@ -2538,7 +2675,7 @@ int CmdHF14AMfESave(const char *Cmd) {
     memset(dump, 0, bytes);
 
     PrintAndLogEx(INFO, "downloading from emulator memory");
-    if (!GetFromDevice( BIG_BUF_EML, dump, bytes, 0, NULL, 2500, false)) {
+    if (!GetFromDevice(BIG_BUF_EML, dump, bytes, 0, NULL, 2500, false)) {
         PrintAndLogEx(WARNING, "Fail, transfer from device time-out");
         free(dump);
         return 2;
@@ -2560,7 +2697,8 @@ int CmdHF14AMfESave(const char *Cmd) {
     return 0;
 }
 
-int CmdHF14AMfECFill(const char *Cmd) {
+int CmdHF14AMfECFill(const char *Cmd)
+{
     uint8_t keyType = 0;
     uint8_t numSectors = 16;
     char c = tolower(param_getchar(Cmd, 0));
@@ -2585,14 +2723,15 @@ int CmdHF14AMfECFill(const char *Cmd) {
     return 0;
 }
 
-int CmdHF14AMfEKeyPrn(const char *Cmd) {
+int CmdHF14AMfEKeyPrn(const char *Cmd)
+{
     int i;
     uint8_t numSectors;
     uint8_t data[16];
     uint64_t keyA, keyB;
 
     char c = tolower(param_getchar(Cmd, 0));
-    if ( c == 'h' )
+    if (c == 'h')
         return usage_hf14_ekeyprn();
 
     numSectors = NumOfSectors(c);
@@ -2614,7 +2753,8 @@ int CmdHF14AMfEKeyPrn(const char *Cmd) {
 }
 
 // CHINESE MAGIC COMMANDS
-int CmdHF14AMfCSetUID(const char *Cmd) {
+int CmdHF14AMfCSetUID(const char *Cmd)
+{
     uint8_t wipeCard = 0;
     uint8_t uid[8] = {0x00};
     uint8_t oldUid[8] = {0x00};
@@ -2661,7 +2801,7 @@ int CmdHF14AMfCSetUID(const char *Cmd) {
         }
     }
 
-    PrintAndLogEx(NORMAL, "--wipe card:%s  uid:%s", (wipeCard)?"YES":"NO", sprint_hex(uid, 4));
+    PrintAndLogEx(NORMAL, "--wipe card:%s  uid:%s", (wipeCard) ? "YES" : "NO", sprint_hex(uid, 4));
 
     res = mfCSetUID(uid, (atqaPresent) ? atqa : NULL, (atqaPresent) ? sak : NULL, oldUid, wipeCard);
     if (res) {
@@ -2674,7 +2814,8 @@ int CmdHF14AMfCSetUID(const char *Cmd) {
     return 0;
 }
 
-int CmdHF14AMfCSetBlk(const char *Cmd) {
+int CmdHF14AMfCSetBlk(const char *Cmd)
+{
     uint8_t block[16] = {0x00};
     uint8_t blockNo = 0;
     uint8_t params = MAGIC_SINGLE;
@@ -2701,7 +2842,8 @@ int CmdHF14AMfCSetBlk(const char *Cmd) {
     return 0;
 }
 
-int CmdHF14AMfCLoad(const char *Cmd) {
+int CmdHF14AMfCLoad(const char *Cmd)
+{
 
     uint8_t buf8[16] = {0x00};
     uint8_t fillFromEmulator = 0;
@@ -2711,11 +2853,11 @@ int CmdHF14AMfCLoad(const char *Cmd) {
     char fileName[50] = {0};
 
     char ctmp = tolower(param_getchar(Cmd, 0));
-    if ( param_getlength(Cmd, 0) == 1 ) {
+    if (param_getlength(Cmd, 0) == 1) {
         if (ctmp == 'h' || ctmp == 0x00) return usage_hf14_cload();
-        if (ctmp == 'e' ) fillFromEmulator = 1;
-        if (ctmp == 'j' ) fillFromJson = true;
-        if (ctmp == 'b' ) fillFromBin = true;
+        if (ctmp == 'e') fillFromEmulator = 1;
+        if (ctmp == 'j') fillFromJson = true;
+        if (ctmp == 'b') fillFromBin = true;
     }
 
     if (fillFromJson || fillFromBin)
@@ -2736,7 +2878,8 @@ int CmdHF14AMfCLoad(const char *Cmd) {
                 PrintAndLogEx(WARNING, "Cant set magic card block: %d", blockNum);
                 return 3;
             }
-            printf("."); fflush(stdout);
+            printf(".");
+            fflush(stdout);
         }
         PrintAndLogEx(NORMAL, "\n");
         return 0;
@@ -2752,12 +2895,12 @@ int CmdHF14AMfCLoad(const char *Cmd) {
         if (fillFromJson) {
             res = loadFileJSON(fileName, "json", data, maxdatalen, &datalen);
         } else {
-            res = loadFileEML( Cmd, "eml", data, &datalen);
+            res = loadFileEML(Cmd, "eml", data, &datalen);
         }
     }
 
-    if ( res ) {
-        if ( data )
+    if (res) {
+        if (data)
             free(data);
         return 1;
     }
@@ -2775,7 +2918,7 @@ int CmdHF14AMfCLoad(const char *Cmd) {
     PrintAndLogEx(INFO, "Copying to magic card");
 
     blockNum = 0;
-    while ( datalen ) {
+    while (datalen) {
 
         // switch on field and send magic sequence
         if (blockNum == 0) flags = MAGIC_INIT + MAGIC_WUPC;
@@ -2794,16 +2937,17 @@ int CmdHF14AMfCLoad(const char *Cmd) {
 
         datalen -= 16;
 
-        printf("."); fflush(stdout);
+        printf(".");
+        fflush(stdout);
         blockNum++;
 
         // magic card type - mifare 1K
-        if (blockNum >= MIFARE_1K_MAXBLOCK ) break;
+        if (blockNum >= MIFARE_1K_MAXBLOCK) break;
     }
     PrintAndLogEx(NORMAL, "\n");
 
     // 64 or 256blocks.
-    if (blockNum != 16 * 4 && blockNum != 32 * 4 + 8 * 16){
+    if (blockNum != 16 * 4 && blockNum != 32 * 4 + 8 * 16) {
         PrintAndLogEx(WARNING, "File content error. There must be 64 blocks");
         free(data);
         return 4;
@@ -2814,7 +2958,8 @@ int CmdHF14AMfCLoad(const char *Cmd) {
     return 0;
 }
 
-int CmdHF14AMfCGetBlk(const char *Cmd) {
+int CmdHF14AMfCGetBlk(const char *Cmd)
+{
     uint8_t data[16] = {0};
     uint8_t blockNo = 0;
     int res;
@@ -2842,7 +2987,7 @@ int CmdHF14AMfCGetBlk(const char *Cmd) {
         int bln = mfFirstBlockOfSector(mfSectorNum(blockNo));
         int blinc = (mfNumBlocksPerSector(mfSectorNum(blockNo)) > 4) ? 5 : 1;
         for (int i = 0; i < 4; i++) {
-            PrintAndLogEx(NORMAL, "Access block %d%s: %s", bln, ((blinc > 1) && (i < 3) ? "+" : "") , mfGetAccessConditionsDesc(i, &data[6]));
+            PrintAndLogEx(NORMAL, "Access block %d%s: %s", bln, ((blinc > 1) && (i < 3) ? "+" : ""), mfGetAccessConditionsDesc(i, &data[6]));
             bln += blinc;
         }
         PrintAndLogEx(NORMAL, "UserData: %s", sprint_hex_inrow(&data[9], 1));
@@ -2851,7 +2996,8 @@ int CmdHF14AMfCGetBlk(const char *Cmd) {
     return 0;
 }
 
-int CmdHF14AMfCGetSc(const char *Cmd) {
+int CmdHF14AMfCGetSc(const char *Cmd)
+{
     uint8_t data[16] = {0};
     uint8_t sector = 0;
     int i, res, flags;
@@ -2869,18 +3015,18 @@ int CmdHF14AMfCGetSc(const char *Cmd) {
     PrintAndLogEx(NORMAL, "----+------------------------------------------------");
     uint8_t blocks = 4;
     uint8_t start = sector * 4;
-    if ( sector > 32 ) {
+    if (sector > 32) {
         blocks = 16;
-        start = 128 + ( sector - 32 ) * 16;
+        start = 128 + (sector - 32) * 16;
     }
 
     flags = MAGIC_INIT + MAGIC_WUPC;
 
     for (i = 0; i < blocks; i++) {
         if (i == 1) flags = 0;
-        if (i == blocks-1) flags = MAGIC_HALT + MAGIC_OFF;
+        if (i == blocks - 1) flags = MAGIC_HALT + MAGIC_OFF;
 
-        res = mfCGetBlock( start + i, data, flags);
+        res = mfCGetBlock(start + i, data, flags);
         if (res) {
             PrintAndLogEx(WARNING, "Can't read block. %d error=%d", start + i, res);
             return 1;
@@ -2890,10 +3036,11 @@ int CmdHF14AMfCGetSc(const char *Cmd) {
     return 0;
 }
 
-int CmdHF14AMfCSave(const char *Cmd) {
+int CmdHF14AMfCSave(const char *Cmd)
+{
 
     char filename[FILE_PATH_SIZE];
-    char * fnameptr = filename;
+    char *fnameptr = filename;
     uint8_t *dump;
     bool fillEmulator = false;
     bool errors = false, hasname = false, useuid = false;
@@ -2905,42 +3052,42 @@ int CmdHF14AMfCSave(const char *Cmd) {
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         ctmp = tolower(param_getchar(Cmd, cmdp));
         switch (ctmp) {
-        case 'e':
-            useuid = true;
-            fillEmulator = true;
-            cmdp++;
-            break;
-        case 'h':
-            return usage_hf14_csave();
-        case '0':
-        case '1':
-        case '2':
-        case '4':
-            numblocks = NumOfBlocks(ctmp);
-            bytes =  numblocks * MFBLOCK_SIZE;
-            PrintAndLogEx(SUCCESS, "Saving magic mifare %cK", ctmp);
-            cmdp++;
-            break;
-        case 'u':
-            useuid = true;
-            hasname = true;
-            cmdp++;
-            break;
-        case 'o':
-            len = param_getstr(Cmd, cmdp+1, filename, FILE_PATH_SIZE);
-            if (len < 1) {
+            case 'e':
+                useuid = true;
+                fillEmulator = true;
+                cmdp++;
+                break;
+            case 'h':
+                return usage_hf14_csave();
+            case '0':
+            case '1':
+            case '2':
+            case '4':
+                numblocks = NumOfBlocks(ctmp);
+                bytes =  numblocks * MFBLOCK_SIZE;
+                PrintAndLogEx(SUCCESS, "Saving magic mifare %cK", ctmp);
+                cmdp++;
+                break;
+            case 'u':
+                useuid = true;
+                hasname = true;
+                cmdp++;
+                break;
+            case 'o':
+                len = param_getstr(Cmd, cmdp + 1, filename, FILE_PATH_SIZE);
+                if (len < 1) {
+                    errors = true;
+                    break;
+                }
+
+                useuid = false;
+                hasname = true;
+                cmdp += 2;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
                 errors = true;
                 break;
-            }
-
-            useuid = false;
-            hasname = true;
-            cmdp += 2;
-            break;
-        default:
-            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-            errors = true;
-            break;
         }
     }
 
@@ -2960,14 +3107,14 @@ int CmdHF14AMfCSave(const char *Cmd) {
         if (i == 1) flags = 0;
         if (i == numblocks - 1) flags = MAGIC_HALT + MAGIC_OFF;
 
-        if (mfCGetBlock(i, dump + (i*MFBLOCK_SIZE), flags)) {
+        if (mfCGetBlock(i, dump + (i * MFBLOCK_SIZE), flags)) {
             PrintAndLogEx(WARNING, "Cant get block: %d", i);
             free(dump);
             return 2;
         }
     }
 
-    if ( useuid ){
+    if (useuid) {
         fnameptr += sprintf(fnameptr, "hf-mf-");
         FillFileNameByUID(fnameptr, dump, "-dump", 4);
     }
@@ -2975,10 +3122,11 @@ int CmdHF14AMfCSave(const char *Cmd) {
     if (fillEmulator) {
         PrintAndLogEx(INFO, "uploading to emulator memory");
         for (i = 0; i < numblocks; i += 5) {
-            if (mfEmlSetMem(dump + (i*MFBLOCK_SIZE), i, 5)) {
+            if (mfEmlSetMem(dump + (i * MFBLOCK_SIZE), i, 5)) {
                 PrintAndLogEx(WARNING, "Cant set emul block: %d", i);
             }
-            printf("."); fflush(stdout);
+            printf(".");
+            fflush(stdout);
         }
         PrintAndLogEx(NORMAL, "\n");
         PrintAndLogEx(SUCCESS, "uploaded %d bytes to emulator memory", bytes);
@@ -2992,17 +3140,18 @@ int CmdHF14AMfCSave(const char *Cmd) {
 }
 
 //needs nt, ar, at, Data to decrypt
-int CmdHf14AMfDecryptBytes(const char *Cmd){
+int CmdHf14AMfDecryptBytes(const char *Cmd)
+{
 
     char ctmp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) < 1 || ctmp == 'h') return usage_hf14_decryptbytes();
 
-    uint32_t nt     = param_get32ex(Cmd,0,0,16);
-    uint32_t ar_enc = param_get32ex(Cmd,1,0,16);
-    uint32_t at_enc = param_get32ex(Cmd,2,0,16);
+    uint32_t nt     = param_get32ex(Cmd, 0, 0, 16);
+    uint32_t ar_enc = param_get32ex(Cmd, 1, 0, 16);
+    uint32_t at_enc = param_get32ex(Cmd, 2, 0, 16);
 
     int len = param_getlength(Cmd, 3);
-    if (len & 1 ) {
+    if (len & 1) {
         PrintAndLogEx(WARNING, "Uneven hex string length. LEN=%d", len);
         return 1;
     }
@@ -3014,12 +3163,13 @@ int CmdHf14AMfDecryptBytes(const char *Cmd){
     uint8_t *data = calloc(len, sizeof(uint8_t));
     param_gethex_ex(Cmd, 3, data, &len);
     len >>= 1;
-    tryDecryptWord( nt, ar_enc, at_enc, data, len);
-    free (data);
+    tryDecryptWord(nt, ar_enc, at_enc, data, len);
+    free(data);
     return 0;
 }
 
-int CmdHf14AMfSetMod(const char *Cmd) {
+int CmdHf14AMfSetMod(const char *Cmd)
+{
     uint8_t key[6] = {0, 0, 0, 0, 0, 0};
     uint8_t mod = 2;
 
@@ -3056,21 +3206,23 @@ int CmdHf14AMfSetMod(const char *Cmd) {
 }
 
 // Mifare NACK bug detection
-int CmdHf14AMfNack(const char *Cmd) {
+int CmdHf14AMfNack(const char *Cmd)
+{
 
     bool verbose = false;
     char ctmp = tolower(param_getchar(Cmd, 0));
-    if ( ctmp == 'h' ) return usage_hf14_nack();
-    if ( ctmp == 'v' ) verbose = true;
+    if (ctmp == 'h') return usage_hf14_nack();
+    if (ctmp == 'v') verbose = true;
 
-    if ( verbose )
+    if (verbose)
         PrintAndLogEx(INFO, "Started testing card for NACK bug. Press key to abort");
 
     detect_classic_nackbug(verbose);
     return 0;
 }
 
-int CmdHF14AMfice(const char *Cmd) {
+int CmdHF14AMfice(const char *Cmd)
+{
 
     uint8_t blockNo = 0;
     uint8_t keyType = 0;
@@ -3079,7 +3231,7 @@ int CmdHF14AMfice(const char *Cmd) {
     bool slow = false;
     bool initialize = true;
     bool acquisition_completed = false;
-    uint8_t cmdp=0;
+    uint8_t cmdp = 0;
     uint32_t flags = 0;
     uint32_t total_num_nonces = 0;
     char ctmp;
@@ -3091,29 +3243,27 @@ int CmdHF14AMfice(const char *Cmd) {
     uint32_t limit = 50000;
 
     while ((ctmp = param_getchar(Cmd, cmdp))) {
-        switch(tolower(ctmp))
-        {
-        case 'h':
-            return usage_hf14_ice();
-        case 'f':
-            param_getstr(Cmd, cmdp+1, filename, FILE_PATH_SIZE);
-            cmdp++;
-            break;
-        case 'l':
-            limit = param_get32ex(Cmd, cmdp+1, 50000, 10);
-            cmdp++;
-            break;
-        default:
-            PrintAndLogEx(WARNING, "Unknown parameter '%c'\n", ctmp);
-            usage_hf14_ice();
-            return 1;
+        switch (tolower(ctmp)) {
+            case 'h':
+                return usage_hf14_ice();
+            case 'f':
+                param_getstr(Cmd, cmdp + 1, filename, FILE_PATH_SIZE);
+                cmdp++;
+                break;
+            case 'l':
+                limit = param_get32ex(Cmd, cmdp + 1, 50000, 10);
+                cmdp++;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'\n", ctmp);
+                usage_hf14_ice();
+                return 1;
         }
         cmdp++;
     }
 
-    if(filename[0]=='\0')
-    {
-        fptr = GenerateFilename("hf-mf-","-nonces.bin");
+    if (filename[0] == '\0') {
+        fptr = GenerateFilename("hf-mf-", "-nonces.bin");
         if (fptr == NULL)
             return 1;
         strcpy(filename, fptr);
@@ -3121,8 +3271,8 @@ int CmdHF14AMfice(const char *Cmd) {
 
     PrintAndLogEx(NORMAL, "Collecting %u nonces \n", limit);
 
-    if ((fnonces = fopen(filename,"wb")) == NULL) {
-        PrintAndLogEx(WARNING, "Could not create file " _YELLOW_(%s),filename);
+    if ((fnonces = fopen(filename, "wb")) == NULL) {
+        PrintAndLogEx(WARNING, "Could not create file " _YELLOW_( % s), filename);
         return 3;
     }
 
@@ -3132,7 +3282,8 @@ int CmdHF14AMfice(const char *Cmd) {
 
     do {
         if (ukbhit()) {
-            int gc = getchar(); (void)gc;
+            int gc = getchar();
+            (void)gc;
             PrintAndLogEx(INFO, "\naborted via keyboard!\n");
             break;
         }
@@ -3149,26 +3300,26 @@ int CmdHF14AMfice(const char *Cmd) {
 
         uint32_t items = resp.arg[2];
         if (fnonces) {
-            fwrite(resp.d.asBytes, 1, items*4, fnonces);
+            fwrite(resp.d.asBytes, 1, items * 4, fnonces);
             fflush(fnonces);
         }
 
         total_num_nonces += items;
-        if ( total_num_nonces > part_limit ) {
+        if (total_num_nonces > part_limit) {
             PrintAndLogEx(INFO, "Total nonces %u\n", total_num_nonces);
             part_limit += 3000;
         }
 
-        acquisition_completed = ( total_num_nonces > limit);
+        acquisition_completed = (total_num_nonces > limit);
 
         initialize = false;
 
     } while (!acquisition_completed);
 
 out:
-    PrintAndLogEx(SUCCESS, "time: %" PRIu64 " seconds\n", (msclock()-t1)/1000);
+    PrintAndLogEx(SUCCESS, "time: %" PRIu64 " seconds\n", (msclock() - t1) / 1000);
 
-    if ( fnonces ) {
+    if (fnonces) {
         fflush(fnonces);
         fclose(fnonces);
     }
@@ -3179,18 +3330,19 @@ out:
     return 0;
 }
 
-int CmdHF14AMfAuth4(const char *Cmd) {
+int CmdHF14AMfAuth4(const char *Cmd)
+{
     uint8_t keyn[20] = {0};
     int keynlen = 0;
     uint8_t key[16] = {0};
     int keylen = 0;
 
     CLIParserInit("hf mf auth4",
-        "Executes AES authentication command in ISO14443-4",
-        "Usage:\n\thf mf auth4 4000 000102030405060708090a0b0c0d0e0f -> executes authentication\n"
-            "\thf mf auth4 9003 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -> executes authentication\n");
+                  "Executes AES authentication command in ISO14443-4",
+                  "Usage:\n\thf mf auth4 4000 000102030405060708090a0b0c0d0e0f -> executes authentication\n"
+                  "\thf mf auth4 9003 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -> executes authentication\n");
 
-    void* argtable[] = {
+    void *argtable[] = {
         arg_param_begin,
         arg_str1(NULL,  NULL,     "<Key Num (HEX 2 bytes)>", NULL),
         arg_str1(NULL,  NULL,     "<Key Value (HEX 16 bytes)>", NULL),
@@ -3216,14 +3368,15 @@ int CmdHF14AMfAuth4(const char *Cmd) {
 }
 
 // https://www.nxp.com/docs/en/application-note/AN10787.pdf
-int CmdHF14AMfMAD(const char *cmd) {
+int CmdHF14AMfMAD(const char *cmd)
+{
 
     CLIParserInit("hf mf mad",
-        "Checks and prints Mifare Application Directory (MAD)",
-        "Usage:\n\thf mf mad -> shows MAD if exists\n"
-            "\thf mf mad -a 03e1 -k ffffffffffff -b -> shows NDEF data if exists. read card with custom key and key B\n");
+                  "Checks and prints Mifare Application Directory (MAD)",
+                  "Usage:\n\thf mf mad -> shows MAD if exists\n"
+                  "\thf mf mad -a 03e1 -k ffffffffffff -b -> shows NDEF data if exists. read card with custom key and key B\n");
 
-    void* argtable[] = {
+    void *argtable[] = {
         arg_param_begin,
         arg_lit0("vV",  "verbose",  "show technical data"),
         arg_str0("aA",  "aid",      "print all sectors with aid", NULL),
@@ -3255,7 +3408,7 @@ int CmdHF14AMfMAD(const char *cmd) {
     }
 
     if (verbose) {
-        for(int i = 0; i < 4; i ++)
+        for (int i = 0; i < 4; i ++)
             PrintAndLogEx(NORMAL, "[%d] %s", i, sprint_hex(&sector0[i * 16], 16));
     }
 
@@ -3297,7 +3450,7 @@ int CmdHF14AMfMAD(const char *cmd) {
                     return 2;
                 }
 
-                for(int j = 0; j < (verbose ? 4 : 3); j ++)
+                for (int j = 0; j < (verbose ? 4 : 3); j ++)
                     PrintAndLogEx(NORMAL, " [%03d] %s", (i + 1) * 4 + j, sprint_hex(&vsector[j * 16], 16));
             }
         }
@@ -3306,14 +3459,15 @@ int CmdHF14AMfMAD(const char *cmd) {
     return 0;
 }
 
-int CmdHFMFNDEF(const char *cmd) {
+int CmdHFMFNDEF(const char *cmd)
+{
 
     CLIParserInit("hf mf ndef",
-        "Prints NFC Data Exchange Format (NDEF)",
-        "Usage:\n\thf mf ndef -> shows NDEF data\n"
-            "\thf mf ndef -a 03e1 -k ffffffffffff -b -> shows NDEF data with custom AID, key and with key B\n");
+                  "Prints NFC Data Exchange Format (NDEF)",
+                  "Usage:\n\thf mf ndef -> shows NDEF data\n"
+                  "\thf mf ndef -a 03e1 -k ffffffffffff -b -> shows NDEF data with custom AID, key and with key B\n");
 
-    void* argtable[] = {
+    void *argtable[] = {
         arg_param_begin,
         arg_litn("vV",  "verbose",  0, 2, "show technical data"),
         arg_str0("aA",  "aid",      "replace default aid for NDEF", NULL),
@@ -3410,7 +3564,8 @@ int CmdHFMFNDEF(const char *cmd) {
     return 0;
 }
 
-int CmdHF14AMfList(const char *Cmd) {
+int CmdHF14AMfList(const char *Cmd)
+{
     CmdTraceList("mf");
     return 0;
 }
@@ -3460,13 +3615,15 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdHFMF(const char *Cmd) {
+int CmdHFMF(const char *Cmd)
+{
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
+int CmdHelp(const char *Cmd)
+{
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdhfmf.h b/client/cmdhfmf.h
index e7ad35b44..a7d337b07 100644
--- a/client/cmdhfmf.h
+++ b/client/cmdhfmf.h
@@ -36,41 +36,41 @@
 extern int CmdHFMF(const char *Cmd);
 
 extern int CmdHF14AMfList(const char *Cmd);
-extern int CmdHF14AMfDbg(const char* cmd);
-extern int CmdHF14AMfRdBl(const char* cmd);
-extern int CmdHF14AMfURdBl(const char* cmd);
-extern int CmdHF14AMfRdSc(const char* cmd);
-extern int CmdHF14SMfURdCard(const char* cmd);
-extern int CmdHF14AMfDump(const char* cmd);
-extern int CmdHF14AMfRestore(const char* cmd);
-extern int CmdHF14AMfWrBl(const char* cmd);
-extern int CmdHF14AMfUWrBl(const char* cmd);
-extern int CmdHF14AMfChk(const char* cmd);
-extern int CmdHF14AMfDarkside(const char* cmd);
-extern int CmdHF14AMfNested(const char* cmd);
+extern int CmdHF14AMfDbg(const char *cmd);
+extern int CmdHF14AMfRdBl(const char *cmd);
+extern int CmdHF14AMfURdBl(const char *cmd);
+extern int CmdHF14AMfRdSc(const char *cmd);
+extern int CmdHF14SMfURdCard(const char *cmd);
+extern int CmdHF14AMfDump(const char *cmd);
+extern int CmdHF14AMfRestore(const char *cmd);
+extern int CmdHF14AMfWrBl(const char *cmd);
+extern int CmdHF14AMfUWrBl(const char *cmd);
+extern int CmdHF14AMfChk(const char *cmd);
+extern int CmdHF14AMfDarkside(const char *cmd);
+extern int CmdHF14AMfNested(const char *cmd);
 extern int CmdHF14AMfNestedHard(const char *Cmd);
 //extern int CmdHF14AMfSniff(const char* cmd);
-extern int CmdHF14AMf1kSim(const char* cmd);
+extern int CmdHF14AMf1kSim(const char *cmd);
 extern int CmdHF14AMfKeyBrute(const char *Cmd);
-extern int CmdHF14AMfEClear(const char* cmd);
-extern int CmdHF14AMfEGet(const char* cmd);
-extern int CmdHF14AMfESet(const char* cmd);
-extern int CmdHF14AMfELoad(const char* cmd);
-extern int CmdHF14AMfESave(const char* cmd);
-extern int CmdHF14AMfECFill(const char* cmd);
-extern int CmdHF14AMfEKeyPrn(const char* cmd);
-extern int CmdHF14AMfCSetUID(const char* cmd);
-extern int CmdHF14AMfCSetBlk(const char* cmd);
-extern int CmdHF14AMfCGetBlk(const char* cmd);
-extern int CmdHF14AMfCGetSc(const char* cmd);
-extern int CmdHF14AMfCLoad(const char* cmd);
-extern int CmdHF14AMfCSave(const char* cmd);
+extern int CmdHF14AMfEClear(const char *cmd);
+extern int CmdHF14AMfEGet(const char *cmd);
+extern int CmdHF14AMfESet(const char *cmd);
+extern int CmdHF14AMfELoad(const char *cmd);
+extern int CmdHF14AMfESave(const char *cmd);
+extern int CmdHF14AMfECFill(const char *cmd);
+extern int CmdHF14AMfEKeyPrn(const char *cmd);
+extern int CmdHF14AMfCSetUID(const char *cmd);
+extern int CmdHF14AMfCSetBlk(const char *cmd);
+extern int CmdHF14AMfCGetBlk(const char *cmd);
+extern int CmdHF14AMfCGetSc(const char *cmd);
+extern int CmdHF14AMfCLoad(const char *cmd);
+extern int CmdHF14AMfCSave(const char *cmd);
 extern int CmdHf14MfDecryptBytes(const char *Cmd);
 extern int CmdHf14AMfSetMod(const char *Cmd);
 extern int CmdHf14AMfNack(const char *Cmd);
 
 void showSectorTable(void);
 void readerAttack(nonces_t data, bool setEmulatorMem, bool verbose);
-void printKeyTable( uint8_t sectorscnt, sector_t *e_sector );
-void printKeyTable_fast( uint8_t sectorscnt, icesector_t *e_sector, uint64_t bar, uint64_t foo );
+void printKeyTable(uint8_t sectorscnt, sector_t *e_sector);
+void printKeyTable_fast(uint8_t sectorscnt, icesector_t *e_sector, uint64_t bar, uint64_t foo);
 #endif
diff --git a/client/cmdhfmfdes.c b/client/cmdhfmfdes.c
index 317192329..29bc90723 100644
--- a/client/cmdhfmfdes.c
+++ b/client/cmdhfmfdes.c
@@ -30,57 +30,57 @@ uint8_t LENPOS = 1;
 
 uint8_t key_zero_data[16] = { 0x00 };
 uint8_t key_ones_data[16] = { 0x01 };
-uint8_t key_defa_data[16] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f };
-uint8_t key_picc_data[16] = { 0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4a,0x4b,0x4c,0x4d,0x4e,0x4f };
+uint8_t key_defa_data[16] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f };
+uint8_t key_picc_data[16] = { 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f };
 
 static int CmdHelp(const char *Cmd);
 
 int CmdHF14ADesWb(const char *Cmd)
 {
-/*  uint8_t blockNo = 0;
-    uint8_t keyType = 0;
-    uint8_t key[6] = {0, 0, 0, 0, 0, 0};
-    uint8_t bldata[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+    /*  uint8_t blockNo = 0;
+        uint8_t keyType = 0;
+        uint8_t key[6] = {0, 0, 0, 0, 0, 0};
+        uint8_t bldata[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 
-    char cmdp = 0x00;
+        char cmdp = 0x00;
 
-    if (strlen(Cmd)<3) {
-        PrintAndLogEx(NORMAL, "Usage:  hf mf wrbl    <block number> <key A/B> <key (12 hex symbols)> <block data (32 hex symbols)>");
-        PrintAndLogEx(NORMAL, "        sample: hf mf wrbl 0 A FFFFFFFFFFFF 000102030405060708090A0B0C0D0E0F");
-        return 0;
-    }
+        if (strlen(Cmd)<3) {
+            PrintAndLogEx(NORMAL, "Usage:  hf mf wrbl    <block number> <key A/B> <key (12 hex symbols)> <block data (32 hex symbols)>");
+            PrintAndLogEx(NORMAL, "        sample: hf mf wrbl 0 A FFFFFFFFFFFF 000102030405060708090A0B0C0D0E0F");
+            return 0;
+        }
 
-    blockNo = param_get8(Cmd, 0);
-    cmdp = param_getchar(Cmd, 1);
-    if (cmdp == 0x00) {
-        PrintAndLogEx(NORMAL, "Key type must be A or B");
-        return 1;
-    }
-    if (cmdp != 'A' && cmdp != 'a') keyType = 1;
-    if (param_gethex(Cmd, 2, key, 12)) {
-        PrintAndLogEx(NORMAL, "Key must include 12 HEX symbols");
-        return 1;
-    }
-    if (param_gethex(Cmd, 3, bldata, 32)) {
-        PrintAndLogEx(NORMAL, "Block data must include 32 HEX symbols");
-        return 1;
-    }
-    PrintAndLogEx(NORMAL, "--block no:%02x key type:%02x key:%s", blockNo, keyType, sprint_hex(key, 6));
-    PrintAndLogEx(NORMAL, "--data: %s", sprint_hex(bldata, 16));
+        blockNo = param_get8(Cmd, 0);
+        cmdp = param_getchar(Cmd, 1);
+        if (cmdp == 0x00) {
+            PrintAndLogEx(NORMAL, "Key type must be A or B");
+            return 1;
+        }
+        if (cmdp != 'A' && cmdp != 'a') keyType = 1;
+        if (param_gethex(Cmd, 2, key, 12)) {
+            PrintAndLogEx(NORMAL, "Key must include 12 HEX symbols");
+            return 1;
+        }
+        if (param_gethex(Cmd, 3, bldata, 32)) {
+            PrintAndLogEx(NORMAL, "Block data must include 32 HEX symbols");
+            return 1;
+        }
+        PrintAndLogEx(NORMAL, "--block no:%02x key type:%02x key:%s", blockNo, keyType, sprint_hex(key, 6));
+        PrintAndLogEx(NORMAL, "--data: %s", sprint_hex(bldata, 16));
 
-  UsbCommand c = {CMD_MIFARE_WRITEBL, {blockNo, keyType, 0}};
-    memcpy(c.d.asBytes, key, 6);
-    memcpy(c.d.asBytes + 10, bldata, 16);
-  SendCommand(&c);
+      UsbCommand c = {CMD_MIFARE_WRITEBL, {blockNo, keyType, 0}};
+        memcpy(c.d.asBytes, key, 6);
+        memcpy(c.d.asBytes + 10, bldata, 16);
+      SendCommand(&c);
 
-    UsbCommand resp;
-    if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
-        uint8_t isOK  = resp.arg[0] & 0xff;
-        PrintAndLogEx(NORMAL, "isOk:%02x", isOK);
-    } else {
-        PrintAndLogEx(NORMAL, "Command execute timeout");
-    }
- */
+        UsbCommand resp;
+        if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
+            uint8_t isOK  = resp.arg[0] & 0xff;
+            PrintAndLogEx(NORMAL, "isOk:%02x", isOK);
+        } else {
+            PrintAndLogEx(NORMAL, "Command execute timeout");
+        }
+     */
     return 0;
 }
 
@@ -94,87 +94,91 @@ int CmdHF14ADesRb(const char *Cmd)
 
 
     // if (strlen(Cmd)<3) {
-        // PrintAndLogEx(NORMAL, "Usage:  hf mf rdbl    <block number> <key A/B> <key (12 hex symbols)>");
-        // PrintAndLogEx(NORMAL, "        sample: hf mf rdbl 0 A FFFFFFFFFFFF ");
-        // return 0;
+    // PrintAndLogEx(NORMAL, "Usage:  hf mf rdbl    <block number> <key A/B> <key (12 hex symbols)>");
+    // PrintAndLogEx(NORMAL, "        sample: hf mf rdbl 0 A FFFFFFFFFFFF ");
+    // return 0;
     // }
 
     // blockNo = param_get8(Cmd, 0);
     // cmdp = param_getchar(Cmd, 1);
     // if (cmdp == 0x00) {
-        // PrintAndLogEx(NORMAL, "Key type must be A or B");
-        // return 1;
+    // PrintAndLogEx(NORMAL, "Key type must be A or B");
+    // return 1;
     // }
     // if (cmdp != 'A' && cmdp != 'a') keyType = 1;
     // if (param_gethex(Cmd, 2, key, 12)) {
-        // PrintAndLogEx(NORMAL, "Key must include 12 HEX symbols");
-        // return 1;
+    // PrintAndLogEx(NORMAL, "Key must include 12 HEX symbols");
+    // return 1;
     // }
     // PrintAndLogEx(NORMAL, "--block no:%02x key type:%02x key:%s ", blockNo, keyType, sprint_hex(key, 6));
 
-  // UsbCommand c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}};
+    // UsbCommand c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}};
     // memcpy(c.d.asBytes, key, 6);
-  // SendCommand(&c);
+    // SendCommand(&c);
 
     // UsbCommand resp;
     // if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
-        // uint8_t                isOK  = resp.arg[0] & 0xff;
-        // uint8_t              * data  = resp.d.asBytes;
+    // uint8_t                isOK  = resp.arg[0] & 0xff;
+    // uint8_t              * data  = resp.d.asBytes;
 
-        // if (isOK)
-            // PrintAndLogEx(NORMAL, "isOk:%02x data:%s", isOK, sprint_hex(data, 16));
-        // else
-            // PrintAndLogEx(NORMAL, "isOk:%02x", isOK);
+    // if (isOK)
+    // PrintAndLogEx(NORMAL, "isOk:%02x data:%s", isOK, sprint_hex(data, 16));
+    // else
+    // PrintAndLogEx(NORMAL, "isOk:%02x", isOK);
     // } else {
-        // PrintAndLogEx(NORMAL, "Command execute timeout");
+    // PrintAndLogEx(NORMAL, "Command execute timeout");
     // }
 
-  return 0;
+    return 0;
 }
 
-int CmdHF14ADesInfo(const char *Cmd){
+int CmdHF14ADesInfo(const char *Cmd)
+{
 
     UsbCommand c = {CMD_MIFARE_DESFIRE_INFO};
     SendCommand(&c);
     UsbCommand resp;
 
-    if ( !WaitForResponseTimeout(CMD_ACK,&resp,1500) ) {
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         PrintAndLogEx(WARNING, "Command execute timeout");
         return 0;
     }
     uint8_t isOK  = resp.arg[0] & 0xff;
-    if ( !isOK ){
-        switch ( resp.arg[1] ) {
+    if (!isOK) {
+        switch (resp.arg[1]) {
             case 1:
-                PrintAndLogEx(WARNING, "Can't select card"); break;
+                PrintAndLogEx(WARNING, "Can't select card");
+                break;
             case 2:
-                PrintAndLogEx(WARNING, "Card is most likely not Desfire. Its UID has wrong size"); break;
+                PrintAndLogEx(WARNING, "Card is most likely not Desfire. Its UID has wrong size");
+                break;
             case 3:
             default:
-                PrintAndLogEx(WARNING, "Command unsuccessful"); break;
+                PrintAndLogEx(WARNING, "Command unsuccessful");
+                break;
         }
         return 0;
     }
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "-- Desfire Information --------------------------------------");
     PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
-    PrintAndLogEx(NORMAL, "  UID                : %s",sprint_hex(resp.d.asBytes, 7));
-    PrintAndLogEx(NORMAL, "  Batch number       : %s",sprint_hex(resp.d.asBytes+28,5));
-    PrintAndLogEx(NORMAL, "  Production date    : week %02x, 20%02x",resp.d.asBytes[33], resp.d.asBytes[34]);
+    PrintAndLogEx(NORMAL, "  UID                : %s", sprint_hex(resp.d.asBytes, 7));
+    PrintAndLogEx(NORMAL, "  Batch number       : %s", sprint_hex(resp.d.asBytes + 28, 5));
+    PrintAndLogEx(NORMAL, "  Production date    : week %02x, 20%02x", resp.d.asBytes[33], resp.d.asBytes[34]);
     PrintAndLogEx(NORMAL, "  -----------------------------------------------------------");
     PrintAndLogEx(NORMAL, "  Hardware Information");
     PrintAndLogEx(NORMAL, "      Vendor Id      : %s", getTagInfo(resp.d.asBytes[7]));
-    PrintAndLogEx(NORMAL, "      Type           : 0x%02X",resp.d.asBytes[8]);
-    PrintAndLogEx(NORMAL, "      Subtype        : 0x%02X",resp.d.asBytes[9]);
-    PrintAndLogEx(NORMAL, "      Version        : %s",GetVersionStr(resp.d.asBytes[10], resp.d.asBytes[11]) );
-    PrintAndLogEx(NORMAL, "      Storage size   : %s",GetCardSizeStr(resp.d.asBytes[12]));
-    PrintAndLogEx(NORMAL, "      Protocol       : %s",GetProtocolStr(resp.d.asBytes[13]));
+    PrintAndLogEx(NORMAL, "      Type           : 0x%02X", resp.d.asBytes[8]);
+    PrintAndLogEx(NORMAL, "      Subtype        : 0x%02X", resp.d.asBytes[9]);
+    PrintAndLogEx(NORMAL, "      Version        : %s", GetVersionStr(resp.d.asBytes[10], resp.d.asBytes[11]));
+    PrintAndLogEx(NORMAL, "      Storage size   : %s", GetCardSizeStr(resp.d.asBytes[12]));
+    PrintAndLogEx(NORMAL, "      Protocol       : %s", GetProtocolStr(resp.d.asBytes[13]));
     PrintAndLogEx(NORMAL, "  -----------------------------------------------------------");
     PrintAndLogEx(NORMAL, "  Software Information");
     PrintAndLogEx(NORMAL, "      Vendor Id      : %s", getTagInfo(resp.d.asBytes[14]));
-    PrintAndLogEx(NORMAL, "      Type           : 0x%02X",resp.d.asBytes[15]);
-    PrintAndLogEx(NORMAL, "      Subtype        : 0x%02X",resp.d.asBytes[16]);
-    PrintAndLogEx(NORMAL, "      Version        : %d.%d",resp.d.asBytes[17], resp.d.asBytes[18]);
+    PrintAndLogEx(NORMAL, "      Type           : 0x%02X", resp.d.asBytes[15]);
+    PrintAndLogEx(NORMAL, "      Subtype        : 0x%02X", resp.d.asBytes[16]);
+    PrintAndLogEx(NORMAL, "      Version        : %d.%d", resp.d.asBytes[17], resp.d.asBytes[18]);
     PrintAndLogEx(NORMAL, "      storage size   : %s", GetCardSizeStr(resp.d.asBytes[19]));
     PrintAndLogEx(NORMAL, "      Protocol       : %s", GetProtocolStr(resp.d.asBytes[20]));
     PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
@@ -188,13 +192,13 @@ int CmdHF14ADesInfo(const char *Cmd){
     c.arg[1] = 0x01;
     c.d.asBytes[0] = GET_FREE_MEMORY;
     SendCommand(&c);
-    if ( !WaitForResponseTimeout(CMD_ACK,&resp,1500))
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500))
         return 0;
 
     uint8_t tmp[3];
-    memcpy(tmp, resp.d.asBytes+3,3);
+    memcpy(tmp, resp.d.asBytes + 3, 3);
 
-    PrintAndLogEx(NORMAL, "   Available free memory on card       : %d bytes", le24toh( tmp ));
+    PrintAndLogEx(NORMAL, "   Available free memory on card       : %d bytes", le24toh(tmp));
     PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
 
     /*
@@ -221,51 +225,55 @@ int CmdHF14ADesInfo(const char *Cmd){
     and set to '1' if the storage size is between 2^n and 2^(n+1).
     For this version of DESFire the 7 MSBits are set to 0x0C (2^12 = 4096) and the LSBit is '0'.
 */
-char * GetCardSizeStr( uint8_t fsize ){
+char *GetCardSizeStr(uint8_t fsize)
+{
 
     static char buf[30] = {0x00};
     char *retStr = buf;
 
-    uint16_t usize = 1 << ((fsize >>1) + 1);
-    uint16_t lsize = 1 << (fsize >>1);
+    uint16_t usize = 1 << ((fsize >> 1) + 1);
+    uint16_t lsize = 1 << (fsize >> 1);
 
     // is  LSB set?
-    if (  fsize & 1 )
-        sprintf(retStr, "0x%02X (%d - %d bytes)",fsize, usize, lsize);
+    if (fsize & 1)
+        sprintf(retStr, "0x%02X (%d - %d bytes)", fsize, usize, lsize);
     else
         sprintf(retStr, "0x%02X (%d bytes)", fsize, lsize);
     return buf;
 }
 
-char * GetProtocolStr(uint8_t id){
+char *GetProtocolStr(uint8_t id)
+{
 
     static char buf[30] = {0x00};
     char *retStr = buf;
 
-    if ( id == 0x05)
-        sprintf(retStr,"0x%02X (ISO 14443-3, 14443-4)", id);
+    if (id == 0x05)
+        sprintf(retStr, "0x%02X (ISO 14443-3, 14443-4)", id);
     else
-        sprintf(retStr,"0x%02X (Unknown)", id);
+        sprintf(retStr, "0x%02X (Unknown)", id);
     return buf;
 }
 
-char * GetVersionStr(uint8_t major, uint8_t minor){
+char *GetVersionStr(uint8_t major, uint8_t minor)
+{
 
     static char buf[30] = {0x00};
     char *retStr = buf;
 
-    if ( major == 0x00)
-        sprintf(retStr,"%d.%d (Desfire MF3ICD40)", major, minor);
-    else if ( major == 0x01 && minor == 0x00)
-        sprintf(retStr,"%d.%d (Desfire EV1)", major, minor);
-    else if ( major == 0x12 && minor == 0x00)
-        sprintf(retStr,"%d.%d (Desfire EV2)", major, minor);
+    if (major == 0x00)
+        sprintf(retStr, "%d.%d (Desfire MF3ICD40)", major, minor);
+    else if (major == 0x01 && minor == 0x00)
+        sprintf(retStr, "%d.%d (Desfire EV1)", major, minor);
+    else if (major == 0x12 && minor == 0x00)
+        sprintf(retStr, "%d.%d (Desfire EV2)", major, minor);
     else
-        sprintf(retStr,"%d.%d (Unknown)", major, minor);
+        sprintf(retStr, "%d.%d (Unknown)", major, minor);
     return buf;
 }
 
-void GetKeySettings( uint8_t *aid){
+void GetKeySettings(uint8_t *aid)
+{
 
     char messStr[512] = {0x00};
     char *str = messStr;
@@ -276,36 +284,36 @@ void GetKeySettings( uint8_t *aid){
 
     //memset(messStr, 0x00, 512);
 
-    if ( aid == NULL ){
+    if (aid == NULL) {
         PrintAndLogEx(NORMAL, " CMK - PICC, Card Master Key settings ");
         PrintAndLogEx(NORMAL, "");
         c.arg[CMDPOS] = (INIT | DISCONNECT);
         c.arg[LENPOS] =  0x01;
         c.d.asBytes[0] = GET_KEY_SETTINGS;  // 0x45
         SendCommand(&c);
-        if ( !WaitForResponseTimeout(CMD_ACK,&resp,1000) ) {return;}
+        if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {return;}
         isOK  = resp.arg[0] & 0xff;
-        if ( !isOK ){
+        if (!isOK) {
             PrintAndLogEx(WARNING, "   Can't select master application");
             return;
         }
 
-        str = (resp.d.asBytes[3] & (1 << 3 )) ? "YES":"NO";
+        str = (resp.d.asBytes[3] & (1 << 3)) ? "YES" : "NO";
         PrintAndLogEx(NORMAL, "   [0x08] Configuration changeable       : %s", str);
-        str = (resp.d.asBytes[3] & (1 << 2 )) ? "NO":"YES";
-        PrintAndLogEx(NORMAL, "   [0x04] CMK required for create/delete : %s",str);
-        str = (resp.d.asBytes[3] & (1 << 1 )) ? "NO":"YES";
-        PrintAndLogEx(NORMAL, "   [0x02] Directory list access with CMK : %s",str);
-        str = (resp.d.asBytes[3] & (1 << 0 )) ? "YES" : "NO";
+        str = (resp.d.asBytes[3] & (1 << 2)) ? "NO" : "YES";
+        PrintAndLogEx(NORMAL, "   [0x04] CMK required for create/delete : %s", str);
+        str = (resp.d.asBytes[3] & (1 << 1)) ? "NO" : "YES";
+        PrintAndLogEx(NORMAL, "   [0x02] Directory list access with CMK : %s", str);
+        str = (resp.d.asBytes[3] & (1 << 0)) ? "YES" : "NO";
         PrintAndLogEx(NORMAL, "   [0x01] CMK is changeable              : %s", str);
 
         c.arg[LENPOS] = 0x02; //LEN
         c.d.asBytes[0] = GET_KEY_VERSION; //0x64
         c.d.asBytes[1] = 0x00;
         SendCommand(&c);
-        if ( !WaitForResponseTimeout(CMD_ACK,&resp,1000) ) { return; }
+        if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000)) { return; }
         isOK  = resp.arg[0] & 0xff;
-        if ( !isOK ){
+        if (!isOK) {
             PrintAndLogEx(WARNING, "   Can't read key-version");
             return;
         }
@@ -318,21 +326,21 @@ void GetKeySettings( uint8_t *aid){
         c.d.asBytes[0] = AUTHENTICATE; //0x0A
         c.d.asBytes[1] = 0x00; // KEY 0
         SendCommand(&c);
-        if ( !WaitForResponseTimeout(CMD_ACK,&resp,1000) ) {return;}
+        if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {return;}
         isOK  = resp.d.asBytes[2] & 0xff;
-        PrintAndLogEx(NORMAL, "   [0x0A] Authenticate      : %s", ( isOK==0xAE ) ? "NO":"YES");
+        PrintAndLogEx(NORMAL, "   [0x0A] Authenticate      : %s", (isOK == 0xAE) ? "NO" : "YES");
 
         c.d.asBytes[0] = AUTHENTICATE_ISO; //0x1A
         SendCommand(&c);
-        if ( !WaitForResponseTimeout(CMD_ACK,&resp,1000) ) {return;}
+        if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {return;}
         isOK  = resp.d.asBytes[2] & 0xff;
-        PrintAndLogEx(NORMAL, "   [0x1A] Authenticate ISO  : %s", ( isOK==0xAE ) ? "NO":"YES");
+        PrintAndLogEx(NORMAL, "   [0x1A] Authenticate ISO  : %s", (isOK == 0xAE) ? "NO" : "YES");
 
         c.d.asBytes[0] = AUTHENTICATE_AES; //0xAA
         SendCommand(&c);
-        if ( !WaitForResponseTimeout(CMD_ACK,&resp,1000) ) {return;}
+        if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {return;}
         isOK  = resp.d.asBytes[2] & 0xff;
-        PrintAndLogEx(NORMAL, "   [0xAA] Authenticate AES  : %s", ( isOK==0xAE ) ? "NO":"YES");
+        PrintAndLogEx(NORMAL, "   [0xAA] Authenticate AES  : %s", (isOK == 0xAE) ? "NO" : "YES");
         PrintAndLogEx(NORMAL, "");
         PrintAndLogEx(NORMAL, "   ----------------------------------------------------------");
 
@@ -343,16 +351,16 @@ void GetKeySettings( uint8_t *aid){
         c.arg[0] = (INIT | CLEARTRACE);
         c.arg[LENPOS] = 0x04;
         c.d.asBytes[0] = SELECT_APPLICATION;  // 0x5a
-        memcpy(c.d.asBytes+1, aid, 3);
+        memcpy(c.d.asBytes + 1, aid, 3);
         SendCommand(&c);
 
-        if (!WaitForResponseTimeout(CMD_ACK,&resp,1500) ) {
+        if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
             PrintAndLogEx(WARNING, "   Timed-out");
             return;
         }
         isOK  = resp.arg[0] & 0xff;
-        if ( !isOK ){
-            PrintAndLogEx(WARNING, "   Can't select AID: %s",sprint_hex(aid,3));
+        if (!isOK) {
+            PrintAndLogEx(WARNING, "   Can't select AID: %s", sprint_hex(aid, 3));
             return;
         }
 
@@ -362,16 +370,16 @@ void GetKeySettings( uint8_t *aid){
         c.arg[LENPOS] = 0x01;
         c.d.asBytes[0] = GET_KEY_SETTINGS; // 0x45
         SendCommand(&c);
-        if ( !WaitForResponseTimeout(CMD_ACK,&resp,1500) ) {
+        if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
             return;
         }
         isOK  = resp.arg[0] & 0xff;
-        if ( !isOK ){
+        if (!isOK) {
             PrintAndLogEx(WARNING, "   Can't read Application Master key settings");
         } else {
             // Access rights.
             uint8_t rights = (resp.d.asBytes[3] >> 4 & 0xff);
-            switch (rights){
+            switch (rights) {
                 case 0x00:
                     str = "AMK authentication is necessary to change any key (default)";
                     break;
@@ -386,16 +394,16 @@ void GetKeySettings( uint8_t *aid){
                     break;
             }
             PrintAndLogEx(NORMAL, "Changekey Access rights");
-            PrintAndLogEx(NORMAL, "-- %s",str);
+            PrintAndLogEx(NORMAL, "-- %s", str);
             PrintAndLogEx(NORMAL, "");
             // same as CMK
-            str = (resp.d.asBytes[3] & (1 << 3 )) ? "YES":"NO";
+            str = (resp.d.asBytes[3] & (1 << 3)) ? "YES" : "NO";
             PrintAndLogEx(NORMAL, "   0x08 Configuration changeable       : %s", str);
-            str = (resp.d.asBytes[3] & (1 << 2 )) ? "NO":"YES";
-            PrintAndLogEx(NORMAL, "   0x04 AMK required for create/delete : %s",str);
-            str = (resp.d.asBytes[3] & (1 << 1 )) ? "NO":"YES";
-            PrintAndLogEx(NORMAL, "   0x02 Directory list access with AMK : %s",str);
-            str = (resp.d.asBytes[3] & (1 << 0 )) ? "YES" : "NO";
+            str = (resp.d.asBytes[3] & (1 << 2)) ? "NO" : "YES";
+            PrintAndLogEx(NORMAL, "   0x04 AMK required for create/delete : %s", str);
+            str = (resp.d.asBytes[3] & (1 << 1)) ? "NO" : "YES";
+            PrintAndLogEx(NORMAL, "   0x02 Directory list access with AMK : %s", str);
+            str = (resp.d.asBytes[3] & (1 << 0)) ? "YES" : "NO";
             PrintAndLogEx(NORMAL, "   0x01 AMK is changeable              : %s", str);
         }
 
@@ -405,7 +413,7 @@ void GetKeySettings( uint8_t *aid){
         c.d.asBytes[0] = GET_KEY_VERSION; //0x64
         c.d.asBytes[1] = 0x00;
         SendCommand(&c);
-        if ( !WaitForResponseTimeout(CMD_ACK,&resp,1500) ) {
+        if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
             PrintAndLogEx(WARNING, "   Timed-out");
             return;
         }
@@ -413,21 +421,20 @@ void GetKeySettings( uint8_t *aid){
         int numOfKeys;
 
         isOK  = resp.arg[0] & 0xff;
-        if ( !isOK ){
+        if (!isOK) {
             PrintAndLogEx(WARNING, "   Can't read Application Master key version. Trying all keys");
             numOfKeys = MAX_NUM_KEYS;
-        }
-        else{
+        } else {
             numOfKeys = resp.d.asBytes[4];
             PrintAndLogEx(NORMAL, "");
-            PrintAndLogEx(NORMAL, "     Max number of keys  : %d", numOfKeys );
+            PrintAndLogEx(NORMAL, "     Max number of keys  : %d", numOfKeys);
             PrintAndLogEx(NORMAL, "     Application Master key Version  : %d (0x%02x)", resp.d.asBytes[3], resp.d.asBytes[3]);
             PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
         }
 
         // LOOP over numOfKeys that we got before.
         // From 0x01 to numOfKeys.  We already got 0x00. (AMK)
-        for(int i=0x01; i<=0x0f; ++i){
+        for (int i = 0x01; i <= 0x0f; ++i) {
 
         }
 
@@ -435,23 +442,24 @@ void GetKeySettings( uint8_t *aid){
     }
 }
 
-int CmdHF14ADesEnumApplications(const char *Cmd){
+int CmdHF14ADesEnumApplications(const char *Cmd)
+{
 
     uint8_t isOK = 0x00;
     uint8_t aid[3];
     uint32_t options = (INIT | DISCONNECT);
 
-    UsbCommand c = {CMD_MIFARE_DESFIRE, {options , 0x01 }};
+    UsbCommand c = {CMD_MIFARE_DESFIRE, {options, 0x01 }};
     c.d.asBytes[0] = GET_APPLICATION_IDS;  //0x6a
 
     SendCommand(&c);
     UsbCommand resp;
 
-    if ( !WaitForResponseTimeout(CMD_ACK,&resp,1500) ) {
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         return 0;
     }
     isOK  = resp.arg[0] & 0xff;
-    if ( !isOK ){
+    if (!isOK) {
         PrintAndLogEx(NORMAL, "Command unsuccessful");
         return 0;
     }
@@ -463,15 +471,15 @@ int CmdHF14ADesEnumApplications(const char *Cmd){
     UsbCommand respFiles;
 
     uint8_t num = 0;
-    int max = resp.arg[1] -3 -2;
+    int max = resp.arg[1] - 3 - 2;
 
-    for(int i=3; i<=max; i+=3){
-        PrintAndLogEx(NORMAL, " Aid %d : %02X %02X %02X ",num ,resp.d.asBytes[i],resp.d.asBytes[i+1],resp.d.asBytes[i+2]);
+    for (int i = 3; i <= max; i += 3) {
+        PrintAndLogEx(NORMAL, " Aid %d : %02X %02X %02X ", num, resp.d.asBytes[i], resp.d.asBytes[i + 1], resp.d.asBytes[i + 2]);
         num++;
 
         aid[0] = resp.d.asBytes[i];
-        aid[1] = resp.d.asBytes[i+1];
-        aid[2] = resp.d.asBytes[i+2];
+        aid[1] = resp.d.asBytes[i + 1];
+        aid[2] = resp.d.asBytes[i + 2];
         GetKeySettings(aid);
 
         // Select Application
@@ -479,17 +487,17 @@ int CmdHF14ADesEnumApplications(const char *Cmd){
         c.arg[LENPOS] = 0x04;
         c.d.asBytes[0] = SELECT_APPLICATION;  // 0x5a
         c.d.asBytes[1] = resp.d.asBytes[i];
-        c.d.asBytes[2] = resp.d.asBytes[i+1];
-        c.d.asBytes[3] = resp.d.asBytes[i+2];
+        c.d.asBytes[2] = resp.d.asBytes[i + 1];
+        c.d.asBytes[3] = resp.d.asBytes[i + 2];
         SendCommand(&c);
 
-        if (!WaitForResponseTimeout(CMD_ACK,&respAid,1500) ) {
+        if (!WaitForResponseTimeout(CMD_ACK, &respAid, 1500)) {
             PrintAndLogEx(WARNING, "   Timed-out");
             continue;
         }
         isOK  = respAid.d.asBytes[2] & 0xff;
-        if ( isOK != 0x00 ){
-            PrintAndLogEx(WARNING, "   Can't select AID: %s",sprint_hex(resp.d.asBytes+i,3));
+        if (isOK != 0x00) {
+            PrintAndLogEx(WARNING, "   Can't select AID: %s", sprint_hex(resp.d.asBytes + i, 3));
             continue;
         }
 
@@ -499,17 +507,17 @@ int CmdHF14ADesEnumApplications(const char *Cmd){
         c.d.asBytes[0] = GET_FILE_IDS; // 0x6f
         SendCommand(&c);
 
-        if ( !WaitForResponseTimeout(CMD_ACK,&respFiles,1500) ) {
+        if (!WaitForResponseTimeout(CMD_ACK, &respFiles, 1500)) {
             PrintAndLogEx(WARNING, "   Timed-out");
             continue;
         } else {
             isOK  = respFiles.d.asBytes[2] & 0xff;
-            if ( !isOK ){
+            if (!isOK) {
                 PrintAndLogEx(WARNING, "   Can't get file ids ");
             } else {
-                int respfileLen = resp.arg[1]-3-2;
-                for (int j=0; j< respfileLen; ++j){
-                    PrintAndLogEx(NORMAL, "   Fileid %d :", resp.d.asBytes[j+3]);
+                int respfileLen = resp.arg[1] - 3 - 2;
+                for (int j = 0; j < respfileLen; ++j) {
+                    PrintAndLogEx(NORMAL, "   Fileid %d :", resp.d.asBytes[j + 3]);
                 }
             }
         }
@@ -520,17 +528,17 @@ int CmdHF14ADesEnumApplications(const char *Cmd){
         c.d.asBytes[0] = GET_ISOFILE_IDS; // 0x61
         SendCommand(&c);
 
-        if ( !WaitForResponseTimeout(CMD_ACK,&respFiles,1500) ) {
+        if (!WaitForResponseTimeout(CMD_ACK, &respFiles, 1500)) {
             PrintAndLogEx(WARNING, "   Timed-out");
             continue;
         } else {
             isOK  = respFiles.d.asBytes[2] & 0xff;
-            if ( !isOK ){
+            if (!isOK) {
                 PrintAndLogEx(WARNING, "   Can't get ISO file ids ");
             } else {
-                int respfileLen = resp.arg[1]-3-2;
-                for (int j=0; j< respfileLen; ++j){
-                    PrintAndLogEx(NORMAL, " ISO  Fileid %d :", resp.d.asBytes[j+3]);
+                int respfileLen = resp.arg[1] - 3 - 2;
+                for (int j = 0; j < respfileLen; ++j) {
+                    PrintAndLogEx(NORMAL, " ISO  Fileid %d :", resp.d.asBytes[j + 3]);
                 }
             }
         }
@@ -546,7 +554,8 @@ int CmdHF14ADesEnumApplications(const char *Cmd){
 // MIAFRE DesFire Authentication
 //
 #define BUFSIZE 256
-int CmdHF14ADesAuth(const char *Cmd){
+int CmdHF14ADesAuth(const char *Cmd)
+{
 
     // NR  DESC     KEYLENGHT
     // ------------------------
@@ -558,7 +567,7 @@ int CmdHF14ADesAuth(const char *Cmd){
     uint8_t keylength = 8;
     unsigned char key[24];
 
-    if (strlen(Cmd)<3) {
+    if (strlen(Cmd) < 3) {
         PrintAndLogEx(NORMAL, "Usage:  hf mfdes auth <1|2|3> <1|2|3|4> <keyno> <key> ");
         PrintAndLogEx(NORMAL, "            Auth modes");
         PrintAndLogEx(NORMAL, "                 1 = normal, 2 = iso, 3 = aes");
@@ -570,26 +579,25 @@ int CmdHF14ADesAuth(const char *Cmd){
         PrintAndLogEx(NORMAL, "         hf mfdes auth 3 4 0 404142434445464748494a4b4c4d4e4f");
         return 0;
     }
-    uint8_t cmdAuthMode = param_get8(Cmd,0);
-    uint8_t cmdAuthAlgo = param_get8(Cmd,1);
-    uint8_t cmdKeyNo    = param_get8(Cmd,2);
+    uint8_t cmdAuthMode = param_get8(Cmd, 0);
+    uint8_t cmdAuthAlgo = param_get8(Cmd, 1);
+    uint8_t cmdKeyNo    = param_get8(Cmd, 2);
 
-    switch (cmdAuthMode)
-    {
+    switch (cmdAuthMode) {
         case 1:
-            if ( cmdAuthAlgo != 1 && cmdAuthAlgo != 2) {
+            if (cmdAuthAlgo != 1 && cmdAuthAlgo != 2) {
                 PrintAndLogEx(NORMAL, "Crypto algo not valid for the auth mode");
                 return 1;
             }
             break;
         case 2:
-            if ( cmdAuthAlgo != 1 && cmdAuthAlgo != 2 && cmdAuthAlgo != 3) {
+            if (cmdAuthAlgo != 1 && cmdAuthAlgo != 2 && cmdAuthAlgo != 3) {
                 PrintAndLogEx(NORMAL, "Crypto algo not valid for the auth mode");
                 return 1;
             }
             break;
         case 3:
-            if ( cmdAuthAlgo != 4) {
+            if (cmdAuthAlgo != 4) {
                 PrintAndLogEx(NORMAL, "Crypto algo not valid for the auth mode");
                 return 1;
             }
@@ -600,7 +608,7 @@ int CmdHF14ADesAuth(const char *Cmd){
             break;
     }
 
-    switch (cmdAuthAlgo){
+    switch (cmdAuthAlgo) {
         case 2:
             keylength = 16;
             PrintAndLogEx(NORMAL, "3DES selected");
@@ -621,7 +629,7 @@ int CmdHF14ADesAuth(const char *Cmd){
     }
 
     // key
-    if (param_gethex(Cmd, 3, key, keylength*2)) {
+    if (param_gethex(Cmd, 3, key, keylength * 2)) {
         PrintAndLogEx(WARNING, "Key must include %d HEX symbols", keylength);
         return 1;
     }
@@ -629,25 +637,25 @@ int CmdHF14ADesAuth(const char *Cmd){
     UsbCommand c = {CMD_MIFARE_DESFIRE_AUTH1, { cmdAuthMode, cmdAuthAlgo, cmdKeyNo }};
 
     c.d.asBytes[0] = keylength;
-    memcpy(c.d.asBytes+1, key, keylength);
+    memcpy(c.d.asBytes + 1, key, keylength);
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
 
-    if (!WaitForResponseTimeout(CMD_ACK,&resp,3000)) {
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 3000)) {
         PrintAndLogEx(WARNING, "Client command execute timeout");
         return 0;
     }
 
     uint8_t isOK  = resp.arg[0] & 0xff;
-    if ( isOK) {
-        uint8_t * data= resp.d.asBytes;
+    if (isOK) {
+        uint8_t *data = resp.d.asBytes;
 
-        PrintAndLogEx(NORMAL, "  Key        :%s",sprint_hex(key, keylength));
-        PrintAndLogEx(NORMAL, "  SESSION    :%s",sprint_hex(data, keylength));
+        PrintAndLogEx(NORMAL, "  Key        :%s", sprint_hex(key, keylength));
+        PrintAndLogEx(NORMAL, "  SESSION    :%s", sprint_hex(data, keylength));
         PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
         //PrintAndLogEx(NORMAL, "  Expected   :B5 21 9E E8 1A A7 49 9D 21 96 68 7E 13 97 38 56");
-    } else{
+    } else {
         PrintAndLogEx(NORMAL, "Client command failed.");
     }
     PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
@@ -656,23 +664,25 @@ int CmdHF14ADesAuth(const char *Cmd){
 
 
 static command_t CommandTable[] = {
-  {"help",    CmdHelp,                    1, "This help"},
-  {"info",    CmdHF14ADesInfo,            0, "Tag information"},
-  {"enum",    CmdHF14ADesEnumApplications,0, "Tries enumerate all applications"},
-  {"auth",    CmdHF14ADesAuth,            0, "Tries a MIFARE DesFire Authentication"},
-  {"rdbl",    CmdHF14ADesRb,              0, "Read MIFARE DesFire block"},
-  {"wrbl",    CmdHF14ADesWb,              0, "write MIFARE DesFire block"},
-  {NULL, NULL, 0, NULL}
+    {"help",    CmdHelp,                    1, "This help"},
+    {"info",    CmdHF14ADesInfo,            0, "Tag information"},
+    {"enum",    CmdHF14ADesEnumApplications, 0, "Tries enumerate all applications"},
+    {"auth",    CmdHF14ADesAuth,            0, "Tries a MIFARE DesFire Authentication"},
+    {"rdbl",    CmdHF14ADesRb,              0, "Read MIFARE DesFire block"},
+    {"wrbl",    CmdHF14ADesWb,              0, "write MIFARE DesFire block"},
+    {NULL, NULL, 0, NULL}
 };
 
-int CmdHFMFDes(const char *Cmd) {
-   // flush
+int CmdHFMFDes(const char *Cmd)
+{
+    // flush
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
+int CmdHelp(const char *Cmd)
+{
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdhfmfdes.h b/client/cmdhfmfdes.h
index 4ed3d4772..9aeb7dbeb 100644
--- a/client/cmdhfmfdes.h
+++ b/client/cmdhfmfdes.h
@@ -11,24 +11,24 @@
 #define __MFDESFIRE_H
 
 int CmdHFMFDes(const char *Cmd);
-int CmdHF14ADesAuth(const char* cmd);
-int CmdHF14ADesRb(const char* cmd);
-int CmdHF14ADesWb(const char* cmd);
+int CmdHF14ADesAuth(const char *cmd);
+int CmdHF14ADesRb(const char *cmd);
+int CmdHF14ADesWb(const char *cmd);
 int CmdHF14ADesInfo(const char *Cmd);
 int CmdHF14ADesEnumApplications(const char *Cmd);
 
-char * GetCardSizeStr( uint8_t fsize );
-char * GetProtocolStr( uint8_t id );
-char * GetVersionStr( uint8_t major, uint8_t minor );
-void GetKeySettings( uint8_t * aid );
+char *GetCardSizeStr(uint8_t fsize);
+char *GetProtocolStr(uint8_t id);
+char *GetVersionStr(uint8_t major, uint8_t minor);
+void GetKeySettings(uint8_t *aid);
 
 // Command options for Desfire behavior.
 enum  {
- NONE       =    0x00,
- INIT       =    0x01,
- DISCONNECT =    0x02,
- CLEARTRACE =    0x04,
- BAR        =    0x08,
+    NONE       =    0x00,
+    INIT       =    0x01,
+    DISCONNECT =    0x02,
+    CLEARTRACE =    0x04,
+    BAR        =    0x08,
 } CmdOptions ;
 
 
@@ -80,51 +80,51 @@ enum  {
 // status- and error codes                                                     |
 #define OPERATION_OK                0x00 // Successful operation
 #define NO_CHANGES                  0x0C //  No changes done to backup files
-                                         //  ,CommitTransaction/
-                                         //  AbortTransaction not necessary
+//  ,CommitTransaction/
+//  AbortTransaction not necessary
 #define OUT_OF_EEPROM_ERROR         0x0E // Insufficient NV-Memory to
-                                         //  complete command
+//  complete command
 #define ILLEGAL_COMMAND_CODE        0x1C // Command code not supported
 #define INTEGRITY_ERROR             0x1E // CRC or MAC does not match data
-                                         //  Padding bytes not valid
+//  Padding bytes not valid
 #define NO_SUCH_KEY                 0x40 // Invalid key number specified
 #define LENGTH_ERROR                0x7E // Length of command string invalid
 #define PERMISSION_DENIED           0x9D // Current configuration status
-                                         //  does not allow the requested
-                                         //  command
+//  does not allow the requested
+//  command
 #define PARAMETER_ERROR             0x9E // Value of the parameter(s) inval.
 #define APPLICATION_NOT_FOUND       0xA0 // Requested AID not present on PIC
 #define APPL_INTEGRITY_ERROR        0xA1 // [1] // Unrecoverable error within app-
-                                         //  lication, app will be disabled
+//  lication, app will be disabled
 #define AUTHENTICATION_ERROR        0xAE // Current authentication status
-                                         //  does not allow the requested
-                                         //  command
+//  does not allow the requested
+//  command
 #define ADDITIONAL_FRAME            0xAF // Additional data frame is
-                                         //  expected to be sent
+//  expected to be sent
 #define BOUNDARY_ERROR              0xBE // Attempt to read/write data from/
-                                         //  to beyond the file's/record's
-                                         //  limits. Attempt to exceed the
-                                         //  limits of a value file.
+//  to beyond the file's/record's
+//  limits. Attempt to exceed the
+//  limits of a value file.
 #define PICC_INTEGRITY_ERROR        0xC1 // [1] // Unrecoverable error within PICC
-                                         //  ,PICC will be disabled
+//  ,PICC will be disabled
 #define COMMAND_ABORTED             0xCA // Previous Command was not fully
-                                         //  completed Not all Frames were
-                                         //  requested or provided by PCD
+//  completed Not all Frames were
+//  requested or provided by PCD
 #define PICC_DISABLED_ERROR         0xCD // [1] // PICC was disabled by an unrecoverable error
 #define COUNT_ERROR                 0xCE // Number of Applications limited
-                                         //  to 28, no additional
-                                         //  CreateApplication possible
+//  to 28, no additional
+//  CreateApplication possible
 #define DUPLICATE_ERROR             0xDE // Creation of file/application
-                                         //  failed because file/application
-                                         //  with same number already exists
+//  failed because file/application
+//  with same number already exists
 #define EEPROM_ERROR                0xEE // [1]    // Could not complete NV-write
-                                         //  operation due to loss of power,
-                                         //  internal backup/rollback
-                                         //  mechanism activated
+//  operation due to loss of power,
+//  internal backup/rollback
+//  mechanism activated
 #define FILE_NOT_FOUND_ERROR        0xF0 // Specified file number does not
-                                         //  exist
+//  exist
 #define FILE_INTEGRITY_ERROR        0xF1 // [1]    // Unrecoverable error within file,
-                                         //  file will be disabled
+//  file will be disabled
 //
 // [1] These errors are not expected to appear during normal operation
 
diff --git a/client/cmdhfmfdesfire.c b/client/cmdhfmfdesfire.c
index 88bbf9034..1384e39c0 100644
--- a/client/cmdhfmfdesfire.c
+++ b/client/cmdhfmfdesfire.c
@@ -29,24 +29,25 @@ static int CmdHelp(const char *Cmd);
 //n'r=rol(r5)
 //verify n'r=nr
 
-int CmdHF14AMfDESAuth(const char *Cmd){
+int CmdHF14AMfDESAuth(const char *Cmd)
+{
 
     uint8_t blockNo = 0;
     //keyNo=0;
     uint32_t cuid = 0;
     uint8_t reply[16] = {0x00};
     //DES_cblock r1_b1;
-    uint8_t b1[8]={ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-    uint8_t b2[8]={ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+    uint8_t b1[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+    uint8_t b2[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
     DES_cblock nr,  b0, r1, r0;
 
 
-    uint8_t key[8]={ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+    uint8_t key[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
     //DES_cblock iv={0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
     DES_key_schedule ks1;
     DES_cblock key1;
 
-    if (strlen(Cmd)<1) {
+    if (strlen(Cmd) < 1) {
         PrintAndLogEx(NORMAL, "Usage:  hf desfire des-auth k <key number>");
         PrintAndLogEx(NORMAL, "Examples:");
         PrintAndLogEx(NORMAL, "        hf desfire des-auth k 0");
@@ -55,23 +56,23 @@ int CmdHF14AMfDESAuth(const char *Cmd){
 
     //Change key to user defined one
 
-    memcpy(key1,key,8);
+    memcpy(key1, key, 8);
     //memcpy(key2,key+8,8);
-    DES_set_key((DES_cblock *)key1,&ks1);
+    DES_set_key((DES_cblock *)key1, &ks1);
     //DES_set_key((DES_cblock *)key2,&ks2);
 
     //Auth1
     UsbCommand c = {CMD_MIFARE_DES_AUTH1, {blockNo}};
     SendCommand(&c);
     UsbCommand resp;
-    if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
+    if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         uint8_t isOK  = resp.arg[0] & 0xff;
-            cuid  = resp.arg[1];
-        uint8_t * data= resp.d.asBytes;
+        cuid  = resp.arg[1];
+        uint8_t *data = resp.d.asBytes;
 
-         if (isOK){
-             PrintAndLogEx(NORMAL, "enc(nc)/b0:%s", sprint_hex(data+2,8));
-             memcpy(b0,data+2,8);
+        if (isOK) {
+            PrintAndLogEx(NORMAL, "enc(nc)/b0:%s", sprint_hex(data + 2, 8));
+            memcpy(b0, data + 2, 8);
         }
     } else {
         PrintAndLogEx(WARNING, "Command execute timeout");
@@ -81,35 +82,35 @@ int CmdHF14AMfDESAuth(const char *Cmd){
     DES_random_key(&nr);
     //b1=dec(nr)
     //r0=dec(b0)
-    DES_ecb_encrypt(&nr,&b1,&ks1,0);
-    DES_ecb_encrypt(&b0,&r0,&ks1,0);
+    DES_ecb_encrypt(&nr, &b1, &ks1, 0);
+    DES_ecb_encrypt(&b0, &r0, &ks1, 0);
     //PrintAndLogEx(NORMAL, "b1:%s",sprint_hex(b1, 8));
-    PrintAndLogEx(NORMAL, "r0:%s",sprint_hex(r0, 8));
+    PrintAndLogEx(NORMAL, "r0:%s", sprint_hex(r0, 8));
     //r1=rol(r0)
-    memcpy(r1,r0,8);
-    rol(r1,8);
-    PrintAndLogEx(NORMAL, "r1:%s",sprint_hex(r1, 8));
-    for(int i=0;i<8;i++){
-      b2[i]=(r1[i] ^ b1[i]);
+    memcpy(r1, r0, 8);
+    rol(r1, 8);
+    PrintAndLogEx(NORMAL, "r1:%s", sprint_hex(r1, 8));
+    for (int i = 0; i < 8; i++) {
+        b2[i] = (r1[i] ^ b1[i]);
     }
-    DES_ecb_encrypt(&b2,&b2,&ks1,0);
+    DES_ecb_encrypt(&b2, &b2, &ks1, 0);
     //PrintAndLogEx(NORMAL, "b1:%s",sprint_hex(b1, 8));
-    PrintAndLogEx(NORMAL, "b2:%s",sprint_hex(b2, 8));
+    PrintAndLogEx(NORMAL, "b2:%s", sprint_hex(b2, 8));
 
     //Auth2
     UsbCommand d = {CMD_MIFARE_DES_AUTH2, {cuid}};
-    memcpy(reply,b1,8);
-    memcpy(reply+8,b2,8);
-    memcpy(d.d.asBytes,reply, 16);
+    memcpy(reply, b1, 8);
+    memcpy(reply + 8, b2, 8);
+    memcpy(d.d.asBytes, reply, 16);
     SendCommand(&d);
 
     UsbCommand respb;
-    if (WaitForResponseTimeout(CMD_ACK,&respb,1500)) {
+    if (WaitForResponseTimeout(CMD_ACK, &respb, 1500)) {
         uint8_t  isOK  = respb.arg[0] & 0xff;
-        uint8_t * data2= respb.d.asBytes;
+        uint8_t *data2 = respb.d.asBytes;
 
         if (isOK)
-            PrintAndLogEx(NORMAL, "b3:%s", sprint_hex(data2+2, 8));
+            PrintAndLogEx(NORMAL, "b3:%s", sprint_hex(data2 + 2, 8));
 
     } else {
         PrintAndLogEx(WARNING, "Command execute timeout");
@@ -122,7 +123,8 @@ int CmdHF14AMfDESAuth(const char *Cmd){
 // Card 2 Reader : 02AF, 16 Bytes(b0), CRC1 CRC2
 // Reader 2 Card : 03AF, 16 Bytes(b1),16Bytes(b2) CRC1 CRC2
 // Card 2 Reader : 0300, 16 bytes(b3), CRC1 CRC2 ; success
-int CmdHF14AMfAESAuth(const char *Cmd){
+int CmdHF14AMfAESAuth(const char *Cmd)
+{
 
     uint8_t blockNo = 0;
     //keyNo=0;
@@ -131,19 +133,19 @@ int CmdHF14AMfAESAuth(const char *Cmd){
     //DES_cblock r1_b1;
     //unsigned char * b1, b2, nr, b0, r0, r1;
 
-    uint8_t b1[16]={ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-    uint8_t b2[16]={ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-    uint8_t nr[16]={ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-    uint8_t b0[16]={ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-    uint8_t r0[16]={ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-    uint8_t r1[16]={ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+    uint8_t b1[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+    uint8_t b2[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+    uint8_t nr[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+    uint8_t b0[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+    uint8_t r0[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+    uint8_t r1[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
     //
-    uint8_t key[16]={ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-    uint8_t iv[16]={ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+    uint8_t key[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+    uint8_t iv[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
     AES_KEY key_e;
     AES_KEY key_d;
 
-    if (strlen(Cmd)<1) {
+    if (strlen(Cmd) < 1) {
         PrintAndLogEx(NORMAL, "Usage:  hf desfire aes-auth k <key number>");
         PrintAndLogEx(NORMAL, "Examples:");
         PrintAndLogEx(NORMAL, "        hf desfire aes-auth k 0");
@@ -153,12 +155,12 @@ int CmdHF14AMfAESAuth(const char *Cmd){
     //Change key to user defined one
     //
     // int private_AES_set_encrypt_key(const unsigned char *userKey, const int bits,AES_KEY *key);
-     //int private_AES_set_decrypt_key(const unsigned char *userKey, const int bits,AES_KEY *key);
+    //int private_AES_set_decrypt_key(const unsigned char *userKey, const int bits,AES_KEY *key);
     //
     //memcpy(key1,key,16);
     //memcpy(key2,key+8,8);
-    AES_set_encrypt_key(key,128,&key_e);
-    AES_set_decrypt_key(key,128,&key_d);
+    AES_set_encrypt_key(key, 128, &key_e);
+    AES_set_decrypt_key(key, 128, &key_d);
 
     //Auth1
     UsbCommand c = {CMD_MIFARE_DES_AUTH1, {blockNo}};
@@ -166,12 +168,12 @@ int CmdHF14AMfAESAuth(const char *Cmd){
     UsbCommand resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         uint8_t isOK  = resp.arg[0] & 0xff;
-            cuid  = resp.arg[1];
-        uint8_t * data= resp.d.asBytes;
+        cuid  = resp.arg[1];
+        uint8_t *data = resp.d.asBytes;
 
-         if (isOK){
-             PrintAndLogEx(NORMAL, "enc(nc)/b0:%s", sprint_hex(data+2,16));
-             memcpy(b0,data+2,16);
+        if (isOK) {
+            PrintAndLogEx(NORMAL, "enc(nc)/b0:%s", sprint_hex(data + 2, 16));
+            memcpy(b0, data + 2, 16);
         }
     } else {
         PrintAndLogEx(WARNING, "Command execute timeout");
@@ -181,42 +183,42 @@ int CmdHF14AMfAESAuth(const char *Cmd){
     //size_t length, const AES_KEY *key,
     //unsigned char *ivec, const int enc);
 
-   //Do crypto magic
+    //Do crypto magic
     //DES_random_key(&nr);
     //b1=dec(nr)
     //r0=dec(b0)
     //AES_cbc_encrypt(&nr,&b1,16,&key,0);
-    AES_cbc_encrypt(&b0,&r0,16,&key_d,iv,0);
+    AES_cbc_encrypt(&b0, &r0, 16, &key_d, iv, 0);
     //PrintAndLogEx(NORMAL, "b1:%s",sprint_hex(b1, 8));
-    PrintAndLogEx(NORMAL, "r0:%s",sprint_hex(r0, 16));
+    PrintAndLogEx(NORMAL, "r0:%s", sprint_hex(r0, 16));
     //r1=rol(r0)
-    memcpy(r1,r0,16);
-    rol(r1,8);
-    PrintAndLogEx(NORMAL, "r1:%s",sprint_hex(r1, 16));
-    for(int i=0;i<16;i++){
-      b1[i]=(nr[i] ^ b0[i]);
-      b2[i]=(r1[i] ^ b1[i]);
+    memcpy(r1, r0, 16);
+    rol(r1, 8);
+    PrintAndLogEx(NORMAL, "r1:%s", sprint_hex(r1, 16));
+    for (int i = 0; i < 16; i++) {
+        b1[i] = (nr[i] ^ b0[i]);
+        b2[i] = (r1[i] ^ b1[i]);
     }
-    PrintAndLogEx(NORMAL, "nr:%s",sprint_hex(nr, 16));
-    AES_cbc_encrypt(&b1,&b1,16,&key_e,iv,1);
-    AES_cbc_encrypt(&b2,&b2,16,&key_e,iv,1);
-    PrintAndLogEx(NORMAL, "b1:%s",sprint_hex(b1, 16));
-    PrintAndLogEx(NORMAL, "b2:%s",sprint_hex(b2, 16));
+    PrintAndLogEx(NORMAL, "nr:%s", sprint_hex(nr, 16));
+    AES_cbc_encrypt(&b1, &b1, 16, &key_e, iv, 1);
+    AES_cbc_encrypt(&b2, &b2, 16, &key_e, iv, 1);
+    PrintAndLogEx(NORMAL, "b1:%s", sprint_hex(b1, 16));
+    PrintAndLogEx(NORMAL, "b2:%s", sprint_hex(b2, 16));
 
     //Auth2
     UsbCommand d = {CMD_MIFARE_DES_AUTH2, {cuid}};
-    memcpy(reply,b1,16);
-    memcpy(reply+16,b2,16);
-    memcpy(d.d.asBytes,reply, 32);
+    memcpy(reply, b1, 16);
+    memcpy(reply + 16, b2, 16);
+    memcpy(d.d.asBytes, reply, 32);
     SendCommand(&d);
 
     UsbCommand respb;
     if (WaitForResponseTimeout(CMD_ACK, &respb, 1500)) {
         uint8_t  isOK  = respb.arg[0] & 0xff;
-        uint8_t * data2= respb.d.asBytes;
+        uint8_t *data2 = respb.d.asBytes;
 
         if (isOK)
-            PrintAndLogEx(NORMAL, "b3:%s", sprint_hex(data2+2, 16));
+            PrintAndLogEx(NORMAL, "b3:%s", sprint_hex(data2 + 2, 16));
 
     } else {
         PrintAndLogEx(WARNING, "Command execute timeout");
@@ -228,23 +230,24 @@ int CmdHF14AMfAESAuth(const char *Cmd){
 //------------------------------------
 // Menu Stuff
 //------------------------------------
-static command_t CommandTable[] =
-{
-    {"help",    CmdHelp,            1,"This help"},
-    {"dbg",     CmdHF14AMfDbg,      0,"Set default debug mode"},
-    {"des-auth",CmdHF14AMfDESAuth,  0,"Desfire Authentication"},
-    {"ev1-auth",CmdHF14AMfAESAuth,  0,"EV1 Authentication"},
+static command_t CommandTable[] = {
+    {"help",    CmdHelp,            1, "This help"},
+    {"dbg",     CmdHF14AMfDbg,      0, "Set default debug mode"},
+    {"des-auth", CmdHF14AMfDESAuth,  0, "Desfire Authentication"},
+    {"ev1-auth", CmdHF14AMfAESAuth,  0, "EV1 Authentication"},
     {NULL, NULL, 0, NULL}
 };
 
-int CmdHFMFDesfire(const char *Cmd){
+int CmdHFMFDesfire(const char *Cmd)
+{
     // flush
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd){
+int CmdHelp(const char *Cmd)
+{
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdhfmfhard.c b/client/cmdhfmfhard.c
index 5f3b650bc..b312d9181 100644
--- a/client/cmdhfmfhard.c
+++ b/client/cmdhfmfhard.c
@@ -68,12 +68,13 @@ static uint16_t num_1st_byte_effective_bitflips = 0;
 #define CHECK_2ND_BYTES 0x02
 static uint8_t hardnested_stage = CHECK_1ST_BYTES;
 static uint64_t known_target_key;
-static uint32_t test_state[2] = {0,0};
+static uint32_t test_state[2] = {0, 0};
 static float brute_force_per_second;
 
 
-static void get_SIMD_instruction_set(char* instruction_set) {
-    switch(GetSIMDInstrAuto()) {
+static void get_SIMD_instruction_set(char *instruction_set)
+{
+    switch (GetSIMDInstrAuto()) {
         case SIMD_AVX512:
             strcpy(instruction_set, "AVX512F");
             break;
@@ -96,7 +97,8 @@ static void get_SIMD_instruction_set(char* instruction_set) {
 }
 
 
-static void print_progress_header(void) {
+static void print_progress_header(void)
+{
     char progress_text[80];
     char instr_set[12] = "";
     get_SIMD_instruction_set(instr_set);
@@ -109,7 +111,8 @@ static void print_progress_header(void) {
 }
 
 
-void hardnested_print_progress(uint32_t nonces, char *activity, float brute_force, uint64_t min_diff_print_time) {
+void hardnested_print_progress(uint32_t nonces, char *activity, float brute_force, uint64_t min_diff_print_time)
+{
     static uint64_t last_print_time = 0;
     if (msclock() - last_print_time > min_diff_print_time) {
         last_print_time = msclock();
@@ -119,13 +122,13 @@ void hardnested_print_progress(uint32_t nonces, char *activity, float brute_forc
         if (brute_force_time < 90) {
             sprintf(brute_force_time_string, "%2.0fs", brute_force_time);
         } else if (brute_force_time < 60 * 90) {
-            sprintf(brute_force_time_string, "%2.0fmin", brute_force_time/60);
+            sprintf(brute_force_time_string, "%2.0fmin", brute_force_time / 60);
         } else if (brute_force_time < 60 * 60 * 36) {
-            sprintf(brute_force_time_string, "%2.0fh", brute_force_time/(60*60));
+            sprintf(brute_force_time_string, "%2.0fh", brute_force_time / (60 * 60));
         } else {
-            sprintf(brute_force_time_string, "%2.0fd", brute_force_time/(60*60*24));
+            sprintf(brute_force_time_string, "%2.0fd", brute_force_time / (60 * 60 * 24));
         }
-        PrintAndLogEx(NORMAL, " %7.0f | %7u | %-55s | %15.0f | %5s", (float)total_time/1000.0, nonces, activity, brute_force, brute_force_time_string);
+        PrintAndLogEx(NORMAL, " %7.0f | %7u | %-55s | %15.0f | %5s", (float)total_time / 1000.0, nonces, activity, brute_force, brute_force_time_string);
     }
 }
 
@@ -135,30 +138,30 @@ void hardnested_print_progress(uint32_t nonces, char *activity, float brute_forc
 
 static inline void clear_bitarray24(uint32_t *bitarray)
 {
-    memset(bitarray, 0x00, sizeof(uint32_t) * (1<<19));
+    memset(bitarray, 0x00, sizeof(uint32_t) * (1 << 19));
 }
 
 
 static inline void set_bitarray24(uint32_t *bitarray)
 {
-    memset(bitarray, 0xff, sizeof(uint32_t) * (1<<19));
+    memset(bitarray, 0xff, sizeof(uint32_t) * (1 << 19));
 }
 
 
 static inline void set_bit24(uint32_t *bitarray, uint32_t index)
 {
-    bitarray[index>>5] |= 0x80000000>>(index&0x0000001f);
+    bitarray[index >> 5] |= 0x80000000 >> (index & 0x0000001f);
 }
 
 static inline uint32_t test_bit24(uint32_t *bitarray, uint32_t index)
 {
-    return bitarray[index>>5] & (0x80000000>>(index&0x0000001f));
+    return bitarray[index >> 5] & (0x80000000 >> (index & 0x0000001f));
 }
 
 
 static inline uint32_t next_state(uint32_t *bitarray, uint32_t state)
 {
-    if (++state == 1<<24) return 1<<24;
+    if (++state == 1 << 24) return 1 << 24;
     uint32_t index = state >> 5;
     uint_fast8_t bit = state & 0x1f;
     uint32_t line = bitarray[index] << bit;
@@ -169,11 +172,11 @@ static inline uint32_t next_state(uint32_t *bitarray, uint32_t state)
         line <<= 1;
     }
     index++;
-    while (bitarray[index] == 0x00000000 && state < 1<<24) {
+    while (bitarray[index] == 0x00000000 && state < 1 << 24) {
         index++;
         state += 0x20;
     }
-    if (state >= 1<<24) return 1<<24;
+    if (state >= 1 << 24) return 1 << 24;
 #if defined __GNUC__
     return state + __builtin_clz(bitarray[index]);
 #else
@@ -185,7 +188,7 @@ static inline uint32_t next_state(uint32_t *bitarray, uint32_t state)
         bit++;
         line <<= 1;
     }
-    return 1<<24;
+    return 1 << 24;
 #endif
 }
 
@@ -209,7 +212,7 @@ static int compare_count_bitflip_bitarrays(const void *b1, const void *b2)
 
 static voidpf inflate_malloc(voidpf opaque, uInt items, uInt size)
 {
-    return calloc(items*size, sizeof(uint8_t));
+    return calloc(items * size, sizeof(uint8_t));
 }
 
 
@@ -250,13 +253,13 @@ static void init_bitflip_bitarrays(void)
     z_stream compressed_stream;
 
     char state_files_path[strlen(get_my_executable_directory()) + strlen(STATE_FILES_DIRECTORY) + strlen(STATE_FILE_TEMPLATE) + 1];
-    char state_file_name[strlen(STATE_FILE_TEMPLATE)+1];
+    char state_file_name[strlen(STATE_FILE_TEMPLATE) + 1];
 
     for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
         num_effective_bitflips[odd_even] = 0;
         for (uint16_t bitflip = 0x001; bitflip < 0x400; bitflip++) {
             bitflip_bitarrays[odd_even][bitflip] = NULL;
-            count_bitflip_bitarrays[odd_even][bitflip] = 1<<24;
+            count_bitflip_bitarrays[odd_even][bitflip] = 1 << 24;
             sprintf(state_file_name, STATE_FILE_TEMPLATE, odd_even, bitflip);
             strcpy(state_files_path, get_my_executable_directory());
             strcat(state_files_path, STATE_FILES_DIRECTORY);
@@ -267,7 +270,7 @@ static void init_bitflip_bitarrays(void)
             } else {
                 fseek(statesfile, 0, SEEK_END);
                 int fsize = ftell(statesfile);
-                if ( fsize == -1 ){
+                if (fsize == -1) {
                     PrintAndLogEx(WARNING, "File read error with %s. Aborting...\n", state_file_name);
                     fclose(statesfile);
                     exit(5);
@@ -286,21 +289,21 @@ static void init_bitflip_bitarrays(void)
                 uint32_t count = 0;
                 init_inflate(&compressed_stream, input_buffer, filesize, (uint8_t *)&count, sizeof(count));
                 inflate(&compressed_stream, Z_SYNC_FLUSH);
-                if ((float)count/(1<<24) < IGNORE_BITFLIP_THRESHOLD) {
-                    uint32_t *bitset = (uint32_t *)malloc_bitarray(sizeof(uint32_t) * (1<<19));
+                if ((float)count / (1 << 24) < IGNORE_BITFLIP_THRESHOLD) {
+                    uint32_t *bitset = (uint32_t *)malloc_bitarray(sizeof(uint32_t) * (1 << 19));
                     if (bitset == NULL) {
                         PrintAndLogEx(WARNING, "Out of memory error in init_bitflip_statelists(). Aborting...\n");
                         inflateEnd(&compressed_stream);
                         exit(4);
                     }
                     compressed_stream.next_out = (uint8_t *)bitset;
-                    compressed_stream.avail_out = sizeof(uint32_t) * (1<<19);
+                    compressed_stream.avail_out = sizeof(uint32_t) * (1 << 19);
                     inflate(&compressed_stream, Z_SYNC_FLUSH);
                     effective_bitflip[odd_even][num_effective_bitflips[odd_even]++] = bitflip;
                     bitflip_bitarrays[odd_even][bitflip] = bitset;
                     count_bitflip_bitarrays[odd_even][bitflip] = count;
 #if defined (DEBUG_REDUCTION)
-                    PrintAndLogEx(NORMAL, "(%03" PRIx16 " %s:%5.1f%%) ", bitflip, odd_even?"odd ":"even", (float)count/(1<<24)*100.0);
+                    PrintAndLogEx(NORMAL, "(%03" PRIx16 " %s:%5.1f%%) ", bitflip, odd_even ? "odd " : "even", (float)count / (1 << 24) * 100.0);
                     line++;
                     if (line == 8) {
                         PrintAndLogEx(NORMAL, "\n");
@@ -327,29 +330,30 @@ static void init_bitflip_bitarrays(void)
             j++;
         } else {
             all_effective_bitflip[num_all_effective_bitflips++] = effective_bitflip[EVEN_STATE][i];
-            i++; j++;
+            i++;
+            j++;
         }
-        if (!(all_effective_bitflip[num_all_effective_bitflips-1] & BITFLIP_2ND_BYTE)) {
+        if (!(all_effective_bitflip[num_all_effective_bitflips - 1] & BITFLIP_2ND_BYTE)) {
             num_1st_byte_effective_bitflips = num_all_effective_bitflips;
         }
     }
     qsort(all_effective_bitflip, num_1st_byte_effective_bitflips, sizeof(uint16_t), compare_count_bitflip_bitarrays);
 #if defined (DEBUG_REDUCTION)
     PrintAndLogEx(NORMAL, "\n1st byte effective bitflips (%d): \n", num_1st_byte_effective_bitflips);
-    for(uint16_t i = 0; i < num_1st_byte_effective_bitflips; i++) {
+    for (uint16_t i = 0; i < num_1st_byte_effective_bitflips; i++) {
         PrintAndLogEx(NORMAL, "%03x ",  all_effective_bitflip[i]);
     }
 #endif
-    qsort(all_effective_bitflip+num_1st_byte_effective_bitflips, num_all_effective_bitflips - num_1st_byte_effective_bitflips, sizeof(uint16_t), compare_count_bitflip_bitarrays);
+    qsort(all_effective_bitflip + num_1st_byte_effective_bitflips, num_all_effective_bitflips - num_1st_byte_effective_bitflips, sizeof(uint16_t), compare_count_bitflip_bitarrays);
 #if defined (DEBUG_REDUCTION)
     PrintAndLogEx(NORMAL, "\n2nd byte effective bitflips (%d): \n", num_all_effective_bitflips - num_1st_byte_effective_bitflips);
-    for(uint16_t i = num_1st_byte_effective_bitflips; i < num_all_effective_bitflips; i++) {
+    for (uint16_t i = num_1st_byte_effective_bitflips; i < num_all_effective_bitflips; i++) {
         PrintAndLogEx(NORMAL, "%03x ",  all_effective_bitflip[i]);
     }
 #endif
     char progress_text[80];
     sprintf(progress_text, "Using %d precalculated bitflip state tables", num_all_effective_bitflips);
-    hardnested_print_progress(0, progress_text, (float)(1LL<<47), 0);
+    hardnested_print_progress(0, progress_text, (float)(1LL << 47), 0);
 }
 
 
@@ -380,12 +384,12 @@ static uint16_t PartialSumProperty(uint32_t state, odd_even_t odd_even)
         if (odd_even == ODD_STATE) {
             for (uint16_t i = 0; i < 5; i++) {
                 part_sum ^= filter(st);
-                st = (st << 1) | ((j >> (3-i)) & 0x01) ;
+                st = (st << 1) | ((j >> (3 - i)) & 0x01) ;
             }
             part_sum ^= 1; // XOR 1 cancelled out for the other 8 bits
         } else {
             for (uint16_t i = 0; i < 4; i++) {
-                st = (st << 1) | ((j >> (3-i)) & 0x01) ;
+                st = (st << 1) | ((j >> (3 - i)) & 0x01) ;
                 part_sum ^= filter(st);
             }
         }
@@ -399,7 +403,7 @@ static void init_part_sum_bitarrays(void)
 {
     for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
         for (uint16_t part_sum_a0 = 0; part_sum_a0 < NUM_PART_SUMS; part_sum_a0++) {
-            part_sum_a0_bitarrays[odd_even][part_sum_a0] = (uint32_t *)malloc_bitarray(sizeof(uint32_t) * (1<<19));
+            part_sum_a0_bitarrays[odd_even][part_sum_a0] = (uint32_t *)malloc_bitarray(sizeof(uint32_t) * (1 << 19));
             if (part_sum_a0_bitarrays[odd_even][part_sum_a0] == NULL) {
                 PrintAndLogEx(WARNING, "Out of memory error in init_part_suma0_statelists(). Aborting...\n");
                 exit(4);
@@ -409,17 +413,17 @@ static void init_part_sum_bitarrays(void)
     }
     for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
         //PrintAndLogEx(NORMAL, "(%d, %" PRIu16 ")...", odd_even, part_sum_a0);
-        for (uint32_t state = 0; state < (1<<20); state++) {
+        for (uint32_t state = 0; state < (1 << 20); state++) {
             uint16_t part_sum_a0 = PartialSumProperty(state, odd_even) / 2;
-            for (uint16_t low_bits = 0; low_bits < 1<<4; low_bits++) {
-                set_bit24(part_sum_a0_bitarrays[odd_even][part_sum_a0], state<<4 | low_bits);
+            for (uint16_t low_bits = 0; low_bits < 1 << 4; low_bits++) {
+                set_bit24(part_sum_a0_bitarrays[odd_even][part_sum_a0], state << 4 | low_bits);
             }
         }
     }
 
     for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
         for (uint16_t part_sum_a8 = 0; part_sum_a8 < NUM_PART_SUMS; part_sum_a8++) {
-            part_sum_a8_bitarrays[odd_even][part_sum_a8] = (uint32_t *)malloc_bitarray(sizeof(uint32_t) * (1<<19));
+            part_sum_a8_bitarrays[odd_even][part_sum_a8] = (uint32_t *)malloc_bitarray(sizeof(uint32_t) * (1 << 19));
             if (part_sum_a8_bitarrays[odd_even][part_sum_a8] == NULL) {
                 PrintAndLogEx(WARNING, "Out of memory error in init_part_suma8_statelists(). Aborting...\n");
                 exit(4);
@@ -429,10 +433,10 @@ static void init_part_sum_bitarrays(void)
     }
     for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
         //PrintAndLogEx(NORMAL, "(%d, %" PRIu16 ")...", odd_even, part_sum_a8);
-        for (uint32_t state = 0; state < (1<<20); state++) {
+        for (uint32_t state = 0; state < (1 << 20); state++) {
             uint16_t part_sum_a8 = PartialSumProperty(state, odd_even) / 2;
-            for (uint16_t high_bits = 0; high_bits < 1<<4; high_bits++) {
-                set_bit24(part_sum_a8_bitarrays[odd_even][part_sum_a8], state | high_bits<<20);
+            for (uint16_t high_bits = 0; high_bits < 1 << 4; high_bits++) {
+                set_bit24(part_sum_a8_bitarrays[odd_even][part_sum_a8], state | high_bits << 20);
             }
         }
     }
@@ -441,16 +445,16 @@ static void init_part_sum_bitarrays(void)
 
 static void free_part_sum_bitarrays(void)
 {
-    for (int16_t part_sum_a8 = (NUM_PART_SUMS-1); part_sum_a8 >= 0; part_sum_a8--) {
+    for (int16_t part_sum_a8 = (NUM_PART_SUMS - 1); part_sum_a8 >= 0; part_sum_a8--) {
         free_bitarray(part_sum_a8_bitarrays[ODD_STATE][part_sum_a8]);
     }
-    for (int16_t part_sum_a8 = (NUM_PART_SUMS-1); part_sum_a8 >= 0; part_sum_a8--) {
+    for (int16_t part_sum_a8 = (NUM_PART_SUMS - 1); part_sum_a8 >= 0; part_sum_a8--) {
         free_bitarray(part_sum_a8_bitarrays[EVEN_STATE][part_sum_a8]);
     }
-    for (int16_t part_sum_a0 = (NUM_PART_SUMS-1); part_sum_a0 >= 0; part_sum_a0--) {
+    for (int16_t part_sum_a0 = (NUM_PART_SUMS - 1); part_sum_a0 >= 0; part_sum_a0--) {
         free_bitarray(part_sum_a0_bitarrays[ODD_STATE][part_sum_a0]);
     }
-    for (int16_t part_sum_a0 = (NUM_PART_SUMS-1); part_sum_a0 >= 0; part_sum_a0--) {
+    for (int16_t part_sum_a0 = (NUM_PART_SUMS - 1); part_sum_a0 >= 0; part_sum_a0--) {
         free_bitarray(part_sum_a0_bitarrays[EVEN_STATE][part_sum_a0]);
     }
 }
@@ -460,7 +464,7 @@ static void init_sum_bitarrays(void)
 {
     for (uint16_t sum_a0 = 0; sum_a0 < NUM_SUMS; sum_a0++) {
         for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
-            sum_a0_bitarrays[odd_even][sum_a0] = (uint32_t *)malloc_bitarray(sizeof(uint32_t) * (1<<19));
+            sum_a0_bitarrays[odd_even][sum_a0] = (uint32_t *)malloc_bitarray(sizeof(uint32_t) * (1 << 19));
             if (sum_a0_bitarrays[odd_even][sum_a0] == NULL) {
                 PrintAndLogEx(WARNING, "Out of memory error in init_sum_bitarrays(). Aborting...\n");
                 exit(4);
@@ -470,7 +474,7 @@ static void init_sum_bitarrays(void)
     }
     for (uint8_t p = 0; p < NUM_PART_SUMS; p++) {
         for (uint8_t q = 0; q < NUM_PART_SUMS; q++) {
-            uint16_t sum_a0 = 2*p*(16-2*q) + (16-2*p)*2*q;
+            uint16_t sum_a0 = 2 * p * (16 - 2 * q) + (16 - 2 * p) * 2 * q;
             uint16_t sum_a0_idx = 0;
             while (sums[sum_a0_idx] != sum_a0) sum_a0_idx++;
             bitarray_OR(sum_a0_bitarrays[EVEN_STATE][sum_a0_idx], part_sum_a0_bitarrays[EVEN_STATE][q]);
@@ -483,7 +487,7 @@ static void init_sum_bitarrays(void)
 
 static void free_sum_bitarrays(void)
 {
-    for (int8_t sum_a0 = NUM_SUMS-1; sum_a0 >= 0; sum_a0--) {
+    for (int8_t sum_a0 = NUM_SUMS - 1; sum_a0 >= 0; sum_a0--) {
         free_bitarray(sum_a0_bitarrays[ODD_STATE][sum_a0]);
         free_bitarray(sum_a0_bitarrays[EVEN_STATE][sum_a0]);
     }
@@ -496,7 +500,7 @@ char failstr[250] = "";
 
 static const float p_K0[NUM_SUMS] = { // the probability that a random nonce has a Sum Property K
     0.0290, 0.0083, 0.0006, 0.0339, 0.0048, 0.0934, 0.0119, 0.0489, 0.0602, 0.4180, 0.0602, 0.0489, 0.0119, 0.0934, 0.0048, 0.0339, 0.0006, 0.0083, 0.0290
-    };
+};
 
 static float my_p_K[NUM_SUMS];
 
@@ -578,14 +582,14 @@ static void init_nonce_memory(void)
         for (uint16_t bitflip = 0x000; bitflip < 0x400; bitflip++) {
             nonces[i].BitFlips[bitflip] = 0;
         }
-        nonces[i].states_bitarray[EVEN_STATE] = (uint32_t *)malloc_bitarray(sizeof(uint32_t) * (1<<19));
+        nonces[i].states_bitarray[EVEN_STATE] = (uint32_t *)malloc_bitarray(sizeof(uint32_t) * (1 << 19));
         if (nonces[i].states_bitarray[EVEN_STATE] == NULL) {
             PrintAndLogEx(WARNING, "Out of memory error in init_nonce_memory(). Aborting...\n");
             exit(4);
         }
         set_bitarray24(nonces[i].states_bitarray[EVEN_STATE]);
         nonces[i].num_states_bitarray[EVEN_STATE] = 1 << 24;
-        nonces[i].states_bitarray[ODD_STATE] = (uint32_t *)malloc_bitarray(sizeof(uint32_t) * (1<<19));
+        nonces[i].states_bitarray[ODD_STATE] = (uint32_t *)malloc_bitarray(sizeof(uint32_t) * (1 << 19));
         if (nonces[i].states_bitarray[ODD_STATE] == NULL) {
             PrintAndLogEx(WARNING, "Out of memory error in init_nonce_memory(). Aborting...\n");
             exit(4);
@@ -643,29 +647,29 @@ static double p_hypergeometric(uint16_t i_K, uint16_t n, uint16_t k)
 
 
 
-    if (n-k > N-K || k > K) return 0.0; // avoids log(x<=0) in calculation below
+    if (n - k > N - K || k > K) return 0.0; // avoids log(x<=0) in calculation below
     if (k == 0) {
         // use logarithms to avoid overflow with huge factorials (double type can only hold 170!)
         double log_result = 0.0;
-        for (int16_t i = N-K; i >= N-K-n+1; i--) {
+        for (int16_t i = N - K; i >= N - K - n + 1; i--) {
             log_result += log(i);
         }
-        for (int16_t i = N; i >= N-n+1; i--) {
+        for (int16_t i = N; i >= N - n + 1; i--) {
             log_result -= log(i);
         }
         return exp(log_result);
     } else {
-        if (n-k == N-K) { // special case. The published recursion below would fail with a divide by zero exception
+        if (n - k == N - K) { // special case. The published recursion below would fail with a divide by zero exception
             double log_result = 0.0;
-            for (int16_t i = k+1; i <= n; i++) {
+            for (int16_t i = k + 1; i <= n; i++) {
                 log_result += log(i);
             }
-            for (int16_t i = K+1; i <= N; i++) {
+            for (int16_t i = K + 1; i <= N; i++) {
                 log_result -= log(i);
             }
             return exp(log_result);
         } else {          // recursion
-            return (p_hypergeometric(i_K, n, k-1) * (K-k+1) * (n-k+1) / (k * (N-K-n+k)));
+            return (p_hypergeometric(i_K, n, k - 1) * (K - k + 1) * (n - k + 1) / (k * (N - K - n + k)));
         }
     }
 }
@@ -681,7 +685,7 @@ static float sum_probability(uint16_t i_K, uint16_t n, uint16_t k)
     for (uint16_t i = 0; i < NUM_SUMS; i++) {
         p_T_is_k += p_K[i] * p_hypergeometric(i, n, k);
     }
-    return(p_T_is_k_when_S_is_K * p_S_is_K / p_T_is_k);
+    return (p_T_is_k_when_S_is_K * p_S_is_K / p_T_is_k);
 }
 
 
@@ -690,14 +694,14 @@ static uint32_t part_sum_count[2][NUM_PART_SUMS][NUM_PART_SUMS];
 static void init_allbitflips_array(void)
 {
     for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
-        uint32_t *bitset = all_bitflips_bitarray[odd_even] = (uint32_t *)malloc_bitarray(sizeof(uint32_t) * (1<<19));
+        uint32_t *bitset = all_bitflips_bitarray[odd_even] = (uint32_t *)malloc_bitarray(sizeof(uint32_t) * (1 << 19));
         if (bitset == NULL) {
             PrintAndLogEx(WARNING, "Out of memory in init_allbitflips_array(). Aborting...");
             exit(4);
         }
         set_bitarray24(bitset);
         all_bitflips_bitarray_dirty[odd_even] = false;
-        num_all_bitflips_bitarray[odd_even] = 1<<24;
+        num_all_bitflips_bitarray[odd_even] = 1 << 24;
     }
 }
 
@@ -737,15 +741,15 @@ static uint32_t estimated_num_states_part_sum(uint8_t first_byte, uint16_t part_
         return count_bitarray_AND4(part_sum_a0_bitarrays[odd_even][part_sum_a0_idx],
                                    part_sum_a8_bitarrays[odd_even][part_sum_a8_idx],
                                    nonces[first_byte].states_bitarray[odd_even],
-                                   nonces[first_byte^0x80].states_bitarray[odd_even]);
+                                   nonces[first_byte ^ 0x80].states_bitarray[odd_even]);
     }
 
     // estimate reduction by all_bitflips_match()
     // if (odd_even) {
-        // float p_bitflip = (float)nonces[first_byte ^ 0x80].num_states_bitarray[ODD_STATE] / num_all_bitflips_bitarray[ODD_STATE];
-        // return (float)count * p_bitflip; //(p_bitflip - 0.25*p_bitflip*p_bitflip);
+    // float p_bitflip = (float)nonces[first_byte ^ 0x80].num_states_bitarray[ODD_STATE] / num_all_bitflips_bitarray[ODD_STATE];
+    // return (float)count * p_bitflip; //(p_bitflip - 0.25*p_bitflip*p_bitflip);
     // } else {
-        // return count;
+    // return count;
     // }
 }
 
@@ -755,12 +759,12 @@ static uint64_t estimated_num_states(uint8_t first_byte, uint16_t sum_a0, uint16
     uint64_t num_states = 0;
     for (uint8_t p = 0; p < NUM_PART_SUMS; p++) {
         for (uint8_t q = 0; q < NUM_PART_SUMS; q++) {
-            if (2*p*(16-2*q) + (16-2*p)*2*q == sum_a0) {
+            if (2 * p * (16 - 2 * q) + (16 - 2 * p) * 2 * q == sum_a0) {
                 for (uint8_t r = 0; r < NUM_PART_SUMS; r++) {
                     for (uint8_t s = 0; s < NUM_PART_SUMS; s++) {
-                        if (2*r*(16-2*s) + (16-2*r)*2*s == sum_a8) {
+                        if (2 * r * (16 - 2 * s) + (16 - 2 * r) * 2 * s == sum_a8) {
                             num_states += (uint64_t)estimated_num_states_part_sum(first_byte, p, r, ODD_STATE)
-                                        * estimated_num_states_part_sum(first_byte, q, s, EVEN_STATE);
+                                          * estimated_num_states_part_sum(first_byte, q, s, EVEN_STATE);
                         }
                     }
                 }
@@ -776,12 +780,12 @@ static uint64_t estimated_num_states_coarse(uint16_t sum_a0, uint16_t sum_a8)
     uint64_t num_states = 0;
     for (uint8_t p = 0; p < NUM_PART_SUMS; p++) {
         for (uint8_t q = 0; q < NUM_PART_SUMS; q++) {
-            if (2*p*(16-2*q) + (16-2*p)*2*q == sum_a0) {
+            if (2 * p * (16 - 2 * q) + (16 - 2 * p) * 2 * q == sum_a0) {
                 for (uint8_t r = 0; r < NUM_PART_SUMS; r++) {
                     for (uint8_t s = 0; s < NUM_PART_SUMS; s++) {
-                        if (2*r*(16-2*s) + (16-2*r)*2*s == sum_a8) {
+                        if (2 * r * (16 - 2 * s) + (16 - 2 * r) * 2 * s == sum_a8) {
                             num_states += (uint64_t)estimated_num_states_part_sum_coarse(p, r, ODD_STATE)
-                                        * estimated_num_states_part_sum_coarse(q, s, EVEN_STATE);
+                                          * estimated_num_states_part_sum_coarse(q, s, EVEN_STATE);
                         }
                     }
                 }
@@ -807,7 +811,7 @@ static void update_p_K(void)
         }
         // PrintAndLogEx(NORMAL, "my_p_K = [");
         // for (uint8_t sum_a8_idx = 0; sum_a8_idx < NUM_SUMS; sum_a8_idx++) {
-            // PrintAndLogEx(NORMAL, "%7.4f ", my_p_K[sum_a8_idx]);
+        // PrintAndLogEx(NORMAL, "%7.4f ", my_p_K[sum_a8_idx]);
         // }
         p_K = my_p_K;
     }
@@ -827,7 +831,7 @@ static void update_sum_bitarrays(odd_even_t odd_even)
         for (uint8_t part_sum_a0 = 0; part_sum_a0 < NUM_PART_SUMS; part_sum_a0++) {
             for (uint8_t part_sum_a8 = 0; part_sum_a8 < NUM_PART_SUMS; part_sum_a8++) {
                 part_sum_count[odd_even][part_sum_a0][part_sum_a8]
-                    += count_bitarray_AND2(part_sum_a0_bitarrays[odd_even][part_sum_a0], part_sum_a8_bitarrays[odd_even][part_sum_a8]);
+                += count_bitarray_AND2(part_sum_a0_bitarrays[odd_even][part_sum_a0], part_sum_a8_bitarrays[odd_even][part_sum_a8]);
             }
         }
         all_bitflips_bitarray_dirty[odd_even] = false;
@@ -871,13 +875,14 @@ static float check_smallest_bitflip_bitarrays(void)
 #if defined (DEBUG_REDUCTION)
     num_odd = nonces[best_first_byte_smallest_bitarray].num_states_bitarray[ODD_STATE];
     num_even = nonces[best_first_byte_smallest_bitarray].num_states_bitarray[EVEN_STATE]; // * (float)nonces[best_first_byte_smallest_bitarray^0x80].num_states_bitarray[EVEN_STATE] / num_all_bitflips_bitarray[EVEN_STATE];
-    PrintAndLogEx(NORMAL, "0x%02x: %8d * %8d = %12" PRIu64 " (2^%1.1f)\n", best_first_byte_smallest_bitarray, num_odd, num_even, (uint64_t)num_odd * num_even, log((uint64_t)num_odd * num_even)/log(2.0));
+    PrintAndLogEx(NORMAL, "0x%02x: %8d * %8d = %12" PRIu64 " (2^%1.1f)\n", best_first_byte_smallest_bitarray, num_odd, num_even, (uint64_t)num_odd * num_even, log((uint64_t)num_odd * num_even) / log(2.0));
 #endif
-    return (float)smallest/2.0;
+    return (float)smallest / 2.0;
 }
 
 
-static void update_expected_brute_force(uint8_t best_byte) {
+static void update_expected_brute_force(uint8_t best_byte)
+{
 
     float total_prob = 0.0;
     for (uint8_t i = 0; i < NUM_SUMS; i++) {
@@ -919,7 +924,7 @@ static float sort_best_first_bytes(void)
     qsort(best_first_bytes, 256, 1, compare_expected_num_brute_force);
 
     // PrintAndLogEx(NORMAL, "refine estimations: ");
-    #define NUM_REFINES 1
+#define NUM_REFINES 1
     // refine scores for the best:
     for (uint16_t i = 0; i < NUM_REFINES; i++) {
         // PrintAndLogEx(NORMAL, "%d...", i);
@@ -928,35 +933,35 @@ static float sort_best_first_bytes(void)
             nonces[first_byte].sum_a8_guess[j].num_states = estimated_num_states(first_byte, sums[first_byte_Sum], sums[nonces[first_byte].sum_a8_guess[j].sum_a8_idx]);
         }
         // while (nonces[first_byte].sum_a8_guess[0].num_states == 0
-                // || nonces[first_byte].sum_a8_guess[1].num_states == 0
-                // || nonces[first_byte].sum_a8_guess[2].num_states == 0) {
-            // if (nonces[first_byte].sum_a8_guess[0].num_states == 0) {
-                // nonces[first_byte].sum_a8_guess[0].prob = 0.0;
-                // PrintAndLogEx(NORMAL, "(0x%02x,%d)", first_byte, 0);
-            // }
-            // if (nonces[first_byte].sum_a8_guess[1].num_states == 0) {
-                // nonces[first_byte].sum_a8_guess[1].prob = 0.0;
-                // PrintAndLogEx(NORMAL, "(0x%02x,%d)", first_byte, 1);
-            // }
-            // if (nonces[first_byte].sum_a8_guess[2].num_states == 0) {
-                // nonces[first_byte].sum_a8_guess[2].prob = 0.0;
-                // PrintAndLogEx(NORMAL, "(0x%02x,%d)", first_byte, 2);
-            // }
-            // PrintAndLogEx(NORMAL, "|");
-            // qsort(nonces[first_byte].sum_a8_guess, NUM_SUMS, sizeof(guess_sum_a8_t), compare_sum_a8_guess);
-            // for (uint8_t j = 0; j < NUM_SUMS && nonces[first_byte].sum_a8_guess[j].prob > 0.05; j++) {
-                // nonces[first_byte].sum_a8_guess[j].num_states = estimated_num_states(first_byte, sums[first_byte_Sum], sums[nonces[first_byte].sum_a8_guess[j].sum_a8_idx]);
-            // }
+        // || nonces[first_byte].sum_a8_guess[1].num_states == 0
+        // || nonces[first_byte].sum_a8_guess[2].num_states == 0) {
+        // if (nonces[first_byte].sum_a8_guess[0].num_states == 0) {
+        // nonces[first_byte].sum_a8_guess[0].prob = 0.0;
+        // PrintAndLogEx(NORMAL, "(0x%02x,%d)", first_byte, 0);
+        // }
+        // if (nonces[first_byte].sum_a8_guess[1].num_states == 0) {
+        // nonces[first_byte].sum_a8_guess[1].prob = 0.0;
+        // PrintAndLogEx(NORMAL, "(0x%02x,%d)", first_byte, 1);
+        // }
+        // if (nonces[first_byte].sum_a8_guess[2].num_states == 0) {
+        // nonces[first_byte].sum_a8_guess[2].prob = 0.0;
+        // PrintAndLogEx(NORMAL, "(0x%02x,%d)", first_byte, 2);
+        // }
+        // PrintAndLogEx(NORMAL, "|");
+        // qsort(nonces[first_byte].sum_a8_guess, NUM_SUMS, sizeof(guess_sum_a8_t), compare_sum_a8_guess);
+        // for (uint8_t j = 0; j < NUM_SUMS && nonces[first_byte].sum_a8_guess[j].prob > 0.05; j++) {
+        // nonces[first_byte].sum_a8_guess[j].num_states = estimated_num_states(first_byte, sums[first_byte_Sum], sums[nonces[first_byte].sum_a8_guess[j].sum_a8_idx]);
+        // }
         // }
         // float fix_probs = 0.0;
         // for (uint8_t j = 0; j < NUM_SUMS; j++) {
-            // fix_probs += nonces[first_byte].sum_a8_guess[j].prob;
+        // fix_probs += nonces[first_byte].sum_a8_guess[j].prob;
         // }
         // for (uint8_t j = 0; j < NUM_SUMS; j++) {
-            // nonces[first_byte].sum_a8_guess[j].prob /= fix_probs;
+        // nonces[first_byte].sum_a8_guess[j].prob /= fix_probs;
         // }
         // for (uint8_t j = 0; j < NUM_SUMS && nonces[first_byte].sum_a8_guess[j].prob > 0.05; j++) {
-            // nonces[first_byte].sum_a8_guess[j].num_states = estimated_num_states(first_byte, sums[first_byte_Sum], sums[nonces[first_byte].sum_a8_guess[j].sum_a8_idx]);
+        // nonces[first_byte].sum_a8_guess[j].num_states = estimated_num_states(first_byte, sums[first_byte_Sum], sums[nonces[first_byte].sum_a8_guess[j].sum_a8_idx]);
         // }
         float prob_all_failed = 1.0;
         nonces[first_byte].expected_num_brute_force = 0.0;
@@ -993,17 +998,17 @@ static float update_reduction_rate(float last, bool init)
 #define QUEUE_LEN 4
     static float queue[QUEUE_LEN];
 
-    for (uint16_t i = 0; i < QUEUE_LEN-1; i++) {
+    for (uint16_t i = 0; i < QUEUE_LEN - 1; i++) {
         if (init) {
             queue[i] = (float)(1LL << 48);
         } else {
-            queue[i] = queue[i+1];
+            queue[i] = queue[i + 1];
         }
     }
     if (init) {
-        queue[QUEUE_LEN-1] = (float)(1LL << 48);
+        queue[QUEUE_LEN - 1] = (float)(1LL << 48);
     } else {
-        queue[QUEUE_LEN-1] = last;
+        queue[QUEUE_LEN - 1] = last;
     }
 
     // linear regression
@@ -1019,8 +1024,8 @@ static float update_reduction_rate(float last, bool init)
     float dev_xy = 0.0;
     float dev_x2 = 0.0;
     for (uint16_t i = 0; i < QUEUE_LEN; i++) {
-        dev_xy += (i - avg_x)*(queue[i] - avg_y);
-        dev_x2 += (i - avg_x)*(i - avg_x);
+        dev_xy += (i - avg_x) * (queue[i] - avg_y);
+        dev_x2 += (i - avg_x) * (i - avg_x);
     }
 
     float reduction_rate = -1.0 * dev_xy / dev_x2;  // the negative slope of the linear regression
@@ -1047,8 +1052,8 @@ static bool shrink_key_space(float *brute_forces)
 
 //iceman 2018
     return ((hardnested_stage & CHECK_2ND_BYTES) &&
-                reduction_rate >= 0.0 &&
-               ( reduction_rate < brute_force_per_second * (float)sample_period / 1000.0  || *brute_forces < 0x1F00000000));
+            reduction_rate >= 0.0 &&
+            (reduction_rate < brute_force_per_second * (float)sample_period / 1000.0  || *brute_forces < 0x1F00000000));
 }
 
 
@@ -1057,7 +1062,7 @@ static void estimate_sum_a8(void)
     if (first_byte_num == 256) {
         for (uint16_t i = 0; i < 256; i++) {
             if (nonces[i].sum_a8_guess_dirty) {
-                for (uint16_t j = 0; j < NUM_SUMS; j++ ) {
+                for (uint16_t j = 0; j < NUM_SUMS; j++) {
                     uint16_t sum_a8_idx = nonces[i].sum_a8_guess[j].sum_a8_idx;
                     nonces[i].sum_a8_guess[j].prob = sum_probability(sum_a8_idx, nonces[i].num, nonces[i].Sum);
                 }
@@ -1072,7 +1077,7 @@ static void estimate_sum_a8(void)
 static int read_nonce_file(char *filename)
 {
     FILE *fnonces = NULL;
-    char progress_text[80]="";
+    char progress_text[80] = "";
     size_t bytes_read;
     uint8_t trgBlockNo;
     uint8_t trgKeyType;
@@ -1081,12 +1086,12 @@ static int read_nonce_file(char *filename)
     uint8_t par_enc;
 
     num_acquired_nonces = 0;
-    if ((fnonces = fopen(filename,"rb")) == NULL) {
-        PrintAndLogEx(WARNING, "Could not open file %s",filename);
+    if ((fnonces = fopen(filename, "rb")) == NULL) {
+        PrintAndLogEx(WARNING, "Could not open file %s", filename);
         return 1;
     }
-    snprintf(progress_text, 80, "Reading nonces from file %s...",filename);
-    hardnested_print_progress(0, progress_text, (float)(1LL<<47), 0);
+    snprintf(progress_text, 80, "Reading nonces from file %s...", filename);
+    hardnested_print_progress(0, progress_text, (float)(1LL << 47), 0);
     bytes_read = fread(read_buf, 1, 6, fnonces);
     if (bytes_read != 6) {
         PrintAndLogEx(WARNING, "File reading error.");
@@ -1094,14 +1099,14 @@ static int read_nonce_file(char *filename)
         return 1;
     }
     cuid = bytes_to_num(read_buf, 4);
-    trgBlockNo = bytes_to_num(read_buf+4, 1);
-    trgKeyType = bytes_to_num(read_buf+5, 1);
+    trgBlockNo = bytes_to_num(read_buf + 4, 1);
+    trgKeyType = bytes_to_num(read_buf + 5, 1);
 
     bytes_read = fread(read_buf, 1, 9, fnonces);
     while (bytes_read == 9) {
         nt_enc1 = bytes_to_num(read_buf, 4);
-        nt_enc2 = bytes_to_num(read_buf+4, 4);
-        par_enc = bytes_to_num(read_buf+8, 1);
+        nt_enc2 = bytes_to_num(read_buf + 4, 4);
+        par_enc = bytes_to_num(read_buf + 8, 1);
         add_nonce(nt_enc1, par_enc >> 4);
         add_nonce(nt_enc2, par_enc & 0x0f);
         num_acquired_nonces += 2;
@@ -1111,9 +1116,9 @@ static int read_nonce_file(char *filename)
 
     char progress_string[80];
     sprintf(progress_string, "Read %d nonces from file. cuid=%08x", num_acquired_nonces, cuid);
-    hardnested_print_progress(num_acquired_nonces, progress_string, (float)(1LL<<47), 0);
-    sprintf(progress_string, "Target Block=%d, Keytype=%c", trgBlockNo, trgKeyType==0?'A':'B');
-    hardnested_print_progress(num_acquired_nonces, progress_string, (float)(1LL<<47), 0);
+    hardnested_print_progress(num_acquired_nonces, progress_string, (float)(1LL << 47), 0);
+    sprintf(progress_string, "Target Block=%d, Keytype=%c", trgBlockNo, trgKeyType == 0 ? 'A' : 'B');
+    hardnested_print_progress(num_acquired_nonces, progress_string, (float)(1LL << 47), 0);
 
     for (uint16_t i = 0; i < NUM_SUMS; i++) {
         if (first_byte_Sum == sums[i]) {
@@ -1169,9 +1174,9 @@ __attribute__((force_align_arg_pointer))
             }
             for (uint16_t i = first_byte; i <= last_byte; i++) {
                 if (nonces[i].BitFlips[bitflip] == 0 && nonces[i].BitFlips[bitflip ^ 0x100] == 0
-                    && nonces[i].first != NULL && nonces[i^(bitflip&0xff)].first != NULL) {
+                    && nonces[i].first != NULL && nonces[i ^ (bitflip & 0xff)].first != NULL) {
                     uint8_t parity1 = (nonces[i].first->par_enc) >> 3;                  // parity of first byte
-                    uint8_t parity2 = (nonces[i^(bitflip&0xff)].first->par_enc) >> 3;   // parity of nonce with bits flipped
+                    uint8_t parity2 = (nonces[i ^ (bitflip & 0xff)].first->par_enc) >> 3; // parity of nonce with bits flipped
                     if ((parity1 == parity2 && !(bitflip & 0x100))          // bitflip
                         || (parity1 != parity2 && (bitflip & 0x100))) {     // not bitflip
                         nonces[i].BitFlips[bitflip] = 1;
@@ -1208,12 +1213,12 @@ __attribute__((force_align_arg_pointer))
                 if (nonces[i].BitFlips[bitflip] == 0) {
                     for (uint16_t j = 0; j < 256; j++) { // for each 2nd Byte
                         noncelistentry_t *byte1 = SearchFor2ndByte(i, j);
-                        noncelistentry_t *byte2 = SearchFor2ndByte(i, j^(bitflip&0xff));
+                        noncelistentry_t *byte2 = SearchFor2ndByte(i, j ^ (bitflip & 0xff));
                         if (byte1 != NULL && byte2 != NULL) {
                             uint8_t parity1 = byte1->par_enc >> 2 & 0x01; // parity of 2nd byte
                             uint8_t parity2 = byte2->par_enc >> 2 & 0x01; // parity of 2nd byte with bits flipped
-                            if ((parity1 == parity2 && !(bitflip&0x100))  // bitflip
-                                || (parity1 != parity2 && (bitflip&0x100))) { // not bitflip
+                            if ((parity1 == parity2 && !(bitflip & 0x100)) // bitflip
+                                || (parity1 != parity2 && (bitflip & 0x100))) { // not bitflip
                                 nonces[i].BitFlips[bitflip] = 1;
                                 for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
                                     if (bitflip_bitarrays[odd_even][bitflip] != NULL) {
@@ -1221,7 +1226,7 @@ __attribute__((force_align_arg_pointer))
                                         nonces[i].num_states_bitarray[odd_even] = count_bitarray_AND(nonces[i].states_bitarray[odd_even], bitflip_bitarrays[odd_even][bitflip]);
                                         if (nonces[i].num_states_bitarray[odd_even] != old_count) {
                                             nonces[i].all_bitflips_dirty[odd_even] = true;
-                                         }
+                                        }
                                     }
                                 }
                                 break;
@@ -1245,13 +1250,13 @@ static void check_for_BitFlipProperties(bool time_budget)
     pthread_t thread_id[NUM_CHECK_BITFLIPS_THREADS];
 
     uint8_t args[NUM_CHECK_BITFLIPS_THREADS][3];
-    uint16_t bytes_per_thread = (256 + (NUM_CHECK_BITFLIPS_THREADS/2)) / NUM_CHECK_BITFLIPS_THREADS;
+    uint16_t bytes_per_thread = (256 + (NUM_CHECK_BITFLIPS_THREADS / 2)) / NUM_CHECK_BITFLIPS_THREADS;
     for (uint8_t i = 0; i < NUM_CHECK_BITFLIPS_THREADS; i++) {
         args[i][0] = i * bytes_per_thread;
-        args[i][1] = MIN(args[i][0]+bytes_per_thread-1, 255);
+        args[i][1] = MIN(args[i][0] + bytes_per_thread - 1, 255);
         args[i][2] = time_budget;
     }
-    args[NUM_CHECK_BITFLIPS_THREADS-1][1] = MAX(args[NUM_CHECK_BITFLIPS_THREADS-1][1], 255);
+    args[NUM_CHECK_BITFLIPS_THREADS - 1][1] = MAX(args[NUM_CHECK_BITFLIPS_THREADS - 1][1], 255);
 
     // start threads
     for (uint8_t i = 0; i < NUM_CHECK_BITFLIPS_THREADS; i++) {
@@ -1309,7 +1314,7 @@ static void simulate_MFplus_RNG(uint32_t test_cuid, uint64_t test_key, uint32_t
     struct Crypto1State sim_cs = {0, 0};
 
     // init cryptostate with key:
-    for(int8_t i = 47; i > 0; i -= 2) {
+    for (int8_t i = 47; i > 0; i -= 2) {
         sim_cs.odd  = sim_cs.odd  << 1 | BIT(test_key, (i - 1) ^ 7);
         sim_cs.even = sim_cs.even << 1 | BIT(test_key, i ^ 7);
     }
@@ -1317,8 +1322,8 @@ static void simulate_MFplus_RNG(uint32_t test_cuid, uint64_t test_key, uint32_t
     *par_enc = 0;
     uint32_t nt = (rand() & 0xff) << 24 | (rand() & 0xff) << 16 | (rand() & 0xff) << 8 | (rand() & 0xff);
     for (int8_t byte_pos = 3; byte_pos >= 0; byte_pos--) {
-        uint8_t nt_byte_dec = (nt >> (8*byte_pos)) & 0xff;
-        uint8_t nt_byte_enc = crypto1_byte(&sim_cs, nt_byte_dec ^ (test_cuid >> (8*byte_pos)), false) ^ nt_byte_dec;  // encode the nonce byte
+        uint8_t nt_byte_dec = (nt >> (8 * byte_pos)) & 0xff;
+        uint8_t nt_byte_enc = crypto1_byte(&sim_cs, nt_byte_dec ^ (test_cuid >> (8 * byte_pos)), false) ^ nt_byte_dec; // encode the nonce byte
         *nt_enc = (*nt_enc << 8) | nt_byte_enc;
         uint8_t ks_par = filter(sim_cs.odd);                         // the keystream bit to encode/decode the parity bit
         uint8_t nt_byte_par_enc = ks_par ^ oddparity8(nt_byte_dec);  // determine the nt byte's parity and encode it
@@ -1346,7 +1351,7 @@ static void simulate_acquire_nonces()
 
     char progress_text[80];
     sprintf(progress_text, "Simulating key %012" PRIx64 ", cuid %08" PRIx32 " ...", known_target_key, cuid);
-    hardnested_print_progress(0, progress_text, (float)(1LL<<47), 0);
+    hardnested_print_progress(0, progress_text, (float)(1LL << 47), 0);
     fprintf(fstats, "%012" PRIx64 ";%" PRIx32 ";", known_target_key, cuid);
 
     num_acquired_nonces = 0;
@@ -1363,7 +1368,7 @@ static void simulate_acquire_nonces()
 
         last_sample_clock = msclock();
 
-        if (first_byte_num == 256 ) {
+        if (first_byte_num == 256) {
             if (hardnested_stage == CHECK_1ST_BYTES) {
                 for (uint16_t i = 0; i < NUM_SUMS; i++) {
                     if (first_byte_Sum == sums[i]) {
@@ -1393,12 +1398,12 @@ static void simulate_acquire_nonces()
 
     time_t end_time = time(NULL);
     // PrintAndLogEx(NORMAL, "Acquired a total of %" PRId32" nonces in %1.0f seconds (%1.0f nonces/minute)",
-        // num_acquired_nonces,
-        // difftime(end_time, time1),
-        // difftime(end_time, time1)!=0.0?(float)total_num_nonces*60.0/difftime(end_time, time1):INFINITY
-        // );
+    // num_acquired_nonces,
+    // difftime(end_time, time1),
+    // difftime(end_time, time1)!=0.0?(float)total_num_nonces*60.0/difftime(end_time, time1):INFINITY
+    // );
 
-    fprintf(fstats, "%" PRId32 ";%" PRId32 ";%1.0f;", total_num_nonces, num_acquired_nonces, difftime(end_time,time1));
+    fprintf(fstats, "%" PRId32 ";%" PRId32 ";%1.0f;", total_num_nonces, num_acquired_nonces, difftime(end_time, time1));
 
 }
 
@@ -1449,12 +1454,12 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
 
             cuid = resp.arg[1];
             if (nonce_file_write && fnonces == NULL) {
-                if ((fnonces = fopen(filename,"wb")) == NULL) {
+                if ((fnonces = fopen(filename, "wb")) == NULL) {
                     PrintAndLogEx(WARNING, "Could not create file %s", filename);
                     return 3;
                 }
                 snprintf(progress_text, 80, "Writing acquired nonces to binary file %s", filename);
-                hardnested_print_progress(0, progress_text, (float)(1LL<<47), 0);
+                hardnested_print_progress(0, progress_text, (float)(1LL << 47), 0);
                 num_to_bytes(cuid, 4, write_buf);
                 fwrite(write_buf, 1, 4, fnonces);
                 fwrite(&trgBlockNo, 1, 1, fnonces);
@@ -1468,10 +1473,10 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
             uint8_t par_enc;
             uint16_t num_sampled_nonces = resp.arg[2];
             uint8_t *bufp = resp.d.asBytes;
-            for (uint16_t i = 0; i < num_sampled_nonces; i+=2) {
+            for (uint16_t i = 0; i < num_sampled_nonces; i += 2) {
                 nt_enc1 = bytes_to_num(bufp, 4);
-                nt_enc2 = bytes_to_num(bufp+4, 4);
-                par_enc = bytes_to_num(bufp+8, 1);
+                nt_enc2 = bytes_to_num(bufp + 4, 4);
+                par_enc = bytes_to_num(bufp + 8, 1);
 
                 //PrintAndLogEx(NORMAL, "Encrypted nonce: %08x, encrypted_parity: %02x\n", nt_enc1, par_enc >> 4);
                 num_acquired_nonces += add_nonce(nt_enc1, par_enc >> 4);
@@ -1486,7 +1491,7 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
             }
             total_num_nonces += num_sampled_nonces;
 
-            if (first_byte_num == 256 ) {
+            if (first_byte_num == 256) {
                 if (hardnested_stage == CHECK_1ST_BYTES) {
                     for (uint16_t i = 0; i < NUM_SUMS; i++) {
                         if (first_byte_Sum == sums[i]) {
@@ -1547,9 +1552,9 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
     }
 
     // PrintAndLogEx(NORMAL, "Sampled a total of %d nonces in %d seconds (%0.0f nonces/minute)",
-        // total_num_nonces,
-        // time(NULL)-time1,
-        // (float)total_num_nonces*60.0/(time(NULL)-time1));
+    // total_num_nonces,
+    // time(NULL)-time1,
+    // (float)total_num_nonces*60.0/(time(NULL)-time1));
 
     return 0;
 }
@@ -1557,9 +1562,9 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
 
 static inline bool invariant_holds(uint_fast8_t byte_diff, uint_fast32_t state1, uint_fast32_t state2, uint_fast8_t bit, uint_fast8_t state_bit)
 {
-    uint_fast8_t j_1_bit_mask = 0x01 << (bit-1);
+    uint_fast8_t j_1_bit_mask = 0x01 << (bit - 1);
     uint_fast8_t bit_diff = byte_diff & j_1_bit_mask;                                               // difference of (j-1)th bit
-    uint_fast8_t filter_diff = filter(state1 >> (4-state_bit)) ^ filter(state2 >> (4-state_bit));   // difference in filter function
+    uint_fast8_t filter_diff = filter(state1 >> (4 - state_bit)) ^ filter(state2 >> (4 - state_bit)); // difference in filter function
     uint_fast8_t mask_y12_y13 = 0xc0 >> state_bit;
     uint_fast8_t state_bits_diff = (state1 ^ state2) & mask_y12_y13;                                // difference in state bits 12 and 13
     uint_fast8_t all_diff = evenparity8(bit_diff ^ state_bits_diff ^ filter_diff);                  // use parity function to XOR all bits
@@ -1583,25 +1588,40 @@ static inline bool remaining_bits_match(uint_fast8_t num_common_bits, uint_fast8
     if (odd_even) {
         // odd bits
         switch (num_common_bits) {
-            case 0: if (!invariant_holds(byte_diff, state1, state2, 1, 0)) return true;
-            case 1: if (invalid_state(byte_diff, state1, state2, 1, 0)) return false;
-            case 2: if (!invariant_holds(byte_diff, state1, state2, 3, 1)) return true;
-            case 3: if (invalid_state(byte_diff, state1, state2, 3, 1)) return false;
-            case 4: if (!invariant_holds(byte_diff, state1, state2, 5, 2)) return true;
-            case 5: if (invalid_state(byte_diff, state1, state2, 5, 2)) return false;
-            case 6: if (!invariant_holds(byte_diff, state1, state2, 7, 3)) return true;
-            case 7: if (invalid_state(byte_diff, state1, state2, 7, 3)) return false;
+            case 0:
+                if (!invariant_holds(byte_diff, state1, state2, 1, 0)) return true;
+            case 1:
+                if (invalid_state(byte_diff, state1, state2, 1, 0)) return false;
+            case 2:
+                if (!invariant_holds(byte_diff, state1, state2, 3, 1)) return true;
+            case 3:
+                if (invalid_state(byte_diff, state1, state2, 3, 1)) return false;
+            case 4:
+                if (!invariant_holds(byte_diff, state1, state2, 5, 2)) return true;
+            case 5:
+                if (invalid_state(byte_diff, state1, state2, 5, 2)) return false;
+            case 6:
+                if (!invariant_holds(byte_diff, state1, state2, 7, 3)) return true;
+            case 7:
+                if (invalid_state(byte_diff, state1, state2, 7, 3)) return false;
         }
     } else {
         // even bits
         switch (num_common_bits) {
-            case 0: if (invalid_state(byte_diff, state1, state2, 0, 0)) return false;
-            case 1: if (!invariant_holds(byte_diff, state1, state2, 2, 1)) return true;
-            case 2: if (invalid_state(byte_diff, state1, state2, 2, 1)) return false;
-            case 3: if (!invariant_holds(byte_diff, state1, state2, 4, 2)) return true;
-            case 4: if (invalid_state(byte_diff, state1, state2, 4, 2)) return false;
-            case 5: if (!invariant_holds(byte_diff, state1, state2, 6, 3)) return true;
-            case 6: if (invalid_state(byte_diff, state1, state2, 6, 3)) return false;
+            case 0:
+                if (invalid_state(byte_diff, state1, state2, 0, 0)) return false;
+            case 1:
+                if (!invariant_holds(byte_diff, state1, state2, 2, 1)) return true;
+            case 2:
+                if (invalid_state(byte_diff, state1, state2, 2, 1)) return false;
+            case 3:
+                if (!invariant_holds(byte_diff, state1, state2, 4, 2)) return true;
+            case 4:
+                if (invalid_state(byte_diff, state1, state2, 4, 2)) return false;
+            case 5:
+                if (!invariant_holds(byte_diff, state1, state2, 6, 3)) return true;
+            case 6:
+                if (invalid_state(byte_diff, state1, state2, 6, 3)) return false;
         }
     }
 
@@ -1623,7 +1643,7 @@ static struct sl_cache_entry {
     uint32_t *sl;
     uint32_t len;
     work_status_t cache_status;
-    } sl_cache[NUM_PART_SUMS][NUM_PART_SUMS][2];
+} sl_cache[NUM_PART_SUMS][NUM_PART_SUMS][2];
 
 
 static void init_statelist_cache(void)
@@ -1667,8 +1687,8 @@ static inline bool bitflips_match(uint8_t byte, uint32_t state, odd_even_t odd_e
     if (!possible) {
 #ifdef DEBUG_KEY_ELIMINATION
         if (!quiet && known_target_key != -1 && state == test_state[odd_even]) {
-            PrintAndLogEx(NORMAL, "Initial state lists: %s test state eliminated by bitflip property.\n", odd_even==EVEN_STATE?"even":"odd");
-            sprintf(failstr, "Initial %s Byte Bitflip property", odd_even==EVEN_STATE?"even":"odd");
+            PrintAndLogEx(NORMAL, "Initial state lists: %s test state eliminated by bitflip property.\n", odd_even == EVEN_STATE ? "even" : "odd");
+            sprintf(failstr, "Initial %s Byte Bitflip property", odd_even == EVEN_STATE ? "even" : "odd");
         }
 #endif
         return false;
@@ -1690,7 +1710,8 @@ static uint_fast8_t reverse(uint_fast8_t b)
 static bool all_bitflips_match(uint8_t byte, uint32_t state, odd_even_t odd_even)
 {
     uint32_t masks[2][8] = {{0x00fffff0, 0x00fffff8, 0x00fffff8, 0x00fffffc, 0x00fffffc, 0x00fffffe, 0x00fffffe, 0x00ffffff},
-                            {0x00fffff0, 0x00fffff0, 0x00fffff8, 0x00fffff8, 0x00fffffc, 0x00fffffc, 0x00fffffe, 0x00fffffe} };
+        {0x00fffff0, 0x00fffff0, 0x00fffff8, 0x00fffff8, 0x00fffffc, 0x00fffffc, 0x00fffffe, 0x00fffffe}
+    };
 
     for (uint16_t i = 1; i < 256; i++) {
         uint_fast8_t bytes_diff = reverse(i); // start with most common bits
@@ -1714,11 +1735,11 @@ static bool all_bitflips_match(uint8_t byte, uint32_t state, odd_even_t odd_even
 #ifdef DEBUG_KEY_ELIMINATION
             if (known_target_key != -1 && state == test_state[odd_even]) {
                 PrintAndLogEx(NORMAL, "all_bitflips_match() 1st Byte: %s test state (0x%06x): Eliminated. Bytes = %02x, %02x, Common Bits = %d\n",
-                    odd_even == ODD_STATE ? "odd" : "even",
-                    test_state[odd_even],
-                    byte,
-                    byte2,
-                    num_common);
+                              odd_even == ODD_STATE ? "odd" : "even",
+                              test_state[odd_even],
+                              byte,
+                              byte2,
+                              num_common);
                 if (failstr[0] == '\0') {
                     sprintf(failstr, "Other 1st Byte %s, all_bitflips_match(), no match", odd_even ? "odd" : "even");
                 }
@@ -1734,7 +1755,7 @@ static bool all_bitflips_match(uint8_t byte, uint32_t state, odd_even_t odd_even
 static void bitarray_to_list(uint8_t byte, uint32_t *bitarray, uint32_t *state_list, uint32_t *len, odd_even_t odd_even)
 {
     uint32_t *p = state_list;
-    for (uint32_t state = next_state(bitarray, -1L); state < (1<<24); state = next_state(bitarray, state)) {
+    for (uint32_t state = next_state(bitarray, -1L); state < (1 << 24); state = next_state(bitarray, state)) {
         if (all_bitflips_match(byte, state, odd_even)) {
             *p++ = state;
         }
@@ -1747,15 +1768,15 @@ static void bitarray_to_list(uint8_t byte, uint32_t *bitarray, uint32_t *state_l
 
 static void add_cached_states(statelist_t *candidates, uint16_t part_sum_a0, uint16_t part_sum_a8, odd_even_t odd_even)
 {
-    candidates->states[odd_even] = sl_cache[part_sum_a0/2][part_sum_a8/2][odd_even].sl;
-    candidates->len[odd_even] = sl_cache[part_sum_a0/2][part_sum_a8/2][odd_even].len;
+    candidates->states[odd_even] = sl_cache[part_sum_a0 / 2][part_sum_a8 / 2][odd_even].sl;
+    candidates->len[odd_even] = sl_cache[part_sum_a0 / 2][part_sum_a8 / 2][odd_even].len;
     return;
 }
 
 
 static void add_matching_states(statelist_t *candidates, uint8_t part_sum_a0, uint8_t part_sum_a8, odd_even_t odd_even)
 {
-    uint32_t worstcase_size = 1<<20;
+    uint32_t worstcase_size = 1 << 20;
     candidates->states[odd_even] = (uint32_t *)malloc(sizeof(uint32_t) * worstcase_size);
     if (candidates->states[odd_even] == NULL) {
         PrintAndLogEx(WARNING, "Out of memory error in add_matching_states() - statelist.\n");
@@ -1768,8 +1789,8 @@ static void add_matching_states(statelist_t *candidates, uint8_t part_sum_a0, ui
         exit(4);
     }
 
-    uint32_t *bitarray_a0 = part_sum_a0_bitarrays[odd_even][part_sum_a0/2];
-    uint32_t *bitarray_a8 = part_sum_a8_bitarrays[odd_even][part_sum_a8/2];
+    uint32_t *bitarray_a0 = part_sum_a0_bitarrays[odd_even][part_sum_a0 / 2];
+    uint32_t *bitarray_a8 = part_sum_a8_bitarrays[odd_even][part_sum_a8 / 2];
     uint32_t *bitarray_bitflips = nonces[best_first_bytes[0]].states_bitarray[odd_even];
 
     bitarray_AND4(candidates_bitarray, bitarray_a0, bitarray_a8, bitarray_bitflips);
@@ -1785,9 +1806,9 @@ static void add_matching_states(statelist_t *candidates, uint8_t part_sum_a0, ui
     free_bitarray(candidates_bitarray);
 
     pthread_mutex_lock(&statelist_cache_mutex);
-    sl_cache[part_sum_a0/2][part_sum_a8/2][odd_even].sl = candidates->states[odd_even];
-    sl_cache[part_sum_a0/2][part_sum_a8/2][odd_even].len = candidates->len[odd_even];
-    sl_cache[part_sum_a0/2][part_sum_a8/2][odd_even].cache_status = COMPLETED;
+    sl_cache[part_sum_a0 / 2][part_sum_a8 / 2][odd_even].sl = candidates->states[odd_even];
+    sl_cache[part_sum_a0 / 2][part_sum_a8 / 2][odd_even].len = candidates->len[odd_even];
+    sl_cache[part_sum_a0 / 2][part_sum_a8 / 2][odd_even].cache_status = COMPLETED;
     pthread_mutex_unlock(&statelist_cache_mutex);
     return;
 }
@@ -1916,12 +1937,12 @@ __attribute__((force_align_arg_pointer))
         there_might_be_more_work = false;
         for (uint8_t p = 0; p < NUM_PART_SUMS; p++) {
             for (uint8_t q = 0; q < NUM_PART_SUMS; q++) {
-                if (2*p*(16-2*q) + (16-2*p)*2*q == sum_a0) {
+                if (2 * p * (16 - 2 * q) + (16 - 2 * p) * 2 * q == sum_a0) {
                     // PrintAndLogEx(NORMAL, "Reducing Partial Statelists (p,q) = (%d,%d) with lengths %d, %d\n",
-                            // p, q, partial_statelist[p].len[ODD_STATE], partial_statelist[q].len[EVEN_STATE]);
+                    // p, q, partial_statelist[p].len[ODD_STATE], partial_statelist[q].len[EVEN_STATE]);
                     for (uint8_t r = 0; r < NUM_PART_SUMS; r++) {
                         for (uint8_t s = 0; s < NUM_PART_SUMS; s++) {
-                            if (2*r*(16-2*s) + (16-2*r)*2*s == sum_a8) {
+                            if (2 * r * (16 - 2 * s) + (16 - 2 * r) * 2 * s == sum_a8) {
                                 pthread_mutex_lock(&book_of_work_mutex);
                                 if (book_of_work[p][q][r][s] != TO_BE_DONE) {  // this has been done or is currently been done by another thread. Look for some other work.
                                     pthread_mutex_unlock(&book_of_work_mutex);
@@ -1944,12 +1965,12 @@ __attribute__((force_align_arg_pointer))
                                 // Check for cached results and add them first
                                 bool odd_completed = false;
                                 if (sl_cache[p][r][ODD_STATE].cache_status == COMPLETED) {
-                                    add_cached_states(current_candidates, 2*p, 2*r, ODD_STATE);
+                                    add_cached_states(current_candidates, 2 * p, 2 * r, ODD_STATE);
                                     odd_completed = true;
                                 }
                                 bool even_completed = false;
                                 if (sl_cache[q][s][EVEN_STATE].cache_status == COMPLETED) {
-                                    add_cached_states(current_candidates, 2*q, 2*s, EVEN_STATE);
+                                    add_cached_states(current_candidates, 2 * q, 2 * s, EVEN_STATE);
                                     even_completed = true;
                                 }
 
@@ -1984,14 +2005,14 @@ __attribute__((force_align_arg_pointer))
                                         sl_cache[p][r][ODD_STATE].cache_status = WORK_IN_PROGRESS;
                                         pthread_mutex_unlock(&statelist_cache_mutex);
                                         pthread_mutex_unlock(&book_of_work_mutex);
-                                        add_matching_states(current_candidates, 2*p, 2*r, ODD_STATE);
+                                        add_matching_states(current_candidates, 2 * p, 2 * r, ODD_STATE);
                                         work_required = false;
                                     } else if (odd_completed) { // we had one cache hit with non-zero odd_states
                                         // PrintAndLogEx(NORMAL, "Thread #%u: start working on even states q=%2d, s=%2d...\n", my_thread_number, q, s);
                                         sl_cache[q][s][EVEN_STATE].cache_status = WORK_IN_PROGRESS;
                                         pthread_mutex_unlock(&statelist_cache_mutex);
                                         pthread_mutex_unlock(&book_of_work_mutex);
-                                        add_matching_states(current_candidates, 2*q, 2*s, EVEN_STATE);
+                                        add_matching_states(current_candidates, 2 * q, 2 * s, EVEN_STATE);
                                         work_required = false;
                                     }
                                 }
@@ -2002,10 +2023,10 @@ __attribute__((force_align_arg_pointer))
                                     pthread_mutex_unlock(&statelist_cache_mutex);
                                     pthread_mutex_unlock(&book_of_work_mutex);
 
-                                    add_matching_states(current_candidates, 2*p, 2*r, ODD_STATE);
-                                    if(current_candidates->len[ODD_STATE]) {
+                                    add_matching_states(current_candidates, 2 * p, 2 * r, ODD_STATE);
+                                    if (current_candidates->len[ODD_STATE]) {
                                         // PrintAndLogEx(NORMAL, "Thread #%u: start working on even states q=%2d, s=%2d...\n", my_thread_number, q, s);
-                                        add_matching_states(current_candidates, 2*q, 2*s, EVEN_STATE);
+                                        add_matching_states(current_candidates, 2 * q, 2 * s, EVEN_STATE);
                                     } else { // no need to calculate even states yet
                                         pthread_mutex_lock(&statelist_cache_mutex);
                                         sl_cache[q][s][EVEN_STATE].cache_status = TO_BE_DONE;
@@ -2021,18 +2042,18 @@ __attribute__((force_align_arg_pointer))
                                 pthread_mutex_unlock(&book_of_work_mutex);
 
                                 // if ((uint64_t)current_candidates->len[ODD_STATE] * current_candidates->len[EVEN_STATE]) {
-                                    // PrintAndLogEx(NORMAL, "Candidates for p=%2u, q=%2u, r=%2u, s=%2u: %" PRIu32 " * %" PRIu32 " = %" PRIu64 " (2^%0.1f)\n",
-                                        // 2*p, 2*q, 2*r, 2*s, current_candidates->len[ODD_STATE], current_candidates->len[EVEN_STATE],
-                                        // (uint64_t)current_candidates->len[ODD_STATE] * current_candidates->len[EVEN_STATE],
-                                        // log((uint64_t)current_candidates->len[ODD_STATE] * current_candidates->len[EVEN_STATE])/log(2));
-                                    // uint32_t estimated_odd = estimated_num_states_part_sum(best_first_bytes[0], p, r, ODD_STATE);
-                                    // uint32_t estimated_even= estimated_num_states_part_sum(best_first_bytes[0], q, s, EVEN_STATE);
-                                    // uint64_t estimated_total = (uint64_t)estimated_odd * estimated_even;
-                                    // PrintAndLogEx(NORMAL, "Estimated: %" PRIu32 " * %" PRIu32 " = %" PRIu64 " (2^%0.1f)\n", estimated_odd, estimated_even, estimated_total, log(estimated_total) / log(2));
-                                    // if (estimated_odd < current_candidates->len[ODD_STATE] || estimated_even < current_candidates->len[EVEN_STATE]) {
-                                        // PrintAndLogEx(NORMAL, "############################################################################ERROR! ESTIMATED < REAL !!!\n");
-                                        // //exit(2);
-                                        // }
+                                // PrintAndLogEx(NORMAL, "Candidates for p=%2u, q=%2u, r=%2u, s=%2u: %" PRIu32 " * %" PRIu32 " = %" PRIu64 " (2^%0.1f)\n",
+                                // 2*p, 2*q, 2*r, 2*s, current_candidates->len[ODD_STATE], current_candidates->len[EVEN_STATE],
+                                // (uint64_t)current_candidates->len[ODD_STATE] * current_candidates->len[EVEN_STATE],
+                                // log((uint64_t)current_candidates->len[ODD_STATE] * current_candidates->len[EVEN_STATE])/log(2));
+                                // uint32_t estimated_odd = estimated_num_states_part_sum(best_first_bytes[0], p, r, ODD_STATE);
+                                // uint32_t estimated_even= estimated_num_states_part_sum(best_first_bytes[0], q, s, EVEN_STATE);
+                                // uint64_t estimated_total = (uint64_t)estimated_odd * estimated_even;
+                                // PrintAndLogEx(NORMAL, "Estimated: %" PRIu32 " * %" PRIu32 " = %" PRIu64 " (2^%0.1f)\n", estimated_odd, estimated_even, estimated_total, log(estimated_total) / log(2));
+                                // if (estimated_odd < current_candidates->len[ODD_STATE] || estimated_even < current_candidates->len[EVEN_STATE]) {
+                                // PrintAndLogEx(NORMAL, "############################################################################ERROR! ESTIMATED < REAL !!!\n");
+                                // //exit(2);
+                                // }
                                 // }
                             }
                         }
@@ -2063,7 +2084,7 @@ static void generate_candidates(uint8_t sum_a0_idx, uint8_t sum_a8_idx)
     for (uint16_t i = 0; i < NUM_REDUCTION_WORKING_THREADS; i++) {
         sums[i][0] = sum_a0_idx;
         sums[i][1] = sum_a8_idx;
-        sums[i][2] = i+1;
+        sums[i][2] = i + 1;
         pthread_create(thread_id + i, NULL, generate_candidates_worker_thread, sums[i]);
     }
 
@@ -2132,7 +2153,7 @@ static uint16_t SumProperty(struct Crypto1State *s)
 {
     uint16_t sum_odd = PartialSumProperty(s->odd, ODD_STATE);
     uint16_t sum_even = PartialSumProperty(s->even, EVEN_STATE);
-    return (sum_odd*(16-sum_even) + (16-sum_odd)*sum_even);
+    return (sum_odd * (16 - sum_even) + (16 - sum_odd) * sum_even);
 }
 
 
@@ -2143,8 +2164,8 @@ static void Tests()
             uint32_t *bitset = nonces[best_first_bytes[0]].states_bitarray[odd_even];
             if (!test_bit24(bitset, test_state[odd_even])) {
                 PrintAndLogEx(NORMAL, "\nBUG: known target key's %s state is not member of first nonce byte's (0x%02x) states_bitarray!\n",
-                    odd_even==EVEN_STATE?"even":"odd ",
-                    best_first_bytes[0]);
+                              odd_even == EVEN_STATE ? "even" : "odd ",
+                              best_first_bytes[0]);
             }
         }
     }
@@ -2154,7 +2175,7 @@ static void Tests()
             uint32_t *bitset = all_bitflips_bitarray[odd_even];
             if (!test_bit24(bitset, test_state[odd_even])) {
                 PrintAndLogEx(NORMAL, "\nBUG: known target key's %s state is not member of all_bitflips_bitarray!\n",
-                    odd_even==EVEN_STATE?"even":"odd ");
+                              odd_even == EVEN_STATE ? "even" : "odd ");
             }
         }
     }
@@ -2168,8 +2189,8 @@ static void Tests2(void)
             uint32_t *bitset = nonces[best_first_byte_smallest_bitarray].states_bitarray[odd_even];
             if (!test_bit24(bitset, test_state[odd_even])) {
                 PrintAndLogEx(NORMAL, "\nBUG: known target key's %s state is not member of first nonce byte's (0x%02x) states_bitarray!\n",
-                    odd_even==EVEN_STATE?"even":"odd ",
-                    best_first_byte_smallest_bitarray);
+                              odd_even == EVEN_STATE ? "even" : "odd ",
+                              best_first_byte_smallest_bitarray);
             }
         }
     }
@@ -2179,7 +2200,7 @@ static void Tests2(void)
             uint32_t *bitset = all_bitflips_bitarray[odd_even];
             if (!test_bit24(bitset, test_state[odd_even])) {
                 PrintAndLogEx(NORMAL, "\nBUG: known target key's %s state is not member of all_bitflips_bitarray!\n",
-                    odd_even==EVEN_STATE?"even":"odd ");
+                              odd_even == EVEN_STATE ? "even" : "odd ");
             }
         }
     }
@@ -2207,7 +2228,7 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc
     char instr_set[12] = {0};
 
     get_SIMD_instruction_set(instr_set);
-    PrintAndLogEx(SUCCESS,"Using %s SIMD core.", instr_set);
+    PrintAndLogEx(SUCCESS, "Using %s SIMD core.", instr_set);
 
     srand((unsigned) time(NULL));
     brute_force_per_second = brute_force_benchmark();
@@ -2217,7 +2238,7 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc
         // set the correct locale for the stats printing
         write_stats = true;
         setlocale(LC_NUMERIC, "");
-        if ((fstats = fopen("hardnested_stats.txt","a")) == NULL) {
+        if ((fstats = fopen("hardnested_stats.txt", "a")) == NULL) {
             PrintAndLogEx(WARNING, "Could not create/open file hardnested_stats.txt");
             return 3;
         }
@@ -2225,10 +2246,10 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc
         for (uint32_t i = 0; i < tests; i++) {
             start_time = msclock();
             print_progress_header();
-            sprintf(progress_text, "Brute force benchmark: %1.0f million (2^%1.1f) keys/s", brute_force_per_second/1000000, log(brute_force_per_second)/log(2.0));
-            hardnested_print_progress(0, progress_text, (float)(1LL<<47), 0);
-            sprintf(progress_text, "Starting Test #%" PRIu32 " ...", i+1);
-            hardnested_print_progress(0, progress_text, (float)(1LL<<47), 0);
+            sprintf(progress_text, "Brute force benchmark: %1.0f million (2^%1.1f) keys/s", brute_force_per_second / 1000000, log(brute_force_per_second) / log(2.0));
+            hardnested_print_progress(0, progress_text, (float)(1LL << 47), 0);
+            sprintf(progress_text, "Starting Test #%" PRIu32 " ...", i + 1);
+            hardnested_print_progress(0, progress_text, (float)(1LL << 47), 0);
             if (trgkey != NULL) {
                 known_target_key = bytes_to_num(trgkey, 6);
             } else {
@@ -2249,8 +2270,8 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc
             Tests();
             free_bitflip_bitarrays();
 
-            fprintf(fstats, "%" PRIu16 ";%1.1f;", sums[first_byte_Sum], log(p_K0[first_byte_Sum])/log(2.0));
-            fprintf(fstats, "%" PRIu16 ";%1.1f;", sums[nonces[best_first_bytes[0]].sum_a8_guess[0].sum_a8_idx], log(p_K[nonces[best_first_bytes[0]].sum_a8_guess[0].sum_a8_idx])/log(2.0));
+            fprintf(fstats, "%" PRIu16 ";%1.1f;", sums[first_byte_Sum], log(p_K0[first_byte_Sum]) / log(2.0));
+            fprintf(fstats, "%" PRIu16 ";%1.1f;", sums[nonces[best_first_bytes[0]].sum_a8_guess[0].sum_a8_idx], log(p_K[nonces[best_first_bytes[0]].sum_a8_guess[0].sum_a8_idx]) / log(2.0));
             fprintf(fstats, "%" PRIu16 ";", real_sum_a8);
 
 #ifdef DEBUG_KEY_ELIMINATION
@@ -2262,7 +2283,7 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc
             uint32_t num_even = nonces[best_first_byte_smallest_bitarray].num_states_bitarray[EVEN_STATE];
             float expected_brute_force1 = (float)num_odd * num_even / 2.0;
             float expected_brute_force2 = nonces[best_first_bytes[0]].expected_num_brute_force;
-            fprintf(fstats, "%1.1f;%1.1f;", log(expected_brute_force1)/log(2.0), log(expected_brute_force2)/log(2.0));
+            fprintf(fstats, "%1.1f;%1.1f;", log(expected_brute_force1) / log(2.0), log(expected_brute_force2) / log(2.0));
 
             if (expected_brute_force1 < expected_brute_force2) {
                 hardnested_print_progress(num_acquired_nonces, "(Ignoring Sum(a8) properties)", expected_brute_force1, 0);
@@ -2288,7 +2309,7 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc
                 prepare_bf_test_nonces(nonces, best_first_bytes[0]);
                 for (uint8_t j = 0; j < NUM_SUMS && !key_found; j++) {
                     float expected_brute_force = nonces[best_first_bytes[0]].expected_num_brute_force;
-                    sprintf(progress_text, "(%d. guess: Sum(a8) = %" PRIu16 ")", j+1, sums[nonces[best_first_bytes[0]].sum_a8_guess[j].sum_a8_idx]);
+                    sprintf(progress_text, "(%d. guess: Sum(a8) = %" PRIu16 ")", j + 1, sums[nonces[best_first_bytes[0]].sum_a8_guess[j].sum_a8_idx]);
                     hardnested_print_progress(num_acquired_nonces, progress_text, expected_brute_force, 0);
                     if (sums[nonces[best_first_bytes[0]].sum_a8_guess[j].sum_a8_idx] != real_sum_a8) {
                         sprintf(progress_text, "(Estimated Sum(a8) is WRONG! Correct Sum(a8) = %" PRIu16 ")", real_sum_a8);
@@ -2309,11 +2330,11 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc
                     }
                 }
             }
-            #ifdef DEBUG_KEY_ELIMINATION
-            fprintf(fstats, "%1.1f;%1.0f;%d;%s\n", log(num_keys_tested)/log(2.0), (float)num_keys_tested/brute_force_per_second, key_found, failstr);
-            #else
-            fprintf(fstats, "%1.0f;%d\n", log(num_keys_tested)/log(2.0), (float)num_keys_tested/brute_force_per_second, key_found);
-            #endif
+#ifdef DEBUG_KEY_ELIMINATION
+            fprintf(fstats, "%1.1f;%1.0f;%d;%s\n", log(num_keys_tested) / log(2.0), (float)num_keys_tested / brute_force_per_second, key_found, failstr);
+#else
+            fprintf(fstats, "%1.0f;%d\n", log(num_keys_tested) / log(2.0), (float)num_keys_tested / brute_force_per_second, key_found);
+#endif
 
             free_nonces_memory();
             free_bitarray(all_bitflips_bitarray[ODD_STATE]);
@@ -2325,8 +2346,8 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc
     } else {
         start_time = msclock();
         print_progress_header();
-        sprintf(progress_text, "Brute force benchmark: %1.0f million (2^%1.1f) keys/s", brute_force_per_second/1000000, log(brute_force_per_second)/log(2.0));
-        hardnested_print_progress(0, progress_text, (float)(1LL<<47), 0);
+        sprintf(progress_text, "Brute force benchmark: %1.0f million (2^%1.1f) keys/s", brute_force_per_second / 1000000, log(brute_force_per_second) / log(2.0));
+        hardnested_print_progress(0, progress_text, (float)(1LL << 47), 0);
         init_bitflip_bitarrays();
         init_part_sum_bitarrays();
         init_sum_bitarrays();
@@ -2406,7 +2427,7 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc
 
             for (uint8_t j = 0; j < NUM_SUMS && !key_found; j++) {
                 float expected_brute_force = nonces[best_first_bytes[0]].expected_num_brute_force;
-                sprintf(progress_text, "(%d. guess: Sum(a8) = %" PRIu16 ")", j+1, sums[nonces[best_first_bytes[0]].sum_a8_guess[j].sum_a8_idx]);
+                sprintf(progress_text, "(%d. guess: Sum(a8) = %" PRIu16 ")", j + 1, sums[nonces[best_first_bytes[0]].sum_a8_guess[j].sum_a8_idx]);
                 hardnested_print_progress(num_acquired_nonces, progress_text, expected_brute_force, 0);
 
                 if (trgkey != NULL && sums[nonces[best_first_bytes[0]].sum_a8_guess[j].sum_a8_idx] != real_sum_a8) {
diff --git a/client/cmdhfmfp.c b/client/cmdhfmfp.c
index ce5e6eb22..d52240e3d 100644
--- a/client/cmdhfmfp.c
+++ b/client/cmdhfmfp.c
@@ -33,7 +33,8 @@ static const uint8_t DefaultKey[16] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
 
 static int CmdHelp(const char *Cmd);
 
-int CmdHFMFPInfo(const char *cmd) {
+int CmdHFMFPInfo(const char *cmd)
+{
 
     if (cmd && strlen(cmd) > 0)
         PrintAndLogEx(WARNING, "command don't have any parameters.\n");
@@ -46,7 +47,7 @@ int CmdHFMFPInfo(const char *cmd) {
     SendCommand(&c);
 
     UsbCommand resp;
-    WaitForResponse(CMD_ACK,&resp);
+    WaitForResponse(CMD_ACK, &resp);
 
     iso14a_card_select_t card;
     memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
@@ -112,18 +113,19 @@ int CmdHFMFPInfo(const char *cmd) {
     return 0;
 }
 
-int CmdHFMFPWritePerso(const char *cmd) {
+int CmdHFMFPWritePerso(const char *cmd)
+{
     uint8_t keyNum[64] = {0};
     int keyNumLen = 0;
     uint8_t key[64] = {0};
     int keyLen = 0;
 
     CLIParserInit("hf mfp wrp",
-        "Executes Write Perso command. Can be used in SL0 mode only.",
-        "Usage:\n\thf mfp wrp 4000 000102030405060708090a0b0c0d0e0f -> write key (00..0f) to key number 4000 \n"
-            "\thf mfp wrp 4000 -> write default key(0xff..0xff) to key number 4000");
+                  "Executes Write Perso command. Can be used in SL0 mode only.",
+                  "Usage:\n\thf mfp wrp 4000 000102030405060708090a0b0c0d0e0f -> write key (00..0f) to key number 4000 \n"
+                  "\thf mfp wrp 4000 -> write default key(0xff..0xff) to key number 4000");
 
-    void* argtable[] = {
+    void *argtable[] = {
         arg_param_begin,
         arg_lit0("vV",  "verbose", "show internal data."),
         arg_str1(NULL,  NULL,      "<HEX key number (2b)>", NULL),
@@ -178,7 +180,8 @@ int CmdHFMFPWritePerso(const char *cmd) {
 
 uint16_t CardAddresses[] = {0x9000, 0x9001, 0x9002, 0x9003, 0x9004, 0xA000, 0xA001, 0xA080, 0xA081, 0xC000, 0xC001};
 
-int CmdHFMFPInitPerso(const char *cmd) {
+int CmdHFMFPInitPerso(const char *cmd)
+{
     int res;
     uint8_t key[256] = {0};
     int keyLen = 0;
@@ -187,11 +190,11 @@ int CmdHFMFPInitPerso(const char *cmd) {
     int datalen = 0;
 
     CLIParserInit("hf mfp initp",
-        "Executes Write Perso command for all card's keys. Can be used in SL0 mode only.",
-        "Usage:\n\thf mfp initp 000102030405060708090a0b0c0d0e0f -> fill all the keys with key (00..0f)\n"
-            "\thf mfp initp -vv -> fill all the keys with default key(0xff..0xff) and show all the data exchange");
+                  "Executes Write Perso command for all card's keys. Can be used in SL0 mode only.",
+                  "Usage:\n\thf mfp initp 000102030405060708090a0b0c0d0e0f -> fill all the keys with key (00..0f)\n"
+                  "\thf mfp initp -vv -> fill all the keys with default key(0xff..0xff) and show all the data exchange");
 
-    void* argtable[] = {
+    void *argtable[] = {
         arg_param_begin,
         arg_litn("vV",  "verbose", 0, 2, "show internal data."),
         arg_strx0(NULL,  NULL,      "<HEX key (16b)>", NULL),
@@ -252,12 +255,13 @@ int CmdHFMFPInitPerso(const char *cmd) {
     return 0;
 }
 
-int CmdHFMFPCommitPerso(const char *cmd) {
+int CmdHFMFPCommitPerso(const char *cmd)
+{
     CLIParserInit("hf mfp commitp",
-        "Executes Commit Perso command. Can be used in SL0 mode only.",
-        "Usage:\n\thf mfp commitp ->  \n");
+                  "Executes Commit Perso command. Can be used in SL0 mode only.",
+                  "Usage:\n\thf mfp commitp ->  \n");
 
-    void* argtable[] = {
+    void *argtable[] = {
         arg_param_begin,
         arg_lit0("vV",  "verbose", "show internal data."),
         arg_int0(NULL,  NULL,      "SL mode", NULL),
@@ -293,18 +297,19 @@ int CmdHFMFPCommitPerso(const char *cmd) {
     return 0;
 }
 
-int CmdHFMFPAuth(const char *cmd) {
+int CmdHFMFPAuth(const char *cmd)
+{
     uint8_t keyn[250] = {0};
     int keynlen = 0;
     uint8_t key[250] = {0};
     int keylen = 0;
 
     CLIParserInit("hf mfp auth",
-        "Executes AES authentication command for Mifare Plus card",
-        "Usage:\n\thf mfp auth 4000 000102030405060708090a0b0c0d0e0f -> executes authentication\n"
-            "\thf mfp auth 9003 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -v -> executes authentication and shows all the system data\n");
+                  "Executes AES authentication command for Mifare Plus card",
+                  "Usage:\n\thf mfp auth 4000 000102030405060708090a0b0c0d0e0f -> executes authentication\n"
+                  "\thf mfp auth 9003 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -v -> executes authentication and shows all the system data\n");
 
-    void* argtable[] = {
+    void *argtable[] = {
         arg_param_begin,
         arg_lit0("vV",  "verbose", "show internal data."),
         arg_str1(NULL,  NULL,     "<Key Num (HEX 2 bytes)>", NULL),
@@ -331,17 +336,18 @@ int CmdHFMFPAuth(const char *cmd) {
     return MifareAuth4(NULL, keyn, key, true, false, verbose);
 }
 
-int CmdHFMFPRdbl(const char *cmd) {
+int CmdHFMFPRdbl(const char *cmd)
+{
     uint8_t keyn[2] = {0};
     uint8_t key[250] = {0};
     int keylen = 0;
 
     CLIParserInit("hf mfp rdbl",
-        "Reads several blocks from Mifare Plus card.",
-        "Usage:\n\thf mfp rdbl 0 000102030405060708090a0b0c0d0e0f -> executes authentication and read block 0 data\n"
-            "\thf mfp rdbl 1 -v -> executes authentication and shows sector 1 data with default key 0xFF..0xFF and some additional data\n");
+                  "Reads several blocks from Mifare Plus card.",
+                  "Usage:\n\thf mfp rdbl 0 000102030405060708090a0b0c0d0e0f -> executes authentication and read block 0 data\n"
+                  "\thf mfp rdbl 1 -v -> executes authentication and shows sector 1 data with default key 0xFF..0xFF and some additional data\n");
 
-    void* argtable[] = {
+    void *argtable[] = {
         arg_param_begin,
         arg_lit0("vV",  "verbose", "show internal data."),
         arg_int0("nN",  "count",   "blocks count (by default 1).", NULL),
@@ -422,10 +428,10 @@ int CmdHFMFPRdbl(const char *cmd) {
     }
 
     int indx = blockn;
-    for(int i = 0; i < blocksCount; i++)  {
+    for (int i = 0; i < blocksCount; i++)  {
         PrintAndLogEx(INFO, "data[%03d]: %s", indx, sprint_hex(&data[1 + i * 16], 16));
         indx++;
-        if (mfIsSectorTrailer(indx) && i != blocksCount - 1){
+        if (mfIsSectorTrailer(indx) && i != blocksCount - 1) {
             PrintAndLogEx(INFO, "data[%03d]: ------------------- trailer -------------------", indx);
             indx++;
         }
@@ -436,24 +442,25 @@ int CmdHFMFPRdbl(const char *cmd) {
         PrintAndLogEx(WARNING, "MAC   card: %s", sprint_hex(&data[blocksCount * 16 + 1], 8));
         PrintAndLogEx(WARNING, "MAC reader: %s", sprint_hex(mac, 8));
     } else {
-    if(verbose)
+        if (verbose)
             PrintAndLogEx(INFO, "MAC: %s", sprint_hex(&data[blocksCount * 16 + 1], 8));
     }
 
     return 0;
 }
 
-int CmdHFMFPRdsc(const char *cmd) {
+int CmdHFMFPRdsc(const char *cmd)
+{
     uint8_t keyn[2] = {0};
     uint8_t key[250] = {0};
     int keylen = 0;
 
     CLIParserInit("hf mfp rdsc",
-        "Reads one sector from Mifare Plus card.",
-        "Usage:\n\thf mfp rdsc 0 000102030405060708090a0b0c0d0e0f -> executes authentication and read sector 0 data\n"
-            "\thf mfp rdsc 1 -v -> executes authentication and shows sector 1 data with default key 0xFF..0xFF and some additional data\n");
+                  "Reads one sector from Mifare Plus card.",
+                  "Usage:\n\thf mfp rdsc 0 000102030405060708090a0b0c0d0e0f -> executes authentication and read sector 0 data\n"
+                  "\thf mfp rdsc 1 -v -> executes authentication and shows sector 1 data with default key 0xFF..0xFF and some additional data\n");
 
-    void* argtable[] = {
+    void *argtable[] = {
         arg_param_begin,
         arg_lit0("vV",  "verbose", "show internal data."),
         arg_lit0("bB",  "keyb",    "use key B (by default keyA)."),
@@ -504,7 +511,7 @@ int CmdHFMFPRdsc(const char *cmd) {
     uint8_t data[250] = {0};
     int datalen = 0;
     uint8_t mac[8] = {0};
-    for(int n = mfFirstBlockOfSector(sectorNum); n < mfFirstBlockOfSector(sectorNum) + mfNumBlocksPerSector(sectorNum); n++) {
+    for (int n = mfFirstBlockOfSector(sectorNum); n < mfFirstBlockOfSector(sectorNum) + mfNumBlocksPerSector(sectorNum); n++) {
         res = MFPReadBlock(&session, plain, n & 0xff, 1, false, true, data, sizeof(data), &datalen, mac);
         if (res) {
             PrintAndLogEx(ERR, "Read error: %d", res);
@@ -530,7 +537,7 @@ int CmdHFMFPRdsc(const char *cmd) {
             PrintAndLogEx(WARNING, "MAC   card: %s", sprint_hex(&data[1 + 16], 8));
             PrintAndLogEx(WARNING, "MAC reader: %s", sprint_hex(mac, 8));
         } else {
-            if(verbose)
+            if (verbose)
                 PrintAndLogEx(INFO, "MAC: %s", sprint_hex(&data[1 + 16], 8));
         }
     }
@@ -539,7 +546,8 @@ int CmdHFMFPRdsc(const char *cmd) {
     return 0;
 }
 
-int CmdHFMFPWrbl(const char *cmd) {
+int CmdHFMFPWrbl(const char *cmd)
+{
     uint8_t keyn[2] = {0};
     uint8_t key[250] = {0};
     int keylen = 0;
@@ -547,11 +555,11 @@ int CmdHFMFPWrbl(const char *cmd) {
     int datainlen = 0;
 
     CLIParserInit("hf mfp wrbl",
-        "Writes one block to Mifare Plus card.",
-        "Usage:\n\thf mfp wrbl 1 ff0000000000000000000000000000ff 000102030405060708090a0b0c0d0e0f -> writes block 1 data\n"
-            "\thf mfp wrbl 2 ff0000000000000000000000000000ff -v -> writes block 2 data with default key 0xFF..0xFF and some additional data\n");
+                  "Writes one block to Mifare Plus card.",
+                  "Usage:\n\thf mfp wrbl 1 ff0000000000000000000000000000ff 000102030405060708090a0b0c0d0e0f -> writes block 1 data\n"
+                  "\thf mfp wrbl 2 ff0000000000000000000000000000ff -v -> writes block 2 data with default key 0xFF..0xFF and some additional data\n");
 
-    void* argtable[] = {
+    void *argtable[] = {
         arg_param_begin,
         arg_lit0("vV",  "verbose", "show internal data."),
         arg_lit0("bB",  "keyb",    "use key B (by default keyA)."),
@@ -632,7 +640,7 @@ int CmdHFMFPWrbl(const char *cmd) {
         PrintAndLogEx(WARNING, "MAC   card: %s", sprint_hex(&data[1], 8));
         PrintAndLogEx(WARNING, "MAC reader: %s", sprint_hex(mac, 8));
     } else {
-        if(verbose)
+        if (verbose)
             PrintAndLogEx(INFO, "MAC: %s", sprint_hex(&data[1], 8));
     }
 
@@ -641,14 +649,15 @@ int CmdHFMFPWrbl(const char *cmd) {
     return 0;
 }
 
-int CmdHFMFPMAD(const char *cmd) {
+int CmdHFMFPMAD(const char *cmd)
+{
 
     CLIParserInit("hf mfp mad",
-        "Checks and prints Mifare Application Directory (MAD)",
-        "Usage:\n\thf mfp mad -> shows MAD if exists\n"
-            "\thf mfp mad -a 03e1 -k d3f7d3f7d3f7d3f7d3f7d3f7d3f7d3f7 -> shows NDEF data if exists\n");
+                  "Checks and prints Mifare Application Directory (MAD)",
+                  "Usage:\n\thf mfp mad -> shows MAD if exists\n"
+                  "\thf mfp mad -a 03e1 -k d3f7d3f7d3f7d3f7d3f7d3f7d3f7d3f7 -> shows NDEF data if exists\n");
 
-    void* argtable[] = {
+    void *argtable[] = {
         arg_param_begin,
         arg_lit0("vV",  "verbose",  "show technical data"),
         arg_str0("aA",  "aid",      "print all sectors with aid", NULL),
@@ -683,7 +692,7 @@ int CmdHFMFPMAD(const char *cmd) {
     }
 
     if (verbose) {
-        for(int i = 0; i < 4; i ++)
+        for (int i = 0; i < 4; i ++)
             PrintAndLogEx(NORMAL, "[%d] %s", i, sprint_hex(&sector0[i * 16], 16));
     }
 
@@ -726,7 +735,7 @@ int CmdHFMFPMAD(const char *cmd) {
                     return 2;
                 }
 
-                for(int j = 0; j < (verbose ? 4 : 3); j ++)
+                for (int j = 0; j < (verbose ? 4 : 3); j ++)
                     PrintAndLogEx(NORMAL, " [%03d] %s", (i + 1) * 4 + j, sprint_hex(&vsector[j * 16], 16));
             }
         }
@@ -735,14 +744,15 @@ int CmdHFMFPMAD(const char *cmd) {
     return 0;
 }
 
-int CmdHFMFPNDEF(const char *cmd) {
+int CmdHFMFPNDEF(const char *cmd)
+{
 
     CLIParserInit("hf mfp ndef",
-        "Prints NFC Data Exchange Format (NDEF)",
-        "Usage:\n\thf mfp ndef -> shows NDEF data\n"
-            "\thf mfp ndef -a 03e1 -k d3f7d3f7d3f7d3f7d3f7d3f7d3f7d3f7 -> shows NDEF data with custom AID and key\n");
+                  "Prints NFC Data Exchange Format (NDEF)",
+                  "Usage:\n\thf mfp ndef -> shows NDEF data\n"
+                  "\thf mfp ndef -a 03e1 -k d3f7d3f7d3f7d3f7d3f7d3f7d3f7d3f7 -> shows NDEF data with custom AID and key\n");
 
-    void* argtable[] = {
+    void *argtable[] = {
         arg_param_begin,
         arg_litn("vV",  "verbose",  0, 2, "show technical data"),
         arg_str0("aA",  "aid",      "replace default aid for NDEF", NULL),
@@ -839,29 +849,30 @@ int CmdHFMFPNDEF(const char *cmd) {
     return 0;
 }
 
-static command_t CommandTable[] =
-{
-  {"help",             CmdHelp,                 1, "This help"},
-  {"info",             CmdHFMFPInfo,            0, "Info about Mifare Plus tag"},
-  {"wrp",              CmdHFMFPWritePerso,      0, "Write Perso command"},
-  {"initp",            CmdHFMFPInitPerso,       0, "Fills all the card's keys"},
-  {"commitp",          CmdHFMFPCommitPerso,     0, "Move card to SL1 or SL3 mode"},
-  {"auth",             CmdHFMFPAuth,            0, "Authentication"},
-  {"rdbl",             CmdHFMFPRdbl,            0, "Read blocks"},
-  {"rdsc",             CmdHFMFPRdsc,            0, "Read sectors"},
-  {"wrbl",             CmdHFMFPWrbl,            0, "Write blocks"},
-  {"mad",              CmdHFMFPMAD,             0, "Checks and prints MAD"},
-  {"ndef",             CmdHFMFPNDEF,            0, "Prints NDEF records from card"},
-  {NULL,               NULL,                    0, NULL}
+static command_t CommandTable[] = {
+    {"help",             CmdHelp,                 1, "This help"},
+    {"info",             CmdHFMFPInfo,            0, "Info about Mifare Plus tag"},
+    {"wrp",              CmdHFMFPWritePerso,      0, "Write Perso command"},
+    {"initp",            CmdHFMFPInitPerso,       0, "Fills all the card's keys"},
+    {"commitp",          CmdHFMFPCommitPerso,     0, "Move card to SL1 or SL3 mode"},
+    {"auth",             CmdHFMFPAuth,            0, "Authentication"},
+    {"rdbl",             CmdHFMFPRdbl,            0, "Read blocks"},
+    {"rdsc",             CmdHFMFPRdsc,            0, "Read sectors"},
+    {"wrbl",             CmdHFMFPWrbl,            0, "Write blocks"},
+    {"mad",              CmdHFMFPMAD,             0, "Checks and prints MAD"},
+    {"ndef",             CmdHFMFPNDEF,            0, "Prints NDEF records from card"},
+    {NULL,               NULL,                    0, NULL}
 };
 
-int CmdHFMFP(const char *Cmd) {
-    (void)WaitForResponseTimeout(CMD_ACK,NULL,100);
+int CmdHFMFP(const char *Cmd)
+{
+    (void)WaitForResponseTimeout(CMD_ACK, NULL, 100);
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
-  CmdsHelp(CommandTable);
-  return 0;
+int CmdHelp(const char *Cmd)
+{
+    CmdsHelp(CommandTable);
+    return 0;
 }
diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index 9dd6f979e..efc1f4f2a 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -28,27 +28,27 @@ static int CmdHelp(const char *Cmd);
 
 #define PUBLIC_ECDA_KEYLEN 33
 uint8_t public_ecda_key[PUBLIC_ECDA_KEYLEN] = {
-        0x04, 0x49, 0x4e, 0x1a, 0x38, 0x6d, 0x3d, 0x3c,
-        0xfe, 0x3d, 0xc1, 0x0e, 0x5d, 0xe6, 0x8a, 0x49,
-        0x9b, 0x1c, 0x20, 0x2d, 0xb5, 0xb1, 0x32, 0x39,
-        0x3e, 0x89, 0xed, 0x19, 0xfe, 0x5b, 0xe8, 0xbc,
-        0x61
+    0x04, 0x49, 0x4e, 0x1a, 0x38, 0x6d, 0x3d, 0x3c,
+    0xfe, 0x3d, 0xc1, 0x0e, 0x5d, 0xe6, 0x8a, 0x49,
+    0x9b, 0x1c, 0x20, 0x2d, 0xb5, 0xb1, 0x32, 0x39,
+    0x3e, 0x89, 0xed, 0x19, 0xfe, 0x5b, 0xe8, 0xbc,
+    0x61
 };
 
 #define KEYS_3DES_COUNT 7
 uint8_t default_3des_keys[KEYS_3DES_COUNT][16] = {
-        { 0x42,0x52,0x45,0x41,0x4b,0x4d,0x45,0x49,0x46,0x59,0x4f,0x55,0x43,0x41,0x4e,0x21 },// 3des std key
-        { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },// all zeroes
-        { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f },// 0x00-0x0F
-        { 0x49,0x45,0x4D,0x4B,0x41,0x45,0x52,0x42,0x21,0x4E,0x41,0x43,0x55,0x4F,0x59,0x46 },// NFC-key
-        { 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01 },// all ones
-        { 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF },// all FF
-        { 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x88,0x99,0xAA,0xBB,0xCC,0xDD,0xEE,0xFF }    // 11 22 33
+    { 0x42, 0x52, 0x45, 0x41, 0x4b, 0x4d, 0x45, 0x49, 0x46, 0x59, 0x4f, 0x55, 0x43, 0x41, 0x4e, 0x21 }, // 3des std key
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, // all zeroes
+    { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f }, // 0x00-0x0F
+    { 0x49, 0x45, 0x4D, 0x4B, 0x41, 0x45, 0x52, 0x42, 0x21, 0x4E, 0x41, 0x43, 0x55, 0x4F, 0x59, 0x46 }, // NFC-key
+    { 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 }, // all ones
+    { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }, // all FF
+    { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0xFF } // 11 22 33
 };
 
 #define KEYS_PWD_COUNT 1
 uint8_t default_pwd_pack[KEYS_PWD_COUNT][4] = {
-    {0xFF,0xFF,0xFF,0xFF}, // PACK 0x00,0x00 -- factory default
+    {0xFF, 0xFF, 0xFF, 0xFF}, // PACK 0x00,0x00 -- factory default
 };
 
 #define MAX_UL_TYPES 22
@@ -77,14 +77,14 @@ const uint32_t c_D[] = {
     0x5728B869, 0x30726D5A
 };
 
-void transform_D(uint8_t* ru) {
+void transform_D(uint8_t *ru)
+{
     //Transform
     uint8_t i;
     uint8_t p = 0;
     uint32_t v1 = ((ru[3] << 24) | (ru[2] << 16) | (ru[1] << 8) | ru[0]) + c_D[p++];
     uint32_t v2 = ((ru[7] << 24) | (ru[6] << 16) | (ru[5] << 8) | ru[4]) + c_D[p++];
-    for (i = 0; i < 12; i += 2)
-    {
+    for (i = 0; i < 12; i += 2) {
         uint32_t t1 = ROTL(v1 ^ v2, v2 & 0x1F) + c_D[p++];
         uint32_t t2 = ROTL(v2 ^ t1, t1 & 0x1F) + c_D[p++];
         v1 = ROTL(t1 ^ t2, t2 & 0x1F) + c_D[p++];
@@ -103,21 +103,22 @@ void transform_D(uint8_t* ru) {
 }
 
 // Certain pwd generation algo nickname A.
-uint32_t ul_ev1_pwdgenA(uint8_t* uid) {
+uint32_t ul_ev1_pwdgenA(uint8_t *uid)
+{
 
     uint8_t pos = (uid[3] ^ uid[4] ^ uid[5] ^ uid[6]) % 32;
 
     uint32_t xortable[] = {
-                        0x4f2711c1, 0x07D7BB83, 0x9636EF07, 0xB5F4460E, 0xF271141C, 0x7D7BB038, 0x636EF871, 0x5F4468E3,
-                        0x271149C7, 0xD7BB0B8F, 0x36EF8F1E, 0xF446863D, 0x7114947A, 0x7BB0B0F5, 0x6EF8F9EB, 0x44686BD7,
-                        0x11494fAF, 0xBB0B075F, 0xEF8F96BE, 0x4686B57C, 0x1494F2F9, 0xB0B07DF3, 0xF8F963E6, 0x686B5FCC,
-                        0x494F2799, 0x0B07D733, 0x8F963667, 0x86B5F4CE, 0x94F2719C, 0xB07D7B38, 0xF9636E70, 0x6B5F44E0
-                        };
+        0x4f2711c1, 0x07D7BB83, 0x9636EF07, 0xB5F4460E, 0xF271141C, 0x7D7BB038, 0x636EF871, 0x5F4468E3,
+        0x271149C7, 0xD7BB0B8F, 0x36EF8F1E, 0xF446863D, 0x7114947A, 0x7BB0B0F5, 0x6EF8F9EB, 0x44686BD7,
+        0x11494fAF, 0xBB0B075F, 0xEF8F96BE, 0x4686B57C, 0x1494F2F9, 0xB0B07DF3, 0xF8F963E6, 0x686B5FCC,
+        0x494F2799, 0x0B07D733, 0x8F963667, 0x86B5F4CE, 0x94F2719C, 0xB07D7B38, 0xF9636E70, 0x6B5F44E0
+    };
 
-    uint8_t entry[] = {0x00,0x00,0x00,0x00};
-    uint8_t pwd[] = {0x00,0x00,0x00,0x00};
+    uint8_t entry[] = {0x00, 0x00, 0x00, 0x00};
+    uint8_t pwd[] = {0x00, 0x00, 0x00, 0x00};
 
-    num_to_bytes( xortable[pos], 4, entry);
+    num_to_bytes(xortable[pos], 4, entry);
 
     pwd[0] = entry[0] ^ uid[1] ^ uid[2] ^ uid[3];
     pwd[1] = entry[1] ^ uid[0] ^ uid[2] ^ uid[4];
@@ -128,9 +129,10 @@ uint32_t ul_ev1_pwdgenA(uint8_t* uid) {
 }
 
 // Certain pwd generation algo nickname B. (very simple)
-uint32_t ul_ev1_pwdgenB(uint8_t* uid) {
+uint32_t ul_ev1_pwdgenB(uint8_t *uid)
+{
 
-    uint8_t pwd[] = {0x00,0x00,0x00,0x00};
+    uint8_t pwd[] = {0x00, 0x00, 0x00, 0x00};
 
     pwd[0] = uid[1] ^ uid[3] ^ 0xAA;
     pwd[1] = uid[2] ^ uid[4] ^ 0x55;
@@ -140,7 +142,8 @@ uint32_t ul_ev1_pwdgenB(uint8_t* uid) {
 }
 
 // Certain pwd generation algo nickname C.
-uint32_t ul_ev1_pwdgenC(uint8_t* uid){
+uint32_t ul_ev1_pwdgenC(uint8_t *uid)
+{
     uint32_t pwd = 0;
     uint8_t base[] = {
         0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x28,
@@ -159,7 +162,8 @@ uint32_t ul_ev1_pwdgenC(uint8_t* uid){
 }
 // Certain pwd generation algo nickname D.
 // a.k.a xzy
-uint32_t ul_ev1_pwdgenD(uint8_t* uid){
+uint32_t ul_ev1_pwdgenD(uint8_t *uid)
+{
     uint8_t i;
     //Rotate
     uint8_t r = (uid[1] + uid[3] + uid[5]) & 7; //Rotation offset
@@ -178,17 +182,21 @@ uint32_t ul_ev1_pwdgenD(uint8_t* uid){
     return BSWAP_32(pwd);
 }
 // pack generation for algo 1-3
-uint16_t ul_ev1_packgenA(uint8_t* uid){
+uint16_t ul_ev1_packgenA(uint8_t *uid)
+{
     uint16_t pack = (uid[0] ^ uid[1] ^ uid[2]) << 8 | (uid[2] ^ 8);
     return pack;
 }
-uint16_t ul_ev1_packgenB(uint8_t* uid){
+uint16_t ul_ev1_packgenB(uint8_t *uid)
+{
     return 0x8080;
 }
-uint16_t ul_ev1_packgenC(uint8_t* uid){
+uint16_t ul_ev1_packgenC(uint8_t *uid)
+{
     return 0xaa55;
 }
-uint16_t ul_ev1_packgenD(uint8_t* uid){
+uint16_t ul_ev1_packgenD(uint8_t *uid)
+{
     uint8_t i;
     //Rotate
     uint8_t r = (uid[2] + uid[5]) & 7; //Rotation offset
@@ -204,40 +212,48 @@ uint16_t ul_ev1_packgenD(uint8_t* uid){
         p += ru[i] * 13;
 
     p ^= 0x5555;
-    return BSWAP_16( p & 0xFFFF );
+    return BSWAP_16(p & 0xFFFF);
 }
 
-int ul_ev1_pwdgen_selftest(){
+int ul_ev1_pwdgen_selftest()
+{
 
     uint8_t uid1[] = {0x04, 0x11, 0x12, 0x11, 0x12, 0x11, 0x10};
     uint32_t pwd1 = ul_ev1_pwdgenA(uid1);
-    PrintAndLogEx(NORMAL, "UID | %s | %08X | %s", sprint_hex(uid1,7), pwd1, (pwd1 == 0x8432EB17)?"OK":"->8432EB17<-");
+    PrintAndLogEx(NORMAL, "UID | %s | %08X | %s", sprint_hex(uid1, 7), pwd1, (pwd1 == 0x8432EB17) ? "OK" : "->8432EB17<-");
 
     uint8_t uid2[] = {0x04, 0x1f, 0x98, 0xea, 0x1e, 0x3e, 0x81};
     uint32_t pwd2 = ul_ev1_pwdgenB(uid2);
-    PrintAndLogEx(NORMAL, "UID | %s | %08X | %s", sprint_hex(uid2,7), pwd2, (pwd2 == 0x5fd37eca)?"OK":"->5fd37eca<--");
+    PrintAndLogEx(NORMAL, "UID | %s | %08X | %s", sprint_hex(uid2, 7), pwd2, (pwd2 == 0x5fd37eca) ? "OK" : "->5fd37eca<--");
 
     uint8_t uid3[] = {0x04, 0x62, 0xB6, 0x8A, 0xB4, 0x42, 0x80};
     uint32_t pwd3 = ul_ev1_pwdgenC(uid3);
-    PrintAndLogEx(NORMAL, "UID | %s | %08X | %s", sprint_hex(uid3,7), pwd3, (pwd3 == 0x5a349515)?"OK":"->5a349515<--");
+    PrintAndLogEx(NORMAL, "UID | %s | %08X | %s", sprint_hex(uid3, 7), pwd3, (pwd3 == 0x5a349515) ? "OK" : "->5a349515<--");
 
     uint8_t uid4[] = {0x04, 0xC5, 0xDF, 0x4A, 0x6D, 0x51, 0x80};
     uint32_t pwd4 = ul_ev1_pwdgenD(uid4);
-    PrintAndLogEx(NORMAL, "UID | %s | %08X | %s", sprint_hex(uid4,7), pwd4, (pwd4 == 0x72B1EC61)?"OK":"->72B1EC61<--");
+    PrintAndLogEx(NORMAL, "UID | %s | %08X | %s", sprint_hex(uid4, 7), pwd4, (pwd4 == 0x72B1EC61) ? "OK" : "->72B1EC61<--");
     return 0;
 }
 
 //------------------------------------
 // get version nxp product type
-char *getProductTypeStr( uint8_t id){
+char *getProductTypeStr(uint8_t id)
+{
 
     static char buf[20];
     char *retStr = buf;
 
-    switch(id) {
-        case 3: sprintf(retStr, "%02X, Ultralight", id); break;
-        case 4: sprintf(retStr, "%02X, NTAG", id); break;
-        default: sprintf(retStr, "%02X, unknown", id); break;
+    switch (id) {
+        case 3:
+            sprintf(retStr, "%02X, Ultralight", id);
+            break;
+        case 4:
+            sprintf(retStr, "%02X, NTAG", id);
+            break;
+        default:
+            sprintf(retStr, "%02X, unknown", id);
+            break;
     }
     return buf;
 }
@@ -247,30 +263,33 @@ char *getProductTypeStr( uint8_t id){
   the LSBit is set to '0' if the size is exactly 2^n
   and set to '1' if the storage size is between 2^n and 2^(n+1).
 */
-char *getUlev1CardSizeStr( uint8_t fsize ){
+char *getUlev1CardSizeStr(uint8_t fsize)
+{
 
     static char buf[40];
     char *retStr = buf;
     memset(buf, 0, sizeof(buf));
 
-    uint16_t usize = 1 << ((fsize >>1) + 1);
-    uint16_t lsize = 1 << (fsize >>1);
+    uint16_t usize = 1 << ((fsize >> 1) + 1);
+    uint16_t lsize = 1 << (fsize >> 1);
 
     // is  LSB set?
-    if (  fsize & 1 )
-        sprintf(retStr, "%02X, (%u <-> %u bytes)",fsize, usize, lsize);
+    if (fsize & 1)
+        sprintf(retStr, "%02X, (%u <-> %u bytes)", fsize, usize, lsize);
     else
         sprintf(retStr, "%02X, (%u bytes)", fsize, lsize);
     return buf;
 }
 
-static void ul_switch_on_field(void) {
+static void ul_switch_on_field(void)
+{
     UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT | ISO14A_NO_RATS, 0, 0}};
     clearCommandBuffer();
     SendCommand(&c);
 }
 
-static int ul_send_cmd_raw( uint8_t *cmd, uint8_t cmdlen, uint8_t *response, uint16_t responseLength ) {
+static int ul_send_cmd_raw(uint8_t *cmd, uint8_t cmdlen, uint8_t *response, uint16_t responseLength)
+{
     UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_NO_DISCONNECT | ISO14A_APPEND_CRC | ISO14A_NO_RATS, cmdlen, 0}};
     memcpy(c.d.asBytes, cmd, cmdlen);
     clearCommandBuffer();
@@ -284,7 +303,8 @@ static int ul_send_cmd_raw( uint8_t *cmd, uint8_t cmdlen, uint8_t *response, uin
     return resplen;
 }
 
-static int ul_select( iso14a_card_select_t *card ){
+static int ul_select(iso14a_card_select_t *card)
+{
 
     ul_switch_on_field();
 
@@ -303,74 +323,80 @@ static int ul_select( iso14a_card_select_t *card ){
 }
 
 // This read command will at least return 16bytes.
-static int ul_read( uint8_t page, uint8_t *response, uint16_t responseLength ){
+static int ul_read(uint8_t page, uint8_t *response, uint16_t responseLength)
+{
 
     uint8_t cmd[] = {ISO14443A_CMD_READBLOCK, page};
     int len = ul_send_cmd_raw(cmd, sizeof(cmd), response, responseLength);
     return len;
 }
 
-static int ul_comp_write( uint8_t page, uint8_t *data, uint8_t datalen ){
+static int ul_comp_write(uint8_t page, uint8_t *data, uint8_t datalen)
+{
 
     uint8_t cmd[18];
     memset(cmd, 0x00, sizeof(cmd));
-    datalen = ( datalen > 16) ? 16 : datalen;
+    datalen = (datalen > 16) ? 16 : datalen;
 
     cmd[0] = ISO14443A_CMD_WRITEBLOCK;
     cmd[1] = page;
-    memcpy(cmd+2, data, datalen);
+    memcpy(cmd + 2, data, datalen);
 
     uint8_t response[1] = {0xff};
-    ul_send_cmd_raw(cmd, 2+datalen, response, sizeof(response));
+    ul_send_cmd_raw(cmd, 2 + datalen, response, sizeof(response));
     // ACK
-    if ( response[0] == 0x0a ) return 0;
+    if (response[0] == 0x0a) return 0;
     // NACK
     return -1;
 }
 
-static int ulc_requestAuthentication( uint8_t *nonce, uint16_t nonceLength ){
+static int ulc_requestAuthentication(uint8_t *nonce, uint16_t nonceLength)
+{
 
     uint8_t cmd[] = {MIFARE_ULC_AUTH_1, 0x00};
     int len = ul_send_cmd_raw(cmd, sizeof(cmd), nonce, nonceLength);
     return len;
 }
 
-static int ulc_authentication( uint8_t *key, bool switch_off_field ){
+static int ulc_authentication(uint8_t *key, bool switch_off_field)
+{
 
     UsbCommand c = {CMD_MIFAREUC_AUTH, {switch_off_field}};
     memcpy(c.d.asBytes, key, 16);
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
-    if ( !WaitForResponseTimeout(CMD_ACK, &resp, 1500) ) return 0;
-    if ( resp.arg[0] == 1 ) return 1;
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return 0;
+    if (resp.arg[0] == 1) return 1;
 
     return 0;
 }
 
-static int ulev1_requestAuthentication( uint8_t *pwd, uint8_t *pack, uint16_t packLength ){
+static int ulev1_requestAuthentication(uint8_t *pwd, uint8_t *pack, uint16_t packLength)
+{
 
     uint8_t cmd[] = {MIFARE_ULEV1_AUTH, pwd[0], pwd[1], pwd[2], pwd[3]};
     int len = ul_send_cmd_raw(cmd, sizeof(cmd), pack, packLength);
     // NACK tables different tags,  but between 0-9 is a NEGATIVE response.
     // ACK == 0xA
-    if ( len == 1 && pack[0] <= 0x09 )
+    if (len == 1 && pack[0] <= 0x09)
         return -1;
     return len;
 }
 
-static int ul_auth_select( iso14a_card_select_t *card, TagTypeUL_t tagtype, bool hasAuthKey, uint8_t *authkey, uint8_t *pack, uint8_t packSize){
-    if ( hasAuthKey && (tagtype & UL_C)) {
+static int ul_auth_select(iso14a_card_select_t *card, TagTypeUL_t tagtype, bool hasAuthKey, uint8_t *authkey, uint8_t *pack, uint8_t packSize)
+{
+    if (hasAuthKey && (tagtype & UL_C)) {
         //will select card automatically and close connection on error
         if (!ulc_authentication(authkey, false)) {
             PrintAndLogEx(WARNING, "Authentication Failed UL-C");
             return 0;
         }
     } else {
-        if ( !ul_select(card) ) return 0;
+        if (!ul_select(card)) return 0;
 
         if (hasAuthKey) {
-            if ( ulev1_requestAuthentication(authkey, pack, packSize) == -1 ) {
+            if (ulev1_requestAuthentication(authkey, pack, packSize) == -1) {
                 DropField();
                 PrintAndLogEx(WARNING, "Authentication Failed UL-EV1/NTAG");
                 return 0;
@@ -380,27 +406,31 @@ static int ul_auth_select( iso14a_card_select_t *card, TagTypeUL_t tagtype, bool
     return 1;
 }
 
-static int ulev1_getVersion( uint8_t *response, uint16_t responseLength ){
+static int ulev1_getVersion(uint8_t *response, uint16_t responseLength)
+{
     uint8_t cmd[] = {MIFARE_ULEV1_VERSION};
     int len = ul_send_cmd_raw(cmd, sizeof(cmd), response, responseLength);
     return len;
 }
 
-static int ulev1_readCounter( uint8_t counter, uint8_t *response, uint16_t responseLength ){
+static int ulev1_readCounter(uint8_t counter, uint8_t *response, uint16_t responseLength)
+{
 
     uint8_t cmd[] = {MIFARE_ULEV1_READ_CNT, counter};
     int len = ul_send_cmd_raw(cmd, sizeof(cmd), response, responseLength);
     return len;
 }
 
-static int ulev1_readTearing( uint8_t counter, uint8_t *response, uint16_t responseLength ){
+static int ulev1_readTearing(uint8_t counter, uint8_t *response, uint16_t responseLength)
+{
 
     uint8_t cmd[] = {MIFARE_ULEV1_CHECKTEAR, counter};
     int len = ul_send_cmd_raw(cmd, sizeof(cmd), response, responseLength);
     return len;
 }
 
-static int ulev1_readSignature( uint8_t *response, uint16_t responseLength ){
+static int ulev1_readSignature(uint8_t *response, uint16_t responseLength)
+{
 
     uint8_t cmd[] = {MIFARE_ULEV1_READSIG, 0x00};
     int len = ul_send_cmd_raw(cmd, sizeof(cmd), response, responseLength);
@@ -420,14 +450,15 @@ static int ulev1_readSignature( uint8_t *response, uint16_t responseLength ){
 //  UL responds with read of page 0, fudan doesn't respond.
 //
 // make sure field is off before calling this function
-static int ul_fudan_check( void ){
+static int ul_fudan_check(void)
+{
     iso14a_card_select_t card;
-    if ( !ul_select(&card) )
+    if (!ul_select(&card))
         return UL_ERROR;
 
     UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_NO_DISCONNECT | ISO14A_NO_RATS, 4, 0}};
 
-    uint8_t cmd[4] = {0x30,0x00,0x02,0xa7}; //wrong crc on purpose  should be 0xa8
+    uint8_t cmd[4] = {0x30, 0x00, 0x02, 0xa7}; //wrong crc on purpose  should be 0xa8
     memcpy(c.d.asBytes, cmd, 4);
     clearCommandBuffer();
     SendCommand(&c);
@@ -438,7 +469,8 @@ static int ul_fudan_check( void ){
     return (!resp.d.asBytes[0]) ? FUDAN_UL : UL; //if response == 0x00 then Fudan, else Genuine NXP
 }
 
-static int ul_print_default( uint8_t *data){
+static int ul_print_default(uint8_t *data)
+{
 
     uint8_t uid[7];
     uid[0] = data[0];
@@ -450,161 +482,172 @@ static int ul_print_default( uint8_t *data){
     uid[6] = data[7];
 
     PrintAndLogEx(NORMAL, "       UID : %s ", sprint_hex(uid, 7));
-    PrintAndLogEx(NORMAL, "    UID[0] : %02X, %s",  uid[0], getTagInfo(uid[0]) );
-    if ( uid[0] == 0x05 && ((uid[1] & 0xf0) >> 4) == 2 ) { // is infineon and 66RxxP
+    PrintAndLogEx(NORMAL, "    UID[0] : %02X, %s",  uid[0], getTagInfo(uid[0]));
+    if (uid[0] == 0x05 && ((uid[1] & 0xf0) >> 4) == 2) {   // is infineon and 66RxxP
         uint8_t chip = (data[8] & 0xC7); // 11000111  mask, bit 3,4,5 RFU
-        switch (chip){
-            case 0xc2: PrintAndLogEx(NORMAL, "   IC type : SLE 66R04P 770 Bytes"); break; //77 pages
-            case 0xc4: PrintAndLogEx(NORMAL, "   IC type : SLE 66R16P 2560 Bytes"); break; //256 pages
-            case 0xc6: PrintAndLogEx(NORMAL, "   IC type : SLE 66R32P 5120 Bytes"); break; //512 pages /2 sectors
+        switch (chip) {
+            case 0xc2:
+                PrintAndLogEx(NORMAL, "   IC type : SLE 66R04P 770 Bytes");
+                break; //77 pages
+            case 0xc4:
+                PrintAndLogEx(NORMAL, "   IC type : SLE 66R16P 2560 Bytes");
+                break; //256 pages
+            case 0xc6:
+                PrintAndLogEx(NORMAL, "   IC type : SLE 66R32P 5120 Bytes");
+                break; //512 pages /2 sectors
         }
     }
     // CT (cascade tag byte) 0x88 xor SN0 xor SN1 xor SN2
-    int crc0 = 0x88 ^ data[0] ^ data[1] ^data[2];
-    if ( data[3] == crc0 )
+    int crc0 = 0x88 ^ data[0] ^ data[1] ^ data[2];
+    if (data[3] == crc0)
         PrintAndLogEx(NORMAL, "      BCC0 : %02X, Ok", data[3]);
     else
         PrintAndLogEx(NORMAL, "      BCC0 : %02X, crc should be %02X", data[3], crc0);
 
-    int crc1 = data[4] ^ data[5] ^ data[6] ^data[7];
-    if ( data[8] == crc1 )
+    int crc1 = data[4] ^ data[5] ^ data[6] ^ data[7];
+    if (data[8] == crc1)
         PrintAndLogEx(NORMAL, "      BCC1 : %02X, Ok", data[8]);
     else
-        PrintAndLogEx(NORMAL, "      BCC1 : %02X, crc should be %02X", data[8], crc1 );
+        PrintAndLogEx(NORMAL, "      BCC1 : %02X, crc should be %02X", data[8], crc1);
 
-    PrintAndLogEx(NORMAL, "  Internal : %02X, %sdefault", data[9], (data[9]==0x48)?"":"not " );
+    PrintAndLogEx(NORMAL, "  Internal : %02X, %sdefault", data[9], (data[9] == 0x48) ? "" : "not ");
 
     PrintAndLogEx(NORMAL, "      Lock : %s - %s",
-                sprint_hex(data+10, 2),
-                sprint_bin(data+10, 2)
-        );
+                  sprint_hex(data + 10, 2),
+                  sprint_bin(data + 10, 2)
+                 );
 
     PrintAndLogEx(NORMAL, "OneTimePad : %s - %s\n",
-                sprint_hex(data + 12, 4),
-                sprint_bin(data+12, 4)
-        );
+                  sprint_hex(data + 12, 4),
+                  sprint_bin(data + 12, 4)
+                 );
 
     return 0;
 }
 
-static int ndef_print_CC(uint8_t *data) {
+static int ndef_print_CC(uint8_t *data)
+{
     // no NDEF message
     if (data[0] != 0xE1)
         return -1;
 
     PrintAndLogEx(NORMAL, "--- NDEF Message");
-    PrintAndLogEx(NORMAL, "Capability Container: %s", sprint_hex(data,4) );
+    PrintAndLogEx(NORMAL, "Capability Container: %s", sprint_hex(data, 4));
     PrintAndLogEx(NORMAL, "  %02X : NDEF Magic Number", data[0]);
     PrintAndLogEx(NORMAL, "  %02X : version %d.%d supported by tag", data[1], (data[1] & 0xF0) >> 4, data[1] & 0x0F);
     PrintAndLogEx(NORMAL, "  %02X : Physical Memory Size: %d bytes", data[2], (data[2] + 1) * 8);
-    if ( data[2] == 0x96 )
+    if (data[2] == 0x96)
         PrintAndLogEx(NORMAL, "  %02X : NDEF Memory Size: %d bytes", data[2], 48);
-    else if ( data[2] == 0x12 )
+    else if (data[2] == 0x12)
         PrintAndLogEx(NORMAL, "  %02X : NDEF Memory Size: %d bytes", data[2], 144);
-    else if ( data[2] == 0x3E )
+    else if (data[2] == 0x3E)
         PrintAndLogEx(NORMAL, "  %02X : NDEF Memory Size: %d bytes", data[2], 496);
-    else if ( data[2] == 0x6D )
+    else if (data[2] == 0x6D)
         PrintAndLogEx(NORMAL, "  %02X : NDEF Memory Size: %d bytes", data[2], 872);
 
     PrintAndLogEx(NORMAL, "  %02X : %s / %s", data[3],
-                (data[3] & 0xF0) ? "(RFU)" : "Read access granted without any security",
-                (data[3] & 0x0F)==0 ? "Write access granted without any security" : (data[3] & 0x0F)==0x0F ? "No write access granted at all" : "(RFU)");
+                  (data[3] & 0xF0) ? "(RFU)" : "Read access granted without any security",
+                  (data[3] & 0x0F) == 0 ? "Write access granted without any security" : (data[3] & 0x0F) == 0x0F ? "No write access granted at all" : "(RFU)");
     return 0;
 }
 
-int ul_print_type(uint32_t tagtype, uint8_t spaces){
+int ul_print_type(uint32_t tagtype, uint8_t spaces)
+{
     char spc[11] = "          ";
-    spc[10]=0x00;
-    char *spacer = spc + (10-spaces);
+    spc[10] = 0x00;
+    char *spacer = spc + (10 - spaces);
 
-    if ( tagtype & UL )
-        PrintAndLogEx(NORMAL, "%sTYPE : MIFARE Ultralight (MF0ICU1) %s", spacer, (tagtype & MAGIC) ? "<magic>" : "" );
-    else if ( tagtype & UL_C)
-        PrintAndLogEx(NORMAL, "%sTYPE : MIFARE Ultralight C (MF0ULC) %s", spacer, (tagtype & MAGIC) ? "<magic>" : "" );
-    else if ( tagtype & UL_NANO_40)
+    if (tagtype & UL)
+        PrintAndLogEx(NORMAL, "%sTYPE : MIFARE Ultralight (MF0ICU1) %s", spacer, (tagtype & MAGIC) ? "<magic>" : "");
+    else if (tagtype & UL_C)
+        PrintAndLogEx(NORMAL, "%sTYPE : MIFARE Ultralight C (MF0ULC) %s", spacer, (tagtype & MAGIC) ? "<magic>" : "");
+    else if (tagtype & UL_NANO_40)
         PrintAndLogEx(NORMAL, "%sTYPE : MIFARE Ultralight Nano 40bytes (MF0UNH00)", spacer);
-    else if ( tagtype & UL_EV1_48)
+    else if (tagtype & UL_EV1_48)
         PrintAndLogEx(NORMAL, "%sTYPE : MIFARE Ultralight EV1 48bytes (MF0UL1101)", spacer);
-    else if ( tagtype & UL_EV1_128)
+    else if (tagtype & UL_EV1_128)
         PrintAndLogEx(NORMAL, "%sTYPE : MIFARE Ultralight EV1 128bytes (MF0UL2101)", spacer);
-    else if ( tagtype & UL_EV1 )
+    else if (tagtype & UL_EV1)
         PrintAndLogEx(NORMAL, "%sTYPE : MIFARE Ultralight EV1 UNKNOWN", spacer);
-    else if ( tagtype & NTAG )
+    else if (tagtype & NTAG)
         PrintAndLogEx(NORMAL, "%sTYPE : NTAG UNKNOWN", spacer);
-    else if ( tagtype & NTAG_203 )
+    else if (tagtype & NTAG_203)
         PrintAndLogEx(NORMAL, "%sTYPE : NTAG 203 144bytes (NT2H0301F0DT)", spacer);
-    else if ( tagtype & NTAG_210 )
+    else if (tagtype & NTAG_210)
         PrintAndLogEx(NORMAL, "%sTYPE : NTAG 210 48bytes (NT2L1011G0DU)", spacer);
-    else if ( tagtype & NTAG_212 )
+    else if (tagtype & NTAG_212)
         PrintAndLogEx(NORMAL, "%sTYPE : NTAG 212 128bytes (NT2L1211G0DU)", spacer);
-    else if ( tagtype & NTAG_213 )
+    else if (tagtype & NTAG_213)
         PrintAndLogEx(NORMAL, "%sTYPE : NTAG 213 144bytes (NT2H1311G0DU)", spacer);
-    else if ( tagtype & NTAG_213_F )
+    else if (tagtype & NTAG_213_F)
         PrintAndLogEx(NORMAL, "%sTYPE : NTAG 213F 144bytes (NT2H1311F0DTL)", spacer);
-    else if ( tagtype & NTAG_215 )
+    else if (tagtype & NTAG_215)
         PrintAndLogEx(NORMAL, "%sTYPE : NTAG 215 504bytes (NT2H1511G0DU)", spacer);
-    else if ( tagtype & NTAG_216 )
+    else if (tagtype & NTAG_216)
         PrintAndLogEx(NORMAL, "%sTYPE : NTAG 216 888bytes (NT2H1611G0DU)", spacer);
-    else if ( tagtype & NTAG_216_F )
+    else if (tagtype & NTAG_216_F)
         PrintAndLogEx(NORMAL, "%sTYPE : NTAG 216F 888bytes (NT2H1611F0DTL)", spacer);
-    else if ( tagtype & NTAG_I2C_1K )
+    else if (tagtype & NTAG_I2C_1K)
         PrintAndLogEx(NORMAL, "%sTYPE : NTAG I%sC 888bytes (NT3H1101FHK)", spacer, "\xFD");
-    else if ( tagtype & NTAG_I2C_2K )
+    else if (tagtype & NTAG_I2C_2K)
         PrintAndLogEx(NORMAL, "%sTYPE : NTAG I%sC 1904bytes (NT3H1201FHK)", spacer, "\xFD");
-    else if ( tagtype & NTAG_I2C_1K_PLUS )
+    else if (tagtype & NTAG_I2C_1K_PLUS)
         PrintAndLogEx(NORMAL, "%sTYPE : NTAG I%sC plus 888bytes (NT3H2111FHK)", spacer, "\xFD");
-    else if ( tagtype & NTAG_I2C_2K_PLUS )
+    else if (tagtype & NTAG_I2C_2K_PLUS)
         PrintAndLogEx(NORMAL, "%sTYPE : NTAG I%sC plus 1912bytes (NT3H2211FHK)", spacer, "\xFD");
-    else if ( tagtype & MY_D )
+    else if (tagtype & MY_D)
         PrintAndLogEx(NORMAL, "%sTYPE : INFINEON my-d\x99 (SLE 66RxxS)", spacer);
-    else if ( tagtype & MY_D_NFC )
+    else if (tagtype & MY_D_NFC)
         PrintAndLogEx(NORMAL, "%sTYPE : INFINEON my-d\x99 NFC (SLE 66RxxP)", spacer);
-    else if ( tagtype & MY_D_MOVE )
+    else if (tagtype & MY_D_MOVE)
         PrintAndLogEx(NORMAL, "%sTYPE : INFINEON my-d\x99 move (SLE 66R01P)", spacer);
-    else if ( tagtype & MY_D_MOVE_NFC )
+    else if (tagtype & MY_D_MOVE_NFC)
         PrintAndLogEx(NORMAL, "%sTYPE : INFINEON my-d\x99 move NFC (SLE 66R01P)", spacer);
-    else if ( tagtype & MY_D_MOVE_LEAN )
+    else if (tagtype & MY_D_MOVE_LEAN)
         PrintAndLogEx(NORMAL, "%sTYPE : INFINEON my-d\x99 move lean (SLE 66R01L)", spacer);
-    else if ( tagtype & FUDAN_UL )
-        PrintAndLogEx(NORMAL, "%sTYPE : FUDAN Ultralight Compatible (or other compatible) %s", spacer, (tagtype & MAGIC) ? "<magic>" : "" );
+    else if (tagtype & FUDAN_UL)
+        PrintAndLogEx(NORMAL, "%sTYPE : FUDAN Ultralight Compatible (or other compatible) %s", spacer, (tagtype & MAGIC) ? "<magic>" : "");
     else
         PrintAndLogEx(NORMAL, "%sTYPE : Unknown %06x", spacer, tagtype);
     return 0;
 }
 
-static int ulc_print_3deskey( uint8_t *data){
-    PrintAndLogEx(NORMAL, "         deskey1 [44/0x2C] : %s [s]", sprint_hex(data   ,4), sprint_ascii(data,4) );
-    PrintAndLogEx(NORMAL, "         deskey1 [45/0x2D] : %s [s]", sprint_hex(data+4 ,4), sprint_ascii(data+4,4));
-    PrintAndLogEx(NORMAL, "         deskey2 [46/0x2E] : %s [s]", sprint_hex(data+8 ,4), sprint_ascii(data+8,4));
-    PrintAndLogEx(NORMAL, "         deskey2 [47/0x2F] : %s [s]", sprint_hex(data+12,4), sprint_ascii(data+12,4));
+static int ulc_print_3deskey(uint8_t *data)
+{
+    PrintAndLogEx(NORMAL, "         deskey1 [44/0x2C] : %s [s]", sprint_hex(data, 4), sprint_ascii(data, 4));
+    PrintAndLogEx(NORMAL, "         deskey1 [45/0x2D] : %s [s]", sprint_hex(data + 4, 4), sprint_ascii(data + 4, 4));
+    PrintAndLogEx(NORMAL, "         deskey2 [46/0x2E] : %s [s]", sprint_hex(data + 8, 4), sprint_ascii(data + 8, 4));
+    PrintAndLogEx(NORMAL, "         deskey2 [47/0x2F] : %s [s]", sprint_hex(data + 12, 4), sprint_ascii(data + 12, 4));
     PrintAndLogEx(NORMAL, "\n 3des key : %s", sprint_hex(SwapEndian64(data, 16, 8), 16));
     return 0;
 }
 
-static int ulc_print_configuration( uint8_t *data){
+static int ulc_print_configuration(uint8_t *data)
+{
 
     PrintAndLogEx(NORMAL, "--- UL-C Configuration");
     PrintAndLogEx(NORMAL, " Higher Lockbits [40/0x28] : %s - %s", sprint_hex(data, 4), sprint_bin(data, 2));
-    PrintAndLogEx(NORMAL, "         Counter [41/0x29] : %s - %s", sprint_hex(data+4, 4), sprint_bin(data+4, 2));
+    PrintAndLogEx(NORMAL, "         Counter [41/0x29] : %s - %s", sprint_hex(data + 4, 4), sprint_bin(data + 4, 2));
 
     bool validAuth = (data[8] >= 0x03 && data[8] <= 0x30);
-    if ( validAuth )
-        PrintAndLogEx(NORMAL, "           Auth0 [42/0x2A] : %s page %d/0x%02X and above need authentication", sprint_hex(data+8, 4), data[8],data[8] );
-    else{
-        if ( data[8] == 0){
-            PrintAndLogEx(NORMAL, "           Auth0 [42/0x2A] : %s default", sprint_hex(data+8, 4) );
+    if (validAuth)
+        PrintAndLogEx(NORMAL, "           Auth0 [42/0x2A] : %s page %d/0x%02X and above need authentication", sprint_hex(data + 8, 4), data[8], data[8]);
+    else {
+        if (data[8] == 0) {
+            PrintAndLogEx(NORMAL, "           Auth0 [42/0x2A] : %s default", sprint_hex(data + 8, 4));
         } else {
-            PrintAndLogEx(NORMAL, "           Auth0 [42/0x2A] : %s auth byte is out-of-range", sprint_hex(data+8, 4) );
+            PrintAndLogEx(NORMAL, "           Auth0 [42/0x2A] : %s auth byte is out-of-range", sprint_hex(data + 8, 4));
         }
     }
     PrintAndLogEx(NORMAL, "           Auth1 [43/0x2B] : %s %s",
-            sprint_hex(data+12, 4),
-            (data[12] & 1) ? "write access restricted": "read and write access restricted"
-            );
+                  sprint_hex(data + 12, 4),
+                  (data[12] & 1) ? "write access restricted" : "read and write access restricted"
+                 );
     return 0;
 }
 
-static int ulev1_print_configuration(uint32_t tagtype, uint8_t *data, uint8_t startPage){
+static int ulev1_print_configuration(uint32_t tagtype, uint8_t *data, uint8_t startPage)
+{
 
     PrintAndLogEx(NORMAL, "\n--- Tag Configuration");
 
@@ -618,7 +661,7 @@ static int ulev1_print_configuration(uint32_t tagtype, uint8_t *data, uint8_t st
 
     PrintAndLogEx(NORMAL, "  cfg0 [%u/0x%02X] : %s", startPage, startPage, sprint_hex(data, 4));
 
-     if ( (tagtype & (NTAG_213_F | NTAG_216_F)) ) {
+    if ((tagtype & (NTAG_213_F | NTAG_216_F))) {
         uint8_t mirror_conf = (data[0] & 0xC0);
         uint8_t mirror_byte = (data[0] & 0x30);
         bool sleep_en = (data[0] & 0x08);
@@ -626,84 +669,112 @@ static int ulev1_print_configuration(uint32_t tagtype, uint8_t *data, uint8_t st
         uint8_t fdp_conf = (data[0] & 0x03);
 
         switch (mirror_conf) {
-            case 0: PrintAndLogEx(NORMAL, "                    - no ASCII mirror"); break;
-            case 1: PrintAndLogEx(NORMAL, "                    - UID ASCII mirror"); break;
-            case 2: PrintAndLogEx(NORMAL, "                    - NFC counter ASCII mirror"); break;
-            case 3: PrintAndLogEx(NORMAL, "                    - UID and NFC counter ASCII mirror"); break;
-            default: break;
+            case 0:
+                PrintAndLogEx(NORMAL, "                    - no ASCII mirror");
+                break;
+            case 1:
+                PrintAndLogEx(NORMAL, "                    - UID ASCII mirror");
+                break;
+            case 2:
+                PrintAndLogEx(NORMAL, "                    - NFC counter ASCII mirror");
+                break;
+            case 3:
+                PrintAndLogEx(NORMAL, "                    - UID and NFC counter ASCII mirror");
+                break;
+            default:
+                break;
         }
 
-        PrintAndLogEx(NORMAL, "                    - SLEEP mode %s", (sleep_en) ? "enabled":"disabled");
+        PrintAndLogEx(NORMAL, "                    - SLEEP mode %s", (sleep_en) ? "enabled" : "disabled");
 
         switch (fdp_conf) {
-            case 0: PrintAndLogEx(NORMAL, "                    - no field detect"); break;
-            case 1: PrintAndLogEx(NORMAL, "                    - enabled by first State-of-Frame (start of communication)"); break;
-            case 2: PrintAndLogEx(NORMAL, "                    - enabled by selection of the tag"); break;
-            case 3: PrintAndLogEx(NORMAL, "                    - enabled by field presence"); break;
-            default: break;
+            case 0:
+                PrintAndLogEx(NORMAL, "                    - no field detect");
+                break;
+            case 1:
+                PrintAndLogEx(NORMAL, "                    - enabled by first State-of-Frame (start of communication)");
+                break;
+            case 2:
+                PrintAndLogEx(NORMAL, "                    - enabled by selection of the tag");
+                break;
+            case 3:
+                PrintAndLogEx(NORMAL, "                    - enabled by field presence");
+                break;
+            default:
+                break;
         }
         // valid mirror start page and byte position within start page.
-        if ( tagtype & NTAG_213_F ) {
-            switch ( mirror_conf ) {
-                case 1: { PrintAndLogEx(NORMAL, "         mirror start block %02X | byte pos %02X - %s", data[2], mirror_byte, ( data[2]>= 0x4 && data[2] <= 0x24) ? "OK":"Invalid value"); break;}
-                case 2: { PrintAndLogEx(NORMAL, "         mirror start block %02X | byte pos %02X - %s", data[2], mirror_byte, ( data[2]>= 0x4 && data[2] <= 0x26) ? "OK":"Invalid value"); break;}
-                case 3: { PrintAndLogEx(NORMAL, "         mirror start block %02X | byte pos %02X - %s", data[2], mirror_byte, ( data[2]>= 0x4 && data[2] <= 0x22) ? "OK":"Invalid value"); break;}
-                default: break;
+        if (tagtype & NTAG_213_F) {
+            switch (mirror_conf) {
+                case 1:
+                { PrintAndLogEx(NORMAL, "         mirror start block %02X | byte pos %02X - %s", data[2], mirror_byte, (data[2] >= 0x4 && data[2] <= 0x24) ? "OK" : "Invalid value"); break;}
+                case 2:
+                { PrintAndLogEx(NORMAL, "         mirror start block %02X | byte pos %02X - %s", data[2], mirror_byte, (data[2] >= 0x4 && data[2] <= 0x26) ? "OK" : "Invalid value"); break;}
+                case 3:
+                { PrintAndLogEx(NORMAL, "         mirror start block %02X | byte pos %02X - %s", data[2], mirror_byte, (data[2] >= 0x4 && data[2] <= 0x22) ? "OK" : "Invalid value"); break;}
+                default:
+                    break;
             }
-        } else if ( tagtype & NTAG_216_F ) {
-            switch ( mirror_conf ) {
-                case 1: { PrintAndLogEx(NORMAL, "         mirror start block %02X | byte pos %02X - %s", data[2], mirror_byte, ( data[2]>= 0x4 && data[2] <= 0xDE) ? "OK":"Invalid value"); break;}
-                case 2: { PrintAndLogEx(NORMAL, "         mirror start block %02X | byte pos %02X - %s", data[2], mirror_byte, ( data[2]>= 0x4 && data[2] <= 0xE0) ? "OK":"Invalid value"); break;}
-                case 3: { PrintAndLogEx(NORMAL, "         mirror start block %02X | byte pos %02X - %s", data[2], mirror_byte, ( data[2]>= 0x4 && data[2] <= 0xDC) ? "OK":"Invalid value"); break;}
-                default: break;
+        } else if (tagtype & NTAG_216_F) {
+            switch (mirror_conf) {
+                case 1:
+                { PrintAndLogEx(NORMAL, "         mirror start block %02X | byte pos %02X - %s", data[2], mirror_byte, (data[2] >= 0x4 && data[2] <= 0xDE) ? "OK" : "Invalid value"); break;}
+                case 2:
+                { PrintAndLogEx(NORMAL, "         mirror start block %02X | byte pos %02X - %s", data[2], mirror_byte, (data[2] >= 0x4 && data[2] <= 0xE0) ? "OK" : "Invalid value"); break;}
+                case 3:
+                { PrintAndLogEx(NORMAL, "         mirror start block %02X | byte pos %02X - %s", data[2], mirror_byte, (data[2] >= 0x4 && data[2] <= 0xDC) ? "OK" : "Invalid value"); break;}
+                default:
+                    break;
             }
         }
     }
-    PrintAndLogEx(NORMAL, "                    - strong modulation mode %s", (strg_mod_en) ? "enabled":"disabled");
+    PrintAndLogEx(NORMAL, "                    - strong modulation mode %s", (strg_mod_en) ? "enabled" : "disabled");
 
-    if ( data[3] < 0xff )
-        PrintAndLogEx(NORMAL, "                    - page %d and above need authentication",data[3]);
+    if (data[3] < 0xff)
+        PrintAndLogEx(NORMAL, "                    - page %d and above need authentication", data[3]);
     else
         PrintAndLogEx(NORMAL, "                    - pages don't need authentication");
 
-    PrintAndLogEx(NORMAL, "  cfg1 [%u/0x%02X] : %s", startPage + 1, startPage + 1,  sprint_hex(data+4, 4) );
-    if ( authlim == 0)
+    PrintAndLogEx(NORMAL, "  cfg1 [%u/0x%02X] : %s", startPage + 1, startPage + 1,  sprint_hex(data + 4, 4));
+    if (authlim == 0)
         PrintAndLogEx(NORMAL, "                    - Unlimited password attempts");
     else
         PrintAndLogEx(NORMAL, "                    - Max number of password attempts is %d", authlim);
 
-    PrintAndLogEx(NORMAL, "                    - NFC counter %s", (nfc_cnf_en) ? "enabled":"disabled");
-    PrintAndLogEx(NORMAL, "                    - NFC counter %s", (nfc_cnf_prot_pwd) ? "not protected":"password protection enabled");
+    PrintAndLogEx(NORMAL, "                    - NFC counter %s", (nfc_cnf_en) ? "enabled" : "disabled");
+    PrintAndLogEx(NORMAL, "                    - NFC counter %s", (nfc_cnf_prot_pwd) ? "not protected" : "password protection enabled");
 
-    PrintAndLogEx(NORMAL, "                    - user configuration %s", cfglck ? "permanently locked":"writeable");
-    PrintAndLogEx(NORMAL, "                    - %s access is protected with password", prot ? "read and write":"write");
-    PrintAndLogEx(NORMAL, "                    - %02X, Virtual Card Type Identifier is %s default", vctid, (vctid==0x05)? "":"not");
-    PrintAndLogEx(NORMAL, "  PWD  [%u/0x%02X] : %s- (cannot be read)", startPage + 2, startPage + 2,  sprint_hex(data+8, 4));
-    PrintAndLogEx(NORMAL, "  PACK [%u/0x%02X] : %s      - (cannot be read)", startPage + 3, startPage + 3,  sprint_hex(data+12, 2));
-    PrintAndLogEx(NORMAL, "  RFU  [%u/0x%02X] :       %s- (cannot be read)", startPage + 3, startPage + 3,  sprint_hex(data+14, 2));
+    PrintAndLogEx(NORMAL, "                    - user configuration %s", cfglck ? "permanently locked" : "writeable");
+    PrintAndLogEx(NORMAL, "                    - %s access is protected with password", prot ? "read and write" : "write");
+    PrintAndLogEx(NORMAL, "                    - %02X, Virtual Card Type Identifier is %s default", vctid, (vctid == 0x05) ? "" : "not");
+    PrintAndLogEx(NORMAL, "  PWD  [%u/0x%02X] : %s- (cannot be read)", startPage + 2, startPage + 2,  sprint_hex(data + 8, 4));
+    PrintAndLogEx(NORMAL, "  PACK [%u/0x%02X] : %s      - (cannot be read)", startPage + 3, startPage + 3,  sprint_hex(data + 12, 2));
+    PrintAndLogEx(NORMAL, "  RFU  [%u/0x%02X] :       %s- (cannot be read)", startPage + 3, startPage + 3,  sprint_hex(data + 14, 2));
     return 0;
 }
 
-static int ulev1_print_counters(){
+static int ulev1_print_counters()
+{
     PrintAndLogEx(NORMAL, "--- Tag Counters");
     uint8_t tear[1] = {0};
-    uint8_t counter[3] = {0,0,0};
+    uint8_t counter[3] = {0, 0, 0};
     uint16_t len = 0;
-    for ( uint8_t i = 0; i<3; ++i) {
-        ulev1_readTearing(i,tear,sizeof(tear));
-        len = ulev1_readCounter(i,counter, sizeof(counter) );
+    for (uint8_t i = 0; i < 3; ++i) {
+        ulev1_readTearing(i, tear, sizeof(tear));
+        len = ulev1_readCounter(i, counter, sizeof(counter));
         if (len == 3) {
-            PrintAndLogEx(NORMAL, "       [%0d] : %s", i, sprint_hex(counter,3));
-            PrintAndLogEx(NORMAL, "                    - %02X tearing %s", tear[0], ( tear[0]==0xBD)?"Ok":"failure");
+            PrintAndLogEx(NORMAL, "       [%0d] : %s", i, sprint_hex(counter, 3));
+            PrintAndLogEx(NORMAL, "                    - %02X tearing %s", tear[0], (tear[0] == 0xBD) ? "Ok" : "failure");
         }
     }
     return len;
 }
 
-static int ulev1_print_signature( uint8_t *data, uint8_t len){
+static int ulev1_print_signature(uint8_t *data, uint8_t len)
+{
     PrintAndLogEx(NORMAL, "\n--- Tag Signature");
     PrintAndLogEx(NORMAL, "IC signature public key name  : NXP NTAG21x (2013)");
-    PrintAndLogEx(NORMAL, "IC signature public key value : %s", sprint_hex(public_ecda_key, PUBLIC_ECDA_KEYLEN) );
+    PrintAndLogEx(NORMAL, "IC signature public key value : %s", sprint_hex(public_ecda_key, PUBLIC_ECDA_KEYLEN));
     PrintAndLogEx(NORMAL, "    Elliptic curve parameters : secp128r1");
     PrintAndLogEx(NORMAL, "            Tag ECC Signature : %s", sprint_hex(data, len));
     //to do:  verify if signature is valid
@@ -712,16 +783,17 @@ static int ulev1_print_signature( uint8_t *data, uint8_t len){
     return 0;
 }
 
-static int ulev1_print_version(uint8_t *data){
+static int ulev1_print_version(uint8_t *data)
+{
     PrintAndLogEx(NORMAL, "\n--- Tag Version");
-    PrintAndLogEx(NORMAL, "       Raw bytes : %s",sprint_hex(data, 8) );
+    PrintAndLogEx(NORMAL, "       Raw bytes : %s", sprint_hex(data, 8));
     PrintAndLogEx(NORMAL, "       Vendor ID : %02X, %s", data[1], getTagInfo(data[1]));
     PrintAndLogEx(NORMAL, "    Product type : %s", getProductTypeStr(data[2]));
-    PrintAndLogEx(NORMAL, " Product subtype : %02X, %s", data[3], (data[3]==1) ?"17 pF":"50pF");
+    PrintAndLogEx(NORMAL, " Product subtype : %02X, %s", data[3], (data[3] == 1) ? "17 pF" : "50pF");
     PrintAndLogEx(NORMAL, "   Major version : %02X", data[4]);
     PrintAndLogEx(NORMAL, "   Minor version : %02X", data[5]);
     PrintAndLogEx(NORMAL, "            Size : %s", getUlev1CardSizeStr(data[6]));
-    PrintAndLogEx(NORMAL, "   Protocol type : %02X %s", data[7],  (data[7]==0x3)?"(ISO14443-3 Compliant)":"");
+    PrintAndLogEx(NORMAL, "   Protocol type : %02X %s", data[7], (data[7] == 0x3) ? "(ISO14443-3 Compliant)" : "");
     return 0;
 }
 
@@ -752,22 +824,24 @@ static int ulc_magic_test(){
     return returnValue;
 }
 */
-static int ul_magic_test(){
+static int ul_magic_test()
+{
     // Magic Ultralight tests
     // 1) take present UID, and try to write it back. OBSOLETE
     // 2) make a wrong length write to page0, and see if tag answers with ACK/NACK:
 
     iso14a_card_select_t card;
-    if ( !ul_select(&card) )
+    if (!ul_select(&card))
         return UL_ERROR;
     int status = ul_comp_write(0, NULL, 0);
     DropField();
-    if ( status == 0 )
+    if (status == 0)
         return MAGIC;
     return 0;
 }
 
-uint32_t GetHF14AMfU_Type(void){
+uint32_t GetHF14AMfU_Type(void)
+{
 
     TagTypeUL_t tagtype = UNKNOWN;
     iso14a_card_select_t card;
@@ -778,13 +852,13 @@ uint32_t GetHF14AMfU_Type(void){
     if (!ul_select(&card)) return UL_ERROR;
 
     // Ultralight - ATQA / SAK
-    if ( card.atqa[1] != 0x00 || card.atqa[0] != 0x44 || card.sak != 0x00 ) {
+    if (card.atqa[1] != 0x00 || card.atqa[0] != 0x44 || card.sak != 0x00) {
         //PrintAndLogEx(NORMAL, "Tag is not Ultralight | NTAG | MY-D  [ATQA: %02X %02X SAK: %02X]\n", card.atqa[1], card.atqa[0], card.sak);
         DropField();
         return UL_ERROR;
     }
 
-    if ( card.uid[0] != 0x05) {
+    if (card.uid[0] != 0x05) {
 
         len  = ulev1_getVersion(version, sizeof(version));
         DropField();
@@ -792,35 +866,43 @@ uint32_t GetHF14AMfU_Type(void){
         switch (len) {
             case 0x0A: {
 
-                if ( memcmp(version, "\x00\x04\x03\x01\x01\x00\x0B", 7) == 0)      { tagtype = UL_EV1_48; break; }
-                else if ( memcmp(version, "\x00\x04\x03\x01\x02\x00\x0B", 7) == 0) { tagtype = UL_NANO_40; break; }
-                else if ( memcmp(version, "\x00\x04\x03\x02\x01\x00\x0B", 7) == 0) { tagtype = UL_EV1_48; break; }
-                else if ( memcmp(version, "\x00\x04\x03\x01\x01\x00\x0E", 7) == 0) { tagtype = UL_EV1_128; break; }
-                else if ( memcmp(version, "\x00\x04\x03\x02\x01\x00\x0E", 7) == 0) { tagtype = UL_EV1_128; break; }
-                else if ( memcmp(version, "\x00\x04\x04\x01\x01\x00\x0B", 7) == 0) { tagtype = NTAG_210; break; }
-                else if ( memcmp(version, "\x00\x04\x04\x01\x01\x00\x0E", 7) == 0) { tagtype = NTAG_212; break; }
-                else if ( memcmp(version, "\x00\x04\x04\x02\x01\x00\x0F", 7) == 0) { tagtype = NTAG_213; break; }
-                else if ( memcmp(version, "\x00\x04\x04\x02\x01\x00\x11", 7) == 0) { tagtype = NTAG_215; break; }
-                else if ( memcmp(version, "\x00\x04\x04\x02\x01\x00\x13", 7) == 0) { tagtype = NTAG_216; break; }
-                else if ( memcmp(version, "\x00\x04\x04\x04\x01\x00\x0F", 7) == 0) { tagtype = NTAG_213_F; break; }
-                else if ( memcmp(version, "\x00\x04\x04\x04\x01\x00\x13", 7) == 0) { tagtype = NTAG_216_F; break; }
-                else if ( memcmp(version, "\x00\x04\x04\x05\x02\x01\x13", 7) == 0) { tagtype = NTAG_I2C_1K; break; }
-                else if ( memcmp(version, "\x00\x04\x04\x05\x02\x01\x15", 7) == 0) { tagtype = NTAG_I2C_2K; break; }
-                else if ( memcmp(version, "\x00\x04\x04\x05\x02\x02\x13", 7) == 0) { tagtype = NTAG_I2C_1K_PLUS; break; }
-                else if ( memcmp(version, "\x00\x04\x04\x05\x02\x02\x15", 7) == 0) { tagtype = NTAG_I2C_2K_PLUS; break; }
-                else if ( version[2] == 0x04 ) { tagtype = NTAG; break; }
-                else if ( version[2] == 0x03 ) { tagtype = UL_EV1; }
+                if (memcmp(version, "\x00\x04\x03\x01\x01\x00\x0B", 7) == 0)      { tagtype = UL_EV1_48; break; }
+                else if (memcmp(version, "\x00\x04\x03\x01\x02\x00\x0B", 7) == 0) { tagtype = UL_NANO_40; break; }
+                else if (memcmp(version, "\x00\x04\x03\x02\x01\x00\x0B", 7) == 0) { tagtype = UL_EV1_48; break; }
+                else if (memcmp(version, "\x00\x04\x03\x01\x01\x00\x0E", 7) == 0) { tagtype = UL_EV1_128; break; }
+                else if (memcmp(version, "\x00\x04\x03\x02\x01\x00\x0E", 7) == 0) { tagtype = UL_EV1_128; break; }
+                else if (memcmp(version, "\x00\x04\x04\x01\x01\x00\x0B", 7) == 0) { tagtype = NTAG_210; break; }
+                else if (memcmp(version, "\x00\x04\x04\x01\x01\x00\x0E", 7) == 0) { tagtype = NTAG_212; break; }
+                else if (memcmp(version, "\x00\x04\x04\x02\x01\x00\x0F", 7) == 0) { tagtype = NTAG_213; break; }
+                else if (memcmp(version, "\x00\x04\x04\x02\x01\x00\x11", 7) == 0) { tagtype = NTAG_215; break; }
+                else if (memcmp(version, "\x00\x04\x04\x02\x01\x00\x13", 7) == 0) { tagtype = NTAG_216; break; }
+                else if (memcmp(version, "\x00\x04\x04\x04\x01\x00\x0F", 7) == 0) { tagtype = NTAG_213_F; break; }
+                else if (memcmp(version, "\x00\x04\x04\x04\x01\x00\x13", 7) == 0) { tagtype = NTAG_216_F; break; }
+                else if (memcmp(version, "\x00\x04\x04\x05\x02\x01\x13", 7) == 0) { tagtype = NTAG_I2C_1K; break; }
+                else if (memcmp(version, "\x00\x04\x04\x05\x02\x01\x15", 7) == 0) { tagtype = NTAG_I2C_2K; break; }
+                else if (memcmp(version, "\x00\x04\x04\x05\x02\x02\x13", 7) == 0) { tagtype = NTAG_I2C_1K_PLUS; break; }
+                else if (memcmp(version, "\x00\x04\x04\x05\x02\x02\x15", 7) == 0) { tagtype = NTAG_I2C_2K_PLUS; break; }
+                else if (version[2] == 0x04) { tagtype = NTAG; break; }
+                else if (version[2] == 0x03) { tagtype = UL_EV1; }
                 break;
             }
-            case 0x01: tagtype = UL_C; break;
-            case 0x00: tagtype = UL; break;
-            case -1  : tagtype = (UL | UL_C | NTAG_203); break;  // could be UL | UL_C magic tags
-            default  : tagtype = UNKNOWN; break;
+            case 0x01:
+                tagtype = UL_C;
+                break;
+            case 0x00:
+                tagtype = UL;
+                break;
+            case -1  :
+                tagtype = (UL | UL_C | NTAG_203);
+                break;  // could be UL | UL_C magic tags
+            default  :
+                tagtype = UNKNOWN;
+                break;
         }
 
         // UL vs UL-C vs ntag203 test
         if (tagtype & (UL | UL_C | NTAG_203)) {
-            if ( !ul_select(&card) ) return UL_ERROR;
+            if (!ul_select(&card)) return UL_ERROR;
 
             // do UL_C check first...
             uint8_t nonce[11] = {0x00};
@@ -830,17 +912,17 @@ uint32_t GetHF14AMfU_Type(void){
                 tagtype = UL_C;
             } else {
                 // need to re-select after authentication error
-                if ( !ul_select(&card) ) return UL_ERROR;
+                if (!ul_select(&card)) return UL_ERROR;
 
                 uint8_t data[16] = {0x00};
                 // read page 0x26-0x29 (last valid ntag203 page)
                 status = ul_read(0x26, data, sizeof(data));
-                if ( status <= 1 ) {
+                if (status <= 1) {
                     tagtype = UL;
                 } else {
                     // read page 0x30 (should error if it is a ntag203)
                     status = ul_read(0x30, data, sizeof(data));
-                    if ( status <= 1 ){
+                    if (status <= 1) {
                         tagtype = NTAG_203;
                     } else {
                         tagtype = UNKNOWN;
@@ -857,12 +939,20 @@ uint32_t GetHF14AMfU_Type(void){
         DropField();
         // Infinition MY-D tests   Exam high nibble
         uint8_t nib = (card.uid[1] & 0xf0) >> 4;
-        switch ( nib ){
+        switch (nib) {
             // case 0: tagtype =  SLE66R35E7; break; //or SLE 66R35E7 - mifare compat... should have different sak/atqa for mf 1k
-            case 1: tagtype =  MY_D; break; // or SLE 66RxxS ... up to 512 pages of 8 user bytes...
-            case 2: tagtype = (MY_D_NFC); break; // or SLE 66RxxP ... up to 512 pages of 8 user bytes... (or in nfc mode FF pages of 4 bytes)
-            case 3: tagtype = (MY_D_MOVE | MY_D_MOVE_NFC); break; // or SLE 66R01P // 38 pages of 4 bytes //notice: we can not currently distinguish between these two
-            case 7: tagtype =  MY_D_MOVE_LEAN; break; // or SLE 66R01L  // 16 pages of 4 bytes
+            case 1:
+                tagtype =  MY_D;
+                break; // or SLE 66RxxS ... up to 512 pages of 8 user bytes...
+            case 2:
+                tagtype = (MY_D_NFC);
+                break; // or SLE 66RxxP ... up to 512 pages of 8 user bytes... (or in nfc mode FF pages of 4 bytes)
+            case 3:
+                tagtype = (MY_D_MOVE | MY_D_MOVE_NFC);
+                break; // or SLE 66R01P // 38 pages of 4 bytes //notice: we can not currently distinguish between these two
+            case 7:
+                tagtype =  MY_D_MOVE_LEAN;
+                break; // or SLE 66R01L  // 16 pages of 4 bytes
         }
     }
 
@@ -873,7 +963,8 @@ uint32_t GetHF14AMfU_Type(void){
 //
 //  extended tag information
 //
-int CmdHF14AMfUInfo(const char *Cmd){
+int CmdHF14AMfUInfo(const char *Cmd)
+{
 
     uint8_t authlim = 0xff;
     uint8_t data[16] = {0x00};
@@ -887,36 +978,36 @@ int CmdHF14AMfUInfo(const char *Cmd){
     uint8_t dataLen = 0;
     uint8_t authenticationkey[16] = {0x00};
     uint8_t *authkeyptr = authenticationkey;
-    uint8_t pwd[4] = {0,0,0,0};
+    uint8_t pwd[4] = {0, 0, 0, 0};
     uint8_t *key = pwd;
-    uint8_t pack[4] = {0,0,0,0};
+    uint8_t pack[4] = {0, 0, 0, 0};
     int len = 0;
     char tempStr[50];
 
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
-        case 'h':
-            return usage_hf_mfu_info();
-        case 'k':
-            dataLen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
-            if (dataLen == 32 || dataLen == 8) { //ul-c or ev1/ntag key length
-                errors = param_gethex(tempStr, 0, authenticationkey, dataLen);
-                dataLen /= 2; // handled as bytes from now on
-            } else {
-                PrintAndLogEx(WARNING, "ERROR: Key is incorrect length\n");
+            case 'h':
+                return usage_hf_mfu_info();
+            case 'k':
+                dataLen = param_getstr(Cmd, cmdp + 1, tempStr, sizeof(tempStr));
+                if (dataLen == 32 || dataLen == 8) { //ul-c or ev1/ntag key length
+                    errors = param_gethex(tempStr, 0, authenticationkey, dataLen);
+                    dataLen /= 2; // handled as bytes from now on
+                } else {
+                    PrintAndLogEx(WARNING, "ERROR: Key is incorrect length\n");
+                    errors = true;
+                }
+                cmdp += 2;
+                hasAuthKey = true;
+                break;
+            case 'l':
+                swapEndian = true;
+                cmdp++;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
                 errors = true;
-            }
-            cmdp += 2;
-            hasAuthKey = true;
-            break;
-        case 'l':
-            swapEndian = true;
-            cmdp++;
-            break;
-        default:
-            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-            errors = true;
-            break;
+                break;
         }
     }
     //Validations
@@ -930,19 +1021,19 @@ int CmdHF14AMfUInfo(const char *Cmd){
     ul_print_type(tagtype, 6);
 
     // Swap endianness
-    if (swapEndian && hasAuthKey) authkeyptr = SwapEndian64(authenticationkey, dataLen, (dataLen == 16) ? 8 : 4 );
+    if (swapEndian && hasAuthKey) authkeyptr = SwapEndian64(authenticationkey, dataLen, (dataLen == 16) ? 8 : 4);
 
-    if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
+    if (!ul_auth_select(&card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
 
     // read pages 0,1,2,3 (should read 4pages)
     status = ul_read(0, data, sizeof(data));
-    if ( status == -1 ) {
+    if (status == -1) {
         DropField();
         PrintAndLogEx(WARNING, "Error: tag didn't answer to READ");
         return status;
     } else if (status == 16) {
         ul_print_default(data);
-        ndef_print_CC(data+12);
+        ndef_print_CC(data + 12);
     } else {
         locked = true;
     }
@@ -953,7 +1044,7 @@ int CmdHF14AMfUInfo(const char *Cmd){
         // read pages 0x28, 0x29, 0x2A, 0x2B
         uint8_t ulc_conf[16] = {0x00};
         status = ul_read(0x28, ulc_conf, sizeof(ulc_conf));
-        if ( status == -1 ){
+        if (status == -1) {
             PrintAndLogEx(WARNING, "Error: tag didn't answer to READ UL-C");
             DropField();
             return status;
@@ -967,7 +1058,7 @@ int CmdHF14AMfUInfo(const char *Cmd){
             //just read key
             uint8_t ulc_deskey[16] = {0x00};
             status = ul_read(0x2C, ulc_deskey, sizeof(ulc_deskey));
-            if ( status == -1 ) {
+            if (status == -1) {
                 DropField();
                 PrintAndLogEx(WARNING, "Error: tag didn't answer to READ magic");
                 return status;
@@ -977,16 +1068,16 @@ int CmdHF14AMfUInfo(const char *Cmd){
         } else {
             DropField();
             // if we called info with key, just return
-            if ( hasAuthKey ) return 1;
+            if (hasAuthKey) return 1;
 
             // also try to diversify default keys..  look into CmdHF14AMfuGenDiverseKeys
             PrintAndLogEx(INFO, "Trying some default 3des keys");
-            for (uint8_t i = 0; i < KEYS_3DES_COUNT; ++i ) {
+            for (uint8_t i = 0; i < KEYS_3DES_COUNT; ++i) {
                 key = default_3des_keys[i];
                 if (ulc_authentication(key, true)) {
                     PrintAndLogEx(SUCCESS, "Found default 3des key: ");
                     uint8_t keySwap[16];
-                    memcpy(keySwap, SwapEndian64(key,16,8), 16);
+                    memcpy(keySwap, SwapEndian64(key, 16, 8), 16);
                     ulc_print_3deskey(keySwap);
                     return 1;
                 }
@@ -1001,7 +1092,7 @@ int CmdHF14AMfUInfo(const char *Cmd){
     if ((tagtype & (UL_EV1_48 | UL_EV1_128 | UL_EV1))) {
         if (ulev1_print_counters() != 3) {
             // failed - re-select
-            if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
+            if (!ul_auth_select(&card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
         }
     }
 
@@ -1010,16 +1101,16 @@ int CmdHF14AMfUInfo(const char *Cmd){
     // Read signature
     if ((tagtype & (UL_EV1_48 | UL_EV1_128 | UL_EV1 | UL_NANO_40 | NTAG_213 | NTAG_213_F | NTAG_215 | NTAG_216 | NTAG_216_F | NTAG_I2C_1K | NTAG_I2C_2K | NTAG_I2C_1K_PLUS | NTAG_I2C_2K_PLUS))) {
         uint8_t ulev1_signature[32] = {0x00};
-        status = ulev1_readSignature( ulev1_signature, sizeof(ulev1_signature));
-        if ( status == -1 ) {
+        status = ulev1_readSignature(ulev1_signature, sizeof(ulev1_signature));
+        if (status == -1) {
             PrintAndLogEx(WARNING, "Error: tag didn't answer to READ SIGNATURE");
             DropField();
             return status;
         }
-        if (status == 32) ulev1_print_signature( ulev1_signature, sizeof(ulev1_signature));
+        if (status == 32) ulev1_print_signature(ulev1_signature, sizeof(ulev1_signature));
         else {
             // re-select
-            if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
+            if (!ul_auth_select(&card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
         }
     }
 
@@ -1027,7 +1118,7 @@ int CmdHF14AMfUInfo(const char *Cmd){
     if ((tagtype & (UL_EV1_48 | UL_EV1_128 | UL_EV1 | UL_NANO_40 | NTAG_213 | NTAG_213_F | NTAG_215 | NTAG_216 | NTAG_216_F | NTAG_I2C_1K | NTAG_I2C_2K | NTAG_I2C_1K_PLUS | NTAG_I2C_2K_PLUS))) {
         uint8_t version[10] = {0x00};
         status  = ulev1_getVersion(version, sizeof(version));
-        if ( status == -1 ) {
+        if (status == -1) {
             PrintAndLogEx(WARNING, "Error: tag didn't answer to GETVERSION");
             DropField();
             return status;
@@ -1035,7 +1126,7 @@ int CmdHF14AMfUInfo(const char *Cmd){
             ulev1_print_version(version);
         } else {
             locked = true;
-            if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
+            if (!ul_auth_select(&card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
         }
 
         uint8_t startconfigblock = 0;
@@ -1044,14 +1135,14 @@ int CmdHF14AMfUInfo(const char *Cmd){
         // config blocks always are last 4 pages
         for (uint8_t i = 0; i < MAX_UL_TYPES; i++) {
             if (tagtype & UL_TYPES_ARRAY[i]) {
-                startconfigblock = UL_MEMORY_ARRAY[i]-3;
+                startconfigblock = UL_MEMORY_ARRAY[i] - 3;
                 break;
             }
         }
 
-        if (startconfigblock){ // if we know where the config block is...
+        if (startconfigblock) { // if we know where the config block is...
             status = ul_read(startconfigblock, ulev1_conf, sizeof(ulev1_conf));
-            if ( status == -1 ) {
+            if (status == -1) {
                 PrintAndLogEx(WARNING, "Error: tag didn't answer to READ EV1");
                 DropField();
                 return status;
@@ -1059,9 +1150,9 @@ int CmdHF14AMfUInfo(const char *Cmd){
                 // save AUTHENTICATION LIMITS for later:
                 authlim = (ulev1_conf[4] & 0x07);
                 // add pwd / pack if used from cli
-                if ( hasAuthKey ) {
-                    memcpy(ulev1_conf+8, authkeyptr, 4);
-                    memcpy(ulev1_conf+12, pack, 2);
+                if (hasAuthKey) {
+                    memcpy(ulev1_conf + 8, authkeyptr, 4);
+                    memcpy(ulev1_conf + 12, pack, 2);
                 }
                 ulev1_print_configuration(tagtype, ulev1_conf, startconfigblock);
             }
@@ -1071,58 +1162,58 @@ int CmdHF14AMfUInfo(const char *Cmd){
         // 0 = limitless.
         // 1-7 = limit. No automatic tries then.
         // hasAuthKey,  if we was called with key, skip test.
-        if ( !authlim && !hasAuthKey ) {
+        if (!authlim && !hasAuthKey) {
             PrintAndLogEx(NORMAL, "\n--- Known EV1/NTAG passwords.");
             len = 0;
 
             // test pwd gen A
-            num_to_bytes( ul_ev1_pwdgenA(card.uid), 4, key);
+            num_to_bytes(ul_ev1_pwdgenA(card.uid), 4, key);
             len = ulev1_requestAuthentication(key, pack, sizeof(pack));
             if (len > -1) {
-                PrintAndLogEx(SUCCESS, "Found a default password: %s || Pack: %02X %02X",sprint_hex(key, 4), pack[0], pack[1]);
+                PrintAndLogEx(SUCCESS, "Found a default password: %s || Pack: %02X %02X", sprint_hex(key, 4), pack[0], pack[1]);
                 goto out;
             }
 
-            if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
+            if (!ul_auth_select(&card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
 
             // test pwd gen B
-            num_to_bytes( ul_ev1_pwdgenB(card.uid), 4, key);
+            num_to_bytes(ul_ev1_pwdgenB(card.uid), 4, key);
             len = ulev1_requestAuthentication(key, pack, sizeof(pack));
             if (len > -1) {
-                PrintAndLogEx(SUCCESS, "Found a default password: %s || Pack: %02X %02X",sprint_hex(key, 4), pack[0], pack[1]);
+                PrintAndLogEx(SUCCESS, "Found a default password: %s || Pack: %02X %02X", sprint_hex(key, 4), pack[0], pack[1]);
                 goto out;
             }
 
-            if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
+            if (!ul_auth_select(&card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
 
             // test pwd gen C
-            num_to_bytes( ul_ev1_pwdgenC(card.uid), 4, key);
+            num_to_bytes(ul_ev1_pwdgenC(card.uid), 4, key);
             len = ulev1_requestAuthentication(key, pack, sizeof(pack));
             if (len > -1) {
-                PrintAndLogEx(SUCCESS, "Found a default password: %s || Pack: %02X %02X",sprint_hex(key, 4), pack[0], pack[1]);
+                PrintAndLogEx(SUCCESS, "Found a default password: %s || Pack: %02X %02X", sprint_hex(key, 4), pack[0], pack[1]);
                 goto out;
             }
 
-            if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
+            if (!ul_auth_select(&card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
 
             // test pwd gen D
-            num_to_bytes( ul_ev1_pwdgenD(card.uid), 4, key);
+            num_to_bytes(ul_ev1_pwdgenD(card.uid), 4, key);
             len = ulev1_requestAuthentication(key, pack, sizeof(pack));
             if (len > -1) {
-                PrintAndLogEx(SUCCESS, "Found a default password: %s || Pack: %02X %02X",sprint_hex(key, 4), pack[0], pack[1]);
+                PrintAndLogEx(SUCCESS, "Found a default password: %s || Pack: %02X %02X", sprint_hex(key, 4), pack[0], pack[1]);
                 goto out;
             }
 
-            if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
+            if (!ul_auth_select(&card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
 
-            for (uint8_t i = 0; i < KEYS_PWD_COUNT; ++i ) {
+            for (uint8_t i = 0; i < KEYS_PWD_COUNT; ++i) {
                 key = default_pwd_pack[i];
                 len = ulev1_requestAuthentication(key, pack, sizeof(pack));
                 if (len > -1) {
-                    PrintAndLogEx(SUCCESS, "Found a default password: %s || Pack: %02X %02X",sprint_hex(key, 4), pack[0], pack[1]);
+                    PrintAndLogEx(SUCCESS, "Found a default password: %s || Pack: %02X %02X", sprint_hex(key, 4), pack[0], pack[1]);
                     break;
                 } else {
-                    if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
+                    if (!ul_auth_select(&card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
                 }
             }
             if (len < 1) PrintAndLogEx(WARNING, "password not known");
@@ -1138,7 +1229,8 @@ out:
 //
 //  Write Single Block
 //
-int CmdHF14AMfUWrBl(const char *Cmd){
+int CmdHF14AMfUWrBl(const char *Cmd)
+{
 
     int blockNo = -1;
     bool errors = false;
@@ -1159,16 +1251,16 @@ int CmdHF14AMfUWrBl(const char *Cmd){
                 return usage_hf_mfu_wrbl();
             case 'k':
                 // EV1/NTAG size key
-                keylen = param_gethex(Cmd, cmdp+1, data, 8);
-                if ( !keylen ) {
+                keylen = param_gethex(Cmd, cmdp + 1, data, 8);
+                if (!keylen) {
                     memcpy(authenticationkey, data, 4);
                     cmdp += 2;
                     hasPwdKey = true;
                     break;
                 }
                 // UL-C size key
-                keylen = param_gethex(Cmd, cmdp+1, data, 32);
-                if (!keylen){
+                keylen = param_gethex(Cmd, cmdp + 1, data, 32);
+                if (!keylen) {
                     memcpy(authenticationkey, data, 16);
                     cmdp += 2;
                     hasAuthKey = true;
@@ -1178,7 +1270,7 @@ int CmdHF14AMfUWrBl(const char *Cmd){
                 errors = true;
                 break;
             case 'b':
-                blockNo = param_get8(Cmd, cmdp+1);
+                blockNo = param_get8(Cmd, cmdp + 1);
                 if (blockNo < 0) {
                     PrintAndLogEx(WARNING, "Wrong block number");
                     errors = true;
@@ -1190,7 +1282,7 @@ int CmdHF14AMfUWrBl(const char *Cmd){
                 cmdp++;
                 break;
             case 'd':
-                if ( param_gethex(Cmd, cmdp+1, blockdata, 8) ) {
+                if (param_gethex(Cmd, cmdp + 1, blockdata, 8)) {
                     PrintAndLogEx(WARNING, "Block data must include 8 HEX symbols");
                     errors = true;
                     break;
@@ -1206,20 +1298,20 @@ int CmdHF14AMfUWrBl(const char *Cmd){
     //Validations
     if (errors || cmdp == 0) return usage_hf_mfu_wrbl();
 
-    if ( blockNo == -1 ) return usage_hf_mfu_wrbl();
+    if (blockNo == -1) return usage_hf_mfu_wrbl();
     // starting with getting tagtype
     TagTypeUL_t tagtype = GetHF14AMfU_Type();
     if (tagtype == UL_ERROR) return -1;
 
     uint8_t maxblockno = 0;
-    for (uint8_t idx = 0; idx < MAX_UL_TYPES; idx++){
+    for (uint8_t idx = 0; idx < MAX_UL_TYPES; idx++) {
         if (tagtype & UL_TYPES_ARRAY[idx]) {
             maxblockno = UL_MEMORY_ARRAY[idx];
             break;
         }
     }
-    if (blockNo > maxblockno){
-        PrintAndLogEx(WARNING, "block number too large. Max block is %u/0x%02X \n", maxblockno,maxblockno);
+    if (blockNo > maxblockno) {
+        PrintAndLogEx(WARNING, "block number too large. Max block is %u/0x%02X \n", maxblockno, maxblockno);
         return usage_hf_mfu_wrbl();
     }
 
@@ -1227,7 +1319,7 @@ int CmdHF14AMfUWrBl(const char *Cmd){
     if (swapEndian && hasAuthKey) authKeyPtr = SwapEndian64(authenticationkey, 16, 8);
     if (swapEndian && hasPwdKey)  authKeyPtr = SwapEndian64(authenticationkey, 4, 4);
 
-    if ( blockNo <= 3)
+    if (blockNo <= 3)
         PrintAndLogEx(NORMAL, "Special Block: %0d (0x%02X) [ %s]", blockNo, blockNo, sprint_hex(blockdata, 4));
     else
         PrintAndLogEx(NORMAL, "Block: %0d (0x%02X) [ %s]", blockNo, blockNo, sprint_hex(blockdata, 4));
@@ -1236,13 +1328,12 @@ int CmdHF14AMfUWrBl(const char *Cmd){
     UsbCommand c = {CMD_MIFAREU_WRITEBL, {blockNo}};
     memcpy(c.d.asBytes, blockdata, 4);
 
-    if ( hasAuthKey ){
+    if (hasAuthKey) {
         c.arg[1] = 1;
-        memcpy(c.d.asBytes+4, authKeyPtr, 16);
-    }
-    else if ( hasPwdKey ) {
+        memcpy(c.d.asBytes + 4, authKeyPtr, 16);
+    } else if (hasPwdKey) {
         c.arg[1] = 2;
-        memcpy(c.d.asBytes+4, authKeyPtr, 4);
+        memcpy(c.d.asBytes + 4, authKeyPtr, 4);
     }
 
     clearCommandBuffer();
@@ -1260,7 +1351,8 @@ int CmdHF14AMfUWrBl(const char *Cmd){
 //
 //  Read Single Block
 //
-int CmdHF14AMfURdBl(const char *Cmd){
+int CmdHF14AMfURdBl(const char *Cmd)
+{
 
     int blockNo = -1;
     bool errors = false;
@@ -1279,16 +1371,16 @@ int CmdHF14AMfURdBl(const char *Cmd){
                 return usage_hf_mfu_rdbl();
             case 'k':
                 // EV1/NTAG size key
-                keylen = param_gethex(Cmd, cmdp+1, data, 8);
-                if ( !keylen ) {
+                keylen = param_gethex(Cmd, cmdp + 1, data, 8);
+                if (!keylen) {
                     memcpy(authenticationkey, data, 4);
                     cmdp += 2;
                     hasPwdKey = true;
                     break;
                 }
                 // UL-C size key
-                keylen = param_gethex(Cmd, cmdp+1, data, 32);
-                if (!keylen){
+                keylen = param_gethex(Cmd, cmdp + 1, data, 32);
+                if (!keylen) {
                     memcpy(authenticationkey, data, 16);
                     cmdp += 2;
                     hasAuthKey = true;
@@ -1298,7 +1390,7 @@ int CmdHF14AMfURdBl(const char *Cmd){
                 errors = true;
                 break;
             case 'b':
-                blockNo = param_get8(Cmd, cmdp+1);
+                blockNo = param_get8(Cmd, cmdp + 1);
                 if (blockNo < 0) {
                     PrintAndLogEx(WARNING, "Wrong block number");
                     errors = true;
@@ -1318,20 +1410,20 @@ int CmdHF14AMfURdBl(const char *Cmd){
     //Validations
     if (errors || cmdp == 0) return usage_hf_mfu_rdbl();
 
-    if ( blockNo == -1 ) return usage_hf_mfu_rdbl();
+    if (blockNo == -1) return usage_hf_mfu_rdbl();
     // start with getting tagtype
     TagTypeUL_t tagtype = GetHF14AMfU_Type();
     if (tagtype == UL_ERROR) return -1;
 
     uint8_t maxblockno = 0;
-    for (uint8_t idx = 0; idx < MAX_UL_TYPES; idx++){
+    for (uint8_t idx = 0; idx < MAX_UL_TYPES; idx++) {
         if (tagtype & UL_TYPES_ARRAY[idx]) {
             maxblockno = UL_MEMORY_ARRAY[idx];
             break;
         }
     }
-    if (blockNo > maxblockno){
-        PrintAndLogEx(WARNING, "block number to large. Max block is %u/0x%02X \n", maxblockno,maxblockno);
+    if (blockNo > maxblockno) {
+        PrintAndLogEx(WARNING, "block number to large. Max block is %u/0x%02X \n", maxblockno, maxblockno);
         return usage_hf_mfu_rdbl();
     }
 
@@ -1341,27 +1433,25 @@ int CmdHF14AMfURdBl(const char *Cmd){
 
     //Read Block
     UsbCommand c = {CMD_MIFAREU_READBL, {blockNo}};
-    if ( hasAuthKey ){
+    if (hasAuthKey) {
         c.arg[1] = 1;
-        memcpy(c.d.asBytes,authKeyPtr,16);
-    }
-    else if ( hasPwdKey ) {
+        memcpy(c.d.asBytes, authKeyPtr, 16);
+    } else if (hasPwdKey) {
         c.arg[1] = 2;
-        memcpy(c.d.asBytes,authKeyPtr,4);
+        memcpy(c.d.asBytes, authKeyPtr, 4);
     }
 
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
-    if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
+    if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         uint8_t isOK = resp.arg[0] & 0xff;
         if (isOK) {
             uint8_t *data = resp.d.asBytes;
             PrintAndLogEx(NORMAL, "\nBlock#  | Data        | Ascii");
             PrintAndLogEx(NORMAL, "-----------------------------");
-            PrintAndLogEx(NORMAL, "%02d/0x%02X | %s| %s\n", blockNo, blockNo, sprint_hex(data, 4), sprint_ascii(data,4));
-        }
-        else {
+            PrintAndLogEx(NORMAL, "%02d/0x%02X | %s| %s\n", blockNo, blockNo, sprint_hex(data, 4), sprint_ascii(data, 4));
+        } else {
             PrintAndLogEx(WARNING, "Failed reading block: (%02x)", isOK);
         }
     } else {
@@ -1370,7 +1460,8 @@ int CmdHF14AMfURdBl(const char *Cmd){
     return 0;
 }
 
-int usage_hf_mfu_info(void) {
+int usage_hf_mfu_info(void)
+{
     PrintAndLogEx(NORMAL, "It gathers information about the tag and tries to detect what kind it is.");
     PrintAndLogEx(NORMAL, "Sometimes the tags are locked down, and you may need a key to be able to read the information");
     PrintAndLogEx(NORMAL, "The following tags can be identified:\n");
@@ -1389,7 +1480,8 @@ int usage_hf_mfu_info(void) {
     return 0;
 }
 
-int usage_hf_mfu_dump(void) {
+int usage_hf_mfu_dump(void)
+{
     PrintAndLogEx(NORMAL, "Reads all pages from Ultralight, Ultralight-C, Ultralight EV1");
     PrintAndLogEx(NORMAL, "NTAG 203, NTAG 210, NTAG 212, NTAG 213, NTAG 215, NTAG 216");
     PrintAndLogEx(NORMAL, "and saves binary dump into the file `filename.bin` or `cardUID.bin`");
@@ -1410,7 +1502,8 @@ int usage_hf_mfu_dump(void) {
     return 0;
 }
 
-int usage_hf_mfu_restore(void){
+int usage_hf_mfu_restore(void)
+{
     PrintAndLogEx(NORMAL, "Restore dumpfile onto card.");
     PrintAndLogEx(NORMAL, "Usage:  hf mfu restore [h] [l] [s] k <key> n <filename w/o .bin> ");
     PrintAndLogEx(NORMAL, "  Options :");
@@ -1428,7 +1521,8 @@ int usage_hf_mfu_restore(void){
     return 0;
 }
 
-int usage_hf_mfu_rdbl(void) {
+int usage_hf_mfu_rdbl(void)
+{
     PrintAndLogEx(NORMAL, "Read a block and print. It autodetects card type.\n");
     PrintAndLogEx(NORMAL, "Usage:  hf mfu rdbl b <block number> k <key> l\n");
     PrintAndLogEx(NORMAL, "Options:");
@@ -1443,7 +1537,8 @@ int usage_hf_mfu_rdbl(void) {
     return 0;
 }
 
-int usage_hf_mfu_wrbl(void) {
+int usage_hf_mfu_wrbl(void)
+{
     PrintAndLogEx(NORMAL, "Write a block. It autodetects card type.\n");
     PrintAndLogEx(NORMAL, "Usage:  hf mfu wrbl b <block number> d <data> k <key> l\n");
     PrintAndLogEx(NORMAL, "Options:");
@@ -1458,7 +1553,8 @@ int usage_hf_mfu_wrbl(void) {
     return 0;
 }
 
-int usage_hf_mfu_eload(void) {
+int usage_hf_mfu_eload(void)
+{
     PrintAndLogEx(NORMAL, "It loads emul dump from the file `filename.eml`");
     PrintAndLogEx(NORMAL, "Hint: See script dumptoemul-mfu.lua to convert the .bin to the eml");
     PrintAndLogEx(NORMAL, "Usage:  hf mfu eload u <file name w/o `.eml`> [numblocks]");
@@ -1470,10 +1566,11 @@ int usage_hf_mfu_eload(void) {
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "  sample: hf mfu eload u filename");
     PrintAndLogEx(NORMAL, "          hf mfu eload u filename 57");
-            return 0;
+    return 0;
 }
 
-int usage_hf_mfu_sim(void) {
+int usage_hf_mfu_sim(void)
+{
     PrintAndLogEx(NORMAL, "\nEmulating Ultralight tag from emulator memory\n");
     PrintAndLogEx(NORMAL, "\nBe sure to load the emulator memory first!\n");
     PrintAndLogEx(NORMAL, "Usage: hf mfu sim t 7 u <uid>");
@@ -1489,7 +1586,8 @@ int usage_hf_mfu_sim(void) {
     return 0;
 }
 
-int usage_hf_mfu_ucauth(void) {
+int usage_hf_mfu_ucauth(void)
+{
     PrintAndLogEx(NORMAL, "Usage:  hf mfu cauth k <key number>");
     PrintAndLogEx(NORMAL, "      0 (default): 3DES standard key");
     PrintAndLogEx(NORMAL, "      1 : all 0x00 key");
@@ -1504,7 +1602,8 @@ int usage_hf_mfu_ucauth(void) {
     return 0;
 }
 
-int usage_hf_mfu_ucsetpwd(void) {
+int usage_hf_mfu_ucsetpwd(void)
+{
     PrintAndLogEx(NORMAL, "Usage:  hf mfu setpwd <password (32 hex symbols)>");
     PrintAndLogEx(NORMAL, "       [password] - (32 hex symbols)");
     PrintAndLogEx(NORMAL, "");
@@ -1514,7 +1613,8 @@ int usage_hf_mfu_ucsetpwd(void) {
     return 0;
 }
 
-int usage_hf_mfu_ucsetuid(void) {
+int usage_hf_mfu_ucsetuid(void)
+{
     PrintAndLogEx(NORMAL, "Usage:  hf mfu setuid <uid (14 hex symbols)>");
     PrintAndLogEx(NORMAL, "       [uid] - (14 hex symbols)");
     PrintAndLogEx(NORMAL, "\nThis only works for Magic Ultralight tags.");
@@ -1525,7 +1625,8 @@ int usage_hf_mfu_ucsetuid(void) {
     return 0;
 }
 
-int usage_hf_mfu_gendiverse(void){
+int usage_hf_mfu_gendiverse(void)
+{
     PrintAndLogEx(NORMAL, "Usage:  hf mfu gen [h] [r] <uid (8 hex symbols)>");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "    h       : this help");
@@ -1538,7 +1639,8 @@ int usage_hf_mfu_gendiverse(void){
     return 0;
 }
 
-int usage_hf_mfu_pwdgen(void){
+int usage_hf_mfu_pwdgen(void)
+{
     PrintAndLogEx(NORMAL, "Usage:  hf mfu pwdgen [h|t] [r] <uid (14 hex symbols)>");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "    h       : this help");
@@ -1553,21 +1655,23 @@ int usage_hf_mfu_pwdgen(void){
     return 0;
 }
 
-void printMFUdump(mfu_dump_t* card) {
+void printMFUdump(mfu_dump_t *card)
+{
     printMFUdumpEx(card, 255, 0);
 }
 
-void printMFUdumpEx(mfu_dump_t* card, uint16_t pages, uint8_t startpage) {
+void printMFUdumpEx(mfu_dump_t *card, uint16_t pages, uint8_t startpage)
+{
     PrintAndLogEx(NORMAL, "\n*special* data\n");
     PrintAndLogEx(NORMAL, "\nDataType  | Data                    | Ascii");
     PrintAndLogEx(NORMAL, "----------+-------------------------+---------");
-    PrintAndLogEx(NORMAL, "Version   | %s| %s", sprint_hex(card->version, sizeof(card->version)), sprint_ascii(card->version, sizeof(card->version)) );
+    PrintAndLogEx(NORMAL, "Version   | %s| %s", sprint_hex(card->version, sizeof(card->version)), sprint_ascii(card->version, sizeof(card->version)));
     PrintAndLogEx(NORMAL, "TBD       | %-24s| %s", sprint_hex(card->tbo, sizeof(card->tbo)), sprint_ascii(card->tbo, sizeof(card->tbo)));
     PrintAndLogEx(NORMAL, "Tearing   | %-24s| %s", sprint_hex(card->tearing, sizeof(card->tearing)), sprint_ascii(card->tearing, sizeof(card->tearing)));
     PrintAndLogEx(NORMAL, "Pack      | %-24s| %s", sprint_hex(card->pack, sizeof(card->pack)), sprint_ascii(card->pack, sizeof(card->pack)));
     PrintAndLogEx(NORMAL, "TBD       | %-24s| %s", sprint_hex(card->tbo1, sizeof(card->tbo1)), sprint_ascii(card->tbo1, sizeof(card->tbo1)));
     PrintAndLogEx(NORMAL, "Signature1| %s| %s", sprint_hex(card->signature, 16), sprint_ascii(card->signature, 16));
-    PrintAndLogEx(NORMAL, "Signature2| %s| %s", sprint_hex(card->signature+16, 16), sprint_ascii(card->signature+16, 16));
+    PrintAndLogEx(NORMAL, "Signature2| %s| %s", sprint_hex(card->signature + 16, 16), sprint_ascii(card->signature + 16, 16));
     PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
     PrintAndLogEx(NORMAL, "\nBlock#   | Data        |lck| Ascii");
     PrintAndLogEx(NORMAL, "---------+-------------+---+------");
@@ -1576,79 +1680,126 @@ void printMFUdumpEx(mfu_dump_t* card, uint16_t pages, uint8_t startpage) {
     bool lckbit = false;
     uint8_t *data = card->data;
 
-    uint8_t lockbytes_sta[] = {0,0};
-    uint8_t lockbytes_dyn[] = {0,0,0};
+    uint8_t lockbytes_sta[] = {0, 0};
+    uint8_t lockbytes_dyn[] = {0, 0, 0};
     bool bit_stat[16]  = {0};
     bool bit_dyn[16] = {0};
 
     // Load static lock bytes.
-    memcpy(lockbytes_sta, data+10, sizeof(lockbytes_sta));
-    for(j = 0; j < 16; j++){
-        bit_stat[j] = lockbytes_sta[j/8] & ( 1 <<(7-j%8));
+    memcpy(lockbytes_sta, data + 10, sizeof(lockbytes_sta));
+    for (j = 0; j < 16; j++) {
+        bit_stat[j] = lockbytes_sta[j / 8] & (1 << (7 - j % 8));
     }
 
     // Load dynamic lockbytes if available
     // TODO -- FIGURE OUT LOCK BYTES FOR TO EV1 and/or NTAG
-    if ( pages == 44 ) {
+    if (pages == 44) {
 
-        memcpy(lockbytes_dyn, data+(40*4), sizeof(lockbytes_dyn));
+        memcpy(lockbytes_dyn, data + (40 * 4), sizeof(lockbytes_dyn));
 
         for (j = 0; j < 16; j++) {
-            bit_dyn[j] = lockbytes_dyn[j/8] & ( 1 <<(7-j%8));
+            bit_dyn[j] = lockbytes_dyn[j / 8] & (1 << (7 - j % 8));
         }
-        PrintAndLogEx(NORMAL, "DYNAMIC LOCK: %s\n", sprint_hex(lockbytes_dyn,3));
+        PrintAndLogEx(NORMAL, "DYNAMIC LOCK: %s\n", sprint_hex(lockbytes_dyn, 3));
     }
 
     for (uint8_t i = 0; i < pages; ++i) {
-        if ( i < 3 ) {
-            PrintAndLogEx(NORMAL, "%3d/0x%02X | %s|   | %s", i+startpage, i+startpage, sprint_hex(data + i * 4, 4), sprint_ascii(data + i * 4,4) );
+        if (i < 3) {
+            PrintAndLogEx(NORMAL, "%3d/0x%02X | %s|   | %s", i + startpage, i + startpage, sprint_hex(data + i * 4, 4), sprint_ascii(data + i * 4, 4));
             continue;
         }
-        switch(i){
-            case  3: lckbit = bit_stat[4]; break;
-            case  4: lckbit = bit_stat[3]; break;
-            case  5: lckbit = bit_stat[2]; break;
-            case  6: lckbit = bit_stat[1]; break;
-            case  7: lckbit = bit_stat[0]; break;
-            case  8: lckbit = bit_stat[15]; break;
-            case  9: lckbit = bit_stat[14]; break;
-            case 10: lckbit = bit_stat[13]; break;
-            case 11: lckbit = bit_stat[12]; break;
-            case 12: lckbit = bit_stat[11]; break;
-            case 13: lckbit = bit_stat[10]; break;
-            case 14: lckbit = bit_stat[9]; break;
-            case 15: lckbit = bit_stat[8]; break;
+        switch (i) {
+            case  3:
+                lckbit = bit_stat[4];
+                break;
+            case  4:
+                lckbit = bit_stat[3];
+                break;
+            case  5:
+                lckbit = bit_stat[2];
+                break;
+            case  6:
+                lckbit = bit_stat[1];
+                break;
+            case  7:
+                lckbit = bit_stat[0];
+                break;
+            case  8:
+                lckbit = bit_stat[15];
+                break;
+            case  9:
+                lckbit = bit_stat[14];
+                break;
+            case 10:
+                lckbit = bit_stat[13];
+                break;
+            case 11:
+                lckbit = bit_stat[12];
+                break;
+            case 12:
+                lckbit = bit_stat[11];
+                break;
+            case 13:
+                lckbit = bit_stat[10];
+                break;
+            case 14:
+                lckbit = bit_stat[9];
+                break;
+            case 15:
+                lckbit = bit_stat[8];
+                break;
             case 16:
             case 17:
             case 18:
-            case 19: lckbit = bit_dyn[6]; break;
+            case 19:
+                lckbit = bit_dyn[6];
+                break;
             case 20:
             case 21:
             case 22:
-            case 23: lckbit = bit_dyn[5]; break;
+            case 23:
+                lckbit = bit_dyn[5];
+                break;
             case 24:
             case 25:
             case 26:
-            case 27: lckbit = bit_dyn[4]; break;
+            case 27:
+                lckbit = bit_dyn[4];
+                break;
             case 28:
             case 29:
             case 30:
-            case 31: lckbit = bit_dyn[2]; break;
+            case 31:
+                lckbit = bit_dyn[2];
+                break;
             case 32:
             case 33:
             case 34:
-            case 35: lckbit = bit_dyn[1]; break;
+            case 35:
+                lckbit = bit_dyn[1];
+                break;
             case 36:
             case 37:
             case 38:
-            case 39: lckbit = bit_dyn[0]; break;
-            case 40: lckbit = bit_dyn[12]; break;
-            case 41: lckbit = bit_dyn[11]; break;
-            case 42: lckbit = bit_dyn[10]; break; //auth0
-            case 43: lckbit = bit_dyn[9]; break;  //auth1
-            default: break;
+            case 39:
+                lckbit = bit_dyn[0];
+                break;
+            case 40:
+                lckbit = bit_dyn[12];
+                break;
+            case 41:
+                lckbit = bit_dyn[11];
+                break;
+            case 42:
+                lckbit = bit_dyn[10];
+                break; //auth0
+            case 43:
+                lckbit = bit_dyn[9];
+                break;  //auth1
+            default:
+                break;
         }
-        PrintAndLogEx(NORMAL, "%3d/0x%02X | %s| %d | %s", i+startpage, i+startpage, sprint_hex(data + i * 4, 4), lckbit, sprint_ascii(data + i * 4,4));
+        PrintAndLogEx(NORMAL, "%3d/0x%02X | %s| %d | %s", i + startpage, i + startpage, sprint_hex(data + i * 4, 4), lckbit, sprint_ascii(data + i * 4, 4));
     }
     PrintAndLogEx(NORMAL, "---------------------------------");
 }
@@ -1656,7 +1807,8 @@ void printMFUdumpEx(mfu_dump_t* card, uint16_t pages, uint8_t startpage) {
 //
 //  Mifare Ultralight / Ultralight-C / Ultralight-EV1
 //  Read and Dump Card Contents,  using auto detection of tag size.
-int CmdHF14AMfUDump(const char *Cmd){
+int CmdHF14AMfUDump(const char *Cmd)
+{
 
     uint8_t fileNameLen = 0;
     char filename[FILE_PATH_SIZE] = {0x00};
@@ -1683,42 +1835,42 @@ int CmdHF14AMfUDump(const char *Cmd){
 
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
-        case 'h':
-            return usage_hf_mfu_dump();
-        case 'k':
-            dataLen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
-            if (dataLen == 32 || dataLen == 8) { //ul-c or ev1/ntag key length
-                errors = param_gethex(tempStr, 0, authenticationkey, dataLen);
-                dataLen /= 2;
-            } else {
-                PrintAndLogEx(WARNING, "ERROR: Key is incorrect length\n");
+            case 'h':
+                return usage_hf_mfu_dump();
+            case 'k':
+                dataLen = param_getstr(Cmd, cmdp + 1, tempStr, sizeof(tempStr));
+                if (dataLen == 32 || dataLen == 8) { //ul-c or ev1/ntag key length
+                    errors = param_gethex(tempStr, 0, authenticationkey, dataLen);
+                    dataLen /= 2;
+                } else {
+                    PrintAndLogEx(WARNING, "ERROR: Key is incorrect length\n");
+                    errors = true;
+                }
+                cmdp += 2;
+                hasAuthKey = true;
+                break;
+            case 'l':
+                swapEndian = true;
+                cmdp++;
+                break;
+            case 'f':
+                fileNameLen = param_getstr(Cmd, cmdp + 1, filename, sizeof(filename));
+                cmdp += 2;
+                break;
+            case 'p': //set start page
+                startPage = param_get8(Cmd, cmdp + 1);
+                manualPages = true;
+                cmdp += 2;
+                break;
+            case 'q':
+                pages = param_get8(Cmd, cmdp + 1);
+                cmdp += 2;
+                manualPages = true;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
                 errors = true;
-            }
-            cmdp += 2;
-            hasAuthKey = true;
-            break;
-        case 'l':
-            swapEndian = true;
-            cmdp++;
-            break;
-        case 'f':
-            fileNameLen = param_getstr(Cmd, cmdp+1, filename, sizeof(filename));
-            cmdp += 2;
-            break;
-        case 'p': //set start page
-            startPage = param_get8(Cmd, cmdp+1);
-            manualPages = true;
-            cmdp += 2;
-            break;
-        case 'q':
-            pages = param_get8(Cmd, cmdp+1);
-            cmdp += 2;
-            manualPages = true;
-            break;
-        default:
-            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-            errors = true;
-            break;
+                break;
         }
     }
 
@@ -1737,7 +1889,7 @@ int CmdHF14AMfUDump(const char *Cmd){
         for (uint8_t idx = 0; idx < MAX_UL_TYPES; idx++) {
             if (tagtype & UL_TYPES_ARRAY[idx]) {
                 //add one as maxblks starts at 0
-                card_mem_size = pages = UL_MEMORY_ARRAY[idx]+1;
+                card_mem_size = pages = UL_MEMORY_ARRAY[idx] + 1;
                 break;
             }
         }
@@ -1745,7 +1897,7 @@ int CmdHF14AMfUDump(const char *Cmd){
     ul_print_type(tagtype, 0);
     PrintAndLogEx(SUCCESS, "Reading tag memory...");
     UsbCommand c = {CMD_MIFAREU_READCARD, {startPage, pages}};
-    if ( hasAuthKey ) {
+    if (hasAuthKey) {
         if (tagtype & UL_C)
             c.arg[2] = 1; //UL_C auth
         else
@@ -1773,30 +1925,30 @@ int CmdHF14AMfUDump(const char *Cmd){
         bufferSize = sizeof(data);
     }
 
-    if ( !GetFromDevice(BIG_BUF, data, bufferSize, startindex, NULL, 2500, false) ) {
+    if (!GetFromDevice(BIG_BUF, data, bufferSize, startindex, NULL, 2500, false)) {
         PrintAndLogEx(WARNING, "command execution time out");
         return 1;
     }
 
-    bool is_partial = (pages != bufferSize/4);
+    bool is_partial = (pages != bufferSize / 4);
 
-    pages = bufferSize/4;
+    pages = bufferSize / 4;
 
     iso14a_card_select_t card;
     mfu_dump_t dump_file_data;
-    uint8_t get_pack[] = {0,0};
-    uint8_t get_version[] = {0,0,0,0,0,0,0,0};
-    uint8_t get_tearing[] = {0,0,0};
-    uint8_t get_counter[] = {0,0,0};
-    uint8_t dummy_pack[] = {0,0};
+    uint8_t get_pack[] = {0, 0};
+    uint8_t get_version[] = {0, 0, 0, 0, 0, 0, 0, 0};
+    uint8_t get_tearing[] = {0, 0, 0};
+    uint8_t get_counter[] = {0, 0, 0};
+    uint8_t dummy_pack[] = {0, 0};
     uint8_t get_signature[32];
-    memset( get_signature, 0, sizeof(get_signature) );
+    memset(get_signature, 0, sizeof(get_signature));
 
     // not ul_c and not std ul then attempt to collect info like
     //  VERSION, SIGNATURE, COUNTERS, TEARING, PACK,
     if (!(tagtype & UL_C || tagtype & UL)) {
         //attempt to read pack
-        if (!ul_auth_select( &card, tagtype, true, authKeyPtr, get_pack, sizeof(get_pack))) {
+        if (!ul_auth_select(&card, tagtype, true, authKeyPtr, get_pack, sizeof(get_pack))) {
             //reset pack
             get_pack[0] = 0;
             get_pack[1] = 0;
@@ -1804,30 +1956,30 @@ int CmdHF14AMfUDump(const char *Cmd){
         DropField();
 
         // only add pack if not partial read,  and complete pages read.
-        if ( !is_partial && pages == card_mem_size) {
+        if (!is_partial && pages == card_mem_size) {
 
             // add pack to block read
-            memcpy(data + (pages*4) - 4, get_pack, sizeof(get_pack));
+            memcpy(data + (pages * 4) - 4, get_pack, sizeof(get_pack));
         }
 
-        if ( hasAuthKey )
-            ul_auth_select( &card, tagtype, hasAuthKey, authKeyPtr, dummy_pack, sizeof(dummy_pack));
+        if (hasAuthKey)
+            ul_auth_select(&card, tagtype, hasAuthKey, authKeyPtr, dummy_pack, sizeof(dummy_pack));
         else
             ul_select(&card);
 
-        ulev1_getVersion( get_version, sizeof(get_version) );
-        for ( uint8_t i = 0; i<3; ++i) {
-            ulev1_readTearing(i, get_tearing+i, 1);
-            ulev1_readCounter(i, get_counter, sizeof(get_counter) );
+        ulev1_getVersion(get_version, sizeof(get_version));
+        for (uint8_t i = 0; i < 3; ++i) {
+            ulev1_readTearing(i, get_tearing + i, 1);
+            ulev1_readCounter(i, get_counter, sizeof(get_counter));
         }
 
         DropField();
-        if ( hasAuthKey )
-            ul_auth_select( &card, tagtype, hasAuthKey, authKeyPtr, dummy_pack, sizeof(dummy_pack));
+        if (hasAuthKey)
+            ul_auth_select(&card, tagtype, hasAuthKey, authKeyPtr, dummy_pack, sizeof(dummy_pack));
         else
             ul_select(&card);
 
-        ulev1_readSignature( get_signature, sizeof(get_signature));
+        ulev1_readSignature(get_signature, sizeof(get_signature));
         DropField();
     }
 
@@ -1836,17 +1988,17 @@ int CmdHF14AMfUDump(const char *Cmd){
         // if we didn't swapendian before - do it now for the sprint_hex call
         // NOTE: default entry is bigendian (unless swapped), sprint_hex outputs little endian
         //       need to swap to keep it the same
-        if (!swapEndian){
+        if (!swapEndian) {
             authKeyPtr = SwapEndian64(authenticationkey, dataLen, (dataLen == 16) ? 8 : 4);
         } else {
             authKeyPtr = authenticationkey;
         }
 
-        if (tagtype & UL_C){ //add 4 pages
-            memcpy(data + pages*4, authKeyPtr, dataLen);
-            pages += dataLen/4;
+        if (tagtype & UL_C) { //add 4 pages
+            memcpy(data + pages * 4, authKeyPtr, dataLen);
+            pages += dataLen / 4;
         } else { // 2nd page from end
-            memcpy(data + (pages*4) - 8, authenticationkey, dataLen);
+            memcpy(data + (pages * 4) - 8, authenticationkey, dataLen);
         }
     }
 
@@ -1856,7 +2008,7 @@ int CmdHF14AMfUDump(const char *Cmd){
     memcpy(dump_file_data.tearing, get_tearing, sizeof(dump_file_data.tearing));
     memcpy(dump_file_data.pack, get_pack, sizeof(dump_file_data.pack));
     memcpy(dump_file_data.signature, get_signature, sizeof(dump_file_data.signature));
-    memcpy(dump_file_data.data, data, pages*4);
+    memcpy(dump_file_data.data, data, pages * 4);
 
     printMFUdumpEx(&dump_file_data, pages, startPage);
 
@@ -1868,21 +2020,22 @@ int CmdHF14AMfUDump(const char *Cmd){
         fptr += sprintf(fptr, "hf-mfu-");
         FillFileNameByUID(fptr, card.uid, "-dump", card.uidlen);
     }
-    uint16_t datalen = pages*4 + DUMP_PREFIX_LENGTH;
-    saveFile(filename, "bin", (uint8_t*)&dump_file_data, datalen);
-    saveFileJSON(filename, "json", jsfMfuMemory, (uint8_t*)&dump_file_data, datalen);
+    uint16_t datalen = pages * 4 + DUMP_PREFIX_LENGTH;
+    saveFile(filename, "bin", (uint8_t *)&dump_file_data, datalen);
+    saveFileJSON(filename, "json", jsfMfuMemory, (uint8_t *)&dump_file_data, datalen);
 
-    if ( is_partial )
+    if (is_partial)
         PrintAndLogEx(WARNING, "Partial dump created. (%d of %d blocks)", pages, card_mem_size);
 
     return 0;
 }
 
-static void wait4response(uint8_t b){
+static void wait4response(uint8_t b)
+{
     UsbCommand resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         uint8_t isOK  = resp.arg[0] & 0xff;
-        if ( !isOK )
+        if (!isOK)
             PrintAndLogEx(WARNING, "failed to write block %d", b);
     } else {
         PrintAndLogEx(WARNING, "Command execute timeout");
@@ -1892,7 +2045,8 @@ static void wait4response(uint8_t b){
 //
 //  Restore dump file onto tag
 //
-int CmdHF14AMfURestore(const char *Cmd){
+int CmdHF14AMfURestore(const char *Cmd)
+{
 
     char tempStr[50] = {0};
     char filename[FILE_PATH_SIZE] = {0};
@@ -1907,65 +2061,65 @@ int CmdHF14AMfURestore(const char *Cmd){
     bool read_key = false;
     size_t filelen = 0;
     FILE *f;
-    UsbCommand c = {CMD_MIFAREU_WRITEBL, {0,0,0}};
+    UsbCommand c = {CMD_MIFAREU_WRITEBL, {0, 0, 0}};
 
     memset(authkey, 0x00, sizeof(authkey));
 
-    while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
-        case 'h':
-            return usage_hf_mfu_restore();
-        case 'k':
-            keylen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
-            if (keylen == 32 || keylen == 8) { //ul-c or ev1/ntag key length
-                errors = param_gethex(tempStr, 0, authkey, keylen);
-                keylen /= 2;
-            } else {
-                PrintAndLogEx(WARNING, "ERROR: Key is incorrect length\n");
+            case 'h':
+                return usage_hf_mfu_restore();
+            case 'k':
+                keylen = param_getstr(Cmd, cmdp + 1, tempStr, sizeof(tempStr));
+                if (keylen == 32 || keylen == 8) { //ul-c or ev1/ntag key length
+                    errors = param_gethex(tempStr, 0, authkey, keylen);
+                    keylen /= 2;
+                } else {
+                    PrintAndLogEx(WARNING, "ERROR: Key is incorrect length\n");
+                    errors = true;
+                }
+                cmdp += 2;
+                hasKey = true;
+                break;
+            case 'l':
+                swapEndian = true;
+                cmdp++;
+                break;
+            case 'f':
+                filelen = param_getstr(Cmd, cmdp + 1, filename, FILE_PATH_SIZE);
+
+                if (filelen > FILE_PATH_SIZE - 5)
+                    filelen = FILE_PATH_SIZE - 5;
+
+                if (filelen < 1)
+                    sprintf(filename, "dumpdata.bin");
+
+                cmdp += 2;
+                break;
+            case 's':
+                cmdp++;
+                write_special = true;
+                break;
+            case 'e':
+                cmdp++;
+                write_extra = true;
+                break;
+            case 'r':
+                cmdp++;
+                read_key = true;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
                 errors = true;
-            }
-            cmdp += 2;
-            hasKey = true;
-            break;
-        case 'l':
-            swapEndian = true;
-            cmdp++;
-            break;
-        case 'f':
-            filelen = param_getstr(Cmd, cmdp+1, filename, FILE_PATH_SIZE);
-
-            if (filelen > FILE_PATH_SIZE-5)
-                filelen = FILE_PATH_SIZE-5;
-
-            if (filelen < 1)
-                sprintf(filename, "dumpdata.bin");
-
-            cmdp += 2;
-            break;
-        case 's':
-            cmdp++;
-            write_special = true;
-            break;
-        case 'e':
-            cmdp++;
-            write_extra = true;
-            break;
-        case 'r':
-            cmdp++;
-            read_key = true;
-            break;
-        default:
-            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-            errors = true;
-            break;
+                break;
         }
     }
 
     //Validations
     if (errors || cmdp == 0) return usage_hf_mfu_restore();
 
-    if ((f = fopen(filename,"rb")) == NULL) {
-        PrintAndLogEx(WARNING, "Could not find file " _YELLOW_(%s), filename);
+    if ((f = fopen(filename, "rb")) == NULL) {
+        PrintAndLogEx(WARNING, "Could not find file " _YELLOW_( % s), filename);
         return 1;
     }
 
@@ -1980,7 +2134,7 @@ int CmdHF14AMfURestore(const char *Cmd){
     }
 
     uint8_t *dump = calloc(fsize, sizeof(uint8_t));
-    if ( !dump ) {
+    if (!dump) {
         PrintAndLogEx(WARNING, "Failed to allocate memory");
         fclose(f);
         return 1;
@@ -1989,51 +2143,51 @@ int CmdHF14AMfURestore(const char *Cmd){
     // read all data
     size_t bytes_read = fread(dump, 1, fsize, f);
     fclose(f);
-    if ( bytes_read < 48 ) {
+    if (bytes_read < 48) {
         PrintAndLogEx(WARNING, "Error, dump file is too small");
         free(dump);
         return 1;
     }
 
-    PrintAndLogEx(INFO, "Restoring " _YELLOW_(%s)" to card", filename);
+    PrintAndLogEx(INFO, "Restoring " _YELLOW_( % s)" to card", filename);
 
-    mfu_dump_t *mem = (mfu_dump_t*)dump;
-    uint8_t pages = (bytes_read-48)/4;
+    mfu_dump_t *mem = (mfu_dump_t *)dump;
+    uint8_t pages = (bytes_read - 48) / 4;
 
     // print dump
     printMFUdumpEx(mem, pages, 0);
 
     // Swap endianness
     if (swapEndian && hasKey) {
-        if ( keylen == 16 )
+        if (keylen == 16)
             p_authkey = SwapEndian64(authkey, keylen, 8);
         else
             p_authkey = SwapEndian64(authkey, keylen, 4);
     }
 
     // set key - only once
-    if ( hasKey ){
+    if (hasKey) {
         c.arg[1] = (keylen == 16) ? 1 : 2;
-        memcpy(c.d.asBytes+4, p_authkey, keylen);
+        memcpy(c.d.asBytes + 4, p_authkey, keylen);
     }
 
     // write version, signature, pack
     // only magic NTAG cards
-    if ( write_extra ) {
+    if (write_extra) {
 
-        #define MFU_NTAG_SPECIAL_PWD        0xF0
-        #define MFU_NTAG_SPECIAL_PACK       0xF1
-        #define MFU_NTAG_SPECIAL_VERSION    0xFA
-        #define MFU_NTAG_SPECIAL_SIGNATURE  0xF2
+#define MFU_NTAG_SPECIAL_PWD        0xF0
+#define MFU_NTAG_SPECIAL_PACK       0xF1
+#define MFU_NTAG_SPECIAL_VERSION    0xFA
+#define MFU_NTAG_SPECIAL_SIGNATURE  0xF2
         // pwd
-        if ( hasKey || read_key) {
+        if (hasKey || read_key) {
             c.arg[0] = MFU_NTAG_SPECIAL_PWD;
 
             if (read_key) {
                 // try reading key from dump and use.
-                memcpy(c.d.asBytes, mem->data + ( bytes_read - 48 - 8), 4);
+                memcpy(c.d.asBytes, mem->data + (bytes_read - 48 - 8), 4);
             } else {
-                memcpy(c.d.asBytes,  p_authkey, 4 );
+                memcpy(c.d.asBytes,  p_authkey, 4);
             }
 
             PrintAndLogEx(NORMAL, "special PWD     block written 0x%X - %s\n", MFU_NTAG_SPECIAL_PWD, sprint_hex(c.d.asBytes, 4));
@@ -2044,7 +2198,7 @@ int CmdHF14AMfURestore(const char *Cmd){
             // copy the new key
             c.arg[1] = 2;
             memcpy(authkey, c.d.asBytes, 4);
-            memcpy(c.d.asBytes+4, authkey, 4);
+            memcpy(c.d.asBytes + 4, authkey, 4);
         }
 
         // pack
@@ -2059,20 +2213,20 @@ int CmdHF14AMfURestore(const char *Cmd){
         wait4response(MFU_NTAG_SPECIAL_PACK);
 
         // Signature
-        for (uint8_t s = MFU_NTAG_SPECIAL_SIGNATURE, i=0; s < MFU_NTAG_SPECIAL_SIGNATURE+8; s++, i += 4){
+        for (uint8_t s = MFU_NTAG_SPECIAL_SIGNATURE, i = 0; s < MFU_NTAG_SPECIAL_SIGNATURE + 8; s++, i += 4) {
             c.arg[0] = s;
-            memcpy(c.d.asBytes, mem->signature+i, 4);
-            PrintAndLogEx(NORMAL, "special SIG     block written 0x%X - %s\n", s, sprint_hex(c.d.asBytes, 4) );
+            memcpy(c.d.asBytes, mem->signature + i, 4);
+            PrintAndLogEx(NORMAL, "special SIG     block written 0x%X - %s\n", s, sprint_hex(c.d.asBytes, 4));
             clearCommandBuffer();
             SendCommand(&c);
             wait4response(s);
         }
 
         // Version
-        for (uint8_t s = MFU_NTAG_SPECIAL_VERSION, i=0; s < MFU_NTAG_SPECIAL_VERSION+2; s++, i += 4){
+        for (uint8_t s = MFU_NTAG_SPECIAL_VERSION, i = 0; s < MFU_NTAG_SPECIAL_VERSION + 2; s++, i += 4) {
             c.arg[0] = s;
-            memcpy(c.d.asBytes, mem->version+i, 4 );
-            PrintAndLogEx(NORMAL, "special VERSION block written 0x%X - %s\n", s, sprint_hex(c.d.asBytes, 4) );
+            memcpy(c.d.asBytes, mem->version + i, 4);
+            PrintAndLogEx(NORMAL, "special VERSION block written 0x%X - %s\n", s, sprint_hex(c.d.asBytes, 4));
             clearCommandBuffer();
             SendCommand(&c);
             wait4response(s);
@@ -2083,15 +2237,16 @@ int CmdHF14AMfURestore(const char *Cmd){
     // write all other data
     // Skip block 0,1,2,3 (only magic tags can write to them)
     // Skip last 5 blocks usually is configuration
-    for (uint8_t b = 4; b < pages-5; b++) {
+    for (uint8_t b = 4; b < pages - 5; b++) {
 
         //Send write Block
         c.arg[0] = b;
-        memcpy(c.d.asBytes, mem->data + (b*4), 4);
+        memcpy(c.d.asBytes, mem->data + (b * 4), 4);
         clearCommandBuffer();
         SendCommand(&c);
         wait4response(b);
-        printf("."); fflush(stdout);
+        printf(".");
+        fflush(stdout);
     }
     PrintAndLogEx(NORMAL, "\n");
 
@@ -2100,18 +2255,18 @@ int CmdHF14AMfURestore(const char *Cmd){
 
         PrintAndLogEx(INFO, "Restoring configuration blocks.\n");
 
-        PrintAndLogEx(NORMAL, "authentication with keytype[%x]  %s\n", (uint8_t)(c.arg[1] & 0xff), sprint_hex(p_authkey,4));
+        PrintAndLogEx(NORMAL, "authentication with keytype[%x]  %s\n", (uint8_t)(c.arg[1] & 0xff), sprint_hex(p_authkey, 4));
 
         // otp, uid, lock, cfg1, cfg0, dynlockbits
-        uint8_t blocks[] = {3, 0, 1, 2, pages-5, pages-4, pages-3};
-        for ( uint8_t i = 0; i < sizeof(blocks); i++){
+        uint8_t blocks[] = {3, 0, 1, 2, pages - 5, pages - 4, pages - 3};
+        for (uint8_t i = 0; i < sizeof(blocks); i++) {
             uint8_t b = blocks[i];
             c.arg[0] = b;
-            memcpy(c.d.asBytes, mem->data + (b*4), 4);
+            memcpy(c.d.asBytes, mem->data + (b * 4), 4);
             clearCommandBuffer();
             SendCommand(&c);
             wait4response(b);
-            PrintAndLogEx(NORMAL, "special block written %u - %s\n", b, sprint_hex(c.d.asBytes, 4) );
+            PrintAndLogEx(NORMAL, "special block written %u - %s\n", b, sprint_hex(c.d.asBytes, 4));
         }
     }
 
@@ -2122,17 +2277,19 @@ int CmdHF14AMfURestore(const char *Cmd){
 //
 //  Load emulator with dump file
 //
-int CmdHF14AMfUeLoad(const char *Cmd){
+int CmdHF14AMfUeLoad(const char *Cmd)
+{
     char c = tolower(param_getchar(Cmd, 0));
-    if ( c == 'h' || c == 0x00) return usage_hf_mfu_eload();
+    if (c == 'h' || c == 0x00) return usage_hf_mfu_eload();
     return CmdHF14AMfELoad(Cmd);
 }
 //
 //  Simulate tag
 //
-int CmdHF14AMfUSim(const char *Cmd){
+int CmdHF14AMfUSim(const char *Cmd)
+{
     char c = tolower(param_getchar(Cmd, 0));
-    if ( c == 'h' || c == 0x00) return usage_hf_mfu_sim();
+    if (c == 'h' || c == 0x00) return usage_hf_mfu_sim();
     return CmdHF14ASim(Cmd);
 }
 
@@ -2143,7 +2300,8 @@ int CmdHF14AMfUSim(const char *Cmd){
 //
 // Ultralight C Authentication Demo {currently uses hard-coded key}
 //
-int CmdHF14AMfucAuth(const char *Cmd){
+int CmdHF14AMfucAuth(const char *Cmd)
+{
 
     uint8_t keyNo = 3;
     bool errors = false;
@@ -2151,9 +2309,9 @@ int CmdHF14AMfucAuth(const char *Cmd){
     char cmdp = tolower(param_getchar(Cmd, 0));
 
     //Change key to user defined one
-    if (cmdp == 'k'){
+    if (cmdp == 'k') {
         keyNo = param_get8(Cmd, 1);
-        if(keyNo >= KEYS_3DES_COUNT)
+        if (keyNo >= KEYS_3DES_COUNT)
             errors = true;
     }
 
@@ -2163,7 +2321,7 @@ int CmdHF14AMfucAuth(const char *Cmd){
 
     uint8_t *key = default_3des_keys[keyNo];
     if (ulc_authentication(key, true))
-        PrintAndLogEx(SUCCESS, "Authentication successful. 3des key: %s",sprint_hex(key, 16));
+        PrintAndLogEx(SUCCESS, "Authentication successful. 3des key: %s", sprint_hex(key, 16));
     else
         PrintAndLogEx(WARNING, "Authentication failed");
 
@@ -2270,7 +2428,8 @@ int CmdTestDES(const char * cmd)
 //
 // Mifare Ultralight C - Set password
 //
-int CmdHF14AMfucSetPwd(const char *Cmd){
+int CmdHF14AMfucSetPwd(const char *Cmd)
+{
 
     uint8_t pwd[16] = {0x00};
     char cmdp = tolower(param_getchar(Cmd, 0));
@@ -2283,14 +2442,14 @@ int CmdHF14AMfucSetPwd(const char *Cmd){
     }
 
     UsbCommand c = {CMD_MIFAREUC_SETPWD};
-    memcpy( c.d.asBytes, pwd, 16);
+    memcpy(c.d.asBytes, pwd, 16);
     clearCommandBuffer();
     SendCommand(&c);
 
     UsbCommand resp;
-    if (WaitForResponseTimeout(CMD_ACK,&resp,1500) ) {
-        if ( (resp.arg[0] & 0xff) == 1) {
-            PrintAndLogEx(INFO, "Ultralight-C new password: %s", sprint_hex(pwd,16));
+    if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
+        if ((resp.arg[0] & 0xff) == 1) {
+            PrintAndLogEx(INFO, "Ultralight-C new password: %s", sprint_hex(pwd, 16));
         } else {
             PrintAndLogEx(WARNING, "Failed writing at block %d", resp.arg[1] & 0xff);
             return 1;
@@ -2305,7 +2464,8 @@ int CmdHF14AMfucSetPwd(const char *Cmd){
 //
 // Magic UL / UL-C tags  - Set UID
 //
-int CmdHF14AMfucSetUid(const char *Cmd){
+int CmdHF14AMfucSetUid(const char *Cmd)
+{
 
     UsbCommand c = {CMD_MIFAREU_READBL};
     UsbCommand resp;
@@ -2323,7 +2483,7 @@ int CmdHF14AMfucSetUid(const char *Cmd){
     c.arg[0] = 2;
     clearCommandBuffer();
     SendCommand(&c);
-    if (!WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         PrintAndLogEx(WARNING, "Command execute timeout");
         return 2;
     }
@@ -2341,7 +2501,7 @@ int CmdHF14AMfucSetUid(const char *Cmd){
     c.d.asBytes[3] =  0x88 ^ uid[0] ^ uid[1] ^ uid[2];
     clearCommandBuffer();
     SendCommand(&c);
-    if (!WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         PrintAndLogEx(WARNING, "Command execute timeout");
         return 3;
     }
@@ -2354,7 +2514,7 @@ int CmdHF14AMfucSetUid(const char *Cmd){
     c.d.asBytes[3] = uid[6];
     clearCommandBuffer();
     SendCommand(&c);
-    if (!WaitForResponseTimeout(CMD_ACK,&resp,1500) ) {
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         PrintAndLogEx(WARNING, "Command execute timeout");
         return 4;
     }
@@ -2367,20 +2527,21 @@ int CmdHF14AMfucSetUid(const char *Cmd){
     c.d.asBytes[3] = oldblock2[3];
     clearCommandBuffer();
     SendCommand(&c);
-    if (!WaitForResponseTimeout(CMD_ACK,&resp,1500) ) {
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         PrintAndLogEx(WARNING, "Command execute timeout");
         return 5;
     }
     return 0;
 }
 
-int CmdHF14AMfuGenDiverseKeys(const char *Cmd){
+int CmdHF14AMfuGenDiverseKeys(const char *Cmd)
+{
 
     uint8_t uid[4];
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) == 0  || cmdp == 'h') return usage_hf_mfu_gendiverse();
 
-    if ( cmdp == 'r' ) {
+    if (cmdp == 'r') {
         // read uid from tag
         UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0}};
         clearCommandBuffer();
@@ -2396,17 +2557,16 @@ int CmdHF14AMfuGenDiverseKeys(const char *Cmd){
         // 2: OK, no ATS
         // 3: proprietary Anticollision
 
-        if ( select_status == 0 ) {
+        if (select_status == 0) {
             PrintAndLogEx(WARNING, "iso14443a card select failed");
             return 1;
         }
-        if ( card.uidlen != 4 ) {
+        if (card.uidlen != 4) {
             PrintAndLogEx(WARNING, "Wrong sized UID, expected 4bytes got %d", card.uidlen);
             return 1;
         }
         memcpy(uid, card.uid, sizeof(uid));
-    }
-    else {
+    } else {
         if (param_gethex(Cmd, 0, uid, 8)) return usage_hf_mfu_gendiverse();
     }
 
@@ -2414,12 +2574,12 @@ int CmdHF14AMfuGenDiverseKeys(const char *Cmd){
     uint8_t iv[8] = { 0x00 };
     uint8_t block = 0x01;
 
-    uint8_t mifarekeyA[] = { 0xA0,0xA1,0xA2,0xA3,0xA4,0xA5 };
-    uint8_t mifarekeyB[] = { 0xB0,0xB1,0xB2,0xB3,0xB4,0xB5 };
+    uint8_t mifarekeyA[] = { 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5 };
+    uint8_t mifarekeyB[] = { 0xB0, 0xB1, 0xB2, 0xB3, 0xB4, 0xB5 };
     uint8_t dkeyA[8] = { 0x00 };
     uint8_t dkeyB[8] = { 0x00 };
 
-    uint8_t masterkey[] = { 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x88,0x99,0xaa,0xbb,0xcc,0xdd,0xee,0xff };
+    uint8_t masterkey[] = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff };
 
     uint8_t mix[8] = { 0x00 };
     uint8_t divkey[8] = { 0x00 };
@@ -2435,48 +2595,48 @@ int CmdHF14AMfuGenDiverseKeys(const char *Cmd){
     mbedtls_des3_set2key_enc(&ctx, masterkey);
 
     mbedtls_des3_crypt_cbc(&ctx  // des3_context
-        , MBEDTLS_DES_ENCRYPT    // int mode
-        , sizeof(mix)    // length
-        , iv             // iv[8]
-        , mix            // input
-        , divkey         // output
-        );
+                           , MBEDTLS_DES_ENCRYPT    // int mode
+                           , sizeof(mix)    // length
+                           , iv             // iv[8]
+                           , mix            // input
+                           , divkey         // output
+                          );
 
     PrintAndLogEx(NORMAL, "-- 3DES version");
-    PrintAndLogEx(NORMAL, "Masterkey    :\t %s", sprint_hex(masterkey,sizeof(masterkey)));
+    PrintAndLogEx(NORMAL, "Masterkey    :\t %s", sprint_hex(masterkey, sizeof(masterkey)));
     PrintAndLogEx(NORMAL, "UID          :\t %s", sprint_hex(uid, sizeof(uid)));
     PrintAndLogEx(NORMAL, "block        :\t %0d", block);
     PrintAndLogEx(NORMAL, "Mifare key   :\t %s", sprint_hex(mifarekeyA, sizeof(mifarekeyA)));
     PrintAndLogEx(NORMAL, "Message      :\t %s", sprint_hex(mix, sizeof(mix)));
-    PrintAndLogEx(NORMAL, "Diversified key: %s", sprint_hex(divkey+1, 6));
+    PrintAndLogEx(NORMAL, "Diversified key: %s", sprint_hex(divkey + 1, 6));
 
-    for (int i=0; i < sizeof(mifarekeyA); ++i){
+    for (int i = 0; i < sizeof(mifarekeyA); ++i) {
         dkeyA[i]  = (mifarekeyA[i] << 1) & 0xff;
-        dkeyA[6] |= ((mifarekeyA[i] >> 7) & 1) << (i+1);
+        dkeyA[6] |= ((mifarekeyA[i] >> 7) & 1) << (i + 1);
     }
 
-    for (int i=0; i < sizeof(mifarekeyB); ++i){
-        dkeyB[1]  |= ((mifarekeyB[i] >> 7) & 1) << (i+1);
-        dkeyB[2+i] = (mifarekeyB[i] << 1) & 0xff;
+    for (int i = 0; i < sizeof(mifarekeyB); ++i) {
+        dkeyB[1]  |= ((mifarekeyB[i] >> 7) & 1) << (i + 1);
+        dkeyB[2 + i] = (mifarekeyB[i] << 1) & 0xff;
     }
 
     uint8_t zeros[8] = {0x00};
     uint8_t newpwd[8] = {0x00};
     uint8_t dmkey[24] = {0x00};
     memcpy(dmkey, dkeyA, 8);
-    memcpy(dmkey+8, dkeyB, 8);
-    memcpy(dmkey+16, dkeyA, 8);
+    memcpy(dmkey + 8, dkeyB, 8);
+    memcpy(dmkey + 16, dkeyA, 8);
     memset(iv, 0x00, 8);
 
     mbedtls_des3_set3key_enc(&ctx, dmkey);
 
     mbedtls_des3_crypt_cbc(&ctx  // des3_context
-        , MBEDTLS_DES_ENCRYPT    // int mode
-        , sizeof(newpwd) // length
-        , iv             // iv[8]
-        , zeros         // input
-        , newpwd         // output
-        );
+                           , MBEDTLS_DES_ENCRYPT    // int mode
+                           , sizeof(newpwd) // length
+                           , iv             // iv[8]
+                           , zeros         // input
+                           , newpwd         // output
+                          );
 
     PrintAndLogEx(NORMAL, "\n-- DES version");
     PrintAndLogEx(NORMAL, "Mifare dkeyA :\t %s", sprint_hex(dkeyA, sizeof(dkeyA)));
@@ -2488,7 +2648,8 @@ int CmdHF14AMfuGenDiverseKeys(const char *Cmd){
     return 0;
 }
 
-int CmdHF14AMfuPwdGen(const char *Cmd){
+int CmdHF14AMfuPwdGen(const char *Cmd)
+{
 
     uint8_t uid[7] = {0x00};
     char cmdp = tolower(param_getchar(Cmd, 0));
@@ -2496,8 +2657,8 @@ int CmdHF14AMfuPwdGen(const char *Cmd){
 
     if (cmdp == 't') return ul_ev1_pwdgen_selftest();
 
-    if ( cmdp == 'r') {
-            // read uid from tag
+    if (cmdp == 'r') {
+        // read uid from tag
         UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0}};
         clearCommandBuffer();
         SendCommand(&c);
@@ -2511,17 +2672,16 @@ int CmdHF14AMfuPwdGen(const char *Cmd){
         // 1: OK with ATS
         // 2: OK, no ATS
         // 3: proprietary Anticollision
-        if ( select_status == 0 ) {
+        if (select_status == 0) {
             PrintAndLogEx(WARNING, "iso14443a card select failed");
             return 1;
         }
-        if ( card.uidlen != 7 ) {
+        if (card.uidlen != 7) {
             PrintAndLogEx(WARNING, "Wrong sized UID, expected 7bytes got %d", card.uidlen);
             return 1;
         }
         memcpy(uid, card.uid, sizeof(uid));
-    }
-    else {
+    } else {
         if (param_gethex(Cmd, 0, uid, 14)) return usage_hf_mfu_pwdgen();
     }
 
@@ -2555,18 +2715,20 @@ static command_t CommandTable[] = {
     {"setpwd",  CmdHF14AMfucSetPwd, 0, "Set 3des password - Ultralight-C"},
     {"setuid",  CmdHF14AMfucSetUid, 0, "Set UID - MAGIC tags only"},
     {"sim",     CmdHF14AMfUSim,     0, "Simulate Ultralight from emulator memory"},
-    {"gen",     CmdHF14AMfuGenDiverseKeys , 1, "Generate 3des mifare diversified keys"},
+    {"gen",     CmdHF14AMfuGenDiverseKeys, 1, "Generate 3des mifare diversified keys"},
     {"pwdgen",  CmdHF14AMfuPwdGen,  1, "Generate pwd from known algos"},
     {NULL, NULL, 0, NULL}
 };
 
-int CmdHFMFUltra(const char *Cmd){
+int CmdHFMFUltra(const char *Cmd)
+{
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd){
+int CmdHelp(const char *Cmd)
+{
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdhfmfu.h b/client/cmdhfmfu.h
index 16fa43001..6be4beb6c 100644
--- a/client/cmdhfmfu.h
+++ b/client/cmdhfmfu.h
@@ -45,8 +45,8 @@ extern int CmdHF14AMfUSim(const char *Cmd);
 extern uint32_t GetHF14AMfU_Type(void);
 extern int ul_print_type(uint32_t tagtype, uint8_t spacer);
 
-void printMFUdump(mfu_dump_t* card);
-void printMFUdumpEx(mfu_dump_t* card, uint16_t pages, uint8_t startpage);
+void printMFUdump(mfu_dump_t *card);
+void printMFUdumpEx(mfu_dump_t *card, uint16_t pages, uint8_t startpage);
 
 extern int usage_hf_mfu_info(void);
 extern int usage_hf_mfu_dump(void);
@@ -62,18 +62,18 @@ extern int usage_hf_mfu_pwdgen(void);
 
 int CmdHFMFUltra(const char *Cmd);
 
-uint32_t ul_ev1_pwdgenA(uint8_t* uid);
-uint32_t ul_ev1_pwdgenA(uint8_t* uid);
-uint32_t ul_ev1_pwdgenC(uint8_t* uid);
-uint32_t ul_ev1_pwdgenD(uint8_t* uid);
+uint32_t ul_ev1_pwdgenA(uint8_t *uid);
+uint32_t ul_ev1_pwdgenA(uint8_t *uid);
+uint32_t ul_ev1_pwdgenC(uint8_t *uid);
+uint32_t ul_ev1_pwdgenD(uint8_t *uid);
 
-uint16_t ul_ev1_packgenA(uint8_t* uid);
-uint16_t ul_ev1_packgenB(uint8_t* uid);
-uint16_t ul_ev1_packgenC(uint8_t* uid);
-uint16_t ul_ev1_packgenD(uint8_t* uid);
-uint16_t ul_ev1_packgen_VCNEW(uint8_t* uid, uint32_t pwd);
+uint16_t ul_ev1_packgenA(uint8_t *uid);
+uint16_t ul_ev1_packgenB(uint8_t *uid);
+uint16_t ul_ev1_packgenC(uint8_t *uid);
+uint16_t ul_ev1_packgenD(uint8_t *uid);
+uint16_t ul_ev1_packgen_VCNEW(uint8_t *uid, uint32_t pwd);
 
-uint32_t ul_ev1_otpgenA(uint8_t* uid);
+uint32_t ul_ev1_otpgenA(uint8_t *uid);
 
 typedef enum TAGTYPE_UL {
     UNKNOWN          = 0x000000,
diff --git a/client/cmdhftopaz.c b/client/cmdhftopaz.c
index d461cb2fa..28e1d05a4 100644
--- a/client/cmdhftopaz.c
+++ b/client/cmdhftopaz.c
@@ -25,23 +25,26 @@ static struct {
     uint8_t HR01[2];
     uint8_t uid[7];
     uint16_t size;
-    uint8_t data_blocks[TOPAZ_STATIC_MEMORY/8][8]; // this memory is always there
+    uint8_t data_blocks[TOPAZ_STATIC_MEMORY / 8][8]; // this memory is always there
     uint8_t *dynamic_memory;                       // this memory can be there
     dynamic_lock_area_t *dynamic_lock_areas;       // lock area descriptors
 } topaz_tag;
 
-static void topaz_switch_on_field(void) {
+static void topaz_switch_on_field(void)
+{
     UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_SELECT | ISO14A_NO_DISCONNECT | ISO14A_TOPAZMODE | ISO14A_NO_RATS, 0, 0}};
     SendCommand(&c);
 }
 
-static void topaz_switch_off_field(void) {
+static void topaz_switch_off_field(void)
+{
     UsbCommand c = {CMD_READER_ISO_14443a, {0, 0, 0}};
     SendCommand(&c);
 }
 
 // send a raw topaz command, returns the length of the response (0 in case of error)
-static int topaz_send_cmd_raw(uint8_t *cmd, uint8_t len, uint8_t *response) {
+static int topaz_send_cmd_raw(uint8_t *cmd, uint8_t len, uint8_t *response)
+{
     UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_NO_DISCONNECT | ISO14A_TOPAZMODE | ISO14A_NO_RATS, len, 0}};
     memcpy(c.d.asBytes, cmd, len);
     SendCommand(&c);
@@ -58,12 +61,13 @@ static int topaz_send_cmd_raw(uint8_t *cmd, uint8_t len, uint8_t *response) {
 
 
 // calculate CRC bytes and send topaz command, returns the length of the response (0 in case of error)
-static int topaz_send_cmd(uint8_t *cmd, uint8_t len, uint8_t *response) {
+static int topaz_send_cmd(uint8_t *cmd, uint8_t len, uint8_t *response)
+{
     if (len > 1) {
         uint8_t b1, b2;
-        compute_crc(CRC_14443_B, cmd, len-2, &b1, &b2);
-        cmd[len-2] = b1;
-        cmd[len-1] = b2;
+        compute_crc(CRC_14443_B, cmd, len - 2, &b1, &b2);
+        cmd[len - 2] = b1;
+        cmd[len - 1] = b2;
     }
 
     return topaz_send_cmd_raw(cmd, len, response);
@@ -71,7 +75,8 @@ static int topaz_send_cmd(uint8_t *cmd, uint8_t len, uint8_t *response) {
 
 
 // select a topaz tag. Send WUPA and RID.
-static int topaz_select(uint8_t *atqa, uint8_t *rid_response) {
+static int topaz_select(uint8_t *atqa, uint8_t *rid_response)
+{
     // ToDo: implement anticollision
 
     uint8_t wupa_cmd[] = {TOPAZ_WUPA};
@@ -94,7 +99,8 @@ static int topaz_select(uint8_t *atqa, uint8_t *rid_response) {
 
 
 // read all of the static memory of a selected Topaz tag.
-static int topaz_rall(uint8_t *uid, uint8_t *response) {
+static int topaz_rall(uint8_t *uid, uint8_t *response)
+{
     uint8_t rall_cmd[] = {TOPAZ_RALL, 0, 0, 0, 0, 0, 0, 0, 0};
 
     memcpy(&rall_cmd[3], uid, 4);
@@ -124,7 +130,8 @@ static int topaz_read_block(uint8_t *uid, uint8_t blockno, uint8_t *block_data)
 }
 
 // read a segment (16 blocks = 128 Bytes) of a selected Topaz tag. Works only for tags with dynamic memory.
-static int topaz_read_segment(uint8_t *uid, uint8_t segno, uint8_t *segment_data) {
+static int topaz_read_segment(uint8_t *uid, uint8_t segno, uint8_t *segment_data)
+{
     uint8_t rseg_cmd[] = {TOPAZ_RSEG, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
     uint8_t rseg_response[131];
 
@@ -139,7 +146,8 @@ static int topaz_read_segment(uint8_t *uid, uint8_t segno, uint8_t *segment_data
 }
 
 // search for the lock area descriptor for the lockable area including byteno
-static dynamic_lock_area_t *get_dynamic_lock_area(uint16_t byteno) {
+static dynamic_lock_area_t *get_dynamic_lock_area(uint16_t byteno)
+{
     dynamic_lock_area_t *lock_area;
     lock_area = topaz_tag.dynamic_lock_areas;
 
@@ -154,7 +162,8 @@ static dynamic_lock_area_t *get_dynamic_lock_area(uint16_t byteno) {
 }
 
 // check if a memory byte is locked.
-static bool topaz_byte_is_locked(uint16_t byteno) {
+static bool topaz_byte_is_locked(uint16_t byteno)
+{
     uint8_t *lockbits;
     uint16_t locked_bytes_per_bit;
     dynamic_lock_area_t *lock_area;
@@ -174,7 +183,7 @@ static bool topaz_byte_is_locked(uint16_t byteno) {
     }
 
     uint16_t blockno = byteno / locked_bytes_per_bit;
-    if(lockbits[blockno/8] & (0x01 << (blockno % 8))) {
+    if (lockbits[blockno / 8] & (0x01 << (blockno % 8))) {
         return true;
     } else {
         return false;
@@ -183,7 +192,8 @@ static bool topaz_byte_is_locked(uint16_t byteno) {
 
 
 // read and print the Capability Container
-static int topaz_print_CC(uint8_t *data) {
+static int topaz_print_CC(uint8_t *data)
+{
     if (data[0] != 0xe1) {
         topaz_tag.size = TOPAZ_STATIC_MEMORY;
         return -1; // no NDEF message
@@ -197,14 +207,15 @@ static int topaz_print_CC(uint8_t *data) {
     topaz_tag.dynamic_memory = calloc(memsize - TOPAZ_STATIC_MEMORY, sizeof(uint8_t));
     PrintAndLogEx(NORMAL, "  %02x: Physical Memory Size of this tag: %d bytes", data[2], memsize);
     PrintAndLogEx(NORMAL, "  %02x: %s / %s", data[3],
-                (data[3] & 0xF0) ? "(RFU)" : "Read access granted without any security",
-                (data[3] & 0x0F)==0 ? "Write access granted without any security" : (data[3] & 0x0F)==0x0F ? "No write access granted at all" : "(RFU)");
+                  (data[3] & 0xF0) ? "(RFU)" : "Read access granted without any security",
+                  (data[3] & 0x0F) == 0 ? "Write access granted without any security" : (data[3] & 0x0F) == 0x0F ? "No write access granted at all" : "(RFU)");
     return 0;
 }
 
 
 // return type, length and value of a TLV, starting at memory position *TLV_ptr
-static void get_TLV(uint8_t **TLV_ptr, uint8_t *TLV_type, uint16_t *TLV_length, uint8_t **TLV_value) {
+static void get_TLV(uint8_t **TLV_ptr, uint8_t *TLV_type, uint16_t *TLV_length, uint8_t **TLV_value)
+{
     *TLV_length = 0;
     *TLV_value = NULL;
 
@@ -238,7 +249,8 @@ static void get_TLV(uint8_t **TLV_ptr, uint8_t *TLV_type, uint16_t *TLV_length,
 // lock area TLVs contain no information on the start of the respective lockable area. Lockable areas
 // do not include the lock bits and reserved memory. We therefore need to adjust the start of the
 // respective lockable areas accordingly
-static void adjust_lock_areas(uint16_t block_start, uint16_t block_size) {
+static void adjust_lock_areas(uint16_t block_start, uint16_t block_size)
+{
     dynamic_lock_area_t *lock_area = topaz_tag.dynamic_lock_areas;
     while (lock_area != NULL) {
         if (lock_area->first_locked_byte <= block_start) {
@@ -250,7 +262,8 @@ static void adjust_lock_areas(uint16_t block_start, uint16_t block_size) {
 
 
 // read and print the lock area and reserved memory TLVs
-static void topaz_print_control_TLVs(uint8_t *memory) {
+static void topaz_print_control_TLVs(uint8_t *memory)
+{
     uint8_t *TLV_ptr = memory;
     uint8_t TLV_type = 0;
     uint16_t TLV_length;
@@ -266,21 +279,21 @@ static void topaz_print_control_TLVs(uint8_t *memory) {
             uint8_t pages_addr = TLV_value[0] >> 4;
             uint8_t byte_offset = TLV_value[0] & 0x0f;
             uint16_t size_in_bits = TLV_value[1] ? TLV_value[1] : 256;
-            uint16_t size_in_bytes = (size_in_bits + 7)/8;
+            uint16_t size_in_bytes = (size_in_bits + 7) / 8;
             uint16_t bytes_per_page = 1 << (TLV_value[2] & 0x0f);
             uint16_t bytes_locked_per_bit = 1 << (TLV_value[2] >> 4);
             uint16_t area_start = pages_addr * bytes_per_page + byte_offset;
             PrintAndLogEx(NORMAL, "Lock Area of %d bits at byte offset 0x%04x. Each Lock Bit locks %d bytes.",
-                        size_in_bits,
-                        area_start,
-                        bytes_locked_per_bit);
+                          size_in_bits,
+                          area_start,
+                          bytes_locked_per_bit);
             lock_TLV_present = true;
             dynamic_lock_area_t *old = topaz_tag.dynamic_lock_areas;
             dynamic_lock_area_t *new = topaz_tag.dynamic_lock_areas;
             if (old == NULL) {
-                new = topaz_tag.dynamic_lock_areas = (dynamic_lock_area_t *) calloc(sizeof(dynamic_lock_area_t) , sizeof(uint8_t));
+                new = topaz_tag.dynamic_lock_areas = (dynamic_lock_area_t *) calloc(sizeof(dynamic_lock_area_t), sizeof(uint8_t));
             } else {
-                while(old->next != NULL) {
+                while (old->next != NULL) {
                     old = old->next;
                 }
                 new = old->next = (dynamic_lock_area_t *) calloc(sizeof(dynamic_lock_area_t), sizeof(uint8_t));
@@ -303,8 +316,8 @@ static void topaz_print_control_TLVs(uint8_t *memory) {
             uint8_t bytes_per_page = 1 << (TLV_value[2] & 0x0f);
             uint16_t area_start = pages_addr * bytes_per_page + byte_offset;
             PrintAndLogEx(NORMAL, "Reserved Memory of %d bytes at byte offset 0x%02x.",
-                        size_in_bytes,
-                        area_start);
+                          size_in_bytes,
+                          area_start);
             reserved_memory_control_TLV_present = true;
             adjust_lock_areas(area_start, size_in_bytes);  // reserved memory areas are not lockable
             if (area_start <= next_lockable_byte) {
@@ -323,7 +336,8 @@ static void topaz_print_control_TLVs(uint8_t *memory) {
 }
 
 // read all of the dynamic memory
-static int topaz_read_dynamic_data(void){
+static int topaz_read_dynamic_data(void)
+{
     // first read the remaining block of segment 0
     if (topaz_read_block(topaz_tag.uid, 0x0f, &topaz_tag.dynamic_memory[0]) == -1) {
         PrintAndLogEx(WARNING, "Error while reading dynamic memory block %02x. Aborting...", 0x0f);
@@ -333,7 +347,7 @@ static int topaz_read_dynamic_data(void){
     // read the remaining segments
     uint8_t max_segment = topaz_tag.size / 128 - 1;
     for (uint8_t segment = 1; segment <= max_segment; segment++) {
-        if (topaz_read_segment(topaz_tag.uid, segment, &topaz_tag.dynamic_memory[(segment-1)*128+8]) == -1) {
+        if (topaz_read_segment(topaz_tag.uid, segment, &topaz_tag.dynamic_memory[(segment - 1) * 128 + 8]) == -1) {
             PrintAndLogEx(WARNING, "Error while reading dynamic memory block %02x. Aborting...", 0x0f);
             return -1;
         }
@@ -343,36 +357,40 @@ static int topaz_read_dynamic_data(void){
 
 
 // read and print the dynamic memory
-static void topaz_print_dynamic_data(void) {
+static void topaz_print_dynamic_data(void)
+{
     if (topaz_tag.size > TOPAZ_STATIC_MEMORY) {
         PrintAndLogEx(NORMAL, "Dynamic Data blocks:");
         if (topaz_read_dynamic_data() == 0) {
             PrintAndLogEx(NORMAL, "block# | offset | Data                    | Locked(y/n)");
             char line[80];
-            for (uint16_t blockno = 0x0f; blockno < topaz_tag.size/8; blockno++) {
-                uint8_t *block_data = &topaz_tag.dynamic_memory[(blockno-0x0f)*8];
+            for (uint16_t blockno = 0x0f; blockno < topaz_tag.size / 8; blockno++) {
+                uint8_t *block_data = &topaz_tag.dynamic_memory[(blockno - 0x0f) * 8];
                 char lockbits[9];
                 for (uint16_t j = 0; j < 8; j++) {
-                    sprintf(&line[3*j], "%02x ", block_data[j]);
-                    lockbits[j] = topaz_byte_is_locked(blockno*8+j) ? 'y' : 'n';
+                    sprintf(&line[3 * j], "%02x ", block_data[j]);
+                    lockbits[j] = topaz_byte_is_locked(blockno * 8 + j) ? 'y' : 'n';
                 }
                 lockbits[8] = '\0';
-                PrintAndLogEx(NORMAL, "  0x%02x | 0x%04x | %s|   %-3s", blockno, blockno*8, line, lockbits);
+                PrintAndLogEx(NORMAL, "  0x%02x | 0x%04x | %s|   %-3s", blockno, blockno * 8, line, lockbits);
             }
         }
     }
 }
 
-static void topaz_print_lifecycle_state(uint8_t *data) {
+static void topaz_print_lifecycle_state(uint8_t *data)
+{
     // to be done
 }
 
-static void topaz_print_NDEF(uint8_t *data) {
+static void topaz_print_NDEF(uint8_t *data)
+{
     // to be done.
 }
 
 // read a Topaz tag and print some useful information
-int CmdHFTopazReader(const char *Cmd) {
+int CmdHFTopazReader(const char *Cmd)
+{
     int status;
     uint8_t atqa[2];
     uint8_t rid_response[8];
@@ -381,7 +399,7 @@ int CmdHFTopazReader(const char *Cmd) {
     bool verbose = true;
 
     char ctmp = param_getchar(Cmd, 0);
-    if ( ctmp == 'S' || ctmp == 's') verbose = false;
+    if (ctmp == 'S' || ctmp == 's') verbose = false;
 
     status = topaz_select(atqa, rid_response);
 
@@ -408,9 +426,9 @@ int CmdHFTopazReader(const char *Cmd) {
 
     // ToDo: CRC check
     PrintAndLogEx(NORMAL, "HR0  : %02x (%sa Topaz tag (%scapable of carrying a NDEF message), %s memory map)", rid_response[0],
-                        (rid_response[0] & 0xF0) == 0x10 ? "" : "not ",
-                        (rid_response[0] & 0xF0) == 0x10 ? "" : "not ",
-                        (rid_response[0] & 0x0F) == 0x01 ? "static" : "dynamic");
+                  (rid_response[0] & 0xF0) == 0x10 ? "" : "not ",
+                  (rid_response[0] & 0xF0) == 0x10 ? "" : "not ",
+                  (rid_response[0] & 0x0F) == 0x01 ? "static" : "dynamic");
     PrintAndLogEx(NORMAL, "HR1  : %02x", rid_response[1]);
 
     status = topaz_rall(uid_echo, rall_response);
@@ -421,21 +439,21 @@ int CmdHFTopazReader(const char *Cmd) {
         return -1;
     }
 
-    memcpy(topaz_tag.uid, rall_response+2, 7);
+    memcpy(topaz_tag.uid, rall_response + 2, 7);
     PrintAndLogEx(NORMAL, "UID  : %02x %02x %02x %02x %02x %02x %02x",
-            topaz_tag.uid[6],
-            topaz_tag.uid[5],
-            topaz_tag.uid[4],
-            topaz_tag.uid[3],
-            topaz_tag.uid[2],
-            topaz_tag.uid[1],
-            topaz_tag.uid[0]);
+                  topaz_tag.uid[6],
+                  topaz_tag.uid[5],
+                  topaz_tag.uid[4],
+                  topaz_tag.uid[3],
+                  topaz_tag.uid[2],
+                  topaz_tag.uid[1],
+                  topaz_tag.uid[0]);
 
     PrintAndLogEx(NORMAL, "       UID[6] (Manufacturer Byte) = %02x, Manufacturer: %s",
-            topaz_tag.uid[6],
-            getTagInfo(topaz_tag.uid[6]));
+                  topaz_tag.uid[6],
+                  getTagInfo(topaz_tag.uid[6]));
 
-    memcpy(topaz_tag.data_blocks, rall_response+2, 0x0f*8);
+    memcpy(topaz_tag.data_blocks, rall_response + 2, 0x0f * 8);
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Static Data blocks 00 to 0c:");
     PrintAndLogEx(NORMAL, "block# | offset | Data                    | Locked");
@@ -443,26 +461,26 @@ int CmdHFTopazReader(const char *Cmd) {
     for (uint16_t i = 0; i <= 0x0c; i++) {
         char lockbits[9];
         for (uint16_t j = 0; j < 8; j++) {
-            sprintf(&line[3*j], "%02x ", topaz_tag.data_blocks[i][j] /*rall_response[2 + 8*i + j]*/);
-            lockbits[j] = topaz_byte_is_locked(i*8+j) ? 'y' : 'n';
+            sprintf(&line[3 * j], "%02x ", topaz_tag.data_blocks[i][j] /*rall_response[2 + 8*i + j]*/);
+            lockbits[j] = topaz_byte_is_locked(i * 8 + j) ? 'y' : 'n';
         }
         lockbits[8] = '\0';
-        PrintAndLogEx(NORMAL, "  0x%02x | 0x%02x | %s|   %-3s", i, i*8, line, lockbits);
+        PrintAndLogEx(NORMAL, "  0x%02x | 0x%02x | %s|   %-3s", i, i * 8, line, lockbits);
     }
 
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Static Reserved block 0d:");
     for (uint16_t j = 0; j < 8; j++) {
-        sprintf(&line[3*j], "%02x ", topaz_tag.data_blocks[0x0d][j]);
+        sprintf(&line[3 * j], "%02x ", topaz_tag.data_blocks[0x0d][j]);
     }
-    PrintAndLogEx(NORMAL, "  0x%02x |  0x%02x  | %s|   %-3s", 0x0d, 0x0d*8, line, "n/a");
+    PrintAndLogEx(NORMAL, "  0x%02x |  0x%02x  | %s|   %-3s", 0x0d, 0x0d * 8, line, "n/a");
 
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Static Lockbits and OTP Bytes:");
     for (uint16_t j = 0; j < 8; j++) {
-        sprintf(&line[3*j], "%02x ", topaz_tag.data_blocks[0x0e][j]);
+        sprintf(&line[3 * j], "%02x ", topaz_tag.data_blocks[0x0e][j]);
     }
-    PrintAndLogEx(NORMAL, "  0x%02x |  0x%02x  | %s|   %-3s", 0x0e, 0x0e*8, line, "n/a");
+    PrintAndLogEx(NORMAL, "  0x%02x |  0x%02x  | %s|   %-3s", 0x0e, 0x0e * 8, line, "n/a");
 
     PrintAndLogEx(NORMAL, "");
 
@@ -488,17 +506,20 @@ int CmdHFTopazReader(const char *Cmd) {
     return 0;
 }
 
-int CmdHFTopazSim(const char *Cmd) {
+int CmdHFTopazSim(const char *Cmd)
+{
     PrintAndLogEx(NORMAL, "not yet implemented");
     return 0;
 }
 
-int CmdHFTopazCmdRaw(const char *Cmd) {
+int CmdHFTopazCmdRaw(const char *Cmd)
+{
     PrintAndLogEx(NORMAL, "not yet implemented. Use hf 14 raw with option -T.");
     return 0;
 }
 
-int CmdHFTopazList(const char *Cmd) {
+int CmdHFTopazList(const char *Cmd)
+{
     CmdTraceList("topaz");
     return 0;
 }
@@ -515,13 +536,15 @@ static command_t CommandTable[] = {
     {NULL,      NULL,               0, NULL}
 };
 
-int CmdHFTopaz(const char *Cmd) {
+int CmdHFTopaz(const char *Cmd)
+{
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-static int CmdHelp(const char *Cmd) {
+static int CmdHelp(const char *Cmd)
+{
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdhw.c b/client/cmdhw.c
index da53ee1f2..b95203b56 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -23,132 +23,296 @@
 
 static int CmdHelp(const char *Cmd);
 
-static void lookupChipID(uint32_t iChipID, uint32_t mem_used) {
+static void lookupChipID(uint32_t iChipID, uint32_t mem_used)
+{
     char asBuff[120];
     memset(asBuff, 0, sizeof(asBuff));
     uint32_t mem_avail = 0;
     PrintAndLogEx(NORMAL, "\n [ Hardware ] ");
 
-    switch(iChipID) {
-        case 0x270B0A40: sprintf(asBuff,"AT91SAM7S512 Rev A"); break;
-        case 0x270B0A4F: sprintf(asBuff,"AT91SAM7S512 Rev B"); break;
-        case 0x270D0940: sprintf(asBuff,"AT91SAM7S256 Rev A"); break;
-        case 0x270B0941: sprintf(asBuff,"AT91SAM7S256 Rev B"); break;
-        case 0x270B0942: sprintf(asBuff,"AT91SAM7S256 Rev C"); break;
-        case 0x270B0943: sprintf(asBuff,"AT91SAM7S256 Rev D"); break;
-        case 0x270C0740: sprintf(asBuff,"AT91SAM7S128 Rev A"); break;
-        case 0x270A0741: sprintf(asBuff,"AT91SAM7S128 Rev B"); break;
-        case 0x270A0742: sprintf(asBuff,"AT91SAM7S128 Rev C"); break;
-        case 0x270A0743: sprintf(asBuff,"AT91SAM7S128 Rev D"); break;
-        case 0x27090540: sprintf(asBuff,"AT91SAM7S64 Rev A"); break;
-        case 0x27090543: sprintf(asBuff,"AT91SAM7S64 Rev B"); break;
-        case 0x27090544: sprintf(asBuff,"AT91SAM7S64 Rev C"); break;
-        case 0x27080342: sprintf(asBuff,"AT91SAM7S321 Rev A"); break;
-        case 0x27080340: sprintf(asBuff,"AT91SAM7S32 Rev A"); break;
-        case 0x27080341: sprintf(asBuff,"AT91SAM7S32 Rev B"); break;
-        case 0x27050241: sprintf(asBuff,"AT9SAM7S161 Rev A"); break;
-        case 0x27050240: sprintf(asBuff,"AT91SAM7S16 Rev A"); break;
+    switch (iChipID) {
+        case 0x270B0A40:
+            sprintf(asBuff, "AT91SAM7S512 Rev A");
+            break;
+        case 0x270B0A4F:
+            sprintf(asBuff, "AT91SAM7S512 Rev B");
+            break;
+        case 0x270D0940:
+            sprintf(asBuff, "AT91SAM7S256 Rev A");
+            break;
+        case 0x270B0941:
+            sprintf(asBuff, "AT91SAM7S256 Rev B");
+            break;
+        case 0x270B0942:
+            sprintf(asBuff, "AT91SAM7S256 Rev C");
+            break;
+        case 0x270B0943:
+            sprintf(asBuff, "AT91SAM7S256 Rev D");
+            break;
+        case 0x270C0740:
+            sprintf(asBuff, "AT91SAM7S128 Rev A");
+            break;
+        case 0x270A0741:
+            sprintf(asBuff, "AT91SAM7S128 Rev B");
+            break;
+        case 0x270A0742:
+            sprintf(asBuff, "AT91SAM7S128 Rev C");
+            break;
+        case 0x270A0743:
+            sprintf(asBuff, "AT91SAM7S128 Rev D");
+            break;
+        case 0x27090540:
+            sprintf(asBuff, "AT91SAM7S64 Rev A");
+            break;
+        case 0x27090543:
+            sprintf(asBuff, "AT91SAM7S64 Rev B");
+            break;
+        case 0x27090544:
+            sprintf(asBuff, "AT91SAM7S64 Rev C");
+            break;
+        case 0x27080342:
+            sprintf(asBuff, "AT91SAM7S321 Rev A");
+            break;
+        case 0x27080340:
+            sprintf(asBuff, "AT91SAM7S32 Rev A");
+            break;
+        case 0x27080341:
+            sprintf(asBuff, "AT91SAM7S32 Rev B");
+            break;
+        case 0x27050241:
+            sprintf(asBuff, "AT9SAM7S161 Rev A");
+            break;
+        case 0x27050240:
+            sprintf(asBuff, "AT91SAM7S16 Rev A");
+            break;
     }
-    PrintAndLogEx(NORMAL, "  --= uC: %s",asBuff);
-    switch( (iChipID & 0xE0) >> 5) {
-        case 1: sprintf(asBuff,"ARM946ES"); break;
-        case 2: sprintf(asBuff,"ARM7TDMI"); break;
-        case 4: sprintf(asBuff,"ARM920T"); break;
-        case 5: sprintf(asBuff,"ARM926EJS"); break;
+    PrintAndLogEx(NORMAL, "  --= uC: %s", asBuff);
+    switch ((iChipID & 0xE0) >> 5) {
+        case 1:
+            sprintf(asBuff, "ARM946ES");
+            break;
+        case 2:
+            sprintf(asBuff, "ARM7TDMI");
+            break;
+        case 4:
+            sprintf(asBuff, "ARM920T");
+            break;
+        case 5:
+            sprintf(asBuff, "ARM926EJS");
+            break;
     }
-    PrintAndLogEx(NORMAL, "  --= Embedded Processor: %s",asBuff);
-    switch( (iChipID & 0xF00) >> 8) {
-        case 0:  mem_avail = 0; break;
-        case 1:  mem_avail = 8; break;
-        case 2:  mem_avail = 16; break;
-        case 3:  mem_avail = 32; break;
-        case 5:  mem_avail = 64; break;
-        case 7:  mem_avail = 128; break;
-        case 9:  mem_avail = 256; break;
-        case 10: mem_avail = 512; break;
-        case 12: mem_avail = 1024; break;
-        case 14: mem_avail = 2048; break;
+    PrintAndLogEx(NORMAL, "  --= Embedded Processor: %s", asBuff);
+    switch ((iChipID & 0xF00) >> 8) {
+        case 0:
+            mem_avail = 0;
+            break;
+        case 1:
+            mem_avail = 8;
+            break;
+        case 2:
+            mem_avail = 16;
+            break;
+        case 3:
+            mem_avail = 32;
+            break;
+        case 5:
+            mem_avail = 64;
+            break;
+        case 7:
+            mem_avail = 128;
+            break;
+        case 9:
+            mem_avail = 256;
+            break;
+        case 10:
+            mem_avail = 512;
+            break;
+        case 12:
+            mem_avail = 1024;
+            break;
+        case 14:
+            mem_avail = 2048;
+            break;
     }
 
     uint32_t mem_left = 0;
-    if ( mem_avail > 0 )
+    if (mem_avail > 0)
         mem_left = (mem_avail * 1024) - mem_used;
 
     PrintAndLogEx(NORMAL, "  --= Nonvolatile Program Memory Size: %uK bytes, Used: %u bytes (%2.0f%%) Free: %u bytes (%2.0f%%)",
-                mem_avail,
-                mem_used,
-                mem_avail == 0 ? 0.0f : (float)mem_used/(mem_avail*1024)*100,
-                mem_left,
-                mem_avail == 0 ? 0.0f : (float)mem_left/(mem_avail*1024)*100
-            );
+                  mem_avail,
+                  mem_used,
+                  mem_avail == 0 ? 0.0f : (float)mem_used / (mem_avail * 1024) * 100,
+                  mem_left,
+                  mem_avail == 0 ? 0.0f : (float)mem_left / (mem_avail * 1024) * 100
+                 );
 
-    switch( (iChipID & 0xF000) >> 12 ) {
-        case 0:  sprintf(asBuff,"None"); break;
-        case 1:  sprintf(asBuff,"8K bytes"); break;
-        case 2:  sprintf(asBuff,"16K bytes"); break;
-        case 3:  sprintf(asBuff,"32K bytes"); break;
-        case 5:  sprintf(asBuff,"64K bytes"); break;
-        case 7:  sprintf(asBuff,"128K bytes"); break;
-        case 9:  sprintf(asBuff,"256K bytes"); break;
-        case 10: sprintf(asBuff,"512K bytes"); break;
-        case 12: sprintf(asBuff,"1024K bytes"); break;
-        case 14: sprintf(asBuff,"2048K bytes"); break;
+    switch ((iChipID & 0xF000) >> 12) {
+        case 0:
+            sprintf(asBuff, "None");
+            break;
+        case 1:
+            sprintf(asBuff, "8K bytes");
+            break;
+        case 2:
+            sprintf(asBuff, "16K bytes");
+            break;
+        case 3:
+            sprintf(asBuff, "32K bytes");
+            break;
+        case 5:
+            sprintf(asBuff, "64K bytes");
+            break;
+        case 7:
+            sprintf(asBuff, "128K bytes");
+            break;
+        case 9:
+            sprintf(asBuff, "256K bytes");
+            break;
+        case 10:
+            sprintf(asBuff, "512K bytes");
+            break;
+        case 12:
+            sprintf(asBuff, "1024K bytes");
+            break;
+        case 14:
+            sprintf(asBuff, "2048K bytes");
+            break;
     }
-    PrintAndLogEx(NORMAL, "  --= Second Nonvolatile Program Memory Size: %s",asBuff);
-    switch( (iChipID & 0xF0000) >> 16) {
-        case 1:  sprintf(asBuff,"1K bytes"); break;
-        case 2:  sprintf(asBuff,"2K bytes"); break;
-        case 3:  sprintf(asBuff,"6K bytes"); break;
-        case 4:  sprintf(asBuff,"112K bytes"); break;
-        case 5:  sprintf(asBuff,"4K bytes"); break;
-        case 6:  sprintf(asBuff,"80K bytes"); break;
-        case 7:  sprintf(asBuff,"160K bytes"); break;
-        case 8:  sprintf(asBuff,"8K bytes"); break;
-        case 9:  sprintf(asBuff,"16K bytes"); break;
-        case 10: sprintf(asBuff,"32K bytes"); break;
-        case 11: sprintf(asBuff,"64K bytes"); break;
-        case 12: sprintf(asBuff,"128K bytes"); break;
-        case 13: sprintf(asBuff,"256K bytes"); break;
-        case 14: sprintf(asBuff,"96K bytes"); break;
-        case 15: sprintf(asBuff,"512K bytes");break;
+    PrintAndLogEx(NORMAL, "  --= Second Nonvolatile Program Memory Size: %s", asBuff);
+    switch ((iChipID & 0xF0000) >> 16) {
+        case 1:
+            sprintf(asBuff, "1K bytes");
+            break;
+        case 2:
+            sprintf(asBuff, "2K bytes");
+            break;
+        case 3:
+            sprintf(asBuff, "6K bytes");
+            break;
+        case 4:
+            sprintf(asBuff, "112K bytes");
+            break;
+        case 5:
+            sprintf(asBuff, "4K bytes");
+            break;
+        case 6:
+            sprintf(asBuff, "80K bytes");
+            break;
+        case 7:
+            sprintf(asBuff, "160K bytes");
+            break;
+        case 8:
+            sprintf(asBuff, "8K bytes");
+            break;
+        case 9:
+            sprintf(asBuff, "16K bytes");
+            break;
+        case 10:
+            sprintf(asBuff, "32K bytes");
+            break;
+        case 11:
+            sprintf(asBuff, "64K bytes");
+            break;
+        case 12:
+            sprintf(asBuff, "128K bytes");
+            break;
+        case 13:
+            sprintf(asBuff, "256K bytes");
+            break;
+        case 14:
+            sprintf(asBuff, "96K bytes");
+            break;
+        case 15:
+            sprintf(asBuff, "512K bytes");
+            break;
     }
-    PrintAndLogEx(NORMAL, "  --= Internal SRAM Size: %s",asBuff);
-    switch( (iChipID & 0xFF00000) >> 20) {
-        case 0x19: sprintf(asBuff,"AT91SAM9xx Series"); break;
-        case 0x29: sprintf(asBuff,"AT91SAM9XExx Series"); break;
-        case 0x34: sprintf(asBuff,"AT91x34 Series"); break;
-        case 0x37: sprintf(asBuff,"CAP7 Series"); break;
-        case 0x39: sprintf(asBuff,"CAP9 Series"); break;
-        case 0x3B: sprintf(asBuff,"CAP11 Series"); break;
-        case 0x40: sprintf(asBuff,"AT91x40 Series"); break;
-        case 0x42: sprintf(asBuff,"AT91x42 Series"); break;
-        case 0x55: sprintf(asBuff,"AT91x55 Series"); break;
-        case 0x60: sprintf(asBuff,"AT91SAM7Axx Series"); break;
-        case 0x61: sprintf(asBuff,"AT91SAM7AQxx Series"); break;
-        case 0x63: sprintf(asBuff,"AT91x63 Series"); break;
-        case 0x70: sprintf(asBuff,"AT91SAM7Sxx Series"); break;
-        case 0x71: sprintf(asBuff,"AT91SAM7XCxx Series"); break;
-        case 0x72: sprintf(asBuff,"AT91SAM7SExx Series"); break;
-        case 0x73: sprintf(asBuff,"AT91SAM7Lxx Series"); break;
-        case 0x75: sprintf(asBuff,"AT91SAM7Xxx Series"); break;
-        case 0x92: sprintf(asBuff,"AT91x92 Series"); break;
-        case 0xF0: sprintf(asBuff,"AT75Cxx Series"); break;
+    PrintAndLogEx(NORMAL, "  --= Internal SRAM Size: %s", asBuff);
+    switch ((iChipID & 0xFF00000) >> 20) {
+        case 0x19:
+            sprintf(asBuff, "AT91SAM9xx Series");
+            break;
+        case 0x29:
+            sprintf(asBuff, "AT91SAM9XExx Series");
+            break;
+        case 0x34:
+            sprintf(asBuff, "AT91x34 Series");
+            break;
+        case 0x37:
+            sprintf(asBuff, "CAP7 Series");
+            break;
+        case 0x39:
+            sprintf(asBuff, "CAP9 Series");
+            break;
+        case 0x3B:
+            sprintf(asBuff, "CAP11 Series");
+            break;
+        case 0x40:
+            sprintf(asBuff, "AT91x40 Series");
+            break;
+        case 0x42:
+            sprintf(asBuff, "AT91x42 Series");
+            break;
+        case 0x55:
+            sprintf(asBuff, "AT91x55 Series");
+            break;
+        case 0x60:
+            sprintf(asBuff, "AT91SAM7Axx Series");
+            break;
+        case 0x61:
+            sprintf(asBuff, "AT91SAM7AQxx Series");
+            break;
+        case 0x63:
+            sprintf(asBuff, "AT91x63 Series");
+            break;
+        case 0x70:
+            sprintf(asBuff, "AT91SAM7Sxx Series");
+            break;
+        case 0x71:
+            sprintf(asBuff, "AT91SAM7XCxx Series");
+            break;
+        case 0x72:
+            sprintf(asBuff, "AT91SAM7SExx Series");
+            break;
+        case 0x73:
+            sprintf(asBuff, "AT91SAM7Lxx Series");
+            break;
+        case 0x75:
+            sprintf(asBuff, "AT91SAM7Xxx Series");
+            break;
+        case 0x92:
+            sprintf(asBuff, "AT91x92 Series");
+            break;
+        case 0xF0:
+            sprintf(asBuff, "AT75Cxx Series");
+            break;
     }
-    PrintAndLogEx(NORMAL, "  --= Architecture Identifier: %s",asBuff);
-    switch( (iChipID & 0x70000000) >> 28 ) {
-        case 0: sprintf(asBuff,"ROM"); break;
-        case 1: sprintf(asBuff,"ROMless or on-chip Flash"); break;
-        case 2: sprintf(asBuff,"Embedded Flash Memory"); break;
-        case 3: sprintf(asBuff,"ROM and Embedded Flash Memory\nNVPSIZ is ROM size\nNVPSIZ2 is Flash size"); break;
-        case 4: sprintf(asBuff,"SRAM emulating ROM"); break;
+    PrintAndLogEx(NORMAL, "  --= Architecture Identifier: %s", asBuff);
+    switch ((iChipID & 0x70000000) >> 28) {
+        case 0:
+            sprintf(asBuff, "ROM");
+            break;
+        case 1:
+            sprintf(asBuff, "ROMless or on-chip Flash");
+            break;
+        case 2:
+            sprintf(asBuff, "Embedded Flash Memory");
+            break;
+        case 3:
+            sprintf(asBuff, "ROM and Embedded Flash Memory\nNVPSIZ is ROM size\nNVPSIZ2 is Flash size");
+            break;
+        case 4:
+            sprintf(asBuff, "SRAM emulating ROM");
+            break;
     }
-    PrintAndLogEx(NORMAL, "  --= Nonvolatile Program Memory Type: %s",asBuff);
+    PrintAndLogEx(NORMAL, "  --= Nonvolatile Program Memory Type: %s", asBuff);
 }
 
-int CmdDetectReader(const char *Cmd) {
+int CmdDetectReader(const char *Cmd)
+{
     UsbCommand c = {CMD_LISTEN_READER_FIELD};
     // 'l' means LF - 125/134 kHz
-    if(*Cmd == 'l') {
+    if (*Cmd == 'l') {
         c.arg[0] = 1;
     } else if (*Cmd == 'h') {
         c.arg[0] = 2;
@@ -162,7 +326,8 @@ int CmdDetectReader(const char *Cmd) {
 }
 
 // ## FPGA Control
-int CmdFPGAOff(const char *Cmd) {
+int CmdFPGAOff(const char *Cmd)
+{
     UsbCommand c = {CMD_FPGA_MAJOR_MODE_OFF};
     clearCommandBuffer();
     SendCommand(&c);
@@ -170,7 +335,8 @@ int CmdFPGAOff(const char *Cmd) {
 }
 
 #ifdef WITH_LCD
-int CmdLCD(const char *Cmd) {
+int CmdLCD(const char *Cmd)
+{
     int i, j;
 
     UsbCommand c = {CMD_LCD};
@@ -183,7 +349,8 @@ int CmdLCD(const char *Cmd) {
     return 0;
 }
 
-int CmdLCDReset(const char *Cmd) {
+int CmdLCDReset(const char *Cmd)
+{
     UsbCommand c = {CMD_LCD_RESET, {strtol(Cmd, NULL, 0), 0, 0}};
     clearCommandBuffer();
     SendCommand(&c);
@@ -191,14 +358,16 @@ int CmdLCDReset(const char *Cmd) {
 }
 #endif
 
-int CmdReadmem(const char *Cmd) {
+int CmdReadmem(const char *Cmd)
+{
     UsbCommand c = {CMD_READ_MEM, {strtol(Cmd, NULL, 0), 0, 0}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
 }
 
-int CmdReset(const char *Cmd) {
+int CmdReset(const char *Cmd)
+{
     UsbCommand c = {CMD_HARDWARE_RESET};
     clearCommandBuffer();
     SendCommand(&c);
@@ -209,7 +378,8 @@ int CmdReset(const char *Cmd) {
  * Sets the divisor for LF frequency clock: lets the user choose any LF frequency below
  * 600kHz.
  */
-int CmdSetDivisor(const char *Cmd) {
+int CmdSetDivisor(const char *Cmd)
+{
     UsbCommand c = {CMD_SET_LF_DIVISOR, {strtol(Cmd, NULL, 0), 0, 0}};
 
     if (c.arg[0] < 19 || c.arg[0] > 255) {
@@ -219,11 +389,12 @@ int CmdSetDivisor(const char *Cmd) {
     // 12 000 000 (12Mhz)
     clearCommandBuffer();
     SendCommand(&c);
-    PrintAndLogEx(NORMAL, "Divisor set, expected %.1f KHz", ((double)12000 / (c.arg[0]+1)) );
+    PrintAndLogEx(NORMAL, "Divisor set, expected %.1f KHz", ((double)12000 / (c.arg[0] + 1)));
     return 0;
 }
 
-int CmdSetMux(const char *Cmd) {
+int CmdSetMux(const char *Cmd)
+{
 
     if (strlen(Cmd) < 5) {
         PrintAndLogEx(NORMAL, "expected:  lopkd | loraw | hipkd | hiraw");
@@ -241,14 +412,16 @@ int CmdSetMux(const char *Cmd) {
     return 0;
 }
 
-int CmdTune(const char *Cmd) {
+int CmdTune(const char *Cmd)
+{
     return CmdTuneSamples(Cmd);
 }
 
-int CmdVersion(const char *Cmd) {
+int CmdVersion(const char *Cmd)
+{
 
     bool silent = (Cmd[0] == 's' || Cmd[0] ==  'S');
-    if ( silent )
+    if (silent)
         return 0;
 
     UsbCommand c = {CMD_VERSION, {0, 0, 0}};
@@ -277,14 +450,15 @@ int CmdVersion(const char *Cmd) {
         PrintAndLogEx(NORMAL, "\n [ CLIENT ]");
         PrintAndLogEx(NORMAL, "  client: iceman %s \n", s);
 
-        PrintAndLogEx(NORMAL, (char*)resp.d.asBytes);
+        PrintAndLogEx(NORMAL, (char *)resp.d.asBytes);
         lookupChipID(resp.arg[0], resp.arg[1]);
     }
     PrintAndLogEx(NORMAL, "\n");
     return 0;
 }
 
-int CmdStatus(const char *Cmd) {
+int CmdStatus(const char *Cmd)
+{
     clearCommandBuffer();
     UsbCommand c = {CMD_STATUS};
     SendCommand(&c);
@@ -293,7 +467,8 @@ int CmdStatus(const char *Cmd) {
     return 0;
 }
 
-int CmdPing(const char *Cmd) {
+int CmdPing(const char *Cmd)
+{
     clearCommandBuffer();
     UsbCommand resp;
     UsbCommand c = {CMD_PING};
@@ -307,7 +482,7 @@ int CmdPing(const char *Cmd) {
 
 static command_t CommandTable[] = {
     {"help",          CmdHelp,        1, "This help"},
-    {"detectreader",  CmdDetectReader,0, "['l'|'h'] -- Detect external reader field (option 'l' or 'h' to limit to LF or HF)"},
+    {"detectreader",  CmdDetectReader, 0, "['l'|'h'] -- Detect external reader field (option 'l' or 'h' to limit to LF or HF)"},
     {"fpgaoff",       CmdFPGAOff,     0, "Set FPGA off"},
 #ifdef WITH_LCD
     {"lcd",           CmdLCD,         0, "<HEX command> <count> -- Send command/data to LCD"},
@@ -324,13 +499,15 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdHW(const char *Cmd) {
+int CmdHW(const char *Cmd)
+{
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
+int CmdHelp(const char *Cmd)
+{
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlf.c b/client/cmdlf.c
index c40e5b32d..30ad0cdc2 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -13,7 +13,8 @@ bool g_lf_threshold_set = false;
 
 static int CmdHelp(const char *Cmd);
 
-int usage_lf_cmdread(void) {
+int usage_lf_cmdread(void)
+{
     PrintAndLogEx(NORMAL, "Usage: lf cmdread d <delay period> z <zero period> o <one period> c <cmdbytes>");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       h             This help");
@@ -28,7 +29,8 @@ int usage_lf_cmdread(void) {
     PrintAndLogEx(NORMAL, "      lf cmdread d 80 z 100 o 200 c 11000");
     return 0;
 }
-int usage_lf_read(void){
+int usage_lf_read(void)
+{
     PrintAndLogEx(NORMAL, "Usage: lf read [h] [s] [d numofsamples]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       h            This help");
@@ -41,7 +43,8 @@ int usage_lf_read(void){
     PrintAndLogEx(NORMAL, "         lf read s");
     return 0;
 }
-int usage_lf_snoop(void) {
+int usage_lf_snoop(void)
+{
     PrintAndLogEx(NORMAL, "Snoop low frequence signal. Use 'lf config' to set parameters.");
     PrintAndLogEx(NORMAL, "Usage: lf snoop [h]");
     PrintAndLogEx(NORMAL, "Options:");
@@ -50,7 +53,8 @@ int usage_lf_snoop(void) {
     PrintAndLogEx(NORMAL, "Use 'lf config' to set parameters.");
     return 0;
 }
-int usage_lf_config(void) {
+int usage_lf_config(void)
+{
     PrintAndLogEx(NORMAL, "Usage: lf config [h] [H|<divisor>] [b <bps>] [d <decim>] [a 0|1]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       h             This help");
@@ -73,7 +77,8 @@ int usage_lf_config(void) {
     PrintAndLogEx(NORMAL, "                    Performs a snoop (no active field)");
     return 0;
 }
-int usage_lf_simfsk(void) {
+int usage_lf_simfsk(void)
+{
     PrintAndLogEx(NORMAL, "Usage: lf simfsk [h] [c <clock>] [H <fcHigh>] [L <fcLow>] [d <hexdata>]");
     PrintAndLogEx(NORMAL, "there are about four FSK modulations to know of.");
     PrintAndLogEx(NORMAL, "FSK1  -  where fc/8 = high  and fc/5 = low");
@@ -98,7 +103,8 @@ int usage_lf_simfsk(void) {
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
-int usage_lf_simask(void) {
+int usage_lf_simask(void)
+{
     PrintAndLogEx(NORMAL, "Usage: lf simask [c <clock>] [i] [b|m|r] [s] [d <raw hex to sim>]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       h              This help");
@@ -111,7 +117,8 @@ int usage_lf_simask(void) {
     PrintAndLogEx(NORMAL, "       d <hexdata>    Data to sim as hex - omit to sim from DemodBuffer");
     return 0;
 }
-int usage_lf_simpsk(void) {
+int usage_lf_simpsk(void)
+{
     PrintAndLogEx(NORMAL, "Usage: lf simpsk [1|2|3] [c <clock>] [i] [r <carrier>] [d <raw hex to sim>]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       h              This help");
@@ -124,7 +131,8 @@ int usage_lf_simpsk(void) {
     PrintAndLogEx(NORMAL, "       d <hexdata>    Data to sim as hex - omit to sim from DemodBuffer");
     return 0;
 }
-int usage_lf_find(void){
+int usage_lf_find(void)
+{
     PrintAndLogEx(NORMAL, "Usage:  lf search [h] <0|1> [u]");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Options:");
@@ -141,36 +149,37 @@ int usage_lf_find(void){
 
 
 /* send a LF command before reading */
-int CmdLFCommandRead(const char *Cmd) {
+int CmdLFCommandRead(const char *Cmd)
+{
 
-    UsbCommand c = {CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K, {0,0,0}};
+    UsbCommand c = {CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K, {0, 0, 0}};
     bool errors = false;
 
     uint8_t cmdp = 0;
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
-        case 'h':
-            return usage_lf_cmdread();
-        case 'c':
-            param_getstr(Cmd, cmdp+1, (char *)&c.d.asBytes, sizeof(c.d.asBytes));
-            cmdp += 2;
-            break;
-        case 'd':
-            c.arg[0] = param_get32ex(Cmd, cmdp+1, 0, 10);
-            cmdp += 2;
-            break;
-        case 'z':
-            c.arg[1] = param_get32ex(Cmd, cmdp+1, 0, 10) & 0xFFFF;
-            cmdp += 2;
-            break;
-        case 'o':
-            c.arg[2] = param_get32ex(Cmd, cmdp+1, 0, 10) & 0xFFFF;
-            cmdp += 2;
-            break;
-        default:
-            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-            errors = true;
-            break;
+            case 'h':
+                return usage_lf_cmdread();
+            case 'c':
+                param_getstr(Cmd, cmdp + 1, (char *)&c.d.asBytes, sizeof(c.d.asBytes));
+                cmdp += 2;
+                break;
+            case 'd':
+                c.arg[0] = param_get32ex(Cmd, cmdp + 1, 0, 10);
+                cmdp += 2;
+                break;
+            case 'z':
+                c.arg[1] = param_get32ex(Cmd, cmdp + 1, 0, 10) & 0xFFFF;
+                cmdp += 2;
+                break;
+            case 'o':
+                c.arg[2] = param_get32ex(Cmd, cmdp + 1, 0, 10) & 0xFFFF;
+                cmdp += 2;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                errors = true;
+                break;
         }
     }
 
@@ -185,9 +194,10 @@ int CmdLFCommandRead(const char *Cmd) {
     return 0;
 }
 
-int CmdFlexdemod(const char *Cmd) {
+int CmdFlexdemod(const char *Cmd)
+{
 
-    if ( GraphTraceLen < 0 )
+    if (GraphTraceLen < 0)
         return 0;
 
 #ifndef LONG_WAIT
@@ -220,7 +230,7 @@ int CmdFlexdemod(const char *Cmd) {
     }
 
     data[start] = 4;
-    data[start+1] = 0;
+    data[start + 1] = 0;
 
     uint8_t bits[64] = {0x00};
 
@@ -262,7 +272,8 @@ int CmdFlexdemod(const char *Cmd) {
     return 0;
 }
 
-int CmdLFSetConfig(const char *Cmd) {
+int CmdLFSetConfig(const char *Cmd)
+{
     uint8_t divisor =  0;//Frequency divisor
     uint8_t bps = 0; // Bits per sample
     uint8_t decimation = 0; //How many to keep
@@ -274,44 +285,44 @@ int CmdLFSetConfig(const char *Cmd) {
     uint8_t cmdp = 0;
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (param_getchar(Cmd, cmdp)) {
-        case 'h':
-            return usage_lf_config();
-        case 'H':
-            divisor = 88;
-            cmdp++;
-            break;
-        case 'L':
-            divisor = 95;
-            cmdp++;
-            break;
-        case 'q':
-            errors |= param_getdec(Cmd, cmdp+1, &divisor);
-            cmdp+=2;
-            break;
-        case 't':
-            errors |= param_getdec(Cmd, cmdp+1, &unsigned_trigg);
-            cmdp+=2;
-            if(!errors) {
-                trigger_threshold = unsigned_trigg;
-                g_lf_threshold_set = (trigger_threshold > 0);
-            }
-            break;
-        case 'b':
-            errors |= param_getdec(Cmd, cmdp+1, &bps);
-            cmdp+=2;
-            break;
-        case 'd':
-            errors |= param_getdec(Cmd, cmdp+1, &decimation);
-            cmdp+=2;
-            break;
-        case 'a':
-            averaging = param_getchar(Cmd, cmdp+1) == '1';
-            cmdp+=2;
-            break;
-        default:
-            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-            errors = 1;
-            break;
+            case 'h':
+                return usage_lf_config();
+            case 'H':
+                divisor = 88;
+                cmdp++;
+                break;
+            case 'L':
+                divisor = 95;
+                cmdp++;
+                break;
+            case 'q':
+                errors |= param_getdec(Cmd, cmdp + 1, &divisor);
+                cmdp += 2;
+                break;
+            case 't':
+                errors |= param_getdec(Cmd, cmdp + 1, &unsigned_trigg);
+                cmdp += 2;
+                if (!errors) {
+                    trigger_threshold = unsigned_trigg;
+                    g_lf_threshold_set = (trigger_threshold > 0);
+                }
+                break;
+            case 'b':
+                errors |= param_getdec(Cmd, cmdp + 1, &bps);
+                cmdp += 2;
+                break;
+            case 'd':
+                errors |= param_getdec(Cmd, cmdp + 1, &decimation);
+                cmdp += 2;
+                break;
+            case 'a':
+                averaging = param_getchar(Cmd, cmdp + 1) == '1';
+                cmdp += 2;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                errors = 1;
+                break;
         }
     }
 
@@ -323,15 +334,16 @@ int CmdLFSetConfig(const char *Cmd) {
 
     sample_config config = { decimation, bps, averaging, divisor, trigger_threshold };
 
-    UsbCommand c = {CMD_SET_LF_SAMPLING_CONFIG, {0,0,0} };
+    UsbCommand c = {CMD_SET_LF_SAMPLING_CONFIG, {0, 0, 0} };
     memcpy(c.d.asBytes, &config, sizeof(sample_config));
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
 }
 
-bool lf_read(bool silent, uint32_t samples) {
-    if ( IsOffline() ) return false;
+bool lf_read(bool silent, uint32_t samples)
+{
+    if (IsOffline()) return false;
     UsbCommand c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_125K, {silent, samples, 0}};
     clearCommandBuffer();
     SendCommand(&c);
@@ -340,20 +352,21 @@ bool lf_read(bool silent, uint32_t samples) {
     if (g_lf_threshold_set) {
         WaitForResponse(CMD_ACK, &resp);
     } else {
-        if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2500) ) {
+        if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
             PrintAndLogEx(WARNING, "command execution time out");
             return false;
         }
     }
     // resp.arg[0] is bits read not bytes read.
-    getSamples(resp.arg[0]/8, silent);
+    getSamples(resp.arg[0] / 8, silent);
 
     return true;
 }
 
-int CmdLFRead(const char *Cmd) {
+int CmdLFRead(const char *Cmd)
+{
 
-    if ( IsOffline() ) return 0;
+    if (IsOffline()) return 0;
 
     bool errors = false;
     bool silent = false;
@@ -361,20 +374,20 @@ int CmdLFRead(const char *Cmd) {
     uint8_t cmdp = 0;
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
-        case 'h':
-            return usage_lf_read();
-        case 's':
-            silent = true;
-            cmdp++;
-            break;
-        case 'd':
-            samples = param_get32ex(Cmd, cmdp, 0, 10);
-            cmdp +=2;
-            break;
-        default:
-            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-            errors = true;
-            break;
+            case 'h':
+                return usage_lf_read();
+            case 's':
+                silent = true;
+                cmdp++;
+                break;
+            case 'd':
+                samples = param_get32ex(Cmd, cmdp, 0, 10);
+                cmdp += 2;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                errors = true;
+                break;
         }
     }
 
@@ -384,11 +397,12 @@ int CmdLFRead(const char *Cmd) {
     return lf_read(silent, samples);
 }
 
-int CmdLFSnoop(const char *Cmd) {
+int CmdLFSnoop(const char *Cmd)
+{
     uint8_t cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_lf_snoop();
 
-    UsbCommand c = {CMD_LF_SNOOP_RAW_ADC_SAMPLES,{0,0,0}};
+    UsbCommand c = {CMD_LF_SNOOP_RAW_ADC_SAMPLES, {0, 0, 0}};
     clearCommandBuffer();
     SendCommand(&c);
     WaitForResponse(CMD_ACK, NULL);
@@ -396,9 +410,10 @@ int CmdLFSnoop(const char *Cmd) {
     return 0;
 }
 
-static void ChkBitstream(const char *str) {
+static void ChkBitstream(const char *str)
+{
     // convert to bitstream if necessary
-    for (int i = 0; i < (int)(GraphTraceLen / 2); i++){
+    for (int i = 0; i < (int)(GraphTraceLen / 2); i++) {
         if (GraphBuffer[i] > 1 || GraphBuffer[i] < 0) {
             CmdGetBitStream("");
             break;
@@ -407,7 +422,8 @@ static void ChkBitstream(const char *str) {
 }
 //Attempt to simulate any wave in buffer (one bit per output sample)
 // converts GraphBuffer to bitstream (based on zero crossings) if needed.
-int CmdLFSim(const char *Cmd) {
+int CmdLFSim(const char *Cmd)
+{
 #define FPGA_LF 1
 #define FPGA_HF 2
 
@@ -424,12 +440,13 @@ int CmdLFSim(const char *Cmd) {
         UsbCommand c = {CMD_UPLOAD_SIM_SAMPLES_125K, {i, FPGA_LF, 0}};
 
         for (uint16_t j = 0; j < USB_CMD_DATA_SIZE; j++)
-            c.d.asBytes[j] = GraphBuffer[i+j];
+            c.d.asBytes[j] = GraphBuffer[i + j];
 
         clearCommandBuffer();
         SendCommand(&c);
         WaitForResponse(CMD_ACK, NULL);
-        printf("."); fflush(stdout);
+        printf(".");
+        fflush(stdout);
     }
 
     PrintAndLogEx(NORMAL, "Simulating");
@@ -442,7 +459,8 @@ int CmdLFSim(const char *Cmd) {
 
 // by marshmellow - sim fsk data given clock, fcHigh, fcLow, invert
 // - allow pull data from DemodBuffer
-int CmdLFfskSim(const char *Cmd) {
+int CmdLFfskSim(const char *Cmd)
+{
     //might be able to autodetect FCs and clock from Graphbuffer if using demod buffer
     // otherwise will need FChigh, FClow, Clock, and bitstream
     uint8_t fcHigh = 0, fcLow = 0, clk = 0;
@@ -453,19 +471,19 @@ int CmdLFfskSim(const char *Cmd) {
     uint8_t cmdp = 0;
 
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-        switch (param_getchar(Cmd, cmdp)){
+        switch (param_getchar(Cmd, cmdp)) {
             case 'h':
                 return usage_lf_simfsk();
             case 'c':
-                errors |= param_getdec(Cmd, cmdp+1, &clk);
+                errors |= param_getdec(Cmd, cmdp + 1, &clk);
                 cmdp += 2;
                 break;
             case 'H':
-                errors |= param_getdec(Cmd, cmdp+1, &fcHigh);
+                errors |= param_getdec(Cmd, cmdp + 1, &fcHigh);
                 cmdp += 2;
                 break;
             case 'L':
-                errors |= param_getdec(Cmd, cmdp+1, &fcLow);
+                errors |= param_getdec(Cmd, cmdp + 1, &fcLow);
                 cmdp += 2;
                 break;
             case 's':
@@ -473,7 +491,7 @@ int CmdLFfskSim(const char *Cmd) {
                 cmdp++;
                 break;
             case 'd':
-                dataLen = param_getstr(Cmd, cmdp+1, hexData, sizeof(hexData));
+                dataLen = param_getstr(Cmd, cmdp + 1, hexData, sizeof(hexData));
                 if (dataLen == 0)
                     errors = true;
                 else
@@ -497,10 +515,10 @@ int CmdLFfskSim(const char *Cmd) {
     if (errors) return usage_lf_simfsk();
 
     int firstClockEdge = 0;
-    if (dataLen == 0){ //using DemodBuffer
-        if (clk == 0 || fcHigh == 0 || fcLow == 0){ //manual settings must set them all
+    if (dataLen == 0) { //using DemodBuffer
+        if (clk == 0 || fcHigh == 0 || fcLow == 0) { //manual settings must set them all
             uint8_t ans = fskClocks(&fcHigh, &fcLow, &clk, &firstClockEdge);
-            if (ans==0){
+            if (ans == 0) {
                 if (!fcHigh) fcHigh = 10;
                 if (!fcLow) fcLow = 8;
                 if (!clk) clk = 50;
@@ -535,7 +553,8 @@ int CmdLFfskSim(const char *Cmd) {
 
 // by marshmellow - sim ask data given clock, invert, manchester or raw, separator
 // - allow pull data from DemodBuffer
-int CmdLFaskSim(const char *Cmd) {
+int CmdLFaskSim(const char *Cmd)
+{
     // autodetect clock from Graphbuffer if using demod buffer
     // needs clock, invert, manchester/raw as m or r, separator as s, and bitstream
     uint8_t encoding = 1, separator = 0, clk = 0, invert = 0;
@@ -545,15 +564,16 @@ int CmdLFaskSim(const char *Cmd) {
     int dataLen = 0;
     uint8_t cmdp = 0;
 
-    while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
-            case 'h': return usage_lf_simask();
+            case 'h':
+                return usage_lf_simask();
             case 'i':
                 invert = 1;
                 cmdp++;
                 break;
             case 'c':
-                errors |= param_getdec(Cmd, cmdp+1, &clk);
+                errors |= param_getdec(Cmd, cmdp + 1, &clk);
                 cmdp += 2;
                 break;
             case 'b':
@@ -573,7 +593,7 @@ int CmdLFaskSim(const char *Cmd) {
                 cmdp++;
                 break;
             case 'd':
-                dataLen = param_getstr(Cmd, cmdp+1, hexData, sizeof(hexData));
+                dataLen = param_getstr(Cmd, cmdp + 1, hexData, sizeof(hexData));
                 if (dataLen == 0)
                     errors = true;
                 else
@@ -596,7 +616,7 @@ int CmdLFaskSim(const char *Cmd) {
     //Validations
     if (errors) return usage_lf_simask();
 
-    if (dataLen == 0){ //using DemodBuffer
+    if (dataLen == 0) { //using DemodBuffer
         if (clk == 0)
             clk = GetAskClock("0", false);
     } else {
@@ -627,11 +647,12 @@ int CmdLFaskSim(const char *Cmd) {
 
 // by marshmellow - sim psk data given carrier, clock, invert
 // - allow pull data from DemodBuffer or parameters
-int CmdLFpskSim(const char *Cmd) {
+int CmdLFpskSim(const char *Cmd)
+{
     //might be able to autodetect FC and clock from Graphbuffer if using demod buffer
     //will need carrier, Clock, and bitstream
-    uint8_t carrier=0, clk=0;
-    uint8_t invert=0;
+    uint8_t carrier = 0, clk = 0;
+    uint8_t invert = 0;
     bool errors = false;
     char hexData[64] = {0x00}; // store entered hex data
     uint8_t data[255] = {0x00};
@@ -648,11 +669,11 @@ int CmdLFpskSim(const char *Cmd) {
                 cmdp++;
                 break;
             case 'c':
-                errors |= param_getdec(Cmd,cmdp+1,&clk);
-                cmdp +=2;
+                errors |= param_getdec(Cmd, cmdp + 1, &clk);
+                cmdp += 2;
                 break;
             case 'r':
-                errors |= param_getdec(Cmd,cmdp+1,&carrier);
+                errors |= param_getdec(Cmd, cmdp + 1, &carrier);
                 cmdp += 2;
                 break;
             case '1':
@@ -668,7 +689,7 @@ int CmdLFpskSim(const char *Cmd) {
                 cmdp++;
                 break;
             case 'd':
-                dataLen = param_getstr(Cmd, cmdp+1, hexData, sizeof(hexData));
+                dataLen = param_getstr(Cmd, cmdp + 1, hexData, sizeof(hexData));
                 if (dataLen == 0)
                     errors = true;
                 else
@@ -676,13 +697,13 @@ int CmdLFpskSim(const char *Cmd) {
 
                 if (dataLen == 0) errors = true;
                 if (errors) PrintAndLogEx(WARNING, "Error getting hex data");
-                cmdp+=2;
+                cmdp += 2;
                 break;
             default:
                 PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
                 errors = true;
                 break;
-            }
+        }
     }
     // No args
     if (cmdp == 0 && DemodBufferLen == 0)
@@ -691,11 +712,11 @@ int CmdLFpskSim(const char *Cmd) {
     //Validations
     if (errors) return usage_lf_simpsk();
 
-    if (dataLen == 0){ //using DemodBuffer
+    if (dataLen == 0) { //using DemodBuffer
         PrintAndLogEx(NORMAL, "Getting Clocks");
 
-        if (clk==0) clk = GetPskClock("", false);
-        PrintAndLogEx(NORMAL, "clk: %d",clk);
+        if (clk == 0) clk = GetPskClock("", false);
+        PrintAndLogEx(NORMAL, "clk: %d", clk);
 
         if (!carrier) carrier = GetPskCarrier("", false);
         PrintAndLogEx(NORMAL, "carrier: %d", carrier);
@@ -706,11 +727,11 @@ int CmdLFpskSim(const char *Cmd) {
 
     if (clk <= 0) clk = 32;
 
-    if (carrier != 2 && carrier != 4 && carrier != 8 )
+    if (carrier != 2 && carrier != 4 && carrier != 8)
         carrier = 2;
 
-    if (pskType != 1){
-        if (pskType == 2){
+    if (pskType != 1) {
+        if (pskType == 2) {
             //need to convert psk2 to psk1 data before sim
             psk2TOpsk1(DemodBuffer, DemodBufferLen);
         } else {
@@ -733,7 +754,8 @@ int CmdLFpskSim(const char *Cmd) {
     return 0;
 }
 
-int CmdLFSimBidir(const char *Cmd) {
+int CmdLFSimBidir(const char *Cmd)
+{
     // Set ADC to twice the carrier for a slight supersampling
     // HACK: not implemented in ARMSRC.
     PrintAndLogEx(INFO, "Not implemented yet.");
@@ -743,7 +765,8 @@ int CmdLFSimBidir(const char *Cmd) {
 }
 
 // ICEMAN,  todo,   swap from Graphbuffer.
-int CmdVchDemod(const char *Cmd) {
+int CmdVchDemod(const char *Cmd)
+{
     // Is this the entire sync pattern, or does this also include some
     // data bits that happen to be the same everywhere? That would be
     // lovely to know.
@@ -768,7 +791,7 @@ int CmdVchDemod(const char *Cmd) {
 
     for (i = 0; i < (GraphTraceLen - 2048); i++) {
         for (j = 0; j < ARRAYLEN(SyncPattern); j++) {
-            sum += GraphBuffer[i+j] * SyncPattern[j];
+            sum += GraphBuffer[i + j] * SyncPattern[j];
         }
         if (sum > bestCorrel) {
             bestCorrel = sum;
@@ -785,14 +808,14 @@ int CmdVchDemod(const char *Cmd) {
     for (i = 0; i < 2048; i += 8) {
         sum = 0;
         for (j = 0; j < 8; j++)
-            sum += GraphBuffer[bestPos+i+j];
+            sum += GraphBuffer[bestPos + i + j];
 
         if (sum < 0)
-            bits[i/8] = '.';
+            bits[i / 8] = '.';
         else
-            bits[i/8] = '1';
+            bits[i / 8] = '1';
 
-        if(abs(sum) < worst) {
+        if (abs(sum) < worst) {
             worst = abs(sum);
             worstPos = i;
         }
@@ -802,21 +825,22 @@ int CmdVchDemod(const char *Cmd) {
     PrintAndLogEx(NORMAL, "worst metric: %d at pos %d", worst, worstPos);
 
     // clone
-    if (strcmp(Cmd, "clone")==0) {
+    if (strcmp(Cmd, "clone") == 0) {
         GraphTraceLen = 0;
         char *s;
-            for(s = bits; *s; s++) {
-                for(j = 0; j < 16; j++) {
-                    GraphBuffer[GraphTraceLen++] = (*s == '1') ? 1 : 0;
-                }
+        for (s = bits; *s; s++) {
+            for (j = 0; j < 16; j++) {
+                GraphBuffer[GraphTraceLen++] = (*s == '1') ? 1 : 0;
             }
+        }
         RepaintGraphWindow();
     }
     return 0;
 }
 
 //by marshmellow
-bool CheckChipType(bool getDeviceData) {
+bool CheckChipType(bool getDeviceData)
+{
 
     bool retval = false;
 
@@ -849,7 +873,8 @@ out:
 }
 
 //by marshmellow
-int CmdLFfind(const char *Cmd) {
+int CmdLFfind(const char *Cmd)
+{
     int ans = 0;
     size_t minLength = 2000;
     char cmdp = tolower(param_getchar(Cmd, 0));
@@ -859,7 +884,7 @@ int CmdLFfind(const char *Cmd) {
 
     if (cmdp == 'u') testRaw = 'u';
 
-    bool isOnline = (!IsOffline() && (cmdp != '1') );
+    bool isOnline = (!IsOffline() && (cmdp != '1'));
 
     if (isOnline)
         lf_read(true, 30000);
@@ -918,33 +943,34 @@ int CmdLFfind(const char *Cmd) {
 
     PrintAndLogEx(FAILED, "\nNo known 125/134 KHz tags Found!\n");
 
-    if (testRaw == 'u'){
+    if (testRaw == 'u') {
         //test unknown tag formats (raw mode)
         PrintAndLogEx(INFO, "\nChecking for Unknown tags:\n");
         ans = AutoCorrelate(GraphBuffer, GraphBuffer, GraphTraceLen, 4000, false, false);
         if (ans > 0) {
 
-            PrintAndLogEx(INFO, "Possible Auto Correlation of %d repeating samples",ans);
+            PrintAndLogEx(INFO, "Possible Auto Correlation of %d repeating samples", ans);
 
-            if ( ans % 8 == 0)
+            if (ans % 8 == 0)
                 PrintAndLogEx(INFO, "Possible %d bytes", (ans / 8));
         }
 
-         //fsk
-        if ( GetFskClock("", false) ) {
-            if ( FSKrawDemod("", true) ) {
-                PrintAndLogEx(NORMAL, "\nUnknown FSK Modulated Tag Found!"); goto out;
+        //fsk
+        if (GetFskClock("", false)) {
+            if (FSKrawDemod("", true)) {
+                PrintAndLogEx(NORMAL, "\nUnknown FSK Modulated Tag Found!");
+                goto out;
             }
         }
 
         bool st = true;
-        if ( ASKDemod_ext("0 0 0", true, false, 1, &st) ) {
-          PrintAndLogEx(NORMAL, "\nUnknown ASK Modulated and Manchester encoded Tag Found!");
-          PrintAndLogEx(NORMAL, "\nif it does not look right it could instead be ASK/Biphase - try 'data rawdemod ab'");
-          goto out;
+        if (ASKDemod_ext("0 0 0", true, false, 1, &st)) {
+            PrintAndLogEx(NORMAL, "\nUnknown ASK Modulated and Manchester encoded Tag Found!");
+            PrintAndLogEx(NORMAL, "\nif it does not look right it could instead be ASK/Biphase - try 'data rawdemod ab'");
+            goto out;
         }
 
-        if ( CmdPSK1rawDemod("") ) {
+        if (CmdPSK1rawDemod("")) {
             PrintAndLogEx(NORMAL, "Possible unknown PSK1 Modulated Tag Found above!\n\nCould also be PSK2 - try 'data rawdemod p2'");
             PrintAndLogEx(NORMAL, "\nCould also be PSK3 - [currently not supported]");
             PrintAndLogEx(NORMAL, "\nCould also be NRZ - try 'data nrzrawdemod");
@@ -1000,13 +1026,15 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLF(const char *Cmd) {
+int CmdLF(const char *Cmd)
+{
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
+int CmdHelp(const char *Cmd)
+{
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c
index aa30b7797..26c65987a 100644
--- a/client/cmdlfawid.c
+++ b/client/cmdlfawid.c
@@ -14,7 +14,8 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_lf_awid_read(void) {
+int usage_lf_awid_read(void)
+{
     PrintAndLogEx(NORMAL, "Enables AWID compatible reader mode printing details of scanned AWID26 or AWID50 tags.");
     PrintAndLogEx(NORMAL, "By default, values are printed and logged until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "If the [1] option is provided, reader mode is exited after reading a single AWID card.");
@@ -30,7 +31,8 @@ int usage_lf_awid_read(void) {
     return 0;
 }
 
-int usage_lf_awid_sim(void) {
+int usage_lf_awid_sim(void)
+{
     PrintAndLogEx(NORMAL, "Enables simulation of AWID card with specified facility-code and card number.");
     PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "");
@@ -47,7 +49,8 @@ int usage_lf_awid_sim(void) {
     return 0;
 }
 
-int usage_lf_awid_clone(void) {
+int usage_lf_awid_clone(void)
+{
     PrintAndLogEx(NORMAL, "Enables cloning of AWID card with specified facility-code and card number onto T55x7.");
     PrintAndLogEx(NORMAL, "The T55x7 must be on the antenna when issuing this command.  T55x7 blocks are calculated and printed in the process.");
     PrintAndLogEx(NORMAL, "");
@@ -65,7 +68,8 @@ int usage_lf_awid_clone(void) {
     return 0;
 }
 
-int usage_lf_awid_brute(void){
+int usage_lf_awid_brute(void)
+{
     PrintAndLogEx(NORMAL, "Enables bruteforce of AWID reader with specified facility-code.");
     PrintAndLogEx(NORMAL, "This is a attack against reader. if cardnumber is given, it starts with it and goes up / down one step");
     PrintAndLogEx(NORMAL, "if cardnumber is not given, it starts with 1 and goes up to 65535");
@@ -86,7 +90,8 @@ int usage_lf_awid_brute(void){
     return 0;
 }
 
-static bool sendPing(void){
+static bool sendPing(void)
+{
     UsbCommand ping = {CMD_PING, {1, 2, 3}};
     SendCommand(&ping);
     SendCommand(&ping);
@@ -98,12 +103,13 @@ static bool sendPing(void){
     return true;
 }
 
-static bool sendTry(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint32_t delay, uint8_t *bits, size_t bs_len, bool verbose){
+static bool sendTry(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint32_t delay, uint8_t *bits, size_t bs_len, bool verbose)
+{
 
-    if ( verbose )
+    if (verbose)
         PrintAndLogEx(INFO, "Trying FC: %u; CN: %u", fc, cn);
 
-    if ( !getAWIDBits(fmtlen, fc, cn, bits)) {
+    if (!getAWIDBits(fmtlen, fc, cn, bits)) {
         PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
         return false;
     }
@@ -123,7 +129,8 @@ static bool sendTry(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint32_t delay, ui
 }
 
 //refactored by marshmellow
-int getAWIDBits(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint8_t *bits) {
+int getAWIDBits(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint8_t *bits)
+{
 
     // the return bits, preamble 0000 0001
     bits[7] = 1;
@@ -136,38 +143,38 @@ int getAWIDBits(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint8_t *bits) {
 
     // add facilitycode, cardnumber and wiegand parity bits
     switch (fmtlen) {
-        case 26:{
+        case 26: {
             uint8_t wiegand[24];
             num_to_bytebits(fc, 8, wiegand);
-            num_to_bytebits(cn, 16, wiegand+8);
-            wiegand_add_parity(pre+8, wiegand,  sizeof(wiegand));
+            num_to_bytebits(cn, 16, wiegand + 8);
+            wiegand_add_parity(pre + 8, wiegand,  sizeof(wiegand));
             break;
         }
-        case 34:{
+        case 34: {
             uint8_t wiegand[32];
             num_to_bytebits(fc, 8, wiegand);
-            num_to_bytebits(cn, 24, wiegand+8);
-            wiegand_add_parity(pre+8, wiegand,  sizeof(wiegand));
+            num_to_bytebits(cn, 24, wiegand + 8);
+            wiegand_add_parity(pre + 8, wiegand,  sizeof(wiegand));
             break;
         }
-        case 37:{
+        case 37: {
             uint8_t wiegand[31];
             num_to_bytebits(fc, 13, wiegand);
-            num_to_bytebits(cn, 18, wiegand+13);
-            wiegand_add_parity(pre+8, wiegand,  sizeof(wiegand));
+            num_to_bytebits(cn, 18, wiegand + 13);
+            wiegand_add_parity(pre + 8, wiegand,  sizeof(wiegand));
             break;
         }
         case 50: {
             uint8_t wiegand[48];
             num_to_bytebits(fc, 16, wiegand);
-            num_to_bytebits(cn, 32, wiegand+16);
-            wiegand_add_parity(pre+8, wiegand, sizeof(wiegand));
+            num_to_bytebits(cn, 32, wiegand + 16);
+            wiegand_add_parity(pre + 8, wiegand, sizeof(wiegand));
             break;
         }
     }
 
     // add AWID 4bit parity
-    size_t bitLen = addParity(pre, bits+8, 66, 4, 1);
+    size_t bitLen = addParity(pre, bits + 8, 66, 4, 1);
 
     if (bitLen != 88) return 0;
 
@@ -176,7 +183,8 @@ int getAWIDBits(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint8_t *bits) {
     return 1;
 }
 
-static void verify_values(uint8_t *fmtlen, uint32_t *fc, uint32_t *cn){
+static void verify_values(uint8_t *fmtlen, uint32_t *fc, uint32_t *cn)
+{
     switch (*fmtlen) {
         case 50:
             if ((*fc & 0xFFFF) != *fc) {
@@ -220,13 +228,15 @@ static void verify_values(uint8_t *fmtlen, uint32_t *fc, uint32_t *cn){
 }
 
 // this read is the "normal" read,  which download lf signal and tries to demod here.
-int CmdAWIDRead(const char *Cmd) {
+int CmdAWIDRead(const char *Cmd)
+{
     lf_read(true, 12000);
     return CmdAWIDDemod(Cmd);
 }
 // this read loops on device side.
 // uses the demod in lfops.c
-int CmdAWIDRead_device(const char *Cmd) {
+int CmdAWIDRead_device(const char *Cmd)
+{
 
     if (Cmd[0] == 'h' || Cmd[0] == 'H') return usage_lf_awid_read();
     uint8_t findone = (Cmd[0] == '1') ? 1 : 0;
@@ -239,8 +249,9 @@ int CmdAWIDRead_device(const char *Cmd) {
 //by marshmellow
 //AWID Prox demod - FSK2a RF/50 with preamble of 00000001  (always a 96 bit data stream)
 //print full AWID Prox ID and some bit format details if found
-int CmdAWIDDemod(const char *Cmd) {
-    uint8_t bits[MAX_GRAPH_TRACE_LEN]={0};
+int CmdAWIDDemod(const char *Cmd)
+{
+    uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
     size_t size = getFromGraphBuf(bits);
     if (size == 0) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - AWID not enough samples");
@@ -249,7 +260,7 @@ int CmdAWIDDemod(const char *Cmd) {
     //get binary from fsk wave
     int waveIdx = 0;
     int idx = detectAWID(bits, &size, &waveIdx);
-    if (idx <= 0){
+    if (idx <= 0) {
 
         if (idx == -1)
             PrintAndLogEx(DEBUG, "DEBUG: Error - AWID not enough samples");
@@ -262,13 +273,13 @@ int CmdAWIDDemod(const char *Cmd) {
         else if (idx == -5)
             PrintAndLogEx(DEBUG, "DEBUG: Error - AWID size not correct, size %d", size);
         else
-            PrintAndLogEx(DEBUG, "DEBUG: Error - AWID error demoding fsk %d",idx);
+            PrintAndLogEx(DEBUG, "DEBUG: Error - AWID error demoding fsk %d", idx);
 
         return 0;
     }
 
     setDemodBuf(bits, size, idx);
-    setClockGrid(50, waveIdx + (idx*50));
+    setClockGrid(50, waveIdx + (idx * 50));
 
 
     // Index map
@@ -289,7 +300,7 @@ int CmdAWIDDemod(const char *Cmd) {
     uint32_t rawHi = bytebits_to_byte(bits + idx + 32, 32);
     uint32_t rawHi2 = bytebits_to_byte(bits + idx, 32);
 
-    size = removeParity(bits, idx+8, 4, 1, 88);
+    size = removeParity(bits, idx + 8, 4, 1, 88);
     if (size != 66) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - AWID at parity check-tag size does not match AWID format");
         return 0;
@@ -318,25 +329,25 @@ int CmdAWIDDemod(const char *Cmd) {
     uint32_t code2 = 0;
     uint8_t fmtLen = bytebits_to_byte(bits, 8);
 
-    switch(fmtLen) {
+    switch (fmtLen) {
         case 26:
             fc = bytebits_to_byte(bits + 9, 8);
             cardnum = bytebits_to_byte(bits + 17, 16);
-            code1 = bytebits_to_byte(bits + 8,fmtLen);
+            code1 = bytebits_to_byte(bits + 8, fmtLen);
             PrintAndLogEx(SUCCESS, "AWID Found - BitLength: %d, FC: %d, Card: %u - Wiegand: %x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, rawHi2, rawHi, rawLo);
             break;
         case 34:
             fc = bytebits_to_byte(bits + 9, 8);
             cardnum = bytebits_to_byte(bits + 17, 24);
-            code1 = bytebits_to_byte(bits + 8, (fmtLen-32) );
-            code2 = bytebits_to_byte(bits + 8 + (fmtLen-32), 32);
+            code1 = bytebits_to_byte(bits + 8, (fmtLen - 32));
+            code2 = bytebits_to_byte(bits + 8 + (fmtLen - 32), 32);
             PrintAndLogEx(SUCCESS, "AWID Found - BitLength: %d, FC: %d, Card: %u - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, code2, rawHi2, rawHi, rawLo);
             break;
         case 37:
             fc = bytebits_to_byte(bits + 9, 13);
             cardnum = bytebits_to_byte(bits + 22, 18);
-            code1 = bytebits_to_byte(bits + 8, (fmtLen-32) );
-            code2 = bytebits_to_byte(bits + 8 + (fmtLen-32), 32);
+            code1 = bytebits_to_byte(bits + 8, (fmtLen - 32));
+            code2 = bytebits_to_byte(bits + 8 + (fmtLen - 32), 32);
             PrintAndLogEx(SUCCESS, "AWID Found - BitLength: %d, FC: %d, Card: %u - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, code2, rawHi2, rawHi, rawLo);
             break;
         // case 40:
@@ -344,18 +355,18 @@ int CmdAWIDDemod(const char *Cmd) {
         case 50:
             fc = bytebits_to_byte(bits + 9, 16);
             cardnum = bytebits_to_byte(bits + 25, 32);
-            code1 = bytebits_to_byte(bits + 8, (fmtLen-32) );
-            code2 = bytebits_to_byte(bits + 8 + (fmtLen-32), 32);
+            code1 = bytebits_to_byte(bits + 8, (fmtLen - 32));
+            code2 = bytebits_to_byte(bits + 8 + (fmtLen - 32), 32);
             PrintAndLogEx(SUCCESS, "AWID Found - BitLength: %d, FC: %d, Card: %u - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, code2, rawHi2, rawHi, rawLo);
             break;
         default:
-            if (fmtLen > 32 ) {
-                cardnum = bytebits_to_byte(bits + 8 + (fmtLen-17), 16);
-                code1 = bytebits_to_byte(bits + 8, fmtLen-32);
-                code2 = bytebits_to_byte(bits + 8 + (fmtLen-32), 32);
+            if (fmtLen > 32) {
+                cardnum = bytebits_to_byte(bits + 8 + (fmtLen - 17), 16);
+                code1 = bytebits_to_byte(bits + 8, fmtLen - 32);
+                code2 = bytebits_to_byte(bits + 8 + (fmtLen - 32), 32);
                 PrintAndLogEx(SUCCESS, "AWID Found - BitLength: %d -unknown BitLength- (%u) - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, cardnum, code1, code2, rawHi2, rawHi, rawLo);
             } else {
-                cardnum = bytebits_to_byte(bits + 8 + (fmtLen-17), 16);
+                cardnum = bytebits_to_byte(bits + 8 + (fmtLen - 17), 16);
                 code1 = bytebits_to_byte(bits + 8, fmtLen);
                 PrintAndLogEx(SUCCESS, "AWID Found - BitLength: %d -unknown BitLength- (%u) - Wiegand: %x, Raw: %08x%08x%08x", fmtLen, cardnum, code1, rawHi2, rawHi, rawLo);
             }
@@ -369,7 +380,8 @@ int CmdAWIDDemod(const char *Cmd) {
     return 1;
 }
 
-int CmdAWIDSim(const char *Cmd) {
+int CmdAWIDSim(const char *Cmd)
+{
     uint32_t fc = 0, cn = 0;
     uint8_t fmtlen = 0;
     uint8_t bits[96];
@@ -382,7 +394,7 @@ int CmdAWIDSim(const char *Cmd) {
     fmtlen = param_get8(Cmd, 0);
     fc = param_get32ex(Cmd, 1, 0, 10);
     cn = param_get32ex(Cmd, 2, 0, 10);
-    if ( !fc || !cn) return usage_lf_awid_sim();
+    if (!fc || !cn) return usage_lf_awid_sim();
 
     verify_values(&fmtlen, &fc, &cn);
 
@@ -409,13 +421,14 @@ int CmdAWIDSim(const char *Cmd) {
     return 0;
 }
 
-int CmdAWIDClone(const char *Cmd) {
-    uint32_t blocks[4] = {T55x7_MODULATION_FSK2a | T55x7_BITRATE_RF_50 | 3<<T55x7_MAXBLOCK_SHIFT, 0, 0, 0};
+int CmdAWIDClone(const char *Cmd)
+{
+    uint32_t blocks[4] = {T55x7_MODULATION_FSK2a | T55x7_BITRATE_RF_50 | 3 << T55x7_MAXBLOCK_SHIFT, 0, 0, 0};
     uint32_t fc = 0, cn = 0;
     uint8_t fmtlen = 0;
     uint8_t bits[96];
-    uint8_t *bs=bits;
-    memset(bs,0,sizeof(bits));
+    uint8_t *bs = bits;
+    memset(bs, 0, sizeof(bits));
 
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_awid_clone();
@@ -424,15 +437,15 @@ int CmdAWIDClone(const char *Cmd) {
     fc = param_get32ex(Cmd, 1, 0, 10);
     cn = param_get32ex(Cmd, 2, 0, 10);
 
-    if ( !fc || !cn) return usage_lf_awid_clone();
+    if (!fc || !cn) return usage_lf_awid_clone();
 
     if (tolower(param_getchar(Cmd, 3)) == 'q')
         //t5555 (Q5) BITRATE = (RF-2)/2 (iceman)
-        blocks[0] = T5555_MODULATION_FSK2 | T5555_INVERT_OUTPUT | T5555_SET_BITRATE(50) | 3<<T5555_MAXBLOCK_SHIFT;
+        blocks[0] = T5555_MODULATION_FSK2 | T5555_INVERT_OUTPUT | T5555_SET_BITRATE(50) | 3 << T5555_MAXBLOCK_SHIFT;
 
     verify_values(&fmtlen, &fc, &cn);
 
-    if ( !getAWIDBits(fmtlen, fc, cn, bs)) {
+    if (!getAWIDBits(fmtlen, fc, cn, bs)) {
         PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
         return 1;
     }
@@ -445,14 +458,14 @@ int CmdAWIDClone(const char *Cmd) {
     print_blocks(blocks, 4);
 
     UsbCommand resp;
-    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
+    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}};
 
-    for (uint8_t i=0; i<4; i++) {
+    for (uint8_t i = 0; i < 4; i++) {
         c.arg[0] = blocks[i];
         c.arg[1] = i;
         clearCommandBuffer();
         SendCommand(&c);
-        if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)){
+        if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
             return -1;
         }
@@ -460,7 +473,8 @@ int CmdAWIDClone(const char *Cmd) {
     return 0;
 }
 
-int CmdAWIDBrute(const char *Cmd) {
+int CmdAWIDBrute(const char *Cmd)
+{
 
     bool errors = false, verbose = false;
     uint32_t fc = 0, cn = 0, delay = 1000;
@@ -471,45 +485,45 @@ int CmdAWIDBrute(const char *Cmd) {
     uint8_t cmdp = 0;
 
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-        switch ( tolower(param_getchar(Cmd, cmdp))) {
-        case 'h':
-            return usage_lf_awid_brute();
-        case 'f':
-            fc =  param_get32ex(Cmd ,cmdp+1, 0, 10);
-            if ( !fc )
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+            case 'h':
+                return usage_lf_awid_brute();
+            case 'f':
+                fc =  param_get32ex(Cmd, cmdp + 1, 0, 10);
+                if (!fc)
+                    errors = true;
+                cmdp += 2;
+                break;
+            case 'd':
+                // delay between attemps,  defaults to 1000ms.
+                delay = param_get32ex(Cmd, cmdp + 1, 1000, 10);
+                cmdp += 2;
+                break;
+            case 'c':
+                cn = param_get32ex(Cmd, cmdp + 1, 0, 10);
+                // truncate cardnumber.
+                cn &= 0xFFFF;
+                cmdp += 2;
+                break;
+            case 'a':
+                fmtlen = param_get8(Cmd, cmdp + 1);
+                cmdp += 2;
+                break;
+            case 'v':
+                verbose = true;
+                cmdp++;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
                 errors = true;
-            cmdp += 2;
-            break;
-        case 'd':
-            // delay between attemps,  defaults to 1000ms.
-            delay = param_get32ex(Cmd, cmdp+1, 1000, 10);
-            cmdp += 2;
-            break;
-        case 'c':
-            cn = param_get32ex(Cmd, cmdp+1, 0, 10);
-            // truncate cardnumber.
-            cn &= 0xFFFF;
-            cmdp += 2;
-            break;
-        case 'a':
-            fmtlen = param_get8(Cmd, cmdp+1);
-            cmdp += 2;
-            break;
-        case 'v':
-            verbose = true;
-            cmdp++;
-            break;
-        default:
-            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-            errors = true;
-            break;
+                break;
         }
     }
-    if ( fc == 0 ) errors = true;
-    if ( errors ) return usage_lf_awid_brute();
+    if (fc == 0) errors = true;
+    if (errors) return usage_lf_awid_brute();
 
     // limit fc according to selected format
-    switch(fmtlen) {
+    switch (fmtlen) {
         case 50:
             if ((fc & 0xFFFF) != fc) {
                 fc &= 0xFFFF;
@@ -531,26 +545,27 @@ int CmdAWIDBrute(const char *Cmd) {
     uint16_t down = cn;
 
     // main loop
-    for (;;){
+    for (;;) {
 
-        if ( IsOffline() ) {
+        if (IsOffline()) {
             PrintAndLogEx(WARNING, "Device offline\n");
             return  2;
         }
         if (ukbhit()) {
-            int gc = getchar(); (void)gc;
+            int gc = getchar();
+            (void)gc;
             PrintAndLogEx(INFO, "aborted via keyboard!");
             return sendPing();
         }
 
         // Do one up
-        if ( up < 0xFFFF )
-            if ( !sendTry(fmtlen, fc, up++, delay, bits, size, verbose)) return 1;
+        if (up < 0xFFFF)
+            if (!sendTry(fmtlen, fc, up++, delay, bits, size, verbose)) return 1;
 
         // Do one down  (if cardnumber is given)
-        if ( cn > 1 )
-            if ( down > 1 )
-                if ( !sendTry(fmtlen, fc, --down, delay, bits, size, verbose)) return 1;
+        if (cn > 1)
+            if (down > 1)
+                if (!sendTry(fmtlen, fc, --down, delay, bits, size, verbose)) return 1;
     }
     return 0;
 }
@@ -565,13 +580,15 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFAWID(const char *Cmd) {
+int CmdLFAWID(const char *Cmd)
+{
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
+int CmdHelp(const char *Cmd)
+{
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfcotag.c b/client/cmdlfcotag.c
index 1e9adb401..7894784af 100644
--- a/client/cmdlfcotag.c
+++ b/client/cmdlfcotag.c
@@ -11,7 +11,8 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_lf_cotag_read(void){
+int usage_lf_cotag_read(void)
+{
     PrintAndLogEx(NORMAL, "Usage: lf COTAG read [h] <signaldata>");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "      h          : This help");
@@ -27,7 +28,8 @@ int usage_lf_cotag_read(void){
 
 // COTAG demod should be able to use GraphBuffer,
 // when data load samples
-int CmdCOTAGDemod(const char *Cmd) {
+int CmdCOTAGDemod(const char *Cmd)
+{
 
     uint8_t bits[COTAG_BITS] = {0};
     size_t bitlen = COTAG_BITS;
@@ -35,7 +37,7 @@ int CmdCOTAGDemod(const char *Cmd) {
 
     uint8_t alignPos = 0;
     int err = manrawdecode(bits, &bitlen, 1, &alignPos);
-    if (err){
+    if (err) {
         if (g_debugMode) PrintAndLogEx(DEBUG, "DEBUG: Error - COTAG too many errors: %d", err);
         return -1;
     }
@@ -43,13 +45,13 @@ int CmdCOTAGDemod(const char *Cmd) {
     setDemodBuf(bits, bitlen, 0);
 
     //got a good demod
-    uint16_t cn = bytebits_to_byteLSBF(bits+1, 16);
-    uint32_t fc = bytebits_to_byteLSBF(bits+1+16, 8);
+    uint16_t cn = bytebits_to_byteLSBF(bits + 1, 16);
+    uint32_t fc = bytebits_to_byteLSBF(bits + 1 + 16, 8);
 
     uint32_t raw1 = bytebits_to_byteLSBF(bits, 32);
-    uint32_t raw2 = bytebits_to_byteLSBF(bits+32, 32);
-    uint32_t raw3 = bytebits_to_byteLSBF(bits+64, 32);
-    uint32_t raw4 = bytebits_to_byteLSBF(bits+96, 32);
+    uint32_t raw2 = bytebits_to_byteLSBF(bits + 32, 32);
+    uint32_t raw3 = bytebits_to_byteLSBF(bits + 64, 32);
+    uint32_t raw4 = bytebits_to_byteLSBF(bits + 96, 32);
 
     /*
     fc 161:   1010 0001 -> LSB 1000 0101
@@ -58,7 +60,7 @@ int CmdCOTAGDemod(const char *Cmd) {
       0 1001 1100 1100 0001 1000 0101 0000 0000 100001010000000001111011100000011010000010000000000000000000000000000000000000000000000000000000100111001100000110000101000
         1001 1100 1100 0001                     10000101
     */
-    PrintAndLogEx(SUCCESS, "COTAG Found: FC %u, CN: %u Raw: %08X%08X%08X%08X", fc, cn, raw1 ,raw2, raw3, raw4);
+    PrintAndLogEx(SUCCESS, "COTAG Found: FC %u, CN: %u Raw: %08X%08X%08X%08X", fc, cn, raw1, raw2, raw3, raw4);
     return 1;
 }
 
@@ -66,7 +68,8 @@ int CmdCOTAGDemod(const char *Cmd) {
 // 0 = HIGH/LOW signal - maxlength bigbuff
 // 1 = translation for HI/LO into bytes with manchester 0,1 - length 300
 // 2 = raw signal -  maxlength bigbuff
-int CmdCOTAGRead(const char *Cmd) {
+int CmdCOTAGRead(const char *Cmd)
+{
 
     if (Cmd[0] == 'h' || Cmd[0] == 'H') return usage_lf_cotag_read();
 
@@ -76,12 +79,12 @@ int CmdCOTAGRead(const char *Cmd) {
     UsbCommand c = {CMD_COTAG, {rawsignal, 0, 0}};
     clearCommandBuffer();
     SendCommand(&c);
-    if ( !WaitForResponseTimeout(CMD_ACK, NULL, 7000) ) {
+    if (!WaitForResponseTimeout(CMD_ACK, NULL, 7000)) {
         PrintAndLogEx(WARNING, "command execution time out");
         return -1;
     }
 
-    switch ( rawsignal ){
+    switch (rawsignal) {
         case 0:
         case 2: {
             CmdPlot("");
@@ -91,7 +94,7 @@ int CmdCOTAGRead(const char *Cmd) {
         }
         case 1: {
 
-            if ( !GetFromDevice(BIG_BUF, DemodBuffer, COTAG_BITS, 0, NULL, 1000, false)) {
+            if (!GetFromDevice(BIG_BUF, DemodBuffer, COTAG_BITS, 0, NULL, 1000, false)) {
                 PrintAndLogEx(WARNING, "timeout while waiting for reply.");
                 return -1;
             }
@@ -109,13 +112,15 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFCOTAG(const char *Cmd) {
+int CmdLFCOTAG(const char *Cmd)
+{
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
+int CmdHelp(const char *Cmd)
+{
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 99bf440bf..011299b68 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -15,7 +15,8 @@ uint64_t g_em410xid = 0;
 static int CmdHelp(const char *Cmd);
 
 //////////////// 410x commands
-int usage_lf_em410x_demod(void){
+int usage_lf_em410x_demod(void)
+{
     PrintAndLogEx(NORMAL, "Usage:  lf em 410x_demod [h] [clock] <0|1> [maxError]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "     h                   - this help");
@@ -31,7 +32,8 @@ int usage_lf_em410x_demod(void){
     PrintAndLogEx(NORMAL, "           lf em 410x_demod 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;
 }
-int usage_lf_em410x_write(void) {
+int usage_lf_em410x_write(void)
+{
     PrintAndLogEx(NORMAL, "Writes EM410x ID to a T55x7 / T5555 (Q5) tag");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  lf em 410x_write [h] <id> <card> [clock]");
@@ -44,7 +46,8 @@ int usage_lf_em410x_write(void) {
     PrintAndLogEx(NORMAL, "      lf em 410x_write 0F0368568B 1       = write ID to t55x7 card");
     return 0;
 }
-int usage_lf_em410x_ws(void) {
+int usage_lf_em410x_ws(void)
+{
     PrintAndLogEx(NORMAL, "Watch 'nd Spoof, activates reader, waits until a EM410x tag gets presented then it starts simulating the found UID");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  lf em 410x_spoof [h]");
@@ -54,7 +57,8 @@ int usage_lf_em410x_ws(void) {
     PrintAndLogEx(NORMAL, "      lf em 410x_spoof");
     return 0;
 }
-int usage_lf_em410x_clone(void) {
+int usage_lf_em410x_clone(void)
+{
     PrintAndLogEx(NORMAL, "Simulating EM410x tag");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  lf em 410x_clone [h] <uid> <clock>");
@@ -67,7 +71,8 @@ int usage_lf_em410x_clone(void) {
     PrintAndLogEx(NORMAL, "      lf em 410x_clone 0F0368568B 32");
     return 0;
 }
-int usage_lf_em410x_sim(void) {
+int usage_lf_em410x_sim(void)
+{
     PrintAndLogEx(NORMAL, "Simulating EM410x tag");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  lf em 410x_sim [h] <uid> <clock>");
@@ -80,7 +85,8 @@ int usage_lf_em410x_sim(void) {
     PrintAndLogEx(NORMAL, "      lf em 410x_sim 0F0368568B 32");
     return 0;
 }
-int usage_lf_em410x_brute(void) {
+int usage_lf_em410x_brute(void)
+{
     PrintAndLogEx(NORMAL, "Bruteforcing by emulating EM410x tag");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  lf em 410x_brute [h] ids.txt [d 2000] [c clock]");
@@ -98,7 +104,8 @@ int usage_lf_em410x_brute(void) {
 }
 
 //////////////// 4050 / 4450 commands
-int usage_lf_em4x50_dump(void) {
+int usage_lf_em4x50_dump(void)
+{
     PrintAndLogEx(NORMAL, "Dump EM4x50/EM4x69.  Tag must be on antenna. ");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  lf em 4x50_dump [h] <pwd>");
@@ -110,7 +117,8 @@ int usage_lf_em4x50_dump(void) {
     PrintAndLogEx(NORMAL, "      lf em 4x50_dump 11223344");
     return 0;
 }
-int usage_lf_em4x50_read(void) {
+int usage_lf_em4x50_read(void)
+{
     PrintAndLogEx(NORMAL, "Read EM 4x50/EM4x69.  Tag must be on antenna. ");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  lf em 4x50_read [h] <address> <pwd>");
@@ -123,7 +131,8 @@ int usage_lf_em4x50_read(void) {
     PrintAndLogEx(NORMAL, "      lf em 4x50_read 1 11223344");
     return 0;
 }
-int usage_lf_em4x50_write(void) {
+int usage_lf_em4x50_write(void)
+{
     PrintAndLogEx(NORMAL, "Write EM 4x50/4x69.  Tag must be on antenna. ");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  lf em 4x50_write [h] <address> <data> <pwd>");
@@ -139,7 +148,8 @@ int usage_lf_em4x50_write(void) {
 }
 
 //////////////// 4205 / 4305 commands
-int usage_lf_em4x05_dump(void) {
+int usage_lf_em4x05_dump(void)
+{
     PrintAndLogEx(NORMAL, "Dump EM4x05/EM4x69.  Tag must be on antenna. ");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  lf em 4x05_dump [h] <pwd>");
@@ -151,7 +161,8 @@ int usage_lf_em4x05_dump(void) {
     PrintAndLogEx(NORMAL, "      lf em 4x05_dump 11223344");
     return 0;
 }
-int usage_lf_em4x05_read(void) {
+int usage_lf_em4x05_read(void)
+{
     PrintAndLogEx(NORMAL, "Read EM4x05/EM4x69.  Tag must be on antenna. ");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  lf em 4x05_read [h] <address> <pwd>");
@@ -164,7 +175,8 @@ int usage_lf_em4x05_read(void) {
     PrintAndLogEx(NORMAL, "      lf em 4x05_read 1 11223344");
     return 0;
 }
-int usage_lf_em4x05_write(void) {
+int usage_lf_em4x05_write(void)
+{
     PrintAndLogEx(NORMAL, "Write EM4x05/4x69.  Tag must be on antenna. ");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  lf em 4x05_write [h] <address> <data> <pwd>");
@@ -178,7 +190,8 @@ int usage_lf_em4x05_write(void) {
     PrintAndLogEx(NORMAL, "      lf em 4x05_write 1 deadc0de 11223344");
     return 0;
 }
-int usage_lf_em4x05_info(void) {
+int usage_lf_em4x05_info(void)
+{
     PrintAndLogEx(NORMAL, "Tag information EM4205/4305/4469//4569 tags.  Tag must be on antenna.");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  lf em 4x05_info [h] <pwd>");
@@ -201,7 +214,8 @@ int usage_lf_em4x05_info(void) {
  */
 
 // Construct the graph for emulating an EM410X tag
-void ConstructEM410xEmulGraph(const char *uid,const  uint8_t clock) {
+void ConstructEM410xEmulGraph(const char *uid, const  uint8_t clock)
+{
 
     int i, j, binary[4], parity[4];
     uint32_t n;
@@ -214,10 +228,10 @@ void ConstructEM410xEmulGraph(const char *uid,const  uint8_t clock) {
 
     /* for each hex char */
     parity[0] = parity[1] = parity[2] = parity[3] = 0;
-    for (i = 0; i < 10; i++){
+    for (i = 0; i < 10; i++) {
         /* read each hex char */
         sscanf(&uid[i], "%1x", &n);
-        for (j = 3; j >= 0; j--, n/= 2)
+        for (j = 3; j >= 0; j--, n /= 2)
             binary[j] = n % 2;
 
         /* append each bit */
@@ -248,23 +262,24 @@ void ConstructEM410xEmulGraph(const char *uid,const  uint8_t clock) {
 
 //by marshmellow
 //print 64 bit EM410x ID in multiple formats
-void printEM410x(uint32_t hi, uint64_t id) {
+void printEM410x(uint32_t hi, uint64_t id)
+{
 
     if (!id && !hi) return;
 
-    PrintAndLogEx(SUCCESS, "EM410x %s pattern found", (hi) ? "XL" : "" );
+    PrintAndLogEx(SUCCESS, "EM410x %s pattern found", (hi) ? "XL" : "");
 
-    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)));
+    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){
+    if (hi) {
         //output 88 bit em id
         PrintAndLogEx(NORMAL, "\nEM TAG ID      : %06X%016" PRIX64, hi, id);
     } else {
@@ -275,33 +290,33 @@ void printEM410x(uint32_t hi, uint64_t id) {
         PrintAndLogEx(NORMAL, "HoneyWell IdentKey {");
         PrintAndLogEx(NORMAL, "DEZ 8          : %08" PRIu64, id & 0xFFFFFF);
         PrintAndLogEx(NORMAL, "DEZ 10         : %010" PRIu64, id & 0xFFFFFFFF);
-        PrintAndLogEx(NORMAL, "DEZ 5.5        : %05" PRIu64 ".%05" PRIu64, (id>>16LL) & 0xFFFF, (id & 0xFFFF));
-        PrintAndLogEx(NORMAL, "DEZ 3.5A       : %03" PRIu64 ".%05" PRIu64, (id>>32ll), (id & 0xFFFF));
+        PrintAndLogEx(NORMAL, "DEZ 5.5        : %05" PRIu64 ".%05" PRIu64, (id >> 16LL) & 0xFFFF, (id & 0xFFFF));
+        PrintAndLogEx(NORMAL, "DEZ 3.5A       : %03" PRIu64 ".%05" PRIu64, (id >> 32ll), (id & 0xFFFF));
         PrintAndLogEx(NORMAL, "DEZ 3.5B       : %03" PRIu64 ".%05" PRIu64, (id & 0xFF000000) >> 24, (id & 0xFFFF));
         PrintAndLogEx(NORMAL, "DEZ 3.5C       : %03" PRIu64 ".%05" PRIu64, (id & 0xFF0000) >> 16, (id & 0xFFFF));
         PrintAndLogEx(NORMAL, "DEZ 14/IK2     : %014" PRIu64, id);
         PrintAndLogEx(NORMAL, "DEZ 15/IK3     : %015" PRIu64, id2lo);
         PrintAndLogEx(NORMAL, "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;
-        PrintAndLogEx(NORMAL, "}\nOther          : %05" PRIu64 "_%03" PRIu64 "_%08" PRIu64, (id&0xFFFF), ((id>>16LL) & 0xFF), (id & 0xFFFFFF));
+                      (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;
+        PrintAndLogEx(NORMAL, "}\nOther          : %05" PRIu64 "_%03" PRIu64 "_%08" PRIu64, (id & 0xFFFF), ((id >> 16LL) & 0xFF), (id & 0xFFFFFF));
         PrintAndLogEx(NORMAL, "Pattern Paxton : %" PRIu64 " [0x%" PRIX64 "]", paxton, paxton);
 
         uint32_t p1id = (id & 0xFFFFFF);
         uint8_t arr[32] = {0x00};
-        int i =0;
+        int i = 0;
         int j = 23;
-        for (; i < 24; ++i, --j ){
+        for (; i < 24; ++i, --j) {
             arr[i] = (p1id >> i) & 1;
         }
 
@@ -352,17 +367,18 @@ void printEM410x(uint32_t hi, uint64_t id) {
  *   CCCC                  <-- each bit here is parity for the 10 bits above in corresponding column
  *   0                     <-- stop bit, end of tag
  */
-int AskEm410xDecode(bool verbose, uint32_t *hi, uint64_t *lo ) {
+int AskEm410xDecode(bool verbose, uint32_t *hi, uint64_t *lo)
+{
     size_t idx = 0;
     uint8_t bits[512] = {0};
     size_t size = sizeof(bits);
-    if ( !getDemodBuf(bits, &size) ) {
+    if (!getDemodBuf(bits, &size)) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - Em410x problem during copy from ASK demod");
         return 0;
     }
 
     int ans = Em410xDecode(bits, &size, &idx, hi, lo);
-    if ( ans < 0){
+    if (ans < 0) {
 
         if (ans == -2)
             PrintAndLogEx(DEBUG, "DEBUG: Error - Em410x not enough samples after demod");
@@ -381,8 +397,8 @@ int AskEm410xDecode(bool verbose, uint32_t *hi, uint64_t *lo ) {
     }
 
     //set GraphBuffer for clone or sim command
-    setDemodBuf(DemodBuffer, (size==40) ? 64 : 128, idx+1);
-    setClockGrid(g_DemodClock, g_DemodStartIdx + ((idx+1)*g_DemodClock));
+    setDemodBuf(DemodBuffer, (size == 40) ? 64 : 128, idx + 1);
+    setClockGrid(g_DemodClock, g_DemodStartIdx + ((idx + 1)*g_DemodClock));
 
     PrintAndLogEx(DEBUG, "DEBUG: Em410x idx: %d, Len: %d, Printing Demod Buffer:", idx, size);
     if (g_debugMode)
@@ -393,21 +409,24 @@ int AskEm410xDecode(bool verbose, uint32_t *hi, uint64_t *lo ) {
 
     return 1;
 }
-int AskEm410xDemod(const char *Cmd, uint32_t *hi, uint64_t *lo, bool verbose) {
+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);
 }
 
 // this read is the "normal" read,  which download lf signal and tries to demod here.
-int CmdEM410xRead(const char *Cmd) {
+int CmdEM410xRead(const char *Cmd)
+{
     lf_read(true, 8192);
     return CmdEM410xDemod(Cmd);
 }
 
 // this read loops on device side.
 // uses the demod in lfops.c
-int CmdEM410xRead_device(const char *Cmd) {
+int CmdEM410xRead_device(const char *Cmd)
+{
     char cmdp = tolower(param_getchar(Cmd, 0));
     uint8_t findone = (cmdp == '1') ? 1 : 0;
     UsbCommand c = {CMD_EM410X_DEMOD, {findone, 0, 0}};
@@ -415,11 +434,12 @@ int CmdEM410xRead_device(const char *Cmd) {
     return 0;
 }
 
- //by marshmellow
+//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 CmdEM410xDemod(const char *Cmd) {
+int CmdEM410xDemod(const char *Cmd)
+{
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) > 10 || cmdp == 'h') return usage_lf_em410x_demod();
 
@@ -433,7 +453,8 @@ int CmdEM410xDemod(const char *Cmd) {
 }
 
 // emulate an EM410X tag
-int CmdEM410xSim(const char *Cmd) {
+int CmdEM410xSim(const char *Cmd)
+{
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_lf_em410x_sim();
 
@@ -449,7 +470,7 @@ int CmdEM410xSim(const char *Cmd) {
 
     param_getdec(Cmd, 1, &clock);
 
-    PrintAndLogEx(SUCCESS, "Starting simulating UID %02X%02X%02X%02X%02X  clock: %d", uid[0],uid[1],uid[2],uid[3],uid[4],clock);
+    PrintAndLogEx(SUCCESS, "Starting simulating UID %02X%02X%02X%02X%02X  clock: %d", uid[0], uid[1], uid[2], uid[3], uid[4], clock);
     PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation");
 
     ConstructEM410xEmulGraph(Cmd, clock);
@@ -458,7 +479,8 @@ int CmdEM410xSim(const char *Cmd) {
     return 0;
 }
 
-int CmdEM410xBrute(const char *Cmd) {
+int CmdEM410xBrute(const char *Cmd)
+{
     char filename[FILE_PATH_SIZE] = {0};
     FILE *f = NULL;
     char buf[11];
@@ -500,12 +522,12 @@ int CmdEM410xBrute(const char *Cmd) {
         return 1;
     }
 
-    while( fgets(buf, sizeof(buf), f) ) {
+    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 (buf[0] == '#') continue;
 
         if (param_gethex(buf, 0, uid, 10)) {
             PrintAndLogEx(FAILED, "UIDs must include 10 HEX symbols");
@@ -516,15 +538,15 @@ int CmdEM410xBrute(const char *Cmd) {
 
         buf[10] = 0;
 
-        if ( stUidBlock - uidcnt < 2) {
-                p = realloc(uidBlock, 5 * (stUidBlock += 10) );
-                if (!p) {
-                    PrintAndLogEx(WARNING, "Cannot allocate memory for UIDs");
-                    free(uidBlock);
-                    fclose(f);
-                    return 1;
-                }
-                uidBlock = p;
+        if (stUidBlock - uidcnt < 2) {
+            p = realloc(uidBlock, 5 * (stUidBlock += 10));
+            if (!p) {
+                PrintAndLogEx(WARNING, "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);
@@ -543,18 +565,19 @@ int CmdEM410xBrute(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "Loaded %d UIDs from %s, pause delay: %d ms", uidcnt, filename, delay);
 
     // loop
-    for(uint32_t c = 0; c < uidcnt; ++c ) {
+    for (uint32_t c = 0; c < uidcnt; ++c) {
         char testuid[11];
         testuid[10] = 0;
 
         if (ukbhit()) {
-            int gc = getchar(); (void)gc;
+            int gc = getchar();
+            (void)gc;
             PrintAndLogEx(WARNING, "\nAborted via keyboard!\n");
             free(uidBlock);
             return 0;
         }
 
-        sprintf(testuid, "%010" PRIX64, bytes_to_num(uidBlock + 5*c, 5));
+        sprintf(testuid, "%010" PRIX64, bytes_to_num(uidBlock + 5 * c, 5));
         PrintAndLogEx(NORMAL, "Bruteforce %d / %d: simulating UID  %s, clock %d", c + 1, uidcnt, testuid, clock);
 
         ConstructEM410xEmulGraph(testuid, clock);
@@ -579,10 +602,12 @@ int CmdEM410xBrute(const char *Cmd) {
  *
  *  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) {
+int CmdEM410xWatch(const char *Cmd)
+{
     do {
         if (ukbhit()) {
-            int gc = getchar(); (void)gc;
+            int gc = getchar();
+            (void)gc;
             PrintAndLogEx(WARNING, "\naborted via keyboard!\n");
             break;
         }
@@ -593,19 +618,21 @@ int CmdEM410xWatch(const char *Cmd) {
 }
 
 //currently only supports manchester modulations
-int CmdEM410xWatchnSpoof(const char *Cmd) {
+int CmdEM410xWatchnSpoof(const char *Cmd)
+{
 
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_lf_em410x_ws();
 
     // loops if the captured ID was in XL-format.
     CmdEM410xWatch(Cmd);
-    PrintAndLogEx(SUCCESS, "# Replaying captured ID: %010" PRIx64 , g_em410xid);
+    PrintAndLogEx(SUCCESS, "# Replaying captured ID: %010" PRIx64, g_em410xid);
     CmdLFaskSim("");
     return 0;
 }
 
-int CmdEM410xWrite(const char *Cmd) {
+int CmdEM410xWrite(const char *Cmd)
+{
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 0x00 || cmdp == 'h') return usage_lf_em410x_write();
 
@@ -666,11 +693,12 @@ int CmdEM410xWrite(const char *Cmd) {
 }
 
 //**************** Start of EM4x50 Code ************************
-bool EM_EndParityTest(uint8_t *bs, size_t size, uint8_t rows, uint8_t cols, uint8_t pType) {
+bool EM_EndParityTest(uint8_t *bs, size_t size, uint8_t rows, uint8_t cols, uint8_t pType)
+{
     if (rows * cols > size) return false;
     uint8_t colP = 0;
     //assume last col is a parity and do not test
-    for (uint8_t colNum = 0; colNum < cols-1; colNum++) {
+    for (uint8_t colNum = 0; colNum < cols - 1; colNum++) {
         for (uint8_t rowNum = 0; rowNum < rows; rowNum++) {
             colP ^= bs[(rowNum * cols) + colNum];
         }
@@ -679,12 +707,13 @@ bool EM_EndParityTest(uint8_t *bs, size_t size, uint8_t rows, uint8_t cols, uint
     return true;
 }
 
-bool EM_ByteParityTest(uint8_t *bs, size_t size, uint8_t rows, uint8_t cols, uint8_t pType) {
+bool EM_ByteParityTest(uint8_t *bs, size_t size, uint8_t rows, uint8_t cols, uint8_t pType)
+{
     if (rows * cols > size) return false;
 
     uint8_t rowP = 0;
     //assume last row is a parity row and do not test
-    for (uint8_t rowNum = 0; rowNum < rows-1; rowNum++) {
+    for (uint8_t rowNum = 0; rowNum < rows - 1; rowNum++) {
         for (uint8_t colNum = 0; colNum < cols; colNum++) {
             rowP ^= bs[(rowNum * cols) + colNum];
         }
@@ -703,24 +732,25 @@ bool EM_ByteParityTest(uint8_t *bs, size_t size, uint8_t rows, uint8_t cols, uin
 //c012345678| 0
 //            |- must be zero
 
-bool EMwordparitytest(uint8_t *bits){
+bool EMwordparitytest(uint8_t *bits)
+{
 
     // last row/col parity must be 0
-    if (bits[44] != 0 ) return false;
+    if (bits[44] != 0) return false;
 
     // col parity check
-    uint8_t c1 = bytebits_to_byte(bits, 8) ^ bytebits_to_byte(bits+9, 8) ^ bytebits_to_byte(bits+18, 8) ^ bytebits_to_byte(bits+27, 8);
-    uint8_t c2 = bytebits_to_byte(bits+36, 8);
-    if ( c1 != c2 ) return false;
+    uint8_t c1 = bytebits_to_byte(bits, 8) ^ bytebits_to_byte(bits + 9, 8) ^ bytebits_to_byte(bits + 18, 8) ^ bytebits_to_byte(bits + 27, 8);
+    uint8_t c2 = bytebits_to_byte(bits + 36, 8);
+    if (c1 != c2) return false;
 
     // row parity check
     uint8_t rowP = 0;
-    for ( uint8_t i = 0; i < 36; ++i ) {
+    for (uint8_t i = 0; i < 36; ++i) {
 
         rowP ^= bits[i];
-        if ( i>0 && (i % 9) == 0) {
+        if (i > 0 && (i % 9) == 0) {
 
-            if ( rowP != EVEN )
+            if (rowP != EVEN)
                 return false;
 
             rowP = 0;
@@ -732,32 +762,33 @@ bool EMwordparitytest(uint8_t *bits){
 
 //////////////// 4050 / 4450 commands
 
-uint32_t OutputEM4x50_Block(uint8_t *BitStream, size_t size, bool verbose, bool pTest) {
-    if (size<45) return 0;
+uint32_t OutputEM4x50_Block(uint8_t *BitStream, size_t size, bool verbose, bool pTest)
+{
+    if (size < 45) return 0;
 
-    uint32_t code = bytebits_to_byte(BitStream,8);
-    code = code<<8 | bytebits_to_byte(BitStream+9,8);
-    code = code<<8 | bytebits_to_byte(BitStream+18,8);
-    code = code<<8 | bytebits_to_byte(BitStream+27,8);
+    uint32_t code = bytebits_to_byte(BitStream, 8);
+    code = code << 8 | bytebits_to_byte(BitStream + 9, 8);
+    code = code << 8 | bytebits_to_byte(BitStream + 18, 8);
+    code = code << 8 | bytebits_to_byte(BitStream + 27, 8);
 
-    if (verbose || g_debugMode){
-        for (uint8_t i = 0; i<5; i++){
+    if (verbose || g_debugMode) {
+        for (uint8_t i = 0; i < 5; i++) {
             if (i == 4) PrintAndLogEx(NORMAL, ""); //parity byte spacer
             PrintAndLogEx(NORMAL, "%d%d%d%d%d%d%d%d %d -> 0x%02x",
-                BitStream[i*9],
-                BitStream[i*9+1],
-                BitStream[i*9+2],
-                BitStream[i*9+3],
-                BitStream[i*9+4],
-                BitStream[i*9+5],
-                BitStream[i*9+6],
-                BitStream[i*9+7],
-                BitStream[i*9+8],
-                bytebits_to_byte(BitStream+i*9,8)
-            );
+                          BitStream[i * 9],
+                          BitStream[i * 9 + 1],
+                          BitStream[i * 9 + 2],
+                          BitStream[i * 9 + 3],
+                          BitStream[i * 9 + 4],
+                          BitStream[i * 9 + 5],
+                          BitStream[i * 9 + 6],
+                          BitStream[i * 9 + 7],
+                          BitStream[i * 9 + 8],
+                          bytebits_to_byte(BitStream + i * 9, 8)
+                         );
         }
 
-        PrintAndLogEx(SUCCESS, "Parity checks | %s", (pTest)? _GREEN_(Passed) : _RED_(Failed));
+        PrintAndLogEx(SUCCESS, "Parity checks | %s", (pTest) ? _GREEN_(Passed) : _RED_(Failed));
     }
     return code;
 }
@@ -781,9 +812,10 @@ uint32_t OutputEM4x50_Block(uint8_t *BitStream, size_t size, bool verbose, bool
  * is stored in the blocks defined in the control word First and Last
  * Word Read values. UID is stored in block 32.
  */
- //completed by Marshmellow
-int EM4x50Read(const char *Cmd, bool verbose) {
-    uint8_t fndClk[] = {8,16,32,40,50,64,128};
+//completed by Marshmellow
+int EM4x50Read(const char *Cmd, bool verbose)
+{
+    uint8_t fndClk[] = {8, 16, 32, 40, 50, 64, 128};
     int clk = 0, invert = 0, tol = 0, phaseoff;
     int i = 0, j = 0, startblock, skip, block, start, end, low = 0, high = 0, minClk = 255;
     uint32_t Code[6];
@@ -792,7 +824,7 @@ int EM4x50Read(const char *Cmd, bool verbose) {
     bool complete = false;
 
     int tmpbuff[MAX_GRAPH_TRACE_LEN / 64];
-    memset(tmpbuff, 0, sizeof(tmpbuff) );
+    memset(tmpbuff, 0, sizeof(tmpbuff));
 
     // get user entry if any
     sscanf(Cmd, "%i %i", &clk, &invert);
@@ -817,16 +849,16 @@ int EM4x50Read(const char *Cmd, bool verbose) {
         // measure from low to low
         while ((bits[i] > low) && (i < size))
             ++i;
-        start= i;
+        start = i;
         while ((bits[i] < high) && (i < size))
             ++i;
         while ((bits[i] > low) && (i < size))
             ++i;
-        if (j >= (MAX_GRAPH_TRACE_LEN/64)) {
+        if (j >= (MAX_GRAPH_TRACE_LEN / 64)) {
             break;
         }
         tmpbuff[j++] = i - start;
-        if (i-start < minClk && i < size) {
+        if (i - start < minClk && i < size) {
             minClk = i - start;
         }
     }
@@ -847,24 +879,23 @@ int EM4x50Read(const char *Cmd, bool verbose) {
 
     // look for data start - should be 2 pairs of LW (pulses of clk*3,clk*2)
     start = -1;
-    for (i= 0; i < j - 4 ; ++i) {
+    for (i = 0; i < j - 4 ; ++i) {
         skip += tmpbuff[i];
         if (tmpbuff[i] >= clk * 3 - tol && tmpbuff[i] <= clk * 3 + tol)  //3 clocks
-            if (tmpbuff[i+1] >= clk * 2 - tol && tmpbuff[i+1] <= clk * 2 + tol)  //2 clocks
-                if (tmpbuff[i+2] >= clk * 3 - tol && tmpbuff[i+2] <= clk * 3 + tol) //3 clocks
-                    if (tmpbuff[i+3] >= clk-tol)  //1.5 to 2 clocks - depends on bit following
-                    {
-                        start= i + 4;
+            if (tmpbuff[i + 1] >= clk * 2 - tol && tmpbuff[i + 1] <= clk * 2 + tol) //2 clocks
+                if (tmpbuff[i + 2] >= clk * 3 - tol && tmpbuff[i + 2] <= clk * 3 + tol) //3 clocks
+                    if (tmpbuff[i + 3] >= clk - tol) { //1.5 to 2 clocks - depends on bit following
+                        start = i + 4;
                         break;
                     }
     }
     startblock = i + 4;
 
     // skip over the remainder of LW
-    skip += (tmpbuff[i+1] + tmpbuff[i+2] + clk);
+    skip += (tmpbuff[i + 1] + tmpbuff[i + 2] + clk);
 
-    if (tmpbuff[i+3] > clk)
-        phaseoff = tmpbuff[i+3] - clk;
+    if (tmpbuff[i + 3] > clk)
+        phaseoff = tmpbuff[i + 3] - clk;
     else
         phaseoff = 0;
 
@@ -873,11 +904,10 @@ int EM4x50Read(const char *Cmd, bool verbose) {
     for (i += 3; i < j - 4 ; ++i) {
         end += tmpbuff[i];
         if (tmpbuff[i] >= clk * 3 - tol && tmpbuff[i] <= clk * 3 + tol)  //3 clocks
-            if (tmpbuff[i+1] >= clk * 2 - tol && tmpbuff[i+1] <= clk * 2 + tol)  //2 clocks
-                if (tmpbuff[i+2] >= clk * 3 - tol && tmpbuff[i+2] <= clk * 3 + tol) //3 clocks
-                    if (tmpbuff[i+3] >= clk-tol)  //1.5 to 2 clocks - depends on bit following
-                    {
-                        complete= true;
+            if (tmpbuff[i + 1] >= clk * 2 - tol && tmpbuff[i + 1] <= clk * 2 + tol) //2 clocks
+                if (tmpbuff[i + 2] >= clk * 3 - tol && tmpbuff[i + 2] <= clk * 3 + tol) //3 clocks
+                    if (tmpbuff[i + 3] >= clk - tol) { //1.5 to 2 clocks - depends on bit following
+                        complete = true;
                         break;
                     }
     }
@@ -887,7 +917,7 @@ int EM4x50Read(const char *Cmd, bool verbose) {
         if (start >= 0) {
             PrintAndLogEx(NORMAL, "\nNote: one block = 50 bits (32 data, 12 parity, 6 marker)");
         } else {
-            PrintAndLogEx(NORMAL, "No data found!, clock tried:%d",clk);
+            PrintAndLogEx(NORMAL, "No data found!, clock tried:%d", clk);
             PrintAndLogEx(NORMAL, "Try again with more samples.");
             PrintAndLogEx(NORMAL, "  or after a 'data askedge' command to clean up the read");
             return 0;
@@ -895,7 +925,7 @@ 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);
+    snprintf(tmp2, sizeof(tmp2), "%d %d 1000 %d", clk, invert, clk * 47);
     // save GraphBuffer - to restore it later
     save_restoreGB(GRAPH_SAVE);
     // get rid of leading crap
@@ -911,16 +941,16 @@ int EM4x50Read(const char *Cmd, bool verbose) {
         skip = phaseoff;
 
         // look for LW before start of next block
-        for ( ; i < j - 4 ; ++i) {
+        for (; i < j - 4 ; ++i) {
             skip += tmpbuff[i];
             if (tmpbuff[i] >= clk * 3 - tol && tmpbuff[i] <= clk * 3 + tol)
-                if (tmpbuff[i+1] >= clk-tol)
+                if (tmpbuff[i + 1] >= clk - tol)
                     break;
         }
-        if (i >= j-4) break; //next LW not found
+        if (i >= j - 4) break; //next LW not found
         skip += clk;
-        if (tmpbuff[i+1] > clk)
-            phaseoff = tmpbuff[i+1] - clk;
+        if (tmpbuff[i + 1] > clk)
+            phaseoff = tmpbuff[i + 1] - clk;
         else
             phaseoff = 0;
 
@@ -931,14 +961,14 @@ int EM4x50Read(const char *Cmd, bool verbose) {
             return 0;
         }
         //set DemodBufferLen to just one block
-        DemodBufferLen = skip/clk;
+        DemodBufferLen = skip / clk;
         //test parities
-        pTest = EM_ByteParityTest(DemodBuffer,DemodBufferLen, 5, 9, 0);
-        pTest &= EM_EndParityTest(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
         Code[block] = OutputEM4x50_Block(DemodBuffer, DemodBufferLen, verbose, pTest);
-        PrintAndLogEx(DEBUG, "\nskipping %d samples, bits:%d", skip, skip/clk);
+        PrintAndLogEx(DEBUG, "\nskipping %d samples, bits:%d", skip, skip / clk);
         //skip to start of next block
         snprintf(tmp, sizeof(tmp), "%i", skip);
         CmdLtrim(tmp);
@@ -946,22 +976,22 @@ int EM4x50Read(const char *Cmd, bool verbose) {
         if (i >= end) break; //in case chip doesn't output 6 blocks
     }
     //print full code:
-    if (verbose || g_debugMode || AllPTest){
+    if (verbose || g_debugMode || AllPTest) {
         if (!complete) {
-            PrintAndLogEx(NORMAL, _RED_(*** Warning!) );
+            PrintAndLogEx(NORMAL, _RED_(* **Warning!));
             PrintAndLogEx(NORMAL, "Partial data - no end found!");
             PrintAndLogEx(NORMAL, "Try again with more samples.");
         }
         PrintAndLogEx(NORMAL, "Found data at sample: %i - using clock: %i", start, clk);
         end = block;
-        for (block=0; block < end; block++){
+        for (block = 0; block < end; block++) {
             PrintAndLogEx(NORMAL, "Block %d: %08x", block, Code[block]);
         }
 
-        PrintAndLogEx(NORMAL, "Parities checks | %s", (AllPTest) ? _GREEN_(Passed) : _RED_(Failed) );
+        PrintAndLogEx(NORMAL, "Parities checks | %s", (AllPTest) ? _GREEN_(Passed) : _RED_(Failed));
 
         if (AllPTest == 0) {
-            PrintAndLogEx(NORMAL, "Try cleaning the read samples with " _YELLOW_('data askedge') );
+            PrintAndLogEx(NORMAL, "Try cleaning the read samples with " _YELLOW_('data askedge'));
         }
     }
 
@@ -970,31 +1000,35 @@ int EM4x50Read(const char *Cmd, bool verbose) {
     return (int)AllPTest;
 }
 
-int CmdEM4x50Read(const char *Cmd) {
+int CmdEM4x50Read(const char *Cmd)
+{
     uint8_t ctmp = tolower(param_getchar(Cmd, 0));
-    if ( ctmp == 'h' ) return usage_lf_em4x50_read();
+    if (ctmp == 'h') return usage_lf_em4x50_read();
     return EM4x50Read(Cmd, true);
 }
-int CmdEM4x50Write(const char *Cmd){
+int CmdEM4x50Write(const char *Cmd)
+{
     uint8_t ctmp = tolower(param_getchar(Cmd, 0));
-    if ( ctmp == 'h' ) return usage_lf_em4x50_write();
+    if (ctmp == 'h') return usage_lf_em4x50_write();
     PrintAndLogEx(NORMAL, "no implemented yet");
     return 0;
 }
-int CmdEM4x50Dump(const char *Cmd){
+int CmdEM4x50Dump(const char *Cmd)
+{
     uint8_t ctmp = tolower(param_getchar(Cmd, 0));
-    if ( ctmp == 'h' ) return usage_lf_em4x50_dump();
+    if (ctmp == 'h') return usage_lf_em4x50_dump();
     PrintAndLogEx(NORMAL, "no implemented yet");
     return 0;
 }
 
 #define EM_PREAMBLE_LEN 6
 // download samples from device and copy to Graphbuffer
-bool downloadSamplesEM(){
+bool downloadSamplesEM()
+{
 
     // 8 bit preamble + 32 bit word response (max clock (128) * 40bits = 5120 samples)
     uint8_t got[6000];
-    if ( !GetFromDevice(BIG_BUF, got, sizeof(got), 0, NULL, 2500, false)) {
+    if (!GetFromDevice(BIG_BUF, got, sizeof(got), 0, NULL, 2500, false)) {
         PrintAndLogEx(WARNING, "command execution time out");
         return false;
     }
@@ -1011,10 +1045,11 @@ bool downloadSamplesEM(){
 }
 
 // em_demod
-bool doPreambleSearch(size_t *startIdx){
+bool doPreambleSearch(size_t *startIdx)
+{
 
     // sanity check
-    if ( DemodBufferLen < EM_PREAMBLE_LEN) {
+    if (DemodBufferLen < EM_PREAMBLE_LEN) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - EM4305 demodbuffer too small");
         return false;
     }
@@ -1023,16 +1058,17 @@ bool doPreambleSearch(size_t *startIdx){
     size_t size = (20 > DemodBufferLen) ? DemodBufferLen : 20;
     *startIdx = 0;
     // skip first two 0 bits as they might have been missed in the demod
-    uint8_t preamble[EM_PREAMBLE_LEN] = {0,0,1,0,1,0};
+    uint8_t preamble[EM_PREAMBLE_LEN] = {0, 0, 1, 0, 1, 0};
 
-    if ( !preambleSearchEx(DemodBuffer, preamble, EM_PREAMBLE_LEN, &size, startIdx, true)) {
+    if (!preambleSearchEx(DemodBuffer, preamble, EM_PREAMBLE_LEN, &size, startIdx, true)) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - EM4305 preamble not found :: %d", *startIdx);
         return false;
     }
     return true;
 }
 
-bool detectFSK(){
+bool detectFSK()
+{
     // detect fsk clock
     if (!GetFskClock("", false)) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - EM: FSK clock failed");
@@ -1047,7 +1083,8 @@ bool detectFSK(){
     return true;
 }
 // PSK clocks should be easy to detect ( but difficult to demod a non-repeating pattern... )
-bool detectPSK(){
+bool detectPSK()
+{
     int ans = GetPskClock("", false);
     if (ans <= 0) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - EM: PSK clock failed");
@@ -1071,15 +1108,17 @@ bool detectPSK(){
     return true;
 }
 // try manchester - NOTE: ST only applies to T55x7 tags.
-bool detectASK_MAN(){
+bool detectASK_MAN()
+{
     bool stcheck = false;
-    if ( !ASKDemod_ext("0 0 0", false, false, 1, &stcheck) ) {
+    if (!ASKDemod_ext("0 0 0", false, false, 1, &stcheck)) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - EM: ASK/Manchester Demod failed");
         return false;
     }
     return true;
 }
-bool detectASK_BI(){
+bool detectASK_BI()
+{
     int ans = ASKbiphaseDemod("0 0 1", false);
     if (!ans) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - EM: ASK/biphase normal demod failed");
@@ -1094,12 +1133,13 @@ bool detectASK_BI(){
 }
 
 // param: idx - start index in demoded data.
-bool setDemodBufferEM(uint32_t *word, size_t idx){
+bool setDemodBufferEM(uint32_t *word, size_t idx)
+{
 
     //test for even parity bits.
     uint8_t parity[45] = {0};
-    memcpy( parity, DemodBuffer, 45);
-    if (!EMwordparitytest(parity) ){
+    memcpy(parity, DemodBuffer, 45);
+    if (!EMwordparitytest(parity)) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - EM Parity tests failed");
         return false;
     }
@@ -1117,57 +1157,60 @@ bool setDemodBufferEM(uint32_t *word, size_t idx){
 // 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...
-bool demodEM4x05resp(uint32_t *word) {
+bool demodEM4x05resp(uint32_t *word)
+{
     size_t idx = 0;
     *word = 0;
-    if (detectASK_MAN() && doPreambleSearch( &idx ))
+    if (detectASK_MAN() && doPreambleSearch(&idx))
         return setDemodBufferEM(word, idx);
 
-    if (detectASK_BI() && doPreambleSearch( &idx ))
+    if (detectASK_BI() && doPreambleSearch(&idx))
         return setDemodBufferEM(word, idx);
 
-    if (detectFSK() && doPreambleSearch( &idx ))
+    if (detectFSK() && doPreambleSearch(&idx))
         return setDemodBufferEM(word, idx);
 
     if (detectPSK()) {
-        if (doPreambleSearch( &idx ))
+        if (doPreambleSearch(&idx))
             return setDemodBufferEM(word, idx);
 
         psk1TOpsk2(DemodBuffer, DemodBufferLen);
-        if (doPreambleSearch( &idx ))
+        if (doPreambleSearch(&idx))
             return setDemodBufferEM(word, idx);
     }
     return false;
 }
 
 //////////////// 4205 / 4305 commands
-int EM4x05ReadWord_ext(uint8_t addr, uint32_t pwd, bool usePwd, uint32_t *word) {
+int EM4x05ReadWord_ext(uint8_t addr, uint32_t pwd, bool usePwd, uint32_t *word)
+{
     UsbCommand c = {CMD_EM4X_READ_WORD, {addr, pwd, usePwd}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
-    if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)){
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         PrintAndLogEx(DEBUG, "timeout while waiting for reply.");
         return -1;
     }
-    if ( !downloadSamplesEM() ) {
+    if (!downloadSamplesEM()) {
         return -1;
     }
 
     return demodEM4x05resp(word);
 }
 
-int CmdEM4x05Dump(const char *Cmd) {
+int CmdEM4x05Dump(const char *Cmd)
+{
     uint8_t addr = 0;
     uint32_t pwd = 0;
     bool usePwd = false;
     uint8_t ctmp = tolower(param_getchar(Cmd, 0));
-    if ( ctmp == 'h' ) return usage_lf_em4x05_dump();
+    if (ctmp == 'h') return usage_lf_em4x05_dump();
 
     // for now use default input of 1 as invalid (unlikely 1 will be a valid password...)
     pwd = param_get32ex(Cmd, 0, 1, 16);
 
-    if ( pwd != 1 )
+    if (pwd != 1)
         usePwd = true;
 
     int success = 1;
@@ -1178,9 +1221,9 @@ int CmdEM4x05Dump(const char *Cmd) {
 
         if (addr == 2) {
             if (usePwd) {
-                PrintAndLogEx(NORMAL, " %02u | %08X", addr, pwd, word );
+                PrintAndLogEx(NORMAL, " %02u | %08X", addr, pwd, word);
             } else {
-                PrintAndLogEx(NORMAL, " 02 | " _RED_(cannot read) );
+                PrintAndLogEx(NORMAL, " 02 | " _RED_(cannot read));
             }
         } else {
             success &= EM4x05ReadWord_ext(addr, pwd, usePwd, &word);
@@ -1190,12 +1233,13 @@ int CmdEM4x05Dump(const char *Cmd) {
     return success;
 }
 
-int CmdEM4x05Read(const char *Cmd) {
+int CmdEM4x05Read(const char *Cmd)
+{
     uint8_t addr;
     uint32_t pwd;
     bool usePwd = false;
     uint8_t ctmp = tolower(param_getchar(Cmd, 0));
-    if ( strlen(Cmd) == 0 || ctmp == 'h' ) return usage_lf_em4x05_read();
+    if (strlen(Cmd) == 0 || ctmp == 'h') return usage_lf_em4x05_read();
 
     addr = param_get8ex(Cmd, 0, 50, 10);
     pwd =  param_get32ex(Cmd, 1, 1, 16);
@@ -1204,7 +1248,7 @@ int CmdEM4x05Read(const char *Cmd) {
         PrintAndLogEx(NORMAL, "Address must be between 0 and 15");
         return 1;
     }
-    if ( pwd == 1 ) {
+    if (pwd == 1) {
         PrintAndLogEx(NORMAL, "Reading address %02u", addr);
     } else {
         usePwd = true;
@@ -1220,9 +1264,10 @@ int CmdEM4x05Read(const char *Cmd) {
     return isOk;
 }
 
-int CmdEM4x05Write(const char *Cmd) {
+int CmdEM4x05Write(const char *Cmd)
+{
     uint8_t ctmp = tolower(param_getchar(Cmd, 0));
-    if ( strlen(Cmd) == 0 || ctmp == 'h' ) return usage_lf_em4x05_write();
+    if (strlen(Cmd) == 0 || ctmp == 'h') return usage_lf_em4x05_write();
 
     bool usePwd = false;
     uint8_t addr = 50; // default to invalid address
@@ -1233,24 +1278,24 @@ int CmdEM4x05Write(const char *Cmd) {
     data = param_get32ex(Cmd, 1, 0, 16);
     pwd =  param_get32ex(Cmd, 2, 1, 16);
 
-    if ( addr > 15 ) {
+    if (addr > 15) {
         PrintAndLogEx(NORMAL, "Address must be between 0 and 15");
         return 1;
     }
-    if ( pwd == 1 )
+    if (pwd == 1)
         PrintAndLogEx(NORMAL, "Writing address %d data %08X", addr, data);
     else {
         usePwd = true;
         PrintAndLogEx(NORMAL, "Writing address %d data %08X using password %08X", addr, data, pwd);
     }
 
-    uint16_t flag = (addr << 8 ) | usePwd;
+    uint16_t flag = (addr << 8) | usePwd;
 
     UsbCommand c = {CMD_EM4X_WRITE_WORD, {flag, data, pwd}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
-    if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)){
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
         PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
         return -1;
     }
@@ -1262,61 +1307,100 @@ int CmdEM4x05Write(const char *Cmd) {
     uint32_t dummy = 0;
     int isOk = demodEM4x05resp(&dummy);
     if (isOk)
-        PrintAndLogEx(NORMAL, "Write " _GREEN_(Verified) );
+        PrintAndLogEx(NORMAL, "Write " _GREEN_(Verified));
     else
         PrintAndLogEx(NORMAL, "Write could " _RED_(not) "be verified");
     return isOk;
 }
 
-void printEM4x05config(uint32_t wordData) {
-    uint16_t datarate = (((wordData & 0x3F)+1)*2);
+void printEM4x05config(uint32_t wordData)
+{
+    uint16_t datarate = (((wordData & 0x3F) + 1) * 2);
     uint8_t encoder = ((wordData >> 6) & 0xF);
     char enc[14];
-    memset(enc,0,sizeof(enc));
+    memset(enc, 0, sizeof(enc));
 
     uint8_t PSKcf = (wordData >> 10) & 0x3;
     char cf[10];
-    memset(cf,0,sizeof(cf));
+    memset(cf, 0, sizeof(cf));
     uint8_t delay = (wordData >> 12) & 0x3;
     char cdelay[33];
-    memset(cdelay,0,sizeof(cdelay));
+    memset(cdelay, 0, sizeof(cdelay));
     uint8_t numblks = EM4x05_GET_NUM_BLOCKS(wordData);
-    uint8_t LWR = numblks+5-1; //last word read
+    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;
-        case 2: snprintf(enc,sizeof(enc),"Biphase"); break;
-        case 3: snprintf(enc,sizeof(enc),"Miller"); break;
-        case 4: snprintf(enc,sizeof(enc),"PSK1"); break;
-        case 5: snprintf(enc,sizeof(enc),"PSK2"); break;
-        case 6: snprintf(enc,sizeof(enc),"PSK3"); break;
-        case 7: snprintf(enc,sizeof(enc),"Unknown"); break;
-        case 8: snprintf(enc,sizeof(enc),"FSK1"); break;
-        case 9: snprintf(enc,sizeof(enc),"FSK2"); break;
-        default: snprintf(enc,sizeof(enc),"Unknown"); break;
+        case 0:
+            snprintf(enc, sizeof(enc), "NRZ");
+            break;
+        case 1:
+            snprintf(enc, sizeof(enc), "Manchester");
+            break;
+        case 2:
+            snprintf(enc, sizeof(enc), "Biphase");
+            break;
+        case 3:
+            snprintf(enc, sizeof(enc), "Miller");
+            break;
+        case 4:
+            snprintf(enc, sizeof(enc), "PSK1");
+            break;
+        case 5:
+            snprintf(enc, sizeof(enc), "PSK2");
+            break;
+        case 6:
+            snprintf(enc, sizeof(enc), "PSK3");
+            break;
+        case 7:
+            snprintf(enc, sizeof(enc), "Unknown");
+            break;
+        case 8:
+            snprintf(enc, sizeof(enc), "FSK1");
+            break;
+        case 9:
+            snprintf(enc, sizeof(enc), "FSK2");
+            break;
+        default:
+            snprintf(enc, sizeof(enc), "Unknown");
+            break;
     }
 
     switch (PSKcf) {
-        case 0: snprintf(cf,sizeof(cf),"RF/2"); break;
-        case 1: snprintf(cf,sizeof(cf),"RF/8"); break;
-        case 2: snprintf(cf,sizeof(cf),"RF/4"); break;
-        case 3: snprintf(cf,sizeof(cf),"unknown"); break;
+        case 0:
+            snprintf(cf, sizeof(cf), "RF/2");
+            break;
+        case 1:
+            snprintf(cf, sizeof(cf), "RF/8");
+            break;
+        case 2:
+            snprintf(cf, sizeof(cf), "RF/4");
+            break;
+        case 3:
+            snprintf(cf, sizeof(cf), "unknown");
+            break;
     }
 
     switch (delay) {
-        case 0: snprintf(cdelay, sizeof(cdelay),"no delay"); break;
-        case 1: snprintf(cdelay, sizeof(cdelay),"BP/8 or 1/8th bit period delay"); break;
-        case 2: snprintf(cdelay, sizeof(cdelay),"BP/4 or 1/4th bit period delay"); break;
-        case 3: snprintf(cdelay, sizeof(cdelay),"no delay"); break;
+        case 0:
+            snprintf(cdelay, sizeof(cdelay), "no delay");
+            break;
+        case 1:
+            snprintf(cdelay, sizeof(cdelay), "BP/8 or 1/8th bit period delay");
+            break;
+        case 2:
+            snprintf(cdelay, sizeof(cdelay), "BP/4 or 1/4th bit period delay");
+            break;
+        case 3:
+            snprintf(cdelay, sizeof(cdelay), "no delay");
+            break;
     }
-    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;
+    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;
     PrintAndLogEx(NORMAL, "ConfigWord: %08X (Word 4)\n", wordData);
     PrintAndLogEx(NORMAL, "Config Breakdown:");
     PrintAndLogEx(NORMAL, " Data Rate:  %02u | RF/%u", wordData & 0x3F, datarate);
@@ -1334,49 +1418,73 @@ void printEM4x05config(uint32_t wordData) {
     PrintAndLogEx(NORMAL, "    Pigeon:   %u | Pigeon Mode is %s\n", pigeon, pigeon ? "Enabled" : "Disabled");
 }
 
-void printEM4x05info(uint32_t block0, uint32_t serial) {
+void printEM4x05info(uint32_t block0, uint32_t serial)
+{
 
     uint8_t chipType = (block0 >> 1) & 0xF;
     uint8_t cap = (block0 >> 5) & 3;
     uint16_t custCode = (block0 >> 9) & 0x3FF;
 
     switch (chipType) {
-        case 9:  PrintAndLogEx(NORMAL, "\n Chip Type:   %u | EM4305", chipType); break;
-        case 8:  PrintAndLogEx(NORMAL, "\n Chip Type:   %u | EM4205", chipType); break;
-        case 4:  PrintAndLogEx(NORMAL, " Chip Type:   %u | Unknown", chipType); break;
-        case 2:  PrintAndLogEx(NORMAL, " Chip Type:   %u | EM4469", chipType); break;
+        case 9:
+            PrintAndLogEx(NORMAL, "\n Chip Type:   %u | EM4305", chipType);
+            break;
+        case 8:
+            PrintAndLogEx(NORMAL, "\n Chip Type:   %u | EM4205", chipType);
+            break;
+        case 4:
+            PrintAndLogEx(NORMAL, " Chip Type:   %u | Unknown", chipType);
+            break;
+        case 2:
+            PrintAndLogEx(NORMAL, " Chip Type:   %u | EM4469", chipType);
+            break;
         //add more here when known
-        default: PrintAndLogEx(NORMAL, " Chip Type:   %u Unknown", chipType); break;
+        default:
+            PrintAndLogEx(NORMAL, " Chip Type:   %u Unknown", chipType);
+            break;
     }
 
     switch (cap) {
-        case 3:  PrintAndLogEx(NORMAL, "  Cap Type:   %u | 330pF",cap); break;
-        case 2:  PrintAndLogEx(NORMAL, "  Cap Type:   %u | %spF",cap, (chipType==2)? "75":"210"); break;
-        case 1:  PrintAndLogEx(NORMAL, "  Cap Type:   %u | 250pF",cap); break;
-        case 0:  PrintAndLogEx(NORMAL, "  Cap Type:   %u | no resonant capacitor",cap); break;
-        default: PrintAndLogEx(NORMAL, "  Cap Type:   %u | unknown",cap); break;
+        case 3:
+            PrintAndLogEx(NORMAL, "  Cap Type:   %u | 330pF", cap);
+            break;
+        case 2:
+            PrintAndLogEx(NORMAL, "  Cap Type:   %u | %spF", cap, (chipType == 2) ? "75" : "210");
+            break;
+        case 1:
+            PrintAndLogEx(NORMAL, "  Cap Type:   %u | 250pF", cap);
+            break;
+        case 0:
+            PrintAndLogEx(NORMAL, "  Cap Type:   %u | no resonant capacitor", cap);
+            break;
+        default:
+            PrintAndLogEx(NORMAL, "  Cap Type:   %u | unknown", cap);
+            break;
     }
 
-    PrintAndLogEx(NORMAL, " Cust Code: %03u | %s", custCode, (custCode == 0x200) ? "Default": "Unknown");
+    PrintAndLogEx(NORMAL, " Cust Code: %03u | %s", custCode, (custCode == 0x200) ? "Default" : "Unknown");
     if (serial != 0)
         PrintAndLogEx(NORMAL, "\n  Serial #: %08X\n", serial);
 }
 
-void printEM4x05ProtectionBits(uint32_t word) {
+void printEM4x05ProtectionBits(uint32_t word)
+{
     for (uint8_t i = 0; i < 15; i++) {
-        PrintAndLogEx(NORMAL, "      Word:  %02u | %s", i, (((1 << i) & word ) || i < 2) ? "Is Write Locked" : "Is Not Write Locked");
-        if (i==14)
-            PrintAndLogEx(NORMAL, "      Word:  %02u | %s", i+1, (((1 << i) & word ) || i < 2) ? "Is Write Locked" : "Is Not Write Locked");
+        PrintAndLogEx(NORMAL, "      Word:  %02u | %s", i, (((1 << i) & word) || i < 2) ? "Is Write Locked" : "Is Not Write Locked");
+        if (i == 14)
+            PrintAndLogEx(NORMAL, "      Word:  %02u | %s", i + 1, (((1 << i) & word) || i < 2) ? "Is Write Locked" : "Is Not Write Locked");
     }
 }
 
 //quick test for EM4x05/EM4x69 tag
-bool EM4x05IsBlock0(uint32_t *word) {
+bool EM4x05IsBlock0(uint32_t *word)
+{
     int res = EM4x05ReadWord_ext(0, 0, false, word);
     return (res > 0) ? true : false;
 }
 
-int CmdEM4x05Info(const char *Cmd) {
+int CmdEM4x05Info(const char *Cmd)
+{
 #define EM_SERIAL_BLOCK 1
 #define EM_CONFIG_BLOCK 4
 #define EM_PROT1_BLOCK 14
@@ -1385,17 +1493,17 @@ int CmdEM4x05Info(const char *Cmd) {
     uint32_t word = 0, block0 = 0, serial = 0;
     bool usePwd = false;
     uint8_t ctmp = tolower(param_getchar(Cmd, 0));
-    if ( ctmp == 'h' ) return usage_lf_em4x05_info();
+    if (ctmp == 'h') return usage_lf_em4x05_info();
 
     // 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 )
+    if (pwd != 1)
         usePwd = true;
 
     // read word 0 (chip info)
     // block 0 can be read even without a password.
-    if ( !EM4x05IsBlock0(&block0) )
+    if (!EM4x05IsBlock0(&block0))
         return -1;
 
     // read word 1 (serial #) doesn't need pwd
@@ -1405,18 +1513,18 @@ int CmdEM4x05Info(const char *Cmd) {
 
     // read word 4 (config block)
     // needs password if one is set
-    if ( EM4x05ReadWord_ext(EM_CONFIG_BLOCK, pwd, usePwd, &word) != 1 )
+    if (EM4x05ReadWord_ext(EM_CONFIG_BLOCK, pwd, usePwd, &word) != 1)
         return 0;
 
     printEM4x05config(word);
 
     // read word 14 and 15 to see which is being used for the protection bits
-    if ( EM4x05ReadWord_ext(EM_PROT1_BLOCK, pwd, usePwd, &word) != 1 ) {
+    if (EM4x05ReadWord_ext(EM_PROT1_BLOCK, pwd, usePwd, &word) != 1) {
         return 0;
     }
     // if status bit says this is not the used protection word
     if (!(word & 0x8000)) {
-        if ( EM4x05ReadWord_ext(EM_PROT2_BLOCK, pwd, usePwd, &word) != 1 )
+        if (EM4x05ReadWord_ext(EM_PROT2_BLOCK, pwd, usePwd, &word) != 1)
             return 0;
     }
     //something went wrong
@@ -1445,13 +1553,15 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFEM4X(const char *Cmd) {
+int CmdLFEM4X(const char *Cmd)
+{
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
+int CmdHelp(const char *Cmd)
+{
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfem4x.h b/client/cmdlfem4x.h
index 7a8186e6a..d01dedc57 100644
--- a/client/cmdlfem4x.h
+++ b/client/cmdlfem4x.h
@@ -47,7 +47,7 @@ extern int EM4x50Read(const char *Cmd, bool verbose);
 bool EM4x05IsBlock0(uint32_t *word);
 
 extern void printEM410x(uint32_t hi, uint64_t id);
-extern int AskEm410xDecode(bool verbose, uint32_t *hi, uint64_t *lo );
+extern int AskEm410xDecode(bool verbose, uint32_t *hi, uint64_t *lo);
 extern int AskEm410xDemod(const char *Cmd, uint32_t *hi, uint64_t *lo, bool verbose);
 
 extern int usage_lf_em410x_sim(void);
diff --git a/client/cmdlffdx.c b/client/cmdlffdx.c
index c2a3a0e40..c697a59eb 100644
--- a/client/cmdlffdx.c
+++ b/client/cmdlffdx.c
@@ -31,7 +31,8 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_lf_fdx_clone(void){
+int usage_lf_fdx_clone(void)
+{
     PrintAndLogEx(NORMAL, "Clone a FDX-B animal tag to a T55x7 tag.");
     PrintAndLogEx(NORMAL, "Usage: lf fdx clone [h] <country id> <animal id> <Q5>");
     PrintAndLogEx(NORMAL, "Options:");
@@ -49,7 +50,8 @@ int usage_lf_fdx_clone(void){
     return 0;
 }
 
-int usage_lf_fdx_sim(void) {
+int usage_lf_fdx_sim(void)
+{
     PrintAndLogEx(NORMAL, "Enables simulation of FDX-B animal tag");
     PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "");
@@ -66,11 +68,12 @@ int usage_lf_fdx_sim(void) {
 
 // Ask/Biphase Demod then try to locate an ISO 11784/85 ID
 // BitStream must contain previously askrawdemod and biphasedemoded data
-int detectFDXB(uint8_t *dest, size_t *size) {
+int detectFDXB(uint8_t *dest, size_t *size)
+{
     //make sure buffer has enough data
-    if (*size < 128*2) return -1;
+    if (*size < 128 * 2) return -1;
     size_t startIdx = 0;
-    uint8_t preamble[] = {0,0,0,0,0,0,0,0,0,0,1};
+    uint8_t preamble[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1};
     if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
         return -2; //preamble not found
     if (*size != 128) return -3; //wrong demoded size
@@ -79,18 +82,20 @@ int detectFDXB(uint8_t *dest, size_t *size) {
 }
 
 // clearing the topbit needed for the preambl detection.
-static void verify_values(uint32_t countryid, uint64_t animalid){
+static void verify_values(uint32_t countryid, uint64_t animalid)
+{
     if ((animalid & 0x3FFFFFFFFF) != animalid) {
         animalid &= 0x3FFFFFFFFF;
         PrintAndLogEx(INFO, "Animal ID Truncated to 38bits: %"PRIx64, animalid);
     }
-    if ( (countryid & 0x3ff) != countryid ) {
+    if ((countryid & 0x3ff) != countryid) {
         countryid &= 0x3ff;
         PrintAndLogEx(INFO, "Country ID Truncated to 10bits: %03d", countryid);
     }
 }
 
-int getFDXBits(uint64_t national_id, uint16_t country, uint8_t isanimal, uint8_t isextended, uint32_t extended, uint8_t *bits) {
+int getFDXBits(uint64_t national_id, uint16_t country, uint8_t isanimal, uint8_t isextended, uint32_t extended, uint8_t *bits)
+{
 
     // add preamble ten 0x00 and one 0x01
     memset(bits, 0x00, 10);
@@ -114,29 +119,29 @@ int getFDXBits(uint64_t national_id, uint16_t country, uint8_t isanimal, uint8_t
     bits[81] = isextended;
 
     // add national code 40bits - OK
-    num_to_bytebitsLSBF(national_id >> 0, 8, bits+11);
-    num_to_bytebitsLSBF(national_id >> 8, 8, bits+20);
-    num_to_bytebitsLSBF(national_id >> 16, 8, bits+29);
-    num_to_bytebitsLSBF(national_id >> 24, 8, bits+38);
-    num_to_bytebitsLSBF(national_id >> 32, 6, bits+47);
+    num_to_bytebitsLSBF(national_id >> 0, 8, bits + 11);
+    num_to_bytebitsLSBF(national_id >> 8, 8, bits + 20);
+    num_to_bytebitsLSBF(national_id >> 16, 8, bits + 29);
+    num_to_bytebitsLSBF(national_id >> 24, 8, bits + 38);
+    num_to_bytebitsLSBF(national_id >> 32, 6, bits + 47);
 
     // add country code - OK
-    num_to_bytebitsLSBF(country >> 0, 2, bits+53);
-    num_to_bytebitsLSBF(country >> 2, 8, bits+56);
+    num_to_bytebitsLSBF(country >> 0, 2, bits + 53);
+    num_to_bytebitsLSBF(country >> 2, 8, bits + 56);
 
     // add crc-16 - OK
     uint8_t raw[8];
-    for (uint8_t i=0; i<8; ++i)
+    for (uint8_t i = 0; i < 8; ++i)
         raw[i] = bytebits_to_byte(bits + 11 + i * 9, 8);
 
     uint16_t crc = crc16_kermit(raw, 8);
-    num_to_bytebitsLSBF(crc >> 0, 8, bits+83);
-    num_to_bytebitsLSBF(crc >> 8, 8, bits+92);
+    num_to_bytebitsLSBF(crc >> 0, 8, bits + 83);
+    num_to_bytebitsLSBF(crc >> 8, 8, bits + 92);
 
     // extended data - OK
-    num_to_bytebitsLSBF( extended >> 0 , 8, bits+101);
-    num_to_bytebitsLSBF( extended >> 8 , 8, bits+110);
-    num_to_bytebitsLSBF( extended >> 16, 8, bits+119);
+    num_to_bytebitsLSBF(extended >> 0, 8, bits + 101);
+    num_to_bytebitsLSBF(extended >> 8, 8, bits + 110);
+    num_to_bytebitsLSBF(extended >> 16, 8, bits + 119);
     return 1;
 }
 
@@ -157,7 +162,8 @@ int getFDXBits(uint64_t national_id, uint16_t country, uint8_t isanimal, uint8_t
 
 -- sample: 985121004515220  [ 37FF65B88EF94 ]
 */
-int CmdFDXBdemodBI(const char *Cmd){
+int CmdFDXBdemodBI(const char *Cmd)
+{
 
     int clk = 32;
     int invert = 1, errCnt = 0, offset = 0, maxErr = 0;
@@ -165,20 +171,20 @@ int CmdFDXBdemodBI(const char *Cmd){
     size_t size = getFromGraphBuf(bs);
 
     errCnt = askdemod(bs, &size, &clk, &invert, maxErr, 0, 0);
-    if ( errCnt < 0 || errCnt > maxErr ) {
+    if (errCnt < 0 || errCnt > maxErr) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - FDXB no data or error found %d, clock: %d", errCnt, clk);
         return 0;
     }
 
     errCnt = BiphaseRawDecode(bs, &size, &offset, 1);
-    if (errCnt < 0 || errCnt > maxErr ) {
+    if (errCnt < 0 || errCnt > maxErr) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - FDXB BiphaseRawDecode: %d", errCnt);
         return 0;
     }
 
     int preambleIndex = detectFDXB(bs, &size);
-    if (preambleIndex < 0){
-        PrintAndLogEx(DEBUG, "DEBUG: Error - FDXB preamble not found :: %d",preambleIndex);
+    if (preambleIndex < 0) {
+        PrintAndLogEx(DEBUG, "DEBUG: Error - FDXB preamble not found :: %d", preambleIndex);
         return 0;
     }
     if (size != 128) {
@@ -190,26 +196,26 @@ int CmdFDXBdemodBI(const char *Cmd){
 
     // remove marker bits (1's every 9th digit after preamble) (pType = 2)
     size = removeParity(bs, preambleIndex + 11, 9, 2, 117);
-    if ( size != 104 ) {
+    if (size != 104) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - FDXB error removeParity:: %d", size);
         return 0;
     }
     PrintAndLogEx(SUCCESS, "\nFDX-B / ISO 11784/5 Animal Tag ID Found:");
 
     //got a good demod
-    uint64_t NationalCode = ((uint64_t)(bytebits_to_byteLSBF(bs+32, 6)) << 32) | bytebits_to_byteLSBF(bs, 32);
-    uint32_t countryCode = bytebits_to_byteLSBF(bs+38, 10);
+    uint64_t NationalCode = ((uint64_t)(bytebits_to_byteLSBF(bs + 32, 6)) << 32) | bytebits_to_byteLSBF(bs, 32);
+    uint32_t countryCode = bytebits_to_byteLSBF(bs + 38, 10);
     uint8_t dataBlockBit = bs[48];
-    uint32_t reservedCode = bytebits_to_byteLSBF(bs+49, 14);
+    uint32_t reservedCode = bytebits_to_byteLSBF(bs + 49, 14);
     uint8_t animalBit = bs[63];
-    uint32_t crc16 = bytebits_to_byteLSBF(bs+64, 16);
-    uint32_t extended = bytebits_to_byteLSBF(bs+80, 24);
+    uint32_t crc16 = bytebits_to_byteLSBF(bs + 64, 16);
+    uint32_t extended = bytebits_to_byteLSBF(bs + 80, 24);
 
-    uint64_t rawid = ((uint64_t)bytebits_to_byte(bs, 32) << 32) | bytebits_to_byte(bs+32, 32);
+    uint64_t rawid = ((uint64_t)bytebits_to_byte(bs, 32) << 32) | bytebits_to_byte(bs + 32, 32);
     uint8_t raw[8];
     num_to_bytes(rawid, 8, raw);
 
-    PrintAndLogEx(SUCCESS, "Raw ID Hex: %s", sprint_hex(raw,8));
+    PrintAndLogEx(SUCCESS, "Raw ID Hex: %s", sprint_hex(raw, 8));
 
     uint16_t calcCrc = crc16_kermit(raw, 8);
     PrintAndLogEx(SUCCESS, "Animal ID:     %04u-%012" PRIu64, countryCode, NationalCode);
@@ -224,7 +230,7 @@ int CmdFDXBdemodBI(const char *Cmd){
     if (g_debugMode) {
         PrintAndLogEx(DEBUG, "Start marker %d;   Size %d", preambleIndex, size);
         char *bin = sprint_bin_break(bs, size, 16);
-        PrintAndLogEx(DEBUG, "DEBUG BinStream:\n%s",bin);
+        PrintAndLogEx(DEBUG, "DEBUG BinStream:\n%s", bin);
     }
     return 1;
 }
@@ -232,7 +238,8 @@ int CmdFDXBdemodBI(const char *Cmd){
 
 //see ASKDemod for what args are accepted
 //almost the same demod as cmddata.c/CmdFDXBdemodBI
-int CmdFdxDemod(const char *Cmd) {
+int CmdFdxDemod(const char *Cmd)
+{
 
     //Differential Biphase / di-phase (inverted biphase)
     //get binary from ask wave
@@ -242,7 +249,7 @@ int CmdFdxDemod(const char *Cmd) {
     }
     size_t size = DemodBufferLen;
     int preambleIndex = detectFDXB(DemodBuffer, &size);
-    if (preambleIndex < 0){
+    if (preambleIndex < 0) {
 
         if (preambleIndex == -1)
             PrintAndLogEx(DEBUG, "DEBUG: Error - FDX-B too few bits found");
@@ -257,23 +264,23 @@ int CmdFdxDemod(const char *Cmd) {
 
     // set and leave DemodBuffer intact
     setDemodBuf(DemodBuffer, 128, preambleIndex);
-    setClockGrid(g_DemodClock, g_DemodStartIdx + (preambleIndex*g_DemodClock));
+    setClockGrid(g_DemodClock, g_DemodStartIdx + (preambleIndex * g_DemodClock));
     // remove marker bits (1's every 9th digit after preamble) (pType = 2)
     size = removeParity(DemodBuffer, 11, 9, 2, 117);
-    if ( size != 104 ) {
+    if (size != 104) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - FDX-B error removeParity: %d", size);
         return 0;
     }
 
     //got a good demod
-    uint64_t NationalCode = ((uint64_t)(bytebits_to_byteLSBF(DemodBuffer+32,6)) << 32) | bytebits_to_byteLSBF(DemodBuffer,32);
-    uint16_t countryCode = bytebits_to_byteLSBF(DemodBuffer+38,10);
+    uint64_t NationalCode = ((uint64_t)(bytebits_to_byteLSBF(DemodBuffer + 32, 6)) << 32) | bytebits_to_byteLSBF(DemodBuffer, 32);
+    uint16_t countryCode = bytebits_to_byteLSBF(DemodBuffer + 38, 10);
     uint8_t dataBlockBit = DemodBuffer[48];
-    uint32_t reservedCode = bytebits_to_byteLSBF(DemodBuffer+49,14);
+    uint32_t reservedCode = bytebits_to_byteLSBF(DemodBuffer + 49, 14);
     uint8_t animalBit = DemodBuffer[63];
-    uint32_t crc16 = bytebits_to_byteLSBF(DemodBuffer+64,16);
-    uint32_t extended = bytebits_to_byteLSBF(DemodBuffer+80,24);
-    uint64_t rawid = (uint64_t)(bytebits_to_byte(DemodBuffer,32)) << 32 | bytebits_to_byte(DemodBuffer+32, 32);
+    uint32_t crc16 = bytebits_to_byteLSBF(DemodBuffer + 64, 16);
+    uint32_t extended = bytebits_to_byteLSBF(DemodBuffer + 80, 24);
+    uint64_t rawid = (uint64_t)(bytebits_to_byte(DemodBuffer, 32)) << 32 | bytebits_to_byte(DemodBuffer + 32, 32);
     uint8_t raw[8];
     num_to_bytes(rawid, 8, raw);
 
@@ -301,12 +308,14 @@ int CmdFdxDemod(const char *Cmd) {
     return 1;
 }
 
-int CmdFdxRead(const char *Cmd) {
+int CmdFdxRead(const char *Cmd)
+{
     lf_read(true, 10000);
     return CmdFdxDemod(Cmd);
 }
 
-int CmdFdxClone(const char *Cmd) {
+int CmdFdxClone(const char *Cmd)
+{
 
     uint32_t countryid = 0;
     uint64_t animalid = 0;
@@ -324,7 +333,7 @@ int CmdFdxClone(const char *Cmd) {
     verify_values(countryid, animalid);
 
     // getFDXBits(uint64_t national_id, uint16_t country, uint8_t isanimal, uint8_t isextended, uint32_t extended, uint8_t *bits)
-    if ( !getFDXBits(animalid, countryid, 1, 0, 0, bs)) {
+    if (!getFDXBits(animalid, countryid, 1, 0, 0, bs)) {
         PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
         return 1;
     }
@@ -343,14 +352,14 @@ int CmdFdxClone(const char *Cmd) {
     print_blocks(blocks, 5);
 
     UsbCommand resp;
-    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
+    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}};
 
     for (int i = 4; i >= 0; --i) {
         c.arg[0] = blocks[i];
         c.arg[1] = i;
         clearCommandBuffer();
         SendCommand(&c);
-        if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)){
+        if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
             return -1;
         }
@@ -358,7 +367,8 @@ int CmdFdxClone(const char *Cmd) {
     return 0;
 }
 
-int CmdFdxSim(const char *Cmd) {
+int CmdFdxSim(const char *Cmd)
+{
     uint32_t countryid = 0;
     uint64_t animalid = 0;
 
@@ -381,7 +391,7 @@ int CmdFdxSim(const char *Cmd) {
 
     UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};
 
-     //getFDXBits(uint64_t national_id, uint16_t country, uint8_t isanimal, uint8_t isextended, uint32_t extended, uint8_t *bits)
+    //getFDXBits(uint64_t national_id, uint16_t country, uint8_t isanimal, uint8_t isextended, uint32_t extended, uint8_t *bits)
     getFDXBits(animalid, countryid, 1, 0, 0, c.d.asBytes);
     clearCommandBuffer();
     SendCommand(&c);
@@ -390,20 +400,22 @@ int CmdFdxSim(const char *Cmd) {
 
 static command_t CommandTable[] = {
     {"help",    CmdHelp,    1, "this help"},
-    {"demod",   CmdFdxDemod,1, "demodulate a FDX-B ISO11784/85 tag from the GraphBuffer"},
+    {"demod",   CmdFdxDemod, 1, "demodulate a FDX-B ISO11784/85 tag from the GraphBuffer"},
     {"read",    CmdFdxRead, 0, "attempt to read and extract tag data"},
-    {"clone",   CmdFdxClone,0, "clone animal ID tag to T55x7 (or to q5/T5555)"},
+    {"clone",   CmdFdxClone, 0, "clone animal ID tag to T55x7 (or to q5/T5555)"},
     {"sim",     CmdFdxSim,  0, "simulate Animal ID tag"},
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFFdx(const char *Cmd) {
+int CmdLFFdx(const char *Cmd)
+{
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
+int CmdHelp(const char *Cmd)
+{
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfguard.c b/client/cmdlfguard.c
index cb64ea528..aee413d42 100644
--- a/client/cmdlfguard.c
+++ b/client/cmdlfguard.c
@@ -11,7 +11,8 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_lf_guard_clone(void){
+int usage_lf_guard_clone(void)
+{
     PrintAndLogEx(NORMAL, "clone a Guardall tag to a T55x7 tag.");
     PrintAndLogEx(NORMAL, "The facility-code is 8-bit and the card number is 16-bit.  Larger values are truncated. ");
     PrintAndLogEx(NORMAL, "Currently work only on 26bit");
@@ -27,7 +28,8 @@ int usage_lf_guard_clone(void){
     return 0;
 }
 
-int usage_lf_guard_sim(void) {
+int usage_lf_guard_sim(void)
+{
     PrintAndLogEx(NORMAL, "Enables simulation of Guardall card with specified card number.");
     PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "The facility-code is 8-bit and the card number is 16-bit.  Larger values are truncated.");
@@ -45,7 +47,8 @@ int usage_lf_guard_sim(void) {
 }
 
 // Works for 26bits.
-int GetGuardBits(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint8_t *guardBits) {
+int GetGuardBits(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint8_t *guardBits)
+{
 
     uint8_t xorKey = 0x66;
     uint8_t i;
@@ -69,7 +72,7 @@ int GetGuardBits(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint8_t *guardBits) {
             uint8_t wiegand[34];
             memset(wiegand, 0x00, sizeof(wiegand));
             num_to_bytebits(fc, 8, wiegand);
-            num_to_bytebits(cn, 26, wiegand+8);
+            num_to_bytebits(cn, 26, wiegand + 8);
 
             // add wiegand parity bits (dest, source, len)
             wiegand_add_parity(pre, wiegand, 34);
@@ -86,7 +89,7 @@ int GetGuardBits(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint8_t *guardBits) {
             uint8_t wiegand[24];
             memset(wiegand, 0x00, sizeof(wiegand));
             num_to_bytebits(fc, 8, wiegand);
-            num_to_bytebits(cn, 16, wiegand+8);
+            num_to_bytebits(cn, 16, wiegand + 8);
 
             // add wiegand parity bits (dest, source, len)
             wiegand_add_parity(pre, wiegand, 24);
@@ -105,7 +108,7 @@ int GetGuardBits(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint8_t *guardBits) {
 
     // add wiegand to rawbytes
     for (i = 0; i < 4; ++i)
-        rawbytes[i+4] = bytebits_to_byte( pre + (i*8), 8);
+        rawbytes[i + 4] = bytebits_to_byte(pre + (i * 8), 8);
 
     PrintAndLogEx(DEBUG, " WIE | %s\n", sprint_hex(rawbytes, sizeof(rawbytes)));
 
@@ -118,14 +121,14 @@ int GetGuardBits(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint8_t *guardBits) {
 
     // convert rawbytes to bits in pre
     for (i = 0; i < 12; ++i)
-        num_to_bytebitsLSBF( rawbytes[i], 8, pre + (i*8));
+        num_to_bytebitsLSBF(rawbytes[i], 8, pre + (i * 8));
 
     PrintAndLogEx(DEBUG, "\n Raw | %s \n", sprint_hex(rawbytes, sizeof(rawbytes)));
-    PrintAndLogEx(DEBUG, " Raw | %s\n", sprint_bin(pre, 64) );
+    PrintAndLogEx(DEBUG, " Raw | %s\n", sprint_bin(pre, 64));
 
     // add spacer bit 0 every 4 bits, starting with index 0,
     // 12 bytes, 24 nibbles.  24+1 extra bites. 3bytes.  ie 9bytes | 1byte xorkey, 8bytes rawdata (64bits, should be enough for a 40bit wiegand)
-    addParity(pre, guardBits+6, 64, 5, 3);
+    addParity(pre, guardBits + 6, 64, 5, 3);
 
     // preamble
     guardBits[0] = 1;
@@ -135,7 +138,7 @@ int GetGuardBits(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint8_t *guardBits) {
     guardBits[4] = 1;
     guardBits[5] = 0;
 
-    PrintAndLogEx(DEBUG, " FIN | %s\n", sprint_bin(guardBits, 96) );
+    PrintAndLogEx(DEBUG, " FIN | %s\n", sprint_bin(guardBits, 96));
     return 1;
 }
 
@@ -144,22 +147,23 @@ int GetGuardBits(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint8_t *guardBits) {
 // error returns as -x
 // success returns start position in bitstream
 // Bitstream must contain previously askrawdemod and biphasedemoded data
-int detectGProxII(uint8_t *bits, size_t *size) {
+int detectGProxII(uint8_t *bits, size_t *size)
+{
 
     size_t startIdx = 0;
-    uint8_t preamble[] = {1,1,1,1,1,0};
+    uint8_t preamble[] = {1, 1, 1, 1, 1, 0};
 
     // sanity check
-    if ( *size < sizeof(preamble) ) return -1;
+    if (*size < sizeof(preamble)) return -1;
 
     if (!preambleSearch(bits, preamble, sizeof(preamble), size, &startIdx))
         return -2; //preamble not found
 
-     //gProxII should be 96 bits
+    //gProxII should be 96 bits
     if (*size != 96) return -3;
 
     //check first 6 spacer bits to verify format
-    if (!bits[startIdx+5] && !bits[startIdx+10] && !bits[startIdx+15] && !bits[startIdx+20] && !bits[startIdx+25] && !bits[startIdx+30]){
+    if (!bits[startIdx + 5] && !bits[startIdx + 10] && !bits[startIdx + 15] && !bits[startIdx + 20] && !bits[startIdx + 25] && !bits[startIdx + 30]) {
         //confirmed proper separator bits found
         //return start position
         return (int) startIdx;
@@ -172,7 +176,8 @@ int detectGProxII(uint8_t *bits, size_t *size) {
 //WARNING: if it fails during some points it will destroy the DemodBuffer data
 // but will leave the GraphBuffer intact.
 //if successful it will push askraw data back to demod buffer ready for emulation
-int CmdGuardDemod(const char *Cmd) {
+int CmdGuardDemod(const char *Cmd)
+{
 
     //Differential Biphase
     //get binary from ask wave
@@ -184,7 +189,7 @@ int CmdGuardDemod(const char *Cmd) {
     size_t size = DemodBufferLen;
 
     int preambleIndex = detectGProxII(DemodBuffer, &size);
-    if (preambleIndex < 0){
+    if (preambleIndex < 0) {
 
         if (preambleIndex == -1)
             PrintAndLogEx(DEBUG, "DEBUG: Error - gProxII too few bits found");
@@ -216,36 +221,36 @@ int CmdGuardDemod(const char *Cmd) {
     // get key and then get all 8 bytes of payload decoded
     xorKey = (uint8_t)bytebits_to_byteLSBF(bits_no_spacer, 8);
     for (size_t idx = 0; idx < 8; idx++) {
-        ByteStream[idx] = ((uint8_t)bytebits_to_byteLSBF(bits_no_spacer+8 + (idx*8),8)) ^ xorKey;
+        ByteStream[idx] = ((uint8_t)bytebits_to_byteLSBF(bits_no_spacer + 8 + (idx * 8), 8)) ^ xorKey;
         PrintAndLogEx(DEBUG, "DEBUG: gProxII byte %u after xor: %02x", (unsigned int)idx, ByteStream[idx]);
     }
 
     setDemodBuf(DemodBuffer, 96, preambleIndex);
-    setClockGrid(g_DemodClock, g_DemodStartIdx + (preambleIndex*g_DemodClock));
+    setClockGrid(g_DemodClock, g_DemodStartIdx + (preambleIndex * g_DemodClock));
 
     //ByteStream contains 8 Bytes (64 bits) of decrypted raw tag data
     uint8_t fmtLen = ByteStream[0] >> 2;
     uint32_t FC = 0;
     uint32_t Card = 0;
     //get raw 96 bits to print
-    uint32_t raw1 = bytebits_to_byte(DemodBuffer,32);
+    uint32_t raw1 = bytebits_to_byte(DemodBuffer, 32);
     uint32_t raw2 = bytebits_to_byte(DemodBuffer + 32, 32);
     uint32_t raw3 = bytebits_to_byte(DemodBuffer + 64, 32);
     bool unknown = false;
-    switch(fmtLen) {
+    switch (fmtLen) {
         case 36:
-            FC = ((ByteStream[3] & 0x7F)<<7) | (ByteStream[4]>>1);
-            Card = ((ByteStream[4]&1)<<19) | (ByteStream[5]<<11) | (ByteStream[6]<<3) | (ByteStream[7]>>5);
+            FC = ((ByteStream[3] & 0x7F) << 7) | (ByteStream[4] >> 1);
+            Card = ((ByteStream[4] & 1) << 19) | (ByteStream[5] << 11) | (ByteStream[6] << 3) | (ByteStream[7] >> 5);
             break;
         case 26:
-            FC = ((ByteStream[3] & 0x7F)<<1) | (ByteStream[4]>>7);
-            Card = ((ByteStream[4]&0x7F)<<9) | (ByteStream[5]<<1) | (ByteStream[6]>>7);
+            FC = ((ByteStream[3] & 0x7F) << 1) | (ByteStream[4] >> 7);
+            Card = ((ByteStream[4] & 0x7F) << 9) | (ByteStream[5] << 1) | (ByteStream[6] >> 7);
             break;
         default :
             unknown = true;
             break;
     }
-    if ( !unknown)
+    if (!unknown)
         PrintAndLogEx(SUCCESS, "G-Prox-II Found: Format Len: %ubit - FC: %u - Card: %u, Raw: %08x%08x%08x", fmtLen, FC, Card, raw1, raw2, raw3);
     else
         PrintAndLogEx(SUCCESS, "Unknown G-Prox-II Fmt Found: Format Len: %u, Raw: %08x%08x%08x", fmtLen, raw1, raw2, raw3);
@@ -253,12 +258,14 @@ int CmdGuardDemod(const char *Cmd) {
     return 1;
 }
 
-int CmdGuardRead(const char *Cmd) {
+int CmdGuardRead(const char *Cmd)
+{
     lf_read(true, 10000);
     return CmdGuardDemod(Cmd);
 }
 
-int CmdGuardClone(const char *Cmd) {
+int CmdGuardClone(const char *Cmd)
+{
 
     char cmdp = param_getchar(Cmd, 0);
     if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_guard_clone();
@@ -271,13 +278,13 @@ int CmdGuardClone(const char *Cmd) {
     //GuardProxII - compat mode, ASK/Biphase,  data rate 64, 3 data blocks
     uint32_t blocks[4] = {T55x7_MODULATION_BIPHASE | T55x7_BITRATE_RF_64 | 3 << T55x7_MAXBLOCK_SHIFT, 0, 0, 0};
 
-    if (sscanf(Cmd, "%u %u %u", &fmtlen, &fc, &cn ) != 3) return usage_lf_guard_clone();
+    if (sscanf(Cmd, "%u %u %u", &fmtlen, &fc, &cn) != 3) return usage_lf_guard_clone();
 
     fmtlen &= 0x7f;
     facilitycode = (fc & 0x000000FF);
     cardnumber = (cn & 0x0000FFFF);
 
-    if ( !GetGuardBits(fmtlen, facilitycode, cardnumber, bs)) {
+    if (!GetGuardBits(fmtlen, facilitycode, cardnumber, bs)) {
         PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
         return 1;
     }
@@ -294,14 +301,14 @@ int CmdGuardClone(const char *Cmd) {
     print_blocks(blocks, 4);
 
     UsbCommand resp;
-    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
+    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}};
 
-    for ( i = 0; i<4; ++i ) {
+    for (i = 0; i < 4; ++i) {
         c.arg[0] = blocks[i];
         c.arg[1] = i;
         clearCommandBuffer();
         SendCommand(&c);
-        if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)){
+        if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
             return -1;
         }
@@ -309,7 +316,8 @@ int CmdGuardClone(const char *Cmd) {
     return 0;
 }
 
-int CmdGuardSim(const char *Cmd) {
+int CmdGuardSim(const char *Cmd)
+{
 
     // Guard uses:  clk: 64, invert: 0, encoding: 2 (ASK Biphase)
     uint8_t clock = 64, encoding = 2, separator = 0, invert = 0;
@@ -318,7 +326,7 @@ int CmdGuardSim(const char *Cmd) {
     char cmdp = param_getchar(Cmd, 0);
     if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_guard_sim();
 
-    if (sscanf(Cmd, "%u %u %u", &fmtlen, &fc, &cn ) != 3) return usage_lf_guard_sim();
+    if (sscanf(Cmd, "%u %u %u", &fmtlen, &fc, &cn) != 3) return usage_lf_guard_sim();
 
     uint8_t bs[96];
     size_t size = sizeof(bs);
@@ -328,19 +336,19 @@ int CmdGuardSim(const char *Cmd) {
     facilitycode = (fc & 0x000000FF);
     cardnumber = (cn & 0x0000FFFF);
 
-    if ( !GetGuardBits(fmtlen, facilitycode, cardnumber, bs)) {
+    if (!GetGuardBits(fmtlen, facilitycode, cardnumber, bs)) {
         PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
         return 1;
     }
 
-    PrintAndLogEx(SUCCESS, "Simulating Guardall - Facility Code: %u, CardNumber: %u", facilitycode, cardnumber );
+    PrintAndLogEx(SUCCESS, "Simulating Guardall - Facility Code: %u, CardNumber: %u", facilitycode, cardnumber);
 
     uint64_t arg1, arg2;
     arg1 = (clock << 8) | encoding;
     arg2 = (invert << 8) | separator;
 
     UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};
-    memcpy(c.d.asBytes, bs, size );
+    memcpy(c.d.asBytes, bs, size);
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -355,13 +363,15 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFGuard(const char *Cmd) {
+int CmdLFGuard(const char *Cmd)
+{
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
+int CmdHelp(const char *Cmd)
+{
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c
index ea074cc31..e8eb9eb30 100644
--- a/client/cmdlfhid.c
+++ b/client/cmdlfhid.c
@@ -16,7 +16,8 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_lf_hid_read(void){
+int usage_lf_hid_read(void)
+{
     PrintAndLogEx(NORMAL, "Enables HID compatible reader mode printing details.");
     PrintAndLogEx(NORMAL, "By default, values are printed and logged until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "If the [1] option is provided, reader mode is exited after reading a single HID card.");
@@ -31,7 +32,8 @@ int usage_lf_hid_read(void){
     PrintAndLogEx(NORMAL, "       lf hid read 1");
     return 0;
 }
-int usage_lf_hid_wiegand(void){
+int usage_lf_hid_wiegand(void)
+{
     PrintAndLogEx(NORMAL, "This command converts facility code/card number to Wiegand code");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage: lf hid wiegand [h] [OEM] [FC] [CN]");
@@ -44,7 +46,8 @@ int usage_lf_hid_wiegand(void){
     PrintAndLogEx(NORMAL, "      lf hid wiegand 0 101 2001");
     return 0;
 }
-int usage_lf_hid_sim(void){
+int usage_lf_hid_sim(void)
+{
     PrintAndLogEx(NORMAL, "Enables simulation of HID card with card number.");
     PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "");
@@ -56,7 +59,8 @@ int usage_lf_hid_sim(void){
     PrintAndLogEx(NORMAL, "      lf hid sim 2006ec0c86");
     return 0;
 }
-int usage_lf_hid_clone(void){
+int usage_lf_hid_clone(void)
+{
     PrintAndLogEx(NORMAL, "Clone HID to T55x7.  Tag must be on antenna. ");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  lf hid clone [h] [ID] <L>");
@@ -69,7 +73,8 @@ int usage_lf_hid_clone(void){
     PrintAndLogEx(NORMAL, "      lf hid clone 2006ec0c86 L");
     return 0;
 }
-int usage_lf_hid_brute(void){
+int usage_lf_hid_brute(void)
+{
     PrintAndLogEx(NORMAL, "Enables bruteforce of HID readers with specified facility code.");
     PrintAndLogEx(NORMAL, "This is a attack against reader. if cardnumber is given, it starts with it and goes up / down one step");
     PrintAndLogEx(NORMAL, "if cardnumber is not given, it starts with 1 and goes up to 65535");
@@ -91,7 +96,8 @@ int usage_lf_hid_brute(void){
 }
 
 // sending three times.  Didn't seem to break the previous sim?
-static bool sendPing(void){
+static bool sendPing(void)
+{
     UsbCommand ping = {CMD_PING, {1, 2, 3}};
     SendCommand(&ping);
     SendCommand(&ping);
@@ -102,13 +108,14 @@ static bool sendPing(void){
         return false;
     return true;
 }
-static bool sendTry(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint32_t delay, uint8_t *bits, bool verbose){
+static bool sendTry(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint32_t delay, uint8_t *bits, bool verbose)
+{
 
     // this should be optional.
-    if ( verbose )
+    if (verbose)
         PrintAndLogEx(INFO, "Trying FC: %u; CN: %u", fc, cn);
 
-    calcWiegand( fmtlen, fc, cn, bits);
+    calcWiegand(fmtlen, fc, cn, bits);
 
     uint64_t arg1 = bytebits_to_byte(bits, 32);
     uint64_t arg2 = bytebits_to_byte(bits + 32, 32);
@@ -124,9 +131,10 @@ static bool sendTry(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint32_t delay, ui
 //by marshmellow (based on existing demod + holiman's refactor)
 //HID Prox demod - FSK RF/50 with preamble of 00011101 (then manchester encoded)
 //print full HID Prox ID and some bit format details if found
-int CmdHIDDemod(const char *Cmd) {
+int CmdHIDDemod(const char *Cmd)
+{
     //raw fsk demod no manchester decoding no start bit finding just get binary from wave
-    uint32_t hi2=0, hi=0, lo=0;
+    uint32_t hi2 = 0, hi = 0, lo = 0;
 
     uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
     size_t size = getFromGraphBuf(bits);
@@ -156,61 +164,60 @@ int CmdHIDDemod(const char *Cmd) {
     }
 
     setDemodBuf(bits, size, idx);
-    setClockGrid(50, waveIdx + (idx*50));
+    setClockGrid(50, waveIdx + (idx * 50));
 
-    if (hi2==0 && hi==0 && lo==0) {
+    if (hi2 == 0 && hi == 0 && lo == 0) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - HID no values found");
         return 0;
     }
 
-    if (hi2 != 0){ //extra large HID tags
-        PrintAndLogEx(SUCCESS, "HID Prox TAG ID: %x%08x%08x (%u)", hi2, hi, lo, (lo>>1) & 0xFFFF);
+    if (hi2 != 0) { //extra large HID tags
+        PrintAndLogEx(SUCCESS, "HID Prox TAG ID: %x%08x%08x (%u)", hi2, hi, lo, (lo >> 1) & 0xFFFF);
     } else {  //standard HID tags <38 bits
         uint8_t fmtLen = 0;
         uint32_t cc = 0;
         uint32_t fc = 0;
         uint32_t cardnum = 0;
-        if ((( hi >> 5) & 1) == 1){//if bit 38 is set then < 37 bit format is used
-            uint32_t lo2=0;
-            lo2=(((hi & 31) << 12) | (lo >> 20)); //get bits 21-37 to check for format len bit
+        if (((hi >> 5) & 1) == 1) {//if bit 38 is set then < 37 bit format is used
+            uint32_t lo2 = 0;
+            lo2 = (((hi & 31) << 12) | (lo >> 20)); //get bits 21-37 to check for format len bit
             uint8_t idx3 = 1;
-            while ( lo2 > 1){ //find last bit set to 1 (format len bit)
+            while (lo2 > 1) { //find last bit set to 1 (format len bit)
                 lo2 >>= 1;
                 idx3++;
             }
             fmtLen = idx3 + 19;
             fc = 0;
             cardnum = 0;
-            if(fmtLen==26){
+            if (fmtLen == 26) {
                 cardnum = (lo >> 1) & 0xFFFF;
-                fc = ( lo >> 17) & 0xFF;
+                fc = (lo >> 17) & 0xFF;
             }
-            if(fmtLen==32 && (lo & 0x40000000)){//if 32 bit and Kastle bit set
+            if (fmtLen == 32 && (lo & 0x40000000)) { //if 32 bit and Kastle bit set
                 cardnum = (lo >> 1) & 0xFFFF;
                 fc = (lo >> 17) & 0xFF;
                 cc = (lo >> 25) & 0x1F;
             }
-            if(fmtLen==34){
+            if (fmtLen == 34) {
                 cardnum = (lo >> 1) & 0xFFFF;
-                fc= ((hi & 1)<< 15) | (lo >> 17);
+                fc = ((hi & 1) << 15) | (lo >> 17);
             }
-            if(fmtLen==35){
+            if (fmtLen == 35) {
                 cardnum = (lo >> 1) & 0xFFFFF;
-                fc = ((hi & 1) << 11 ) | (lo >> 21);
+                fc = ((hi & 1) << 11) | (lo >> 21);
             }
-        }
-        else { //if bit 38 is not set then 37 bit format is used
+        } else { //if bit 38 is not set then 37 bit format is used
             fmtLen = 37;
             fc = 0;
             cardnum = 0;
-            if(fmtLen == 37){
-                cardnum = (lo >> 1 ) & 0x7FFFF;
+            if (fmtLen == 37) {
+                cardnum = (lo >> 1) & 0x7FFFF;
                 fc = ((hi & 0xF) << 12) | (lo >> 20);
             }
         }
-        if(fmtLen==32 && (lo & 0x40000000)){//if 32 bit and Kastle bit set
+        if (fmtLen == 32 && (lo & 0x40000000)) { //if 32 bit and Kastle bit set
             PrintAndLogEx(SUCCESS, "HID Prox TAG (Kastle format) ID: %08x (%u) - Format Len: 32bit - CC: %u - FC: %u - Card: %u", lo, (lo >> 1) & 0xFFFF, cc, fc, cardnum);
-        }else{
+        } else {
             PrintAndLogEx(SUCCESS, "HID Prox TAG ID: %x%08x (%u) - Format Len: %ubit - FC: %u - Card: %u", hi, lo, (lo >> 1) & 0xFFFF, fmtLen, fc, cardnum);
         }
     }
@@ -223,31 +230,34 @@ int CmdHIDDemod(const char *Cmd) {
 }
 
 // this read is the "normal" read,  which download lf signal and tries to demod here.
-int CmdHIDRead(const char *Cmd) {
+int CmdHIDRead(const char *Cmd)
+{
     lf_read(true, 12000);
     return CmdHIDDemod(Cmd);
 }
 
 // this read loops on device side.
 // uses the demod in lfops.c
-int CmdHIDRead_device(const char *Cmd) {
+int CmdHIDRead_device(const char *Cmd)
+{
 
     if (Cmd[0] == 'h' || Cmd[0] == 'H') return usage_lf_hid_read();
-    uint8_t findone = ( Cmd[0] == '1' ) ? 1 : 0;
-    UsbCommand c = {CMD_HID_DEMOD_FSK, {findone, 0 , 0}};
+    uint8_t findone = (Cmd[0] == '1') ? 1 : 0;
+    UsbCommand c = {CMD_HID_DEMOD_FSK, {findone, 0, 0}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
 }
 
-int CmdHIDSim(const char *Cmd) {
+int CmdHIDSim(const char *Cmd)
+{
     uint32_t hi = 0, lo = 0;
     uint32_t n = 0, i = 0;
 
     uint8_t ctmp = tolower(param_getchar(Cmd, 0));
-    if ( strlen(Cmd) == 0 || ctmp == 'h' ) return usage_lf_hid_sim();
+    if (strlen(Cmd) == 0 || ctmp == 'h') return usage_lf_hid_sim();
 
-    while (sscanf(&Cmd[i++], "%1x", &n ) == 1) {
+    while (sscanf(&Cmd[i++], "%1x", &n) == 1) {
         hi = (hi << 4) | (lo >> 28);
         lo = (lo << 4) | (n & 0xf);
     }
@@ -261,17 +271,18 @@ int CmdHIDSim(const char *Cmd) {
     return 0;
 }
 
-int CmdHIDClone(const char *Cmd) {
+int CmdHIDClone(const char *Cmd)
+{
 
     uint32_t hi2 = 0, hi = 0, lo = 0;
     uint32_t n = 0, i = 0;
     UsbCommand c = {CMD_HID_CLONE_TAG};
 
     uint8_t ctmp = param_getchar(Cmd, 0);
-    if ( strlen(Cmd) == 0 || ctmp == 'H' || ctmp == 'h' ) return usage_lf_hid_clone();
+    if (strlen(Cmd) == 0 || ctmp == 'H' || ctmp == 'h') return usage_lf_hid_clone();
 
-    if (strchr(Cmd,'l') != 0) {
-        while (sscanf(&Cmd[i++], "%1x", &n ) == 1) {
+    if (strchr(Cmd, 'l') != 0) {
+        while (sscanf(&Cmd[i++], "%1x", &n) == 1) {
             hi2 = (hi2 << 4) | (hi >> 28);
             hi = (hi << 4) | (lo >> 28);
             lo = (lo << 4) | (n & 0xf);
@@ -281,7 +292,7 @@ int CmdHIDClone(const char *Cmd) {
 
         c.d.asBytes[0] = 1;
     } else {
-        while (sscanf(&Cmd[i++], "%1x", &n ) == 1) {
+        while (sscanf(&Cmd[i++], "%1x", &n) == 1) {
             hi = (hi << 4) | (lo >> 28);
             lo = (lo << 4) | (n & 0xf);
         }
@@ -304,97 +315,102 @@ typedef struct {
     uint8_t  SiteCode;
     uint8_t  FacilityCode;
     uint8_t  CardNumber;
-    uint8_t* Wiegand;
+    uint8_t *Wiegand;
     size_t   Wiegand_n;
- } wiegand_t;
+} wiegand_t;
 
-static void addHIDMarker(uint8_t fmtlen, uint8_t *out) {
+static void addHIDMarker(uint8_t fmtlen, uint8_t *out)
+{
     // temp array
     uint8_t arr[BITS];
     memset(arr, 0, BITS);
 
     // copy inpu
-    uint8_t pos = sizeof(arr)-fmtlen;
-    memcpy(arr+pos, out, fmtlen);
+    uint8_t pos = sizeof(arr) - fmtlen;
+    memcpy(arr + pos, out, fmtlen);
 
-    switch(fmtlen) {
-        case 26:{
+    switch (fmtlen) {
+        case 26: {
             // start sentinel, BITS-bit 27 = 1
-            arr[BITS-27] = 1;
+            arr[BITS - 27] = 1;
             // fmt smaller than 37 used,  bit37 = 1
-            arr[BITS-38]  = 1;
+            arr[BITS - 38]  = 1;
             memcpy(out, arr, BITS);
             break;
         }
         case 34:
             // start sentinel, BITS-bit 27 = 1
-            arr[BITS-35] = 1;
+            arr[BITS - 35] = 1;
 
             // fmt smaller than 37 used,  bit37 = 1
-            arr[BITS-38]  = 1;
+            arr[BITS - 38]  = 1;
             memcpy(out, arr, BITS);
             break;
-        default:break;
+        default:
+            break;
     }
 }
 
 // static void getParity34(uint32_t *hi, uint32_t *lo){
-    // uint32_t result = 0;
-    // int i;
+// uint32_t result = 0;
+// int i;
 
-    // // even parity
-    // for (i = 7;i >= 0;i--)
-        // result ^= (*hi >> i) & i;
-    // for (i = 31;i >= 24;i--)
-        // result ^= (*lo >> i) & 1;
+// // even parity
+// for (i = 7;i >= 0;i--)
+// result ^= (*hi >> i) & i;
+// for (i = 31;i >= 24;i--)
+// result ^= (*lo >> i) & 1;
 
-    // *hi |= result << 2;
+// *hi |= result << 2;
 
-    // // odd parity bit
-    // result = 0;
-    // for (i = 23;i >= 1;i--)
-        // result ^= (*lo >> i) & 1;
+// // odd parity bit
+// result = 0;
+// for (i = 23;i >= 1;i--)
+// result ^= (*lo >> i) & 1;
 
-    // *lo |= !result;
+// *lo |= !result;
 // }
 // static void getParity37H(uint32_t *hi, uint32_t *lo){
-    // uint32_t result = 0;
-    // int i;
+// uint32_t result = 0;
+// int i;
 
-    // // even parity
-    // for (i = 4;i >= 0;i--)
-        // result ^= (*hi >> i) & 1;
-    // for (i = 31;i >= 20;i--)
-        // result ^= (*lo >> i) & 1;
-    // *hi |= result << 4;
+// // even parity
+// for (i = 4;i >= 0;i--)
+// result ^= (*hi >> i) & 1;
+// for (i = 31;i >= 20;i--)
+// result ^= (*lo >> i) & 1;
+// *hi |= result << 4;
 
-    // // odd parity
-    // result = 0;
-    // for (i = 19;i >= 1;i--)
-        // result ^= (*lo >> i) & 1;
-    // *lo |= result;
+// // odd parity
+// result = 0;
+// for (i = 19;i >= 1;i--)
+// result ^= (*lo >> i) & 1;
+// *lo |= result;
 // }
 
 //static void calc26(uint16_t fc, uint32_t cardno,  uint8_t *out){
-static void calc26(uint16_t fc, uint32_t cardno, uint8_t *out){
+static void calc26(uint16_t fc, uint32_t cardno, uint8_t *out)
+{
     uint8_t wiegand[24];
     num_to_bytebits(fc, 8, wiegand);
-    num_to_bytebits(cardno, 16, wiegand+8);
-    wiegand_add_parity(out,  wiegand, sizeof(wiegand) );
+    num_to_bytebits(cardno, 16, wiegand + 8);
+    wiegand_add_parity(out,  wiegand, sizeof(wiegand));
 }
 // static void calc33(uint16_t fc, uint32_t cardno,  uint8_t *out){
 // }
-static void calc34(uint16_t fc, uint32_t cardno, uint8_t *out){
+static void calc34(uint16_t fc, uint32_t cardno, uint8_t *out)
+{
     uint8_t wiegand[32];
     num_to_bytebits(fc, 16, wiegand);
     num_to_bytebits(cardno, 16, wiegand + 16);
-    wiegand_add_parity(out,  wiegand, sizeof(wiegand) );
+    wiegand_add_parity(out,  wiegand, sizeof(wiegand));
 }
 // static void calc35(uint16_t fc, uint32_t cardno,  uint8_t *out){
-    // *lo = ((cardno & 0xFFFFF) << 1) | fc << 21;
-    // *hi = (1 << 5) | ((fc >> 11) & 1);
+// *lo = ((cardno & 0xFFFFF) << 1) | fc << 21;
+// *hi = (1 << 5) | ((fc >> 11) & 1);
 // }
-static void calc37S(uint16_t fc, uint32_t cardno, uint8_t *out){
+static void calc37S(uint16_t fc, uint32_t cardno, uint8_t *out)
+{
     // FC 2 - 17   - 16 bit
     // cardno 18 - 36  - 19 bit
     // Even P1   1 - 19
@@ -402,43 +418,55 @@ static void calc37S(uint16_t fc, uint32_t cardno, uint8_t *out){
     uint8_t wiegand[35];
     num_to_bytebits(fc, 16, wiegand);
     num_to_bytebits(cardno, 19, wiegand + 16);
-    wiegand_add_parity(out,  wiegand, sizeof(wiegand) );
+    wiegand_add_parity(out,  wiegand, sizeof(wiegand));
 }
-static void calc37H(uint64_t cardno, uint8_t *out){
+static void calc37H(uint64_t cardno, uint8_t *out)
+{
     // SC NONE
     // cardno 1-35 34 bits
     // Even Parity  0th bit  1-18
     // Odd  Parity 36th bit 19-35
     uint8_t wiegand[37];
-    num_to_bytebits( (uint32_t)(cardno >> 32), 2, wiegand);
-    num_to_bytebits( (uint32_t)(cardno >> 0), 32, wiegand + 2);
-    wiegand_add_parity(out,  wiegand, sizeof(wiegand) );
+    num_to_bytebits((uint32_t)(cardno >> 32), 2, wiegand);
+    num_to_bytebits((uint32_t)(cardno >> 0), 32, wiegand + 2);
+    wiegand_add_parity(out,  wiegand, sizeof(wiegand));
 
-    PrintAndLogEx(NORMAL, "%x %x\n", (uint32_t)(cardno >> 32), (uint32_t)cardno );
+    PrintAndLogEx(NORMAL, "%x %x\n", (uint32_t)(cardno >> 32), (uint32_t)cardno);
 }
 // static void calc40(uint64_t cardno,  uint8_t *out){
-    // cardno = (cardno & 0xFFFFFFFFFF);
-    // *lo = ((cardno & 0xFFFFFFFF) << 1 );
-    // *hi = (cardno >> 31);
+// cardno = (cardno & 0xFFFFFFFFFF);
+// *lo = ((cardno & 0xFFFFFFFF) << 1 );
+// *hi = (cardno >> 31);
 // }
 
-void calcWiegand(uint8_t fmtlen, uint16_t fc, uint64_t cardno, uint8_t *bits){
-     uint32_t cn32 = (cardno & 0xFFFFFFFF);
-     switch ( fmtlen ) {
-        case 26: calc26(fc, cn32, bits); break;
+void calcWiegand(uint8_t fmtlen, uint16_t fc, uint64_t cardno, uint8_t *bits)
+{
+    uint32_t cn32 = (cardno & 0xFFFFFFFF);
+    switch (fmtlen) {
+        case 26:
+            calc26(fc, cn32, bits);
+            break;
         // case 33 : calc33(fc, cn32, bits); break;
-        case 34: calc34(fc, cn32, bits); break;
+        case 34:
+            calc34(fc, cn32, bits);
+            break;
         // case 35 : calc35(fc, cn32, bits); break;
-        case 37: calc37S(fc, cn32, bits); break;
-        case 38: calc37H(cardno, bits); break;
+        case 37:
+            calc37S(fc, cn32, bits);
+            break;
+        case 38:
+            calc37H(cardno, bits);
+            break;
         // case 40 : calc40(cardno, bits); break;
         // case 44 : { break; }
         // case 84 : { break; }
-        default: break;
+        default:
+            break;
     }
 }
 
-int CmdHIDWiegand(const char *Cmd) {
+int CmdHIDWiegand(const char *Cmd)
+{
     uint32_t oem = 0, fc = 0;
     uint64_t cardnum = 0;
     uint64_t blocks = 0, wiegand = 0;
@@ -448,42 +476,43 @@ int CmdHIDWiegand(const char *Cmd) {
     memset(bs, 0, sizeof(bits));
 
     uint8_t ctmp = param_getchar(Cmd, 0);
-    if ( strlen(Cmd) == 0 || strlen(Cmd) < 3 || ctmp == 'H' || ctmp == 'h' ) return usage_lf_hid_wiegand();
+    if (strlen(Cmd) == 0 || strlen(Cmd) < 3 || ctmp == 'H' || ctmp == 'h') return usage_lf_hid_wiegand();
 
     oem = param_get8(Cmd, 0);
     fc = param_get32ex(Cmd, 1, 0, 10);
     cardnum = param_get64ex(Cmd, 2, 0, 10);
 
-    uint8_t fmtlen[] = {26,33,34,35,37,38,40};
+    uint8_t fmtlen[] = {26, 33, 34, 35, 37, 38, 40};
 
     PrintAndLogEx(NORMAL, "HID | OEM | FC   | CN      |  Wiegand  |  HID Formatted");
     PrintAndLogEx(NORMAL, "----+-----+------+---------+-----------+--------------------");
-    for (uint8_t i = 0; i < sizeof(fmtlen); i++){
+    for (uint8_t i = 0; i < sizeof(fmtlen); i++) {
         memset(bits, 0x00, sizeof(bits));
-        calcWiegand( fmtlen[i], fc, cardnum, bs);
+        calcWiegand(fmtlen[i], fc, cardnum, bs);
         PrintAndLogEx(NORMAL, "ice:: %s \n", sprint_bin(bs, fmtlen[i]));
-        wiegand = (uint64_t)bytebits_to_byte(bs, 32) << 32 | bytebits_to_byte(bs+32, 32);
+        wiegand = (uint64_t)bytebits_to_byte(bs, 32) << 32 | bytebits_to_byte(bs + 32, 32);
 
         addHIDMarker(fmtlen[i], bs);
         PrintAndLogEx(NORMAL, "ice:: %s\n", sprint_bin(bs, BITS));
-        blocks = (uint64_t)bytebits_to_byte(bs+32, 32) << 32 | bytebits_to_byte(bs+64, 32);
-        uint8_t shifts = 64-fmtlen[i];
+        blocks = (uint64_t)bytebits_to_byte(bs + 32, 32) << 32 | bytebits_to_byte(bs + 64, 32);
+        uint8_t shifts = 64 - fmtlen[i];
         wiegand >>= shifts;
 
-        PrintAndLogEx(NORMAL, " %u | %03u | %03u  | %" PRIu64 "  | %" PRIX64 "  |  %" PRIX64 ,
-            fmtlen[i],
-            oem,
-            fc,
-            cardnum,
-            wiegand,
-            blocks
-            );
+        PrintAndLogEx(NORMAL, " %u | %03u | %03u  | %" PRIu64 "  | %" PRIX64 "  |  %" PRIX64,
+                      fmtlen[i],
+                      oem,
+                      fc,
+                      cardnum,
+                      wiegand,
+                      blocks
+                     );
     }
     PrintAndLogEx(NORMAL, "----+-----+-----+-------+-----------+--------------------");
     return 0;
 }
 
-int CmdHIDBrute(const char *Cmd){
+int CmdHIDBrute(const char *Cmd)
+{
 
     bool errors = false, verbose = false;
     uint32_t fc = 0, cn = 0, delay = 1000;
@@ -494,50 +523,50 @@ int CmdHIDBrute(const char *Cmd){
 
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
-        case 'h':
-            return usage_lf_hid_brute();
-        case 'f':
-            fc =  param_get32ex(Cmd ,cmdp+1, 0, 10);
-            if ( !fc )
-                errors = true;
-            cmdp += 2;
-            break;
-        case 'd':
-            // delay between attemps,  defaults to 1000ms.
-            delay = param_get32ex(Cmd, cmdp+1, 1000, 10);
-            cmdp += 2;
-            break;
-        case 'c':
-            cn = param_get32ex(Cmd, cmdp+1, 0, 10);
-            // truncate cardnumber.
-            cn &= 0xFFFF;
-            cmdp += 2;
-            break;
-        case 'a':
-            fmtlen = param_get8(Cmd, cmdp+1);
-            cmdp += 2;
-            bool is_ftm_ok = false;
-            uint8_t ftms[] = {26, 33, 34, 35, 37};
-            for ( uint8_t i = 0; i < sizeof(ftms); i++){
-                if ( ftms[i] == fmtlen ) {
-                    is_ftm_ok = true;
+            case 'h':
+                return usage_lf_hid_brute();
+            case 'f':
+                fc =  param_get32ex(Cmd, cmdp + 1, 0, 10);
+                if (!fc)
+                    errors = true;
+                cmdp += 2;
+                break;
+            case 'd':
+                // delay between attemps,  defaults to 1000ms.
+                delay = param_get32ex(Cmd, cmdp + 1, 1000, 10);
+                cmdp += 2;
+                break;
+            case 'c':
+                cn = param_get32ex(Cmd, cmdp + 1, 0, 10);
+                // truncate cardnumber.
+                cn &= 0xFFFF;
+                cmdp += 2;
+                break;
+            case 'a':
+                fmtlen = param_get8(Cmd, cmdp + 1);
+                cmdp += 2;
+                bool is_ftm_ok = false;
+                uint8_t ftms[] = {26, 33, 34, 35, 37};
+                for (uint8_t i = 0; i < sizeof(ftms); i++) {
+                    if (ftms[i] == fmtlen) {
+                        is_ftm_ok = true;
+                    }
                 }
-            }
-            // negated
-            errors = !is_ftm_ok;
-            break;
-        case 'v':
-            verbose = true;
-            cmdp++;
-            break;
-        default:
-            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-            errors = true;
-            break;
+                // negated
+                errors = !is_ftm_ok;
+                break;
+            case 'v':
+                verbose = true;
+                cmdp++;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                errors = true;
+                break;
         }
     }
-    if ( fc == 0 ) errors = true;
-    if ( errors ) return usage_lf_hid_brute();
+    if (fc == 0) errors = true;
+    if (errors) return usage_lf_hid_brute();
 
     PrintAndLogEx(INFO, "Brute-forcing HID reader");
     PrintAndLogEx(INFO, "Press pm3-button to abort simulation or run another command");
@@ -546,27 +575,28 @@ int CmdHIDBrute(const char *Cmd){
     uint16_t down = cn;
 
     // main loop
-    for (;;){
+    for (;;) {
 
-        if ( IsOffline() ) {
+        if (IsOffline()) {
             PrintAndLogEx(WARNING, "Device offline\n");
             return  2;
         }
 
         if (ukbhit()) {
-            int gc = getchar(); (void)gc;
+            int gc = getchar();
+            (void)gc;
             PrintAndLogEx(INFO, "aborted via keyboard!");
             return sendPing();
         }
 
         // Do one up
-        if ( up < 0xFFFF )
-            if ( !sendTry(fmtlen, fc, up++, delay, bits, verbose)) return 1;
+        if (up < 0xFFFF)
+            if (!sendTry(fmtlen, fc, up++, delay, bits, verbose)) return 1;
 
         // Do one down  (if cardnumber is given)
-        if ( cn > 1 )
-            if ( down > 1 )
-                if ( !sendTry(fmtlen, fc, --down, delay, bits, verbose)) return 1;
+        if (cn > 1)
+            if (down > 1)
+                if (!sendTry(fmtlen, fc, --down, delay, bits, verbose)) return 1;
     }
     return 0;
 }
@@ -582,13 +612,15 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFHID(const char *Cmd) {
+int CmdLFHID(const char *Cmd)
+{
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
+int CmdHelp(const char *Cmd)
+{
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index 6d355fc58..f844c4f95 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -25,20 +25,22 @@
 
 static int CmdHelp(const char *Cmd);
 
-size_t nbytes(size_t nbits) {
-    return (nbits/8) + ((nbits%8) > 0);
+size_t nbytes(size_t nbits)
+{
+    return (nbits / 8) + ((nbits % 8) > 0);
 }
 
-int CmdLFHitagList(const char *Cmd) {
+int CmdLFHitagList(const char *Cmd)
+{
     uint8_t *got = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
-    if ( !got ) {
+    if (!got) {
         PrintAndLogEx(WARNING, "Cannot allocate memory for trace");
         return 2;
     }
 
     // Query for the actual size of the trace
     UsbCommand response;
-    if ( !GetFromDevice(BIG_BUF, got, USB_CMD_DATA_SIZE, 0, &response, 2500, false) ) {
+    if (!GetFromDevice(BIG_BUF, got, USB_CMD_DATA_SIZE, 0, &response, 2500, false)) {
         PrintAndLogEx(WARNING, "command execution time out");
         free(got);
         return 2;
@@ -53,7 +55,7 @@ int CmdLFHitagList(const char *Cmd) {
             return 2;
         }
         got = p;
-        if ( !GetFromDevice(BIG_BUF, got, traceLen, 0, NULL, 2500, false) ) {
+        if (!GetFromDevice(BIG_BUF, got, traceLen, 0, NULL, 2500, false)) {
             PrintAndLogEx(WARNING, "command execution time out");
             free(got);
             return 2;
@@ -69,26 +71,26 @@ int CmdLFHitagList(const char *Cmd) {
     int len = strlen(Cmd);
 
     char filename[FILE_PATH_SIZE]  = { 0x00 };
-    FILE* f = NULL;
+    FILE *f = NULL;
 
     if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
 
     memcpy(filename, Cmd, len);
 
     if (strlen(filename) > 0) {
-        f = fopen(filename,"wb");
+        f = fopen(filename, "wb");
         if (!f) {
-            PrintAndLogEx(WARNING, "Error: Could not open file [%s]",filename);
+            PrintAndLogEx(WARNING, "Error: Could not open file [%s]", filename);
             return 1;
         }
     }
 
     for (;;) {
 
-        if(i >= traceLen) { break; }
+        if (i >= traceLen) { break; }
 
         bool isResponse;
-        int timestamp = *((uint32_t *)(got+i));
+        int timestamp = *((uint32_t *)(got + i));
         if (timestamp & 0x80000000) {
             timestamp &= 0x7fffffff;
             isResponse = 1;
@@ -96,7 +98,7 @@ int CmdLFHitagList(const char *Cmd) {
             isResponse = 0;
         }
 
-        int parityBits = *((uint32_t *)(got+i+4));
+        int parityBits = *((uint32_t *)(got + i + 4));
         // 4 bytes of additional information...
         // maximum of 32 additional parity bit information
         //
@@ -104,15 +106,15 @@ int CmdLFHitagList(const char *Cmd) {
         // at each quarter bit period we can send power level (16 levels)
         // or each half bit period in 256 levels.
 
-        int bits = got[i+8];
-        int len = nbytes(got[i+8]);
+        int bits = got[i + 8];
+        int len = nbytes(got[i + 8]);
 
         if (len > 100) {
-          break;
+            break;
         }
         if (i + len > traceLen) { break;}
 
-        uint8_t *frame = (got+i+9);
+        uint8_t *frame = (got + i + 9);
 
         // Break and stick with current result if buffer was not completely full
         if (frame[0] == 0x44 && frame[1] == 0x44 && frame[3] == 0x44) { break; }
@@ -121,27 +123,26 @@ int CmdLFHitagList(const char *Cmd) {
         int j;
         for (j = 0; j < len; j++) {
 
-          //if((parityBits >> (len - j - 1)) & 0x01) {
-          if (isResponse && (oddparity8(frame[j]) != ((parityBits >> (len - j - 1)) & 0x01))) {
-            sprintf(line+(j*4), "%02x!  ", frame[j]);
-          }
-          else {
-            sprintf(line+(j*4), "%02x   ", frame[j]);
-          }
+            //if((parityBits >> (len - j - 1)) & 0x01) {
+            if (isResponse && (oddparity8(frame[j]) != ((parityBits >> (len - j - 1)) & 0x01))) {
+                sprintf(line + (j * 4), "%02x!  ", frame[j]);
+            } else {
+                sprintf(line + (j * 4), "%02x   ", frame[j]);
+            }
         }
 
         PrintAndLogEx(NORMAL, " +%7d:  %3d: %s %s",
-            (prev < 0 ? 0 : (timestamp - prev)),
-            bits,
-            (isResponse ? "TAG" : "   "),
-            line);
+                      (prev < 0 ? 0 : (timestamp - prev)),
+                      bits,
+                      (isResponse ? "TAG" : "   "),
+                      line);
 
         if (f) {
-            fprintf(f," +%7d:  %3d: %s %s\n",
-                (prev < 0 ? 0 : (timestamp - prev)),
-                bits,
-                (isResponse ? "TAG" : "   "),
-                line);
+            fprintf(f, " +%7d:  %3d: %s %s\n",
+                    (prev < 0 ? 0 : (timestamp - prev)),
+                    bits,
+                    (isResponse ? "TAG" : "   "),
+                    line);
         }
 
         prev = timestamp;
@@ -157,18 +158,20 @@ int CmdLFHitagList(const char *Cmd) {
     return 0;
 }
 
-int CmdLFHitagSnoop(const char *Cmd) {
+int CmdLFHitagSnoop(const char *Cmd)
+{
     UsbCommand c = {CMD_SNOOP_HITAG};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
 }
 
-int CmdLFHitagSim(const char *Cmd) {
+int CmdLFHitagSim(const char *Cmd)
+{
 
     UsbCommand c = {CMD_SIMULATE_HITAG};
     char filename[FILE_PATH_SIZE] = { 0x00 };
-    FILE* f;
+    FILE *f;
     bool tag_mem_supplied;
 
     int len = strlen(Cmd);
@@ -176,14 +179,14 @@ int CmdLFHitagSim(const char *Cmd) {
     memcpy(filename, Cmd, len);
 
     if (strlen(filename) > 0) {
-        f = fopen(filename,"rb+");
+        f = fopen(filename, "rb+");
         if (!f) {
-            PrintAndLogEx(WARNING, "Error: Could not open file [%s]",filename);
+            PrintAndLogEx(WARNING, "Error: Could not open file [%s]", filename);
             return 1;
         }
         tag_mem_supplied = true;
         size_t bytes_read = fread(c.d.asBytes, 1, 48, f);
-        if ( bytes_read == 48) {
+        if (bytes_read == 48) {
             PrintAndLogEx(WARNING, "Error: File reading error");
             fclose(f);
             return 1;
@@ -200,32 +203,38 @@ int CmdLFHitagSim(const char *Cmd) {
     return 0;
 }
 
-int CmdLFHitagReader(const char *Cmd) {
+int CmdLFHitagReader(const char *Cmd)
+{
 
-    UsbCommand c = {CMD_READER_HITAG, {0,0,0} };//, {param_get32ex(Cmd,0,0,10),param_get32ex(Cmd,1,0,16),param_get32ex(Cmd,2,0,16),param_get32ex(Cmd,3,0,16)}};
-    hitag_data* htd = (hitag_data*)c.d.asBytes;
+    UsbCommand c = {CMD_READER_HITAG, {0, 0, 0} }; //, {param_get32ex(Cmd,0,0,10),param_get32ex(Cmd,1,0,16),param_get32ex(Cmd,2,0,16),param_get32ex(Cmd,3,0,16)}};
+    hitag_data *htd = (hitag_data *)c.d.asBytes;
     hitag_function htf = param_get32ex(Cmd, 0, 0, 10);
 
     switch (htf) {
         case 01: { //RHTSF_CHALLENGE
             c.cmd = CMD_READ_HITAG_S;
             num_to_bytes(param_get32ex(Cmd, 1, 0, 16), 4, htd->auth.NrAr);
-            num_to_bytes(param_get32ex(Cmd, 2, 0, 16), 4, htd->auth.NrAr+4);
-        } break;
+            num_to_bytes(param_get32ex(Cmd, 2, 0, 16), 4, htd->auth.NrAr + 4);
+        }
+        break;
         case 02: { //RHTSF_KEY
             c.cmd = CMD_READ_HITAG_S;
             num_to_bytes(param_get64ex(Cmd, 1, 0, 16), 6, htd->crypto.key);
-        } break;
+        }
+        break;
         case RHT2F_PASSWORD: {
             num_to_bytes(param_get32ex(Cmd, 1, 0, 16), 4, htd->pwd.password);
-        } break;
+        }
+        break;
         case RHT2F_AUTHENTICATE: {
             num_to_bytes(param_get32ex(Cmd, 1, 0, 16), 4, htd->auth.NrAr);
-            num_to_bytes(param_get32ex(Cmd, 2, 0, 16), 4, htd->auth.NrAr+4);
-        } break;
+            num_to_bytes(param_get32ex(Cmd, 2, 0, 16), 4, htd->auth.NrAr + 4);
+        }
+        break;
         case RHT2F_CRYPTO: {
             num_to_bytes(param_get64ex(Cmd, 1, 0, 16), 6, htd->crypto.key);
-        } break;
+        }
+        break;
         case RHT2F_TEST_AUTH_ATTEMPTS: {
             // No additional parameters needed
         } break;
@@ -248,7 +257,8 @@ int CmdLFHitagReader(const char *Cmd) {
             PrintAndLogEx(NORMAL, "  25 (test recorded authentications)");
             PrintAndLogEx(NORMAL, "  26 just read UID");
             return 1;
-        } break;
+        }
+        break;
     }
 
     // Copy the hitag2 function into the first argument
@@ -256,7 +266,7 @@ int CmdLFHitagReader(const char *Cmd) {
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
-    if ( !WaitForResponseTimeout(CMD_ACK, &resp, 4000) ) {
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 4000)) {
         PrintAndLogEx(WARNING, "timeout while waiting for reply.");
         return 1;
     }
@@ -269,11 +279,11 @@ int CmdLFHitagReader(const char *Cmd) {
 
     uint32_t id = bytes_to_num(resp.d.asBytes, 4);
 
-    if (htf == RHT2F_UID_ONLY){
+    if (htf == RHT2F_UID_ONLY) {
         PrintAndLogEx(NORMAL, "Valid Hitag2 tag found - UID: %08x", id);
     } else {
         char filename[FILE_PATH_SIZE];
-        FILE* f = NULL;
+        FILE *f = NULL;
         sprintf(filename, "%08x_%04x.ht2", id, (rand() & 0xffff));
         f = fopen(filename, "wb");
         if (!f) {
@@ -289,10 +299,11 @@ int CmdLFHitagReader(const char *Cmd) {
     return 0;
 }
 
-int CmdLFHitagSimS(const char *Cmd) {
+int CmdLFHitagSimS(const char *Cmd)
+{
     UsbCommand c = { CMD_SIMULATE_HITAG_S };
     char filename[FILE_PATH_SIZE] = { 0x00 };
-    FILE* f;
+    FILE *f;
     bool tag_mem_supplied;
     int len = strlen(Cmd);
     if (len > FILE_PATH_SIZE)
@@ -306,8 +317,8 @@ int CmdLFHitagSimS(const char *Cmd) {
             return 1;
         }
         tag_mem_supplied = true;
-        size_t bytes_read = fread(c.d.asBytes, 1, 4*64, f);
-        if ( bytes_read == 4*64) {
+        size_t bytes_read = fread(c.d.asBytes, 1, 4 * 64, f);
+        if (bytes_read == 4 * 64) {
             PrintAndLogEx(WARNING, "Error: File reading error");
             fclose(f);
             return 1;
@@ -324,10 +335,11 @@ int CmdLFHitagSimS(const char *Cmd) {
     return 0;
 }
 
-int CmdLFHitagCheckChallenges(const char *Cmd) {
+int CmdLFHitagCheckChallenges(const char *Cmd)
+{
     UsbCommand c = { CMD_TEST_HITAGS_TRACES };
     char filename[FILE_PATH_SIZE] = { 0x00 };
-    FILE* f;
+    FILE *f;
     bool file_given;
     int len = strlen(Cmd);
     if (len > FILE_PATH_SIZE)
@@ -335,14 +347,14 @@ int CmdLFHitagCheckChallenges(const char *Cmd) {
     memcpy(filename, Cmd, len);
 
     if (strlen(filename) > 0) {
-        f = fopen(filename,"rb+");
-        if ( !f ) {
+        f = fopen(filename, "rb+");
+        if (!f) {
             PrintAndLogEx(WARNING, "Error: Could not open file [%s]", filename);
             return 1;
         }
         file_given = true;
-        size_t bytes_read = fread(c.d.asBytes, 1, 8*60, f);
-        if ( bytes_read == 8*60) {
+        size_t bytes_read = fread(c.d.asBytes, 1, 8 * 60, f);
+        if (bytes_read == 8 * 60) {
             PrintAndLogEx(WARNING, "Error: File reading error");
             fclose(f);
             return 1;
@@ -359,24 +371,27 @@ int CmdLFHitagCheckChallenges(const char *Cmd) {
     return 0;
 }
 
-int CmdLFHitagWP(const char *Cmd) {
+int CmdLFHitagWP(const char *Cmd)
+{
     UsbCommand c = { CMD_WR_HITAG_S };
-    hitag_data* htd = (hitag_data*)c.d.asBytes;
+    hitag_data *htd = (hitag_data *)c.d.asBytes;
     hitag_function htf = param_get32ex(Cmd, 0, 0, 10);
     switch (htf) {
         case 03: { //WHTSF_CHALLENGE
             num_to_bytes(param_get64ex(Cmd, 1, 0, 16), 8, htd->auth.NrAr);
-            c.arg[2]= param_get32ex(Cmd, 2, 0, 10);
+            c.arg[2] = param_get32ex(Cmd, 2, 0, 10);
             num_to_bytes(param_get32ex(Cmd, 3, 0, 16), 4, htd->auth.data);
-        } break;
+        }
+        break;
         case 04:
-        case 24:
-         { //WHTSF_KEY
+        case 24: {
+            //WHTSF_KEY
             num_to_bytes(param_get64ex(Cmd, 1, 0, 16), 6, htd->crypto.key);
-            c.arg[2]= param_get32ex(Cmd, 2, 0, 10);
+            c.arg[2] = param_get32ex(Cmd, 2, 0, 10);
             num_to_bytes(param_get32ex(Cmd, 3, 0, 16), 4, htd->crypto.data);
 
-        } break;
+        }
+        break;
         default: {
             PrintAndLogEx(WARNING, "Error: unkown writer function %d", htf);
             PrintAndLogEx(NORMAL, "Hitag writer functions");
@@ -386,7 +401,8 @@ int CmdLFHitagWP(const char *Cmd) {
             PrintAndLogEx(NORMAL, " Hitag1 (1*)");
             PrintAndLogEx(NORMAL, " Hitag2 (2*)");
             return 1;
-        } break;
+        }
+        break;
     }
     // Copy the hitag function into the first argument
     c.arg[0] = htf;
@@ -410,16 +426,18 @@ static command_t CommandTable[] = {
     {"snoop",   CmdLFHitagSnoop,   1, "Eavesdrop Hitag communication"},
     {"writer",  CmdLFHitagWP,      1, "Act like a Hitag Writer" },
     {"check_challenges", CmdLFHitagCheckChallenges,   1, "<challenges.cc> test all challenges" },
-    { NULL,NULL, 0, NULL }
+    { NULL, NULL, 0, NULL }
 };
 
-int CmdLFHitag(const char *Cmd) {
+int CmdLFHitag(const char *Cmd)
+{
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
+int CmdHelp(const char *Cmd)
+{
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfindala.c b/client/cmdlfindala.c
index b926e133d..ff98938e3 100644
--- a/client/cmdlfindala.c
+++ b/client/cmdlfindala.c
@@ -12,7 +12,8 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_lf_indala_demod(void) {
+int usage_lf_indala_demod(void)
+{
     PrintAndLogEx(NORMAL, "Enables Indala compatible reader mode printing details of scanned tags.");
     PrintAndLogEx(NORMAL, "By default, values are printed and logged until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "");
@@ -25,7 +26,8 @@ int usage_lf_indala_demod(void) {
     return 0;
 }
 
-int usage_lf_indala_sim(void) {
+int usage_lf_indala_sim(void)
+{
     PrintAndLogEx(NORMAL, "Enables simulation of Indala card with specified uid.");
     PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "");
@@ -39,7 +41,8 @@ int usage_lf_indala_sim(void) {
     return 0;
 }
 
-int usage_lf_indala_clone(void) {
+int usage_lf_indala_clone(void)
+{
     PrintAndLogEx(NORMAL, "Enables cloning of Indala card with specified uid onto T55x7.");
     PrintAndLogEx(NORMAL, "The T55x7 must be on the antenna when issuing this command.  T55x7 blocks are calculated and printed in the process.");
     PrintAndLogEx(NORMAL, "");
@@ -56,13 +59,14 @@ int usage_lf_indala_clone(void) {
 
 // redesigned by marshmellow adjusted from existing decode functions
 // indala id decoding
-int indala64decode(uint8_t *dest, size_t *size, uint8_t *invert) {
+int indala64decode(uint8_t *dest, size_t *size, uint8_t *invert)
+{
     //standard 64 bit indala formats including 26 bit 40134 format
-    uint8_t   preamble64[] = {1,0,1,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 1};
-    uint8_t preamble64_i[] = {0,1,0,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 0};
+    uint8_t   preamble64[] = {1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1};
+    uint8_t preamble64_i[] = {0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0};
     size_t idx = 0;
     size_t found_size = *size;
-    if (!preambleSearch(dest, preamble64, sizeof(preamble64), &found_size, &idx) ) {
+    if (!preambleSearch(dest, preamble64, sizeof(preamble64), &found_size, &idx)) {
         // if didn't find preamble try again inverting
         if (!preambleSearch(dest, preamble64_i, sizeof(preamble64_i), &found_size, &idx)) return -1;
         *invert ^= 1;
@@ -78,27 +82,28 @@ int indala64decode(uint8_t *dest, size_t *size, uint8_t *invert) {
     return (int) idx;
 }
 
-int indala224decode(uint8_t *dest, size_t *size, uint8_t *invert) {
+int indala224decode(uint8_t *dest, size_t *size, uint8_t *invert)
+{
     //large 224 bit indala formats (different preamble too...)
-    uint8_t   preamble224[] = {1,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 1};
-    uint8_t preamble224_i[] = {0,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 0};
+    uint8_t   preamble224[] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1};
+    uint8_t preamble224_i[] = {0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0};
     size_t idx = 0;
     size_t found_size = *size;
-    if (!preambleSearch(dest, preamble224, sizeof(preamble224), &found_size, &idx) ) {
+    if (!preambleSearch(dest, preamble224, sizeof(preamble224), &found_size, &idx)) {
         // if didn't find preamble try again inverting
         if (!preambleSearch(dest, preamble224_i, sizeof(preamble224_i), &found_size, &idx)) return -1;
         *invert ^= 1;
     }
     if (found_size != 224) return -2;
 
-    if (*invert==1 && idx > 0)
-        for (size_t i = idx-1; i < found_size + idx + 2; i++)
+    if (*invert == 1 && idx > 0)
+        for (size_t i = idx - 1; i < found_size + idx + 2; i++)
             dest[i] ^= 1;
 
     // 224 formats are typically PSK2 (afaik 2017 Marshmellow)
     // note loses 1 bit at beginning of transformation...
     // don't need to verify array is big enough as to get here there has to be a full preamble after all of our data
-    psk1TOpsk2(dest + (idx-1), found_size+2);
+    psk1TOpsk2(dest + (idx - 1), found_size + 2);
     idx++;
 
     *size = found_size;
@@ -106,7 +111,8 @@ int indala224decode(uint8_t *dest, size_t *size, uint8_t *invert) {
 }
 
 // this read is the "normal" read,  which download lf signal and tries to demod here.
-int CmdIndalaRead(const char *Cmd) {
+int CmdIndalaRead(const char *Cmd)
+{
     lf_read(true, 30000);
     return CmdIndalaDemod(Cmd);
 }
@@ -114,14 +120,15 @@ int CmdIndalaRead(const char *Cmd) {
 // Indala 26 bit decode
 // by marshmellow
 // optional arguments - same as PSKDemod (clock & invert & maxerr)
-int CmdIndalaDemod(const char *Cmd) {
+int CmdIndalaDemod(const char *Cmd)
+{
     int ans;
     if (strlen(Cmd) > 0)
         ans = PSKDemod(Cmd, 0);
     else //default to RF/32
         ans = PSKDemod("32", 0);
 
-    if (!ans){
+    if (!ans) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - Indala can't demod signal: %d", ans);
         return 0;
     }
@@ -150,24 +157,24 @@ int CmdIndalaDemod(const char *Cmd) {
 
     //convert UID to HEX
     uint32_t uid1, uid2, uid3, uid4, uid5, uid6, uid7;
-    uid1 = bytebits_to_byte(DemodBuffer,32);
-    uid2 = bytebits_to_byte(DemodBuffer+32,32);
-    if (DemodBufferLen == 64){
+    uid1 = bytebits_to_byte(DemodBuffer, 32);
+    uid2 = bytebits_to_byte(DemodBuffer + 32, 32);
+    if (DemodBufferLen == 64) {
         PrintAndLogEx(SUCCESS, "Indala Found - bitlength %d, UID = (0x%x%08x)\n%s",
-            DemodBufferLen, uid1, uid2, sprint_bin_break(DemodBuffer,DemodBufferLen,32)
-        );
+                      DemodBufferLen, uid1, uid2, sprint_bin_break(DemodBuffer, DemodBufferLen, 32)
+                     );
     } else {
-        uid3 = bytebits_to_byte(DemodBuffer+64,32);
-        uid4 = bytebits_to_byte(DemodBuffer+96,32);
-        uid5 = bytebits_to_byte(DemodBuffer+128,32);
-        uid6 = bytebits_to_byte(DemodBuffer+160,32);
-        uid7 = bytebits_to_byte(DemodBuffer+192,32);
+        uid3 = bytebits_to_byte(DemodBuffer + 64, 32);
+        uid4 = bytebits_to_byte(DemodBuffer + 96, 32);
+        uid5 = bytebits_to_byte(DemodBuffer + 128, 32);
+        uid6 = bytebits_to_byte(DemodBuffer + 160, 32);
+        uid7 = bytebits_to_byte(DemodBuffer + 192, 32);
         PrintAndLogEx(SUCCESS, "Indala Found - bitlength %d, UID = (0x%x%08x%08x%08x%08x%08x%08x)\n%s",
-            DemodBufferLen,
-            uid1, uid2, uid3, uid4, uid5, uid6, uid7, sprint_bin_break(DemodBuffer, DemodBufferLen, 32)
-        );
+                      DemodBufferLen,
+                      uid1, uid2, uid3, uid4, uid5, uid6, uid7, sprint_bin_break(DemodBuffer, DemodBufferLen, 32)
+                     );
     }
-    if (g_debugMode){
+    if (g_debugMode) {
         PrintAndLogEx(DEBUG, "DEBUG: Indala - printing demodbuffer:");
         printDemodBuff();
     }
@@ -178,7 +185,8 @@ int CmdIndalaDemod(const char *Cmd) {
 // returns false positives more often - but runs against more sets of samples
 // poor psk signal can be difficult to demod this approach might succeed when the other fails
 // but the other appears to currently be more accurate than this approach most of the time.
-int CmdIndalaDemodAlt(const char *Cmd) {
+int CmdIndalaDemodAlt(const char *Cmd)
+{
     // Usage: recover 64bit UID by default, specify "224" as arg to recover a 224bit UID
     int state = -1;
     int count = 0;
@@ -199,7 +207,7 @@ int CmdIndalaDemodAlt(const char *Cmd) {
 
     // PrintAndLogEx(NORMAL, "Expecting a bit less than %d raw bits", GraphTraceLen / 32);
     // loop through raw signal - since we know it is psk1 rf/32 fc/2 skip every other value (+=2)
-    for (i = 0; i < datasize-1; i += 2) {
+    for (i = 0; i < datasize - 1; i += 2) {
         count += 1;
         if ((data[i] > data[i + 1]) && (state != 1)) {
             // appears redundant - marshmellow
@@ -230,8 +238,8 @@ int CmdIndalaDemodAlt(const char *Cmd) {
         }
     }
 
-    if (rawbit > 0){
-        PrintAndLogEx(INFO, "Recovered %d raw bits, expected: %d", rawbit, GraphTraceLen/32);
+    if (rawbit > 0) {
+        PrintAndLogEx(INFO, "Recovered %d raw bits, expected: %d", rawbit, GraphTraceLen / 32);
         PrintAndLogEx(INFO, "worst metric (0=best..7=worst): %d at pos %d", worst, worstPos);
     } else {
         return 0;
@@ -287,7 +295,7 @@ int CmdIndalaDemodAlt(const char *Cmd) {
             // As we cannot know the parity, let's use "." and "/"
             showbits[bit] = '.' + bits[bit];
         }
-        showbits[bit+1]='\0';
+        showbits[bit + 1] = '\0';
         PrintAndLogEx(SUCCESS, "Partial UID | %s", showbits);
         return 0;
     } else {
@@ -303,39 +311,38 @@ int CmdIndalaDemodAlt(const char *Cmd) {
     int idx;
     uid1 = uid2 = 0;
 
-    if (uidlen == 64){
-        for( idx=0; idx < 64; idx++) {
-                if (showbits[idx] == '0') {
-                    uid1 = (uid1<<1) | (uid2>>31);
-                    uid2 = (uid2<<1) | 0;
-                } else {
-                    uid1 = (uid1<<1) | (uid2>>31);
-                    uid2 = (uid2<<1) | 1;
-                }
+    if (uidlen == 64) {
+        for (idx = 0; idx < 64; idx++) {
+            if (showbits[idx] == '0') {
+                uid1 = (uid1 << 1) | (uid2 >> 31);
+                uid2 = (uid2 << 1) | 0;
+            } else {
+                uid1 = (uid1 << 1) | (uid2 >> 31);
+                uid2 = (uid2 << 1) | 1;
             }
+        }
         PrintAndLogEx(SUCCESS, "UID | %s (%x%08x)", showbits, uid1, uid2);
-    }
-    else {
+    } else {
         uid3 = uid4 = uid5 = uid6 = uid7 = 0;
 
-        for( idx=0; idx<224; idx++) {
-                uid1 = (uid1<<1) | (uid2>>31);
-                uid2 = (uid2<<1) | (uid3>>31);
-                uid3 = (uid3<<1) | (uid4>>31);
-                uid4 = (uid4<<1) | (uid5>>31);
-                uid5 = (uid5<<1) | (uid6>>31);
-                uid6 = (uid6<<1) | (uid7>>31);
+        for (idx = 0; idx < 224; idx++) {
+            uid1 = (uid1 << 1) | (uid2 >> 31);
+            uid2 = (uid2 << 1) | (uid3 >> 31);
+            uid3 = (uid3 << 1) | (uid4 >> 31);
+            uid4 = (uid4 << 1) | (uid5 >> 31);
+            uid5 = (uid5 << 1) | (uid6 >> 31);
+            uid6 = (uid6 << 1) | (uid7 >> 31);
 
             if (showbits[idx] == '0')
-                uid7 = (uid7<<1) | 0;
+                uid7 = (uid7 << 1) | 0;
             else
-                uid7 = (uid7<<1) | 1;
-            }
+                uid7 = (uid7 << 1) | 1;
+        }
         PrintAndLogEx(SUCCESS, "UID | %s (%x%08x%08x%08x%08x%08x%08x)", showbits, uid1, uid2, uid3, uid4, uid5, uid6, uid7);
     }
 
     // Checking UID against next occurrences
-        int failed = 0;
+    int failed = 0;
     for (; i + uidlen <= rawbit;) {
         failed = 0;
         for (bit = 0; bit < uidlen; bit++) {
@@ -375,7 +382,8 @@ int CmdIndalaDemodAlt(const char *Cmd) {
     return 1;
 }
 
-int CmdIndalaSim(const char *Cmd) {
+int CmdIndalaSim(const char *Cmd)
+{
 
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_indala_sim();
@@ -388,13 +396,13 @@ int CmdIndalaSim(const char *Cmd) {
     uint8_t hexuid[100];
     int len = 0;
     param_gethex_ex(Cmd, 0, hexuid, &len);
-    if ( len > 28 )
+    if (len > 28)
         return usage_lf_indala_sim();
 
     // convert to binarray
     uint8_t counter = 223;
     for (uint8_t i = 0; i < len; i++) {
-        for(uint8_t j = 0; j < 8; j++) {
+        for (uint8_t j = 0; j < 8; j++) {
             bits[counter--] = hexuid[i] & 1;
             hexuid[i] >>= 1;
         }
@@ -420,15 +428,16 @@ int CmdIndalaSim(const char *Cmd) {
 }
 
 // iceman - needs refactoring
-int CmdIndalaClone(const char *Cmd) {
+int CmdIndalaClone(const char *Cmd)
+{
     UsbCommand c = {0};
     uint32_t uid1, uid2, uid3, uid4, uid5, uid6, uid7;
     uid1 =  uid2 = uid3 = uid4 = uid5 = uid6 = uid7 = 0;
     uint32_t n = 0, i = 0;
 
-    if (strchr(Cmd,'l') != 0) {
+    if (strchr(Cmd, 'l') != 0) {
 
-        while (sscanf(&Cmd[i++], "%1x", &n ) == 1) {
+        while (sscanf(&Cmd[i++], "%1x", &n) == 1) {
             uid1 = (uid1 << 4) | (uid2 >> 28);
             uid2 = (uid2 << 4) | (uid3 >> 28);
             uid3 = (uid3 << 4) | (uid4 >> 28);
@@ -448,7 +457,7 @@ int CmdIndalaClone(const char *Cmd) {
         c.d.asDwords[5] = uid6;
         c.d.asDwords[6] = uid7;
     } else {
-        while (sscanf(&Cmd[i++], "%1x", &n ) == 1) {
+        while (sscanf(&Cmd[i++], "%1x", &n) == 1) {
             uid1 = (uid1 << 4) | (uid2 >> 28);
             uid2 = (uid2 << 4) | (n & 0xf);
         }
@@ -473,13 +482,15 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFINDALA(const char *Cmd){
+int CmdLFINDALA(const char *Cmd)
+{
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
+int CmdHelp(const char *Cmd)
+{
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfio.c b/client/cmdlfio.c
index eab1dc7f3..5890cb912 100644
--- a/client/cmdlfio.c
+++ b/client/cmdlfio.c
@@ -12,7 +12,8 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_lf_io_read(void) {
+int usage_lf_io_read(void)
+{
     PrintAndLogEx(NORMAL, "Enables IOProx compatible reader mode printing details of scanned tags.");
     PrintAndLogEx(NORMAL, "By default, values are printed and logged until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "If the [1] option is provided, reader mode is exited after reading a single card.");
@@ -28,7 +29,8 @@ int usage_lf_io_read(void) {
     return 0;
 }
 
-int usage_lf_io_sim(void) {
+int usage_lf_io_sim(void)
+{
     PrintAndLogEx(NORMAL, "Enables simulation of IOProx card with specified facility-code and card number.");
     PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "");
@@ -44,7 +46,8 @@ int usage_lf_io_sim(void) {
     return 0;
 }
 
-int usage_lf_io_clone(void) {
+int usage_lf_io_clone(void)
+{
     PrintAndLogEx(NORMAL, "Enables cloning of IOProx card with specified facility-code and card number onto T55x7.");
     PrintAndLogEx(NORMAL, "The T55x7 must be on the antenna when issuing this command.  T55x7 blocks are calculated and printed in the process.");
     PrintAndLogEx(NORMAL, "");
@@ -62,15 +65,17 @@ int usage_lf_io_clone(void) {
 }
 
 // this read is the "normal" read,  which download lf signal and tries to demod here.
-int CmdIOProxRead(const char *Cmd) {
+int CmdIOProxRead(const char *Cmd)
+{
     lf_read(true, 12000);
     return CmdIOProxDemod(Cmd);
 }
 // this read loops on device side.
 // uses the demod in lfops.c
-int CmdIOProxRead_device(const char *Cmd) {
+int CmdIOProxRead_device(const char *Cmd)
+{
     if (Cmd[0] == 'h' || Cmd[0] == 'H') return usage_lf_io_read();
-    int findone = (Cmd[0]=='1') ? 1 : 0;
+    int findone = (Cmd[0] == '1') ? 1 : 0;
     UsbCommand c = {CMD_IO_DEMOD_FSK, {findone, 0, 0}};
     clearCommandBuffer();
     SendCommand(&c);
@@ -80,7 +85,8 @@ int CmdIOProxRead_device(const char *Cmd) {
 //by marshmellow
 //IO-Prox demod - FSK RF/64 with preamble of 000000001
 //print ioprox ID and some format details
-int CmdIOProxDemod(const char *Cmd) {
+int CmdIOProxDemod(const char *Cmd)
+{
     int retval = 0;
     int idx = 0;
     uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
@@ -113,7 +119,7 @@ int CmdIOProxDemod(const char *Cmd) {
         return 0;
     }
     setDemodBuf(bits, size, idx);
-    setClockGrid(64, waveIdx + (idx*64));
+    setClockGrid(64, waveIdx + (idx * 64));
 
     if (idx == 0) {
         if (g_debugMode) {
@@ -132,30 +138,30 @@ int CmdIOProxDemod(const char *Cmd) {
     //
     //XSF(version)facility:codeone+codetwo (raw)
 
-    PrintAndLogEx(DEBUG, "%d%d%d%d%d%d%d%d %d", bits[idx], bits[idx+1], bits[idx+2], bits[idx+3], bits[idx+4], bits[idx+5], bits[idx+6], bits[idx+7], bits[idx+8]);
-    PrintAndLogEx(DEBUG, "%d%d%d%d%d%d%d%d %d", bits[idx+9], bits[idx+10], bits[idx+11],bits[idx+12],bits[idx+13],bits[idx+14],bits[idx+15],bits[idx+16],bits[idx+17]);
-    PrintAndLogEx(DEBUG, "%d%d%d%d%d%d%d%d %d facility", bits[idx+18], bits[idx+19], bits[idx+20],bits[idx+21],bits[idx+22],bits[idx+23],bits[idx+24],bits[idx+25],bits[idx+26]);
-    PrintAndLogEx(DEBUG, "%d%d%d%d%d%d%d%d %d version", bits[idx+27], bits[idx+28], bits[idx+29],bits[idx+30],bits[idx+31],bits[idx+32],bits[idx+33],bits[idx+34],bits[idx+35]);
-    PrintAndLogEx(DEBUG, "%d%d%d%d%d%d%d%d %d code1", bits[idx+36], bits[idx+37], bits[idx+38],bits[idx+39],bits[idx+40],bits[idx+41],bits[idx+42],bits[idx+43],bits[idx+44]);
-    PrintAndLogEx(DEBUG, "%d%d%d%d%d%d%d%d %d code2", bits[idx+45], bits[idx+46], bits[idx+47],bits[idx+48],bits[idx+49],bits[idx+50],bits[idx+51],bits[idx+52],bits[idx+53]);
-    PrintAndLogEx(DEBUG, "%d%d%d%d%d%d%d%d %d%d checksum", bits[idx+54],bits[idx+55],bits[idx+56],bits[idx+57],bits[idx+58],bits[idx+59],bits[idx+60],bits[idx+61],bits[idx+62],bits[idx+63]);
+    PrintAndLogEx(DEBUG, "%d%d%d%d%d%d%d%d %d", bits[idx], bits[idx + 1], bits[idx + 2], bits[idx + 3], bits[idx + 4], bits[idx + 5], bits[idx + 6], bits[idx + 7], bits[idx + 8]);
+    PrintAndLogEx(DEBUG, "%d%d%d%d%d%d%d%d %d", bits[idx + 9], bits[idx + 10], bits[idx + 11], bits[idx + 12], bits[idx + 13], bits[idx + 14], bits[idx + 15], bits[idx + 16], bits[idx + 17]);
+    PrintAndLogEx(DEBUG, "%d%d%d%d%d%d%d%d %d facility", bits[idx + 18], bits[idx + 19], bits[idx + 20], bits[idx + 21], bits[idx + 22], bits[idx + 23], bits[idx + 24], bits[idx + 25], bits[idx + 26]);
+    PrintAndLogEx(DEBUG, "%d%d%d%d%d%d%d%d %d version", bits[idx + 27], bits[idx + 28], bits[idx + 29], bits[idx + 30], bits[idx + 31], bits[idx + 32], bits[idx + 33], bits[idx + 34], bits[idx + 35]);
+    PrintAndLogEx(DEBUG, "%d%d%d%d%d%d%d%d %d code1", bits[idx + 36], bits[idx + 37], bits[idx + 38], bits[idx + 39], bits[idx + 40], bits[idx + 41], bits[idx + 42], bits[idx + 43], bits[idx + 44]);
+    PrintAndLogEx(DEBUG, "%d%d%d%d%d%d%d%d %d code2", bits[idx + 45], bits[idx + 46], bits[idx + 47], bits[idx + 48], bits[idx + 49], bits[idx + 50], bits[idx + 51], bits[idx + 52], bits[idx + 53]);
+    PrintAndLogEx(DEBUG, "%d%d%d%d%d%d%d%d %d%d checksum", bits[idx + 54], bits[idx + 55], bits[idx + 56], bits[idx + 57], bits[idx + 58], bits[idx + 59], bits[idx + 60], bits[idx + 61], bits[idx + 62], bits[idx + 63]);
 
-    uint32_t code = bytebits_to_byte(bits+idx,32);
-    uint32_t code2 = bytebits_to_byte(bits+idx+32,32);
-    uint8_t version = bytebits_to_byte(bits+idx+27,8); //14,4
-    uint8_t facilitycode = bytebits_to_byte(bits+idx+18,8) ;
-    uint16_t number = (bytebits_to_byte(bits+idx+36,8)<<8)|(bytebits_to_byte(bits+idx+45,8)); //36,9
-    uint8_t crc = bytebits_to_byte(bits+idx+54,8);
+    uint32_t code = bytebits_to_byte(bits + idx, 32);
+    uint32_t code2 = bytebits_to_byte(bits + idx + 32, 32);
+    uint8_t version = bytebits_to_byte(bits + idx + 27, 8); //14,4
+    uint8_t facilitycode = bytebits_to_byte(bits + idx + 18, 8) ;
+    uint16_t number = (bytebits_to_byte(bits + idx + 36, 8) << 8) | (bytebits_to_byte(bits + idx + 45, 8)); //36,9
+    uint8_t crc = bytebits_to_byte(bits + idx + 54, 8);
     uint8_t calccrc = 0;
 
-    for (uint8_t i = 1; i < 6; ++i){
-        calccrc += bytebits_to_byte(bits + idx + 9 * i ,8);
+    for (uint8_t i = 1; i < 6; ++i) {
+        calccrc += bytebits_to_byte(bits + idx + 9 * i, 8);
     }
     calccrc &= 0xff;
     calccrc = 0xff - calccrc;
 
     char crcStr[30];
-    memset(crcStr, 0x00, sizeof(crcStr) );
+    memset(crcStr, 0x00, sizeof(crcStr));
 
     if (crc == calccrc) {
         snprintf(crcStr, 3, "ok");
@@ -169,7 +175,7 @@ int CmdIOProxDemod(const char *Cmd) {
 
     PrintAndLogEx(SUCCESS, "IO Prox XSF(%02d)%02x:%05d (%08x%08x) [crc %s]", version, facilitycode, number, code, code2, crcStr);
 
-    if (g_debugMode){
+    if (g_debugMode) {
         PrintAndLogEx(DEBUG, "DEBUG: IO prox idx: %d, Len: %d, Printing demod buffer:", idx, size);
         printDemodBuff();
     }
@@ -183,9 +189,10 @@ int CmdIOProxDemod(const char *Cmd) {
 //-----------------------------------------------------------------------------
 //00000000 0 11110000 1 facility 1 version* 1 code*one 1 code*two 1 ???????? 11
 //XSF(version)facility:codeone+codetwo (raw)
-int getIOProxBits(uint8_t version, uint8_t fc, uint16_t cn, uint8_t *bits) {
-    #define SEPARATOR 1
-    uint8_t pos=0;
+int getIOProxBits(uint8_t version, uint8_t fc, uint16_t cn, uint8_t *bits)
+{
+#define SEPARATOR 1
+    uint8_t pos = 0;
     // the return bits, preamble 0000 0000 0
     uint8_t pre[64];
     memset(pre, 0, sizeof(pre));
@@ -194,43 +201,43 @@ int getIOProxBits(uint8_t version, uint8_t fc, uint16_t cn, uint8_t *bits) {
     pos = 9;
 
     // another fixed byte 11110000 = 0xF0
-    num_to_bytebits(0xF0, 8, pre+pos);
+    num_to_bytebits(0xF0, 8, pre + pos);
     pos += 8;
     pre[pos] = SEPARATOR;
     pos++;
 
     // add facilitycode
-    num_to_bytebits(fc, 8, pre+pos);
+    num_to_bytebits(fc, 8, pre + pos);
     pos += 8;
     pre[pos] = SEPARATOR;
     pos++;
 
     // add version
-    num_to_bytebits(version, 8, pre+pos);
+    num_to_bytebits(version, 8, pre + pos);
     pos += 8;
     pre[pos] = SEPARATOR;
     pos++;
 
     // cardnumber high byte
-    num_to_bytebits( ((cn & 0xFF00)>>8), 8, pre+pos);
+    num_to_bytebits(((cn & 0xFF00) >> 8), 8, pre + pos);
     pos += 8;
     pre[pos] = SEPARATOR;
     pos++;
 
     // cardnumber low byte
-    num_to_bytebits( (cn & 0xFF), 8, pre+pos);
+    num_to_bytebits((cn & 0xFF), 8, pre + pos);
     pos += 8;
     pre[pos] = SEPARATOR;
     pos++;
 
     // calculate and add CRC
     uint16_t crc = 0;
-    for (uint8_t i=1; i<6; ++i)
-        crc += bytebits_to_byte(pre+9*i, 8);
+    for (uint8_t i = 1; i < 6; ++i)
+        crc += bytebits_to_byte(pre + 9 * i, 8);
 
     crc &= 0xFF;
     crc = 0xff - crc;
-    num_to_bytebits(crc, 8, pre+pos);
+    num_to_bytebits(crc, 8, pre + pos);
     pos += 8;
 
     // Final two ONES
@@ -243,7 +250,8 @@ int getIOProxBits(uint8_t version, uint8_t fc, uint16_t cn, uint8_t *bits) {
     return 1;
 }
 
-int CmdIOProxSim(const char *Cmd) {
+int CmdIOProxSim(const char *Cmd)
+{
     uint16_t cn = 0;
     uint8_t version = 0, fc = 0;
     uint8_t bits[64];
@@ -257,7 +265,7 @@ int CmdIOProxSim(const char *Cmd) {
     fc = param_get8(Cmd, 1);
     cn = param_get32ex(Cmd, 2, 0, 10);
 
-    if ( !version | !fc || !cn) return usage_lf_io_sim();
+    if (!version | !fc || !cn) return usage_lf_io_sim();
 
     if ((cn & 0xFFFF) != cn) {
         cn &= 0xFFFF;
@@ -273,7 +281,7 @@ int CmdIOProxSim(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "Simulating IOProx version: %u FC: %u; CN: %u\n", version, fc, cn);
     PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation or run another command");
 
-    if ( !getIOProxBits(version, fc, cn, bits)) {
+    if (!getIOProxBits(version, fc, cn, bits)) {
         PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
         return 1;
     }
@@ -288,13 +296,14 @@ int CmdIOProxSim(const char *Cmd) {
     return 0;
 }
 
-int CmdIOProxClone(const char *Cmd) {
+int CmdIOProxClone(const char *Cmd)
+{
 
     uint32_t blocks[3] = {T55x7_MODULATION_FSK2a | T55x7_BITRATE_RF_64 | 2 << T55x7_MAXBLOCK_SHIFT, 0, 0};
     uint16_t cn = 0;
     uint8_t version = 0, fc = 0;
     uint8_t bits[64];
-    memset(bits,0,sizeof(bits));
+    memset(bits, 0, sizeof(bits));
 
     char cmdp = param_getchar(Cmd, 0);
     if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_io_clone();
@@ -303,14 +312,14 @@ int CmdIOProxClone(const char *Cmd) {
     fc = param_get8(Cmd, 1);
     cn = param_get32ex(Cmd, 2, 0, 10);
 
-    if ( !version | !fc || !cn) return usage_lf_io_clone();
+    if (!version | !fc || !cn) return usage_lf_io_clone();
 
     if ((cn & 0xFFFF) != cn) {
         cn &= 0xFFFF;
         PrintAndLogEx(INFO, "Card Number Truncated to 16-bits (IOProx): %u", cn);
     }
 
-    if ( !getIOProxBits(version, fc, cn, bits)) {
+    if (!getIOProxBits(version, fc, cn, bits)) {
         PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
         return 1;
     }
@@ -325,7 +334,7 @@ int CmdIOProxClone(const char *Cmd) {
     print_blocks(blocks, 3);
 
     //UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
-    UsbCommand c = {CMD_IO_CLONE_TAG, {blocks[1],blocks[2],0}};
+    UsbCommand c = {CMD_IO_CLONE_TAG, {blocks[1], blocks[2], 0}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -340,13 +349,15 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFIO(const char *Cmd){
+int CmdLFIO(const char *Cmd)
+{
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
+int CmdHelp(const char *Cmd)
+{
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfjablotron.c b/client/cmdlfjablotron.c
index 12c7a77e5..77e625ff8 100644
--- a/client/cmdlfjablotron.c
+++ b/client/cmdlfjablotron.c
@@ -12,7 +12,8 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_lf_jablotron_clone(void){
+int usage_lf_jablotron_clone(void)
+{
     PrintAndLogEx(NORMAL, "clone a Jablotron tag to a T55x7 tag.");
     PrintAndLogEx(NORMAL, "Usage: lf jablotron clone [h] <card ID> <Q5>");
     PrintAndLogEx(NORMAL, "Options:");
@@ -25,7 +26,8 @@ int usage_lf_jablotron_clone(void){
     return 0;
 }
 
-int usage_lf_jablotron_sim(void) {
+int usage_lf_jablotron_sim(void)
+{
     PrintAndLogEx(NORMAL, "Enables simulation of jablotron card with specified card number.");
     PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "");
@@ -39,25 +41,27 @@ int usage_lf_jablotron_sim(void) {
     return 0;
 }
 
-static uint8_t jablontron_chksum(uint8_t *bits){
+static uint8_t jablontron_chksum(uint8_t *bits)
+{
     uint8_t chksum = 0;
-    for (int i=16; i < 56; i += 8) {
-        chksum += bytebits_to_byte(bits+i,8);
+    for (int i = 16; i < 56; i += 8) {
+        chksum += bytebits_to_byte(bits + i, 8);
     }
     chksum ^= 0x3A;
     return chksum;
 }
 
-int getJablotronBits(uint64_t fullcode, uint8_t *bits) {
+int getJablotronBits(uint64_t fullcode, uint8_t *bits)
+{
     //preamp
     num_to_bytebits(0xFFFF, 16, bits);
 
     //fullcode
-    num_to_bytebits(fullcode, 40, bits+16);
+    num_to_bytebits(fullcode, 40, bits + 16);
 
     //chksum byte
     uint8_t chksum = jablontron_chksum(bits);
-    num_to_bytebits(chksum, 8, bits+56);
+    num_to_bytebits(chksum, 8, bits + 56);
     return 1;
 }
 
@@ -65,33 +69,36 @@ int getJablotronBits(uint64_t fullcode, uint8_t *bits) {
 // Note: this is not a demod, this is only a detection
 // the parameter *bits needs to be demoded before call
 // 0xFFFF preamble, 64bits
-int detectJablotron(uint8_t *bits, size_t *size) {
-    if (*size < 64*2) return -1; //make sure buffer has enough data
+int detectJablotron(uint8_t *bits, size_t *size)
+{
+    if (*size < 64 * 2) return -1; //make sure buffer has enough data
     size_t startIdx = 0;
-    uint8_t preamble[] = {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0};
+    uint8_t preamble[] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0};
     if (preambleSearch(bits, preamble, sizeof(preamble), size, &startIdx) == 0)
         return -2; //preamble not found
     if (*size != 64) return -3; // wrong demoded size
 
-    uint8_t checkchksum = jablontron_chksum(bits+startIdx);
-    uint8_t crc = bytebits_to_byte(bits+startIdx+56, 8);
-    if ( checkchksum != crc ) return -5;
+    uint8_t checkchksum = jablontron_chksum(bits + startIdx);
+    uint8_t crc = bytebits_to_byte(bits + startIdx + 56, 8);
+    if (checkchksum != crc) return -5;
     return (int)startIdx;
 }
 
-static uint64_t getJablontronCardId( uint64_t rawcode ){
+static uint64_t getJablontronCardId(uint64_t rawcode)
+{
     uint64_t id = 0;
-    uint8_t bytes[] = {0,0,0,0,0};
+    uint8_t bytes[] = {0, 0, 0, 0, 0};
     num_to_bytes(rawcode, 5, bytes);
-    for ( int i = 4, j = 0; i > -1;  --i, j += 2 ) {
-        id += NIBBLE_LOW( bytes[i] ) * (int)pow(10,j);
-        id += NIBBLE_HIGH( bytes[i] ) * (int)pow(10,j+1);
+    for (int i = 4, j = 0; i > -1;  --i, j += 2) {
+        id += NIBBLE_LOW(bytes[i]) * (int)pow(10, j);
+        id += NIBBLE_HIGH(bytes[i]) * (int)pow(10, j + 1);
     }
     return id;
 }
 
 //see ASKDemod for what args are accepted
-int CmdJablotronDemod(const char *Cmd) {
+int CmdJablotronDemod(const char *Cmd)
+{
 
     //Differential Biphase / di-phase (inverted biphase)
     //get binary from ask wave
@@ -101,8 +108,8 @@ int CmdJablotronDemod(const char *Cmd) {
     }
     size_t size = DemodBufferLen;
     int ans = detectJablotron(DemodBuffer, &size);
-    if (ans < 0){
-        if (g_debugMode){
+    if (ans < 0) {
+        if (g_debugMode) {
             if (ans == -1)
                 PrintAndLogEx(DEBUG, "DEBUG: Error - Jablotron too few bits found");
             else if (ans == -2)
@@ -118,39 +125,41 @@ int CmdJablotronDemod(const char *Cmd) {
     }
 
     setDemodBuf(DemodBuffer, 64, ans);
-    setClockGrid(g_DemodClock, g_DemodStartIdx + (ans*g_DemodClock));
+    setClockGrid(g_DemodClock, g_DemodStartIdx + (ans * g_DemodClock));
 
     //got a good demod
     uint32_t raw1 = bytebits_to_byte(DemodBuffer, 32);
-    uint32_t raw2 = bytebits_to_byte(DemodBuffer+32, 32);
+    uint32_t raw2 = bytebits_to_byte(DemodBuffer + 32, 32);
 
-    uint64_t rawid = bytebits_to_byte(DemodBuffer+16, 40);
+    uint64_t rawid = bytebits_to_byte(DemodBuffer + 16, 40);
     uint64_t id = getJablontronCardId(rawid);
 
     PrintAndLogEx(SUCCESS, "Jablotron Tag Found: Card ID: %"PRIx64" :: Raw: %08X%08X", id, raw1, raw2);
 
     uint8_t chksum = raw2 & 0xFF;
     PrintAndLogEx(INFO, "Checksum: %02X [%s]",
-        chksum,
-        (chksum == jablontron_chksum(DemodBuffer)) ? _GREEN_(OK) : _RED_(FAIL)
-    );
+                  chksum,
+                  (chksum == jablontron_chksum(DemodBuffer)) ? _GREEN_(OK) : _RED_(FAIL)
+                 );
 
     id = DEC2BCD(id);
     // Printed format: 1410-nn-nnnn-nnnn
     PrintAndLogEx(SUCCESS, "Printed: 1410-%02X-%04X-%04X",
-        (uint8_t)(id >> 32) & 0xFF,
-        (uint16_t)(id >> 16) & 0xFFFF,
-        (uint16_t)id & 0xFFFF
-    );
+                  (uint8_t)(id >> 32) & 0xFF,
+                  (uint16_t)(id >> 16) & 0xFFFF,
+                  (uint16_t)id & 0xFFFF
+                 );
     return 1;
 }
 
-int CmdJablotronRead(const char *Cmd) {
+int CmdJablotronRead(const char *Cmd)
+{
     lf_read(true, 10000);
     return CmdJablotronDemod(Cmd);
 }
 
-int CmdJablotronClone(const char *Cmd) {
+int CmdJablotronClone(const char *Cmd)
+{
 
     uint64_t fullcode = 0;
     uint32_t blocks[3] = {T55x7_MODULATION_DIPHASE | T55x7_BITRATE_RF_64 | 2 << T55x7_MAXBLOCK_SHIFT, 0, 0};
@@ -173,7 +182,7 @@ int CmdJablotronClone(const char *Cmd) {
         PrintAndLogEx(INFO, "Card Number Truncated to 39bits: %"PRIx64, fullcode);
     }
 
-    if ( !getJablotronBits(fullcode, bits)) {
+    if (!getJablotronBits(fullcode, bits)) {
         PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
         return 1;
     }
@@ -185,14 +194,14 @@ int CmdJablotronClone(const char *Cmd) {
     print_blocks(blocks, 3);
 
     UsbCommand resp;
-    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
+    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}};
 
-    for (uint8_t i=0; i<3; i++) {
+    for (uint8_t i = 0; i < 3; i++) {
         c.arg[0] = blocks[i];
         c.arg[1] = i;
         clearCommandBuffer();
         SendCommand(&c);
-        if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)){
+        if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
             return -1;
         }
@@ -200,7 +209,8 @@ int CmdJablotronClone(const char *Cmd) {
     return 0;
 }
 
-int CmdJablotronSim(const char *Cmd) {
+int CmdJablotronSim(const char *Cmd)
+{
     uint64_t fullcode = 0;
 
     char cmdp = tolower(param_getchar(Cmd, 0));
@@ -238,13 +248,15 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFJablotron(const char *Cmd) {
+int CmdLFJablotron(const char *Cmd)
+{
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
+int CmdHelp(const char *Cmd)
+{
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfkeri.c b/client/cmdlfkeri.c
index af2b48552..bce98b5cc 100644
--- a/client/cmdlfkeri.c
+++ b/client/cmdlfkeri.c
@@ -11,7 +11,8 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_lf_keri_clone(void){
+int usage_lf_keri_clone(void)
+{
     PrintAndLogEx(NORMAL, "clone a KERI tag to a T55x7 tag.");
     PrintAndLogEx(NORMAL, "Usage: lf keri clone [h] <id> <Q5>");
     PrintAndLogEx(NORMAL, "Options:");
@@ -24,7 +25,8 @@ int usage_lf_keri_clone(void){
     return 0;
 }
 
-int usage_lf_keri_sim(void) {
+int usage_lf_keri_sim(void)
+{
     PrintAndLogEx(NORMAL, "Enables simulation of KERI card with specified card number.");
     PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "");
@@ -39,13 +41,14 @@ int usage_lf_keri_sim(void) {
 }
 
 // find KERI preamble in already demoded data
-int detectKeri(uint8_t *dest, size_t *size, bool *invert) {
+int detectKeri(uint8_t *dest, size_t *size, bool *invert)
+{
 
-    uint8_t preamble[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1};
-    uint8_t preamble_i[] = {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0};
+    uint8_t preamble[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1};
+    uint8_t preamble_i[] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0};
 
     // sanity check.
-    if ( *size < sizeof(preamble) + 100) return -1;
+    if (*size < sizeof(preamble) + 100) return -1;
 
     size_t startIdx = 0;
 
@@ -63,7 +66,8 @@ int detectKeri(uint8_t *dest, size_t *size, bool *invert) {
     return (int)startIdx;
 }
 
-int CmdKeriDemod(const char *Cmd) {
+int CmdKeriDemod(const char *Cmd)
+{
 
     if (!PSKDemod("", false)) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - KERI: PSK1 Demod failed");
@@ -88,11 +92,11 @@ int CmdKeriDemod(const char *Cmd) {
     setClockGrid(g_DemodClock, g_DemodStartIdx + (idx * g_DemodClock));
 
     //got a good demod
-    uint32_t raw1 = bytebits_to_byte(DemodBuffer   , 32);
-    uint32_t raw2 = bytebits_to_byte(DemodBuffer+32, 32);
+    uint32_t raw1 = bytebits_to_byte(DemodBuffer, 32);
+    uint32_t raw2 = bytebits_to_byte(DemodBuffer + 32, 32);
 
     //get internal id
-    uint32_t ID = bytebits_to_byte(DemodBuffer+29, 32);
+    uint32_t ID = bytebits_to_byte(DemodBuffer + 29, 32);
     ID &= 0x7FFFFFFF;
 
     /*
@@ -110,9 +114,9 @@ int CmdKeriDemod(const char *Cmd) {
     */
 
     PrintAndLogEx(SUCCESS, "KERI Tag Found -- Internal ID: %u", ID);
-    PrintAndLogEx(SUCCESS, "Raw: %08X%08X", raw1 ,raw2);
+    PrintAndLogEx(SUCCESS, "Raw: %08X%08X", raw1, raw2);
 
-    if (invert){
+    if (invert) {
         PrintAndLogEx(INFO, "Had to Invert - probably KERI");
         for (size_t i = 0; i < size; i++)
             DemodBuffer[i] ^= 1;
@@ -122,22 +126,25 @@ int CmdKeriDemod(const char *Cmd) {
     return 1;
 }
 
-int CmdKeriRead(const char *Cmd) {
+int CmdKeriRead(const char *Cmd)
+{
     lf_read(true, 10000);
     return CmdKeriDemod(Cmd);
 }
 
-int CmdKeriClone(const char *Cmd) {
+int CmdKeriClone(const char *Cmd)
+{
 
     uint32_t internalid = 0;
     uint32_t blocks[3] = {
-            T55x7_TESTMODE_DISABLED |
-            T55x7_X_MODE |
-            T55x7_MODULATION_PSK1 |
-            T55x7_PSKCF_RF_2 |
-            2 << T55x7_MAXBLOCK_SHIFT,
-            0,
-            0};
+        T55x7_TESTMODE_DISABLED |
+        T55x7_X_MODE |
+        T55x7_MODULATION_PSK1 |
+        T55x7_PSKCF_RF_2 |
+        2 << T55x7_MAXBLOCK_SHIFT,
+          0,
+          0
+    };
 
     // dynamic bitrate used
     blocks[0] |= 0xF << 18;
@@ -161,7 +168,7 @@ int CmdKeriClone(const char *Cmd) {
     internalid |= 0x80000000;
 
     // 3 LSB is ONE
-    uint64_t data =  ((uint64_t)internalid << 3 ) + 7;
+    uint64_t data = ((uint64_t)internalid << 3) + 7;
 
     //
     blocks[1] = data >> 32;
@@ -172,7 +179,7 @@ int CmdKeriClone(const char *Cmd) {
 
 
     UsbCommand resp;
-    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
+    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}};
 
 
     for (uint8_t i = 0; i < 3; i++) {
@@ -180,7 +187,7 @@ int CmdKeriClone(const char *Cmd) {
         c.arg[1] = i;
         clearCommandBuffer();
         SendCommand(&c);
-        if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)){
+        if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
             return -1;
         }
@@ -189,7 +196,8 @@ int CmdKeriClone(const char *Cmd) {
     return 0;
 }
 
-int CmdKeriSim(const char *Cmd) {
+int CmdKeriSim(const char *Cmd)
+{
 
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_keri_sim();
@@ -202,8 +210,8 @@ int CmdKeriSim(const char *Cmd) {
     uint8_t bits[64] = {0x00};
     // loop to bits
     uint8_t j = 0;
-    for ( int8_t i = 63; i >= 0; --i) {
-        bits[j++] = ((internalid >> i) & 1 );
+    for (int8_t i = 63; i >= 0; --i) {
+        bits[j++] = ((internalid >> i) & 1);
     }
 
     uint8_t clk = 32, carrier = 2, invert = 0;
@@ -231,13 +239,15 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFKeri(const char *Cmd) {
+int CmdLFKeri(const char *Cmd)
+{
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
+int CmdHelp(const char *Cmd)
+{
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfnedap.c b/client/cmdlfnedap.c
index 07e07e7ec..fdff78424 100644
--- a/client/cmdlfnedap.c
+++ b/client/cmdlfnedap.c
@@ -10,7 +10,8 @@
 #include "cmdlfnedap.h"
 static int CmdHelp(const char *Cmd);
 
-int usage_lf_nedap_clone(void){
+int usage_lf_nedap_clone(void)
+{
     PrintAndLogEx(NORMAL, "clone a NEDAP tag to a T55x7 tag.");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage: lf nedap clone [h] <Card-Number>");
@@ -24,7 +25,8 @@ int usage_lf_nedap_clone(void){
     return 0;
 }
 
-int usage_lf_nedap_sim(void) {
+int usage_lf_nedap_sim(void)
+{
     PrintAndLogEx(NORMAL, "Enables simulation of NEDAP card with specified card number.");
     PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "");
@@ -39,19 +41,21 @@ int usage_lf_nedap_sim(void) {
 }
 
 // find nedap preamble in already demoded data
-int detectNedap(uint8_t *dest, size_t *size) {
+int detectNedap(uint8_t *dest, size_t *size)
+{
     //make sure buffer has data
     if (*size < 128) return -3;
 
     size_t startIdx = 0;
     //uint8_t preamble[] = {1,1,1,1,1,1,1,1,1,0,0,0,1};
-    uint8_t preamble[] = {1,1,1,1,1,1,1,1,1,0};
+    uint8_t preamble[] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 0};
     if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
         return -4; //preamble not found
     return (int) startIdx;
 }
 
-int GetNedapBits(uint32_t cn, uint8_t *nedapBits) {
+int GetNedapBits(uint32_t cn, uint8_t *nedapBits)
+{
 
     uint8_t pre[128];
     memset(pre, 0x00, sizeof(pre));
@@ -60,7 +64,7 @@ int GetNedapBits(uint32_t cn, uint8_t *nedapBits) {
     num_to_bytebits(0xFF8, 12, pre);
 
     // fixed tagtype code?  0010 1101 = 0x2D
-    num_to_bytebits(0x2D, 8, pre+10);
+    num_to_bytebits(0x2D, 8, pre + 10);
 
     // 46 encrypted bits - UNKNOWN ALGO
     //    -- 16 bits checksum. Should be 4x4 checksum,  based on UID and 2 constant values.
@@ -77,25 +81,25 @@ int GetNedapBits(uint32_t cn, uint8_t *nedapBits) {
     pre[118] = 0;
 
     // cardnumber (uid)
-    num_to_bytebits( (cn >>  0) & 0xFF, 8, pre+65);
-    num_to_bytebits( (cn >>  8) & 0xFF, 8, pre+74);
-    num_to_bytebits( (cn >> 16) & 0xFF, 8, pre+83);
+    num_to_bytebits((cn >>  0) & 0xFF, 8, pre + 65);
+    num_to_bytebits((cn >>  8) & 0xFF, 8, pre + 74);
+    num_to_bytebits((cn >> 16) & 0xFF, 8, pre + 83);
 
     // two ?
-    num_to_bytebits( 0, 8, pre+92);
-    num_to_bytebits( 0, 8, pre+101);
+    num_to_bytebits(0, 8, pre + 92);
+    num_to_bytebits(0, 8, pre + 101);
 
     // chksum
-    num_to_bytebits( (0 >> 0) & 0xFF, 8, pre+110);
-    num_to_bytebits( (0 >> 8) & 0xFF, 8, pre+119);
+    num_to_bytebits((0 >> 0) & 0xFF, 8, pre + 110);
+    num_to_bytebits((0 >> 8) & 0xFF, 8, pre + 119);
 
 
     // add paritybits (bitsource, dest, sourcelen, paritylen, parityType (odd, even,)
-    addParity(pre, pre+64, 64, 8, 1);
-    addParity(pre+64, pre+64, 64, 8, 1);
+    addParity(pre, pre + 64, 64, 8, 1);
+    addParity(pre + 64, pre + 64, 64, 8, 1);
 
-    pre[63] = GetParity( DemodBuffer, EVEN, 63);
-    pre[127] = GetParity( DemodBuffer+64, EVEN, 63);
+    pre[63] = GetParity(DemodBuffer, EVEN, 63);
+    pre[127] = GetParity(DemodBuffer + 64, EVEN, 63);
 
     memcpy(nedapBits, pre, 128);
 
@@ -112,7 +116,8 @@ int GetNedapBits(uint32_t cn, uint8_t *nedapBits) {
 //NEDAP demod - ASK/Biphase (or Diphase),  RF/64 with preamble of 1111111110  (always a 128 bit data stream)
 //print NEDAP Prox ID, encoding, encrypted ID,
 
-int CmdLFNedapDemod(const char *Cmd) {
+int CmdLFNedapDemod(const char *Cmd)
+{
     //raw ask demod no start bit finding just get binary from wave
     if (!ASKbiphaseDemod("0 64 1 0", false)) {
         if (g_debugMode) PrintAndLogEx(DEBUG, "DEBUG: Error - Nedap ASKbiphaseDemod failed");
@@ -120,89 +125,89 @@ int CmdLFNedapDemod(const char *Cmd) {
     }
     size_t size = DemodBufferLen;
     int idx = detectNedap(DemodBuffer, &size);
-    if (idx < 0){
-        if (g_debugMode){
+    if (idx < 0) {
+        if (g_debugMode) {
             // if (idx == -5)
-                // PrintAndLogEx(DEBUG, "DEBUG: Error - not enough samples");
+            // PrintAndLogEx(DEBUG, "DEBUG: Error - not enough samples");
             // else if (idx == -1)
-                // PrintAndLogEx(DEBUG, "DEBUG: Error - only noise found");
+            // PrintAndLogEx(DEBUG, "DEBUG: Error - only noise found");
             // else if (idx == -2)
-                // PrintAndLogEx(DEBUG, "DEBUG: Error - problem during ASK/Biphase demod");
+            // PrintAndLogEx(DEBUG, "DEBUG: Error - problem during ASK/Biphase demod");
             if (idx == -3)
                 PrintAndLogEx(DEBUG, "DEBUG: Error - Nedap Size not correct: %d", size);
             else if (idx == -4)
                 PrintAndLogEx(DEBUG, "DEBUG: Error - Nedap preamble not found");
             else
-                PrintAndLogEx(DEBUG, "DEBUG: Error - Nedap idx: %d",idx);
+                PrintAndLogEx(DEBUG, "DEBUG: Error - Nedap idx: %d", idx);
         }
         return 0;
     }
 
-/* Index map                                                      E                                                                              E
- preamble    enc tag type         encrypted uid                   P d    33    d    90    d    04    d    71    d    40    d    45    d    E7    P
- 1111111110 00101101000001011010001100100100001011010100110101100 1 0 00110011 0 10010000 0 00000100 0 01110001 0 01000000 0 01000101 0 11100111 1
-                                                                         uid2       uid1       uid0         I          I          R           R
- 1111111110 00101101000001011010001100100100001011010100110101100 1
+    /* Index map                                                      E                                                                              E
+     preamble    enc tag type         encrypted uid                   P d    33    d    90    d    04    d    71    d    40    d    45    d    E7    P
+     1111111110 00101101000001011010001100100100001011010100110101100 1 0 00110011 0 10010000 0 00000100 0 01110001 0 01000000 0 01000101 0 11100111 1
+                                                                             uid2       uid1       uid0         I          I          R           R
+     1111111110 00101101000001011010001100100100001011010100110101100 1
 
- 0 00110011
- 0 10010000
- 0 00000100
- 0 01110001
- 0 01000000
- 0 01000101
- 0 11100111
- 1
+     0 00110011
+     0 10010000
+     0 00000100
+     0 01110001
+     0 01000000
+     0 01000101
+     0 11100111
+     1
 
-     Tag ID is 049033
-     I = Identical on all tags
-     R = Random ?
-     UID2, UID1, UID0 == card number
+         Tag ID is 049033
+         I = Identical on all tags
+         R = Random ?
+         UID2, UID1, UID0 == card number
 
-*/
+    */
     //get raw ID before removing parities
-    uint32_t raw[4] = {0,0,0,0};
-    raw[0] = bytebits_to_byte(DemodBuffer+idx+96,32);
-    raw[1] = bytebits_to_byte(DemodBuffer+idx+64,32);
-    raw[2] = bytebits_to_byte(DemodBuffer+idx+32,32);
-    raw[3] = bytebits_to_byte(DemodBuffer+idx,32);
+    uint32_t raw[4] = {0, 0, 0, 0};
+    raw[0] = bytebits_to_byte(DemodBuffer + idx + 96, 32);
+    raw[1] = bytebits_to_byte(DemodBuffer + idx + 64, 32);
+    raw[2] = bytebits_to_byte(DemodBuffer + idx + 32, 32);
+    raw[3] = bytebits_to_byte(DemodBuffer + idx, 32);
     setDemodBuf(DemodBuffer, 128, idx);
-    setClockGrid(g_DemodClock, g_DemodStartIdx + (idx*g_DemodClock));
+    setClockGrid(g_DemodClock, g_DemodStartIdx + (idx * g_DemodClock));
 
-    uint8_t firstParity = GetParity( DemodBuffer, EVEN, 63);
-    if ( firstParity != DemodBuffer[63]  ) {
+    uint8_t firstParity = GetParity(DemodBuffer, EVEN, 63);
+    if (firstParity != DemodBuffer[63]) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - Nedap 1st 64bit parity check failed:  %d|%d ", DemodBuffer[63], firstParity);
         return 0;
     }
 
-    uint8_t secondParity = GetParity( DemodBuffer+64, EVEN, 63);
-    if ( secondParity != DemodBuffer[127]  ) {
+    uint8_t secondParity = GetParity(DemodBuffer + 64, EVEN, 63);
+    if (secondParity != DemodBuffer[127]) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - Nedap 2st 64bit parity check failed:  %d|%d ", DemodBuffer[127], secondParity);
         return 0;
     }
 
     // ok valid card found!
     uint32_t uid = 0;
-    uid =  bytebits_to_byte(DemodBuffer+65, 8);
-    uid |= bytebits_to_byte(DemodBuffer+74, 8) << 8;
-    uid |= bytebits_to_byte(DemodBuffer+83, 8) << 16;
+    uid =  bytebits_to_byte(DemodBuffer + 65, 8);
+    uid |= bytebits_to_byte(DemodBuffer + 74, 8) << 8;
+    uid |= bytebits_to_byte(DemodBuffer + 83, 8) << 16;
 
     uint16_t two = 0;
-    two =  bytebits_to_byte(DemodBuffer+92, 8);
-    two |= bytebits_to_byte(DemodBuffer+101, 8) << 8;
+    two =  bytebits_to_byte(DemodBuffer + 92, 8);
+    two |= bytebits_to_byte(DemodBuffer + 101, 8) << 8;
 
     uint16_t chksum2 = 0;
-    chksum2 =  bytebits_to_byte(DemodBuffer+110, 8);
-    chksum2 |= bytebits_to_byte(DemodBuffer+119, 8) << 8;
+    chksum2 =  bytebits_to_byte(DemodBuffer + 110, 8);
+    chksum2 |= bytebits_to_byte(DemodBuffer + 119, 8) << 8;
 
     PrintAndLogEx(SUCCESS, "NEDAP ID Found - Raw: %08x%08x%08x%08x", raw[3], raw[2], raw[1], raw[0]);
     PrintAndLogEx(SUCCESS, " - UID: %06X", uid);
     PrintAndLogEx(SUCCESS, " - i: %04X", two);
     PrintAndLogEx(SUCCESS, " - Checksum2 %04X", chksum2);
 
-    if (g_debugMode){
+    if (g_debugMode) {
         PrintAndLogEx(DEBUG, "DEBUG: idx: %d, Len: %d, Printing Demod Buffer:", idx, 128);
         printDemodBuff();
-        PrintAndLogEx(DEBUG, "BIN:\n%s", sprint_bin_break( DemodBuffer, 128, 64) );
+        PrintAndLogEx(DEBUG, "BIN:\n%s", sprint_bin_break(DemodBuffer, 128, 64));
     }
 
     return 1;
@@ -231,7 +236,8 @@ lf t55xx wr b 4 d 4c0003ff
 
 */
 
-int CmdLFNedapRead(const char *Cmd) {
+int CmdLFNedapRead(const char *Cmd)
+{
     lf_read(true, 12000);
     return CmdLFNedapDemod(Cmd);
 }
@@ -288,14 +294,15 @@ int CmdLFNedapClone(const char *Cmd) {
 }
 */
 
-int CmdLFNedapSim(const char *Cmd) {
+int CmdLFNedapSim(const char *Cmd)
+{
 
     uint32_t cardnumber = 0, cn = 0;
 
     char cmdp = param_getchar(Cmd, 0);
     if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_nedap_sim();
 
-    if (sscanf(Cmd, "%u", &cn ) != 1) return usage_lf_nedap_sim();
+    if (sscanf(Cmd, "%u", &cn) != 1) return usage_lf_nedap_sim();
 
     cardnumber = (cn & 0x00FFFFFF);
 
@@ -309,13 +316,13 @@ int CmdLFNedapSim(const char *Cmd) {
     arg1 = clk << 8 | encoding;
     arg2 = invert << 8 | separator;
 
-    if ( !GetNedapBits(cardnumber, bs)) {
+    if (!GetNedapBits(cardnumber, bs)) {
         PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
         return 1;
     }
 
     PrintAndLogEx(SUCCESS, "bin  %s", sprint_bin_break(bs, 128, 32));
-    PrintAndLogEx(SUCCESS, "Simulating Nedap - CardNumber: %u", cardnumber );
+    PrintAndLogEx(SUCCESS, "Simulating Nedap - CardNumber: %u", cardnumber);
 
     UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};
     memcpy(c.d.asBytes, bs, size);
@@ -324,13 +331,14 @@ int CmdLFNedapSim(const char *Cmd) {
     return 0;
 }
 
-int CmdLFNedapChk(const char *Cmd){
+int CmdLFNedapChk(const char *Cmd)
+{
     //301600714021BE
     uint8_t data[256] = { 0x30, 0x16, 0x00, 0x71, 0x40, 0x21, 0xBE};
     int len = 0;
     param_gethex_ex(Cmd, 0, data, &len);
 
-    len = ( len == 0 ) ? 5 : len>>1;
+    len = (len == 0) ? 5 : len >> 1;
 
     PrintAndLogEx(SUCCESS, "Input: [%d] %s", len, sprint_hex(data, len));
 
@@ -340,7 +348,7 @@ int CmdLFNedapChk(const char *Cmd){
     uint8_t cl = 0x1D, ch = 0x1D, carry = 0;
     uint8_t al, bl, temp;
 
-    for (int i =len; i >= 0; --i){
+    for (int i = len; i >= 0; --i) {
         al = data[i];
         for (int j = 8; j > 0; --j) {
 
@@ -367,13 +375,13 @@ int CmdLFNedapChk(const char *Cmd){
         }
     }
 
-    PrintAndLogEx(SUCCESS, "Nedap checksum: 0x%X", ((ch << 8) | cl) );
+    PrintAndLogEx(SUCCESS, "Nedap checksum: 0x%X", ((ch << 8) | cl));
     return 0;
 }
 
 static command_t CommandTable[] = {
     {"help",    CmdHelp,        1, "this help"},
-    {"demod",   CmdLFNedapDemod,0, "demodulate an Nedap tag from the GraphBuffer"},
+    {"demod",   CmdLFNedapDemod, 0, "demodulate an Nedap tag from the GraphBuffer"},
     {"read",    CmdLFNedapRead, 0, "attempt to read and extract tag data"},
 //  {"clone",   CmdLFNedapClone,0, "<Card Number>  clone nedap tag"},
     {"sim",     CmdLFNedapSim,  0, "simulate nedap tag"},
@@ -381,13 +389,15 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFNedap(const char *Cmd) {
+int CmdLFNedap(const char *Cmd)
+{
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
+int CmdHelp(const char *Cmd)
+{
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfnexwatch.c b/client/cmdlfnexwatch.c
index a8cc421fd..61781dbba 100644
--- a/client/cmdlfnexwatch.c
+++ b/client/cmdlfnexwatch.c
@@ -12,16 +12,17 @@
 
 static int CmdHelp(const char *Cmd);
 
-int detectNexWatch(uint8_t *dest, size_t *size, bool *invert) {
+int detectNexWatch(uint8_t *dest, size_t *size, bool *invert)
+{
 
-    uint8_t preamble[28]   = {0,0,0,0,0,1,0,1,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
-    uint8_t preamble_i[28] = {1,1,1,1,1,0,1,0,1,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1};
+    uint8_t preamble[28]   = {0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+    uint8_t preamble_i[28] = {1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
     // sanity check.
-    if ( *size < sizeof(preamble) + 100) return -1;
+    if (*size < sizeof(preamble) + 100) return -1;
 
     size_t startIdx = 0;
 
-    if (!preambleSearch(DemodBuffer, preamble, sizeof(preamble), size, &startIdx)){
+    if (!preambleSearch(DemodBuffer, preamble, sizeof(preamble), size, &startIdx)) {
         // if didn't find preamble try again inverting
         if (!preambleSearch(DemodBuffer, preamble_i, sizeof(preamble_i), size, &startIdx)) return -4;
         *invert ^= 1;
@@ -31,7 +32,8 @@ int detectNexWatch(uint8_t *dest, size_t *size, bool *invert) {
     return (int) startIdx;
 }
 
-int CmdNexWatchDemod(const char *Cmd) {
+int CmdNexWatchDemod(const char *Cmd)
+{
 
     if (!PSKDemod("", false)) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - NexWatch can't demod signal");
@@ -41,32 +43,32 @@ int CmdNexWatchDemod(const char *Cmd) {
     size_t size = DemodBufferLen;
     int idx = detectNexWatch(DemodBuffer, &size, &invert);
     if (idx <= 0) {
-            if (idx == -1)
-                PrintAndLogEx(DEBUG, "DEBUG: Error - NexWatch not enough samples");
-            // else if (idx == -2)
-                // PrintAndLogEx(DEBUG, "DEBUG: Error - NexWatch only noise found");
-            // else if (idx == -3)
-                // PrintAndLogEx(DEBUG, "DEBUG: Error - NexWatch problem during PSK demod");
-            else if (idx == -4)
-                PrintAndLogEx(DEBUG, "DEBUG: Error - NexWatch preamble not found");
-            // else if (idx == -5)
-                // PrintAndLogEx(DEBUG, "DEBUG: Error - NexWatch size not correct: %d", size);
-            else
-                PrintAndLogEx(DEBUG, "DEBUG: Error - NexWatch error %d",idx);
+        if (idx == -1)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - NexWatch not enough samples");
+        // else if (idx == -2)
+        // PrintAndLogEx(DEBUG, "DEBUG: Error - NexWatch only noise found");
+        // else if (idx == -3)
+        // PrintAndLogEx(DEBUG, "DEBUG: Error - NexWatch problem during PSK demod");
+        else if (idx == -4)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - NexWatch preamble not found");
+        // else if (idx == -5)
+        // PrintAndLogEx(DEBUG, "DEBUG: Error - NexWatch size not correct: %d", size);
+        else
+            PrintAndLogEx(DEBUG, "DEBUG: Error - NexWatch error %d", idx);
 
         return 0;
     }
 
-    setDemodBuf(DemodBuffer, size, idx+4);
-    setClockGrid(g_DemodClock, g_DemodStartIdx + ((idx+4)*g_DemodClock));
+    setDemodBuf(DemodBuffer, size, idx + 4);
+    setClockGrid(g_DemodClock, g_DemodStartIdx + ((idx + 4)*g_DemodClock));
 
-    idx = 8+32; // 8 = preamble, 32 = reserved bits (always 0)
+    idx = 8 + 32; // 8 = preamble, 32 = reserved bits (always 0)
 
     //get ID
     uint32_t ID = 0;
-    for (uint8_t k = 0; k < 4; k++){
-        for (uint8_t m = 0; m < 8; m++){
-            ID = (ID << 1) | DemodBuffer[m + k + (m*4)];
+    for (uint8_t k = 0; k < 4; k++) {
+        for (uint8_t m = 0; m < 8; m++) {
+            ID = (ID << 1) | DemodBuffer[m + k + (m * 4)];
         }
     }
     //parity check (TBD)
@@ -75,7 +77,7 @@ int CmdNexWatchDemod(const char *Cmd) {
 
     //output
     PrintAndLogEx(NORMAL, "NexWatch ID: %d", ID);
-    if (invert){
+    if (invert) {
         PrintAndLogEx(NORMAL, "Had to Invert - probably NexKey");
         for (size_t i = 0; i < size; i++)
             DemodBuffer[i] ^= 1;
@@ -87,7 +89,8 @@ int CmdNexWatchDemod(const char *Cmd) {
 
 //by marshmellow
 //see ASKDemod for what args are accepted
-int CmdNexWatchRead(const char *Cmd) {
+int CmdNexWatchRead(const char *Cmd)
+{
     lf_read(true, 10000);
     return CmdNexWatchDemod(Cmd);
 }
@@ -99,13 +102,15 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFNEXWATCH(const char *Cmd) {
+int CmdLFNEXWATCH(const char *Cmd)
+{
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
+int CmdHelp(const char *Cmd)
+{
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfnoralsy.c b/client/cmdlfnoralsy.c
index 763d70e1e..f7e1455bf 100644
--- a/client/cmdlfnoralsy.c
+++ b/client/cmdlfnoralsy.c
@@ -11,7 +11,8 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_lf_noralsy_clone(void){
+int usage_lf_noralsy_clone(void)
+{
     PrintAndLogEx(NORMAL, "clone a Noralsy tag to a T55x7 tag.");
     PrintAndLogEx(NORMAL, "Usage: lf noralsy clone [h] <card id> <year> <Q5>");
     PrintAndLogEx(NORMAL, "Options:");
@@ -25,7 +26,8 @@ int usage_lf_noralsy_clone(void){
     return 0;
 }
 
-int usage_lf_noralsy_sim(void) {
+int usage_lf_noralsy_sim(void)
+{
     PrintAndLogEx(NORMAL, "Enables simulation of Noralsy card with specified card number.");
     PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "");
@@ -40,13 +42,15 @@ int usage_lf_noralsy_sim(void) {
     return 0;
 }
 
-static uint8_t noralsy_chksum( uint8_t* bits, uint8_t len) {
+static uint8_t noralsy_chksum(uint8_t *bits, uint8_t len)
+{
     uint8_t sum = 0;
     for (uint8_t i = 0; i < len; i += 4)
-        sum ^= bytebits_to_byte(bits+i, 4);
+        sum ^= bytebits_to_byte(bits + i, 4);
     return sum & 0x0F ;
 }
-int getnoralsyBits(uint32_t id, uint16_t year, uint8_t *bits) {
+int getnoralsyBits(uint32_t id, uint16_t year, uint8_t *bits)
+{
     //preamp
     num_to_bytebits(0xBB0214FF, 32, bits);  // --> Have seen 0xBB0214FF / 0xBB0314FF  UNKNOWN
 
@@ -59,27 +63,28 @@ int getnoralsyBits(uint32_t id, uint16_t year, uint8_t *bits) {
     uint8_t sub2 = (id & 0x000FF00) >> 8;
     uint8_t sub3 = (id & 0x00000FF);
 
-    num_to_bytebits(sub1, 12, bits+32);
-    num_to_bytebits(year, 8, bits+44);
-    num_to_bytebits(0, 4, bits+52);   // --> UNKNOWN. Flag?
+    num_to_bytebits(sub1, 12, bits + 32);
+    num_to_bytebits(year, 8, bits + 44);
+    num_to_bytebits(0, 4, bits + 52); // --> UNKNOWN. Flag?
 
-    num_to_bytebits(sub2, 8, bits+56);
-    num_to_bytebits(sub3, 8, bits+64);
+    num_to_bytebits(sub2, 8, bits + 56);
+    num_to_bytebits(sub3, 8, bits + 64);
 
     //chksum byte
-    uint8_t chksum = noralsy_chksum(bits+32, 40);
-    num_to_bytebits(chksum, 4, bits+72);
+    uint8_t chksum = noralsy_chksum(bits + 32, 40);
+    num_to_bytebits(chksum, 4, bits + 72);
     chksum = noralsy_chksum(bits, 76);
-    num_to_bytebits(chksum, 4, bits+76);
+    num_to_bytebits(chksum, 4, bits + 76);
     return 1;
 }
 
 // by iceman
 // find Noralsy preamble in already demoded data
-int detectNoralsy(uint8_t *dest, size_t *size) {
+int detectNoralsy(uint8_t *dest, size_t *size)
+{
     if (*size < 96) return -1; //make sure buffer has data
     size_t startIdx = 0;
-    uint8_t preamble[] = {1,0,1,1,1,0,1,1,0,0,0,0};
+    uint8_t preamble[] = {1, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0};
     if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
         return -2; //preamble not found
     if (*size != 96) return -3; //wrong demoded size
@@ -100,7 +105,8 @@ int detectNoralsy(uint8_t *dest, size_t *size) {
 **/
 
 //see ASKDemod for what args are accepted
-int CmdNoralsyDemod(const char *Cmd) {
+int CmdNoralsyDemod(const char *Cmd)
+{
 
     //ASK / Manchester
     bool st = true;
@@ -115,8 +121,8 @@ int CmdNoralsyDemod(const char *Cmd) {
 
     size_t size = DemodBufferLen;
     int ans = detectNoralsy(DemodBuffer, &size);
-    if (ans < 0){
-        if (g_debugMode){
+    if (ans < 0) {
+        if (g_debugMode) {
             if (ans == -1)
                 PrintAndLogEx(DEBUG, "DEBUG: Error - Noralsy: too few bits found");
             else if (ans == -2)
@@ -129,12 +135,12 @@ int CmdNoralsyDemod(const char *Cmd) {
         return 0;
     }
     setDemodBuf(DemodBuffer, 96, ans);
-    setClockGrid(g_DemodClock, g_DemodStartIdx + (ans*g_DemodClock));
+    setClockGrid(g_DemodClock, g_DemodStartIdx + (ans * g_DemodClock));
 
     //got a good demod
     uint32_t raw1 = bytebits_to_byte(DemodBuffer, 32);
-    uint32_t raw2 = bytebits_to_byte(DemodBuffer+32, 32);
-    uint32_t raw3 = bytebits_to_byte(DemodBuffer+64, 32);
+    uint32_t raw2 = bytebits_to_byte(DemodBuffer + 32, 32);
+    uint32_t raw3 = bytebits_to_byte(DemodBuffer + 64, 32);
 
     uint32_t cardid = ((raw2 & 0xFFF00000) >> 20) << 16;
     cardid |= (raw2 & 0xFF) << 8;
@@ -143,25 +149,25 @@ int CmdNoralsyDemod(const char *Cmd) {
 
     uint16_t year = (raw2 & 0x000ff000) >> 12;
     year = BCD2DEC(year);
-    year += ( year > 60 ) ? 1900: 2000;
+    year += (year > 60) ? 1900 : 2000;
 
     // calc checksums
-    uint8_t calc1 = noralsy_chksum(DemodBuffer+32, 40);
+    uint8_t calc1 = noralsy_chksum(DemodBuffer + 32, 40);
     uint8_t calc2 = noralsy_chksum(DemodBuffer, 76);
     uint8_t chk1 = 0, chk2 = 0;
-    chk1 = bytebits_to_byte(DemodBuffer+72, 4);
-    chk2 = bytebits_to_byte(DemodBuffer+76, 4);
+    chk1 = bytebits_to_byte(DemodBuffer + 72, 4);
+    chk2 = bytebits_to_byte(DemodBuffer + 76, 4);
     // test checksums
-    if ( chk1 != calc1 ) {
+    if (chk1 != calc1) {
         if (g_debugMode) PrintAndLogEx(DEBUG, "DEBUG: Error - Noralsy: checksum 1 failed %x - %x\n", chk1, calc1);
         return 0;
     }
-    if ( chk2 != calc2 ) {
+    if (chk2 != calc2) {
         if (g_debugMode) PrintAndLogEx(DEBUG, "DEBUG: Error - Noralsy: checksum 2 failed %x - %x\n", chk2, calc2);
         return 0;
     }
 
-    PrintAndLogEx(SUCCESS, "Noralsy Tag Found: Card ID %u, Year: %u Raw: %08X%08X%08X", cardid, year, raw1 ,raw2, raw3);
+    PrintAndLogEx(SUCCESS, "Noralsy Tag Found: Card ID %u, Year: %u Raw: %08X%08X%08X", cardid, year, raw1, raw2, raw3);
     if (raw1 != 0xBB0214FF) {
         PrintAndLogEx(WARNING, "Unknown bits set in first block! Expected 0xBB0214FF, Found: 0x%08X", raw1);
         PrintAndLogEx(WARNING, "Please post this output in forum to further research on this format");
@@ -169,12 +175,14 @@ int CmdNoralsyDemod(const char *Cmd) {
     return 1;
 }
 
-int CmdNoralsyRead(const char *Cmd) {
+int CmdNoralsyRead(const char *Cmd)
+{
     lf_read(true, 8000);
     return CmdNoralsyDemod(Cmd);
 }
 
-int CmdNoralsyClone(const char *Cmd) {
+int CmdNoralsyClone(const char *Cmd)
+{
 
     uint16_t year = 0;
     uint32_t id = 0;
@@ -192,7 +200,7 @@ int CmdNoralsyClone(const char *Cmd) {
     if (param_getchar(Cmd, 2) == 'Q' || param_getchar(Cmd, 2) == 'q')
         blocks[0] = T5555_MODULATION_MANCHESTER | T5555_SET_BITRATE(32) | T5555_ST_TERMINATOR | 3 << T5555_MAXBLOCK_SHIFT;
 
-     if ( !getnoralsyBits(id, year, bits)) {
+    if (!getnoralsyBits(id, year, bits)) {
         PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
         return 1;
     }
@@ -206,14 +214,14 @@ int CmdNoralsyClone(const char *Cmd) {
     print_blocks(blocks, 4);
 
     UsbCommand resp;
-    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
+    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}};
 
-    for (uint8_t i=0; i<4; i++) {
+    for (uint8_t i = 0; i < 4; i++) {
         c.arg[0] = blocks[i];
         c.arg[1] = i;
         clearCommandBuffer();
         SendCommand(&c);
-        if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)){
+        if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
             return -1;
         }
@@ -221,7 +229,8 @@ int CmdNoralsyClone(const char *Cmd) {
     return 0;
 }
 
-int CmdNoralsySim(const char *Cmd) {
+int CmdNoralsySim(const char *Cmd)
+{
 
     uint8_t bits[96];
     uint8_t *bs = bits;
@@ -242,7 +251,7 @@ int CmdNoralsySim(const char *Cmd) {
     arg1 = clk << 8 | encoding;
     arg2 = invert << 8 | separator;
 
-     if ( !getnoralsyBits(id, year, bs)) {
+    if (!getnoralsyBits(id, year, bs)) {
         PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
         return 1;
     }
@@ -258,20 +267,22 @@ int CmdNoralsySim(const char *Cmd) {
 
 static command_t CommandTable[] = {
     {"help",    CmdHelp,        1, "This help"},
-    {"demod",   CmdNoralsyDemod,1, "Demodulate an Noralsy tag from the GraphBuffer"},
+    {"demod",   CmdNoralsyDemod, 1, "Demodulate an Noralsy tag from the GraphBuffer"},
     {"read",    CmdNoralsyRead, 0, "Attempt to read and extract tag data from the antenna"},
-    {"clone",   CmdNoralsyClone,0, "clone Noralsy to T55x7"},
+    {"clone",   CmdNoralsyClone, 0, "clone Noralsy to T55x7"},
     {"sim",     CmdNoralsySim,  0, "simulate Noralsy tag"},
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFNoralsy(const char *Cmd) {
+int CmdLFNoralsy(const char *Cmd)
+{
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
+int CmdHelp(const char *Cmd)
+{
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfpac.c b/client/cmdlfpac.c
index 4c9bda1db..c9466d215 100644
--- a/client/cmdlfpac.c
+++ b/client/cmdlfpac.c
@@ -13,10 +13,11 @@ static int CmdHelp(const char *Cmd);
 
 // by marshmellow
 // find PAC preamble in already demoded data
-int detectPac(uint8_t *dest, size_t *size) {
+int detectPac(uint8_t *dest, size_t *size)
+{
     if (*size < 128) return -1; //make sure buffer has data
     size_t startIdx = 0;
-    uint8_t preamble[] = {1,1,1,1,1,1,1,1,0,0,1,0,0,0,0,0,0,1,0};
+    uint8_t preamble[] = {1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0};
     if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
         return -2; //preamble not found
     if (*size != 128) return -3; //wrong demoded size
@@ -25,7 +26,8 @@ int detectPac(uint8_t *dest, size_t *size) {
 }
 
 //see NRZDemod for what args are accepted
-int CmdPacDemod(const char *Cmd) {
+int CmdPacDemod(const char *Cmd)
+{
 
     //NRZ
     if (!NRZrawDemod(Cmd, false)) {
@@ -47,42 +49,45 @@ int CmdPacDemod(const char *Cmd) {
         return 0;
     }
     setDemodBuf(DemodBuffer, 128, ans);
-    setClockGrid(g_DemodClock, g_DemodStartIdx + (ans*g_DemodClock));
+    setClockGrid(g_DemodClock, g_DemodStartIdx + (ans * g_DemodClock));
 
     //got a good demod
-    uint32_t raw1 = bytebits_to_byte(DemodBuffer   , 32);
-    uint32_t raw2 = bytebits_to_byte(DemodBuffer+32, 32);
-    uint32_t raw3 = bytebits_to_byte(DemodBuffer+64, 32);
-    uint32_t raw4 = bytebits_to_byte(DemodBuffer+96, 32);
+    uint32_t raw1 = bytebits_to_byte(DemodBuffer, 32);
+    uint32_t raw2 = bytebits_to_byte(DemodBuffer + 32, 32);
+    uint32_t raw3 = bytebits_to_byte(DemodBuffer + 64, 32);
+    uint32_t raw4 = bytebits_to_byte(DemodBuffer + 96, 32);
 
     // preamble     then appears to have marker bits of "10"                                                                                                                                       CS?
     // 11111111001000000 10 01001100 10 00001101 10 00001101 10 00001101 10 00001101 10 00001101 10 00001101 10 00001101 10 00001101 10 10001100 10 100000001
     // unknown checksum 9 bits at the end
 
-    PrintAndLogEx(NORMAL, "PAC/Stanley Tag Found -- Raw: %08X%08X%08X%08X", raw1 ,raw2, raw3, raw4);
+    PrintAndLogEx(NORMAL, "PAC/Stanley Tag Found -- Raw: %08X%08X%08X%08X", raw1, raw2, raw3, raw4);
     PrintAndLogEx(NORMAL, "\nHow the Raw ID is translated by the reader is unknown");
     return 1;
 }
 
-int CmdPacRead(const char *Cmd) {
-    lf_read(true, 4096*2 + 20);
+int CmdPacRead(const char *Cmd)
+{
+    lf_read(true, 4096 * 2 + 20);
     return CmdPacDemod(Cmd);
 }
 
 static command_t CommandTable[] = {
     {"help",  CmdHelp,    1, "This help"},
-    {"demod", CmdPacDemod,1, "Demodulate an PAC tag from the GraphBuffer"},
+    {"demod", CmdPacDemod, 1, "Demodulate an PAC tag from the GraphBuffer"},
     {"read",  CmdPacRead, 0, "Attempt to read and extract tag data from the antenna"},
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFPac(const char *Cmd) {
+int CmdLFPac(const char *Cmd)
+{
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
+int CmdHelp(const char *Cmd)
+{
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfparadox.c b/client/cmdlfparadox.c
index cda0833dd..a7d287f9c 100644
--- a/client/cmdlfparadox.c
+++ b/client/cmdlfparadox.c
@@ -21,7 +21,8 @@
 #include "lfdemod.h"
 static int CmdHelp(const char *Cmd);
 
-int usage_lf_paradox_sim(void) {
+int usage_lf_paradox_sim(void)
+{
     PrintAndLogEx(NORMAL, "Enables simulation of Paradox card with specified card number.");
     PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "The facility-code is 8-bit and the card number is 16-bit.  Larger values are truncated.");
@@ -38,9 +39,10 @@ int usage_lf_paradox_sim(void) {
 }
 
 // loop to get raw paradox waveform then FSK demodulate the TAG ID from it
-int detectParadox(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32_t *lo, int *waveStartIdx) {
+int detectParadox(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32_t *lo, int *waveStartIdx)
+{
     //make sure buffer has data
-    if (*size < 96*50) return -1;
+    if (*size < 96 * 50) return -1;
 
     if (getSignalProperties()->isnoise) return -2;
 
@@ -52,21 +54,21 @@ int detectParadox(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint
 
     // 00001111 bit pattern represent start of frame, 01 pattern represents a 0 and 10 represents a 1
     size_t startIdx = 0;
-    uint8_t preamble[] = {0,0,0,0,1,1,1,1};
+    uint8_t preamble[] = {0, 0, 0, 0, 1, 1, 1, 1};
     if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
         return -4; //preamble not found
 
     size_t numStart = startIdx + sizeof(preamble);
     // final loop, go over previously decoded FSK data and manchester decode into usable tag ID
-    for (size_t idx = numStart; (idx-numStart) < *size - sizeof(preamble); idx+=2){
-        if (dest[idx] == dest[idx+1])
+    for (size_t idx = numStart; (idx - numStart) < *size - sizeof(preamble); idx += 2) {
+        if (dest[idx] == dest[idx + 1])
             return -5; //not manchester data
 
         *hi2 = (*hi2 << 1) | (*hi >> 31);
         *hi = (*hi << 1) | (*lo >> 31);
         //Then, shift in a 0 or one into low
         *lo <<= 1;
-        if (dest[idx] && !dest[idx+1]) // 1 0
+        if (dest[idx] && !dest[idx + 1]) // 1 0
             *lo |= 1;
         else // 0 1
             *lo |= 0;
@@ -77,7 +79,8 @@ int detectParadox(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint
 //by marshmellow
 //Paradox Prox demod - FSK2a RF/50 with preamble of 00001111 (then manchester encoded)
 //print full Paradox Prox ID and some bit format details if found
-int CmdParadoxDemod(const char *Cmd) {
+int CmdParadoxDemod(const char *Cmd)
+{
     //raw fsk demod no manchester decoding no start bit finding just get binary from wave
     uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
     size_t size = getFromGraphBuf(bits);
@@ -90,7 +93,7 @@ int CmdParadoxDemod(const char *Cmd) {
     int waveIdx = 0;
     //get binary from fsk wave
     int idx = detectParadox(bits, &size, &hi2, &hi, &lo, &waveIdx);
-    if (idx < 0){
+    if (idx < 0) {
 
         if (idx == -1)
             PrintAndLogEx(DEBUG, "DEBUG: Error - Paradox not enough samples");
@@ -111,7 +114,7 @@ int CmdParadoxDemod(const char *Cmd) {
     setDemodBuf(bits, size, idx);
     setClockGrid(50, waveIdx + (idx * 50));
 
-    if (hi2 == 0 && hi == 0 && lo == 0){
+    if (hi2 == 0 && hi == 0 && lo == 0) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - Paradox no value found");
         return 0;
     }
@@ -123,14 +126,14 @@ int CmdParadoxDemod(const char *Cmd) {
     uint32_t rawHi2 = bytebits_to_byte(bits + idx, 32);
 
     PrintAndLogEx(NORMAL, "Paradox TAG ID: %x%08x - FC: %d - Card: %d - Checksum: %02x - RAW: %08x%08x%08x",
-        hi >> 10,
-        (hi & 0x3) << 26 | (lo >> 10),
-        fc, cardnum,
-        (lo >> 2) & 0xFF,
-        rawHi2,
-        rawHi,
-        rawLo
-    );
+                  hi >> 10,
+                  (hi & 0x3) << 26 | (lo >> 10),
+                  fc, cardnum,
+                  (lo >> 2) & 0xFF,
+                  rawHi2,
+                  rawHi,
+                  rawLo
+                 );
 
     PrintAndLogEx(DEBUG, "DEBUG: Paradox idx: %d, len: %d, Printing Demod Buffer:", idx, size);
     if (g_debugMode)
@@ -140,12 +143,14 @@ int CmdParadoxDemod(const char *Cmd) {
 }
 //by marshmellow
 //see ASKDemod for what args are accepted
-int CmdParadoxRead(const char *Cmd) {
+int CmdParadoxRead(const char *Cmd)
+{
     lf_read(true, 10000);
     return CmdParadoxDemod(Cmd);
 }
 
-int CmdParadoxSim(const char *Cmd) {
+int CmdParadoxSim(const char *Cmd)
+{
 
     char cmdp = param_getchar(Cmd, 0);
     if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_paradox_sim();
@@ -162,17 +167,17 @@ int CmdParadoxSim(const char *Cmd) {
     arg1 = high << 8 | low;
     arg2 = invert << 8 | clk;
 
-    if (sscanf(Cmd, "%u %u", &fc, &cn ) != 2) return usage_lf_paradox_sim();
+    if (sscanf(Cmd, "%u %u", &fc, &cn) != 2) return usage_lf_paradox_sim();
 
     facilitycode = (fc & 0x000000FF);
     cardnumber = (cn & 0x0000FFFF);
 
     // if ( !GetParadoxBits(facilitycode, cardnumber, bs)) {
-        // PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
-        // return 1;
+    // PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
+    // return 1;
     // }
 
-    PrintAndLogEx(NORMAL, "Simulating Paradox - Facility Code: %u, CardNumber: %u", facilitycode, cardnumber );
+    PrintAndLogEx(NORMAL, "Simulating Paradox - Facility Code: %u, CardNumber: %u", facilitycode, cardnumber);
 
     UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}};
     memcpy(c.d.asBytes, bs, size);
@@ -192,13 +197,15 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFParadox(const char *Cmd) {
+int CmdLFParadox(const char *Cmd)
+{
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
+int CmdHelp(const char *Cmd)
+{
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfpcf7931.c b/client/cmdlfpcf7931.c
index 1bddd4e4c..ab862719f 100644
--- a/client/cmdlfpcf7931.c
+++ b/client/cmdlfpcf7931.c
@@ -28,30 +28,33 @@ static int CmdHelp(const char *Cmd);
 
 // Default values - Configuration
 struct pcf7931_config configPcf = {
-    {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF},
+    {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF},
     PCF7931_DEFAULT_INITDELAY,
     PCF7931_DEFAULT_OFFSET_WIDTH,
     PCF7931_DEFAULT_OFFSET_POSITION
-    };
+};
 
 // Resets the configuration settings to default values.
-int pcf7931_resetConfig(){
-    memset(configPcf.Pwd, 0xFF, sizeof(configPcf.Pwd) );
+int pcf7931_resetConfig()
+{
+    memset(configPcf.Pwd, 0xFF, sizeof(configPcf.Pwd));
     configPcf.InitDelay = PCF7931_DEFAULT_INITDELAY;
     configPcf.OffsetWidth = PCF7931_DEFAULT_OFFSET_WIDTH;
     configPcf.OffsetPosition = PCF7931_DEFAULT_OFFSET_POSITION;
     return 0;
 }
 
-int pcf7931_printConfig(){
-    PrintAndLogEx(NORMAL, "Password (LSB first on bytes) : %s", sprint_hex( configPcf.Pwd, sizeof(configPcf.Pwd)));
+int pcf7931_printConfig()
+{
+    PrintAndLogEx(NORMAL, "Password (LSB first on bytes) : %s", sprint_hex(configPcf.Pwd, sizeof(configPcf.Pwd)));
     PrintAndLogEx(NORMAL, "Tag initialization delay      : %d us", configPcf.InitDelay);
     PrintAndLogEx(NORMAL, "Offset low pulses width       : %d us", configPcf.OffsetWidth);
     PrintAndLogEx(NORMAL, "Offset low pulses position    : %d us", configPcf.OffsetPosition);
     return 0;
 }
 
-int usage_pcf7931_read(){
+int usage_pcf7931_read()
+{
     PrintAndLogEx(NORMAL, "Usage: lf pcf7931 read [h] ");
     PrintAndLogEx(NORMAL, "This command tries to read a PCF7931 tag.");
     PrintAndLogEx(NORMAL, "Options:");
@@ -61,7 +64,8 @@ int usage_pcf7931_read(){
     return 0;
 }
 
-int usage_pcf7931_write(){
+int usage_pcf7931_write()
+{
     PrintAndLogEx(NORMAL, "Usage: lf pcf7931 write [h] <block address> <byte address> <data>");
     PrintAndLogEx(NORMAL, "This command tries to write a PCF7931 tag.");
     PrintAndLogEx(NORMAL, "Options:");
@@ -74,7 +78,8 @@ int usage_pcf7931_write(){
     return 0;
 }
 
-int usage_pcf7931_config(){
+int usage_pcf7931_config()
+{
     PrintAndLogEx(NORMAL, "Usage: lf pcf7931 config [h] [r] <pwd> <delay> <offset width> <offset position>");
     PrintAndLogEx(NORMAL, "This command tries to set the configuration used with PCF7931 commands");
     PrintAndLogEx(NORMAL, "The time offsets could be useful to correct slew rate generated by the antenna");
@@ -94,50 +99,53 @@ int usage_pcf7931_config(){
     return 0;
 }
 
-int CmdLFPCF7931Read(const char *Cmd){
+int CmdLFPCF7931Read(const char *Cmd)
+{
 
     uint8_t ctmp = param_getchar(Cmd, 0);
-    if ( ctmp == 'H' || ctmp == 'h' ) return usage_pcf7931_read();
+    if (ctmp == 'H' || ctmp == 'h') return usage_pcf7931_read();
 
     UsbCommand resp;
     UsbCommand c = {CMD_PCF7931_READ, {0, 0, 0}};
     clearCommandBuffer();
     SendCommand(&c);
-    if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2500) ) {
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         PrintAndLogEx(WARNING, "command execution time out");
         return 1;
     }
     return 0;
 }
 
-int CmdLFPCF7931Config(const char *Cmd){
+int CmdLFPCF7931Config(const char *Cmd)
+{
 
     uint8_t ctmp = param_getchar(Cmd, 0);
-    if ( ctmp == 0) return pcf7931_printConfig();
-    if ( ctmp == 'H' || ctmp == 'h' ) return usage_pcf7931_config();
-    if ( ctmp == 'R' || ctmp == 'r' ) return pcf7931_resetConfig();
+    if (ctmp == 0) return pcf7931_printConfig();
+    if (ctmp == 'H' || ctmp == 'h') return usage_pcf7931_config();
+    if (ctmp == 'R' || ctmp == 'r') return pcf7931_resetConfig();
 
-    if ( param_gethex(Cmd, 0, configPcf.Pwd, 14) ) return usage_pcf7931_config();
+    if (param_gethex(Cmd, 0, configPcf.Pwd, 14)) return usage_pcf7931_config();
 
-    configPcf.InitDelay = (param_get32ex(Cmd,1,0,10) & 0xFFFF);
-    configPcf.OffsetWidth = (int)(param_get32ex(Cmd,2,0,10) & 0xFFFF);
-    configPcf.OffsetPosition = (int)(param_get32ex(Cmd,3,0,10) & 0xFFFF);
+    configPcf.InitDelay = (param_get32ex(Cmd, 1, 0, 10) & 0xFFFF);
+    configPcf.OffsetWidth = (int)(param_get32ex(Cmd, 2, 0, 10) & 0xFFFF);
+    configPcf.OffsetPosition = (int)(param_get32ex(Cmd, 3, 0, 10) & 0xFFFF);
 
     pcf7931_printConfig();
     return 0;
 }
 
-int CmdLFPCF7931Write(const char *Cmd){
+int CmdLFPCF7931Write(const char *Cmd)
+{
 
     uint8_t ctmp = param_getchar(Cmd, 0);
     if (strlen(Cmd) < 1 || ctmp == 'h' || ctmp == 'H') return usage_pcf7931_write();
 
     uint8_t block = 0, bytepos = 0, data = 0;
 
-    if ( param_getdec(Cmd, 0, &block) ) return usage_pcf7931_write();
-    if ( param_getdec(Cmd, 1, &bytepos) ) return usage_pcf7931_write();
+    if (param_getdec(Cmd, 0, &block)) return usage_pcf7931_write();
+    if (param_getdec(Cmd, 1, &bytepos)) return usage_pcf7931_write();
 
-    if ( (block > 7) || (bytepos > 15) ) return usage_pcf7931_write();
+    if ((block > 7) || (bytepos > 15)) return usage_pcf7931_write();
 
     data = param_get8ex(Cmd, 2, 0, 16);
 
@@ -146,7 +154,7 @@ int CmdLFPCF7931Write(const char *Cmd){
     PrintAndLogEx(NORMAL, "         data: 0x%02X", data);
 
     UsbCommand c = {CMD_PCF7931_WRITE, { block, bytepos, data} };
-    memcpy(c.d.asDwords, configPcf.Pwd, sizeof(configPcf.Pwd) );
+    memcpy(c.d.asDwords, configPcf.Pwd, sizeof(configPcf.Pwd));
     c.d.asDwords[7] = (configPcf.OffsetWidth + 128);
     c.d.asDwords[8] = (configPcf.OffsetPosition + 128);
     c.d.asDwords[9] = configPcf.InitDelay;
@@ -165,13 +173,15 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFPCF7931(const char *Cmd) {
+int CmdLFPCF7931(const char *Cmd)
+{
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
+int CmdHelp(const char *Cmd)
+{
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfpcf7931.h b/client/cmdlfpcf7931.h
index 9e279e731..da31877eb 100644
--- a/client/cmdlfpcf7931.h
+++ b/client/cmdlfpcf7931.h
@@ -12,7 +12,7 @@
 #ifndef CMDLFPCF7931_H__
 #define CMDLFPCF7931_H__
 
-struct pcf7931_config{
+struct pcf7931_config {
     uint8_t Pwd[7];
     uint16_t InitDelay;
     int16_t OffsetWidth;
diff --git a/client/cmdlfpresco.c b/client/cmdlfpresco.c
index 51175df83..cb859ef4b 100644
--- a/client/cmdlfpresco.c
+++ b/client/cmdlfpresco.c
@@ -10,7 +10,8 @@
 #include "cmdlfpresco.h"
 static int CmdHelp(const char *Cmd);
 
-int usage_lf_presco_clone(void){
+int usage_lf_presco_clone(void)
+{
     PrintAndLogEx(NORMAL, "clone a Presco tag to a T55x7 tag.");
     PrintAndLogEx(NORMAL, "Usage: lf presco clone [h] d <Card-ID> c <hex-ID> <Q5>");
     PrintAndLogEx(NORMAL, "Options:");
@@ -24,7 +25,8 @@ int usage_lf_presco_clone(void){
     return 0;
 }
 
-int usage_lf_presco_sim(void) {
+int usage_lf_presco_sim(void)
+{
     PrintAndLogEx(NORMAL, "Enables simulation of presco card with specified card number.");
     PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "Per presco format, the card number is 9 digit number and can contain *# chars. Larger values are truncated.");
@@ -41,10 +43,11 @@ int usage_lf_presco_sim(void) {
 }
 
 // find presco preamble 0x10D in already demoded data
-int detectPresco(uint8_t *dest, size_t *size) {
-    if (*size < 128*2) return -1; //make sure buffer has data
+int detectPresco(uint8_t *dest, size_t *size)
+{
+    if (*size < 128 * 2) return -1; //make sure buffer has data
     size_t startIdx = 0;
-    uint8_t preamble[] = {0,0,0,1,0,0,0,0,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0};
+    uint8_t preamble[] = {0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
     if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
         return -2; //preamble not found
     if (*size != 128) return -3; //wrong demoded size
@@ -53,7 +56,8 @@ int detectPresco(uint8_t *dest, size_t *size) {
 }
 
 // convert base 12 ID to sitecode & usercode & 8 bit other unknown code
-int GetWiegandFromPresco(const char *Cmd, uint32_t *sitecode, uint32_t *usercode, uint32_t *fullcode, bool *Q5) {
+int GetWiegandFromPresco(const char *Cmd, uint32_t *sitecode, uint32_t *usercode, uint32_t *fullcode, bool *Q5)
+{
 
     uint8_t val = 0;
     bool hex = false, errors = false;
@@ -69,12 +73,12 @@ int GetWiegandFromPresco(const char *Cmd, uint32_t *sitecode, uint32_t *usercode
             case 'c':
                 hex = true;
                 //get hex
-                *fullcode = param_get32ex(Cmd, cmdp+1, 0, 16);
-                cmdp+=2;
+                *fullcode = param_get32ex(Cmd, cmdp + 1, 0, 16);
+                cmdp += 2;
                 break;
             case 'd':
                 //param get string int param_getstr(const char *line, int paramnum, char * str)
-                stringlen = param_getstr(Cmd, cmdp+1, id, sizeof(id));
+                stringlen = param_getstr(Cmd, cmdp + 1, id, sizeof(id));
                 if (stringlen < 2) return -1;
                 cmdp += 2;
                 break;
@@ -92,21 +96,21 @@ int GetWiegandFromPresco(const char *Cmd, uint32_t *sitecode, uint32_t *usercode
     if (errors || cmdp == 0) return -1;
 
     if (!hex) {
-        for (int index =0; index < strlen(id); ++index) {
+        for (int index = 0; index < strlen(id); ++index) {
 
             // Get value from number string.
-            if ( id[index] == '*' )
+            if (id[index] == '*')
                 val = 10;
-            if ( id[index] == '#')
+            if (id[index] == '#')
                 val = 11;
-            if ( id[index] >= 0x30 && id[index] <= 0x39 )
+            if (id[index] >= 0x30 && id[index] <= 0x39)
                 val = id[index] - 0x30;
 
             *fullcode += val;
 
             // last digit is only added, not multipled.
-            if ( index < strlen(id)-1 )
-                    *fullcode *= 12;
+            if (index < strlen(id) - 1)
+                *fullcode *= 12;
         }
     }
 
@@ -116,16 +120,18 @@ int GetWiegandFromPresco(const char *Cmd, uint32_t *sitecode, uint32_t *usercode
 }
 
 // calc not certain - intended to get bitstream for programming / sim
-int GetPrescoBits(uint32_t fullcode, uint8_t *prescoBits) {
+int GetPrescoBits(uint32_t fullcode, uint8_t *prescoBits)
+{
     num_to_bytebits(0x10D00000, 32, prescoBits);
-    num_to_bytebits(0x00000000, 32, prescoBits+32);
-    num_to_bytebits(0x00000000, 32, prescoBits+64);
-    num_to_bytebits(fullcode  , 32, prescoBits+96);
+    num_to_bytebits(0x00000000, 32, prescoBits + 32);
+    num_to_bytebits(0x00000000, 32, prescoBits + 64);
+    num_to_bytebits(fullcode, 32, prescoBits + 96);
     return 1;
 }
 
 //see ASKDemod for what args are accepted
-int CmdPrescoDemod(const char *Cmd) {
+int CmdPrescoDemod(const char *Cmd)
+{
     bool st = true;
     if (!ASKDemod_ext("32 0 0 0 0 a", false, false, 1, &st)) {
         PrintAndLogEx(DEBUG, "DEBUG: Error Presco ASKDemod failed");
@@ -145,13 +151,13 @@ int CmdPrescoDemod(const char *Cmd) {
         return 0;
     }
     setDemodBuf(DemodBuffer, 128, ans);
-    setClockGrid(g_DemodClock, g_DemodStartIdx + (ans*g_DemodClock));
+    setClockGrid(g_DemodClock, g_DemodStartIdx + (ans * g_DemodClock));
 
     //got a good demod
     uint32_t raw1 = bytebits_to_byte(DemodBuffer, 32);
-    uint32_t raw2 = bytebits_to_byte(DemodBuffer+32, 32);
-    uint32_t raw3 = bytebits_to_byte(DemodBuffer+64, 32);
-    uint32_t raw4 = bytebits_to_byte(DemodBuffer+96, 32);
+    uint32_t raw2 = bytebits_to_byte(DemodBuffer + 32, 32);
+    uint32_t raw3 = bytebits_to_byte(DemodBuffer + 64, 32);
+    uint32_t raw4 = bytebits_to_byte(DemodBuffer + 96, 32);
     uint32_t cardid = raw4;
     PrintAndLogEx(SUCCESS, "Presco Tag Found: Card ID %08X, Raw: %08X%08X%08X%08X", cardid, raw1, raw2, raw3, raw4);
 
@@ -165,7 +171,8 @@ int CmdPrescoDemod(const char *Cmd) {
 }
 
 //see ASKDemod for what args are accepted
-int CmdPrescoRead(const char *Cmd) {
+int CmdPrescoRead(const char *Cmd)
+{
     // Presco Number: 123456789 --> Sitecode 30 | usercode 8665
     lf_read(true, 12000);
     return CmdPrescoDemod(Cmd);
@@ -173,10 +180,11 @@ int CmdPrescoRead(const char *Cmd) {
 
 // takes base 12 ID converts to hex
 // Or takes 8 digit hex ID
-int CmdPrescoClone(const char *Cmd) {
+int CmdPrescoClone(const char *Cmd)
+{
 
     bool Q5 = false;
-    uint32_t sitecode=0, usercode=0, fullcode=0;
+    uint32_t sitecode = 0, usercode = 0, fullcode = 0;
     uint32_t blocks[5] = {T55x7_MODULATION_MANCHESTER | T55x7_BITRATE_RF_32 | 4 << T55x7_MAXBLOCK_SHIFT | T55x7_ST_TERMINATOR, 0, 0, 0, 0};
 
     // get wiegand from printed number.
@@ -204,14 +212,14 @@ int CmdPrescoClone(const char *Cmd) {
     print_blocks(blocks, 5);
 
     UsbCommand resp;
-    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
+    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}};
 
-    for (uint8_t i=0; i<5; i++) {
+    for (uint8_t i = 0; i < 5; i++) {
         c.arg[0] = blocks[i];
         c.arg[1] = i;
         clearCommandBuffer();
         SendCommand(&c);
-        if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)){
+        if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
             return -1;
         }
@@ -221,9 +229,10 @@ int CmdPrescoClone(const char *Cmd) {
 
 // takes base 12 ID converts to hex
 // Or takes 8 digit hex ID
-int CmdPrescoSim(const char *Cmd) {
-    uint32_t sitecode=0, usercode=0, fullcode=0;
-    bool Q5=false;
+int CmdPrescoSim(const char *Cmd)
+{
+    uint32_t sitecode = 0, usercode = 0, fullcode = 0;
+    bool Q5 = false;
     // get wiegand from printed number.
     if (GetWiegandFromPresco(Cmd, &sitecode, &usercode, &fullcode, &Q5) == -1) return usage_lf_presco_sim();
 
@@ -233,7 +242,7 @@ int CmdPrescoSim(const char *Cmd) {
     arg1 = clk << 8 | encoding;
     arg2 = invert << 8 | separator;
 
-    PrintAndLogEx(SUCCESS, "Simulating Presco - SiteCode: %u, UserCode: %u, FullCode: %08X",sitecode, usercode, fullcode);
+    PrintAndLogEx(SUCCESS, "Simulating Presco - SiteCode: %u, UserCode: %u, FullCode: %08X", sitecode, usercode, fullcode);
 
     UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};
     GetPrescoBits(fullcode, c.d.asBytes);
@@ -250,13 +259,15 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFPresco(const char *Cmd) {
+int CmdLFPresco(const char *Cmd)
+{
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
+int CmdHelp(const char *Cmd)
+{
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c
index 939d9444d..aa213ef6a 100644
--- a/client/cmdlfpyramid.c
+++ b/client/cmdlfpyramid.c
@@ -11,7 +11,8 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_lf_pyramid_clone(void){
+int usage_lf_pyramid_clone(void)
+{
     PrintAndLogEx(NORMAL, "clone a Farpointe/Pyramid tag to a T55x7 tag.");
     PrintAndLogEx(NORMAL, "The facility-code is 8-bit and the card number is 16-bit.  Larger values are truncated. ");
     PrintAndLogEx(NORMAL, "Currently only works on 26bit");
@@ -28,7 +29,8 @@ int usage_lf_pyramid_clone(void){
     return 0;
 }
 
-int usage_lf_pyramid_sim(void) {
+int usage_lf_pyramid_sim(void)
+{
     PrintAndLogEx(NORMAL, "Enables simulation of Farpointe/Pyramid card with specified card number.");
     PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "The facility-code is 8-bit and the card number is 16-bit.  Larger values are truncated.");
@@ -47,9 +49,10 @@ int usage_lf_pyramid_sim(void) {
 
 // by marshmellow
 // FSK Demod then try to locate a Farpointe Data (pyramid) ID
-int detectPyramid(uint8_t *dest, size_t *size, int *waveStartIdx) {
+int detectPyramid(uint8_t *dest, size_t *size, int *waveStartIdx)
+{
     //make sure buffer has data
-    if (*size < 128*50) return -1;
+    if (*size < 128 * 50) return -1;
 
     //test samples are not just noise
     if (getSignalProperties()->isnoise) return -2;
@@ -61,7 +64,7 @@ int detectPyramid(uint8_t *dest, size_t *size, int *waveStartIdx) {
     if (*size < 128) return -3;
 
     size_t startIdx = 0;
-    uint8_t preamble[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1};
+    uint8_t preamble[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1};
     if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
         return -4; //preamble not found
 
@@ -72,7 +75,8 @@ int detectPyramid(uint8_t *dest, size_t *size, int *waveStartIdx) {
 }
 
 // Works for 26bits.
-int GetPyramidBits(uint32_t fc, uint32_t cn, uint8_t *pyramidBits) {
+int GetPyramidBits(uint32_t fc, uint32_t cn, uint8_t *pyramidBits)
+{
 
     uint8_t pre[128];
     memset(pre, 0x00, sizeof(pre));
@@ -84,40 +88,41 @@ int GetPyramidBits(uint32_t fc, uint32_t cn, uint8_t *pyramidBits) {
     uint8_t wiegand[24];
     memset(wiegand, 0x00, sizeof(wiegand));
     num_to_bytebits(fc, 8, wiegand);
-    num_to_bytebits(cn, 16, wiegand+8);
+    num_to_bytebits(cn, 16, wiegand + 8);
 
     // add wiegand parity bits (dest, source, len)
-    wiegand_add_parity(pre+80, wiegand, 24);
+    wiegand_add_parity(pre + 80, wiegand, 24);
 
     // add paritybits (bitsource, dest, sourcelen, paritylen, parityType (odd, even,)
-    addParity(pre+8, pyramidBits+8, 102, 8, 1);
+    addParity(pre + 8, pyramidBits + 8, 102, 8, 1);
 
     // add checksum
     uint8_t csBuff[13];
     for (uint8_t i = 0; i < 13; i++)
-        csBuff[i] = bytebits_to_byte(pyramidBits + 16 + (i*8), 8);
+        csBuff[i] = bytebits_to_byte(pyramidBits + 16 + (i * 8), 8);
 
     uint32_t crc = CRC8Maxim(csBuff, 13);
-    num_to_bytebits(crc, 8, pyramidBits+120);
+    num_to_bytebits(crc, 8, pyramidBits + 120);
     return 1;
 }
 
 //by marshmellow
 //Pyramid Prox demod - FSK RF/50 with preamble of 0000000000000001  (always a 128 bit data stream)
 //print full Farpointe Data/Pyramid Prox ID and some bit format details if found
-int CmdPyramidDemod(const char *Cmd) {
+int CmdPyramidDemod(const char *Cmd)
+{
     //raw fsk demod no manchester decoding no start bit finding just get binary from wave
-    uint8_t bits[MAX_GRAPH_TRACE_LEN]={0};
+    uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
     size_t size = getFromGraphBuf(bits);
     if (size == 0) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - Pyramid not enough samples");
         return 0;
     }
     //get binary from fsk wave
-    int waveIdx=0;
+    int waveIdx = 0;
     int idx = detectPyramid(bits, &size, &waveIdx);
-    if (idx < 0){
-            if (idx == -1)
+    if (idx < 0) {
+        if (idx == -1)
             PrintAndLogEx(DEBUG, "DEBUG: Error - Pyramid: not enough samples");
         else if (idx == -2)
             PrintAndLogEx(DEBUG, "DEBUG: Error - Pyramid: only noise found");
@@ -128,11 +133,11 @@ int CmdPyramidDemod(const char *Cmd) {
         else if (idx == -5)
             PrintAndLogEx(DEBUG, "DEBUG: Error - Pyramid: size not correct: %d", size);
         else
-            PrintAndLogEx(DEBUG, "DEBUG: Error - Pyramid: error demoding fsk idx: %d",idx);
+            PrintAndLogEx(DEBUG, "DEBUG: Error - Pyramid: error demoding fsk idx: %d", idx);
         return 0;
     }
     setDemodBuf(bits, size, idx);
-    setClockGrid(50, waveIdx + (idx*50));
+    setClockGrid(50, waveIdx + (idx * 50));
 
     // Index map
     // 0           10          20          30            40          50          60
@@ -158,22 +163,22 @@ int CmdPyramidDemod(const char *Cmd) {
     //get bytes for checksum calc
     uint8_t checksum = bytebits_to_byte(bits + idx + 120, 8);
     uint8_t csBuff[14] = {0x00};
-    for (uint8_t i = 0; i < 13; i++){
-        csBuff[i] = bytebits_to_byte(bits + idx + 16 + (i*8), 8);
+    for (uint8_t i = 0; i < 13; i++) {
+        csBuff[i] = bytebits_to_byte(bits + idx + 16 + (i * 8), 8);
     }
     //check checksum calc
     //checksum calc thanks to ICEMAN!!
     uint32_t checkCS =  CRC8Maxim(csBuff, 13);
 
     //get raw ID before removing parities
-    uint32_t rawLo = bytebits_to_byte(bits+idx+96, 32);
-    uint32_t rawHi = bytebits_to_byte(bits+idx+64, 32);
-    uint32_t rawHi2 = bytebits_to_byte(bits+idx+32, 32);
-    uint32_t rawHi3 = bytebits_to_byte(bits+idx, 32);
+    uint32_t rawLo = bytebits_to_byte(bits + idx + 96, 32);
+    uint32_t rawHi = bytebits_to_byte(bits + idx + 64, 32);
+    uint32_t rawHi2 = bytebits_to_byte(bits + idx + 32, 32);
+    uint32_t rawHi3 = bytebits_to_byte(bits + idx, 32);
 
-    size = removeParity(bits, idx+8, 8, 1, 120);
-    if (size != 105){
-        if ( size == 0)
+    size = removeParity(bits, idx + 8, 8, 1, 120);
+    if (size != 105) {
+        if (size == 0)
             PrintAndLogEx(DEBUG, "DEBUG: Error - Pyramid: parity check failed - IDX: %d, hi3: %08X", idx, rawHi3);
         else
             PrintAndLogEx(DEBUG, "DEBUG: Error - Pyramid: at parity check - tag size does not match Pyramid format, SIZE: %d, IDX: %d, hi3: %08X", size, idx, rawHi3);
@@ -205,32 +210,32 @@ int CmdPyramidDemod(const char *Cmd) {
 
     //find start bit to get fmtLen
     int j;
-    for (j=0; j < size; ++j){
-        if(bits[j]) break;
+    for (j = 0; j < size; ++j) {
+        if (bits[j]) break;
     }
 
-    uint8_t fmtLen = size-j-8;
+    uint8_t fmtLen = size - j - 8;
     uint32_t fc = 0;
     uint32_t cardnum = 0;
     uint32_t code1 = 0;
 
-    if ( fmtLen == 26 ){
-        fc = bytebits_to_byte(bits+73, 8);
-        cardnum = bytebits_to_byte(bits+81, 16);
-        code1 = bytebits_to_byte(bits+72,fmtLen);
+    if (fmtLen == 26) {
+        fc = bytebits_to_byte(bits + 73, 8);
+        cardnum = bytebits_to_byte(bits + 81, 16);
+        code1 = bytebits_to_byte(bits + 72, fmtLen);
         PrintAndLogEx(SUCCESS, "Pyramid ID Found - BitLength: %d, FC: %d, Card: %d - Wiegand: %x, Raw: %08x%08x%08x%08x", fmtLen, fc, cardnum, code1, rawHi3, rawHi2, rawHi, rawLo);
     } else if (fmtLen == 45) {
         fmtLen = 42; //end = 10 bits not 7 like 26 bit fmt
-        fc = bytebits_to_byte(bits+53, 10);
-        cardnum = bytebits_to_byte(bits+63, 32);
+        fc = bytebits_to_byte(bits + 53, 10);
+        cardnum = bytebits_to_byte(bits + 63, 32);
         PrintAndLogEx(SUCCESS, "Pyramid ID Found - BitLength: %d, FC: %d, Card: %d - Raw: %08x%08x%08x%08x", fmtLen, fc, cardnum, rawHi3, rawHi2, rawHi, rawLo);
     } else {
-        cardnum = bytebits_to_byte(bits+81, 16);
-        if (fmtLen>32){
+        cardnum = bytebits_to_byte(bits + 81, 16);
+        if (fmtLen > 32) {
             //code1 = bytebits_to_byte(bits+(size-fmtLen),fmtLen-32);
             //code2 = bytebits_to_byte(bits+(size-32),32);
-        PrintAndLogEx(SUCCESS, "Pyramid ID Found - BitLength: %d -unknown BitLength- (%d), Raw: %08x%08x%08x%08x", fmtLen, cardnum, rawHi3, rawHi2, rawHi, rawLo);
-        } else{
+            PrintAndLogEx(SUCCESS, "Pyramid ID Found - BitLength: %d -unknown BitLength- (%d), Raw: %08x%08x%08x%08x", fmtLen, cardnum, rawHi3, rawHi2, rawHi, rawLo);
+        } else {
             //code1 = bytebits_to_byte(bits+(size-fmtLen),fmtLen);
             PrintAndLogEx(SUCCESS, "Pyramid ID Found - BitLength: %d -unknown BitLength- (%d), Raw: %08x%08x%08x%08x", fmtLen, cardnum, rawHi3, rawHi2, rawHi, rawLo);
         }
@@ -247,27 +252,29 @@ int CmdPyramidDemod(const char *Cmd) {
     return 1;
 }
 
-int CmdPyramidRead(const char *Cmd) {
+int CmdPyramidRead(const char *Cmd)
+{
     lf_read(true, 15000);
     return CmdPyramidDemod(Cmd);
 }
 
-int CmdPyramidClone(const char *Cmd) {
+int CmdPyramidClone(const char *Cmd)
+{
 
     char cmdp = param_getchar(Cmd, 0);
     if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_pyramid_clone();
 
-    uint32_t facilitycode=0, cardnumber=0, fc = 0, cn = 0;
+    uint32_t facilitycode = 0, cardnumber = 0, fc = 0, cn = 0;
     uint32_t blocks[5];
     uint8_t bs[128];
     memset(bs, 0x00, sizeof(bs));
 
-    if (sscanf(Cmd, "%u %u", &fc, &cn ) != 2) return usage_lf_pyramid_clone();
+    if (sscanf(Cmd, "%u %u", &fc, &cn) != 2) return usage_lf_pyramid_clone();
 
     facilitycode = (fc & 0x000000FF);
     cardnumber = (cn & 0x0000FFFF);
 
-    if ( !GetPyramidBits(facilitycode, cardnumber, bs)) {
+    if (!GetPyramidBits(facilitycode, cardnumber, bs)) {
         PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
         return 1;
     }
@@ -288,14 +295,14 @@ int CmdPyramidClone(const char *Cmd) {
     print_blocks(blocks, 5);
 
     UsbCommand resp;
-    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
+    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}};
 
-    for (uint8_t i = 0; i < 5; ++i ) {
+    for (uint8_t i = 0; i < 5; ++i) {
         c.arg[0] = blocks[i];
         c.arg[1] = i;
         clearCommandBuffer();
         SendCommand(&c);
-        if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)){
+        if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
             return -1;
         }
@@ -303,7 +310,8 @@ int CmdPyramidClone(const char *Cmd) {
     return 0;
 }
 
-int CmdPyramidSim(const char *Cmd) {
+int CmdPyramidSim(const char *Cmd)
+{
 
     char cmdp = param_getchar(Cmd, 0);
     if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_pyramid_sim();
@@ -320,17 +328,17 @@ int CmdPyramidSim(const char *Cmd) {
     arg1 = high << 8 | low;
     arg2 = invert << 8 | clk;
 
-    if (sscanf(Cmd, "%u %u", &fc, &cn ) != 2) return usage_lf_pyramid_sim();
+    if (sscanf(Cmd, "%u %u", &fc, &cn) != 2) return usage_lf_pyramid_sim();
 
     facilitycode = (fc & 0x000000FF);
     cardnumber = (cn & 0x0000FFFF);
 
-    if ( !GetPyramidBits(facilitycode, cardnumber, bs)) {
+    if (!GetPyramidBits(facilitycode, cardnumber, bs)) {
         PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
         return 1;
     }
 
-    PrintAndLogEx(SUCCESS, "Simulating Farpointe/Pyramid - Facility Code: %u, CardNumber: %u", facilitycode, cardnumber );
+    PrintAndLogEx(SUCCESS, "Simulating Farpointe/Pyramid - Facility Code: %u, CardNumber: %u", facilitycode, cardnumber);
 
     UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}};
     memcpy(c.d.asBytes, bs, size);
@@ -341,20 +349,22 @@ int CmdPyramidSim(const char *Cmd) {
 
 static command_t CommandTable[] = {
     {"help",    CmdHelp,        1, "this help"},
-    {"demod",   CmdPyramidDemod,0, "demodulate a Pyramid FSK tag from the GraphBuffer"},
+    {"demod",   CmdPyramidDemod, 0, "demodulate a Pyramid FSK tag from the GraphBuffer"},
     {"read",    CmdPyramidRead, 0, "attempt to read and extract tag data"},
-    {"clone",   CmdPyramidClone,0, "clone pyramid tag"},
+    {"clone",   CmdPyramidClone, 0, "clone pyramid tag"},
     {"sim",     CmdPyramidSim,  0, "simulate pyramid tag"},
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFPyramid(const char *Cmd) {
+int CmdLFPyramid(const char *Cmd)
+{
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
+int CmdHelp(const char *Cmd)
+{
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfsecurakey.c b/client/cmdlfsecurakey.c
index 52feead8a..bb021eeb3 100644
--- a/client/cmdlfsecurakey.c
+++ b/client/cmdlfsecurakey.c
@@ -13,10 +13,11 @@ static int CmdHelp(const char *Cmd);
 
 // by marshmellow
 // find Securakey preamble in already demoded data
-int detectSecurakey(uint8_t *dest, size_t *size) {
+int detectSecurakey(uint8_t *dest, size_t *size)
+{
     if (*size < 96) return -1; //make sure buffer has data
     size_t startIdx = 0;
-    uint8_t preamble[] = {0,1,1,1,1,1,1,1,1,1,0,0,1};
+    uint8_t preamble[] = {0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1};
     if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
         return -2; //preamble not found
     if (*size != 96) return -3; //wrong demoded size
@@ -25,7 +26,8 @@ int detectSecurakey(uint8_t *dest, size_t *size) {
 }
 
 //see ASKDemod for what args are accepted
-int CmdSecurakeyDemod(const char *Cmd) {
+int CmdSecurakeyDemod(const char *Cmd)
+{
 
     //ASK / Manchester
     bool st = false;
@@ -48,12 +50,12 @@ int CmdSecurakeyDemod(const char *Cmd) {
         return 0;
     }
     setDemodBuf(DemodBuffer, 96, ans);
-    setClockGrid(g_DemodClock, g_DemodStartIdx + (ans*g_DemodClock));
+    setClockGrid(g_DemodClock, g_DemodStartIdx + (ans * g_DemodClock));
 
     //got a good demod
-    uint32_t raw1 = bytebits_to_byte(DemodBuffer   , 32);
-    uint32_t raw2 = bytebits_to_byte(DemodBuffer+32, 32);
-    uint32_t raw3 = bytebits_to_byte(DemodBuffer+64, 32);
+    uint32_t raw1 = bytebits_to_byte(DemodBuffer, 32);
+    uint32_t raw2 = bytebits_to_byte(DemodBuffer + 32, 32);
+    uint32_t raw3 = bytebits_to_byte(DemodBuffer + 64, 32);
 
     // 26 bit format
     // preamble     ??bitlen   reserved        EPx   xxxxxxxy   yyyyyyyy   yyyyyyyOP  CS?        CS2?
@@ -72,61 +74,64 @@ int CmdSecurakeyDemod(const char *Cmd) {
 
     // remove marker bits (0's every 9th digit after preamble) (pType = 3 (always 0s))
     size = removeParity(bits_no_spacer, 0, 9, 3, 85);
-    if ( size != 85-9 ) {
+    if (size != 85 - 9) {
         PrintAndLogEx(DEBUG, "DEBUG: Error removeParity: %d", size);
         return 0;
     }
 
-    uint8_t bitLen = (uint8_t)bytebits_to_byte(bits_no_spacer+2, 6);
-    uint32_t fc=0, lWiegand=0, rWiegand=0;
+    uint8_t bitLen = (uint8_t)bytebits_to_byte(bits_no_spacer + 2, 6);
+    uint32_t fc = 0, lWiegand = 0, rWiegand = 0;
     if (bitLen > 40) { //securakey's max bitlen is 40 bits...
         PrintAndLogEx(DEBUG, "DEBUG: Error bitLen too long: %u", bitLen);
         return 0;
     }
     // get left 1/2 wiegand & right 1/2 wiegand (for parity test and wiegand print)
-    lWiegand = bytebits_to_byte(bits_no_spacer + 48 - bitLen, bitLen/2);
-    rWiegand = bytebits_to_byte(bits_no_spacer + 48 - bitLen + bitLen/2, bitLen/2);
+    lWiegand = bytebits_to_byte(bits_no_spacer + 48 - bitLen, bitLen / 2);
+    rWiegand = bytebits_to_byte(bits_no_spacer + 48 - bitLen + bitLen / 2, bitLen / 2);
     // get FC
-    fc = bytebits_to_byte(bits_no_spacer+49-bitLen, bitLen-2-16);
+    fc = bytebits_to_byte(bits_no_spacer + 49 - bitLen, bitLen - 2 - 16);
 
     // test bitLen
     if (bitLen != 26 && bitLen != 32)
         PrintAndLogEx(NORMAL, "***unknown securakey bitLen - share with forum***");
 
-    uint32_t cardid = bytebits_to_byte(bits_no_spacer+8+23, 16);
+    uint32_t cardid = bytebits_to_byte(bits_no_spacer + 8 + 23, 16);
     // test parities - evenparity32 looks to add an even parity returns 0 if already even...
     bool parity = !evenparity32(lWiegand) && !oddparity32(rWiegand);
 
-    PrintAndLogEx(SUCCESS, "Securakey Tag Found--BitLen: %u, Card ID: %u, FC: 0x%X, Raw: %08X%08X%08X", bitLen, cardid, fc, raw1 ,raw2, raw3);
+    PrintAndLogEx(SUCCESS, "Securakey Tag Found--BitLen: %u, Card ID: %u, FC: 0x%X, Raw: %08X%08X%08X", bitLen, cardid, fc, raw1, raw2, raw3);
     if (bitLen <= 32)
-        PrintAndLogEx(SUCCESS, "Wiegand: %08X, Parity: %s", (lWiegand<<(bitLen/2)) | rWiegand, parity ? "Passed" : "Failed");
+        PrintAndLogEx(SUCCESS, "Wiegand: %08X, Parity: %s", (lWiegand << (bitLen / 2)) | rWiegand, parity ? "Passed" : "Failed");
     PrintAndLogEx(INFO, "\nHow the FC translates to printed FC is unknown");
     PrintAndLogEx(INFO, "How the checksum is calculated is unknown");
     PrintAndLogEx(INFO, "Help the community identify this format further\n by sharing your tag on the pm3 forum or with forum members");
     return 1;
 }
 
-int CmdSecurakeyRead(const char *Cmd) {
+int CmdSecurakeyRead(const char *Cmd)
+{
     lf_read(true, 8000);
     return CmdSecurakeyDemod(Cmd);
 }
 
 static command_t CommandTable[] = {
     {"help",  CmdHelp,          1, "This help"},
-    {"demod", CmdSecurakeyDemod,1, "Demodulate an Securakey tag from the GraphBuffer"},
+    {"demod", CmdSecurakeyDemod, 1, "Demodulate an Securakey tag from the GraphBuffer"},
     {"read",  CmdSecurakeyRead, 0, "Attempt to read and extract tag data from the antenna"},
     //{"clone", CmdSecurakeyClone,0, "clone Securakey tag"},
     //{"sim",   CmdSecurakeydSim, 0, "simulate Securakey tag"},
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFSecurakey(const char *Cmd) {
+int CmdLFSecurakey(const char *Cmd)
+{
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
+int CmdHelp(const char *Cmd)
+{
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 0aba4b4be..039d69c07 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -11,14 +11,17 @@
 // Default configuration
 t55xx_conf_block_t config = { .modulation = DEMOD_ASK, .inverted = false, .offset = 0x00, .block0 = 0x00, .Q5 = false };
 
-t55xx_conf_block_t Get_t55xx_Config(){
+t55xx_conf_block_t Get_t55xx_Config()
+{
     return config;
 }
-void Set_t55xx_Config(t55xx_conf_block_t conf){
+void Set_t55xx_Config(t55xx_conf_block_t conf)
+{
     config = conf;
 }
 
-int usage_t55xx_config(){
+int usage_t55xx_config()
+{
     PrintAndLogEx(NORMAL, "Usage: lf t55xx config [d <demodulation>] [i 1] [o <offset>] [Q5]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       h                                - This help");
@@ -36,7 +39,8 @@ int usage_t55xx_config(){
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
-int usage_t55xx_read(){
+int usage_t55xx_read()
+{
     PrintAndLogEx(NORMAL, "Usage:  lf t55xx read [b <block>] [p <password>] <override_safety> <page1>");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "     b <block>    - block number to read. Between 0-7");
@@ -54,7 +58,8 @@ int usage_t55xx_read(){
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
-int usage_t55xx_write(){
+int usage_t55xx_write()
+{
     PrintAndLogEx(NORMAL, "Usage:  lf t55xx write [b <block>] [d <data>] [p <password>] [1] [t]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "     b <block>    - block number to write. Between 0-7");
@@ -69,7 +74,8 @@ int usage_t55xx_write(){
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
-int usage_t55xx_trace() {
+int usage_t55xx_trace()
+{
     PrintAndLogEx(NORMAL, "Usage:  lf t55xx trace [1]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "     1            - if set, use Graphbuffer otherwise read data from tag.");
@@ -80,7 +86,8 @@ int usage_t55xx_trace() {
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
-int usage_t55xx_info() {
+int usage_t55xx_info()
+{
     PrintAndLogEx(NORMAL, "Usage:  lf t55xx info [1]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "     1            - if set, use Graphbuffer otherwise read data from tag.");
@@ -91,7 +98,8 @@ int usage_t55xx_info() {
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
-int usage_t55xx_dump(){
+int usage_t55xx_dump()
+{
     PrintAndLogEx(NORMAL, "Usage:  lf t55xx dump <password> [o]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "     <password>   - OPTIONAL password 4bytes (8 hex symbols)");
@@ -103,7 +111,8 @@ int usage_t55xx_dump(){
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
-int usage_t55xx_detect(){
+int usage_t55xx_detect()
+{
     PrintAndLogEx(NORMAL, "Usage:  lf t55xx detect [1] [p <password>]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "     1            - if set, use Graphbuffer otherwise read data from tag.");
@@ -116,7 +125,8 @@ int usage_t55xx_detect(){
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
-int usage_t55xx_detectP1(){
+int usage_t55xx_detectP1()
+{
     PrintAndLogEx(NORMAL, "Command: Detect Page 1 of a t55xx chip");
     PrintAndLogEx(NORMAL, "Usage:  lf t55xx p1detect [1] [p <password>]");
     PrintAndLogEx(NORMAL, "Options:");
@@ -130,7 +140,8 @@ int usage_t55xx_detectP1(){
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
-int usage_t55xx_wakup(){
+int usage_t55xx_wakup()
+{
     PrintAndLogEx(NORMAL, "Usage:  lf t55xx wakeup [h] p <password>");
     PrintAndLogEx(NORMAL, "This commands send the Answer-On-Request command and leaves the readerfield ON afterwards.");
     PrintAndLogEx(NORMAL, "Options:");
@@ -141,7 +152,8 @@ int usage_t55xx_wakup(){
     PrintAndLogEx(NORMAL, "      lf t55xx wakeup p 11223344  - send wakeup password");
     return 0;
 }
-int usage_t55xx_chk(){
+int usage_t55xx_chk()
+{
     PrintAndLogEx(NORMAL, "This command uses a dictionary attack");
     PrintAndLogEx(NORMAL, "press 'enter' to cancel the command");
     PrintAndLogEx(NORMAL, "Usage: lf t55xx bruteforce [h] <m> [i <*.dic>]");
@@ -156,7 +168,8 @@ int usage_t55xx_chk(){
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
-int usage_t55xx_bruteforce(){
+int usage_t55xx_bruteforce()
+{
     PrintAndLogEx(NORMAL, "This command uses bruteforce to scan a number range");
     PrintAndLogEx(NORMAL, "press 'enter' to cancel the command");
     PrintAndLogEx(NORMAL, "Usage: lf t55xx bruteforce [h] <start password> <end password>");
@@ -171,7 +184,8 @@ int usage_t55xx_bruteforce(){
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
-int usage_t55xx_recoverpw(){
+int usage_t55xx_recoverpw()
+{
     PrintAndLogEx(NORMAL, "This command uses a few tricks to try to recover mangled password");
     PrintAndLogEx(NORMAL, "press 'enter' to cancel the command");
     PrintAndLogEx(NORMAL, "WARNING: this may brick non-password protected chips!");
@@ -187,7 +201,9 @@ int usage_t55xx_recoverpw(){
     PrintAndLogEx(NORMAL, "       lf t55xx recoverpw 51243648");
     PrintAndLogEx(NORMAL, "");
     return 0;
-}int usage_t55xx_wipe(){
+}
+int usage_t55xx_wipe()
+{
     PrintAndLogEx(NORMAL, "Usage:  lf t55xx wipe [h] [Q5]");
     PrintAndLogEx(NORMAL, "This commands wipes a tag, fills blocks 1-7 with zeros and a default configuration block");
     PrintAndLogEx(NORMAL, "Options:");
@@ -199,7 +215,8 @@ int usage_t55xx_recoverpw(){
     PrintAndLogEx(NORMAL, "      lf t55xx wipe Q5 -  wipes a t5555 Q5 tag, config block 0x6001F004");
     return 0;
 }
-int usage_lf_deviceconfig(){
+int usage_lf_deviceconfig()
+{
     PrintAndLogEx(NORMAL, "Sets t55x7 timings for direkt commands. The timings are set here in Field Clocks (FC), \nwhich is converted to (US) on device");
     PrintAndLogEx(NORMAL, "Usage: lf t55xx deviceconfig a <gap> b <gap> c <gap> d <gap> e <gap> p");
     PrintAndLogEx(NORMAL, "Options:");
@@ -220,123 +237,126 @@ int usage_lf_deviceconfig(){
 
 int CmdHelp(const char *Cmd);
 
-void printT5xxHeader(uint8_t page){
+void printT5xxHeader(uint8_t page)
+{
     PrintAndLogEx(NORMAL, "Reading Page %d:", page);
     PrintAndLogEx(NORMAL, "blk | hex data | binary                           | ascii");
     PrintAndLogEx(NORMAL, "----+----------+----------------------------------+-------");
 }
 
-int CmdT55xxSetConfig(const char *Cmd) {
+int CmdT55xxSetConfig(const char *Cmd)
+{
 
     uint8_t offset = 0;
     char modulation[6] = {0x00};
     char tmp = 0x00;
     uint8_t bitRate = 0;
-    uint8_t rates[9] = {8,16,32,40,50,64,100,128,0};
+    uint8_t rates[9] = {8, 16, 32, 40, 50, 64, 100, 128, 0};
     uint8_t cmdp = 0;
     bool errors = false;
-    while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         tmp = tolower(param_getchar(Cmd, cmdp));
-        switch(tmp) {
-        case 'h':
-            return usage_t55xx_config();
-        case 'b':
-            errors |= param_getdec(Cmd, cmdp+1, &bitRate);
-            if ( !errors){
-                uint8_t i = 0;
-                for (; i < 9; i++){
-                    if (rates[i]==bitRate) {
-                        config.bitrate = i;
-                        break;
+        switch (tmp) {
+            case 'h':
+                return usage_t55xx_config();
+            case 'b':
+                errors |= param_getdec(Cmd, cmdp + 1, &bitRate);
+                if (!errors) {
+                    uint8_t i = 0;
+                    for (; i < 9; i++) {
+                        if (rates[i] == bitRate) {
+                            config.bitrate = i;
+                            break;
+                        }
                     }
+                    if (i == 9) errors = true;
                 }
-                if (i==9) errors = true;
-            }
-            cmdp+=2;
-            break;
-        case 'd':
-            param_getstr(Cmd, cmdp+1, modulation, sizeof(modulation));
-            cmdp += 2;
+                cmdp += 2;
+                break;
+            case 'd':
+                param_getstr(Cmd, cmdp + 1, modulation, sizeof(modulation));
+                cmdp += 2;
 
-            if ( strcmp(modulation, "FSK" ) == 0) {
-                config.modulation = DEMOD_FSK;
-            } else if ( strcmp(modulation, "FSK1" ) == 0) {
-                config.modulation = DEMOD_FSK1;
-                config.inverted=1;
-            } else if ( strcmp(modulation, "FSK1a" ) == 0) {
-                config.modulation = DEMOD_FSK1a;
-                config.inverted=0;
-            } else if ( strcmp(modulation, "FSK2" ) == 0) {
-                config.modulation = DEMOD_FSK2;
-                config.inverted=0;
-            } else if ( strcmp(modulation, "FSK2a" ) == 0) {
-                config.modulation = DEMOD_FSK2a;
-                config.inverted=1;
-            } else if ( strcmp(modulation, "ASK" ) == 0) {
-                config.modulation = DEMOD_ASK;
-            } else if ( strcmp(modulation, "NRZ" ) == 0) {
-                config.modulation = DEMOD_NRZ;
-            } else if ( strcmp(modulation, "PSK1" ) == 0) {
-                config.modulation = DEMOD_PSK1;
-            } else if ( strcmp(modulation, "PSK2" ) == 0) {
-                config.modulation = DEMOD_PSK2;
-            } else if ( strcmp(modulation, "PSK3" ) == 0) {
-                config.modulation = DEMOD_PSK3;
-            } else if ( strcmp(modulation, "BIa" ) == 0) {
-                config.modulation = DEMOD_BIa;
-                config.inverted=1;
-            } else if ( strcmp(modulation, "BI" ) == 0) {
-                config.modulation = DEMOD_BI;
-                config.inverted=0;
-            } else {
-                PrintAndLogEx(WARNING, "Unknown modulation '%s'", modulation);
+                if (strcmp(modulation, "FSK") == 0) {
+                    config.modulation = DEMOD_FSK;
+                } else if (strcmp(modulation, "FSK1") == 0) {
+                    config.modulation = DEMOD_FSK1;
+                    config.inverted = 1;
+                } else if (strcmp(modulation, "FSK1a") == 0) {
+                    config.modulation = DEMOD_FSK1a;
+                    config.inverted = 0;
+                } else if (strcmp(modulation, "FSK2") == 0) {
+                    config.modulation = DEMOD_FSK2;
+                    config.inverted = 0;
+                } else if (strcmp(modulation, "FSK2a") == 0) {
+                    config.modulation = DEMOD_FSK2a;
+                    config.inverted = 1;
+                } else if (strcmp(modulation, "ASK") == 0) {
+                    config.modulation = DEMOD_ASK;
+                } else if (strcmp(modulation, "NRZ") == 0) {
+                    config.modulation = DEMOD_NRZ;
+                } else if (strcmp(modulation, "PSK1") == 0) {
+                    config.modulation = DEMOD_PSK1;
+                } else if (strcmp(modulation, "PSK2") == 0) {
+                    config.modulation = DEMOD_PSK2;
+                } else if (strcmp(modulation, "PSK3") == 0) {
+                    config.modulation = DEMOD_PSK3;
+                } else if (strcmp(modulation, "BIa") == 0) {
+                    config.modulation = DEMOD_BIa;
+                    config.inverted = 1;
+                } else if (strcmp(modulation, "BI") == 0) {
+                    config.modulation = DEMOD_BI;
+                    config.inverted = 0;
+                } else {
+                    PrintAndLogEx(WARNING, "Unknown modulation '%s'", modulation);
+                    errors = true;
+                }
+                break;
+            case 'i':
+                config.inverted = param_getchar(Cmd, cmdp + 1) == '1';
+                cmdp += 2;
+                break;
+            case 'o':
+                errors |= param_getdec(Cmd, cmdp + 1, &offset);
+                if (!errors)
+                    config.offset = offset;
+                cmdp += 2;
+                break;
+            case 'q':
+                config.Q5 = true;
+                cmdp++;
+                break;
+            case 's':
+                config.ST = true;
+                cmdp++;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
                 errors = true;
-            }
-            break;
-        case 'i':
-            config.inverted = param_getchar(Cmd,cmdp+1) == '1';
-            cmdp+=2;
-            break;
-        case 'o':
-            errors |= param_getdec(Cmd, cmdp+1, &offset);
-            if ( !errors )
-                config.offset = offset;
-            cmdp+=2;
-            break;
-        case 'q':
-            config.Q5 = true;
-            cmdp++;
-            break;
-        case 's':
-            config.ST = true;
-            cmdp++;
-            break;
-        default:
-            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-            errors = true;
-            break;
+                break;
         }
     }
 
     // No args
-    if (cmdp == 0) return printConfiguration( config );
+    if (cmdp == 0) return printConfiguration(config);
 
     //Validations
     if (errors) return usage_t55xx_config();
 
     config.block0 = 0;
-    return printConfiguration ( config );
+    return printConfiguration(config);
 }
 
-int T55xxReadBlock(uint8_t block, bool page1, bool usepwd, bool override, uint32_t password){
+int T55xxReadBlock(uint8_t block, bool page1, bool usepwd, bool override, uint32_t password)
+{
     //Password mode
-    if ( usepwd ) {
+    if (usepwd) {
         // try reading the config block and verify that PWD bit is set before doing this!
-        if ( !override ) {
+        if (!override) {
 
-            if ( !AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, false, 0 ) ) return 0;
+            if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, false, 0)) return 0;
 
-            if ( !tryDetectModulation() ) {
+            if (!tryDetectModulation()) {
                 PrintAndLogEx(NORMAL, "Safety Check: Could not detect if PWD bit is set in config block. Exits.");
                 return 0;
             } else {
@@ -349,7 +369,7 @@ int T55xxReadBlock(uint8_t block, bool page1, bool usepwd, bool override, uint32
         }
     }
 
-    if (!AquireData(page1, block, usepwd, password) ) return 0;
+    if (!AquireData(page1, block, usepwd, password)) return 0;
     if (!DecodeT55xxBlock()) return 0;
 
     char blk[10] = {0};
@@ -358,7 +378,8 @@ int T55xxReadBlock(uint8_t block, bool page1, bool usepwd, bool override, uint32
     return 1;
 }
 
-int CmdT55xxReadBlock(const char *Cmd) {
+int CmdT55xxReadBlock(const char *Cmd)
+{
     uint8_t block = REGULAR_READ_MODE_BLOCK;
     uint32_t password = 0; //default to blank Block 7
     bool usepwd = false;
@@ -366,31 +387,31 @@ int CmdT55xxReadBlock(const char *Cmd) {
     bool page1 = false;
     bool errors = false;
     uint8_t cmdp = 0;
-    while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-        switch ( tolower(param_getchar(Cmd, cmdp))) {
-        case 'h':
-            return usage_t55xx_read();
-        case 'b':
-            errors |= param_getdec(Cmd, cmdp+1, &block);
-            cmdp += 2;
-            break;
-        case 'o':
-            override = true;
-            cmdp++;
-            break;
-        case 'p':
-            password = param_get32ex(Cmd, cmdp+1, 0, 16);
-            usepwd = true;
-            cmdp += 2;
-            break;
-        case '1':
-            page1 = true;
-            cmdp++;
-            break;
-        default:
-            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-            errors = true;
-            break;
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+            case 'h':
+                return usage_t55xx_read();
+            case 'b':
+                errors |= param_getdec(Cmd, cmdp + 1, &block);
+                cmdp += 2;
+                break;
+            case 'o':
+                override = true;
+                cmdp++;
+                break;
+            case 'p':
+                password = param_get32ex(Cmd, cmdp + 1, 0, 16);
+                usepwd = true;
+                cmdp += 2;
+                break;
+            case '1':
+                page1 = true;
+                cmdp++;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                errors = true;
+                break;
         }
     }
     if (errors) return usage_t55xx_read();
@@ -404,39 +425,40 @@ int CmdT55xxReadBlock(const char *Cmd) {
     return T55xxReadBlock(block, page1, usepwd, override, password);
 }
 
-bool DecodeT55xxBlock(){
+bool DecodeT55xxBlock()
+{
 
     char buf[30] = {0x00};
     char *cmdStr = buf;
     int ans = 0;
     bool ST = config.ST;
-    uint8_t bitRate[8] = {8,16,32,40,50,64,100,128};
+    uint8_t bitRate[8] = {8, 16, 32, 40, 50, 64, 100, 128};
     DemodBufferLen = 0x00;
 
-    switch( config.modulation ){
+    switch (config.modulation) {
         case DEMOD_FSK:
-            snprintf(cmdStr, sizeof(buf),"%d %d", bitRate[config.bitrate], config.inverted );
+            snprintf(cmdStr, sizeof(buf), "%d %d", bitRate[config.bitrate], config.inverted);
             ans = FSKrawDemod(cmdStr, false);
             break;
         case DEMOD_FSK1:
         case DEMOD_FSK1a:
-            snprintf(cmdStr, sizeof(buf),"%d %d 8 5", bitRate[config.bitrate], config.inverted );
+            snprintf(cmdStr, sizeof(buf), "%d %d 8 5", bitRate[config.bitrate], config.inverted);
             ans = FSKrawDemod(cmdStr, false);
             break;
         case DEMOD_FSK2:
         case DEMOD_FSK2a:
-            snprintf(cmdStr, sizeof(buf),"%d %d 10 8", bitRate[config.bitrate], config.inverted );
+            snprintf(cmdStr, sizeof(buf), "%d %d 10 8", bitRate[config.bitrate], config.inverted);
             ans = FSKrawDemod(cmdStr, false);
             break;
         case DEMOD_ASK:
-            snprintf(cmdStr, sizeof(buf),"%d %d 1", bitRate[config.bitrate], config.inverted );
+            snprintf(cmdStr, sizeof(buf), "%d %d 1", bitRate[config.bitrate], config.inverted);
             ans = ASKDemod_ext(cmdStr, false, false, 1, &ST);
             break;
         case DEMOD_PSK1:
             // skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)
             save_restoreGB(GRAPH_SAVE);
             CmdLtrim("160");
-            snprintf(cmdStr, sizeof(buf),"%d %d 6", bitRate[config.bitrate], config.inverted );
+            snprintf(cmdStr, sizeof(buf), "%d %d 6", bitRate[config.bitrate], config.inverted);
             ans = PSKDemod(cmdStr, false);
             //undo trim samples
             save_restoreGB(GRAPH_RESTORE);
@@ -446,19 +468,19 @@ bool DecodeT55xxBlock(){
             // skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)
             save_restoreGB(GRAPH_SAVE);
             CmdLtrim("160");
-            snprintf(cmdStr, sizeof(buf),"%d 0 6", bitRate[config.bitrate] );
+            snprintf(cmdStr, sizeof(buf), "%d 0 6", bitRate[config.bitrate]);
             ans = PSKDemod(cmdStr, false);
             psk1TOpsk2(DemodBuffer, DemodBufferLen);
             //undo trim samples
             save_restoreGB(GRAPH_RESTORE);
             break;
         case DEMOD_NRZ:
-            snprintf(cmdStr, sizeof(buf),"%d %d 1", bitRate[config.bitrate], config.inverted );
+            snprintf(cmdStr, sizeof(buf), "%d %d 1", bitRate[config.bitrate], config.inverted);
             ans = NRZrawDemod(cmdStr, false);
             break;
         case DEMOD_BI:
         case DEMOD_BIa:
-            snprintf(cmdStr, sizeof(buf),"0 %d %d 1", bitRate[config.bitrate], config.inverted );
+            snprintf(cmdStr, sizeof(buf), "0 %d %d 1", bitRate[config.bitrate], config.inverted);
             ans = ASKbiphaseDemod(cmdStr, false);
             break;
         default:
@@ -467,7 +489,8 @@ bool DecodeT55xxBlock(){
     return (bool) ans;
 }
 
-bool DecodeT5555TraceBlock() {
+bool DecodeT5555TraceBlock()
+{
     DemodBufferLen = 0x00;
 
     // According to datasheet. Always: RF/64, not inverted, Manchester
@@ -475,38 +498,40 @@ bool DecodeT5555TraceBlock() {
 }
 
 // sanity check. Don't use proxmark if it is offline and you didn't specify useGraphbuf
-static int SanityOfflineCheck( bool useGraphBuffer ){
-    if ( !useGraphBuffer && IsOffline() ) {
+static int SanityOfflineCheck(bool useGraphBuffer)
+{
+    if (!useGraphBuffer && IsOffline()) {
         PrintAndLogEx(NORMAL, "Your proxmark3 device is offline. Specify [1] to use graphbuffer data instead");
         return 0;
     }
     return 1;
 }
 
-int CmdT55xxDetect(const char *Cmd){
+int CmdT55xxDetect(const char *Cmd)
+{
     bool errors = false;
     bool useGB = false, usepwd = false;
     uint32_t password = 0;
     uint8_t cmdp = 0;
 
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-        switch ( tolower(param_getchar(Cmd, cmdp))) {
-        case 'h':
-            return usage_t55xx_detect();
-        case 'p':
-            password = param_get32ex(Cmd, cmdp+1, 0, 16);
-            usepwd = true;
-            cmdp += 2;
-            break;
-        case '1':
-            // use Graphbuffer data
-            useGB = true;
-            cmdp++;
-            break;
-        default:
-            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-            errors = true;
-            break;
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+            case 'h':
+                return usage_t55xx_detect();
+            case 'p':
+                password = param_get32ex(Cmd, cmdp + 1, 0, 16);
+                usepwd = true;
+                cmdp += 2;
+                break;
+            case '1':
+                // use Graphbuffer data
+                useGB = true;
+                cmdp++;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                errors = true;
+                break;
         }
     }
     if (errors) return usage_t55xx_detect();
@@ -514,19 +539,20 @@ int CmdT55xxDetect(const char *Cmd){
     // sanity check.
     if (!SanityOfflineCheck(useGB)) return 1;
 
-    if ( !useGB) {
-        if ( !AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, usepwd, password) )
+    if (!useGB) {
+        if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, usepwd, password))
             return 1;
     }
 
-    if ( !tryDetectModulation() )
+    if (!tryDetectModulation())
         PrintAndLogEx(WARNING, "Could not detect modulation automatically. Try setting it manually with \'lf t55xx config\'");
 
     return 0;
 }
 
 // detect configuration?
-bool tryDetectModulation(){
+bool tryDetectModulation()
+{
 
     t55xx_conf_block_t tests[15];
     int bitRate = 0, clk = 0, firstClockEdge = 0;
@@ -534,12 +560,12 @@ bool tryDetectModulation(){
 
     ans = fskClocks(&fc1, &fc2, (uint8_t *)&clk, &firstClockEdge);
 
-    if (ans && ((fc1==10 && fc2==8) || (fc1==8 && fc2==5))) {
-        if ( FSKrawDemod("0 0", false) && test(DEMOD_FSK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)){
+    if (ans && ((fc1 == 10 && fc2 == 8) || (fc1 == 8 && fc2 == 5))) {
+        if (FSKrawDemod("0 0", false) && test(DEMOD_FSK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
             tests[hits].modulation = DEMOD_FSK;
-            if (fc1==8 && fc2 == 5)
+            if (fc1 == 8 && fc2 == 5)
                 tests[hits].modulation = DEMOD_FSK1a;
-            else if (fc1==10 && fc2 == 8)
+            else if (fc1 == 10 && fc2 == 8)
                 tests[hits].modulation = DEMOD_FSK2;
             tests[hits].bitrate = bitRate;
             tests[hits].inverted = false;
@@ -547,7 +573,7 @@ bool tryDetectModulation(){
             tests[hits].ST = false;
             ++hits;
         }
-        if ( FSKrawDemod("0 1", false) && test(DEMOD_FSK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
+        if (FSKrawDemod("0 1", false) && test(DEMOD_FSK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
             tests[hits].modulation = DEMOD_FSK;
             if (fc1 == 8 && fc2 == 5)
                 tests[hits].modulation = DEMOD_FSK1;
@@ -568,7 +594,7 @@ bool tryDetectModulation(){
             // false = no emSearch
             // 1 = Ask/Man
             // st = true
-            if ( ASKDemod_ext("0 0 1", false, false, 1, &tests[hits].ST) && test(DEMOD_ASK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
+            if (ASKDemod_ext("0 0 1", false, false, 1, &tests[hits].ST) && test(DEMOD_ASK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
                 tests[hits].modulation = DEMOD_ASK;
                 tests[hits].bitrate = bitRate;
                 tests[hits].inverted = false;
@@ -581,14 +607,14 @@ bool tryDetectModulation(){
             // false = no emSearch
             // 1 = Ask/Man
             // st = true
-            if ( ASKDemod_ext("0 1 1", false, false, 1, &tests[hits].ST)  && test(DEMOD_ASK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
+            if (ASKDemod_ext("0 1 1", false, false, 1, &tests[hits].ST)  && test(DEMOD_ASK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
                 tests[hits].modulation = DEMOD_ASK;
                 tests[hits].bitrate = bitRate;
                 tests[hits].inverted = true;
                 tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
                 ++hits;
             }
-            if ( ASKbiphaseDemod("0 0 0 2", false) && test(DEMOD_BI, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5) ) {
+            if (ASKbiphaseDemod("0 0 0 2", false) && test(DEMOD_BI, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
                 tests[hits].modulation = DEMOD_BI;
                 tests[hits].bitrate = bitRate;
                 tests[hits].inverted = false;
@@ -596,7 +622,7 @@ bool tryDetectModulation(){
                 tests[hits].ST = false;
                 ++hits;
             }
-            if ( ASKbiphaseDemod("0 0 1 2", false) && test(DEMOD_BIa, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5) ) {
+            if (ASKbiphaseDemod("0 0 1 2", false) && test(DEMOD_BIa, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
                 tests[hits].modulation = DEMOD_BIa;
                 tests[hits].bitrate = bitRate;
                 tests[hits].inverted = true;
@@ -607,7 +633,7 @@ bool tryDetectModulation(){
         }
         clk = GetNrzClock("", false);
         if (clk > 8) { //clock of rf/8 is likely a false positive, so don't use it.
-            if ( NRZrawDemod("0 0 1", false)  && test(DEMOD_NRZ, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
+            if (NRZrawDemod("0 0 1", false)  && test(DEMOD_NRZ, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
                 tests[hits].modulation = DEMOD_NRZ;
                 tests[hits].bitrate = bitRate;
                 tests[hits].inverted = false;
@@ -616,7 +642,7 @@ bool tryDetectModulation(){
                 ++hits;
             }
 
-            if ( NRZrawDemod("0 1 1", false)  && test(DEMOD_NRZ, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
+            if (NRZrawDemod("0 1 1", false)  && test(DEMOD_NRZ, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
                 tests[hits].modulation = DEMOD_NRZ;
                 tests[hits].bitrate = bitRate;
                 tests[hits].inverted = true;
@@ -632,7 +658,7 @@ bool tryDetectModulation(){
             save_restoreGB(GRAPH_SAVE);
             // skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)
             CmdLtrim("160");
-            if ( PSKDemod("0 0 6", false) && test(DEMOD_PSK1, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
+            if (PSKDemod("0 0 6", false) && test(DEMOD_PSK1, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
                 tests[hits].modulation = DEMOD_PSK1;
                 tests[hits].bitrate = bitRate;
                 tests[hits].inverted = false;
@@ -640,7 +666,7 @@ bool tryDetectModulation(){
                 tests[hits].ST = false;
                 ++hits;
             }
-            if ( PSKDemod("0 1 6", false) && test(DEMOD_PSK1, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
+            if (PSKDemod("0 1 6", false) && test(DEMOD_PSK1, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
                 tests[hits].modulation = DEMOD_PSK1;
                 tests[hits].bitrate = bitRate;
                 tests[hits].inverted = true;
@@ -650,9 +676,9 @@ bool tryDetectModulation(){
             }
             //ICEMAN: are these PSKDemod calls needed?
             // PSK2 - needs a call to psk1TOpsk2.
-            if ( PSKDemod("0 0 6", false)) {
+            if (PSKDemod("0 0 6", false)) {
                 psk1TOpsk2(DemodBuffer, DemodBufferLen);
-                if (test(DEMOD_PSK2, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)){
+                if (test(DEMOD_PSK2, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
                     tests[hits].modulation = DEMOD_PSK2;
                     tests[hits].bitrate = bitRate;
                     tests[hits].inverted = false;
@@ -662,9 +688,9 @@ bool tryDetectModulation(){
                 }
             } // inverse waves does not affect this demod
             // PSK3 - needs a call to psk1TOpsk2.
-            if ( PSKDemod("0 0 6", false)) {
+            if (PSKDemod("0 0 6", false)) {
                 psk1TOpsk2(DemodBuffer, DemodBufferLen);
-                if (test(DEMOD_PSK3, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)){
+                if (test(DEMOD_PSK3, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
                     tests[hits].modulation = DEMOD_PSK3;
                     tests[hits].bitrate = bitRate;
                     tests[hits].inverted = false;
@@ -673,11 +699,11 @@ bool tryDetectModulation(){
                     ++hits;
                 }
             } // inverse waves does not affect this demod
-        //undo trim samples
+            //undo trim samples
             save_restoreGB(GRAPH_RESTORE);
         }
     }
-    if ( hits == 1) {
+    if (hits == 1) {
         config.modulation = tests[0].modulation;
         config.bitrate = tests[0].bitrate;
         config.inverted = tests[0].inverted;
@@ -685,17 +711,17 @@ bool tryDetectModulation(){
         config.block0 = tests[0].block0;
         config.Q5 = tests[0].Q5;
         config.ST = tests[0].ST;
-        printConfiguration( config );
+        printConfiguration(config);
         return true;
     }
 
     bool retval = false;
-    if ( hits > 1) {
+    if (hits > 1) {
         PrintAndLogEx(SUCCESS, "Found [%d] possible matches for modulation.", hits);
-        for(int i=0; i<hits; ++i){
+        for (int i = 0; i < hits; ++i) {
             retval = testKnownConfigBlock(tests[i].block0);
-            if ( retval ) {
-                PrintAndLogEx(NORMAL, "--[%d]--------------- << selected this", i+1);
+            if (retval) {
+                PrintAndLogEx(NORMAL, "--[%d]--------------- << selected this", i + 1);
                 config.modulation = tests[i].modulation;
                 config.bitrate = tests[i].bitrate;
                 config.inverted = tests[i].inverted;
@@ -704,16 +730,17 @@ bool tryDetectModulation(){
                 config.Q5 = tests[i].Q5;
                 config.ST = tests[i].ST;
             } else {
-                PrintAndLogEx(NORMAL, "--[%d]---------------", i+1);
+                PrintAndLogEx(NORMAL, "--[%d]---------------", i + 1);
             }
-            printConfiguration( tests[i] );
+            printConfiguration(tests[i]);
         }
     }
     return retval;
 }
 
-bool testKnownConfigBlock(uint32_t block0) {
-    switch(block0){
+bool testKnownConfigBlock(uint32_t block0)
+{
+    switch (block0) {
         case T55X7_DEFAULT_CONFIG_BLOCK:
         case T55X7_RAW_CONFIG_BLOCK:
         case T55X7_EM_UNIQUE_CONFIG_BLOCK:
@@ -732,8 +759,9 @@ bool testKnownConfigBlock(uint32_t block0) {
     return false;
 }
 
-bool testModulation(uint8_t mode, uint8_t modread){
-    switch( mode ){
+bool testModulation(uint8_t mode, uint8_t modread)
+{
+    switch (mode) {
         case DEMOD_FSK:
             if (modread >= DEMOD_FSK1 && modread <= DEMOD_FSK2a) return true;
             break;
@@ -764,8 +792,9 @@ bool testModulation(uint8_t mode, uint8_t modread){
     return false;
 }
 
-bool testQ5Modulation(uint8_t mode, uint8_t modread){
-    switch( mode ){
+bool testQ5Modulation(uint8_t mode, uint8_t modread)
+{
+    switch (mode) {
         case DEMOD_FSK:
             if (modread >= 4 && modread <= 5) return true;
             break;
@@ -793,41 +822,48 @@ bool testQ5Modulation(uint8_t mode, uint8_t modread){
     return false;
 }
 
-int convertQ5bitRate(uint8_t bitRateRead) {
+int convertQ5bitRate(uint8_t bitRateRead)
+{
     uint8_t expected[] = {8, 16, 32, 40, 50, 64, 100, 128};
-    for (int i=0; i<8; i++)
+    for (int i = 0; i < 8; i++)
         if (expected[i] == bitRateRead)
             return i;
 
     return -1;
 }
 
-bool testQ5(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk){
+bool testQ5(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk)
+{
 
-    if ( DemodBufferLen < 64 ) return false;
+    if (DemodBufferLen < 64) return false;
     uint8_t si = 0;
-    for (uint8_t idx = 28; idx < 64; idx++){
+    for (uint8_t idx = 28; idx < 64; idx++) {
         si = idx;
-        if ( PackBits(si, 28, DemodBuffer) == 0x00 ) continue;
+        if (PackBits(si, 28, DemodBuffer) == 0x00) continue;
 
-        uint8_t safer     = PackBits(si, 4, DemodBuffer); si += 4;     //master key
-        uint8_t resv      = PackBits(si, 8, DemodBuffer); si += 8;
+        uint8_t safer     = PackBits(si, 4, DemodBuffer);
+        si += 4;     //master key
+        uint8_t resv      = PackBits(si, 8, DemodBuffer);
+        si += 8;
         // 2nibble must be zeroed.
         if (safer != 0x6 && safer != 0x9) continue;
-        if ( resv > 0x00) continue;
+        if (resv > 0x00) continue;
         //uint8_t pageSel   = PackBits(si, 1, DemodBuffer); si += 1;
         //uint8_t fastWrite = PackBits(si, 1, DemodBuffer); si += 1;
-        si += 1+1;
-        int bitRate       = PackBits(si, 6, DemodBuffer)*2 + 2; si += 6;     //bit rate
+        si += 1 + 1;
+        int bitRate       = PackBits(si, 6, DemodBuffer) * 2 + 2;
+        si += 6;     //bit rate
         if (bitRate > 128 || bitRate < 8) continue;
 
         //uint8_t AOR       = PackBits(si, 1, DemodBuffer); si += 1;
         //uint8_t PWD       = PackBits(si, 1, DemodBuffer); si += 1;
         //uint8_t pskcr     = PackBits(si, 2, DemodBuffer); si += 2;  //could check psk cr
         //uint8_t inverse   = PackBits(si, 1, DemodBuffer); si += 1;
-        si += 1+1+2+1;
-        uint8_t modread   = PackBits(si, 3, DemodBuffer); si += 3;
-        uint8_t maxBlk    = PackBits(si, 3, DemodBuffer); si += 3;
+        si += 1 + 1 + 2 + 1;
+        uint8_t modread   = PackBits(si, 3, DemodBuffer);
+        si += 3;
+        uint8_t maxBlk    = PackBits(si, 3, DemodBuffer);
+        si += 3;
         //uint8_t ST        = PackBits(si, 1, DemodBuffer); si += 1;
         if (maxBlk == 0) continue;
         //test modulation
@@ -842,7 +878,8 @@ bool testQ5(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk){
     return false;
 }
 
-bool testBitRate(uint8_t readRate, uint8_t clk){
+bool testBitRate(uint8_t readRate, uint8_t clk)
+{
     uint8_t expected[] = {8, 16, 32, 40, 50, 64, 100, 128};
     if (expected[readRate] == clk)
         return true;
@@ -850,31 +887,37 @@ bool testBitRate(uint8_t readRate, uint8_t clk){
     return false;
 }
 
-bool test(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk, bool *Q5){
+bool test(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk, bool *Q5)
+{
 
-    if ( DemodBufferLen < 64 ) return false;
+    if (DemodBufferLen < 64) return false;
     uint8_t si = 0;
-    for (uint8_t idx = 28; idx < 64; idx++){
+    for (uint8_t idx = 28; idx < 64; idx++) {
         si = idx;
-        if ( PackBits(si, 28, DemodBuffer) == 0x00 ) continue;
+        if (PackBits(si, 28, DemodBuffer) == 0x00) continue;
 
-        uint8_t safer    = PackBits(si, 4, DemodBuffer); si += 4;     //master key
-        uint8_t resv     = PackBits(si, 4, DemodBuffer); si += 4;     //was 7 & +=7+3 //should be only 4 bits if extended mode
+        uint8_t safer    = PackBits(si, 4, DemodBuffer);
+        si += 4;     //master key
+        uint8_t resv     = PackBits(si, 4, DemodBuffer);
+        si += 4;     //was 7 & +=7+3 //should be only 4 bits if extended mode
         // 2nibble must be zeroed.
         // moved test to here, since this gets most faults first.
-        if ( resv > 0x00) continue;
+        if (resv > 0x00) continue;
 
-        int bitRate      = PackBits(si, 6, DemodBuffer); si += 6;     //bit rate (includes extended mode part of rate)
-        uint8_t extend   = PackBits(si, 1, DemodBuffer); si += 1;     //bit 15 extended mode
-        uint8_t modread  = PackBits(si, 5, DemodBuffer); si += 5+2+1;
+        int bitRate      = PackBits(si, 6, DemodBuffer);
+        si += 6;     //bit rate (includes extended mode part of rate)
+        uint8_t extend   = PackBits(si, 1, DemodBuffer);
+        si += 1;     //bit 15 extended mode
+        uint8_t modread  = PackBits(si, 5, DemodBuffer);
+        si += 5 + 2 + 1;
         //uint8_t pskcr   = PackBits(si, 2, DemodBuffer); si += 2+1;  //could check psk cr
         //uint8_t nml01    = PackBits(si, 1, DemodBuffer); si += 1+5;   //bit 24, 30, 31 could be tested for 0 if not extended mode
         //uint8_t nml02    = PackBits(si, 2, DemodBuffer); si += 2;
 
         //if extended mode
-        bool extMode =( (safer == 0x6 || safer == 0x9) && extend) ? true : false;
+        bool extMode = ((safer == 0x6 || safer == 0x9) && extend) ? true : false;
 
-        if (!extMode){
+        if (!extMode) {
             if (bitRate > 7) continue;
             if (!testBitRate(bitRate, clk)) continue;
         } else { //extended mode bitrate = same function to calc bitrate as em4x05
@@ -895,17 +938,18 @@ bool test(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk, bool *Q5)
     return false;
 }
 
-void printT55xxBlock(const char *blockNum){
+void printT55xxBlock(const char *blockNum)
+{
 
     uint8_t i = config.offset;
     uint8_t endpos = 32 + i;
     uint32_t blockData = 0;
     uint8_t bits[64] = {0x00};
 
-    if ( !DemodBufferLen) return;
+    if (!DemodBufferLen) return;
 
-    if ( endpos > DemodBufferLen){
-        PrintAndLogEx(NORMAL, "The configured offset %d is too big. Possible offset: %d)", i, DemodBufferLen-32);
+    if (endpos > DemodBufferLen) {
+        PrintAndLogEx(NORMAL, "The configured offset %d is too big. Possible offset: %d)", i, DemodBufferLen - 32);
         return;
     }
 
@@ -916,57 +960,60 @@ void printT55xxBlock(const char *blockNum){
     uint8_t bytes[4] = {0};
     num_to_bytes(blockData, 4, bytes);
 
-    PrintAndLogEx(NORMAL, " %s | %08X | %s | %s", blockNum, blockData, sprint_bin(bits,32), sprint_ascii(bytes,4));
+    PrintAndLogEx(NORMAL, " %s | %08X | %s | %s", blockNum, blockData, sprint_bin(bits, 32), sprint_ascii(bytes, 4));
 }
 
-int special(const char *Cmd) {
+int special(const char *Cmd)
+{
     uint32_t blockData = 0;
     uint8_t bits[32] = {0x00};
 
     PrintAndLogEx(NORMAL, "OFFSET | DATA  | BINARY                              | ASCII");
     PrintAndLogEx(NORMAL, "-------+-------+-------------------------------------+------");
-    int i,j = 0;
-    for (; j < 64; ++j){
+    int i, j = 0;
+    for (; j < 64; ++j) {
 
         for (i = 0; i < 32; ++i)
-            bits[i]=DemodBuffer[j+i];
+            bits[i] = DemodBuffer[j + i];
 
         blockData = PackBits(0, 32, bits);
 
-        PrintAndLogEx(NORMAL, "%02d | 0x%08X | %s",j , blockData, sprint_bin(bits,32));
+        PrintAndLogEx(NORMAL, "%02d | 0x%08X | %s", j, blockData, sprint_bin(bits, 32));
     }
     return 0;
 }
 
-int printConfiguration( t55xx_conf_block_t b){
+int printConfiguration(t55xx_conf_block_t b)
+{
     PrintAndLogEx(NORMAL, "Chip Type  : %s", (b.Q5) ? "T5555(Q5)" : "T55x7");
-    PrintAndLogEx(NORMAL, "Modulation : %s", GetSelectedModulationStr(b.modulation) );
-    PrintAndLogEx(NORMAL, "Bit Rate   : %s", GetBitRateStr(b.bitrate, (b.block0 & T55x7_X_MODE && (b.block0>>28==6 || b.block0>>28==9))) );
-    PrintAndLogEx(NORMAL, "Inverted   : %s", (b.inverted) ? _GREEN_(Yes) : "No" );
+    PrintAndLogEx(NORMAL, "Modulation : %s", GetSelectedModulationStr(b.modulation));
+    PrintAndLogEx(NORMAL, "Bit Rate   : %s", GetBitRateStr(b.bitrate, (b.block0 & T55x7_X_MODE && (b.block0 >> 28 == 6 || b.block0 >> 28 == 9))));
+    PrintAndLogEx(NORMAL, "Inverted   : %s", (b.inverted) ? _GREEN_(Yes) : "No");
     PrintAndLogEx(NORMAL, "Offset     : %d", b.offset);
-    PrintAndLogEx(NORMAL, "Seq. Term. : %s", (b.ST) ? _GREEN_(Yes) : "No" );
+    PrintAndLogEx(NORMAL, "Seq. Term. : %s", (b.ST) ? _GREEN_(Yes) : "No");
     PrintAndLogEx(NORMAL, "Block0     : 0x%08X", b.block0);
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
 
-int CmdT55xxWakeUp(const char *Cmd) {
+int CmdT55xxWakeUp(const char *Cmd)
+{
     uint32_t password = 0;
     uint8_t cmdp = 0;
     bool errors = false;
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
-        case 'h':
-            return usage_t55xx_wakup();
-        case 'p':
-            password = param_get32ex(Cmd, cmdp+1, 0, 16);
-            cmdp += 2;
-            errors = false;
-            break;
-        default:
-            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-            errors = true;
-            break;
+            case 'h':
+                return usage_t55xx_wakup();
+            case 'p':
+                password = param_get32ex(Cmd, cmdp + 1, 0, 16);
+                cmdp += 2;
+                errors = false;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                errors = true;
+                break;
         }
     }
     if (errors) return usage_t55xx_wakup();
@@ -978,7 +1025,8 @@ int CmdT55xxWakeUp(const char *Cmd) {
     return 0;
 }
 
-int CmdT55xxWriteBlock(const char *Cmd) {
+int CmdT55xxWriteBlock(const char *Cmd)
+{
     uint8_t block = 0xFF; //default to invalid block
     uint32_t data = 0; //default to blank Block
     uint32_t password = 0; //default to blank Block 7
@@ -990,34 +1038,34 @@ int CmdT55xxWriteBlock(const char *Cmd) {
     uint8_t cmdp = 0;
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
-        case 'h':
-            return usage_t55xx_write();
-        case 'b':
-            errors |= param_getdec(Cmd, cmdp+1, &block);
-            cmdp += 2;
-            break;
-        case 'd':
-            data = param_get32ex(Cmd, cmdp+1, 0, 16);
-            gotdata = true;
-            cmdp += 2;
-            break;
-        case 'p':
-            password = param_get32ex(Cmd, cmdp+1, 0, 16);
-            usepwd = true;
-            cmdp += 2;
-            break;
-        case 't':
-            testMode = true;
-            cmdp++;
-            break;
-        case '1':
-            page1 = true;
-            cmdp++;
-            break;
-        default:
-            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-            errors = true;
-            break;
+            case 'h':
+                return usage_t55xx_write();
+            case 'b':
+                errors |= param_getdec(Cmd, cmdp + 1, &block);
+                cmdp += 2;
+                break;
+            case 'd':
+                data = param_get32ex(Cmd, cmdp + 1, 0, 16);
+                gotdata = true;
+                cmdp += 2;
+                break;
+            case 'p':
+                password = param_get32ex(Cmd, cmdp + 1, 0, 16);
+                usepwd = true;
+                cmdp += 2;
+                break;
+            case 't':
+                testMode = true;
+                cmdp++;
+                break;
+            case '1':
+                page1 = true;
+                cmdp++;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                errors = true;
+                break;
         }
     }
     if (errors || !gotdata) return usage_t55xx_write();
@@ -1035,7 +1083,7 @@ int CmdT55xxWriteBlock(const char *Cmd) {
     char pwdStr[16] = {0};
     snprintf(pwdStr, sizeof(pwdStr), "pwd: 0x%08X", password);
 
-    PrintAndLogEx(INFO, "Writing page %d  block: %02d  data: 0x%08X %s", page1, block, data,  (usepwd) ? pwdStr : "" );
+    PrintAndLogEx(INFO, "Writing page %d  block: %02d  data: 0x%08X %s", page1, block, data, (usepwd) ? pwdStr : "");
 
     //Password mode
     if (usepwd) {
@@ -1044,14 +1092,15 @@ int CmdT55xxWriteBlock(const char *Cmd) {
     }
     clearCommandBuffer();
     SendCommand(&c);
-    if ( !WaitForResponseTimeout(CMD_ACK, &resp, 1500 )){
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         PrintAndLogEx(WARNING, "Error occurred, device did not ACK write operation. (May be due to old firmware)");
         return 0;
     }
     return 1;
 }
 
-int CmdT55xxReadTrace(const char *Cmd) {
+int CmdT55xxReadTrace(const char *Cmd)
+{
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) > 1 || cmdp == 'h') return usage_t55xx_trace();
 
@@ -1062,59 +1111,73 @@ int CmdT55xxReadTrace(const char *Cmd) {
         // sanity check.
         if (!SanityOfflineCheck(false)) return 1;
 
-        if ( !AquireData( T55x7_PAGE1, REGULAR_READ_MODE_BLOCK, pwdmode, password ) )
+        if (!AquireData(T55x7_PAGE1, REGULAR_READ_MODE_BLOCK, pwdmode, password))
             return 1;
     }
 
-    if ( config.Q5 ){
+    if (config.Q5) {
         if (!DecodeT5555TraceBlock()) return 1;
     } else {
         if (!DecodeT55xxBlock()) return 1;
     }
 
-    if ( !DemodBufferLen ) return 1;
+    if (!DemodBufferLen) return 1;
 
     RepaintGraphWindow();
     uint8_t repeat = (config.offset > 5) ? 32 : 0;
 
     uint8_t si = config.offset + repeat;
     uint32_t bl1 = PackBits(si, 32, DemodBuffer);
-    uint32_t bl2 = PackBits(si+32, 32, DemodBuffer);
+    uint32_t bl2 = PackBits(si + 32, 32, DemodBuffer);
 
     if (config.Q5) {
-        uint32_t hdr = PackBits(si, 9,  DemodBuffer); si += 9;
+        uint32_t hdr = PackBits(si, 9,  DemodBuffer);
+        si += 9;
 
         if (hdr != 0x1FF) {
-          PrintAndLogEx(FAILED, "Invalid Q5 Trace data header (expected 0x1FF, found %X)", hdr);
-          return 1;
+            PrintAndLogEx(FAILED, "Invalid Q5 Trace data header (expected 0x1FF, found %X)", hdr);
+            return 1;
         }
 
-        t5555_tracedata_t data = {.bl1 = bl1, .bl2 = bl2, .icr = 0, .lotidc = '?', .lotid = 0, .wafer = 0, .dw =0};
+        t5555_tracedata_t data = {.bl1 = bl1, .bl2 = bl2, .icr = 0, .lotidc = '?', .lotid = 0, .wafer = 0, .dw = 0};
 
-        data.icr     = PackBits(si, 2,  DemodBuffer); si += 2;
-        data.lotidc  = 'Z' - PackBits(si, 2,  DemodBuffer); si += 3;
+        data.icr     = PackBits(si, 2,  DemodBuffer);
+        si += 2;
+        data.lotidc  = 'Z' - PackBits(si, 2,  DemodBuffer);
+        si += 3;
 
-        data.lotid   = PackBits(si, 4,  DemodBuffer); si += 5;
+        data.lotid   = PackBits(si, 4,  DemodBuffer);
+        si += 5;
         data.lotid <<= 4;
-        data.lotid  |= PackBits(si, 4,  DemodBuffer); si += 5;
+        data.lotid  |= PackBits(si, 4,  DemodBuffer);
+        si += 5;
         data.lotid <<= 4;
-        data.lotid  |= PackBits(si, 4,  DemodBuffer); si += 5;
+        data.lotid  |= PackBits(si, 4,  DemodBuffer);
+        si += 5;
         data.lotid <<= 4;
-        data.lotid  |= PackBits(si, 4,  DemodBuffer); si += 5;
+        data.lotid  |= PackBits(si, 4,  DemodBuffer);
+        si += 5;
         data.lotid <<= 1;
-        data.lotid  |= PackBits(si, 1,  DemodBuffer); si += 1;
+        data.lotid  |= PackBits(si, 1,  DemodBuffer);
+        si += 1;
 
-        data.wafer   = PackBits(si, 3,  DemodBuffer); si += 4;
+        data.wafer   = PackBits(si, 3,  DemodBuffer);
+        si += 4;
         data.wafer <<= 2;
-        data.wafer  |= PackBits(si, 2,  DemodBuffer); si += 2;
+        data.wafer  |= PackBits(si, 2,  DemodBuffer);
+        si += 2;
 
-        data.dw      = PackBits(si, 2,  DemodBuffer); si += 3;
+        data.dw      = PackBits(si, 2,  DemodBuffer);
+        si += 3;
         data.dw    <<= 4;
-        data.dw     |= PackBits(si, 4,  DemodBuffer); si += 5;
+        data.dw     |= PackBits(si, 4,  DemodBuffer);
+        si += 5;
         data.dw    <<= 4;
-        data.dw     |= PackBits(si, 4,  DemodBuffer); si += 5;
+        data.dw     |= PackBits(si, 4,  DemodBuffer);
+        si += 5;
         data.dw    <<= 4;
-        data.dw     |= PackBits(si, 4,  DemodBuffer); si += 5;
+        data.dw     |= PackBits(si, 4,  DemodBuffer);
+        si += 5;
 
         printT5555Trace(data, repeat);
 
@@ -1122,24 +1185,32 @@ int CmdT55xxReadTrace(const char *Cmd) {
 
         t55x7_tracedata_t data = {.bl1 = bl1, .bl2 = bl2, .acl = 0, .mfc = 0, .cid = 0, .year = 0, .quarter = 0, .icr = 0,  .lotid = 0, .wafer = 0, .dw = 0};
 
-        data.acl = PackBits(si, 8,  DemodBuffer); si += 8;
-        if ( data.acl != 0xE0 ) {
+        data.acl = PackBits(si, 8,  DemodBuffer);
+        si += 8;
+        if (data.acl != 0xE0) {
             PrintAndLogEx(FAILED, "The modulation is most likely wrong since the ACL is not 0xE0. ");
             return 1;
         }
 
-        data.mfc     = PackBits(si, 8,  DemodBuffer); si += 8;
-        data.cid     = PackBits(si, 5,  DemodBuffer); si += 5;
-        data.icr     = PackBits(si, 3,  DemodBuffer); si += 3;
-        data.year    = PackBits(si, 4,  DemodBuffer); si += 4;
-        data.quarter = PackBits(si, 2,  DemodBuffer); si += 2;
-        data.lotid   = PackBits(si, 14, DemodBuffer); si += 14;
-        data.wafer   = PackBits(si, 5,  DemodBuffer); si += 5;
+        data.mfc     = PackBits(si, 8,  DemodBuffer);
+        si += 8;
+        data.cid     = PackBits(si, 5,  DemodBuffer);
+        si += 5;
+        data.icr     = PackBits(si, 3,  DemodBuffer);
+        si += 3;
+        data.year    = PackBits(si, 4,  DemodBuffer);
+        si += 4;
+        data.quarter = PackBits(si, 2,  DemodBuffer);
+        si += 2;
+        data.lotid   = PackBits(si, 14, DemodBuffer);
+        si += 14;
+        data.wafer   = PackBits(si, 5,  DemodBuffer);
+        si += 5;
         data.dw      = PackBits(si, 15, DemodBuffer);
 
         time_t t = time(NULL);
         struct tm tm = *localtime(&t);
-        if ( data.year > tm.tm_year-110)
+        if (data.year > tm.tm_year - 110)
             data.year += 2000;
         else
             data.year += 2010;
@@ -1149,22 +1220,23 @@ int CmdT55xxReadTrace(const char *Cmd) {
     return 0;
 }
 
-void printT55x7Trace( t55x7_tracedata_t data, uint8_t repeat ){
+void printT55x7Trace(t55x7_tracedata_t data, uint8_t repeat)
+{
     PrintAndLogEx(NORMAL, "-- T55x7 Trace Information ----------------------------------");
     PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
     PrintAndLogEx(NORMAL, " ACL Allocation class (ISO/IEC 15963-1)  : 0x%02X (%d)", data.acl, data.acl);
     PrintAndLogEx(NORMAL, " MFC Manufacturer ID (ISO/IEC 7816-6)    : 0x%02X (%d) - %s", data.mfc, data.mfc, getTagInfo(data.mfc));
     PrintAndLogEx(NORMAL, " CID                                     : 0x%02X (%d) - %s", data.cid, data.cid, GetModelStrFromCID(data.cid));
-    PrintAndLogEx(NORMAL, " ICR IC Revision                         : %d", data.icr );
+    PrintAndLogEx(NORMAL, " ICR IC Revision                         : %d", data.icr);
     PrintAndLogEx(NORMAL, " Manufactured");
     PrintAndLogEx(NORMAL, "     Year/Quarter : %d/%d", data.year, data.quarter);
-    PrintAndLogEx(NORMAL, "     Lot ID       : %d", data.lotid );
+    PrintAndLogEx(NORMAL, "     Lot ID       : %d", data.lotid);
     PrintAndLogEx(NORMAL, "     Wafer number : %d", data.wafer);
     PrintAndLogEx(NORMAL, "     Die Number   : %d", data.dw);
     PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
     PrintAndLogEx(NORMAL, " Raw Data - Page 1");
-    PrintAndLogEx(NORMAL, "     Block 1  : 0x%08X  %s", data.bl1, sprint_bin(DemodBuffer+config.offset+repeat,32) );
-    PrintAndLogEx(NORMAL, "     Block 2  : 0x%08X  %s", data.bl2, sprint_bin(DemodBuffer+config.offset+repeat+32,32) );
+    PrintAndLogEx(NORMAL, "     Block 1  : 0x%08X  %s", data.bl1, sprint_bin(DemodBuffer + config.offset + repeat, 32));
+    PrintAndLogEx(NORMAL, "     Block 2  : 0x%08X  %s", data.bl2, sprint_bin(DemodBuffer + config.offset + repeat + 32, 32));
     PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
 
     /*
@@ -1185,17 +1257,18 @@ void printT55x7Trace( t55x7_tracedata_t data, uint8_t repeat ){
     */
 }
 
-void printT5555Trace( t5555_tracedata_t data, uint8_t repeat ){
+void printT5555Trace(t5555_tracedata_t data, uint8_t repeat)
+{
     PrintAndLogEx(NORMAL, "-- T5555 (Q5) Trace Information -----------------------------");
     PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
-    PrintAndLogEx(NORMAL, " ICR IC Revision  : %d", data.icr );
+    PrintAndLogEx(NORMAL, " ICR IC Revision  : %d", data.icr);
     PrintAndLogEx(NORMAL, "     Lot          : %c%d", data.lotidc, data.lotid);
     PrintAndLogEx(NORMAL, "     Wafer number : %d", data.wafer);
     PrintAndLogEx(NORMAL, "     Die Number   : %d", data.dw);
     PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
     PrintAndLogEx(NORMAL, " Raw Data - Page 1");
-    PrintAndLogEx(NORMAL, "     Block 1  : 0x%08X  %s", data.bl1, sprint_bin(DemodBuffer+config.offset+repeat,32) );
-    PrintAndLogEx(NORMAL, "     Block 2  : 0x%08X  %s", data.bl2, sprint_bin(DemodBuffer+config.offset+repeat+32,32) );
+    PrintAndLogEx(NORMAL, "     Block 1  : 0x%08X  %s", data.bl1, sprint_bin(DemodBuffer + config.offset + repeat, 32));
+    PrintAndLogEx(NORMAL, "     Block 2  : 0x%08X  %s", data.bl2, sprint_bin(DemodBuffer + config.offset + repeat + 32, 32));
 
     /*
         ** Q5 **
@@ -1213,7 +1286,8 @@ void printT5555Trace( t5555_tracedata_t data, uint8_t repeat ){
 }
 
 //need to add Q5 info...
-int CmdT55xxInfo(const char *Cmd){
+int CmdT55xxInfo(const char *Cmd)
+{
     /*
         Page 0 Block 0 Configuration data.
         Normal mode
@@ -1229,37 +1303,51 @@ int CmdT55xxInfo(const char *Cmd){
         // sanity check.
         if (!SanityOfflineCheck(false)) return 1;
 
-        if ( !AquireData( T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, pwdmode, password ) )
+        if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, pwdmode, password))
             return 1;
     }
 
     if (!DecodeT55xxBlock()) return 1;
 
     // too little space to start with
-    if ( DemodBufferLen < 32) return 1;
+    if (DemodBufferLen < 32) return 1;
 
     //
     //PrintAndLogEx(NORMAL, "Offset+32 ==%d\n DemodLen == %d", config.offset + 32, DemodBufferLen);
 
     uint8_t si = config.offset;
     uint32_t block0   = PackBits(si, 32, DemodBuffer);
-    uint32_t safer    = PackBits(si, 4, DemodBuffer); si += 4;
-    uint32_t resv     = PackBits(si, 7, DemodBuffer); si += 7;
-    uint32_t dbr      = PackBits(si, 3, DemodBuffer); si += 3;
-    uint32_t extend   = PackBits(si, 1, DemodBuffer); si += 1;
-    uint32_t datamod  = PackBits(si, 5, DemodBuffer); si += 5;
-    uint32_t pskcf    = PackBits(si, 2, DemodBuffer); si += 2;
-    uint32_t aor      = PackBits(si, 1, DemodBuffer); si += 1;
-    uint32_t otp      = PackBits(si, 1, DemodBuffer); si += 1;
-    uint32_t maxblk   = PackBits(si, 3, DemodBuffer); si += 3;
-    uint32_t pwd      = PackBits(si, 1, DemodBuffer); si += 1;
-    uint32_t sst      = PackBits(si, 1, DemodBuffer); si += 1;
-    uint32_t fw       = PackBits(si, 1, DemodBuffer); si += 1;
-    uint32_t inv      = PackBits(si, 1, DemodBuffer); si += 1;
-    uint32_t por      = PackBits(si, 1, DemodBuffer); si += 1;
+    uint32_t safer    = PackBits(si, 4, DemodBuffer);
+    si += 4;
+    uint32_t resv     = PackBits(si, 7, DemodBuffer);
+    si += 7;
+    uint32_t dbr      = PackBits(si, 3, DemodBuffer);
+    si += 3;
+    uint32_t extend   = PackBits(si, 1, DemodBuffer);
+    si += 1;
+    uint32_t datamod  = PackBits(si, 5, DemodBuffer);
+    si += 5;
+    uint32_t pskcf    = PackBits(si, 2, DemodBuffer);
+    si += 2;
+    uint32_t aor      = PackBits(si, 1, DemodBuffer);
+    si += 1;
+    uint32_t otp      = PackBits(si, 1, DemodBuffer);
+    si += 1;
+    uint32_t maxblk   = PackBits(si, 3, DemodBuffer);
+    si += 3;
+    uint32_t pwd      = PackBits(si, 1, DemodBuffer);
+    si += 1;
+    uint32_t sst      = PackBits(si, 1, DemodBuffer);
+    si += 1;
+    uint32_t fw       = PackBits(si, 1, DemodBuffer);
+    si += 1;
+    uint32_t inv      = PackBits(si, 1, DemodBuffer);
+    si += 1;
+    uint32_t por      = PackBits(si, 1, DemodBuffer);
+    si += 1;
 
     if (config.Q5)
-        PrintAndLogEx(NORMAL, _RED_(*** Warning ***) " Config Info read off a Q5 will not display as expected");
+        PrintAndLogEx(NORMAL, _RED_(* **Warning ***) " Config Info read off a Q5 will not display as expected");
 
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "-- T55x7 Configuration & Tag Information --------------------");
@@ -1271,7 +1359,7 @@ int CmdT55xxInfo(const char *Cmd){
     PrintAndLogEx(NORMAL, " Modulation                : %s", GetModulationStr(datamod));
     PrintAndLogEx(NORMAL, " PSK clock frequency       : %d", pskcf);
     PrintAndLogEx(NORMAL, " AOR - Answer on Request   : %s", (aor) ? _GREEN_(Yes) : "No");
-    PrintAndLogEx(NORMAL, " OTP - One Time Pad        : %s", (otp) ? _YELLOW_(Yes - Warning) : "No" );
+    PrintAndLogEx(NORMAL, " OTP - One Time Pad        : %s", (otp) ? _YELLOW_(Yes - Warning) : "No");
     PrintAndLogEx(NORMAL, " Max block                 : %d", maxblk);
     PrintAndLogEx(NORMAL, " Password mode             : %s", (pwd) ? _GREEN_(Yes) : "No");
     PrintAndLogEx(NORMAL, " Sequence Start Terminator : %s", (sst) ? _GREEN_(Yes) : "No");
@@ -1280,47 +1368,49 @@ int CmdT55xxInfo(const char *Cmd){
     PrintAndLogEx(NORMAL, " POR-Delay                 : %s", (por) ? _GREEN_(Yes) : "No");
     PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
     PrintAndLogEx(NORMAL, " Raw Data - Page 0");
-    PrintAndLogEx(NORMAL, "     Block 0  : 0x%08X  %s", block0, sprint_bin(DemodBuffer + config.offset, 32) );
+    PrintAndLogEx(NORMAL, "     Block 0  : 0x%08X  %s", block0, sprint_bin(DemodBuffer + config.offset, 32));
     PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
     return 0;
 }
 
-int CmdT55xxDump(const char *Cmd){
+int CmdT55xxDump(const char *Cmd)
+{
 
     uint32_t password = 0;
     bool override = false;
     char cmdp = tolower(param_getchar(Cmd, 0));
-    if ( cmdp == 'h') return usage_t55xx_dump();
+    if (cmdp == 'h') return usage_t55xx_dump();
 
-    bool usepwd = ( strlen(Cmd) > 0);
-    if ( usepwd ){
+    bool usepwd = (strlen(Cmd) > 0);
+    if (usepwd) {
         password = param_get32ex(Cmd, 0, 0, 16);
-        if (param_getchar(Cmd, 1) =='o' )
+        if (param_getchar(Cmd, 1) == 'o')
             override = true;
     }
 
     printT5xxHeader(0);
-    for ( uint8_t i = 0; i < 8; ++i)
+    for (uint8_t i = 0; i < 8; ++i)
         T55xxReadBlock(i, 0, usepwd, override, password);
 
     printT5xxHeader(1);
-    for ( uint8_t i = 0; i < 4; i++)
+    for (uint8_t i = 0; i < 4; i++)
         T55xxReadBlock(i, 1, usepwd, override, password);
 
     return 1;
 }
 
-bool AquireData( uint8_t page, uint8_t block, bool pwdmode, uint32_t password ) {
+bool AquireData(uint8_t page, uint8_t block, bool pwdmode, uint32_t password)
+{
     // arg0 bitmodes:
     //  bit0 = pwdmode
     //  bit1 = page to read from
     // arg1: which block to read
     // arg2: password
-    uint8_t arg0 = (page<<1) | pwdmode;
+    uint8_t arg0 = (page << 1) | pwdmode;
     UsbCommand c = {CMD_T55XX_READ_BLOCK, {arg0, block, password}};
     clearCommandBuffer();
     SendCommand(&c);
-    if ( !WaitForResponseTimeout(CMD_ACK, NULL, 2500) ) {
+    if (!WaitForResponseTimeout(CMD_ACK, NULL, 2500)) {
         PrintAndLogEx(WARNING, "command execution time out");
         return false;
     }
@@ -1330,99 +1420,175 @@ bool AquireData( uint8_t page, uint8_t block, bool pwdmode, uint32_t password )
     return !getSignalProperties()->isnoise;
 }
 
-char * GetBitRateStr(uint32_t id, bool xmode) {
+char *GetBitRateStr(uint32_t id, bool xmode)
+{
     static char buf[25];
 
     char *retStr = buf;
     if (xmode) { //xmode bitrate calc is same as em4x05 calc
-        snprintf(retStr,sizeof(buf),"%d - RF/%d", id, EM4x05_GET_BITRATE(id));
+        snprintf(retStr, sizeof(buf), "%d - RF/%d", id, EM4x05_GET_BITRATE(id));
     } else {
-        switch (id){
-        case 0:   snprintf(retStr,sizeof(buf),"%d - RF/8",id);   break;
-        case 1:   snprintf(retStr,sizeof(buf),"%d - RF/16",id);  break;
-        case 2:   snprintf(retStr,sizeof(buf),"%d - RF/32",id);  break;
-        case 3:   snprintf(retStr,sizeof(buf),"%d - RF/40",id);  break;
-        case 4:   snprintf(retStr,sizeof(buf),"%d - RF/50",id);  break;
-        case 5:   snprintf(retStr,sizeof(buf),"%d - RF/64",id);  break;
-        case 6:   snprintf(retStr,sizeof(buf),"%d - RF/100",id); break;
-        case 7:   snprintf(retStr,sizeof(buf),"%d - RF/128",id); break;
-        default:  snprintf(retStr,sizeof(buf),"%d - (Unknown)",id); break;
+        switch (id) {
+            case 0:
+                snprintf(retStr, sizeof(buf), "%d - RF/8", id);
+                break;
+            case 1:
+                snprintf(retStr, sizeof(buf), "%d - RF/16", id);
+                break;
+            case 2:
+                snprintf(retStr, sizeof(buf), "%d - RF/32", id);
+                break;
+            case 3:
+                snprintf(retStr, sizeof(buf), "%d - RF/40", id);
+                break;
+            case 4:
+                snprintf(retStr, sizeof(buf), "%d - RF/50", id);
+                break;
+            case 5:
+                snprintf(retStr, sizeof(buf), "%d - RF/64", id);
+                break;
+            case 6:
+                snprintf(retStr, sizeof(buf), "%d - RF/100", id);
+                break;
+            case 7:
+                snprintf(retStr, sizeof(buf), "%d - RF/128", id);
+                break;
+            default:
+                snprintf(retStr, sizeof(buf), "%d - (Unknown)", id);
+                break;
         }
     }
     return buf;
 }
 
-char * GetSaferStr(uint32_t id){
+char *GetSaferStr(uint32_t id)
+{
     static char buf[40];
     char *retStr = buf;
 
-    snprintf(retStr,sizeof(buf),"%d",id);
+    snprintf(retStr, sizeof(buf), "%d", id);
     if (id == 6) {
-        snprintf(retStr,sizeof(buf),"%d - passwd",id);
+        snprintf(retStr, sizeof(buf), "%d - passwd", id);
     }
-    if (id == 9 ){
-        snprintf(retStr,sizeof(buf),"%d - testmode",id);
+    if (id == 9) {
+        snprintf(retStr, sizeof(buf), "%d - testmode", id);
     }
 
     return buf;
 }
 
-char * GetModulationStr( uint32_t id){
+char *GetModulationStr(uint32_t id)
+{
     static char buf[60];
     char *retStr = buf;
 
-    switch (id){
-        case 0: snprintf(retStr,sizeof(buf),"%d - DIRECT (ASK/NRZ)",id); break;
-        case 1: snprintf(retStr,sizeof(buf),"%d - PSK 1 phase change when input changes",id); break;
-        case 2: snprintf(retStr,sizeof(buf),"%d - PSK 2 phase change on bitclk if input high",id); break;
-        case 3: snprintf(retStr,sizeof(buf),"%d - PSK 3 phase change on rising edge of input",id); break;
-        case 4: snprintf(retStr,sizeof(buf),"%d - FSK 1 RF/8  RF/5",id); break;
-        case 5: snprintf(retStr,sizeof(buf),"%d - FSK 2 RF/8  RF/10",id); break;
-        case 6: snprintf(retStr,sizeof(buf),"%d - FSK 1a RF/5  RF/8",id); break;
-        case 7: snprintf(retStr,sizeof(buf),"%d - FSK 2a RF/10  RF/8",id); break;
-        case 8: snprintf(retStr,sizeof(buf),"%d - Manchester",id); break;
-        case 16: snprintf(retStr,sizeof(buf),"%d - Biphase",id); break;
-        case 0x18:snprintf(retStr,sizeof(buf),"%d - Biphase a - AKA Conditional Dephase Encoding(CDP)",id); break;
-        case 17: snprintf(retStr,sizeof(buf),"%d - Reserved",id); break;
-        default: snprintf(retStr,sizeof(buf),"0x%02X (Unknown)",id); break;
-        }
+    switch (id) {
+        case 0:
+            snprintf(retStr, sizeof(buf), "%d - DIRECT (ASK/NRZ)", id);
+            break;
+        case 1:
+            snprintf(retStr, sizeof(buf), "%d - PSK 1 phase change when input changes", id);
+            break;
+        case 2:
+            snprintf(retStr, sizeof(buf), "%d - PSK 2 phase change on bitclk if input high", id);
+            break;
+        case 3:
+            snprintf(retStr, sizeof(buf), "%d - PSK 3 phase change on rising edge of input", id);
+            break;
+        case 4:
+            snprintf(retStr, sizeof(buf), "%d - FSK 1 RF/8  RF/5", id);
+            break;
+        case 5:
+            snprintf(retStr, sizeof(buf), "%d - FSK 2 RF/8  RF/10", id);
+            break;
+        case 6:
+            snprintf(retStr, sizeof(buf), "%d - FSK 1a RF/5  RF/8", id);
+            break;
+        case 7:
+            snprintf(retStr, sizeof(buf), "%d - FSK 2a RF/10  RF/8", id);
+            break;
+        case 8:
+            snprintf(retStr, sizeof(buf), "%d - Manchester", id);
+            break;
+        case 16:
+            snprintf(retStr, sizeof(buf), "%d - Biphase", id);
+            break;
+        case 0x18:
+            snprintf(retStr, sizeof(buf), "%d - Biphase a - AKA Conditional Dephase Encoding(CDP)", id);
+            break;
+        case 17:
+            snprintf(retStr, sizeof(buf), "%d - Reserved", id);
+            break;
+        default:
+            snprintf(retStr, sizeof(buf), "0x%02X (Unknown)", id);
+            break;
+    }
     return buf;
 }
 
-char * GetModelStrFromCID(uint32_t cid){
+char *GetModelStrFromCID(uint32_t cid)
+{
 
     static char buf[10];
     char *retStr = buf;
 
-    if (cid == 1) snprintf(retStr, sizeof(buf),"ATA5577M1");
-    if (cid == 2) snprintf(retStr, sizeof(buf),"ATA5577M2");
+    if (cid == 1) snprintf(retStr, sizeof(buf), "ATA5577M1");
+    if (cid == 2) snprintf(retStr, sizeof(buf), "ATA5577M2");
     return buf;
 }
 
-char * GetSelectedModulationStr( uint8_t id){
+char *GetSelectedModulationStr(uint8_t id)
+{
 
     static char buf[20];
     char *retStr = buf;
 
-    switch (id){
-        case DEMOD_FSK: snprintf(retStr,sizeof(buf),"FSK"); break;
-        case DEMOD_FSK1: snprintf(retStr,sizeof(buf),"FSK1"); break;
-        case DEMOD_FSK1a: snprintf(retStr,sizeof(buf),"FSK1a"); break;
-        case DEMOD_FSK2: snprintf(retStr,sizeof(buf),"FSK2"); break;
-        case DEMOD_FSK2a: snprintf(retStr,sizeof(buf),"FSK2a"); break;
-        case DEMOD_ASK: snprintf(retStr,sizeof(buf),"ASK"); break;
-        case DEMOD_NRZ: snprintf(retStr,sizeof(buf),"DIRECT/NRZ"); break;
-        case DEMOD_PSK1: snprintf(retStr,sizeof(buf),"PSK1"); break;
-        case DEMOD_PSK2: snprintf(retStr,sizeof(buf),"PSK2"); break;
-        case DEMOD_PSK3: snprintf(retStr,sizeof(buf),"PSK3"); break;
-        case DEMOD_BI: snprintf(retStr,sizeof(buf),"BIPHASE"); break;
-        case DEMOD_BIa: snprintf(retStr,sizeof(buf),"BIPHASEa - (CDP)"); break;
-        default: snprintf(retStr,sizeof(buf),"(Unknown)"); break;
-        }
+    switch (id) {
+        case DEMOD_FSK:
+            snprintf(retStr, sizeof(buf), "FSK");
+            break;
+        case DEMOD_FSK1:
+            snprintf(retStr, sizeof(buf), "FSK1");
+            break;
+        case DEMOD_FSK1a:
+            snprintf(retStr, sizeof(buf), "FSK1a");
+            break;
+        case DEMOD_FSK2:
+            snprintf(retStr, sizeof(buf), "FSK2");
+            break;
+        case DEMOD_FSK2a:
+            snprintf(retStr, sizeof(buf), "FSK2a");
+            break;
+        case DEMOD_ASK:
+            snprintf(retStr, sizeof(buf), "ASK");
+            break;
+        case DEMOD_NRZ:
+            snprintf(retStr, sizeof(buf), "DIRECT/NRZ");
+            break;
+        case DEMOD_PSK1:
+            snprintf(retStr, sizeof(buf), "PSK1");
+            break;
+        case DEMOD_PSK2:
+            snprintf(retStr, sizeof(buf), "PSK2");
+            break;
+        case DEMOD_PSK3:
+            snprintf(retStr, sizeof(buf), "PSK3");
+            break;
+        case DEMOD_BI:
+            snprintf(retStr, sizeof(buf), "BIPHASE");
+            break;
+        case DEMOD_BIa:
+            snprintf(retStr, sizeof(buf), "BIPHASEa - (CDP)");
+            break;
+        default:
+            snprintf(retStr, sizeof(buf), "(Unknown)");
+            break;
+    }
     return buf;
 }
 
-void t55x7_create_config_block( int tagtype ){
+void t55x7_create_config_block(int tagtype)
+{
 
     /*
      T55X7_DEFAULT_CONFIG_BLOCK, T55X7_RAW_CONFIG_BLOCK
@@ -1433,27 +1599,34 @@ void t55x7_create_config_block( int tagtype ){
     static char buf[60];
     char *retStr = buf;
 
-    switch (tagtype){
-        case 0: snprintf(retStr, sizeof(buf),"%08X - T55X7 Default", T55X7_DEFAULT_CONFIG_BLOCK); break;
-        case 1: snprintf(retStr, sizeof(buf),"%08X - T55X7 Raw", T55X7_RAW_CONFIG_BLOCK); break;
-        case 2: snprintf(retStr, sizeof(buf),"%08X - T5555 Q5 Default", T5555_DEFAULT_CONFIG_BLOCK); break;
+    switch (tagtype) {
+        case 0:
+            snprintf(retStr, sizeof(buf), "%08X - T55X7 Default", T55X7_DEFAULT_CONFIG_BLOCK);
+            break;
+        case 1:
+            snprintf(retStr, sizeof(buf), "%08X - T55X7 Raw", T55X7_RAW_CONFIG_BLOCK);
+            break;
+        case 2:
+            snprintf(retStr, sizeof(buf), "%08X - T5555 Q5 Default", T5555_DEFAULT_CONFIG_BLOCK);
+            break;
         default:
             break;
     }
     PrintAndLogEx(NORMAL, buf);
 }
 
-int CmdResetRead(const char *Cmd) {
-    UsbCommand c = {CMD_T55XX_RESET_READ, {0,0,0}};
+int CmdResetRead(const char *Cmd)
+{
+    UsbCommand c = {CMD_T55XX_RESET_READ, {0, 0, 0}};
     clearCommandBuffer();
     SendCommand(&c);
-    if ( !WaitForResponseTimeout(CMD_ACK, NULL, 2500) ) {
+    if (!WaitForResponseTimeout(CMD_ACK, NULL, 2500)) {
         PrintAndLogEx(WARNING, "command execution time out");
         return 0;
     }
 
-    uint8_t got[BIGBUF_SIZE-1];
-    if ( !GetFromDevice(BIG_BUF, got, sizeof(got), 0, NULL, 2500, false)) {
+    uint8_t got[BIGBUF_SIZE - 1];
+    if (!GetFromDevice(BIG_BUF, got, sizeof(got), 0, NULL, 2500, false)) {
         PrintAndLogEx(WARNING, "command execution time out");
         return 0;
     }
@@ -1461,11 +1634,12 @@ int CmdResetRead(const char *Cmd) {
     return 1;
 }
 
-int CmdT55xxWipe(const char *Cmd) {
+int CmdT55xxWipe(const char *Cmd)
+{
     char writeData[20] = {0};
     char *ptrData = writeData;
     char cmdp = tolower(param_getchar(Cmd, 0));
-    if ( cmdp == 'h') return usage_t55xx_wipe();
+    if (cmdp == 'h') return usage_t55xx_wipe();
 
     bool Q5 = (cmdp == 'q');
 
@@ -1473,16 +1647,16 @@ int CmdT55xxWipe(const char *Cmd) {
     // With a pwd should work even if pwd bit not set
     PrintAndLogEx(INFO, "\nBeginning Wipe of a T55xx tag (assuming the tag is not password protected)\n");
 
-    if ( Q5 )
-        snprintf(ptrData,sizeof(writeData),"b 0 d 6001F004 p 0");
+    if (Q5)
+        snprintf(ptrData, sizeof(writeData), "b 0 d 6001F004 p 0");
     else
-        snprintf(ptrData,sizeof(writeData),"b 0 d 000880E0 p 0");
+        snprintf(ptrData, sizeof(writeData), "b 0 d 000880E0 p 0");
 
     if (!CmdT55xxWriteBlock(ptrData)) PrintAndLogEx(WARNING, "Error writing blk 0");
 
-    for (uint8_t blk = 1; blk<8; blk++) {
+    for (uint8_t blk = 1; blk < 8; blk++) {
 
-        snprintf(ptrData,sizeof(writeData),"b %d d 0", blk);
+        snprintf(ptrData, sizeof(writeData), "b %d d 0", blk);
 
         if (!CmdT55xxWriteBlock(ptrData)) PrintAndLogEx(WARNING, "Error writing blk %d", blk);
 
@@ -1491,16 +1665,19 @@ int CmdT55xxWipe(const char *Cmd) {
     return 0;
 }
 
-bool IsCancelled(void) {
+bool IsCancelled(void)
+{
     if (ukbhit()) {
-        int gc = getchar(); (void)gc;
+        int gc = getchar();
+        (void)gc;
         PrintAndLogEx(WARNING, "\naborted via keyboard!\n");
         return true;
     }
     return false;
 }
 
-int CmdT55xxChkPwds(const char *Cmd) {
+int CmdT55xxChkPwds(const char *Cmd)
+{
     // load a default pwd file.
     char line[9];
     char filename[FILE_PATH_SIZE] = {0};
@@ -1526,22 +1703,23 @@ int CmdT55xxChkPwds(const char *Cmd) {
 
     uint64_t t1 = msclock();
 
-    if ( cmdp == 'm' ) {
-        UsbCommand c = {CMD_T55XX_CHKPWDS, {0,0,0} };
+    if (cmdp == 'm') {
+        UsbCommand c = {CMD_T55XX_CHKPWDS, {0, 0, 0} };
         clearCommandBuffer();
         SendCommand(&c);
         UsbCommand resp;
 
-        while ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
+        while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
             timeout++;
-            printf("."); fflush(stdout);
+            printf(".");
+            fflush(stdout);
             if (timeout > 180) {
                 PrintAndLogEx(WARNING, "\nno response from Proxmark. Aborting...");
                 return 2;
             }
         }
 
-        if ( resp.arg[0] ) {
+        if (resp.arg[0]) {
             PrintAndLogEx(SUCCESS, "\nFound a candidate [ %08X ]. Trying to validate", resp.arg[1]);
 
             if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, resp.arg[1])) {
@@ -1567,25 +1745,25 @@ int CmdT55xxChkPwds(const char *Cmd) {
 
     if (cmdp == 'i') {
 
-        int len = strlen(Cmd+2);
+        int len = strlen(Cmd + 2);
         if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
-        memcpy(filename, Cmd+2, len);
+        memcpy(filename, Cmd + 2, len);
 
-        FILE * f = fopen( filename , "r");
-        if ( !f ) {
-            PrintAndLogEx(FAILED, "File: " _YELLOW_(%s) ": not found or locked.", filename);
+        FILE *f = fopen(filename, "r");
+        if (!f) {
+            PrintAndLogEx(FAILED, "File: " _YELLOW_( % s) ": not found or locked.", filename);
             free(keyBlock);
             return 1;
         }
 
-        while( fgets(line, sizeof(line), f) ){
+        while (fgets(line, sizeof(line), f)) {
             if (strlen(line) < 8 || line[7] == '\n') continue;
 
             //goto next line
             while (fgetc(f) != '\n' && !feof(f)) ;
 
             //The line start with # is comment, skip
-            if( line[0]=='#' ) continue;
+            if (line[0] == '#') continue;
 
             if (!isxdigit(line[0])) {
                 PrintAndLogEx(WARNING, "File content error. '%s' must include 8 HEX symbols", line);
@@ -1595,7 +1773,7 @@ int CmdT55xxChkPwds(const char *Cmd) {
             line[8] = 0;
 
             // realloc keyblock array size.
-            if ( stKeyBlock - keycnt < 2) {
+            if (stKeyBlock - keycnt < 2) {
                 p = realloc(keyBlock, 4 * (stKeyBlock += 10));
                 if (!p) {
                     PrintAndLogEx(WARNING, "Cannot allocate memory for defaultKeys");
@@ -1609,7 +1787,7 @@ int CmdT55xxChkPwds(const char *Cmd) {
             // clear mem
             memset(keyBlock + 4 * keycnt, 0, 4);
 
-            num_to_bytes( strtoll(line, NULL, 16), 4, keyBlock + 4*keycnt);
+            num_to_bytes(strtoll(line, NULL, 16), 4, keyBlock + 4 * keycnt);
 
 // PrintAndLogEx(NORMAL, "chk custom pwd[%2d] %08X", keycnt, bytes_to_num(keyBlock + 4 * keycnt, 4) );
             keycnt++;
@@ -1628,9 +1806,9 @@ int CmdT55xxChkPwds(const char *Cmd) {
 
         // loop
         uint64_t testpwd = 0x00;
-        for (uint16_t c = 0; c < keycnt; ++c ) {
+        for (uint16_t c = 0; c < keycnt; ++c) {
 
-            if ( IsOffline() ) {
+            if (IsOffline()) {
                 PrintAndLogEx(WARNING, "Device offline\n");
                 free(keyBlock);
                 return  2;
@@ -1641,22 +1819,22 @@ int CmdT55xxChkPwds(const char *Cmd) {
                 return 0;
             }
 
-            testpwd = bytes_to_num(keyBlock + 4*c, 4);
+            testpwd = bytes_to_num(keyBlock + 4 * c, 4);
 
             PrintAndLogEx(INFO, "Testing %08X", testpwd);
 
-            if ( !AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, testpwd)) {
+            if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, testpwd)) {
                 PrintAndLogEx(INFO, "Aquireing data from device failed. Quitting");
                 free(keyBlock);
                 return 0;
             }
 
             found = tryDetectModulation();
-            if ( found )
+            if (found)
                 break;
 
         }
-        if ( found )
+        if (found)
             PrintAndLogEx(SUCCESS, "Found valid password: [ %08X ]", testpwd);
         else
             PrintAndLogEx(WARNING, "Password NOT found.");
@@ -1666,11 +1844,12 @@ int CmdT55xxChkPwds(const char *Cmd) {
 
 out:
     t1 = msclock() - t1;
-    PrintAndLogEx(SUCCESS, "\nTime in bruteforce: %.0f seconds\n", (float)t1/1000.0);
+    PrintAndLogEx(SUCCESS, "\nTime in bruteforce: %.0f seconds\n", (float)t1 / 1000.0);
     return 0;
 }
 
-int CmdT55xxBruteForce(const char *Cmd) {
+int CmdT55xxBruteForce(const char *Cmd)
+{
 
     uint32_t start_password = 0x00000000; //start password
     uint32_t end_password   = 0xFFFFFFFF; //end   password
@@ -1691,15 +1870,16 @@ int CmdT55xxBruteForce(const char *Cmd) {
 
     curr = start_password;
 
-    if ( start_password >= end_password ) {
+    if (start_password >= end_password) {
         return usage_t55xx_bruteforce();
     }
 
     PrintAndLogEx(INFO, "Search password range [%08X -> %08X]", start_password, end_password);
 
-    while ( !found ){
+    while (!found) {
 
-        printf("."); fflush(stdout);
+        printf(".");
+        fflush(stdout);
 
         if (IsCancelled()) {
             return 0;
@@ -1725,11 +1905,12 @@ int CmdT55xxBruteForce(const char *Cmd) {
         PrintAndLogEx(WARNING, "Password NOT found. Last tried: [ %08X ]", --curr);
 
     t1 = msclock() - t1;
-    PrintAndLogEx(SUCCESS, "\nTime in bruteforce: %.0f seconds\n", (float)t1/1000.0);
+    PrintAndLogEx(SUCCESS, "\nTime in bruteforce: %.0f seconds\n", (float)t1 / 1000.0);
     return 0;
 }
 
-int tryOnePassword(uint32_t password) {
+int tryOnePassword(uint32_t password)
+{
     PrintAndLogEx(INFO, "Trying password %08x", password);
     if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, password)) {
         PrintAndLogEx(NORMAL, "Acquire data from device failed. Quitting");
@@ -1742,7 +1923,8 @@ int tryOnePassword(uint32_t password) {
         return 0;
 }
 
-int CmdT55xxRecoverPW(const char *Cmd) {
+int CmdT55xxRecoverPW(const char *Cmd)
+{
     int bit = 0;
     uint32_t orig_password = 0x0;
     uint32_t curr_password = 0x0;
@@ -1750,13 +1932,13 @@ int CmdT55xxRecoverPW(const char *Cmd) {
     uint32_t mask = 0x0;
     int found = 0;
     char cmdp = tolower(param_getchar(Cmd, 0));
-    if (cmdp == 'h' ) return usage_t55xx_recoverpw();
+    if (cmdp == 'h') return usage_t55xx_recoverpw();
 
     orig_password = param_get32ex(Cmd, 0, 0x51243648, 16); //password used by handheld cloners
 
     // first try fliping each bit in the expected password
     while (bit < 32) {
-        curr_password = orig_password ^ ( 1 << bit );
+        curr_password = orig_password ^ (1 << bit);
         found = tryOnePassword(curr_password);
         if (found == -1) return 0;
         bit++;
@@ -1771,7 +1953,7 @@ int CmdT55xxRecoverPW(const char *Cmd) {
     // from low bit to high bit
     bit = 0;
     while (bit < 32) {
-        mask += ( 1 << bit );
+        mask += (1 << bit);
         curr_password = orig_password & mask;
         // if updated mask didn't change the password, don't try it again
         if (prev_password == curr_password) {
@@ -1790,7 +1972,7 @@ int CmdT55xxRecoverPW(const char *Cmd) {
     bit = 0;
     mask = 0xffffffff;
     while (bit < 32) {
-        mask -= ( 1 << bit );
+        mask -= (1 << bit);
         curr_password = orig_password & mask;
         // if updated mask didn't change the password, don't try it again
         if (prev_password == curr_password) {
@@ -1819,29 +2001,30 @@ int CmdT55xxRecoverPW(const char *Cmd) {
 // note length of data returned is different for different chips.
 // some return all page 1 (64 bits) and others return just that block (32 bits)
 // unfortunately the 64 bits makes this more likely to get a false positive...
-bool tryDetectP1(bool getData) {
-    uint8_t preamble[] = {1,1,1,0,0,0,0,0,0,0,0,1,0,1,0,1};
+bool tryDetectP1(bool getData)
+{
+    uint8_t preamble[] = {1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1};
     size_t startIdx = 0;
     uint8_t fc1 = 0, fc2 = 0, ans = 0;
     int clk = 0, firstClockEdge = 0;
     bool st = true;
 
-    if ( getData ) {
-        if ( !AquireData(T55x7_PAGE1, 1, false, 0) )
+    if (getData) {
+        if (!AquireData(T55x7_PAGE1, 1, false, 0))
             return false;
     }
 
     // try fsk clock detect. if successful it cannot be any other type of modulation...  (in theory...)
     ans = fskClocks(&fc1, &fc2, (uint8_t *)&clk, &firstClockEdge);
-    if (ans && ((fc1==10 && fc2==8) || (fc1==8 && fc2==5))) {
-        if ( FSKrawDemod("0 0", false) &&
-              preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
-              (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
+    if (ans && ((fc1 == 10 && fc2 == 8) || (fc1 == 8 && fc2 == 5))) {
+        if (FSKrawDemod("0 0", false) &&
+            preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
+            (DemodBufferLen == 32 || DemodBufferLen == 64)) {
             return true;
         }
-        if ( FSKrawDemod("0 1", false) &&
-              preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
-              (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
+        if (FSKrawDemod("0 1", false) &&
+            preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
+            (DemodBufferLen == 32 || DemodBufferLen == 64)) {
             return true;
         }
         return false;
@@ -1850,25 +2033,25 @@ bool tryDetectP1(bool getData) {
     // try ask clock detect.  it could be another type even if successful.
     clk = GetAskClock("", false);
     if (clk > 0) {
-        if ( ASKDemod_ext("0 0 1", false, false, 1, &st) &&
-              preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
-              (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
+        if (ASKDemod_ext("0 0 1", false, false, 1, &st) &&
+            preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
+            (DemodBufferLen == 32 || DemodBufferLen == 64)) {
             return true;
         }
         st = true;
-        if ( ASKDemod_ext("0 1 1", false, false, 1, &st)  &&
-                preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
-                (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
+        if (ASKDemod_ext("0 1 1", false, false, 1, &st)  &&
+            preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
+            (DemodBufferLen == 32 || DemodBufferLen == 64)) {
             return true;
         }
-        if ( ASKbiphaseDemod("0 0 0 2", false) &&
-                preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
-                (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
+        if (ASKbiphaseDemod("0 0 0 2", false) &&
+            preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
+            (DemodBufferLen == 32 || DemodBufferLen == 64)) {
             return true;
         }
-        if ( ASKbiphaseDemod("0 0 1 2", false) &&
-                preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
-                (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
+        if (ASKbiphaseDemod("0 0 1 2", false) &&
+            preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
+            (DemodBufferLen == 32 || DemodBufferLen == 64)) {
             return true;
         }
     }
@@ -1876,14 +2059,14 @@ bool tryDetectP1(bool getData) {
     // try NRZ clock detect.  it could be another type even if successful.
     clk = GetNrzClock("", false); //has the most false positives :(
     if (clk > 0) {
-        if ( NRZrawDemod("0 0 1", false)  &&
-                preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
-                (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
+        if (NRZrawDemod("0 0 1", false)  &&
+            preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
+            (DemodBufferLen == 32 || DemodBufferLen == 64)) {
             return true;
         }
-        if ( NRZrawDemod("0 1 1", false)  &&
-                preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
-                (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
+        if (NRZrawDemod("0 1 1", false)  &&
+            preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
+            (DemodBufferLen == 32 || DemodBufferLen == 64)) {
             return true;
         }
     }
@@ -1896,23 +2079,23 @@ bool tryDetectP1(bool getData) {
         // save_restoreGB(GRAPH_SAVE);
         // skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)
         //CmdLtrim("160");
-        if ( PSKDemod("0 0 6", false) &&
-              preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
-              (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
+        if (PSKDemod("0 0 6", false) &&
+            preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
+            (DemodBufferLen == 32 || DemodBufferLen == 64)) {
             //save_restoreGB(GRAPH_RESTORE);
             return true;
         }
-        if ( PSKDemod("0 1 6", false) &&
-              preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
-              (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
+        if (PSKDemod("0 1 6", false) &&
+            preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
+            (DemodBufferLen == 32 || DemodBufferLen == 64)) {
             //save_restoreGB(GRAPH_RESTORE);
             return true;
         }
         // PSK2 - needs a call to psk1TOpsk2.
-        if ( PSKDemod("0 0 6", false)) {
+        if (PSKDemod("0 0 6", false)) {
             psk1TOpsk2(DemodBuffer, DemodBufferLen);
             if (preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
-                  (DemodBufferLen == 32 || DemodBufferLen == 64) ) {
+                (DemodBufferLen == 32 || DemodBufferLen == 64)) {
                 //save_restoreGB(GRAPH_RESTORE);
                 return true;
             }
@@ -1926,7 +2109,8 @@ bool tryDetectP1(bool getData) {
     return false;
 }
 //  does this need to be a callable command?
-int CmdT55xxDetectPage1(const char *Cmd){
+int CmdT55xxDetectPage1(const char *Cmd)
+{
     bool errors = false;
     bool useGB = false;
     bool usepwd = false;
@@ -1935,28 +2119,28 @@ int CmdT55xxDetectPage1(const char *Cmd){
 
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
-        case 'h':
-            return usage_t55xx_detectP1();
-        case 'p':
-            password = param_get32ex(Cmd, cmdp+1, 0, 16);
-            usepwd = true;
-            cmdp += 2;
-            break;
-        case '1':
-            // use Graphbuffer data
-            useGB = true;
-            cmdp++;
-            break;
-        default:
-            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-            errors = true;
-            break;
+            case 'h':
+                return usage_t55xx_detectP1();
+            case 'p':
+                password = param_get32ex(Cmd, cmdp + 1, 0, 16);
+                usepwd = true;
+                cmdp += 2;
+                break;
+            case '1':
+                // use Graphbuffer data
+                useGB = true;
+                cmdp++;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                errors = true;
+                break;
         }
     }
     if (errors) return usage_t55xx_detectP1();
 
-    if ( !useGB ) {
-        if ( !AquireData(T55x7_PAGE1, 1, usepwd, password) )
+    if (!useGB) {
+        if (!AquireData(T55x7_PAGE1, 1, usepwd, password))
             return false;
     }
     bool success = tryDetectP1(false);
@@ -1964,52 +2148,53 @@ int CmdT55xxDetectPage1(const char *Cmd){
     return success;
 }
 
-int CmdT55xxSetDeviceConfig(const char *Cmd){
+int CmdT55xxSetDeviceConfig(const char *Cmd)
+{
     uint8_t startgap = 0, writegap = 0;
     uint8_t write0 = 0, write1 = 0, readgap = 0;
     bool errors = false, shall_persist = false;
     uint8_t cmdp = 0;
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
-        case 'h':
-            return usage_lf_deviceconfig();
-        case 'a':
-            errors |= param_getdec(Cmd, cmdp+1, &startgap);
-            cmdp += 2;
-            break;
-        case 'b':
-            errors |= param_getdec(Cmd, cmdp+1, &writegap);
-            cmdp += 2;
-            break;
-        case 'c':
-            errors |= param_getdec(Cmd, cmdp+1, &write0);
-            cmdp += 2;
-            break;
-        case 'd':
-            errors |= param_getdec(Cmd, cmdp+1, &write1);
-            cmdp += 2;
-            break;
-        case 'e':
-            errors |= param_getdec(Cmd, cmdp+1, &readgap);
-            cmdp += 2;
-            break;
-        case 'p':
-            shall_persist = true;
-            cmdp++;
-            break;
-        default:
-            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-            errors = 1;
-            break;
+            case 'h':
+                return usage_lf_deviceconfig();
+            case 'a':
+                errors |= param_getdec(Cmd, cmdp + 1, &startgap);
+                cmdp += 2;
+                break;
+            case 'b':
+                errors |= param_getdec(Cmd, cmdp + 1, &writegap);
+                cmdp += 2;
+                break;
+            case 'c':
+                errors |= param_getdec(Cmd, cmdp + 1, &write0);
+                cmdp += 2;
+                break;
+            case 'd':
+                errors |= param_getdec(Cmd, cmdp + 1, &write1);
+                cmdp += 2;
+                break;
+            case 'e':
+                errors |= param_getdec(Cmd, cmdp + 1, &readgap);
+                cmdp += 2;
+                break;
+            case 'p':
+                shall_persist = true;
+                cmdp++;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                errors = 1;
+                break;
         }
     }
 
     //Validations
     if (errors || cmdp == 0) return usage_lf_deviceconfig();
 
-    t55xx_config config = { startgap*8, writegap*8, write0*8, write1*8, readgap*8 };
+    t55xx_config config = { startgap * 8, writegap * 8, write0 * 8, write1 * 8, readgap * 8 };
 
-    UsbCommand c = {CMD_SET_LF_T55XX_CONFIG, {shall_persist,0,0} };
+    UsbCommand c = {CMD_SET_LF_T55XX_CONFIG, {shall_persist, 0, 0} };
     memcpy(c.d.asBytes, &config, sizeof(t55xx_config));
     clearCommandBuffer();
     SendCommand(&c);
@@ -2022,7 +2207,7 @@ static command_t CommandTable[] = {
     {"config",      CmdT55xxSetConfig,       1, "Set/Get T55XX configuration (modulation, inverted, offset, rate)"},
     {"chk",         CmdT55xxChkPwds,         1, "Check passwords"},
     {"detect",      CmdT55xxDetect,          1, "[1] Try detecting the tag modulation from reading the configuration block."},
-    {"deviceconfig",CmdT55xxSetDeviceConfig, 1, "Set/Get T55XX device configuration (startgap, writegap, write0, write1, readgap"},
+    {"deviceconfig", CmdT55xxSetDeviceConfig, 1, "Set/Get T55XX device configuration (startgap, writegap, write0, write1, readgap"},
     {"p1detect",    CmdT55xxDetectPage1,     1, "[1] Try detecting if this is a t55xx tag by reading page 1"},
     {"dump",        CmdT55xxDump,            0, "[password] [o] Dump T55xx card block 0-7. Optional [password], [override]"},
     {"info",        CmdT55xxInfo,            1, "[1] Show T55x7 configuration data (page 0/ blk 0)"},
@@ -2037,13 +2222,15 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFT55XX(const char *Cmd) {
+int CmdLFT55XX(const char *Cmd)
+{
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
+int CmdHelp(const char *Cmd)
+{
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlft55xx.h b/client/cmdlft55xx.h
index 77cb60b8a..f0a438ef5 100644
--- a/client/cmdlft55xx.h
+++ b/client/cmdlft55xx.h
@@ -144,15 +144,15 @@ extern int CmdT55xxDetect(const char *Cmd);
 extern int CmdResetRead(const char *Cmd);
 extern int CmdT55xxWipe(const char *Cmd);
 
-char * GetBitRateStr(uint32_t id, bool xmode);
-char * GetSaferStr(uint32_t id);
-char * GetModulationStr( uint32_t id);
-char * GetModelStrFromCID(uint32_t cid);
-char * GetSelectedModulationStr( uint8_t id);
+char *GetBitRateStr(uint32_t id, bool xmode);
+char *GetSaferStr(uint32_t id);
+char *GetModulationStr(uint32_t id);
+char *GetModelStrFromCID(uint32_t cid);
+char *GetSelectedModulationStr(uint8_t id);
 uint32_t PackBits(uint8_t start, uint8_t len, uint8_t *bitstream);
 void printT5xxHeader(uint8_t page);
 void printT55xxBlock(const char *demodStr);
-int printConfiguration( t55xx_conf_block_t b);
+int printConfiguration(t55xx_conf_block_t b);
 
 bool DecodeT55xxBlock(void);
 bool tryDetectModulation(void);
@@ -160,12 +160,12 @@ bool testKnownConfigBlock(uint32_t block0);
 extern bool tryDetectP1(bool getData);
 bool test(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk, bool *Q5);
 int special(const char *Cmd);
-bool AquireData( uint8_t page, uint8_t block, bool pwdmode, uint32_t password );
-bool AquireDataEx( uint8_t page, uint8_t block, bool pwdmode, uint32_t password, uint32_t timing ) ;
+bool AquireData(uint8_t page, uint8_t block, bool pwdmode, uint32_t password);
+bool AquireDataEx(uint8_t page, uint8_t block, bool pwdmode, uint32_t password, uint32_t timing) ;
 
 bool detectPassword(int password);
 
-void printT55x7Trace( t55x7_tracedata_t data, uint8_t repeat );
-void printT5555Trace( t5555_tracedata_t data, uint8_t repeat );
+void printT55x7Trace(t55x7_tracedata_t data, uint8_t repeat);
+void printT5555Trace(t5555_tracedata_t data, uint8_t repeat);
 
 #endif
diff --git a/client/cmdlfti.c b/client/cmdlfti.c
index 0f4cf4f96..6c675c2de 100644
--- a/client/cmdlfti.c
+++ b/client/cmdlfti.c
@@ -21,61 +21,62 @@
 
 static int CmdHelp(const char *Cmd);
 
-int CmdTIDemod(const char *Cmd) {
-  /* MATLAB as follows:
-    f_s = 2000000;  % sampling frequency
-    f_l = 123200;   % low FSK tone
-    f_h = 134200;   % high FSK tone
+int CmdTIDemod(const char *Cmd)
+{
+    /* MATLAB as follows:
+      f_s = 2000000;  % sampling frequency
+      f_l = 123200;   % low FSK tone
+      f_h = 134200;   % high FSK tone
 
-    T_l = 119e-6;   % low bit duration
-    T_h = 130e-6;   % high bit duration
+      T_l = 119e-6;   % low bit duration
+      T_h = 130e-6;   % high bit duration
 
-    l = 2*pi*ones(1, floor(f_s*T_l))*(f_l/f_s);
-    h = 2*pi*ones(1, floor(f_s*T_h))*(f_h/f_s);
+      l = 2*pi*ones(1, floor(f_s*T_l))*(f_l/f_s);
+      h = 2*pi*ones(1, floor(f_s*T_h))*(f_h/f_s);
 
-    l = sign(sin(cumsum(l)));
-    h = sign(sin(cumsum(h)));
-  */
+      l = sign(sin(cumsum(l)));
+      h = sign(sin(cumsum(h)));
+    */
 
-  // 2M*16/134.2k = 238
-  static const int LowTone[] = {
-    1, 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,
-    1, 1, 1, 1, 1, 1, 1, 1,    -1, -1, -1, -1, -1, -1, -1, -1,
-    1, 1, 1, 1, 1, 1, 1, 1,    -1, -1, -1, -1, -1, -1, -1, -1,
-    1, 1, 1, 1, 1, 1, 1, 1,    -1, -1, -1, -1, -1, -1, -1, -1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,
-    1, 1, 1, 1, 1, 1, 1, 1,    -1, -1, -1, -1, -1, -1, -1, -1,
-    1, 1, 1, 1, 1, 1, 1, 1,    -1, -1, -1, -1, -1, -1, -1, -1,
-    1, 1, 1, 1, 1, 1, 1, 1,    -1, -1, -1, -1, -1, -1, -1, -1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,
-    1, 1, 1, 1, 1, 1, 1, 1,    -1, -1, -1, -1, -1, -1, -1, -1,
-    1, 1, 1, 1, 1, 1, 1, 1,    -1, -1, -1, -1, -1, -1, -1, -1,
-    1, 1, 1, 1, 1, 1, 1, 1,    -1, -1, -1, -1, -1, -1, -1, -1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,
-    1, 1, 1, 1, 1, 1, 1, 1,    -1, -1, -1, -1, -1, -1, -1, -1,
-    1, 1, 1, 1, 1, 1, 1, 1,    -1, -1
-  };
-  // 2M*16/123.2k = 260
-  static const int HighTone[] = {
-    1, 1, 1, 1, 1, 1, 1, 1,   -1, -1, -1, -1, -1, -1, -1,
-    1, 1, 1, 1, 1, 1, 1, 1,   -1, -1, -1, -1, -1, -1, -1,
-    1, 1, 1, 1, 1, 1, 1,      -1, -1, -1, -1, -1, -1, -1, -1,
-    1, 1, 1, 1, 1, 1, 1,      -1, -1, -1, -1, -1, -1, -1, -1,
-    1, 1, 1, 1, 1, 1, 1,      -1, -1, -1, -1, -1, -1, -1, -1,
-    1, 1, 1, 1, 1, 1, 1,      -1, -1, -1, -1, -1, -1, -1,
-    1, 1, 1, 1, 1, 1, 1, 1,   -1, -1, -1, -1, -1, -1, -1,
-    1, 1, 1, 1, 1, 1, 1, 1,   -1, -1, -1, -1, -1, -1, -1,
-    1, 1, 1, 1, 1, 1, 1,      -1, -1, -1, -1, -1, -1, -1, -1,
-    1, 1, 1, 1, 1, 1, 1,      -1, -1, -1, -1, -1, -1, -1, -1,
-    1, 1, 1, 1, 1, 1, 1,      -1, -1, -1, -1, -1, -1, -1,
-    1, 1, 1, 1, 1, 1, 1, 1,   -1, -1, -1, -1, -1, -1, -1,
-    1, 1, 1, 1, 1, 1, 1, 1,   -1, -1, -1, -1, -1, -1, -1,
-    1, 1, 1, 1, 1, 1, 1, 1,   -1, -1, -1, -1, -1, -1, -1,
-    1, 1, 1, 1, 1, 1, 1,      -1, -1, -1, -1, -1, -1, -1, -1,
-    1, 1, 1, 1, 1, 1, 1,      -1, -1, -1, -1, -1, -1, -1, -1,
-    1, 1, 1, 1, 1, 1, 1,      -1, -1, -1, -1, -1, -1, -1,
-    1, 1, 1, 1, 1, 1, 1, 1
-  };
+    // 2M*16/134.2k = 238
+    static const int LowTone[] = {
+        1, 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,
+        1, 1, 1, 1, 1, 1, 1, 1,    -1, -1, -1, -1, -1, -1, -1, -1,
+        1, 1, 1, 1, 1, 1, 1, 1,    -1, -1, -1, -1, -1, -1, -1, -1,
+        1, 1, 1, 1, 1, 1, 1, 1,    -1, -1, -1, -1, -1, -1, -1, -1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,
+        1, 1, 1, 1, 1, 1, 1, 1,    -1, -1, -1, -1, -1, -1, -1, -1,
+        1, 1, 1, 1, 1, 1, 1, 1,    -1, -1, -1, -1, -1, -1, -1, -1,
+        1, 1, 1, 1, 1, 1, 1, 1,    -1, -1, -1, -1, -1, -1, -1, -1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,
+        1, 1, 1, 1, 1, 1, 1, 1,    -1, -1, -1, -1, -1, -1, -1, -1,
+        1, 1, 1, 1, 1, 1, 1, 1,    -1, -1, -1, -1, -1, -1, -1, -1,
+        1, 1, 1, 1, 1, 1, 1, 1,    -1, -1, -1, -1, -1, -1, -1, -1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,
+        1, 1, 1, 1, 1, 1, 1, 1,    -1, -1, -1, -1, -1, -1, -1, -1,
+        1, 1, 1, 1, 1, 1, 1, 1,    -1, -1
+    };
+    // 2M*16/123.2k = 260
+    static const int HighTone[] = {
+        1, 1, 1, 1, 1, 1, 1, 1,   -1, -1, -1, -1, -1, -1, -1,
+        1, 1, 1, 1, 1, 1, 1, 1,   -1, -1, -1, -1, -1, -1, -1,
+        1, 1, 1, 1, 1, 1, 1,      -1, -1, -1, -1, -1, -1, -1, -1,
+        1, 1, 1, 1, 1, 1, 1,      -1, -1, -1, -1, -1, -1, -1, -1,
+        1, 1, 1, 1, 1, 1, 1,      -1, -1, -1, -1, -1, -1, -1, -1,
+        1, 1, 1, 1, 1, 1, 1,      -1, -1, -1, -1, -1, -1, -1,
+        1, 1, 1, 1, 1, 1, 1, 1,   -1, -1, -1, -1, -1, -1, -1,
+        1, 1, 1, 1, 1, 1, 1, 1,   -1, -1, -1, -1, -1, -1, -1,
+        1, 1, 1, 1, 1, 1, 1,      -1, -1, -1, -1, -1, -1, -1, -1,
+        1, 1, 1, 1, 1, 1, 1,      -1, -1, -1, -1, -1, -1, -1, -1,
+        1, 1, 1, 1, 1, 1, 1,      -1, -1, -1, -1, -1, -1, -1,
+        1, 1, 1, 1, 1, 1, 1, 1,   -1, -1, -1, -1, -1, -1, -1,
+        1, 1, 1, 1, 1, 1, 1, 1,   -1, -1, -1, -1, -1, -1, -1,
+        1, 1, 1, 1, 1, 1, 1, 1,   -1, -1, -1, -1, -1, -1, -1,
+        1, 1, 1, 1, 1, 1, 1,      -1, -1, -1, -1, -1, -1, -1, -1,
+        1, 1, 1, 1, 1, 1, 1,      -1, -1, -1, -1, -1, -1, -1, -1,
+        1, 1, 1, 1, 1, 1, 1,      -1, -1, -1, -1, -1, -1, -1,
+        1, 1, 1, 1, 1, 1, 1, 1
+    };
 
     save_restoreGB(GRAPH_SAVE);
 
@@ -93,10 +94,10 @@ int CmdTIDemod(const char *Cmd) {
         highSum = 0;;
 
         for (j = 0; j < lowLen; j++) {
-            lowSum += LowTone[j] * GraphBuffer[i+j];
+            lowSum += LowTone[j] * GraphBuffer[i + j];
         }
         for (j = 0; j < highLen; j++) {
-            highSum += HighTone[j] * GraphBuffer[i+j];
+            highSum += HighTone[j] * GraphBuffer[i + j];
         }
         lowSum = abs((100 * lowSum) / lowLen);
         highSum = abs((100 * highSum) / highLen);
@@ -111,10 +112,10 @@ int CmdTIDemod(const char *Cmd) {
         highTot = 0;
         // 16 and 15 are f_s divided by f_l and f_h, rounded
         for (j = 0; j < 16; j++) {
-            lowTot += (GraphBuffer[i+j] & 0xffff);
+            lowTot += (GraphBuffer[i + j] & 0xffff);
         }
         for (j = 0; j < 15; j++) {
-            highTot += (GraphBuffer[i+j] >> 16);
+            highTot += (GraphBuffer[i + j] >> 16);
         }
         GraphBuffer[i] = lowTot - highTot;
     }
@@ -141,12 +142,12 @@ int CmdTIDemod(const char *Cmd) {
         int j;
         int dec = 0;
         // searching 17 consecutive lows
-        for (j = 0; j < 17*lowLen; j++) {
-            dec -= GraphBuffer[i+j];
+        for (j = 0; j < 17 * lowLen; j++) {
+            dec -= GraphBuffer[i + j];
         }
         // searching 7 consecutive highs
-        for (; j < 17*lowLen + 6*highLen; j++) {
-            dec += GraphBuffer[i+j];
+        for (; j < 17 * lowLen + 6 * highLen; j++) {
+            dec += GraphBuffer[i + j];
         }
         if (dec > max) {
             max = dec;
@@ -157,7 +158,7 @@ int CmdTIDemod(const char *Cmd) {
     // place a marker in the buffer to visually aid location
     // of the start of sync
     GraphBuffer[maxPos] = 800;
-    GraphBuffer[maxPos+1] = -800;
+    GraphBuffer[maxPos + 1] = -800;
 
     // advance pointer to start of actual data stream (after 16 pre and 8 start bits)
     maxPos += 17 * lowLen;
@@ -166,46 +167,46 @@ int CmdTIDemod(const char *Cmd) {
     // place a marker in the buffer to visually aid location
     // of the end of sync
     GraphBuffer[maxPos] = 800;
-    GraphBuffer[maxPos+1] = -800;
+    GraphBuffer[maxPos + 1] = -800;
 
     PrintAndLogEx(DEBUG, "actual data bits start at sample %d", maxPos);
     PrintAndLogEx(DEBUG, "length %d/%d", highLen, lowLen);
 
-    uint8_t bits[1+64+16+8+16];
-    bits[sizeof(bits)-1] = '\0';
+    uint8_t bits[1 + 64 + 16 + 8 + 16];
+    bits[sizeof(bits) - 1] = '\0';
 
     uint32_t shift3 = 0x7e000000, shift2 = 0, shift1 = 0, shift0 = 0;
 
-    for (i = 0; i < ARRAYLEN(bits)-1; i++) {
+    for (i = 0; i < ARRAYLEN(bits) - 1; i++) {
         int high = 0;
         int low = 0;
         int j;
         for (j = 0; j < lowLen; j++) {
-            low -= GraphBuffer[maxPos+j];
+            low -= GraphBuffer[maxPos + j];
         }
         for (j = 0; j < highLen; j++) {
-            high += GraphBuffer[maxPos+j];
+            high += GraphBuffer[maxPos + j];
         }
 
         if (high > low) {
             bits[i] = '1';
             maxPos += highLen;
             // bitstream arrives lsb first so shift right
-            shift3 |= (1<<31);
+            shift3 |= (1 << 31);
         } else {
             bits[i] = '.';
             maxPos += lowLen;
         }
 
         // 128 bit right shift register
-        shift0 = (shift0>>1) | (shift1 << 31);
-        shift1 = (shift1>>1) | (shift2 << 31);
-        shift2 = (shift2>>1) | (shift3 << 31);
+        shift0 = (shift0 >> 1) | (shift1 << 31);
+        shift1 = (shift1 >> 1) | (shift2 << 31);
+        shift2 = (shift2 >> 1) | (shift3 << 31);
         shift3 >>= 1;
 
         // place a marker in the buffer between bits to visually aid location
         GraphBuffer[maxPos] = 800;
-        GraphBuffer[maxPos+1] = -800;
+        GraphBuffer[maxPos + 1] = -800;
     }
 
     RepaintGraphWindow();
@@ -213,16 +214,14 @@ int CmdTIDemod(const char *Cmd) {
     PrintAndLogEx(INFO, "raw tag bits = %s", bits);
 
     TagType = (shift3 >> 8) & 0xFF;
-    if ( TagType != ((shift0 >> 16) & 0xFF) ) {
+    if (TagType != ((shift0 >> 16) & 0xFF)) {
         PrintAndLogEx(WARNING, "Error: start and stop bits do not match!");
         goto out;
-    }
-    else if (TagType == 0x7E) {
+    } else if (TagType == 0x7E) {
         PrintAndLogEx(INFO, "Readonly TI tag detected.");
         retval = 1;
         goto out;
-    }
-    else if (TagType == 0xFE) {
+    } else if (TagType == 0xFE) {
         PrintAndLogEx(INFO, "Rewriteable TI tag detected.");
 
         // put 64 bit data into shift1 and shift0
@@ -236,8 +235,8 @@ int CmdTIDemod(const char *Cmd) {
         shift3 >>= 16;
 
         // only 15 bits compare, last bit of ident is not valid
-        if ( (shift3 ^ shift0) & 0x7FFF ) {
-          PrintAndLogEx(WARNING, "Error: Ident mismatch!");
+        if ((shift3 ^ shift0) & 0x7FFF) {
+            PrintAndLogEx(WARNING, "Error: Ident mismatch!");
         }
         // WARNING the order of the bytes in which we calc crc below needs checking
         // i'm 99% sure the crc algorithm is correct, but it may need to eat the
@@ -256,29 +255,29 @@ int CmdTIDemod(const char *Cmd) {
 
         //crc =  crc16_ccitt(message, sizeof(message);
 
-        char *crcStr = (crc == (shift2 & 0xFFFF) ) ? "Passed" : "Failed";
+        char *crcStr = (crc == (shift2 & 0xFFFF)) ? "Passed" : "Failed";
 
-        PrintAndLogEx(INFO, "Tag data = %08X%08X  [Crc %04X %s]", shift1, shift0, crc, crcStr );
+        PrintAndLogEx(INFO, "Tag data = %08X%08X  [Crc %04X %s]", shift1, shift0, crc, crcStr);
 
         if (crc != (shift2 & 0xFFFF))
             PrintAndLogEx(WARNING, "Error: CRC mismatch, calculated %04X, got %04X", crc, shift2 & 0xFFFF);
 
         retval = 1;
         goto out;
-    }
-    else {
+    } else {
         PrintAndLogEx(WARNING, "Unknown tag type.");
     }
 
 out:
-    if ( retval == 0)
+    if (retval == 0)
         save_restoreGB(GRAPH_RESTORE);
 
     return retval;
 }
 
 // read a TI tag and return its ID
-int CmdTIRead(const char *Cmd) {
+int CmdTIRead(const char *Cmd)
+{
     UsbCommand c = {CMD_READ_TI_TYPE};
     clearCommandBuffer();
     SendCommand(&c);
@@ -286,7 +285,8 @@ int CmdTIRead(const char *Cmd) {
 }
 
 // write new data to a r/w TI tag
-int CmdTIWrite(const char *Cmd) {
+int CmdTIWrite(const char *Cmd)
+{
     int res = 0;
     UsbCommand c = {CMD_WRITE_TI_TYPE};
     res = sscanf(Cmd, "%012" SCNx64 " %012" SCNx64 " %012" SCNx64 "", &c.arg[0], &c.arg[1], &c.arg[2]);
@@ -311,13 +311,15 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFTI(const char *Cmd){
+int CmdLFTI(const char *Cmd)
+{
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd){
+int CmdHelp(const char *Cmd)
+{
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfviking.c b/client/cmdlfviking.c
index 37370dc88..33df5c971 100644
--- a/client/cmdlfviking.c
+++ b/client/cmdlfviking.c
@@ -11,7 +11,8 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_lf_viking_clone(void) {
+int usage_lf_viking_clone(void)
+{
     PrintAndLogEx(NORMAL, "clone a Viking AM tag to a T55x7 tag.");
     PrintAndLogEx(NORMAL, "Usage: lf viking clone <Card ID - 8 hex digits> <Q5>");
     PrintAndLogEx(NORMAL, "Options:");
@@ -23,7 +24,8 @@ int usage_lf_viking_clone(void) {
     return 0;
 }
 
-int usage_lf_viking_sim(void) {
+int usage_lf_viking_sim(void)
+{
     PrintAndLogEx(NORMAL, "Enables simulation of viking card with specified card number.");
     PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "Per viking format, the card number is 8 digit hex number.  Larger values are truncated.");
@@ -38,8 +40,9 @@ int usage_lf_viking_sim(void) {
 }
 
 // calc checksum
-uint64_t getVikingBits(uint32_t id) {
-    uint8_t checksum = ((id>>24) & 0xFF) ^ ((id>>16) & 0xFF) ^ ((id>>8) & 0xFF) ^ (id & 0xFF) ^ 0xF2 ^ 0xA8;
+uint64_t getVikingBits(uint32_t id)
+{
+    uint8_t checksum = ((id >> 24) & 0xFF) ^ ((id >> 16) & 0xFF) ^ ((id >> 8) & 0xFF) ^ (id & 0xFF) ^ 0xF2 ^ 0xA8;
     uint64_t ret = (uint64_t)0xF2 << 56;
     ret |= (uint64_t)id << 8;
     ret |= checksum;
@@ -47,23 +50,24 @@ uint64_t getVikingBits(uint32_t id) {
 }
 // by marshmellow
 // find viking preamble 0xF200 in already demoded data
-int detectViking(uint8_t *dest, size_t *size) {
+int detectViking(uint8_t *dest, size_t *size)
+{
     //make sure buffer has data
-    if (*size < 64*2) return -2;
+    if (*size < 64 * 2) return -2;
     size_t startIdx = 0;
-    uint8_t preamble[] = {1,1,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+    uint8_t preamble[] = {1, 1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
     if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
         return -4; //preamble not found
 
-    uint32_t checkCalc = bytebits_to_byte(dest+startIdx,8) ^
-                         bytebits_to_byte(dest+startIdx+8,8) ^
-                         bytebits_to_byte(dest+startIdx+16,8) ^
-                         bytebits_to_byte(dest+startIdx+24,8) ^
-                         bytebits_to_byte(dest+startIdx+32,8) ^
-                         bytebits_to_byte(dest+startIdx+40,8) ^
-                         bytebits_to_byte(dest+startIdx+48,8) ^
-                         bytebits_to_byte(dest+startIdx+56,8);
-    if ( checkCalc != 0xA8 ) return -5;
+    uint32_t checkCalc = bytebits_to_byte(dest + startIdx, 8) ^
+                         bytebits_to_byte(dest + startIdx + 8, 8) ^
+                         bytebits_to_byte(dest + startIdx + 16, 8) ^
+                         bytebits_to_byte(dest + startIdx + 24, 8) ^
+                         bytebits_to_byte(dest + startIdx + 32, 8) ^
+                         bytebits_to_byte(dest + startIdx + 40, 8) ^
+                         bytebits_to_byte(dest + startIdx + 48, 8) ^
+                         bytebits_to_byte(dest + startIdx + 56, 8);
+    if (checkCalc != 0xA8) return -5;
     if (*size != 64) return -6;
     //return start position
     return (int)startIdx;
@@ -71,7 +75,8 @@ int detectViking(uint8_t *dest, size_t *size) {
 
 //by marshmellow
 //see ASKDemod for what args are accepted
-int CmdVikingDemod(const char *Cmd) {
+int CmdVikingDemod(const char *Cmd)
+{
     if (!ASKDemod(Cmd, false, false, 1)) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - Viking ASKDemod failed");
         return 0;
@@ -80,29 +85,31 @@ int CmdVikingDemod(const char *Cmd) {
 
     int ans = detectViking(DemodBuffer, &size);
     if (ans < 0) {
-        PrintAndLogEx(DEBUG, "DEBUG: Error - Viking Demod %d %s", ans, (ans == -5)?"[chksum error]":"");
+        PrintAndLogEx(DEBUG, "DEBUG: Error - Viking Demod %d %s", ans, (ans == -5) ? "[chksum error]" : "");
         return 0;
     }
     //got a good demod
-    uint32_t raw1 = bytebits_to_byte(DemodBuffer+ans, 32);
-    uint32_t raw2 = bytebits_to_byte(DemodBuffer+ans+32, 32);
-    uint32_t cardid = bytebits_to_byte(DemodBuffer+ans+24, 32);
-    uint8_t  checksum = bytebits_to_byte(DemodBuffer+ans+32+24, 8);
+    uint32_t raw1 = bytebits_to_byte(DemodBuffer + ans, 32);
+    uint32_t raw2 = bytebits_to_byte(DemodBuffer + ans + 32, 32);
+    uint32_t cardid = bytebits_to_byte(DemodBuffer + ans + 24, 32);
+    uint8_t  checksum = bytebits_to_byte(DemodBuffer + ans + 32 + 24, 8);
     PrintAndLogEx(SUCCESS, "Viking Tag Found: Card ID %08X, Checksum: %02X", cardid, checksum);
-    PrintAndLogEx(SUCCESS, "Raw: %08X%08X", raw1,raw2);
+    PrintAndLogEx(SUCCESS, "Raw: %08X%08X", raw1, raw2);
     setDemodBuf(DemodBuffer, 64, ans);
-    setClockGrid(g_DemodClock, g_DemodStartIdx + (ans*g_DemodClock));
+    setClockGrid(g_DemodClock, g_DemodStartIdx + (ans * g_DemodClock));
     return 1;
 }
 
 //by marshmellow
 //see ASKDemod for what args are accepted
-int CmdVikingRead(const char *Cmd) {
+int CmdVikingRead(const char *Cmd)
+{
     lf_read(true, 10000);
     return CmdVikingDemod(Cmd);
 }
 
-int CmdVikingClone(const char *Cmd) {
+int CmdVikingClone(const char *Cmd)
+{
     uint32_t id = 0;
     uint64_t rawID = 0;
     bool Q5 = false;
@@ -113,25 +120,26 @@ int CmdVikingClone(const char *Cmd) {
     if (id == 0) return usage_lf_viking_clone();
 
     cmdp = param_getchar(Cmd, 1);
-    if ( cmdp == 'Q' || cmdp == 'q')
+    if (cmdp == 'Q' || cmdp == 'q')
         Q5 = true;
 
     rawID = getVikingBits(id);
 
-    PrintAndLogEx(INFO, "Preparing to clone Viking tag - ID: %08X, Raw: %08X%08X",id,(uint32_t)(rawID >> 32),(uint32_t) (rawID & 0xFFFFFFFF));
+    PrintAndLogEx(INFO, "Preparing to clone Viking tag - ID: %08X, Raw: %08X%08X", id, (uint32_t)(rawID >> 32), (uint32_t)(rawID & 0xFFFFFFFF));
 
     UsbCommand c = {CMD_VIKING_CLONE_TAG, {rawID >> 32, rawID & 0xFFFFFFFF, Q5}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
-    if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)){
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
         PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
         return -1;
     }
     return 0;
 }
 
-int CmdVikingSim(const char *Cmd) {
+int CmdVikingSim(const char *Cmd)
+{
     uint32_t id = 0;
     uint64_t rawID = 0;
     uint8_t clk = 32, encoding = 1, separator = 0, invert = 0;
@@ -149,7 +157,7 @@ int CmdVikingSim(const char *Cmd) {
     arg1 = clk << 8 | encoding;
     arg2 = invert << 8 | separator;
 
-    PrintAndLogEx(SUCCESS, "Simulating Viking - ID: %08X, Raw: %08X%08X",id,(uint32_t)(rawID >> 32),(uint32_t) (rawID & 0xFFFFFFFF));
+    PrintAndLogEx(SUCCESS, "Simulating Viking - ID: %08X, Raw: %08X%08X", id, (uint32_t)(rawID >> 32), (uint32_t)(rawID & 0xFFFFFFFF));
 
     UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};
     num_to_bytebits(rawID, size, c.d.asBytes);
@@ -167,13 +175,15 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFViking(const char *Cmd) {
+int CmdLFViking(const char *Cmd)
+{
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
+int CmdHelp(const char *Cmd)
+{
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfvisa2000.c b/client/cmdlfvisa2000.c
index 51dc5c843..a2b229592 100644
--- a/client/cmdlfvisa2000.c
+++ b/client/cmdlfvisa2000.c
@@ -15,7 +15,8 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_lf_visa2k_clone(void){
+int usage_lf_visa2k_clone(void)
+{
     PrintAndLogEx(NORMAL, "clone a Visa2000 tag to a T55x7 tag.");
     PrintAndLogEx(NORMAL, "Usage: lf visa2000 clone [h] <card ID> <Q5>");
     PrintAndLogEx(NORMAL, "Options:");
@@ -28,7 +29,8 @@ int usage_lf_visa2k_clone(void){
     return 0;
 }
 
-int usage_lf_visa2k_sim(void) {
+int usage_lf_visa2k_sim(void)
+{
     PrintAndLogEx(NORMAL, "Enables simulation of visa2k card with specified card number.");
     PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "");
@@ -42,39 +44,42 @@ int usage_lf_visa2k_sim(void) {
     return 0;
 }
 
-static uint8_t visa_chksum( uint32_t id ) {
+static uint8_t visa_chksum(uint32_t id)
+{
     uint8_t sum = 0;
     for (uint8_t i = 0; i < 32; i += 4)
-        sum ^=  (id >> i) & 0xF;
+        sum ^= (id >> i) & 0xF;
     return sum & 0xF;
 }
 
-static uint8_t visa_parity( uint32_t id) {
+static uint8_t visa_parity(uint32_t id)
+{
     // 4bit parity LUT
     uint8_t par_lut[] = {
-        0,1,1,0
-        ,1,0,0,1
-        ,1,0,0,1
-        ,0,1,1,0
+        0, 1, 1, 0
+        , 1, 0, 0, 1
+        , 1, 0, 0, 1
+        , 0, 1, 1, 0
     };
     uint8_t par = 0;
-    par |= par_lut[ (id >> 28) & 0xF ] << 7;
-    par |= par_lut[ (id >> 24) & 0xF ] << 6;
-    par |= par_lut[ (id >> 20) & 0xF ] << 5;
-    par |= par_lut[ (id >> 16) & 0xF ] << 4;
-    par |= par_lut[ (id >> 12) & 0xF ] << 3;
-    par |= par_lut[ (id >>  8) & 0xF ] << 2;
-    par |= par_lut[ (id >>  4) & 0xF ] << 1;
-    par |= par_lut[ (id & 0xF) ];
+    par |= par_lut[(id >> 28) & 0xF ] << 7;
+    par |= par_lut[(id >> 24) & 0xF ] << 6;
+    par |= par_lut[(id >> 20) & 0xF ] << 5;
+    par |= par_lut[(id >> 16) & 0xF ] << 4;
+    par |= par_lut[(id >> 12) & 0xF ] << 3;
+    par |= par_lut[(id >>  8) & 0xF ] << 2;
+    par |= par_lut[(id >>  4) & 0xF ] << 1;
+    par |= par_lut[(id & 0xF) ];
     return par;
 }
 
 // by iceman
 // find Visa2000 preamble in already demoded data
-int detectVisa2k(uint8_t *dest, size_t *size) {
+int detectVisa2k(uint8_t *dest, size_t *size)
+{
     if (*size < 96) return -1; //make sure buffer has data
     size_t startIdx = 0;
-    uint8_t preamble[] = {0,1,0,1,0,1,1,0,0,1,0,0,1,0,0,1,0,1,0,1,0,0,1,1,0,0,1,1,0,0,1,0};
+    uint8_t preamble[] = {0, 1, 0, 1, 0, 1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 0};
     if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
         return -2; //preamble not found
     if (*size != 96) return -3; //wrong demoded size
@@ -94,7 +99,8 @@ int detectVisa2k(uint8_t *dest, size_t *size) {
 *
 **/
 //see ASKDemod for what args are accepted
-int CmdVisa2kDemod(const char *Cmd) {
+int CmdVisa2kDemod(const char *Cmd)
+{
 
     save_restoreGB(GRAPH_SAVE);
 
@@ -109,7 +115,7 @@ int CmdVisa2kDemod(const char *Cmd) {
     }
     size_t size = DemodBufferLen;
     int ans = detectVisa2k(DemodBuffer, &size);
-    if (ans < 0){
+    if (ans < 0) {
         if (ans == -1)
             PrintAndLogEx(DEBUG, "DEBUG: Error - Visa2k: too few bits found");
         else if (ans == -2)
@@ -123,19 +129,19 @@ int CmdVisa2kDemod(const char *Cmd) {
         return 0;
     }
     setDemodBuf(DemodBuffer, 96, ans);
-    setClockGrid(g_DemodClock, g_DemodStartIdx + (ans*g_DemodClock));
+    setClockGrid(g_DemodClock, g_DemodStartIdx + (ans * g_DemodClock));
 
     //got a good demod
     uint32_t raw1 = bytebits_to_byte(DemodBuffer, 32);
-    uint32_t raw2 = bytebits_to_byte(DemodBuffer+32, 32);
-    uint32_t raw3 = bytebits_to_byte(DemodBuffer+64, 32);
+    uint32_t raw2 = bytebits_to_byte(DemodBuffer + 32, 32);
+    uint32_t raw3 = bytebits_to_byte(DemodBuffer + 64, 32);
 
     // chksum
     uint8_t calc = visa_chksum(raw2);
     uint8_t chk = raw3 & 0xF;
 
     // test checksums
-    if ( chk != calc ) {
+    if (chk != calc) {
         PrintAndLogEx(DEBUG, "DEBUG: error: Visa2000 checksum failed %x - %x\n", chk, calc);
         save_restoreGB(GRAPH_RESTORE);
         return 0;
@@ -143,22 +149,24 @@ int CmdVisa2kDemod(const char *Cmd) {
     // parity
     uint8_t calc_par = visa_parity(raw2);
     uint8_t chk_par = (raw3 & 0xFF0) >> 4;
-    if ( calc_par != chk_par) {
+    if (calc_par != chk_par) {
         PrintAndLogEx(DEBUG, "DEBUG: error: Visa2000 parity failed %x - %x\n", chk_par, calc_par);
         save_restoreGB(GRAPH_RESTORE);
         return 0;
     }
-    PrintAndLogEx(SUCCESS, "Visa2000 Tag Found: Card ID %u,  Raw: %08X%08X%08X", raw2,  raw1 ,raw2, raw3);
+    PrintAndLogEx(SUCCESS, "Visa2000 Tag Found: Card ID %u,  Raw: %08X%08X%08X", raw2,  raw1, raw2, raw3);
     return 1;
 }
 
 // 64*96*2=12288 samples just in case we just missed the first preamble we can still catch 2 of them
-int CmdVisa2kRead(const char *Cmd) {
+int CmdVisa2kRead(const char *Cmd)
+{
     lf_read(true, 20000);
     return CmdVisa2kDemod(Cmd);
 }
 
-int CmdVisa2kClone(const char *Cmd) {
+int CmdVisa2kClone(const char *Cmd)
+{
 
     uint64_t id = 0;
     uint32_t blocks[4] = {T55x7_MODULATION_MANCHESTER | T55x7_BITRATE_RF_64 | T55x7_ST_TERMINATOR | 3 << T55x7_MAXBLOCK_SHIFT, BL0CK1, 0};
@@ -173,20 +181,20 @@ int CmdVisa2kClone(const char *Cmd) {
         blocks[0] = T5555_MODULATION_MANCHESTER | T5555_SET_BITRATE(64) | T5555_ST_TERMINATOR | 3 << T5555_MAXBLOCK_SHIFT;
 
     blocks[2] = id;
-    blocks[3] =  (visa_parity(id) << 4) | visa_chksum(id);
+    blocks[3] = (visa_parity(id) << 4) | visa_chksum(id);
 
     PrintAndLogEx(INFO, "Preparing to clone Visa2000 to T55x7 with CardId: %u", id);
     print_blocks(blocks, 4);
 
     UsbCommand resp;
-    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
+    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}};
 
     for (uint8_t i = 0; i < 4; i++) {
         c.arg[0] = blocks[i];
         c.arg[1] = i;
         clearCommandBuffer();
         SendCommand(&c);
-        if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)){
+        if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
             return -1;
         }
@@ -194,7 +202,8 @@ int CmdVisa2kClone(const char *Cmd) {
     return 0;
 }
 
-int CmdVisa2kSim(const char *Cmd) {
+int CmdVisa2kSim(const char *Cmd)
+{
 
     uint32_t id = 0;
     char cmdp = param_getchar(Cmd, 0);
@@ -214,8 +223,8 @@ int CmdVisa2kSim(const char *Cmd) {
 
     uint32_t blocks[3] = { BL0CK1, id, (visa_parity(id) << 4) | visa_chksum(id) };
 
-    for(int i = 0; i < 3; ++i)
-        num_to_bytebits(blocks[i], 32, c.d.asBytes + i*32);
+    for (int i = 0; i < 3; ++i)
+        num_to_bytebits(blocks[i], 32, c.d.asBytes + i * 32);
 
     clearCommandBuffer();
     SendCommand(&c);
@@ -231,13 +240,15 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFVisa2k(const char *Cmd) {
+int CmdLFVisa2k(const char *Cmd)
+{
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
+int CmdHelp(const char *Cmd)
+{
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdmain.c b/client/cmdmain.c
index c9ddae448..911280955 100644
--- a/client/cmdmain.c
+++ b/client/cmdmain.c
@@ -38,32 +38,37 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-command_t* getTopLevelCommandTable() {
+command_t *getTopLevelCommandTable()
+{
     return CommandTable;
 }
 
-int CmdRem(const char *Cmd) {
+int CmdRem(const char *Cmd)
+{
     char buf[22];
 
     memset(buf, 0x00, sizeof(buf));
     struct tm *curTime;
     time_t now = time(0);
     curTime = gmtime(&now);
-    strftime (buf, sizeof(buf), "%Y-%m-%dT%H:%M:%SZ", curTime); // ISO8601
+    strftime(buf, sizeof(buf), "%Y-%m-%dT%H:%M:%SZ", curTime);  // ISO8601
     PrintAndLogEx(NORMAL, "%s remark: %s", buf, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
+int CmdHelp(const char *Cmd)
+{
     CmdsHelp(CommandTable);
     return 0;
 }
 
-int CmdQuit(const char *Cmd) {
+int CmdQuit(const char *Cmd)
+{
     return 99;
 }
 
-int CmdRev(const char *Cmd) {
+int CmdRev(const char *Cmd)
+{
     CmdCrc(Cmd);
     return 0;
 }
@@ -72,6 +77,7 @@ int CmdRev(const char *Cmd) {
 // Entry point into our code: called whenever the user types a command and
 // then presses Enter, which the full command line that they typed.
 //-----------------------------------------------------------------------------
-int CommandReceived(char *Cmd) {
+int CommandReceived(char *Cmd)
+{
     return CmdsParse(CommandTable, Cmd);
 }
\ No newline at end of file
diff --git a/client/cmdmain.h b/client/cmdmain.h
index a030e9a6a..d5ac8e5a4 100644
--- a/client/cmdmain.h
+++ b/client/cmdmain.h
@@ -42,6 +42,6 @@
 #endif
 
 extern int CommandReceived(char *Cmd);
-extern command_t* getTopLevelCommandTable();
+extern command_t *getTopLevelCommandTable();
 
 #endif
diff --git a/client/cmdparser.c b/client/cmdparser.c
index 7a6ceaff9..af26c794b 100644
--- a/client/cmdparser.c
+++ b/client/cmdparser.c
@@ -17,7 +17,8 @@
 #include "proxmark3.h"
 #include "comms.h"
 
-void CmdsHelp(const command_t Commands[]) {
+void CmdsHelp(const command_t Commands[])
+{
     if (Commands[0].Name == NULL) return;
     int i = 0;
     while (Commands[i].Name) {
@@ -27,14 +28,15 @@ void CmdsHelp(const command_t Commands[]) {
     }
 }
 
-int CmdsParse(const command_t Commands[], const char *Cmd) {
+int CmdsParse(const command_t Commands[], const char *Cmd)
+{
     // Help dump children
-    if (strcmp( Cmd, "XX_internal_command_dump_XX") == 0) {
+    if (strcmp(Cmd, "XX_internal_command_dump_XX") == 0) {
         dumpCommandsRecursive(Commands, 0);
         return 0;
     }
     // Markdown help dump children
-    if(strcmp( Cmd, "XX_internal_command_dump_markdown_XX") == 0) {
+    if (strcmp(Cmd, "XX_internal_command_dump_markdown_XX") == 0) {
         dumpCommandsRecursive(Commands, 1);
         return 0;
     }
@@ -52,8 +54,8 @@ int CmdsParse(const command_t Commands[], const char *Cmd) {
         int last_match = 0;
         int matches = 0;
 
-        for (i=0; Commands[i].Name; i++) {
-            if( !strncmp(Commands[i].Name, cmd_name, strlen(cmd_name)) ) {
+        for (i = 0; Commands[i].Name; i++) {
+            if (!strncmp(Commands[i].Name, cmd_name, strlen(cmd_name))) {
                 last_match = i;
                 matches++;
             }
@@ -63,7 +65,7 @@ int CmdsParse(const command_t Commands[], const char *Cmd) {
 
     if (Commands[i].Name) {
         while (Cmd[len] == ' ')
-        ++len;
+            ++len;
         return Commands[i].Parse(Cmd + len);
     } else {
         // show help for selected hierarchy or if command not recognised
@@ -76,7 +78,8 @@ int CmdsParse(const command_t Commands[], const char *Cmd) {
 char pparent[512] = {0};
 char *parent = pparent;
 
-void dumpCommandsRecursive(const command_t cmds[], int markdown) {
+void dumpCommandsRecursive(const command_t cmds[], int markdown)
+{
     if (cmds[0].Name == NULL) return;
 
     int i = 0;
@@ -85,23 +88,23 @@ void dumpCommandsRecursive(const command_t cmds[], int markdown) {
     // First, dump all single commands, which are not a container for
     // other commands
     if (markdown) {
-        PrintAndLogEx(NORMAL, "|%-*s|%-*s|%s\n",w_cmd,"command",w_off,"offline","description");
-        PrintAndLogEx(NORMAL, "|%-*s|%-*s|%s\n",w_cmd,"-------",w_off,"-------","-----------");
+        PrintAndLogEx(NORMAL, "|%-*s|%-*s|%s\n", w_cmd, "command", w_off, "offline", "description");
+        PrintAndLogEx(NORMAL, "|%-*s|%-*s|%s\n", w_cmd, "-------", w_off, "-------", "-----------");
     } else {
-        PrintAndLogEx(NORMAL, "%-*s|%-*s|%s\n",w_cmd,"command",w_off,"offline","description");
-        PrintAndLogEx(NORMAL, "%-*s|%-*s|%s\n",w_cmd,"-------",w_off,"-------","-----------");
+        PrintAndLogEx(NORMAL, "%-*s|%-*s|%s\n", w_cmd, "command", w_off, "offline", "description");
+        PrintAndLogEx(NORMAL, "%-*s|%-*s|%s\n", w_cmd, "-------", w_off, "-------", "-----------");
     }
 
     while (cmds[i].Name) {
-        char* cmd_offline = "N";
+        char *cmd_offline = "N";
         if (cmds[i].Help[0] == '{' && ++i) continue;
 
-        if ( cmds[i].Offline)
+        if (cmds[i].Offline)
             cmd_offline = "Y";
         if (markdown)
-          PrintAndLogEx(NORMAL, "|`%s%-*s`|%-*s|`%s`\n", parent, w_cmd-(int)strlen(parent)-2, cmds[i].Name, w_off, cmd_offline, cmds[i].Help);
+            PrintAndLogEx(NORMAL, "|`%s%-*s`|%-*s|`%s`\n", parent, w_cmd - (int)strlen(parent) - 2, cmds[i].Name, w_off, cmd_offline, cmds[i].Help);
         else
-          PrintAndLogEx(NORMAL, "%s%-*s|%-*s|%s\n", parent, w_cmd-(int)strlen(parent), cmds[i].Name, w_off, cmd_offline, cmds[i].Help);
+            PrintAndLogEx(NORMAL, "%s%-*s|%-*s|%s\n", parent, w_cmd - (int)strlen(parent), cmds[i].Name, w_off, cmd_offline, cmds[i].Help);
         ++i;
     }
     PrintAndLogEx(NORMAL, "\n\n");
@@ -109,7 +112,7 @@ void dumpCommandsRecursive(const command_t cmds[], int markdown) {
 
     // Then, print the categories. These will go into subsections with their own tables
     while (cmds[i].Name) {
-        if(cmds[i].Help[0] != '{' && ++i)  continue;
+        if (cmds[i].Help[0] != '{' && ++i)  continue;
 
         PrintAndLogEx(NORMAL, "### %s%s\n\n %s\n\n", parent, cmds[i].Name, cmds[i].Help);
 
@@ -120,9 +123,9 @@ void dumpCommandsRecursive(const command_t cmds[], int markdown) {
         // This is what causes the recursion, since commands Parse-implementation
         // in turn calls the CmdsParse above.
         if (markdown)
-          cmds[i].Parse("XX_internal_command_dump_markdown_XX");
+            cmds[i].Parse("XX_internal_command_dump_markdown_XX");
         else
-          cmds[i].Parse("XX_internal_command_dump_XX");
+            cmds[i].Parse("XX_internal_command_dump_XX");
 
         parent = old_parent;
         ++i;
diff --git a/client/cmdparser.h b/client/cmdparser.h
index eeb9a1460..722fd0d21 100644
--- a/client/cmdparser.h
+++ b/client/cmdparser.h
@@ -11,12 +11,11 @@
 #ifndef CMDPARSER_H__
 #define CMDPARSER_H__
 
-typedef struct command_s
-{
-  const char * Name;
-  int (*Parse)(const char *Cmd);
-  int Offline;
-  const char * Help;
+typedef struct command_s {
+    const char *Name;
+    int (*Parse)(const char *Cmd);
+    int Offline;
+    const char *Help;
 } command_t;
 
 // command_t array are expected to be NULL terminated
diff --git a/client/cmdscript.c b/client/cmdscript.c
index d8c819365..33cf92506 100644
--- a/client/cmdscript.c
+++ b/client/cmdscript.c
@@ -39,24 +39,26 @@
 
 static int CmdHelp(const char *Cmd);
 
-int str_ends_with(const char * str, const char * suffix) {
+int str_ends_with(const char *str, const char *suffix)
+{
 
-  if( str == NULL || suffix == NULL )
-    return 0;
+    if (str == NULL || suffix == NULL)
+        return 0;
 
-  size_t str_len = strlen(str);
-  size_t suffix_len = strlen(suffix);
+    size_t str_len = strlen(str);
+    size_t suffix_len = strlen(suffix);
 
-  if(suffix_len > str_len)
-    return 0;
+    if (suffix_len > str_len)
+        return 0;
 
-  return 0 == strncmp( str + str_len - suffix_len, suffix, suffix_len );
+    return 0 == strncmp(str + str_len - suffix_len, suffix, suffix_len);
 }
 
 /**
  * Utility to check the ending of a string (used to check file suffix)
  */
-bool endsWith(char* base, char* str) {
+bool endsWith(char *base, char *str)
+{
     int blen = strlen(base);
     int slen = strlen(str);
     return (blen >= slen) && (0 == strcmp(base + blen - slen, str));
@@ -67,9 +69,10 @@ bool endsWith(char* base, char* str) {
 * generate a file listing of the script-directory for files
 * ending with .lua
 */
-int CmdScriptList(const char *Cmd) {
+int CmdScriptList(const char *Cmd)
+{
 
-    char const * exedir = get_my_executable_directory();
+    char const *exedir = get_my_executable_directory();
     if (exedir == NULL)
         return 0;
     char script_directory_path[strlen(exedir) + strlen(LUA_SCRIPTS_DIRECTORY) + 1];
@@ -101,7 +104,8 @@ int CmdScriptList(const char *Cmd) {
  * @param argv
  * @return
  */
-int CmdScriptRun(const char *Cmd) {
+int CmdScriptRun(const char *Cmd)
+{
     // create new Lua state
     lua_State *lua_state;
     lua_state = luaL_newstate();
@@ -145,16 +149,15 @@ int CmdScriptRun(const char *Cmd) {
         lua_setglobal(lua_state, "args");
 
         //Call it with 0 arguments
-         error = lua_pcall(lua_state, 0, LUA_MULTRET, 0); // once again, returns non-0 on error,
+        error = lua_pcall(lua_state, 0, LUA_MULTRET, 0); // once again, returns non-0 on error,
     }
-    if (error) // if non-0, then an error
-    {
+    if (error) { // if non-0, then an error
         // the top of the stack should be the error string
         if (!lua_isstring(lua_state, lua_gettop(lua_state)))
             PrintAndLogEx(FAILED, "Error - but no error (?!)");
 
         // get the top of the stack as the error and pop it off
-        const char * str = lua_tostring(lua_state, lua_gettop(lua_state));
+        const char *str = lua_tostring(lua_state, lua_gettop(lua_state));
         lua_pop(lua_state, 1);
         puts(str);
     }
@@ -179,7 +182,8 @@ static command_t CommandTable[] = {
  * @param Cmd
  * @return
  */
-int CmdScript(const char *Cmd) {
+int CmdScript(const char *Cmd)
+{
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
@@ -191,7 +195,8 @@ int CmdScript(const char *Cmd) {
  * @param Cmd
  * @return
  */
-int CmdHelp(const char * Cmd) {
+int CmdHelp(const char *Cmd)
+{
     PrintAndLogEx(NORMAL, "This is a feature to run Lua-scripts. You can place lua-scripts within the scripts/-folder. ");
     return 0;
 }
\ No newline at end of file
diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index 40d4df3e9..a373fee39 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -12,7 +12,8 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_sm_raw(void) {
+int usage_sm_raw(void)
+{
     PrintAndLogEx(NORMAL, "Usage: sc raw [h|r|c] d <0A 0B 0C ... hex>");
     PrintAndLogEx(NORMAL, "       h          :  this help");
     PrintAndLogEx(NORMAL, "       r          :  do not read response");
@@ -30,7 +31,8 @@ int usage_sm_raw(void) {
 
     return 0;
 }
-int usage_sm_reader(void) {
+int usage_sm_reader(void)
+{
     PrintAndLogEx(NORMAL, "Usage: sc reader [h|s]");
     PrintAndLogEx(NORMAL, "       h          :  this help");
     PrintAndLogEx(NORMAL, "       s          :  silent (no messages)");
@@ -39,7 +41,8 @@ int usage_sm_reader(void) {
     PrintAndLogEx(NORMAL, "        sc reader");
     return 0;
 }
-int usage_sm_info(void) {
+int usage_sm_info(void)
+{
     PrintAndLogEx(NORMAL, "Usage: s info [h|s]");
     PrintAndLogEx(NORMAL, "       h          :  this help");
     PrintAndLogEx(NORMAL, "       s          :  silent (no messages)");
@@ -48,7 +51,8 @@ int usage_sm_info(void) {
     PrintAndLogEx(NORMAL, "        sc info");
     return 0;
 }
-int usage_sm_upgrade(void) {
+int usage_sm_upgrade(void)
+{
     PrintAndLogEx(NORMAL, "Upgrade firmware");
     PrintAndLogEx(NORMAL, "Usage:  sc upgrade f <file name>");
     PrintAndLogEx(NORMAL, "       h               :  this help");
@@ -58,7 +62,8 @@ int usage_sm_upgrade(void) {
     PrintAndLogEx(NORMAL, "        sc upgrade f myfile");
     return 0;
 }
-int usage_sm_setclock(void) {
+int usage_sm_setclock(void)
+{
     PrintAndLogEx(NORMAL, "Usage: sc setclock [h] c <clockspeed>");
     PrintAndLogEx(NORMAL, "       h          :  this help");
     PrintAndLogEx(NORMAL, "       c <>       :  clockspeed (0 = 16mhz, 1=8mhz, 2=4mhz) ");
@@ -67,7 +72,8 @@ int usage_sm_setclock(void) {
     PrintAndLogEx(NORMAL, "        sc setclock c 2");
     return 0;
 }
-int usage_sm_brute(void) {
+int usage_sm_brute(void)
+{
     PrintAndLogEx(NORMAL, "Tries to bruteforce SFI, using a known list of AID's ");
     PrintAndLogEx(NORMAL, "Usage: sc brute [h]");
     PrintAndLogEx(NORMAL, "       h          :  this help");
@@ -79,16 +85,17 @@ int usage_sm_brute(void) {
     return 0;
 }
 
-static int smart_loadjson(const char *preferredName, const char *suffix, json_t **root) {
+static int smart_loadjson(const char *preferredName, const char *suffix, json_t **root)
+{
 
     json_error_t error;
 
-    if ( preferredName == NULL ) return 1;
-    if ( suffix == NULL ) return 1;
+    if (preferredName == NULL) return 1;
+    if (suffix == NULL) return 1;
 
     int retval = 0;
     int size = sizeof(char) * (strlen(get_my_executable_directory()) + strlen(preferredName) + strlen(suffix) + 10);
-    char * fileName = calloc(size, sizeof(char));
+    char *fileName = calloc(size, sizeof(char));
     sprintf(fileName, "%s%s.%s", get_my_executable_directory(), preferredName, suffix);
     *root = json_load_file(fileName, 0, &error);
     if (!*root) {
@@ -109,7 +116,8 @@ out:
     return retval;
 }
 
-uint8_t GetATRTA1(uint8_t *atr, size_t atrlen) {
+uint8_t GetATRTA1(uint8_t *atr, size_t atrlen)
+{
     if (atrlen > 2) {
         uint8_t T0 = atr[1];
         if (T0 & 0x10)
@@ -176,22 +184,26 @@ float FArray[] = {
     0     // b1111 RFU
 };
 
-int GetATRDi(uint8_t *atr, size_t atrlen) {
+int GetATRDi(uint8_t *atr, size_t atrlen)
+{
     uint8_t TA1 = GetATRTA1(atr, atrlen);
     return DiArray[TA1 & 0x0F];  // The 4 low-order bits of TA1 (4th MSbit to 1st LSbit) encode Di
 }
 
-int GetATRFi(uint8_t *atr, size_t atrlen) {
+int GetATRFi(uint8_t *atr, size_t atrlen)
+{
     uint8_t TA1 = GetATRTA1(atr, atrlen);
     return FiArray[TA1 >> 4];  // The 4 high-order bits of TA1 (8th MSbit to 5th LSbit) encode fmax and Fi
 }
 
-float GetATRF(uint8_t *atr, size_t atrlen) {
+float GetATRF(uint8_t *atr, size_t atrlen)
+{
     uint8_t TA1 = GetATRTA1(atr, atrlen);
     return FArray[TA1 >> 4];  // The 4 high-order bits of TA1 (8th MSbit to 5th LSbit) encode fmax and Fi
 }
 
-static int PrintATR(uint8_t *atr, size_t atrlen) {
+static int PrintATR(uint8_t *atr, size_t atrlen)
+{
 
     uint8_t T0 = atr[1];
     uint8_t K = T0 & 0x0F;
@@ -291,7 +303,8 @@ static int PrintATR(uint8_t *atr, size_t atrlen) {
     return 0;
 }
 
-bool smart_select(bool silent, smart_card_atr_t *atr) {
+bool smart_select(bool silent, smart_card_atr_t *atr)
+{
     if (atr)
         memset(atr, 0, sizeof(smart_card_atr_t));
 
@@ -299,7 +312,7 @@ bool smart_select(bool silent, smart_card_atr_t *atr) {
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
-    if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2500) ) {
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         if (!silent) PrintAndLogEx(WARNING, "smart card select failed");
         return false;
     }
@@ -322,7 +335,8 @@ bool smart_select(bool silent, smart_card_atr_t *atr) {
     return true;
 }
 
-static int smart_wait(uint8_t *data, bool silent) {
+static int smart_wait(uint8_t *data, bool silent)
+{
     UsbCommand resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         if (!silent) PrintAndLogEx(WARNING, "smart card response timeout");
@@ -330,7 +344,7 @@ static int smart_wait(uint8_t *data, bool silent) {
     }
 
     uint32_t len = resp.arg[0];
-    if ( !len ) {
+    if (!len) {
         if (!silent) PrintAndLogEx(WARNING, "smart card response failed");
         return -2;
     }
@@ -344,16 +358,17 @@ static int smart_wait(uint8_t *data, bool silent) {
     return len;
 }
 
-static int smart_responseEx(uint8_t *data, bool silent) {
+static int smart_responseEx(uint8_t *data, bool silent)
+{
 
     int datalen = smart_wait(data, silent);
     bool needGetData = false;
 
-    if (datalen < 2 ) {
+    if (datalen < 2) {
         goto out;
     }
 
-    if ( data[datalen - 2] == 0x61 || data[datalen - 2] == 0x9F ) {
+    if (data[datalen - 2] == 0x61 || data[datalen - 2] == 0x9F) {
         needGetData = true;
     }
 
@@ -362,13 +377,13 @@ static int smart_responseEx(uint8_t *data, bool silent) {
         if (!silent) PrintAndLogEx(INFO, "Requesting 0x%02X bytes response", len);
         uint8_t getstatus[] = {0x00, ISO7816_GET_RESPONSE, 0x00, 0x00, len};
         UsbCommand cStatus = {CMD_SMART_RAW, {SC_RAW, sizeof(getstatus), 0}};
-        memcpy(cStatus.d.asBytes, getstatus, sizeof(getstatus) );
+        memcpy(cStatus.d.asBytes, getstatus, sizeof(getstatus));
         clearCommandBuffer();
         SendCommand(&cStatus);
 
         datalen = smart_wait(data, silent);
 
-        if (datalen < 2 ) {
+        if (datalen < 2) {
             goto out;
         }
 
@@ -399,11 +414,13 @@ out:
     return datalen;
 }
 
-static int smart_response(uint8_t *data) {
+static int smart_response(uint8_t *data)
+{
     return smart_responseEx(data, false);
 }
 
-int CmdSmartRaw(const char *Cmd) {
+int CmdSmartRaw(const char *Cmd)
+{
 
     int hexlen = 0;
     bool active = false;
@@ -415,55 +432,56 @@ int CmdSmartRaw(const char *Cmd) {
 
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
-        case 'h': return usage_sm_raw();
-        case 'r':
-            reply = false;
-            cmdp++;
-            break;
-        case 'a':
-            active = true;
-            cmdp++;
-            break;
-        case 's':
-            active_select = true;
-            cmdp++;
-            break;
-        case 't':
-            decodeTLV = true;
-            cmdp++;
-            break;
-        case '0':
-            useT0 = true;
-            cmdp++;
-            break;
-        case 'd': {
-            switch (param_gethex_to_eol(Cmd, cmdp+1, data, sizeof(data), &hexlen)) {
-            case 1:
-                PrintAndLogEx(WARNING, "Invalid HEX value.");
-                return 1;
-            case 2:
-                PrintAndLogEx(WARNING, "Too many bytes.  Max %d bytes", sizeof(data));
-                return 1;
-            case 3:
-                PrintAndLogEx(WARNING, "Hex must have even number of digits.");
-                return 1;
+            case 'h':
+                return usage_sm_raw();
+            case 'r':
+                reply = false;
+                cmdp++;
+                break;
+            case 'a':
+                active = true;
+                cmdp++;
+                break;
+            case 's':
+                active_select = true;
+                cmdp++;
+                break;
+            case 't':
+                decodeTLV = true;
+                cmdp++;
+                break;
+            case '0':
+                useT0 = true;
+                cmdp++;
+                break;
+            case 'd': {
+                switch (param_gethex_to_eol(Cmd, cmdp + 1, data, sizeof(data), &hexlen)) {
+                    case 1:
+                        PrintAndLogEx(WARNING, "Invalid HEX value.");
+                        return 1;
+                    case 2:
+                        PrintAndLogEx(WARNING, "Too many bytes.  Max %d bytes", sizeof(data));
+                        return 1;
+                    case 3:
+                        PrintAndLogEx(WARNING, "Hex must have even number of digits.");
+                        return 1;
+                }
+                cmdp++;
+                breakloop = true;
+                break;
             }
-            cmdp++;
-            breakloop = true;
-            break;
-        }
-        default:
-            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-            errors = true;
-            break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                errors = true;
+                break;
         }
 
-        if ( breakloop )
+        if (breakloop)
             break;
     }
 
     //Validations
-    if (errors || cmdp == 0 ) return usage_sm_raw();
+    if (errors || cmdp == 0) return usage_sm_raw();
 
     // arg0 = RFU flags
     // arg1 = length
@@ -482,27 +500,27 @@ int CmdSmartRaw(const char *Cmd) {
             c.arg[0] |= SC_RAW;
     }
 
-    memcpy(c.d.asBytes, data, hexlen );
+    memcpy(c.d.asBytes, data, hexlen);
     clearCommandBuffer();
     SendCommand(&c);
 
     // reading response from smart card
-    if ( reply ) {
+    if (reply) {
 
-        uint8_t* buf = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
-        if ( !buf )
+        uint8_t *buf = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
+        if (!buf)
             return 1;
 
         int len = smart_response(buf);
-        if ( len < 0 ) {
+        if (len < 0) {
             free(buf);
             return 2;
         }
 
-        if ( buf[0] == 0x6C ) {
+        if (buf[0] == 0x6C) {
             data[4] = buf[1];
 
-            memcpy(c.d.asBytes, data, sizeof(data) );
+            memcpy(c.d.asBytes, data, sizeof(data));
             clearCommandBuffer();
             SendCommand(&c);
             len = smart_response(buf);
@@ -511,14 +529,15 @@ int CmdSmartRaw(const char *Cmd) {
         }
 
         if (decodeTLV && len > 4)
-            TLVPrintFromBuffer(buf, len-2);
+            TLVPrintFromBuffer(buf, len - 2);
 
         free(buf);
     }
     return 0;
 }
 
-int ExchangeAPDUSC(uint8_t *datain, int datainlen, bool activateCard, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
+int ExchangeAPDUSC(uint8_t *datain, int datainlen, bool activateCard, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen)
+{
     *dataoutlen = 0;
 
     if (activateCard)
@@ -536,7 +555,7 @@ int ExchangeAPDUSC(uint8_t *datain, int datainlen, bool activateCard, bool leave
 
     int len = smart_responseEx(dataout, true);
 
-    if ( len < 0 ) {
+    if (len < 0) {
         return 1;
     }
 
@@ -558,7 +577,8 @@ int ExchangeAPDUSC(uint8_t *datain, int datainlen, bool activateCard, bool leave
     return 0;
 }
 
-int CmdSmartUpgrade(const char *Cmd) {
+int CmdSmartUpgrade(const char *Cmd)
+{
 
     PrintAndLogEx(WARNING, "WARNING - Smartcard socket firmware upgrade.");
     PrintAndLogEx(WARNING, "A dangerous command, do wrong and you will brick the smart card socket");
@@ -570,31 +590,31 @@ int CmdSmartUpgrade(const char *Cmd) {
 
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
-        case 'f':
-            //File handling and reading
-            if ( param_getstr(Cmd, cmdp+1, filename, FILE_PATH_SIZE) >= FILE_PATH_SIZE ) {
-                PrintAndLogEx(FAILED, "Filename too long");
+            case 'f':
+                //File handling and reading
+                if (param_getstr(Cmd, cmdp + 1, filename, FILE_PATH_SIZE) >= FILE_PATH_SIZE) {
+                    PrintAndLogEx(FAILED, "Filename too long");
+                    errors = true;
+                    break;
+                }
+                cmdp += 2;
+                break;
+            case 'h':
+                return usage_sm_upgrade();
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
                 errors = true;
                 break;
-            }
-            cmdp += 2;
-            break;
-        case 'h':
-            return usage_sm_upgrade();
-        default:
-            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-            errors = true;
-            break;
         }
     }
 
     //Validations
-    if (errors || cmdp == 0 ) return usage_sm_upgrade();
+    if (errors || cmdp == 0) return usage_sm_upgrade();
 
     // load file
     f = fopen(filename, "rb");
-    if ( !f ){
-        PrintAndLogEx(FAILED, "File: " _YELLOW_(%s) ": not found or locked.", filename);
+    if (!f) {
+        PrintAndLogEx(FAILED, "File: " _YELLOW_( % s) ": not found or locked.", filename);
         return 1;
     }
 
@@ -626,7 +646,7 @@ int CmdSmartUpgrade(const char *Cmd) {
     uint32_t bytes_sent = 0;
     uint32_t bytes_remaining = bytes_read;
 
-    while (bytes_remaining > 0){
+    while (bytes_remaining > 0) {
         uint32_t bytes_in_packet = MIN(USB_CMD_DATA_SIZE, bytes_remaining);
         UsbCommand c = {CMD_SMART_UPLOAD, {index + bytes_sent, bytes_in_packet, 0}};
 
@@ -635,7 +655,7 @@ int CmdSmartUpgrade(const char *Cmd) {
         memcpy(c.d.asBytes, dump + bytes_sent, bytes_in_packet);
         clearCommandBuffer();
         SendCommand(&c);
-        if ( !WaitForResponseTimeout(CMD_ACK, NULL, 2000) ) {
+        if (!WaitForResponseTimeout(CMD_ACK, NULL, 2000)) {
             PrintAndLogEx(WARNING, "timeout while waiting for reply.");
             free(dump);
             return 1;
@@ -643,7 +663,8 @@ int CmdSmartUpgrade(const char *Cmd) {
 
         bytes_remaining -= bytes_in_packet;
         bytes_sent += bytes_in_packet;
-        printf("."); fflush(stdout);
+        printf(".");
+        fflush(stdout);
     }
     free(dump);
     printf("\n");
@@ -654,43 +675,45 @@ int CmdSmartUpgrade(const char *Cmd) {
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
-    if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2500) ) {
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         PrintAndLogEx(WARNING, "timeout while waiting for reply.");
         return 1;
     }
-    if ( (resp.arg[0] & 0xFF ) )
+    if ((resp.arg[0] & 0xFF))
         PrintAndLogEx(SUCCESS, "Smartcard socket firmware upgraded successful");
     else
         PrintAndLogEx(FAILED, "Smartcard socket firmware updating failed");
     return 0;
 }
 
-int CmdSmartInfo(const char *Cmd){
+int CmdSmartInfo(const char *Cmd)
+{
     uint8_t cmdp = 0;
     bool errors = false, silent = false;
 
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
-        case 'h': return usage_sm_info();
-        case 's':
-            silent = true;
-            break;
-        default:
-            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-            errors = true;
-            break;
+            case 'h':
+                return usage_sm_info();
+            case 's':
+                silent = true;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                errors = true;
+                break;
         }
         cmdp++;
     }
 
     //Validations
-    if (errors ) return usage_sm_info();
+    if (errors) return usage_sm_info();
 
     UsbCommand c = {CMD_SMART_ATR, {0, 0, 0}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
-    if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2500) ) {
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         if (!silent) PrintAndLogEx(WARNING, "smart card select failed");
         return 1;
     }
@@ -708,7 +731,7 @@ int CmdSmartInfo(const char *Cmd){
     PrintAndLogEx(INFO, "--- Smartcard Information ---------");
     PrintAndLogEx(INFO, "-------------------------------------------------------------");
     PrintAndLogEx(INFO, "ISO7618-3 ATR : %s", sprint_hex(card.atr, card.atr_len));
-    PrintAndLogEx(INFO, "\nhttp://smartcard-atr.appspot.com/parse?ATR=%s", sprint_hex_inrow(card.atr, card.atr_len) );
+    PrintAndLogEx(INFO, "\nhttp://smartcard-atr.appspot.com/parse?ATR=%s", sprint_hex_inrow(card.atr, card.atr_len));
 
     // print ATR
     PrintAndLogEx(NORMAL, "");
@@ -729,9 +752,9 @@ int CmdSmartInfo(const char *Cmd){
     PrintAndLogEx(NORMAL, "\t- F  %.1f MHz", F);
 
     if (Di && Fi) {
-        PrintAndLogEx(NORMAL, "\t- Cycles/ETU %d", Fi/Di);
-        PrintAndLogEx(NORMAL, "\t- %.1f bits/sec at 4MHz", (float)4000000 / (Fi/Di));
-        PrintAndLogEx(NORMAL, "\t- %.1f bits/sec at Fmax (%.1fMHz)", (F * 1000000) / (Fi/Di), F);
+        PrintAndLogEx(NORMAL, "\t- Cycles/ETU %d", Fi / Di);
+        PrintAndLogEx(NORMAL, "\t- %.1f bits/sec at 4MHz", (float)4000000 / (Fi / Di));
+        PrintAndLogEx(NORMAL, "\t- %.1f bits/sec at Fmax (%.1fMHz)", (F * 1000000) / (Fi / Di), F);
     } else {
         PrintAndLogEx(WARNING, "\t- Di or Fi is RFU.");
     };
@@ -739,32 +762,34 @@ int CmdSmartInfo(const char *Cmd){
     return 0;
 }
 
-int CmdSmartReader(const char *Cmd){
+int CmdSmartReader(const char *Cmd)
+{
     uint8_t cmdp = 0;
     bool errors = false, silent = false;
 
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
-        case 'h': return usage_sm_reader();
-        case 's':
-            silent = true;
-            break;
-        default:
-            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-            errors = true;
-            break;
+            case 'h':
+                return usage_sm_reader();
+            case 's':
+                silent = true;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                errors = true;
+                break;
         }
         cmdp++;
     }
 
     //Validations
-    if (errors ) return usage_sm_reader();
+    if (errors) return usage_sm_reader();
 
     UsbCommand c = {CMD_SMART_ATR, {0, 0, 0}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
-    if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2500) ) {
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         if (!silent) PrintAndLogEx(WARNING, "smart card select failed");
         return 1;
     }
@@ -781,24 +806,26 @@ int CmdSmartReader(const char *Cmd){
     return 0;
 }
 
-int CmdSmartSetClock(const char *Cmd){
+int CmdSmartSetClock(const char *Cmd)
+{
     uint8_t cmdp = 0;
     bool errors = false;
     uint8_t clock = 0;
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
-        case 'h': return usage_sm_setclock();
-        case 'c':
-            clock = param_get8ex(Cmd, cmdp+1, 2, 10);
-            if ( clock > 2)
-                errors = true;
+            case 'h':
+                return usage_sm_setclock();
+            case 'c':
+                clock = param_get8ex(Cmd, cmdp + 1, 2, 10);
+                if (clock > 2)
+                    errors = true;
 
-            cmdp += 2;
-            break;
-        default:
-            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-            errors = true;
-            break;
+                cmdp += 2;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                errors = true;
+                break;
         }
     }
 
@@ -809,7 +836,7 @@ int CmdSmartSetClock(const char *Cmd){
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
-    if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2500) ) {
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         PrintAndLogEx(WARNING, "smart card select failed");
         return 1;
     }
@@ -836,15 +863,17 @@ int CmdSmartSetClock(const char *Cmd){
     return 0;
 }
 
-int CmdSmartList(const char *Cmd) {
+int CmdSmartList(const char *Cmd)
+{
     CmdTraceList("7816");
     return 0;
 }
 
-static void smart_brute_prim(){
+static void smart_brute_prim()
+{
 
-    uint8_t* buf = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
-    if ( !buf )
+    uint8_t *buf = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
+    if (!buf)
         return;
 
     int len = 0;
@@ -861,18 +890,18 @@ static void smart_brute_prim(){
 
     for (int i = 0; i < sizeof(get_card_data); i += 5) {
 
-        memcpy(c.d.asBytes, get_card_data+i, 5 );
+        memcpy(c.d.asBytes, get_card_data + i, 5);
         clearCommandBuffer();
         SendCommand(&c);
 
         len = smart_responseEx(buf, true);
 
-        if ( len > 2 ) {
+        if (len > 2) {
 
             //if ( decodeTLV ) {
-                //if (!TLVPrintFromBuffer(buf, len-2)) {
-                    PrintAndLogEx(SUCCESS, "\tHEX  %d |: %s", len, sprint_hex(buf, len));
-                //}
+            //if (!TLVPrintFromBuffer(buf, len-2)) {
+            PrintAndLogEx(SUCCESS, "\tHEX  %d |: %s", len, sprint_hex(buf, len));
+            //}
             //}
         }
         len = 0;
@@ -880,10 +909,11 @@ static void smart_brute_prim(){
     free(buf);
 }
 
-static int smart_brute_sfi(bool decodeTLV){
+static int smart_brute_sfi(bool decodeTLV)
+{
 
-    uint8_t* buf = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
-    if ( !buf )
+    uint8_t *buf = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
+    if (!buf)
         return 1;
 
     int len = 0;
@@ -893,14 +923,16 @@ static int smart_brute_sfi(bool decodeTLV){
 
     PrintAndLogEx(INFO, "Start SFI brute forcing");
 
-    for (uint8_t sfi=1; sfi <= 31; sfi++) {
+    for (uint8_t sfi = 1; sfi <= 31; sfi++) {
 
-        printf("."); fflush(stdout);
+        printf(".");
+        fflush(stdout);
 
-        for (uint16_t rec=1; rec <= 255; rec++) {
+        for (uint16_t rec = 1; rec <= 255; rec++) {
 
             if (ukbhit()) {
-                int gc = getchar(); (void)gc;
+                int gc = getchar();
+                (void)gc;
                 PrintAndLogEx(WARNING, "\naborted via keyboard!\n");
                 free(buf);
                 return 1;
@@ -909,16 +941,16 @@ static int smart_brute_sfi(bool decodeTLV){
             READ_RECORD[2] = rec;
             READ_RECORD[3] = (sfi << 3) | 4;
 
-            memcpy(c.d.asBytes, READ_RECORD, sizeof(READ_RECORD) );
+            memcpy(c.d.asBytes, READ_RECORD, sizeof(READ_RECORD));
             clearCommandBuffer();
             SendCommand(&c);
 
             len = smart_responseEx(buf, true);
 
-            if ( buf[0] == 0x6C ) {
+            if (buf[0] == 0x6C) {
                 READ_RECORD[4] = buf[1];
 
-                memcpy(c.d.asBytes, READ_RECORD, sizeof(READ_RECORD) );
+                memcpy(c.d.asBytes, READ_RECORD, sizeof(READ_RECORD));
                 clearCommandBuffer();
                 SendCommand(&c);
                 len = smart_responseEx(buf, true);
@@ -926,14 +958,14 @@ static int smart_brute_sfi(bool decodeTLV){
                 READ_RECORD[4] = 0;
             }
 
-            if ( len > 4 ) {
+            if (len > 4) {
 
                 PrintAndLogEx(SUCCESS, "\n\t file %02d, record %02d found", sfi, rec);
 
                 uint8_t modifier = (buf[0] == 0xC0) ? 1 : 0;
 
-                if ( decodeTLV ) {
-                    if (!TLVPrintFromBuffer(buf + modifier, len-2-modifier)) {
+                if (decodeTLV) {
+                    if (!TLVPrintFromBuffer(buf + modifier, len - 2 - modifier)) {
                         PrintAndLogEx(SUCCESS, "\tHEX: %s", sprint_hex(buf, len));
                     }
                 }
@@ -945,25 +977,26 @@ static int smart_brute_sfi(bool decodeTLV){
     return 0;
 }
 
-static void smart_brute_options(bool decodeTLV) {
+static void smart_brute_options(bool decodeTLV)
+{
 
-    uint8_t* buf = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
-    if ( !buf )
+    uint8_t *buf = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
+    if (!buf)
         return;
 
     uint8_t GET_PROCESSING_OPTIONS[] = {0x80, 0xA8, 0x00, 0x00, 0x02, 0x83, 0x00, 0x00};
 
     // Get processing options command
     UsbCommand c = {CMD_SMART_RAW, {SC_RAW_T0, sizeof(GET_PROCESSING_OPTIONS), 0}};
-    memcpy(c.d.asBytes, GET_PROCESSING_OPTIONS, sizeof(GET_PROCESSING_OPTIONS) );
+    memcpy(c.d.asBytes, GET_PROCESSING_OPTIONS, sizeof(GET_PROCESSING_OPTIONS));
     clearCommandBuffer();
     SendCommand(&c);
 
     int len = smart_responseEx(buf, true);
-    if ( len > 4 ) {
+    if (len > 4) {
         PrintAndLogEx(SUCCESS, "Got processing options");
-        if ( decodeTLV ) {
-            TLVPrintFromBuffer(buf, len-2);
+        if (decodeTLV) {
+            TLVPrintFromBuffer(buf, len - 2);
         }
     } else {
         PrintAndLogEx(FAILED, "Getting processing options failed");
@@ -972,28 +1005,30 @@ static void smart_brute_options(bool decodeTLV) {
     free(buf);
 }
 
-int CmdSmartBruteforceSFI(const char *Cmd) {
+int CmdSmartBruteforceSFI(const char *Cmd)
+{
 
     uint8_t cmdp = 0;
     bool errors = false, decodeTLV = false; //, useT0 = false;
 
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
-        case 'h': return usage_sm_brute();
-        case 't':
-            decodeTLV = true;
-            cmdp++;
-            break;
-/*
-        case '0':
-            useT0 = true;
-            cmdp++;
-            break;
-*/
-        default:
-            PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-            errors = true;
-            break;
+            case 'h':
+                return usage_sm_brute();
+            case 't':
+                decodeTLV = true;
+                cmdp++;
+                break;
+            /*
+                    case '0':
+                        useT0 = true;
+                        cmdp++;
+                        break;
+            */
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                errors = true;
+                break;
         }
     }
 
@@ -1016,21 +1051,22 @@ int CmdSmartBruteforceSFI(const char *Cmd) {
     json_t *root = NULL;
     smart_loadjson("aidlist", "json", &root);
 
-    uint8_t* buf = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
-    if ( !buf )
+    uint8_t *buf = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
+    if (!buf)
         return 1;
 
     PrintAndLogEx(INFO, "Selecting card");
-    if ( !smart_select(false, NULL) ) {
+    if (!smart_select(false, NULL)) {
         free(buf);
         return 1;
     }
 
-    char* caid = NULL;
+    char *caid = NULL;
 
     for (int i = 0; i < json_array_size(root); i++) {
 
-        printf("+"); fflush(stdout);
+        printf("+");
+        fflush(stdout);
 
         if (caid)
             free(caid);
@@ -1051,17 +1087,17 @@ int CmdSmartBruteforceSFI(const char *Cmd) {
             return 1;
         }
 
-        const char* aid = json_string_value(jaid);
-        if ( !aid )
+        const char *aid = json_string_value(jaid);
+        if (!aid)
             continue;
 
         size_t aidlen = strlen(aid);
-        caid = calloc( 8+2+aidlen+1, sizeof(uint8_t));
-        snprintf(caid, 8+2+aidlen+1, SELECT, aidlen >> 1, aid);
+        caid = calloc(8 + 2 + aidlen + 1, sizeof(uint8_t));
+        snprintf(caid, 8 + 2 + aidlen + 1, SELECT, aidlen >> 1, aid);
 
         int hexlen = 0;
         int res = param_gethex_to_eol(caid, 0, cAid.d.asBytes, sizeof(cAid.d.asBytes), &hexlen);
-        if ( res )
+        if (res)
             continue;
 
         cAid.arg[1] = hexlen;
@@ -1070,7 +1106,7 @@ int CmdSmartBruteforceSFI(const char *Cmd) {
         SendCommand(&cAid);
 
         int len = smart_responseEx(buf, true);
-        if ( len < 3 )
+        if (len < 3)
             continue;
 
         json_t *jvendor, *jname;
@@ -1080,8 +1116,8 @@ int CmdSmartBruteforceSFI(const char *Cmd) {
             continue;
         }
 
-        const char* vendor = json_string_value(jvendor);
-        if ( !vendor )
+        const char *vendor = json_string_value(jvendor);
+        if (!vendor)
             continue;
 
         jname = json_object_get(data, "Name");
@@ -1089,8 +1125,8 @@ int CmdSmartBruteforceSFI(const char *Cmd) {
             PrintAndLogEx(ERR, "Name data [%d] is not a string", i + 1);
             continue;
         }
-        const char* name = json_string_value(jname);
-        if ( !name )
+        const char *name = json_string_value(jname);
+        if (!name)
             continue;
 
         PrintAndLogEx(SUCCESS, "\nAID %s | %s | %s", aid, vendor, name);
@@ -1121,18 +1157,20 @@ static command_t CommandTable[] = {
     {"reader",  CmdSmartReader,        1, "Act like an IS07816 reader"},
     {"raw",     CmdSmartRaw,           1, "Send raw hex data to tag"},
     {"upgrade", CmdSmartUpgrade,       1, "Upgrade firmware"},
-    {"setclock",CmdSmartSetClock,      1, "Set clock speed"},
+    {"setclock", CmdSmartSetClock,      1, "Set clock speed"},
     {"brute",   CmdSmartBruteforceSFI, 1, "Bruteforce SFI"},
     {NULL, NULL, 0, NULL}
 };
 
-int CmdSmartcard(const char *Cmd) {
+int CmdSmartcard(const char *Cmd)
+{
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
+int CmdHelp(const char *Cmd)
+{
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdsmartcard.h b/client/cmdsmartcard.h
index f7c3bed5a..14e79cd4e 100644
--- a/client/cmdsmartcard.h
+++ b/client/cmdsmartcard.h
@@ -28,9 +28,9 @@
 
 extern int CmdSmartcard(const char *Cmd);
 
-extern int CmdSmartRaw(const char* cmd);
-extern int CmdSmartUpgrade(const char* cmd);
-extern int CmdSmartInfo(const char* cmd);
+extern int CmdSmartRaw(const char *cmd);
+extern int CmdSmartUpgrade(const char *cmd);
+extern int CmdSmartInfo(const char *cmd);
 extern int CmdSmartReader(const char *Cmd);
 
 extern bool smart_select(bool silent, smart_card_atr_t *atr);
diff --git a/client/cmdtrace.c b/client/cmdtrace.c
index 86fa07169..26836262c 100644
--- a/client/cmdtrace.c
+++ b/client/cmdtrace.c
@@ -15,7 +15,8 @@ static int CmdHelp(const char *Cmd);
 static uint8_t *trace;
 long traceLen = 0;
 
-int usage_trace_list(){
+int usage_trace_list()
+{
     PrintAndLogEx(NORMAL, "List protocol data in trace buffer.");
     PrintAndLogEx(NORMAL, "Usage:  trace list <protocol> [f][c| <0|1>");
     PrintAndLogEx(NORMAL, "    f      - show frame delay times as well");
@@ -42,14 +43,16 @@ int usage_trace_list(){
     PrintAndLogEx(NORMAL, "        trace list iclass");
     return 0;
 }
-int usage_trace_load(){
+int usage_trace_load()
+{
     PrintAndLogEx(NORMAL, "Load protocol data from file to trace buffer.");
     PrintAndLogEx(NORMAL, "Usage:  trace load <filename>");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "        trace load mytracefile.bin");
     return 0;
 }
-int usage_trace_save(){
+int usage_trace_save()
+{
     PrintAndLogEx(NORMAL, "Save protocol data from trace buffer to file.");
     PrintAndLogEx(NORMAL, "Usage:  trace save <filename>");
     PrintAndLogEx(NORMAL, "Examples:");
@@ -57,17 +60,20 @@ int usage_trace_save(){
     return 0;
 }
 
-bool is_last_record(uint16_t tracepos, uint8_t *trace, uint16_t traceLen) {
-    return(tracepos + sizeof(uint32_t) + sizeof(uint16_t) + sizeof(uint16_t) >= traceLen);
+bool is_last_record(uint16_t tracepos, uint8_t *trace, uint16_t traceLen)
+{
+    return (tracepos + sizeof(uint32_t) + sizeof(uint16_t) + sizeof(uint16_t) >= traceLen);
 }
 
-bool next_record_is_response(uint16_t tracepos, uint8_t *trace) {
+bool next_record_is_response(uint16_t tracepos, uint8_t *trace)
+{
     uint16_t next_records_datalen = *((uint16_t *)(trace + tracepos + sizeof(uint32_t) + sizeof(uint16_t)));
-    return(next_records_datalen & 0x8000);
+    return (next_records_datalen & 0x8000);
 }
 
 bool merge_topaz_reader_frames(uint32_t timestamp, uint32_t *duration, uint16_t *tracepos, uint16_t traceLen,
-                                uint8_t *trace, uint8_t *frame, uint8_t *topaz_reader_command, uint16_t *data_len) {
+                               uint8_t *trace, uint8_t *frame, uint8_t *topaz_reader_command, uint16_t *data_len)
+{
 
 #define MAX_TOPAZ_READER_CMD_LEN 16
 
@@ -95,7 +101,7 @@ bool merge_topaz_reader_frames(uint32_t timestamp, uint32_t *duration, uint16_t
             *tracepos = *tracepos - next_data_len - sizeof(uint16_t) - sizeof(uint16_t) - sizeof(uint32_t);
             break;
         }
-        uint16_t next_parity_len = (next_data_len-1)/8 + 1;
+        uint16_t next_parity_len = (next_data_len - 1) / 8 + 1;
         *tracepos += next_parity_len;
     }
 
@@ -104,7 +110,8 @@ bool merge_topaz_reader_frames(uint32_t timestamp, uint32_t *duration, uint16_t
     return true;
 }
 
-uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, uint8_t protocol, bool showWaitCycles, bool markCRCBytes) {
+uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, uint8_t protocol, bool showWaitCycles, bool markCRCBytes)
+{
     // sanity check
     if (tracepos + sizeof(uint32_t) + sizeof(uint16_t) + sizeof(uint16_t) > traceLen) return traceLen;
 
@@ -133,7 +140,7 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
     } else {
         isResponse = false;
     }
-    parity_len = (data_len-1)/8 + 1;
+    parity_len = (data_len - 1) / 8 + 1;
 
     if (tracepos + data_len + parity_len > traceLen) {
         return traceLen;
@@ -186,34 +193,34 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
     //--- Draw the data column
     char line[18][110];
 
-    for (int j = 0; j < data_len && j/18 < 18; j++) {
+    for (int j = 0; j < data_len && j / 18 < 18; j++) {
 
         uint8_t parityBits = parityBytes[j >> 3];
         if (protocol != LEGIC &&
             protocol != ISO_14443B &&
             protocol != ISO_7816_4 &&
             (isResponse || protocol == ISO_14443A) &&
-            (oddparity8(frame[j]) != ((parityBits >> (7-(j&0x0007))) & 0x01))) {
+            (oddparity8(frame[j]) != ((parityBits >> (7 - (j & 0x0007))) & 0x01))) {
 
-            snprintf(line[j/18]+(( j % 18) * 4),110, "%02x! ", frame[j]);
+            snprintf(line[j / 18] + ((j % 18) * 4), 110, "%02x! ", frame[j]);
         } else {
-            snprintf(line[j/18]+(( j % 18) * 4),110, "%02x  ", frame[j]);
+            snprintf(line[j / 18] + ((j % 18) * 4), 110, "%02x  ", frame[j]);
         }
 
     }
 
     if (markCRCBytes) {
         //CRC-command
-        if(crcStatus == 0 || crcStatus == 1) {
-            char *pos1 = line[(data_len-2)/18]+(((data_len-2) % 18) * 4);
+        if (crcStatus == 0 || crcStatus == 1) {
+            char *pos1 = line[(data_len - 2) / 18] + (((data_len - 2) % 18) * 4);
             (*pos1) = '[';
-            char *pos2 = line[(data_len)/18]+(((data_len) % 18) * 4);
+            char *pos2 = line[(data_len) / 18] + (((data_len) % 18) * 4);
             sprintf(pos2, "%c", ']');
         }
     }
 
-    if (data_len == 0 ) {
-        sprintf(line[0],"<empty trace - possible error>");
+    if (data_len == 0) {
+        sprintf(line[0], "<empty trace - possible error>");
         return tracepos;
     }
 
@@ -223,41 +230,58 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
     EndOfTransmissionTimestamp = timestamp + duration;
 
     // Always annotate LEGIC read/tag
-    if ( protocol == LEGIC )
+    if (protocol == LEGIC)
         annotateLegic(explanation, sizeof(explanation), frame, data_len);
 
-    if ( protocol == PROTO_MIFARE )
+    if (protocol == PROTO_MIFARE)
         annotateMifare(explanation, sizeof(explanation), frame, data_len, parityBytes, parity_len, isResponse);
 
     if (!isResponse) {
-        switch(protocol) {
-            case ICLASS:        annotateIclass(explanation,sizeof(explanation),frame,data_len); break;
-            case ISO_14443A:    annotateIso14443a(explanation,sizeof(explanation),frame,data_len); break;
-            case MFDES:         annotateMfDesfire(explanation,sizeof(explanation),frame,data_len); break;
-            case ISO_14443B:    annotateIso14443b(explanation,sizeof(explanation),frame,data_len); break;
-            case TOPAZ:         annotateTopaz(explanation,sizeof(explanation),frame,data_len); break;
-            case ISO_7816_4:    annotateIso7816(explanation,sizeof(explanation),frame,data_len); break;
-            case ISO_15693:     annotateIso15693(explanation,sizeof(explanation),frame,data_len); break;
-            case FELICA:        annotateFelica(explanation,sizeof(explanation),frame,data_len); break;
-            default:            break;
+        switch (protocol) {
+            case ICLASS:
+                annotateIclass(explanation, sizeof(explanation), frame, data_len);
+                break;
+            case ISO_14443A:
+                annotateIso14443a(explanation, sizeof(explanation), frame, data_len);
+                break;
+            case MFDES:
+                annotateMfDesfire(explanation, sizeof(explanation), frame, data_len);
+                break;
+            case ISO_14443B:
+                annotateIso14443b(explanation, sizeof(explanation), frame, data_len);
+                break;
+            case TOPAZ:
+                annotateTopaz(explanation, sizeof(explanation), frame, data_len);
+                break;
+            case ISO_7816_4:
+                annotateIso7816(explanation, sizeof(explanation), frame, data_len);
+                break;
+            case ISO_15693:
+                annotateIso15693(explanation, sizeof(explanation), frame, data_len);
+                break;
+            case FELICA:
+                annotateFelica(explanation, sizeof(explanation), frame, data_len);
+                break;
+            default:
+                break;
         }
     }
 
-    int num_lines = MIN((data_len - 1)/18 + 1, 18);
+    int num_lines = MIN((data_len - 1) / 18 + 1, 18);
     for (int j = 0; j < num_lines ; j++) {
         if (j == 0) {
             PrintAndLogEx(NORMAL, " %10u | %10u | %s |%-72s | %s| %s",
-                (timestamp - first_timestamp),
-                (EndOfTransmissionTimestamp - first_timestamp),
-                (isResponse ? "Tag" : "Rdr"),
-                line[j],
-                (j == num_lines-1) ? crc : "    ",
-                (j == num_lines-1) ? explanation : "");
+                          (timestamp - first_timestamp),
+                          (EndOfTransmissionTimestamp - first_timestamp),
+                          (isResponse ? "Tag" : "Rdr"),
+                          line[j],
+                          (j == num_lines - 1) ? crc : "    ",
+                          (j == num_lines - 1) ? explanation : "");
         } else {
             PrintAndLogEx(NORMAL, "            |            |     |%-72s | %s| %s",
-                line[j],
-                (j == num_lines-1) ? crc : "    ",
-                (j == num_lines-1) ? explanation : "");
+                          line[j],
+                          (j == num_lines - 1) ? crc : "    ",
+                          (j == num_lines - 1) ? explanation : "");
         }
     }
 
@@ -268,127 +292,206 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
         }
         uint8_t crcc = iso14443A_CRC_check(isResponse, mfData, mfDataLen);
         PrintAndLogEx(NORMAL, "            |            |  *  |%-72s | %-4s| %s",
-            sprint_hex_inrow_spaces(mfData, mfDataLen, 2),
-            (crcc == 0 ? "!crc" : (crcc == 1 ? " ok " : "    ")),
-            explanation);
+                      sprint_hex_inrow_spaces(mfData, mfDataLen, 2),
+                      (crcc == 0 ? "!crc" : (crcc == 1 ? " ok " : "    ")),
+                      explanation);
     };
 
     if (is_last_record(tracepos, trace, traceLen)) return traceLen;
 
     if (showWaitCycles && !isResponse && next_record_is_response(tracepos, trace)) {
         uint32_t next_timestamp = *((uint32_t *)(trace + tracepos));
-            PrintAndLogEx(NORMAL, " %10u | %10u | %s |fdt (Frame Delay Time): %d",
-                (EndOfTransmissionTimestamp - first_timestamp),
-                (next_timestamp - first_timestamp),
-                "   ",
-                (next_timestamp - EndOfTransmissionTimestamp));
-        }
+        PrintAndLogEx(NORMAL, " %10u | %10u | %s |fdt (Frame Delay Time): %d",
+                      (EndOfTransmissionTimestamp - first_timestamp),
+                      (next_timestamp - first_timestamp),
+                      "   ",
+                      (next_timestamp - EndOfTransmissionTimestamp));
+    }
 
     return tracepos;
 }
 
-void printFelica(uint16_t traceLen, uint8_t *trace) {
+void printFelica(uint16_t traceLen, uint8_t *trace)
+{
 
     PrintAndLogEx(NORMAL, "ISO18092 / FeliCa - Timings are not as accurate");
     PrintAndLogEx(NORMAL, "    Gap | Src | Data                            | CRC      | Annotation        |");
     PrintAndLogEx(NORMAL, "--------|-----|---------------------------------|----------|-------------------|");
     uint16_t tracepos = 0;
 
-    while( tracepos < traceLen) {
+    while (tracepos < traceLen) {
 
         if (tracepos + 3 >= traceLen) break;
 
 
         uint16_t gap = *((uint16_t *)(trace + tracepos));
-        uint8_t crc_ok = trace[tracepos+2];
+        uint8_t crc_ok = trace[tracepos + 2];
         tracepos += 3;
 
         if (tracepos + 3 >= traceLen) break;
 
-        uint16_t len = trace[tracepos+2];
+        uint16_t len = trace[tracepos + 2];
 
         //I am stripping SYNC
         tracepos += 3; //skip SYNC
 
-        if( tracepos + len + 1 >= traceLen) break;
+        if (tracepos + len + 1 >= traceLen) break;
 
         uint8_t cmd = trace[tracepos];
-        uint8_t isResponse = cmd&1;
+        uint8_t isResponse = cmd & 1;
 
         char line[32][110];
-        for (int j = 0; j < len+1 && j/8 < 32; j++) {
-            snprintf(line[j/8]+(( j % 8) * 4), 110, " %02x ", trace[tracepos+j]);
+        for (int j = 0; j < len + 1 && j / 8 < 32; j++) {
+            snprintf(line[j / 8] + ((j % 8) * 4), 110, " %02x ", trace[tracepos + j]);
         }
         char expbuf[50];
-        switch(cmd) {
-            case FELICA_POLL_REQ: snprintf(expbuf,49,"Poll Req");break;
-            case FELICA_POLL_ACK: snprintf(expbuf,49,"Poll Resp");break;
+        switch (cmd) {
+            case FELICA_POLL_REQ:
+                snprintf(expbuf, 49, "Poll Req");
+                break;
+            case FELICA_POLL_ACK:
+                snprintf(expbuf, 49, "Poll Resp");
+                break;
 
-            case FELICA_REQSRV_REQ: snprintf(expbuf,49,"Request Srvc Req");break;
-            case FELICA_REQSRV_ACK: snprintf(expbuf,49,"Request Srv Resp");break;
+            case FELICA_REQSRV_REQ:
+                snprintf(expbuf, 49, "Request Srvc Req");
+                break;
+            case FELICA_REQSRV_ACK:
+                snprintf(expbuf, 49, "Request Srv Resp");
+                break;
 
-            case FELICA_RDBLK_REQ: snprintf(expbuf,49,"Read block(s) Req");break;
-            case FELICA_RDBLK_ACK: snprintf(expbuf,49,"Read block(s) Resp");break;
+            case FELICA_RDBLK_REQ:
+                snprintf(expbuf, 49, "Read block(s) Req");
+                break;
+            case FELICA_RDBLK_ACK:
+                snprintf(expbuf, 49, "Read block(s) Resp");
+                break;
 
-            case FELICA_WRTBLK_REQ: snprintf(expbuf,49,"Write block(s) Req");break;
-            case FELICA_WRTBLK_ACK: snprintf(expbuf,49,"Write block(s) Resp");break;
-            case FELICA_SRCHSYSCODE_REQ: snprintf(expbuf,49,"Search syscode Req");break;
-            case FELICA_SRCHSYSCODE_ACK: snprintf(expbuf,49,"Search syscode Resp");break;
+            case FELICA_WRTBLK_REQ:
+                snprintf(expbuf, 49, "Write block(s) Req");
+                break;
+            case FELICA_WRTBLK_ACK:
+                snprintf(expbuf, 49, "Write block(s) Resp");
+                break;
+            case FELICA_SRCHSYSCODE_REQ:
+                snprintf(expbuf, 49, "Search syscode Req");
+                break;
+            case FELICA_SRCHSYSCODE_ACK:
+                snprintf(expbuf, 49, "Search syscode Resp");
+                break;
 
-            case FELICA_REQSYSCODE_REQ: snprintf(expbuf,49,"Request syscode Req");break;
-            case FELICA_REQSYSCODE_ACK: snprintf(expbuf,49,"Request syscode Resp");break;
+            case FELICA_REQSYSCODE_REQ:
+                snprintf(expbuf, 49, "Request syscode Req");
+                break;
+            case FELICA_REQSYSCODE_ACK:
+                snprintf(expbuf, 49, "Request syscode Resp");
+                break;
 
-            case FELICA_AUTH1_REQ: snprintf(expbuf,49,"Auth1 Req");break;
-            case FELICA_AUTH1_ACK: snprintf(expbuf,49,"Auth1 Resp");break;
+            case FELICA_AUTH1_REQ:
+                snprintf(expbuf, 49, "Auth1 Req");
+                break;
+            case FELICA_AUTH1_ACK:
+                snprintf(expbuf, 49, "Auth1 Resp");
+                break;
 
-            case FELICA_AUTH2_REQ: snprintf(expbuf,49,"Auth2 Req");break;
-            case FELICA_AUTH2_ACK: snprintf(expbuf,49,"Auth2 Resp");break;
+            case FELICA_AUTH2_REQ:
+                snprintf(expbuf, 49, "Auth2 Req");
+                break;
+            case FELICA_AUTH2_ACK:
+                snprintf(expbuf, 49, "Auth2 Resp");
+                break;
 
-            case FELICA_RDSEC_REQ: snprintf(expbuf,49,"Secure read Req");break;
-            case FELICA_RDSEC_ACK: snprintf(expbuf,49,"Secure read Resp");break;
+            case FELICA_RDSEC_REQ:
+                snprintf(expbuf, 49, "Secure read Req");
+                break;
+            case FELICA_RDSEC_ACK:
+                snprintf(expbuf, 49, "Secure read Resp");
+                break;
 
-            case FELICA_WRTSEC_REQ: snprintf(expbuf,49,"Secure write Req");break;
-            case FELICA_WRTSEC_ACK: snprintf(expbuf,49,"Secure write Resp");break;
+            case FELICA_WRTSEC_REQ:
+                snprintf(expbuf, 49, "Secure write Req");
+                break;
+            case FELICA_WRTSEC_ACK:
+                snprintf(expbuf, 49, "Secure write Resp");
+                break;
 
-            case FELICA_REQSRV2_REQ: snprintf(expbuf,49,"Request Srvc v2 Req");break;
-            case FELICA_REQSRV2_ACK: snprintf(expbuf,49,"Request Srvc v2 Resp");break;
+            case FELICA_REQSRV2_REQ:
+                snprintf(expbuf, 49, "Request Srvc v2 Req");
+                break;
+            case FELICA_REQSRV2_ACK:
+                snprintf(expbuf, 49, "Request Srvc v2 Resp");
+                break;
 
-            case FELICA_GETSTATUS_REQ: snprintf(expbuf,49,"Get status Req");break;
-            case FELICA_GETSTATUS_ACK: snprintf(expbuf,49,"Get status Resp");break;
+            case FELICA_GETSTATUS_REQ:
+                snprintf(expbuf, 49, "Get status Req");
+                break;
+            case FELICA_GETSTATUS_ACK:
+                snprintf(expbuf, 49, "Get status Resp");
+                break;
 
-            case FELICA_OSVER_REQ: snprintf(expbuf,49,"Get OS Version Req");break;
-            case FELICA_OSVER_ACK: snprintf(expbuf,49,"Get OS Version Resp");break;
+            case FELICA_OSVER_REQ:
+                snprintf(expbuf, 49, "Get OS Version Req");
+                break;
+            case FELICA_OSVER_ACK:
+                snprintf(expbuf, 49, "Get OS Version Resp");
+                break;
 
-            case FELICA_RESET_MODE_REQ: snprintf(expbuf,49,"Reset mode Req");break;
-            case FELICA_RESET_MODE_ACK: snprintf(expbuf,49,"Reset mode Resp");break;
+            case FELICA_RESET_MODE_REQ:
+                snprintf(expbuf, 49, "Reset mode Req");
+                break;
+            case FELICA_RESET_MODE_ACK:
+                snprintf(expbuf, 49, "Reset mode Resp");
+                break;
 
-            case FELICA_AUTH1V2_REQ: snprintf(expbuf,49,"Auth1 v2 Req");break;
-            case FELICA_AUTH1V2_ACK: snprintf(expbuf,49,"Auth1 v2 Resp");break;
+            case FELICA_AUTH1V2_REQ:
+                snprintf(expbuf, 49, "Auth1 v2 Req");
+                break;
+            case FELICA_AUTH1V2_ACK:
+                snprintf(expbuf, 49, "Auth1 v2 Resp");
+                break;
 
-            case FELICA_AUTH2V2_REQ: snprintf(expbuf,49,"Auth2 v2 Req");break;
-            case FELICA_AUTH2V2_ACK: snprintf(expbuf,49,"Auth2 v2 Resp");break;
+            case FELICA_AUTH2V2_REQ:
+                snprintf(expbuf, 49, "Auth2 v2 Req");
+                break;
+            case FELICA_AUTH2V2_ACK:
+                snprintf(expbuf, 49, "Auth2 v2 Resp");
+                break;
 
-            case FELICA_RDSECV2_REQ: snprintf(expbuf,49,"Secure read v2 Req");break;
-            case FELICA_RDSECV2_ACK: snprintf(expbuf,49,"Secure read v2 Resp");break;
-            case FELICA_WRTSECV2_REQ: snprintf(expbuf,49,"Secure write v2 Req");break;
-            case FELICA_WRTSECV2_ACK: snprintf(expbuf,49,"Secure write v2 Resp");break;
+            case FELICA_RDSECV2_REQ:
+                snprintf(expbuf, 49, "Secure read v2 Req");
+                break;
+            case FELICA_RDSECV2_ACK:
+                snprintf(expbuf, 49, "Secure read v2 Resp");
+                break;
+            case FELICA_WRTSECV2_REQ:
+                snprintf(expbuf, 49, "Secure write v2 Req");
+                break;
+            case FELICA_WRTSECV2_ACK:
+                snprintf(expbuf, 49, "Secure write v2 Resp");
+                break;
 
-            case FELICA_UPDATE_RNDID_REQ: snprintf(expbuf,49,"Update IDr Req");break;
-            case FELICA_UPDATE_RNDID_ACK: snprintf(expbuf,49,"Update IDr Resp");break;
-            default: snprintf(expbuf,49,"Unknown");break;
+            case FELICA_UPDATE_RNDID_REQ:
+                snprintf(expbuf, 49, "Update IDr Req");
+                break;
+            case FELICA_UPDATE_RNDID_ACK:
+                snprintf(expbuf, 49, "Update IDr Resp");
+                break;
+            default:
+                snprintf(expbuf, 49, "Unknown");
+                break;
         }
 
-        int num_lines = MIN((len )/16 + 1, 16);
+        int num_lines = MIN((len) / 16 + 1, 16);
         for (int j = 0; j < num_lines ; j++) {
             if (j == 0) {
                 PrintAndLogEx(NORMAL, "%7d | %s |%-32s |%02x %02x %s| %s",
-                    gap,
-                    (isResponse ? "Tag" : "Rdr"),
-                    line[j],
-                    trace[tracepos+len],
-                    trace[tracepos+len+1],
-                    (crc_ok) ? "OK" : "NG",
-                    expbuf);
+                              gap,
+                              (isResponse ? "Tag" : "Rdr"),
+                              line[j],
+                              trace[tracepos + len],
+                              trace[tracepos + len + 1],
+                              (crc_ok) ? "OK" : "NG",
+                              expbuf);
             } else {
                 PrintAndLogEx(NORMAL, "        |     |%-32s |        |    ", line[j]);
             }
@@ -409,7 +512,8 @@ static int SanityOfflineCheck( bool useTraceBuffer ){
 }
 */
 
-int CmdTraceList(const char *Cmd) {
+int CmdTraceList(const char *Cmd)
+{
 
     clearCommandBuffer();
 
@@ -427,32 +531,32 @@ int CmdTraceList(const char *Cmd) {
     char cmdp = 0;
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
 
-        int slen = param_getstr(Cmd, cmdp, type, sizeof(type) );
-        if ( slen == 1) {
+        int slen = param_getstr(Cmd, cmdp, type, sizeof(type));
+        if (slen == 1) {
 
-            switch ( tolower(param_getchar(Cmd, cmdp))) {
-            case 'h':
-                return usage_trace_list();
-            case 'f':
-                showWaitCycles = true;
-                cmdp++;
-                break;
-            case 'c':
-                markCRCBytes = true;
-                cmdp++;
-                break;
-            case '0':
-                isOnline = true;
-                cmdp++;
-                break;
-            case '1':
-                isOnline = false;
-                cmdp++;
-                break;
-            default:
-                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-                errors = true;
-                break;
+            switch (tolower(param_getchar(Cmd, cmdp))) {
+                case 'h':
+                    return usage_trace_list();
+                case 'f':
+                    showWaitCycles = true;
+                    cmdp++;
+                    break;
+                case 'c':
+                    markCRCBytes = true;
+                    cmdp++;
+                    break;
+                case '0':
+                    isOnline = true;
+                    cmdp++;
+                    break;
+                case '1':
+                    isOnline = false;
+                    cmdp++;
+                    break;
+                default:
+                    PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                    errors = true;
+                    break;
             }
 
         } else {
@@ -461,16 +565,16 @@ int CmdTraceList(const char *Cmd) {
 
             // validate type of output
             if (strcmp(type,     "iclass") == 0)    protocol = ICLASS;
-            else if(strcmp(type, "14a") == 0)       protocol = ISO_14443A;
-            else if(strcmp(type, "14b") == 0)       protocol = ISO_14443B;
-            else if(strcmp(type, "topaz") == 0)     protocol = TOPAZ;
-            else if(strcmp(type, "7816") == 0)      protocol = ISO_7816_4;
-            else if(strcmp(type, "des") == 0)       protocol = MFDES;
-            else if(strcmp(type, "legic") == 0)     protocol = LEGIC;
-            else if(strcmp(type, "15") == 0)        protocol = ISO_15693;
-            else if(strcmp(type, "felica") == 0)    protocol = FELICA;
-            else if(strcmp(type, "mf") == 0)        protocol = PROTO_MIFARE;
-            else if(strcmp(type, "raw") == 0)       protocol = -1;//No crc, no annotations
+            else if (strcmp(type, "14a") == 0)       protocol = ISO_14443A;
+            else if (strcmp(type, "14b") == 0)       protocol = ISO_14443B;
+            else if (strcmp(type, "topaz") == 0)     protocol = TOPAZ;
+            else if (strcmp(type, "7816") == 0)      protocol = ISO_7816_4;
+            else if (strcmp(type, "des") == 0)       protocol = MFDES;
+            else if (strcmp(type, "legic") == 0)     protocol = LEGIC;
+            else if (strcmp(type, "15") == 0)        protocol = ISO_15693;
+            else if (strcmp(type, "felica") == 0)    protocol = FELICA;
+            else if (strcmp(type, "mf") == 0)        protocol = PROTO_MIFARE;
+            else if (strcmp(type, "raw") == 0)       protocol = -1; //No crc, no annotations
             else errors = true;
 
             cmdp++;
@@ -488,10 +592,10 @@ int CmdTraceList(const char *Cmd) {
     if (!trace)
         trace = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
 
-    if ( isOnline ) {
+    if (isOnline) {
         // Query for the size of the trace,  downloading USB_CMD_DATA_SIZE
         UsbCommand response;
-        if ( !GetFromDevice(BIG_BUF, trace, USB_CMD_DATA_SIZE, 0, &response, 4000, true)) {
+        if (!GetFromDevice(BIG_BUF, trace, USB_CMD_DATA_SIZE, 0, &response, 4000, true)) {
             PrintAndLogEx(WARNING, "timeout while waiting for reply.");
             return 1;
         }
@@ -505,7 +609,7 @@ int CmdTraceList(const char *Cmd) {
                 return 2;
             }
             trace = p;
-            if ( !GetFromDevice(BIG_BUF, trace, traceLen, 0, NULL, 2500, false)) {
+            if (!GetFromDevice(BIG_BUF, trace, traceLen, 0, NULL, 2500, false)) {
                 PrintAndLogEx(WARNING, "command execution time out");
                 free(trace);
                 return 3;
@@ -519,16 +623,16 @@ int CmdTraceList(const char *Cmd) {
         printFelica(traceLen, trace);
     } else {
         PrintAndLogEx(NORMAL, "Start = Start of Start Bit, End = End of last modulation. Src = Source of Transfer");
-        if ( protocol == ISO_14443A || protocol == PROTO_MIFARE)
+        if (protocol == ISO_14443A || protocol == PROTO_MIFARE)
             PrintAndLogEx(NORMAL, "iso14443a - All times are in carrier periods (1/13.56Mhz)");
-        if ( protocol == ICLASS )
+        if (protocol == ICLASS)
             PrintAndLogEx(NORMAL, "iClass - Timings are not as accurate");
-        if ( protocol == LEGIC )
+        if (protocol == LEGIC)
             PrintAndLogEx(NORMAL, "LEGIC - Reader Mode: Timings are in ticks (1us == 1.5ticks)\n"
-                                  "        Tag Mode: Timings are in sub carrier periods (1/212 kHz == 4.7us)");
-        if ( protocol == ISO_15693 )
+                          "        Tag Mode: Timings are in sub carrier periods (1/212 kHz == 4.7us)");
+        if (protocol == ISO_15693)
             PrintAndLogEx(NORMAL, "ISO15693 - Timings are not as accurate");
-        if ( protocol == ISO_7816_4 )
+        if (protocol == ISO_7816_4)
             PrintAndLogEx(NORMAL, "ISO7816-4 / Smartcard - Timings N/A yet");
 
         PrintAndLogEx(NORMAL, "");
@@ -543,7 +647,8 @@ int CmdTraceList(const char *Cmd) {
     return 0;
 }
 
-int CmdTraceLoad(const char *Cmd) {
+int CmdTraceLoad(const char *Cmd)
+{
 
     FILE *f = NULL;
     char filename[FILE_PATH_SIZE];
@@ -567,13 +672,13 @@ int CmdTraceLoad(const char *Cmd) {
         fclose(f);
         return 3;
     }
-    if (fsize < 4 ) {
+    if (fsize < 4) {
         PrintAndLogEx(FAILED, "error, file is too small");
         fclose(f);
         return 4;
     }
 
-    if ( trace )
+    if (trace)
         free(trace);
 
     trace = calloc(fsize, sizeof(uint8_t));
@@ -590,9 +695,10 @@ int CmdTraceLoad(const char *Cmd) {
     return 0;
 }
 
-int CmdTraceSave(const char *Cmd) {
+int CmdTraceSave(const char *Cmd)
+{
 
-    if (traceLen == 0 ) {
+    if (traceLen == 0) {
         PrintAndLogEx(WARNING, "trace is empty, exiting...");
         return 0;
     }
@@ -614,13 +720,15 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdTrace(const char *Cmd) {
+int CmdTrace(const char *Cmd)
+{
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
+int CmdHelp(const char *Cmd)
+{
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/comms.c b/client/comms.c
index 9a09c060e..53f52d7a5 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -44,19 +44,22 @@ static pthread_mutex_t rxBufferMutex = PTHREAD_MUTEX_INITIALIZER;
 
 // These wrappers are required because it is not possible to access a static
 // global variable outside of the context of a single file.
-void SetOffline(bool value) {
+void SetOffline(bool value)
+{
     offline = value;
 }
 
-bool IsOffline() {
+bool IsOffline()
+{
     return offline;
 }
 
-void SendCommand(UsbCommand *c) {
+void SendCommand(UsbCommand *c)
+{
 
-    #ifdef COMMS_DEBUG
+#ifdef COMMS_DEBUG
     PrintAndLogEx(NORMAL, "Sending %d bytes | cmd %04x\n", sizeof(UsbCommand), c->cmd);
-    #endif
+#endif
 
     if (offline) {
         PrintAndLogEx(NORMAL, "Sending bytes to proxmark failed - offline");
@@ -90,7 +93,8 @@ void SendCommand(UsbCommand *c) {
  *  A better method could have been to have explicit command-ACKS, so we can know which ACK goes to which
  *  operation. Right now we'll just have to live with this.
  */
-void clearCommandBuffer() {
+void clearCommandBuffer()
+{
     //This is a very simple operation
     pthread_mutex_lock(&rxBufferMutex);
     cmd_tail = cmd_head;
@@ -100,21 +104,22 @@ void clearCommandBuffer() {
  * @brief storeCommand stores a USB command in a circular buffer
  * @param UC
  */
-static void storeCommand(UsbCommand *command) {
+static void storeCommand(UsbCommand *command)
+{
 
     pthread_mutex_lock(&rxBufferMutex);
-    if ( ( cmd_head+1) % CMD_BUFFER_SIZE == cmd_tail) {
+    if ((cmd_head + 1) % CMD_BUFFER_SIZE == cmd_tail) {
         //If these two are equal, we're about to overwrite in the
         // circular buffer.
         PrintAndLogEx(FAILED, "WARNING: Command buffer about to overwrite command! This needs to be fixed!");
         fflush(stdout);
     }
     //Store the command at the 'head' location
-    UsbCommand* destination = &rxBuffer[cmd_head];
+    UsbCommand *destination = &rxBuffer[cmd_head];
     memcpy(destination, command, sizeof(UsbCommand));
 
-     //increment head and wrap
-    cmd_head = (cmd_head +1) % CMD_BUFFER_SIZE;
+    //increment head and wrap
+    cmd_head = (cmd_head + 1) % CMD_BUFFER_SIZE;
     pthread_mutex_unlock(&rxBufferMutex);
 }
 /**
@@ -122,7 +127,8 @@ static void storeCommand(UsbCommand *command) {
  * @param response location to write command
  * @return 1 if response was returned, 0 if nothing has been received
  */
-static int getCommand(UsbCommand* response) {
+static int getCommand(UsbCommand *response)
+{
     pthread_mutex_lock(&rxBufferMutex);
     //If head == tail, there's nothing to read, or if we just got initialized
     if (cmd_head == cmd_tail)  {
@@ -131,11 +137,11 @@ static int getCommand(UsbCommand* response) {
     }
 
     //Pick out the next unread command
-    UsbCommand* last_unread = &rxBuffer[cmd_tail];
+    UsbCommand *last_unread = &rxBuffer[cmd_tail];
     memcpy(response, last_unread, sizeof(UsbCommand));
 
     //Increment tail - this is a circular buffer, so modulo buffer size
-    cmd_tail = (cmd_tail +1 ) % CMD_BUFFER_SIZE;
+    cmd_tail = (cmd_tail + 1) % CMD_BUFFER_SIZE;
 
     pthread_mutex_unlock(&rxBufferMutex);
     return 1;
@@ -145,13 +151,14 @@ static int getCommand(UsbCommand* response) {
 // Entry point into our code: called whenever we received a packet over USB
 // that we weren't necessarily expecting, for example a debug print.
 //-----------------------------------------------------------------------------
-static void UsbCommandReceived(UsbCommand* c) {
+static void UsbCommandReceived(UsbCommand *c)
+{
 
-    switch(c->cmd) {
+    switch (c->cmd) {
         // First check if we are handling a debug message
         case CMD_DEBUG_PRINT_STRING: {
 
-            char s[USB_CMD_DATA_SIZE+1];
+            char s[USB_CMD_DATA_SIZE + 1];
             memset(s, 0x00, sizeof(s));
             size_t len = MIN(c->arg[0], USB_CMD_DATA_SIZE);
             memcpy(s, c->d.asBytes, len);
@@ -224,8 +231,9 @@ void
 __attribute__((force_align_arg_pointer))
 #endif
 #endif
-*uart_communication(void *targ) {
-    communication_arg_t *conn = (communication_arg_t*)targ;
+*uart_communication(void *targ)
+{
+    communication_arg_t *conn = (communication_arg_t *)targ;
     size_t rxlen, totallen = 0;
     UsbCommand rx;
     UsbCommand *prx = &rx;
@@ -244,7 +252,7 @@ __attribute__((force_align_arg_pointer))
             prx += rxlen;
             totallen += rxlen;
 
-            if ( totallen < sizeof(UsbCommand)) {
+            if (totallen < sizeof(UsbCommand)) {
 
                 // iceman: this looping is no working as expected at all. The reassemble of package is nonfunctional.
                 // solved so far with increasing the timeouts of the serial port configuration.
@@ -273,7 +281,7 @@ __attribute__((force_align_arg_pointer))
         }
 
         if (txBuffer_pending) {
-            if (!uart_send(sp, (uint8_t*) &txBuffer, sizeof(UsbCommand))) {
+            if (!uart_send(sp, (uint8_t *) &txBuffer, sizeof(UsbCommand))) {
                 //counter_to_offline++;
                 PrintAndLogEx(WARNING, "sending bytes to proxmark failed");
             }
@@ -298,19 +306,21 @@ __attribute__((force_align_arg_pointer))
     return NULL;
 }
 
-bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode) {
+bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode)
+{
 
     char *portname = (char *)port;
     if (!wait_for_port) {
         sp = uart_open(portname);
     } else {
-        PrintAndLogEx(SUCCESS, "Waiting for Proxmark to appear on " _YELLOW_(%s), portname);
+        PrintAndLogEx(SUCCESS, "Waiting for Proxmark to appear on " _YELLOW_( % s), portname);
         fflush(stdout);
         int openCount = 0;
         do {
             sp = uart_open(portname);
             msleep(500);
-            printf("."); fflush(stdout);
+            printf(".");
+            fflush(stdout);
         } while (++openCount < timeout && (sp == INVALID_SERIAL_PORT || sp == CLAIMED_SERIAL_PORT));
         //PrintAndLogEx(NORMAL, "\n");
     }
@@ -341,7 +351,8 @@ bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode)
     }
 }
 
-void CloseProxmark(void) {
+void CloseProxmark(void)
+{
     conn.run = false;
 
 
@@ -383,7 +394,8 @@ void CloseProxmark(void) {
  * @param show_warning display message after 3 seconds
  * @return true if command was returned, otherwise false
  */
-bool WaitForResponseTimeoutW(uint32_t cmd, UsbCommand* response, size_t ms_timeout, bool show_warning) {
+bool WaitForResponseTimeoutW(uint32_t cmd, UsbCommand *response, size_t ms_timeout, bool show_warning)
+{
 
     UsbCommand resp;
 
@@ -395,7 +407,7 @@ bool WaitForResponseTimeoutW(uint32_t cmd, UsbCommand* response, size_t ms_timeo
     // Wait until the command is received
     while (true) {
 
-        while ( getCommand(response) ) {
+        while (getCommand(response)) {
             if (cmd == CMD_UNKNOWN || response->cmd == cmd)
                 return true;
         }
@@ -413,11 +425,13 @@ bool WaitForResponseTimeoutW(uint32_t cmd, UsbCommand* response, size_t ms_timeo
     return false;
 }
 
-bool WaitForResponseTimeout(uint32_t cmd, UsbCommand* response, size_t ms_timeout) {
+bool WaitForResponseTimeout(uint32_t cmd, UsbCommand *response, size_t ms_timeout)
+{
     return WaitForResponseTimeoutW(cmd, response, ms_timeout, true);
 }
 
-bool WaitForResponse(uint32_t cmd, UsbCommand* response) {
+bool WaitForResponse(uint32_t cmd, UsbCommand *response)
+{
     return WaitForResponseTimeoutW(cmd, response, -1, true);
 }
 
@@ -434,7 +448,8 @@ bool WaitForResponse(uint32_t cmd, UsbCommand* response) {
 * @param show_warning display message after 2 seconds
 * @return true if command was returned, otherwise false
 */
-bool GetFromDevice(DeviceMemType_t memtype, uint8_t *dest, uint32_t bytes, uint32_t start_index, UsbCommand *response, size_t ms_timeout, bool show_warning) {
+bool GetFromDevice(DeviceMemType_t memtype, uint8_t *dest, uint32_t bytes, uint32_t start_index, UsbCommand *response, size_t ms_timeout, bool show_warning)
+{
 
     if (dest == NULL) return false;
     if (bytes == 0) return true;
@@ -472,7 +487,8 @@ bool GetFromDevice(DeviceMemType_t memtype, uint8_t *dest, uint32_t bytes, uint3
     return false;
 }
 
-bool dl_it(uint8_t *dest, uint32_t bytes, uint32_t start_index, UsbCommand *response, size_t ms_timeout, bool show_warning, uint32_t rec_cmd) {
+bool dl_it(uint8_t *dest, uint32_t bytes, uint32_t start_index, UsbCommand *response, size_t ms_timeout, bool show_warning, uint32_t rec_cmd)
+{
 
     uint32_t bytes_completed = 0;
     uint64_t start_time = msclock();
@@ -496,8 +512,8 @@ bool dl_it(uint8_t *dest, uint32_t bytes, uint32_t start_index, UsbCommand *resp
                 copy_bytes = MIN(copy_bytes, USB_CMD_DATA_SIZE);
 
                 // extended bounds check2.
-                if ( offset + copy_bytes > bytes ) {
-                    PrintAndLogEx(FAILED, "ERROR: Out of bounds when downloading from device,  offset %u | len %u | total len %u > buf_size %u", offset, copy_bytes,  offset+copy_bytes,  bytes);
+                if (offset + copy_bytes > bytes) {
+                    PrintAndLogEx(FAILED, "ERROR: Out of bounds when downloading from device,  offset %u | len %u | total len %u > buf_size %u", offset, copy_bytes,  offset + copy_bytes,  bytes);
                     break;
                 }
 
diff --git a/client/comms.h b/client/comms.h
index bf7869d77..f56bdb57e 100644
--- a/client/comms.h
+++ b/client/comms.h
@@ -37,7 +37,7 @@ typedef enum {
     BIG_BUF_EML,
     FLASH_MEM,
     SIM_MEM,
-    } DeviceMemType_t;
+} DeviceMemType_t;
 
 typedef struct {
     bool run; // If TRUE, continue running the uart_communication thread
@@ -57,9 +57,9 @@ void clearCommandBuffer();
 bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode);
 void CloseProxmark(void);
 
-bool WaitForResponseTimeoutW(uint32_t cmd, UsbCommand* response, size_t ms_timeout, bool show_warning);
-bool WaitForResponseTimeout(uint32_t cmd, UsbCommand* response, size_t ms_timeout);
-bool WaitForResponse(uint32_t cmd, UsbCommand* response);
+bool WaitForResponseTimeoutW(uint32_t cmd, UsbCommand *response, size_t ms_timeout, bool show_warning);
+bool WaitForResponseTimeout(uint32_t cmd, UsbCommand *response, size_t ms_timeout);
+bool WaitForResponse(uint32_t cmd, UsbCommand *response);
 
 extern bool GetFromDevice(DeviceMemType_t memtype, uint8_t *dest, uint32_t bytes, uint32_t start_index, UsbCommand *response, size_t ms_timeout, bool show_warning);
 
diff --git a/client/crypto/asn1dump.c b/client/crypto/asn1dump.c
index 276351e96..5c2cd5d08 100644
--- a/client/crypto/asn1dump.c
+++ b/client/crypto/asn1dump.c
@@ -48,7 +48,7 @@ struct asn1_tag {
 
 static const struct asn1_tag asn1_tags[] = {
     // internal
-    { 0x00  , "Unknown ???" },
+    { 0x00, "Unknown ???" },
 
     // ASN.1
     { 0x01, "BOOLEAN", ASN1_TAG_BOOLEAN },
@@ -87,25 +87,29 @@ static const struct asn1_tag asn1_tags[] = {
     { 0xa5, "[5]" },
 };
 
-static int asn1_sort_tag(tlv_tag_t tag) {
+static int asn1_sort_tag(tlv_tag_t tag)
+{
     return (int)(tag >= 0x100 ? tag : tag << 8);
 }
 
-static int asn1_tlv_compare(const void *a, const void *b) {
+static int asn1_tlv_compare(const void *a, const void *b)
+{
     const struct tlv *tlv = a;
     const struct asn1_tag *tag = b;
 
     return asn1_sort_tag(tlv->tag) - (asn1_sort_tag(tag->tag));
 }
 
-static const struct asn1_tag *asn1_get_tag(const struct tlv *tlv) {
+static const struct asn1_tag *asn1_get_tag(const struct tlv *tlv)
+{
     struct asn1_tag *tag = bsearch(tlv, asn1_tags, sizeof(asn1_tags) / sizeof(asn1_tags[0]),
-            sizeof(asn1_tags[0]), asn1_tlv_compare);
+                                   sizeof(asn1_tags[0]), asn1_tlv_compare);
 
     return tag ? tag : &asn1_tags[0];
 }
 
-static void asn1_tag_dump_str_time(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level, bool longyear, bool *needdump){
+static void asn1_tag_dump_str_time(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level, bool longyear, bool *needdump)
+{
     int len = tlv->len;
     *needdump = false;
 
@@ -157,16 +161,18 @@ static void asn1_tag_dump_str_time(const struct tlv *tlv, const struct asn1_tag
     }
 }
 
-static void asn1_tag_dump_string(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level){
+static void asn1_tag_dump_string(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level)
+{
     fprintf(f, "\tvalue: '");
     fwrite(tlv->value, 1, tlv->len, f);
     fprintf(f, "'\n");
 }
 
-static void asn1_tag_dump_octet_string(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level, bool *needdump){
+static void asn1_tag_dump_octet_string(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level, bool *needdump)
+{
     *needdump = false;
     for (int i = 0; i < tlv->len; i++)
-        if (!isspace(tlv->value[i]) && !isprint(tlv->value[i])){
+        if (!isspace(tlv->value[i]) && !isprint(tlv->value[i])) {
             *needdump = true;
             break;
         }
@@ -179,7 +185,8 @@ static void asn1_tag_dump_octet_string(const struct tlv *tlv, const struct asn1_
     }
 }
 
-static unsigned long asn1_value_integer(const struct tlv *tlv, unsigned start, unsigned end) {
+static unsigned long asn1_value_integer(const struct tlv *tlv, unsigned start, unsigned end)
+{
     unsigned long ret = 0;
     int i;
 
@@ -189,36 +196,38 @@ static unsigned long asn1_value_integer(const struct tlv *tlv, unsigned start, u
         return ret;
 
     if (start & 1) {
-        ret += tlv->value[start/2] & 0xf;
+        ret += tlv->value[start / 2] & 0xf;
         i = start + 1;
     } else
         i = start;
 
     for (; i < end - 1; i += 2) {
         ret *= 10;
-        ret += tlv->value[i/2] >> 4;
+        ret += tlv->value[i / 2] >> 4;
         ret *= 10;
-        ret += tlv->value[i/2] & 0xf;
+        ret += tlv->value[i / 2] & 0xf;
     }
 
     if (end & 1) {
         ret *= 10;
-        ret += tlv->value[end/2] >> 4;
+        ret += tlv->value[end / 2] >> 4;
     }
 
     return ret;
 }
 
-static void asn1_tag_dump_boolean(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level) {
+static void asn1_tag_dump_boolean(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level)
+{
     PRINT_INDENT(level);
     if (tlv->len > 0) {
-        fprintf(f, "\tvalue: %s\n", tlv->value[0]?"true":"false");
+        fprintf(f, "\tvalue: %s\n", tlv->value[0] ? "true" : "false");
     } else {
         fprintf(f, "n/a\n");
     }
 }
 
-static void asn1_tag_dump_integer(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level) {
+static void asn1_tag_dump_integer(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level)
+{
     PRINT_INDENT(level);
     if (tlv->len == 4) {
         int32_t val = 0;
@@ -230,7 +239,8 @@ static void asn1_tag_dump_integer(const struct tlv *tlv, const struct asn1_tag *
     fprintf(f, "\tvalue: %lu\n", asn1_value_integer(tlv, 0, tlv->len * 2));
 }
 
-static char *asn1_oid_description(const char *oid, bool with_group_desc) {
+static char *asn1_oid_description(const char *oid, bool with_group_desc)
+{
     json_error_t error;
     json_t *root = NULL;
     char fname[300] = {0};
@@ -238,7 +248,7 @@ static char *asn1_oid_description(const char *oid, bool with_group_desc) {
     memset(res, 0x00, sizeof(res));
 
     size_t len = strlen(get_my_executable_directory());
-    if ( len > 300 ) len = 299;
+    if (len > 300) len = 299;
 
     strncpy(fname, get_my_executable_directory(), len);
     strcat(fname, "crypto/oids.json");
@@ -281,7 +291,8 @@ error:
     return NULL;
 }
 
-static void asn1_tag_dump_object_id(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level) {
+static void asn1_tag_dump_object_id(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level)
+{
     PRINT_INDENT(level);
     mbedtls_asn1_buf asn1_buf;
     asn1_buf.len = tlv->len;
@@ -314,7 +325,8 @@ static void asn1_tag_dump_object_id(const struct tlv *tlv, const struct asn1_tag
     fprintf(f, "\n");
 }
 
-bool asn1_tag_dump(const struct tlv *tlv, FILE *f, int level, bool *candump) {
+bool asn1_tag_dump(const struct tlv *tlv, FILE *f, int level, bool *candump)
+{
     if (!tlv) {
         fprintf(f, "NULL\n");
         return false;
@@ -326,34 +338,34 @@ bool asn1_tag_dump(const struct tlv *tlv, FILE *f, int level, bool *candump) {
     fprintf(f, "--%2hx[%02zx] '%s':", tlv->tag, tlv->len, tag->name);
 
     switch (tag->type) {
-    case ASN1_TAG_GENERIC:
-        fprintf(f, "\n");
-        break;
-    case ASN1_TAG_STRING:
-        asn1_tag_dump_string(tlv, tag, f, level);
-        *candump = false;
-        break;
-    case ASN1_TAG_OCTET_STRING:
-        asn1_tag_dump_octet_string(tlv, tag, f, level, candump);
-        break;
-    case ASN1_TAG_BOOLEAN:
-        asn1_tag_dump_boolean(tlv, tag, f, level);
-        *candump = false;
-        break;
-    case ASN1_TAG_INTEGER:
-        asn1_tag_dump_integer(tlv, tag, f, level);
-        *candump = false;
-        break;
-    case ASN1_TAG_UTC_TIME:
-        asn1_tag_dump_str_time(tlv, tag, f, level, false, candump);
-        break;
-    case ASN1_TAG_STR_TIME:
-        asn1_tag_dump_str_time(tlv, tag, f, level, true, candump);
-        break;
-    case ASN1_TAG_OBJECT_ID:
-        asn1_tag_dump_object_id(tlv, tag, f, level);
-        *candump = false;
-        break;
+        case ASN1_TAG_GENERIC:
+            fprintf(f, "\n");
+            break;
+        case ASN1_TAG_STRING:
+            asn1_tag_dump_string(tlv, tag, f, level);
+            *candump = false;
+            break;
+        case ASN1_TAG_OCTET_STRING:
+            asn1_tag_dump_octet_string(tlv, tag, f, level, candump);
+            break;
+        case ASN1_TAG_BOOLEAN:
+            asn1_tag_dump_boolean(tlv, tag, f, level);
+            *candump = false;
+            break;
+        case ASN1_TAG_INTEGER:
+            asn1_tag_dump_integer(tlv, tag, f, level);
+            *candump = false;
+            break;
+        case ASN1_TAG_UTC_TIME:
+            asn1_tag_dump_str_time(tlv, tag, f, level, false, candump);
+            break;
+        case ASN1_TAG_STR_TIME:
+            asn1_tag_dump_str_time(tlv, tag, f, level, true, candump);
+            break;
+        case ASN1_TAG_OBJECT_ID:
+            asn1_tag_dump_object_id(tlv, tag, f, level);
+            *candump = false;
+            break;
     };
 
     return true;
diff --git a/client/crypto/asn1utils.c b/client/crypto/asn1utils.c
index 35fbe43b3..aa10f707a 100644
--- a/client/crypto/asn1utils.c
+++ b/client/crypto/asn1utils.c
@@ -17,7 +17,8 @@
 #include "asn1dump.h"
 #include "util.h"
 
-int ecdsa_asn1_get_signature(uint8_t *signature, size_t signaturelen, uint8_t *rval, uint8_t *sval) {
+int ecdsa_asn1_get_signature(uint8_t *signature, size_t signaturelen, uint8_t *rval, uint8_t *sval)
+{
     if (!signature || !signaturelen || !rval || !sval)
         return 1;
 
@@ -55,13 +56,14 @@ int ecdsa_asn1_get_signature(uint8_t *signature, size_t signaturelen, uint8_t *r
         // check size
         if (end != p)
             return 2;
-        }
+    }
 
 exit:
     return res;
 }
 
-static bool print_cb(void *data, const struct tlv *tlv, int level, bool is_leaf) {
+static bool print_cb(void *data, const struct tlv *tlv, int level, bool is_leaf)
+{
     bool candump = true;
     asn1_tag_dump(tlv, stdout, level, &candump);
     if (is_leaf && candump) {
@@ -71,7 +73,8 @@ static bool print_cb(void *data, const struct tlv *tlv, int level, bool is_leaf)
     return true;
 }
 
-int asn1_print(uint8_t *asn1buf, size_t asn1buflen, char *indent) {
+int asn1_print(uint8_t *asn1buf, size_t asn1buflen, char *indent)
+{
 
     struct tlvdb *t = NULL;
     t = tlvdb_parse_multi(asn1buf, asn1buflen);
diff --git a/client/crypto/libpcrypto.c b/client/crypto/libpcrypto.c
index 4d6c33704..27b998303 100644
--- a/client/crypto/libpcrypto.c
+++ b/client/crypto/libpcrypto.c
@@ -26,7 +26,8 @@
 #include <util.h>
 
 // NIST Special Publication 800-38A — Recommendation for block cipher modes of operation: methods and techniques, 2001.
-int aes_encode(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *output, int length){
+int aes_encode(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *output, int length)
+{
     uint8_t iiv[16] = {0};
     if (iv)
         memcpy(iiv, iv, 16);
@@ -42,7 +43,8 @@ int aes_encode(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *output, int l
     return 0;
 }
 
-int aes_decode(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *output, int length){
+int aes_decode(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *output, int length)
+{
     uint8_t iiv[16] = {0};
     if (iv)
         memcpy(iiv, iv, 16);
@@ -60,14 +62,16 @@ int aes_decode(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *output, int l
 
 // NIST Special Publication 800-38B — Recommendation for block cipher modes of operation: The CMAC mode for authentication.
 // https://csrc.nist.gov/CSRC/media/Projects/Cryptographic-Standards-and-Guidelines/documents/examples/AES_CMAC.pdf
-int aes_cmac(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *mac, int length) {
+int aes_cmac(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *mac, int length)
+{
     memset(mac, 0x00, 16);
 
     //  NIST 800-38B
     return mbedtls_aes_cmac_prf_128(key, MBEDTLS_AES_BLOCK_SIZE, input, length, mac);
 }
 
-int aes_cmac8(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *mac, int length) {
+int aes_cmac8(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *mac, int length)
+{
     uint8_t cmac[16] = {0};
     memset(mac, 0x00, 8);
 
@@ -75,14 +79,15 @@ int aes_cmac8(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *mac, int lengt
     if (res)
         return res;
 
-    for(int i = 0; i < 8; i++)
+    for (int i = 0; i < 8; i++)
         mac[i] = cmac[i * 2 + 1];
 
     return 0;
 }
 
 static uint8_t fixed_rand_value[250] = {0};
-static int fixed_rand(void *rng_state, unsigned char *output, size_t len) {
+static int fixed_rand(void *rng_state, unsigned char *output, size_t len)
+{
     if (len <= 250) {
         memcpy(output, fixed_rand_value, len);
     } else {
@@ -92,7 +97,8 @@ static int fixed_rand(void *rng_state, unsigned char *output, size_t len) {
     return 0;
 }
 
-int sha256hash(uint8_t *input, int length, uint8_t *hash) {
+int sha256hash(uint8_t *input, int length, uint8_t *hash)
+{
     if (!hash || !input)
         return 1;
 
@@ -106,7 +112,8 @@ int sha256hash(uint8_t *input, int length, uint8_t *hash) {
     return 0;
 }
 
-int ecdsa_init_str(mbedtls_ecdsa_context *ctx, char * key_d, char *key_x, char *key_y) {
+int ecdsa_init_str(mbedtls_ecdsa_context *ctx, char *key_d, char *key_x, char *key_y)
+{
     if (!ctx)
         return 1;
 
@@ -132,7 +139,8 @@ int ecdsa_init_str(mbedtls_ecdsa_context *ctx, char * key_d, char *key_x, char *
     return 0;
 }
 
-int ecdsa_init(mbedtls_ecdsa_context *ctx, uint8_t * key_d, uint8_t *key_xy) {
+int ecdsa_init(mbedtls_ecdsa_context *ctx, uint8_t *key_d, uint8_t *key_xy)
+{
     if (!ctx)
         return 1;
 
@@ -158,7 +166,8 @@ int ecdsa_init(mbedtls_ecdsa_context *ctx, uint8_t * key_d, uint8_t *key_xy) {
     return 0;
 }
 
-int ecdsa_key_create(uint8_t * key_d, uint8_t *key_xy) {
+int ecdsa_key_create(uint8_t *key_d, uint8_t *key_xy)
+{
     int res;
     mbedtls_ecdsa_context ctx;
     ecdsa_init(&ctx, NULL, NULL);
@@ -202,14 +211,16 @@ exit:
     return res;
 }
 
-char *ecdsa_get_error(int ret) {
+char *ecdsa_get_error(int ret)
+{
     static char retstr[300];
     memset(retstr, 0x00, sizeof(retstr));
     mbedtls_strerror(ret, retstr, sizeof(retstr));
     return retstr;
 }
 
-int ecdsa_public_key_from_pk(mbedtls_pk_context *pk, uint8_t *key, size_t keylen) {
+int ecdsa_public_key_from_pk(mbedtls_pk_context *pk, uint8_t *key, size_t keylen)
+{
     int res = 0;
     size_t realkeylen = 0;
     if (keylen < 65)
@@ -222,7 +233,7 @@ int ecdsa_public_key_from_pk(mbedtls_pk_context *pk, uint8_t *key, size_t keylen
     if (res)
         goto exit;
 
-    res = mbedtls_ecdsa_from_keypair(&ctx, mbedtls_pk_ec(*pk) );
+    res = mbedtls_ecdsa_from_keypair(&ctx, mbedtls_pk_ec(*pk));
     if (res)
         goto exit;
 
@@ -234,7 +245,8 @@ exit:
     return res;
 }
 
-int ecdsa_signature_create(uint8_t *key_d, uint8_t *key_xy, uint8_t *input, int length, uint8_t *signature, size_t *signaturelen) {
+int ecdsa_signature_create(uint8_t *key_d, uint8_t *key_xy, uint8_t *input, int length, uint8_t *signature, size_t *signaturelen)
+{
     int res;
     *signaturelen = 0;
 
@@ -264,7 +276,8 @@ exit:
     return res;
 }
 
-int ecdsa_signature_create_test(char * key_d, char *key_x, char *key_y, char *random, uint8_t *input, int length, uint8_t *signature, size_t *signaturelen) {
+int ecdsa_signature_create_test(char *key_d, char *key_x, char *key_y, char *random, uint8_t *input, int length, uint8_t *signature, size_t *signaturelen)
+{
     int res;
     *signaturelen = 0;
 
@@ -284,7 +297,8 @@ int ecdsa_signature_create_test(char * key_d, char *key_x, char *key_y, char *ra
     return res;
 }
 
-int ecdsa_signature_verify_keystr(char *key_x, char *key_y, uint8_t *input, int length, uint8_t *signature, size_t signaturelen) {
+int ecdsa_signature_verify_keystr(char *key_x, char *key_y, uint8_t *input, int length, uint8_t *signature, size_t signaturelen)
+{
     int res;
     uint8_t shahash[32] = {0};
     res = sha256hash(input, length, shahash);
@@ -299,7 +313,8 @@ int ecdsa_signature_verify_keystr(char *key_x, char *key_y, uint8_t *input, int
     return res;
 }
 
-int ecdsa_signature_verify(uint8_t *key_xy, uint8_t *input, int length, uint8_t *signature, size_t signaturelen) {
+int ecdsa_signature_verify(uint8_t *key_xy, uint8_t *input, int length, uint8_t *signature, size_t signaturelen)
+{
     int res;
     uint8_t shahash[32] = {0};
     res = sha256hash(input, length, shahash);
@@ -321,7 +336,8 @@ int ecdsa_signature_verify(uint8_t *key_xy, uint8_t *input, int length, uint8_t
 #define T_R           "2B42F576D07F4165FF65D1F3B1500F81E44C316F1F0B3EF57325B69ACA46104F"
 #define T_S           "DC42C2122D6392CD3E3A993A89502A8198C1886FE69D262C4B329BDB6B63FAF1"
 
-int ecdsa_nist_test(bool verbose) {
+int ecdsa_nist_test(bool verbose)
+{
     int res;
     uint8_t input[] = "Example of ECDSA with P-256";
     int length = strlen((char *)input);
diff --git a/client/crypto/libpcrypto.h b/client/crypto/libpcrypto.h
index 7ac6c3b07..5f3592b7a 100644
--- a/client/crypto/libpcrypto.h
+++ b/client/crypto/libpcrypto.h
@@ -23,7 +23,7 @@ extern int aes_cmac8(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *mac, in
 
 extern int sha256hash(uint8_t *input, int length, uint8_t *hash);
 
-extern int ecdsa_key_create(uint8_t * key_d, uint8_t *key_xy);
+extern int ecdsa_key_create(uint8_t *key_d, uint8_t *key_xy);
 extern int ecdsa_public_key_from_pk(mbedtls_pk_context *pk, uint8_t *key, size_t keylen);
 extern int ecdsa_signature_create(uint8_t *key_d, uint8_t *key_xy, uint8_t *input, int length, uint8_t *signature, size_t *signaturelen);
 extern int ecdsa_signature_verify(uint8_t *key_xy, uint8_t *input, int length, uint8_t *signature, size_t signaturelen);
diff --git a/client/emv/apduinfo.c b/client/emv/apduinfo.c
index 226252e14..461d5551c 100644
--- a/client/emv/apduinfo.c
+++ b/client/emv/apduinfo.c
@@ -257,9 +257,10 @@ const APDUCode APDUCodeTable[] = {
     {"9FXX",     APDUCODE_TYPE_NONE,         "Command successfully executed; 'xx' bytes of data are available and can be requested using GET RESPONSE."},
     {"9XXX",     APDUCODE_TYPE_NONE,         "Application related status, (ISO 7816-3)"}
 };
-const size_t APDUCodeTableLen = sizeof(APDUCodeTable)/sizeof(APDUCode);
+const size_t APDUCodeTableLen = sizeof(APDUCodeTable) / sizeof(APDUCode);
 
-int CodeCmp(const char *code1, const char *code2) {
+int CodeCmp(const char *code1, const char *code2)
+{
     int xsymb = 0;
     int cmp = 0;
     for (int i = 0; i < 4; i++) {
@@ -277,7 +278,8 @@ int CodeCmp(const char *code1, const char *code2) {
     return -1;
 }
 
-const APDUCode* const GetAPDUCode(uint8_t sw1, uint8_t sw2) {
+const APDUCode *const GetAPDUCode(uint8_t sw1, uint8_t sw2)
+{
     char buf[6] = {0};
     int res;
     int mineq = APDUCodeTableLen;
@@ -308,7 +310,8 @@ const APDUCode* const GetAPDUCode(uint8_t sw1, uint8_t sw2) {
     return NULL;
 }
 
-const char* GetAPDUCodeDescription(uint8_t sw1, uint8_t sw2) {
+const char *GetAPDUCodeDescription(uint8_t sw1, uint8_t sw2)
+{
     const APDUCode *cd = GetAPDUCode(sw1, sw2);
     if (cd)
         return cd->Description;
diff --git a/client/emv/apduinfo.h b/client/emv/apduinfo.h
index 0e06f515f..054aeec91 100644
--- a/client/emv/apduinfo.h
+++ b/client/emv/apduinfo.h
@@ -28,7 +28,7 @@ typedef struct {
     const char *Description;
 } APDUCode;
 
-extern const APDUCode* const GetAPDUCode(uint8_t sw1, uint8_t sw2);
-extern const char* GetAPDUCodeDescription(uint8_t sw1, uint8_t sw2);
+extern const APDUCode *const GetAPDUCode(uint8_t sw1, uint8_t sw2);
+extern const char *GetAPDUCodeDescription(uint8_t sw1, uint8_t sw2);
 
 #endif
diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index cf6c56efd..760aae577 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -20,7 +20,8 @@
 static int CmdHelp(const char *Cmd);
 
 #define TLV_ADD(tag, value)( tlvdb_change_or_add_node(tlvRoot, tag, sizeof(value) - 1, (const unsigned char *)value) )
-void ParamLoadDefaults(struct tlvdb *tlvRoot) {
+void ParamLoadDefaults(struct tlvdb *tlvRoot)
+{
     //9F02:(Amount, authorized (Numeric)) len:6
     TLV_ADD(0x9F02, "\x00\x00\x00\x00\x01\x00");
     //9F1A:(Terminal Country Code) len:2
@@ -43,26 +44,28 @@ void ParamLoadDefaults(struct tlvdb *tlvRoot) {
     TLV_ADD(0x95,   "\x00\x00\x00\x00\x00");
 }
 
-void PrintChannel(EMVCommandChannel channel) {
-    switch(channel) {
-    case ECC_CONTACTLESS:
-        PrintAndLogEx(INFO, "Channel: CONTACTLESS");
-        break;
-    case ECC_CONTACT:
-        PrintAndLogEx(INFO, "Channel: CONTACT");
-        break;
+void PrintChannel(EMVCommandChannel channel)
+{
+    switch (channel) {
+        case ECC_CONTACTLESS:
+            PrintAndLogEx(INFO, "Channel: CONTACTLESS");
+            break;
+        case ECC_CONTACT:
+            PrintAndLogEx(INFO, "Channel: CONTACT");
+            break;
     }
 }
 
-int CmdEMVSelect(const char *cmd) {
+int CmdEMVSelect(const char *cmd)
+{
     uint8_t data[APDU_AID_LEN] = {0};
     int datalen = 0;
 
     CLIParserInit("emv select",
-        "Executes select applet command",
-        "Usage:\n\temv select -s a00000000101 -> select card, select applet\n\temv select -st a00000000101 -> select card, select applet, show result in TLV\n");
+                  "Executes select applet command",
+                  "Usage:\n\temv select -s a00000000101 -> select card, select applet\n\temv select -st a00000000101 -> select card, select applet, show result in TLV\n");
 
-    void* argtable[] = {
+    void *argtable[] = {
         arg_param_begin,
         arg_lit0("sS",  "select",  "activate field and select card"),
         arg_lit0("kK",  "keep",    "keep field for next command"),
@@ -105,13 +108,14 @@ int CmdEMVSelect(const char *cmd) {
     return 0;
 }
 
-int CmdEMVSearch(const char *cmd) {
+int CmdEMVSearch(const char *cmd)
+{
 
     CLIParserInit("emv search",
-        "Tries to select all applets from applet list:\n",
-        "Usage:\n\temv search -s -> select card and search\n\temv search -st -> select card, search and show result in TLV\n");
+                  "Tries to select all applets from applet list:\n",
+                  "Usage:\n\temv search -s -> select card and search\n\temv search -st -> select card, search and show result in TLV\n");
 
-    void* argtable[] = {
+    void *argtable[] = {
         arg_param_begin,
         arg_lit0("sS",  "select",  "activate field and select card"),
         arg_lit0("kK",  "keep",    "keep field ON for next command"),
@@ -155,13 +159,14 @@ int CmdEMVSearch(const char *cmd) {
     return 0;
 }
 
-int CmdEMVPPSE(const char *cmd) {
+int CmdEMVPPSE(const char *cmd)
+{
 
     CLIParserInit("emv pse",
-        "Executes PSE/PPSE select command. It returns list of applet on the card:\n",
-        "Usage:\n\temv pse -s1 -> select, get pse\n\temv pse -st2 -> select, get ppse, show result in TLV\n");
+                  "Executes PSE/PPSE select command. It returns list of applet on the card:\n",
+                  "Usage:\n\temv pse -s1 -> select, get pse\n\temv pse -st2 -> select, get ppse, show result in TLV\n");
 
-    void* argtable[] = {
+    void *argtable[] = {
         arg_param_begin,
         arg_lit0("sS",  "select",  "activate field and select card"),
         arg_lit0("kK",  "keep",    "keep field ON for next command"),
@@ -210,17 +215,18 @@ int CmdEMVPPSE(const char *cmd) {
     return 0;
 }
 
-int CmdEMVGPO(const char *cmd) {
+int CmdEMVGPO(const char *cmd)
+{
     uint8_t data[APDU_RES_LEN] = {0};
     int datalen = 0;
 
     CLIParserInit("emv gpo",
-        "Executes Get Processing Options command. It returns data in TLV format (0x77 - format2) or plain format (0x80 - format1).\nNeeds a EMV applet to be selected.",
-        "Usage:\n\temv gpo -k -> execute GPO\n"
-            "\temv gpo -t 01020304 -> execute GPO with 4-byte PDOL data, show result in TLV\n"
-            "\temv gpo -pmt 9F 37 04 -> load params from file, make PDOL data from PDOL, execute GPO with PDOL, show result in TLV\n");
+                  "Executes Get Processing Options command. It returns data in TLV format (0x77 - format2) or plain format (0x80 - format1).\nNeeds a EMV applet to be selected.",
+                  "Usage:\n\temv gpo -k -> execute GPO\n"
+                  "\temv gpo -t 01020304 -> execute GPO with 4-byte PDOL data, show result in TLV\n"
+                  "\temv gpo -pmt 9F 37 04 -> load params from file, make PDOL data from PDOL, execute GPO with PDOL, show result in TLV\n");
 
-    void* argtable[] = {
+    void *argtable[] = {
         arg_param_begin,
         arg_lit0("kK",  "keep",    "keep field ON for next command"),
         arg_lit0("pP",  "params",  "load parameters from `emv/defparams.json` file for PDOLdata making from PDOL and parameters"),
@@ -269,7 +275,7 @@ int CmdEMVGPO(const char *cmd) {
 
         tmp_ext = tlvdb_external(0x9f38, datalen, data);
         pdol_data_tlv = dol_process((const struct tlv *)tmp_ext, tlvRoot, 0x83);
-        if (!pdol_data_tlv){
+        if (!pdol_data_tlv) {
             PrintAndLogEx(ERR, "Can't create PDOL TLV.");
             tlvdb_free(tmp_ext);
             tlvdb_free(tlvRoot);
@@ -316,15 +322,16 @@ int CmdEMVGPO(const char *cmd) {
     return 0;
 }
 
-int CmdEMVReadRecord(const char *cmd) {
+int CmdEMVReadRecord(const char *cmd)
+{
     uint8_t data[APDU_RES_LEN] = {0};
     int datalen = 0;
 
     CLIParserInit("emv readrec",
-        "Executes Read Record command. It returns data in TLV format.\nNeeds a bank applet to be selected and sometimes needs GPO to be executed.",
-        "Usage:\n\temv readrec -k 0101 -> read file SFI=01, SFIrec=01\n\temv readrec -kt 0201-> read file 0201 and show result in TLV\n");
+                  "Executes Read Record command. It returns data in TLV format.\nNeeds a bank applet to be selected and sometimes needs GPO to be executed.",
+                  "Usage:\n\temv readrec -k 0101 -> read file SFI=01, SFIrec=01\n\temv readrec -kt 0201-> read file 0201 and show result in TLV\n");
 
-    void* argtable[] = {
+    void *argtable[] = {
         arg_param_begin,
         arg_lit0("kK",  "keep",    "keep field ON for next command"),
         arg_lit0("aA",  "apdu",    "show APDU reqests and responses"),
@@ -371,18 +378,19 @@ int CmdEMVReadRecord(const char *cmd) {
     return 0;
 }
 
-int CmdEMVAC(const char *cmd) {
+int CmdEMVAC(const char *cmd)
+{
     uint8_t data[APDU_RES_LEN] = {0};
     int datalen = 0;
 
     CLIParserInit("emv genac",
-        "Generate Application Cryptogram command. It returns data in TLV format .\nNeeds a EMV applet to be selected and GPO to be executed.",
-        "Usage:\n\temv genac -k 0102 -> generate AC with 2-byte CDOLdata and keep field ON after command\n"
-            "\temv genac -t 01020304 -> generate AC with 4-byte CDOL data, show result in TLV\n"
-            "\temv genac -Daac 01020304 -> generate AC with 4-byte CDOL data and terminal decision 'declined'\n"
-            "\temv genac -pmt 9F 37 04 -> load params from file, make CDOL data from CDOL, generate AC with CDOL, show result in TLV");
+                  "Generate Application Cryptogram command. It returns data in TLV format .\nNeeds a EMV applet to be selected and GPO to be executed.",
+                  "Usage:\n\temv genac -k 0102 -> generate AC with 2-byte CDOLdata and keep field ON after command\n"
+                  "\temv genac -t 01020304 -> generate AC with 4-byte CDOL data, show result in TLV\n"
+                  "\temv genac -Daac 01020304 -> generate AC with 4-byte CDOL data and terminal decision 'declined'\n"
+                  "\temv genac -pmt 9F 37 04 -> load params from file, make CDOL data from CDOL, generate AC with CDOL, show result in TLV");
 
-    void* argtable[] = {
+    void *argtable[] = {
         arg_param_begin,
         arg_lit0("kK",  "keep",     "keep field ON for next command"),
         arg_lit0("cC",  "cda",      "executes CDA transaction. Needs to get SDAD in results."),
@@ -453,7 +461,7 @@ int CmdEMVAC(const char *cmd) {
 
         tmp_ext = tlvdb_external(0x8c, datalen, data);
         cdol_data_tlv = dol_process((const struct tlv *)tmp_ext, tlvRoot, 0x01); // 0x01 - dummy tag
-        if (!cdol_data_tlv){
+        if (!cdol_data_tlv) {
             PrintAndLogEx(ERR, "Can't create CDOL TLV.");
             tlvdb_free(tmp_ext);
             tlvdb_free(tlvRoot);
@@ -492,13 +500,14 @@ int CmdEMVAC(const char *cmd) {
     return 0;
 }
 
-int CmdEMVGenerateChallenge(const char *cmd) {
+int CmdEMVGenerateChallenge(const char *cmd)
+{
 
     CLIParserInit("emv challenge",
-        "Executes Generate Challenge command. It returns 4 or 8-byte random number from card.\nNeeds a EMV applet to be selected and GPO to be executed.",
-        "Usage:\n\temv challenge -> get challenge\n\temv challenge -k -> get challenge, keep fileld ON\n");
+                  "Executes Generate Challenge command. It returns 4 or 8-byte random number from card.\nNeeds a EMV applet to be selected and GPO to be executed.",
+                  "Usage:\n\temv challenge -> get challenge\n\temv challenge -k -> get challenge, keep fileld ON\n");
 
-    void* argtable[] = {
+    void *argtable[] = {
         arg_param_begin,
         arg_lit0("kK",  "keep",    "keep field ON for next command"),
         arg_lit0("aA",  "apdu",    "show APDU reqests and responses"),
@@ -537,20 +546,21 @@ int CmdEMVGenerateChallenge(const char *cmd) {
     return 0;
 }
 
-int CmdEMVInternalAuthenticate(const char *cmd) {
+int CmdEMVInternalAuthenticate(const char *cmd)
+{
     uint8_t data[APDU_RES_LEN] = {0};
     int datalen = 0;
 
     CLIParserInit("emv intauth",
-        "Generate Internal Authenticate command. Usually needs 4-byte random number. It returns data in TLV format .\n"
-        "Needs a EMV applet to be selected and GPO to be executed.",
+                  "Generate Internal Authenticate command. Usually needs 4-byte random number. It returns data in TLV format .\n"
+                  "Needs a EMV applet to be selected and GPO to be executed.",
 
-        "Usage:\n"
-        "\temv intauth -k 01020304 -> execute Internal Authenticate with 4-byte DDOLdata and keep field ON after command\n"
-            "\temv intauth -t 01020304 -> execute Internal Authenticate with 4-byte DDOL data, show result in TLV\n"
-            "\temv intauth -pmt 9F 37 04 -> load params from file, make DDOL data from DDOL, Internal Authenticate with DDOL, show result in TLV");
+                  "Usage:\n"
+                  "\temv intauth -k 01020304 -> execute Internal Authenticate with 4-byte DDOLdata and keep field ON after command\n"
+                  "\temv intauth -t 01020304 -> execute Internal Authenticate with 4-byte DDOL data, show result in TLV\n"
+                  "\temv intauth -pmt 9F 37 04 -> load params from file, make DDOL data from DDOL, Internal Authenticate with DDOL, show result in TLV");
 
-    void* argtable[] = {
+    void *argtable[] = {
         arg_param_begin,
         arg_lit0("kK",  "keep",    "keep field ON for next command"),
         arg_lit0("pP",  "params",  "load parameters from `emv/defparams.json` file for DDOLdata making from DDOL and parameters"),
@@ -600,7 +610,7 @@ int CmdEMVInternalAuthenticate(const char *cmd) {
 
         tmp_ext = tlvdb_external(0x9f49, datalen, data);
         ddol_data_tlv = dol_process((const struct tlv *)tmp_ext, tlvRoot, 0x01); // 0x01 - dummy tag
-        if (!ddol_data_tlv){
+        if (!ddol_data_tlv) {
             PrintAndLogEx(ERR, "Can't create DDOL TLV.");
             tlvdb_free(tmp_ext);
             tlvdb_free(tlvRoot);
@@ -641,7 +651,8 @@ int CmdEMVInternalAuthenticate(const char *cmd) {
 
 #define dreturn(n) {free(pdol_data_tlv); tlvdb_free(tlvSelect); tlvdb_free(tlvRoot); DropFieldEx( channel ); return n;}
 
-void InitTransactionParameters(struct tlvdb *tlvRoot, bool paramLoadJSON, enum TransactionType TrType, bool GenACGPO) {
+void InitTransactionParameters(struct tlvdb *tlvRoot, bool paramLoadJSON, enum TransactionType TrType, bool GenACGPO)
+{
 
     ParamLoadDefaults(tlvRoot);
 
@@ -655,7 +666,7 @@ void InitTransactionParameters(struct tlvdb *tlvRoot, bool paramLoadJSON, enum T
     if (GenACGPO) {
         qVSDC = "\x26\x80\x00\x00";
     }
-    switch(TrType) {
+    switch (TrType) {
         case TT_MSD:
             TLV_ADD(0x9F66, "\x86\x00\x00\x00"); // MSD
             break;
@@ -674,9 +685,10 @@ void InitTransactionParameters(struct tlvdb *tlvRoot, bool paramLoadJSON, enum T
     }
 }
 
-void ProcessGPOResponseFormat1(struct tlvdb *tlvRoot, uint8_t *buf, size_t len, bool decodeTLV) {
+void ProcessGPOResponseFormat1(struct tlvdb *tlvRoot, uint8_t *buf, size_t len, bool decodeTLV)
+{
     if (buf[0] == 0x80) {
-        if (decodeTLV){
+        if (decodeTLV) {
             PrintAndLog("GPO response format1:");
             TLVPrintFromBuffer(buf, len);
         }
@@ -685,15 +697,15 @@ void ProcessGPOResponseFormat1(struct tlvdb *tlvRoot, uint8_t *buf, size_t len,
             PrintAndLogEx(ERR, "GPO response format1 parsing error. length=%d", len);
         } else {
             // AIP
-            struct tlvdb * f1AIP = tlvdb_fixed(0x82, 2, buf + 2);
+            struct tlvdb *f1AIP = tlvdb_fixed(0x82, 2, buf + 2);
             tlvdb_add(tlvRoot, f1AIP);
-            if (decodeTLV){
+            if (decodeTLV) {
                 PrintAndLogEx(INFO, "\n* * Decode response format 1 (0x80) AIP and AFL:");
                 TLVPrintFromTLV(f1AIP);
             }
 
             // AFL
-            struct tlvdb * f1AFL = tlvdb_fixed(0x94, len - 4, buf + 2 + 2);
+            struct tlvdb *f1AFL = tlvdb_fixed(0x94, len - 4, buf + 2 + 2);
             tlvdb_add(tlvRoot, f1AFL);
             if (decodeTLV)
                 TLVPrintFromTLV(f1AFL);
@@ -704,9 +716,10 @@ void ProcessGPOResponseFormat1(struct tlvdb *tlvRoot, uint8_t *buf, size_t len,
     }
 }
 
-void ProcessACResponseFormat1(struct tlvdb *tlvRoot, uint8_t *buf, size_t len, bool decodeTLV) {
+void ProcessACResponseFormat1(struct tlvdb *tlvRoot, uint8_t *buf, size_t len, bool decodeTLV)
+{
     if (buf[0] == 0x80) {
-        if (decodeTLV){
+        if (decodeTLV) {
             PrintAndLog("GPO response format1:");
             TLVPrintFromBuffer(buf, len);
         }
@@ -748,7 +761,8 @@ void ProcessACResponseFormat1(struct tlvdb *tlvRoot, uint8_t *buf, size_t len, b
     }
 }
 
-int CmdEMVExec(const char *cmd) {
+int CmdEMVExec(const char *cmd)
+{
     uint8_t buf[APDU_RES_LEN] = {0};
     size_t len = 0;
     uint16_t sw = 0;
@@ -764,12 +778,12 @@ int CmdEMVExec(const char *cmd) {
     struct tlv *pdol_data_tlv = NULL;
 
     CLIParserInit("emv exec",
-        "Executes EMV contactless transaction",
-        "Usage:\n"
-            "\temv exec -sat -> select card, execute MSD transaction, show APDU and TLV\n"
-            "\temv exec -satc -> select card, execute CDA transaction, show APDU and TLV\n");
+                  "Executes EMV contactless transaction",
+                  "Usage:\n"
+                  "\temv exec -sat -> select card, execute MSD transaction, show APDU and TLV\n"
+                  "\temv exec -satc -> select card, execute CDA transaction, show APDU and TLV\n");
 
-    void* argtable[] = {
+    void *argtable[] = {
         arg_param_begin,
         arg_lit0("sS",  "select",   "activate field and select card."),
         arg_lit0("aA",  "apdu",     "show APDU reqests and responses."),
@@ -810,7 +824,7 @@ int CmdEMVExec(const char *cmd) {
 
 #ifndef WITH_SMARTCARD
     // not compiled with smartcard functionality,  we need to exit
-    if ( channel == ECC_CONTACT ) {
+    if (channel == ECC_CONTACT) {
         PrintAndLogEx(WARNING, "PM3 Client is not compiled with support for SMARTCARD. Exiting.");
         return 0;
     }
@@ -880,7 +894,7 @@ int CmdEMVExec(const char *cmd) {
 
     PrintAndLogEx(NORMAL, "\n* Calc PDOL.");
     pdol_data_tlv = dol_process(tlvdb_get(tlvRoot, 0x9f38, NULL), tlvRoot, 0x83);
-    if (!pdol_data_tlv){
+    if (!pdol_data_tlv) {
         PrintAndLogEx(WARNING, "Error: can't create PDOL TLV.");
         dreturn(4);
     }
@@ -1019,7 +1033,7 @@ int CmdEMVExec(const char *cmd) {
     // transaction check
 
     // qVSDC
-    if (TrType == TT_QVSDCMCHIP || TrType == TT_CDA){
+    if (TrType == TT_QVSDCMCHIP || TrType == TT_CDA) {
         // 9F26: Application Cryptogram
         const struct tlv *AC = tlvdb_get(tlvRoot, 0x9F26, NULL);
         if (AC) {
@@ -1043,7 +1057,7 @@ int CmdEMVExec(const char *cmd) {
                         PrintAndLogEx(NORMAL, "\tKey index:  0x%02x", IAD->value[1]);
                         PrintAndLogEx(NORMAL, "\tCrypto ver: 0x%02x(%03d)", IAD->value[2], IAD->value[2]);
                         PrintAndLogEx(NORMAL, "\tCVR:", sprint_hex(&IAD->value[3], IAD->value[0] - 2));
-                        struct tlvdb * cvr = tlvdb_fixed(0x20, IAD->value[0] - 2, &IAD->value[3]);
+                        struct tlvdb *cvr = tlvdb_fixed(0x20, IAD->value[0] - 2, &IAD->value[3]);
                         TLVPrintFromTLVLev(cvr, 1);
                     }
                 } else {
@@ -1057,7 +1071,7 @@ int CmdEMVExec(const char *cmd) {
     }
 
     // Mastercard M/CHIP
-    if (GetCardPSVendor(AID, AIDlen) == CV_MASTERCARD && (TrType == TT_QVSDCMCHIP || TrType == TT_CDA)){
+    if (GetCardPSVendor(AID, AIDlen) == CV_MASTERCARD && (TrType == TT_QVSDCMCHIP || TrType == TT_CDA)) {
         const struct tlv *CDOL1 = tlvdb_get(tlvRoot, 0x8c, NULL);
         if (CDOL1 && GetCardPSVendor(AID, AIDlen) == CV_MASTERCARD) { // and m/chip transaction flag
             PrintAndLogEx(NORMAL, "\n--> Mastercard M/Chip transaction.");
@@ -1074,7 +1088,7 @@ int CmdEMVExec(const char *cmd) {
             }
 
             // ICC Dynamic Number
-            struct tlvdb * ICCDynN = tlvdb_fixed(0x9f4c, len, buf);
+            struct tlvdb *ICCDynN = tlvdb_fixed(0x9f4c, len, buf);
             tlvdb_add(tlvRoot, ICCDynN);
             if (decodeTLV) {
                 PrintAndLogEx(NORMAL, "\n* * ICC Dynamic Number:");
@@ -1120,7 +1134,7 @@ int CmdEMVExec(const char *cmd) {
                 emv_tag_dump(CID, stdout, 0);
                 PrintAndLogEx(NORMAL, "------------------------------");
                 if (CID->len > 0) {
-                    switch(CID->value[0] & EMVAC_AC_MASK){
+                    switch (CID->value[0] & EMVAC_AC_MASK) {
                         case EMVAC_AAC:
                             PrintAndLogEx(NORMAL, "Transaction DECLINED.");
                             break;
@@ -1202,7 +1216,7 @@ int CmdEMVExec(const char *cmd) {
     }
 
     // VSDC
-    if (GetCardPSVendor(AID, AIDlen) == CV_VISA && (TrType == TT_VSDC || TrType == TT_CDA)){
+    if (GetCardPSVendor(AID, AIDlen) == CV_VISA && (TrType == TT_VSDC || TrType == TT_CDA)) {
         PrintAndLogEx(NORMAL, "\n--> VSDC transaction.");
 
         PrintAndLogEx(NORMAL, "* * Calc CDOL1");
@@ -1323,18 +1337,18 @@ int CmdEMVExec(const char *cmd) {
 
             // here must be AC2, but we dont make external authenticate (
 
-/*          // AC2
-            PRINT_INDENT(level);
-            if ((CID & EMVAC_AC2_MASK) == EMVAC_AAC2)     fprintf(f, "\tAC2: AAC (Transaction declined)\n");
-            if ((CID & EMVAC_AC2_MASK) == EMVAC_TC2)      fprintf(f, "\tAC2: TC (Transaction approved)\n");
-            if ((CID & EMVAC_AC2_MASK) == EMVAC_ARQC2)    fprintf(f, "\tAC2: not requested (ARQC)\n");
-            if ((CID & EMVAC_AC2_MASK) == EMVAC_AC2_MASK) fprintf(f, "\tAC2: RFU\n");
-*/
+            /*          // AC2
+                        PRINT_INDENT(level);
+                        if ((CID & EMVAC_AC2_MASK) == EMVAC_AAC2)     fprintf(f, "\tAC2: AAC (Transaction declined)\n");
+                        if ((CID & EMVAC_AC2_MASK) == EMVAC_TC2)      fprintf(f, "\tAC2: TC (Transaction approved)\n");
+                        if ((CID & EMVAC_AC2_MASK) == EMVAC_ARQC2)    fprintf(f, "\tAC2: not requested (ARQC)\n");
+                        if ((CID & EMVAC_AC2_MASK) == EMVAC_AC2_MASK) fprintf(f, "\tAC2: RFU\n");
+            */
         }
 
     }
 
-    DropFieldEx( channel );
+    DropFieldEx(channel);
 
     // Destroy TLV's
     free(pdol_data_tlv);
@@ -1345,7 +1359,8 @@ int CmdEMVExec(const char *cmd) {
     return 0;
 }
 
-int CmdEMVScan(const char *cmd) {
+int CmdEMVScan(const char *cmd)
+{
     uint8_t AID[APDU_AID_LEN] = {0};
     size_t AIDlen = 0;
     uint8_t buf[APDU_RES_LEN] = {0};
@@ -1356,12 +1371,12 @@ int CmdEMVScan(const char *cmd) {
     json_error_t error;
 
     CLIParserInit("emv scan",
-        "Scan EMV card and save it contents to a file.",
-        "It executes EMV contactless transaction and saves result to a file which can be used for emulation\n"
-            "Usage:\n\temv scan -at -> scan MSD transaction mode and show APDU and TLV\n"
-            "\temv scan -c -> scan CDA transaction mode\n");
+                  "Scan EMV card and save it contents to a file.",
+                  "It executes EMV contactless transaction and saves result to a file which can be used for emulation\n"
+                  "Usage:\n\temv scan -at -> scan MSD transaction mode and show APDU and TLV\n"
+                  "\temv scan -c -> scan CDA transaction mode\n");
 
-    void* argtable[] = {
+    void *argtable[] = {
         arg_param_begin,
         arg_lit0("aA",  "apdu",     "show APDU reqests and responses."),
         arg_lit0("tT",  "tlv",      "TLV decode results."),
@@ -1399,7 +1414,7 @@ int CmdEMVScan(const char *cmd) {
         channel = ECC_CONTACT;
     PrintChannel(channel);
     uint8_t psenum = (channel == ECC_CONTACT) ? 1 : 2;
-    uint8_t relfname[250] ={0};
+    uint8_t relfname[250] = {0};
     char *crelfname = (char *)relfname;
     int relfnamelen = 0;
     CLIGetStrWithReturn(12, relfname, &relfnamelen);
@@ -1407,7 +1422,7 @@ int CmdEMVScan(const char *cmd) {
 
 #ifndef WITH_SMARTCARD
     // not compiled with smartcard functionality,  we need to exit
-    if ( channel == ECC_CONTACT ) {
+    if (channel == ECC_CONTACT) {
         PrintAndLogEx(WARNING, "PM3 Client is not compiled with support for SMARTCARD. Exiting.");
         return 0;
     }
@@ -1438,7 +1453,7 @@ int CmdEMVScan(const char *cmd) {
     }
 
     // drop field at start
-    DropFieldEx( channel );
+    DropFieldEx(channel);
 
     JsonSaveStr(root, "$.File.Created", "proxmark3 `emv scan`");
 
@@ -1478,7 +1493,7 @@ int CmdEMVScan(const char *cmd) {
     PrintAndLogEx(NORMAL, "--> PPSE.");
     res = EMVSelectPSE(channel, true, true, 2, buf, sizeof(buf), &len, &sw);
 
-    if (!res && sw == 0x9000){
+    if (!res && sw == 0x9000) {
         if (decodeTLV)
             TLVPrintFromBuffer(buf, len);
 
@@ -1505,7 +1520,7 @@ int CmdEMVScan(const char *cmd) {
         if (EMVSearch(channel, false, true, decodeTLV, tlvSelect)) {
             PrintAndLogEx(ERR, "Can't found any of EMV AID. Exit...");
             tlvdb_free(tlvSelect);
-            DropFieldEx( channel );
+            DropFieldEx(channel);
             return 3;
         }
 
@@ -1521,7 +1536,7 @@ int CmdEMVScan(const char *cmd) {
 
     if (!AIDlen) {
         PrintAndLogEx(INFO, "Can't select AID. EMV AID not found. Exit...");
-        DropFieldEx( channel );
+        DropFieldEx(channel);
         return 4;
     }
 
@@ -1540,7 +1555,7 @@ int CmdEMVScan(const char *cmd) {
     if (res) {
         PrintAndLogEx(ERR, "Can't select AID (%d). Exit...", res);
         tlvdb_free(tlvRoot);
-        DropFieldEx( channel );
+        DropFieldEx(channel);
         return 5;
     }
 
@@ -1565,10 +1580,10 @@ int CmdEMVScan(const char *cmd) {
 
     PrintAndLogEx(NORMAL, "-->Calc PDOL.");
     struct tlv *pdol_data_tlv = dol_process(tlvdb_get(tlvRoot, 0x9f38, NULL), tlvRoot, 0x83);
-    if (!pdol_data_tlv){
+    if (!pdol_data_tlv) {
         PrintAndLogEx(ERR, "Can't create PDOL TLV.");
         tlvdb_free(tlvRoot);
-        DropFieldEx( channel );
+        DropFieldEx(channel);
         return 6;
     }
 
@@ -1577,7 +1592,7 @@ int CmdEMVScan(const char *cmd) {
     if (!pdol_data_tlv_data) {
         PrintAndLogEx(ERR, "Can't create PDOL data.");
         tlvdb_free(tlvRoot);
-        DropFieldEx( channel );
+        DropFieldEx(channel);
         return 6;
     }
     PrintAndLogEx(INFO, "PDOL data[%d]: %s", pdol_data_tlv_data_len, sprint_hex(pdol_data_tlv_data, pdol_data_tlv_data_len));
@@ -1591,7 +1606,7 @@ int CmdEMVScan(const char *cmd) {
     if (res) {
         PrintAndLogEx(ERR, "GPO error(%d): %4x. Exit...", res, sw);
         tlvdb_free(tlvRoot);
-        DropFieldEx( channel );
+        DropFieldEx(channel);
         return 7;
     }
     ProcessGPOResponseFormat1(tlvRoot, buf, len, decodeTLV);
@@ -1610,7 +1625,7 @@ int CmdEMVScan(const char *cmd) {
     PrintAndLogEx(INFO, "-->Read records from AFL.");
     const struct tlv *AFL = tlvdb_get(tlvRoot, 0x94, NULL);
 
-    while(AFL && AFL->len) {
+    while (AFL && AFL->len) {
         if (AFL->len % 4) {
             PrintAndLogEx(ERR, "Wrong AFL length: %d", AFL->len);
             break;
@@ -1639,7 +1654,7 @@ int CmdEMVScan(const char *cmd) {
                 continue;
             }
 
-            for(int n = SFIstart; n <= SFIend; n++) {
+            for (int n = SFIstart; n <= SFIend; n++) {
                 PrintAndLogEx(INFO, "---->SFI[%02x] %d", SFI, n);
 
                 res = EMVReadRecord(channel, true, SFI, n, buf, sizeof(buf), &len, &sw, tlvRoot);
@@ -1683,7 +1698,7 @@ int CmdEMVScan(const char *cmd) {
     // free tlv object
     tlvdb_free(tlvRoot);
 
-    DropFieldEx( channel );
+    DropFieldEx(channel);
 
     res = json_dump_file(root, fname, JSON_INDENT(2));
     if (res) {
@@ -1698,15 +1713,18 @@ int CmdEMVScan(const char *cmd) {
     return 0;
 }
 
-int CmdEMVList(const char *Cmd) {
+int CmdEMVList(const char *Cmd)
+{
     return CmdTraceList("7816");
 }
 
-int CmdEMVTest(const char *cmd) {
+int CmdEMVTest(const char *cmd)
+{
     return ExecuteCryptoTests(true);
 }
 
-int CmdEMVRoca(const char *cmd) {
+int CmdEMVRoca(const char *cmd)
+{
     uint8_t AID[APDU_AID_LEN] = {0};
     size_t AIDlen = 0;
     uint8_t buf[APDU_RES_LEN] = {0};
@@ -1715,13 +1733,13 @@ int CmdEMVRoca(const char *cmd) {
     int res;
 
     CLIParserInit("emv roca",
-        "Tries to extract public keys and run the ROCA test against them.\n",
-        "Usage:\n"
-            "\temv roca -w -> select --CONTACT-- card and run test\n"
-            "\temv roca -> select --CONTACTLESS-- card and run test\n"
-            );
+                  "Tries to extract public keys and run the ROCA test against them.\n",
+                  "Usage:\n"
+                  "\temv roca -w -> select --CONTACT-- card and run test\n"
+                  "\temv roca -> select --CONTACTLESS-- card and run test\n"
+                 );
 
-    void* argtable[] = {
+    void *argtable[] = {
         arg_param_begin,
         arg_lit0("tT",  "selftest",   "self test"),
         arg_lit0("wW",  "wired",   "Send data via contact (iso7816) interface. Contactless interface set by default."),
@@ -1740,7 +1758,7 @@ int CmdEMVRoca(const char *cmd) {
 
 #ifndef WITH_SMARTCARD
     // not compiled with smartcard functionality,  we need to exit
-    if ( channel == ECC_CONTACT ) {
+    if (channel == ECC_CONTACT) {
         PrintAndLogEx(WARNING, "PM3 Client is not compiled with support for SMARTCARD. Exiting.");
         return 0;
     }
@@ -1768,7 +1786,7 @@ int CmdEMVRoca(const char *cmd) {
         if (EMVSearch(channel, false, true, false, tlvSelect)) {
             PrintAndLogEx(ERR, "Can't found any of EMV AID. Exit...");
             tlvdb_free(tlvSelect);
-            DropFieldEx( channel );
+            DropFieldEx(channel);
             return 3;
         }
 
@@ -1784,7 +1802,7 @@ int CmdEMVRoca(const char *cmd) {
 
     if (!AIDlen) {
         PrintAndLogEx(INFO, "Can't select AID. EMV AID not found. Exit...");
-        DropFieldEx( channel );
+        DropFieldEx(channel);
         return 4;
     }
 
@@ -1799,7 +1817,7 @@ int CmdEMVRoca(const char *cmd) {
     if (res) {
         PrintAndLogEx(ERR, "Can't select AID (%d). Exit...", res);
         tlvdb_free(tlvRoot);
-        DropFieldEx( channel );
+        DropFieldEx(channel);
         return 5;
     }
 
@@ -1808,10 +1826,10 @@ int CmdEMVRoca(const char *cmd) {
 
     PrintAndLogEx(NORMAL, "-->Calc PDOL.");
     struct tlv *pdol_data_tlv = dol_process(tlvdb_get(tlvRoot, 0x9f38, NULL), tlvRoot, 0x83);
-    if (!pdol_data_tlv){
+    if (!pdol_data_tlv) {
         PrintAndLogEx(ERR, "Can't create PDOL TLV.");
         tlvdb_free(tlvRoot);
-        DropFieldEx( channel );
+        DropFieldEx(channel);
         return 6;
     }
 
@@ -1820,7 +1838,7 @@ int CmdEMVRoca(const char *cmd) {
     if (!pdol_data_tlv_data) {
         PrintAndLogEx(ERR, "Can't create PDOL data.");
         tlvdb_free(tlvRoot);
-        DropFieldEx( channel );
+        DropFieldEx(channel);
         free(pdol_data_tlv);
         return 6;
     }
@@ -1835,7 +1853,7 @@ int CmdEMVRoca(const char *cmd) {
     if (res) {
         PrintAndLogEx(ERR, "GPO error(%d): %4x. Exit...", res, sw);
         tlvdb_free(tlvRoot);
-        DropFieldEx( channel );
+        DropFieldEx(channel);
         return 7;
     }
     ProcessGPOResponseFormat1(tlvRoot, buf, len, false);
@@ -1843,7 +1861,7 @@ int CmdEMVRoca(const char *cmd) {
     PrintAndLogEx(INFO, "-->Read records from AFL.");
     const struct tlv *AFL = tlvdb_get(tlvRoot, 0x94, NULL);
 
-    while(AFL && AFL->len) {
+    while (AFL && AFL->len) {
         if (AFL->len % 4) {
             PrintAndLogEx(ERR, "Wrong AFL length: %d", AFL->len);
             break;
@@ -1861,7 +1879,7 @@ int CmdEMVRoca(const char *cmd) {
                 continue;
             }
 
-            for(int n = SFIstart; n <= SFIend; n++) {
+            for (int n = SFIstart; n <= SFIend; n++) {
                 PrintAndLogEx(INFO, "---->SFI[%02x] %d", SFI, n);
 
                 res = EMVReadRecord(channel, true, SFI, n, buf, sizeof(buf), &len, &sw, tlvRoot);
@@ -1894,10 +1912,10 @@ int CmdEMVRoca(const char *cmd) {
         }
 
         PrintAndLogEx(SUCCESS, "Issuer PK recovered. RID %s IDX %02hhx CSN %s",
-                sprint_hex(issuer_pk->rid, 5),
-                issuer_pk->index,
-                sprint_hex(issuer_pk->serial, 3)
-                );
+                      sprint_hex(issuer_pk->rid, 5),
+                      issuer_pk->index,
+                      sprint_hex(issuer_pk->serial, 3)
+                     );
 
 
         struct emv_pk *icc_pk = emv_pki_recover_icc_cert(issuer_pk, tlvRoot, NULL);
@@ -1908,10 +1926,10 @@ int CmdEMVRoca(const char *cmd) {
             goto out;
         }
         PrintAndLogEx(SUCCESS, "ICC PK recovered. RID %s IDX %02hhx CSN %s\n",
-                sprint_hex(icc_pk->rid, 5),
-                icc_pk->index,
-                sprint_hex(icc_pk->serial, 3)
-                );
+                      sprint_hex(icc_pk->rid, 5),
+                      icc_pk->index,
+                      sprint_hex(icc_pk->serial, 3)
+                     );
 
         PrintAndLogEx(INFO, "ICC pk modulus: %s", sprint_hex_inrow(icc_pk->modulus, icc_pk->mlen));
 
@@ -1933,7 +1951,7 @@ out:
     // free tlv object
     tlvdb_free(tlvRoot);
 
-    DropFieldEx( channel );
+    DropFieldEx(channel);
     return 0;
 }
 
@@ -1962,13 +1980,15 @@ static command_t CommandTable[] =  {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdEMV(const char *Cmd) {
+int CmdEMV(const char *Cmd)
+{
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
+int CmdHelp(const char *Cmd)
+{
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/emv/crypto_polarssl.c b/client/emv/crypto_polarssl.c
index cac8734fa..9a4e57e4f 100644
--- a/client/emv/crypto_polarssl.c
+++ b/client/emv/crypto_polarssl.c
@@ -104,7 +104,7 @@ static struct crypto_pk *crypto_pk_polarssl_open_rsa(va_list vl)
     mbedtls_mpi_read_binary(&cp->ctx.E, (const unsigned char *)exp, explen);
 
     int res = mbedtls_rsa_check_pubkey(&cp->ctx);
-    if(res != 0) {
+    if (res != 0) {
         fprintf(stderr, "PolarSSL public key error res=%x exp=%d mod=%d.\n", res * -1, explen, modlen);
         free(cp);
         return NULL;
@@ -138,18 +138,18 @@ static struct crypto_pk *crypto_pk_polarssl_open_priv_rsa(va_list vl)
     mbedtls_rsa_init(&cp->ctx, MBEDTLS_RSA_PKCS_V15, 0);
 
     cp->ctx.len = modlen; // size(N) in bytes
-    mbedtls_mpi_read_binary(&cp->ctx.N,  (const unsigned char *)mod, modlen);
-    mbedtls_mpi_read_binary(&cp->ctx.E,  (const unsigned char *)exp, explen);
+    mbedtls_mpi_read_binary(&cp->ctx.N, (const unsigned char *)mod, modlen);
+    mbedtls_mpi_read_binary(&cp->ctx.E, (const unsigned char *)exp, explen);
 
-    mbedtls_mpi_read_binary(&cp->ctx.D,  (const unsigned char *)d, dlen);
-    mbedtls_mpi_read_binary(&cp->ctx.P,  (const unsigned char *)p, plen);
-    mbedtls_mpi_read_binary(&cp->ctx.Q,  (const unsigned char *)q, qlen);
+    mbedtls_mpi_read_binary(&cp->ctx.D, (const unsigned char *)d, dlen);
+    mbedtls_mpi_read_binary(&cp->ctx.P, (const unsigned char *)p, plen);
+    mbedtls_mpi_read_binary(&cp->ctx.Q, (const unsigned char *)q, qlen);
     mbedtls_mpi_read_binary(&cp->ctx.DP, (const unsigned char *)dp, dplen);
     mbedtls_mpi_read_binary(&cp->ctx.DQ, (const unsigned char *)dq, dqlen);
     mbedtls_mpi_inv_mod(&cp->ctx.QP, &cp->ctx.Q, &cp->ctx.P);
 
     int res = mbedtls_rsa_check_privkey(&cp->ctx);
-    if(res != 0) {
+    if (res != 0) {
         fprintf(stderr, "PolarSSL private key error res=%x exp=%d mod=%d.\n", res * -1, explen, modlen);
         free(cp);
         return NULL;
@@ -158,13 +158,14 @@ static struct crypto_pk *crypto_pk_polarssl_open_priv_rsa(va_list vl)
     return &cp->cp;
 }
 
-static int myrand(void *rng_state, unsigned char *output, size_t len) {
+static int myrand(void *rng_state, unsigned char *output, size_t len)
+{
     size_t i;
 
-    if(rng_state != NULL)
+    if (rng_state != NULL)
         rng_state = NULL;
 
-    for( i = 0; i < len; ++i )
+    for (i = 0; i < len; ++i)
         output[i] = rand();
 
     return 0;
@@ -217,7 +218,7 @@ static unsigned char *crypto_pk_polarssl_encrypt(const struct crypto_pk *_cp, co
     }
 
     res = mbedtls_rsa_public(&cp->ctx, buf, result);
-    if(res) {
+    if (res) {
         printf("RSA encrypt failed. Error: %x data len: %zd key len: %zd\n", res * -1, len, keylen);
         free(result);
         return NULL;
@@ -244,7 +245,7 @@ static unsigned char *crypto_pk_polarssl_decrypt(const struct crypto_pk *_cp, co
     }
 
     res = mbedtls_rsa_private(&cp->ctx, NULL, NULL, buf, result); // CHECK???
-    if(res) {
+    if (res) {
         printf("RSA decrypt failed. Error: %x data len: %zd key len: %zd\n", res * -1, len, keylen);
         free(result);
         return NULL;
@@ -260,14 +261,14 @@ static size_t crypto_pk_polarssl_get_nbits(const struct crypto_pk *_cp)
     struct crypto_pk_polarssl *cp = (struct crypto_pk_polarssl *)_cp;
 
     return cp->ctx.len * 8;
-return 0;
+    return 0;
 }
 
 static unsigned char *crypto_pk_polarssl_get_parameter(const struct crypto_pk *_cp, unsigned param, size_t *plen)
 {
     struct crypto_pk_polarssl *cp = (struct crypto_pk_polarssl *)_cp;
     unsigned char *result = NULL;
-    switch(param){
+    switch (param) {
         // mod
         case 0:
             *plen = mbedtls_mpi_size(&cp->ctx.N);
diff --git a/client/emv/dump.c b/client/emv/dump.c
index 93e59dfd0..ca0b1f09c 100644
--- a/client/emv/dump.c
+++ b/client/emv/dump.c
@@ -51,7 +51,7 @@ void dump_buffer(const unsigned char *ptr, size_t len, FILE *f, int level)
         }
         fprintf(f, " |");
         for (j = 0; j < 16 && i + j < len; j++) {
-            fprintf(f, "%c", (ptr[i+j] >= 0x20 && ptr[i+j] < 0x7f) ? ptr[i+j] : '.' );
+            fprintf(f, "%c", (ptr[i + j] >= 0x20 && ptr[i + j] < 0x7f) ? ptr[i + j] : '.');
         }
         fprintf(f, "\n");
     }
diff --git a/client/emv/emv_pk.c b/client/emv/emv_pk.c
index d1fa3359d..4f2f2669c 100644
--- a/client/emv/emv_pk.c
+++ b/client/emv/emv_pk.c
@@ -31,12 +31,12 @@
 #include <sys/types.h>
 
 #define BCD(c) (((c) >= '0' && (c) <= '9') ? ((c) - '0') : \
-        -1)
+                -1)
 
 #define HEX(c) (((c) >= '0' && (c) <= '9') ? ((c) - '0') : \
-        ((c) >= 'A' && (c) <= 'F') ? ((c) - 'A' + 10) : \
-        ((c) >= 'a' && (c) <= 'f') ? ((c) - 'a' + 10) : \
-        -1)
+                ((c) >= 'A' && (c) <= 'F') ? ((c) - 'A' + 10) : \
+                ((c) >= 'a' && (c) <= 'f') ? ((c) - 'a' + 10) : \
+                -1)
 
 #define TOHEX(v) ((v) < 10 ? (v) + '0' : (v) - 10 + 'a')
 
@@ -180,8 +180,8 @@ struct emv_pk *emv_pk_parse_pk(char *buf)
         goto out;
     buf += l;
 
-    r->modulus = malloc(2048/8);
-    l = emv_pk_read_bin(buf, r->modulus, 2048/8, &r->mlen);
+    r->modulus = malloc(2048 / 8);
+    l = emv_pk_read_bin(buf, r->modulus, 2048 / 8, &r->mlen);
     if (l <= 0)
         goto out2;
     buf += l;
@@ -270,9 +270,9 @@ char *emv_pk_dump_pk(const struct emv_pk *pk)
     out[outpos++] = TOHEX((pk->expire >> 20) & 0xf);
     out[outpos++] = TOHEX((pk->expire >> 16) & 0xf);
     out[outpos++] = TOHEX((pk->expire >> 12) & 0xf);
-    out[outpos++] = TOHEX((pk->expire >> 8 ) & 0xf);
-    out[outpos++] = TOHEX((pk->expire >> 4 ) & 0xf);
-    out[outpos++] = TOHEX((pk->expire >> 0 ) & 0xf);
+    out[outpos++] = TOHEX((pk->expire >> 8) & 0xf);
+    out[outpos++] = TOHEX((pk->expire >> 4) & 0xf);
+    out[outpos++] = TOHEX((pk->expire >> 0) & 0xf);
     out[outpos++] = ' ';
 
     if (pk->pk_algo == PK_RSA) {
@@ -321,7 +321,7 @@ char *emv_pk_dump_pk(const struct emv_pk *pk)
         goto err;
     outpos += rc;
 
-    out[outpos-1] = '\0';
+    out[outpos - 1] = '\0';
 
     return out;
 
@@ -389,10 +389,10 @@ void emv_pk_free(struct emv_pk *pk)
 }
 
 static struct emv_pk *emv_pk_get_ca_pk_from_file(const char *fname,
-        const unsigned char *rid,
-        unsigned char idx)
+                                                 const unsigned char *rid,
+                                                 unsigned char idx)
 {
-    if  (!fname)
+    if (!fname)
         return NULL;
 
     FILE *f = fopen(fname, "r");
@@ -431,13 +431,13 @@ char *emv_pk_get_ca_pk_file(const char *dirname, const unsigned char *rid, unsig
 
     char *filename;
     int ret = asprintf(&filename, "%s/%02hhx%02hhx%02hhx%02hhx%02hhx_%02hhx.0",
-            dirname,
-            rid[0],
-            rid[1],
-            rid[2],
-            rid[3],
-            rid[4],
-            idx);
+                       dirname,
+                       rid[0],
+                       rid[1],
+                       rid[2],
+                       rid[3],
+                       rid[4],
+                       idx);
 
     if (ret <= 0)
         return NULL;
@@ -452,12 +452,12 @@ char *emv_pk_get_ca_pk_rid_file(const char *dirname, const unsigned char *rid)
 
     char *filename;
     int ret = asprintf(&filename, "%s/%02hhx%02hhx%02hhx%02hhx%02hhx.pks",
-            dirname,
-            rid[0],
-            rid[1],
-            rid[2],
-            rid[3],
-            rid[4]);
+                       dirname,
+                       rid[0],
+                       rid[1],
+                       rid[2],
+                       rid[3],
+                       rid[4]);
 
     if (ret <= 0)
         return NULL;
@@ -469,22 +469,22 @@ struct emv_pk *emv_pk_get_ca_pk(const unsigned char *rid, unsigned char idx)
 {
     struct emv_pk *pk = NULL;
 
-/*  if (!pk) {
-        char *fname = emv_pk_get_ca_pk_file(NULL, rid, idx);
-        if (fname) {
-            pk = emv_pk_get_ca_pk_from_file(fname, rid, idx);
-            free(fname);
+    /*  if (!pk) {
+            char *fname = emv_pk_get_ca_pk_file(NULL, rid, idx);
+            if (fname) {
+                pk = emv_pk_get_ca_pk_from_file(fname, rid, idx);
+                free(fname);
+            }
         }
-    }
 
-    if (!pk) {
-        char *fname = emv_pk_get_ca_pk_rid_file(NULL, rid);
-        if (fname) {
-            pk = emv_pk_get_ca_pk_from_file(fname, rid, idx);
-            free(fname);
+        if (!pk) {
+            char *fname = emv_pk_get_ca_pk_rid_file(NULL, rid);
+            if (fname) {
+                pk = emv_pk_get_ca_pk_from_file(fname, rid, idx);
+                free(fname);
+            }
         }
-    }
-*/
+    */
     if (!pk) {
         const char *relfname = "emv/capk.txt";
 
@@ -498,13 +498,13 @@ struct emv_pk *emv_pk_get_ca_pk(const unsigned char *rid, unsigned char idx)
         return NULL;
 
     printf("Verifying CA PK for %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx %zd bits...",
-                pk->rid[0],
-                pk->rid[1],
-                pk->rid[2],
-                pk->rid[3],
-                pk->rid[4],
-                pk->index,
-                pk->mlen * 8);
+           pk->rid[0],
+           pk->rid[1],
+           pk->rid[2],
+           pk->rid[3],
+           pk->rid[4],
+           pk->index,
+           pk->mlen * 8);
     if (emv_pk_verify(pk)) {
         printf("OK\n");
 
diff --git a/client/emv/emv_pki.c b/client/emv/emv_pki.c
index 5854ef103..614ffd27b 100644
--- a/client/emv/emv_pki.c
+++ b/client/emv/emv_pki.c
@@ -28,7 +28,8 @@
 #include <stdarg.h>
 
 static bool strictExecution = true;
-void PKISetStrictExecution(bool se) {
+void PKISetStrictExecution(bool se)
+{
     strictExecution = se;
 }
 
@@ -38,12 +39,12 @@ static const struct tlv empty_tlv = {.tag = 0x0, .len = 0, .value = empty_tlv_va
 static size_t emv_pki_hash_psn[256] = { 0, 0, 11, 2, 17, 2, };
 
 static unsigned char *emv_pki_decode_message(const struct emv_pk *enc_pk,
-        uint8_t msgtype,
-        size_t *len,
-        const struct tlv *cert_tlv,
-        int tlv_count,
-        ... /* A list of tlv pointers */
-        )
+                                             uint8_t msgtype,
+                                             size_t *len,
+                                             const struct tlv *cert_tlv,
+                                             int tlv_count,
+                                             ... /* A list of tlv pointers */
+                                            )
 {
     struct crypto_pk *kcp;
     unsigned char *data;
@@ -63,27 +64,27 @@ static unsigned char *emv_pki_decode_message(const struct emv_pk *enc_pk,
         return NULL;
     }
     kcp = crypto_pk_open(enc_pk->pk_algo,
-            enc_pk->modulus, enc_pk->mlen,
-            enc_pk->exp, enc_pk->elen);
+                         enc_pk->modulus, enc_pk->mlen,
+                         enc_pk->exp, enc_pk->elen);
     if (!kcp)
         return NULL;
 
     data = crypto_pk_encrypt(kcp, cert_tlv->value, cert_tlv->len, &data_len);
     crypto_pk_close(kcp);
 
-/*  if (true){
-        printf("Recovered data:\n");
-        dump_buffer(data, data_len, stdout, 0);
-    }*/
+    /*  if (true){
+            printf("Recovered data:\n");
+            dump_buffer(data, data_len, stdout, 0);
+        }*/
 
-    if (data[data_len-1] != 0xbc || data[0] != 0x6a || data[1] != msgtype) {
+    if (data[data_len - 1] != 0xbc || data[0] != 0x6a || data[1] != msgtype) {
         printf("ERROR: Certificate format\n");
         free(data);
         return NULL;
     }
 
     size_t hash_pos = emv_pki_hash_psn[msgtype];
-    if (hash_pos == 0 || hash_pos > data_len){
+    if (hash_pos == 0 || hash_pos > data_len) {
         printf("ERROR: Cant get hash position in the certificate\n");
         free(data);
         return NULL;
@@ -115,8 +116,8 @@ static unsigned char *emv_pki_decode_message(const struct emv_pk *enc_pk,
     memcpy(hash, crypto_hash_read(ch), hash_len);
     if (memcmp(data + data_len - 1 - hash_len, hash, hash_len)) {
         printf("ERROR: Calculated wrong hash\n");
-        printf("decoded:    %s\n",sprint_hex(data + data_len - 1 - hash_len, hash_len));
-        printf("calculated: %s\n",sprint_hex(hash, hash_len));
+        printf("decoded:    %s\n", sprint_hex(data + data_len - 1 - hash_len, hash_len));
+        printf("calculated: %s\n", sprint_hex(hash, hash_len));
 
         if (strictExecution) {
             crypto_hash_close(ch);
@@ -163,15 +164,15 @@ static unsigned char emv_cn_get(const struct tlv *tlv, unsigned pos)
 }
 
 static struct emv_pk *emv_pki_decode_key_ex(const struct emv_pk *enc_pk,
-        unsigned char msgtype,
-        const struct tlv *pan_tlv,
-        const struct tlv *cert_tlv,
-        const struct tlv *exp_tlv,
-        const struct tlv *rem_tlv,
-        const struct tlv *add_tlv,
-        const struct tlv *sdatl_tlv,
-        bool showData
-        )
+                                            unsigned char msgtype,
+                                            const struct tlv *pan_tlv,
+                                            const struct tlv *cert_tlv,
+                                            const struct tlv *exp_tlv,
+                                            const struct tlv *rem_tlv,
+                                            const struct tlv *add_tlv,
+                                            const struct tlv *sdatl_tlv,
+                                            bool showData
+                                           )
 {
     size_t pan_length;
     unsigned char *data;
@@ -194,19 +195,19 @@ static struct emv_pk *emv_pki_decode_key_ex(const struct emv_pk *enc_pk,
     }
 
     data = emv_pki_decode_message(enc_pk, msgtype, &data_len,
-            cert_tlv,
-            5,
-            rem_tlv,
-            exp_tlv,
-            add_tlv,
-            sdatl_tlv,
-            NULL);
+                                  cert_tlv,
+                                  5,
+                                  rem_tlv,
+                                  exp_tlv,
+                                  add_tlv,
+                                  sdatl_tlv,
+                                  NULL);
     if (!data || data_len < 11 + pan_length) {
         printf("ERROR: Can't decode message\n");
         return NULL;
     }
 
-    if (showData){
+    if (showData) {
         printf("Recovered data:\n");
         dump_buffer(data, data_len, stdout, 0);
     }
@@ -265,9 +266,9 @@ static struct emv_pk *emv_pki_decode_key_ex(const struct emv_pk *enc_pk,
     memset(pk->pan + pan_length, 0xff, 10 - pan_length);
 
     memcpy(pk->modulus, data + 11 + pan_length,
-            pk_len < data_len - (11 + pan_length) ?
-            pk_len :
-            data_len - (11 + pan_length));
+           pk_len < data_len - (11 + pan_length) ?
+           pk_len :
+           data_len - (11 + pan_length));
     memcpy(pk->modulus + data_len - (11 + pan_length), rem_tlv->value, rem_tlv->len);
     memcpy(pk->exp, exp_tlv->value, exp_tlv->len);
 
@@ -277,26 +278,27 @@ static struct emv_pk *emv_pki_decode_key_ex(const struct emv_pk *enc_pk,
 }
 
 static struct emv_pk *emv_pki_decode_key(const struct emv_pk *enc_pk,
-        unsigned char msgtype,
-        const struct tlv *pan_tlv,
-        const struct tlv *cert_tlv,
-        const struct tlv *exp_tlv,
-        const struct tlv *rem_tlv,
-        const struct tlv *add_tlv,
-        const struct tlv *sdatl_tlv
-        ) {
+                                         unsigned char msgtype,
+                                         const struct tlv *pan_tlv,
+                                         const struct tlv *cert_tlv,
+                                         const struct tlv *exp_tlv,
+                                         const struct tlv *rem_tlv,
+                                         const struct tlv *add_tlv,
+                                         const struct tlv *sdatl_tlv
+                                        )
+{
     return emv_pki_decode_key_ex(enc_pk, msgtype, pan_tlv, cert_tlv, exp_tlv, rem_tlv, add_tlv, sdatl_tlv, false);
 }
 
 struct emv_pk *emv_pki_recover_issuer_cert(const struct emv_pk *pk, struct tlvdb *db)
 {
     return emv_pki_decode_key(pk, 2,
-            tlvdb_get(db, 0x5a, NULL),
-            tlvdb_get(db, 0x90, NULL),
-            tlvdb_get(db, 0x9f32, NULL),
-            tlvdb_get(db, 0x92, NULL),
-            NULL,
-            NULL);
+                              tlvdb_get(db, 0x5a, NULL),
+                              tlvdb_get(db, 0x90, NULL),
+                              tlvdb_get(db, 0x9f32, NULL),
+                              tlvdb_get(db, 0x92, NULL),
+                              NULL,
+                              NULL);
 }
 
 struct emv_pk *emv_pki_recover_icc_cert(const struct emv_pk *pk, struct tlvdb *db, const struct tlv *sda_tlv)
@@ -310,12 +312,12 @@ struct emv_pk *emv_pki_recover_icc_cert(const struct emv_pk *pk, struct tlvdb *d
     };
 
     struct emv_pk *res = emv_pki_decode_key(pk, 4,
-            tlvdb_get(db, 0x5a, NULL),
-            tlvdb_get(db, 0x9f46, NULL),
-            tlvdb_get(db, 0x9f47, NULL),
-            tlvdb_get(db, 0x9f48, NULL),
-            sda_tlv,
-            &sda_tdata);
+                                            tlvdb_get(db, 0x5a, NULL),
+                                            tlvdb_get(db, 0x9f46, NULL),
+                                            tlvdb_get(db, 0x9f47, NULL),
+                                            tlvdb_get(db, 0x9f48, NULL),
+                                            sda_tlv,
+                                            &sda_tdata);
 
     free(sdatl); // malloc here: emv_pki_sdatl_fill
     return res;
@@ -324,15 +326,16 @@ struct emv_pk *emv_pki_recover_icc_cert(const struct emv_pk *pk, struct tlvdb *d
 struct emv_pk *emv_pki_recover_icc_pe_cert(const struct emv_pk *pk, struct tlvdb *db)
 {
     return emv_pki_decode_key(pk, 4,
-            tlvdb_get(db, 0x5a, NULL),
-            tlvdb_get(db, 0x9f2d, NULL),
-            tlvdb_get(db, 0x9f2e, NULL),
-            tlvdb_get(db, 0x9f2f, NULL),
-            NULL,
-            NULL);
+                              tlvdb_get(db, 0x5a, NULL),
+                              tlvdb_get(db, 0x9f2d, NULL),
+                              tlvdb_get(db, 0x9f2e, NULL),
+                              tlvdb_get(db, 0x9f2f, NULL),
+                              NULL,
+                              NULL);
 }
 
-unsigned char *emv_pki_sdatl_fill(const struct tlvdb *db, size_t *sdatl_len) {
+unsigned char *emv_pki_sdatl_fill(const struct tlvdb *db, size_t *sdatl_len)
+{
     uint8_t buf[2048] = {0};
     size_t len = 0;
 
@@ -376,33 +379,35 @@ struct tlvdb *emv_pki_recover_dac_ex(const struct emv_pk *enc_pk, const struct t
     };
 
     unsigned char *data = emv_pki_decode_message(enc_pk, 3, &data_len,
-            tlvdb_get(db, 0x93, NULL),
-            3,
-            sda_tlv,
-            &sda_tdata,
-            NULL);
+                                                 tlvdb_get(db, 0x93, NULL),
+                                                 3,
+                                                 sda_tlv,
+                                                 &sda_tdata,
+                                                 NULL);
 
     free(sdatl); // malloc here: emv_pki_sdatl_fill
 
     if (!data || data_len < 5)
         return NULL;
 
-    if (showData){
+    if (showData) {
         printf("Recovered data:\n");
         dump_buffer(data, data_len, stdout, 0);
     }
 
-    struct tlvdb *dac_db = tlvdb_fixed(0x9f45, 2, data+3);
+    struct tlvdb *dac_db = tlvdb_fixed(0x9f45, 2, data + 3);
 
     free(data);
 
     return dac_db;
 }
-struct tlvdb *emv_pki_recover_dac(const struct emv_pk *enc_pk, const struct tlvdb *db, const struct tlv *sda_tlv) {
+struct tlvdb *emv_pki_recover_dac(const struct emv_pk *enc_pk, const struct tlvdb *db, const struct tlv *sda_tlv)
+{
     return emv_pki_recover_dac_ex(enc_pk, db, sda_tlv, false);
 }
 
-struct tlvdb *emv_pki_recover_idn(const struct emv_pk *enc_pk, const struct tlvdb *db, const struct tlv *dyn_tlv) {
+struct tlvdb *emv_pki_recover_idn(const struct emv_pk *enc_pk, const struct tlvdb *db, const struct tlv *dyn_tlv)
+{
     return emv_pki_recover_idn_ex(enc_pk, db, dyn_tlv, false);
 }
 
@@ -410,10 +415,10 @@ struct tlvdb *emv_pki_recover_idn_ex(const struct emv_pk *enc_pk, const struct t
 {
     size_t data_len;
     unsigned char *data = emv_pki_decode_message(enc_pk, 5, &data_len,
-            tlvdb_get(db, 0x9f4b, NULL),
-            2,
-            dyn_tlv,
-            NULL);
+                                                 tlvdb_get(db, 0x9f4b, NULL),
+                                                 2,
+                                                 dyn_tlv,
+                                                 NULL);
 
     if (!data || data_len < 3)
         return NULL;
@@ -423,7 +428,7 @@ struct tlvdb *emv_pki_recover_idn_ex(const struct emv_pk *enc_pk, const struct t
         return NULL;
     }
 
-    if (showData){
+    if (showData) {
         printf("Recovered data:\n");
         dump_buffer(data, data_len, stdout, 0);
     }
@@ -446,13 +451,13 @@ struct tlvdb *emv_pki_recover_atc_ex(const struct emv_pk *enc_pk, const struct t
 {
     size_t data_len;
     unsigned char *data = emv_pki_decode_message(enc_pk, 5, &data_len,
-            tlvdb_get(db, 0x9f4b, NULL),
-            5,
-            tlvdb_get(db, 0x9f37, NULL),
-            tlvdb_get(db, 0x9f02, NULL),
-            tlvdb_get(db, 0x5f2a, NULL),
-            tlvdb_get(db, 0x9f69, NULL),
-            NULL);
+                                                 tlvdb_get(db, 0x9f4b, NULL),
+                                                 5,
+                                                 tlvdb_get(db, 0x9f37, NULL),
+                                                 tlvdb_get(db, 0x9f02, NULL),
+                                                 tlvdb_get(db, 0x5f2a, NULL),
+                                                 tlvdb_get(db, 0x9f69, NULL),
+                                                 NULL);
 
     if (!data || data_len < 3)
         return NULL;
@@ -462,7 +467,7 @@ struct tlvdb *emv_pki_recover_atc_ex(const struct emv_pk *enc_pk, const struct t
         return NULL;
     }
 
-    if (showData){
+    if (showData) {
         printf("Recovered data:\n");
         dump_buffer(data, data_len, stdout, 0);
     }
@@ -501,19 +506,19 @@ static bool tlv_hash(void *data, const struct tlv *tlv, int level, bool is_leaf)
 }
 
 struct tlvdb *emv_pki_perform_cda(const struct emv_pk *enc_pk, const struct tlvdb *db,
-        const struct tlvdb *this_db,
-        const struct tlv *pdol_data_tlv,
-        const struct tlv *crm1_tlv,
-        const struct tlv *crm2_tlv)
+                                  const struct tlvdb *this_db,
+                                  const struct tlv *pdol_data_tlv,
+                                  const struct tlv *crm1_tlv,
+                                  const struct tlv *crm2_tlv)
 {
     return emv_pki_perform_cda_ex(enc_pk, db, this_db, pdol_data_tlv, crm1_tlv, crm2_tlv, false);
 }
 struct tlvdb *emv_pki_perform_cda_ex(const struct emv_pk *enc_pk, const struct tlvdb *db,
-        const struct tlvdb *this_db,     // AC TLV result
-        const struct tlv *pdol_data_tlv, // PDOL
-        const struct tlv *crm1_tlv,      // CDOL1
-        const struct tlv *crm2_tlv,      // CDOL2
-        bool showData)
+                                     const struct tlvdb *this_db,     // AC TLV result
+                                     const struct tlv *pdol_data_tlv, // PDOL
+                                     const struct tlv *crm1_tlv,      // CDOL1
+                                     const struct tlv *crm2_tlv,      // CDOL2
+                                     bool showData)
 {
     const struct tlv *un_tlv = tlvdb_get(db, 0x9f37, NULL);
     const struct tlv *cid_tlv = tlvdb_get(this_db, 0x9f27, NULL);
@@ -523,16 +528,16 @@ struct tlvdb *emv_pki_perform_cda_ex(const struct emv_pk *enc_pk, const struct t
 
     size_t data_len = 0;
     unsigned char *data = emv_pki_decode_message(enc_pk, 5, &data_len,
-            tlvdb_get(this_db, 0x9f4b, NULL),
-            2,
-            un_tlv,
-            NULL);
+                                                 tlvdb_get(this_db, 0x9f4b, NULL),
+                                                 2,
+                                                 un_tlv,
+                                                 NULL);
     if (!data || data_len < 3) {
         printf("ERROR: can't decode message. len %zu\n", data_len);
         return NULL;
     }
 
-    if (showData){
+    if (showData) {
         printf("Recovered data:\n");
         dump_buffer(data, data_len, stdout, 0);
     }
diff --git a/client/emv/emv_pki.h b/client/emv/emv_pki.h
index df7fe9d50..6cc4a97d1 100644
--- a/client/emv/emv_pki.h
+++ b/client/emv/emv_pki.h
@@ -34,15 +34,15 @@ struct tlvdb *emv_pki_recover_idn(const struct emv_pk *pk, const struct tlvdb *d
 struct tlvdb *emv_pki_recover_idn_ex(const struct emv_pk *pk, const struct tlvdb *db, const struct tlv *dyn_tlv, bool showData);
 struct tlvdb *emv_pki_recover_atc_ex(const struct emv_pk *enc_pk, const struct tlvdb *db, bool showData);
 struct tlvdb *emv_pki_perform_cda(const struct emv_pk *enc_pk, const struct tlvdb *db,
-        const struct tlvdb *this_db,
-        const struct tlv *pdol_data_tlv,
-        const struct tlv *crm1_tlv,
-        const struct tlv *crm2_tlv);
+                                  const struct tlvdb *this_db,
+                                  const struct tlv *pdol_data_tlv,
+                                  const struct tlv *crm1_tlv,
+                                  const struct tlv *crm2_tlv);
 struct tlvdb *emv_pki_perform_cda_ex(const struct emv_pk *enc_pk, const struct tlvdb *db,
-        const struct tlvdb *this_db,
-        const struct tlv *pdol_data_tlv,
-        const struct tlv *crm1_tlv,
-        const struct tlv *crm2_tlv,
-        bool showData);
+                                     const struct tlvdb *this_db,
+                                     const struct tlv *pdol_data_tlv,
+                                     const struct tlv *crm1_tlv,
+                                     const struct tlv *crm2_tlv,
+                                     bool showData);
 
 #endif
diff --git a/client/emv/emv_pki_priv.c b/client/emv/emv_pki_priv.c
index ec78f508a..418d922df 100644
--- a/client/emv/emv_pki_priv.c
+++ b/client/emv/emv_pki_priv.c
@@ -25,8 +25,8 @@
 #include <stdarg.h>
 
 struct emv_pk *emv_pki_make_ca(const struct crypto_pk *cp,
-        const unsigned char *rid, unsigned char index,
-        unsigned int expire, enum crypto_algo_hash hash_algo)
+                               const unsigned char *rid, unsigned char index,
+                               unsigned int expire, enum crypto_algo_hash hash_algo)
 {
     size_t modlen, explen;
     unsigned char *mod, *exp;
@@ -82,10 +82,10 @@ struct emv_pk *emv_pki_make_ca(const struct crypto_pk *cp,
 }
 
 static struct tlvdb *emv_pki_sign_message(const struct crypto_pk *cp,
-        tlv_tag_t cert_tag, tlv_tag_t rem_tag,
-        const unsigned char *msg, size_t msg_len,
-        ... /* A list of tlv pointers, end with NULL */
-        )
+                                          tlv_tag_t cert_tag, tlv_tag_t rem_tag,
+                                          const unsigned char *msg, size_t msg_len,
+                                          ... /* A list of tlv pointers, end with NULL */
+                                         )
 {
     size_t tmp_len = (crypto_pk_get_nbits(cp) + 7) / 8;
     unsigned char *tmp = malloc(tmp_len);
@@ -168,14 +168,14 @@ static struct tlvdb *emv_pki_sign_message(const struct crypto_pk *cp,
 }
 
 static struct tlvdb *emv_pki_sign_key(const struct crypto_pk *cp,
-        struct emv_pk *ipk,
-        unsigned char msgtype,
-        size_t pan_len,
-        tlv_tag_t cert_tag,
-        tlv_tag_t exp_tag,
-        tlv_tag_t rem_tag,
-        const struct tlv *add_tlv
-        )
+                                      struct emv_pk *ipk,
+                                      unsigned char msgtype,
+                                      size_t pan_len,
+                                      tlv_tag_t cert_tag,
+                                      tlv_tag_t exp_tag,
+                                      tlv_tag_t rem_tag,
+                                      const struct tlv *add_tlv
+                                     )
 {
     unsigned pos = 0;
     unsigned char *msg = malloc(1 + pan_len + 2 + 3 + 1 + 1 + 1 + 1 + ipk->mlen);
@@ -184,10 +184,12 @@ static struct tlvdb *emv_pki_sign_key(const struct crypto_pk *cp,
         return NULL;
 
     msg[pos++] = msgtype;
-    memcpy(msg + pos, ipk->pan, pan_len); pos += pan_len;
+    memcpy(msg + pos, ipk->pan, pan_len);
+    pos += pan_len;
     msg[pos++] = (ipk->expire >> 8) & 0xff;
     msg[pos++] = (ipk->expire >> 16) & 0xff;
-    memcpy(msg + pos, ipk->serial, 3); pos += 3;
+    memcpy(msg + pos, ipk->serial, 3);
+    pos += 3;
     msg[pos++] = ipk->hash_algo;
     msg[pos++] = ipk->pk_algo;
     msg[pos++] = ipk->mlen;
@@ -203,11 +205,11 @@ static struct tlvdb *emv_pki_sign_key(const struct crypto_pk *cp,
     }
 
     struct tlvdb *db = emv_pki_sign_message(cp,
-            cert_tag, rem_tag,
-            msg, pos,
-            tlvdb_get(exp_db, exp_tag, NULL),
-            add_tlv,
-            NULL);
+                                            cert_tag, rem_tag,
+                                            msg, pos,
+                                            tlvdb_get(exp_db, exp_tag, NULL),
+                                            add_tlv,
+                                            NULL);
     free(msg);
     if (!db)
         return NULL;
@@ -235,21 +237,21 @@ struct tlvdb *emv_pki_sign_icc_pe_cert(const struct crypto_pk *cp, struct emv_pk
 struct tlvdb *emv_pki_sign_dac(const struct crypto_pk *cp, const struct tlv *dac_tlv, const struct tlv *sda_tlv)
 {
     unsigned pos = 0;
-    unsigned char *msg = malloc(1+1+dac_tlv->len);
+    unsigned char *msg = malloc(1 + 1 + dac_tlv->len);
 
     if (!msg)
         return NULL;
 
     msg[pos++] = 3;
     msg[pos++] = HASH_SHA_1;
-    memcpy(msg+pos, dac_tlv->value, dac_tlv->len);
+    memcpy(msg + pos, dac_tlv->value, dac_tlv->len);
     pos += dac_tlv->len;
 
     struct tlvdb *db = emv_pki_sign_message(cp,
-            0x93, 0,
-            msg, pos,
-            sda_tlv,
-            NULL);
+                                            0x93, 0,
+                                            msg, pos,
+                                            sda_tlv,
+                                            NULL);
 
     free(msg);
 
@@ -259,7 +261,7 @@ struct tlvdb *emv_pki_sign_dac(const struct crypto_pk *cp, const struct tlv *dac
 struct tlvdb *emv_pki_sign_idn(const struct crypto_pk *cp, const struct tlv *idn_tlv, const struct tlv *dyn_tlv)
 {
     unsigned pos = 0;
-    unsigned char *msg = malloc(1+1+1+1+idn_tlv->len);
+    unsigned char *msg = malloc(1 + 1 + 1 + 1 + idn_tlv->len);
 
     if (!msg)
         return NULL;
@@ -268,14 +270,14 @@ struct tlvdb *emv_pki_sign_idn(const struct crypto_pk *cp, const struct tlv *idn
     msg[pos++] = HASH_SHA_1;
     msg[pos++] = idn_tlv->len + 1;
     msg[pos++] = idn_tlv->len;
-    memcpy(msg+pos, idn_tlv->value, idn_tlv->len);
+    memcpy(msg + pos, idn_tlv->value, idn_tlv->len);
     pos += idn_tlv->len;
 
     struct tlvdb *db = emv_pki_sign_message(cp,
-            0x9f4b, 0,
-            msg, pos,
-            dyn_tlv,
-            NULL);
+                                            0x9f4b, 0,
+                                            msg, pos,
+                                            dyn_tlv,
+                                            NULL);
 
     free(msg);
 
diff --git a/client/emv/emv_pki_priv.h b/client/emv/emv_pki_priv.h
index edb361947..8c8d1a813 100644
--- a/client/emv/emv_pki_priv.h
+++ b/client/emv/emv_pki_priv.h
@@ -23,8 +23,8 @@
 #include <stddef.h>
 
 struct emv_pk *emv_pki_make_ca(const struct crypto_pk *cp,
-        const unsigned char *rid, unsigned char index,
-        unsigned int expire, enum crypto_algo_hash hash_algo);
+                               const unsigned char *rid, unsigned char index,
+                               unsigned int expire, enum crypto_algo_hash hash_algo);
 struct tlvdb *emv_pki_sign_issuer_cert(const struct crypto_pk *cp, struct emv_pk *issuer_pk);
 struct tlvdb *emv_pki_sign_icc_cert(const struct crypto_pk *cp, struct emv_pk *icc_pk, const struct tlv *sda_tlv);
 struct tlvdb *emv_pki_sign_icc_pe_cert(const struct crypto_pk *cp, struct emv_pk *icc_pe_pk);
diff --git a/client/emv/emv_roca.c b/client/emv/emv_roca.c
index 7f58f3906..c28240eac 100644
--- a/client/emv/emv_roca.c
+++ b/client/emv/emv_roca.c
@@ -29,7 +29,8 @@ static uint8_t g_primes[ROCA_PRINTS_LENGTH] = {
 
 mbedtls_mpi g_prints[ROCA_PRINTS_LENGTH];
 
-void rocacheck_init(void) {
+void rocacheck_init(void)
+{
 
     for (int i = 0; i < ROCA_PRINTS_LENGTH; i++)
         mbedtls_mpi_init(&g_prints[i]);
@@ -53,12 +54,14 @@ void rocacheck_init(void) {
     mbedtls_mpi_read_string(&g_prints[16], 10, "126304807362733370595828809000324029340048915994");
 }
 
-void rocacheck_cleanup(void) {
+void rocacheck_cleanup(void)
+{
     for (int i = 0; i < ROCA_PRINTS_LENGTH; i++)
         mbedtls_mpi_free(&g_prints[i]);
 }
 
-int bitand_is_zero( mbedtls_mpi* a, mbedtls_mpi* b ) {
+int bitand_is_zero(mbedtls_mpi *a, mbedtls_mpi *b)
+{
 
     for (int i = 0; i < mbedtls_mpi_bitlen(a); i++) {
 
@@ -69,7 +72,8 @@ int bitand_is_zero( mbedtls_mpi* a, mbedtls_mpi* b ) {
 }
 
 
-mbedtls_mpi_uint mpi_get_uint(const mbedtls_mpi *X) {
+mbedtls_mpi_uint mpi_get_uint(const mbedtls_mpi *X)
+{
 
     if (X->n == 1 && X->s > 0) {
         return X->p[0];
@@ -78,7 +82,8 @@ mbedtls_mpi_uint mpi_get_uint(const mbedtls_mpi *X) {
     return 0;
 }
 
-void print_mpi(const char *msg, int radix, const mbedtls_mpi *X) {
+void print_mpi(const char *msg, int radix, const mbedtls_mpi *X)
+{
 
     char Xchar[400] = {0};
     size_t len = 0;
@@ -87,7 +92,8 @@ void print_mpi(const char *msg, int radix, const mbedtls_mpi *X) {
     printf("%s[%d] %s\n", msg, len, Xchar);
 }
 
-bool emv_rocacheck(const unsigned char *buf, size_t buflen, bool verbose) {
+bool emv_rocacheck(const unsigned char *buf, size_t buflen, bool verbose)
+{
 
     mbedtls_mpi t_modulus;
     mbedtls_mpi_init(&t_modulus);
@@ -96,7 +102,7 @@ bool emv_rocacheck(const unsigned char *buf, size_t buflen, bool verbose) {
 
     rocacheck_init();
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_read_binary(&t_modulus, buf, buflen) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_read_binary(&t_modulus, buf, buflen));
 
     for (int i = 0; i < ROCA_PRINTS_LENGTH; i++) {
 
@@ -108,13 +114,13 @@ bool emv_rocacheck(const unsigned char *buf, size_t buflen, bool verbose) {
         mbedtls_mpi_init(&t_prime);
         mbedtls_mpi_init(&g_one);
 
-        MBEDTLS_MPI_CHK( mbedtls_mpi_read_string(&g_one, 10, "1") );
+        MBEDTLS_MPI_CHK(mbedtls_mpi_read_string(&g_one, 10, "1"));
 
-        MBEDTLS_MPI_CHK( mbedtls_mpi_add_int(&t_prime, &t_prime, g_primes[i]) );
+        MBEDTLS_MPI_CHK(mbedtls_mpi_add_int(&t_prime, &t_prime, g_primes[i]));
 
-        MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi(&t_temp, &t_modulus, &t_prime) );
+        MBEDTLS_MPI_CHK(mbedtls_mpi_mod_mpi(&t_temp, &t_modulus, &t_prime));
 
-        MBEDTLS_MPI_CHK( mbedtls_mpi_shift_l(&g_one, mpi_get_uint(&t_temp)) );
+        MBEDTLS_MPI_CHK(mbedtls_mpi_shift_l(&g_one, mpi_get_uint(&t_temp)));
 
         if (bitand_is_zero(&g_one, &g_prints[i])) {
             if (verbose)
@@ -138,37 +144,37 @@ cleanup:
     return ret;
 }
 
-int roca_self_test(void) {
+int roca_self_test(void)
+{
     int ret = 0;
 
-    PrintAndLogEx(INFO, "ROCA check vulnerability tests" );
+    PrintAndLogEx(INFO, "ROCA check vulnerability tests");
 
     // positive
     uint8_t keyp[] = "\x94\x4e\x13\x20\x8a\x28\x0c\x37\xef\xc3\x1c\x31\x14\x48\x5e\x59"\
-                    "\x01\x92\xad\xbb\x8e\x11\xc8\x7c\xad\x60\xcd\xef\x00\x37\xce\x99"\
-                    "\x27\x83\x30\xd3\xf4\x71\xa2\x53\x8f\xa6\x67\x80\x2e\xd2\xa3\xc4"\
-                    "\x4a\x8b\x7d\xea\x82\x6e\x88\x8d\x0a\xa3\x41\xfd\x66\x4f\x7f\xa7";
+                     "\x01\x92\xad\xbb\x8e\x11\xc8\x7c\xad\x60\xcd\xef\x00\x37\xce\x99"\
+                     "\x27\x83\x30\xd3\xf4\x71\xa2\x53\x8f\xa6\x67\x80\x2e\xd2\xa3\xc4"\
+                     "\x4a\x8b\x7d\xea\x82\x6e\x88\x8d\x0a\xa3\x41\xfd\x66\x4f\x7f\xa7";
 
 
     if (emv_rocacheck(keyp, 64, false)) {
-        PrintAndLogEx(SUCCESS, "Weak modulus [ %s]", _GREEN_(PASS) );
-    }
-    else {
+        PrintAndLogEx(SUCCESS, "Weak modulus [ %s]", _GREEN_(PASS));
+    } else {
         ret++;
-        PrintAndLogEx(FAILED, "Weak modulus [ %s]", _RED_(FAIL) );
+        PrintAndLogEx(FAILED, "Weak modulus [ %s]", _RED_(FAIL));
     }
 
     // negative
     uint8_t keyn[] = "\x84\x4e\x13\x20\x8a\x28\x0c\x37\xef\xc3\x1c\x31\x14\x48\x5e\x59"\
-                    "\x01\x92\xad\xbb\x8e\x11\xc8\x7c\xad\x60\xcd\xef\x00\x37\xce\x99"\
-                    "\x27\x83\x30\xd3\xf4\x71\xa2\x53\x8f\xa6\x67\x80\x2e\xd2\xa3\xc4"\
-                    "\x4a\x8b\x7d\xea\x82\x6e\x88\x8d\x0a\xa3\x41\xfd\x66\x4f\x7f\xa7";
+                     "\x01\x92\xad\xbb\x8e\x11\xc8\x7c\xad\x60\xcd\xef\x00\x37\xce\x99"\
+                     "\x27\x83\x30\xd3\xf4\x71\xa2\x53\x8f\xa6\x67\x80\x2e\xd2\xa3\xc4"\
+                     "\x4a\x8b\x7d\xea\x82\x6e\x88\x8d\x0a\xa3\x41\xfd\x66\x4f\x7f\xa7";
 
     if (emv_rocacheck(keyn, 64, false)) {
         ret++;
-        PrintAndLogEx(FAILED, "Strong modulus [ %s]", _RED_(FAIL) );
+        PrintAndLogEx(FAILED, "Strong modulus [ %s]", _RED_(FAIL));
     } else {
-        PrintAndLogEx(SUCCESS, "Strong modulus [ %s]", _GREEN_(PASS) );
+        PrintAndLogEx(SUCCESS, "Strong modulus [ %s]", _GREEN_(PASS));
     }
 
     return ret;
diff --git a/client/emv/emv_roca.h b/client/emv/emv_roca.h
index a531ea101..2830ce9c5 100644
--- a/client/emv/emv_roca.h
+++ b/client/emv/emv_roca.h
@@ -31,8 +31,8 @@
 
 #define ROCA_PRINTS_LENGTH 17
 
-extern bool emv_rocacheck( const unsigned char *buf, size_t buflen, bool verbose );
-extern int roca_self_test( void );
+extern bool emv_rocacheck(const unsigned char *buf, size_t buflen, bool verbose);
+extern int roca_self_test(void);
 
 #endif
 
diff --git a/client/emv/emv_tags.c b/client/emv/emv_tags.c
index 9e7b3d2aa..9eadcd1f7 100644
--- a/client/emv/emv_tags.c
+++ b/client/emv/emv_tags.c
@@ -173,24 +173,24 @@ static const struct emv_tag_bit EMV_CVR[] = {
 // http://dexterous-programmer.blogspot.in/2012/05/emv-tags.html
 static const struct emv_tag emv_tags[] = {
     // internal
-    { 0x00  , "Unknown ???" },
-    { 0x01  , "", EMV_TAG_STRING }, // string for headers
-    { 0x02  , "Raw data" }, // data
-    { 0x06  , "Object Identifier (OID)" },
-    { 0x20  , "Cardholder Verification Results (CVR)", EMV_TAG_CVR }, // not standard!
-    { 0x21  , "Input list for Offline Data Authentication" }, // not standard! data for "Offline Data Authentication" come from "read records" command. (EMV book3 10.3)
+    { 0x00, "Unknown ???" },
+    { 0x01, "", EMV_TAG_STRING },   // string for headers
+    { 0x02, "Raw data" },   // data
+    { 0x06, "Object Identifier (OID)" },
+    { 0x20, "Cardholder Verification Results (CVR)", EMV_TAG_CVR },   // not standard!
+    { 0x21, "Input list for Offline Data Authentication" },   // not standard! data for "Offline Data Authentication" come from "read records" command. (EMV book3 10.3)
 
     // EMV
-    { 0x41  , "Country code and national data" },
-    { 0x42  , "Issuer Identification Number (IIN)" },
-    { 0x4f  , "Application Dedicated File (ADF) Name" },
-    { 0x50  , "Application Label", EMV_TAG_STRING },
-    { 0x51  , "File reference data element" },
-    { 0x52  , "Command APDU" },
-    { 0x53  , "Discretionary data (or template)" },
-    { 0x56  , "Track 1 Data" },
-    { 0x57  , "Track 2 Equivalent Data" },
-    { 0x5a  , "Application Primary Account Number (PAN)" },
+    { 0x41, "Country code and national data" },
+    { 0x42, "Issuer Identification Number (IIN)" },
+    { 0x4f, "Application Dedicated File (ADF) Name" },
+    { 0x50, "Application Label", EMV_TAG_STRING },
+    { 0x51, "File reference data element" },
+    { 0x52, "Command APDU" },
+    { 0x53, "Discretionary data (or template)" },
+    { 0x56, "Track 1 Data" },
+    { 0x57, "Track 2 Equivalent Data" },
+    { 0x5a, "Application Primary Account Number (PAN)" },
     { 0x5f20, "Cardholder Name", EMV_TAG_STRING },
     { 0x5f24, "Application Expiration Date", EMV_TAG_YYMMDD },
     { 0x5f25, "Application Effective Date", EMV_TAG_YYMMDD },
@@ -206,40 +206,40 @@ static const struct emv_tag emv_tags[] = {
     { 0x5f55, "Issuer Country Code (alpha2 format)", EMV_TAG_STRING },
     { 0x5f56, "Issuer Country Code (alpha3 format)", EMV_TAG_STRING },
 
-    { 0x61  , "Application Template" },
-    { 0x6f  , "File Control Information (FCI) Template" },
-    { 0x70  , "READ RECORD Response Message Template" },
-    { 0x71  , "Issues Script Template 1" },
-    { 0x72  , "Issues Script Template 2" },
-    { 0x73  , "Directory Discretionary Template" },
-    { 0x77  , "Response Message Template Format 2" },
-    { 0x80  , "Response Message Template Format 1" },
-    { 0x81  , "Amount, Authorised (Binary)" },
-    { 0x82  , "Application Interchange Profile", EMV_TAG_BITMASK, &EMV_AIP },
-    { 0x83  , "Command Template" },
-    { 0x84  , "Dedicated File (DF) Name" },
-    { 0x86  , "Issuer Script Command" },
-    { 0x87  , "Application Priority Indicator" },
-    { 0x88  , "Short File Identifier (SFI)" },
-    { 0x89  , "Authorisation Code" },
-    { 0x8a  , "Authorisation Response Code" },
-    { 0x8c  , "Card Risk Management Data Object List 1 (CDOL1)", EMV_TAG_DOL },
-    { 0x8d  , "Card Risk Management Data Object List 2 (CDOL2)", EMV_TAG_DOL },
-    { 0x8e  , "Cardholder Verification Method (CVM) List", EMV_TAG_CVM_LIST },
-    { 0x8f  , "Certification Authority Public Key Index" },
-    { 0x90  , "Issuer Public Key Certificate" },
-    { 0x91  , "Issuer Authentication Data" },
-    { 0x92  , "Issuer Public Key Remainder" },
-    { 0x93  , "Signed Static Application Data" },
-    { 0x94  , "Application File Locator (AFL)", EMV_TAG_AFL },
-    { 0x95  , "Terminal Verification Results" },
-    { 0x97  , "Transaction Certificate Data Object List (TDOL)" },
-    { 0x98  , "Transaction Certificate (TC) Hash Value" },
-    { 0x99  , "Transaction Personal Identification Number (PIN) Data" },
-    { 0x9a  , "Transaction Date", EMV_TAG_YYMMDD },
-    { 0x9b  , "Transaction Status Information" },
-    { 0x9c  , "Transaction Type", EMV_TAG_NUMERIC },
-    { 0x9d  , "Directory Definition File (DDF) Name" },
+    { 0x61, "Application Template" },
+    { 0x6f, "File Control Information (FCI) Template" },
+    { 0x70, "READ RECORD Response Message Template" },
+    { 0x71, "Issues Script Template 1" },
+    { 0x72, "Issues Script Template 2" },
+    { 0x73, "Directory Discretionary Template" },
+    { 0x77, "Response Message Template Format 2" },
+    { 0x80, "Response Message Template Format 1" },
+    { 0x81, "Amount, Authorised (Binary)" },
+    { 0x82, "Application Interchange Profile", EMV_TAG_BITMASK, &EMV_AIP },
+    { 0x83, "Command Template" },
+    { 0x84, "Dedicated File (DF) Name" },
+    { 0x86, "Issuer Script Command" },
+    { 0x87, "Application Priority Indicator" },
+    { 0x88, "Short File Identifier (SFI)" },
+    { 0x89, "Authorisation Code" },
+    { 0x8a, "Authorisation Response Code" },
+    { 0x8c, "Card Risk Management Data Object List 1 (CDOL1)", EMV_TAG_DOL },
+    { 0x8d, "Card Risk Management Data Object List 2 (CDOL2)", EMV_TAG_DOL },
+    { 0x8e, "Cardholder Verification Method (CVM) List", EMV_TAG_CVM_LIST },
+    { 0x8f, "Certification Authority Public Key Index" },
+    { 0x90, "Issuer Public Key Certificate" },
+    { 0x91, "Issuer Authentication Data" },
+    { 0x92, "Issuer Public Key Remainder" },
+    { 0x93, "Signed Static Application Data" },
+    { 0x94, "Application File Locator (AFL)", EMV_TAG_AFL },
+    { 0x95, "Terminal Verification Results" },
+    { 0x97, "Transaction Certificate Data Object List (TDOL)" },
+    { 0x98, "Transaction Certificate (TC) Hash Value" },
+    { 0x99, "Transaction Personal Identification Number (PIN) Data" },
+    { 0x9a, "Transaction Date", EMV_TAG_YYMMDD },
+    { 0x9b, "Transaction Status Information" },
+    { 0x9c, "Transaction Type", EMV_TAG_NUMERIC },
+    { 0x9d, "Directory Definition File (DDF) Name" },
 
     { 0x9f01, "Acquirer Identifier", EMV_TAG_NUMERIC },
     { 0x9f02, "Amount, Authorised (Numeric)", EMV_TAG_NUMERIC },
@@ -364,7 +364,7 @@ static const struct emv_tag emv_tags[] = {
     { 0x9f7d, "DS Summary 1" },
     { 0x9f7f, "DS Unpredictable Number" },
 
-    { 0xa5  , "File Control Information (FCI) Proprietary Template" },
+    { 0xa5, "File Control Information (FCI) Proprietary Template" },
     { 0xbf0c, "File Control Information (FCI) Issuer Discretionary Data" },
     { 0xdf20, "Issuer Proprietary Bitmap (IPB)" },
     { 0xdf4b, "POS Cardholder Interaction Information" },
@@ -424,20 +424,23 @@ static const struct emv_tag emv_tags[] = {
     { 0xff8106, "Discretionary Data" },
 };
 
-static int emv_sort_tag(tlv_tag_t tag) {
+static int emv_sort_tag(tlv_tag_t tag)
+{
     return (int)(tag >= 0x100 ? tag : tag << 8);
 }
 
-static int emv_tlv_compare(const void *a, const void *b) {
+static int emv_tlv_compare(const void *a, const void *b)
+{
     const struct tlv *tlv = a;
     const struct emv_tag *tag = b;
 
     return emv_sort_tag(tlv->tag) - (emv_sort_tag(tag->tag));
 }
 
-static const struct emv_tag *emv_get_tag(const struct tlv *tlv) {
-    struct emv_tag *tag = bsearch(tlv, emv_tags, sizeof(emv_tags)/sizeof(emv_tags[0]),
-            sizeof(emv_tags[0]), emv_tlv_compare);
+static const struct emv_tag *emv_get_tag(const struct tlv *tlv)
+{
+    struct emv_tag *tag = bsearch(tlv, emv_tags, sizeof(emv_tags) / sizeof(emv_tags[0]),
+                                  sizeof(emv_tags[0]), emv_tlv_compare);
 
     return tag ? tag : &emv_tags[0];
 }
@@ -453,7 +456,8 @@ static const char *bitstrings[] = {
     "1.......",
 };
 
-static void emv_tag_dump_bitmask(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level) {
+static void emv_tag_dump_bitmask(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level)
+{
     const struct emv_tag_bit *bits = tag->data;
     unsigned bit, byte;
 
@@ -462,7 +466,7 @@ static void emv_tag_dump_bitmask(const struct tlv *tlv, const struct emv_tag *ta
         PRINT_INDENT(level);
         fprintf(f, "\tByte %u (%02x)\n", byte, val);
         for (bit = 8; bit > 0; bit--, val <<= 1) {
-            if (val & 0x80){
+            if (val & 0x80) {
                 PRINT_INDENT(level);
                 fprintf(f, "\t\t%s - '%s'\n", bitstrings[bit - 1],
                         bits->bit == EMV_BIT(byte, bit) ? bits->name : "Unknown");
@@ -473,7 +477,8 @@ static void emv_tag_dump_bitmask(const struct tlv *tlv, const struct emv_tag *ta
     }
 }
 
-static void emv_tag_dump_dol(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level) {
+static void emv_tag_dump_dol(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level)
+{
     const unsigned char *buf = tlv->value;
     size_t left = tlv->len;
 
@@ -494,13 +499,15 @@ static void emv_tag_dump_dol(const struct tlv *tlv, const struct emv_tag *tag, F
     }
 }
 
-static void emv_tag_dump_string(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level) {
+static void emv_tag_dump_string(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level)
+{
     fprintf(f, "\tString value '");
     fwrite(tlv->value, 1, tlv->len, f);
     fprintf(f, "'\n");
 }
 
-static unsigned long emv_value_numeric(const struct tlv *tlv, unsigned start, unsigned end) {
+static unsigned long emv_value_numeric(const struct tlv *tlv, unsigned start, unsigned end)
+{
     unsigned long ret = 0;
     int i;
 
@@ -510,32 +517,34 @@ static unsigned long emv_value_numeric(const struct tlv *tlv, unsigned start, un
         return ret;
 
     if (start & 1) {
-        ret += tlv->value[start/2] & 0xf;
+        ret += tlv->value[start / 2] & 0xf;
         i = start + 1;
     } else
         i = start;
 
     for (; i < end - 1; i += 2) {
         ret *= 10;
-        ret += tlv->value[i/2] >> 4;
+        ret += tlv->value[i / 2] >> 4;
         ret *= 10;
-        ret += tlv->value[i/2] & 0xf;
+        ret += tlv->value[i / 2] & 0xf;
     }
 
     if (end & 1) {
         ret *= 10;
-        ret += tlv->value[end/2] >> 4;
+        ret += tlv->value[end / 2] >> 4;
     }
 
     return ret;
 }
 
-static void emv_tag_dump_numeric(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level) {
+static void emv_tag_dump_numeric(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level)
+{
     PRINT_INDENT(level);
     fprintf(f, "\tNumeric value %lu\n", emv_value_numeric(tlv, 0, tlv->len * 2));
 }
 
-static void emv_tag_dump_yymmdd(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level) {
+static void emv_tag_dump_yymmdd(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level)
+{
     PRINT_INDENT(level);
     fprintf(f, "\tDate: 20%02ld.%ld.%ld\n",
             emv_value_numeric(tlv, 0, 2),
@@ -543,12 +552,14 @@ static void emv_tag_dump_yymmdd(const struct tlv *tlv, const struct emv_tag *tag
             emv_value_numeric(tlv, 4, 6));
 }
 
-static uint32_t emv_get_binary(const unsigned char *S) {
+static uint32_t emv_get_binary(const unsigned char *S)
+{
     return (S[0] << 24) | (S[1] << 16) | (S[2] << 8) | (S[3] << 0);
 }
 
 // https://github.com/binaryfoo/emv-bertlv/blob/master/src/main/resources/fields/visa-cvr.txt
-static void emv_tag_dump_cvr(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level) {
+static void emv_tag_dump_cvr(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level)
+{
     if (!tlv || tlv->len < 1) {
         PRINT_INDENT(level);
         fprintf(f, "\tINVALID!\n");
@@ -612,7 +623,8 @@ static void emv_tag_dump_cvr(const struct tlv *tlv, const struct emv_tag *tag, F
 }
 
 // EMV Book 3
-static void emv_tag_dump_cid(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level) {
+static void emv_tag_dump_cid(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level)
+{
     if (!tlv || tlv->len < 1) {
         PRINT_INDENT(level);
         fprintf(f, "\tINVALID!\n");
@@ -633,7 +645,7 @@ static void emv_tag_dump_cid(const struct tlv *tlv, const struct emv_tag *tag, F
     if (tlv->value[0] & EMVCID_REASON_MASK) {
         PRINT_INDENT(level);
         fprintf(f, "\tReason/advice/referral code: ");
-        switch((tlv->value[0] & EMVCID_REASON_MASK)) {
+        switch ((tlv->value[0] & EMVCID_REASON_MASK)) {
             case 0:
                 fprintf(f, "No information given\n");
                 break;
@@ -653,7 +665,8 @@ static void emv_tag_dump_cid(const struct tlv *tlv, const struct emv_tag *tag, F
     }
 }
 
-static void emv_tag_dump_cvm_list(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level) {
+static void emv_tag_dump_cvm_list(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level)
+{
     uint32_t X, Y;
     int i;
 
@@ -671,87 +684,88 @@ static void emv_tag_dump_cvm_list(const struct tlv *tlv, const struct emv_tag *t
     PRINT_INDENT(level);
     fprintf(f, "\tY: %d\n", Y);
 
-    for (i = 8; i < tlv->len; i+= 2) {
+    for (i = 8; i < tlv->len; i += 2) {
         const char *method;
         const char *condition;
 
         switch (tlv->value[i] & 0x3f) {
-        case 0x0:
-            method = "Fail CVM processing";
-            break;
-        case 0x1:
-            method = "Plaintext PIN verification performed by ICC";
-            break;
-        case 0x2:
-            method = "Enciphered PIN verified online";
-            break;
-        case 0x3:
-            method = "Plaintext PIN verification performed by ICC and signature (paper)";
-            break;
-        case 0x4:
-            method = "Enciphered PIN verification performed by ICC";
-            break;
-        case 0x5:
-            method = "Enciphered PIN verification performed by ICC and signature (paper)";
-            break;
-        case 0x1e:
-            method = "Signature (paper)";
-            break;
-        case 0x1f:
-            method = "No CVM required";
-            break;
-        case 0x3f:
-            method = "NOT AVAILABLE!";
-            break;
-        default:
-            method = "Unknown";
-            break;
+            case 0x0:
+                method = "Fail CVM processing";
+                break;
+            case 0x1:
+                method = "Plaintext PIN verification performed by ICC";
+                break;
+            case 0x2:
+                method = "Enciphered PIN verified online";
+                break;
+            case 0x3:
+                method = "Plaintext PIN verification performed by ICC and signature (paper)";
+                break;
+            case 0x4:
+                method = "Enciphered PIN verification performed by ICC";
+                break;
+            case 0x5:
+                method = "Enciphered PIN verification performed by ICC and signature (paper)";
+                break;
+            case 0x1e:
+                method = "Signature (paper)";
+                break;
+            case 0x1f:
+                method = "No CVM required";
+                break;
+            case 0x3f:
+                method = "NOT AVAILABLE!";
+                break;
+            default:
+                method = "Unknown";
+                break;
         }
 
-        switch (tlv->value[i+1]) {
-        case 0x00:
-            condition = "Always";
-            break;
-        case 0x01:
-            condition = "If unattended cash";
-            break;
-        case 0x02:
-            condition = "If not unattended cash and not manual cash and not purchase with cashback";
-            break;
-        case 0x03:
-            condition = "If terminal supports the CVM";
-            break;
-        case 0x04:
-            condition = "If manual cash";
-            break;
-        case 0x05:
-            condition = "If purchase with cashback";
-            break;
-        case 0x06:
-            condition = "If transaction is in the application currency and is under X value";
-            break;
-        case 0x07:
-            condition = "If transaction is in the application currency and is over X value";
-            break;
-        case 0x08:
-            condition = "If transaction is in the application currency and is under Y value";
-            break;
-        case 0x09:
-            condition = "If transaction is in the application currency and is over Y value";
-            break;
-        default:
-            condition = "Unknown";
-            break;
+        switch (tlv->value[i + 1]) {
+            case 0x00:
+                condition = "Always";
+                break;
+            case 0x01:
+                condition = "If unattended cash";
+                break;
+            case 0x02:
+                condition = "If not unattended cash and not manual cash and not purchase with cashback";
+                break;
+            case 0x03:
+                condition = "If terminal supports the CVM";
+                break;
+            case 0x04:
+                condition = "If manual cash";
+                break;
+            case 0x05:
+                condition = "If purchase with cashback";
+                break;
+            case 0x06:
+                condition = "If transaction is in the application currency and is under X value";
+                break;
+            case 0x07:
+                condition = "If transaction is in the application currency and is over X value";
+                break;
+            case 0x08:
+                condition = "If transaction is in the application currency and is under Y value";
+                break;
+            case 0x09:
+                condition = "If transaction is in the application currency and is over Y value";
+                break;
+            default:
+                condition = "Unknown";
+                break;
         }
 
         PRINT_INDENT(level);
         fprintf(f, "\t%02x %02x: '%s' '%s' and '%s' if this CVM is unsuccessful\n",
-                tlv->value[i], tlv->value[i+1],
+                tlv->value[i], tlv->value[i + 1],
                 method, condition, (tlv->value[i] & 0x40) ? "continue" : "fail");
     }
 }
 
-static void emv_tag_dump_afl(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level) {
+static void emv_tag_dump_afl(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level)
+{
     if (tlv->len < 4 || tlv->len % 4) {
         PRINT_INDENT(level);
         fprintf(f, "\tINVALID!\n");
@@ -764,7 +778,8 @@ static void emv_tag_dump_afl(const struct tlv *tlv, const struct emv_tag *tag, F
     }
 }
 
-bool emv_tag_dump(const struct tlv *tlv, FILE *f, int level) {
+bool emv_tag_dump(const struct tlv *tlv, FILE *f, int level)
+{
     if (!tlv) {
         fprintf(f, "NULL\n");
         return false;
@@ -776,48 +791,49 @@ bool emv_tag_dump(const struct tlv *tlv, FILE *f, int level) {
     fprintf(f, "--%2hx[%02zx] '%s':", tlv->tag, tlv->len, tag->name);
 
     switch (tag->type) {
-    case EMV_TAG_GENERIC:
-        fprintf(f, "\n");
-        break;
-    case EMV_TAG_BITMASK:
-        fprintf(f, "\n");
-        emv_tag_dump_bitmask(tlv, tag, f, level);
-        break;
-    case EMV_TAG_DOL:
-        fprintf(f, "\n");
-        emv_tag_dump_dol(tlv, tag, f, level);
-        break;
-    case EMV_TAG_CVM_LIST:
-        fprintf(f, "\n");
-        emv_tag_dump_cvm_list(tlv, tag, f, level);
-        break;
-    case EMV_TAG_AFL:
-        fprintf(f, "\n");
-        emv_tag_dump_afl(tlv, tag, f, level);
-        break;
-    case EMV_TAG_STRING:
-        emv_tag_dump_string(tlv, tag, f, level);
-        break;
-    case EMV_TAG_NUMERIC:
-        emv_tag_dump_numeric(tlv, tag, f, level);
-        break;
-    case EMV_TAG_YYMMDD:
-        emv_tag_dump_yymmdd(tlv, tag, f, level);
-        break;
-    case EMV_TAG_CVR:
-        fprintf(f, "\n");
-        emv_tag_dump_cvr(tlv, tag, f, level);
-        break;
-    case EMV_TAG_CID:
-        fprintf(f, "\n");
-        emv_tag_dump_cid(tlv, tag, f, level);
-        break;
+        case EMV_TAG_GENERIC:
+            fprintf(f, "\n");
+            break;
+        case EMV_TAG_BITMASK:
+            fprintf(f, "\n");
+            emv_tag_dump_bitmask(tlv, tag, f, level);
+            break;
+        case EMV_TAG_DOL:
+            fprintf(f, "\n");
+            emv_tag_dump_dol(tlv, tag, f, level);
+            break;
+        case EMV_TAG_CVM_LIST:
+            fprintf(f, "\n");
+            emv_tag_dump_cvm_list(tlv, tag, f, level);
+            break;
+        case EMV_TAG_AFL:
+            fprintf(f, "\n");
+            emv_tag_dump_afl(tlv, tag, f, level);
+            break;
+        case EMV_TAG_STRING:
+            emv_tag_dump_string(tlv, tag, f, level);
+            break;
+        case EMV_TAG_NUMERIC:
+            emv_tag_dump_numeric(tlv, tag, f, level);
+            break;
+        case EMV_TAG_YYMMDD:
+            emv_tag_dump_yymmdd(tlv, tag, f, level);
+            break;
+        case EMV_TAG_CVR:
+            fprintf(f, "\n");
+            emv_tag_dump_cvr(tlv, tag, f, level);
+            break;
+        case EMV_TAG_CID:
+            fprintf(f, "\n");
+            emv_tag_dump_cid(tlv, tag, f, level);
+            break;
     };
 
     return true;
 }
 
-char *emv_get_tag_name(const struct tlv *tlv) {
+char *emv_get_tag_name(const struct tlv *tlv)
+{
     static char *defstr = "";
 
     if (!tlv)
diff --git a/client/emv/emvcore.c b/client/emv/emvcore.c
index b2fc430a2..dbe953b66 100644
--- a/client/emv/emvcore.c
+++ b/client/emv/emvcore.c
@@ -29,7 +29,7 @@ char *TransactionTypeStr[] = {
 
 typedef struct {
     enum CardPSVendor vendor;
-    const char* aid;
+    const char *aid;
 } TAIDList;
 
 static const TAIDList AIDlist [] = {
@@ -88,22 +88,24 @@ static const TAIDList AIDlist [] = {
     { CV_OTHER, "A0000005241010" },              // RuPay - RuPay
     { CV_OTHER, "D5780000021010" }               // Bankaxept - Bankaxept
 };
-static const size_t AIDlistLen = sizeof(AIDlist)/sizeof(TAIDList);
+static const size_t AIDlistLen = sizeof(AIDlist) / sizeof(TAIDList);
 
 static bool APDULogging = false;
-void SetAPDULogging(bool logging) {
+void SetAPDULogging(bool logging)
+{
     APDULogging = logging;
 }
 
-enum CardPSVendor GetCardPSVendor(uint8_t * AID, size_t AIDlen) {
+enum CardPSVendor GetCardPSVendor(uint8_t *AID, size_t AIDlen)
+{
     char buf[100] = {0};
     if (AIDlen < 1)
         return CV_NA;
 
     hex_to_buffer((uint8_t *)buf, AID, AIDlen, sizeof(buf) - 1, 0, 0, true);
 
-    for(int i = 0; i < AIDlistLen; i ++) {
-        if (strncmp(AIDlist[i].aid, buf, strlen(AIDlist[i].aid)) == 0){
+    for (int i = 0; i < AIDlistLen; i ++) {
+        if (strncmp(AIDlist[i].aid, buf, strlen(AIDlist[i].aid)) == 0) {
             return AIDlist[i].vendor;
         }
     }
@@ -111,7 +113,8 @@ enum CardPSVendor GetCardPSVendor(uint8_t * AID, size_t AIDlen) {
     return CV_NA;
 }
 
-static bool print_cb(void *data, const struct tlv *tlv, int level, bool is_leaf) {
+static bool print_cb(void *data, const struct tlv *tlv, int level, bool is_leaf)
+{
     emv_tag_dump(tlv, stdout, level);
     if (is_leaf) {
         dump_buffer(tlv->value, tlv->len, stdout, level);
@@ -120,7 +123,8 @@ static bool print_cb(void *data, const struct tlv *tlv, int level, bool is_leaf)
     return true;
 }
 
-bool TLVPrintFromBuffer(uint8_t *data, int datalen) {
+bool TLVPrintFromBuffer(uint8_t *data, int datalen)
+{
     struct tlvdb *t = NULL;
     t = tlvdb_parse_multi(data, datalen);
     if (t) {
@@ -135,18 +139,21 @@ bool TLVPrintFromBuffer(uint8_t *data, int datalen) {
     return false;
 }
 
-void TLVPrintFromTLVLev(struct tlvdb *tlv, int level) {
+void TLVPrintFromTLVLev(struct tlvdb *tlv, int level)
+{
     if (!tlv)
         return;
 
     tlvdb_visit(tlv, print_cb, NULL, level);
 }
 
-void TLVPrintFromTLV(struct tlvdb *tlv) {
+void TLVPrintFromTLV(struct tlvdb *tlv)
+{
     TLVPrintFromTLVLev(tlv, 0);
 }
 
-void TLVPrintAIDlistFromSelectTLV(struct tlvdb *tlv) {
+void TLVPrintAIDlistFromSelectTLV(struct tlvdb *tlv)
+{
     PrintAndLogEx(NORMAL, "|------------------|--------|-------------------------|");
     PrintAndLogEx(NORMAL, "|    AID           |Priority| Name                    |");
     PrintAndLogEx(NORMAL, "|------------------|--------|-------------------------|");
@@ -162,9 +169,9 @@ void TLVPrintAIDlistFromSelectTLV(struct tlvdb *tlv) {
         if (!tgAID)
             break;
         PrintAndLogEx(NORMAL, "|%s|   %s  |%s|",
-            sprint_hex_inrow_ex(tgAID->value, tgAID->len, 18),
-            (tgPrio) ? sprint_hex(tgPrio->value, 1) : "   ",
-            (tgName) ? sprint_ascii_ex(tgName->value, tgName->len, 25) : "                         ");
+                      sprint_hex_inrow_ex(tgAID->value, tgAID->len, 18),
+                      (tgPrio) ? sprint_hex(tgPrio->value, 1) : "   ",
+                      (tgName) ? sprint_ascii_ex(tgName->value, tgName->len, 25) : "                         ");
 
         ttmp = tlvdb_find_next(ttmp, 0x6f);
     }
@@ -172,7 +179,8 @@ void TLVPrintAIDlistFromSelectTLV(struct tlvdb *tlv) {
     PrintAndLogEx(NORMAL, "|------------------|--------|-------------------------|");
 }
 
-struct tlvdb *GetPANFromTrack2(const struct tlv *track2) {
+struct tlvdb *GetPANFromTrack2(const struct tlv *track2)
+{
     char track2Hex[200] = {0};
     uint8_t PAN[100] = {0};
     int PANlen = 0;
@@ -196,10 +204,11 @@ struct tlvdb *GetPANFromTrack2(const struct tlv *track2) {
 
     param_gethex_to_eol(track2Hex, 0, PAN, sizeof(PAN), &PANlen);
 
-  return tlvdb_fixed(0x5a, PANlen, PAN);
+    return tlvdb_fixed(0x5a, PANlen, PAN);
 }
 
-struct tlvdb *GetdCVVRawFromTrack2(const struct tlv *track2) {
+struct tlvdb *GetdCVVRawFromTrack2(const struct tlv *track2)
+{
     char track2Hex[200] = {0};
     char dCVVHex[100] = {0};
     uint8_t dCVV[100] = {0};
@@ -229,10 +238,11 @@ struct tlvdb *GetdCVVRawFromTrack2(const struct tlv *track2) {
 
     param_gethex_to_eol(dCVVHex, 0, dCVV, sizeof(dCVV), &dCVVlen);
 
-  return tlvdb_fixed(0x02, dCVVlen, dCVV);
+    return tlvdb_fixed(0x02, dCVVlen, dCVV);
 }
 
-int EMVExchangeEx(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, sAPDU apdu, bool IncludeLe, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
+int EMVExchangeEx(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, sAPDU apdu, bool IncludeLe, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv)
+{
     uint8_t data[APDU_RES_LEN] = {0};
 
     *ResultLen = 0;
@@ -241,7 +251,7 @@ int EMVExchangeEx(EMVCommandChannel channel, bool ActivateField, bool LeaveField
     int res = 0;
 
     if (ActivateField) {
-        DropFieldEx( channel );
+        DropFieldEx(channel);
         msleep(50);
     }
 
@@ -251,26 +261,26 @@ int EMVExchangeEx(EMVCommandChannel channel, bool ActivateField, bool LeaveField
         memcpy(&data[5], apdu.data, apdu.Lc);
 
     if (APDULogging)
-        PrintAndLogEx(SUCCESS, ">>>> %s", sprint_hex(data, (IncludeLe?6:5) + apdu.Lc));
+        PrintAndLogEx(SUCCESS, ">>>> %s", sprint_hex(data, (IncludeLe ? 6 : 5) + apdu.Lc));
 
-    switch(channel) {
-    case ECC_CONTACTLESS:
-        // 6 byes + data = INS + CLA + P1 + P2 + Lc + <data = Nc> + Le(?IncludeLe)
-        res = ExchangeAPDU14a(data, (IncludeLe?6:5) + apdu.Lc, ActivateField, LeaveFieldON, Result, (int)MaxResultLen, (int *)ResultLen);
-        if (res) {
-            return res;
-        }
-        break;
-    case ECC_CONTACT:
+    switch (channel) {
+        case ECC_CONTACTLESS:
+            // 6 byes + data = INS + CLA + P1 + P2 + Lc + <data = Nc> + Le(?IncludeLe)
+            res = ExchangeAPDU14a(data, (IncludeLe ? 6 : 5) + apdu.Lc, ActivateField, LeaveFieldON, Result, (int)MaxResultLen, (int *)ResultLen);
+            if (res) {
+                return res;
+            }
+            break;
+        case ECC_CONTACT:
 #ifdef WITH_SMARTCARD
-        res = ExchangeAPDUSC(data, (IncludeLe?6:5) + apdu.Lc, ActivateField, LeaveFieldON, Result, (int)MaxResultLen, (int *)ResultLen);
+            res = ExchangeAPDUSC(data, (IncludeLe ? 6 : 5) + apdu.Lc, ActivateField, LeaveFieldON, Result, (int)MaxResultLen, (int *)ResultLen);
 #else
-        res = 1;
+            res = 1;
 #endif
-        if (res) {
-            return res;
-        }
-        break;
+            if (res) {
+                return res;
+            }
+            break;
     }
 
     if (APDULogging)
@@ -305,15 +315,18 @@ int EMVExchangeEx(EMVCommandChannel channel, bool ActivateField, bool LeaveField
     return 0;
 }
 
-int EMVExchange(EMVCommandChannel channel, bool LeaveFieldON, sAPDU apdu, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
+int EMVExchange(EMVCommandChannel channel, bool LeaveFieldON, sAPDU apdu, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv)
+{
     return EMVExchangeEx(channel, false, LeaveFieldON, apdu, (channel == ECC_CONTACTLESS), Result, MaxResultLen, ResultLen, sw, tlv);
 }
 
-int EMVSelect(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, uint8_t *AID, size_t AIDLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
-    return EMVExchangeEx(channel, ActivateField, LeaveFieldON, (sAPDU){0x00, 0xa4, 0x04, 0x00, AIDLen, AID}, (channel == ECC_CONTACTLESS), Result, MaxResultLen, ResultLen, sw, tlv);
+int EMVSelect(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, uint8_t *AID, size_t AIDLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv)
+{
+    return EMVExchangeEx(channel, ActivateField, LeaveFieldON, (sAPDU) {0x00, 0xa4, 0x04, 0x00, AIDLen, AID}, (channel == ECC_CONTACTLESS), Result, MaxResultLen, ResultLen, sw, tlv);
 }
 
-int EMVSelectPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, uint8_t PSENum, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
+int EMVSelectPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, uint8_t PSENum, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw)
+{
     uint8_t buf[APDU_AID_LEN] = {0};
     *ResultLen = 0;
     int len = 0;
@@ -335,7 +348,8 @@ int EMVSelectPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldO
     return res;
 }
 
-int EMVSelectWithRetry(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, uint8_t *AID, size_t AIDLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
+int EMVSelectWithRetry(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, uint8_t *AID, size_t AIDLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv)
+{
     int retrycnt = 0;
     int res = 0;
     do {
@@ -343,7 +357,7 @@ int EMVSelectWithRetry(EMVCommandChannel channel, bool ActivateField, bool Leave
 
         // retry if error and not returned sw error
         if (res && res != 5) {
-            if (++retrycnt < 3){
+            if (++retrycnt < 3) {
                 continue;
             } else {
                 // card select error, proxmark error
@@ -362,7 +376,8 @@ int EMVSelectWithRetry(EMVCommandChannel channel, bool ActivateField, bool Leave
     return res;
 }
 
-int EMVCheckAID(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlvdbelm, struct tlvdb *tlv){
+int EMVCheckAID(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlvdbelm, struct tlvdb *tlv)
+{
     uint8_t data[APDU_RES_LEN] = {0};
     size_t datalen = 0;
     int res = 0;
@@ -384,7 +399,7 @@ int EMVCheckAID(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlvdbel
                 break;
 
             // all is ok
-            if (decodeTLV){
+            if (decodeTLV) {
                 PrintAndLogEx(NORMAL, "%s:", sprint_hex_inrow(tgAID->value, tgAID->len));
                 TLVPrintFromBuffer(data, datalen);
             }
@@ -394,7 +409,8 @@ int EMVCheckAID(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlvdbel
     return res;
 }
 
-int EMVSearchPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, uint8_t PSENum, bool decodeTLV, struct tlvdb *tlv) {
+int EMVSearchPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, uint8_t PSENum, bool decodeTLV, struct tlvdb *tlv)
+{
     uint8_t data[APDU_RES_LEN] = {0};
     size_t datalen = 0;
     uint8_t sfidata[0x11][APDU_RES_LEN];
@@ -406,7 +422,7 @@ int EMVSearchPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldO
     // select PPSE
     res = EMVSelectPSE(channel, ActivateField, true, PSENum, data, sizeof(data), &datalen, &sw);
 
-    if (!res){
+    if (!res) {
         if (sw != 0x9000) {
             PrintAndLogEx(FAILED, "Select PSE error. APDU error: %04x.", sw);
             return 1;
@@ -416,7 +432,7 @@ int EMVSearchPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldO
         t = tlvdb_parse_multi(data, datalen);
         if (t) {
             // PSE/PPSE with SFI
-            struct tlvdb *tsfi = tlvdb_find_path(t, (tlv_tag_t[]){0x6f, 0xa5, 0x88, 0x00});
+            struct tlvdb *tsfi = tlvdb_find_path(t, (tlv_tag_t[]) {0x6f, 0xa5, 0x88, 0x00});
             if (tsfi) {
                 uint8_t sfin = 0;
                 tlv_get_uint8(tlvdb_get_tlv(tsfi), &sfin);
@@ -440,7 +456,7 @@ int EMVSearchPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldO
                         break;
                     }
 
-                    if (decodeTLV){
+                    if (decodeTLV) {
                         TLVPrintFromBuffer(sfidata[ui], sfidatalen[ui]);
                     }
                 }
@@ -450,7 +466,7 @@ int EMVSearchPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldO
                         struct tlvdb *tsfi = NULL;
                         tsfi = tlvdb_parse_multi(sfidata[ui], sfidatalen[ui]);
                         if (tsfi) {
-                            struct tlvdb *tsfitmp = tlvdb_find_path(tsfi, (tlv_tag_t[]){0x70, 0x61, 0x00});
+                            struct tlvdb *tsfitmp = tlvdb_find_path(tsfi, (tlv_tag_t[]) {0x70, 0x61, 0x00});
                             if (!tsfitmp) {
                                 PrintAndLogEx(FAILED, "SFI 0x%02d don't have records.", sfidatalen[ui]);
                                 continue;
@@ -465,7 +481,7 @@ int EMVSearchPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldO
 
 
             // PSE/PPSE plain (wo SFI)
-            struct tlvdb *ttmp = tlvdb_find_path(t, (tlv_tag_t[]){0x6f, 0xa5, 0xbf0c, 0x61, 0x00});
+            struct tlvdb *ttmp = tlvdb_find_path(t, (tlv_tag_t[]) {0x6f, 0xa5, 0xbf0c, 0x61, 0x00});
             if (ttmp) {
                 res = EMVCheckAID(channel, decodeTLV, ttmp, tlv);
                 fileFound = true;
@@ -482,13 +498,14 @@ int EMVSearchPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldO
         PrintAndLogEx(WARNING, "PPSE ERROR: Can't select PPSE AID. Error: %d", res);
     }
 
-    if(!LeaveFieldON)
-        DropFieldEx( channel );
+    if (!LeaveFieldON)
+        DropFieldEx(channel);
 
     return res;
 }
 
-int EMVSearch(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, bool decodeTLV, struct tlvdb *tlv) {
+int EMVSearch(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, bool decodeTLV, struct tlvdb *tlv)
+{
     uint8_t aidbuf[APDU_AID_LEN] = {0};
     int aidlen = 0;
     uint8_t data[APDU_RES_LEN] = {0};
@@ -497,12 +514,12 @@ int EMVSearch(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON,
 
     int res = 0;
     int retrycnt = 0;
-    for(int i = 0; i < AIDlistLen; i ++) {
+    for (int i = 0; i < AIDlistLen; i ++) {
         param_gethex_to_eol(AIDlist[i].aid, 0, aidbuf, sizeof(aidbuf), &aidlen);
         res = EMVSelect(channel, (i == 0) ? ActivateField : false, (i == AIDlistLen - 1) ? LeaveFieldON : true, aidbuf, aidlen, data, sizeof(data), &datalen, &sw, tlv);
         // retry if error and not returned sw error
         if (res && res != 5) {
-            if (++retrycnt < 3){
+            if (++retrycnt < 3) {
                 i--;
             } else {
                 // (1) - card select error, proxmark error OR (200) - result length = 0
@@ -533,7 +550,8 @@ int EMVSearch(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON,
     return 0;
 }
 
-int EMVSelectApplication(struct tlvdb *tlv, uint8_t *AID, size_t *AIDlen) {
+int EMVSelectApplication(struct tlvdb *tlv, uint8_t *AID, size_t *AIDlen)
+{
     // check priority. 0x00 - highest
     int prio = 0xffff;
 
@@ -551,7 +569,7 @@ int EMVSelectApplication(struct tlvdb *tlv, uint8_t *AID, size_t *AIDlen) {
             break;
 
         if (tgPrio) {
-            int pt = bytes_to_num((uint8_t*)tgPrio->value, (tgPrio->len < 2) ? tgPrio->len : 2);
+            int pt = bytes_to_num((uint8_t *)tgPrio->value, (tgPrio->len < 2) ? tgPrio->len : 2);
             if (pt < prio) {
                 prio = pt;
 
@@ -561,8 +579,8 @@ int EMVSelectApplication(struct tlvdb *tlv, uint8_t *AID, size_t *AIDlen) {
         } else {
             // takes the first application from list wo priority
             if (!*AIDlen) {
-            memcpy(AID, tgAID->value, tgAID->len);
-            *AIDlen = tgAID->len;
+                memcpy(AID, tgAID->value, tgAID->len);
+                *AIDlen = tgAID->len;
             }
         }
 
@@ -572,42 +590,49 @@ int EMVSelectApplication(struct tlvdb *tlv, uint8_t *AID, size_t *AIDlen) {
     return 0;
 }
 
-int EMVGPO(EMVCommandChannel channel, bool LeaveFieldON, uint8_t *PDOL, size_t PDOLLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
-    return EMVExchange(channel, LeaveFieldON, (sAPDU){0x80, 0xa8, 0x00, 0x00, PDOLLen, PDOL}, Result, MaxResultLen, ResultLen, sw, tlv);
+int EMVGPO(EMVCommandChannel channel, bool LeaveFieldON, uint8_t *PDOL, size_t PDOLLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv)
+{
+    return EMVExchange(channel, LeaveFieldON, (sAPDU) {0x80, 0xa8, 0x00, 0x00, PDOLLen, PDOL}, Result, MaxResultLen, ResultLen, sw, tlv);
 }
 
-int EMVReadRecord(EMVCommandChannel channel, bool LeaveFieldON, uint8_t SFI, uint8_t SFIrec, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
-    int res = EMVExchange(channel, LeaveFieldON, (sAPDU){0x00, 0xb2, SFIrec, (SFI << 3) | 0x04, 0, NULL}, Result, MaxResultLen, ResultLen, sw, tlv);
+int EMVReadRecord(EMVCommandChannel channel, bool LeaveFieldON, uint8_t SFI, uint8_t SFIrec, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv)
+{
+    int res = EMVExchange(channel, LeaveFieldON, (sAPDU) {0x00, 0xb2, SFIrec, (SFI << 3) | 0x04, 0, NULL}, Result, MaxResultLen, ResultLen, sw, tlv);
     if (*sw == 0x6700) {
         PrintAndLogEx(INFO, ">>> trying to reissue command withouth Le...");
-        res = EMVExchangeEx(channel, false, LeaveFieldON, (sAPDU){0x00, 0xb2, SFIrec, (SFI << 3) | 0x04, 0, NULL}, false, Result, MaxResultLen, ResultLen, sw, tlv);
+        res = EMVExchangeEx(channel, false, LeaveFieldON, (sAPDU) {0x00, 0xb2, SFIrec, (SFI << 3) | 0x04, 0, NULL}, false, Result, MaxResultLen, ResultLen, sw, tlv);
     }
     return res;
 }
 
-int EMVAC(EMVCommandChannel channel, bool LeaveFieldON, uint8_t RefControl, uint8_t *CDOL, size_t CDOLLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
-    return EMVExchange(channel, LeaveFieldON, (sAPDU){0x80, 0xae, RefControl, 0x00, CDOLLen, CDOL}, Result, MaxResultLen, ResultLen, sw, tlv);
+int EMVAC(EMVCommandChannel channel, bool LeaveFieldON, uint8_t RefControl, uint8_t *CDOL, size_t CDOLLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv)
+{
+    return EMVExchange(channel, LeaveFieldON, (sAPDU) {0x80, 0xae, RefControl, 0x00, CDOLLen, CDOL}, Result, MaxResultLen, ResultLen, sw, tlv);
 }
 
-int EMVGenerateChallenge(EMVCommandChannel channel, bool LeaveFieldON, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
-    int res = EMVExchange(channel, LeaveFieldON, (sAPDU){0x00, 0x84, 0x00, 0x00, 0x00, NULL}, Result, MaxResultLen, ResultLen, sw, tlv);
+int EMVGenerateChallenge(EMVCommandChannel channel, bool LeaveFieldON, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv)
+{
+    int res = EMVExchange(channel, LeaveFieldON, (sAPDU) {0x00, 0x84, 0x00, 0x00, 0x00, NULL}, Result, MaxResultLen, ResultLen, sw, tlv);
     if (*sw == 0x6700) {
         PrintAndLogEx(INFO, ">>> trying to reissue command withouth Le...");
-        res = EMVExchangeEx(channel, false, LeaveFieldON, (sAPDU){0x00, 0x84, 0x00, 0x00, 0x00, NULL}, false, Result, MaxResultLen, ResultLen, sw, tlv);
+        res = EMVExchangeEx(channel, false, LeaveFieldON, (sAPDU) {0x00, 0x84, 0x00, 0x00, 0x00, NULL}, false, Result, MaxResultLen, ResultLen, sw, tlv);
     }
     return res;
 }
 
-int EMVInternalAuthenticate(EMVCommandChannel channel, bool LeaveFieldON, uint8_t *DDOL, size_t DDOLLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
-    return EMVExchangeEx(channel, false, LeaveFieldON, (sAPDU){0x00, 0x88, 0x00, 0x00, DDOLLen, DDOL}, true, Result, MaxResultLen, ResultLen, sw, tlv);
+int EMVInternalAuthenticate(EMVCommandChannel channel, bool LeaveFieldON, uint8_t *DDOL, size_t DDOLLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv)
+{
+    return EMVExchangeEx(channel, false, LeaveFieldON, (sAPDU) {0x00, 0x88, 0x00, 0x00, DDOLLen, DDOL}, true, Result, MaxResultLen, ResultLen, sw, tlv);
 }
 
-int MSCComputeCryptoChecksum(EMVCommandChannel channel, bool LeaveFieldON, uint8_t *UDOL, uint8_t UDOLlen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
-    return EMVExchange(channel, LeaveFieldON, (sAPDU){0x80, 0x2a, 0x8e, 0x80, UDOLlen, UDOL}, Result, MaxResultLen, ResultLen, sw, tlv);
+int MSCComputeCryptoChecksum(EMVCommandChannel channel, bool LeaveFieldON, uint8_t *UDOL, uint8_t UDOLlen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv)
+{
+    return EMVExchange(channel, LeaveFieldON, (sAPDU) {0x80, 0x2a, 0x8e, 0x80, UDOLlen, UDOL}, Result, MaxResultLen, ResultLen, sw, tlv);
 }
 
 // Authentication
-struct emv_pk *get_ca_pk(struct tlvdb *db) {
+struct emv_pk *get_ca_pk(struct tlvdb *db)
+{
     const struct tlv *df_tlv = tlvdb_get(db, 0x84, NULL);
     const struct tlv *caidx_tlv = tlvdb_get(db, 0x8f, NULL);
 
@@ -618,7 +643,8 @@ struct emv_pk *get_ca_pk(struct tlvdb *db) {
     return emv_pk_get_ca_pk(df_tlv->value, caidx_tlv->value[0]);
 }
 
-int trSDA(struct tlvdb *tlv) {
+int trSDA(struct tlvdb *tlv)
+{
 
     struct emv_pk *pk = get_ca_pk(tlv);
     if (!pk) {
@@ -634,16 +660,16 @@ int trSDA(struct tlvdb *tlv) {
     }
 
     PrintAndLogEx(SUCCESS, "Issuer PK recovered. RID %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx CSN %02hhx:%02hhx:%02hhx",
-        issuer_pk->rid[0],
-        issuer_pk->rid[1],
-        issuer_pk->rid[2],
-        issuer_pk->rid[3],
-        issuer_pk->rid[4],
-        issuer_pk->index,
-        issuer_pk->serial[0],
-        issuer_pk->serial[1],
-        issuer_pk->serial[2]
-        );
+                  issuer_pk->rid[0],
+                  issuer_pk->rid[1],
+                  issuer_pk->rid[2],
+                  issuer_pk->rid[3],
+                  issuer_pk->rid[4],
+                  issuer_pk->index,
+                  issuer_pk->serial[0],
+                  issuer_pk->serial[1],
+                  issuer_pk->serial[2]
+                 );
 
     const struct tlv *sda_tlv = tlvdb_get(tlv, 0x21, NULL);
     if (!sda_tlv || sda_tlv->len < 1) {
@@ -673,7 +699,8 @@ int trSDA(struct tlvdb *tlv) {
 static const unsigned char default_ddol_value[] = {0x9f, 0x37, 0x04};
 static struct tlv default_ddol_tlv = {.tag = 0x9f49, .len = 3, .value = default_ddol_value };
 
-int trDDA(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlv) {
+int trDDA(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlv)
+{
     uint8_t buf[APDU_RES_LEN] = {0};
     size_t len = 0;
     uint16_t sw = 0;
@@ -685,12 +712,12 @@ int trDDA(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlv) {
     }
 
     const struct tlv *sda_tlv = tlvdb_get(tlv, 0x21, NULL);
-/* if (!sda_tlv || sda_tlv->len < 1) { it may be 0!!!!
-        emv_pk_free(pk);
-        PrintAndLogEx(WARNING, "Error: Can't find input list for Offline Data Authentication. Exit.");
-        return 3;
-    }
-*/
+    /* if (!sda_tlv || sda_tlv->len < 1) { it may be 0!!!!
+            emv_pk_free(pk);
+            PrintAndLogEx(WARNING, "Error: Can't find input list for Offline Data Authentication. Exit.");
+            return 3;
+        }
+    */
     struct emv_pk *issuer_pk = emv_pki_recover_issuer_cert(pk, tlv);
     if (!issuer_pk) {
         emv_pk_free(pk);
@@ -698,16 +725,16 @@ int trDDA(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlv) {
         return 2;
     }
     PrintAndLogEx(SUCCESS, "Issuer PK recovered. RID %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx CSN %02hhx:%02hhx:%02hhx\n",
-            issuer_pk->rid[0],
-            issuer_pk->rid[1],
-            issuer_pk->rid[2],
-            issuer_pk->rid[3],
-            issuer_pk->rid[4],
-            issuer_pk->index,
-            issuer_pk->serial[0],
-            issuer_pk->serial[1],
-            issuer_pk->serial[2]
-            );
+                  issuer_pk->rid[0],
+                  issuer_pk->rid[1],
+                  issuer_pk->rid[2],
+                  issuer_pk->rid[3],
+                  issuer_pk->rid[4],
+                  issuer_pk->index,
+                  issuer_pk->serial[0],
+                  issuer_pk->serial[1],
+                  issuer_pk->serial[2]
+                 );
 
     struct emv_pk *icc_pk = emv_pki_recover_icc_cert(issuer_pk, tlv, sda_tlv);
     if (!icc_pk) {
@@ -717,16 +744,16 @@ int trDDA(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlv) {
         return 2;
     }
     PrintAndLogEx(SUCCESS, "ICC PK recovered. RID %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx CSN %02hhx:%02hhx:%02hhx\n",
-            icc_pk->rid[0],
-            icc_pk->rid[1],
-            icc_pk->rid[2],
-            icc_pk->rid[3],
-            icc_pk->rid[4],
-            icc_pk->index,
-            icc_pk->serial[0],
-            icc_pk->serial[1],
-            icc_pk->serial[2]
-            );
+                  icc_pk->rid[0],
+                  icc_pk->rid[1],
+                  icc_pk->rid[2],
+                  icc_pk->rid[3],
+                  icc_pk->rid[4],
+                  icc_pk->index,
+                  icc_pk->serial[0],
+                  icc_pk->serial[1],
+                  icc_pk->serial[2]
+                 );
 
     if (tlvdb_get(tlv, 0x9f2d, NULL)) {
         struct emv_pk *icc_pe_pk = emv_pki_recover_icc_pe_cert(issuer_pk, tlv);
@@ -734,16 +761,16 @@ int trDDA(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlv) {
             PrintAndLogEx(WARNING, "WARNING: ICC PE PK recover error. ");
         } else {
             PrintAndLogEx(SUCCESS, "ICC PE PK recovered. RID %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx CSN %02hhx:%02hhx:%02hhx\n",
-                    icc_pe_pk->rid[0],
-                    icc_pe_pk->rid[1],
-                    icc_pe_pk->rid[2],
-                    icc_pe_pk->rid[3],
-                    icc_pe_pk->rid[4],
-                    icc_pe_pk->index,
-                    icc_pe_pk->serial[0],
-                    icc_pe_pk->serial[1],
-                    icc_pe_pk->serial[2]
-                    );
+                          icc_pe_pk->rid[0],
+                          icc_pe_pk->rid[1],
+                          icc_pe_pk->rid[2],
+                          icc_pe_pk->rid[3],
+                          icc_pe_pk->rid[4],
+                          icc_pe_pk->index,
+                          icc_pe_pk->serial[0],
+                          icc_pe_pk->serial[1],
+                          icc_pe_pk->serial[2]
+                         );
         }
     } else {
         PrintAndLogEx(INFO, "ICC PE PK (PIN Encipherment Public Key Certificate) not found.\n");
@@ -767,11 +794,11 @@ int trDDA(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlv) {
 
         // 9f36 Application Transaction Counter (ATC)
         const struct tlv *atc_tlv = tlvdb_get(atc_db, 0x9f36, NULL);
-        if(atc_tlv) {
+        if (atc_tlv) {
             PrintAndLogEx(NORMAL, "\nATC (Application Transaction Counter) [%zu] %s", atc_tlv->len, sprint_hex_inrow(atc_tlv->value, atc_tlv->len));
 
             const struct tlv *core_atc_tlv = tlvdb_get(tlv, 0x9f36, NULL);
-            if(tlv_equal(core_atc_tlv, atc_tlv)) {
+            if (tlv_equal(core_atc_tlv, atc_tlv)) {
                 PrintAndLogEx(SUCCESS, "ATC check OK.");
                 PrintAndLogEx(SUCCESS, "fDDA (fast DDA) verified OK.");
             } else {
@@ -829,12 +856,12 @@ int trDDA(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlv) {
 
         struct tlvdb *dda_db = NULL;
         if (buf[0] == 0x80) {
-            if (len < 3 ) {
+            if (len < 3) {
                 PrintAndLogEx(WARNING, "Error: Internal Authenticate format1 parsing error. length=%d", len);
             } else {
                 // parse response 0x80
                 struct tlvdb *t80 = tlvdb_parse_multi(buf, len);
-                const struct tlv * t80tlv = tlvdb_get_tlv(t80);
+                const struct tlv *t80tlv = tlvdb_get_tlv(t80);
 
                 // 9f4b Signed Dynamic Application Data
                 dda_db = tlvdb_fixed(0x9f4b, t80tlv->len, t80tlv->value);
@@ -842,14 +869,14 @@ int trDDA(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlv) {
 
                 tlvdb_free(t80);
 
-                if (decodeTLV){
+                if (decodeTLV) {
                     PrintAndLogEx(NORMAL, "* * * Decode response format 1:");
                     TLVPrintFromTLV(dda_db);
                 }
             }
         } else {
             dda_db = tlvdb_parse_multi(buf, len);
-            if(!dda_db) {
+            if (!dda_db) {
                 PrintAndLogEx(WARNING, "Error: Can't parse Internal Authenticate result as TLV");
                 free(ddol_data_tlv);
                 emv_pk_free(pk);
@@ -877,7 +904,7 @@ int trDDA(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlv) {
 
         // 9f4c ICC Dynamic Number
         const struct tlv *idn_tlv = tlvdb_get(idn_db, 0x9f4c, NULL);
-        if(idn_tlv) {
+        if (idn_tlv) {
             PrintAndLogEx(INFO, "\nIDN (ICC Dynamic Number) [%zu] %s", idn_tlv->len, sprint_hex_inrow(idn_tlv->value, idn_tlv->len));
             PrintAndLogEx(INFO, "DDA verified OK.");
             tlvdb_add(tlv, idn_db);
@@ -899,7 +926,8 @@ int trDDA(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlv) {
     return 0;
 }
 
-int trCDA(struct tlvdb *tlv, struct tlvdb *ac_tlv, struct tlv *pdol_data_tlv, struct tlv *ac_data_tlv) {
+int trCDA(struct tlvdb *tlv, struct tlvdb *ac_tlv, struct tlv *pdol_data_tlv, struct tlv *ac_data_tlv)
+{
 
     struct emv_pk *pk = get_ca_pk(tlv);
     if (!pk) {
@@ -921,16 +949,16 @@ int trCDA(struct tlvdb *tlv, struct tlvdb *ac_tlv, struct tlv *pdol_data_tlv, st
         return 2;
     }
     PrintAndLogEx(SUCCESS, "Issuer PK recovered. RID %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx CSN %02hhx:%02hhx:%02hhx\n",
-            issuer_pk->rid[0],
-            issuer_pk->rid[1],
-            issuer_pk->rid[2],
-            issuer_pk->rid[3],
-            issuer_pk->rid[4],
-            issuer_pk->index,
-            issuer_pk->serial[0],
-            issuer_pk->serial[1],
-            issuer_pk->serial[2]
-            );
+                  issuer_pk->rid[0],
+                  issuer_pk->rid[1],
+                  issuer_pk->rid[2],
+                  issuer_pk->rid[3],
+                  issuer_pk->rid[4],
+                  issuer_pk->index,
+                  issuer_pk->serial[0],
+                  issuer_pk->serial[1],
+                  issuer_pk->serial[2]
+                 );
 
     struct emv_pk *icc_pk = emv_pki_recover_icc_cert(issuer_pk, tlv, sda_tlv);
     if (!icc_pk) {
@@ -940,16 +968,16 @@ int trCDA(struct tlvdb *tlv, struct tlvdb *ac_tlv, struct tlv *pdol_data_tlv, st
         return 2;
     }
     PrintAndLogEx(SUCCESS, "ICC PK recovered. RID %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx CSN %02hhx:%02hhx:%02hhx\n",
-            icc_pk->rid[0],
-            icc_pk->rid[1],
-            icc_pk->rid[2],
-            icc_pk->rid[3],
-            icc_pk->rid[4],
-            icc_pk->index,
-            icc_pk->serial[0],
-            icc_pk->serial[1],
-            icc_pk->serial[2]
-            );
+                  icc_pk->rid[0],
+                  icc_pk->rid[1],
+                  icc_pk->rid[2],
+                  icc_pk->rid[3],
+                  icc_pk->rid[4],
+                  icc_pk->index,
+                  icc_pk->serial[0],
+                  icc_pk->serial[1],
+                  icc_pk->serial[2]
+                 );
 
     struct tlvdb *dac_db = emv_pki_recover_dac(issuer_pk, tlv, sda_tlv);
     if (dac_db) {
@@ -966,10 +994,10 @@ int trCDA(struct tlvdb *tlv, struct tlvdb *ac_tlv, struct tlv *pdol_data_tlv, st
 
     PrintAndLogEx(NORMAL, "\n* * Check Signed Dynamic Application Data (SDAD)");
     struct tlvdb *idn_db = emv_pki_perform_cda_ex(icc_pk, tlv, ac_tlv,
-            pdol_data_tlv, // pdol
-            ac_data_tlv,   // cdol1
-            NULL,          // cdol2
-            true);
+                                                  pdol_data_tlv, // pdol
+                                                  ac_data_tlv,   // cdol1
+                                                  NULL,          // cdol2
+                                                  true);
     if (idn_db) {
         const struct tlv *idn_tlv = tlvdb_get(idn_db, 0x9f4c, NULL);
         PrintAndLogEx(NORMAL, "\nIDN (ICC Dynamic Number) [%zu] %s", idn_tlv->len, sprint_hex_inrow(idn_tlv->value, idn_tlv->len));
@@ -985,7 +1013,8 @@ int trCDA(struct tlvdb *tlv, struct tlvdb *ac_tlv, struct tlv *pdol_data_tlv, st
     return 0;
 }
 
-int RecoveryCertificates(struct tlvdb *tlvRoot, json_t *root) {
+int RecoveryCertificates(struct tlvdb *tlvRoot, json_t *root)
+{
 
     struct emv_pk *pk = get_ca_pk(tlvRoot);
     if (!pk) {
@@ -1000,16 +1029,16 @@ int RecoveryCertificates(struct tlvdb *tlvRoot, json_t *root) {
         return 2;
     }
     PrintAndLogEx(SUCCESS, "Issuer PK recovered. RID %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx CSN %02hhx:%02hhx:%02hhx",
-            issuer_pk->rid[0],
-            issuer_pk->rid[1],
-            issuer_pk->rid[2],
-            issuer_pk->rid[3],
-            issuer_pk->rid[4],
-            issuer_pk->index,
-            issuer_pk->serial[0],
-            issuer_pk->serial[1],
-            issuer_pk->serial[2]
-            );
+                  issuer_pk->rid[0],
+                  issuer_pk->rid[1],
+                  issuer_pk->rid[2],
+                  issuer_pk->rid[3],
+                  issuer_pk->rid[4],
+                  issuer_pk->index,
+                  issuer_pk->serial[0],
+                  issuer_pk->serial[1],
+                  issuer_pk->serial[2]
+                 );
 
     JsonSaveBufAsHex(root, "$.ApplicationData.RID", issuer_pk->rid, 5);
 
@@ -1026,16 +1055,16 @@ int RecoveryCertificates(struct tlvdb *tlvRoot, json_t *root) {
         return 2;
     }
     PrintAndLogEx(SUCCESS, "ICC PK recovered. RID %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx CSN %02hhx:%02hhx:%02hhx\n",
-            icc_pk->rid[0],
-            icc_pk->rid[1],
-            icc_pk->rid[2],
-            icc_pk->rid[3],
-            icc_pk->rid[4],
-            icc_pk->index,
-            icc_pk->serial[0],
-            icc_pk->serial[1],
-            icc_pk->serial[2]
-            );
+                  icc_pk->rid[0],
+                  icc_pk->rid[1],
+                  icc_pk->rid[2],
+                  icc_pk->rid[3],
+                  icc_pk->rid[4],
+                  icc_pk->index,
+                  icc_pk->serial[0],
+                  icc_pk->serial[1],
+                  icc_pk->serial[2]
+                 );
 
     char *icc_pk_c = emv_pk_dump_pk(icc_pk);
     JsonSaveStr(root, "$.ApplicationData.ICCPublicKeyDec", icc_pk_c);
diff --git a/client/emv/emvcore.h b/client/emv/emvcore.h
index cfc0e9457..7e9afabf7 100644
--- a/client/emv/emvcore.h
+++ b/client/emv/emvcore.h
@@ -63,7 +63,7 @@ enum CardPSVendor {
     CV_CB,
     CV_OTHER,
 };
-extern enum CardPSVendor GetCardPSVendor(uint8_t * AID, size_t AIDlen);
+extern enum CardPSVendor GetCardPSVendor(uint8_t *AID, size_t AIDlen);
 
 extern bool TLVPrintFromBuffer(uint8_t *data, int datalen);
 extern void TLVPrintFromTLV(struct tlvdb *tlv);
diff --git a/client/emv/emvjson.c b/client/emv/emvjson.c
index 0b96b846c..5885ca294 100644
--- a/client/emv/emvjson.c
+++ b/client/emv/emvjson.c
@@ -20,47 +20,48 @@
 #include "emv_tags.h"
 
 static const ApplicationDataElm ApplicationData[] = {
-{0x82,    "AIP"},
-{0x94,    "AFL"},
+    {0x82,    "AIP"},
+    {0x94,    "AFL"},
 
-{0x5A,    "PAN"},
-{0x5F34,  "PANSeqNo"},
-{0x5F24,  "ExpirationDate"},
-{0x5F25,  "EffectiveDate"},
-{0x5F28,  "IssuerCountryCode"},
+    {0x5A,    "PAN"},
+    {0x5F34,  "PANSeqNo"},
+    {0x5F24,  "ExpirationDate"},
+    {0x5F25,  "EffectiveDate"},
+    {0x5F28,  "IssuerCountryCode"},
 
-{0x50,    "ApplicationLabel"},
-{0x9F08,  "VersionNumber"},
-{0x9F42,  "CurrencyCode"},
-{0x5F2D,  "LanguagePreference"},
-{0x87,    "PriorityIndicator"},
-{0x9F36,  "ATC"}, //Application Transaction Counter
+    {0x50,    "ApplicationLabel"},
+    {0x9F08,  "VersionNumber"},
+    {0x9F42,  "CurrencyCode"},
+    {0x5F2D,  "LanguagePreference"},
+    {0x87,    "PriorityIndicator"},
+    {0x9F36,  "ATC"}, //Application Transaction Counter
 
-{0x5F20,  "CardholderName"},
+    {0x5F20,  "CardholderName"},
 
-{0x9F38,  "PDOL"},
-{0x8C,    "CDOL1"},
-{0x8D,    "CDOL2"},
+    {0x9F38,  "PDOL"},
+    {0x8C,    "CDOL1"},
+    {0x8D,    "CDOL2"},
 
-{0x9F07,  "AUC"},   // Application Usage Control
-{0x9F6C,  "CTQ"},
-{0x8E,    "CVMList"},
-{0x9F0D,  "IACDefault"},
-{0x9F0E,  "IACDeny"},
-{0x9F0F,  "IACOnline"},
+    {0x9F07,  "AUC"},   // Application Usage Control
+    {0x9F6C,  "CTQ"},
+    {0x8E,    "CVMList"},
+    {0x9F0D,  "IACDefault"},
+    {0x9F0E,  "IACDeny"},
+    {0x9F0F,  "IACOnline"},
 
-{0x8F,    "CertificationAuthorityPublicKeyIndex"},
-{0x9F32,  "IssuerPublicKeyExponent"},
-{0x92,    "IssuerPublicKeyRemainder"},
-{0x90,    "IssuerPublicKeyCertificate"},
-{0x9F47,  "ICCPublicKeyExponent"},
-{0x9F46,  "ICCPublicKeyCertificate"},
+    {0x8F,    "CertificationAuthorityPublicKeyIndex"},
+    {0x9F32,  "IssuerPublicKeyExponent"},
+    {0x92,    "IssuerPublicKeyRemainder"},
+    {0x90,    "IssuerPublicKeyCertificate"},
+    {0x9F47,  "ICCPublicKeyExponent"},
+    {0x9F46,  "ICCPublicKeyCertificate"},
 
-{0x00,    "end..."}
+    {0x00,    "end..."}
 };
 int ApplicationDataLen = sizeof(ApplicationData) / sizeof(ApplicationDataElm);
 
-char* GetApplicationDataName(tlv_tag_t tag) {
+char *GetApplicationDataName(tlv_tag_t tag)
+{
     for (int i = 0; i < ApplicationDataLen; i++)
         if (ApplicationData[i].Tag == tag)
             return ApplicationData[i].Name;
@@ -68,7 +69,8 @@ char* GetApplicationDataName(tlv_tag_t tag) {
     return NULL;
 }
 
-int JsonSaveJsonObject(json_t *root, char *path, json_t *value) {
+int JsonSaveJsonObject(json_t *root, char *path, json_t *value)
+{
     json_error_t error;
 
     if (strlen(path) < 1)
@@ -86,31 +88,36 @@ int JsonSaveJsonObject(json_t *root, char *path, json_t *value) {
     }
 }
 
-int JsonSaveInt(json_t *root, char *path, int value) {
+int JsonSaveInt(json_t *root, char *path, int value)
+{
     return JsonSaveJsonObject(root, path, json_integer(value));
 }
 
-int JsonSaveStr(json_t *root, char *path, char *value) {
+int JsonSaveStr(json_t *root, char *path, char *value)
+{
     return JsonSaveJsonObject(root, path, json_string(value));
 };
 
-int JsonSaveBufAsHexCompact(json_t *elm, char *path, uint8_t *data, size_t datalen) {
-    char * msg = sprint_hex_inrow(data, datalen);
+int JsonSaveBufAsHexCompact(json_t *elm, char *path, uint8_t *data, size_t datalen)
+{
+    char *msg = sprint_hex_inrow(data, datalen);
     if (msg && strlen(msg) && msg[strlen(msg) - 1] == ' ')
         msg[strlen(msg) - 1] = '\0';
 
     return JsonSaveStr(elm, path, msg);
 }
 
-int JsonSaveBufAsHex(json_t *elm, char *path, uint8_t *data, size_t datalen) {
-    char * msg = sprint_hex(data, datalen);
+int JsonSaveBufAsHex(json_t *elm, char *path, uint8_t *data, size_t datalen)
+{
+    char *msg = sprint_hex(data, datalen);
     if (msg && strlen(msg) && msg[strlen(msg) - 1] == ' ')
         msg[strlen(msg) - 1] = '\0';
 
     return JsonSaveStr(elm, path, msg);
 }
 
-int JsonSaveHex(json_t *elm, char *path, uint64_t data, int datalen) {
+int JsonSaveHex(json_t *elm, char *path, uint64_t data, int datalen)
+{
     uint8_t bdata[8] = {0};
     int len = 0;
     if (!datalen) {
@@ -130,7 +137,8 @@ int JsonSaveHex(json_t *elm, char *path, uint64_t data, int datalen) {
     return JsonSaveBufAsHex(elm, path, bdata, len);
 }
 
-int JsonSaveTLVValue(json_t *root, char *path, struct tlvdb *tlvdbelm) {
+int JsonSaveTLVValue(json_t *root, char *path, struct tlvdb *tlvdbelm)
+{
     const struct tlv *tlvelm = tlvdb_get_tlv(tlvdbelm);
     if (tlvelm)
         return JsonSaveBufAsHex(root, path, (uint8_t *)tlvelm->value, tlvelm->len);
@@ -138,7 +146,8 @@ int JsonSaveTLVValue(json_t *root, char *path, struct tlvdb *tlvdbelm) {
         return 1;
 }
 
-int JsonSaveTLVElm(json_t *elm, char *path, struct tlv *tlvelm, bool saveName, bool saveValue, bool saveAppDataLink) {
+int JsonSaveTLVElm(json_t *elm, char *path, struct tlv *tlvelm, bool saveName, bool saveValue, bool saveAppDataLink)
+{
     json_error_t error;
 
     if (strlen(path) < 1 || !tlvelm)
@@ -164,11 +173,11 @@ int JsonSaveTLVElm(json_t *elm, char *path, struct tlv *tlvelm, bool saveName, b
         }
 
         if (saveAppDataLink) {
-            char * AppDataName = GetApplicationDataName(tlvelm->tag);
+            char *AppDataName = GetApplicationDataName(tlvelm->tag);
             if (AppDataName)
                 JsonSaveStr(obj, "appdata", AppDataName);
         } else {
-            char * name = emv_get_tag_name(tlvelm);
+            char *name = emv_get_tag_name(tlvelm);
             if (saveName && name && strlen(name) > 0 && strncmp(name, "Unknown", 7))
                 JsonSaveStr(obj, "name", emv_get_tag_name(tlvelm));
             JsonSaveHex(obj, "tag", tlvelm->tag, 0);
@@ -182,15 +191,17 @@ int JsonSaveTLVElm(json_t *elm, char *path, struct tlv *tlvelm, bool saveName, b
     return 0;
 }
 
-int JsonSaveTLVTreeElm(json_t *elm, char *path, struct tlvdb *tlvdbelm, bool saveName, bool saveValue, bool saveAppDataLink) {
+int JsonSaveTLVTreeElm(json_t *elm, char *path, struct tlvdb *tlvdbelm, bool saveName, bool saveValue, bool saveAppDataLink)
+{
     return JsonSaveTLVElm(elm, path, (struct tlv *)tlvdb_get_tlv(tlvdbelm), saveName, saveValue, saveAppDataLink);
 }
 
-int JsonSaveTLVTree(json_t *root, json_t *elm, char *path, struct tlvdb *tlvdbelm) {
+int JsonSaveTLVTree(json_t *root, json_t *elm, char *path, struct tlvdb *tlvdbelm)
+{
     struct tlvdb *tlvp = tlvdbelm;
     while (tlvp) {
-        const struct tlv * tlvpelm = tlvdb_get_tlv(tlvp);
-        char * AppDataName = NULL;
+        const struct tlv *tlvpelm = tlvdb_get_tlv(tlvp);
+        char *AppDataName = NULL;
         if (tlvpelm)
             AppDataName = GetApplicationDataName(tlvpelm->tag);
 
@@ -213,7 +224,7 @@ int JsonSaveTLVTree(json_t *root, json_t *elm, char *path, struct tlvdb *tlvdbel
 
         if (tlvdb_elm_get_children(tlvp)) {
             // get path element
-            if(!pelm)
+            if (!pelm)
                 return 1;
 
             // check childs element and add it if not found
@@ -239,7 +250,8 @@ int JsonSaveTLVTree(json_t *root, json_t *elm, char *path, struct tlvdb *tlvdbel
     return 0;
 }
 
-bool HexToBuffer(const char *errormsg, const char *hexvalue, uint8_t * buffer, size_t maxbufferlen, size_t *bufferlen) {
+bool HexToBuffer(const char *errormsg, const char *hexvalue, uint8_t *buffer, size_t maxbufferlen, size_t *bufferlen)
+{
     int buflen = 0;
 
     switch (param_gethex_to_eol(hexvalue, 0, buffer, maxbufferlen, &buflen)) {
@@ -259,13 +271,14 @@ bool HexToBuffer(const char *errormsg, const char *hexvalue, uint8_t * buffer, s
         return false;
     }
 
-    if ( bufferlen )
+    if (bufferlen)
         *bufferlen = buflen;
 
     return true;
 }
 
-int JsonLoadStr(json_t *root, char *path, char *value) {
+int JsonLoadStr(json_t *root, char *path, char *value)
+{
     if (!value)
         return 1;
 
@@ -273,7 +286,7 @@ int JsonLoadStr(json_t *root, char *path, char *value) {
     if (!jelm || !json_is_string(jelm))
         return 2;
 
-    const char * strval = json_string_value(jelm);
+    const char *strval = json_string_value(jelm);
     if (!strval)
         return 1;
 
@@ -282,7 +295,8 @@ int JsonLoadStr(json_t *root, char *path, char *value) {
     return 0;
 }
 
-int JsonLoadBufAsHex(json_t *elm, char *path, uint8_t *data, size_t maxbufferlen, size_t *datalen) {
+int JsonLoadBufAsHex(json_t *elm, char *path, uint8_t *data, size_t maxbufferlen, size_t *datalen)
+{
     if (datalen)
         *datalen = 0;
 
@@ -296,7 +310,8 @@ int JsonLoadBufAsHex(json_t *elm, char *path, uint8_t *data, size_t maxbufferlen
     return 0;
 };
 
-bool ParamLoadFromJson(struct tlvdb *tlv) {
+bool ParamLoadFromJson(struct tlvdb *tlv)
+{
     json_t *root;
     json_error_t error;
 
@@ -324,20 +339,18 @@ bool ParamLoadFromJson(struct tlvdb *tlv) {
 
     PrintAndLog("Load params: json(%d) OK", json_array_size(root));
 
-    for(int i = 0; i < json_array_size(root); i++) {
+    for (int i = 0; i < json_array_size(root); i++) {
         json_t *data, *jtag, *jlength, *jvalue;
 
         data = json_array_get(root, i);
-        if(!json_is_object(data))
-        {
+        if (!json_is_object(data)) {
             PrintAndLog("Load params: data [%d] is not an object", i + 1);
             json_decref(root);
             return false;
         }
 
         jtag = json_object_get(data, "tag");
-        if(!json_is_string(jtag))
-        {
+        if (!json_is_string(jtag)) {
             PrintAndLog("Load params: data [%d] tag is not a string", i + 1);
             json_decref(root);
             return false;
@@ -345,8 +358,7 @@ bool ParamLoadFromJson(struct tlvdb *tlv) {
         const char *tlvTag = json_string_value(jtag);
 
         jvalue = json_object_get(data, "value");
-        if(!json_is_string(jvalue))
-        {
+        if (!json_is_string(jvalue)) {
             PrintAndLog("Load params: data [%d] value is not a string", i + 1);
             json_decref(root);
             return false;
@@ -354,8 +366,7 @@ bool ParamLoadFromJson(struct tlvdb *tlv) {
         const char *tlvValue = json_string_value(jvalue);
 
         jlength = json_object_get(data, "length");
-        if(!json_is_number(jlength))
-        {
+        if (!json_is_number(jlength)) {
             PrintAndLog("Load params: data [%d] length is not a number", i + 1);
             json_decref(root);
             return false;
diff --git a/client/emv/emvjson.h b/client/emv/emvjson.h
index 5ca6947f5..d47109f7c 100644
--- a/client/emv/emvjson.h
+++ b/client/emv/emvjson.h
@@ -18,7 +18,7 @@ typedef struct {
     char *Name;
 } ApplicationDataElm;
 
-extern char* GetApplicationDataName(tlv_tag_t tag);
+extern char *GetApplicationDataName(tlv_tag_t tag);
 
 extern int JsonSaveJsonObject(json_t *root, char *path, json_t *value);
 extern int JsonSaveStr(json_t *root, char *path, char *value);
diff --git a/client/emv/test/cda_test.c b/client/emv/test/cda_test.c
index 0047a09bf..69c1b6ac9 100644
--- a/client/emv/test/cda_test.c
+++ b/client/emv/test/cda_test.c
@@ -37,11 +37,13 @@ struct emv_pk c_mchip_05 = {
         0x06, 0xd8, 0xce, 0x70,
         0x2d, 0xa3, 0xea, 0xe8,
         0x90, 0x70, 0x1d, 0x45,
-        0xe2, 0x74, 0xc8, 0x45, },
+        0xe2, 0x74, 0xc8, 0x45,
+    },
     .exp = { 0x03, },
     .elen = 1,
     .mlen = 1408 / 8,
-    .modulus = (unsigned char[]){
+    .modulus = (unsigned char[])
+    {
         0xb8, 0x04, 0x8a, 0xbc, 0x30, 0xc9, 0x0d, 0x97, 0x63, 0x36, 0x54, 0x3e, 0x3f, 0xd7, 0x09, 0x1c,
         0x8f, 0xe4, 0x80, 0x0d, 0xf8, 0x20, 0xed, 0x55, 0xe7, 0xe9, 0x48, 0x13, 0xed, 0x00, 0x55, 0x5b,
         0x57, 0x3f, 0xec, 0xa3, 0xd8, 0x4a, 0xf6, 0x13, 0x1a, 0x65, 0x1d, 0x66, 0xcf, 0xf4, 0x28, 0x4f,
@@ -57,45 +59,45 @@ struct emv_pk c_mchip_05 = {
 };
 
 const unsigned char c_issuer_cert[] = {
-        0x17, 0x14, 0x28, 0x4f, 0x76, 0x3b, 0x85, 0x86, 0xee, 0x6d, 0x31, 0x99, 0x51, 0xf7, 0xe6, 0x3f,
-        0xa2, 0x50, 0x76, 0xe5, 0x0d, 0xc9, 0xd3, 0x20, 0x0b, 0xa9, 0x98, 0xd3, 0xa0, 0x52, 0xad, 0xba,
-        0x9a, 0xb6, 0x9a, 0xc6, 0xad, 0x6a, 0xdd, 0x3c, 0xe0, 0x9f, 0x02, 0x78, 0xf4, 0x07, 0x4e, 0xc4,
-        0xee, 0x9b, 0x1d, 0x22, 0x68, 0xa3, 0xe9, 0x53, 0x57, 0x5e, 0x45, 0x4e, 0x50, 0xcd, 0x86, 0x0b,
-        0xf4, 0x24, 0xc5, 0x1c, 0x59, 0x77, 0x12, 0xd2, 0xaa, 0x05, 0x70, 0x89, 0xdd, 0x86, 0x73, 0xe5,
-        0x1b, 0x1e, 0x1d, 0x71, 0x88, 0x03, 0x48, 0x92, 0x07, 0x7a, 0xc1, 0x8a, 0x6a, 0xe2, 0x34, 0x88,
-        0xbe, 0xa9, 0xdf, 0x3b, 0x1a, 0x83, 0xf2, 0xc0, 0x80, 0x0c, 0xd7, 0xc5, 0xcd, 0xf2, 0xfd, 0xe0,
-        0x49, 0x6f, 0x7b, 0xc3, 0x9f, 0xb4, 0xbf, 0x36, 0x32, 0x99, 0xbf, 0xa6, 0x37, 0xb2, 0xec, 0x33,
-        0xc5, 0x07, 0xe3, 0x68, 0x21, 0xee, 0xc2, 0x07, 0x5f, 0x0e, 0x42, 0x0d, 0x38, 0xa1, 0xc9, 0xf3,
-        0x12, 0x72, 0x61, 0xba, 0x31, 0x6c, 0x98, 0x76, 0x74, 0xfa, 0xdb, 0x20, 0xea, 0x7f, 0xeb, 0x75,
-        0xee, 0x45, 0x5d, 0x12, 0x14, 0x6e, 0xa6, 0xf0, 0x2e, 0x8b, 0x01, 0xec, 0x2f, 0xa7, 0xa1, 0x15,
+    0x17, 0x14, 0x28, 0x4f, 0x76, 0x3b, 0x85, 0x86, 0xee, 0x6d, 0x31, 0x99, 0x51, 0xf7, 0xe6, 0x3f,
+    0xa2, 0x50, 0x76, 0xe5, 0x0d, 0xc9, 0xd3, 0x20, 0x0b, 0xa9, 0x98, 0xd3, 0xa0, 0x52, 0xad, 0xba,
+    0x9a, 0xb6, 0x9a, 0xc6, 0xad, 0x6a, 0xdd, 0x3c, 0xe0, 0x9f, 0x02, 0x78, 0xf4, 0x07, 0x4e, 0xc4,
+    0xee, 0x9b, 0x1d, 0x22, 0x68, 0xa3, 0xe9, 0x53, 0x57, 0x5e, 0x45, 0x4e, 0x50, 0xcd, 0x86, 0x0b,
+    0xf4, 0x24, 0xc5, 0x1c, 0x59, 0x77, 0x12, 0xd2, 0xaa, 0x05, 0x70, 0x89, 0xdd, 0x86, 0x73, 0xe5,
+    0x1b, 0x1e, 0x1d, 0x71, 0x88, 0x03, 0x48, 0x92, 0x07, 0x7a, 0xc1, 0x8a, 0x6a, 0xe2, 0x34, 0x88,
+    0xbe, 0xa9, 0xdf, 0x3b, 0x1a, 0x83, 0xf2, 0xc0, 0x80, 0x0c, 0xd7, 0xc5, 0xcd, 0xf2, 0xfd, 0xe0,
+    0x49, 0x6f, 0x7b, 0xc3, 0x9f, 0xb4, 0xbf, 0x36, 0x32, 0x99, 0xbf, 0xa6, 0x37, 0xb2, 0xec, 0x33,
+    0xc5, 0x07, 0xe3, 0x68, 0x21, 0xee, 0xc2, 0x07, 0x5f, 0x0e, 0x42, 0x0d, 0x38, 0xa1, 0xc9, 0xf3,
+    0x12, 0x72, 0x61, 0xba, 0x31, 0x6c, 0x98, 0x76, 0x74, 0xfa, 0xdb, 0x20, 0xea, 0x7f, 0xeb, 0x75,
+    0xee, 0x45, 0x5d, 0x12, 0x14, 0x6e, 0xa6, 0xf0, 0x2e, 0x8b, 0x01, 0xec, 0x2f, 0xa7, 0xa1, 0x15,
 };
 
 const unsigned char c_issuer_rem[] = {
-        0x6e, 0x63, 0xb7, 0xbc, 0x70, 0xab, 0xdd, 0x09, 0x34, 0x1b, 0x34, 0xc0, 0x32, 0x86, 0xba, 0x9b,
-        0xd8, 0x3b, 0xa7, 0x93, 0x6c, 0x5b, 0x77, 0x98, 0xfb, 0x22, 0xc5, 0xe5, 0x3f, 0xf2, 0x40, 0xa2,
-        0x6d, 0xbd, 0x64, 0x15,
+    0x6e, 0x63, 0xb7, 0xbc, 0x70, 0xab, 0xdd, 0x09, 0x34, 0x1b, 0x34, 0xc0, 0x32, 0x86, 0xba, 0x9b,
+    0xd8, 0x3b, 0xa7, 0x93, 0x6c, 0x5b, 0x77, 0x98, 0xfb, 0x22, 0xc5, 0xe5, 0x3f, 0xf2, 0x40, 0xa2,
+    0x6d, 0xbd, 0x64, 0x15,
 };
 
 const unsigned char c_issuer_exp[] = {
-        0x03,
+    0x03,
 };
 
 const unsigned char c_icc_cert[] = {
-        0xa4, 0x2f, 0xbe, 0xb1, 0x56, 0xb9, 0x8d, 0xcb, 0x05, 0x54, 0xda, 0x06, 0x2a, 0xdc, 0xa5, 0x30,
-        0x9a, 0x91, 0xf0, 0x4f, 0xa2, 0xc7, 0xbd, 0x71, 0x02, 0xa8, 0xd7, 0x3f, 0x16, 0xa3, 0xcf, 0xad,
-        0xe8, 0xaa, 0xdf, 0x4f, 0x3f, 0xe2, 0xa2, 0x12, 0x5c, 0xcd, 0xd7, 0x7c, 0x6b, 0x9f, 0x78, 0xb5,
-        0xb4, 0x37, 0x1c, 0xe0, 0x80, 0x57, 0x25, 0xb0, 0xf9, 0xc0, 0x27, 0xaf, 0x14, 0x7d, 0x91, 0xe1,
-        0xff, 0xdb, 0x20, 0x1e, 0x9c, 0x17, 0x0c, 0xe7, 0x77, 0x05, 0x3a, 0x17, 0x2a, 0xd5, 0x26, 0xdc,
-        0xaf, 0xd3, 0x38, 0x95, 0xe1, 0xa9, 0x47, 0x30, 0x5c, 0x5b, 0x16, 0x7f, 0x2e, 0x7c, 0x6f, 0x99,
-        0x15, 0x81, 0xa6, 0x52, 0xee, 0x47, 0x31, 0x54, 0x76, 0x0c, 0x2e, 0xd7, 0x74, 0x21, 0x4e, 0x50,
-        0xdf, 0xec, 0xdd, 0x4c, 0xf2, 0x94, 0xc9, 0x74, 0xb8, 0x9e, 0xbc, 0xa2, 0x5b, 0x5a, 0xb3, 0xc0,
-        0xbe, 0xb5, 0x0d, 0xfa, 0xf7, 0x82, 0xaf, 0xde, 0x14, 0x33, 0xd9, 0x0c, 0xa2, 0xa8, 0x9d, 0x65,
-        0x1e, 0x75, 0xd6, 0x7e, 0xbc, 0x7c, 0x3e, 0x36, 0xf5, 0xa1, 0x65, 0xee, 0x61, 0x32, 0x61, 0x29,
-        0x39, 0xc1, 0xec, 0xd3, 0x99, 0xe4, 0x60, 0x74, 0xb9, 0x96, 0xd9, 0x3a, 0x88, 0xe0, 0x1e, 0x0a,
+    0xa4, 0x2f, 0xbe, 0xb1, 0x56, 0xb9, 0x8d, 0xcb, 0x05, 0x54, 0xda, 0x06, 0x2a, 0xdc, 0xa5, 0x30,
+    0x9a, 0x91, 0xf0, 0x4f, 0xa2, 0xc7, 0xbd, 0x71, 0x02, 0xa8, 0xd7, 0x3f, 0x16, 0xa3, 0xcf, 0xad,
+    0xe8, 0xaa, 0xdf, 0x4f, 0x3f, 0xe2, 0xa2, 0x12, 0x5c, 0xcd, 0xd7, 0x7c, 0x6b, 0x9f, 0x78, 0xb5,
+    0xb4, 0x37, 0x1c, 0xe0, 0x80, 0x57, 0x25, 0xb0, 0xf9, 0xc0, 0x27, 0xaf, 0x14, 0x7d, 0x91, 0xe1,
+    0xff, 0xdb, 0x20, 0x1e, 0x9c, 0x17, 0x0c, 0xe7, 0x77, 0x05, 0x3a, 0x17, 0x2a, 0xd5, 0x26, 0xdc,
+    0xaf, 0xd3, 0x38, 0x95, 0xe1, 0xa9, 0x47, 0x30, 0x5c, 0x5b, 0x16, 0x7f, 0x2e, 0x7c, 0x6f, 0x99,
+    0x15, 0x81, 0xa6, 0x52, 0xee, 0x47, 0x31, 0x54, 0x76, 0x0c, 0x2e, 0xd7, 0x74, 0x21, 0x4e, 0x50,
+    0xdf, 0xec, 0xdd, 0x4c, 0xf2, 0x94, 0xc9, 0x74, 0xb8, 0x9e, 0xbc, 0xa2, 0x5b, 0x5a, 0xb3, 0xc0,
+    0xbe, 0xb5, 0x0d, 0xfa, 0xf7, 0x82, 0xaf, 0xde, 0x14, 0x33, 0xd9, 0x0c, 0xa2, 0xa8, 0x9d, 0x65,
+    0x1e, 0x75, 0xd6, 0x7e, 0xbc, 0x7c, 0x3e, 0x36, 0xf5, 0xa1, 0x65, 0xee, 0x61, 0x32, 0x61, 0x29,
+    0x39, 0xc1, 0xec, 0xd3, 0x99, 0xe4, 0x60, 0x74, 0xb9, 0x96, 0xd9, 0x3a, 0x88, 0xe0, 0x1e, 0x0a,
 };
 
 const unsigned char c_icc_exp[] = {
-        0x03,
+    0x03,
 };
 
 const unsigned char c_sdad_cr[] = {
@@ -153,8 +155,8 @@ static int cda_test_raw(bool verbose)
     const struct emv_pk *pk = &c_mchip_05;
 
     struct crypto_pk *kcp = crypto_pk_open(PK_RSA,
-            pk->modulus, pk->mlen,
-            pk->exp, pk->elen);
+                                           pk->modulus, pk->mlen,
+                                           pk->exp, pk->elen);
     if (!kcp)
         return 1;
 
@@ -212,7 +214,7 @@ static int cda_test_raw(bool verbose)
     free(ipk_data);
 
     struct crypto_pk *ikcp = crypto_pk_open(PK_RSA, ipk_pk, (int) ipk_pk_len,
-            c_issuer_exp, (int) sizeof(c_issuer_exp));
+                                            c_issuer_exp, (int) sizeof(c_issuer_exp));
     free(ipk_pk);
     if (!ikcp)
         return 1;
@@ -270,7 +272,7 @@ static int cda_test_raw(bool verbose)
     free(iccpk_data);
 
     struct crypto_pk *icckcp = crypto_pk_open(PK_RSA, iccpk_pk, (int) iccpk_pk_len,
-            c_issuer_exp, (int) sizeof(c_issuer_exp));
+                                              c_issuer_exp, (int) sizeof(c_issuer_exp));
     free(iccpk_pk);
     if (!icckcp)
         return 1;
@@ -375,16 +377,16 @@ static int cda_test_pk(bool verbose)
     tlvdb_add(db, tlvdb_fixed(0x9f37, sizeof(c_dd1), c_dd1));
 
     struct tlvdb *cda_db;
-    cda_db = tlvdb_fixed(0x9f27, 1, (unsigned char[]){ 0x40 });
+    cda_db = tlvdb_fixed(0x9f27, 1, (unsigned char[]) { 0x40 });
     tlvdb_add(cda_db, tlvdb_fixed(0x9f36, 2, (unsigned char[]) { 0x00, 0x10 }));
     tlvdb_add(cda_db, tlvdb_external(0x9f4b, sizeof(c_sdad_cr), c_sdad_cr));
     tlvdb_add(cda_db, tlvdb_fixed(0x9f10, 0x12,
-            (unsigned char[]) { 0x00, 0x10, 0x90, 0x40, 0x01, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff}));
+    (unsigned char[]) { 0x00, 0x10, 0x90, 0x40, 0x01, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff}));
 
     struct tlvdb *idndb = emv_pki_perform_cda(iccpk, db, cda_db,
-            NULL,
-            &crm1_tlv,
-            NULL);
+                                              NULL,
+                                              &crm1_tlv,
+                                              NULL);
     if (!idndb) {
         fprintf(stderr, "Could not recover IDN!\n");
         tlvdb_free(cda_db);
diff --git a/client/emv/test/crypto_test.c b/client/emv/test/crypto_test.c
index 93391eaae..ab8a7cb2e 100644
--- a/client/emv/test/crypto_test.c
+++ b/client/emv/test/crypto_test.c
@@ -204,8 +204,8 @@ static int test_pk(bool verbose)
     printf("Testing public keys interfaces\n");
 
     pubk = crypto_pk_open(PK_RSA,
-            pk_N, sizeof(pk_N),
-            pk_E, sizeof(pk_E));
+                          pk_N, sizeof(pk_N),
+                          pk_E, sizeof(pk_E));
     if (!pubk) {
         fprintf(stderr, "ERROR: open public key.\n");
         return 1;
@@ -234,14 +234,14 @@ static int test_pk(bool verbose)
     free(tmp);
 
     privk = crypto_pk_open_priv(PK_RSA,
-            pk_N, sizeof(pk_N),
-            pk_E, sizeof(pk_E),
-            pk_D, sizeof(pk_D),
-            pk_P, sizeof(pk_P),
-            pk_Q, sizeof(pk_Q),
-            pk_dP, sizeof(pk_dP),
-            pk_dQ, sizeof(pk_dQ),
-            pk_I, sizeof(pk_I));
+                                pk_N, sizeof(pk_N),
+                                pk_E, sizeof(pk_E),
+                                pk_D, sizeof(pk_D),
+                                pk_P, sizeof(pk_P),
+                                pk_Q, sizeof(pk_Q),
+                                pk_dP, sizeof(pk_dP),
+                                pk_dQ, sizeof(pk_dQ),
+                                pk_I, sizeof(pk_I));
     if (!privk) {
         fprintf(stderr, "ERROR: open private key.\n");
         goto close_pub;
diff --git a/client/emv/test/crypto_test.h b/client/emv/test/crypto_test.h
index 084bc9919..04159c4f0 100644
--- a/client/emv/test/crypto_test.h
+++ b/client/emv/test/crypto_test.h
@@ -13,6 +13,6 @@
  * Lesser General Public License for more details.
  */
 
- #include <stdbool.h>
+#include <stdbool.h>
 
 extern int exec_crypto_test(bool verbose);
diff --git a/client/emv/test/cryptotest.c b/client/emv/test/cryptotest.c
index d442da1c1..e5259f417 100644
--- a/client/emv/test/cryptotest.c
+++ b/client/emv/test/cryptotest.c
@@ -33,7 +33,8 @@
 #include "crypto/libpcrypto.h"
 #include "emv/emv_roca.h"
 
-int ExecuteCryptoTests(bool verbose) {
+int ExecuteCryptoTests(bool verbose)
+{
     int res;
     bool TestFail = false;
 
@@ -97,9 +98,9 @@ int ExecuteCryptoTests(bool verbose) {
     PrintAndLog("\n--------------------------");
 
     if (TestFail)
-        PrintAndLogEx(FAILED, "\tTest(s) [ %s ]", _RED_(FAIL) );
+        PrintAndLogEx(FAILED, "\tTest(s) [ %s ]", _RED_(FAIL));
     else
-        PrintAndLogEx(SUCCESS, "\tTest(s) [ %s ]", _GREEN_(OK) );
+        PrintAndLogEx(SUCCESS, "\tTest(s) [ %s ]", _GREEN_(OK));
 
     return TestFail;
 }
diff --git a/client/emv/test/dda_test.c b/client/emv/test/dda_test.c
index 0fc12ee1f..14f819923 100644
--- a/client/emv/test/dda_test.c
+++ b/client/emv/test/dda_test.c
@@ -39,11 +39,13 @@ struct emv_pk mchip_05 = {
         0x06, 0xd8, 0xce, 0x70,
         0x2d, 0xa3, 0xea, 0xe8,
         0x90, 0x70, 0x1d, 0x45,
-        0xe2, 0x74, 0xc8, 0x45, },
+        0xe2, 0x74, 0xc8, 0x45,
+    },
     .exp = { 0x03, },
     .elen = 1,
     .mlen = 1408 / 8,
-    .modulus = (unsigned char[]){
+    .modulus = (unsigned char[])
+    {
         0xb8, 0x04, 0x8a, 0xbc, 0x30, 0xc9, 0x0d, 0x97, 0x63, 0x36, 0x54, 0x3e, 0x3f, 0xd7, 0x09, 0x1c,
         0x8f, 0xe4, 0x80, 0x0d, 0xf8, 0x20, 0xed, 0x55, 0xe7, 0xe9, 0x48, 0x13, 0xed, 0x00, 0x55, 0x5b,
         0x57, 0x3f, 0xec, 0xa3, 0xd8, 0x4a, 0xf6, 0x13, 0x1a, 0x65, 0x1d, 0x66, 0xcf, 0xf4, 0x28, 0x4f,
@@ -59,45 +61,45 @@ struct emv_pk mchip_05 = {
 };
 
 const unsigned char d_issuer_cert[] = {
-        0x17, 0x14, 0x28, 0x4f, 0x76, 0x3b, 0x85, 0x86, 0xee, 0x6d, 0x31, 0x99, 0x51, 0xf7, 0xe6, 0x3f,
-        0xa2, 0x50, 0x76, 0xe5, 0x0d, 0xc9, 0xd3, 0x20, 0x0b, 0xa9, 0x98, 0xd3, 0xa0, 0x52, 0xad, 0xba,
-        0x9a, 0xb6, 0x9a, 0xc6, 0xad, 0x6a, 0xdd, 0x3c, 0xe0, 0x9f, 0x02, 0x78, 0xf4, 0x07, 0x4e, 0xc4,
-        0xee, 0x9b, 0x1d, 0x22, 0x68, 0xa3, 0xe9, 0x53, 0x57, 0x5e, 0x45, 0x4e, 0x50, 0xcd, 0x86, 0x0b,
-        0xf4, 0x24, 0xc5, 0x1c, 0x59, 0x77, 0x12, 0xd2, 0xaa, 0x05, 0x70, 0x89, 0xdd, 0x86, 0x73, 0xe5,
-        0x1b, 0x1e, 0x1d, 0x71, 0x88, 0x03, 0x48, 0x92, 0x07, 0x7a, 0xc1, 0x8a, 0x6a, 0xe2, 0x34, 0x88,
-        0xbe, 0xa9, 0xdf, 0x3b, 0x1a, 0x83, 0xf2, 0xc0, 0x80, 0x0c, 0xd7, 0xc5, 0xcd, 0xf2, 0xfd, 0xe0,
-        0x49, 0x6f, 0x7b, 0xc3, 0x9f, 0xb4, 0xbf, 0x36, 0x32, 0x99, 0xbf, 0xa6, 0x37, 0xb2, 0xec, 0x33,
-        0xc5, 0x07, 0xe3, 0x68, 0x21, 0xee, 0xc2, 0x07, 0x5f, 0x0e, 0x42, 0x0d, 0x38, 0xa1, 0xc9, 0xf3,
-        0x12, 0x72, 0x61, 0xba, 0x31, 0x6c, 0x98, 0x76, 0x74, 0xfa, 0xdb, 0x20, 0xea, 0x7f, 0xeb, 0x75,
-        0xee, 0x45, 0x5d, 0x12, 0x14, 0x6e, 0xa6, 0xf0, 0x2e, 0x8b, 0x01, 0xec, 0x2f, 0xa7, 0xa1, 0x15,
+    0x17, 0x14, 0x28, 0x4f, 0x76, 0x3b, 0x85, 0x86, 0xee, 0x6d, 0x31, 0x99, 0x51, 0xf7, 0xe6, 0x3f,
+    0xa2, 0x50, 0x76, 0xe5, 0x0d, 0xc9, 0xd3, 0x20, 0x0b, 0xa9, 0x98, 0xd3, 0xa0, 0x52, 0xad, 0xba,
+    0x9a, 0xb6, 0x9a, 0xc6, 0xad, 0x6a, 0xdd, 0x3c, 0xe0, 0x9f, 0x02, 0x78, 0xf4, 0x07, 0x4e, 0xc4,
+    0xee, 0x9b, 0x1d, 0x22, 0x68, 0xa3, 0xe9, 0x53, 0x57, 0x5e, 0x45, 0x4e, 0x50, 0xcd, 0x86, 0x0b,
+    0xf4, 0x24, 0xc5, 0x1c, 0x59, 0x77, 0x12, 0xd2, 0xaa, 0x05, 0x70, 0x89, 0xdd, 0x86, 0x73, 0xe5,
+    0x1b, 0x1e, 0x1d, 0x71, 0x88, 0x03, 0x48, 0x92, 0x07, 0x7a, 0xc1, 0x8a, 0x6a, 0xe2, 0x34, 0x88,
+    0xbe, 0xa9, 0xdf, 0x3b, 0x1a, 0x83, 0xf2, 0xc0, 0x80, 0x0c, 0xd7, 0xc5, 0xcd, 0xf2, 0xfd, 0xe0,
+    0x49, 0x6f, 0x7b, 0xc3, 0x9f, 0xb4, 0xbf, 0x36, 0x32, 0x99, 0xbf, 0xa6, 0x37, 0xb2, 0xec, 0x33,
+    0xc5, 0x07, 0xe3, 0x68, 0x21, 0xee, 0xc2, 0x07, 0x5f, 0x0e, 0x42, 0x0d, 0x38, 0xa1, 0xc9, 0xf3,
+    0x12, 0x72, 0x61, 0xba, 0x31, 0x6c, 0x98, 0x76, 0x74, 0xfa, 0xdb, 0x20, 0xea, 0x7f, 0xeb, 0x75,
+    0xee, 0x45, 0x5d, 0x12, 0x14, 0x6e, 0xa6, 0xf0, 0x2e, 0x8b, 0x01, 0xec, 0x2f, 0xa7, 0xa1, 0x15,
 };
 
 const unsigned char d_issuer_rem[] = {
-        0x6e, 0x63, 0xb7, 0xbc, 0x70, 0xab, 0xdd, 0x09, 0x34, 0x1b, 0x34, 0xc0, 0x32, 0x86, 0xba, 0x9b,
-        0xd8, 0x3b, 0xa7, 0x93, 0x6c, 0x5b, 0x77, 0x98, 0xfb, 0x22, 0xc5, 0xe5, 0x3f, 0xf2, 0x40, 0xa2,
-        0x6d, 0xbd, 0x64, 0x15,
+    0x6e, 0x63, 0xb7, 0xbc, 0x70, 0xab, 0xdd, 0x09, 0x34, 0x1b, 0x34, 0xc0, 0x32, 0x86, 0xba, 0x9b,
+    0xd8, 0x3b, 0xa7, 0x93, 0x6c, 0x5b, 0x77, 0x98, 0xfb, 0x22, 0xc5, 0xe5, 0x3f, 0xf2, 0x40, 0xa2,
+    0x6d, 0xbd, 0x64, 0x15,
 };
 
 const unsigned char d_issuer_exp[] = {
-        0x03,
+    0x03,
 };
 
 const unsigned char d_icc_cert[] = {
-        0xa4, 0x2f, 0xbe, 0xb1, 0x56, 0xb9, 0x8d, 0xcb, 0x05, 0x54, 0xda, 0x06, 0x2a, 0xdc, 0xa5, 0x30,
-        0x9a, 0x91, 0xf0, 0x4f, 0xa2, 0xc7, 0xbd, 0x71, 0x02, 0xa8, 0xd7, 0x3f, 0x16, 0xa3, 0xcf, 0xad,
-        0xe8, 0xaa, 0xdf, 0x4f, 0x3f, 0xe2, 0xa2, 0x12, 0x5c, 0xcd, 0xd7, 0x7c, 0x6b, 0x9f, 0x78, 0xb5,
-        0xb4, 0x37, 0x1c, 0xe0, 0x80, 0x57, 0x25, 0xb0, 0xf9, 0xc0, 0x27, 0xaf, 0x14, 0x7d, 0x91, 0xe1,
-        0xff, 0xdb, 0x20, 0x1e, 0x9c, 0x17, 0x0c, 0xe7, 0x77, 0x05, 0x3a, 0x17, 0x2a, 0xd5, 0x26, 0xdc,
-        0xaf, 0xd3, 0x38, 0x95, 0xe1, 0xa9, 0x47, 0x30, 0x5c, 0x5b, 0x16, 0x7f, 0x2e, 0x7c, 0x6f, 0x99,
-        0x15, 0x81, 0xa6, 0x52, 0xee, 0x47, 0x31, 0x54, 0x76, 0x0c, 0x2e, 0xd7, 0x74, 0x21, 0x4e, 0x50,
-        0xdf, 0xec, 0xdd, 0x4c, 0xf2, 0x94, 0xc9, 0x74, 0xb8, 0x9e, 0xbc, 0xa2, 0x5b, 0x5a, 0xb3, 0xc0,
-        0xbe, 0xb5, 0x0d, 0xfa, 0xf7, 0x82, 0xaf, 0xde, 0x14, 0x33, 0xd9, 0x0c, 0xa2, 0xa8, 0x9d, 0x65,
-        0x1e, 0x75, 0xd6, 0x7e, 0xbc, 0x7c, 0x3e, 0x36, 0xf5, 0xa1, 0x65, 0xee, 0x61, 0x32, 0x61, 0x29,
-        0x39, 0xc1, 0xec, 0xd3, 0x99, 0xe4, 0x60, 0x74, 0xb9, 0x96, 0xd9, 0x3a, 0x88, 0xe0, 0x1e, 0x0a,
+    0xa4, 0x2f, 0xbe, 0xb1, 0x56, 0xb9, 0x8d, 0xcb, 0x05, 0x54, 0xda, 0x06, 0x2a, 0xdc, 0xa5, 0x30,
+    0x9a, 0x91, 0xf0, 0x4f, 0xa2, 0xc7, 0xbd, 0x71, 0x02, 0xa8, 0xd7, 0x3f, 0x16, 0xa3, 0xcf, 0xad,
+    0xe8, 0xaa, 0xdf, 0x4f, 0x3f, 0xe2, 0xa2, 0x12, 0x5c, 0xcd, 0xd7, 0x7c, 0x6b, 0x9f, 0x78, 0xb5,
+    0xb4, 0x37, 0x1c, 0xe0, 0x80, 0x57, 0x25, 0xb0, 0xf9, 0xc0, 0x27, 0xaf, 0x14, 0x7d, 0x91, 0xe1,
+    0xff, 0xdb, 0x20, 0x1e, 0x9c, 0x17, 0x0c, 0xe7, 0x77, 0x05, 0x3a, 0x17, 0x2a, 0xd5, 0x26, 0xdc,
+    0xaf, 0xd3, 0x38, 0x95, 0xe1, 0xa9, 0x47, 0x30, 0x5c, 0x5b, 0x16, 0x7f, 0x2e, 0x7c, 0x6f, 0x99,
+    0x15, 0x81, 0xa6, 0x52, 0xee, 0x47, 0x31, 0x54, 0x76, 0x0c, 0x2e, 0xd7, 0x74, 0x21, 0x4e, 0x50,
+    0xdf, 0xec, 0xdd, 0x4c, 0xf2, 0x94, 0xc9, 0x74, 0xb8, 0x9e, 0xbc, 0xa2, 0x5b, 0x5a, 0xb3, 0xc0,
+    0xbe, 0xb5, 0x0d, 0xfa, 0xf7, 0x82, 0xaf, 0xde, 0x14, 0x33, 0xd9, 0x0c, 0xa2, 0xa8, 0x9d, 0x65,
+    0x1e, 0x75, 0xd6, 0x7e, 0xbc, 0x7c, 0x3e, 0x36, 0xf5, 0xa1, 0x65, 0xee, 0x61, 0x32, 0x61, 0x29,
+    0x39, 0xc1, 0xec, 0xd3, 0x99, 0xe4, 0x60, 0x74, 0xb9, 0x96, 0xd9, 0x3a, 0x88, 0xe0, 0x1e, 0x0a,
 };
 
 const unsigned char d_icc_exp[] = {
-        0x03,
+    0x03,
 };
 
 const unsigned char d_sdad_cr[] = {
@@ -143,8 +145,8 @@ static int dda_test_raw(bool verbose)
     const struct emv_pk *pk = &mchip_05;
 
     struct crypto_pk *kcp = crypto_pk_open(PK_RSA,
-            pk->modulus, pk->mlen,
-            pk->exp, pk->elen);
+                                           pk->modulus, pk->mlen,
+                                           pk->exp, pk->elen);
     if (!kcp)
         return 1;
 
@@ -202,7 +204,7 @@ static int dda_test_raw(bool verbose)
     free(ipk_data);
 
     struct crypto_pk *ikcp = crypto_pk_open(PK_RSA, ipk_pk, (int) ipk_pk_len,
-            d_issuer_exp, (int) sizeof(d_issuer_exp));
+                                            d_issuer_exp, (int) sizeof(d_issuer_exp));
     free(ipk_pk);
     if (!ikcp)
         return 1;
@@ -260,7 +262,7 @@ static int dda_test_raw(bool verbose)
     free(iccpk_data);
 
     struct crypto_pk *icckcp = crypto_pk_open(PK_RSA, iccpk_pk, (int) iccpk_pk_len,
-            d_issuer_exp, (int) sizeof(d_issuer_exp));
+                                              d_issuer_exp, (int) sizeof(d_issuer_exp));
     free(iccpk_pk);
     if (!icckcp)
         return 1;
diff --git a/client/emv/test/sda_test.c b/client/emv/test/sda_test.c
index df1620cfd..7b9fbfffb 100644
--- a/client/emv/test/sda_test.c
+++ b/client/emv/test/sda_test.c
@@ -37,11 +37,13 @@ struct emv_pk vsdc_01 = {
         0x60, 0x11, 0xc7, 0xe7,
         0xce, 0x3a, 0xec, 0x5f,
         0x03, 0xad, 0x2f, 0x8c,
-        0xfc, 0x55, 0x03, 0xcc, },
+        0xfc, 0x55, 0x03, 0xcc,
+    },
     .exp = { 0x03, },
     .elen = 1,
     .mlen = 1024 / 8,
-    .modulus = (unsigned char[]){
+    .modulus = (unsigned char[])
+    {
         0xc6, 0x96, 0x03, 0x42, 0x13, 0xd7, 0xd8, 0x54, 0x69, 0x84, 0x57, 0x9d, 0x1d, 0x0f, 0x0e, 0xa5,
         0x19, 0xcf, 0xf8, 0xde, 0xff, 0xc4, 0x29, 0x35, 0x4c, 0xf3, 0xa8, 0x71, 0xa6, 0xf7, 0x18, 0x3f,
         0x12, 0x28, 0xda, 0x5c, 0x74, 0x70, 0xc0, 0x55, 0x38, 0x71, 0x00, 0xcb, 0x93, 0x5a, 0x71, 0x2c,
@@ -54,35 +56,35 @@ struct emv_pk vsdc_01 = {
 };
 
 const unsigned char issuer_cert[] = {
-        0x3c, 0x5f, 0xea, 0xd4, 0xdd, 0x7b, 0xca, 0x44, 0xf9, 0x3e, 0x90, 0xc4, 0x4f, 0x76, 0xed, 0xe5,
-        0x4a, 0x32, 0x88, 0xec, 0xdc, 0x78, 0x46, 0x9f, 0xcb, 0x12, 0x25, 0xc0, 0x3b, 0x2c, 0x04, 0xf2,
-        0xc2, 0xf4, 0x12, 0x28, 0x1a, 0x08, 0x22, 0xdf, 0x14, 0x64, 0x92, 0x30, 0x98, 0x9f, 0xb1, 0x49,
-        0x40, 0x70, 0xda, 0xf8, 0xc9, 0x53, 0x4a, 0x78, 0x81, 0x96, 0x01, 0x48, 0x61, 0x6a, 0xce, 0x58,
-        0x17, 0x88, 0x12, 0x0d, 0x35, 0x06, 0xac, 0xe4, 0xce, 0xe5, 0x64, 0xfb, 0x27, 0xee, 0x53, 0x34,
-        0x1c, 0x22, 0xf0, 0xb4, 0x5b, 0x31, 0x87, 0x3d, 0x05, 0xde, 0x54, 0x5e, 0xfe, 0x33, 0xbc, 0xd2,
-        0x9b, 0x21, 0x85, 0xd0, 0x35, 0xa8, 0x06, 0xad, 0x08, 0xc6, 0x97, 0x6f, 0x35, 0x05, 0xa1, 0x99,
-        0x99, 0x93, 0x0c, 0xa8, 0xa0, 0x3e, 0xfa, 0x32, 0x1c, 0x48, 0x60, 0x61, 0xf7, 0xdc, 0xec, 0x9f,
+    0x3c, 0x5f, 0xea, 0xd4, 0xdd, 0x7b, 0xca, 0x44, 0xf9, 0x3e, 0x90, 0xc4, 0x4f, 0x76, 0xed, 0xe5,
+    0x4a, 0x32, 0x88, 0xec, 0xdc, 0x78, 0x46, 0x9f, 0xcb, 0x12, 0x25, 0xc0, 0x3b, 0x2c, 0x04, 0xf2,
+    0xc2, 0xf4, 0x12, 0x28, 0x1a, 0x08, 0x22, 0xdf, 0x14, 0x64, 0x92, 0x30, 0x98, 0x9f, 0xb1, 0x49,
+    0x40, 0x70, 0xda, 0xf8, 0xc9, 0x53, 0x4a, 0x78, 0x81, 0x96, 0x01, 0x48, 0x61, 0x6a, 0xce, 0x58,
+    0x17, 0x88, 0x12, 0x0d, 0x35, 0x06, 0xac, 0xe4, 0xce, 0xe5, 0x64, 0xfb, 0x27, 0xee, 0x53, 0x34,
+    0x1c, 0x22, 0xf0, 0xb4, 0x5b, 0x31, 0x87, 0x3d, 0x05, 0xde, 0x54, 0x5e, 0xfe, 0x33, 0xbc, 0xd2,
+    0x9b, 0x21, 0x85, 0xd0, 0x35, 0xa8, 0x06, 0xad, 0x08, 0xc6, 0x97, 0x6f, 0x35, 0x05, 0xa1, 0x99,
+    0x99, 0x93, 0x0c, 0xa8, 0xa0, 0x3e, 0xfa, 0x32, 0x1c, 0x48, 0x60, 0x61, 0xf7, 0xdc, 0xec, 0x9f,
 };
 
 const unsigned char issuer_rem[] = {
-        0x1e, 0xbc, 0xa3, 0x0f, 0x00, 0xce, 0x59, 0x62, 0xa8, 0xc6, 0xe1, 0x30, 0x54, 0x4b, 0x82, 0x89,
-        0x1b, 0x23, 0x6c, 0x65, 0xde, 0x29, 0x31, 0x7f, 0x36, 0x47, 0x35, 0xde, 0xe6, 0x3f, 0x65, 0x98,
-        0x97, 0x58, 0x35, 0xd5
+    0x1e, 0xbc, 0xa3, 0x0f, 0x00, 0xce, 0x59, 0x62, 0xa8, 0xc6, 0xe1, 0x30, 0x54, 0x4b, 0x82, 0x89,
+    0x1b, 0x23, 0x6c, 0x65, 0xde, 0x29, 0x31, 0x7f, 0x36, 0x47, 0x35, 0xde, 0xe6, 0x3f, 0x65, 0x98,
+    0x97, 0x58, 0x35, 0xd5
 };
 
 const unsigned char issuer_exp[] = {
-        0x03,
+    0x03,
 };
 
 const unsigned char ssad_cr[] = {
-        0x99, 0xa5, 0x58, 0xb6, 0x2b, 0x67, 0x4a, 0xa5, 0xe7, 0xd2, 0xa5, 0x7e, 0x5e, 0xf6, 0xa6, 0xf2,
-        0x25, 0x8e, 0x5d, 0xa0, 0x52, 0xd0, 0x5b, 0x54, 0xe5, 0xc1, 0x15, 0xff, 0x1c, 0xec, 0xf9, 0x4a,
-        0xa2, 0xdf, 0x8f, 0x39, 0xa0, 0x1d, 0x71, 0xc6, 0x19, 0xeb, 0x81, 0x9d, 0xa5, 0x2e, 0xf3, 0x81,
-        0xe8, 0x49, 0x79, 0x58, 0x6a, 0xea, 0x78, 0x55, 0xff, 0xbe, 0xf4, 0x0a, 0xa3, 0xa7, 0x1c, 0xd3,
-        0xb0, 0x4c, 0xfd, 0xf2, 0x70, 0xae, 0xc8, 0x15, 0x8a, 0x27, 0x97, 0xf2, 0x4f, 0xd6, 0x13, 0xb7,
-        0x48, 0x13, 0x46, 0x61, 0x13, 0x5c, 0xd2, 0x90, 0xe4, 0x5b, 0x04, 0xa8, 0xe0, 0xcc, 0xc7, 0x11,
-        0xae, 0x04, 0x2f, 0x15, 0x9e, 0x73, 0xc8, 0x9c, 0x2a, 0x7e, 0x65, 0xa4, 0xc2, 0xfd, 0x1d, 0x61,
-        0x06, 0x02, 0x4a, 0xa2, 0x71, 0x30, 0xb0, 0xec, 0xec, 0x02, 0x38, 0xf9, 0x16, 0x59, 0xde, 0x96,
+    0x99, 0xa5, 0x58, 0xb6, 0x2b, 0x67, 0x4a, 0xa5, 0xe7, 0xd2, 0xa5, 0x7e, 0x5e, 0xf6, 0xa6, 0xf2,
+    0x25, 0x8e, 0x5d, 0xa0, 0x52, 0xd0, 0x5b, 0x54, 0xe5, 0xc1, 0x15, 0xff, 0x1c, 0xec, 0xf9, 0x4a,
+    0xa2, 0xdf, 0x8f, 0x39, 0xa0, 0x1d, 0x71, 0xc6, 0x19, 0xeb, 0x81, 0x9d, 0xa5, 0x2e, 0xf3, 0x81,
+    0xe8, 0x49, 0x79, 0x58, 0x6a, 0xea, 0x78, 0x55, 0xff, 0xbe, 0xf4, 0x0a, 0xa3, 0xa7, 0x1c, 0xd3,
+    0xb0, 0x4c, 0xfd, 0xf2, 0x70, 0xae, 0xc8, 0x15, 0x8a, 0x27, 0x97, 0xf2, 0x4f, 0xd6, 0x13, 0xb7,
+    0x48, 0x13, 0x46, 0x61, 0x13, 0x5c, 0xd2, 0x90, 0xe4, 0x5b, 0x04, 0xa8, 0xe0, 0xcc, 0xc7, 0x11,
+    0xae, 0x04, 0x2f, 0x15, 0x9e, 0x73, 0xc8, 0x9c, 0x2a, 0x7e, 0x65, 0xa4, 0xc2, 0xfd, 0x1d, 0x61,
+    0x06, 0x02, 0x4a, 0xa2, 0x71, 0x30, 0xb0, 0xec, 0xec, 0x02, 0x38, 0xf9, 0x16, 0x59, 0xde, 0x96,
 };
 
 const unsigned char ssd1[] = {
@@ -103,8 +105,8 @@ static int sda_test_raw(bool verbose)
     const struct emv_pk *pk = &vsdc_01;
 
     struct crypto_pk *kcp = crypto_pk_open(PK_RSA,
-            pk->modulus, pk->mlen,
-            pk->exp, pk->elen);
+                                           pk->modulus, pk->mlen,
+                                           pk->exp, pk->elen);
     if (!kcp)
         return 1;
 
@@ -162,7 +164,7 @@ static int sda_test_raw(bool verbose)
     free(ipk_data);
 
     struct crypto_pk *ikcp = crypto_pk_open(PK_RSA, ipk_pk, (int) ipk_pk_len,
-            issuer_exp, (int) sizeof(issuer_exp));
+                                            issuer_exp, (int) sizeof(issuer_exp));
     free(ipk_pk);
     if (!ikcp)
         return 1;
diff --git a/client/emv/tlv.c b/client/emv/tlv.c
index fe4d3906f..7c25a6e0a 100644
--- a/client/emv/tlv.c
+++ b/client/emv/tlv.c
@@ -91,7 +91,7 @@ static size_t tlv_parse_len(const unsigned char **buf, size_t *len)
     if (!(l & TLV_LEN_LONG))
         return l;
 
-    size_t ll = l &~ TLV_LEN_LONG;
+    size_t ll = l & ~ TLV_LEN_LONG;
     if (ll > 5)
         return TLV_LEN_INVALID;
 
@@ -123,9 +123,9 @@ bool tlv_parse_tl(const unsigned char **buf, size_t *len, struct tlv *tlv)
 static struct tlvdb *tlvdb_parse_children(struct tlvdb *parent);
 
 static bool tlvdb_parse_one(struct tlvdb *tlvdb,
-        struct tlvdb *parent,
-        const unsigned char **tmp,
-        size_t *left)
+                            struct tlvdb *parent,
+                            const unsigned char **tmp,
+                            size_t *left)
 {
     tlvdb->next = tlvdb->children = NULL;
     tlvdb->parent = parent;
@@ -240,7 +240,7 @@ struct tlvdb *tlvdb_parse_multi(const unsigned char *buf, size_t len)
     while (left != 0) {
         struct tlvdb *db = malloc(sizeof(*db));
         if (!tlvdb_parse_one(db, NULL, &tmp, &left)) {
-            free (db);
+            free(db);
             goto err;
         }
 
@@ -298,14 +298,16 @@ void tlvdb_free(struct tlvdb *tlvdb)
     }
 }
 
-struct tlvdb *tlvdb_find_next(struct tlvdb *tlvdb, tlv_tag_t tag) {
+struct tlvdb *tlvdb_find_next(struct tlvdb *tlvdb, tlv_tag_t tag)
+{
     if (!tlvdb)
         return NULL;
 
     return tlvdb_find(tlvdb->next, tag);
 }
 
-struct tlvdb *tlvdb_find(struct tlvdb *tlvdb, tlv_tag_t tag) {
+struct tlvdb *tlvdb_find(struct tlvdb *tlvdb, tlv_tag_t tag)
+{
     if (!tlvdb)
         return NULL;
 
@@ -317,7 +319,8 @@ struct tlvdb *tlvdb_find(struct tlvdb *tlvdb, tlv_tag_t tag) {
     return NULL;
 }
 
-struct tlvdb *tlvdb_find_full(struct tlvdb *tlvdb, tlv_tag_t tag) {
+struct tlvdb *tlvdb_find_full(struct tlvdb *tlvdb, tlv_tag_t tag)
+{
     if (!tlvdb)
         return NULL;
 
@@ -326,7 +329,7 @@ struct tlvdb *tlvdb_find_full(struct tlvdb *tlvdb, tlv_tag_t tag) {
             return tlvdb;
 
         if (tlvdb->children) {
-            struct tlvdb * ch = tlvdb_find_full(tlvdb->children, tag);
+            struct tlvdb *ch = tlvdb_find_full(tlvdb->children, tag);
             if (ch)
                 return ch;
         }
@@ -335,7 +338,8 @@ struct tlvdb *tlvdb_find_full(struct tlvdb *tlvdb, tlv_tag_t tag) {
     return NULL;
 }
 
-struct tlvdb *tlvdb_find_path(struct tlvdb *tlvdb, tlv_tag_t tag[]) {
+struct tlvdb *tlvdb_find_path(struct tlvdb *tlvdb, tlv_tag_t tag[])
+{
     int i = 0;
     struct tlvdb *tnext = tlvdb;
 
@@ -469,12 +473,14 @@ const struct tlv *tlvdb_get(const struct tlvdb *tlvdb, tlv_tag_t tag, const stru
     return NULL;
 }
 
-const struct tlv *tlvdb_get_inchild(const struct tlvdb *tlvdb, tlv_tag_t tag, const struct tlv *prev) {
+const struct tlv *tlvdb_get_inchild(const struct tlvdb *tlvdb, tlv_tag_t tag, const struct tlv *prev)
+{
     tlvdb = tlvdb->children;
     return tlvdb_get(tlvdb, tag, prev);
 }
 
-const struct tlv *tlvdb_get_tlv(const struct tlvdb *tlvdb) {
+const struct tlv *tlvdb_get_tlv(const struct tlvdb *tlvdb)
+{
     if (tlvdb)
         return &tlvdb->tag;
     else
@@ -564,13 +570,11 @@ bool tlvdb_get_uint8(struct tlvdb *tlvRoot, tlv_tag_t tag, uint8_t *value)
 bool tlv_get_uint8(const struct tlv *etlv, uint8_t *value)
 {
     *value = 0;
-    if (etlv)
-    {
+    if (etlv) {
         if (etlv->len == 0)
             return true;
 
-        if (etlv->len == 1)
-        {
+        if (etlv->len == 1) {
             *value = etlv->value[0];
             return true;
         }
@@ -581,15 +585,12 @@ bool tlv_get_uint8(const struct tlv *etlv, uint8_t *value)
 bool tlv_get_int(const struct tlv *etlv, int *value)
 {
     *value = 0;
-    if (etlv)
-    {
+    if (etlv) {
         if (etlv->len == 0)
             return true;
 
-        if (etlv->len <= 4)
-        {
-            for (int i = 0; i < etlv->len; i++)
-            {
+        if (etlv->len <= 4) {
+            for (int i = 0; i < etlv->len; i++) {
                 *value += etlv->value[i] * (1 << (i * 8));
             }
             return true;
diff --git a/client/fido/additional_ca.c b/client/fido/additional_ca.c
index 58bada3fe..550847e10 100644
--- a/client/fido/additional_ca.c
+++ b/client/fido/additional_ca.c
@@ -13,67 +13,67 @@
 #include "mbedtls/certs.h"
 
 #define GLOBALSIGN_CA \
-"-----BEGIN CERTIFICATE-----\r\n" \
-"MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkG\r\n" \
-"A1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jv\r\n" \
-"b3QgQ0ExGzAZBgNVBAMTEkdsb2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAw\r\n" \
-"MDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9i\r\n" \
-"YWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYDVQQDExJHbG9iYWxT\r\n" \
-"aWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDaDuaZ\r\n" \
-"jc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavp\r\n" \
-"xy0Sy6scTHAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp\r\n" \
-"1Wrjsok6Vjk4bwY8iGlbKk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdG\r\n" \
-"snUOhugZitVtbNV4FpWi6cgKOOvyJBNPc1STE4U6G7weNLWLBYy5d4ux2x8gkasJ\r\n" \
-"U26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrXgzT/LCrBbBlDSgeF59N8\r\n" \
-"9iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8E\r\n" \
-"BTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0B\r\n" \
-"AQUFAAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOz\r\n" \
-"yj1hTdNGCbM+w6DjY1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE\r\n" \
-"38NflNUVyRRBnMRddWQVDf9VMOyGj/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymP\r\n" \
-"AbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhHhm4qxFYxldBniYUr+WymXUad\r\n" \
-"DKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveCX4XSQRjbgbME\r\n" \
-"HMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==\r\n" \
-"-----END CERTIFICATE-----\r\n"
+    "-----BEGIN CERTIFICATE-----\r\n" \
+    "MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkG\r\n" \
+    "A1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jv\r\n" \
+    "b3QgQ0ExGzAZBgNVBAMTEkdsb2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAw\r\n" \
+    "MDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9i\r\n" \
+    "YWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYDVQQDExJHbG9iYWxT\r\n" \
+    "aWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDaDuaZ\r\n" \
+    "jc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavp\r\n" \
+    "xy0Sy6scTHAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp\r\n" \
+    "1Wrjsok6Vjk4bwY8iGlbKk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdG\r\n" \
+    "snUOhugZitVtbNV4FpWi6cgKOOvyJBNPc1STE4U6G7weNLWLBYy5d4ux2x8gkasJ\r\n" \
+    "U26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrXgzT/LCrBbBlDSgeF59N8\r\n" \
+    "9iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8E\r\n" \
+    "BTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0B\r\n" \
+    "AQUFAAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOz\r\n" \
+    "yj1hTdNGCbM+w6DjY1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE\r\n" \
+    "38NflNUVyRRBnMRddWQVDf9VMOyGj/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymP\r\n" \
+    "AbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhHhm4qxFYxldBniYUr+WymXUad\r\n" \
+    "DKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveCX4XSQRjbgbME\r\n" \
+    "HMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==\r\n" \
+    "-----END CERTIFICATE-----\r\n"
 
 // Name: Yubico U2F Root CA Serial 457200631
 // Issued: 2014-08-01
 #define YUBICO_CA \
-"-----BEGIN CERTIFICATE-----\r\n" \
-"MIIDHjCCAgagAwIBAgIEG0BT9zANBgkqhkiG9w0BAQsFADAuMSwwKgYDVQQDEyNZ\r\n" \
-"dWJpY28gVTJGIFJvb3QgQ0EgU2VyaWFsIDQ1NzIwMDYzMTAgFw0xNDA4MDEwMDAw\r\n" \
-"MDBaGA8yMDUwMDkwNDAwMDAwMFowLjEsMCoGA1UEAxMjWXViaWNvIFUyRiBSb290\r\n" \
-"IENBIFNlcmlhbCA0NTcyMDA2MzEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK\r\n" \
-"AoIBAQC/jwYuhBVlqaiYWEMsrWFisgJ+PtM91eSrpI4TK7U53mwCIawSDHy8vUmk\r\n" \
-"5N2KAj9abvT9NP5SMS1hQi3usxoYGonXQgfO6ZXyUA9a+KAkqdFnBnlyugSeCOep\r\n" \
-"8EdZFfsaRFtMjkwz5Gcz2Py4vIYvCdMHPtwaz0bVuzneueIEz6TnQjE63Rdt2zbw\r\n" \
-"nebwTG5ZybeWSwbzy+BJ34ZHcUhPAY89yJQXuE0IzMZFcEBbPNRbWECRKgjq//qT\r\n" \
-"9nmDOFVlSRCt2wiqPSzluwn+v+suQEBsUjTGMEd25tKXXTkNW21wIWbxeSyUoTXw\r\n" \
-"LvGS6xlwQSgNpk2qXYwf8iXg7VWZAgMBAAGjQjBAMB0GA1UdDgQWBBQgIvz0bNGJ\r\n" \
-"hjgpToksyKpP9xv9oDAPBgNVHRMECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAN\r\n" \
-"BgkqhkiG9w0BAQsFAAOCAQEAjvjuOMDSa+JXFCLyBKsycXtBVZsJ4Ue3LbaEsPY4\r\n" \
-"MYN/hIQ5ZM5p7EjfcnMG4CtYkNsfNHc0AhBLdq45rnT87q/6O3vUEtNMafbhU6kt\r\n" \
-"hX7Y+9XFN9NpmYxr+ekVY5xOxi8h9JDIgoMP4VB1uS0aunL1IGqrNooL9mmFnL2k\r\n" \
-"LVVee6/VR6C5+KSTCMCWppMuJIZII2v9o4dkoZ8Y7QRjQlLfYzd3qGtKbw7xaF1U\r\n" \
-"sG/5xUb/Btwb2X2g4InpiB/yt/3CpQXpiWX/K4mBvUKiGn05ZsqeY1gx4g0xLBqc\r\n" \
-"U9psmyPzK+Vsgw2jeRQ5JlKDyqE0hebfC1tvFu0CCrJFcw==\r\n" \
-"-----END CERTIFICATE-----\r\n"
+    "-----BEGIN CERTIFICATE-----\r\n" \
+    "MIIDHjCCAgagAwIBAgIEG0BT9zANBgkqhkiG9w0BAQsFADAuMSwwKgYDVQQDEyNZ\r\n" \
+    "dWJpY28gVTJGIFJvb3QgQ0EgU2VyaWFsIDQ1NzIwMDYzMTAgFw0xNDA4MDEwMDAw\r\n" \
+    "MDBaGA8yMDUwMDkwNDAwMDAwMFowLjEsMCoGA1UEAxMjWXViaWNvIFUyRiBSb290\r\n" \
+    "IENBIFNlcmlhbCA0NTcyMDA2MzEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK\r\n" \
+    "AoIBAQC/jwYuhBVlqaiYWEMsrWFisgJ+PtM91eSrpI4TK7U53mwCIawSDHy8vUmk\r\n" \
+    "5N2KAj9abvT9NP5SMS1hQi3usxoYGonXQgfO6ZXyUA9a+KAkqdFnBnlyugSeCOep\r\n" \
+    "8EdZFfsaRFtMjkwz5Gcz2Py4vIYvCdMHPtwaz0bVuzneueIEz6TnQjE63Rdt2zbw\r\n" \
+    "nebwTG5ZybeWSwbzy+BJ34ZHcUhPAY89yJQXuE0IzMZFcEBbPNRbWECRKgjq//qT\r\n" \
+    "9nmDOFVlSRCt2wiqPSzluwn+v+suQEBsUjTGMEd25tKXXTkNW21wIWbxeSyUoTXw\r\n" \
+    "LvGS6xlwQSgNpk2qXYwf8iXg7VWZAgMBAAGjQjBAMB0GA1UdDgQWBBQgIvz0bNGJ\r\n" \
+    "hjgpToksyKpP9xv9oDAPBgNVHRMECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAN\r\n" \
+    "BgkqhkiG9w0BAQsFAAOCAQEAjvjuOMDSa+JXFCLyBKsycXtBVZsJ4Ue3LbaEsPY4\r\n" \
+    "MYN/hIQ5ZM5p7EjfcnMG4CtYkNsfNHc0AhBLdq45rnT87q/6O3vUEtNMafbhU6kt\r\n" \
+    "hX7Y+9XFN9NpmYxr+ekVY5xOxi8h9JDIgoMP4VB1uS0aunL1IGqrNooL9mmFnL2k\r\n" \
+    "LVVee6/VR6C5+KSTCMCWppMuJIZII2v9o4dkoZ8Y7QRjQlLfYzd3qGtKbw7xaF1U\r\n" \
+    "sG/5xUb/Btwb2X2g4InpiB/yt/3CpQXpiWX/K4mBvUKiGn05ZsqeY1gx4g0xLBqc\r\n" \
+    "U9psmyPzK+Vsgw2jeRQ5JlKDyqE0hebfC1tvFu0CCrJFcw==\r\n" \
+    "-----END CERTIFICATE-----\r\n"
 
 // Name: SoloKey U2F Root CA Serial 14143382635911888524 (0xc44763928ff4be8c)
 // Issued: 2018-11-11
 #define SOLOKEY_CA \
-"-----BEGIN CERTIFICATE-----\r\n" \
-"MIIB9DCCAZoCCQDER2OSj/S+jDAKBggqhkjOPQQDAjCBgDELMAkGA1UEBhMCVVMx\r\n" \
-"ETAPBgNVBAgMCE1hcnlsYW5kMRIwEAYDVQQKDAlTb2xvIEtleXMxEDAOBgNVBAsM\r\n" \
-"B1Jvb3QgQ0ExFTATBgNVBAMMDHNvbG9rZXlzLmNvbTEhMB8GCSqGSIb3DQEJARYS\r\n" \
-"aGVsbG9Ac29sb2tleXMuY29tMCAXDTE4MTExMTEyNTE0MloYDzIwNjgxMDI5MTI1\r\n" \
-"MTQyWjCBgDELMAkGA1UEBhMCVVMxETAPBgNVBAgMCE1hcnlsYW5kMRIwEAYDVQQK\r\n" \
-"DAlTb2xvIEtleXMxEDAOBgNVBAsMB1Jvb3QgQ0ExFTATBgNVBAMMDHNvbG9rZXlz\r\n" \
-"LmNvbTEhMB8GCSqGSIb3DQEJARYSaGVsbG9Ac29sb2tleXMuY29tMFkwEwYHKoZI\r\n" \
-"zj0CAQYIKoZIzj0DAQcDQgAEWHAN0CCJVZdMs0oktZ5m93uxmB1iyq8ELRLtqVFL\r\n" \
-"SOiHQEab56qRTB/QzrpGAY++Y2mw+vRuQMNhBiU0KzwjBjAKBggqhkjOPQQDAgNI\r\n" \
-"ADBFAiEAz9SlrAXIlEu87vra54rICPs+4b0qhp3PdzcTg7rvnP0CIGjxzlteQQx+\r\n" \
-"jQGd7rwSZuE5RWUPVygYhUstQO9zNUOs\r\n" \
-"-----END CERTIFICATE-----\r\n"
+    "-----BEGIN CERTIFICATE-----\r\n" \
+    "MIIB9DCCAZoCCQDER2OSj/S+jDAKBggqhkjOPQQDAjCBgDELMAkGA1UEBhMCVVMx\r\n" \
+    "ETAPBgNVBAgMCE1hcnlsYW5kMRIwEAYDVQQKDAlTb2xvIEtleXMxEDAOBgNVBAsM\r\n" \
+    "B1Jvb3QgQ0ExFTATBgNVBAMMDHNvbG9rZXlzLmNvbTEhMB8GCSqGSIb3DQEJARYS\r\n" \
+    "aGVsbG9Ac29sb2tleXMuY29tMCAXDTE4MTExMTEyNTE0MloYDzIwNjgxMDI5MTI1\r\n" \
+    "MTQyWjCBgDELMAkGA1UEBhMCVVMxETAPBgNVBAgMCE1hcnlsYW5kMRIwEAYDVQQK\r\n" \
+    "DAlTb2xvIEtleXMxEDAOBgNVBAsMB1Jvb3QgQ0ExFTATBgNVBAMMDHNvbG9rZXlz\r\n" \
+    "LmNvbTEhMB8GCSqGSIb3DQEJARYSaGVsbG9Ac29sb2tleXMuY29tMFkwEwYHKoZI\r\n" \
+    "zj0CAQYIKoZIzj0DAQcDQgAEWHAN0CCJVZdMs0oktZ5m93uxmB1iyq8ELRLtqVFL\r\n" \
+    "SOiHQEab56qRTB/QzrpGAY++Y2mw+vRuQMNhBiU0KzwjBjAKBggqhkjOPQQDAgNI\r\n" \
+    "ADBFAiEAz9SlrAXIlEu87vra54rICPs+4b0qhp3PdzcTg7rvnP0CIGjxzlteQQx+\r\n" \
+    "jQGd7rwSZuE5RWUPVygYhUstQO9zNUOs\r\n" \
+    "-----END CERTIFICATE-----\r\n"
 
 /* Concatenation of all additional CA certificates in PEM format if available */
 const char   additional_ca_pem[] = GLOBALSIGN_CA YUBICO_CA SOLOKEY_CA;
diff --git a/client/fido/cbortools.c b/client/fido/cbortools.c
index 7c3573289..6cd3b3ca4 100644
--- a/client/fido/cbortools.c
+++ b/client/fido/cbortools.c
@@ -16,113 +16,116 @@
 #include "util.h"
 #include "fidocore.h"
 
-static void indent(int nestingLevel) {
+static void indent(int nestingLevel)
+{
     while (nestingLevel--)
         printf("  ");
 }
 
-static CborError dumpelm(CborValue *it, bool *got_next, int nestingLevel) {
+static CborError dumpelm(CborValue *it, bool *got_next, int nestingLevel)
+{
     CborError err;
     *got_next = false;
 
     CborType type = cbor_value_get_type(it);
     indent(nestingLevel);
     switch (type) {
-    case CborMapType:
-    case CborArrayType: {
-        printf(type == CborArrayType ? "Array[" : "Map[");
-        break;
-    }
-
-    case CborIntegerType: {
-        int64_t val;
-        cbor_value_get_int64(it, &val);     // can't fail
-        printf("%lld", (long long)val);
-        break;
-    }
-
-    case CborByteStringType: {
-        uint8_t *buf;
-        size_t n;
-        err = cbor_value_dup_byte_string(it, &buf, &n, it);
-        *got_next = true;
-        if (err)
-            return err;     // parse error
-        printf("%s", sprint_hex(buf, n));
-        free(buf);
-        break;
-    }
-
-    case CborTextStringType: {
-        char *buf;
-        size_t n;
-        err = cbor_value_dup_text_string(it, &buf, &n, it);
-        *got_next = true;
-        if (err)
-            return err;     // parse error
-        printf("%s", buf);
-        free(buf);
-        break;
-    }
-
-    case CborTagType: {
-        CborTag tag;
-        cbor_value_get_tag(it, &tag);
-        printf("Tag(%lld)", (long long)tag);
-        break;
-    }
-
-    case CborSimpleType: {
-        uint8_t type;
-        cbor_value_get_simple_type(it, &type);
-        printf("simple(%u)", type);
-        break;
-    }
-
-    case CborNullType:
-        printf("null");
-        break;
-
-    case CborUndefinedType:
-        printf("undefined");
-        break;
-
-    case CborBooleanType: {
-        bool val;
-        cbor_value_get_boolean(it, &val);       // can't fail
-        printf("%s", val ? "true" : "false");
-        break;
-    }
-
-    case CborDoubleType: {
-        double val;
-        if (false) {
-            float f;
-    case CborFloatType:
-            cbor_value_get_float(it, &f);
-            val = f;
-        } else {
-            cbor_value_get_double(it, &val);
+        case CborMapType:
+        case CborArrayType: {
+            printf(type == CborArrayType ? "Array[" : "Map[");
+            break;
         }
-        printf("%g", val);
-        break;
-    }
-    case CborHalfFloatType: {
-        uint16_t val;
-        cbor_value_get_half_float(it, &val);
-        printf("__f16(%04x)", val);
-        break;
-    }
 
-    case CborInvalidType:
-        printf("CborInvalidType!!!");
-        break;
+        case CborIntegerType: {
+            int64_t val;
+            cbor_value_get_int64(it, &val);     // can't fail
+            printf("%lld", (long long)val);
+            break;
+        }
+
+        case CborByteStringType: {
+            uint8_t *buf;
+            size_t n;
+            err = cbor_value_dup_byte_string(it, &buf, &n, it);
+            *got_next = true;
+            if (err)
+                return err;     // parse error
+            printf("%s", sprint_hex(buf, n));
+            free(buf);
+            break;
+        }
+
+        case CborTextStringType: {
+            char *buf;
+            size_t n;
+            err = cbor_value_dup_text_string(it, &buf, &n, it);
+            *got_next = true;
+            if (err)
+                return err;     // parse error
+            printf("%s", buf);
+            free(buf);
+            break;
+        }
+
+        case CborTagType: {
+            CborTag tag;
+            cbor_value_get_tag(it, &tag);
+            printf("Tag(%lld)", (long long)tag);
+            break;
+        }
+
+        case CborSimpleType: {
+            uint8_t type;
+            cbor_value_get_simple_type(it, &type);
+            printf("simple(%u)", type);
+            break;
+        }
+
+        case CborNullType:
+            printf("null");
+            break;
+
+        case CborUndefinedType:
+            printf("undefined");
+            break;
+
+        case CborBooleanType: {
+            bool val;
+            cbor_value_get_boolean(it, &val);       // can't fail
+            printf("%s", val ? "true" : "false");
+            break;
+        }
+
+        case CborDoubleType: {
+            double val;
+            if (false) {
+                float f;
+                case CborFloatType:
+                    cbor_value_get_float(it, &f);
+                    val = f;
+                } else {
+                    cbor_value_get_double(it, &val);
+                }
+                printf("%g", val);
+                break;
+            }
+        case CborHalfFloatType: {
+            uint16_t val;
+            cbor_value_get_half_float(it, &val);
+            printf("__f16(%04x)", val);
+            break;
+        }
+
+        case CborInvalidType:
+            printf("CborInvalidType!!!");
+            break;
     }
 
     return CborNoError;
 }
 
-static CborError dumprecursive(uint8_t cmdCode, bool isResponse, CborValue *it, bool isMapType, int nestingLevel) {
+static CborError dumprecursive(uint8_t cmdCode, bool isResponse, CborValue *it, bool isMapType, int nestingLevel)
+{
     int elmCount = 0;
     while (!cbor_value_at_end(it)) {
         CborError err;
@@ -131,42 +134,42 @@ static CborError dumprecursive(uint8_t cmdCode, bool isResponse, CborValue *it,
         bool got_next;
 
         switch (type) {
-        case CborMapType:
-        case CborArrayType: {
-            // recursive type
-            CborValue recursed;
-            assert(cbor_value_is_container(it));
-            if (!(isMapType && (elmCount % 2)))
+            case CborMapType:
+            case CborArrayType: {
+                // recursive type
+                CborValue recursed;
+                assert(cbor_value_is_container(it));
+                if (!(isMapType && (elmCount % 2)))
+                    indent(nestingLevel);
+                printf(type == CborArrayType ? "Array[\n" : "Map[\n");
+                err = cbor_value_enter_container(it, &recursed);
+                if (err)
+                    return err;       // parse error
+                err = dumprecursive(cmdCode, isResponse, &recursed, (type == CborMapType), nestingLevel + 1);
+                if (err)
+                    return err;       // parse error
+                err = cbor_value_leave_container(it, &recursed);
+                if (err)
+                    return err;       // parse error
                 indent(nestingLevel);
-            printf(type == CborArrayType ? "Array[\n" : "Map[\n");
-            err = cbor_value_enter_container(it, &recursed);
-            if (err)
-                return err;       // parse error
-            err = dumprecursive(cmdCode, isResponse, &recursed, (type == CborMapType), nestingLevel + 1);
-            if (err)
-                return err;       // parse error
-            err = cbor_value_leave_container(it, &recursed);
-            if (err)
-                return err;       // parse error
-            indent(nestingLevel);
-            printf("]");
-            got_next = true;
-            break;
-        }
-
-        default: {
-            err = dumpelm(it, &got_next, (isMapType && (elmCount % 2)) ? 0 : nestingLevel);
-            if (err)
-                return err;
-            if (cmdCode > 0 && nestingLevel == 1 && isMapType && !(elmCount % 2)) {
-                int64_t val;
-                cbor_value_get_int64(it, &val);
-                char *desc = fido2GetCmdMemberDescription(cmdCode, isResponse, val);
-                if (desc)
-                    printf(" (%s)", desc);
+                printf("]");
+                got_next = true;
+                break;
+            }
+
+            default: {
+                err = dumpelm(it, &got_next, (isMapType && (elmCount % 2)) ? 0 : nestingLevel);
+                if (err)
+                    return err;
+                if (cmdCode > 0 && nestingLevel == 1 && isMapType && !(elmCount % 2)) {
+                    int64_t val;
+                    cbor_value_get_int64(it, &val);
+                    char *desc = fido2GetCmdMemberDescription(cmdCode, isResponse, val);
+                    if (desc)
+                        printf(" (%s)", desc);
+                }
+                break;
             }
-            break;
-        }
         }
 
         if (!got_next) {
@@ -184,7 +187,8 @@ static CborError dumprecursive(uint8_t cmdCode, bool isResponse, CborValue *it,
     return CborNoError;
 }
 
-int TinyCborInit(uint8_t *data, size_t length, CborValue *cb) {
+int TinyCborInit(uint8_t *data, size_t length, CborValue *cb)
+{
     CborParser parser;
     CborError err = cbor_parser_init(data, length, 0, &parser, cb);
     if (err)
@@ -193,7 +197,8 @@ int TinyCborInit(uint8_t *data, size_t length, CborValue *cb) {
     return 0;
 }
 
-int TinyCborPrintFIDOPackage(uint8_t cmdCode, bool isResponse, uint8_t *data, size_t length) {
+int TinyCborPrintFIDOPackage(uint8_t cmdCode, bool isResponse, uint8_t *data, size_t length)
+{
     CborValue cb;
     int res;
     res = TinyCborInit(data, length, &cb);
@@ -205,18 +210,19 @@ int TinyCborPrintFIDOPackage(uint8_t cmdCode, bool isResponse, uint8_t *data, si
     if (err) {
         fprintf(stderr,
 #if __WORDSIZE == 64
-        "CBOR parsing failure at offset %" PRId64 " : %s\n",
+                "CBOR parsing failure at offset %" PRId64 " : %s\n",
 #else
-        "CBOR parsing failure at offset %" PRId32 " : %s\n",
+                "CBOR parsing failure at offset %" PRId32 " : %s\n",
 #endif
-        cb.ptr - data, cbor_error_string(err));
+                cb.ptr - data, cbor_error_string(err));
         return 1;
     }
 
     return 0;
 }
 
-int JsonObjElmCount(json_t *elm) {
+int JsonObjElmCount(json_t *elm)
+{
     int res = 0;
     const char *key;
     json_t *value;
@@ -232,7 +238,8 @@ int JsonObjElmCount(json_t *elm) {
     return res;
 }
 
-int JsonToCbor(json_t *elm, CborEncoder *encoder) {
+int JsonToCbor(json_t *elm, CborEncoder *encoder)
+{
     if (!elm || !encoder)
         return 1;
 
@@ -295,7 +302,7 @@ int JsonToCbor(json_t *elm, CborEncoder *encoder) {
     }
 
     if (json_is_string(elm)) {
-        const char * val = json_string_value(elm);
+        const char *val = json_string_value(elm);
         if (CheckStringIsHEXValue(val)) {
             size_t datalen = 0;
             uint8_t data[4096] = {0};
@@ -316,7 +323,8 @@ int JsonToCbor(json_t *elm, CborEncoder *encoder) {
     return 0;
 }
 
-int CborMapGetKeyById(CborParser *parser, CborValue *map, uint8_t *data, size_t dataLen, int key) {
+int CborMapGetKeyById(CborParser *parser, CborValue *map, uint8_t *data, size_t dataLen, int key)
+{
     CborValue cb;
 
     CborError err = cbor_parser_init(data, dataLen, 0, parser, &cb);
@@ -353,11 +361,13 @@ int CborMapGetKeyById(CborParser *parser, CborValue *map, uint8_t *data, size_t
     return 2;
 }
 
-CborError CborGetArrayBinStringValue(CborValue *elm, uint8_t *data, size_t maxdatalen, size_t *datalen) {
+CborError CborGetArrayBinStringValue(CborValue *elm, uint8_t *data, size_t maxdatalen, size_t *datalen)
+{
     return CborGetArrayBinStringValueEx(elm, data, maxdatalen, datalen, NULL, 0);
 }
 
-CborError CborGetArrayBinStringValueEx(CborValue *elm, uint8_t *data, size_t maxdatalen, size_t *datalen, uint8_t *delimeter, size_t delimeterlen) {
+CborError CborGetArrayBinStringValueEx(CborValue *elm, uint8_t *data, size_t maxdatalen, size_t *datalen, uint8_t *delimeter, size_t delimeterlen)
+{
     CborValue array;
     if (datalen)
         *datalen = 0;
@@ -389,7 +399,8 @@ CborError CborGetArrayBinStringValueEx(CborValue *elm, uint8_t *data, size_t max
     return CborNoError;
 };
 
-CborError CborGetBinStringValue(CborValue *elm, uint8_t *data, size_t maxdatalen, size_t *datalen) {
+CborError CborGetBinStringValue(CborValue *elm, uint8_t *data, size_t maxdatalen, size_t *datalen)
+{
     if (datalen)
         *datalen = 0;
 
@@ -404,7 +415,8 @@ CborError CborGetBinStringValue(CborValue *elm, uint8_t *data, size_t maxdatalen
     return CborNoError;
 };
 
-CborError CborGetArrayStringValue(CborValue *elm, char *data, size_t maxdatalen, size_t *datalen, char *delimeter) {
+CborError CborGetArrayStringValue(CborValue *elm, char *data, size_t maxdatalen, size_t *datalen, char *delimeter)
+{
     CborValue array;
     if (datalen)
         *datalen = 0;
@@ -437,7 +449,8 @@ CborError CborGetArrayStringValue(CborValue *elm, char *data, size_t maxdatalen,
     return CborNoError;
 };
 
-CborError CborGetStringValue(CborValue *elm, char *data, size_t maxdatalen, size_t *datalen) {
+CborError CborGetStringValue(CborValue *elm, char *data, size_t maxdatalen, size_t *datalen)
+{
     if (datalen)
         *datalen = 0;
 
@@ -452,14 +465,16 @@ CborError CborGetStringValue(CborValue *elm, char *data, size_t maxdatalen, size
     return CborNoError;
 };
 
-CborError CborGetStringValueBuf(CborValue *elm) {
+CborError CborGetStringValueBuf(CborValue *elm)
+{
     static char stringBuf[2048];
     memset(stringBuf, 0x00, sizeof(stringBuf));
 
     return CborGetStringValue(elm, stringBuf, sizeof(stringBuf), NULL);
 };
 
-int CBOREncodeElm(json_t *root, char *rootElmId, CborEncoder *encoder) {
+int CBOREncodeElm(json_t *root, char *rootElmId, CborEncoder *encoder)
+{
     json_t *elm = NULL;
     if (rootElmId && strlen(rootElmId) && rootElmId[0] == '$')
         elm = json_path_get(root, rootElmId);
@@ -474,7 +489,8 @@ int CBOREncodeElm(json_t *root, char *rootElmId, CborEncoder *encoder) {
     return res;
 }
 
-CborError CBOREncodeClientDataHash(json_t *root, CborEncoder *encoder) {
+CborError CBOREncodeClientDataHash(json_t *root, CborEncoder *encoder)
+{
     uint8_t buf[100] = {0};
     size_t jlen;
 
diff --git a/client/fido/cose.c b/client/fido/cose.c
index 81cf1f974..a21dc5601 100644
--- a/client/fido/cose.c
+++ b/client/fido/cose.c
@@ -38,14 +38,16 @@ COSEValueNameDesc_t COSEKeyTypeValueDesc[] = {
     {4, "Symmetric", "Symmetric Key"},
 };
 
-COSEValueNameDesc_t *GetCOSEktyElm(int id) {
+COSEValueNameDesc_t *GetCOSEktyElm(int id)
+{
     for (int i = 0; i < ARRAYLEN(COSEKeyTypeValueDesc); i++)
         if (COSEKeyTypeValueDesc[i].Value == id)
             return &COSEKeyTypeValueDesc[i];
     return NULL;
 }
 
-const char *GetCOSEktyDescription(int id) {
+const char *GetCOSEktyDescription(int id)
+{
     COSEValueNameDesc_t *elm = GetCOSEktyElm(id);
     if (elm)
         return elm->Description;
@@ -63,14 +65,16 @@ COSEValueTypeNameDesc_t COSECurvesDesc[] = {
     {7, "OKP", "Ed448",    "Ed448 for use w/ EdDSA only"},
 };
 
-COSEValueTypeNameDesc_t *GetCOSECurveElm(int id) {
+COSEValueTypeNameDesc_t *GetCOSECurveElm(int id)
+{
     for (int i = 0; i < ARRAYLEN(COSECurvesDesc); i++)
         if (COSECurvesDesc[i].Value == id)
             return &COSECurvesDesc[i];
     return NULL;
 }
 
-const char *GetCOSECurveDescription(int id) {
+const char *GetCOSECurveDescription(int id)
+{
     COSEValueTypeNameDesc_t *elm = GetCOSECurveElm(id);
     if (elm)
         return elm->Description;
@@ -135,41 +139,45 @@ COSEValueNameDesc_t COSEAlg[] = {
     {33,        "AES-CCM-64-128-256",       "AES-CCM mode 256-bit key, 128-bit tag, 7-byte nonce"}
 };
 
-COSEValueNameDesc_t *GetCOSEAlgElm(int id) {
+COSEValueNameDesc_t *GetCOSEAlgElm(int id)
+{
     for (int i = 0; i < ARRAYLEN(COSEAlg); i++)
         if (COSEAlg[i].Value == id)
             return &COSEAlg[i];
     return NULL;
 }
 
-const char *GetCOSEAlgName(int id) {
+const char *GetCOSEAlgName(int id)
+{
     COSEValueNameDesc_t *elm = GetCOSEAlgElm(id);
     if (elm)
         return elm->Name;
     return COSEEmptyStr;
 }
 
-const char *GetCOSEAlgDescription(int id) {
+const char *GetCOSEAlgDescription(int id)
+{
     COSEValueNameDesc_t *elm = GetCOSEAlgElm(id);
     if (elm)
         return elm->Description;
     return COSEEmptyStr;
 }
 
-int COSEGetECDSAKey(uint8_t *data, size_t datalen, bool verbose, uint8_t *public_key) {
+int COSEGetECDSAKey(uint8_t *data, size_t datalen, bool verbose, uint8_t *public_key)
+{
     CborParser parser;
     CborValue map;
     int64_t i64;
     size_t len;
 
-    if(verbose)
+    if (verbose)
         PrintAndLog("----------- CBOR decode ----------------");
 
     // kty
     int res = CborMapGetKeyById(&parser, &map, data, datalen, 1);
-    if(!res) {
+    if (!res) {
         cbor_value_get_int64(&map, &i64);
-        if(verbose)
+        if (verbose)
             PrintAndLog("kty [%lld] %s", (long long)i64, GetCOSEktyDescription(i64));
         if (i64 != 2)
             PrintAndLog("ERROR: kty must be 2.");
@@ -177,9 +185,9 @@ int COSEGetECDSAKey(uint8_t *data, size_t datalen, bool verbose, uint8_t *public
 
     // algorithm
     res = CborMapGetKeyById(&parser, &map, data, datalen, 3);
-    if(!res) {
+    if (!res) {
         cbor_value_get_int64(&map, &i64);
-        if(verbose)
+        if (verbose)
             PrintAndLog("algorithm [%lld] %s", (long long)i64, GetCOSEAlgDescription(i64));
         if (i64 != -7)
             PrintAndLog("ERROR: algorithm must be -7.");
@@ -187,9 +195,9 @@ int COSEGetECDSAKey(uint8_t *data, size_t datalen, bool verbose, uint8_t *public
 
     // curve
     res = CborMapGetKeyById(&parser, &map, data, datalen, -1);
-    if(!res) {
+    if (!res) {
         cbor_value_get_int64(&map, &i64);
-        if(verbose)
+        if (verbose)
             PrintAndLog("curve [%lld] %s", (long long)i64, GetCOSECurveDescription(i64));
         if (i64 != 1)
             PrintAndLog("ERROR: curve must be 1.");
@@ -200,10 +208,10 @@ int COSEGetECDSAKey(uint8_t *data, size_t datalen, bool verbose, uint8_t *public
 
     // x - coordinate
     res = CborMapGetKeyById(&parser, &map, data, datalen, -2);
-    if(!res) {
+    if (!res) {
         res = CborGetBinStringValue(&map, &public_key[1], 32, &len);
         cbor_check(res);
-        if(verbose)
+        if (verbose)
             PrintAndLog("x - coordinate [%d]: %s", len, sprint_hex(&public_key[1], 32));
         if (len != 32)
             PrintAndLog("ERROR: x - coordinate length must be 32.");
@@ -211,10 +219,10 @@ int COSEGetECDSAKey(uint8_t *data, size_t datalen, bool verbose, uint8_t *public
 
     // y - coordinate
     res = CborMapGetKeyById(&parser, &map, data, datalen, -3);
-    if(!res) {
+    if (!res) {
         res = CborGetBinStringValue(&map, &public_key[33], 32, &len);
         cbor_check(res);
-        if(verbose)
+        if (verbose)
             PrintAndLog("y - coordinate [%d]: %s", len, sprint_hex(&public_key[33], 32));
         if (len != 32)
             PrintAndLog("ERROR: y - coordinate length must be 32.");
@@ -223,14 +231,14 @@ int COSEGetECDSAKey(uint8_t *data, size_t datalen, bool verbose, uint8_t *public
     // d - private key
     uint8_t private_key[128] = {0};
     res = CborMapGetKeyById(&parser, &map, data, datalen, -4);
-    if(!res) {
+    if (!res) {
         res = CborGetBinStringValue(&map, private_key, sizeof(private_key), &len);
         cbor_check(res);
-        if(verbose)
+        if (verbose)
             PrintAndLog("d - private key [%d]: %s", len, sprint_hex(private_key, len));
     }
 
-    if(verbose)
+    if (verbose)
         PrintAndLog("----------- CBOR decode ----------------");
 
     return 0;
diff --git a/client/fido/fidocore.c b/client/fido/fidocore.c
index a05b362d4..6537ce8eb 100644
--- a/client/fido/fidocore.c
+++ b/client/fido/fidocore.c
@@ -149,7 +149,8 @@ fido2Desc_t fido2CmdGetInfoRespDesc[] = {
     {fido2COSEKey,              ptResponse,   -4, "d - private key"},
 };
 
-char *fido2GetCmdErrorDescription(uint8_t errorCode) {
+char *fido2GetCmdErrorDescription(uint8_t errorCode)
+{
     for (int i = 0; i < sizeof(fido2Errors) / sizeof(fido2Error_t); i++)
         if (fido2Errors[i].ErrorCode == errorCode)
             return fido2Errors[i].Description;
@@ -157,30 +158,33 @@ char *fido2GetCmdErrorDescription(uint8_t errorCode) {
     return fido2Errors[0].Description;
 }
 
-char *fido2GetCmdMemberDescription(uint8_t cmdCode, bool isResponse, int memberNum) {
+char *fido2GetCmdMemberDescription(uint8_t cmdCode, bool isResponse, int memberNum)
+{
     for (int i = 0; i < sizeof(fido2CmdGetInfoRespDesc) / sizeof(fido2Desc_t); i++)
         if (fido2CmdGetInfoRespDesc[i].Command == cmdCode &&
             fido2CmdGetInfoRespDesc[i].PckType == (isResponse ? ptResponse : ptQuery) &&
-            fido2CmdGetInfoRespDesc[i].MemberNumber == memberNum )
+            fido2CmdGetInfoRespDesc[i].MemberNumber == memberNum)
             return fido2CmdGetInfoRespDesc[i].Description;
 
     return NULL;
 }
 
-int FIDOSelect(bool ActivateField, bool LeaveFieldON, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
+int FIDOSelect(bool ActivateField, bool LeaveFieldON, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw)
+{
     uint8_t data[] = {0xA0, 0x00, 0x00, 0x06, 0x47, 0x2F, 0x00, 0x01};
 
     return EMVSelect(ECC_CONTACTLESS, ActivateField, LeaveFieldON, data, sizeof(data), Result, MaxResultLen, ResultLen, sw, NULL);
 }
 
-int FIDOExchange(sAPDU apdu, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
+int FIDOExchange(sAPDU apdu, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw)
+{
     int res = EMVExchange(ECC_CONTACTLESS, true, apdu, Result, MaxResultLen, ResultLen, sw, NULL);
     if (res == 5) // apdu result (sw) not a 0x9000
         res = 0;
     // software chaining
     while (!res && (*sw >> 8) == 0x61) {
         size_t oldlen = *ResultLen;
-        res = EMVExchange(ECC_CONTACTLESS, true, (sAPDU){0x00, 0xC0, 0x00, 0x00, 0x00, NULL}, &Result[oldlen], MaxResultLen - oldlen, ResultLen, sw, NULL);
+        res = EMVExchange(ECC_CONTACTLESS, true, (sAPDU) {0x00, 0xC0, 0x00, 0x00, 0x00, NULL}, &Result[oldlen], MaxResultLen - oldlen, ResultLen, sw, NULL);
         if (res == 5) // apdu result (sw) not a 0x9000
             res = 0;
 
@@ -191,34 +195,40 @@ int FIDOExchange(sAPDU apdu, uint8_t *Result, size_t MaxResultLen, size_t *Resul
     return res;
 }
 
-int FIDORegister(uint8_t *params, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
-    return FIDOExchange((sAPDU){0x00, 0x01, 0x03, 0x00, 64, params}, Result, MaxResultLen, ResultLen, sw);
+int FIDORegister(uint8_t *params, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw)
+{
+    return FIDOExchange((sAPDU) {0x00, 0x01, 0x03, 0x00, 64, params}, Result, MaxResultLen, ResultLen, sw);
 }
 
-int FIDOAuthentication(uint8_t *params, uint8_t paramslen, uint8_t controlb, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
-    return FIDOExchange((sAPDU){0x00, 0x02, controlb, 0x00, paramslen, params}, Result, MaxResultLen, ResultLen, sw);
+int FIDOAuthentication(uint8_t *params, uint8_t paramslen, uint8_t controlb, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw)
+{
+    return FIDOExchange((sAPDU) {0x00, 0x02, controlb, 0x00, paramslen, params}, Result, MaxResultLen, ResultLen, sw);
 }
 
-int FIDO2GetInfo(uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
+int FIDO2GetInfo(uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw)
+{
     uint8_t data[] = {fido2CmdGetInfo};
-    return FIDOExchange((sAPDU){0x80, 0x10, 0x00, 0x00, sizeof(data), data}, Result, MaxResultLen, ResultLen, sw);
+    return FIDOExchange((sAPDU) {0x80, 0x10, 0x00, 0x00, sizeof(data), data}, Result, MaxResultLen, ResultLen, sw);
 }
 
-int FIDO2MakeCredential(uint8_t *params, uint8_t paramslen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
+int FIDO2MakeCredential(uint8_t *params, uint8_t paramslen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw)
+{
     uint8_t data[paramslen + 1];
     data[0] = fido2CmdMakeCredential;
     memcpy(&data[1], params, paramslen);
-    return FIDOExchange((sAPDU){0x80, 0x10, 0x00, 0x00, sizeof(data), data}, Result, MaxResultLen, ResultLen, sw);
+    return FIDOExchange((sAPDU) {0x80, 0x10, 0x00, 0x00, sizeof(data), data}, Result, MaxResultLen, ResultLen, sw);
 }
 
-int FIDO2GetAssertion(uint8_t *params, uint8_t paramslen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
+int FIDO2GetAssertion(uint8_t *params, uint8_t paramslen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw)
+{
     uint8_t data[paramslen + 1];
     data[0] = fido2CmdGetAssertion;
     memcpy(&data[1], params, paramslen);
-    return FIDOExchange((sAPDU){0x80, 0x10, 0x00, 0x00, sizeof(data), data}, Result, MaxResultLen, ResultLen, sw);
+    return FIDOExchange((sAPDU) {0x80, 0x10, 0x00, 0x00, sizeof(data), data}, Result, MaxResultLen, ResultLen, sw);
 }
 
-int FIDOCheckDERAndGetKey(uint8_t *der, size_t derLen, bool verbose, uint8_t *publicKey, size_t publicKeyMaxLen) {
+int FIDOCheckDERAndGetKey(uint8_t *der, size_t derLen, bool verbose, uint8_t *publicKey, size_t publicKeyMaxLen)
+{
     int res;
 
     // load CA's
@@ -236,7 +246,7 @@ int FIDOCheckDERAndGetKey(uint8_t *der, size_t derLen, bool verbose, uint8_t *pu
     mbedtls_x509_crt_init(&cert);
     res = mbedtls_x509_crt_parse_der(&cert, der, derLen);
     if (res) {
-        PrintAndLog("ERROR: DER parse returned 0x%x - %s", (res<0)?-res:res, ecdsa_get_error(res));
+        PrintAndLog("ERROR: DER parse returned 0x%x - %s", (res < 0) ? -res : res, ecdsa_get_error(res));
     }
 
     // get certificate info
@@ -250,7 +260,7 @@ int FIDOCheckDERAndGetKey(uint8_t *der, size_t derLen, bool verbose, uint8_t *pu
     uint32_t verifyflags = 0;
     res = mbedtls_x509_crt_verify(&cert, &cacert, NULL, NULL, &verifyflags, NULL, NULL);
     if (res) {
-        PrintAndLog("ERROR: DER verify returned 0x%x - %s\n", (res<0)?-res:res, ecdsa_get_error(res));
+        PrintAndLog("ERROR: DER verify returned 0x%x - %s\n", (res < 0) ? -res : res, ecdsa_get_error(res));
     } else {
         PrintAndLog("Certificate OK.\n");
     }
@@ -264,7 +274,7 @@ int FIDOCheckDERAndGetKey(uint8_t *der, size_t derLen, bool verbose, uint8_t *pu
     // get public key
     res = ecdsa_public_key_from_pk(&cert.pk, publicKey, publicKeyMaxLen);
     if (res) {
-        PrintAndLog("ERROR: getting public key from certificate 0x%x - %s", (res<0)?-res:res, ecdsa_get_error(res));
+        PrintAndLog("ERROR: getting public key from certificate 0x%x - %s", (res < 0) ? -res : res, ecdsa_get_error(res));
     } else {
         if (verbose)
             PrintAndLog("Got a public key from certificate:\n%s", sprint_hex_inrow(publicKey, 65));
@@ -282,7 +292,8 @@ int FIDOCheckDERAndGetKey(uint8_t *der, size_t derLen, bool verbose, uint8_t *pu
 #define fido_check_if(r) if ((r) != CborNoError) {return r;} else
 #define fido_check(r) if ((r) != CborNoError) return r;
 
-int FIDO2CreateMakeCredentionalReq(json_t *root, uint8_t *data, size_t maxdatalen, size_t *datalen) {
+int FIDO2CreateMakeCredentionalReq(json_t *root, uint8_t *data, size_t maxdatalen, size_t *datalen)
+{
     if (datalen)
         *datalen = 0;
     if (!root || !data || !maxdatalen)
@@ -342,7 +353,8 @@ int FIDO2CreateMakeCredentionalReq(json_t *root, uint8_t *data, size_t maxdatale
     return 0;
 }
 
-bool CheckrpIdHash(json_t *json, uint8_t *hash) {
+bool CheckrpIdHash(json_t *json, uint8_t *hash)
+{
     char hashval[300] = {0};
     uint8_t hash2[32] = {0};
 
@@ -355,7 +367,8 @@ bool CheckrpIdHash(json_t *json, uint8_t *hash) {
 }
 
 // check ANSI X9.62 format ECDSA signature (on P-256)
-int FIDO2CheckSignature(json_t *root, uint8_t *publickey, uint8_t *sign, size_t signLen, uint8_t *authData, size_t authDataLen, bool verbose) {
+int FIDO2CheckSignature(json_t *root, uint8_t *publickey, uint8_t *sign, size_t signLen, uint8_t *authData, size_t authDataLen, bool verbose)
+{
     int res;
     uint8_t rval[300] = {0};
     uint8_t sval[300] = {0};
@@ -377,16 +390,16 @@ int FIDO2CheckSignature(json_t *root, uint8_t *publickey, uint8_t *sign, size_t
         uint8_t xbuf[4096] = {0};
         size_t xbuflen = 0;
         res = FillBuffer(xbuf, sizeof(xbuf), &xbuflen,
-            authData, authDataLen,  // rpIdHash[32] + flags[1] + signCount[4]
-            clientDataHash, 32,     // Hash of the serialized client data. "$.ClientDataHash" from json
-            NULL, 0);
+                         authData, authDataLen,  // rpIdHash[32] + flags[1] + signCount[4]
+                         clientDataHash, 32,     // Hash of the serialized client data. "$.ClientDataHash" from json
+                         NULL, 0);
         //PrintAndLog("--xbuf(%d)[%d]: %s", res, xbuflen, sprint_hex(xbuf, xbuflen));
         res = ecdsa_signature_verify(publickey, xbuf, xbuflen, sign, signLen);
         if (res) {
             if (res == -0x4e00) {
                 PrintAndLog("Signature is NOT VALID.");
             } else {
-                PrintAndLog("Other signature check error: %x %s", (res<0)?-res:res, ecdsa_get_error(res));
+                PrintAndLog("Other signature check error: %x %s", (res < 0) ? -res : res, ecdsa_get_error(res));
             }
             return res;
         } else {
@@ -400,7 +413,8 @@ int FIDO2CheckSignature(json_t *root, uint8_t *publickey, uint8_t *sign, size_t
     return 0;
 }
 
-int FIDO2MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, bool verbose, bool verbose2, bool showCBOR, bool showDERTLV) {
+int FIDO2MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, bool verbose, bool verbose2, bool showCBOR, bool showDERTLV)
+{
     CborParser parser;
     CborValue map, mapsmt;
     int res;
@@ -457,7 +471,7 @@ int FIDO2MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, b
     if (ubuf[32] & 0x80)
         PrintAndLog("ed - extension data included");
 
-    uint32_t cntr =  (uint32_t)bytes_to_num(&ubuf[33], 4);
+    uint32_t cntr = (uint32_t)bytes_to_num(&ubuf[33], 4);
     PrintAndLog("Counter: %d", cntr);
     JsonSaveInt(root, "$.AppData.Counter", cntr);
 
@@ -543,7 +557,7 @@ int FIDO2MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, b
             } else {
                 PrintAndLog("DER [%d]: %s...", derLen, sprint_hex(der, MIN(derLen, 16)));
             }
-                JsonSaveBufAsHexCompact(root, "$.AppData.DER", der, derLen);
+            JsonSaveBufAsHexCompact(root, "$.AppData.DER", der, derLen);
         }
     }
     res = cbor_value_leave_container(&map, &mapsmt);
@@ -566,7 +580,8 @@ int FIDO2MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, b
     return 0;
 }
 
-int FIDO2CreateGetAssertionReq(json_t *root, uint8_t *data, size_t maxdatalen, size_t *datalen, bool createAllowList) {
+int FIDO2CreateGetAssertionReq(json_t *root, uint8_t *data, size_t maxdatalen, size_t *datalen, bool createAllowList)
+{
     if (datalen)
         *datalen = 0;
     if (!root || !data || !maxdatalen)
@@ -640,7 +655,8 @@ int FIDO2CreateGetAssertionReq(json_t *root, uint8_t *data, size_t maxdatalen, s
     return 0;
 }
 
-int FIDO2GetAssertionParseRes(json_t *root, uint8_t *data, size_t dataLen, bool verbose, bool verbose2, bool showCBOR) {
+int FIDO2GetAssertionParseRes(json_t *root, uint8_t *data, size_t dataLen, bool verbose, bool verbose2, bool showCBOR)
+{
     CborParser parser;
     CborValue map, mapint;
     int res;
@@ -716,7 +732,7 @@ int FIDO2GetAssertionParseRes(json_t *root, uint8_t *data, size_t dataLen, bool
     if (ubuf[32] & 0x80)
         PrintAndLog("ed - extension data included");
 
-    uint32_t cntr =  (uint32_t)bytes_to_num(&ubuf[33], 4);
+    uint32_t cntr = (uint32_t)bytes_to_num(&ubuf[33], 4);
     PrintAndLog("Counter: %d", cntr);
     JsonSaveInt(root, "$.AppData.Counter", cntr);
 
diff --git a/client/flash.c b/client/flash.c
index 2df7ee4cd..21eabe8e3 100644
--- a/client/flash.c
+++ b/client/flash.c
@@ -33,7 +33,8 @@ static const uint8_t elf_ident[] = {
 
 // Turn PHDRs into flasher segments, checking for PHDR sanity and merging adjacent
 // unaligned segments if needed
-static int build_segs_from_phdrs(flash_file_t *ctx, FILE *fd, Elf32_Phdr *phdrs, uint16_t num_phdrs) {
+static int build_segs_from_phdrs(flash_file_t *ctx, FILE *fd, Elf32_Phdr *phdrs, uint16_t num_phdrs)
+{
     Elf32_Phdr *phdr = phdrs;
     flash_seg_t *seg;
     uint32_t last_end = 0;
@@ -70,14 +71,14 @@ static int build_segs_from_phdrs(flash_file_t *ctx, FILE *fd, Elf32_Phdr *phdrs,
                 offset);
         if (filesz != memsz) {
             fprintf(stderr, "Error: PHDR file size does not equal memory size\n"
-                            "(DATA+BSS PHDRs do not make sense on ROM platforms!)\n");
+                    "(DATA+BSS PHDRs do not make sense on ROM platforms!)\n");
             return -1;
         }
         if (paddr < last_end) {
             fprintf(stderr, "Error: PHDRs not sorted or overlap\n");
             return -1;
         }
-        if (paddr < FLASH_START || (paddr+filesz) > FLASH_END) {
+        if (paddr < FLASH_START || (paddr + filesz) > FLASH_END) {
             fprintf(stderr, "Error: PHDR is not contained in Flash\n");
             return -1;
         }
@@ -99,13 +100,13 @@ static int build_segs_from_phdrs(flash_file_t *ctx, FILE *fd, Elf32_Phdr *phdrs,
             return -1;
         }
 
-        uint32_t block_offset = paddr & (BLOCK_SIZE-1);
+        uint32_t block_offset = paddr & (BLOCK_SIZE - 1);
         if (block_offset) {
             if (ctx->num_segs) {
                 flash_seg_t *prev_seg = seg - 1;
                 uint32_t this_end = paddr + filesz;
-                uint32_t this_firstblock = paddr & ~(BLOCK_SIZE-1);
-                uint32_t prev_lastblock = (last_end - 1) & ~(BLOCK_SIZE-1);
+                uint32_t this_firstblock = paddr & ~(BLOCK_SIZE - 1);
+                uint32_t prev_lastblock = (last_end - 1) & ~(BLOCK_SIZE - 1);
 
                 if (this_firstblock == prev_lastblock) {
                     uint32_t new_length = this_end - prev_seg->start;
@@ -153,11 +154,12 @@ static int build_segs_from_phdrs(flash_file_t *ctx, FILE *fd, Elf32_Phdr *phdrs,
 }
 
 // Sanity check segments and check for bootloader writes
-static int check_segs(flash_file_t *ctx, int can_write_bl) {
+static int check_segs(flash_file_t *ctx, int can_write_bl)
+{
     for (int i = 0; i < ctx->num_segs; i++) {
         flash_seg_t *seg = &ctx->segments[i];
 
-        if (seg->start & (BLOCK_SIZE-1)) {
+        if (seg->start & (BLOCK_SIZE - 1)) {
             fprintf(stderr, "Error: Segment is not aligned\n");
             return -1;
         }
@@ -178,7 +180,8 @@ static int check_segs(flash_file_t *ctx, int can_write_bl) {
 }
 
 // Load an ELF file and prepare it for flashing
-int flash_load(flash_file_t *ctx, const char *name, int can_write_bl) {
+int flash_load(flash_file_t *ctx, const char *name, int can_write_bl)
+{
     FILE *fd = NULL;
     Elf32_Ehdr ehdr;
     Elf32_Phdr *phdrs = NULL;
@@ -199,8 +202,7 @@ int flash_load(flash_file_t *ctx, const char *name, int can_write_bl) {
         goto fail;
     }
     if (memcmp(ehdr.e_ident, elf_ident, sizeof(elf_ident))
-        || le32(ehdr.e_version) != 1)
-    {
+        || le32(ehdr.e_version) != 1) {
         fprintf(stderr, "Not an ELF file or wrong ELF type\n");
         goto fail;
     }
@@ -259,7 +261,8 @@ fail:
 }
 
 // Get the state of the proxmark, backwards compatible
-static int get_proxmark_state(uint32_t *state) {
+static int get_proxmark_state(uint32_t *state)
+{
     UsbCommand c = {CMD_DEVICE_INFO};
     SendCommand(&c);
     UsbCommand resp;
@@ -289,7 +292,8 @@ static int get_proxmark_state(uint32_t *state) {
 }
 
 // Enter the bootloader to be able to start flashing
-static int enter_bootloader(char *serial_port_name) {
+static int enter_bootloader(char *serial_port_name)
+{
     uint32_t state;
 
     if (get_proxmark_state(&state) < 0)
@@ -302,7 +306,7 @@ static int enter_bootloader(char *serial_port_name) {
     if (state & DEVICE_INFO_FLAG_CURRENT_MODE_OS) {
         fprintf(stdout, _BLUE_(Entering bootloader...) "\n");
         UsbCommand c;
-        memset(&c, 0, sizeof (c));
+        memset(&c, 0, sizeof(c));
 
         if ((state & DEVICE_INFO_FLAG_BOOTROM_PRESENT)
             && (state & DEVICE_INFO_FLAG_OSIMAGE_PRESENT)) {
@@ -334,21 +338,23 @@ static int enter_bootloader(char *serial_port_name) {
     return -1;
 }
 
-static int wait_for_ack(UsbCommand *ack) {
+static int wait_for_ack(UsbCommand *ack)
+{
     WaitForResponse(CMD_UNKNOWN, ack);
 
     if (ack->cmd != CMD_ACK) {
         printf("Error: Unexpected reply 0x%04" PRIx64 " %s (expected ACK)\n",
-            ack->cmd,
-            (ack->cmd == CMD_NACK) ? "NACK" : ""
-            );
+               ack->cmd,
+               (ack->cmd == CMD_NACK) ? "NACK" : ""
+              );
         return -1;
     }
     return 0;
 }
 
 // Go into flashing mode
-int flash_start_flashing(int enable_bl_writes, char *serial_port_name) {
+int flash_start_flashing(int enable_bl_writes, char *serial_port_name)
+{
     uint32_t state;
 
     if (enter_bootloader(serial_port_name) < 0)
@@ -375,12 +381,13 @@ int flash_start_flashing(int enable_bl_writes, char *serial_port_name) {
         return wait_for_ack(&c);
     } else {
         fprintf(stderr, _RED_(Note: Your bootloader does not understand the new START_FLASH command) "\n");
-        fprintf(stderr, _RED_(      It is recommended that you update your bootloader) "\n\n");
+        fprintf(stderr, _RED_(It is recommended that you update your bootloader) "\n\n");
     }
     return 0;
 }
 
-static int write_block(uint32_t address, uint8_t *data, uint32_t length) {
+static int write_block(uint32_t address, uint8_t *data, uint32_t length)
+{
     uint8_t block_buf[BLOCK_SIZE];
     memset(block_buf, 0xFF, BLOCK_SIZE);
     memcpy(block_buf, data, length);
@@ -402,7 +409,8 @@ static int write_block(uint32_t address, uint8_t *data, uint32_t length) {
 }
 
 // Write a file's segments to Flash
-int flash_write(flash_file_t *ctx) {
+int flash_write(flash_file_t *ctx)
+{
     fprintf(stdout, "Writing segments for file: %s\n", ctx->filename);
     for (int i = 0; i < ctx->num_segs; i++) {
         flash_seg_t *seg = &ctx->segments[i];
@@ -432,7 +440,8 @@ int flash_write(flash_file_t *ctx) {
             baddr += block_size;
             length -= block_size;
             block++;
-            fprintf(stdout, "."); fflush(stdout);
+            fprintf(stdout, ".");
+            fflush(stdout);
         }
         fprintf(stdout, _GREEN_(OK) "\n");
         fflush(stdout);
@@ -441,7 +450,8 @@ int flash_write(flash_file_t *ctx) {
 }
 
 // free a file context
-void flash_free(flash_file_t *ctx) {
+void flash_free(flash_file_t *ctx)
+{
     if (!ctx)
         return;
     if (ctx->segments) {
@@ -454,7 +464,8 @@ void flash_free(flash_file_t *ctx) {
 }
 
 // just reset the unit
-int flash_stop_flashing(void) {
+int flash_stop_flashing(void)
+{
     UsbCommand c = {CMD_HARDWARE_RESET};
     SendCommand(&c);
     msleep(100);
diff --git a/client/flash.h b/client/flash.h
index 547a8d1d6..b474c79b6 100644
--- a/client/flash.h
+++ b/client/flash.h
@@ -38,7 +38,7 @@ typedef struct {
 } flash_file_t;
 
 int flash_load(flash_file_t *ctx, const char *name, int can_write_bl);
-int flash_start_flashing(int enable_bl_writes,char *serial_port_name);
+int flash_start_flashing(int enable_bl_writes, char *serial_port_name);
 int flash_write(flash_file_t *ctx);
 void flash_free(flash_file_t *ctx);
 int flash_stop_flashing(void);
diff --git a/client/flasher.c b/client/flasher.c
index 9c5488bee..90965322d 100644
--- a/client/flasher.c
+++ b/client/flasher.c
@@ -20,7 +20,8 @@
 
 #define MAX_FILES 4
 
-void cmd_debug(UsbCommand* c) {
+void cmd_debug(UsbCommand *c)
+{
     //  Debug
     printf("UsbCommand length[len=%zd]\n", sizeof(UsbCommand));
     printf("  cmd[len=%zd]: %016" PRIx64"\n", sizeof(c->cmd), c->cmd);
@@ -29,13 +30,14 @@ void cmd_debug(UsbCommand* c) {
     printf(" arg2[len=%zd]: %016" PRIx64"\n", sizeof(c->arg[2]), c->arg[2]);
     printf(" data[len=%zd]: ", sizeof(c->d.asBytes));
 
-    for (size_t i=0; i<16; i++)
+    for (size_t i = 0; i < 16; i++)
         printf("%02x", c->d.asBytes[i]);
 
     printf("...\n");
 }
 
-static void usage(char *argv0) {
+static void usage(char *argv0)
+{
     fprintf(stdout, "Usage:   %s <port> [-b] image.elf [image.elf...]\n\n", argv0);
     fprintf(stdout, "\t-b\tEnable flashing of bootloader area (DANGEROUS)\n\n");
     fprintf(stdout, "\nExample:\n\n\t %s "SERIAL_PORT_H" armsrc/obj/fullimage.elf\n", argv0);
@@ -48,7 +50,8 @@ static void usage(char *argv0) {
 #endif
 }
 
-int main(int argc, char **argv) {
+int main(int argc, char **argv)
+{
     int can_write_bl = 0;
     int num_files = 0;
     int res;
@@ -79,10 +82,10 @@ int main(int argc, char **argv) {
         }
     }
 
-    char* serial_port_name = argv[1];
+    char *serial_port_name = argv[1];
 
     if (!OpenProxmark(serial_port_name, true, 60, true)) {
-        fprintf(stderr, "Could not find Proxmark on " _RED_(%s) ".\n\n", serial_port_name);
+        fprintf(stderr, "Could not find Proxmark on " _RED_( % s) ".\n\n", serial_port_name);
         return -1;
     } else {
         fprintf(stderr, _GREEN_(Found) "\n");
diff --git a/client/fpga_compress.c b/client/fpga_compress.c
index 3b2f900b9..2ec7fdebf 100644
--- a/client/fpga_compress.c
+++ b/client/fpga_compress.c
@@ -59,7 +59,7 @@ static void usage(void)
 
 static voidpf fpga_deflate_malloc(voidpf opaque, uInt items, uInt size)
 {
-    return calloc(items*size, sizeof(uint8_t));
+    return calloc(items * size, sizeof(uint8_t));
 }
 
 
@@ -101,24 +101,24 @@ int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile, bool hardn
             if (hardnested_mode) {
                 fprintf(stderr,
 #if __WORDSIZE == 64
-                "Input file too big (> %" PRIu64 " bytes). This is probably not a hardnested bitflip state table.\n"
+                        "Input file too big (> %" PRIu64 " bytes). This is probably not a hardnested bitflip state table.\n"
 #else
-                "Input file too big (> %lu bytes). This is probably not a hardnested bitflip state table.\n"
+                        "Input file too big (> %lu bytes). This is probably not a hardnested bitflip state table.\n"
 #endif
-                , HARDNESTED_TABLE_SIZE);
+                        , HARDNESTED_TABLE_SIZE);
 
             } else {
                 fprintf(stderr, "Input files too big (total > %lu bytes). These are probably not PM3 FPGA config files.\n", num_infiles * FPGA_CONFIG_SIZE);
             }
-            for(uint16_t j = 0; j < num_infiles; j++) {
+            for (uint16_t j = 0; j < num_infiles; j++) {
                 fclose(infile[j]);
             }
             free(fpga_config);
-            return(EXIT_FAILURE);
+            return (EXIT_FAILURE);
         }
 
-        for(uint16_t j = 0; j < num_infiles; j++) {
-            for(uint16_t k = 0; k < FPGA_INTERLEAVE_SIZE; k++) {
+        for (uint16_t j = 0; j < num_infiles; j++) {
+            for (uint16_t k = 0; k < FPGA_INTERLEAVE_SIZE; k++) {
                 c = (uint8_t)fgetc(infile[j]);
                 if (!feof(infile[j])) {
                     fpga_config[i++] = c;
@@ -138,11 +138,11 @@ int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile, bool hardn
     compressed_fpga_stream.opaque = Z_NULL;
 
     ret = deflateInit2(&compressed_fpga_stream,
-                        COMPRESS_LEVEL,
-                        Z_DEFLATED,
-                        COMPRESS_WINDOW_BITS,
-                        COMPRESS_MEM_LEVEL,
-                        COMPRESS_STRATEGY);
+                       COMPRESS_LEVEL,
+                       Z_DEFLATED,
+                       COMPRESS_WINDOW_BITS,
+                       COMPRESS_MEM_LEVEL,
+                       COMPRESS_STRATEGY);
 
     // estimate the size of the compressed output
     uint32_t outsize_max = deflateBound(&compressed_fpga_stream, compressed_fpga_stream.avail_in);
@@ -152,10 +152,10 @@ int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile, bool hardn
 
     if (ret == Z_OK) {
         ret = deflateTune(&compressed_fpga_stream,
-                            COMPRESS_GOOD_LENGTH,
-                            COMPRESS_MAX_LAZY,
-                            COMPRESS_MAX_NICE_LENGTH,
-                            COMPRESS_MAX_CHAIN);
+                          COMPRESS_GOOD_LENGTH,
+                          COMPRESS_MAX_LAZY,
+                          COMPRESS_MAX_NICE_LENGTH,
+                          COMPRESS_MAX_CHAIN);
     }
 
     if (ret == Z_OK) {
@@ -168,14 +168,14 @@ int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile, bool hardn
         fprintf(stderr, "Error in deflate(): %d %s\n", ret, compressed_fpga_stream.msg);
         free(outbuf);
         deflateEnd(&compressed_fpga_stream);
-        for(uint16_t j = 0; j < num_infiles; j++) {
+        for (uint16_t j = 0; j < num_infiles; j++) {
             fclose(infile[j]);
         }
         fclose(outfile);
         free(infile);
         free(fpga_config);
-        return(EXIT_FAILURE);
-        }
+        return (EXIT_FAILURE);
+    }
 
     for (i = 0; i < compressed_fpga_stream.total_out; i++) {
         fputc(outbuf[i], outfile);
@@ -183,21 +183,21 @@ int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile, bool hardn
 
     free(outbuf);
     deflateEnd(&compressed_fpga_stream);
-    for(uint16_t j = 0; j < num_infiles; j++) {
+    for (uint16_t j = 0; j < num_infiles; j++) {
         fclose(infile[j]);
     }
     fclose(outfile);
     free(infile);
     free(fpga_config);
 
-    return(EXIT_SUCCESS);
+    return (EXIT_SUCCESS);
 
 }
 
 
 int zlib_decompress(FILE *infile, FILE *outfile)
 {
-    #define DECOMPRESS_BUF_SIZE 1024
+#define DECOMPRESS_BUF_SIZE 1024
     uint8_t outbuf[DECOMPRESS_BUF_SIZE];
     uint8_t inbuf[DECOMPRESS_BUF_SIZE];
     int32_t ret;
@@ -253,12 +253,12 @@ int zlib_decompress(FILE *infile, FILE *outfile)
         }
         fclose(outfile);
         fclose(infile);
-        return(EXIT_SUCCESS);
+        return (EXIT_SUCCESS);
     } else {
         fprintf(stderr, "Error. Inflate() returned error %d, %s", ret, compressed_fpga_stream.msg);
         fclose(outfile);
         fclose(infile);
-        return(EXIT_FAILURE);
+        return (EXIT_FAILURE);
     }
 
 }
@@ -273,7 +273,7 @@ int zlib_decompress(FILE *infile, FILE *outfile)
 static int bitparse_find_section(FILE *infile, char section_name, unsigned int *section_length)
 {
     int result = 0;
-    #define MAX_FPGA_BIT_STREAM_HEADER_SEARCH 100  // maximum number of bytes to search for the requested section
+#define MAX_FPGA_BIT_STREAM_HEADER_SEARCH 100  // maximum number of bytes to search for the requested section
     uint16_t numbytes = 0;
     while (numbytes < MAX_FPGA_BIT_STREAM_HEADER_SEARCH) {
         char current_name = (char)fgetc(infile);
@@ -284,15 +284,15 @@ static int bitparse_find_section(FILE *infile, char section_name, unsigned int *
         }
         unsigned int current_length = 0;
         switch (current_name) {
-        case 'e':
-            /* Four byte length field */
-            current_length += fgetc(infile) << 24;
-            current_length += fgetc(infile) << 16;
-            numbytes += 2;
-        default: /* Fall through, two byte length field */
-            current_length += fgetc(infile) << 8;
-            current_length += fgetc(infile) << 0;
-            numbytes += 2;
+            case 'e':
+                /* Four byte length field */
+                current_length += fgetc(infile) << 24;
+                current_length += fgetc(infile) << 16;
+                numbytes += 2;
+            default: /* Fall through, two byte length field */
+                current_length += fgetc(infile) << 8;
+                current_length += fgetc(infile) << 0;
+                numbytes += 2;
         }
 
         if (current_name != 'e' && current_length > 255) {
@@ -315,7 +315,7 @@ static int bitparse_find_section(FILE *infile, char section_name, unsigned int *
     return result;
 }
 
-static int FpgaGatherVersion(FILE *infile, char* infile_name, char *dst, int len)
+static int FpgaGatherVersion(FILE *infile, char *infile_name, char *dst, int len)
 {
     unsigned int fpga_info_len;
     char tempstr[40] = {0x00};
@@ -325,52 +325,53 @@ static int FpgaGatherVersion(FILE *infile, char* infile_name, char *dst, int len
     for (uint16_t i = 0; i < FPGA_BITSTREAM_FIXED_HEADER_SIZE; i++) {
         if (fgetc(infile) != bitparse_fixed_header[i]) {
             fprintf(stderr, "Invalid FPGA file. Aborting...\n\n");
-            return(EXIT_FAILURE);
+            return (EXIT_FAILURE);
         }
     }
 
     if (!memcmp("fpga_lf", basename(infile_name), 7))
-        strncat(dst, "LF", len-1);
+        strncat(dst, "LF", len - 1);
     else if (!memcmp("fpga_hf", basename(infile_name), 7))
-        strncat(dst, "HF", len-1);
+        strncat(dst, "HF", len - 1);
 
-    strncat(dst, " image built", len-1);
+    strncat(dst, " image built", len - 1);
     if (bitparse_find_section(infile, 'b', &fpga_info_len)) {
-        strncat(dst, " for ", len-1);
+        strncat(dst, " for ", len - 1);
         for (uint16_t i = 0; i < fpga_info_len; i++) {
             char c = (char)fgetc(infile);
             if (i < sizeof(tempstr)) {
                 tempstr[i] = c;
             }
         }
-        strncat(dst, tempstr, len-1);
+        strncat(dst, tempstr, len - 1);
     }
 
     if (bitparse_find_section(infile, 'c', &fpga_info_len)) {
-        strncat(dst, " on ", len-1);
+        strncat(dst, " on ", len - 1);
         for (uint16_t i = 0; i < fpga_info_len; i++) {
             char c = (char)fgetc(infile);
             if (i < sizeof(tempstr)) {
                 tempstr[i] = c;
             }
         }
-        strncat(dst, tempstr, len-1);
+        strncat(dst, tempstr, len - 1);
     }
 
     if (bitparse_find_section(infile, 'd', &fpga_info_len)) {
-        strncat(dst, " at ", len-1);
+        strncat(dst, " at ", len - 1);
         for (uint16_t i = 0; i < fpga_info_len; i++) {
             char c = (char)fgetc(infile);
             if (i < sizeof(tempstr)) {
                 tempstr[i] = c;
             }
         }
-        strncat(dst, tempstr, len-1);
+        strncat(dst, tempstr, len - 1);
     }
     return 0;
 }
 
-static void print_version_info_preamble(FILE *outfile, int num_infiles) {
+static void print_version_info_preamble(FILE *outfile, int num_infiles)
+{
     fprintf(outfile, "//-----------------------------------------------------------------------------\n");
     fprintf(outfile, "// piwi, 2018\n");
     fprintf(outfile, "//\n");
@@ -388,7 +389,8 @@ static void print_version_info_preamble(FILE *outfile, int num_infiles) {
     fprintf(outfile, "const char* const fpga_version_information[%d] = {\n", num_infiles);
 }
 
-static int generate_fpga_version_info(FILE *infile[], char *infile_names[], int num_infiles, FILE *outfile) {
+static int generate_fpga_version_info(FILE *infile[], char *infile_names[], int num_infiles, FILE *outfile)
+{
 
     char version_string[80] = "";
 
@@ -397,10 +399,10 @@ static int generate_fpga_version_info(FILE *infile[], char *infile_names[], int
     for (int i = 0; i < num_infiles; i++) {
         FpgaGatherVersion(infile[i], infile_names[i], version_string, sizeof(version_string));
         fprintf(outfile, "\t\" %s\"", version_string);
-        if (i != num_infiles-1) {
+        if (i != num_infiles - 1) {
             fprintf(outfile, ",");
         }
-        fprintf(outfile,"\n");
+        fprintf(outfile, "\n");
     }
     fprintf(outfile, "};\n");
     return 0;
@@ -414,25 +416,25 @@ int main(int argc, char **argv)
 
     if (argc == 1 || argc == 2) {
         usage();
-        return(EXIT_FAILURE);
+        return (EXIT_FAILURE);
     }
 
     if (!strcmp(argv[1], "-d")) { // Decompress
 
-        infiles = calloc(1, sizeof(FILE*));
+        infiles = calloc(1, sizeof(FILE *));
         if (argc != 4) {
             usage();
-            return(EXIT_FAILURE);
+            return (EXIT_FAILURE);
         }
         infiles[0] = fopen(argv[2], "rb");
         if (infiles[0] == NULL) {
             fprintf(stderr, "Error. Cannot open input file %s\n\n", argv[2]);
-            return(EXIT_FAILURE);
+            return (EXIT_FAILURE);
         }
         outfile = fopen(argv[3], "wb");
         if (outfile == NULL) {
             fprintf(stderr, "Error. Cannot open output file %s\n\n", argv[3]);
-            return(EXIT_FAILURE);
+            return (EXIT_FAILURE);
         }
         return zlib_decompress(infiles[0], outfile);
 
@@ -444,38 +446,38 @@ int main(int argc, char **argv)
         if (!strcmp(argv[1], "-t")) {  // compress one hardnested table
             if (argc != 4) {
                 usage();
-                return(EXIT_FAILURE);
+                return (EXIT_FAILURE);
             }
             hardnested_mode = true;
             num_input_files = 1;
         } else if (!strcmp(argv[1], "-v")) {  // generate version info
             generate_version_file = true;
-            num_input_files = argc-3;
+            num_input_files = argc - 3;
         } else {  // compress 1..n fpga files
-            num_input_files = argc-2;
+            num_input_files = argc - 2;
         }
 
-        infiles = calloc(num_input_files, sizeof(FILE*));
-        infile_names = calloc(num_input_files, sizeof(char*));
+        infiles = calloc(num_input_files, sizeof(FILE *));
+        infile_names = calloc(num_input_files, sizeof(char *));
         for (uint16_t i = 0; i < num_input_files; i++) {
-            infile_names[i] = argv[i+((hardnested_mode || generate_version_file)?2:1)];
+            infile_names[i] = argv[i + ((hardnested_mode || generate_version_file) ? 2 : 1)];
             infiles[i] = fopen(infile_names[i], "rb");
             if (infiles[i] == NULL) {
                 fprintf(stderr, "Error. Cannot open input file %s\n\n", infile_names[i]);
-                return(EXIT_FAILURE);
+                return (EXIT_FAILURE);
             }
         }
-        outfile = fopen(argv[argc-1], "wb");
+        outfile = fopen(argv[argc - 1], "wb");
         if (outfile == NULL) {
-            fprintf(stderr, "Error. Cannot open output file %s\n\n", argv[argc-1]);
-            return(EXIT_FAILURE);
+            fprintf(stderr, "Error. Cannot open output file %s\n\n", argv[argc - 1]);
+            return (EXIT_FAILURE);
         }
         if (generate_version_file) {
             if (generate_fpga_version_info(infiles, infile_names, num_input_files, outfile)) {
-                return(EXIT_FAILURE);
+                return (EXIT_FAILURE);
             }
         } else {
-        return zlib_compress(infiles, num_input_files, outfile, hardnested_mode);
+            return zlib_compress(infiles, num_input_files, outfile, hardnested_mode);
         }
     }
 }
diff --git a/client/graph.c b/client/graph.c
index 4f10ab94d..b45598d69 100644
--- a/client/graph.c
+++ b/client/graph.c
@@ -16,7 +16,8 @@ int s_Buff[MAX_GRAPH_TRACE_LEN];
 /* write a manchester bit to the graph
 TODO,  verfy that this doesn't overflow buffer  (iceman)
 */
-void AppendGraph(bool redraw, int clock, int bit) {
+void AppendGraph(bool redraw, int clock, int bit)
+{
     int i;
     //set first half the clock bit (all 1's or 0's for a 0 or 1 bit)
     for (i = 0; i < (int)(clock / 2); ++i)
@@ -30,7 +31,8 @@ void AppendGraph(bool redraw, int clock, int bit) {
 }
 
 // clear out our graph window
-int ClearGraph(bool redraw) {
+int ClearGraph(bool redraw)
+{
     int gtl = GraphTraceLen;
     memset(GraphBuffer, 0x00, GraphTraceLen);
     GraphTraceLen = 0;
@@ -39,7 +41,8 @@ int ClearGraph(bool redraw) {
     return gtl;
 }
 // option '1' to save GraphBuffer any other to restore
-void save_restoreGB(uint8_t saveOpt) {
+void save_restoreGB(uint8_t saveOpt)
+{
     static int SavedGB[MAX_GRAPH_TRACE_LEN];
     static int SavedGBlen = 0;
     static bool GB_Saved = false;
@@ -50,7 +53,7 @@ void save_restoreGB(uint8_t saveOpt) {
         SavedGBlen = GraphTraceLen;
         GB_Saved = true;
         SavedGridOffsetAdj = GridOffset;
-    } else if (GB_Saved){ //restore
+    } else if (GB_Saved) { //restore
         memcpy(GraphBuffer, SavedGB, sizeof(GraphBuffer));
         GraphTraceLen = SavedGBlen;
         GridOffset = SavedGridOffsetAdj;
@@ -59,12 +62,13 @@ void save_restoreGB(uint8_t saveOpt) {
     return;
 }
 
-void setGraphBuf(uint8_t *buf, size_t size) {
-    if ( buf == NULL ) return;
+void setGraphBuf(uint8_t *buf, size_t size)
+{
+    if (buf == NULL) return;
 
     ClearGraph(false);
 
-    if ( size > MAX_GRAPH_TRACE_LEN )
+    if (size > MAX_GRAPH_TRACE_LEN)
         size = MAX_GRAPH_TRACE_LEN;
 
     for (uint32_t i = 0; i < size; ++i)
@@ -75,10 +79,11 @@ void setGraphBuf(uint8_t *buf, size_t size) {
     return;
 }
 
-size_t getFromGraphBuf(uint8_t *buf) {
-    if (buf == NULL ) return 0;
+size_t getFromGraphBuf(uint8_t *buf)
+{
+    if (buf == NULL) return 0;
     uint32_t i;
-    for (i=0; i < GraphTraceLen; ++i){
+    for (i = 0; i < GraphTraceLen; ++i) {
         //trim
         if (GraphBuffer[i] > 127) GraphBuffer[i] = 127;
         if (GraphBuffer[i] < -127) GraphBuffer[i] = -127;
@@ -88,8 +93,9 @@ size_t getFromGraphBuf(uint8_t *buf) {
 }
 
 // A simple test to see if there is any data inside Graphbuffer.
-bool HasGraphData(){
-    if ( GraphTraceLen <= 0) {
+bool HasGraphData()
+{
+    if (GraphTraceLen <= 0) {
         PrintAndLogEx(NORMAL, "No data available, try reading something first");
         return false;
     }
@@ -97,7 +103,8 @@ bool HasGraphData(){
 }
 
 // Get or auto-detect ask clock rate
-int GetAskClock(const char *str, bool printAns) {
+int GetAskClock(const char *str, bool printAns)
+{
     if (getSignalProperties()->isnoise)
         return false;
 
@@ -120,7 +127,7 @@ int GetAskClock(const char *str, bool printAns) {
         idx = DetectASKClock(bits, size, &clock, 20);
     }
 
-    if ( clock > 0 ) {
+    if (clock > 0) {
         setClockGrid(clock, idx);
     }
     // Only print this message if we're not looping something
@@ -130,28 +137,30 @@ int GetAskClock(const char *str, bool printAns) {
     return clock;
 }
 
-uint8_t GetPskCarrier(const char *str, bool printAns) {
+uint8_t GetPskCarrier(const char *str, bool printAns)
+{
     if (getSignalProperties()->isnoise)
         return false;
 
     uint8_t carrier = 0;
     uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
     size_t size = getFromGraphBuf(bits);
-    if ( size == 0 ) {
+    if (size == 0) {
         PrintAndLogEx(WARNING, "Failed to copy from graphbuffer");
         return 0;
     }
     uint16_t fc = countFC(bits, size, false);
     carrier = fc & 0xFF;
     if (carrier != 2 && carrier != 4 && carrier != 8) return 0;
-    if (( fc >> 8) == 10 && carrier == 8) return 0;
+    if ((fc >> 8) == 10 && carrier == 8) return 0;
     // Only print this message if we're not looping something
     if (printAns)
         PrintAndLogEx(SUCCESS, "Auto-detected PSK carrier rate: %d", carrier);
     return carrier;
 }
 
-int GetPskClock(const char* str, bool printAns) {
+int GetPskClock(const char *str, bool printAns)
+{
 
     if (getSignalProperties()->isnoise)
         return -1;
@@ -163,7 +172,7 @@ int GetPskClock(const char* str, bool printAns) {
     // Auto-detect clock
     uint8_t grph[MAX_GRAPH_TRACE_LEN] = {0};
     size_t size = getFromGraphBuf(grph);
-    if ( size == 0 ) {
+    if (size == 0) {
         PrintAndLogEx(WARNING, "Failed to copy from graphbuffer");
         return -1;
     }
@@ -177,7 +186,8 @@ int GetPskClock(const char* str, bool printAns) {
     return clock;
 }
 
-int GetNrzClock(const char* str, bool printAns) {
+int GetNrzClock(const char *str, bool printAns)
+{
 
     if (getSignalProperties()->isnoise)
         return -1;
@@ -189,7 +199,7 @@ int GetNrzClock(const char* str, bool printAns) {
     // Auto-detect clock
     uint8_t grph[MAX_GRAPH_TRACE_LEN] = {0};
     size_t size = getFromGraphBuf(grph);
-    if ( size == 0 ) {
+    if (size == 0) {
         PrintAndLogEx(WARNING, "Failed to copy from graphbuffer");
         return -1;
     }
@@ -203,7 +213,8 @@ int GetNrzClock(const char* str, bool printAns) {
 }
 //by marshmellow
 //attempt to detect the field clock and bit clock for FSK
-int GetFskClock(const char* str, bool printAns) {
+int GetFskClock(const char *str, bool printAns)
+{
 
     int clock = param_get32ex(str, 0, 0, 10);
     if (clock != 0)
@@ -212,10 +223,10 @@ int GetFskClock(const char* str, bool printAns) {
     uint8_t fc1 = 0, fc2 = 0, rf1 = 0;
     int firstClockEdge = 0;
 
-    if ( !fskClocks(&fc1, &fc2, &rf1, &firstClockEdge))
+    if (!fskClocks(&fc1, &fc2, &rf1, &firstClockEdge))
         return 0;
 
-    if ((fc1==10 && fc2==8) || (fc1==8 && fc2==5)){
+    if ((fc1 == 10 && fc2 == 8) || (fc1 == 8 && fc2 == 5)) {
         if (printAns)
             PrintAndLogEx(SUCCESS, "Detected Field Clocks: FC/%d, FC/%d - Bit Clock: RF/%d", fc1, fc2, rf1);
         setClockGrid(rf1, firstClockEdge);
@@ -226,7 +237,8 @@ int GetFskClock(const char* str, bool printAns) {
     PrintAndLogEx(DEBUG, "Detected Field Clocks: FC/%d, FC/%d - Bit Clock: RF/%d", fc1, fc2, rf1);
     return 0;
 }
-bool fskClocks(uint8_t *fc1, uint8_t *fc2, uint8_t *rf1, int *firstClockEdge) {
+bool fskClocks(uint8_t *fc1, uint8_t *fc2, uint8_t *rf1, int *firstClockEdge)
+{
 
     if (getSignalProperties()->isnoise)
         return false;
diff --git a/client/hardnested/hardnested_bf_core.c b/client/hardnested/hardnested_bf_core.c
index 7a91b48f6..a5fbdfcf2 100644
--- a/client/hardnested/hardnested_bf_core.c
+++ b/client/hardnested/hardnested_bf_core.c
@@ -80,9 +80,9 @@ THE SOFTWARE.
 #define VECTOR_SIZE (MAX_BITSLICES/8)
 typedef uint32_t __attribute__((aligned(VECTOR_SIZE))) __attribute__((vector_size(VECTOR_SIZE))) bitslice_value_t;
 typedef union {
-        bitslice_value_t value;
-        uint64_t bytes64[MAX_BITSLICES/64];
-        uint8_t bytes[MAX_BITSLICES/8];
+    bitslice_value_t value;
+    uint64_t bytes64[MAX_BITSLICES / 64];
+    uint8_t bytes[MAX_BITSLICES / 8];
 } bitslice_t;
 
 // filter function (f20)
@@ -123,7 +123,7 @@ typedef union {
 #endif
 
 // typedefs and declaration of functions:
-typedef const uint64_t crack_states_bitsliced_t(uint32_t, uint8_t*, statelist_t*, uint32_t*, uint64_t*, uint32_t, uint8_t*, noncelist_t*);
+typedef const uint64_t crack_states_bitsliced_t(uint32_t, uint8_t *, statelist_t *, uint32_t *, uint64_t *, uint32_t, uint8_t *, noncelist_t *);
 crack_states_bitsliced_t crack_states_bitsliced_AVX512;
 crack_states_bitsliced_t crack_states_bitsliced_AVX2;
 crack_states_bitsliced_t crack_states_bitsliced_AVX;
@@ -132,7 +132,7 @@ crack_states_bitsliced_t crack_states_bitsliced_MMX;
 crack_states_bitsliced_t crack_states_bitsliced_NOSIMD;
 crack_states_bitsliced_t crack_states_bitsliced_dispatch;
 
-typedef void bitslice_test_nonces_t(uint32_t, uint32_t*, uint8_t*);
+typedef void bitslice_test_nonces_t(uint32_t, uint32_t *, uint8_t *);
 bitslice_test_nonces_t bitslice_test_nonces_AVX512;
 bitslice_test_nonces_t bitslice_test_nonces_AVX2;
 bitslice_test_nonces_t bitslice_test_nonces_AVX;
@@ -145,12 +145,13 @@ bitslice_test_nonces_t bitslice_test_nonces_dispatch;
 #define malloc_bitslice(x) __builtin_assume_aligned(_aligned_malloc((x), MAX_BITSLICES/8), MAX_BITSLICES/8)
 #define free_bitslice(x) _aligned_free(x)
 #elif defined (__APPLE__)
-static void *malloc_bitslice(size_t x) {
+static void *malloc_bitslice(size_t x)
+{
     char *allocated_memory;
-    if (posix_memalign((void**)&allocated_memory, MAX_BITSLICES/8, x)) {
+    if (posix_memalign((void **)&allocated_memory, MAX_BITSLICES / 8, x)) {
         return NULL;
     } else {
-        return __builtin_assume_aligned(allocated_memory, MAX_BITSLICES/8);
+        return __builtin_assume_aligned(allocated_memory, MAX_BITSLICES / 8);
     }
 }
 #define free_bitslice(x) free(x)
@@ -173,7 +174,8 @@ static bitslice_t bs_ones;
 static bitslice_t bs_zeroes;
 
 
-void BITSLICE_TEST_NONCES(uint32_t nonces_to_bruteforce, uint32_t *bf_test_nonce, uint8_t *bf_test_nonce_par) {
+void BITSLICE_TEST_NONCES(uint32_t nonces_to_bruteforce, uint32_t *bf_test_nonce, uint8_t *bf_test_nonce_par)
+{
 
     // initialize 1 and 0 vectors
     memset(bs_ones.bytes, 0xff, VECTOR_SIZE);
@@ -181,9 +183,9 @@ void BITSLICE_TEST_NONCES(uint32_t nonces_to_bruteforce, uint32_t *bf_test_nonce
 
     // bitslice nonces' 2nd to 4th byte
     for (uint32_t i = 0; i < nonces_to_bruteforce; i++) {
-        for(uint32_t bit_idx = 0; bit_idx < KEYSTREAM_SIZE; bit_idx++){
-            bool bit = get_bit(KEYSTREAM_SIZE-1-bit_idx, BSWAP_32(bf_test_nonce[i] << 8));
-            if(bit){
+        for (uint32_t bit_idx = 0; bit_idx < KEYSTREAM_SIZE; bit_idx++) {
+            bool bit = get_bit(KEYSTREAM_SIZE - 1 - bit_idx, BSWAP_32(bf_test_nonce[i] << 8));
+            if (bit) {
                 bitsliced_encrypted_nonces[i][bit_idx].value = bs_ones.value;
             } else {
                 bitsliced_encrypted_nonces[i][bit_idx].value = bs_zeroes.value;
@@ -192,9 +194,9 @@ void BITSLICE_TEST_NONCES(uint32_t nonces_to_bruteforce, uint32_t *bf_test_nonce
     }
     // bitslice nonces' parity (4 bits)
     for (uint32_t i = 0; i < nonces_to_bruteforce; i++) {
-        for(uint32_t bit_idx = 0; bit_idx < 4; bit_idx++){
-            bool bit = get_bit(4-1-bit_idx, bf_test_nonce_par[i]);
-            if(bit){
+        for (uint32_t bit_idx = 0; bit_idx < 4; bit_idx++) {
+            bool bit = get_bit(4 - 1 - bit_idx, bf_test_nonce_par[i]);
+            if (bit) {
                 bitsliced_encrypted_parity_bits[i][bit_idx].value = bs_ones.value;
             } else {
                 bitsliced_encrypted_parity_bits[i][bit_idx].value = bs_zeroes.value;
@@ -205,27 +207,28 @@ void BITSLICE_TEST_NONCES(uint32_t nonces_to_bruteforce, uint32_t *bf_test_nonce
 }
 
 
-const uint64_t CRACK_STATES_BITSLICED(uint32_t cuid, uint8_t *best_first_bytes, statelist_t *p, uint32_t *keys_found, uint64_t *num_keys_tested, uint32_t nonces_to_bruteforce, uint8_t *bf_test_nonce_2nd_byte, noncelist_t *nonces){
+const uint64_t CRACK_STATES_BITSLICED(uint32_t cuid, uint8_t *best_first_bytes, statelist_t *p, uint32_t *keys_found, uint64_t *num_keys_tested, uint32_t nonces_to_bruteforce, uint8_t *bf_test_nonce_2nd_byte, noncelist_t *nonces)
+{
 
     // Unlike aczid's implementation this doesn't roll back at all when performing bitsliced bruteforce.
     // We know that the best first byte is already shifted in. Testing with the remaining three bytes of
     // the nonces is sufficient to eliminate most of them. The small rest is tested with a simple unsliced
     // brute forcing (including roll back).
 
-    bitslice_t states[KEYSTREAM_SIZE+STATE_SIZE];
-    bitslice_t * restrict state_p;
+    bitslice_t states[KEYSTREAM_SIZE + STATE_SIZE];
+    bitslice_t *restrict state_p;
     uint64_t key = -1;
     uint64_t bucket_states_tested = 0;
-    uint32_t bucket_size[(p->len[EVEN_STATE] - 1)/MAX_BITSLICES + 1];
+    uint32_t bucket_size[(p->len[EVEN_STATE] - 1) / MAX_BITSLICES + 1];
     uint32_t bitsliced_blocks = 0;
     uint32_t const *restrict p_even_end = p->states[EVEN_STATE] + p->len[EVEN_STATE];
 #if defined (DEBUG_BRUTE_FORCE)
     uint32_t elimination_step = 0;
-    #define MAX_ELIMINATION_STEP 32
+#define MAX_ELIMINATION_STEP 32
     uint64_t keys_eliminated[MAX_ELIMINATION_STEP] = {0};
 #endif
 #ifdef DEBUG_KEY_ELIMINATION
-    bool bucket_contains_test_key[(p->len[EVEN_STATE] - 1)/MAX_BITSLICES + 1];
+    bool bucket_contains_test_key[(p->len[EVEN_STATE] - 1) / MAX_BITSLICES + 1];
 #endif
 
     // constant ones/zeroes
@@ -235,32 +238,32 @@ const uint64_t CRACK_STATES_BITSLICED(uint32_t cuid, uint8_t *best_first_bytes,
     memset(bs_zeroes.bytes, 0x00, VECTOR_SIZE);
 
     // bitslice all the even states
-    bitslice_t **restrict bitsliced_even_states = (bitslice_t **)malloc(((p->len[EVEN_STATE] - 1)/MAX_BITSLICES + 1) * sizeof(bitslice_t *));
+    bitslice_t **restrict bitsliced_even_states = (bitslice_t **)malloc(((p->len[EVEN_STATE] - 1) / MAX_BITSLICES + 1) * sizeof(bitslice_t *));
     if (bitsliced_even_states == NULL) {
         printf("Out of memory error in brute_force. Aborting...");
         exit(4);
     }
-    bitslice_value_t *restrict bitsliced_even_feedback = malloc_bitslice(((p->len[EVEN_STATE] - 1)/MAX_BITSLICES + 1) * sizeof(bitslice_value_t));
+    bitslice_value_t *restrict bitsliced_even_feedback = malloc_bitslice(((p->len[EVEN_STATE] - 1) / MAX_BITSLICES + 1) * sizeof(bitslice_value_t));
     if (bitsliced_even_feedback == NULL) {
         printf("Out of memory error in brute_force. Aborting...");
         exit(4);
     }
-    for(uint32_t *restrict p_even = p->states[EVEN_STATE]; p_even < p_even_end; p_even += MAX_BITSLICES){
-        bitslice_t *restrict lstate_p = malloc_bitslice(STATE_SIZE/2*sizeof(bitslice_t));
+    for (uint32_t *restrict p_even = p->states[EVEN_STATE]; p_even < p_even_end; p_even += MAX_BITSLICES) {
+        bitslice_t *restrict lstate_p = malloc_bitslice(STATE_SIZE / 2 * sizeof(bitslice_t));
         if (lstate_p == NULL) {
             printf("Out of memory error in brute_force. Aborting... \n");
             exit(4);
         }
-        memset(lstate_p, 0x00, STATE_SIZE/2*sizeof(bitslice_t)); // zero even bits
+        memset(lstate_p, 0x00, STATE_SIZE / 2 * sizeof(bitslice_t)); // zero even bits
         // bitslice even half-states
-        const uint32_t max_slices = (p_even_end-p_even) < MAX_BITSLICES ? p_even_end-p_even : MAX_BITSLICES;
+        const uint32_t max_slices = (p_even_end - p_even) < MAX_BITSLICES ? p_even_end - p_even : MAX_BITSLICES;
         bucket_size[bitsliced_blocks] = max_slices;
 #ifdef DEBUG_KEY_ELIMINATION
         bucket_contains_test_key[bitsliced_blocks] = false;
 #endif
         uint32_t slice_idx;
-        for(slice_idx = 0; slice_idx < max_slices; ++slice_idx){
-            uint32_t e = *(p_even+slice_idx);
+        for (slice_idx = 0; slice_idx < max_slices; ++slice_idx) {
+            uint32_t e = *(p_even + slice_idx);
 #ifdef DEBUG_KEY_ELIMINATION
             if (known_target_key != -1 && e == test_state[EVEN_STATE]) {
                 bucket_contains_test_key[bitsliced_blocks] = true;
@@ -268,34 +271,34 @@ const uint64_t CRACK_STATES_BITSLICED(uint32_t cuid, uint8_t *best_first_bytes,
                 // printf("in slice %d\n", slice_idx);
             }
 #endif
-            for(uint32_t bit_idx = 0; bit_idx < STATE_SIZE/2; bit_idx++, e >>= 1){
+            for (uint32_t bit_idx = 0; bit_idx < STATE_SIZE / 2; bit_idx++, e >>= 1) {
                 // set even bits
-                if(e&1){
-                    lstate_p[bit_idx].bytes64[slice_idx>>6] |= 1ull << (slice_idx & 0x3f);
+                if (e & 1) {
+                    lstate_p[bit_idx].bytes64[slice_idx >> 6] |= 1ull << (slice_idx & 0x3f);
                 }
             }
         }
         // padding with last even state
-        for ( ; slice_idx < MAX_BITSLICES; ++slice_idx) {
-            uint32_t e = *(p_even_end-1);
-            for(uint32_t bit_idx = 0; bit_idx < STATE_SIZE/2; bit_idx++, e >>= 1){
+        for (; slice_idx < MAX_BITSLICES; ++slice_idx) {
+            uint32_t e = *(p_even_end - 1);
+            for (uint32_t bit_idx = 0; bit_idx < STATE_SIZE / 2; bit_idx++, e >>= 1) {
                 // set even bits
-                if(e&1){
-                    lstate_p[bit_idx].bytes64[slice_idx>>6] |= 1ull << (slice_idx & 0x3f);
+                if (e & 1) {
+                    lstate_p[bit_idx].bytes64[slice_idx >> 6] |= 1ull << (slice_idx & 0x3f);
                 }
             }
         }
         bitsliced_even_states[bitsliced_blocks] = lstate_p;
         // bitsliced_even_feedback[bitsliced_blocks] = bs_ones;
-        bitsliced_even_feedback[bitsliced_blocks] = lstate_p[(47- 0)/2].value ^
-                                                    lstate_p[(47-10)/2].value ^ lstate_p[(47-12)/2].value ^ lstate_p[(47-14)/2].value ^
-                                                    lstate_p[(47-24)/2].value ^ lstate_p[(47-42)/2].value;
+        bitsliced_even_feedback[bitsliced_blocks] = lstate_p[(47 - 0) / 2].value ^
+                                                    lstate_p[(47 - 10) / 2].value ^ lstate_p[(47 - 12) / 2].value ^ lstate_p[(47 - 14) / 2].value ^
+                                                    lstate_p[(47 - 24) / 2].value ^ lstate_p[(47 - 42) / 2].value;
         bitsliced_blocks++;
     }
     // bitslice every odd state to every block of even states
-    for(uint32_t const *restrict p_odd = p->states[ODD_STATE]; p_odd < p->states[ODD_STATE] + p->len[ODD_STATE]; ++p_odd){
+    for (uint32_t const *restrict p_odd = p->states[ODD_STATE]; p_odd < p->states[ODD_STATE] + p->len[ODD_STATE]; ++p_odd) {
         // early abort
-        if(*keys_found){
+        if (*keys_found) {
             goto out;
         }
 
@@ -305,12 +308,12 @@ const uint64_t CRACK_STATES_BITSLICED(uint32_t cuid, uint8_t *best_first_bytes,
         uint32_t o = *p_odd;
 
         // pre-compute the odd feedback bit
-        bool odd_feedback_bit = evenparity32(o&0x29ce5c);
+        bool odd_feedback_bit = evenparity32(o & 0x29ce5c);
         const bitslice_value_t odd_feedback = odd_feedback_bit ? bs_ones.value : bs_zeroes.value;
 
         // set odd state bits
         for (uint32_t state_idx = 0; state_idx < STATE_SIZE; o >>= 1, state_idx += 2) {
-            if (o & 1){
+            if (o & 1) {
                 state_p[state_idx] = bs_ones;
             } else {
                 state_p[state_idx] = bs_zeroes;
@@ -320,14 +323,14 @@ const uint64_t CRACK_STATES_BITSLICED(uint32_t cuid, uint8_t *best_first_bytes,
         bitslice_value_t crypto1_bs_f20b_2[16];
         bitslice_value_t crypto1_bs_f20b_3[8];
 
-        crypto1_bs_f20b_2[0] = f20b(state_p[47-25].value, state_p[47-27].value, state_p[47-29].value, state_p[47-31].value);
-        crypto1_bs_f20b_3[0] = f20b(state_p[47-41].value, state_p[47-43].value, state_p[47-45].value, state_p[47-47].value);
+        crypto1_bs_f20b_2[0] = f20b(state_p[47 - 25].value, state_p[47 - 27].value, state_p[47 - 29].value, state_p[47 - 31].value);
+        crypto1_bs_f20b_3[0] = f20b(state_p[47 - 41].value, state_p[47 - 43].value, state_p[47 - 45].value, state_p[47 - 47].value);
 
         bitslice_value_t ksb[8];
-        ksb[0] = f20c(f20a(state_p[47- 9].value, state_p[47-11].value, state_p[47-13].value, state_p[47-15].value),
-                      f20b(state_p[47-17].value, state_p[47-19].value, state_p[47-21].value, state_p[47-23].value),
+        ksb[0] = f20c(f20a(state_p[47 - 9].value, state_p[47 - 11].value, state_p[47 - 13].value, state_p[47 - 15].value),
+                      f20b(state_p[47 - 17].value, state_p[47 - 19].value, state_p[47 - 21].value, state_p[47 - 23].value),
                       crypto1_bs_f20b_2[0],
-                      f20a(state_p[47-33].value, state_p[47-35].value, state_p[47-37].value, state_p[47-39].value),
+                      f20a(state_p[47 - 33].value, state_p[47 - 35].value, state_p[47 - 37].value, state_p[47 - 39].value),
                       crypto1_bs_f20b_3[0]);
 
         uint32_t *restrict p_even = p->states[EVEN_STATE];
@@ -335,14 +338,14 @@ const uint64_t CRACK_STATES_BITSLICED(uint32_t cuid, uint8_t *best_first_bytes,
 
 #ifdef DEBUG_KEY_ELIMINATION
             // if (known_target_key != -1 && bucket_contains_test_key[block_idx] && *p_odd == test_state[ODD_STATE]) {
-                // printf("Now testing known target key.\n");
-                // printf("block_idx = %d/%d\n", block_idx, bitsliced_blocks);
+            // printf("Now testing known target key.\n");
+            // printf("block_idx = %d/%d\n", block_idx, bitsliced_blocks);
             // }
 #endif
             // add the even state bits
             const bitslice_t *restrict bitsliced_even_state = bitsliced_even_states[block_idx];
-            for(uint32_t state_idx = 1; state_idx < STATE_SIZE; state_idx += 2) {
-                state_p[state_idx] = bitsliced_even_state[state_idx/2];
+            for (uint32_t state_idx = 1; state_idx < STATE_SIZE; state_idx += 2) {
+                state_p[state_idx] = bitsliced_even_state[state_idx / 2];
             }
 
             // pre-compute first feedback bit vector. This is the same for all nonces
@@ -357,10 +360,10 @@ const uint64_t CRACK_STATES_BITSLICED(uint32_t cuid, uint8_t *best_first_bytes,
             par[0] = bs_zeroes.value;
             uint32_t next_common_bits = 0;
 
-            for(uint32_t tests = 0; tests < nonces_to_bruteforce; ++tests){
+            for (uint32_t tests = 0; tests < nonces_to_bruteforce; ++tests) {
                 // common bits with preceding test nonce
                 uint32_t common_bits = next_common_bits; //tests ? trailing_zeros(bf_test_nonce_2nd_byte[tests] ^ bf_test_nonce_2nd_byte[tests-1]) : 0;
-                next_common_bits = tests < nonces_to_bruteforce - 1 ? trailing_zeros(bf_test_nonce_2nd_byte[tests] ^ bf_test_nonce_2nd_byte[tests+1]) : 0;
+                next_common_bits = tests < nonces_to_bruteforce - 1 ? trailing_zeros(bf_test_nonce_2nd_byte[tests] ^ bf_test_nonce_2nd_byte[tests + 1]) : 0;
                 uint32_t parity_bit_idx = 1;                        // start checking with the parity of second nonce byte
                 bitslice_value_t fb_bits = fbb[common_bits];        // start with precomputed feedback bits from previous nonce
                 bitslice_value_t ks_bits = ksb[common_bits];        // dito for first keystream bits
@@ -371,7 +374,7 @@ const uint64_t CRACK_STATES_BITSLICED(uint32_t cuid, uint8_t *best_first_bytes,
                 state_p -= common_bits;                             // and reuse the already calculated state bits
                 // highest bit is transmitted/received first. We start with Bit 23 (highest bit of second nonce byte),
                 // or the highest bit which differs from the previous nonce
-                for (int32_t ks_idx = KEYSTREAM_SIZE-1-common_bits; ks_idx >= 0; --ks_idx) {
+                for (int32_t ks_idx = KEYSTREAM_SIZE - 1 - common_bits; ks_idx >= 0; --ks_idx) {
 
                     // decrypt nonce bits
                     const bitslice_value_t encrypted_nonce_bit_vector = bitsliced_encrypted_nonces[tests][ks_idx].value;
@@ -386,27 +389,27 @@ const uint64_t CRACK_STATES_BITSLICED(uint32_t cuid, uint8_t *best_first_bytes,
 
                     // update crypto1 subfunctions
                     bitslice_value_t f20a_1, f20b_1, f20b_2, f20a_2, f20b_3;
-                    f20a_2 = f20a(state_p[47-33].value, state_p[47-35].value, state_p[47-37].value, state_p[47-39].value);
-                    f20b_3 = f20b(state_p[47-41].value, state_p[47-43].value, state_p[47-45].value, state_p[47-47].value);
+                    f20a_2 = f20a(state_p[47 - 33].value, state_p[47 - 35].value, state_p[47 - 37].value, state_p[47 - 39].value);
+                    f20b_3 = f20b(state_p[47 - 41].value, state_p[47 - 43].value, state_p[47 - 45].value, state_p[47 - 47].value);
                     if (ks_idx > KEYSTREAM_SIZE - 8) {
-                        f20a_1 = f20a(state_p[47- 9].value, state_p[47-11].value, state_p[47-13].value, state_p[47-15].value);
-                        f20b_1 = f20b(state_p[47-17].value, state_p[47-19].value, state_p[47-21].value, state_p[47-23].value);
-                        f20b_2 = f20b(state_p[47-25].value, state_p[47-27].value, state_p[47-29].value, state_p[47-31].value);
+                        f20a_1 = f20a(state_p[47 - 9].value, state_p[47 - 11].value, state_p[47 - 13].value, state_p[47 - 15].value);
+                        f20b_1 = f20b(state_p[47 - 17].value, state_p[47 - 19].value, state_p[47 - 21].value, state_p[47 - 23].value);
+                        f20b_2 = f20b(state_p[47 - 25].value, state_p[47 - 27].value, state_p[47 - 29].value, state_p[47 - 31].value);
                         crypto1_bs_f20b_2[KEYSTREAM_SIZE - ks_idx] = f20b_2;
                         crypto1_bs_f20b_3[KEYSTREAM_SIZE - ks_idx] = f20b_3;
                     } else if (ks_idx > KEYSTREAM_SIZE - 16) {
-                        f20a_1 = f20a(state_p[47- 9].value, state_p[47-11].value, state_p[47-13].value, state_p[47-15].value);
+                        f20a_1 = f20a(state_p[47 - 9].value, state_p[47 - 11].value, state_p[47 - 13].value, state_p[47 - 15].value);
                         f20b_1 = crypto1_bs_f20b_2[KEYSTREAM_SIZE - ks_idx - 8];
-                        f20b_2 = f20b(state_p[47-25].value, state_p[47-27].value, state_p[47-29].value, state_p[47-31].value);
+                        f20b_2 = f20b(state_p[47 - 25].value, state_p[47 - 27].value, state_p[47 - 29].value, state_p[47 - 31].value);
                         crypto1_bs_f20b_2[KEYSTREAM_SIZE - ks_idx] = f20b_2;
-                    } else if (ks_idx > KEYSTREAM_SIZE - 24){
-                        f20a_1 = f20a(state_p[47- 9].value, state_p[47-11].value, state_p[47-13].value, state_p[47-15].value);
+                    } else if (ks_idx > KEYSTREAM_SIZE - 24) {
+                        f20a_1 = f20a(state_p[47 - 9].value, state_p[47 - 11].value, state_p[47 - 13].value, state_p[47 - 15].value);
                         f20b_1 = crypto1_bs_f20b_2[KEYSTREAM_SIZE - ks_idx - 8];
                         f20b_2 = crypto1_bs_f20b_3[KEYSTREAM_SIZE - ks_idx - 16];
                     } else {
-                        f20a_1 = f20a(state_p[47- 9].value, state_p[47-11].value, state_p[47-13].value, state_p[47-15].value);
-                        f20b_1 = f20b(state_p[47-17].value, state_p[47-19].value, state_p[47-21].value, state_p[47-23].value);
-                        f20b_2 = f20b(state_p[47-25].value, state_p[47-27].value, state_p[47-29].value, state_p[47-31].value);
+                        f20a_1 = f20a(state_p[47 - 9].value, state_p[47 - 11].value, state_p[47 - 13].value, state_p[47 - 15].value);
+                        f20b_1 = f20b(state_p[47 - 17].value, state_p[47 - 19].value, state_p[47 - 21].value, state_p[47 - 23].value);
+                        f20b_2 = f20b(state_p[47 - 25].value, state_p[47 - 27].value, state_p[47 - 29].value, state_p[47 - 31].value);
                     }
                     // update keystream bit
                     ks_bits = f20c(f20a_1, f20b_1, f20b_2, f20a_2, f20b_3);
@@ -427,15 +430,15 @@ const uint64_t CRACK_STATES_BITSLICED(uint32_t cuid, uint8_t *best_first_bytes,
 
                         // this is much faster on my gcc, because somehow a memcmp needlessly spills/fills all the xmm registers to/from the stack - ???
                         // the short-circuiting also helps
-                        if(results.bytes64[0] == 0
+                        if (results.bytes64[0] == 0
 #if MAX_BITSLICES > 64
-                           && results.bytes64[1] == 0
+                            && results.bytes64[1] == 0
 #endif
 #if MAX_BITSLICES > 128
-                           && results.bytes64[2] == 0
-                           && results.bytes64[3] == 0
+                            && results.bytes64[2] == 0
+                            && results.bytes64[3] == 0
 #endif
-                          ) {
+                           ) {
 #if defined (DEBUG_BRUTE_FORCE)
                             if (elimination_step < MAX_ELIMINATION_STEP) {
                                 keys_eliminated[elimination_step] += MAX_BITSLICES;
@@ -458,12 +461,12 @@ const uint64_t CRACK_STATES_BITSLICED(uint32_t cuid, uint8_t *best_first_bytes,
                     // update feedback bit vector
                     if (ks_idx != 0) {
                         fb_bits =
-                                  (state_p[47- 0].value ^ state_p[47- 5].value ^ state_p[47- 9].value ^
-                                   state_p[47-10].value ^ state_p[47-12].value ^ state_p[47-14].value ^
-                                   state_p[47-15].value ^ state_p[47-17].value ^ state_p[47-19].value ^
-                                   state_p[47-24].value ^ state_p[47-25].value ^ state_p[47-27].value ^
-                                   state_p[47-29].value ^ state_p[47-35].value ^ state_p[47-39].value ^
-                                   state_p[47-41].value ^ state_p[47-42].value ^ state_p[47-43].value);
+                            (state_p[47 - 0].value ^ state_p[47 - 5].value ^ state_p[47 - 9].value ^
+                             state_p[47 - 10].value ^ state_p[47 - 12].value ^ state_p[47 - 14].value ^
+                             state_p[47 - 15].value ^ state_p[47 - 17].value ^ state_p[47 - 19].value ^
+                             state_p[47 - 24].value ^ state_p[47 - 25].value ^ state_p[47 - 27].value ^
+                             state_p[47 - 29].value ^ state_p[47 - 35].value ^ state_p[47 - 39].value ^
+                             state_p[47 - 41].value ^ state_p[47 - 42].value ^ state_p[47 - 43].value);
                     }
                     // remember feedback and keystream vectors for later use
                     uint8_t bit = KEYSTREAM_SIZE - ks_idx;
@@ -523,7 +526,7 @@ stop_tests:
         }
     }
 out:
-    for(uint32_t block_idx = 0; block_idx < bitsliced_blocks; ++block_idx){
+    for (uint32_t block_idx = 0; block_idx < bitsliced_blocks; ++block_idx) {
         free_bitslice(bitsliced_even_states[block_idx]);
     }
     free(bitsliced_even_states);
@@ -532,7 +535,7 @@ out:
 
 #if defined (DEBUG_BRUTE_FORCE)
     for (uint32_t i = 0; i < MAX_ELIMINATION_STEP; i++) {
-        printf("Eliminated after %2u test_bytes: %5.2f%%\n", i+1, (float)keys_eliminated[i] / bucket_states_tested * 100);
+        printf("Eliminated after %2u test_bytes: %5.2f%%\n", i + 1, (float)keys_eliminated[i] / bucket_states_tested * 100);
     }
 #endif
     return key;
@@ -548,36 +551,39 @@ bitslice_test_nonces_t *bitslice_test_nonces_function_p = &bitslice_test_nonces_
 
 static SIMDExecInstr intSIMDInstr = SIMD_AUTO;
 
-void SetSIMDInstr(SIMDExecInstr instr) {
+void SetSIMDInstr(SIMDExecInstr instr)
+{
     intSIMDInstr = instr;
 
     crack_states_bitsliced_function_p = &crack_states_bitsliced_dispatch;
     bitslice_test_nonces_function_p = &bitslice_test_nonces_dispatch;
 }
 
-SIMDExecInstr GetSIMDInstr() {
+SIMDExecInstr GetSIMDInstr()
+{
     SIMDExecInstr instr = SIMD_NONE;
 
 #if defined (__i386__) || defined (__x86_64__)
-    #if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
-        #if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
-        if (__builtin_cpu_supports("avx512f")) instr = SIMD_AVX512;
-        else if (__builtin_cpu_supports("avx2")) instr = SIMD_AVX2;
-        #else
-        if (__builtin_cpu_supports("avx2")) instr = SIMD_AVX2;
-        #endif
-        else if (__builtin_cpu_supports("avx")) instr = SIMD_AVX;
-        else if (__builtin_cpu_supports("sse2")) instr = SIMD_SSE2;
-        else if (__builtin_cpu_supports("mmx")) instr = SIMD_MMX;
-        else
-    #endif
+#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
+#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
+    if (__builtin_cpu_supports("avx512f")) instr = SIMD_AVX512;
+    else if (__builtin_cpu_supports("avx2")) instr = SIMD_AVX2;
+#else
+    if (__builtin_cpu_supports("avx2")) instr = SIMD_AVX2;
+#endif
+    else if (__builtin_cpu_supports("avx")) instr = SIMD_AVX;
+    else if (__builtin_cpu_supports("sse2")) instr = SIMD_SSE2;
+    else if (__builtin_cpu_supports("mmx")) instr = SIMD_MMX;
+    else
+#endif
 #endif
         instr = SIMD_NONE;
 
     return instr;
 }
 
-SIMDExecInstr GetSIMDInstrAuto() {
+SIMDExecInstr GetSIMDInstrAuto()
+{
     SIMDExecInstr instr = intSIMDInstr;
     if (instr == SIMD_AUTO)
         return GetSIMDInstr();
@@ -586,15 +592,16 @@ SIMDExecInstr GetSIMDInstrAuto() {
 }
 
 // determine the available instruction set at runtime and call the correct function
-const uint64_t crack_states_bitsliced_dispatch(uint32_t cuid, uint8_t *best_first_bytes, statelist_t *p, uint32_t *keys_found, uint64_t *num_keys_tested, uint32_t nonces_to_bruteforce, uint8_t *bf_test_nonce_2nd_byte, noncelist_t *nonces) {
-    switch(GetSIMDInstrAuto()) {
+const uint64_t crack_states_bitsliced_dispatch(uint32_t cuid, uint8_t *best_first_bytes, statelist_t *p, uint32_t *keys_found, uint64_t *num_keys_tested, uint32_t nonces_to_bruteforce, uint8_t *bf_test_nonce_2nd_byte, noncelist_t *nonces)
+{
+    switch (GetSIMDInstrAuto()) {
 #if defined (__i386__) || defined (__x86_64__)
-    #if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
-        #if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
+#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
+#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
         case SIMD_AVX512:
             crack_states_bitsliced_function_p = &crack_states_bitsliced_AVX512;
             break;
-        #endif
+#endif
         case SIMD_AVX2:
             crack_states_bitsliced_function_p = &crack_states_bitsliced_AVX2;
             break;
@@ -607,10 +614,10 @@ const uint64_t crack_states_bitsliced_dispatch(uint32_t cuid, uint8_t *best_firs
         case SIMD_MMX:
             crack_states_bitsliced_function_p = &crack_states_bitsliced_MMX;
             break;
-    #endif
+#endif
 #endif
         default:
-        crack_states_bitsliced_function_p = &crack_states_bitsliced_NOSIMD;
+            crack_states_bitsliced_function_p = &crack_states_bitsliced_NOSIMD;
             break;
     }
 
@@ -618,15 +625,16 @@ const uint64_t crack_states_bitsliced_dispatch(uint32_t cuid, uint8_t *best_firs
     return (*crack_states_bitsliced_function_p)(cuid, best_first_bytes, p, keys_found, num_keys_tested, nonces_to_bruteforce, bf_test_nonce_2nd_byte, nonces);
 }
 
-void bitslice_test_nonces_dispatch(uint32_t nonces_to_bruteforce, uint32_t *bf_test_nonce, uint8_t *bf_test_nonce_par) {
-    switch(GetSIMDInstrAuto()) {
+void bitslice_test_nonces_dispatch(uint32_t nonces_to_bruteforce, uint32_t *bf_test_nonce, uint8_t *bf_test_nonce_par)
+{
+    switch (GetSIMDInstrAuto()) {
 #if defined (__i386__) || defined (__x86_64__)
-    #if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
-        #if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
+#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
+#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
         case SIMD_AVX512:
             bitslice_test_nonces_function_p = &bitslice_test_nonces_AVX512;
             break;
-        #endif
+#endif
         case SIMD_AVX2:
             bitslice_test_nonces_function_p = &bitslice_test_nonces_AVX2;
             break;
@@ -639,10 +647,10 @@ void bitslice_test_nonces_dispatch(uint32_t nonces_to_bruteforce, uint32_t *bf_t
         case SIMD_MMX:
             bitslice_test_nonces_function_p = &bitslice_test_nonces_MMX;
             break;
-    #endif
+#endif
 #endif
         default:
-        bitslice_test_nonces_function_p = &bitslice_test_nonces_NOSIMD;
+            bitslice_test_nonces_function_p = &bitslice_test_nonces_NOSIMD;
             break;
     }
 
@@ -651,11 +659,13 @@ void bitslice_test_nonces_dispatch(uint32_t nonces_to_bruteforce, uint32_t *bf_t
 }
 
 // Entries to dispatched function calls
-const uint64_t crack_states_bitsliced(uint32_t cuid, uint8_t *best_first_bytes, statelist_t *p, uint32_t *keys_found, uint64_t *num_keys_tested, uint32_t nonces_to_bruteforce, uint8_t *bf_test_nonce_2nd_byte, noncelist_t *nonces) {
+const uint64_t crack_states_bitsliced(uint32_t cuid, uint8_t *best_first_bytes, statelist_t *p, uint32_t *keys_found, uint64_t *num_keys_tested, uint32_t nonces_to_bruteforce, uint8_t *bf_test_nonce_2nd_byte, noncelist_t *nonces)
+{
     return (*crack_states_bitsliced_function_p)(cuid, best_first_bytes, p, keys_found, num_keys_tested, nonces_to_bruteforce, bf_test_nonce_2nd_byte, nonces);
 }
 
-void bitslice_test_nonces(uint32_t nonces_to_bruteforce, uint32_t *bf_test_nonce, uint8_t *bf_test_nonce_par) {
+void bitslice_test_nonces(uint32_t nonces_to_bruteforce, uint32_t *bf_test_nonce, uint8_t *bf_test_nonce_par)
+{
     (*bitslice_test_nonces_function_p)(nonces_to_bruteforce, bf_test_nonce, bf_test_nonce_par);
 }
 
diff --git a/client/hardnested/hardnested_bitarray_core.c b/client/hardnested/hardnested_bitarray_core.c
index 09d9ef60b..6a91f67eb 100644
--- a/client/hardnested/hardnested_bitarray_core.c
+++ b/client/hardnested/hardnested_bitarray_core.c
@@ -115,31 +115,31 @@
 
 
 // typedefs and declaration of functions:
-typedef uint32_t* malloc_bitarray_t(uint32_t);
+typedef uint32_t *malloc_bitarray_t(uint32_t);
 malloc_bitarray_t malloc_bitarray_AVX512, malloc_bitarray_AVX2, malloc_bitarray_AVX, malloc_bitarray_SSE2, malloc_bitarray_MMX, malloc_bitarray_NOSIMD, malloc_bitarray_dispatch;
-typedef void free_bitarray_t(uint32_t*);
+typedef void free_bitarray_t(uint32_t *);
 free_bitarray_t free_bitarray_AVX512, free_bitarray_AVX2, free_bitarray_AVX, free_bitarray_SSE2, free_bitarray_MMX, free_bitarray_NOSIMD, free_bitarray_dispatch;
 typedef uint32_t bitcount_t(uint32_t);
 bitcount_t bitcount_AVX512, bitcount_AVX2, bitcount_AVX, bitcount_SSE2, bitcount_MMX, bitcount_NOSIMD, bitcount_dispatch;
-typedef uint32_t count_states_t(uint32_t*);
+typedef uint32_t count_states_t(uint32_t *);
 count_states_t count_states_AVX512, count_states_AVX2, count_states_AVX, count_states_SSE2, count_states_MMX, count_states_NOSIMD, count_states_dispatch;
 typedef void bitarray_AND_t(uint32_t[], uint32_t[]);
 bitarray_AND_t bitarray_AND_AVX512, bitarray_AND_AVX2, bitarray_AND_AVX, bitarray_AND_SSE2, bitarray_AND_MMX, bitarray_AND_NOSIMD, bitarray_AND_dispatch;
-typedef void bitarray_low20_AND_t(uint32_t*, uint32_t*);
+typedef void bitarray_low20_AND_t(uint32_t *, uint32_t *);
 bitarray_low20_AND_t bitarray_low20_AND_AVX512, bitarray_low20_AND_AVX2, bitarray_low20_AND_AVX, bitarray_low20_AND_SSE2, bitarray_low20_AND_MMX, bitarray_low20_AND_NOSIMD, bitarray_low20_AND_dispatch;
-typedef uint32_t count_bitarray_AND_t(uint32_t*, uint32_t*);
+typedef uint32_t count_bitarray_AND_t(uint32_t *, uint32_t *);
 count_bitarray_AND_t count_bitarray_AND_AVX512, count_bitarray_AND_AVX2, count_bitarray_AND_AVX, count_bitarray_AND_SSE2, count_bitarray_AND_MMX, count_bitarray_AND_NOSIMD, count_bitarray_AND_dispatch;
-typedef uint32_t count_bitarray_low20_AND_t(uint32_t*, uint32_t*);
+typedef uint32_t count_bitarray_low20_AND_t(uint32_t *, uint32_t *);
 count_bitarray_low20_AND_t count_bitarray_low20_AND_AVX512, count_bitarray_low20_AND_AVX2, count_bitarray_low20_AND_AVX, count_bitarray_low20_AND_SSE2, count_bitarray_low20_AND_MMX, count_bitarray_low20_AND_NOSIMD, count_bitarray_low20_AND_dispatch;
-typedef void bitarray_AND4_t(uint32_t*, uint32_t*, uint32_t*, uint32_t*);
+typedef void bitarray_AND4_t(uint32_t *, uint32_t *, uint32_t *, uint32_t *);
 bitarray_AND4_t bitarray_AND4_AVX512, bitarray_AND4_AVX2, bitarray_AND4_AVX, bitarray_AND4_SSE2, bitarray_AND4_MMX, bitarray_AND4_NOSIMD, bitarray_AND4_dispatch;
 typedef void bitarray_OR_t(uint32_t[], uint32_t[]);
 bitarray_OR_t bitarray_OR_AVX512, bitarray_OR_AVX2, bitarray_OR_AVX, bitarray_OR_SSE2, bitarray_OR_MMX, bitarray_OR_NOSIMD, bitarray_OR_dispatch;
-typedef uint32_t count_bitarray_AND2_t(uint32_t*, uint32_t*);
+typedef uint32_t count_bitarray_AND2_t(uint32_t *, uint32_t *);
 count_bitarray_AND2_t count_bitarray_AND2_AVX512, count_bitarray_AND2_AVX2, count_bitarray_AND2_AVX, count_bitarray_AND2_SSE2, count_bitarray_AND2_MMX, count_bitarray_AND2_NOSIMD, count_bitarray_AND2_dispatch;
-typedef uint32_t count_bitarray_AND3_t(uint32_t*, uint32_t*, uint32_t*);
+typedef uint32_t count_bitarray_AND3_t(uint32_t *, uint32_t *, uint32_t *);
 count_bitarray_AND3_t count_bitarray_AND3_AVX512, count_bitarray_AND3_AVX2, count_bitarray_AND3_AVX, count_bitarray_AND3_SSE2, count_bitarray_AND3_MMX, count_bitarray_AND3_NOSIMD, count_bitarray_AND3_dispatch;
-typedef uint32_t count_bitarray_AND4_t(uint32_t*, uint32_t*, uint32_t*, uint32_t*);
+typedef uint32_t count_bitarray_AND4_t(uint32_t *, uint32_t *, uint32_t *, uint32_t *);
 count_bitarray_AND4_t count_bitarray_AND4_AVX512, count_bitarray_AND4_AVX2, count_bitarray_AND4_AVX, count_bitarray_AND4_SSE2, count_bitarray_AND4_MMX, count_bitarray_AND4_NOSIMD, count_bitarray_AND4_dispatch;
 
 
@@ -149,7 +149,7 @@ inline uint32_t *MALLOC_BITARRAY(uint32_t x)
     return __builtin_assume_aligned(_aligned_malloc((x), __BIGGEST_ALIGNMENT__), __BIGGEST_ALIGNMENT__);
 #elif defined (__APPLE__)
     uint32_t *allocated_memory;
-    if (posix_memalign((void**)&allocated_memory, __BIGGEST_ALIGNMENT__, x)) {
+    if (posix_memalign((void **)&allocated_memory, __BIGGEST_ALIGNMENT__, x)) {
         return NULL;
     } else {
         return __builtin_assume_aligned(allocated_memory, __BIGGEST_ALIGNMENT__);
@@ -179,7 +179,7 @@ inline uint32_t BITCOUNT(uint32_t a)
 inline uint32_t COUNT_STATES(uint32_t *A)
 {
     uint32_t count = 0;
-    for (uint32_t i = 0; i < (1<<19); i++) {
+    for (uint32_t i = 0; i < (1 << 19); i++) {
         count += BITCOUNT(A[i]);
     }
     return count;
@@ -190,7 +190,7 @@ inline void BITARRAY_AND(uint32_t *restrict A, uint32_t *restrict B)
 {
     A = __builtin_assume_aligned(A, __BIGGEST_ALIGNMENT__);
     B = __builtin_assume_aligned(B, __BIGGEST_ALIGNMENT__);
-    for (uint32_t i = 0; i < (1<<19); i++) {
+    for (uint32_t i = 0; i < (1 << 19); i++) {
         A[i] &= B[i];
     }
 }
@@ -201,7 +201,7 @@ inline void BITARRAY_LOW20_AND(uint32_t *restrict A, uint32_t *restrict B)
     uint16_t *a = (uint16_t *)__builtin_assume_aligned(A, __BIGGEST_ALIGNMENT__);
     uint16_t *b = (uint16_t *)__builtin_assume_aligned(B, __BIGGEST_ALIGNMENT__);
 
-    for (uint32_t i = 0; i < (1<<20); i++) {
+    for (uint32_t i = 0; i < (1 << 20); i++) {
         if (!b[i]) {
             a[i] = 0;
         }
@@ -214,7 +214,7 @@ inline uint32_t COUNT_BITARRAY_AND(uint32_t *restrict A, uint32_t *restrict B)
     A = __builtin_assume_aligned(A, __BIGGEST_ALIGNMENT__);
     B = __builtin_assume_aligned(B, __BIGGEST_ALIGNMENT__);
     uint32_t count = 0;
-    for (uint32_t i = 0; i < (1<<19); i++) {
+    for (uint32_t i = 0; i < (1 << 19); i++) {
         A[i] &= B[i];
         count += BITCOUNT(A[i]);
     }
@@ -228,7 +228,7 @@ inline uint32_t COUNT_BITARRAY_LOW20_AND(uint32_t *restrict A, uint32_t *restric
     uint16_t *b = (uint16_t *)__builtin_assume_aligned(B, __BIGGEST_ALIGNMENT__);
     uint32_t count = 0;
 
-    for (uint32_t i = 0; i < (1<<20); i++) {
+    for (uint32_t i = 0; i < (1 << 20); i++) {
         if (!b[i]) {
             a[i] = 0;
         }
@@ -244,7 +244,7 @@ inline void BITARRAY_AND4(uint32_t *restrict A, uint32_t *restrict B, uint32_t *
     B = __builtin_assume_aligned(B, __BIGGEST_ALIGNMENT__);
     C = __builtin_assume_aligned(C, __BIGGEST_ALIGNMENT__);
     D = __builtin_assume_aligned(D, __BIGGEST_ALIGNMENT__);
-    for (uint32_t i = 0; i < (1<<19); i++) {
+    for (uint32_t i = 0; i < (1 << 19); i++) {
         A[i] = B[i] & C[i] & D[i];
     }
 }
@@ -254,7 +254,7 @@ inline void BITARRAY_OR(uint32_t *restrict A, uint32_t *restrict B)
 {
     A = __builtin_assume_aligned(A, __BIGGEST_ALIGNMENT__);
     B = __builtin_assume_aligned(B, __BIGGEST_ALIGNMENT__);
-    for (uint32_t i = 0; i < (1<<19); i++) {
+    for (uint32_t i = 0; i < (1 << 19); i++) {
         A[i] |= B[i];
     }
 }
@@ -265,7 +265,7 @@ inline uint32_t COUNT_BITARRAY_AND2(uint32_t *restrict A, uint32_t *restrict B)
     A = __builtin_assume_aligned(A, __BIGGEST_ALIGNMENT__);
     B = __builtin_assume_aligned(B, __BIGGEST_ALIGNMENT__);
     uint32_t count = 0;
-    for (uint32_t i = 0; i < (1<<19); i++) {
+    for (uint32_t i = 0; i < (1 << 19); i++) {
         count += BITCOUNT(A[i] & B[i]);
     }
     return count;
@@ -278,7 +278,7 @@ inline uint32_t COUNT_BITARRAY_AND3(uint32_t *restrict A, uint32_t *restrict B,
     B = __builtin_assume_aligned(B, __BIGGEST_ALIGNMENT__);
     C = __builtin_assume_aligned(C, __BIGGEST_ALIGNMENT__);
     uint32_t count = 0;
-    for (uint32_t i = 0; i < (1<<19); i++) {
+    for (uint32_t i = 0; i < (1 << 19); i++) {
         count += BITCOUNT(A[i] & B[i] & C[i]);
     }
     return count;
@@ -292,7 +292,7 @@ inline uint32_t COUNT_BITARRAY_AND4(uint32_t *restrict A, uint32_t *restrict B,
     C = __builtin_assume_aligned(C, __BIGGEST_ALIGNMENT__);
     D = __builtin_assume_aligned(D, __BIGGEST_ALIGNMENT__);
     uint32_t count = 0;
-    for (uint32_t i = 0; i < (1<<19); i++) {
+    for (uint32_t i = 0; i < (1 << 19); i++) {
         count += BITCOUNT(A[i] & B[i] & C[i] & D[i]);
     }
     return count;
@@ -317,20 +317,21 @@ count_bitarray_AND3_t *count_bitarray_AND3_function_p = &count_bitarray_AND3_dis
 count_bitarray_AND4_t *count_bitarray_AND4_function_p = &count_bitarray_AND4_dispatch;
 
 // determine the available instruction set at runtime and call the correct function
-uint32_t *malloc_bitarray_dispatch(uint32_t x) {
+uint32_t *malloc_bitarray_dispatch(uint32_t x)
+{
 #if defined (__i386__) || defined (__x86_64__)
-    #if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
-        #if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
+#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
+#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
     if (__builtin_cpu_supports("avx512f")) malloc_bitarray_function_p = &malloc_bitarray_AVX512;
     else if (__builtin_cpu_supports("avx2")) malloc_bitarray_function_p = &malloc_bitarray_AVX2;
-        #else
+#else
     if (__builtin_cpu_supports("avx2")) malloc_bitarray_function_p = &malloc_bitarray_AVX2;
-        #endif
+#endif
     else if (__builtin_cpu_supports("avx")) malloc_bitarray_function_p = &malloc_bitarray_AVX;
     else if (__builtin_cpu_supports("sse2")) malloc_bitarray_function_p = &malloc_bitarray_SSE2;
     else if (__builtin_cpu_supports("mmx")) malloc_bitarray_function_p = &malloc_bitarray_MMX;
     else
-    #endif
+#endif
 #endif
         malloc_bitarray_function_p = &malloc_bitarray_NOSIMD;
 
@@ -338,20 +339,21 @@ uint32_t *malloc_bitarray_dispatch(uint32_t x) {
     return (*malloc_bitarray_function_p)(x);
 }
 
-void free_bitarray_dispatch(uint32_t *x) {
+void free_bitarray_dispatch(uint32_t *x)
+{
 #if defined (__i386__) || defined (__x86_64__)
-    #if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
-        #if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
+#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
+#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
     if (__builtin_cpu_supports("avx512f")) free_bitarray_function_p = &free_bitarray_AVX512;
     else if (__builtin_cpu_supports("avx2")) free_bitarray_function_p = &free_bitarray_AVX2;
-        #else
+#else
     if (__builtin_cpu_supports("avx2")) free_bitarray_function_p = &free_bitarray_AVX2;
-        #endif
+#endif
     else if (__builtin_cpu_supports("avx")) free_bitarray_function_p = &free_bitarray_AVX;
     else if (__builtin_cpu_supports("sse2")) free_bitarray_function_p = &free_bitarray_SSE2;
     else if (__builtin_cpu_supports("mmx")) free_bitarray_function_p = &free_bitarray_MMX;
     else
-    #endif
+#endif
 #endif
         free_bitarray_function_p = &free_bitarray_NOSIMD;
 
@@ -359,20 +361,21 @@ void free_bitarray_dispatch(uint32_t *x) {
     (*free_bitarray_function_p)(x);
 }
 
-uint32_t bitcount_dispatch(uint32_t a) {
+uint32_t bitcount_dispatch(uint32_t a)
+{
 #if defined (__i386__) || defined (__x86_64__)
-    #if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
-        #if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
+#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
+#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
     if (__builtin_cpu_supports("avx512f")) bitcount_function_p = &bitcount_AVX512;
     else if (__builtin_cpu_supports("avx2")) bitcount_function_p = &bitcount_AVX2;
-        #else
+#else
     if (__builtin_cpu_supports("avx2")) bitcount_function_p = &bitcount_AVX2;
-        #endif
+#endif
     else if (__builtin_cpu_supports("avx")) bitcount_function_p = &bitcount_AVX;
     else if (__builtin_cpu_supports("sse2")) bitcount_function_p = &bitcount_SSE2;
     else if (__builtin_cpu_supports("mmx")) bitcount_function_p = &bitcount_MMX;
     else
-    #endif
+#endif
 #endif
         bitcount_function_p = &bitcount_NOSIMD;
 
@@ -380,20 +383,21 @@ uint32_t bitcount_dispatch(uint32_t a) {
     return (*bitcount_function_p)(a);
 }
 
-uint32_t count_states_dispatch(uint32_t *bitarray) {
+uint32_t count_states_dispatch(uint32_t *bitarray)
+{
 #if defined (__i386__) || defined (__x86_64__)
-    #if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
-        #if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
+#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
+#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
     if (__builtin_cpu_supports("avx512f")) count_states_function_p = &count_states_AVX512;
     else if (__builtin_cpu_supports("avx2")) count_states_function_p = &count_states_AVX2;
-        #else
+#else
     if (__builtin_cpu_supports("avx2")) count_states_function_p = &count_states_AVX2;
-        #endif
+#endif
     else if (__builtin_cpu_supports("avx")) count_states_function_p = &count_states_AVX;
     else if (__builtin_cpu_supports("sse2")) count_states_function_p = &count_states_SSE2;
     else if (__builtin_cpu_supports("mmx")) count_states_function_p = &count_states_MMX;
     else
-    #endif
+#endif
 #endif
         count_states_function_p = &count_states_NOSIMD;
 
@@ -401,41 +405,43 @@ uint32_t count_states_dispatch(uint32_t *bitarray) {
     return (*count_states_function_p)(bitarray);
 }
 
-void bitarray_AND_dispatch(uint32_t *A, uint32_t *B) {
+void bitarray_AND_dispatch(uint32_t *A, uint32_t *B)
+{
 #if defined (__i386__) || defined (__x86_64__)
-    #if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
-        #if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
+#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
+#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
     if (__builtin_cpu_supports("avx512f")) bitarray_AND_function_p = &bitarray_AND_AVX512;
     else if (__builtin_cpu_supports("avx2")) bitarray_AND_function_p = &bitarray_AND_AVX2;
-        #else
+#else
     if (__builtin_cpu_supports("avx2")) bitarray_AND_function_p = &bitarray_AND_AVX2;
-        #endif
+#endif
     else if (__builtin_cpu_supports("avx")) bitarray_AND_function_p = &bitarray_AND_AVX;
     else if (__builtin_cpu_supports("sse2")) bitarray_AND_function_p = &bitarray_AND_SSE2;
     else if (__builtin_cpu_supports("mmx")) bitarray_AND_function_p = &bitarray_AND_MMX;
     else
-    #endif
+#endif
 #endif
         bitarray_AND_function_p = &bitarray_AND_NOSIMD;
 
     // call the most optimized function for this CPU
-    (*bitarray_AND_function_p)(A,B);
+    (*bitarray_AND_function_p)(A, B);
 }
 
-void bitarray_low20_AND_dispatch(uint32_t *A, uint32_t *B) {
+void bitarray_low20_AND_dispatch(uint32_t *A, uint32_t *B)
+{
 #if defined (__i386__) || defined (__x86_64__)
-    #if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
-        #if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
+#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
+#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
     if (__builtin_cpu_supports("avx512f")) bitarray_low20_AND_function_p = &bitarray_low20_AND_AVX512;
     else if (__builtin_cpu_supports("avx2")) bitarray_low20_AND_function_p = &bitarray_low20_AND_AVX2;
-        #else
+#else
     if (__builtin_cpu_supports("avx2")) bitarray_low20_AND_function_p = &bitarray_low20_AND_AVX2;
-        #endif
+#endif
     else if (__builtin_cpu_supports("avx")) bitarray_low20_AND_function_p = &bitarray_low20_AND_AVX;
     else if (__builtin_cpu_supports("sse2")) bitarray_low20_AND_function_p = &bitarray_low20_AND_SSE2;
     else if (__builtin_cpu_supports("mmx")) bitarray_low20_AND_function_p = &bitarray_low20_AND_MMX;
     else
-    #endif
+#endif
 #endif
         bitarray_low20_AND_function_p = &bitarray_low20_AND_NOSIMD;
 
@@ -443,20 +449,21 @@ void bitarray_low20_AND_dispatch(uint32_t *A, uint32_t *B) {
     (*bitarray_low20_AND_function_p)(A, B);
 }
 
-uint32_t count_bitarray_AND_dispatch(uint32_t *A, uint32_t *B) {
+uint32_t count_bitarray_AND_dispatch(uint32_t *A, uint32_t *B)
+{
 #if defined (__i386__) || defined (__x86_64__)
-    #if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
-        #if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
+#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
+#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
     if (__builtin_cpu_supports("avx512f")) count_bitarray_AND_function_p = &count_bitarray_AND_AVX512;
     else if (__builtin_cpu_supports("avx2")) count_bitarray_AND_function_p = &count_bitarray_AND_AVX2;
-        #else
+#else
     if (__builtin_cpu_supports("avx2")) count_bitarray_AND_function_p = &count_bitarray_AND_AVX2;
-        #endif
+#endif
     else if (__builtin_cpu_supports("avx")) count_bitarray_AND_function_p = &count_bitarray_AND_AVX;
     else if (__builtin_cpu_supports("sse2")) count_bitarray_AND_function_p = &count_bitarray_AND_SSE2;
     else if (__builtin_cpu_supports("mmx")) count_bitarray_AND_function_p = &count_bitarray_AND_MMX;
     else
-    #endif
+#endif
 #endif
         count_bitarray_AND_function_p = &count_bitarray_AND_NOSIMD;
 
@@ -464,20 +471,21 @@ uint32_t count_bitarray_AND_dispatch(uint32_t *A, uint32_t *B) {
     return (*count_bitarray_AND_function_p)(A, B);
 }
 
-uint32_t count_bitarray_low20_AND_dispatch(uint32_t *A, uint32_t *B) {
+uint32_t count_bitarray_low20_AND_dispatch(uint32_t *A, uint32_t *B)
+{
 #if defined (__i386__) || defined (__x86_64__)
-    #if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
-        #if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
+#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
+#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
     if (__builtin_cpu_supports("avx512f")) count_bitarray_low20_AND_function_p = &count_bitarray_low20_AND_AVX512;
     else if (__builtin_cpu_supports("avx2")) count_bitarray_low20_AND_function_p = &count_bitarray_low20_AND_AVX2;
-        #else
+#else
     if (__builtin_cpu_supports("avx2")) count_bitarray_low20_AND_function_p = &count_bitarray_low20_AND_AVX2;
-        #endif
+#endif
     else if (__builtin_cpu_supports("avx")) count_bitarray_low20_AND_function_p = &count_bitarray_low20_AND_AVX;
     else if (__builtin_cpu_supports("sse2")) count_bitarray_low20_AND_function_p = &count_bitarray_low20_AND_SSE2;
     else if (__builtin_cpu_supports("mmx")) count_bitarray_low20_AND_function_p = &count_bitarray_low20_AND_MMX;
     else
-    #endif
+#endif
 #endif
         count_bitarray_low20_AND_function_p = &count_bitarray_low20_AND_NOSIMD;
 
@@ -485,20 +493,21 @@ uint32_t count_bitarray_low20_AND_dispatch(uint32_t *A, uint32_t *B) {
     return (*count_bitarray_low20_AND_function_p)(A, B);
 }
 
-void bitarray_AND4_dispatch(uint32_t *A, uint32_t *B, uint32_t *C, uint32_t *D) {
+void bitarray_AND4_dispatch(uint32_t *A, uint32_t *B, uint32_t *C, uint32_t *D)
+{
 #if defined (__i386__) || defined (__x86_64__)
-    #if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
-        #if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
+#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
+#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
     if (__builtin_cpu_supports("avx512f")) bitarray_AND4_function_p = &bitarray_AND4_AVX512;
     else if (__builtin_cpu_supports("avx2")) bitarray_AND4_function_p = &bitarray_AND4_AVX2;
-        #else
+#else
     if (__builtin_cpu_supports("avx2")) bitarray_AND4_function_p = &bitarray_AND4_AVX2;
-        #endif
+#endif
     else if (__builtin_cpu_supports("avx")) bitarray_AND4_function_p = &bitarray_AND4_AVX;
     else if (__builtin_cpu_supports("sse2")) bitarray_AND4_function_p = &bitarray_AND4_SSE2;
     else if (__builtin_cpu_supports("mmx")) bitarray_AND4_function_p = &bitarray_AND4_MMX;
     else
-    #endif
+#endif
 #endif
         bitarray_AND4_function_p = &bitarray_AND4_NOSIMD;
 
@@ -506,41 +515,43 @@ void bitarray_AND4_dispatch(uint32_t *A, uint32_t *B, uint32_t *C, uint32_t *D)
     (*bitarray_AND4_function_p)(A, B, C, D);
 }
 
-void bitarray_OR_dispatch(uint32_t *A, uint32_t *B) {
+void bitarray_OR_dispatch(uint32_t *A, uint32_t *B)
+{
 #if defined (__i386__) || defined (__x86_64__)
-    #if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
-        #if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
+#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
+#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
     if (__builtin_cpu_supports("avx512f")) bitarray_OR_function_p = &bitarray_OR_AVX512;
     else if (__builtin_cpu_supports("avx2")) bitarray_OR_function_p = &bitarray_OR_AVX2;
-        #else
+#else
     if (__builtin_cpu_supports("avx2")) bitarray_OR_function_p = &bitarray_OR_AVX2;
-        #endif
+#endif
     else if (__builtin_cpu_supports("avx")) bitarray_OR_function_p = &bitarray_OR_AVX;
     else if (__builtin_cpu_supports("sse2")) bitarray_OR_function_p = &bitarray_OR_SSE2;
     else if (__builtin_cpu_supports("mmx")) bitarray_OR_function_p = &bitarray_OR_MMX;
     else
-    #endif
+#endif
 #endif
         bitarray_OR_function_p = &bitarray_OR_NOSIMD;
 
     // call the most optimized function for this CPU
-    (*bitarray_OR_function_p)(A,B);
+    (*bitarray_OR_function_p)(A, B);
 }
 
-uint32_t count_bitarray_AND2_dispatch(uint32_t *A, uint32_t *B) {
+uint32_t count_bitarray_AND2_dispatch(uint32_t *A, uint32_t *B)
+{
 #if defined (__i386__) || defined (__x86_64__)
-    #if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
-        #if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
+#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
+#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
     if (__builtin_cpu_supports("avx512f")) count_bitarray_AND2_function_p = &count_bitarray_AND2_AVX512;
     else if (__builtin_cpu_supports("avx2")) count_bitarray_AND2_function_p = &count_bitarray_AND2_AVX2;
-        #else
+#else
     if (__builtin_cpu_supports("avx2")) count_bitarray_AND2_function_p = &count_bitarray_AND2_AVX2;
-        #endif
+#endif
     else if (__builtin_cpu_supports("avx")) count_bitarray_AND2_function_p = &count_bitarray_AND2_AVX;
     else if (__builtin_cpu_supports("sse2")) count_bitarray_AND2_function_p = &count_bitarray_AND2_SSE2;
     else if (__builtin_cpu_supports("mmx")) count_bitarray_AND2_function_p = &count_bitarray_AND2_MMX;
     else
-    #endif
+#endif
 #endif
         count_bitarray_AND2_function_p = &count_bitarray_AND2_NOSIMD;
 
@@ -548,20 +559,21 @@ uint32_t count_bitarray_AND2_dispatch(uint32_t *A, uint32_t *B) {
     return (*count_bitarray_AND2_function_p)(A, B);
 }
 
-uint32_t count_bitarray_AND3_dispatch(uint32_t *A, uint32_t *B, uint32_t *C) {
+uint32_t count_bitarray_AND3_dispatch(uint32_t *A, uint32_t *B, uint32_t *C)
+{
 #if defined (__i386__) || defined (__x86_64__)
-    #if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
-        #if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
+#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
+#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
     if (__builtin_cpu_supports("avx512f")) count_bitarray_AND3_function_p = &count_bitarray_AND3_AVX512;
     else if (__builtin_cpu_supports("avx2")) count_bitarray_AND3_function_p = &count_bitarray_AND3_AVX2;
-        #else
+#else
     if (__builtin_cpu_supports("avx2")) count_bitarray_AND3_function_p = &count_bitarray_AND3_AVX2;
-        #endif
+#endif
     else if (__builtin_cpu_supports("avx")) count_bitarray_AND3_function_p = &count_bitarray_AND3_AVX;
     else if (__builtin_cpu_supports("sse2")) count_bitarray_AND3_function_p = &count_bitarray_AND3_SSE2;
     else if (__builtin_cpu_supports("mmx")) count_bitarray_AND3_function_p = &count_bitarray_AND3_MMX;
     else
-    #endif
+#endif
 #endif
         count_bitarray_AND3_function_p = &count_bitarray_AND3_NOSIMD;
 
@@ -569,20 +581,21 @@ uint32_t count_bitarray_AND3_dispatch(uint32_t *A, uint32_t *B, uint32_t *C) {
     return (*count_bitarray_AND3_function_p)(A, B, C);
 }
 
-uint32_t count_bitarray_AND4_dispatch(uint32_t *A, uint32_t *B, uint32_t *C, uint32_t *D) {
+uint32_t count_bitarray_AND4_dispatch(uint32_t *A, uint32_t *B, uint32_t *C, uint32_t *D)
+{
 #if defined (__i386__) || defined (__x86_64__)
-    #if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
-        #if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
+#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
+#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
     if (__builtin_cpu_supports("avx512f")) count_bitarray_AND4_function_p = &count_bitarray_AND4_AVX512;
     else if (__builtin_cpu_supports("avx2")) count_bitarray_AND4_function_p = &count_bitarray_AND4_AVX2;
-        #else
+#else
     if (__builtin_cpu_supports("avx2")) count_bitarray_AND4_function_p = &count_bitarray_AND4_AVX2;
-        #endif
+#endif
     else if (__builtin_cpu_supports("avx")) count_bitarray_AND4_function_p = &count_bitarray_AND4_AVX;
     else if (__builtin_cpu_supports("sse2")) count_bitarray_AND4_function_p = &count_bitarray_AND4_SSE2;
     else if (__builtin_cpu_supports("mmx")) count_bitarray_AND4_function_p = &count_bitarray_AND4_MMX;
     else
-    #endif
+#endif
 #endif
         count_bitarray_AND4_function_p = &count_bitarray_AND4_NOSIMD;
 
@@ -594,55 +607,68 @@ uint32_t count_bitarray_AND4_dispatch(uint32_t *A, uint32_t *B, uint32_t *C, uin
 ///////////////////////////////////////////////77
 // Entries to dispatched function calls
 
-uint32_t *malloc_bitarray(uint32_t x) {
+uint32_t *malloc_bitarray(uint32_t x)
+{
     return (*malloc_bitarray_function_p)(x);
 }
 
-void free_bitarray(uint32_t *x) {
+void free_bitarray(uint32_t *x)
+{
     (*free_bitarray_function_p)(x);
 }
 
-uint32_t bitcount(uint32_t a) {
+uint32_t bitcount(uint32_t a)
+{
     return (*bitcount_function_p)(a);
 }
 
-uint32_t count_states(uint32_t *bitarray) {
+uint32_t count_states(uint32_t *bitarray)
+{
     return (*count_states_function_p)(bitarray);
 }
 
-void bitarray_AND(uint32_t *A, uint32_t *B) {
+void bitarray_AND(uint32_t *A, uint32_t *B)
+{
     (*bitarray_AND_function_p)(A, B);
 }
 
-void bitarray_low20_AND(uint32_t *A, uint32_t *B) {
+void bitarray_low20_AND(uint32_t *A, uint32_t *B)
+{
     (*bitarray_low20_AND_function_p)(A, B);
 }
 
-uint32_t count_bitarray_AND(uint32_t *A, uint32_t *B) {
+uint32_t count_bitarray_AND(uint32_t *A, uint32_t *B)
+{
     return (*count_bitarray_AND_function_p)(A, B);
 }
 
-uint32_t count_bitarray_low20_AND(uint32_t *A, uint32_t *B) {
+uint32_t count_bitarray_low20_AND(uint32_t *A, uint32_t *B)
+{
     return (*count_bitarray_low20_AND_function_p)(A, B);
 }
 
-void bitarray_AND4(uint32_t *A, uint32_t *B, uint32_t *C, uint32_t *D) {
+void bitarray_AND4(uint32_t *A, uint32_t *B, uint32_t *C, uint32_t *D)
+{
     (*bitarray_AND4_function_p)(A, B, C, D);
 }
 
-void bitarray_OR(uint32_t *A, uint32_t *B) {
+void bitarray_OR(uint32_t *A, uint32_t *B)
+{
     (*bitarray_OR_function_p)(A, B);
 }
 
-uint32_t count_bitarray_AND2(uint32_t *A, uint32_t *B) {
+uint32_t count_bitarray_AND2(uint32_t *A, uint32_t *B)
+{
     return (*count_bitarray_AND2_function_p)(A, B);
 }
 
-uint32_t count_bitarray_AND3(uint32_t *A, uint32_t *B, uint32_t *C) {
+uint32_t count_bitarray_AND3(uint32_t *A, uint32_t *B, uint32_t *C)
+{
     return (*count_bitarray_AND3_function_p)(A, B, C);
 }
 
-uint32_t count_bitarray_AND4(uint32_t *A, uint32_t *B, uint32_t *C, uint32_t *D) {
+uint32_t count_bitarray_AND4(uint32_t *A, uint32_t *B, uint32_t *C, uint32_t *D)
+{
     return (*count_bitarray_AND4_function_p)(A, B, C, D);
 }
 
diff --git a/client/hardnested/hardnested_bruteforce.c b/client/hardnested/hardnested_bruteforce.c
index ce250152a..680f032a6 100644
--- a/client/hardnested/hardnested_bruteforce.c
+++ b/client/hardnested/hardnested_bruteforce.c
@@ -84,7 +84,7 @@ static uint32_t bf_test_nonce[256];
 static uint8_t bf_test_nonce_2nd_byte[256];
 static uint8_t bf_test_nonce_par[256];
 static uint32_t bucket_count = 0;
-static statelist_t* buckets[128];
+static statelist_t *buckets[128];
 static uint32_t keys_found = 0;
 static uint64_t num_keys_tested;
 static uint64_t found_bs_key = 0;
@@ -125,7 +125,7 @@ bool verify_key(uint32_t cuid, noncelist_t *nonces, uint8_t *best_first_bytes, u
             lfsr_rollback_byte(&pcs, (cuid >> 24) ^ best_first_bytes[0], true);
             for (int8_t byte_pos = 3; byte_pos >= 0; byte_pos--) {
                 uint8_t test_par_enc_bit = (test_nonce->par_enc >> byte_pos) & 0x01;     // the encoded parity bit
-                uint8_t test_byte_enc = (test_nonce->nonce_enc >> (8*byte_pos)) & 0xff;  // the encoded nonce byte
+                uint8_t test_byte_enc = (test_nonce->nonce_enc >> (8 * byte_pos)) & 0xff; // the encoded nonce byte
                 uint8_t test_byte_dec = crypto1_byte(&pcs, test_byte_enc /* ^ (cuid >> (8*byte_pos)) */, true) ^ test_byte_enc; // decode the nonce byte
                 uint8_t ks_par = filter(pcs.odd);                                        // the keystream bit to encode/decode the parity bit
                 uint8_t test_par_enc2 = ks_par ^ evenparity8(test_byte_dec);             // determine the decoded byte's parity and encode it
@@ -138,13 +138,14 @@ bool verify_key(uint32_t cuid, noncelist_t *nonces, uint8_t *best_first_bytes, u
     }
     return true;
 }
-static void*
+static void *
 #ifdef __has_attribute
-    #if __has_attribute(force_align_arg_pointer)
-    __attribute__((force_align_arg_pointer))
-    #endif
+#if __has_attribute(force_align_arg_pointer)
+__attribute__((force_align_arg_pointer))
 #endif
-crack_states_thread(void* x){
+#endif
+crack_states_thread(void *x)
+{
     struct arg {
         bool silent;
         int thread_ID;
@@ -152,36 +153,36 @@ crack_states_thread(void* x){
         uint32_t num_acquired_nonces;
         uint64_t maximum_states;
         noncelist_t *nonces;
-        uint8_t* best_first_bytes;
+        uint8_t *best_first_bytes;
     } *thread_arg;
 
     thread_arg = (struct arg *)x;
     const int thread_id = thread_arg->thread_ID;
     uint32_t current_bucket = thread_id;
-    while(current_bucket < bucket_count){
+    while (current_bucket < bucket_count) {
         statelist_t *bucket = buckets[current_bucket];
-        if(bucket){
+        if (bucket) {
 #if defined (DEBUG_BRUTE_FORCE)
             printf("Thread %u starts working on bucket %u\n", thread_id, current_bucket);
 #endif
             const uint64_t key = crack_states_bitsliced(thread_arg->cuid, thread_arg->best_first_bytes, bucket, &keys_found, &num_keys_tested, nonces_to_bruteforce, bf_test_nonce_2nd_byte, thread_arg->nonces);
-            if(key != -1){
+            if (key != -1) {
                 __atomic_fetch_add(&keys_found, 1, __ATOMIC_SEQ_CST);
                 __atomic_fetch_add(&found_bs_key, key, __ATOMIC_SEQ_CST);
 
                 char progress_text[80];
                 char keystr[18];
                 sprintf(keystr, "%012" PRIx64 "  ", key);
-                sprintf(progress_text, "Brute force phase completed. Key found: " _YELLOW_(%s), keystr);
+                sprintf(progress_text, "Brute force phase completed. Key found: " _YELLOW_( % s), keystr);
                 hardnested_print_progress(thread_arg->num_acquired_nonces, progress_text, 0.0, 0);
                 break;
-            } else if(keys_found){
+            } else if (keys_found) {
                 break;
             } else {
                 if (!thread_arg->silent) {
                     char progress_text[80];
-                    sprintf(progress_text, "Brute force phase: %6.02f%%\t", 100.0*(float)num_keys_tested/(float)(thread_arg->maximum_states));
-                    float remaining_bruteforce = thread_arg->nonces[thread_arg->best_first_bytes[0]].expected_num_brute_force - (float)num_keys_tested/2;
+                    sprintf(progress_text, "Brute force phase: %6.02f%%\t", 100.0 * (float)num_keys_tested / (float)(thread_arg->maximum_states));
+                    float remaining_bruteforce = thread_arg->nonces[thread_arg->best_first_bytes[0]].expected_num_brute_force - (float)num_keys_tested / 2;
                     hardnested_print_progress(thread_arg->num_acquired_nonces, progress_text, remaining_bruteforce, 5000);
                 }
             }
@@ -209,9 +210,9 @@ void prepare_bf_test_nonces(noncelist_t *nonces, uint8_t best_first_byte)
 
     // printf("Nonces to bruteforce: %d\n", nonces_to_bruteforce);
     // printf("Common bits of first 4 2nd nonce bytes (before sorting): %u %u %u\n",
-            // trailing_zeros(bf_test_nonce_2nd_byte[1] ^ bf_test_nonce_2nd_byte[0]),
-            // trailing_zeros(bf_test_nonce_2nd_byte[2] ^ bf_test_nonce_2nd_byte[1]),
-            // trailing_zeros(bf_test_nonce_2nd_byte[3] ^ bf_test_nonce_2nd_byte[2]));
+    // trailing_zeros(bf_test_nonce_2nd_byte[1] ^ bf_test_nonce_2nd_byte[0]),
+    // trailing_zeros(bf_test_nonce_2nd_byte[2] ^ bf_test_nonce_2nd_byte[1]),
+    // trailing_zeros(bf_test_nonce_2nd_byte[3] ^ bf_test_nonce_2nd_byte[2]));
 
     uint8_t best_4[4] = {0};
     int sum_best = -1;
@@ -221,13 +222,13 @@ void prepare_bf_test_nonces(noncelist_t *nonces, uint8_t best_first_byte)
                 for (uint16_t n3 = 0; n3 < nonces_to_bruteforce; n3++) {
                     if ((n3 != n2 && n3 != n1) || nonces_to_bruteforce < 3
                         // && trailing_zeros(bf_test_nonce_2nd_byte[n1] ^ bf_test_nonce_2nd_byte[n2])
-                            // > trailing_zeros(bf_test_nonce_2nd_byte[n2] ^ bf_test_nonce_2nd_byte[n3])
-                            ) {
+                        // > trailing_zeros(bf_test_nonce_2nd_byte[n2] ^ bf_test_nonce_2nd_byte[n3])
+                       ) {
                         for (uint16_t n4 = 0; n4 < nonces_to_bruteforce; n4++) {
                             if ((n4 != n3 && n4 != n2 && n4 != n1) || nonces_to_bruteforce < 4
                                 // && trailing_zeros(bf_test_nonce_2nd_byte[n2] ^ bf_test_nonce_2nd_byte[n3])
                                 // > trailing_zeros(bf_test_nonce_2nd_byte[n3] ^ bf_test_nonce_2nd_byte[n4])
-                                ) {
+                               ) {
                                 int sum = nonces_to_bruteforce > 1 ? trailing_zeros(bf_test_nonce_2nd_byte[n1] ^ bf_test_nonce_2nd_byte[n2]) : 0.0
                                           + nonces_to_bruteforce > 2 ? trailing_zeros(bf_test_nonce_2nd_byte[n2] ^ bf_test_nonce_2nd_byte[n3]) : 0.0
                                           + nonces_to_bruteforce > 3 ? trailing_zeros(bf_test_nonce_2nd_byte[n3] ^ bf_test_nonce_2nd_byte[n4]) : 0.0;
@@ -264,7 +265,8 @@ void prepare_bf_test_nonces(noncelist_t *nonces, uint8_t best_first_byte)
 
 
 #if defined (WRITE_BENCH_FILE)
-static void write_benchfile(statelist_t *candidates) {
+static void write_benchfile(statelist_t *candidates)
+{
 
     printf("Writing brute force benchmark data...");
     FILE *benchfile = fopen(TEST_BENCH_FILENAME, "wb");
@@ -314,7 +316,7 @@ bool brute_force_bs(float *bf_rate, statelist_t *candidates, uint32_t cuid, uint
     uint64_t start_time = msclock();
 
 #if defined(__linux__) ||  defined(__APPLE__)
-    if ( NUM_BRUTE_FORCE_THREADS < 0 )
+    if (NUM_BRUTE_FORCE_THREADS < 0)
         return false;
 #endif
 
@@ -329,7 +331,7 @@ bool brute_force_bs(float *bf_rate, statelist_t *candidates, uint32_t cuid, uint
         uint8_t *best_first_bytes;
     } thread_args[NUM_BRUTE_FORCE_THREADS];
 
-    for (uint32_t i = 0; i < NUM_BRUTE_FORCE_THREADS; i++){
+    for (uint32_t i = 0; i < NUM_BRUTE_FORCE_THREADS; i++) {
         thread_args[i].thread_ID = i;
         thread_args[i].silent = silent;
         thread_args[i].cuid = cuid;
@@ -337,9 +339,9 @@ bool brute_force_bs(float *bf_rate, statelist_t *candidates, uint32_t cuid, uint
         thread_args[i].maximum_states = maximum_states;
         thread_args[i].nonces = nonces;
         thread_args[i].best_first_bytes = best_first_bytes;
-        pthread_create(&threads[i], NULL, crack_states_thread, (void*)&thread_args[i]);
+        pthread_create(&threads[i], NULL, crack_states_thread, (void *)&thread_args[i]);
     }
-    for (uint32_t i = 0; i < NUM_BRUTE_FORCE_THREADS; i++){
+    for (uint32_t i = 0; i < NUM_BRUTE_FORCE_THREADS; i++) {
         pthread_join(threads[i], 0);
     }
 
@@ -348,14 +350,15 @@ bool brute_force_bs(float *bf_rate, statelist_t *candidates, uint32_t cuid, uint
     if (bf_rate != NULL)
         *bf_rate = (float)num_keys_tested / ((float)elapsed_time / 1000.0);
 
-    if ( keys_found > 0)
+    if (keys_found > 0)
         *foundkey = found_bs_key;
 
     return (keys_found != 0);
 }
 
 
-static bool read_bench_data(statelist_t *test_candidates) {
+static bool read_bench_data(statelist_t *test_candidates)
+{
 
     size_t bytes_read = 0;
     uint32_t temp = 0;
@@ -401,7 +404,7 @@ static bool read_bench_data(statelist_t *test_candidates) {
         }
     }
     for (uint32_t i = states_read; i < TEST_BENCH_SIZE; i++) {
-        test_candidates->states[EVEN_STATE][i] = test_candidates->states[EVEN_STATE][i-states_read];
+        test_candidates->states[EVEN_STATE][i] = test_candidates->states[EVEN_STATE][i - states_read];
     }
     for (uint32_t i = states_read; i < num_states; i++) {
         bytes_read = fread(&temp, 1, sizeof(uint32_t), benchfile);
@@ -418,7 +421,7 @@ static bool read_bench_data(statelist_t *test_candidates) {
         }
     }
     for (uint32_t i = states_read; i < TEST_BENCH_SIZE; i++) {
-        test_candidates->states[ODD_STATE][i] = test_candidates->states[ODD_STATE][i-states_read];
+        test_candidates->states[ODD_STATE][i] = test_candidates->states[ODD_STATE][i - states_read];
     }
 
     fclose(benchfile);
@@ -426,17 +429,18 @@ static bool read_bench_data(statelist_t *test_candidates) {
 }
 
 
-float brute_force_benchmark() {
+float brute_force_benchmark()
+{
     statelist_t test_candidates[NUM_BRUTE_FORCE_THREADS];
 
-    test_candidates[0].states[ODD_STATE] = malloc((TEST_BENCH_SIZE+1) * sizeof(uint32_t));
-    test_candidates[0].states[EVEN_STATE] = malloc((TEST_BENCH_SIZE+1) * sizeof(uint32_t));
-    for (uint8_t i = 0; i < NUM_BRUTE_FORCE_THREADS - 1; i++){
+    test_candidates[0].states[ODD_STATE] = malloc((TEST_BENCH_SIZE + 1) * sizeof(uint32_t));
+    test_candidates[0].states[EVEN_STATE] = malloc((TEST_BENCH_SIZE + 1) * sizeof(uint32_t));
+    for (uint8_t i = 0; i < NUM_BRUTE_FORCE_THREADS - 1; i++) {
         test_candidates[i].next = test_candidates + i + 1;
-        test_candidates[i+1].states[ODD_STATE] = test_candidates[0].states[ODD_STATE];
-        test_candidates[i+1].states[EVEN_STATE] = test_candidates[0].states[EVEN_STATE];
+        test_candidates[i + 1].states[ODD_STATE] = test_candidates[0].states[ODD_STATE];
+        test_candidates[i + 1].states[EVEN_STATE] = test_candidates[0].states[EVEN_STATE];
     }
-    test_candidates[NUM_BRUTE_FORCE_THREADS-1].next = NULL;
+    test_candidates[NUM_BRUTE_FORCE_THREADS - 1].next = NULL;
 
     if (!read_bench_data(test_candidates)) {
         PrintAndLogEx(NORMAL, "Couldn't read benchmark data. Assuming brute force rate of %1.0f states per second", DEFAULT_BRUTE_FORCE_RATE);
@@ -450,7 +454,7 @@ float brute_force_benchmark() {
         test_candidates[i].states[EVEN_STATE][TEST_BENCH_SIZE] = -1;
     }
 
-    uint64_t maximum_states = TEST_BENCH_SIZE*TEST_BENCH_SIZE*(uint64_t)NUM_BRUTE_FORCE_THREADS;
+    uint64_t maximum_states = TEST_BENCH_SIZE * TEST_BENCH_SIZE * (uint64_t)NUM_BRUTE_FORCE_THREADS;
 
     float bf_rate;
     uint64_t found_key = 0;
diff --git a/client/hardnested/hardnested_bruteforce.h b/client/hardnested/hardnested_bruteforce.h
index ad23c2a6f..c104e69ac 100644
--- a/client/hardnested/hardnested_bruteforce.h
+++ b/client/hardnested/hardnested_bruteforce.h
@@ -24,7 +24,7 @@
 typedef struct {
     uint32_t *states[2];
     uint32_t len[2];
-    void* next;
+    void *next;
 } statelist_t;
 
 extern void prepare_bf_test_nonces(noncelist_t *nonces, uint8_t best_first_byte);
diff --git a/client/hardnested/hardnested_tables.c b/client/hardnested/hardnested_tables.c
index 1706f8452..6fb7fc030 100644
--- a/client/hardnested/hardnested_tables.c
+++ b/client/hardnested/hardnested_tables.c
@@ -47,12 +47,12 @@ static uint16_t PartialSumProperty(uint32_t state, odd_even_t odd_even)
         if (odd_even == ODD_STATE) {
             for (uint16_t i = 0; i < 5; i++) {
                 part_sum ^= filter(st);
-                st = (st << 1) | ((j >> (3-i)) & 0x01) ;
+                st = (st << 1) | ((j >> (3 - i)) & 0x01) ;
             }
             part_sum ^= 1; // XOR 1 cancelled out for the other 8 bits
         } else {
             for (uint16_t i = 0; i < 4; i++) {
-                st = (st << 1) | ((j >> (3-i)) & 0x01) ;
+                st = (st << 1) | ((j >> (3 - i)) & 0x01) ;
                 part_sum ^= filter(st);
             }
         }
@@ -70,25 +70,25 @@ static uint16_t PartialSumProperty(uint32_t state, odd_even_t odd_even)
 
 static inline void clear_bitarray24(uint32_t *bitarray)
 {
-    memset(bitarray, 0x00, sizeof(uint32_t) * (1<<19));
+    memset(bitarray, 0x00, sizeof(uint32_t) * (1 << 19));
 }
 
 
 static inline uint32_t test_bit24(uint32_t *bitarray, uint32_t index)
 {
-    return bitarray[index>>5] & (0x80000000>>(index&0x0000001f));
+    return bitarray[index >> 5] & (0x80000000 >> (index & 0x0000001f));
 }
 
 
 static inline void set_bit24(uint32_t *bitarray, uint32_t index)
 {
-    bitarray[index>>5] |= 0x80000000>>(index&0x0000001f);
+    bitarray[index >> 5] |= 0x80000000 >> (index & 0x0000001f);
 }
 
 
 static inline uint32_t next_state(uint32_t *bitset, uint32_t state)
 {
-    if (++state == 1<<24) return 1<<24;
+    if (++state == 1 << 24) return 1 << 24;
     uint32_t index = state >> 5;
     uint_fast8_t bit = state & 0x1f;
     uint32_t line = bitset[index] << bit;
@@ -99,11 +99,11 @@ static inline uint32_t next_state(uint32_t *bitset, uint32_t state)
         line <<= 1;
     }
     index++;
-    while (bitset[index] == 0x00000000 && state < 1<<24) {
+    while (bitset[index] == 0x00000000 && state < 1 << 24) {
         index++;
         state += 0x20;
     }
-    if (state >= 1<<24) return 1<<24;
+    if (state >= 1 << 24) return 1 << 24;
 #if defined __GNUC__
     return state + __builtin_clz(bitset[index]);
 #else
@@ -115,14 +115,14 @@ static inline uint32_t next_state(uint32_t *bitset, uint32_t state)
         bit++;
         line <<= 1;
     }
-    return 1<<24;
+    return 1 << 24;
 #endif
 }
 
 
 static inline uint32_t next_not_state(uint32_t *bitset, uint32_t state)
 {
-    if (++state == 1<<24) return 1<<24;
+    if (++state == 1 << 24) return 1 << 24;
     uint32_t index = state >> 5;
     uint_fast8_t bit = state & 0x1f;
     uint32_t line = bitset[index] << bit;
@@ -133,11 +133,11 @@ static inline uint32_t next_not_state(uint32_t *bitset, uint32_t state)
         line <<= 1;
     }
     index++;
-    while (bitset[index] == 0xffffffff && state < 1<<24) {
+    while (bitset[index] == 0xffffffff && state < 1 << 24) {
         index++;
         state += 0x20;
     }
-    if (state >= 1<<24) return 1<<24;
+    if (state >= 1 << 24) return 1 << 24;
 #if defined __GNUC__
     return state + __builtin_clz(~bitset[index]);
 #else
@@ -149,7 +149,7 @@ static inline uint32_t next_not_state(uint32_t *bitset, uint32_t state)
         bit++;
         line <<= 1;
     }
-    return 1<<24;
+    return 1 << 24;
 #endif
 }
 
@@ -169,7 +169,7 @@ static inline uint32_t bitcount(uint32_t a)
 static inline uint32_t count_states(uint32_t *bitset)
 {
     uint32_t count = 0;
-    for (uint32_t i = 0; i < (1<<19); i++) {
+    for (uint32_t i = 0; i < (1 << 19); i++) {
         count += bitcount(bitset[i]);
     }
     return count;
@@ -182,7 +182,7 @@ static void write_bitflips_file(odd_even_t odd_even, uint16_t bitflip, int sum_a
     sprintf(filename, "bitflip_%d_%03" PRIx16 "_sum%d_states.bin", odd_even, bitflip, sum_a0);
     FILE *outfile = fopen(filename, "wb");
     fwrite(&count, 1, sizeof(count), outfile);
-    fwrite(bitset, 1, sizeof(uint32_t)*(1<<19), outfile);
+    fwrite(bitset, 1, sizeof(uint32_t) * (1 << 19), outfile);
     fclose(outfile);
 }
 
@@ -194,7 +194,7 @@ static void init_part_sum_bitarrays(void)
     printf("init_part_sum_bitarrays()...");
     for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
         for (uint16_t part_sum_a0 = 0; part_sum_a0 < NUM_PART_SUMS; part_sum_a0++) {
-            part_sum_a0_bitarrays[odd_even][part_sum_a0] = (uint32_t *)malloc_bitarray(sizeof(uint32_t) * (1<<19));
+            part_sum_a0_bitarrays[odd_even][part_sum_a0] = (uint32_t *)malloc_bitarray(sizeof(uint32_t) * (1 << 19));
             if (part_sum_a0_bitarrays[odd_even][part_sum_a0] == NULL) {
                 printf("Out of memory error in init_part_suma0_statelists(). Aborting...\n");
                 exit(4);
@@ -204,10 +204,10 @@ static void init_part_sum_bitarrays(void)
     }
     for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
         //printf("(%d, %" PRIu16 ")...", odd_even, part_sum_a0);
-        for (uint32_t state = 0; state < (1<<20); state++) {
+        for (uint32_t state = 0; state < (1 << 20); state++) {
             uint16_t part_sum_a0 = PartialSumProperty(state, odd_even) / 2;
-            for (uint16_t low_bits = 0; low_bits < 1<<4; low_bits++) {
-                set_bit24(part_sum_a0_bitarrays[odd_even][part_sum_a0], state<<4 | low_bits);
+            for (uint16_t low_bits = 0; low_bits < 1 << 4; low_bits++) {
+                set_bit24(part_sum_a0_bitarrays[odd_even][part_sum_a0], state << 4 | low_bits);
             }
         }
     }
@@ -218,10 +218,10 @@ static void init_part_sum_bitarrays(void)
 static void free_part_sum_bitarrays(void)
 {
     printf("free_part_sum_bitarrays()...");
-    for (int16_t part_sum_a0 = (NUM_PART_SUMS-1); part_sum_a0 >= 0; part_sum_a0--) {
+    for (int16_t part_sum_a0 = (NUM_PART_SUMS - 1); part_sum_a0 >= 0; part_sum_a0--) {
         free_bitarray(part_sum_a0_bitarrays[ODD_STATE][part_sum_a0]);
     }
-    for (int16_t part_sum_a0 = (NUM_PART_SUMS-1); part_sum_a0 >= 0; part_sum_a0--) {
+    for (int16_t part_sum_a0 = (NUM_PART_SUMS - 1); part_sum_a0 >= 0; part_sum_a0--) {
         free_bitarray(part_sum_a0_bitarrays[EVEN_STATE][part_sum_a0]);
     }
     printf("done.\n");
@@ -233,7 +233,7 @@ void init_sum_bitarray(uint16_t sum_a0)
 {
     printf("init_sum_bitarray()...\n");
     for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
-        sum_a0_bitarray[odd_even] = (uint32_t *)malloc_bitarray(sizeof(uint32_t) * (1<<19));
+        sum_a0_bitarray[odd_even] = (uint32_t *)malloc_bitarray(sizeof(uint32_t) * (1 << 19));
         if (sum_a0_bitarray[odd_even] == NULL) {
             printf("Out of memory error in init_sum_bitarrays(). Aborting...\n");
             exit(4);
@@ -242,8 +242,8 @@ void init_sum_bitarray(uint16_t sum_a0)
     }
     for (uint8_t p = 0; p < NUM_PART_SUMS; p++) {
         for (uint8_t q = 0; q < NUM_PART_SUMS; q++) {
-            if (sum_a0 == 2*p*(16-2*q) + (16-2*p)*2*q) {
-                for (uint32_t i = 0; i < (1<<19); i++) {
+            if (sum_a0 == 2 * p * (16 - 2 * q) + (16 - 2 * p) * 2 * q) {
+                for (uint32_t i = 0; i < (1 << 19); i++) {
                     sum_a0_bitarray[EVEN_STATE][i] |= part_sum_a0_bitarrays[EVEN_STATE][q][i];
                     sum_a0_bitarray[ODD_STATE][i] |= part_sum_a0_bitarrays[ODD_STATE][p][i];
                 }
@@ -252,7 +252,7 @@ void init_sum_bitarray(uint16_t sum_a0)
     }
     for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
         uint32_t count = count_states(sum_a0_bitarray[odd_even]);
-        printf("sum_a0_bitarray[%s] has %d states (%5.2f%%)\n", odd_even==EVEN_STATE?"even":"odd ", count, (float)count/(1<<24)*100.0);
+        printf("sum_a0_bitarray[%s] has %d states (%5.2f%%)\n", odd_even == EVEN_STATE ? "even" : "odd ", count, (float)count / (1 << 24) * 100.0);
     }
     printf("done.\n");
 }
@@ -270,11 +270,11 @@ static void free_sum_bitarray(void)
 static void precalculate_bit0_bitflip_bitarrays(uint8_t const bitflip, uint16_t const sum_a0)
 {
     // #define TEST_RUN
-    #ifdef TEST_RUN
-    #define NUM_TEST_STATES (1<<10)
-    #else
-    #define NUM_TEST_STATES (1<<23)
-    #endif
+#ifdef TEST_RUN
+#define NUM_TEST_STATES (1<<10)
+#else
+#define NUM_TEST_STATES (1<<23)
+#endif
 
     time_t start_time = time(NULL);
     time_t last_check_time = start_time;
@@ -282,14 +282,14 @@ static void precalculate_bit0_bitflip_bitarrays(uint8_t const bitflip, uint16_t
     uint32_t *restrict test_bitarray[2];
     uint32_t *restrict test_not_bitarray[2];
 
-    test_bitarray[EVEN_STATE] = malloc_bitarray(sizeof(uint32_t) * (1<<19));
+    test_bitarray[EVEN_STATE] = malloc_bitarray(sizeof(uint32_t) * (1 << 19));
     clear_bitarray24(test_bitarray[EVEN_STATE]);
-    test_bitarray[ODD_STATE] = malloc_bitarray(sizeof(uint32_t) * (1<<19));
+    test_bitarray[ODD_STATE] = malloc_bitarray(sizeof(uint32_t) * (1 << 19));
     clear_bitarray24(test_bitarray[ODD_STATE]);
 
-    test_not_bitarray[EVEN_STATE] = malloc_bitarray(sizeof(uint32_t) * (1<<19));
+    test_not_bitarray[EVEN_STATE] = malloc_bitarray(sizeof(uint32_t) * (1 << 19));
     clear_bitarray24(test_not_bitarray[EVEN_STATE]);
-    test_not_bitarray[ODD_STATE] = malloc_bitarray(sizeof(uint32_t) * (1<<19));
+    test_not_bitarray[ODD_STATE] = malloc_bitarray(sizeof(uint32_t) * (1 << 19));
     clear_bitarray24(test_not_bitarray[ODD_STATE]);
 
     uint32_t count[2];
@@ -299,13 +299,13 @@ static void precalculate_bit0_bitflip_bitarrays(uint8_t const bitflip, uint16_t
     for (uint32_t even_state = next_state(sum_a0_bitarray[EVEN_STATE], -1); even_state < NUM_TEST_STATES; even_state = next_state(sum_a0_bitarray[EVEN_STATE], even_state)) {
         bool even_state_is_possible = false;
         time_t time_now = time(NULL);
-        if (difftime(time_now, last_check_time) > 5*60) { // print status every 5 minutes
+        if (difftime(time_now, last_check_time) > 5 * 60) { // print status every 5 minutes
             float runtime = difftime(time_now, start_time);
-            float remaining_time = runtime * ((1<<23) - even_state) / even_state;
-            printf("\n%1.1f hours elapsed, expected completion in %1.1f hours (%1.1f days)", runtime/3600, remaining_time/3600, remaining_time/3600/24);
+            float remaining_time = runtime * ((1 << 23) - even_state) / even_state;
+            printf("\n%1.1f hours elapsed, expected completion in %1.1f hours (%1.1f days)", runtime / 3600, remaining_time / 3600, remaining_time / 3600 / 24);
             last_check_time = time_now;
         }
-        for (uint32_t odd_state = next_state(sum_a0_bitarray[ODD_STATE], -1); odd_state < (1<<24); odd_state = next_state(test_bitarray[ODD_STATE], odd_state)) {
+        for (uint32_t odd_state = next_state(sum_a0_bitarray[ODD_STATE], -1); odd_state < (1 << 24); odd_state = next_state(test_bitarray[ODD_STATE], odd_state)) {
             if (even_state_is_possible && test_bit24(test_bitarray[ODD_STATE], odd_state)) continue;
             // load crypto1 state
             struct Crypto1State cs;
@@ -363,47 +363,47 @@ static void precalculate_bit0_bitflip_bitarrays(uint8_t const bitflip, uint16_t
     printf("\nAnalysis completed. Checking for effective bitflip properties...\n");
     for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
         count[odd_even] = count_states(test_bitarray[odd_even]);
-        if (count[odd_even] != 1<<24) {
+        if (count[odd_even] != 1 << 24) {
             printf("Writing %d possible %s states for bitflip property %03x (%d (%1.2f%%) states eliminated)\n",
-                count[odd_even],
-                odd_even==EVEN_STATE?"even":"odd",
-                bitflip, (1<<24) - count[odd_even],
-                (float)((1<<24) - count[odd_even]) / (1<<24) * 100.0);
-            #ifndef TEST_RUN
+                   count[odd_even],
+                   odd_even == EVEN_STATE ? "even" : "odd",
+                   bitflip, (1 << 24) - count[odd_even],
+                   (float)((1 << 24) - count[odd_even]) / (1 << 24) * 100.0);
+#ifndef TEST_RUN
             write_bitflips_file(odd_even, bitflip, sum_a0, test_bitarray[odd_even], count[odd_even]);
-            #endif
+#endif
         } else {
-            printf("All %s states for bitflip property %03x are possible. No file written.\n", odd_even==EVEN_STATE?"even":"odd", bitflip);
+            printf("All %s states for bitflip property %03x are possible. No file written.\n", odd_even == EVEN_STATE ? "even" : "odd", bitflip);
         }
     }
-    uint32_t *restrict test_bitarray_2nd = malloc_bitarray(sizeof(uint32_t) * (1<<19));
+    uint32_t *restrict test_bitarray_2nd = malloc_bitarray(sizeof(uint32_t) * (1 << 19));
     clear_bitarray24(test_bitarray_2nd);
     for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
-        if (count[odd_even] != 1<<24) {
-            for (uint32_t state = 0; state < (1<<24); state += 1<<4) {
-                uint32_t line = test_bitarray[odd_even][state>>5];
-                uint16_t half_line = state&0x000000010 ? line&0x0000ffff : line>>16;
+        if (count[odd_even] != 1 << 24) {
+            for (uint32_t state = 0; state < (1 << 24); state += 1 << 4) {
+                uint32_t line = test_bitarray[odd_even][state >> 5];
+                uint16_t half_line = state & 0x000000010 ? line & 0x0000ffff : line >> 16;
                 if (half_line != 0) {
-                    for (uint32_t low_bits = 0; low_bits < (1<<4); low_bits++) {
+                    for (uint32_t low_bits = 0; low_bits < (1 << 4); low_bits++) {
                         set_bit24(test_bitarray_2nd, low_bits << 20 | state >> 4);
                     }
                 }
             }
             count[odd_even] = count_states(test_bitarray_2nd);
-            if (count[odd_even] != 1<<24) {
+            if (count[odd_even] != 1 << 24) {
                 printf("Writing %d possible %s states for bitflip property %03x (%d (%1.2f%%) states eliminated)\n",
-                    count[odd_even],
-                    odd_even==EVEN_STATE?"even":"odd",
-                    bitflip | BITFLIP_2ND_BYTE, (1<<24) - count[odd_even],
-                    (float)((1<<24) - count[odd_even]) / (1<<24) * 100.0);
-                #ifndef TEST_RUN
+                       count[odd_even],
+                       odd_even == EVEN_STATE ? "even" : "odd",
+                       bitflip | BITFLIP_2ND_BYTE, (1 << 24) - count[odd_even],
+                       (float)((1 << 24) - count[odd_even]) / (1 << 24) * 100.0);
+#ifndef TEST_RUN
                 write_bitflips_file(odd_even, bitflip | BITFLIP_2ND_BYTE, sum_a0, test_bitarray_2nd, count[odd_even]);
-                #endif
+#endif
             } else {
-                printf("All %s states for bitflip property %03x are possible. No file written.\n", odd_even==EVEN_STATE?"even":"odd", bitflip | BITFLIP_2ND_BYTE);
+                printf("All %s states for bitflip property %03x are possible. No file written.\n", odd_even == EVEN_STATE ? "even" : "odd", bitflip | BITFLIP_2ND_BYTE);
             }
         } else {
-            printf("All %s states for bitflip property %03x are possible. No file written.\n", odd_even==EVEN_STATE?"even":"odd", bitflip | BITFLIP_2ND_BYTE);
+            printf("All %s states for bitflip property %03x are possible. No file written.\n", odd_even == EVEN_STATE ? "even" : "odd", bitflip | BITFLIP_2ND_BYTE);
         }
     }
 
@@ -415,13 +415,13 @@ static void precalculate_bit0_bitflip_bitarrays(uint8_t const bitflip, uint16_t
     for (uint32_t even_state = next_state(sum_a0_bitarray[EVEN_STATE], -1); even_state < NUM_TEST_STATES; even_state = next_state(sum_a0_bitarray[EVEN_STATE], even_state)) {
         bool even_state_is_possible = test_bit24(test_not_bitarray[EVEN_STATE], even_state);
         time_t time_now = time(NULL);
-        if (difftime(time_now, last_check_time) > 5*60) { // print status every 5 minutes
+        if (difftime(time_now, last_check_time) > 5 * 60) { // print status every 5 minutes
             float runtime = difftime(time_now, start_time);
-            float remaining_time = runtime * ((1<<23) - even_state) / even_state;
-            printf("\n%1.1f hours elapsed, expected completion in %1.1f hours (%1.1f days)", runtime/3600, remaining_time/3600, remaining_time/3600/24);
+            float remaining_time = runtime * ((1 << 23) - even_state) / even_state;
+            printf("\n%1.1f hours elapsed, expected completion in %1.1f hours (%1.1f days)", runtime / 3600, remaining_time / 3600, remaining_time / 3600 / 24);
             last_check_time = time_now;
         }
-        for (uint32_t odd_state = next_state(sum_a0_bitarray[ODD_STATE], -1); odd_state < (1<<24); odd_state = next_state(sum_a0_bitarray[ODD_STATE], odd_state)) {
+        for (uint32_t odd_state = next_state(sum_a0_bitarray[ODD_STATE], -1); odd_state < (1 << 24); odd_state = next_state(sum_a0_bitarray[ODD_STATE], odd_state)) {
             if (even_state_is_possible) {
                 if (all_odd_states_are_possible_for_notbitflip) break;
                 if (test_bit24(test_not_bitarray[ODD_STATE], odd_state)) continue;
@@ -446,7 +446,7 @@ static void precalculate_bit0_bitflip_bitarrays(uint8_t const bitflip, uint16_t
             for (int i = 0; i < 9; i++) {
                 uint_fast8_t keystream_bit = filter(cs.odd & 0x000fffff) ^ filter((cs.odd & 0x000fffff) ^ cs_delta.odd);
                 keystream = keystream << 1 | keystream_bit;
-                uint_fast8_t nt_bit = BIT(bitflip|0x100, i) ^ keystream_bit;
+                uint_fast8_t nt_bit = BIT(bitflip | 0x100, i) ^ keystream_bit;
                 uint_fast8_t LSFR_feedback = BIT(cs_delta.odd, 2) ^ BIT(cs_delta.even, 2) ^ BIT(cs_delta.odd, 3);
 
                 cs_delta.even = cs_delta.even << 1 | (LSFR_feedback ^ nt_bit);
@@ -475,47 +475,47 @@ static void precalculate_bit0_bitflip_bitarrays(uint8_t const bitflip, uint16_t
     printf("\nAnalysis completed. Checking for effective !bitflip properties...\n");
     for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
         count[odd_even] = count_states(test_not_bitarray[odd_even]);
-        if (count[odd_even] != 1<<24) {
+        if (count[odd_even] != 1 << 24) {
             printf("Writing %d possible %s states for bitflip property %03x (%d (%1.2f%%) states eliminated)\n",
-                count[odd_even],
-                odd_even==EVEN_STATE?"even":"odd",
-                bitflip|0x100, (1<<24) - count[odd_even],
-                (float)((1<<24) - count[odd_even]) / (1<<24) * 100.0);
-            #ifndef TEST_RUN
-            write_bitflips_file(odd_even, bitflip|0x100, sum_a0, test_not_bitarray[odd_even], count[odd_even]);
-            #endif
+                   count[odd_even],
+                   odd_even == EVEN_STATE ? "even" : "odd",
+                   bitflip | 0x100, (1 << 24) - count[odd_even],
+                   (float)((1 << 24) - count[odd_even]) / (1 << 24) * 100.0);
+#ifndef TEST_RUN
+            write_bitflips_file(odd_even, bitflip | 0x100, sum_a0, test_not_bitarray[odd_even], count[odd_even]);
+#endif
         } else {
-            printf("All %s states for bitflip property %03x are possible. No file written.\n", odd_even==EVEN_STATE?"even":"odd", bitflip|0x100);
+            printf("All %s states for bitflip property %03x are possible. No file written.\n", odd_even == EVEN_STATE ? "even" : "odd", bitflip | 0x100);
         }
     }
 
     clear_bitarray24(test_bitarray_2nd);
     for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
-        if (count[odd_even] != 1<<24) {
-            for (uint32_t state = 0; state < (1<<24); state += 1<<4) {
-                uint32_t line = test_not_bitarray[odd_even][state>>5];
-                uint16_t half_line = state&0x000000010 ? line&0x0000ffff : line>>16;
+        if (count[odd_even] != 1 << 24) {
+            for (uint32_t state = 0; state < (1 << 24); state += 1 << 4) {
+                uint32_t line = test_not_bitarray[odd_even][state >> 5];
+                uint16_t half_line = state & 0x000000010 ? line & 0x0000ffff : line >> 16;
                 if (half_line != 0) {
-                    for (uint32_t low_bits = 0; low_bits < (1<<4); low_bits++) {
+                    for (uint32_t low_bits = 0; low_bits < (1 << 4); low_bits++) {
                         set_bit24(test_bitarray_2nd, low_bits << 20 | state >> 4);
                     }
                 }
             }
             count[odd_even] = count_states(test_bitarray_2nd);
-            if (count[odd_even] != 1<<24) {
+            if (count[odd_even] != 1 << 24) {
                 printf("Writing %d possible %s states for bitflip property %03x (%d (%1.2f%%) states eliminated)\n",
-                    count[odd_even],
-                    odd_even==EVEN_STATE?"even":"odd",
-                    bitflip | 0x100| BITFLIP_2ND_BYTE, (1<<24) - count[odd_even],
-                    (float)((1<<24) - count[odd_even]) / (1<<24) * 100.0);
-                #ifndef TEST_RUN
+                       count[odd_even],
+                       odd_even == EVEN_STATE ? "even" : "odd",
+                       bitflip | 0x100 | BITFLIP_2ND_BYTE, (1 << 24) - count[odd_even],
+                       (float)((1 << 24) - count[odd_even]) / (1 << 24) * 100.0);
+#ifndef TEST_RUN
                 write_bitflips_file(odd_even, bitflip | 0x100 | BITFLIP_2ND_BYTE, sum_a0, test_bitarray_2nd, count[odd_even]);
-                #endif
+#endif
             } else {
-                printf("All %s states for bitflip property %03x are possible. No file written.\n", odd_even==EVEN_STATE?"even":"odd", bitflip | 0x100 | BITFLIP_2ND_BYTE);
+                printf("All %s states for bitflip property %03x are possible. No file written.\n", odd_even == EVEN_STATE ? "even" : "odd", bitflip | 0x100 | BITFLIP_2ND_BYTE);
             }
         } else {
-            printf("All %s states for bitflip property %03x are possible. No file written.\n", odd_even==EVEN_STATE?"even":"odd", bitflip | 0x100 | BITFLIP_2ND_BYTE);
+            printf("All %s states for bitflip property %03x are possible. No file written.\n", odd_even == EVEN_STATE ? "even" : "odd", bitflip | 0x100 | BITFLIP_2ND_BYTE);
         }
     }
 
@@ -529,7 +529,8 @@ static void precalculate_bit0_bitflip_bitarrays(uint8_t const bitflip, uint16_t
 }
 
 
-int main (int argc, char *argv[]) {
+int main(int argc, char *argv[])
+{
 
     unsigned int bitflip_in;
     int sum_a0;
@@ -544,14 +545,14 @@ int main (int argc, char *argv[]) {
         return 1;
     }
 
-    sscanf(argv[1],"%x", &bitflip_in);
+    sscanf(argv[1], "%x", &bitflip_in);
 
     if (bitflip_in > 255) {
         printf("Bitflip property must be less than or equal to 0xff\n\n");
         return 1;
     }
 
-    if(argc == 3) {
+    if (argc == 3) {
         sscanf(argv[2], "%d", &sum_a0);
     }
 
@@ -574,8 +575,10 @@ int main (int argc, char *argv[]) {
         case  192:
         case  200:
         case  224:
-        case  256: break;
-        default: sum_a0 = -1;
+        case  256:
+            break;
+        default:
+            sum_a0 = -1;
     }
 
     printf("Calculating for bitflip = %02x, sum_a0 = %d\n", bitflip_in, sum_a0);
diff --git a/client/hid-flasher/flash.c b/client/hid-flasher/flash.c
index 2277dd8a1..bac79956a 100644
--- a/client/hid-flasher/flash.c
+++ b/client/hid-flasher/flash.c
@@ -72,14 +72,14 @@ static int build_segs_from_phdrs(flash_file_t *ctx, FILE *fd, Elf32_Phdr *phdrs,
                 offset);
         if (filesz != memsz) {
             fprintf(stderr, "Error: PHDR file size does not equal memory size\n"
-                            "(DATA+BSS PHDRs do not make sense on ROM platforms!)\n");
+                    "(DATA+BSS PHDRs do not make sense on ROM platforms!)\n");
             return -1;
         }
         if (paddr < last_end) {
             fprintf(stderr, "Error: PHDRs not sorted or overlap\n");
             return -1;
         }
-        if (paddr < FLASH_START || (paddr+filesz) > FLASH_END) {
+        if (paddr < FLASH_START || (paddr + filesz) > FLASH_END) {
             fprintf(stderr, "Error: PHDR is not contained in Flash\n");
             return -1;
         }
@@ -101,13 +101,13 @@ static int build_segs_from_phdrs(flash_file_t *ctx, FILE *fd, Elf32_Phdr *phdrs,
             return -1;
         }
 
-        uint32_t block_offset = paddr & (BLOCK_SIZE-1);
+        uint32_t block_offset = paddr & (BLOCK_SIZE - 1);
         if (block_offset) {
             if (ctx->num_segs) {
                 flash_seg_t *prev_seg = seg - 1;
                 uint32_t this_end = paddr + filesz;
-                uint32_t this_firstblock = paddr & ~(BLOCK_SIZE-1);
-                uint32_t prev_lastblock = (last_end - 1) & ~(BLOCK_SIZE-1);
+                uint32_t this_firstblock = paddr & ~(BLOCK_SIZE - 1);
+                uint32_t prev_lastblock = (last_end - 1) & ~(BLOCK_SIZE - 1);
 
                 if (this_firstblock == prev_lastblock) {
                     uint32_t new_length = this_end - prev_seg->start;
@@ -155,11 +155,12 @@ static int build_segs_from_phdrs(flash_file_t *ctx, FILE *fd, Elf32_Phdr *phdrs,
 }
 
 // Sanity check segments and check for bootloader writes
-static int check_segs(flash_file_t *ctx, int can_write_bl) {
+static int check_segs(flash_file_t *ctx, int can_write_bl)
+{
     for (int i = 0; i < ctx->num_segs; i++) {
         flash_seg_t *seg = &ctx->segments[i];
 
-        if (seg->start & (BLOCK_SIZE-1)) {
+        if (seg->start & (BLOCK_SIZE - 1)) {
             fprintf(stderr, "Error: Segment is not aligned\n");
             return -1;
         }
@@ -202,8 +203,7 @@ int flash_load(flash_file_t *ctx, const char *name, int can_write_bl)
         goto fail;
     }
     if (memcmp(ehdr.e_ident, elf_ident, sizeof(elf_ident))
-        || le32(ehdr.e_version) != 1)
-    {
+        || le32(ehdr.e_version) != 1) {
         fprintf(stderr, "Not an ELF file or wrong ELF type\n");
         goto fail;
     }
@@ -307,33 +307,33 @@ static int enter_bootloader(void)
     }
 
     if (state & DEVICE_INFO_FLAG_CURRENT_MODE_OS) {
-        fprintf(stderr,"Entering bootloader...\n");
+        fprintf(stderr, "Entering bootloader...\n");
         UsbCommand c;
-        memset(&c, 0, sizeof (c));
+        memset(&c, 0, sizeof(c));
 
         if ((state & DEVICE_INFO_FLAG_BOOTROM_PRESENT)
-            && (state & DEVICE_INFO_FLAG_OSIMAGE_PRESENT))
-        {
+            && (state & DEVICE_INFO_FLAG_OSIMAGE_PRESENT)) {
             // New style handover: Send CMD_START_FLASH, which will reset the board
             // and enter the bootrom on the next boot.
             c.cmd = CMD_START_FLASH;
             SendCommand(&c);
-            fprintf(stderr,"(Press and release the button only to abort)\n");
+            fprintf(stderr, "(Press and release the button only to abort)\n");
         } else {
             // Old style handover: Ask the user to press the button, then reset the board
             c.cmd = CMD_HARDWARE_RESET;
             SendCommand(&c);
-            fprintf(stderr,"Press and hold down button NOW if your bootloader requires it.\n");
+            fprintf(stderr, "Press and hold down button NOW if your bootloader requires it.\n");
         }
-        fprintf(stderr,"Waiting for Proxmark to reappear on USB...");
+        fprintf(stderr, "Waiting for Proxmark to reappear on USB...");
 
         CloseProxmark();
         msleep(1000);
         while (!OpenProxmark(0)) {
             msleep(1000);
-            fprintf(stderr, "."); fflush(stdout);
+            fprintf(stderr, ".");
+            fflush(stdout);
         }
-        fprintf(stderr," Found.\n");
+        fprintf(stderr, " Found.\n");
 
         return 0;
     }
@@ -406,7 +406,7 @@ static int write_block(uint32_t address, uint8_t *data, uint32_t length)
 
     c.cmd = CMD_FINISH_WRITE;
     c.arg[0] = address;
-    memcpy(c.d.asBytes, block_buf+240, 16);
+    memcpy(c.d.asBytes, block_buf + 240, 16);
     SendCommand(&c);
     return wait_for_ack();
 }
@@ -444,7 +444,8 @@ int flash_write(flash_file_t *ctx)
             baddr += block_size;
             length -= block_size;
             block++;
-            fprintf(stderr, "."); fflush(stdout);
+            fprintf(stderr, ".");
+            fflush(stdout);
         }
         fprintf(stderr, " OK\n");
     }
@@ -466,7 +467,8 @@ void flash_free(flash_file_t *ctx)
 }
 
 // just reset the unit
-int flash_stop_flashing(void) {
+int flash_stop_flashing(void)
+{
     UsbCommand c = {CMD_HARDWARE_RESET};
     SendCommand(&c);
     return 0;
diff --git a/client/hid-flasher/flasher.c b/client/hid-flasher/flasher.c
index 4375476d6..8314afe5b 100644
--- a/client/hid-flasher/flasher.c
+++ b/client/hid-flasher/flasher.c
@@ -60,7 +60,8 @@ int main(int argc, char **argv)
     fprintf(stderr, "Waiting for Proxmark to appear on USB...");
     while (!OpenProxmark(1)) {
         msleep(1000);
-        fprintf(stderr, "."); fflush(stdout);
+        fprintf(stderr, ".");
+        fflush(stdout);
     }
     fprintf(stderr, " Found.\n");
 
diff --git a/client/hid-flasher/proxendian.h b/client/hid-flasher/proxendian.h
index 751351c6c..e3d939086 100644
--- a/client/hid-flasher/proxendian.h
+++ b/client/hid-flasher/proxendian.h
@@ -34,12 +34,12 @@
 
 static inline uint16_t le16(uint16_t v)
 {
-    return (v>>8) | (v<<8);
+    return (v >> 8) | (v << 8);
 }
 
 static inline uint32_t le32(uint32_t v)
 {
-    return (le16(v)<<16) | (le16(v>>16));
+    return (le16(v) << 16) | (le16(v >> 16));
 }
 #endif // HOST_LITTLE_ENDIAN
 
diff --git a/client/hid-flasher/proxusb.c b/client/hid-flasher/proxusb.c
index 8a2fe01e0..906cc9783 100644
--- a/client/hid-flasher/proxusb.c
+++ b/client/hid-flasher/proxusb.c
@@ -22,80 +22,80 @@ unsigned char error_occured = 0;
 
 void SendCommand(UsbCommand *c)
 {
-  int ret;
+    int ret;
 
 #if 0
-  printf("Sending %d bytes\n", sizeof(UsbCommand));
+    printf("Sending %d bytes\n", sizeof(UsbCommand));
 #endif
 
-  ret = usb_bulk_write(devh, 0x01, (char*)c, sizeof(UsbCommand), 1000);
-  if (ret<0) {
-    error_occured = 1;
-    if (return_on_error)
-      return;
+    ret = usb_bulk_write(devh, 0x01, (char *)c, sizeof(UsbCommand), 1000);
+    if (ret < 0) {
+        error_occured = 1;
+        if (return_on_error)
+            return;
 
-    fprintf(stderr, "write failed: %s!\nTrying to reopen device...\n",
-      usb_strerror());
+        fprintf(stderr, "write failed: %s!\nTrying to reopen device...\n",
+                usb_strerror());
 
-    if (devh) {
-      usb_close(devh);
-      devh = NULL;
+        if (devh) {
+            usb_close(devh);
+            devh = NULL;
+        }
+        while (!OpenProxmark(0)) { msleep(1000); }
+        printf(PROXPROMPT);
+        fflush(NULL);
+
+        return;
     }
-    while(!OpenProxmark(0)) { msleep(1000); }
-    printf(PROXPROMPT);
-    fflush(NULL);
-
-    return;
-  }
 }
 
 bool ReceiveCommandPoll(UsbCommand *c)
 {
-  int ret;
+    int ret;
 
-  memset(c, 0, sizeof (UsbCommand));
-  ret = usb_bulk_read(devh, 0x82, (char*)c, sizeof(UsbCommand), 500);
-  if (ret<0) {
-    if (ret != -ETIMEDOUT) {
-      error_occured = 1;
-      if (return_on_error)
-        return false;
+    memset(c, 0, sizeof(UsbCommand));
+    ret = usb_bulk_read(devh, 0x82, (char *)c, sizeof(UsbCommand), 500);
+    if (ret < 0) {
+        if (ret != -ETIMEDOUT) {
+            error_occured = 1;
+            if (return_on_error)
+                return false;
 
-      fprintf(stderr, "read failed: %s(%d)!\nTrying to reopen device...\n",
-        usb_strerror(), ret);
+            fprintf(stderr, "read failed: %s(%d)!\nTrying to reopen device...\n",
+                    usb_strerror(), ret);
 
-      if (devh) {
-        usb_close(devh);
-        devh = NULL;
-      }
-      while(!OpenProxmark(0)) { msleep(1000); }
-      printf(PROXPROMPT);
-      fflush(NULL);
+            if (devh) {
+                usb_close(devh);
+                devh = NULL;
+            }
+            while (!OpenProxmark(0)) { msleep(1000); }
+            printf(PROXPROMPT);
+            fflush(NULL);
 
-      return false;
+            return false;
+        }
+    } else {
+        if (ret && (ret < sizeof(UsbCommand))) {
+            fprintf(stderr, "Read only %d instead of requested %d bytes!\n",
+                    ret, (int)sizeof(UsbCommand));
+        }
     }
-  } else {
-    if (ret && (ret < sizeof(UsbCommand))) {
-      fprintf(stderr, "Read only %d instead of requested %d bytes!\n",
-        ret, (int)sizeof(UsbCommand));
-    }
-  }
 
-  return ret > 0;
+    return ret > 0;
 }
 
 void ReceiveCommand(UsbCommand *c)
 {
 //  printf("%s()\n", __FUNCTION__);
-  int retval = 0;
-  do {
-    retval = ReceiveCommandPoll(c);
-    if (retval != 1) printf("ReceiveCommandPoll returned %d\n", retval);
-  } while(retval<0);
+    int retval = 0;
+    do {
+        retval = ReceiveCommandPoll(c);
+        if (retval != 1) printf("ReceiveCommandPoll returned %d\n", retval);
+    } while (retval < 0);
 //  printf("recv %x\n", c->cmd);
 }
 
-usb_dev_handle* findProxmark(int verbose, unsigned int *iface)
+usb_dev_handle *findProxmark(int verbose, unsigned int *iface)
 {
     struct usb_bus *busses, *bus;
     usb_dev_handle *handle = NULL;
@@ -138,21 +138,20 @@ usb_dev_handle* findProxmark(int verbose, unsigned int *iface)
         fprintf(stdout, "\nConnected units:\n");
 
         for (int i = 0; i < iUnit; i++) {
-            struct usb_device * dev = usb_device(units[i].handle);
-            fprintf(stdout, "\t%d. SN: %s [%s/%s]\n", i+1, units[i].serial_number, dev->bus->dirname, dev->filename);
+            struct usb_device *dev = usb_device(units[i].handle);
+            fprintf(stdout, "\t%d. SN: %s [%s/%s]\n", i + 1, units[i].serial_number, dev->bus->dirname, dev->filename);
         }
         if (iUnit > 1) {
             while (iSelection < 1 || iSelection > iUnit) {
                 fprintf(stdout, "Which unit do you want to connect to? ");
                 int res = fscanf(stdin, "%d", &iSelection);
-                if ( res != 1 ) {
+                if (res != 1) {
                     fprintf(stderr, "Input parse error");
                     fflush(stderr);
                     abort();
                 }
             }
-        }
-        else {
+        } else {
             iSelection = 1;
         }
 
@@ -169,46 +168,46 @@ usb_dev_handle* findProxmark(int verbose, unsigned int *iface)
     return NULL;
 }
 
-usb_dev_handle* OpenProxmark(int verbose)
+usb_dev_handle *OpenProxmark(int verbose)
 {
-  int ret;
-  usb_dev_handle *handle = NULL;
-  unsigned int iface;
+    int ret;
+    usb_dev_handle *handle = NULL;
+    unsigned int iface;
 
-  handle = findProxmark(verbose, &iface);
-  if (!handle)
-    return NULL;
+    handle = findProxmark(verbose, &iface);
+    if (!handle)
+        return NULL;
 
 #ifdef __linux__
-  /* detach kernel driver first */
-  ret = usb_detach_kernel_driver_np(handle, iface);
-  /* don't complain if no driver attached */
-  if (ret<0 && ret != -61 && verbose)
-    fprintf(stderr, "detach kernel driver failed: (%d) %s!\n", ret, usb_strerror());
+    /* detach kernel driver first */
+    ret = usb_detach_kernel_driver_np(handle, iface);
+    /* don't complain if no driver attached */
+    if (ret < 0 && ret != -61 && verbose)
+        fprintf(stderr, "detach kernel driver failed: (%d) %s!\n", ret, usb_strerror());
 #endif
 
-  // Needed for Windows. Optional for Mac OS and Linux
-  ret = usb_set_configuration(handle, 1);
-  if (ret < 0) {
-    if (verbose)
-      fprintf(stderr, "configuration set failed: %s!\n", usb_strerror());
-    return NULL;
-  }
+    // Needed for Windows. Optional for Mac OS and Linux
+    ret = usb_set_configuration(handle, 1);
+    if (ret < 0) {
+        if (verbose)
+            fprintf(stderr, "configuration set failed: %s!\n", usb_strerror());
+        return NULL;
+    }
 
-  ret = usb_claim_interface(handle, iface);
-  if (ret < 0) {
-    if (verbose)
-      fprintf(stderr, "claim failed: %s!\n", usb_strerror());
-    return NULL;
-  }
-  claimed_iface = iface;
-  devh = handle;
-  return handle;
+    ret = usb_claim_interface(handle, iface);
+    if (ret < 0) {
+        if (verbose)
+            fprintf(stderr, "claim failed: %s!\n", usb_strerror());
+        return NULL;
+    }
+    claimed_iface = iface;
+    devh = handle;
+    return handle;
 }
 
 void CloseProxmark(void)
 {
-  usb_release_interface(devh, claimed_iface);
-  usb_close(devh);
-  devh = NULL;
+    usb_release_interface(devh, claimed_iface);
+    usb_close(devh);
+    devh = NULL;
 }
diff --git a/client/hid-flasher/proxusb.h b/client/hid-flasher/proxusb.h
index 5d6f2b17e..69d47abd2 100644
--- a/client/hid-flasher/proxusb.h
+++ b/client/hid-flasher/proxusb.h
@@ -30,13 +30,13 @@ extern unsigned char error_occured;
 void SendCommand(UsbCommand *c);
 bool ReceiveCommandPoll(UsbCommand *c);
 void ReceiveCommand(UsbCommand *c);
-struct usb_dev_handle* FindProxmark(int verbose, unsigned int *iface);
-struct usb_dev_handle* OpenProxmark(int verbose);
+struct usb_dev_handle *FindProxmark(int verbose, unsigned int *iface);
+struct usb_dev_handle *OpenProxmark(int verbose);
 void CloseProxmark(void);
 
 struct prox_unit {
-  usb_dev_handle *handle;
-  char serial_number[256];
+    usb_dev_handle *handle;
+    char serial_number[256];
 };
 
 #endif
diff --git a/client/jansson/dump.c b/client/jansson/dump.c
index 89802c65d..c8957c2a8 100644
--- a/client/jansson/dump.c
+++ b/client/jansson/dump.c
@@ -44,7 +44,7 @@ static int dump_to_buffer(const char *buffer, size_t size, void *data)
 {
     struct buffer *buf = (struct buffer *)data;
 
-    if(buf->used + size <= buf->size)
+    if (buf->used + size <= buf->size)
         memcpy(&buf->data[buf->used], buffer, size);
 
     buf->used += size;
@@ -54,7 +54,7 @@ static int dump_to_buffer(const char *buffer, size_t size, void *data)
 static int dump_to_file(const char *buffer, size_t size, void *data)
 {
     FILE *dest = (FILE *)data;
-    if(fwrite(buffer, size, 1, dest) != 1)
+    if (fwrite(buffer, size, 1, dest) != 1)
         return -1;
     return 0;
 }
@@ -63,7 +63,7 @@ static int dump_to_fd(const char *buffer, size_t size, void *data)
 {
 #ifdef HAVE_UNISTD_H
     int *dest = (int *)data;
-    if(write(*dest, buffer, size) == (ssize_t)size)
+    if (write(*dest, buffer, size) == (ssize_t)size)
         return 0;
 #endif
     return -1;
@@ -74,25 +74,21 @@ static const char whitespace[] = "                                ";
 
 static int dump_indent(size_t flags, int depth, int space, json_dump_callback_t dump, void *data)
 {
-    if(FLAGS_TO_INDENT(flags) > 0)
-    {
+    if (FLAGS_TO_INDENT(flags) > 0) {
         unsigned int ws_count = FLAGS_TO_INDENT(flags), n_spaces = depth * ws_count;
 
-        if(dump("\n", 1, data))
+        if (dump("\n", 1, data))
             return -1;
 
-        while(n_spaces > 0)
-        {
+        while (n_spaces > 0) {
             int cur_n = n_spaces < sizeof whitespace - 1 ? n_spaces : sizeof whitespace - 1;
 
-            if(dump(whitespace, cur_n, data))
+            if (dump(whitespace, cur_n, data))
                 return -1;
 
             n_spaces -= cur_n;
         }
-    }
-    else if(space && !(flags & JSON_COMPACT))
-    {
+    } else if (space && !(flags & JSON_COMPACT)) {
         return dump(" ", 1, data);
     }
     return 0;
@@ -103,70 +99,80 @@ static int dump_string(const char *str, size_t len, json_dump_callback_t dump, v
     const char *pos, *end, *lim;
     int32_t codepoint = 0;
 
-    if(dump("\"", 1, data))
+    if (dump("\"", 1, data))
         return -1;
 
     end = pos = str;
     lim = str + len;
-    while(1)
-    {
+    while (1) {
         const char *text;
         char seq[13];
         int length;
 
-        while(end < lim)
-        {
+        while (end < lim) {
             end = utf8_iterate(pos, lim - pos, &codepoint);
-            if(!end)
+            if (!end)
                 return -1;
 
             /* mandatory escape or control char */
-            if(codepoint == '\\' || codepoint == '"' || codepoint < 0x20)
+            if (codepoint == '\\' || codepoint == '"' || codepoint < 0x20)
                 break;
 
             /* slash */
-            if((flags & JSON_ESCAPE_SLASH) && codepoint == '/')
+            if ((flags & JSON_ESCAPE_SLASH) && codepoint == '/')
                 break;
 
             /* non-ASCII */
-            if((flags & JSON_ENSURE_ASCII) && codepoint > 0x7F)
+            if ((flags & JSON_ENSURE_ASCII) && codepoint > 0x7F)
                 break;
 
             pos = end;
         }
 
-        if(pos != str) {
-            if(dump(str, pos - str, data))
+        if (pos != str) {
+            if (dump(str, pos - str, data))
                 return -1;
         }
 
-        if(end == pos)
+        if (end == pos)
             break;
 
         /* handle \, /, ", and control codes */
         length = 2;
-        switch(codepoint)
-        {
-            case '\\': text = "\\\\"; break;
-            case '\"': text = "\\\""; break;
-            case '\b': text = "\\b"; break;
-            case '\f': text = "\\f"; break;
-            case '\n': text = "\\n"; break;
-            case '\r': text = "\\r"; break;
-            case '\t': text = "\\t"; break;
-            case '/':  text = "\\/"; break;
-            default:
-            {
+        switch (codepoint) {
+            case '\\':
+                text = "\\\\";
+                break;
+            case '\"':
+                text = "\\\"";
+                break;
+            case '\b':
+                text = "\\b";
+                break;
+            case '\f':
+                text = "\\f";
+                break;
+            case '\n':
+                text = "\\n";
+                break;
+            case '\r':
+                text = "\\r";
+                break;
+            case '\t':
+                text = "\\t";
+                break;
+            case '/':
+                text = "\\/";
+                break;
+            default: {
                 /* codepoint is in BMP */
-                if(codepoint < 0x10000)
-                {
+                if (codepoint < 0x10000) {
                     snprintf(seq, sizeof(seq), "\\u%04X", (unsigned int)codepoint);
                     length = 6;
                 }
 
                 /* not in BMP -> construct a UTF-16 surrogate pair */
-                else
-                {
+                else {
                     int32_t first, last;
 
                     codepoint -= 0x10000;
@@ -182,7 +188,7 @@ static int dump_string(const char *str, size_t len, json_dump_callback_t dump, v
             }
         }
 
-        if(dump(text, length, data))
+        if (dump(text, length, data))
             return -1;
 
         str = pos = end;
@@ -212,10 +218,10 @@ static int do_dump(const json_t *json, size_t flags, int depth,
 
     flags &= ~JSON_EMBED;
 
-    if(!json)
+    if (!json)
         return -1;
 
-    switch(json_typeof(json)) {
+    switch (json_typeof(json)) {
         case JSON_NULL:
             return dump("null", 4, data);
 
@@ -225,29 +231,27 @@ static int do_dump(const json_t *json, size_t flags, int depth,
         case JSON_FALSE:
             return dump("false", 5, data);
 
-        case JSON_INTEGER:
-        {
+        case JSON_INTEGER: {
             char buffer[MAX_INTEGER_STR_LENGTH];
             int size;
 
             size = snprintf(buffer, MAX_INTEGER_STR_LENGTH,
                             "%" JSON_INTEGER_FORMAT,
                             json_integer_value(json));
-            if(size < 0 || size >= MAX_INTEGER_STR_LENGTH)
+            if (size < 0 || size >= MAX_INTEGER_STR_LENGTH)
                 return -1;
 
             return dump(buffer, size, data);
         }
 
-        case JSON_REAL:
-        {
+        case JSON_REAL: {
             char buffer[MAX_REAL_STR_LENGTH];
             int size;
             double value = json_real_value(json);
 
             size = jsonp_dtostr(buffer, MAX_REAL_STR_LENGTH, value,
                                 FLAGS_TO_PRECISION(flags));
-            if(size < 0)
+            if (size < 0)
                 return -1;
 
             return dump(buffer, size, data);
@@ -256,8 +260,7 @@ static int do_dump(const json_t *json, size_t flags, int depth,
         case JSON_STRING:
             return dump_string(json_string_value(json), json_string_length(json), dump, data, flags);
 
-        case JSON_ARRAY:
-        {
+        case JSON_ARRAY: {
             size_t n;
             size_t i;
             /* Space for "0x", double the sizeof a pointer for the hex and a terminator. */
@@ -269,29 +272,26 @@ static int do_dump(const json_t *json, size_t flags, int depth,
 
             n = json_array_size(json);
 
-            if(!embed && dump("[", 1, data))
+            if (!embed && dump("[", 1, data))
                 return -1;
-            if(n == 0) {
+            if (n == 0) {
                 hashtable_del(parents, key);
                 return embed ? 0 : dump("]", 1, data);
             }
-            if(dump_indent(flags, depth + 1, 0, dump, data))
+            if (dump_indent(flags, depth + 1, 0, dump, data))
                 return -1;
 
-            for(i = 0; i < n; ++i) {
-                if(do_dump(json_array_get(json, i), flags, depth + 1,
-                           parents, dump, data))
+            for (i = 0; i < n; ++i) {
+                if (do_dump(json_array_get(json, i), flags, depth + 1,
+                            parents, dump, data))
                     return -1;
 
-                if(i < n - 1)
-                {
-                    if(dump(",", 1, data) ||
-                       dump_indent(flags, depth + 1, 1, dump, data))
+                if (i < n - 1) {
+                    if (dump(",", 1, data) ||
+                        dump_indent(flags, depth + 1, 1, dump, data))
                         return -1;
-                }
-                else
-                {
-                    if(dump_indent(flags, depth, 0, dump, data))
+                } else {
+                    if (dump_indent(flags, depth, 0, dump, data))
                         return -1;
                 }
             }
@@ -300,19 +300,17 @@ static int do_dump(const json_t *json, size_t flags, int depth,
             return embed ? 0 : dump("]", 1, data);
         }
 
-        case JSON_OBJECT:
-        {
+        case JSON_OBJECT: {
             void *iter;
             const char *separator;
             int separator_length;
             /* Space for "0x", double the sizeof a pointer for the hex and a terminator. */
             char loop_key[2 + (sizeof(json) * 2) + 1];
 
-            if(flags & JSON_COMPACT) {
+            if (flags & JSON_COMPACT) {
                 separator = ":";
                 separator_length = 1;
-            }
-            else {
+            } else {
                 separator = ": ";
                 separator_length = 2;
             }
@@ -323,28 +321,26 @@ static int do_dump(const json_t *json, size_t flags, int depth,
 
             iter = json_object_iter((json_t *)json);
 
-            if(!embed && dump("{", 1, data))
+            if (!embed && dump("{", 1, data))
                 return -1;
-            if(!iter) {
+            if (!iter) {
                 hashtable_del(parents, loop_key);
                 return embed ? 0 : dump("}", 1, data);
             }
-            if(dump_indent(flags, depth + 1, 0, dump, data))
+            if (dump_indent(flags, depth + 1, 0, dump, data))
                 return -1;
 
-            if(flags & JSON_SORT_KEYS)
-            {
+            if (flags & JSON_SORT_KEYS) {
                 const char **keys;
                 size_t size, i;
 
                 size = json_object_size(json);
                 keys = jsonp_malloc(size * sizeof(const char *));
-                if(!keys)
+                if (!keys)
                     return -1;
 
                 i = 0;
-                while(iter)
-                {
+                while (iter) {
                     keys[i] = json_object_iter_key(iter);
                     iter = json_object_iter_next((json_t *)json, iter);
                     i++;
@@ -353,8 +349,7 @@ static int do_dump(const json_t *json, size_t flags, int depth,
 
                 qsort(keys, size, sizeof(const char *), compare_keys);
 
-                for(i = 0; i < size; i++)
-                {
+                for (i = 0; i < size; i++) {
                     const char *key;
                     json_t *value;
 
@@ -363,26 +358,20 @@ static int do_dump(const json_t *json, size_t flags, int depth,
                     assert(value);
 
                     dump_string(key, strlen(key), dump, data, flags);
-                    if(dump(separator, separator_length, data) ||
-                       do_dump(value, flags, depth + 1, parents, dump, data))
-                    {
+                    if (dump(separator, separator_length, data) ||
+                        do_dump(value, flags, depth + 1, parents, dump, data)) {
                         jsonp_free(keys);
                         return -1;
                     }
 
-                    if(i < size - 1)
-                    {
-                        if(dump(",", 1, data) ||
-                           dump_indent(flags, depth + 1, 1, dump, data))
-                        {
+                    if (i < size - 1) {
+                        if (dump(",", 1, data) ||
+                            dump_indent(flags, depth + 1, 1, dump, data)) {
                             jsonp_free(keys);
                             return -1;
                         }
-                    }
-                    else
-                    {
-                        if(dump_indent(flags, depth, 0, dump, data))
-                        {
+                    } else {
+                        if (dump_indent(flags, depth, 0, dump, data)) {
                             jsonp_free(keys);
                             return -1;
                         }
@@ -390,31 +379,25 @@ static int do_dump(const json_t *json, size_t flags, int depth,
                 }
 
                 jsonp_free(keys);
-            }
-            else
-            {
+            } else {
                 /* Don't sort keys */
 
-                while(iter)
-                {
+                while (iter) {
                     void *next = json_object_iter_next((json_t *)json, iter);
                     const char *key = json_object_iter_key(iter);
 
                     dump_string(key, strlen(key), dump, data, flags);
-                    if(dump(separator, separator_length, data) ||
-                       do_dump(json_object_iter_value(iter), flags, depth + 1,
-                               parents, dump, data))
+                    if (dump(separator, separator_length, data) ||
+                        do_dump(json_object_iter_value(iter), flags, depth + 1,
+                                parents, dump, data))
                         return -1;
 
-                    if(next)
-                    {
-                        if(dump(",", 1, data) ||
-                           dump_indent(flags, depth + 1, 1, dump, data))
+                    if (next) {
+                        if (dump(",", 1, data) ||
+                            dump_indent(flags, depth + 1, 1, dump, data))
                             return -1;
-                    }
-                    else
-                    {
-                        if(dump_indent(flags, depth, 0, dump, data))
+                    } else {
+                        if (dump_indent(flags, depth, 0, dump, data))
                             return -1;
                     }
 
@@ -437,10 +420,10 @@ char *json_dumps(const json_t *json, size_t flags)
     strbuffer_t strbuff;
     char *result;
 
-    if(strbuffer_init(&strbuff))
+    if (strbuffer_init(&strbuff))
         return NULL;
 
-    if(json_dump_callback(json, dump_to_strbuffer, (void *)&strbuff, flags))
+    if (json_dump_callback(json, dump_to_strbuffer, (void *)&strbuff, flags))
         result = NULL;
     else
         result = jsonp_strdup(strbuffer_value(&strbuff));
@@ -453,7 +436,7 @@ size_t json_dumpb(const json_t *json, char *buffer, size_t size, size_t flags)
 {
     struct buffer buf = { size, 0, buffer };
 
-    if(json_dump_callback(json, dump_to_buffer, (void *)&buf, flags))
+    if (json_dump_callback(json, dump_to_buffer, (void *)&buf, flags))
         return 0;
 
     return buf.used;
@@ -474,12 +457,12 @@ int json_dump_file(const json_t *json, const char *path, size_t flags)
     int result;
 
     FILE *output = fopen(path, "w");
-    if(!output)
+    if (!output)
         return -1;
 
     result = json_dumpf(json, output, flags);
 
-    if(fclose(output) != 0)
+    if (fclose(output) != 0)
         return -1;
 
     return result;
@@ -490,9 +473,9 @@ int json_dump_callback(const json_t *json, json_dump_callback_t callback, void *
     int res;
     hashtable_t parents_set;
 
-    if(!(flags & JSON_ENCODE_ANY)) {
-        if(!json_is_array(json) && !json_is_object(json))
-           return -1;
+    if (!(flags & JSON_ENCODE_ANY)) {
+        if (!json_is_array(json) && !json_is_object(json))
+            return -1;
     }
 
     if (hashtable_init(&parents_set))
diff --git a/client/jansson/error.c b/client/jansson/error.c
index 0d6124e6e..8532e04ff 100644
--- a/client/jansson/error.c
+++ b/client/jansson/error.c
@@ -8,7 +8,7 @@ void jsonp_error_init(json_error_t *error, const char *source)
         error->line = -1;
         error->column = -1;
         error->position = 0;
-        if(source)
+        if (source)
             jsonp_error_set_source(error, source);
         else
             error->source[0] = '\0';
diff --git a/client/jansson/hashtable.c b/client/jansson/hashtable.c
index c819319a7..472eda1ea 100644
--- a/client/jansson/hashtable.c
+++ b/client/jansson/hashtable.c
@@ -65,13 +65,10 @@ static JSON_INLINE int bucket_is_empty(hashtable_t *hashtable, bucket_t *bucket)
 static void insert_to_bucket(hashtable_t *hashtable, bucket_t *bucket,
                              list_t *list)
 {
-    if(bucket_is_empty(hashtable, bucket))
-    {
+    if (bucket_is_empty(hashtable, bucket)) {
         list_insert(&hashtable->list, list);
         bucket->first = bucket->last = list;
-    }
-    else
-    {
+    } else {
         list_insert(bucket->first, list);
         bucket->first = list;
     }
@@ -83,17 +80,16 @@ static pair_t *hashtable_find_pair(hashtable_t *hashtable, bucket_t *bucket,
     list_t *list;
     pair_t *pair;
 
-    if(bucket_is_empty(hashtable, bucket))
+    if (bucket_is_empty(hashtable, bucket))
         return NULL;
 
     list = bucket->first;
-    while(1)
-    {
+    while (1) {
         pair = list_to_pair(list);
-        if(pair->hash == hash && strcmp(pair->key, key) == 0)
+        if (pair->hash == hash && strcmp(pair->key, key) == 0)
             return pair;
 
-        if(list == bucket->last)
+        if (list == bucket->last)
             break;
 
         list = list->next;
@@ -114,16 +110,16 @@ static int hashtable_do_del(hashtable_t *hashtable,
     bucket = &hashtable->buckets[index];
 
     pair = hashtable_find_pair(hashtable, bucket, key, hash);
-    if(!pair)
+    if (!pair)
         return -1;
 
-    if(&pair->list == bucket->first && &pair->list == bucket->last)
+    if (&pair->list == bucket->first && &pair->list == bucket->last)
         bucket->first = bucket->last = &hashtable->list;
 
-    else if(&pair->list == bucket->first)
+    else if (&pair->list == bucket->first)
         bucket->first = pair->list.next;
 
-    else if(&pair->list == bucket->last)
+    else if (&pair->list == bucket->last)
         bucket->last = pair->list.prev;
 
     list_remove(&pair->list);
@@ -141,8 +137,7 @@ static void hashtable_do_clear(hashtable_t *hashtable)
     list_t *list, *next;
     pair_t *pair;
 
-    for(list = hashtable->list.next; list != &hashtable->list; list = next)
-    {
+    for (list = hashtable->list.next; list != &hashtable->list; list = next) {
         next = list->next;
         pair = list_to_pair(list);
         json_decref(pair->value);
@@ -161,23 +156,22 @@ static int hashtable_do_rehash(hashtable_t *hashtable)
     new_size = hashsize(new_order);
 
     new_buckets = jsonp_malloc(new_size * sizeof(bucket_t));
-    if(!new_buckets)
+    if (!new_buckets)
         return -1;
 
     jsonp_free(hashtable->buckets);
     hashtable->buckets = new_buckets;
     hashtable->order = new_order;
 
-    for(i = 0; i < hashsize(hashtable->order); i++)
-    {
+    for (i = 0; i < hashsize(hashtable->order); i++) {
         hashtable->buckets[i].first = hashtable->buckets[i].last =
-            &hashtable->list;
+                                          &hashtable->list;
     }
 
     list = hashtable->list.next;
     list_init(&hashtable->list);
 
-    for(; list != &hashtable->list; list = next) {
+    for (; list != &hashtable->list; list = next) {
         next = list->next;
         pair = list_to_pair(list);
         index = pair->hash % new_size;
@@ -195,16 +189,15 @@ int hashtable_init(hashtable_t *hashtable)
     hashtable->size = 0;
     hashtable->order = INITIAL_HASHTABLE_ORDER;
     hashtable->buckets = jsonp_malloc(hashsize(hashtable->order) * sizeof(bucket_t));
-    if(!hashtable->buckets)
+    if (!hashtable->buckets)
         return -1;
 
     list_init(&hashtable->list);
     list_init(&hashtable->ordered_list);
 
-    for(i = 0; i < hashsize(hashtable->order); i++)
-    {
+    for (i = 0; i < hashsize(hashtable->order); i++) {
         hashtable->buckets[i].first = hashtable->buckets[i].last =
-            &hashtable->list;
+                                          &hashtable->list;
     }
 
     return 0;
@@ -223,8 +216,8 @@ int hashtable_set(hashtable_t *hashtable, const char *key, json_t *value)
     size_t hash, index;
 
     /* rehash if the load ratio exceeds 1 */
-    if(hashtable->size >= hashsize(hashtable->order))
-        if(hashtable_do_rehash(hashtable))
+    if (hashtable->size >= hashsize(hashtable->order))
+        if (hashtable_do_rehash(hashtable))
             return -1;
 
     hash = hash_str(key);
@@ -232,25 +225,22 @@ int hashtable_set(hashtable_t *hashtable, const char *key, json_t *value)
     bucket = &hashtable->buckets[index];
     pair = hashtable_find_pair(hashtable, bucket, key, hash);
 
-    if(pair)
-    {
+    if (pair) {
         json_decref(pair->value);
         pair->value = value;
-    }
-    else
-    {
+    } else {
         /* offsetof(...) returns the size of pair_t without the last,
            flexible member. This way, the correct amount is
            allocated. */
 
         size_t len = strlen(key);
-        if(len >= (size_t)-1 - offsetof(pair_t, key)) {
+        if (len >= (size_t) -1 - offsetof(pair_t, key)) {
             /* Avoid an overflow if the key is very long */
             return -1;
         }
 
         pair = jsonp_malloc(offsetof(pair_t, key) + len + 1);
-        if(!pair)
+        if (!pair)
             return -1;
 
         pair->hash = hash;
@@ -277,7 +267,7 @@ void *hashtable_get(hashtable_t *hashtable, const char *key)
     bucket = &hashtable->buckets[hash & hashmask(hashtable->order)];
 
     pair = hashtable_find_pair(hashtable, bucket, key, hash);
-    if(!pair)
+    if (!pair)
         return NULL;
 
     return pair->value;
@@ -295,10 +285,9 @@ void hashtable_clear(hashtable_t *hashtable)
 
     hashtable_do_clear(hashtable);
 
-    for(i = 0; i < hashsize(hashtable->order); i++)
-    {
+    for (i = 0; i < hashsize(hashtable->order); i++) {
         hashtable->buckets[i].first = hashtable->buckets[i].last =
-            &hashtable->list;
+                                          &hashtable->list;
     }
 
     list_init(&hashtable->list);
@@ -321,7 +310,7 @@ void *hashtable_iter_at(hashtable_t *hashtable, const char *key)
     bucket = &hashtable->buckets[hash & hashmask(hashtable->order)];
 
     pair = hashtable_find_pair(hashtable, bucket, key, hash);
-    if(!pair)
+    if (!pair)
         return NULL;
 
     return &pair->ordered_list;
@@ -330,7 +319,7 @@ void *hashtable_iter_at(hashtable_t *hashtable, const char *key)
 void *hashtable_iter_next(hashtable_t *hashtable, void *iter)
 {
     list_t *list = (list_t *)iter;
-    if(list->next == &hashtable->ordered_list)
+    if (list->next == &hashtable->ordered_list)
         return NULL;
     return list->next;
 }
diff --git a/client/jansson/hashtable_seed.c b/client/jansson/hashtable_seed.c
index 540358ada..2567f7250 100644
--- a/client/jansson/hashtable_seed.c
+++ b/client/jansson/hashtable_seed.c
@@ -45,7 +45,8 @@
 #include "jansson.h"
 
 
-static uint32_t buf_to_uint32(char *data) {
+static uint32_t buf_to_uint32(char *data)
+{
     size_t i;
     uint32_t result = 0;
 
@@ -59,7 +60,8 @@ static uint32_t buf_to_uint32(char *data) {
 
 /* /dev/urandom */
 #if !defined(_WIN32) && defined(USE_URANDOM)
-static int seed_from_urandom(uint32_t *seed) {
+static int seed_from_urandom(uint32_t *seed)
+{
     /* Use unbuffered I/O if we have open(), close() and read(). Otherwise
        fall back to fopen() */
 
@@ -112,7 +114,7 @@ static int seed_from_windows_cryptoapi(uint32_t *seed)
     int ok;
 
     hAdvAPI32 = GetModuleHandle(TEXT("advapi32.dll"));
-    if(hAdvAPI32 == NULL)
+    if (hAdvAPI32 == NULL)
         return 1;
 
     pCryptAcquireContext = (CRYPTACQUIRECONTEXTA)GetProcAddress(hAdvAPI32, "CryptAcquireContextA");
@@ -142,7 +144,8 @@ static int seed_from_windows_cryptoapi(uint32_t *seed)
 #endif
 
 /* gettimeofday() and getpid() */
-static int seed_from_timestamp_and_pid(uint32_t *seed) {
+static int seed_from_timestamp_and_pid(uint32_t *seed)
+{
 #ifdef HAVE_GETTIMEOFDAY
     /* XOR of seconds and microseconds */
     struct timeval tv;
@@ -163,7 +166,8 @@ static int seed_from_timestamp_and_pid(uint32_t *seed) {
     return 0;
 }
 
-static uint32_t generate_seed() {
+static uint32_t generate_seed()
+{
     uint32_t seed = 0;
     int done = 0;
 
@@ -196,7 +200,8 @@ volatile uint32_t hashtable_seed = 0;
 #if defined(HAVE_ATOMIC_BUILTINS) && (defined(HAVE_SCHED_YIELD) || !defined(_WIN32))
 static volatile char seed_initialized = 0;
 
-void json_object_seed(size_t seed) {
+void json_object_seed(size_t seed)
+{
     uint32_t new_seed = (uint32_t)seed;
 
     if (hashtable_seed == 0) {
@@ -212,12 +217,13 @@ void json_object_seed(size_t seed) {
 #ifdef HAVE_SCHED_YIELD
                 sched_yield();
 #endif
-            } while(__atomic_load_n(&hashtable_seed, __ATOMIC_ACQUIRE) == 0);
+            } while (__atomic_load_n(&hashtable_seed, __ATOMIC_ACQUIRE) == 0);
         }
     }
 }
 #elif defined(HAVE_SYNC_BUILTINS) && (defined(HAVE_SCHED_YIELD) || !defined(_WIN32))
-void json_object_seed(size_t seed) {
+void json_object_seed(size_t seed)
+{
     uint32_t new_seed = (uint32_t)seed;
 
     if (hashtable_seed == 0) {
@@ -239,12 +245,13 @@ void json_object_seed(size_t seed) {
                 sched_yield();
 #endif
             }
-        } while(hashtable_seed == 0);
+        } while (hashtable_seed == 0);
     }
 }
 #elif defined(_WIN32)
 static long seed_initialized = 0;
-void json_object_seed(size_t seed) {
+void json_object_seed(size_t seed)
+{
     uint32_t new_seed = (uint32_t)seed;
 
     if (hashtable_seed == 0) {
@@ -264,7 +271,8 @@ void json_object_seed(size_t seed) {
 }
 #else
 /* Fall back to a thread-unsafe version */
-void json_object_seed(size_t seed) {
+void json_object_seed(size_t seed)
+{
     uint32_t new_seed = (uint32_t)seed;
 
     if (hashtable_seed == 0) {
diff --git a/client/jansson/jansson.h b/client/jansson/jansson.h
index 774754118..37861dca0 100644
--- a/client/jansson/jansson.h
+++ b/client/jansson/jansson.h
@@ -120,7 +120,7 @@ json_t *json_null(void);
 static JSON_INLINE
 json_t *json_incref(json_t *json)
 {
-    if(json && json->refcount != (size_t)-1)
+    if (json && json->refcount != (size_t) -1)
         JSON_INTERNAL_INCREF(json);
     return json;
 }
@@ -131,7 +131,7 @@ void json_delete(json_t *json);
 static JSON_INLINE
 void json_decref(json_t *json)
 {
-    if(json && json->refcount != (size_t)-1 && JSON_INTERNAL_DECREF(json) == 0)
+    if (json && json->refcount != (size_t) -1 && JSON_INTERNAL_DECREF(json) == 0)
         json_delete(json);
 }
 
@@ -139,9 +139,9 @@ void json_decref(json_t *json)
 static JSON_INLINE
 void json_decrefp(json_t **json)
 {
-    if(json) {
+    if (json) {
         json_decref(*json);
-    *json = NULL;
+        *json = NULL;
     }
 }
 
@@ -183,7 +183,8 @@ enum json_error_code {
     json_error_index_out_of_range
 };
 
-static JSON_INLINE enum json_error_code json_error_code(const json_error_t *e) {
+static JSON_INLINE enum json_error_code json_error_code(const json_error_t *e)
+{
     return (enum json_error_code)e->text[JSON_ERROR_TEXT_LENGTH - 1];
 }
 
@@ -214,10 +215,10 @@ int json_object_iter_set_new(json_t *object, void *iter, json_t *value);
 
 #define json_object_foreach_safe(object, n, key, value)     \
     for(key = json_object_iter_key(json_object_iter(object)), \
-            n = json_object_iter_next(object, json_object_key_to_iter(key)); \
+        n = json_object_iter_next(object, json_object_key_to_iter(key)); \
         key && (value = json_object_iter_value(json_object_key_to_iter(key))); \
         key = json_object_iter_key(n), \
-            n = json_object_iter_next(object, json_object_key_to_iter(key)))
+        n = json_object_iter_next(object, json_object_key_to_iter(key)))
 
 #define json_array_foreach(array, index, value) \
     for(index = 0; \
diff --git a/client/jansson/jansson_private.h b/client/jansson/jansson_private.h
index 083604b4d..5957f70b2 100644
--- a/client/jansson/jansson_private.h
+++ b/client/jansson/jansson_private.h
@@ -87,7 +87,7 @@ int jsonp_strtod(strbuffer_t *strbuffer, double *out);
 int jsonp_dtostr(char *buffer, size_t size, double value, int prec);
 
 /* Wrappers for custom memory functions */
-void* jsonp_malloc(size_t size) JANSSON_ATTRS(warn_unused_result);
+void *jsonp_malloc(size_t size) JANSSON_ATTRS(warn_unused_result);
 void jsonp_free(void *ptr);
 char *jsonp_strndup(const char *str, size_t length) JANSSON_ATTRS(warn_unused_result);
 char *jsonp_strdup(const char *str) JANSSON_ATTRS(warn_unused_result);
diff --git a/client/jansson/load.c b/client/jansson/load.c
index 2f123724e..e8ba8d7aa 100644
--- a/client/jansson/load.c
+++ b/client/jansson/load.c
@@ -95,7 +95,7 @@ static void error_set(json_error_t *error, const lex_t *lex,
     size_t pos = 0;
     const char *result = msg_text;
 
-    if(!error)
+    if (!error)
         return;
 
     va_start(ap, msg);
@@ -103,33 +103,28 @@ static void error_set(json_error_t *error, const lex_t *lex,
     msg_text[JSON_ERROR_TEXT_LENGTH - 1] = '\0';
     va_end(ap);
 
-    if(lex)
-    {
+    if (lex) {
         const char *saved_text = strbuffer_value(&lex->saved_text);
 
         line = lex->stream.line;
         col = lex->stream.column;
         pos = lex->stream.position;
 
-        if(saved_text && saved_text[0])
-        {
-            if(lex->saved_text.length <= 20) {
+        if (saved_text && saved_text[0]) {
+            if (lex->saved_text.length <= 20) {
                 snprintf(msg_with_context, JSON_ERROR_TEXT_LENGTH, "%s near '%s'", msg_text, saved_text);
                 msg_with_context[JSON_ERROR_TEXT_LENGTH - 1] = '\0';
                 result = msg_with_context;
             }
-        }
-        else
-        {
-            if(code == json_error_invalid_syntax) {
+        } else {
+            if (code == json_error_invalid_syntax) {
                 /* More specific error code for premature end of file. */
                 code = json_error_premature_end_of_input;
             }
-            if(lex->stream.state == STREAM_STATE_ERROR) {
+            if (lex->stream.state == STREAM_STATE_ERROR) {
                 /* No context for UTF-8 decoding errors */
                 result = msg_text;
-            }
-            else {
+            } else {
                 snprintf(msg_with_context, JSON_ERROR_TEXT_LENGTH, "%s near end of file", msg_text);
                 msg_with_context[JSON_ERROR_TEXT_LENGTH - 1] = '\0';
                 result = msg_with_context;
@@ -161,13 +156,12 @@ static int stream_get(stream_t *stream, json_error_t *error)
 {
     int c;
 
-    if(stream->state != STREAM_STATE_OK)
+    if (stream->state != STREAM_STATE_OK)
         return stream->state;
 
-    if(!stream->buffer[stream->buffer_pos])
-    {
+    if (!stream->buffer[stream->buffer_pos]) {
         c = stream->get(stream->data);
-        if(c == EOF) {
+        if (c == EOF) {
             stream->state = STREAM_STATE_EOF;
             return STREAM_STATE_EOF;
         }
@@ -175,38 +169,35 @@ static int stream_get(stream_t *stream, json_error_t *error)
         stream->buffer[0] = c;
         stream->buffer_pos = 0;
 
-        if(0x80 <= c && c <= 0xFF)
-        {
+        if (0x80 <= c && c <= 0xFF) {
             /* multi-byte UTF-8 sequence */
             size_t i, count;
 
             count = utf8_check_first(c);
-            if(!count)
+            if (!count)
                 goto out;
 
             assert(count >= 2);
 
-            for(i = 1; i < count; i++)
+            for (i = 1; i < count; i++)
                 stream->buffer[i] = stream->get(stream->data);
 
-            if(!utf8_check_full(stream->buffer, count, NULL))
+            if (!utf8_check_full(stream->buffer, count, NULL))
                 goto out;
 
             stream->buffer[count] = '\0';
-        }
-        else
+        } else
             stream->buffer[1] = '\0';
     }
 
     c = stream->buffer[stream->buffer_pos++];
 
     stream->position++;
-    if(c == '\n') {
+    if (c == '\n') {
         stream->line++;
         stream->last_column = stream->column;
         stream->column = 0;
-    }
-    else if(utf8_check_first(c)) {
+    } else if (utf8_check_first(c)) {
         /* track the Unicode character column, so increment only if
            this is the first character of a UTF-8 sequence */
         stream->column++;
@@ -222,15 +213,14 @@ out:
 
 static void stream_unget(stream_t *stream, int c)
 {
-    if(c == STREAM_STATE_EOF || c == STREAM_STATE_ERROR)
+    if (c == STREAM_STATE_EOF || c == STREAM_STATE_ERROR)
         return;
 
     stream->position--;
-    if(c == '\n') {
+    if (c == '\n') {
         stream->line--;
         stream->column = stream->last_column;
-    }
-    else if(utf8_check_first(c))
+    } else if (utf8_check_first(c))
         stream->column--;
 
     assert(stream->buffer_pos > 0);
@@ -252,7 +242,7 @@ static void lex_save(lex_t *lex, int c)
 static int lex_get_save(lex_t *lex, json_error_t *error)
 {
     int c = stream_get(&lex->stream, error);
-    if(c != STREAM_STATE_EOF && c != STREAM_STATE_ERROR)
+    if (c != STREAM_STATE_EOF && c != STREAM_STATE_ERROR)
         lex_save(lex, c);
     return c;
 }
@@ -264,18 +254,18 @@ static void lex_unget(lex_t *lex, int c)
 
 static void lex_unget_unsave(lex_t *lex, int c)
 {
-    if(c != STREAM_STATE_EOF && c != STREAM_STATE_ERROR) {
+    if (c != STREAM_STATE_EOF && c != STREAM_STATE_ERROR) {
         /* Since we treat warnings as errors, when assertions are turned
          * off the "d" variable would be set but never used. Which is
          * treated as an error by GCC.
          */
-        #ifndef NDEBUG
+#ifndef NDEBUG
         char d;
-        #endif
+#endif
         stream_unget(&lex->stream, c);
-        #ifndef NDEBUG
+#ifndef NDEBUG
         d =
-        #endif
+#endif
             strbuffer_pop(&lex->saved_text);
         assert(c == d);
     }
@@ -283,8 +273,7 @@ static void lex_unget_unsave(lex_t *lex, int c)
 
 static void lex_save_cached(lex_t *lex)
 {
-    while(lex->stream.buffer[lex->stream.buffer_pos] != '\0')
-    {
+    while (lex->stream.buffer[lex->stream.buffer_pos] != '\0') {
         lex_save(lex, lex->stream.buffer[lex->stream.buffer_pos]);
         lex->stream.buffer_pos++;
         lex->stream.position++;
@@ -306,14 +295,14 @@ static int32_t decode_unicode_escape(const char *str)
 
     assert(str[0] == 'u');
 
-    for(i = 1; i <= 4; i++) {
+    for (i = 1; i <= 4; i++) {
         char c = str[i];
         value <<= 4;
-        if(l_isdigit(c))
+        if (l_isdigit(c))
             value += c - '0';
-        else if(l_islower(c))
+        else if (l_islower(c))
             value += c - 'a' + 10;
-        else if(l_isupper(c))
+        else if (l_isupper(c))
             value += c - 'A' + 10;
         else
             return -1;
@@ -334,46 +323,44 @@ static void lex_scan_string(lex_t *lex, json_error_t *error)
 
     c = lex_get_save(lex, error);
 
-    while(c != '"') {
-        if(c == STREAM_STATE_ERROR)
+    while (c != '"') {
+        if (c == STREAM_STATE_ERROR)
             goto out;
 
-        else if(c == STREAM_STATE_EOF) {
+        else if (c == STREAM_STATE_EOF) {
             error_set(error, lex, json_error_premature_end_of_input, "premature end of input");
             goto out;
         }
 
-        else if(0 <= c && c <= 0x1F) {
+        else if (0 <= c && c <= 0x1F) {
             /* control character */
             lex_unget_unsave(lex, c);
-            if(c == '\n')
+            if (c == '\n')
                 error_set(error, lex, json_error_invalid_syntax, "unexpected newline");
             else
                 error_set(error, lex, json_error_invalid_syntax, "control character 0x%x", c);
             goto out;
         }
 
-        else if(c == '\\') {
+        else if (c == '\\') {
             c = lex_get_save(lex, error);
-            if(c == 'u') {
+            if (c == 'u') {
                 c = lex_get_save(lex, error);
-                for(i = 0; i < 4; i++) {
-                    if(!l_isxdigit(c)) {
+                for (i = 0; i < 4; i++) {
+                    if (!l_isxdigit(c)) {
                         error_set(error, lex, json_error_invalid_syntax, "invalid escape");
                         goto out;
                     }
                     c = lex_get_save(lex, error);
                 }
-            }
-            else if(c == '"' || c == '\\' || c == '/' || c == 'b' ||
-                    c == 'f' || c == 'n' || c == 'r' || c == 't')
+            } else if (c == '"' || c == '\\' || c == '/' || c == 'b' ||
+                       c == 'f' || c == 'n' || c == 'r' || c == 't')
                 c = lex_get_save(lex, error);
             else {
                 error_set(error, lex, json_error_invalid_syntax, "invalid escape");
                 goto out;
             }
-        }
-        else
+        } else
             c = lex_get_save(lex, error);
     }
 
@@ -385,7 +372,7 @@ static void lex_scan_string(lex_t *lex, json_error_t *error)
            are converted to 4 bytes
     */
     t = jsonp_malloc(lex->saved_text.length + 1);
-    if(!t) {
+    if (!t) {
         /* this is not very nice, since TOKEN_INVALID is returned */
         goto out;
     }
@@ -394,38 +381,37 @@ static void lex_scan_string(lex_t *lex, json_error_t *error)
     /* + 1 to skip the " */
     p = strbuffer_value(&lex->saved_text) + 1;
 
-    while(*p != '"') {
-        if(*p == '\\') {
+    while (*p != '"') {
+        if (*p == '\\') {
             p++;
-            if(*p == 'u') {
+            if (*p == 'u') {
                 size_t length;
                 int32_t value;
 
                 value = decode_unicode_escape(p);
-                if(value < 0) {
+                if (value < 0) {
                     error_set(error, lex, json_error_invalid_syntax, "invalid Unicode escape '%.6s'", p - 1);
                     goto out;
                 }
                 p += 5;
 
-                if(0xD800 <= value && value <= 0xDBFF) {
+                if (0xD800 <= value && value <= 0xDBFF) {
                     /* surrogate pair */
-                    if(*p == '\\' && *(p + 1) == 'u') {
+                    if (*p == '\\' && *(p + 1) == 'u') {
                         int32_t value2 = decode_unicode_escape(++p);
-                        if(value2 < 0) {
+                        if (value2 < 0) {
                             error_set(error, lex, json_error_invalid_syntax, "invalid Unicode escape '%.6s'", p - 1);
                             goto out;
                         }
                         p += 5;
 
-                        if(0xDC00 <= value2 && value2 <= 0xDFFF) {
+                        if (0xDC00 <= value2 && value2 <= 0xDFFF) {
                             /* valid second surrogate */
                             value =
                                 ((value - 0xD800) << 10) +
                                 (value2 - 0xDC00) +
                                 0x10000;
-                        }
-                        else {
+                        } else {
                             /* invalid second surrogate */
                             error_set(error, lex,
                                       json_error_invalid_syntax,
@@ -433,39 +419,49 @@ static void lex_scan_string(lex_t *lex, json_error_t *error)
                                       value, value2);
                             goto out;
                         }
-                    }
-                    else {
+                    } else {
                         /* no second surrogate */
                         error_set(error, lex, json_error_invalid_syntax, "invalid Unicode '\\u%04X'",
                                   value);
                         goto out;
                     }
-                }
-                else if(0xDC00 <= value && value <= 0xDFFF) {
+                } else if (0xDC00 <= value && value <= 0xDFFF) {
                     error_set(error, lex, json_error_invalid_syntax, "invalid Unicode '\\u%04X'", value);
                     goto out;
                 }
 
-                if(utf8_encode(value, t, &length))
+                if (utf8_encode(value, t, &length))
                     assert(0);
                 t += length;
-            }
-            else {
-                switch(*p) {
-                    case '"': case '\\': case '/':
-                        *t = *p; break;
-                    case 'b': *t = '\b'; break;
-                    case 'f': *t = '\f'; break;
-                    case 'n': *t = '\n'; break;
-                    case 'r': *t = '\r'; break;
-                    case 't': *t = '\t'; break;
-                    default: assert(0);
+            } else {
+                switch (*p) {
+                    case '"':
+                    case '\\':
+                    case '/':
+                        *t = *p;
+                        break;
+                    case 'b':
+                        *t = '\b';
+                        break;
+                    case 'f':
+                        *t = '\f';
+                        break;
+                    case 'n':
+                        *t = '\n';
+                        break;
+                    case 'r':
+                        *t = '\r';
+                        break;
+                    case 't':
+                        *t = '\t';
+                        break;
+                    default:
+                        assert(0);
                 }
                 t++;
                 p++;
             }
-        }
-        else
+        } else
             *(t++) = *(p++);
     }
     *t = '\0';
@@ -497,29 +493,26 @@ static int lex_scan_number(lex_t *lex, int c, json_error_t *error)
 
     lex->token = TOKEN_INVALID;
 
-    if(c == '-')
+    if (c == '-')
         c = lex_get_save(lex, error);
 
-    if(c == '0') {
+    if (c == '0') {
         c = lex_get_save(lex, error);
-        if(l_isdigit(c)) {
+        if (l_isdigit(c)) {
             lex_unget_unsave(lex, c);
             goto out;
         }
-    }
-    else if(l_isdigit(c)) {
+    } else if (l_isdigit(c)) {
         do
             c = lex_get_save(lex, error);
-        while(l_isdigit(c));
-    }
-    else {
+        while (l_isdigit(c));
+    } else {
         lex_unget_unsave(lex, c);
         goto out;
     }
 
-    if(!(lex->flags & JSON_DECODE_INT_AS_REAL) &&
-       c != '.' && c != 'E' && c != 'e')
-    {
+    if (!(lex->flags & JSON_DECODE_INT_AS_REAL) &&
+        c != '.' && c != 'E' && c != 'e') {
         json_int_t intval;
 
         lex_unget_unsave(lex, c);
@@ -528,8 +521,8 @@ static int lex_scan_number(lex_t *lex, int c, json_error_t *error)
 
         errno = 0;
         intval = json_strtoint(saved_text, &end, 10);
-        if(errno == ERANGE) {
-            if(intval < 0)
+        if (errno == ERANGE) {
+            if (intval < 0)
                 error_set(error, lex, json_error_numeric_overflow, "too big negative integer");
             else
                 error_set(error, lex, json_error_numeric_overflow, "too big integer");
@@ -543,9 +536,9 @@ static int lex_scan_number(lex_t *lex, int c, json_error_t *error)
         return 0;
     }
 
-    if(c == '.') {
+    if (c == '.') {
         c = lex_get(lex, error);
-        if(!l_isdigit(c)) {
+        if (!l_isdigit(c)) {
             lex_unget(lex, c);
             goto out;
         }
@@ -553,27 +546,27 @@ static int lex_scan_number(lex_t *lex, int c, json_error_t *error)
 
         do
             c = lex_get_save(lex, error);
-        while(l_isdigit(c));
+        while (l_isdigit(c));
     }
 
-    if(c == 'E' || c == 'e') {
+    if (c == 'E' || c == 'e') {
         c = lex_get_save(lex, error);
-        if(c == '+' || c == '-')
+        if (c == '+' || c == '-')
             c = lex_get_save(lex, error);
 
-        if(!l_isdigit(c)) {
+        if (!l_isdigit(c)) {
             lex_unget_unsave(lex, c);
             goto out;
         }
 
         do
             c = lex_get_save(lex, error);
-        while(l_isdigit(c));
+        while (l_isdigit(c));
     }
 
     lex_unget_unsave(lex, c);
 
-    if(jsonp_strtod(&lex->saved_text, &doubleval)) {
+    if (jsonp_strtod(&lex->saved_text, &doubleval)) {
         error_set(error, lex, json_error_numeric_overflow, "real number overflow");
         goto out;
     }
@@ -592,52 +585,52 @@ static int lex_scan(lex_t *lex, json_error_t *error)
 
     strbuffer_clear(&lex->saved_text);
 
-    if(lex->token == TOKEN_STRING)
+    if (lex->token == TOKEN_STRING)
         lex_free_string(lex);
 
     do
         c = lex_get(lex, error);
-    while(c == ' ' || c == '\t' || c == '\n' || c == '\r');
+    while (c == ' ' || c == '\t' || c == '\n' || c == '\r');
 
-    if(c == STREAM_STATE_EOF) {
+    if (c == STREAM_STATE_EOF) {
         lex->token = TOKEN_EOF;
         goto out;
     }
 
-    if(c == STREAM_STATE_ERROR) {
+    if (c == STREAM_STATE_ERROR) {
         lex->token = TOKEN_INVALID;
         goto out;
     }
 
     lex_save(lex, c);
 
-    if(c == '{' || c == '}' || c == '[' || c == ']' || c == ':' || c == ',')
+    if (c == '{' || c == '}' || c == '[' || c == ']' || c == ':' || c == ',')
         lex->token = c;
 
-    else if(c == '"')
+    else if (c == '"')
         lex_scan_string(lex, error);
 
-    else if(l_isdigit(c) || c == '-') {
-        if(lex_scan_number(lex, c, error))
+    else if (l_isdigit(c) || c == '-') {
+        if (lex_scan_number(lex, c, error))
             goto out;
     }
 
-    else if(l_isalpha(c)) {
+    else if (l_isalpha(c)) {
         /* eat up the whole identifier for clearer error messages */
         const char *saved_text;
 
         do
             c = lex_get_save(lex, error);
-        while(l_isalpha(c));
+        while (l_isalpha(c));
         lex_unget_unsave(lex, c);
 
         saved_text = strbuffer_value(&lex->saved_text);
 
-        if(strcmp(saved_text, "true") == 0)
+        if (strcmp(saved_text, "true") == 0)
             lex->token = TOKEN_TRUE;
-        else if(strcmp(saved_text, "false") == 0)
+        else if (strcmp(saved_text, "false") == 0)
             lex->token = TOKEN_FALSE;
-        else if(strcmp(saved_text, "null") == 0)
+        else if (strcmp(saved_text, "null") == 0)
             lex->token = TOKEN_NULL;
         else
             lex->token = TOKEN_INVALID;
@@ -657,7 +650,7 @@ out:
 static char *lex_steal_string(lex_t *lex, size_t *out_len)
 {
     char *result = NULL;
-    if(lex->token == TOKEN_STRING) {
+    if (lex->token == TOKEN_STRING) {
         result = lex->value.string.val;
         *out_len = lex->value.string.len;
         lex->value.string.val = NULL;
@@ -669,7 +662,7 @@ static char *lex_steal_string(lex_t *lex, size_t *out_len)
 static int lex_init(lex_t *lex, get_func get, size_t flags, void *data)
 {
     stream_init(&lex->stream, get, data);
-    if(strbuffer_init(&lex->saved_text))
+    if (strbuffer_init(&lex->saved_text))
         return -1;
 
     lex->flags = flags;
@@ -679,7 +672,7 @@ static int lex_init(lex_t *lex, get_func get, size_t flags, void *data)
 
 static void lex_close(lex_t *lex)
 {
-    if(lex->token == TOKEN_STRING)
+    if (lex->token == TOKEN_STRING)
         lex_free_string(lex);
     strbuffer_close(&lex->saved_text);
 }
@@ -692,25 +685,25 @@ static json_t *parse_value(lex_t *lex, size_t flags, json_error_t *error);
 static json_t *parse_object(lex_t *lex, size_t flags, json_error_t *error)
 {
     json_t *object = json_object();
-    if(!object)
+    if (!object)
         return NULL;
 
     lex_scan(lex, error);
-    if(lex->token == '}')
+    if (lex->token == '}')
         return object;
 
-    while(1) {
+    while (1) {
         char *key;
         size_t len;
         json_t *value;
 
-        if(lex->token != TOKEN_STRING) {
+        if (lex->token != TOKEN_STRING) {
             error_set(error, lex, json_error_invalid_syntax, "string or '}' expected");
             goto error;
         }
 
         key = lex_steal_string(lex, &len);
-        if(!key)
+        if (!key)
             return NULL;
         if (memchr(key, '\0', len)) {
             jsonp_free(key);
@@ -718,8 +711,8 @@ static json_t *parse_object(lex_t *lex, size_t flags, json_error_t *error)
             goto error;
         }
 
-        if(flags & JSON_REJECT_DUPLICATES) {
-            if(json_object_get(object, key)) {
+        if (flags & JSON_REJECT_DUPLICATES) {
+            if (json_object_get(object, key)) {
                 jsonp_free(key);
                 error_set(error, lex, json_error_duplicate_key, "duplicate object key");
                 goto error;
@@ -727,7 +720,7 @@ static json_t *parse_object(lex_t *lex, size_t flags, json_error_t *error)
         }
 
         lex_scan(lex, error);
-        if(lex->token != ':') {
+        if (lex->token != ':') {
             jsonp_free(key);
             error_set(error, lex, json_error_invalid_syntax, "':' expected");
             goto error;
@@ -735,12 +728,12 @@ static json_t *parse_object(lex_t *lex, size_t flags, json_error_t *error)
 
         lex_scan(lex, error);
         value = parse_value(lex, flags, error);
-        if(!value) {
+        if (!value) {
             jsonp_free(key);
             goto error;
         }
 
-        if(json_object_set_new_nocheck(object, key, value)) {
+        if (json_object_set_new_nocheck(object, key, value)) {
             jsonp_free(key);
             goto error;
         }
@@ -748,13 +741,13 @@ static json_t *parse_object(lex_t *lex, size_t flags, json_error_t *error)
         jsonp_free(key);
 
         lex_scan(lex, error);
-        if(lex->token != ',')
+        if (lex->token != ',')
             break;
 
         lex_scan(lex, error);
     }
 
-    if(lex->token != '}') {
+    if (lex->token != '}') {
         error_set(error, lex, json_error_invalid_syntax, "'}' expected");
         goto error;
     }
@@ -769,30 +762,30 @@ error:
 static json_t *parse_array(lex_t *lex, size_t flags, json_error_t *error)
 {
     json_t *array = json_array();
-    if(!array)
+    if (!array)
         return NULL;
 
     lex_scan(lex, error);
-    if(lex->token == ']')
+    if (lex->token == ']')
         return array;
 
-    while(lex->token) {
+    while (lex->token) {
         json_t *elem = parse_value(lex, flags, error);
-        if(!elem)
+        if (!elem)
             goto error;
 
-        if(json_array_append_new(array, elem)) {
+        if (json_array_append_new(array, elem)) {
             goto error;
         }
 
         lex_scan(lex, error);
-        if(lex->token != ',')
+        if (lex->token != ',')
             break;
 
         lex_scan(lex, error);
     }
 
-    if(lex->token != ']') {
+    if (lex->token != ']') {
         error_set(error, lex, json_error_invalid_syntax, "']' expected");
         goto error;
     }
@@ -809,18 +802,18 @@ static json_t *parse_value(lex_t *lex, size_t flags, json_error_t *error)
     json_t *json;
 
     lex->depth++;
-    if(lex->depth > JSON_PARSER_MAX_DEPTH) {
+    if (lex->depth > JSON_PARSER_MAX_DEPTH) {
         error_set(error, lex, json_error_stack_overflow, "maximum parsing depth reached");
         return NULL;
     }
 
-    switch(lex->token) {
+    switch (lex->token) {
         case TOKEN_STRING: {
             const char *value = lex->value.string.val;
             size_t len = lex->value.string.len;
 
-            if(!(flags & JSON_ALLOW_NUL)) {
-                if(memchr(value, '\0', len)) {
+            if (!(flags & JSON_ALLOW_NUL)) {
+                if (memchr(value, '\0', len)) {
                     error_set(error, lex, json_error_null_character, "\\u0000 is not allowed without JSON_ALLOW_NUL");
                     return NULL;
                 }
@@ -871,7 +864,7 @@ static json_t *parse_value(lex_t *lex, size_t flags, json_error_t *error)
             return NULL;
     }
 
-    if(!json)
+    if (!json)
         return NULL;
 
     lex->depth--;
@@ -885,27 +878,27 @@ static json_t *parse_json(lex_t *lex, size_t flags, json_error_t *error)
     lex->depth = 0;
 
     lex_scan(lex, error);
-    if(!(flags & JSON_DECODE_ANY)) {
-        if(lex->token != '[' && lex->token != '{') {
+    if (!(flags & JSON_DECODE_ANY)) {
+        if (lex->token != '[' && lex->token != '{') {
             error_set(error, lex, json_error_invalid_syntax, "'[' or '{' expected");
             return NULL;
         }
     }
 
     result = parse_value(lex, flags, error);
-    if(!result)
+    if (!result)
         return NULL;
 
-    if(!(flags & JSON_DISABLE_EOF_CHECK)) {
+    if (!(flags & JSON_DISABLE_EOF_CHECK)) {
         lex_scan(lex, error);
-        if(lex->token != TOKEN_EOF) {
+        if (lex->token != TOKEN_EOF) {
             error_set(error, lex, json_error_end_of_input_expected, "end of file expected");
             json_decref(result);
             return NULL;
         }
     }
 
-    if(error) {
+    if (error) {
         /* Save the position even though there was no error */
         error->position = (int)lex->stream.position;
     }
@@ -913,8 +906,7 @@ static json_t *parse_json(lex_t *lex, size_t flags, json_error_t *error)
     return result;
 }
 
-typedef struct
-{
+typedef struct {
     const char *data;
     size_t pos;
 } string_data_t;
@@ -924,10 +916,9 @@ static int string_get(void *data)
     char c;
     string_data_t *stream = (string_data_t *)data;
     c = stream->data[stream->pos];
-    if(c == '\0')
+    if (c == '\0')
         return EOF;
-    else
-    {
+    else {
         stream->pos++;
         return (unsigned char)c;
     }
@@ -949,7 +940,7 @@ json_t *json_loads(const char *string, size_t flags, json_error_t *error)
     stream_data.data = string;
     stream_data.pos = 0;
 
-    if(lex_init(&lex, string_get, flags, (void *)&stream_data))
+    if (lex_init(&lex, string_get, flags, (void *)&stream_data))
         return NULL;
 
     result = parse_json(&lex, flags, error);
@@ -958,8 +949,7 @@ json_t *json_loads(const char *string, size_t flags, json_error_t *error)
     return result;
 }
 
-typedef struct
-{
+typedef struct {
     const char *data;
     size_t len;
     size_t pos;
@@ -969,8 +959,8 @@ static int buffer_get(void *data)
 {
     char c;
     buffer_data_t *stream = data;
-    if(stream->pos >= stream->len)
-      return EOF;
+    if (stream->pos >= stream->len)
+        return EOF;
 
     c = stream->data[stream->pos];
     stream->pos++;
@@ -994,7 +984,7 @@ json_t *json_loadb(const char *buffer, size_t buflen, size_t flags, json_error_t
     stream_data.pos = 0;
     stream_data.len = buflen;
 
-    if(lex_init(&lex, buffer_get, flags, (void *)&stream_data))
+    if (lex_init(&lex, buffer_get, flags, (void *)&stream_data))
         return NULL;
 
     result = parse_json(&lex, flags, error);
@@ -1009,7 +999,7 @@ json_t *json_loadf(FILE *input, size_t flags, json_error_t *error)
     const char *source;
     json_t *result;
 
-    if(input == stdin)
+    if (input == stdin)
         source = "<stdin>";
     else
         source = "<stream>";
@@ -1021,7 +1011,7 @@ json_t *json_loadf(FILE *input, size_t flags, json_error_t *error)
         return NULL;
     }
 
-    if(lex_init(&lex, (get_func)fgetc, flags, input))
+    if (lex_init(&lex, (get_func)fgetc, flags, input))
         return NULL;
 
     result = parse_json(&lex, flags, error);
@@ -1047,7 +1037,7 @@ json_t *json_loadfd(int input, size_t flags, json_error_t *error)
     json_t *result;
 
 #ifdef HAVE_UNISTD_H
-    if(input == STDIN_FILENO)
+    if (input == STDIN_FILENO)
         source = "<stdin>";
     else
 #endif
@@ -1060,7 +1050,7 @@ json_t *json_loadfd(int input, size_t flags, json_error_t *error)
         return NULL;
     }
 
-    if(lex_init(&lex, (get_func)fd_get_func, flags, &input))
+    if (lex_init(&lex, (get_func)fd_get_func, flags, &input))
         return NULL;
 
     result = parse_json(&lex, flags, error);
@@ -1082,8 +1072,7 @@ json_t *json_load_file(const char *path, size_t flags, json_error_t *error)
     }
 
     fp = fopen(path, "rb");
-    if(!fp)
-    {
+    if (!fp) {
         error_set(error, NULL, json_error_cannot_open_file, "unable to open %s: %s",
                   path, strerror(errno));
         return NULL;
@@ -1097,8 +1086,7 @@ json_t *json_load_file(const char *path, size_t flags, json_error_t *error)
 
 #define MAX_BUF_LEN 1024
 
-typedef struct
-{
+typedef struct {
     char data[MAX_BUF_LEN];
     size_t len;
     size_t pos;
@@ -1111,10 +1099,10 @@ static int callback_get(void *data)
     char c;
     callback_data_t *stream = data;
 
-    if(stream->pos >= stream->len) {
+    if (stream->pos >= stream->len) {
         stream->pos = 0;
         stream->len = stream->callback(stream->data, MAX_BUF_LEN, stream->arg);
-        if(stream->len == 0 || stream->len == (size_t)-1)
+        if (stream->len == 0 || stream->len == (size_t) -1)
             return EOF;
     }
 
@@ -1141,7 +1129,7 @@ json_t *json_load_callback(json_load_callback_t callback, void *arg, size_t flag
         return NULL;
     }
 
-    if(lex_init(&lex, (get_func)callback_get, flags, &stream_data))
+    if (lex_init(&lex, (get_func)callback_get, flags, &stream_data))
         return NULL;
 
     result = parse_json(&lex, flags, error);
diff --git a/client/jansson/lookup3.h b/client/jansson/lookup3.h
index ec2d0ffd6..b75e6b505 100644
--- a/client/jansson/lookup3.h
+++ b/client/jansson/lookup3.h
@@ -121,14 +121,14 @@ rotates.
 -------------------------------------------------------------------------------
 */
 #define mix(a,b,c) \
-{ \
-  a -= c;  a ^= rot(c, 4);  c += b; \
-  b -= a;  b ^= rot(a, 6);  a += c; \
-  c -= b;  c ^= rot(b, 8);  b += a; \
-  a -= c;  a ^= rot(c,16);  c += b; \
-  b -= a;  b ^= rot(a,19);  a += c; \
-  c -= b;  c ^= rot(b, 4);  b += a; \
-}
+    { \
+        a -= c;  a ^= rot(c, 4);  c += b; \
+        b -= a;  b ^= rot(a, 6);  a += c; \
+        c -= b;  c ^= rot(b, 8);  b += a; \
+        a -= c;  a ^= rot(c,16);  c += b; \
+        b -= a;  b ^= rot(a,19);  a += c; \
+        c -= b;  c ^= rot(b, 4);  b += a; \
+    }
 
 /*
 -------------------------------------------------------------------------------
@@ -156,15 +156,15 @@ and these came close:
 -------------------------------------------------------------------------------
 */
 #define final(a,b,c) \
-{ \
-  c ^= b; c -= rot(b,14); \
-  a ^= c; a -= rot(c,11); \
-  b ^= a; b -= rot(a,25); \
-  c ^= b; c -= rot(b,16); \
-  a ^= c; a -= rot(c,4);  \
-  b ^= a; b -= rot(a,14); \
-  c ^= b; c -= rot(b,24); \
-}
+    { \
+        c ^= b; c -= rot(b,14); \
+        a ^= c; a -= rot(c,11); \
+        b ^= a; b -= rot(a,25); \
+        c ^= b; c -= rot(b,16); \
+        a ^= c; a -= rot(c,4);  \
+        b ^= a; b -= rot(a,14); \
+        c ^= b; c -= rot(b,24); \
+    }
 
 /*
 -------------------------------------------------------------------------------
@@ -195,17 +195,17 @@ acceptable.  Do NOT use for cryptographic purposes.
 
 static uint32_t hashlittle(const void *key, size_t length, uint32_t initval)
 {
-  uint32_t a,b,c;                                          /* internal state */
-  union { const void *ptr; size_t i; } u;     /* needed for Mac Powerbook G4 */
+    uint32_t a, b, c;                                        /* internal state */
+    union { const void *ptr; size_t i; } u;     /* needed for Mac Powerbook G4 */
 
-  /* Set up the internal state */
-  a = b = c = 0xdeadbeef + ((uint32_t)length) + initval;
+    /* Set up the internal state */
+    a = b = c = 0xdeadbeef + ((uint32_t)length) + initval;
 
-  u.ptr = key;
-  if (HASH_LITTLE_ENDIAN && ((u.i & 0x3) == 0)) {
-    const uint32_t *k = (const uint32_t *)key;         /* read 32-bit chunks */
+    u.ptr = key;
+    if (HASH_LITTLE_ENDIAN && ((u.i & 0x3) == 0)) {
+        const uint32_t *k = (const uint32_t *)key;         /* read 32-bit chunks */
 
-/* Detect Valgrind or AddressSanitizer */
+        /* Detect Valgrind or AddressSanitizer */
 #ifdef VALGRIND
 # define NO_MASKING_TRICK 1
 #else
@@ -221,161 +221,237 @@ static uint32_t hashlittle(const void *key, size_t length, uint32_t initval)
 #endif
 
 #ifdef NO_MASKING_TRICK
-    const uint8_t  *k8;
+        const uint8_t  *k8;
 #endif
 
-    /*------ all but last block: aligned reads and affect 32 bits of (a,b,c) */
-    while (length > 12)
-    {
-      a += k[0];
-      b += k[1];
-      c += k[2];
-      mix(a,b,c);
-      length -= 12;
-      k += 3;
-    }
+        /*------ all but last block: aligned reads and affect 32 bits of (a,b,c) */
+        while (length > 12) {
+            a += k[0];
+            b += k[1];
+            c += k[2];
+            mix(a, b, c);
+            length -= 12;
+            k += 3;
+        }
 
-    /*----------------------------- handle the last (probably partial) block */
-    /*
-     * "k[2]&0xffffff" actually reads beyond the end of the string, but
-     * then masks off the part it's not allowed to read.  Because the
-     * string is aligned, the masked-off tail is in the same word as the
-     * rest of the string.  Every machine with memory protection I've seen
-     * does it on word boundaries, so is OK with this.  But VALGRIND will
-     * still catch it and complain.  The masking trick does make the hash
-     * noticably faster for short strings (like English words).
-     */
+        /*----------------------------- handle the last (probably partial) block */
+        /*
+         * "k[2]&0xffffff" actually reads beyond the end of the string, but
+         * then masks off the part it's not allowed to read.  Because the
+         * string is aligned, the masked-off tail is in the same word as the
+         * rest of the string.  Every machine with memory protection I've seen
+         * does it on word boundaries, so is OK with this.  But VALGRIND will
+         * still catch it and complain.  The masking trick does make the hash
+         * noticably faster for short strings (like English words).
+         */
 #ifndef NO_MASKING_TRICK
 
-    switch(length)
-    {
-    case 12: c+=k[2]; b+=k[1]; a+=k[0]; break;
-    case 11: c+=k[2]&0xffffff; b+=k[1]; a+=k[0]; break;
-    case 10: c+=k[2]&0xffff; b+=k[1]; a+=k[0]; break;
-    case 9 : c+=k[2]&0xff; b+=k[1]; a+=k[0]; break;
-    case 8 : b+=k[1]; a+=k[0]; break;
-    case 7 : b+=k[1]&0xffffff; a+=k[0]; break;
-    case 6 : b+=k[1]&0xffff; a+=k[0]; break;
-    case 5 : b+=k[1]&0xff; a+=k[0]; break;
-    case 4 : a+=k[0]; break;
-    case 3 : a+=k[0]&0xffffff; break;
-    case 2 : a+=k[0]&0xffff; break;
-    case 1 : a+=k[0]&0xff; break;
-    case 0 : return c;              /* zero length strings require no mixing */
-    }
+        switch (length) {
+            case 12:
+                c += k[2];
+                b += k[1];
+                a += k[0];
+                break;
+            case 11:
+                c += k[2] & 0xffffff;
+                b += k[1];
+                a += k[0];
+                break;
+            case 10:
+                c += k[2] & 0xffff;
+                b += k[1];
+                a += k[0];
+                break;
+            case 9 :
+                c += k[2] & 0xff;
+                b += k[1];
+                a += k[0];
+                break;
+            case 8 :
+                b += k[1];
+                a += k[0];
+                break;
+            case 7 :
+                b += k[1] & 0xffffff;
+                a += k[0];
+                break;
+            case 6 :
+                b += k[1] & 0xffff;
+                a += k[0];
+                break;
+            case 5 :
+                b += k[1] & 0xff;
+                a += k[0];
+                break;
+            case 4 :
+                a += k[0];
+                break;
+            case 3 :
+                a += k[0] & 0xffffff;
+                break;
+            case 2 :
+                a += k[0] & 0xffff;
+                break;
+            case 1 :
+                a += k[0] & 0xff;
+                break;
+            case 0 :
+                return c;              /* zero length strings require no mixing */
+        }
 
 #else /* make valgrind happy */
 
-    k8 = (const uint8_t *)k;
-    switch(length)
-    {
-    case 12: c+=k[2]; b+=k[1]; a+=k[0]; break;
-    case 11: c+=((uint32_t)k8[10])<<16;  /* fall through */
-    case 10: c+=((uint32_t)k8[9])<<8;    /* fall through */
-    case 9 : c+=k8[8];                   /* fall through */
-    case 8 : b+=k[1]; a+=k[0]; break;
-    case 7 : b+=((uint32_t)k8[6])<<16;   /* fall through */
-    case 6 : b+=((uint32_t)k8[5])<<8;    /* fall through */
-    case 5 : b+=k8[4];                   /* fall through */
-    case 4 : a+=k[0]; break;
-    case 3 : a+=((uint32_t)k8[2])<<16;   /* fall through */
-    case 2 : a+=((uint32_t)k8[1])<<8;    /* fall through */
-    case 1 : a+=k8[0]; break;
-    case 0 : return c;
-    }
+        k8 = (const uint8_t *)k;
+        switch (length) {
+            case 12:
+                c += k[2];
+                b += k[1];
+                a += k[0];
+                break;
+            case 11:
+                c += ((uint32_t)k8[10]) << 16; /* fall through */
+            case 10:
+                c += ((uint32_t)k8[9]) << 8; /* fall through */
+            case 9 :
+                c += k8[8];                 /* fall through */
+            case 8 :
+                b += k[1];
+                a += k[0];
+                break;
+            case 7 :
+                b += ((uint32_t)k8[6]) << 16; /* fall through */
+            case 6 :
+                b += ((uint32_t)k8[5]) << 8; /* fall through */
+            case 5 :
+                b += k8[4];                 /* fall through */
+            case 4 :
+                a += k[0];
+                break;
+            case 3 :
+                a += ((uint32_t)k8[2]) << 16; /* fall through */
+            case 2 :
+                a += ((uint32_t)k8[1]) << 8; /* fall through */
+            case 1 :
+                a += k8[0];
+                break;
+            case 0 :
+                return c;
+        }
 
 #endif /* !valgrind */
 
-  } else if (HASH_LITTLE_ENDIAN && ((u.i & 0x1) == 0)) {
-    const uint16_t *k = (const uint16_t *)key;         /* read 16-bit chunks */
-    const uint8_t  *k8;
+    } else if (HASH_LITTLE_ENDIAN && ((u.i & 0x1) == 0)) {
+        const uint16_t *k = (const uint16_t *)key;         /* read 16-bit chunks */
+        const uint8_t  *k8;
 
-    /*--------------- all but last block: aligned reads and different mixing */
-    while (length > 12)
-    {
-      a += k[0] + (((uint32_t)k[1])<<16);
-      b += k[2] + (((uint32_t)k[3])<<16);
-      c += k[4] + (((uint32_t)k[5])<<16);
-      mix(a,b,c);
-      length -= 12;
-      k += 6;
+        /*--------------- all but last block: aligned reads and different mixing */
+        while (length > 12) {
+            a += k[0] + (((uint32_t)k[1]) << 16);
+            b += k[2] + (((uint32_t)k[3]) << 16);
+            c += k[4] + (((uint32_t)k[5]) << 16);
+            mix(a, b, c);
+            length -= 12;
+            k += 6;
+        }
+
+        /*----------------------------- handle the last (probably partial) block */
+        k8 = (const uint8_t *)k;
+        switch (length) {
+            case 12:
+                c += k[4] + (((uint32_t)k[5]) << 16);
+                b += k[2] + (((uint32_t)k[3]) << 16);
+                a += k[0] + (((uint32_t)k[1]) << 16);
+                break;
+            case 11:
+                c += ((uint32_t)k8[10]) << 16; /* fall through */
+            case 10:
+                c += k[4];
+                b += k[2] + (((uint32_t)k[3]) << 16);
+                a += k[0] + (((uint32_t)k[1]) << 16);
+                break;
+            case 9 :
+                c += k8[8];                    /* fall through */
+            case 8 :
+                b += k[2] + (((uint32_t)k[3]) << 16);
+                a += k[0] + (((uint32_t)k[1]) << 16);
+                break;
+            case 7 :
+                b += ((uint32_t)k8[6]) << 16;  /* fall through */
+            case 6 :
+                b += k[2];
+                a += k[0] + (((uint32_t)k[1]) << 16);
+                break;
+            case 5 :
+                b += k8[4];                    /* fall through */
+            case 4 :
+                a += k[0] + (((uint32_t)k[1]) << 16);
+                break;
+            case 3 :
+                a += ((uint32_t)k8[2]) << 16;  /* fall through */
+            case 2 :
+                a += k[0];
+                break;
+            case 1 :
+                a += k8[0];
+                break;
+            case 0 :
+                return c;                     /* zero length requires no mixing */
+        }
+
+    } else {                        /* need to read the key one byte at a time */
+        const uint8_t *k = (const uint8_t *)key;
+
+        /*--------------- all but the last block: affect some 32 bits of (a,b,c) */
+        while (length > 12) {
+            a += k[0];
+            a += ((uint32_t)k[1]) << 8;
+            a += ((uint32_t)k[2]) << 16;
+            a += ((uint32_t)k[3]) << 24;
+            b += k[4];
+            b += ((uint32_t)k[5]) << 8;
+            b += ((uint32_t)k[6]) << 16;
+            b += ((uint32_t)k[7]) << 24;
+            c += k[8];
+            c += ((uint32_t)k[9]) << 8;
+            c += ((uint32_t)k[10]) << 16;
+            c += ((uint32_t)k[11]) << 24;
+            mix(a, b, c);
+            length -= 12;
+            k += 12;
+        }
+
+        /*-------------------------------- last block: affect all 32 bits of (c) */
+        switch (length) {                /* all the case statements fall through */
+            case 12:
+                c += ((uint32_t)k[11]) << 24; /* fall through */
+            case 11:
+                c += ((uint32_t)k[10]) << 16; /* fall through */
+            case 10:
+                c += ((uint32_t)k[9]) << 8; /* fall through */
+            case 9 :
+                c += k[8]; /* fall through */
+            case 8 :
+                b += ((uint32_t)k[7]) << 24; /* fall through */
+            case 7 :
+                b += ((uint32_t)k[6]) << 16; /* fall through */
+            case 6 :
+                b += ((uint32_t)k[5]) << 8; /* fall through */
+            case 5 :
+                b += k[4]; /* fall through */
+            case 4 :
+                a += ((uint32_t)k[3]) << 24; /* fall through */
+            case 3 :
+                a += ((uint32_t)k[2]) << 16; /* fall through */
+            case 2 :
+                a += ((uint32_t)k[1]) << 8; /* fall through */
+            case 1 :
+                a += k[0];
+                break;
+            case 0 :
+                return c;
+        }
     }
 
-    /*----------------------------- handle the last (probably partial) block */
-    k8 = (const uint8_t *)k;
-    switch(length)
-    {
-    case 12: c+=k[4]+(((uint32_t)k[5])<<16);
-             b+=k[2]+(((uint32_t)k[3])<<16);
-             a+=k[0]+(((uint32_t)k[1])<<16);
-             break;
-    case 11: c+=((uint32_t)k8[10])<<16;     /* fall through */
-    case 10: c+=k[4];
-             b+=k[2]+(((uint32_t)k[3])<<16);
-             a+=k[0]+(((uint32_t)k[1])<<16);
-             break;
-    case 9 : c+=k8[8];                      /* fall through */
-    case 8 : b+=k[2]+(((uint32_t)k[3])<<16);
-             a+=k[0]+(((uint32_t)k[1])<<16);
-             break;
-    case 7 : b+=((uint32_t)k8[6])<<16;      /* fall through */
-    case 6 : b+=k[2];
-             a+=k[0]+(((uint32_t)k[1])<<16);
-             break;
-    case 5 : b+=k8[4];                      /* fall through */
-    case 4 : a+=k[0]+(((uint32_t)k[1])<<16);
-             break;
-    case 3 : a+=((uint32_t)k8[2])<<16;      /* fall through */
-    case 2 : a+=k[0];
-             break;
-    case 1 : a+=k8[0];
-             break;
-    case 0 : return c;                     /* zero length requires no mixing */
-    }
-
-  } else {                        /* need to read the key one byte at a time */
-    const uint8_t *k = (const uint8_t *)key;
-
-    /*--------------- all but the last block: affect some 32 bits of (a,b,c) */
-    while (length > 12)
-    {
-      a += k[0];
-      a += ((uint32_t)k[1])<<8;
-      a += ((uint32_t)k[2])<<16;
-      a += ((uint32_t)k[3])<<24;
-      b += k[4];
-      b += ((uint32_t)k[5])<<8;
-      b += ((uint32_t)k[6])<<16;
-      b += ((uint32_t)k[7])<<24;
-      c += k[8];
-      c += ((uint32_t)k[9])<<8;
-      c += ((uint32_t)k[10])<<16;
-      c += ((uint32_t)k[11])<<24;
-      mix(a,b,c);
-      length -= 12;
-      k += 12;
-    }
-
-    /*-------------------------------- last block: affect all 32 bits of (c) */
-    switch(length)                   /* all the case statements fall through */
-    {
-    case 12: c+=((uint32_t)k[11])<<24; /* fall through */
-    case 11: c+=((uint32_t)k[10])<<16; /* fall through */
-    case 10: c+=((uint32_t)k[9])<<8; /* fall through */
-    case 9 : c+=k[8]; /* fall through */
-    case 8 : b+=((uint32_t)k[7])<<24; /* fall through */
-    case 7 : b+=((uint32_t)k[6])<<16; /* fall through */
-    case 6 : b+=((uint32_t)k[5])<<8; /* fall through */
-    case 5 : b+=k[4]; /* fall through */
-    case 4 : a+=((uint32_t)k[3])<<24; /* fall through */
-    case 3 : a+=((uint32_t)k[2])<<16; /* fall through */
-    case 2 : a+=((uint32_t)k[1])<<8; /* fall through */
-    case 1 : a+=k[0];
-             break;
-    case 0 : return c;
-    }
-  }
-
-  final(a,b,c);
-  return c;
+    final(a, b, c);
+    return c;
 }
diff --git a/client/jansson/memory.c b/client/jansson/memory.c
index a2be5d23d..bd4f5abd7 100644
--- a/client/jansson/memory.c
+++ b/client/jansson/memory.c
@@ -22,7 +22,7 @@ static json_free_t do_free = free;
 
 void *jsonp_malloc(size_t size)
 {
-    if(!size)
+    if (!size)
         return NULL;
 
     return (*do_malloc)(size);
@@ -30,7 +30,7 @@ void *jsonp_malloc(size_t size)
 
 void jsonp_free(void *ptr)
 {
-    if(!ptr)
+    if (!ptr)
         return;
 
     (*do_free)(ptr);
@@ -46,7 +46,7 @@ char *jsonp_strndup(const char *str, size_t len)
     char *new_str;
 
     new_str = jsonp_malloc(len + 1);
-    if(!new_str)
+    if (!new_str)
         return NULL;
 
     memcpy(new_str, str, len);
diff --git a/client/jansson/pack_unpack.c b/client/jansson/pack_unpack.c
index 3b9977667..bdb17380b 100644
--- a/client/jansson/pack_unpack.c
+++ b/client/jansson/pack_unpack.c
@@ -34,7 +34,7 @@ typedef struct {
 
 #define token(scanner) ((scanner)->token.token)
 
-static const char * const type_names[] = {
+static const char *const type_names[] = {
     "object",
     "array",
     "string",
@@ -69,7 +69,7 @@ static void next_token(scanner_t *s)
     const char *t;
     s->prev_token = s->token;
 
-    if(s->next_token.line) {
+    if (s->next_token.line) {
         s->token = s->next_token;
         s->next_token.line = 0;
         return;
@@ -83,12 +83,11 @@ static void next_token(scanner_t *s)
     s->pos++;
 
     /* skip space and ignored chars */
-    while(*t == ' ' || *t == '\t' || *t == '\n' || *t == ',' || *t == ':') {
-        if(*t == '\n') {
+    while (*t == ' ' || *t == '\t' || *t == '\n' || *t == ',' || *t == ':') {
+        if (*t == '\n') {
             s->line++;
             s->column = 1;
-        }
-        else
+        } else
             s->column++;
 
         s->pos++;
@@ -142,11 +141,11 @@ static char *read_string(scanner_t *s, va_list *ap,
     prev_token(s);
 
     *ours = 0;
-    if(t != '#' && t != '%' && t != '+') {
+    if (t != '#' && t != '%' && t != '+') {
         /* Optimize the simple case */
         str = va_arg(*ap, const char *);
 
-        if(!str) {
+        if (!str) {
             if (!optional) {
                 set_error(s, "<args>", json_error_null_value, "NULL %s", purpose);
                 s->has_error = 1;
@@ -156,7 +155,7 @@ static char *read_string(scanner_t *s, va_list *ap,
 
         length = strlen(str);
 
-        if(!utf8_check_string(str, length)) {
+        if (!utf8_check_string(str, length)) {
             set_error(s, "<args>", json_error_invalid_utf8, "Invalid UTF-8 %s", purpose);
             s->has_error = 1;
             return NULL;
@@ -171,49 +170,47 @@ static char *read_string(scanner_t *s, va_list *ap,
         return NULL;
     }
 
-    if(strbuffer_init(&strbuff)) {
+    if (strbuffer_init(&strbuff)) {
         set_error(s, "<internal>", json_error_out_of_memory, "Out of memory");
         s->has_error = 1;
     }
 
-    while(1) {
+    while (1) {
         str = va_arg(*ap, const char *);
-        if(!str) {
+        if (!str) {
             set_error(s, "<args>", json_error_null_value, "NULL %s", purpose);
             s->has_error = 1;
         }
 
         next_token(s);
 
-        if(token(s) == '#') {
+        if (token(s) == '#') {
             length = va_arg(*ap, int);
-        }
-        else if(token(s) == '%') {
+        } else if (token(s) == '%') {
             length = va_arg(*ap, size_t);
-        }
-        else {
+        } else {
             prev_token(s);
             length = s->has_error ? 0 : strlen(str);
         }
 
-        if(!s->has_error && strbuffer_append_bytes(&strbuff, str, length) == -1) {
+        if (!s->has_error && strbuffer_append_bytes(&strbuff, str, length) == -1) {
             set_error(s, "<internal>", json_error_out_of_memory, "Out of memory");
             s->has_error = 1;
         }
 
         next_token(s);
-        if(token(s) != '+') {
+        if (token(s) != '+') {
             prev_token(s);
             break;
         }
     }
 
-    if(s->has_error) {
+    if (s->has_error) {
         strbuffer_close(&strbuff);
         return NULL;
     }
 
-    if(!utf8_check_string(strbuff.value, strbuff.length)) {
+    if (!utf8_check_string(strbuff.value, strbuff.length)) {
         set_error(s, "<args>", json_error_invalid_utf8, "Invalid UTF-8 %s", purpose);
         strbuffer_close(&strbuff);
         s->has_error = 1;
@@ -230,19 +227,19 @@ static json_t *pack_object(scanner_t *s, va_list *ap)
     json_t *object = json_object();
     next_token(s);
 
-    while(token(s) != '}') {
+    while (token(s) != '}') {
         char *key;
         size_t len;
         int ours;
         json_t *value;
         char valueOptional;
 
-        if(!token(s)) {
+        if (!token(s)) {
             set_error(s, "<format>", json_error_invalid_format, "Unexpected end of format string");
             goto error;
         }
 
-        if(token(s) != 's') {
+        if (token(s) != 's') {
             set_error(s, "<format>", json_error_invalid_format, "Expected format 's', got '%c'", token(s));
             goto error;
         }
@@ -256,11 +253,11 @@ static json_t *pack_object(scanner_t *s, va_list *ap)
         prev_token(s);
 
         value = pack(s, ap);
-        if(!value) {
-            if(ours)
+        if (!value) {
+            if (ours)
                 jsonp_free(key);
 
-            if(valueOptional != '*') {
+            if (valueOptional != '*') {
                 set_error(s, "<args>", json_error_null_value, "NULL object value");
                 s->has_error = 1;
             }
@@ -269,21 +266,21 @@ static json_t *pack_object(scanner_t *s, va_list *ap)
             continue;
         }
 
-        if(s->has_error)
+        if (s->has_error)
             json_decref(value);
 
-        if(!s->has_error && json_object_set_new_nocheck(object, key, value)) {
+        if (!s->has_error && json_object_set_new_nocheck(object, key, value)) {
             set_error(s, "<internal>", json_error_out_of_memory, "Unable to add key \"%s\"", key);
             s->has_error = 1;
         }
 
-        if(ours)
+        if (ours)
             jsonp_free(key);
 
         next_token(s);
     }
 
-    if(!s->has_error)
+    if (!s->has_error)
         return object;
 
 error:
@@ -296,11 +293,11 @@ static json_t *pack_array(scanner_t *s, va_list *ap)
     json_t *array = json_array();
     next_token(s);
 
-    while(token(s) != ']') {
+    while (token(s) != ']') {
         json_t *value;
         char valueOptional;
 
-        if(!token(s)) {
+        if (!token(s)) {
             set_error(s, "<format>", json_error_invalid_format, "Unexpected end of format string");
             /* Format string errors are unrecoverable. */
             goto error;
@@ -311,8 +308,8 @@ static json_t *pack_array(scanner_t *s, va_list *ap)
         prev_token(s);
 
         value = pack(s, ap);
-        if(!value) {
-            if(valueOptional != '*') {
+        if (!value) {
+            if (valueOptional != '*') {
                 s->has_error = 1;
             }
 
@@ -320,10 +317,10 @@ static json_t *pack_array(scanner_t *s, va_list *ap)
             continue;
         }
 
-        if(s->has_error)
+        if (s->has_error)
             json_decref(value);
 
-        if(!s->has_error && json_array_append_new(array, value)) {
+        if (!s->has_error && json_array_append_new(array, value)) {
             set_error(s, "<internal>", json_error_out_of_memory, "Unable to append to array");
             s->has_error = 1;
         }
@@ -331,7 +328,7 @@ static json_t *pack_array(scanner_t *s, va_list *ap)
         next_token(s);
     }
 
-    if(!s->has_error)
+    if (!s->has_error)
         return array;
 
 error:
@@ -437,7 +434,7 @@ static json_t *pack_real(scanner_t *s, double value)
 
 static json_t *pack(scanner_t *s, va_list *ap)
 {
-    switch(token(s)) {
+    switch (token(s)) {
         case '{':
             return pack_object(s, ap);
 
@@ -491,81 +488,80 @@ static int unpack_object(scanner_t *s, json_t *root, va_list *ap)
     */
     hashtable_t key_set;
 
-    if(hashtable_init(&key_set)) {
+    if (hashtable_init(&key_set)) {
         set_error(s, "<internal>", json_error_out_of_memory, "Out of memory");
         return -1;
     }
 
-    if(root && !json_is_object(root)) {
+    if (root && !json_is_object(root)) {
         set_error(s, "<validation>", json_error_wrong_type, "Expected object, got %s",
                   type_name(root));
         goto out;
     }
     next_token(s);
 
-    while(token(s) != '}') {
+    while (token(s) != '}') {
         const char *key;
         json_t *value;
         int opt = 0;
 
-        if(strict != 0) {
+        if (strict != 0) {
             set_error(s, "<format>", json_error_invalid_format, "Expected '}' after '%c', got '%c'",
                       (strict == 1 ? '!' : '*'), token(s));
             goto out;
         }
 
-        if(!token(s)) {
+        if (!token(s)) {
             set_error(s, "<format>", json_error_invalid_format, "Unexpected end of format string");
             goto out;
         }
 
-        if(token(s) == '!' || token(s) == '*') {
+        if (token(s) == '!' || token(s) == '*') {
             strict = (token(s) == '!' ? 1 : -1);
             next_token(s);
             continue;
         }
 
-        if(token(s) != 's') {
+        if (token(s) != 's') {
             set_error(s, "<format>", json_error_invalid_format, "Expected format 's', got '%c'", token(s));
             goto out;
         }
 
         key = va_arg(*ap, const char *);
-        if(!key) {
+        if (!key) {
             set_error(s, "<args>", json_error_null_value, "NULL object key");
             goto out;
         }
 
         next_token(s);
 
-        if(token(s) == '?') {
+        if (token(s) == '?') {
             opt = gotopt = 1;
             next_token(s);
         }
 
-        if(!root) {
+        if (!root) {
             /* skipping */
             value = NULL;
-        }
-        else {
+        } else {
             value = json_object_get(root, key);
-            if(!value && !opt) {
+            if (!value && !opt) {
                 set_error(s, "<validation>", json_error_item_not_found, "Object item not found: %s", key);
                 goto out;
             }
         }
 
-        if(unpack(s, value, ap))
+        if (unpack(s, value, ap))
             goto out;
 
         hashtable_set(&key_set, key, json_null());
         next_token(s);
     }
 
-    if(strict == 0 && (s->flags & JSON_STRICT))
+    if (strict == 0 && (s->flags & JSON_STRICT))
         strict = 1;
 
-    if(root && strict == 1) {
+    if (root && strict == 1) {
         /* We need to check that all non optional items have been parsed */
         const char *key;
         /* keys_res is 1 for uninitialized, 0 for success, -1 for error. */
@@ -576,7 +572,7 @@ static int unpack_object(scanner_t *s, json_t *root, va_list *ap)
 
         if (gotopt || json_object_size(root) != key_set.size) {
             json_object_foreach(root, key, value) {
-                if(!hashtable_get(&key_set, key)) {
+                if (!hashtable_get(&key_set, key)) {
                     unpacked++;
 
                     /* Save unrecognized keys for the error message */
@@ -613,63 +609,62 @@ static int unpack_array(scanner_t *s, json_t *root, va_list *ap)
     size_t i = 0;
     int strict = 0;
 
-    if(root && !json_is_array(root)) {
+    if (root && !json_is_array(root)) {
         set_error(s, "<validation>", json_error_wrong_type, "Expected array, got %s", type_name(root));
         return -1;
     }
     next_token(s);
 
-    while(token(s) != ']') {
+    while (token(s) != ']') {
         json_t *value;
 
-        if(strict != 0) {
+        if (strict != 0) {
             set_error(s, "<format>", json_error_invalid_format, "Expected ']' after '%c', got '%c'",
                       (strict == 1 ? '!' : '*'),
                       token(s));
             return -1;
         }
 
-        if(!token(s)) {
+        if (!token(s)) {
             set_error(s, "<format>", json_error_invalid_format, "Unexpected end of format string");
             return -1;
         }
 
-        if(token(s) == '!' || token(s) == '*') {
+        if (token(s) == '!' || token(s) == '*') {
             strict = (token(s) == '!' ? 1 : -1);
             next_token(s);
             continue;
         }
 
-        if(!strchr(unpack_value_starters, token(s))) {
+        if (!strchr(unpack_value_starters, token(s))) {
             set_error(s, "<format>", json_error_invalid_format, "Unexpected format character '%c'",
                       token(s));
             return -1;
         }
 
-        if(!root) {
+        if (!root) {
             /* skipping */
             value = NULL;
-        }
-        else {
+        } else {
             value = json_array_get(root, i);
-            if(!value) {
+            if (!value) {
                 set_error(s, "<validation>", json_error_index_out_of_range, "Array index %lu out of range",
                           (unsigned long)i);
                 return -1;
             }
         }
 
-        if(unpack(s, value, ap))
+        if (unpack(s, value, ap))
             return -1;
 
         next_token(s);
         i++;
     }
 
-    if(strict == 0 && (s->flags & JSON_STRICT))
+    if (strict == 0 && (s->flags & JSON_STRICT))
         strict = 1;
 
-    if(root && strict == 1 && i != json_array_size(root)) {
+    if (root && strict == 1 && i != json_array_size(root)) {
         long diff = (long)json_array_size(root) - (long)i;
         set_error(s, "<validation>", json_error_end_of_input_expected, "%li array item(s) left unpacked", diff);
         return -1;
@@ -680,8 +675,7 @@ static int unpack_array(scanner_t *s, json_t *root, va_list *ap)
 
 static int unpack(scanner_t *s, json_t *root, va_list *ap)
 {
-    switch(token(s))
-    {
+    switch (token(s)) {
         case '{':
             return unpack_object(s, root, ap);
 
@@ -689,126 +683,125 @@ static int unpack(scanner_t *s, json_t *root, va_list *ap)
             return unpack_array(s, root, ap);
 
         case 's':
-            if(root && !json_is_string(root)) {
+            if (root && !json_is_string(root)) {
                 set_error(s, "<validation>", json_error_wrong_type, "Expected string, got %s",
                           type_name(root));
                 return -1;
             }
 
-            if(!(s->flags & JSON_VALIDATE_ONLY)) {
+            if (!(s->flags & JSON_VALIDATE_ONLY)) {
                 const char **str_target;
                 size_t *len_target = NULL;
 
                 str_target = va_arg(*ap, const char **);
-                if(!str_target) {
+                if (!str_target) {
                     set_error(s, "<args>", json_error_null_value, "NULL string argument");
                     return -1;
                 }
 
                 next_token(s);
 
-                if(token(s) == '%') {
+                if (token(s) == '%') {
                     len_target = va_arg(*ap, size_t *);
-                    if(!len_target) {
+                    if (!len_target) {
                         set_error(s, "<args>", json_error_null_value, "NULL string length argument");
                         return -1;
                     }
-                }
-                else
+                } else
                     prev_token(s);
 
-                if(root) {
+                if (root) {
                     *str_target = json_string_value(root);
-                    if(len_target)
+                    if (len_target)
                         *len_target = json_string_length(root);
                 }
             }
             return 0;
 
         case 'i':
-            if(root && !json_is_integer(root)) {
+            if (root && !json_is_integer(root)) {
                 set_error(s, "<validation>", json_error_wrong_type, "Expected integer, got %s",
                           type_name(root));
                 return -1;
             }
 
-            if(!(s->flags & JSON_VALIDATE_ONLY)) {
-                int *target = va_arg(*ap, int*);
-                if(root)
+            if (!(s->flags & JSON_VALIDATE_ONLY)) {
+                int *target = va_arg(*ap, int *);
+                if (root)
                     *target = (int)json_integer_value(root);
             }
 
             return 0;
 
         case 'I':
-            if(root && !json_is_integer(root)) {
+            if (root && !json_is_integer(root)) {
                 set_error(s, "<validation>", json_error_wrong_type, "Expected integer, got %s",
                           type_name(root));
                 return -1;
             }
 
-            if(!(s->flags & JSON_VALIDATE_ONLY)) {
-                json_int_t *target = va_arg(*ap, json_int_t*);
-                if(root)
+            if (!(s->flags & JSON_VALIDATE_ONLY)) {
+                json_int_t *target = va_arg(*ap, json_int_t *);
+                if (root)
                     *target = json_integer_value(root);
             }
 
             return 0;
 
         case 'b':
-            if(root && !json_is_boolean(root)) {
+            if (root && !json_is_boolean(root)) {
                 set_error(s, "<validation>", json_error_wrong_type, "Expected true or false, got %s",
                           type_name(root));
                 return -1;
             }
 
-            if(!(s->flags & JSON_VALIDATE_ONLY)) {
-                int *target = va_arg(*ap, int*);
-                if(root)
+            if (!(s->flags & JSON_VALIDATE_ONLY)) {
+                int *target = va_arg(*ap, int *);
+                if (root)
                     *target = json_is_true(root);
             }
 
             return 0;
 
         case 'f':
-            if(root && !json_is_real(root)) {
+            if (root && !json_is_real(root)) {
                 set_error(s, "<validation>", json_error_wrong_type, "Expected real, got %s",
                           type_name(root));
                 return -1;
             }
 
-            if(!(s->flags & JSON_VALIDATE_ONLY)) {
-                double *target = va_arg(*ap, double*);
-                if(root)
+            if (!(s->flags & JSON_VALIDATE_ONLY)) {
+                double *target = va_arg(*ap, double *);
+                if (root)
                     *target = json_real_value(root);
             }
 
             return 0;
 
         case 'F':
-            if(root && !json_is_number(root)) {
+            if (root && !json_is_number(root)) {
                 set_error(s, "<validation>", json_error_wrong_type, "Expected real or integer, got %s",
                           type_name(root));
                 return -1;
             }
 
-            if(!(s->flags & JSON_VALIDATE_ONLY)) {
-                double *target = va_arg(*ap, double*);
-                if(root)
+            if (!(s->flags & JSON_VALIDATE_ONLY)) {
+                double *target = va_arg(*ap, double *);
+                if (root)
                     *target = json_number_value(root);
             }
 
             return 0;
 
         case 'O':
-            if(root && !(s->flags & JSON_VALIDATE_ONLY))
+            if (root && !(s->flags & JSON_VALIDATE_ONLY))
                 json_incref(root);
-            /* Fall through */
+        /* Fall through */
 
         case 'o':
-            if(!(s->flags & JSON_VALIDATE_ONLY)) {
-                json_t **target = va_arg(*ap, json_t**);
-                if(root)
+            if (!(s->flags & JSON_VALIDATE_ONLY)) {
+                json_t **target = va_arg(*ap, json_t **);
+                if (root)
                     *target = root;
             }
 
@@ -816,7 +809,7 @@ static int unpack(scanner_t *s, json_t *root, va_list *ap)
 
         case 'n':
             /* Never assign, just validate */
-            if(root && !json_is_null(root)) {
+            if (root && !json_is_null(root)) {
                 set_error(s, "<validation>", json_error_wrong_type, "Expected null, got %s",
                           type_name(root));
                 return -1;
@@ -837,7 +830,7 @@ json_t *json_vpack_ex(json_error_t *error, size_t flags,
     va_list ap_copy;
     json_t *value;
 
-    if(!fmt || !*fmt) {
+    if (!fmt || !*fmt) {
         jsonp_error_init(error, "<format>");
         jsonp_error_set(error, -1, -1, 0, json_error_invalid_argument, "NULL or empty format string");
         return NULL;
@@ -852,11 +845,11 @@ json_t *json_vpack_ex(json_error_t *error, size_t flags,
     va_end(ap_copy);
 
     /* This will cover all situations where s.has_error is true */
-    if(!value)
+    if (!value)
         return NULL;
 
     next_token(&s);
-    if(token(&s)) {
+    if (token(&s)) {
         json_decref(value);
         set_error(&s, "<format>", json_error_invalid_format, "Garbage after format string");
         return NULL;
@@ -895,13 +888,13 @@ int json_vunpack_ex(json_t *root, json_error_t *error, size_t flags,
     scanner_t s;
     va_list ap_copy;
 
-    if(!root) {
+    if (!root) {
         jsonp_error_init(error, "<root>");
         jsonp_error_set(error, -1, -1, 0, json_error_null_value, "NULL root value");
         return -1;
     }
 
-    if(!fmt || !*fmt) {
+    if (!fmt || !*fmt) {
         jsonp_error_init(error, "<format>");
         jsonp_error_set(error, -1, -1, 0, json_error_invalid_argument, "NULL or empty format string");
         return -1;
@@ -912,14 +905,14 @@ int json_vunpack_ex(json_t *root, json_error_t *error, size_t flags,
     next_token(&s);
 
     va_copy(ap_copy, ap);
-    if(unpack(&s, root, &ap_copy)) {
+    if (unpack(&s, root, &ap_copy)) {
         va_end(ap_copy);
         return -1;
     }
     va_end(ap_copy);
 
     next_token(&s);
-    if(token(&s)) {
+    if (token(&s)) {
         set_error(&s, "<format>", json_error_invalid_format, "Garbage after format string");
         return -1;
     }
diff --git a/client/jansson/path.c b/client/jansson/path.c
index 785a3e824..466ac70ce 100644
--- a/client/jansson/path.c
+++ b/client/jansson/path.c
@@ -31,8 +31,7 @@ json_t *json_path_get(const json_t *json, const char *path)
     token = NULL;
     expect = path_delims;
 
-    while (peek && *peek && cursor)
-    {
+    while (peek && *peek && cursor) {
         char *last_peek = peek;
         peek = strpbrk(peek, expect);
         if (peek) {
@@ -72,7 +71,7 @@ fail:
 int json_path_set_new(json_t *json, const char *path, json_t *value, size_t flags, json_error_t *error)
 {
     static const char root_chr = '$', array_open = '[', object_delim = '.';
-    static const char * const path_delims = ".[", *array_close = "]";
+    static const char *const path_delims = ".[", *array_close = "]";
 
     json_t *cursor, *parent = NULL;
     char *token, *buf = NULL, *peek, delim = '\0';
@@ -98,8 +97,7 @@ int json_path_set_new(json_t *json, const char *path, json_t *value, size_t flag
     token = NULL;
     expect = path_delims;
 
-    while (peek && *peek && cursor)
-    {
+    while (peek && *peek && cursor) {
         char *last_peek = peek;
         peek = strpbrk(last_peek, expect);
 
diff --git a/client/jansson/strbuffer.c b/client/jansson/strbuffer.c
index 5e8c00395..49486926f 100644
--- a/client/jansson/strbuffer.c
+++ b/client/jansson/strbuffer.c
@@ -24,7 +24,7 @@ int strbuffer_init(strbuffer_t *strbuff)
     strbuff->length = 0;
 
     strbuff->value = jsonp_malloc(strbuff->size);
-    if(!strbuff->value)
+    if (!strbuff->value)
         return -1;
 
     /* initialize to empty */
@@ -34,7 +34,7 @@ int strbuffer_init(strbuffer_t *strbuff)
 
 void strbuffer_close(strbuffer_t *strbuff)
 {
-    if(strbuff->value)
+    if (strbuff->value)
         jsonp_free(strbuff->value);
 
     strbuff->size = 0;
@@ -67,8 +67,7 @@ int strbuffer_append_byte(strbuffer_t *strbuff, char byte)
 
 int strbuffer_append_bytes(strbuffer_t *strbuff, const char *data, size_t size)
 {
-    if(size >= strbuff->size - strbuff->length)
-    {
+    if (size >= strbuff->size - strbuff->length) {
         size_t new_size;
         char *new_value;
 
@@ -82,7 +81,7 @@ int strbuffer_append_bytes(strbuffer_t *strbuff, const char *data, size_t size)
                        strbuff->length + size + 1);
 
         new_value = jsonp_malloc(new_size);
-        if(!new_value)
+        if (!new_value)
             return -1;
 
         memcpy(new_value, strbuff->value, strbuff->length);
@@ -101,11 +100,10 @@ int strbuffer_append_bytes(strbuffer_t *strbuff, const char *data, size_t size)
 
 char strbuffer_pop(strbuffer_t *strbuff)
 {
-    if(strbuff->length > 0) {
+    if (strbuff->length > 0) {
         char c = strbuff->value[--strbuff->length];
         strbuff->value[strbuff->length] = '\0';
         return c;
-    }
-    else
+    } else
         return '\0';
 }
diff --git a/client/jansson/strconv.c b/client/jansson/strconv.c
index 8075481e3..3f9d355d8 100644
--- a/client/jansson/strconv.c
+++ b/client/jansson/strconv.c
@@ -37,13 +37,13 @@ static void to_locale(strbuffer_t *strbuffer)
     char *pos;
 
     point = localeconv()->decimal_point;
-    if(*point == '.') {
+    if (*point == '.') {
         /* No conversion needed */
         return;
     }
 
     pos = strchr(strbuffer->value, '.');
-    if(pos)
+    if (pos)
         *pos = *point;
 }
 
@@ -53,13 +53,13 @@ static void from_locale(char *buffer)
     char *pos;
 
     point = localeconv()->decimal_point;
-    if(*point == '.') {
+    if (*point == '.') {
         /* No conversion needed */
         return;
     }
 
     pos = strchr(buffer, *point);
-    if(pos)
+    if (pos)
         *pos = '.';
 }
 #endif
@@ -77,7 +77,7 @@ int jsonp_strtod(strbuffer_t *strbuffer, double *out)
     value = strtod(strbuffer->value, &end);
     assert(end == strbuffer->value + strbuffer->length);
 
-    if((value == HUGE_VAL || value == -HUGE_VAL) && errno == ERANGE) {
+    if ((value == HUGE_VAL || value == -HUGE_VAL) && errno == ERANGE) {
         /* Overflow */
         return -1;
     }
@@ -96,11 +96,11 @@ int jsonp_dtostr(char *buffer, size_t size, double value, int precision)
         precision = 17;
 
     ret = snprintf(buffer, size, "%.*g", precision, value);
-    if(ret < 0)
+    if (ret < 0)
         return -1;
 
     length = (size_t)ret;
-    if(length >= size)
+    if (length >= size)
         return -1;
 
 #if JSON_HAVE_LOCALECONV
@@ -109,10 +109,9 @@ int jsonp_dtostr(char *buffer, size_t size, double value, int precision)
 
     /* Make sure there's a dot or 'e' in the output. Otherwise
        a real is converted to an integer when decoding */
-    if(strchr(buffer, '.') == NULL &&
-       strchr(buffer, 'e') == NULL)
-    {
-        if(length + 3 >= size) {
+    if (strchr(buffer, '.') == NULL &&
+        strchr(buffer, 'e') == NULL) {
+        if (length + 3 >= size) {
             /* No space to append ".0" */
             return -1;
         }
@@ -125,17 +124,17 @@ int jsonp_dtostr(char *buffer, size_t size, double value, int precision)
     /* Remove leading '+' from positive exponent. Also remove leading
        zeros from exponents (added by some printf() implementations) */
     start = strchr(buffer, 'e');
-    if(start) {
+    if (start) {
         start++;
         end = start + 1;
 
-        if(*start == '-')
+        if (*start == '-')
             start++;
 
-        while(*end == '0')
+        while (*end == '0')
             end++;
 
-        if(end != start) {
+        if (end != start) {
             memmove(start, end, length - (size_t)(end - buffer));
             length -= (size_t)(end - start);
         }
diff --git a/client/jansson/utf.c b/client/jansson/utf.c
index be966cbd8..9f64ae6c0 100644
--- a/client/jansson/utf.c
+++ b/client/jansson/utf.c
@@ -10,35 +10,27 @@
 
 int utf8_encode(int32_t codepoint, char *buffer, size_t *size)
 {
-    if(codepoint < 0)
+    if (codepoint < 0)
         return -1;
-    else if(codepoint < 0x80)
-    {
+    else if (codepoint < 0x80) {
         buffer[0] = (char)codepoint;
         *size = 1;
-    }
-    else if(codepoint < 0x800)
-    {
+    } else if (codepoint < 0x800) {
         buffer[0] = 0xC0 + ((codepoint & 0x7C0) >> 6);
         buffer[1] = 0x80 + ((codepoint & 0x03F));
         *size = 2;
-    }
-    else if(codepoint < 0x10000)
-    {
+    } else if (codepoint < 0x10000) {
         buffer[0] = 0xE0 + ((codepoint & 0xF000) >> 12);
         buffer[1] = 0x80 + ((codepoint & 0x0FC0) >> 6);
         buffer[2] = 0x80 + ((codepoint & 0x003F));
         *size = 3;
-    }
-    else if(codepoint <= 0x10FFFF)
-    {
+    } else if (codepoint <= 0x10FFFF) {
         buffer[0] = 0xF0 + ((codepoint & 0x1C0000) >> 18);
         buffer[1] = 0x80 + ((codepoint & 0x03F000) >> 12);
         buffer[2] = 0x80 + ((codepoint & 0x000FC0) >> 6);
         buffer[3] = 0x80 + ((codepoint & 0x00003F));
         *size = 4;
-    }
-    else
+    } else
         return -1;
 
     return 0;
@@ -48,32 +40,28 @@ size_t utf8_check_first(char byte)
 {
     unsigned char u = (unsigned char)byte;
 
-    if(u < 0x80)
+    if (u < 0x80)
         return 1;
 
-    if(0x80 <= u && u <= 0xBF) {
+    if (0x80 <= u && u <= 0xBF) {
         /* second, third or fourth byte of a multi-byte
            sequence, i.e. a "continuation byte" */
         return 0;
-    }
-    else if(u == 0xC0 || u == 0xC1) {
+    } else if (u == 0xC0 || u == 0xC1) {
         /* overlong encoding of an ASCII byte */
         return 0;
-    }
-    else if(0xC2 <= u && u <= 0xDF) {
+    } else if (0xC2 <= u && u <= 0xDF) {
         /* 2-byte sequence */
         return 2;
     }
 
-    else if(0xE0 <= u && u <= 0xEF) {
+    else if (0xE0 <= u && u <= 0xEF) {
         /* 3-byte sequence */
         return 3;
-    }
-    else if(0xF0 <= u && u <= 0xF4) {
+    } else if (0xF0 <= u && u <= 0xF4) {
         /* 4-byte sequence */
         return 4;
-    }
-    else { /* u >= 0xF5 */
+    } else { /* u >= 0xF5 */
         /* Restricted (start of 4-, 5- or 6-byte sequence) or invalid
            UTF-8 */
         return 0;
@@ -86,26 +74,19 @@ size_t utf8_check_full(const char *buffer, size_t size, int32_t *codepoint)
     int32_t value = 0;
     unsigned char u = (unsigned char)buffer[0];
 
-    if(size == 2)
-    {
+    if (size == 2) {
         value = u & 0x1F;
-    }
-    else if(size == 3)
-    {
+    } else if (size == 3) {
         value = u & 0xF;
-    }
-    else if(size == 4)
-    {
+    } else if (size == 4) {
         value = u & 0x7;
-    }
-    else
+    } else
         return 0;
 
-    for(i = 1; i < size; i++)
-    {
+    for (i = 1; i < size; i++) {
         u = (unsigned char)buffer[i];
 
-        if(u < 0x80 || u > 0xBF) {
+        if (u < 0x80 || u > 0xBF) {
             /* not a continuation byte */
             return 0;
         }
@@ -113,24 +94,24 @@ size_t utf8_check_full(const char *buffer, size_t size, int32_t *codepoint)
         value = (value << 6) + (u & 0x3F);
     }
 
-    if(value > 0x10FFFF) {
+    if (value > 0x10FFFF) {
         /* not in Unicode range */
         return 0;
     }
 
-    else if(0xD800 <= value && value <= 0xDFFF) {
+    else if (0xD800 <= value && value <= 0xDFFF) {
         /* invalid code point (UTF-16 surrogate halves) */
         return 0;
     }
 
-    else if((size == 2 && value < 0x80) ||
-            (size == 3 && value < 0x800) ||
-            (size == 4 && value < 0x10000)) {
+    else if ((size == 2 && value < 0x80) ||
+             (size == 3 && value < 0x800) ||
+             (size == 4 && value < 0x10000)) {
         /* overlong encoding */
         return 0;
     }
 
-    if(codepoint)
+    if (codepoint)
         *codepoint = value;
 
     return 1;
@@ -141,22 +122,21 @@ const char *utf8_iterate(const char *buffer, size_t bufsize, int32_t *codepoint)
     size_t count;
     int32_t value;
 
-    if(!bufsize)
+    if (!bufsize)
         return buffer;
 
     count = utf8_check_first(buffer[0]);
-    if(count <= 0)
+    if (count <= 0)
         return NULL;
 
-    if(count == 1)
+    if (count == 1)
         value = (unsigned char)buffer[0];
-    else
-    {
-        if(count > bufsize || !utf8_check_full(buffer, count, &value))
+    else {
+        if (count > bufsize || !utf8_check_full(buffer, count, &value))
             return NULL;
     }
 
-    if(codepoint)
+    if (codepoint)
         *codepoint = value;
 
     return buffer + count;
@@ -166,17 +146,15 @@ int utf8_check_string(const char *string, size_t length)
 {
     size_t i;
 
-    for(i = 0; i < length; i++)
-    {
+    for (i = 0; i < length; i++) {
         size_t count = utf8_check_first(string[i]);
-        if(count == 0)
+        if (count == 0)
             return 0;
-        else if(count > 1)
-        {
-            if(count > length - i)
+        else if (count > 1) {
+            if (count > length - i)
                 return 0;
 
-            if(!utf8_check_full(&string[i], count, NULL))
+            if (!utf8_check_full(&string[i], count, NULL))
                 return 0;
 
             i += count - 1;
diff --git a/client/jansson/value.c b/client/jansson/value.c
index 3f964a041..487777f11 100644
--- a/client/jansson/value.c
+++ b/client/jansson/value.c
@@ -51,7 +51,7 @@ extern volatile uint32_t hashtable_seed;
 json_t *json_object(void)
 {
     json_object_t *object = jsonp_malloc(sizeof(json_object_t));
-    if(!object)
+    if (!object)
         return NULL;
 
     if (!hashtable_seed) {
@@ -61,8 +61,7 @@ json_t *json_object(void)
 
     json_init(&object->json, JSON_OBJECT);
 
-    if(hashtable_init(&object->hashtable))
-    {
+    if (hashtable_init(&object->hashtable)) {
         jsonp_free(object);
         return NULL;
     }
@@ -80,7 +79,7 @@ size_t json_object_size(const json_t *json)
 {
     json_object_t *object;
 
-    if(!json_is_object(json))
+    if (!json_is_object(json))
         return 0;
 
     object = json_to_object(json);
@@ -91,7 +90,7 @@ json_t *json_object_get(const json_t *json, const char *key)
 {
     json_object_t *object;
 
-    if(!key || !json_is_object(json))
+    if (!key || !json_is_object(json))
         return NULL;
 
     object = json_to_object(json);
@@ -102,18 +101,16 @@ int json_object_set_new_nocheck(json_t *json, const char *key, json_t *value)
 {
     json_object_t *object;
 
-    if(!value)
+    if (!value)
         return -1;
 
-    if(!key || !json_is_object(json) || json == value)
-    {
+    if (!key || !json_is_object(json) || json == value) {
         json_decref(value);
         return -1;
     }
     object = json_to_object(json);
 
-    if(hashtable_set(&object->hashtable, key, value))
-    {
+    if (hashtable_set(&object->hashtable, key, value)) {
         json_decref(value);
         return -1;
     }
@@ -123,8 +120,7 @@ int json_object_set_new_nocheck(json_t *json, const char *key, json_t *value)
 
 int json_object_set_new(json_t *json, const char *key, json_t *value)
 {
-    if(!key || !utf8_check_string(key, strlen(key)))
-    {
+    if (!key || !utf8_check_string(key, strlen(key))) {
         json_decref(value);
         return -1;
     }
@@ -136,7 +132,7 @@ int json_object_del(json_t *json, const char *key)
 {
     json_object_t *object;
 
-    if(!key || !json_is_object(json))
+    if (!key || !json_is_object(json))
         return -1;
 
     object = json_to_object(json);
@@ -147,7 +143,7 @@ int json_object_clear(json_t *json)
 {
     json_object_t *object;
 
-    if(!json_is_object(json))
+    if (!json_is_object(json))
         return -1;
 
     object = json_to_object(json);
@@ -161,11 +157,11 @@ int json_object_update(json_t *object, json_t *other)
     const char *key;
     json_t *value;
 
-    if(!json_is_object(object) || !json_is_object(other))
+    if (!json_is_object(object) || !json_is_object(other))
         return -1;
 
     json_object_foreach(other, key, value) {
-        if(json_object_set_nocheck(object, key, value))
+        if (json_object_set_nocheck(object, key, value))
             return -1;
     }
 
@@ -177,11 +173,11 @@ int json_object_update_existing(json_t *object, json_t *other)
     const char *key;
     json_t *value;
 
-    if(!json_is_object(object) || !json_is_object(other))
+    if (!json_is_object(object) || !json_is_object(other))
         return -1;
 
     json_object_foreach(other, key, value) {
-        if(json_object_get(object, key))
+        if (json_object_get(object, key))
             json_object_set_nocheck(object, key, value);
     }
 
@@ -193,11 +189,11 @@ int json_object_update_missing(json_t *object, json_t *other)
     const char *key;
     json_t *value;
 
-    if(!json_is_object(object) || !json_is_object(other))
+    if (!json_is_object(object) || !json_is_object(other))
         return -1;
 
     json_object_foreach(other, key, value) {
-        if(!json_object_get(object, key))
+        if (!json_object_get(object, key))
             json_object_set_nocheck(object, key, value);
     }
 
@@ -208,7 +204,7 @@ void *json_object_iter(json_t *json)
 {
     json_object_t *object;
 
-    if(!json_is_object(json))
+    if (!json_is_object(json))
         return NULL;
 
     object = json_to_object(json);
@@ -219,7 +215,7 @@ void *json_object_iter_at(json_t *json, const char *key)
 {
     json_object_t *object;
 
-    if(!key || !json_is_object(json))
+    if (!key || !json_is_object(json))
         return NULL;
 
     object = json_to_object(json);
@@ -230,7 +226,7 @@ void *json_object_iter_next(json_t *json, void *iter)
 {
     json_object_t *object;
 
-    if(!json_is_object(json) || iter == NULL)
+    if (!json_is_object(json) || iter == NULL)
         return NULL;
 
     object = json_to_object(json);
@@ -239,7 +235,7 @@ void *json_object_iter_next(json_t *json, void *iter)
 
 const char *json_object_iter_key(void *iter)
 {
-    if(!iter)
+    if (!iter)
         return NULL;
 
     return hashtable_iter_key(iter);
@@ -247,7 +243,7 @@ const char *json_object_iter_key(void *iter)
 
 json_t *json_object_iter_value(void *iter)
 {
-    if(!iter)
+    if (!iter)
         return NULL;
 
     return (json_t *)hashtable_iter_value(iter);
@@ -255,8 +251,7 @@ json_t *json_object_iter_value(void *iter)
 
 int json_object_iter_set_new(json_t *json, void *iter, json_t *value)
 {
-    if(!json_is_object(json) || !iter || !value)
-    {
+    if (!json_is_object(json) || !iter || !value) {
         json_decref(value);
         return -1;
     }
@@ -267,7 +262,7 @@ int json_object_iter_set_new(json_t *json, void *iter, json_t *value)
 
 void *json_object_key_to_iter(const char *key)
 {
-    if(!key)
+    if (!key)
         return NULL;
 
     return hashtable_key_to_iter(key);
@@ -278,13 +273,13 @@ static int json_object_equal(const json_t *object1, const json_t *object2)
     const char *key;
     const json_t *value1, *value2;
 
-    if(json_object_size(object1) != json_object_size(object2))
+    if (json_object_size(object1) != json_object_size(object2))
         return 0;
 
     json_object_foreach((json_t *)object1, key, value1) {
         value2 = json_object_get(object2, key);
 
-        if(!json_equal(value1, value2))
+        if (!json_equal(value1, value2))
             return 0;
     }
 
@@ -299,11 +294,11 @@ static json_t *json_object_copy(json_t *object)
     json_t *value;
 
     result = json_object();
-    if(!result)
+    if (!result)
         return NULL;
 
     json_object_foreach(object, key, value)
-        json_object_set_nocheck(result, key, value);
+    json_object_set_nocheck(result, key, value);
 
     return result;
 }
@@ -314,13 +309,13 @@ static json_t *json_object_deep_copy(const json_t *object)
     void *iter;
 
     result = json_object();
-    if(!result)
+    if (!result)
         return NULL;
 
     /* Cannot use json_object_foreach because object has to be cast
        non-const */
     iter = json_object_iter((json_t *)object);
-    while(iter) {
+    while (iter) {
         const char *key;
         const json_t *value;
         key = json_object_iter_key(iter);
@@ -339,7 +334,7 @@ static json_t *json_object_deep_copy(const json_t *object)
 json_t *json_array(void)
 {
     json_array_t *array = jsonp_malloc(sizeof(json_array_t));
-    if(!array)
+    if (!array)
         return NULL;
     json_init(&array->json, JSON_ARRAY);
 
@@ -347,7 +342,7 @@ json_t *json_array(void)
     array->size = 8;
 
     array->table = jsonp_malloc(array->size * sizeof(json_t *));
-    if(!array->table) {
+    if (!array->table) {
         jsonp_free(array);
         return NULL;
     }
@@ -359,7 +354,7 @@ static void json_delete_array(json_array_t *array)
 {
     size_t i;
 
-    for(i = 0; i < array->entries; i++)
+    for (i = 0; i < array->entries; i++)
         json_decref(array->table[i]);
 
     jsonp_free(array->table);
@@ -368,7 +363,7 @@ static void json_delete_array(json_array_t *array)
 
 size_t json_array_size(const json_t *json)
 {
-    if(!json_is_array(json))
+    if (!json_is_array(json))
         return 0;
 
     return json_to_array(json)->entries;
@@ -377,11 +372,11 @@ size_t json_array_size(const json_t *json)
 json_t *json_array_get(const json_t *json, size_t index)
 {
     json_array_t *array;
-    if(!json_is_array(json))
+    if (!json_is_array(json))
         return NULL;
     array = json_to_array(json);
 
-    if(index >= array->entries)
+    if (index >= array->entries)
         return NULL;
 
     return array->table[index];
@@ -391,18 +386,16 @@ int json_array_set_new(json_t *json, size_t index, json_t *value)
 {
     json_array_t *array;
 
-    if(!value)
+    if (!value)
         return -1;
 
-    if(!json_is_array(json) || json == value)
-    {
+    if (!json_is_array(json) || json == value) {
         json_decref(value);
         return -1;
     }
     array = json_to_array(json);
 
-    if(index >= array->entries)
-    {
+    if (index >= array->entries) {
         json_decref(value);
         return -1;
     }
@@ -433,20 +426,20 @@ static json_t **json_array_grow(json_array_t *array,
     size_t new_size;
     json_t **old_table, **new_table;
 
-    if(array->entries + amount <= array->size)
+    if (array->entries + amount <= array->size)
         return array->table;
 
     old_table = array->table;
 
     new_size = max(array->size + amount, array->size * 2);
     new_table = jsonp_malloc(new_size * sizeof(json_t *));
-    if(!new_table)
+    if (!new_table)
         return NULL;
 
     array->size = new_size;
     array->table = new_table;
 
-    if(copy) {
+    if (copy) {
         array_copy(array->table, 0, old_table, 0, array->entries);
         jsonp_free(old_table);
         return array->table;
@@ -459,17 +452,16 @@ int json_array_append_new(json_t *json, json_t *value)
 {
     json_array_t *array;
 
-    if(!value)
+    if (!value)
         return -1;
 
-    if(!json_is_array(json) || json == value)
-    {
+    if (!json_is_array(json) || json == value) {
         json_decref(value);
         return -1;
     }
     array = json_to_array(json);
 
-    if(!json_array_grow(array, 1, 1)) {
+    if (!json_array_grow(array, 1, 1)) {
         json_decref(value);
         return -1;
     }
@@ -485,33 +477,32 @@ int json_array_insert_new(json_t *json, size_t index, json_t *value)
     json_array_t *array;
     json_t **old_table;
 
-    if(!value)
+    if (!value)
         return -1;
 
-    if(!json_is_array(json) || json == value) {
+    if (!json_is_array(json) || json == value) {
         json_decref(value);
         return -1;
     }
     array = json_to_array(json);
 
-    if(index > array->entries) {
+    if (index > array->entries) {
         json_decref(value);
         return -1;
     }
 
     old_table = json_array_grow(array, 1, 0);
-    if(!old_table) {
+    if (!old_table) {
         json_decref(value);
         return -1;
     }
 
-    if(old_table != array->table) {
+    if (old_table != array->table) {
         array_copy(array->table, 0, old_table, 0, index);
         array_copy(array->table, index + 1, old_table, index,
                    array->entries - index);
         jsonp_free(old_table);
-    }
-    else
+    } else
         array_move(array, index + 1, index, array->entries - index);
 
     array->table[index] = value;
@@ -524,17 +515,17 @@ int json_array_remove(json_t *json, size_t index)
 {
     json_array_t *array;
 
-    if(!json_is_array(json))
+    if (!json_is_array(json))
         return -1;
     array = json_to_array(json);
 
-    if(index >= array->entries)
+    if (index >= array->entries)
         return -1;
 
     json_decref(array->table[index]);
 
     /* If we're removing the last element, nothing has to be moved */
-    if(index < array->entries - 1)
+    if (index < array->entries - 1)
         array_move(array, index, index + 1, array->entries - index - 1);
 
     array->entries--;
@@ -547,11 +538,11 @@ int json_array_clear(json_t *json)
     json_array_t *array;
     size_t i;
 
-    if(!json_is_array(json))
+    if (!json_is_array(json))
         return -1;
     array = json_to_array(json);
 
-    for(i = 0; i < array->entries; i++)
+    for (i = 0; i < array->entries; i++)
         json_decref(array->table[i]);
 
     array->entries = 0;
@@ -563,15 +554,15 @@ int json_array_extend(json_t *json, json_t *other_json)
     json_array_t *array, *other;
     size_t i;
 
-    if(!json_is_array(json) || !json_is_array(other_json))
+    if (!json_is_array(json) || !json_is_array(other_json))
         return -1;
     array = json_to_array(json);
     other = json_to_array(other_json);
 
-    if(!json_array_grow(array, other->entries, 1))
+    if (!json_array_grow(array, other->entries, 1))
         return -1;
 
-    for(i = 0; i < other->entries; i++)
+    for (i = 0; i < other->entries; i++)
         json_incref(other->table[i]);
 
     array_copy(array->table, array->entries, other->table, 0, other->entries);
@@ -585,17 +576,16 @@ static int json_array_equal(const json_t *array1, const json_t *array2)
     size_t i, size;
 
     size = json_array_size(array1);
-    if(size != json_array_size(array2))
+    if (size != json_array_size(array2))
         return 0;
 
-    for(i = 0; i < size; i++)
-    {
+    for (i = 0; i < size; i++) {
         json_t *value1, *value2;
 
         value1 = json_array_get(array1, i);
         value2 = json_array_get(array2, i);
 
-        if(!json_equal(value1, value2))
+        if (!json_equal(value1, value2))
             return 0;
     }
 
@@ -608,10 +598,10 @@ static json_t *json_array_copy(json_t *array)
     size_t i;
 
     result = json_array();
-    if(!result)
+    if (!result)
         return NULL;
 
-    for(i = 0; i < json_array_size(array); i++)
+    for (i = 0; i < json_array_size(array); i++)
         json_array_append(result, json_array_get(array, i));
 
     return result;
@@ -623,10 +613,10 @@ static json_t *json_array_deep_copy(const json_t *array)
     size_t i;
 
     result = json_array();
-    if(!result)
+    if (!result)
         return NULL;
 
-    for(i = 0; i < json_array_size(array); i++)
+    for (i = 0; i < json_array_size(array); i++)
         json_array_append_new(result, json_deep_copy(json_array_get(array, i)));
 
     return result;
@@ -639,19 +629,19 @@ static json_t *string_create(const char *value, size_t len, int own)
     char *v;
     json_string_t *string;
 
-    if(!value)
+    if (!value)
         return NULL;
 
-    if(own)
+    if (own)
         v = (char *)value;
     else {
         v = jsonp_strndup(value, len);
-        if(!v)
+        if (!v)
             return NULL;
     }
 
     string = jsonp_malloc(sizeof(json_string_t));
-    if(!string) {
+    if (!string) {
         jsonp_free(v);
         return NULL;
     }
@@ -664,7 +654,7 @@ static json_t *string_create(const char *value, size_t len, int own)
 
 json_t *json_string_nocheck(const char *value)
 {
-    if(!value)
+    if (!value)
         return NULL;
 
     return string_create(value, strlen(value), 0);
@@ -683,7 +673,7 @@ json_t *jsonp_stringn_nocheck_own(const char *value, size_t len)
 
 json_t *json_string(const char *value)
 {
-    if(!value)
+    if (!value)
         return NULL;
 
     return json_stringn(value, strlen(value));
@@ -691,7 +681,7 @@ json_t *json_string(const char *value)
 
 json_t *json_stringn(const char *value, size_t len)
 {
-    if(!value || !utf8_check_string(value, len))
+    if (!value || !utf8_check_string(value, len))
         return NULL;
 
     return json_stringn_nocheck(value, len);
@@ -699,7 +689,7 @@ json_t *json_stringn(const char *value, size_t len)
 
 const char *json_string_value(const json_t *json)
 {
-    if(!json_is_string(json))
+    if (!json_is_string(json))
         return NULL;
 
     return json_to_string(json)->value;
@@ -707,7 +697,7 @@ const char *json_string_value(const json_t *json)
 
 size_t json_string_length(const json_t *json)
 {
-    if(!json_is_string(json))
+    if (!json_is_string(json))
         return 0;
 
     return json_to_string(json)->length;
@@ -715,7 +705,7 @@ size_t json_string_length(const json_t *json)
 
 int json_string_set_nocheck(json_t *json, const char *value)
 {
-    if(!value)
+    if (!value)
         return -1;
 
     return json_string_setn_nocheck(json, value, strlen(value));
@@ -726,11 +716,11 @@ int json_string_setn_nocheck(json_t *json, const char *value, size_t len)
     char *dup;
     json_string_t *string;
 
-    if(!json_is_string(json) || !value)
+    if (!json_is_string(json) || !value)
         return -1;
 
     dup = jsonp_strndup(value, len);
-    if(!dup)
+    if (!dup)
         return -1;
 
     string = json_to_string(json);
@@ -743,7 +733,7 @@ int json_string_setn_nocheck(json_t *json, const char *value, size_t len)
 
 int json_string_set(json_t *json, const char *value)
 {
-    if(!value)
+    if (!value)
         return -1;
 
     return json_string_setn(json, value, strlen(value));
@@ -751,7 +741,7 @@ int json_string_set(json_t *json, const char *value)
 
 int json_string_setn(json_t *json, const char *value, size_t len)
 {
-    if(!value || !utf8_check_string(value, len))
+    if (!value || !utf8_check_string(value, len))
         return -1;
 
     return json_string_setn_nocheck(json, value, len);
@@ -780,7 +770,8 @@ static json_t *json_string_copy(const json_t *string)
     return json_stringn_nocheck(s->value, s->length);
 }
 
-json_t *json_vsprintf(const char *fmt, va_list ap) {
+json_t *json_vsprintf(const char *fmt, va_list ap)
+{
     json_t *json = NULL;
     int length;
     char *buf;
@@ -810,7 +801,8 @@ out:
     return json;
 }
 
-json_t *json_sprintf(const char *fmt, ...) {
+json_t *json_sprintf(const char *fmt, ...)
+{
     json_t *result;
     va_list ap;
 
@@ -827,7 +819,7 @@ json_t *json_sprintf(const char *fmt, ...) {
 json_t *json_integer(json_int_t value)
 {
     json_integer_t *integer = jsonp_malloc(sizeof(json_integer_t));
-    if(!integer)
+    if (!integer)
         return NULL;
     json_init(&integer->json, JSON_INTEGER);
 
@@ -837,7 +829,7 @@ json_t *json_integer(json_int_t value)
 
 json_int_t json_integer_value(const json_t *json)
 {
-    if(!json_is_integer(json))
+    if (!json_is_integer(json))
         return 0;
 
     return json_to_integer(json)->value;
@@ -845,7 +837,7 @@ json_int_t json_integer_value(const json_t *json)
 
 int json_integer_set(json_t *json, json_int_t value)
 {
-    if(!json_is_integer(json))
+    if (!json_is_integer(json))
         return -1;
 
     json_to_integer(json)->value = value;
@@ -875,11 +867,11 @@ json_t *json_real(double value)
 {
     json_real_t *real;
 
-    if(isnan(value) || isinf(value))
+    if (isnan(value) || isinf(value))
         return NULL;
 
     real = jsonp_malloc(sizeof(json_real_t));
-    if(!real)
+    if (!real)
         return NULL;
     json_init(&real->json, JSON_REAL);
 
@@ -889,7 +881,7 @@ json_t *json_real(double value)
 
 double json_real_value(const json_t *json)
 {
-    if(!json_is_real(json))
+    if (!json_is_real(json))
         return 0;
 
     return json_to_real(json)->value;
@@ -897,7 +889,7 @@ double json_real_value(const json_t *json)
 
 int json_real_set(json_t *json, double value)
 {
-    if(!json_is_real(json) || isnan(value) || isinf(value))
+    if (!json_is_real(json) || isnan(value) || isinf(value))
         return -1;
 
     json_to_real(json)->value = value;
@@ -925,9 +917,9 @@ static json_t *json_real_copy(const json_t *real)
 
 double json_number_value(const json_t *json)
 {
-    if(json_is_integer(json))
+    if (json_is_integer(json))
         return (double)json_integer_value(json);
-    else if(json_is_real(json))
+    else if (json_is_real(json))
         return json_real_value(json);
     else
         return 0.0;
@@ -938,21 +930,21 @@ double json_number_value(const json_t *json)
 
 json_t *json_true(void)
 {
-    static json_t the_true = {JSON_TRUE, (size_t)-1};
+    static json_t the_true = {JSON_TRUE, (size_t) -1};
     return &the_true;
 }
 
 
 json_t *json_false(void)
 {
-    static json_t the_false = {JSON_FALSE, (size_t)-1};
+    static json_t the_false = {JSON_FALSE, (size_t) -1};
     return &the_false;
 }
 
 
 json_t *json_null(void)
 {
-    static json_t the_null = {JSON_NULL, (size_t)-1};
+    static json_t the_null = {JSON_NULL, (size_t) -1};
     return &the_null;
 }
 
@@ -964,7 +956,7 @@ void json_delete(json_t *json)
     if (!json)
         return;
 
-    switch(json_typeof(json)) {
+    switch (json_typeof(json)) {
         case JSON_OBJECT:
             json_delete_object(json_to_object(json));
             break;
@@ -992,17 +984,17 @@ void json_delete(json_t *json)
 
 int json_equal(const json_t *json1, const json_t *json2)
 {
-    if(!json1 || !json2)
+    if (!json1 || !json2)
         return 0;
 
-    if(json_typeof(json1) != json_typeof(json2))
+    if (json_typeof(json1) != json_typeof(json2))
         return 0;
 
     /* this covers true, false and null as they are singletons */
-    if(json1 == json2)
+    if (json1 == json2)
         return 1;
 
-    switch(json_typeof(json1)) {
+    switch (json_typeof(json1)) {
         case JSON_OBJECT:
             return json_object_equal(json1, json2);
         case JSON_ARRAY:
@@ -1023,10 +1015,10 @@ int json_equal(const json_t *json1, const json_t *json2)
 
 json_t *json_copy(json_t *json)
 {
-    if(!json)
+    if (!json)
         return NULL;
 
-    switch(json_typeof(json)) {
+    switch (json_typeof(json)) {
         case JSON_OBJECT:
             return json_object_copy(json);
         case JSON_ARRAY:
@@ -1048,16 +1040,16 @@ json_t *json_copy(json_t *json)
 
 json_t *json_deep_copy(const json_t *json)
 {
-    if(!json)
+    if (!json)
         return NULL;
 
-    switch(json_typeof(json)) {
+    switch (json_typeof(json)) {
         case JSON_OBJECT:
             return json_object_deep_copy(json);
         case JSON_ARRAY:
             return json_array_deep_copy(json);
-            /* for the rest of the types, deep copying doesn't differ from
-               shallow copying */
+        /* for the rest of the types, deep copying doesn't differ from
+           shallow copying */
         case JSON_STRING:
             return json_string_copy(json);
         case JSON_INTEGER:
diff --git a/client/loclass/cipher.c b/client/loclass/cipher.c
index ff7b08cf0..159208beb 100644
--- a/client/loclass/cipher.c
+++ b/client/loclass/cipher.c
@@ -114,8 +114,8 @@ uint8_t _select(bool x, bool y, uint8_t r)
     bool r7 = r & 0x1;
 
     bool z0 = (r0 & r2) ^ (r1 & !r3) ^ (r2 | r4);
-    bool z1 = (r0 | r2) ^ ( r5 | r7) ^ r1 ^ r6 ^ x ^ y;
-    bool z2 = (r3 & !r5) ^ (r4 & r6 ) ^ r7 ^ x;
+    bool z1 = (r0 | r2) ^ (r5 | r7) ^ r1 ^ r6 ^ x ^ y;
+    bool z2 = (r3 & !r5) ^ (r4 & r6) ^ r7 ^ x;
 
     // The three bitz z0.. z1 are packed into a uint8_t:
     // 00000ZZZ
@@ -139,13 +139,13 @@ uint8_t _select(bool x, bool y, uint8_t r)
 * @param s - state
 * @param k - array containing 8 bytes
 **/
-State successor(uint8_t* k, State s, bool y)
+State successor(uint8_t *k, State s, bool y)
 {
     bool r0 = s.r >> 7 & 0x1;
     bool r4 = s.r >> 3 & 0x1;
     bool r7 = s.r & 0x1;
 
-    State successor = {0,0,0,0};
+    State successor = {0, 0, 0, 0};
 
     successor.t = s.t >> 1;
     successor.t |= (T(s) ^ r0 ^ r4) << 15;
@@ -155,8 +155,8 @@ State successor(uint8_t* k, State s, bool y)
 
     bool Tt = T(s);
 
-    successor.l = ((k[_select(Tt,y,s.r)] ^ successor.b) + s.l+s.r ) & 0xFF;
-    successor.r = ((k[_select(Tt,y,s.r)] ^ successor.b) + s.l ) & 0xFF;
+    successor.l = ((k[_select(Tt, y, s.r)] ^ successor.b) + s.l + s.r) & 0xFF;
+    successor.r = ((k[_select(Tt, y, s.r)] ^ successor.b) + s.l) & 0xFF;
 
     return successor;
 }
@@ -166,14 +166,13 @@ State successor(uint8_t* k, State s, bool y)
 *  to multiple bit input x ∈ F n 2 which we define as
 * @param k - array containing 8 bytes
 **/
-State suc(uint8_t* k,State s, BitstreamIn *bitstream)
+State suc(uint8_t *k, State s, BitstreamIn *bitstream)
 {
-    if(bitsLeft(bitstream) == 0)
-    {
+    if (bitsLeft(bitstream) == 0) {
         return s;
     }
     bool lastbit = tailBit(bitstream);
-    return successor(k,suc(k,s,bitstream), lastbit);
+    return successor(k, suc(k, s, bitstream), lastbit);
 }
 
 /**
@@ -184,17 +183,16 @@ State suc(uint8_t* k,State s, BitstreamIn *bitstream)
 *  output(k, s, x 0 . . . x n ) = output(s) · output(k, s ′ , x 1 . . . x n )
 *  where s ′ = suc(k, s, x 0 ).
 **/
-void output(uint8_t* k,State s, BitstreamIn* in,  BitstreamOut* out)
+void output(uint8_t *k, State s, BitstreamIn *in,  BitstreamOut *out)
 {
-    if(bitsLeft(in) == 0)
-    {
+    if (bitsLeft(in) == 0) {
         return;
     }
-    pushBit(out,(s.r >> 2) & 1);
+    pushBit(out, (s.r >> 2) & 1);
     //Remove first bit
     uint8_t x0 = headBit(in);
-    State ss = successor(k,s,x0);
-    output(k,ss,in, out);
+    State ss = successor(k, s, x0);
+    output(k, ss, in, out);
 }
 
 /**
@@ -202,22 +200,22 @@ void output(uint8_t* k,State s, BitstreamIn* in,  BitstreamOut* out)
 * key k ∈ (F 82 ) 8 and outputs the initial cipher state s =< l, r, t, b >
 **/
 
-State init(uint8_t* k)
+State init(uint8_t *k)
 {
     State s = {
-    ((k[0] ^ 0x4c) + 0xEC) & 0xFF,// l
-    ((k[0] ^ 0x4c) + 0x21) & 0xFF,// r
-    0x4c, // b
-    0xE012 // t
+        ((k[0] ^ 0x4c) + 0xEC) & 0xFF,// l
+        ((k[0] ^ 0x4c) + 0x21) & 0xFF,// r
+        0x4c, // b
+        0xE012 // t
     };
     return s;
 }
-void MAC(uint8_t* k, BitstreamIn input, BitstreamOut out)
+void MAC(uint8_t *k, BitstreamIn input, BitstreamOut out)
 {
-    uint8_t zeroes_32[] = {0,0,0,0};
-    BitstreamIn input_32_zeroes = {zeroes_32,sizeof(zeroes_32)*8,0};
-    State initState = suc(k,init(k),&input);
-    output(k,initState,&input_32_zeroes,&out);
+    uint8_t zeroes_32[] = {0, 0, 0, 0};
+    BitstreamIn input_32_zeroes = {zeroes_32, sizeof(zeroes_32) * 8, 0};
+    State initState = suc(k, init(k), &input);
+    output(k, initState, &input_32_zeroes, &out);
 }
 
 void doMAC(uint8_t *cc_nr_p, uint8_t *div_key_p, uint8_t mac[4])
@@ -231,9 +229,9 @@ void doMAC(uint8_t *cc_nr_p, uint8_t *div_key_p, uint8_t mac[4])
 
     reverse_arraybytes(cc_nr, 12);
     BitstreamIn bitstream = {cc_nr, 12 * 8, 0};
-    uint8_t dest []= {0,0,0,0,0,0,0,0};
-    BitstreamOut out = { dest, sizeof(dest)*8, 0 };
-    MAC(div_key,bitstream, out);
+    uint8_t dest [] = {0, 0, 0, 0, 0, 0, 0, 0};
+    BitstreamOut out = { dest, sizeof(dest) * 8, 0 };
+    MAC(div_key, bitstream, out);
     //The output MAC must also be reversed
     reverse_arraybytes(dest, sizeof(dest));
     memcpy(mac, dest, 4);
@@ -244,15 +242,15 @@ void doMAC_N(uint8_t *address_data_p, uint8_t address_data_size, uint8_t *div_ke
 {
     uint8_t *address_data;
     uint8_t div_key[8];
-    address_data = (uint8_t*) calloc(address_data_size, sizeof(uint8_t));
+    address_data = (uint8_t *) calloc(address_data_size, sizeof(uint8_t));
 
     memcpy(address_data, address_data_p, address_data_size);
     memcpy(div_key, div_key_p, 8);
 
     reverse_arraybytes(address_data, address_data_size);
     BitstreamIn bitstream = {address_data, address_data_size * 8, 0};
-    uint8_t dest []= {0,0,0,0,0,0,0,0};
-    BitstreamOut out = { dest, sizeof(dest)*8, 0 };
+    uint8_t dest [] = {0, 0, 0, 0, 0, 0, 0, 0};
+    BitstreamOut out = { dest, sizeof(dest) * 8, 0 };
     MAC(div_key, bitstream, out);
     //The output MAC must also be reversed
     reverse_arraybytes(dest, sizeof(dest));
@@ -267,15 +265,15 @@ int testMAC()
     PrintAndLogDevice(SUCCESS, "Testing MAC calculation...");
 
     //From the "dismantling.IClass" paper:
-    uint8_t cc_nr[] = {0xFE,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0,0,0,0};
+    uint8_t cc_nr[] = {0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0, 0, 0, 0};
     //From the paper
-    uint8_t div_key[8] = {0xE0,0x33,0xCA,0x41,0x9A,0xEE,0x43,0xF9};
-    uint8_t correct_MAC[4] = {0x1d,0x49,0xC9,0xDA};
+    uint8_t div_key[8] = {0xE0, 0x33, 0xCA, 0x41, 0x9A, 0xEE, 0x43, 0xF9};
+    uint8_t correct_MAC[4] = {0x1d, 0x49, 0xC9, 0xDA};
 
     uint8_t calculated_mac[4] = {0};
-    doMAC(cc_nr,div_key, calculated_mac);
+    doMAC(cc_nr, div_key, calculated_mac);
 
-    if (memcmp(calculated_mac, correct_MAC,4) == 0) {
+    if (memcmp(calculated_mac, correct_MAC, 4) == 0) {
         PrintAndLogDevice(SUCCESS, "MAC calculation OK!");
     } else {
         PrintAndLogDevice(FAILED, "FAILED: MAC calculation failed:");
diff --git a/client/loclass/cipher.h b/client/loclass/cipher.h
index c6d2f0320..ddf5fecf7 100644
--- a/client/loclass/cipher.h
+++ b/client/loclass/cipher.h
@@ -41,7 +41,7 @@
 #include <stdint.h>
 
 void doMAC(uint8_t *cc_nr_p, uint8_t *div_key_p, uint8_t mac[4]);
-void doMAC_N(uint8_t *address_data_p,uint8_t address_data_size, uint8_t *div_key_p, uint8_t mac[4]);
+void doMAC_N(uint8_t *address_data_p, uint8_t address_data_size, uint8_t *div_key_p, uint8_t mac[4]);
 
 #ifndef ON_DEVICE
 int testMAC();
diff --git a/client/loclass/cipherutils.c b/client/loclass/cipherutils.c
index e3ed1cdbc..4f015251c 100644
--- a/client/loclass/cipherutils.c
+++ b/client/loclass/cipherutils.c
@@ -46,35 +46,35 @@
  * @param stream
  * @return
  */
-bool headBit( BitstreamIn *stream)
+bool headBit(BitstreamIn *stream)
 {
     int bytepos = stream->position >> 3; // divide by 8
     int bitpos = (stream->position++) & 7; // mask out 00000111
-    return (*(stream->buffer + bytepos) >> (7-bitpos)) & 1;
+    return (*(stream->buffer + bytepos) >> (7 - bitpos)) & 1;
 }
 /**
  * @brief Return and remove the last bit (xn) in the stream: <x0 x1 x2 ... xn>
  * @param stream
  * @return
  */
-bool tailBit( BitstreamIn *stream)
+bool tailBit(BitstreamIn *stream)
 {
-    int bitpos = stream->numbits -1 - (stream->position++);
+    int bitpos = stream->numbits - 1 - (stream->position++);
 
-    int bytepos= bitpos >> 3;
+    int bytepos = bitpos >> 3;
     bitpos &= 7;
-    return (*(stream->buffer + bytepos) >> (7-bitpos)) & 1;
+    return (*(stream->buffer + bytepos) >> (7 - bitpos)) & 1;
 }
 /**
  * @brief Pushes bit onto the stream
  * @param stream
  * @param bit
  */
-void pushBit( BitstreamOut* stream, bool bit)
+void pushBit(BitstreamOut *stream, bool bit)
 {
     int bytepos = stream->position >> 3; // divide by 8
     int bitpos = stream->position & 7;
-    *(stream->buffer+bytepos) |= (bit & 1) <<  (7 - bitpos);
+    *(stream->buffer + bytepos) |= (bit & 1) << (7 - bitpos);
     stream->position++;
     stream->numbits++;
 }
@@ -85,7 +85,7 @@ void pushBit( BitstreamOut* stream, bool bit)
  * @param stream
  * @param bits
  */
-void push6bits( BitstreamOut* stream, uint8_t bits)
+void push6bits(BitstreamOut *stream, uint8_t bits)
 {
     pushBit(stream, bits & 0x20);
     pushBit(stream, bits & 0x10);
@@ -100,7 +100,7 @@ void push6bits( BitstreamOut* stream, uint8_t bits)
  * @param stream
  * @return number of bits left in stream
  */
-int bitsLeft( BitstreamIn *stream)
+int bitsLeft(BitstreamIn *stream)
 {
     return stream->numbits - stream->position;
 }
@@ -114,7 +114,7 @@ int numBits(BitstreamOut *stream)
     return stream->numbits;
 }
 
-void x_num_to_bytes(uint64_t n, size_t len, uint8_t* dest)
+void x_num_to_bytes(uint64_t n, size_t len, uint8_t *dest)
 {
     while (len--) {
         dest[len] = (uint8_t) n;
@@ -122,74 +122,75 @@ void x_num_to_bytes(uint64_t n, size_t len, uint8_t* dest)
     }
 }
 
-uint64_t x_bytes_to_num(uint8_t* src, size_t len)
+uint64_t x_bytes_to_num(uint8_t *src, size_t len)
 {
     uint64_t num = 0;
-    while (len--)
-    {
+    while (len--) {
         num = (num << 8) | (*src);
         src++;
     }
     return num;
 }
-uint8_t reversebytes(uint8_t b) {
+uint8_t reversebytes(uint8_t b)
+{
     b = (b & 0xF0) >> 4 | (b & 0x0F) << 4;
     b = (b & 0xCC) >> 2 | (b & 0x33) << 2;
     b = (b & 0xAA) >> 1 | (b & 0x55) << 1;
-   return b;
+    return b;
 }
-void reverse_arraybytes(uint8_t* arr, size_t len)
+void reverse_arraybytes(uint8_t *arr, size_t len)
 {
     uint8_t i;
-    for( i =0; i< len ; i++)
-    {
+    for (i = 0; i < len ; i++) {
         arr[i] = reversebytes(arr[i]);
     }
 }
-void reverse_arraycopy(uint8_t* arr, uint8_t* dest, size_t len)
+void reverse_arraycopy(uint8_t *arr, uint8_t *dest, size_t len)
 {
     uint8_t i;
-    for( i =0; i< len ; i++)
-    {
+    for (i = 0; i < len ; i++) {
         dest[i] = reversebytes(arr[i]);
     }
 }
 
-void printarr(char * name, uint8_t* arr, int len) {
+void printarr(char *name, uint8_t *arr, int len)
+{
     int cx, i;
-    size_t outsize = 40 + strlen(name) + len*5;
-    char* output = calloc(outsize, sizeof(char));
-    cx = snprintf(output,outsize, "uint8_t %s[] = {", name);
-    for (i=0; i < len; i++) {
-        cx += snprintf(output+cx,outsize-cx,"0x%02x,",*(arr+i));//5 bytes per byte
+    size_t outsize = 40 + strlen(name) + len * 5;
+    char *output = calloc(outsize, sizeof(char));
+    cx = snprintf(output, outsize, "uint8_t %s[] = {", name);
+    for (i = 0; i < len; i++) {
+        cx += snprintf(output + cx, outsize - cx, "0x%02x,", *(arr + i)); //5 bytes per byte
     }
-    cx += snprintf(output+cx,outsize-cx,"};");
+    cx += snprintf(output + cx, outsize - cx, "};");
     PrintAndLogDevice(NORMAL, output);
     free(output);
 }
 
-void printvar(char * name, uint8_t* arr, int len) {
+void printvar(char *name, uint8_t *arr, int len)
+{
     int cx, i;
-    size_t outsize = 40 + strlen(name) + len*2;
-    char* output = calloc(outsize, sizeof(char));
-    cx = snprintf(output,outsize,"%s = ", name);
-    for (i=0; i < len; i++) {
-        cx += snprintf(output+cx,outsize-cx,"%02x",*(arr+i));//2 bytes per byte
+    size_t outsize = 40 + strlen(name) + len * 2;
+    char *output = calloc(outsize, sizeof(char));
+    cx = snprintf(output, outsize, "%s = ", name);
+    for (i = 0; i < len; i++) {
+        cx += snprintf(output + cx, outsize - cx, "%02x", *(arr + i)); //2 bytes per byte
     }
 
     PrintAndLogDevice(NORMAL, output);
     free(output);
 }
 
-void printarr_human_readable(char * title, uint8_t* arr, int len) {
+void printarr_human_readable(char *title, uint8_t *arr, int len)
+{
     int cx, i;
-    size_t outsize = 100 + strlen(title) + len*4;
-    char* output = calloc(outsize, sizeof(char));
-    cx = snprintf(output,outsize,  "\n\t%s\n", title);
-    for (i=0;  i < len; i++) {
+    size_t outsize = 100 + strlen(title) + len * 4;
+    char *output = calloc(outsize, sizeof(char));
+    cx = snprintf(output, outsize,  "\n\t%s\n", title);
+    for (i = 0;  i < len; i++) {
         if (i % 16 == 0)
-            cx += snprintf(output+cx,outsize-cx,"\n%02x| ", i );
-        cx += snprintf(output+cx,outsize-cx, "%02x ",*(arr+i));
+            cx += snprintf(output + cx, outsize - cx, "\n%02x| ", i);
+        cx += snprintf(output + cx, outsize - cx, "%02x ", *(arr + i));
     }
     PrintAndLogDevice(NORMAL, output);
     free(output);
@@ -202,24 +203,23 @@ void printarr_human_readable(char * title, uint8_t* arr, int len) {
 #ifndef ON_DEVICE
 int testBitStream()
 {
-    uint8_t input [] = {0xDE,0xAD,0xBE,0xEF,0xDE,0xAD,0xBE,0xEF};
-    uint8_t output [] = {0,0,0,0,0,0,0,0};
-    BitstreamIn in = { input, sizeof(input) * 8,0};
-    BitstreamOut out = { output, 0,0}
-                      ;
+    uint8_t input [] = {0xDE, 0xAD, 0xBE, 0xEF, 0xDE, 0xAD, 0xBE, 0xEF};
+    uint8_t output [] = {0, 0, 0, 0, 0, 0, 0, 0};
+    BitstreamIn in = { input, sizeof(input) * 8, 0};
+    BitstreamOut out = { output, 0, 0}
+                       ;
     while (bitsLeft(&in) > 0) {
         pushBit(&out, headBit(&in));
         //printf("Bits left: %d\n", bitsLeft(&in));
         //printf("Bits out: %d\n", numBits(&out));
     }
 
-    if(memcmp(input, output, sizeof(input)) == 0) {
+    if (memcmp(input, output, sizeof(input)) == 0) {
         PrintAndLogDevice(SUCCESS, "    Bitstream test 1 ok");
     } else {
         PrintAndLogDevice(FAILED, "    Bitstream test 1 failed");
         uint8_t i;
-        for(i = 0 ; i < sizeof(input) ; i++)
-        {
+        for (i = 0 ; i < sizeof(input) ; i++) {
             PrintAndLogDevice(NORMAL, "    IN %02x, OUT %02x", input[i], output[i]);
         }
         return 1;
@@ -229,13 +229,13 @@ int testBitStream()
 
 int testReversedBitstream()
 {
-    uint8_t input [] = {0xDE,0xAD,0xBE,0xEF,0xDE,0xAD,0xBE,0xEF};
-    uint8_t reverse [] = {0,0,0,0,0,0,0,0};
-    uint8_t output [] = {0,0,0,0,0,0,0,0};
-    BitstreamIn in = { input, sizeof(input) * 8,0};
-    BitstreamOut out = { output, 0,0};
-    BitstreamIn reversed_in = { reverse, sizeof(input)*8,0};
-    BitstreamOut reversed_out = { reverse,0 ,0};
+    uint8_t input [] = {0xDE, 0xAD, 0xBE, 0xEF, 0xDE, 0xAD, 0xBE, 0xEF};
+    uint8_t reverse [] = {0, 0, 0, 0, 0, 0, 0, 0};
+    uint8_t output [] = {0, 0, 0, 0, 0, 0, 0, 0};
+    BitstreamIn in = { input, sizeof(input) * 8, 0};
+    BitstreamOut out = { output, 0, 0};
+    BitstreamIn reversed_in = { reverse, sizeof(input) * 8, 0};
+    BitstreamOut reversed_out = { reverse, 0, 0};
 
     while (bitsLeft(&in) > 0) {
         pushBit(&reversed_out, tailBit(&in));
@@ -251,7 +251,7 @@ int testReversedBitstream()
         PrintAndLogDevice(FAILED, "    Bitstream test 2 failed");
         uint8_t i;
         for (i = 0 ; i < sizeof(input) ; i++) {
-            PrintAndLogDevice(NORMAL, "    IN %02x, MIDDLE: %02x, OUT %02x", input[i],reverse[i], output[i]);
+            PrintAndLogDevice(NORMAL, "    IN %02x, MIDDLE: %02x, OUT %02x", input[i], reverse[i], output[i]);
         }
         return 1;
     }
diff --git a/client/loclass/cipherutils.h b/client/loclass/cipherutils.h
index 87a797d1a..62afd6729 100644
--- a/client/loclass/cipherutils.h
+++ b/client/loclass/cipherutils.h
@@ -43,33 +43,33 @@
 #include <stdlib.h>
 
 typedef struct {
-    uint8_t * buffer;
+    uint8_t *buffer;
     uint8_t numbits;
     uint8_t position;
 } BitstreamIn;
 
 typedef struct {
-    uint8_t * buffer;
+    uint8_t *buffer;
     uint8_t numbits;
     uint8_t position;
 } BitstreamOut;
 
-bool headBit( BitstreamIn *stream);
-bool tailBit( BitstreamIn *stream);
-void pushBit( BitstreamOut *stream, bool bit);
-int bitsLeft( BitstreamIn *stream);
+bool headBit(BitstreamIn *stream);
+bool tailBit(BitstreamIn *stream);
+void pushBit(BitstreamOut *stream, bool bit);
+int bitsLeft(BitstreamIn *stream);
 #ifndef ON_DEVICE
 int testCipherUtils(void);
 int testMAC();
 #endif
-void push6bits( BitstreamOut* stream, uint8_t bits);
+void push6bits(BitstreamOut *stream, uint8_t bits);
 void EncryptDES(bool key[56], bool outBlk[64], bool inBlk[64], int verbose) ;
-void x_num_to_bytes(uint64_t n, size_t len, uint8_t* dest);
-uint64_t x_bytes_to_num(uint8_t* src, size_t len);
+void x_num_to_bytes(uint64_t n, size_t len, uint8_t *dest);
+uint64_t x_bytes_to_num(uint8_t *src, size_t len);
 uint8_t reversebytes(uint8_t b);
-void reverse_arraybytes(uint8_t* arr, size_t len);
-void reverse_arraycopy(uint8_t* arr, uint8_t* dest, size_t len);
-void printarr(char * name, uint8_t* arr, int len);
-void printvar(char * name, uint8_t* arr, int len);
-void printarr_human_readable(char * title, uint8_t* arr, int len);
+void reverse_arraybytes(uint8_t *arr, size_t len);
+void reverse_arraycopy(uint8_t *arr, uint8_t *dest, size_t len);
+void printarr(char *name, uint8_t *arr, int len);
+void printvar(char *name, uint8_t *arr, int len);
+void printarr_human_readable(char *title, uint8_t *arr, int len);
 #endif // CIPHERUTILS_H
diff --git a/client/loclass/elite_crack.c b/client/loclass/elite_crack.c
index b4726fc71..14e80eb65 100644
--- a/client/loclass/elite_crack.c
+++ b/client/loclass/elite_crack.c
@@ -69,17 +69,18 @@
  * @param key
  * @param dest
  */
-void permutekey(uint8_t key[8], uint8_t dest[8]) {
+void permutekey(uint8_t key[8], uint8_t dest[8])
+{
     int i;
-    for(i = 0 ; i < 8 ; i++) {
-        dest[i] =   (((key[7] & (0x80 >> i)) >> (7-i)) << 7) |
-                    (((key[6] & (0x80 >> i)) >> (7-i)) << 6) |
-                    (((key[5] & (0x80 >> i)) >> (7-i)) << 5) |
-                    (((key[4] & (0x80 >> i)) >> (7-i)) << 4) |
-                    (((key[3] & (0x80 >> i)) >> (7-i)) << 3) |
-                    (((key[2] & (0x80 >> i)) >> (7-i)) << 2) |
-                    (((key[1] & (0x80 >> i)) >> (7-i)) << 1) |
-                    (((key[0] & (0x80 >> i)) >> (7-i)) << 0);
+    for (i = 0 ; i < 8 ; i++) {
+        dest[i] = (((key[7] & (0x80 >> i)) >> (7 - i)) << 7) |
+                  (((key[6] & (0x80 >> i)) >> (7 - i)) << 6) |
+                  (((key[5] & (0x80 >> i)) >> (7 - i)) << 5) |
+                  (((key[4] & (0x80 >> i)) >> (7 - i)) << 4) |
+                  (((key[3] & (0x80 >> i)) >> (7 - i)) << 3) |
+                  (((key[2] & (0x80 >> i)) >> (7 - i)) << 2) |
+                  (((key[1] & (0x80 >> i)) >> (7 - i)) << 1) |
+                  (((key[0] & (0x80 >> i)) >> (7 - i)) << 0);
     }
 }
 /**
@@ -88,17 +89,18 @@ void permutekey(uint8_t key[8], uint8_t dest[8]) {
  * @param key
  * @param dest
  */
-void permutekey_rev(uint8_t key[8], uint8_t dest[8]) {
+void permutekey_rev(uint8_t key[8], uint8_t dest[8])
+{
     int i;
-    for(i = 0 ; i < 8 ; i++) {
-        dest[7-i] = (((key[0] & (0x80 >> i)) >> (7-i)) << 7) |
-                    (((key[1] & (0x80 >> i)) >> (7-i)) << 6) |
-                    (((key[2] & (0x80 >> i)) >> (7-i)) << 5) |
-                    (((key[3] & (0x80 >> i)) >> (7-i)) << 4) |
-                    (((key[4] & (0x80 >> i)) >> (7-i)) << 3) |
-                    (((key[5] & (0x80 >> i)) >> (7-i)) << 2) |
-                    (((key[6] & (0x80 >> i)) >> (7-i)) << 1) |
-                    (((key[7] & (0x80 >> i)) >> (7-i)) << 0);
+    for (i = 0 ; i < 8 ; i++) {
+        dest[7 - i] = (((key[0] & (0x80 >> i)) >> (7 - i)) << 7) |
+                      (((key[1] & (0x80 >> i)) >> (7 - i)) << 6) |
+                      (((key[2] & (0x80 >> i)) >> (7 - i)) << 5) |
+                      (((key[3] & (0x80 >> i)) >> (7 - i)) << 4) |
+                      (((key[4] & (0x80 >> i)) >> (7 - i)) << 3) |
+                      (((key[5] & (0x80 >> i)) >> (7 - i)) << 2) |
+                      (((key[6] & (0x80 >> i)) >> (7 - i)) << 1) |
+                      (((key[7] & (0x80 >> i)) >> (7 - i)) << 0);
     }
 }
 
@@ -108,8 +110,9 @@ void permutekey_rev(uint8_t key[8], uint8_t dest[8]) {
  * @param val
  * @return
  */
-inline uint8_t rr(uint8_t val) {
-    return val >> 1 | (( val & 1) << 7);
+inline uint8_t rr(uint8_t val)
+{
+    return val >> 1 | ((val & 1) << 7);
 }
 
 /**
@@ -118,8 +121,9 @@ inline uint8_t rr(uint8_t val) {
  * @param val
  * @return
  */
-inline uint8_t rl(uint8_t val) {
-  return val << 1 | (( val & 0x80) >> 7);
+inline uint8_t rl(uint8_t val)
+{
+    return val << 1 | ((val & 0x80) >> 7);
 }
 
 /**
@@ -128,8 +132,9 @@ inline uint8_t rl(uint8_t val) {
  * @param val
  * @return
  */
-inline uint8_t swap(uint8_t val) {
-    return ((val >> 4) & 0xFF) | ((val &0xFF) << 4);
+inline uint8_t swap(uint8_t val)
+{
+    return ((val >> 4) & 0xFF) | ((val & 0xFF) << 4);
 }
 
 /**
@@ -138,15 +143,16 @@ inline uint8_t swap(uint8_t val) {
  * @param csn the CSN used
  * @param k output
  */
-void hash1(uint8_t csn[] , uint8_t k[]) {
+void hash1(uint8_t csn[], uint8_t k[])
+{
     k[0] = csn[0] ^ csn[1] ^ csn[2] ^ csn[3] ^ csn[4] ^ csn[5] ^ csn[6] ^ csn[7];
     k[1] = csn[0] + csn[1] + csn[2] + csn[3] + csn[4] + csn[5] + csn[6] + csn[7];
-    k[2] = rr(swap( csn[2] + k[1] ));
-    k[3] = rl(swap( csn[3] + k[0] ));
-    k[4] = ~rr( csn[4] + k[2] ) + 1;
-    k[5] = ~rl( csn[5] + k[3] ) + 1;
-    k[6] = rr( csn[6] + (k[4] ^ 0x3c) );
-    k[7] = rl( csn[7] + (k[5] ^ 0xc3) );
+    k[2] = rr(swap(csn[2] + k[1]));
+    k[3] = rl(swap(csn[3] + k[0]));
+    k[4] = ~rr(csn[4] + k[2]) + 1;
+    k[5] = ~rl(csn[5] + k[3]) + 1;
+    k[6] = rr(csn[6] + (k[4] ^ 0x3c));
+    k[7] = rl(csn[7] + (k[5] ^ 0xc3));
 
     k[7] &= 0x7F;
     k[6] &= 0x7F;
@@ -162,11 +168,12 @@ Definition 14. Define the rotate key function rk : (F 82 ) 8 × N → (F 82 ) 8
 rk(x [0] . . . x [7] , 0) = x [0] . . . x [7]
 rk(x [0] . . . x [7] , n + 1) = rk(rl(x [0] ) . . . rl(x [7] ), n)
 **/
-void rk(uint8_t *key, uint8_t n, uint8_t *outp_key) {
+void rk(uint8_t *key, uint8_t n, uint8_t *outp_key)
+{
     memcpy(outp_key, key, 8);
     uint8_t j;
     while (n-- > 0) {
-        for (j=0; j < 8 ; j++)
+        for (j = 0; j < 8 ; j++)
             outp_key[j] = rl(outp_key[j]);
     }
     return;
@@ -175,18 +182,20 @@ void rk(uint8_t *key, uint8_t n, uint8_t *outp_key) {
 static mbedtls_des_context ctx_enc;
 static mbedtls_des_context ctx_dec;
 
-void desdecrypt_iclass(uint8_t *iclass_key, uint8_t *input, uint8_t *output) {
+void desdecrypt_iclass(uint8_t *iclass_key, uint8_t *input, uint8_t *output)
+{
     uint8_t key_std_format[8] = {0};
     permutekey_rev(iclass_key, key_std_format);
-    mbedtls_des_setkey_dec( &ctx_dec, key_std_format);
-    mbedtls_des_crypt_ecb(&ctx_dec,input,output);
+    mbedtls_des_setkey_dec(&ctx_dec, key_std_format);
+    mbedtls_des_crypt_ecb(&ctx_dec, input, output);
 }
 
-void desencrypt_iclass(uint8_t *iclass_key, uint8_t *input, uint8_t *output) {
+void desencrypt_iclass(uint8_t *iclass_key, uint8_t *input, uint8_t *output)
+{
     uint8_t key_std_format[8] = {0};
     permutekey_rev(iclass_key, key_std_format);
-    mbedtls_des_setkey_enc( &ctx_enc, key_std_format);
-    mbedtls_des_crypt_ecb(&ctx_enc,input,output);
+    mbedtls_des_setkey_enc(&ctx_enc, key_std_format);
+    mbedtls_des_crypt_ecb(&ctx_enc, input, output);
 }
 
 /**
@@ -195,28 +204,29 @@ void desencrypt_iclass(uint8_t *iclass_key, uint8_t *input, uint8_t *output) {
  * @param hash1 hash1
  * @param key_sel output key_sel=h[hash1[i]]
  */
-void hash2(uint8_t *key64, uint8_t *outp_keytable) {
+void hash2(uint8_t *key64, uint8_t *outp_keytable)
+{
     /**
      *Expected:
      * High Security Key Table
 
-00  F1 35 59 A1 0D 5A 26 7F 18 60 0B 96 8A C0 25 C1
-10  BF A1 3B B0 FF 85 28 75 F2 1F C6 8F 0E 74 8F 21
-20  14 7A 55 16 C8 A9 7D B3 13 0C 5D C9 31 8D A9 B2
-30  A3 56 83 0F 55 7E DE 45 71 21 D2 6D C1 57 1C 9C
-40  78 2F 64 51 42 7B 64 30 FA 26 51 76 D3 E0 FB B6
-50  31 9F BF 2F 7E 4F 94 B4 BD 4F 75 91 E3 1B EB 42
-60  3F 88 6F B8 6C 2C 93 0D 69 2C D5 20 3C C1 61 95
-70  43 08 A0 2F FE B3 26 D7 98 0B 34 7B 47 70 A0 AB
+    00  F1 35 59 A1 0D 5A 26 7F 18 60 0B 96 8A C0 25 C1
+    10  BF A1 3B B0 FF 85 28 75 F2 1F C6 8F 0E 74 8F 21
+    20  14 7A 55 16 C8 A9 7D B3 13 0C 5D C9 31 8D A9 B2
+    30  A3 56 83 0F 55 7E DE 45 71 21 D2 6D C1 57 1C 9C
+    40  78 2F 64 51 42 7B 64 30 FA 26 51 76 D3 E0 FB B6
+    50  31 9F BF 2F 7E 4F 94 B4 BD 4F 75 91 E3 1B EB 42
+    60  3F 88 6F B8 6C 2C 93 0D 69 2C D5 20 3C C1 61 95
+    70  43 08 A0 2F FE B3 26 D7 98 0B 34 7B 47 70 A0 AB
 
-**** The 64-bit HS Custom Key Value = 5B7C62C491C11B39 ******/
+    **** The 64-bit HS Custom Key Value = 5B7C62C491C11B39 ******/
     uint8_t key64_negated[8] = {0};
-    uint8_t z[8][8]={{0},{0}};
-    uint8_t temp_output[8]={0};
+    uint8_t z[8][8] = {{0}, {0}};
+    uint8_t temp_output[8] = {0};
     //calculate complement of key
     int i;
-    for (i=0; i<8; i++)
-        key64_negated[i]= ~key64[i];
+    for (i = 0; i < 8; i++)
+        key64_negated[i] = ~key64[i];
 
     // Once again, key is on iclass-format
     desencrypt_iclass(key64, key64_negated, z[0]);
@@ -224,29 +234,29 @@ void hash2(uint8_t *key64, uint8_t *outp_keytable) {
 //    PrintAndLogDevice(NORMAL, "\n"); PrintAndLogDevice(NORMAL, "High security custom key (Kcus):");
 //    printvar("z0  ",  z[0],8);
 
-    uint8_t y[8][8]={{0},{0}};
+    uint8_t y[8][8] = {{0}, {0}};
 
     // y[0]=DES_dec(z[0],~key)
     // Once again, key is on iclass-format
     desdecrypt_iclass(z[0], key64_negated, y[0]);
 //    printvar("y0  ",  y[0],8);
 
-    for (i=1; i<8; i++) {
+    for (i = 1; i < 8; i++) {
         // z [i] = DES dec (rk(K cus , i), z [i−1] )
         rk(key64, i, temp_output);
         //y [i] = DES enc (rk(K cus , i), y [i−1] )
 
-        desdecrypt_iclass(temp_output,z[i-1], z[i]);
-        desencrypt_iclass(temp_output,y[i-1], y[i]);
+        desdecrypt_iclass(temp_output, z[i - 1], z[i]);
+        desencrypt_iclass(temp_output, y[i - 1], y[i]);
     }
 
     if (outp_keytable != NULL) {
         for (i = 0 ; i < 8 ; i++) {
-            memcpy(outp_keytable+i*16,y[i],8);
-            memcpy(outp_keytable+8+i*16,z[i],8);
+            memcpy(outp_keytable + i * 16, y[i], 8);
+            memcpy(outp_keytable + 8 + i * 16, z[i], 8);
         }
     } else {
-        printarr_human_readable("hash2", outp_keytable,128);
+        printarr_human_readable("hash2", outp_keytable, 128);
     }
 }
 
@@ -266,9 +276,10 @@ void hash2(uint8_t *key64, uint8_t *outp_keytable) {
  * @param i the number to read. Should be less than 127, or something is wrong...
  * @return
  */
-int _readFromDump(uint8_t dump[], dumpdata* item, uint8_t i) {
+int _readFromDump(uint8_t dump[], dumpdata *item, uint8_t i)
+{
     size_t itemsize = sizeof(dumpdata);
-    memcpy(item, dump+i*itemsize, itemsize);
+    memcpy(item, dump + i * itemsize, itemsize);
 
     if (true) {
         printvar("csn", item->csn, sizeof(item->csn));
@@ -290,7 +301,8 @@ int _readFromDump(uint8_t dump[], dumpdata* item, uint8_t i) {
  * @param keytable where to write found values.
  * @return
  */
-int bruteforceItem(dumpdata item, uint16_t keytable[]) {
+int bruteforceItem(dumpdata item, uint16_t keytable[])
+{
     int errors = 0;
     int found = false;
     uint8_t key_sel_p[8] = {0};
@@ -317,7 +329,7 @@ int bruteforceItem(dumpdata item, uint16_t keytable[]) {
     uint8_t bytes_to_recover[3] = {0};
     uint8_t numbytes_to_recover = 0 ;
     int i;
-    for (i=0; i<8; i++) {
+    for (i = 0; i < 8; i++) {
         if (keytable[key_index[i]] & (CRACKED | BEING_CRACKED)) continue;
 
         bytes_to_recover[numbytes_to_recover++] = key_index[i];
@@ -349,17 +361,17 @@ int bruteforceItem(dumpdata item, uint16_t keytable[]) {
        bytes_to_recover = 3 --> endmask = 0x001000000
     */
 
-    uint32_t endmask =  1 << 8*numbytes_to_recover;
+    uint32_t endmask =  1 << 8 * numbytes_to_recover;
     PrintAndLogDevice(NORMAL, "----------------------------");
-    for (i =0 ; i < numbytes_to_recover && numbytes_to_recover > 1; i++)
+    for (i = 0 ; i < numbytes_to_recover && numbytes_to_recover > 1; i++)
         PrintAndLogDevice(INFO, "Bruteforcing byte %d", bytes_to_recover[i]);
 
     while (!found && !(brute & endmask)) {
 
         //Update the keytable with the brute-values
-        for (i=0; i < numbytes_to_recover; i++) {
+        for (i = 0; i < numbytes_to_recover; i++) {
             keytable[bytes_to_recover[i]] &= 0xFF00;
-            keytable[bytes_to_recover[i]] |= (brute >> (i*8) & 0xFF);
+            keytable[bytes_to_recover[i]] |= (brute >> (i * 8) & 0xFF);
         }
 
         // Piece together the key
@@ -382,7 +394,7 @@ int bruteforceItem(dumpdata item, uint16_t keytable[]) {
         // success
         if (memcmp(calculated_MAC, item.mac, 4) == 0) {
             printf("\r\n");
-            for (i =0 ; i < numbytes_to_recover; i++) {
+            for (i = 0 ; i < numbytes_to_recover; i++) {
                 PrintAndLogDevice(INFO, "%d: 0x%02x", bytes_to_recover[i], 0xFF & keytable[bytes_to_recover[i]]);
             }
             found = true;
@@ -391,26 +403,27 @@ int bruteforceItem(dumpdata item, uint16_t keytable[]) {
 
         brute++;
         if ((brute & 0xFFFF) == 0) {
-            printf("%3d,",(brute >> 16) & 0xFF);
-            if ( ((brute >> 16) % 0x10) == 0)
+            printf("%3d,", (brute >> 16) & 0xFF);
+            if (((brute >> 16) % 0x10) == 0)
                 printf("\n");
             fflush(stdout);
         }
     }
 
     if (!found) {
-        PrintAndLogDevice(NORMAL, "\n"); PrintAndLogDevice(WARNING, "Failed to recover %d bytes using the following CSN", numbytes_to_recover);
+        PrintAndLogDevice(NORMAL, "\n");
+        PrintAndLogDevice(WARNING, "Failed to recover %d bytes using the following CSN", numbytes_to_recover);
         printvar("[!] CSN", item.csn, 8);
         errors++;
 
         //Before we exit, reset the 'BEING_CRACKED' to zero
-        for (i=0; i < numbytes_to_recover; i++){
+        for (i = 0; i < numbytes_to_recover; i++) {
             keytable[bytes_to_recover[i]]  &= 0xFF;
             keytable[bytes_to_recover[i]]  |= CRACK_FAILED;
         }
     } else {
         //PrintAndLogDevice(SUCCESS, "DES calcs: %u", brute);
-        for (i=0; i < numbytes_to_recover; i++){
+        for (i = 0; i < numbytes_to_recover; i++) {
             keytable[bytes_to_recover[i]]  &= 0xFF;
             keytable[bytes_to_recover[i]]  |= CRACKED;
         }
@@ -430,7 +443,8 @@ int bruteforceItem(dumpdata item, uint16_t keytable[]) {
  * @param master_key where to put the master key
  * @return 0 for ok, 1 for failz
  */
-int calculateMasterKey(uint8_t first16bytes[], uint64_t master_key[] ){
+int calculateMasterKey(uint8_t first16bytes[], uint64_t master_key[])
+{
     mbedtls_des_context ctx_e;
 
     uint8_t z_0[8] = {0};
@@ -441,8 +455,8 @@ int calculateMasterKey(uint8_t first16bytes[], uint64_t master_key[] ){
     uint8_t result[8] = {0};
 
     // y_0 and z_0 are the first 16 bytes of the keytable
-    memcpy(y_0, first16bytes,8);
-    memcpy(z_0, first16bytes+8,8);
+    memcpy(y_0, first16bytes, 8);
+    memcpy(z_0, first16bytes + 8, 8);
 
     // Our DES-implementation uses the standard NIST
     // format for keys, thus must translate from iclass
@@ -450,7 +464,7 @@ int calculateMasterKey(uint8_t first16bytes[], uint64_t master_key[] ){
     permutekey_rev(z_0, z_0_rev);
 
     // ~K_cus = DESenc(z[0], y[0])
-    mbedtls_des_setkey_enc( &ctx_e, z_0_rev );
+    mbedtls_des_setkey_enc(&ctx_e, z_0_rev);
     mbedtls_des_crypt_ecb(&ctx_e, y_0, key64_negated);
 
     int i;
@@ -462,20 +476,22 @@ int calculateMasterKey(uint8_t first16bytes[], uint64_t master_key[] ){
     uint8_t key64_stdformat[8] = {0};
     permutekey_rev(key64, key64_stdformat);
 
-    mbedtls_des_setkey_enc( &ctx_e, key64_stdformat );
+    mbedtls_des_setkey_enc(&ctx_e, key64_stdformat);
     mbedtls_des_crypt_ecb(&ctx_e, key64_negated, result);
-    PrintAndLogDevice(NORMAL, "\n"); PrintAndLogDevice(SUCCESS, "-- High security custom key (Kcus) --");
+    PrintAndLogDevice(NORMAL, "\n");
+    PrintAndLogDevice(SUCCESS, "-- High security custom key (Kcus) --");
     printvar("[+] Standard format   ", key64_stdformat, 8);
     printvar("[+] iClass format     ", key64, 8);
 
     if (master_key != NULL)
         memcpy(master_key, key64, 8);
 
-    if (memcmp(z_0,result,4) != 0) {
+    if (memcmp(z_0, result, 4) != 0) {
         PrintAndLogDevice(WARNING, "Failed to verify calculated master key (k_cus)! Something is wrong.");
         return 1;
     } else {
-        PrintAndLogDevice(NORMAL, "\n"); PrintAndLogDevice(SUCCESS, "Key verified ok!\n");
+        PrintAndLogDevice(NORMAL, "\n");
+        PrintAndLogDevice(SUCCESS, "Key verified ok!\n");
     }
     return 0;
 }
@@ -486,22 +502,23 @@ int calculateMasterKey(uint8_t first16bytes[], uint64_t master_key[] ){
  * @param keytable
  * @return
  */
-int bruteforceDump(uint8_t dump[], size_t dumpsize, uint16_t keytable[]) {
+int bruteforceDump(uint8_t dump[], size_t dumpsize, uint16_t keytable[])
+{
     uint8_t i;
     int errors = 0;
     size_t itemsize = sizeof(dumpdata);
 
     uint64_t t1 = msclock();
 
-    dumpdata* attack = (dumpdata* ) calloc(itemsize, sizeof(uint8_t));
+    dumpdata *attack = (dumpdata *) calloc(itemsize, sizeof(uint8_t));
 
-    for (i = 0 ; i * itemsize < dumpsize ; i++ ) {
+    for (i = 0 ; i * itemsize < dumpsize ; i++) {
         memcpy(attack, dump + i * itemsize, itemsize);
         errors += bruteforceItem(*attack, keytable);
     }
     free(attack);
 
-    PrintAndLogDevice(SUCCESS, "time: %" PRIu64 " seconds", (msclock()-t1)/1000);
+    PrintAndLogDevice(SUCCESS, "time: %" PRIu64 " seconds", (msclock() - t1) / 1000);
 
     // Pick out the first 16 bytes of the keytable.
     // The keytable is now in 16-bit ints, where the upper 8 bits
@@ -525,7 +542,8 @@ int bruteforceDump(uint8_t dump[], size_t dumpsize, uint16_t keytable[]) {
  * @param filename
  * @return
  */
-int bruteforceFile(const char *filename, uint16_t keytable[]) {
+int bruteforceFile(const char *filename, uint16_t keytable[])
+{
     FILE *f = fopen(filename, "rb");
     if (!f) {
         PrintAndLogDevice(WARNING, "Failed to read from file '%s'", filename);
@@ -543,7 +561,7 @@ int bruteforceFile(const char *filename, uint16_t keytable[]) {
     }
 
     uint8_t *dump = calloc(fsize, sizeof(uint8_t));
-    if ( !dump ) {
+    if (!dump) {
         PrintAndLogDevice(WARNING, "Failed to allocate memory");
         fclose(f);
         return 2;
@@ -553,7 +571,7 @@ int bruteforceFile(const char *filename, uint16_t keytable[]) {
     fclose(f);
 
     if (bytes_read < fsize) {
-        PrintAndLogDevice(WARNING, "Error, could only read %d bytes (should be %d)", bytes_read, fsize );
+        PrintAndLogDevice(WARNING, "Error, could only read %d bytes (should be %d)", bytes_read, fsize);
     }
 
     uint8_t res = bruteforceDump(dump, fsize, keytable);
@@ -566,7 +584,8 @@ int bruteforceFile(const char *filename, uint16_t keytable[]) {
  * @param filename
  * @return
  */
-int bruteforceFileNoKeys(const char *filename) {
+int bruteforceFileNoKeys(const char *filename)
+{
     uint16_t keytable[128] = {0};
     return bruteforceFile(filename, keytable);
 }
@@ -577,7 +596,8 @@ int bruteforceFileNoKeys(const char *filename) {
 // ----------------------------------------------------------------------------
 // TEST CODE BELOW
 // ----------------------------------------------------------------------------
-int _testBruteforce() {
+int _testBruteforce()
+{
     int errors = 0;
     if (true) {
         // First test
@@ -601,11 +621,11 @@ int _testBruteforce() {
         uint16_t keytable[128] = {0};
 
         //Test a few variants
-        if (fileExists("iclass_dump.bin")){
+        if (fileExists("iclass_dump.bin")) {
             errors |= bruteforceFile("iclass_dump.bin", keytable);
-        } else if (fileExists("loclass/iclass_dump.bin")){
+        } else if (fileExists("loclass/iclass_dump.bin")) {
             errors |= bruteforceFile("loclass/iclass_dump.bin", keytable);
-        } else if (fileExists("client/loclass/iclass_dump.bin")){
+        } else if (fileExists("client/loclass/iclass_dump.bin")) {
             errors |= bruteforceFile("client/loclass/iclass_dump.bin", keytable);
         } else {
             PrintAndLogDevice(WARNING, "Error: The file iclass_dump.bin was not found!");
@@ -614,15 +634,16 @@ int _testBruteforce() {
     return errors;
 }
 
-int _test_iclass_key_permutation() {
-    uint8_t testcase[8] = {0x6c,0x8d,0x44,0xf9,0x2a,0x2d,0x01,0xbf};
+int _test_iclass_key_permutation()
+{
+    uint8_t testcase[8] = {0x6c, 0x8d, 0x44, 0xf9, 0x2a, 0x2d, 0x01, 0xbf};
     uint8_t testcase_output[8] = {0};
-    uint8_t testcase_output_correct[8] = {0x8a,0x0d,0xb9,0x88,0xbb,0xa7,0x90,0xea};
+    uint8_t testcase_output_correct[8] = {0x8a, 0x0d, 0xb9, 0x88, 0xbb, 0xa7, 0x90, 0xea};
     uint8_t testcase_output_rev[8] = {0};
     permutekey(testcase, testcase_output);
     permutekey_rev(testcase_output, testcase_output_rev);
 
-    if (memcmp(testcase_output, testcase_output_correct,8) != 0) {
+    if (memcmp(testcase_output, testcase_output_correct, 8) != 0) {
         PrintAndLogDevice(WARNING, "Error with iclass key permute!");
         printarr("testcase_output", testcase_output, 8);
         printarr("testcase_output_correct", testcase_output_correct, 8);
@@ -640,13 +661,14 @@ int _test_iclass_key_permutation() {
     return 0;
 }
 
-int _testHash1() {
-    uint8_t expected[8] = {0x7E,0x72,0x2F,0x40,0x2D,0x02,0x51,0x42};
-    uint8_t csn[8] = {0x01,0x02,0x03,0x04,0xF7,0xFF,0x12,0xE0};
+int _testHash1()
+{
+    uint8_t expected[8] = {0x7E, 0x72, 0x2F, 0x40, 0x2D, 0x02, 0x51, 0x42};
+    uint8_t csn[8] = {0x01, 0x02, 0x03, 0x04, 0xF7, 0xFF, 0x12, 0xE0};
     uint8_t k[8] = {0};
     hash1(csn, k);
 
-    if (memcmp(k,expected,8) != 0) {
+    if (memcmp(k, expected, 8) != 0) {
         PrintAndLogDevice(WARNING, "Error with hash1!");
         printarr("calculated", k, 8);
         printarr("expected", expected, 8);
@@ -655,25 +677,26 @@ int _testHash1() {
     return 0;
 }
 
-int testElite() {
+int testElite()
+{
     PrintAndLogDevice(INFO, "Testing iClass Elite functinality...");
     PrintAndLogDevice(INFO, "Testing hash2");
-    uint8_t k_cus[8] = {0x5B,0x7C,0x62,0xC4,0x91,0xC1,0x1B,0x39};
+    uint8_t k_cus[8] = {0x5B, 0x7C, 0x62, 0xC4, 0x91, 0xC1, 0x1B, 0x39};
 
     /**
      *Expected:
      * High Security Key Table
 
-00  F1 35 59 A1 0D 5A 26 7F 18 60 0B 96 8A C0 25 C1
-10  BF A1 3B B0 FF 85 28 75 F2 1F C6 8F 0E 74 8F 21
-20  14 7A 55 16 C8 A9 7D B3 13 0C 5D C9 31 8D A9 B2
-30  A3 56 83 0F 55 7E DE 45 71 21 D2 6D C1 57 1C 9C
-40  78 2F 64 51 42 7B 64 30 FA 26 51 76 D3 E0 FB B6
-50  31 9F BF 2F 7E 4F 94 B4 BD 4F 75 91 E3 1B EB 42
-60  3F 88 6F B8 6C 2C 93 0D 69 2C D5 20 3C C1 61 95
-70  43 08 A0 2F FE B3 26 D7 98 0B 34 7B 47 70 A0 AB
+    00  F1 35 59 A1 0D 5A 26 7F 18 60 0B 96 8A C0 25 C1
+    10  BF A1 3B B0 FF 85 28 75 F2 1F C6 8F 0E 74 8F 21
+    20  14 7A 55 16 C8 A9 7D B3 13 0C 5D C9 31 8D A9 B2
+    30  A3 56 83 0F 55 7E DE 45 71 21 D2 6D C1 57 1C 9C
+    40  78 2F 64 51 42 7B 64 30 FA 26 51 76 D3 E0 FB B6
+    50  31 9F BF 2F 7E 4F 94 B4 BD 4F 75 91 E3 1B EB 42
+    60  3F 88 6F B8 6C 2C 93 0D 69 2C D5 20 3C C1 61 95
+    70  43 08 A0 2F FE B3 26 D7 98 0B 34 7B 47 70 A0 AB
 
-**** The 64-bit HS Custom Key Value = 5B7C62C491C11B39 ****
+    **** The 64-bit HS Custom Key Value = 5B7C62C491C11B39 ****
      */
     uint8_t keytable[128] = {0};
     hash2(k_cus, keytable);
@@ -686,7 +709,7 @@ int testElite() {
     PrintAndLogDevice(INFO, "Testing hash1...");
     errors += _testHash1();
     PrintAndLogDevice(INFO, "Testing key diversification ...");
-    errors +=_test_iclass_key_permutation();
+    errors += _test_iclass_key_permutation();
     errors += _testBruteforce();
     return errors;
 }
\ No newline at end of file
diff --git a/client/loclass/elite_crack.h b/client/loclass/elite_crack.h
index b3c748629..2353fdbac 100644
--- a/client/loclass/elite_crack.h
+++ b/client/loclass/elite_crack.h
@@ -104,7 +104,7 @@ int bruteforceItem(dumpdata item, uint16_t keytable[]);
  * @param csn the CSN used
  * @param k output
  */
-void hash1(uint8_t csn[] , uint8_t k[]);
+void hash1(uint8_t csn[], uint8_t k[]);
 void hash2(uint8_t *key64, uint8_t *outp_keytable);
 /**
  * From dismantling iclass-paper:
@@ -118,7 +118,7 @@ void hash2(uint8_t *key64, uint8_t *outp_keytable);
  * @param master_key where to put the master key
  * @return 0 for ok, 1 for failz
  */
-int calculateMasterKey(uint8_t first16bytes[], uint64_t master_key[] );
+int calculateMasterKey(uint8_t first16bytes[], uint64_t master_key[]);
 
 /**
  * @brief Test function
diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index 047a48188..0ce761548 100644
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -45,7 +45,8 @@
  * @param filename
  * @return
  */
-int fileExists(const char *filename) {
+int fileExists(const char *filename)
+{
 
 #ifdef _WIN32
     struct _stat st;
@@ -57,13 +58,14 @@ int fileExists(const char *filename) {
     return result == 0;
 }
 
-int saveFile(const char *preferredName, const char *suffix, const void* data, size_t datalen) {
+int saveFile(const char *preferredName, const char *suffix, const void *data, size_t datalen)
+{
     int size = sizeof(char) * (strlen(preferredName) + strlen(suffix) + 10);
-    char * fileName = calloc(size, sizeof(char));
+    char *fileName = calloc(size, sizeof(char));
     int num = 1;
-    sprintf(fileName,"%s.%s", preferredName, suffix);
+    sprintf(fileName, "%s.%s", preferredName, suffix);
     while (fileExists(fileName)) {
-        sprintf(fileName,"%s-%d.%s", preferredName, num, suffix);
+        sprintf(fileName, "%s-%d.%s", preferredName, num, suffix);
         num++;
     }
     /* We should have a valid filename now, e.g. dumpdata-3.bin */
@@ -71,34 +73,35 @@ int saveFile(const char *preferredName, const char *suffix, const void* data, si
     /*Opening file for writing in binary mode*/
     FILE *f = fopen(fileName, "wb");
     if (!f) {
-        PrintAndLogDevice(WARNING, "file not found or locked. '" _YELLOW_(%s)"'", fileName);
+        PrintAndLogDevice(WARNING, "file not found or locked. '" _YELLOW_( % s)"'", fileName);
         free(fileName);
         return 1;
     }
     fwrite(data, 1, datalen, f);
     fflush(f);
     fclose(f);
-    PrintAndLogDevice(SUCCESS, "saved %u bytes to binary file " _YELLOW_(%s), datalen, fileName);
+    PrintAndLogDevice(SUCCESS, "saved %u bytes to binary file " _YELLOW_( % s), datalen, fileName);
     free(fileName);
     return 0;
 }
 
-int saveFileEML(const char *preferredName, const char *suffix, uint8_t* data, size_t datalen, size_t blocksize) {
+int saveFileEML(const char *preferredName, const char *suffix, uint8_t *data, size_t datalen, size_t blocksize)
+{
 
-    if ( preferredName == NULL ) return 1;
-    if ( suffix == NULL ) return 1;
-    if ( data == NULL ) return 1;
+    if (preferredName == NULL) return 1;
+    if (suffix == NULL) return 1;
+    if (data == NULL) return 1;
 
     int retval = 0;
-    int blocks = datalen/blocksize;
+    int blocks = datalen / blocksize;
     uint16_t currblock = 1;
-    int i,j;
+    int i, j;
     int size = sizeof(char) * (strlen(preferredName) + strlen(suffix) + 10);
-    char * fileName = calloc(size, sizeof(char));
+    char *fileName = calloc(size, sizeof(char));
     int num = 1;
-    sprintf(fileName,"%s.%s", preferredName, suffix);
+    sprintf(fileName, "%s.%s", preferredName, suffix);
     while (fileExists(fileName)) {
-        sprintf(fileName,"%s-%d.%s", preferredName, num, suffix);
+        sprintf(fileName, "%s-%d.%s", preferredName, num, suffix);
         num++;
     }
 
@@ -107,54 +110,55 @@ int saveFileEML(const char *preferredName, const char *suffix, uint8_t* data, si
     /*Opening file for writing in text mode*/
     FILE *f = fopen(fileName, "w+");
     if (!f) {
-        PrintAndLogDevice(WARNING, "file not found or locked. '" _YELLOW_(%s)"'", fileName);
+        PrintAndLogDevice(WARNING, "file not found or locked. '" _YELLOW_( % s)"'", fileName);
         retval =  1;
         goto out;
     }
 
     for (i = 0; i < datalen; i++) {
-        fprintf(f, "%02X", data[i] );
+        fprintf(f, "%02X", data[i]);
 
         // no extra line in the end
-        if ( (i+1) % blocksize == 0 && currblock != blocks ) {
+        if ((i + 1) % blocksize == 0 && currblock != blocks) {
             fprintf(f, "\n");
             currblock++;
         }
     }
     // left overs
-    if ( datalen % blocksize != 0) {
+    if (datalen % blocksize != 0) {
         int index = blocks * blocksize;
         for (j = 0; j < datalen % blocksize; j++) {
-            fprintf(f, "%02X", data[index + j] );
+            fprintf(f, "%02X", data[index + j]);
         }
     }
     fflush(f);
     fclose(f);
-    PrintAndLogDevice(SUCCESS, "saved %d blocks to text file " _YELLOW_(%s), blocks, fileName);
+    PrintAndLogDevice(SUCCESS, "saved %d blocks to text file " _YELLOW_( % s), blocks, fileName);
 
 out:
     free(fileName);
     return retval;
 }
 
-int saveFileJSON(const char *preferredName, const char *suffix, JSONFileType ftype, uint8_t* data, size_t datalen) {
-    if ( preferredName == NULL ) return 1;
-    if ( suffix == NULL ) return 1;
-    if ( data == NULL ) return 1;
+int saveFileJSON(const char *preferredName, const char *suffix, JSONFileType ftype, uint8_t *data, size_t datalen)
+{
+    if (preferredName == NULL) return 1;
+    if (suffix == NULL) return 1;
+    if (data == NULL) return 1;
 
     int retval = 0;
     int size = sizeof(char) * (strlen(preferredName) + strlen(suffix) + 10);
-    char * fileName = calloc(size, sizeof(char));
+    char *fileName = calloc(size, sizeof(char));
     int num = 1;
-    sprintf(fileName,"%s.%s", preferredName, suffix);
+    sprintf(fileName, "%s.%s", preferredName, suffix);
     while (fileExists(fileName)) {
-        sprintf(fileName,"%s-%d.%s", preferredName, num, suffix);
+        sprintf(fileName, "%s-%d.%s", preferredName, num, suffix);
         num++;
     }
 
     json_t *root = json_object();
     JsonSaveStr(root, "Created", "proxmark3");
-    switch(ftype) {
+    switch (ftype) {
         case jsfRaw:
             JsonSaveStr(root, "FileType", "raw");
             JsonSaveBufAsHexCompact(root, "raw", data, datalen);
@@ -211,11 +215,11 @@ int saveFileJSON(const char *preferredName, const char *suffix, JSONFileType fty
         case jsfMfuMemory:
             JsonSaveStr(root, "FileType", "mfu");
 
-            mfu_dump_t* tmp = (mfu_dump_t*)data;
+            mfu_dump_t *tmp = (mfu_dump_t *)data;
 
             uint8_t uid[7] = {0};
             memcpy(uid, tmp->data, 3);
-            memcpy(uid+3, tmp->data+4, 4);
+            memcpy(uid + 3, tmp->data + 4, 4);
 
             JsonSaveBufAsHexCompact(root, "$.Card.UID", uid, sizeof(uid));
             JsonSaveBufAsHexCompact(root, "$.Card.Version", tmp->version, sizeof(tmp->version));
@@ -235,17 +239,17 @@ int saveFileJSON(const char *preferredName, const char *suffix, JSONFileType fty
                 sprintf(path, "$.blocks.%d", i);
                 JsonSaveBufAsHexCompact(root, path, tmp->data + (i * 4), 4);
             }
-        break;
+            break;
     }
 
     int res = json_dump_file(root, fileName, JSON_INDENT(2));
     if (res) {
-        PrintAndLogDevice(FAILED, "error: can't save the file: " _YELLOW_(%s), fileName);
+        PrintAndLogDevice(FAILED, "error: can't save the file: " _YELLOW_( % s), fileName);
         json_decref(root);
         retval = 200;
         goto out;
     }
-    PrintAndLogDevice(SUCCESS, "saved to json file " _YELLOW_(%s), fileName);
+    PrintAndLogDevice(SUCCESS, "saved to json file " _YELLOW_( % s), fileName);
     json_decref(root);
 
 out:
@@ -253,20 +257,21 @@ out:
     return retval;
 }
 
-int loadFile(const char *preferredName, const char *suffix, void* data, size_t* datalen) {
+int loadFile(const char *preferredName, const char *suffix, void *data, size_t *datalen)
+{
 
-    if ( preferredName == NULL ) return 1;
-    if ( suffix == NULL ) return 1;
-    if ( data == NULL ) return 1;
+    if (preferredName == NULL) return 1;
+    if (suffix == NULL) return 1;
+    if (data == NULL) return 1;
 
     int retval = 0;
     int size = sizeof(char) * (strlen(preferredName) + strlen(suffix) + 10);
-    char * fileName = calloc(size, sizeof(char));
-    sprintf(fileName,"%s.%s", preferredName, suffix);
+    char *fileName = calloc(size, sizeof(char));
+    sprintf(fileName, "%s.%s", preferredName, suffix);
 
     FILE *f = fopen(fileName, "rb");
-    if ( !f ) {
-        PrintAndLogDevice(WARNING, "file not found or locked. '" _YELLOW_(%s)"'", fileName);
+    if (!f) {
+        PrintAndLogDevice(WARNING, "file not found or locked. '" _YELLOW_( % s)"'", fileName);
         free(fileName);
         return 1;
     }
@@ -276,14 +281,14 @@ int loadFile(const char *preferredName, const char *suffix, void* data, size_t*
     long fsize = ftell(f);
     fseek(f, 0, SEEK_SET);
 
-    if ( fsize < 0 ) {
+    if (fsize < 0) {
         PrintAndLogDevice(FAILED, "error, when getting filesize");
         retval = 1;
         goto out;
     }
 
     uint8_t *dump = calloc(fsize, sizeof(uint8_t));
-    if ( !dump ) {
+    if (!dump) {
         PrintAndLogDevice(FAILED, "error, cannot allocate memory");
         retval = 2;
         goto out;
@@ -291,17 +296,17 @@ int loadFile(const char *preferredName, const char *suffix, void* data, size_t*
 
     size_t bytes_read = fread(dump, 1, fsize, f);
 
-    if ( bytes_read != fsize ) {
+    if (bytes_read != fsize) {
         PrintAndLogDevice(FAILED, "error, bytes read mismatch file size");
         free(dump);
         retval = 3;
         goto out;
     }
 
-    memcpy( (data), dump, bytes_read);
+    memcpy((data), dump, bytes_read);
     free(dump);
 
-    PrintAndLogDevice(SUCCESS, "loaded %d bytes from binary file " _YELLOW_(%s), bytes_read, fileName);
+    PrintAndLogDevice(SUCCESS, "loaded %d bytes from binary file " _YELLOW_( % s), bytes_read, fileName);
 
     *datalen = bytes_read;
 
@@ -312,21 +317,22 @@ out:
     return retval;
 }
 
-int loadFileEML(const char *preferredName, const char *suffix, void* data, size_t* datalen) {
+int loadFileEML(const char *preferredName, const char *suffix, void *data, size_t *datalen)
+{
 
-    if ( preferredName == NULL ) return 1;
-    if ( suffix == NULL ) return 1;
-    if ( data == NULL ) return 1;
+    if (preferredName == NULL) return 1;
+    if (suffix == NULL) return 1;
+    if (data == NULL) return 1;
 
     size_t counter = 0;
     int retval = 0, hexlen = 0;
     int size = sizeof(char) * (strlen(preferredName) + strlen(suffix) + 10);
-    char * fileName = calloc(size, sizeof(char));
-    sprintf(fileName,"%s.%s", preferredName, suffix);
+    char *fileName = calloc(size, sizeof(char));
+    sprintf(fileName, "%s.%s", preferredName, suffix);
 
     FILE *f = fopen(fileName, "r");
-    if ( !f ) {
-        PrintAndLogDevice(WARNING, "file not found or locked. '" _YELLOW_(%s)"'", fileName);
+    if (!f) {
+        PrintAndLogDevice(WARNING, "file not found or locked. '" _YELLOW_( % s)"'", fileName);
         retval = 1;
         goto out;
     }
@@ -336,18 +342,18 @@ int loadFileEML(const char *preferredName, const char *suffix, void* data, size_
     memset(line, 0, sizeof(line));
     uint8_t buf[64] = {0x00};
 
-    while ( !feof(f) ) {
+    while (!feof(f)) {
 
         memset(line, 0, sizeof(line));
 
-        if (fgets(line, sizeof(line), f) == NULL){
+        if (fgets(line, sizeof(line), f) == NULL) {
             fclose(f);
             PrintAndLogEx(FAILED, "File reading error.");
             retval = 2;
             goto out;
         }
 
-        if ( line[0] == '#' )
+        if (line[0] == '#')
             continue;
 
         int res = param_gethex_to_eol(line, 0, buf, sizeof(buf), &hexlen);
@@ -357,9 +363,9 @@ int loadFileEML(const char *preferredName, const char *suffix, void* data, size_
         }
     }
     fclose(f);
-    PrintAndLogDevice(SUCCESS, "loaded %d bytes from text file " _YELLOW_(%s), counter, fileName);
+    PrintAndLogDevice(SUCCESS, "loaded %d bytes from text file " _YELLOW_( % s), counter, fileName);
 
-    if ( datalen )
+    if (datalen)
         *datalen = counter;
 
 out:
@@ -367,11 +373,12 @@ out:
     return retval;
 }
 
-int loadFileJSON(const char *preferredName, const char *suffix, void* data, size_t maxdatalen, size_t* datalen) {
+int loadFileJSON(const char *preferredName, const char *suffix, void *data, size_t maxdatalen, size_t *datalen)
+{
 
-    if ( preferredName == NULL ) return 1;
-    if ( suffix == NULL ) return 1;
-    if ( data == NULL ) return 1;
+    if (preferredName == NULL) return 1;
+    if (suffix == NULL) return 1;
+    if (data == NULL) return 1;
 
     *datalen = 0;
     json_t *root;
@@ -379,18 +386,18 @@ int loadFileJSON(const char *preferredName, const char *suffix, void* data, size
 
     int retval = 0;
     int size = sizeof(char) * (strlen(preferredName) + strlen(suffix) + 10);
-    char * fileName = calloc(size, sizeof(char));
-    sprintf(fileName,"%s.%s", preferredName, suffix);
+    char *fileName = calloc(size, sizeof(char));
+    sprintf(fileName, "%s.%s", preferredName, suffix);
 
     root = json_load_file(fileName, 0, &error);
     if (!root) {
-        PrintAndLog("ERROR: json " _YELLOW_(%s) " error on line %d: %s", fileName, error.line, error.text);
+        PrintAndLog("ERROR: json " _YELLOW_( % s) " error on line %d: %s", fileName, error.line, error.text);
         retval = 2;
         goto out;
     }
 
     if (!json_is_object(root)) {
-        PrintAndLog("ERROR: Invalid json " _YELLOW_(%s) " format. root must be an object.", fileName);
+        PrintAndLog("ERROR: Invalid json " _YELLOW_( % s) " format. root must be an object.", fileName);
         retval = 3;
         goto out;
     }
@@ -448,18 +455,19 @@ int loadFileJSON(const char *preferredName, const char *suffix, void* data, size
     }
 
 
-    PrintAndLog("loaded from JSON file " _YELLOW_(%s), fileName);
+    PrintAndLog("loaded from JSON file " _YELLOW_( % s), fileName);
 out:
     json_decref(root);
     free(fileName);
     return retval;
 }
 
-int loadFileDICTIONARY(const char *preferredName, const char *suffix, void* data, size_t* datalen, uint8_t keylen, uint16_t* keycnt ) {
+int loadFileDICTIONARY(const char *preferredName, const char *suffix, void *data, size_t *datalen, uint8_t keylen, uint16_t *keycnt)
+{
 
-    if ( preferredName == NULL ) return 1;
-    if ( suffix == NULL ) return 1;
-    if ( data == NULL ) return 1;
+    if (preferredName == NULL) return 1;
+    if (suffix == NULL) return 1;
+    if (data == NULL) return 1;
 
     // t5577 == 4bytes
     // mifare == 6 bytes
@@ -477,18 +485,18 @@ int loadFileDICTIONARY(const char *preferredName, const char *suffix, void* data
     size_t counter = 0;
     int retval = 0;
     int size = sizeof(char) * (strlen(preferredName) + strlen(suffix) + 10);
-    char * fileName = calloc(size, sizeof(char));
-    sprintf(fileName,"%s.%s", preferredName, suffix);
+    char *fileName = calloc(size, sizeof(char));
+    sprintf(fileName, "%s.%s", preferredName, suffix);
 
     FILE *f = fopen(fileName, "r");
-    if ( !f ) {
-        PrintAndLogDevice(WARNING, "file not found or locked. '" _YELLOW_(%s)"'", fileName);
+    if (!f) {
+        PrintAndLogDevice(WARNING, "file not found or locked. '" _YELLOW_( % s)"'", fileName);
         retval = 1;
         goto out;
     }
 
     // read file
-    while ( fgets(line, sizeof(line), f) ) {
+    while (fgets(line, sizeof(line), f)) {
 
         // add null terminator
         line[keylen] = 0;
@@ -499,11 +507,11 @@ int loadFileDICTIONARY(const char *preferredName, const char *suffix, void* data
 
 
         // The line start with # is comment, skip
-        if( line[0] == '#' )
+        if (line[0] == '#')
             continue;
 
-        if (!isxdigit(line[0])){
-            PrintAndLogEx(FAILED, "file content error. '%s' must include " _BLUE_(%2d) "HEX symbols", line, keylen);
+        if (!isxdigit(line[0])) {
+            PrintAndLogEx(FAILED, "file content error. '%s' must include " _BLUE_( % 2d) "HEX symbols", line, keylen);
             continue;
         }
 
@@ -515,9 +523,9 @@ int loadFileDICTIONARY(const char *preferredName, const char *suffix, void* data
         counter += (keylen >> 1);
     }
     fclose(f);
-    PrintAndLogDevice(SUCCESS, "loaded " _GREEN_(%2d) "keys from dictionary file " _YELLOW_(%s), *keycnt, fileName);
+    PrintAndLogDevice(SUCCESS, "loaded " _GREEN_( % 2d) "keys from dictionary file " _YELLOW_( % s), *keycnt, fileName);
 
-    if ( datalen )
+    if (datalen)
         *datalen = counter;
 out:
     free(fileName);
diff --git a/client/loclass/fileutils.h b/client/loclass/fileutils.h
index 591630dfe..c2888c196 100644
--- a/client/loclass/fileutils.h
+++ b/client/loclass/fileutils.h
@@ -70,7 +70,7 @@ int fileExists(const char *filename);
  * @param datalen the length of the data
  * @return 0 for ok, 1 for failz
  */
-extern int saveFile(const char *preferredName, const char *suffix, const void* data, size_t datalen);
+extern int saveFile(const char *preferredName, const char *suffix, const void *data, size_t datalen);
 
 /**
  * @brief Utility function to save data to a textfile (EML). This method takes a preferred name, but if that
@@ -84,7 +84,7 @@ extern int saveFile(const char *preferredName, const char *suffix, const void* d
  * @param blocksize the length of one row
  * @return 0 for ok, 1 for failz
 */
-extern int saveFileEML(const char *preferredName, const char *suffix, uint8_t* data, size_t datalen, size_t blocksize);
+extern int saveFileEML(const char *preferredName, const char *suffix, uint8_t *data, size_t datalen, size_t blocksize);
 
 /** STUB
  * @brief Utility function to save JSON data to a file. This method takes a preferred name, but if that
@@ -98,7 +98,7 @@ extern int saveFileEML(const char *preferredName, const char *suffix, uint8_t* d
  * @param datalen the length of the data
  * @return 0 for ok, 1 for failz
  */
-extern int saveFileJSON(const char *preferredName, const char *suffix, JSONFileType ftype, uint8_t* data, size_t datalen);
+extern int saveFileJSON(const char *preferredName, const char *suffix, JSONFileType ftype, uint8_t *data, size_t datalen);
 
 /** STUB
  * @brief Utility function to load data from a binary file. This method takes a preferred name.
@@ -110,7 +110,7 @@ extern int saveFileJSON(const char *preferredName, const char *suffix, JSONFileT
  * @param datalen the number of bytes loaded from file
  * @return 0 for ok, 1 for failz
 */
-extern int loadFile(const char *preferredName, const char *suffix, void* data, size_t* datalen);
+extern int loadFile(const char *preferredName, const char *suffix, void *data, size_t *datalen);
 
 /**
  * @brief  Utility function to load data from a textfile (EML). This method takes a preferred name.
@@ -122,7 +122,7 @@ extern int loadFile(const char *preferredName, const char *suffix, void* data, s
  * @param datalen the number of bytes loaded from file
  * @return 0 for ok, 1 for failz
 */
-extern int loadFileEML(const char *preferredName, const char *suffix, void* data, size_t* datalen);
+extern int loadFileEML(const char *preferredName, const char *suffix, void *data, size_t *datalen);
 
 /**
  * @brief  Utility function to load data from a JSON textfile. This method takes a preferred name.
@@ -135,7 +135,7 @@ extern int loadFileEML(const char *preferredName, const char *suffix, void* data
  * @param datalen the number of bytes loaded from file
  * @return 0 for ok, 1 for failz
 */
-extern int loadFileJSON(const char *preferredName, const char *suffix, void* data, size_t maxdatalen, size_t* datalen);
+extern int loadFileJSON(const char *preferredName, const char *suffix, void *data, size_t maxdatalen, size_t *datalen);
 
 
 /**
@@ -150,18 +150,18 @@ extern int loadFileJSON(const char *preferredName, const char *suffix, void* dat
  * @param keylen  the number of bytes a key per row is
  * @return 0 for ok, 1 for failz
 */
-extern int loadFileDICTIONARY(const char *preferredName, const char *suffix, void* data, size_t* datalen, uint8_t keylen, uint16_t* keycnt );
+extern int loadFileDICTIONARY(const char *preferredName, const char *suffix, void *data, size_t *datalen, uint8_t keylen, uint16_t *keycnt);
 
 #define PrintAndLogDevice(level, format, args...)  PrintAndLogEx(level, format , ## args)
 #else
 
-    /**
- * Utility function to print to console. This is used consistently within the library instead
- * of printf, but it actually only calls printf. The reason to have this method is to
- *make it simple to plug this library into proxmark, which has this function already to
- * write also to a logfile. When doing so, just point this function to use PrintAndLog
- * @param fmt
- */
+/**
+* Utility function to print to console. This is used consistently within the library instead
+* of printf, but it actually only calls printf. The reason to have this method is to
+*make it simple to plug this library into proxmark, which has this function already to
+* write also to a logfile. When doing so, just point this function to use PrintAndLog
+* @param fmt
+*/
 #define PrintAndLogDevice(level, format, args...) { }
 
 
diff --git a/client/loclass/hash1_brute.c b/client/loclass/hash1_brute.c
index d2ae822a5..af6ef8ace 100644
--- a/client/loclass/hash1_brute.c
+++ b/client/loclass/hash1_brute.c
@@ -7,45 +7,46 @@
 #include <ctype.h>
 #include "elite_crack.h"
 
-void calc_score(uint8_t* csn, uint8_t* k) {
-    uint8_t score =0 ;
+void calc_score(uint8_t *csn, uint8_t *k)
+{
+    uint8_t score = 0 ;
     uint8_t i;
     uint8_t goodvals[16] = {0};
     uint8_t uniq_vals[8] = {0};
     memset(goodvals, 0x00, 16);
     memset(uniq_vals, 0x00, 8);
     uint8_t badval = 0;
-    int badscore =0;
-    for ( i=0; i < 8 ; i++) {
+    int badscore = 0;
+    for (i = 0; i < 8 ; i++) {
         if (k[i] == 0x01) continue;
         if (k[i] == 0x00) continue;
         if (k[i] == 0x45) continue;
-        if (k[i] < 16){
+        if (k[i] < 16) {
             goodvals[k[i]] = 1;
         }
 //        if(k[i] ==9 || k[i]==2){
 //            goodvals[k[i]] = 1;
 //        }
 
-        else if (k[i]>=16){
+        else if (k[i] >= 16) {
             badscore++;
             badval = k[i];
         }
     }
-    for (i =0; i < 16; i++) {
+    for (i = 0; i < 16; i++) {
         if (goodvals[i]) {
             uniq_vals[score] = i;
-            score +=1;
+            score += 1;
         }
     }
 
-    if (score >=2 && badscore < 2) {
+    if (score >= 2 && badscore < 2) {
         printf("CSN\t%02x%02x%02x%02x%02x%02x%02x%02x\t%02x %02x %02x %02x %02x %02x %02x %02x\t"
-               ,csn[0],csn[1],csn[2],csn[3],csn[4],csn[5],csn[6],csn[7]
-                ,k[0],k[1],k[2],k[3],k[4],k[5],k[6],k[7]
-                );
+               , csn[0], csn[1], csn[2], csn[3], csn[4], csn[5], csn[6], csn[7]
+               , k[0], k[1], k[2], k[3], k[4], k[5], k[6], k[7]
+              );
 
-        for (i=0 ; i < score; i++) {
+        for (i = 0 ; i < score; i++) {
             printf("%d,", uniq_vals[i]);
         }
         printf("\tbadscore: %d (%02x)", badscore, badval);
@@ -53,21 +54,22 @@ void calc_score(uint8_t* csn, uint8_t* k) {
     }
 }
 
-void brute_hash1(void){
-    uint16_t a,b,c,d;
-    uint8_t csn[8] = {0,0,0,0,0xf7,0xff,0x12,0xe0};
-    uint8_t k[8]= {0,0,0,0,0,0,0,0};
-    uint8_t testcsn[8] = {0x00,0x0d,0x0f,0xfd,0xf7,0xff,0x12,0xe0} ;
-    uint8_t testkey[8] = {0x05 ,0x01 ,0x00 ,0x10 ,0x45 ,0x08 ,0x45,0x56} ;
-    calc_score(testcsn,testkey);
+void brute_hash1(void)
+{
+    uint16_t a, b, c, d;
+    uint8_t csn[8] = {0, 0, 0, 0, 0xf7, 0xff, 0x12, 0xe0};
+    uint8_t k[8] = {0, 0, 0, 0, 0, 0, 0, 0};
+    uint8_t testcsn[8] = {0x00, 0x0d, 0x0f, 0xfd, 0xf7, 0xff, 0x12, 0xe0} ;
+    uint8_t testkey[8] = {0x05, 0x01, 0x00, 0x10, 0x45, 0x08, 0x45, 0x56} ;
+    calc_score(testcsn, testkey);
     printf("Brute forcing hashones\n");
     //exit(1);
 
-    for (a=0; a < 256; a++) {
+    for (a = 0; a < 256; a++) {
         //if(a > 0)printf("%d/256 done...\n", a);
-        for (b=0; b < 256; b++)
-            for (c=0; c < 256; c++)
-               for (d=0; d < 256; d++) {
+        for (b = 0; b < 256; b++)
+            for (c = 0; c < 256; c++)
+                for (d = 0; d < 256; d++) {
                     csn[0] = a;
                     csn[1] = b;
                     csn[2] = c;
@@ -77,8 +79,8 @@ void brute_hash1(void){
                     csn[6] = 0x12;
                     csn[7] = 0xe0;
                     hash1(csn, k);
-                    calc_score(csn,k);
-               }
+                    calc_score(csn, k);
+                }
     }
 }
 
diff --git a/client/loclass/ikeys.c b/client/loclass/ikeys.c
index e754a5f52..59eae3d62 100644
--- a/client/loclass/ikeys.c
+++ b/client/loclass/ikeys.c
@@ -67,7 +67,7 @@ From "Dismantling iclass":
 #include "cipherutils.h"
 #include "mbedtls/des.h"
 
-uint8_t pi[35] = {0x0F,0x17,0x1B,0x1D,0x1E,0x27,0x2B,0x2D,0x2E,0x33,0x35,0x39,0x36,0x3A,0x3C,0x47,0x4B,0x4D,0x4E,0x53,0x55,0x56,0x59,0x5A,0x5C,0x63,0x65,0x66,0x69,0x6A,0x6C,0x71,0x72,0x74,0x78};
+uint8_t pi[35] = {0x0F, 0x17, 0x1B, 0x1D, 0x1E, 0x27, 0x2B, 0x2D, 0x2E, 0x33, 0x35, 0x39, 0x36, 0x3A, 0x3C, 0x47, 0x4B, 0x4D, 0x4E, 0x53, 0x55, 0x56, 0x59, 0x5A, 0x5C, 0x63, 0x65, 0x66, 0x69, 0x6A, 0x6C, 0x71, 0x72, 0x74, 0x78};
 
 static mbedtls_des_context ctx_enc;
 static mbedtls_des_context ctx_dec;
@@ -87,7 +87,7 @@ static int debug_print = 0;
  */
 uint8_t getSixBitByte(uint64_t c, int n)
 {
-    return (c >> (42-6*n)) & 0x3F;
+    return (c >> (42 - 6 * n)) & 0x3F;
 }
 
 /**
@@ -104,8 +104,8 @@ void pushbackSixBitByte(uint64_t *c, uint8_t z, int n)
 
     uint64_t masked = z & 0x3F;
     uint64_t eraser = 0x3F;
-    masked <<= 42-6*n;
-    eraser <<= 42-6*n;
+    masked <<= 42 - 6 * n;
+    eraser <<= 42 - 6 * n;
 
     //masked <<= 6*n;
     //eraser <<= 6*n;
@@ -125,14 +125,14 @@ void pushbackSixBitByte(uint64_t *c, uint8_t z, int n)
 uint64_t swapZvalues(uint64_t c)
 {
     uint64_t newz = 0;
-    pushbackSixBitByte(&newz, getSixBitByte(c,0),7);
-    pushbackSixBitByte(&newz, getSixBitByte(c,1),6);
-    pushbackSixBitByte(&newz, getSixBitByte(c,2),5);
-    pushbackSixBitByte(&newz, getSixBitByte(c,3),4);
-    pushbackSixBitByte(&newz, getSixBitByte(c,4),3);
-    pushbackSixBitByte(&newz, getSixBitByte(c,5),2);
-    pushbackSixBitByte(&newz, getSixBitByte(c,6),1);
-    pushbackSixBitByte(&newz, getSixBitByte(c,7),0);
+    pushbackSixBitByte(&newz, getSixBitByte(c, 0), 7);
+    pushbackSixBitByte(&newz, getSixBitByte(c, 1), 6);
+    pushbackSixBitByte(&newz, getSixBitByte(c, 2), 5);
+    pushbackSixBitByte(&newz, getSixBitByte(c, 3), 4);
+    pushbackSixBitByte(&newz, getSixBitByte(c, 4), 3);
+    pushbackSixBitByte(&newz, getSixBitByte(c, 5), 2);
+    pushbackSixBitByte(&newz, getSixBitByte(c, 6), 1);
+    pushbackSixBitByte(&newz, getSixBitByte(c, 7), 0);
     newz |= (c & 0xFFFF000000000000);
     return newz;
 }
@@ -145,26 +145,25 @@ uint64_t ck(int i, int j, uint64_t z)
     if (i == 1 && j == -1) {
         // ck(1, −1, z [0] . . . z [3] ) = z [0] . . . z [3]
         return z;
-    } else if( j == -1) {
+    } else if (j == -1) {
         // ck(i, −1, z [0] . . . z [3] ) = ck(i − 1, i − 2, z [0] . . . z [3] )
-        return ck(i-1,i-2, z);
+        return ck(i - 1, i - 2, z);
     }
 
-    if (getSixBitByte(z,i) == getSixBitByte(z,j))
-    {
+    if (getSixBitByte(z, i) == getSixBitByte(z, j)) {
         //ck(i, j − 1, z [0] . . . z [i] ← j . . . z [3] )
         uint64_t newz = 0;
         int c;
-        for(c = 0; c < 4; c++) {
-            uint8_t val = getSixBitByte(z,c);
+        for (c = 0; c < 4; c++) {
+            uint8_t val = getSixBitByte(z, c);
             if (c == i)
                 pushbackSixBitByte(&newz, j, c);
             else
                 pushbackSixBitByte(&newz, val, c);
         }
-        return ck(i,j-1,newz);
+        return ck(i, j - 1, newz);
     } else {
-        return ck(i,j-1,z);
+        return ck(i, j - 1, z);
     }
 }
 /**
@@ -189,10 +188,10 @@ uint64_t check(uint64_t z)
     //These 64 bits are divided as c = x, y, z [0] , . . . , z [7]
 
     // ck(3, 2, z [0] . . . z [3] )
-    uint64_t ck1 = ck(3,2, z );
+    uint64_t ck1 = ck(3, 2, z);
 
     // ck(3, 2, z [4] . . . z [7] )
-    uint64_t ck2 = ck(3,2, z << 24);
+    uint64_t ck2 = ck(3, 2, z << 24);
 
     //The ck function will place the values
     // in the middle of z.
@@ -203,45 +202,44 @@ uint64_t check(uint64_t z)
 
 }
 
-void permute(BitstreamIn *p_in, uint64_t z,int l,int r, BitstreamOut* out)
+void permute(BitstreamIn *p_in, uint64_t z, int l, int r, BitstreamOut *out)
 {
-    if(bitsLeft(p_in) == 0)
+    if (bitsLeft(p_in) == 0)
         return;
 
     bool pn = tailBit(p_in);
-    if( pn ) // pn = 1
-    {
-        uint8_t zl = getSixBitByte(z,l);
+    if (pn) { // pn = 1
+        uint8_t zl = getSixBitByte(z, l);
 
-        push6bits(out, zl+1);
-        permute(p_in, z, l+1,r, out);
-    }else // otherwise
-    {
-        uint8_t zr = getSixBitByte(z,r);
+        push6bits(out, zl + 1);
+        permute(p_in, z, l + 1, r, out);
+    } else { // otherwise
+        uint8_t zr = getSixBitByte(z, r);
 
         push6bits(out, zr);
-        permute(p_in,z,l,r+1,out);
+        permute(p_in, z, l, r + 1, out);
     }
 }
-void printbegin() {
+void printbegin()
+{
     if (debug_print < 2)
         return;
 
     PrintAndLogDevice(NORMAL, "          | x| y|z0|z1|z2|z3|z4|z5|z6|z7|");
 }
 
-void printState(char* desc, uint64_t c)
+void printState(char *desc, uint64_t c)
 {
-    if(debug_print < 2)
+    if (debug_print < 2)
         return;
 
     printf("%s : ", desc);
-    uint8_t x = (c & 0xFF00000000000000 ) >> 56;
-    uint8_t y = (c & 0x00FF000000000000 ) >> 48;
-    printf("  %02x %02x", x,y);
+    uint8_t x = (c & 0xFF00000000000000) >> 56;
+    uint8_t y = (c & 0x00FF000000000000) >> 48;
+    printf("  %02x %02x", x, y);
     int i;
-    for(i = 0; i < 8; i++)
-        printf(" %02x", getSixBitByte(c,i));
+    for (i = 0; i < 8; i++)
+        printf(" %02x", getSixBitByte(c, i));
     printf("\n");
 }
 
@@ -261,61 +259,59 @@ void hash0(uint64_t c, uint8_t k[8])
     c = swapZvalues(c);
 
     printbegin();
-    printState("origin",c);
+    printState("origin", c);
     //These 64 bits are divided as c = x, y, z [0] , . . . , z [7]
     // x = 8 bits
     // y = 8 bits
     // z0-z7 6 bits each : 48 bits
-    uint8_t x = (c & 0xFF00000000000000 ) >> 56;
-    uint8_t y = (c & 0x00FF000000000000 ) >> 48;
+    uint8_t x = (c & 0xFF00000000000000) >> 56;
+    uint8_t y = (c & 0x00FF000000000000) >> 48;
     int n;
     uint8_t zn, zn4, _zn, _zn4;
     uint64_t zP = 0;
 
-    for(n = 0;  n < 4 ; n++)
-    {
-        zn = getSixBitByte(c,n);
+    for (n = 0;  n < 4 ; n++) {
+        zn = getSixBitByte(c, n);
 
-        zn4 = getSixBitByte(c,n+4);
+        zn4 = getSixBitByte(c, n + 4);
 
-        _zn = (zn % (63-n)) + n;
-        _zn4 = (zn4 % (64-n)) + n;
+        _zn = (zn % (63 - n)) + n;
+        _zn4 = (zn4 % (64 - n)) + n;
 
-        pushbackSixBitByte(&zP, _zn,n);
-        pushbackSixBitByte(&zP, _zn4,n+4);
+        pushbackSixBitByte(&zP, _zn, n);
+        pushbackSixBitByte(&zP, _zn4, n + 4);
     }
 
-    printState("0|0|z'",zP);
+    printState("0|0|z'", zP);
 
     uint64_t zCaret = check(zP);
-    printState("0|0|z^",zP);
+    printState("0|0|z^", zP);
 
     uint8_t p = pi[x % 35];
 
-    if(x & 1) //Check if x7 is 1
+    if (x & 1) //Check if x7 is 1
         p = ~p;
 
-    if(debug_print >= 2) PrintAndLogDevice(DEBUG, "p:%02x", p);
+    if (debug_print >= 2) PrintAndLogDevice(DEBUG, "p:%02x", p);
 
-    BitstreamIn p_in = { &p, 8,0 };
-    uint8_t outbuffer[] = {0,0,0,0,0,0,0,0};
-    BitstreamOut out = {outbuffer,0,0};
-    permute(&p_in,zCaret,0,4,&out);//returns 48 bits? or 6 8-bytes
+    BitstreamIn p_in = { &p, 8, 0 };
+    uint8_t outbuffer[] = {0, 0, 0, 0, 0, 0, 0, 0};
+    BitstreamOut out = {outbuffer, 0, 0};
+    permute(&p_in, zCaret, 0, 4, &out); //returns 48 bits? or 6 8-bytes
 
     //Out is now a buffer containing six-bit bytes, should be 48 bits
     // if all went well
     //Shift z-values down onto the lower segment
 
-    uint64_t zTilde = x_bytes_to_num(outbuffer,8);
+    uint64_t zTilde = x_bytes_to_num(outbuffer, 8);
 
     zTilde >>= 16;
 
     printState("0|0|z~", zTilde);
 
     int i;
-    int zerocounter =0 ;
-    for(i = 0; i < 8; i++)
-    {
+    int zerocounter = 0 ;
+    for (i = 0; i < 8; i++) {
         // the key on index i is first a bit from y
         // then six bits from z,
         // then a bit from p
@@ -326,7 +322,7 @@ void hash0(uint64_t c, uint8_t k[8])
         //k[i] |= (y  << i) & 0x80 ;
 
         // First, place y(7-i) leftmost in k
-        k[i] |= (y  << (7-i)) & 0x80 ;
+        k[i] |= (y  << (7 - i)) & 0x80 ;
 
 
 
@@ -343,20 +339,17 @@ void hash0(uint64_t c, uint8_t k[8])
         //Shift bit i into rightmost location (mask only after complement)
         uint8_t p_i = p >> i & 0x1;
 
-        if( k[i] )// yi = 1
-        {
+        if (k[i]) { // yi = 1
             //printf("k[%d] +1\n", i);
             k[i] |= ~zTilde_i & 0x7E;
             k[i] |= p_i & 1;
             k[i] += 1;
 
-        }else // otherwise
-        {
+        } else { // otherwise
             k[i] |= zTilde_i & 0x7E;
             k[i] |= (~p_i) & 1;
         }
-        if ((k[i] & 1 )== 0)
-        {
+        if ((k[i] & 1) == 0) {
             zerocounter++;
         }
     }
@@ -370,31 +363,31 @@ void hash0(uint64_t c, uint8_t k[8])
 void diversifyKey(uint8_t csn[8], uint8_t key[8], uint8_t div_key[8])
 {
     // Prepare the DES key
-    mbedtls_des_setkey_enc( &ctx_enc, key);
+    mbedtls_des_setkey_enc(&ctx_enc, key);
 
     uint8_t crypted_csn[8] = {0};
 
     // Calculate DES(CSN, KEY)
-    mbedtls_des_crypt_ecb(&ctx_enc,csn, crypted_csn);
+    mbedtls_des_crypt_ecb(&ctx_enc, csn, crypted_csn);
 
     //Calculate HASH0(DES))
     uint64_t crypt_csn = x_bytes_to_num(crypted_csn, 8);
     //uint64_t crypted_csn_swapped = swapZvalues(crypt_csn);
 
-    hash0(crypt_csn,div_key);
+    hash0(crypt_csn, div_key);
 }
 
 void testPermute()
 {
     uint64_t x = 0;
-    pushbackSixBitByte(&x,0x00,0);
-    pushbackSixBitByte(&x,0x01,1);
-    pushbackSixBitByte(&x,0x02,2);
-    pushbackSixBitByte(&x,0x03,3);
-    pushbackSixBitByte(&x,0x04,4);
-    pushbackSixBitByte(&x,0x05,5);
-    pushbackSixBitByte(&x,0x06,6);
-    pushbackSixBitByte(&x,0x07,7);
+    pushbackSixBitByte(&x, 0x00, 0);
+    pushbackSixBitByte(&x, 0x01, 1);
+    pushbackSixBitByte(&x, 0x02, 2);
+    pushbackSixBitByte(&x, 0x03, 3);
+    pushbackSixBitByte(&x, 0x04, 4);
+    pushbackSixBitByte(&x, 0x05, 5);
+    pushbackSixBitByte(&x, 0x06, 6);
+    pushbackSixBitByte(&x, 0x07, 7);
 
     uint8_t mres[8] = { getSixBitByte(x, 0),
                         getSixBitByte(x, 1),
@@ -403,35 +396,36 @@ void testPermute()
                         getSixBitByte(x, 4),
                         getSixBitByte(x, 5),
                         getSixBitByte(x, 6),
-                        getSixBitByte(x, 7)};
-    printarr("input_perm", mres,8);
+                        getSixBitByte(x, 7)
+                      };
+    printarr("input_perm", mres, 8);
 
     uint8_t p = ~pi[0];
-    BitstreamIn p_in = { &p, 8,0 };
-    uint8_t outbuffer[] = {0,0,0,0,0,0,0,0};
-    BitstreamOut out = {outbuffer,0,0};
+    BitstreamIn p_in = { &p, 8, 0 };
+    uint8_t outbuffer[] = {0, 0, 0, 0, 0, 0, 0, 0};
+    BitstreamOut out = {outbuffer, 0, 0};
 
-    permute(&p_in, x,0,4, &out);
+    permute(&p_in, x, 0, 4, &out);
 
-    uint64_t permuted = x_bytes_to_num(outbuffer,8);
+    uint64_t permuted = x_bytes_to_num(outbuffer, 8);
     //printf("zTilde 0x%"PRIX64"\n", zTilde);
     permuted >>= 16;
 
     uint8_t res[8] = { getSixBitByte(permuted, 0),
-                        getSixBitByte(permuted, 1),
-                        getSixBitByte(permuted, 2),
-                        getSixBitByte(permuted, 3),
-                        getSixBitByte(permuted, 4),
-                        getSixBitByte(permuted, 5),
-                        getSixBitByte(permuted, 6),
-                        getSixBitByte(permuted, 7)};
+                       getSixBitByte(permuted, 1),
+                       getSixBitByte(permuted, 2),
+                       getSixBitByte(permuted, 3),
+                       getSixBitByte(permuted, 4),
+                       getSixBitByte(permuted, 5),
+                       getSixBitByte(permuted, 6),
+                       getSixBitByte(permuted, 7)
+                     };
     printarr("permuted", res, 8);
 }
 
 // These testcases are
 // { UID , TEMP_KEY, DIV_KEY} using the specific key
-typedef struct
-{
+typedef struct {
     uint8_t uid[8];
     uint8_t t_key[8];
     uint8_t div_key[8];
@@ -460,14 +454,14 @@ int testDES(Testcase testcase, mbedtls_des_context ctx_enc, mbedtls_des_context
         printarr("Expected", testcase.t_key, 8);
         retval = 1;
     }
-    uint64_t crypted_csn = x_bytes_to_num(des_encrypted_csn,8);
+    uint64_t crypted_csn = x_bytes_to_num(des_encrypted_csn, 8);
     hash0(crypted_csn, div_key);
 
     if (memcmp(div_key, testcase.div_key, 8) != 0) {
         //Key diversification fail
         PrintAndLogDevice(FAILED, "Div key != expected result");
-        printarr("  csn   ", testcase.uid,8);
-        printarr("{csn}   ", des_encrypted_csn,8);
+        printarr("  csn   ", testcase.uid, 8);
+        printarr("{csn}   ", des_encrypted_csn, 8);
         printarr("hash0   ", div_key, 8);
         printarr("Expected", testcase.div_key, 8);
         retval = 1;
@@ -475,15 +469,17 @@ int testDES(Testcase testcase, mbedtls_des_context ctx_enc, mbedtls_des_context
     return retval;
 }
 bool des_getParityBitFromKey(uint8_t key)
-{ // The top 7 bits is used
+{
+    // The top 7 bits is used
     bool parity = ((key & 0x80) >> 7)
-            ^ ((key & 0x40) >> 6) ^ ((key & 0x20) >> 5)
-            ^ ((key & 0x10) >> 4) ^ ((key & 0x08) >> 3)
-            ^ ((key & 0x04) >> 2) ^ ((key & 0x02) >> 1);
+                  ^ ((key & 0x40) >> 6) ^ ((key & 0x20) >> 5)
+                  ^ ((key & 0x10) >> 4) ^ ((key & 0x08) >> 3)
+                  ^ ((key & 0x04) >> 2) ^ ((key & 0x02) >> 1);
     return !parity;
 }
 
-void des_checkParity(uint8_t* key) {
+void des_checkParity(uint8_t *key)
+{
     int i;
     int fails = 0;
     for (i = 0; i < 8; i++) {
@@ -500,84 +496,85 @@ void des_checkParity(uint8_t* key) {
     }
 }
 
-Testcase testcases[] ={
+Testcase testcases[] = {
 
-    {{0x8B,0xAC,0x60,0x1F,0x53,0xB8,0xED,0x11},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x05,0x07}},
-    {{0xAE,0x51,0xE5,0x62,0xE7,0x9A,0x99,0x39},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01},{0x04,0x02,0x06,0x08,0x01,0x03,0x05,0x07}},
-    {{0x9B,0x21,0xE4,0x31,0x6A,0x00,0x29,0x62},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02},{0x06,0x04,0x02,0x08,0x01,0x03,0x05,0x07}},
-    {{0x65,0x24,0x0C,0x41,0x4F,0xC2,0x21,0x93},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04},{0x0A,0x04,0x06,0x08,0x01,0x03,0x05,0x07}},
-    {{0x7F,0xEB,0xAE,0x93,0xE5,0x30,0x08,0xBD},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08},{0x12,0x04,0x06,0x08,0x01,0x03,0x05,0x07}},
-    {{0x49,0x7B,0x70,0x74,0x9B,0x35,0x1B,0x83},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10},{0x22,0x04,0x06,0x08,0x01,0x03,0x05,0x07}},
-    {{0x02,0x3C,0x15,0x6B,0xED,0xA5,0x64,0x6C},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20},{0x42,0x04,0x06,0x08,0x01,0x03,0x05,0x07}},
-    {{0xE8,0x37,0xE0,0xE2,0xC6,0x45,0x24,0xF3},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x40},{0x02,0x06,0x04,0x08,0x01,0x03,0x05,0x07}},
-    {{0xAB,0xBD,0x30,0x05,0x29,0xC8,0xF7,0x12},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80},{0x02,0x08,0x06,0x04,0x01,0x03,0x05,0x07}},
-    {{0x17,0xE8,0x97,0xF0,0x99,0xB6,0x79,0x31},{0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00},{0x02,0x0C,0x06,0x08,0x01,0x03,0x05,0x07}},
-    {{0x49,0xA4,0xF0,0x8F,0x5F,0x96,0x83,0x16},{0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00},{0x02,0x14,0x06,0x08,0x01,0x03,0x05,0x07}},
-    {{0x60,0xF5,0x7E,0x54,0xAA,0x41,0x83,0xD4},{0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x00},{0x02,0x24,0x06,0x08,0x01,0x03,0x05,0x07}},
-    {{0x1D,0xF6,0x3B,0x6B,0x85,0x55,0xF0,0x4B},{0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x00},{0x02,0x44,0x06,0x08,0x01,0x03,0x05,0x07}},
-    {{0x1F,0xDC,0x95,0x1A,0xEA,0x6B,0x4B,0xB4},{0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00},{0x02,0x04,0x08,0x06,0x01,0x03,0x05,0x07}},
-    {{0xEC,0x93,0x72,0xF0,0x3B,0xA9,0xF5,0x0B},{0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00},{0x02,0x04,0x0A,0x08,0x01,0x03,0x05,0x07}},
-    {{0xDE,0x57,0x5C,0xBE,0x2D,0x55,0x03,0x12},{0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x00},{0x02,0x04,0x0E,0x08,0x01,0x03,0x05,0x07}},
-    {{0x1E,0xD2,0xB5,0xCE,0x90,0xC9,0xC1,0xCC},{0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00},{0x02,0x04,0x16,0x08,0x01,0x03,0x05,0x07}},
-    {{0xD8,0x65,0x96,0x4E,0xE7,0x74,0x99,0xB8},{0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00},{0x02,0x04,0x26,0x08,0x01,0x03,0x05,0x07}},
-    {{0xE3,0x7A,0x29,0x83,0x31,0xD5,0x3A,0x54},{0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x00},{0x02,0x04,0x46,0x08,0x01,0x03,0x05,0x07}},
-    {{0x3A,0xB5,0x1A,0x34,0x34,0x25,0x12,0xF0},{0x00,0x00,0x00,0x00,0x00,0x04,0x00,0x00},{0x02,0x04,0x06,0x0A,0x01,0x03,0x05,0x07}},
-    {{0xF2,0x88,0xEE,0x6F,0x70,0x6F,0xC2,0x52},{0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x00},{0x02,0x04,0x06,0x0C,0x01,0x03,0x05,0x07}},
-    {{0x76,0xEF,0xEB,0x80,0x52,0x43,0x83,0x57},{0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x00},{0x02,0x04,0x06,0x10,0x01,0x03,0x05,0x07}},
-    {{0x1C,0x09,0x8E,0x3B,0x23,0x23,0x52,0xB5},{0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00},{0x02,0x04,0x06,0x18,0x01,0x03,0x05,0x07}},
-    {{0xA9,0x13,0xA2,0xBE,0xCF,0x1A,0xC4,0x9A},{0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x00},{0x02,0x04,0x06,0x28,0x01,0x03,0x05,0x07}},
-    {{0x25,0x56,0x4B,0xB0,0xC8,0x2A,0xD4,0x27},{0x00,0x00,0x00,0x00,0x00,0x80,0x00,0x00},{0x02,0x04,0x06,0x48,0x01,0x03,0x05,0x07}},
-    {{0xB1,0x04,0x57,0x3F,0xA7,0x16,0x62,0xD4},{0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x03,0x01,0x05,0x07}},
-    {{0x45,0x46,0xED,0xCC,0xE7,0xD3,0x8E,0xA3},{0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x05,0x03,0x01,0x07}},
-    {{0x22,0x6D,0xB5,0x35,0xE0,0x5A,0xE0,0x90},{0x00,0x00,0x00,0x00,0x04,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x09,0x03,0x05,0x07}},
-    {{0xB8,0xF5,0xE5,0x44,0xC5,0x98,0x4A,0xBD},{0x00,0x00,0x00,0x00,0x08,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x11,0x03,0x05,0x07}},
-    {{0xAC,0x78,0x0A,0x23,0x9E,0xF6,0xBC,0xA0},{0x00,0x00,0x00,0x00,0x10,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x21,0x03,0x05,0x07}},
-    {{0x46,0x6B,0x2D,0x70,0x41,0x17,0xBF,0x3D},{0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x41,0x03,0x05,0x07}},
-    {{0x64,0x44,0x24,0x71,0xA2,0x56,0xDF,0xB5},{0x00,0x00,0x00,0x00,0x40,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x05,0x03,0x07}},
-    {{0xC4,0x00,0x52,0x24,0xA2,0xD6,0x16,0x7A},{0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x07,0x05,0x03}},
-    {{0xD8,0x4A,0x80,0x1E,0x95,0x5B,0x70,0xC4},{0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x0B,0x05,0x07}},
-    {{0x08,0x56,0x6E,0xB5,0x64,0xD6,0x47,0x4E},{0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x13,0x05,0x07}},
-    {{0x41,0x6F,0xBA,0xA4,0xEB,0xAE,0xA0,0x55},{0x00,0x00,0x00,0x04,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x23,0x05,0x07}},
-    {{0x62,0x9D,0xDE,0x72,0x84,0x4A,0x53,0xD5},{0x00,0x00,0x00,0x08,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x43,0x05,0x07}},
-    {{0x39,0xD3,0x2B,0x66,0xB8,0x08,0x40,0x2E},{0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x07,0x05}},
-    {{0xAF,0x67,0xA9,0x18,0x57,0x21,0xAF,0x8D},{0x00,0x00,0x00,0x20,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x09,0x07}},
-    {{0x34,0xBC,0x9D,0xBC,0xC4,0xC2,0x3B,0xC8},{0x00,0x00,0x00,0x40,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x0D,0x07}},
-    {{0xB6,0x50,0xF9,0x81,0xF6,0xBF,0x90,0x3C},{0x00,0x00,0x00,0x80,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x15,0x07}},
-    {{0x71,0x41,0x93,0xA1,0x59,0x81,0xA5,0x52},{0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x25,0x07}},
-    {{0x6B,0x00,0xBD,0x74,0x1C,0x3C,0xE0,0x1A},{0x00,0x00,0x02,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x45,0x07}},
-    {{0x76,0xFD,0x0B,0xD0,0x41,0xD2,0x82,0x5D},{0x00,0x00,0x04,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x05,0x09}},
-    {{0xC6,0x3A,0x1C,0x25,0x63,0x5A,0x2F,0x0E},{0x00,0x00,0x08,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x05,0x0B}},
-    {{0xD9,0x0E,0xD7,0x30,0xE2,0xAD,0xA9,0x87},{0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x05,0x0F}},
-    {{0x6B,0x81,0xC6,0xD1,0x05,0x09,0x87,0x1E},{0x00,0x00,0x20,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x05,0x17}},
-    {{0xB4,0xA7,0x1E,0x02,0x54,0x37,0x43,0x35},{0x00,0x00,0x40,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x05,0x27}},
-    {{0x45,0x14,0x7C,0x7F,0xE0,0xDE,0x09,0x65},{0x00,0x00,0x80,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x05,0x47}},
-    {{0x78,0xB0,0xF5,0x20,0x8B,0x7D,0xF3,0xDD},{0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00},{0xFE,0x04,0x06,0x08,0x01,0x03,0x05,0x07}},
-    {{0x88,0xB3,0x3C,0xE1,0xF7,0x87,0x42,0xA1},{0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00},{0x02,0xFC,0x06,0x08,0x01,0x03,0x05,0x07}},
-    {{0x11,0x2F,0xB2,0xF7,0xE2,0xB2,0x4F,0x6E},{0x00,0x04,0x00,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0xFA,0x08,0x01,0x03,0x05,0x07}},
-    {{0x25,0x56,0x4E,0xC6,0xEB,0x2D,0x74,0x5B},{0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0xF8,0x01,0x03,0x05,0x07}},
-    {{0x7E,0x98,0x37,0xF9,0x80,0x8F,0x09,0x82},{0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0xFF,0x03,0x05,0x07}},
-    {{0xF9,0xB5,0x62,0x3B,0xD8,0x7B,0x3C,0x3F},{0x00,0x20,0x00,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0xFD,0x05,0x07}},
-    {{0x29,0xC5,0x2B,0xFA,0xD1,0xFC,0x5C,0xC7},{0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0xFB,0x07}},
-    {{0xC1,0xA3,0x09,0x71,0xBD,0x8E,0xAF,0x2F},{0x00,0x80,0x00,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x05,0xF9}},
-    {{0xB6,0xDD,0xD1,0xAD,0xAA,0x15,0x6F,0x29},{0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x01,0x03,0x05,0x02,0x07,0x04,0x06,0x08}},
-    {{0x65,0x34,0x03,0x19,0x17,0xB3,0xA3,0x96},{0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x01,0x06,0x08,0x03,0x05,0x07}},
-    {{0xF9,0x38,0x43,0x56,0x52,0xE5,0xB1,0xA9},{0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x01,0x02,0x04,0x06,0x08,0x03,0x05,0x07}},
+    {{0x8B, 0xAC, 0x60, 0x1F, 0x53, 0xB8, 0xED, 0x11}, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, {0x02, 0x04, 0x06, 0x08, 0x01, 0x03, 0x05, 0x07}},
+    {{0xAE, 0x51, 0xE5, 0x62, 0xE7, 0x9A, 0x99, 0x39}, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01}, {0x04, 0x02, 0x06, 0x08, 0x01, 0x03, 0x05, 0x07}},
+    {{0x9B, 0x21, 0xE4, 0x31, 0x6A, 0x00, 0x29, 0x62}, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02}, {0x06, 0x04, 0x02, 0x08, 0x01, 0x03, 0x05, 0x07}},
+    {{0x65, 0x24, 0x0C, 0x41, 0x4F, 0xC2, 0x21, 0x93}, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04}, {0x0A, 0x04, 0x06, 0x08, 0x01, 0x03, 0x05, 0x07}},
+    {{0x7F, 0xEB, 0xAE, 0x93, 0xE5, 0x30, 0x08, 0xBD}, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08}, {0x12, 0x04, 0x06, 0x08, 0x01, 0x03, 0x05, 0x07}},
+    {{0x49, 0x7B, 0x70, 0x74, 0x9B, 0x35, 0x1B, 0x83}, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10}, {0x22, 0x04, 0x06, 0x08, 0x01, 0x03, 0x05, 0x07}},
+    {{0x02, 0x3C, 0x15, 0x6B, 0xED, 0xA5, 0x64, 0x6C}, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20}, {0x42, 0x04, 0x06, 0x08, 0x01, 0x03, 0x05, 0x07}},
+    {{0xE8, 0x37, 0xE0, 0xE2, 0xC6, 0x45, 0x24, 0xF3}, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40}, {0x02, 0x06, 0x04, 0x08, 0x01, 0x03, 0x05, 0x07}},
+    {{0xAB, 0xBD, 0x30, 0x05, 0x29, 0xC8, 0xF7, 0x12}, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80}, {0x02, 0x08, 0x06, 0x04, 0x01, 0x03, 0x05, 0x07}},
+    {{0x17, 0xE8, 0x97, 0xF0, 0x99, 0xB6, 0x79, 0x31}, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00}, {0x02, 0x0C, 0x06, 0x08, 0x01, 0x03, 0x05, 0x07}},
+    {{0x49, 0xA4, 0xF0, 0x8F, 0x5F, 0x96, 0x83, 0x16}, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00}, {0x02, 0x14, 0x06, 0x08, 0x01, 0x03, 0x05, 0x07}},
+    {{0x60, 0xF5, 0x7E, 0x54, 0xAA, 0x41, 0x83, 0xD4}, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00}, {0x02, 0x24, 0x06, 0x08, 0x01, 0x03, 0x05, 0x07}},
+    {{0x1D, 0xF6, 0x3B, 0x6B, 0x85, 0x55, 0xF0, 0x4B}, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00}, {0x02, 0x44, 0x06, 0x08, 0x01, 0x03, 0x05, 0x07}},
+    {{0x1F, 0xDC, 0x95, 0x1A, 0xEA, 0x6B, 0x4B, 0xB4}, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00}, {0x02, 0x04, 0x08, 0x06, 0x01, 0x03, 0x05, 0x07}},
+    {{0xEC, 0x93, 0x72, 0xF0, 0x3B, 0xA9, 0xF5, 0x0B}, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00}, {0x02, 0x04, 0x0A, 0x08, 0x01, 0x03, 0x05, 0x07}},
+    {{0xDE, 0x57, 0x5C, 0xBE, 0x2D, 0x55, 0x03, 0x12}, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00}, {0x02, 0x04, 0x0E, 0x08, 0x01, 0x03, 0x05, 0x07}},
+    {{0x1E, 0xD2, 0xB5, 0xCE, 0x90, 0xC9, 0xC1, 0xCC}, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00}, {0x02, 0x04, 0x16, 0x08, 0x01, 0x03, 0x05, 0x07}},
+    {{0xD8, 0x65, 0x96, 0x4E, 0xE7, 0x74, 0x99, 0xB8}, {0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00}, {0x02, 0x04, 0x26, 0x08, 0x01, 0x03, 0x05, 0x07}},
+    {{0xE3, 0x7A, 0x29, 0x83, 0x31, 0xD5, 0x3A, 0x54}, {0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00}, {0x02, 0x04, 0x46, 0x08, 0x01, 0x03, 0x05, 0x07}},
+    {{0x3A, 0xB5, 0x1A, 0x34, 0x34, 0x25, 0x12, 0xF0}, {0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00}, {0x02, 0x04, 0x06, 0x0A, 0x01, 0x03, 0x05, 0x07}},
+    {{0xF2, 0x88, 0xEE, 0x6F, 0x70, 0x6F, 0xC2, 0x52}, {0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00}, {0x02, 0x04, 0x06, 0x0C, 0x01, 0x03, 0x05, 0x07}},
+    {{0x76, 0xEF, 0xEB, 0x80, 0x52, 0x43, 0x83, 0x57}, {0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00}, {0x02, 0x04, 0x06, 0x10, 0x01, 0x03, 0x05, 0x07}},
+    {{0x1C, 0x09, 0x8E, 0x3B, 0x23, 0x23, 0x52, 0xB5}, {0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00}, {0x02, 0x04, 0x06, 0x18, 0x01, 0x03, 0x05, 0x07}},
+    {{0xA9, 0x13, 0xA2, 0xBE, 0xCF, 0x1A, 0xC4, 0x9A}, {0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00}, {0x02, 0x04, 0x06, 0x28, 0x01, 0x03, 0x05, 0x07}},
+    {{0x25, 0x56, 0x4B, 0xB0, 0xC8, 0x2A, 0xD4, 0x27}, {0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00}, {0x02, 0x04, 0x06, 0x48, 0x01, 0x03, 0x05, 0x07}},
+    {{0xB1, 0x04, 0x57, 0x3F, 0xA7, 0x16, 0x62, 0xD4}, {0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00}, {0x02, 0x04, 0x06, 0x08, 0x03, 0x01, 0x05, 0x07}},
+    {{0x45, 0x46, 0xED, 0xCC, 0xE7, 0xD3, 0x8E, 0xA3}, {0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00}, {0x02, 0x04, 0x06, 0x08, 0x05, 0x03, 0x01, 0x07}},
+    {{0x22, 0x6D, 0xB5, 0x35, 0xE0, 0x5A, 0xE0, 0x90}, {0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00}, {0x02, 0x04, 0x06, 0x08, 0x09, 0x03, 0x05, 0x07}},
+    {{0xB8, 0xF5, 0xE5, 0x44, 0xC5, 0x98, 0x4A, 0xBD}, {0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00}, {0x02, 0x04, 0x06, 0x08, 0x11, 0x03, 0x05, 0x07}},
+    {{0xAC, 0x78, 0x0A, 0x23, 0x9E, 0xF6, 0xBC, 0xA0}, {0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00}, {0x02, 0x04, 0x06, 0x08, 0x21, 0x03, 0x05, 0x07}},
+    {{0x46, 0x6B, 0x2D, 0x70, 0x41, 0x17, 0xBF, 0x3D}, {0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00}, {0x02, 0x04, 0x06, 0x08, 0x41, 0x03, 0x05, 0x07}},
+    {{0x64, 0x44, 0x24, 0x71, 0xA2, 0x56, 0xDF, 0xB5}, {0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00}, {0x02, 0x04, 0x06, 0x08, 0x01, 0x05, 0x03, 0x07}},
+    {{0xC4, 0x00, 0x52, 0x24, 0xA2, 0xD6, 0x16, 0x7A}, {0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00}, {0x02, 0x04, 0x06, 0x08, 0x01, 0x07, 0x05, 0x03}},
+    {{0xD8, 0x4A, 0x80, 0x1E, 0x95, 0x5B, 0x70, 0xC4}, {0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00}, {0x02, 0x04, 0x06, 0x08, 0x01, 0x0B, 0x05, 0x07}},
+    {{0x08, 0x56, 0x6E, 0xB5, 0x64, 0xD6, 0x47, 0x4E}, {0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00}, {0x02, 0x04, 0x06, 0x08, 0x01, 0x13, 0x05, 0x07}},
+    {{0x41, 0x6F, 0xBA, 0xA4, 0xEB, 0xAE, 0xA0, 0x55}, {0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00}, {0x02, 0x04, 0x06, 0x08, 0x01, 0x23, 0x05, 0x07}},
+    {{0x62, 0x9D, 0xDE, 0x72, 0x84, 0x4A, 0x53, 0xD5}, {0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00}, {0x02, 0x04, 0x06, 0x08, 0x01, 0x43, 0x05, 0x07}},
+    {{0x39, 0xD3, 0x2B, 0x66, 0xB8, 0x08, 0x40, 0x2E}, {0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00}, {0x02, 0x04, 0x06, 0x08, 0x01, 0x03, 0x07, 0x05}},
+    {{0xAF, 0x67, 0xA9, 0x18, 0x57, 0x21, 0xAF, 0x8D}, {0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00}, {0x02, 0x04, 0x06, 0x08, 0x01, 0x03, 0x09, 0x07}},
+    {{0x34, 0xBC, 0x9D, 0xBC, 0xC4, 0xC2, 0x3B, 0xC8}, {0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00}, {0x02, 0x04, 0x06, 0x08, 0x01, 0x03, 0x0D, 0x07}},
+    {{0xB6, 0x50, 0xF9, 0x81, 0xF6, 0xBF, 0x90, 0x3C}, {0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00}, {0x02, 0x04, 0x06, 0x08, 0x01, 0x03, 0x15, 0x07}},
+    {{0x71, 0x41, 0x93, 0xA1, 0x59, 0x81, 0xA5, 0x52}, {0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00}, {0x02, 0x04, 0x06, 0x08, 0x01, 0x03, 0x25, 0x07}},
+    {{0x6B, 0x00, 0xBD, 0x74, 0x1C, 0x3C, 0xE0, 0x1A}, {0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00}, {0x02, 0x04, 0x06, 0x08, 0x01, 0x03, 0x45, 0x07}},
+    {{0x76, 0xFD, 0x0B, 0xD0, 0x41, 0xD2, 0x82, 0x5D}, {0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00}, {0x02, 0x04, 0x06, 0x08, 0x01, 0x03, 0x05, 0x09}},
+    {{0xC6, 0x3A, 0x1C, 0x25, 0x63, 0x5A, 0x2F, 0x0E}, {0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00}, {0x02, 0x04, 0x06, 0x08, 0x01, 0x03, 0x05, 0x0B}},
+    {{0xD9, 0x0E, 0xD7, 0x30, 0xE2, 0xAD, 0xA9, 0x87}, {0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00}, {0x02, 0x04, 0x06, 0x08, 0x01, 0x03, 0x05, 0x0F}},
+    {{0x6B, 0x81, 0xC6, 0xD1, 0x05, 0x09, 0x87, 0x1E}, {0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00}, {0x02, 0x04, 0x06, 0x08, 0x01, 0x03, 0x05, 0x17}},
+    {{0xB4, 0xA7, 0x1E, 0x02, 0x54, 0x37, 0x43, 0x35}, {0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00}, {0x02, 0x04, 0x06, 0x08, 0x01, 0x03, 0x05, 0x27}},
+    {{0x45, 0x14, 0x7C, 0x7F, 0xE0, 0xDE, 0x09, 0x65}, {0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00}, {0x02, 0x04, 0x06, 0x08, 0x01, 0x03, 0x05, 0x47}},
+    {{0x78, 0xB0, 0xF5, 0x20, 0x8B, 0x7D, 0xF3, 0xDD}, {0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, {0xFE, 0x04, 0x06, 0x08, 0x01, 0x03, 0x05, 0x07}},
+    {{0x88, 0xB3, 0x3C, 0xE1, 0xF7, 0x87, 0x42, 0xA1}, {0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, {0x02, 0xFC, 0x06, 0x08, 0x01, 0x03, 0x05, 0x07}},
+    {{0x11, 0x2F, 0xB2, 0xF7, 0xE2, 0xB2, 0x4F, 0x6E}, {0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, {0x02, 0x04, 0xFA, 0x08, 0x01, 0x03, 0x05, 0x07}},
+    {{0x25, 0x56, 0x4E, 0xC6, 0xEB, 0x2D, 0x74, 0x5B}, {0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, {0x02, 0x04, 0x06, 0xF8, 0x01, 0x03, 0x05, 0x07}},
+    {{0x7E, 0x98, 0x37, 0xF9, 0x80, 0x8F, 0x09, 0x82}, {0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, {0x02, 0x04, 0x06, 0x08, 0xFF, 0x03, 0x05, 0x07}},
+    {{0xF9, 0xB5, 0x62, 0x3B, 0xD8, 0x7B, 0x3C, 0x3F}, {0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, {0x02, 0x04, 0x06, 0x08, 0x01, 0xFD, 0x05, 0x07}},
+    {{0x29, 0xC5, 0x2B, 0xFA, 0xD1, 0xFC, 0x5C, 0xC7}, {0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, {0x02, 0x04, 0x06, 0x08, 0x01, 0x03, 0xFB, 0x07}},
+    {{0xC1, 0xA3, 0x09, 0x71, 0xBD, 0x8E, 0xAF, 0x2F}, {0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, {0x02, 0x04, 0x06, 0x08, 0x01, 0x03, 0x05, 0xF9}},
+    {{0xB6, 0xDD, 0xD1, 0xAD, 0xAA, 0x15, 0x6F, 0x29}, {0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, {0x01, 0x03, 0x05, 0x02, 0x07, 0x04, 0x06, 0x08}},
+    {{0x65, 0x34, 0x03, 0x19, 0x17, 0xB3, 0xA3, 0x96}, {0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, {0x02, 0x04, 0x01, 0x06, 0x08, 0x03, 0x05, 0x07}},
+    {{0xF9, 0x38, 0x43, 0x56, 0x52, 0xE5, 0xB1, 0xA9}, {0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, {0x01, 0x02, 0x04, 0x06, 0x08, 0x03, 0x05, 0x07}},
 
-    {{0xA4,0xA0,0xAF,0xDA,0x48,0xB0,0xA1,0x10},{0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x01,0x02,0x04,0x06,0x03,0x08,0x05,0x07}},
-    {{0x55,0x15,0x8A,0x0D,0x48,0x29,0x01,0xD8},{0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x01,0x06,0x03,0x05,0x08,0x07}},
-    {{0xC4,0x81,0x96,0x7D,0xA3,0xB7,0x73,0x50},{0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x01,0x02,0x03,0x05,0x04,0x06,0x08,0x07}},
-    {{0x36,0x73,0xDF,0xC1,0x1B,0x98,0xA8,0x1D},{0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x01,0x02,0x03,0x04,0x05,0x06,0x08,0x07}},
-    {{0xCE,0xE0,0xB3,0x1B,0x41,0xEB,0x15,0x12},{0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x01,0x02,0x03,0x04,0x06,0x05,0x08,0x07}},
-    {{0},{0},{0}}
+    {{0xA4, 0xA0, 0xAF, 0xDA, 0x48, 0xB0, 0xA1, 0x10}, {0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, {0x01, 0x02, 0x04, 0x06, 0x03, 0x08, 0x05, 0x07}},
+    {{0x55, 0x15, 0x8A, 0x0D, 0x48, 0x29, 0x01, 0xD8}, {0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, {0x02, 0x04, 0x01, 0x06, 0x03, 0x05, 0x08, 0x07}},
+    {{0xC4, 0x81, 0x96, 0x7D, 0xA3, 0xB7, 0x73, 0x50}, {0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, {0x01, 0x02, 0x03, 0x05, 0x04, 0x06, 0x08, 0x07}},
+    {{0x36, 0x73, 0xDF, 0xC1, 0x1B, 0x98, 0xA8, 0x1D}, {0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x08, 0x07}},
+    {{0xCE, 0xE0, 0xB3, 0x1B, 0x41, 0xEB, 0x15, 0x12}, {0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, {0x01, 0x02, 0x03, 0x04, 0x06, 0x05, 0x08, 0x07}},
+    {{0}, {0}, {0}}
 };
 
-int testKeyDiversificationWithMasterkeyTestcases() {
+int testKeyDiversificationWithMasterkeyTestcases()
+{
     int i, error = 0;
     uint8_t empty[8] = {0};
 
     PrintAndLogDevice(INFO, "Testing encryption/decryption");
 
-    for (i = 0; memcmp(testcases+i, empty, 8); i++)
+    for (i = 0; memcmp(testcases + i, empty, 8); i++)
         error += testDES(testcases[i], ctx_enc, ctx_dec);
 
     if (error)
@@ -587,8 +584,9 @@ int testKeyDiversificationWithMasterkeyTestcases() {
     return error;
 }
 
-void print64bits(char*name, uint64_t val) {
-    printf("%s%08x%08x\n", name, (uint32_t) (val >> 32) ,(uint32_t) (val & 0xFFFFFFFF));
+void print64bits(char *name, uint64_t val)
+{
+    printf("%s%08x%08x\n", name, (uint32_t)(val >> 32), (uint32_t)(val & 0xFFFFFFFF));
 }
 
 uint64_t testCryptedCSN(uint64_t crypted_csn, uint64_t expected)
@@ -596,20 +594,21 @@ uint64_t testCryptedCSN(uint64_t crypted_csn, uint64_t expected)
     int retval = 0;
     uint8_t result[8] = {0};
     if (debug_print) PrintAndLogDevice(DEBUG, "debug_print %d", debug_print);
-    if (debug_print) print64bits("    {csn}      ", crypted_csn );
+    if (debug_print) print64bits("    {csn}      ", crypted_csn);
 
     uint64_t crypted_csn_swapped = swapZvalues(crypted_csn);
 
     if (debug_print) print64bits("    {csn-revz} ", crypted_csn_swapped);
 
     hash0(crypted_csn, result);
-    uint64_t resultbyte = x_bytes_to_num(result,8 );
-    if (debug_print) print64bits("    hash0      " , resultbyte );
+    uint64_t resultbyte = x_bytes_to_num(result, 8);
+    if (debug_print) print64bits("    hash0      ", resultbyte);
 
-    if (resultbyte != expected ) {
+    if (resultbyte != expected) {
         if (debug_print) {
-            PrintAndLogDevice(NORMAL, "\n"); PrintAndLogDevice(FAILED, "FAIL!");
-            print64bits("    expected       " ,  expected );
+            PrintAndLogDevice(NORMAL, "\n");
+            PrintAndLogDevice(FAILED, "FAIL!");
+            print64bits("    expected       ",  expected);
         }
         retval = 1;
     } else {
@@ -618,7 +617,8 @@ uint64_t testCryptedCSN(uint64_t crypted_csn, uint64_t expected)
     return retval;
 }
 
-int testDES2(uint64_t csn, uint64_t expected) {
+int testDES2(uint64_t csn, uint64_t expected)
+{
     uint8_t result[8] = {0};
     uint8_t input[8] = {0};
 
@@ -628,10 +628,10 @@ int testDES2(uint64_t csn, uint64_t expected) {
     mbedtls_des_crypt_ecb(&ctx_enc, input, result);
 
     uint64_t crypt_csn = x_bytes_to_num(result, 8);
-    print64bits("   {csn}    ", crypt_csn );
-    print64bits("   expected ", expected );
+    print64bits("   {csn}    ", crypt_csn);
+    print64bits("   expected ", expected);
 
-    if( expected == crypt_csn ) {
+    if (expected == crypt_csn) {
         PrintAndLogDevice(SUCCESS, "OK");
         return 0;
     } else {
@@ -644,49 +644,51 @@ int testDES2(uint64_t csn, uint64_t expected) {
  * @brief doTestsWithKnownInputs
  * @return
  */
-int doTestsWithKnownInputs() {
+int doTestsWithKnownInputs()
+{
     // KSel from http://www.proxmark.org/forum/viewtopic.php?pid=10977#p10977
     int errors = 0;
     PrintAndLogDevice(SUCCESS, "Testing DES encryption");
-    uint8_t key[8] = {0x6c,0x8d,0x44,0xf9,0x2a,0x2d,0x01,0xbf};
+    uint8_t key[8] = {0x6c, 0x8d, 0x44, 0xf9, 0x2a, 0x2d, 0x01, 0xbf};
 
-    mbedtls_des_setkey_enc( &ctx_enc, key);
-    testDES2(0xbbbbaaaabbbbeeee,0xd6ad3ca619659e6b);
+    mbedtls_des_setkey_enc(&ctx_enc, key);
+    testDES2(0xbbbbaaaabbbbeeee, 0xd6ad3ca619659e6b);
 
     PrintAndLogDevice(SUCCESS, "Testing hashing algorithm");
 
-    errors += testCryptedCSN(0x0102030405060708,0x0bdd6512073c460a);
-    errors += testCryptedCSN(0x1020304050607080,0x0208211405f3381f);
-    errors += testCryptedCSN(0x1122334455667788,0x2bee256d40ac1f3a);
-    errors += testCryptedCSN(0xabcdabcdabcdabcd,0xa91c9ec66f7da592);
-    errors += testCryptedCSN(0xbcdabcdabcdabcda,0x79ca5796a474e19b);
-    errors += testCryptedCSN(0xcdabcdabcdabcdab,0xa8901b9f7ec76da4);
-    errors += testCryptedCSN(0xdabcdabcdabcdabc,0x357aa8e0979a5b8d);
-    errors += testCryptedCSN(0x21ba6565071f9299,0x34e80f88d5cf39ea);
-    errors += testCryptedCSN(0x14e2adfc5bb7e134,0x6ac90c6508bd9ea3);
+    errors += testCryptedCSN(0x0102030405060708, 0x0bdd6512073c460a);
+    errors += testCryptedCSN(0x1020304050607080, 0x0208211405f3381f);
+    errors += testCryptedCSN(0x1122334455667788, 0x2bee256d40ac1f3a);
+    errors += testCryptedCSN(0xabcdabcdabcdabcd, 0xa91c9ec66f7da592);
+    errors += testCryptedCSN(0xbcdabcdabcdabcda, 0x79ca5796a474e19b);
+    errors += testCryptedCSN(0xcdabcdabcdabcdab, 0xa8901b9f7ec76da4);
+    errors += testCryptedCSN(0xdabcdabcdabcdabc, 0x357aa8e0979a5b8d);
+    errors += testCryptedCSN(0x21ba6565071f9299, 0x34e80f88d5cf39ea);
+    errors += testCryptedCSN(0x14e2adfc5bb7e134, 0x6ac90c6508bd9ea3);
 
     if (errors)
         PrintAndLogDevice(FAILED, "%d errors occurred (9 testcases)", errors);
     else
-        PrintAndLogDevice(SUCCESS, "Hashing seems to work (9 testcases)" );
+        PrintAndLogDevice(SUCCESS, "Hashing seems to work (9 testcases)");
     return errors;
 }
 
-static bool readKeyFile(uint8_t key[8]) {
+static bool readKeyFile(uint8_t key[8])
+{
     bool retval = false;
 
     //Test a few variants
     char filename[30] = {0};
 
-    if (fileExists("iclass_key.bin")){
+    if (fileExists("iclass_key.bin")) {
         sprintf(filename, "%s.bin", "iclass_key");
-    } else if (fileExists("loclass/iclass_key.bin")){
+    } else if (fileExists("loclass/iclass_key.bin")) {
         sprintf(filename, "%s.bin", "loclass/iclass_key");
-    } else if (fileExists("client/loclass/iclass_key.bin")){
+    } else if (fileExists("client/loclass/iclass_key.bin")) {
         sprintf(filename, "%s.bin", "client/loclass/iclass_key");
     }
 
-    if ( strlen(filename) == 0 )
+    if (strlen(filename) == 0)
         return retval;
 
     FILE *f = fopen(filename, "rb");
@@ -694,7 +696,7 @@ static bool readKeyFile(uint8_t key[8]) {
         return retval;
 
     size_t bytes_read = fread(key, sizeof(uint8_t), 8, f);
-    if ( bytes_read == 8)
+    if (bytes_read == 8)
         retval = true;
 
     if (f)
@@ -702,7 +704,8 @@ static bool readKeyFile(uint8_t key[8]) {
     return retval;
 }
 
-int doKeyTests(uint8_t debuglevel) {
+int doKeyTests(uint8_t debuglevel)
+{
     debug_print = debuglevel;
 
     PrintAndLogDevice(INFO, "Checking if the master key is present (iclass_key.bin)...");
@@ -723,8 +726,8 @@ int doKeyTests(uint8_t debuglevel) {
             PrintAndLogDevice(SUCCESS, "Key present");
             PrintAndLogDevice(SUCCESS, "Checking key parity...");
             des_checkParity(key);
-            mbedtls_des_setkey_enc( &ctx_enc, key);
-            mbedtls_des_setkey_dec( &ctx_dec, key);
+            mbedtls_des_setkey_enc(&ctx_enc, key);
+            mbedtls_des_setkey_dec(&ctx_dec, key);
             // Test hashing functions
             PrintAndLogDevice(SUCCESS, "The following tests require the correct 8-byte master key");
             testKeyDiversificationWithMasterkeyTestcases();
diff --git a/client/loclass/main.c b/client/loclass/main.c
index c82c7f6be..415ffc14f 100644
--- a/client/loclass/main.c
+++ b/client/loclass/main.c
@@ -54,8 +54,7 @@ int unitTests()
     errors += testMAC();
     errors += doKeyTests(0);
     errors += testElite();
-    if(errors)
-    {
+    if (errors) {
         PrintAndLogDevice(NORMAL, "OBS! There were errors!!!");
     }
     return errors;
@@ -78,7 +77,7 @@ int showHelp()
     return 0;
 }
 
-int main (int argc, char **argv)
+int main(int argc, char **argv)
 {
     PrintAndLogDevice(NORMAL, "IClass Cipher version 1.2, Copyright (C) 2014 Martin Holst Swende\n");
     PrintAndLogDevice(NORMAL, "Comes with ABSOLUTELY NO WARRANTY");
@@ -96,28 +95,27 @@ int main (int argc, char **argv)
 
     char *fileName = NULL;
     int c;
-    while ((c = getopt (argc, argv, "thf:")) != -1)
-      switch (c)
-        {
-        case 't':
-          return unitTests();
-        case 'h':
-          return showHelp();
-        case 'f':
-          fileName = optarg;
-          return bruteforceFileNoKeys(fileName);
-        case '?':
-          if (optopt == 'f')
-            fprintf (stderr, "Option -%c requires an argument.\n", optopt);
-          else if (isprint (optopt))
-            fprintf (stderr, "Unknown option `-%c'.\n", optopt);
-          else
-            fprintf (stderr,
-                     "Unknown option character `\\x%x'.\n",
-                     optopt);
-          return 1;
-        //default:
-          //showHelp();
+    while ((c = getopt(argc, argv, "thf:")) != -1)
+        switch (c) {
+            case 't':
+                return unitTests();
+            case 'h':
+                return showHelp();
+            case 'f':
+                fileName = optarg;
+                return bruteforceFileNoKeys(fileName);
+            case '?':
+                if (optopt == 'f')
+                    fprintf(stderr, "Option -%c requires an argument.\n", optopt);
+                else if (isprint(optopt))
+                    fprintf(stderr, "Unknown option `-%c'.\n", optopt);
+                else
+                    fprintf(stderr,
+                            "Unknown option character `\\x%x'.\n",
+                            optopt);
+                return 1;
+                //default:
+                //showHelp();
         }
     showHelp();
     return 0;
diff --git a/client/mifare/mad.c b/client/mifare/mad.c
index 964379d3f..33703440f 100644
--- a/client/mifare/mad.c
+++ b/client/mifare/mad.c
@@ -95,19 +95,21 @@ static madAIDDescr madKnownClusterCodes[] = {
 
 static const char unknownAID[] = "";
 
-static const char *GetAIDDescription(uint16_t AID) {
-    for(int i = 0; i < ARRAYLEN(madKnownAIDs); i++)
+static const char *GetAIDDescription(uint16_t AID)
+{
+    for (int i = 0; i < ARRAYLEN(madKnownAIDs); i++)
         if (madKnownAIDs[i].AID == AID)
             return madKnownAIDs[i].Description;
 
-    for(int i = 0; i < ARRAYLEN(madKnownClusterCodes); i++)
+    for (int i = 0; i < ARRAYLEN(madKnownClusterCodes); i++)
         if (madKnownClusterCodes[i].AID == (AID >> 8)) // high byte - cluster code
             return madKnownClusterCodes[i].Description;
 
     return unknownAID;
 }
 
-int madCRCCheck(uint8_t *sector, bool verbose, int MADver) {
+int madCRCCheck(uint8_t *sector, bool verbose, int MADver)
+{
     if (MADver == 1) {
         uint8_t crc = CRC8Mad(&sector[16 + 1], 15 + 16);
         if (crc != sector[16]) {
@@ -125,14 +127,16 @@ int madCRCCheck(uint8_t *sector, bool verbose, int MADver) {
     return 0;
 }
 
-uint16_t madGetAID(uint8_t *sector, int MADver, int sectorNo) {
+uint16_t madGetAID(uint8_t *sector, int MADver, int sectorNo)
+{
     if (MADver == 1)
         return (sector[16 + 2 + (sectorNo - 1) * 2] << 8) + (sector[16 + 2 + (sectorNo - 1) * 2 + 1]);
     else
         return (sector[2 + (sectorNo - 1) * 2] << 8) + (sector[2 + (sectorNo - 1) * 2 + 1]);
 }
 
-int MADCheck(uint8_t *sector0, uint8_t *sector10, bool verbose, bool *haveMAD2) {
+int MADCheck(uint8_t *sector0, uint8_t *sector10, bool verbose, bool *haveMAD2)
+{
     int res = 0;
 
     if (!sector0)
@@ -186,7 +190,8 @@ int MADCheck(uint8_t *sector0, uint8_t *sector10, bool verbose, bool *haveMAD2)
     return res;
 }
 
-int MADDecode(uint8_t *sector0, uint8_t *sector10, uint16_t *mad, size_t *madlen) {
+int MADDecode(uint8_t *sector0, uint8_t *sector10, uint16_t *mad, size_t *madlen)
+{
     *madlen = 0;
     bool haveMAD2 = false;
     MADCheck(sector0, sector10, false, &haveMAD2);
@@ -211,7 +216,8 @@ int MADDecode(uint8_t *sector0, uint8_t *sector10, uint16_t *mad, size_t *madlen
 }
 
 
-int MAD1DecodeAndPrint(uint8_t *sector, bool verbose, bool *haveMAD2) {
+int MAD1DecodeAndPrint(uint8_t *sector, bool verbose, bool *haveMAD2)
+{
 
     // check MAD1 only
     MADCheck(sector, NULL, verbose, haveMAD2);
@@ -228,7 +234,7 @@ int MAD1DecodeAndPrint(uint8_t *sector, bool verbose, bool *haveMAD2) {
         PrintAndLogEx(WARNING, "Info byte error");
 
     PrintAndLogEx(NORMAL, "00 MAD1");
-    for(int i = 1; i < 16; i++) {
+    for (int i = 1; i < 16; i++) {
         uint16_t AID = madGetAID(sector, 1, i);
         PrintAndLogEx(NORMAL, "%02d [%04X] %s", i, AID, GetAIDDescription(AID));
     };
@@ -236,7 +242,8 @@ int MAD1DecodeAndPrint(uint8_t *sector, bool verbose, bool *haveMAD2) {
     return 0;
 };
 
-int MAD2DecodeAndPrint(uint8_t *sector, bool verbose) {
+int MAD2DecodeAndPrint(uint8_t *sector, bool verbose)
+{
     PrintAndLogEx(NORMAL, "16 MAD2");
 
     int res = madCRCCheck(sector, true, 2);
@@ -247,7 +254,7 @@ int MAD2DecodeAndPrint(uint8_t *sector, bool verbose) {
     uint8_t InfoByte = sector[1] & 0x3f;
     PrintAndLogEx(NORMAL, "MAD2 Card publisher sector: 0x%02x", InfoByte);
 
-    for(int i = 1; i < 8 + 8 + 7 + 1; i++) {
+    for (int i = 1; i < 8 + 8 + 7 + 1; i++) {
         uint16_t AID = madGetAID(sector, 2, i);
         PrintAndLogEx(NORMAL, "%02d [%04X] %s", i + 16, AID, GetAIDDescription(AID));
     };
diff --git a/client/mifare/mfkey.c b/client/mifare/mfkey.c
index 86df4bdd0..b239bc672 100644
--- a/client/mifare/mfkey.c
+++ b/client/mifare/mfkey.c
@@ -12,14 +12,16 @@
 #include "mfkey.h"
 
 // MIFARE
-int compare_uint64(const void *a, const void *b) {
-    if (*(uint64_t*)b == *(uint64_t*)a) return 0;
-    if (*(uint64_t*)b < *(uint64_t*)a) return 1;
+int compare_uint64(const void *a, const void *b)
+{
+    if (*(uint64_t *)b == *(uint64_t *)a) return 0;
+    if (*(uint64_t *)b < * (uint64_t *)a) return 1;
     return -1;
 }
 
 // create the intersection (common members) of two sorted lists. Lists are terminated by -1. Result will be in list1. Number of elements is returned.
-uint32_t intersection(uint64_t *listA, uint64_t *listB) {
+uint32_t intersection(uint64_t *listA, uint64_t *listB)
+{
     if (listA == NULL || listB == NULL)
         return 0;
 
@@ -27,12 +29,11 @@ uint32_t intersection(uint64_t *listA, uint64_t *listB) {
     p1 = p3 = listA;
     p2 = listB;
 
-    while ( *p1 != -1 && *p2 != -1 ) {
+    while (*p1 != -1 && *p2 != -1) {
         if (compare_uint64(p1, p2) == 0) {
             *p3++ = *p1++;
             p2++;
-        }
-        else {
+        } else {
             while (compare_uint64(p1, p2) < 0) ++p1;
             while (compare_uint64(p1, p2) > 0) ++p2;
         }
@@ -43,7 +44,8 @@ uint32_t intersection(uint64_t *listA, uint64_t *listB) {
 
 // Darkside attack (hf mf mifare)
 // if successful it will return a list of keys, not just one.
-uint32_t nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint32_t ar, uint64_t par_info, uint64_t ks_info, uint64_t **keys) {
+uint32_t nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint32_t ar, uint64_t par_info, uint64_t ks_info, uint64_t **keys)
+{
     struct Crypto1State *states;
     uint32_t i, pos;
     uint8_t bt, ks3x[8], par[8][8];
@@ -53,18 +55,18 @@ uint32_t nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint32_t ar, uint64_t
     // Reset the last three significant bits of the reader nonce
     nr &= 0xFFFFFF1F;
 
-    for ( pos = 0; pos < 8; pos++ ) {
-        ks3x[7-pos] = (ks_info >> (pos*8)) & 0x0F;
-        bt = (par_info >> (pos*8)) & 0xFF;
+    for (pos = 0; pos < 8; pos++) {
+        ks3x[7 - pos] = (ks_info >> (pos * 8)) & 0x0F;
+        bt = (par_info >> (pos * 8)) & 0xFF;
 
-        par[7-pos][0] = (bt >> 0) & 1;
-        par[7-pos][1] = (bt >> 1) & 1;
-        par[7-pos][2] = (bt >> 2) & 1;
-        par[7-pos][3] = (bt >> 3) & 1;
-        par[7-pos][4] = (bt >> 4) & 1;
-        par[7-pos][5] = (bt >> 5) & 1;
-        par[7-pos][6] = (bt >> 6) & 1;
-        par[7-pos][7] = (bt >> 7) & 1;
+        par[7 - pos][0] = (bt >> 0) & 1;
+        par[7 - pos][1] = (bt >> 1) & 1;
+        par[7 - pos][2] = (bt >> 2) & 1;
+        par[7 - pos][3] = (bt >> 3) & 1;
+        par[7 - pos][4] = (bt >> 4) & 1;
+        par[7 - pos][5] = (bt >> 5) & 1;
+        par[7 - pos][6] = (bt >> 6) & 1;
+        par[7 - pos][7] = (bt >> 7) & 1;
     }
 
     states = lfsr_common_prefix(nr, ar, ks3x, par, (par_info == 0));
@@ -74,11 +76,11 @@ uint32_t nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint32_t ar, uint64_t
         return 0;
     }
 
-    keylist = (uint64_t*)states;
+    keylist = (uint64_t *)states;
 
     for (i = 0; keylist[i]; i++) {
-        lfsr_rollback_word(states+i, uid ^ nt, 0);
-        crypto1_get_lfsr(states+i, &key_recovered);
+        lfsr_rollback_word(states + i, uid ^ nt, 0);
+        crypto1_get_lfsr(states + i, &key_recovered);
         keylist[i] = key_recovered;
     }
     keylist[i] = -1;
@@ -88,8 +90,9 @@ uint32_t nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint32_t ar, uint64_t
 }
 
 // recover key from 2 different reader responses on same tag challenge
-bool mfkey32(nonces_t data, uint64_t *outputkey) {
-    struct Crypto1State *s,*t;
+bool mfkey32(nonces_t data, uint64_t *outputkey)
+{
+    struct Crypto1State *s, *t;
     uint64_t outkey = 0;
     uint64_t key = 0;     // recovered key
     bool isSuccess = false;
@@ -99,7 +102,7 @@ bool mfkey32(nonces_t data, uint64_t *outputkey) {
     uint32_t p641 = prng_successor(data.nonce2, 64);
     s = lfsr_recovery32(data.ar ^ p640, 0);
 
-    for(t = s; t->odd | t->even; ++t) {
+    for (t = s; t->odd | t->even; ++t) {
         lfsr_rollback_word(t, 0, 0);
         lfsr_rollback_word(t, data.nr, 1);
         lfsr_rollback_word(t, data.cuid ^ data.nonce, 0);
@@ -113,14 +116,15 @@ bool mfkey32(nonces_t data, uint64_t *outputkey) {
         }
     }
     isSuccess = (counter == 1);
-    *outputkey = ( isSuccess ) ? outkey : 0;
+    *outputkey = (isSuccess) ? outkey : 0;
     crypto1_destroy(s);
     return isSuccess;
 }
 
 // recover key from 2 reader responses on 2 different tag challenges
 // skip "several found keys".  Only return true if ONE key is found
-bool mfkey32_moebius(nonces_t data, uint64_t *outputkey) {
+bool mfkey32_moebius(nonces_t data, uint64_t *outputkey)
+{
     struct Crypto1State *s, *t;
     uint64_t outkey  = 0;
     uint64_t key     = 0; // recovered key
@@ -131,7 +135,7 @@ bool mfkey32_moebius(nonces_t data, uint64_t *outputkey) {
 
     s = lfsr_recovery32(data.ar ^ p640, 0);
 
-    for(t = s; t->odd | t->even; ++t) {
+    for (t = s; t->odd | t->even; ++t) {
         lfsr_rollback_word(t, 0, 0);
         lfsr_rollback_word(t, data.nr, 1);
         lfsr_rollback_word(t, data.cuid ^ data.nonce, 0);
@@ -146,13 +150,14 @@ bool mfkey32_moebius(nonces_t data, uint64_t *outputkey) {
         }
     }
     isSuccess  = (counter == 1);
-    *outputkey = ( isSuccess ) ? outkey : 0;
+    *outputkey = (isSuccess) ? outkey : 0;
     crypto1_destroy(s);
     return isSuccess;
 }
 
 // recover key from reader response and tag response of one authentication sequence
-int mfkey64(nonces_t data, uint64_t *outputkey){
+int mfkey64(nonces_t data, uint64_t *outputkey)
+{
     uint64_t key = 0;  // recovered key
     uint32_t ks2;      // keystream used to encrypt reader response
     uint32_t ks3;      // keystream used to encrypt tag response
diff --git a/client/mifare/mifare4.c b/client/mifare/mifare4.c
index e5051743d..4cd529dc3 100644
--- a/client/mifare/mifare4.c
+++ b/client/mifare/mifare4.c
@@ -18,7 +18,8 @@
 #include "crypto/libpcrypto.h"
 
 static bool VerboseMode = false;
-void mfpSetVerboseMode(bool verbose) {
+void mfpSetVerboseMode(bool verbose)
+{
     VerboseMode = verbose;
 }
 
@@ -42,8 +43,9 @@ static const PlusErrorsElm PlusErrors[] = {
 };
 int PlusErrorsLen = sizeof(PlusErrors) / sizeof(PlusErrorsElm);
 
-const char * mfpGetErrorDescription(uint8_t errorCode) {
-    for(int i = 0; i < PlusErrorsLen; i++)
+const char *mfpGetErrorDescription(uint8_t errorCode)
+{
+    for (int i = 0; i < PlusErrorsLen; i++)
         if (errorCode == PlusErrors[i].Code)
             return PlusErrors[i].Description;
 
@@ -72,7 +74,8 @@ AccessConditions_t MFAccessConditionsTrailer[] = {
     {0x07, "rdCbyAB"}
 };
 
-char *mfGetAccessConditionsDesc(uint8_t blockn, uint8_t *data) {
+char *mfGetAccessConditionsDesc(uint8_t blockn, uint8_t *data)
+{
     static char StaticNone[] = "none";
 
     uint8_t data1 = ((data[1] >> 4) & 0x0f) >> blockn;
@@ -96,7 +99,8 @@ char *mfGetAccessConditionsDesc(uint8_t blockn, uint8_t *data) {
     return StaticNone;
 };
 
-int CalculateEncIVCommand(mf4Session *session, uint8_t *iv, bool verbose) {
+int CalculateEncIVCommand(mf4Session *session, uint8_t *iv, bool verbose)
+{
     memcpy(&iv[0], session->TI, 4);
     memcpy(&iv[4], &session->R_Ctr, 2);
     memcpy(&iv[6], &session->W_Ctr, 2);
@@ -108,7 +112,8 @@ int CalculateEncIVCommand(mf4Session *session, uint8_t *iv, bool verbose) {
     return 0;
 }
 
-int CalculateEncIVResponse(mf4Session *session, uint8_t *iv, bool verbose) {
+int CalculateEncIVResponse(mf4Session *session, uint8_t *iv, bool verbose)
+{
     memcpy(&iv[0], &session->R_Ctr, 2);
     memcpy(&iv[2], &session->W_Ctr, 2);
     memcpy(&iv[4], &session->R_Ctr, 2);
@@ -121,46 +126,47 @@ int CalculateEncIVResponse(mf4Session *session, uint8_t *iv, bool verbose) {
 }
 
 
-int CalculateMAC(mf4Session *session, MACType_t mtype, uint8_t blockNum, uint8_t blockCount, uint8_t *data, int datalen, uint8_t *mac, bool verbose) {
+int CalculateMAC(mf4Session *session, MACType_t mtype, uint8_t blockNum, uint8_t blockCount, uint8_t *data, int datalen, uint8_t *mac, bool verbose)
+{
     if (!session || !session->Authenticated || !mac || !data || !datalen || datalen < 1)
         return 1;
 
     memset(mac, 0x00, 8);
 
     uint16_t ctr = session->R_Ctr;
-    switch(mtype) {
-    case mtypWriteCmd:
-    case mtypWriteResp:
-        ctr = session->W_Ctr;
-        break;
-    case mtypReadCmd:
-    case mtypReadResp:
-        break;
+    switch (mtype) {
+        case mtypWriteCmd:
+        case mtypWriteResp:
+            ctr = session->W_Ctr;
+            break;
+        case mtypReadCmd:
+        case mtypReadResp:
+            break;
     }
 
     uint8_t macdata[2049] = {data[0], (ctr & 0xFF), (ctr >> 8), 0};
     int macdatalen = datalen;
     memcpy(&macdata[3], session->TI, 4);
 
-    switch(mtype) {
-    case mtypReadCmd:
-        memcpy(&macdata[7], &data[1], datalen - 1);
-        macdatalen = datalen + 6;
-        break;
-    case mtypReadResp:
-        macdata[7] = blockNum;
-        macdata[8] = 0;
-        macdata[9] = blockCount;
-        memcpy(&macdata[10], &data[1], datalen - 1);
-        macdatalen = datalen + 9;
-        break;
-    case mtypWriteCmd:
-        memcpy(&macdata[7], &data[1], datalen - 1);
-        macdatalen = datalen + 6;
-        break;
-    case mtypWriteResp:
-        macdatalen = 1 + 6;
-        break;
+    switch (mtype) {
+        case mtypReadCmd:
+            memcpy(&macdata[7], &data[1], datalen - 1);
+            macdatalen = datalen + 6;
+            break;
+        case mtypReadResp:
+            macdata[7] = blockNum;
+            macdata[8] = 0;
+            macdata[9] = blockCount;
+            memcpy(&macdata[10], &data[1], datalen - 1);
+            macdatalen = datalen + 9;
+            break;
+        case mtypWriteCmd:
+            memcpy(&macdata[7], &data[1], datalen - 1);
+            macdatalen = datalen + 6;
+            break;
+        case mtypWriteResp:
+            macdatalen = 1 + 6;
+            break;
     }
 
     if (verbose)
@@ -169,7 +175,8 @@ int CalculateMAC(mf4Session *session, MACType_t mtype, uint8_t blockNum, uint8_t
     return aes_cmac8(NULL, session->Kmac, macdata, mac, macdatalen);
 }
 
-int MifareAuth4(mf4Session *session, uint8_t *keyn, uint8_t *key, bool activateField, bool leaveSignalON, bool verbose) {
+int MifareAuth4(mf4Session *session, uint8_t *keyn, uint8_t *key, bool activateField, bool leaveSignalON, bool verbose)
+{
     uint8_t data[257] = {0};
     int datalen = 0;
 
@@ -260,7 +267,7 @@ int MifareAuth4(mf4Session *session, uint8_t *keyn, uint8_t *key, bool activateF
     uint8_t kenc[16] = {0};
     memcpy(&kenc[0], &RndA[11], 5);
     memcpy(&kenc[5], &RndB[11], 5);
-    for(int i = 0; i < 5; i++)
+    for (int i = 0; i < 5; i++)
         kenc[10 + i] = RndA[4 + i] ^ RndB[4 + i];
     kenc[15] = 0x11;
 
@@ -272,7 +279,7 @@ int MifareAuth4(mf4Session *session, uint8_t *keyn, uint8_t *key, bool activateF
     uint8_t kmac[16] = {0};
     memcpy(&kmac[0], &RndA[7], 5);
     memcpy(&kmac[5], &RndB[7], 5);
-    for(int i = 0; i < 5; i++)
+    for (int i = 0; i < 5; i++)
         kmac[10 + i] = RndA[0 + i] ^ RndB[0 + i];
     kmac[15] = 0x22;
 
@@ -308,69 +315,75 @@ int MifareAuth4(mf4Session *session, uint8_t *keyn, uint8_t *key, bool activateF
     return 0;
 }
 
-int intExchangeRAW14aPlus(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
-    if(VerboseMode)
+int intExchangeRAW14aPlus(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen)
+{
+    if (VerboseMode)
         PrintAndLogEx(INFO, ">>> %s", sprint_hex(datain, datainlen));
 
     int res = ExchangeRAW14a(datain, datainlen, activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
 
-    if(VerboseMode)
+    if (VerboseMode)
         PrintAndLogEx(INFO, "<<< %s", sprint_hex(dataout, *dataoutlen));
 
     return res;
 }
 
-int MFPWritePerso(uint8_t *keyNum, uint8_t *key, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
+int MFPWritePerso(uint8_t *keyNum, uint8_t *key, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen)
+{
     uint8_t rcmd[3 + 16] = {0xa8, keyNum[1], keyNum[0], 0x00};
     memmove(&rcmd[3], key, 16);
 
     return intExchangeRAW14aPlus(rcmd, sizeof(rcmd), activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
 }
 
-int MFPCommitPerso(bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
+int MFPCommitPerso(bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen)
+{
     uint8_t rcmd[1] = {0xaa};
 
     return intExchangeRAW14aPlus(rcmd, sizeof(rcmd), activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
 }
 
-int MFPReadBlock(mf4Session *session, bool plain, uint8_t blockNum, uint8_t blockCount, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen, uint8_t *mac) {
-    uint8_t rcmd[4 + 8] = {(plain?(0x37):(0x33)), blockNum, 0x00, blockCount};
+int MFPReadBlock(mf4Session *session, bool plain, uint8_t blockNum, uint8_t blockCount, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen, uint8_t *mac)
+{
+    uint8_t rcmd[4 + 8] = {(plain ? (0x37) : (0x33)), blockNum, 0x00, blockCount};
     if (!plain && session)
         CalculateMAC(session, mtypReadCmd, blockNum, blockCount, rcmd, 4, &rcmd[4], VerboseMode);
 
-    int res = intExchangeRAW14aPlus(rcmd, plain?4:sizeof(rcmd), activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
-    if(res)
+    int res = intExchangeRAW14aPlus(rcmd, plain ? 4 : sizeof(rcmd), activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
+    if (res)
         return res;
 
     if (session)
         session->R_Ctr++;
 
-    if(session && mac && *dataoutlen > 11)
+    if (session && mac && *dataoutlen > 11)
         CalculateMAC(session, mtypReadResp, blockNum, blockCount, dataout, *dataoutlen - 8 - 2, mac, VerboseMode);
 
     return 0;
 }
 
-int MFPWriteBlock(mf4Session *session, uint8_t blockNum, uint8_t *data, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen, uint8_t *mac) {
+int MFPWriteBlock(mf4Session *session, uint8_t blockNum, uint8_t *data, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen, uint8_t *mac)
+{
     uint8_t rcmd[1 + 2 + 16 + 8] = {0xA3, blockNum, 0x00};
     memmove(&rcmd[3], data, 16);
     if (session)
         CalculateMAC(session, mtypWriteCmd, blockNum, 1, rcmd, 19, &rcmd[19], VerboseMode);
 
     int res = intExchangeRAW14aPlus(rcmd, sizeof(rcmd), activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
-    if(res)
+    if (res)
         return res;
 
     if (session)
         session->W_Ctr++;
 
-    if(session && mac && *dataoutlen > 3)
+    if (session && mac && *dataoutlen > 3)
         CalculateMAC(session, mtypWriteResp, blockNum, 1, dataout, *dataoutlen, mac, VerboseMode);
 
     return 0;
 }
 
-int mfpReadSector(uint8_t sectorNo, uint8_t keyType, uint8_t *key, uint8_t *dataout, bool verbose){
+int mfpReadSector(uint8_t sectorNo, uint8_t keyType, uint8_t *key, uint8_t *dataout, bool verbose)
+{
     uint8_t keyn[2] = {0};
     bool plain = false;
 
@@ -391,7 +404,7 @@ int mfpReadSector(uint8_t sectorNo, uint8_t keyType, uint8_t *key, uint8_t *data
     int datalen = 0;
     uint8_t mac[8] = {0};
     uint8_t firstBlockNo = mfFirstBlockOfSector(sectorNo);
-    for(int n = firstBlockNo; n < firstBlockNo + mfNumBlocksPerSector(sectorNo); n++) {
+    for (int n = firstBlockNo; n < firstBlockNo + mfNumBlocksPerSector(sectorNo); n++) {
         res = MFPReadBlock(&session, plain, n & 0xff, 1, false, true, data, sizeof(data), &datalen, mac);
         if (res) {
             PrintAndLogEx(ERR, "Sector %d read error: %d", sectorNo, res);
@@ -423,7 +436,7 @@ int mfpReadSector(uint8_t sectorNo, uint8_t keyType, uint8_t *key, uint8_t *data
             if (!verbose)
                 return 7;
         } else {
-            if(verbose)
+            if (verbose)
                 PrintAndLogEx(INFO, "MAC: %s", sprint_hex(&data[1 + 16], 8));
         }
     }
@@ -434,33 +447,38 @@ int mfpReadSector(uint8_t sectorNo, uint8_t keyType, uint8_t *key, uint8_t *data
 
 // Mifare Memory Structure: up to 32 Sectors with 4 blocks each (1k and 2k cards),
 // plus evtl. 8 sectors with 16 blocks each (4k cards)
-uint8_t mfNumBlocksPerSector(uint8_t sectorNo) {
+uint8_t mfNumBlocksPerSector(uint8_t sectorNo)
+{
     if (sectorNo < 32)
         return 4;
     else
         return 16;
 }
 
-uint8_t mfFirstBlockOfSector(uint8_t sectorNo) {
+uint8_t mfFirstBlockOfSector(uint8_t sectorNo)
+{
     if (sectorNo < 32)
         return sectorNo * 4;
     else
         return 32 * 4 + (sectorNo - 32) * 16;
 }
 
-uint8_t mfSectorTrailer(uint8_t blockNo) {
-    if (blockNo < 32*4) {
+uint8_t mfSectorTrailer(uint8_t blockNo)
+{
+    if (blockNo < 32 * 4) {
         return (blockNo | 0x03);
     } else {
         return (blockNo | 0x0f);
     }
 }
 
-bool mfIsSectorTrailer(uint8_t blockNo) {
+bool mfIsSectorTrailer(uint8_t blockNo)
+{
     return (blockNo == mfSectorTrailer(blockNo));
 }
 
-uint8_t mfSectorNum(uint8_t blockNo) {
+uint8_t mfSectorNum(uint8_t blockNo)
+{
     if (blockNo < 32 * 4)
         return blockNo / 4;
     else
diff --git a/client/mifare/mifare4.h b/client/mifare/mifare4.h
index c33cb7889..e33e69fd2 100644
--- a/client/mifare/mifare4.h
+++ b/client/mifare/mifare4.h
@@ -29,7 +29,7 @@ typedef struct {
     uint8_t Kmac[16];
     uint16_t R_Ctr;
     uint16_t W_Ctr;
-}mf4Session;
+} mf4Session;
 
 typedef enum {
     mtypReadCmd,
@@ -44,7 +44,7 @@ typedef struct {
 } AccessConditions_t;
 
 extern void mfpSetVerboseMode(bool verbose);
-extern const char * mfpGetErrorDescription(uint8_t errorCode);
+extern const char *mfpGetErrorDescription(uint8_t errorCode);
 
 extern int CalculateMAC(mf4Session *session, MACType_t mtype, uint8_t blockNum, uint8_t blockCount, uint8_t *data, int datalen, uint8_t *mac, bool verbose);
 extern int MifareAuth4(mf4Session *session, uint8_t *keyn, uint8_t *key, bool activateField, bool leaveSignalON, bool verbose);
diff --git a/client/mifare/mifaredefault.h b/client/mifare/mifaredefault.h
index e7cd3852e..8debf3f65 100644
--- a/client/mifare/mifaredefault.h
+++ b/client/mifare/mifaredefault.h
@@ -15,8 +15,7 @@
 
 #define MIFARE_DEFAULTKEYS_SIZE sizeof(g_mifare_default_keys) / sizeof(uint64_t)
 
-static const uint64_t g_mifare_default_keys[] =
-{
+static const uint64_t g_mifare_default_keys[] = {
     0xffffffffffff, // Default key (first key used by program if no user defined key)
     0x000000000000, // Blank key
     0xa0a1a2a3a4a5, // NFCForum MAD key
diff --git a/client/mifare/mifarehost.c b/client/mifare/mifarehost.c
index cef876d18..080ecbe77 100644
--- a/client/mifare/mifarehost.c
+++ b/client/mifare/mifarehost.c
@@ -10,7 +10,8 @@
 #include "mifarehost.h"
 #include "cmdmain.h"
 
-int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
+int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key)
+{
     uint32_t uid = 0;
     uint32_t nt = 0, nr = 0, ar = 0;
     uint64_t par_list = 0, ks_list = 0;
@@ -32,15 +33,18 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
 
         //flush queue
         while (ukbhit()) {
-            int gc = getchar(); (void)gc;
+            int gc = getchar();
+            (void)gc;
             return -5;
         }
 
         // wait cycle
         while (true) {
-            printf("."); fflush(stdout);
+            printf(".");
+            fflush(stdout);
             if (ukbhit()) {
-                int gc = getchar(); (void)gc;
+                int gc = getchar();
+                (void)gc;
                 return -5;
             }
 
@@ -75,7 +79,7 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
         }
 
         // only parity zero attack
-        if (par_list == 0 ) {
+        if (par_list == 0) {
             qsort(keylist, keycount, sizeof(*keylist), compare_uint64);
             keycount = intersection(last_keylist, keylist);
             if (keycount == 0) {
@@ -96,9 +100,9 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
             int size = keycount - i > max_keys ? max_keys : keycount - i;
             for (int j = 0; j < size; j++) {
                 if (par_list == 0) {
-                    num_to_bytes(last_keylist[i*max_keys + j], 6, keyBlock+(j*6));
+                    num_to_bytes(last_keylist[i * max_keys + j], 6, keyBlock + (j * 6));
                 } else {
-                    num_to_bytes(keylist[i*max_keys + j], 6, keyBlock+(j*6));
+                    num_to_bytes(keylist[i * max_keys + j], 6, keyBlock + (j * 6));
                 }
             }
 
@@ -120,7 +124,8 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
     free(keylist);
     return 0;
 }
-int mfCheckKeys(uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t keycnt, uint8_t * keyBlock, uint64_t * key){
+int mfCheckKeys(uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t keycnt, uint8_t *keyBlock, uint64_t *key)
+{
     *key = -1;
     UsbCommand c = {CMD_MIFARE_CHKKEYS, { (blockNo | (keyType << 8)), clear_trace, keycnt}};
     memcpy(c.d.asBytes, keyBlock, 6 * keycnt);
@@ -137,22 +142,24 @@ int mfCheckKeys(uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t keyc
 // 0 == ok all keys found
 // 1 ==
 // 2 == Time-out, aborting
-int mfCheckKeys_fast( uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk, uint8_t strategy,
-                        uint32_t size, uint8_t *keyBlock, sector_t *e_sector, bool use_flashmemory) {
+int mfCheckKeys_fast(uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk, uint8_t strategy,
+                     uint32_t size, uint8_t *keyBlock, sector_t *e_sector, bool use_flashmemory)
+{
 
     uint64_t t2 = msclock();
     uint32_t timeout = 0;
 
     // send keychunk
-    UsbCommand c = {CMD_MIFARE_CHKKEYS_FAST, { (sectorsCnt | (firstChunk << 8) | (lastChunk << 12) ), ((use_flashmemory << 8) | strategy), size}};
+    UsbCommand c = {CMD_MIFARE_CHKKEYS_FAST, { (sectorsCnt | (firstChunk << 8) | (lastChunk << 12)), ((use_flashmemory << 8) | strategy), size}};
     memcpy(c.d.asBytes, keyBlock, 6 * size);
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
 
-    while ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
+    while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
         timeout++;
-        printf("."); fflush(stdout);
+        printf(".");
+        fflush(stdout);
         // max timeout for one chunk of 85keys, 60*3sec = 180seconds
         // s70 with 40*2 keys to check, 80*85 = 6800 auth.
         // takes about 97s, still some margin before abort
@@ -166,47 +173,47 @@ int mfCheckKeys_fast( uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk,
     // time to convert the returned data.
     uint8_t curr_keys = resp.arg[0];
 
-    PrintAndLogEx(SUCCESS, "\nChunk: %.1fs | found %u/%u keys (%u)", (float)(t2/1000.0), curr_keys, (sectorsCnt<<1), size);
+    PrintAndLogEx(SUCCESS, "\nChunk: %.1fs | found %u/%u keys (%u)", (float)(t2 / 1000.0), curr_keys, (sectorsCnt << 1), size);
 
     // all keys?
-    if ( curr_keys == sectorsCnt*2 || lastChunk ) {
+    if (curr_keys == sectorsCnt * 2 || lastChunk) {
 
         // success array. each byte is status of key
         uint8_t arr[80];
         uint64_t foo = 0;
         uint16_t bar = 0;
-        foo = bytes_to_num(resp.d.asBytes+480, 8);
+        foo = bytes_to_num(resp.d.asBytes + 480, 8);
         bar = (resp.d.asBytes[489]  << 8 | resp.d.asBytes[488]);
 
         for (uint8_t i = 0; i < 64; i++)
             arr[i] = (foo >> i) & 0x1;
 
         for (uint8_t i = 0; i < 16; i++)
-            arr[i+64] = (bar >> i) & 0x1;
+            arr[i + 64] = (bar >> i) & 0x1;
 
         // initialize storage for found keys
         icesector_t *tmp = calloc(sectorsCnt, sizeof(icesector_t));
         if (tmp == NULL)
             return 1;
-        memcpy(tmp, resp.d.asBytes, sectorsCnt * sizeof(icesector_t) );
+        memcpy(tmp, resp.d.asBytes, sectorsCnt * sizeof(icesector_t));
 
-        for ( int i = 0; i < sectorsCnt; i++) {
+        for (int i = 0; i < sectorsCnt; i++) {
             // key A
-            if ( !e_sector[i].foundKey[0] ) {
-                e_sector[i].Key[0] =  bytes_to_num( tmp[i].keyA, 6);
-                e_sector[i].foundKey[0] = arr[ (i*2) ];
+            if (!e_sector[i].foundKey[0]) {
+                e_sector[i].Key[0] =  bytes_to_num(tmp[i].keyA, 6);
+                e_sector[i].foundKey[0] = arr[(i * 2) ];
             }
             // key B
-            if ( !e_sector[i].foundKey[1] ) {
-                e_sector[i].Key[1] =  bytes_to_num( tmp[i].keyB, 6);
-                e_sector[i].foundKey[1] = arr[ (i*2) + 1 ];
+            if (!e_sector[i].foundKey[1]) {
+                e_sector[i].Key[1] =  bytes_to_num(tmp[i].keyB, 6);
+                e_sector[i].foundKey[1] = arr[(i * 2) + 1 ];
             }
         }
         free(tmp);
 
-        if ( curr_keys == sectorsCnt*2 )
+        if (curr_keys == sectorsCnt * 2)
             return 0;
-        if ( lastChunk )
+        if (lastChunk)
             return 1;
     }
     return 1;
@@ -214,11 +221,12 @@ int mfCheckKeys_fast( uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk,
 
 // PM3 imp of J-Run mf_key_brute (part 2)
 // ref: https://github.com/J-Run/mf_key_brute
-int mfKeyBrute(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint64_t *resultkey){
+int mfKeyBrute(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint64_t *resultkey)
+{
 
-    #define KEYS_IN_BLOCK 85
-    #define KEYBLOCK_SIZE 510
-    #define CANDIDATE_SIZE 0xFFFF * 6
+#define KEYS_IN_BLOCK 85
+#define KEYBLOCK_SIZE 510
+#define CANDIDATE_SIZE 0xFFFF * 6
     uint8_t found = false;
     uint64_t key64 = 0;
     uint8_t candidates[CANDIDATE_SIZE] = {0x00};
@@ -238,7 +246,7 @@ int mfKeyBrute(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint64_t *resultk
         candidates[5 + j] = key[5];
     }
     uint32_t counter, i;
-    for ( i = 0, counter = 1; i < CANDIDATE_SIZE; i += KEYBLOCK_SIZE, ++counter){
+    for (i = 0, counter = 1; i < CANDIDATE_SIZE; i += KEYBLOCK_SIZE, ++counter) {
 
         key64 = 0;
 
@@ -253,16 +261,17 @@ int mfKeyBrute(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint64_t *resultk
         }
 
         // progress
-        if ( counter % 20 == 0 )
-            PrintAndLogEx(SUCCESS, "tried : %s.. \t %u keys", sprint_hex(candidates + i, 6),  counter * KEYS_IN_BLOCK  );
+        if (counter % 20 == 0)
+            PrintAndLogEx(SUCCESS, "tried : %s.. \t %u keys", sprint_hex(candidates + i, 6),  counter * KEYS_IN_BLOCK);
     }
     return found;
 }
 
 // Compare 16 Bits out of cryptostate
-int Compare16Bits(const void * a, const void * b) {
-    if ((*(uint64_t*)b & 0x00ff000000ff0000) == (*(uint64_t*)a & 0x00ff000000ff0000)) return 0;
-    if ((*(uint64_t*)b & 0x00ff000000ff0000) > (*(uint64_t*)a & 0x00ff000000ff0000)) return 1;
+int Compare16Bits(const void *a, const void *b)
+{
+    if ((*(uint64_t *)b & 0x00ff000000ff0000) == (*(uint64_t *)a & 0x00ff000000ff0000)) return 0;
+    if ((*(uint64_t *)b & 0x00ff000000ff0000) > (*(uint64_t *)a & 0x00ff000000ff0000)) return 1;
     return -1;
 }
 
@@ -273,12 +282,13 @@ void
 __attribute__((force_align_arg_pointer))
 #endif
 #endif
-*nested_worker_thread(void *arg) {
+*nested_worker_thread(void *arg)
+{
     struct Crypto1State *p1;
     StateList_t *statelist = arg;
     statelist->head.slhead = lfsr_recovery32(statelist->ks1, statelist->nt ^ statelist->uid);
 
-    for (p1 = statelist->head.slhead; *(uint64_t *)p1 != 0; p1++) {};
+    for (p1 = statelist->head.slhead; * (uint64_t *)p1 != 0; p1++) {};
 
     statelist->len = p1 - statelist->head.slhead;
     statelist->tail.sltail = --p1;
@@ -287,7 +297,8 @@ __attribute__((force_align_arg_pointer))
     return statelist->head.slhead;
 }
 
-int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t * resultKey, bool calibrate) {
+int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t *resultKey, bool calibrate)
+{
     uint16_t i;
     uint32_t uid;
     UsbCommand resp;
@@ -309,7 +320,7 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo
         statelists[i].blockNo = resp.arg[2] & 0xff;
         statelists[i].keyType = (resp.arg[2] >> 8) & 0xff;
         statelists[i].uid = uid;
-        memcpy(&statelists[i].nt,  (void *)(resp.d.asBytes + 4 + i * 8 + 0), 4);
+        memcpy(&statelists[i].nt, (void *)(resp.d.asBytes + 4 + i * 8 + 0), 4);
         memcpy(&statelists[i].ks1, (void *)(resp.d.asBytes + 4 + i * 8 + 4), 4);
     }
 
@@ -322,7 +333,7 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo
 
     // wait for threads to terminate:
     for (i = 0; i < 2; i++)
-        pthread_join(thread_id[i], (void*)&statelists[i].head.slhead);
+        pthread_join(thread_id[i], (void *)&statelists[i].head.slhead);
 
     // the first 16 Bits of the cryptostate already contain part of our key.
     // Create the intersection of the two lists based on these 16 Bits and
@@ -335,28 +346,27 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo
 
             struct Crypto1State savestate, *savep = &savestate;
             savestate = *p1;
-            while(Compare16Bits(p1, savep) == 0 && p1 <= statelists[0].tail.sltail) {
+            while (Compare16Bits(p1, savep) == 0 && p1 <= statelists[0].tail.sltail) {
                 *p3 = *p1;
                 lfsr_rollback_word(p3, statelists[0].nt ^ statelists[0].uid, 0);
                 p3++;
                 p1++;
             }
             savestate = *p2;
-            while(Compare16Bits(p2, savep) == 0 && p2 <= statelists[1].tail.sltail) {
+            while (Compare16Bits(p2, savep) == 0 && p2 <= statelists[1].tail.sltail) {
                 *p4 = *p2;
                 lfsr_rollback_word(p4, statelists[1].nt ^ statelists[1].uid, 0);
                 p4++;
                 p2++;
             }
-        }
-        else {
+        } else {
             while (Compare16Bits(p1, p2) == -1) p1++;
             while (Compare16Bits(p1, p2) == 1) p2++;
         }
     }
 
-    *(uint64_t*)p3 = -1;
-    *(uint64_t*)p4 = -1;
+    *(uint64_t *)p3 = -1;
+    *(uint64_t *)p4 = -1;
     statelists[0].len = p3 - statelists[0].head.slhead;
     statelists[1].len = p4 - statelists[1].head.slhead;
     statelists[0].tail.sltail = --p3;
@@ -371,13 +381,13 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo
 
     //statelists[0].tail.keytail = --p7;
     uint32_t keycnt = statelists[0].len;
-    if ( keycnt == 0 ) goto out;
+    if (keycnt == 0) goto out;
 
     memset(resultKey, 0, 6);
     uint64_t key64 = -1;
 
     // The list may still contain several key candidates. Test each of them with mfCheckKeys
-    uint32_t max_keys = keycnt > (USB_CMD_DATA_SIZE/6) ? (USB_CMD_DATA_SIZE/6) : keycnt;
+    uint32_t max_keys = keycnt > (USB_CMD_DATA_SIZE / 6) ? (USB_CMD_DATA_SIZE / 6) : keycnt;
     uint8_t keyBlock[USB_CMD_DATA_SIZE] = {0x00};
 
     for (int i = 0; i < keycnt; i += max_keys) {
@@ -395,19 +405,19 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo
             num_to_bytes(key64, 6, resultKey);
 
             PrintAndLogEx(SUCCESS, "target block:%3u key type: %c  -- found valid key [%012" PRIx64 "]",
-                (uint16_t)resp.arg[2] & 0xff,
-                (resp.arg[2] >> 8) ? 'B' : 'A',
-                key64
-            );
+                          (uint16_t)resp.arg[2] & 0xff,
+                          (resp.arg[2] >> 8) ? 'B' : 'A',
+                          key64
+                         );
             return -5;
         }
     }
 
 out:
     PrintAndLogEx(SUCCESS, "target block:%3u key type: %c",
-            (uint16_t)resp.arg[2] & 0xff,
-            (resp.arg[2] >> 8) ? 'B' : 'A'
-    );
+                  (uint16_t)resp.arg[2] & 0xff,
+                  (resp.arg[2] >> 8) ? 'B' : 'A'
+                 );
 
     free(statelists[0].head.slhead);
     free(statelists[1].head.slhead);
@@ -415,7 +425,8 @@ out:
 }
 
 // MIFARE
-int mfReadSector(uint8_t sectorNo, uint8_t keyType, uint8_t *key, uint8_t *data) {
+int mfReadSector(uint8_t sectorNo, uint8_t keyType, uint8_t *key, uint8_t *data)
+{
 
     UsbCommand c = {CMD_MIFARE_READSC, {sectorNo, keyType, 0}};
     memcpy(c.d.asBytes, key, 6);
@@ -441,7 +452,8 @@ int mfReadSector(uint8_t sectorNo, uint8_t keyType, uint8_t *key, uint8_t *data)
 }
 
 // EMULATOR
-int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount) {
+int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount)
+{
     UsbCommand c = {CMD_MIFARE_EML_MEMGET, {blockNum, blocksCount, 0}};
     clearCommandBuffer();
     SendCommand(&c);
@@ -451,11 +463,13 @@ int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount) {
     return 0;
 }
 
-int mfEmlSetMem(uint8_t *data, int blockNum, int blocksCount) {
+int mfEmlSetMem(uint8_t *data, int blockNum, int blocksCount)
+{
     return mfEmlSetMem_xt(data, blockNum, blocksCount, 16);
 }
 
-int mfEmlSetMem_xt(uint8_t *data, int blockNum, int blocksCount, int blockBtWidth) {
+int mfEmlSetMem_xt(uint8_t *data, int blockNum, int blocksCount, int blockBtWidth)
+{
     UsbCommand c = {CMD_MIFARE_EML_MEMSET, {blockNum, blocksCount, blockBtWidth}};
     memcpy(c.d.asBytes, data, blocksCount * blockBtWidth);
     clearCommandBuffer();
@@ -464,7 +478,8 @@ int mfEmlSetMem_xt(uint8_t *data, int blockNum, int blocksCount, int blockBtWidt
 }
 
 // "MAGIC" CARD
-int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, uint8_t wipecard) {
+int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, uint8_t wipecard)
+{
 
     uint8_t params = MAGIC_SINGLE;
     uint8_t block0[16];
@@ -482,22 +497,23 @@ int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, uint8_
     // Mifare UID BCC
     block0[4] = block0[0] ^ block0[1] ^ block0[2] ^ block0[3];
     // mifare classic SAK(byte 5) and ATQA(byte 6 and 7, reversed)
-    if ( sak != NULL )
+    if (sak != NULL)
         block0[5] = sak[0];
 
-    if ( atqa != NULL ) {
+    if (atqa != NULL) {
         block0[6] = atqa[1];
         block0[7] = atqa[0];
     }
-    PrintAndLogEx(SUCCESS, "new block 0:  %s", sprint_hex(block0,16));
+    PrintAndLogEx(SUCCESS, "new block 0:  %s", sprint_hex(block0, 16));
 
-    if ( wipecard )      params |= MAGIC_WIPE;
-    if ( oldUID == NULL) params |= MAGIC_UID;
+    if (wipecard)      params |= MAGIC_WIPE;
+    if (oldUID == NULL) params |= MAGIC_UID;
 
     return mfCSetBlock(0, block0, oldUID, params);
 }
 
-int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, uint8_t params) {
+int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, uint8_t params)
+{
 
     uint8_t isOK = 0;
     UsbCommand c = {CMD_MIFARE_CSETBLOCK, {params, blockNo, 0}};
@@ -518,7 +534,8 @@ int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, uint8_t params) {
     return 0;
 }
 
-int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params) {
+int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params)
+{
     uint8_t isOK = 0;
     UsbCommand c = {CMD_MIFARE_CGETBLOCK, {params, blockNo, 0}};
     clearCommandBuffer();
@@ -562,23 +579,27 @@ uint32_t nr_enc = 0;  // encrypted reader challenge
 uint32_t ar_enc = 0;  // encrypted reader response
 uint32_t at_enc = 0;  // encrypted tag response
 
-int isTraceCardEmpty(void) {
+int isTraceCardEmpty(void)
+{
     return ((traceCard[0] == 0) && (traceCard[1] == 0) && (traceCard[2] == 0) && (traceCard[3] == 0));
 }
 
-int isBlockEmpty(int blockN) {
+int isBlockEmpty(int blockN)
+{
     for (int i = 0; i < 16; i++)
         if (traceCard[blockN * 16 + i] != 0) return 0;
 
     return 1;
 }
 
-int isBlockTrailer(int blockN) {
+int isBlockTrailer(int blockN)
+{
     return ((blockN & 0x03) == 0x03);
 }
 
-int loadTraceCard(uint8_t *tuid, uint8_t uidlen) {
-    FILE * f;
+int loadTraceCard(uint8_t *tuid, uint8_t uidlen)
+{
+    FILE *f;
     char buf[64] = {0x00};
     uint8_t buf8[64] = {0x00};
     int i, blockNum;
@@ -597,7 +618,7 @@ int loadTraceCard(uint8_t *tuid, uint8_t uidlen) {
 
     blockNum = 0;
 
-    while (!feof(f)){
+    while (!feof(f)) {
 
         memset(buf, 0, sizeof(buf));
         if (fgets(buf, sizeof(buf), f) == NULL) {
@@ -608,7 +629,7 @@ int loadTraceCard(uint8_t *tuid, uint8_t uidlen) {
             return 2;
         }
 
-        if (strlen(buf) < 32){
+        if (strlen(buf) < 32) {
             if (feof(f)) break;
             PrintAndLogEx(FAILED, "File content error. Block data must include 32 HEX symbols");
             if (f) {
@@ -631,13 +652,14 @@ int loadTraceCard(uint8_t *tuid, uint8_t uidlen) {
     return 0;
 }
 
-int saveTraceCard(void) {
+int saveTraceCard(void)
+{
 
     if ((!strlen(traceFileName)) || (isTraceCardEmpty())) return 0;
 
-    FILE * f;
+    FILE *f;
     f = fopen(traceFileName, "w+");
-    if ( !f ) return 1;
+    if (!f) return 1;
 
     // given 4096 tracecard size,  these loop will only match a 1024, 1kb card memory
     // 4086/16 == 256blocks.
@@ -646,7 +668,7 @@ int saveTraceCard(void) {
             fprintf(f, "%02X", *(traceCard + i * 16 + j));
 
         // no extra line in the end
-        if ( i < 255 )
+        if (i < 255)
             fprintf(f, "\n");
     }
     fflush(f);
@@ -654,7 +676,8 @@ int saveTraceCard(void) {
     return 0;
 }
 //
-int mfTraceInit(uint8_t *tuid, uint8_t uidlen, uint8_t *atqa, uint8_t sak, bool wantSaveToEmlFile) {
+int mfTraceInit(uint8_t *tuid, uint8_t uidlen, uint8_t *atqa, uint8_t sak, bool wantSaveToEmlFile)
+{
 
     if (traceCrypto1)
         crypto1_destroy(traceCrypto1);
@@ -668,12 +691,13 @@ int mfTraceInit(uint8_t *tuid, uint8_t uidlen, uint8_t *atqa, uint8_t sak, bool
     traceCard[5] = sak;
     memcpy(&traceCard[6], atqa, 2);
     traceCurBlock = 0;
-    cuid = bytes_to_num(tuid + (uidlen-4), 4);
+    cuid = bytes_to_num(tuid + (uidlen - 4), 4);
     traceState = TRACE_IDLE;
     return 0;
 }
 
-void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len, bool isEncrypted){
+void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len, bool isEncrypted)
+{
     uint8_t bt = 0;
     int i;
 
@@ -690,7 +714,8 @@ void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len, bool i
     }
 }
 
-int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
+int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile)
+{
 
     if (traceState == TRACE_ERROR)
         return 1;
@@ -712,161 +737,162 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
     }
 
     switch (traceState) {
-    case TRACE_IDLE:
-        // check packet crc16!
-        if ((len >= 4) && (!check_crc(CRC_14443_A, data, len))) {
-            PrintAndLogEx(NORMAL, "DEC| CRC ERROR!!!");
-            AddLogLine(logHexFileName, "DEC| ", "CRC ERROR!!!");
-            traceState = TRACE_ERROR;  // do not decrypt the next commands
-            return 1;
-        }
-
-        // AUTHENTICATION
-        if ((len == 4) && ((data[0] == MIFARE_AUTH_KEYA) || (data[0] == MIFARE_AUTH_KEYB))) {
-            traceState = TRACE_AUTH1;
-            traceCurBlock = data[1];
-            traceCurKey = data[0] == 60 ? 1:0;
-            return 0;
-        }
-
-        // READ
-        if ((len == 4) && ((data[0] == ISO14443A_CMD_READBLOCK))) {
-            traceState = TRACE_READ_DATA;
-            traceCurBlock = data[1];
-            return 0;
-        }
-
-        // WRITE
-        if ((len == 4) && ((data[0] == ISO14443A_CMD_WRITEBLOCK))) {
-            traceState = TRACE_WRITE_OK;
-            traceCurBlock = data[1];
-            return 0;
-        }
-
-        // HALT
-        if ((len == 4) && ((data[0] == ISO14443A_CMD_HALT) && (data[1] == 0x00))) {
-            traceState = TRACE_ERROR;  // do not decrypt the next commands
-            return 0;
-        }
-        return 0;
-
-    case TRACE_READ_DATA:
-        if (len == 18) {
-            traceState = TRACE_IDLE;
-
-            if (isBlockTrailer(traceCurBlock)) {
-                memcpy(traceCard + traceCurBlock * 16 + 6, data + 6, 4);
-            } else {
-                memcpy(traceCard + traceCurBlock * 16, data, 16);
+        case TRACE_IDLE:
+            // check packet crc16!
+            if ((len >= 4) && (!check_crc(CRC_14443_A, data, len))) {
+                PrintAndLogEx(NORMAL, "DEC| CRC ERROR!!!");
+                AddLogLine(logHexFileName, "DEC| ", "CRC ERROR!!!");
+                traceState = TRACE_ERROR;  // do not decrypt the next commands
+                return 1;
+            }
+
+            // AUTHENTICATION
+            if ((len == 4) && ((data[0] == MIFARE_AUTH_KEYA) || (data[0] == MIFARE_AUTH_KEYB))) {
+                traceState = TRACE_AUTH1;
+                traceCurBlock = data[1];
+                traceCurKey = data[0] == 60 ? 1 : 0;
+                return 0;
+            }
+
+            // READ
+            if ((len == 4) && ((data[0] == ISO14443A_CMD_READBLOCK))) {
+                traceState = TRACE_READ_DATA;
+                traceCurBlock = data[1];
+                return 0;
+            }
+
+            // WRITE
+            if ((len == 4) && ((data[0] == ISO14443A_CMD_WRITEBLOCK))) {
+                traceState = TRACE_WRITE_OK;
+                traceCurBlock = data[1];
+                return 0;
+            }
+
+            // HALT
+            if ((len == 4) && ((data[0] == ISO14443A_CMD_HALT) && (data[1] == 0x00))) {
+                traceState = TRACE_ERROR;  // do not decrypt the next commands
+                return 0;
             }
-            if (wantSaveToEmlFile) saveTraceCard();
             return 0;
-        } else {
-            traceState = TRACE_ERROR;
-            return 1;
-        }
-        break;
-    case TRACE_WRITE_OK:
-        if ((len == 1) && (data[0] == 0x0a)) {
-            traceState = TRACE_WRITE_DATA;
-            return 0;
-        } else {
-            traceState = TRACE_ERROR;
-            return 1;
-        }
-        break;
-    case TRACE_WRITE_DATA:
-        if (len == 18) {
-            traceState = TRACE_IDLE;
-            memcpy(traceCard + traceCurBlock * 16, data, 16);
-            if (wantSaveToEmlFile) saveTraceCard();
-            return 0;
-        } else {
-            traceState = TRACE_ERROR;
-            return 1;
-        }
-        break;
-    case TRACE_AUTH1:
-        if (len == 4) {
-            traceState = TRACE_AUTH2;
-            nt = bytes_to_num(data, 4);
-            return 0;
-        } else {
-            traceState = TRACE_ERROR;
-            return 1;
-        }
-        break;
-    case TRACE_AUTH2:
-        if (len == 8) {
-            traceState = TRACE_AUTH_OK;
-            nr_enc = bytes_to_num(data, 4);
-            ar_enc = bytes_to_num(data + 4, 4);
-            return 0;
-        } else {
-            traceState = TRACE_ERROR;
-            return 1;
-        }
-        break;
-    case TRACE_AUTH_OK:
-        if (len == 4) {
-            traceState = TRACE_IDLE;
-            at_enc = bytes_to_num(data, 4);
 
-            //  mfkey64 recover key.
-            ks2 = ar_enc ^ prng_successor(nt, 64);
-            ks3 = at_enc ^ prng_successor(nt, 96);
-            revstate = lfsr_recovery64(ks2, ks3);
-            lfsr_rollback_word(revstate, 0, 0);
-            lfsr_rollback_word(revstate, 0, 0);
-            lfsr_rollback_word(revstate, nr_enc, 1);
-            lfsr_rollback_word(revstate, cuid ^ nt, 0);
-            crypto1_get_lfsr(revstate, &key);
-            PrintAndLogEx(SUCCESS, "found Key: [%012" PRIx64 "]", key);
+        case TRACE_READ_DATA:
+            if (len == 18) {
+                traceState = TRACE_IDLE;
 
-            //if ( tryMfk64(cuid, nt, nr_enc, ar_enc, at_enc, &key) )
-            AddLogUint64(logHexFileName, "Found Key: ", key);
+                if (isBlockTrailer(traceCurBlock)) {
+                    memcpy(traceCard + traceCurBlock * 16 + 6, data + 6, 4);
+                } else {
+                    memcpy(traceCard + traceCurBlock * 16, data, 16);
+                }
+                if (wantSaveToEmlFile) saveTraceCard();
+                return 0;
+            } else {
+                traceState = TRACE_ERROR;
+                return 1;
+            }
+            break;
+        case TRACE_WRITE_OK:
+            if ((len == 1) && (data[0] == 0x0a)) {
+                traceState = TRACE_WRITE_DATA;
+                return 0;
+            } else {
+                traceState = TRACE_ERROR;
+                return 1;
+            }
+            break;
+        case TRACE_WRITE_DATA:
+            if (len == 18) {
+                traceState = TRACE_IDLE;
+                memcpy(traceCard + traceCurBlock * 16, data, 16);
+                if (wantSaveToEmlFile) saveTraceCard();
+                return 0;
+            } else {
+                traceState = TRACE_ERROR;
+                return 1;
+            }
+            break;
+        case TRACE_AUTH1:
+            if (len == 4) {
+                traceState = TRACE_AUTH2;
+                nt = bytes_to_num(data, 4);
+                return 0;
+            } else {
+                traceState = TRACE_ERROR;
+                return 1;
+            }
+            break;
+        case TRACE_AUTH2:
+            if (len == 8) {
+                traceState = TRACE_AUTH_OK;
+                nr_enc = bytes_to_num(data, 4);
+                ar_enc = bytes_to_num(data + 4, 4);
+                return 0;
+            } else {
+                traceState = TRACE_ERROR;
+                return 1;
+            }
+            break;
+        case TRACE_AUTH_OK:
+            if (len == 4) {
+                traceState = TRACE_IDLE;
+                at_enc = bytes_to_num(data, 4);
 
-            int blockShift = ((traceCurBlock & 0xFC) + 3) * 16;
-            if (isBlockEmpty((traceCurBlock & 0xFC) + 3))
-                memcpy(traceCard + blockShift + 6, trailerAccessBytes, 4);
+                //  mfkey64 recover key.
+                ks2 = ar_enc ^ prng_successor(nt, 64);
+                ks3 = at_enc ^ prng_successor(nt, 96);
+                revstate = lfsr_recovery64(ks2, ks3);
+                lfsr_rollback_word(revstate, 0, 0);
+                lfsr_rollback_word(revstate, 0, 0);
+                lfsr_rollback_word(revstate, nr_enc, 1);
+                lfsr_rollback_word(revstate, cuid ^ nt, 0);
+                crypto1_get_lfsr(revstate, &key);
+                PrintAndLogEx(SUCCESS, "found Key: [%012" PRIx64 "]", key);
 
-            // keytype A/B
-            if (traceCurKey)
-                num_to_bytes(key, 6, traceCard + blockShift + 10);
-            else
-                num_to_bytes(key, 6, traceCard + blockShift);
+                //if ( tryMfk64(cuid, nt, nr_enc, ar_enc, at_enc, &key) )
+                AddLogUint64(logHexFileName, "Found Key: ", key);
 
-            if (wantSaveToEmlFile)
-                saveTraceCard();
+                int blockShift = ((traceCurBlock & 0xFC) + 3) * 16;
+                if (isBlockEmpty((traceCurBlock & 0xFC) + 3))
+                    memcpy(traceCard + blockShift + 6, trailerAccessBytes, 4);
 
-            if (traceCrypto1)
+                // keytype A/B
+                if (traceCurKey)
+                    num_to_bytes(key, 6, traceCard + blockShift + 10);
+                else
+                    num_to_bytes(key, 6, traceCard + blockShift);
+
+                if (wantSaveToEmlFile)
+                    saveTraceCard();
+
+                if (traceCrypto1)
+                    crypto1_destroy(traceCrypto1);
+
+                // set cryptosystem state
+                traceCrypto1 = lfsr_recovery64(ks2, ks3);
+
+            } else {
+                PrintAndLogEx(NORMAL, "[!] nested key recovery not implemented!\n");
+                at_enc = bytes_to_num(data, 4);
                 crypto1_destroy(traceCrypto1);
-
-            // set cryptosystem state
-            traceCrypto1 = lfsr_recovery64(ks2, ks3);
-
-        } else {
-            PrintAndLogEx(NORMAL, "[!] nested key recovery not implemented!\n");
-            at_enc = bytes_to_num(data, 4);
-            crypto1_destroy(traceCrypto1);
+                traceState = TRACE_ERROR;
+            }
+            break;
+        default:
             traceState = TRACE_ERROR;
-        }
-        break;
-    default:
-        traceState = TRACE_ERROR;
-        return 1;
+            return 1;
     }
     return 0;
 }
 
-int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t *data, int len){
-    PrintAndLogEx(SUCCESS, "\nencrypted data: [%s]", sprint_hex(data, len) );
+int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t *data, int len)
+{
+    PrintAndLogEx(SUCCESS, "\nencrypted data: [%s]", sprint_hex(data, len));
     struct Crypto1State *s;
     ks2 = ar_enc ^ prng_successor(nt, 64);
     ks3 = at_enc ^ prng_successor(nt, 96);
     s = lfsr_recovery64(ks2, ks3);
     mf_crypto1_decrypt(s, data, len, false);
-    PrintAndLogEx(SUCCESS, "decrypted data: [%s]", sprint_hex(data, len) );
+    PrintAndLogEx(SUCCESS, "decrypted data: [%s]", sprint_hex(data, len));
     crypto1_destroy(s);
     return 0;
 }
@@ -878,7 +904,8 @@ int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t *data,
 *   TRUE if tag uses WEAK prng (ie Now the NACK bug also needs to be present for Darkside attack)
 *   FALSE is tag uses HARDEND prng (ie hardnested attack possible, with known key)
 */
-int detect_classic_prng(void){
+int detect_classic_prng(void)
+{
 
     UsbCommand resp, respA;
     uint8_t cmd[] = {MIFARE_AUTH_KEYA, 0x00};
@@ -896,7 +923,7 @@ int detect_classic_prng(void){
     }
 
     // if select tag failed.
-    if ( resp.arg[0] == 0 ) {
+    if (resp.arg[0] == 0) {
         PrintAndLogEx(WARNING, "error:  selecting tag failed,  can't detect prng\n");
         return -2;
     }
@@ -922,14 +949,15 @@ returns:
 2 = has not nack bug
 3 = always leak nacks  (clones)
 */
-int detect_classic_nackbug(bool verbose){
+int detect_classic_nackbug(bool verbose)
+{
 
     UsbCommand c = {CMD_MIFARE_NACK_DETECT, {0, 0, 0}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
 
-    if ( verbose )
+    if (verbose)
         PrintAndLogEx(SUCCESS, "press pm3-button on the proxmark3 device to abort both proxmark3 and client.\n");
 
     // for nice animation
@@ -945,16 +973,17 @@ int detect_classic_nackbug(bool verbose){
             printf(".");
         } else {
             printf(
-            #if defined(__linux__) || (__APPLE__)
-            "\e[32m\e[s%c\e[u\e[0m", star[ (staridx++ % 4) ]
-            #else
-            "."
-            #endif
+#if defined(__linux__) || (__APPLE__)
+                "\e[32m\e[s%c\e[u\e[0m", star[(staridx++ % 4) ]
+#else
+                "."
+#endif
             );
         }
         fflush(stdout);
         if (ukbhit()) {
-            int gc = getchar(); (void)gc;
+            int gc = getchar();
+            (void)gc;
             return -1;
             break;
         }
@@ -965,30 +994,40 @@ int detect_classic_nackbug(bool verbose){
             uint32_t auths = resp.arg[2];
             PrintAndLogEx(NORMAL, "");
 
-            if ( verbose ) {
+            if (verbose) {
                 PrintAndLogEx(SUCCESS, "num of auth requests  : %u", auths);
                 PrintAndLogEx(SUCCESS, "num of received NACK  : %u", nacks);
             }
-            switch( ok ) {
-                case 99 : PrintAndLogEx(WARNING, "button pressed. Aborted."); return 0;
+            switch (ok) {
+                case 99 :
+                    PrintAndLogEx(WARNING, "button pressed. Aborted.");
+                    return 0;
                 case 96 :
                 case 98 : {
-                            if (verbose)
-                                PrintAndLogEx(FAILED, "card random number generator is not predictable.");
-                            PrintAndLogEx(WARNING, "detection failed");
-                            return 2;
-                        }
+                    if (verbose)
+                        PrintAndLogEx(FAILED, "card random number generator is not predictable.");
+                    PrintAndLogEx(WARNING, "detection failed");
+                    return 2;
+                }
                 case 97 : {
-                            if (verbose) {
-                                PrintAndLogEx(FAILED, "card random number generator seems to be based on the well-known generating polynomial");
-                                PrintAndLogEx(NORMAL, "[- ]with 16 effective bits only, but shows unexpected behavior, try again.");
-                            }
-                            return 2;
-                        }
-                case  2 : PrintAndLogEx(SUCCESS, _GREEN_(always leak NACK detected)); return 3;
-                case  1 : PrintAndLogEx(SUCCESS, _GREEN_(NACK bug detected)); return 1;
-                case  0 : PrintAndLogEx(SUCCESS, "No NACK bug detected"); return 2;
-                default : PrintAndLogEx(WARNING, "errorcode from device [%i]", ok); return 0;
+                    if (verbose) {
+                        PrintAndLogEx(FAILED, "card random number generator seems to be based on the well-known generating polynomial");
+                        PrintAndLogEx(NORMAL, "[- ]with 16 effective bits only, but shows unexpected behavior, try again.");
+                    }
+                    return 2;
+                }
+                case  2 :
+                    PrintAndLogEx(SUCCESS, _GREEN_(always leak NACK detected));
+                    return 3;
+                case  1 :
+                    PrintAndLogEx(SUCCESS, _GREEN_(NACK bug detected));
+                    return 1;
+                case  0 :
+                    PrintAndLogEx(SUCCESS, "No NACK bug detected");
+                    return 2;
+                default :
+                    PrintAndLogEx(WARNING, "errorcode from device [%i]", ok);
+                    return 0;
             }
             break;
         }
@@ -996,7 +1035,8 @@ int detect_classic_nackbug(bool verbose){
     return 0;
 }
 /* try to see if card responses to "chinese magic backdoor" commands. */
-void detect_classic_magic(void) {
+void detect_classic_magic(void)
+{
 
     uint8_t isGeneration = 0;
     UsbCommand resp;
@@ -1006,10 +1046,16 @@ void detect_classic_magic(void) {
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500))
         isGeneration = resp.arg[0] & 0xff;
 
-    switch( isGeneration ){
-        case 1: PrintAndLogEx(SUCCESS, "Answers to magic commands (GEN 1a): " _GREEN_(YES)); break;
-        case 2: PrintAndLogEx(SUCCESS, "Answers to magic commands (GEN 1b): " _GREEN_(YES)); break;
+    switch (isGeneration) {
+        case 1:
+            PrintAndLogEx(SUCCESS, "Answers to magic commands (GEN 1a): " _GREEN_(YES));
+            break;
+        case 2:
+            PrintAndLogEx(SUCCESS, "Answers to magic commands (GEN 1b): " _GREEN_(YES));
+            break;
         //case 4: PrintAndLogEx(SUCCESS, "Answers to magic commands (GEN 2): "  _GREEN_(YES)); break;
-        default: PrintAndLogEx(INFO, "Answers to magic commands: " _YELLOW_(NO)); break;
+        default:
+            PrintAndLogEx(INFO, "Answers to magic commands: " _YELLOW_(NO));
+            break;
     }
 }
\ No newline at end of file
diff --git a/client/mifare/mifarehost.h b/client/mifare/mifarehost.h
index eb2042778..1d9f0c3ab 100644
--- a/client/mifare/mifarehost.h
+++ b/client/mifare/mifarehost.h
@@ -40,20 +40,20 @@
 #define TRACE_ERROR             0xFF
 
 typedef struct {
-        union {
-            struct Crypto1State *slhead;
-            uint64_t *keyhead;
-        } head;
-        union {
-            struct Crypto1State *sltail;
-            uint64_t *keytail;
-        } tail;
-        uint32_t len;
-        uint32_t uid;
-        uint32_t blockNo;
-        uint32_t keyType;
-        uint32_t nt;
-        uint32_t ks1;
+    union {
+        struct Crypto1State *slhead;
+        uint64_t *keyhead;
+    } head;
+    union {
+        struct Crypto1State *sltail;
+        uint64_t *keytail;
+    } tail;
+    uint32_t len;
+    uint32_t uid;
+    uint32_t blockNo;
+    uint32_t keyType;
+    uint32_t nt;
+    uint32_t ks1;
 } StateList_t;
 
 typedef struct {
@@ -70,10 +70,10 @@ typedef struct {
 extern char logHexFileName[FILE_PATH_SIZE];
 
 extern int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key);
-extern int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t * ResultKeys, bool calibrate);
-extern int mfCheckKeys (uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t keycnt, uint8_t * keyBlock, uint64_t * key);
-extern int mfCheckKeys_fast( uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk,
-                        uint8_t strategy, uint32_t size, uint8_t *keyBlock, sector_t *e_sector, bool use_flashmemory);
+extern int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t *ResultKeys, bool calibrate);
+extern int mfCheckKeys(uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t keycnt, uint8_t *keyBlock, uint64_t *key);
+extern int mfCheckKeys_fast(uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk,
+                            uint8_t strategy, uint32_t size, uint8_t *keyBlock, sector_t *e_sector, bool use_flashmemory);
 extern int mfKeyBrute(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint64_t *resultkey);
 
 extern int mfReadSector(uint8_t sectorNo, uint8_t keyType, uint8_t *key, uint8_t *data);
diff --git a/client/mifare/ndef.c b/client/mifare/ndef.c
index 21b0bdda1..2e05fb192 100644
--- a/client/mifare/ndef.c
+++ b/client/mifare/ndef.c
@@ -80,7 +80,8 @@ static const char *URI_s[] = {
     "urn:nfc:"                    // 0x23
 };
 
-uint16_t ndefTLVGetLength(uint8_t *data, size_t *indx) {
+uint16_t ndefTLVGetLength(uint8_t *data, size_t *indx)
+{
     uint16_t len = 0;
     if (data[0] == 0xff) {
         len = (data[1] << 8) + data[2];
@@ -93,7 +94,8 @@ uint16_t ndefTLVGetLength(uint8_t *data, size_t *indx) {
     return len;
 }
 
-int ndefDecodeHeader(uint8_t *data, size_t datalen, NDEFHeader_t *header) {
+int ndefDecodeHeader(uint8_t *data, size_t datalen, NDEFHeader_t *header)
+{
     header->Type = NULL;
     header->Payload = NULL;
     header->ID = NULL;
@@ -130,7 +132,8 @@ int ndefDecodeHeader(uint8_t *data, size_t datalen, NDEFHeader_t *header) {
     return 0;
 }
 
-int ndefPrintHeader(NDEFHeader_t *header) {
+int ndefPrintHeader(NDEFHeader_t *header)
+{
     PrintAndLogEx(INFO, "Header:");
 
     PrintAndLogEx(NORMAL, "\tMessage Begin:    %s", STRBOOL(header->MessageBegin));
@@ -149,7 +152,8 @@ int ndefPrintHeader(NDEFHeader_t *header) {
     return 0;
 }
 
-int ndefDecodeSig(uint8_t *sig, size_t siglen) {
+int ndefDecodeSig(uint8_t *sig, size_t siglen)
+{
     size_t indx = 0;
     PrintAndLogEx(NORMAL, "\tsignature version: 0x%02x", sig[0]);
     if (sig[0] != 0x01) {
@@ -174,8 +178,8 @@ int ndefDecodeSig(uint8_t *sig, size_t siglen) {
         uint8_t sval[300] = {0};
         int res = ecdsa_asn1_get_signature(&sig[indx], intsiglen, rval, sval);
         if (!res) {
-            PrintAndLogEx(NORMAL ,"\t\tr: %s", sprint_hex(rval, 32));
-            PrintAndLogEx(NORMAL ,"\t\ts: %s", sprint_hex(sval, 32));
+            PrintAndLogEx(NORMAL, "\t\tr: %s", sprint_hex(rval, 32));
+            PrintAndLogEx(NORMAL, "\t\ts: %s", sprint_hex(sval, 32));
         }
     }
     indx += intsiglen;
@@ -215,38 +219,40 @@ int ndefDecodeSig(uint8_t *sig, size_t siglen) {
     return 0;
 };
 
-int ndefDecodePayload(NDEFHeader_t *ndef) {
+int ndefDecodePayload(NDEFHeader_t *ndef)
+{
 
-    switch(ndef->TypeNameFormat) {
-    case tnfWellKnownRecord:
-        PrintAndLogEx(INFO, "Well Known Record");
-        PrintAndLogEx(NORMAL, "\ttype:    %.*s", ndef->TypeLen, ndef->Type);
+    switch (ndef->TypeNameFormat) {
+        case tnfWellKnownRecord:
+            PrintAndLogEx(INFO, "Well Known Record");
+            PrintAndLogEx(NORMAL, "\ttype:    %.*s", ndef->TypeLen, ndef->Type);
 
-        if (!strncmp((char *)ndef->Type, "T", ndef->TypeLen)) {
-            PrintAndLogEx(NORMAL, "\ttext   : %.*s", ndef->PayloadLen, ndef->Payload);
-        }
+            if (!strncmp((char *)ndef->Type, "T", ndef->TypeLen)) {
+                PrintAndLogEx(NORMAL, "\ttext   : %.*s", ndef->PayloadLen, ndef->Payload);
+            }
 
-        if (!strncmp((char *)ndef->Type, "U", ndef->TypeLen)) {
-            PrintAndLogEx(NORMAL, "\turi    : %s%.*s", (ndef->Payload[0] <= 0x23 ? URI_s[ndef->Payload[0]] : "[err]"), ndef->PayloadLen, &ndef->Payload[1]);
-        }
+            if (!strncmp((char *)ndef->Type, "U", ndef->TypeLen)) {
+                PrintAndLogEx(NORMAL, "\turi    : %s%.*s", (ndef->Payload[0] <= 0x23 ? URI_s[ndef->Payload[0]] : "[err]"), ndef->PayloadLen, &ndef->Payload[1]);
+            }
 
-        if (!strncmp((char *)ndef->Type, "Sig", ndef->TypeLen)) {
-            ndefDecodeSig(ndef->Payload, ndef->PayloadLen);
-        }
+            if (!strncmp((char *)ndef->Type, "Sig", ndef->TypeLen)) {
+                ndefDecodeSig(ndef->Payload, ndef->PayloadLen);
+            }
 
-        break;
-    case tnfAbsoluteURIRecord:
-        PrintAndLogEx(INFO, "Absolute URI Record");
-        PrintAndLogEx(NORMAL, "\ttype:    %.*s", ndef->TypeLen, ndef->Type);
-        PrintAndLogEx(NORMAL, "\tpayload: %.*s", ndef->PayloadLen, ndef->Payload);
-        break;
-    default:
-        break;
+            break;
+        case tnfAbsoluteURIRecord:
+            PrintAndLogEx(INFO, "Absolute URI Record");
+            PrintAndLogEx(NORMAL, "\ttype:    %.*s", ndef->TypeLen, ndef->Type);
+            PrintAndLogEx(NORMAL, "\tpayload: %.*s", ndef->PayloadLen, ndef->Payload);
+            break;
+        default:
+            break;
     }
     return 0;
 }
 
-int ndefRecordDecodeAndPrint(uint8_t *ndefRecord, size_t ndefRecordLen) {
+int ndefRecordDecodeAndPrint(uint8_t *ndefRecord, size_t ndefRecordLen)
+{
     NDEFHeader_t NDEFHeader = {0};
     int res = ndefDecodeHeader(ndefRecord, ndefRecordLen, &NDEFHeader);
     if (res)
@@ -272,7 +278,8 @@ int ndefRecordDecodeAndPrint(uint8_t *ndefRecord, size_t ndefRecordLen) {
     return 0;
 }
 
-int ndefRecordsDecodeAndPrint(uint8_t *ndefRecord, size_t ndefRecordLen) {
+int ndefRecordsDecodeAndPrint(uint8_t *ndefRecord, size_t ndefRecordLen)
+{
     bool firstRec = true;
     size_t len = 0;
 
@@ -306,7 +313,8 @@ int ndefRecordsDecodeAndPrint(uint8_t *ndefRecord, size_t ndefRecordLen) {
     return 0;
 }
 
-int NDEFDecodeAndPrint(uint8_t *ndef, size_t ndefLen, bool verbose) {
+int NDEFDecodeAndPrint(uint8_t *ndef, size_t ndefLen, bool verbose)
+{
 
     size_t indx = 0;
 
diff --git a/client/pm3_binlib.c b/client/pm3_binlib.c
index 332714fed..95b1547cc 100644
--- a/client/pm3_binlib.c
+++ b/client/pm3_binlib.c
@@ -41,311 +41,302 @@
 
 static void badcode(lua_State *L, int c)
 {
- char s[]="bad code `?'";
- s[sizeof(s)-3]=c;
- luaL_argerror(L,1,s);
+    char s[] = "bad code `?'";
+    s[sizeof(s) - 3] = c;
+    luaL_argerror(L, 1, s);
 }
 
 static int doendian(int c)
 {
- int x = 1;
- int e = *(char*)&x;
- if (c==OP_LITTLEENDIAN) return !e;
- if (c==OP_BIGENDIAN) return e;
- if (c==OP_NATIVE) return 0;
- return 0;
+    int x = 1;
+    int e = *(char *)&x;
+    if (c == OP_LITTLEENDIAN) return !e;
+    if (c == OP_BIGENDIAN) return e;
+    if (c == OP_NATIVE) return 0;
+    return 0;
 }
 
 static void doswap(int swap, void *p, size_t n)
 {
- if (swap)
- {
-  char *a = (char*)p;
-  int i,j;
-  for (i=0, j=n-1, n=n/2; n--; i++, j--)
-  {
-   char t=a[i]; a[i]=a[j]; a[j]=t;
-  }
- }
+    if (swap) {
+        char *a = (char *)p;
+        int i, j;
+        for (i = 0, j = n - 1, n = n / 2; n--; i++, j--) {
+            char t = a[i];
+            a[i] = a[j];
+            a[j] = t;
+        }
+    }
 }
 
 #define UNPACKNUMBER(OP,T)                      \
-   case OP:                                     \
-   {                                            \
-    T a;                                        \
-    int m=sizeof(a);                            \
-    if (i+m>len) { done = 1;    break;}         \
-    memcpy(&a,s+i,m);                           \
-    i+=m;                                       \
-    doswap(swap,&a,m);                          \
-    lua_pushnumber(L,(lua_Number)a);            \
-    ++n;                                        \
-    break;                                      \
-   }
+    case OP:                                     \
+    {                                            \
+        T a;                                        \
+        int m=sizeof(a);                            \
+        if (i+m>len) { done = 1;    break;}         \
+        memcpy(&a,s+i,m);                           \
+        i+=m;                                       \
+        doswap(swap,&a,m);                          \
+        lua_pushnumber(L,(lua_Number)a);            \
+        ++n;                                        \
+        break;                                      \
+    }
 
 #define UNPACKSTRING(OP,T)                      \
-   case OP:                                     \
-   {                                            \
-    T l;                                        \
-    int m = sizeof(l);                          \
-    if (i + m > len) { done = 1;    break; }    \
-    memcpy(&l, s+i, m);                         \
-    doswap(swap,&l,m);                          \
-    if (i + m + l > len) { done = 1; break;}    \
-    i += m;                                     \
-    lua_pushlstring(L,s+i,l);                   \
-    i += l;                                     \
-    ++n;                                        \
-    break;                                      \
-   }
+    case OP:                                     \
+    {                                            \
+        T l;                                        \
+        int m = sizeof(l);                          \
+        if (i + m > len) { done = 1;    break; }    \
+        memcpy(&l, s+i, m);                         \
+        doswap(swap,&l,m);                          \
+        if (i + m + l > len) { done = 1; break;}    \
+        i += m;                                     \
+        lua_pushlstring(L,s+i,l);                   \
+        i += l;                                     \
+        ++n;                                        \
+        break;                                      \
+    }
 
 #define HEXDIGITS(DIG) \
- "0123456789ABCDEF"[DIG]
+    "0123456789ABCDEF"[DIG]
 
 static int l_unpack(lua_State *L)         /** unpack(f,s, [init]) */
 {
- size_t len;
- const char *s=luaL_checklstring(L,2,&len); /* switched s and f */
- const char *f=luaL_checkstring(L,1);
- int i_read = luaL_optinteger(L,3,1)-1;
- //int i_read = (int)luaL_optint(L,(3),(1))-1;
- unsigned int i;
- if (i_read >= 0) {
-   i = i_read;
- } else {
-   i = 0;
- }
- int n=0;
- int swap=0;
- int done=0;
- lua_pushnil(L);
- while (*f && done == 0)
- {
-  int c = *f++;
-  int N = 1;
-  if (isdigit((int) (unsigned char) *f))
-  {
-   N=0;
-   while (isdigit((int) (unsigned char) *f)) N=10*N+(*f++)-'0';
-   if (N==0 && c==OP_STRING) { lua_pushliteral(L,""); ++n; }
-  }
-  while (N-- && done == 0) switch (c)
-  {
-   case OP_LITTLEENDIAN:
-   case OP_BIGENDIAN:
-   case OP_NATIVE:
-   {
-    swap=doendian(c);
-    N=0;
-    break;
-   }
-   case OP_STRING:
-   {
-    ++N;
-    if (i+N>len) {done = 1; break; }
-    lua_pushlstring(L,s+i,N);
-    i+=N;
-    ++n;
-    N=0;
-    break;
-   }
-   case OP_ZSTRING:
-   {
-    size_t l;
-    if (i>=len) {done = 1; break; }
-    l=strlen(s+i);
-    lua_pushlstring(L,s+i,l);
-    i+=l+1;
-    ++n;
-    break;
-   }
-
-   UNPACKSTRING(OP_BSTRING, uint8_t)
-   UNPACKSTRING(OP_WSTRING, uint16_t)
-   UNPACKSTRING(OP_SSTRING, uint32_t)
-   UNPACKNUMBER(OP_NUMBER, lua_Number)
-   UNPACKNUMBER(OP_DOUBLE, double)
-   UNPACKNUMBER(OP_FLOAT, float)
-   UNPACKNUMBER(OP_CHAR, int8_t)
-   UNPACKNUMBER(OP_BYTE, uint8_t)
-   UNPACKNUMBER(OP_SHORT, int16_t)
-   UNPACKNUMBER(OP_USHORT, uint16_t)
-   UNPACKNUMBER(OP_INT, int32_t)
-   UNPACKNUMBER(OP_UINT, uint32_t)
-   UNPACKNUMBER(OP_LONG, int64_t)
-   UNPACKNUMBER(OP_ULONG, uint64_t)
-  case OP_HEX:
-    {
-      luaL_Buffer buf;
-      char hdigit = '0';
-      int val = 0;
-      luaL_buffinit(L,&buf);
-      N++;
-      if (i+N > len) {done = 1; break;}
-      for (unsigned int ii = i; ii < i+N; ii++) {
-    val = s[ii] & 0xF0;
-    val = val >> 4;
-    hdigit = HEXDIGITS(val);
-    luaL_addlstring(&buf, &hdigit, 1);
-
-    val = s[ii] & 0x0F;
-    hdigit = HEXDIGITS(val);
-    luaL_addlstring(&buf, &hdigit, 1);
-      }
-      luaL_pushresult(&buf);
-      n++;
-      i += N;
-      N = 0;
-      break;
+    size_t len;
+    const char *s = luaL_checklstring(L, 2, &len); /* switched s and f */
+    const char *f = luaL_checkstring(L, 1);
+    int i_read = luaL_optinteger(L, 3, 1) - 1;
+//int i_read = (int)luaL_optint(L,(3),(1))-1;
+    unsigned int i;
+    if (i_read >= 0) {
+        i = i_read;
+    } else {
+        i = 0;
     }
+    int n = 0;
+    int swap = 0;
+    int done = 0;
+    lua_pushnil(L);
+    while (*f && done == 0) {
+        int c = *f++;
+        int N = 1;
+        if (isdigit((int)(unsigned char) *f)) {
+            N = 0;
+            while (isdigit((int)(unsigned char) *f)) N = 10 * N + (*f++) - '0';
+            if (N == 0 && c == OP_STRING) { lua_pushliteral(L, ""); ++n; }
+        }
+        while (N-- && done == 0) switch (c) {
+                case OP_LITTLEENDIAN:
+                case OP_BIGENDIAN:
+                case OP_NATIVE: {
+                    swap = doendian(c);
+                    N = 0;
+                    break;
+                }
+                case OP_STRING: {
+                    ++N;
+                    if (i + N > len) {done = 1; break; }
+                    lua_pushlstring(L, s + i, N);
+                    i += N;
+                    ++n;
+                    N = 0;
+                    break;
+                }
+                case OP_ZSTRING: {
+                    size_t l;
+                    if (i >= len) {done = 1; break; }
+                    l = strlen(s + i);
+                    lua_pushlstring(L, s + i, l);
+                    i += l + 1;
+                    ++n;
+                    break;
+                }
 
-   case ' ': case ',':
-    break;
-   default:
-    badcode(L,c);
-    break;
-  }
- }
- lua_pushnumber(L,i+1);
- lua_replace(L,-n-2);
- return n+1;
+                UNPACKSTRING(OP_BSTRING, uint8_t)
+                UNPACKSTRING(OP_WSTRING, uint16_t)
+                UNPACKSTRING(OP_SSTRING, uint32_t)
+                UNPACKNUMBER(OP_NUMBER, lua_Number)
+                UNPACKNUMBER(OP_DOUBLE, double)
+                UNPACKNUMBER(OP_FLOAT, float)
+                UNPACKNUMBER(OP_CHAR, int8_t)
+                UNPACKNUMBER(OP_BYTE, uint8_t)
+                UNPACKNUMBER(OP_SHORT, int16_t)
+                UNPACKNUMBER(OP_USHORT, uint16_t)
+                UNPACKNUMBER(OP_INT, int32_t)
+                UNPACKNUMBER(OP_UINT, uint32_t)
+                UNPACKNUMBER(OP_LONG, int64_t)
+                UNPACKNUMBER(OP_ULONG, uint64_t)
+                case OP_HEX: {
+                    luaL_Buffer buf;
+                    char hdigit = '0';
+                    int val = 0;
+                    luaL_buffinit(L, &buf);
+                    N++;
+                    if (i + N > len) {done = 1; break;}
+                    for (unsigned int ii = i; ii < i + N; ii++) {
+                        val = s[ii] & 0xF0;
+                        val = val >> 4;
+                        hdigit = HEXDIGITS(val);
+                        luaL_addlstring(&buf, &hdigit, 1);
+
+                        val = s[ii] & 0x0F;
+                        hdigit = HEXDIGITS(val);
+                        luaL_addlstring(&buf, &hdigit, 1);
+                    }
+                    luaL_pushresult(&buf);
+                    n++;
+                    i += N;
+                    N = 0;
+                    break;
+                }
+
+                case ' ':
+                case ',':
+                    break;
+                default:
+                    badcode(L, c);
+                    break;
+            }
+    }
+    lua_pushnumber(L, i + 1);
+    lua_replace(L, -n - 2);
+    return n + 1;
 }
 
 #define PACKNUMBER(OP,T)                        \
-   case OP:                                     \
-   {                                            \
-    T a=(T)luaL_checknumber(L,i++);             \
-    doswap(swap,&a,sizeof(a));                  \
-    luaL_addlstring(&b,(char*)&a,sizeof(a));    \
-    break;                                      \
-   }
+    case OP:                                     \
+    {                                            \
+        T a=(T)luaL_checknumber(L,i++);             \
+        doswap(swap,&a,sizeof(a));                  \
+        luaL_addlstring(&b,(char*)&a,sizeof(a));    \
+        break;                                      \
+    }
 
 #define PACKSTRING(OP,T)                        \
-   case OP:                                     \
-   {                                            \
-    size_t l;                                   \
-    const char *a=luaL_checklstring(L,i++,&l);  \
-    T ll=(T)l;                                  \
-    doswap(swap,&ll,sizeof(ll));                \
-    luaL_addlstring(&b,(char*)&ll,sizeof(ll));  \
-    luaL_addlstring(&b,a,l);                    \
-    break;                                      \
-   }
+    case OP:                                     \
+    {                                            \
+        size_t l;                                   \
+        const char *a=luaL_checklstring(L,i++,&l);  \
+        T ll=(T)l;                                  \
+        doswap(swap,&ll,sizeof(ll));                \
+        luaL_addlstring(&b,(char*)&ll,sizeof(ll));  \
+        luaL_addlstring(&b,a,l);                    \
+        break;                                      \
+    }
 
 static int l_pack(lua_State *L)         /** pack(f,...) */
 {
- int i = 2;
- const char *f = luaL_checkstring(L,1);
- int swap = 0;
- luaL_Buffer b;
- luaL_buffinit(L,&b);
- while (*f)
- {
-  int c = *f++;
-  int N = 1;
-  if (isdigit((int) (unsigned char) *f))
-  {
-   N=0;
-   while (isdigit((int) (unsigned char) *f)) N=10*N+(*f++)-'0';
-  }
-  while (N--) switch (c)
-  {
-   case OP_LITTLEENDIAN:
-   case OP_BIGENDIAN:
-   case OP_NATIVE:
-   {
-    swap=doendian(c);
-    N=0;
-    break;
-   }
-   case OP_STRING:
-   case OP_ZSTRING:
-   {
-    size_t l;
-    const char *a=luaL_checklstring(L,i++,&l);
-    luaL_addlstring(&b,a,l+(c==OP_ZSTRING));
-    break;
-   }
-   PACKSTRING(OP_BSTRING, uint8_t)
-   PACKSTRING(OP_WSTRING, uint16_t)
-   PACKSTRING(OP_SSTRING, uint32_t)
-   PACKNUMBER(OP_NUMBER, lua_Number)
-   PACKNUMBER(OP_DOUBLE, double)
-   PACKNUMBER(OP_FLOAT, float)
-   PACKNUMBER(OP_CHAR, int8_t)
-   PACKNUMBER(OP_BYTE, uint8_t)
-   PACKNUMBER(OP_SHORT, int16_t)
-   PACKNUMBER(OP_USHORT, uint16_t)
-   PACKNUMBER(OP_INT, int32_t)
-   PACKNUMBER(OP_UINT, uint32_t)
-   PACKNUMBER(OP_LONG, int64_t)
-   PACKNUMBER(OP_ULONG, uint64_t)
-  case OP_HEX:
-    { // doing digit parsing the lpack way
-      unsigned char sbyte = 0;
-      size_t l;
-      unsigned int ii = 0;
-      int odd = 0;
-      const char *a = luaL_checklstring(L, i++, &l);
-      for (ii = 0; ii < l; ii++) {
-    if (isxdigit((int) (unsigned char) a[ii])) {
-      if (isdigit((int) (unsigned char) a[ii])) {
-        sbyte += a[ii] - '0';
-        odd++;
-      } else if (a[ii] >= 'A' && a[ii] <= 'F') {
-        sbyte += a[ii] - 'A' + 10;
-        odd++;
-      } else if (a[ii] >= 'a' && a[ii] <= 'f') {
-        sbyte += a[ii] - 'a' + 10;
-        odd++;
-      }
-      if (odd == 1) {
-        sbyte = sbyte << 4;
-      } else if (odd == 2) {
-        luaL_addlstring(&b, (char *) &sbyte, 1);
-        sbyte = 0;
-        odd = 0;
-      }
-    } else if (isspace(a[ii])) {
-      /* ignore */
-    } else {
-      /* err ... ignore too*/
+    int i = 2;
+    const char *f = luaL_checkstring(L, 1);
+    int swap = 0;
+    luaL_Buffer b;
+    luaL_buffinit(L, &b);
+    while (*f) {
+        int c = *f++;
+        int N = 1;
+        if (isdigit((int)(unsigned char) *f)) {
+            N = 0;
+            while (isdigit((int)(unsigned char) *f)) N = 10 * N + (*f++) - '0';
+        }
+        while (N--) switch (c) {
+                case OP_LITTLEENDIAN:
+                case OP_BIGENDIAN:
+                case OP_NATIVE: {
+                    swap = doendian(c);
+                    N = 0;
+                    break;
+                }
+                case OP_STRING:
+                case OP_ZSTRING: {
+                    size_t l;
+                    const char *a = luaL_checklstring(L, i++, &l);
+                    luaL_addlstring(&b, a, l + (c == OP_ZSTRING));
+                    break;
+                }
+                PACKSTRING(OP_BSTRING, uint8_t)
+                PACKSTRING(OP_WSTRING, uint16_t)
+                PACKSTRING(OP_SSTRING, uint32_t)
+                PACKNUMBER(OP_NUMBER, lua_Number)
+                PACKNUMBER(OP_DOUBLE, double)
+                PACKNUMBER(OP_FLOAT, float)
+                PACKNUMBER(OP_CHAR, int8_t)
+                PACKNUMBER(OP_BYTE, uint8_t)
+                PACKNUMBER(OP_SHORT, int16_t)
+                PACKNUMBER(OP_USHORT, uint16_t)
+                PACKNUMBER(OP_INT, int32_t)
+                PACKNUMBER(OP_UINT, uint32_t)
+                PACKNUMBER(OP_LONG, int64_t)
+                PACKNUMBER(OP_ULONG, uint64_t)
+                case OP_HEX: {
+                    // doing digit parsing the lpack way
+                    unsigned char sbyte = 0;
+                    size_t l;
+                    unsigned int ii = 0;
+                    int odd = 0;
+                    const char *a = luaL_checklstring(L, i++, &l);
+                    for (ii = 0; ii < l; ii++) {
+                        if (isxdigit((int)(unsigned char) a[ii])) {
+                            if (isdigit((int)(unsigned char) a[ii])) {
+                                sbyte += a[ii] - '0';
+                                odd++;
+                            } else if (a[ii] >= 'A' && a[ii] <= 'F') {
+                                sbyte += a[ii] - 'A' + 10;
+                                odd++;
+                            } else if (a[ii] >= 'a' && a[ii] <= 'f') {
+                                sbyte += a[ii] - 'a' + 10;
+                                odd++;
+                            }
+                            if (odd == 1) {
+                                sbyte = sbyte << 4;
+                            } else if (odd == 2) {
+                                luaL_addlstring(&b, (char *) &sbyte, 1);
+                                sbyte = 0;
+                                odd = 0;
+                            }
+                        } else if (isspace(a[ii])) {
+                            /* ignore */
+                        } else {
+                            /* err ... ignore too*/
+                        }
+                    }
+                    if (odd == 1) {
+                        luaL_addlstring(&b, (char *) &sbyte, 1);
+                    }
+                    break;
+                }
+                case ' ':
+                case ',':
+                    break;
+                default:
+                    badcode(L, c);
+                    break;
+            }
     }
-      }
-      if (odd == 1) {
-    luaL_addlstring(&b, (char *) &sbyte, 1);
-      }
-      break;
-    }
-   case ' ': case ',':
-    break;
-   default:
-    badcode(L,c);
-    break;
-  }
- }
- luaL_pushresult(&b);
- return 1;
+    luaL_pushresult(&b);
+    return 1;
 }
 
-static const luaL_Reg binlib[] =
-{
+static const luaL_Reg binlib[] = {
     {"pack",   l_pack},
     {"unpack", l_unpack},
     {NULL,     NULL}
 };
 
-LUALIB_API int luaopen_binlib (lua_State *L) {
-  luaL_newlib(L, binlib);
-  return 1;
+LUALIB_API int luaopen_binlib(lua_State *L)
+{
+    luaL_newlib(L, binlib);
+    return 1;
 }
 /*
 ** Open bin library
 */
-int set_bin_library (lua_State *L) {
+int set_bin_library(lua_State *L)
+{
 
-   luaL_requiref(L, "bin", luaopen_binlib, 1);
-   lua_pop(L, 1);
-  return 1;
+    luaL_requiref(L, "bin", luaopen_binlib, 1);
+    lua_pop(L, 1);
+    return 1;
 }
 
diff --git a/client/pm3_binlib.h b/client/pm3_binlib.h
index e45b0233c..3d4f0993d 100644
--- a/client/pm3_binlib.h
+++ b/client/pm3_binlib.h
@@ -2,6 +2,6 @@
 #define PM3_BINLIB
 
 #include <lua.h>
-int set_bin_library (lua_State *L);
+int set_bin_library(lua_State *L);
 
 #endif /* PM3_BINLIB */
diff --git a/client/pm3_bitlib.c b/client/pm3_bitlib.c
index ad00f3b58..1f4d25b98 100644
--- a/client/pm3_bitlib.c
+++ b/client/pm3_bitlib.c
@@ -21,41 +21,41 @@ typedef size_t lua_UInteger;
 /* Bit type size and limits */
 
 #define BIT_BITS                                                        \
-  (CHAR_BIT * sizeof(lua_Integer) > BITLIB_FLOAT_BITS ?                 \
-   BITLIB_FLOAT_BITS : (CHAR_BIT * sizeof(lua_Integer)))
+    (CHAR_BIT * sizeof(lua_Integer) > BITLIB_FLOAT_BITS ?                 \
+     BITLIB_FLOAT_BITS : (CHAR_BIT * sizeof(lua_Integer)))
 
 /* This code may give warnings if BITLIB_FLOAT_* are too big to fit in
    long, but that doesn't matter since in that case they won't be
    used. */
 #define BIT_MAX                                                         \
-  (CHAR_BIT * sizeof(lua_Integer) > BITLIB_FLOAT_BITS ? BITLIB_FLOAT_MAX : LUA_INTEGER_MAX)
+    (CHAR_BIT * sizeof(lua_Integer) > BITLIB_FLOAT_BITS ? BITLIB_FLOAT_MAX : LUA_INTEGER_MAX)
 
 #define BIT_MIN                                                         \
-  (CHAR_BIT * sizeof(lua_Integer) > BITLIB_FLOAT_BITS ? BITLIB_FLOAT_MIN : LUA_INTEGER_MIN)
+    (CHAR_BIT * sizeof(lua_Integer) > BITLIB_FLOAT_BITS ? BITLIB_FLOAT_MIN : LUA_INTEGER_MIN)
 
 #define BIT_UMAX                                                        \
-  (CHAR_BIT * sizeof(lua_Integer) > BITLIB_FLOAT_BITS ? BITLIB_FLOAT_UMAX : LUA_UINTEGER_MAX)
+    (CHAR_BIT * sizeof(lua_Integer) > BITLIB_FLOAT_BITS ? BITLIB_FLOAT_UMAX : LUA_UINTEGER_MAX)
 
 
 /* Define TOBIT to get a bit value */
 #ifdef BUILTIN_CAST
 #define
 #define TOBIT(L, n, res)                    \
-  ((void)(res), luaL_checkinteger((L), (n)))
+    ((void)(res), luaL_checkinteger((L), (n)))
 #else
 #include <stdint.h>
 #include <math.h>
 
 /* FIXME: Assumes lua_Number fits in a double (use of fmod). */
 #define TOBIT(L, n, res)                                            \
-  ((lua_Integer)(((res) = fmod(luaL_checknumber(L, (n)), (double)BIT_UMAX + 1.0)), \
-                 (res) > BIT_MAX ? ((res) -= (double)BIT_UMAX, (res) -= 1) : \
-                 ((res) < BIT_MIN ? ((res) += (double)BIT_UMAX, (res) += 1) : (res))))
+    ((lua_Integer)(((res) = fmod(luaL_checknumber(L, (n)), (double)BIT_UMAX + 1.0)), \
+                   (res) > BIT_MAX ? ((res) -= (double)BIT_UMAX, (res) -= 1) : \
+                   ((res) < BIT_MIN ? ((res) += (double)BIT_UMAX, (res) += 1) : (res))))
 #endif
 
 
 #define BIT_TRUNCATE(i)                         \
-  ((i) & BIT_UMAX)
+    ((i) & BIT_UMAX)
 
 
 /* Operations
@@ -71,38 +71,38 @@ typedef size_t lua_UInteger;
    */
 
 #define MONADIC(name, op)                                       \
-  static int bit_ ## name(lua_State *L) {                       \
-    lua_Number f;                                               \
-    lua_pushinteger(L, BIT_TRUNCATE(op TOBIT(L, 1, f)));        \
-    return 1;                                                   \
-  }
+    static int bit_ ## name(lua_State *L) {                       \
+        lua_Number f;                                               \
+        lua_pushinteger(L, BIT_TRUNCATE(op TOBIT(L, 1, f)));        \
+        return 1;                                                   \
+    }
 
 #define VARIADIC(name, op)                      \
-  static int bit_ ## name(lua_State *L) {       \
-    lua_Number f;                               \
-    int n = lua_gettop(L), i;                   \
-    lua_Integer w = TOBIT(L, 1, f);             \
-    for (i = 2; i <= n; i++)                    \
-      w op TOBIT(L, i, f);                      \
-    lua_pushinteger(L, BIT_TRUNCATE(w));        \
-    return 1;                                   \
-  }
+    static int bit_ ## name(lua_State *L) {       \
+        lua_Number f;                               \
+        int n = lua_gettop(L), i;                   \
+        lua_Integer w = TOBIT(L, 1, f);             \
+        for (i = 2; i <= n; i++)                    \
+            w op TOBIT(L, i, f);                      \
+        lua_pushinteger(L, BIT_TRUNCATE(w));        \
+        return 1;                                   \
+    }
 
 #define LOGICAL_SHIFT(name, op)                                         \
-  static int bit_ ## name(lua_State *L) {                               \
-    lua_Number f;                                                       \
-    lua_pushinteger(L, BIT_TRUNCATE(BIT_TRUNCATE((lua_UInteger)TOBIT(L, 1, f)) op \
-                                    (unsigned)luaL_checknumber(L, 2))); \
-    return 1;                                                           \
-  }
+    static int bit_ ## name(lua_State *L) {                               \
+        lua_Number f;                                                       \
+        lua_pushinteger(L, BIT_TRUNCATE(BIT_TRUNCATE((lua_UInteger)TOBIT(L, 1, f)) op \
+                                        (unsigned)luaL_checknumber(L, 2))); \
+        return 1;                                                           \
+    }
 
 #define ARITHMETIC_SHIFT(name, op)                                      \
-  static int bit_ ## name(lua_State *L) {                               \
-    lua_Number f;                                                       \
-    lua_pushinteger(L, BIT_TRUNCATE((lua_Integer)TOBIT(L, 1, f) op      \
-                                    (unsigned)luaL_checknumber(L, 2))); \
-    return 1;                                                           \
-  }
+    static int bit_ ## name(lua_State *L) {                               \
+        lua_Number f;                                                       \
+        lua_pushinteger(L, BIT_TRUNCATE((lua_Integer)TOBIT(L, 1, f) op      \
+                                        (unsigned)luaL_checknumber(L, 2))); \
+        return 1;                                                           \
+    }
 
 MONADIC(cast,  +)
 MONADIC(bnot,  ~)
@@ -114,18 +114,19 @@ LOGICAL_SHIFT(rshift,     >>)
 ARITHMETIC_SHIFT(arshift, >>)
 
 static const struct luaL_Reg bitlib[] = {
-  {"cast",    bit_cast},
-  {"bnot",    bit_bnot},
-  {"band",    bit_band},
-  {"bor",     bit_bor},
-  {"bxor",    bit_bxor},
-  {"lshift",  bit_lshift},
-  {"rshift",  bit_rshift},
-  {"arshift", bit_arshift},
-  {NULL, NULL}
+    {"cast",    bit_cast},
+    {"bnot",    bit_bnot},
+    {"band",    bit_band},
+    {"bor",     bit_bor},
+    {"bxor",    bit_bxor},
+    {"lshift",  bit_lshift},
+    {"rshift",  bit_rshift},
+    {"arshift", bit_arshift},
+    {NULL, NULL}
 };
 
-LUALIB_API int luaopen_bit (lua_State *L) {
+LUALIB_API int luaopen_bit(lua_State *L)
+{
     luaL_newlib(L, bitlib);
     //luaL_register(L, "bit", bitlib);
     lua_pushnumber(L, BIT_BITS);
@@ -144,9 +145,10 @@ LUALIB_API int luaopen_bit (lua_State *L) {
 /*
 ** Open bit library
 */
-int set_bit_library (lua_State *L) {
+int set_bit_library(lua_State *L)
+{
 
-   luaL_requiref(L, "bit", luaopen_bit, 1);
-   lua_pop(L, 1);
-  return 1;
+    luaL_requiref(L, "bit", luaopen_bit, 1);
+    lua_pop(L, 1);
+    return 1;
 }
diff --git a/client/pm3_bitlib.h b/client/pm3_bitlib.h
index 45da0a34e..4e4ccfa98 100644
--- a/client/pm3_bitlib.h
+++ b/client/pm3_bitlib.h
@@ -2,6 +2,6 @@
 #define PM3_BITLIB
 
 #include <lua.h>
-int set_bit_library (lua_State *L);
+int set_bit_library(lua_State *L);
 
 #endif /* PM3_BITLIB */
diff --git a/client/proxendian.h b/client/proxendian.h
index 3ef073292..33f9a5f9c 100644
--- a/client/proxendian.h
+++ b/client/proxendian.h
@@ -37,12 +37,12 @@
 
 static inline uint16_t le16(uint16_t v)
 {
-    return (v>>8) | (v<<8);
+    return (v >> 8) | (v << 8);
 }
 
 static inline uint32_t le32(uint32_t v)
 {
-    return (le16(v)<<16) | (le16(v>>16));
+    return (le16(v) << 16) | (le16(v >> 16));
 }
 #endif // HOST_LITTLE_ENDIAN
 
diff --git a/client/proxgui.cpp b/client/proxgui.cpp
index cfe7bc794..3acf249ad 100644
--- a/client/proxgui.cpp
+++ b/client/proxgui.cpp
@@ -23,7 +23,8 @@ WorkerThread::~WorkerThread()
 {
 }
 
-void WorkerThread::run() {
+void WorkerThread::run()
+{
     main_loop(script_cmds_file, script_cmd, usb_present);
 }
 
diff --git a/client/proxgui.h b/client/proxgui.h
index d5d90e8e1..5f6d8bd2a 100644
--- a/client/proxgui.h
+++ b/client/proxgui.h
@@ -38,7 +38,7 @@ extern bool GridLocked;
 //extern int autoCorr(const int* in, int *out, size_t len, int window);
 extern int AskEdgeDetect(const int *in, int *out, int len, int threshold);
 extern int AutoCorrelate(const int *in, int *out, size_t len, int window, bool SaveGrph, bool verbose);
-extern int directionalThreshold(const int* in, int *out, size_t len, int8_t up, int8_t down);
+extern int directionalThreshold(const int *in, int *out, size_t len, int8_t up, int8_t down);
 extern void save_restoreGB(uint8_t saveOpt);
 
 #define GRAPH_SAVE 1
diff --git a/client/proxguiqt.cpp b/client/proxguiqt.cpp
index 8460253ad..8857ba1c5 100644
--- a/client/proxguiqt.cpp
+++ b/client/proxguiqt.cpp
@@ -37,24 +37,29 @@ int startMax;
 int PageWidth;
 int unlockStart = 0;
 
-void ProxGuiQT::ShowGraphWindow(void) {
+void ProxGuiQT::ShowGraphWindow(void)
+{
     emit ShowGraphWindowSignal();
 }
 
-void ProxGuiQT::RepaintGraphWindow(void) {
+void ProxGuiQT::RepaintGraphWindow(void)
+{
     emit RepaintGraphWindowSignal();
 }
 
-void ProxGuiQT::HideGraphWindow(void) {
+void ProxGuiQT::HideGraphWindow(void)
+{
     emit HideGraphWindowSignal();
 }
 
-void ProxGuiQT::Exit(void) {
+void ProxGuiQT::Exit(void)
+{
     emit ExitSignal();
 }
 
-void ProxGuiQT::_ShowGraphWindow(void) {
-    if(!plotapp)
+void ProxGuiQT::_ShowGraphWindow(void)
+{
+    if (!plotapp)
         return;
 
     if (!plotwidget) {
@@ -68,25 +73,29 @@ void ProxGuiQT::_ShowGraphWindow(void) {
     plotwidget->show();
 }
 
-void ProxGuiQT::_RepaintGraphWindow(void) {
+void ProxGuiQT::_RepaintGraphWindow(void)
+{
     if (!plotapp || !plotwidget)
         return;
 
     plotwidget->update();
 }
 
-void ProxGuiQT::_HideGraphWindow(void) {
+void ProxGuiQT::_HideGraphWindow(void)
+{
     if (!plotapp || !plotwidget)
         return;
 
     plotwidget->hide();
 }
 
-void ProxGuiQT::_Exit(void) {
+void ProxGuiQT::_Exit(void)
+{
     delete this;
 }
 
-void ProxGuiQT::_StartProxmarkThread(void) {
+void ProxGuiQT::_StartProxmarkThread(void)
+{
     if (!proxmarkThread)
         return;
 
@@ -123,7 +132,8 @@ ProxGuiQT::ProxGuiQT(int argc, char **argv, WorkerThread *wthread) : plotapp(NUL
 {
 }
 
-ProxGuiQT::~ProxGuiQT(void) {
+ProxGuiQT::~ProxGuiQT(void)
+{
     if (plotapp) {
         plotapp->quit();
         plotapp = NULL;
@@ -131,44 +141,51 @@ ProxGuiQT::~ProxGuiQT(void) {
 }
 
 //--------------------
-void ProxWidget::applyOperation() {
+void ProxWidget::applyOperation()
+{
     //printf("ApplyOperation()");
     save_restoreGB(GRAPH_SAVE);
     memcpy(GraphBuffer, s_Buff, sizeof(int) * GraphTraceLen);
     RepaintGraphWindow();
 }
-void ProxWidget::stickOperation() {
+void ProxWidget::stickOperation()
+{
     save_restoreGB(GRAPH_RESTORE);
     //printf("stickOperation()");
 }
-void ProxWidget::vchange_autocorr(int v) {
+void ProxWidget::vchange_autocorr(int v)
+{
     int ans = AutoCorrelate(GraphBuffer, s_Buff, GraphTraceLen, v, true, false);
     if (g_debugMode) printf("vchange_autocorr(w:%d): %d\n", v, ans);
     g_useOverlays = true;
     RepaintGraphWindow();
 }
-void ProxWidget::vchange_askedge(int v) {
+void ProxWidget::vchange_askedge(int v)
+{
     //extern int AskEdgeDetect(const int *in, int *out, int len, int threshold);
     int ans = AskEdgeDetect(GraphBuffer, s_Buff, GraphTraceLen, v);
     if (g_debugMode) printf("vchange_askedge(w:%d)%d\n", v, ans);
     g_useOverlays = true;
     RepaintGraphWindow();
 }
-void ProxWidget::vchange_dthr_up(int v) {
+void ProxWidget::vchange_dthr_up(int v)
+{
     int down = opsController->horizontalSlider_dirthr_down->value();
     directionalThreshold(GraphBuffer, s_Buff, GraphTraceLen, v, down);
     //printf("vchange_dthr_up(%d)", v);
     g_useOverlays = true;
     RepaintGraphWindow();
 }
-void ProxWidget::vchange_dthr_down(int v) {
+void ProxWidget::vchange_dthr_down(int v)
+{
     //printf("vchange_dthr_down(%d)", v);
     int up = opsController->horizontalSlider_dirthr_up->value();
-    directionalThreshold(GraphBuffer,s_Buff, GraphTraceLen, v, up);
+    directionalThreshold(GraphBuffer, s_Buff, GraphTraceLen, v, up);
     g_useOverlays = true;
     RepaintGraphWindow();
 }
-ProxWidget::ProxWidget(QWidget *parent, ProxGuiQT *master) : QWidget(parent) {
+ProxWidget::ProxWidget(QWidget *parent, ProxGuiQT *master) : QWidget(parent)
+{
     this->master = master;
     resize(800, 400);
 
@@ -202,14 +219,15 @@ ProxWidget::ProxWidget(QWidget *parent, ProxGuiQT *master) : QWidget(parent) {
     show(); // places the window on the screen.
 
     // Move controller widget below plot
-    controlWidget->move(x(),y()+frameSize().height());
+    controlWidget->move(x(), y() + frameSize().height());
     controlWidget->resize(size().width(), 200);
     controlWidget->show();
 }
 
 // not 100% sure what i need in this block
 // feel free to fix - marshmellow...
-ProxWidget::~ProxWidget(void) {
+ProxWidget::~ProxWidget(void)
+{
     if (controlWidget) {
         controlWidget->close();
         delete controlWidget;
@@ -227,49 +245,59 @@ ProxWidget::~ProxWidget(void) {
         plot = NULL;
     }
 }
-void ProxWidget::closeEvent(QCloseEvent *event) {
+void ProxWidget::closeEvent(QCloseEvent *event)
+{
     event->ignore();
     this->hide();
     g_useOverlays = false;
 }
-void ProxWidget::hideEvent(QHideEvent *event) {
+void ProxWidget::hideEvent(QHideEvent *event)
+{
     controlWidget->hide();
     plot->hide();
 }
-void ProxWidget::showEvent(QShowEvent *event) {
+void ProxWidget::showEvent(QShowEvent *event)
+{
     controlWidget->show();
     plot->show();
 }
 
 //----------- Plotting
 
-int Plot::xCoordOf(int i, QRect r ) {
+int Plot::xCoordOf(int i, QRect r)
+{
     return r.left() + (int)((i - GraphStart) * GraphPixelsPerPoint);
 }
 
-int Plot::yCoordOf(int v, QRect r, int maxVal) {
+int Plot::yCoordOf(int v, QRect r, int maxVal)
+{
     int z = (r.bottom() - r.top()) / 2;
-    if ( maxVal == 0 ) ++maxVal;
+    if (maxVal == 0) ++maxVal;
     return -(z * v) / maxVal + z;
 }
 
-int Plot::valueOf_yCoord(int y, QRect r, int maxVal) {
-    int z = (r.bottom() - r.top())/2;
-    return (y-z) * maxVal / z;
+int Plot::valueOf_yCoord(int y, QRect r, int maxVal)
+{
+    int z = (r.bottom() - r.top()) / 2;
+    return (y - z) * maxVal / z;
 }
 
-static const QColor GREEN = QColor(100,255,100);
-static const QColor RED   = QColor(255,100,100);
-static const QColor BLUE  = QColor(100,100,255);
-static const QColor GRAY = QColor(240,240,240);
+static const QColor GREEN = QColor(100, 255, 100);
+static const QColor RED   = QColor(255, 100, 100);
+static const QColor BLUE  = QColor(100, 100, 255);
+static const QColor GRAY = QColor(240, 240, 240);
 
 QColor Plot::getColor(int graphNum)
 {
     switch (graphNum) {
-    case 0: return GREEN;  //Green
-    case 1: return RED;    //Red
-    case 2: return BLUE;   //Blue
-    default: return GRAY;  //Gray
+        case 0:
+            return GREEN;  //Green
+        case 1:
+            return RED;    //Red
+        case 2:
+            return BLUE;   //Blue
+        default:
+            return GRAY;  //Gray
     }
 }
 
@@ -286,7 +314,7 @@ void Plot::setMaxAndStart(int *buffer, int len, QRect plotRect)
     if (GraphStart > len) return;
     int vMin = INT_MAX, vMax = INT_MIN, v = 0;
     int sample_index = GraphStart ;
-    for ( ; sample_index < len && xCoordOf(sample_index,plotRect) < plotRect.right() ; sample_index++) {
+    for (; sample_index < len && xCoordOf(sample_index, plotRect) < plotRect.right() ; sample_index++) {
 
         v = buffer[sample_index];
         if (v < vMin) vMin = v;
@@ -294,8 +322,8 @@ void Plot::setMaxAndStart(int *buffer, int len, QRect plotRect)
     }
 
     g_absVMax = 0;
-    if (fabs( (double) vMin) > g_absVMax) g_absVMax = (int)fabs( (double) vMin);
-    if (fabs( (double) vMax) > g_absVMax) g_absVMax = (int)fabs( (double) vMax);
+    if (fabs((double) vMin) > g_absVMax) g_absVMax = (int)fabs((double) vMin);
+    if (fabs((double) vMax) > g_absVMax) g_absVMax = (int)fabs((double) vMax);
     g_absVMax = (int)(g_absVMax * 1.25 + 1);
 }
 
@@ -307,13 +335,13 @@ void Plot::PlotDemod(uint8_t *buffer, size_t len, QRect plotRect, QRect annotati
 
     int grid_delta_x = PlotGridX;
     int first_delta_x = grid_delta_x; //(plotOffset > 0) ? PlotGridX : (PlotGridX +);
-    if (GraphStart > plotOffset) first_delta_x -= (GraphStart-plotOffset);
+    if (GraphStart > plotOffset) first_delta_x -= (GraphStart - plotOffset);
     int DemodStart = GraphStart;
     if (plotOffset > GraphStart) DemodStart = plotOffset;
 
     int BitStart = 0;
     // round down
-    if (DemodStart-plotOffset > 0) BitStart = (int)(((DemodStart-plotOffset)+(PlotGridX-1))/PlotGridX)-1;
+    if (DemodStart - plotOffset > 0) BitStart = (int)(((DemodStart - plotOffset) + (PlotGridX - 1)) / PlotGridX) - 1;
     first_delta_x += BitStart * PlotGridX;
     if (BitStart > (int)len) return;
     int delta_x = 0;
@@ -322,29 +350,29 @@ void Plot::PlotDemod(uint8_t *buffer, size_t len, QRect plotRect, QRect annotati
 
     painter->setPen(getColor(graphNum));
     char str[5];
-  int absVMax = (int)(100*1.05+1);
+    int absVMax = (int)(100 * 1.05 + 1);
     int x = xCoordOf(DemodStart, plotRect);
-    int y = yCoordOf((buffer[BitStart]*200-100)*-1,plotRect,absVMax);
+    int y = yCoordOf((buffer[BitStart] * 200 - 100) * -1, plotRect, absVMax);
     penPath.moveTo(x, y);
     delta_x = 0;
     int clk = first_delta_x;
-    for(int i = BitStart; i < (int)len && xCoordOf(delta_x+DemodStart, plotRect) < plotRect.right(); i++) {
-        for (int ii = 0; ii < (clk) && i < (int)len && xCoordOf(DemodStart+delta_x+ii, plotRect) < plotRect.right() ; ii++ ) {
-            x = xCoordOf(DemodStart+delta_x+ii, plotRect);
-            v = buffer[i]*200-100;
+    for (int i = BitStart; i < (int)len && xCoordOf(delta_x + DemodStart, plotRect) < plotRect.right(); i++) {
+        for (int ii = 0; ii < (clk) && i < (int)len && xCoordOf(DemodStart + delta_x + ii, plotRect) < plotRect.right() ; ii++) {
+            x = xCoordOf(DemodStart + delta_x + ii, plotRect);
+            v = buffer[i] * 200 - 100;
 
-            y = yCoordOf( v, plotRect, absVMax);
+            y = yCoordOf(v, plotRect, absVMax);
 
             penPath.lineTo(x, y);
 
-            if(GraphPixelsPerPoint > 10) {
-                QRect f(QPoint(x - 3, y - 3),QPoint(x + 3, y + 3));
+            if (GraphPixelsPerPoint > 10) {
+                QRect f(QPoint(x - 3, y - 3), QPoint(x + 3, y + 3));
                 painter->fillRect(f, QColor(100, 255, 100));
             }
-            if (ii == (int)clk/2) {
+            if (ii == (int)clk / 2) {
                 //print label
-                sprintf(str, "%u",buffer[i]);
-                painter->drawText(x-8, y + ((buffer[i] > 0) ? 18 : -6), str);
+                sprintf(str, "%u", buffer[i]);
+                painter->drawText(x - 8, y + ((buffer[i] > 0) ? 18 : -6), str);
             }
         }
         delta_x += clk;
@@ -355,7 +383,8 @@ void Plot::PlotDemod(uint8_t *buffer, size_t len, QRect plotRect, QRect annotati
     painter->drawPath(penPath);
 }
 
-void Plot::PlotGraph(int *buffer, int len, QRect plotRect, QRect annotationRect, QPainter *painter, int graphNum) {
+void Plot::PlotGraph(int *buffer, int len, QRect plotRect, QRect annotationRect, QPainter *painter, int graphNum)
+{
     if (len == 0) return;
     // clock_t begin = clock();
     QPainterPath penPath;
@@ -363,17 +392,17 @@ void Plot::PlotGraph(int *buffer, int len, QRect plotRect, QRect annotationRect,
     int x = xCoordOf(GraphStart, plotRect);
     int y = yCoordOf(buffer[GraphStart], plotRect, g_absVMax);
     penPath.moveTo(x, y);
-    for(i = GraphStart; i < len && xCoordOf(i, plotRect) < plotRect.right(); i++) {
+    for (i = GraphStart; i < len && xCoordOf(i, plotRect) < plotRect.right(); i++) {
 
         x = xCoordOf(i, plotRect);
         v = buffer[i];
 
-        y = yCoordOf( v, plotRect, g_absVMax);
+        y = yCoordOf(v, plotRect, g_absVMax);
 
         penPath.lineTo(x, y);
 
         if (GraphPixelsPerPoint > 10) {
-            QRect f(QPoint(x - 3, y - 3),QPoint(x + 3, y + 3));
+            QRect f(QPoint(x - 3, y - 3), QPoint(x + 3, y + 3));
             painter->fillRect(f, QColor(100, 255, 100));
         }
         // catch stats
@@ -387,7 +416,7 @@ void Plot::PlotGraph(int *buffer, int len, QRect plotRect, QRect annotationRect,
 
     // Draw y-axis
     int xo = 5 + (graphNum * 40);
-    painter->drawLine(xo, plotRect.top(),xo, plotRect.bottom());
+    painter->drawLine(xo, plotRect.top(), xo, plotRect.bottom());
 
     int vMarkers = (g_absVMax - (g_absVMax % 10)) / 5;
     int minYDist = 40; // Minimum pixel-distance between markers
@@ -397,20 +426,20 @@ void Plot::PlotGraph(int *buffer, int len, QRect plotRect, QRect annotationRect,
     int n = 0;
     int lasty0 = 65535;
 
-    for (v = vMarkers; yCoordOf(v, plotRect, g_absVMax) > plotRect.top() && n < 20; v+= vMarkers ,n++) {
+    for (v = vMarkers; yCoordOf(v, plotRect, g_absVMax) > plotRect.top() && n < 20; v += vMarkers, n++) {
         int y0 = yCoordOf(v, plotRect, g_absVMax);
         int y1 = yCoordOf(-v, plotRect, g_absVMax);
 
-        if(lasty0 - y0 < minYDist) continue;
+        if (lasty0 - y0 < minYDist) continue;
 
-        painter->drawLine(xo-5,y0, xo+5, y0);
+        painter->drawLine(xo - 5, y0, xo + 5, y0);
 
         sprintf(yLbl, "%d", v);
-        painter->drawText(xo+8, y0+7, yLbl);
+        painter->drawText(xo + 8, y0 + 7, yLbl);
 
-        painter->drawLine(xo-5, y1, xo+5, y1);
+        painter->drawLine(xo - 5, y1, xo + 5, y1);
         sprintf(yLbl, "%d", -v);
-        painter->drawText(xo+8, y1+5 , yLbl);
+        painter->drawText(xo + 8, y1 + 5, yLbl);
         lasty0 = y0;
     }
 
@@ -426,7 +455,8 @@ void Plot::PlotGraph(int *buffer, int len, QRect plotRect, QRect annotationRect,
     //printf("Plot time %f\n", elapsed_secs);
 }
 
-void Plot::plotGridLines(QPainter* painter, QRect r) {
+void Plot::plotGridLines(QPainter *painter, QRect r)
+{
 
     // set GridOffset
     if (PlotGridX <= 0) return;
@@ -435,27 +465,27 @@ void Plot::plotGridLines(QPainter* painter, QRect r) {
     if (GridLocked && PlotGridX) {
         offset = GridOffset + PlotGridX - (GraphStart % PlotGridX);
     } else if (!GridLocked && GraphStart > 0 && PlotGridX) {
-        offset = PlotGridX-((GraphStart - offset) % PlotGridX) + GraphStart - unlockStart;
+        offset = PlotGridX - ((GraphStart - offset) % PlotGridX) + GraphStart - unlockStart;
     }
     offset %= PlotGridX;
     if (offset < 0) offset += PlotGridX;
 
     int i;
-    int grid_delta_x = (int) (PlotGridX * GraphPixelsPerPoint);
+    int grid_delta_x = (int)(PlotGridX * GraphPixelsPerPoint);
     int grid_delta_y = PlotGridY;
 
     if ((PlotGridX > 0) && ((PlotGridX * GraphPixelsPerPoint) > 1)) {
         for (i = (offset * GraphPixelsPerPoint); i < r.right(); i += grid_delta_x) {
-            painter->drawLine(r.left()+i, r.top(), r.left()+i, r.bottom());
+            painter->drawLine(r.left() + i, r.top(), r.left() + i, r.bottom());
         }
     }
 
     if (PlotGridY > 0) {
         for (i = 0; yCoordOf(i, r, g_absVMax) > r.top(); i += grid_delta_y) {
             // line above mid
-            painter->drawLine( r.left(), yCoordOf(i, r, g_absVMax), r.right(), yCoordOf(i, r, g_absVMax) );
+            painter->drawLine(r.left(), yCoordOf(i, r, g_absVMax), r.right(), yCoordOf(i, r, g_absVMax));
             // line below mid
-            painter->drawLine( r.left(), yCoordOf(-i, r, g_absVMax), r.right(), yCoordOf(-i, r, g_absVMax) );
+            painter->drawLine(r.left(), yCoordOf(-i, r, g_absVMax), r.right(), yCoordOf(-i, r, g_absVMax));
         }
     }
 }
@@ -471,20 +501,20 @@ void Plot::paintEvent(QPaintEvent *event)
 
     painter.setFont(QFont("Courier New", 10));
 
-    if(GraphStart < 0)
+    if (GraphStart < 0)
         GraphStart = 0;
 
     if (CursorAPos > GraphTraceLen)
-        CursorAPos= 0;
+        CursorAPos = 0;
     if (CursorBPos > GraphTraceLen)
-        CursorBPos= 0;
+        CursorBPos = 0;
     if (CursorCPos > GraphTraceLen)
-        CursorCPos= 0;
+        CursorCPos = 0;
     if (CursorDPos > GraphTraceLen)
-        CursorDPos= 0;
+        CursorDPos = 0;
 
-    QRect plotRect(WIDTH_AXES, 0, width()-WIDTH_AXES, height()-HEIGHT_INFO);
-    QRect infoRect(0, height()-HEIGHT_INFO, width(), HEIGHT_INFO);
+    QRect plotRect(WIDTH_AXES, 0, width() - WIDTH_AXES, height() - HEIGHT_INFO);
+    QRect infoRect(0, height() - HEIGHT_INFO, width(), HEIGHT_INFO);
 
     //Grey background
     painter.fillRect(rect(), QColor(60, 60, 60));
@@ -492,7 +522,7 @@ void Plot::paintEvent(QPaintEvent *event)
     painter.fillRect(plotRect, QColor(0, 0, 0));
 
     //init graph variables
-    setMaxAndStart(GraphBuffer,GraphTraceLen,plotRect);
+    setMaxAndStart(GraphBuffer, GraphTraceLen, plotRect);
 
     // center line
     int zeroHeight = plotRect.top() + (plotRect.bottom() - plotRect.top()) / 2;
@@ -502,33 +532,33 @@ void Plot::paintEvent(QPaintEvent *event)
     plotGridLines(&painter, plotRect);
 
     //Start painting graph
-    PlotGraph(GraphBuffer, GraphTraceLen,plotRect,infoRect,&painter,0);
+    PlotGraph(GraphBuffer, GraphTraceLen, plotRect, infoRect, &painter, 0);
     if (showDemod && DemodBufferLen > 8) {
-        PlotDemod(DemodBuffer, DemodBufferLen,plotRect,infoRect,&painter,2,g_DemodStartIdx);
+        PlotDemod(DemodBuffer, DemodBufferLen, plotRect, infoRect, &painter, 2, g_DemodStartIdx);
     }
     if (g_useOverlays) {
         //init graph variables
-        setMaxAndStart(s_Buff,GraphTraceLen,plotRect);
-        PlotGraph(s_Buff, GraphTraceLen,plotRect,infoRect,&painter,1);
+        setMaxAndStart(s_Buff, GraphTraceLen, plotRect);
+        PlotGraph(s_Buff, GraphTraceLen, plotRect, infoRect, &painter, 1);
     }
     // End graph drawing
 
     //Draw the cursors
     if (CursorAPos > GraphStart && xCoordOf(CursorAPos, plotRect) < plotRect.right()) {
         painter.setPen(QColor(255, 255, 0));
-        painter.drawLine(xCoordOf(CursorAPos, plotRect),plotRect.top(),xCoordOf(CursorAPos, plotRect),plotRect.bottom());
+        painter.drawLine(xCoordOf(CursorAPos, plotRect), plotRect.top(), xCoordOf(CursorAPos, plotRect), plotRect.bottom());
     }
     if (CursorBPos > GraphStart && xCoordOf(CursorBPos, plotRect) < plotRect.right()) {
         painter.setPen(QColor(255, 0, 255));
-        painter.drawLine(xCoordOf(CursorBPos, plotRect),plotRect.top(),xCoordOf(CursorBPos, plotRect),plotRect.bottom());
+        painter.drawLine(xCoordOf(CursorBPos, plotRect), plotRect.top(), xCoordOf(CursorBPos, plotRect), plotRect.bottom());
     }
     if (CursorCPos > GraphStart && xCoordOf(CursorCPos, plotRect) < plotRect.right()) {
         painter.setPen(QColor(255, 153, 0)); //orange
-        painter.drawLine(xCoordOf(CursorCPos, plotRect),plotRect.top(),xCoordOf(CursorCPos, plotRect),plotRect.bottom());
+        painter.drawLine(xCoordOf(CursorCPos, plotRect), plotRect.top(), xCoordOf(CursorCPos, plotRect), plotRect.bottom());
     }
     if (CursorDPos > GraphStart && xCoordOf(CursorDPos, plotRect) < plotRect.right()) {
         painter.setPen(QColor(0, 0, 205)); //light blue
-        painter.drawLine(xCoordOf(CursorDPos, plotRect),plotRect.top(),xCoordOf(CursorDPos, plotRect),plotRect.bottom());
+        painter.drawLine(xCoordOf(CursorDPos, plotRect), plotRect.top(), xCoordOf(CursorDPos, plotRect), plotRect.bottom());
     }
 
     //Draw annotations
@@ -536,7 +566,7 @@ void Plot::paintEvent(QPaintEvent *event)
     sprintf(str, "@%d  dt=%d [%2.2f] zoom=%2.2f  CursorAPos=%d  CursorBPos=%d  GridX=%d  GridY=%d (%s) GridXoffset=%d",
             GraphStart,
             CursorBPos - CursorAPos,
-            (CursorBPos - CursorAPos)/CursorScaleFactor,
+            (CursorBPos - CursorAPos) / CursorScaleFactor,
             GraphPixelsPerPoint,
             CursorAPos,
             CursorBPos,
@@ -544,7 +574,7 @@ void Plot::paintEvent(QPaintEvent *event)
             PlotGridYdefault,
             GridLocked ? "Locked" : "Unlocked",
             GridOffset
-        );
+           );
     painter.setPen(QColor(255, 255, 255));
     painter.drawText(20, infoRect.bottom() - 3, str);
 }
@@ -552,12 +582,12 @@ void Plot::paintEvent(QPaintEvent *event)
 Plot::Plot(QWidget *parent) : QWidget(parent), GraphStart(0), GraphPixelsPerPoint(1)
 {
     //Need to set this, otherwise we don't receive keypress events
-    setFocusPolicy( Qt::StrongFocus);
+    setFocusPolicy(Qt::StrongFocus);
     resize(400, 200);
 
-    QPalette palette(QColor(0,0,0,0));
-    palette.setColor(QPalette::WindowText, QColor(255,255,255));
-    palette.setColor(QPalette::Text, QColor(255,255,255));
+    QPalette palette(QColor(0, 0, 0, 0));
+    palette.setColor(QPalette::WindowText, QColor(255, 255, 255));
+    palette.setColor(QPalette::Text, QColor(255, 255, 255));
     palette.setColor(QPalette::Button, QColor(100, 100, 100));
     setPalette(palette);
     setAutoFillBackground(true);
@@ -606,7 +636,7 @@ void Plot::keyPressEvent(QKeyEvent *event)
             offset = (int)(20 / GraphPixelsPerPoint);
     }
 
-    switch(event->key()) {
+    switch (event->key()) {
         case Qt::Key_Down:
             if (GraphPixelsPerPoint <= 50) {
                 GraphPixelsPerPoint *= 2;
@@ -640,9 +670,9 @@ void Plot::keyPressEvent(QKeyEvent *event)
                 PlotGridX = 0;
                 PlotGridY = 0;
             } else {
-                if ( PlotGridXdefault < 0  )
+                if (PlotGridXdefault < 0)
                     PlotGridXdefault = 64;
-                if ( PlotGridYdefault < 0 )
+                if (PlotGridYdefault < 0)
                     PlotGridYdefault = 0;
 
                 PlotGridX = PlotGridXdefault;
diff --git a/client/proxguiqt.h b/client/proxguiqt.h
index 6ad6f4f7c..a12fe157b 100644
--- a/client/proxguiqt.h
+++ b/client/proxguiqt.h
@@ -30,30 +30,30 @@ class ProxWidget;
  */
 class Plot: public QWidget
 {
-    private:
-        QWidget *master;
-        int GraphStart;
-        double GraphPixelsPerPoint;
-        int CursorAPos;
-        int CursorBPos;
-        void PlotGraph(int *buffer, int len, QRect r,QRect r2, QPainter* painter, int graphNum);
-        void PlotDemod(uint8_t *buffer, size_t len, QRect r,QRect r2, QPainter* painter, int graphNum, int plotOffset);
-        void plotGridLines(QPainter* painter,QRect r);
-        int xCoordOf(int i, QRect r );
-        int yCoordOf(int v, QRect r, int maxVal);
-        int valueOf_yCoord(int y, QRect r, int maxVal);
-        void setMaxAndStart(int *buffer, int len, QRect plotRect);
-        QColor getColor(int graphNum);
+private:
+    QWidget *master;
+    int GraphStart;
+    double GraphPixelsPerPoint;
+    int CursorAPos;
+    int CursorBPos;
+    void PlotGraph(int *buffer, int len, QRect r, QRect r2, QPainter *painter, int graphNum);
+    void PlotDemod(uint8_t *buffer, size_t len, QRect r, QRect r2, QPainter *painter, int graphNum, int plotOffset);
+    void plotGridLines(QPainter *painter, QRect r);
+    int xCoordOf(int i, QRect r);
+    int yCoordOf(int v, QRect r, int maxVal);
+    int valueOf_yCoord(int y, QRect r, int maxVal);
+    void setMaxAndStart(int *buffer, int len, QRect plotRect);
+    QColor getColor(int graphNum);
 
-    public:
-        Plot(QWidget *parent = 0);
+public:
+    Plot(QWidget *parent = 0);
 
-    protected:
-        void paintEvent(QPaintEvent *event);
-        void closeEvent(QCloseEvent *event);
-        void mouseMoveEvent(QMouseEvent *event);
-        void mousePressEvent(QMouseEvent *event) { mouseMoveEvent(event); }
-        void keyPressEvent(QKeyEvent *event);
+protected:
+    void paintEvent(QPaintEvent *event);
+    void closeEvent(QCloseEvent *event);
+    void mouseMoveEvent(QMouseEvent *event);
+    void mousePressEvent(QMouseEvent *event) { mouseMoveEvent(event); }
+    void keyPressEvent(QKeyEvent *event);
 };
 class ProxGuiQT;
 
@@ -64,79 +64,80 @@ class ProxWidget : public QWidget
 {
     Q_OBJECT; //needed for slot/signal classes
 
-    private:
-        ProxGuiQT *master;
-        Plot *plot;
-        Ui::Form *opsController;
-        QWidget* controlWidget;
+private:
+    ProxGuiQT *master;
+    Plot *plot;
+    Ui::Form *opsController;
+    QWidget *controlWidget;
 
-    public:
-        ProxWidget(QWidget *parent = 0, ProxGuiQT *master = NULL);
-        ~ProxWidget(void);
-        //OpsShow(void);
+public:
+    ProxWidget(QWidget *parent = 0, ProxGuiQT *master = NULL);
+    ~ProxWidget(void);
+    //OpsShow(void);
 
-    protected:
+protected:
     //  void paintEvent(QPaintEvent *event);
-        void closeEvent(QCloseEvent *event);
-        void showEvent(QShowEvent *event);
-        void hideEvent(QHideEvent *event);
+    void closeEvent(QCloseEvent *event);
+    void showEvent(QShowEvent *event);
+    void hideEvent(QHideEvent *event);
     //  void mouseMoveEvent(QMouseEvent *event);
     //  void mousePressEvent(QMouseEvent *event) { mouseMoveEvent(event); }
     //  void keyPressEvent(QKeyEvent *event);
-    public slots:
-        void applyOperation();
-        void stickOperation();
-        void vchange_autocorr(int v);
-        void vchange_askedge(int v);
-        void vchange_dthr_up(int v);
-        void vchange_dthr_down(int v);
+public slots:
+    void applyOperation();
+    void stickOperation();
+    void vchange_autocorr(int v);
+    void vchange_askedge(int v);
+    void vchange_dthr_up(int v);
+    void vchange_dthr_down(int v);
 };
 
-class WorkerThread : public QThread {
-        Q_OBJECT;
-    public:
-        WorkerThread(char*, char*, bool);
-        ~WorkerThread();
-        void run();
-    private:
-        char *script_cmds_file = NULL;
-        char *script_cmd = NULL;
-        bool usb_present;
+class WorkerThread : public QThread
+{
+    Q_OBJECT;
+public:
+    WorkerThread(char *, char *, bool);
+    ~WorkerThread();
+    void run();
+private:
+    char *script_cmds_file = NULL;
+    char *script_cmd = NULL;
+    bool usb_present;
 };
 
 class ProxGuiQT : public QObject
 {
     Q_OBJECT;
 
-    private:
-        QApplication *plotapp;
-        ProxWidget *plotwidget;
-        int argc;
-        char **argv;
-        //void (*main_func)(void);
-        WorkerThread *proxmarkThread;
+private:
+    QApplication *plotapp;
+    ProxWidget *plotwidget;
+    int argc;
+    char **argv;
+    //void (*main_func)(void);
+    WorkerThread *proxmarkThread;
 
-    public:
-        ProxGuiQT(int argc, char **argv, WorkerThread *wthread);
-        ~ProxGuiQT(void);
-        void ShowGraphWindow(void);
-        void RepaintGraphWindow(void);
-        void HideGraphWindow(void);
-        void MainLoop(void);
-        void Exit(void);
+public:
+    ProxGuiQT(int argc, char **argv, WorkerThread *wthread);
+    ~ProxGuiQT(void);
+    void ShowGraphWindow(void);
+    void RepaintGraphWindow(void);
+    void HideGraphWindow(void);
+    void MainLoop(void);
+    void Exit(void);
 
-    private slots:
-        void _ShowGraphWindow(void);
-        void _RepaintGraphWindow(void);
-        void _HideGraphWindow(void);
-        void _Exit(void);
-        void _StartProxmarkThread(void);
+private slots:
+    void _ShowGraphWindow(void);
+    void _RepaintGraphWindow(void);
+    void _HideGraphWindow(void);
+    void _Exit(void);
+    void _StartProxmarkThread(void);
 
-    signals:
-        void ShowGraphWindowSignal(void);
-        void RepaintGraphWindowSignal(void);
-        void HideGraphWindowSignal(void);
-        void ExitSignal(void);
+signals:
+    void ShowGraphWindowSignal(void);
+    void RepaintGraphWindowSignal(void);
+    void HideGraphWindowSignal(void);
+    void ExitSignal(void);
 };
 
 #endif // PROXGUI_QT
diff --git a/client/proxmark3.c b/client/proxmark3.c
index f931ef9af..e9df91ef6 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -29,7 +29,8 @@
 #include "comms.h"
 
 #if defined(__linux__) || (__APPLE__)
-static void showBanner(void){
+static void showBanner(void)
+{
     printf("\n\n");
     printf("\e[34m██████╗ ███╗   ███╗ ████╗\e[0m     ...iceman fork\n");
     printf("\e[34m██╔══██╗████╗ ████║   ══█║\e[0m      ...dedicated to \e[34mRDV40\e[0m\n");
@@ -50,7 +51,8 @@ void
 __attribute__((force_align_arg_pointer))
 #endif
 #endif
-main_loop(char *script_cmds_file, char *script_cmd, bool usb_present) {
+main_loop(char *script_cmds_file, char *script_cmd, bool usb_present)
+{
 
     char *cmd = NULL;
     bool execCommand = (script_cmd != NULL);
@@ -63,7 +65,7 @@ main_loop(char *script_cmds_file, char *script_cmd, bool usb_present) {
     if (usb_present) {
         SetOffline(false);
         // cache Version information now:
-        if ( execCommand || script_cmds_file || stdinOnPipe)
+        if (execCommand || script_cmds_file || stdinOnPipe)
             CmdVersion("s");
         else
             CmdVersion("");
@@ -123,7 +125,7 @@ main_loop(char *script_cmds_file, char *script_cmd, bool usb_present) {
             }
         } else {
             // If there is a script command
-            if (execCommand){
+            if (execCommand) {
 
                 if ((cmd = strmcopy(script_cmd)) != NULL)
                     PrintAndLogEx(NORMAL, PROXPROMPT"%s", cmd);
@@ -162,12 +164,12 @@ main_loop(char *script_cmds_file, char *script_cmd, bool usb_present) {
 
             // rtrim
             size_t l = strlen(cmd);
-            if ( l > 0 && isspace(cmd[l - 1]))
-                cmd[l-1] = 0x00;
+            if (l > 0 && isspace(cmd[l - 1]))
+                cmd[l - 1] = 0x00;
 
             if (cmd[0] != 0x00) {
                 int ret = CommandReceived(cmd);
-                HIST_ENTRY * entry = history_get(history_length);
+                HIST_ENTRY *entry = history_get(history_length);
                 if ((!entry) || (strcmp(entry->line, cmd) != 0))
                     add_history(cmd);
 
@@ -194,7 +196,8 @@ main_loop(char *script_cmds_file, char *script_cmd, bool usb_present) {
     }
 }
 
-static void dumpAllHelp(int markdown) {
+static void dumpAllHelp(int markdown)
+{
     PrintAndLogEx(NORMAL, "\n%sProxmark3 command dump%s\n\n", markdown ? "# " : "", markdown ? "" : "\n======================");
     PrintAndLogEx(NORMAL, "Some commands are available only if a Proxmark is actually connected.%s\n", markdown ? "  " : "");
     PrintAndLogEx(NORMAL, "Check column \"offline\" for their availability.\n");
@@ -206,33 +209,37 @@ static void dumpAllHelp(int markdown) {
 static char *my_executable_path = NULL;
 static char *my_executable_directory = NULL;
 
-const char *get_my_executable_path(void) {
+const char *get_my_executable_path(void)
+{
     return my_executable_path;
 }
 
-const char *get_my_executable_directory(void) {
+const char *get_my_executable_directory(void)
+{
     return my_executable_directory;
 }
 
-static void set_my_executable_path(void) {
+static void set_my_executable_path(void)
+{
     int path_length = wai_getExecutablePath(NULL, 0, NULL);
     if (path_length != -1) {
-        my_executable_path = (char*)calloc(path_length + 1, sizeof(uint8_t));
+        my_executable_path = (char *)calloc(path_length + 1, sizeof(uint8_t));
         int dirname_length = 0;
         if (wai_getExecutablePath(my_executable_path, path_length, &dirname_length) != -1) {
             my_executable_path[path_length] = '\0';
             my_executable_directory = (char *)calloc(dirname_length + 2, sizeof(uint8_t));
-            strncpy(my_executable_directory, my_executable_path, dirname_length+1);
-            my_executable_directory[dirname_length+1] = '\0';
+            strncpy(my_executable_directory, my_executable_path, dirname_length + 1);
+            my_executable_directory[dirname_length + 1] = '\0';
         }
     }
 }
 
-static void show_help(bool showFullHelp, char *command_line){
+static void show_help(bool showFullHelp, char *command_line)
+{
     PrintAndLogEx(NORMAL, "syntax: %s <port> [-h | -help | -m | -f | -flush | -w | -wait | -c | -command | -l | -lua] [cmd_script_file_name] [command][lua_script_name]\n", command_line);
     PrintAndLogEx(NORMAL, "\texample:'%s "SERIAL_PORT_H"'\n\n", command_line);
 
-    if (showFullHelp){
+    if (showFullHelp) {
         PrintAndLogEx(NORMAL, "help: <-h|-help> Dump all interactive command's help at once.\n");
         PrintAndLogEx(NORMAL, "\t%s  -h\n\n", command_line);
         PrintAndLogEx(NORMAL, "markdown: <-m> Dump all interactive help at once in markdown syntax\n");
@@ -250,7 +257,8 @@ static void show_help(bool showFullHelp, char *command_line){
     }
 }
 
-int main(int argc, char* argv[]) {
+int main(int argc, char *argv[])
+{
     srand(time(0));
 
     bool usb_present = false;
@@ -260,7 +268,7 @@ int main(int argc, char* argv[]) {
     char *script_cmds_file = NULL;
     char *script_cmd = NULL;
 
-     /* initialize history */
+    /* initialize history */
     using_history();
 
 #ifdef RL_STATE_READCMD
@@ -288,23 +296,23 @@ int main(int argc, char* argv[]) {
         }
 
         // flush output
-        if (strcmp(argv[i], "-f") == 0 || strcmp(argv[i], "-flush") == 0){
+        if (strcmp(argv[i], "-f") == 0 || strcmp(argv[i], "-flush") == 0) {
             SetFlushAfterWrite(true);
             PrintAndLogEx(INFO, "Output will be flushed after every print.\n");
         }
 
         // wait for comport
-        if (strcmp(argv[i], "-w") == 0 || strcmp(argv[i], "-wait") == 0){
+        if (strcmp(argv[i], "-w") == 0 || strcmp(argv[i], "-wait") == 0) {
             waitCOMPort = true;
         }
 
         // execute pm3 command
-        if (strcmp(argv[i], "-c") == 0 || strcmp(argv[i], "-command") == 0){
+        if (strcmp(argv[i], "-c") == 0 || strcmp(argv[i], "-command") == 0) {
             executeCommand = true;
         }
 
         // execute lua script
-        if (strcmp(argv[i], "-l") == 0 || strcmp(argv[i], "-lua") == 0){
+        if (strcmp(argv[i], "-l") == 0 || strcmp(argv[i], "-lua") == 0) {
             executeCommand = true;
             addLuaExec = true;
         }
@@ -312,7 +320,7 @@ int main(int argc, char* argv[]) {
 
     // If the user passed the filename of the 'script' to execute, get it from last parameter
     if (argc > 2 && argv[argc - 1] && argv[argc - 1][0] != '-') {
-        if (executeCommand){
+        if (executeCommand) {
             script_cmd = argv[argc - 1];
 
             while (script_cmd[strlen(script_cmd) - 1] == ' ')
@@ -321,10 +329,10 @@ int main(int argc, char* argv[]) {
             if (strlen(script_cmd) == 0) {
                 script_cmd = NULL;
             } else {
-                if (addLuaExec){
+                if (addLuaExec) {
                     // add "script run " to command
                     int len = strlen(script_cmd) + 11 + 1;
-                    char *ctmp = (char*) calloc(len, sizeof(uint8_t));
+                    char *ctmp = (char *) calloc(len, sizeof(uint8_t));
                     if (ctmp != NULL) {
                         memset(ctmp, 0, len);
                         strcpy(ctmp, "script run ");
@@ -341,7 +349,7 @@ int main(int argc, char* argv[]) {
     }
 
     // check command
-    if (executeCommand && (!script_cmd || strlen(script_cmd) == 0)){
+    if (executeCommand && (!script_cmd || strlen(script_cmd) == 0)) {
         PrintAndLogEx(WARNING, "ERROR: execute command: command not found.\n");
         return 2;
     }
@@ -350,7 +358,7 @@ int main(int argc, char* argv[]) {
 // ascii art doesn't work well on mingw :(
 
     bool stdinOnPipe = !isatty(STDIN_FILENO);
-    if ( !executeCommand && !script_cmds_file && !stdinOnPipe )
+    if (!executeCommand && !script_cmds_file && !stdinOnPipe)
         showBanner();
 #endif
 
@@ -367,7 +375,7 @@ int main(int argc, char* argv[]) {
     MainGraphics();
 #  else
     // for *nix distro's,  check enviroment variable to verify a display
-    char* display = getenv("DISPLAY");
+    char *display = getenv("DISPLAY");
     if (display && strlen(display) > 1) {
         InitGraphics(argc, argv, script_cmds_file, script_cmd, usb_present);
         MainGraphics();
diff --git a/client/reveng/bmpbit.c b/client/reveng/bmpbit.c
index 9325b6d99..79b1f653a 100644
--- a/client/reveng/bmpbit.c
+++ b/client/reveng/bmpbit.c
@@ -41,44 +41,47 @@ int bmpbit;
 int bmpsub;
 
 void
-setbmp(void) {
+setbmp(void)
+{
     /* Initialise BMP_BIT and BMP_SUB for the local architecture. */
     bmp_t bmpmax = ~(bmp_t) 0;
 
-    bmpbit = 0; bmpsub = 1;
+    bmpbit = 0;
+    bmpsub = 1;
 
-    while(bmpmax) {
+    while (bmpmax) {
         bmpmax <<= 1;
         ++bmpbit;
     }
 
-    while((bmpsub | (bmpsub - 1)) < bmpbit - 1)
+    while ((bmpsub | (bmpsub - 1)) < bmpbit - 1)
         bmpsub <<= 1;
 }
 #endif
 
 #ifdef BMPTST
 int
-main(int argc, char *argv[]) {
+main(int argc, char *argv[])
+{
     /* check the compile-time bitmap width is correct, otherwise
      * searches run forever. */
 #  if BMP_BIT > 0
     setbmp();
-    if(BMP_BIT != bmpbit || BMP_SUB != bmpsub) {
-        fprintf(stderr,"reveng: configuration fault.  Update "
-            "config.h with these definitions and "
-            "recompile:\n"
-            "\t#define BMP_BIT   %d\n"
-            "\t#define BMP_SUB   %d\n",
-            bmpbit, bmpsub);
+    if (BMP_BIT != bmpbit || BMP_SUB != bmpsub) {
+        fprintf(stderr, "reveng: configuration fault.  Update "
+                "config.h with these definitions and "
+                "recompile:\n"
+                "\t#define BMP_BIT   %d\n"
+                "\t#define BMP_SUB   %d\n",
+                bmpbit, bmpsub);
         exit(EXIT_FAILURE);
     }
 #  endif /* BMP_BIT > 0 */
     /* check the bitmap constant macro */
-    if(~(bmp_t) 0 != ~BMP_C(0)) {
+    if (~(bmp_t) 0 != ~BMP_C(0)) {
         fprintf(stderr, "reveng: configuration fault.  Edit "
-            "the definition of BMP_C() in config.h to "
-            "match BMP_T and recompile.\n");
+                "the definition of BMP_C() in config.h to "
+                "match BMP_T and recompile.\n");
         exit(EXIT_FAILURE);
     }
     exit(EXIT_SUCCESS);
diff --git a/client/reveng/cli.c b/client/reveng/cli.c
index eb857e5b9..834f2d688 100644
--- a/client/reveng/cli.c
+++ b/client/reveng/cli.c
@@ -70,7 +70,8 @@ static void usage(void);
 
 static const char *myname = "reveng"; /* name of our program */
 
-int reveng_main(int argc, char *argv[]) {
+int reveng_main(int argc, char *argv[])
+{
     /* Command-line interface for CRC RevEng.
      * Process options and switches in the argument list and
      * run the required function.
@@ -97,28 +98,28 @@ int reveng_main(int argc, char *argv[]) {
     SETBMP();
 
 //  pos=0; --- not in this ver of getopt
-    optind=1;
+    optind = 1;
     do {
-        c=getopt(argc, argv, "?A:BDFGLMP:SVXa:bcdefhi:k:lm:p:q:rstuvw:x:yz");
-        switch(c) {
+        c = getopt(argc, argv, "?A:BDFGLMP:SVXa:bcdefhi:k:lm:p:q:rstuvw:x:yz");
+        switch (c) {
             case 'A': /* A: bits per output character */
             case 'a': /* a: bits per character */
-                if((obperhx = atoi(optarg)) > BMP_BIT) {
-                    fprintf(stderr,"%s: argument to -%c must be between 1 and %d\n", myname, c, BMP_BIT);
+                if ((obperhx = atoi(optarg)) > BMP_BIT) {
+                    fprintf(stderr, "%s: argument to -%c must be between 1 and %d\n", myname, c, BMP_BIT);
                     return 0;
                     //exit(EXIT_FAILURE);
                 }
-                if(c == 'a') ibperhx = obperhx;
+                if (c == 'a') ibperhx = obperhx;
                 break;
             case 'b': /* b  big-endian (RefIn = false, RefOut = false ) */
                 model.flags &= ~P_REFIN;
                 rflags |= R_HAVERI;
-                /* fall through: */
+            /* fall through: */
             case 'B': /* B  big-endian output (RefOut = false) */
                 model.flags &= ~P_REFOUT;
                 rflags |= R_HAVERO;
                 mnovel(&model);
-                /* fall through: */
+            /* fall through: */
             case 'r': /* r  right-justified */
                 model.flags |= P_RTJUST;
                 break;
@@ -128,8 +129,8 @@ int reveng_main(int argc, char *argv[]) {
             case 'e': /* e  echo arguments */
             case 's': /* s  search for algorithm */
             case 'v': /* v  calculate reversed CRC */
-                if(mode) {
-                    fprintf(stderr,"%s: more than one mode switch specified.  Use %s -h for help.\n", myname, myname);
+                if (mode) {
+                    fprintf(stderr, "%s: more than one mode switch specified.  Use %s -h for help.\n", myname, myname);
                     return 0;
                     //exit(EXIT_FAILURE);
                 }
@@ -165,29 +166,29 @@ int reveng_main(int argc, char *argv[]) {
                 pkchop(&model.spoly);
                 width = plen(model.spoly);
                 rflags |= R_HAVEP;
-                if(c == 'P')
+                if (c == 'P')
                     prcp(&model.spoly);
                 mnovel(&model);
                 break;
             case 'l': /* l  little-endian input and output */
                 model.flags |= P_REFIN;
                 rflags |= R_HAVERI;
-                /* fall through: */
+            /* fall through: */
             case 'L': /* L  little-endian output */
                 model.flags |= P_REFOUT;
                 rflags |= R_HAVERO;
                 mnovel(&model);
-                /* fall through: */
+            /* fall through: */
             case 't': /* t  left-justified */
                 model.flags &= ~P_RTJUST;
                 break;
             case 'm': /* m: select preset CRC model */
-                if(!(c = mbynam(&model, optarg))) {
-                    fprintf(stderr,"%s: preset model '%s' not found.  Use %s -D to list presets.\n", myname, optarg, myname);
+                if (!(c = mbynam(&model, optarg))) {
+                    fprintf(stderr, "%s: preset model '%s' not found.  Use %s -D to list presets.\n", myname, optarg, myname);
                     return 0;
                     //exit(EXIT_FAILURE);
                 }
-                if(c < 0){
+                if (c < 0) {
                     uerror("no preset models available");
                     return 0;
                 }
@@ -244,16 +245,16 @@ ipqx:
             case -1: /* no more options, continue */
                 ;
         }
-    } while(c != -1);
+    } while (c != -1);
 
     /* canonicalise the model, so the one we dump is the one we
      * calculate with (not with -s, spoly may be blank which will
      * normalise to zero and clear init and xorout.)
      */
-    if(mode != 's')
+    if (mode != 's')
         mcanon(&model);
 
-    switch(mode) {
+    switch (mode) {
         case 'v': /* v  calculate reversed CRC */
             /* Distinct from the -V switch as this causes
              * the arguments and output to be reversed as well.
@@ -269,7 +270,7 @@ ipqx:
              * Consequently Init is the mirror image of the
              * one resulting from -V, and so we have:
              */
-            if(~model.flags & P_REFOUT) {
+            if (~model.flags & P_REFOUT) {
                 prev(&model.init);
                 prev(&model.xorout);
             }
@@ -279,7 +280,7 @@ ipqx:
             model.init = model.xorout;
             model.xorout = apoly;
 
-            /* fall through: */
+        /* fall through: */
         case 'c': /* c  calculate CRC */
 
             /* validate inputs */
@@ -292,21 +293,21 @@ ipqx:
             /* in the Williams model, xorout is applied after the refout stage.
              * as refout is part of ptostr(), we reverse xorout here.
              */
-            if(model.flags & P_REFOUT)
+            if (model.flags & P_REFOUT)
                 prev(&model.xorout);
 
-            for(; optind < argc; ++optind) {
-                if(uflags & C_INFILE)
+            for (; optind < argc; ++optind) {
+                if (uflags & C_INFILE)
                     apoly = rdpoly(argv[optind], model.flags, ibperhx);
                 else
                     apoly = strtop(argv[optind], model.flags, ibperhx);
 
-                if(mode == 'v')
+                if (mode == 'v')
                     prev(&apoly);
 
                 crc = pcrc(apoly, model.spoly, model.init, model.xorout, model.flags);
 
-                if(mode == 'v')
+                if (mode == 'v')
                     prev(&crc);
 
                 string = ptostr(crc, model.flags, obperhx);
@@ -318,21 +319,21 @@ ipqx:
             break;
         case 'D': /* D  dump all models */
             args = mcount();
-            if(!args){
+            if (!args) {
                 uerror("no preset models available");
                 return 0;
             }
             do {
                 mbynum(&model, --args);
                 ufound(&model);
-            } while(args);
+            } while (args);
             break;
         case 'd': /* d  dump CRC model */
             /* maybe we don't want to do this:
              * either attaching names to arbitrary models or forcing to a preset
              * mmatch(&model, M_OVERWR);
              */
-            if(~model.flags & P_MULXN){
+            if (~model.flags & P_MULXN) {
                 uerror("not a Williams model compliant algorithm");
                 return 0;
             }
@@ -341,8 +342,8 @@ ipqx:
             free(string);
             break;
         case 'e': /* e  echo arguments */
-            for(; optind < argc; ++optind) {
-                if(uflags & C_INFILE)
+            for (; optind < argc; ++optind) {
+                if (uflags & C_INFILE)
                     apoly = rdpoly(argv[optind], model.flags, ibperhx);
                 else
                     apoly = strtop(argv[optind], model.flags, ibperhx);
@@ -355,37 +356,37 @@ ipqx:
             }
             break;
         case 's': /* s  search for algorithm */
-            if(!width){
+            if (!width) {
                 uerror("must specify positive -k or -w before -s");
                 return 0;
             }
-            if(~model.flags & P_MULXN){
+            if (~model.flags & P_MULXN) {
                 uerror("cannot search for non-Williams compliant models");
                 return 0;
             }
             praloc(&model.spoly, width);
             praloc(&model.init, width);
             praloc(&model.xorout, width);
-            if(!plen(model.spoly))
+            if (!plen(model.spoly))
                 palloc(&model.spoly, width);
             else
                 width = plen(model.spoly);
 
             /* special case if qpoly is zero, search to end of range */
-            if(!ptst(qpoly))
+            if (!ptst(qpoly))
                 rflags &= ~R_HAVEQ;
 
             /* allocate argument array */
             args = argc - optind;
 
             apolys = calloc(args * sizeof(poly_t), sizeof(char));
-            if ( !apolys ){
+            if (!apolys) {
                 uerror("cannot allocate memory for argument list");
                 return 0;
             }
 
-            for(pptr = apolys; optind < argc; ++optind) {
-                if(uflags & C_INFILE)
+            for (pptr = apolys; optind < argc; ++optind) {
+                if (uflags & C_INFILE)
                     *pptr++ = rdpoly(argv[optind], model.flags, ibperhx);
                 else
                     *pptr++ = strtop(argv[optind], model.flags, ibperhx);
@@ -399,35 +400,35 @@ ipqx:
              */
 
             /* scan against preset models */
-            if(~uflags & C_NOPCK) {
+            if (~uflags & C_NOPCK) {
                 pass = 0;
                 do {
                     psets = mcount();
-                    while(psets) {
+                    while (psets) {
                         mbynum(&pset, --psets);
                         /* skip if different width, or refin or refout don't match */
-                        if(plen(pset.spoly) != width || (model.flags ^ pset.flags) & (P_REFIN | P_REFOUT))
+                        if (plen(pset.spoly) != width || (model.flags ^ pset.flags) & (P_REFIN | P_REFOUT))
                             continue;
                         /* skip if the preset doesn't match specified parameters */
-                        if(rflags & R_HAVEP && pcmp(&model.spoly, &pset.spoly))
+                        if (rflags & R_HAVEP && pcmp(&model.spoly, &pset.spoly))
                             continue;
-                        if(rflags & R_HAVEI && psncmp(&model.init, &pset.init))
+                        if (rflags & R_HAVEI && psncmp(&model.init, &pset.init))
                             continue;
-                        if(rflags & R_HAVEX && psncmp(&model.xorout, &pset.xorout))
+                        if (rflags & R_HAVEX && psncmp(&model.xorout, &pset.xorout))
                             continue;
                         apoly = pclone(pset.xorout);
-                        if(pset.flags & P_REFOUT)
+                        if (pset.flags & P_REFOUT)
                             prev(&apoly);
-                        for(qptr = apolys; qptr < pptr; ++qptr) {
+                        for (qptr = apolys; qptr < pptr; ++qptr) {
                             crc = pcrc(*qptr, pset.spoly, pset.init, apoly, 0);
-                            if(ptst(crc)) {
+                            if (ptst(crc)) {
                                 pfree(&crc);
                                 break;
                             } else
                                 pfree(&crc);
                         }
                         pfree(&apoly);
-                        if(qptr == pptr) {
+                        if (qptr == pptr) {
                             /* the selected model solved all arguments */
                             ufound(&pset);
                             uflags |= C_RESULT;
@@ -436,34 +437,34 @@ ipqx:
                     mfree(&pset);
 
                     /* toggle refIn/refOut and reflect arguments */
-                    if(~rflags & R_HAVERI) {
+                    if (~rflags & R_HAVERI) {
                         model.flags ^= P_REFIN | P_REFOUT;
-                        for(qptr = apolys; qptr < pptr; ++qptr)
+                        for (qptr = apolys; qptr < pptr; ++qptr)
                             prevch(qptr, ibperhx);
                     }
-                } while(~rflags & R_HAVERI && ++pass < 2);
+                } while (~rflags & R_HAVERI && ++pass < 2);
             }
-            if(uflags & C_RESULT) {
-                for(qptr = apolys; qptr < pptr; ++qptr)
+            if (uflags & C_RESULT) {
+                for (qptr = apolys; qptr < pptr; ++qptr)
                     pfree(qptr);
                 return 1;
                 //exit(EXIT_SUCCESS);
             }
-            if(uflags & C_NOBFS && ~rflags & R_HAVEP) {
+            if (uflags & C_NOBFS && ~rflags & R_HAVEP) {
                 uerror("no models found");
                 return 0;
                 //break;
             }
-            if(!(model.flags & P_REFIN) != !(model.flags & P_REFOUT)){
+            if (!(model.flags & P_REFIN) != !(model.flags & P_REFOUT)) {
                 uerror("cannot search for crossed-endian models");
                 return 0;
             }
             pass = 0;
             do {
                 mptr = candmods = reveng(&model, qpoly, rflags, args, apolys);
-                if(mptr && plen(mptr->spoly))
+                if (mptr && plen(mptr->spoly))
                     uflags |= C_RESULT;
-                while(mptr && plen(mptr->spoly)) {
+                while (mptr && plen(mptr->spoly)) {
                     /* results were printed by the callback
                      * string = mtostr(mptr);
                      * puts(string);
@@ -472,16 +473,16 @@ ipqx:
                     mfree(mptr++);
                 }
                 free(candmods);
-                if(~rflags & R_HAVERI) {
+                if (~rflags & R_HAVERI) {
                     model.flags ^= P_REFIN | P_REFOUT;
-                    for(qptr = apolys; qptr < pptr; ++qptr)
+                    for (qptr = apolys; qptr < pptr; ++qptr)
                         prevch(qptr, ibperhx);
                 }
-            } while(~rflags & R_HAVERI && ++pass < 2);
-            for(qptr = apolys; qptr < pptr; ++qptr)
+            } while (~rflags & R_HAVERI && ++pass < 2);
+            for (qptr = apolys; qptr < pptr; ++qptr)
                 pfree(qptr);
             free(apolys);
-            if(~uflags & C_RESULT)
+            if (~uflags & C_RESULT)
                 uerror("no models found");
             break;
         default:  /* no mode specified */
@@ -495,11 +496,12 @@ ipqx:
 }
 
 void
-ufound(const model_t *model) {
+ufound(const model_t *model)
+{
     /* Callback function to report each model found */
     char *string;
 
-    if(!model) return;
+    if (!model) return;
     /* generated models will be canonical */
     string = mtostr(model);
     puts(string);
@@ -507,75 +509,80 @@ ufound(const model_t *model) {
 }
 
 void
-uerror(const char *msg) {
+uerror(const char *msg)
+{
     /* Callback function to report fatal errors */
     fprintf(stderr, "%s: %s\n", myname, msg);
     //exit(EXIT_FAILURE);
 }
 
 void
-uprog(const poly_t gpoly, int flags, unsigned long seq) {
+uprog(const poly_t gpoly, int flags, unsigned long seq)
+{
     /* Callback function to report search progress */
     char *string;
 
     /* Suppress first report in CLI */
-    if(!seq)
+    if (!seq)
         return;
     string = ptostr(gpoly, P_RTJUST, 4);
     fprintf(stderr, "%s: searching: width=%ld  poly=0x%s  refin=%s  refout=%s\n",
             myname, plen(gpoly), string,
             (flags & P_REFIN ? "true" : "false"),
             (flags & P_REFOUT ? "true" : "false")
-            );
+           );
     free(string);
 }
 
 static poly_t
-rdpoly(const char *name, int flags, int bperhx) {
+rdpoly(const char *name, int flags, int bperhx)
+{
     /* read poly from file in chunks and report errors */
 
     poly_t apoly = PZERO, chunk = PZERO;
     FILE *input;
 
     input = oread(name);
-    while(!feof(input) && !ferror(input)) {
+    while (!feof(input) && !ferror(input)) {
         chunk = filtop(input, BUFFER, flags, bperhx);
         psum(&apoly, chunk, plen(apoly));
         pfree(&chunk);
     }
-    if(ferror(input)) {
-        fprintf(stderr,"%s: error condition on file '%s'\n", myname, name);
+    if (ferror(input)) {
+        fprintf(stderr, "%s: error condition on file '%s'\n", myname, name);
         exit(EXIT_FAILURE);
     }
     /* close file unless stdin */
-    if(input == stdin)
+    if (input == stdin)
         /* reset EOF condition */
         clearerr(input);
-    else if(fclose(input)) {
-        fprintf(stderr,"%s: error closing file '%s'\n", myname, name);
+    else if (fclose(input)) {
+        fprintf(stderr, "%s: error closing file '%s'\n", myname, name);
         exit(EXIT_FAILURE);
     }
-    return(apoly);
+    return (apoly);
 }
 
 static FILE *
-oread(const char *name) {
+oread(const char *name)
+{
     /* open file for reading and report errors */
     FILE *handle;
 
     /* recognise special name '-' as standard input */
-    if(*name == '-' && name[1] == '\0')
-        return(stdin);
-    if(!(handle = fopen(name, "rb"))) {
+    if (*name == '-' && name[1] == '\0')
+        return (stdin);
+    if (!(handle = fopen(name, "rb"))) {
         fprintf(stderr, "%s: cannot open '%s' for reading\n", myname, name);
         return 0;
         //exit(EXIT_FAILURE);
     }
-    return(handle);
+    return (handle);
 }
 
 static void
-usage(void) {
+usage(void)
+{
     /* print usage if asked, or if syntax incorrect */
     fprintf(stderr,
             "CRC RevEng: arbitrary-precision CRC calculator and algorithm finder\n"
diff --git a/client/reveng/config.h b/client/reveng/config.h
index 8fe8b6c7a..eeca55231 100644
--- a/client/reveng/config.h
+++ b/client/reveng/config.h
@@ -63,7 +63,7 @@
  */
 
 #ifdef _WIN32
- #define PRESETS  1 //
+#define PRESETS  1 //
 #endif
 
 
diff --git a/client/reveng/getopt.c b/client/reveng/getopt.c
index eb4f57a28..71799a320 100644
--- a/client/reveng/getopt.c
+++ b/client/reveng/getopt.c
@@ -37,45 +37,45 @@ int getopt(int argc, char *argv[], const char *optstring)
     char *str;
 
     if (pos == 0) {
-    if ((optind >= argc) || (*argv[optind] != '-'))
-        return EOF;
-    pos = 1;
-    if (argv[optind][pos] == '\0')
-        return EOF;
+        if ((optind >= argc) || (*argv[optind] != '-'))
+            return EOF;
+        pos = 1;
+        if (argv[optind][pos] == '\0')
+            return EOF;
     }
 
     str = strchr(optstring, argv[optind][pos]);
     if (str == NULL) {
-    optopt = argv[optind][pos];
-    if (opterr)
-        fprintf(stderr, "%s: illegal option -- %c\n", argv[0],
-            optopt);
-    return '?';
+        optopt = argv[optind][pos];
+        if (opterr)
+            fprintf(stderr, "%s: illegal option -- %c\n", argv[0],
+                    optopt);
+        return '?';
     }
 
     if (str[1] == ':') {
-    if (argv[optind][pos+1] != '\0') {
-        optarg = &argv[optind][pos+1];
-        return *str;
-    }
-    optind++;
-    if (optind >= argc) {
-        optopt = *str;
-        if (opterr)
-        fprintf(stderr, "%s: option requires an argument -- %c\n",
-            argv[0], optopt);
-        return '?';
-    }
-    optarg = argv[optind];
-    optind++; pos = 0;
-    return *str;
-    }
-    else {
-    pos++;
-    if (argv[optind][pos] == '\0') {
+        if (argv[optind][pos + 1] != '\0') {
+            optarg = &argv[optind][pos + 1];
+            return *str;
+        }
+        optind++;
+        if (optind >= argc) {
+            optopt = *str;
+            if (opterr)
+                fprintf(stderr, "%s: option requires an argument -- %c\n",
+                        argv[0], optopt);
+            return '?';
+        }
+        optarg = argv[optind];
         optind++;
         pos = 0;
-    }
-    return *str;
+        return *str;
+    } else {
+        pos++;
+        if (argv[optind][pos] == '\0') {
+            optind++;
+            pos = 0;
+        }
+        return *str;
     }
 }
diff --git a/client/reveng/model.c b/client/reveng/model.c
index d15c86e09..f7ad1fb77 100644
--- a/client/reveng/model.c
+++ b/client/reveng/model.c
@@ -47,7 +47,8 @@ static const poly_t pzero = PZERO;
 
 /* Definitions */
 
-void mcpy(model_t *dest, const model_t *src) {
+void mcpy(model_t *dest, const model_t *src)
+{
     /* Copies the parameters of src to dest.
      * dest must be an initialised model.
      */
@@ -62,7 +63,8 @@ void mcpy(model_t *dest, const model_t *src) {
     dest->name = src->name;
 }
 
-void mfree(model_t *model) {
+void mfree(model_t *model)
+{
     /* Frees the parameters of model. */
     if (!model) return;
     pfree(&model->spoly);
@@ -74,7 +76,8 @@ void mfree(model_t *model) {
     /* not model either, it might point to an array! */
 }
 
-int mcmp(const model_t *a, const model_t *b) {
+int mcmp(const model_t *a, const model_t *b)
+{
     /* Compares a and b for identical effect, i.e. disregarding
      * trailing zeroes in parameter polys.
      * Intended for bsearch().
@@ -90,16 +93,17 @@ int mcmp(const model_t *a, const model_t *b) {
     return (psncmp(&a->xorout, &b->xorout));
 }
 
-char * mtostr(const model_t *model) {
+char *mtostr(const model_t *model)
+{
     /* Returns a malloc()-ed string containing a Williams model
      * record representing the input model.
      * mcanon() should be called on the argument before printing.
      */
     size_t size;
     char *polystr, *initstr, *xorotstr, *checkstr, *magicstr,
-        strbuf[512], *string = NULL;
+         strbuf[512], *string = NULL;
 
-    if (!model) return(NULL);
+    if (!model) return (NULL);
     polystr = ptostr(model->spoly, P_RTJUST, 4);
     initstr = ptostr(model->init, P_RTJUST, 4);
     xorotstr = ptostr(model->xorout, P_RTJUST, 4);
@@ -145,12 +149,13 @@ char * mtostr(const model_t *model) {
     free(xorotstr);
     free(checkstr);
     free(magicstr);
-    if(!string)
+    if (!string)
         uerror("cannot allocate memory for model description");
-    return(string);
+    return (string);
 }
 
-void mcanon(model_t *model) {
+void mcanon(model_t *model)
+{
     /* canonicalise a model */
     unsigned long dlen;
 
@@ -176,7 +181,8 @@ void mcanon(model_t *model) {
         mcheck(model);
 }
 
-void mcheck(model_t *model) {
+void mcheck(model_t *model)
+{
     /* calculate a check for the model */
     poly_t checkstr, check, xorout, magic;
 
@@ -199,7 +205,7 @@ void mcheck(model_t *model) {
      * that the characters of the received CRC are specially
      * reflected before submitting the codeword.
      */
-    xorout=pclone(model->xorout);
+    xorout = pclone(model->xorout);
     if (model->flags & P_REFOUT)
         prev(&xorout);
     magic = pcrc(xorout, model->spoly, pzero, pzero, model->flags);
@@ -209,7 +215,8 @@ void mcheck(model_t *model) {
     model->magic = magic;
 }
 
-void mrev(model_t *model) {
+void mrev(model_t *model)
+{
     /* reverse the model to calculate reversed CRCs */
     /* Here we invert RefIn and RefOut so that the user need only
      * reverse the order of characters in the arguments, not the
@@ -239,7 +246,8 @@ void mrev(model_t *model) {
     mnovel(model);
 }
 
-void mnovel(model_t *model) {
+void mnovel(model_t *model)
+{
     /* remove name and check string from modified model */
     model->name = NULL;
     pfree(&model->check);
diff --git a/client/reveng/poly.c b/client/reveng/poly.c
index 8abe6ff75..774e76a7c 100644
--- a/client/reveng/poly.c
+++ b/client/reveng/poly.c
@@ -127,7 +127,8 @@ static const poly_t pzero = PZERO;
 #endif
 
 poly_t
-filtop(FILE *input, unsigned long length, int flags, int bperhx) {
+filtop(FILE *input, unsigned long length, int flags, int bperhx)
+{
     /* reads binary data from input into a poly_t until EOF or until
      * length bits are read.  Characters are read until
      * ceil(bperhx / CHAR_BIT) bits are collected; if P_LTLBYT is
@@ -146,22 +147,22 @@ filtop(FILE *input, unsigned long length, int flags, int bperhx) {
     int cmask = (1 << CHAR_BIT) - 1, c;
     int count = 0, ofs;
     poly_t poly = PZERO;
-    if(bperhx == 0) return(poly);
+    if (bperhx == 0) return (poly);
 
     length -= length % bperhx;
     palloc(&poly, length); /* >= 0 */
 
-    while(iter < length && (c = fgetc(input)) != EOF) {
-        if(flags & P_LTLBYT)
-            accu |= (bmp_t) (c & cmask) << count;
+    while (iter < length && (c = fgetc(input)) != EOF) {
+        if (flags & P_LTLBYT)
+            accu |= (bmp_t)(c & cmask) << count;
         else
-            accu = (accu << CHAR_BIT) | (bmp_t) (c & cmask);
+            accu = (accu << CHAR_BIT) | (bmp_t)(c & cmask);
         count += CHAR_BIT;
-        if(count >= bperhx) {
+        if (count >= bperhx) {
             /* the low bperhx bits of accu contain bits of the poly.*/
             iter += bperhx;
             count = 0;
-            if(flags & P_REFIN)
+            if (flags & P_REFIN)
                 accu = rev(accu, bperhx);
             accu &= mask;
 
@@ -169,18 +170,19 @@ filtop(FILE *input, unsigned long length, int flags, int bperhx) {
             idx = IDX(iter - 1UL);
             ofs = OFS(iter - 1UL);
             poly.bitmap[idx] |= accu << ofs;
-            if(ofs + bperhx > BMP_BIT) {
-                poly.bitmap[idx-1] |= accu >> (BMP_BIT - ofs);
+            if (ofs + bperhx > BMP_BIT) {
+                poly.bitmap[idx - 1] |= accu >> (BMP_BIT - ofs);
             }
             accu = BMP_C(0); /* only needed for P_LTLBYT */
         }
     }
     praloc(&poly, iter);
-    return(poly);
+    return (poly);
 }
 
 poly_t
-strtop(const char *string, int flags, int bperhx) {
+strtop(const char *string, int flags, int bperhx)
+{
     /* Converts a hex or character string to a poly_t.
      * Each character is converted to a hex nibble yielding 4 bits
      * unless P_DIRECT, when each character yields CHAR_BIT bits.
@@ -208,39 +210,39 @@ strtop(const char *string, int flags, int bperhx) {
     bmp_t accu;
     bmp_t mask = bperhx == BMP_BIT ? ~BMP_C(0) : (BMP_C(1) << bperhx) - BMP_C(1);
     int pass, count, ofs;
-    int cmask = (1 << CHAR_BIT) - 1 , c;
+    int cmask = (1 << CHAR_BIT) - 1, c;
     const char *s;
 
     poly_t poly = PZERO;
-    if(bperhx > BMP_BIT || bperhx <= 0 || string == NULL || *string == '\0')
-        return(poly);
+    if (bperhx > BMP_BIT || bperhx <= 0 || string == NULL || *string == '\0')
+        return (poly);
 
-    if(~flags & P_DIRECT) {
-        if(*string == '$' || *string == '&')
+    if (~flags & P_DIRECT) {
+        if (*string == '$' || *string == '&')
             ++string;
-        else if(*string == '0'
-            && (string[1] == 'x' || string[1] == 'X'))
+        else if (*string == '0'
+                 && (string[1] == 'x' || string[1] == 'X'))
             string += 2;
     }
     length = (*string != '\0');
 
-    for(pass=0; pass<2 && length > 0UL; ++pass) {
+    for (pass = 0; pass < 2 && length > 0UL; ++pass) {
         s = string;
         length = 0UL;
         count = 0;
         accu = BMP_C(0);
-        while((c = *s++)) {
-            if(flags & P_DIRECT) {
-                if(flags & P_LTLBYT)
-                    accu |= (bmp_t) (c & cmask) << count;
+        while ((c = *s++)) {
+            if (flags & P_DIRECT) {
+                if (flags & P_LTLBYT)
+                    accu |= (bmp_t)(c & cmask) << count;
                 else
-                    accu = (accu << CHAR_BIT) | (bmp_t) (c & cmask);
+                    accu = (accu << CHAR_BIT) | (bmp_t)(c & cmask);
                 count += CHAR_BIT;
             } else {
-                if(c == ' ' || c == '\t' || c == '\r' || c == '\n') continue;
+                if (c == ' ' || c == '\t' || c == '\r' || c == '\n') continue;
                 accu <<= 4;
                 count += 4;
-                switch(c) {
+                switch (c) {
                     case '0':
                     case '1':
                     case '2':
@@ -282,14 +284,14 @@ strtop(const char *string, int flags, int bperhx) {
                 }
             }
 
-            if(count >= bperhx) {
+            if (count >= bperhx) {
                 /* the low bperhx bits of accu contain bits of the poly.
                  * in pass 0, increment length by bperhx.
                  * in pass 1, put the low bits of accu into the bitmap. */
                 length += bperhx;
                 count = 0;
-                if(pass == 1) {
-                    if(flags & P_REFIN)
+                if (pass == 1) {
+                    if (flags & P_REFIN)
                         accu = rev(accu, bperhx);
                     accu &= mask;
 
@@ -297,27 +299,29 @@ strtop(const char *string, int flags, int bperhx) {
                     idx = IDX(length - 1);
                     ofs = OFS(length - 1);
                     poly.bitmap[idx] |= accu << ofs;
-                    if(ofs + bperhx > BMP_BIT)
-                        poly.bitmap[idx-1] |= accu >> (BMP_BIT - ofs);
+                    if (ofs + bperhx > BMP_BIT)
+                        poly.bitmap[idx - 1] |= accu >> (BMP_BIT - ofs);
                     accu = BMP_C(0); /* only needed for P_LTLBYT */
                 }
             }
         }
-        if(pass == 0) palloc(&poly, length);
+        if (pass == 0) palloc(&poly, length);
     }
-    return(poly);
+    return (poly);
 }
 
 char *
-ptostr(const poly_t poly, int flags, int bperhx) {
+ptostr(const poly_t poly, int flags, int bperhx)
+{
     /* Returns a malloc()-ed string containing a hexadecimal
      * representation of poly. See phxsubs().
      */
-    return(pxsubs(poly, flags, bperhx, 0UL, poly.length));
+    return (pxsubs(poly, flags, bperhx, 0UL, poly.length));
 }
 
 char *
-pxsubs(const poly_t poly, int flags, int bperhx, unsigned long start, unsigned long end) {
+pxsubs(const poly_t poly, int flags, int bperhx, unsigned long start, unsigned long end)
+{
     /* Returns a malloc()-ed string containing a hexadecimal
      * representation of a portion of poly, from bit offset start to
      * (end - 1) inclusive.  The output is grouped into words of
@@ -336,82 +340,85 @@ pxsubs(const poly_t poly, int flags, int bperhx, unsigned long start, unsigned l
     bmp_t mask = bperhx == BMP_BIT ? ~BMP_C(0) : (BMP_C(1) << bperhx) - BMP_C(1);
     int cperhx, part;
 
-    if(bperhx <= 0 || bperhx > BMP_BIT) return(NULL);
+    if (bperhx <= 0 || bperhx > BMP_BIT) return (NULL);
 
-    if(start > poly.length) start = poly.length;
-    if(end > poly.length) end = poly.length;
-    if(end < start) end = start;
+    if (start > poly.length) start = poly.length;
+    if (end > poly.length) end = poly.length;
+    if (end < start) end = start;
 
     cperhx = (bperhx + 3) >> 2;
-    if(flags & P_SPACE) ++cperhx;
+    if (flags & P_SPACE) ++cperhx;
 
     size = (end - start + bperhx - 1UL) / bperhx;
     size *= cperhx;
-    if(!size || ~flags & P_SPACE) ++size; /* for trailing null */
+    if (!size || ~flags & P_SPACE) ++size; /* for trailing null */
 
-    if(!(sptr = string = (char *) calloc(size, sizeof(char))))
+    if (!(sptr = string = (char *) calloc(size, sizeof(char))))
         uerror("cannot allocate memory for string");
 
     size = end - start;
     part = (int) size % bperhx;
-    if(part && flags & P_RTJUST) {
+    if (part && flags & P_RTJUST) {
         iter = start + part;
         accu = getwrd(poly, iter - 1UL) & ((BMP_C(1) << part) - BMP_C(1));
-        if(flags & P_REFOUT)
+        if (flags & P_REFOUT)
             /* best to reverse over bperhx rather than part, I think
              * e.g. converting a 7-bit poly to 8-bit little-endian hex
              */
             accu = rev(accu, bperhx);
         prhex(&sptr, accu, flags, bperhx);
-        if(flags & P_SPACE && size > iter) *sptr++ = ' ';
+        if (flags & P_SPACE && size > iter) *sptr++ = ' ';
     } else {
         iter = start;
     }
 
-    while((iter+=bperhx) <= end) {
+    while ((iter += bperhx) <= end) {
         accu = getwrd(poly, iter - 1UL) & mask;
-        if(flags & P_REFOUT)
+        if (flags & P_REFOUT)
             accu = rev(accu, bperhx);
         prhex(&sptr, accu, flags, bperhx);
-        if(flags & P_SPACE && size > iter) *sptr++ = ' ';
+        if (flags & P_SPACE && size > iter) *sptr++ = ' ';
     }
 
-    if(part && ~flags & P_RTJUST) {
+    if (part && ~flags & P_RTJUST) {
         accu = getwrd(poly, end - 1UL);
-        if(flags & P_REFOUT)
+        if (flags & P_REFOUT)
             accu = rev(accu, part);
         else
             accu = accu << (bperhx - part) & mask;
         prhex(&sptr, accu, flags, bperhx);
     }
     *sptr = '\0';
-    return(string);
+    return (string);
 }
 
 poly_t
-pclone(const poly_t poly) {
+pclone(const poly_t poly)
+{
     /* Returns a freestanding copy of poly.  Does not clean poly or
      * the result.
      */
     poly_t clone = PZERO;
 
     pcpy(&clone, poly);
-    return(clone);
+    return (clone);
 }
 
 void
-pcpy(poly_t *dest, const poly_t src) {
+pcpy(poly_t *dest, const poly_t src)
+{
     /* Assigns (copies) src into dest.  Does not clean src or dest.
      */
     unsigned long iter, idx;
 
     praloc(dest, src.length);
-    for(iter=0UL, idx=0UL; iter < src.length; iter += BMP_BIT, ++idx)
+    for (iter = 0UL, idx = 0UL; iter < src.length; iter += BMP_BIT, ++idx)
         dest->bitmap[idx] = src.bitmap[idx];
 }
 
 void
-pcanon(poly_t *poly) {
+pcanon(poly_t *poly)
+{
     /* Converts poly into a CLEAN object by freeing unused bitmap words
      * and clearing any bits in the last word beyond the last bit.
      * The length field has absolute priority over the contents of the bitmap.
@@ -423,7 +430,8 @@ pcanon(poly_t *poly) {
 }
 
 void
-pnorm(poly_t *poly) {
+pnorm(poly_t *poly)
+{
     /* Converts poly into a NORMALISED object by removing leading
      * and trailing zeroes, so that the polynomial starts and ends
      * with significant terms.
@@ -436,14 +444,15 @@ pnorm(poly_t *poly) {
      */
     pcanon(poly);
     first = pfirst(*poly);
-    if(first)
+    if (first)
         pshift(poly, *poly, 0UL, first, plast(*poly), 0UL);
     else
         praloc(poly, plast(*poly));
 }
 
 void
-psnorm(poly_t *poly) {
+psnorm(poly_t *poly)
+{
     /* Converts poly into a SEMI-NORMALISED object by removing
      * trailing zeroes, so that the polynomial ends with a
      * significant term.
@@ -456,22 +465,24 @@ psnorm(poly_t *poly) {
 }
 
 void
-pchop(poly_t *poly) {
+pchop(poly_t *poly)
+{
     /* Normalise poly, then chop off the highest significant term
      * (produces a SEMI-NORMALISED object).  poly becomes a suitable
      * divisor for pcrc().
      * poly may or may not be WELL-FORMED.
      */
 
-     /* call pcanon() here so pfirst() and plast() return correct
-      * results
-      */
+    /* call pcanon() here so pfirst() and plast() return correct
+     * results
+     */
     pcanon(poly);
     pshift(poly, *poly, 0UL, pfirst(*poly) + 1UL, plast(*poly), 0UL);
 }
 
 void
-pkchop(poly_t *poly) {
+pkchop(poly_t *poly)
+{
     /* Convert poly from Koopman notation to chopped form (produces
      * a SEMI-NORMALISED object).  poly becomes a suitable divisor
      * for pcrc().
@@ -482,7 +493,7 @@ pkchop(poly_t *poly) {
     /* call pcanon() here so pfirst() returns the correct result */
     pcanon(poly);
     first = pfirst(*poly);
-    if(first >= poly->length) {
+    if (first >= poly->length) {
         pfree(poly);
         return;
     }
@@ -491,15 +502,17 @@ pkchop(poly_t *poly) {
 }
 
 unsigned long
-plen(const poly_t poly) {
+plen(const poly_t poly)
+{
     /* Return length of polynomial.
      * poly may or may not be WELL-FORMED.
      */
-    return(poly.length);
+    return (poly.length);
 }
 
 int
-pcmp(const poly_t *a, const poly_t *b) {
+pcmp(const poly_t *a, const poly_t *b)
+{
     /* Compares poly_t objects for identical sizes and contents.
      * a and b must be CLEAN.
      * Defines a total order relation for sorting, etc. although
@@ -509,24 +522,25 @@ pcmp(const poly_t *a, const poly_t *b) {
     unsigned long iter;
     bmp_t *aptr, *bptr;
 
-    if(!a || !b) return(!b - !a);
-    if(a->length < b->length) return(-1);
-    if(a->length > b->length) return(1);
+    if (!a || !b) return (!b - !a);
+    if (a->length < b->length) return (-1);
+    if (a->length > b->length) return (1);
     aptr = a->bitmap;
     bptr = b->bitmap;
-    if(aptr == bptr)
-        return(0);
-    for(iter=0UL; iter < a->length; iter += BMP_BIT) {
-        if(*aptr < *bptr)
-            return(-1);
-        if(*aptr++ > *bptr++)
-            return(1);
+    if (aptr == bptr)
+        return (0);
+    for (iter = 0UL; iter < a->length; iter += BMP_BIT) {
+        if (*aptr < *bptr)
+            return (-1);
+        if (*aptr++ > *bptr++)
+            return (1);
     }
-    return(0);
+    return (0);
 }
 
 int
-psncmp(const poly_t *a, const poly_t *b) {
+psncmp(const poly_t *a, const poly_t *b)
+{
     /* Compares polys for identical effect, i.e. as though the
      * shorter poly were padded with zeroes to the length of the
      * longer.
@@ -536,36 +550,38 @@ psncmp(const poly_t *a, const poly_t *b) {
      */
     unsigned long length, iter, idx;
     bmp_t aword, bword;
-    if(!a || !b) return(!b - !a);
+    if (!a || !b) return (!b - !a);
     length = (a->length > b->length) ? a->length : b->length;
-    for(iter = 0UL, idx = 0UL; iter < length; iter += BMP_BIT, ++idx) {
+    for (iter = 0UL, idx = 0UL; iter < length; iter += BMP_BIT, ++idx) {
         aword = (iter < a->length) ? a->bitmap[idx] : BMP_C(0);
         bword = (iter < b->length) ? b->bitmap[idx] : BMP_C(0);
-        if(aword < bword)
-            return(-1);
-        if(aword > bword)
-            return(1);
+        if (aword < bword)
+            return (-1);
+        if (aword > bword)
+            return (1);
     }
-    return(0);
+    return (0);
 }
 
 
 int
-ptst(const poly_t poly) {
+ptst(const poly_t poly)
+{
     /* Tests whether a polynomial equals zero.  Returns 0 if equal,
      * a nonzero value otherwise.
      * poly must be CLEAN.
      */
     unsigned long iter;
     bmp_t *bptr;
-    if(!poly.bitmap) return(0);
-    for(iter = 0UL, bptr = poly.bitmap; iter < poly.length; iter += BMP_BIT)
-        if(*bptr++) return(1);
-    return(0);
+    if (!poly.bitmap) return (0);
+    for (iter = 0UL, bptr = poly.bitmap; iter < poly.length; iter += BMP_BIT)
+        if (*bptr++) return (1);
+    return (0);
 }
 
 unsigned long
-pfirst(const poly_t poly) {
+pfirst(const poly_t poly)
+{
     /* Returns the index of the first nonzero term in poly.  If none
      * is found, returns the length of poly.
      * poly must be CLEAN.
@@ -574,21 +590,22 @@ pfirst(const poly_t poly) {
     bmp_t accu = BMP_C(0); /* initialiser for Acorn C */
     unsigned int probe = BMP_SUB, ofs = 0;
 
-    while(idx < size && !(accu = poly.bitmap[idx])) ++idx;
-    if(idx >= size) return(poly.length);
-    while(probe) {
+    while (idx < size && !(accu = poly.bitmap[idx])) ++idx;
+    if (idx >= size) return (poly.length);
+    while (probe) {
 #ifndef BMP_POF2
-        while((ofs | probe) >= (unsigned int) BMP_BIT) probe >>= 1;
+        while ((ofs | probe) >= (unsigned int) BMP_BIT) probe >>= 1;
 #endif
-        if(accu >> (ofs | probe)) ofs |= probe;
+        if (accu >> (ofs | probe)) ofs |= probe;
         probe >>= 1;
     }
 
-    return(BMP_BIT - 1UL - ofs + idx * BMP_BIT);
+    return (BMP_BIT - 1UL - ofs + idx * BMP_BIT);
 }
 
 unsigned long
-plast(const poly_t poly) {
+plast(const poly_t poly)
+{
     /* Returns 1 plus the index of the last nonzero term in poly.
      * If none is found, returns zero.
      * poly must be CLEAN.
@@ -597,31 +614,33 @@ plast(const poly_t poly) {
     bmp_t accu;
     unsigned int probe = BMP_SUB, ofs = 0;
 
-    if(!poly.length) return(0UL);
+    if (!poly.length) return (0UL);
     idx = size - 1UL;
-    while(idx && !(accu = poly.bitmap[idx])) --idx;
-    if(!idx && !(accu = poly.bitmap[idx])) return(0UL);
+    while (idx && !(accu = poly.bitmap[idx])) --idx;
+    if (!idx && !(accu = poly.bitmap[idx])) return (0UL);
     /* now accu == poly.bitmap[idx] and contains last significant term */
-    while(probe) {
+    while (probe) {
 #ifndef BMP_POF2
-        while((ofs | probe) >= (unsigned int) BMP_BIT) probe >>= 1;
+        while ((ofs | probe) >= (unsigned int) BMP_BIT) probe >>= 1;
 #endif
-        if(accu << (ofs | probe)) ofs |= probe;
+        if (accu << (ofs | probe)) ofs |= probe;
         probe >>= 1;
     }
 
-    return(idx * BMP_BIT + ofs + 1UL);
+    return (idx * BMP_BIT + ofs + 1UL);
 }
 
 poly_t
-psubs(const poly_t src, unsigned long head, unsigned long start, unsigned long end, unsigned long tail) {
+psubs(const poly_t src, unsigned long head, unsigned long start, unsigned long end, unsigned long tail)
+{
     poly_t dest = PZERO;
     pshift(&dest, src, head, start, end, tail);
-    return(dest);
+    return (dest);
 }
 
 void
-pright(poly_t *poly, unsigned long length) {
+pright(poly_t *poly, unsigned long length)
+{
     /* Trims or extends poly to length at the left edge, prepending
      * zeroes if necessary.  Analogous to praloc() except the
      * rightmost terms of poly are preserved.
@@ -629,16 +648,17 @@ pright(poly_t *poly, unsigned long length) {
      * On exit, poly is CLEAN.
      */
 
-    if(length > poly->length)
+    if (length > poly->length)
         pshift(poly, *poly, length - poly->length, 0UL, poly->length, 0UL);
-    else if(length < poly->length)
+    else if (length < poly->length)
         pshift(poly, *poly, 0UL, poly->length - length, poly->length, 0UL);
     else
         praloc(poly, poly->length);
 }
 
 void
-pshift(poly_t *dest, const poly_t src, unsigned long head, unsigned long start, unsigned long end, unsigned long tail) {
+pshift(poly_t *dest, const poly_t src, unsigned long head, unsigned long start, unsigned long end, unsigned long tail)
+{
     /* copies bits start to end-1 of src to dest, plus the number of leading and trailing zeroes given by head and tail.
      * end may exceed the length of src in which case more zeroes are appended.
      * dest may point to src, in which case the poly is edited in place.
@@ -648,11 +668,11 @@ pshift(poly_t *dest, const poly_t src, unsigned long head, unsigned long start,
 
     unsigned long length, fulllength, size, fullsize, iter, idx, datidx;
     /* condition inputs; end, head and tail may be any value */
-    if(end < start) end = start;
+    if (end < start) end = start;
 
     length = end - start + head;
     fulllength = length + tail;
-    if(fulllength > src.length)
+    if (fulllength > src.length)
         praloc(dest, fulllength);
     else
         praloc(dest, src.length);
@@ -663,12 +683,12 @@ pshift(poly_t *dest, const poly_t src, unsigned long head, unsigned long start,
     /* array index of first word ending up with source material */
     datidx = IDX(head);
 
-    if(head > start && end > start) {
+    if (head > start && end > start) {
         /* shifting right, size > 0 */
         /* index of the source bit ending up in the LSB of the last word
          * size * BMP_BIT >= length > head > 0 */
         iter = size * BMP_BIT - head - 1UL;
-        for(idx = size - 1UL; idx > datidx; iter -= BMP_BIT, --idx)
+        for (idx = size - 1UL; idx > datidx; iter -= BMP_BIT, --idx)
             dest->bitmap[idx] = getwrd(src, iter);
         dest->bitmap[idx] = getwrd(src, iter);
         /* iter == size * BMP_BIT - head - 1 - BMP_BIT * (size - 1 - datidx)
@@ -678,33 +698,34 @@ pshift(poly_t *dest, const poly_t src, unsigned long head, unsigned long start,
          *      == BMP_BIT - head % BMP_BIT - 1
          *      >= 0
          */
-    } else if(head <= start) {
+    } else if (head <= start) {
         /* shifting left or copying */
         /* index of the source bit ending up in the LSB of bitmap[idx] */
         iter = start - head + BMP_BIT - 1UL;
-        for(idx = datidx; idx < size; iter += BMP_BIT, ++idx)
+        for (idx = datidx; idx < size; iter += BMP_BIT, ++idx)
             dest->bitmap[idx] = getwrd(src, iter);
     }
 
     /* clear head */
-    for(idx = 0UL; idx < datidx; ++idx)
+    for (idx = 0UL; idx < datidx; ++idx)
         dest->bitmap[idx] = BMP_C(0);
-    if(size)
+    if (size)
         dest->bitmap[datidx] &= ~BMP_C(0) >> LOFS(head);
 
     /* clear tail */
-    if(LOFS(length))
+    if (LOFS(length))
         dest->bitmap[size - 1UL] &= ~(~BMP_C(0) >> LOFS(length));
-    for(idx = size; idx < fullsize; ++idx)
+    for (idx = size; idx < fullsize; ++idx)
         dest->bitmap[idx] = BMP_C(0);
 
     /* call praloc to shrink poly if required */
-    if(dest->length > fulllength)
+    if (dest->length > fulllength)
         praloc(dest, fulllength);
 }
 
 void
-ppaste(poly_t *dest, const poly_t src, unsigned long skip, unsigned long seek, unsigned long end, unsigned long fulllength) {
+ppaste(poly_t *dest, const poly_t src, unsigned long skip, unsigned long seek, unsigned long end, unsigned long fulllength)
+{
     /* pastes terms of src, starting from skip, to positions seek to end-1 of dest
      * then sets length of dest to fulllength (>= end)
      * to paste n terms of src, give end = seek + n
@@ -717,28 +738,28 @@ ppaste(poly_t *dest, const poly_t src, unsigned long skip, unsigned long seek, u
     bmp_t mask;
     unsigned long seekidx, endidx, iter;
     int seekofs;
-    if(end < seek) end = seek;
-    if(fulllength < end) fulllength = end;
+    if (end < seek) end = seek;
+    if (fulllength < end) fulllength = end;
 
     /* expand dest if necessary. don't shrink as dest may be src */
-    if(fulllength > dest->length)
+    if (fulllength > dest->length)
         praloc(dest, fulllength);
     seekidx = IDX(seek);
     endidx = IDX(end);
     seekofs = OFS(seek);
     /* index of the source bit ending up in the LSB of the first modified word */
     iter = skip + seekofs;
-    if(seekidx == endidx) {
+    if (seekidx == endidx) {
         /* paste affects one word (traps end = seek case) */
         mask = ((BMP_C(1) << seekofs) - (BMP_C(1) << OFS(end))) << 1;
         dest->bitmap[seekidx] = (dest->bitmap[seekidx] & ~mask) | (getwrd(src, iter) & mask);
-    } else if(seek > skip) {
+    } else if (seek > skip) {
         /* shifting right */
         /* index of the source bit ending up in the LSB of the last modified word */
         iter += (endidx - seekidx) * BMP_BIT;
         mask = ~BMP_C(0) >> LOFS(end);
         dest->bitmap[endidx] = (dest->bitmap[endidx] & mask) | (getwrd(src, iter) & ~mask);
-        for(iter -= BMP_BIT, --endidx; endidx > seekidx; iter -= BMP_BIT, --endidx)
+        for (iter -= BMP_BIT, --endidx; endidx > seekidx; iter -= BMP_BIT, --endidx)
             dest->bitmap[endidx] = getwrd(src, iter);
         mask = ~BMP_C(0) >> LOFS(seek);
         dest->bitmap[endidx] = (dest->bitmap[endidx] & ~mask) | (getwrd(src, iter) & mask);
@@ -751,18 +772,19 @@ ppaste(poly_t *dest, const poly_t src, unsigned long skip, unsigned long seek, u
         /* shifting left or copying */
         mask = ~BMP_C(0) >> LOFS(seek);
         dest->bitmap[seekidx] = (dest->bitmap[seekidx] & ~mask) | (getwrd(src, iter) & mask);
-        for(iter += BMP_BIT, ++seekidx; seekidx < endidx; iter += BMP_BIT, ++seekidx)
+        for (iter += BMP_BIT, ++seekidx; seekidx < endidx; iter += BMP_BIT, ++seekidx)
             dest->bitmap[seekidx] = getwrd(src, iter);
         mask = ~BMP_C(0) >> LOFS(end);
         dest->bitmap[seekidx] = (dest->bitmap[seekidx] & mask) | (getwrd(src, iter) & ~mask);
     }
     /* shrink poly if required */
-    if(dest->length > fulllength)
+    if (dest->length > fulllength)
         praloc(dest, fulllength);
 }
 
 void
-pdiff(poly_t *dest, const poly_t src, unsigned long ofs) {
+pdiff(poly_t *dest, const poly_t src, unsigned long ofs)
+{
     /* Subtract src from dest (modulo 2) at offset ofs.
      * In modulo 2 arithmetic, subtraction is equivalent to addition
      * We include an alias for those who wish to retain the distinction
@@ -772,7 +794,8 @@ pdiff(poly_t *dest, const poly_t src, unsigned long ofs) {
 }
 
 void
-psum(poly_t *dest, const poly_t src, unsigned long ofs) {
+psum(poly_t *dest, const poly_t src, unsigned long ofs)
+{
     /* Adds src to dest (modulo 2) at offset ofs.
      * When ofs == dest->length, catenates src on to dest.
      * src and dest must be CLEAN.
@@ -780,7 +803,7 @@ psum(poly_t *dest, const poly_t src, unsigned long ofs) {
     unsigned long fulllength, idx, iter, end;
 
     fulllength = ofs + src.length;
-    if(fulllength > dest->length)
+    if (fulllength > dest->length)
         praloc(dest, fulllength);
     /* array index of first word in dest to be modified */
     idx = IDX(ofs);
@@ -788,12 +811,13 @@ psum(poly_t *dest, const poly_t src, unsigned long ofs) {
     iter = OFS(ofs);
     /* stop value for iter */
     end = BMP_BIT - 1UL + src.length;
-    for(; iter < end; iter += BMP_BIT, ++idx)
+    for (; iter < end; iter += BMP_BIT, ++idx)
         dest->bitmap[idx] ^= getwrd(src, iter);
 }
 
 void
-prev(poly_t *poly) {
+prev(poly_t *poly)
+{
     /* Reverse or reciprocate a polynomial.
      * On exit, poly is CLEAN.
      */
@@ -802,9 +826,9 @@ prev(poly_t *poly) {
     unsigned long fulllength = poly->length + ofs;
     bmp_t accu;
 
-    if(ofs) {
+    if (ofs) {
         /* removable optimisation */
-        if(poly->length < (unsigned long) BMP_BIT) {
+        if (poly->length < (unsigned long) BMP_BIT) {
             *poly->bitmap = rev(*poly->bitmap >> ofs, (int) poly->length) << ofs;
             return;
         }
@@ -814,37 +838,38 @@ prev(poly_t *poly) {
     }
 
     /* reverse and swap words in the array, leaving it right-justified */
-    while(leftidx < rightidx) {
+    while (leftidx < rightidx) {
         /* rightidx > 0 */
         accu = rev(poly->bitmap[--rightidx], BMP_BIT);
         poly->bitmap[rightidx] = rev(poly->bitmap[leftidx], BMP_BIT);
         poly->bitmap[leftidx++] = accu;
     }
     /* shift polynomial to left edge if required */
-    if(ofs)
+    if (ofs)
         pshift(poly, *poly, 0UL, ofs, fulllength, 0UL);
 }
 
 void
-prevch(poly_t *poly, int bperhx) {
+prevch(poly_t *poly, int bperhx)
+{
     /* Reverse each group of bperhx bits in a polynomial.
      * Does not clean poly.
      */
     unsigned long iter = 0, idx, ofs;
     bmp_t mask, accu;
 
-    if(bperhx < 2 || bperhx > BMP_BIT)
+    if (bperhx < 2 || bperhx > BMP_BIT)
         return;
-    if(poly->length % bperhx)
+    if (poly->length % bperhx)
         praloc(poly, bperhx - (poly->length % bperhx) + poly->length);
     mask = ~BMP_C(0) >> (BMP_BIT - bperhx);
-    for(iter = (unsigned long) (bperhx - 1); iter < poly->length; iter += bperhx) {
+    for (iter = (unsigned long)(bperhx - 1); iter < poly->length; iter += bperhx) {
         accu = getwrd(*poly, iter) & mask;
         accu ^= rev(accu, bperhx);
         idx = IDX(iter);
         ofs = OFS(iter);
         poly->bitmap[idx] ^= accu << ofs;
-        if(ofs + bperhx > (unsigned int) BMP_BIT)
+        if (ofs + bperhx > (unsigned int) BMP_BIT)
             /* (BMP_BIT - 1UL - (iter) % BMP_BIT) + bperhx > BMP_BIT
              * (-1UL - (iter) % BMP_BIT) + bperhx > 0
              * (- (iter % BMP_BIT)) + bperhx > 1
@@ -853,12 +878,13 @@ prevch(poly_t *poly, int bperhx) {
              * iter >= BMP_BIT
              * idx >= 1
              */
-            poly->bitmap[idx-1] ^= accu >> (BMP_BIT - ofs);
+            poly->bitmap[idx - 1] ^= accu >> (BMP_BIT - ofs);
     }
 }
 
 void
-prcp(poly_t *poly) {
+prcp(poly_t *poly)
+{
     /* Reciprocate a chopped polynomial.  Use prev() on whole
      * polynomials.
      * On exit, poly is SEMI-NORMALISED.
@@ -868,7 +894,7 @@ prcp(poly_t *poly) {
     praloc(poly, RNDUP(poly->length));
     prev(poly);
     first = pfirst(*poly);
-    if(first >= poly->length) {
+    if (first >= poly->length) {
         pfree(poly);
         return;
     }
@@ -877,20 +903,22 @@ prcp(poly_t *poly) {
 }
 
 void
-pinv(poly_t *poly) {
+pinv(poly_t *poly)
+{
     /* Invert a polynomial, i.e. add 1 (modulo 2) to the coefficient of each term
      * on exit, poly is CLEAN.
      */
     unsigned long idx, size = SIZE(poly->length);
 
-    for(idx = 0UL; idx<size; ++idx)
+    for (idx = 0UL; idx < size; ++idx)
         poly->bitmap[idx] = ~poly->bitmap[idx];
-    if(LOFS(poly->length))
+    if (LOFS(poly->length))
         poly->bitmap[size - 1UL] &= ~(~BMP_C(0) >> LOFS(poly->length));
 }
 
 poly_t
-pmod(const poly_t dividend, const poly_t divisor) {
+pmod(const poly_t dividend, const poly_t divisor)
+{
     /* Divide dividend by normalised divisor and return the remainder
      * This function generates a temporary 'chopped' divisor for pcrc()
      * If calling repeatedly with a constant divisor, produce a chopped copy
@@ -902,11 +930,12 @@ pmod(const poly_t dividend, const poly_t divisor) {
     poly_t subdivisor = psubs(divisor, 0UL, pfirst(divisor) + 1UL, plast(divisor), 0UL);
     poly_t result = pcrc(dividend, subdivisor, pzero, pzero, 0);
     pfree(&subdivisor);
-    return(result);
+    return (result);
 }
 
 poly_t
-pcrc(const poly_t message, const poly_t divisor, const poly_t init, const poly_t xorout, int flags) {
+pcrc(const poly_t message, const poly_t divisor, const poly_t init, const poly_t xorout, int flags)
+{
     /* Divide message by divisor and return the remainder.
      * init is added to divisor, highest terms aligned, before
      * division.
@@ -923,34 +952,34 @@ pcrc(const poly_t message, const poly_t divisor, const poly_t init, const poly_t
     const bmp_t *bptr, *eptr;
     poly_t result = PZERO;
 
-    if(flags & P_MULXN)
+    if (flags & P_MULXN)
         max = message.length;
-    else if(message.length > divisor.length)
+    else if (message.length > divisor.length)
         max = message.length - divisor.length;
-    bptr=message.bitmap;
-    eptr=message.bitmap+SIZE(message.length);
-    probe=~(~BMP_C(0) >> 1);
-    if(divisor.length <= (unsigned long) BMP_BIT
+    bptr = message.bitmap;
+    eptr = message.bitmap + SIZE(message.length);
+    probe = ~(~BMP_C(0) >> 1);
+    if (divisor.length <= (unsigned long) BMP_BIT
         && init.length <= (unsigned long) BMP_BIT) {
         rem = init.length ? *init.bitmap : BMP_C(0);
         dvsr = divisor.length ? *divisor.bitmap : BMP_C(0);
-        for(iter = 0UL, ofs = 0UL; iter < max; ++iter, --ofs) {
-            if(!ofs) {
+        for (iter = 0UL, ofs = 0UL; iter < max; ++iter, --ofs) {
+            if (!ofs) {
                 ofs = BMP_BIT;
                 rem ^= *bptr++;
             }
-            if(rem & probe)
+            if (rem & probe)
                 rem = (rem << 1) ^ dvsr;
             else
                 rem <<= 1;
         }
-        if(bptr < eptr)
+        if (bptr < eptr)
             /* max < message.length */
             rem ^= *bptr >> OFS(BMP_BIT - 1UL + max);
-        if(init.length > max && init.length - max > divisor.length) {
+        if (init.length > max && init.length - max > divisor.length) {
             palloc(&result, init.length - max);
             *result.bitmap = rem;
-        } else if(divisor.length) {
+        } else if (divisor.length) {
             palloc(&result, divisor.length);
             *result.bitmap = rem;
         }
@@ -958,13 +987,13 @@ pcrc(const poly_t message, const poly_t divisor, const poly_t init, const poly_t
         /* allocate maximum size plus one word for shifted divisors and one word containing zero.
          * This also ensures that result[1] exists
          */
-        palloc(&result, (init.length > divisor.length ? init.length : divisor.length) + (unsigned long) (BMP_BIT << 1));
+        palloc(&result, (init.length > divisor.length ? init.length : divisor.length) + (unsigned long)(BMP_BIT << 1));
         /*if there is content in init, there will be an extra word in result to clear it */
         psum(&result, init, 0UL);
-        if(max)
+        if (max)
             *result.bitmap ^= *bptr++;
-        for(iter = 0UL, ofs = 0UL; iter < max; ++iter, probe >>= 1) {
-            if(!probe) {
+        for (iter = 0UL, ofs = 0UL; iter < max; ++iter, probe >>= 1) {
+            if (!probe) {
                 probe = ~(~BMP_C(0) >> 1);
                 ofs = 0UL;
                 sptr = rptr = result.bitmap;
@@ -974,43 +1003,45 @@ pcrc(const poly_t message, const poly_t divisor, const poly_t init, const poly_t
                  * and clearing the last active word
                  */
                 *rptr++ = *sptr++ ^ *bptr++;
-                for(resiter = (unsigned long) (BMP_BIT << 1); resiter < result.length; resiter += BMP_BIT)
-                    *rptr++ = *sptr++;
+                for (resiter = (unsigned long)(BMP_BIT << 1); resiter < result.length; resiter += BMP_BIT)
+                    * rptr++ = *sptr++;
             }
             ++ofs;
-            if(*result.bitmap & probe)
+            if (*result.bitmap & probe)
                 psum(&result, divisor, ofs);
         }
         rptr = result.bitmap;
         ++rptr;
-        while(bptr < eptr)
+        while (bptr < eptr)
             *rptr++ ^= *bptr++;
         /* 0 <= ofs <= BMP_BIT, location of the first bit of the result */
         pshift(&result, result, 0UL, ofs, (init.length > max + divisor.length ? init.length - max - divisor.length : 0UL) + divisor.length + ofs, 0UL);
     }
     psum(&result, xorout, 0UL);
-    return(result);
+    return (result);
 }
 
 int
-piter(poly_t *poly) {
+piter(poly_t *poly)
+{
     /* Replace poly with the 'next' polynomial of equal length.
      * Returns zero if the next polynomial is all zeroes, a nonzero
      * value otherwise.
      * Does not clean poly.
      */
     bmp_t *bptr;
-    if(!poly->length) return(0);
+    if (!poly->length) return (0);
 
     bptr = poly->bitmap + IDX(poly->length - 1UL);
     *bptr += BMP_C(1) << OFS(poly->length - 1UL);
-    while(bptr != poly->bitmap && !*bptr)
+    while (bptr != poly->bitmap && !*bptr)
         ++(*--bptr);
-    return(*bptr != BMP_C(0));
+    return (*bptr != BMP_C(0));
 }
 
 void
-palloc(poly_t *poly, unsigned long length) {
+palloc(poly_t *poly, unsigned long length)
+{
     /* Replaces poly with a CLEAN object of the specified length,
      * consisting of all zeroes.
      * It is safe to call with length = 0, in which case the object
@@ -1023,18 +1054,19 @@ palloc(poly_t *poly, unsigned long length) {
     poly->length = 0UL;
     free(poly->bitmap);
     poly->bitmap = NULL;
-    if(!length) return;
-    if(!size)
+    if (!length) return;
+    if (!size)
         size = IDX(length) + 1UL;
     poly->bitmap = (bmp_t *) calloc(size, sizeof(bmp_t));
-    if(poly->bitmap) {
+    if (poly->bitmap) {
         poly->length = length;
     } else
         uerror("cannot allocate memory for poly");
 }
 
 void
-pfree(poly_t *poly) {
+pfree(poly_t *poly)
+{
     /* Frees poly's bitmap storage and sets poly equal to the empty
      * polynomial (PZERO).
      * poly may or may not be WELL-FORMED.
@@ -1049,38 +1081,39 @@ pfree(poly_t *poly) {
 }
 
 void
-praloc(poly_t *poly, unsigned long length) {
+praloc(poly_t *poly, unsigned long length)
+{
     /* Trims or extends poly to length at the right edge, appending
      * zeroes if necessary.
      * On entry, poly may or may not be WELL-FORMED.
      * On exit, poly is CLEAN.
      */
     unsigned long oldsize, size = SIZE(length);
-    if(!poly) return;
-    if(!length) {
+    if (!poly) return;
+    if (!length) {
         poly->length = 0UL;
         free(poly->bitmap);
         poly->bitmap = NULL;
         return;
     }
-    if(!size)
+    if (!size)
         size = IDX(length) + 1UL;
-    if(!poly->bitmap)
+    if (!poly->bitmap)
         poly->length = 0UL;
     oldsize = SIZE(poly->length);
-    if(oldsize != size)
+    if (oldsize != size)
         /* reallocate if array pointer is null or array resized */
         poly->bitmap = (bmp_t *) realloc((void *)poly->bitmap, size * sizeof(bmp_t));
-    if(poly->bitmap) {
-        if(poly->length < length) {
+    if (poly->bitmap) {
+        if (poly->length < length) {
             /* poly->length >= 0, length > 0, size > 0.
              * poly expanded. clear old last word and all new words
              */
-            if(LOFS(poly->length))
+            if (LOFS(poly->length))
                 poly->bitmap[oldsize - 1UL] &= ~(~BMP_C(0) >> LOFS(poly->length));
-            while(oldsize < size)
+            while (oldsize < size)
                 poly->bitmap[oldsize++] = BMP_C(0);
-        } else if(LOFS(length))
+        } else if (LOFS(length))
             /* poly->length >= length > 0.
              * poly shrunk. clear new last word
              */
@@ -1091,7 +1124,8 @@ praloc(poly_t *poly, unsigned long length) {
 }
 
 int
-pmpar(const poly_t poly, const poly_t mask) {
+pmpar(const poly_t poly, const poly_t mask)
+{
     /* Return even parity of poly masked with mask.
      * Poly and mask must be CLEAN.
      */
@@ -1101,28 +1135,30 @@ pmpar(const poly_t poly, const poly_t mask) {
     const bmp_t *const pend = poly.bitmap + SIZE(poly.length);
     const bmp_t *const mend = mask.bitmap + SIZE(mask.length);
 
-    while(pptr < pend && mptr < mend)
+    while (pptr < pend && mptr < mend)
         res ^= *pptr++ & *mptr++;
     do
         res ^= res >> i;
-    while(i >>= 1);
+    while (i >>= 1);
 
-    return((int) (res & BMP_C(1)));
+    return ((int)(res & BMP_C(1)));
 }
 
 int
-pident(const poly_t a, const poly_t b) {
+pident(const poly_t a, const poly_t b)
+{
     /* Return nonzero if a and b have the same length
      * and point to the same bitmap.
      * a and b need not be CLEAN.
      */
-    return(a.length == b.length && a.bitmap == b.bitmap);
+    return (a.length == b.length && a.bitmap == b.bitmap);
 }
 
 /* Private functions */
 
 static bmp_t
-getwrd(const poly_t poly, unsigned long iter) {
+getwrd(const poly_t poly, unsigned long iter)
+{
     /* Fetch unaligned word from poly where LSB of result is
      * bit iter of the bitmap (counting from zero).  If iter exceeds
      * the length of poly then zeroes are appended as necessary.
@@ -1137,64 +1173,66 @@ getwrd(const poly_t poly, unsigned long iter) {
     ofs = OFS(iter);
     size = SIZE(poly.length);
 
-    if(idx < size)
+    if (idx < size)
         accu |= poly.bitmap[idx] >> ofs;
-    if(idx && idx <= size && ofs > 0)
+    if (idx && idx <= size && ofs > 0)
         accu |= poly.bitmap[idx - 1UL] << (BMP_BIT - ofs);
-    return(accu);
+    return (accu);
 }
 
 static bmp_t
-rev(bmp_t accu, int bits) {
+rev(bmp_t accu, int bits)
+{
     /* Returns the bitmap word argument with the given number of
      * least significant bits reversed and the rest cleared.
      */
     static const unsigned char revtab[256] = {
-        0x00,0x80,0x40,0xc0,0x20,0xa0,0x60,0xe0,
-        0x10,0x90,0x50,0xd0,0x30,0xb0,0x70,0xf0,
-        0x08,0x88,0x48,0xc8,0x28,0xa8,0x68,0xe8,
-        0x18,0x98,0x58,0xd8,0x38,0xb8,0x78,0xf8,
-        0x04,0x84,0x44,0xc4,0x24,0xa4,0x64,0xe4,
-        0x14,0x94,0x54,0xd4,0x34,0xb4,0x74,0xf4,
-        0x0c,0x8c,0x4c,0xcc,0x2c,0xac,0x6c,0xec,
-        0x1c,0x9c,0x5c,0xdc,0x3c,0xbc,0x7c,0xfc,
-        0x02,0x82,0x42,0xc2,0x22,0xa2,0x62,0xe2,
-        0x12,0x92,0x52,0xd2,0x32,0xb2,0x72,0xf2,
-        0x0a,0x8a,0x4a,0xca,0x2a,0xaa,0x6a,0xea,
-        0x1a,0x9a,0x5a,0xda,0x3a,0xba,0x7a,0xfa,
-        0x06,0x86,0x46,0xc6,0x26,0xa6,0x66,0xe6,
-        0x16,0x96,0x56,0xd6,0x36,0xb6,0x76,0xf6,
-        0x0e,0x8e,0x4e,0xce,0x2e,0xae,0x6e,0xee,
-        0x1e,0x9e,0x5e,0xde,0x3e,0xbe,0x7e,0xfe,
-        0x01,0x81,0x41,0xc1,0x21,0xa1,0x61,0xe1,
-        0x11,0x91,0x51,0xd1,0x31,0xb1,0x71,0xf1,
-        0x09,0x89,0x49,0xc9,0x29,0xa9,0x69,0xe9,
-        0x19,0x99,0x59,0xd9,0x39,0xb9,0x79,0xf9,
-        0x05,0x85,0x45,0xc5,0x25,0xa5,0x65,0xe5,
-        0x15,0x95,0x55,0xd5,0x35,0xb5,0x75,0xf5,
-        0x0d,0x8d,0x4d,0xcd,0x2d,0xad,0x6d,0xed,
-        0x1d,0x9d,0x5d,0xdd,0x3d,0xbd,0x7d,0xfd,
-        0x03,0x83,0x43,0xc3,0x23,0xa3,0x63,0xe3,
-        0x13,0x93,0x53,0xd3,0x33,0xb3,0x73,0xf3,
-        0x0b,0x8b,0x4b,0xcb,0x2b,0xab,0x6b,0xeb,
-        0x1b,0x9b,0x5b,0xdb,0x3b,0xbb,0x7b,0xfb,
-        0x07,0x87,0x47,0xc7,0x27,0xa7,0x67,0xe7,
-        0x17,0x97,0x57,0xd7,0x37,0xb7,0x77,0xf7,
-        0x0f,0x8f,0x4f,0xcf,0x2f,0xaf,0x6f,0xef,
-        0x1f,0x9f,0x5f,0xdf,0x3f,0xbf,0x7f,0xff
+        0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0,
+        0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0,
+        0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8,
+        0x18, 0x98, 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8,
+        0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 0xe4,
+        0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4,
+        0x0c, 0x8c, 0x4c, 0xcc, 0x2c, 0xac, 0x6c, 0xec,
+        0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc,
+        0x02, 0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2,
+        0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, 0x72, 0xf2,
+        0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea,
+        0x1a, 0x9a, 0x5a, 0xda, 0x3a, 0xba, 0x7a, 0xfa,
+        0x06, 0x86, 0x46, 0xc6, 0x26, 0xa6, 0x66, 0xe6,
+        0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6, 0x76, 0xf6,
+        0x0e, 0x8e, 0x4e, 0xce, 0x2e, 0xae, 0x6e, 0xee,
+        0x1e, 0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe,
+        0x01, 0x81, 0x41, 0xc1, 0x21, 0xa1, 0x61, 0xe1,
+        0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, 0xf1,
+        0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9,
+        0x19, 0x99, 0x59, 0xd9, 0x39, 0xb9, 0x79, 0xf9,
+        0x05, 0x85, 0x45, 0xc5, 0x25, 0xa5, 0x65, 0xe5,
+        0x15, 0x95, 0x55, 0xd5, 0x35, 0xb5, 0x75, 0xf5,
+        0x0d, 0x8d, 0x4d, 0xcd, 0x2d, 0xad, 0x6d, 0xed,
+        0x1d, 0x9d, 0x5d, 0xdd, 0x3d, 0xbd, 0x7d, 0xfd,
+        0x03, 0x83, 0x43, 0xc3, 0x23, 0xa3, 0x63, 0xe3,
+        0x13, 0x93, 0x53, 0xd3, 0x33, 0xb3, 0x73, 0xf3,
+        0x0b, 0x8b, 0x4b, 0xcb, 0x2b, 0xab, 0x6b, 0xeb,
+        0x1b, 0x9b, 0x5b, 0xdb, 0x3b, 0xbb, 0x7b, 0xfb,
+        0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67, 0xe7,
+        0x17, 0x97, 0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7,
+        0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 0xef,
+        0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff
     };
     bmp_t result = BMP_C(0);
-    while(bits > 8) {
+    while (bits > 8) {
         bits -= 8;
         result = result << 8 | revtab[accu & 0xff];
         accu >>= 8;
     }
-    result = result << bits | (bmp_t) (revtab[accu & 0xff] >> (8 - bits));
-    return(result);
+    result = result << bits | (bmp_t)(revtab[accu & 0xff] >> (8 - bits));
+    return (result);
 }
 
 static void
-prhex(char **spp, bmp_t bits, int flags, int bperhx) {
+prhex(char **spp, bmp_t bits, int flags, int bperhx)
+{
     /* Appends a hexadecimal string representing the bperhx least
      * significant bits of bits to an external string.
      * spp points to a character pointer that in turn points to the
@@ -1205,7 +1243,7 @@ prhex(char **spp, bmp_t bits, int flags, int bperhx) {
      */
     static const char hex[] = "0123456789abcdef0123456789ABCDEF";
     const int upper = (flags & P_UPPER ? 0x10 : 0);
-    while(bperhx > 0) {
+    while (bperhx > 0) {
         bperhx -= ((bperhx + 3) & 3) + 1;
         *(*spp)++ = hex[(bits >> bperhx & BMP_C(0xf)) | upper];
     }
diff --git a/client/reveng/preset.c b/client/reveng/preset.c
index e09c07ff0..dbbebe88e 100644
--- a/client/reveng/preset.c
+++ b/client/reveng/preset.c
@@ -136,19 +136,19 @@ static const bmp_t b40c[] = {
 #    else /* BMP_BIT */
 static const bmp_t b40[] = {
     BMP_C(0x00048200) << (BMP_BIT - 32) | BMP_C(0x04) >> (39 - BMP_BIT),
-    BMP_C(0x09) << (BMP_BIT * 2 - 40),
+                      BMP_C(0x09) << (BMP_BIT * 2 - 40),
 };
 static const bmp_t b40a[] = {
     BMP_C(0xffffffff) << (BMP_BIT - 32) | BMP_C(0x7f) >> (39 - BMP_BIT),
-    BMP_C(0xff) << (BMP_BIT * 2 - 40),
+                      BMP_C(0xff) << (BMP_BIT * 2 - 40),
 };
 static const bmp_t b40b[] = {
     BMP_C(0xd4164fc6) << (BMP_BIT - 32) | BMP_C(0x23) >> (39 - BMP_BIT),
-    BMP_C(0x46) << (BMP_BIT * 2 - 40),
+                      BMP_C(0x46) << (BMP_BIT * 2 - 40),
 };
 static const bmp_t b40c[] = {
     BMP_C(0xc4ff8071) << (BMP_BIT - 32) | BMP_C(0x7f) >> (39 - BMP_BIT),
-    BMP_C(0xff) << (BMP_BIT * 2 - 40),
+                      BMP_C(0xff) << (BMP_BIT * 2 - 40),
 };
 #    endif /* BMP_BIT */
 
@@ -186,43 +186,43 @@ static const bmp_t b64i[] = {
 #    else /* BMP_BIT */
 static const bmp_t b64[] = {
     BMP_C(0x00000000) << (BMP_BIT - 32) | BMP_C(0x0000000d) >> (63 - BMP_BIT),
-    BMP_C(0x0000001b) << (BMP_BIT * 2 - 64),
+                      BMP_C(0x0000001b) << (BMP_BIT * 2 - 64),
 };
 static const bmp_t b64a[] = {
     BMP_C(0xffffffff) << (BMP_BIT - 32) | BMP_C(0x7fffffff) >> (63 - BMP_BIT),
-    BMP_C(0xffffffff) << (BMP_BIT * 2 - 64),
+                      BMP_C(0xffffffff) << (BMP_BIT * 2 - 64),
 };
 static const bmp_t b64b[] = {
     BMP_C(0xb90956c7) << (BMP_BIT - 32) | BMP_C(0x3ad20800) >> (63 - BMP_BIT),
-    BMP_C(0x75a41001) << (BMP_BIT * 2 - 64),
+                      BMP_C(0x75a41001) << (BMP_BIT * 2 - 64),
 };
 static const bmp_t b64c[] = {
     BMP_C(0x53000000) << (BMP_BIT - 32) | BMP_C(0x00000000) >> (63 - BMP_BIT),
-    BMP_C(0x00000000) << (BMP_BIT * 2 - 64),
+                      BMP_C(0x00000000) << (BMP_BIT * 2 - 64),
 };
 static const bmp_t b64d[] = {
     BMP_C(0x42f0e1eb) << (BMP_BIT - 32) | BMP_C(0x54f51b49) >> (63 - BMP_BIT),
-    BMP_C(0xa9ea3693) << (BMP_BIT * 2 - 64),
+                      BMP_C(0xa9ea3693) << (BMP_BIT * 2 - 64),
 };
 static const bmp_t b64e[] = {
     BMP_C(0x6c40df5f) << (BMP_BIT - 32) | BMP_C(0x05a4b9a3) >> (63 - BMP_BIT),
-    BMP_C(0x0b497347) << (BMP_BIT * 2 - 64),
+                      BMP_C(0x0b497347) << (BMP_BIT * 2 - 64),
 };
 static const bmp_t b64f[] = {
     BMP_C(0x62ec59e3) << (BMP_BIT - 32) | BMP_C(0x78d27805) >> (63 - BMP_BIT),
-    BMP_C(0xf1a4f00a) << (BMP_BIT * 2 - 64),
+                      BMP_C(0xf1a4f00a) << (BMP_BIT * 2 - 64),
 };
 static const bmp_t b64g[] = {
     BMP_C(0xfcacbebd) << (BMP_BIT - 32) | BMP_C(0x2c98d4c9) >> (63 - BMP_BIT),
-    BMP_C(0x5931a992) << (BMP_BIT * 2 - 64),
+                      BMP_C(0x5931a992) << (BMP_BIT * 2 - 64),
 };
 static const bmp_t b64h[] = {
     BMP_C(0x995dc9bb) << (BMP_BIT - 32) | BMP_C(0x6f8c9cfd) >> (63 - BMP_BIT),
-    BMP_C(0xdf1939fa) << (BMP_BIT * 2 - 64),
+                      BMP_C(0xdf1939fa) << (BMP_BIT * 2 - 64),
 };
 static const bmp_t b64i[] = {
     BMP_C(0x49958c9a) << (BMP_BIT - 32) | BMP_C(0x5ebe9a9f) >> (63 - BMP_BIT),
-    BMP_C(0xbd7d353f) << (BMP_BIT * 2 - 64),
+                      BMP_C(0xbd7d353f) << (BMP_BIT * 2 - 64),
 };
 #    endif /* BMP_BIT */
 
@@ -236,22 +236,22 @@ static const bmp_t b82a[] = {
 #    elif BMP_BIT >= 41
 static const bmp_t b82[] = {
     BMP_C(0x01846008880) << (BMP_BIT - 41) | BMP_C(0x08a00a20208) >> (81 - BMP_BIT),
-    BMP_C(0x11401440411) << (BMP_BIT * 2 - 82),
+                         BMP_C(0x11401440411) << (BMP_BIT * 2 - 82),
 };
 static const bmp_t b82a[] = {
     BMP_C(0x04f541fb128) << (BMP_BIT - 41) | BMP_C(0x011c00feb09) >> (81 - BMP_BIT),
-    BMP_C(0x023801fd612) << (BMP_BIT * 2 - 82),
+                         BMP_C(0x023801fd612) << (BMP_BIT * 2 - 82),
 };
 #    else /* BMP_BIT */
 static const bmp_t b82[] = {
     BMP_C(0x0c230044) << (BMP_BIT - 32) | BMP_C(0x040) >> (40 - BMP_BIT),
-    BMP_C(0x40450051) << (BMP_BIT * 2 - 64) | BMP_C(0x00104) >> (80 - BMP_BIT * 2),
-    BMP_C(0x00411) << (BMP_BIT * 3 - 82),
+                      BMP_C(0x40450051) << (BMP_BIT * 2 - 64) | BMP_C(0x00104) >> (80 - BMP_BIT * 2),
+                      BMP_C(0x00411) << (BMP_BIT * 3 - 82),
 };
 static const bmp_t b82a[] = {
     BMP_C(0x27aa0fd8) << (BMP_BIT - 32) | BMP_C(0x094) >> (40 - BMP_BIT),
-    BMP_C(0x9408e007) << (BMP_BIT * 2 - 64) | BMP_C(0x0f584) >> (80 - BMP_BIT * 2),
-    BMP_C(0x3d612) << (BMP_BIT * 3 - 82),
+                      BMP_C(0x9408e007) << (BMP_BIT * 2 - 64) | BMP_C(0x0f584) >> (80 - BMP_BIT * 2),
+                      BMP_C(0x3d612) << (BMP_BIT * 3 - 82),
 };
 #    endif /* BMP_BIT */
 
@@ -261,213 +261,213 @@ static const bmp_t b82a[] = {
 /* Array of the polynomial bitmaps used in the model table. */
 static const bmp_t b32[] = {
     BMP_C(0x000000af) << (BMP_BIT - 32),    /*   0 -- 32,000000af */
-    BMP_C(0x00010000) << (BMP_BIT - 32),    /*   1 -- 16,    0001 */
-    BMP_C(0x00020000) << (BMP_BIT - 32),    /*   2 -- 15,    0001 */
-    BMP_C(0x00065b00) << (BMP_BIT - 32),    /*   3 -- 24,  00065b */
-    BMP_C(0x007e0000) << (BMP_BIT - 32),    /*   4 -- 16,    007e */
-    BMP_C(0x007f0000) << (BMP_BIT - 32),    /*   5 -- 16,    007f */
-    BMP_C(0x03400000) << (BMP_BIT - 32),    /*   6 -- 11,     01a */
-    BMP_C(0x0376e6e7) << (BMP_BIT - 32),    /*   7 -- 32,0376e6e7 */
-    BMP_C(0x04c11db7) << (BMP_BIT - 32),    /*   8 -- 32,04c11db7 */
-    BMP_C(0x05890000) << (BMP_BIT - 32),    /*   9 -- 16,    0589 */
-    BMP_C(0x07000000) << (BMP_BIT - 32),    /*  10 --  8,      07 */
-    BMP_C(0x080b0000) << (BMP_BIT - 32),    /*  11 -- 16,    080b */
-    BMP_C(0x09823b6e) << (BMP_BIT - 32),    /*  12 -- 31,04c11db7 */
-    BMP_C(0x0b3c0000) << (BMP_BIT - 32),    /*  13 -- 15,    059e */
-    BMP_C(0x0c000000) << (BMP_BIT - 32),    /*  14 --  6,      03 */
-    BMP_C(0x0c200000) << (BMP_BIT - 32),    /*  15 -- 11,     061 */
-    BMP_C(0x0c780000) << (BMP_BIT - 32),    /*  16 -- 14,    031e */
-    BMP_C(0x0fb30000) << (BMP_BIT - 32),    /*  17 -- 16,    0fb3 */
-    BMP_C(0x10210000) << (BMP_BIT - 32),    /*  18 -- 16,    1021 */
-    BMP_C(0x12000000) << (BMP_BIT - 32),    /*  19 --  7,      09 */
-    BMP_C(0x130d2afc) << (BMP_BIT - 32),    /*  20 -- 30,04c34abf */
-    BMP_C(0x144e6300) << (BMP_BIT - 32),    /*  21 -- 24,  144e63 */
-    BMP_C(0x15000000) << (BMP_BIT - 32),    /*  22 --  8,      15 */
-    BMP_C(0x1697d06a) << (BMP_BIT - 32),    /*  23 -- 32,1697d06a */
-    BMP_C(0x17800000) << (BMP_BIT - 32),    /*  24 -- 12,     178 */
-    BMP_C(0x18000000) << (BMP_BIT - 32),    /*  25 --  6,      06 */
-    BMP_C(0x19d3c8d8) << (BMP_BIT - 32),    /*  26 -- 31,0ce9e46c */
-    BMP_C(0x1c000000) << (BMP_BIT - 32),    /*  27 --  6,      07 */
-    BMP_C(0x1d000000) << (BMP_BIT - 32),    /*  28 --  8,      1d */
-    BMP_C(0x1d0f0000) << (BMP_BIT - 32),    /*  29 -- 16,    1d0f */
-    BMP_C(0x1dcf0000) << (BMP_BIT - 32),    /*  30 -- 16,    1dcf */
-    BMP_C(0x1edc6f41) << (BMP_BIT - 32),    /*  31 -- 32,1edc6f41 */
-    BMP_C(0x1f23b800) << (BMP_BIT - 32),    /*  32 -- 24,  1f23b8 */
-    BMP_C(0x20000000) << (BMP_BIT - 32),    /*  33 --  4,       2 */
-    BMP_C(0x200fa500) << (BMP_BIT - 32),    /*  34 -- 24,  200fa5 */
-    BMP_C(0x20140000) << (BMP_BIT - 32),    /*  35 -- 14,    0805 */
-    BMP_C(0x20b40000) << (BMP_BIT - 32),    /*  36 -- 14,    082d */
-    BMP_C(0x20fe0000) << (BMP_BIT - 32),    /*  37 -- 16,    20fe */
-    BMP_C(0x21890000) << (BMP_BIT - 32),    /*  38 -- 16,    2189 */
-    BMP_C(0x21cf0200) << (BMP_BIT - 32),    /*  39 -- 24,  21cf02 */
-    BMP_C(0x23ef5200) << (BMP_BIT - 32),    /*  40 -- 24,  23ef52 */
-    BMP_C(0x25000000) << (BMP_BIT - 32),    /*  41 --  8,      25 */
-    BMP_C(0x26000000) << (BMP_BIT - 32),    /*  42 --  8,      26 */
-    BMP_C(0x26b10000) << (BMP_BIT - 32),    /*  43 -- 16,    26b1 */
-    BMP_C(0x27818000) << (BMP_BIT - 32),    /*  44 -- 17,   04f03 */
-    BMP_C(0x27d00000) << (BMP_BIT - 32),    /*  45 -- 13,    04fa */
-    BMP_C(0x28000000) << (BMP_BIT - 32),    /*  46 --  5,      05 */
-    BMP_C(0x29b10000) << (BMP_BIT - 32),    /*  47 -- 16,    29b1 */
-    BMP_C(0x2f000000) << (BMP_BIT - 32),    /*  48 --  8,      2f */
-    BMP_C(0x30000000) << (BMP_BIT - 32),    /*  49 --  4, 3/ 5, 6 */
-    BMP_C(0x3010bf7f) << (BMP_BIT - 32),    /*  50 -- 32,3010bf7f */
-    BMP_C(0x31000000) << (BMP_BIT - 32),    /*  51 --  8,      31 */
-    BMP_C(0x31800000) << (BMP_BIT - 32),    /*  52 -- 10,     0c6 */
-    BMP_C(0x31c30000) << (BMP_BIT - 32),    /*  53 -- 16,    31c3 */
-    BMP_C(0x328b6300) << (BMP_BIT - 32),    /*  54 -- 24,  328b63 */
-    BMP_C(0x34000000) << (BMP_BIT - 32),    /*  55 --  6,      0d */
-    BMP_C(0x340bc6d9) << (BMP_BIT - 32),    /*  56 -- 32,340bc6d9 */
-    BMP_C(0x37000000) << (BMP_BIT - 32),    /*  57 --  8,      37 */
-    BMP_C(0x38000000) << (BMP_BIT - 32),    /*  58 --  5,      07 */
-    BMP_C(0x39000000) << (BMP_BIT - 32),    /*  59 --  8,      39 */
-    BMP_C(0x3d650000) << (BMP_BIT - 32),    /*  60 -- 16,    3d65 */
-    BMP_C(0x3e000000) << (BMP_BIT - 32),    /*  61 --  8,      3e */
-    BMP_C(0x40000000) << (BMP_BIT - 32),    /*  62 --  3,       2 */
-    BMP_C(0x42000000) << (BMP_BIT - 32),    /*  63 --  8,      42 */
-    BMP_C(0x44c20000) << (BMP_BIT - 32),    /*  64 -- 16,    44c2 */
-    BMP_C(0x45270551) << (BMP_BIT - 32),    /*  65 -- 32,45270551 */
-    BMP_C(0x48000000) << (BMP_BIT - 32),    /*  66 --  5,      09 */
-    BMP_C(0x49000000) << (BMP_BIT - 32),    /*  67 --  8,      49 */
-    BMP_C(0x4a800000) << (BMP_BIT - 32),    /*  68 -- 10,     12a */
-    BMP_C(0x4acc0000) << (BMP_BIT - 32),    /*  69 -- 15,    2566 */
-    BMP_C(0x4b000000) << (BMP_BIT - 32),    /*  70 --  8,      4b */
-    BMP_C(0x4b370000) << (BMP_BIT - 32),    /*  71 -- 16,    4b37 */
-    BMP_C(0x4c000000) << (BMP_BIT - 32),    /*  72 --  6,      13 */
-    BMP_C(0x4c060000) << (BMP_BIT - 32),    /*  73 -- 16,    4c06 */
-    BMP_C(0x53000000) << (BMP_BIT - 32),    /*  74 --  8,      53 */
-    BMP_C(0x55000000) << (BMP_BIT - 32),    /*  75 --  8,      55 */
-    BMP_C(0x55555500) << (BMP_BIT - 32),    /*  76 -- 24,  555555 */
-    BMP_C(0x59350000) << (BMP_BIT - 32),    /*  77 -- 16,    5935 */
-    BMP_C(0x5d380000) << (BMP_BIT - 32),    /*  78 -- 16,    5d38 */
-    BMP_C(0x5d400000) << (BMP_BIT - 32),    /*  79 -- 10,     175 */
-    BMP_C(0x5d6dcb00) << (BMP_BIT - 32),    /*  80 -- 24,  5d6dcb */
-    BMP_C(0x60000000) << (BMP_BIT - 32),    /*  81 --  3,       3 */
-    BMP_C(0x60e00000) << (BMP_BIT - 32),    /*  82 -- 11,     307 */
-    BMP_C(0x63d00000) << (BMP_BIT - 32),    /*  83 -- 16,    63d0 */
-    BMP_C(0x64000000) << (BMP_BIT - 32),    /*  84 --  6,      19 */
-    BMP_C(0x66400000) << (BMP_BIT - 32),    /*  85 -- 10,     199 */
-    BMP_C(0x66c50000) << (BMP_BIT - 32),    /*  86 -- 16,    66c5 */
-    BMP_C(0x6f630000) << (BMP_BIT - 32),    /*  87 -- 16,    6f63 */
-    BMP_C(0x6f910000) << (BMP_BIT - 32),    /*  88 -- 16,    6f91 */
-    BMP_C(0x70000000) << (BMP_BIT - 32),    /*  89 --  4,       7 */
-    BMP_C(0x70a00000) << (BMP_BIT - 32),    /*  90 -- 11,     385 */
-    BMP_C(0x755b0000) << (BMP_BIT - 32),    /*  91 -- 16,    755b */
-    BMP_C(0x765e7680) << (BMP_BIT - 32),    /*  92 -- 32,765e7680 */
-    BMP_C(0x76c20800) << (BMP_BIT - 32),    /*  93 -- 32,  0ed841 */
-    BMP_C(0x7979bd00) << (BMP_BIT - 32),    /*  94 -- 24,  7979bd */
-    BMP_C(0x7e000000) << (BMP_BIT - 32),    /*  95 --  8,      7e */
-    BMP_C(0x80000000) << (BMP_BIT - 32),    /*  96 --  3,       4 */
-    BMP_C(0x80006300) << (BMP_BIT - 32),    /*  97 -- 24,  800063 */
-    BMP_C(0x80050000) << (BMP_BIT - 32),    /*  98 -- 16,    8005 */
-    BMP_C(0x800d0000) << (BMP_BIT - 32),    /*  99 -- 16,    800d */
-    BMP_C(0x800fe300) << (BMP_BIT - 32),    /* 100 -- 24,  800fe3 */
-    BMP_C(0x80b40000) << (BMP_BIT - 32),    /* 101 -- 14,    202d */
-    BMP_C(0x80c2e71c) << (BMP_BIT - 32),    /* 102 -- 30,2030b9c7 */
-    BMP_C(0x80f00000) << (BMP_BIT - 32),    /* 103 -- 12,     80f */
-    BMP_C(0x814141ab) << (BMP_BIT - 32),    /* 104 -- 32,814141ab */
-    BMP_C(0x8144c800) << (BMP_BIT - 32),    /* 105 -- 21,  102899 */
-    BMP_C(0x864cfb00) << (BMP_BIT - 32),    /* 106 -- 24,  864cfb */
-    BMP_C(0x87315576) << (BMP_BIT - 32),    /* 107 -- 32,87315576 */
-    BMP_C(0x89ec0000) << (BMP_BIT - 32),    /* 108 -- 16,    89ec */
-    BMP_C(0x8a000000) << (BMP_BIT - 32),    /* 109 --  7,      45 */
-    BMP_C(0x8b320000) << (BMP_BIT - 32),    /* 110 -- 15,    4599 */
-    BMP_C(0x8bb70000) << (BMP_BIT - 32),    /* 111 -- 16,    8bb7 */
-    BMP_C(0x8cc00000) << (BMP_BIT - 32),    /* 112 -- 10,     233 */
-    BMP_C(0x904cddbf) << (BMP_BIT - 32),    /* 113 -- 32,904cddbf */
-    BMP_C(0x906e0000) << (BMP_BIT - 32),    /* 114 -- 16,    906e */
-    BMP_C(0x94000000) << (BMP_BIT - 32),    /* 115 --  8,      94 */
-    BMP_C(0x97000000) << (BMP_BIT - 32),    /* 116 --  8,      97 */
-    BMP_C(0x98000000) << (BMP_BIT - 32),    /* 117 --  6,      26 */
-    BMP_C(0x9b000000) << (BMP_BIT - 32),    /* 118 --  8,      9b */
-    BMP_C(0x9c000000) << (BMP_BIT - 32),    /* 119 --  6,      27 */
-    BMP_C(0x9d5e4de2) << (BMP_BIT - 32),    /* 120 -- 31,4eaf26f1 */
-    BMP_C(0x9e000000) << (BMP_BIT - 32),    /* 121 --  7,      4f */
-    BMP_C(0x9ecf0000) << (BMP_BIT - 32),    /* 122 -- 16,    9ecf */
-    BMP_C(0xa0660000) << (BMP_BIT - 32),    /* 123 -- 16,    a066 */
-    BMP_C(0xa0970000) << (BMP_BIT - 32),    /* 124 -- 16,    a097 */
-    BMP_C(0xa1000000) << (BMP_BIT - 32),    /* 125 --  8,      a1 */
-    BMP_C(0xa3660000) << (BMP_BIT - 32),    /* 126 -- 16,    a366 */
-    BMP_C(0xa6000000) << (BMP_BIT - 32),    /* 127 --  7,      53 */
-    BMP_C(0xa7000000) << (BMP_BIT - 32),    /* 128 --  8,      a7 */
-    BMP_C(0xa8000000) << (BMP_BIT - 32),    /* 129 --  5,      15 */
-    BMP_C(0xa8190000) << (BMP_BIT - 32),    /* 130 -- 16,    a819 */
-    BMP_C(0xa833982b) << (BMP_BIT - 32),    /* 131 -- 32,a833982b */
-    BMP_C(0xabcdef00) << (BMP_BIT - 32),    /* 132 -- 24,  abcdef */
-    BMP_C(0xac000000) << (BMP_BIT - 32),    /* 133 --  8,      ac */
-    BMP_C(0xaee70000) << (BMP_BIT - 32),    /* 134 -- 16,    aee7 */
-    BMP_C(0xb0000000) << (BMP_BIT - 32),    /* 135 --  4,       b */
-    BMP_C(0xb0010000) << (BMP_BIT - 32),    /* 136 -- 16,    b001 */
-    BMP_C(0xb2aa0000) << (BMP_BIT - 32),    /* 137 -- 16,    b2aa */
-    BMP_C(0xb3400000) << (BMP_BIT - 32),    /* 138 -- 12,     b34 */
-    BMP_C(0xb42d8000) << (BMP_BIT - 32),    /* 139 -- 17,   1685b */
-    BMP_C(0xb4600000) << (BMP_BIT - 32),    /* 140 -- 11,     5a3 */
-    BMP_C(0xb4c80000) << (BMP_BIT - 32),    /* 141 -- 16,    b4c8 */
-    BMP_C(0xb4f3e600) << (BMP_BIT - 32),    /* 142 -- 24,  b4f3e6 */
-    BMP_C(0xb704ce00) << (BMP_BIT - 32),    /* 143 -- 24,  b704ce */
-    BMP_C(0xb798b438) << (BMP_BIT - 32),    /* 144 -- 32,b798b438 */
-    BMP_C(0xbb3d0000) << (BMP_BIT - 32),    /* 145 -- 16,    bb3d */
-    BMP_C(0xbc000000) << (BMP_BIT - 32),    /* 146 --  6,2f/ 8,bc */
-    BMP_C(0xbd0be338) << (BMP_BIT - 32),    /* 147 -- 32,bd0be338 */
-    BMP_C(0xbdf40000) << (BMP_BIT - 32),    /* 148 -- 16,    bdf4 */
-    BMP_C(0xbf050000) << (BMP_BIT - 32),    /* 149 -- 16,    bf05 */
-    BMP_C(0xc0000000) << (BMP_BIT - 32),    /* 150 --  3,       6 */
-    BMP_C(0xc2000000) << (BMP_BIT - 32),    /* 151 --  7,      61 */
-    BMP_C(0xc25a5600) << (BMP_BIT - 32),    /* 152 -- 24,  c25a56 */
-    BMP_C(0xc2b70000) << (BMP_BIT - 32),    /* 153 -- 16,    c2b7 */
-    BMP_C(0xc2b80000) << (BMP_BIT - 32),    /* 154 -- 14,    30ae */
-    BMP_C(0xc4000000) << (BMP_BIT - 32),    /* 155 --  8,      c4 */
-    BMP_C(0xc6c60000) << (BMP_BIT - 32),    /* 156 -- 16,    c6c6 */
-    BMP_C(0xc704dd7b) << (BMP_BIT - 32),    /* 157 -- 32,c704dd7b */
-    BMP_C(0xc8000000) << (BMP_BIT - 32),    /* 158 --  5,      19 */
-    BMP_C(0xc8670000) << (BMP_BIT - 32),    /* 159 -- 16,    c867 */
-    BMP_C(0xcbf43926) << (BMP_BIT - 32),    /* 160 -- 32,cbf43926 */
-    BMP_C(0xcde70300) << (BMP_BIT - 32),    /* 161 -- 24,  cde703 */
-    BMP_C(0xce3c0000) << (BMP_BIT - 32),    /* 162 -- 16,    ce3c */
-    BMP_C(0xd0000000) << (BMP_BIT - 32),    /* 163 --  8,      d0 */
-    BMP_C(0xd02a0000) << (BMP_BIT - 32),    /* 164 -- 15,    6815 */
-    BMP_C(0xd0db0000) << (BMP_BIT - 32),    /* 165 -- 16,    d0db */
-    BMP_C(0xd3100000) << (BMP_BIT - 32),    /* 166 -- 12,     d31 */
-    BMP_C(0xd3be9568) << (BMP_BIT - 32),    /* 167 -- 30,34efa55a */
-    BMP_C(0xd4d00000) << (BMP_BIT - 32),    /* 168 -- 12,     d4d */
-    BMP_C(0xd5000000) << (BMP_BIT - 32),    /* 169 --  8,      d5 */
-    BMP_C(0xd64e0000) << (BMP_BIT - 32),    /* 170 -- 16,    d64e */
-    BMP_C(0xda000000) << (BMP_BIT - 32),    /* 171 --  8,      da */
-    BMP_C(0xdaf00000) << (BMP_BIT - 32),    /* 172 -- 12,     daf */
-    BMP_C(0xdebb20e3) << (BMP_BIT - 32),    /* 173 -- 32,debb20e3 */
-    BMP_C(0xdf000000) << (BMP_BIT - 32),    /* 174 --  8,      df */
-    BMP_C(0xe0000000) << (BMP_BIT - 32),    /* 175 --  3,       7 */
-    BMP_C(0xe3069283) << (BMP_BIT - 32),    /* 176 -- 32,e3069283 */
-    BMP_C(0xe3940000) << (BMP_BIT - 32),    /* 177 -- 16,    e394 */
-    BMP_C(0xe5cc0000) << (BMP_BIT - 32),    /* 178 -- 16,    e5cc */
-    BMP_C(0xe7a80000) << (BMP_BIT - 32),    /* 179 -- 13,    1cf5 */
-    BMP_C(0xe8000000) << (BMP_BIT - 32),    /* 180 --  6,      3a */
-    BMP_C(0xea000000) << (BMP_BIT - 32),    /* 181 --  7,      75 */
-    BMP_C(0xea820000) << (BMP_BIT - 32),    /* 182 -- 16,    ea82 */
-    BMP_C(0xec000000) << (BMP_BIT - 32),    /* 183 --  6,      3b */
-    BMP_C(0xf0000000) << (BMP_BIT - 32),    /* 184 --  4,       f */
-    BMP_C(0xf0b80000) << (BMP_BIT - 32),    /* 185 -- 16,    f0b8 */
-    BMP_C(0xf1300000) << (BMP_BIT - 32),    /* 186 -- 12,     f13 */
-    BMP_C(0xf4000000) << (BMP_BIT - 32),    /* 187 --  8,      f4 */
-    BMP_C(0xf4acfb13) << (BMP_BIT - 32),    /* 188 -- 32,f4acfb13 */
-    BMP_C(0xf5b00000) << (BMP_BIT - 32),    /* 189 -- 12,     f5b */
-    BMP_C(0xf6400000) << (BMP_BIT - 32),    /* 190 -- 10,     3d9 */
-    BMP_C(0xf7000000) << (BMP_BIT - 32),    /* 191 --  8,      f7 */
-    BMP_C(0xf8000000) << (BMP_BIT - 32),    /* 192 --  5,      1f */
-    BMP_C(0xfc000000) << (BMP_BIT - 32),    /* 193 --  6,      3f */
-    BMP_C(0xfc891918) << (BMP_BIT - 32),    /* 194 -- 32,fc891918 */
-    BMP_C(0xfd000000) << (BMP_BIT - 32),    /* 195 --  8,      fd */
-    BMP_C(0xfe000000) << (BMP_BIT - 32),    /* 196 --  7,      7f */
-    BMP_C(0xfedcba00) << (BMP_BIT - 32),    /* 197 -- 24,  fedcba */
-    BMP_C(0xfee80000) << (BMP_BIT - 32),    /* 198 -- 16,    fee8 */
-    BMP_C(0xff000000) << (BMP_BIT - 32),    /* 199 --  8,      ff */
-    BMP_C(0xffc00000) << (BMP_BIT - 32),    /* 200 -- 10,     3ff */
-    BMP_C(0xfff00000) << (BMP_BIT - 32),    /* 201 -- 12,     fff */
-    BMP_C(0xfffc0000) << (BMP_BIT - 32),    /* 202 -- 14,    3fff */
-    BMP_C(0xffff0000) << (BMP_BIT - 32),    /* 203 -- 16,    ffff */
-    BMP_C(0xffffff00) << (BMP_BIT - 32),    /* 204 -- 24,  ffffff */
-    BMP_C(0xfffffffc) << (BMP_BIT - 32),    /* 205 -- 30,3fffffff */
-    BMP_C(0xfffffffe) << (BMP_BIT - 32),    /* 206 -- 31,7fffffff */
-    BMP_C(0xffffffff) << (BMP_BIT - 32),    /* 207 -- 32,ffffffff */
+                      BMP_C(0x00010000) << (BMP_BIT - 32),    /*   1 -- 16,    0001 */
+                      BMP_C(0x00020000) << (BMP_BIT - 32),    /*   2 -- 15,    0001 */
+                      BMP_C(0x00065b00) << (BMP_BIT - 32),    /*   3 -- 24,  00065b */
+                      BMP_C(0x007e0000) << (BMP_BIT - 32),    /*   4 -- 16,    007e */
+                      BMP_C(0x007f0000) << (BMP_BIT - 32),    /*   5 -- 16,    007f */
+                      BMP_C(0x03400000) << (BMP_BIT - 32),    /*   6 -- 11,     01a */
+                      BMP_C(0x0376e6e7) << (BMP_BIT - 32),    /*   7 -- 32,0376e6e7 */
+                      BMP_C(0x04c11db7) << (BMP_BIT - 32),    /*   8 -- 32,04c11db7 */
+                      BMP_C(0x05890000) << (BMP_BIT - 32),    /*   9 -- 16,    0589 */
+                      BMP_C(0x07000000) << (BMP_BIT - 32),    /*  10 --  8,      07 */
+                      BMP_C(0x080b0000) << (BMP_BIT - 32),    /*  11 -- 16,    080b */
+                      BMP_C(0x09823b6e) << (BMP_BIT - 32),    /*  12 -- 31,04c11db7 */
+                      BMP_C(0x0b3c0000) << (BMP_BIT - 32),    /*  13 -- 15,    059e */
+                      BMP_C(0x0c000000) << (BMP_BIT - 32),    /*  14 --  6,      03 */
+                      BMP_C(0x0c200000) << (BMP_BIT - 32),    /*  15 -- 11,     061 */
+                      BMP_C(0x0c780000) << (BMP_BIT - 32),    /*  16 -- 14,    031e */
+                      BMP_C(0x0fb30000) << (BMP_BIT - 32),    /*  17 -- 16,    0fb3 */
+                      BMP_C(0x10210000) << (BMP_BIT - 32),    /*  18 -- 16,    1021 */
+                      BMP_C(0x12000000) << (BMP_BIT - 32),    /*  19 --  7,      09 */
+                      BMP_C(0x130d2afc) << (BMP_BIT - 32),    /*  20 -- 30,04c34abf */
+                      BMP_C(0x144e6300) << (BMP_BIT - 32),    /*  21 -- 24,  144e63 */
+                      BMP_C(0x15000000) << (BMP_BIT - 32),    /*  22 --  8,      15 */
+                      BMP_C(0x1697d06a) << (BMP_BIT - 32),    /*  23 -- 32,1697d06a */
+                      BMP_C(0x17800000) << (BMP_BIT - 32),    /*  24 -- 12,     178 */
+                      BMP_C(0x18000000) << (BMP_BIT - 32),    /*  25 --  6,      06 */
+                      BMP_C(0x19d3c8d8) << (BMP_BIT - 32),    /*  26 -- 31,0ce9e46c */
+                      BMP_C(0x1c000000) << (BMP_BIT - 32),    /*  27 --  6,      07 */
+                      BMP_C(0x1d000000) << (BMP_BIT - 32),    /*  28 --  8,      1d */
+                      BMP_C(0x1d0f0000) << (BMP_BIT - 32),    /*  29 -- 16,    1d0f */
+                      BMP_C(0x1dcf0000) << (BMP_BIT - 32),    /*  30 -- 16,    1dcf */
+                      BMP_C(0x1edc6f41) << (BMP_BIT - 32),    /*  31 -- 32,1edc6f41 */
+                      BMP_C(0x1f23b800) << (BMP_BIT - 32),    /*  32 -- 24,  1f23b8 */
+                      BMP_C(0x20000000) << (BMP_BIT - 32),    /*  33 --  4,       2 */
+                      BMP_C(0x200fa500) << (BMP_BIT - 32),    /*  34 -- 24,  200fa5 */
+                      BMP_C(0x20140000) << (BMP_BIT - 32),    /*  35 -- 14,    0805 */
+                      BMP_C(0x20b40000) << (BMP_BIT - 32),    /*  36 -- 14,    082d */
+                      BMP_C(0x20fe0000) << (BMP_BIT - 32),    /*  37 -- 16,    20fe */
+                      BMP_C(0x21890000) << (BMP_BIT - 32),    /*  38 -- 16,    2189 */
+                      BMP_C(0x21cf0200) << (BMP_BIT - 32),    /*  39 -- 24,  21cf02 */
+                      BMP_C(0x23ef5200) << (BMP_BIT - 32),    /*  40 -- 24,  23ef52 */
+                      BMP_C(0x25000000) << (BMP_BIT - 32),    /*  41 --  8,      25 */
+                      BMP_C(0x26000000) << (BMP_BIT - 32),    /*  42 --  8,      26 */
+                      BMP_C(0x26b10000) << (BMP_BIT - 32),    /*  43 -- 16,    26b1 */
+                      BMP_C(0x27818000) << (BMP_BIT - 32),    /*  44 -- 17,   04f03 */
+                      BMP_C(0x27d00000) << (BMP_BIT - 32),    /*  45 -- 13,    04fa */
+                      BMP_C(0x28000000) << (BMP_BIT - 32),    /*  46 --  5,      05 */
+                      BMP_C(0x29b10000) << (BMP_BIT - 32),    /*  47 -- 16,    29b1 */
+                      BMP_C(0x2f000000) << (BMP_BIT - 32),    /*  48 --  8,      2f */
+                      BMP_C(0x30000000) << (BMP_BIT - 32),    /*  49 --  4, 3/ 5, 6 */
+                      BMP_C(0x3010bf7f) << (BMP_BIT - 32),    /*  50 -- 32,3010bf7f */
+                      BMP_C(0x31000000) << (BMP_BIT - 32),    /*  51 --  8,      31 */
+                      BMP_C(0x31800000) << (BMP_BIT - 32),    /*  52 -- 10,     0c6 */
+                      BMP_C(0x31c30000) << (BMP_BIT - 32),    /*  53 -- 16,    31c3 */
+                      BMP_C(0x328b6300) << (BMP_BIT - 32),    /*  54 -- 24,  328b63 */
+                      BMP_C(0x34000000) << (BMP_BIT - 32),    /*  55 --  6,      0d */
+                      BMP_C(0x340bc6d9) << (BMP_BIT - 32),    /*  56 -- 32,340bc6d9 */
+                      BMP_C(0x37000000) << (BMP_BIT - 32),    /*  57 --  8,      37 */
+                      BMP_C(0x38000000) << (BMP_BIT - 32),    /*  58 --  5,      07 */
+                      BMP_C(0x39000000) << (BMP_BIT - 32),    /*  59 --  8,      39 */
+                      BMP_C(0x3d650000) << (BMP_BIT - 32),    /*  60 -- 16,    3d65 */
+                      BMP_C(0x3e000000) << (BMP_BIT - 32),    /*  61 --  8,      3e */
+                      BMP_C(0x40000000) << (BMP_BIT - 32),    /*  62 --  3,       2 */
+                      BMP_C(0x42000000) << (BMP_BIT - 32),    /*  63 --  8,      42 */
+                      BMP_C(0x44c20000) << (BMP_BIT - 32),    /*  64 -- 16,    44c2 */
+                      BMP_C(0x45270551) << (BMP_BIT - 32),    /*  65 -- 32,45270551 */
+                      BMP_C(0x48000000) << (BMP_BIT - 32),    /*  66 --  5,      09 */
+                      BMP_C(0x49000000) << (BMP_BIT - 32),    /*  67 --  8,      49 */
+                      BMP_C(0x4a800000) << (BMP_BIT - 32),    /*  68 -- 10,     12a */
+                      BMP_C(0x4acc0000) << (BMP_BIT - 32),    /*  69 -- 15,    2566 */
+                      BMP_C(0x4b000000) << (BMP_BIT - 32),    /*  70 --  8,      4b */
+                      BMP_C(0x4b370000) << (BMP_BIT - 32),    /*  71 -- 16,    4b37 */
+                      BMP_C(0x4c000000) << (BMP_BIT - 32),    /*  72 --  6,      13 */
+                      BMP_C(0x4c060000) << (BMP_BIT - 32),    /*  73 -- 16,    4c06 */
+                      BMP_C(0x53000000) << (BMP_BIT - 32),    /*  74 --  8,      53 */
+                      BMP_C(0x55000000) << (BMP_BIT - 32),    /*  75 --  8,      55 */
+                      BMP_C(0x55555500) << (BMP_BIT - 32),    /*  76 -- 24,  555555 */
+                      BMP_C(0x59350000) << (BMP_BIT - 32),    /*  77 -- 16,    5935 */
+                      BMP_C(0x5d380000) << (BMP_BIT - 32),    /*  78 -- 16,    5d38 */
+                      BMP_C(0x5d400000) << (BMP_BIT - 32),    /*  79 -- 10,     175 */
+                      BMP_C(0x5d6dcb00) << (BMP_BIT - 32),    /*  80 -- 24,  5d6dcb */
+                      BMP_C(0x60000000) << (BMP_BIT - 32),    /*  81 --  3,       3 */
+                      BMP_C(0x60e00000) << (BMP_BIT - 32),    /*  82 -- 11,     307 */
+                      BMP_C(0x63d00000) << (BMP_BIT - 32),    /*  83 -- 16,    63d0 */
+                      BMP_C(0x64000000) << (BMP_BIT - 32),    /*  84 --  6,      19 */
+                      BMP_C(0x66400000) << (BMP_BIT - 32),    /*  85 -- 10,     199 */
+                      BMP_C(0x66c50000) << (BMP_BIT - 32),    /*  86 -- 16,    66c5 */
+                      BMP_C(0x6f630000) << (BMP_BIT - 32),    /*  87 -- 16,    6f63 */
+                      BMP_C(0x6f910000) << (BMP_BIT - 32),    /*  88 -- 16,    6f91 */
+                      BMP_C(0x70000000) << (BMP_BIT - 32),    /*  89 --  4,       7 */
+                      BMP_C(0x70a00000) << (BMP_BIT - 32),    /*  90 -- 11,     385 */
+                      BMP_C(0x755b0000) << (BMP_BIT - 32),    /*  91 -- 16,    755b */
+                      BMP_C(0x765e7680) << (BMP_BIT - 32),    /*  92 -- 32,765e7680 */
+                      BMP_C(0x76c20800) << (BMP_BIT - 32),    /*  93 -- 32,  0ed841 */
+                      BMP_C(0x7979bd00) << (BMP_BIT - 32),    /*  94 -- 24,  7979bd */
+                      BMP_C(0x7e000000) << (BMP_BIT - 32),    /*  95 --  8,      7e */
+                      BMP_C(0x80000000) << (BMP_BIT - 32),    /*  96 --  3,       4 */
+                      BMP_C(0x80006300) << (BMP_BIT - 32),    /*  97 -- 24,  800063 */
+                      BMP_C(0x80050000) << (BMP_BIT - 32),    /*  98 -- 16,    8005 */
+                      BMP_C(0x800d0000) << (BMP_BIT - 32),    /*  99 -- 16,    800d */
+                      BMP_C(0x800fe300) << (BMP_BIT - 32),    /* 100 -- 24,  800fe3 */
+                      BMP_C(0x80b40000) << (BMP_BIT - 32),    /* 101 -- 14,    202d */
+                      BMP_C(0x80c2e71c) << (BMP_BIT - 32),    /* 102 -- 30,2030b9c7 */
+                      BMP_C(0x80f00000) << (BMP_BIT - 32),    /* 103 -- 12,     80f */
+                      BMP_C(0x814141ab) << (BMP_BIT - 32),    /* 104 -- 32,814141ab */
+                      BMP_C(0x8144c800) << (BMP_BIT - 32),    /* 105 -- 21,  102899 */
+                      BMP_C(0x864cfb00) << (BMP_BIT - 32),    /* 106 -- 24,  864cfb */
+                      BMP_C(0x87315576) << (BMP_BIT - 32),    /* 107 -- 32,87315576 */
+                      BMP_C(0x89ec0000) << (BMP_BIT - 32),    /* 108 -- 16,    89ec */
+                      BMP_C(0x8a000000) << (BMP_BIT - 32),    /* 109 --  7,      45 */
+                      BMP_C(0x8b320000) << (BMP_BIT - 32),    /* 110 -- 15,    4599 */
+                      BMP_C(0x8bb70000) << (BMP_BIT - 32),    /* 111 -- 16,    8bb7 */
+                      BMP_C(0x8cc00000) << (BMP_BIT - 32),    /* 112 -- 10,     233 */
+                      BMP_C(0x904cddbf) << (BMP_BIT - 32),    /* 113 -- 32,904cddbf */
+                      BMP_C(0x906e0000) << (BMP_BIT - 32),    /* 114 -- 16,    906e */
+                      BMP_C(0x94000000) << (BMP_BIT - 32),    /* 115 --  8,      94 */
+                      BMP_C(0x97000000) << (BMP_BIT - 32),    /* 116 --  8,      97 */
+                      BMP_C(0x98000000) << (BMP_BIT - 32),    /* 117 --  6,      26 */
+                      BMP_C(0x9b000000) << (BMP_BIT - 32),    /* 118 --  8,      9b */
+                      BMP_C(0x9c000000) << (BMP_BIT - 32),    /* 119 --  6,      27 */
+                      BMP_C(0x9d5e4de2) << (BMP_BIT - 32),    /* 120 -- 31,4eaf26f1 */
+                      BMP_C(0x9e000000) << (BMP_BIT - 32),    /* 121 --  7,      4f */
+                      BMP_C(0x9ecf0000) << (BMP_BIT - 32),    /* 122 -- 16,    9ecf */
+                      BMP_C(0xa0660000) << (BMP_BIT - 32),    /* 123 -- 16,    a066 */
+                      BMP_C(0xa0970000) << (BMP_BIT - 32),    /* 124 -- 16,    a097 */
+                      BMP_C(0xa1000000) << (BMP_BIT - 32),    /* 125 --  8,      a1 */
+                      BMP_C(0xa3660000) << (BMP_BIT - 32),    /* 126 -- 16,    a366 */
+                      BMP_C(0xa6000000) << (BMP_BIT - 32),    /* 127 --  7,      53 */
+                      BMP_C(0xa7000000) << (BMP_BIT - 32),    /* 128 --  8,      a7 */
+                      BMP_C(0xa8000000) << (BMP_BIT - 32),    /* 129 --  5,      15 */
+                      BMP_C(0xa8190000) << (BMP_BIT - 32),    /* 130 -- 16,    a819 */
+                      BMP_C(0xa833982b) << (BMP_BIT - 32),    /* 131 -- 32,a833982b */
+                      BMP_C(0xabcdef00) << (BMP_BIT - 32),    /* 132 -- 24,  abcdef */
+                      BMP_C(0xac000000) << (BMP_BIT - 32),    /* 133 --  8,      ac */
+                      BMP_C(0xaee70000) << (BMP_BIT - 32),    /* 134 -- 16,    aee7 */
+                      BMP_C(0xb0000000) << (BMP_BIT - 32),    /* 135 --  4,       b */
+                      BMP_C(0xb0010000) << (BMP_BIT - 32),    /* 136 -- 16,    b001 */
+                      BMP_C(0xb2aa0000) << (BMP_BIT - 32),    /* 137 -- 16,    b2aa */
+                      BMP_C(0xb3400000) << (BMP_BIT - 32),    /* 138 -- 12,     b34 */
+                      BMP_C(0xb42d8000) << (BMP_BIT - 32),    /* 139 -- 17,   1685b */
+                      BMP_C(0xb4600000) << (BMP_BIT - 32),    /* 140 -- 11,     5a3 */
+                      BMP_C(0xb4c80000) << (BMP_BIT - 32),    /* 141 -- 16,    b4c8 */
+                      BMP_C(0xb4f3e600) << (BMP_BIT - 32),    /* 142 -- 24,  b4f3e6 */
+                      BMP_C(0xb704ce00) << (BMP_BIT - 32),    /* 143 -- 24,  b704ce */
+                      BMP_C(0xb798b438) << (BMP_BIT - 32),    /* 144 -- 32,b798b438 */
+                      BMP_C(0xbb3d0000) << (BMP_BIT - 32),    /* 145 -- 16,    bb3d */
+                      BMP_C(0xbc000000) << (BMP_BIT - 32),    /* 146 --  6,2f/ 8,bc */
+                      BMP_C(0xbd0be338) << (BMP_BIT - 32),    /* 147 -- 32,bd0be338 */
+                      BMP_C(0xbdf40000) << (BMP_BIT - 32),    /* 148 -- 16,    bdf4 */
+                      BMP_C(0xbf050000) << (BMP_BIT - 32),    /* 149 -- 16,    bf05 */
+                      BMP_C(0xc0000000) << (BMP_BIT - 32),    /* 150 --  3,       6 */
+                      BMP_C(0xc2000000) << (BMP_BIT - 32),    /* 151 --  7,      61 */
+                      BMP_C(0xc25a5600) << (BMP_BIT - 32),    /* 152 -- 24,  c25a56 */
+                      BMP_C(0xc2b70000) << (BMP_BIT - 32),    /* 153 -- 16,    c2b7 */
+                      BMP_C(0xc2b80000) << (BMP_BIT - 32),    /* 154 -- 14,    30ae */
+                      BMP_C(0xc4000000) << (BMP_BIT - 32),    /* 155 --  8,      c4 */
+                      BMP_C(0xc6c60000) << (BMP_BIT - 32),    /* 156 -- 16,    c6c6 */
+                      BMP_C(0xc704dd7b) << (BMP_BIT - 32),    /* 157 -- 32,c704dd7b */
+                      BMP_C(0xc8000000) << (BMP_BIT - 32),    /* 158 --  5,      19 */
+                      BMP_C(0xc8670000) << (BMP_BIT - 32),    /* 159 -- 16,    c867 */
+                      BMP_C(0xcbf43926) << (BMP_BIT - 32),    /* 160 -- 32,cbf43926 */
+                      BMP_C(0xcde70300) << (BMP_BIT - 32),    /* 161 -- 24,  cde703 */
+                      BMP_C(0xce3c0000) << (BMP_BIT - 32),    /* 162 -- 16,    ce3c */
+                      BMP_C(0xd0000000) << (BMP_BIT - 32),    /* 163 --  8,      d0 */
+                      BMP_C(0xd02a0000) << (BMP_BIT - 32),    /* 164 -- 15,    6815 */
+                      BMP_C(0xd0db0000) << (BMP_BIT - 32),    /* 165 -- 16,    d0db */
+                      BMP_C(0xd3100000) << (BMP_BIT - 32),    /* 166 -- 12,     d31 */
+                      BMP_C(0xd3be9568) << (BMP_BIT - 32),    /* 167 -- 30,34efa55a */
+                      BMP_C(0xd4d00000) << (BMP_BIT - 32),    /* 168 -- 12,     d4d */
+                      BMP_C(0xd5000000) << (BMP_BIT - 32),    /* 169 --  8,      d5 */
+                      BMP_C(0xd64e0000) << (BMP_BIT - 32),    /* 170 -- 16,    d64e */
+                      BMP_C(0xda000000) << (BMP_BIT - 32),    /* 171 --  8,      da */
+                      BMP_C(0xdaf00000) << (BMP_BIT - 32),    /* 172 -- 12,     daf */
+                      BMP_C(0xdebb20e3) << (BMP_BIT - 32),    /* 173 -- 32,debb20e3 */
+                      BMP_C(0xdf000000) << (BMP_BIT - 32),    /* 174 --  8,      df */
+                      BMP_C(0xe0000000) << (BMP_BIT - 32),    /* 175 --  3,       7 */
+                      BMP_C(0xe3069283) << (BMP_BIT - 32),    /* 176 -- 32,e3069283 */
+                      BMP_C(0xe3940000) << (BMP_BIT - 32),    /* 177 -- 16,    e394 */
+                      BMP_C(0xe5cc0000) << (BMP_BIT - 32),    /* 178 -- 16,    e5cc */
+                      BMP_C(0xe7a80000) << (BMP_BIT - 32),    /* 179 -- 13,    1cf5 */
+                      BMP_C(0xe8000000) << (BMP_BIT - 32),    /* 180 --  6,      3a */
+                      BMP_C(0xea000000) << (BMP_BIT - 32),    /* 181 --  7,      75 */
+                      BMP_C(0xea820000) << (BMP_BIT - 32),    /* 182 -- 16,    ea82 */
+                      BMP_C(0xec000000) << (BMP_BIT - 32),    /* 183 --  6,      3b */
+                      BMP_C(0xf0000000) << (BMP_BIT - 32),    /* 184 --  4,       f */
+                      BMP_C(0xf0b80000) << (BMP_BIT - 32),    /* 185 -- 16,    f0b8 */
+                      BMP_C(0xf1300000) << (BMP_BIT - 32),    /* 186 -- 12,     f13 */
+                      BMP_C(0xf4000000) << (BMP_BIT - 32),    /* 187 --  8,      f4 */
+                      BMP_C(0xf4acfb13) << (BMP_BIT - 32),    /* 188 -- 32,f4acfb13 */
+                      BMP_C(0xf5b00000) << (BMP_BIT - 32),    /* 189 -- 12,     f5b */
+                      BMP_C(0xf6400000) << (BMP_BIT - 32),    /* 190 -- 10,     3d9 */
+                      BMP_C(0xf7000000) << (BMP_BIT - 32),    /* 191 --  8,      f7 */
+                      BMP_C(0xf8000000) << (BMP_BIT - 32),    /* 192 --  5,      1f */
+                      BMP_C(0xfc000000) << (BMP_BIT - 32),    /* 193 --  6,      3f */
+                      BMP_C(0xfc891918) << (BMP_BIT - 32),    /* 194 -- 32,fc891918 */
+                      BMP_C(0xfd000000) << (BMP_BIT - 32),    /* 195 --  8,      fd */
+                      BMP_C(0xfe000000) << (BMP_BIT - 32),    /* 196 --  7,      7f */
+                      BMP_C(0xfedcba00) << (BMP_BIT - 32),    /* 197 -- 24,  fedcba */
+                      BMP_C(0xfee80000) << (BMP_BIT - 32),    /* 198 -- 16,    fee8 */
+                      BMP_C(0xff000000) << (BMP_BIT - 32),    /* 199 --  8,      ff */
+                      BMP_C(0xffc00000) << (BMP_BIT - 32),    /* 200 -- 10,     3ff */
+                      BMP_C(0xfff00000) << (BMP_BIT - 32),    /* 201 -- 12,     fff */
+                      BMP_C(0xfffc0000) << (BMP_BIT - 32),    /* 202 -- 14,    3fff */
+                      BMP_C(0xffff0000) << (BMP_BIT - 32),    /* 203 -- 16,    ffff */
+                      BMP_C(0xffffff00) << (BMP_BIT - 32),    /* 204 -- 24,  ffffff */
+                      BMP_C(0xfffffffc) << (BMP_BIT - 32),    /* 205 -- 30,3fffffff */
+                      BMP_C(0xfffffffe) << (BMP_BIT - 32),    /* 206 -- 31,7fffffff */
+                      BMP_C(0xffffffff) << (BMP_BIT - 32),    /* 207 -- 32,ffffffff */
 };
 
 static const struct malias aliases[];
@@ -476,294 +476,294 @@ static const struct malias aliases[];
  * Sorted by left-justified polynomial for bsearch().
  */
 static const struct mpreset models[] = {
-    {64UL, b64,     b64a,    P_LE   | P_CONFIR, b64a,    b64b,    b64c,    aliases+130},    /*   0 */
-    {32UL, b32+  0, 0,       P_BE   | P_CONFIR, 0,       b32+147, 0,       aliases+107},    /*   1 */
-    {40UL, b40,     0,       P_BE   | P_ACADEM, b40a,    b40b,    b40c,    aliases+115},    /*   2 */
-    {24UL, b32+  3, b32+ 76, P_LE   | P_ATTEST, 0,       b32+152, 0,       aliases+ 77},    /*   3 */
-    {32UL, b32+  8, 0,       P_BE   | P_ATTEST, b32+207, b32+ 92, b32+157, aliases+ 98},    /*   4 */
-    {32UL, b32+  8, b32+207, P_BE   | P_ATTEST, 0,       b32+  7, 0,       aliases+104},    /*   5 */
-    {32UL, b32+  8, b32+207, P_BE   | P_ATTEST, b32+207, b32+194, b32+157, aliases+ 96},    /*   6 */
-    {32UL, b32+  8, b32+207, P_LE   | P_CONFIR, 0,       b32+ 56, 0,       aliases+103},    /*   7 */
-    {32UL, b32+  8, b32+207, P_LE   | P_ATTEST, b32+207, b32+160, b32+173, aliases+102},    /*   8 */
-    {16UL, b32+  9, 0,       P_BE   | P_ATTEST, 0,       b32+  5, 0,       aliases+ 36},    /*   9 */
-    {16UL, b32+  9, 0,       P_BE   | P_ATTEST, b32+  1, b32+  4, b32+  9, aliases+ 35},    /*  10 */
-    { 8UL, b32+ 10, 0,       P_BE   | P_ATTEST, 0,       b32+187, 0,       aliases+157},    /*  11 */
-    { 8UL, b32+ 10, 0,       P_BE   | P_ACADEM, b32+ 75, b32+125, b32+133, aliases+147},    /*  12 */
-    { 8UL, b32+ 10, b32+199, P_LE   | P_ACADEM, 0,       b32+163, 0,       aliases+155},    /*  13 */
-    {16UL, b32+ 11, b32+203, P_LE   | P_ATTEST, 0,       b32+123, 0,       aliases+ 58},    /*  14 */
-    {31UL, b32+ 12, b32+206, P_BE   | P_CONFIR, b32+206, b32+ 26, b32+120, aliases+ 88},    /*  15 */
-    { 6UL, b32+ 14, 0,       P_LE   | P_ACADEM, 0,       b32+ 25, 0,       aliases+124},    /*  16 */
-    {82UL, b82,     0,       P_LE   | P_ATTEST, 0,       b82a,    0,       aliases+160},    /*  17 */
-    {16UL, b32+ 18, 0,       P_BE   | P_ATTEST, 0,       b32+ 53, 0,       aliases+ 73},    /*  18 */
-    {16UL, b32+ 18, 0,       P_BE   | P_ACADEM, b32+203, b32+162, b32+ 29, aliases+ 42},    /*  19 */
-    {16UL, b32+ 18, 0,       P_LE   | P_ATTEST, 0,       b32+ 38, 0,       aliases+ 50},    /*  20 */
-    {16UL, b32+ 18, b32+ 29, P_BE   | P_ATTEST, 0,       b32+178, 0,       aliases+ 63},    /*  21 */
-    {16UL, b32+ 18, b32+108, P_LE   | P_ATTEST, 0,       b32+ 43, 0,       aliases+ 66},    /*  22 */
-    {16UL, b32+ 18, b32+137, P_LE   | P_THIRDP, 0,       b32+ 83, 0,       aliases+ 62},    /*  23 */
-    {16UL, b32+ 18, b32+156, P_LE   | P_ATTEST, 0,       b32+149, 0,       aliases+ 48},    /*  24 */
-    {16UL, b32+ 18, b32+203, P_BE   | P_ATTEST, 0,       b32+ 47, 0,       aliases+ 44},    /*  25 */
-    {16UL, b32+ 18, b32+203, P_BE   | P_ATTEST, b32+203, b32+170, b32+ 29, aliases+ 41},    /*  26 */
-    {16UL, b32+ 18, b32+203, P_LE   | P_ATTEST, 0,       b32+ 88, 0,       aliases+ 56},    /*  27 */
-    {16UL, b32+ 18, b32+203, P_LE   | P_ATTEST, b32+203, b32+114, b32+185, aliases+ 45},    /*  28 */
-    { 7UL, b32+ 19, 0,       P_BE   | P_ACADEM, 0,       b32+181, 0,       aliases+134},    /*  29 */
-    { 6UL, b32+ 27, b32+193, P_BE   | P_ACADEM, 0,       b32+183, 0,       aliases+122},    /*  30 */
-    { 8UL, b32+ 28, 0,       P_BE   | P_ACADEM, 0,       b32+ 57, 0,       aliases+145},    /*  31 */
-    { 8UL, b32+ 28, b32+195, P_BE   | P_ATTEST, 0,       b32+ 95, 0,       aliases+148},    /*  32 */
-    { 8UL, b32+ 28, b32+199, P_BE   | P_ATTEST, b32+199, b32+ 70, b32+155, aliases+156},    /*  33 */
-    { 8UL, b32+ 28, b32+199, P_LE   | P_ATTEST, 0,       b32+116, 0,       aliases+158},    /*  34 */
-    {16UL, b32+ 30, b32+203, P_BE   | P_ATTEST, b32+203, b32+130, b32+177, aliases+ 61},    /*  35 */
-    {32UL, b32+ 31, b32+207, P_LE   | P_ATTEST, b32+207, b32+176, b32+144, aliases+101},    /*  36 */
-    {14UL, b32+ 35, 0,       P_LE   | P_ATTEST, 0,       b32+ 36, 0,       aliases+ 17},    /*  37 */
-    { 5UL, b32+ 46, b32+192, P_LE   | P_THIRDP, b32+192, b32+158, b32+ 49, aliases+120},    /*  38 */
-    { 8UL, b32+ 48, 0,       P_BE   | P_ATTEST, 0,       b32+ 61, 0,       aliases+154},    /*  39 */
-    { 8UL, b32+ 48, b32+199, P_BE   | P_ATTEST, b32+199, b32+174, b32+ 63, aliases+139},    /*  40 */
-    { 4UL, b32+ 49, 0,       P_LE   | P_ACADEM, 0,       b32+ 89, 0,       aliases+112},    /*  41 */
-    { 4UL, b32+ 49, b32+184, P_BE   | P_ACADEM, b32+184, b32+135, b32+ 33, aliases+113},    /*  42 */
-    { 8UL, b32+ 51, 0,       P_LE   | P_ATTEST, 0,       b32+125, 0,       aliases+152},    /*  43 */
-    { 8UL, b32+ 51, b32+199, P_BE   | P_ATTEST, 0,       b32+191, 0,       aliases+153},    /*  44 */
-    {24UL, b32+ 54, b32+204, P_BE   | P_ACADEM, b32+204, b32+142, b32+ 21, aliases+ 80},    /*  45 */
-    { 8UL, b32+ 59, 0,       P_LE   | P_ATTEST, 0,       b32+ 22, 0,       aliases+142},    /*  46 */
-    {16UL, b32+ 60, 0,       P_BE   | P_CONFIR, b32+203, b32+153, b32+126, aliases+ 38},    /*  47 */
-    {16UL, b32+ 60, 0,       P_LE   | P_CONFIR, b32+203, b32+182, b32+ 86, aliases+ 37},    /*  48 */
-    {64UL, b64d,    0,       P_BE   | P_ACADEM, 0,       b64e,    0,       aliases+128},    /*  49 */
-    {64UL, b64d,    b64a,    P_BE   | P_CONFIR, b64a,    b64f,    b64g,    aliases+131},    /*  50 */
-    {64UL, b64d,    b64a,    P_LE   | P_ATTEST, b64a,    b64h,    b64i,    aliases+132},    /*  51 */
-    { 5UL, b32+ 66, b32+ 66, P_BE   | P_ATTEST, 0,       0,       0,       aliases+117},    /*  52 */
-    { 8UL, b32+ 67, 0,       P_BE   | P_ACADEM, b32+199, b32+115, b32+ 74, aliases+146},    /*  53 */
-    {16UL, b32+ 77, 0,       P_BE   | P_ATTEST, 0,       b32+ 78, 0,       aliases+ 59},    /*  54 */
-    {10UL, b32+ 79, 0,       P_BE   | P_ACADEM, b32+200, b32+ 68, b32+ 52, aliases+  6},    /*  55 */
-    {24UL, b32+ 80, b32+132, P_BE   | P_ATTEST, 0,       b32+ 32, 0,       aliases+ 79},    /*  56 */
-    {24UL, b32+ 80, b32+197, P_BE   | P_ATTEST, 0,       b32+ 94, 0,       aliases+ 78},    /*  57 */
-    { 3UL, b32+ 81, 0,       P_BE   | P_ACADEM, b32+175, b32+ 96, b32+ 62, aliases+ 85},    /*  58 */
-    { 3UL, b32+ 81, b32+175, P_LE   | P_ACADEM, 0,       b32+150, 0,       aliases+ 86},    /*  59 */
-    {11UL, b32+ 82, 0,       P_BE   | P_ACADEM, 0,       b32+ 15, 0,       aliases+ 10},    /*  60 */
-    { 6UL, b32+ 84, 0,       P_LE   | P_ATTEST, 0,       b32+117, 0,       aliases+123},    /*  61 */
-    {16UL, b32+ 87, 0,       P_BE   | P_THIRDP, 0,       b32+148, 0,       aliases+ 52},    /*  62 */
-    {11UL, b32+ 90, b32+  6, P_BE   | P_ATTEST, 0,       b32+140, 0,       aliases+  9},    /*  63 */
-    {16UL, b32+ 91, 0,       P_BE   | P_ATTEST, 0,       b32+ 37, 0,       aliases+ 60},    /*  64 */
-    {24UL, b32+ 97, 0,       P_BE   | P_ACADEM, 0,       b32+ 40, 0,       aliases+ 82},    /*  65 */
-    {24UL, b32+ 97, b32+204, P_BE   | P_ATTEST, b32+204, b32+ 34, b32+100, aliases+ 84},    /*  66 */
-    {16UL, b32+ 98, 0,       P_BE   | P_ATTEST, 0,       b32+198, 0,       aliases+ 67},    /*  67 */
-    {16UL, b32+ 98, 0,       P_LE   | P_CONFIR, 0,       b32+145, 0,       aliases+ 24},    /*  68 */
-    {16UL, b32+ 98, 0,       P_LE   | P_ATTEST, b32+203, b32+ 64, b32+136, aliases+ 55},    /*  69 */
-    {16UL, b32+ 98, b32+ 99, P_BE   | P_ATTEST, 0,       b32+122, 0,       aliases+ 34},    /*  70 */
-    {16UL, b32+ 98, b32+203, P_BE   | P_THIRDP, 0,       b32+134, 0,       aliases+ 32},    /*  71 */
-    {16UL, b32+ 98, b32+203, P_LE   | P_ATTEST, 0,       b32+ 71, 0,       aliases+ 57},    /*  72 */
-    {16UL, b32+ 98, b32+203, P_LE   | P_THIRDP, b32+203, b32+141, b32+136, aliases+ 68},    /*  73 */
-    {14UL, b32+101, 0,       P_BE   | P_ACADEM, b32+202, b32+154, b32+ 16, aliases+ 18},    /*  74 */
-    {30UL, b32+102, b32+205, P_BE   | P_ACADEM, b32+205, b32+ 20, b32+167, aliases+ 87},    /*  75 */
-    {12UL, b32+103, 0,       P_BE   | P_ACADEM, 0,       b32+189, 0,       aliases+ 13},    /*  76 */
-    {12UL, b32+103, 0,       P_BELE | P_ACADEM, 0,       b32+172, 0,       aliases+ 15},    /*  77 */
-    {32UL, b32+104, 0,       P_BE   | P_ATTEST, 0,       b32+ 50, 0,       aliases+ 92},    /*  78 */
-    {21UL, b32+105, 0,       P_BE   | P_ACADEM, 0,       b32+ 93, 0,       aliases+ 75},    /*  79 */
-    {24UL, b32+106, 0,       P_BE   | P_ACADEM, 0,       b32+161, 0,       aliases+ 81},    /*  80 */
-    {24UL, b32+106, b32+143, P_BE   | P_ATTEST, 0,       b32+ 39, 0,       aliases+ 83},    /*  81 */
-    { 7UL, b32+109, 0,       P_BE   | P_ACADEM, 0,       b32+151, 0,       aliases+136},    /*  82 */
-    {15UL, b32+110, 0,       P_BE   | P_ACADEM, 0,       b32+ 13, 0,       aliases+ 20},    /*  83 */
-    {16UL, b32+111, 0,       P_BE   | P_ATTEST, 0,       b32+165, 0,       aliases+ 64},    /*  84 */
-    {10UL, b32+112, 0,       P_BE   | P_ATTEST, 0,       b32+ 85, 0,       aliases+  4},    /*  85 */
-    { 8UL, b32+118, 0,       P_BE   | P_ACADEM, 0,       b32+181, 0,       aliases+150},    /*  86 */
-    { 8UL, b32+118, 0,       P_LE   | P_THIRDP, 0,       b32+ 41, 0,       aliases+159},    /*  87 */
-    { 8UL, b32+118, b32+199, P_BE   | P_ACADEM, 0,       b32+171, 0,       aliases+141},    /*  88 */
-    { 6UL, b32+119, b32+193, P_BE   | P_ATTEST, 0,       b32+ 55, 0,       aliases+121},    /*  89 */
-    { 7UL, b32+121, b32+196, P_LE   | P_ACADEM, 0,       b32+127, 0,       aliases+135},    /*  90 */
-    {16UL, b32+124, 0,       P_BE   | P_CONFIR, 0,       b32+ 17, 0,       aliases+ 65},    /*  91 */
-    { 8UL, b32+128, 0,       P_LE   | P_ATTEST, 0,       b32+ 42, 0,       aliases+140},    /*  92 */
-    { 5UL, b32+129, 0,       P_LE   | P_ACADEM, 0,       b32+ 58, 0,       aliases+118},    /*  93 */
-    {32UL, b32+131, b32+207, P_LE   | P_CONFIR, b32+207, b32+107, b32+ 65, aliases+ 95},    /*  94 */
-    {17UL, b32+139, 0,       P_BE   | P_ACADEM, 0,       b32+ 44, 0,       aliases+ 74},    /*  95 */
-    { 6UL, b32+146, 0,       P_BE   | P_ACADEM, b32+193, b32+ 72, b32+180, aliases+125},    /*  96 */
-    {16UL, b32+159, b32+203, P_BE   | P_ACADEM, 0,       b32+ 73, 0,       aliases+ 31},    /*  97 */
-    {15UL, b32+164, 0,       P_BE   | P_ATTEST, b32+  2, b32+ 69, b32+164, aliases+ 21},    /*  98 */
-    {12UL, b32+166, 0,       P_BE   | P_ACADEM, b32+201, b32+138, b32+ 24, aliases+ 14},    /*  99 */
-    { 8UL, b32+169, 0,       P_BE   | P_ACADEM, 0,       b32+146, 0,       aliases+143},    /* 100 */
-    {13UL, b32+179, 0,       P_BE   | P_ATTEST, 0,       b32+ 45, 0,       aliases+ 16},    /* 101 */
-    {12UL, b32+186, b32+201, P_BE   | P_ACADEM, 0,       b32+168, 0,       aliases+ 12},    /* 102 */
-    {32UL, b32+188, b32+207, P_LE   | P_ATTEST, b32+207, b32+ 23, b32+113, aliases+ 93},    /* 103 */
-    {10UL, b32+190, b32+200, P_BE   | P_ACADEM, 0,       b32+112, 0,       aliases+  5},    /* 104 */
+    {64UL, b64,     b64a,    P_LE   | P_CONFIR, b64a,    b64b,    b64c,    aliases + 130},  /*   0 */
+    {32UL, b32 +  0, 0,       P_BE   | P_CONFIR, 0,       b32 + 147, 0,       aliases + 107}, /*   1 */
+    {40UL, b40,     0,       P_BE   | P_ACADEM, b40a,    b40b,    b40c,    aliases + 115},  /*   2 */
+    {24UL, b32 +  3, b32 + 76, P_LE   | P_ATTEST, 0,       b32 + 152, 0,       aliases + 77}, /*   3 */
+    {32UL, b32 +  8, 0,       P_BE   | P_ATTEST, b32 + 207, b32 + 92, b32 + 157, aliases + 98}, /*   4 */
+    {32UL, b32 +  8, b32 + 207, P_BE   | P_ATTEST, 0,       b32 +  7, 0,       aliases + 104}, /*   5 */
+    {32UL, b32 +  8, b32 + 207, P_BE   | P_ATTEST, b32 + 207, b32 + 194, b32 + 157, aliases + 96}, /*   6 */
+    {32UL, b32 +  8, b32 + 207, P_LE   | P_CONFIR, 0,       b32 + 56, 0,       aliases + 103}, /*   7 */
+    {32UL, b32 +  8, b32 + 207, P_LE   | P_ATTEST, b32 + 207, b32 + 160, b32 + 173, aliases + 102}, /*   8 */
+    {16UL, b32 +  9, 0,       P_BE   | P_ATTEST, 0,       b32 +  5, 0,       aliases + 36}, /*   9 */
+    {16UL, b32 +  9, 0,       P_BE   | P_ATTEST, b32 +  1, b32 +  4, b32 +  9, aliases + 35}, /*  10 */
+    { 8UL, b32 + 10, 0,       P_BE   | P_ATTEST, 0,       b32 + 187, 0,       aliases + 157}, /*  11 */
+    { 8UL, b32 + 10, 0,       P_BE   | P_ACADEM, b32 + 75, b32 + 125, b32 + 133, aliases + 147}, /*  12 */
+    { 8UL, b32 + 10, b32 + 199, P_LE   | P_ACADEM, 0,       b32 + 163, 0,       aliases + 155}, /*  13 */
+    {16UL, b32 + 11, b32 + 203, P_LE   | P_ATTEST, 0,       b32 + 123, 0,       aliases + 58}, /*  14 */
+    {31UL, b32 + 12, b32 + 206, P_BE   | P_CONFIR, b32 + 206, b32 + 26, b32 + 120, aliases + 88}, /*  15 */
+    { 6UL, b32 + 14, 0,       P_LE   | P_ACADEM, 0,       b32 + 25, 0,       aliases + 124}, /*  16 */
+    {82UL, b82,     0,       P_LE   | P_ATTEST, 0,       b82a,    0,       aliases + 160},  /*  17 */
+    {16UL, b32 + 18, 0,       P_BE   | P_ATTEST, 0,       b32 + 53, 0,       aliases + 73}, /*  18 */
+    {16UL, b32 + 18, 0,       P_BE   | P_ACADEM, b32 + 203, b32 + 162, b32 + 29, aliases + 42}, /*  19 */
+    {16UL, b32 + 18, 0,       P_LE   | P_ATTEST, 0,       b32 + 38, 0,       aliases + 50}, /*  20 */
+    {16UL, b32 + 18, b32 + 29, P_BE   | P_ATTEST, 0,       b32 + 178, 0,       aliases + 63}, /*  21 */
+    {16UL, b32 + 18, b32 + 108, P_LE   | P_ATTEST, 0,       b32 + 43, 0,       aliases + 66}, /*  22 */
+    {16UL, b32 + 18, b32 + 137, P_LE   | P_THIRDP, 0,       b32 + 83, 0,       aliases + 62}, /*  23 */
+    {16UL, b32 + 18, b32 + 156, P_LE   | P_ATTEST, 0,       b32 + 149, 0,       aliases + 48}, /*  24 */
+    {16UL, b32 + 18, b32 + 203, P_BE   | P_ATTEST, 0,       b32 + 47, 0,       aliases + 44}, /*  25 */
+    {16UL, b32 + 18, b32 + 203, P_BE   | P_ATTEST, b32 + 203, b32 + 170, b32 + 29, aliases + 41}, /*  26 */
+    {16UL, b32 + 18, b32 + 203, P_LE   | P_ATTEST, 0,       b32 + 88, 0,       aliases + 56}, /*  27 */
+    {16UL, b32 + 18, b32 + 203, P_LE   | P_ATTEST, b32 + 203, b32 + 114, b32 + 185, aliases + 45}, /*  28 */
+    { 7UL, b32 + 19, 0,       P_BE   | P_ACADEM, 0,       b32 + 181, 0,       aliases + 134}, /*  29 */
+    { 6UL, b32 + 27, b32 + 193, P_BE   | P_ACADEM, 0,       b32 + 183, 0,       aliases + 122}, /*  30 */
+    { 8UL, b32 + 28, 0,       P_BE   | P_ACADEM, 0,       b32 + 57, 0,       aliases + 145}, /*  31 */
+    { 8UL, b32 + 28, b32 + 195, P_BE   | P_ATTEST, 0,       b32 + 95, 0,       aliases + 148}, /*  32 */
+    { 8UL, b32 + 28, b32 + 199, P_BE   | P_ATTEST, b32 + 199, b32 + 70, b32 + 155, aliases + 156}, /*  33 */
+    { 8UL, b32 + 28, b32 + 199, P_LE   | P_ATTEST, 0,       b32 + 116, 0,       aliases + 158}, /*  34 */
+    {16UL, b32 + 30, b32 + 203, P_BE   | P_ATTEST, b32 + 203, b32 + 130, b32 + 177, aliases + 61}, /*  35 */
+    {32UL, b32 + 31, b32 + 207, P_LE   | P_ATTEST, b32 + 207, b32 + 176, b32 + 144, aliases + 101}, /*  36 */
+    {14UL, b32 + 35, 0,       P_LE   | P_ATTEST, 0,       b32 + 36, 0,       aliases + 17}, /*  37 */
+    { 5UL, b32 + 46, b32 + 192, P_LE   | P_THIRDP, b32 + 192, b32 + 158, b32 + 49, aliases + 120}, /*  38 */
+    { 8UL, b32 + 48, 0,       P_BE   | P_ATTEST, 0,       b32 + 61, 0,       aliases + 154}, /*  39 */
+    { 8UL, b32 + 48, b32 + 199, P_BE   | P_ATTEST, b32 + 199, b32 + 174, b32 + 63, aliases + 139}, /*  40 */
+    { 4UL, b32 + 49, 0,       P_LE   | P_ACADEM, 0,       b32 + 89, 0,       aliases + 112}, /*  41 */
+    { 4UL, b32 + 49, b32 + 184, P_BE   | P_ACADEM, b32 + 184, b32 + 135, b32 + 33, aliases + 113}, /*  42 */
+    { 8UL, b32 + 51, 0,       P_LE   | P_ATTEST, 0,       b32 + 125, 0,       aliases + 152}, /*  43 */
+    { 8UL, b32 + 51, b32 + 199, P_BE   | P_ATTEST, 0,       b32 + 191, 0,       aliases + 153}, /*  44 */
+    {24UL, b32 + 54, b32 + 204, P_BE   | P_ACADEM, b32 + 204, b32 + 142, b32 + 21, aliases + 80}, /*  45 */
+    { 8UL, b32 + 59, 0,       P_LE   | P_ATTEST, 0,       b32 + 22, 0,       aliases + 142}, /*  46 */
+    {16UL, b32 + 60, 0,       P_BE   | P_CONFIR, b32 + 203, b32 + 153, b32 + 126, aliases + 38}, /*  47 */
+    {16UL, b32 + 60, 0,       P_LE   | P_CONFIR, b32 + 203, b32 + 182, b32 + 86, aliases + 37}, /*  48 */
+    {64UL, b64d,    0,       P_BE   | P_ACADEM, 0,       b64e,    0,       aliases + 128},  /*  49 */
+    {64UL, b64d,    b64a,    P_BE   | P_CONFIR, b64a,    b64f,    b64g,    aliases + 131},  /*  50 */
+    {64UL, b64d,    b64a,    P_LE   | P_ATTEST, b64a,    b64h,    b64i,    aliases + 132},  /*  51 */
+    { 5UL, b32 + 66, b32 + 66, P_BE   | P_ATTEST, 0,       0,       0,       aliases + 117}, /*  52 */
+    { 8UL, b32 + 67, 0,       P_BE   | P_ACADEM, b32 + 199, b32 + 115, b32 + 74, aliases + 146}, /*  53 */
+    {16UL, b32 + 77, 0,       P_BE   | P_ATTEST, 0,       b32 + 78, 0,       aliases + 59}, /*  54 */
+    {10UL, b32 + 79, 0,       P_BE   | P_ACADEM, b32 + 200, b32 + 68, b32 + 52, aliases +  6}, /*  55 */
+    {24UL, b32 + 80, b32 + 132, P_BE   | P_ATTEST, 0,       b32 + 32, 0,       aliases + 79}, /*  56 */
+    {24UL, b32 + 80, b32 + 197, P_BE   | P_ATTEST, 0,       b32 + 94, 0,       aliases + 78}, /*  57 */
+    { 3UL, b32 + 81, 0,       P_BE   | P_ACADEM, b32 + 175, b32 + 96, b32 + 62, aliases + 85}, /*  58 */
+    { 3UL, b32 + 81, b32 + 175, P_LE   | P_ACADEM, 0,       b32 + 150, 0,       aliases + 86}, /*  59 */
+    {11UL, b32 + 82, 0,       P_BE   | P_ACADEM, 0,       b32 + 15, 0,       aliases + 10}, /*  60 */
+    { 6UL, b32 + 84, 0,       P_LE   | P_ATTEST, 0,       b32 + 117, 0,       aliases + 123}, /*  61 */
+    {16UL, b32 + 87, 0,       P_BE   | P_THIRDP, 0,       b32 + 148, 0,       aliases + 52}, /*  62 */
+    {11UL, b32 + 90, b32 +  6, P_BE   | P_ATTEST, 0,       b32 + 140, 0,       aliases +  9}, /*  63 */
+    {16UL, b32 + 91, 0,       P_BE   | P_ATTEST, 0,       b32 + 37, 0,       aliases + 60}, /*  64 */
+    {24UL, b32 + 97, 0,       P_BE   | P_ACADEM, 0,       b32 + 40, 0,       aliases + 82}, /*  65 */
+    {24UL, b32 + 97, b32 + 204, P_BE   | P_ATTEST, b32 + 204, b32 + 34, b32 + 100, aliases + 84}, /*  66 */
+    {16UL, b32 + 98, 0,       P_BE   | P_ATTEST, 0,       b32 + 198, 0,       aliases + 67}, /*  67 */
+    {16UL, b32 + 98, 0,       P_LE   | P_CONFIR, 0,       b32 + 145, 0,       aliases + 24}, /*  68 */
+    {16UL, b32 + 98, 0,       P_LE   | P_ATTEST, b32 + 203, b32 + 64, b32 + 136, aliases + 55}, /*  69 */
+    {16UL, b32 + 98, b32 + 99, P_BE   | P_ATTEST, 0,       b32 + 122, 0,       aliases + 34}, /*  70 */
+    {16UL, b32 + 98, b32 + 203, P_BE   | P_THIRDP, 0,       b32 + 134, 0,       aliases + 32}, /*  71 */
+    {16UL, b32 + 98, b32 + 203, P_LE   | P_ATTEST, 0,       b32 + 71, 0,       aliases + 57}, /*  72 */
+    {16UL, b32 + 98, b32 + 203, P_LE   | P_THIRDP, b32 + 203, b32 + 141, b32 + 136, aliases + 68}, /*  73 */
+    {14UL, b32 + 101, 0,       P_BE   | P_ACADEM, b32 + 202, b32 + 154, b32 + 16, aliases + 18}, /*  74 */
+    {30UL, b32 + 102, b32 + 205, P_BE   | P_ACADEM, b32 + 205, b32 + 20, b32 + 167, aliases + 87}, /*  75 */
+    {12UL, b32 + 103, 0,       P_BE   | P_ACADEM, 0,       b32 + 189, 0,       aliases + 13}, /*  76 */
+    {12UL, b32 + 103, 0,       P_BELE | P_ACADEM, 0,       b32 + 172, 0,       aliases + 15}, /*  77 */
+    {32UL, b32 + 104, 0,       P_BE   | P_ATTEST, 0,       b32 + 50, 0,       aliases + 92}, /*  78 */
+    {21UL, b32 + 105, 0,       P_BE   | P_ACADEM, 0,       b32 + 93, 0,       aliases + 75}, /*  79 */
+    {24UL, b32 + 106, 0,       P_BE   | P_ACADEM, 0,       b32 + 161, 0,       aliases + 81}, /*  80 */
+    {24UL, b32 + 106, b32 + 143, P_BE   | P_ATTEST, 0,       b32 + 39, 0,       aliases + 83}, /*  81 */
+    { 7UL, b32 + 109, 0,       P_BE   | P_ACADEM, 0,       b32 + 151, 0,       aliases + 136}, /*  82 */
+    {15UL, b32 + 110, 0,       P_BE   | P_ACADEM, 0,       b32 + 13, 0,       aliases + 20}, /*  83 */
+    {16UL, b32 + 111, 0,       P_BE   | P_ATTEST, 0,       b32 + 165, 0,       aliases + 64}, /*  84 */
+    {10UL, b32 + 112, 0,       P_BE   | P_ATTEST, 0,       b32 + 85, 0,       aliases +  4}, /*  85 */
+    { 8UL, b32 + 118, 0,       P_BE   | P_ACADEM, 0,       b32 + 181, 0,       aliases + 150}, /*  86 */
+    { 8UL, b32 + 118, 0,       P_LE   | P_THIRDP, 0,       b32 + 41, 0,       aliases + 159}, /*  87 */
+    { 8UL, b32 + 118, b32 + 199, P_BE   | P_ACADEM, 0,       b32 + 171, 0,       aliases + 141}, /*  88 */
+    { 6UL, b32 + 119, b32 + 193, P_BE   | P_ATTEST, 0,       b32 + 55, 0,       aliases + 121}, /*  89 */
+    { 7UL, b32 + 121, b32 + 196, P_LE   | P_ACADEM, 0,       b32 + 127, 0,       aliases + 135}, /*  90 */
+    {16UL, b32 + 124, 0,       P_BE   | P_CONFIR, 0,       b32 + 17, 0,       aliases + 65}, /*  91 */
+    { 8UL, b32 + 128, 0,       P_LE   | P_ATTEST, 0,       b32 + 42, 0,       aliases + 140}, /*  92 */
+    { 5UL, b32 + 129, 0,       P_LE   | P_ACADEM, 0,       b32 + 58, 0,       aliases + 118}, /*  93 */
+    {32UL, b32 + 131, b32 + 207, P_LE   | P_CONFIR, b32 + 207, b32 + 107, b32 + 65, aliases + 95}, /*  94 */
+    {17UL, b32 + 139, 0,       P_BE   | P_ACADEM, 0,       b32 + 44, 0,       aliases + 74}, /*  95 */
+    { 6UL, b32 + 146, 0,       P_BE   | P_ACADEM, b32 + 193, b32 + 72, b32 + 180, aliases + 125}, /*  96 */
+    {16UL, b32 + 159, b32 + 203, P_BE   | P_ACADEM, 0,       b32 + 73, 0,       aliases + 31}, /*  97 */
+    {15UL, b32 + 164, 0,       P_BE   | P_ATTEST, b32 +  2, b32 + 69, b32 + 164, aliases + 21}, /*  98 */
+    {12UL, b32 + 166, 0,       P_BE   | P_ACADEM, b32 + 201, b32 + 138, b32 + 24, aliases + 14}, /*  99 */
+    { 8UL, b32 + 169, 0,       P_BE   | P_ACADEM, 0,       b32 + 146, 0,       aliases + 143}, /* 100 */
+    {13UL, b32 + 179, 0,       P_BE   | P_ATTEST, 0,       b32 + 45, 0,       aliases + 16}, /* 101 */
+    {12UL, b32 + 186, b32 + 201, P_BE   | P_ACADEM, 0,       b32 + 168, 0,       aliases + 12}, /* 102 */
+    {32UL, b32 + 188, b32 + 207, P_LE   | P_ATTEST, b32 + 207, b32 + 23, b32 + 113, aliases + 93}, /* 103 */
+    {10UL, b32 + 190, b32 + 200, P_BE   | P_ACADEM, 0,       b32 + 112, 0,       aliases +  5}, /* 104 */
     { 0UL, 0,       0,       P_BE   | P_UNDFCL, 0,       0,       0,       NULL       },    /* terminating entry */
 };
 #    define NPRESETS 105
 
 /* List of names with pointers to models, pre-sorted for use with bsearch() */
 static const struct malias aliases[] = {
-    {"ARC",                 models+ 68},    /*   0 */
-    {"B-CRC-32",            models+  6},    /*   1 */
-    {"CKSUM",               models+  4},    /*   2 */
-    {"CRC-10",              models+ 85},    /*   3 */
-    {"CRC-10/ATM",          models+ 85},    /*   4 */
-    {"CRC-10/CDMA2000",     models+104},    /*   5 */
-    {"CRC-10/GSM",          models+ 55},    /*   6 */
-    {"CRC-10/I-610",        models+ 85},    /*   7 */
-    {"CRC-11",              models+ 63},    /*   8 */
-    {"CRC-11/FLEXRAY",      models+ 63},    /*   9 */
-    {"CRC-11/UMTS",         models+ 60},    /*  10 */
-    {"CRC-12/3GPP",         models+ 77},    /*  11 */
-    {"CRC-12/CDMA2000",     models+102},    /*  12 */
-    {"CRC-12/DECT",         models+ 76},    /*  13 */
-    {"CRC-12/GSM",          models+ 99},    /*  14 */
-    {"CRC-12/UMTS",         models+ 77},    /*  15 */
-    {"CRC-13/BBC",          models+101},    /*  16 */
-    {"CRC-14/DARC",         models+ 37},    /*  17 */
-    {"CRC-14/GSM",          models+ 74},    /*  18 */
-    {"CRC-15",              models+ 83},    /*  19 */
-    {"CRC-15/CAN",          models+ 83},    /*  20 */
-    {"CRC-15/MPT1327",      models+ 98},    /*  21 */
-    {"CRC-16",              models+ 68},    /*  22 */
-    {"CRC-16/ACORN",        models+ 18},    /*  23 */
-    {"CRC-16/ARC",          models+ 68},    /*  24 */
-    {"CRC-16/AUG-CCITT",    models+ 21},    /*  25 */
-    {"CRC-16/AUTOSAR",      models+ 25},    /*  26 */
-    {"CRC-16/BUYPASS",      models+ 67},    /*  27 */
-    {"CRC-16/CCITT",        models+ 20},    /*  28 */
-    {"CRC-16/CCITT-FALSE",  models+ 25},    /*  29 */
-    {"CRC-16/CCITT-TRUE",   models+ 20},    /*  30 */
-    {"CRC-16/CDMA2000",     models+ 97},    /*  31 */
-    {"CRC-16/CMS",          models+ 71},    /*  32 */
-    {"CRC-16/DARC",         models+ 26},    /*  33 */
-    {"CRC-16/DDS-110",      models+ 70},    /*  34 */
-    {"CRC-16/DECT-R",       models+ 10},    /*  35 */
-    {"CRC-16/DECT-X",       models+  9},    /*  36 */
-    {"CRC-16/DNP",          models+ 48},    /*  37 */
-    {"CRC-16/EN-13757",     models+ 47},    /*  38 */
-    {"CRC-16/EPC",          models+ 26},    /*  39 */
-    {"CRC-16/EPC-C1G2",     models+ 26},    /*  40 */
-    {"CRC-16/GENIBUS",      models+ 26},    /*  41 */
-    {"CRC-16/GSM",          models+ 19},    /*  42 */
-    {"CRC-16/I-CODE",       models+ 26},    /*  43 */
-    {"CRC-16/IBM-3740",     models+ 25},    /*  44 */
-    {"CRC-16/IBM-SDLC",     models+ 28},    /*  45 */
-    {"CRC-16/IEC-61158-2",  models+ 35},    /*  46 */
-    {"CRC-16/ISO-HDLC",     models+ 28},    /*  47 */
-    {"CRC-16/ISO-IEC-14443-3-A",    models+ 24},    /*  48 */
-    {"CRC-16/ISO-IEC-14443-3-B",    models+ 28},    /*  49 */
-    {"CRC-16/KERMIT",       models+ 20},    /*  50 */
-    {"CRC-16/LHA",          models+ 68},    /*  51 */
-    {"CRC-16/LJ1200",       models+ 62},    /*  52 */
-    {"CRC-16/LTE",          models+ 18},    /*  53 */
-    {"CRC-16/MAXIM",        models+ 69},    /*  54 */
-    {"CRC-16/MAXIM-DOW",    models+ 69},    /*  55 */
-    {"CRC-16/MCRF4XX",      models+ 27},    /*  56 */
-    {"CRC-16/MODBUS",       models+ 72},    /*  57 */
-    {"CRC-16/NRSC-5",       models+ 14},    /*  58 */
-    {"CRC-16/OPENSAFETY-A", models+ 54},    /*  59 */
-    {"CRC-16/OPENSAFETY-B", models+ 64},    /*  60 */
-    {"CRC-16/PROFIBUS",     models+ 35},    /*  61 */
-    {"CRC-16/RIELLO",       models+ 23},    /*  62 */
-    {"CRC-16/SPI-FUJITSU",  models+ 21},    /*  63 */
-    {"CRC-16/T10-DIF",      models+ 84},    /*  64 */
-    {"CRC-16/TELEDISK",     models+ 91},    /*  65 */
-    {"CRC-16/TMS37157",     models+ 22},    /*  66 */
-    {"CRC-16/UMTS",         models+ 67},    /*  67 */
-    {"CRC-16/USB",          models+ 73},    /*  68 */
-    {"CRC-16/V-41-LSB",     models+ 20},    /*  69 */
-    {"CRC-16/V-41-MSB",     models+ 18},    /*  70 */
-    {"CRC-16/VERIFONE",     models+ 67},    /*  71 */
-    {"CRC-16/X-25",         models+ 28},    /*  72 */
-    {"CRC-16/XMODEM",       models+ 18},    /*  73 */
-    {"CRC-17/CAN-FD",       models+ 95},    /*  74 */
-    {"CRC-21/CAN-FD",       models+ 79},    /*  75 */
-    {"CRC-24",              models+ 81},    /*  76 */
-    {"CRC-24/BLE",          models+  3},    /*  77 */
-    {"CRC-24/FLEXRAY-A",    models+ 57},    /*  78 */
-    {"CRC-24/FLEXRAY-B",    models+ 56},    /*  79 */
-    {"CRC-24/INTERLAKEN",   models+ 45},    /*  80 */
-    {"CRC-24/LTE-A",        models+ 80},    /*  81 */
-    {"CRC-24/LTE-B",        models+ 65},    /*  82 */
-    {"CRC-24/OPENPGP",      models+ 81},    /*  83 */
-    {"CRC-24/OS-9",         models+ 66},    /*  84 */
-    {"CRC-3/GSM",           models+ 58},    /*  85 */
-    {"CRC-3/ROHC",          models+ 59},    /*  86 */
-    {"CRC-30/CDMA",         models+ 75},    /*  87 */
-    {"CRC-31/PHILIPS",      models+ 15},    /*  88 */
-    {"CRC-32",              models+  8},    /*  89 */
-    {"CRC-32/AAL5",         models+  6},    /*  90 */
-    {"CRC-32/ADCCP",        models+  8},    /*  91 */
-    {"CRC-32/AIXM",         models+ 78},    /*  92 */
-    {"CRC-32/AUTOSAR",      models+103},    /*  93 */
-    {"CRC-32/BASE91-C",     models+ 36},    /*  94 */
-    {"CRC-32/BASE91-D",     models+ 94},    /*  95 */
-    {"CRC-32/BZIP2",        models+  6},    /*  96 */
-    {"CRC-32/CASTAGNOLI",   models+ 36},    /*  97 */
-    {"CRC-32/CKSUM",        models+  4},    /*  98 */
-    {"CRC-32/DECT-B",       models+  6},    /*  99 */
-    {"CRC-32/INTERLAKEN",   models+ 36},    /* 100 */
-    {"CRC-32/ISCSI",        models+ 36},    /* 101 */
-    {"CRC-32/ISO-HDLC",     models+  8},    /* 102 */
-    {"CRC-32/JAMCRC",       models+  7},    /* 103 */
-    {"CRC-32/MPEG-2",       models+  5},    /* 104 */
-    {"CRC-32/POSIX",        models+  4},    /* 105 */
-    {"CRC-32/V-42",         models+  8},    /* 106 */
-    {"CRC-32/XFER",         models+  1},    /* 107 */
-    {"CRC-32/XZ",           models+  8},    /* 108 */
-    {"CRC-32C",             models+ 36},    /* 109 */
-    {"CRC-32D",             models+ 94},    /* 110 */
-    {"CRC-32Q",             models+ 78},    /* 111 */
-    {"CRC-4/G-704",         models+ 41},    /* 112 */
-    {"CRC-4/INTERLAKEN",    models+ 42},    /* 113 */
-    {"CRC-4/ITU",           models+ 41},    /* 114 */
-    {"CRC-40/GSM",          models+  2},    /* 115 */
-    {"CRC-5/EPC",           models+ 52},    /* 116 */
-    {"CRC-5/EPC-C1G2",      models+ 52},    /* 117 */
-    {"CRC-5/G-704",         models+ 93},    /* 118 */
-    {"CRC-5/ITU",           models+ 93},    /* 119 */
-    {"CRC-5/USB",           models+ 38},    /* 120 */
-    {"CRC-6/CDMA2000-A",    models+ 89},    /* 121 */
-    {"CRC-6/CDMA2000-B",    models+ 30},    /* 122 */
-    {"CRC-6/DARC",          models+ 61},    /* 123 */
-    {"CRC-6/G-704",         models+ 16},    /* 124 */
-    {"CRC-6/GSM",           models+ 96},    /* 125 */
-    {"CRC-6/ITU",           models+ 16},    /* 126 */
-    {"CRC-64",              models+ 49},    /* 127 */
-    {"CRC-64/ECMA-182",     models+ 49},    /* 128 */
-    {"CRC-64/GO-ECMA",      models+ 51},    /* 129 */
-    {"CRC-64/GO-ISO",       models+  0},    /* 130 */
-    {"CRC-64/WE",           models+ 50},    /* 131 */
-    {"CRC-64/XZ",           models+ 51},    /* 132 */
-    {"CRC-7",               models+ 29},    /* 133 */
-    {"CRC-7/MMC",           models+ 29},    /* 134 */
-    {"CRC-7/ROHC",          models+ 90},    /* 135 */
-    {"CRC-7/UMTS",          models+ 82},    /* 136 */
-    {"CRC-8",               models+ 11},    /* 137 */
-    {"CRC-8/AES",           models+ 34},    /* 138 */
-    {"CRC-8/AUTOSAR",       models+ 40},    /* 139 */
-    {"CRC-8/BLUETOOTH",     models+ 92},    /* 140 */
-    {"CRC-8/CDMA2000",      models+ 88},    /* 141 */
-    {"CRC-8/DARC",          models+ 46},    /* 142 */
-    {"CRC-8/DVB-S2",        models+100},    /* 143 */
-    {"CRC-8/EBU",           models+ 34},    /* 144 */
-    {"CRC-8/GSM-A",         models+ 31},    /* 145 */
-    {"CRC-8/GSM-B",         models+ 53},    /* 146 */
-    {"CRC-8/I-432-1",       models+ 12},    /* 147 */
-    {"CRC-8/I-CODE",        models+ 32},    /* 148 */
-    {"CRC-8/ITU",           models+ 12},    /* 149 */
-    {"CRC-8/LTE",           models+ 86},    /* 150 */
-    {"CRC-8/MAXIM",         models+ 43},    /* 151 */
-    {"CRC-8/MAXIM-DOW",     models+ 43},    /* 152 */
-    {"CRC-8/NRSC-5",        models+ 44},    /* 153 */
-    {"CRC-8/OPENSAFETY",    models+ 39},    /* 154 */
-    {"CRC-8/ROHC",          models+ 13},    /* 155 */
-    {"CRC-8/SAE-J1850",     models+ 33},    /* 156 */
-    {"CRC-8/SMBUS",         models+ 11},    /* 157 */
-    {"CRC-8/TECH-3250",     models+ 34},    /* 158 */
-    {"CRC-8/WCDMA",         models+ 87},    /* 159 */
-    {"CRC-82/DARC",         models+ 17},    /* 160 */
-    {"CRC-A",               models+ 24},    /* 161 */
-    {"CRC-B",               models+ 28},    /* 162 */
-    {"CRC-CCITT",           models+ 20},    /* 163 */
-    {"CRC-IBM",             models+ 68},    /* 164 */
-    {"DOW-CRC",             models+ 43},    /* 165 */
-    {"JAMCRC",              models+  7},    /* 166 */
-    {"KERMIT",              models+ 20},    /* 167 */
-    {"MODBUS",              models+ 72},    /* 168 */
-    {"PKZIP",               models+  8},    /* 169 */
-    {"R-CRC-16",            models+ 10},    /* 170 */
-    {"X-25",                models+ 28},    /* 171 */
-    {"X-CRC-12",            models+ 76},    /* 172 */
-    {"X-CRC-16",            models+  9},    /* 173 */
-    {"XFER",                models+  1},    /* 174 */
-    {"XMODEM",              models+ 18},    /* 175 */
-    {"ZMODEM",              models+ 18},    /* 176 */
+    {"ARC",                 models + 68},   /*   0 */
+    {"B-CRC-32",            models +  6},   /*   1 */
+    {"CKSUM",               models +  4},   /*   2 */
+    {"CRC-10",              models + 85},   /*   3 */
+    {"CRC-10/ATM",          models + 85},   /*   4 */
+    {"CRC-10/CDMA2000",     models + 104},  /*   5 */
+    {"CRC-10/GSM",          models + 55},   /*   6 */
+    {"CRC-10/I-610",        models + 85},   /*   7 */
+    {"CRC-11",              models + 63},   /*   8 */
+    {"CRC-11/FLEXRAY",      models + 63},   /*   9 */
+    {"CRC-11/UMTS",         models + 60},   /*  10 */
+    {"CRC-12/3GPP",         models + 77},   /*  11 */
+    {"CRC-12/CDMA2000",     models + 102},  /*  12 */
+    {"CRC-12/DECT",         models + 76},   /*  13 */
+    {"CRC-12/GSM",          models + 99},   /*  14 */
+    {"CRC-12/UMTS",         models + 77},   /*  15 */
+    {"CRC-13/BBC",          models + 101},  /*  16 */
+    {"CRC-14/DARC",         models + 37},   /*  17 */
+    {"CRC-14/GSM",          models + 74},   /*  18 */
+    {"CRC-15",              models + 83},   /*  19 */
+    {"CRC-15/CAN",          models + 83},   /*  20 */
+    {"CRC-15/MPT1327",      models + 98},   /*  21 */
+    {"CRC-16",              models + 68},   /*  22 */
+    {"CRC-16/ACORN",        models + 18},   /*  23 */
+    {"CRC-16/ARC",          models + 68},   /*  24 */
+    {"CRC-16/AUG-CCITT",    models + 21},   /*  25 */
+    {"CRC-16/AUTOSAR",      models + 25},   /*  26 */
+    {"CRC-16/BUYPASS",      models + 67},   /*  27 */
+    {"CRC-16/CCITT",        models + 20},   /*  28 */
+    {"CRC-16/CCITT-FALSE",  models + 25},   /*  29 */
+    {"CRC-16/CCITT-TRUE",   models + 20},   /*  30 */
+    {"CRC-16/CDMA2000",     models + 97},   /*  31 */
+    {"CRC-16/CMS",          models + 71},   /*  32 */
+    {"CRC-16/DARC",         models + 26},   /*  33 */
+    {"CRC-16/DDS-110",      models + 70},   /*  34 */
+    {"CRC-16/DECT-R",       models + 10},   /*  35 */
+    {"CRC-16/DECT-X",       models +  9},   /*  36 */
+    {"CRC-16/DNP",          models + 48},   /*  37 */
+    {"CRC-16/EN-13757",     models + 47},   /*  38 */
+    {"CRC-16/EPC",          models + 26},   /*  39 */
+    {"CRC-16/EPC-C1G2",     models + 26},   /*  40 */
+    {"CRC-16/GENIBUS",      models + 26},   /*  41 */
+    {"CRC-16/GSM",          models + 19},   /*  42 */
+    {"CRC-16/I-CODE",       models + 26},   /*  43 */
+    {"CRC-16/IBM-3740",     models + 25},   /*  44 */
+    {"CRC-16/IBM-SDLC",     models + 28},   /*  45 */
+    {"CRC-16/IEC-61158-2",  models + 35},   /*  46 */
+    {"CRC-16/ISO-HDLC",     models + 28},   /*  47 */
+    {"CRC-16/ISO-IEC-14443-3-A",    models + 24},   /*  48 */
+    {"CRC-16/ISO-IEC-14443-3-B",    models + 28},   /*  49 */
+    {"CRC-16/KERMIT",       models + 20},   /*  50 */
+    {"CRC-16/LHA",          models + 68},   /*  51 */
+    {"CRC-16/LJ1200",       models + 62},   /*  52 */
+    {"CRC-16/LTE",          models + 18},   /*  53 */
+    {"CRC-16/MAXIM",        models + 69},   /*  54 */
+    {"CRC-16/MAXIM-DOW",    models + 69},   /*  55 */
+    {"CRC-16/MCRF4XX",      models + 27},   /*  56 */
+    {"CRC-16/MODBUS",       models + 72},   /*  57 */
+    {"CRC-16/NRSC-5",       models + 14},   /*  58 */
+    {"CRC-16/OPENSAFETY-A", models + 54},   /*  59 */
+    {"CRC-16/OPENSAFETY-B", models + 64},   /*  60 */
+    {"CRC-16/PROFIBUS",     models + 35},   /*  61 */
+    {"CRC-16/RIELLO",       models + 23},   /*  62 */
+    {"CRC-16/SPI-FUJITSU",  models + 21},   /*  63 */
+    {"CRC-16/T10-DIF",      models + 84},   /*  64 */
+    {"CRC-16/TELEDISK",     models + 91},   /*  65 */
+    {"CRC-16/TMS37157",     models + 22},   /*  66 */
+    {"CRC-16/UMTS",         models + 67},   /*  67 */
+    {"CRC-16/USB",          models + 73},   /*  68 */
+    {"CRC-16/V-41-LSB",     models + 20},   /*  69 */
+    {"CRC-16/V-41-MSB",     models + 18},   /*  70 */
+    {"CRC-16/VERIFONE",     models + 67},   /*  71 */
+    {"CRC-16/X-25",         models + 28},   /*  72 */
+    {"CRC-16/XMODEM",       models + 18},   /*  73 */
+    {"CRC-17/CAN-FD",       models + 95},   /*  74 */
+    {"CRC-21/CAN-FD",       models + 79},   /*  75 */
+    {"CRC-24",              models + 81},   /*  76 */
+    {"CRC-24/BLE",          models +  3},   /*  77 */
+    {"CRC-24/FLEXRAY-A",    models + 57},   /*  78 */
+    {"CRC-24/FLEXRAY-B",    models + 56},   /*  79 */
+    {"CRC-24/INTERLAKEN",   models + 45},   /*  80 */
+    {"CRC-24/LTE-A",        models + 80},   /*  81 */
+    {"CRC-24/LTE-B",        models + 65},   /*  82 */
+    {"CRC-24/OPENPGP",      models + 81},   /*  83 */
+    {"CRC-24/OS-9",         models + 66},   /*  84 */
+    {"CRC-3/GSM",           models + 58},   /*  85 */
+    {"CRC-3/ROHC",          models + 59},   /*  86 */
+    {"CRC-30/CDMA",         models + 75},   /*  87 */
+    {"CRC-31/PHILIPS",      models + 15},   /*  88 */
+    {"CRC-32",              models +  8},   /*  89 */
+    {"CRC-32/AAL5",         models +  6},   /*  90 */
+    {"CRC-32/ADCCP",        models +  8},   /*  91 */
+    {"CRC-32/AIXM",         models + 78},   /*  92 */
+    {"CRC-32/AUTOSAR",      models + 103},  /*  93 */
+    {"CRC-32/BASE91-C",     models + 36},   /*  94 */
+    {"CRC-32/BASE91-D",     models + 94},   /*  95 */
+    {"CRC-32/BZIP2",        models +  6},   /*  96 */
+    {"CRC-32/CASTAGNOLI",   models + 36},   /*  97 */
+    {"CRC-32/CKSUM",        models +  4},   /*  98 */
+    {"CRC-32/DECT-B",       models +  6},   /*  99 */
+    {"CRC-32/INTERLAKEN",   models + 36},   /* 100 */
+    {"CRC-32/ISCSI",        models + 36},   /* 101 */
+    {"CRC-32/ISO-HDLC",     models +  8},   /* 102 */
+    {"CRC-32/JAMCRC",       models +  7},   /* 103 */
+    {"CRC-32/MPEG-2",       models +  5},   /* 104 */
+    {"CRC-32/POSIX",        models +  4},   /* 105 */
+    {"CRC-32/V-42",         models +  8},   /* 106 */
+    {"CRC-32/XFER",         models +  1},   /* 107 */
+    {"CRC-32/XZ",           models +  8},   /* 108 */
+    {"CRC-32C",             models + 36},   /* 109 */
+    {"CRC-32D",             models + 94},   /* 110 */
+    {"CRC-32Q",             models + 78},   /* 111 */
+    {"CRC-4/G-704",         models + 41},   /* 112 */
+    {"CRC-4/INTERLAKEN",    models + 42},   /* 113 */
+    {"CRC-4/ITU",           models + 41},   /* 114 */
+    {"CRC-40/GSM",          models +  2},   /* 115 */
+    {"CRC-5/EPC",           models + 52},   /* 116 */
+    {"CRC-5/EPC-C1G2",      models + 52},   /* 117 */
+    {"CRC-5/G-704",         models + 93},   /* 118 */
+    {"CRC-5/ITU",           models + 93},   /* 119 */
+    {"CRC-5/USB",           models + 38},   /* 120 */
+    {"CRC-6/CDMA2000-A",    models + 89},   /* 121 */
+    {"CRC-6/CDMA2000-B",    models + 30},   /* 122 */
+    {"CRC-6/DARC",          models + 61},   /* 123 */
+    {"CRC-6/G-704",         models + 16},   /* 124 */
+    {"CRC-6/GSM",           models + 96},   /* 125 */
+    {"CRC-6/ITU",           models + 16},   /* 126 */
+    {"CRC-64",              models + 49},   /* 127 */
+    {"CRC-64/ECMA-182",     models + 49},   /* 128 */
+    {"CRC-64/GO-ECMA",      models + 51},   /* 129 */
+    {"CRC-64/GO-ISO",       models +  0},   /* 130 */
+    {"CRC-64/WE",           models + 50},   /* 131 */
+    {"CRC-64/XZ",           models + 51},   /* 132 */
+    {"CRC-7",               models + 29},   /* 133 */
+    {"CRC-7/MMC",           models + 29},   /* 134 */
+    {"CRC-7/ROHC",          models + 90},   /* 135 */
+    {"CRC-7/UMTS",          models + 82},   /* 136 */
+    {"CRC-8",               models + 11},   /* 137 */
+    {"CRC-8/AES",           models + 34},   /* 138 */
+    {"CRC-8/AUTOSAR",       models + 40},   /* 139 */
+    {"CRC-8/BLUETOOTH",     models + 92},   /* 140 */
+    {"CRC-8/CDMA2000",      models + 88},   /* 141 */
+    {"CRC-8/DARC",          models + 46},   /* 142 */
+    {"CRC-8/DVB-S2",        models + 100},  /* 143 */
+    {"CRC-8/EBU",           models + 34},   /* 144 */
+    {"CRC-8/GSM-A",         models + 31},   /* 145 */
+    {"CRC-8/GSM-B",         models + 53},   /* 146 */
+    {"CRC-8/I-432-1",       models + 12},   /* 147 */
+    {"CRC-8/I-CODE",        models + 32},   /* 148 */
+    {"CRC-8/ITU",           models + 12},   /* 149 */
+    {"CRC-8/LTE",           models + 86},   /* 150 */
+    {"CRC-8/MAXIM",         models + 43},   /* 151 */
+    {"CRC-8/MAXIM-DOW",     models + 43},   /* 152 */
+    {"CRC-8/NRSC-5",        models + 44},   /* 153 */
+    {"CRC-8/OPENSAFETY",    models + 39},   /* 154 */
+    {"CRC-8/ROHC",          models + 13},   /* 155 */
+    {"CRC-8/SAE-J1850",     models + 33},   /* 156 */
+    {"CRC-8/SMBUS",         models + 11},   /* 157 */
+    {"CRC-8/TECH-3250",     models + 34},   /* 158 */
+    {"CRC-8/WCDMA",         models + 87},   /* 159 */
+    {"CRC-82/DARC",         models + 17},   /* 160 */
+    {"CRC-A",               models + 24},   /* 161 */
+    {"CRC-B",               models + 28},   /* 162 */
+    {"CRC-CCITT",           models + 20},   /* 163 */
+    {"CRC-IBM",             models + 68},   /* 164 */
+    {"DOW-CRC",             models + 43},   /* 165 */
+    {"JAMCRC",              models +  7},   /* 166 */
+    {"KERMIT",              models + 20},   /* 167 */
+    {"MODBUS",              models + 72},   /* 168 */
+    {"PKZIP",               models +  8},   /* 169 */
+    {"R-CRC-16",            models + 10},   /* 170 */
+    {"X-25",                models + 28},   /* 171 */
+    {"X-CRC-12",            models + 76},   /* 172 */
+    {"X-CRC-16",            models +  9},   /* 173 */
+    {"XFER",                models +  1},   /* 174 */
+    {"XMODEM",              models + 18},   /* 175 */
+    {"ZMODEM",              models + 18},   /* 176 */
     {NULL,                  NULL      },    /* terminating entry */
 };
 #    define NALIASES 177
@@ -788,21 +788,22 @@ static void munpack(model_t *, const struct mpreset *);
 /* copy a parameter of a preset to a poly */
 
 #define PUNPACK(poly, preset, field) {\
-    unsigned long iter, idx; \
-    palloc((poly), (preset)->width); \
-    if((preset)->field) \
-        for(iter=0UL, idx=0UL; \
-            iter < (poly)->length; \
-            iter += BMP_BIT, ++idx) \
-        (poly)->bitmap[idx] = (preset)->field[idx]; \
-}
+        unsigned long iter, idx; \
+        palloc((poly), (preset)->width); \
+        if((preset)->field) \
+            for(iter=0UL, idx=0UL; \
+                iter < (poly)->length; \
+                iter += BMP_BIT, ++idx) \
+                (poly)->bitmap[idx] = (preset)->field[idx]; \
+    }
 
 /* copy a parameter of a preset into a model */
 #define MUNPACK(parm) PUNPACK(&dest->parm, src, b##parm)
 
 /* Definitions */
 
-int mbynam(model_t *dest, const char *key) {
+int mbynam(model_t *dest, const char *key)
+{
     /* Sets parameters in dest according to the model named by key.
      */
     size_t left = 0, right = NALIASES, middle = 0;
@@ -810,12 +811,12 @@ int mbynam(model_t *dest, const char *key) {
     char *ukey, *uptr;
 
     if (!aliases->name)
-        return(-1);
+        return (-1);
 
     ukey = calloc((size_t) 1 + strlen(key) + 1, sizeof(char));
     if (!ukey) {
         uerror("[!] cannot allocate memory for comparison string");
-        return(0);
+        return (0);
     }
     uptr = ukey;
     do
@@ -831,24 +832,27 @@ int mbynam(model_t *dest, const char *key) {
     free(ukey);
 
     if (cmp)
-        return(0);
+        return (0);
     munpack(dest, aliases[middle].model);
-    return(1);
+    return (1);
 }
 
-void mbynum(model_t *dest, int num) {
+void mbynum(model_t *dest, int num)
+{
     /* Sets parameters in dest according to the model indexed by num. */
     if (num > NPRESETS)
         num = NPRESETS;
-    munpack(dest, num+models);
+    munpack(dest, num + models);
 }
 
-int mcount(void) {
+int mcount(void)
+{
     /* Returns the number of preset models. */
     return (NPRESETS);
 }
 
-char * mnames(void) {
+char *mnames(void)
+{
     /* Returns a malloc()-ed string of the names of all preset
      * models, separated by newlines and terminated by NULL.
      * Aliases are not listed.
@@ -862,7 +866,7 @@ char * mnames(void) {
             size += strlen(aptr->name) + 1;
         ++aptr;
     }
-    if (!size) return(NULL);
+    if (!size) return (NULL);
 
     string = calloc(size, sizeof(char));
     if (string) {
@@ -880,10 +884,11 @@ char * mnames(void) {
     } else
         uerror("cannot allocate memory for list of models");
 
-    return(string);
+    return (string);
 }
 
-void mmatch(model_t *model, int flags) {
+void mmatch(model_t *model, int flags)
+{
     /* searches models[] for a model matching the argument, and links a name if found
      * if flags & M_OVERWR, copies the found model onto the argument. */
     size_t left = 0, right = NPRESETS, middle = 0;
@@ -893,10 +898,10 @@ void mmatch(model_t *model, int flags) {
 
     while (left < right && cmp) {
         middle = (left >> 1) + (right >> 1);
-        PUNPACK(&poly, models+middle, bspoly);
+        PUNPACK(&poly, models + middle, bspoly);
         cmp = psncmp(&model->spoly, &poly);
         if (!cmp) {
-            PUNPACK(&poly, models+middle, binit);
+            PUNPACK(&poly, models + middle, binit);
             cmp = psncmp(&model->init, &poly);
         }
         if (!cmp) {
@@ -909,7 +914,7 @@ void mmatch(model_t *model, int flags) {
             else if ((~model->flags & P_REFOUT) && (models[middle].flags & P_REFOUT))
                 cmp = -1;
             else {
-                PUNPACK(&poly, models+middle, bxorout);
+                PUNPACK(&poly, models + middle, bxorout);
                 cmp = psncmp(&model->xorout, &poly);
             }
         }
@@ -921,12 +926,13 @@ void mmatch(model_t *model, int flags) {
     if (!cmp) {
         model->name = models[middle].alias->name;
         if (flags & M_OVERWR)
-            munpack(model, models+middle);
+            munpack(model, models + middle);
     }
 }
 
 /* Private functions */
-static void munpack(model_t *dest, const struct mpreset *src) {
+static void munpack(model_t *dest, const struct mpreset *src)
+{
     /* Copies the parameters of src to dest.
      * dest must be an initialised model.
      */
diff --git a/client/reveng/reveng.c b/client/reveng/reveng.c
index af4f2985b..627c8bc31 100644
--- a/client/reveng/reveng.c
+++ b/client/reveng/reveng.c
@@ -62,19 +62,20 @@ static void chkres(int *resc, model_t **result, const poly_t divisor, const poly
 static const poly_t pzero = PZERO;
 
 model_t *
-reveng(const model_t *guess, const poly_t qpoly, int rflags, int args, const poly_t *argpolys) {
+reveng(const model_t *guess, const poly_t qpoly, int rflags, int args, const poly_t *argpolys)
+{
     /* Complete the parameters of a model by calculation or brute search. */
     poly_t *pworks, *wptr, rem, gpoly;
     model_t *result = NULL, *rptr;
     int resc = 0;
     unsigned long spin = 0, seq = 0;
 
-    if(~rflags & R_HAVEP) {
+    if (~rflags & R_HAVEP) {
         /* The poly is not known.
          * Produce a list of differences between the arguments.
          */
         pworks = modpol(guess->init, rflags, args, argpolys);
-        if(!pworks || !plen(*pworks)) {
+        if (!pworks || !plen(*pworks)) {
             free(pworks);
             goto requit;
         }
@@ -84,20 +85,20 @@ reveng(const model_t *guess, const poly_t qpoly, int rflags, int args, const pol
          * loop. qpoly does not need fixing as it is only
          * compared with odd polys.
          */
-        if(plen(gpoly))
+        if (plen(gpoly))
             pshift(&gpoly, gpoly, 0UL, 0UL, plen(gpoly) - 1UL, 1UL);
 
-        while(piter(&gpoly) && (~rflags & R_HAVEQ || pcmp(&gpoly, &qpoly) < 0)) {
+        while (piter(&gpoly) && (~rflags & R_HAVEQ || pcmp(&gpoly, &qpoly) < 0)) {
             /* For each possible poly of this size, try
              * dividing all the differences in the list.
              */
-            if(!(spin++ & R_SPMASK)) {
+            if (!(spin++ & R_SPMASK)) {
                 uprog(gpoly, guess->flags, seq++);
             }
-            for(wptr = pworks; plen(*wptr); ++wptr) {
+            for (wptr = pworks; plen(*wptr); ++wptr) {
                 /* straight divide message by poly, don't multiply by x^n */
                 rem = pcrc(*wptr, gpoly, pzero, pzero, 0);
-                if(ptst(rem)) {
+                if (ptst(rem)) {
                     pfree(&rem);
                     break;
                 } else
@@ -107,34 +108,33 @@ reveng(const model_t *guess, const poly_t qpoly, int rflags, int args, const pol
              * candidate.  Search for an Init value for this
              * poly or if Init is known, log the result.
              */
-            if(!plen(*wptr)) {
+            if (!plen(*wptr)) {
                 /* gpoly is a candidate poly */
-                if(rflags & R_HAVEI && rflags & R_HAVEX)
+                if (rflags & R_HAVEI && rflags & R_HAVEX)
                     chkres(&resc, &result, gpoly, guess->init, guess->flags, guess->xorout, args, argpolys);
-                else if(rflags & R_HAVEI)
+                else if (rflags & R_HAVEI)
                     calout(&resc, &result, gpoly, guess->init, guess->flags, args, argpolys);
-                else if(rflags & R_HAVEX)
+                else if (rflags & R_HAVEX)
                     calini(&resc, &result, gpoly, guess->flags, guess->xorout, args, argpolys);
                 else
                     engini(&resc, &result, gpoly, guess->flags, args, argpolys);
             }
-            if(!piter(&gpoly))
+            if (!piter(&gpoly))
                 break;
         }
         /* Finished with gpoly and the differences list, free them.
          */
         pfree(&gpoly);
-        for(wptr = pworks; plen(*wptr); ++wptr)
+        for (wptr = pworks; plen(*wptr); ++wptr)
             pfree(wptr);
         free(pworks);
-    }
-    else if(rflags & R_HAVEI && rflags & R_HAVEX)
+    } else if (rflags & R_HAVEI && rflags & R_HAVEX)
         /* All parameters are known!  Submit the result if we get here */
         chkres(&resc, &result, guess->spoly, guess->init, guess->flags, guess->xorout, args, argpolys);
-    else if(rflags & R_HAVEI)
+    else if (rflags & R_HAVEI)
         /* Poly and Init are known, calculate XorOut */
         calout(&resc, &result, guess->spoly, guess->init, guess->flags, args, argpolys);
-    else if(rflags & R_HAVEX)
+    else if (rflags & R_HAVEX)
         /* Poly and XorOut are known, calculate Init */
         calini(&resc, &result, guess->spoly, guess->flags, guess->xorout, args, argpolys);
     else
@@ -142,7 +142,7 @@ reveng(const model_t *guess, const poly_t qpoly, int rflags, int args, const pol
         engini(&resc, &result, guess->spoly, guess->flags, args, argpolys);
 
 requit:
-    if(!(result = realloc(result, ++resc * sizeof(model_t)))) {
+    if (!(result = realloc(result, ++resc * sizeof(model_t)))) {
         uerror("cannot reallocate result array");
         return NULL;
     }
@@ -155,11 +155,12 @@ requit:
     rptr->magic  = pzero;
     rptr->name   = NULL;
 
-    return(result);
+    return (result);
 }
 
 static poly_t *
-modpol(const poly_t init, int rflags, int args, const poly_t *argpolys) {
+modpol(const poly_t init, int rflags, int args, const poly_t *argpolys)
+{
     /* Produce, in ascending length order, a list of differences
      * between the arguments in the list by summing pairs of arguments.
      * If R_HAVEI is not set in rflags, only pairs of equal length are
@@ -172,27 +173,27 @@ modpol(const poly_t init, int rflags, int args, const poly_t *argpolys) {
     const poly_t *aptr, *bptr, *eptr = argpolys + args;
     unsigned long alen, blen;
 
-    if(args < 2) return(NULL);
+    if (args < 2) return (NULL);
 
     result = calloc(((((args - 1) * args) >> 1) + 1) * sizeof(poly_t), sizeof(char));
-    if(!result)
+    if (!result)
         uerror("cannot allocate memory for codeword table");
 
     rptr = result;
 
-    for(aptr = argpolys; aptr < eptr; ++aptr) {
+    for (aptr = argpolys; aptr < eptr; ++aptr) {
         alen = plen(*aptr);
-        for(bptr = aptr + 1; bptr < eptr; ++bptr) {
+        for (bptr = aptr + 1; bptr < eptr; ++bptr) {
             blen = plen(*bptr);
-            if(alen == blen) {
+            if (alen == blen) {
                 work = pclone(*aptr);
                 psum(&work, *bptr, 0UL);
-            } else if(rflags & R_HAVEI && alen < blen) {
+            } else if (rflags & R_HAVEI && alen < blen) {
                 work = pclone(*bptr);
                 psum(&work, *aptr, blen - alen);
                 psum(&work, init, 0UL);
                 psum(&work, init, blen - alen);
-            } else if(rflags & R_HAVEI /* && alen > blen */) {
+            } else if (rflags & R_HAVEI /* && alen > blen */) {
                 work = pclone(*aptr);
                 psum(&work, *bptr, alen - blen);
                 psum(&work, init, 0UL);
@@ -200,17 +201,16 @@ modpol(const poly_t init, int rflags, int args, const poly_t *argpolys) {
             } else
                 work = pzero;
 
-            if(plen(work))
+            if (plen(work))
                 pnorm(&work);
-            if((blen = plen(work))) {
+            if ((blen = plen(work))) {
                 /* insert work into result[] in ascending order of length */
-                for(iptr = result; iptr < rptr; ++iptr) {
-                    if(plen(work) < plen(*iptr)) {
+                for (iptr = result; iptr < rptr; ++iptr) {
+                    if (plen(work) < plen(*iptr)) {
                         swap = *iptr;
                         *iptr = work;
                         work = swap;
-                    }
-                    else if(plen(*iptr) == blen && !pcmp(&work, iptr)) {
+                    } else if (plen(*iptr) == blen && !pcmp(&work, iptr)) {
                         pfree(&work);
                         work = *--rptr;
                         break;
@@ -221,11 +221,12 @@ modpol(const poly_t init, int rflags, int args, const poly_t *argpolys) {
         }
     }
     *rptr = pzero;
-    return(result);
+    return (result);
 }
 
 static void
-engini(int *resc, model_t **result, const poly_t divisor, int flags, int args, const poly_t *argpolys) {
+engini(int *resc, model_t **result, const poly_t divisor, int flags, int args, const poly_t *argpolys)
+{
     /* Search for init values implied by the arguments.
      * Method from: Ewing, Gregory C. (March 2010).
      * "Reverse-Engineering a CRC Algorithm". Christchurch:
@@ -242,21 +243,24 @@ engini(int *resc, model_t **result, const poly_t divisor, int flags, int args, c
 
     /* Allocate the CRC matrix */
     mat = (poly_t *) calloc((dlen << 1) * sizeof(poly_t), sizeof(char));
-    if(!mat)
+    if (!mat)
         uerror("cannot allocate memory for CRC matrix");
 
     /* Find arguments of the two shortest lengths */
     alen = blen = plen(*(aptr = bptr = iptr = argpolys));
-    for(++iptr; iptr < argpolys + args; ++iptr) {
+    for (++iptr; iptr < argpolys + args; ++iptr) {
         ilen = plen(*iptr);
-        if(ilen < alen) {
-            bptr = aptr; blen = alen;
-            aptr = iptr; alen = ilen;
-        } else if(ilen > alen && (aptr == bptr || ilen < blen)) {
-            bptr = iptr; blen = ilen;
+        if (ilen < alen) {
+            bptr = aptr;
+            blen = alen;
+            aptr = iptr;
+            alen = ilen;
+        } else if (ilen > alen && (aptr == bptr || ilen < blen)) {
+            bptr = iptr;
+            blen = ilen;
         }
     }
-    if(aptr == bptr) {
+    if (aptr == bptr) {
         /* if no arguments are suitable, calculate Init with an
          * assumed XorOut of 0.  Create a padded XorOut
          */
@@ -270,7 +274,7 @@ engini(int *resc, model_t **result, const poly_t divisor, int flags, int args, c
     /* Find the potential contribution of the bottom bit of Init */
     palloc(&pone, 1UL);
     piter(&pone);
-    if(blen < (dlen << 1)) {
+    if (blen < (dlen << 1)) {
         palloc(&apoly, dlen); /* >= 1 */
         psum(&apoly, pone, (dlen << 1) - 1UL - blen); /* >= 0 */
         psum(&apoly, pone, (dlen << 1) - 1UL - alen); /* >= 1 */
@@ -279,7 +283,7 @@ engini(int *resc, model_t **result, const poly_t divisor, int flags, int args, c
         psum(&apoly, pone, 0UL);
         psum(&apoly, pone, blen - alen); /* >= 1 */
     }
-    if(plen(apoly) > dlen) {
+    if (plen(apoly) > dlen) {
         mat[dlen] = pcrc(apoly, divisor, pzero, pzero, 0);
         pfree(&apoly);
     } else {
@@ -292,28 +296,28 @@ engini(int *resc, model_t **result, const poly_t divisor, int flags, int args, c
 
     /* Populate the matrix */
     palloc(&apoly, 1UL);
-    for(jptr=mat; jptr<mat+dlen; ++jptr)
+    for (jptr = mat; jptr < mat + dlen; ++jptr)
         *jptr = pzero;
-    for(iptr = jptr++; jptr < mat + (dlen << 1); iptr = jptr++)
-        *jptr = pcrc(apoly, divisor, *iptr, pzero, P_MULXN);
+    for (iptr = jptr++; jptr < mat + (dlen << 1); iptr = jptr++)
+        * jptr = pcrc(apoly, divisor, *iptr, pzero, P_MULXN);
     pfree(&apoly);
 
     /* Transpose the matrix, augment with the Init contribution
      * and convert to row echelon form
      */
-    for(i=0UL; i<dlen; ++i) {
+    for (i = 0UL; i < dlen; ++i) {
         apoly = pzero;
         iptr = mat + (dlen << 1);
-        for(j=0UL; j<dlen; ++j)
+        for (j = 0UL; j < dlen; ++j)
             ppaste(&apoly, *--iptr, i, j, j + 1UL, dlen + 1UL);
-        if(ptst(apoly))
+        if (ptst(apoly))
             ppaste(&apoly, bpoly, i, dlen, dlen + 1UL, dlen + 1UL);
         j = pfirst(apoly);
-        while(j < dlen && !pident(mat[j], pzero)) {
+        while (j < dlen && !pident(mat[j], pzero)) {
             psum(&apoly, mat[j], 0UL); /* pfirst(apoly) > j */
             j = pfirst(apoly);
         }
-        if(j < dlen)
+        if (j < dlen)
             mat[j] = apoly; /* pident(mat[j], pzero) || pfirst(mat[j]) == j */
         else
             pfree(&apoly);
@@ -329,20 +333,20 @@ engini(int *resc, model_t **result, const poly_t divisor, int flags, int args, c
         cy = 1;
         apoly = pclone(bpoly);
         jptr = mat + dlen;
-        for(i=0UL; i<dlen; ++i) {
+        for (i = 0UL; i < dlen; ++i) {
             /* Compute next bit of Init */
-            if(pmpar(apoly, *--jptr))
+            if (pmpar(apoly, *--jptr))
                 psum(&apoly, pone, dlen - 1UL - i);
             /* Toggle each zero row with carry, for next iteration */
-            if(cy) {
-                   if(pident(*jptr, pzero)) {
-                       /* 0 to 1, no carry */
-                       *jptr = bpoly;
-                       cy = 0;
-                   } else if(pident(*jptr, bpoly)) {
-                       /* 1 to 0, carry forward */
-                       *jptr = pzero;
-                   }
+            if (cy) {
+                if (pident(*jptr, pzero)) {
+                    /* 0 to 1, no carry */
+                    *jptr = bpoly;
+                    cy = 0;
+                } else if (pident(*jptr, bpoly)) {
+                    /* 1 to 0, carry forward */
+                    *jptr = pzero;
+                }
             }
         }
 
@@ -352,18 +356,19 @@ engini(int *resc, model_t **result, const poly_t divisor, int flags, int args, c
         /* Test the Init value and add to results if correct */
         calout(resc, result, divisor, apoly, flags, args, argpolys);
         pfree(&apoly);
-    } while(!cy);
+    } while (!cy);
     pfree(&pone);
     pfree(&bpoly);
 
     /* Free the matrix. */
-    for(jptr=mat; jptr < mat + (dlen << 1); ++jptr)
+    for (jptr = mat; jptr < mat + (dlen << 1); ++jptr)
         pfree(jptr);
     free(mat);
 }
 
 static void
-calout(int *resc, model_t **result, const poly_t divisor, const poly_t init, int flags, int args, const poly_t *argpolys) {
+calout(int *resc, model_t **result, const poly_t divisor, const poly_t init, int flags, int args, const poly_t *argpolys)
+{
     /* Calculate Xorout, check it against all the arguments and
      * add to results if consistent.
      */
@@ -371,14 +376,15 @@ calout(int *resc, model_t **result, const poly_t divisor, const poly_t init, int
     const poly_t *aptr, *iptr;
     unsigned long alen, ilen;
 
-    if(args < 1) return;
+    if (args < 1) return;
 
     /* find argument of the shortest length */
     alen = plen(*(aptr = iptr = argpolys));
-    for(++iptr; iptr < argpolys + args; ++iptr) {
+    for (++iptr; iptr < argpolys + args; ++iptr) {
         ilen = plen(*iptr);
-        if(ilen < alen) {
-            aptr = iptr; alen = ilen;
+        if (ilen < alen) {
+            aptr = iptr;
+            alen = ilen;
         }
     }
 
@@ -388,7 +394,7 @@ calout(int *resc, model_t **result, const poly_t divisor, const poly_t init, int
      * model, the refout stage intervenes between init and
      * xorout.
      */
-    if(flags & P_REFOUT)
+    if (flags & P_REFOUT)
         prev(&xorout);
 
     /* Submit the model to the results table.
@@ -400,7 +406,8 @@ calout(int *resc, model_t **result, const poly_t divisor, const poly_t init, int
 }
 
 static void
-calini(int *resc, model_t **result, const poly_t divisor, int flags, const poly_t xorout, int args, const poly_t *argpolys) {
+calini(int *resc, model_t **result, const poly_t divisor, int flags, const poly_t xorout, int args, const poly_t *argpolys)
+{
     /* Calculate Init, check it against all the arguments and add to
      * results if consistent.
      */
@@ -408,14 +415,15 @@ calini(int *resc, model_t **result, const poly_t divisor, int flags, const poly_
     const poly_t *aptr, *iptr;
     unsigned long alen, ilen;
 
-    if(args < 1) return;
+    if (args < 1) return;
 
     /* find argument of the shortest length */
     alen = plen(*(aptr = iptr = argpolys));
-    for(++iptr; iptr < argpolys + args; ++iptr) {
+    for (++iptr; iptr < argpolys + args; ++iptr) {
         ilen = plen(*iptr);
-        if(ilen < alen) {
-            aptr = iptr; alen = ilen;
+        if (ilen < alen) {
+            aptr = iptr;
+            alen = ilen;
         }
     }
 
@@ -427,7 +435,7 @@ calini(int *resc, model_t **result, const poly_t divisor, int flags, const poly_
      * mirror image of the forward XorOut.
      */
     rxor = pclone(xorout);
-    if(~flags & P_REFOUT)
+    if (~flags & P_REFOUT)
         prev(&rxor);
     arg = pclone(*aptr);
     prev(&arg);
@@ -447,7 +455,8 @@ calini(int *resc, model_t **result, const poly_t divisor, int flags, const poly_
 }
 
 static void
-chkres(int *resc, model_t **result, const poly_t divisor, const poly_t init, int flags, const poly_t xorout, int args, const poly_t *argpolys) {
+chkres(int *resc, model_t **result, const poly_t divisor, const poly_t init, int flags, const poly_t xorout, int args, const poly_t *argpolys)
+{
     /* Checks a model against the argument list, and adds to the
      * external results table if consistent.
      * Extends the result array and updates the external pointer if
@@ -462,12 +471,12 @@ chkres(int *resc, model_t **result, const poly_t divisor, const poly_t init, int
      * stage.
      */
     xor = pclone(xorout);
-    if(flags & P_REFOUT)
+    if (flags & P_REFOUT)
         prev(&xor);
 
-    for(; aptr < eptr; ++aptr) {
+    for (; aptr < eptr; ++aptr) {
         crc = pcrc(*aptr, divisor, init, xor, 0);
-        if(ptst(crc)) {
+        if (ptst(crc)) {
             pfree(&crc);
             break;
         } else {
@@ -475,7 +484,7 @@ chkres(int *resc, model_t **result, const poly_t divisor, const poly_t init, int
         }
     }
     pfree(&xor);
-    if(aptr != eptr) return;
+    if (aptr != eptr) return;
 
     *result = realloc(*result, ++*resc * sizeof(model_t));
     if (!*result) {
diff --git a/client/reveng/reveng.h b/client/reveng/reveng.h
index 7489d2da4..66db6ba81 100644
--- a/client/reveng/reveng.h
+++ b/client/reveng/reveng.h
@@ -136,7 +136,7 @@ extern void setbmp(void);
 typedef struct {
     unsigned long length; /* number of significant bits */
     bmp_t *bitmap;        /* bitmap, MSB first, */
-                          /* left-justified in each word */
+    /* left-justified in each word */
 } poly_t;
 
 extern poly_t filtop(FILE *input, unsigned long length, int flags, int bperhx);
diff --git a/client/scandir.c b/client/scandir.c
index e0986e4d2..e5003ee74 100644
--- a/client/scandir.c
+++ b/client/scandir.c
@@ -18,10 +18,10 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-int scandir (const char *dir,
-     struct dirent ***namelist,
-     int (*select) (const struct dirent *),
-     int (*compar) (const struct dirent **, const struct dirent **))
+int scandir(const char *dir,
+            struct dirent ***namelist,
+            int (*select)(const struct dirent *),
+            int (*compar)(const struct dirent **, const struct dirent **))
 {
     DIR *dirp;
     struct dirent *ent, *etmp, **nl = NULL, **ntmp;
@@ -29,13 +29,13 @@ int scandir (const char *dir,
     int allocated = 0;
     int err_no = 0;
 
-    if (!(dirp = opendir (dir)))
+    if (!(dirp = opendir(dir)))
         return -1;
 
-    while ((ent = readdir (dirp))) {
-        if (!select || select (ent)) {
+    while ((ent = readdir(dirp))) {
+        if (!select || select(ent)) {
 
-            err_no =0;
+            err_no = 0;
 
             if (count == allocated) {
                 if (allocated == 0)
@@ -43,7 +43,7 @@ int scandir (const char *dir,
                 else
                     allocated *= 2;
 
-                ntmp = (struct dirent **) realloc (nl, allocated * sizeof *nl);
+                ntmp = (struct dirent **) realloc(nl, allocated * sizeof * nl);
                 if (!ntmp) {
                     err_no = 1;
                     break;
@@ -51,7 +51,7 @@ int scandir (const char *dir,
                 nl = ntmp;
             }
 
-            etmp = (struct dirent *) calloc (sizeof *ent, sizeof(char));
+            etmp = (struct dirent *) calloc(sizeof * ent, sizeof(char));
             if (!etmp) {
                 err_no = 1;
                 break;
@@ -62,19 +62,19 @@ int scandir (const char *dir,
     }
 
     if (err_no != 0) {
-        closedir (dirp);
+        closedir(dirp);
         if (nl) {
             while (count > 0) {
-                free (nl[--count]);
+                free(nl[--count]);
             }
-            free (nl);
+            free(nl);
         }
         return -1;
     }
 
-    closedir (dirp);
+    closedir(dirp);
 
-    qsort (nl, count, sizeof *nl, (int (*)(const void *, const void *)) compar);
+    qsort(nl, count, sizeof * nl, (int (*)(const void *, const void *)) compar);
     if (namelist)
         *namelist = nl;
     return count;
@@ -86,9 +86,9 @@ int scandir (const char *dir,
 #ifdef __cplusplus
 extern "C" {
 #endif
-int alphasort (const struct dirent **a, const struct dirent **b)
+int alphasort(const struct dirent **a, const struct dirent **b)
 {
-    return strcoll ((*a)->d_name, (*b)->d_name);
+    return strcoll((*a)->d_name, (*b)->d_name);
 }
 #ifdef __cplusplus
 }
diff --git a/client/scandir.h b/client/scandir.h
index 22399bc0f..a41a13319 100644
--- a/client/scandir.h
+++ b/client/scandir.h
@@ -15,8 +15,8 @@
 #include <stdlib.h>
 
 #ifdef _WIN32
-extern int scandir (const char *dir, struct dirent ***namelist, int (*select) (const struct dirent *), int (*compar) (const struct dirent **, const struct dirent **));
-extern int alphasort (const struct dirent **a, const struct dirent **b);
+extern int scandir(const char *dir, struct dirent ***namelist, int (*select)(const struct dirent *), int (*compar)(const struct dirent **, const struct dirent **));
+extern int alphasort(const struct dirent **a, const struct dirent **b);
 #endif // _WIN32
 
 #endif // SCANDIR_H__
\ No newline at end of file
diff --git a/client/scripting.c b/client/scripting.c
index 2df14888a..4377bc1cd 100644
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -17,7 +17,8 @@
  * @param L
  * @return
  */
-static int l_SendCommand(lua_State *L){
+static int l_SendCommand(lua_State *L)
+{
 
     /*
      The SendCommand (native) expects the following structure:
@@ -36,12 +37,12 @@ static int l_SendCommand(lua_State *L){
     size_t size;
     const char *data = luaL_checklstring(L, 1, &size);
     if (size != sizeof(UsbCommand)) {
-        printf("Got data size %d, expected %d" , (int) size,(int) sizeof(UsbCommand));
-        lua_pushstring(L,"Wrong data size");
+        printf("Got data size %d, expected %d", (int) size, (int) sizeof(UsbCommand));
+        lua_pushstring(L, "Wrong data size");
         return 1;
     }
 
-    SendCommand((UsbCommand* )data);
+    SendCommand((UsbCommand *)data);
     return 0; // no return values
 }
 
@@ -53,7 +54,8 @@ static int l_SendCommand(lua_State *L){
  * @param L
  * @return
  */
-static int l_GetFromBigBuf(lua_State *L){
+static int l_GetFromBigBuf(lua_State *L)
+{
 
     int len = 0, startindex = 0;
 
@@ -71,14 +73,14 @@ static int l_GetFromBigBuf(lua_State *L){
     }
 
     uint8_t *data = calloc(len, sizeof(uint8_t));
-    if ( !data ) {
+    if (!data) {
         //signal error by returning Nil, errorstring
         lua_pushnil(L);
-        lua_pushstring(L,"Allocating memory failed");
+        lua_pushstring(L, "Allocating memory failed");
         return 2; // two return values
     }
 
-    if ( !GetFromDevice(BIG_BUF, data, len, startindex, NULL, 2500, false)) {
+    if (!GetFromDevice(BIG_BUF, data, len, startindex, NULL, 2500, false)) {
         free(data);
         lua_pushnil(L);
         lua_pushstring(L, "command execution time out");
@@ -86,7 +88,7 @@ static int l_GetFromBigBuf(lua_State *L){
     }
 
     //Push it as a string
-    lua_pushlstring(L,(const char *)data, len);
+    lua_pushlstring(L, (const char *)data, len);
     free(data);
     return 1;// return 1 to signal one return value
 }
@@ -99,7 +101,8 @@ static int l_GetFromBigBuf(lua_State *L){
  * @param L
  * @return
  */
-static int l_GetFromFlashMem(lua_State *L){
+static int l_GetFromFlashMem(lua_State *L)
+{
 
 #ifndef WITH_FLASH
     lua_pushnil(L);
@@ -120,20 +123,20 @@ static int l_GetFromFlashMem(lua_State *L){
     }
 
     uint8_t *data = calloc(len, sizeof(uint8_t));
-    if ( !data ) {
+    if (!data) {
         lua_pushnil(L);
         lua_pushstring(L, "Allocating memory failed");
         return 2;
     }
 
-    if ( !GetFromDevice(FLASH_MEM, data, len, startindex, NULL, -1, false)) {
+    if (!GetFromDevice(FLASH_MEM, data, len, startindex, NULL, -1, false)) {
         free(data);
         lua_pushnil(L);
         lua_pushstring(L, "command execution time out");
         return 2;
     }
 
-    lua_pushlstring(L,(const char *)data, len);
+    lua_pushlstring(L, (const char *)data, len);
     free(data);
     return 1;
 #endif
@@ -147,7 +150,8 @@ static int l_GetFromFlashMem(lua_State *L){
  * @param L
  * @return
  */
-static int l_WaitForResponseTimeout(lua_State *L){
+static int l_WaitForResponseTimeout(lua_State *L)
+{
 
     uint32_t cmd = 0;
     size_t ms_timeout = -1;
@@ -166,14 +170,14 @@ static int l_WaitForResponseTimeout(lua_State *L){
         cmd = luaL_checkunsigned(L, 1);
     }
     // extract second param. timeout value
-    if(n >= 2){
+    if (n >= 2) {
         ms_timeout = luaL_checkunsigned(L, 2);
     }
 
     UsbCommand response;
     if (WaitForResponseTimeout(cmd, &response, ms_timeout)) {
         //Push it as a string
-        lua_pushlstring(L,(const char *)&response, sizeof(UsbCommand));
+        lua_pushlstring(L, (const char *)&response, sizeof(UsbCommand));
         return 1;
     } else {
         //signal error by returning Nil, errorstring
@@ -183,19 +187,21 @@ static int l_WaitForResponseTimeout(lua_State *L){
     }
 }
 
-static int returnToLuaWithError(lua_State *L, const char* fmt, ...) {
+static int returnToLuaWithError(lua_State *L, const char *fmt, ...)
+{
     char buffer[200];
     va_list args;
-    va_start(args,fmt);
-    vsnprintf(buffer, sizeof(buffer), fmt,args);
+    va_start(args, fmt);
+    vsnprintf(buffer, sizeof(buffer), fmt, args);
     va_end(args);
 
     lua_pushnil(L);
-    lua_pushstring(L,buffer);
+    lua_pushstring(L, buffer);
     return 2;
 }
 
-static int l_mfDarkside(lua_State *L){
+static int l_mfDarkside(lua_State *L)
+{
 
     uint32_t blockno = 0;
     uint32_t keytype = MIFARE_AUTH_KEYA;
@@ -205,18 +211,19 @@ static int l_mfDarkside(lua_State *L){
     //Check number of arguments
     int n = lua_gettop(L);
     switch (n) {
-        case 2:{
+        case 2: {
             const char *p_keytype = luaL_checklstring(L, 2, &size);
-            if (size != 2)  return returnToLuaWithError(L,"Wrong size of keytype, got %d bytes, expected 1", (int) size);
+            if (size != 2)  return returnToLuaWithError(L, "Wrong size of keytype, got %d bytes, expected 1", (int) size);
             sscanf(p_keytype, "%x", &keytype);
         }
         case 1: {
             const char *p_blockno = luaL_checklstring(L, 1, &size);
-            if (size != 2)  return returnToLuaWithError(L,"Wrong size of blockno, got %d bytes, expected 2", (int) size);
+            if (size != 2)  return returnToLuaWithError(L, "Wrong size of blockno, got %d bytes, expected 2", (int) size);
             sscanf(p_blockno, "%02x", &blockno);
             break;
         }
-        default : break;
+        default :
+            break;
     }
 
     int retval = mfDarkside(blockno & 0xFF, keytype & 0xFF, &key);
@@ -230,7 +237,8 @@ static int l_mfDarkside(lua_State *L){
     return 2;
 }
 
-static int l_clearCommandBuffer(lua_State *L){
+static int l_clearCommandBuffer(lua_State *L)
+{
     clearCommandBuffer();
     return 0;
 }
@@ -239,10 +247,11 @@ static int l_clearCommandBuffer(lua_State *L){
  * @param L
  * @return
  */
-static int l_foobar(lua_State *L) {
+static int l_foobar(lua_State *L)
+{
     //Check number of arguments
     int n = lua_gettop(L);
-    printf("foobar called with %d arguments" , n);
+    printf("foobar called with %d arguments", n);
     lua_settop(L, 0);
     printf("Arguments discarded, stack now contains %d elements", lua_gettop(L));
 
@@ -252,9 +261,9 @@ static int l_foobar(lua_State *L) {
     printf("Now returning a uint64_t as a string");
     uint64_t x = 0xDEADC0DE;
     uint8_t destination[8];
-    num_to_bytes(x,sizeof(x),destination);
-    lua_pushlstring(L,(const char *)&x,sizeof(x));
-    lua_pushlstring(L,(const char *)destination,sizeof(destination));
+    num_to_bytes(x, sizeof(x), destination);
+    lua_pushlstring(L, (const char *)&x, sizeof(x));
+    lua_pushlstring(L, (const char *)destination, sizeof(destination));
     return 2;
 }
 
@@ -264,7 +273,8 @@ static int l_foobar(lua_State *L) {
  * @param L
  * @return boolean, true if kbhit, false otherwise.
  */
-static int l_ukbhit(lua_State *L) {
+static int l_ukbhit(lua_State *L)
+{
     lua_pushboolean(L, ukbhit() ? true : false);
     return 1;
 }
@@ -274,12 +284,14 @@ static int l_ukbhit(lua_State *L) {
  * @param L
  * @return
  */
-static int l_CmdConsole(lua_State *L) {
+static int l_CmdConsole(lua_State *L)
+{
     CommandReceived((char *)luaL_checkstring(L, 1));
     return 0;
 }
 
-static int l_iso15693_crc(lua_State *L) {
+static int l_iso15693_crc(lua_State *L)
+{
     uint32_t tmp;
     unsigned char buf[USB_CMD_DATA_SIZE] = {0x00};
     size_t size = 0;
@@ -291,12 +303,13 @@ static int l_iso15693_crc(lua_State *L) {
     }
 
     size /= 2;
-    compute_crc(CRC_15693, buf, size, &buf[size], &buf[size+1]);
-    lua_pushlstring(L, (const char *)&buf, size+2);
+    compute_crc(CRC_15693, buf, size, &buf[size], &buf[size + 1]);
+    lua_pushlstring(L, (const char *)&buf, size + 2);
     return 1;
 }
 
-static int l_iso14443b_crc(lua_State *L) {
+static int l_iso14443b_crc(lua_State *L)
+{
     uint32_t tmp;
     unsigned char buf[USB_CMD_DATA_SIZE] = {0x00};
     size_t size = 0;
@@ -308,8 +321,8 @@ static int l_iso14443b_crc(lua_State *L) {
     }
 
     size /= 2;
-    compute_crc(CRC_14443_B, buf, size, &buf[size], &buf[size+1]);
-    lua_pushlstring(L, (const char *)&buf, size+2);
+    compute_crc(CRC_14443_B, buf, size, &buf[size], &buf[size + 1]);
+    lua_pushlstring(L, (const char *)&buf, size + 2);
     return 1;
 }
 
@@ -317,13 +330,14 @@ static int l_iso14443b_crc(lua_State *L) {
  Simple AES 128 cbc hook up to OpenSSL.
  params:  key, input
 */
-static int l_aes128decrypt_cbc(lua_State *L) {
+static int l_aes128decrypt_cbc(lua_State *L)
+{
     //Check number of arguments
     int i;
     uint32_t tmp;
     size_t size;
     const char *p_key = luaL_checklstring(L, 1, &size);
-    if (size != 32)  return returnToLuaWithError(L,"Wrong size of key, got %d bytes, expected 32", (int) size);
+    if (size != 32)  return returnToLuaWithError(L, "Wrong size of key, got %d bytes, expected 32", (int) size);
 
     const char *p_encTxt = luaL_checklstring(L, 2, &size);
 
@@ -343,18 +357,19 @@ static int l_aes128decrypt_cbc(lua_State *L) {
     mbedtls_aes_context ctx;
     mbedtls_aes_init(&ctx);
     mbedtls_aes_setkey_dec(&ctx, aes_key, 128);
-    mbedtls_aes_crypt_cbc(&ctx, MBEDTLS_AES_DECRYPT, sizeof(indata), iv, indata, outdata );
+    mbedtls_aes_crypt_cbc(&ctx, MBEDTLS_AES_DECRYPT, sizeof(indata), iv, indata, outdata);
     //Push decrypted array as a string
-    lua_pushlstring(L,(const char *)&outdata, sizeof(outdata));
+    lua_pushlstring(L, (const char *)&outdata, sizeof(outdata));
     return 1;// return 1 to signal one return value
 }
-static int l_aes128decrypt_ecb(lua_State *L) {
+static int l_aes128decrypt_ecb(lua_State *L)
+{
     //Check number of arguments
     int i;
     uint32_t tmp;
     size_t size;
     const char *p_key = luaL_checklstring(L, 1, &size);
-    if (size != 32)  return returnToLuaWithError(L,"Wrong size of key, got %d bytes, expected 32", (int) size);
+    if (size != 32)  return returnToLuaWithError(L, "Wrong size of key, got %d bytes, expected 32", (int) size);
 
     const char *p_encTxt = luaL_checklstring(L, 2, &size);
 
@@ -372,20 +387,21 @@ static int l_aes128decrypt_ecb(lua_State *L) {
     mbedtls_aes_context ctx;
     mbedtls_aes_init(&ctx);
     mbedtls_aes_setkey_dec(&ctx, aes_key, 128);
-    mbedtls_aes_crypt_ecb(&ctx, MBEDTLS_AES_DECRYPT, indata, outdata );
+    mbedtls_aes_crypt_ecb(&ctx, MBEDTLS_AES_DECRYPT, indata, outdata);
 
     //Push decrypted array as a string
-    lua_pushlstring(L,(const char *)&outdata, sizeof(outdata));
+    lua_pushlstring(L, (const char *)&outdata, sizeof(outdata));
     return 1;// return 1 to signal one return value
 }
 
-static int l_aes128encrypt_cbc(lua_State *L) {
+static int l_aes128encrypt_cbc(lua_State *L)
+{
     //Check number of arguments
     int i;
     uint32_t tmp;
     size_t size;
     const char *p_key = luaL_checklstring(L, 1, &size);
-    if (size != 32)  return returnToLuaWithError(L,"Wrong size of key, got %d bytes, expected 32", (int) size);
+    if (size != 32)  return returnToLuaWithError(L, "Wrong size of key, got %d bytes, expected 32", (int) size);
 
     const char *p_txt = luaL_checklstring(L, 2, &size);
 
@@ -404,19 +420,20 @@ static int l_aes128encrypt_cbc(lua_State *L) {
     mbedtls_aes_context ctx;
     mbedtls_aes_init(&ctx);
     mbedtls_aes_setkey_enc(&ctx, aes_key, 128);
-    mbedtls_aes_crypt_cbc(&ctx, MBEDTLS_AES_ENCRYPT, sizeof(indata), iv, indata, outdata );
+    mbedtls_aes_crypt_cbc(&ctx, MBEDTLS_AES_ENCRYPT, sizeof(indata), iv, indata, outdata);
     //Push encrypted array as a string
-    lua_pushlstring(L,(const char *)&outdata, sizeof(outdata));
+    lua_pushlstring(L, (const char *)&outdata, sizeof(outdata));
     return 1;// return 1 to signal one return value
 }
 
-static int l_aes128encrypt_ecb(lua_State *L) {
+static int l_aes128encrypt_ecb(lua_State *L)
+{
     //Check number of arguments
     int i;
     uint32_t tmp;
     size_t size;
     const char *p_key = luaL_checklstring(L, 1, &size);
-    if (size != 32) return returnToLuaWithError(L,"Wrong size of key, got %d bytes, expected 32", (int) size);
+    if (size != 32) return returnToLuaWithError(L, "Wrong size of key, got %d bytes, expected 32", (int) size);
 
     const char *p_txt = luaL_checklstring(L, 2, &size);
 
@@ -433,38 +450,41 @@ static int l_aes128encrypt_ecb(lua_State *L) {
     mbedtls_aes_context ctx;
     mbedtls_aes_init(&ctx);
     mbedtls_aes_setkey_enc(&ctx, aes_key, 128);
-    mbedtls_aes_crypt_ecb(&ctx, MBEDTLS_AES_ENCRYPT, indata, outdata );
+    mbedtls_aes_crypt_ecb(&ctx, MBEDTLS_AES_ENCRYPT, indata, outdata);
     //Push encrypted array as a string
-    lua_pushlstring(L,(const char *)&outdata, sizeof(outdata));
+    lua_pushlstring(L, (const char *)&outdata, sizeof(outdata));
     return 1;// return 1 to signal one return value
 }
 
-static int l_crc8legic(lua_State *L) {
+static int l_crc8legic(lua_State *L)
+{
     size_t size;
     const char *p_str = luaL_checklstring(L, 1, &size);
 
-    uint16_t retval = CRC8Legic( (uint8_t*) p_str, size);
+    uint16_t retval = CRC8Legic((uint8_t *) p_str, size);
     lua_pushunsigned(L, retval);
     return 1;
 }
 
-static int l_crc16(lua_State *L) {
+static int l_crc16(lua_State *L)
+{
     size_t size;
     const char *p_str = luaL_checklstring(L, 1, &size);
 
-    uint16_t checksum = crc(CRC_CCITT,  (uint8_t*) p_str, size);
+    uint16_t checksum = crc(CRC_CCITT, (uint8_t *) p_str, size);
     lua_pushunsigned(L, checksum);
     return 1;
 }
 
-static int l_crc64(lua_State *L) {
+static int l_crc64(lua_State *L)
+{
     size_t size;
     uint64_t crc = 0;
     unsigned char outdata[8] = {0x00};
 
     const char *p_str = luaL_checklstring(L, 1, &size);
 
-    crc64( (uint8_t*) p_str, size, &crc);
+    crc64((uint8_t *) p_str, size, &crc);
 
     outdata[0] = (uint8_t)(crc >> 56) & 0xff;
     outdata[1] = (uint8_t)(crc >> 48) & 0xff;
@@ -474,11 +494,12 @@ static int l_crc64(lua_State *L) {
     outdata[5] = (uint8_t)(crc >> 16) & 0xff;
     outdata[6] = (uint8_t)(crc >> 8) & 0xff;
     outdata[7] = crc & 0xff;
-    lua_pushlstring(L,(const char *)&outdata, sizeof(outdata));
+    lua_pushlstring(L, (const char *)&outdata, sizeof(outdata));
     return 1;
 }
 
-static int l_crc64_ecma182(lua_State *L) {
+static int l_crc64_ecma182(lua_State *L)
+{
     //size_t size;
     uint64_t crc = 0;
     unsigned char outdata[8] = {0x00};
@@ -503,23 +524,25 @@ static int l_crc64_ecma182(lua_State *L) {
     return 1;
 }
 
-static int l_sha1(lua_State *L) {
+static int l_sha1(lua_State *L)
+{
     size_t size;
     const char *p_str = luaL_checklstring(L, 1, &size);
     unsigned char outdata[20] = {0x00};
-    mbedtls_sha1( (uint8_t*) p_str, size, outdata);
+    mbedtls_sha1((uint8_t *) p_str, size, outdata);
     lua_pushlstring(L, (const char *)&outdata, sizeof(outdata));
     return 1;
 }
 
-static int l_reveng_models(lua_State *L){
+static int l_reveng_models(lua_State *L)
+{
 
 // This array needs to be adjusted if RevEng adds more crc-models.
 #define NMODELS 105
 
     int count = 0;
     uint8_t in_width = luaL_checkunsigned(L, 1);
-    if ( in_width > 89 ) return returnToLuaWithError(L,"Width cannot exceed 89, got %d", in_width);
+    if (in_width > 89) return returnToLuaWithError(L, "Width cannot exceed 89, got %d", in_width);
 
     uint8_t width[NMODELS];
     memset(width, 0, sizeof(width));
@@ -531,9 +554,9 @@ static int l_reveng_models(lua_State *L){
         return returnToLuaWithError(L, "didn't find any models");
 
     lua_newtable(L);
-    for (int i = 0; i < count; i++){
-        lua_pushstring(L,  (const char*)models[i]);
-        lua_rawseti(L,-2,i+1);
+    for (int i = 0; i < count; i++) {
+        lua_pushstring(L, (const char *)models[i]);
+        lua_rawseti(L, -2, i + 1);
         free(models[i]);
     }
     return 1;
@@ -546,7 +569,8 @@ static int l_reveng_models(lua_State *L){
 // endian    ,char,  'B','b','L','l','t','r' describing if Big-Endian or Little-Endian should be used in different combinations.
 //
 // outputs:  string with hex representation of the CRC result
-static int l_reveng_RunModel(lua_State *L){
+static int l_reveng_RunModel(lua_State *L)
+{
     //-c || -v
     //inModel = valid model name string - CRC-8
     //inHexStr = input hex string to calculate crc on
@@ -561,54 +585,55 @@ static int l_reveng_RunModel(lua_State *L){
     bool reverse =  lua_toboolean(L, 3);
     const char endian = luaL_checkstring(L, 4)[0];
 
-    int ans = RunModel( (char *)inModel, (char *)inHexStr, reverse, endian, result);
+    int ans = RunModel((char *)inModel, (char *)inHexStr, reverse, endian, result);
     if (!ans)
-        return returnToLuaWithError(L,"Reveng failed");
+        return returnToLuaWithError(L, "Reveng failed");
 
-    lua_pushstring(L, (const char*)result);
+    lua_pushstring(L, (const char *)result);
     return 1;
 }
 
-static int l_hardnested(lua_State *L){
+static int l_hardnested(lua_State *L)
+{
 
     bool haveTarget = true;
     size_t size;
     uint32_t tmp;
     const char *p_blockno = luaL_checklstring(L, 1, &size);
-    if(size != 2)  return returnToLuaWithError(L,"Wrong size of blockNo, got %d bytes, expected 2", (int) size);
+    if (size != 2)  return returnToLuaWithError(L, "Wrong size of blockNo, got %d bytes, expected 2", (int) size);
 
     const char *p_keytype = luaL_checklstring(L, 2, &size);
-    if(size != 1)  return returnToLuaWithError(L,"Wrong size of keyType, got %d bytes, expected 1", (int) size);
+    if (size != 1)  return returnToLuaWithError(L, "Wrong size of keyType, got %d bytes, expected 1", (int) size);
 
     const char *p_key = luaL_checklstring(L, 3, &size);
-    if(size != 12)  return returnToLuaWithError(L,"Wrong size of key, got %d bytes, expected 12", (int) size);
+    if (size != 12)  return returnToLuaWithError(L, "Wrong size of key, got %d bytes, expected 12", (int) size);
 
     const char *p_trg_blockno = luaL_checklstring(L, 4, &size);
-    if(size != 2)  return returnToLuaWithError(L,"Wrong size of trgBlockNo, got %d bytes, expected 2", (int) size);
+    if (size != 2)  return returnToLuaWithError(L, "Wrong size of trgBlockNo, got %d bytes, expected 2", (int) size);
 
     const char *p_trg_keytype = luaL_checklstring(L, 5, &size);
-    if(size != 1)  return returnToLuaWithError(L,"Wrong size of trgKeyType, got %d bytes, expected 1", (int) size);
+    if (size != 1)  return returnToLuaWithError(L, "Wrong size of trgKeyType, got %d bytes, expected 1", (int) size);
 
     const char *p_trgkey = luaL_checklstring(L, 6, &size);
-    if(size != 12)
+    if (size != 12)
         haveTarget = false;
 
     const char *p_nonce_file_read = luaL_checklstring(L, 7, &size);
-    if(size != 1)  return returnToLuaWithError(L,"Wrong size of nonce_file_read, got %d bytes, expected 1", (int) size);
+    if (size != 1)  return returnToLuaWithError(L, "Wrong size of nonce_file_read, got %d bytes, expected 1", (int) size);
 
     const char *p_nonce_file_write = luaL_checklstring(L, 8, &size);
-    if(size != 1)  return returnToLuaWithError(L,"Wrong size of nonce_file_write, got %d bytes, expected 1", (int) size);
+    if (size != 1)  return returnToLuaWithError(L, "Wrong size of nonce_file_write, got %d bytes, expected 1", (int) size);
 
     const char *p_slow = luaL_checklstring(L, 9, &size);
-    if(size != 1)  return returnToLuaWithError(L,"Wrong size of slow, got %d bytes, expected 1", (int) size);
+    if (size != 1)  return returnToLuaWithError(L, "Wrong size of slow, got %d bytes, expected 1", (int) size);
 
     const char *p_tests = luaL_checklstring(L, 10, &size);
-    if(size != 1)  return returnToLuaWithError(L,"Wrong size of tests, got %d bytes, expected 1", (int) size);
+    if (size != 1)  return returnToLuaWithError(L, "Wrong size of tests, got %d bytes, expected 1", (int) size);
 
-    char filename[FILE_PATH_SIZE]="nonces.bin";
+    char filename[FILE_PATH_SIZE] = "nonces.bin";
     const char *p_filename = luaL_checklstring(L, 11, &size);
-    if(size != 0)
-        memcpy(filename, p_filename, FILE_PATH_SIZE-1);
+    if (size != 0)
+        memcpy(filename, p_filename, FILE_PATH_SIZE - 1);
 
     uint32_t blockNo = 0, keyType = 0;
     uint32_t trgBlockNo = 0, trgKeyType = 0;
@@ -624,8 +649,8 @@ static int l_hardnested(lua_State *L){
     sscanf(p_slow, "%x", &slow);
     sscanf(p_tests, "%x", &tests);
 
-    uint8_t key[6] = {0,0,0,0,0,0};
-    uint8_t trgkey[6] = {0,0,0,0,0,0};
+    uint8_t key[6] = {0, 0, 0, 0, 0, 0};
+    uint8_t trgkey[6] = {0, 0, 0, 0, 0, 0};
     for (int i = 0; i < 32; i += 2) {
         sscanf(&p_key[i], "%02x", &tmp);
         key[i / 2] = tmp & 0xFF;
@@ -644,7 +669,7 @@ static int l_hardnested(lua_State *L){
     num_to_bytes(foundkey, sizeof(dest_key), dest_key);
 
     //Push the retval on the stack
-    lua_pushinteger(L,retval);
+    lua_pushinteger(L, retval);
     lua_pushlstring(L, (const char *) dest_key, sizeof(dest_key));
     return 2; //Two return values
 }
@@ -655,7 +680,8 @@ static int l_hardnested(lua_State *L){
  * @param L
  * @return
  */
-static int l_detect_prng(lua_State *L) {
+static int l_detect_prng(lua_State *L)
+{
     int res = detect_classic_prng();
     lua_pushinteger(L, res);
     return 1;
@@ -665,13 +691,14 @@ static int l_detect_prng(lua_State *L) {
  * @param L
  * @return
  */
-static int l_keygen_algoD(lua_State *L) {
+static int l_keygen_algoD(lua_State *L)
+{
     size_t size;
     uint32_t tmp;
     const char *p_uid = luaL_checklstring(L, 1, &size);
-    if (size != 14) return returnToLuaWithError(L,"Wrong size of UID, got %d bytes, expected 14", (int) size);
+    if (size != 14) return returnToLuaWithError(L, "Wrong size of UID, got %d bytes, expected 14", (int) size);
 
-    uint8_t uid[7] = {0,0,0,0,0,0,0};
+    uint8_t uid[7] = {0, 0, 0, 0, 0, 0, 0};
 
     for (int i = 0; i < 14; i += 2) {
         sscanf(&p_uid[i], "%02x", &tmp);
@@ -694,22 +721,24 @@ static int l_keygen_algoD(lua_State *L) {
  * @param path
  * @return
  */
-int setLuaPath( lua_State* L, const char* path ) {
-    lua_getglobal( L, "package" );
-    lua_getfield( L, -1, "path" ); // get field "path" from table at top of stack (-1)
-    const char* cur_path = lua_tostring( L, -1 ); // grab path string from top of stack
-    int requiredLength = strlen(cur_path)+ strlen(path)+10; //A few bytes too many, whatever we can afford it
-    char * buf = calloc(requiredLength, sizeof(char));
+int setLuaPath(lua_State *L, const char *path)
+{
+    lua_getglobal(L, "package");
+    lua_getfield(L, -1, "path");   // get field "path" from table at top of stack (-1)
+    const char *cur_path = lua_tostring(L, -1);   // grab path string from top of stack
+    int requiredLength = strlen(cur_path) + strlen(path) + 10; //A few bytes too many, whatever we can afford it
+    char *buf = calloc(requiredLength, sizeof(char));
     snprintf(buf, requiredLength, "%s;%s", cur_path, path);
-    lua_pop( L, 1 ); // get rid of the string on the stack we just pushed on line 5
-    lua_pushstring( L, buf ); // push the new one
-    lua_setfield( L, -2, "path" ); // set the field "path" in table at -2 with value at top of stack
-    lua_pop( L, 1 ); // get rid of package table from top of stack
+    lua_pop(L, 1);   // get rid of the string on the stack we just pushed on line 5
+    lua_pushstring(L, buf);   // push the new one
+    lua_setfield(L, -2, "path");   // set the field "path" in table at -2 with value at top of stack
+    lua_pop(L, 1);   // get rid of package table from top of stack
     free(buf);
     return 0; // all done!
 }
 
-int set_pm3_libraries(lua_State *L) {
+int set_pm3_libraries(lua_State *L)
+{
     static const luaL_Reg libs[] = {
         {"SendCommand",                 l_SendCommand},
         {"GetFromBigBuf",               l_GetFromBigBuf},
diff --git a/client/snooper.c b/client/snooper.c
index 3c145629f..66fa3d1b6 100644
--- a/client/snooper.c
+++ b/client/snooper.c
@@ -13,34 +13,34 @@
 #include "cmdmain.h"
 
 #define HANDLE_ERROR if (error_occured) { \
-  error_occured = 0;\
-  break;\
-}
+        error_occured = 0;\
+        break;\
+    }
 
 int main()
 {
-  usb_init();
-  SetLogFilename("snooper.log");
+    usb_init();
+    SetLogFilename("snooper.log");
 
-  return_on_error = 1;
+    return_on_error = 1;
 
-  while(1) {
-    while (!OpenProxmark()) { sleep(1); }
     while (1) {
-      UsbCommand cmdbuf;
-      CommandReceived("hf 14a snoop");
-      HANDLE_ERROR;
-      ReceiveCommand(&cmdbuf);
-      HANDLE_ERROR;
-      for (int i = 0; i < 5; ++i) {
-        ReceiveCommandPoll(&cmdbuf);
-      }
-      HANDLE_ERROR;
-      CommandReceived("hf list 14a");
-      HANDLE_ERROR;
+        while (!OpenProxmark()) { sleep(1); }
+        while (1) {
+            UsbCommand cmdbuf;
+            CommandReceived("hf 14a snoop");
+            HANDLE_ERROR;
+            ReceiveCommand(&cmdbuf);
+            HANDLE_ERROR;
+            for (int i = 0; i < 5; ++i) {
+                ReceiveCommandPoll(&cmdbuf);
+            }
+            HANDLE_ERROR;
+            CommandReceived("hf list 14a");
+            HANDLE_ERROR;
+        }
     }
-  }
 
-  CloseProxmark();
-  return 0;
+    CloseProxmark();
+    return 0;
 }
diff --git a/client/tinycbor/cbor.h b/client/tinycbor/cbor.h
index fd145be2e..6a39e5fe7 100644
--- a/client/tinycbor/cbor.h
+++ b/client/tinycbor/cbor.h
@@ -195,15 +195,14 @@ typedef enum CborError {
     CborErrorJsonObjectKeyNotString,
     CborErrorJsonNotImplemented,
 
-    CborErrorOutOfMemory = (int) (~0U / 2 + 1),
-    CborErrorInternalError = (int) (~0U / 2)    /* INT_MAX on two's complement machines */
+    CborErrorOutOfMemory = (int)(~0U / 2 + 1),
+    CborErrorInternalError = (int)(~0U / 2)     /* INT_MAX on two's complement machines */
 } CborError;
 
 CBOR_API const char *cbor_error_string(CborError error);
 
 /* Encoder API */
-struct CborEncoder
-{
+struct CborEncoder {
     union {
         uint8_t *ptr;
         ptrdiff_t bytes_needed;
@@ -264,8 +263,7 @@ CBOR_INLINE_API size_t cbor_encoder_get_extra_bytes_needed(const CborEncoder *en
 
 /* Parser API */
 
-enum CborParserIteratorFlags
-{
+enum CborParserIteratorFlags {
     CborIteratorFlag_IntegerValueTooLarge   = 0x01,
     CborIteratorFlag_NegativeInteger        = 0x02,
     CborIteratorFlag_IteratingStringChunks  = 0x02,
@@ -273,15 +271,13 @@ enum CborParserIteratorFlags
     CborIteratorFlag_ContainerIsMap         = 0x20
 };
 
-struct CborParser
-{
+struct CborParser {
     const uint8_t *end;
     uint32_t flags;
 };
 typedef struct CborParser CborParser;
 
-struct CborValue
-{
+struct CborValue {
     const CborParser *parser;
     const uint8_t *ptr;
     uint32_t remaining;
@@ -310,7 +306,7 @@ CBOR_PRIVATE_API uint64_t _cbor_value_decode_int64_internal(const CborValue *val
 CBOR_INLINE_API uint64_t _cbor_value_extract_int64_helper(const CborValue *value)
 {
     return value->flags & CborIteratorFlag_IntegerValueTooLarge ?
-                _cbor_value_decode_int64_internal(value) : value->extra;
+           _cbor_value_decode_int64_internal(value) : value->extra;
 }
 
 CBOR_INLINE_API bool cbor_value_is_valid(const CborValue *value)
@@ -579,9 +575,9 @@ enum CborPrettyFlags {
     CborPrettyDefaultFlags          = CborPrettyIndicateIndeterminateLength
 };
 
-typedef CborError (*CborStreamFunction)(void *token, const char *fmt, ...)
+typedef CborError(*CborStreamFunction)(void *token, const char *fmt, ...)
 #ifdef __GNUC__
-    __attribute__((__format__(printf, 2, 3)))
+__attribute__((__format__(printf, 2, 3)))
 #endif
 ;
 
diff --git a/client/tinycbor/cborencoder.c b/client/tinycbor/cborencoder.c
index adb92fd88..cd0399fc1 100644
--- a/client/tinycbor/cborencoder.c
+++ b/client/tinycbor/cborencoder.c
@@ -393,11 +393,11 @@ CborError cbor_encode_floating_point(CborEncoder *encoder, CborType fpType, cons
 
     size = 2U << (fpType - CborHalfFloatType);
     if (size == 8)
-        put64(buf + 1, *(const uint64_t*)value);
+        put64(buf + 1, *(const uint64_t *)value);
     else if (size == 4)
-        put32(buf + 1, *(const uint32_t*)value);
+        put32(buf + 1, *(const uint32_t *)value);
     else
-        put16(buf + 1, *(const uint16_t*)value);
+        put16(buf + 1, *(const uint16_t *)value);
     saturated_decrement(encoder);
     return append_to_buffer(encoder, buf, size + 1);
 }
diff --git a/client/tinycbor/cborerrorstrings.c b/client/tinycbor/cborerrorstrings.c
index 3fe3a9823..2ee8f55e3 100644
--- a/client/tinycbor/cborerrorstrings.c
+++ b/client/tinycbor/cborerrorstrings.c
@@ -80,103 +80,103 @@
 const char *cbor_error_string(CborError error)
 {
     switch (error) {
-    case CborNoError:
-        return "";
+        case CborNoError:
+            return "";
 
-    case CborUnknownError:
-        return _("unknown error");
+        case CborUnknownError:
+            return _("unknown error");
 
-    case CborErrorOutOfMemory:
-        return _("out of memory/need more memory");
+        case CborErrorOutOfMemory:
+            return _("out of memory/need more memory");
 
-    case CborErrorUnknownLength:
-        return _("unknown length (attempted to get the length of a map/array/string of indeterminate length");
+        case CborErrorUnknownLength:
+            return _("unknown length (attempted to get the length of a map/array/string of indeterminate length");
 
-    case CborErrorAdvancePastEOF:
-        return _("attempted to advance past EOF");
+        case CborErrorAdvancePastEOF:
+            return _("attempted to advance past EOF");
 
-    case CborErrorIO:
-        return _("I/O error");
+        case CborErrorIO:
+            return _("I/O error");
 
-    case CborErrorGarbageAtEnd:
-        return _("garbage after the end of the content");
+        case CborErrorGarbageAtEnd:
+            return _("garbage after the end of the content");
 
-    case CborErrorUnexpectedEOF:
-        return _("unexpected end of data");
+        case CborErrorUnexpectedEOF:
+            return _("unexpected end of data");
 
-    case CborErrorUnexpectedBreak:
-        return _("unexpected 'break' byte");
+        case CborErrorUnexpectedBreak:
+            return _("unexpected 'break' byte");
 
-    case CborErrorUnknownType:
-        return _("illegal byte (encodes future extension type)");
+        case CborErrorUnknownType:
+            return _("illegal byte (encodes future extension type)");
 
-    case CborErrorIllegalType:
-        return _("mismatched string type in chunked string");
+        case CborErrorIllegalType:
+            return _("mismatched string type in chunked string");
 
-    case CborErrorIllegalNumber:
-        return _("illegal initial byte (encodes unspecified additional information)");
+        case CborErrorIllegalNumber:
+            return _("illegal initial byte (encodes unspecified additional information)");
 
-    case CborErrorIllegalSimpleType:
-        return _("illegal encoding of simple type smaller than 32");
+        case CborErrorIllegalSimpleType:
+            return _("illegal encoding of simple type smaller than 32");
 
-    case CborErrorUnknownSimpleType:
-        return _("unknown simple type");
+        case CborErrorUnknownSimpleType:
+            return _("unknown simple type");
 
-    case CborErrorUnknownTag:
-        return _("unknown tag");
+        case CborErrorUnknownTag:
+            return _("unknown tag");
 
-    case CborErrorInappropriateTagForType:
-        return _("inappropriate tag for type");
+        case CborErrorInappropriateTagForType:
+            return _("inappropriate tag for type");
 
-    case CborErrorDuplicateObjectKeys:
-        return _("duplicate keys in object");
+        case CborErrorDuplicateObjectKeys:
+            return _("duplicate keys in object");
 
-    case CborErrorInvalidUtf8TextString:
-        return _("invalid UTF-8 content in string");
+        case CborErrorInvalidUtf8TextString:
+            return _("invalid UTF-8 content in string");
 
-    case CborErrorExcludedType:
-        return _("excluded type found");
+        case CborErrorExcludedType:
+            return _("excluded type found");
 
-    case CborErrorExcludedValue:
-        return _("excluded value found");
+        case CborErrorExcludedValue:
+            return _("excluded value found");
 
-    case CborErrorImproperValue:
-    case CborErrorOverlongEncoding:
-        return _("value encoded in non-canonical form");
+        case CborErrorImproperValue:
+        case CborErrorOverlongEncoding:
+            return _("value encoded in non-canonical form");
 
-    case CborErrorMapKeyNotString:
-    case CborErrorJsonObjectKeyNotString:
-        return _("key in map is not a string");
+        case CborErrorMapKeyNotString:
+        case CborErrorJsonObjectKeyNotString:
+            return _("key in map is not a string");
 
-    case CborErrorMapNotSorted:
-        return _("map is not sorted");
+        case CborErrorMapNotSorted:
+            return _("map is not sorted");
 
-    case CborErrorMapKeysNotUnique:
-        return _("map keys are not unique");
+        case CborErrorMapKeysNotUnique:
+            return _("map keys are not unique");
 
-    case CborErrorTooManyItems:
-        return _("too many items added to encoder");
+        case CborErrorTooManyItems:
+            return _("too many items added to encoder");
 
-    case CborErrorTooFewItems:
-        return _("too few items added to encoder");
+        case CborErrorTooFewItems:
+            return _("too few items added to encoder");
 
-    case CborErrorDataTooLarge:
-        return _("internal error: data too large");
+        case CborErrorDataTooLarge:
+            return _("internal error: data too large");
 
-    case CborErrorNestingTooDeep:
-        return _("internal error: too many nested containers found in recursive function");
+        case CborErrorNestingTooDeep:
+            return _("internal error: too many nested containers found in recursive function");
 
-    case CborErrorUnsupportedType:
-        return _("unsupported type");
+        case CborErrorUnsupportedType:
+            return _("unsupported type");
 
-    case CborErrorJsonObjectKeyIsAggregate:
-        return _("conversion to JSON failed: key in object is an array or map");
+        case CborErrorJsonObjectKeyIsAggregate:
+            return _("conversion to JSON failed: key in object is an array or map");
 
-    case CborErrorJsonNotImplemented:
-        return _("conversion to JSON failed: open_memstream unavailable");
+        case CborErrorJsonNotImplemented:
+            return _("conversion to JSON failed: open_memstream unavailable");
 
-    case CborErrorInternalError:
-        return _("internal error");
+        case CborErrorInternalError:
+            return _("internal error");
     }
     return cbor_error_string(CborUnknownError);
 }
diff --git a/client/tinycbor/cborinternal_p.h b/client/tinycbor/cborinternal_p.h
index a85a92972..f971cf8ab 100644
--- a/client/tinycbor/cborinternal_p.h
+++ b/client/tinycbor/cborinternal_p.h
@@ -56,7 +56,7 @@ static inline unsigned short encode_half(double val)
     memcpy(&v, &val, sizeof(v));
     sign = v >> 63 << 15;
     exp = (v >> 52) & 0x7ff;
-    mant = v << 12 >> 12 >> (53-11);    /* keep only the 11 most significant bits of the mantissa */
+    mant = v << 12 >> 12 >> (53 - 11);  /* keep only the 11 most significant bits of the mantissa */
     exp -= 1023;
     if (exp == 1024) {
         /* infinity or NaN */
@@ -147,7 +147,7 @@ enum {
     IndefiniteLength        = 31U,
 
     MajorTypeShift          = SmallValueBitLength,
-    MajorTypeMask           = (int) (~0U << MajorTypeShift),
+    MajorTypeMask           = (int)(~0U << MajorTypeShift),
 
     BreakByte               = (unsigned)Break | (SimpleTypesType << MajorTypeShift)
 };
@@ -155,7 +155,7 @@ enum {
 CBOR_INTERNAL_API CborError CBOR_INTERNAL_API_CC _cbor_value_extract_number(const uint8_t **ptr, const uint8_t *end, uint64_t *len);
 CBOR_INTERNAL_API CborError CBOR_INTERNAL_API_CC _cbor_value_prepare_string_iteration(CborValue *it);
 CBOR_INTERNAL_API CborError CBOR_INTERNAL_API_CC _cbor_value_get_string_chunk(const CborValue *value, const void **bufferptr,
-                                                                              size_t *len, CborValue *next);
+        size_t *len, CborValue *next);
 
 
 #endif /* CBORINTERNAL_P_H */
diff --git a/client/tinycbor/cborjson.h b/client/tinycbor/cborjson.h
index 8ff27b920..a88a80e8c 100644
--- a/client/tinycbor/cborjson.h
+++ b/client/tinycbor/cborjson.h
@@ -32,8 +32,7 @@ extern "C" {
 #endif
 
 /* Conversion to JSON */
-enum CborToJsonFlags
-{
+enum CborToJsonFlags {
     CborConvertAddMetadata = 1,
     CborConvertTagsToObjects = 2,
     CborConvertIgnoreTags = 0,
diff --git a/client/tinycbor/cborparser.c b/client/tinycbor/cborparser.c
index 45de2226a..18ba60897 100644
--- a/client/tinycbor/cborparser.c
+++ b/client/tinycbor/cborparser.c
@@ -249,38 +249,38 @@ static CborError preparse_value(CborValue *it)
         it->type = CborIntegerType;
     } else if (majortype == SimpleTypesType) {
         switch (descriptor) {
-        case FalseValue:
-            it->extra = false;
-            it->type = CborBooleanType;
-            break;
+            case FalseValue:
+                it->extra = false;
+                it->type = CborBooleanType;
+                break;
 
-        case SinglePrecisionFloat:
-        case DoublePrecisionFloat:
-            it->flags |= CborIteratorFlag_IntegerValueTooLarge;
+            case SinglePrecisionFloat:
+            case DoublePrecisionFloat:
+                it->flags |= CborIteratorFlag_IntegerValueTooLarge;
             /* fall through */
-        case TrueValue:
-        case NullValue:
-        case UndefinedValue:
-        case HalfPrecisionFloat:
-            it->type = *it->ptr;
-            break;
+            case TrueValue:
+            case NullValue:
+            case UndefinedValue:
+            case HalfPrecisionFloat:
+                it->type = *it->ptr;
+                break;
 
-        case SimpleTypeInNextByte:
-            it->extra = (uint8_t)it->ptr[1];
+            case SimpleTypeInNextByte:
+                it->extra = (uint8_t)it->ptr[1];
 #ifndef CBOR_PARSER_NO_STRICT_CHECKS
-            if (unlikely(it->extra < 32)) {
-                it->type = CborInvalidType;
-                return CborErrorIllegalSimpleType;
-            }
+                if (unlikely(it->extra < 32)) {
+                    it->type = CborInvalidType;
+                    return CborErrorIllegalSimpleType;
+                }
 #endif
-            break;
+                break;
 
-        case 28:
-        case 29:
-        case 30:
-        case Break:
-            cbor_assert(false);  /* these conditions can't be reached */
-            return CborErrorUnexpectedBreak;
+            case 28:
+            case 29:
+            case 30:
+            case Break:
+                cbor_assert(false);  /* these conditions can't be reached */
+                return CborErrorUnexpectedBreak;
         }
         return CborNoError;
     }
@@ -872,7 +872,7 @@ CborError cbor_value_get_int_checked(const CborValue *value, int *result)
      */
 
     if (value->flags & CborIteratorFlag_NegativeInteger) {
-        if (unlikely(v > (unsigned) -(INT_MIN + 1)))
+        if (unlikely(v > (unsigned) - (INT_MIN + 1)))
             return CborErrorDataTooLarge;
 
         *result = (int)v;
@@ -1189,13 +1189,13 @@ static CborError iterate_string_chunks(const CborValue *value, char *buffer, siz
  */
 
 CborError _cbor_value_copy_string(const CborValue *value, void *buffer,
-                                 size_t *buflen, CborValue *next)
+                                  size_t *buflen, CborValue *next)
 {
     bool copied_all;
-    CborError err = iterate_string_chunks(value, (char*)buffer, buflen, &copied_all, next,
+    CborError err = iterate_string_chunks(value, (char *)buffer, buflen, &copied_all, next,
                                           buffer ? iterate_memcpy : iterate_noop);
     return err ? err :
-                 copied_all ? CborNoError : CborErrorOutOfMemory;
+           copied_all ? CborNoError : CborErrorOutOfMemory;
 }
 
 /**
diff --git a/client/tinycbor/cborpretty.c b/client/tinycbor/cborpretty.c
index b8825deee..c0e9726b9 100644
--- a/client/tinycbor/cborpretty.c
+++ b/client/tinycbor/cborpretty.c
@@ -197,7 +197,7 @@ static CborError hexDump(CborStreamFunction stream, void *out, const void *ptr,
 static CborError utf8EscapedDump(CborStreamFunction stream, void *out, const void *ptr, size_t n)
 {
     const uint8_t *buffer = (const uint8_t *)ptr;
-    const uint8_t * const end = buffer + n;
+    const uint8_t *const end = buffer + n;
     CborError err = CborNoError;
 
     while (buffer < end && !err) {
@@ -215,26 +215,26 @@ static CborError utf8EscapedDump(CborStreamFunction stream, void *out, const voi
 
             /* print as an escape sequence */
             switch (uc) {
-            case '"':
-            case '\\':
-                break;
-            case '\b':
-                escaped = 'b';
-                break;
-            case '\f':
-                escaped = 'f';
-                break;
-            case '\n':
-                escaped = 'n';
-                break;
-            case '\r':
-                escaped = 'r';
-                break;
-            case '\t':
-                escaped = 't';
-                break;
-            default:
-                goto print_utf16;
+                case '"':
+                case '\\':
+                    break;
+                case '\b':
+                    escaped = 'b';
+                    break;
+                case '\f':
+                    escaped = 'f';
+                    break;
+                case '\n':
+                    escaped = 'n';
+                    break;
+                case '\r':
+                    escaped = 'r';
+                    break;
+                case '\t':
+                    escaped = 't';
+                    break;
+                default:
+                    goto print_utf16;
             }
             err = stream(out, "\\%c", escaped);
             continue;
@@ -277,7 +277,7 @@ static const char *resolve_indicator(const uint8_t *ptr, const uint8_t *end, int
 
     /* determine whether to show anything */
     if ((flags & CborPrettyIndicateIndeterminateLength) &&
-            additional_information == IndefiniteLength)
+        additional_information == IndefiniteLength)
         return indicators[IndefiniteLength - Value8Bit];
     if ((flags & CborPrettyIndicateOverlongNumbers) == 0)
         return no_indicator;
@@ -296,8 +296,8 @@ static const char *resolve_indicator(const uint8_t *ptr, const uint8_t *end, int
     if (value > 0xffffffffU)
         ++expected_information;
     return expected_information == additional_information ?
-                no_indicator :
-                indicators[additional_information - Value8Bit];
+           no_indicator :
+           indicators[additional_information - Value8Bit];
 }
 
 static const char *get_indicator(const CborValue *it, int flags)
@@ -341,208 +341,208 @@ static CborError value_to_pretty(CborStreamFunction stream, void *out, CborValue
     CborError err = CborNoError;
     CborType type = cbor_value_get_type(it);
     switch (type) {
-    case CborArrayType:
-    case CborMapType: {
-        /* recursive type */
-        CborValue recursed;
-        const char *indicator = get_indicator(it, flags);
-        const char *space = *indicator ? " " : indicator;
+        case CborArrayType:
+        case CborMapType: {
+            /* recursive type */
+            CborValue recursed;
+            const char *indicator = get_indicator(it, flags);
+            const char *space = *indicator ? " " : indicator;
 
-        err = stream(out, "%c%s%s", type == CborArrayType ? '[' : '{', indicator, space);
-        if (err)
-            return err;
+            err = stream(out, "%c%s%s", type == CborArrayType ? '[' : '{', indicator, space);
+            if (err)
+                return err;
 
-        err = cbor_value_enter_container(it, &recursed);
-        if (err) {
-            it->ptr = recursed.ptr;
-            return err;       /* parse error */
+            err = cbor_value_enter_container(it, &recursed);
+            if (err) {
+                it->ptr = recursed.ptr;
+                return err;       /* parse error */
+            }
+            err = container_to_pretty(stream, out, &recursed, type, flags, recursionsLeft - 1);
+            if (err) {
+                it->ptr = recursed.ptr;
+                return err;       /* parse error */
+            }
+            err = cbor_value_leave_container(it, &recursed);
+            if (err)
+                return err;       /* parse error */
+
+            return stream(out, type == CborArrayType ? "]" : "}");
         }
-        err = container_to_pretty(stream, out, &recursed, type, flags, recursionsLeft - 1);
-        if (err) {
-            it->ptr = recursed.ptr;
-            return err;       /* parse error */
-        }
-        err = cbor_value_leave_container(it, &recursed);
-        if (err)
-            return err;       /* parse error */
 
-        return stream(out, type == CborArrayType ? "]" : "}");
-    }
+        case CborIntegerType: {
+            uint64_t val;
+            cbor_value_get_raw_integer(it, &val);    /* can't fail */
 
-    case CborIntegerType: {
-        uint64_t val;
-        cbor_value_get_raw_integer(it, &val);    /* can't fail */
-
-        if (cbor_value_is_unsigned_integer(it)) {
-            err = stream(out, "%" PRIu64, val);
-        } else {
-            /* CBOR stores the negative number X as -1 - X
-             * (that is, -1 is stored as 0, -2 as 1 and so forth) */
-            if (++val) {                /* unsigned overflow may happen */
-                err = stream(out, "-%" PRIu64, val);
+            if (cbor_value_is_unsigned_integer(it)) {
+                err = stream(out, "%" PRIu64, val);
             } else {
-                /* overflown
-                 *   0xffff`ffff`ffff`ffff + 1 =
-                 * 0x1`0000`0000`0000`0000 = 18446744073709551616 (2^64) */
-                err = stream(out, "-18446744073709551616");
+                /* CBOR stores the negative number X as -1 - X
+                 * (that is, -1 is stored as 0, -2 as 1 and so forth) */
+                if (++val) {                /* unsigned overflow may happen */
+                    err = stream(out, "-%" PRIu64, val);
+                } else {
+                    /* overflown
+                     *   0xffff`ffff`ffff`ffff + 1 =
+                     * 0x1`0000`0000`0000`0000 = 18446744073709551616 (2^64) */
+                    err = stream(out, "-18446744073709551616");
+                }
             }
-        }
-        if (!err)
-            err = stream(out, "%s", get_indicator(it, flags));
-        break;
-    }
-
-    case CborByteStringType:
-    case CborTextStringType: {
-        size_t n = 0;
-        const void *ptr;
-        bool showingFragments = (flags & CborPrettyShowStringFragments) && !cbor_value_is_length_known(it);
-        const char *separator = "";
-        char close = '\'';
-        char open[3] = "h'";
-        const char *indicator = NULL;
-
-        if (type == CborTextStringType) {
-            close = open[0] = '"';
-            open[1] = '\0';
-        }
-
-        if (showingFragments) {
-            err = stream(out, "(_ ");
             if (!err)
-                err = _cbor_value_prepare_string_iteration(it);
-        } else {
-            err = stream(out, "%s", open);
+                err = stream(out, "%s", get_indicator(it, flags));
+            break;
         }
 
-        while (!err) {
-            if (showingFragments || indicator == NULL) {
-                /* any iteration, except the second for a non-chunked string */
-                indicator = resolve_indicator(it->ptr, it->parser->end, flags);
+        case CborByteStringType:
+        case CborTextStringType: {
+            size_t n = 0;
+            const void *ptr;
+            bool showingFragments = (flags & CborPrettyShowStringFragments) && !cbor_value_is_length_known(it);
+            const char *separator = "";
+            char close = '\'';
+            char open[3] = "h'";
+            const char *indicator = NULL;
+
+            if (type == CborTextStringType) {
+                close = open[0] = '"';
+                open[1] = '\0';
             }
 
-            err = _cbor_value_get_string_chunk(it, &ptr, &n, it);
-            if (!ptr)
-                break;
+            if (showingFragments) {
+                err = stream(out, "(_ ");
+                if (!err)
+                    err = _cbor_value_prepare_string_iteration(it);
+            } else {
+                err = stream(out, "%s", open);
+            }
 
-            if (!err && showingFragments)
-                err = stream(out, "%s%s", separator, open);
-            if (!err)
-                err = (type == CborByteStringType ?
+            while (!err) {
+                if (showingFragments || indicator == NULL) {
+                    /* any iteration, except the second for a non-chunked string */
+                    indicator = resolve_indicator(it->ptr, it->parser->end, flags);
+                }
+
+                err = _cbor_value_get_string_chunk(it, &ptr, &n, it);
+                if (!ptr)
+                    break;
+
+                if (!err && showingFragments)
+                    err = stream(out, "%s%s", separator, open);
+                if (!err)
+                    err = (type == CborByteStringType ?
                            hexDump(stream, out, ptr, n) :
                            utf8EscapedDump(stream, out, ptr, n));
-            if (!err && showingFragments) {
-                err = stream(out, "%c%s", close, indicator);
-                separator = ", ";
+                if (!err && showingFragments) {
+                    err = stream(out, "%c%s", close, indicator);
+                    separator = ", ";
+                }
             }
+
+            if (!err) {
+                if (showingFragments)
+                    err = stream(out, ")");
+                else
+                    err = stream(out, "%c%s", close, indicator);
+            }
+            return err;
         }
 
-        if (!err) {
-            if (showingFragments)
+        case CborTagType: {
+            CborTag tag;
+            cbor_value_get_tag(it, &tag);       /* can't fail */
+            err = stream(out, "%" PRIu64 "%s(", tag, get_indicator(it, flags));
+            if (!err)
+                err = cbor_value_advance_fixed(it);
+            if (!err && recursionsLeft)
+                err = value_to_pretty(stream, out, it, flags, recursionsLeft - 1);
+            else if (!err)
+                printRecursionLimit(stream, out);
+            if (!err)
                 err = stream(out, ")");
-            else
-                err = stream(out, "%c%s", close, indicator);
+            return err;
         }
-        return err;
-    }
 
-    case CborTagType: {
-        CborTag tag;
-        cbor_value_get_tag(it, &tag);       /* can't fail */
-        err = stream(out, "%" PRIu64 "%s(", tag, get_indicator(it, flags));
-        if (!err)
-            err = cbor_value_advance_fixed(it);
-        if (!err && recursionsLeft)
-            err = value_to_pretty(stream, out, it, flags, recursionsLeft - 1);
-        else if (!err)
-            printRecursionLimit(stream, out);
-        if (!err)
-            err = stream(out, ")");
-        return err;
-    }
+        case CborSimpleType: {
+            /* simple types can't fail and can't have overlong encoding */
+            uint8_t simple_type;
+            cbor_value_get_simple_type(it, &simple_type);
+            err = stream(out, "simple(%" PRIu8 ")", simple_type);
+            break;
+        }
 
-    case CborSimpleType: {
-        /* simple types can't fail and can't have overlong encoding */
-        uint8_t simple_type;
-        cbor_value_get_simple_type(it, &simple_type);
-        err = stream(out, "simple(%" PRIu8 ")", simple_type);
-        break;
-    }
+        case CborNullType:
+            err = stream(out, "null");
+            break;
 
-    case CborNullType:
-        err = stream(out, "null");
-        break;
+        case CborUndefinedType:
+            err = stream(out, "undefined");
+            break;
 
-    case CborUndefinedType:
-        err = stream(out, "undefined");
-        break;
-
-    case CborBooleanType: {
-        bool val;
-        cbor_value_get_boolean(it, &val);       /* can't fail */
-        err = stream(out, val ? "true" : "false");
-        break;
-    }
+        case CborBooleanType: {
+            bool val;
+            cbor_value_get_boolean(it, &val);       /* can't fail */
+            err = stream(out, val ? "true" : "false");
+            break;
+        }
 
 #ifndef CBOR_NO_FLOATING_POINT
-    case CborDoubleType: {
-        const char *suffix;
-        double val;
-        int r;
-        uint64_t ival;
+        case CborDoubleType: {
+            const char *suffix;
+            double val;
+            int r;
+            uint64_t ival;
 
-        if (false) {
-            float f;
-    case CborFloatType:
-            cbor_value_get_float(it, &f);
-            val = f;
-            suffix = flags & CborPrettyNumericEncodingIndicators ? "_2" : "f";
-        } else if (false) {
-            uint16_t f16;
-    case CborHalfFloatType:
+            if (false) {
+                float f;
+                case CborFloatType:
+                    cbor_value_get_float(it, &f);
+                    val = f;
+                    suffix = flags & CborPrettyNumericEncodingIndicators ? "_2" : "f";
+                } else if (false) {
+                    uint16_t f16;
+                case CborHalfFloatType:
 #ifndef CBOR_NO_HALF_FLOAT_TYPE
-            cbor_value_get_half_float(it, &f16);
-            val = decode_half(f16);
-            suffix = flags & CborPrettyNumericEncodingIndicators ? "_1" : "f16";
+                    cbor_value_get_half_float(it, &f16);
+                    val = decode_half(f16);
+                    suffix = flags & CborPrettyNumericEncodingIndicators ? "_1" : "f16";
 #else
-            (void)f16;
+                    (void)f16;
+                    err = CborErrorUnsupportedType;
+                    break;
+#endif
+                } else {
+                    cbor_value_get_double(it, &val);
+                    suffix = "";
+                }
+
+                if ((flags & CborPrettyNumericEncodingIndicators) == 0) {
+                    r = fpclassify(val);
+                    if (r == FP_NAN || r == FP_INFINITE)
+                        suffix = "";
+                }
+
+                if (convertToUint64(val, &ival)) {
+                    /* this double value fits in a 64-bit integer, so show it as such
+                     * (followed by a floating point suffix, to disambiguate) */
+                    err = stream(out, "%s%" PRIu64 ".%s", val < 0 ? "-" : "", ival, suffix);
+                } else {
+                    /* this number is definitely not a 64-bit integer */
+                    err = stream(out, "%." DBL_DECIMAL_DIG_STR "g%s", val, suffix);
+                }
+                break;
+            }
+#else
+        case CborDoubleType:
+        case CborFloatType:
+        case CborHalfFloatType:
             err = CborErrorUnsupportedType;
             break;
-#endif
-        } else {
-            cbor_value_get_double(it, &val);
-            suffix = "";
-        }
-
-        if ((flags & CborPrettyNumericEncodingIndicators) == 0) {
-            r = fpclassify(val);
-            if (r == FP_NAN || r == FP_INFINITE)
-                suffix = "";
-        }
-
-        if (convertToUint64(val, &ival)) {
-            /* this double value fits in a 64-bit integer, so show it as such
-             * (followed by a floating point suffix, to disambiguate) */
-            err = stream(out, "%s%" PRIu64 ".%s", val < 0 ? "-" : "", ival, suffix);
-        } else {
-            /* this number is definitely not a 64-bit integer */
-            err = stream(out, "%." DBL_DECIMAL_DIG_STR "g%s", val, suffix);
-        }
-        break;
-    }
-#else
-    case CborDoubleType:
-    case CborFloatType:
-    case CborHalfFloatType:
-        err = CborErrorUnsupportedType;
-        break;
 #endif /* !CBOR_NO_FLOATING_POINT */
 
-    case CborInvalidType:
-        err = stream(out, "invalid");
-        if (err)
-            return err;
-        return CborErrorUnknownType;
+        case CborInvalidType:
+            err = stream(out, "invalid");
+            if (err)
+                return err;
+            return CborErrorUnknownType;
     }
 
     if (!err)
diff --git a/client/tinycbor/cbortojson.c b/client/tinycbor/cbortojson.c
index 34b900bab..38c4a7851 100644
--- a/client/tinycbor/cbortojson.c
+++ b/client/tinycbor/cbortojson.c
@@ -188,8 +188,8 @@ static CborError dump_bytestring_base16(char **result, CborValue *it)
 
     for (i = 0; i < n; ++i) {
         uint8_t byte = buffer[n + i];
-        buffer[2*i]     = characters[byte >> 4];
-        buffer[2*i + 1] = characters[byte & 0xf];
+        buffer[2 * i]     = characters[byte >> 4];
+        buffer[2 * i + 1] = characters[byte & 0xf];
     }
     return CborNoError;
 }
@@ -352,8 +352,8 @@ static CborError tagged_value_to_json(FILE *out, CborValue *it, int flags, Conve
             return err;
         if (flags & CborConvertAddMetadata && status->flags) {
             if (fprintf(out, ",\"tag%" PRIu64 "$cbor\":{", tag) < 0 ||
-                    add_value_metadata(out, type, status) != CborNoError ||
-                    fputc('}', out) < 0)
+                add_value_metadata(out, type, status) != CborNoError ||
+                fputc('}', out) < 0)
                 return CborErrorIO;
         }
         if (fputc('}', out) < 0)
@@ -370,7 +370,7 @@ static CborError tagged_value_to_json(FILE *out, CborValue *it, int flags, Conve
 
     /* special handling of byte strings? */
     if (type == CborByteStringType && (flags & CborConvertByteStringsToBase64Url) == 0 &&
-            (tag == CborNegativeBignumTag || tag == CborExpectedBase16Tag || tag == CborExpectedBase64Tag)) {
+        (tag == CborNegativeBignumTag || tag == CborExpectedBase16Tag || tag == CborExpectedBase64Tag)) {
         char *str;
         char *pre = "";
 
@@ -473,8 +473,8 @@ static CborError map_to_json(FILE *out, CborValue *it, int flags, ConversionStat
             }
             if (!err && status->flags) {
                 if (fprintf(out, ",\"%s$cbor\":{", key) < 0 ||
-                        add_value_metadata(out, valueType, status) != CborNoError ||
-                        fputc('}', out) < 0)
+                    add_value_metadata(out, valueType, status) != CborNoError ||
+                    fputc('}', out) < 0)
                     err = CborErrorIO;
             }
         }
@@ -492,164 +492,164 @@ static CborError value_to_json(FILE *out, CborValue *it, int flags, CborType typ
     status->flags = 0;
 
     switch (type) {
-    case CborArrayType:
-    case CborMapType: {
-        /* recursive type */
-        CborValue recursed;
-        err = cbor_value_enter_container(it, &recursed);
-        if (err) {
-            it->ptr = recursed.ptr;
-            return err;       /* parse error */
-        }
-        if (fputc(type == CborArrayType ? '[' : '{', out) < 0)
-            return CborErrorIO;
+        case CborArrayType:
+        case CborMapType: {
+            /* recursive type */
+            CborValue recursed;
+            err = cbor_value_enter_container(it, &recursed);
+            if (err) {
+                it->ptr = recursed.ptr;
+                return err;       /* parse error */
+            }
+            if (fputc(type == CborArrayType ? '[' : '{', out) < 0)
+                return CborErrorIO;
 
-        err = (type == CborArrayType) ?
+            err = (type == CborArrayType) ?
                   array_to_json(out, &recursed, flags, status) :
                   map_to_json(out, &recursed, flags, status);
-        if (err) {
-            it->ptr = recursed.ptr;
-            return err;       /* parse error */
-        }
-
-        if (fputc(type == CborArrayType ? ']' : '}', out) < 0)
-            return CborErrorIO;
-        err = cbor_value_leave_container(it, &recursed);
-        if (err)
-            return err;       /* parse error */
-
-        status->flags = 0;    /* reset, there are never conversion errors for us */
-        return CborNoError;
-    }
-
-    case CborIntegerType: {
-        double num;     /* JS numbers are IEEE double precision */
-        uint64_t val;
-        cbor_value_get_raw_integer(it, &val);    /* can't fail */
-        num = (double)val;
-
-        if (cbor_value_is_negative_integer(it)) {
-            num = -num - 1;                     /* convert to negative */
-            if ((uint64_t)(-num - 1) != val) {
-                status->flags = NumberPrecisionWasLost | NumberWasNegative;
-                status->originalNumber = val;
+            if (err) {
+                it->ptr = recursed.ptr;
+                return err;       /* parse error */
             }
-        } else {
-            if ((uint64_t)num != val) {
-                status->flags = NumberPrecisionWasLost;
-                status->originalNumber = val;
+
+            if (fputc(type == CborArrayType ? ']' : '}', out) < 0)
+                return CborErrorIO;
+            err = cbor_value_leave_container(it, &recursed);
+            if (err)
+                return err;       /* parse error */
+
+            status->flags = 0;    /* reset, there are never conversion errors for us */
+            return CborNoError;
+        }
+
+        case CborIntegerType: {
+            double num;     /* JS numbers are IEEE double precision */
+            uint64_t val;
+            cbor_value_get_raw_integer(it, &val);    /* can't fail */
+            num = (double)val;
+
+            if (cbor_value_is_negative_integer(it)) {
+                num = -num - 1;                     /* convert to negative */
+                if ((uint64_t)(-num - 1) != val) {
+                    status->flags = NumberPrecisionWasLost | NumberWasNegative;
+                    status->originalNumber = val;
+                }
+            } else {
+                if ((uint64_t)num != val) {
+                    status->flags = NumberPrecisionWasLost;
+                    status->originalNumber = val;
+                }
             }
-        }
-        if (fprintf(out, "%.0f", num) < 0)  /* this number has no fraction, so no decimal points please */
-            return CborErrorIO;
-        break;
-    }
-
-    case CborByteStringType:
-    case CborTextStringType: {
-        char *str;
-        if (type == CborByteStringType) {
-            err = dump_bytestring_base64url(&str, it);
-            status->flags = TypeWasNotNative;
-        } else {
-            size_t n = 0;
-            err = cbor_value_dup_text_string(it, &str, &n, it);
-        }
-        if (err)
-            return err;
-        err = (fprintf(out, "\"%s\"", str) < 0) ? CborErrorIO : CborNoError;
-        free(str);
-        return err;
-    }
-
-    case CborTagType:
-        return tagged_value_to_json(out, it, flags, status);
-
-    case CborSimpleType: {
-        uint8_t simple_type;
-        cbor_value_get_simple_type(it, &simple_type);  /* can't fail */
-        status->flags = TypeWasNotNative;
-        status->originalNumber = simple_type;
-        if (fprintf(out, "\"simple(%" PRIu8 ")\"", simple_type) < 0)
-            return CborErrorIO;
-        break;
-    }
-
-    case CborNullType:
-        if (fprintf(out, "null") < 0)
-            return CborErrorIO;
-        break;
-
-    case CborUndefinedType:
-        status->flags = TypeWasNotNative;
-        if (fprintf(out, "\"undefined\"") < 0)
-            return CborErrorIO;
-        break;
-
-    case CborBooleanType: {
-        bool val;
-        cbor_value_get_boolean(it, &val);       /* can't fail */
-        if (fprintf(out, val ? "true" : "false") < 0)
-            return CborErrorIO;
-        break;
-    }
-
-#ifndef CBOR_NO_FLOATING_POINT
-    case CborDoubleType: {
-        double val;
-        if (false) {
-            float f;
-    case CborFloatType:
-            status->flags = TypeWasNotNative;
-            cbor_value_get_float(it, &f);
-            val = f;
-        } else if (false) {
-            uint16_t f16;
-    case CborHalfFloatType:
-#  ifndef CBOR_NO_HALF_FLOAT_TYPE
-            status->flags = TypeWasNotNative;
-            cbor_value_get_half_float(it, &f16);
-            val = decode_half(f16);
-#  else
-            (void)f16;
-            err = CborErrorUnsupportedType;
+            if (fprintf(out, "%.0f", num) < 0)  /* this number has no fraction, so no decimal points please */
+                return CborErrorIO;
             break;
-#  endif
-        } else {
-            cbor_value_get_double(it, &val);
         }
 
-        int r = fpclassify(val);
-        if (r == FP_NAN || r == FP_INFINITE) {
+        case CborByteStringType:
+        case CborTextStringType: {
+            char *str;
+            if (type == CborByteStringType) {
+                err = dump_bytestring_base64url(&str, it);
+                status->flags = TypeWasNotNative;
+            } else {
+                size_t n = 0;
+                err = cbor_value_dup_text_string(it, &str, &n, it);
+            }
+            if (err)
+                return err;
+            err = (fprintf(out, "\"%s\"", str) < 0) ? CborErrorIO : CborNoError;
+            free(str);
+            return err;
+        }
+
+        case CborTagType:
+            return tagged_value_to_json(out, it, flags, status);
+
+        case CborSimpleType: {
+            uint8_t simple_type;
+            cbor_value_get_simple_type(it, &simple_type);  /* can't fail */
+            status->flags = TypeWasNotNative;
+            status->originalNumber = simple_type;
+            if (fprintf(out, "\"simple(%" PRIu8 ")\"", simple_type) < 0)
+                return CborErrorIO;
+            break;
+        }
+
+        case CborNullType:
             if (fprintf(out, "null") < 0)
                 return CborErrorIO;
-            status->flags |= r == FP_NAN ? NumberWasNaN :
-                                           NumberWasInfinite | (val < 0 ? NumberWasNegative : 0);
-        } else {
-            uint64_t ival = (uint64_t)fabs(val);
-            if ((double)ival == fabs(val)) {
-                /* print as integer so we get the full precision */
-                r = fprintf(out, "%s%" PRIu64, val < 0 ? "-" : "", ival);
-                status->flags |= TypeWasNotNative;   /* mark this integer number as a double */
-            } else {
-                /* this number is definitely not a 64-bit integer */
-                r = fprintf(out, "%." DBL_DECIMAL_DIG_STR "g", val);
-            }
-            if (r < 0)
+            break;
+
+        case CborUndefinedType:
+            status->flags = TypeWasNotNative;
+            if (fprintf(out, "\"undefined\"") < 0)
                 return CborErrorIO;
+            break;
+
+        case CborBooleanType: {
+            bool val;
+            cbor_value_get_boolean(it, &val);       /* can't fail */
+            if (fprintf(out, val ? "true" : "false") < 0)
+                return CborErrorIO;
+            break;
         }
-        break;
-    }
+
+#ifndef CBOR_NO_FLOATING_POINT
+        case CborDoubleType: {
+            double val;
+            if (false) {
+                float f;
+                case CborFloatType:
+                    status->flags = TypeWasNotNative;
+                    cbor_value_get_float(it, &f);
+                    val = f;
+                } else if (false) {
+                    uint16_t f16;
+                case CborHalfFloatType:
+#  ifndef CBOR_NO_HALF_FLOAT_TYPE
+                    status->flags = TypeWasNotNative;
+                    cbor_value_get_half_float(it, &f16);
+                    val = decode_half(f16);
+#  else
+                    (void)f16;
+                    err = CborErrorUnsupportedType;
+                    break;
+#  endif
+                } else {
+                    cbor_value_get_double(it, &val);
+                }
+
+                int r = fpclassify(val);
+                if (r == FP_NAN || r == FP_INFINITE) {
+                    if (fprintf(out, "null") < 0)
+                        return CborErrorIO;
+                    status->flags |= r == FP_NAN ? NumberWasNaN :
+                                     NumberWasInfinite | (val < 0 ? NumberWasNegative : 0);
+                } else {
+                    uint64_t ival = (uint64_t)fabs(val);
+                    if ((double)ival == fabs(val)) {
+                        /* print as integer so we get the full precision */
+                        r = fprintf(out, "%s%" PRIu64, val < 0 ? "-" : "", ival);
+                        status->flags |= TypeWasNotNative;   /* mark this integer number as a double */
+                    } else {
+                        /* this number is definitely not a 64-bit integer */
+                        r = fprintf(out, "%." DBL_DECIMAL_DIG_STR "g", val);
+                    }
+                    if (r < 0)
+                        return CborErrorIO;
+                }
+                break;
+            }
 #else
-    case CborDoubleType:
-    case CborFloatType:
-    case CborHalfFloatType:
-        err = CborErrorUnsupportedType;
-        break;
+        case CborDoubleType:
+        case CborFloatType:
+        case CborHalfFloatType:
+            err = CborErrorUnsupportedType;
+            break;
 #endif /* !CBOR_NO_FLOATING_POINT */
 
-    case CborInvalidType:
-        return CborErrorUnknownType;
+        case CborInvalidType:
+            return CborErrorUnknownType;
     }
 
     return cbor_value_advance_fixed(it);
diff --git a/client/tinycbor/cborvalidation.c b/client/tinycbor/cborvalidation.c
index 08c35117b..532f63025 100644
--- a/client/tinycbor/cborvalidation.c
+++ b/client/tinycbor/cborvalidation.c
@@ -242,7 +242,7 @@
 struct KnownTagData { uint32_t tag; uint32_t types; };
 static const struct KnownTagData knownTagData[] = {
     { 0, (uint32_t)CborTextStringType },
-    { 1, (uint32_t)(CborIntegerType+1) },
+    { 1, (uint32_t)(CborIntegerType + 1) },
     { 2, (uint32_t)CborByteStringType },
     { 3, (uint32_t)CborByteStringType },
     { 4, (uint32_t)CborArrayType },
@@ -270,7 +270,7 @@ static CborError validate_value(CborValue *it, uint32_t flags, int recursionLeft
 static inline CborError validate_utf8_string(const void *ptr, size_t n)
 {
     const uint8_t *buffer = (const uint8_t *)ptr;
-    const uint8_t * const end = buffer + n;
+    const uint8_t *const end = buffer + n;
     while (buffer < end) {
         uint32_t uc = get_utf8(&buffer, end);
         if (uc == ~0U)
@@ -287,7 +287,7 @@ static inline CborError validate_simple_type(uint8_t simple_type, uint32_t flags
     if (simple_type < 32)
         return (flags & CborValidateNoUnknownSimpleTypesSA) ? CborErrorUnknownSimpleType : CborNoError;
     return (flags & CborValidateNoUnknownSimpleTypes) == CborValidateNoUnknownSimpleTypes ?
-                CborErrorUnknownSimpleType : CborNoError;
+           CborErrorUnknownSimpleType : CborNoError;
 }
 
 static inline CborError validate_number(const CborValue *it, CborType type, uint32_t flags)
@@ -326,7 +326,7 @@ static inline CborError validate_tag(CborValue *it, CborTag tag, uint32_t flags,
     CborType type = cbor_value_get_type(it);
     const size_t knownTagCount = sizeof(knownTagData) / sizeof(knownTagData[0]);
     const struct KnownTagData *tagData = knownTagData;
-    const struct KnownTagData * const knownTagDataEnd = knownTagData + knownTagCount;
+    const struct KnownTagData *const knownTagDataEnd = knownTagData + knownTagCount;
 
     if (!recursionLeft)
         return CborErrorNestingTooDeep;
@@ -334,7 +334,7 @@ static inline CborError validate_tag(CborValue *it, CborTag tag, uint32_t flags,
         return CborErrorExcludedType;
 
     /* find the tag data, if any */
-    for ( ; tagData != knownTagDataEnd; ++tagData) {
+    for (; tagData != knownTagDataEnd; ++tagData) {
         if (tagData->tag < tag)
             continue;
         if (tagData->tag > tag)
@@ -526,110 +526,110 @@ static CborError validate_value(CborValue *it, uint32_t flags, int recursionLeft
     }
 
     switch (type) {
-    case CborArrayType:
-    case CborMapType: {
-        /* recursive type */
-        CborValue recursed;
-        err = cbor_value_enter_container(it, &recursed);
-        if (!err)
-            err = validate_container(&recursed, type, flags, recursionLeft - 1);
-        if (err) {
-            it->ptr = recursed.ptr;
-            return err;
+        case CborArrayType:
+        case CborMapType: {
+            /* recursive type */
+            CborValue recursed;
+            err = cbor_value_enter_container(it, &recursed);
+            if (!err)
+                err = validate_container(&recursed, type, flags, recursionLeft - 1);
+            if (err) {
+                it->ptr = recursed.ptr;
+                return err;
+            }
+            err = cbor_value_leave_container(it, &recursed);
+            if (err)
+                return err;
+            return CborNoError;
         }
-        err = cbor_value_leave_container(it, &recursed);
-        if (err)
-            return err;
-        return CborNoError;
-    }
 
-    case CborIntegerType: {
-        uint64_t val;
-        err = cbor_value_get_raw_integer(it, &val);
-        cbor_assert(err == CborNoError);         /* can't fail */
+        case CborIntegerType: {
+            uint64_t val;
+            err = cbor_value_get_raw_integer(it, &val);
+            cbor_assert(err == CborNoError);         /* can't fail */
 
-        break;
-    }
+            break;
+        }
 
-    case CborByteStringType:
-    case CborTextStringType: {
-        size_t n = 0;
-        const void *ptr;
+        case CborByteStringType:
+        case CborTextStringType: {
+            size_t n = 0;
+            const void *ptr;
 
-        err = _cbor_value_prepare_string_iteration(it);
-        if (err)
-            return err;
-
-        while (1) {
-            err = validate_number(it, type, flags);
+            err = _cbor_value_prepare_string_iteration(it);
             if (err)
                 return err;
 
-            err = _cbor_value_get_string_chunk(it, &ptr, &n, it);
-            if (err)
-                return err;
-            if (!ptr)
-                break;
-
-            if (type == CborTextStringType && flags & CborValidateUtf8) {
-                err = validate_utf8_string(ptr, n);
+            while (1) {
+                err = validate_number(it, type, flags);
                 if (err)
                     return err;
+
+                err = _cbor_value_get_string_chunk(it, &ptr, &n, it);
+                if (err)
+                    return err;
+                if (!ptr)
+                    break;
+
+                if (type == CborTextStringType && flags & CborValidateUtf8) {
+                    err = validate_utf8_string(ptr, n);
+                    if (err)
+                        return err;
+                }
             }
+
+            return CborNoError;
         }
 
-        return CborNoError;
-    }
+        case CborTagType: {
+            CborTag tag;
+            err = cbor_value_get_tag(it, &tag);
+            cbor_assert(err == CborNoError);     /* can't fail */
 
-    case CborTagType: {
-        CborTag tag;
-        err = cbor_value_get_tag(it, &tag);
-        cbor_assert(err == CborNoError);     /* can't fail */
+            err = cbor_value_advance_fixed(it);
+            if (err)
+                return err;
+            err = validate_tag(it, tag, flags, recursionLeft - 1);
+            if (err)
+                return err;
 
-        err = cbor_value_advance_fixed(it);
-        if (err)
-            return err;
-        err = validate_tag(it, tag, flags, recursionLeft - 1);
-        if (err)
-            return err;
+            return CborNoError;
+        }
 
-        return CborNoError;
-    }
+        case CborSimpleType: {
+            uint8_t simple_type;
+            err = cbor_value_get_simple_type(it, &simple_type);
+            cbor_assert(err == CborNoError);     /* can't fail */
+            err = validate_simple_type(simple_type, flags);
+            if (err)
+                return err;
+            break;
+        }
 
-    case CborSimpleType: {
-        uint8_t simple_type;
-        err = cbor_value_get_simple_type(it, &simple_type);
-        cbor_assert(err == CborNoError);     /* can't fail */
-        err = validate_simple_type(simple_type, flags);
-        if (err)
-            return err;
-        break;
-    }
+        case CborNullType:
+        case CborBooleanType:
+            break;
 
-    case CborNullType:
-    case CborBooleanType:
-        break;
+        case CborUndefinedType:
+            if (flags & CborValidateNoUndefined)
+                return CborErrorExcludedType;
+            break;
 
-    case CborUndefinedType:
-        if (flags & CborValidateNoUndefined)
-            return CborErrorExcludedType;
-        break;
-
-    case CborHalfFloatType:
-    case CborFloatType:
-    case CborDoubleType: {
+        case CborHalfFloatType:
+        case CborFloatType:
+        case CborDoubleType: {
 #ifdef CBOR_NO_FLOATING_POINT
-        return CborErrorUnsupportedType;
+            return CborErrorUnsupportedType;
 #else
-        err = validate_floating_point(it, type, flags);
-        if (err)
-            return err;
-        break;
+            err = validate_floating_point(it, type, flags);
+            if (err)
+                return err;
+            break;
 #endif /* !CBOR_NO_FLOATING_POINT */
-    }
+        }
 
-    case CborInvalidType:
-        return CborErrorUnknownType;
+        case CborInvalidType:
+            return CborErrorUnknownType;
     }
 
     err = cbor_value_advance_fixed(it);
diff --git a/client/tinycbor/open_memstream.c b/client/tinycbor/open_memstream.c
index f618db8ae..b7ea77247 100644
--- a/client/tinycbor/open_memstream.c
+++ b/client/tinycbor/open_memstream.c
@@ -47,8 +47,7 @@ typedef size_t LenType;
 
 #include "compilersupport_p.h"
 
-struct Buffer
-{
+struct Buffer {
     char **ptr;
     size_t *len;
     size_t alloc;
diff --git a/client/ui.c b/client/ui.c
index c2b7db003..022c03a4a 100644
--- a/client/ui.c
+++ b/client/ui.c
@@ -12,7 +12,7 @@
 #include "ui.h"
 
 double CursorScaleFactor = 1;
-int PlotGridX=0, PlotGridY=0, PlotGridXdefault= 64, PlotGridYdefault= 64, CursorCPos= 0, CursorDPos= 0;
+int PlotGridX = 0, PlotGridY = 0, PlotGridXdefault = 64, PlotGridYdefault = 64, CursorCPos = 0, CursorDPos = 0;
 bool flushAfterWrite = 0;
 int GridOffset = 0;
 bool GridLocked = false;
@@ -21,7 +21,8 @@ bool showDemod = true;
 pthread_mutex_t print_lock = PTHREAD_MUTEX_INITIALIZER;
 static char *logfilename = "proxmark3.log";
 
-void PrintAndLogOptions(char *str[][2], size_t size, size_t space) {
+void PrintAndLogOptions(char *str[][2], size_t size, size_t space)
+{
     char buff[2000] = "Options:\n";
     char format[2000] = "";
     size_t counts[2] = {0, 0};
@@ -38,12 +39,13 @@ void PrintAndLogOptions(char *str[][2], size_t size, size_t space) {
                 snprintf(format, sizeof(format), "%%%zus%%-%zus", space, counts[j]);
             snprintf(buff + strlen(buff), sizeof(buff) - strlen(buff), format, " ", str[i][j]);
         }
-        if (i < size-1)
-            strncat(buff, "\n", sizeof(buff)-strlen(buff) -1);
+        if (i < size - 1)
+            strncat(buff, "\n", sizeof(buff) - strlen(buff) - 1);
     }
     PrintAndLogEx(NORMAL, "%s", buff);
 }
-void PrintAndLogEx(logLevel_t level, char *fmt, ...) {
+void PrintAndLogEx(logLevel_t level, char *fmt, ...)
+{
 
     // skip debug messages if client debugging is turned off i.e. 'DATA SETDEBUG 0'
     if (g_debugMode == 0 && level == DEBUG)
@@ -51,30 +53,30 @@ void PrintAndLogEx(logLevel_t level, char *fmt, ...) {
 
     char prefix[20] = {0};
     char buffer[MAX_PRINT_BUFFER] = {0};
-    char buffer2[MAX_PRINT_BUFFER+20] = {0};
+    char buffer2[MAX_PRINT_BUFFER + 20] = {0};
     char *token = NULL;
     int size = 0;
-                        //   {NORMAL, SUCCESS, INFO, FAILED, WARNING, ERR, DEBUG}
+    //   {NORMAL, SUCCESS, INFO, FAILED, WARNING, ERR, DEBUG}
     static char *prefixes[7] = { "", "[+] ", "[=] ", "[-] ", "[!] ", "[!!] ", "[#] "};
 
-    switch( level ) {
+    switch (level) {
         case ERR:
-            strncpy(prefix,_RED_([!!] ), sizeof(prefix)-1);
+            strncpy(prefix, _RED_([!!]), sizeof(prefix) - 1);
             break;
         case FAILED:
-            strncpy(prefix,_RED_([-] ), sizeof(prefix)-1);
+            strncpy(prefix, _RED_([-]), sizeof(prefix) - 1);
             break;
         case DEBUG:
-            strncpy(prefix,_BLUE_([#] ), sizeof(prefix)-1);
+            strncpy(prefix, _BLUE_([#]), sizeof(prefix) - 1);
             break;
         case SUCCESS:
-            strncpy(prefix,_GREEN_([+] ), sizeof(prefix)-1);
+            strncpy(prefix, _GREEN_([+]), sizeof(prefix) - 1);
             break;
         case WARNING:
-            strncpy(prefix,_CYAN_([!] ), sizeof(prefix)-1);
+            strncpy(prefix, _CYAN_([!]), sizeof(prefix) - 1);
             break;
         default:
-            strncpy(prefix, prefixes[level], sizeof(prefix)-1);
+            strncpy(prefix, prefixes[level], sizeof(prefix) - 1);
             break;
     }
 
@@ -84,7 +86,7 @@ void PrintAndLogEx(logLevel_t level, char *fmt, ...) {
     va_end(args);
 
     // no prefixes for normal
-    if ( level == NORMAL ) {
+    if (level == NORMAL) {
         PrintAndLog("%s", buffer);
         return;
     }
@@ -104,9 +106,9 @@ void PrintAndLogEx(logLevel_t level, char *fmt, ...) {
             size = strlen(buffer2);
 
             if (strlen(token))
-                snprintf(buffer2+size, sizeof(buffer2)-size, "%s%s\n", prefix, token);
+                snprintf(buffer2 + size, sizeof(buffer2) - size, "%s%s\n", prefix, token);
             else
-                snprintf(buffer2+size, sizeof(buffer2)-size, "\n");
+                snprintf(buffer2 + size, sizeof(buffer2) - size, "\n");
 
             token = strtok(NULL, delim);
         }
@@ -117,7 +119,8 @@ void PrintAndLogEx(logLevel_t level, char *fmt, ...) {
     }
 }
 
-void PrintAndLog(char *fmt, ...) {
+void PrintAndLog(char *fmt, ...)
+{
     char *saved_line;
     int saved_point;
     va_list argptr, argptr2;
@@ -184,20 +187,23 @@ void PrintAndLog(char *fmt, ...) {
     pthread_mutex_unlock(&print_lock);
 }
 
-void SetLogFilename(char *fn) {
+void SetLogFilename(char *fn)
+{
     logfilename = fn;
 }
 
-void SetFlushAfterWrite(bool value) {
+void SetFlushAfterWrite(bool value)
+{
     flushAfterWrite = value;
 }
 
- void iceIIR_Butterworth(int *data, const size_t len){
+void iceIIR_Butterworth(int *data, const size_t len)
+{
 
-    int i,j;
+    int i, j;
 
-    int * output =  (int* ) calloc(sizeof(int) * len, sizeof(uint8_t));
-    if ( !output ) return;
+    int *output = (int *) calloc(sizeof(int) * len, sizeof(uint8_t));
+    if (!output) return;
 
     // clear mem
     memset(output, 0x00, len);
@@ -206,7 +212,7 @@ void SetFlushAfterWrite(bool value) {
     float fc = 0.1125f;          // center frequency
 
     // create very simple low-pass filter to remove images (2nd-order Butterworth)
-    float complex iir_buf[3] = {0,0,0};
+    float complex iir_buf[3] = {0, 0, 0};
     float b[3] = {0.003621681514929,  0.007243363029857, 0.003621681514929};
     float a[3] = {1.000000000000000, -1.822694925196308, 0.837181651256023};
 
@@ -219,42 +225,43 @@ void SetFlushAfterWrite(bool value) {
         sample = data[i];
 
         // remove DC offset and mix to complex baseband
-        x = (sample - 127.5f) * cexpf( _Complex_I * 2 * M_PI * fc * i );
+        x = (sample - 127.5f) * cexpf(_Complex_I * 2 * M_PI * fc * i);
 
         // apply low-pass filter, removing spectral image (IIR using direct-form II)
         iir_buf[2] = iir_buf[1];
         iir_buf[1] = iir_buf[0];
-        iir_buf[0] = x - a[1]*iir_buf[1] - a[2]*iir_buf[2];
-        x          = b[0]*iir_buf[0] +
-                     b[1]*iir_buf[1] +
-                     b[2]*iir_buf[2];
+        iir_buf[0] = x - a[1] * iir_buf[1] - a[2] * iir_buf[2];
+        x          = b[0] * iir_buf[0] +
+                     b[1] * iir_buf[1] +
+                     b[2] * iir_buf[2];
 
         // compute instantaneous frequency by looking at phase difference
         // between adjacent samples
         float freq = cargf(x * conjf(x_prime));
         x_prime = x;    // retain this sample for next iteration
 
-        output[i] =(freq > 0) ? 127 : -127;
+        output[i] = (freq > 0) ? 127 : -127;
     }
 
     // show data
     //memcpy(data, output, adjustedLen);
-    for (j=0; j<adjustedLen; ++j)
+    for (j = 0; j < adjustedLen; ++j)
         data[j] = output[j];
 
     free(output);
 }
 
-void iceSimple_Filter(int *data, const size_t len, uint8_t k){
+void iceSimple_Filter(int *data, const size_t len, uint8_t k)
+{
 // ref: http://www.edn.com/design/systems-design/4320010/A-simple-software-lowpass-filter-suits-embedded-system-applications
 // parameter K
 #define FILTER_SHIFT 4
 
     int32_t filter_reg = 0;
     int16_t input, output;
-    int8_t shift = (k <=8 ) ? k : FILTER_SHIFT;
+    int8_t shift = (k <= 8) ? k : FILTER_SHIFT;
 
-    for (int i = 0; i < len; ++i){
+    for (int i = 0; i < len; ++i) {
 
         input = data[i];
         // Update filter with current sample
@@ -266,10 +273,11 @@ void iceSimple_Filter(int *data, const size_t len, uint8_t k){
     }
 }
 
-float complex cexpf (float complex Z) {
-  float complex  Res;
-  double rho = exp (__real__ Z);
-  __real__ Res = rho * cosf(__imag__ Z);
-  __imag__ Res = rho * sinf(__imag__ Z);
-  return Res;
+float complex cexpf(float complex Z)
+{
+    float complex  Res;
+    double rho = exp(__real__ Z);
+    __real__ Res = rho * cosf(__imag__ Z);
+    __imag__ Res = rho * sinf(__imag__ Z);
+    return Res;
 }
diff --git a/client/ui.h b/client/ui.h
index e04612f2e..827c3828e 100644
--- a/client/ui.h
+++ b/client/ui.h
@@ -48,6 +48,6 @@ extern bool showDemod;
 
 extern pthread_mutex_t print_lock;
 
-extern void iceIIR_Butterworth(int * data, const size_t len);
+extern void iceIIR_Butterworth(int *data, const size_t len);
 extern void iceSimple_Filter(int *data, const size_t len, uint8_t k);
 #endif
diff --git a/client/util.c b/client/util.c
index 2adb2bf4d..cc95533bb 100644
--- a/client/util.c
+++ b/client/util.c
@@ -25,12 +25,13 @@ uint8_t g_debugMode = 0;
 #include <unistd.h>
 #include <stdarg.h>
 
-int ukbhit(void) {
+int ukbhit(void)
+{
     int cnt = 0;
     int error;
     static struct termios Otty, Ntty;
 
-    if ( tcgetattr(STDIN_FILENO, &Otty) == -1) return -1;
+    if (tcgetattr(STDIN_FILENO, &Otty) == -1) return -1;
 
     Ntty = Otty;
 
@@ -44,13 +45,14 @@ int ukbhit(void) {
         error += ioctl(STDIN_FILENO, FIONREAD, &cnt);              // get number of characters available
         error += tcsetattr(STDIN_FILENO, TCSANOW, &Otty);          // reset attributes
     }
-    return ( error == 0 ? cnt : -1 );
+    return (error == 0 ? cnt : -1);
 }
 
 #else
 
 #include <conio.h>
-int ukbhit(void) {
+int ukbhit(void)
+{
     return kbhit();
 }
 #endif
@@ -58,7 +60,8 @@ int ukbhit(void) {
 // log files functions
 
 // open, appped and close logfile
-void AddLogLine(char *fn, char *data, char *c) {
+void AddLogLine(char *fn, char *data, char *c)
+{
     FILE *f = NULL;
     char filename[FILE_PATH_SIZE] = {0x00};
     int len = 0;
@@ -80,24 +83,27 @@ void AddLogLine(char *fn, char *data, char *c) {
     fclose(f);
 }
 
-void AddLogHex(char *fn, char *extData, const uint8_t * data, const size_t len){
+void AddLogHex(char *fn, char *extData, const uint8_t *data, const size_t len)
+{
     AddLogLine(fn, extData, sprint_hex(data, len));
 }
 
-void AddLogUint64(char *fn, char *data, const uint64_t value) {
+void AddLogUint64(char *fn, char *data, const uint64_t value)
+{
     char buf[20] = {0};
     memset(buf, 0x00, sizeof(buf));
     sprintf(buf, "%016" PRIx64 "", value);
     AddLogLine(fn, data, buf);
 }
 
-void AddLogCurrentDT(char *fn) {
+void AddLogCurrentDT(char *fn)
+{
     char buf[20];
     memset(buf, 0x00, sizeof(buf));
     struct tm *curTime;
     time_t now = time(0);
     curTime = gmtime(&now);
-    strftime (buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", curTime);
+    strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", curTime);
     AddLogLine(fn, "\nanticollision: ", buf);
 }
 
@@ -106,8 +112,9 @@ void AddLogCurrentDT(char *fn) {
 // param *uid  -  pointer to uid byte array
 // param *ext  -  ".log"
 // param uidlen - length of uid array.
-void FillFileNameByUID(char *filenamePrefix, uint8_t *uid, const char *ext, int uidlen) {
-    if ( filenamePrefix == NULL || uid == NULL || ext == NULL ){
+void FillFileNameByUID(char *filenamePrefix, uint8_t *uid, const char *ext, int uidlen)
+{
+    if (filenamePrefix == NULL || uid == NULL || ext == NULL) {
         printf("[!] error parameter is NULL\n");
         return;
     }
@@ -122,14 +129,15 @@ void FillFileNameByUID(char *filenamePrefix, uint8_t *uid, const char *ext, int
 }
 
 // fill buffer from structure [{uint8_t data, size_t length},...]
-int FillBuffer(uint8_t *data, size_t maxDataLength, size_t *dataLength, ...) {
+int FillBuffer(uint8_t *data, size_t maxDataLength, size_t *dataLength, ...)
+{
     *dataLength = 0;
     va_list valist;
     va_start(valist, dataLength);
 
     uint8_t *vdata = NULL;
     size_t vlength = 0;
-    do{
+    do {
         vdata = va_arg(valist, uint8_t *);
         if (!vdata)
             break;
@@ -150,7 +158,8 @@ int FillBuffer(uint8_t *data, size_t maxDataLength, size_t *dataLength, ...) {
     return 0;
 }
 
-bool CheckStringIsHEXValue(const char *value) {
+bool CheckStringIsHEXValue(const char *value)
+{
     for (int i = 0; i < strlen(value); i++)
         if (!isxdigit(value[i]))
             return false;
@@ -162,13 +171,14 @@ bool CheckStringIsHEXValue(const char *value) {
 }
 
 void hex_to_buffer(const uint8_t *buf, const uint8_t *hex_data, const size_t hex_len, const size_t hex_max_len,
-    const size_t min_str_len, const size_t spaces_between, bool uppercase) {
+                   const size_t min_str_len, const size_t spaces_between, bool uppercase)
+{
 
     char *tmp = (char *)buf;
     size_t i;
     memset(tmp, 0x00, hex_max_len);
 
-    int maxLen = ( hex_len > hex_max_len) ? hex_max_len : hex_len;
+    int maxLen = (hex_len > hex_max_len) ? hex_max_len : hex_len;
 
     for (i = 0; i < maxLen; ++i, tmp += 2 + spaces_between) {
         sprintf(tmp, (uppercase) ? "%02X" : "%02x", (unsigned int) hex_data[i]);
@@ -181,21 +191,23 @@ void hex_to_buffer(const uint8_t *buf, const uint8_t *hex_data, const size_t hex
     int minStrLen = min_str_len > i ? min_str_len : 0;
     if (minStrLen > hex_max_len)
         minStrLen = hex_max_len;
-    for(; i < minStrLen; i++, tmp += 1)
+    for (; i < minStrLen; i++, tmp += 1)
         sprintf(tmp, " ");
 
     return;
 }
 
 // printing and converting functions
-void print_hex(const uint8_t *data, const size_t len) {
+void print_hex(const uint8_t *data, const size_t len)
+{
     size_t i;
-    for (i=0; i < len; i++)
+    for (i = 0; i < len; i++)
         printf("%02x ", data[i]);
     printf("\n");
 }
 
-void print_hex_break(const uint8_t *data, const size_t len, uint8_t breaks) {
+void print_hex_break(const uint8_t *data, const size_t len, uint8_t breaks)
+{
     int rownum = 0;
     printf("[%02d] | ", rownum);
     for (int i = 0; i < len; ++i) {
@@ -203,7 +215,7 @@ void print_hex_break(const uint8_t *data, const size_t len, uint8_t breaks) {
         printf("%02X ", data[i]);
 
         // check if a line break is needed
-        if ( breaks > 0 && !((i+1) % breaks) && (i+1 < len) ) {
+        if (breaks > 0 && !((i + 1) % breaks) && (i + 1 < len)) {
             ++rownum;
             printf("\n[%02d] | ", rownum);
         }
@@ -211,36 +223,41 @@ void print_hex_break(const uint8_t *data, const size_t len, uint8_t breaks) {
     printf("\n");
 }
 
-char *sprint_hex(const uint8_t *data, const size_t len) {
+char *sprint_hex(const uint8_t *data, const size_t len)
+{
     static char buf[UTIL_BUFFER_SIZE_SPRINT - 3] = {0};
     hex_to_buffer((uint8_t *)buf, data, len, sizeof(buf) - 1, 0, 1, true);
     return buf;
 }
 
-char *sprint_hex_inrow_ex(const uint8_t *data, const size_t len, const size_t min_str_len) {
+char *sprint_hex_inrow_ex(const uint8_t *data, const size_t len, const size_t min_str_len)
+{
     static char buf[UTIL_BUFFER_SIZE_SPRINT] = {0};
     hex_to_buffer((uint8_t *)buf, data, len, sizeof(buf) - 1, min_str_len, 0, true);
     return buf;
 }
 
-char *sprint_hex_inrow(const uint8_t *data, const size_t len) {
+char *sprint_hex_inrow(const uint8_t *data, const size_t len)
+{
     return sprint_hex_inrow_ex(data, len, 0);
 }
-char *sprint_hex_inrow_spaces(const uint8_t *data, const size_t len, size_t spaces_between) {
+char *sprint_hex_inrow_spaces(const uint8_t *data, const size_t len, size_t spaces_between)
+{
     static char buf[UTIL_BUFFER_SIZE_SPRINT] = {0};
     hex_to_buffer((uint8_t *)buf, data, len, sizeof(buf) - 1, 0, spaces_between, true);
     return buf;
 }
 
-char *sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t breaks) {
+char *sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t breaks)
+{
 
     // make sure we don't go beyond our char array memory
     size_t in_index = 0, out_index = 0;
 
-    int rowlen = (len > MAX_BIN_BREAK_LENGTH ) ? MAX_BIN_BREAK_LENGTH : len;
+    int rowlen = (len > MAX_BIN_BREAK_LENGTH) ? MAX_BIN_BREAK_LENGTH : len;
 
-    if ( breaks > 0 && len % breaks != 0)
-        rowlen = ( len+(len/breaks) > MAX_BIN_BREAK_LENGTH ) ? MAX_BIN_BREAK_LENGTH : len+(len/breaks);
+    if (breaks > 0 && len % breaks != 0)
+        rowlen = (len + (len / breaks) > MAX_BIN_BREAK_LENGTH) ? MAX_BIN_BREAK_LENGTH : len + (len / breaks);
 
     //printf("(sprint_bin_break) rowlen %d\n", rowlen);
 
@@ -250,14 +267,14 @@ char *sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t brea
     char *tmp = buf;
 
     // loop through the out_index to make sure we don't go too far
-    for (out_index=0; out_index < rowlen; out_index++) {
+    for (out_index = 0; out_index < rowlen; out_index++) {
         // set character
         sprintf(tmp++, "%u", data[in_index]);
         // check if a line break is needed and we have room to print it in our array
-        if ( (breaks > 0) && !((in_index+1) % breaks) && (out_index+1 != rowlen) ) {
+        if ((breaks > 0) && !((in_index + 1) % breaks) && (out_index + 1 != rowlen)) {
             // increment and print line break
             out_index++;
-            sprintf(tmp++, "%s","\n");
+            sprintf(tmp++, "%s", "\n");
         }
         in_index++;
     }
@@ -303,72 +320,79 @@ void sprint_bin_break_ex(uint8_t *src, size_t srclen, char *dest , uint8_t break
 }
 */
 
-char *sprint_bin(const uint8_t *data, const size_t len) {
+char *sprint_bin(const uint8_t *data, const size_t len)
+{
     return sprint_bin_break(data, len, 0);
 }
 
-char *sprint_hex_ascii(const uint8_t *data, const size_t len) {
+char *sprint_hex_ascii(const uint8_t *data, const size_t len)
+{
     static char buf[UTIL_BUFFER_SIZE_SPRINT];
     char *tmp = buf;
     memset(buf, 0x00, UTIL_BUFFER_SIZE_SPRINT);
     size_t max_len = (len > 1010) ? 1010 : len;
 
-    snprintf(tmp, UTIL_BUFFER_SIZE_SPRINT, "%s| ", sprint_hex(data, max_len) );
+    snprintf(tmp, UTIL_BUFFER_SIZE_SPRINT, "%s| ", sprint_hex(data, max_len));
 
     size_t i = 0;
     size_t pos = (max_len * 3) + 2;
-    while (i < max_len){
+    while (i < max_len) {
         char c = data[i];
-        if ( (c < 32) || (c == 127))
+        if ((c < 32) || (c == 127))
             c = '.';
-        sprintf(tmp+pos+i, "%c",  c);
+        sprintf(tmp + pos + i, "%c",  c);
         ++i;
     }
     return buf;
 }
 
-char *sprint_ascii_ex(const uint8_t *data, const size_t len, const size_t min_str_len) {
+char *sprint_ascii_ex(const uint8_t *data, const size_t len, const size_t min_str_len)
+{
     static char buf[UTIL_BUFFER_SIZE_SPRINT];
     char *tmp = buf;
     memset(buf, 0x00, UTIL_BUFFER_SIZE_SPRINT);
     size_t max_len = (len > 1010) ? 1010 : len;
     size_t i = 0;
-    while(i < max_len){
+    while (i < max_len) {
         char c = data[i];
         tmp[i] = ((c < 32) || (c == 127)) ? '.' : c;
         ++i;
     }
 
     int m = min_str_len > i ? min_str_len : 0;
-    for(; i < m; ++i)
+    for (; i < m; ++i)
         tmp[i] = ' ';
 
     return buf;
 }
-char *sprint_ascii(const uint8_t *data, const size_t len) {
+char *sprint_ascii(const uint8_t *data, const size_t len)
+{
     return sprint_ascii_ex(data, len, 0);
 }
 
-void print_blocks(uint32_t *data, size_t len) {
+void print_blocks(uint32_t *data, size_t len)
+{
     PrintAndLogEx(NORMAL, "Blk | Data ");
     PrintAndLogEx(NORMAL, "----+------------");
 
-    if ( !data ) {
+    if (!data) {
         PrintAndLogEx(ERR, "..empty data");
     } else {
-        for (uint8_t i=0; i<len; i++)
+        for (uint8_t i = 0; i < len; i++)
             PrintAndLogEx(NORMAL, "%02d | 0x%08X", i, data[i]);
     }
 }
 
-void num_to_bytes(uint64_t n, size_t len, uint8_t* dest) {
+void num_to_bytes(uint64_t n, size_t len, uint8_t *dest)
+{
     while (len--) {
         dest[len] = n & 0xFF;
         n >>= 8;
     }
 }
 
-uint64_t bytes_to_num(uint8_t* src, size_t len) {
+uint64_t bytes_to_num(uint8_t *src, size_t len)
+{
     uint64_t num = 0;
     while (len--) {
         num = (num << 8) | (*src);
@@ -378,7 +402,8 @@ uint64_t bytes_to_num(uint8_t* src, size_t len) {
 }
 
 // takes a number (uint64_t) and creates a binarray in dest.
-void num_to_bytebits(uint64_t n, size_t len, uint8_t *dest) {
+void num_to_bytebits(uint64_t n, size_t len, uint8_t *dest)
+{
     while (len--) {
         dest[len] = n & 1;
         n >>= 1;
@@ -386,8 +411,9 @@ void num_to_bytebits(uint64_t n, size_t len, uint8_t *dest) {
 }
 
 //least significant bit first
-void num_to_bytebitsLSBF(uint64_t n, size_t len, uint8_t *dest) {
-    for(int i = 0 ; i < len ; ++i) {
+void num_to_bytebitsLSBF(uint64_t n, size_t len, uint8_t *dest)
+{
+    for (int i = 0 ; i < len ; ++i) {
         dest[i] =  n & 1;
         n >>= 1;
     }
@@ -397,13 +423,14 @@ void num_to_bytebitsLSBF(uint64_t n, size_t len, uint8_t *dest) {
 // to
 // hh,gg,ff,ee,dd,cc,bb,aa, pp,oo,nn,mm,ll,kk,jj,ii
 // up to 64 bytes or 512 bits
-uint8_t *SwapEndian64(const uint8_t *src, const size_t len, const uint8_t blockSize){
+uint8_t *SwapEndian64(const uint8_t *src, const size_t len, const uint8_t blockSize)
+{
     static uint8_t buf[64];
     memset(buf, 0x00, 64);
     uint8_t *tmp = buf;
-    for (uint8_t block=0; block < (uint8_t)(len/blockSize); block++){
-        for (size_t i = 0; i < blockSize; i++){
-            tmp[i+(blockSize*block)] = src[(blockSize-1-i)+(blockSize*block)];
+    for (uint8_t block = 0; block < (uint8_t)(len / blockSize); block++) {
+        for (size_t i = 0; i < blockSize; i++) {
+            tmp[i + (blockSize * block)] = src[(blockSize - 1 - i) + (blockSize * block)];
         }
     }
     return buf;
@@ -411,10 +438,11 @@ uint8_t *SwapEndian64(const uint8_t *src, const size_t len, const uint8_t blockS
 
 // takes a uint8_t src array, for len items and reverses the byte order in blocksizes (8,16,32,64),
 // returns: the dest array contains the reordered src array.
-void SwapEndian64ex(const uint8_t *src, const size_t len, const uint8_t blockSize, uint8_t *dest){
-    for (uint8_t block=0; block < (uint8_t)(len/blockSize); block++){
-        for (size_t i = 0; i < blockSize; i++){
-            dest[i+(blockSize*block)] = src[(blockSize-1-i)+(blockSize*block)];
+void SwapEndian64ex(const uint8_t *src, const size_t len, const uint8_t blockSize, uint8_t *dest)
+{
+    for (uint8_t block = 0; block < (uint8_t)(len / blockSize); block++) {
+        for (size_t i = 0; i < blockSize; i++) {
+            dest[i + (blockSize * block)] = src[(blockSize - 1 - i) + (blockSize * block)];
         }
     }
 }
@@ -436,21 +464,21 @@ int param_getptr(const char *line, int *bg, int *en, int paramnum)
     *bg = 0;
     *en = 0;
 
-  // skip spaces
-    while (line[*bg] ==' ' || line[*bg]=='\t') (*bg)++;
+    // skip spaces
+    while (line[*bg] == ' ' || line[*bg] == '\t')(*bg)++;
     if (*bg >= len) {
         return 1;
     }
 
     for (i = 0; i < paramnum; i++) {
-        while (line[*bg]!=' ' && line[*bg]!='\t' && line[*bg] != '\0') (*bg)++;
-        while (line[*bg]==' ' || line[*bg]=='\t') (*bg)++;
+        while (line[*bg] != ' ' && line[*bg] != '\t' && line[*bg] != '\0')(*bg)++;
+        while (line[*bg] == ' ' || line[*bg] == '\t')(*bg)++;
 
         if (line[*bg] == '\0') return 1;
     }
 
     *en = *bg;
-    while (line[*en] != ' ' && line[*en] != '\t' && line[*en] != '\0') (*en)++;
+    while (line[*en] != ' ' && line[*en] != '\t' && line[*en] != '\0')(*en)++;
 
     (*en)--;
 
@@ -466,11 +494,13 @@ int param_getlength(const char *line, int paramnum)
     return en - bg + 1;
 }
 
-char param_getchar(const char *line, int paramnum) {
+char param_getchar(const char *line, int paramnum)
+{
     return param_getchar_indx(line, 0, paramnum);
 }
 
-char param_getchar_indx(const char *line, int indx, int paramnum) {
+char param_getchar_indx(const char *line, int indx, int paramnum)
+{
     int bg, en;
 
     if (param_getptr(line, &bg, &en, paramnum)) return 0x00;
@@ -495,7 +525,7 @@ uint8_t param_get8(const char *line, int paramnum)
 uint8_t param_getdec(const char *line, int paramnum, uint8_t *destination)
 {
     uint8_t val =  param_get8ex(line, paramnum, 255, 10);
-    if( (int8_t) val == -1) return 1;
+    if ((int8_t) val == -1) return 1;
     (*destination) = val;
     return 0;
 }
@@ -510,7 +540,7 @@ uint8_t param_isdec(const char *line, int paramnum)
     int bg, en;
     //TODO, check more thorougly
     if (!param_getptr(line, &bg, &en, paramnum)) return 1;
-        // return strtoul(&line[bg], NULL, 10) & 0xff;
+    // return strtoul(&line[bg], NULL, 10) & 0xff;
 
     return 0;
 }
@@ -542,7 +572,8 @@ uint64_t param_get64ex(const char *line, int paramnum, int deflt, int base)
         return deflt;
 }
 
-int param_gethex(const char *line, int paramnum, uint8_t * data, int hexcnt) {
+int param_gethex(const char *line, int paramnum, uint8_t *data, int hexcnt)
+{
     int bg, en, i;
     uint32_t temp;
 
@@ -552,16 +583,17 @@ int param_gethex(const char *line, int paramnum, uint8_t * data, int hexcnt) {
 
     if (en - bg + 1 != hexcnt) return 1;
 
-    for(i = 0; i < hexcnt; i += 2) {
-        if (!(isxdigit(line[bg + i]) && isxdigit(line[bg + i + 1])) ) return 1;
+    for (i = 0; i < hexcnt; i += 2) {
+        if (!(isxdigit(line[bg + i]) && isxdigit(line[bg + i + 1]))) return 1;
 
-        sscanf((char[]){line[bg + i], line[bg + i + 1], 0}, "%X", &temp);
+        sscanf((char[]) {line[bg + i], line[bg + i + 1], 0}, "%X", &temp);
         data[i / 2] = temp & 0xff;
     }
 
     return 0;
 }
-int param_gethex_ex(const char *line, int paramnum, uint8_t * data, int *hexcnt) {
+int param_gethex_ex(const char *line, int paramnum, uint8_t *data, int *hexcnt)
+{
     int bg, en, i;
     uint32_t temp;
 
@@ -571,17 +603,18 @@ int param_gethex_ex(const char *line, int paramnum, uint8_t * data, int *hexcnt)
     if (*hexcnt % 2) //error if not complete hex bytes
         return 1;
 
-    for(i = 0; i < *hexcnt; i += 2) {
-        if (!(isxdigit(line[bg + i]) && isxdigit(line[bg + i + 1])) ) return 1;
+    for (i = 0; i < *hexcnt; i += 2) {
+        if (!(isxdigit(line[bg + i]) && isxdigit(line[bg + i + 1]))) return 1;
 
-        sscanf((char[]){line[bg + i], line[bg + i + 1], 0}, "%X", &temp);
+        sscanf((char[]) {line[bg + i], line[bg + i + 1], 0}, "%X", &temp);
         data[i / 2] = temp & 0xff;
     }
 
     return 0;
 }
 
-int param_gethex_to_eol(const char *line, int paramnum, uint8_t * data, int maxdatalen, int *datalen) {
+int param_gethex_to_eol(const char *line, int paramnum, uint8_t *data, int maxdatalen, int *datalen)
+{
     int bg, en;
     uint32_t temp;
     char buf[5] = {0};
@@ -627,7 +660,7 @@ int param_gethex_to_eol(const char *line, int paramnum, uint8_t * data, int maxd
     return 0;
 }
 
-int param_getstr(const char *line, int paramnum, char * str, size_t buffersize)
+int param_getstr(const char *line, int paramnum, char *str, size_t buffersize)
 {
     int bg, en;
 
@@ -655,15 +688,14 @@ https://github.com/ApertureLabsLtd/RFIDler/blob/master/firmware/Pic32/RFIDler.X/
 // returns number of bits converted
 int hextobinarray(char *target, char *source)
 {
-    int length, i, count= 0;
-    char* start = source;
+    int length, i, count = 0;
+    char *start = source;
     char x;
 
     length = strlen(source);
     // process 4 bits (1 hex digit) at a time
-    while(length--)
-    {
-        x= *(source++);
+    while (length--) {
+        x = *(source++);
         // capitalize
         if (x >= 'a' && x <= 'f')
             x -= 32;
@@ -677,8 +709,8 @@ int hextobinarray(char *target, char *source)
             return 0;
         }
         // output
-        for(i= 0 ; i < 4 ; ++i, ++count)
-            *(target++)= (x >> (3 - i)) & 1;
+        for (i = 0 ; i < 4 ; ++i, ++count)
+            *(target++) = (x >> (3 - i)) & 1;
     }
 
     return count;
@@ -689,7 +721,7 @@ int hextobinstring(char *target, char *source)
 {
     int length;
 
-    if(!(length= hextobinarray(target, source)))
+    if (!(length = hextobinarray(target, source)))
         return 0;
     binarraytobinstring(target, target, length);
     return length;
@@ -702,14 +734,13 @@ int binarraytohex(char *target, char *source, int length)
     unsigned char i, x;
     int j = length;
 
-    if(j % 4)
+    if (j % 4)
         return 0;
 
-    while(j)
-    {
-        for(i= x= 0 ; i < 4 ; ++i)
-            x +=  ( source[i] << (3 - i));
-        sprintf(target,"%X", x);
+    while (j) {
+        for (i = x = 0 ; i < 4 ; ++i)
+            x += (source[i] << (3 - i));
+        sprintf(target, "%X", x);
         ++target;
         source += 4;
         j -= 4;
@@ -722,16 +753,16 @@ void binarraytobinstring(char *target, char *source,  int length)
 {
     int i;
 
-    for(i= 0 ; i < length ; ++i)
-        *(target++)= *(source++) + '0';
-    *target= '\0';
+    for (i = 0 ; i < length ; ++i)
+        *(target++) = *(source++) + '0';
+    *target = '\0';
 }
 
 // return parity bit required to match type
-uint8_t GetParity( uint8_t *bits, uint8_t type, int length)
+uint8_t GetParity(uint8_t *bits, uint8_t type, int length)
 {
     int x;
-    for( x = 0 ; length > 0 ; --length)
+    for (x = 0 ; length > 0 ; --length)
         x += bits[length - 1];
     x %= 2;
     return x ^ type;
@@ -740,28 +771,31 @@ uint8_t GetParity( uint8_t *bits, uint8_t type, int length)
 // add HID parity to binary array: EVEN prefix for 1st half of ID, ODD suffix for 2nd half
 void wiegand_add_parity(uint8_t *target, uint8_t *source, uint8_t length)
 {
-    *(target++)= GetParity(source, EVEN, length / 2);
+    *(target++) = GetParity(source, EVEN, length / 2);
     memcpy(target, source, length);
     target += length;
-    *(target)= GetParity(source + length / 2, ODD, length / 2);
+    *(target) = GetParity(source + length / 2, ODD, length / 2);
 }
 
 // xor two arrays together for len items.  The dst array contains the new xored values.
-void xor(unsigned char * dst, unsigned char * src, size_t len) {
-   for( ; len > 0; len--,dst++,src++)
-       *dst ^= *src;
+void xor(unsigned char *dst, unsigned char *src, size_t len)
+{
+    for (; len > 0; len--, dst++, src++)
+        *dst ^= *src;
 }
 
-int32_t le24toh (uint8_t data[3]) {
+int32_t le24toh(uint8_t data[3])
+{
     return (data[2] << 16) | (data[1] << 8) | data[0];
 }
 // Pack a bitarray into a uint32_t.
-uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits) {
+uint32_t PackBits(uint8_t start, uint8_t len, uint8_t *bits)
+{
 
     if (len > 32) return 0;
 
     int i = start;
-    int j = len-1;
+    int j = len - 1;
     uint32_t tmp = 0;
 
     for (; j >= 0; --j, ++i)
@@ -772,12 +806,13 @@ uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits) {
 
 // RotateLeft - Ultralight, Desfire, works on byte level
 // 00-01-02  >> 01-02-00
-void rol(uint8_t *data, const size_t len){
+void rol(uint8_t *data, const size_t len)
+{
     uint8_t first = data[0];
-    for (size_t i = 0; i < len-1; i++) {
-        data[i] = data[i+1];
+    for (size_t i = 0; i < len - 1; i++) {
+        data[i] = data[i + 1];
     }
-    data[len-1] = first;
+    data[len - 1] = first;
 }
 
 /*
@@ -788,10 +823,12 @@ uint8_t pw_rev_A(uint8_t b) {
     return b;
 }
 */
-uint8_t reflect8(uint8_t b) {
+uint8_t reflect8(uint8_t b)
+{
     return ((b * 0x80200802ULL) & 0x0884422110ULL) * 0x0101010101ULL >> 32;
 }
-uint16_t reflect16(uint16_t b) {
+uint16_t reflect16(uint16_t b)
+{
     uint16_t v = 0;
     v |= (b & 0x8000) >> 15;
     v |= (b & 0x4000) >> 13;
@@ -817,74 +854,83 @@ uint16_t reflect16(uint16_t b) {
  Returns the value v with the bottom b [0,32] bits reflected.
  Example: reflect(0x3e23L,3) == 0x3e26
 */
-uint32_t reflect(uint32_t v, int b) {
+uint32_t reflect(uint32_t v, int b)
+{
     uint32_t t = v;
-    for ( int i = 0; i < b; ++i) {
+    for (int i = 0; i < b; ++i) {
         if (t & 1)
-            v |=  BITMASK((b-1)-i);
+            v |=  BITMASK((b - 1) - i);
         else
-            v &= ~BITMASK((b-1)-i);
-        t>>=1;
+            v &= ~BITMASK((b - 1) - i);
+        t >>= 1;
     }
     return v;
 }
 
-uint64_t HornerScheme(uint64_t num, uint64_t divider, uint64_t factor) {
-   uint64_t remainder=0, quotient=0, result=0;
-   remainder = num % divider;
-   quotient = num / divider;
-   if(!(quotient == 0 && remainder == 0))
-   result += HornerScheme(quotient, divider, factor) * factor + remainder;
-   return result;
+uint64_t HornerScheme(uint64_t num, uint64_t divider, uint64_t factor)
+{
+    uint64_t remainder = 0, quotient = 0, result = 0;
+    remainder = num % divider;
+    quotient = num / divider;
+    if (!(quotient == 0 && remainder == 0))
+        result += HornerScheme(quotient, divider, factor) * factor + remainder;
+    return result;
 }
 
 // determine number of logical CPU cores (use for multithreaded functions)
-extern int num_CPUs(void) {
+extern int num_CPUs(void)
+{
 #if defined(_WIN32)
-    #include <sysinfoapi.h>
+#include <sysinfoapi.h>
     SYSTEM_INFO sysinfo;
     GetSystemInfo(&sysinfo);
     return sysinfo.dwNumberOfProcessors;
 #elif defined(__linux__) || defined(__APPLE__)
-    #include <unistd.h>
+#include <unistd.h>
     return sysconf(_SC_NPROCESSORS_ONLN);
 #else
     return 1;
 #endif
 }
 
-extern void str_lower(char *s ){
-    for(int i=0; i < strlen(s); i++)
-        s[i] = tolower( s[i] );
+extern void str_lower(char *s)
+{
+    for (int i = 0; i < strlen(s); i++)
+        s[i] = tolower(s[i]);
 }
-extern bool str_startswith(const char *s,  const char *pre) {
+extern bool str_startswith(const char *s,  const char *pre)
+{
     return strncmp(pre, s, strlen(pre)) == 0;
 }
 
 // Replace unprintable characters with a dot in char buffer
-extern void clean_ascii(unsigned char *buf, size_t len) {
-  for (size_t i = 0; i < len; i++) {
-    if (!isprint(buf[i]))
-      buf[i] = '.';
-  }
+extern void clean_ascii(unsigned char *buf, size_t len)
+{
+    for (size_t i = 0; i < len; i++) {
+        if (!isprint(buf[i]))
+            buf[i] = '.';
+    }
 }
 
 // replace \r \n to \0
-extern void strcleanrn(char *buf, size_t len) {
+extern void strcleanrn(char *buf, size_t len)
+{
     strcreplace(buf, len, '\n', '\0');
     strcreplace(buf, len, '\r', '\0');
 }
 
 // replace char in buffer
-extern void strcreplace(char *buf, size_t len, char from, char to) {
-  for (size_t i = 0; i < len; i++) {
-    if (buf[i] == from)
-      buf[i] = to;
-  }
+extern void strcreplace(char *buf, size_t len, char from, char to)
+{
+    for (size_t i = 0; i < len; i++) {
+        if (buf[i] == from)
+            buf[i] = to;
+    }
 }
 
-extern char *strmcopy(char *buf) {
-    char* str = (char*) calloc(strlen(buf) + 1, sizeof(uint8_t));
+extern char *strmcopy(char *buf)
+{
+    char *str = (char *) calloc(strlen(buf) + 1, sizeof(uint8_t));
     if (str != NULL) {
         memset(str, 0, strlen(buf) + 1);
         strcpy(str, buf);
diff --git a/client/util.h b/client/util.h
index 5c4251b3a..0edeae5f0 100644
--- a/client/util.h
+++ b/client/util.h
@@ -21,7 +21,7 @@
 #include "ui.h"     // PrintAndLog
 
 #ifdef ANDROID
-  #include <endian.h>
+#include <endian.h>
 #endif
 
 #ifndef BITMASK
@@ -43,63 +43,63 @@
 
 // endian change for 64bit
 #ifdef __GNUC__
-    #ifndef BSWAP_64
-        #define BSWAP_64(x) __builtin_bswap64(x)
-    #endif
+#ifndef BSWAP_64
+#define BSWAP_64(x) __builtin_bswap64(x)
+#endif
 #else
-    #ifdef _MSC_VER
-        #ifndef BSWAP_64
-            #define BSWAP_64(x) _byteswap_uint64(x)
-        #endif
-    #else
-    #ifndef BSWAP_64
-        #define BSWAP_64(x) \
-            (((uint64_t)(x) << 56) | \
-            (((uint64_t)(x) << 40) & 0xff000000000000ULL) | \
-            (((uint64_t)(x) << 24) & 0xff0000000000ULL) | \
-            (((uint64_t)(x) << 8)  & 0xff00000000ULL) | \
-            (((uint64_t)(x) >> 8)  & 0xff000000ULL) | \
-            (((uint64_t)(x) >> 24) & 0xff0000ULL) | \
-            (((uint64_t)(x) >> 40) & 0xff00ULL) | \
-            ((uint64_t)(x)  >> 56))
-        #endif
-    #endif
+#ifdef _MSC_VER
+#ifndef BSWAP_64
+#define BSWAP_64(x) _byteswap_uint64(x)
+#endif
+#else
+#ifndef BSWAP_64
+#define BSWAP_64(x) \
+    (((uint64_t)(x) << 56) | \
+     (((uint64_t)(x) << 40) & 0xff000000000000ULL) | \
+     (((uint64_t)(x) << 24) & 0xff0000000000ULL) | \
+     (((uint64_t)(x) << 8)  & 0xff00000000ULL) | \
+     (((uint64_t)(x) >> 8)  & 0xff000000ULL) | \
+     (((uint64_t)(x) >> 24) & 0xff0000ULL) | \
+     (((uint64_t)(x) >> 40) & 0xff00ULL) | \
+     ((uint64_t)(x)  >> 56))
+#endif
+#endif
 #endif
 
 // endian change for 32bit
 #ifdef __GNUC__
-    #ifndef BSWAP_32
-        #define BSWAP_32(x) __builtin_bswap32(x)
-    #endif
+#ifndef BSWAP_32
+#define BSWAP_32(x) __builtin_bswap32(x)
+#endif
 #else
-    #ifdef _MSC_VER
-        #ifndef BSWAP_32
-            #define BSWAP_32(x) _byteswap_ulong(x)
-        #endif
-    #else
-        #ifndef BSWAP_32
-            # define BSWAP_32(x) \
-             ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >>  8) | \
-              (((x) & 0x0000ff00) <<  8) | (((x) & 0x000000ff) << 24))
-        #endif
-    #endif
+#ifdef _MSC_VER
+#ifndef BSWAP_32
+#define BSWAP_32(x) _byteswap_ulong(x)
+#endif
+#else
+#ifndef BSWAP_32
+# define BSWAP_32(x) \
+    ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >>  8) | \
+     (((x) & 0x0000ff00) <<  8) | (((x) & 0x000000ff) << 24))
+#endif
+#endif
 #endif
 
 // endian change for 16bit
 #ifdef __GNUC__
-    #ifndef BSWAP_16
-        #define BSWAP_16(x) __builtin_bswap16(x)
-    #endif
+#ifndef BSWAP_16
+#define BSWAP_16(x) __builtin_bswap16(x)
+#endif
 #else
-    #ifdef _MSC_VER
-        #ifndef BSWAP_16
-            #define BSWAP_16(x) _byteswap_ushort(x)
-        #endif
-    #else
-        #ifndef BSWAP_16
-            # define BSWAP_16(x) ((( ((x) & 0xFF00 ) >> 8))| ( (((x) & 0x00FF) << 8)))
-        #endif
-    #endif
+#ifdef _MSC_VER
+#ifndef BSWAP_16
+#define BSWAP_16(x) _byteswap_ushort(x)
+#endif
+#else
+#ifndef BSWAP_16
+# define BSWAP_16(x) ((( ((x) & 0xFF00 ) >> 8))| ( (((x) & 0x00FF) << 8)))
+#endif
+#endif
 #endif
 
 #define EVEN                        0
@@ -174,26 +174,26 @@
 
 #ifndef DropField
 #define DropField() { \
-    UsbCommand c = {CMD_READER_ISO_14443a, {0,0,0}}; clearCommandBuffer(); SendCommand(&c); \
-}
+        UsbCommand c = {CMD_READER_ISO_14443a, {0,0,0}}; clearCommandBuffer(); SendCommand(&c); \
+    }
 #endif
 
 #ifndef DropFieldEx
 #define DropFieldEx(x) { \
-    if ( (x) == ECC_CONTACTLESS) { \
-        DropField(); \
-    } \
-}
+        if ( (x) == ECC_CONTACTLESS) { \
+            DropField(); \
+        } \
+    }
 #endif
 
 extern uint8_t g_debugMode;
 
 extern int ukbhit(void);
 extern void AddLogLine(char *fileName, char *extData, char *c);
-extern void AddLogHex(char *fileName, char *extData, const uint8_t * data, const size_t len);
+extern void AddLogHex(char *fileName, char *extData, const uint8_t *data, const size_t len);
 extern void AddLogUint64(char *fileName, char *extData, const uint64_t data);
 extern void AddLogCurrentDT(char *fileName);
-extern void FillFileNameByUID(char *filenamePrefix, uint8_t * uid, const char *ext, int uidlen);
+extern void FillFileNameByUID(char *filenamePrefix, uint8_t *uid, const char *ext, int uidlen);
 
 // fill buffer from structure [{uint8_t data, size_t length},...]
 extern int FillBuffer(uint8_t *data, size_t maxDataLength, size_t *dataLength, ...);
@@ -203,13 +203,13 @@ extern void hex_to_buffer(const uint8_t *buf, const uint8_t *hex_data, const siz
                           const size_t hex_max_len, const size_t min_str_len, const size_t spaces_between,
                           bool uppercase);
 
-extern void print_hex(const uint8_t * data, const size_t len);
+extern void print_hex(const uint8_t *data, const size_t len);
 extern void print_hex_break(const uint8_t *data, const size_t len, const uint8_t breaks);
-extern char *sprint_hex(const uint8_t * data, const size_t len);
+extern char *sprint_hex(const uint8_t *data, const size_t len);
 extern char *sprint_hex_inrow(const uint8_t *data, const size_t len);
 extern char *sprint_hex_inrow_ex(const uint8_t *data, const size_t len, const size_t min_str_len);
 extern char *sprint_hex_inrow_spaces(const uint8_t *data, const size_t len, size_t spaces_between);
-extern char *sprint_bin(const uint8_t * data, const size_t len);
+extern char *sprint_bin(const uint8_t *data, const size_t len);
 extern char *sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t breaks);
 extern char *sprint_hex_ascii(const uint8_t *data, const size_t len);
 extern char *sprint_ascii(const uint8_t *data, const size_t len);
@@ -217,8 +217,8 @@ extern char *sprint_ascii_ex(const uint8_t *data, const size_t len, const size_t
 
 extern void print_blocks(uint32_t *data, size_t len);
 
-extern void num_to_bytes(uint64_t n, size_t len, uint8_t* dest);
-extern uint64_t bytes_to_num(uint8_t* src, size_t len);
+extern void num_to_bytes(uint64_t n, size_t len, uint8_t *dest);
+extern uint64_t bytes_to_num(uint8_t *src, size_t len);
 extern void num_to_bytebits(uint64_t n, size_t len, uint8_t *dest);
 extern void num_to_bytebitsLSBF(uint64_t n, size_t len, uint8_t *dest);
 extern uint8_t *SwapEndian64(const uint8_t *src, const size_t len, const uint8_t blockSize);
@@ -234,22 +234,22 @@ extern uint32_t param_get32ex(const char *line, int paramnum, int deflt, int bas
 extern uint64_t param_get64ex(const char *line, int paramnum, int deflt, int base);
 extern uint8_t param_getdec(const char *line, int paramnum, uint8_t *destination);
 extern uint8_t param_isdec(const char *line, int paramnum);
-extern int param_gethex(const char *line, int paramnum, uint8_t * data, int hexcnt);
-extern int param_gethex_ex(const char *line, int paramnum, uint8_t * data, int *hexcnt);
-extern int param_gethex_to_eol(const char *line, int paramnum, uint8_t * data, int maxdatalen, int *datalen);
-extern int param_getstr(const char *line, int paramnum, char * str, size_t buffersize);
+extern int param_gethex(const char *line, int paramnum, uint8_t *data, int hexcnt);
+extern int param_gethex_ex(const char *line, int paramnum, uint8_t *data, int *hexcnt);
+extern int param_gethex_to_eol(const char *line, int paramnum, uint8_t *data, int maxdatalen, int *datalen);
+extern int param_getstr(const char *line, int paramnum, char *str, size_t buffersize);
 
-extern int hextobinarray( char *target,  char *source);
-extern int hextobinstring( char *target,  char *source);
-extern int binarraytohex( char *target,  char *source,  int length);
+extern int hextobinarray(char *target,  char *source);
+extern int hextobinstring(char *target,  char *source);
+extern int binarraytohex(char *target,  char *source,  int length);
 extern void binarraytobinstring(char *target,  char *source,  int length);
-extern uint8_t GetParity( uint8_t *string, uint8_t type,  int length);
+extern uint8_t GetParity(uint8_t *string, uint8_t type,  int length);
 extern void wiegand_add_parity(uint8_t *target, uint8_t *source, uint8_t length);
 
-extern void xor(unsigned char * dst, unsigned char * src, size_t len);
-extern int32_t le24toh (uint8_t data[3]);
+extern void xor(unsigned char *dst, unsigned char *src, size_t len);
+extern int32_t le24toh(uint8_t data[3]);
 
-extern uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits);
+extern uint32_t PackBits(uint8_t start, uint8_t len, uint8_t *bits);
 extern void rol(uint8_t *data, const size_t len);
 extern uint32_t reflect(uint32_t v, int b);
 extern uint8_t reflect8(uint8_t b); // dedicated 8bit reversal
@@ -258,7 +258,7 @@ extern uint64_t HornerScheme(uint64_t num, uint64_t divider, uint64_t factor);
 
 extern int num_CPUs(void); // number of logical CPUs
 
-extern void str_lower(char* s); // converts string to lower case
+extern void str_lower(char *s); // converts string to lower case
 extern bool str_startswith(const char *s,  const char *pre);  // check for prefix in string
 extern void strcleanrn(char *buf, size_t len);
 extern void strcreplace(char *buf, size_t len, char from, char to);
diff --git a/client/util_darwin.h b/client/util_darwin.h
index c69a551d3..15af75404 100644
--- a/client/util_darwin.h
+++ b/client/util_darwin.h
@@ -11,7 +11,7 @@
 #ifndef UTIL_DARWIN_H__
 #define UTIL_DARWIN_H__
 
-void disableAppNap(const char* reason);
+void disableAppNap(const char *reason);
 void enableAppNap();
 void makeUnfocusable();
 void makeFocusable();
diff --git a/client/util_posix.c b/client/util_posix.c
index 915b46d26..00cace2ec 100644
--- a/client/util_posix.c
+++ b/client/util_posix.c
@@ -23,14 +23,16 @@
 #if !defined (_WIN32)
 #include <errno.h>
 
-static void nsleep(uint64_t n) {
+static void nsleep(uint64_t n)
+{
     struct timespec timeout;
-    timeout.tv_sec = n/1000000000;
-    timeout.tv_nsec = n%1000000000;
+    timeout.tv_sec = n / 1000000000;
+    timeout.tv_nsec = n % 1000000000;
     while (nanosleep(&timeout, &timeout) && errno == EINTR);
 }
 
-void msleep(uint32_t n) {
+void msleep(uint32_t n)
+{
     nsleep(1000000 * (uint64_t)n);
 }
 #endif // _WIN32
@@ -38,84 +40,86 @@ void msleep(uint32_t n) {
 #ifdef __APPLE__
 
 #ifndef CLOCK_MONOTONIC
-    #define CLOCK_MONOTONIC (1)
+#define CLOCK_MONOTONIC (1)
 #endif
 #ifndef CLOCK_REALTIME
-    #define CLOCK_REALTIME (2)
+#define CLOCK_REALTIME (2)
 #endif
 
-    #include <sys/time.h>
-    #include <mach/clock.h>
-    #include <mach/mach.h>
-    #include <mach/mach_time.h>
+#include <sys/time.h>
+#include <mach/clock.h>
+#include <mach/mach.h>
+#include <mach/mach_time.h>
 
-    /* clock_gettime is not implemented on OSX prior to 10.12 */
-    int _civet_clock_gettime(int clk_id, struct timespec *t);
+/* clock_gettime is not implemented on OSX prior to 10.12 */
+int _civet_clock_gettime(int clk_id, struct timespec *t);
 
-    int _civet_clock_gettime(int clk_id, struct timespec *t)
-    {
-        memset(t, 0, sizeof(*t));
-        if (clk_id == CLOCK_REALTIME) {
-            struct timeval now;
-            int rv = gettimeofday(&now, NULL);
-            if (rv) {
-                return rv;
-            }
-            t->tv_sec = now.tv_sec;
-            t->tv_nsec = now.tv_usec * 1000;
-            return 0;
-
-        } else if (clk_id == CLOCK_MONOTONIC) {
-            static uint64_t clock_start_time = 0;
-            static mach_timebase_info_data_t timebase_info = {0, 0};
-
-            uint64_t now = mach_absolute_time();
-
-            if (clock_start_time == 0) {
-
-                mach_timebase_info(&timebase_info);
-                clock_start_time = now;
-            }
-
-            now = (uint64_t)((double)(now - clock_start_time)
-                             * (double)timebase_info.numer
-                             / (double)timebase_info.denom);
-
-            t->tv_sec = now / 1000000000;
-            t->tv_nsec = now % 1000000000;
-            return 0;
+int _civet_clock_gettime(int clk_id, struct timespec *t)
+{
+    memset(t, 0, sizeof(*t));
+    if (clk_id == CLOCK_REALTIME) {
+        struct timeval now;
+        int rv = gettimeofday(&now, NULL);
+        if (rv) {
+            return rv;
         }
-        return -1; // EINVAL - Clock ID is unknown
+        t->tv_sec = now.tv_sec;
+        t->tv_nsec = now.tv_usec * 1000;
+        return 0;
+
+    } else if (clk_id == CLOCK_MONOTONIC) {
+        static uint64_t clock_start_time = 0;
+        static mach_timebase_info_data_t timebase_info = {0, 0};
+
+        uint64_t now = mach_absolute_time();
+
+        if (clock_start_time == 0) {
+
+            mach_timebase_info(&timebase_info);
+            clock_start_time = now;
+        }
+
+        now = (uint64_t)((double)(now - clock_start_time)
+                         * (double)timebase_info.numer
+                         / (double)timebase_info.denom);
+
+        t->tv_sec = now / 1000000000;
+        t->tv_nsec = now % 1000000000;
+        return 0;
     }
+    return -1; // EINVAL - Clock ID is unknown
+}
 
-    /* if clock_gettime is declared, then __CLOCK_AVAILABILITY will be defined */
-    #ifdef __CLOCK_AVAILABILITY
-        /* If we compiled with Mac OSX 10.12 or later, then clock_gettime will be declared
-         * but it may be NULL at runtime. So we need to check before using it. */
-        int _civet_safe_clock_gettime(int clk_id, struct timespec *t);
+/* if clock_gettime is declared, then __CLOCK_AVAILABILITY will be defined */
+#ifdef __CLOCK_AVAILABILITY
+/* If we compiled with Mac OSX 10.12 or later, then clock_gettime will be declared
+ * but it may be NULL at runtime. So we need to check before using it. */
+int _civet_safe_clock_gettime(int clk_id, struct timespec *t);
 
-        int _civet_safe_clock_gettime(int clk_id, struct timespec *t) {
-            if( clock_gettime ) {
-                return clock_gettime(clk_id, t);
-            }
-            return _civet_clock_gettime(clk_id, t);
-        }
-        #define clock_gettime _civet_safe_clock_gettime
-    #else
-        #define clock_gettime _civet_clock_gettime
-    #endif
+int _civet_safe_clock_gettime(int clk_id, struct timespec *t)
+{
+    if (clock_gettime) {
+        return clock_gettime(clk_id, t);
+    }
+    return _civet_clock_gettime(clk_id, t);
+}
+#define clock_gettime _civet_safe_clock_gettime
+#else
+#define clock_gettime _civet_clock_gettime
+#endif
 
 #endif
 
 
 // a milliseconds timer for performance measurement
-uint64_t msclock(void) {
+uint64_t msclock(void)
+{
 #if defined(_WIN32)
-    #include <sys/types.h>
+#include <sys/types.h>
 
     // WORKAROUND FOR MinGW (some versions - use if normal code does not compile)
     // It has no _ftime_s and needs explicit inclusion of timeb.h
-    #include <sys/timeb.h>
+#include <sys/timeb.h>
     struct _timeb t;
     _ftime(&t);
     return 1000 * (uint64_t)t.time + t.millitm;
@@ -130,7 +134,7 @@ uint64_t msclock(void) {
 #else
     struct timespec t;
     clock_gettime(CLOCK_MONOTONIC, &t);
-    return ( 1000 * (uint64_t)t.tv_sec + t.tv_nsec / 1000000);
+    return (1000 * (uint64_t)t.tv_sec + t.tv_nsec / 1000000);
 #endif
 }
 
diff --git a/client/whereami.c b/client/whereami.c
index 83d178535..531b7f478 100644
--- a/client/whereami.c
+++ b/client/whereami.c
@@ -60,84 +60,76 @@ extern "C" {
 #pragma warning(pop)
 #endif
 
-static int WAI_PREFIX(getModulePath_)(HMODULE module, char* out, int capacity, int* dirname_length)
+static int WAI_PREFIX(getModulePath_)(HMODULE module, char *out, int capacity, int *dirname_length)
 {
-  wchar_t buffer1[MAX_PATH];
-  wchar_t buffer2[MAX_PATH];
-  wchar_t* path = NULL;
-  int length = -1;
+    wchar_t buffer1[MAX_PATH];
+    wchar_t buffer2[MAX_PATH];
+    wchar_t *path = NULL;
+    int length = -1;
 
-  for (;;)
-  {
-    DWORD size;
-    int length_, length__;
+    for (;;) {
+        DWORD size;
+        int length_, length__;
 
-    size = GetModuleFileNameW(module, buffer1, sizeof(buffer1) / sizeof(buffer1[0]));
+        size = GetModuleFileNameW(module, buffer1, sizeof(buffer1) / sizeof(buffer1[0]));
 
-    if (size == 0)
-      break;
-    else if (size == (DWORD)(sizeof(buffer1) / sizeof(buffer1[0])))
-    {
-      DWORD size_ = size;
-      do
-      {
-        wchar_t* path_;
+        if (size == 0)
+            break;
+        else if (size == (DWORD)(sizeof(buffer1) / sizeof(buffer1[0]))) {
+            DWORD size_ = size;
+            do {
+                wchar_t *path_;
 
-        path_ = (wchar_t*)WAI_REALLOC(path, sizeof(wchar_t) * size_ * 2);
-        if (!path_)
-          break;
-        size_ *= 2;
-        path = path_;
-        size = GetModuleFileNameW(module, path, size_);
-      }
-      while (size == size_);
+                path_ = (wchar_t *)WAI_REALLOC(path, sizeof(wchar_t) * size_ * 2);
+                if (!path_)
+                    break;
+                size_ *= 2;
+                path = path_;
+                size = GetModuleFileNameW(module, path, size_);
+            } while (size == size_);
+
+            if (size == size_)
+                break;
+        } else
+            path = buffer1;
+
+        if (!_wfullpath(buffer2, path, MAX_PATH))
+            break;
+        length_ = (int)wcslen(buffer2);
+        length__ = WideCharToMultiByte(CP_UTF8, 0, buffer2, length_, out, capacity, NULL, NULL);
+
+        if (length__ == 0)
+            length__ = WideCharToMultiByte(CP_UTF8, 0, buffer2, length_, NULL, 0, NULL, NULL);
+        if (length__ == 0)
+            break;
+
+        if (length__ <= capacity && dirname_length) {
+            int i;
+
+            for (i = length__ - 1; i >= 0; --i) {
+                if (out[i] == '\\') {
+                    *dirname_length = i;
+                    break;
+                }
+            }
+        }
+
+        length = length__;
 
-      if (size == size_)
         break;
     }
-    else
-      path = buffer1;
 
-    if (!_wfullpath(buffer2, path, MAX_PATH))
-      break;
-    length_ = (int)wcslen(buffer2);
-    length__ = WideCharToMultiByte(CP_UTF8, 0, buffer2, length_ , out, capacity, NULL, NULL);
+    if (path != buffer1)
+        WAI_FREE(path);
 
-    if (length__ == 0)
-      length__ = WideCharToMultiByte(CP_UTF8, 0, buffer2, length_, NULL, 0, NULL, NULL);
-    if (length__ == 0)
-      break;
-
-    if (length__ <= capacity && dirname_length)
-    {
-      int i;
-
-      for (i = length__ - 1; i >= 0; --i)
-      {
-        if (out[i] == '\\')
-        {
-          *dirname_length = i;
-          break;
-        }
-      }
-    }
-
-    length = length__;
-
-    break;
-  }
-
-  if (path != buffer1)
-    WAI_FREE(path);
-
-  return length;
+    return length;
 }
 
 WAI_NOINLINE
 WAI_FUNCSPEC
-int WAI_PREFIX(getExecutablePath)(char* out, int capacity, int* dirname_length)
+int WAI_PREFIX(getExecutablePath)(char *out, int capacity, int *dirname_length)
 {
-  return WAI_PREFIX(getModulePath_)(NULL, out, capacity, dirname_length);
+    return WAI_PREFIX(getModulePath_)(NULL, out, capacity, dirname_length);
 }
 
 // GetModuleHandleEx() is not available on old mingw environments. We don't need getModulePath() yet.
@@ -181,42 +173,37 @@ int WAI_PREFIX(getModulePath)(char* out, int capacity, int* dirname_length)
 #endif
 
 WAI_FUNCSPEC
-int WAI_PREFIX(getExecutablePath)(char* out, int capacity, int* dirname_length)
+int WAI_PREFIX(getExecutablePath)(char *out, int capacity, int *dirname_length)
 {
-  char buffer[PATH_MAX];
-  char* resolved = NULL;
-  int length = -1;
+    char buffer[PATH_MAX];
+    char *resolved = NULL;
+    int length = -1;
 
-  for (;;)
-  {
-    resolved = realpath(WAI_PROC_SELF_EXE, buffer);
-    if (!resolved)
-      break;
-
-    length = (int)strlen(resolved);
-    if (length <= capacity)
-    {
-      memcpy(out, resolved, length);
-
-      if (dirname_length)
-      {
-        int i;
-
-        for (i = length - 1; i >= 0; --i)
-        {
-          if (out[i] == '/')
-          {
-            *dirname_length = i;
+    for (;;) {
+        resolved = realpath(WAI_PROC_SELF_EXE, buffer);
+        if (!resolved)
             break;
-          }
+
+        length = (int)strlen(resolved);
+        if (length <= capacity) {
+            memcpy(out, resolved, length);
+
+            if (dirname_length) {
+                int i;
+
+                for (i = length - 1; i >= 0; --i) {
+                    if (out[i] == '/') {
+                        *dirname_length = i;
+                        break;
+                    }
+                }
+            }
         }
-      }
+
+        break;
     }
 
-    break;
-  }
-
-  return length;
+    return length;
 }
 
 #if !defined(WAI_PROC_SELF_MAPS_RETRY)
@@ -234,111 +221,99 @@ int WAI_PREFIX(getExecutablePath)(char* out, int capacity, int* dirname_length)
 
 WAI_NOINLINE
 WAI_FUNCSPEC
-int WAI_PREFIX(getModulePath)(char* out, int capacity, int* dirname_length)
+int WAI_PREFIX(getModulePath)(char *out, int capacity, int *dirname_length)
 {
-  int length = -1;
-  FILE* maps = NULL;
-  int i;
+    int length = -1;
+    FILE *maps = NULL;
+    int i;
 
-  for (i = 0; i < WAI_PROC_SELF_MAPS_RETRY; ++i)
-  {
-    maps = fopen(WAI_PROC_SELF_MAPS, "r");
-    if (!maps)
-      break;
-
-    for (;;)
-    {
-      char buffer[PATH_MAX < 1024 ? 1024 : PATH_MAX];
-      uint64_t low, high;
-      char perms[5];
-      uint64_t offset;
-      uint32_t major, minor;
-      char path[PATH_MAX];
-      uint32_t inode;
-
-      if (!fgets(buffer, sizeof(buffer), maps))
-        break;
-
-      if (sscanf(buffer, "%" SCNx64 "-%" SCNx64 " %s %" SCNx64 " %x:%x %u %s\n", &low, &high, perms, &offset, &major, &minor, &inode, path) == 8)
-      {
-        uint64_t addr = (uint64_t)(uintptr_t)WAI_RETURN_ADDRESS();
-        if (low <= addr && addr <= high)
-        {
-          char* resolved;
-
-          resolved = realpath(path, buffer);
-          if (!resolved)
+    for (i = 0; i < WAI_PROC_SELF_MAPS_RETRY; ++i) {
+        maps = fopen(WAI_PROC_SELF_MAPS, "r");
+        if (!maps)
             break;
 
-          length = (int)strlen(resolved);
-#if defined(__ANDROID__) || defined(ANDROID)
-          if (length > 4
-              &&buffer[length - 1] == 'k'
-              &&buffer[length - 2] == 'p'
-              &&buffer[length - 3] == 'a'
-              &&buffer[length - 4] == '.')
-          {
-            int fd = open(path, O_RDONLY);
-            char* begin;
-            char* p;
-
-            begin = (char*)mmap(0, offset, PROT_READ, MAP_SHARED, fd, 0);
-            p = begin + offset;
-
-            while (p >= begin) // scan backwards
-            {
-              if (*((uint32_t*)p) == 0x04034b50UL) // local file header found
-              {
-                uint16_t length_ = *((uint16_t*)(p + 26));
-
-                if (length + 2 + length_ < (int)sizeof(buffer))
-                {
-                  memcpy(&buffer[length], "!/", 2);
-                  memcpy(&buffer[length + 2], p + 30, length_);
-                  length += 2 + length_;
-                }
+        for (;;) {
+            char buffer[PATH_MAX < 1024 ? 1024 : PATH_MAX];
+            uint64_t low, high;
+            char perms[5];
+            uint64_t offset;
+            uint32_t major, minor;
+            char path[PATH_MAX];
+            uint32_t inode;
 
+            if (!fgets(buffer, sizeof(buffer), maps))
                 break;
-              }
 
-              p -= 4;
-            }
+            if (sscanf(buffer, "%" SCNx64 "-%" SCNx64 " %s %" SCNx64 " %x:%x %u %s\n", &low, &high, perms, &offset, &major, &minor, &inode, path) == 8) {
+                uint64_t addr = (uint64_t)(uintptr_t)WAI_RETURN_ADDRESS();
+                if (low <= addr && addr <= high) {
+                    char *resolved;
 
-            munmap(begin, offset);
-            close(fd);
-          }
+                    resolved = realpath(path, buffer);
+                    if (!resolved)
+                        break;
+
+                    length = (int)strlen(resolved);
+#if defined(__ANDROID__) || defined(ANDROID)
+                    if (length > 4
+                        && buffer[length - 1] == 'k'
+                        && buffer[length - 2] == 'p'
+                        && buffer[length - 3] == 'a'
+                        && buffer[length - 4] == '.') {
+                        int fd = open(path, O_RDONLY);
+                        char *begin;
+                        char *p;
+
+                        begin = (char *)mmap(0, offset, PROT_READ, MAP_SHARED, fd, 0);
+                        p = begin + offset;
+
+                        while (p >= begin) { // scan backwards
+                            if (*((uint32_t *)p) == 0x04034b50UL) { // local file header found
+                                uint16_t length_ = *((uint16_t *)(p + 26));
+
+                                if (length + 2 + length_ < (int)sizeof(buffer)) {
+                                    memcpy(&buffer[length], "!/", 2);
+                                    memcpy(&buffer[length + 2], p + 30, length_);
+                                    length += 2 + length_;
+                                }
+
+                                break;
+                            }
+
+                            p -= 4;
+                        }
+
+                        munmap(begin, offset);
+                        close(fd);
+                    }
 #endif
-          if (length <= capacity)
-          {
-            memcpy(out, resolved, length);
+                    if (length <= capacity) {
+                        memcpy(out, resolved, length);
 
-            if (dirname_length)
-            {
-              int i;
+                        if (dirname_length) {
+                            int i;
 
-              for (i = length - 1; i >= 0; --i)
-              {
-                if (out[i] == '/')
-                {
-                  *dirname_length = i;
-                  break;
+                            for (i = length - 1; i >= 0; --i) {
+                                if (out[i] == '/') {
+                                    *dirname_length = i;
+                                    break;
+                                }
+                            }
+                        }
+                    }
+
+                    break;
                 }
-              }
             }
-          }
-
-          break;
         }
-      }
+
+        fclose(maps);
+
+        if (length != -1)
+            break;
     }
 
-    fclose(maps);
-
-    if (length != -1)
-      break;
-  }
-
-  return length;
+    return length;
 }
 
 #elif defined(__APPLE__)
@@ -351,100 +326,88 @@ int WAI_PREFIX(getModulePath)(char* out, int capacity, int* dirname_length)
 #include <dlfcn.h>
 
 WAI_FUNCSPEC
-int WAI_PREFIX(getExecutablePath)(char* out, int capacity, int* dirname_length)
+int WAI_PREFIX(getExecutablePath)(char *out, int capacity, int *dirname_length)
 {
-  char buffer1[PATH_MAX];
-  char buffer2[PATH_MAX];
-  char* path = buffer1;
-  char* resolved = NULL;
-  int length = -1;
+    char buffer1[PATH_MAX];
+    char buffer2[PATH_MAX];
+    char *path = buffer1;
+    char *resolved = NULL;
+    int length = -1;
+
+    for (;;) {
+        uint32_t size = (uint32_t)sizeof(buffer1);
+        if (_NSGetExecutablePath(path, &size) == -1) {
+            path = (char *)WAI_MALLOC(size);
+            if (!_NSGetExecutablePath(path, &size))
+                break;
+        }
+
+        resolved = realpath(path, buffer2);
+        if (!resolved)
+            break;
+
+        length = (int)strlen(resolved);
+        if (length <= capacity) {
+            memcpy(out, resolved, length);
+
+            if (dirname_length) {
+                int i;
+
+                for (i = length - 1; i >= 0; --i) {
+                    if (out[i] == '/') {
+                        *dirname_length = i;
+                        break;
+                    }
+                }
+            }
+        }
 
-  for (;;)
-  {
-    uint32_t size = (uint32_t)sizeof(buffer1);
-    if (_NSGetExecutablePath(path, &size) == -1)
-    {
-      path = (char*)WAI_MALLOC(size);
-      if (!_NSGetExecutablePath(path, &size))
         break;
     }
 
-    resolved = realpath(path, buffer2);
-    if (!resolved)
-      break;
+    if (path != buffer1)
+        WAI_FREE(path);
 
-    length = (int)strlen(resolved);
-    if (length <= capacity)
-    {
-      memcpy(out, resolved, length);
-
-      if (dirname_length)
-      {
-        int i;
-
-        for (i = length - 1; i >= 0; --i)
-        {
-          if (out[i] == '/')
-          {
-            *dirname_length = i;
-            break;
-          }
-        }
-      }
-    }
-
-    break;
-  }
-
-  if (path != buffer1)
-    WAI_FREE(path);
-
-  return length;
+    return length;
 }
 
 WAI_NOINLINE
 WAI_FUNCSPEC
-int WAI_PREFIX(getModulePath)(char* out, int capacity, int* dirname_length)
+int WAI_PREFIX(getModulePath)(char *out, int capacity, int *dirname_length)
 {
-  char buffer[PATH_MAX];
-  char* resolved = NULL;
-  int length = -1;
+    char buffer[PATH_MAX];
+    char *resolved = NULL;
+    int length = -1;
 
-  for(;;)
-  {
-    Dl_info info;
+    for (;;) {
+        Dl_info info;
 
-    if (dladdr(WAI_RETURN_ADDRESS(), &info))
-    {
-      resolved = realpath(info.dli_fname, buffer);
-      if (!resolved)
-        break;
+        if (dladdr(WAI_RETURN_ADDRESS(), &info)) {
+            resolved = realpath(info.dli_fname, buffer);
+            if (!resolved)
+                break;
 
-      length = (int)strlen(resolved);
-      if (length <= capacity)
-      {
-        memcpy(out, resolved, length);
+            length = (int)strlen(resolved);
+            if (length <= capacity) {
+                memcpy(out, resolved, length);
 
-        if (dirname_length)
-        {
-          int i;
+                if (dirname_length) {
+                    int i;
 
-          for (i = length - 1; i >= 0; --i)
-          {
-            if (out[i] == '/')
-            {
-              *dirname_length = i;
-              break;
+                    for (i = length - 1; i >= 0; --i) {
+                        if (out[i] == '/') {
+                            *dirname_length = i;
+                            break;
+                        }
+                    }
+                }
             }
-          }
         }
-      }
+
+        break;
     }
 
-    break;
-  }
-
-  return length;
+    return length;
 }
 
 #elif defined(__QNXNTO__)
@@ -460,97 +423,86 @@ int WAI_PREFIX(getModulePath)(char* out, int capacity, int* dirname_length)
 #endif
 
 WAI_FUNCSPEC
-int WAI_PREFIX(getExecutablePath)(char* out, int capacity, int* dirname_length)
+int WAI_PREFIX(getExecutablePath)(char *out, int capacity, int *dirname_length)
 {
-  char buffer1[PATH_MAX];
-  char buffer2[PATH_MAX];
-  char* resolved = NULL;
-  FILE* self_exe = NULL;
-  int length = -1;
+    char buffer1[PATH_MAX];
+    char buffer2[PATH_MAX];
+    char *resolved = NULL;
+    FILE *self_exe = NULL;
+    int length = -1;
 
-  for (;;)
-  {
-    self_exe = fopen(WAI_PROC_SELF_EXE, "r");
-    if (!self_exe)
-      break;
-
-    if (!fgets(buffer1, sizeof(buffer1), self_exe))
-      break;
-
-    resolved = realpath(buffer1, buffer2);
-    if (!resolved)
-      break;
-
-    length = (int)strlen(resolved);
-    if (length <= capacity)
-    {
-      memcpy(out, resolved, length);
-
-      if (dirname_length)
-      {
-        int i;
-
-        for (i = length - 1; i >= 0; --i)
-        {
-          if (out[i] == '/')
-          {
-            *dirname_length = i;
+    for (;;) {
+        self_exe = fopen(WAI_PROC_SELF_EXE, "r");
+        if (!self_exe)
             break;
-          }
+
+        if (!fgets(buffer1, sizeof(buffer1), self_exe))
+            break;
+
+        resolved = realpath(buffer1, buffer2);
+        if (!resolved)
+            break;
+
+        length = (int)strlen(resolved);
+        if (length <= capacity) {
+            memcpy(out, resolved, length);
+
+            if (dirname_length) {
+                int i;
+
+                for (i = length - 1; i >= 0; --i) {
+                    if (out[i] == '/') {
+                        *dirname_length = i;
+                        break;
+                    }
+                }
+            }
         }
-      }
+
+        break;
     }
 
-    break;
-  }
+    fclose(self_exe);
 
-  fclose(self_exe);
-
-  return length;
+    return length;
 }
 
 WAI_FUNCSPEC
-int WAI_PREFIX(getModulePath)(char* out, int capacity, int* dirname_length)
+int WAI_PREFIX(getModulePath)(char *out, int capacity, int *dirname_length)
 {
-  char buffer[PATH_MAX];
-  char* resolved = NULL;
-  int length = -1;
+    char buffer[PATH_MAX];
+    char *resolved = NULL;
+    int length = -1;
 
-  for(;;)
-  {
-    Dl_info info;
+    for (;;) {
+        Dl_info info;
 
-    if (dladdr(WAI_RETURN_ADDRESS(), &info))
-    {
-      resolved = realpath(info.dli_fname, buffer);
-      if (!resolved)
-        break;
+        if (dladdr(WAI_RETURN_ADDRESS(), &info)) {
+            resolved = realpath(info.dli_fname, buffer);
+            if (!resolved)
+                break;
 
-      length = (int)strlen(resolved);
-      if (length <= capacity)
-      {
-        memcpy(out, resolved, length);
+            length = (int)strlen(resolved);
+            if (length <= capacity) {
+                memcpy(out, resolved, length);
 
-        if (dirname_length)
-        {
-          int i;
+                if (dirname_length) {
+                    int i;
 
-          for (i = length - 1; i >= 0; --i)
-          {
-            if (out[i] == '/')
-            {
-              *dirname_length = i;
-              break;
+                    for (i = length - 1; i >= 0; --i) {
+                        if (out[i] == '/') {
+                            *dirname_length = i;
+                            break;
+                        }
+                    }
+                }
             }
-          }
         }
-      }
+
+        break;
     }
 
-    break;
-  }
-
-  return length;
+    return length;
 }
 
 #elif defined(__DragonFly__) || defined(__FreeBSD__) || \
@@ -565,102 +517,91 @@ int WAI_PREFIX(getModulePath)(char* out, int capacity, int* dirname_length)
 #include <dlfcn.h>
 
 WAI_FUNCSPEC
-int WAI_PREFIX(getExecutablePath)(char* out, int capacity, int* dirname_length)
+int WAI_PREFIX(getExecutablePath)(char *out, int capacity, int *dirname_length)
 {
-  char buffer1[PATH_MAX];
-  char buffer2[PATH_MAX];
-  char* path = buffer1;
-  char* resolved = NULL;
-  int length = -1;
+    char buffer1[PATH_MAX];
+    char buffer2[PATH_MAX];
+    char *path = buffer1;
+    char *resolved = NULL;
+    int length = -1;
 
-  for (;;)
-  {
+    for (;;) {
 #ifdef KERN_PROC_ARGV
-    int mib[4] = { CTL_KERN, KERN_PROC_ARGS, getpid(), KERN_PROC_ARGV };
+        int mib[4] = { CTL_KERN, KERN_PROC_ARGS, getpid(), KERN_PROC_ARGV };
 #else
-    int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
+        int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
 #endif
-    size_t size = sizeof(buffer1);
+        size_t size = sizeof(buffer1);
 
-    if (sysctl(mib, (u_int)(sizeof(mib) / sizeof(mib[0])), path, &size, NULL, 0) != 0)
-        break;
-
-    resolved = realpath(path, buffer2);
-    if (!resolved)
-      break;
-
-    length = (int)strlen(resolved);
-    if (length <= capacity)
-    {
-      memcpy(out, resolved, length);
-
-      if (dirname_length)
-      {
-        int i;
-
-        for (i = length - 1; i >= 0; --i)
-        {
-          if (out[i] == '/')
-          {
-            *dirname_length = i;
+        if (sysctl(mib, (u_int)(sizeof(mib) / sizeof(mib[0])), path, &size, NULL, 0) != 0)
             break;
-          }
+
+        resolved = realpath(path, buffer2);
+        if (!resolved)
+            break;
+
+        length = (int)strlen(resolved);
+        if (length <= capacity) {
+            memcpy(out, resolved, length);
+
+            if (dirname_length) {
+                int i;
+
+                for (i = length - 1; i >= 0; --i) {
+                    if (out[i] == '/') {
+                        *dirname_length = i;
+                        break;
+                    }
+                }
+            }
         }
-      }
+
+        break;
     }
 
-    break;
-  }
+    if (path != buffer1)
+        WAI_FREE(path);
 
-  if (path != buffer1)
-    WAI_FREE(path);
-
-  return length;
+    return length;
 }
 
 WAI_NOINLINE
 WAI_FUNCSPEC
-int WAI_PREFIX(getModulePath)(char* out, int capacity, int* dirname_length)
+int WAI_PREFIX(getModulePath)(char *out, int capacity, int *dirname_length)
 {
-  char buffer[PATH_MAX];
-  char* resolved = NULL;
-  int length = -1;
+    char buffer[PATH_MAX];
+    char *resolved = NULL;
+    int length = -1;
 
-  for(;;)
-  {
-    Dl_info info;
+    for (;;) {
+        Dl_info info;
 
-    if (dladdr(WAI_RETURN_ADDRESS(), &info))
-    {
-      resolved = realpath(info.dli_fname, buffer);
-      if (!resolved)
-        break;
+        if (dladdr(WAI_RETURN_ADDRESS(), &info)) {
+            resolved = realpath(info.dli_fname, buffer);
+            if (!resolved)
+                break;
 
-      length = (int)strlen(resolved);
-      if (length <= capacity)
-      {
-        memcpy(out, resolved, length);
+            length = (int)strlen(resolved);
+            if (length <= capacity) {
+                memcpy(out, resolved, length);
 
-        if (dirname_length)
-        {
-          int i;
+                if (dirname_length) {
+                    int i;
 
-          for (i = length - 1; i >= 0; --i)
-          {
-            if (out[i] == '/')
-            {
-              *dirname_length = i;
-              break;
+                    for (i = length - 1; i >= 0; --i) {
+                        if (out[i] == '/') {
+                            *dirname_length = i;
+                            break;
+                        }
+                    }
+                }
             }
-          }
         }
-      }
+
+        break;
     }
 
-    break;
-  }
-
-  return length;
+    return length;
 }
 
 #else
diff --git a/client/whereami.h b/client/whereami.h
index 6c81af818..6610a2ff4 100644
--- a/client/whereami.h
+++ b/client/whereami.h
@@ -9,7 +9,7 @@ extern "C" {
 #endif
 
 #ifndef WAI_FUNCSPEC
-  #define WAI_FUNCSPEC
+#define WAI_FUNCSPEC
 #endif
 #ifndef WAI_PREFIX
 #define WAI_PREFIX(function) wai_##function
@@ -35,7 +35,7 @@ extern "C" {
  * character), otherwise `-1`
  */
 WAI_FUNCSPEC
-int WAI_PREFIX(getExecutablePath)(char* out, int capacity, int* dirname_length);
+int WAI_PREFIX(getExecutablePath)(char *out, int capacity, int *dirname_length);
 
 /**
  * Returns the path to the current module
@@ -56,7 +56,7 @@ int WAI_PREFIX(getExecutablePath)(char* out, int capacity, int* dirname_length);
  * character), otherwise `-1`
  */
 WAI_FUNCSPEC
-int WAI_PREFIX(getModulePath)(char* out, int capacity, int* dirname_length);
+int WAI_PREFIX(getModulePath)(char *out, int capacity, int *dirname_length);
 
 #ifdef __cplusplus
 }
diff --git a/common/bucketsort.c b/common/bucketsort.c
index c42b8673f..f61a24cb7 100644
--- a/common/bucketsort.c
+++ b/common/bucketsort.c
@@ -1,7 +1,7 @@
 #include "bucketsort.h"
 
-extern void bucket_sort_intersect(uint32_t* const estart, uint32_t* const estop,
-                                  uint32_t* const ostart, uint32_t* const ostop,
+extern void bucket_sort_intersect(uint32_t *const estart, uint32_t *const estop,
+                                  uint32_t *const ostart, uint32_t *const ostop,
                                   bucket_info_t *bucket_info, bucket_array_t bucket)
 {
     uint32_t *p1, *p2;
diff --git a/common/bucketsort.h b/common/bucketsort.h
index 30da87f2c..1de175ae5 100644
--- a/common/bucketsort.h
+++ b/common/bucketsort.h
@@ -14,11 +14,11 @@ typedef bucket_t bucket_array_t[2][0x100];
 typedef struct bucket_info {
     struct {
         uint32_t *head, *tail;
-        } bucket_info[2][0x100];
-        uint32_t numbuckets;
+    } bucket_info[2][0x100];
+    uint32_t numbuckets;
 } bucket_info_t;
 
-void bucket_sort_intersect(uint32_t* const estart, uint32_t* const estop,
-                                  uint32_t* const ostart, uint32_t* const ostop,
-                                  bucket_info_t *bucket_info, bucket_array_t bucket);
+void bucket_sort_intersect(uint32_t *const estart, uint32_t *const estop,
+                           uint32_t *const ostart, uint32_t *const ostop,
+                           bucket_info_t *bucket_info, bucket_array_t bucket);
 #endif
\ No newline at end of file
diff --git a/common/cmd.c b/common/cmd.c
index bc042b068..aaca19af6 100644
--- a/common/cmd.c
+++ b/common/cmd.c
@@ -31,11 +31,12 @@
  */
 #include "cmd.h"
 
-uint8_t cmd_send(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void* data, size_t len) {
+uint8_t cmd_send(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len)
+{
     UsbCommand txcmd;
 
-    for (size_t i=0; i < sizeof(UsbCommand); i++)
-        ((uint8_t*)&txcmd)[i] = 0x00;
+    for (size_t i = 0; i < sizeof(UsbCommand); i++)
+        ((uint8_t *)&txcmd)[i] = 0x00;
 
     // Compose the outgoing command frame
     txcmd.cmd = cmd;
@@ -46,14 +47,14 @@ uint8_t cmd_send(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void
     // Add the (optional) content to the frame, with a maximum size of USB_CMD_DATA_SIZE
     if (data && len) {
         len = MIN(len, USB_CMD_DATA_SIZE);
-        for (size_t i=0; i<len; i++) {
-            txcmd.d.asBytes[i] = ((uint8_t*)data)[i];
+        for (size_t i = 0; i < len; i++) {
+            txcmd.d.asBytes[i] = ((uint8_t *)data)[i];
         }
     }
 
     uint32_t sendlen = 0;
     // Send frame and make sure all bytes are transmitted
-    sendlen = usb_write( (uint8_t*)&txcmd, sizeof(UsbCommand) );
+    sendlen = usb_write((uint8_t *)&txcmd, sizeof(UsbCommand));
 
 #ifdef WITH_FPC
 // usart_init();
diff --git a/common/cmd.h b/common/cmd.h
index 753e0a794..858466dd3 100644
--- a/common/cmd.h
+++ b/common/cmd.h
@@ -39,7 +39,7 @@
 #include "usart.h"
 #include "proxmark3.h"
 
-uint8_t cmd_send(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void* data, size_t len);
+uint8_t cmd_send(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
 
 #endif // _PROXMARK_CMD_H_
 
diff --git a/common/crapto1/crapto1.c b/common/crapto1/crapto1.c
index 67b4f5651..a281e5f7b 100644
--- a/common/crapto1/crapto1.c
+++ b/common/crapto1/crapto1.c
@@ -26,9 +26,9 @@
 static uint8_t filterlut[1 << 20];
 static void __attribute__((constructor)) fill_lut()
 {
-        uint32_t i;
-        for(i = 0; i < 1 << 20; ++i)
-                filterlut[i] = filter(i);
+    uint32_t i;
+    for (i = 0; i < 1 << 20; ++i)
+        filterlut[i] = filter(i);
 }
 #define filter(x) (filterlut[(x) & 0xfffff])
 #endif
@@ -51,12 +51,12 @@ static inline void update_contribution(uint32_t *item, const uint32_t mask1, con
 static inline void extend_table(uint32_t *tbl, uint32_t **end, int bit, int m1, int m2, uint32_t in)
 {
     in <<= 24;
-    for(*tbl <<= 1; tbl <= *end; *++tbl <<= 1)
-        if(filter(*tbl) ^ filter(*tbl | 1)) {
+    for (*tbl <<= 1; tbl <= *end; *++tbl <<= 1)
+        if (filter(*tbl) ^ filter(*tbl | 1)) {
             *tbl |= filter(*tbl) ^ bit;
             update_contribution(tbl, m1, m2);
             *tbl ^= in;
-        } else if(filter(*tbl) == bit) {
+        } else if (filter(*tbl) == bit) {
             *++*end = tbl[1];
             tbl[1] = tbl[0] | 1;
             update_contribution(tbl, m1, m2);
@@ -71,32 +71,32 @@ static inline void extend_table(uint32_t *tbl, uint32_t **end, int bit, int m1,
  */
 static inline void extend_table_simple(uint32_t *tbl, uint32_t **end, int bit)
 {
-    for(*tbl <<= 1; tbl <= *end; *++tbl <<= 1) {
-        if(filter(*tbl) ^ filter(*tbl | 1)) { // replace
+    for (*tbl <<= 1; tbl <= *end; *++tbl <<= 1) {
+        if (filter(*tbl) ^ filter(*tbl | 1)) { // replace
             *tbl |= filter(*tbl) ^ bit;
-        } else if(filter(*tbl) == bit) {      // insert
+        } else if (filter(*tbl) == bit) {     // insert
             *++*end = *++tbl;
             *tbl = tbl[-1] | 1;
         } else {                              // drop
             *tbl-- = *(*end)--;
-}
+        }
     }
 }
 /** recover
  * recursively narrow down the search space, 4 bits of keystream at a time
  */
-static struct Crypto1State*
+static struct Crypto1State *
 recover(uint32_t *o_head, uint32_t *o_tail, uint32_t oks,
-    uint32_t *e_head, uint32_t *e_tail, uint32_t eks, int rem,
-    struct Crypto1State *sl, uint32_t in, bucket_array_t bucket)
+        uint32_t *e_head, uint32_t *e_tail, uint32_t eks, int rem,
+        struct Crypto1State *sl, uint32_t in, bucket_array_t bucket)
 {
     uint32_t *o, *e;
     bucket_info_t bucket_info;
 
-    if(rem == -1) {
-        for(e = e_head; e <= e_tail; ++e) {
+    if (rem == -1) {
+        for (e = e_head; e <= e_tail; ++e) {
             *e = *e << 1 ^ evenparity32(*e & LF_POLY_EVEN) ^ !!(in & 4);
-            for(o = o_head; o <= o_tail; ++o, ++sl) {
+            for (o = o_head; o <= o_tail; ++o, ++sl) {
                 sl->even = *o;
                 sl->odd = *e ^ evenparity32(*o & LF_POLY_ODD);
                 sl[1].odd = sl[1].even = 0;
@@ -105,16 +105,16 @@ recover(uint32_t *o_head, uint32_t *o_tail, uint32_t oks,
         return sl;
     }
 
-    for(uint32_t i = 0; i < 4 && rem--; i++) {
+    for (uint32_t i = 0; i < 4 && rem--; i++) {
         oks >>= 1;
         eks >>= 1;
         in >>= 2;
         extend_table(o_head, &o_tail, oks & 1, LF_POLY_EVEN << 1 | 1, LF_POLY_ODD << 1, 0);
-        if(o_head > o_tail)
+        if (o_head > o_tail)
             return sl;
 
         extend_table(e_head, &e_tail, eks & 1, LF_POLY_ODD, LF_POLY_EVEN << 1 | 1, in & 3);
-        if(e_head > e_tail)
+        if (e_head > e_tail)
             return sl;
     }
 
@@ -133,7 +133,7 @@ recover(uint32_t *o_head, uint32_t *o_tail, uint32_t oks,
  * additionally you can use the in parameter to specify the value
  * that was fed into the lfsr at the time the keystream was generated
  */
-struct Crypto1State* lfsr_recovery32(uint32_t ks2, uint32_t in)
+struct Crypto1State *lfsr_recovery32(uint32_t ks2, uint32_t in)
 {
     struct Crypto1State *statelist;
     uint32_t *odd_head = 0, *odd_tail = 0, oks = 0;
@@ -170,15 +170,15 @@ struct Crypto1State* lfsr_recovery32(uint32_t ks2, uint32_t in)
     }
 
     // initialize statelists: add all possible states which would result into the rightmost 2 bits of the keystream
-    for(i = 1 << 20; i >= 0; --i) {
-        if(filter(i) == (oks & 1))
+    for (i = 1 << 20; i >= 0; --i) {
+        if (filter(i) == (oks & 1))
             *++odd_tail = i;
-        if(filter(i) == (eks & 1))
+        if (filter(i) == (eks & 1))
             *++even_tail = i;
     }
 
     // extend the statelists. Look at the next 8 Bits of the keystream (4 Bit each odd and even):
-    for(i = 0; i < 4; i++) {
+    for (i = 0; i < 4; i++) {
         extend_table_simple(odd_head,  &odd_tail, (oks >>= 1) & 1);
         extend_table_simple(even_head, &even_tail, (eks >>= 1) & 1);
     }
@@ -199,29 +199,33 @@ out:
 }
 
 static const uint32_t S1[] = {     0x62141, 0x310A0, 0x18850, 0x0C428, 0x06214,
-    0x0310A, 0x85E30, 0xC69AD, 0x634D6, 0xB5CDE, 0xDE8DA, 0x6F46D, 0xB3C83,
-    0x59E41, 0xA8995, 0xD027F, 0x6813F, 0x3409F, 0x9E6FA};
+                                   0x0310A, 0x85E30, 0xC69AD, 0x634D6, 0xB5CDE, 0xDE8DA, 0x6F46D, 0xB3C83,
+                                   0x59E41, 0xA8995, 0xD027F, 0x6813F, 0x3409F, 0x9E6FA
+                             };
 static const uint32_t S2[] = {  0x3A557B00, 0x5D2ABD80, 0x2E955EC0, 0x174AAF60,
-    0x0BA557B0, 0x05D2ABD8, 0x0449DE68, 0x048464B0, 0x42423258, 0x278192A8,
-    0x156042D0, 0x0AB02168, 0x43F89B30, 0x61FC4D98, 0x765EAD48, 0x7D8FDD20,
-    0x7EC7EE90, 0x7F63F748, 0x79117020};
+                                0x0BA557B0, 0x05D2ABD8, 0x0449DE68, 0x048464B0, 0x42423258, 0x278192A8,
+                                0x156042D0, 0x0AB02168, 0x43F89B30, 0x61FC4D98, 0x765EAD48, 0x7D8FDD20,
+                                0x7EC7EE90, 0x7F63F748, 0x79117020
+                             };
 static const uint32_t T1[] = {
     0x4F37D, 0x279BE, 0x97A6A, 0x4BD35, 0x25E9A, 0x12F4D, 0x097A6, 0x80D66,
     0xC4006, 0x62003, 0xB56B4, 0x5AB5A, 0xA9318, 0xD0F39, 0x6879C, 0xB057B,
     0x582BD, 0x2C15E, 0x160AF, 0x8F6E2, 0xC3DC4, 0xE5857, 0x72C2B, 0x39615,
-    0x98DBF, 0xC806A, 0xE0680, 0x70340, 0x381A0, 0x98665, 0x4C332, 0xA272C};
+    0x98DBF, 0xC806A, 0xE0680, 0x70340, 0x381A0, 0x98665, 0x4C332, 0xA272C
+};
 static const uint32_t T2[] = {  0x3C88B810, 0x5E445C08, 0x2982A580, 0x14C152C0,
-    0x4A60A960, 0x253054B0, 0x52982A58, 0x2FEC9EA8, 0x1156C4D0, 0x08AB6268,
-    0x42F53AB0, 0x217A9D58, 0x161DC528, 0x0DAE6910, 0x46D73488, 0x25CB11C0,
-    0x52E588E0, 0x6972C470, 0x34B96238, 0x5CFC3A98, 0x28DE96C8, 0x12CFC0E0,
-    0x4967E070, 0x64B3F038, 0x74F97398, 0x7CDC3248, 0x38CE92A0, 0x1C674950,
-    0x0E33A4A8, 0x01B959D0, 0x40DCACE8, 0x26CEDDF0};
+                                0x4A60A960, 0x253054B0, 0x52982A58, 0x2FEC9EA8, 0x1156C4D0, 0x08AB6268,
+                                0x42F53AB0, 0x217A9D58, 0x161DC528, 0x0DAE6910, 0x46D73488, 0x25CB11C0,
+                                0x52E588E0, 0x6972C470, 0x34B96238, 0x5CFC3A98, 0x28DE96C8, 0x12CFC0E0,
+                                0x4967E070, 0x64B3F038, 0x74F97398, 0x7CDC3248, 0x38CE92A0, 0x1C674950,
+                                0x0E33A4A8, 0x01B959D0, 0x40DCACE8, 0x26CEDDF0
+                             };
 static const uint32_t C1[] = { 0x846B5, 0x4235A, 0x211AD};
 static const uint32_t C2[] = { 0x1A822E0, 0x21A822E0, 0x21A822E0};
 /** Reverse 64 bits of keystream into possible cipher states
  * Variation mentioned in the paper. Somewhat optimized version
  */
-struct Crypto1State* lfsr_recovery64(uint32_t ks2, uint32_t ks3)
+struct Crypto1State *lfsr_recovery64(uint32_t ks2, uint32_t ks3)
 {
     struct Crypto1State *statelist, *sl;
     uint8_t oks[32], eks[32], hi[32];
@@ -230,50 +234,50 @@ struct Crypto1State* lfsr_recovery64(uint32_t ks2, uint32_t ks3)
     int i, j;
 
     sl = statelist = malloc(sizeof(struct Crypto1State) << 4);
-    if(!sl)
+    if (!sl)
         return 0;
     sl->odd = sl->even = 0;
 
-    for(i = 30; i >= 0; i -= 2) {
+    for (i = 30; i >= 0; i -= 2) {
         oks[i >> 1] = BEBIT(ks2, i);
         oks[16 + (i >> 1)] = BEBIT(ks3, i);
     }
-    for(i = 31; i >= 0; i -= 2) {
+    for (i = 31; i >= 0; i -= 2) {
         eks[i >> 1] = BEBIT(ks2, i);
         eks[16 + (i >> 1)] = BEBIT(ks3, i);
     }
 
-    for(i = 0xfffff; i >= 0; --i) {
+    for (i = 0xfffff; i >= 0; --i) {
         if (filter(i) != oks[0])
             continue;
 
         *(tail = table) = i;
-        for(j = 1; tail >= table && j < 29; ++j)
+        for (j = 1; tail >= table && j < 29; ++j)
             extend_table_simple(table, &tail, oks[j]);
 
-        if(tail < table)
+        if (tail < table)
             continue;
 
-        for(j = 0; j < 19; ++j)
+        for (j = 0; j < 19; ++j)
             low = low << 1 | evenparity32(i & S1[j]);
-        for(j = 0; j < 32; ++j)
+        for (j = 0; j < 32; ++j)
             hi[j] = evenparity32(i & T1[j]);
 
-        for(; tail >= table; --tail) {
-            for(j = 0; j < 3; ++j) {
+        for (; tail >= table; --tail) {
+            for (j = 0; j < 3; ++j) {
                 *tail = *tail << 1;
                 *tail |= evenparity32((i & C1[j]) ^ (*tail & C2[j]));
-                if(filter(*tail) != oks[29 + j])
+                if (filter(*tail) != oks[29 + j])
                     goto continue2;
             }
 
-            for(j = 0; j < 19; ++j)
+            for (j = 0; j < 19; ++j)
                 win = win << 1 | evenparity32(*tail & S2[j]);
 
             win ^= low;
-            for(j = 0; j < 32; ++j) {
+            for (j = 0; j < 32; ++j) {
                 win = win << 1 ^ hi[j] ^ evenparity32(*tail & T2[j]);
-                if(filter(win) != eks[j])
+                if (filter(win) != eks[j])
                     goto continue2;
             }
 
@@ -282,7 +286,8 @@ struct Crypto1State* lfsr_recovery64(uint32_t ks2, uint32_t ks3)
             sl->even = win;
             ++sl;
             sl->odd = sl->even = 0;
-            continue2:;
+continue2:
+            ;
         }
     }
     return statelist;
@@ -377,9 +382,9 @@ static uint16_t *dist = 0;
 int nonce_distance(uint32_t from, uint32_t to)
 {
     uint16_t x, i;
-    if(!dist) {
+    if (!dist) {
         dist = calloc(2 << 16,  sizeof(uint8_t));
-        if(!dist)
+        if (!dist)
             return -1;
         for (x = i = 1; i; ++i) {
             dist[(x & 0xff) << 8 | x >> 8] = i;
@@ -395,7 +400,8 @@ int nonce_distance(uint32_t from, uint32_t to)
  *   true = weak prng
  *   false = hardend prng
  */
-bool validate_prng_nonce(uint32_t nonce) {
+bool validate_prng_nonce(uint32_t nonce)
+{
     // init prng table:
     nonce_distance(nonce, nonce);
     return ((65535 - dist[nonce >> 16] + dist[nonce & 0xffff]) % 65535) == 16;
@@ -403,7 +409,8 @@ bool validate_prng_nonce(uint32_t nonce) {
 
 static uint32_t fastfwd[2][8] = {
     { 0, 0x4BC53, 0xECB1, 0x450E2, 0x25E29, 0x6E27A, 0x2B298, 0x60ECB},
-    { 0, 0x1D962, 0x4BC53, 0x56531, 0xECB1, 0x135D3, 0x450E2, 0x58980}};
+    { 0, 0x1D962, 0x4BC53, 0x56531, 0xECB1, 0x135D3, 0x450E2, 0x58980}
+};
 
 /** lfsr_prefix_ks
  *
@@ -440,11 +447,11 @@ uint32_t *lfsr_prefix_ks(uint8_t ks[8], int isodd)
 /** check_pfx_parity
  * helper function which eliminates possible secret states using parity bits
  */
-static struct Crypto1State* check_pfx_parity(uint32_t prefix, uint32_t rresp, uint8_t parities[8][8], uint32_t odd, uint32_t even, struct Crypto1State* sl, uint32_t no_par)
+static struct Crypto1State *check_pfx_parity(uint32_t prefix, uint32_t rresp, uint8_t parities[8][8], uint32_t odd, uint32_t even, struct Crypto1State *sl, uint32_t no_par)
 {
     uint32_t ks1, nr, ks2, rr, ks3, c, good = 1;
 
-    for(c = 0; good && c < 8; ++c) {
+    for (c = 0; good && c < 8; ++c) {
         sl->odd = odd ^ fastfwd[1][c];
         sl->even = even ^ fastfwd[0][c];
 
@@ -482,7 +489,7 @@ static struct Crypto1State* check_pfx_parity(uint32_t prefix, uint32_t rresp, ui
  * tag nonce was fed in
  */
 
-struct Crypto1State* lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8], uint32_t no_par)
+struct Crypto1State *lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8], uint32_t no_par)
 {
     struct Crypto1State *statelist, *s;
     uint32_t *odd, *even, *o, *e, top;
@@ -490,7 +497,7 @@ struct Crypto1State* lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8]
     odd = lfsr_prefix_ks(ks, 1);
     even = lfsr_prefix_ks(ks, 0);
 
-    s = statelist = malloc((sizeof *statelist) << 24); // was << 20. Need more for no_par special attack. Enough???
+    s = statelist = malloc((sizeof * statelist) << 24); // was << 20. Need more for no_par special attack. Enough???
     if (!s || !odd || !even) {
         free(statelist);
         statelist = 0;
diff --git a/common/crapto1/crapto1.h b/common/crapto1/crapto1.h
index b51b2aa15..feb0c2b46 100644
--- a/common/crapto1/crapto1.h
+++ b/common/crapto1/crapto1.h
@@ -33,23 +33,23 @@ void crypto1_create(struct Crypto1State *s, uint64_t key);
 #else
 struct Crypto1State *crypto1_create(uint64_t key);
 #endif
-void crypto1_destroy(struct Crypto1State*);
-void crypto1_get_lfsr(struct Crypto1State*, uint64_t*);
-uint8_t crypto1_bit(struct Crypto1State*, uint8_t, int);
-uint8_t crypto1_byte(struct Crypto1State*, uint8_t, int);
-uint32_t crypto1_word(struct Crypto1State*, uint32_t, int);
+void crypto1_destroy(struct Crypto1State *);
+void crypto1_get_lfsr(struct Crypto1State *, uint64_t *);
+uint8_t crypto1_bit(struct Crypto1State *, uint8_t, int);
+uint8_t crypto1_byte(struct Crypto1State *, uint8_t, int);
+uint32_t crypto1_word(struct Crypto1State *, uint32_t, int);
 uint32_t prng_successor(uint32_t x, uint32_t n);
 
-struct Crypto1State* lfsr_recovery32(uint32_t ks2, uint32_t in);
-struct Crypto1State* lfsr_recovery64(uint32_t ks2, uint32_t ks3);
+struct Crypto1State *lfsr_recovery32(uint32_t ks2, uint32_t in);
+struct Crypto1State *lfsr_recovery64(uint32_t ks2, uint32_t ks3);
 uint32_t *lfsr_prefix_ks(uint8_t ks[8], int isodd);
-struct Crypto1State*
+struct Crypto1State *
 lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8], uint32_t no_par);
 
 
-uint8_t lfsr_rollback_bit(struct Crypto1State* s, uint32_t in, int fb);
-uint8_t lfsr_rollback_byte(struct Crypto1State* s, uint32_t in, int fb);
-uint32_t lfsr_rollback_word(struct Crypto1State* s, uint32_t in, int fb);
+uint8_t lfsr_rollback_bit(struct Crypto1State *s, uint32_t in, int fb);
+uint8_t lfsr_rollback_byte(struct Crypto1State *s, uint32_t in, int fb);
+uint32_t lfsr_rollback_word(struct Crypto1State *s, uint32_t in, int fb);
 int nonce_distance(uint32_t from, uint32_t to);
 extern bool validate_prng_nonce(uint32_t nonce);
 #define FOREACH_VALID_NONCE(N, FILTER, FSIZE)\
diff --git a/common/crapto1/crypto1.c b/common/crapto1/crypto1.c
index f4147bf4f..a61a99107 100644
--- a/common/crapto1/crypto1.c
+++ b/common/crapto1/crypto1.c
@@ -30,7 +30,7 @@ void crypto1_create(struct Crypto1State *s, uint64_t key)
 {
     int i;
 
-    for(i = 47;s && i > 0; i -= 2) {
+    for (i = 47; s && i > 0; i -= 2) {
         s->odd  = s->odd  << 1 | BIT(key, (i - 1) ^ 7);
         s->even = s->even << 1 | BIT(key, i ^ 7);
     }
@@ -42,15 +42,15 @@ void crypto1_destroy(struct Crypto1State *state)
     state->even = 0;
 }
 #else
-struct Crypto1State * crypto1_create(uint64_t key)
+struct Crypto1State *crypto1_create(uint64_t key)
 {
     struct Crypto1State *s = malloc(sizeof(*s));
-    if ( !s ) return NULL;
+    if (!s) return NULL;
 
     s->odd = s->even = 0;
 
     int i;
-    for(i = 47; i > 0; i -= 2) {
+    for (i = 47; i > 0; i -= 2) {
         s->odd  = s->odd  << 1 | BIT(key, (i - 1) ^ 7);
         s->even = s->even << 1 | BIT(key, i ^ 7);
     }
@@ -64,7 +64,7 @@ void crypto1_destroy(struct Crypto1State *state)
 void crypto1_get_lfsr(struct Crypto1State *state, uint64_t *lfsr)
 {
     int i;
-    for(*lfsr = 0, i = 23; i >= 0; --i) {
+    for (*lfsr = 0, i = 23; i >= 0; --i) {
         *lfsr = *lfsr << 1 | BIT(state->odd, i ^ 3);
         *lfsr = *lfsr << 1 | BIT(state->even, i ^ 3);
     }
@@ -146,7 +146,7 @@ uint32_t crypto1_word(struct Crypto1State *s, uint32_t in, int is_encrypted)
 uint32_t prng_successor(uint32_t x, uint32_t n)
 {
     SWAPENDIAN(x);
-    while(n--)
+    while (n--)
         x = x >> 1 | (x >> 16 ^ x >> 18 ^ x >> 19 ^ x >> 21) << 31;
 
     return SWAPENDIAN(x);
diff --git a/common/crc.c b/common/crc.c
index b91eea505..df479b94a 100644
--- a/common/crc.c
+++ b/common/crc.c
@@ -9,33 +9,37 @@
 //
 #include "crc.h"
 
-void crc_init_ref(crc_t *crc, int order, uint32_t polynom, uint32_t initial_value, uint32_t final_xor, bool refin, bool refout) {
+void crc_init_ref(crc_t *crc, int order, uint32_t polynom, uint32_t initial_value, uint32_t final_xor, bool refin, bool refout)
+{
     crc_init(crc, order, polynom, initial_value, final_xor);
     crc->refin = refin;
     crc->refout = refout;
     crc_clear(crc);
 }
 
-void crc_init(crc_t *crc, int order, uint32_t polynom, uint32_t initial_value, uint32_t final_xor) {
+void crc_init(crc_t *crc, int order, uint32_t polynom, uint32_t initial_value, uint32_t final_xor)
+{
     crc->order = order;
-    crc->topbit = BITMASK( order-1 );
+    crc->topbit = BITMASK(order - 1);
     crc->polynom = polynom;
     crc->initial_value = initial_value;
     crc->final_xor = final_xor;
-    crc->mask = (1L<<order)-1;
+    crc->mask = (1L << order) - 1;
     crc->refin = false;
     crc->refout = false;
     crc_clear(crc);
 }
 
-void crc_clear(crc_t *crc) {
+void crc_clear(crc_t *crc)
+{
 
     crc->state = crc->initial_value & crc->mask;
     if (crc->refin)
         crc->state = reflect(crc->state, crc->order);
 }
 
-void crc_update2(crc_t *crc, uint32_t data, int data_width){
+void crc_update2(crc_t *crc, uint32_t data, int data_width)
+{
 
     if (crc->refin)
         data = reflect(data, data_width);
@@ -43,7 +47,7 @@ void crc_update2(crc_t *crc, uint32_t data, int data_width){
     // Bring the next byte into the remainder.
     crc->state ^= data << (crc->order - data_width);
 
-    for( uint8_t bit = data_width; bit > 0; --bit) {
+    for (uint8_t bit = data_width; bit > 0; --bit) {
 
         if (crc->state & crc->topbit)
             crc->state = (crc->state << 1) ^ crc->polynom;
@@ -58,21 +62,22 @@ void crc_update(crc_t *crc, uint32_t data, int data_width)
         data = reflect(data, data_width);
 
     int i;
-    for(i=0; i<data_width; i++) {
+    for (i = 0; i < data_width; i++) {
         int oldstate = crc->state;
         crc->state = crc->state >> 1;
-        if( (oldstate^data) & 1 ) {
+        if ((oldstate ^ data) & 1) {
             crc->state ^= crc->polynom;
         }
         data >>= 1;
     }
 }
 
-uint32_t crc_finish(crc_t *crc) {
+uint32_t crc_finish(crc_t *crc)
+{
     uint32_t val = crc->state;
     if (crc->refout)
         val = reflect(val, crc->order);
-    return ( val ^ crc->final_xor ) & crc->mask;
+    return (val ^ crc->final_xor) & crc->mask;
 }
 
 /*
@@ -92,23 +97,26 @@ static void print_crc(crc_t *crc) {
 */
 
 // width=8  poly=0x31  init=0x00  refin=true  refout=true  xorout=0x00  check=0xA1  name="CRC-8/MAXIM"
-uint32_t CRC8Maxim(uint8_t *buff, size_t size) {
+uint32_t CRC8Maxim(uint8_t *buff, size_t size)
+{
     crc_t crc;
     crc_init_ref(&crc, 8, 0x31, 0, 0, true, true);
-    for ( int i=0; i < size; ++i)
+    for (int i = 0; i < size; ++i)
         crc_update2(&crc, buff[i], 8);
     return crc_finish(&crc);
 }
 // width=8 poly=0x1d, init=0xc7 (0xe3 - WRONG! but it mentioned in MAD datasheet) refin=false  refout=false  xorout=0x00 name="CRC-8/MIFARE-MAD"
-uint32_t CRC8Mad(uint8_t *buff, size_t size) {
+uint32_t CRC8Mad(uint8_t *buff, size_t size)
+{
     crc_t crc;
     crc_init_ref(&crc, 8, 0x1d, 0xc7, 0, false, false);
-    for ( int i = 0; i < size; ++i)
+    for (int i = 0; i < size; ++i)
         crc_update2(&crc, buff[i], 8);
     return crc_finish(&crc);
 }
 // width=4  poly=0xC, reversed poly=0x7  init=0x5   refin=true  refout=true  xorout=0x0000  check=  name="CRC-4/LEGIC"
-uint32_t CRC4Legic(uint8_t *cmd, size_t size) {
+uint32_t CRC4Legic(uint8_t *cmd, size_t size)
+{
     crc_t crc;
     crc_init_ref(&crc, 4, 0x19 >> 1, 0x5, 0, true, true);
     crc_update2(&crc, 1, 1); /* CMD_READ */
@@ -118,10 +126,11 @@ uint32_t CRC4Legic(uint8_t *cmd, size_t size) {
 }
 // width=8  poly=0x63, reversed poly=0x8D  init=0x55  refin=true  refout=true  xorout=0x0000  check=0xC6  name="CRC-8/LEGIC"
 // the CRC needs to be reversed before returned.
-uint32_t CRC8Legic(uint8_t *buff, size_t size) {
+uint32_t CRC8Legic(uint8_t *buff, size_t size)
+{
     crc_t crc;
     crc_init_ref(&crc, 8, 0x63, 0x55, 0, true, true);
-    for ( int i = 0; i < size; ++i)
+    for (int i = 0; i < size; ++i)
         crc_update2(&crc, buff[i], 8);
     return reflect8(crc_finish(&crc));
 }
\ No newline at end of file
diff --git a/common/crc.h b/common/crc.h
index 5a15563b7..368758f40 100644
--- a/common/crc.h
+++ b/common/crc.h
@@ -64,14 +64,14 @@ uint32_t CRC8Legic(uint8_t *buff, size_t size);
 
 /* Static initialization of a crc structure */
 #define CRC_INITIALIZER(_order, _polynom, _initial_value, _final_xor) { \
-    .state = ((_initial_value) & ((1L<<(_order))-1)), \
-    .order = (_order), \
-    .polynom = (_polynom), \
-    .initial_value = (_initial_value), \
-    .final_xor = (_final_xor), \
-    .mask = ((1L<<(_order))-1) \
-    .refin = false, \
-    .refout = false \
+        .state = ((_initial_value) & ((1L<<(_order))-1)), \
+                 .order = (_order), \
+                          .polynom = (_polynom), \
+                                     .initial_value = (_initial_value), \
+                                                      .final_xor = (_final_xor), \
+                                                                   .mask = ((1L<<(_order))-1) \
+                                                                           .refin = false, \
+                                                                                   .refout = false \
     }
 
 #endif /* __CRC_H */
diff --git a/common/crc16.c b/common/crc16.c
index af3ca2676..1142fbbac 100644
--- a/common/crc16.c
+++ b/common/crc16.c
@@ -11,14 +11,15 @@ static uint16_t crc_table[256];
 static bool crc_table_init = false;
 static CrcType_t crc_type = CRC_NONE;
 
-void init_table(CrcType_t ct) {
+void init_table(CrcType_t ct)
+{
 
     // same crc algo, and initialised already
-    if ( ct == crc_type && crc_table_init)
+    if (ct == crc_type && crc_table_init)
         return;
 
     // not the same crc algo. reset table.
-    if ( ct != crc_type)
+    if (ct != crc_type)
         reset_table();
 
     crc_type = ct;
@@ -27,11 +28,21 @@ void init_table(CrcType_t ct) {
         case CRC_14443_A:
         case CRC_14443_B:
         case CRC_15693:
-        case CRC_ICLASS: generate_table(CRC16_POLY_CCITT, true); break;
-        case CRC_FELICA: generate_table(CRC16_POLY_CCITT, false); break;
-        case CRC_LEGIC: generate_table(CRC16_POLY_LEGIC, true); break;
-        case CRC_CCITT: generate_table(CRC16_POLY_CCITT, false); break;
-        case CRC_KERMIT: generate_table(CRC16_POLY_CCITT, true); break;
+        case CRC_ICLASS:
+            generate_table(CRC16_POLY_CCITT, true);
+            break;
+        case CRC_FELICA:
+            generate_table(CRC16_POLY_CCITT, false);
+            break;
+        case CRC_LEGIC:
+            generate_table(CRC16_POLY_LEGIC, true);
+            break;
+        case CRC_CCITT:
+            generate_table(CRC16_POLY_CCITT, false);
+            break;
+        case CRC_KERMIT:
+            generate_table(CRC16_POLY_CCITT, true);
+            break;
         default:
             crc_table_init = false;
             crc_type = CRC_NONE;
@@ -39,7 +50,8 @@ void init_table(CrcType_t ct) {
     }
 }
 
-void generate_table( uint16_t polynomial, bool refin) {
+void generate_table(uint16_t polynomial, bool refin)
+{
 
     uint16_t i, j, crc, c;
 
@@ -52,8 +64,8 @@ void generate_table( uint16_t polynomial, bool refin) {
 
         for (j = 0; j < 8; j++) {
 
-            if ( (crc ^ c) & 0x8000 )
-                crc = ( crc << 1 ) ^ polynomial;
+            if ((crc ^ c) & 0x8000)
+                crc = (crc << 1) ^ polynomial;
             else
                 crc =   crc << 1;
 
@@ -67,14 +79,16 @@ void generate_table( uint16_t polynomial, bool refin) {
     crc_table_init = true;
 }
 
-void reset_table(void) {
+void reset_table(void)
+{
     memset(crc_table, 0, sizeof(crc_table));
     crc_table_init = false;
     crc_type = CRC_NONE;
 }
 
 // table lookup LUT solution
-uint16_t crc16_fast(uint8_t const *d, size_t n, uint16_t initval, bool refin, bool refout) {
+uint16_t crc16_fast(uint8_t const *d, size_t n, uint16_t initval, bool refin, bool refout)
+{
 
     // fast lookup table algorithm without augmented zero bytes, e.g. used in pkzip.
     // only usable with polynom orders of 8, 16, 24 or 32.
@@ -87,26 +101,27 @@ uint16_t crc16_fast(uint8_t const *d, size_t n, uint16_t initval, bool refin, bo
         crc = reflect16(crc);
 
     if (!refin)
-        while (n--) crc = (crc << 8) ^ crc_table[ ((crc >> 8) ^ *d++) & 0xFF ];
+        while (n--) crc = (crc << 8) ^ crc_table[((crc >> 8) ^ *d++) & 0xFF ];
     else
-        while (n--) crc = (crc >> 8) ^ crc_table[ (crc & 0xFF) ^ *d++];
+        while (n--) crc = (crc >> 8) ^ crc_table[(crc & 0xFF) ^ *d++];
 
-    if (refout^refin)
+    if (refout ^ refin)
         crc = reflect16(crc);
 
     return crc;
 }
 
 // bit looped solution  TODO REMOVED
-uint16_t update_crc16_ex( uint16_t crc, uint8_t c, uint16_t polynomial ) {
+uint16_t update_crc16_ex(uint16_t crc, uint8_t c, uint16_t polynomial)
+{
     uint16_t i, v, tmp = 0;
 
     v = (crc ^ c) & 0xff;
 
     for (i = 0; i < 8; i++) {
 
-        if ( (tmp ^ v) & 1 )
-            tmp = ( tmp >> 1 ) ^ polynomial;
+        if ((tmp ^ v) & 1)
+            tmp = (tmp >> 1) ^ polynomial;
         else
             tmp >>= 1;
 
@@ -114,12 +129,14 @@ uint16_t update_crc16_ex( uint16_t crc, uint8_t c, uint16_t polynomial ) {
     }
     return ((crc >> 8) ^ tmp) & 0xffff;
 }
-uint16_t update_crc16( uint16_t crc, uint8_t c ) {
-    return update_crc16_ex( crc, c, CRC16_POLY_CCITT);
+uint16_t update_crc16(uint16_t crc, uint8_t c)
+{
+    return update_crc16_ex(crc, c, CRC16_POLY_CCITT);
 }
 
 // two ways.  msb or lsb loop.
-uint16_t crc16(uint8_t const *d, size_t length, uint16_t remainder, uint16_t polynomial, bool refin, bool refout) {
+uint16_t crc16(uint8_t const *d, size_t length, uint16_t remainder, uint16_t polynomial, bool refin, bool refout)
+{
     if (length == 0)
         return (~remainder);
 
@@ -146,44 +163,66 @@ uint16_t crc16(uint8_t const *d, size_t length, uint16_t remainder, uint16_t pol
     return remainder;
 }
 
-void compute_crc(CrcType_t ct, const uint8_t *d, size_t n, uint8_t *first, uint8_t *second) {
+void compute_crc(CrcType_t ct, const uint8_t *d, size_t n, uint8_t *first, uint8_t *second)
+{
 
     // can't calc a crc on less than 1 byte
-    if ( n == 0 ) return;
+    if (n == 0) return;
 
     init_table(ct);
 
     uint16_t crc = 0;
     switch (ct) {
-        case CRC_14443_A: crc = crc16_a(d, n); break;
+        case CRC_14443_A:
+            crc = crc16_a(d, n);
+            break;
         case CRC_14443_B:
-        case CRC_15693: crc = crc16_x25(d, n); break;
-        case CRC_ICLASS: crc = crc16_iclass(d, n); break;
-        case CRC_FELICA:crc = crc16_xmodem(d, n); break;
+        case CRC_15693:
+            crc = crc16_x25(d, n);
+            break;
+        case CRC_ICLASS:
+            crc = crc16_iclass(d, n);
+            break;
+        case CRC_FELICA:
+            crc = crc16_xmodem(d, n);
+            break;
         //case CRC_LEGIC:
-        case CRC_CCITT: crc = crc16_ccitt(d, n); break;
-        case CRC_KERMIT: crc = crc16_kermit(d, n); break;
-        default: break;
+        case CRC_CCITT:
+            crc = crc16_ccitt(d, n);
+            break;
+        case CRC_KERMIT:
+            crc = crc16_kermit(d, n);
+            break;
+        default:
+            break;
     }
     *first = (crc & 0xFF);
     *second = ((crc >> 8) & 0xFF);
 }
-uint16_t crc(CrcType_t ct, const uint8_t *d, size_t n) {
+uint16_t crc(CrcType_t ct, const uint8_t *d, size_t n)
+{
 
     // can't calc a crc on less than 3 byte. (1byte + 2 crc bytes)
-    if ( n < 3 ) return 0;
+    if (n < 3) return 0;
 
     init_table(ct);
     switch (ct) {
-        case CRC_14443_A: return crc16_a(d, n);
+        case CRC_14443_A:
+            return crc16_a(d, n);
         case CRC_14443_B:
-        case CRC_15693: return crc16_x25(d, n);
-        case CRC_ICLASS: return crc16_iclass(d, n);
-        case CRC_FELICA: return crc16_xmodem(d, n);
+        case CRC_15693:
+            return crc16_x25(d, n);
+        case CRC_ICLASS:
+            return crc16_iclass(d, n);
+        case CRC_FELICA:
+            return crc16_xmodem(d, n);
         //case CRC_LEGIC:
-        case CRC_CCITT: return crc16_ccitt(d, n);
-        case CRC_KERMIT: return crc16_kermit(d, n);
-        default: break;
+        case CRC_CCITT:
+            return crc16_ccitt(d, n);
+        case CRC_KERMIT:
+            return crc16_kermit(d, n);
+        default:
+            break;
     }
     return 0;
 }
@@ -197,40 +236,51 @@ uint16_t crc(CrcType_t ct, const uint8_t *d, size_t n) {
 // crc16 algos like CRC-A become 0x000
 // while CRC-15693 become 0x0F47
 // If calculated with crc bytes,  the residue should be 0xF0B8
-bool check_crc(CrcType_t ct, const uint8_t *d, size_t n) {
+bool check_crc(CrcType_t ct, const uint8_t *d, size_t n)
+{
 
     // can't calc a crc on less than 3 byte. (1byte + 2 crc bytes)
-    if ( n < 3 ) return false;
+    if (n < 3) return false;
 
     init_table(ct);
 
     switch (ct) {
-        case CRC_14443_A: return (crc16_a(d, n) == 0);
-        case CRC_14443_B: return (crc16_x25(d, n) == X25_CRC_CHECK);
-        case CRC_15693:   return (crc16_x25(d, n) == X25_CRC_CHECK);
-        case CRC_ICLASS:  return (crc16_iclass(d, n) == 0);
-        case CRC_FELICA:  return (crc16_xmodem(d, n) == 0);
+        case CRC_14443_A:
+            return (crc16_a(d, n) == 0);
+        case CRC_14443_B:
+            return (crc16_x25(d, n) == X25_CRC_CHECK);
+        case CRC_15693:
+            return (crc16_x25(d, n) == X25_CRC_CHECK);
+        case CRC_ICLASS:
+            return (crc16_iclass(d, n) == 0);
+        case CRC_FELICA:
+            return (crc16_xmodem(d, n) == 0);
         //case CRC_LEGIC:
-        case CRC_CCITT:   return (crc16_ccitt(d, n) == 0);
-        default: break;
+        case CRC_CCITT:
+            return (crc16_ccitt(d, n) == 0);
+        default:
+            break;
     }
     return false;
 }
 
 // poly=0x1021  init=0xffff  refin=false  refout=false  xorout=0x0000  check=0x29b1  residue=0x0000  name="CRC-16/CCITT-FALSE"
-uint16_t crc16_ccitt(uint8_t const *d, size_t n) {
+uint16_t crc16_ccitt(uint8_t const *d, size_t n)
+{
     return crc16_fast(d, n, 0xffff, false, false);
 }
 
 // FDX-B ISO11784/85) uses KERMIT
 // poly=0x1021  init=0x0000  refin=true  refout=true  xorout=0x0000 name="KERMIT"
-uint16_t crc16_kermit(uint8_t const *d, size_t n) {
+uint16_t crc16_kermit(uint8_t const *d, size_t n)
+{
     return crc16_fast(d, n, 0x0000, true, true);
 }
 
 // FeliCa uses XMODEM
 // poly=0x1021  init=0x0000  refin=false  refout=false  xorout=0x0000 name="XMODEM"
-uint16_t crc16_xmodem(uint8_t const *d, size_t n) {
+uint16_t crc16_xmodem(uint8_t const *d, size_t n)
+{
     return crc16_fast(d, n, 0x0000, false, false);
 }
 
@@ -239,14 +289,16 @@ uint16_t crc16_xmodem(uint8_t const *d, size_t n) {
 //   ISO 14443 CRC-B
 //   ISO/IEC 13239 (formerly ISO/IEC 3309)
 // poly=0x1021  init=0xffff  refin=true  refout=true  xorout=0xffff name="X-25"
-uint16_t crc16_x25(uint8_t const *d, size_t n) {
+uint16_t crc16_x25(uint8_t const *d, size_t n)
+{
     uint16_t crc = crc16_fast(d, n, 0xffff, true, true);
     crc = ~crc;
     return crc;
 }
 // CRC-A (14443-3)
 // poly=0x1021 init=0xc6c6 refin=true refout=true xorout=0x0000 name="CRC-A"
-uint16_t crc16_a(uint8_t const *d, size_t n) {
+uint16_t crc16_a(uint8_t const *d, size_t n)
+{
     return crc16_fast(d, n, 0xC6C6, true, true);
 }
 
@@ -254,13 +306,15 @@ uint16_t crc16_a(uint8_t const *d, size_t n) {
 // initvalue  0x4807 reflected 0xE012
 // poly       0x1021 reflected 0x8408
 // poly=0x1021  init=0x4807  refin=true  refout=true  xorout=0x0BC3  check=0xF0B8  name="CRC-16/ICLASS"
-uint16_t crc16_iclass(uint8_t const *d, size_t n) {
+uint16_t crc16_iclass(uint8_t const *d, size_t n)
+{
     return crc16_fast(d, n, 0x4807, true, true);
 }
 
 // This CRC-16 is used in Legic Advant systems.
 // poly=0xB400,  init=depends  refin=true  refout=true  xorout=0x0000  check=  name="CRC-16/LEGIC"
-uint16_t crc16_legic(uint8_t const *d, size_t n, uint8_t uidcrc) {
+uint16_t crc16_legic(uint8_t const *d, size_t n, uint8_t uidcrc)
+{
     uint16_t initial = uidcrc << 8 | uidcrc;
     return crc16_fast(d, n, initial, true, true);
 }
diff --git a/common/crc16.h b/common/crc16.h
index 6b3f1432b..b88995a40 100644
--- a/common/crc16.h
+++ b/common/crc16.h
@@ -30,7 +30,7 @@ typedef enum {
     CRC_KERMIT,
 } CrcType_t;
 
-uint16_t update_crc16_ex( uint16_t crc, uint8_t c, uint16_t polynomial );
+uint16_t update_crc16_ex(uint16_t crc, uint8_t c, uint16_t polynomial);
 uint16_t update_crc16(uint16_t crc, uint8_t c);
 uint16_t crc16(uint8_t const *message, size_t length, uint16_t remainder, uint16_t polynomial, bool refin, bool refout);
 
diff --git a/common/crc32.c b/common/crc32.c
index 176c3c8f0..245dcf1a8 100644
--- a/common/crc32.c
+++ b/common/crc32.c
@@ -3,9 +3,10 @@
 #define htole32(x) (x)
 #define CRC32_PRESET 0xFFFFFFFF
 
-static void crc32_byte (uint32_t *crc, const uint8_t value);
+static void crc32_byte(uint32_t *crc, const uint8_t value);
 
-static void crc32_byte (uint32_t *crc, const uint8_t value) {
+static void crc32_byte(uint32_t *crc, const uint8_t value)
+{
     /* x32 + x26 + x23 + x22 + x16 + x12 + x11 + x10 + x8 + x7 + x5 + x4 + x2 + x + 1 */
     const uint32_t poly = 0xEDB88320;
 
@@ -18,15 +19,17 @@ static void crc32_byte (uint32_t *crc, const uint8_t value) {
     }
 }
 
-void crc32_ex (const uint8_t *data, const size_t len, uint8_t *crc) {
+void crc32_ex(const uint8_t *data, const size_t len, uint8_t *crc)
+{
     uint32_t desfire_crc = CRC32_PRESET;
     for (size_t i = 0; i < len; i++) {
-        crc32_byte (&desfire_crc, data[i]);
+        crc32_byte(&desfire_crc, data[i]);
     }
 
-    *((uint32_t *)(crc)) = htole32 (desfire_crc);
+    *((uint32_t *)(crc)) = htole32(desfire_crc);
 }
 
-void crc32_append (uint8_t *data, const size_t len) {
-    crc32_ex (data, len, data + len);
+void crc32_append(uint8_t *data, const size_t len)
+{
+    crc32_ex(data, len, data + len);
 }
\ No newline at end of file
diff --git a/common/crc32.h b/common/crc32.h
index a21b741e3..308b3a077 100644
--- a/common/crc32.h
+++ b/common/crc32.h
@@ -17,7 +17,7 @@ extern "C" {
 #endif
 
 void crc32_ex(const uint8_t *data, const size_t len, uint8_t *crc);
-void crc32_append (uint8_t *data, const size_t len);
+void crc32_append(uint8_t *data, const size_t len);
 
 #ifdef __cplusplus
 }
diff --git a/common/crc64.c b/common/crc64.c
index 5dc779f8d..db33c8db3 100644
--- a/common/crc64.c
+++ b/common/crc64.c
@@ -6,73 +6,74 @@
 #define CRC64_ECMA_PRESET 0x0000000000000000
 
 const uint64_t crc64_table[] = {
-         0x0000000000000000, 0x42F0E1EBA9EA3693, 0x85E1C3D753D46D26, 0xC711223CFA3E5BB5,
-         0x493366450E42ECDF, 0x0BC387AEA7A8DA4C, 0xCCD2A5925D9681F9, 0x8E224479F47CB76A,
-         0x9266CC8A1C85D9BE, 0xD0962D61B56FEF2D, 0x17870F5D4F51B498, 0x5577EEB6E6BB820B,
-         0xDB55AACF12C73561, 0x99A54B24BB2D03F2, 0x5EB4691841135847, 0x1C4488F3E8F96ED4,
-         0x663D78FF90E185EF, 0x24CD9914390BB37C, 0xE3DCBB28C335E8C9, 0xA12C5AC36ADFDE5A,
-         0x2F0E1EBA9EA36930, 0x6DFEFF5137495FA3, 0xAAEFDD6DCD770416, 0xE81F3C86649D3285,
-         0xF45BB4758C645C51, 0xB6AB559E258E6AC2, 0x71BA77A2DFB03177, 0x334A9649765A07E4,
-         0xBD68D2308226B08E, 0xFF9833DB2BCC861D, 0x388911E7D1F2DDA8, 0x7A79F00C7818EB3B,
-         0xCC7AF1FF21C30BDE, 0x8E8A101488293D4D, 0x499B3228721766F8, 0x0B6BD3C3DBFD506B,
-         0x854997BA2F81E701, 0xC7B97651866BD192, 0x00A8546D7C558A27, 0x4258B586D5BFBCB4,
-         0x5E1C3D753D46D260, 0x1CECDC9E94ACE4F3, 0xDBFDFEA26E92BF46, 0x990D1F49C77889D5,
-         0x172F5B3033043EBF, 0x55DFBADB9AEE082C, 0x92CE98E760D05399, 0xD03E790CC93A650A,
-         0xAA478900B1228E31, 0xE8B768EB18C8B8A2, 0x2FA64AD7E2F6E317, 0x6D56AB3C4B1CD584,
-         0xE374EF45BF6062EE, 0xA1840EAE168A547D, 0x66952C92ECB40FC8, 0x2465CD79455E395B,
-         0x3821458AADA7578F, 0x7AD1A461044D611C, 0xBDC0865DFE733AA9, 0xFF3067B657990C3A,
-         0x711223CFA3E5BB50, 0x33E2C2240A0F8DC3, 0xF4F3E018F031D676, 0xB60301F359DBE0E5,
-         0xDA050215EA6C212F, 0x98F5E3FE438617BC, 0x5FE4C1C2B9B84C09, 0x1D14202910527A9A,
-         0x93366450E42ECDF0, 0xD1C685BB4DC4FB63, 0x16D7A787B7FAA0D6, 0x5427466C1E109645,
-         0x4863CE9FF6E9F891, 0x0A932F745F03CE02, 0xCD820D48A53D95B7, 0x8F72ECA30CD7A324,
-         0x0150A8DAF8AB144E, 0x43A04931514122DD, 0x84B16B0DAB7F7968, 0xC6418AE602954FFB,
-         0xBC387AEA7A8DA4C0, 0xFEC89B01D3679253, 0x39D9B93D2959C9E6, 0x7B2958D680B3FF75,
-         0xF50B1CAF74CF481F, 0xB7FBFD44DD257E8C, 0x70EADF78271B2539, 0x321A3E938EF113AA,
-         0x2E5EB66066087D7E, 0x6CAE578BCFE24BED, 0xABBF75B735DC1058, 0xE94F945C9C3626CB,
-         0x676DD025684A91A1, 0x259D31CEC1A0A732, 0xE28C13F23B9EFC87, 0xA07CF2199274CA14,
-         0x167FF3EACBAF2AF1, 0x548F120162451C62, 0x939E303D987B47D7, 0xD16ED1D631917144,
-         0x5F4C95AFC5EDC62E, 0x1DBC74446C07F0BD, 0xDAAD56789639AB08, 0x985DB7933FD39D9B,
-         0x84193F60D72AF34F, 0xC6E9DE8B7EC0C5DC, 0x01F8FCB784FE9E69, 0x43081D5C2D14A8FA,
-         0xCD2A5925D9681F90, 0x8FDAB8CE70822903, 0x48CB9AF28ABC72B6, 0x0A3B7B1923564425,
-         0x70428B155B4EAF1E, 0x32B26AFEF2A4998D, 0xF5A348C2089AC238, 0xB753A929A170F4AB,
-         0x3971ED50550C43C1, 0x7B810CBBFCE67552, 0xBC902E8706D82EE7, 0xFE60CF6CAF321874,
-         0xE224479F47CB76A0, 0xA0D4A674EE214033, 0x67C58448141F1B86, 0x253565A3BDF52D15,
-         0xAB1721DA49899A7F, 0xE9E7C031E063ACEC, 0x2EF6E20D1A5DF759, 0x6C0603E6B3B7C1CA,
-         0xF6FAE5C07D3274CD, 0xB40A042BD4D8425E, 0x731B26172EE619EB, 0x31EBC7FC870C2F78,
-         0xBFC9838573709812, 0xFD39626EDA9AAE81, 0x3A28405220A4F534, 0x78D8A1B9894EC3A7,
-         0x649C294A61B7AD73, 0x266CC8A1C85D9BE0, 0xE17DEA9D3263C055, 0xA38D0B769B89F6C6,
-         0x2DAF4F0F6FF541AC, 0x6F5FAEE4C61F773F, 0xA84E8CD83C212C8A, 0xEABE6D3395CB1A19,
-         0x90C79D3FEDD3F122, 0xD2377CD44439C7B1, 0x15265EE8BE079C04, 0x57D6BF0317EDAA97,
-         0xD9F4FB7AE3911DFD, 0x9B041A914A7B2B6E, 0x5C1538ADB04570DB, 0x1EE5D94619AF4648,
-         0x02A151B5F156289C, 0x4051B05E58BC1E0F, 0x87409262A28245BA, 0xC5B073890B687329,
-         0x4B9237F0FF14C443, 0x0962D61B56FEF2D0, 0xCE73F427ACC0A965, 0x8C8315CC052A9FF6,
-         0x3A80143F5CF17F13, 0x7870F5D4F51B4980, 0xBF61D7E80F251235, 0xFD913603A6CF24A6,
-         0x73B3727A52B393CC, 0x31439391FB59A55F, 0xF652B1AD0167FEEA, 0xB4A25046A88DC879,
-         0xA8E6D8B54074A6AD, 0xEA16395EE99E903E, 0x2D071B6213A0CB8B, 0x6FF7FA89BA4AFD18,
-         0xE1D5BEF04E364A72, 0xA3255F1BE7DC7CE1, 0x64347D271DE22754, 0x26C49CCCB40811C7,
-         0x5CBD6CC0CC10FAFC, 0x1E4D8D2B65FACC6F, 0xD95CAF179FC497DA, 0x9BAC4EFC362EA149,
-         0x158E0A85C2521623, 0x577EEB6E6BB820B0, 0x906FC95291867B05, 0xD29F28B9386C4D96,
-         0xCEDBA04AD0952342, 0x8C2B41A1797F15D1, 0x4B3A639D83414E64, 0x09CA82762AAB78F7,
-         0x87E8C60FDED7CF9D, 0xC51827E4773DF90E, 0x020905D88D03A2BB, 0x40F9E43324E99428,
-         0x2CFFE7D5975E55E2, 0x6E0F063E3EB46371, 0xA91E2402C48A38C4, 0xEBEEC5E96D600E57,
-         0x65CC8190991CB93D, 0x273C607B30F68FAE, 0xE02D4247CAC8D41B, 0xA2DDA3AC6322E288,
-         0xBE992B5F8BDB8C5C, 0xFC69CAB42231BACF, 0x3B78E888D80FE17A, 0x7988096371E5D7E9,
-         0xF7AA4D1A85996083, 0xB55AACF12C735610, 0x724B8ECDD64D0DA5, 0x30BB6F267FA73B36,
-         0x4AC29F2A07BFD00D, 0x08327EC1AE55E69E, 0xCF235CFD546BBD2B, 0x8DD3BD16FD818BB8,
-         0x03F1F96F09FD3CD2, 0x41011884A0170A41, 0x86103AB85A2951F4, 0xC4E0DB53F3C36767,
-         0xD8A453A01B3A09B3, 0x9A54B24BB2D03F20, 0x5D45907748EE6495, 0x1FB5719CE1045206,
-         0x919735E51578E56C, 0xD367D40EBC92D3FF, 0x1476F63246AC884A, 0x568617D9EF46BED9,
-         0xE085162AB69D5E3C, 0xA275F7C11F7768AF, 0x6564D5FDE549331A, 0x279434164CA30589,
-         0xA9B6706FB8DFB2E3, 0xEB46918411358470, 0x2C57B3B8EB0BDFC5, 0x6EA7525342E1E956,
-         0x72E3DAA0AA188782, 0x30133B4B03F2B111, 0xF7021977F9CCEAA4, 0xB5F2F89C5026DC37,
-         0x3BD0BCE5A45A6B5D, 0x79205D0E0DB05DCE, 0xBE317F32F78E067B, 0xFCC19ED95E6430E8,
-         0x86B86ED5267CDBD3, 0xC4488F3E8F96ED40, 0x0359AD0275A8B6F5, 0x41A94CE9DC428066,
-         0xCF8B0890283E370C, 0x8D7BE97B81D4019F, 0x4A6ACB477BEA5A2A, 0x089A2AACD2006CB9,
-         0x14DEA25F3AF9026D, 0x562E43B4931334FE, 0x913F6188692D6F4B, 0xD3CF8063C0C759D8,
-         0x5DEDC41A34BBEEB2, 0x1F1D25F19D51D821, 0xD80C07CD676F8394, 0x9AFCE626CE85B507
+    0x0000000000000000, 0x42F0E1EBA9EA3693, 0x85E1C3D753D46D26, 0xC711223CFA3E5BB5,
+    0x493366450E42ECDF, 0x0BC387AEA7A8DA4C, 0xCCD2A5925D9681F9, 0x8E224479F47CB76A,
+    0x9266CC8A1C85D9BE, 0xD0962D61B56FEF2D, 0x17870F5D4F51B498, 0x5577EEB6E6BB820B,
+    0xDB55AACF12C73561, 0x99A54B24BB2D03F2, 0x5EB4691841135847, 0x1C4488F3E8F96ED4,
+    0x663D78FF90E185EF, 0x24CD9914390BB37C, 0xE3DCBB28C335E8C9, 0xA12C5AC36ADFDE5A,
+    0x2F0E1EBA9EA36930, 0x6DFEFF5137495FA3, 0xAAEFDD6DCD770416, 0xE81F3C86649D3285,
+    0xF45BB4758C645C51, 0xB6AB559E258E6AC2, 0x71BA77A2DFB03177, 0x334A9649765A07E4,
+    0xBD68D2308226B08E, 0xFF9833DB2BCC861D, 0x388911E7D1F2DDA8, 0x7A79F00C7818EB3B,
+    0xCC7AF1FF21C30BDE, 0x8E8A101488293D4D, 0x499B3228721766F8, 0x0B6BD3C3DBFD506B,
+    0x854997BA2F81E701, 0xC7B97651866BD192, 0x00A8546D7C558A27, 0x4258B586D5BFBCB4,
+    0x5E1C3D753D46D260, 0x1CECDC9E94ACE4F3, 0xDBFDFEA26E92BF46, 0x990D1F49C77889D5,
+    0x172F5B3033043EBF, 0x55DFBADB9AEE082C, 0x92CE98E760D05399, 0xD03E790CC93A650A,
+    0xAA478900B1228E31, 0xE8B768EB18C8B8A2, 0x2FA64AD7E2F6E317, 0x6D56AB3C4B1CD584,
+    0xE374EF45BF6062EE, 0xA1840EAE168A547D, 0x66952C92ECB40FC8, 0x2465CD79455E395B,
+    0x3821458AADA7578F, 0x7AD1A461044D611C, 0xBDC0865DFE733AA9, 0xFF3067B657990C3A,
+    0x711223CFA3E5BB50, 0x33E2C2240A0F8DC3, 0xF4F3E018F031D676, 0xB60301F359DBE0E5,
+    0xDA050215EA6C212F, 0x98F5E3FE438617BC, 0x5FE4C1C2B9B84C09, 0x1D14202910527A9A,
+    0x93366450E42ECDF0, 0xD1C685BB4DC4FB63, 0x16D7A787B7FAA0D6, 0x5427466C1E109645,
+    0x4863CE9FF6E9F891, 0x0A932F745F03CE02, 0xCD820D48A53D95B7, 0x8F72ECA30CD7A324,
+    0x0150A8DAF8AB144E, 0x43A04931514122DD, 0x84B16B0DAB7F7968, 0xC6418AE602954FFB,
+    0xBC387AEA7A8DA4C0, 0xFEC89B01D3679253, 0x39D9B93D2959C9E6, 0x7B2958D680B3FF75,
+    0xF50B1CAF74CF481F, 0xB7FBFD44DD257E8C, 0x70EADF78271B2539, 0x321A3E938EF113AA,
+    0x2E5EB66066087D7E, 0x6CAE578BCFE24BED, 0xABBF75B735DC1058, 0xE94F945C9C3626CB,
+    0x676DD025684A91A1, 0x259D31CEC1A0A732, 0xE28C13F23B9EFC87, 0xA07CF2199274CA14,
+    0x167FF3EACBAF2AF1, 0x548F120162451C62, 0x939E303D987B47D7, 0xD16ED1D631917144,
+    0x5F4C95AFC5EDC62E, 0x1DBC74446C07F0BD, 0xDAAD56789639AB08, 0x985DB7933FD39D9B,
+    0x84193F60D72AF34F, 0xC6E9DE8B7EC0C5DC, 0x01F8FCB784FE9E69, 0x43081D5C2D14A8FA,
+    0xCD2A5925D9681F90, 0x8FDAB8CE70822903, 0x48CB9AF28ABC72B6, 0x0A3B7B1923564425,
+    0x70428B155B4EAF1E, 0x32B26AFEF2A4998D, 0xF5A348C2089AC238, 0xB753A929A170F4AB,
+    0x3971ED50550C43C1, 0x7B810CBBFCE67552, 0xBC902E8706D82EE7, 0xFE60CF6CAF321874,
+    0xE224479F47CB76A0, 0xA0D4A674EE214033, 0x67C58448141F1B86, 0x253565A3BDF52D15,
+    0xAB1721DA49899A7F, 0xE9E7C031E063ACEC, 0x2EF6E20D1A5DF759, 0x6C0603E6B3B7C1CA,
+    0xF6FAE5C07D3274CD, 0xB40A042BD4D8425E, 0x731B26172EE619EB, 0x31EBC7FC870C2F78,
+    0xBFC9838573709812, 0xFD39626EDA9AAE81, 0x3A28405220A4F534, 0x78D8A1B9894EC3A7,
+    0x649C294A61B7AD73, 0x266CC8A1C85D9BE0, 0xE17DEA9D3263C055, 0xA38D0B769B89F6C6,
+    0x2DAF4F0F6FF541AC, 0x6F5FAEE4C61F773F, 0xA84E8CD83C212C8A, 0xEABE6D3395CB1A19,
+    0x90C79D3FEDD3F122, 0xD2377CD44439C7B1, 0x15265EE8BE079C04, 0x57D6BF0317EDAA97,
+    0xD9F4FB7AE3911DFD, 0x9B041A914A7B2B6E, 0x5C1538ADB04570DB, 0x1EE5D94619AF4648,
+    0x02A151B5F156289C, 0x4051B05E58BC1E0F, 0x87409262A28245BA, 0xC5B073890B687329,
+    0x4B9237F0FF14C443, 0x0962D61B56FEF2D0, 0xCE73F427ACC0A965, 0x8C8315CC052A9FF6,
+    0x3A80143F5CF17F13, 0x7870F5D4F51B4980, 0xBF61D7E80F251235, 0xFD913603A6CF24A6,
+    0x73B3727A52B393CC, 0x31439391FB59A55F, 0xF652B1AD0167FEEA, 0xB4A25046A88DC879,
+    0xA8E6D8B54074A6AD, 0xEA16395EE99E903E, 0x2D071B6213A0CB8B, 0x6FF7FA89BA4AFD18,
+    0xE1D5BEF04E364A72, 0xA3255F1BE7DC7CE1, 0x64347D271DE22754, 0x26C49CCCB40811C7,
+    0x5CBD6CC0CC10FAFC, 0x1E4D8D2B65FACC6F, 0xD95CAF179FC497DA, 0x9BAC4EFC362EA149,
+    0x158E0A85C2521623, 0x577EEB6E6BB820B0, 0x906FC95291867B05, 0xD29F28B9386C4D96,
+    0xCEDBA04AD0952342, 0x8C2B41A1797F15D1, 0x4B3A639D83414E64, 0x09CA82762AAB78F7,
+    0x87E8C60FDED7CF9D, 0xC51827E4773DF90E, 0x020905D88D03A2BB, 0x40F9E43324E99428,
+    0x2CFFE7D5975E55E2, 0x6E0F063E3EB46371, 0xA91E2402C48A38C4, 0xEBEEC5E96D600E57,
+    0x65CC8190991CB93D, 0x273C607B30F68FAE, 0xE02D4247CAC8D41B, 0xA2DDA3AC6322E288,
+    0xBE992B5F8BDB8C5C, 0xFC69CAB42231BACF, 0x3B78E888D80FE17A, 0x7988096371E5D7E9,
+    0xF7AA4D1A85996083, 0xB55AACF12C735610, 0x724B8ECDD64D0DA5, 0x30BB6F267FA73B36,
+    0x4AC29F2A07BFD00D, 0x08327EC1AE55E69E, 0xCF235CFD546BBD2B, 0x8DD3BD16FD818BB8,
+    0x03F1F96F09FD3CD2, 0x41011884A0170A41, 0x86103AB85A2951F4, 0xC4E0DB53F3C36767,
+    0xD8A453A01B3A09B3, 0x9A54B24BB2D03F20, 0x5D45907748EE6495, 0x1FB5719CE1045206,
+    0x919735E51578E56C, 0xD367D40EBC92D3FF, 0x1476F63246AC884A, 0x568617D9EF46BED9,
+    0xE085162AB69D5E3C, 0xA275F7C11F7768AF, 0x6564D5FDE549331A, 0x279434164CA30589,
+    0xA9B6706FB8DFB2E3, 0xEB46918411358470, 0x2C57B3B8EB0BDFC5, 0x6EA7525342E1E956,
+    0x72E3DAA0AA188782, 0x30133B4B03F2B111, 0xF7021977F9CCEAA4, 0xB5F2F89C5026DC37,
+    0x3BD0BCE5A45A6B5D, 0x79205D0E0DB05DCE, 0xBE317F32F78E067B, 0xFCC19ED95E6430E8,
+    0x86B86ED5267CDBD3, 0xC4488F3E8F96ED40, 0x0359AD0275A8B6F5, 0x41A94CE9DC428066,
+    0xCF8B0890283E370C, 0x8D7BE97B81D4019F, 0x4A6ACB477BEA5A2A, 0x089A2AACD2006CB9,
+    0x14DEA25F3AF9026D, 0x562E43B4931334FE, 0x913F6188692D6F4B, 0xD3CF8063C0C759D8,
+    0x5DEDC41A34BBEEB2, 0x1F1D25F19D51D821, 0xD80C07CD676F8394, 0x9AFCE626CE85B507
 };
 
-void crc64 (const uint8_t *data, const size_t len, uint64_t *crc) {
+void crc64(const uint8_t *data, const size_t len, uint64_t *crc)
+{
 
     for (size_t i = 0; i < len; i++) {
         uint8_t tableIndex = (((uint8_t)(*crc >> 56)) ^ data[i]) & 0xff;
diff --git a/common/crc64.h b/common/crc64.h
index e28fba144..3782bdbae 100644
--- a/common/crc64.h
+++ b/common/crc64.h
@@ -9,6 +9,6 @@
 #ifndef __CRC64_H
 #define __CRC64_H
 
-void crc64 (const uint8_t *data, const size_t len, uint64_t *crc) ;
+void crc64(const uint8_t *data, const size_t len, uint64_t *crc) ;
 
 #endif
diff --git a/common/default_version.c b/common/default_version.c
index af5bc59e2..b586e4ad1 100644
--- a/common/default_version.c
+++ b/common/default_version.c
@@ -1,9 +1,9 @@
 #include "proxmark3.h"
 /* This is the default version.c file that Makefile.common falls back to if perl is not available */
 const struct version_information __attribute__((section(".version_information"))) version_information = {
-        VERSION_INFORMATION_MAGIC,
-        1, /* version 1 */
-        0, /* version information not present */
-        2, /* cleanliness couldn't be determined */
-        /* Remaining fields: zero */
+    VERSION_INFORMATION_MAGIC,
+    1, /* version 1 */
+    0, /* version information not present */
+    2, /* cleanliness couldn't be determined */
+    /* Remaining fields: zero */
 };
diff --git a/common/emvtags.h b/common/emvtags.h
index 72cd34ccb..9315258fc 100644
--- a/common/emvtags.h
+++ b/common/emvtags.h
@@ -32,10 +32,10 @@ typedef struct {
     uint8_t TA1;
     uint8_t TB1;
     uint8_t TC1;
-    uint8_t* historicalbytes;
+    uint8_t *historicalbytes;
     //PPS response
     uint8_t PPSS;
-        //SFI 2 record 1
+    //SFI 2 record 1
     uint8_t tag_4F_len; //length of AID
     uint8_t tag_4F[16]; //Application Identifier (AID)
     uint8_t tag_50_len; //length of application label
@@ -244,6 +244,6 @@ typedef struct {
     uint8_t tag_BF0C[222]; //File Control Information (FCI) Issuer Discretionary Data
     uint8_t tag_DFName[16];
     uint8_t tag_DFName_len;
-}emvtags;
+} emvtags;
 
 #endif //__EMVCARD_H
diff --git a/common/fpga.h b/common/fpga.h
index b99a75935..eb26d0ccb 100644
--- a/common/fpga.h
+++ b/common/fpga.h
@@ -13,6 +13,6 @@
 
 static const uint8_t bitparse_fixed_header[] = {0x00, 0x09, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x00, 0x00, 0x01};
 extern const int fpga_bitstream_num;
-extern const char* const fpga_version_information[];
+extern const char *const fpga_version_information[];
 
 #endif
diff --git a/common/i2c.c b/common/i2c.c
index 041b3e7ec..344d5d9ee 100644
--- a/common/i2c.c
+++ b/common/i2c.c
@@ -30,7 +30,8 @@ volatile unsigned long c;
 // timer.
 // I2CSpinDelayClk(4) = 12.31us
 // I2CSpinDelayClk(1) = 3.07us
-void __attribute__((optimize("O0"))) I2CSpinDelayClk(uint16_t delay) {
+void __attribute__((optimize("O0"))) I2CSpinDelayClk(uint16_t delay)
+{
     for (c = delay * 2; c; c--) {};
 }
 
@@ -41,23 +42,30 @@ void __attribute__((optimize("O0"))) I2CSpinDelayClk(uint16_t delay) {
 #define  ISO7618_MAX_FRAME 255
 
 // try i2c bus recovery at 100kHz = 5uS high, 5uS low
-void I2C_recovery(void) {
+void I2C_recovery(void)
+{
 
     DbpString("Performing i2c bus recovery");
 
     // reset I2C
-    SDA_H; SCL_H;
+    SDA_H;
+    SCL_H;
 
-     //9nth cycle acts as NACK
+    //9nth cycle acts as NACK
     for (int i = 0; i < 10; i++)  {
-        SCL_H; WaitUS(5);
-        SCL_L; WaitUS(5);
+        SCL_H;
+        WaitUS(5);
+        SCL_L;
+        WaitUS(5);
     }
 
     //a STOP signal (SDA from low to high while CLK is high)
-    SDA_L; WaitUS(5);
-    SCL_H; WaitUS(2);
-    SDA_H; WaitUS(2);
+    SDA_L;
+    WaitUS(5);
+    SCL_H;
+    WaitUS(2);
+    SDA_H;
+    WaitUS(2);
 
     bool isok = (SCL_read && SDA_read);
     if (!SDA_read)
@@ -68,7 +76,8 @@ void I2C_recovery(void) {
         DbpString("I2C bus recovery complete");
 }
 
-void I2C_init(void) {
+void I2C_init(void)
+{
     // Configure reset pin, close up pull up, push-pull output, default high
     AT91C_BASE_PIOA->PIO_PPUDR = GPIO_RST;
     AT91C_BASE_PIOA->PIO_MDDR = GPIO_RST;
@@ -84,14 +93,15 @@ void I2C_init(void) {
     AT91C_BASE_PIOA->PIO_PER |= (GPIO_SCL | GPIO_SDA | GPIO_RST);
 
 
-    bool isok =  (SCL_read && SDA_read);
-    if ( !isok )
+    bool isok = (SCL_read && SDA_read);
+    if (!isok)
         I2C_recovery();
 
 }
 
 // set the reset state
-void I2C_SetResetStatus(uint8_t LineRST, uint8_t LineSCK, uint8_t LineSDA) {
+void I2C_SetResetStatus(uint8_t LineRST, uint8_t LineSCK, uint8_t LineSDA)
+{
     if (LineRST)
         HIGH(GPIO_RST);
     else
@@ -110,7 +120,8 @@ void I2C_SetResetStatus(uint8_t LineRST, uint8_t LineSCK, uint8_t LineSDA) {
 
 // Reset the SIM_Adapter, then  enter the main program
 // Note: the SIM_Adapter will not enter the main program after power up. Please run this function before use SIM_Adapter.
-void I2C_Reset_EnterMainProgram(void) {
+void I2C_Reset_EnterMainProgram(void)
+{
     StartTicks();
     I2C_init();
     I2C_SetResetStatus(0, 0, 0);
@@ -123,7 +134,8 @@ void I2C_Reset_EnterMainProgram(void) {
 
 // Reset the SIM_Adapter, then enter the bootloader program
 // Reserve for firmware update.
-void I2C_Reset_EnterBootloader(void) {
+void I2C_Reset_EnterBootloader(void)
+{
     StartTicks();
     I2C_init();
     I2C_SetResetStatus(0, 1, 1);
@@ -133,7 +145,8 @@ void I2C_Reset_EnterBootloader(void) {
 }
 
 // Wait for the clock to go High.
-bool WaitSCL_H_delay(uint32_t delay) {
+bool WaitSCL_H_delay(uint32_t delay)
+{
     while (delay--) {
         if (SCL_read) {
             return true;
@@ -145,11 +158,13 @@ bool WaitSCL_H_delay(uint32_t delay) {
 
 // 5000 * 3.07us = 15350us. 15.35ms
 // 15000 * 3.07us = 46050us. 46.05ms
-bool WaitSCL_H(void) {
+bool WaitSCL_H(void)
+{
     return WaitSCL_H_delay(15000);
 }
 
-bool WaitSCL_L_delay(uint32_t delay) {
+bool WaitSCL_L_delay(uint32_t delay)
+{
     while (delay--) {
         if (!SCL_read) {
             return true;
@@ -159,16 +174,18 @@ bool WaitSCL_L_delay(uint32_t delay) {
     return false;
 }
 // 5000 * 3.07us = 15350us. 15.35ms
-bool WaitSCL_L(void) {
+bool WaitSCL_L(void)
+{
     return WaitSCL_L_delay(15000);
 }
 
 // Wait max 1800ms or until SCL goes LOW.
 // It timeout reading response from card
 // Which ever comes first
-bool WaitSCL_L_timeout(void){
+bool WaitSCL_L_timeout(void)
+{
     volatile uint16_t delay = 1800;
-    while ( delay-- ) {
+    while (delay--) {
         // exit on SCL LOW
         if (!SCL_read)
             return true;
@@ -178,10 +195,12 @@ bool WaitSCL_L_timeout(void){
     return (delay == 0);
 }
 
-bool I2C_Start(void) {
+bool I2C_Start(void)
+{
 
     I2C_DELAY_XCLK(4);
-    SDA_H; I2C_DELAY_1CLK;
+    SDA_H;
+    I2C_DELAY_1CLK;
     SCL_H;
     if (!WaitSCL_H()) return false;
 
@@ -190,11 +209,13 @@ bool I2C_Start(void) {
     if (!SCL_read) return false;
     if (!SDA_read) return false;
 
-    SDA_L; I2C_DELAY_2CLK;
+    SDA_L;
+    I2C_DELAY_2CLK;
     return true;
 }
 
-bool I2C_WaitForSim() {
+bool I2C_WaitForSim()
+{
 
     // wait for data from card
     if (!WaitSCL_L_timeout())
@@ -203,43 +224,60 @@ bool I2C_WaitForSim() {
     // 8051 speaks with smart card.
     // 1000*50*3.07 = 153.5ms
     // 1byte transfer == 1ms  with max frame being 256bytes
-    if (!WaitSCL_H_delay(10 * 1000 * 50) )
+    if (!WaitSCL_H_delay(10 * 1000 * 50))
         return false;
 
     return true;
 }
 
 // send i2c STOP
-void I2C_Stop(void) {
-    SCL_L; I2C_DELAY_2CLK;
-    SDA_L; I2C_DELAY_2CLK;
-    SCL_H; I2C_DELAY_2CLK;
+void I2C_Stop(void)
+{
+    SCL_L;
+    I2C_DELAY_2CLK;
+    SDA_L;
+    I2C_DELAY_2CLK;
+    SCL_H;
+    I2C_DELAY_2CLK;
     if (!WaitSCL_H()) return;
     SDA_H;
     I2C_DELAY_XCLK(8);
 }
 
 // Send i2c ACK
-void I2C_Ack(void) {
-    SCL_L; I2C_DELAY_2CLK;
-    SDA_L; I2C_DELAY_2CLK;
-    SCL_H; I2C_DELAY_2CLK;
+void I2C_Ack(void)
+{
+    SCL_L;
+    I2C_DELAY_2CLK;
+    SDA_L;
+    I2C_DELAY_2CLK;
+    SCL_H;
+    I2C_DELAY_2CLK;
     if (!WaitSCL_H()) return;
-    SCL_L; I2C_DELAY_2CLK;
+    SCL_L;
+    I2C_DELAY_2CLK;
 }
 
 // Send i2c NACK
-void I2C_NoAck(void) {
-    SCL_L; I2C_DELAY_2CLK;
-    SDA_H; I2C_DELAY_2CLK;
-    SCL_H; I2C_DELAY_2CLK;
+void I2C_NoAck(void)
+{
+    SCL_L;
+    I2C_DELAY_2CLK;
+    SDA_H;
+    I2C_DELAY_2CLK;
+    SCL_H;
+    I2C_DELAY_2CLK;
     if (!WaitSCL_H()) return;
-    SCL_L; I2C_DELAY_2CLK;
+    SCL_L;
+    I2C_DELAY_2CLK;
 }
 
-bool I2C_WaitAck(void) {
-    SCL_L; I2C_DELAY_1CLK;
-    SDA_H; I2C_DELAY_1CLK;
+bool I2C_WaitAck(void)
+{
+    SCL_L;
+    I2C_DELAY_1CLK;
+    SDA_H;
+    I2C_DELAY_1CLK;
     SCL_H;
     if (!WaitSCL_H())
         return false;
@@ -254,7 +292,8 @@ bool I2C_WaitAck(void) {
     return true;
 }
 
-void I2C_SendByte(uint8_t data) {
+void I2C_SendByte(uint8_t data)
+{
     uint8_t bits = 8;
 
     while (bits--) {
@@ -280,7 +319,8 @@ void I2C_SendByte(uint8_t data) {
     SCL_L;
 }
 
-int16_t I2C_ReadByte(void) {
+int16_t I2C_ReadByte(void)
+{
     uint8_t bits = 8, b = 0;
 
     SDA_H;
@@ -303,7 +343,8 @@ int16_t I2C_ReadByte(void) {
 }
 
 // Sends one byte  ( command to be written, SlaveDevice address)
-bool I2C_WriteCmd(uint8_t device_cmd, uint8_t device_address) {
+bool I2C_WriteCmd(uint8_t device_cmd, uint8_t device_address)
+{
     bool bBreak = true;
     do {
         if (!I2C_Start())
@@ -322,14 +363,15 @@ bool I2C_WriteCmd(uint8_t device_cmd, uint8_t device_address) {
 
     I2C_Stop();
     if (bBreak) {
-        if ( MF_DBGLEVEL > 3 ) DbpString(I2C_ERROR);
+        if (MF_DBGLEVEL > 3) DbpString(I2C_ERROR);
         return false;
     }
     return true;
 }
 
 // Sends 1 byte data (Data to be written, command to be written , SlaveDevice address  ).
-bool I2C_WriteByte(uint8_t data, uint8_t device_cmd, uint8_t device_address) {
+bool I2C_WriteByte(uint8_t data, uint8_t device_cmd, uint8_t device_address)
+{
     bool bBreak = true;
     do {
         if (!I2C_Start())
@@ -352,7 +394,7 @@ bool I2C_WriteByte(uint8_t data, uint8_t device_cmd, uint8_t device_address) {
 
     I2C_Stop();
     if (bBreak) {
-        if ( MF_DBGLEVEL > 3 ) DbpString(I2C_ERROR);
+        if (MF_DBGLEVEL > 3) DbpString(I2C_ERROR);
         return false;
     }
     return true;
@@ -360,7 +402,8 @@ bool I2C_WriteByte(uint8_t data, uint8_t device_cmd, uint8_t device_address) {
 
 //Sends array of data (Array, length, command to be written , SlaveDevice address  ).
 // len = uint8 (max buffer to write 256bytes)
-bool I2C_BufferWrite(uint8_t *data, uint8_t len, uint8_t device_cmd, uint8_t device_address) {
+bool I2C_BufferWrite(uint8_t *data, uint8_t len, uint8_t device_cmd, uint8_t device_address)
+{
     bool bBreak = true;
     do {
         if (!I2C_Start())
@@ -390,7 +433,7 @@ bool I2C_BufferWrite(uint8_t *data, uint8_t len, uint8_t device_cmd, uint8_t dev
 
     I2C_Stop();
     if (bBreak) {
-        if ( MF_DBGLEVEL > 3 ) DbpString(I2C_ERROR);
+        if (MF_DBGLEVEL > 3) DbpString(I2C_ERROR);
         return false;
     }
     return true;
@@ -398,9 +441,10 @@ bool I2C_BufferWrite(uint8_t *data, uint8_t len, uint8_t device_cmd, uint8_t dev
 
 // read one array of data (Data array, Readout length, command to be written , SlaveDevice address  ).
 // len = uint8 (max buffer to read 256bytes)
-int16_t I2C_BufferRead(uint8_t *data, uint8_t len, uint8_t device_cmd, uint8_t device_address) {
+int16_t I2C_BufferRead(uint8_t *data, uint8_t len, uint8_t device_cmd, uint8_t device_address)
+{
 
-    if ( !data || len == 0 )
+    if (!data || len == 0)
         return 0;
 
     // extra wait  500us (514us measured)
@@ -433,14 +477,14 @@ int16_t I2C_BufferRead(uint8_t *data, uint8_t len, uint8_t device_cmd, uint8_t d
 
     if (bBreak) {
         I2C_Stop();
-        if ( MF_DBGLEVEL > 3 ) DbpString(I2C_ERROR);
+        if (MF_DBGLEVEL > 3) DbpString(I2C_ERROR);
         return 0;
     }
 
     while (len) {
 
         int16_t tmp = I2C_ReadByte();
-        if ( tmp < 0 )
+        if (tmp < 0)
             return tmp;
 
         *data = (uint8_t)tmp & 0xFF;
@@ -469,7 +513,8 @@ int16_t I2C_BufferRead(uint8_t *data, uint8_t len, uint8_t device_cmd, uint8_t d
     return --readcount;
 }
 
-int16_t I2C_ReadFW(uint8_t *data, uint8_t len, uint8_t msb, uint8_t lsb, uint8_t device_address) {
+int16_t I2C_ReadFW(uint8_t *data, uint8_t len, uint8_t msb, uint8_t lsb, uint8_t device_address)
+{
     //START, 0xB0, 0x00, 0x00, START, 0xB1, xx, yy, zz, ......, STOP
     bool bBreak = true;
     uint8_t readcount = 0;
@@ -503,7 +548,7 @@ int16_t I2C_ReadFW(uint8_t *data, uint8_t len, uint8_t msb, uint8_t lsb, uint8_t
 
     if (bBreak) {
         I2C_Stop();
-        if ( MF_DBGLEVEL > 3 ) DbpString(I2C_ERROR);
+        if (MF_DBGLEVEL > 3) DbpString(I2C_ERROR);
         return 0;
     }
 
@@ -511,7 +556,7 @@ int16_t I2C_ReadFW(uint8_t *data, uint8_t len, uint8_t msb, uint8_t lsb, uint8_t
     while (len) {
 
         int16_t tmp = I2C_ReadByte();
-        if ( tmp < 0 )
+        if (tmp < 0)
             return tmp;
 
         *data = (uint8_t)tmp & 0xFF;
@@ -531,7 +576,8 @@ int16_t I2C_ReadFW(uint8_t *data, uint8_t len, uint8_t msb, uint8_t lsb, uint8_t
     return readcount;
 }
 
-bool I2C_WriteFW(uint8_t *data, uint8_t len, uint8_t msb, uint8_t lsb, uint8_t device_address) {
+bool I2C_WriteFW(uint8_t *data, uint8_t len, uint8_t msb, uint8_t lsb, uint8_t device_address)
+{
     //START, 0xB0, 0x00, 0x00, xx, yy, zz, ......, STOP
     bool bBreak = true;
 
@@ -567,25 +613,27 @@ bool I2C_WriteFW(uint8_t *data, uint8_t len, uint8_t msb, uint8_t lsb, uint8_t d
 
     I2C_Stop();
     if (bBreak) {
-        if ( MF_DBGLEVEL > 3 ) DbpString(I2C_ERROR);
+        if (MF_DBGLEVEL > 3) DbpString(I2C_ERROR);
         return false;
     }
     return true;
 }
 
-void I2C_print_status(void) {
+void I2C_print_status(void)
+{
     DbpString("Smart card module (ISO 7816)");
-    uint8_t resp[] = {0,0,0,0};
+    uint8_t resp[] = {0, 0, 0, 0};
     I2C_Reset_EnterMainProgram();
     uint8_t len = I2C_BufferRead(resp, sizeof(resp), I2C_DEVICE_CMD_GETVERSION, I2C_DEVICE_ADDRESS_MAIN);
-    if ( len > 0 )
+    if (len > 0)
         Dbprintf("  version.................v%x.%02d", resp[0], resp[1]);
     else
         DbpString("  version.................FAILED");
 }
 
 // Will read response from smart card module,  retries 3 times to get the data.
-bool sc_rx_bytes(uint8_t* dest, uint8_t *destlen) {
+bool sc_rx_bytes(uint8_t *dest, uint8_t *destlen)
+{
 
     uint8_t i = 3;
     int16_t len = 0;
@@ -595,26 +643,27 @@ bool sc_rx_bytes(uint8_t* dest, uint8_t *destlen) {
 
         len = I2C_BufferRead(dest, *destlen, I2C_DEVICE_CMD_READ, I2C_DEVICE_ADDRESS_MAIN);
 
-        if ( len > 1 ){
+        if (len > 1) {
             break;
-        } else if ( len == 1 ) {
+        } else if (len == 1) {
             continue;
-        } else if ( len <= 0 ) {
+        } else if (len <= 0) {
             return false;
         }
     }
 
     // after three
-    if ( len <= 1 )
+    if (len <= 1)
         return false;
 
     *destlen = (uint8_t)len & 0xFF;
     return true;
 }
 
-bool GetATR(smart_card_atr_t *card_ptr) {
+bool GetATR(smart_card_atr_t *card_ptr)
+{
 
-    if ( !card_ptr )
+    if (!card_ptr)
         return false;
 
     card_ptr->atr_len = 0;
@@ -632,29 +681,29 @@ bool GetATR(smart_card_atr_t *card_ptr) {
 
     // read bytes from module
     uint8_t len = sizeof(card_ptr->atr);
-    if ( !sc_rx_bytes(card_ptr->atr, &len) )
+    if (!sc_rx_bytes(card_ptr->atr, &len))
         return false;
 
     uint8_t pos_td = 1;
-    if ( (card_ptr->atr[1] & 0x10) == 0x10) pos_td++;
-    if ( (card_ptr->atr[1] & 0x20) == 0x20) pos_td++;
-    if ( (card_ptr->atr[1] & 0x40) == 0x40) pos_td++;
+    if ((card_ptr->atr[1] & 0x10) == 0x10) pos_td++;
+    if ((card_ptr->atr[1] & 0x20) == 0x20) pos_td++;
+    if ((card_ptr->atr[1] & 0x40) == 0x40) pos_td++;
 
     // T0 indicate presence T=0 vs T=1.  T=1 has checksum TCK
-    if ( (card_ptr->atr[1] & 0x80) == 0x80) {
+    if ((card_ptr->atr[1] & 0x80) == 0x80) {
 
         pos_td++;
 
         // 1 == T1 ,  presence of checksum TCK
-        if ( (card_ptr->atr[pos_td] & 0x01) == 0x01) {
+        if ((card_ptr->atr[pos_td] & 0x01) == 0x01) {
 
             uint8_t chksum = 0;
             // xor property.  will be zero when xored with chksum.
             for (uint8_t i = 1; i < len; ++i)
                 chksum ^= card_ptr->atr[i];
 
-            if ( chksum ) {
-                if ( MF_DBGLEVEL > 2) DbpString("Wrong ATR checksum");
+            if (chksum) {
+                if (MF_DBGLEVEL > 2) DbpString("Wrong ATR checksum");
             }
         }
     }
@@ -664,19 +713,21 @@ bool GetATR(smart_card_atr_t *card_ptr) {
     return true;
 }
 
-void SmartCardAtr(void) {
+void SmartCardAtr(void)
+{
     smart_card_atr_t card;
     LED_D_ON();
     clear_trace();
     set_tracing(true);
     I2C_Reset_EnterMainProgram();
-    bool isOK = GetATR( &card );
+    bool isOK = GetATR(&card);
     cmd_send(CMD_ACK, isOK, sizeof(smart_card_atr_t), 0, &card, sizeof(smart_card_atr_t));
     set_tracing(false);
     LEDsoff();
 }
 
-void SmartCardRaw( uint64_t arg0, uint64_t arg1, uint8_t *data ) {
+void SmartCardRaw(uint64_t arg0, uint64_t arg1, uint8_t *data)
+{
 
     LED_D_ON();
 
@@ -695,9 +746,9 @@ void SmartCardRaw( uint64_t arg0, uint64_t arg1, uint8_t *data ) {
 
         if ((flags & SC_SELECT)) {
             smart_card_atr_t card;
-            bool gotATR = GetATR( &card );
+            bool gotATR = GetATR(&card);
             //cmd_send(CMD_ACK, gotATR, sizeof(smart_card_atr_t), 0, &card, sizeof(smart_card_atr_t));
-            if ( !gotATR )
+            if (!gotATR)
                 goto OUT;
         }
     }
@@ -710,12 +761,12 @@ void SmartCardRaw( uint64_t arg0, uint64_t arg1, uint8_t *data ) {
         // asBytes = A0 A4 00 00 02
         // arg1 = len 5
         bool res = I2C_BufferWrite(data, arg1, ((flags & SC_RAW_T0) ? I2C_DEVICE_CMD_SEND_T0 : I2C_DEVICE_CMD_SEND), I2C_DEVICE_ADDRESS_MAIN);
-        if ( !res && MF_DBGLEVEL > 3 ) DbpString(I2C_ERROR);
+        if (!res && MF_DBGLEVEL > 3) DbpString(I2C_ERROR);
 
         // read bytes from module
         len = ISO7618_MAX_FRAME;
         res = sc_rx_bytes(resp, &len);
-        if ( res ) {
+        if (res) {
             LogTrace(resp, len, 0, 0, NULL, false);
         } else {
             len = 0;
@@ -728,11 +779,12 @@ OUT:
     LEDsoff();
 }
 
-void SmartCardUpgrade(uint64_t arg0) {
+void SmartCardUpgrade(uint64_t arg0)
+{
 
     LED_C_ON();
 
-    #define I2C_BLOCK_SIZE 128
+#define I2C_BLOCK_SIZE 128
     // write.   Sector0,  with 11,22,33,44
     // erase is 128bytes, and takes 50ms to execute
 
@@ -755,8 +807,8 @@ void SmartCardUpgrade(uint64_t arg0) {
         size_t size = MIN(I2C_BLOCK_SIZE, length);
 
         // write
-        res = I2C_WriteFW(fwdata+pos, size, msb, lsb, I2C_DEVICE_ADDRESS_BOOT);
-        if ( !res ) {
+        res = I2C_WriteFW(fwdata + pos, size, msb, lsb, I2C_DEVICE_ADDRESS_BOOT);
+        if (!res) {
             DbpString("Writing failed");
             isOK = false;
             break;
@@ -767,14 +819,14 @@ void SmartCardUpgrade(uint64_t arg0) {
 
         // read
         res = I2C_ReadFW(verfiydata, size, msb, lsb, I2C_DEVICE_ADDRESS_BOOT);
-        if ( res <= 0) {
+        if (res <= 0) {
             DbpString("Reading back failed");
             isOK = false;
             break;
         }
 
         // cmp
-        if ( 0 != memcmp(fwdata+pos, verfiydata, size)) {
+        if (0 != memcmp(fwdata + pos, verfiydata, size)) {
             DbpString("not equal data");
             isOK = false;
             break;
@@ -788,10 +840,12 @@ void SmartCardUpgrade(uint64_t arg0) {
     BigBuf_free();
 }
 
-void SmartCardSetBaud(uint64_t arg0) {
+void SmartCardSetBaud(uint64_t arg0)
+{
 }
 
-void SmartCardSetClock(uint64_t arg0) {
+void SmartCardSetClock(uint64_t arg0)
+{
     LED_D_ON();
     set_tracing(true);
     I2C_Reset_EnterMainProgram();
diff --git a/common/iso14443crc.c b/common/iso14443crc.c
index 891eb9b14..63fa5459b 100644
--- a/common/iso14443crc.c
+++ b/common/iso14443crc.c
@@ -9,7 +9,8 @@
 #include "iso14443crc.h"
 
 
-uint16_t UpdateCrc14443(uint8_t b, uint16_t *crc) {
+uint16_t UpdateCrc14443(uint8_t b, uint16_t *crc)
+{
     b = (b ^ (uint8_t)((*crc) & 0x00FF));
     b = (b ^ (b << 4));
     *crc = (*crc >> 8) ^ ((uint16_t) b << 8) ^ ((uint16_t) b << 3) ^ ((uint16_t) b >> 4);
@@ -30,12 +31,13 @@ void ComputeCrc14443(uint16_t CrcType, const uint8_t *data, int length,
     if (CrcType == CRC_14443_B)
         crc = ~crc;                /* ISO/IEC 13239 (formerly ISO/IEC 3309) */
 
-    *TransmitFirst = (uint8_t) (crc & 0xFF);
+    *TransmitFirst = (uint8_t)(crc & 0xFF);
     *TransmitSecond = (uint8_t)((crc >> 8) & 0xFF);
     return;
 }
 
-bool CheckCrc14443(uint16_t CrcType, const uint8_t *data, int length) {
+bool CheckCrc14443(uint16_t CrcType, const uint8_t *data, int length)
+{
     if (length < 3) return false;
     uint8_t b1, b2;
     ComputeCrc14443(CrcType, data, length - 2, &b1, &b2);
diff --git a/common/iso15693tools.c b/common/iso15693tools.c
index e821feb1f..2da2b236f 100644
--- a/common/iso15693tools.c
+++ b/common/iso15693tools.c
@@ -12,14 +12,15 @@
 // target    char* buffer, where to put the UID, if NULL a static buffer is returned
 // uid[]     the UID in transmission order
 // return: ptr to string
-char* Iso15693sprintUID(char *target, uint8_t *uid) {
+char *Iso15693sprintUID(char *target, uint8_t *uid)
+{
 
-    static char tempbuf[2*8+1] = {0};
+    static char tempbuf[2 * 8 + 1] = {0};
     if (target == NULL)
         target = tempbuf;
     sprintf(target, "%02X %02X %02X %02X %02X %02X %02X %02X",
-                uid[7], uid[6], uid[5], uid[4],
-                uid[3], uid[2], uid[1], uid[0]
-    );
+            uid[7], uid[6], uid[5], uid[4],
+            uid[3], uid[2], uid[1], uid[0]
+           );
     return target;
 }
\ No newline at end of file
diff --git a/common/iso15693tools.h b/common/iso15693tools.h
index 1937ec84e..d7a1b2bb5 100644
--- a/common/iso15693tools.h
+++ b/common/iso15693tools.h
@@ -70,7 +70,7 @@
 #define ISO15_CMD_SYSINFO                0x2B
 #define ISO15_CMD_SECSTATUS              0x2C
 
-char* Iso15693sprintUID(char *target, uint8_t *uid);
+char *Iso15693sprintUID(char *target, uint8_t *uid);
 
 //-----------------------------------------------------------------------------
 // Map a sequence of octets (~layer 2 command) into the set of bits to feed
@@ -78,49 +78,49 @@ char* Iso15693sprintUID(char *target, uint8_t *uid);
 // Mode: highspeed && one subcarrier (ASK)
 //-----------------------------------------------------------------------------
 
-    // The sampling rate is 106.353 ksps/s, for T = 18.8 us
+// The sampling rate is 106.353 ksps/s, for T = 18.8 us
 
-    // SOF defined as
-    // 1) Unmodulated time of 56.64us
-    // 2) 24 pulses of 423.75khz
-    // 3) logic '1' (unmodulated for 18.88us followed by 8 pulses of 423.75khz)
+// SOF defined as
+// 1) Unmodulated time of 56.64us
+// 2) 24 pulses of 423.75khz
+// 3) logic '1' (unmodulated for 18.88us followed by 8 pulses of 423.75khz)
 
-    static const int Iso15693FrameSOF[] = {
+static const int Iso15693FrameSOF[] = {
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
         -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-         1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-         1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
+        1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
+        1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
         -1, -1, -1, -1,
         -1, -1, -1, -1,
-         1,  1,  1,  1,
-         1,  1,  1,  1
+        1,  1,  1,  1,
+        1,  1,  1,  1
     };
-    static const int Iso15693Logic0[] = {
-         1,  1,  1,  1,
-         1,  1,  1,  1,
+static const int Iso15693Logic0[] = {
+    1,  1,  1,  1,
+    1,  1,  1,  1,
+    -1, -1, -1, -1,
+    -1, -1, -1, -1
+};
+static const int Iso15693Logic1[] = {
+    -1, -1, -1, -1,
         -1, -1, -1, -1,
-        -1, -1, -1, -1
-    };
-    static const int Iso15693Logic1[] = {
-        -1, -1, -1, -1,
-        -1, -1, -1, -1,
-         1,  1,  1,  1,
-         1,  1,  1,  1
+        1,  1,  1,  1,
+        1,  1,  1,  1
     };
 
-    // EOF defined as
-    // 1) logic '0' (8 pulses of 423.75khz followed by unmodulated for 18.88us)
-    // 2) 24 pulses of 423.75khz
-    // 3) Unmodulated time of 56.64us
-    static const int Iso15693FrameEOF[] = {
-         1,  1,  1,  1,
-         1,  1,  1,  1,
-        -1, -1, -1, -1,
-        -1, -1, -1, -1,
-         1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-         1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
-    };
+// EOF defined as
+// 1) logic '0' (8 pulses of 423.75khz followed by unmodulated for 18.88us)
+// 2) 24 pulses of 423.75khz
+// 3) Unmodulated time of 56.64us
+static const int Iso15693FrameEOF[] = {
+    1,  1,  1,  1,
+    1,  1,  1,  1,
+    -1, -1, -1, -1,
+    -1, -1, -1, -1,
+    1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
+    1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
+};
 
 #endif
\ No newline at end of file
diff --git a/common/legic_prng.c b/common/legic_prng.c
index 75e04d8b6..96202e1a4 100644
--- a/common/legic_prng.c
+++ b/common/legic_prng.c
@@ -27,37 +27,42 @@ struct lfsr {
 // it sets b to 0 aswell to make sure we get a all zero keystream out
 // which is used in the initialisation phase sending the IV
 //
-void legic_prng_init(uint8_t iv) {
+void legic_prng_init(uint8_t iv)
+{
     lfsr.a = iv;
     lfsr.b = 0;  // hack to get a always 0 keystream
     lfsr.c = 0;
-    if(iv)
+    if (iv)
         lfsr.b = (iv << 1) | 1;
 }
 
-void legic_prng_forward(int count) {
+void legic_prng_forward(int count)
+{
     if (count == 0) return;
 
     lfsr.c += count;
-    while(count--) {
+    while (count--) {
         // According: http://www.proxmark.org/forum/viewtopic.php?pid=5437#p5437
         lfsr.a = (lfsr.a >> 1 | (lfsr.a ^ lfsr.a >> 6) << 6) & 0x7F;
         lfsr.b = lfsr.b >> 1 | (lfsr.b ^ lfsr.b >> 2 ^ lfsr.b >> 3 ^ lfsr.b >> 7) << 7;
     }
 }
 
-uint32_t legic_prng_count() {
+uint32_t legic_prng_count()
+{
     return lfsr.c;
 }
 
-uint8_t legic_prng_get_bit() {
-    uint8_t idx = 7 - ( (lfsr.a & 4) | (lfsr.a >> 2 & 2) | (lfsr.a >> 4 & 1) );
+uint8_t legic_prng_get_bit()
+{
+    uint8_t idx = 7 - ((lfsr.a & 4) | (lfsr.a >> 2 & 2) | (lfsr.a >> 4 & 1));
     return lfsr.b >> idx & 1;
 }
 
-uint32_t legic_prng_get_bits(uint8_t len){
+uint32_t legic_prng_get_bits(uint8_t len)
+{
     uint32_t a = 0;
-    for(uint8_t i = 0; i < len; ++i) {
+    for (uint8_t i = 0; i < len; ++i) {
         a |= legic_prng_get_bit() << i;
         legic_prng_forward(1);
     }
diff --git a/common/lfdemod.c b/common/lfdemod.c
index 13c2a3f9f..e86ccf9a1 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -59,16 +59,18 @@ extern void Dbprintf(const char *fmt, ...);
 # include "cmddata.h"
 # define prnt PrintAndLog
 #else
-  uint8_t g_debugMode = 0;
+uint8_t g_debugMode = 0;
 # define prnt Dbprintf
 #endif
 
 signal_t signalprop = { 255, -255, 0, 0, true };
-signal_t* getSignalProperties(void) {
+signal_t *getSignalProperties(void)
+{
     return &signalprop;
 }
 
-static void resetSignal(void) {
+static void resetSignal(void)
+{
     signalprop.low = 255;
     signalprop.high = -255;
     signalprop.mean = 0;
@@ -76,23 +78,25 @@ static void resetSignal(void) {
     signalprop.isnoise = true;
 }
 
-static void printSignal(void) {
+static void printSignal(void)
+{
     prnt("LF signal properties:");
     prnt("  high..........%d", signalprop.high);
     prnt("  low...........%d", signalprop.low);
     prnt("  mean..........%d", signalprop.mean);
     prnt("  amplitude.....%d", signalprop.amplitude);
     prnt("  is Noise......%s", (signalprop.isnoise) ? "Yes" : "No");
-    prnt("  THRESHOLD noise amplitude......%d" , NOISE_AMPLITUDE_THRESHOLD);
+    prnt("  THRESHOLD noise amplitude......%d", NOISE_AMPLITUDE_THRESHOLD);
 }
 
-void computeSignalProperties(uint8_t *samples, uint32_t size) {
+void computeSignalProperties(uint8_t *samples, uint32_t size)
+{
     resetSignal();
 
     uint32_t sum = 0;
-    for ( uint32_t i = 0; i < size; i++) {
-        if ( samples[i] < signalprop.low ) signalprop.low = samples[i];
-        if ( samples[i] > signalprop.high ) signalprop.high = samples[i];
+    for (uint32_t i = 0; i < size; i++) {
+        if (samples[i] < signalprop.low) signalprop.low = samples[i];
+        if (samples[i] > signalprop.high) signalprop.high = samples[i];
         sum += samples[i];
     }
 
@@ -107,8 +111,9 @@ void computeSignalProperties(uint8_t *samples, uint32_t size) {
         printSignal();
 }
 
-void removeSignalOffset(uint8_t *samples, uint32_t size) {
-    if ( samples == NULL || size < SIGNAL_MIN_SAMPLES ) return;
+void removeSignalOffset(uint8_t *samples, uint32_t size)
+{
+    if (samples == NULL || size < SIGNAL_MIN_SAMPLES) return;
 
     int acc_off = 0;
     for (uint32_t i = SIGNAL_IGNORE_FIRST_SAMPLES; i < size; i++)
@@ -116,12 +121,12 @@ void removeSignalOffset(uint8_t *samples, uint32_t size) {
     acc_off /= (int)(size - SIGNAL_IGNORE_FIRST_SAMPLES);
 
     // shift and saturate samples to center the mean
-    for ( uint32_t i = 0; i < size; i++) {
+    for (uint32_t i = 0; i < size; i++) {
         if (acc_off > 0) {
-            samples[i] = (samples[i] >= acc_off)? samples[i] - acc_off : 0;
+            samples[i] = (samples[i] >= acc_off) ? samples[i] - acc_off : 0;
         }
         if (acc_off < 0) {
-            samples[i] = (255 - samples[i] >=  -acc_off)? samples[i] - acc_off : 255;
+            samples[i] = (255 - samples[i] >=  -acc_off) ? samples[i] - acc_off : 255;
         }
     }
 }
@@ -129,19 +134,20 @@ void removeSignalOffset(uint8_t *samples, uint32_t size) {
 //by marshmellow
 //get high and low values of a wave with passed in fuzz factor. also return noise test = 1 for passed or 0 for only noise
 //void getHiLo(uint8_t *bits, size_t size, int *high, int *low, uint8_t fuzzHi, uint8_t fuzzLo) {
-void getHiLo(int *high, int *low, uint8_t fuzzHi, uint8_t fuzzLo) {
+void getHiLo(int *high, int *low, uint8_t fuzzHi, uint8_t fuzzLo)
+{
     // add fuzz.
     *high = (signalprop.high * fuzzHi) / 100;
-    if ( signalprop.low < 0 ) {
+    if (signalprop.low < 0) {
         *low = (signalprop.low * fuzzLo) / 100;
     } else {
         uint8_t range = signalprop.high - signalprop.low;
 
-        *low =  signalprop.low + ((range * (100-fuzzLo))/100);
+        *low =  signalprop.low + ((range * (100 - fuzzLo)) / 100);
     }
 
     // if fuzzing to great and overlap
-    if ( *high < *low ) {
+    if (*high < *low) {
         *high = signalprop.high;
         *low =  signalprop.low;
     }
@@ -153,30 +159,38 @@ void getHiLo(int *high, int *low, uint8_t fuzzHi, uint8_t fuzzLo) {
 // by marshmellow
 // pass bits to be tested in bits, length bits passed in bitLen, and parity type (even=0 | odd=1) in pType
 // returns 1 if passed
-bool parityTest(uint32_t bits, uint8_t bitLen, uint8_t pType) {
+bool parityTest(uint32_t bits, uint8_t bitLen, uint8_t pType)
+{
     return oddparity32(bits) ^ pType;
 }
 
 //by marshmellow
 // takes a array of binary values, start position, length of bits per parity (includes parity bit - MAX 32),
 //   Parity Type (1 for odd; 0 for even; 2 for Always 1's; 3 for Always 0's), and binary Length (length to run)
-size_t removeParity(uint8_t *bits, size_t startIdx, uint8_t pLen, uint8_t pType, size_t bLen) {
+size_t removeParity(uint8_t *bits, size_t startIdx, uint8_t pLen, uint8_t pType, size_t bLen)
+{
     uint32_t parityWd = 0;
     size_t bitCnt = 0;
-    for (int word = 0; word < (bLen); word += pLen){
-        for (int bit=0; bit < pLen; bit++){
-            if (word+bit >= bLen) break;
-            parityWd = (parityWd << 1) | bits[startIdx+word+bit];
-            bits[bitCnt++] = (bits[startIdx+word+bit]);
+    for (int word = 0; word < (bLen); word += pLen) {
+        for (int bit = 0; bit < pLen; bit++) {
+            if (word + bit >= bLen) break;
+            parityWd = (parityWd << 1) | bits[startIdx + word + bit];
+            bits[bitCnt++] = (bits[startIdx + word + bit]);
         }
-        if (word+pLen > bLen) break;
+        if (word + pLen > bLen) break;
 
         bitCnt--; // overwrite parity with next data
         // if parity fails then return 0
         switch (pType) {
-            case 3: if (bits[bitCnt]==1) {return 0;} break; //should be 0 spacer bit
-            case 2: if (bits[bitCnt]==0) {return 0;} break; //should be 1 spacer bit
-            default: if (parityTest(parityWd, pLen, pType) == 0) { return 0; } break; //test parity
+            case 3:
+                if (bits[bitCnt] == 1) {return 0;}
+                break; //should be 0 spacer bit
+            case 2:
+                if (bits[bitCnt] == 0) {return 0;}
+                break; //should be 1 spacer bit
+            default:
+                if (parityTest(parityWd, pLen, pType) == 0) { return 0; }
+                break; //test parity
         }
         parityWd = 0;
     }
@@ -189,20 +203,25 @@ size_t removeParity(uint8_t *bits, size_t startIdx, uint8_t pLen, uint8_t pType,
 // takes a array of binary values, length of bits per parity (includes parity bit),
 //   Parity Type (1 for odd; 0 for even; 2 Always 1's; 3 Always 0's), and binary Length (length to run)
 //   Make sure *dest is long enough to store original sourceLen + #_of_parities_to_be_added
-size_t addParity(uint8_t *src, uint8_t *dest, uint8_t sourceLen, uint8_t pLen, uint8_t pType) {
+size_t addParity(uint8_t *src, uint8_t *dest, uint8_t sourceLen, uint8_t pLen, uint8_t pType)
+{
     uint32_t parityWd = 0;
     size_t j = 0, bitCnt = 0;
-    for (int word = 0; word < sourceLen; word += pLen-1) {
-        for (int bit=0; bit < pLen-1; bit++){
-            parityWd = (parityWd << 1) | src[word+bit];
-            dest[j++] = (src[word+bit]);
+    for (int word = 0; word < sourceLen; word += pLen - 1) {
+        for (int bit = 0; bit < pLen - 1; bit++) {
+            parityWd = (parityWd << 1) | src[word + bit];
+            dest[j++] = (src[word + bit]);
         }
         // if parity fails then return 0
         switch (pType) {
-            case 3: dest[j++]=0; break; // marker bit which should be a 0
-            case 2: dest[j++]=1; break; // marker bit which should be a 1
+            case 3:
+                dest[j++] = 0;
+                break; // marker bit which should be a 0
+            case 2:
+                dest[j++] = 1;
+                break; // marker bit which should be a 1
             default:
-                dest[j++] = parityTest(parityWd, pLen-1, pType) ^ 1;
+                dest[j++] = parityTest(parityWd, pLen - 1, pType) ^ 1;
                 break;
         }
         bitCnt += pLen;
@@ -214,18 +233,20 @@ size_t addParity(uint8_t *src, uint8_t *dest, uint8_t sourceLen, uint8_t pLen, u
 }
 
 // array must be size dividable with 8
-uint8_t bits_to_array(const uint8_t *bits, size_t size, uint8_t *dest) {
-    if ( (size == 0) || (size % 8) != 0) return 0;
+uint8_t bits_to_array(const uint8_t *bits, size_t size, uint8_t *dest)
+{
+    if ((size == 0) || (size % 8) != 0) return 0;
 
-    for(uint32_t i = 0; i < (size / 8); i++)
+    for (uint32_t i = 0; i < (size / 8); i++)
         dest[i] = bytebits_to_byte((uint8_t *) bits + (i * 8), 8);
 
     return 0;
 }
 
-uint32_t bytebits_to_byte(uint8_t *src, size_t numbits) {
+uint32_t bytebits_to_byte(uint8_t *src, size_t numbits)
+{
     uint32_t num = 0;
-    for(int i = 0 ; i < numbits ; i++) {
+    for (int i = 0 ; i < numbits ; i++) {
         num = (num << 1) | (*src);
         src++;
     }
@@ -233,17 +254,19 @@ uint32_t bytebits_to_byte(uint8_t *src, size_t numbits) {
 }
 
 //least significant bit first
-uint32_t bytebits_to_byteLSBF(uint8_t *src, size_t numbits) {
+uint32_t bytebits_to_byteLSBF(uint8_t *src, size_t numbits)
+{
     uint32_t num = 0;
-    for(int i = 0 ; i < numbits ; i++) {
-        num = (num << 1) | *(src + (numbits-(i+1)));
+    for (int i = 0 ; i < numbits ; i++) {
+        num = (num << 1) | *(src + (numbits - (i + 1)));
     }
     return num;
 }
 
 //by marshmellow
 //search for given preamble in given BitStream and return success = TRUE or fail = FALSE and startIndex and length
-bool preambleSearch(uint8_t *bits, uint8_t *preamble, size_t pLen, size_t *size, size_t *startIdx){
+bool preambleSearch(uint8_t *bits, uint8_t *preamble, size_t pLen, size_t *size, size_t *startIdx)
+{
     return preambleSearchEx(bits, preamble, pLen, size, startIdx, false);
 }
 //by marshmellow
@@ -253,19 +276,19 @@ bool preambleSearch(uint8_t *bits, uint8_t *preamble, size_t pLen, size_t *size,
 bool preambleSearchEx(uint8_t *bits, uint8_t *preamble, size_t pLen, size_t *size, size_t *startIdx, bool findone)
 {
     // Sanity check.  If preamble length is bigger than bits length.
-    if ( *size <= pLen ) return false;
+    if (*size <= pLen) return false;
 
     uint8_t foundCnt = 0;
     for (size_t idx = 0; idx < *size - pLen; idx++) {
-        if (memcmp(bits+idx, preamble, pLen) == 0){
+        if (memcmp(bits + idx, preamble, pLen) == 0) {
             //first index found
             foundCnt++;
-            if (foundCnt == 1){
+            if (foundCnt == 1) {
                 if (g_debugMode) prnt("DEBUG: (preambleSearchEx) preamble found at %i", idx);
                 *startIdx = idx;
                 if (findone) return true;
             }
-            if (foundCnt == 2){
+            if (foundCnt == 2) {
                 if (g_debugMode) prnt("DEBUG: (preambleSearchEx) preamble 2 found at %i", idx);
                 *size = idx - *startIdx;
                 return true;
@@ -276,20 +299,21 @@ bool preambleSearchEx(uint8_t *bits, uint8_t *preamble, size_t pLen, size_t *siz
 }
 
 // find start of modulating data (for fsk and psk) in case of beginning noise or slow chip startup.
-size_t findModStart(uint8_t *src, size_t size, uint8_t expWaveSize) {
+size_t findModStart(uint8_t *src, size_t size, uint8_t expWaveSize)
+{
     size_t i = 0;
     size_t waveSizeCnt = 0;
     uint8_t thresholdCnt = 0;
     bool isAboveThreshold = src[i++] >= signalprop.mean; //FSK_PSK_THRESHOLD;
-    for (; i < size-20; i++ ) {
+    for (; i < size - 20; i++) {
         if (src[i] < signalprop.mean && isAboveThreshold) {
             thresholdCnt++;
-            if (thresholdCnt > 2 && waveSizeCnt < expWaveSize+1) break;
+            if (thresholdCnt > 2 && waveSizeCnt < expWaveSize + 1) break;
             isAboveThreshold = false;
             waveSizeCnt = 0;
         } else if (src[i] >= signalprop.mean && !isAboveThreshold) {
             thresholdCnt++;
-            if (thresholdCnt > 2 && waveSizeCnt < expWaveSize+1) break;
+            if (thresholdCnt > 2 && waveSizeCnt < expWaveSize + 1) break;
             isAboveThreshold = true;
             waveSizeCnt = 0;
         } else {
@@ -301,29 +325,33 @@ size_t findModStart(uint8_t *src, size_t size, uint8_t expWaveSize) {
     return i;
 }
 
-int getClosestClock(int testclk) {
+int getClosestClock(int testclk)
+{
     uint16_t clocks[] = {8, 16, 32, 40, 50, 64, 128, 256, 384};
     uint8_t limit[]  = {1,  2,  4,  4,  5,  8,   8,   8,   8};
 
     for (uint8_t i = 0; i < 9; i++)
-        if ( testclk >= clocks[i]-limit[i] && testclk <= clocks[i]+limit[i] )
+        if (testclk >= clocks[i] - limit[i] && testclk <= clocks[i] + limit[i])
             return clocks[i];
 
     return 0;
 }
 
-void getNextLow(uint8_t *samples, size_t size, int low, size_t *i) {
+void getNextLow(uint8_t *samples, size_t size, int low, size_t *i)
+{
     while ((samples[*i] > low) && (*i < size))
         *i += 1;
 }
 
-void getNextHigh(uint8_t *samples, size_t size, int high, size_t *i) {
+void getNextHigh(uint8_t *samples, size_t size, int high, size_t *i)
+{
     while ((samples[*i] < high) && (*i < size))
         *i += 1;
 }
 
 // load wave counters
-bool loadWaveCounters(uint8_t *samples, size_t size, int lowToLowWaveLen[], int highToLowWaveLen[], int *waveCnt, int *skip, int *minClk, int *high, int *low) {
+bool loadWaveCounters(uint8_t *samples, size_t size, int lowToLowWaveLen[], int highToLowWaveLen[], int *waveCnt, int *skip, int *minClk, int *high, int *low)
+{
     size_t i = 0, firstLow, firstHigh;
     //size_t testsize = (size < 512) ? size : 512;
 
@@ -350,54 +378,56 @@ bool loadWaveCounters(uint8_t *samples, size_t size, int lowToLowWaveLen[], int
 
         getNextLow(samples, size, *low, &i);
 
-        if (*waveCnt >= (size/LOWEST_DEFAULT_CLOCK))
+        if (*waveCnt >= (size / LOWEST_DEFAULT_CLOCK))
             break;
 
         highToLowWaveLen[*waveCnt] = i - firstHigh; //first high to first low
         lowToLowWaveLen[*waveCnt] = i - firstLow;
         *waveCnt += 1;
-        if (i-firstLow < *minClk && i < size) {
+        if (i - firstLow < *minClk && i < size) {
             *minClk = i - firstLow;
         }
     }
     return true;
 }
 
-size_t pskFindFirstPhaseShift(uint8_t *samples, size_t size, uint8_t *curPhase, size_t waveStart, uint16_t fc, uint16_t *fullWaveLen) {
-    uint16_t loopCnt = (size+3 < 4096) ? size : 4096;  //don't need to loop through entire array...
+size_t pskFindFirstPhaseShift(uint8_t *samples, size_t size, uint8_t *curPhase, size_t waveStart, uint16_t fc, uint16_t *fullWaveLen)
+{
+    uint16_t loopCnt = (size + 3 < 4096) ? size : 4096; //don't need to loop through entire array...
 
-    uint16_t avgWaveVal=0, lastAvgWaveVal=0;
+    uint16_t avgWaveVal = 0, lastAvgWaveVal = 0;
     size_t i = waveStart, waveEnd, waveLenCnt, firstFullWave;
-    for (; i<loopCnt; i++) {
+    for (; i < loopCnt; i++) {
         // find peak // was "samples[i] + fc" but why?  must have been used to weed out some wave error... removed..
-        if (samples[i] < samples[i+1] && samples[i+1] >= samples[i+2]){
-            waveEnd = i+1;
+        if (samples[i] < samples[i + 1] && samples[i + 1] >= samples[i + 2]) {
+            waveEnd = i + 1;
             if (g_debugMode == 2) prnt("DEBUG PSK: waveEnd: %u, waveStart: %u", waveEnd, waveStart);
-            waveLenCnt = waveEnd-waveStart;
-            if (waveLenCnt > fc && waveStart > fc && !(waveLenCnt > fc+8)){ //not first peak and is a large wave but not out of whack
-                lastAvgWaveVal = avgWaveVal/(waveLenCnt);
+            waveLenCnt = waveEnd - waveStart;
+            if (waveLenCnt > fc && waveStart > fc && !(waveLenCnt > fc + 8)) { //not first peak and is a large wave but not out of whack
+                lastAvgWaveVal = avgWaveVal / (waveLenCnt);
                 firstFullWave = waveStart;
                 *fullWaveLen = waveLenCnt;
                 //if average wave value is > graph 0 then it is an up wave or a 1 (could cause inverting)
                 if (lastAvgWaveVal > FSK_PSK_THRESHOLD) *curPhase ^= 1;
                 return firstFullWave;
             }
-            waveStart = i+1;
+            waveStart = i + 1;
             avgWaveVal = 0;
         }
-        avgWaveVal += samples[i+2];
+        avgWaveVal += samples[i + 2];
     }
     return 0;
 }
 
 //by marshmellow
 //amplify based on ask edge detection  -  not accurate enough to use all the time
-void askAmp(uint8_t *bits, size_t size) {
+void askAmp(uint8_t *bits, size_t size)
+{
     uint8_t last = 128;
-    for(size_t i = 1; i < size; ++i){
-        if ( bits[i] - bits[i-1] >= 30) //large jump up
+    for (size_t i = 1; i < size; ++i) {
+        if (bits[i] - bits[i - 1] >= 30) //large jump up
             last = 255;
-        else if ( bits[i-1] - bits[i] >= 20) //large jump down
+        else if (bits[i - 1] - bits[i] >= 20) //large jump down
             last = 0;
 
         bits[i] = last;
@@ -405,12 +435,13 @@ void askAmp(uint8_t *bits, size_t size) {
 }
 
 // iceman, simplify this
-uint32_t manchesterEncode2Bytes(uint16_t datain) {
+uint32_t manchesterEncode2Bytes(uint16_t datain)
+{
     uint32_t output = 0;
     uint8_t curBit = 0;
     for (uint8_t i = 0; i < 16; i++) {
-        curBit = (datain >> (15-i) & 1);
-        output |= ( 1 << ( ( (15-i) * 2 ) + curBit));
+        curBit = (datain >> (15 - i) & 1);
+        output |= (1 << (((15 - i) * 2) + curBit));
     }
     return output;
 }
@@ -418,17 +449,18 @@ uint32_t manchesterEncode2Bytes(uint16_t datain) {
 //by marshmellow
 //encode binary data into binary manchester
 //NOTE: bitstream must have triple the size of "size" available in memory to do the swap
-int ManchesterEncode(uint8_t *bits, size_t size) {
+int ManchesterEncode(uint8_t *bits, size_t size)
+{
     //allow up to 4096b out (means bits must be at least 2048+4096 to handle the swap)
     size = (size > 2048) ? 2048 : size;
     size_t modIdx = size;
     size_t i;
-    for (size_t idx=0; idx < size; idx++){
-        bits[idx+modIdx++] = bits[idx];
-        bits[idx+modIdx++] = bits[idx]^1;
+    for (size_t idx = 0; idx < size; idx++) {
+        bits[idx + modIdx++] = bits[idx];
+        bits[idx + modIdx++] = bits[idx] ^ 1;
     }
-    for (i=0; i < (size*2); i++){
-        bits[i] = bits[i+size];
+    for (i = 0; i < (size * 2); i++) {
+        bits[i] = bits[i + size];
     }
     return i;
 }
@@ -436,7 +468,8 @@ int ManchesterEncode(uint8_t *bits, size_t size) {
 // by marshmellow
 // to detect a wave that has heavily clipped (clean) samples
 // loop 512 samples,   if 250 of them is deemed maxed out,  we assume the wave is clipped.
-bool DetectCleanAskWave(uint8_t *dest, size_t size, uint8_t high, uint8_t low) {
+bool DetectCleanAskWave(uint8_t *dest, size_t size, uint8_t high, uint8_t low)
+{
     bool allArePeaks = true;
     uint16_t cntPeaks = 0;
     size_t loopEnd = 512 + 160;
@@ -444,7 +477,7 @@ bool DetectCleanAskWave(uint8_t *dest, size_t size, uint8_t high, uint8_t low) {
     // sanity check
     if (loopEnd > size) loopEnd = size;
 
-    for (size_t i = 160; i < loopEnd; i++){
+    for (size_t i = 160; i < loopEnd; i++) {
 
         if (dest[i] > low && dest[i] < high)
             allArePeaks = false;
@@ -452,7 +485,7 @@ bool DetectCleanAskWave(uint8_t *dest, size_t size, uint8_t high, uint8_t low) {
             cntPeaks++;
     }
 
-    if (!allArePeaks){
+    if (!allArePeaks) {
         if (cntPeaks > 250) return true;
     }
     return allArePeaks;
@@ -467,7 +500,8 @@ bool DetectCleanAskWave(uint8_t *dest, size_t size, uint8_t high, uint8_t low) {
 // by marshmellow
 // to help detect clocks on heavily clipped samples
 // based on count of low to low
-int DetectStrongAskClock(uint8_t *dest, size_t size, int high, int low, int *clock) {
+int DetectStrongAskClock(uint8_t *dest, size_t size, int high, int low, int *clock)
+{
     size_t startwave;
     size_t i = 100;
     size_t minClk = 512;
@@ -478,7 +512,7 @@ int DetectStrongAskClock(uint8_t *dest, size_t size, int high, int low, int *clo
     getNextLow(dest, size, low, &i);
 
     // loop through all samples (well, we don't want to go out-of-bounds)
-    while (i < size-512) {
+    while (i < size - 512) {
         // measure from low to low
         startwave = i;
 
@@ -486,7 +520,7 @@ int DetectStrongAskClock(uint8_t *dest, size_t size, int high, int low, int *clo
         getNextLow(dest, size, low, &i);
 
         //get minimum measured distance
-        if (i-startwave < minClk && i < size) {
+        if (i - startwave < minClk && i < size) {
             minClk = i - startwave;
             shortestWaveIdx = startwave;
         }
@@ -506,13 +540,14 @@ int DetectStrongAskClock(uint8_t *dest, size_t size, int high, int low, int *clo
 // not perfect especially with lower clocks or VERY good antennas (heavy wave clipping)
 // maybe somehow adjust peak trimming value based on samples to fix?
 // return start index of best starting position for that clock and return clock (by reference)
-int DetectASKClock(uint8_t *dest, size_t size, int *clock, int maxErr) {
+int DetectASKClock(uint8_t *dest, size_t size, int *clock, int maxErr)
+{
 
     //don't need to loop through entire array. (cotag has clock of 384)
     uint16_t loopCnt = 1500;
 
     // not enough samples
-    if (size <= loopCnt + 60){
+    if (size <= loopCnt + 60) {
         if (g_debugMode == 2) prnt("DEBUG DetectASKClock: not enough samples - aborting");
         return -1;
     }
@@ -548,7 +583,7 @@ int DetectASKClock(uint8_t *dest, size_t size, int *clock, int maxErr) {
 
     if (!found_clk) {
 
-        if (DetectCleanAskWave(dest, size, peak_hi, peak_low)){
+        if (DetectCleanAskWave(dest, size, peak_hi, peak_low)) {
 
             int idx = DetectStrongAskClock(dest, size, peak_hi, peak_low, clock);
             if (g_debugMode == 2)
@@ -562,13 +597,13 @@ int DetectASKClock(uint8_t *dest, size_t size, int *clock, int maxErr) {
     // test for weak peaks
 
     // test clock if given as cmd parameter
-    if ( *clock > 0 )
+    if (*clock > 0)
         clk[0] = *clock;
 
     uint8_t clkCnt, tol = 0;
     size_t j = 0;
-    uint16_t bestErr[] = {1000,1000,1000,1000,1000,1000,1000,1000,1000};
-    uint8_t bestStart[] = {0,0,0,0,0,0,0,0,0};
+    uint16_t bestErr[] = {1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000};
+    uint8_t bestStart[] = {0, 0, 0, 0, 0, 0, 0, 0, 0};
     size_t errCnt = 0, arrLoc, loopEnd;
 
     if (found_clk) {
@@ -586,7 +621,7 @@ int DetectASKClock(uint8_t *dest, size_t size, int *clock, int maxErr) {
             tol = 0;
         }
         //if no errors allowed - keep start within the first clock
-        if (!maxErr && size > clk[clkCnt]*2 + tol && clk[clkCnt] < 128)
+        if (!maxErr && size > clk[clkCnt] * 2 + tol && clk[clkCnt] < 128)
             loopCnt = clk[clkCnt] * 2;
 
         bestErr[clkCnt] = 1000;
@@ -597,15 +632,15 @@ int DetectASKClock(uint8_t *dest, size_t size, int *clock, int maxErr) {
         getNextHigh(dest, size, peak_hi, &j);
         getNextLow(dest, size, peak_low, &j);
 
-        for (; j < loopCnt; j++){
+        for (; j < loopCnt; j++) {
             errCnt = 0;
             // now that we have the first one lined up test rest of wave array
-            loopEnd = ((size-j-tol) / clk[clkCnt]) - 1;
-            for (i=0; i < loopEnd; ++i){
+            loopEnd = ((size - j - tol) / clk[clkCnt]) - 1;
+            for (i = 0; i < loopEnd; ++i) {
                 arrLoc = j + (i * clk[clkCnt]);
-                if (dest[arrLoc] >= peak_hi || dest[arrLoc] <= peak_low){
-                } else if (dest[arrLoc-tol] >= peak_hi || dest[arrLoc-tol] <= peak_low){
-                } else if (dest[arrLoc+tol] >= peak_hi || dest[arrLoc+tol] <= peak_low){
+                if (dest[arrLoc] >= peak_hi || dest[arrLoc] <= peak_low) {
+                } else if (dest[arrLoc - tol] >= peak_hi || dest[arrLoc - tol] <= peak_low) {
+                } else if (dest[arrLoc + tol] >= peak_hi || dest[arrLoc + tol] <= peak_low) {
                 } else {  //error no peak detected
                     errCnt++;
                 }
@@ -628,11 +663,11 @@ int DetectASKClock(uint8_t *dest, size_t size, int *clock, int maxErr) {
 
     uint8_t k, best = 0;
 
-    for (k=1; k < num_clks; ++k){
-        if (bestErr[k] < bestErr[best]){
+    for (k = 1; k < num_clks; ++k) {
+        if (bestErr[k] < bestErr[best]) {
             if (bestErr[k] == 0) bestErr[k] = 1;
             // current best bit to error ratio     vs  new bit to error ratio
-            if ( (size/clk[best])/bestErr[best] < (size/clk[k])/bestErr[k] ){
+            if ((size / clk[best]) / bestErr[best] < (size / clk[k]) / bestErr[k]) {
                 best = k;
             }
         }
@@ -645,7 +680,8 @@ int DetectASKClock(uint8_t *dest, size_t size, int *clock, int maxErr) {
     return bestStart[best];
 }
 
-int DetectStrongNRZClk(uint8_t *dest, size_t size, int peak, int low, bool *strong) {
+int DetectStrongNRZClk(uint8_t *dest, size_t size, int peak, int low, bool *strong)
+{
     //find shortest transition from high to low
     *strong = false;
     size_t i = 0;
@@ -666,11 +702,11 @@ int DetectStrongNRZClk(uint8_t *dest, size_t size, int peak, int low, bool *stro
 
     transition1 = i;
 
-    for (;i < size; i++) {
+    for (; i < size; i++) {
         if ((dest[i] >= peak && !lastWasHigh) || (dest[i] <= low && lastWasHigh)) {
             lastWasHigh = (dest[i] >= peak);
-            if (i-transition1 < lowestTransition)
-                lowestTransition = i-transition1;
+            if (i - transition1 < lowestTransition)
+                lowestTransition = i - transition1;
             transition1 = i;
         } else if (dest[i] < peak && dest[i] > low) {
             transitionSampleCount++;
@@ -690,9 +726,10 @@ int DetectStrongNRZClk(uint8_t *dest, size_t size, int peak, int low, bool *stro
 
 //by marshmellow
 //detect nrz clock by reading #peaks vs no peaks(or errors)
-int DetectNRZClock(uint8_t *dest, size_t size, int clock, size_t *clockStartIdx) {
+int DetectNRZClock(uint8_t *dest, size_t size, int clock, size_t *clockStartIdx)
+{
     size_t i = 0;
-    uint8_t clk[] = {8,16,32,40,50,64,100,128,255};
+    uint8_t clk[] = {8, 16, 32, 40, 50, 64, 100, 128, 255};
     size_t loopCnt = 4096;  //don't need to loop through entire array...
 
     //if we already have a valid clock quit
@@ -701,7 +738,7 @@ int DetectNRZClock(uint8_t *dest, size_t size, int clock, size_t *clockStartIdx)
 
     if (size < 20) return 0;
     // size must be larger than 20 here
-    if (size < loopCnt) loopCnt = size-20;
+    if (size < loopCnt) loopCnt = size - 20;
 
 
     // just noise - no super good detection. good enough
@@ -716,19 +753,19 @@ int DetectNRZClock(uint8_t *dest, size_t size, int clock, size_t *clockStartIdx)
     getHiLo(&peak, &low, 90, 90);
 
     bool strong = false;
-    int lowestTransition = DetectStrongNRZClk(dest, size-20, peak, low, &strong);
+    int lowestTransition = DetectStrongNRZClk(dest, size - 20, peak, low, &strong);
     if (strong) return lowestTransition;
     size_t ii;
     uint8_t clkCnt;
     uint8_t tol = 0;
     uint16_t smplCnt = 0;
     int16_t peakcnt = 0;
-    int16_t peaksdet[] = {0,0,0,0,0,0,0,0};
+    int16_t peaksdet[] = {0, 0, 0, 0, 0, 0, 0, 0};
     uint16_t minPeak = 255;
     bool firstpeak = true;
     //test for large clipped waves - ignore first peak
-    for (i=0; i<loopCnt; i++){
-        if (dest[i] >= peak || dest[i] <= low){
+    for (i = 0; i < loopCnt; i++) {
+        if (dest[i] >= peak || dest[i] <= low) {
             if (firstpeak) continue;
             smplCnt++;
         } else {
@@ -736,7 +773,7 @@ int DetectNRZClock(uint8_t *dest, size_t size, int clock, size_t *clockStartIdx)
             if (smplCnt > 0) {
                 if (minPeak > smplCnt && smplCnt > 7) minPeak = smplCnt;
                 peakcnt++;
-                if (g_debugMode == 2) prnt("DEBUG NRZ: minPeak: %d, smplCnt: %d, peakcnt: %d",minPeak,smplCnt,peakcnt);
+                if (g_debugMode == 2) prnt("DEBUG NRZ: minPeak: %d, smplCnt: %d, peakcnt: %d", minPeak, smplCnt, peakcnt);
                 smplCnt = 0;
             }
         }
@@ -746,21 +783,21 @@ int DetectNRZClock(uint8_t *dest, size_t size, int clock, size_t *clockStartIdx)
     bool errBitHigh = 0, bitHigh = 0, lastPeakHigh = 0;
     uint8_t ignoreCnt = 0, ignoreWindow = 4;
     int lastBit = 0;
-    size_t bestStart[] = {0,0,0,0,0,0,0,0,0};
+    size_t bestStart[] = {0, 0, 0, 0, 0, 0, 0, 0, 0};
     peakcnt = 0;
     //test each valid clock from smallest to greatest to see which lines up
-    for (clkCnt=0; clkCnt < 8; ++clkCnt){
+    for (clkCnt = 0; clkCnt < 8; ++clkCnt) {
         //ignore clocks smaller than smallest peak
-        if (clk[clkCnt] < minPeak - (clk[clkCnt]/4)) continue;
+        if (clk[clkCnt] < minPeak - (clk[clkCnt] / 4)) continue;
         //try lining up the peaks by moving starting point (try first 256)
-        for (ii=20; ii < loopCnt; ++ii){
-            if ((dest[ii] >= peak) || (dest[ii] <= low)){
-                peakcnt=0;
+        for (ii = 20; ii < loopCnt; ++ii) {
+            if ((dest[ii] >= peak) || (dest[ii] <= low)) {
+                peakcnt = 0;
                 bitHigh = false;
                 ignoreCnt = 0;
-                lastBit = ii-clk[clkCnt];
+                lastBit = ii - clk[clkCnt];
                 //loop through to see if this start location works
-                for (i = ii; i < size-20; ++i) {
+                for (i = ii; i < size - 20; ++i) {
                     //if we are at a clock bit
                     if ((i >= lastBit + clk[clkCnt] - tol) && (i <= lastBit + clk[clkCnt] + tol)) {
                         //test high/low
@@ -777,9 +814,9 @@ int DetectNRZClock(uint8_t *dest, size_t size, int clock, size_t *clockStartIdx)
                         } else if (i == lastBit + clk[clkCnt] + tol) {
                             lastBit += clk[clkCnt];
                         }
-                    //else if not a clock bit and no peaks
-                    } else if (dest[i] < peak && dest[i] > low){
-                        if (ignoreCnt == 0){
+                        //else if not a clock bit and no peaks
+                    } else if (dest[i] < peak && dest[i] > low) {
+                        if (ignoreCnt == 0) {
                             bitHigh = false;
                             if (errBitHigh == true)
                                 peakcnt--;
@@ -802,12 +839,12 @@ int DetectNRZClock(uint8_t *dest, size_t size, int clock, size_t *clockStartIdx)
     }
 
     uint8_t best = 0;
-    for (int m = 7; m > 0; m--){
-        if ((peaksdet[m] >= (peaksdet[best]-1)) && (peaksdet[m] <= peaksdet[best]+1) && lowestTransition) {
-            if (clk[m] > (lowestTransition - (clk[m]/8)) && clk[m] < (lowestTransition + (clk[m]/8))) {
+    for (int m = 7; m > 0; m--) {
+        if ((peaksdet[m] >= (peaksdet[best] - 1)) && (peaksdet[m] <= peaksdet[best] + 1) && lowestTransition) {
+            if (clk[m] > (lowestTransition - (clk[m] / 8)) && clk[m] < (lowestTransition + (clk[m] / 8))) {
                 best = m;
             }
-        } else if (peaksdet[m] > peaksdet[best]){
+        } else if (peaksdet[m] > peaksdet[best]) {
             best = m;
         }
         if (g_debugMode == 2) prnt("DEBUG NRZ: Clk: %d, peaks: %d, minPeak: %d, bestClk: %d, lowestTrs: %d", clk[m], peaksdet[m], minPeak, clk[best], lowestTransition);
@@ -820,9 +857,10 @@ int DetectNRZClock(uint8_t *dest, size_t size, int clock, size_t *clockStartIdx)
 //countFC is to detect the field clock lengths.
 //counts and returns the 2 most common wave lengths
 //mainly used for FSK field clock detection
-uint16_t countFC(uint8_t *bits, size_t size, bool fskAdj) {
-    uint8_t fcLens[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
-    uint16_t fcCnts[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+uint16_t countFC(uint8_t *bits, size_t size, bool fskAdj)
+{
+    uint8_t fcLens[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+    uint16_t fcCnts[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
     uint8_t fcLensFnd = 0;
     uint8_t lastFCcnt = 0;
     uint8_t fcCounter = 0;
@@ -830,15 +868,15 @@ uint16_t countFC(uint8_t *bits, size_t size, bool fskAdj) {
     if (size < 180) return 0;
 
     // prime i to first up transition
-    for (i = 160; i < size-20; i++)
-        if (bits[i] > bits[i-1] && bits[i] >= bits[i+1])
+    for (i = 160; i < size - 20; i++)
+        if (bits[i] > bits[i - 1] && bits[i] >= bits[i + 1])
             break;
 
-    for (; i < size-20; i++){
-        if (bits[i] > bits[i-1] && bits[i] >= bits[i+1]){
+    for (; i < size - 20; i++) {
+        if (bits[i] > bits[i - 1] && bits[i] >= bits[i + 1]) {
             // new up transition
             fcCounter++;
-            if (fskAdj){
+            if (fskAdj) {
                 //if we had 5 and now have 9 then go back to 8 (for when we get a fc 9 instead of an 8)
                 if (lastFCcnt == 5 && fcCounter == 9) fcCounter--;
 
@@ -848,19 +886,19 @@ uint16_t countFC(uint8_t *bits, size_t size, bool fskAdj) {
                 lastFCcnt = fcCounter;
             }
             // find which fcLens to save it to:
-            for (int m=0; m<15; m++){
-                if (fcLens[m] == fcCounter){
+            for (int m = 0; m < 15; m++) {
+                if (fcLens[m] == fcCounter) {
                     fcCnts[m]++;
                     fcCounter = 0;
                     break;
                 }
             }
-            if (fcCounter>0 && fcLensFnd<15){
+            if (fcCounter > 0 && fcLensFnd < 15) {
                 //add new fc length
                 fcCnts[fcLensFnd]++;
                 fcLens[fcLensFnd++] = fcCounter;
             }
-            fcCounter=0;
+            fcCounter = 0;
         } else {
             // count sample
             fcCounter++;
@@ -870,17 +908,17 @@ uint16_t countFC(uint8_t *bits, size_t size, bool fskAdj) {
     uint8_t best1 = 14, best2 = 14, best3 = 14;
     uint16_t maxCnt1 = 0;
     // go through fclens and find which ones are bigest 2
-    for (i=0; i<15; i++){
+    for (i = 0; i < 15; i++) {
         // get the 3 best FC values
         if (fcCnts[i] > maxCnt1) {
             best3 = best2;
             best2 = best1;
             maxCnt1 = fcCnts[i];
             best1 = i;
-        } else if(fcCnts[i] > fcCnts[best2]){
+        } else if (fcCnts[i] > fcCnts[best2]) {
             best3 = best2;
             best2 = i;
-        } else if(fcCnts[i] > fcCnts[best3]){
+        } else if (fcCnts[i] > fcCnts[best3]) {
             best3 = i;
         }
         if (g_debugMode == 2) prnt("DEBUG countfc: FC %u, Cnt %u, best fc: %u, best2 fc: %u", fcLens[i], fcCnts[i], fcLens[best1], fcLens[best2]);
@@ -889,20 +927,20 @@ uint16_t countFC(uint8_t *bits, size_t size, bool fskAdj) {
 
     if (fcLens[best1] == 0) return 0;
     uint8_t fcH = 0, fcL = 0;
-    if (fcLens[best1] > fcLens[best2]){
+    if (fcLens[best1] > fcLens[best2]) {
         fcH = fcLens[best1];
         fcL = fcLens[best2];
-    } else{
+    } else {
         fcH = fcLens[best2];
         fcL = fcLens[best1];
     }
-    if ((size-180)/fcH/3 > fcCnts[best1] + fcCnts[best2]) {
-        if (g_debugMode == 2) prnt("DEBUG countfc: fc is too large: %u > %u. Not psk or fsk", (size-180)/fcH/3, fcCnts[best1] + fcCnts[best2]);
+    if ((size - 180) / fcH / 3 > fcCnts[best1] + fcCnts[best2]) {
+        if (g_debugMode == 2) prnt("DEBUG countfc: fc is too large: %u > %u. Not psk or fsk", (size - 180) / fcH / 3, fcCnts[best1] + fcCnts[best2]);
         return 0; //lots of waves not psk or fsk
     }
     // TODO: take top 3 answers and compare to known Field clocks to get top 2
 
-    uint16_t fcs = (((uint16_t)fcH)<<8) | fcL;
+    uint16_t fcs = (((uint16_t)fcH) << 8) | fcL;
     if (fskAdj) return fcs;
     return (uint16_t)fcLens[best2] << 8 | fcLens[best1];
 }
@@ -910,8 +948,9 @@ uint16_t countFC(uint8_t *bits, size_t size, bool fskAdj) {
 //by marshmellow
 //detect psk clock by reading each phase shift
 // a phase shift is determined by measuring the sample length of each wave
-int DetectPSKClock(uint8_t *dest, size_t size, int clock, size_t *firstPhaseShift, uint8_t *curPhase, uint8_t *fc) {
-    uint8_t clk[] = {255,16,32,40,50,64,100,128,255}; //255 is not a valid clock
+int DetectPSKClock(uint8_t *dest, size_t size, int clock, size_t *firstPhaseShift, uint8_t *curPhase, uint8_t *fc)
+{
+    uint8_t clk[] = {255, 16, 32, 40, 50, 64, 100, 128, 255}; //255 is not a valid clock
     uint16_t loopCnt = 4096;  //don't need to loop through entire array...
 
     //if we already have a valid clock quit
@@ -919,27 +958,27 @@ int DetectPSKClock(uint8_t *dest, size_t size, int clock, size_t *firstPhaseShif
     for (; i < 8; ++i)
         if (clk[i] == clock) return clock;
 
-    if (size < 160+20) return 0;
+    if (size < 160 + 20) return 0;
     // size must be larger than 20 here, and 160 later on.
-    if (size < loopCnt) loopCnt = size-20;
+    if (size < loopCnt) loopCnt = size - 20;
 
     uint16_t fcs = countFC(dest, size, 0);
 
     *fc = fcs & 0xFF;
 
-    if (g_debugMode == 2) prnt("DEBUG PSK: FC: %d, FC2: %d",*fc, fcs>>8);
+    if (g_debugMode == 2) prnt("DEBUG PSK: FC: %d, FC2: %d", *fc, fcs >> 8);
 
     if ((fcs >> 8) == 10 && *fc == 8) return 0;
 
     if (*fc != 2 && *fc != 4 && *fc != 8) return 0;
 
 
-    size_t waveStart=0, waveEnd=0, firstFullWave=0, lastClkBit=0;
+    size_t waveStart = 0, waveEnd = 0, firstFullWave = 0, lastClkBit = 0;
 
-    uint8_t clkCnt, tol=1;
-    uint16_t peakcnt=0, errCnt=0, waveLenCnt=0, fullWaveLen=0;
-    uint16_t bestErr[] = {1000,1000,1000,1000,1000,1000,1000,1000,1000};
-    uint16_t peaksdet[] = {0,0,0,0,0,0,0,0,0};
+    uint8_t clkCnt, tol = 1;
+    uint16_t peakcnt = 0, errCnt = 0, waveLenCnt = 0, fullWaveLen = 0;
+    uint16_t bestErr[] = {1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000};
+    uint16_t peaksdet[] = {0, 0, 0, 0, 0, 0, 0, 0, 0};
 
     //find start of modulating data in trace
     i = findModStart(dest, size, *fc);
@@ -953,41 +992,41 @@ int DetectPSKClock(uint8_t *dest, size_t size, int clock, size_t *firstPhaseShif
     }
 
     *firstPhaseShift = firstFullWave;
-    if (g_debugMode == 2) prnt("DEBUG PSK: firstFullWave: %d, waveLen: %d",firstFullWave,fullWaveLen);
+    if (g_debugMode == 2) prnt("DEBUG PSK: firstFullWave: %d, waveLen: %d", firstFullWave, fullWaveLen);
 
     //test each valid clock from greatest to smallest to see which lines up
-    for (clkCnt=7; clkCnt >= 1 ; clkCnt--){
-        tol = *fc/2;
+    for (clkCnt = 7; clkCnt >= 1 ; clkCnt--) {
+        tol = *fc / 2;
         lastClkBit = firstFullWave; //set end of wave as clock align
         waveStart = 0;
         errCnt = 0;
         peakcnt = 0;
         if (g_debugMode == 2) prnt("DEBUG PSK: clk: %d, lastClkBit: %d", clk[clkCnt], lastClkBit);
 
-        for (i = firstFullWave+fullWaveLen-1; i < loopCnt-2; i++){
+        for (i = firstFullWave + fullWaveLen - 1; i < loopCnt - 2; i++) {
             //top edge of wave = start of new wave
-            if (dest[i] < dest[i+1] && dest[i+1] >= dest[i+2]){
+            if (dest[i] < dest[i + 1] && dest[i + 1] >= dest[i + 2]) {
                 if (waveStart == 0) {
-                    waveStart = i+1;
+                    waveStart = i + 1;
                     waveLenCnt = 0;
                 } else { //waveEnd
-                    waveEnd = i+1;
-                    waveLenCnt = waveEnd-waveStart;
-                    if (waveLenCnt > *fc){
+                    waveEnd = i + 1;
+                    waveLenCnt = waveEnd - waveStart;
+                    if (waveLenCnt > *fc) {
                         //if this wave is a phase shift
-                        if (g_debugMode == 2) prnt("DEBUG PSK: phase shift at: %d, len: %d, nextClk: %d, i: %d, fc: %d", waveStart, waveLenCnt, lastClkBit + clk[clkCnt] - tol, i+1, *fc);
-                        if (i+1 >= lastClkBit + clk[clkCnt] - tol){ //should be a clock bit
+                        if (g_debugMode == 2) prnt("DEBUG PSK: phase shift at: %d, len: %d, nextClk: %d, i: %d, fc: %d", waveStart, waveLenCnt, lastClkBit + clk[clkCnt] - tol, i + 1, *fc);
+                        if (i + 1 >= lastClkBit + clk[clkCnt] - tol) { //should be a clock bit
                             peakcnt++;
                             lastClkBit += clk[clkCnt];
-                        } else if (i < lastClkBit+8){
+                        } else if (i < lastClkBit + 8) {
                             //noise after a phase shift - ignore
                         } else { //phase shift before supposed to based on clock
                             errCnt++;
                         }
-                    } else if (i+1 > lastClkBit + clk[clkCnt] + tol + *fc){
-                        lastClkBit+=clk[clkCnt]; //no phase shift but clock bit
+                    } else if (i + 1 > lastClkBit + clk[clkCnt] + tol + *fc) {
+                        lastClkBit += clk[clkCnt]; //no phase shift but clock bit
                     }
-                    waveStart = i+1;
+                    waveStart = i + 1;
                 }
             }
         }
@@ -998,66 +1037,67 @@ int DetectPSKClock(uint8_t *dest, size_t size, int clock, size_t *firstPhaseShif
     //all tested with errors
     //return the highest clk with the most peaks found
     uint8_t best = 7;
-    for (i=7; i >= 1; i--){
+    for (i = 7; i >= 1; i--) {
         if (peaksdet[i] > peaksdet[best])
             best = i;
 
-        if (g_debugMode == 2) prnt("DEBUG PSK: Clk: %d, peaks: %d, errs: %d, bestClk: %d",clk[i],peaksdet[i],bestErr[i],clk[best]);
+        if (g_debugMode == 2) prnt("DEBUG PSK: Clk: %d, peaks: %d, errs: %d, bestClk: %d", clk[i], peaksdet[i], bestErr[i], clk[best]);
     }
     return clk[best];
 }
 
 //by marshmellow
 //detects the bit clock for FSK given the high and low Field Clocks
-uint8_t detectFSKClk(uint8_t *bits, size_t size, uint8_t fcHigh, uint8_t fcLow, int *firstClockEdge) {
+uint8_t detectFSKClk(uint8_t *bits, size_t size, uint8_t fcHigh, uint8_t fcLow, int *firstClockEdge)
+{
 
     if (size == 0)
         return 0;
 
-    uint8_t clk[] = {8,16,32,40,50,64,100,128,0};
-    uint16_t rfLens[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
-    uint8_t rfCnts[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+    uint8_t clk[] = {8, 16, 32, 40, 50, 64, 100, 128, 0};
+    uint16_t rfLens[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+    uint8_t rfCnts[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
     uint8_t rfLensFnd = 0;
     uint8_t lastFCcnt = 0;
     uint16_t fcCounter = 0;
     uint16_t rfCounter = 0;
     uint8_t firstBitFnd = 0;
     size_t i;
-    uint8_t fcTol = ((fcHigh * 100 - fcLow * 100)/2 + 50)/100; //(uint8_t)(0.5+(float)(fcHigh-fcLow)/2);
+    uint8_t fcTol = ((fcHigh * 100 - fcLow * 100) / 2 + 50) / 100; //(uint8_t)(0.5+(float)(fcHigh-fcLow)/2);
 
     // prime i to first peak / up transition
-    for (i = 160; i < size-20; i++)
-        if (bits[i] > bits[i-1] && bits[i] >= bits[i+1])
+    for (i = 160; i < size - 20; i++)
+        if (bits[i] > bits[i - 1] && bits[i] >= bits[i + 1])
             break;
 
-    for (; i < size-20; i++){
+    for (; i < size - 20; i++) {
         fcCounter++;
         rfCounter++;
 
-        if (bits[i] <= bits[i-1] || bits[i] < bits[i+1])
+        if (bits[i] <= bits[i - 1] || bits[i] < bits[i + 1])
             continue;
         // else new peak
         // if we got less than the small fc + tolerance then set it to the small fc
         // if it is inbetween set it to the last counter
         if (fcCounter < fcHigh && fcCounter > fcLow)
             fcCounter = lastFCcnt;
-        else if (fcCounter < fcLow+fcTol)
+        else if (fcCounter < fcLow + fcTol)
             fcCounter = fcLow;
         else //set it to the large fc
             fcCounter = fcHigh;
 
         //look for bit clock  (rf/xx)
-        if ((fcCounter < lastFCcnt || fcCounter > lastFCcnt)){
+        if ((fcCounter < lastFCcnt || fcCounter > lastFCcnt)) {
             //not the same size as the last wave - start of new bit sequence
-            if (firstBitFnd > 1){ //skip first wave change - probably not a complete bit
-                for (int ii=0; ii<15; ii++){
-                    if (rfLens[ii] >= (rfCounter-4) && rfLens[ii] <= (rfCounter+4)){
+            if (firstBitFnd > 1) { //skip first wave change - probably not a complete bit
+                for (int ii = 0; ii < 15; ii++) {
+                    if (rfLens[ii] >= (rfCounter - 4) && rfLens[ii] <= (rfCounter + 4)) {
                         rfCnts[ii]++;
                         rfCounter = 0;
                         break;
                     }
                 }
-                if (rfCounter > 0 && rfLensFnd < 15){
+                if (rfCounter > 0 && rfLensFnd < 15) {
                     //prnt("DEBUG: rfCntr %d, fcCntr %d",rfCounter,fcCounter);
                     rfCnts[rfLensFnd]++;
                     rfLens[rfLensFnd++] = rfCounter;
@@ -1073,16 +1113,16 @@ uint8_t detectFSKClk(uint8_t *bits, size_t size, uint8_t fcHigh, uint8_t fcLow,
     }
     uint8_t rfHighest = 15, rfHighest2 = 15, rfHighest3 = 15;
 
-    for (i=0; i<15; i++){
+    for (i = 0; i < 15; i++) {
         //get highest 2 RF values  (might need to get more values to compare or compare all?)
-        if (rfCnts[i] > rfCnts[rfHighest]){
+        if (rfCnts[i] > rfCnts[rfHighest]) {
             rfHighest3 = rfHighest2;
             rfHighest2 = rfHighest;
             rfHighest = i;
-        } else if(rfCnts[i] > rfCnts[rfHighest2]){
+        } else if (rfCnts[i] > rfCnts[rfHighest2]) {
             rfHighest3 = rfHighest2;
             rfHighest2 = i;
-        } else if(rfCnts[i] > rfCnts[rfHighest3]){
+        } else if (rfCnts[i] > rfCnts[rfHighest3]) {
             rfHighest3 = i;
         }
         if (g_debugMode == 2)
@@ -1090,7 +1130,7 @@ uint8_t detectFSKClk(uint8_t *bits, size_t size, uint8_t fcHigh, uint8_t fcLow,
     }
     // set allowed clock remainder tolerance to be 1 large field clock length+1
     //   we could have mistakenly made a 9 a 10 instead of an 8 or visa versa so rfLens could be 1 FC off
-    uint8_t tol1 = fcHigh+1;
+    uint8_t tol1 = fcHigh + 1;
 
     if (g_debugMode == 2)
         prnt("DEBUG FSK: most counted rf values: 1 %d, 2 %d, 3 %d", rfLens[rfHighest], rfLens[rfHighest2], rfLens[rfHighest3]);
@@ -1099,10 +1139,10 @@ uint8_t detectFSKClk(uint8_t *bits, size_t size, uint8_t fcHigh, uint8_t fcLow,
     //   compare samples counted divided by
     // test 128 down to 32 (shouldn't be possible to have fc/10 & fc/8 and rf/16 or less)
     int m = 7;
-    for (; m >= 2; m--){
-        if (rfLens[rfHighest] % clk[m] < tol1 || rfLens[rfHighest] % clk[m] > clk[m]-tol1){
-            if (rfLens[rfHighest2] % clk[m] < tol1 || rfLens[rfHighest2] % clk[m] > clk[m]-tol1){
-                if (rfLens[rfHighest3] % clk[m] < tol1 || rfLens[rfHighest3] % clk[m] > clk[m]-tol1){
+    for (; m >= 2; m--) {
+        if (rfLens[rfHighest] % clk[m] < tol1 || rfLens[rfHighest] % clk[m] > clk[m] - tol1) {
+            if (rfLens[rfHighest2] % clk[m] < tol1 || rfLens[rfHighest2] % clk[m] > clk[m] - tol1) {
+                if (rfLens[rfHighest3] % clk[m] < tol1 || rfLens[rfHighest3] % clk[m] > clk[m] - tol1) {
                     if (g_debugMode == 2)
                         prnt("DEBUG FSK: clk %d divides into the 3 most rf values within tolerance", clk[m]);
                     break;
@@ -1123,15 +1163,16 @@ uint8_t detectFSKClk(uint8_t *bits, size_t size, uint8_t fcHigh, uint8_t fcLow,
 
 
 // look for Sequence Terminator - should be pulses of clk*(1 or 2), clk*2, clk*(1.5 or 2), by idx we mean graph position index...
-bool findST(int *stStopLoc, int *stStartIdx, int lowToLowWaveLen[], int highToLowWaveLen[], int clk, int tol, int buffSize, size_t *i) {
-    if (buffSize < *i+4) return false;
+bool findST(int *stStopLoc, int *stStartIdx, int lowToLowWaveLen[], int highToLowWaveLen[], int clk, int tol, int buffSize, size_t *i)
+{
+    if (buffSize < *i + 4) return false;
 
-    for (; *i < buffSize - 4; *i+=1) {
+    for (; *i < buffSize - 4; *i += 1) {
         *stStartIdx += lowToLowWaveLen[*i]; //caution part of this wave may be data and part may be ST....  to be accounted for in main function for now...
-        if (lowToLowWaveLen[*i] >= clk*1-tol && lowToLowWaveLen[*i] <= (clk*2)+tol && highToLowWaveLen[*i] < clk+tol) {           //1 to 2 clocks depending on 2 bits prior
-            if (lowToLowWaveLen[*i+1] >= clk*2-tol && lowToLowWaveLen[*i+1] <= clk*2+tol && highToLowWaveLen[*i+1] > clk*3/2-tol) {       //2 clocks and wave size is 1 1/2
-                if (lowToLowWaveLen[*i+2] >= (clk*3)/2-tol && lowToLowWaveLen[*i+2] <= clk*2+tol && highToLowWaveLen[*i+2] > clk-tol) { //1 1/2 to 2 clocks and at least one full clock wave
-                    if (lowToLowWaveLen[*i+3] >= clk*1-tol && lowToLowWaveLen[*i+3] <= clk*2+tol) { //1 to 2 clocks for end of ST + first bit
+        if (lowToLowWaveLen[*i] >= clk * 1 - tol && lowToLowWaveLen[*i] <= (clk * 2) + tol && highToLowWaveLen[*i] < clk + tol) { //1 to 2 clocks depending on 2 bits prior
+            if (lowToLowWaveLen[*i + 1] >= clk * 2 - tol && lowToLowWaveLen[*i + 1] <= clk * 2 + tol && highToLowWaveLen[*i + 1] > clk * 3 / 2 - tol) { //2 clocks and wave size is 1 1/2
+                if (lowToLowWaveLen[*i + 2] >= (clk * 3) / 2 - tol && lowToLowWaveLen[*i + 2] <= clk * 2 + tol && highToLowWaveLen[*i + 2] > clk - tol) { //1 1/2 to 2 clocks and at least one full clock wave
+                    if (lowToLowWaveLen[*i + 3] >= clk * 1 - tol && lowToLowWaveLen[*i + 3] <= clk * 2 + tol) { //1 to 2 clocks for end of ST + first bit
                         *stStopLoc = *i + 3;
                         return true;
                     }
@@ -1143,12 +1184,13 @@ bool findST(int *stStopLoc, int *stStartIdx, int lowToLowWaveLen[], int highToLo
 }
 //by marshmellow
 //attempt to identify a Sequence Terminator in ASK modulated raw wave
-bool DetectST(uint8_t *buffer, size_t *size, int *foundclock, size_t *ststart, size_t *stend) {
+bool DetectST(uint8_t *buffer, size_t *size, int *foundclock, size_t *ststart, size_t *stend)
+{
     size_t bufsize = *size;
     //need to loop through all samples and identify our clock, look for the ST pattern
     int clk = 0;
     int tol = 0;
-    int j=0, high, low, skip=0, start=0, end=0, minClk=255;
+    int j = 0, high, low, skip = 0, start = 0, end = 0, minClk = 255;
     size_t i = 0;
     //probably should malloc... || test if memory is available ... handle device side? memory danger!!! [marshmellow]
     int tmpbuff[bufsize / LOWEST_DEFAULT_CLOCK]; // low to low wave count //guess rf/32 clock, if click is smaller we will only have room for a fraction of the samples captured
@@ -1162,48 +1204,48 @@ bool DetectST(uint8_t *buffer, size_t *size, int *foundclock, size_t *ststart, s
     if (!loadWaveCounters(buffer, bufsize, tmpbuff, waveLen, &j, &skip, &minClk, &high, &low)) return false;
     // set clock  - might be able to get this externally and remove this work...
     clk = getClosestClock(minClk);
-        // clock not found - ERROR
-        if (!clk) {
-            if (g_debugMode == 2) prnt("DEBUG STT: clock not found - quitting");
-            return false;
-        }
+    // clock not found - ERROR
+    if (!clk) {
+        if (g_debugMode == 2) prnt("DEBUG STT: clock not found - quitting");
+        return false;
+    }
     *foundclock = clk;
 
-    tol = clk/8;
+    tol = clk / 8;
     if (!findST(&start, &skip, tmpbuff, waveLen, clk, tol, j, &i)) {
-    // first ST not found - ERROR
+        // first ST not found - ERROR
         if (g_debugMode == 2) prnt("DEBUG STT: first STT not found - quitting");
         return false;
     } else {
         if (g_debugMode == 2) prnt("DEBUG STT: first STT found at wave: %i, skip: %i, j=%i", start, skip, j);
     }
-    if (waveLen[i+2] > clk*1+tol)
+    if (waveLen[i + 2] > clk * 1 + tol)
         phaseoff = 0;
     else
-        phaseoff = clk/2;
+        phaseoff = clk / 2;
 
     // skip over the remainder of ST
-    skip += clk*7/2; //3.5 clocks from tmpbuff[i] = end of st - also aligns for ending point
+    skip += clk * 7 / 2; //3.5 clocks from tmpbuff[i] = end of st - also aligns for ending point
 
     // now do it again to find the end
     int dummy1 = 0;
     end = skip;
     i += 3;
     if (!findST(&dummy1, &end, tmpbuff, waveLen, clk, tol, j, &i)) {
-    //didn't find second ST - ERROR
+        //didn't find second ST - ERROR
         if (g_debugMode == 2) prnt("DEBUG STT: second STT not found - quitting");
         return false;
     }
     end -= phaseoff;
-    if (g_debugMode == 2) prnt("DEBUG STT: start of data: %d end of data: %d, datalen: %d, clk: %d, bits: %d, phaseoff: %d", skip, end, end-skip, clk, (end-skip)/clk, phaseoff);
+    if (g_debugMode == 2) prnt("DEBUG STT: start of data: %d end of data: %d, datalen: %d, clk: %d, bits: %d, phaseoff: %d", skip, end, end - skip, clk, (end - skip) / clk, phaseoff);
     //now begin to trim out ST so we can use normal demod cmds
     start = skip;
     size_t datalen = end - start;
     // check validity of datalen (should be even clock increments)  - use a tolerance of up to 1/8th a clock
-    if ( clk - (datalen % clk) <= clk/8) {
+    if (clk - (datalen % clk) <= clk / 8) {
         // padd the amount off - could be problematic...  but shouldn't happen often
         datalen += clk - (datalen % clk);
-    } else if ( (datalen % clk) <= clk/8 ) {
+    } else if ((datalen % clk) <= clk / 8) {
         // padd the amount off - could be problematic...  but shouldn't happen often
         datalen -= datalen % clk;
     } else {
@@ -1211,15 +1253,15 @@ bool DetectST(uint8_t *buffer, size_t *size, int *foundclock, size_t *ststart, s
         return false;
     }
     // if datalen is less than one t55xx block - ERROR
-    if (datalen/clk < 8*4) {
+    if (datalen / clk < 8 * 4) {
         if (g_debugMode == 2) prnt("DEBUG STT: datalen is less than 1 full t55xx block - quitting");
         return false;
     }
     size_t dataloc = start;
-    if (buffer[dataloc-(clk*4)-(clk/4)] <= low && buffer[dataloc] <= low && buffer[dataloc-(clk*4)] >= high) {
+    if (buffer[dataloc - (clk * 4) - (clk / 4)] <= low && buffer[dataloc] <= low && buffer[dataloc - (clk * 4)] >= high) {
         //we have low drift (and a low just before the ST and a low just after the ST) - compensate by backing up the start
-        for ( i=0; i <= (clk/4); ++i ) {
-            if ( buffer[dataloc - (clk*4) - i] <= low ) {
+        for (i = 0; i <= (clk / 4); ++i) {
+            if (buffer[dataloc - (clk * 4) - i] <= low) {
                 dataloc -= i;
                 break;
             }
@@ -1227,39 +1269,39 @@ bool DetectST(uint8_t *buffer, size_t *size, int *foundclock, size_t *ststart, s
     }
 
     size_t newloc = 0;
-    i=0;
-    if (g_debugMode == 2) prnt("DEBUG STT: Starting STT trim - start: %d, datalen: %d ",dataloc, datalen);
+    i = 0;
+    if (g_debugMode == 2) prnt("DEBUG STT: Starting STT trim - start: %d, datalen: %d ", dataloc, datalen);
     bool firstrun = true;
     // warning - overwriting buffer given with raw wave data with ST removed...
-    while ( dataloc < bufsize-(clk/2) ) {
+    while (dataloc < bufsize - (clk / 2)) {
         //compensate for long high at end of ST not being high due to signal loss... (and we cut out the start of wave high part)
-        if (buffer[dataloc]<high && buffer[dataloc]>low && buffer[dataloc+clk/4]<high && buffer[dataloc+clk/4]>low) {
-            for(i=0; i < clk/2-tol; ++i) {
-                buffer[dataloc+i] = high+5;
+        if (buffer[dataloc] < high && buffer[dataloc] > low && buffer[dataloc + clk / 4] < high && buffer[dataloc + clk / 4] > low) {
+            for (i = 0; i < clk / 2 - tol; ++i) {
+                buffer[dataloc + i] = high + 5;
             }
         } //test for small spike outlier (high between two lows) in the case of very strong waves
-        if (buffer[dataloc] > low && buffer[dataloc+clk/4] <= low) {
-            for(i=0; i < clk/4; ++i) {
-                buffer[dataloc+i] = buffer[dataloc+clk/4];
+        if (buffer[dataloc] > low && buffer[dataloc + clk / 4] <= low) {
+            for (i = 0; i < clk / 4; ++i) {
+                buffer[dataloc + i] = buffer[dataloc + clk / 4];
             }
         }
         if (firstrun) {
             *stend = dataloc;
-            *ststart = dataloc-(clk*4);
-            firstrun=false;
+            *ststart = dataloc - (clk * 4);
+            firstrun = false;
         }
-        for (i=0; i<datalen; ++i) {
-            if (i+newloc < bufsize) {
-                if (i+newloc < dataloc)
-                    buffer[i+newloc] = buffer[dataloc];
+        for (i = 0; i < datalen; ++i) {
+            if (i + newloc < bufsize) {
+                if (i + newloc < dataloc)
+                    buffer[i + newloc] = buffer[dataloc];
 
                 dataloc++;
             }
         }
         newloc += i;
         //skip next ST  -  we just assume it will be there from now on...
-        if (g_debugMode == 2) prnt("DEBUG STT: skipping STT at %d to %d", dataloc, dataloc+(clk*4));
-        dataloc += clk*4;
+        if (g_debugMode == 2) prnt("DEBUG STT: skipping STT at %d to %d", dataloc, dataloc + (clk * 4));
+        dataloc += clk * 4;
     }
     *size = newloc;
     return true;
@@ -1270,7 +1312,8 @@ bool DetectST(uint8_t *buffer, size_t *size, int *foundclock, size_t *ststart, s
 //check for phase errors - should never have half a 1 or 0 by itself and should never exceed 1111 or 0000 in a row
 //decodes miller encoded binary
 //NOTE  askrawdemod will NOT demod miller encoded ask unless the clock is manually set to 1/2 what it is detected as!
-int millerRawDecode(uint8_t *bits, size_t *size, int invert) {
+int millerRawDecode(uint8_t *bits, size_t *size, int invert)
+{
     if (*size < 16) return -1;
 
     uint16_t MaxBits = 512, errCnt = 0;
@@ -1278,8 +1321,8 @@ int millerRawDecode(uint8_t *bits, size_t *size, int invert) {
     uint8_t alignCnt = 0, curBit = bits[0], alignedIdx = 0, halfClkErr = 0;
 
     //find alignment, needs 4 1s or 0s to properly align
-    for (i=1; i < *size-1; i++) {
-        alignCnt = (bits[i] == curBit) ? alignCnt+1 : 0;
+    for (i = 1; i < *size - 1; i++) {
+        alignCnt = (bits[i] == curBit) ? alignCnt + 1 : 0;
         curBit = bits[i];
         if (alignCnt == 4) break;
     }
@@ -1288,15 +1331,15 @@ int millerRawDecode(uint8_t *bits, size_t *size, int invert) {
         if (g_debugMode) prnt("ERROR MillerDecode: alignment not found so either your bits is not miller or your data does not have a 101 in it");
         return -1;
     }
-    alignedIdx = (i-1) % 2;
-    for (i = alignedIdx; i < *size-3; i += 2) {
+    alignedIdx = (i - 1) % 2;
+    for (i = alignedIdx; i < *size - 3; i += 2) {
         halfClkErr = (uint8_t)((halfClkErr << 1 | bits[i]) & 0xFF);
-        if ( (halfClkErr & 0x7) == 5 || (halfClkErr & 0x7) == 2 || (i > 2 && (halfClkErr & 0x7) == 0) || (halfClkErr & 0x1F) == 0x1F) {
+        if ((halfClkErr & 0x7) == 5 || (halfClkErr & 0x7) == 2 || (i > 2 && (halfClkErr & 0x7) == 0) || (halfClkErr & 0x1F) == 0x1F) {
             errCnt++;
             bits[bitCnt++] = 7;
             continue;
         }
-        bits[bitCnt++] = bits[i] ^ bits[i+1] ^ invert;
+        bits[bitCnt++] = bits[i] ^ bits[i + 1] ^ invert;
 
         if (bitCnt > MaxBits) break;
     }
@@ -1308,7 +1351,8 @@ int millerRawDecode(uint8_t *bits, size_t *size, int invert) {
 //take 01 or 10 = 1 and 11 or 00 = 0
 //check for phase errors - should never have 111 or 000 should be 01001011 or 10110100 for 1010
 //decodes biphase or if inverted it is AKA conditional dephase encoding AKA differential manchester encoding
-int BiphaseRawDecode(uint8_t *bits, size_t *size, int *offset, int invert) {
+int BiphaseRawDecode(uint8_t *bits, size_t *size, int *offset, int invert)
+{
     //sanity check
     if (*size < 51) return -1;
 
@@ -1319,21 +1363,21 @@ int BiphaseRawDecode(uint8_t *bits, size_t *size, int *offset, int invert) {
 
     //check for phase change faults - skip one sample if faulty
     bool offsetA = true, offsetB = true;
-    for (; i < *offset+48; i += 2){
-        if (bits[i+1] == bits[i+2]) offsetA = false;
-        if (bits[i+2] == bits[i+3]) offsetB = false;
+    for (; i < *offset + 48; i += 2) {
+        if (bits[i + 1] == bits[i + 2]) offsetA = false;
+        if (bits[i + 2] == bits[i + 3]) offsetB = false;
     }
     if (!offsetA && offsetB) ++*offset;
 
-    for (i = *offset; i < *size-3; i += 2){
+    for (i = *offset; i < *size - 3; i += 2) {
         //check for phase error
-        if (bits[i+1] == bits[i+2]) {
+        if (bits[i + 1] == bits[i + 2]) {
             bits[bitnum++] = 7;
             errCnt++;
         }
-        if((bits[i]==1 && bits[i+1]==0) || (bits[i]==0 && bits[i+1]==1)){
+        if ((bits[i] == 1 && bits[i + 1] == 0) || (bits[i] == 0 && bits[i + 1] == 1)) {
             bits[bitnum++] = 1 ^ invert;
-        } else if((bits[i]==0 && bits[i+1]==0) || (bits[i]==1 && bits[i+1]==1)){
+        } else if ((bits[i] == 0 && bits[i + 1] == 0) || (bits[i] == 1 && bits[i + 1] == 1)) {
             bits[bitnum++] = invert;
         } else {
             bits[bitnum++] = 7;
@@ -1348,7 +1392,8 @@ int BiphaseRawDecode(uint8_t *bits, size_t *size, int *offset, int invert) {
 //by marshmellow
 //take 10 and 01 and manchester decode
 //run through 2 times and take least errCnt
-int manrawdecode(uint8_t *bits, size_t *size, uint8_t invert, uint8_t *alignPos){
+int manrawdecode(uint8_t *bits, size_t *size, uint8_t invert, uint8_t *alignPos)
+{
 
     // sanity check
     if (*size < 16) return -1;
@@ -1358,12 +1403,12 @@ int manrawdecode(uint8_t *bits, size_t *size, uint8_t invert, uint8_t *alignPos)
     size_t i, k;
 
     //find correct start position [alignment]
-    for (k = 0; k < 2; ++k){
-        for (i = k; i < *size-3; i += 2) {
-            if (bits[i] == bits[i+1])
+    for (k = 0; k < 2; ++k) {
+        for (i = k; i < *size - 3; i += 2) {
+            if (bits[i] == bits[i + 1])
                 errCnt++;
         }
-        if (bestErr > errCnt){
+        if (bestErr > errCnt) {
             bestErr = errCnt;
             bestRun = k;
         }
@@ -1371,11 +1416,11 @@ int manrawdecode(uint8_t *bits, size_t *size, uint8_t invert, uint8_t *alignPos)
     }
     *alignPos = bestRun;
     //decode
-    for (i = bestRun; i < *size-3; i += 2){
-        if (bits[i] == 1 && (bits[i+1] == 0)){
+    for (i = bestRun; i < *size - 3; i += 2) {
+        if (bits[i] == 1 && (bits[i + 1] == 0)) {
             bits[bitnum++] = invert;
-        } else if ((bits[i] == 0) && bits[i+1] == 1){
-            bits[bitnum++] = invert^1;
+        } else if ((bits[i] == 0) && bits[i + 1] == 1) {
+            bits[bitnum++] = invert ^ 1;
         } else {
             bits[bitnum++] = 7;
         }
@@ -1388,7 +1433,8 @@ int manrawdecode(uint8_t *bits, size_t *size, uint8_t invert, uint8_t *alignPos)
 //by marshmellow
 //demodulates strong heavily clipped samples
 //RETURN: num of errors.  if 0, is ok.
-int cleanAskRawDemod(uint8_t *bits, size_t *size, int clk, int invert, int high, int low, int *startIdx) {
+int cleanAskRawDemod(uint8_t *bits, size_t *size, int clk, int invert, int high, int low, int *startIdx)
+{
     *startIdx = 0;
     size_t bitCnt = 0, smplCnt = 1, errCnt = 0, pos = 0;
     uint8_t cl_4 = clk / 4;
@@ -1398,13 +1444,13 @@ int cleanAskRawDemod(uint8_t *bits, size_t *size, int clk, int invert, int high,
     getNextHigh(bits, *size, high, &pos);
 
     // sample counts,   like clock = 32.. it tries to find  32/4 = 8,  32/2 = 16
-    for (size_t i = pos; i < *size; i++){
-        if (bits[i] >= high && waveHigh){
+    for (size_t i = pos; i < *size; i++) {
+        if (bits[i] >= high && waveHigh) {
             smplCnt++;
-        } else if (bits[i] <= low && !waveHigh){
+        } else if (bits[i] <= low && !waveHigh) {
             smplCnt++;
         } else { //transition
-            if ((bits[i] >= high && !waveHigh) || (bits[i] <= low && waveHigh)){
+            if ((bits[i] >= high && !waveHigh) || (bits[i] <= low && waveHigh)) {
 
                 // 32-8-1 = 23
                 // 32+8+1 = 41
@@ -1426,7 +1472,7 @@ int cleanAskRawDemod(uint8_t *bits, size_t *size, int clk, int invert, int high,
                     waveHigh = !waveHigh;
                     smplCnt = 0;
 
-                // 16-8-1 = 7
+                    // 16-8-1 = 7
                 } else if (smplCnt > cl_2 - cl_4 - 1) { //half clock
 
                     if (smplCnt > cl_2 + cl_4 + 1) { //too many samples
@@ -1459,7 +1505,8 @@ int cleanAskRawDemod(uint8_t *bits, size_t *size, int clk, int invert, int high,
 
 //by marshmellow
 //attempts to demodulate ask modulations, askType == 0 for ask/raw, askType==1 for ask/manchester
-int askdemod_ext(uint8_t *bits, size_t *size, int *clk, int *invert, int maxErr, uint8_t amp, uint8_t askType, int *startIdx) {
+int askdemod_ext(uint8_t *bits, size_t *size, int *clk, int *invert, int maxErr, uint8_t amp, uint8_t askType, int *startIdx)
+{
 
     if (*size == 0) return -1;
 
@@ -1476,7 +1523,7 @@ int askdemod_ext(uint8_t *bits, size_t *size, int *clk, int *invert, int maxErr,
 
     //start pos from detect ask clock is 1/2 clock offset
     // NOTE: can be negative (demod assumes rest of wave was there)
-    *startIdx = start - (*clk/2);
+    *startIdx = start - (*clk / 2);
     uint16_t initLoopMax = 1024;
     if (initLoopMax > *size) initLoopMax = *size;
 
@@ -1503,7 +1550,7 @@ int askdemod_ext(uint8_t *bits, size_t *size, int *clk, int *invert, int maxErr,
         if (askType) { //ask/manchester
             uint8_t alignPos = 0;
             errCnt = manrawdecode(bits, size, 0, &alignPos);
-            *startIdx += *clk/2 * alignPos;
+            *startIdx += *clk / 2 * alignPos;
 
             if (g_debugMode)
                 prnt("DEBUG: (askdemod_ext) CLEAN: startIdx %i, alignPos %u", *startIdx, alignPos);
@@ -1522,12 +1569,12 @@ int askdemod_ext(uint8_t *bits, size_t *size, int *clk, int *invert, int maxErr,
     lastBit = start - *clk;
 
     for (i = start; i < *size; ++i) {
-        if (i - lastBit >= *clk - tol){
+        if (i - lastBit >= *clk - tol) {
             if (bits[i] >= high) {
                 bits[bitnum++] = *invert;
             } else if (bits[i] <= low) {
                 bits[bitnum++] = *invert ^ 1;
-            } else if (i-lastBit >= *clk + tol) {
+            } else if (i - lastBit >= *clk + tol) {
                 if (bitnum > 0) {
                     if (g_debugMode == 2) prnt("DEBUG: (askdemod_ext) Modulation Error at: %u", i);
                     bits[bitnum++] = 7;
@@ -1538,13 +1585,13 @@ int askdemod_ext(uint8_t *bits, size_t *size, int *clk, int *invert, int maxErr,
             }
             midBit = 0;
             lastBit += *clk;
-        } else if (i-lastBit >= (*clk/2 - tol) && !midBit && !askType){
+        } else if (i - lastBit >= (*clk / 2 - tol) && !midBit && !askType) {
             if (bits[i] >= high) {
                 bits[bitnum++] = *invert;
             } else if (bits[i] <= low) {
                 bits[bitnum++] = *invert ^ 1;
-            } else if (i-lastBit >= *clk/2 + tol) {
-                bits[bitnum] = bits[bitnum-1];
+            } else if (i - lastBit >= *clk / 2 + tol) {
+                bits[bitnum] = bits[bitnum - 1];
                 bitnum++;
             } else { //in tolerance - looking for peak
                 continue;
@@ -1557,14 +1604,16 @@ int askdemod_ext(uint8_t *bits, size_t *size, int *clk, int *invert, int maxErr,
     return errCnt;
 }
 
-int askdemod(uint8_t *bits, size_t *size, int *clk, int *invert, int maxErr, uint8_t amp, uint8_t askType) {
+int askdemod(uint8_t *bits, size_t *size, int *clk, int *invert, int maxErr, uint8_t amp, uint8_t askType)
+{
     int start = 0;
     return askdemod_ext(bits, size, clk, invert, maxErr, amp, askType, &start);
 }
 
 // by marshmellow - demodulate NRZ wave - requires a read with strong signal
 // peaks invert bit (high=1 low=0) each clock cycle = 1 bit determined by last peak
-int nrzRawDemod(uint8_t *dest, size_t *size, int *clk, int *invert, int *startIdx) {
+int nrzRawDemod(uint8_t *dest, size_t *size, int *clk, int *invert, int *startIdx)
+{
     if (signalprop.isnoise) return -1;
 
     size_t clkStartIdx = 0;
@@ -1573,7 +1622,7 @@ int nrzRawDemod(uint8_t *dest, size_t *size, int *clk, int *invert, int *startId
 
     size_t i, gLen = 4096;
     if (gLen > *size)
-        gLen = *size-20;
+        gLen = *size - 20;
 
 
     // just noise - no super good detection. good enough
@@ -1587,9 +1636,9 @@ int nrzRawDemod(uint8_t *dest, size_t *size, int *clk, int *invert, int *startId
     getHiLo(&high, &low, 75, 75);
     getHiLo(&high, &low, 75, 75);
 
-    uint8_t bit=0;
+    uint8_t bit = 0;
     //convert wave samples to 1's and 0's
-    for(i=20; i < *size-20; i++){
+    for (i = 20; i < *size - 20; i++) {
         if (dest[i] >= high) bit = 1;
         if (dest[i] <= low)  bit = 0;
         dest[i] = bit;
@@ -1597,16 +1646,16 @@ int nrzRawDemod(uint8_t *dest, size_t *size, int *clk, int *invert, int *startId
     //now demod based on clock (rf/32 = 32 1's for one 1 bit, 32 0's for one 0 bit)
     size_t lastBit = 0;
     size_t numBits = 0;
-    for(i=21; i < *size-20; i++) {
+    for (i = 21; i < *size - 20; i++) {
         //if transition detected or large number of same bits - store the passed bits
-        if (dest[i] != dest[i-1] || (i-lastBit) == (10 * *clk)) {
-            memset(dest+numBits, dest[i-1] ^ *invert, (i - lastBit + (*clk/4)) / *clk);
-            numBits += (i - lastBit + (*clk/4)) / *clk;
+        if (dest[i] != dest[i - 1] || (i - lastBit) == (10 * *clk)) {
+            memset(dest + numBits, dest[i - 1] ^ *invert, (i - lastBit + (*clk / 4)) / *clk);
+            numBits += (i - lastBit + (*clk / 4)) / *clk;
             if (lastBit == 0) {
                 *startIdx = i - (numBits * *clk);
                 if (g_debugMode == 2) prnt("DEBUG NRZ: startIdx %i", *startIdx);
             }
-            lastBit = i-1;
+            lastBit = i - 1;
         }
     }
     *size = numBits;
@@ -1614,9 +1663,10 @@ int nrzRawDemod(uint8_t *dest, size_t *size, int *clk, int *invert, int *startId
 }
 
 //translate wave to 11111100000 (1 for each short wave [higher freq] 0 for each long wave [lower freq])
-size_t fsk_wave_demod(uint8_t *dest, size_t size, uint8_t fchigh, uint8_t fclow, int *startIdx) {
+size_t fsk_wave_demod(uint8_t *dest, size_t size, uint8_t fchigh, uint8_t fclow, int *startIdx)
+{
 
-    if ( size < 1024 ) return 0; // not enough samples
+    if (size < 1024) return 0;   // not enough samples
 
     if (fchigh == 0) fchigh = 10;
     if (fclow == 0) fclow = 8;
@@ -1667,42 +1717,42 @@ size_t fsk_wave_demod(uint8_t *dest, size_t size, uint8_t fchigh, uint8_t fclow,
     // width should be divided with exp_one.  i:e 6+7+6+2=21,  21/5 = 4,
     // the 1-0 to 0-1  width should be divided with exp_zero.   Ie: 3+5+6+7 = 21/6 = 3
 
-    for(; idx < size-20; idx++) {
+    for (; idx < size - 20; idx++) {
 
         // threshold current value
         dest[idx] = (dest[idx] < signalprop.mean) ? 0 : 1;
 
         // Check for 0->1 transition
-        if (dest[idx-1] < dest[idx]) {
+        if (dest[idx - 1] < dest[idx]) {
             preLastSample = LastSample;
             LastSample = currSample;
-            currSample = idx-last_transition;
-            if (currSample < (fclow-2)){            //0-5 = garbage noise (or 0-3)
+            currSample = idx - last_transition;
+            if (currSample < (fclow - 2)) {         //0-5 = garbage noise (or 0-3)
                 //do nothing with extra garbage
-            } else if (currSample < (fchigh-1)) {           //6-8 = 8 sample waves  (or 3-6 = 5)
+            } else if (currSample < (fchigh - 1)) {         //6-8 = 8 sample waves  (or 3-6 = 5)
                 //correct previous 9 wave surrounded by 8 waves (or 6 surrounded by 5)
-                if (numBits > 1 && LastSample > (fchigh-2) && (preLastSample < (fchigh-1))){
-                    dest[numBits-1]=1;
+                if (numBits > 1 && LastSample > (fchigh - 2) && (preLastSample < (fchigh - 1))) {
+                    dest[numBits - 1] = 1;
                 }
-                dest[numBits++]=1;
+                dest[numBits++] = 1;
 
 
                 if (numBits > 0 && *startIdx == 0)
                     *startIdx = idx - fclow;
 
-            } else if (currSample > (fchigh+1) && numBits < 3) { //12 + and first two bit = unusable garbage
+            } else if (currSample > (fchigh + 1) && numBits < 3) { //12 + and first two bit = unusable garbage
                 //do nothing with beginning garbage and reset..  should be rare..
                 numBits = 0;
-            } else if (currSample == (fclow+1) && LastSample == (fclow-1)) { // had a 7 then a 9 should be two 8's (or 4 then a 6 should be two 5's)
-                dest[numBits++]=1;
+            } else if (currSample == (fclow + 1) && LastSample == (fclow - 1)) { // had a 7 then a 9 should be two 8's (or 4 then a 6 should be two 5's)
+                dest[numBits++] = 1;
                 if (numBits > 0 && *startIdx == 0) {
                     *startIdx = idx - fclow;
                 }
             } else {                                        //9+ = 10 sample waves (or 6+ = 7)
-                dest[numBits++]=0;
-                    if (numBits > 0 && *startIdx == 0) {
-                        *startIdx = idx - fchigh;
-                    }
+                dest[numBits++] = 0;
+                if (numBits > 0 && *startIdx == 0) {
+                    *startIdx = idx - fchigh;
+                }
             }
             last_transition = idx;
         }
@@ -1712,22 +1762,23 @@ size_t fsk_wave_demod(uint8_t *dest, size_t size, uint8_t fchigh, uint8_t fclow,
 
 //translate 11111100000 to 10
 //rfLen = clock, fchigh = larger field clock, fclow = smaller field clock
-size_t aggregate_bits(uint8_t *dest, size_t size, uint8_t clk, uint8_t invert, uint8_t fchigh, uint8_t fclow, int *startIdx) {
+size_t aggregate_bits(uint8_t *dest, size_t size, uint8_t clk, uint8_t invert, uint8_t fchigh, uint8_t fclow, int *startIdx)
+{
 
     uint8_t lastval = dest[0];
     size_t i = 0;
     size_t numBits = 0;
     uint32_t n = 1;
-    uint8_t hclk = clk/2;
+    uint8_t hclk = clk / 2;
 
-    for( i = 1; i < size; i++) {
+    for (i = 1; i < size; i++) {
         n++;
         if (dest[i] == lastval) continue; //skip until we hit a transition
 
         //find out how many bits (n) we collected (use 1/2 clk tolerance)
 
-        if (dest[i-1] == 1)
-        //if lastval was 1, we have a 1->0 crossing
+        if (dest[i - 1] == 1)
+            //if lastval was 1, we have a 1->0 crossing
             n = (n * fclow + hclk) / clk;
         else
             // 0->1 crossing
@@ -1739,16 +1790,16 @@ size_t aggregate_bits(uint8_t *dest, size_t size, uint8_t clk, uint8_t invert, u
         //first transition - save startidx
         if (numBits == 0) {
             if (lastval == 1) {  //high to low
-                *startIdx += (fclow * i) - (n*clk);
-                if (g_debugMode == 2) prnt("DEBUG (aggregate_bits) FSK startIdx %i, fclow*idx %i, n*clk %u", *startIdx, fclow*i, n*clk);
+                *startIdx += (fclow * i) - (n * clk);
+                if (g_debugMode == 2) prnt("DEBUG (aggregate_bits) FSK startIdx %i, fclow*idx %i, n*clk %u", *startIdx, fclow * i, n * clk);
             } else {
-                *startIdx += (fchigh * i) - (n*clk);
-                if (g_debugMode == 2) prnt("DEBUG (aggregate_bits) FSK startIdx %i, fchigh*idx %i, n*clk %u", *startIdx, fchigh*i, n*clk);
+                *startIdx += (fchigh * i) - (n * clk);
+                if (g_debugMode == 2) prnt("DEBUG (aggregate_bits) FSK startIdx %i, fchigh*idx %i, n*clk %u", *startIdx, fchigh * i, n * clk);
             }
         }
 
         //add to our destination the bits we collected
-        memset(dest+numBits, dest[i-1] ^ invert , n);
+        memset(dest + numBits, dest[i - 1] ^ invert, n);
 
         numBits += n;
         n = 0;
@@ -1757,13 +1808,13 @@ size_t aggregate_bits(uint8_t *dest, size_t size, uint8_t clk, uint8_t invert, u
     }//end for
 
     // if valid extra bits at the end were all the same frequency - add them in
-    if (n > clk/fchigh) {
-        if (dest[i-2] == 1) {
-            n = (n * fclow + clk/2) / clk;
+    if (n > clk / fchigh) {
+        if (dest[i - 2] == 1) {
+            n = (n * fclow + clk / 2) / clk;
         } else {
-            n = (n * fchigh + clk/2) / clk;
+            n = (n * fchigh + clk / 2) / clk;
         }
-        memset(dest+numBits, dest[i-1] ^ invert , n);
+        memset(dest + numBits, dest[i - 1] ^ invert, n);
         numBits += n;
     }
     return numBits;
@@ -1771,7 +1822,8 @@ size_t aggregate_bits(uint8_t *dest, size_t size, uint8_t clk, uint8_t invert, u
 
 //by marshmellow  (from holiman's base)
 // full fsk demod from GraphBuffer wave to decoded 1s and 0s (no mandemod)
-size_t fskdemod(uint8_t *dest, size_t size, uint8_t rfLen, uint8_t invert, uint8_t fchigh, uint8_t fclow, int *start_idx) {
+size_t fskdemod(uint8_t *dest, size_t size, uint8_t rfLen, uint8_t invert, uint8_t fchigh, uint8_t fclow, int *start_idx)
+{
     if (signalprop.isnoise) return 0;
     // FSK demodulator
     size = fsk_wave_demod(dest, size, fchigh, fclow, start_idx);
@@ -1783,13 +1835,14 @@ size_t fskdemod(uint8_t *dest, size_t size, uint8_t rfLen, uint8_t invert, uint8
 // convert psk1 demod to psk2 demod
 // only transition waves are 1s
 //TODO: Iceman - hard coded value 7,  should be #define
-void psk1TOpsk2(uint8_t *bits, size_t size) {
+void psk1TOpsk2(uint8_t *bits, size_t size)
+{
     uint8_t lastbit = bits[0];
-    for (size_t i = 1; i < size; i++){
+    for (size_t i = 1; i < size; i++) {
         //ignore errors
         if (bits[i] == 7) continue;
 
-        if (lastbit != bits[i]){
+        if (lastbit != bits[i]) {
             lastbit = bits[i];
             bits[i] = 1;
         } else {
@@ -1801,10 +1854,11 @@ void psk1TOpsk2(uint8_t *bits, size_t size) {
 // by marshmellow
 // convert psk2 demod to psk1 demod
 // from only transition waves are 1s to phase shifts change bit
-void psk2TOpsk1(uint8_t *bits, size_t size) {
+void psk2TOpsk1(uint8_t *bits, size_t size)
+{
     uint8_t phase = 0;
-    for (size_t i = 0; i < size; i++){
-        if (bits[i] == 1){
+    for (size_t i = 0; i < size; i++) {
+        if (bits[i] == 1) {
             phase ^= 1;
         }
         bits[i] = phase;
@@ -1814,21 +1868,22 @@ void psk2TOpsk1(uint8_t *bits, size_t size) {
 //by marshmellow - demodulate PSK1 wave
 //uses wave lengths (# Samples)
 //TODO: Iceman - hard coded value 7,  should be #define
-int pskRawDemod_ext(uint8_t *dest, size_t *size, int *clock, int *invert, int *startIdx) {
+int pskRawDemod_ext(uint8_t *dest, size_t *size, int *clock, int *invert, int *startIdx)
+{
 
     // sanity check
     if (*size < 170) return -1;
 
     uint8_t curPhase = *invert;
-    uint8_t fc=0;
-    size_t i=0, numBits=0, waveStart=1, waveEnd=0, firstFullWave=0, lastClkBit=0;
-    uint16_t fullWaveLen=0, waveLenCnt=0, avgWaveVal=0;
-    uint16_t errCnt=0, errCnt2=0;
+    uint8_t fc = 0;
+    size_t i = 0, numBits = 0, waveStart = 1, waveEnd = 0, firstFullWave = 0, lastClkBit = 0;
+    uint16_t fullWaveLen = 0, waveLenCnt = 0, avgWaveVal = 0;
+    uint16_t errCnt = 0, errCnt2 = 0;
 
     *clock = DetectPSKClock(dest, *size, *clock, &firstFullWave, &curPhase, &fc);
     if (*clock <= 0) return -1;
     //if clock detect found firstfullwave...
-    uint16_t tol = fc/2;
+    uint16_t tol = fc / 2;
     if (firstFullWave == 0) {
         //find start of modulating data in trace
         i = findModStart(dest, *size, fc);
@@ -1840,63 +1895,64 @@ int pskRawDemod_ext(uint8_t *dest, size_t *size, int *clock, int *invert, int *s
             firstFullWave = 160;
             memset(dest, curPhase, firstFullWave / *clock);
         } else {
-            memset(dest, curPhase^1, firstFullWave / *clock);
+            memset(dest, curPhase ^ 1, firstFullWave / *clock);
         }
     } else {
-        memset(dest, curPhase^1, firstFullWave / *clock);
+        memset(dest, curPhase ^ 1, firstFullWave / *clock);
     }
     //advance bits
     numBits += (firstFullWave / *clock);
-    *startIdx = firstFullWave - (*clock * numBits)+2;
+    *startIdx = firstFullWave - (*clock * numBits) + 2;
     //set start of wave as clock align
     lastClkBit = firstFullWave;
-    if (g_debugMode == 2) prnt("DEBUG PSK: firstFullWave: %u, waveLen: %u, startIdx %i",firstFullWave,fullWaveLen, *startIdx);
+    if (g_debugMode == 2) prnt("DEBUG PSK: firstFullWave: %u, waveLen: %u, startIdx %i", firstFullWave, fullWaveLen, *startIdx);
     if (g_debugMode == 2) prnt("DEBUG PSK: clk: %d, lastClkBit: %u, fc: %u", *clock, lastClkBit, fc);
     waveStart = 0;
     dest[numBits++] = curPhase; //set first read bit
-    for (i = firstFullWave + fullWaveLen - 1; i < *size-3; i++){
+    for (i = firstFullWave + fullWaveLen - 1; i < *size - 3; i++) {
         //top edge of wave = start of new wave
-        if (dest[i]+fc < dest[i+1] && dest[i+1] >= dest[i+2]){
+        if (dest[i] + fc < dest[i + 1] && dest[i + 1] >= dest[i + 2]) {
             if (waveStart == 0) {
-                waveStart = i+1;
+                waveStart = i + 1;
                 waveLenCnt = 0;
-                avgWaveVal = dest[i+1];
+                avgWaveVal = dest[i + 1];
             } else { //waveEnd
-                waveEnd = i+1;
-                waveLenCnt = waveEnd-waveStart;
-                if (waveLenCnt > fc){
+                waveEnd = i + 1;
+                waveLenCnt = waveEnd - waveStart;
+                if (waveLenCnt > fc) {
                     //this wave is a phase shift
                     //prnt("DEBUG: phase shift at: %d, len: %d, nextClk: %d, i: %d, fc: %d",waveStart,waveLenCnt,lastClkBit+*clock-tol,i+1,fc);
-                    if (i+1 >= lastClkBit + *clock - tol){ //should be a clock bit
+                    if (i + 1 >= lastClkBit + *clock - tol) { //should be a clock bit
                         curPhase ^= 1;
                         dest[numBits++] = curPhase;
                         lastClkBit += *clock;
-                    } else if (i < lastClkBit+10+fc){
+                    } else if (i < lastClkBit + 10 + fc) {
                         //noise after a phase shift - ignore
                     } else { //phase shift before supposed to based on clock
                         errCnt++;
                         dest[numBits++] = 7;
                     }
-                } else if (i+1 > lastClkBit + *clock + tol + fc){
+                } else if (i + 1 > lastClkBit + *clock + tol + fc) {
                     lastClkBit += *clock; //no phase shift but clock bit
                     dest[numBits++] = curPhase;
                 } else if (waveLenCnt < fc - 1) { //wave is smaller than field clock (shouldn't happen often)
                     errCnt2++;
                     if (errCnt2 > 101) return errCnt2;
-                    avgWaveVal += dest[i+1];
+                    avgWaveVal += dest[i + 1];
                     continue;
                 }
                 avgWaveVal = 0;
-                waveStart = i+1;
+                waveStart = i + 1;
             }
         }
-        avgWaveVal += dest[i+1];
+        avgWaveVal += dest[i + 1];
     }
     *size = numBits;
     return errCnt;
 }
 
-int pskRawDemod(uint8_t *dest, size_t *size, int *clock, int *invert) {
+int pskRawDemod(uint8_t *dest, size_t *size, int *clock, int *invert)
+{
     int start_idx = 0;
     return pskRawDemod_ext(dest, size, clock, invert, &start_idx);
 }
@@ -1909,9 +1965,10 @@ int pskRawDemod(uint8_t *dest, size_t *size, int *clock, int *invert) {
 
 // by marshmellow
 // FSK Demod then try to locate an AWID ID
-int detectAWID(uint8_t *dest, size_t *size, int *waveStartIdx) {
+int detectAWID(uint8_t *dest, size_t *size, int *waveStartIdx)
+{
     //make sure buffer has enough data (96bits * 50clock samples)
-    if (*size < 96*50) return -1;
+    if (*size < 96 * 50) return -1;
 
     if (signalprop.isnoise) return -2;
 
@@ -1922,7 +1979,7 @@ int detectAWID(uint8_t *dest, size_t *size, int *waveStartIdx) {
     if (*size < 96) return -3;
 
     size_t start_idx = 0;
-    uint8_t preamble[] = {0,0,0,0,0,0,0,1};
+    uint8_t preamble[] = {0, 0, 0, 0, 0, 0, 0, 1};
     if (!preambleSearch(dest, preamble, sizeof(preamble), size, &start_idx))
         return -4; //preamble not found
 
@@ -1934,7 +1991,8 @@ int detectAWID(uint8_t *dest, size_t *size, int *waveStartIdx) {
 
 //by marshmellow
 //takes 1s and 0s and searches for EM410x format - output EM ID
-int Em410xDecode(uint8_t *bits, size_t *size, size_t *start_idx, uint32_t *hi, uint64_t *lo) {
+int Em410xDecode(uint8_t *bits, size_t *size, size_t *start_idx, uint32_t *hi, uint64_t *lo)
+{
     // sanity check
     if (bits[1] > 1) return -1;
     if (*size < 64) return -2;
@@ -1944,7 +2002,7 @@ int Em410xDecode(uint8_t *bits, size_t *size, size_t *start_idx, uint32_t *hi, u
 
     // preamble 0111111111
     // include 0 in front to help get start pos
-    uint8_t preamble[] = {0,1,1,1,1,1,1,1,1,1};
+    uint8_t preamble[] = {0, 1, 1, 1, 1, 1, 1, 1, 1, 1};
     if (!preambleSearch(bits, preamble, sizeof(preamble), size, start_idx))
         return -4;
 
@@ -1955,28 +2013,30 @@ int Em410xDecode(uint8_t *bits, size_t *size, size_t *start_idx, uint32_t *hi, u
     *size = removeParity(bits, *start_idx + sizeof(preamble), 5, 0, fmtlen * 5);
 
     switch (*size) {
-       case 40: {
-        // std em410x format
-        *hi = 0;
-        *lo = ((uint64_t)(bytebits_to_byte(bits, 8)) << 32) | (bytebits_to_byte(bits + 8, 32));
-        break;
+        case 40: {
+            // std em410x format
+            *hi = 0;
+            *lo = ((uint64_t)(bytebits_to_byte(bits, 8)) << 32) | (bytebits_to_byte(bits + 8, 32));
+            break;
         }
         case 88:  {
-        // long em format
-        *hi = (bytebits_to_byte(bits, 24));
-        *lo = ((uint64_t)(bytebits_to_byte(bits + 24, 32)) << 32) | (bytebits_to_byte(bits + 24 + 32, 32));
-        break;
+            // long em format
+            *hi = (bytebits_to_byte(bits, 24));
+            *lo = ((uint64_t)(bytebits_to_byte(bits + 24, 32)) << 32) | (bytebits_to_byte(bits + 24 + 32, 32));
+            break;
         }
-        default: return -6;
+        default:
+            return -6;
     }
     return 1;
 }
 
 
 // loop to get raw HID waveform then FSK demodulate the TAG ID from it
-int HIDdemodFSK(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32_t *lo, int *waveStartIdx) {
+int HIDdemodFSK(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32_t *lo, int *waveStartIdx)
+{
     //make sure buffer has data
-    if (*size < 96*50) return -1;
+    if (*size < 96 * 50) return -1;
 
     if (signalprop.isnoise) return -2;
 
@@ -1984,11 +2044,11 @@ int HIDdemodFSK(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32
     *size = fskdemod(dest, *size, 50, 1, 10, 8, waveStartIdx); //hid fsk2a
 
     //did we get a good demod?
-    if (*size < 96*2) return -3;
+    if (*size < 96 * 2) return -3;
 
     // 00011101 bit pattern represent start of frame, 01 pattern represents a 0 and 10 represents a 1
     size_t start_idx = 0;
-    uint8_t preamble[] = {0,0,0,1,1,1,0,1};
+    uint8_t preamble[] = {0, 0, 0, 1, 1, 1, 0, 1};
     if (!preambleSearch(dest, preamble, sizeof(preamble), size, &start_idx))
         return -4; //preamble not found
 
@@ -1998,14 +2058,14 @@ int HIDdemodFSK(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32
     size_t num_start = start_idx + sizeof(preamble);
     // final loop, go over previously decoded FSK data and manchester decode into usable tag ID
     for (size_t idx = num_start; (idx - num_start) < *size - sizeof(preamble); idx += 2) {
-        if (dest[idx] == dest[idx+1]){
+        if (dest[idx] == dest[idx + 1]) {
             return -5; //not manchester data
         }
         *hi2 = (*hi2 << 1) | (*hi >> 31);
         *hi = (*hi << 1) | (*lo >> 31);
         //Then, shift in a 0 or one into low
         *lo <<= 1;
-        if (dest[idx] && !dest[idx+1])  // 1 0
+        if (dest[idx] && !dest[idx + 1]) // 1 0
             *lo |= 1;
         else // 0 1
             *lo |= 0;
@@ -2015,27 +2075,29 @@ int HIDdemodFSK(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32
 
 // Find IDTEC PSK1, RF  Preamble == 0x4944544B, Demodsize 64bits
 // by iceman
-int detectIdteck(uint8_t *dest, size_t *size) {
+int detectIdteck(uint8_t *dest, size_t *size)
+{
     //make sure buffer has data
-    if (*size < 64*2) return -1;
+    if (*size < 64 * 2) return -1;
 
     if (signalprop.isnoise) return -2;
 
     size_t start_idx = 0;
-    uint8_t preamble[] = {0,1,0,0,1,0,0,1,0,1,0,0,0,1,0,0,0,1,0,1,0,1,0,0,0,1,0,0,1,0,1,1};
+    uint8_t preamble[] = {0, 1, 0, 0, 1, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 1, 1};
 
     //preamble not found
     if (!preambleSearch(dest, preamble, sizeof(preamble), size, &start_idx))
         return -3;
 
-     // wrong demoded size
+    // wrong demoded size
     if (*size != 64) return -4;
     return (int)start_idx;
 }
 
-int detectIOProx(uint8_t *dest, size_t *size, int *waveStartIdx) {
+int detectIOProx(uint8_t *dest, size_t *size, int *waveStartIdx)
+{
     //make sure buffer has data
-    if (*size < 66*64) return -1;
+    if (*size < 66 * 64) return -1;
 
     if (signalprop.isnoise) return -2;
 
@@ -2055,14 +2117,14 @@ int detectIOProx(uint8_t *dest, size_t *size, int *waveStartIdx) {
     //XSF(version)facility:codeone+codetwo
 
     size_t start_idx = 0;
-    uint8_t preamble[] = {0,0,0,0,0,0,0,0,0,1};
+    uint8_t preamble[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1};
     if (!preambleSearch(dest, preamble, sizeof(preamble), size, &start_idx))
         return -4; //preamble not found
 
     // wrong size?  (between to preambles)
     if (*size != 64) return -5;
 
-    if (  !dest[start_idx + 8]
+    if (!dest[start_idx + 8]
         && dest[start_idx + 17] == 1
         && dest[start_idx + 26] == 1
         && dest[start_idx + 35] == 1
diff --git a/common/lfdemod.h b/common/lfdemod.h
index 80f0e06a7..883393cc3 100644
--- a/common/lfdemod.h
+++ b/common/lfdemod.h
@@ -36,7 +36,7 @@ typedef struct {
     int amplitude;
     bool isnoise;
 } signal_t;
-signal_t* getSignalProperties(void);
+signal_t *getSignalProperties(void);
 
 void computeSignalProperties(uint8_t *bits, uint32_t size);
 void removeSignalOffset(uint8_t *samples, uint32_t size);
diff --git a/common/mbedtls/aes.c b/common/mbedtls/aes.c
index 07391ecd5..1aab6e2e5 100644
--- a/common/mbedtls/aes.c
+++ b/common/mbedtls/aes.c
@@ -62,22 +62,22 @@
  */
 #ifndef GET_UINT32_LE
 #define GET_UINT32_LE(n,b,i)                            \
-{                                                       \
-    (n) = ( (uint32_t) (b)[(i)    ]       )             \
-        | ( (uint32_t) (b)[(i) + 1] <<  8 )             \
-        | ( (uint32_t) (b)[(i) + 2] << 16 )             \
-        | ( (uint32_t) (b)[(i) + 3] << 24 );            \
-}
+    {                                                       \
+        (n) = ( (uint32_t) (b)[(i)    ]       )             \
+              | ( (uint32_t) (b)[(i) + 1] <<  8 )             \
+              | ( (uint32_t) (b)[(i) + 2] << 16 )             \
+              | ( (uint32_t) (b)[(i) + 3] << 24 );            \
+    }
 #endif
 
 #ifndef PUT_UINT32_LE
 #define PUT_UINT32_LE(n,b,i)                                    \
-{                                                               \
-    (b)[(i)    ] = (unsigned char) ( ( (n)       ) & 0xFF );    \
-    (b)[(i) + 1] = (unsigned char) ( ( (n) >>  8 ) & 0xFF );    \
-    (b)[(i) + 2] = (unsigned char) ( ( (n) >> 16 ) & 0xFF );    \
-    (b)[(i) + 3] = (unsigned char) ( ( (n) >> 24 ) & 0xFF );    \
-}
+    {                                                               \
+        (b)[(i)    ] = (unsigned char) ( ( (n)       ) & 0xFF );    \
+        (b)[(i) + 1] = (unsigned char) ( ( (n) >>  8 ) & 0xFF );    \
+        (b)[(i) + 2] = (unsigned char) ( ( (n) >> 16 ) & 0xFF );    \
+        (b)[(i) + 3] = (unsigned char) ( ( (n) >> 24 ) & 0xFF );    \
+    }
 #endif
 
 #if defined(MBEDTLS_PADLOCK_C) &&                      \
@@ -89,8 +89,7 @@ static int aes_padlock_ace = -1;
 /*
  * Forward S-box
  */
-static const unsigned char FSb[256] =
-{
+static const unsigned char FSb[256] = {
     0x63, 0x7C, 0x77, 0x7B, 0xF2, 0x6B, 0x6F, 0xC5,
     0x30, 0x01, 0x67, 0x2B, 0xFE, 0xD7, 0xAB, 0x76,
     0xCA, 0x82, 0xC9, 0x7D, 0xFA, 0x59, 0x47, 0xF0,
@@ -129,7 +128,7 @@ static const unsigned char FSb[256] =
  * Forward tables
  */
 #define FT \
-\
+    \
     V(A5,63,63,C6), V(84,7C,7C,F8), V(99,77,77,EE), V(8D,7B,7B,F6), \
     V(0D,F2,F2,FF), V(BD,6B,6B,D6), V(B1,6F,6F,DE), V(54,C5,C5,91), \
     V(50,30,30,60), V(03,01,01,02), V(A9,67,67,CE), V(7D,2B,2B,56), \
@@ -220,8 +219,7 @@ static const uint32_t FT3[256] = { FT };
 /*
  * Reverse S-box
  */
-static const unsigned char RSb[256] =
-{
+static const unsigned char RSb[256] = {
     0x52, 0x09, 0x6A, 0xD5, 0x30, 0x36, 0xA5, 0x38,
     0xBF, 0x40, 0xA3, 0x9E, 0x81, 0xF3, 0xD7, 0xFB,
     0x7C, 0xE3, 0x39, 0x82, 0x9B, 0x2F, 0xFF, 0x87,
@@ -260,7 +258,7 @@ static const unsigned char RSb[256] =
  * Reverse tables
  */
 #define RT \
-\
+    \
     V(50,A7,F4,51), V(53,65,41,7E), V(C3,A4,17,1A), V(96,5E,27,3A), \
     V(CB,6B,AB,3B), V(F1,45,9D,1F), V(AB,58,FA,AC), V(93,03,E3,4B), \
     V(55,FA,30,20), V(F6,6D,76,AD), V(91,76,CC,88), V(25,4C,02,F5), \
@@ -351,8 +349,7 @@ static const uint32_t RT3[256] = { RT };
 /*
  * Round constants
  */
-static const uint32_t RCON[10] =
-{
+static const uint32_t RCON[10] = {
     0x00000001, 0x00000002, 0x00000004, 0x00000008,
     0x00000010, 0x00000020, 0x00000040, 0x00000080,
     0x0000001B, 0x00000036
@@ -396,7 +393,7 @@ static uint32_t RCON[10];
 
 static int aes_init_done = 0;
 
-static void aes_gen_tables( void )
+static void aes_gen_tables(void)
 {
     int i, x, y, z;
     int pow[256];
@@ -405,20 +402,18 @@ static void aes_gen_tables( void )
     /*
      * compute pow and log tables over GF(2^8)
      */
-    for( i = 0, x = 1; i < 256; i++ )
-    {
+    for (i = 0, x = 1; i < 256; i++) {
         pow[i] = x;
         log[x] = i;
-        x = ( x ^ XTIME( x ) ) & 0xFF;
+        x = (x ^ XTIME(x)) & 0xFF;
     }
 
     /*
      * calculate the round constants
      */
-    for( i = 0, x = 1; i < 10; i++ )
-    {
+    for (i = 0, x = 1; i < 10; i++) {
         RCON[i] = (uint32_t) x;
-        x = XTIME( x ) & 0xFF;
+        x = XTIME(x) & 0xFF;
     }
 
     /*
@@ -427,14 +422,17 @@ static void aes_gen_tables( void )
     FSb[0x00] = 0x63;
     RSb[0x63] = 0x00;
 
-    for( i = 1; i < 256; i++ )
-    {
+    for (i = 1; i < 256; i++) {
         x = pow[255 - log[i]];
 
-        y  = x; y = ( ( y << 1 ) | ( y >> 7 ) ) & 0xFF;
-        x ^= y; y = ( ( y << 1 ) | ( y >> 7 ) ) & 0xFF;
-        x ^= y; y = ( ( y << 1 ) | ( y >> 7 ) ) & 0xFF;
-        x ^= y; y = ( ( y << 1 ) | ( y >> 7 ) ) & 0xFF;
+        y  = x;
+        y = ((y << 1) | (y >> 7)) & 0xFF;
+        x ^= y;
+        y = ((y << 1) | (y >> 7)) & 0xFF;
+        x ^= y;
+        y = ((y << 1) | (y >> 7)) & 0xFF;
+        x ^= y;
+        y = ((y << 1) | (y >> 7)) & 0xFF;
         x ^= y ^ 0x63;
 
         FSb[i] = (unsigned char) x;
@@ -444,34 +442,33 @@ static void aes_gen_tables( void )
     /*
      * generate the forward and reverse tables
      */
-    for( i = 0; i < 256; i++ )
-    {
+    for (i = 0; i < 256; i++) {
         x = FSb[i];
-        y = XTIME( x ) & 0xFF;
-        z =  ( y ^ x ) & 0xFF;
+        y = XTIME(x) & 0xFF;
+        z = (y ^ x) & 0xFF;
 
-        FT0[i] = ( (uint32_t) y       ) ^
-                 ( (uint32_t) x <<  8 ) ^
-                 ( (uint32_t) x << 16 ) ^
-                 ( (uint32_t) z << 24 );
+        FT0[i] = ((uint32_t) y) ^
+                 ((uint32_t) x <<  8) ^
+                 ((uint32_t) x << 16) ^
+                 ((uint32_t) z << 24);
 
 #if !defined(MBEDTLS_AES_FEWER_TABLES)
-        FT1[i] = ROTL8( FT0[i] );
-        FT2[i] = ROTL8( FT1[i] );
-        FT3[i] = ROTL8( FT2[i] );
+        FT1[i] = ROTL8(FT0[i]);
+        FT2[i] = ROTL8(FT1[i]);
+        FT3[i] = ROTL8(FT2[i]);
 #endif /* !MBEDTLS_AES_FEWER_TABLES */
 
         x = RSb[i];
 
-        RT0[i] = ( (uint32_t) MUL( 0x0E, x )       ) ^
-                 ( (uint32_t) MUL( 0x09, x ) <<  8 ) ^
-                 ( (uint32_t) MUL( 0x0D, x ) << 16 ) ^
-                 ( (uint32_t) MUL( 0x0B, x ) << 24 );
+        RT0[i] = ((uint32_t) MUL(0x0E, x)) ^
+                 ((uint32_t) MUL(0x09, x) <<  8) ^
+                 ((uint32_t) MUL(0x0D, x) << 16) ^
+                 ((uint32_t) MUL(0x0B, x) << 24);
 
 #if !defined(MBEDTLS_AES_FEWER_TABLES)
-        RT1[i] = ROTL8( RT0[i] );
-        RT2[i] = ROTL8( RT1[i] );
-        RT3[i] = ROTL8( RT2[i] );
+        RT1[i] = ROTL8(RT0[i]);
+        RT2[i] = ROTL8(RT1[i]);
+        RT3[i] = ROTL8(RT2[i]);
 #endif /* !MBEDTLS_AES_FEWER_TABLES */
     }
 }
@@ -510,30 +507,30 @@ static void aes_gen_tables( void )
 
 #endif /* MBEDTLS_AES_FEWER_TABLES */
 
-void mbedtls_aes_init( mbedtls_aes_context *ctx )
+void mbedtls_aes_init(mbedtls_aes_context *ctx)
 {
-    memset( ctx, 0, sizeof( mbedtls_aes_context ) );
+    memset(ctx, 0, sizeof(mbedtls_aes_context));
 }
 
-void mbedtls_aes_free( mbedtls_aes_context *ctx )
+void mbedtls_aes_free(mbedtls_aes_context *ctx)
 {
-    if( ctx == NULL )
+    if (ctx == NULL)
         return;
 
-    mbedtls_platform_zeroize( ctx, sizeof( mbedtls_aes_context ) );
+    mbedtls_platform_zeroize(ctx, sizeof(mbedtls_aes_context));
 }
 
 #if defined(MBEDTLS_CIPHER_MODE_XTS)
-void mbedtls_aes_xts_init( mbedtls_aes_xts_context *ctx )
+void mbedtls_aes_xts_init(mbedtls_aes_xts_context *ctx)
 {
-    mbedtls_aes_init( &ctx->crypt );
-    mbedtls_aes_init( &ctx->tweak );
+    mbedtls_aes_init(&ctx->crypt);
+    mbedtls_aes_init(&ctx->tweak);
 }
 
-void mbedtls_aes_xts_free( mbedtls_aes_xts_context *ctx )
+void mbedtls_aes_xts_free(mbedtls_aes_xts_context *ctx)
 {
-    mbedtls_aes_free( &ctx->crypt );
-    mbedtls_aes_free( &ctx->tweak );
+    mbedtls_aes_free(&ctx->crypt);
+    mbedtls_aes_free(&ctx->tweak);
 }
 #endif /* MBEDTLS_CIPHER_MODE_XTS */
 
@@ -541,60 +538,62 @@ void mbedtls_aes_xts_free( mbedtls_aes_xts_context *ctx )
  * AES key schedule (encryption)
  */
 #if !defined(MBEDTLS_AES_SETKEY_ENC_ALT)
-int mbedtls_aes_setkey_enc( mbedtls_aes_context *ctx, const unsigned char *key,
-                    unsigned int keybits )
+int mbedtls_aes_setkey_enc(mbedtls_aes_context *ctx, const unsigned char *key,
+                           unsigned int keybits)
 {
     unsigned int i;
     uint32_t *RK;
 
 #if !defined(MBEDTLS_AES_ROM_TABLES)
-    if( aes_init_done == 0 )
-    {
+    if (aes_init_done == 0) {
         aes_gen_tables();
         aes_init_done = 1;
 
     }
 #endif
 
-    switch( keybits )
-    {
-        case 128: ctx->nr = 10; break;
-        case 192: ctx->nr = 12; break;
-        case 256: ctx->nr = 14; break;
-        default : return( MBEDTLS_ERR_AES_INVALID_KEY_LENGTH );
+    switch (keybits) {
+        case 128:
+            ctx->nr = 10;
+            break;
+        case 192:
+            ctx->nr = 12;
+            break;
+        case 256:
+            ctx->nr = 14;
+            break;
+        default :
+            return (MBEDTLS_ERR_AES_INVALID_KEY_LENGTH);
     }
 
 #if defined(MBEDTLS_PADLOCK_C) && defined(MBEDTLS_PADLOCK_ALIGN16)
-    if( aes_padlock_ace == -1 )
-        aes_padlock_ace = mbedtls_padlock_has_support( MBEDTLS_PADLOCK_ACE );
+    if (aes_padlock_ace == -1)
+        aes_padlock_ace = mbedtls_padlock_has_support(MBEDTLS_PADLOCK_ACE);
 
-    if( aes_padlock_ace )
-        ctx->rk = RK = MBEDTLS_PADLOCK_ALIGN16( ctx->buf );
+    if (aes_padlock_ace)
+        ctx->rk = RK = MBEDTLS_PADLOCK_ALIGN16(ctx->buf);
     else
 #endif
-    ctx->rk = RK = ctx->buf;
+        ctx->rk = RK = ctx->buf;
 
 #if defined(MBEDTLS_AESNI_C) && defined(MBEDTLS_HAVE_X86_64)
-    if( mbedtls_aesni_has_support( MBEDTLS_AESNI_AES ) )
-        return( mbedtls_aesni_setkey_enc( (unsigned char *) ctx->rk, key, keybits ) );
+    if (mbedtls_aesni_has_support(MBEDTLS_AESNI_AES))
+        return (mbedtls_aesni_setkey_enc((unsigned char *) ctx->rk, key, keybits));
 #endif
 
-    for( i = 0; i < ( keybits >> 5 ); i++ )
-    {
-        GET_UINT32_LE( RK[i], key, i << 2 );
+    for (i = 0; i < (keybits >> 5); i++) {
+        GET_UINT32_LE(RK[i], key, i << 2);
     }
 
-    switch( ctx->nr )
-    {
+    switch (ctx->nr) {
         case 10:
 
-            for( i = 0; i < 10; i++, RK += 4 )
-            {
+            for (i = 0; i < 10; i++, RK += 4) {
                 RK[4]  = RK[0] ^ RCON[i] ^
-                ( (uint32_t) FSb[ ( RK[3] >>  8 ) & 0xFF ]       ) ^
-                ( (uint32_t) FSb[ ( RK[3] >> 16 ) & 0xFF ] <<  8 ) ^
-                ( (uint32_t) FSb[ ( RK[3] >> 24 ) & 0xFF ] << 16 ) ^
-                ( (uint32_t) FSb[ ( RK[3]       ) & 0xFF ] << 24 );
+                         ((uint32_t) FSb[(RK[3] >>  8) & 0xFF ]) ^
+                         ((uint32_t) FSb[(RK[3] >> 16) & 0xFF ] <<  8) ^
+                         ((uint32_t) FSb[(RK[3] >> 24) & 0xFF ] << 16) ^
+                         ((uint32_t) FSb[(RK[3]) & 0xFF ] << 24);
 
                 RK[5]  = RK[1] ^ RK[4];
                 RK[6]  = RK[2] ^ RK[5];
@@ -604,13 +603,12 @@ int mbedtls_aes_setkey_enc( mbedtls_aes_context *ctx, const unsigned char *key,
 
         case 12:
 
-            for( i = 0; i < 8; i++, RK += 6 )
-            {
+            for (i = 0; i < 8; i++, RK += 6) {
                 RK[6]  = RK[0] ^ RCON[i] ^
-                ( (uint32_t) FSb[ ( RK[5] >>  8 ) & 0xFF ]       ) ^
-                ( (uint32_t) FSb[ ( RK[5] >> 16 ) & 0xFF ] <<  8 ) ^
-                ( (uint32_t) FSb[ ( RK[5] >> 24 ) & 0xFF ] << 16 ) ^
-                ( (uint32_t) FSb[ ( RK[5]       ) & 0xFF ] << 24 );
+                         ((uint32_t) FSb[(RK[5] >>  8) & 0xFF ]) ^
+                         ((uint32_t) FSb[(RK[5] >> 16) & 0xFF ] <<  8) ^
+                         ((uint32_t) FSb[(RK[5] >> 24) & 0xFF ] << 16) ^
+                         ((uint32_t) FSb[(RK[5]) & 0xFF ] << 24);
 
                 RK[7]  = RK[1] ^ RK[6];
                 RK[8]  = RK[2] ^ RK[7];
@@ -622,23 +620,22 @@ int mbedtls_aes_setkey_enc( mbedtls_aes_context *ctx, const unsigned char *key,
 
         case 14:
 
-            for( i = 0; i < 7; i++, RK += 8 )
-            {
+            for (i = 0; i < 7; i++, RK += 8) {
                 RK[8]  = RK[0] ^ RCON[i] ^
-                ( (uint32_t) FSb[ ( RK[7] >>  8 ) & 0xFF ]       ) ^
-                ( (uint32_t) FSb[ ( RK[7] >> 16 ) & 0xFF ] <<  8 ) ^
-                ( (uint32_t) FSb[ ( RK[7] >> 24 ) & 0xFF ] << 16 ) ^
-                ( (uint32_t) FSb[ ( RK[7]       ) & 0xFF ] << 24 );
+                         ((uint32_t) FSb[(RK[7] >>  8) & 0xFF ]) ^
+                         ((uint32_t) FSb[(RK[7] >> 16) & 0xFF ] <<  8) ^
+                         ((uint32_t) FSb[(RK[7] >> 24) & 0xFF ] << 16) ^
+                         ((uint32_t) FSb[(RK[7]) & 0xFF ] << 24);
 
                 RK[9]  = RK[1] ^ RK[8];
                 RK[10] = RK[2] ^ RK[9];
                 RK[11] = RK[3] ^ RK[10];
 
                 RK[12] = RK[4] ^
-                ( (uint32_t) FSb[ ( RK[11]       ) & 0xFF ]       ) ^
-                ( (uint32_t) FSb[ ( RK[11] >>  8 ) & 0xFF ] <<  8 ) ^
-                ( (uint32_t) FSb[ ( RK[11] >> 16 ) & 0xFF ] << 16 ) ^
-                ( (uint32_t) FSb[ ( RK[11] >> 24 ) & 0xFF ] << 24 );
+                         ((uint32_t) FSb[(RK[11]) & 0xFF ]) ^
+                         ((uint32_t) FSb[(RK[11] >>  8) & 0xFF ] <<  8) ^
+                         ((uint32_t) FSb[(RK[11] >> 16) & 0xFF ] << 16) ^
+                         ((uint32_t) FSb[(RK[11] >> 24) & 0xFF ] << 24);
 
                 RK[13] = RK[5] ^ RK[12];
                 RK[14] = RK[6] ^ RK[13];
@@ -647,7 +644,7 @@ int mbedtls_aes_setkey_enc( mbedtls_aes_context *ctx, const unsigned char *key,
             break;
     }
 
-    return( 0 );
+    return (0);
 }
 #endif /* !MBEDTLS_AES_SETKEY_ENC_ALT */
 
@@ -655,37 +652,36 @@ int mbedtls_aes_setkey_enc( mbedtls_aes_context *ctx, const unsigned char *key,
  * AES key schedule (decryption)
  */
 #if !defined(MBEDTLS_AES_SETKEY_DEC_ALT)
-int mbedtls_aes_setkey_dec( mbedtls_aes_context *ctx, const unsigned char *key,
-                    unsigned int keybits )
+int mbedtls_aes_setkey_dec(mbedtls_aes_context *ctx, const unsigned char *key,
+                           unsigned int keybits)
 {
     int i, j, ret;
     mbedtls_aes_context cty;
     uint32_t *RK;
     uint32_t *SK;
 
-    mbedtls_aes_init( &cty );
+    mbedtls_aes_init(&cty);
 
 #if defined(MBEDTLS_PADLOCK_C) && defined(MBEDTLS_PADLOCK_ALIGN16)
-    if( aes_padlock_ace == -1 )
-        aes_padlock_ace = mbedtls_padlock_has_support( MBEDTLS_PADLOCK_ACE );
+    if (aes_padlock_ace == -1)
+        aes_padlock_ace = mbedtls_padlock_has_support(MBEDTLS_PADLOCK_ACE);
 
-    if( aes_padlock_ace )
-        ctx->rk = RK = MBEDTLS_PADLOCK_ALIGN16( ctx->buf );
+    if (aes_padlock_ace)
+        ctx->rk = RK = MBEDTLS_PADLOCK_ALIGN16(ctx->buf);
     else
 #endif
-    ctx->rk = RK = ctx->buf;
+        ctx->rk = RK = ctx->buf;
 
     /* Also checks keybits */
-    if( ( ret = mbedtls_aes_setkey_enc( &cty, key, keybits ) ) != 0 )
+    if ((ret = mbedtls_aes_setkey_enc(&cty, key, keybits)) != 0)
         goto exit;
 
     ctx->nr = cty.nr;
 
 #if defined(MBEDTLS_AESNI_C) && defined(MBEDTLS_HAVE_X86_64)
-    if( mbedtls_aesni_has_support( MBEDTLS_AESNI_AES ) )
-    {
-        mbedtls_aesni_inverse_key( (unsigned char *) ctx->rk,
-                           (const unsigned char *) cty.rk, ctx->nr );
+    if (mbedtls_aesni_has_support(MBEDTLS_AESNI_AES)) {
+        mbedtls_aesni_inverse_key((unsigned char *) ctx->rk,
+                                  (const unsigned char *) cty.rk, ctx->nr);
         goto exit;
     }
 #endif
@@ -697,14 +693,12 @@ int mbedtls_aes_setkey_dec( mbedtls_aes_context *ctx, const unsigned char *key,
     *RK++ = *SK++;
     *RK++ = *SK++;
 
-    for( i = ctx->nr - 1, SK -= 8; i > 0; i--, SK -= 8 )
-    {
-        for( j = 0; j < 4; j++, SK++ )
-        {
-            *RK++ = AES_RT0( FSb[ ( *SK       ) & 0xFF ] ) ^
-                    AES_RT1( FSb[ ( *SK >>  8 ) & 0xFF ] ) ^
-                    AES_RT2( FSb[ ( *SK >> 16 ) & 0xFF ] ) ^
-                    AES_RT3( FSb[ ( *SK >> 24 ) & 0xFF ] );
+    for (i = ctx->nr - 1, SK -= 8; i > 0; i--, SK -= 8) {
+        for (j = 0; j < 4; j++, SK++) {
+            *RK++ = AES_RT0(FSb[(*SK) & 0xFF ]) ^
+                    AES_RT1(FSb[(*SK >>  8) & 0xFF ]) ^
+                    AES_RT2(FSb[(*SK >> 16) & 0xFF ]) ^
+                    AES_RT3(FSb[(*SK >> 24) & 0xFF ]);
         }
     }
 
@@ -714,27 +708,29 @@ int mbedtls_aes_setkey_dec( mbedtls_aes_context *ctx, const unsigned char *key,
     *RK++ = *SK++;
 
 exit:
-    mbedtls_aes_free( &cty );
+    mbedtls_aes_free(&cty);
 
-    return( ret );
+    return (ret);
 }
 
 #if defined(MBEDTLS_CIPHER_MODE_XTS)
-static int mbedtls_aes_xts_decode_keys( const unsigned char *key,
-                                        unsigned int keybits,
-                                        const unsigned char **key1,
-                                        unsigned int *key1bits,
-                                        const unsigned char **key2,
-                                        unsigned int *key2bits )
+static int mbedtls_aes_xts_decode_keys(const unsigned char *key,
+                                       unsigned int keybits,
+                                       const unsigned char **key1,
+                                       unsigned int *key1bits,
+                                       const unsigned char **key2,
+                                       unsigned int *key2bits)
 {
     const unsigned int half_keybits = keybits / 2;
     const unsigned int half_keybytes = half_keybits / 8;
 
-    switch( keybits )
-    {
-        case 256: break;
-        case 512: break;
-        default : return( MBEDTLS_ERR_AES_INVALID_KEY_LENGTH );
+    switch (keybits) {
+        case 256:
+            break;
+        case 512:
+            break;
+        default :
+            return (MBEDTLS_ERR_AES_INVALID_KEY_LENGTH);
     }
 
     *key1bits = half_keybits;
@@ -745,164 +741,167 @@ static int mbedtls_aes_xts_decode_keys( const unsigned char *key,
     return 0;
 }
 
-int mbedtls_aes_xts_setkey_enc( mbedtls_aes_xts_context *ctx,
-                                const unsigned char *key,
-                                unsigned int keybits)
+int mbedtls_aes_xts_setkey_enc(mbedtls_aes_xts_context *ctx,
+                               const unsigned char *key,
+                               unsigned int keybits)
 {
     int ret;
     const unsigned char *key1, *key2;
     unsigned int key1bits, key2bits;
 
-    ret = mbedtls_aes_xts_decode_keys( key, keybits, &key1, &key1bits,
-                                       &key2, &key2bits );
-    if( ret != 0 )
-        return( ret );
+    ret = mbedtls_aes_xts_decode_keys(key, keybits, &key1, &key1bits,
+                                      &key2, &key2bits);
+    if (ret != 0)
+        return (ret);
 
     /* Set the tweak key. Always set tweak key for the encryption mode. */
-    ret = mbedtls_aes_setkey_enc( &ctx->tweak, key2, key2bits );
-    if( ret != 0 )
-        return( ret );
+    ret = mbedtls_aes_setkey_enc(&ctx->tweak, key2, key2bits);
+    if (ret != 0)
+        return (ret);
 
     /* Set crypt key for encryption. */
-    return mbedtls_aes_setkey_enc( &ctx->crypt, key1, key1bits );
+    return mbedtls_aes_setkey_enc(&ctx->crypt, key1, key1bits);
 }
 
-int mbedtls_aes_xts_setkey_dec( mbedtls_aes_xts_context *ctx,
-                                const unsigned char *key,
-                                unsigned int keybits)
+int mbedtls_aes_xts_setkey_dec(mbedtls_aes_xts_context *ctx,
+                               const unsigned char *key,
+                               unsigned int keybits)
 {
     int ret;
     const unsigned char *key1, *key2;
     unsigned int key1bits, key2bits;
 
-    ret = mbedtls_aes_xts_decode_keys( key, keybits, &key1, &key1bits,
-                                       &key2, &key2bits );
-    if( ret != 0 )
-        return( ret );
+    ret = mbedtls_aes_xts_decode_keys(key, keybits, &key1, &key1bits,
+                                      &key2, &key2bits);
+    if (ret != 0)
+        return (ret);
 
     /* Set the tweak key. Always set tweak key for encryption. */
-    ret = mbedtls_aes_setkey_enc( &ctx->tweak, key2, key2bits );
-    if( ret != 0 )
-        return( ret );
+    ret = mbedtls_aes_setkey_enc(&ctx->tweak, key2, key2bits);
+    if (ret != 0)
+        return (ret);
 
     /* Set crypt key for decryption. */
-    return mbedtls_aes_setkey_dec( &ctx->crypt, key1, key1bits );
+    return mbedtls_aes_setkey_dec(&ctx->crypt, key1, key1bits);
 }
 #endif /* MBEDTLS_CIPHER_MODE_XTS */
 
 #endif /* !MBEDTLS_AES_SETKEY_DEC_ALT */
 
 #define AES_FROUND(X0,X1,X2,X3,Y0,Y1,Y2,Y3)         \
-{                                                   \
-    X0 = *RK++ ^ AES_FT0( ( Y0       ) & 0xFF ) ^   \
-                 AES_FT1( ( Y1 >>  8 ) & 0xFF ) ^   \
-                 AES_FT2( ( Y2 >> 16 ) & 0xFF ) ^   \
-                 AES_FT3( ( Y3 >> 24 ) & 0xFF );    \
-                                                    \
-    X1 = *RK++ ^ AES_FT0( ( Y1       ) & 0xFF ) ^   \
-                 AES_FT1( ( Y2 >>  8 ) & 0xFF ) ^   \
-                 AES_FT2( ( Y3 >> 16 ) & 0xFF ) ^   \
-                 AES_FT3( ( Y0 >> 24 ) & 0xFF );    \
-                                                    \
-    X2 = *RK++ ^ AES_FT0( ( Y2       ) & 0xFF ) ^   \
-                 AES_FT1( ( Y3 >>  8 ) & 0xFF ) ^   \
-                 AES_FT2( ( Y0 >> 16 ) & 0xFF ) ^   \
-                 AES_FT3( ( Y1 >> 24 ) & 0xFF );    \
-                                                    \
-    X3 = *RK++ ^ AES_FT0( ( Y3       ) & 0xFF ) ^   \
-                 AES_FT1( ( Y0 >>  8 ) & 0xFF ) ^   \
-                 AES_FT2( ( Y1 >> 16 ) & 0xFF ) ^   \
-                 AES_FT3( ( Y2 >> 24 ) & 0xFF );    \
-}
+    {                                                   \
+        X0 = *RK++ ^ AES_FT0( ( Y0       ) & 0xFF ) ^   \
+             AES_FT1( ( Y1 >>  8 ) & 0xFF ) ^   \
+             AES_FT2( ( Y2 >> 16 ) & 0xFF ) ^   \
+             AES_FT3( ( Y3 >> 24 ) & 0xFF );    \
+        \
+        X1 = *RK++ ^ AES_FT0( ( Y1       ) & 0xFF ) ^   \
+             AES_FT1( ( Y2 >>  8 ) & 0xFF ) ^   \
+             AES_FT2( ( Y3 >> 16 ) & 0xFF ) ^   \
+             AES_FT3( ( Y0 >> 24 ) & 0xFF );    \
+        \
+        X2 = *RK++ ^ AES_FT0( ( Y2       ) & 0xFF ) ^   \
+             AES_FT1( ( Y3 >>  8 ) & 0xFF ) ^   \
+             AES_FT2( ( Y0 >> 16 ) & 0xFF ) ^   \
+             AES_FT3( ( Y1 >> 24 ) & 0xFF );    \
+        \
+        X3 = *RK++ ^ AES_FT0( ( Y3       ) & 0xFF ) ^   \
+             AES_FT1( ( Y0 >>  8 ) & 0xFF ) ^   \
+             AES_FT2( ( Y1 >> 16 ) & 0xFF ) ^   \
+             AES_FT3( ( Y2 >> 24 ) & 0xFF );    \
+    }
 
 #define AES_RROUND(X0,X1,X2,X3,Y0,Y1,Y2,Y3)         \
-{                                                   \
-    X0 = *RK++ ^ AES_RT0( ( Y0       ) & 0xFF ) ^   \
-                 AES_RT1( ( Y3 >>  8 ) & 0xFF ) ^   \
-                 AES_RT2( ( Y2 >> 16 ) & 0xFF ) ^   \
-                 AES_RT3( ( Y1 >> 24 ) & 0xFF );    \
-                                                    \
-    X1 = *RK++ ^ AES_RT0( ( Y1       ) & 0xFF ) ^   \
-                 AES_RT1( ( Y0 >>  8 ) & 0xFF ) ^   \
-                 AES_RT2( ( Y3 >> 16 ) & 0xFF ) ^   \
-                 AES_RT3( ( Y2 >> 24 ) & 0xFF );    \
-                                                    \
-    X2 = *RK++ ^ AES_RT0( ( Y2       ) & 0xFF ) ^   \
-                 AES_RT1( ( Y1 >>  8 ) & 0xFF ) ^   \
-                 AES_RT2( ( Y0 >> 16 ) & 0xFF ) ^   \
-                 AES_RT3( ( Y3 >> 24 ) & 0xFF );    \
-                                                    \
-    X3 = *RK++ ^ AES_RT0( ( Y3       ) & 0xFF ) ^   \
-                 AES_RT1( ( Y2 >>  8 ) & 0xFF ) ^   \
-                 AES_RT2( ( Y1 >> 16 ) & 0xFF ) ^   \
-                 AES_RT3( ( Y0 >> 24 ) & 0xFF );    \
-}
+    {                                                   \
+        X0 = *RK++ ^ AES_RT0( ( Y0       ) & 0xFF ) ^   \
+             AES_RT1( ( Y3 >>  8 ) & 0xFF ) ^   \
+             AES_RT2( ( Y2 >> 16 ) & 0xFF ) ^   \
+             AES_RT3( ( Y1 >> 24 ) & 0xFF );    \
+        \
+        X1 = *RK++ ^ AES_RT0( ( Y1       ) & 0xFF ) ^   \
+             AES_RT1( ( Y0 >>  8 ) & 0xFF ) ^   \
+             AES_RT2( ( Y3 >> 16 ) & 0xFF ) ^   \
+             AES_RT3( ( Y2 >> 24 ) & 0xFF );    \
+        \
+        X2 = *RK++ ^ AES_RT0( ( Y2       ) & 0xFF ) ^   \
+             AES_RT1( ( Y1 >>  8 ) & 0xFF ) ^   \
+             AES_RT2( ( Y0 >> 16 ) & 0xFF ) ^   \
+             AES_RT3( ( Y3 >> 24 ) & 0xFF );    \
+        \
+        X3 = *RK++ ^ AES_RT0( ( Y3       ) & 0xFF ) ^   \
+             AES_RT1( ( Y2 >>  8 ) & 0xFF ) ^   \
+             AES_RT2( ( Y1 >> 16 ) & 0xFF ) ^   \
+             AES_RT3( ( Y0 >> 24 ) & 0xFF );    \
+    }
 
 /*
  * AES-ECB block encryption
  */
 #if !defined(MBEDTLS_AES_ENCRYPT_ALT)
-int mbedtls_internal_aes_encrypt( mbedtls_aes_context *ctx,
-                                  const unsigned char input[16],
-                                  unsigned char output[16] )
+int mbedtls_internal_aes_encrypt(mbedtls_aes_context *ctx,
+                                 const unsigned char input[16],
+                                 unsigned char output[16])
 {
     int i;
     uint32_t *RK, X0, X1, X2, X3, Y0, Y1, Y2, Y3;
 
     RK = ctx->rk;
 
-    GET_UINT32_LE( X0, input,  0 ); X0 ^= *RK++;
-    GET_UINT32_LE( X1, input,  4 ); X1 ^= *RK++;
-    GET_UINT32_LE( X2, input,  8 ); X2 ^= *RK++;
-    GET_UINT32_LE( X3, input, 12 ); X3 ^= *RK++;
+    GET_UINT32_LE(X0, input,  0);
+    X0 ^= *RK++;
+    GET_UINT32_LE(X1, input,  4);
+    X1 ^= *RK++;
+    GET_UINT32_LE(X2, input,  8);
+    X2 ^= *RK++;
+    GET_UINT32_LE(X3, input, 12);
+    X3 ^= *RK++;
 
-    for( i = ( ctx->nr >> 1 ) - 1; i > 0; i-- )
-    {
-        AES_FROUND( Y0, Y1, Y2, Y3, X0, X1, X2, X3 );
-        AES_FROUND( X0, X1, X2, X3, Y0, Y1, Y2, Y3 );
+    for (i = (ctx->nr >> 1) - 1; i > 0; i--) {
+        AES_FROUND(Y0, Y1, Y2, Y3, X0, X1, X2, X3);
+        AES_FROUND(X0, X1, X2, X3, Y0, Y1, Y2, Y3);
     }
 
-    AES_FROUND( Y0, Y1, Y2, Y3, X0, X1, X2, X3 );
+    AES_FROUND(Y0, Y1, Y2, Y3, X0, X1, X2, X3);
 
     X0 = *RK++ ^ \
-            ( (uint32_t) FSb[ ( Y0       ) & 0xFF ]       ) ^
-            ( (uint32_t) FSb[ ( Y1 >>  8 ) & 0xFF ] <<  8 ) ^
-            ( (uint32_t) FSb[ ( Y2 >> 16 ) & 0xFF ] << 16 ) ^
-            ( (uint32_t) FSb[ ( Y3 >> 24 ) & 0xFF ] << 24 );
+         ((uint32_t) FSb[(Y0) & 0xFF ]) ^
+         ((uint32_t) FSb[(Y1 >>  8) & 0xFF ] <<  8) ^
+         ((uint32_t) FSb[(Y2 >> 16) & 0xFF ] << 16) ^
+         ((uint32_t) FSb[(Y3 >> 24) & 0xFF ] << 24);
 
     X1 = *RK++ ^ \
-            ( (uint32_t) FSb[ ( Y1       ) & 0xFF ]       ) ^
-            ( (uint32_t) FSb[ ( Y2 >>  8 ) & 0xFF ] <<  8 ) ^
-            ( (uint32_t) FSb[ ( Y3 >> 16 ) & 0xFF ] << 16 ) ^
-            ( (uint32_t) FSb[ ( Y0 >> 24 ) & 0xFF ] << 24 );
+         ((uint32_t) FSb[(Y1) & 0xFF ]) ^
+         ((uint32_t) FSb[(Y2 >>  8) & 0xFF ] <<  8) ^
+         ((uint32_t) FSb[(Y3 >> 16) & 0xFF ] << 16) ^
+         ((uint32_t) FSb[(Y0 >> 24) & 0xFF ] << 24);
 
     X2 = *RK++ ^ \
-            ( (uint32_t) FSb[ ( Y2       ) & 0xFF ]       ) ^
-            ( (uint32_t) FSb[ ( Y3 >>  8 ) & 0xFF ] <<  8 ) ^
-            ( (uint32_t) FSb[ ( Y0 >> 16 ) & 0xFF ] << 16 ) ^
-            ( (uint32_t) FSb[ ( Y1 >> 24 ) & 0xFF ] << 24 );
+         ((uint32_t) FSb[(Y2) & 0xFF ]) ^
+         ((uint32_t) FSb[(Y3 >>  8) & 0xFF ] <<  8) ^
+         ((uint32_t) FSb[(Y0 >> 16) & 0xFF ] << 16) ^
+         ((uint32_t) FSb[(Y1 >> 24) & 0xFF ] << 24);
 
     X3 = *RK++ ^ \
-            ( (uint32_t) FSb[ ( Y3       ) & 0xFF ]       ) ^
-            ( (uint32_t) FSb[ ( Y0 >>  8 ) & 0xFF ] <<  8 ) ^
-            ( (uint32_t) FSb[ ( Y1 >> 16 ) & 0xFF ] << 16 ) ^
-            ( (uint32_t) FSb[ ( Y2 >> 24 ) & 0xFF ] << 24 );
+         ((uint32_t) FSb[(Y3) & 0xFF ]) ^
+         ((uint32_t) FSb[(Y0 >>  8) & 0xFF ] <<  8) ^
+         ((uint32_t) FSb[(Y1 >> 16) & 0xFF ] << 16) ^
+         ((uint32_t) FSb[(Y2 >> 24) & 0xFF ] << 24);
 
-    PUT_UINT32_LE( X0, output,  0 );
-    PUT_UINT32_LE( X1, output,  4 );
-    PUT_UINT32_LE( X2, output,  8 );
-    PUT_UINT32_LE( X3, output, 12 );
+    PUT_UINT32_LE(X0, output,  0);
+    PUT_UINT32_LE(X1, output,  4);
+    PUT_UINT32_LE(X2, output,  8);
+    PUT_UINT32_LE(X3, output, 12);
 
-    return( 0 );
+    return (0);
 }
 #endif /* !MBEDTLS_AES_ENCRYPT_ALT */
 
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
-void mbedtls_aes_encrypt( mbedtls_aes_context *ctx,
-                          const unsigned char input[16],
-                          unsigned char output[16] )
+void mbedtls_aes_encrypt(mbedtls_aes_context *ctx,
+                         const unsigned char input[16],
+                         unsigned char output[16])
 {
-    mbedtls_internal_aes_encrypt( ctx, input, output );
+    mbedtls_internal_aes_encrypt(ctx, input, output);
 }
 #endif /* !MBEDTLS_DEPRECATED_REMOVED */
 
@@ -910,88 +909,90 @@ void mbedtls_aes_encrypt( mbedtls_aes_context *ctx,
  * AES-ECB block decryption
  */
 #if !defined(MBEDTLS_AES_DECRYPT_ALT)
-int mbedtls_internal_aes_decrypt( mbedtls_aes_context *ctx,
-                                  const unsigned char input[16],
-                                  unsigned char output[16] )
+int mbedtls_internal_aes_decrypt(mbedtls_aes_context *ctx,
+                                 const unsigned char input[16],
+                                 unsigned char output[16])
 {
     int i;
     uint32_t *RK, X0, X1, X2, X3, Y0, Y1, Y2, Y3;
 
     RK = ctx->rk;
 
-    GET_UINT32_LE( X0, input,  0 ); X0 ^= *RK++;
-    GET_UINT32_LE( X1, input,  4 ); X1 ^= *RK++;
-    GET_UINT32_LE( X2, input,  8 ); X2 ^= *RK++;
-    GET_UINT32_LE( X3, input, 12 ); X3 ^= *RK++;
+    GET_UINT32_LE(X0, input,  0);
+    X0 ^= *RK++;
+    GET_UINT32_LE(X1, input,  4);
+    X1 ^= *RK++;
+    GET_UINT32_LE(X2, input,  8);
+    X2 ^= *RK++;
+    GET_UINT32_LE(X3, input, 12);
+    X3 ^= *RK++;
 
-    for( i = ( ctx->nr >> 1 ) - 1; i > 0; i-- )
-    {
-        AES_RROUND( Y0, Y1, Y2, Y3, X0, X1, X2, X3 );
-        AES_RROUND( X0, X1, X2, X3, Y0, Y1, Y2, Y3 );
+    for (i = (ctx->nr >> 1) - 1; i > 0; i--) {
+        AES_RROUND(Y0, Y1, Y2, Y3, X0, X1, X2, X3);
+        AES_RROUND(X0, X1, X2, X3, Y0, Y1, Y2, Y3);
     }
 
-    AES_RROUND( Y0, Y1, Y2, Y3, X0, X1, X2, X3 );
+    AES_RROUND(Y0, Y1, Y2, Y3, X0, X1, X2, X3);
 
     X0 = *RK++ ^ \
-            ( (uint32_t) RSb[ ( Y0       ) & 0xFF ]       ) ^
-            ( (uint32_t) RSb[ ( Y3 >>  8 ) & 0xFF ] <<  8 ) ^
-            ( (uint32_t) RSb[ ( Y2 >> 16 ) & 0xFF ] << 16 ) ^
-            ( (uint32_t) RSb[ ( Y1 >> 24 ) & 0xFF ] << 24 );
+         ((uint32_t) RSb[(Y0) & 0xFF ]) ^
+         ((uint32_t) RSb[(Y3 >>  8) & 0xFF ] <<  8) ^
+         ((uint32_t) RSb[(Y2 >> 16) & 0xFF ] << 16) ^
+         ((uint32_t) RSb[(Y1 >> 24) & 0xFF ] << 24);
 
     X1 = *RK++ ^ \
-            ( (uint32_t) RSb[ ( Y1       ) & 0xFF ]       ) ^
-            ( (uint32_t) RSb[ ( Y0 >>  8 ) & 0xFF ] <<  8 ) ^
-            ( (uint32_t) RSb[ ( Y3 >> 16 ) & 0xFF ] << 16 ) ^
-            ( (uint32_t) RSb[ ( Y2 >> 24 ) & 0xFF ] << 24 );
+         ((uint32_t) RSb[(Y1) & 0xFF ]) ^
+         ((uint32_t) RSb[(Y0 >>  8) & 0xFF ] <<  8) ^
+         ((uint32_t) RSb[(Y3 >> 16) & 0xFF ] << 16) ^
+         ((uint32_t) RSb[(Y2 >> 24) & 0xFF ] << 24);
 
     X2 = *RK++ ^ \
-            ( (uint32_t) RSb[ ( Y2       ) & 0xFF ]       ) ^
-            ( (uint32_t) RSb[ ( Y1 >>  8 ) & 0xFF ] <<  8 ) ^
-            ( (uint32_t) RSb[ ( Y0 >> 16 ) & 0xFF ] << 16 ) ^
-            ( (uint32_t) RSb[ ( Y3 >> 24 ) & 0xFF ] << 24 );
+         ((uint32_t) RSb[(Y2) & 0xFF ]) ^
+         ((uint32_t) RSb[(Y1 >>  8) & 0xFF ] <<  8) ^
+         ((uint32_t) RSb[(Y0 >> 16) & 0xFF ] << 16) ^
+         ((uint32_t) RSb[(Y3 >> 24) & 0xFF ] << 24);
 
     X3 = *RK++ ^ \
-            ( (uint32_t) RSb[ ( Y3       ) & 0xFF ]       ) ^
-            ( (uint32_t) RSb[ ( Y2 >>  8 ) & 0xFF ] <<  8 ) ^
-            ( (uint32_t) RSb[ ( Y1 >> 16 ) & 0xFF ] << 16 ) ^
-            ( (uint32_t) RSb[ ( Y0 >> 24 ) & 0xFF ] << 24 );
+         ((uint32_t) RSb[(Y3) & 0xFF ]) ^
+         ((uint32_t) RSb[(Y2 >>  8) & 0xFF ] <<  8) ^
+         ((uint32_t) RSb[(Y1 >> 16) & 0xFF ] << 16) ^
+         ((uint32_t) RSb[(Y0 >> 24) & 0xFF ] << 24);
 
-    PUT_UINT32_LE( X0, output,  0 );
-    PUT_UINT32_LE( X1, output,  4 );
-    PUT_UINT32_LE( X2, output,  8 );
-    PUT_UINT32_LE( X3, output, 12 );
+    PUT_UINT32_LE(X0, output,  0);
+    PUT_UINT32_LE(X1, output,  4);
+    PUT_UINT32_LE(X2, output,  8);
+    PUT_UINT32_LE(X3, output, 12);
 
-    return( 0 );
+    return (0);
 }
 #endif /* !MBEDTLS_AES_DECRYPT_ALT */
 
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
-void mbedtls_aes_decrypt( mbedtls_aes_context *ctx,
-                          const unsigned char input[16],
-                          unsigned char output[16] )
+void mbedtls_aes_decrypt(mbedtls_aes_context *ctx,
+                         const unsigned char input[16],
+                         unsigned char output[16])
 {
-    mbedtls_internal_aes_decrypt( ctx, input, output );
+    mbedtls_internal_aes_decrypt(ctx, input, output);
 }
 #endif /* !MBEDTLS_DEPRECATED_REMOVED */
 
 /*
  * AES-ECB block encryption/decryption
  */
-int mbedtls_aes_crypt_ecb( mbedtls_aes_context *ctx,
-                    int mode,
-                    const unsigned char input[16],
-                    unsigned char output[16] )
+int mbedtls_aes_crypt_ecb(mbedtls_aes_context *ctx,
+                          int mode,
+                          const unsigned char input[16],
+                          unsigned char output[16])
 {
 #if defined(MBEDTLS_AESNI_C) && defined(MBEDTLS_HAVE_X86_64)
-    if( mbedtls_aesni_has_support( MBEDTLS_AESNI_AES ) )
-        return( mbedtls_aesni_crypt_ecb( ctx, mode, input, output ) );
+    if (mbedtls_aesni_has_support(MBEDTLS_AESNI_AES))
+        return (mbedtls_aesni_crypt_ecb(ctx, mode, input, output));
 #endif
 
 #if defined(MBEDTLS_PADLOCK_C) && defined(MBEDTLS_HAVE_X86)
-    if( aes_padlock_ace )
-    {
-        if( mbedtls_padlock_xcryptecb( ctx, mode, input, output ) == 0 )
-            return( 0 );
+    if (aes_padlock_ace) {
+        if (mbedtls_padlock_xcryptecb(ctx, mode, input, output) == 0)
+            return (0);
 
         // If padlock data misaligned, we just fall back to
         // unaccelerated mode
@@ -999,34 +1000,33 @@ int mbedtls_aes_crypt_ecb( mbedtls_aes_context *ctx,
     }
 #endif
 
-    if( mode == MBEDTLS_AES_ENCRYPT )
-        return( mbedtls_internal_aes_encrypt( ctx, input, output ) );
+    if (mode == MBEDTLS_AES_ENCRYPT)
+        return (mbedtls_internal_aes_encrypt(ctx, input, output));
     else
-        return( mbedtls_internal_aes_decrypt( ctx, input, output ) );
+        return (mbedtls_internal_aes_decrypt(ctx, input, output));
 }
 
 #if defined(MBEDTLS_CIPHER_MODE_CBC)
 /*
  * AES-CBC buffer encryption/decryption
  */
-int mbedtls_aes_crypt_cbc( mbedtls_aes_context *ctx,
-                    int mode,
-                    size_t length,
-                    unsigned char iv[16],
-                    const unsigned char *input,
-                    unsigned char *output )
+int mbedtls_aes_crypt_cbc(mbedtls_aes_context *ctx,
+                          int mode,
+                          size_t length,
+                          unsigned char iv[16],
+                          const unsigned char *input,
+                          unsigned char *output)
 {
     int i;
     unsigned char temp[16];
 
-    if( length % 16 )
-        return( MBEDTLS_ERR_AES_INVALID_INPUT_LENGTH );
+    if (length % 16)
+        return (MBEDTLS_ERR_AES_INVALID_INPUT_LENGTH);
 
 #if defined(MBEDTLS_PADLOCK_C) && defined(MBEDTLS_HAVE_X86)
-    if( aes_padlock_ace )
-    {
-        if( mbedtls_padlock_xcryptcbc( ctx, mode, length, iv, input, output ) == 0 )
-            return( 0 );
+    if (aes_padlock_ace) {
+        if (mbedtls_padlock_xcryptcbc(ctx, mode, length, iv, input, output) == 0)
+            return (0);
 
         // If padlock data misaligned, we just fall back to
         // unaccelerated mode
@@ -1034,32 +1034,27 @@ int mbedtls_aes_crypt_cbc( mbedtls_aes_context *ctx,
     }
 #endif
 
-    if( mode == MBEDTLS_AES_DECRYPT )
-    {
-        while( length > 0 )
-        {
-            memcpy( temp, input, 16 );
-            mbedtls_aes_crypt_ecb( ctx, mode, input, output );
+    if (mode == MBEDTLS_AES_DECRYPT) {
+        while (length > 0) {
+            memcpy(temp, input, 16);
+            mbedtls_aes_crypt_ecb(ctx, mode, input, output);
 
-            for( i = 0; i < 16; i++ )
-                output[i] = (unsigned char)( output[i] ^ iv[i] );
+            for (i = 0; i < 16; i++)
+                output[i] = (unsigned char)(output[i] ^ iv[i]);
 
-            memcpy( iv, temp, 16 );
+            memcpy(iv, temp, 16);
 
             input  += 16;
             output += 16;
             length -= 16;
         }
-    }
-    else
-    {
-        while( length > 0 )
-        {
-            for( i = 0; i < 16; i++ )
-                output[i] = (unsigned char)( input[i] ^ iv[i] );
+    } else {
+        while (length > 0) {
+            for (i = 0; i < 16; i++)
+                output[i] = (unsigned char)(input[i] ^ iv[i]);
 
-            mbedtls_aes_crypt_ecb( ctx, mode, output, output );
-            memcpy( iv, output, 16 );
+            mbedtls_aes_crypt_ecb(ctx, mode, output, output);
+            memcpy(iv, output, 16);
 
             input  += 16;
             output += 16;
@@ -1067,7 +1062,7 @@ int mbedtls_aes_crypt_cbc( mbedtls_aes_context *ctx,
         }
     }
 
-    return( 0 );
+    return (0);
 }
 #endif /* MBEDTLS_CIPHER_MODE_CBC */
 
@@ -1076,30 +1071,30 @@ int mbedtls_aes_crypt_cbc( mbedtls_aes_context *ctx,
 /* Endianess with 64 bits values */
 #ifndef GET_UINT64_LE
 #define GET_UINT64_LE(n,b,i)                            \
-{                                                       \
-    (n) = ( (uint64_t) (b)[(i) + 7] << 56 )             \
-        | ( (uint64_t) (b)[(i) + 6] << 48 )             \
-        | ( (uint64_t) (b)[(i) + 5] << 40 )             \
-        | ( (uint64_t) (b)[(i) + 4] << 32 )             \
-        | ( (uint64_t) (b)[(i) + 3] << 24 )             \
-        | ( (uint64_t) (b)[(i) + 2] << 16 )             \
-        | ( (uint64_t) (b)[(i) + 1] <<  8 )             \
-        | ( (uint64_t) (b)[(i)    ]       );            \
-}
+    {                                                       \
+        (n) = ( (uint64_t) (b)[(i) + 7] << 56 )             \
+              | ( (uint64_t) (b)[(i) + 6] << 48 )             \
+              | ( (uint64_t) (b)[(i) + 5] << 40 )             \
+              | ( (uint64_t) (b)[(i) + 4] << 32 )             \
+              | ( (uint64_t) (b)[(i) + 3] << 24 )             \
+              | ( (uint64_t) (b)[(i) + 2] << 16 )             \
+              | ( (uint64_t) (b)[(i) + 1] <<  8 )             \
+              | ( (uint64_t) (b)[(i)    ]       );            \
+    }
 #endif
 
 #ifndef PUT_UINT64_LE
 #define PUT_UINT64_LE(n,b,i)                            \
-{                                                       \
-    (b)[(i) + 7] = (unsigned char) ( (n) >> 56 );       \
-    (b)[(i) + 6] = (unsigned char) ( (n) >> 48 );       \
-    (b)[(i) + 5] = (unsigned char) ( (n) >> 40 );       \
-    (b)[(i) + 4] = (unsigned char) ( (n) >> 32 );       \
-    (b)[(i) + 3] = (unsigned char) ( (n) >> 24 );       \
-    (b)[(i) + 2] = (unsigned char) ( (n) >> 16 );       \
-    (b)[(i) + 1] = (unsigned char) ( (n) >>  8 );       \
-    (b)[(i)    ] = (unsigned char) ( (n)       );       \
-}
+    {                                                       \
+        (b)[(i) + 7] = (unsigned char) ( (n) >> 56 );       \
+        (b)[(i) + 6] = (unsigned char) ( (n) >> 48 );       \
+        (b)[(i) + 5] = (unsigned char) ( (n) >> 40 );       \
+        (b)[(i) + 4] = (unsigned char) ( (n) >> 32 );       \
+        (b)[(i) + 3] = (unsigned char) ( (n) >> 24 );       \
+        (b)[(i) + 2] = (unsigned char) ( (n) >> 16 );       \
+        (b)[(i) + 1] = (unsigned char) ( (n) >>  8 );       \
+        (b)[(i)    ] = (unsigned char) ( (n)       );       \
+    }
 #endif
 
 typedef unsigned char mbedtls_be128[16];
@@ -1112,30 +1107,30 @@ typedef unsigned char mbedtls_be128[16];
  * for machine endianess and hence works correctly on both big and little
  * endian machines.
  */
-static void mbedtls_gf128mul_x_ble( unsigned char r[16],
-                                    const unsigned char x[16] )
+static void mbedtls_gf128mul_x_ble(unsigned char r[16],
+                                   const unsigned char x[16])
 {
     uint64_t a, b, ra, rb;
 
-    GET_UINT64_LE( a, x, 0 );
-    GET_UINT64_LE( b, x, 8 );
+    GET_UINT64_LE(a, x, 0);
+    GET_UINT64_LE(b, x, 8);
 
-    ra = ( a << 1 )  ^ 0x0087 >> ( 8 - ( ( b >> 63 ) << 3 ) );
-    rb = ( a >> 63 ) | ( b << 1 );
+    ra = (a << 1)  ^ 0x0087 >> (8 - ((b >> 63) << 3));
+    rb = (a >> 63) | (b << 1);
 
-    PUT_UINT64_LE( ra, r, 0 );
-    PUT_UINT64_LE( rb, r, 8 );
+    PUT_UINT64_LE(ra, r, 0);
+    PUT_UINT64_LE(rb, r, 8);
 }
 
 /*
  * AES-XTS buffer encryption/decryption
  */
-int mbedtls_aes_crypt_xts( mbedtls_aes_xts_context *ctx,
-                           int mode,
-                           size_t length,
-                           const unsigned char data_unit[16],
-                           const unsigned char *input,
-                           unsigned char *output )
+int mbedtls_aes_crypt_xts(mbedtls_aes_xts_context *ctx,
+                          int mode,
+                          size_t length,
+                          const unsigned char data_unit[16],
+                          const unsigned char *input,
+                          unsigned char *output)
 {
     int ret;
     size_t blocks = length / 16;
@@ -1145,53 +1140,50 @@ int mbedtls_aes_crypt_xts( mbedtls_aes_xts_context *ctx,
     unsigned char tmp[16];
 
     /* Sectors must be at least 16 bytes. */
-    if( length < 16 )
+    if (length < 16)
         return MBEDTLS_ERR_AES_INVALID_INPUT_LENGTH;
 
     /* NIST SP 80-38E disallows data units larger than 2**20 blocks. */
-    if( length > ( 1 << 20 ) * 16 )
+    if (length > (1 << 20) * 16)
         return MBEDTLS_ERR_AES_INVALID_INPUT_LENGTH;
 
     /* Compute the tweak. */
-    ret = mbedtls_aes_crypt_ecb( &ctx->tweak, MBEDTLS_AES_ENCRYPT,
-                                 data_unit, tweak );
-    if( ret != 0 )
-        return( ret );
+    ret = mbedtls_aes_crypt_ecb(&ctx->tweak, MBEDTLS_AES_ENCRYPT,
+                                data_unit, tweak);
+    if (ret != 0)
+        return (ret);
 
-    while( blocks-- )
-    {
+    while (blocks--) {
         size_t i;
 
-        if( leftover && ( mode == MBEDTLS_AES_DECRYPT ) && blocks == 0 )
-        {
+        if (leftover && (mode == MBEDTLS_AES_DECRYPT) && blocks == 0) {
             /* We are on the last block in a decrypt operation that has
              * leftover bytes, so we need to use the next tweak for this block,
              * and this tweak for the lefover bytes. Save the current tweak for
              * the leftovers and then update the current tweak for use on this,
              * the last full block. */
-            memcpy( prev_tweak, tweak, sizeof( tweak ) );
-            mbedtls_gf128mul_x_ble( tweak, tweak );
+            memcpy(prev_tweak, tweak, sizeof(tweak));
+            mbedtls_gf128mul_x_ble(tweak, tweak);
         }
 
-        for( i = 0; i < 16; i++ )
+        for (i = 0; i < 16; i++)
             tmp[i] = input[i] ^ tweak[i];
 
-        ret = mbedtls_aes_crypt_ecb( &ctx->crypt, mode, tmp, tmp );
-        if( ret != 0 )
-            return( ret );
+        ret = mbedtls_aes_crypt_ecb(&ctx->crypt, mode, tmp, tmp);
+        if (ret != 0)
+            return (ret);
 
-        for( i = 0; i < 16; i++ )
+        for (i = 0; i < 16; i++)
             output[i] = tmp[i] ^ tweak[i];
 
         /* Update the tweak for the next block. */
-        mbedtls_gf128mul_x_ble( tweak, tweak );
+        mbedtls_gf128mul_x_ble(tweak, tweak);
 
         output += 16;
         input += 16;
     }
 
-    if( leftover )
-    {
+    if (leftover) {
         /* If we are on the leftover bytes in a decrypt operation, we need to
          * use the previous tweak for these bytes (as saved in prev_tweak). */
         unsigned char *t = mode == MBEDTLS_AES_DECRYPT ? prev_tweak : tweak;
@@ -1205,28 +1197,27 @@ int mbedtls_aes_crypt_xts( mbedtls_aes_xts_context *ctx,
          * byte of cyphertext we won't steal. At the same time, copy the
          * remainder of the input for this final round (since the loop bounds
          * are the same). */
-        for( i = 0; i < leftover; i++ )
-        {
+        for (i = 0; i < leftover; i++) {
             output[i] = prev_output[i];
             tmp[i] = input[i] ^ t[i];
         }
 
         /* Copy ciphertext bytes from the previous block for input in this
          * round. */
-        for( ; i < 16; i++ )
+        for (; i < 16; i++)
             tmp[i] = prev_output[i] ^ t[i];
 
-        ret = mbedtls_aes_crypt_ecb( &ctx->crypt, mode, tmp, tmp );
-        if( ret != 0 )
+        ret = mbedtls_aes_crypt_ecb(&ctx->crypt, mode, tmp, tmp);
+        if (ret != 0)
             return ret;
 
         /* Write the result back to the previous block, overriding the previous
          * output we copied. */
-        for( i = 0; i < 16; i++ )
+        for (i = 0; i < 16; i++)
             prev_output[i] = tmp[i] ^ t[i];
     }
 
-    return( 0 );
+    return (0);
 }
 #endif /* MBEDTLS_CIPHER_MODE_XTS */
 
@@ -1234,79 +1225,73 @@ int mbedtls_aes_crypt_xts( mbedtls_aes_xts_context *ctx,
 /*
  * AES-CFB128 buffer encryption/decryption
  */
-int mbedtls_aes_crypt_cfb128( mbedtls_aes_context *ctx,
-                       int mode,
-                       size_t length,
-                       size_t *iv_off,
-                       unsigned char iv[16],
-                       const unsigned char *input,
-                       unsigned char *output )
+int mbedtls_aes_crypt_cfb128(mbedtls_aes_context *ctx,
+                             int mode,
+                             size_t length,
+                             size_t *iv_off,
+                             unsigned char iv[16],
+                             const unsigned char *input,
+                             unsigned char *output)
 {
     int c;
     size_t n = *iv_off;
 
-    if( mode == MBEDTLS_AES_DECRYPT )
-    {
-        while( length-- )
-        {
-            if( n == 0 )
-                mbedtls_aes_crypt_ecb( ctx, MBEDTLS_AES_ENCRYPT, iv, iv );
+    if (mode == MBEDTLS_AES_DECRYPT) {
+        while (length--) {
+            if (n == 0)
+                mbedtls_aes_crypt_ecb(ctx, MBEDTLS_AES_ENCRYPT, iv, iv);
 
             c = *input++;
-            *output++ = (unsigned char)( c ^ iv[n] );
+            *output++ = (unsigned char)(c ^ iv[n]);
             iv[n] = (unsigned char) c;
 
-            n = ( n + 1 ) & 0x0F;
+            n = (n + 1) & 0x0F;
         }
-    }
-    else
-    {
-        while( length-- )
-        {
-            if( n == 0 )
-                mbedtls_aes_crypt_ecb( ctx, MBEDTLS_AES_ENCRYPT, iv, iv );
+    } else {
+        while (length--) {
+            if (n == 0)
+                mbedtls_aes_crypt_ecb(ctx, MBEDTLS_AES_ENCRYPT, iv, iv);
 
-            iv[n] = *output++ = (unsigned char)( iv[n] ^ *input++ );
+            iv[n] = *output++ = (unsigned char)(iv[n] ^ *input++);
 
-            n = ( n + 1 ) & 0x0F;
+            n = (n + 1) & 0x0F;
         }
     }
 
     *iv_off = n;
 
-    return( 0 );
+    return (0);
 }
 
 /*
  * AES-CFB8 buffer encryption/decryption
  */
-int mbedtls_aes_crypt_cfb8( mbedtls_aes_context *ctx,
-                       int mode,
-                       size_t length,
-                       unsigned char iv[16],
-                       const unsigned char *input,
-                       unsigned char *output )
+int mbedtls_aes_crypt_cfb8(mbedtls_aes_context *ctx,
+                           int mode,
+                           size_t length,
+                           unsigned char iv[16],
+                           const unsigned char *input,
+                           unsigned char *output)
 {
     unsigned char c;
     unsigned char ov[17];
 
-    while( length-- )
-    {
-        memcpy( ov, iv, 16 );
-        mbedtls_aes_crypt_ecb( ctx, MBEDTLS_AES_ENCRYPT, iv, iv );
+    while (length--) {
+        memcpy(ov, iv, 16);
+        mbedtls_aes_crypt_ecb(ctx, MBEDTLS_AES_ENCRYPT, iv, iv);
 
-        if( mode == MBEDTLS_AES_DECRYPT )
+        if (mode == MBEDTLS_AES_DECRYPT)
             ov[16] = *input;
 
-        c = *output++ = (unsigned char)( iv[0] ^ *input++ );
+        c = *output++ = (unsigned char)(iv[0] ^ *input++);
 
-        if( mode == MBEDTLS_AES_ENCRYPT )
+        if (mode == MBEDTLS_AES_ENCRYPT)
             ov[16] = c;
 
-        memcpy( iv, ov + 1, 16 );
+        memcpy(iv, ov + 1, 16);
     }
 
-    return( 0 );
+    return (0);
 }
 #endif /* MBEDTLS_CIPHER_MODE_CFB */
 
@@ -1314,33 +1299,31 @@ int mbedtls_aes_crypt_cfb8( mbedtls_aes_context *ctx,
 /*
  * AES-OFB (Output Feedback Mode) buffer encryption/decryption
  */
-int mbedtls_aes_crypt_ofb( mbedtls_aes_context *ctx,
-                           size_t length,
-                           size_t *iv_off,
-                           unsigned char iv[16],
-                           const unsigned char *input,
-                           unsigned char *output )
+int mbedtls_aes_crypt_ofb(mbedtls_aes_context *ctx,
+                          size_t length,
+                          size_t *iv_off,
+                          unsigned char iv[16],
+                          const unsigned char *input,
+                          unsigned char *output)
 {
     int ret = 0;
     size_t n = *iv_off;
 
-    while( length-- )
-    {
-        if( n == 0 )
-        {
-            ret = mbedtls_aes_crypt_ecb( ctx, MBEDTLS_AES_ENCRYPT, iv, iv );
-            if( ret != 0 )
+    while (length--) {
+        if (n == 0) {
+            ret = mbedtls_aes_crypt_ecb(ctx, MBEDTLS_AES_ENCRYPT, iv, iv);
+            if (ret != 0)
                 goto exit;
         }
         *output++ =  *input++ ^ iv[n];
 
-        n = ( n + 1 ) & 0x0F;
+        n = (n + 1) & 0x0F;
     }
 
     *iv_off = n;
 
 exit:
-    return( ret );
+    return (ret);
 }
 #endif /* MBEDTLS_CIPHER_MODE_OFB */
 
@@ -1348,38 +1331,37 @@ exit:
 /*
  * AES-CTR buffer encryption/decryption
  */
-int mbedtls_aes_crypt_ctr( mbedtls_aes_context *ctx,
-                       size_t length,
-                       size_t *nc_off,
-                       unsigned char nonce_counter[16],
-                       unsigned char stream_block[16],
-                       const unsigned char *input,
-                       unsigned char *output )
+int mbedtls_aes_crypt_ctr(mbedtls_aes_context *ctx,
+                          size_t length,
+                          size_t *nc_off,
+                          unsigned char nonce_counter[16],
+                          unsigned char stream_block[16],
+                          const unsigned char *input,
+                          unsigned char *output)
 {
     int c, i;
     size_t n = *nc_off;
 
-    if ( n > 0x0F )
-        return( MBEDTLS_ERR_AES_BAD_INPUT_DATA );
+    if (n > 0x0F)
+        return (MBEDTLS_ERR_AES_BAD_INPUT_DATA);
 
-    while( length-- )
-    {
-        if( n == 0 ) {
-            mbedtls_aes_crypt_ecb( ctx, MBEDTLS_AES_ENCRYPT, nonce_counter, stream_block );
+    while (length--) {
+        if (n == 0) {
+            mbedtls_aes_crypt_ecb(ctx, MBEDTLS_AES_ENCRYPT, nonce_counter, stream_block);
 
-            for( i = 16; i > 0; i-- )
-                if( ++nonce_counter[i - 1] != 0 )
+            for (i = 16; i > 0; i--)
+                if (++nonce_counter[i - 1] != 0)
                     break;
         }
         c = *input++;
-        *output++ = (unsigned char)( c ^ stream_block[n] );
+        *output++ = (unsigned char)(c ^ stream_block[n]);
 
-        n = ( n + 1 ) & 0x0F;
+        n = (n + 1) & 0x0F;
     }
 
     *nc_off = n;
 
-    return( 0 );
+    return (0);
 }
 #endif /* MBEDTLS_CIPHER_MODE_CTR */
 
@@ -1391,45 +1373,65 @@ int mbedtls_aes_crypt_ctr( mbedtls_aes_context *ctx,
  *
  * http://csrc.nist.gov/archive/aes/rijndael/rijndael-vals.zip
  */
-static const unsigned char aes_test_ecb_dec[3][16] =
-{
-    { 0x44, 0x41, 0x6A, 0xC2, 0xD1, 0xF5, 0x3C, 0x58,
-      0x33, 0x03, 0x91, 0x7E, 0x6B, 0xE9, 0xEB, 0xE0 },
-    { 0x48, 0xE3, 0x1E, 0x9E, 0x25, 0x67, 0x18, 0xF2,
-      0x92, 0x29, 0x31, 0x9C, 0x19, 0xF1, 0x5B, 0xA4 },
-    { 0x05, 0x8C, 0xCF, 0xFD, 0xBB, 0xCB, 0x38, 0x2D,
-      0x1F, 0x6F, 0x56, 0x58, 0x5D, 0x8A, 0x4A, 0xDE }
+static const unsigned char aes_test_ecb_dec[3][16] = {
+    {
+        0x44, 0x41, 0x6A, 0xC2, 0xD1, 0xF5, 0x3C, 0x58,
+        0x33, 0x03, 0x91, 0x7E, 0x6B, 0xE9, 0xEB, 0xE0
+    },
+    {
+        0x48, 0xE3, 0x1E, 0x9E, 0x25, 0x67, 0x18, 0xF2,
+        0x92, 0x29, 0x31, 0x9C, 0x19, 0xF1, 0x5B, 0xA4
+    },
+    {
+        0x05, 0x8C, 0xCF, 0xFD, 0xBB, 0xCB, 0x38, 0x2D,
+        0x1F, 0x6F, 0x56, 0x58, 0x5D, 0x8A, 0x4A, 0xDE
+    }
 };
 
-static const unsigned char aes_test_ecb_enc[3][16] =
-{
-    { 0xC3, 0x4C, 0x05, 0x2C, 0xC0, 0xDA, 0x8D, 0x73,
-      0x45, 0x1A, 0xFE, 0x5F, 0x03, 0xBE, 0x29, 0x7F },
-    { 0xF3, 0xF6, 0x75, 0x2A, 0xE8, 0xD7, 0x83, 0x11,
-      0x38, 0xF0, 0x41, 0x56, 0x06, 0x31, 0xB1, 0x14 },
-    { 0x8B, 0x79, 0xEE, 0xCC, 0x93, 0xA0, 0xEE, 0x5D,
-      0xFF, 0x30, 0xB4, 0xEA, 0x21, 0x63, 0x6D, 0xA4 }
+static const unsigned char aes_test_ecb_enc[3][16] = {
+    {
+        0xC3, 0x4C, 0x05, 0x2C, 0xC0, 0xDA, 0x8D, 0x73,
+        0x45, 0x1A, 0xFE, 0x5F, 0x03, 0xBE, 0x29, 0x7F
+    },
+    {
+        0xF3, 0xF6, 0x75, 0x2A, 0xE8, 0xD7, 0x83, 0x11,
+        0x38, 0xF0, 0x41, 0x56, 0x06, 0x31, 0xB1, 0x14
+    },
+    {
+        0x8B, 0x79, 0xEE, 0xCC, 0x93, 0xA0, 0xEE, 0x5D,
+        0xFF, 0x30, 0xB4, 0xEA, 0x21, 0x63, 0x6D, 0xA4
+    }
 };
 
 #if defined(MBEDTLS_CIPHER_MODE_CBC)
-static const unsigned char aes_test_cbc_dec[3][16] =
-{
-    { 0xFA, 0xCA, 0x37, 0xE0, 0xB0, 0xC8, 0x53, 0x73,
-      0xDF, 0x70, 0x6E, 0x73, 0xF7, 0xC9, 0xAF, 0x86 },
-    { 0x5D, 0xF6, 0x78, 0xDD, 0x17, 0xBA, 0x4E, 0x75,
-      0xB6, 0x17, 0x68, 0xC6, 0xAD, 0xEF, 0x7C, 0x7B },
-    { 0x48, 0x04, 0xE1, 0x81, 0x8F, 0xE6, 0x29, 0x75,
-      0x19, 0xA3, 0xE8, 0x8C, 0x57, 0x31, 0x04, 0x13 }
+static const unsigned char aes_test_cbc_dec[3][16] = {
+    {
+        0xFA, 0xCA, 0x37, 0xE0, 0xB0, 0xC8, 0x53, 0x73,
+        0xDF, 0x70, 0x6E, 0x73, 0xF7, 0xC9, 0xAF, 0x86
+    },
+    {
+        0x5D, 0xF6, 0x78, 0xDD, 0x17, 0xBA, 0x4E, 0x75,
+        0xB6, 0x17, 0x68, 0xC6, 0xAD, 0xEF, 0x7C, 0x7B
+    },
+    {
+        0x48, 0x04, 0xE1, 0x81, 0x8F, 0xE6, 0x29, 0x75,
+        0x19, 0xA3, 0xE8, 0x8C, 0x57, 0x31, 0x04, 0x13
+    }
 };
 
-static const unsigned char aes_test_cbc_enc[3][16] =
-{
-    { 0x8A, 0x05, 0xFC, 0x5E, 0x09, 0x5A, 0xF4, 0x84,
-      0x8A, 0x08, 0xD3, 0x28, 0xD3, 0x68, 0x8E, 0x3D },
-    { 0x7B, 0xD9, 0x66, 0xD5, 0x3A, 0xD8, 0xC1, 0xBB,
-      0x85, 0xD2, 0xAD, 0xFA, 0xE8, 0x7B, 0xB1, 0x04 },
-    { 0xFE, 0x3C, 0x53, 0x65, 0x3E, 0x2F, 0x45, 0xB5,
-      0x6F, 0xCD, 0x88, 0xB2, 0xCC, 0x89, 0x8F, 0xF0 }
+static const unsigned char aes_test_cbc_enc[3][16] = {
+    {
+        0x8A, 0x05, 0xFC, 0x5E, 0x09, 0x5A, 0xF4, 0x84,
+        0x8A, 0x08, 0xD3, 0x28, 0xD3, 0x68, 0x8E, 0x3D
+    },
+    {
+        0x7B, 0xD9, 0x66, 0xD5, 0x3A, 0xD8, 0xC1, 0xBB,
+        0x85, 0xD2, 0xAD, 0xFA, 0xE8, 0x7B, 0xB1, 0x04
+    },
+    {
+        0xFE, 0x3C, 0x53, 0x65, 0x3E, 0x2F, 0x45, 0xB5,
+        0x6F, 0xCD, 0x88, 0xB2, 0xCC, 0x89, 0x8F, 0xF0
+    }
 };
 #endif /* MBEDTLS_CIPHER_MODE_CBC */
 
@@ -1439,27 +1441,30 @@ static const unsigned char aes_test_cbc_enc[3][16] =
  *
  * http://csrc.nist.gov/publications/nistpubs/800-38a/sp800-38a.pdf
  */
-static const unsigned char aes_test_cfb128_key[3][32] =
-{
-    { 0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6,
-      0xAB, 0xF7, 0x15, 0x88, 0x09, 0xCF, 0x4F, 0x3C },
-    { 0x8E, 0x73, 0xB0, 0xF7, 0xDA, 0x0E, 0x64, 0x52,
-      0xC8, 0x10, 0xF3, 0x2B, 0x80, 0x90, 0x79, 0xE5,
-      0x62, 0xF8, 0xEA, 0xD2, 0x52, 0x2C, 0x6B, 0x7B },
-    { 0x60, 0x3D, 0xEB, 0x10, 0x15, 0xCA, 0x71, 0xBE,
-      0x2B, 0x73, 0xAE, 0xF0, 0x85, 0x7D, 0x77, 0x81,
-      0x1F, 0x35, 0x2C, 0x07, 0x3B, 0x61, 0x08, 0xD7,
-      0x2D, 0x98, 0x10, 0xA3, 0x09, 0x14, 0xDF, 0xF4 }
+static const unsigned char aes_test_cfb128_key[3][32] = {
+    {
+        0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6,
+        0xAB, 0xF7, 0x15, 0x88, 0x09, 0xCF, 0x4F, 0x3C
+    },
+    {
+        0x8E, 0x73, 0xB0, 0xF7, 0xDA, 0x0E, 0x64, 0x52,
+        0xC8, 0x10, 0xF3, 0x2B, 0x80, 0x90, 0x79, 0xE5,
+        0x62, 0xF8, 0xEA, 0xD2, 0x52, 0x2C, 0x6B, 0x7B
+    },
+    {
+        0x60, 0x3D, 0xEB, 0x10, 0x15, 0xCA, 0x71, 0xBE,
+        0x2B, 0x73, 0xAE, 0xF0, 0x85, 0x7D, 0x77, 0x81,
+        0x1F, 0x35, 0x2C, 0x07, 0x3B, 0x61, 0x08, 0xD7,
+        0x2D, 0x98, 0x10, 0xA3, 0x09, 0x14, 0xDF, 0xF4
+    }
 };
 
-static const unsigned char aes_test_cfb128_iv[16] =
-{
+static const unsigned char aes_test_cfb128_iv[16] = {
     0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
     0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F
 };
 
-static const unsigned char aes_test_cfb128_pt[64] =
-{
+static const unsigned char aes_test_cfb128_pt[64] = {
     0x6B, 0xC1, 0xBE, 0xE2, 0x2E, 0x40, 0x9F, 0x96,
     0xE9, 0x3D, 0x7E, 0x11, 0x73, 0x93, 0x17, 0x2A,
     0xAE, 0x2D, 0x8A, 0x57, 0x1E, 0x03, 0xAC, 0x9C,
@@ -1470,32 +1475,37 @@ static const unsigned char aes_test_cfb128_pt[64] =
     0xAD, 0x2B, 0x41, 0x7B, 0xE6, 0x6C, 0x37, 0x10
 };
 
-static const unsigned char aes_test_cfb128_ct[3][64] =
-{
-    { 0x3B, 0x3F, 0xD9, 0x2E, 0xB7, 0x2D, 0xAD, 0x20,
-      0x33, 0x34, 0x49, 0xF8, 0xE8, 0x3C, 0xFB, 0x4A,
-      0xC8, 0xA6, 0x45, 0x37, 0xA0, 0xB3, 0xA9, 0x3F,
-      0xCD, 0xE3, 0xCD, 0xAD, 0x9F, 0x1C, 0xE5, 0x8B,
-      0x26, 0x75, 0x1F, 0x67, 0xA3, 0xCB, 0xB1, 0x40,
-      0xB1, 0x80, 0x8C, 0xF1, 0x87, 0xA4, 0xF4, 0xDF,
-      0xC0, 0x4B, 0x05, 0x35, 0x7C, 0x5D, 0x1C, 0x0E,
-      0xEA, 0xC4, 0xC6, 0x6F, 0x9F, 0xF7, 0xF2, 0xE6 },
-    { 0xCD, 0xC8, 0x0D, 0x6F, 0xDD, 0xF1, 0x8C, 0xAB,
-      0x34, 0xC2, 0x59, 0x09, 0xC9, 0x9A, 0x41, 0x74,
-      0x67, 0xCE, 0x7F, 0x7F, 0x81, 0x17, 0x36, 0x21,
-      0x96, 0x1A, 0x2B, 0x70, 0x17, 0x1D, 0x3D, 0x7A,
-      0x2E, 0x1E, 0x8A, 0x1D, 0xD5, 0x9B, 0x88, 0xB1,
-      0xC8, 0xE6, 0x0F, 0xED, 0x1E, 0xFA, 0xC4, 0xC9,
-      0xC0, 0x5F, 0x9F, 0x9C, 0xA9, 0x83, 0x4F, 0xA0,
-      0x42, 0xAE, 0x8F, 0xBA, 0x58, 0x4B, 0x09, 0xFF },
-    { 0xDC, 0x7E, 0x84, 0xBF, 0xDA, 0x79, 0x16, 0x4B,
-      0x7E, 0xCD, 0x84, 0x86, 0x98, 0x5D, 0x38, 0x60,
-      0x39, 0xFF, 0xED, 0x14, 0x3B, 0x28, 0xB1, 0xC8,
-      0x32, 0x11, 0x3C, 0x63, 0x31, 0xE5, 0x40, 0x7B,
-      0xDF, 0x10, 0x13, 0x24, 0x15, 0xE5, 0x4B, 0x92,
-      0xA1, 0x3E, 0xD0, 0xA8, 0x26, 0x7A, 0xE2, 0xF9,
-      0x75, 0xA3, 0x85, 0x74, 0x1A, 0xB9, 0xCE, 0xF8,
-      0x20, 0x31, 0x62, 0x3D, 0x55, 0xB1, 0xE4, 0x71 }
+static const unsigned char aes_test_cfb128_ct[3][64] = {
+    {
+        0x3B, 0x3F, 0xD9, 0x2E, 0xB7, 0x2D, 0xAD, 0x20,
+        0x33, 0x34, 0x49, 0xF8, 0xE8, 0x3C, 0xFB, 0x4A,
+        0xC8, 0xA6, 0x45, 0x37, 0xA0, 0xB3, 0xA9, 0x3F,
+        0xCD, 0xE3, 0xCD, 0xAD, 0x9F, 0x1C, 0xE5, 0x8B,
+        0x26, 0x75, 0x1F, 0x67, 0xA3, 0xCB, 0xB1, 0x40,
+        0xB1, 0x80, 0x8C, 0xF1, 0x87, 0xA4, 0xF4, 0xDF,
+        0xC0, 0x4B, 0x05, 0x35, 0x7C, 0x5D, 0x1C, 0x0E,
+        0xEA, 0xC4, 0xC6, 0x6F, 0x9F, 0xF7, 0xF2, 0xE6
+    },
+    {
+        0xCD, 0xC8, 0x0D, 0x6F, 0xDD, 0xF1, 0x8C, 0xAB,
+        0x34, 0xC2, 0x59, 0x09, 0xC9, 0x9A, 0x41, 0x74,
+        0x67, 0xCE, 0x7F, 0x7F, 0x81, 0x17, 0x36, 0x21,
+        0x96, 0x1A, 0x2B, 0x70, 0x17, 0x1D, 0x3D, 0x7A,
+        0x2E, 0x1E, 0x8A, 0x1D, 0xD5, 0x9B, 0x88, 0xB1,
+        0xC8, 0xE6, 0x0F, 0xED, 0x1E, 0xFA, 0xC4, 0xC9,
+        0xC0, 0x5F, 0x9F, 0x9C, 0xA9, 0x83, 0x4F, 0xA0,
+        0x42, 0xAE, 0x8F, 0xBA, 0x58, 0x4B, 0x09, 0xFF
+    },
+    {
+        0xDC, 0x7E, 0x84, 0xBF, 0xDA, 0x79, 0x16, 0x4B,
+        0x7E, 0xCD, 0x84, 0x86, 0x98, 0x5D, 0x38, 0x60,
+        0x39, 0xFF, 0xED, 0x14, 0x3B, 0x28, 0xB1, 0xC8,
+        0x32, 0x11, 0x3C, 0x63, 0x31, 0xE5, 0x40, 0x7B,
+        0xDF, 0x10, 0x13, 0x24, 0x15, 0xE5, 0x4B, 0x92,
+        0xA1, 0x3E, 0xD0, 0xA8, 0x26, 0x7A, 0xE2, 0xF9,
+        0x75, 0xA3, 0x85, 0x74, 0x1A, 0xB9, 0xCE, 0xF8,
+        0x20, 0x31, 0x62, 0x3D, 0x55, 0xB1, 0xE4, 0x71
+    }
 };
 #endif /* MBEDTLS_CIPHER_MODE_CFB */
 
@@ -1505,27 +1515,30 @@ static const unsigned char aes_test_cfb128_ct[3][64] =
  *
  * https://csrc.nist.gov/publications/detail/sp/800-38a/final
  */
-static const unsigned char aes_test_ofb_key[3][32] =
-{
-    { 0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6,
-      0xAB, 0xF7, 0x15, 0x88, 0x09, 0xCF, 0x4F, 0x3C },
-    { 0x8E, 0x73, 0xB0, 0xF7, 0xDA, 0x0E, 0x64, 0x52,
-      0xC8, 0x10, 0xF3, 0x2B, 0x80, 0x90, 0x79, 0xE5,
-      0x62, 0xF8, 0xEA, 0xD2, 0x52, 0x2C, 0x6B, 0x7B },
-    { 0x60, 0x3D, 0xEB, 0x10, 0x15, 0xCA, 0x71, 0xBE,
-      0x2B, 0x73, 0xAE, 0xF0, 0x85, 0x7D, 0x77, 0x81,
-      0x1F, 0x35, 0x2C, 0x07, 0x3B, 0x61, 0x08, 0xD7,
-      0x2D, 0x98, 0x10, 0xA3, 0x09, 0x14, 0xDF, 0xF4 }
+static const unsigned char aes_test_ofb_key[3][32] = {
+    {
+        0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6,
+        0xAB, 0xF7, 0x15, 0x88, 0x09, 0xCF, 0x4F, 0x3C
+    },
+    {
+        0x8E, 0x73, 0xB0, 0xF7, 0xDA, 0x0E, 0x64, 0x52,
+        0xC8, 0x10, 0xF3, 0x2B, 0x80, 0x90, 0x79, 0xE5,
+        0x62, 0xF8, 0xEA, 0xD2, 0x52, 0x2C, 0x6B, 0x7B
+    },
+    {
+        0x60, 0x3D, 0xEB, 0x10, 0x15, 0xCA, 0x71, 0xBE,
+        0x2B, 0x73, 0xAE, 0xF0, 0x85, 0x7D, 0x77, 0x81,
+        0x1F, 0x35, 0x2C, 0x07, 0x3B, 0x61, 0x08, 0xD7,
+        0x2D, 0x98, 0x10, 0xA3, 0x09, 0x14, 0xDF, 0xF4
+    }
 };
 
-static const unsigned char aes_test_ofb_iv[16] =
-{
+static const unsigned char aes_test_ofb_iv[16] = {
     0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
     0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F
 };
 
-static const unsigned char aes_test_ofb_pt[64] =
-{
+static const unsigned char aes_test_ofb_pt[64] = {
     0x6B, 0xC1, 0xBE, 0xE2, 0x2E, 0x40, 0x9F, 0x96,
     0xE9, 0x3D, 0x7E, 0x11, 0x73, 0x93, 0x17, 0x2A,
     0xAE, 0x2D, 0x8A, 0x57, 0x1E, 0x03, 0xAC, 0x9C,
@@ -1536,32 +1549,37 @@ static const unsigned char aes_test_ofb_pt[64] =
     0xAD, 0x2B, 0x41, 0x7B, 0xE6, 0x6C, 0x37, 0x10
 };
 
-static const unsigned char aes_test_ofb_ct[3][64] =
-{
-    { 0x3B, 0x3F, 0xD9, 0x2E, 0xB7, 0x2D, 0xAD, 0x20,
-      0x33, 0x34, 0x49, 0xF8, 0xE8, 0x3C, 0xFB, 0x4A,
-      0x77, 0x89, 0x50, 0x8d, 0x16, 0x91, 0x8f, 0x03,
-      0xf5, 0x3c, 0x52, 0xda, 0xc5, 0x4e, 0xd8, 0x25,
-      0x97, 0x40, 0x05, 0x1e, 0x9c, 0x5f, 0xec, 0xf6,
-      0x43, 0x44, 0xf7, 0xa8, 0x22, 0x60, 0xed, 0xcc,
-      0x30, 0x4c, 0x65, 0x28, 0xf6, 0x59, 0xc7, 0x78,
-      0x66, 0xa5, 0x10, 0xd9, 0xc1, 0xd6, 0xae, 0x5e },
-    { 0xCD, 0xC8, 0x0D, 0x6F, 0xDD, 0xF1, 0x8C, 0xAB,
-      0x34, 0xC2, 0x59, 0x09, 0xC9, 0x9A, 0x41, 0x74,
-      0xfc, 0xc2, 0x8b, 0x8d, 0x4c, 0x63, 0x83, 0x7c,
-      0x09, 0xe8, 0x17, 0x00, 0xc1, 0x10, 0x04, 0x01,
-      0x8d, 0x9a, 0x9a, 0xea, 0xc0, 0xf6, 0x59, 0x6f,
-      0x55, 0x9c, 0x6d, 0x4d, 0xaf, 0x59, 0xa5, 0xf2,
-      0x6d, 0x9f, 0x20, 0x08, 0x57, 0xca, 0x6c, 0x3e,
-      0x9c, 0xac, 0x52, 0x4b, 0xd9, 0xac, 0xc9, 0x2a },
-    { 0xDC, 0x7E, 0x84, 0xBF, 0xDA, 0x79, 0x16, 0x4B,
-      0x7E, 0xCD, 0x84, 0x86, 0x98, 0x5D, 0x38, 0x60,
-      0x4f, 0xeb, 0xdc, 0x67, 0x40, 0xd2, 0x0b, 0x3a,
-      0xc8, 0x8f, 0x6a, 0xd8, 0x2a, 0x4f, 0xb0, 0x8d,
-      0x71, 0xab, 0x47, 0xa0, 0x86, 0xe8, 0x6e, 0xed,
-      0xf3, 0x9d, 0x1c, 0x5b, 0xba, 0x97, 0xc4, 0x08,
-      0x01, 0x26, 0x14, 0x1d, 0x67, 0xf3, 0x7b, 0xe8,
-      0x53, 0x8f, 0x5a, 0x8b, 0xe7, 0x40, 0xe4, 0x84 }
+static const unsigned char aes_test_ofb_ct[3][64] = {
+    {
+        0x3B, 0x3F, 0xD9, 0x2E, 0xB7, 0x2D, 0xAD, 0x20,
+        0x33, 0x34, 0x49, 0xF8, 0xE8, 0x3C, 0xFB, 0x4A,
+        0x77, 0x89, 0x50, 0x8d, 0x16, 0x91, 0x8f, 0x03,
+        0xf5, 0x3c, 0x52, 0xda, 0xc5, 0x4e, 0xd8, 0x25,
+        0x97, 0x40, 0x05, 0x1e, 0x9c, 0x5f, 0xec, 0xf6,
+        0x43, 0x44, 0xf7, 0xa8, 0x22, 0x60, 0xed, 0xcc,
+        0x30, 0x4c, 0x65, 0x28, 0xf6, 0x59, 0xc7, 0x78,
+        0x66, 0xa5, 0x10, 0xd9, 0xc1, 0xd6, 0xae, 0x5e
+    },
+    {
+        0xCD, 0xC8, 0x0D, 0x6F, 0xDD, 0xF1, 0x8C, 0xAB,
+        0x34, 0xC2, 0x59, 0x09, 0xC9, 0x9A, 0x41, 0x74,
+        0xfc, 0xc2, 0x8b, 0x8d, 0x4c, 0x63, 0x83, 0x7c,
+        0x09, 0xe8, 0x17, 0x00, 0xc1, 0x10, 0x04, 0x01,
+        0x8d, 0x9a, 0x9a, 0xea, 0xc0, 0xf6, 0x59, 0x6f,
+        0x55, 0x9c, 0x6d, 0x4d, 0xaf, 0x59, 0xa5, 0xf2,
+        0x6d, 0x9f, 0x20, 0x08, 0x57, 0xca, 0x6c, 0x3e,
+        0x9c, 0xac, 0x52, 0x4b, 0xd9, 0xac, 0xc9, 0x2a
+    },
+    {
+        0xDC, 0x7E, 0x84, 0xBF, 0xDA, 0x79, 0x16, 0x4B,
+        0x7E, 0xCD, 0x84, 0x86, 0x98, 0x5D, 0x38, 0x60,
+        0x4f, 0xeb, 0xdc, 0x67, 0x40, 0xd2, 0x0b, 0x3a,
+        0xc8, 0x8f, 0x6a, 0xd8, 0x2a, 0x4f, 0xb0, 0x8d,
+        0x71, 0xab, 0x47, 0xa0, 0x86, 0xe8, 0x6e, 0xed,
+        0xf3, 0x9d, 0x1c, 0x5b, 0xba, 0x97, 0xc4, 0x08,
+        0x01, 0x26, 0x14, 0x1d, 0x67, 0xf3, 0x7b, 0xe8,
+        0x53, 0x8f, 0x5a, 0x8b, 0xe7, 0x40, 0xe4, 0x84
+    }
 };
 #endif /* MBEDTLS_CIPHER_MODE_OFB */
 
@@ -1572,60 +1590,80 @@ static const unsigned char aes_test_ofb_ct[3][64] =
  * http://www.faqs.org/rfcs/rfc3686.html
  */
 
-static const unsigned char aes_test_ctr_key[3][16] =
-{
-    { 0xAE, 0x68, 0x52, 0xF8, 0x12, 0x10, 0x67, 0xCC,
-      0x4B, 0xF7, 0xA5, 0x76, 0x55, 0x77, 0xF3, 0x9E },
-    { 0x7E, 0x24, 0x06, 0x78, 0x17, 0xFA, 0xE0, 0xD7,
-      0x43, 0xD6, 0xCE, 0x1F, 0x32, 0x53, 0x91, 0x63 },
-    { 0x76, 0x91, 0xBE, 0x03, 0x5E, 0x50, 0x20, 0xA8,
-      0xAC, 0x6E, 0x61, 0x85, 0x29, 0xF9, 0xA0, 0xDC }
+static const unsigned char aes_test_ctr_key[3][16] = {
+    {
+        0xAE, 0x68, 0x52, 0xF8, 0x12, 0x10, 0x67, 0xCC,
+        0x4B, 0xF7, 0xA5, 0x76, 0x55, 0x77, 0xF3, 0x9E
+    },
+    {
+        0x7E, 0x24, 0x06, 0x78, 0x17, 0xFA, 0xE0, 0xD7,
+        0x43, 0xD6, 0xCE, 0x1F, 0x32, 0x53, 0x91, 0x63
+    },
+    {
+        0x76, 0x91, 0xBE, 0x03, 0x5E, 0x50, 0x20, 0xA8,
+        0xAC, 0x6E, 0x61, 0x85, 0x29, 0xF9, 0xA0, 0xDC
+    }
 };
 
-static const unsigned char aes_test_ctr_nonce_counter[3][16] =
-{
-    { 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 },
-    { 0x00, 0x6C, 0xB6, 0xDB, 0xC0, 0x54, 0x3B, 0x59,
-      0xDA, 0x48, 0xD9, 0x0B, 0x00, 0x00, 0x00, 0x01 },
-    { 0x00, 0xE0, 0x01, 0x7B, 0x27, 0x77, 0x7F, 0x3F,
-      0x4A, 0x17, 0x86, 0xF0, 0x00, 0x00, 0x00, 0x01 }
+static const unsigned char aes_test_ctr_nonce_counter[3][16] = {
+    {
+        0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01
+    },
+    {
+        0x00, 0x6C, 0xB6, 0xDB, 0xC0, 0x54, 0x3B, 0x59,
+        0xDA, 0x48, 0xD9, 0x0B, 0x00, 0x00, 0x00, 0x01
+    },
+    {
+        0x00, 0xE0, 0x01, 0x7B, 0x27, 0x77, 0x7F, 0x3F,
+        0x4A, 0x17, 0x86, 0xF0, 0x00, 0x00, 0x00, 0x01
+    }
 };
 
-static const unsigned char aes_test_ctr_pt[3][48] =
-{
-    { 0x53, 0x69, 0x6E, 0x67, 0x6C, 0x65, 0x20, 0x62,
-      0x6C, 0x6F, 0x63, 0x6B, 0x20, 0x6D, 0x73, 0x67 },
+static const unsigned char aes_test_ctr_pt[3][48] = {
+    {
+        0x53, 0x69, 0x6E, 0x67, 0x6C, 0x65, 0x20, 0x62,
+        0x6C, 0x6F, 0x63, 0x6B, 0x20, 0x6D, 0x73, 0x67
+    },
 
-    { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-      0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
-      0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
-      0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F },
+    {
+        0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+        0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
+        0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+        0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F
+    },
 
-    { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-      0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
-      0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
-      0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F,
-      0x20, 0x21, 0x22, 0x23 }
+    {
+        0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+        0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
+        0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+        0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F,
+        0x20, 0x21, 0x22, 0x23
+    }
 };
 
-static const unsigned char aes_test_ctr_ct[3][48] =
-{
-    { 0xE4, 0x09, 0x5D, 0x4F, 0xB7, 0xA7, 0xB3, 0x79,
-      0x2D, 0x61, 0x75, 0xA3, 0x26, 0x13, 0x11, 0xB8 },
-    { 0x51, 0x04, 0xA1, 0x06, 0x16, 0x8A, 0x72, 0xD9,
-      0x79, 0x0D, 0x41, 0xEE, 0x8E, 0xDA, 0xD3, 0x88,
-      0xEB, 0x2E, 0x1E, 0xFC, 0x46, 0xDA, 0x57, 0xC8,
-      0xFC, 0xE6, 0x30, 0xDF, 0x91, 0x41, 0xBE, 0x28 },
-    { 0xC1, 0xCF, 0x48, 0xA8, 0x9F, 0x2F, 0xFD, 0xD9,
-      0xCF, 0x46, 0x52, 0xE9, 0xEF, 0xDB, 0x72, 0xD7,
-      0x45, 0x40, 0xA4, 0x2B, 0xDE, 0x6D, 0x78, 0x36,
-      0xD5, 0x9A, 0x5C, 0xEA, 0xAE, 0xF3, 0x10, 0x53,
-      0x25, 0xB2, 0x07, 0x2F }
+static const unsigned char aes_test_ctr_ct[3][48] = {
+    {
+        0xE4, 0x09, 0x5D, 0x4F, 0xB7, 0xA7, 0xB3, 0x79,
+        0x2D, 0x61, 0x75, 0xA3, 0x26, 0x13, 0x11, 0xB8
+    },
+    {
+        0x51, 0x04, 0xA1, 0x06, 0x16, 0x8A, 0x72, 0xD9,
+        0x79, 0x0D, 0x41, 0xEE, 0x8E, 0xDA, 0xD3, 0x88,
+        0xEB, 0x2E, 0x1E, 0xFC, 0x46, 0xDA, 0x57, 0xC8,
+        0xFC, 0xE6, 0x30, 0xDF, 0x91, 0x41, 0xBE, 0x28
+    },
+    {
+        0xC1, 0xCF, 0x48, 0xA8, 0x9F, 0x2F, 0xFD, 0xD9,
+        0xCF, 0x46, 0x52, 0xE9, 0xEF, 0xDB, 0x72, 0xD7,
+        0x45, 0x40, 0xA4, 0x2B, 0xDE, 0x6D, 0x78, 0x36,
+        0xD5, 0x9A, 0x5C, 0xEA, 0xAE, 0xF3, 0x10, 0x53,
+        0x25, 0xB2, 0x07, 0x2F
+    }
 };
 
 static const int aes_test_ctr_len[3] =
-    { 16, 32, 36 };
+{ 16, 32, 36 };
 #endif /* MBEDTLS_CIPHER_MODE_CTR */
 
 #if defined(MBEDTLS_CIPHER_MODE_XTS)
@@ -1636,62 +1674,82 @@ static const int aes_test_ctr_len[3] =
  * https://web.archive.org/web/20150629024421/http://grouper.ieee.org/groups/1619/email/pdf00086.pdf
  * (Archived from original at http://grouper.ieee.org/groups/1619/email/pdf00086.pdf)
  */
-static const unsigned char aes_test_xts_key[][32] =
-{
-    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
-    { 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11,
-      0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11,
-      0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22,
-      0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22 },
-    { 0xff, 0xfe, 0xfd, 0xfc, 0xfb, 0xfa, 0xf9, 0xf8,
-      0xf7, 0xf6, 0xf5, 0xf4, 0xf3, 0xf2, 0xf1, 0xf0,
-      0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22,
-      0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22 },
+static const unsigned char aes_test_xts_key[][32] = {
+    {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    },
+    {
+        0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11,
+        0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11,
+        0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22,
+        0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22
+    },
+    {
+        0xff, 0xfe, 0xfd, 0xfc, 0xfb, 0xfa, 0xf9, 0xf8,
+        0xf7, 0xf6, 0xf5, 0xf4, 0xf3, 0xf2, 0xf1, 0xf0,
+        0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22,
+        0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22
+    },
 };
 
-static const unsigned char aes_test_xts_pt32[][32] =
-{
-    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
-    { 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44,
-      0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44,
-      0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44,
-      0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44 },
-    { 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44,
-      0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44,
-      0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44,
-      0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44 },
+static const unsigned char aes_test_xts_pt32[][32] = {
+    {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    },
+    {
+        0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44,
+        0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44,
+        0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44,
+        0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44
+    },
+    {
+        0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44,
+        0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44,
+        0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44,
+        0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44
+    },
 };
 
-static const unsigned char aes_test_xts_ct32[][32] =
-{
-    { 0x91, 0x7c, 0xf6, 0x9e, 0xbd, 0x68, 0xb2, 0xec,
-      0x9b, 0x9f, 0xe9, 0xa3, 0xea, 0xdd, 0xa6, 0x92,
-      0xcd, 0x43, 0xd2, 0xf5, 0x95, 0x98, 0xed, 0x85,
-      0x8c, 0x02, 0xc2, 0x65, 0x2f, 0xbf, 0x92, 0x2e },
-    { 0xc4, 0x54, 0x18, 0x5e, 0x6a, 0x16, 0x93, 0x6e,
-      0x39, 0x33, 0x40, 0x38, 0xac, 0xef, 0x83, 0x8b,
-      0xfb, 0x18, 0x6f, 0xff, 0x74, 0x80, 0xad, 0xc4,
-      0x28, 0x93, 0x82, 0xec, 0xd6, 0xd3, 0x94, 0xf0 },
-    { 0xaf, 0x85, 0x33, 0x6b, 0x59, 0x7a, 0xfc, 0x1a,
-      0x90, 0x0b, 0x2e, 0xb2, 0x1e, 0xc9, 0x49, 0xd2,
-      0x92, 0xdf, 0x4c, 0x04, 0x7e, 0x0b, 0x21, 0x53,
-      0x21, 0x86, 0xa5, 0x97, 0x1a, 0x22, 0x7a, 0x89 },
+static const unsigned char aes_test_xts_ct32[][32] = {
+    {
+        0x91, 0x7c, 0xf6, 0x9e, 0xbd, 0x68, 0xb2, 0xec,
+        0x9b, 0x9f, 0xe9, 0xa3, 0xea, 0xdd, 0xa6, 0x92,
+        0xcd, 0x43, 0xd2, 0xf5, 0x95, 0x98, 0xed, 0x85,
+        0x8c, 0x02, 0xc2, 0x65, 0x2f, 0xbf, 0x92, 0x2e
+    },
+    {
+        0xc4, 0x54, 0x18, 0x5e, 0x6a, 0x16, 0x93, 0x6e,
+        0x39, 0x33, 0x40, 0x38, 0xac, 0xef, 0x83, 0x8b,
+        0xfb, 0x18, 0x6f, 0xff, 0x74, 0x80, 0xad, 0xc4,
+        0x28, 0x93, 0x82, 0xec, 0xd6, 0xd3, 0x94, 0xf0
+    },
+    {
+        0xaf, 0x85, 0x33, 0x6b, 0x59, 0x7a, 0xfc, 0x1a,
+        0x90, 0x0b, 0x2e, 0xb2, 0x1e, 0xc9, 0x49, 0xd2,
+        0x92, 0xdf, 0x4c, 0x04, 0x7e, 0x0b, 0x21, 0x53,
+        0x21, 0x86, 0xa5, 0x97, 0x1a, 0x22, 0x7a, 0x89
+    },
 };
 
-static const unsigned char aes_test_xts_data_unit[][16] =
-{
-   { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
-   { 0x33, 0x33, 0x33, 0x33, 0x33, 0x00, 0x00, 0x00,
-     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
-   { 0x33, 0x33, 0x33, 0x33, 0x33, 0x00, 0x00, 0x00,
-     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+static const unsigned char aes_test_xts_data_unit[][16] = {
+    {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    },
+    {
+        0x33, 0x33, 0x33, 0x33, 0x33, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    },
+    {
+        0x33, 0x33, 0x33, 0x33, 0x33, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    },
 };
 
 #endif /* MBEDTLS_CIPHER_MODE_XTS */
@@ -1699,7 +1757,7 @@ static const unsigned char aes_test_xts_data_unit[][16] =
 /*
  * Checkup routine
  */
-int mbedtls_aes_self_test( int verbose )
+int mbedtls_aes_self_test(int verbose)
 {
     int ret = 0, i, j, u, mode;
     unsigned int keybits;
@@ -1725,32 +1783,28 @@ int mbedtls_aes_self_test( int verbose )
 #endif
     mbedtls_aes_context ctx;
 
-    memset( key, 0, 32 );
-    mbedtls_aes_init( &ctx );
+    memset(key, 0, 32);
+    mbedtls_aes_init(&ctx);
 
     /*
      * ECB mode
      */
-    for( i = 0; i < 6; i++ )
-    {
+    for (i = 0; i < 6; i++) {
         u = i >> 1;
         keybits = 128 + u * 64;
         mode = i & 1;
 
-        if( verbose != 0 )
-            mbedtls_printf( "  AES-ECB-%3d (%s): ", keybits,
-                            ( mode == MBEDTLS_AES_DECRYPT ) ? "dec" : "enc" );
+        if (verbose != 0)
+            mbedtls_printf("  AES-ECB-%3d (%s): ", keybits,
+                           (mode == MBEDTLS_AES_DECRYPT) ? "dec" : "enc");
 
-        memset( buf, 0, 16 );
+        memset(buf, 0, 16);
 
-        if( mode == MBEDTLS_AES_DECRYPT )
-        {
-            ret = mbedtls_aes_setkey_dec( &ctx, key, keybits );
+        if (mode == MBEDTLS_AES_DECRYPT) {
+            ret = mbedtls_aes_setkey_dec(&ctx, key, keybits);
             aes_tests = aes_test_ecb_dec[u];
-        }
-        else
-        {
-            ret = mbedtls_aes_setkey_enc( &ctx, key, keybits );
+        } else {
+            ret = mbedtls_aes_setkey_enc(&ctx, key, keybits);
             aes_tests = aes_test_ecb_enc[u];
         }
 
@@ -1759,62 +1813,53 @@ int mbedtls_aes_self_test( int verbose )
          * there is an alternative underlying implementation i.e. when
          * MBEDTLS_AES_ALT is defined.
          */
-        if( ret == MBEDTLS_ERR_AES_FEATURE_UNAVAILABLE && keybits == 192 )
-        {
-            mbedtls_printf( "skipped\n" );
+        if (ret == MBEDTLS_ERR_AES_FEATURE_UNAVAILABLE && keybits == 192) {
+            mbedtls_printf("skipped\n");
             continue;
-        }
-        else if( ret != 0 )
-        {
+        } else if (ret != 0) {
             goto exit;
         }
 
-        for( j = 0; j < 10000; j++ )
-        {
-            ret = mbedtls_aes_crypt_ecb( &ctx, mode, buf, buf );
-            if( ret != 0 )
+        for (j = 0; j < 10000; j++) {
+            ret = mbedtls_aes_crypt_ecb(&ctx, mode, buf, buf);
+            if (ret != 0)
                 goto exit;
         }
 
-        if( memcmp( buf, aes_tests, 16 ) != 0 )
-        {
+        if (memcmp(buf, aes_tests, 16) != 0) {
             ret = 1;
             goto exit;
         }
 
-        if( verbose != 0 )
-            mbedtls_printf( "passed\n" );
+        if (verbose != 0)
+            mbedtls_printf("passed\n");
     }
 
-    if( verbose != 0 )
-        mbedtls_printf( "\n" );
+    if (verbose != 0)
+        mbedtls_printf("\n");
 
 #if defined(MBEDTLS_CIPHER_MODE_CBC)
     /*
      * CBC mode
      */
-    for( i = 0; i < 6; i++ )
-    {
+    for (i = 0; i < 6; i++) {
         u = i >> 1;
         keybits = 128 + u * 64;
         mode = i & 1;
 
-        if( verbose != 0 )
-            mbedtls_printf( "  AES-CBC-%3d (%s): ", keybits,
-                            ( mode == MBEDTLS_AES_DECRYPT ) ? "dec" : "enc" );
+        if (verbose != 0)
+            mbedtls_printf("  AES-CBC-%3d (%s): ", keybits,
+                           (mode == MBEDTLS_AES_DECRYPT) ? "dec" : "enc");
 
-        memset( iv , 0, 16 );
-        memset( prv, 0, 16 );
-        memset( buf, 0, 16 );
+        memset(iv, 0, 16);
+        memset(prv, 0, 16);
+        memset(buf, 0, 16);
 
-        if( mode == MBEDTLS_AES_DECRYPT )
-        {
-            ret = mbedtls_aes_setkey_dec( &ctx, key, keybits );
+        if (mode == MBEDTLS_AES_DECRYPT) {
+            ret = mbedtls_aes_setkey_dec(&ctx, key, keybits);
             aes_tests = aes_test_cbc_dec[u];
-        }
-        else
-        {
-            ret = mbedtls_aes_setkey_enc( &ctx, key, keybits );
+        } else {
+            ret = mbedtls_aes_setkey_enc(&ctx, key, keybits);
             aes_tests = aes_test_cbc_enc[u];
         }
 
@@ -1823,301 +1868,269 @@ int mbedtls_aes_self_test( int verbose )
          * there is an alternative underlying implementation i.e. when
          * MBEDTLS_AES_ALT is defined.
          */
-        if( ret == MBEDTLS_ERR_AES_FEATURE_UNAVAILABLE && keybits == 192 )
-        {
-            mbedtls_printf( "skipped\n" );
+        if (ret == MBEDTLS_ERR_AES_FEATURE_UNAVAILABLE && keybits == 192) {
+            mbedtls_printf("skipped\n");
             continue;
-        }
-        else if( ret != 0 )
-        {
+        } else if (ret != 0) {
             goto exit;
         }
 
-        for( j = 0; j < 10000; j++ )
-        {
-            if( mode == MBEDTLS_AES_ENCRYPT )
-            {
+        for (j = 0; j < 10000; j++) {
+            if (mode == MBEDTLS_AES_ENCRYPT) {
                 unsigned char tmp[16];
 
-                memcpy( tmp, prv, 16 );
-                memcpy( prv, buf, 16 );
-                memcpy( buf, tmp, 16 );
+                memcpy(tmp, prv, 16);
+                memcpy(prv, buf, 16);
+                memcpy(buf, tmp, 16);
             }
 
-            ret = mbedtls_aes_crypt_cbc( &ctx, mode, 16, iv, buf, buf );
-            if( ret != 0 )
+            ret = mbedtls_aes_crypt_cbc(&ctx, mode, 16, iv, buf, buf);
+            if (ret != 0)
                 goto exit;
 
         }
 
-        if( memcmp( buf, aes_tests, 16 ) != 0 )
-        {
+        if (memcmp(buf, aes_tests, 16) != 0) {
             ret = 1;
             goto exit;
         }
 
-        if( verbose != 0 )
-            mbedtls_printf( "passed\n" );
+        if (verbose != 0)
+            mbedtls_printf("passed\n");
     }
 
-    if( verbose != 0 )
-        mbedtls_printf( "\n" );
+    if (verbose != 0)
+        mbedtls_printf("\n");
 #endif /* MBEDTLS_CIPHER_MODE_CBC */
 
 #if defined(MBEDTLS_CIPHER_MODE_CFB)
     /*
      * CFB128 mode
      */
-    for( i = 0; i < 6; i++ )
-    {
+    for (i = 0; i < 6; i++) {
         u = i >> 1;
         keybits = 128 + u * 64;
         mode = i & 1;
 
-        if( verbose != 0 )
-            mbedtls_printf( "  AES-CFB128-%3d (%s): ", keybits,
-                            ( mode == MBEDTLS_AES_DECRYPT ) ? "dec" : "enc" );
+        if (verbose != 0)
+            mbedtls_printf("  AES-CFB128-%3d (%s): ", keybits,
+                           (mode == MBEDTLS_AES_DECRYPT) ? "dec" : "enc");
 
-        memcpy( iv,  aes_test_cfb128_iv, 16 );
-        memcpy( key, aes_test_cfb128_key[u], keybits / 8 );
+        memcpy(iv,  aes_test_cfb128_iv, 16);
+        memcpy(key, aes_test_cfb128_key[u], keybits / 8);
 
         offset = 0;
-        ret = mbedtls_aes_setkey_enc( &ctx, key, keybits );
+        ret = mbedtls_aes_setkey_enc(&ctx, key, keybits);
         /*
          * AES-192 is an optional feature that may be unavailable when
          * there is an alternative underlying implementation i.e. when
          * MBEDTLS_AES_ALT is defined.
          */
-        if( ret == MBEDTLS_ERR_AES_FEATURE_UNAVAILABLE && keybits == 192 )
-        {
-            mbedtls_printf( "skipped\n" );
+        if (ret == MBEDTLS_ERR_AES_FEATURE_UNAVAILABLE && keybits == 192) {
+            mbedtls_printf("skipped\n");
             continue;
-        }
-        else if( ret != 0 )
-        {
+        } else if (ret != 0) {
             goto exit;
         }
 
-        if( mode == MBEDTLS_AES_DECRYPT )
-        {
-            memcpy( buf, aes_test_cfb128_ct[u], 64 );
+        if (mode == MBEDTLS_AES_DECRYPT) {
+            memcpy(buf, aes_test_cfb128_ct[u], 64);
             aes_tests = aes_test_cfb128_pt;
-        }
-        else
-        {
-            memcpy( buf, aes_test_cfb128_pt, 64 );
+        } else {
+            memcpy(buf, aes_test_cfb128_pt, 64);
             aes_tests = aes_test_cfb128_ct[u];
         }
 
-        ret = mbedtls_aes_crypt_cfb128( &ctx, mode, 64, &offset, iv, buf, buf );
-        if( ret != 0 )
+        ret = mbedtls_aes_crypt_cfb128(&ctx, mode, 64, &offset, iv, buf, buf);
+        if (ret != 0)
             goto exit;
 
-        if( memcmp( buf, aes_tests, 64 ) != 0 )
-        {
+        if (memcmp(buf, aes_tests, 64) != 0) {
             ret = 1;
             goto exit;
         }
 
-        if( verbose != 0 )
-            mbedtls_printf( "passed\n" );
+        if (verbose != 0)
+            mbedtls_printf("passed\n");
     }
 
-    if( verbose != 0 )
-        mbedtls_printf( "\n" );
+    if (verbose != 0)
+        mbedtls_printf("\n");
 #endif /* MBEDTLS_CIPHER_MODE_CFB */
 
 #if defined(MBEDTLS_CIPHER_MODE_OFB)
     /*
      * OFB mode
      */
-    for( i = 0; i < 6; i++ )
-    {
+    for (i = 0; i < 6; i++) {
         u = i >> 1;
         keybits = 128 + u * 64;
         mode = i & 1;
 
-        if( verbose != 0 )
-            mbedtls_printf( "  AES-OFB-%3d (%s): ", keybits,
-                            ( mode == MBEDTLS_AES_DECRYPT ) ? "dec" : "enc" );
+        if (verbose != 0)
+            mbedtls_printf("  AES-OFB-%3d (%s): ", keybits,
+                           (mode == MBEDTLS_AES_DECRYPT) ? "dec" : "enc");
 
-        memcpy( iv,  aes_test_ofb_iv, 16 );
-        memcpy( key, aes_test_ofb_key[u], keybits / 8 );
+        memcpy(iv,  aes_test_ofb_iv, 16);
+        memcpy(key, aes_test_ofb_key[u], keybits / 8);
 
         offset = 0;
-        ret = mbedtls_aes_setkey_enc( &ctx, key, keybits );
+        ret = mbedtls_aes_setkey_enc(&ctx, key, keybits);
         /*
          * AES-192 is an optional feature that may be unavailable when
          * there is an alternative underlying implementation i.e. when
          * MBEDTLS_AES_ALT is defined.
          */
-        if( ret == MBEDTLS_ERR_AES_FEATURE_UNAVAILABLE && keybits == 192 )
-        {
-            mbedtls_printf( "skipped\n" );
+        if (ret == MBEDTLS_ERR_AES_FEATURE_UNAVAILABLE && keybits == 192) {
+            mbedtls_printf("skipped\n");
             continue;
-        }
-        else if( ret != 0 )
-        {
+        } else if (ret != 0) {
             goto exit;
         }
 
-        if( mode == MBEDTLS_AES_DECRYPT )
-        {
-            memcpy( buf, aes_test_ofb_ct[u], 64 );
+        if (mode == MBEDTLS_AES_DECRYPT) {
+            memcpy(buf, aes_test_ofb_ct[u], 64);
             aes_tests = aes_test_ofb_pt;
-        }
-        else
-        {
-            memcpy( buf, aes_test_ofb_pt, 64 );
+        } else {
+            memcpy(buf, aes_test_ofb_pt, 64);
             aes_tests = aes_test_ofb_ct[u];
         }
 
-        ret = mbedtls_aes_crypt_ofb( &ctx, 64, &offset, iv, buf, buf );
-        if( ret != 0 )
+        ret = mbedtls_aes_crypt_ofb(&ctx, 64, &offset, iv, buf, buf);
+        if (ret != 0)
             goto exit;
 
-        if( memcmp( buf, aes_tests, 64 ) != 0 )
-        {
+        if (memcmp(buf, aes_tests, 64) != 0) {
             ret = 1;
             goto exit;
         }
 
-        if( verbose != 0 )
-            mbedtls_printf( "passed\n" );
+        if (verbose != 0)
+            mbedtls_printf("passed\n");
     }
 
-    if( verbose != 0 )
-        mbedtls_printf( "\n" );
+    if (verbose != 0)
+        mbedtls_printf("\n");
 #endif /* MBEDTLS_CIPHER_MODE_OFB */
 
 #if defined(MBEDTLS_CIPHER_MODE_CTR)
     /*
      * CTR mode
      */
-    for( i = 0; i < 6; i++ )
-    {
+    for (i = 0; i < 6; i++) {
         u = i >> 1;
         mode = i & 1;
 
-        if( verbose != 0 )
-            mbedtls_printf( "  AES-CTR-128 (%s): ",
-                            ( mode == MBEDTLS_AES_DECRYPT ) ? "dec" : "enc" );
+        if (verbose != 0)
+            mbedtls_printf("  AES-CTR-128 (%s): ",
+                           (mode == MBEDTLS_AES_DECRYPT) ? "dec" : "enc");
 
-        memcpy( nonce_counter, aes_test_ctr_nonce_counter[u], 16 );
-        memcpy( key, aes_test_ctr_key[u], 16 );
+        memcpy(nonce_counter, aes_test_ctr_nonce_counter[u], 16);
+        memcpy(key, aes_test_ctr_key[u], 16);
 
         offset = 0;
-        if( ( ret = mbedtls_aes_setkey_enc( &ctx, key, 128 ) ) != 0 )
+        if ((ret = mbedtls_aes_setkey_enc(&ctx, key, 128)) != 0)
             goto exit;
 
         len = aes_test_ctr_len[u];
 
-        if( mode == MBEDTLS_AES_DECRYPT )
-        {
-            memcpy( buf, aes_test_ctr_ct[u], len );
+        if (mode == MBEDTLS_AES_DECRYPT) {
+            memcpy(buf, aes_test_ctr_ct[u], len);
             aes_tests = aes_test_ctr_pt[u];
-        }
-        else
-        {
-            memcpy( buf, aes_test_ctr_pt[u], len );
+        } else {
+            memcpy(buf, aes_test_ctr_pt[u], len);
             aes_tests = aes_test_ctr_ct[u];
         }
 
-        ret = mbedtls_aes_crypt_ctr( &ctx, len, &offset, nonce_counter,
-                                     stream_block, buf, buf );
-        if( ret != 0 )
+        ret = mbedtls_aes_crypt_ctr(&ctx, len, &offset, nonce_counter,
+                                    stream_block, buf, buf);
+        if (ret != 0)
             goto exit;
 
-        if( memcmp( buf, aes_tests, len ) != 0 )
-        {
+        if (memcmp(buf, aes_tests, len) != 0) {
             ret = 1;
             goto exit;
         }
 
-        if( verbose != 0 )
-            mbedtls_printf( "passed\n" );
+        if (verbose != 0)
+            mbedtls_printf("passed\n");
     }
 
-    if( verbose != 0 )
-        mbedtls_printf( "\n" );
+    if (verbose != 0)
+        mbedtls_printf("\n");
 #endif /* MBEDTLS_CIPHER_MODE_CTR */
 
 #if defined(MBEDTLS_CIPHER_MODE_XTS)
     {
-    static const int num_tests =
-        sizeof(aes_test_xts_key) / sizeof(*aes_test_xts_key);
-    mbedtls_aes_xts_context ctx_xts;
+        static const int num_tests =
+            sizeof(aes_test_xts_key) / sizeof(*aes_test_xts_key);
+        mbedtls_aes_xts_context ctx_xts;
 
-    /*
-     * XTS mode
-     */
-    mbedtls_aes_xts_init( &ctx_xts );
+        /*
+         * XTS mode
+         */
+        mbedtls_aes_xts_init(&ctx_xts);
 
-    for( i = 0; i < num_tests << 1; i++ )
-    {
-        const unsigned char *data_unit;
-        u = i >> 1;
-        mode = i & 1;
+        for (i = 0; i < num_tests << 1; i++) {
+            const unsigned char *data_unit;
+            u = i >> 1;
+            mode = i & 1;
 
-        if( verbose != 0 )
-            mbedtls_printf( "  AES-XTS-128 (%s): ",
-                            ( mode == MBEDTLS_AES_DECRYPT ) ? "dec" : "enc" );
+            if (verbose != 0)
+                mbedtls_printf("  AES-XTS-128 (%s): ",
+                               (mode == MBEDTLS_AES_DECRYPT) ? "dec" : "enc");
 
-        memset( key, 0, sizeof( key ) );
-        memcpy( key, aes_test_xts_key[u], 32 );
-        data_unit = aes_test_xts_data_unit[u];
+            memset(key, 0, sizeof(key));
+            memcpy(key, aes_test_xts_key[u], 32);
+            data_unit = aes_test_xts_data_unit[u];
 
-        len = sizeof( *aes_test_xts_ct32 );
+            len = sizeof(*aes_test_xts_ct32);
 
-        if( mode == MBEDTLS_AES_DECRYPT )
-        {
-            ret = mbedtls_aes_xts_setkey_dec( &ctx_xts, key, 256 );
-            if( ret != 0)
+            if (mode == MBEDTLS_AES_DECRYPT) {
+                ret = mbedtls_aes_xts_setkey_dec(&ctx_xts, key, 256);
+                if (ret != 0)
+                    goto exit;
+                memcpy(buf, aes_test_xts_ct32[u], len);
+                aes_tests = aes_test_xts_pt32[u];
+            } else {
+                ret = mbedtls_aes_xts_setkey_enc(&ctx_xts, key, 256);
+                if (ret != 0)
+                    goto exit;
+                memcpy(buf, aes_test_xts_pt32[u], len);
+                aes_tests = aes_test_xts_ct32[u];
+            }
+
+
+            ret = mbedtls_aes_crypt_xts(&ctx_xts, mode, len, data_unit,
+                                        buf, buf);
+            if (ret != 0)
                 goto exit;
-            memcpy( buf, aes_test_xts_ct32[u], len );
-            aes_tests = aes_test_xts_pt32[u];
-        }
-        else
-        {
-            ret = mbedtls_aes_xts_setkey_enc( &ctx_xts, key, 256 );
-            if( ret != 0)
+
+            if (memcmp(buf, aes_tests, len) != 0) {
+                ret = 1;
                 goto exit;
-            memcpy( buf, aes_test_xts_pt32[u], len );
-            aes_tests = aes_test_xts_ct32[u];
+            }
+
+            if (verbose != 0)
+                mbedtls_printf("passed\n");
         }
 
+        if (verbose != 0)
+            mbedtls_printf("\n");
 
-        ret = mbedtls_aes_crypt_xts( &ctx_xts, mode, len, data_unit,
-                                     buf, buf );
-        if( ret != 0 )
-            goto exit;
-
-        if( memcmp( buf, aes_tests, len ) != 0 )
-        {
-            ret = 1;
-            goto exit;
-        }
-
-        if( verbose != 0 )
-            mbedtls_printf( "passed\n" );
-    }
-
-    if( verbose != 0 )
-        mbedtls_printf( "\n" );
-
-    mbedtls_aes_xts_free( &ctx_xts );
+        mbedtls_aes_xts_free(&ctx_xts);
     }
 #endif /* MBEDTLS_CIPHER_MODE_XTS */
 
     ret = 0;
 
 exit:
-    if( ret != 0 && verbose != 0 )
-        mbedtls_printf( "failed\n" );
+    if (ret != 0 && verbose != 0)
+        mbedtls_printf("failed\n");
 
-    mbedtls_aes_free( &ctx );
+    mbedtls_aes_free(&ctx);
 
-    return( ret );
+    return (ret);
 }
 
 #endif /* MBEDTLS_SELF_TEST */
diff --git a/common/mbedtls/aes.h b/common/mbedtls/aes.h
index 9af6bb729..522bdb87e 100644
--- a/common/mbedtls/aes.h
+++ b/common/mbedtls/aes.h
@@ -81,8 +81,7 @@ extern "C" {
 /**
  * \brief The AES context-type definition.
  */
-typedef struct mbedtls_aes_context
-{
+typedef struct mbedtls_aes_context {
     int nr;                     /*!< The number of rounds. */
     uint32_t *rk;               /*!< AES round keys. */
     uint32_t buf[68];           /*!< Unaligned data buffer. This buffer can
@@ -100,8 +99,7 @@ mbedtls_aes_context;
 /**
  * \brief The AES XTS context-type definition.
  */
-typedef struct mbedtls_aes_xts_context
-{
+typedef struct mbedtls_aes_xts_context {
     mbedtls_aes_context crypt; /*!< The AES context to use for AES block
                                         encryption or decryption. */
     mbedtls_aes_context tweak; /*!< The AES context used for tweak
@@ -121,14 +119,14 @@ typedef struct mbedtls_aes_xts_context
  *
  * \param ctx      The AES context to initialize.
  */
-void mbedtls_aes_init( mbedtls_aes_context *ctx );
+void mbedtls_aes_init(mbedtls_aes_context *ctx);
 
 /**
  * \brief          This function releases and clears the specified AES context.
  *
  * \param ctx      The AES context to clear.
  */
-void mbedtls_aes_free( mbedtls_aes_context *ctx );
+void mbedtls_aes_free(mbedtls_aes_context *ctx);
 
 #if defined(MBEDTLS_CIPHER_MODE_XTS)
 /**
@@ -139,14 +137,14 @@ void mbedtls_aes_free( mbedtls_aes_context *ctx );
  *
  * \param ctx      The AES XTS context to initialize.
  */
-void mbedtls_aes_xts_init( mbedtls_aes_xts_context *ctx );
+void mbedtls_aes_xts_init(mbedtls_aes_xts_context *ctx);
 
 /**
  * \brief          This function releases and clears the specified AES XTS context.
  *
  * \param ctx      The AES XTS context to clear.
  */
-void mbedtls_aes_xts_free( mbedtls_aes_xts_context *ctx );
+void mbedtls_aes_xts_free(mbedtls_aes_xts_context *ctx);
 #endif /* MBEDTLS_CIPHER_MODE_XTS */
 
 /**
@@ -162,8 +160,8 @@ void mbedtls_aes_xts_free( mbedtls_aes_xts_context *ctx );
  * \return         \c 0 on success.
  * \return         #MBEDTLS_ERR_AES_INVALID_KEY_LENGTH on failure.
  */
-int mbedtls_aes_setkey_enc( mbedtls_aes_context *ctx, const unsigned char *key,
-                    unsigned int keybits );
+int mbedtls_aes_setkey_enc(mbedtls_aes_context *ctx, const unsigned char *key,
+                           unsigned int keybits);
 
 /**
  * \brief          This function sets the decryption key.
@@ -178,8 +176,8 @@ int mbedtls_aes_setkey_enc( mbedtls_aes_context *ctx, const unsigned char *key,
  * \return         \c 0 on success.
  * \return         #MBEDTLS_ERR_AES_INVALID_KEY_LENGTH on failure.
  */
-int mbedtls_aes_setkey_dec( mbedtls_aes_context *ctx, const unsigned char *key,
-                    unsigned int keybits );
+int mbedtls_aes_setkey_dec(mbedtls_aes_context *ctx, const unsigned char *key,
+                           unsigned int keybits);
 
 #if defined(MBEDTLS_CIPHER_MODE_XTS)
 /**
@@ -196,9 +194,9 @@ int mbedtls_aes_setkey_dec( mbedtls_aes_context *ctx, const unsigned char *key,
  * \return         \c 0 on success.
  * \return         #MBEDTLS_ERR_AES_INVALID_KEY_LENGTH on failure.
  */
-int mbedtls_aes_xts_setkey_enc( mbedtls_aes_xts_context *ctx,
-                                const unsigned char *key,
-                                unsigned int keybits );
+int mbedtls_aes_xts_setkey_enc(mbedtls_aes_xts_context *ctx,
+                               const unsigned char *key,
+                               unsigned int keybits);
 
 /**
  * \brief          This function prepares an XTS context for decryption and
@@ -214,9 +212,9 @@ int mbedtls_aes_xts_setkey_enc( mbedtls_aes_xts_context *ctx,
  * \return         \c 0 on success.
  * \return         #MBEDTLS_ERR_AES_INVALID_KEY_LENGTH on failure.
  */
-int mbedtls_aes_xts_setkey_dec( mbedtls_aes_xts_context *ctx,
-                                const unsigned char *key,
-                                unsigned int keybits );
+int mbedtls_aes_xts_setkey_dec(mbedtls_aes_xts_context *ctx,
+                               const unsigned char *key,
+                               unsigned int keybits);
 #endif /* MBEDTLS_CIPHER_MODE_XTS */
 
 /**
@@ -239,10 +237,10 @@ int mbedtls_aes_xts_setkey_dec( mbedtls_aes_xts_context *ctx,
 
  * \return         \c 0 on success.
  */
-int mbedtls_aes_crypt_ecb( mbedtls_aes_context *ctx,
-                    int mode,
-                    const unsigned char input[16],
-                    unsigned char output[16] );
+int mbedtls_aes_crypt_ecb(mbedtls_aes_context *ctx,
+                          int mode,
+                          const unsigned char input[16],
+                          unsigned char output[16]);
 
 #if defined(MBEDTLS_CIPHER_MODE_CBC)
 /**
@@ -282,12 +280,12 @@ int mbedtls_aes_crypt_ecb( mbedtls_aes_context *ctx,
  * \return         #MBEDTLS_ERR_AES_INVALID_INPUT_LENGTH
  *                 on failure.
  */
-int mbedtls_aes_crypt_cbc( mbedtls_aes_context *ctx,
-                    int mode,
-                    size_t length,
-                    unsigned char iv[16],
-                    const unsigned char *input,
-                    unsigned char *output );
+int mbedtls_aes_crypt_cbc(mbedtls_aes_context *ctx,
+                          int mode,
+                          size_t length,
+                          unsigned char iv[16],
+                          const unsigned char *input,
+                          unsigned char *output);
 #endif /* MBEDTLS_CIPHER_MODE_CBC */
 
 #if defined(MBEDTLS_CIPHER_MODE_XTS)
@@ -325,12 +323,12 @@ int mbedtls_aes_crypt_cbc( mbedtls_aes_context *ctx,
  *                     smaller than an AES block in size (16 bytes) or if \p
  *                     length is larger than 2^20 blocks (16 MiB).
  */
-int mbedtls_aes_crypt_xts( mbedtls_aes_xts_context *ctx,
-                           int mode,
-                           size_t length,
-                           const unsigned char data_unit[16],
-                           const unsigned char *input,
-                           unsigned char *output );
+int mbedtls_aes_crypt_xts(mbedtls_aes_xts_context *ctx,
+                          int mode,
+                          size_t length,
+                          const unsigned char data_unit[16],
+                          const unsigned char *input,
+                          unsigned char *output);
 #endif /* MBEDTLS_CIPHER_MODE_XTS */
 
 #if defined(MBEDTLS_CIPHER_MODE_CFB)
@@ -368,13 +366,13 @@ int mbedtls_aes_crypt_xts( mbedtls_aes_xts_context *ctx,
  *
  * \return         \c 0 on success.
  */
-int mbedtls_aes_crypt_cfb128( mbedtls_aes_context *ctx,
-                       int mode,
-                       size_t length,
-                       size_t *iv_off,
-                       unsigned char iv[16],
-                       const unsigned char *input,
-                       unsigned char *output );
+int mbedtls_aes_crypt_cfb128(mbedtls_aes_context *ctx,
+                             int mode,
+                             size_t length,
+                             size_t *iv_off,
+                             unsigned char iv[16],
+                             const unsigned char *input,
+                             unsigned char *output);
 
 /**
  * \brief This function performs an AES-CFB8 encryption or decryption
@@ -408,12 +406,12 @@ int mbedtls_aes_crypt_cfb128( mbedtls_aes_context *ctx,
  *
  * \return         \c 0 on success.
  */
-int mbedtls_aes_crypt_cfb8( mbedtls_aes_context *ctx,
-                    int mode,
-                    size_t length,
-                    unsigned char iv[16],
-                    const unsigned char *input,
-                    unsigned char *output );
+int mbedtls_aes_crypt_cfb8(mbedtls_aes_context *ctx,
+                           int mode,
+                           size_t length,
+                           unsigned char iv[16],
+                           const unsigned char *input,
+                           unsigned char *output);
 #endif /*MBEDTLS_CIPHER_MODE_CFB */
 
 #if defined(MBEDTLS_CIPHER_MODE_OFB)
@@ -457,12 +455,12 @@ int mbedtls_aes_crypt_cfb8( mbedtls_aes_context *ctx,
  *
  * \return         \c 0 on success.
  */
-int mbedtls_aes_crypt_ofb( mbedtls_aes_context *ctx,
-                       size_t length,
-                       size_t *iv_off,
-                       unsigned char iv[16],
-                       const unsigned char *input,
-                       unsigned char *output );
+int mbedtls_aes_crypt_ofb(mbedtls_aes_context *ctx,
+                          size_t length,
+                          size_t *iv_off,
+                          unsigned char iv[16],
+                          const unsigned char *input,
+                          unsigned char *output);
 
 #endif /* MBEDTLS_CIPHER_MODE_OFB */
 
@@ -537,13 +535,13 @@ int mbedtls_aes_crypt_ofb( mbedtls_aes_context *ctx,
  *
  * \return                 \c 0 on success.
  */
-int mbedtls_aes_crypt_ctr( mbedtls_aes_context *ctx,
-                       size_t length,
-                       size_t *nc_off,
-                       unsigned char nonce_counter[16],
-                       unsigned char stream_block[16],
-                       const unsigned char *input,
-                       unsigned char *output );
+int mbedtls_aes_crypt_ctr(mbedtls_aes_context *ctx,
+                          size_t length,
+                          size_t *nc_off,
+                          unsigned char nonce_counter[16],
+                          unsigned char stream_block[16],
+                          const unsigned char *input,
+                          unsigned char *output);
 #endif /* MBEDTLS_CIPHER_MODE_CTR */
 
 /**
@@ -557,9 +555,9 @@ int mbedtls_aes_crypt_ctr( mbedtls_aes_context *ctx,
  *
  * \return          \c 0 on success.
  */
-int mbedtls_internal_aes_encrypt( mbedtls_aes_context *ctx,
-                                  const unsigned char input[16],
-                                  unsigned char output[16] );
+int mbedtls_internal_aes_encrypt(mbedtls_aes_context *ctx,
+                                 const unsigned char input[16],
+                                 unsigned char output[16]);
 
 /**
  * \brief           Internal AES block decryption function. This is only
@@ -572,9 +570,9 @@ int mbedtls_internal_aes_encrypt( mbedtls_aes_context *ctx,
  *
  * \return          \c 0 on success.
  */
-int mbedtls_internal_aes_decrypt( mbedtls_aes_context *ctx,
-                                  const unsigned char input[16],
-                                  unsigned char output[16] );
+int mbedtls_internal_aes_decrypt(mbedtls_aes_context *ctx,
+                                 const unsigned char input[16],
+                                 unsigned char output[16]);
 
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
 #if defined(MBEDTLS_DEPRECATED_WARNING)
@@ -592,9 +590,9 @@ int mbedtls_internal_aes_decrypt( mbedtls_aes_context *ctx,
  * \param input     Plaintext block.
  * \param output    Output (ciphertext) block.
  */
-MBEDTLS_DEPRECATED void mbedtls_aes_encrypt( mbedtls_aes_context *ctx,
-                                             const unsigned char input[16],
-                                             unsigned char output[16] );
+MBEDTLS_DEPRECATED void mbedtls_aes_encrypt(mbedtls_aes_context *ctx,
+                                            const unsigned char input[16],
+                                            unsigned char output[16]);
 
 /**
  * \brief           Deprecated internal AES block decryption function
@@ -606,9 +604,9 @@ MBEDTLS_DEPRECATED void mbedtls_aes_encrypt( mbedtls_aes_context *ctx,
  * \param input     Ciphertext block.
  * \param output    Output (plaintext) block.
  */
-MBEDTLS_DEPRECATED void mbedtls_aes_decrypt( mbedtls_aes_context *ctx,
-                                             const unsigned char input[16],
-                                             unsigned char output[16] );
+MBEDTLS_DEPRECATED void mbedtls_aes_decrypt(mbedtls_aes_context *ctx,
+                                            const unsigned char input[16],
+                                            unsigned char output[16]);
 
 #undef MBEDTLS_DEPRECATED
 #endif /* !MBEDTLS_DEPRECATED_REMOVED */
@@ -619,7 +617,7 @@ MBEDTLS_DEPRECATED void mbedtls_aes_decrypt( mbedtls_aes_context *ctx,
  * \return         \c 0 on success.
  * \return         \c 1 on failure.
  */
-int mbedtls_aes_self_test( int verbose );
+int mbedtls_aes_self_test(int verbose);
 
 #ifdef __cplusplus
 }
diff --git a/common/mbedtls/arc4.c b/common/mbedtls/arc4.c
index 22992dd46..58a186034 100644
--- a/common/mbedtls/arc4.c
+++ b/common/mbedtls/arc4.c
@@ -50,24 +50,24 @@
 
 #if !defined(MBEDTLS_ARC4_ALT)
 
-void mbedtls_arc4_init( mbedtls_arc4_context *ctx )
+void mbedtls_arc4_init(mbedtls_arc4_context *ctx)
 {
-    memset( ctx, 0, sizeof( mbedtls_arc4_context ) );
+    memset(ctx, 0, sizeof(mbedtls_arc4_context));
 }
 
-void mbedtls_arc4_free( mbedtls_arc4_context *ctx )
+void mbedtls_arc4_free(mbedtls_arc4_context *ctx)
 {
-    if( ctx == NULL )
+    if (ctx == NULL)
         return;
 
-    mbedtls_platform_zeroize( ctx, sizeof( mbedtls_arc4_context ) );
+    mbedtls_platform_zeroize(ctx, sizeof(mbedtls_arc4_context));
 }
 
 /*
  * ARC4 key schedule
  */
-void mbedtls_arc4_setup( mbedtls_arc4_context *ctx, const unsigned char *key,
-                 unsigned int keylen )
+void mbedtls_arc4_setup(mbedtls_arc4_context *ctx, const unsigned char *key,
+                        unsigned int keylen)
 {
     int i, j, a;
     unsigned int k;
@@ -77,17 +77,16 @@ void mbedtls_arc4_setup( mbedtls_arc4_context *ctx, const unsigned char *key,
     ctx->y = 0;
     m = ctx->m;
 
-    for( i = 0; i < 256; i++ )
+    for (i = 0; i < 256; i++)
         m[i] = (unsigned char) i;
 
     j = k = 0;
 
-    for( i = 0; i < 256; i++, k++ )
-    {
-        if( k >= keylen ) k = 0;
+    for (i = 0; i < 256; i++, k++) {
+        if (k >= keylen) k = 0;
 
         a = m[i];
-        j = ( j + a + key[k] ) & 0xFF;
+        j = (j + a + key[k]) & 0xFF;
         m[i] = m[j];
         m[j] = (unsigned char) a;
     }
@@ -96,8 +95,8 @@ void mbedtls_arc4_setup( mbedtls_arc4_context *ctx, const unsigned char *key,
 /*
  * ARC4 cipher function
  */
-int mbedtls_arc4_crypt( mbedtls_arc4_context *ctx, size_t length, const unsigned char *input,
-                unsigned char *output )
+int mbedtls_arc4_crypt(mbedtls_arc4_context *ctx, size_t length, const unsigned char *input,
+                       unsigned char *output)
 {
     int x, y, a, b;
     size_t i;
@@ -107,22 +106,23 @@ int mbedtls_arc4_crypt( mbedtls_arc4_context *ctx, size_t length, const unsigned
     y = ctx->y;
     m = ctx->m;
 
-    for( i = 0; i < length; i++ )
-    {
-        x = ( x + 1 ) & 0xFF; a = m[x];
-        y = ( y + a ) & 0xFF; b = m[y];
+    for (i = 0; i < length; i++) {
+        x = (x + 1) & 0xFF;
+        a = m[x];
+        y = (y + a) & 0xFF;
+        b = m[y];
 
         m[x] = (unsigned char) b;
         m[y] = (unsigned char) a;
 
         output[i] = (unsigned char)
-            ( input[i] ^ m[(unsigned char)( a + b )] );
+                    (input[i] ^ m[(unsigned char)(a + b)]);
     }
 
     ctx->x = x;
     ctx->y = y;
 
-    return( 0 );
+    return (0);
 }
 
 #endif /* !MBEDTLS_ARC4_ALT */
@@ -133,22 +133,19 @@ int mbedtls_arc4_crypt( mbedtls_arc4_context *ctx, size_t length, const unsigned
  *
  * http://groups.google.com/group/comp.security.misc/msg/10a300c9d21afca0
  */
-static const unsigned char arc4_test_key[3][8] =
-{
+static const unsigned char arc4_test_key[3][8] = {
     { 0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF },
     { 0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF },
     { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }
 };
 
-static const unsigned char arc4_test_pt[3][8] =
-{
+static const unsigned char arc4_test_pt[3][8] = {
     { 0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF },
     { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
     { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }
 };
 
-static const unsigned char arc4_test_ct[3][8] =
-{
+static const unsigned char arc4_test_ct[3][8] = {
     { 0x75, 0xB7, 0x87, 0x80, 0x99, 0xE0, 0xC5, 0x96 },
     { 0x74, 0x94, 0xC2, 0xE7, 0x10, 0x4B, 0x08, 0x79 },
     { 0xDE, 0x18, 0x89, 0x41, 0xA3, 0x37, 0x5D, 0x3A }
@@ -157,45 +154,43 @@ static const unsigned char arc4_test_ct[3][8] =
 /*
  * Checkup routine
  */
-int mbedtls_arc4_self_test( int verbose )
+int mbedtls_arc4_self_test(int verbose)
 {
     int i, ret = 0;
     unsigned char ibuf[8];
     unsigned char obuf[8];
     mbedtls_arc4_context ctx;
 
-    mbedtls_arc4_init( &ctx );
+    mbedtls_arc4_init(&ctx);
 
-    for( i = 0; i < 3; i++ )
-    {
-        if( verbose != 0 )
-            mbedtls_printf( "  ARC4 test #%d: ", i + 1 );
+    for (i = 0; i < 3; i++) {
+        if (verbose != 0)
+            mbedtls_printf("  ARC4 test #%d: ", i + 1);
 
-        memcpy( ibuf, arc4_test_pt[i], 8 );
+        memcpy(ibuf, arc4_test_pt[i], 8);
 
-        mbedtls_arc4_setup( &ctx, arc4_test_key[i], 8 );
-        mbedtls_arc4_crypt( &ctx, 8, ibuf, obuf );
+        mbedtls_arc4_setup(&ctx, arc4_test_key[i], 8);
+        mbedtls_arc4_crypt(&ctx, 8, ibuf, obuf);
 
-        if( memcmp( obuf, arc4_test_ct[i], 8 ) != 0 )
-        {
-            if( verbose != 0 )
-                mbedtls_printf( "failed\n" );
+        if (memcmp(obuf, arc4_test_ct[i], 8) != 0) {
+            if (verbose != 0)
+                mbedtls_printf("failed\n");
 
             ret = 1;
             goto exit;
         }
 
-        if( verbose != 0 )
-            mbedtls_printf( "passed\n" );
+        if (verbose != 0)
+            mbedtls_printf("passed\n");
     }
 
-    if( verbose != 0 )
-        mbedtls_printf( "\n" );
+    if (verbose != 0)
+        mbedtls_printf("\n");
 
 exit:
-    mbedtls_arc4_free( &ctx );
+    mbedtls_arc4_free(&ctx);
 
-    return( ret );
+    return (ret);
 }
 
 #endif /* MBEDTLS_SELF_TEST */
diff --git a/common/mbedtls/arc4.h b/common/mbedtls/arc4.h
index 0355fb8b5..4c0a4ca57 100644
--- a/common/mbedtls/arc4.h
+++ b/common/mbedtls/arc4.h
@@ -55,8 +55,7 @@ extern "C" {
  *            security risk. We recommend considering stronger ciphers instead.
  *
  */
-typedef struct mbedtls_arc4_context
-{
+typedef struct mbedtls_arc4_context {
     int x;                      /*!< permutation index */
     int y;                      /*!< permutation index */
     unsigned char m[256];       /*!< permutation table */
@@ -77,7 +76,7 @@ mbedtls_arc4_context;
  *                 instead.
  *
  */
-void mbedtls_arc4_init( mbedtls_arc4_context *ctx );
+void mbedtls_arc4_init(mbedtls_arc4_context *ctx);
 
 /**
  * \brief          Clear ARC4 context
@@ -89,7 +88,7 @@ void mbedtls_arc4_init( mbedtls_arc4_context *ctx );
  *                 instead.
  *
  */
-void mbedtls_arc4_free( mbedtls_arc4_context *ctx );
+void mbedtls_arc4_free(mbedtls_arc4_context *ctx);
 
 /**
  * \brief          ARC4 key schedule
@@ -103,8 +102,8 @@ void mbedtls_arc4_free( mbedtls_arc4_context *ctx );
  *                 instead.
  *
  */
-void mbedtls_arc4_setup( mbedtls_arc4_context *ctx, const unsigned char *key,
-                 unsigned int keylen );
+void mbedtls_arc4_setup(mbedtls_arc4_context *ctx, const unsigned char *key,
+                        unsigned int keylen);
 
 /**
  * \brief          ARC4 cipher function
@@ -121,8 +120,8 @@ void mbedtls_arc4_setup( mbedtls_arc4_context *ctx, const unsigned char *key,
  *                 instead.
  *
  */
-int mbedtls_arc4_crypt( mbedtls_arc4_context *ctx, size_t length, const unsigned char *input,
-                unsigned char *output );
+int mbedtls_arc4_crypt(mbedtls_arc4_context *ctx, size_t length, const unsigned char *input,
+                       unsigned char *output);
 
 /**
  * \brief          Checkup routine
@@ -134,7 +133,7 @@ int mbedtls_arc4_crypt( mbedtls_arc4_context *ctx, size_t length, const unsigned
  *                 instead.
  *
  */
-int mbedtls_arc4_self_test( int verbose );
+int mbedtls_arc4_self_test(int verbose);
 
 #ifdef __cplusplus
 }
diff --git a/common/mbedtls/asn1.h b/common/mbedtls/asn1.h
index 00b6f2c0f..7eb06c543 100644
--- a/common/mbedtls/asn1.h
+++ b/common/mbedtls/asn1.h
@@ -118,8 +118,8 @@
  * 'unsigned char *oid' here!
  */
 #define MBEDTLS_OID_CMP(oid_str, oid_buf)                                   \
-        ( ( MBEDTLS_OID_SIZE(oid_str) != (oid_buf)->len ) ||                \
-          memcmp( (oid_str), (oid_buf)->p, (oid_buf)->len) != 0 )
+    ( ( MBEDTLS_OID_SIZE(oid_str) != (oid_buf)->len ) ||                \
+      memcmp( (oid_str), (oid_buf)->p, (oid_buf)->len) != 0 )
 
 #ifdef __cplusplus
 extern "C" {
@@ -133,8 +133,7 @@ extern "C" {
 /**
  * Type-length-value structure that allows for ASN1 using DER.
  */
-typedef struct mbedtls_asn1_buf
-{
+typedef struct mbedtls_asn1_buf {
     int tag;                /**< ASN1 type, e.g. MBEDTLS_ASN1_UTF8_STRING. */
     size_t len;             /**< ASN1 length, in octets. */
     unsigned char *p;       /**< ASN1 data, e.g. in ASCII. */
@@ -144,8 +143,7 @@ mbedtls_asn1_buf;
 /**
  * Container for ASN1 bit strings.
  */
-typedef struct mbedtls_asn1_bitstring
-{
+typedef struct mbedtls_asn1_bitstring {
     size_t len;                 /**< ASN1 length, in octets. */
     unsigned char unused_bits;  /**< Number of unused bits at the end of the string */
     unsigned char *p;           /**< Raw ASN1 data for the bit string */
@@ -155,8 +153,7 @@ mbedtls_asn1_bitstring;
 /**
  * Container for a sequence of ASN.1 items
  */
-typedef struct mbedtls_asn1_sequence
-{
+typedef struct mbedtls_asn1_sequence {
     mbedtls_asn1_buf buf;                   /**< Buffer containing the given ASN.1 item. */
     struct mbedtls_asn1_sequence *next;    /**< The next entry in the sequence. */
 }
@@ -165,8 +162,7 @@ mbedtls_asn1_sequence;
 /**
  * Container for a sequence or list of 'named' ASN.1 data items
  */
-typedef struct mbedtls_asn1_named_data
-{
+typedef struct mbedtls_asn1_named_data {
     mbedtls_asn1_buf oid;                   /**< The object identifier. */
     mbedtls_asn1_buf val;                   /**< The named value. */
     struct mbedtls_asn1_named_data *next;  /**< The next entry in the sequence. */
@@ -186,9 +182,9 @@ mbedtls_asn1_named_data;
  *              end of data, MBEDTLS_ERR_ASN1_INVALID_LENGTH if length is
  *              unparseable.
  */
-int mbedtls_asn1_get_len( unsigned char **p,
-                  const unsigned char *end,
-                  size_t *len );
+int mbedtls_asn1_get_len(unsigned char **p,
+                         const unsigned char *end,
+                         size_t *len);
 
 /**
  * \brief       Get the tag and length of the tag. Check for the requested tag.
@@ -202,9 +198,9 @@ int mbedtls_asn1_get_len( unsigned char **p,
  * \return      0 if successful, MBEDTLS_ERR_ASN1_UNEXPECTED_TAG if tag did
  *              not match requested tag, or another specific ASN.1 error code.
  */
-int mbedtls_asn1_get_tag( unsigned char **p,
-                  const unsigned char *end,
-                  size_t *len, int tag );
+int mbedtls_asn1_get_tag(unsigned char **p,
+                         const unsigned char *end,
+                         size_t *len, int tag);
 
 /**
  * \brief       Retrieve a boolean ASN.1 tag and its value.
@@ -216,9 +212,9 @@ int mbedtls_asn1_get_tag( unsigned char **p,
  *
  * \return      0 if successful or a specific ASN.1 error code.
  */
-int mbedtls_asn1_get_bool( unsigned char **p,
-                   const unsigned char *end,
-                   int *val );
+int mbedtls_asn1_get_bool(unsigned char **p,
+                          const unsigned char *end,
+                          int *val);
 
 /**
  * \brief       Retrieve an integer ASN.1 tag and its value.
@@ -230,9 +226,9 @@ int mbedtls_asn1_get_bool( unsigned char **p,
  *
  * \return      0 if successful or a specific ASN.1 error code.
  */
-int mbedtls_asn1_get_int( unsigned char **p,
-                  const unsigned char *end,
-                  int *val );
+int mbedtls_asn1_get_int(unsigned char **p,
+                         const unsigned char *end,
+                         int *val);
 
 /**
  * \brief       Retrieve a bitstring ASN.1 tag and its value.
@@ -244,8 +240,8 @@ int mbedtls_asn1_get_int( unsigned char **p,
  *
  * \return      0 if successful or a specific ASN.1 error code.
  */
-int mbedtls_asn1_get_bitstring( unsigned char **p, const unsigned char *end,
-                        mbedtls_asn1_bitstring *bs);
+int mbedtls_asn1_get_bitstring(unsigned char **p, const unsigned char *end,
+                               mbedtls_asn1_bitstring *bs);
 
 /**
  * \brief       Retrieve a bitstring ASN.1 tag without unused bits and its
@@ -258,8 +254,8 @@ int mbedtls_asn1_get_bitstring( unsigned char **p, const unsigned char *end,
  *
  * \return      0 if successful or a specific ASN.1 error code.
  */
-int mbedtls_asn1_get_bitstring_null( unsigned char **p, const unsigned char *end,
-                             size_t *len );
+int mbedtls_asn1_get_bitstring_null(unsigned char **p, const unsigned char *end,
+                                    size_t *len);
 
 /**
  * \brief       Parses and splits an ASN.1 "SEQUENCE OF <tag>"
@@ -272,10 +268,10 @@ int mbedtls_asn1_get_bitstring_null( unsigned char **p, const unsigned char *end
  *
  * \return      0 if successful or a specific ASN.1 error code.
  */
-int mbedtls_asn1_get_sequence_of( unsigned char **p,
-                          const unsigned char *end,
-                          mbedtls_asn1_sequence *cur,
-                          int tag);
+int mbedtls_asn1_get_sequence_of(unsigned char **p,
+                                 const unsigned char *end,
+                                 mbedtls_asn1_sequence *cur,
+                                 int tag);
 
 #if defined(MBEDTLS_BIGNUM_C)
 /**
@@ -288,9 +284,9 @@ int mbedtls_asn1_get_sequence_of( unsigned char **p,
  *
  * \return      0 if successful or a specific ASN.1 or MPI error code.
  */
-int mbedtls_asn1_get_mpi( unsigned char **p,
-                  const unsigned char *end,
-                  mbedtls_mpi *X );
+int mbedtls_asn1_get_mpi(unsigned char **p,
+                         const unsigned char *end,
+                         mbedtls_mpi *X);
 #endif /* MBEDTLS_BIGNUM_C */
 
 /**
@@ -305,9 +301,9 @@ int mbedtls_asn1_get_mpi( unsigned char **p,
  *
  * \return      0 if successful or a specific ASN.1 or MPI error code.
  */
-int mbedtls_asn1_get_alg( unsigned char **p,
-                  const unsigned char *end,
-                  mbedtls_asn1_buf *alg, mbedtls_asn1_buf *params );
+int mbedtls_asn1_get_alg(unsigned char **p,
+                         const unsigned char *end,
+                         mbedtls_asn1_buf *alg, mbedtls_asn1_buf *params);
 
 /**
  * \brief       Retrieve an AlgorithmIdentifier ASN.1 sequence with NULL or no
@@ -321,9 +317,9 @@ int mbedtls_asn1_get_alg( unsigned char **p,
  *
  * \return      0 if successful or a specific ASN.1 or MPI error code.
  */
-int mbedtls_asn1_get_alg_null( unsigned char **p,
-                       const unsigned char *end,
-                       mbedtls_asn1_buf *alg );
+int mbedtls_asn1_get_alg_null(unsigned char **p,
+                              const unsigned char *end,
+                              mbedtls_asn1_buf *alg);
 
 /**
  * \brief       Find a specific named_data entry in a sequence or list based on
@@ -335,15 +331,15 @@ int mbedtls_asn1_get_alg_null( unsigned char **p,
  *
  * \return      NULL if not found, or a pointer to the existing entry.
  */
-mbedtls_asn1_named_data *mbedtls_asn1_find_named_data( mbedtls_asn1_named_data *list,
-                                       const char *oid, size_t len );
+mbedtls_asn1_named_data *mbedtls_asn1_find_named_data(mbedtls_asn1_named_data *list,
+                                                      const char *oid, size_t len);
 
 /**
  * \brief       Free a mbedtls_asn1_named_data entry
  *
  * \param entry The named data entry to free
  */
-void mbedtls_asn1_free_named_data( mbedtls_asn1_named_data *entry );
+void mbedtls_asn1_free_named_data(mbedtls_asn1_named_data *entry);
 
 /**
  * \brief       Free all entries in a mbedtls_asn1_named_data list
@@ -351,7 +347,7 @@ void mbedtls_asn1_free_named_data( mbedtls_asn1_named_data *entry );
  *
  * \param head  Pointer to the head of the list of named data entries to free
  */
-void mbedtls_asn1_free_named_data_list( mbedtls_asn1_named_data **head );
+void mbedtls_asn1_free_named_data_list(mbedtls_asn1_named_data **head);
 
 #ifdef __cplusplus
 }
diff --git a/common/mbedtls/asn1parse.c b/common/mbedtls/asn1parse.c
index aeec173ae..ace2d2146 100644
--- a/common/mbedtls/asn1parse.c
+++ b/common/mbedtls/asn1parse.c
@@ -49,186 +49,183 @@
 /*
  * ASN.1 DER decoding routines
  */
-int mbedtls_asn1_get_len( unsigned char **p,
-                  const unsigned char *end,
-                  size_t *len )
+int mbedtls_asn1_get_len(unsigned char **p,
+                         const unsigned char *end,
+                         size_t *len)
 {
-    if( ( end - *p ) < 1 )
-        return( MBEDTLS_ERR_ASN1_OUT_OF_DATA );
+    if ((end - *p) < 1)
+        return (MBEDTLS_ERR_ASN1_OUT_OF_DATA);
 
-    if( ( **p & 0x80 ) == 0 )
+    if ((**p & 0x80) == 0)
         *len = *(*p)++;
-    else
-    {
-        switch( **p & 0x7F )
-        {
-        case 1:
-            if( ( end - *p ) < 2 )
-                return( MBEDTLS_ERR_ASN1_OUT_OF_DATA );
+    else {
+        switch (**p & 0x7F) {
+            case 1:
+                if ((end - *p) < 2)
+                    return (MBEDTLS_ERR_ASN1_OUT_OF_DATA);
 
-            *len = (*p)[1];
-            (*p) += 2;
-            break;
+                *len = (*p)[1];
+                (*p) += 2;
+                break;
 
-        case 2:
-            if( ( end - *p ) < 3 )
-                return( MBEDTLS_ERR_ASN1_OUT_OF_DATA );
+            case 2:
+                if ((end - *p) < 3)
+                    return (MBEDTLS_ERR_ASN1_OUT_OF_DATA);
 
-            *len = ( (size_t)(*p)[1] << 8 ) | (*p)[2];
-            (*p) += 3;
-            break;
+                *len = ((size_t)(*p)[1] << 8) | (*p)[2];
+                (*p) += 3;
+                break;
 
-        case 3:
-            if( ( end - *p ) < 4 )
-                return( MBEDTLS_ERR_ASN1_OUT_OF_DATA );
+            case 3:
+                if ((end - *p) < 4)
+                    return (MBEDTLS_ERR_ASN1_OUT_OF_DATA);
 
-            *len = ( (size_t)(*p)[1] << 16 ) |
-                   ( (size_t)(*p)[2] << 8  ) | (*p)[3];
-            (*p) += 4;
-            break;
+                *len = ((size_t)(*p)[1] << 16) |
+                       ((size_t)(*p)[2] << 8) | (*p)[3];
+                (*p) += 4;
+                break;
 
-        case 4:
-            if( ( end - *p ) < 5 )
-                return( MBEDTLS_ERR_ASN1_OUT_OF_DATA );
+            case 4:
+                if ((end - *p) < 5)
+                    return (MBEDTLS_ERR_ASN1_OUT_OF_DATA);
 
-            *len = ( (size_t)(*p)[1] << 24 ) | ( (size_t)(*p)[2] << 16 ) |
-                   ( (size_t)(*p)[3] << 8  ) |           (*p)[4];
-            (*p) += 5;
-            break;
+                *len = ((size_t)(*p)[1] << 24) | ((size_t)(*p)[2] << 16) |
+                       ((size_t)(*p)[3] << 8) | (*p)[4];
+                (*p) += 5;
+                break;
 
-        default:
-            return( MBEDTLS_ERR_ASN1_INVALID_LENGTH );
+            default:
+                return (MBEDTLS_ERR_ASN1_INVALID_LENGTH);
         }
     }
 
-    if( *len > (size_t) ( end - *p ) )
-        return( MBEDTLS_ERR_ASN1_OUT_OF_DATA );
+    if (*len > (size_t)(end - *p))
+        return (MBEDTLS_ERR_ASN1_OUT_OF_DATA);
 
-    return( 0 );
+    return (0);
 }
 
-int mbedtls_asn1_get_tag( unsigned char **p,
-                  const unsigned char *end,
-                  size_t *len, int tag )
+int mbedtls_asn1_get_tag(unsigned char **p,
+                         const unsigned char *end,
+                         size_t *len, int tag)
 {
-    if( ( end - *p ) < 1 )
-        return( MBEDTLS_ERR_ASN1_OUT_OF_DATA );
+    if ((end - *p) < 1)
+        return (MBEDTLS_ERR_ASN1_OUT_OF_DATA);
 
-    if( **p != tag )
-        return( MBEDTLS_ERR_ASN1_UNEXPECTED_TAG );
+    if (**p != tag)
+        return (MBEDTLS_ERR_ASN1_UNEXPECTED_TAG);
 
     (*p)++;
 
-    return( mbedtls_asn1_get_len( p, end, len ) );
+    return (mbedtls_asn1_get_len(p, end, len));
 }
 
-int mbedtls_asn1_get_bool( unsigned char **p,
-                   const unsigned char *end,
-                   int *val )
+int mbedtls_asn1_get_bool(unsigned char **p,
+                          const unsigned char *end,
+                          int *val)
 {
     int ret;
     size_t len;
 
-    if( ( ret = mbedtls_asn1_get_tag( p, end, &len, MBEDTLS_ASN1_BOOLEAN ) ) != 0 )
-        return( ret );
+    if ((ret = mbedtls_asn1_get_tag(p, end, &len, MBEDTLS_ASN1_BOOLEAN)) != 0)
+        return (ret);
 
-    if( len != 1 )
-        return( MBEDTLS_ERR_ASN1_INVALID_LENGTH );
+    if (len != 1)
+        return (MBEDTLS_ERR_ASN1_INVALID_LENGTH);
 
-    *val = ( **p != 0 ) ? 1 : 0;
+    *val = (**p != 0) ? 1 : 0;
     (*p)++;
 
-    return( 0 );
+    return (0);
 }
 
-int mbedtls_asn1_get_int( unsigned char **p,
-                  const unsigned char *end,
-                  int *val )
+int mbedtls_asn1_get_int(unsigned char **p,
+                         const unsigned char *end,
+                         int *val)
 {
     int ret;
     size_t len;
 
-    if( ( ret = mbedtls_asn1_get_tag( p, end, &len, MBEDTLS_ASN1_INTEGER ) ) != 0 )
-        return( ret );
+    if ((ret = mbedtls_asn1_get_tag(p, end, &len, MBEDTLS_ASN1_INTEGER)) != 0)
+        return (ret);
 
-    if( len == 0 || len > sizeof( int ) || ( **p & 0x80 ) != 0 )
-        return( MBEDTLS_ERR_ASN1_INVALID_LENGTH );
+    if (len == 0 || len > sizeof(int) || (**p & 0x80) != 0)
+        return (MBEDTLS_ERR_ASN1_INVALID_LENGTH);
 
     *val = 0;
 
-    while( len-- > 0 )
-    {
-        *val = ( *val << 8 ) | **p;
+    while (len-- > 0) {
+        *val = (*val << 8) | **p;
         (*p)++;
     }
 
-    return( 0 );
+    return (0);
 }
 
 #if defined(MBEDTLS_BIGNUM_C)
-int mbedtls_asn1_get_mpi( unsigned char **p,
-                  const unsigned char *end,
-                  mbedtls_mpi *X )
+int mbedtls_asn1_get_mpi(unsigned char **p,
+                         const unsigned char *end,
+                         mbedtls_mpi *X)
 {
     int ret;
     size_t len;
 
-    if( ( ret = mbedtls_asn1_get_tag( p, end, &len, MBEDTLS_ASN1_INTEGER ) ) != 0 )
-        return( ret );
+    if ((ret = mbedtls_asn1_get_tag(p, end, &len, MBEDTLS_ASN1_INTEGER)) != 0)
+        return (ret);
 
-    ret = mbedtls_mpi_read_binary( X, *p, len );
+    ret = mbedtls_mpi_read_binary(X, *p, len);
 
     *p += len;
 
-    return( ret );
+    return (ret);
 }
 #endif /* MBEDTLS_BIGNUM_C */
 
-int mbedtls_asn1_get_bitstring( unsigned char **p, const unsigned char *end,
-                        mbedtls_asn1_bitstring *bs)
+int mbedtls_asn1_get_bitstring(unsigned char **p, const unsigned char *end,
+                               mbedtls_asn1_bitstring *bs)
 {
     int ret;
 
     /* Certificate type is a single byte bitstring */
-    if( ( ret = mbedtls_asn1_get_tag( p, end, &bs->len, MBEDTLS_ASN1_BIT_STRING ) ) != 0 )
-        return( ret );
+    if ((ret = mbedtls_asn1_get_tag(p, end, &bs->len, MBEDTLS_ASN1_BIT_STRING)) != 0)
+        return (ret);
 
     /* Check length, subtract one for actual bit string length */
-    if( bs->len < 1 )
-        return( MBEDTLS_ERR_ASN1_OUT_OF_DATA );
+    if (bs->len < 1)
+        return (MBEDTLS_ERR_ASN1_OUT_OF_DATA);
     bs->len -= 1;
 
     /* Get number of unused bits, ensure unused bits <= 7 */
     bs->unused_bits = **p;
-    if( bs->unused_bits > 7 )
-        return( MBEDTLS_ERR_ASN1_INVALID_LENGTH );
+    if (bs->unused_bits > 7)
+        return (MBEDTLS_ERR_ASN1_INVALID_LENGTH);
     (*p)++;
 
     /* Get actual bitstring */
     bs->p = *p;
     *p += bs->len;
 
-    if( *p != end )
-        return( MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+    if (*p != end)
+        return (MBEDTLS_ERR_ASN1_LENGTH_MISMATCH);
 
-    return( 0 );
+    return (0);
 }
 
 /*
  * Get a bit string without unused bits
  */
-int mbedtls_asn1_get_bitstring_null( unsigned char **p, const unsigned char *end,
-                             size_t *len )
+int mbedtls_asn1_get_bitstring_null(unsigned char **p, const unsigned char *end,
+                                    size_t *len)
 {
     int ret;
 
-    if( ( ret = mbedtls_asn1_get_tag( p, end, len, MBEDTLS_ASN1_BIT_STRING ) ) != 0 )
-        return( ret );
+    if ((ret = mbedtls_asn1_get_tag(p, end, len, MBEDTLS_ASN1_BIT_STRING)) != 0)
+        return (ret);
 
-    if( (*len)-- < 2 || *(*p)++ != 0 )
-        return( MBEDTLS_ERR_ASN1_INVALID_DATA );
+    if ((*len)-- < 2 || *(*p)++ != 0)
+        return (MBEDTLS_ERR_ASN1_INVALID_DATA);
 
-    return( 0 );
+    return (0);
 }
 
 
@@ -236,42 +233,40 @@ int mbedtls_asn1_get_bitstring_null( unsigned char **p, const unsigned char *end
 /*
  *  Parses and splits an ASN.1 "SEQUENCE OF <tag>"
  */
-int mbedtls_asn1_get_sequence_of( unsigned char **p,
-                          const unsigned char *end,
-                          mbedtls_asn1_sequence *cur,
-                          int tag)
+int mbedtls_asn1_get_sequence_of(unsigned char **p,
+                                 const unsigned char *end,
+                                 mbedtls_asn1_sequence *cur,
+                                 int tag)
 {
     int ret;
     size_t len;
     mbedtls_asn1_buf *buf;
 
     /* Get main sequence tag */
-    if( ( ret = mbedtls_asn1_get_tag( p, end, &len,
-            MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
-        return( ret );
+    if ((ret = mbedtls_asn1_get_tag(p, end, &len,
+                                    MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE)) != 0)
+        return (ret);
 
-    if( *p + len != end )
-        return( MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+    if (*p + len != end)
+        return (MBEDTLS_ERR_ASN1_LENGTH_MISMATCH);
 
-    while( *p < end )
-    {
+    while (*p < end) {
         buf = &(cur->buf);
         buf->tag = **p;
 
-        if( ( ret = mbedtls_asn1_get_tag( p, end, &buf->len, tag ) ) != 0 )
-            return( ret );
+        if ((ret = mbedtls_asn1_get_tag(p, end, &buf->len, tag)) != 0)
+            return (ret);
 
         buf->p = *p;
         *p += buf->len;
 
         /* Allocate and assign next pointer */
-        if( *p < end )
-        {
-            cur->next = (mbedtls_asn1_sequence*)mbedtls_calloc( 1,
-                                            sizeof( mbedtls_asn1_sequence ) );
+        if (*p < end) {
+            cur->next = (mbedtls_asn1_sequence *)mbedtls_calloc(1,
+                                                                sizeof(mbedtls_asn1_sequence));
 
-            if( cur->next == NULL )
-                return( MBEDTLS_ERR_ASN1_ALLOC_FAILED );
+            if (cur->next == NULL)
+                return (MBEDTLS_ERR_ASN1_ALLOC_FAILED);
 
             cur = cur->next;
         }
@@ -280,112 +275,108 @@ int mbedtls_asn1_get_sequence_of( unsigned char **p,
     /* Set final sequence entry's next pointer to NULL */
     cur->next = NULL;
 
-    if( *p != end )
-        return( MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+    if (*p != end)
+        return (MBEDTLS_ERR_ASN1_LENGTH_MISMATCH);
 
-    return( 0 );
+    return (0);
 }
 
-int mbedtls_asn1_get_alg( unsigned char **p,
-                  const unsigned char *end,
-                  mbedtls_asn1_buf *alg, mbedtls_asn1_buf *params )
+int mbedtls_asn1_get_alg(unsigned char **p,
+                         const unsigned char *end,
+                         mbedtls_asn1_buf *alg, mbedtls_asn1_buf *params)
 {
     int ret;
     size_t len;
 
-    if( ( ret = mbedtls_asn1_get_tag( p, end, &len,
-            MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
-        return( ret );
+    if ((ret = mbedtls_asn1_get_tag(p, end, &len,
+                                    MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE)) != 0)
+        return (ret);
 
-    if( ( end - *p ) < 1 )
-        return( MBEDTLS_ERR_ASN1_OUT_OF_DATA );
+    if ((end - *p) < 1)
+        return (MBEDTLS_ERR_ASN1_OUT_OF_DATA);
 
     alg->tag = **p;
     end = *p + len;
 
-    if( ( ret = mbedtls_asn1_get_tag( p, end, &alg->len, MBEDTLS_ASN1_OID ) ) != 0 )
-        return( ret );
+    if ((ret = mbedtls_asn1_get_tag(p, end, &alg->len, MBEDTLS_ASN1_OID)) != 0)
+        return (ret);
 
     alg->p = *p;
     *p += alg->len;
 
-    if( *p == end )
-    {
-        mbedtls_platform_zeroize( params, sizeof(mbedtls_asn1_buf) );
-        return( 0 );
+    if (*p == end) {
+        mbedtls_platform_zeroize(params, sizeof(mbedtls_asn1_buf));
+        return (0);
     }
 
     params->tag = **p;
     (*p)++;
 
-    if( ( ret = mbedtls_asn1_get_len( p, end, &params->len ) ) != 0 )
-        return( ret );
+    if ((ret = mbedtls_asn1_get_len(p, end, &params->len)) != 0)
+        return (ret);
 
     params->p = *p;
     *p += params->len;
 
-    if( *p != end )
-        return( MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+    if (*p != end)
+        return (MBEDTLS_ERR_ASN1_LENGTH_MISMATCH);
 
-    return( 0 );
+    return (0);
 }
 
-int mbedtls_asn1_get_alg_null( unsigned char **p,
-                       const unsigned char *end,
-                       mbedtls_asn1_buf *alg )
+int mbedtls_asn1_get_alg_null(unsigned char **p,
+                              const unsigned char *end,
+                              mbedtls_asn1_buf *alg)
 {
     int ret;
     mbedtls_asn1_buf params;
 
-    memset( &params, 0, sizeof(mbedtls_asn1_buf) );
+    memset(&params, 0, sizeof(mbedtls_asn1_buf));
 
-    if( ( ret = mbedtls_asn1_get_alg( p, end, alg, &params ) ) != 0 )
-        return( ret );
+    if ((ret = mbedtls_asn1_get_alg(p, end, alg, &params)) != 0)
+        return (ret);
 
-    if( ( params.tag != MBEDTLS_ASN1_NULL && params.tag != 0 ) || params.len != 0 )
-        return( MBEDTLS_ERR_ASN1_INVALID_DATA );
+    if ((params.tag != MBEDTLS_ASN1_NULL && params.tag != 0) || params.len != 0)
+        return (MBEDTLS_ERR_ASN1_INVALID_DATA);
 
-    return( 0 );
+    return (0);
 }
 
-void mbedtls_asn1_free_named_data( mbedtls_asn1_named_data *cur )
+void mbedtls_asn1_free_named_data(mbedtls_asn1_named_data *cur)
 {
-    if( cur == NULL )
+    if (cur == NULL)
         return;
 
-    mbedtls_free( cur->oid.p );
-    mbedtls_free( cur->val.p );
+    mbedtls_free(cur->oid.p);
+    mbedtls_free(cur->val.p);
 
-    mbedtls_platform_zeroize( cur, sizeof( mbedtls_asn1_named_data ) );
+    mbedtls_platform_zeroize(cur, sizeof(mbedtls_asn1_named_data));
 }
 
-void mbedtls_asn1_free_named_data_list( mbedtls_asn1_named_data **head )
+void mbedtls_asn1_free_named_data_list(mbedtls_asn1_named_data **head)
 {
     mbedtls_asn1_named_data *cur;
 
-    while( ( cur = *head ) != NULL )
-    {
+    while ((cur = *head) != NULL) {
         *head = cur->next;
-        mbedtls_asn1_free_named_data( cur );
-        mbedtls_free( cur );
+        mbedtls_asn1_free_named_data(cur);
+        mbedtls_free(cur);
     }
 }
 
-mbedtls_asn1_named_data *mbedtls_asn1_find_named_data( mbedtls_asn1_named_data *list,
-                                       const char *oid, size_t len )
+mbedtls_asn1_named_data *mbedtls_asn1_find_named_data(mbedtls_asn1_named_data *list,
+                                                      const char *oid, size_t len)
 {
-    while( list != NULL )
-    {
-        if( list->oid.len == len &&
-            memcmp( list->oid.p, oid, len ) == 0 )
-        {
+    while (list != NULL) {
+        if (list->oid.len == len &&
+            memcmp(list->oid.p, oid, len) == 0) {
             break;
         }
 
         list = list->next;
     }
 
-    return( list );
+    return (list);
 }
 
 #endif /* MBEDTLS_ASN1_PARSE_C */
diff --git a/common/mbedtls/asn1write.c b/common/mbedtls/asn1write.c
index f8e29dc74..1335ff65d 100644
--- a/common/mbedtls/asn1write.c
+++ b/common/mbedtls/asn1write.c
@@ -41,352 +41,341 @@
 #define mbedtls_free       free
 #endif
 
-int mbedtls_asn1_write_len( unsigned char **p, unsigned char *start, size_t len )
+int mbedtls_asn1_write_len(unsigned char **p, unsigned char *start, size_t len)
 {
-    if( len < 0x80 )
-    {
-        if( *p - start < 1 )
-            return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
+    if (len < 0x80) {
+        if (*p - start < 1)
+            return (MBEDTLS_ERR_ASN1_BUF_TOO_SMALL);
 
         *--(*p) = (unsigned char) len;
-        return( 1 );
+        return (1);
     }
 
-    if( len <= 0xFF )
-    {
-        if( *p - start < 2 )
-            return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
+    if (len <= 0xFF) {
+        if (*p - start < 2)
+            return (MBEDTLS_ERR_ASN1_BUF_TOO_SMALL);
 
         *--(*p) = (unsigned char) len;
         *--(*p) = 0x81;
-        return( 2 );
+        return (2);
     }
 
-    if( len <= 0xFFFF )
-    {
-        if( *p - start < 3 )
-            return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
+    if (len <= 0xFFFF) {
+        if (*p - start < 3)
+            return (MBEDTLS_ERR_ASN1_BUF_TOO_SMALL);
 
-        *--(*p) = ( len       ) & 0xFF;
-        *--(*p) = ( len >>  8 ) & 0xFF;
+        *--(*p) = (len) & 0xFF;
+        *--(*p) = (len >>  8) & 0xFF;
         *--(*p) = 0x82;
-        return( 3 );
+        return (3);
     }
 
-    if( len <= 0xFFFFFF )
-    {
-        if( *p - start < 4 )
-            return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
+    if (len <= 0xFFFFFF) {
+        if (*p - start < 4)
+            return (MBEDTLS_ERR_ASN1_BUF_TOO_SMALL);
 
-        *--(*p) = ( len       ) & 0xFF;
-        *--(*p) = ( len >>  8 ) & 0xFF;
-        *--(*p) = ( len >> 16 ) & 0xFF;
+        *--(*p) = (len) & 0xFF;
+        *--(*p) = (len >>  8) & 0xFF;
+        *--(*p) = (len >> 16) & 0xFF;
         *--(*p) = 0x83;
-        return( 4 );
+        return (4);
     }
 
 #if SIZE_MAX > 0xFFFFFFFF
-    if( len <= 0xFFFFFFFF )
+    if (len <= 0xFFFFFFFF)
 #endif
     {
-        if( *p - start < 5 )
-            return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
+        if (*p - start < 5)
+            return (MBEDTLS_ERR_ASN1_BUF_TOO_SMALL);
 
-        *--(*p) = ( len       ) & 0xFF;
-        *--(*p) = ( len >>  8 ) & 0xFF;
-        *--(*p) = ( len >> 16 ) & 0xFF;
-        *--(*p) = ( len >> 24 ) & 0xFF;
+        *--(*p) = (len) & 0xFF;
+        *--(*p) = (len >>  8) & 0xFF;
+        *--(*p) = (len >> 16) & 0xFF;
+        *--(*p) = (len >> 24) & 0xFF;
         *--(*p) = 0x84;
-        return( 5 );
+        return (5);
     }
 
 #if SIZE_MAX > 0xFFFFFFFF
-    return( MBEDTLS_ERR_ASN1_INVALID_LENGTH );
+    return (MBEDTLS_ERR_ASN1_INVALID_LENGTH);
 #endif
 }
 
-int mbedtls_asn1_write_tag( unsigned char **p, unsigned char *start, unsigned char tag )
+int mbedtls_asn1_write_tag(unsigned char **p, unsigned char *start, unsigned char tag)
 {
-    if( *p - start < 1 )
-        return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
+    if (*p - start < 1)
+        return (MBEDTLS_ERR_ASN1_BUF_TOO_SMALL);
 
     *--(*p) = tag;
 
-    return( 1 );
+    return (1);
 }
 
-int mbedtls_asn1_write_raw_buffer( unsigned char **p, unsigned char *start,
-                           const unsigned char *buf, size_t size )
+int mbedtls_asn1_write_raw_buffer(unsigned char **p, unsigned char *start,
+                                  const unsigned char *buf, size_t size)
 {
     size_t len = 0;
 
-    if( *p < start || (size_t)( *p - start ) < size )
-        return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
+    if (*p < start || (size_t)(*p - start) < size)
+        return (MBEDTLS_ERR_ASN1_BUF_TOO_SMALL);
 
     len = size;
     (*p) -= len;
-    memcpy( *p, buf, len );
+    memcpy(*p, buf, len);
 
-    return( (int) len );
+    return ((int) len);
 }
 
 #if defined(MBEDTLS_BIGNUM_C)
-int mbedtls_asn1_write_mpi( unsigned char **p, unsigned char *start, const mbedtls_mpi *X )
+int mbedtls_asn1_write_mpi(unsigned char **p, unsigned char *start, const mbedtls_mpi *X)
 {
     int ret;
     size_t len = 0;
 
     // Write the MPI
     //
-    len = mbedtls_mpi_size( X );
+    len = mbedtls_mpi_size(X);
 
-    if( *p < start || (size_t)( *p - start ) < len )
-        return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
+    if (*p < start || (size_t)(*p - start) < len)
+        return (MBEDTLS_ERR_ASN1_BUF_TOO_SMALL);
 
     (*p) -= len;
-    MBEDTLS_MPI_CHK( mbedtls_mpi_write_binary( X, *p, len ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_write_binary(X, *p, len));
 
     // DER format assumes 2s complement for numbers, so the leftmost bit
     // should be 0 for positive numbers and 1 for negative numbers.
     //
-    if( X->s ==1 && **p & 0x80 )
-    {
-        if( *p - start < 1 )
-            return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
+    if (X->s == 1 && **p & 0x80) {
+        if (*p - start < 1)
+            return (MBEDTLS_ERR_ASN1_BUF_TOO_SMALL);
 
         *--(*p) = 0x00;
         len += 1;
     }
 
-    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( p, start, len ) );
-    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( p, start, MBEDTLS_ASN1_INTEGER ) );
+    MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_len(p, start, len));
+    MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_tag(p, start, MBEDTLS_ASN1_INTEGER));
 
     ret = (int) len;
 
 cleanup:
-    return( ret );
+    return (ret);
 }
 #endif /* MBEDTLS_BIGNUM_C */
 
-int mbedtls_asn1_write_null( unsigned char **p, unsigned char *start )
+int mbedtls_asn1_write_null(unsigned char **p, unsigned char *start)
 {
     int ret;
     size_t len = 0;
 
     // Write NULL
     //
-    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( p, start, 0) );
-    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( p, start, MBEDTLS_ASN1_NULL ) );
+    MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_len(p, start, 0));
+    MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_tag(p, start, MBEDTLS_ASN1_NULL));
 
-    return( (int) len );
+    return ((int) len);
 }
 
-int mbedtls_asn1_write_oid( unsigned char **p, unsigned char *start,
-                    const char *oid, size_t oid_len )
+int mbedtls_asn1_write_oid(unsigned char **p, unsigned char *start,
+                           const char *oid, size_t oid_len)
 {
     int ret;
     size_t len = 0;
 
-    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_raw_buffer( p, start,
-                                  (const unsigned char *) oid, oid_len ) );
-    MBEDTLS_ASN1_CHK_ADD( len , mbedtls_asn1_write_len( p, start, len ) );
-    MBEDTLS_ASN1_CHK_ADD( len , mbedtls_asn1_write_tag( p, start, MBEDTLS_ASN1_OID ) );
+    MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_raw_buffer(p, start,
+                                                            (const unsigned char *) oid, oid_len));
+    MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_len(p, start, len));
+    MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_tag(p, start, MBEDTLS_ASN1_OID));
 
-    return( (int) len );
+    return ((int) len);
 }
 
-int mbedtls_asn1_write_algorithm_identifier( unsigned char **p, unsigned char *start,
-                                     const char *oid, size_t oid_len,
-                                     size_t par_len )
+int mbedtls_asn1_write_algorithm_identifier(unsigned char **p, unsigned char *start,
+                                            const char *oid, size_t oid_len,
+                                            size_t par_len)
 {
     int ret;
     size_t len = 0;
 
-    if( par_len == 0 )
-        MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_null( p, start ) );
+    if (par_len == 0)
+        MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_null(p, start));
     else
         len += par_len;
 
-    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_oid( p, start, oid, oid_len ) );
+    MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_oid(p, start, oid, oid_len));
 
-    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( p, start, len ) );
-    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( p, start,
-                                       MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) );
+    MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_len(p, start, len));
+    MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_tag(p, start,
+                                                     MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE));
 
-    return( (int) len );
+    return ((int) len);
 }
 
-int mbedtls_asn1_write_bool( unsigned char **p, unsigned char *start, int boolean )
+int mbedtls_asn1_write_bool(unsigned char **p, unsigned char *start, int boolean)
 {
     int ret;
     size_t len = 0;
 
-    if( *p - start < 1 )
-        return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
+    if (*p - start < 1)
+        return (MBEDTLS_ERR_ASN1_BUF_TOO_SMALL);
 
     *--(*p) = (boolean) ? 255 : 0;
     len++;
 
-    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( p, start, len ) );
-    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( p, start, MBEDTLS_ASN1_BOOLEAN ) );
+    MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_len(p, start, len));
+    MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_tag(p, start, MBEDTLS_ASN1_BOOLEAN));
 
-    return( (int) len );
+    return ((int) len);
 }
 
-int mbedtls_asn1_write_int( unsigned char **p, unsigned char *start, int val )
+int mbedtls_asn1_write_int(unsigned char **p, unsigned char *start, int val)
 {
     int ret;
     size_t len = 0;
 
-    if( *p - start < 1 )
-        return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
+    if (*p - start < 1)
+        return (MBEDTLS_ERR_ASN1_BUF_TOO_SMALL);
 
     len += 1;
     *--(*p) = val;
 
-    if( val > 0 && **p & 0x80 )
-    {
-        if( *p - start < 1 )
-            return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
+    if (val > 0 && **p & 0x80) {
+        if (*p - start < 1)
+            return (MBEDTLS_ERR_ASN1_BUF_TOO_SMALL);
 
         *--(*p) = 0x00;
         len += 1;
     }
 
-    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( p, start, len ) );
-    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( p, start, MBEDTLS_ASN1_INTEGER ) );
+    MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_len(p, start, len));
+    MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_tag(p, start, MBEDTLS_ASN1_INTEGER));
 
-    return( (int) len );
+    return ((int) len);
 }
 
-int mbedtls_asn1_write_printable_string( unsigned char **p, unsigned char *start,
-                                 const char *text, size_t text_len )
+int mbedtls_asn1_write_printable_string(unsigned char **p, unsigned char *start,
+                                        const char *text, size_t text_len)
 {
     int ret;
     size_t len = 0;
 
-    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_raw_buffer( p, start,
-                  (const unsigned char *) text, text_len ) );
+    MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_raw_buffer(p, start,
+                                                            (const unsigned char *) text, text_len));
 
-    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( p, start, len ) );
-    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( p, start, MBEDTLS_ASN1_PRINTABLE_STRING ) );
+    MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_len(p, start, len));
+    MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_tag(p, start, MBEDTLS_ASN1_PRINTABLE_STRING));
 
-    return( (int) len );
+    return ((int) len);
 }
 
-int mbedtls_asn1_write_ia5_string( unsigned char **p, unsigned char *start,
-                           const char *text, size_t text_len )
+int mbedtls_asn1_write_ia5_string(unsigned char **p, unsigned char *start,
+                                  const char *text, size_t text_len)
 {
     int ret;
     size_t len = 0;
 
-    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_raw_buffer( p, start,
-                  (const unsigned char *) text, text_len ) );
+    MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_raw_buffer(p, start,
+                                                            (const unsigned char *) text, text_len));
 
-    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( p, start, len ) );
-    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( p, start, MBEDTLS_ASN1_IA5_STRING ) );
+    MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_len(p, start, len));
+    MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_tag(p, start, MBEDTLS_ASN1_IA5_STRING));
 
-    return( (int) len );
+    return ((int) len);
 }
 
-int mbedtls_asn1_write_bitstring( unsigned char **p, unsigned char *start,
-                          const unsigned char *buf, size_t bits )
+int mbedtls_asn1_write_bitstring(unsigned char **p, unsigned char *start,
+                                 const unsigned char *buf, size_t bits)
 {
     int ret;
     size_t len = 0, size;
 
-    size = ( bits / 8 ) + ( ( bits % 8 ) ? 1 : 0 );
+    size = (bits / 8) + ((bits % 8) ? 1 : 0);
 
     // Calculate byte length
     //
-    if( *p < start || (size_t)( *p - start ) < size + 1 )
-        return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
+    if (*p < start || (size_t)(*p - start) < size + 1)
+        return (MBEDTLS_ERR_ASN1_BUF_TOO_SMALL);
 
     len = size + 1;
     (*p) -= size;
-    memcpy( *p, buf, size );
+    memcpy(*p, buf, size);
 
     // Write unused bits
     //
-    *--(*p) = (unsigned char) (size * 8 - bits);
+    *--(*p) = (unsigned char)(size * 8 - bits);
 
-    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( p, start, len ) );
-    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( p, start, MBEDTLS_ASN1_BIT_STRING ) );
+    MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_len(p, start, len));
+    MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_tag(p, start, MBEDTLS_ASN1_BIT_STRING));
 
-    return( (int) len );
+    return ((int) len);
 }
 
-int mbedtls_asn1_write_octet_string( unsigned char **p, unsigned char *start,
-                             const unsigned char *buf, size_t size )
+int mbedtls_asn1_write_octet_string(unsigned char **p, unsigned char *start,
+                                    const unsigned char *buf, size_t size)
 {
     int ret;
     size_t len = 0;
 
-    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_raw_buffer( p, start, buf, size ) );
+    MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_raw_buffer(p, start, buf, size));
 
-    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( p, start, len ) );
-    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( p, start, MBEDTLS_ASN1_OCTET_STRING ) );
+    MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_len(p, start, len));
+    MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_tag(p, start, MBEDTLS_ASN1_OCTET_STRING));
 
-    return( (int) len );
+    return ((int) len);
 }
 
-mbedtls_asn1_named_data *mbedtls_asn1_store_named_data( mbedtls_asn1_named_data **head,
-                                        const char *oid, size_t oid_len,
-                                        const unsigned char *val,
-                                        size_t val_len )
+mbedtls_asn1_named_data *mbedtls_asn1_store_named_data(mbedtls_asn1_named_data **head,
+                                                       const char *oid, size_t oid_len,
+                                                       const unsigned char *val,
+                                                       size_t val_len)
 {
     mbedtls_asn1_named_data *cur;
 
-    if( ( cur = mbedtls_asn1_find_named_data( *head, oid, oid_len ) ) == NULL )
-    {
+    if ((cur = mbedtls_asn1_find_named_data(*head, oid, oid_len)) == NULL) {
         // Add new entry if not present yet based on OID
         //
-        cur = (mbedtls_asn1_named_data*)mbedtls_calloc( 1,
-                                            sizeof(mbedtls_asn1_named_data) );
-        if( cur == NULL )
-            return( NULL );
+        cur = (mbedtls_asn1_named_data *)mbedtls_calloc(1,
+                                                        sizeof(mbedtls_asn1_named_data));
+        if (cur == NULL)
+            return (NULL);
 
         cur->oid.len = oid_len;
-        cur->oid.p = mbedtls_calloc( 1, oid_len );
-        if( cur->oid.p == NULL )
-        {
-            mbedtls_free( cur );
-            return( NULL );
+        cur->oid.p = mbedtls_calloc(1, oid_len);
+        if (cur->oid.p == NULL) {
+            mbedtls_free(cur);
+            return (NULL);
         }
 
-        memcpy( cur->oid.p, oid, oid_len );
+        memcpy(cur->oid.p, oid, oid_len);
 
         cur->val.len = val_len;
-        cur->val.p = mbedtls_calloc( 1, val_len );
-        if( cur->val.p == NULL )
-        {
-            mbedtls_free( cur->oid.p );
-            mbedtls_free( cur );
-            return( NULL );
+        cur->val.p = mbedtls_calloc(1, val_len);
+        if (cur->val.p == NULL) {
+            mbedtls_free(cur->oid.p);
+            mbedtls_free(cur);
+            return (NULL);
         }
 
         cur->next = *head;
         *head = cur;
-    }
-    else if( cur->val.len < val_len )
-    {
+    } else if (cur->val.len < val_len) {
         /*
          * Enlarge existing value buffer if needed
          * Preserve old data until the allocation succeeded, to leave list in
          * a consistent state in case allocation fails.
          */
-        void *p = mbedtls_calloc( 1, val_len );
-        if( p == NULL )
-            return( NULL );
+        void *p = mbedtls_calloc(1, val_len);
+        if (p == NULL)
+            return (NULL);
 
-        mbedtls_free( cur->val.p );
+        mbedtls_free(cur->val.p);
         cur->val.p = p;
         cur->val.len = val_len;
     }
 
-    if( val != NULL )
-        memcpy( cur->val.p, val, val_len );
+    if (val != NULL)
+        memcpy(cur->val.p, val, val_len);
 
-    return( cur );
+    return (cur);
 }
 #endif /* MBEDTLS_ASN1_WRITE_C */
diff --git a/common/mbedtls/asn1write.h b/common/mbedtls/asn1write.h
index 0b832e5c2..59c6d2f72 100644
--- a/common/mbedtls/asn1write.h
+++ b/common/mbedtls/asn1write.h
@@ -29,7 +29,7 @@
 #include "asn1.h"
 
 #define MBEDTLS_ASN1_CHK_ADD(g, f) do { if( ( ret = f ) < 0 ) return( ret ); else   \
-                                g += ret; } while( 0 )
+            g += ret; } while( 0 )
 
 #ifdef __cplusplus
 extern "C" {
@@ -45,7 +45,7 @@ extern "C" {
  *
  * \return          the length written or a negative error code
  */
-int mbedtls_asn1_write_len( unsigned char **p, unsigned char *start, size_t len );
+int mbedtls_asn1_write_len(unsigned char **p, unsigned char *start, size_t len);
 
 /**
  * \brief           Write a ASN.1 tag in ASN.1 format
@@ -57,8 +57,8 @@ int mbedtls_asn1_write_len( unsigned char **p, unsigned char *start, size_t len
  *
  * \return          the length written or a negative error code
  */
-int mbedtls_asn1_write_tag( unsigned char **p, unsigned char *start,
-                    unsigned char tag );
+int mbedtls_asn1_write_tag(unsigned char **p, unsigned char *start,
+                           unsigned char tag);
 
 /**
  * \brief           Write raw buffer data
@@ -71,8 +71,8 @@ int mbedtls_asn1_write_tag( unsigned char **p, unsigned char *start,
  *
  * \return          the length written or a negative error code
  */
-int mbedtls_asn1_write_raw_buffer( unsigned char **p, unsigned char *start,
-                           const unsigned char *buf, size_t size );
+int mbedtls_asn1_write_raw_buffer(unsigned char **p, unsigned char *start,
+                                  const unsigned char *buf, size_t size);
 
 #if defined(MBEDTLS_BIGNUM_C)
 /**
@@ -85,7 +85,7 @@ int mbedtls_asn1_write_raw_buffer( unsigned char **p, unsigned char *start,
  *
  * \return          the length written or a negative error code
  */
-int mbedtls_asn1_write_mpi( unsigned char **p, unsigned char *start, const mbedtls_mpi *X );
+int mbedtls_asn1_write_mpi(unsigned char **p, unsigned char *start, const mbedtls_mpi *X);
 #endif /* MBEDTLS_BIGNUM_C */
 
 /**
@@ -97,7 +97,7 @@ int mbedtls_asn1_write_mpi( unsigned char **p, unsigned char *start, const mbedt
  *
  * \return          the length written or a negative error code
  */
-int mbedtls_asn1_write_null( unsigned char **p, unsigned char *start );
+int mbedtls_asn1_write_null(unsigned char **p, unsigned char *start);
 
 /**
  * \brief           Write an OID tag (MBEDTLS_ASN1_OID) and data in ASN.1 format
@@ -110,8 +110,8 @@ int mbedtls_asn1_write_null( unsigned char **p, unsigned char *start );
  *
  * \return          the length written or a negative error code
  */
-int mbedtls_asn1_write_oid( unsigned char **p, unsigned char *start,
-                    const char *oid, size_t oid_len );
+int mbedtls_asn1_write_oid(unsigned char **p, unsigned char *start,
+                           const char *oid, size_t oid_len);
 
 /**
  * \brief           Write an AlgorithmIdentifier sequence in ASN.1 format
@@ -126,9 +126,9 @@ int mbedtls_asn1_write_oid( unsigned char **p, unsigned char *start,
  *
  * \return          the length written or a negative error code
  */
-int mbedtls_asn1_write_algorithm_identifier( unsigned char **p, unsigned char *start,
-                                     const char *oid, size_t oid_len,
-                                     size_t par_len );
+int mbedtls_asn1_write_algorithm_identifier(unsigned char **p, unsigned char *start,
+                                            const char *oid, size_t oid_len,
+                                            size_t par_len);
 
 /**
  * \brief           Write a boolean tag (MBEDTLS_ASN1_BOOLEAN) and value in ASN.1 format
@@ -140,7 +140,7 @@ int mbedtls_asn1_write_algorithm_identifier( unsigned char **p, unsigned char *s
  *
  * \return          the length written or a negative error code
  */
-int mbedtls_asn1_write_bool( unsigned char **p, unsigned char *start, int boolean );
+int mbedtls_asn1_write_bool(unsigned char **p, unsigned char *start, int boolean);
 
 /**
  * \brief           Write an int tag (MBEDTLS_ASN1_INTEGER) and value in ASN.1 format
@@ -152,7 +152,7 @@ int mbedtls_asn1_write_bool( unsigned char **p, unsigned char *start, int boolea
  *
  * \return          the length written or a negative error code
  */
-int mbedtls_asn1_write_int( unsigned char **p, unsigned char *start, int val );
+int mbedtls_asn1_write_int(unsigned char **p, unsigned char *start, int val);
 
 /**
  * \brief           Write a printable string tag (MBEDTLS_ASN1_PRINTABLE_STRING) and
@@ -166,8 +166,8 @@ int mbedtls_asn1_write_int( unsigned char **p, unsigned char *start, int val );
  *
  * \return          the length written or a negative error code
  */
-int mbedtls_asn1_write_printable_string( unsigned char **p, unsigned char *start,
-                                 const char *text, size_t text_len );
+int mbedtls_asn1_write_printable_string(unsigned char **p, unsigned char *start,
+                                        const char *text, size_t text_len);
 
 /**
  * \brief           Write an IA5 string tag (MBEDTLS_ASN1_IA5_STRING) and
@@ -181,8 +181,8 @@ int mbedtls_asn1_write_printable_string( unsigned char **p, unsigned char *start
  *
  * \return          the length written or a negative error code
  */
-int mbedtls_asn1_write_ia5_string( unsigned char **p, unsigned char *start,
-                           const char *text, size_t text_len );
+int mbedtls_asn1_write_ia5_string(unsigned char **p, unsigned char *start,
+                                  const char *text, size_t text_len);
 
 /**
  * \brief           Write a bitstring tag (MBEDTLS_ASN1_BIT_STRING) and
@@ -196,8 +196,8 @@ int mbedtls_asn1_write_ia5_string( unsigned char **p, unsigned char *start,
  *
  * \return          the length written or a negative error code
  */
-int mbedtls_asn1_write_bitstring( unsigned char **p, unsigned char *start,
-                          const unsigned char *buf, size_t bits );
+int mbedtls_asn1_write_bitstring(unsigned char **p, unsigned char *start,
+                                 const unsigned char *buf, size_t bits);
 
 /**
  * \brief           Write an octet string tag (MBEDTLS_ASN1_OCTET_STRING) and
@@ -211,8 +211,8 @@ int mbedtls_asn1_write_bitstring( unsigned char **p, unsigned char *start,
  *
  * \return          the length written or a negative error code
  */
-int mbedtls_asn1_write_octet_string( unsigned char **p, unsigned char *start,
-                             const unsigned char *buf, size_t size );
+int mbedtls_asn1_write_octet_string(unsigned char **p, unsigned char *start,
+                                    const unsigned char *buf, size_t size);
 
 /**
  * \brief           Create or find a specific named_data entry for writing in a
@@ -230,10 +230,10 @@ int mbedtls_asn1_write_octet_string( unsigned char **p, unsigned char *start,
  * \return      NULL if if there was a memory allocation error, or a pointer
  *              to the new / existing entry.
  */
-mbedtls_asn1_named_data *mbedtls_asn1_store_named_data( mbedtls_asn1_named_data **list,
-                                        const char *oid, size_t oid_len,
-                                        const unsigned char *val,
-                                        size_t val_len );
+mbedtls_asn1_named_data *mbedtls_asn1_store_named_data(mbedtls_asn1_named_data **list,
+                                                       const char *oid, size_t oid_len,
+                                                       const unsigned char *val,
+                                                       size_t val_len);
 
 #ifdef __cplusplus
 }
diff --git a/common/mbedtls/base64.c b/common/mbedtls/base64.c
index 412000217..f96848942 100644
--- a/common/mbedtls/base64.c
+++ b/common/mbedtls/base64.c
@@ -43,8 +43,7 @@
 #endif /* MBEDTLS_PLATFORM_C */
 #endif /* MBEDTLS_SELF_TEST */
 
-static const unsigned char base64_enc_map[64] =
-{
+static const unsigned char base64_enc_map[64] = {
     'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',
     'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T',
     'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd',
@@ -54,21 +53,20 @@ static const unsigned char base64_enc_map[64] =
     '8', '9', '+', '/'
 };
 
-static const unsigned char base64_dec_map[128] =
-{
+static const unsigned char base64_dec_map[128] = {
     127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
     127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
     127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
     127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
     127, 127, 127,  62, 127, 127, 127,  63,  52,  53,
-     54,  55,  56,  57,  58,  59,  60,  61, 127, 127,
+    54,  55,  56,  57,  58,  59,  60,  61, 127, 127,
     127,  64, 127, 127, 127,   0,   1,   2,   3,   4,
-      5,   6,   7,   8,   9,  10,  11,  12,  13,  14,
-     15,  16,  17,  18,  19,  20,  21,  22,  23,  24,
-     25, 127, 127, 127, 127, 127, 127,  26,  27,  28,
-     29,  30,  31,  32,  33,  34,  35,  36,  37,  38,
-     39,  40,  41,  42,  43,  44,  45,  46,  47,  48,
-     49,  50,  51, 127, 127, 127, 127, 127
+    5,   6,   7,   8,   9,  10,  11,  12,  13,  14,
+    15,  16,  17,  18,  19,  20,  21,  22,  23,  24,
+    25, 127, 127, 127, 127, 127, 127,  26,  27,  28,
+    29,  30,  31,  32,  33,  34,  35,  36,  37,  38,
+    39,  40,  41,  42,  43,  44,  45,  46,  47,  48,
+    49,  50,  51, 127, 127, 127, 127, 127
 };
 
 #define BASE64_SIZE_T_MAX   ( (size_t) -1 ) /* SIZE_T_MAX is not standard */
@@ -76,39 +74,35 @@ static const unsigned char base64_dec_map[128] =
 /*
  * Encode a buffer into base64 format
  */
-int mbedtls_base64_encode( unsigned char *dst, size_t dlen, size_t *olen,
-                   const unsigned char *src, size_t slen )
+int mbedtls_base64_encode(unsigned char *dst, size_t dlen, size_t *olen,
+                          const unsigned char *src, size_t slen)
 {
     size_t i, n;
     int C1, C2, C3;
     unsigned char *p;
 
-    if( slen == 0 )
-    {
+    if (slen == 0) {
         *olen = 0;
-        return( 0 );
+        return (0);
     }
 
-    n = slen / 3 + ( slen % 3 != 0 );
+    n = slen / 3 + (slen % 3 != 0);
 
-    if( n > ( BASE64_SIZE_T_MAX - 1 ) / 4 )
-    {
+    if (n > (BASE64_SIZE_T_MAX - 1) / 4) {
         *olen = BASE64_SIZE_T_MAX;
-        return( MBEDTLS_ERR_BASE64_BUFFER_TOO_SMALL );
+        return (MBEDTLS_ERR_BASE64_BUFFER_TOO_SMALL);
     }
 
     n *= 4;
 
-    if( ( dlen < n + 1 ) || ( NULL == dst ) )
-    {
+    if ((dlen < n + 1) || (NULL == dst)) {
         *olen = n + 1;
-        return( MBEDTLS_ERR_BASE64_BUFFER_TOO_SMALL );
+        return (MBEDTLS_ERR_BASE64_BUFFER_TOO_SMALL);
     }
 
-    n = ( slen / 3 ) * 3;
+    n = (slen / 3) * 3;
 
-    for( i = 0, p = dst; i < n; i += 3 )
-    {
+    for (i = 0, p = dst; i < n; i += 3) {
         C1 = *src++;
         C2 = *src++;
         C3 = *src++;
@@ -119,16 +113,15 @@ int mbedtls_base64_encode( unsigned char *dst, size_t dlen, size_t *olen,
         *p++ = base64_enc_map[C3 & 0x3F];
     }
 
-    if( i < slen )
-    {
+    if (i < slen) {
         C1 = *src++;
-        C2 = ( ( i + 1 ) < slen ) ? *src++ : 0;
+        C2 = ((i + 1) < slen) ? *src++ : 0;
 
         *p++ = base64_enc_map[(C1 >> 2) & 0x3F];
         *p++ = base64_enc_map[(((C1 & 3) << 4) + (C2 >> 4)) & 0x3F];
 
-        if( ( i + 1 ) < slen )
-             *p++ = base64_enc_map[((C2 & 15) << 2) & 0x3F];
+        if ((i + 1) < slen)
+            *p++ = base64_enc_map[((C2 & 15) << 2) & 0x3F];
         else *p++ = '=';
 
         *p++ = '=';
@@ -137,102 +130,95 @@ int mbedtls_base64_encode( unsigned char *dst, size_t dlen, size_t *olen,
     *olen = p - dst;
     *p = 0;
 
-    return( 0 );
+    return (0);
 }
 
 /*
  * Decode a base64-formatted buffer
  */
-int mbedtls_base64_decode( unsigned char *dst, size_t dlen, size_t *olen,
-                   const unsigned char *src, size_t slen )
+int mbedtls_base64_decode(unsigned char *dst, size_t dlen, size_t *olen,
+                          const unsigned char *src, size_t slen)
 {
     size_t i, n;
     uint32_t j, x;
     unsigned char *p;
 
     /* First pass: check for validity and get output length */
-    for( i = n = j = 0; i < slen; i++ )
-    {
+    for (i = n = j = 0; i < slen; i++) {
         /* Skip spaces before checking for EOL */
         x = 0;
-        while( i < slen && src[i] == ' ' )
-        {
+        while (i < slen && src[i] == ' ') {
             ++i;
             ++x;
         }
 
         /* Spaces at end of buffer are OK */
-        if( i == slen )
+        if (i == slen)
             break;
 
-        if( ( slen - i ) >= 2 &&
-            src[i] == '\r' && src[i + 1] == '\n' )
+        if ((slen - i) >= 2 &&
+            src[i] == '\r' && src[i + 1] == '\n')
             continue;
 
-        if( src[i] == '\n' )
+        if (src[i] == '\n')
             continue;
 
         /* Space inside a line is an error */
-        if( x != 0 )
-            return( MBEDTLS_ERR_BASE64_INVALID_CHARACTER );
+        if (x != 0)
+            return (MBEDTLS_ERR_BASE64_INVALID_CHARACTER);
 
-        if( src[i] == '=' && ++j > 2 )
-            return( MBEDTLS_ERR_BASE64_INVALID_CHARACTER );
+        if (src[i] == '=' && ++j > 2)
+            return (MBEDTLS_ERR_BASE64_INVALID_CHARACTER);
 
-        if( src[i] > 127 || base64_dec_map[src[i]] == 127 )
-            return( MBEDTLS_ERR_BASE64_INVALID_CHARACTER );
+        if (src[i] > 127 || base64_dec_map[src[i]] == 127)
+            return (MBEDTLS_ERR_BASE64_INVALID_CHARACTER);
 
-        if( base64_dec_map[src[i]] < 64 && j != 0 )
-            return( MBEDTLS_ERR_BASE64_INVALID_CHARACTER );
+        if (base64_dec_map[src[i]] < 64 && j != 0)
+            return (MBEDTLS_ERR_BASE64_INVALID_CHARACTER);
 
         n++;
     }
 
-    if( n == 0 )
-    {
+    if (n == 0) {
         *olen = 0;
-        return( 0 );
+        return (0);
     }
 
     /* The following expression is to calculate the following formula without
      * risk of integer overflow in n:
      *     n = ( ( n * 6 ) + 7 ) >> 3;
      */
-    n = ( 6 * ( n >> 3 ) ) + ( ( 6 * ( n & 0x7 ) + 7 ) >> 3 );
+    n = (6 * (n >> 3)) + ((6 * (n & 0x7) + 7) >> 3);
     n -= j;
 
-    if( dst == NULL || dlen < n )
-    {
+    if (dst == NULL || dlen < n) {
         *olen = n;
-        return( MBEDTLS_ERR_BASE64_BUFFER_TOO_SMALL );
+        return (MBEDTLS_ERR_BASE64_BUFFER_TOO_SMALL);
     }
 
-   for( j = 3, n = x = 0, p = dst; i > 0; i--, src++ )
-   {
-        if( *src == '\r' || *src == '\n' || *src == ' ' )
+    for (j = 3, n = x = 0, p = dst; i > 0; i--, src++) {
+        if (*src == '\r' || *src == '\n' || *src == ' ')
             continue;
 
-        j -= ( base64_dec_map[*src] == 64 );
-        x  = ( x << 6 ) | ( base64_dec_map[*src] & 0x3F );
+        j -= (base64_dec_map[*src] == 64);
+        x  = (x << 6) | (base64_dec_map[*src] & 0x3F);
 
-        if( ++n == 4 )
-        {
+        if (++n == 4) {
             n = 0;
-            if( j > 0 ) *p++ = (unsigned char)( x >> 16 );
-            if( j > 1 ) *p++ = (unsigned char)( x >>  8 );
-            if( j > 2 ) *p++ = (unsigned char)( x       );
+            if (j > 0) *p++ = (unsigned char)(x >> 16);
+            if (j > 1) *p++ = (unsigned char)(x >>  8);
+            if (j > 2) *p++ = (unsigned char)(x);
         }
     }
 
     *olen = p - dst;
 
-    return( 0 );
+    return (0);
 }
 
 #if defined(MBEDTLS_SELF_TEST)
 
-static const unsigned char base64_test_dec[64] =
-{
+static const unsigned char base64_test_dec[64] = {
     0x24, 0x48, 0x6E, 0x56, 0x87, 0x62, 0x5A, 0xBD,
     0xBF, 0x17, 0xD9, 0xA2, 0xC4, 0x17, 0x1A, 0x01,
     0x94, 0xED, 0x8F, 0x1E, 0x11, 0xB3, 0xD7, 0x09,
@@ -250,44 +236,42 @@ static const unsigned char base64_test_enc[] =
 /*
  * Checkup routine
  */
-int mbedtls_base64_self_test( int verbose )
+int mbedtls_base64_self_test(int verbose)
 {
     size_t len;
     const unsigned char *src;
     unsigned char buffer[128];
 
-    if( verbose != 0 )
-        mbedtls_printf( "  Base64 encoding test: " );
+    if (verbose != 0)
+        mbedtls_printf("  Base64 encoding test: ");
 
     src = base64_test_dec;
 
-    if( mbedtls_base64_encode( buffer, sizeof( buffer ), &len, src, 64 ) != 0 ||
-         memcmp( base64_test_enc, buffer, 88 ) != 0 )
-    {
-        if( verbose != 0 )
-            mbedtls_printf( "failed\n" );
+    if (mbedtls_base64_encode(buffer, sizeof(buffer), &len, src, 64) != 0 ||
+        memcmp(base64_test_enc, buffer, 88) != 0) {
+        if (verbose != 0)
+            mbedtls_printf("failed\n");
 
-        return( 1 );
+        return (1);
     }
 
-    if( verbose != 0 )
-        mbedtls_printf( "passed\n  Base64 decoding test: " );
+    if (verbose != 0)
+        mbedtls_printf("passed\n  Base64 decoding test: ");
 
     src = base64_test_enc;
 
-    if( mbedtls_base64_decode( buffer, sizeof( buffer ), &len, src, 88 ) != 0 ||
-         memcmp( base64_test_dec, buffer, 64 ) != 0 )
-    {
-        if( verbose != 0 )
-            mbedtls_printf( "failed\n" );
+    if (mbedtls_base64_decode(buffer, sizeof(buffer), &len, src, 88) != 0 ||
+        memcmp(base64_test_dec, buffer, 64) != 0) {
+        if (verbose != 0)
+            mbedtls_printf("failed\n");
 
-        return( 1 );
+        return (1);
     }
 
-    if( verbose != 0 )
-        mbedtls_printf( "passed\n\n" );
+    if (verbose != 0)
+        mbedtls_printf("passed\n\n");
 
-    return( 0 );
+    return (0);
 }
 
 #endif /* MBEDTLS_SELF_TEST */
diff --git a/common/mbedtls/base64.h b/common/mbedtls/base64.h
index ce5563e1d..02ca18a91 100644
--- a/common/mbedtls/base64.h
+++ b/common/mbedtls/base64.h
@@ -54,8 +54,8 @@ extern "C" {
  * \note           Call this function with dlen = 0 to obtain the
  *                 required buffer size in *olen
  */
-int mbedtls_base64_encode( unsigned char *dst, size_t dlen, size_t *olen,
-                   const unsigned char *src, size_t slen );
+int mbedtls_base64_encode(unsigned char *dst, size_t dlen, size_t *olen,
+                          const unsigned char *src, size_t slen);
 
 /**
  * \brief          Decode a base64-formatted buffer
@@ -74,15 +74,15 @@ int mbedtls_base64_encode( unsigned char *dst, size_t dlen, size_t *olen,
  * \note           Call this function with *dst = NULL or dlen = 0 to obtain
  *                 the required buffer size in *olen
  */
-int mbedtls_base64_decode( unsigned char *dst, size_t dlen, size_t *olen,
-                   const unsigned char *src, size_t slen );
+int mbedtls_base64_decode(unsigned char *dst, size_t dlen, size_t *olen,
+                          const unsigned char *src, size_t slen);
 
 /**
  * \brief          Checkup routine
  *
  * \return         0 if successful, or 1 if the test failed
  */
-int mbedtls_base64_self_test( int verbose );
+int mbedtls_base64_self_test(int verbose);
 
 #ifdef __cplusplus
 }
diff --git a/common/mbedtls/bignum.c b/common/mbedtls/bignum.c
index 2c9ecbe26..47fb06518 100644
--- a/common/mbedtls/bignum.c
+++ b/common/mbedtls/bignum.c
@@ -75,17 +75,17 @@
 #define CHARS_TO_LIMBS(i) ( (i) / ciL + ( (i) % ciL != 0 ) )
 
 /* Implementation that should never be optimized out by the compiler */
-static void mbedtls_mpi_zeroize( mbedtls_mpi_uint *v, size_t n )
+static void mbedtls_mpi_zeroize(mbedtls_mpi_uint *v, size_t n)
 {
-    mbedtls_platform_zeroize( v, ciL * n );
+    mbedtls_platform_zeroize(v, ciL * n);
 }
 
 /*
  * Initialize one MPI
  */
-void mbedtls_mpi_init( mbedtls_mpi *X )
+void mbedtls_mpi_init(mbedtls_mpi *X)
 {
-    if( X == NULL )
+    if (X == NULL)
         return;
 
     X->s = 1;
@@ -96,15 +96,14 @@ void mbedtls_mpi_init( mbedtls_mpi *X )
 /*
  * Unallocate one MPI
  */
-void mbedtls_mpi_free( mbedtls_mpi *X )
+void mbedtls_mpi_free(mbedtls_mpi *X)
 {
-    if( X == NULL )
+    if (X == NULL)
         return;
 
-    if( X->p != NULL )
-    {
-        mbedtls_mpi_zeroize( X->p, X->n );
-        mbedtls_free( X->p );
+    if (X->p != NULL) {
+        mbedtls_mpi_zeroize(X->p, X->n);
+        mbedtls_free(X->p);
     }
 
     X->s = 1;
@@ -115,119 +114,112 @@ void mbedtls_mpi_free( mbedtls_mpi *X )
 /*
  * Enlarge to the specified number of limbs
  */
-int mbedtls_mpi_grow( mbedtls_mpi *X, size_t nblimbs )
+int mbedtls_mpi_grow(mbedtls_mpi *X, size_t nblimbs)
 {
     mbedtls_mpi_uint *p;
 
-    if( nblimbs > MBEDTLS_MPI_MAX_LIMBS )
-        return( MBEDTLS_ERR_MPI_ALLOC_FAILED );
+    if (nblimbs > MBEDTLS_MPI_MAX_LIMBS)
+        return (MBEDTLS_ERR_MPI_ALLOC_FAILED);
 
-    if( X->n < nblimbs )
-    {
-        if( ( p = (mbedtls_mpi_uint*)mbedtls_calloc( nblimbs, ciL ) ) == NULL )
-            return( MBEDTLS_ERR_MPI_ALLOC_FAILED );
+    if (X->n < nblimbs) {
+        if ((p = (mbedtls_mpi_uint *)mbedtls_calloc(nblimbs, ciL)) == NULL)
+            return (MBEDTLS_ERR_MPI_ALLOC_FAILED);
 
-        if( X->p != NULL )
-        {
-            memcpy( p, X->p, X->n * ciL );
-            mbedtls_mpi_zeroize( X->p, X->n );
-            mbedtls_free( X->p );
+        if (X->p != NULL) {
+            memcpy(p, X->p, X->n * ciL);
+            mbedtls_mpi_zeroize(X->p, X->n);
+            mbedtls_free(X->p);
         }
 
         X->n = nblimbs;
         X->p = p;
     }
 
-    return( 0 );
+    return (0);
 }
 
 /*
  * Resize down as much as possible,
  * while keeping at least the specified number of limbs
  */
-int mbedtls_mpi_shrink( mbedtls_mpi *X, size_t nblimbs )
+int mbedtls_mpi_shrink(mbedtls_mpi *X, size_t nblimbs)
 {
     mbedtls_mpi_uint *p;
     size_t i;
 
     /* Actually resize up in this case */
-    if( X->n <= nblimbs )
-        return( mbedtls_mpi_grow( X, nblimbs ) );
+    if (X->n <= nblimbs)
+        return (mbedtls_mpi_grow(X, nblimbs));
 
-    for( i = X->n - 1; i > 0; i-- )
-        if( X->p[i] != 0 )
+    for (i = X->n - 1; i > 0; i--)
+        if (X->p[i] != 0)
             break;
     i++;
 
-    if( i < nblimbs )
+    if (i < nblimbs)
         i = nblimbs;
 
-    if( ( p = (mbedtls_mpi_uint*)mbedtls_calloc( i, ciL ) ) == NULL )
-        return( MBEDTLS_ERR_MPI_ALLOC_FAILED );
+    if ((p = (mbedtls_mpi_uint *)mbedtls_calloc(i, ciL)) == NULL)
+        return (MBEDTLS_ERR_MPI_ALLOC_FAILED);
 
-    if( X->p != NULL )
-    {
-        memcpy( p, X->p, i * ciL );
-        mbedtls_mpi_zeroize( X->p, X->n );
-        mbedtls_free( X->p );
+    if (X->p != NULL) {
+        memcpy(p, X->p, i * ciL);
+        mbedtls_mpi_zeroize(X->p, X->n);
+        mbedtls_free(X->p);
     }
 
     X->n = i;
     X->p = p;
 
-    return( 0 );
+    return (0);
 }
 
 /*
  * Copy the contents of Y into X
  */
-int mbedtls_mpi_copy( mbedtls_mpi *X, const mbedtls_mpi *Y )
+int mbedtls_mpi_copy(mbedtls_mpi *X, const mbedtls_mpi *Y)
 {
     int ret = 0;
     size_t i;
 
-    if( X == Y )
-        return( 0 );
+    if (X == Y)
+        return (0);
 
-    if( Y->p == NULL )
-    {
-        mbedtls_mpi_free( X );
-        return( 0 );
+    if (Y->p == NULL) {
+        mbedtls_mpi_free(X);
+        return (0);
     }
 
-    for( i = Y->n - 1; i > 0; i-- )
-        if( Y->p[i] != 0 )
+    for (i = Y->n - 1; i > 0; i--)
+        if (Y->p[i] != 0)
             break;
     i++;
 
     X->s = Y->s;
 
-    if( X->n < i )
-    {
-        MBEDTLS_MPI_CHK( mbedtls_mpi_grow( X, i ) );
-    }
-    else
-    {
-        memset( X->p + i, 0, ( X->n - i ) * ciL );
+    if (X->n < i) {
+        MBEDTLS_MPI_CHK(mbedtls_mpi_grow(X, i));
+    } else {
+        memset(X->p + i, 0, (X->n - i) * ciL);
     }
 
-    memcpy( X->p, Y->p, i * ciL );
+    memcpy(X->p, Y->p, i * ciL);
 
 cleanup:
 
-    return( ret );
+    return (ret);
 }
 
 /*
  * Swap the contents of X and Y
  */
-void mbedtls_mpi_swap( mbedtls_mpi *X, mbedtls_mpi *Y )
+void mbedtls_mpi_swap(mbedtls_mpi *X, mbedtls_mpi *Y)
 {
     mbedtls_mpi T;
 
-    memcpy( &T,  X, sizeof( mbedtls_mpi ) );
-    memcpy(  X,  Y, sizeof( mbedtls_mpi ) );
-    memcpy(  Y, &T, sizeof( mbedtls_mpi ) );
+    memcpy(&T,  X, sizeof(mbedtls_mpi));
+    memcpy(X,  Y, sizeof(mbedtls_mpi));
+    memcpy(Y, &T, sizeof(mbedtls_mpi));
 }
 
 /*
@@ -235,26 +227,26 @@ void mbedtls_mpi_swap( mbedtls_mpi *X, mbedtls_mpi *Y )
  * about whether the assignment was made or not.
  * (Leaking information about the respective sizes of X and Y is ok however.)
  */
-int mbedtls_mpi_safe_cond_assign( mbedtls_mpi *X, const mbedtls_mpi *Y, unsigned char assign )
+int mbedtls_mpi_safe_cond_assign(mbedtls_mpi *X, const mbedtls_mpi *Y, unsigned char assign)
 {
     int ret = 0;
     size_t i;
 
     /* make sure assign is 0 or 1 in a time-constant manner */
-    assign = (assign | (unsigned char)-assign) >> 7;
+    assign = (assign | (unsigned char) - assign) >> 7;
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_grow( X, Y->n ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_grow(X, Y->n));
 
-    X->s = X->s * ( 1 - assign ) + Y->s * assign;
+    X->s = X->s * (1 - assign) + Y->s * assign;
 
-    for( i = 0; i < Y->n; i++ )
-        X->p[i] = X->p[i] * ( 1 - assign ) + Y->p[i] * assign;
+    for (i = 0; i < Y->n; i++)
+        X->p[i] = X->p[i] * (1 - assign) + Y->p[i] * assign;
 
-    for( ; i < X->n; i++ )
-        X->p[i] *= ( 1 - assign );
+    for (; i < X->n; i++)
+        X->p[i] *= (1 - assign);
 
 cleanup:
-    return( ret );
+    return (ret);
 }
 
 /*
@@ -263,120 +255,117 @@ cleanup:
  * Here it is not ok to simply swap the pointers, which whould lead to
  * different memory access patterns when X and Y are used afterwards.
  */
-int mbedtls_mpi_safe_cond_swap( mbedtls_mpi *X, mbedtls_mpi *Y, unsigned char swap )
+int mbedtls_mpi_safe_cond_swap(mbedtls_mpi *X, mbedtls_mpi *Y, unsigned char swap)
 {
     int ret, s;
     size_t i;
     mbedtls_mpi_uint tmp;
 
-    if( X == Y )
-        return( 0 );
+    if (X == Y)
+        return (0);
 
     /* make sure swap is 0 or 1 in a time-constant manner */
-    swap = (swap | (unsigned char)-swap) >> 7;
+    swap = (swap | (unsigned char) - swap) >> 7;
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_grow( X, Y->n ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_grow( Y, X->n ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_grow(X, Y->n));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_grow(Y, X->n));
 
     s = X->s;
-    X->s = X->s * ( 1 - swap ) + Y->s * swap;
-    Y->s = Y->s * ( 1 - swap ) +    s * swap;
+    X->s = X->s * (1 - swap) + Y->s * swap;
+    Y->s = Y->s * (1 - swap) +    s * swap;
 
 
-    for( i = 0; i < X->n; i++ )
-    {
+    for (i = 0; i < X->n; i++) {
         tmp = X->p[i];
-        X->p[i] = X->p[i] * ( 1 - swap ) + Y->p[i] * swap;
-        Y->p[i] = Y->p[i] * ( 1 - swap ) +     tmp * swap;
+        X->p[i] = X->p[i] * (1 - swap) + Y->p[i] * swap;
+        Y->p[i] = Y->p[i] * (1 - swap) +     tmp * swap;
     }
 
 cleanup:
-    return( ret );
+    return (ret);
 }
 
 /*
  * Set value from integer
  */
-int mbedtls_mpi_lset( mbedtls_mpi *X, mbedtls_mpi_sint z )
+int mbedtls_mpi_lset(mbedtls_mpi *X, mbedtls_mpi_sint z)
 {
     int ret;
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_grow( X, 1 ) );
-    memset( X->p, 0, X->n * ciL );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_grow(X, 1));
+    memset(X->p, 0, X->n * ciL);
 
-    X->p[0] = ( z < 0 ) ? -z : z;
-    X->s    = ( z < 0 ) ? -1 : 1;
+    X->p[0] = (z < 0) ? -z : z;
+    X->s    = (z < 0) ? -1 : 1;
 
 cleanup:
 
-    return( ret );
+    return (ret);
 }
 
 /*
  * Get a specific bit
  */
-int mbedtls_mpi_get_bit( const mbedtls_mpi *X, size_t pos )
+int mbedtls_mpi_get_bit(const mbedtls_mpi *X, size_t pos)
 {
-    if( X->n * biL <= pos )
-        return( 0 );
+    if (X->n * biL <= pos)
+        return (0);
 
-    return( ( X->p[pos / biL] >> ( pos % biL ) ) & 0x01 );
+    return ((X->p[pos / biL] >> (pos % biL)) & 0x01);
 }
 
 /*
  * Set a bit to a specific value of 0 or 1
  */
-int mbedtls_mpi_set_bit( mbedtls_mpi *X, size_t pos, unsigned char val )
+int mbedtls_mpi_set_bit(mbedtls_mpi *X, size_t pos, unsigned char val)
 {
     int ret = 0;
     size_t off = pos / biL;
     size_t idx = pos % biL;
 
-    if( val != 0 && val != 1 )
-        return( MBEDTLS_ERR_MPI_BAD_INPUT_DATA );
+    if (val != 0 && val != 1)
+        return (MBEDTLS_ERR_MPI_BAD_INPUT_DATA);
 
-    if( X->n * biL <= pos )
-    {
-        if( val == 0 )
-            return( 0 );
+    if (X->n * biL <= pos) {
+        if (val == 0)
+            return (0);
 
-        MBEDTLS_MPI_CHK( mbedtls_mpi_grow( X, off + 1 ) );
+        MBEDTLS_MPI_CHK(mbedtls_mpi_grow(X, off + 1));
     }
 
-    X->p[off] &= ~( (mbedtls_mpi_uint) 0x01 << idx );
+    X->p[off] &= ~((mbedtls_mpi_uint) 0x01 << idx);
     X->p[off] |= (mbedtls_mpi_uint) val << idx;
 
 cleanup:
 
-    return( ret );
+    return (ret);
 }
 
 /*
  * Return the number of less significant zero-bits
  */
-size_t mbedtls_mpi_lsb( const mbedtls_mpi *X )
+size_t mbedtls_mpi_lsb(const mbedtls_mpi *X)
 {
     size_t i, j, count = 0;
 
-    for( i = 0; i < X->n; i++ )
-        for( j = 0; j < biL; j++, count++ )
-            if( ( ( X->p[i] >> j ) & 1 ) != 0 )
-                return( count );
+    for (i = 0; i < X->n; i++)
+        for (j = 0; j < biL; j++, count++)
+            if (((X->p[i] >> j) & 1) != 0)
+                return (count);
 
-    return( 0 );
+    return (0);
 }
 
 /*
  * Count leading zero bits in a given integer
  */
-static size_t mbedtls_clz( const mbedtls_mpi_uint x )
+static size_t mbedtls_clz(const mbedtls_mpi_uint x)
 {
     size_t j;
     mbedtls_mpi_uint mask = (mbedtls_mpi_uint) 1 << (biL - 1);
 
-    for( j = 0; j < biL; j++ )
-    {
-        if( x & mask ) break;
+    for (j = 0; j < biL; j++) {
+        if (x & mask) break;
 
         mask >>= 1;
     }
@@ -387,194 +376,180 @@ static size_t mbedtls_clz( const mbedtls_mpi_uint x )
 /*
  * Return the number of bits
  */
-size_t mbedtls_mpi_bitlen( const mbedtls_mpi *X )
+size_t mbedtls_mpi_bitlen(const mbedtls_mpi *X)
 {
     size_t i, j;
 
-    if( X->n == 0 )
-        return( 0 );
+    if (X->n == 0)
+        return (0);
 
-    for( i = X->n - 1; i > 0; i-- )
-        if( X->p[i] != 0 )
+    for (i = X->n - 1; i > 0; i--)
+        if (X->p[i] != 0)
             break;
 
-    j = biL - mbedtls_clz( X->p[i] );
+    j = biL - mbedtls_clz(X->p[i]);
 
-    return( ( i * biL ) + j );
+    return ((i * biL) + j);
 }
 
 /*
  * Return the total size in bytes
  */
-size_t mbedtls_mpi_size( const mbedtls_mpi *X )
+size_t mbedtls_mpi_size(const mbedtls_mpi *X)
 {
-    return( ( mbedtls_mpi_bitlen( X ) + 7 ) >> 3 );
+    return ((mbedtls_mpi_bitlen(X) + 7) >> 3);
 }
 
 /*
  * Convert an ASCII character to digit value
  */
-static int mpi_get_digit( mbedtls_mpi_uint *d, int radix, char c )
+static int mpi_get_digit(mbedtls_mpi_uint *d, int radix, char c)
 {
     *d = 255;
 
-    if( c >= 0x30 && c <= 0x39 ) *d = c - 0x30;
-    if( c >= 0x41 && c <= 0x46 ) *d = c - 0x37;
-    if( c >= 0x61 && c <= 0x66 ) *d = c - 0x57;
+    if (c >= 0x30 && c <= 0x39) *d = c - 0x30;
+    if (c >= 0x41 && c <= 0x46) *d = c - 0x37;
+    if (c >= 0x61 && c <= 0x66) *d = c - 0x57;
 
-    if( *d >= (mbedtls_mpi_uint) radix )
-        return( MBEDTLS_ERR_MPI_INVALID_CHARACTER );
+    if (*d >= (mbedtls_mpi_uint) radix)
+        return (MBEDTLS_ERR_MPI_INVALID_CHARACTER);
 
-    return( 0 );
+    return (0);
 }
 
 /*
  * Import from an ASCII string
  */
-int mbedtls_mpi_read_string( mbedtls_mpi *X, int radix, const char *s )
+int mbedtls_mpi_read_string(mbedtls_mpi *X, int radix, const char *s)
 {
     int ret;
     size_t i, j, slen, n;
     mbedtls_mpi_uint d;
     mbedtls_mpi T;
 
-    if( radix < 2 || radix > 16 )
-        return( MBEDTLS_ERR_MPI_BAD_INPUT_DATA );
+    if (radix < 2 || radix > 16)
+        return (MBEDTLS_ERR_MPI_BAD_INPUT_DATA);
 
-    mbedtls_mpi_init( &T );
+    mbedtls_mpi_init(&T);
 
-    slen = strlen( s );
+    slen = strlen(s);
 
-    if( radix == 16 )
-    {
-        if( slen > MPI_SIZE_T_MAX >> 2 )
-            return( MBEDTLS_ERR_MPI_BAD_INPUT_DATA );
+    if (radix == 16) {
+        if (slen > MPI_SIZE_T_MAX >> 2)
+            return (MBEDTLS_ERR_MPI_BAD_INPUT_DATA);
 
-        n = BITS_TO_LIMBS( slen << 2 );
+        n = BITS_TO_LIMBS(slen << 2);
 
-        MBEDTLS_MPI_CHK( mbedtls_mpi_grow( X, n ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_lset( X, 0 ) );
+        MBEDTLS_MPI_CHK(mbedtls_mpi_grow(X, n));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_lset(X, 0));
 
-        for( i = slen, j = 0; i > 0; i--, j++ )
-        {
-            if( i == 1 && s[i - 1] == '-' )
-            {
+        for (i = slen, j = 0; i > 0; i--, j++) {
+            if (i == 1 && s[i - 1] == '-') {
                 X->s = -1;
                 break;
             }
 
-            MBEDTLS_MPI_CHK( mpi_get_digit( &d, radix, s[i - 1] ) );
-            X->p[j / ( 2 * ciL )] |= d << ( ( j % ( 2 * ciL ) ) << 2 );
+            MBEDTLS_MPI_CHK(mpi_get_digit(&d, radix, s[i - 1]));
+            X->p[j / (2 * ciL)] |= d << ((j % (2 * ciL)) << 2);
         }
-    }
-    else
-    {
-        MBEDTLS_MPI_CHK( mbedtls_mpi_lset( X, 0 ) );
+    } else {
+        MBEDTLS_MPI_CHK(mbedtls_mpi_lset(X, 0));
 
-        for( i = 0; i < slen; i++ )
-        {
-            if( i == 0 && s[i] == '-' )
-            {
+        for (i = 0; i < slen; i++) {
+            if (i == 0 && s[i] == '-') {
                 X->s = -1;
                 continue;
             }
 
-            MBEDTLS_MPI_CHK( mpi_get_digit( &d, radix, s[i] ) );
-            MBEDTLS_MPI_CHK( mbedtls_mpi_mul_int( &T, X, radix ) );
+            MBEDTLS_MPI_CHK(mpi_get_digit(&d, radix, s[i]));
+            MBEDTLS_MPI_CHK(mbedtls_mpi_mul_int(&T, X, radix));
 
-            if( X->s == 1 )
-            {
-                MBEDTLS_MPI_CHK( mbedtls_mpi_add_int( X, &T, d ) );
-            }
-            else
-            {
-                MBEDTLS_MPI_CHK( mbedtls_mpi_sub_int( X, &T, d ) );
+            if (X->s == 1) {
+                MBEDTLS_MPI_CHK(mbedtls_mpi_add_int(X, &T, d));
+            } else {
+                MBEDTLS_MPI_CHK(mbedtls_mpi_sub_int(X, &T, d));
             }
         }
     }
 
 cleanup:
 
-    mbedtls_mpi_free( &T );
+    mbedtls_mpi_free(&T);
 
-    return( ret );
+    return (ret);
 }
 
 /*
  * Helper to write the digits high-order first
  */
-static int mpi_write_hlp( mbedtls_mpi *X, int radix, char **p )
+static int mpi_write_hlp(mbedtls_mpi *X, int radix, char **p)
 {
     int ret;
     mbedtls_mpi_uint r;
 
-    if( radix < 2 || radix > 16 )
-        return( MBEDTLS_ERR_MPI_BAD_INPUT_DATA );
+    if (radix < 2 || radix > 16)
+        return (MBEDTLS_ERR_MPI_BAD_INPUT_DATA);
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mod_int( &r, X, radix ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_div_int( X, NULL, X, radix ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mod_int(&r, X, radix));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_div_int(X, NULL, X, radix));
 
-    if( mbedtls_mpi_cmp_int( X, 0 ) != 0 )
-        MBEDTLS_MPI_CHK( mpi_write_hlp( X, radix, p ) );
+    if (mbedtls_mpi_cmp_int(X, 0) != 0)
+        MBEDTLS_MPI_CHK(mpi_write_hlp(X, radix, p));
 
-    if( r < 10 )
-        *(*p)++ = (char)( r + 0x30 );
+    if (r < 10)
+        *(*p)++ = (char)(r + 0x30);
     else
-        *(*p)++ = (char)( r + 0x37 );
+        *(*p)++ = (char)(r + 0x37);
 
 cleanup:
 
-    return( ret );
+    return (ret);
 }
 
 /*
  * Export into an ASCII string
  */
-int mbedtls_mpi_write_string( const mbedtls_mpi *X, int radix,
-                              char *buf, size_t buflen, size_t *olen )
+int mbedtls_mpi_write_string(const mbedtls_mpi *X, int radix,
+                             char *buf, size_t buflen, size_t *olen)
 {
     int ret = 0;
     size_t n;
     char *p;
     mbedtls_mpi T;
 
-    if( radix < 2 || radix > 16 )
-        return( MBEDTLS_ERR_MPI_BAD_INPUT_DATA );
+    if (radix < 2 || radix > 16)
+        return (MBEDTLS_ERR_MPI_BAD_INPUT_DATA);
 
-    n = mbedtls_mpi_bitlen( X );
-    if( radix >=  4 ) n >>= 1;
-    if( radix >= 16 ) n >>= 1;
+    n = mbedtls_mpi_bitlen(X);
+    if (radix >=  4) n >>= 1;
+    if (radix >= 16) n >>= 1;
     /*
      * Round up the buffer length to an even value to ensure that there is
      * enough room for hexadecimal values that can be represented in an odd
      * number of digits.
      */
-    n += 3 + ( ( n + 1 ) & 1 );
+    n += 3 + ((n + 1) & 1);
 
-    if( buflen < n )
-    {
+    if (buflen < n) {
         *olen = n;
-        return( MBEDTLS_ERR_MPI_BUFFER_TOO_SMALL );
+        return (MBEDTLS_ERR_MPI_BUFFER_TOO_SMALL);
     }
 
     p = buf;
-    mbedtls_mpi_init( &T );
+    mbedtls_mpi_init(&T);
 
-    if( X->s == -1 )
+    if (X->s == -1)
         *p++ = '-';
 
-    if( radix == 16 )
-    {
+    if (radix == 16) {
         int c;
         size_t i, j, k;
 
-        for( i = X->n, k = 0; i > 0; i-- )
-        {
-            for( j = ciL; j > 0; j-- )
-            {
-                c = ( X->p[i - 1] >> ( ( j - 1 ) << 3) ) & 0xFF;
+        for (i = X->n, k = 0; i > 0; i--) {
+            for (j = ciL; j > 0; j--) {
+                c = (X->p[i - 1] >> ((j - 1) << 3)) & 0xFF;
 
-                if( c == 0 && k == 0 && ( i + j ) != 2 )
+                if (c == 0 && k == 0 && (i + j) != 2)
                     continue;
 
                 *(p++) = "0123456789ABCDEF" [c / 16];
@@ -582,15 +557,13 @@ int mbedtls_mpi_write_string( const mbedtls_mpi *X, int radix,
                 k = 1;
             }
         }
-    }
-    else
-    {
-        MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &T, X ) );
+    } else {
+        MBEDTLS_MPI_CHK(mbedtls_mpi_copy(&T, X));
 
-        if( T.s == -1 )
+        if (T.s == -1)
             T.s = 1;
 
-        MBEDTLS_MPI_CHK( mpi_write_hlp( &T, radix, &p ) );
+        MBEDTLS_MPI_CHK(mpi_write_hlp(&T, radix, &p));
     }
 
     *p++ = '\0';
@@ -598,16 +571,16 @@ int mbedtls_mpi_write_string( const mbedtls_mpi *X, int radix,
 
 cleanup:
 
-    mbedtls_mpi_free( &T );
+    mbedtls_mpi_free(&T);
 
-    return( ret );
+    return (ret);
 }
 
 #if defined(MBEDTLS_FS_IO)
 /*
  * Read X from an opened file
  */
-int mbedtls_mpi_read_file( mbedtls_mpi *X, int radix, FILE *fin )
+int mbedtls_mpi_read_file(mbedtls_mpi *X, int radix, FILE *fin)
 {
     mbedtls_mpi_uint d;
     size_t slen;
@@ -618,29 +591,29 @@ int mbedtls_mpi_read_file( mbedtls_mpi *X, int radix, FILE *fin )
      */
     char s[ MBEDTLS_MPI_RW_BUFFER_SIZE ];
 
-    memset( s, 0, sizeof( s ) );
-    if( fgets( s, sizeof( s ) - 1, fin ) == NULL )
-        return( MBEDTLS_ERR_MPI_FILE_IO_ERROR );
+    memset(s, 0, sizeof(s));
+    if (fgets(s, sizeof(s) - 1, fin) == NULL)
+        return (MBEDTLS_ERR_MPI_FILE_IO_ERROR);
 
-    slen = strlen( s );
-    if( slen == sizeof( s ) - 2 )
-        return( MBEDTLS_ERR_MPI_BUFFER_TOO_SMALL );
+    slen = strlen(s);
+    if (slen == sizeof(s) - 2)
+        return (MBEDTLS_ERR_MPI_BUFFER_TOO_SMALL);
 
-    if( slen > 0 && s[slen - 1] == '\n' ) { slen--; s[slen] = '\0'; }
-    if( slen > 0 && s[slen - 1] == '\r' ) { slen--; s[slen] = '\0'; }
+    if (slen > 0 && s[slen - 1] == '\n') { slen--; s[slen] = '\0'; }
+    if (slen > 0 && s[slen - 1] == '\r') { slen--; s[slen] = '\0'; }
 
     p = s + slen;
-    while( p-- > s )
-        if( mpi_get_digit( &d, radix, *p ) != 0 )
+    while (p-- > s)
+        if (mpi_get_digit(&d, radix, *p) != 0)
             break;
 
-    return( mbedtls_mpi_read_string( X, radix, p + 1 ) );
+    return (mbedtls_mpi_read_string(X, radix, p + 1));
 }
 
 /*
  * Write X into an opened file (or stdout if fout == NULL)
  */
-int mbedtls_mpi_write_file( const char *p, const mbedtls_mpi *X, int radix, FILE *fout )
+int mbedtls_mpi_write_file(const char *p, const mbedtls_mpi *X, int radix, FILE *fout)
 {
     int ret;
     size_t n, slen, plen;
@@ -650,117 +623,111 @@ int mbedtls_mpi_write_file( const char *p, const mbedtls_mpi *X, int radix, FILE
      */
     char s[ MBEDTLS_MPI_RW_BUFFER_SIZE ];
 
-    memset( s, 0, sizeof( s ) );
+    memset(s, 0, sizeof(s));
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_write_string( X, radix, s, sizeof( s ) - 2, &n ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_write_string(X, radix, s, sizeof(s) - 2, &n));
 
-    if( p == NULL ) p = "";
+    if (p == NULL) p = "";
 
-    plen = strlen( p );
-    slen = strlen( s );
+    plen = strlen(p);
+    slen = strlen(s);
     s[slen++] = '\r';
     s[slen++] = '\n';
 
-    if( fout != NULL )
-    {
-        if( fwrite( p, 1, plen, fout ) != plen ||
-            fwrite( s, 1, slen, fout ) != slen )
-            return( MBEDTLS_ERR_MPI_FILE_IO_ERROR );
-    }
-    else
-        mbedtls_printf( "%s%s", p, s );
+    if (fout != NULL) {
+        if (fwrite(p, 1, plen, fout) != plen ||
+            fwrite(s, 1, slen, fout) != slen)
+            return (MBEDTLS_ERR_MPI_FILE_IO_ERROR);
+    } else
+        mbedtls_printf("%s%s", p, s);
 
 cleanup:
 
-    return( ret );
+    return (ret);
 }
 #endif /* MBEDTLS_FS_IO */
 
 /*
  * Import X from unsigned binary data, big endian
  */
-int mbedtls_mpi_read_binary( mbedtls_mpi *X, const unsigned char *buf, size_t buflen )
+int mbedtls_mpi_read_binary(mbedtls_mpi *X, const unsigned char *buf, size_t buflen)
 {
     int ret;
     size_t i, j;
-    size_t const limbs = CHARS_TO_LIMBS( buflen );
+    size_t const limbs = CHARS_TO_LIMBS(buflen);
 
     /* Ensure that target MPI has exactly the necessary number of limbs */
-    if( X->n != limbs )
-    {
-        mbedtls_mpi_free( X );
-        mbedtls_mpi_init( X );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_grow( X, limbs ) );
+    if (X->n != limbs) {
+        mbedtls_mpi_free(X);
+        mbedtls_mpi_init(X);
+        MBEDTLS_MPI_CHK(mbedtls_mpi_grow(X, limbs));
     }
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_lset( X, 0 ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_lset(X, 0));
 
-    for( i = buflen, j = 0; i > 0; i--, j++ )
+    for (i = buflen, j = 0; i > 0; i--, j++)
         X->p[j / ciL] |= ((mbedtls_mpi_uint) buf[i - 1]) << ((j % ciL) << 3);
 
 cleanup:
 
-    return( ret );
+    return (ret);
 }
 
 /*
  * Export X into unsigned binary data, big endian
  */
-int mbedtls_mpi_write_binary( const mbedtls_mpi *X, unsigned char *buf, size_t buflen )
+int mbedtls_mpi_write_binary(const mbedtls_mpi *X, unsigned char *buf, size_t buflen)
 {
     size_t i, j, n;
 
-    n = mbedtls_mpi_size( X );
+    n = mbedtls_mpi_size(X);
 
-    if( buflen < n )
-        return( MBEDTLS_ERR_MPI_BUFFER_TOO_SMALL );
+    if (buflen < n)
+        return (MBEDTLS_ERR_MPI_BUFFER_TOO_SMALL);
 
-    memset( buf, 0, buflen );
+    memset(buf, 0, buflen);
 
-    for( i = buflen - 1, j = 0; n > 0; i--, j++, n-- )
-        buf[i] = (unsigned char)( X->p[j / ciL] >> ((j % ciL) << 3) );
+    for (i = buflen - 1, j = 0; n > 0; i--, j++, n--)
+        buf[i] = (unsigned char)(X->p[j / ciL] >> ((j % ciL) << 3));
 
-    return( 0 );
+    return (0);
 }
 
 /*
  * Left-shift: X <<= count
  */
-int mbedtls_mpi_shift_l( mbedtls_mpi *X, size_t count )
+int mbedtls_mpi_shift_l(mbedtls_mpi *X, size_t count)
 {
     int ret;
     size_t i, v0, t1;
     mbedtls_mpi_uint r0 = 0, r1;
 
-    v0 = count / (biL    );
+    v0 = count / (biL);
     t1 = count & (biL - 1);
 
-    i = mbedtls_mpi_bitlen( X ) + count;
+    i = mbedtls_mpi_bitlen(X) + count;
 
-    if( X->n * biL < i )
-        MBEDTLS_MPI_CHK( mbedtls_mpi_grow( X, BITS_TO_LIMBS( i ) ) );
+    if (X->n * biL < i)
+        MBEDTLS_MPI_CHK(mbedtls_mpi_grow(X, BITS_TO_LIMBS(i)));
 
     ret = 0;
 
     /*
      * shift by count / limb_size
      */
-    if( v0 > 0 )
-    {
-        for( i = X->n; i > v0; i-- )
+    if (v0 > 0) {
+        for (i = X->n; i > v0; i--)
             X->p[i - 1] = X->p[i - v0 - 1];
 
-        for( ; i > 0; i-- )
+        for (; i > 0; i--)
             X->p[i - 1] = 0;
     }
 
     /*
      * shift by count % limb_size
      */
-    if( t1 > 0 )
-    {
-        for( i = v0; i < X->n; i++ )
-        {
+    if (t1 > 0) {
+        for (i = v0; i < X->n; i++) {
             r1 = X->p[i] >> (biL - t1);
             X->p[i] <<= t1;
             X->p[i] |= r0;
@@ -770,13 +737,13 @@ int mbedtls_mpi_shift_l( mbedtls_mpi *X, size_t count )
 
 cleanup:
 
-    return( ret );
+    return (ret);
 }
 
 /*
  * Right-shift: X >>= count
  */
-int mbedtls_mpi_shift_r( mbedtls_mpi *X, size_t count )
+int mbedtls_mpi_shift_r(mbedtls_mpi *X, size_t count)
 {
     size_t i, v0, v1;
     mbedtls_mpi_uint r0 = 0, r1;
@@ -784,28 +751,25 @@ int mbedtls_mpi_shift_r( mbedtls_mpi *X, size_t count )
     v0 = count /  biL;
     v1 = count & (biL - 1);
 
-    if( v0 > X->n || ( v0 == X->n && v1 > 0 ) )
-        return mbedtls_mpi_lset( X, 0 );
+    if (v0 > X->n || (v0 == X->n && v1 > 0))
+        return mbedtls_mpi_lset(X, 0);
 
     /*
      * shift by count / limb_size
      */
-    if( v0 > 0 )
-    {
-        for( i = 0; i < X->n - v0; i++ )
+    if (v0 > 0) {
+        for (i = 0; i < X->n - v0; i++)
             X->p[i] = X->p[i + v0];
 
-        for( ; i < X->n; i++ )
+        for (; i < X->n; i++)
             X->p[i] = 0;
     }
 
     /*
      * shift by count % limb_size
      */
-    if( v1 > 0 )
-    {
-        for( i = X->n; i > 0; i-- )
-        {
+    if (v1 > 0) {
+        for (i = X->n; i > 0; i--) {
             r1 = X->p[i - 1] << (biL - v1);
             X->p[i - 1] >>= v1;
             X->p[i - 1] |= r0;
@@ -813,187 +777,191 @@ int mbedtls_mpi_shift_r( mbedtls_mpi *X, size_t count )
         }
     }
 
-    return( 0 );
+    return (0);
 }
 
 /*
  * Compare unsigned values
  */
-int mbedtls_mpi_cmp_abs( const mbedtls_mpi *X, const mbedtls_mpi *Y )
+int mbedtls_mpi_cmp_abs(const mbedtls_mpi *X, const mbedtls_mpi *Y)
 {
     size_t i, j;
 
-    for( i = X->n; i > 0; i-- )
-        if( X->p[i - 1] != 0 )
+    for (i = X->n; i > 0; i--)
+        if (X->p[i - 1] != 0)
             break;
 
-    for( j = Y->n; j > 0; j-- )
-        if( Y->p[j - 1] != 0 )
+    for (j = Y->n; j > 0; j--)
+        if (Y->p[j - 1] != 0)
             break;
 
-    if( i == 0 && j == 0 )
-        return( 0 );
+    if (i == 0 && j == 0)
+        return (0);
 
-    if( i > j ) return(  1 );
-    if( j > i ) return( -1 );
+    if (i > j) return (1);
+    if (j > i) return (-1);
 
-    for( ; i > 0; i-- )
-    {
-        if( X->p[i - 1] > Y->p[i - 1] ) return(  1 );
-        if( X->p[i - 1] < Y->p[i - 1] ) return( -1 );
+    for (; i > 0; i--) {
+        if (X->p[i - 1] > Y->p[i - 1]) return (1);
+        if (X->p[i - 1] < Y->p[i - 1]) return (-1);
     }
 
-    return( 0 );
+    return (0);
 }
 
 /*
  * Compare signed values
  */
-int mbedtls_mpi_cmp_mpi( const mbedtls_mpi *X, const mbedtls_mpi *Y )
+int mbedtls_mpi_cmp_mpi(const mbedtls_mpi *X, const mbedtls_mpi *Y)
 {
     size_t i, j;
 
-    for( i = X->n; i > 0; i-- )
-        if( X->p[i - 1] != 0 )
+    for (i = X->n; i > 0; i--)
+        if (X->p[i - 1] != 0)
             break;
 
-    for( j = Y->n; j > 0; j-- )
-        if( Y->p[j - 1] != 0 )
+    for (j = Y->n; j > 0; j--)
+        if (Y->p[j - 1] != 0)
             break;
 
-    if( i == 0 && j == 0 )
-        return( 0 );
+    if (i == 0 && j == 0)
+        return (0);
 
-    if( i > j ) return(  X->s );
-    if( j > i ) return( -Y->s );
+    if (i > j) return (X->s);
+    if (j > i) return (-Y->s);
 
-    if( X->s > 0 && Y->s < 0 ) return(  1 );
-    if( Y->s > 0 && X->s < 0 ) return( -1 );
+    if (X->s > 0 && Y->s < 0) return (1);
+    if (Y->s > 0 && X->s < 0) return (-1);
 
-    for( ; i > 0; i-- )
-    {
-        if( X->p[i - 1] > Y->p[i - 1] ) return(  X->s );
-        if( X->p[i - 1] < Y->p[i - 1] ) return( -X->s );
+    for (; i > 0; i--) {
+        if (X->p[i - 1] > Y->p[i - 1]) return (X->s);
+        if (X->p[i - 1] < Y->p[i - 1]) return (-X->s);
     }
 
-    return( 0 );
+    return (0);
 }
 
 /*
  * Compare signed values
  */
-int mbedtls_mpi_cmp_int( const mbedtls_mpi *X, mbedtls_mpi_sint z )
+int mbedtls_mpi_cmp_int(const mbedtls_mpi *X, mbedtls_mpi_sint z)
 {
     mbedtls_mpi Y;
     mbedtls_mpi_uint p[1];
 
-    *p  = ( z < 0 ) ? -z : z;
-    Y.s = ( z < 0 ) ? -1 : 1;
+    *p  = (z < 0) ? -z : z;
+    Y.s = (z < 0) ? -1 : 1;
     Y.n = 1;
     Y.p = p;
 
-    return( mbedtls_mpi_cmp_mpi( X, &Y ) );
+    return (mbedtls_mpi_cmp_mpi(X, &Y));
 }
 
 /*
  * Unsigned addition: X = |A| + |B|  (HAC 14.7)
  */
-int mbedtls_mpi_add_abs( mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *B )
+int mbedtls_mpi_add_abs(mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *B)
 {
     int ret;
     size_t i, j;
     mbedtls_mpi_uint *o, *p, c, tmp;
 
-    if( X == B )
-    {
-        const mbedtls_mpi *T = A; A = X; B = T;
+    if (X == B) {
+        const mbedtls_mpi *T = A;
+        A = X;
+        B = T;
     }
 
-    if( X != A )
-        MBEDTLS_MPI_CHK( mbedtls_mpi_copy( X, A ) );
+    if (X != A)
+        MBEDTLS_MPI_CHK(mbedtls_mpi_copy(X, A));
 
     /*
      * X should always be positive as a result of unsigned additions.
      */
     X->s = 1;
 
-    for( j = B->n; j > 0; j-- )
-        if( B->p[j - 1] != 0 )
+    for (j = B->n; j > 0; j--)
+        if (B->p[j - 1] != 0)
             break;
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_grow( X, j ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_grow(X, j));
 
-    o = B->p; p = X->p; c = 0;
+    o = B->p;
+    p = X->p;
+    c = 0;
 
     /*
      * tmp is used because it might happen that p == o
      */
-    for( i = 0; i < j; i++, o++, p++ )
-    {
-        tmp= *o;
-        *p +=  c; c  = ( *p <  c );
-        *p += tmp; c += ( *p < tmp );
+    for (i = 0; i < j; i++, o++, p++) {
+        tmp = *o;
+        *p +=  c;
+        c  = (*p <  c);
+        *p += tmp;
+        c += (*p < tmp);
     }
 
-    while( c != 0 )
-    {
-        if( i >= X->n )
-        {
-            MBEDTLS_MPI_CHK( mbedtls_mpi_grow( X, i + 1 ) );
+    while (c != 0) {
+        if (i >= X->n) {
+            MBEDTLS_MPI_CHK(mbedtls_mpi_grow(X, i + 1));
             p = X->p + i;
         }
 
-        *p += c; c = ( *p < c ); i++; p++;
+        *p += c;
+        c = (*p < c);
+        i++;
+        p++;
     }
 
 cleanup:
 
-    return( ret );
+    return (ret);
 }
 
 /*
  * Helper for mbedtls_mpi subtraction
  */
-static void mpi_sub_hlp( size_t n, mbedtls_mpi_uint *s, mbedtls_mpi_uint *d )
+static void mpi_sub_hlp(size_t n, mbedtls_mpi_uint *s, mbedtls_mpi_uint *d)
 {
     size_t i;
     mbedtls_mpi_uint c, z;
 
-    for( i = c = 0; i < n; i++, s++, d++ )
-    {
-        z = ( *d <  c );     *d -=  c;
-        c = ( *d < *s ) + z; *d -= *s;
+    for (i = c = 0; i < n; i++, s++, d++) {
+        z = (*d <  c);
+        *d -=  c;
+        c = (*d < *s) + z;
+        *d -= *s;
     }
 
-    while( c != 0 )
-    {
-        z = ( *d < c ); *d -= c;
-        c = z; d++;
+    while (c != 0) {
+        z = (*d < c);
+        *d -= c;
+        c = z;
+        d++;
     }
 }
 
 /*
  * Unsigned subtraction: X = |A| - |B|  (HAC 14.9)
  */
-int mbedtls_mpi_sub_abs( mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *B )
+int mbedtls_mpi_sub_abs(mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *B)
 {
     mbedtls_mpi TB;
     int ret;
     size_t n;
 
-    if( mbedtls_mpi_cmp_abs( A, B ) < 0 )
-        return( MBEDTLS_ERR_MPI_NEGATIVE_VALUE );
+    if (mbedtls_mpi_cmp_abs(A, B) < 0)
+        return (MBEDTLS_ERR_MPI_NEGATIVE_VALUE);
 
-    mbedtls_mpi_init( &TB );
+    mbedtls_mpi_init(&TB);
 
-    if( X == B )
-    {
-        MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &TB, B ) );
+    if (X == B) {
+        MBEDTLS_MPI_CHK(mbedtls_mpi_copy(&TB, B));
         B = &TB;
     }
 
-    if( X != A )
-        MBEDTLS_MPI_CHK( mbedtls_mpi_copy( X, A ) );
+    if (X != A)
+        MBEDTLS_MPI_CHK(mbedtls_mpi_copy(X, A));
 
     /*
      * X should always be positive as a result of unsigned subtractions.
@@ -1002,111 +970,99 @@ int mbedtls_mpi_sub_abs( mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi
 
     ret = 0;
 
-    for( n = B->n; n > 0; n-- )
-        if( B->p[n - 1] != 0 )
+    for (n = B->n; n > 0; n--)
+        if (B->p[n - 1] != 0)
             break;
 
-    mpi_sub_hlp( n, B->p, X->p );
+    mpi_sub_hlp(n, B->p, X->p);
 
 cleanup:
 
-    mbedtls_mpi_free( &TB );
+    mbedtls_mpi_free(&TB);
 
-    return( ret );
+    return (ret);
 }
 
 /*
  * Signed addition: X = A + B
  */
-int mbedtls_mpi_add_mpi( mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *B )
+int mbedtls_mpi_add_mpi(mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *B)
 {
     int ret, s = A->s;
 
-    if( A->s * B->s < 0 )
-    {
-        if( mbedtls_mpi_cmp_abs( A, B ) >= 0 )
-        {
-            MBEDTLS_MPI_CHK( mbedtls_mpi_sub_abs( X, A, B ) );
+    if (A->s * B->s < 0) {
+        if (mbedtls_mpi_cmp_abs(A, B) >= 0) {
+            MBEDTLS_MPI_CHK(mbedtls_mpi_sub_abs(X, A, B));
             X->s =  s;
-        }
-        else
-        {
-            MBEDTLS_MPI_CHK( mbedtls_mpi_sub_abs( X, B, A ) );
+        } else {
+            MBEDTLS_MPI_CHK(mbedtls_mpi_sub_abs(X, B, A));
             X->s = -s;
         }
-    }
-    else
-    {
-        MBEDTLS_MPI_CHK( mbedtls_mpi_add_abs( X, A, B ) );
+    } else {
+        MBEDTLS_MPI_CHK(mbedtls_mpi_add_abs(X, A, B));
         X->s = s;
     }
 
 cleanup:
 
-    return( ret );
+    return (ret);
 }
 
 /*
  * Signed subtraction: X = A - B
  */
-int mbedtls_mpi_sub_mpi( mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *B )
+int mbedtls_mpi_sub_mpi(mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *B)
 {
     int ret, s = A->s;
 
-    if( A->s * B->s > 0 )
-    {
-        if( mbedtls_mpi_cmp_abs( A, B ) >= 0 )
-        {
-            MBEDTLS_MPI_CHK( mbedtls_mpi_sub_abs( X, A, B ) );
+    if (A->s * B->s > 0) {
+        if (mbedtls_mpi_cmp_abs(A, B) >= 0) {
+            MBEDTLS_MPI_CHK(mbedtls_mpi_sub_abs(X, A, B));
             X->s =  s;
-        }
-        else
-        {
-            MBEDTLS_MPI_CHK( mbedtls_mpi_sub_abs( X, B, A ) );
+        } else {
+            MBEDTLS_MPI_CHK(mbedtls_mpi_sub_abs(X, B, A));
             X->s = -s;
         }
-    }
-    else
-    {
-        MBEDTLS_MPI_CHK( mbedtls_mpi_add_abs( X, A, B ) );
+    } else {
+        MBEDTLS_MPI_CHK(mbedtls_mpi_add_abs(X, A, B));
         X->s = s;
     }
 
 cleanup:
 
-    return( ret );
+    return (ret);
 }
 
 /*
  * Signed addition: X = A + b
  */
-int mbedtls_mpi_add_int( mbedtls_mpi *X, const mbedtls_mpi *A, mbedtls_mpi_sint b )
+int mbedtls_mpi_add_int(mbedtls_mpi *X, const mbedtls_mpi *A, mbedtls_mpi_sint b)
 {
     mbedtls_mpi _B;
     mbedtls_mpi_uint p[1];
 
-    p[0] = ( b < 0 ) ? -b : b;
-    _B.s = ( b < 0 ) ? -1 : 1;
+    p[0] = (b < 0) ? -b : b;
+    _B.s = (b < 0) ? -1 : 1;
     _B.n = 1;
     _B.p = p;
 
-    return( mbedtls_mpi_add_mpi( X, A, &_B ) );
+    return (mbedtls_mpi_add_mpi(X, A, &_B));
 }
 
 /*
  * Signed subtraction: X = A - b
  */
-int mbedtls_mpi_sub_int( mbedtls_mpi *X, const mbedtls_mpi *A, mbedtls_mpi_sint b )
+int mbedtls_mpi_sub_int(mbedtls_mpi *X, const mbedtls_mpi *A, mbedtls_mpi_sint b)
 {
     mbedtls_mpi _B;
     mbedtls_mpi_uint p[1];
 
-    p[0] = ( b < 0 ) ? -b : b;
-    _B.s = ( b < 0 ) ? -1 : 1;
+    p[0] = (b < 0) ? -b : b;
+    _B.s = (b < 0) ? -1 : 1;
     _B.n = 1;
     _B.p = p;
 
-    return( mbedtls_mpi_sub_mpi( X, A, &_B ) );
+    return (mbedtls_mpi_sub_mpi(X, A, &_B));
 }
 
 /*
@@ -1118,29 +1074,26 @@ static
  * Apple LLVM version 4.2 (clang-425.0.24) (based on LLVM 3.2svn)
  * appears to need this to prevent bad ARM code generation at -O3.
  */
-__attribute__ ((noinline))
+__attribute__((noinline))
 #endif
-void mpi_mul_hlp( size_t i, mbedtls_mpi_uint *s, mbedtls_mpi_uint *d, mbedtls_mpi_uint b )
+void mpi_mul_hlp(size_t i, mbedtls_mpi_uint *s, mbedtls_mpi_uint *d, mbedtls_mpi_uint b)
 {
     mbedtls_mpi_uint c = 0, t = 0;
 
 #if defined(MULADDC_HUIT)
-    for( ; i >= 8; i -= 8 )
-    {
+    for (; i >= 8; i -= 8) {
         MULADDC_INIT
         MULADDC_HUIT
         MULADDC_STOP
     }
 
-    for( ; i > 0; i-- )
-    {
+    for (; i > 0; i--) {
         MULADDC_INIT
         MULADDC_CORE
         MULADDC_STOP
     }
 #else /* MULADDC_HUIT */
-    for( ; i >= 16; i -= 16 )
-    {
+    for (; i >= 16; i -= 16) {
         MULADDC_INIT
         MULADDC_CORE   MULADDC_CORE
         MULADDC_CORE   MULADDC_CORE
@@ -1154,8 +1107,7 @@ void mpi_mul_hlp( size_t i, mbedtls_mpi_uint *s, mbedtls_mpi_uint *d, mbedtls_mp
         MULADDC_STOP
     }
 
-    for( ; i >= 8; i -= 8 )
-    {
+    for (; i >= 8; i -= 8) {
         MULADDC_INIT
         MULADDC_CORE   MULADDC_CORE
         MULADDC_CORE   MULADDC_CORE
@@ -1165,8 +1117,7 @@ void mpi_mul_hlp( size_t i, mbedtls_mpi_uint *s, mbedtls_mpi_uint *d, mbedtls_mp
         MULADDC_STOP
     }
 
-    for( ; i > 0; i-- )
-    {
+    for (; i > 0; i--) {
         MULADDC_INIT
         MULADDC_CORE
         MULADDC_STOP
@@ -1176,52 +1127,55 @@ void mpi_mul_hlp( size_t i, mbedtls_mpi_uint *s, mbedtls_mpi_uint *d, mbedtls_mp
     t++;
 
     do {
-        *d += c; c = ( *d < c ); d++;
-    }
-    while( c != 0 );
+        *d += c;
+        c = (*d < c);
+        d++;
+    } while (c != 0);
 }
 
 /*
  * Baseline multiplication: X = A * B  (HAC 14.12)
  */
-int mbedtls_mpi_mul_mpi( mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *B )
+int mbedtls_mpi_mul_mpi(mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *B)
 {
     int ret;
     size_t i, j;
     mbedtls_mpi TA, TB;
 
-    mbedtls_mpi_init( &TA ); mbedtls_mpi_init( &TB );
+    mbedtls_mpi_init(&TA);
+    mbedtls_mpi_init(&TB);
 
-    if( X == A ) { MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &TA, A ) ); A = &TA; }
-    if( X == B ) { MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &TB, B ) ); B = &TB; }
+    if (X == A) { MBEDTLS_MPI_CHK(mbedtls_mpi_copy(&TA, A)); A = &TA; }
+    if (X == B) { MBEDTLS_MPI_CHK(mbedtls_mpi_copy(&TB, B)); B = &TB; }
 
-    for( i = A->n; i > 0; i-- )
-        if( A->p[i - 1] != 0 )
+    for (i = A->n; i > 0; i--)
+        if (A->p[i - 1] != 0)
             break;
 
-    for( j = B->n; j > 0; j-- )
-        if( B->p[j - 1] != 0 )
+    for (j = B->n; j > 0; j--)
+        if (B->p[j - 1] != 0)
             break;
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_grow( X, i + j ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_lset( X, 0 ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_grow(X, i + j));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_lset(X, 0));
 
-    for( ; j > 0; j-- )
-        mpi_mul_hlp( i, A->p, X->p + j - 1, B->p[j - 1] );
+    for (; j > 0; j--)
+        mpi_mul_hlp(i, A->p, X->p + j - 1, B->p[j - 1]);
 
     X->s = A->s * B->s;
 
 cleanup:
 
-    mbedtls_mpi_free( &TB ); mbedtls_mpi_free( &TA );
+    mbedtls_mpi_free(&TB);
+    mbedtls_mpi_free(&TA);
 
-    return( ret );
+    return (ret);
 }
 
 /*
  * Baseline multiplication: X = A * b
  */
-int mbedtls_mpi_mul_int( mbedtls_mpi *X, const mbedtls_mpi *A, mbedtls_mpi_uint b )
+int mbedtls_mpi_mul_int(mbedtls_mpi *X, const mbedtls_mpi *A, mbedtls_mpi_uint b)
 {
     mbedtls_mpi _B;
     mbedtls_mpi_uint p[1];
@@ -1231,21 +1185,21 @@ int mbedtls_mpi_mul_int( mbedtls_mpi *X, const mbedtls_mpi *A, mbedtls_mpi_uint
     _B.p = p;
     p[0] = b;
 
-    return( mbedtls_mpi_mul_mpi( X, A, &_B ) );
+    return (mbedtls_mpi_mul_mpi(X, A, &_B));
 }
 
 /*
  * Unsigned integer divide - double mbedtls_mpi_uint dividend, u1/u0, and
  * mbedtls_mpi_uint divisor, d
  */
-static mbedtls_mpi_uint mbedtls_int_div_int( mbedtls_mpi_uint u1,
-            mbedtls_mpi_uint u0, mbedtls_mpi_uint d, mbedtls_mpi_uint *r )
+static mbedtls_mpi_uint mbedtls_int_div_int(mbedtls_mpi_uint u1,
+                                            mbedtls_mpi_uint u0, mbedtls_mpi_uint d, mbedtls_mpi_uint *r)
 {
 #if defined(MBEDTLS_HAVE_UDBL)
     mbedtls_t_udbl dividend, quotient;
 #else
     const mbedtls_mpi_uint radix = (mbedtls_mpi_uint) 1 << biH;
-    const mbedtls_mpi_uint uint_halfword_mask = ( (mbedtls_mpi_uint) 1 << biH ) - 1;
+    const mbedtls_mpi_uint uint_halfword_mask = ((mbedtls_mpi_uint) 1 << biH) - 1;
     mbedtls_mpi_uint d0, d1, q0, q1, rAX, r0, quotient;
     mbedtls_mpi_uint u0_msw, u0_lsw;
     size_t s;
@@ -1254,22 +1208,21 @@ static mbedtls_mpi_uint mbedtls_int_div_int( mbedtls_mpi_uint u1,
     /*
      * Check for overflow
      */
-    if( 0 == d || u1 >= d )
-    {
+    if (0 == d || u1 >= d) {
         if (r != NULL) *r = ~0;
 
-        return ( ~0 );
+        return (~0);
     }
 
 #if defined(MBEDTLS_HAVE_UDBL)
     dividend  = (mbedtls_t_udbl) u1 << biL;
     dividend |= (mbedtls_t_udbl) u0;
     quotient = dividend / d;
-    if( quotient > ( (mbedtls_t_udbl) 1 << biL ) - 1 )
-        quotient = ( (mbedtls_t_udbl) 1 << biL ) - 1;
+    if (quotient > ((mbedtls_t_udbl) 1 << biL) - 1)
+        quotient = ((mbedtls_t_udbl) 1 << biL) - 1;
 
-    if( r != NULL )
-        *r = (mbedtls_mpi_uint)( dividend - (quotient * d ) );
+    if (r != NULL)
+        *r = (mbedtls_mpi_uint)(dividend - (quotient * d));
 
     return (mbedtls_mpi_uint) quotient;
 #else
@@ -1282,11 +1235,11 @@ static mbedtls_mpi_uint mbedtls_int_div_int( mbedtls_mpi_uint u1,
     /*
      * Normalize the divisor, d, and dividend, u0, u1
      */
-    s = mbedtls_clz( d );
+    s = mbedtls_clz(d);
     d = d << s;
 
     u1 = u1 << s;
-    u1 |= ( u0 >> ( biL - s ) ) & ( -(mbedtls_mpi_sint)s >> ( biL - 1 ) );
+    u1 |= (u0 >> (biL - s)) & (-(mbedtls_mpi_sint)s >> (biL - 1));
     u0 =  u0 << s;
 
     d1 = d >> biH;
@@ -1301,28 +1254,26 @@ static mbedtls_mpi_uint mbedtls_int_div_int( mbedtls_mpi_uint u1,
     q1 = u1 / d1;
     r0 = u1 - d1 * q1;
 
-    while( q1 >= radix || ( q1 * d0 > radix * r0 + u0_msw ) )
-    {
+    while (q1 >= radix || (q1 * d0 > radix * r0 + u0_msw)) {
         q1 -= 1;
         r0 += d1;
 
-        if ( r0 >= radix ) break;
+        if (r0 >= radix) break;
     }
 
-    rAX = ( u1 * radix ) + ( u0_msw - q1 * d );
+    rAX = (u1 * radix) + (u0_msw - q1 * d);
     q0 = rAX / d1;
     r0 = rAX - q0 * d1;
 
-    while( q0 >= radix || ( q0 * d0 > radix * r0 + u0_lsw ) )
-    {
+    while (q0 >= radix || (q0 * d0 > radix * r0 + u0_lsw)) {
         q0 -= 1;
         r0 += d1;
 
-        if ( r0 >= radix ) break;
+        if (r0 >= radix) break;
     }
 
     if (r != NULL)
-        *r = ( rAX * radix + u0_lsw - q0 * d ) >> s;
+        *r = (rAX * radix + u0_lsw - q0 * d) >> s;
 
     quotient = q1 * radix + q0;
 
@@ -1333,198 +1284,190 @@ static mbedtls_mpi_uint mbedtls_int_div_int( mbedtls_mpi_uint u1,
 /*
  * Division by mbedtls_mpi: A = Q * B + R  (HAC 14.20)
  */
-int mbedtls_mpi_div_mpi( mbedtls_mpi *Q, mbedtls_mpi *R, const mbedtls_mpi *A, const mbedtls_mpi *B )
+int mbedtls_mpi_div_mpi(mbedtls_mpi *Q, mbedtls_mpi *R, const mbedtls_mpi *A, const mbedtls_mpi *B)
 {
     int ret;
     size_t i, n, t, k;
     mbedtls_mpi X, Y, Z, T1, T2;
 
-    if( mbedtls_mpi_cmp_int( B, 0 ) == 0 )
-        return( MBEDTLS_ERR_MPI_DIVISION_BY_ZERO );
+    if (mbedtls_mpi_cmp_int(B, 0) == 0)
+        return (MBEDTLS_ERR_MPI_DIVISION_BY_ZERO);
 
-    mbedtls_mpi_init( &X ); mbedtls_mpi_init( &Y ); mbedtls_mpi_init( &Z );
-    mbedtls_mpi_init( &T1 ); mbedtls_mpi_init( &T2 );
+    mbedtls_mpi_init(&X);
+    mbedtls_mpi_init(&Y);
+    mbedtls_mpi_init(&Z);
+    mbedtls_mpi_init(&T1);
+    mbedtls_mpi_init(&T2);
 
-    if( mbedtls_mpi_cmp_abs( A, B ) < 0 )
-    {
-        if( Q != NULL ) MBEDTLS_MPI_CHK( mbedtls_mpi_lset( Q, 0 ) );
-        if( R != NULL ) MBEDTLS_MPI_CHK( mbedtls_mpi_copy( R, A ) );
-        return( 0 );
+    if (mbedtls_mpi_cmp_abs(A, B) < 0) {
+        if (Q != NULL) MBEDTLS_MPI_CHK(mbedtls_mpi_lset(Q, 0));
+        if (R != NULL) MBEDTLS_MPI_CHK(mbedtls_mpi_copy(R, A));
+        return (0);
     }
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &X, A ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &Y, B ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_copy(&X, A));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_copy(&Y, B));
     X.s = Y.s = 1;
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_grow( &Z, A->n + 2 ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &Z,  0 ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_grow( &T1, 2 ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_grow( &T2, 3 ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_grow(&Z, A->n + 2));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_lset(&Z,  0));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_grow(&T1, 2));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_grow(&T2, 3));
 
-    k = mbedtls_mpi_bitlen( &Y ) % biL;
-    if( k < biL - 1 )
-    {
+    k = mbedtls_mpi_bitlen(&Y) % biL;
+    if (k < biL - 1) {
         k = biL - 1 - k;
-        MBEDTLS_MPI_CHK( mbedtls_mpi_shift_l( &X, k ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_shift_l( &Y, k ) );
-    }
-    else k = 0;
+        MBEDTLS_MPI_CHK(mbedtls_mpi_shift_l(&X, k));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_shift_l(&Y, k));
+    } else k = 0;
 
     n = X.n - 1;
     t = Y.n - 1;
-    MBEDTLS_MPI_CHK( mbedtls_mpi_shift_l( &Y, biL * ( n - t ) ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_shift_l(&Y, biL * (n - t)));
 
-    while( mbedtls_mpi_cmp_mpi( &X, &Y ) >= 0 )
-    {
+    while (mbedtls_mpi_cmp_mpi(&X, &Y) >= 0) {
         Z.p[n - t]++;
-        MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &X, &X, &Y ) );
+        MBEDTLS_MPI_CHK(mbedtls_mpi_sub_mpi(&X, &X, &Y));
     }
-    MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &Y, biL * ( n - t ) ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_shift_r(&Y, biL * (n - t)));
 
-    for( i = n; i > t ; i-- )
-    {
-        if( X.p[i] >= Y.p[t] )
+    for (i = n; i > t ; i--) {
+        if (X.p[i] >= Y.p[t])
             Z.p[i - t - 1] = ~0;
-        else
-        {
-            Z.p[i - t - 1] = mbedtls_int_div_int( X.p[i], X.p[i - 1],
-                                                            Y.p[t], NULL);
+        else {
+            Z.p[i - t - 1] = mbedtls_int_div_int(X.p[i], X.p[i - 1],
+                                                 Y.p[t], NULL);
         }
 
         Z.p[i - t - 1]++;
-        do
-        {
+        do {
             Z.p[i - t - 1]--;
 
-            MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &T1, 0 ) );
-            T1.p[0] = ( t < 1 ) ? 0 : Y.p[t - 1];
+            MBEDTLS_MPI_CHK(mbedtls_mpi_lset(&T1, 0));
+            T1.p[0] = (t < 1) ? 0 : Y.p[t - 1];
             T1.p[1] = Y.p[t];
-            MBEDTLS_MPI_CHK( mbedtls_mpi_mul_int( &T1, &T1, Z.p[i - t - 1] ) );
+            MBEDTLS_MPI_CHK(mbedtls_mpi_mul_int(&T1, &T1, Z.p[i - t - 1]));
 
-            MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &T2, 0 ) );
-            T2.p[0] = ( i < 2 ) ? 0 : X.p[i - 2];
-            T2.p[1] = ( i < 1 ) ? 0 : X.p[i - 1];
+            MBEDTLS_MPI_CHK(mbedtls_mpi_lset(&T2, 0));
+            T2.p[0] = (i < 2) ? 0 : X.p[i - 2];
+            T2.p[1] = (i < 1) ? 0 : X.p[i - 1];
             T2.p[2] = X.p[i];
-        }
-        while( mbedtls_mpi_cmp_mpi( &T1, &T2 ) > 0 );
+        } while (mbedtls_mpi_cmp_mpi(&T1, &T2) > 0);
 
-        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_int( &T1, &Y, Z.p[i - t - 1] ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_shift_l( &T1,  biL * ( i - t - 1 ) ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &X, &X, &T1 ) );
+        MBEDTLS_MPI_CHK(mbedtls_mpi_mul_int(&T1, &Y, Z.p[i - t - 1]));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_shift_l(&T1,  biL * (i - t - 1)));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_sub_mpi(&X, &X, &T1));
 
-        if( mbedtls_mpi_cmp_int( &X, 0 ) < 0 )
-        {
-            MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &T1, &Y ) );
-            MBEDTLS_MPI_CHK( mbedtls_mpi_shift_l( &T1, biL * ( i - t - 1 ) ) );
-            MBEDTLS_MPI_CHK( mbedtls_mpi_add_mpi( &X, &X, &T1 ) );
+        if (mbedtls_mpi_cmp_int(&X, 0) < 0) {
+            MBEDTLS_MPI_CHK(mbedtls_mpi_copy(&T1, &Y));
+            MBEDTLS_MPI_CHK(mbedtls_mpi_shift_l(&T1, biL * (i - t - 1)));
+            MBEDTLS_MPI_CHK(mbedtls_mpi_add_mpi(&X, &X, &T1));
             Z.p[i - t - 1]--;
         }
     }
 
-    if( Q != NULL )
-    {
-        MBEDTLS_MPI_CHK( mbedtls_mpi_copy( Q, &Z ) );
+    if (Q != NULL) {
+        MBEDTLS_MPI_CHK(mbedtls_mpi_copy(Q, &Z));
         Q->s = A->s * B->s;
     }
 
-    if( R != NULL )
-    {
-        MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &X, k ) );
+    if (R != NULL) {
+        MBEDTLS_MPI_CHK(mbedtls_mpi_shift_r(&X, k));
         X.s = A->s;
-        MBEDTLS_MPI_CHK( mbedtls_mpi_copy( R, &X ) );
+        MBEDTLS_MPI_CHK(mbedtls_mpi_copy(R, &X));
 
-        if( mbedtls_mpi_cmp_int( R, 0 ) == 0 )
+        if (mbedtls_mpi_cmp_int(R, 0) == 0)
             R->s = 1;
     }
 
 cleanup:
 
-    mbedtls_mpi_free( &X ); mbedtls_mpi_free( &Y ); mbedtls_mpi_free( &Z );
-    mbedtls_mpi_free( &T1 ); mbedtls_mpi_free( &T2 );
+    mbedtls_mpi_free(&X);
+    mbedtls_mpi_free(&Y);
+    mbedtls_mpi_free(&Z);
+    mbedtls_mpi_free(&T1);
+    mbedtls_mpi_free(&T2);
 
-    return( ret );
+    return (ret);
 }
 
 /*
  * Division by int: A = Q * b + R
  */
-int mbedtls_mpi_div_int( mbedtls_mpi *Q, mbedtls_mpi *R, const mbedtls_mpi *A, mbedtls_mpi_sint b )
+int mbedtls_mpi_div_int(mbedtls_mpi *Q, mbedtls_mpi *R, const mbedtls_mpi *A, mbedtls_mpi_sint b)
 {
     mbedtls_mpi _B;
     mbedtls_mpi_uint p[1];
 
-    p[0] = ( b < 0 ) ? -b : b;
-    _B.s = ( b < 0 ) ? -1 : 1;
+    p[0] = (b < 0) ? -b : b;
+    _B.s = (b < 0) ? -1 : 1;
     _B.n = 1;
     _B.p = p;
 
-    return( mbedtls_mpi_div_mpi( Q, R, A, &_B ) );
+    return (mbedtls_mpi_div_mpi(Q, R, A, &_B));
 }
 
 /*
  * Modulo: R = A mod B
  */
-int mbedtls_mpi_mod_mpi( mbedtls_mpi *R, const mbedtls_mpi *A, const mbedtls_mpi *B )
+int mbedtls_mpi_mod_mpi(mbedtls_mpi *R, const mbedtls_mpi *A, const mbedtls_mpi *B)
 {
     int ret;
 
-    if( mbedtls_mpi_cmp_int( B, 0 ) < 0 )
-        return( MBEDTLS_ERR_MPI_NEGATIVE_VALUE );
+    if (mbedtls_mpi_cmp_int(B, 0) < 0)
+        return (MBEDTLS_ERR_MPI_NEGATIVE_VALUE);
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_div_mpi( NULL, R, A, B ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_div_mpi(NULL, R, A, B));
 
-    while( mbedtls_mpi_cmp_int( R, 0 ) < 0 )
-      MBEDTLS_MPI_CHK( mbedtls_mpi_add_mpi( R, R, B ) );
+    while (mbedtls_mpi_cmp_int(R, 0) < 0)
+        MBEDTLS_MPI_CHK(mbedtls_mpi_add_mpi(R, R, B));
 
-    while( mbedtls_mpi_cmp_mpi( R, B ) >= 0 )
-      MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( R, R, B ) );
+    while (mbedtls_mpi_cmp_mpi(R, B) >= 0)
+        MBEDTLS_MPI_CHK(mbedtls_mpi_sub_mpi(R, R, B));
 
 cleanup:
 
-    return( ret );
+    return (ret);
 }
 
 /*
  * Modulo: r = A mod b
  */
-int mbedtls_mpi_mod_int( mbedtls_mpi_uint *r, const mbedtls_mpi *A, mbedtls_mpi_sint b )
+int mbedtls_mpi_mod_int(mbedtls_mpi_uint *r, const mbedtls_mpi *A, mbedtls_mpi_sint b)
 {
     size_t i;
     mbedtls_mpi_uint x, y, z;
 
-    if( b == 0 )
-        return( MBEDTLS_ERR_MPI_DIVISION_BY_ZERO );
+    if (b == 0)
+        return (MBEDTLS_ERR_MPI_DIVISION_BY_ZERO);
 
-    if( b < 0 )
-        return( MBEDTLS_ERR_MPI_NEGATIVE_VALUE );
+    if (b < 0)
+        return (MBEDTLS_ERR_MPI_NEGATIVE_VALUE);
 
     /*
      * handle trivial cases
      */
-    if( b == 1 )
-    {
+    if (b == 1) {
         *r = 0;
-        return( 0 );
+        return (0);
     }
 
-    if( b == 2 )
-    {
+    if (b == 2) {
         *r = A->p[0] & 1;
-        return( 0 );
+        return (0);
     }
 
     /*
      * general case
      */
-    for( i = A->n, y = 0; i > 0; i-- )
-    {
+    for (i = A->n, y = 0; i > 0; i--) {
         x  = A->p[i - 1];
-        y  = ( y << biH ) | ( x >> biH );
+        y  = (y << biH) | (x >> biH);
         z  = y / b;
         y -= z * b;
 
         x <<= biH;
-        y  = ( y << biH ) | ( x >> biH );
+        y  = (y << biH) | (x >> biH);
         z  = y / b;
         y -= z * b;
     }
@@ -1533,27 +1476,27 @@ int mbedtls_mpi_mod_int( mbedtls_mpi_uint *r, const mbedtls_mpi *A, mbedtls_mpi_
      * If A is negative, then the current y represents a negative value.
      * Flipping it to the positive side.
      */
-    if( A->s < 0 && y != 0 )
+    if (A->s < 0 && y != 0)
         y = b - y;
 
     *r = y;
 
-    return( 0 );
+    return (0);
 }
 
 /*
  * Fast Montgomery initialization (thanks to Tom St Denis)
  */
-static void mpi_montg_init( mbedtls_mpi_uint *mm, const mbedtls_mpi *N )
+static void mpi_montg_init(mbedtls_mpi_uint *mm, const mbedtls_mpi *N)
 {
     mbedtls_mpi_uint x, m0 = N->p[0];
     unsigned int i;
 
     x  = m0;
-    x += ( ( m0 + 2 ) & 4 ) << 1;
+    x += ((m0 + 2) & 4) << 1;
 
-    for( i = biL; i >= 8; i /= 2 )
-        x *= ( 2 - ( m0 * x ) );
+    for (i = biL; i >= 8; i /= 2)
+        x *= (2 - (m0 * x));
 
     *mm = ~x + 1;
 }
@@ -1561,50 +1504,50 @@ static void mpi_montg_init( mbedtls_mpi_uint *mm, const mbedtls_mpi *N )
 /*
  * Montgomery multiplication: A = A * B * R^-1 mod N  (HAC 14.36)
  */
-static int mpi_montmul( mbedtls_mpi *A, const mbedtls_mpi *B, const mbedtls_mpi *N, mbedtls_mpi_uint mm,
-                         const mbedtls_mpi *T )
+static int mpi_montmul(mbedtls_mpi *A, const mbedtls_mpi *B, const mbedtls_mpi *N, mbedtls_mpi_uint mm,
+                       const mbedtls_mpi *T)
 {
     size_t i, n, m;
     mbedtls_mpi_uint u0, u1, *d;
 
-    if( T->n < N->n + 1 || T->p == NULL )
-        return( MBEDTLS_ERR_MPI_BAD_INPUT_DATA );
+    if (T->n < N->n + 1 || T->p == NULL)
+        return (MBEDTLS_ERR_MPI_BAD_INPUT_DATA);
 
-    memset( T->p, 0, T->n * ciL );
+    memset(T->p, 0, T->n * ciL);
 
     d = T->p;
     n = N->n;
-    m = ( B->n < n ) ? B->n : n;
+    m = (B->n < n) ? B->n : n;
 
-    for( i = 0; i < n; i++ )
-    {
+    for (i = 0; i < n; i++) {
         /*
          * T = (T + u0*B + u1*N) / 2^biL
          */
         u0 = A->p[i];
-        u1 = ( d[0] + u0 * B->p[0] ) * mm;
+        u1 = (d[0] + u0 * B->p[0]) * mm;
 
-        mpi_mul_hlp( m, B->p, d, u0 );
-        mpi_mul_hlp( n, N->p, d, u1 );
+        mpi_mul_hlp(m, B->p, d, u0);
+        mpi_mul_hlp(n, N->p, d, u1);
 
-        *d++ = u0; d[n + 1] = 0;
+        *d++ = u0;
+        d[n + 1] = 0;
     }
 
-    memcpy( A->p, d, ( n + 1 ) * ciL );
+    memcpy(A->p, d, (n + 1) * ciL);
 
-    if( mbedtls_mpi_cmp_abs( A, N ) >= 0 )
-        mpi_sub_hlp( n, N->p, A->p );
+    if (mbedtls_mpi_cmp_abs(A, N) >= 0)
+        mpi_sub_hlp(n, N->p, A->p);
     else
         /* prevent timing attacks */
-        mpi_sub_hlp( n, A->p, T->p );
+        mpi_sub_hlp(n, A->p, T->p);
 
-    return( 0 );
+    return (0);
 }
 
 /*
  * Montgomery reduction: A = A * R^-1 mod N
  */
-static int mpi_montred( mbedtls_mpi *A, const mbedtls_mpi *N, mbedtls_mpi_uint mm, const mbedtls_mpi *T )
+static int mpi_montred(mbedtls_mpi *A, const mbedtls_mpi *N, mbedtls_mpi_uint mm, const mbedtls_mpi *T)
 {
     mbedtls_mpi_uint z = 1;
     mbedtls_mpi U;
@@ -1612,13 +1555,13 @@ static int mpi_montred( mbedtls_mpi *A, const mbedtls_mpi *N, mbedtls_mpi_uint m
     U.n = U.s = (int) z;
     U.p = &z;
 
-    return( mpi_montmul( A, &U, N, mm, T ) );
+    return (mpi_montmul(A, &U, N, mm, T));
 }
 
 /*
  * Sliding-window exponentiation: X = A^E mod N  (HAC 14.85)
  */
-int mbedtls_mpi_exp_mod( mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *E, const mbedtls_mpi *N, mbedtls_mpi *_RR )
+int mbedtls_mpi_exp_mod(mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *E, const mbedtls_mpi *N, mbedtls_mpi *_RR)
 {
     int ret;
     size_t wbits, wsize, one = 1;
@@ -1628,40 +1571,40 @@ int mbedtls_mpi_exp_mod( mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi
     mbedtls_mpi RR, T, W[ 2 << MBEDTLS_MPI_WINDOW_SIZE ], Apos;
     int neg;
 
-    if( mbedtls_mpi_cmp_int( N, 0 ) <= 0 || ( N->p[0] & 1 ) == 0 )
-        return( MBEDTLS_ERR_MPI_BAD_INPUT_DATA );
+    if (mbedtls_mpi_cmp_int(N, 0) <= 0 || (N->p[0] & 1) == 0)
+        return (MBEDTLS_ERR_MPI_BAD_INPUT_DATA);
 
-    if( mbedtls_mpi_cmp_int( E, 0 ) < 0 )
-        return( MBEDTLS_ERR_MPI_BAD_INPUT_DATA );
+    if (mbedtls_mpi_cmp_int(E, 0) < 0)
+        return (MBEDTLS_ERR_MPI_BAD_INPUT_DATA);
 
     /*
      * Init temps and window size
      */
-    mpi_montg_init( &mm, N );
-    mbedtls_mpi_init( &RR ); mbedtls_mpi_init( &T );
-    mbedtls_mpi_init( &Apos );
-    memset( W, 0, sizeof( W ) );
+    mpi_montg_init(&mm, N);
+    mbedtls_mpi_init(&RR);
+    mbedtls_mpi_init(&T);
+    mbedtls_mpi_init(&Apos);
+    memset(W, 0, sizeof(W));
 
-    i = mbedtls_mpi_bitlen( E );
+    i = mbedtls_mpi_bitlen(E);
 
-    wsize = ( i > 671 ) ? 6 : ( i > 239 ) ? 5 :
-            ( i >  79 ) ? 4 : ( i >  23 ) ? 3 : 1;
+    wsize = (i > 671) ? 6 : (i > 239) ? 5 :
+            (i >  79) ? 4 : (i >  23) ? 3 : 1;
 
-    if( wsize > MBEDTLS_MPI_WINDOW_SIZE )
+    if (wsize > MBEDTLS_MPI_WINDOW_SIZE)
         wsize = MBEDTLS_MPI_WINDOW_SIZE;
 
     j = N->n + 1;
-    MBEDTLS_MPI_CHK( mbedtls_mpi_grow( X, j ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_grow( &W[1],  j ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_grow( &T, j * 2 ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_grow(X, j));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_grow(&W[1],  j));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_grow(&T, j * 2));
 
     /*
      * Compensate for negative A (and correct at the end)
      */
-    neg = ( A->s == -1 );
-    if( neg )
-    {
-        MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &Apos, A ) );
+    neg = (A->s == -1);
+    if (neg) {
+        MBEDTLS_MPI_CHK(mbedtls_mpi_copy(&Apos, A));
         Apos.s = 1;
         A = &Apos;
     }
@@ -1669,56 +1612,52 @@ int mbedtls_mpi_exp_mod( mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi
     /*
      * If 1st call, pre-compute R^2 mod N
      */
-    if( _RR == NULL || _RR->p == NULL )
-    {
-        MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &RR, 1 ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_shift_l( &RR, N->n * 2 * biL ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi( &RR, &RR, N ) );
+    if (_RR == NULL || _RR->p == NULL) {
+        MBEDTLS_MPI_CHK(mbedtls_mpi_lset(&RR, 1));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_shift_l(&RR, N->n * 2 * biL));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_mod_mpi(&RR, &RR, N));
 
-        if( _RR != NULL )
-            memcpy( _RR, &RR, sizeof( mbedtls_mpi ) );
-    }
-    else
-        memcpy( &RR, _RR, sizeof( mbedtls_mpi ) );
+        if (_RR != NULL)
+            memcpy(_RR, &RR, sizeof(mbedtls_mpi));
+    } else
+        memcpy(&RR, _RR, sizeof(mbedtls_mpi));
 
     /*
      * W[1] = A * R^2 * R^-1 mod N = A * R mod N
      */
-    if( mbedtls_mpi_cmp_mpi( A, N ) >= 0 )
-        MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi( &W[1], A, N ) );
+    if (mbedtls_mpi_cmp_mpi(A, N) >= 0)
+        MBEDTLS_MPI_CHK(mbedtls_mpi_mod_mpi(&W[1], A, N));
     else
-        MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &W[1], A ) );
+        MBEDTLS_MPI_CHK(mbedtls_mpi_copy(&W[1], A));
 
-    MBEDTLS_MPI_CHK( mpi_montmul( &W[1], &RR, N, mm, &T ) );
+    MBEDTLS_MPI_CHK(mpi_montmul(&W[1], &RR, N, mm, &T));
 
     /*
      * X = R^2 * R^-1 mod N = R mod N
      */
-    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( X, &RR ) );
-    MBEDTLS_MPI_CHK( mpi_montred( X, N, mm, &T ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_copy(X, &RR));
+    MBEDTLS_MPI_CHK(mpi_montred(X, N, mm, &T));
 
-    if( wsize > 1 )
-    {
+    if (wsize > 1) {
         /*
          * W[1 << (wsize - 1)] = W[1] ^ (wsize - 1)
          */
-        j =  one << ( wsize - 1 );
+        j =  one << (wsize - 1);
 
-        MBEDTLS_MPI_CHK( mbedtls_mpi_grow( &W[j], N->n + 1 ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &W[j], &W[1]    ) );
+        MBEDTLS_MPI_CHK(mbedtls_mpi_grow(&W[j], N->n + 1));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_copy(&W[j], &W[1]));
 
-        for( i = 0; i < wsize - 1; i++ )
-            MBEDTLS_MPI_CHK( mpi_montmul( &W[j], &W[j], N, mm, &T ) );
+        for (i = 0; i < wsize - 1; i++)
+            MBEDTLS_MPI_CHK(mpi_montmul(&W[j], &W[j], N, mm, &T));
 
         /*
          * W[i] = W[i - 1] * W[1]
          */
-        for( i = j + 1; i < ( one << wsize ); i++ )
-        {
-            MBEDTLS_MPI_CHK( mbedtls_mpi_grow( &W[i], N->n + 1 ) );
-            MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &W[i], &W[i - 1] ) );
+        for (i = j + 1; i < (one << wsize); i++) {
+            MBEDTLS_MPI_CHK(mbedtls_mpi_grow(&W[i], N->n + 1));
+            MBEDTLS_MPI_CHK(mbedtls_mpi_copy(&W[i], &W[i - 1]));
 
-            MBEDTLS_MPI_CHK( mpi_montmul( &W[i], &W[1], N, mm, &T ) );
+            MBEDTLS_MPI_CHK(mpi_montmul(&W[i], &W[1], N, mm, &T));
         }
     }
 
@@ -1728,16 +1667,14 @@ int mbedtls_mpi_exp_mod( mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi
     wbits   = 0;
     state   = 0;
 
-    while( 1 )
-    {
-        if( bufsize == 0 )
-        {
-            if( nblimbs == 0 )
+    while (1) {
+        if (bufsize == 0) {
+            if (nblimbs == 0)
                 break;
 
             nblimbs--;
 
-            bufsize = sizeof( mbedtls_mpi_uint ) << 3;
+            bufsize = sizeof(mbedtls_mpi_uint) << 3;
         }
 
         bufsize--;
@@ -1747,15 +1684,14 @@ int mbedtls_mpi_exp_mod( mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi
         /*
          * skip leading 0s
          */
-        if( ei == 0 && state == 0 )
+        if (ei == 0 && state == 0)
             continue;
 
-        if( ei == 0 && state == 1 )
-        {
+        if (ei == 0 && state == 1) {
             /*
              * out of window, square X
              */
-            MBEDTLS_MPI_CHK( mpi_montmul( X, X, N, mm, &T ) );
+            MBEDTLS_MPI_CHK(mpi_montmul(X, X, N, mm, &T));
             continue;
         }
 
@@ -1765,20 +1701,19 @@ int mbedtls_mpi_exp_mod( mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi
         state = 2;
 
         nbits++;
-        wbits |= ( ei << ( wsize - nbits ) );
+        wbits |= (ei << (wsize - nbits));
 
-        if( nbits == wsize )
-        {
+        if (nbits == wsize) {
             /*
              * X = X^wsize R^-1 mod N
              */
-            for( i = 0; i < wsize; i++ )
-                MBEDTLS_MPI_CHK( mpi_montmul( X, X, N, mm, &T ) );
+            for (i = 0; i < wsize; i++)
+                MBEDTLS_MPI_CHK(mpi_montmul(X, X, N, mm, &T));
 
             /*
              * X = X * W[wbits] R^-1 mod N
              */
-            MBEDTLS_MPI_CHK( mpi_montmul( X, &W[wbits], N, mm, &T ) );
+            MBEDTLS_MPI_CHK(mpi_montmul(X, &W[wbits], N, mm, &T));
 
             state--;
             nbits = 0;
@@ -1789,90 +1724,90 @@ int mbedtls_mpi_exp_mod( mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi
     /*
      * process the remaining bits
      */
-    for( i = 0; i < nbits; i++ )
-    {
-        MBEDTLS_MPI_CHK( mpi_montmul( X, X, N, mm, &T ) );
+    for (i = 0; i < nbits; i++) {
+        MBEDTLS_MPI_CHK(mpi_montmul(X, X, N, mm, &T));
 
         wbits <<= 1;
 
-        if( ( wbits & ( one << wsize ) ) != 0 )
-            MBEDTLS_MPI_CHK( mpi_montmul( X, &W[1], N, mm, &T ) );
+        if ((wbits & (one << wsize)) != 0)
+            MBEDTLS_MPI_CHK(mpi_montmul(X, &W[1], N, mm, &T));
     }
 
     /*
      * X = A^E * R * R^-1 mod N = A^E mod N
      */
-    MBEDTLS_MPI_CHK( mpi_montred( X, N, mm, &T ) );
+    MBEDTLS_MPI_CHK(mpi_montred(X, N, mm, &T));
 
-    if( neg && E->n != 0 && ( E->p[0] & 1 ) != 0 )
-    {
+    if (neg && E->n != 0 && (E->p[0] & 1) != 0) {
         X->s = -1;
-        MBEDTLS_MPI_CHK( mbedtls_mpi_add_mpi( X, N, X ) );
+        MBEDTLS_MPI_CHK(mbedtls_mpi_add_mpi(X, N, X));
     }
 
 cleanup:
 
-    for( i = ( one << ( wsize - 1 ) ); i < ( one << wsize ); i++ )
-        mbedtls_mpi_free( &W[i] );
+    for (i = (one << (wsize - 1)); i < (one << wsize); i++)
+        mbedtls_mpi_free(&W[i]);
 
-    mbedtls_mpi_free( &W[1] ); mbedtls_mpi_free( &T ); mbedtls_mpi_free( &Apos );
+    mbedtls_mpi_free(&W[1]);
+    mbedtls_mpi_free(&T);
+    mbedtls_mpi_free(&Apos);
 
-    if( _RR == NULL || _RR->p == NULL )
-        mbedtls_mpi_free( &RR );
+    if (_RR == NULL || _RR->p == NULL)
+        mbedtls_mpi_free(&RR);
 
-    return( ret );
+    return (ret);
 }
 
 /*
  * Greatest common divisor: G = gcd(A, B)  (HAC 14.54)
  */
-int mbedtls_mpi_gcd( mbedtls_mpi *G, const mbedtls_mpi *A, const mbedtls_mpi *B )
+int mbedtls_mpi_gcd(mbedtls_mpi *G, const mbedtls_mpi *A, const mbedtls_mpi *B)
 {
     int ret;
     size_t lz, lzt;
     mbedtls_mpi TG, TA, TB;
 
-    mbedtls_mpi_init( &TG ); mbedtls_mpi_init( &TA ); mbedtls_mpi_init( &TB );
+    mbedtls_mpi_init(&TG);
+    mbedtls_mpi_init(&TA);
+    mbedtls_mpi_init(&TB);
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &TA, A ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &TB, B ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_copy(&TA, A));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_copy(&TB, B));
 
-    lz = mbedtls_mpi_lsb( &TA );
-    lzt = mbedtls_mpi_lsb( &TB );
+    lz = mbedtls_mpi_lsb(&TA);
+    lzt = mbedtls_mpi_lsb(&TB);
 
-    if( lzt < lz )
+    if (lzt < lz)
         lz = lzt;
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &TA, lz ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &TB, lz ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_shift_r(&TA, lz));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_shift_r(&TB, lz));
 
     TA.s = TB.s = 1;
 
-    while( mbedtls_mpi_cmp_int( &TA, 0 ) != 0 )
-    {
-        MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &TA, mbedtls_mpi_lsb( &TA ) ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &TB, mbedtls_mpi_lsb( &TB ) ) );
+    while (mbedtls_mpi_cmp_int(&TA, 0) != 0) {
+        MBEDTLS_MPI_CHK(mbedtls_mpi_shift_r(&TA, mbedtls_mpi_lsb(&TA)));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_shift_r(&TB, mbedtls_mpi_lsb(&TB)));
 
-        if( mbedtls_mpi_cmp_mpi( &TA, &TB ) >= 0 )
-        {
-            MBEDTLS_MPI_CHK( mbedtls_mpi_sub_abs( &TA, &TA, &TB ) );
-            MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &TA, 1 ) );
-        }
-        else
-        {
-            MBEDTLS_MPI_CHK( mbedtls_mpi_sub_abs( &TB, &TB, &TA ) );
-            MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &TB, 1 ) );
+        if (mbedtls_mpi_cmp_mpi(&TA, &TB) >= 0) {
+            MBEDTLS_MPI_CHK(mbedtls_mpi_sub_abs(&TA, &TA, &TB));
+            MBEDTLS_MPI_CHK(mbedtls_mpi_shift_r(&TA, 1));
+        } else {
+            MBEDTLS_MPI_CHK(mbedtls_mpi_sub_abs(&TB, &TB, &TA));
+            MBEDTLS_MPI_CHK(mbedtls_mpi_shift_r(&TB, 1));
         }
     }
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_shift_l( &TB, lz ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( G, &TB ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_shift_l(&TB, lz));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_copy(G, &TB));
 
 cleanup:
 
-    mbedtls_mpi_free( &TG ); mbedtls_mpi_free( &TA ); mbedtls_mpi_free( &TB );
+    mbedtls_mpi_free(&TG);
+    mbedtls_mpi_free(&TA);
+    mbedtls_mpi_free(&TB);
 
-    return( ret );
+    return (ret);
 }
 
 /*
@@ -1882,144 +1817,145 @@ cleanup:
  * regardless of the platform endianness (useful when f_rng is actually
  * deterministic, eg for tests).
  */
-int mbedtls_mpi_fill_random( mbedtls_mpi *X, size_t size,
-                     int (*f_rng)(void *, unsigned char *, size_t),
-                     void *p_rng )
+int mbedtls_mpi_fill_random(mbedtls_mpi *X, size_t size,
+                            int (*f_rng)(void *, unsigned char *, size_t),
+                            void *p_rng)
 {
     int ret;
     unsigned char buf[MBEDTLS_MPI_MAX_SIZE];
 
-    if( size > MBEDTLS_MPI_MAX_SIZE )
-        return( MBEDTLS_ERR_MPI_BAD_INPUT_DATA );
+    if (size > MBEDTLS_MPI_MAX_SIZE)
+        return (MBEDTLS_ERR_MPI_BAD_INPUT_DATA);
 
-    MBEDTLS_MPI_CHK( f_rng( p_rng, buf, size ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_read_binary( X, buf, size ) );
+    MBEDTLS_MPI_CHK(f_rng(p_rng, buf, size));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_read_binary(X, buf, size));
 
 cleanup:
-    mbedtls_platform_zeroize( buf, sizeof( buf ) );
-    return( ret );
+    mbedtls_platform_zeroize(buf, sizeof(buf));
+    return (ret);
 }
 
 /*
  * Modular inverse: X = A^-1 mod N  (HAC 14.61 / 14.64)
  */
-int mbedtls_mpi_inv_mod( mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *N )
+int mbedtls_mpi_inv_mod(mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *N)
 {
     int ret;
     mbedtls_mpi G, TA, TU, U1, U2, TB, TV, V1, V2;
 
-    if( mbedtls_mpi_cmp_int( N, 1 ) <= 0 )
-        return( MBEDTLS_ERR_MPI_BAD_INPUT_DATA );
+    if (mbedtls_mpi_cmp_int(N, 1) <= 0)
+        return (MBEDTLS_ERR_MPI_BAD_INPUT_DATA);
 
-    mbedtls_mpi_init( &TA ); mbedtls_mpi_init( &TU ); mbedtls_mpi_init( &U1 ); mbedtls_mpi_init( &U2 );
-    mbedtls_mpi_init( &G ); mbedtls_mpi_init( &TB ); mbedtls_mpi_init( &TV );
-    mbedtls_mpi_init( &V1 ); mbedtls_mpi_init( &V2 );
+    mbedtls_mpi_init(&TA);
+    mbedtls_mpi_init(&TU);
+    mbedtls_mpi_init(&U1);
+    mbedtls_mpi_init(&U2);
+    mbedtls_mpi_init(&G);
+    mbedtls_mpi_init(&TB);
+    mbedtls_mpi_init(&TV);
+    mbedtls_mpi_init(&V1);
+    mbedtls_mpi_init(&V2);
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_gcd( &G, A, N ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_gcd(&G, A, N));
 
-    if( mbedtls_mpi_cmp_int( &G, 1 ) != 0 )
-    {
+    if (mbedtls_mpi_cmp_int(&G, 1) != 0) {
         ret = MBEDTLS_ERR_MPI_NOT_ACCEPTABLE;
         goto cleanup;
     }
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi( &TA, A, N ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &TU, &TA ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &TB, N ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &TV, N ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mod_mpi(&TA, A, N));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_copy(&TU, &TA));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_copy(&TB, N));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_copy(&TV, N));
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &U1, 1 ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &U2, 0 ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &V1, 0 ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &V2, 1 ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_lset(&U1, 1));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_lset(&U2, 0));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_lset(&V1, 0));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_lset(&V2, 1));
 
-    do
-    {
-        while( ( TU.p[0] & 1 ) == 0 )
-        {
-            MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &TU, 1 ) );
+    do {
+        while ((TU.p[0] & 1) == 0) {
+            MBEDTLS_MPI_CHK(mbedtls_mpi_shift_r(&TU, 1));
 
-            if( ( U1.p[0] & 1 ) != 0 || ( U2.p[0] & 1 ) != 0 )
-            {
-                MBEDTLS_MPI_CHK( mbedtls_mpi_add_mpi( &U1, &U1, &TB ) );
-                MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &U2, &U2, &TA ) );
+            if ((U1.p[0] & 1) != 0 || (U2.p[0] & 1) != 0) {
+                MBEDTLS_MPI_CHK(mbedtls_mpi_add_mpi(&U1, &U1, &TB));
+                MBEDTLS_MPI_CHK(mbedtls_mpi_sub_mpi(&U2, &U2, &TA));
             }
 
-            MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &U1, 1 ) );
-            MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &U2, 1 ) );
+            MBEDTLS_MPI_CHK(mbedtls_mpi_shift_r(&U1, 1));
+            MBEDTLS_MPI_CHK(mbedtls_mpi_shift_r(&U2, 1));
         }
 
-        while( ( TV.p[0] & 1 ) == 0 )
-        {
-            MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &TV, 1 ) );
+        while ((TV.p[0] & 1) == 0) {
+            MBEDTLS_MPI_CHK(mbedtls_mpi_shift_r(&TV, 1));
 
-            if( ( V1.p[0] & 1 ) != 0 || ( V2.p[0] & 1 ) != 0 )
-            {
-                MBEDTLS_MPI_CHK( mbedtls_mpi_add_mpi( &V1, &V1, &TB ) );
-                MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &V2, &V2, &TA ) );
+            if ((V1.p[0] & 1) != 0 || (V2.p[0] & 1) != 0) {
+                MBEDTLS_MPI_CHK(mbedtls_mpi_add_mpi(&V1, &V1, &TB));
+                MBEDTLS_MPI_CHK(mbedtls_mpi_sub_mpi(&V2, &V2, &TA));
             }
 
-            MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &V1, 1 ) );
-            MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &V2, 1 ) );
+            MBEDTLS_MPI_CHK(mbedtls_mpi_shift_r(&V1, 1));
+            MBEDTLS_MPI_CHK(mbedtls_mpi_shift_r(&V2, 1));
         }
 
-        if( mbedtls_mpi_cmp_mpi( &TU, &TV ) >= 0 )
-        {
-            MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &TU, &TU, &TV ) );
-            MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &U1, &U1, &V1 ) );
-            MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &U2, &U2, &V2 ) );
+        if (mbedtls_mpi_cmp_mpi(&TU, &TV) >= 0) {
+            MBEDTLS_MPI_CHK(mbedtls_mpi_sub_mpi(&TU, &TU, &TV));
+            MBEDTLS_MPI_CHK(mbedtls_mpi_sub_mpi(&U1, &U1, &V1));
+            MBEDTLS_MPI_CHK(mbedtls_mpi_sub_mpi(&U2, &U2, &V2));
+        } else {
+            MBEDTLS_MPI_CHK(mbedtls_mpi_sub_mpi(&TV, &TV, &TU));
+            MBEDTLS_MPI_CHK(mbedtls_mpi_sub_mpi(&V1, &V1, &U1));
+            MBEDTLS_MPI_CHK(mbedtls_mpi_sub_mpi(&V2, &V2, &U2));
         }
-        else
-        {
-            MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &TV, &TV, &TU ) );
-            MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &V1, &V1, &U1 ) );
-            MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &V2, &V2, &U2 ) );
-        }
-    }
-    while( mbedtls_mpi_cmp_int( &TU, 0 ) != 0 );
+    } while (mbedtls_mpi_cmp_int(&TU, 0) != 0);
 
-    while( mbedtls_mpi_cmp_int( &V1, 0 ) < 0 )
-        MBEDTLS_MPI_CHK( mbedtls_mpi_add_mpi( &V1, &V1, N ) );
+    while (mbedtls_mpi_cmp_int(&V1, 0) < 0)
+        MBEDTLS_MPI_CHK(mbedtls_mpi_add_mpi(&V1, &V1, N));
 
-    while( mbedtls_mpi_cmp_mpi( &V1, N ) >= 0 )
-        MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &V1, &V1, N ) );
+    while (mbedtls_mpi_cmp_mpi(&V1, N) >= 0)
+        MBEDTLS_MPI_CHK(mbedtls_mpi_sub_mpi(&V1, &V1, N));
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( X, &V1 ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_copy(X, &V1));
 
 cleanup:
 
-    mbedtls_mpi_free( &TA ); mbedtls_mpi_free( &TU ); mbedtls_mpi_free( &U1 ); mbedtls_mpi_free( &U2 );
-    mbedtls_mpi_free( &G ); mbedtls_mpi_free( &TB ); mbedtls_mpi_free( &TV );
-    mbedtls_mpi_free( &V1 ); mbedtls_mpi_free( &V2 );
+    mbedtls_mpi_free(&TA);
+    mbedtls_mpi_free(&TU);
+    mbedtls_mpi_free(&U1);
+    mbedtls_mpi_free(&U2);
+    mbedtls_mpi_free(&G);
+    mbedtls_mpi_free(&TB);
+    mbedtls_mpi_free(&TV);
+    mbedtls_mpi_free(&V1);
+    mbedtls_mpi_free(&V2);
 
-    return( ret );
+    return (ret);
 }
 
 #if defined(MBEDTLS_GENPRIME)
 
-static const int small_prime[] =
-{
-        3,    5,    7,   11,   13,   17,   19,   23,
-       29,   31,   37,   41,   43,   47,   53,   59,
-       61,   67,   71,   73,   79,   83,   89,   97,
-      101,  103,  107,  109,  113,  127,  131,  137,
-      139,  149,  151,  157,  163,  167,  173,  179,
-      181,  191,  193,  197,  199,  211,  223,  227,
-      229,  233,  239,  241,  251,  257,  263,  269,
-      271,  277,  281,  283,  293,  307,  311,  313,
-      317,  331,  337,  347,  349,  353,  359,  367,
-      373,  379,  383,  389,  397,  401,  409,  419,
-      421,  431,  433,  439,  443,  449,  457,  461,
-      463,  467,  479,  487,  491,  499,  503,  509,
-      521,  523,  541,  547,  557,  563,  569,  571,
-      577,  587,  593,  599,  601,  607,  613,  617,
-      619,  631,  641,  643,  647,  653,  659,  661,
-      673,  677,  683,  691,  701,  709,  719,  727,
-      733,  739,  743,  751,  757,  761,  769,  773,
-      787,  797,  809,  811,  821,  823,  827,  829,
-      839,  853,  857,  859,  863,  877,  881,  883,
-      887,  907,  911,  919,  929,  937,  941,  947,
-      953,  967,  971,  977,  983,  991,  997, -103
+static const int small_prime[] = {
+    3,    5,    7,   11,   13,   17,   19,   23,
+    29,   31,   37,   41,   43,   47,   53,   59,
+    61,   67,   71,   73,   79,   83,   89,   97,
+    101,  103,  107,  109,  113,  127,  131,  137,
+    139,  149,  151,  157,  163,  167,  173,  179,
+    181,  191,  193,  197,  199,  211,  223,  227,
+    229,  233,  239,  241,  251,  257,  263,  269,
+    271,  277,  281,  283,  293,  307,  311,  313,
+    317,  331,  337,  347,  349,  353,  359,  367,
+    373,  379,  383,  389,  397,  401,  409,  419,
+    421,  431,  433,  439,  443,  449,  457,  461,
+    463,  467,  479,  487,  491,  499,  503,  509,
+    521,  523,  541,  547,  557,  563,  569,  571,
+    577,  587,  593,  599,  601,  607,  613,  617,
+    619,  631,  641,  643,  647,  653,  659,  661,
+    673,  677,  683,  691,  701,  709,  719,  727,
+    733,  739,  743,  751,  757,  761,  769,  773,
+    787,  797,  809,  811,  821,  823,  827,  829,
+    839,  853,  857,  859,  863,  877,  881,  883,
+    887,  907,  911,  919,  929,  937,  941,  947,
+    953,  967,  971,  977,  983,  991,  997, -103
 };
 
 /*
@@ -2031,111 +1967,110 @@ static const int small_prime[] =
  * MBEDTLS_ERR_MPI_NOT_ACCEPTABLE: certain non-prime
  * other negative: error
  */
-static int mpi_check_small_factors( const mbedtls_mpi *X )
+static int mpi_check_small_factors(const mbedtls_mpi *X)
 {
     int ret = 0;
     size_t i;
     mbedtls_mpi_uint r;
 
-    if( ( X->p[0] & 1 ) == 0 )
-        return( MBEDTLS_ERR_MPI_NOT_ACCEPTABLE );
+    if ((X->p[0] & 1) == 0)
+        return (MBEDTLS_ERR_MPI_NOT_ACCEPTABLE);
 
-    for( i = 0; small_prime[i] > 0; i++ )
-    {
-        if( mbedtls_mpi_cmp_int( X, small_prime[i] ) <= 0 )
-            return( 1 );
+    for (i = 0; small_prime[i] > 0; i++) {
+        if (mbedtls_mpi_cmp_int(X, small_prime[i]) <= 0)
+            return (1);
 
-        MBEDTLS_MPI_CHK( mbedtls_mpi_mod_int( &r, X, small_prime[i] ) );
+        MBEDTLS_MPI_CHK(mbedtls_mpi_mod_int(&r, X, small_prime[i]));
 
-        if( r == 0 )
-            return( MBEDTLS_ERR_MPI_NOT_ACCEPTABLE );
+        if (r == 0)
+            return (MBEDTLS_ERR_MPI_NOT_ACCEPTABLE);
     }
 
 cleanup:
-    return( ret );
+    return (ret);
 }
 
 /*
  * Miller-Rabin pseudo-primality test  (HAC 4.24)
  */
-static int mpi_miller_rabin( const mbedtls_mpi *X,
-                             int (*f_rng)(void *, unsigned char *, size_t),
-                             void *p_rng )
+static int mpi_miller_rabin(const mbedtls_mpi *X,
+                            int (*f_rng)(void *, unsigned char *, size_t),
+                            void *p_rng)
 {
     int ret, count;
     size_t i, j, k, n, s;
     mbedtls_mpi W, R, T, A, RR;
 
-    mbedtls_mpi_init( &W ); mbedtls_mpi_init( &R ); mbedtls_mpi_init( &T ); mbedtls_mpi_init( &A );
-    mbedtls_mpi_init( &RR );
+    mbedtls_mpi_init(&W);
+    mbedtls_mpi_init(&R);
+    mbedtls_mpi_init(&T);
+    mbedtls_mpi_init(&A);
+    mbedtls_mpi_init(&RR);
 
     /*
      * W = |X| - 1
      * R = W >> lsb( W )
      */
-    MBEDTLS_MPI_CHK( mbedtls_mpi_sub_int( &W, X, 1 ) );
-    s = mbedtls_mpi_lsb( &W );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &R, &W ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &R, s ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_sub_int(&W, X, 1));
+    s = mbedtls_mpi_lsb(&W);
+    MBEDTLS_MPI_CHK(mbedtls_mpi_copy(&R, &W));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_shift_r(&R, s));
 
-    i = mbedtls_mpi_bitlen( X );
+    i = mbedtls_mpi_bitlen(X);
     /*
      * HAC, table 4.4
      */
-    n = ( ( i >= 1300 ) ?  2 : ( i >=  850 ) ?  3 :
-          ( i >=  650 ) ?  4 : ( i >=  350 ) ?  8 :
-          ( i >=  250 ) ? 12 : ( i >=  150 ) ? 18 : 27 );
+    n = ((i >= 1300) ?  2 : (i >=  850) ?  3 :
+         (i >=  650) ?  4 : (i >=  350) ?  8 :
+         (i >=  250) ? 12 : (i >=  150) ? 18 : 27);
 
-    for( i = 0; i < n; i++ )
-    {
+    for (i = 0; i < n; i++) {
         /*
          * pick a random A, 1 < A < |X| - 1
          */
-        MBEDTLS_MPI_CHK( mbedtls_mpi_fill_random( &A, X->n * ciL, f_rng, p_rng ) );
+        MBEDTLS_MPI_CHK(mbedtls_mpi_fill_random(&A, X->n * ciL, f_rng, p_rng));
 
-        if( mbedtls_mpi_cmp_mpi( &A, &W ) >= 0 )
-        {
-            j = mbedtls_mpi_bitlen( &A ) - mbedtls_mpi_bitlen( &W );
-            MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &A, j + 1 ) );
+        if (mbedtls_mpi_cmp_mpi(&A, &W) >= 0) {
+            j = mbedtls_mpi_bitlen(&A) - mbedtls_mpi_bitlen(&W);
+            MBEDTLS_MPI_CHK(mbedtls_mpi_shift_r(&A, j + 1));
         }
         A.p[0] |= 3;
 
         count = 0;
         do {
-            MBEDTLS_MPI_CHK( mbedtls_mpi_fill_random( &A, X->n * ciL, f_rng, p_rng ) );
+            MBEDTLS_MPI_CHK(mbedtls_mpi_fill_random(&A, X->n * ciL, f_rng, p_rng));
 
-            j = mbedtls_mpi_bitlen( &A );
-            k = mbedtls_mpi_bitlen( &W );
+            j = mbedtls_mpi_bitlen(&A);
+            k = mbedtls_mpi_bitlen(&W);
             if (j > k) {
-                MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &A, j - k ) );
+                MBEDTLS_MPI_CHK(mbedtls_mpi_shift_r(&A, j - k));
             }
 
             if (count++ > 30) {
                 return MBEDTLS_ERR_MPI_NOT_ACCEPTABLE;
             }
 
-        } while ( mbedtls_mpi_cmp_mpi( &A, &W ) >= 0 ||
-                  mbedtls_mpi_cmp_int( &A, 1 )  <= 0    );
+        } while (mbedtls_mpi_cmp_mpi(&A, &W) >= 0 ||
+                 mbedtls_mpi_cmp_int(&A, 1)  <= 0);
 
         /*
          * A = A^R mod |X|
          */
-        MBEDTLS_MPI_CHK( mbedtls_mpi_exp_mod( &A, &A, &R, X, &RR ) );
+        MBEDTLS_MPI_CHK(mbedtls_mpi_exp_mod(&A, &A, &R, X, &RR));
 
-        if( mbedtls_mpi_cmp_mpi( &A, &W ) == 0 ||
-            mbedtls_mpi_cmp_int( &A,  1 ) == 0 )
+        if (mbedtls_mpi_cmp_mpi(&A, &W) == 0 ||
+            mbedtls_mpi_cmp_int(&A,  1) == 0)
             continue;
 
         j = 1;
-        while( j < s && mbedtls_mpi_cmp_mpi( &A, &W ) != 0 )
-        {
+        while (j < s && mbedtls_mpi_cmp_mpi(&A, &W) != 0) {
             /*
              * A = A * A mod |X|
              */
-            MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &T, &A, &A ) );
-            MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi( &A, &T, X  ) );
+            MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&T, &A, &A));
+            MBEDTLS_MPI_CHK(mbedtls_mpi_mod_mpi(&A, &T, X));
 
-            if( mbedtls_mpi_cmp_int( &A, 1 ) == 0 )
+            if (mbedtls_mpi_cmp_int(&A, 1) == 0)
                 break;
 
             j++;
@@ -2144,27 +2079,29 @@ static int mpi_miller_rabin( const mbedtls_mpi *X,
         /*
          * not prime if A != |X| - 1 or A == 1
          */
-        if( mbedtls_mpi_cmp_mpi( &A, &W ) != 0 ||
-            mbedtls_mpi_cmp_int( &A,  1 ) == 0 )
-        {
+        if (mbedtls_mpi_cmp_mpi(&A, &W) != 0 ||
+            mbedtls_mpi_cmp_int(&A,  1) == 0) {
             ret = MBEDTLS_ERR_MPI_NOT_ACCEPTABLE;
             break;
         }
     }
 
 cleanup:
-    mbedtls_mpi_free( &W ); mbedtls_mpi_free( &R ); mbedtls_mpi_free( &T ); mbedtls_mpi_free( &A );
-    mbedtls_mpi_free( &RR );
+    mbedtls_mpi_free(&W);
+    mbedtls_mpi_free(&R);
+    mbedtls_mpi_free(&T);
+    mbedtls_mpi_free(&A);
+    mbedtls_mpi_free(&RR);
 
-    return( ret );
+    return (ret);
 }
 
 /*
  * Pseudo-primality test: small factors, then Miller-Rabin
  */
-int mbedtls_mpi_is_prime( const mbedtls_mpi *X,
-                  int (*f_rng)(void *, unsigned char *, size_t),
-                  void *p_rng )
+int mbedtls_mpi_is_prime(const mbedtls_mpi *X,
+                         int (*f_rng)(void *, unsigned char *, size_t),
+                         void *p_rng)
 {
     int ret;
     mbedtls_mpi XX;
@@ -2173,22 +2110,21 @@ int mbedtls_mpi_is_prime( const mbedtls_mpi *X,
     XX.n = X->n;
     XX.p = X->p;
 
-    if( mbedtls_mpi_cmp_int( &XX, 0 ) == 0 ||
-        mbedtls_mpi_cmp_int( &XX, 1 ) == 0 )
-        return( MBEDTLS_ERR_MPI_NOT_ACCEPTABLE );
+    if (mbedtls_mpi_cmp_int(&XX, 0) == 0 ||
+        mbedtls_mpi_cmp_int(&XX, 1) == 0)
+        return (MBEDTLS_ERR_MPI_NOT_ACCEPTABLE);
 
-    if( mbedtls_mpi_cmp_int( &XX, 2 ) == 0 )
-        return( 0 );
+    if (mbedtls_mpi_cmp_int(&XX, 2) == 0)
+        return (0);
 
-    if( ( ret = mpi_check_small_factors( &XX ) ) != 0 )
-    {
-        if( ret == 1 )
-            return( 0 );
+    if ((ret = mpi_check_small_factors(&XX)) != 0) {
+        if (ret == 1)
+            return (0);
 
-        return( ret );
+        return (ret);
     }
 
-    return( mpi_miller_rabin( &XX, f_rng, p_rng ) );
+    return (mpi_miller_rabin(&XX, f_rng, p_rng));
 }
 
 /*
@@ -2198,9 +2134,9 @@ int mbedtls_mpi_is_prime( const mbedtls_mpi *X,
  * follows the RSA probably-prime generation method of FIPS 186-4.
  * NB. FIPS 186-4 only allows the specific bit lengths of 1024 and 1536.
  */
-int mbedtls_mpi_gen_prime( mbedtls_mpi *X, size_t nbits, int dh_flag,
-                   int (*f_rng)(void *, unsigned char *, size_t),
-                   void *p_rng )
+int mbedtls_mpi_gen_prime(mbedtls_mpi *X, size_t nbits, int dh_flag,
+                          int (*f_rng)(void *, unsigned char *, size_t),
+                          void *p_rng)
 {
 #ifdef MBEDTLS_HAVE_INT64
 // ceil(2^63.5)
@@ -2214,32 +2150,28 @@ int mbedtls_mpi_gen_prime( mbedtls_mpi *X, size_t nbits, int dh_flag,
     mbedtls_mpi_uint r;
     mbedtls_mpi Y;
 
-    if( nbits < 3 || nbits > MBEDTLS_MPI_MAX_BITS )
-        return( MBEDTLS_ERR_MPI_BAD_INPUT_DATA );
+    if (nbits < 3 || nbits > MBEDTLS_MPI_MAX_BITS)
+        return (MBEDTLS_ERR_MPI_BAD_INPUT_DATA);
 
-    mbedtls_mpi_init( &Y );
+    mbedtls_mpi_init(&Y);
 
-    n = BITS_TO_LIMBS( nbits );
+    n = BITS_TO_LIMBS(nbits);
 
-    while( 1 )
-    {
-        MBEDTLS_MPI_CHK( mbedtls_mpi_fill_random( X, n * ciL, f_rng, p_rng ) );
+    while (1) {
+        MBEDTLS_MPI_CHK(mbedtls_mpi_fill_random(X, n * ciL, f_rng, p_rng));
         /* make sure generated number is at least (nbits-1)+0.5 bits (FIPS 186-4 §B.3.3 steps 4.4, 5.5) */
-        if( X->p[n-1] < CEIL_MAXUINT_DIV_SQRT2 ) continue;
+        if (X->p[n - 1] < CEIL_MAXUINT_DIV_SQRT2) continue;
 
         k = n * biL;
-        if( k > nbits ) MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( X, k - nbits ) );
+        if (k > nbits) MBEDTLS_MPI_CHK(mbedtls_mpi_shift_r(X, k - nbits));
         X->p[0] |= 1;
 
-        if( dh_flag == 0 )
-        {
-            ret = mbedtls_mpi_is_prime( X, f_rng, p_rng );
+        if (dh_flag == 0) {
+            ret = mbedtls_mpi_is_prime(X, f_rng, p_rng);
 
-            if( ret != MBEDTLS_ERR_MPI_NOT_ACCEPTABLE )
+            if (ret != MBEDTLS_ERR_MPI_NOT_ACCEPTABLE)
                 goto cleanup;
-        }
-        else
-        {
+        } else {
             /*
              * An necessary condition for Y and X = 2Y + 1 to be prime
              * is X = 2 mod 3 (which is equivalent to Y = 2 mod 3).
@@ -2248,29 +2180,28 @@ int mbedtls_mpi_gen_prime( mbedtls_mpi *X, size_t nbits, int dh_flag,
 
             X->p[0] |= 2;
 
-            MBEDTLS_MPI_CHK( mbedtls_mpi_mod_int( &r, X, 3 ) );
-            if( r == 0 )
-                MBEDTLS_MPI_CHK( mbedtls_mpi_add_int( X, X, 8 ) );
-            else if( r == 1 )
-                MBEDTLS_MPI_CHK( mbedtls_mpi_add_int( X, X, 4 ) );
+            MBEDTLS_MPI_CHK(mbedtls_mpi_mod_int(&r, X, 3));
+            if (r == 0)
+                MBEDTLS_MPI_CHK(mbedtls_mpi_add_int(X, X, 8));
+            else if (r == 1)
+                MBEDTLS_MPI_CHK(mbedtls_mpi_add_int(X, X, 4));
 
             /* Set Y = (X-1) / 2, which is X / 2 because X is odd */
-            MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &Y, X ) );
-            MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &Y, 1 ) );
+            MBEDTLS_MPI_CHK(mbedtls_mpi_copy(&Y, X));
+            MBEDTLS_MPI_CHK(mbedtls_mpi_shift_r(&Y, 1));
 
-            while( 1 )
-            {
+            while (1) {
                 /*
                  * First, check small factors for X and Y
                  * before doing Miller-Rabin on any of them
                  */
-                if( ( ret = mpi_check_small_factors(  X         ) ) == 0 &&
-                    ( ret = mpi_check_small_factors( &Y         ) ) == 0 &&
-                    ( ret = mpi_miller_rabin(  X, f_rng, p_rng  ) ) == 0 &&
-                    ( ret = mpi_miller_rabin( &Y, f_rng, p_rng  ) ) == 0 )
+                if ((ret = mpi_check_small_factors(X)) == 0 &&
+                    (ret = mpi_check_small_factors(&Y)) == 0 &&
+                    (ret = mpi_miller_rabin(X, f_rng, p_rng)) == 0 &&
+                    (ret = mpi_miller_rabin(&Y, f_rng, p_rng)) == 0)
                     goto cleanup;
 
-                if( ret != MBEDTLS_ERR_MPI_NOT_ACCEPTABLE )
+                if (ret != MBEDTLS_ERR_MPI_NOT_ACCEPTABLE)
                     goto cleanup;
 
                 /*
@@ -2278,17 +2209,17 @@ int mbedtls_mpi_gen_prime( mbedtls_mpi *X, size_t nbits, int dh_flag,
                  * Y = 1 mod 2 and Y = 2 mod 3 (eq X = 3 mod 4 and X = 2 mod 3)
                  * so up Y by 6 and X by 12.
                  */
-                MBEDTLS_MPI_CHK( mbedtls_mpi_add_int(  X,  X, 12 ) );
-                MBEDTLS_MPI_CHK( mbedtls_mpi_add_int( &Y, &Y, 6  ) );
+                MBEDTLS_MPI_CHK(mbedtls_mpi_add_int(X,  X, 12));
+                MBEDTLS_MPI_CHK(mbedtls_mpi_add_int(&Y, &Y, 6));
             }
         }
     }
 
 cleanup:
 
-    mbedtls_mpi_free( &Y );
+    mbedtls_mpi_free(&Y);
 
-    return( ret );
+    return (ret);
 }
 
 #endif /* MBEDTLS_GENPRIME */
@@ -2297,8 +2228,7 @@ cleanup:
 
 #define GCD_PAIR_COUNT  3
 
-static const int gcd_pairs[GCD_PAIR_COUNT][3] =
-{
+static const int gcd_pairs[GCD_PAIR_COUNT][3] = {
     { 693, 609, 21 },
     { 1764, 868, 28 },
     { 768454923, 542167814, 1 }
@@ -2307,162 +2237,166 @@ static const int gcd_pairs[GCD_PAIR_COUNT][3] =
 /*
  * Checkup routine
  */
-int mbedtls_mpi_self_test( int verbose )
+int mbedtls_mpi_self_test(int verbose)
 {
     int ret, i;
     mbedtls_mpi A, E, N, X, Y, U, V;
 
-    mbedtls_mpi_init( &A ); mbedtls_mpi_init( &E ); mbedtls_mpi_init( &N ); mbedtls_mpi_init( &X );
-    mbedtls_mpi_init( &Y ); mbedtls_mpi_init( &U ); mbedtls_mpi_init( &V );
+    mbedtls_mpi_init(&A);
+    mbedtls_mpi_init(&E);
+    mbedtls_mpi_init(&N);
+    mbedtls_mpi_init(&X);
+    mbedtls_mpi_init(&Y);
+    mbedtls_mpi_init(&U);
+    mbedtls_mpi_init(&V);
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_read_string( &A, 16,
-        "EFE021C2645FD1DC586E69184AF4A31E" \
-        "D5F53E93B5F123FA41680867BA110131" \
-        "944FE7952E2517337780CB0DB80E61AA" \
-        "E7C8DDC6C5C6AADEB34EB38A2F40D5E6" ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_read_string(&A, 16,
+                                            "EFE021C2645FD1DC586E69184AF4A31E" \
+                                            "D5F53E93B5F123FA41680867BA110131" \
+                                            "944FE7952E2517337780CB0DB80E61AA" \
+                                            "E7C8DDC6C5C6AADEB34EB38A2F40D5E6"));
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_read_string( &E, 16,
-        "B2E7EFD37075B9F03FF989C7C5051C20" \
-        "34D2A323810251127E7BF8625A4F49A5" \
-        "F3E27F4DA8BD59C47D6DAABA4C8127BD" \
-        "5B5C25763222FEFCCFC38B832366C29E" ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_read_string(&E, 16,
+                                            "B2E7EFD37075B9F03FF989C7C5051C20" \
+                                            "34D2A323810251127E7BF8625A4F49A5" \
+                                            "F3E27F4DA8BD59C47D6DAABA4C8127BD" \
+                                            "5B5C25763222FEFCCFC38B832366C29E"));
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_read_string( &N, 16,
-        "0066A198186C18C10B2F5ED9B522752A" \
-        "9830B69916E535C8F047518A889A43A5" \
-        "94B6BED27A168D31D4A52F88925AA8F5" ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_read_string(&N, 16,
+                                            "0066A198186C18C10B2F5ED9B522752A" \
+                                            "9830B69916E535C8F047518A889A43A5" \
+                                            "94B6BED27A168D31D4A52F88925AA8F5"));
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &X, &A, &N ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&X, &A, &N));
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_read_string( &U, 16,
-        "602AB7ECA597A3D6B56FF9829A5E8B85" \
-        "9E857EA95A03512E2BAE7391688D264A" \
-        "A5663B0341DB9CCFD2C4C5F421FEC814" \
-        "8001B72E848A38CAE1C65F78E56ABDEF" \
-        "E12D3C039B8A02D6BE593F0BBBDA56F1" \
-        "ECF677152EF804370C1A305CAF3B5BF1" \
-        "30879B56C61DE584A0F53A2447A51E" ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_read_string(&U, 16,
+                                            "602AB7ECA597A3D6B56FF9829A5E8B85" \
+                                            "9E857EA95A03512E2BAE7391688D264A" \
+                                            "A5663B0341DB9CCFD2C4C5F421FEC814" \
+                                            "8001B72E848A38CAE1C65F78E56ABDEF" \
+                                            "E12D3C039B8A02D6BE593F0BBBDA56F1" \
+                                            "ECF677152EF804370C1A305CAF3B5BF1" \
+                                            "30879B56C61DE584A0F53A2447A51E"));
 
-    if( verbose != 0 )
-        mbedtls_printf( "  MPI test #1 (mul_mpi): " );
+    if (verbose != 0)
+        mbedtls_printf("  MPI test #1 (mul_mpi): ");
 
-    if( mbedtls_mpi_cmp_mpi( &X, &U ) != 0 )
-    {
-        if( verbose != 0 )
-            mbedtls_printf( "failed\n" );
+    if (mbedtls_mpi_cmp_mpi(&X, &U) != 0) {
+        if (verbose != 0)
+            mbedtls_printf("failed\n");
 
         ret = 1;
         goto cleanup;
     }
 
-    if( verbose != 0 )
-        mbedtls_printf( "passed\n" );
+    if (verbose != 0)
+        mbedtls_printf("passed\n");
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_div_mpi( &X, &Y, &A, &N ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_div_mpi(&X, &Y, &A, &N));
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_read_string( &U, 16,
-        "256567336059E52CAE22925474705F39A94" ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_read_string(&U, 16,
+                                            "256567336059E52CAE22925474705F39A94"));
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_read_string( &V, 16,
-        "6613F26162223DF488E9CD48CC132C7A" \
-        "0AC93C701B001B092E4E5B9F73BCD27B" \
-        "9EE50D0657C77F374E903CDFA4C642" ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_read_string(&V, 16,
+                                            "6613F26162223DF488E9CD48CC132C7A" \
+                                            "0AC93C701B001B092E4E5B9F73BCD27B" \
+                                            "9EE50D0657C77F374E903CDFA4C642"));
 
-    if( verbose != 0 )
-        mbedtls_printf( "  MPI test #2 (div_mpi): " );
+    if (verbose != 0)
+        mbedtls_printf("  MPI test #2 (div_mpi): ");
 
-    if( mbedtls_mpi_cmp_mpi( &X, &U ) != 0 ||
-        mbedtls_mpi_cmp_mpi( &Y, &V ) != 0 )
-    {
-        if( verbose != 0 )
-            mbedtls_printf( "failed\n" );
+    if (mbedtls_mpi_cmp_mpi(&X, &U) != 0 ||
+        mbedtls_mpi_cmp_mpi(&Y, &V) != 0) {
+        if (verbose != 0)
+            mbedtls_printf("failed\n");
 
         ret = 1;
         goto cleanup;
     }
 
-    if( verbose != 0 )
-        mbedtls_printf( "passed\n" );
+    if (verbose != 0)
+        mbedtls_printf("passed\n");
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_exp_mod( &X, &A, &E, &N, NULL ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_exp_mod(&X, &A, &E, &N, NULL));
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_read_string( &U, 16,
-        "36E139AEA55215609D2816998ED020BB" \
-        "BD96C37890F65171D948E9BC7CBAA4D9" \
-        "325D24D6A3C12710F10A09FA08AB87" ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_read_string(&U, 16,
+                                            "36E139AEA55215609D2816998ED020BB" \
+                                            "BD96C37890F65171D948E9BC7CBAA4D9" \
+                                            "325D24D6A3C12710F10A09FA08AB87"));
 
-    if( verbose != 0 )
-        mbedtls_printf( "  MPI test #3 (exp_mod): " );
+    if (verbose != 0)
+        mbedtls_printf("  MPI test #3 (exp_mod): ");
 
-    if( mbedtls_mpi_cmp_mpi( &X, &U ) != 0 )
-    {
-        if( verbose != 0 )
-            mbedtls_printf( "failed\n" );
+    if (mbedtls_mpi_cmp_mpi(&X, &U) != 0) {
+        if (verbose != 0)
+            mbedtls_printf("failed\n");
 
         ret = 1;
         goto cleanup;
     }
 
-    if( verbose != 0 )
-        mbedtls_printf( "passed\n" );
+    if (verbose != 0)
+        mbedtls_printf("passed\n");
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_inv_mod( &X, &A, &N ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_inv_mod(&X, &A, &N));
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_read_string( &U, 16,
-        "003A0AAEDD7E784FC07D8F9EC6E3BFD5" \
-        "C3DBA76456363A10869622EAC2DD84EC" \
-        "C5B8A74DAC4D09E03B5E0BE779F2DF61" ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_read_string(&U, 16,
+                                            "003A0AAEDD7E784FC07D8F9EC6E3BFD5" \
+                                            "C3DBA76456363A10869622EAC2DD84EC" \
+                                            "C5B8A74DAC4D09E03B5E0BE779F2DF61"));
 
-    if( verbose != 0 )
-        mbedtls_printf( "  MPI test #4 (inv_mod): " );
+    if (verbose != 0)
+        mbedtls_printf("  MPI test #4 (inv_mod): ");
 
-    if( mbedtls_mpi_cmp_mpi( &X, &U ) != 0 )
-    {
-        if( verbose != 0 )
-            mbedtls_printf( "failed\n" );
+    if (mbedtls_mpi_cmp_mpi(&X, &U) != 0) {
+        if (verbose != 0)
+            mbedtls_printf("failed\n");
 
         ret = 1;
         goto cleanup;
     }
 
-    if( verbose != 0 )
-        mbedtls_printf( "passed\n" );
+    if (verbose != 0)
+        mbedtls_printf("passed\n");
 
-    if( verbose != 0 )
-        mbedtls_printf( "  MPI test #5 (simple gcd): " );
+    if (verbose != 0)
+        mbedtls_printf("  MPI test #5 (simple gcd): ");
 
-    for( i = 0; i < GCD_PAIR_COUNT; i++ )
-    {
-        MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &X, gcd_pairs[i][0] ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &Y, gcd_pairs[i][1] ) );
+    for (i = 0; i < GCD_PAIR_COUNT; i++) {
+        MBEDTLS_MPI_CHK(mbedtls_mpi_lset(&X, gcd_pairs[i][0]));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_lset(&Y, gcd_pairs[i][1]));
 
-        MBEDTLS_MPI_CHK( mbedtls_mpi_gcd( &A, &X, &Y ) );
+        MBEDTLS_MPI_CHK(mbedtls_mpi_gcd(&A, &X, &Y));
 
-        if( mbedtls_mpi_cmp_int( &A, gcd_pairs[i][2] ) != 0 )
-        {
-            if( verbose != 0 )
-                mbedtls_printf( "failed at %d\n", i );
+        if (mbedtls_mpi_cmp_int(&A, gcd_pairs[i][2]) != 0) {
+            if (verbose != 0)
+                mbedtls_printf("failed at %d\n", i);
 
             ret = 1;
             goto cleanup;
         }
     }
 
-    if( verbose != 0 )
-        mbedtls_printf( "passed\n" );
+    if (verbose != 0)
+        mbedtls_printf("passed\n");
 
 cleanup:
 
-    if( ret != 0 && verbose != 0 )
-        mbedtls_printf( "Unexpected error, return code = %08X\n", ret );
+    if (ret != 0 && verbose != 0)
+        mbedtls_printf("Unexpected error, return code = %08X\n", ret);
 
-    mbedtls_mpi_free( &A ); mbedtls_mpi_free( &E ); mbedtls_mpi_free( &N ); mbedtls_mpi_free( &X );
-    mbedtls_mpi_free( &Y ); mbedtls_mpi_free( &U ); mbedtls_mpi_free( &V );
+    mbedtls_mpi_free(&A);
+    mbedtls_mpi_free(&E);
+    mbedtls_mpi_free(&N);
+    mbedtls_mpi_free(&X);
+    mbedtls_mpi_free(&Y);
+    mbedtls_mpi_free(&U);
+    mbedtls_mpi_free(&V);
 
-    if( verbose != 0 )
-        mbedtls_printf( "\n" );
+    if (verbose != 0)
+        mbedtls_printf("\n");
 
-    return( ret );
+    return (ret);
 }
 
 #endif /* MBEDTLS_SELF_TEST */
diff --git a/common/mbedtls/bignum.h b/common/mbedtls/bignum.h
index 00787908c..d7319c99c 100644
--- a/common/mbedtls/bignum.h
+++ b/common/mbedtls/bignum.h
@@ -114,62 +114,62 @@
  * disabled by defining MBEDTLS_NO_UDBL_DIVISION.
  */
 #if !defined(MBEDTLS_HAVE_INT32)
-    #if defined(_MSC_VER) && defined(_M_AMD64)
-        /* Always choose 64-bit when using MSC */
-        #if !defined(MBEDTLS_HAVE_INT64)
-            #define MBEDTLS_HAVE_INT64
-        #endif /* !MBEDTLS_HAVE_INT64 */
-        typedef  int64_t mbedtls_mpi_sint;
-        typedef uint64_t mbedtls_mpi_uint;
-    #elif defined(__GNUC__) && (                         \
+#if defined(_MSC_VER) && defined(_M_AMD64)
+/* Always choose 64-bit when using MSC */
+#if !defined(MBEDTLS_HAVE_INT64)
+#define MBEDTLS_HAVE_INT64
+#endif /* !MBEDTLS_HAVE_INT64 */
+typedef  int64_t mbedtls_mpi_sint;
+typedef uint64_t mbedtls_mpi_uint;
+#elif defined(__GNUC__) && (                         \
         defined(__amd64__) || defined(__x86_64__)     || \
         defined(__ppc64__) || defined(__powerpc64__)  || \
         defined(__ia64__)  || defined(__alpha__)      || \
         ( defined(__sparc__) && defined(__arch64__) ) || \
         defined(__s390x__) || defined(__mips64) )
-        #if !defined(MBEDTLS_HAVE_INT64)
-            #define MBEDTLS_HAVE_INT64
-        #endif /* MBEDTLS_HAVE_INT64 */
-        typedef  int64_t mbedtls_mpi_sint;
-        typedef uint64_t mbedtls_mpi_uint;
-        #if !defined(MBEDTLS_NO_UDBL_DIVISION)
-            /* mbedtls_t_udbl defined as 128-bit unsigned int */
-            typedef unsigned int mbedtls_t_udbl __attribute__((mode(TI)));
-            #define MBEDTLS_HAVE_UDBL
-        #endif /* !MBEDTLS_NO_UDBL_DIVISION */
-    #elif defined(__ARMCC_VERSION) && defined(__aarch64__)
-        /*
-         * __ARMCC_VERSION is defined for both armcc and armclang and
-         * __aarch64__ is only defined by armclang when compiling 64-bit code
-         */
-        #if !defined(MBEDTLS_HAVE_INT64)
-            #define MBEDTLS_HAVE_INT64
-        #endif /* !MBEDTLS_HAVE_INT64 */
-        typedef  int64_t mbedtls_mpi_sint;
-        typedef uint64_t mbedtls_mpi_uint;
-        #if !defined(MBEDTLS_NO_UDBL_DIVISION)
-            /* mbedtls_t_udbl defined as 128-bit unsigned int */
-            typedef __uint128_t mbedtls_t_udbl;
-            #define MBEDTLS_HAVE_UDBL
-        #endif /* !MBEDTLS_NO_UDBL_DIVISION */
-    #elif defined(MBEDTLS_HAVE_INT64)
-        /* Force 64-bit integers with unknown compiler */
-        typedef  int64_t mbedtls_mpi_sint;
-        typedef uint64_t mbedtls_mpi_uint;
-    #endif
+#if !defined(MBEDTLS_HAVE_INT64)
+#define MBEDTLS_HAVE_INT64
+#endif /* MBEDTLS_HAVE_INT64 */
+typedef  int64_t mbedtls_mpi_sint;
+typedef uint64_t mbedtls_mpi_uint;
+#if !defined(MBEDTLS_NO_UDBL_DIVISION)
+/* mbedtls_t_udbl defined as 128-bit unsigned int */
+typedef unsigned int mbedtls_t_udbl __attribute__((mode(TI)));
+#define MBEDTLS_HAVE_UDBL
+#endif /* !MBEDTLS_NO_UDBL_DIVISION */
+#elif defined(__ARMCC_VERSION) && defined(__aarch64__)
+/*
+ * __ARMCC_VERSION is defined for both armcc and armclang and
+ * __aarch64__ is only defined by armclang when compiling 64-bit code
+ */
+#if !defined(MBEDTLS_HAVE_INT64)
+#define MBEDTLS_HAVE_INT64
+#endif /* !MBEDTLS_HAVE_INT64 */
+typedef  int64_t mbedtls_mpi_sint;
+typedef uint64_t mbedtls_mpi_uint;
+#if !defined(MBEDTLS_NO_UDBL_DIVISION)
+/* mbedtls_t_udbl defined as 128-bit unsigned int */
+typedef __uint128_t mbedtls_t_udbl;
+#define MBEDTLS_HAVE_UDBL
+#endif /* !MBEDTLS_NO_UDBL_DIVISION */
+#elif defined(MBEDTLS_HAVE_INT64)
+/* Force 64-bit integers with unknown compiler */
+typedef  int64_t mbedtls_mpi_sint;
+typedef uint64_t mbedtls_mpi_uint;
+#endif
 #endif /* !MBEDTLS_HAVE_INT32 */
 
 #if !defined(MBEDTLS_HAVE_INT64)
-    /* Default to 32-bit compilation */
-    #if !defined(MBEDTLS_HAVE_INT32)
-        #define MBEDTLS_HAVE_INT32
-    #endif /* !MBEDTLS_HAVE_INT32 */
-    typedef  int32_t mbedtls_mpi_sint;
-    typedef uint32_t mbedtls_mpi_uint;
-    #if !defined(MBEDTLS_NO_UDBL_DIVISION)
-        typedef uint64_t mbedtls_t_udbl;
-        #define MBEDTLS_HAVE_UDBL
-    #endif /* !MBEDTLS_NO_UDBL_DIVISION */
+/* Default to 32-bit compilation */
+#if !defined(MBEDTLS_HAVE_INT32)
+#define MBEDTLS_HAVE_INT32
+#endif /* !MBEDTLS_HAVE_INT32 */
+typedef  int32_t mbedtls_mpi_sint;
+typedef uint32_t mbedtls_mpi_uint;
+#if !defined(MBEDTLS_NO_UDBL_DIVISION)
+typedef uint64_t mbedtls_t_udbl;
+#define MBEDTLS_HAVE_UDBL
+#endif /* !MBEDTLS_NO_UDBL_DIVISION */
 #endif /* !MBEDTLS_HAVE_INT64 */
 
 #ifdef __cplusplus
@@ -179,8 +179,7 @@ extern "C" {
 /**
  * \brief          MPI structure
  */
-typedef struct mbedtls_mpi
-{
+typedef struct mbedtls_mpi {
     int s;              /*!<  integer sign      */
     size_t n;           /*!<  total # of limbs  */
     mbedtls_mpi_uint *p;          /*!<  pointer to limbs  */
@@ -194,14 +193,14 @@ mbedtls_mpi;
  *
  * \param X         One MPI to initialize.
  */
-void mbedtls_mpi_init( mbedtls_mpi *X );
+void mbedtls_mpi_init(mbedtls_mpi *X);
 
 /**
  * \brief          Unallocate one MPI
  *
  * \param X        One MPI to unallocate.
  */
-void mbedtls_mpi_free( mbedtls_mpi *X );
+void mbedtls_mpi_free(mbedtls_mpi *X);
 
 /**
  * \brief          Enlarge to the specified number of limbs
@@ -214,7 +213,7 @@ void mbedtls_mpi_free( mbedtls_mpi *X );
  * \return         0 if successful,
  *                 MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed
  */
-int mbedtls_mpi_grow( mbedtls_mpi *X, size_t nblimbs );
+int mbedtls_mpi_grow(mbedtls_mpi *X, size_t nblimbs);
 
 /**
  * \brief          Resize down, keeping at least the specified number of limbs
@@ -229,7 +228,7 @@ int mbedtls_mpi_grow( mbedtls_mpi *X, size_t nblimbs );
  *                 MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed
  *                 (this can only happen when resizing up).
  */
-int mbedtls_mpi_shrink( mbedtls_mpi *X, size_t nblimbs );
+int mbedtls_mpi_shrink(mbedtls_mpi *X, size_t nblimbs);
 
 /**
  * \brief          Copy the contents of Y into X
@@ -240,7 +239,7 @@ int mbedtls_mpi_shrink( mbedtls_mpi *X, size_t nblimbs );
  * \return         0 if successful,
  *                 MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed
  */
-int mbedtls_mpi_copy( mbedtls_mpi *X, const mbedtls_mpi *Y );
+int mbedtls_mpi_copy(mbedtls_mpi *X, const mbedtls_mpi *Y);
 
 /**
  * \brief          Swap the contents of X and Y
@@ -248,7 +247,7 @@ int mbedtls_mpi_copy( mbedtls_mpi *X, const mbedtls_mpi *Y );
  * \param X        First MPI value
  * \param Y        Second MPI value
  */
-void mbedtls_mpi_swap( mbedtls_mpi *X, mbedtls_mpi *Y );
+void mbedtls_mpi_swap(mbedtls_mpi *X, mbedtls_mpi *Y);
 
 /**
  * \brief          Safe conditional assignement X = Y if assign is 1
@@ -267,7 +266,7 @@ void mbedtls_mpi_swap( mbedtls_mpi *X, mbedtls_mpi *Y );
  *                 information through branch prediction and/or memory access
  *                 patterns analysis).
  */
-int mbedtls_mpi_safe_cond_assign( mbedtls_mpi *X, const mbedtls_mpi *Y, unsigned char assign );
+int mbedtls_mpi_safe_cond_assign(mbedtls_mpi *X, const mbedtls_mpi *Y, unsigned char assign);
 
 /**
  * \brief          Safe conditional swap X <-> Y if swap is 1
@@ -286,7 +285,7 @@ int mbedtls_mpi_safe_cond_assign( mbedtls_mpi *X, const mbedtls_mpi *Y, unsigned
  *                 information through branch prediction and/or memory access
  *                 patterns analysis).
  */
-int mbedtls_mpi_safe_cond_swap( mbedtls_mpi *X, mbedtls_mpi *Y, unsigned char assign );
+int mbedtls_mpi_safe_cond_swap(mbedtls_mpi *X, mbedtls_mpi *Y, unsigned char assign);
 
 /**
  * \brief          Set value from integer
@@ -297,7 +296,7 @@ int mbedtls_mpi_safe_cond_swap( mbedtls_mpi *X, mbedtls_mpi *Y, unsigned char as
  * \return         0 if successful,
  *                 MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed
  */
-int mbedtls_mpi_lset( mbedtls_mpi *X, mbedtls_mpi_sint z );
+int mbedtls_mpi_lset(mbedtls_mpi *X, mbedtls_mpi_sint z);
 
 /**
  * \brief          Get a specific bit from X
@@ -307,7 +306,7 @@ int mbedtls_mpi_lset( mbedtls_mpi *X, mbedtls_mpi_sint z );
  *
  * \return         Either a 0 or a 1
  */
-int mbedtls_mpi_get_bit( const mbedtls_mpi *X, size_t pos );
+int mbedtls_mpi_get_bit(const mbedtls_mpi *X, size_t pos);
 
 /**
  * \brief          Set a bit of X to a specific value of 0 or 1
@@ -323,7 +322,7 @@ int mbedtls_mpi_get_bit( const mbedtls_mpi *X, size_t pos );
  *                 MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed,
  *                 MBEDTLS_ERR_MPI_BAD_INPUT_DATA if val is not 0 or 1
  */
-int mbedtls_mpi_set_bit( mbedtls_mpi *X, size_t pos, unsigned char val );
+int mbedtls_mpi_set_bit(mbedtls_mpi *X, size_t pos, unsigned char val);
 
 /**
  * \brief          Return the number of zero-bits before the least significant
@@ -333,7 +332,7 @@ int mbedtls_mpi_set_bit( mbedtls_mpi *X, size_t pos, unsigned char val );
  *
  * \param X        MPI to use
  */
-size_t mbedtls_mpi_lsb( const mbedtls_mpi *X );
+size_t mbedtls_mpi_lsb(const mbedtls_mpi *X);
 
 /**
  * \brief          Return the number of bits up to and including the most
@@ -343,14 +342,14 @@ size_t mbedtls_mpi_lsb( const mbedtls_mpi *X );
  *
  * \param X        MPI to use
  */
-size_t mbedtls_mpi_bitlen( const mbedtls_mpi *X );
+size_t mbedtls_mpi_bitlen(const mbedtls_mpi *X);
 
 /**
  * \brief          Return the total size in bytes
  *
  * \param X        MPI to use
  */
-size_t mbedtls_mpi_size( const mbedtls_mpi *X );
+size_t mbedtls_mpi_size(const mbedtls_mpi *X);
 
 /**
  * \brief          Import from an ASCII string
@@ -361,7 +360,7 @@ size_t mbedtls_mpi_size( const mbedtls_mpi *X );
  *
  * \return         0 if successful, or a MBEDTLS_ERR_MPI_XXX error code
  */
-int mbedtls_mpi_read_string( mbedtls_mpi *X, int radix, const char *s );
+int mbedtls_mpi_read_string(mbedtls_mpi *X, int radix, const char *s);
 
 /**
  * \brief          Export into an ASCII string
@@ -379,8 +378,8 @@ int mbedtls_mpi_read_string( mbedtls_mpi *X, int radix, const char *s );
  * \note           Call this function with buflen = 0 to obtain the
  *                 minimum required buffer size in *olen.
  */
-int mbedtls_mpi_write_string( const mbedtls_mpi *X, int radix,
-                              char *buf, size_t buflen, size_t *olen );
+int mbedtls_mpi_write_string(const mbedtls_mpi *X, int radix,
+                             char *buf, size_t buflen, size_t *olen);
 
 #if defined(MBEDTLS_FS_IO)
 /**
@@ -403,7 +402,7 @@ int mbedtls_mpi_write_string( const mbedtls_mpi *X, int radix,
  *                 '0x' prefix for radix 16.
  *
  */
-int mbedtls_mpi_read_file( mbedtls_mpi *X, int radix, FILE *fin );
+int mbedtls_mpi_read_file(mbedtls_mpi *X, int radix, FILE *fin);
 
 /**
  * \brief          Write X into an opened file, or stdout if fout is NULL
@@ -417,7 +416,7 @@ int mbedtls_mpi_read_file( mbedtls_mpi *X, int radix, FILE *fin );
  *
  * \note           Set fout == NULL to print X on the console.
  */
-int mbedtls_mpi_write_file( const char *p, const mbedtls_mpi *X, int radix, FILE *fout );
+int mbedtls_mpi_write_file(const char *p, const mbedtls_mpi *X, int radix, FILE *fout);
 #endif /* MBEDTLS_FS_IO */
 
 /**
@@ -430,7 +429,7 @@ int mbedtls_mpi_write_file( const char *p, const mbedtls_mpi *X, int radix, FILE
  * \return         0 if successful,
  *                 MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed
  */
-int mbedtls_mpi_read_binary( mbedtls_mpi *X, const unsigned char *buf, size_t buflen );
+int mbedtls_mpi_read_binary(mbedtls_mpi *X, const unsigned char *buf, size_t buflen);
 
 /**
  * \brief          Export X into unsigned binary data, big endian.
@@ -444,7 +443,7 @@ int mbedtls_mpi_read_binary( mbedtls_mpi *X, const unsigned char *buf, size_t bu
  * \return         0 if successful,
  *                 MBEDTLS_ERR_MPI_BUFFER_TOO_SMALL if buf isn't large enough
  */
-int mbedtls_mpi_write_binary( const mbedtls_mpi *X, unsigned char *buf, size_t buflen );
+int mbedtls_mpi_write_binary(const mbedtls_mpi *X, unsigned char *buf, size_t buflen);
 
 /**
  * \brief          Left-shift: X <<= count
@@ -455,7 +454,7 @@ int mbedtls_mpi_write_binary( const mbedtls_mpi *X, unsigned char *buf, size_t b
  * \return         0 if successful,
  *                 MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed
  */
-int mbedtls_mpi_shift_l( mbedtls_mpi *X, size_t count );
+int mbedtls_mpi_shift_l(mbedtls_mpi *X, size_t count);
 
 /**
  * \brief          Right-shift: X >>= count
@@ -466,7 +465,7 @@ int mbedtls_mpi_shift_l( mbedtls_mpi *X, size_t count );
  * \return         0 if successful,
  *                 MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed
  */
-int mbedtls_mpi_shift_r( mbedtls_mpi *X, size_t count );
+int mbedtls_mpi_shift_r(mbedtls_mpi *X, size_t count);
 
 /**
  * \brief          Compare unsigned values
@@ -478,7 +477,7 @@ int mbedtls_mpi_shift_r( mbedtls_mpi *X, size_t count );
  *                -1 if |X| is lesser  than |Y| or
  *                 0 if |X| is equal to |Y|
  */
-int mbedtls_mpi_cmp_abs( const mbedtls_mpi *X, const mbedtls_mpi *Y );
+int mbedtls_mpi_cmp_abs(const mbedtls_mpi *X, const mbedtls_mpi *Y);
 
 /**
  * \brief          Compare signed values
@@ -490,7 +489,7 @@ int mbedtls_mpi_cmp_abs( const mbedtls_mpi *X, const mbedtls_mpi *Y );
  *                -1 if X is lesser  than Y or
  *                 0 if X is equal to Y
  */
-int mbedtls_mpi_cmp_mpi( const mbedtls_mpi *X, const mbedtls_mpi *Y );
+int mbedtls_mpi_cmp_mpi(const mbedtls_mpi *X, const mbedtls_mpi *Y);
 
 /**
  * \brief          Compare signed values
@@ -502,7 +501,7 @@ int mbedtls_mpi_cmp_mpi( const mbedtls_mpi *X, const mbedtls_mpi *Y );
  *                -1 if X is lesser  than z or
  *                 0 if X is equal to z
  */
-int mbedtls_mpi_cmp_int( const mbedtls_mpi *X, mbedtls_mpi_sint z );
+int mbedtls_mpi_cmp_int(const mbedtls_mpi *X, mbedtls_mpi_sint z);
 
 /**
  * \brief          Unsigned addition: X = |A| + |B|
@@ -514,7 +513,7 @@ int mbedtls_mpi_cmp_int( const mbedtls_mpi *X, mbedtls_mpi_sint z );
  * \return         0 if successful,
  *                 MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed
  */
-int mbedtls_mpi_add_abs( mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *B );
+int mbedtls_mpi_add_abs(mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *B);
 
 /**
  * \brief          Unsigned subtraction: X = |A| - |B|
@@ -526,7 +525,7 @@ int mbedtls_mpi_add_abs( mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi
  * \return         0 if successful,
  *                 MBEDTLS_ERR_MPI_NEGATIVE_VALUE if B is greater than A
  */
-int mbedtls_mpi_sub_abs( mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *B );
+int mbedtls_mpi_sub_abs(mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *B);
 
 /**
  * \brief          Signed addition: X = A + B
@@ -538,7 +537,7 @@ int mbedtls_mpi_sub_abs( mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi
  * \return         0 if successful,
  *                 MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed
  */
-int mbedtls_mpi_add_mpi( mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *B );
+int mbedtls_mpi_add_mpi(mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *B);
 
 /**
  * \brief          Signed subtraction: X = A - B
@@ -550,7 +549,7 @@ int mbedtls_mpi_add_mpi( mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi
  * \return         0 if successful,
  *                 MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed
  */
-int mbedtls_mpi_sub_mpi( mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *B );
+int mbedtls_mpi_sub_mpi(mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *B);
 
 /**
  * \brief          Signed addition: X = A + b
@@ -562,7 +561,7 @@ int mbedtls_mpi_sub_mpi( mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi
  * \return         0 if successful,
  *                 MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed
  */
-int mbedtls_mpi_add_int( mbedtls_mpi *X, const mbedtls_mpi *A, mbedtls_mpi_sint b );
+int mbedtls_mpi_add_int(mbedtls_mpi *X, const mbedtls_mpi *A, mbedtls_mpi_sint b);
 
 /**
  * \brief          Signed subtraction: X = A - b
@@ -574,7 +573,7 @@ int mbedtls_mpi_add_int( mbedtls_mpi *X, const mbedtls_mpi *A, mbedtls_mpi_sint
  * \return         0 if successful,
  *                 MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed
  */
-int mbedtls_mpi_sub_int( mbedtls_mpi *X, const mbedtls_mpi *A, mbedtls_mpi_sint b );
+int mbedtls_mpi_sub_int(mbedtls_mpi *X, const mbedtls_mpi *A, mbedtls_mpi_sint b);
 
 /**
  * \brief          Baseline multiplication: X = A * B
@@ -586,7 +585,7 @@ int mbedtls_mpi_sub_int( mbedtls_mpi *X, const mbedtls_mpi *A, mbedtls_mpi_sint
  * \return         0 if successful,
  *                 MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed
  */
-int mbedtls_mpi_mul_mpi( mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *B );
+int mbedtls_mpi_mul_mpi(mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *B);
 
 /**
  * \brief          Baseline multiplication: X = A * b
@@ -600,7 +599,7 @@ int mbedtls_mpi_mul_mpi( mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi
  * \return         0 if successful,
  *                 MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed
  */
-int mbedtls_mpi_mul_int( mbedtls_mpi *X, const mbedtls_mpi *A, mbedtls_mpi_uint b );
+int mbedtls_mpi_mul_int(mbedtls_mpi *X, const mbedtls_mpi *A, mbedtls_mpi_uint b);
 
 /**
  * \brief          Division by mbedtls_mpi: A = Q * B + R
@@ -616,7 +615,7 @@ int mbedtls_mpi_mul_int( mbedtls_mpi *X, const mbedtls_mpi *A, mbedtls_mpi_uint
  *
  * \note           Either Q or R can be NULL.
  */
-int mbedtls_mpi_div_mpi( mbedtls_mpi *Q, mbedtls_mpi *R, const mbedtls_mpi *A, const mbedtls_mpi *B );
+int mbedtls_mpi_div_mpi(mbedtls_mpi *Q, mbedtls_mpi *R, const mbedtls_mpi *A, const mbedtls_mpi *B);
 
 /**
  * \brief          Division by int: A = Q * b + R
@@ -632,7 +631,7 @@ int mbedtls_mpi_div_mpi( mbedtls_mpi *Q, mbedtls_mpi *R, const mbedtls_mpi *A, c
  *
  * \note           Either Q or R can be NULL.
  */
-int mbedtls_mpi_div_int( mbedtls_mpi *Q, mbedtls_mpi *R, const mbedtls_mpi *A, mbedtls_mpi_sint b );
+int mbedtls_mpi_div_int(mbedtls_mpi *Q, mbedtls_mpi *R, const mbedtls_mpi *A, mbedtls_mpi_sint b);
 
 /**
  * \brief          Modulo: R = A mod B
@@ -646,7 +645,7 @@ int mbedtls_mpi_div_int( mbedtls_mpi *Q, mbedtls_mpi *R, const mbedtls_mpi *A, m
  *                 MBEDTLS_ERR_MPI_DIVISION_BY_ZERO if B == 0,
  *                 MBEDTLS_ERR_MPI_NEGATIVE_VALUE if B < 0
  */
-int mbedtls_mpi_mod_mpi( mbedtls_mpi *R, const mbedtls_mpi *A, const mbedtls_mpi *B );
+int mbedtls_mpi_mod_mpi(mbedtls_mpi *R, const mbedtls_mpi *A, const mbedtls_mpi *B);
 
 /**
  * \brief          Modulo: r = A mod b
@@ -660,7 +659,7 @@ int mbedtls_mpi_mod_mpi( mbedtls_mpi *R, const mbedtls_mpi *A, const mbedtls_mpi
  *                 MBEDTLS_ERR_MPI_DIVISION_BY_ZERO if b == 0,
  *                 MBEDTLS_ERR_MPI_NEGATIVE_VALUE if b < 0
  */
-int mbedtls_mpi_mod_int( mbedtls_mpi_uint *r, const mbedtls_mpi *A, mbedtls_mpi_sint b );
+int mbedtls_mpi_mod_int(mbedtls_mpi_uint *r, const mbedtls_mpi *A, mbedtls_mpi_sint b);
 
 /**
  * \brief          Sliding-window exponentiation: X = A^E mod N
@@ -680,7 +679,7 @@ int mbedtls_mpi_mod_int( mbedtls_mpi_uint *r, const mbedtls_mpi *A, mbedtls_mpi_
  *                 multiple calls, which speeds up things a bit. It can
  *                 be set to NULL if the extra performance is unneeded.
  */
-int mbedtls_mpi_exp_mod( mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *E, const mbedtls_mpi *N, mbedtls_mpi *_RR );
+int mbedtls_mpi_exp_mod(mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *E, const mbedtls_mpi *N, mbedtls_mpi *_RR);
 
 /**
  * \brief          Fill an MPI X with size bytes of random
@@ -697,9 +696,9 @@ int mbedtls_mpi_exp_mod( mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi
  *                 as a big-endian representation of an MPI; this can
  *                 be relevant in applications like deterministic ECDSA.
  */
-int mbedtls_mpi_fill_random( mbedtls_mpi *X, size_t size,
-                     int (*f_rng)(void *, unsigned char *, size_t),
-                     void *p_rng );
+int mbedtls_mpi_fill_random(mbedtls_mpi *X, size_t size,
+                            int (*f_rng)(void *, unsigned char *, size_t),
+                            void *p_rng);
 
 /**
  * \brief          Greatest common divisor: G = gcd(A, B)
@@ -711,7 +710,7 @@ int mbedtls_mpi_fill_random( mbedtls_mpi *X, size_t size,
  * \return         0 if successful,
  *                 MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed
  */
-int mbedtls_mpi_gcd( mbedtls_mpi *G, const mbedtls_mpi *A, const mbedtls_mpi *B );
+int mbedtls_mpi_gcd(mbedtls_mpi *G, const mbedtls_mpi *A, const mbedtls_mpi *B);
 
 /**
  * \brief          Modular inverse: X = A^-1 mod N
@@ -725,7 +724,7 @@ int mbedtls_mpi_gcd( mbedtls_mpi *G, const mbedtls_mpi *A, const mbedtls_mpi *B
  *                 MBEDTLS_ERR_MPI_BAD_INPUT_DATA if N is <= 1,
                    MBEDTLS_ERR_MPI_NOT_ACCEPTABLE if A has no inverse mod N.
  */
-int mbedtls_mpi_inv_mod( mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *N );
+int mbedtls_mpi_inv_mod(mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *N);
 
 /**
  * \brief          Miller-Rabin primality test
@@ -738,9 +737,9 @@ int mbedtls_mpi_inv_mod( mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi
  *                 MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed,
  *                 MBEDTLS_ERR_MPI_NOT_ACCEPTABLE if X is not prime
  */
-int mbedtls_mpi_is_prime( const mbedtls_mpi *X,
-                  int (*f_rng)(void *, unsigned char *, size_t),
-                  void *p_rng );
+int mbedtls_mpi_is_prime(const mbedtls_mpi *X,
+                         int (*f_rng)(void *, unsigned char *, size_t),
+                         void *p_rng);
 
 /**
  * \brief          Prime number generation
@@ -756,16 +755,16 @@ int mbedtls_mpi_is_prime( const mbedtls_mpi *X,
  *                 MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed,
  *                 MBEDTLS_ERR_MPI_BAD_INPUT_DATA if nbits is < 3
  */
-int mbedtls_mpi_gen_prime( mbedtls_mpi *X, size_t nbits, int dh_flag,
-                   int (*f_rng)(void *, unsigned char *, size_t),
-                   void *p_rng );
+int mbedtls_mpi_gen_prime(mbedtls_mpi *X, size_t nbits, int dh_flag,
+                          int (*f_rng)(void *, unsigned char *, size_t),
+                          void *p_rng);
 
 /**
  * \brief          Checkup routine
  *
  * \return         0 if successful, or 1 if the test failed
  */
-int mbedtls_mpi_self_test( int verbose );
+int mbedtls_mpi_self_test(int verbose);
 
 #ifdef __cplusplus
 }
diff --git a/common/mbedtls/blowfish.c b/common/mbedtls/blowfish.c
index 404d24e1f..c3e19cdca 100644
--- a/common/mbedtls/blowfish.c
+++ b/common/mbedtls/blowfish.c
@@ -47,55 +47,55 @@
  */
 #ifndef GET_UINT32_BE
 #define GET_UINT32_BE(n,b,i)                            \
-{                                                       \
-    (n) = ( (uint32_t) (b)[(i)    ] << 24 )             \
-        | ( (uint32_t) (b)[(i) + 1] << 16 )             \
-        | ( (uint32_t) (b)[(i) + 2] <<  8 )             \
-        | ( (uint32_t) (b)[(i) + 3]       );            \
-}
+    {                                                       \
+        (n) = ( (uint32_t) (b)[(i)    ] << 24 )             \
+              | ( (uint32_t) (b)[(i) + 1] << 16 )             \
+              | ( (uint32_t) (b)[(i) + 2] <<  8 )             \
+              | ( (uint32_t) (b)[(i) + 3]       );            \
+    }
 #endif
 
 #ifndef PUT_UINT32_BE
 #define PUT_UINT32_BE(n,b,i)                            \
-{                                                       \
-    (b)[(i)    ] = (unsigned char) ( (n) >> 24 );       \
-    (b)[(i) + 1] = (unsigned char) ( (n) >> 16 );       \
-    (b)[(i) + 2] = (unsigned char) ( (n) >>  8 );       \
-    (b)[(i) + 3] = (unsigned char) ( (n)       );       \
-}
+    {                                                       \
+        (b)[(i)    ] = (unsigned char) ( (n) >> 24 );       \
+        (b)[(i) + 1] = (unsigned char) ( (n) >> 16 );       \
+        (b)[(i) + 2] = (unsigned char) ( (n) >>  8 );       \
+        (b)[(i) + 3] = (unsigned char) ( (n)       );       \
+    }
 #endif
 
 static const uint32_t P[MBEDTLS_BLOWFISH_ROUNDS + 2] = {
-        0x243F6A88L, 0x85A308D3L, 0x13198A2EL, 0x03707344L,
-        0xA4093822L, 0x299F31D0L, 0x082EFA98L, 0xEC4E6C89L,
-        0x452821E6L, 0x38D01377L, 0xBE5466CFL, 0x34E90C6CL,
-        0xC0AC29B7L, 0xC97C50DDL, 0x3F84D5B5L, 0xB5470917L,
-        0x9216D5D9L, 0x8979FB1BL
+    0x243F6A88L, 0x85A308D3L, 0x13198A2EL, 0x03707344L,
+    0xA4093822L, 0x299F31D0L, 0x082EFA98L, 0xEC4E6C89L,
+    0x452821E6L, 0x38D01377L, 0xBE5466CFL, 0x34E90C6CL,
+    0xC0AC29B7L, 0xC97C50DDL, 0x3F84D5B5L, 0xB5470917L,
+    0x9216D5D9L, 0x8979FB1BL
 };
 
 /* declarations of data at the end of this file */
 static const uint32_t S[4][256];
 
-static uint32_t F( mbedtls_blowfish_context *ctx, uint32_t x )
+static uint32_t F(mbedtls_blowfish_context *ctx, uint32_t x)
 {
-   unsigned short a, b, c, d;
-   uint32_t  y;
+    unsigned short a, b, c, d;
+    uint32_t  y;
 
-   d = (unsigned short)(x & 0xFF);
-   x >>= 8;
-   c = (unsigned short)(x & 0xFF);
-   x >>= 8;
-   b = (unsigned short)(x & 0xFF);
-   x >>= 8;
-   a = (unsigned short)(x & 0xFF);
-   y = ctx->S[0][a] + ctx->S[1][b];
-   y = y ^ ctx->S[2][c];
-   y = y + ctx->S[3][d];
+    d = (unsigned short)(x & 0xFF);
+    x >>= 8;
+    c = (unsigned short)(x & 0xFF);
+    x >>= 8;
+    b = (unsigned short)(x & 0xFF);
+    x >>= 8;
+    a = (unsigned short)(x & 0xFF);
+    y = ctx->S[0][a] + ctx->S[1][b];
+    y = y ^ ctx->S[2][c];
+    y = y + ctx->S[3][d];
 
-   return( y );
+    return (y);
 }
 
-static void blowfish_enc( mbedtls_blowfish_context *ctx, uint32_t *xl, uint32_t *xr )
+static void blowfish_enc(mbedtls_blowfish_context *ctx, uint32_t *xl, uint32_t *xr)
 {
     uint32_t  Xl, Xr, temp;
     short i;
@@ -103,10 +103,9 @@ static void blowfish_enc( mbedtls_blowfish_context *ctx, uint32_t *xl, uint32_t
     Xl = *xl;
     Xr = *xr;
 
-    for( i = 0; i < MBEDTLS_BLOWFISH_ROUNDS; ++i )
-    {
+    for (i = 0; i < MBEDTLS_BLOWFISH_ROUNDS; ++i) {
         Xl = Xl ^ ctx->P[i];
-        Xr = F( ctx, Xl ) ^ Xr;
+        Xr = F(ctx, Xl) ^ Xr;
 
         temp = Xl;
         Xl = Xr;
@@ -124,7 +123,7 @@ static void blowfish_enc( mbedtls_blowfish_context *ctx, uint32_t *xl, uint32_t
     *xr = Xr;
 }
 
-static void blowfish_dec( mbedtls_blowfish_context *ctx, uint32_t *xl, uint32_t *xr )
+static void blowfish_dec(mbedtls_blowfish_context *ctx, uint32_t *xl, uint32_t *xr)
 {
     uint32_t  Xl, Xr, temp;
     short i;
@@ -132,10 +131,9 @@ static void blowfish_dec( mbedtls_blowfish_context *ctx, uint32_t *xl, uint32_t
     Xl = *xl;
     Xr = *xr;
 
-    for( i = MBEDTLS_BLOWFISH_ROUNDS + 1; i > 1; --i )
-    {
+    for (i = MBEDTLS_BLOWFISH_ROUNDS + 1; i > 1; --i) {
         Xl = Xl ^ ctx->P[i];
-        Xr = F( ctx, Xl ) ^ Xr;
+        Xr = F(ctx, Xl) ^ Xr;
 
         temp = Xl;
         Xl = Xr;
@@ -153,50 +151,46 @@ static void blowfish_dec( mbedtls_blowfish_context *ctx, uint32_t *xl, uint32_t
     *xr = Xr;
 }
 
-void mbedtls_blowfish_init( mbedtls_blowfish_context *ctx )
+void mbedtls_blowfish_init(mbedtls_blowfish_context *ctx)
 {
-    memset( ctx, 0, sizeof( mbedtls_blowfish_context ) );
+    memset(ctx, 0, sizeof(mbedtls_blowfish_context));
 }
 
-void mbedtls_blowfish_free( mbedtls_blowfish_context *ctx )
+void mbedtls_blowfish_free(mbedtls_blowfish_context *ctx)
 {
-    if( ctx == NULL )
+    if (ctx == NULL)
         return;
 
-    mbedtls_platform_zeroize( ctx, sizeof( mbedtls_blowfish_context ) );
+    mbedtls_platform_zeroize(ctx, sizeof(mbedtls_blowfish_context));
 }
 
 /*
  * Blowfish key schedule
  */
-int mbedtls_blowfish_setkey( mbedtls_blowfish_context *ctx, const unsigned char *key,
-                     unsigned int keybits )
+int mbedtls_blowfish_setkey(mbedtls_blowfish_context *ctx, const unsigned char *key,
+                            unsigned int keybits)
 {
     unsigned int i, j, k;
     uint32_t data, datal, datar;
 
-    if( keybits < MBEDTLS_BLOWFISH_MIN_KEY_BITS || keybits > MBEDTLS_BLOWFISH_MAX_KEY_BITS ||
-        ( keybits % 8 ) )
-    {
-        return( MBEDTLS_ERR_BLOWFISH_INVALID_KEY_LENGTH );
+    if (keybits < MBEDTLS_BLOWFISH_MIN_KEY_BITS || keybits > MBEDTLS_BLOWFISH_MAX_KEY_BITS ||
+        (keybits % 8)) {
+        return (MBEDTLS_ERR_BLOWFISH_INVALID_KEY_LENGTH);
     }
 
     keybits >>= 3;
 
-    for( i = 0; i < 4; i++ )
-    {
-        for( j = 0; j < 256; j++ )
+    for (i = 0; i < 4; i++) {
+        for (j = 0; j < 256; j++)
             ctx->S[i][j] = S[i][j];
     }
 
     j = 0;
-    for( i = 0; i < MBEDTLS_BLOWFISH_ROUNDS + 2; ++i )
-    {
+    for (i = 0; i < MBEDTLS_BLOWFISH_ROUNDS + 2; ++i) {
         data = 0x00000000;
-        for( k = 0; k < 4; ++k )
-        {
-            data = ( data << 8 ) | key[j++];
-            if( j >= keybits )
+        for (k = 0; k < 4; ++k) {
+            data = (data << 8) | key[j++];
+            if (j >= keybits)
                 j = 0;
         }
         ctx->P[i] = P[i] ^ data;
@@ -205,96 +199,85 @@ int mbedtls_blowfish_setkey( mbedtls_blowfish_context *ctx, const unsigned char
     datal = 0x00000000;
     datar = 0x00000000;
 
-    for( i = 0; i < MBEDTLS_BLOWFISH_ROUNDS + 2; i += 2 )
-    {
-        blowfish_enc( ctx, &datal, &datar );
+    for (i = 0; i < MBEDTLS_BLOWFISH_ROUNDS + 2; i += 2) {
+        blowfish_enc(ctx, &datal, &datar);
         ctx->P[i] = datal;
         ctx->P[i + 1] = datar;
     }
 
-    for( i = 0; i < 4; i++ )
-    {
-       for( j = 0; j < 256; j += 2 )
-       {
-            blowfish_enc( ctx, &datal, &datar );
+    for (i = 0; i < 4; i++) {
+        for (j = 0; j < 256; j += 2) {
+            blowfish_enc(ctx, &datal, &datar);
             ctx->S[i][j] = datal;
             ctx->S[i][j + 1] = datar;
         }
     }
-    return( 0 );
+    return (0);
 }
 
 /*
  * Blowfish-ECB block encryption/decryption
  */
-int mbedtls_blowfish_crypt_ecb( mbedtls_blowfish_context *ctx,
-                    int mode,
-                    const unsigned char input[MBEDTLS_BLOWFISH_BLOCKSIZE],
-                    unsigned char output[MBEDTLS_BLOWFISH_BLOCKSIZE] )
+int mbedtls_blowfish_crypt_ecb(mbedtls_blowfish_context *ctx,
+                               int mode,
+                               const unsigned char input[MBEDTLS_BLOWFISH_BLOCKSIZE],
+                               unsigned char output[MBEDTLS_BLOWFISH_BLOCKSIZE])
 {
     uint32_t X0, X1;
 
-    GET_UINT32_BE( X0, input,  0 );
-    GET_UINT32_BE( X1, input,  4 );
+    GET_UINT32_BE(X0, input,  0);
+    GET_UINT32_BE(X1, input,  4);
 
-    if( mode == MBEDTLS_BLOWFISH_DECRYPT )
-    {
-        blowfish_dec( ctx, &X0, &X1 );
-    }
-    else /* MBEDTLS_BLOWFISH_ENCRYPT */
-    {
-        blowfish_enc( ctx, &X0, &X1 );
+    if (mode == MBEDTLS_BLOWFISH_DECRYPT) {
+        blowfish_dec(ctx, &X0, &X1);
+    } else { /* MBEDTLS_BLOWFISH_ENCRYPT */
+        blowfish_enc(ctx, &X0, &X1);
     }
 
-    PUT_UINT32_BE( X0, output,  0 );
-    PUT_UINT32_BE( X1, output,  4 );
+    PUT_UINT32_BE(X0, output,  0);
+    PUT_UINT32_BE(X1, output,  4);
 
-    return( 0 );
+    return (0);
 }
 
 #if defined(MBEDTLS_CIPHER_MODE_CBC)
 /*
  * Blowfish-CBC buffer encryption/decryption
  */
-int mbedtls_blowfish_crypt_cbc( mbedtls_blowfish_context *ctx,
-                    int mode,
-                    size_t length,
-                    unsigned char iv[MBEDTLS_BLOWFISH_BLOCKSIZE],
-                    const unsigned char *input,
-                    unsigned char *output )
+int mbedtls_blowfish_crypt_cbc(mbedtls_blowfish_context *ctx,
+                               int mode,
+                               size_t length,
+                               unsigned char iv[MBEDTLS_BLOWFISH_BLOCKSIZE],
+                               const unsigned char *input,
+                               unsigned char *output)
 {
     int i;
     unsigned char temp[MBEDTLS_BLOWFISH_BLOCKSIZE];
 
-    if( length % MBEDTLS_BLOWFISH_BLOCKSIZE )
-        return( MBEDTLS_ERR_BLOWFISH_INVALID_INPUT_LENGTH );
+    if (length % MBEDTLS_BLOWFISH_BLOCKSIZE)
+        return (MBEDTLS_ERR_BLOWFISH_INVALID_INPUT_LENGTH);
 
-    if( mode == MBEDTLS_BLOWFISH_DECRYPT )
-    {
-        while( length > 0 )
-        {
-            memcpy( temp, input, MBEDTLS_BLOWFISH_BLOCKSIZE );
-            mbedtls_blowfish_crypt_ecb( ctx, mode, input, output );
+    if (mode == MBEDTLS_BLOWFISH_DECRYPT) {
+        while (length > 0) {
+            memcpy(temp, input, MBEDTLS_BLOWFISH_BLOCKSIZE);
+            mbedtls_blowfish_crypt_ecb(ctx, mode, input, output);
 
-            for( i = 0; i < MBEDTLS_BLOWFISH_BLOCKSIZE;i++ )
-                output[i] = (unsigned char)( output[i] ^ iv[i] );
+            for (i = 0; i < MBEDTLS_BLOWFISH_BLOCKSIZE; i++)
+                output[i] = (unsigned char)(output[i] ^ iv[i]);
 
-            memcpy( iv, temp, MBEDTLS_BLOWFISH_BLOCKSIZE );
+            memcpy(iv, temp, MBEDTLS_BLOWFISH_BLOCKSIZE);
 
             input  += MBEDTLS_BLOWFISH_BLOCKSIZE;
             output += MBEDTLS_BLOWFISH_BLOCKSIZE;
             length -= MBEDTLS_BLOWFISH_BLOCKSIZE;
         }
-    }
-    else
-    {
-        while( length > 0 )
-        {
-            for( i = 0; i < MBEDTLS_BLOWFISH_BLOCKSIZE; i++ )
-                output[i] = (unsigned char)( input[i] ^ iv[i] );
+    } else {
+        while (length > 0) {
+            for (i = 0; i < MBEDTLS_BLOWFISH_BLOCKSIZE; i++)
+                output[i] = (unsigned char)(input[i] ^ iv[i]);
 
-            mbedtls_blowfish_crypt_ecb( ctx, mode, output, output );
-            memcpy( iv, output, MBEDTLS_BLOWFISH_BLOCKSIZE );
+            mbedtls_blowfish_crypt_ecb(ctx, mode, output, output);
+            memcpy(iv, output, MBEDTLS_BLOWFISH_BLOCKSIZE);
 
             input  += MBEDTLS_BLOWFISH_BLOCKSIZE;
             output += MBEDTLS_BLOWFISH_BLOCKSIZE;
@@ -302,7 +285,7 @@ int mbedtls_blowfish_crypt_cbc( mbedtls_blowfish_context *ctx,
         }
     }
 
-    return( 0 );
+    return (0);
 }
 #endif /* MBEDTLS_CIPHER_MODE_CBC */
 
@@ -310,47 +293,42 @@ int mbedtls_blowfish_crypt_cbc( mbedtls_blowfish_context *ctx,
 /*
  * Blowfish CFB buffer encryption/decryption
  */
-int mbedtls_blowfish_crypt_cfb64( mbedtls_blowfish_context *ctx,
-                       int mode,
-                       size_t length,
-                       size_t *iv_off,
-                       unsigned char iv[MBEDTLS_BLOWFISH_BLOCKSIZE],
-                       const unsigned char *input,
-                       unsigned char *output )
+int mbedtls_blowfish_crypt_cfb64(mbedtls_blowfish_context *ctx,
+                                 int mode,
+                                 size_t length,
+                                 size_t *iv_off,
+                                 unsigned char iv[MBEDTLS_BLOWFISH_BLOCKSIZE],
+                                 const unsigned char *input,
+                                 unsigned char *output)
 {
     int c;
     size_t n = *iv_off;
 
-    if( mode == MBEDTLS_BLOWFISH_DECRYPT )
-    {
-        while( length-- )
-        {
-            if( n == 0 )
-                mbedtls_blowfish_crypt_ecb( ctx, MBEDTLS_BLOWFISH_ENCRYPT, iv, iv );
+    if (mode == MBEDTLS_BLOWFISH_DECRYPT) {
+        while (length--) {
+            if (n == 0)
+                mbedtls_blowfish_crypt_ecb(ctx, MBEDTLS_BLOWFISH_ENCRYPT, iv, iv);
 
             c = *input++;
-            *output++ = (unsigned char)( c ^ iv[n] );
+            *output++ = (unsigned char)(c ^ iv[n]);
             iv[n] = (unsigned char) c;
 
-            n = ( n + 1 ) % MBEDTLS_BLOWFISH_BLOCKSIZE;
+            n = (n + 1) % MBEDTLS_BLOWFISH_BLOCKSIZE;
         }
-    }
-    else
-    {
-        while( length-- )
-        {
-            if( n == 0 )
-                mbedtls_blowfish_crypt_ecb( ctx, MBEDTLS_BLOWFISH_ENCRYPT, iv, iv );
+    } else {
+        while (length--) {
+            if (n == 0)
+                mbedtls_blowfish_crypt_ecb(ctx, MBEDTLS_BLOWFISH_ENCRYPT, iv, iv);
 
-            iv[n] = *output++ = (unsigned char)( iv[n] ^ *input++ );
+            iv[n] = *output++ = (unsigned char)(iv[n] ^ *input++);
 
-            n = ( n + 1 ) % MBEDTLS_BLOWFISH_BLOCKSIZE;
+            n = (n + 1) % MBEDTLS_BLOWFISH_BLOCKSIZE;
         }
     }
 
     *iv_off = n;
 
-    return( 0 );
+    return (0);
 }
 #endif /*MBEDTLS_CIPHER_MODE_CFB */
 
@@ -358,41 +336,41 @@ int mbedtls_blowfish_crypt_cfb64( mbedtls_blowfish_context *ctx,
 /*
  * Blowfish CTR buffer encryption/decryption
  */
-int mbedtls_blowfish_crypt_ctr( mbedtls_blowfish_context *ctx,
-                       size_t length,
-                       size_t *nc_off,
-                       unsigned char nonce_counter[MBEDTLS_BLOWFISH_BLOCKSIZE],
-                       unsigned char stream_block[MBEDTLS_BLOWFISH_BLOCKSIZE],
-                       const unsigned char *input,
-                       unsigned char *output )
+int mbedtls_blowfish_crypt_ctr(mbedtls_blowfish_context *ctx,
+                               size_t length,
+                               size_t *nc_off,
+                               unsigned char nonce_counter[MBEDTLS_BLOWFISH_BLOCKSIZE],
+                               unsigned char stream_block[MBEDTLS_BLOWFISH_BLOCKSIZE],
+                               const unsigned char *input,
+                               unsigned char *output)
 {
     int c, i;
     size_t n = *nc_off;
 
-    while( length-- )
-    {
-        if( n == 0 ) {
-            mbedtls_blowfish_crypt_ecb( ctx, MBEDTLS_BLOWFISH_ENCRYPT, nonce_counter,
-                                stream_block );
+    while (length--) {
+        if (n == 0) {
+            mbedtls_blowfish_crypt_ecb(ctx, MBEDTLS_BLOWFISH_ENCRYPT, nonce_counter,
+                                       stream_block);
 
-            for( i = MBEDTLS_BLOWFISH_BLOCKSIZE; i > 0; i-- )
-                if( ++nonce_counter[i - 1] != 0 )
+            for (i = MBEDTLS_BLOWFISH_BLOCKSIZE; i > 0; i--)
+                if (++nonce_counter[i - 1] != 0)
                     break;
         }
         c = *input++;
-        *output++ = (unsigned char)( c ^ stream_block[n] );
+        *output++ = (unsigned char)(c ^ stream_block[n]);
 
-        n = ( n + 1 ) % MBEDTLS_BLOWFISH_BLOCKSIZE;
+        n = (n + 1) % MBEDTLS_BLOWFISH_BLOCKSIZE;
     }
 
     *nc_off = n;
 
-    return( 0 );
+    return (0);
 }
 #endif /* MBEDTLS_CIPHER_MODE_CTR */
 
 static const uint32_t S[4][256] = {
-    {   0xD1310BA6L, 0x98DFB5ACL, 0x2FFD72DBL, 0xD01ADFB7L,
+    {
+        0xD1310BA6L, 0x98DFB5ACL, 0x2FFD72DBL, 0xD01ADFB7L,
         0xB8E1AFEDL, 0x6A267E96L, 0xBA7C9045L, 0xF12C7F99L,
         0x24A19947L, 0xB3916CF7L, 0x0801F2E2L, 0x858EFC16L,
         0x636920D8L, 0x71574E69L, 0xA458FEA3L, 0xF4933D7EL,
@@ -455,8 +433,10 @@ static const uint32_t S[4][256] = {
         0xD60F573FL, 0xBC9BC6E4L, 0x2B60A476L, 0x81E67400L,
         0x08BA6FB5L, 0x571BE91FL, 0xF296EC6BL, 0x2A0DD915L,
         0xB6636521L, 0xE7B9F9B6L, 0xFF34052EL, 0xC5855664L,
-        0x53B02D5DL, 0xA99F8FA1L, 0x08BA4799L, 0x6E85076AL   },
-    {   0x4B7A70E9L, 0xB5B32944L, 0xDB75092EL, 0xC4192623L,
+        0x53B02D5DL, 0xA99F8FA1L, 0x08BA4799L, 0x6E85076AL
+    },
+    {
+        0x4B7A70E9L, 0xB5B32944L, 0xDB75092EL, 0xC4192623L,
         0xAD6EA6B0L, 0x49A7DF7DL, 0x9CEE60B8L, 0x8FEDB266L,
         0xECAA8C71L, 0x699A17FFL, 0x5664526CL, 0xC2B19EE1L,
         0x193602A5L, 0x75094C29L, 0xA0591340L, 0xE4183A3EL,
@@ -519,8 +499,10 @@ static const uint32_t S[4][256] = {
         0x9E447A2EL, 0xC3453484L, 0xFDD56705L, 0x0E1E9EC9L,
         0xDB73DBD3L, 0x105588CDL, 0x675FDA79L, 0xE3674340L,
         0xC5C43465L, 0x713E38D8L, 0x3D28F89EL, 0xF16DFF20L,
-        0x153E21E7L, 0x8FB03D4AL, 0xE6E39F2BL, 0xDB83ADF7L   },
-    {   0xE93D5A68L, 0x948140F7L, 0xF64C261CL, 0x94692934L,
+        0x153E21E7L, 0x8FB03D4AL, 0xE6E39F2BL, 0xDB83ADF7L
+    },
+    {
+        0xE93D5A68L, 0x948140F7L, 0xF64C261CL, 0x94692934L,
         0x411520F7L, 0x7602D4F7L, 0xBCF46B2EL, 0xD4A20068L,
         0xD4082471L, 0x3320F46AL, 0x43B7D4B7L, 0x500061AFL,
         0x1E39F62EL, 0x97244546L, 0x14214F74L, 0xBF8B8840L,
@@ -583,8 +565,10 @@ static const uint32_t S[4][256] = {
         0xED545578L, 0x08FCA5B5L, 0xD83D7CD3L, 0x4DAD0FC4L,
         0x1E50EF5EL, 0xB161E6F8L, 0xA28514D9L, 0x6C51133CL,
         0x6FD5C7E7L, 0x56E14EC4L, 0x362ABFCEL, 0xDDC6C837L,
-        0xD79A3234L, 0x92638212L, 0x670EFA8EL, 0x406000E0L  },
-    {   0x3A39CE37L, 0xD3FAF5CFL, 0xABC27737L, 0x5AC52D1BL,
+        0xD79A3234L, 0x92638212L, 0x670EFA8EL, 0x406000E0L
+    },
+    {
+        0x3A39CE37L, 0xD3FAF5CFL, 0xABC27737L, 0x5AC52D1BL,
         0x5CB0679EL, 0x4FA33742L, 0xD3822740L, 0x99BC9BBEL,
         0xD5118E9DL, 0xBF0F7315L, 0xD62D1C7EL, 0xC700C47BL,
         0xB78C1B6BL, 0x21A19045L, 0xB26EB1BEL, 0x6A366EB4L,
@@ -647,7 +631,8 @@ static const uint32_t S[4][256] = {
         0x85CBFE4EL, 0x8AE88DD8L, 0x7AAAF9B0L, 0x4CF9AA7EL,
         0x1948C25CL, 0x02FB8A8CL, 0x01C36AE4L, 0xD6EBE1F9L,
         0x90D4F869L, 0xA65CDEA0L, 0x3F09252DL, 0xC208E69FL,
-        0xB74E6132L, 0xCE77E25BL, 0x578FDFE3L, 0x3AC372E6L  }
+        0xB74E6132L, 0xCE77E25BL, 0x578FDFE3L, 0x3AC372E6L
+    }
 };
 
 #endif /* !MBEDTLS_BLOWFISH_ALT */
diff --git a/common/mbedtls/blowfish.h b/common/mbedtls/blowfish.h
index b63af8cdd..6c18cdcf2 100644
--- a/common/mbedtls/blowfish.h
+++ b/common/mbedtls/blowfish.h
@@ -57,8 +57,7 @@ extern "C" {
 /**
  * \brief          Blowfish context structure
  */
-typedef struct mbedtls_blowfish_context
-{
+typedef struct mbedtls_blowfish_context {
     uint32_t P[MBEDTLS_BLOWFISH_ROUNDS + 2];    /*!<  Blowfish round keys    */
     uint32_t S[4][256];                 /*!<  key dependent S-boxes  */
 }
@@ -73,14 +72,14 @@ mbedtls_blowfish_context;
  *
  * \param ctx      Blowfish context to be initialized
  */
-void mbedtls_blowfish_init( mbedtls_blowfish_context *ctx );
+void mbedtls_blowfish_init(mbedtls_blowfish_context *ctx);
 
 /**
  * \brief          Clear Blowfish context
  *
  * \param ctx      Blowfish context to be cleared
  */
-void mbedtls_blowfish_free( mbedtls_blowfish_context *ctx );
+void mbedtls_blowfish_free(mbedtls_blowfish_context *ctx);
 
 /**
  * \brief          Blowfish key schedule
@@ -91,8 +90,8 @@ void mbedtls_blowfish_free( mbedtls_blowfish_context *ctx );
  *
  * \return         0 if successful, or MBEDTLS_ERR_BLOWFISH_INVALID_KEY_LENGTH
  */
-int mbedtls_blowfish_setkey( mbedtls_blowfish_context *ctx, const unsigned char *key,
-                     unsigned int keybits );
+int mbedtls_blowfish_setkey(mbedtls_blowfish_context *ctx, const unsigned char *key,
+                            unsigned int keybits);
 
 /**
  * \brief          Blowfish-ECB block encryption/decryption
@@ -104,10 +103,10 @@ int mbedtls_blowfish_setkey( mbedtls_blowfish_context *ctx, const unsigned char
  *
  * \return         0 if successful
  */
-int mbedtls_blowfish_crypt_ecb( mbedtls_blowfish_context *ctx,
-                        int mode,
-                        const unsigned char input[MBEDTLS_BLOWFISH_BLOCKSIZE],
-                        unsigned char output[MBEDTLS_BLOWFISH_BLOCKSIZE] );
+int mbedtls_blowfish_crypt_ecb(mbedtls_blowfish_context *ctx,
+                               int mode,
+                               const unsigned char input[MBEDTLS_BLOWFISH_BLOCKSIZE],
+                               unsigned char output[MBEDTLS_BLOWFISH_BLOCKSIZE]);
 
 #if defined(MBEDTLS_CIPHER_MODE_CBC)
 /**
@@ -133,12 +132,12 @@ int mbedtls_blowfish_crypt_ecb( mbedtls_blowfish_context *ctx,
  * \return         0 if successful, or
  *                 MBEDTLS_ERR_BLOWFISH_INVALID_INPUT_LENGTH
  */
-int mbedtls_blowfish_crypt_cbc( mbedtls_blowfish_context *ctx,
-                        int mode,
-                        size_t length,
-                        unsigned char iv[MBEDTLS_BLOWFISH_BLOCKSIZE],
-                        const unsigned char *input,
-                        unsigned char *output );
+int mbedtls_blowfish_crypt_cbc(mbedtls_blowfish_context *ctx,
+                               int mode,
+                               size_t length,
+                               unsigned char iv[MBEDTLS_BLOWFISH_BLOCKSIZE],
+                               const unsigned char *input,
+                               unsigned char *output);
 #endif /* MBEDTLS_CIPHER_MODE_CBC */
 
 #if defined(MBEDTLS_CIPHER_MODE_CFB)
@@ -163,13 +162,13 @@ int mbedtls_blowfish_crypt_cbc( mbedtls_blowfish_context *ctx,
  *
  * \return         0 if successful
  */
-int mbedtls_blowfish_crypt_cfb64( mbedtls_blowfish_context *ctx,
-                          int mode,
-                          size_t length,
-                          size_t *iv_off,
-                          unsigned char iv[MBEDTLS_BLOWFISH_BLOCKSIZE],
-                          const unsigned char *input,
-                          unsigned char *output );
+int mbedtls_blowfish_crypt_cfb64(mbedtls_blowfish_context *ctx,
+                                 int mode,
+                                 size_t length,
+                                 size_t *iv_off,
+                                 unsigned char iv[MBEDTLS_BLOWFISH_BLOCKSIZE],
+                                 const unsigned char *input,
+                                 unsigned char *output);
 #endif /*MBEDTLS_CIPHER_MODE_CFB */
 
 #if defined(MBEDTLS_CIPHER_MODE_CTR)
@@ -230,13 +229,13 @@ int mbedtls_blowfish_crypt_cfb64( mbedtls_blowfish_context *ctx,
  *
  * \return         0 if successful
  */
-int mbedtls_blowfish_crypt_ctr( mbedtls_blowfish_context *ctx,
-                        size_t length,
-                        size_t *nc_off,
-                        unsigned char nonce_counter[MBEDTLS_BLOWFISH_BLOCKSIZE],
-                        unsigned char stream_block[MBEDTLS_BLOWFISH_BLOCKSIZE],
-                        const unsigned char *input,
-                        unsigned char *output );
+int mbedtls_blowfish_crypt_ctr(mbedtls_blowfish_context *ctx,
+                               size_t length,
+                               size_t *nc_off,
+                               unsigned char nonce_counter[MBEDTLS_BLOWFISH_BLOCKSIZE],
+                               unsigned char stream_block[MBEDTLS_BLOWFISH_BLOCKSIZE],
+                               const unsigned char *input,
+                               unsigned char *output);
 #endif /* MBEDTLS_CIPHER_MODE_CTR */
 
 #ifdef __cplusplus
diff --git a/common/mbedtls/bn_mul.h b/common/mbedtls/bn_mul.h
index ff0c9fe23..7efbeedd4 100644
--- a/common/mbedtls/bn_mul.h
+++ b/common/mbedtls/bn_mul.h
@@ -62,109 +62,109 @@
 
 #define MULADDC_INIT                        \
     asm(                                    \
-        "movl   %%ebx, %0           \n\t"   \
-        "movl   %5, %%esi           \n\t"   \
-        "movl   %6, %%edi           \n\t"   \
-        "movl   %7, %%ecx           \n\t"   \
-        "movl   %8, %%ebx           \n\t"
+                                            "movl   %%ebx, %0           \n\t"   \
+                                            "movl   %5, %%esi           \n\t"   \
+                                            "movl   %6, %%edi           \n\t"   \
+                                            "movl   %7, %%ecx           \n\t"   \
+                                            "movl   %8, %%ebx           \n\t"
 
 #define MULADDC_CORE                        \
-        "lodsl                      \n\t"   \
-        "mull   %%ebx               \n\t"   \
-        "addl   %%ecx,   %%eax      \n\t"   \
-        "adcl   $0,      %%edx      \n\t"   \
-        "addl   (%%edi), %%eax      \n\t"   \
-        "adcl   $0,      %%edx      \n\t"   \
-        "movl   %%edx,   %%ecx      \n\t"   \
-        "stosl                      \n\t"
+    "lodsl                      \n\t"   \
+    "mull   %%ebx               \n\t"   \
+    "addl   %%ecx,   %%eax      \n\t"   \
+    "adcl   $0,      %%edx      \n\t"   \
+    "addl   (%%edi), %%eax      \n\t"   \
+    "adcl   $0,      %%edx      \n\t"   \
+    "movl   %%edx,   %%ecx      \n\t"   \
+    "stosl                      \n\t"
 
 #if defined(MBEDTLS_HAVE_SSE2)
 
 #define MULADDC_HUIT                            \
-        "movd     %%ecx,     %%mm1      \n\t"   \
-        "movd     %%ebx,     %%mm0      \n\t"   \
-        "movd     (%%edi),   %%mm3      \n\t"   \
-        "paddq    %%mm3,     %%mm1      \n\t"   \
-        "movd     (%%esi),   %%mm2      \n\t"   \
-        "pmuludq  %%mm0,     %%mm2      \n\t"   \
-        "movd     4(%%esi),  %%mm4      \n\t"   \
-        "pmuludq  %%mm0,     %%mm4      \n\t"   \
-        "movd     8(%%esi),  %%mm6      \n\t"   \
-        "pmuludq  %%mm0,     %%mm6      \n\t"   \
-        "movd     12(%%esi), %%mm7      \n\t"   \
-        "pmuludq  %%mm0,     %%mm7      \n\t"   \
-        "paddq    %%mm2,     %%mm1      \n\t"   \
-        "movd     4(%%edi),  %%mm3      \n\t"   \
-        "paddq    %%mm4,     %%mm3      \n\t"   \
-        "movd     8(%%edi),  %%mm5      \n\t"   \
-        "paddq    %%mm6,     %%mm5      \n\t"   \
-        "movd     12(%%edi), %%mm4      \n\t"   \
-        "paddq    %%mm4,     %%mm7      \n\t"   \
-        "movd     %%mm1,     (%%edi)    \n\t"   \
-        "movd     16(%%esi), %%mm2      \n\t"   \
-        "pmuludq  %%mm0,     %%mm2      \n\t"   \
-        "psrlq    $32,       %%mm1      \n\t"   \
-        "movd     20(%%esi), %%mm4      \n\t"   \
-        "pmuludq  %%mm0,     %%mm4      \n\t"   \
-        "paddq    %%mm3,     %%mm1      \n\t"   \
-        "movd     24(%%esi), %%mm6      \n\t"   \
-        "pmuludq  %%mm0,     %%mm6      \n\t"   \
-        "movd     %%mm1,     4(%%edi)   \n\t"   \
-        "psrlq    $32,       %%mm1      \n\t"   \
-        "movd     28(%%esi), %%mm3      \n\t"   \
-        "pmuludq  %%mm0,     %%mm3      \n\t"   \
-        "paddq    %%mm5,     %%mm1      \n\t"   \
-        "movd     16(%%edi), %%mm5      \n\t"   \
-        "paddq    %%mm5,     %%mm2      \n\t"   \
-        "movd     %%mm1,     8(%%edi)   \n\t"   \
-        "psrlq    $32,       %%mm1      \n\t"   \
-        "paddq    %%mm7,     %%mm1      \n\t"   \
-        "movd     20(%%edi), %%mm5      \n\t"   \
-        "paddq    %%mm5,     %%mm4      \n\t"   \
-        "movd     %%mm1,     12(%%edi)  \n\t"   \
-        "psrlq    $32,       %%mm1      \n\t"   \
-        "paddq    %%mm2,     %%mm1      \n\t"   \
-        "movd     24(%%edi), %%mm5      \n\t"   \
-        "paddq    %%mm5,     %%mm6      \n\t"   \
-        "movd     %%mm1,     16(%%edi)  \n\t"   \
-        "psrlq    $32,       %%mm1      \n\t"   \
-        "paddq    %%mm4,     %%mm1      \n\t"   \
-        "movd     28(%%edi), %%mm5      \n\t"   \
-        "paddq    %%mm5,     %%mm3      \n\t"   \
-        "movd     %%mm1,     20(%%edi)  \n\t"   \
-        "psrlq    $32,       %%mm1      \n\t"   \
-        "paddq    %%mm6,     %%mm1      \n\t"   \
-        "movd     %%mm1,     24(%%edi)  \n\t"   \
-        "psrlq    $32,       %%mm1      \n\t"   \
-        "paddq    %%mm3,     %%mm1      \n\t"   \
-        "movd     %%mm1,     28(%%edi)  \n\t"   \
-        "addl     $32,       %%edi      \n\t"   \
-        "addl     $32,       %%esi      \n\t"   \
-        "psrlq    $32,       %%mm1      \n\t"   \
-        "movd     %%mm1,     %%ecx      \n\t"
+    "movd     %%ecx,     %%mm1      \n\t"   \
+    "movd     %%ebx,     %%mm0      \n\t"   \
+    "movd     (%%edi),   %%mm3      \n\t"   \
+    "paddq    %%mm3,     %%mm1      \n\t"   \
+    "movd     (%%esi),   %%mm2      \n\t"   \
+    "pmuludq  %%mm0,     %%mm2      \n\t"   \
+    "movd     4(%%esi),  %%mm4      \n\t"   \
+    "pmuludq  %%mm0,     %%mm4      \n\t"   \
+    "movd     8(%%esi),  %%mm6      \n\t"   \
+    "pmuludq  %%mm0,     %%mm6      \n\t"   \
+    "movd     12(%%esi), %%mm7      \n\t"   \
+    "pmuludq  %%mm0,     %%mm7      \n\t"   \
+    "paddq    %%mm2,     %%mm1      \n\t"   \
+    "movd     4(%%edi),  %%mm3      \n\t"   \
+    "paddq    %%mm4,     %%mm3      \n\t"   \
+    "movd     8(%%edi),  %%mm5      \n\t"   \
+    "paddq    %%mm6,     %%mm5      \n\t"   \
+    "movd     12(%%edi), %%mm4      \n\t"   \
+    "paddq    %%mm4,     %%mm7      \n\t"   \
+    "movd     %%mm1,     (%%edi)    \n\t"   \
+    "movd     16(%%esi), %%mm2      \n\t"   \
+    "pmuludq  %%mm0,     %%mm2      \n\t"   \
+    "psrlq    $32,       %%mm1      \n\t"   \
+    "movd     20(%%esi), %%mm4      \n\t"   \
+    "pmuludq  %%mm0,     %%mm4      \n\t"   \
+    "paddq    %%mm3,     %%mm1      \n\t"   \
+    "movd     24(%%esi), %%mm6      \n\t"   \
+    "pmuludq  %%mm0,     %%mm6      \n\t"   \
+    "movd     %%mm1,     4(%%edi)   \n\t"   \
+    "psrlq    $32,       %%mm1      \n\t"   \
+    "movd     28(%%esi), %%mm3      \n\t"   \
+    "pmuludq  %%mm0,     %%mm3      \n\t"   \
+    "paddq    %%mm5,     %%mm1      \n\t"   \
+    "movd     16(%%edi), %%mm5      \n\t"   \
+    "paddq    %%mm5,     %%mm2      \n\t"   \
+    "movd     %%mm1,     8(%%edi)   \n\t"   \
+    "psrlq    $32,       %%mm1      \n\t"   \
+    "paddq    %%mm7,     %%mm1      \n\t"   \
+    "movd     20(%%edi), %%mm5      \n\t"   \
+    "paddq    %%mm5,     %%mm4      \n\t"   \
+    "movd     %%mm1,     12(%%edi)  \n\t"   \
+    "psrlq    $32,       %%mm1      \n\t"   \
+    "paddq    %%mm2,     %%mm1      \n\t"   \
+    "movd     24(%%edi), %%mm5      \n\t"   \
+    "paddq    %%mm5,     %%mm6      \n\t"   \
+    "movd     %%mm1,     16(%%edi)  \n\t"   \
+    "psrlq    $32,       %%mm1      \n\t"   \
+    "paddq    %%mm4,     %%mm1      \n\t"   \
+    "movd     28(%%edi), %%mm5      \n\t"   \
+    "paddq    %%mm5,     %%mm3      \n\t"   \
+    "movd     %%mm1,     20(%%edi)  \n\t"   \
+    "psrlq    $32,       %%mm1      \n\t"   \
+    "paddq    %%mm6,     %%mm1      \n\t"   \
+    "movd     %%mm1,     24(%%edi)  \n\t"   \
+    "psrlq    $32,       %%mm1      \n\t"   \
+    "paddq    %%mm3,     %%mm1      \n\t"   \
+    "movd     %%mm1,     28(%%edi)  \n\t"   \
+    "addl     $32,       %%edi      \n\t"   \
+    "addl     $32,       %%esi      \n\t"   \
+    "psrlq    $32,       %%mm1      \n\t"   \
+    "movd     %%mm1,     %%ecx      \n\t"
 
 #define MULADDC_STOP                    \
-        "emms                   \n\t"   \
-        "movl   %4, %%ebx       \n\t"   \
-        "movl   %%ecx, %1       \n\t"   \
-        "movl   %%edi, %2       \n\t"   \
-        "movl   %%esi, %3       \n\t"   \
-        : "=m" (t), "=m" (c), "=m" (d), "=m" (s)        \
+    "emms                   \n\t"   \
+    "movl   %4, %%ebx       \n\t"   \
+    "movl   %%ecx, %1       \n\t"   \
+    "movl   %%edi, %2       \n\t"   \
+    "movl   %%esi, %3       \n\t"   \
+    : "=m" (t), "=m" (c), "=m" (d), "=m" (s)        \
         : "m" (t), "m" (s), "m" (d), "m" (c), "m" (b)   \
-        : "eax", "ebx", "ecx", "edx", "esi", "edi"      \
-    );
+              : "eax", "ebx", "ecx", "edx", "esi", "edi"      \
+            );
 
 #else
 
 #define MULADDC_STOP                    \
-        "movl   %4, %%ebx       \n\t"   \
-        "movl   %%ecx, %1       \n\t"   \
-        "movl   %%edi, %2       \n\t"   \
-        "movl   %%esi, %3       \n\t"   \
-        : "=m" (t), "=m" (c), "=m" (d), "=m" (s)        \
+    "movl   %4, %%ebx       \n\t"   \
+    "movl   %%ecx, %1       \n\t"   \
+    "movl   %%edi, %2       \n\t"   \
+    "movl   %%esi, %3       \n\t"   \
+    : "=m" (t), "=m" (c), "=m" (d), "=m" (s)        \
         : "m" (t), "m" (s), "m" (d), "m" (c), "m" (b)   \
-        : "eax", "ebx", "ecx", "edx", "esi", "edi"      \
-    );
+              : "eax", "ebx", "ecx", "edx", "esi", "edi"      \
+            );
 #endif /* SSE2 */
 #endif /* i386 */
 
@@ -172,25 +172,25 @@
 
 #define MULADDC_INIT                        \
     asm(                                    \
-        "xorq   %%r8, %%r8          \n\t"
+                                            "xorq   %%r8, %%r8          \n\t"
 
 #define MULADDC_CORE                        \
-        "movq   (%%rsi), %%rax      \n\t"   \
-        "mulq   %%rbx               \n\t"   \
-        "addq   $8,      %%rsi      \n\t"   \
-        "addq   %%rcx,   %%rax      \n\t"   \
-        "movq   %%r8,    %%rcx      \n\t"   \
-        "adcq   $0,      %%rdx      \n\t"   \
-        "nop                        \n\t"   \
-        "addq   %%rax,   (%%rdi)    \n\t"   \
-        "adcq   %%rdx,   %%rcx      \n\t"   \
-        "addq   $8,      %%rdi      \n\t"
+    "movq   (%%rsi), %%rax      \n\t"   \
+    "mulq   %%rbx               \n\t"   \
+    "addq   $8,      %%rsi      \n\t"   \
+    "addq   %%rcx,   %%rax      \n\t"   \
+    "movq   %%r8,    %%rcx      \n\t"   \
+    "adcq   $0,      %%rdx      \n\t"   \
+    "nop                        \n\t"   \
+    "addq   %%rax,   (%%rdi)    \n\t"   \
+    "adcq   %%rdx,   %%rcx      \n\t"   \
+    "addq   $8,      %%rdi      \n\t"
 
 #define MULADDC_STOP                        \
-        : "+c" (c), "+D" (d), "+S" (s)      \
+    : "+c" (c), "+D" (d), "+S" (s)      \
         : "b" (b)                           \
-        : "rax", "rdx", "r8"                \
-    );
+              : "rax", "rdx", "r8"                \
+            );
 
 #endif /* AMD64 */
 
@@ -198,72 +198,72 @@
 
 #define MULADDC_INIT                    \
     asm(                                \
-        "movl   %3, %%a2        \n\t"   \
-        "movl   %4, %%a3        \n\t"   \
-        "movl   %5, %%d3        \n\t"   \
-        "movl   %6, %%d2        \n\t"   \
-        "moveq  #0, %%d0        \n\t"
+                                        "movl   %3, %%a2        \n\t"   \
+                                        "movl   %4, %%a3        \n\t"   \
+                                        "movl   %5, %%d3        \n\t"   \
+                                        "movl   %6, %%d2        \n\t"   \
+                                        "moveq  #0, %%d0        \n\t"
 
 #define MULADDC_CORE                    \
-        "movel  %%a2@+, %%d1    \n\t"   \
-        "mulul  %%d2, %%d4:%%d1 \n\t"   \
-        "addl   %%d3, %%d1      \n\t"   \
-        "addxl  %%d0, %%d4      \n\t"   \
-        "moveq  #0,   %%d3      \n\t"   \
-        "addl   %%d1, %%a3@+    \n\t"   \
-        "addxl  %%d4, %%d3      \n\t"
+    "movel  %%a2@+, %%d1    \n\t"   \
+    "mulul  %%d2, %%d4:%%d1 \n\t"   \
+    "addl   %%d3, %%d1      \n\t"   \
+    "addxl  %%d0, %%d4      \n\t"   \
+    "moveq  #0,   %%d3      \n\t"   \
+    "addl   %%d1, %%a3@+    \n\t"   \
+    "addxl  %%d4, %%d3      \n\t"
 
 #define MULADDC_STOP                    \
-        "movl   %%d3, %0        \n\t"   \
-        "movl   %%a3, %1        \n\t"   \
-        "movl   %%a2, %2        \n\t"   \
-        : "=m" (c), "=m" (d), "=m" (s)              \
+    "movl   %%d3, %0        \n\t"   \
+    "movl   %%a3, %1        \n\t"   \
+    "movl   %%a2, %2        \n\t"   \
+    : "=m" (c), "=m" (d), "=m" (s)              \
         : "m" (s), "m" (d), "m" (c), "m" (b)        \
-        : "d0", "d1", "d2", "d3", "d4", "a2", "a3"  \
-    );
+              : "d0", "d1", "d2", "d3", "d4", "a2", "a3"  \
+            );
 
 #define MULADDC_HUIT                        \
-        "movel  %%a2@+,  %%d1       \n\t"   \
-        "mulul  %%d2,    %%d4:%%d1  \n\t"   \
-        "addxl  %%d3,    %%d1       \n\t"   \
-        "addxl  %%d0,    %%d4       \n\t"   \
-        "addl   %%d1,    %%a3@+     \n\t"   \
-        "movel  %%a2@+,  %%d1       \n\t"   \
-        "mulul  %%d2,    %%d3:%%d1  \n\t"   \
-        "addxl  %%d4,    %%d1       \n\t"   \
-        "addxl  %%d0,    %%d3       \n\t"   \
-        "addl   %%d1,    %%a3@+     \n\t"   \
-        "movel  %%a2@+,  %%d1       \n\t"   \
-        "mulul  %%d2,    %%d4:%%d1  \n\t"   \
-        "addxl  %%d3,    %%d1       \n\t"   \
-        "addxl  %%d0,    %%d4       \n\t"   \
-        "addl   %%d1,    %%a3@+     \n\t"   \
-        "movel  %%a2@+,  %%d1       \n\t"   \
-        "mulul  %%d2,    %%d3:%%d1  \n\t"   \
-        "addxl  %%d4,    %%d1       \n\t"   \
-        "addxl  %%d0,    %%d3       \n\t"   \
-        "addl   %%d1,    %%a3@+     \n\t"   \
-        "movel  %%a2@+,  %%d1       \n\t"   \
-        "mulul  %%d2,    %%d4:%%d1  \n\t"   \
-        "addxl  %%d3,    %%d1       \n\t"   \
-        "addxl  %%d0,    %%d4       \n\t"   \
-        "addl   %%d1,    %%a3@+     \n\t"   \
-        "movel  %%a2@+,  %%d1       \n\t"   \
-        "mulul  %%d2,    %%d3:%%d1  \n\t"   \
-        "addxl  %%d4,    %%d1       \n\t"   \
-        "addxl  %%d0,    %%d3       \n\t"   \
-        "addl   %%d1,    %%a3@+     \n\t"   \
-        "movel  %%a2@+,  %%d1       \n\t"   \
-        "mulul  %%d2,    %%d4:%%d1  \n\t"   \
-        "addxl  %%d3,    %%d1       \n\t"   \
-        "addxl  %%d0,    %%d4       \n\t"   \
-        "addl   %%d1,    %%a3@+     \n\t"   \
-        "movel  %%a2@+,  %%d1       \n\t"   \
-        "mulul  %%d2,    %%d3:%%d1  \n\t"   \
-        "addxl  %%d4,    %%d1       \n\t"   \
-        "addxl  %%d0,    %%d3       \n\t"   \
-        "addl   %%d1,    %%a3@+     \n\t"   \
-        "addxl  %%d0,    %%d3       \n\t"
+    "movel  %%a2@+,  %%d1       \n\t"   \
+    "mulul  %%d2,    %%d4:%%d1  \n\t"   \
+    "addxl  %%d3,    %%d1       \n\t"   \
+    "addxl  %%d0,    %%d4       \n\t"   \
+    "addl   %%d1,    %%a3@+     \n\t"   \
+    "movel  %%a2@+,  %%d1       \n\t"   \
+    "mulul  %%d2,    %%d3:%%d1  \n\t"   \
+    "addxl  %%d4,    %%d1       \n\t"   \
+    "addxl  %%d0,    %%d3       \n\t"   \
+    "addl   %%d1,    %%a3@+     \n\t"   \
+    "movel  %%a2@+,  %%d1       \n\t"   \
+    "mulul  %%d2,    %%d4:%%d1  \n\t"   \
+    "addxl  %%d3,    %%d1       \n\t"   \
+    "addxl  %%d0,    %%d4       \n\t"   \
+    "addl   %%d1,    %%a3@+     \n\t"   \
+    "movel  %%a2@+,  %%d1       \n\t"   \
+    "mulul  %%d2,    %%d3:%%d1  \n\t"   \
+    "addxl  %%d4,    %%d1       \n\t"   \
+    "addxl  %%d0,    %%d3       \n\t"   \
+    "addl   %%d1,    %%a3@+     \n\t"   \
+    "movel  %%a2@+,  %%d1       \n\t"   \
+    "mulul  %%d2,    %%d4:%%d1  \n\t"   \
+    "addxl  %%d3,    %%d1       \n\t"   \
+    "addxl  %%d0,    %%d4       \n\t"   \
+    "addl   %%d1,    %%a3@+     \n\t"   \
+    "movel  %%a2@+,  %%d1       \n\t"   \
+    "mulul  %%d2,    %%d3:%%d1  \n\t"   \
+    "addxl  %%d4,    %%d1       \n\t"   \
+    "addxl  %%d0,    %%d3       \n\t"   \
+    "addl   %%d1,    %%a3@+     \n\t"   \
+    "movel  %%a2@+,  %%d1       \n\t"   \
+    "mulul  %%d2,    %%d4:%%d1  \n\t"   \
+    "addxl  %%d3,    %%d1       \n\t"   \
+    "addxl  %%d0,    %%d4       \n\t"   \
+    "addl   %%d1,    %%a3@+     \n\t"   \
+    "movel  %%a2@+,  %%d1       \n\t"   \
+    "mulul  %%d2,    %%d3:%%d1  \n\t"   \
+    "addxl  %%d4,    %%d1       \n\t"   \
+    "addxl  %%d0,    %%d3       \n\t"   \
+    "addl   %%d1,    %%a3@+     \n\t"   \
+    "addxl  %%d0,    %%d3       \n\t"
 
 #endif /* MC68000 */
 
@@ -273,70 +273,70 @@
 
 #define MULADDC_INIT                        \
     asm(                                    \
-        "ld     r3, %3              \n\t"   \
-        "ld     r4, %4              \n\t"   \
-        "ld     r5, %5              \n\t"   \
-        "ld     r6, %6              \n\t"   \
-        "addi   r3, r3, -8          \n\t"   \
-        "addi   r4, r4, -8          \n\t"   \
-        "addic  r5, r5,  0          \n\t"
+                                            "ld     r3, %3              \n\t"   \
+                                            "ld     r4, %4              \n\t"   \
+                                            "ld     r5, %5              \n\t"   \
+                                            "ld     r6, %6              \n\t"   \
+                                            "addi   r3, r3, -8          \n\t"   \
+                                            "addi   r4, r4, -8          \n\t"   \
+                                            "addic  r5, r5,  0          \n\t"
 
 #define MULADDC_CORE                        \
-        "ldu    r7, 8(r3)           \n\t"   \
-        "mulld  r8, r7, r6          \n\t"   \
-        "mulhdu r9, r7, r6          \n\t"   \
-        "adde   r8, r8, r5          \n\t"   \
-        "ld     r7, 8(r4)           \n\t"   \
-        "addze  r5, r9              \n\t"   \
-        "addc   r8, r8, r7          \n\t"   \
-        "stdu   r8, 8(r4)           \n\t"
+    "ldu    r7, 8(r3)           \n\t"   \
+    "mulld  r8, r7, r6          \n\t"   \
+    "mulhdu r9, r7, r6          \n\t"   \
+    "adde   r8, r8, r5          \n\t"   \
+    "ld     r7, 8(r4)           \n\t"   \
+    "addze  r5, r9              \n\t"   \
+    "addc   r8, r8, r7          \n\t"   \
+    "stdu   r8, 8(r4)           \n\t"
 
 #define MULADDC_STOP                        \
-        "addze  r5, r5              \n\t"   \
-        "addi   r4, r4, 8           \n\t"   \
-        "addi   r3, r3, 8           \n\t"   \
-        "std    r5, %0              \n\t"   \
-        "std    r4, %1              \n\t"   \
-        "std    r3, %2              \n\t"   \
-        : "=m" (c), "=m" (d), "=m" (s)              \
+    "addze  r5, r5              \n\t"   \
+    "addi   r4, r4, 8           \n\t"   \
+    "addi   r3, r3, 8           \n\t"   \
+    "std    r5, %0              \n\t"   \
+    "std    r4, %1              \n\t"   \
+    "std    r3, %2              \n\t"   \
+    : "=m" (c), "=m" (d), "=m" (s)              \
         : "m" (s), "m" (d), "m" (c), "m" (b)        \
-        : "r3", "r4", "r5", "r6", "r7", "r8", "r9"  \
-    );
+              : "r3", "r4", "r5", "r6", "r7", "r8", "r9"  \
+            );
 
 
 #else /* __MACH__ && __APPLE__ */
 
 #define MULADDC_INIT                        \
     asm(                                    \
-        "ld     %%r3, %3            \n\t"   \
-        "ld     %%r4, %4            \n\t"   \
-        "ld     %%r5, %5            \n\t"   \
-        "ld     %%r6, %6            \n\t"   \
-        "addi   %%r3, %%r3, -8      \n\t"   \
-        "addi   %%r4, %%r4, -8      \n\t"   \
-        "addic  %%r5, %%r5,  0      \n\t"
+                                            "ld     %%r3, %3            \n\t"   \
+                                            "ld     %%r4, %4            \n\t"   \
+                                            "ld     %%r5, %5            \n\t"   \
+                                            "ld     %%r6, %6            \n\t"   \
+                                            "addi   %%r3, %%r3, -8      \n\t"   \
+                                            "addi   %%r4, %%r4, -8      \n\t"   \
+                                            "addic  %%r5, %%r5,  0      \n\t"
 
 #define MULADDC_CORE                        \
-        "ldu    %%r7, 8(%%r3)       \n\t"   \
-        "mulld  %%r8, %%r7, %%r6    \n\t"   \
-        "mulhdu %%r9, %%r7, %%r6    \n\t"   \
-        "adde   %%r8, %%r8, %%r5    \n\t"   \
-        "ld     %%r7, 8(%%r4)       \n\t"   \
-        "addze  %%r5, %%r9          \n\t"   \
-        "addc   %%r8, %%r8, %%r7    \n\t"   \
-        "stdu   %%r8, 8(%%r4)       \n\t"
+    "ldu    %%r7, 8(%%r3)       \n\t"   \
+    "mulld  %%r8, %%r7, %%r6    \n\t"   \
+    "mulhdu %%r9, %%r7, %%r6    \n\t"   \
+    "adde   %%r8, %%r8, %%r5    \n\t"   \
+    "ld     %%r7, 8(%%r4)       \n\t"   \
+    "addze  %%r5, %%r9          \n\t"   \
+    "addc   %%r8, %%r8, %%r7    \n\t"   \
+    "stdu   %%r8, 8(%%r4)       \n\t"
 
 #define MULADDC_STOP                        \
-        "addze  %%r5, %%r5          \n\t"   \
-        "addi   %%r4, %%r4, 8       \n\t"   \
-        "addi   %%r3, %%r3, 8       \n\t"   \
-        "std    %%r5, %0            \n\t"   \
-        "std    %%r4, %1            \n\t"   \
-        "std    %%r3, %2            \n\t"   \
-        : "=m" (c), "=m" (d), "=m" (s)              \
+    "addze  %%r5, %%r5          \n\t"   \
+    "addi   %%r4, %%r4, 8       \n\t"   \
+    "addi   %%r3, %%r3, 8       \n\t"   \
+    "std    %%r5, %0            \n\t"   \
+    "std    %%r4, %1            \n\t"   \
+    "std    %%r3, %2            \n\t"   \
+    : "=m" (c), "=m" (d), "=m" (s)              \
         : "m" (s), "m" (d), "m" (c), "m" (b)        \
-        : "r3", "r4", "r5", "r6", "r7", "r8", "r9"  \
-    );
+              : "r3", "r4", "r5", "r6", "r7", "r8", "r9"  \
+            );
 
 #endif /* __MACH__ && __APPLE__ */
 
@@ -346,69 +346,69 @@
 
 #define MULADDC_INIT                    \
     asm(                                \
-        "lwz    r3, %3          \n\t"   \
-        "lwz    r4, %4          \n\t"   \
-        "lwz    r5, %5          \n\t"   \
-        "lwz    r6, %6          \n\t"   \
-        "addi   r3, r3, -4      \n\t"   \
-        "addi   r4, r4, -4      \n\t"   \
-        "addic  r5, r5,  0      \n\t"
+                                        "lwz    r3, %3          \n\t"   \
+                                        "lwz    r4, %4          \n\t"   \
+                                        "lwz    r5, %5          \n\t"   \
+                                        "lwz    r6, %6          \n\t"   \
+                                        "addi   r3, r3, -4      \n\t"   \
+                                        "addi   r4, r4, -4      \n\t"   \
+                                        "addic  r5, r5,  0      \n\t"
 
 #define MULADDC_CORE                    \
-        "lwzu   r7, 4(r3)       \n\t"   \
-        "mullw  r8, r7, r6      \n\t"   \
-        "mulhwu r9, r7, r6      \n\t"   \
-        "adde   r8, r8, r5      \n\t"   \
-        "lwz    r7, 4(r4)       \n\t"   \
-        "addze  r5, r9          \n\t"   \
-        "addc   r8, r8, r7      \n\t"   \
-        "stwu   r8, 4(r4)       \n\t"
+    "lwzu   r7, 4(r3)       \n\t"   \
+    "mullw  r8, r7, r6      \n\t"   \
+    "mulhwu r9, r7, r6      \n\t"   \
+    "adde   r8, r8, r5      \n\t"   \
+    "lwz    r7, 4(r4)       \n\t"   \
+    "addze  r5, r9          \n\t"   \
+    "addc   r8, r8, r7      \n\t"   \
+    "stwu   r8, 4(r4)       \n\t"
 
 #define MULADDC_STOP                    \
-        "addze  r5, r5          \n\t"   \
-        "addi   r4, r4, 4       \n\t"   \
-        "addi   r3, r3, 4       \n\t"   \
-        "stw    r5, %0          \n\t"   \
-        "stw    r4, %1          \n\t"   \
-        "stw    r3, %2          \n\t"   \
-        : "=m" (c), "=m" (d), "=m" (s)              \
+    "addze  r5, r5          \n\t"   \
+    "addi   r4, r4, 4       \n\t"   \
+    "addi   r3, r3, 4       \n\t"   \
+    "stw    r5, %0          \n\t"   \
+    "stw    r4, %1          \n\t"   \
+    "stw    r3, %2          \n\t"   \
+    : "=m" (c), "=m" (d), "=m" (s)              \
         : "m" (s), "m" (d), "m" (c), "m" (b)        \
-        : "r3", "r4", "r5", "r6", "r7", "r8", "r9"  \
-    );
+              : "r3", "r4", "r5", "r6", "r7", "r8", "r9"  \
+            );
 
 #else /* __MACH__ && __APPLE__ */
 
 #define MULADDC_INIT                        \
     asm(                                    \
-        "lwz    %%r3, %3            \n\t"   \
-        "lwz    %%r4, %4            \n\t"   \
-        "lwz    %%r5, %5            \n\t"   \
-        "lwz    %%r6, %6            \n\t"   \
-        "addi   %%r3, %%r3, -4      \n\t"   \
-        "addi   %%r4, %%r4, -4      \n\t"   \
-        "addic  %%r5, %%r5,  0      \n\t"
+                                            "lwz    %%r3, %3            \n\t"   \
+                                            "lwz    %%r4, %4            \n\t"   \
+                                            "lwz    %%r5, %5            \n\t"   \
+                                            "lwz    %%r6, %6            \n\t"   \
+                                            "addi   %%r3, %%r3, -4      \n\t"   \
+                                            "addi   %%r4, %%r4, -4      \n\t"   \
+                                            "addic  %%r5, %%r5,  0      \n\t"
 
 #define MULADDC_CORE                        \
-        "lwzu   %%r7, 4(%%r3)       \n\t"   \
-        "mullw  %%r8, %%r7, %%r6    \n\t"   \
-        "mulhwu %%r9, %%r7, %%r6    \n\t"   \
-        "adde   %%r8, %%r8, %%r5    \n\t"   \
-        "lwz    %%r7, 4(%%r4)       \n\t"   \
-        "addze  %%r5, %%r9          \n\t"   \
-        "addc   %%r8, %%r8, %%r7    \n\t"   \
-        "stwu   %%r8, 4(%%r4)       \n\t"
+    "lwzu   %%r7, 4(%%r3)       \n\t"   \
+    "mullw  %%r8, %%r7, %%r6    \n\t"   \
+    "mulhwu %%r9, %%r7, %%r6    \n\t"   \
+    "adde   %%r8, %%r8, %%r5    \n\t"   \
+    "lwz    %%r7, 4(%%r4)       \n\t"   \
+    "addze  %%r5, %%r9          \n\t"   \
+    "addc   %%r8, %%r8, %%r7    \n\t"   \
+    "stwu   %%r8, 4(%%r4)       \n\t"
 
 #define MULADDC_STOP                        \
-        "addze  %%r5, %%r5          \n\t"   \
-        "addi   %%r4, %%r4, 4       \n\t"   \
-        "addi   %%r3, %%r3, 4       \n\t"   \
-        "stw    %%r5, %0            \n\t"   \
-        "stw    %%r4, %1            \n\t"   \
-        "stw    %%r3, %2            \n\t"   \
-        : "=m" (c), "=m" (d), "=m" (s)              \
+    "addze  %%r5, %%r5          \n\t"   \
+    "addi   %%r4, %%r4, 4       \n\t"   \
+    "addi   %%r3, %%r3, 4       \n\t"   \
+    "stw    %%r5, %0            \n\t"   \
+    "stw    %%r4, %1            \n\t"   \
+    "stw    %%r3, %2            \n\t"   \
+    : "=m" (c), "=m" (d), "=m" (s)              \
         : "m" (s), "m" (d), "m" (c), "m" (b)        \
-        : "r3", "r4", "r5", "r6", "r7", "r8", "r9"  \
-    );
+              : "r3", "r4", "r5", "r6", "r7", "r8", "r9"  \
+            );
 
 #endif /* __MACH__ && __APPLE__ */
 
@@ -423,65 +423,65 @@
 
 #define MULADDC_INIT                                    \
     asm(                                                \
-                "ldx     %3, %%o0               \n\t"   \
-                "ldx     %4, %%o1               \n\t"   \
-                "ld      %5, %%o2               \n\t"   \
-                "ld      %6, %%o3               \n\t"
+                                                        "ldx     %3, %%o0               \n\t"   \
+                                                        "ldx     %4, %%o1               \n\t"   \
+                                                        "ld      %5, %%o2               \n\t"   \
+                                                        "ld      %6, %%o3               \n\t"
 
 #define MULADDC_CORE                                    \
-                "ld      [%%o0], %%o4           \n\t"   \
-                "inc     4, %%o0                \n\t"   \
-                "ld      [%%o1], %%o5           \n\t"   \
-                "umul    %%o3, %%o4, %%o4       \n\t"   \
-                "addcc   %%o4, %%o2, %%o4       \n\t"   \
-                "rd      %%y, %%g1              \n\t"   \
-                "addx    %%g1, 0, %%g1          \n\t"   \
-                "addcc   %%o4, %%o5, %%o4       \n\t"   \
-                "st      %%o4, [%%o1]           \n\t"   \
-                "addx    %%g1, 0, %%o2          \n\t"   \
-                "inc     4, %%o1                \n\t"
+    "ld      [%%o0], %%o4           \n\t"   \
+    "inc     4, %%o0                \n\t"   \
+    "ld      [%%o1], %%o5           \n\t"   \
+    "umul    %%o3, %%o4, %%o4       \n\t"   \
+    "addcc   %%o4, %%o2, %%o4       \n\t"   \
+    "rd      %%y, %%g1              \n\t"   \
+    "addx    %%g1, 0, %%g1          \n\t"   \
+    "addcc   %%o4, %%o5, %%o4       \n\t"   \
+    "st      %%o4, [%%o1]           \n\t"   \
+    "addx    %%g1, 0, %%o2          \n\t"   \
+    "inc     4, %%o1                \n\t"
 
-        #define MULADDC_STOP                            \
-                "st      %%o2, %0               \n\t"   \
-                "stx     %%o1, %1               \n\t"   \
-                "stx     %%o0, %2               \n\t"   \
-        : "=m" (c), "=m" (d), "=m" (s)          \
+#define MULADDC_STOP                            \
+    "st      %%o2, %0               \n\t"   \
+    "stx     %%o1, %1               \n\t"   \
+    "stx     %%o0, %2               \n\t"   \
+    : "=m" (c), "=m" (d), "=m" (s)          \
         : "m" (s), "m" (d), "m" (c), "m" (b)    \
-        : "g1", "o0", "o1", "o2", "o3", "o4",   \
-          "o5"                                  \
-        );
+              : "g1", "o0", "o1", "o2", "o3", "o4",   \
+            "o5"                                  \
+            );
 
 #else /* __sparc64__ */
 
 #define MULADDC_INIT                                    \
     asm(                                                \
-                "ld      %3, %%o0               \n\t"   \
-                "ld      %4, %%o1               \n\t"   \
-                "ld      %5, %%o2               \n\t"   \
-                "ld      %6, %%o3               \n\t"
+                                                        "ld      %3, %%o0               \n\t"   \
+                                                        "ld      %4, %%o1               \n\t"   \
+                                                        "ld      %5, %%o2               \n\t"   \
+                                                        "ld      %6, %%o3               \n\t"
 
 #define MULADDC_CORE                                    \
-                "ld      [%%o0], %%o4           \n\t"   \
-                "inc     4, %%o0                \n\t"   \
-                "ld      [%%o1], %%o5           \n\t"   \
-                "umul    %%o3, %%o4, %%o4       \n\t"   \
-                "addcc   %%o4, %%o2, %%o4       \n\t"   \
-                "rd      %%y, %%g1              \n\t"   \
-                "addx    %%g1, 0, %%g1          \n\t"   \
-                "addcc   %%o4, %%o5, %%o4       \n\t"   \
-                "st      %%o4, [%%o1]           \n\t"   \
-                "addx    %%g1, 0, %%o2          \n\t"   \
-                "inc     4, %%o1                \n\t"
+    "ld      [%%o0], %%o4           \n\t"   \
+    "inc     4, %%o0                \n\t"   \
+    "ld      [%%o1], %%o5           \n\t"   \
+    "umul    %%o3, %%o4, %%o4       \n\t"   \
+    "addcc   %%o4, %%o2, %%o4       \n\t"   \
+    "rd      %%y, %%g1              \n\t"   \
+    "addx    %%g1, 0, %%g1          \n\t"   \
+    "addcc   %%o4, %%o5, %%o4       \n\t"   \
+    "st      %%o4, [%%o1]           \n\t"   \
+    "addx    %%g1, 0, %%o2          \n\t"   \
+    "inc     4, %%o1                \n\t"
 
 #define MULADDC_STOP                                    \
-                "st      %%o2, %0               \n\t"   \
-                "st      %%o1, %1               \n\t"   \
-                "st      %%o0, %2               \n\t"   \
-        : "=m" (c), "=m" (d), "=m" (s)          \
+    "st      %%o2, %0               \n\t"   \
+    "st      %%o1, %1               \n\t"   \
+    "st      %%o0, %2               \n\t"   \
+    : "=m" (c), "=m" (d), "=m" (s)          \
         : "m" (s), "m" (d), "m" (c), "m" (b)    \
-        : "g1", "o0", "o1", "o2", "o3", "o4",   \
-          "o5"                                  \
-        );
+              : "g1", "o0", "o1", "o2", "o3", "o4",   \
+            "o5"                                  \
+            );
 
 #endif /* __sparc64__ */
 #endif /* __sparc__ */
@@ -490,49 +490,49 @@
 
 #define MULADDC_INIT                    \
     asm(                                \
-        "lwi   r3,   %3         \n\t"   \
-        "lwi   r4,   %4         \n\t"   \
-        "lwi   r5,   %5         \n\t"   \
-        "lwi   r6,   %6         \n\t"   \
-        "andi  r7,   r6, 0xffff \n\t"   \
-        "bsrli r6,   r6, 16     \n\t"
+                                        "lwi   r3,   %3         \n\t"   \
+                                        "lwi   r4,   %4         \n\t"   \
+                                        "lwi   r5,   %5         \n\t"   \
+                                        "lwi   r6,   %6         \n\t"   \
+                                        "andi  r7,   r6, 0xffff \n\t"   \
+                                        "bsrli r6,   r6, 16     \n\t"
 
 #define MULADDC_CORE                    \
-        "lhui  r8,   r3,   0    \n\t"   \
-        "addi  r3,   r3,   2    \n\t"   \
-        "lhui  r9,   r3,   0    \n\t"   \
-        "addi  r3,   r3,   2    \n\t"   \
-        "mul   r10,  r9,  r6    \n\t"   \
-        "mul   r11,  r8,  r7    \n\t"   \
-        "mul   r12,  r9,  r7    \n\t"   \
-        "mul   r13,  r8,  r6    \n\t"   \
-        "bsrli  r8, r10,  16    \n\t"   \
-        "bsrli  r9, r11,  16    \n\t"   \
-        "add   r13, r13,  r8    \n\t"   \
-        "add   r13, r13,  r9    \n\t"   \
-        "bslli r10, r10,  16    \n\t"   \
-        "bslli r11, r11,  16    \n\t"   \
-        "add   r12, r12, r10    \n\t"   \
-        "addc  r13, r13,  r0    \n\t"   \
-        "add   r12, r12, r11    \n\t"   \
-        "addc  r13, r13,  r0    \n\t"   \
-        "lwi   r10,  r4,   0    \n\t"   \
-        "add   r12, r12, r10    \n\t"   \
-        "addc  r13, r13,  r0    \n\t"   \
-        "add   r12, r12,  r5    \n\t"   \
-        "addc   r5, r13,  r0    \n\t"   \
-        "swi   r12,  r4,   0    \n\t"   \
-        "addi   r4,  r4,   4    \n\t"
+    "lhui  r8,   r3,   0    \n\t"   \
+    "addi  r3,   r3,   2    \n\t"   \
+    "lhui  r9,   r3,   0    \n\t"   \
+    "addi  r3,   r3,   2    \n\t"   \
+    "mul   r10,  r9,  r6    \n\t"   \
+    "mul   r11,  r8,  r7    \n\t"   \
+    "mul   r12,  r9,  r7    \n\t"   \
+    "mul   r13,  r8,  r6    \n\t"   \
+    "bsrli  r8, r10,  16    \n\t"   \
+    "bsrli  r9, r11,  16    \n\t"   \
+    "add   r13, r13,  r8    \n\t"   \
+    "add   r13, r13,  r9    \n\t"   \
+    "bslli r10, r10,  16    \n\t"   \
+    "bslli r11, r11,  16    \n\t"   \
+    "add   r12, r12, r10    \n\t"   \
+    "addc  r13, r13,  r0    \n\t"   \
+    "add   r12, r12, r11    \n\t"   \
+    "addc  r13, r13,  r0    \n\t"   \
+    "lwi   r10,  r4,   0    \n\t"   \
+    "add   r12, r12, r10    \n\t"   \
+    "addc  r13, r13,  r0    \n\t"   \
+    "add   r12, r12,  r5    \n\t"   \
+    "addc   r5, r13,  r0    \n\t"   \
+    "swi   r12,  r4,   0    \n\t"   \
+    "addi   r4,  r4,   4    \n\t"
 
 #define MULADDC_STOP                    \
-        "swi   r5,   %0         \n\t"   \
-        "swi   r4,   %1         \n\t"   \
-        "swi   r3,   %2         \n\t"   \
-        : "=m" (c), "=m" (d), "=m" (s)              \
+    "swi   r5,   %0         \n\t"   \
+    "swi   r4,   %1         \n\t"   \
+    "swi   r3,   %2         \n\t"   \
+    : "=m" (c), "=m" (d), "=m" (s)              \
         : "m" (s), "m" (d), "m" (c), "m" (b)        \
-        : "r3", "r4", "r5", "r6", "r7", "r8",       \
-          "r9", "r10", "r11", "r12", "r13"          \
-    );
+              : "r3", "r4", "r5", "r6", "r7", "r8",       \
+            "r9", "r10", "r11", "r12", "r13"          \
+            );
 
 #endif /* MicroBlaze */
 
@@ -540,29 +540,29 @@
 
 #define MULADDC_INIT                            \
     asm(                                        \
-        "ld.a   %%a2, %3                \n\t"   \
-        "ld.a   %%a3, %4                \n\t"   \
-        "ld.w   %%d4, %5                \n\t"   \
-        "ld.w   %%d1, %6                \n\t"   \
-        "xor    %%d5, %%d5              \n\t"
+                                                "ld.a   %%a2, %3                \n\t"   \
+                                                "ld.a   %%a3, %4                \n\t"   \
+                                                "ld.w   %%d4, %5                \n\t"   \
+                                                "ld.w   %%d1, %6                \n\t"   \
+                                                "xor    %%d5, %%d5              \n\t"
 
 #define MULADDC_CORE                            \
-        "ld.w   %%d0,   [%%a2+]         \n\t"   \
-        "madd.u %%e2, %%e4, %%d0, %%d1  \n\t"   \
-        "ld.w   %%d0,   [%%a3]          \n\t"   \
-        "addx   %%d2,    %%d2,  %%d0    \n\t"   \
-        "addc   %%d3,    %%d3,    0     \n\t"   \
-        "mov    %%d4,    %%d3           \n\t"   \
-        "st.w  [%%a3+],  %%d2           \n\t"
+    "ld.w   %%d0,   [%%a2+]         \n\t"   \
+    "madd.u %%e2, %%e4, %%d0, %%d1  \n\t"   \
+    "ld.w   %%d0,   [%%a3]          \n\t"   \
+    "addx   %%d2,    %%d2,  %%d0    \n\t"   \
+    "addc   %%d3,    %%d3,    0     \n\t"   \
+    "mov    %%d4,    %%d3           \n\t"   \
+    "st.w  [%%a3+],  %%d2           \n\t"
 
 #define MULADDC_STOP                            \
-        "st.w   %0, %%d4                \n\t"   \
-        "st.a   %1, %%a3                \n\t"   \
-        "st.a   %2, %%a2                \n\t"   \
-        : "=m" (c), "=m" (d), "=m" (s)          \
+    "st.w   %0, %%d4                \n\t"   \
+    "st.a   %1, %%a3                \n\t"   \
+    "st.a   %2, %%a2                \n\t"   \
+    : "=m" (c), "=m" (d), "=m" (s)          \
         : "m" (s), "m" (d), "m" (c), "m" (b)    \
-        : "d0", "d1", "e2", "d4", "a2", "a3"    \
-    );
+              : "d0", "d1", "e2", "d4", "a2", "a3"    \
+            );
 
 #endif /* TriCore */
 
@@ -588,84 +588,84 @@
 
 #define MULADDC_INIT                                    \
     asm(                                                \
-            "ldr    r0, %3                      \n\t"   \
-            "ldr    r1, %4                      \n\t"   \
-            "ldr    r2, %5                      \n\t"   \
-            "ldr    r3, %6                      \n\t"   \
-            "lsr    r7, r3, #16                 \n\t"   \
-            "mov    r9, r7                      \n\t"   \
-            "lsl    r7, r3, #16                 \n\t"   \
-            "lsr    r7, r7, #16                 \n\t"   \
-            "mov    r8, r7                      \n\t"
+                                                        "ldr    r0, %3                      \n\t"   \
+                                                        "ldr    r1, %4                      \n\t"   \
+                                                        "ldr    r2, %5                      \n\t"   \
+                                                        "ldr    r3, %6                      \n\t"   \
+                                                        "lsr    r7, r3, #16                 \n\t"   \
+                                                        "mov    r9, r7                      \n\t"   \
+                                                        "lsl    r7, r3, #16                 \n\t"   \
+                                                        "lsr    r7, r7, #16                 \n\t"   \
+                                                        "mov    r8, r7                      \n\t"
 
 #define MULADDC_CORE                                    \
-            "ldmia  r0!, {r6}                   \n\t"   \
-            "lsr    r7, r6, #16                 \n\t"   \
-            "lsl    r6, r6, #16                 \n\t"   \
-            "lsr    r6, r6, #16                 \n\t"   \
-            "mov    r4, r8                      \n\t"   \
-            "mul    r4, r6                      \n\t"   \
-            "mov    r3, r9                      \n\t"   \
-            "mul    r6, r3                      \n\t"   \
-            "mov    r5, r9                      \n\t"   \
-            "mul    r5, r7                      \n\t"   \
-            "mov    r3, r8                      \n\t"   \
-            "mul    r7, r3                      \n\t"   \
-            "lsr    r3, r6, #16                 \n\t"   \
-            "add    r5, r5, r3                  \n\t"   \
-            "lsr    r3, r7, #16                 \n\t"   \
-            "add    r5, r5, r3                  \n\t"   \
-            "add    r4, r4, r2                  \n\t"   \
-            "mov    r2, #0                      \n\t"   \
-            "adc    r5, r2                      \n\t"   \
-            "lsl    r3, r6, #16                 \n\t"   \
-            "add    r4, r4, r3                  \n\t"   \
-            "adc    r5, r2                      \n\t"   \
-            "lsl    r3, r7, #16                 \n\t"   \
-            "add    r4, r4, r3                  \n\t"   \
-            "adc    r5, r2                      \n\t"   \
-            "ldr    r3, [r1]                    \n\t"   \
-            "add    r4, r4, r3                  \n\t"   \
-            "adc    r2, r5                      \n\t"   \
-            "stmia  r1!, {r4}                   \n\t"
+    "ldmia  r0!, {r6}                   \n\t"   \
+    "lsr    r7, r6, #16                 \n\t"   \
+    "lsl    r6, r6, #16                 \n\t"   \
+    "lsr    r6, r6, #16                 \n\t"   \
+    "mov    r4, r8                      \n\t"   \
+    "mul    r4, r6                      \n\t"   \
+    "mov    r3, r9                      \n\t"   \
+    "mul    r6, r3                      \n\t"   \
+    "mov    r5, r9                      \n\t"   \
+    "mul    r5, r7                      \n\t"   \
+    "mov    r3, r8                      \n\t"   \
+    "mul    r7, r3                      \n\t"   \
+    "lsr    r3, r6, #16                 \n\t"   \
+    "add    r5, r5, r3                  \n\t"   \
+    "lsr    r3, r7, #16                 \n\t"   \
+    "add    r5, r5, r3                  \n\t"   \
+    "add    r4, r4, r2                  \n\t"   \
+    "mov    r2, #0                      \n\t"   \
+    "adc    r5, r2                      \n\t"   \
+    "lsl    r3, r6, #16                 \n\t"   \
+    "add    r4, r4, r3                  \n\t"   \
+    "adc    r5, r2                      \n\t"   \
+    "lsl    r3, r7, #16                 \n\t"   \
+    "add    r4, r4, r3                  \n\t"   \
+    "adc    r5, r2                      \n\t"   \
+    "ldr    r3, [r1]                    \n\t"   \
+    "add    r4, r4, r3                  \n\t"   \
+    "adc    r2, r5                      \n\t"   \
+    "stmia  r1!, {r4}                   \n\t"
 
 #define MULADDC_STOP                                    \
-            "str    r2, %0                      \n\t"   \
-            "str    r1, %1                      \n\t"   \
-            "str    r0, %2                      \n\t"   \
-         : "=m" (c),  "=m" (d), "=m" (s)        \
-         : "m" (s), "m" (d), "m" (c), "m" (b)   \
-         : "r0", "r1", "r2", "r3", "r4", "r5",  \
-           "r6", "r7", "r8", "r9", "cc"         \
-         );
+    "str    r2, %0                      \n\t"   \
+    "str    r1, %1                      \n\t"   \
+    "str    r0, %2                      \n\t"   \
+    : "=m" (c),  "=m" (d), "=m" (s)        \
+        : "m" (s), "m" (d), "m" (c), "m" (b)   \
+              : "r0", "r1", "r2", "r3", "r4", "r5",  \
+            "r6", "r7", "r8", "r9", "cc"         \
+            );
 
 #else
 
 #define MULADDC_INIT                                    \
     asm(                                                \
-            "ldr    r0, %3                      \n\t"   \
-            "ldr    r1, %4                      \n\t"   \
-            "ldr    r2, %5                      \n\t"   \
-            "ldr    r3, %6                      \n\t"
+                                                        "ldr    r0, %3                      \n\t"   \
+                                                        "ldr    r1, %4                      \n\t"   \
+                                                        "ldr    r2, %5                      \n\t"   \
+                                                        "ldr    r3, %6                      \n\t"
 
 #define MULADDC_CORE                                    \
-            "ldr    r4, [r0], #4                \n\t"   \
-            "mov    r5, #0                      \n\t"   \
-            "ldr    r6, [r1]                    \n\t"   \
-            "umlal  r2, r5, r3, r4              \n\t"   \
-            "adds   r7, r6, r2                  \n\t"   \
-            "adc    r2, r5, #0                  \n\t"   \
-            "str    r7, [r1], #4                \n\t"
+    "ldr    r4, [r0], #4                \n\t"   \
+    "mov    r5, #0                      \n\t"   \
+    "ldr    r6, [r1]                    \n\t"   \
+    "umlal  r2, r5, r3, r4              \n\t"   \
+    "adds   r7, r6, r2                  \n\t"   \
+    "adc    r2, r5, #0                  \n\t"   \
+    "str    r7, [r1], #4                \n\t"
 
 #define MULADDC_STOP                                    \
-            "str    r2, %0                      \n\t"   \
-            "str    r1, %1                      \n\t"   \
-            "str    r0, %2                      \n\t"   \
-         : "=m" (c),  "=m" (d), "=m" (s)        \
-         : "m" (s), "m" (d), "m" (c), "m" (b)   \
-         : "r0", "r1", "r2", "r3", "r4", "r5",  \
-           "r6", "r7", "cc"                     \
-         );
+    "str    r2, %0                      \n\t"   \
+    "str    r1, %1                      \n\t"   \
+    "str    r0, %2                      \n\t"   \
+    : "=m" (c),  "=m" (d), "=m" (s)        \
+        : "m" (s), "m" (d), "m" (c), "m" (b)   \
+              : "r0", "r1", "r2", "r3", "r4", "r5",  \
+            "r6", "r7", "cc"                     \
+            );
 
 #endif /* Thumb */
 
@@ -675,69 +675,69 @@
 
 #define MULADDC_INIT                    \
     asm(                                \
-        "ldq    $1, %3          \n\t"   \
-        "ldq    $2, %4          \n\t"   \
-        "ldq    $3, %5          \n\t"   \
-        "ldq    $4, %6          \n\t"
+                                        "ldq    $1, %3          \n\t"   \
+                                        "ldq    $2, %4          \n\t"   \
+                                        "ldq    $3, %5          \n\t"   \
+                                        "ldq    $4, %6          \n\t"
 
 #define MULADDC_CORE                    \
-        "ldq    $6,  0($1)      \n\t"   \
-        "addq   $1,  8, $1      \n\t"   \
-        "mulq   $6, $4, $7      \n\t"   \
-        "umulh  $6, $4, $6      \n\t"   \
-        "addq   $7, $3, $7      \n\t"   \
-        "cmpult $7, $3, $3      \n\t"   \
-        "ldq    $5,  0($2)      \n\t"   \
-        "addq   $7, $5, $7      \n\t"   \
-        "cmpult $7, $5, $5      \n\t"   \
-        "stq    $7,  0($2)      \n\t"   \
-        "addq   $2,  8, $2      \n\t"   \
-        "addq   $6, $3, $3      \n\t"   \
-        "addq   $5, $3, $3      \n\t"
+    "ldq    $6,  0($1)      \n\t"   \
+    "addq   $1,  8, $1      \n\t"   \
+    "mulq   $6, $4, $7      \n\t"   \
+    "umulh  $6, $4, $6      \n\t"   \
+    "addq   $7, $3, $7      \n\t"   \
+    "cmpult $7, $3, $3      \n\t"   \
+    "ldq    $5,  0($2)      \n\t"   \
+    "addq   $7, $5, $7      \n\t"   \
+    "cmpult $7, $5, $5      \n\t"   \
+    "stq    $7,  0($2)      \n\t"   \
+    "addq   $2,  8, $2      \n\t"   \
+    "addq   $6, $3, $3      \n\t"   \
+    "addq   $5, $3, $3      \n\t"
 
 #define MULADDC_STOP                                    \
-        "stq    $3, %0          \n\t"   \
-        "stq    $2, %1          \n\t"   \
-        "stq    $1, %2          \n\t"   \
-        : "=m" (c), "=m" (d), "=m" (s)              \
+    "stq    $3, %0          \n\t"   \
+    "stq    $2, %1          \n\t"   \
+    "stq    $1, %2          \n\t"   \
+    : "=m" (c), "=m" (d), "=m" (s)              \
         : "m" (s), "m" (d), "m" (c), "m" (b)        \
-        : "$1", "$2", "$3", "$4", "$5", "$6", "$7"  \
-    );
+              : "$1", "$2", "$3", "$4", "$5", "$6", "$7"  \
+            );
 #endif /* Alpha */
 
 #if defined(__mips__) && !defined(__mips64)
 
 #define MULADDC_INIT                    \
     asm(                                \
-        "lw     $10, %3         \n\t"   \
-        "lw     $11, %4         \n\t"   \
-        "lw     $12, %5         \n\t"   \
-        "lw     $13, %6         \n\t"
+                                        "lw     $10, %3         \n\t"   \
+                                        "lw     $11, %4         \n\t"   \
+                                        "lw     $12, %5         \n\t"   \
+                                        "lw     $13, %6         \n\t"
 
 #define MULADDC_CORE                    \
-        "lw     $14, 0($10)     \n\t"   \
-        "multu  $13, $14        \n\t"   \
-        "addi   $10, $10, 4     \n\t"   \
-        "mflo   $14             \n\t"   \
-        "mfhi   $9              \n\t"   \
-        "addu   $14, $12, $14   \n\t"   \
-        "lw     $15, 0($11)     \n\t"   \
-        "sltu   $12, $14, $12   \n\t"   \
-        "addu   $15, $14, $15   \n\t"   \
-        "sltu   $14, $15, $14   \n\t"   \
-        "addu   $12, $12, $9    \n\t"   \
-        "sw     $15, 0($11)     \n\t"   \
-        "addu   $12, $12, $14   \n\t"   \
-        "addi   $11, $11, 4     \n\t"
+    "lw     $14, 0($10)     \n\t"   \
+    "multu  $13, $14        \n\t"   \
+    "addi   $10, $10, 4     \n\t"   \
+    "mflo   $14             \n\t"   \
+    "mfhi   $9              \n\t"   \
+    "addu   $14, $12, $14   \n\t"   \
+    "lw     $15, 0($11)     \n\t"   \
+    "sltu   $12, $14, $12   \n\t"   \
+    "addu   $15, $14, $15   \n\t"   \
+    "sltu   $14, $15, $14   \n\t"   \
+    "addu   $12, $12, $9    \n\t"   \
+    "sw     $15, 0($11)     \n\t"   \
+    "addu   $12, $12, $14   \n\t"   \
+    "addi   $11, $11, 4     \n\t"
 
 #define MULADDC_STOP                    \
-        "sw     $12, %0         \n\t"   \
-        "sw     $11, %1         \n\t"   \
-        "sw     $10, %2         \n\t"   \
-        : "=m" (c), "=m" (d), "=m" (s)                      \
+    "sw     $12, %0         \n\t"   \
+    "sw     $11, %1         \n\t"   \
+    "sw     $10, %2         \n\t"   \
+    : "=m" (c), "=m" (d), "=m" (s)                      \
         : "m" (s), "m" (d), "m" (c), "m" (b)                \
-        : "$9", "$10", "$11", "$12", "$13", "$14", "$15"    \
-    );
+              : "$9", "$10", "$11", "$12", "$13", "$14", "$15"    \
+            );
 
 #endif /* MIPS */
 #endif /* GNUC */
@@ -849,9 +849,9 @@
 #if defined(MBEDTLS_HAVE_UDBL)
 
 #define MULADDC_INIT                    \
-{                                       \
-    mbedtls_t_udbl r;                           \
-    mbedtls_mpi_uint r0, r1;
+    {                                       \
+        mbedtls_t_udbl r;                           \
+        mbedtls_mpi_uint r0, r1;
 
 #define MULADDC_CORE                    \
     r   = *(s++) * (mbedtls_t_udbl) b;          \
@@ -862,15 +862,15 @@
     c = r1; *(d++) = r0;
 
 #define MULADDC_STOP                    \
-}
+    }
 
 #else
 #define MULADDC_INIT                    \
-{                                       \
-    mbedtls_mpi_uint s0, s1, b0, b1;              \
-    mbedtls_mpi_uint r0, r1, rx, ry;              \
-    b0 = ( b << biH ) >> biH;           \
-    b1 = ( b >> biH );
+    {                                       \
+        mbedtls_mpi_uint s0, s1, b0, b1;              \
+        mbedtls_mpi_uint r0, r1, rx, ry;              \
+        b0 = ( b << biH ) >> biH;           \
+        b1 = ( b >> biH );
 
 #define MULADDC_CORE                    \
     s0 = ( *s << biH ) >> biH;          \
@@ -887,7 +887,7 @@
     c = r1; *(d++) = r0;
 
 #define MULADDC_STOP                    \
-}
+    }
 
 #endif /* C (generic)  */
 #endif /* C (longlong) */
diff --git a/common/mbedtls/camellia.c b/common/mbedtls/camellia.c
index 3d9ae72c7..6f1a8aec2 100644
--- a/common/mbedtls/camellia.c
+++ b/common/mbedtls/camellia.c
@@ -56,26 +56,25 @@
  */
 #ifndef GET_UINT32_BE
 #define GET_UINT32_BE(n,b,i)                            \
-{                                                       \
-    (n) = ( (uint32_t) (b)[(i)    ] << 24 )             \
-        | ( (uint32_t) (b)[(i) + 1] << 16 )             \
-        | ( (uint32_t) (b)[(i) + 2] <<  8 )             \
-        | ( (uint32_t) (b)[(i) + 3]       );            \
-}
+    {                                                       \
+        (n) = ( (uint32_t) (b)[(i)    ] << 24 )             \
+              | ( (uint32_t) (b)[(i) + 1] << 16 )             \
+              | ( (uint32_t) (b)[(i) + 2] <<  8 )             \
+              | ( (uint32_t) (b)[(i) + 3]       );            \
+    }
 #endif
 
 #ifndef PUT_UINT32_BE
 #define PUT_UINT32_BE(n,b,i)                            \
-{                                                       \
-    (b)[(i)    ] = (unsigned char) ( (n) >> 24 );       \
-    (b)[(i) + 1] = (unsigned char) ( (n) >> 16 );       \
-    (b)[(i) + 2] = (unsigned char) ( (n) >>  8 );       \
-    (b)[(i) + 3] = (unsigned char) ( (n)       );       \
-}
+    {                                                       \
+        (b)[(i)    ] = (unsigned char) ( (n) >> 24 );       \
+        (b)[(i) + 1] = (unsigned char) ( (n) >> 16 );       \
+        (b)[(i) + 2] = (unsigned char) ( (n) >>  8 );       \
+        (b)[(i) + 3] = (unsigned char) ( (n)       );       \
+    }
 #endif
 
-static const unsigned char SIGMA_CHARS[6][8] =
-{
+static const unsigned char SIGMA_CHARS[6][8] = {
     { 0xa0, 0x9e, 0x66, 0x7f, 0x3b, 0xcc, 0x90, 0x8b },
     { 0xb6, 0x7a, 0xe8, 0x58, 0x4c, 0xaa, 0x73, 0xb2 },
     { 0xc6, 0xef, 0x37, 0x2f, 0xe9, 0x4f, 0x82, 0xbe },
@@ -86,24 +85,23 @@ static const unsigned char SIGMA_CHARS[6][8] =
 
 #if defined(MBEDTLS_CAMELLIA_SMALL_MEMORY)
 
-static const unsigned char FSb[256] =
-{
-    112,130, 44,236,179, 39,192,229,228,133, 87, 53,234, 12,174, 65,
-     35,239,107,147, 69, 25,165, 33,237, 14, 79, 78, 29,101,146,189,
-    134,184,175,143,124,235, 31,206, 62, 48,220, 95, 94,197, 11, 26,
-    166,225, 57,202,213, 71, 93, 61,217,  1, 90,214, 81, 86,108, 77,
-    139, 13,154,102,251,204,176, 45,116, 18, 43, 32,240,177,132,153,
-    223, 76,203,194, 52,126,118,  5,109,183,169, 49,209, 23,  4,215,
-     20, 88, 58, 97,222, 27, 17, 28, 50, 15,156, 22, 83, 24,242, 34,
-    254, 68,207,178,195,181,122,145, 36,  8,232,168, 96,252,105, 80,
-    170,208,160,125,161,137, 98,151, 84, 91, 30,149,224,255,100,210,
-     16,196,  0, 72,163,247,117,219,138,  3,230,218,  9, 63,221,148,
-    135, 92,131,  2,205, 74,144, 51,115,103,246,243,157,127,191,226,
-     82,155,216, 38,200, 55,198, 59,129,150,111, 75, 19,190, 99, 46,
-    233,121,167,140,159,110,188,142, 41,245,249,182, 47,253,180, 89,
-    120,152,  6,106,231, 70,113,186,212, 37,171, 66,136,162,141,250,
-    114,  7,185, 85,248,238,172, 10, 54, 73, 42,104, 60, 56,241,164,
-     64, 40,211,123,187,201, 67,193, 21,227,173,244,119,199,128,158
+static const unsigned char FSb[256] = {
+    112, 130, 44, 236, 179, 39, 192, 229, 228, 133, 87, 53, 234, 12, 174, 65,
+    35, 239, 107, 147, 69, 25, 165, 33, 237, 14, 79, 78, 29, 101, 146, 189,
+    134, 184, 175, 143, 124, 235, 31, 206, 62, 48, 220, 95, 94, 197, 11, 26,
+    166, 225, 57, 202, 213, 71, 93, 61, 217,  1, 90, 214, 81, 86, 108, 77,
+    139, 13, 154, 102, 251, 204, 176, 45, 116, 18, 43, 32, 240, 177, 132, 153,
+    223, 76, 203, 194, 52, 126, 118,  5, 109, 183, 169, 49, 209, 23,  4, 215,
+    20, 88, 58, 97, 222, 27, 17, 28, 50, 15, 156, 22, 83, 24, 242, 34,
+    254, 68, 207, 178, 195, 181, 122, 145, 36,  8, 232, 168, 96, 252, 105, 80,
+    170, 208, 160, 125, 161, 137, 98, 151, 84, 91, 30, 149, 224, 255, 100, 210,
+    16, 196,  0, 72, 163, 247, 117, 219, 138,  3, 230, 218,  9, 63, 221, 148,
+    135, 92, 131,  2, 205, 74, 144, 51, 115, 103, 246, 243, 157, 127, 191, 226,
+    82, 155, 216, 38, 200, 55, 198, 59, 129, 150, 111, 75, 19, 190, 99, 46,
+    233, 121, 167, 140, 159, 110, 188, 142, 41, 245, 249, 182, 47, 253, 180, 89,
+    120, 152,  6, 106, 231, 70, 113, 186, 212, 37, 171, 66, 136, 162, 141, 250,
+    114,  7, 185, 85, 248, 238, 172, 10, 54, 73, 42, 104, 60, 56, 241, 164,
+    64, 40, 211, 123, 187, 201, 67, 193, 21, 227, 173, 244, 119, 199, 128, 158
 };
 
 #define SBOX1(n) FSb[(n)]
@@ -113,84 +111,80 @@ static const unsigned char FSb[256] =
 
 #else /* MBEDTLS_CAMELLIA_SMALL_MEMORY */
 
-static const unsigned char FSb[256] =
-{
- 112, 130,  44, 236, 179,  39, 192, 229, 228, 133,  87,  53, 234,  12, 174,  65,
-  35, 239, 107, 147,  69,  25, 165,  33, 237,  14,  79,  78,  29, 101, 146, 189,
- 134, 184, 175, 143, 124, 235,  31, 206,  62,  48, 220,  95,  94, 197,  11,  26,
- 166, 225,  57, 202, 213,  71,  93,  61, 217,   1,  90, 214,  81,  86, 108,  77,
- 139,  13, 154, 102, 251, 204, 176,  45, 116,  18,  43,  32, 240, 177, 132, 153,
- 223,  76, 203, 194,  52, 126, 118,   5, 109, 183, 169,  49, 209,  23,   4, 215,
-  20,  88,  58,  97, 222,  27,  17,  28,  50,  15, 156,  22,  83,  24, 242,  34,
- 254,  68, 207, 178, 195, 181, 122, 145,  36,   8, 232, 168,  96, 252, 105,  80,
- 170, 208, 160, 125, 161, 137,  98, 151,  84,  91,  30, 149, 224, 255, 100, 210,
-  16, 196,   0,  72, 163, 247, 117, 219, 138,   3, 230, 218,   9,  63, 221, 148,
- 135,  92, 131,   2, 205,  74, 144,  51, 115, 103, 246, 243, 157, 127, 191, 226,
-  82, 155, 216,  38, 200,  55, 198,  59, 129, 150, 111,  75,  19, 190,  99,  46,
- 233, 121, 167, 140, 159, 110, 188, 142,  41, 245, 249, 182,  47, 253, 180,  89,
- 120, 152,   6, 106, 231,  70, 113, 186, 212,  37, 171,  66, 136, 162, 141, 250,
- 114,   7, 185,  85, 248, 238, 172,  10,  54,  73,  42, 104,  60,  56, 241, 164,
- 64,  40, 211, 123, 187, 201,  67, 193,  21, 227, 173, 244, 119, 199, 128, 158
+static const unsigned char FSb[256] = {
+    112, 130,  44, 236, 179,  39, 192, 229, 228, 133,  87,  53, 234,  12, 174,  65,
+    35, 239, 107, 147,  69,  25, 165,  33, 237,  14,  79,  78,  29, 101, 146, 189,
+    134, 184, 175, 143, 124, 235,  31, 206,  62,  48, 220,  95,  94, 197,  11,  26,
+    166, 225,  57, 202, 213,  71,  93,  61, 217,   1,  90, 214,  81,  86, 108,  77,
+    139,  13, 154, 102, 251, 204, 176,  45, 116,  18,  43,  32, 240, 177, 132, 153,
+    223,  76, 203, 194,  52, 126, 118,   5, 109, 183, 169,  49, 209,  23,   4, 215,
+    20,  88,  58,  97, 222,  27,  17,  28,  50,  15, 156,  22,  83,  24, 242,  34,
+    254,  68, 207, 178, 195, 181, 122, 145,  36,   8, 232, 168,  96, 252, 105,  80,
+    170, 208, 160, 125, 161, 137,  98, 151,  84,  91,  30, 149, 224, 255, 100, 210,
+    16, 196,   0,  72, 163, 247, 117, 219, 138,   3, 230, 218,   9,  63, 221, 148,
+    135,  92, 131,   2, 205,  74, 144,  51, 115, 103, 246, 243, 157, 127, 191, 226,
+    82, 155, 216,  38, 200,  55, 198,  59, 129, 150, 111,  75,  19, 190,  99,  46,
+    233, 121, 167, 140, 159, 110, 188, 142,  41, 245, 249, 182,  47, 253, 180,  89,
+    120, 152,   6, 106, 231,  70, 113, 186, 212,  37, 171,  66, 136, 162, 141, 250,
+    114,   7, 185,  85, 248, 238, 172,  10,  54,  73,  42, 104,  60,  56, 241, 164,
+    64,  40, 211, 123, 187, 201,  67, 193,  21, 227, 173, 244, 119, 199, 128, 158
 };
 
-static const unsigned char FSb2[256] =
-{
- 224,   5,  88, 217, 103,  78, 129, 203, 201,  11, 174, 106, 213,  24,  93, 130,
-  70, 223, 214,  39, 138,  50,  75,  66, 219,  28, 158, 156,  58, 202,  37, 123,
-  13, 113,  95,  31, 248, 215,  62, 157, 124,  96, 185, 190, 188, 139,  22,  52,
-  77, 195, 114, 149, 171, 142, 186, 122, 179,   2, 180, 173, 162, 172, 216, 154,
-  23,  26,  53, 204, 247, 153,  97,  90, 232,  36,  86,  64, 225,  99,   9,  51,
- 191, 152, 151, 133, 104, 252, 236,  10, 218, 111,  83,  98, 163,  46,   8, 175,
-  40, 176, 116, 194, 189,  54,  34,  56, 100,  30,  57,  44, 166,  48, 229,  68,
- 253, 136, 159, 101, 135, 107, 244,  35,  72,  16, 209,  81, 192, 249, 210, 160,
-  85, 161,  65, 250,  67,  19, 196,  47, 168, 182,  60,  43, 193, 255, 200, 165,
-  32, 137,   0, 144,  71, 239, 234, 183,  21,   6, 205, 181,  18, 126, 187,  41,
-  15, 184,   7,   4, 155, 148,  33, 102, 230, 206, 237, 231,  59, 254, 127, 197,
- 164,  55, 177,  76, 145, 110, 141, 118,   3,  45, 222, 150,  38, 125, 198,  92,
- 211, 242,  79,  25,  63, 220, 121,  29,  82, 235, 243, 109,  94, 251, 105, 178,
- 240,  49,  12, 212, 207, 140, 226, 117, 169,  74,  87, 132,  17,  69,  27, 245,
- 228,  14, 115, 170, 241, 221,  89,  20, 108, 146,  84, 208, 120, 112, 227,  73,
- 128,  80, 167, 246, 119, 147, 134, 131,  42, 199,  91, 233, 238, 143,   1,  61
+static const unsigned char FSb2[256] = {
+    224,   5,  88, 217, 103,  78, 129, 203, 201,  11, 174, 106, 213,  24,  93, 130,
+    70, 223, 214,  39, 138,  50,  75,  66, 219,  28, 158, 156,  58, 202,  37, 123,
+    13, 113,  95,  31, 248, 215,  62, 157, 124,  96, 185, 190, 188, 139,  22,  52,
+    77, 195, 114, 149, 171, 142, 186, 122, 179,   2, 180, 173, 162, 172, 216, 154,
+    23,  26,  53, 204, 247, 153,  97,  90, 232,  36,  86,  64, 225,  99,   9,  51,
+    191, 152, 151, 133, 104, 252, 236,  10, 218, 111,  83,  98, 163,  46,   8, 175,
+    40, 176, 116, 194, 189,  54,  34,  56, 100,  30,  57,  44, 166,  48, 229,  68,
+    253, 136, 159, 101, 135, 107, 244,  35,  72,  16, 209,  81, 192, 249, 210, 160,
+    85, 161,  65, 250,  67,  19, 196,  47, 168, 182,  60,  43, 193, 255, 200, 165,
+    32, 137,   0, 144,  71, 239, 234, 183,  21,   6, 205, 181,  18, 126, 187,  41,
+    15, 184,   7,   4, 155, 148,  33, 102, 230, 206, 237, 231,  59, 254, 127, 197,
+    164,  55, 177,  76, 145, 110, 141, 118,   3,  45, 222, 150,  38, 125, 198,  92,
+    211, 242,  79,  25,  63, 220, 121,  29,  82, 235, 243, 109,  94, 251, 105, 178,
+    240,  49,  12, 212, 207, 140, 226, 117, 169,  74,  87, 132,  17,  69,  27, 245,
+    228,  14, 115, 170, 241, 221,  89,  20, 108, 146,  84, 208, 120, 112, 227,  73,
+    128,  80, 167, 246, 119, 147, 134, 131,  42, 199,  91, 233, 238, 143,   1,  61
 };
 
-static const unsigned char FSb3[256] =
-{
-  56,  65,  22, 118, 217, 147,  96, 242, 114, 194, 171, 154, 117,   6,  87, 160,
- 145, 247, 181, 201, 162, 140, 210, 144, 246,   7, 167,  39, 142, 178,  73, 222,
-  67,  92, 215, 199,  62, 245, 143, 103,  31,  24, 110, 175,  47, 226, 133,  13,
-  83, 240, 156, 101, 234, 163, 174, 158, 236, 128,  45, 107, 168,  43,  54, 166,
- 197, 134,  77,  51, 253, 102,  88, 150,  58,   9, 149,  16, 120, 216,  66, 204,
- 239,  38, 229,  97,  26,  63,  59, 130, 182, 219, 212, 152, 232, 139,   2, 235,
-  10,  44,  29, 176, 111, 141, 136,  14,  25, 135,  78,  11, 169,  12, 121,  17,
- 127,  34, 231,  89, 225, 218,  61, 200,  18,   4, 116,  84,  48, 126, 180,  40,
-  85, 104,  80, 190, 208, 196,  49, 203,  42, 173,  15, 202, 112, 255,  50, 105,
-   8,  98,   0,  36, 209, 251, 186, 237,  69, 129, 115, 109, 132, 159, 238,  74,
- 195,  46, 193,   1, 230,  37,  72, 153, 185, 179, 123, 249, 206, 191, 223, 113,
-  41, 205, 108,  19, 100, 155,  99, 157, 192,  75, 183, 165, 137,  95, 177,  23,
- 244, 188, 211,  70, 207,  55,  94,  71, 148, 250, 252,  91, 151, 254,  90, 172,
-  60,  76,   3,  53, 243,  35, 184,  93, 106, 146, 213,  33,  68,  81, 198, 125,
-  57, 131, 220, 170, 124, 119,  86,   5,  27, 164,  21,  52,  30,  28, 248,  82,
-  32,  20, 233, 189, 221, 228, 161, 224, 138, 241, 214, 122, 187, 227,  64,  79
+static const unsigned char FSb3[256] = {
+    56,  65,  22, 118, 217, 147,  96, 242, 114, 194, 171, 154, 117,   6,  87, 160,
+    145, 247, 181, 201, 162, 140, 210, 144, 246,   7, 167,  39, 142, 178,  73, 222,
+    67,  92, 215, 199,  62, 245, 143, 103,  31,  24, 110, 175,  47, 226, 133,  13,
+    83, 240, 156, 101, 234, 163, 174, 158, 236, 128,  45, 107, 168,  43,  54, 166,
+    197, 134,  77,  51, 253, 102,  88, 150,  58,   9, 149,  16, 120, 216,  66, 204,
+    239,  38, 229,  97,  26,  63,  59, 130, 182, 219, 212, 152, 232, 139,   2, 235,
+    10,  44,  29, 176, 111, 141, 136,  14,  25, 135,  78,  11, 169,  12, 121,  17,
+    127,  34, 231,  89, 225, 218,  61, 200,  18,   4, 116,  84,  48, 126, 180,  40,
+    85, 104,  80, 190, 208, 196,  49, 203,  42, 173,  15, 202, 112, 255,  50, 105,
+    8,  98,   0,  36, 209, 251, 186, 237,  69, 129, 115, 109, 132, 159, 238,  74,
+    195,  46, 193,   1, 230,  37,  72, 153, 185, 179, 123, 249, 206, 191, 223, 113,
+    41, 205, 108,  19, 100, 155,  99, 157, 192,  75, 183, 165, 137,  95, 177,  23,
+    244, 188, 211,  70, 207,  55,  94,  71, 148, 250, 252,  91, 151, 254,  90, 172,
+    60,  76,   3,  53, 243,  35, 184,  93, 106, 146, 213,  33,  68,  81, 198, 125,
+    57, 131, 220, 170, 124, 119,  86,   5,  27, 164,  21,  52,  30,  28, 248,  82,
+    32,  20, 233, 189, 221, 228, 161, 224, 138, 241, 214, 122, 187, 227,  64,  79
 };
 
-static const unsigned char FSb4[256] =
-{
- 112,  44, 179, 192, 228,  87, 234, 174,  35, 107,  69, 165, 237,  79,  29, 146,
- 134, 175, 124,  31,  62, 220,  94,  11, 166,  57, 213,  93, 217,  90,  81, 108,
- 139, 154, 251, 176, 116,  43, 240, 132, 223, 203,  52, 118, 109, 169, 209,   4,
-  20,  58, 222,  17,  50, 156,  83, 242, 254, 207, 195, 122,  36, 232,  96, 105,
- 170, 160, 161,  98,  84,  30, 224, 100,  16,   0, 163, 117, 138, 230,   9, 221,
- 135, 131, 205, 144, 115, 246, 157, 191,  82, 216, 200, 198, 129, 111,  19,  99,
- 233, 167, 159, 188,  41, 249,  47, 180, 120,   6, 231, 113, 212, 171, 136, 141,
- 114, 185, 248, 172,  54,  42,  60, 241,  64, 211, 187,  67,  21, 173, 119, 128,
- 130, 236,  39, 229, 133,  53,  12,  65, 239, 147,  25,  33,  14,  78, 101, 189,
- 184, 143, 235, 206,  48,  95, 197,  26, 225, 202,  71,  61,   1, 214,  86,  77,
-  13, 102, 204,  45,  18,  32, 177, 153,  76, 194, 126,   5, 183,  49,  23, 215,
-  88,  97,  27,  28,  15,  22,  24,  34,  68, 178, 181, 145,   8, 168, 252,  80,
- 208, 125, 137, 151,  91, 149, 255, 210, 196,  72, 247, 219,   3, 218,  63, 148,
-  92,   2,  74,  51, 103, 243, 127, 226, 155,  38,  55,  59, 150,  75, 190,  46,
- 121, 140, 110, 142, 245, 182, 253,  89, 152, 106,  70, 186,  37,  66, 162, 250,
-  7,  85, 238,  10,  73, 104,  56, 164,  40, 123, 201, 193, 227, 244, 199, 158
+static const unsigned char FSb4[256] = {
+    112,  44, 179, 192, 228,  87, 234, 174,  35, 107,  69, 165, 237,  79,  29, 146,
+    134, 175, 124,  31,  62, 220,  94,  11, 166,  57, 213,  93, 217,  90,  81, 108,
+    139, 154, 251, 176, 116,  43, 240, 132, 223, 203,  52, 118, 109, 169, 209,   4,
+    20,  58, 222,  17,  50, 156,  83, 242, 254, 207, 195, 122,  36, 232,  96, 105,
+    170, 160, 161,  98,  84,  30, 224, 100,  16,   0, 163, 117, 138, 230,   9, 221,
+    135, 131, 205, 144, 115, 246, 157, 191,  82, 216, 200, 198, 129, 111,  19,  99,
+    233, 167, 159, 188,  41, 249,  47, 180, 120,   6, 231, 113, 212, 171, 136, 141,
+    114, 185, 248, 172,  54,  42,  60, 241,  64, 211, 187,  67,  21, 173, 119, 128,
+    130, 236,  39, 229, 133,  53,  12,  65, 239, 147,  25,  33,  14,  78, 101, 189,
+    184, 143, 235, 206,  48,  95, 197,  26, 225, 202,  71,  61,   1, 214,  86,  77,
+    13, 102, 204,  45,  18,  32, 177, 153,  76, 194, 126,   5, 183,  49,  23, 215,
+    88,  97,  27,  28,  15,  22,  24,  34,  68, 178, 181, 145,   8, 168, 252,  80,
+    208, 125, 137, 151,  91, 149, 255, 210, 196,  72, 247, 219,   3, 218,  63, 148,
+    92,   2,  74,  51, 103, 243, 127, 226, 155,  38,  55,  59, 150,  75, 190,  46,
+    121, 140, 110, 142, 245, 182, 253,  89, 152, 106,  70, 186,  37,  66, 162, 250,
+    7,  85, 238,  10,  73, 104,  56, 164,  40, 123, 201, 193, 227, 244, 199, 158
 };
 
 #define SBOX1(n) FSb[(n)]
@@ -200,8 +194,7 @@ static const unsigned char FSb4[256] =
 
 #endif /* MBEDTLS_CAMELLIA_SMALL_MEMORY */
 
-static const unsigned char shifts[2][4][4] =
-{
+static const unsigned char shifts[2][4][4] = {
     {
         { 1, 1, 1, 1 }, /* KL */
         { 0, 0, 0, 0 }, /* KR */
@@ -216,32 +209,46 @@ static const unsigned char shifts[2][4][4] =
     }
 };
 
-static const signed char indexes[2][4][20] =
-{
+static const signed char indexes[2][4][20] = {
     {
-        {  0,  1,  2,  3,  8,  9, 10, 11, 38, 39,
-          36, 37, 23, 20, 21, 22, 27, -1, -1, 26 }, /* KL -> RK */
-        { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-          -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }, /* KR -> RK */
-        {  4,  5,  6,  7, 12, 13, 14, 15, 16, 17,
-          18, 19, -1, 24, 25, -1, 31, 28, 29, 30 }, /* KA -> RK */
-        { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-          -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }  /* KB -> RK */
+        {
+            0,  1,  2,  3,  8,  9, 10, 11, 38, 39,
+            36, 37, 23, 20, 21, 22, 27, -1, -1, 26
+        }, /* KL -> RK */
+        {
+            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+                -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
+            }, /* KR -> RK */
+        {
+            4,  5,  6,  7, 12, 13, 14, 15, 16, 17,
+            18, 19, -1, 24, 25, -1, 31, 28, 29, 30
+        }, /* KA -> RK */
+        {
+            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+                -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
+            }  /* KB -> RK */
     },
     {
-        {  0,  1,  2,  3, 61, 62, 63, 60, -1, -1,
-          -1, -1, 27, 24, 25, 26, 35, 32, 33, 34 }, /* KL -> RK */
-        { -1, -1, -1, -1,  8,  9, 10, 11, 16, 17,
-          18, 19, -1, -1, -1, -1, 39, 36, 37, 38 }, /* KR -> RK */
-        { -1, -1, -1, -1, 12, 13, 14, 15, 58, 59,
-          56, 57, 31, 28, 29, 30, -1, -1, -1, -1 }, /* KA -> RK */
-        {  4,  5,  6,  7, 65, 66, 67, 64, 20, 21,
-          22, 23, -1, -1, -1, -1, 43, 40, 41, 42 }  /* KB -> RK */
+        {
+            0,  1,  2,  3, 61, 62, 63, 60, -1, -1,
+            -1, -1, 27, 24, 25, 26, 35, 32, 33, 34
+        }, /* KL -> RK */
+        {
+            -1, -1, -1, -1,  8,  9, 10, 11, 16, 17,
+                18, 19, -1, -1, -1, -1, 39, 36, 37, 38
+            }, /* KR -> RK */
+        {
+            -1, -1, -1, -1, 12, 13, 14, 15, 58, 59,
+                56, 57, 31, 28, 29, 30, -1, -1, -1, -1
+            }, /* KA -> RK */
+        {
+            4,  5,  6,  7, 65, 66, 67, 64, 20, 21,
+            22, 23, -1, -1, -1, -1, 43, 40, 41, 42
+        }  /* KB -> RK */
     }
 };
 
-static const signed char transposes[2][20] =
-{
+static const signed char transposes[2][20] = {
     {
         21, 22, 23, 20,
         -1, -1, -1, -1,
@@ -260,44 +267,44 @@ static const signed char transposes[2][20] =
 
 /* Shift macro for 128 bit strings with rotation smaller than 32 bits (!) */
 #define ROTL(DEST, SRC, SHIFT)                                      \
-{                                                                   \
-    (DEST)[0] = (SRC)[0] << (SHIFT) ^ (SRC)[1] >> (32 - (SHIFT));   \
-    (DEST)[1] = (SRC)[1] << (SHIFT) ^ (SRC)[2] >> (32 - (SHIFT));   \
-    (DEST)[2] = (SRC)[2] << (SHIFT) ^ (SRC)[3] >> (32 - (SHIFT));   \
-    (DEST)[3] = (SRC)[3] << (SHIFT) ^ (SRC)[0] >> (32 - (SHIFT));   \
-}
+    {                                                                   \
+        (DEST)[0] = (SRC)[0] << (SHIFT) ^ (SRC)[1] >> (32 - (SHIFT));   \
+        (DEST)[1] = (SRC)[1] << (SHIFT) ^ (SRC)[2] >> (32 - (SHIFT));   \
+        (DEST)[2] = (SRC)[2] << (SHIFT) ^ (SRC)[3] >> (32 - (SHIFT));   \
+        (DEST)[3] = (SRC)[3] << (SHIFT) ^ (SRC)[0] >> (32 - (SHIFT));   \
+    }
 
 #define FL(XL, XR, KL, KR)                                          \
-{                                                                   \
-    (XR) = ((((XL) & (KL)) << 1) | (((XL) & (KL)) >> 31)) ^ (XR);   \
-    (XL) = ((XR) | (KR)) ^ (XL);                                    \
-}
+    {                                                                   \
+        (XR) = ((((XL) & (KL)) << 1) | (((XL) & (KL)) >> 31)) ^ (XR);   \
+        (XL) = ((XR) | (KR)) ^ (XL);                                    \
+    }
 
 #define FLInv(YL, YR, KL, KR)                                       \
-{                                                                   \
-    (YL) = ((YR) | (KR)) ^ (YL);                                    \
-    (YR) = ((((YL) & (KL)) << 1) | (((YL) & (KL)) >> 31)) ^ (YR);   \
-}
+    {                                                                   \
+        (YL) = ((YR) | (KR)) ^ (YL);                                    \
+        (YR) = ((((YL) & (KL)) << 1) | (((YL) & (KL)) >> 31)) ^ (YR);   \
+    }
 
 #define SHIFT_AND_PLACE(INDEX, OFFSET)                      \
-{                                                           \
-    TK[0] = KC[(OFFSET) * 4 + 0];                           \
-    TK[1] = KC[(OFFSET) * 4 + 1];                           \
-    TK[2] = KC[(OFFSET) * 4 + 2];                           \
-    TK[3] = KC[(OFFSET) * 4 + 3];                           \
-                                                            \
-    for( i = 1; i <= 4; i++ )                               \
-        if( shifts[(INDEX)][(OFFSET)][i -1] )               \
-            ROTL(TK + i * 4, TK, ( 15 * i ) % 32);          \
-                                                            \
-    for( i = 0; i < 20; i++ )                               \
-        if( indexes[(INDEX)][(OFFSET)][i] != -1 ) {         \
-            RK[indexes[(INDEX)][(OFFSET)][i]] = TK[ i ];    \
-        }                                                   \
-}
+    {                                                           \
+        TK[0] = KC[(OFFSET) * 4 + 0];                           \
+        TK[1] = KC[(OFFSET) * 4 + 1];                           \
+        TK[2] = KC[(OFFSET) * 4 + 2];                           \
+        TK[3] = KC[(OFFSET) * 4 + 3];                           \
+        \
+        for( i = 1; i <= 4; i++ )                               \
+            if( shifts[(INDEX)][(OFFSET)][i -1] )               \
+                ROTL(TK + i * 4, TK, ( 15 * i ) % 32);          \
+        \
+        for( i = 0; i < 20; i++ )                               \
+            if( indexes[(INDEX)][(OFFSET)][i] != -1 ) {         \
+                RK[indexes[(INDEX)][(OFFSET)][i]] = TK[ i ];    \
+            }                                                   \
+    }
 
-static void camellia_feistel( const uint32_t x[2], const uint32_t k[2],
-                              uint32_t z[2])
+static void camellia_feistel(const uint32_t x[2], const uint32_t k[2],
+                             uint32_t z[2])
 {
     uint32_t I0, I1;
     I0 = x[0] ^ k[0];
@@ -306,11 +313,11 @@ static void camellia_feistel( const uint32_t x[2], const uint32_t k[2],
     I0 = ((uint32_t) SBOX1((I0 >> 24) & 0xFF) << 24) |
          ((uint32_t) SBOX2((I0 >> 16) & 0xFF) << 16) |
          ((uint32_t) SBOX3((I0 >>  8) & 0xFF) <<  8) |
-         ((uint32_t) SBOX4((I0      ) & 0xFF)      );
+         ((uint32_t) SBOX4((I0) & 0xFF));
     I1 = ((uint32_t) SBOX2((I1 >> 24) & 0xFF) << 24) |
          ((uint32_t) SBOX3((I1 >> 16) & 0xFF) << 16) |
          ((uint32_t) SBOX4((I1 >>  8) & 0xFF) <<  8) |
-         ((uint32_t) SBOX1((I1      ) & 0xFF)      );
+         ((uint32_t) SBOX1((I1) & 0xFF));
 
     I0 ^= (I1 << 8) | (I1 >> 24);
     I1 ^= (I0 << 16) | (I0 >> 16);
@@ -321,24 +328,24 @@ static void camellia_feistel( const uint32_t x[2], const uint32_t k[2],
     z[1] ^= I0;
 }
 
-void mbedtls_camellia_init( mbedtls_camellia_context *ctx )
+void mbedtls_camellia_init(mbedtls_camellia_context *ctx)
 {
-    memset( ctx, 0, sizeof( mbedtls_camellia_context ) );
+    memset(ctx, 0, sizeof(mbedtls_camellia_context));
 }
 
-void mbedtls_camellia_free( mbedtls_camellia_context *ctx )
+void mbedtls_camellia_free(mbedtls_camellia_context *ctx)
 {
-    if( ctx == NULL )
+    if (ctx == NULL)
         return;
 
-    mbedtls_platform_zeroize( ctx, sizeof( mbedtls_camellia_context ) );
+    mbedtls_platform_zeroize(ctx, sizeof(mbedtls_camellia_context));
 }
 
 /*
  * Camellia key schedule (encryption)
  */
-int mbedtls_camellia_setkey_enc( mbedtls_camellia_context *ctx, const unsigned char *key,
-                         unsigned int keybits )
+int mbedtls_camellia_setkey_enc(mbedtls_camellia_context *ctx, const unsigned char *key,
+                                unsigned int keybits)
 {
     int idx;
     size_t i;
@@ -350,63 +357,69 @@ int mbedtls_camellia_setkey_enc( mbedtls_camellia_context *ctx, const unsigned c
 
     RK = ctx->rk;
 
-    memset( t, 0, 64 );
-    memset( RK, 0, sizeof(ctx->rk) );
+    memset(t, 0, 64);
+    memset(RK, 0, sizeof(ctx->rk));
 
-    switch( keybits )
-    {
-        case 128: ctx->nr = 3; idx = 0; break;
+    switch (keybits) {
+        case 128:
+            ctx->nr = 3;
+            idx = 0;
+            break;
         case 192:
-        case 256: ctx->nr = 4; idx = 1; break;
-        default : return( MBEDTLS_ERR_CAMELLIA_INVALID_KEY_LENGTH );
+        case 256:
+            ctx->nr = 4;
+            idx = 1;
+            break;
+        default :
+            return (MBEDTLS_ERR_CAMELLIA_INVALID_KEY_LENGTH);
     }
 
-    for( i = 0; i < keybits / 8; ++i )
+    for (i = 0; i < keybits / 8; ++i)
         t[i] = key[i];
 
-    if( keybits == 192 ) {
-        for( i = 0; i < 8; i++ )
+    if (keybits == 192) {
+        for (i = 0; i < 8; i++)
             t[24 + i] = ~t[16 + i];
     }
 
     /*
      * Prepare SIGMA values
      */
-    for( i = 0; i < 6; i++ ) {
-        GET_UINT32_BE( SIGMA[i][0], SIGMA_CHARS[i], 0 );
-        GET_UINT32_BE( SIGMA[i][1], SIGMA_CHARS[i], 4 );
+    for (i = 0; i < 6; i++) {
+        GET_UINT32_BE(SIGMA[i][0], SIGMA_CHARS[i], 0);
+        GET_UINT32_BE(SIGMA[i][1], SIGMA_CHARS[i], 4);
     }
 
     /*
      * Key storage in KC
      * Order: KL, KR, KA, KB
      */
-    memset( KC, 0, sizeof(KC) );
+    memset(KC, 0, sizeof(KC));
 
     /* Store KL, KR */
-    for( i = 0; i < 8; i++ )
-        GET_UINT32_BE( KC[i], t, i * 4 );
+    for (i = 0; i < 8; i++)
+        GET_UINT32_BE(KC[i], t, i * 4);
 
     /* Generate KA */
-    for( i = 0; i < 4; ++i )
+    for (i = 0; i < 4; ++i)
         KC[8 + i] = KC[i] ^ KC[4 + i];
 
-    camellia_feistel( KC + 8, SIGMA[0], KC + 10 );
-    camellia_feistel( KC + 10, SIGMA[1], KC + 8 );
+    camellia_feistel(KC + 8, SIGMA[0], KC + 10);
+    camellia_feistel(KC + 10, SIGMA[1], KC + 8);
 
-    for( i = 0; i < 4; ++i )
+    for (i = 0; i < 4; ++i)
         KC[8 + i] ^= KC[i];
 
-    camellia_feistel( KC + 8, SIGMA[2], KC + 10 );
-    camellia_feistel( KC + 10, SIGMA[3], KC + 8 );
+    camellia_feistel(KC + 8, SIGMA[2], KC + 10);
+    camellia_feistel(KC + 10, SIGMA[3], KC + 8);
 
-    if( keybits > 128 ) {
+    if (keybits > 128) {
         /* Generate KB */
-        for( i = 0; i < 4; ++i )
+        for (i = 0; i < 4; ++i)
             KC[12 + i] = KC[4 + i] ^ KC[8 + i];
 
-        camellia_feistel( KC + 12, SIGMA[4], KC + 14 );
-        camellia_feistel( KC + 14, SIGMA[5], KC + 12 );
+        camellia_feistel(KC + 12, SIGMA[4], KC + 14);
+        camellia_feistel(KC + 14, SIGMA[5], KC + 12);
     }
 
     /*
@@ -414,36 +427,36 @@ int mbedtls_camellia_setkey_enc( mbedtls_camellia_context *ctx, const unsigned c
      */
 
     /* Manipulating KL */
-    SHIFT_AND_PLACE( idx, 0 );
+    SHIFT_AND_PLACE(idx, 0);
 
     /* Manipulating KR */
-    if( keybits > 128 ) {
-        SHIFT_AND_PLACE( idx, 1 );
+    if (keybits > 128) {
+        SHIFT_AND_PLACE(idx, 1);
     }
 
     /* Manipulating KA */
-    SHIFT_AND_PLACE( idx, 2 );
+    SHIFT_AND_PLACE(idx, 2);
 
     /* Manipulating KB */
-    if( keybits > 128 ) {
-        SHIFT_AND_PLACE( idx, 3 );
+    if (keybits > 128) {
+        SHIFT_AND_PLACE(idx, 3);
     }
 
     /* Do transpositions */
-    for( i = 0; i < 20; i++ ) {
-        if( transposes[idx][i] != -1 ) {
+    for (i = 0; i < 20; i++) {
+        if (transposes[idx][i] != -1) {
             RK[32 + 12 * idx + i] = RK[transposes[idx][i]];
         }
     }
 
-    return( 0 );
+    return (0);
 }
 
 /*
  * Camellia key schedule (decryption)
  */
-int mbedtls_camellia_setkey_dec( mbedtls_camellia_context *ctx, const unsigned char *key,
-                         unsigned int keybits )
+int mbedtls_camellia_setkey_dec(mbedtls_camellia_context *ctx, const unsigned char *key,
+                                unsigned int keybits)
 {
     int idx, ret;
     size_t i;
@@ -451,14 +464,14 @@ int mbedtls_camellia_setkey_dec( mbedtls_camellia_context *ctx, const unsigned c
     uint32_t *RK;
     uint32_t *SK;
 
-    mbedtls_camellia_init( &cty );
+    mbedtls_camellia_init(&cty);
 
     /* Also checks keybits */
-    if( ( ret = mbedtls_camellia_setkey_enc( &cty, key, keybits ) ) != 0 )
+    if ((ret = mbedtls_camellia_setkey_enc(&cty, key, keybits)) != 0)
         goto exit;
 
     ctx->nr = cty.nr;
-    idx = ( ctx->nr == 4 );
+    idx = (ctx->nr == 4);
 
     RK = ctx->rk;
     SK = cty.rk + 24 * 2 + 8 * idx * 2;
@@ -468,8 +481,7 @@ int mbedtls_camellia_setkey_dec( mbedtls_camellia_context *ctx, const unsigned c
     *RK++ = *SK++;
     *RK++ = *SK++;
 
-    for( i = 22 + 8 * idx, SK -= 6; i > 0; i--, SK -= 4 )
-    {
+    for (i = 22 + 8 * idx, SK -= 6; i > 0; i--, SK -= 4) {
         *RK++ = *SK++;
         *RK++ = *SK++;
     }
@@ -482,53 +494,53 @@ int mbedtls_camellia_setkey_dec( mbedtls_camellia_context *ctx, const unsigned c
     *RK++ = *SK++;
 
 exit:
-    mbedtls_camellia_free( &cty );
+    mbedtls_camellia_free(&cty);
 
-    return( ret );
+    return (ret);
 }
 
 /*
  * Camellia-ECB block encryption/decryption
  */
-int mbedtls_camellia_crypt_ecb( mbedtls_camellia_context *ctx,
-                    int mode,
-                    const unsigned char input[16],
-                    unsigned char output[16] )
+int mbedtls_camellia_crypt_ecb(mbedtls_camellia_context *ctx,
+                               int mode,
+                               const unsigned char input[16],
+                               unsigned char output[16])
 {
     int NR;
     uint32_t *RK, X[4];
 
-    ( (void) mode );
+    ((void) mode);
 
     NR = ctx->nr;
     RK = ctx->rk;
 
-    GET_UINT32_BE( X[0], input,  0 );
-    GET_UINT32_BE( X[1], input,  4 );
-    GET_UINT32_BE( X[2], input,  8 );
-    GET_UINT32_BE( X[3], input, 12 );
+    GET_UINT32_BE(X[0], input,  0);
+    GET_UINT32_BE(X[1], input,  4);
+    GET_UINT32_BE(X[2], input,  8);
+    GET_UINT32_BE(X[3], input, 12);
 
     X[0] ^= *RK++;
     X[1] ^= *RK++;
     X[2] ^= *RK++;
     X[3] ^= *RK++;
 
-    while( NR ) {
+    while (NR) {
         --NR;
-        camellia_feistel( X, RK, X + 2 );
+        camellia_feistel(X, RK, X + 2);
         RK += 2;
-        camellia_feistel( X + 2, RK, X );
+        camellia_feistel(X + 2, RK, X);
         RK += 2;
-        camellia_feistel( X, RK, X + 2 );
+        camellia_feistel(X, RK, X + 2);
         RK += 2;
-        camellia_feistel( X + 2, RK, X );
+        camellia_feistel(X + 2, RK, X);
         RK += 2;
-        camellia_feistel( X, RK, X + 2 );
+        camellia_feistel(X, RK, X + 2);
         RK += 2;
-        camellia_feistel( X + 2, RK, X );
+        camellia_feistel(X + 2, RK, X);
         RK += 2;
 
-        if( NR ) {
+        if (NR) {
             FL(X[0], X[1], RK[0], RK[1]);
             RK += 2;
             FLInv(X[2], X[3], RK[0], RK[1]);
@@ -541,57 +553,52 @@ int mbedtls_camellia_crypt_ecb( mbedtls_camellia_context *ctx,
     X[0] ^= *RK++;
     X[1] ^= *RK++;
 
-    PUT_UINT32_BE( X[2], output,  0 );
-    PUT_UINT32_BE( X[3], output,  4 );
-    PUT_UINT32_BE( X[0], output,  8 );
-    PUT_UINT32_BE( X[1], output, 12 );
+    PUT_UINT32_BE(X[2], output,  0);
+    PUT_UINT32_BE(X[3], output,  4);
+    PUT_UINT32_BE(X[0], output,  8);
+    PUT_UINT32_BE(X[1], output, 12);
 
-    return( 0 );
+    return (0);
 }
 
 #if defined(MBEDTLS_CIPHER_MODE_CBC)
 /*
  * Camellia-CBC buffer encryption/decryption
  */
-int mbedtls_camellia_crypt_cbc( mbedtls_camellia_context *ctx,
-                    int mode,
-                    size_t length,
-                    unsigned char iv[16],
-                    const unsigned char *input,
-                    unsigned char *output )
+int mbedtls_camellia_crypt_cbc(mbedtls_camellia_context *ctx,
+                               int mode,
+                               size_t length,
+                               unsigned char iv[16],
+                               const unsigned char *input,
+                               unsigned char *output)
 {
     int i;
     unsigned char temp[16];
 
-    if( length % 16 )
-        return( MBEDTLS_ERR_CAMELLIA_INVALID_INPUT_LENGTH );
+    if (length % 16)
+        return (MBEDTLS_ERR_CAMELLIA_INVALID_INPUT_LENGTH);
 
-    if( mode == MBEDTLS_CAMELLIA_DECRYPT )
-    {
-        while( length > 0 )
-        {
-            memcpy( temp, input, 16 );
-            mbedtls_camellia_crypt_ecb( ctx, mode, input, output );
+    if (mode == MBEDTLS_CAMELLIA_DECRYPT) {
+        while (length > 0) {
+            memcpy(temp, input, 16);
+            mbedtls_camellia_crypt_ecb(ctx, mode, input, output);
 
-            for( i = 0; i < 16; i++ )
-                output[i] = (unsigned char)( output[i] ^ iv[i] );
+            for (i = 0; i < 16; i++)
+                output[i] = (unsigned char)(output[i] ^ iv[i]);
 
-            memcpy( iv, temp, 16 );
+            memcpy(iv, temp, 16);
 
             input  += 16;
             output += 16;
             length -= 16;
         }
-    }
-    else
-    {
-        while( length > 0 )
-        {
-            for( i = 0; i < 16; i++ )
-                output[i] = (unsigned char)( input[i] ^ iv[i] );
+    } else {
+        while (length > 0) {
+            for (i = 0; i < 16; i++)
+                output[i] = (unsigned char)(input[i] ^ iv[i]);
 
-            mbedtls_camellia_crypt_ecb( ctx, mode, output, output );
-            memcpy( iv, output, 16 );
+            mbedtls_camellia_crypt_ecb(ctx, mode, output, output);
+            memcpy(iv, output, 16);
 
             input  += 16;
             output += 16;
@@ -599,7 +606,7 @@ int mbedtls_camellia_crypt_cbc( mbedtls_camellia_context *ctx,
         }
     }
 
-    return( 0 );
+    return (0);
 }
 #endif /* MBEDTLS_CIPHER_MODE_CBC */
 
@@ -607,47 +614,42 @@ int mbedtls_camellia_crypt_cbc( mbedtls_camellia_context *ctx,
 /*
  * Camellia-CFB128 buffer encryption/decryption
  */
-int mbedtls_camellia_crypt_cfb128( mbedtls_camellia_context *ctx,
-                       int mode,
-                       size_t length,
-                       size_t *iv_off,
-                       unsigned char iv[16],
-                       const unsigned char *input,
-                       unsigned char *output )
+int mbedtls_camellia_crypt_cfb128(mbedtls_camellia_context *ctx,
+                                  int mode,
+                                  size_t length,
+                                  size_t *iv_off,
+                                  unsigned char iv[16],
+                                  const unsigned char *input,
+                                  unsigned char *output)
 {
     int c;
     size_t n = *iv_off;
 
-    if( mode == MBEDTLS_CAMELLIA_DECRYPT )
-    {
-        while( length-- )
-        {
-            if( n == 0 )
-                mbedtls_camellia_crypt_ecb( ctx, MBEDTLS_CAMELLIA_ENCRYPT, iv, iv );
+    if (mode == MBEDTLS_CAMELLIA_DECRYPT) {
+        while (length--) {
+            if (n == 0)
+                mbedtls_camellia_crypt_ecb(ctx, MBEDTLS_CAMELLIA_ENCRYPT, iv, iv);
 
             c = *input++;
-            *output++ = (unsigned char)( c ^ iv[n] );
+            *output++ = (unsigned char)(c ^ iv[n]);
             iv[n] = (unsigned char) c;
 
-            n = ( n + 1 ) & 0x0F;
+            n = (n + 1) & 0x0F;
         }
-    }
-    else
-    {
-        while( length-- )
-        {
-            if( n == 0 )
-                mbedtls_camellia_crypt_ecb( ctx, MBEDTLS_CAMELLIA_ENCRYPT, iv, iv );
+    } else {
+        while (length--) {
+            if (n == 0)
+                mbedtls_camellia_crypt_ecb(ctx, MBEDTLS_CAMELLIA_ENCRYPT, iv, iv);
 
-            iv[n] = *output++ = (unsigned char)( iv[n] ^ *input++ );
+            iv[n] = *output++ = (unsigned char)(iv[n] ^ *input++);
 
-            n = ( n + 1 ) & 0x0F;
+            n = (n + 1) & 0x0F;
         }
     }
 
     *iv_off = n;
 
-    return( 0 );
+    return (0);
 }
 #endif /* MBEDTLS_CIPHER_MODE_CFB */
 
@@ -655,36 +657,35 @@ int mbedtls_camellia_crypt_cfb128( mbedtls_camellia_context *ctx,
 /*
  * Camellia-CTR buffer encryption/decryption
  */
-int mbedtls_camellia_crypt_ctr( mbedtls_camellia_context *ctx,
-                       size_t length,
-                       size_t *nc_off,
-                       unsigned char nonce_counter[16],
-                       unsigned char stream_block[16],
-                       const unsigned char *input,
-                       unsigned char *output )
+int mbedtls_camellia_crypt_ctr(mbedtls_camellia_context *ctx,
+                               size_t length,
+                               size_t *nc_off,
+                               unsigned char nonce_counter[16],
+                               unsigned char stream_block[16],
+                               const unsigned char *input,
+                               unsigned char *output)
 {
     int c, i;
     size_t n = *nc_off;
 
-    while( length-- )
-    {
-        if( n == 0 ) {
-            mbedtls_camellia_crypt_ecb( ctx, MBEDTLS_CAMELLIA_ENCRYPT, nonce_counter,
-                                stream_block );
+    while (length--) {
+        if (n == 0) {
+            mbedtls_camellia_crypt_ecb(ctx, MBEDTLS_CAMELLIA_ENCRYPT, nonce_counter,
+                                       stream_block);
 
-            for( i = 16; i > 0; i-- )
-                if( ++nonce_counter[i - 1] != 0 )
+            for (i = 16; i > 0; i--)
+                if (++nonce_counter[i - 1] != 0)
                     break;
         }
         c = *input++;
-        *output++ = (unsigned char)( c ^ stream_block[n] );
+        *output++ = (unsigned char)(c ^ stream_block[n]);
 
-        n = ( n + 1 ) & 0x0F;
+        n = (n + 1) & 0x0F;
     }
 
     *nc_off = n;
 
-    return( 0 );
+    return (0);
 }
 #endif /* MBEDTLS_CIPHER_MODE_CTR */
 #endif /* !MBEDTLS_CAMELLIA_ALT */
@@ -701,124 +702,178 @@ int mbedtls_camellia_crypt_ctr( mbedtls_camellia_context *ctx,
  */
 #define CAMELLIA_TESTS_ECB  2
 
-static const unsigned char camellia_test_ecb_key[3][CAMELLIA_TESTS_ECB][32] =
-{
+static const unsigned char camellia_test_ecb_key[3][CAMELLIA_TESTS_ECB][32] = {
     {
-        { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef,
-          0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10 },
-        { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }
+        {
+            0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef,
+            0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10
+        },
+        {
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+        }
     },
     {
-        { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef,
-          0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10,
-          0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77 },
-        { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }
+        {
+            0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef,
+            0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10,
+            0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77
+        },
+        {
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+        }
     },
     {
-        { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef,
-          0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10,
-          0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
-          0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff },
-        { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }
+        {
+            0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef,
+            0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10,
+            0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
+            0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff
+        },
+        {
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+        }
     },
 };
 
-static const unsigned char camellia_test_ecb_plain[CAMELLIA_TESTS_ECB][16] =
-{
-    { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef,
-      0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10 },
-    { 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }
+static const unsigned char camellia_test_ecb_plain[CAMELLIA_TESTS_ECB][16] = {
+    {
+        0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef,
+        0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10
+    },
+    {
+        0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    }
 };
 
-static const unsigned char camellia_test_ecb_cipher[3][CAMELLIA_TESTS_ECB][16] =
-{
+static const unsigned char camellia_test_ecb_cipher[3][CAMELLIA_TESTS_ECB][16] = {
     {
-        { 0x67, 0x67, 0x31, 0x38, 0x54, 0x96, 0x69, 0x73,
-          0x08, 0x57, 0x06, 0x56, 0x48, 0xea, 0xbe, 0x43 },
-        { 0x38, 0x3C, 0x6C, 0x2A, 0xAB, 0xEF, 0x7F, 0xDE,
-          0x25, 0xCD, 0x47, 0x0B, 0xF7, 0x74, 0xA3, 0x31 }
+        {
+            0x67, 0x67, 0x31, 0x38, 0x54, 0x96, 0x69, 0x73,
+            0x08, 0x57, 0x06, 0x56, 0x48, 0xea, 0xbe, 0x43
+        },
+        {
+            0x38, 0x3C, 0x6C, 0x2A, 0xAB, 0xEF, 0x7F, 0xDE,
+            0x25, 0xCD, 0x47, 0x0B, 0xF7, 0x74, 0xA3, 0x31
+        }
     },
     {
-        { 0xb4, 0x99, 0x34, 0x01, 0xb3, 0xe9, 0x96, 0xf8,
-          0x4e, 0xe5, 0xce, 0xe7, 0xd7, 0x9b, 0x09, 0xb9 },
-        { 0xD1, 0x76, 0x3F, 0xC0, 0x19, 0xD7, 0x7C, 0xC9,
-          0x30, 0xBF, 0xF2, 0xA5, 0x6F, 0x7C, 0x93, 0x64 }
+        {
+            0xb4, 0x99, 0x34, 0x01, 0xb3, 0xe9, 0x96, 0xf8,
+            0x4e, 0xe5, 0xce, 0xe7, 0xd7, 0x9b, 0x09, 0xb9
+        },
+        {
+            0xD1, 0x76, 0x3F, 0xC0, 0x19, 0xD7, 0x7C, 0xC9,
+            0x30, 0xBF, 0xF2, 0xA5, 0x6F, 0x7C, 0x93, 0x64
+        }
     },
     {
-        { 0x9a, 0xcc, 0x23, 0x7d, 0xff, 0x16, 0xd7, 0x6c,
-          0x20, 0xef, 0x7c, 0x91, 0x9e, 0x3a, 0x75, 0x09 },
-        { 0x05, 0x03, 0xFB, 0x10, 0xAB, 0x24, 0x1E, 0x7C,
-          0xF4, 0x5D, 0x8C, 0xDE, 0xEE, 0x47, 0x43, 0x35 }
+        {
+            0x9a, 0xcc, 0x23, 0x7d, 0xff, 0x16, 0xd7, 0x6c,
+            0x20, 0xef, 0x7c, 0x91, 0x9e, 0x3a, 0x75, 0x09
+        },
+        {
+            0x05, 0x03, 0xFB, 0x10, 0xAB, 0x24, 0x1E, 0x7C,
+            0xF4, 0x5D, 0x8C, 0xDE, 0xEE, 0x47, 0x43, 0x35
+        }
     }
 };
 
 #if defined(MBEDTLS_CIPHER_MODE_CBC)
 #define CAMELLIA_TESTS_CBC  3
 
-static const unsigned char camellia_test_cbc_key[3][32] =
-{
-        { 0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6,
-          0xAB, 0xF7, 0x15, 0x88, 0x09, 0xCF, 0x4F, 0x3C }
+static const unsigned char camellia_test_cbc_key[3][32] = {
+    {
+        0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6,
+        0xAB, 0xF7, 0x15, 0x88, 0x09, 0xCF, 0x4F, 0x3C
+    }
     ,
-        { 0x8E, 0x73, 0xB0, 0xF7, 0xDA, 0x0E, 0x64, 0x52,
-          0xC8, 0x10, 0xF3, 0x2B, 0x80, 0x90, 0x79, 0xE5,
-          0x62, 0xF8, 0xEA, 0xD2, 0x52, 0x2C, 0x6B, 0x7B }
+    {
+        0x8E, 0x73, 0xB0, 0xF7, 0xDA, 0x0E, 0x64, 0x52,
+        0xC8, 0x10, 0xF3, 0x2B, 0x80, 0x90, 0x79, 0xE5,
+        0x62, 0xF8, 0xEA, 0xD2, 0x52, 0x2C, 0x6B, 0x7B
+    }
     ,
-        { 0x60, 0x3D, 0xEB, 0x10, 0x15, 0xCA, 0x71, 0xBE,
-          0x2B, 0x73, 0xAE, 0xF0, 0x85, 0x7D, 0x77, 0x81,
-          0x1F, 0x35, 0x2C, 0x07, 0x3B, 0x61, 0x08, 0xD7,
-          0x2D, 0x98, 0x10, 0xA3, 0x09, 0x14, 0xDF, 0xF4 }
+    {
+        0x60, 0x3D, 0xEB, 0x10, 0x15, 0xCA, 0x71, 0xBE,
+        0x2B, 0x73, 0xAE, 0xF0, 0x85, 0x7D, 0x77, 0x81,
+        0x1F, 0x35, 0x2C, 0x07, 0x3B, 0x61, 0x08, 0xD7,
+        0x2D, 0x98, 0x10, 0xA3, 0x09, 0x14, 0xDF, 0xF4
+    }
 };
 
 static const unsigned char camellia_test_cbc_iv[16] =
 
-    { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-      0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F }
+{
+    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+    0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F
+}
 ;
 
-static const unsigned char camellia_test_cbc_plain[CAMELLIA_TESTS_CBC][16] =
-{
-    { 0x6B, 0xC1, 0xBE, 0xE2, 0x2E, 0x40, 0x9F, 0x96,
-      0xE9, 0x3D, 0x7E, 0x11, 0x73, 0x93, 0x17, 0x2A },
-    { 0xAE, 0x2D, 0x8A, 0x57, 0x1E, 0x03, 0xAC, 0x9C,
-      0x9E, 0xB7, 0x6F, 0xAC, 0x45, 0xAF, 0x8E, 0x51 },
-    { 0x30, 0xC8, 0x1C, 0x46, 0xA3, 0x5C, 0xE4, 0x11,
-      0xE5, 0xFB, 0xC1, 0x19, 0x1A, 0x0A, 0x52, 0xEF }
+static const unsigned char camellia_test_cbc_plain[CAMELLIA_TESTS_CBC][16] = {
+    {
+        0x6B, 0xC1, 0xBE, 0xE2, 0x2E, 0x40, 0x9F, 0x96,
+        0xE9, 0x3D, 0x7E, 0x11, 0x73, 0x93, 0x17, 0x2A
+    },
+    {
+        0xAE, 0x2D, 0x8A, 0x57, 0x1E, 0x03, 0xAC, 0x9C,
+        0x9E, 0xB7, 0x6F, 0xAC, 0x45, 0xAF, 0x8E, 0x51
+    },
+    {
+        0x30, 0xC8, 0x1C, 0x46, 0xA3, 0x5C, 0xE4, 0x11,
+        0xE5, 0xFB, 0xC1, 0x19, 0x1A, 0x0A, 0x52, 0xEF
+    }
 
 };
 
-static const unsigned char camellia_test_cbc_cipher[3][CAMELLIA_TESTS_CBC][16] =
-{
+static const unsigned char camellia_test_cbc_cipher[3][CAMELLIA_TESTS_CBC][16] = {
     {
-        { 0x16, 0x07, 0xCF, 0x49, 0x4B, 0x36, 0xBB, 0xF0,
-          0x0D, 0xAE, 0xB0, 0xB5, 0x03, 0xC8, 0x31, 0xAB },
-        { 0xA2, 0xF2, 0xCF, 0x67, 0x16, 0x29, 0xEF, 0x78,
-          0x40, 0xC5, 0xA5, 0xDF, 0xB5, 0x07, 0x48, 0x87 },
-        { 0x0F, 0x06, 0x16, 0x50, 0x08, 0xCF, 0x8B, 0x8B,
-          0x5A, 0x63, 0x58, 0x63, 0x62, 0x54, 0x3E, 0x54 }
+        {
+            0x16, 0x07, 0xCF, 0x49, 0x4B, 0x36, 0xBB, 0xF0,
+            0x0D, 0xAE, 0xB0, 0xB5, 0x03, 0xC8, 0x31, 0xAB
+        },
+        {
+            0xA2, 0xF2, 0xCF, 0x67, 0x16, 0x29, 0xEF, 0x78,
+            0x40, 0xC5, 0xA5, 0xDF, 0xB5, 0x07, 0x48, 0x87
+        },
+        {
+            0x0F, 0x06, 0x16, 0x50, 0x08, 0xCF, 0x8B, 0x8B,
+            0x5A, 0x63, 0x58, 0x63, 0x62, 0x54, 0x3E, 0x54
+        }
     },
     {
-        { 0x2A, 0x48, 0x30, 0xAB, 0x5A, 0xC4, 0xA1, 0xA2,
-          0x40, 0x59, 0x55, 0xFD, 0x21, 0x95, 0xCF, 0x93 },
-        { 0x5D, 0x5A, 0x86, 0x9B, 0xD1, 0x4C, 0xE5, 0x42,
-          0x64, 0xF8, 0x92, 0xA6, 0xDD, 0x2E, 0xC3, 0xD5 },
-        { 0x37, 0xD3, 0x59, 0xC3, 0x34, 0x98, 0x36, 0xD8,
-          0x84, 0xE3, 0x10, 0xAD, 0xDF, 0x68, 0xC4, 0x49 }
+        {
+            0x2A, 0x48, 0x30, 0xAB, 0x5A, 0xC4, 0xA1, 0xA2,
+            0x40, 0x59, 0x55, 0xFD, 0x21, 0x95, 0xCF, 0x93
+        },
+        {
+            0x5D, 0x5A, 0x86, 0x9B, 0xD1, 0x4C, 0xE5, 0x42,
+            0x64, 0xF8, 0x92, 0xA6, 0xDD, 0x2E, 0xC3, 0xD5
+        },
+        {
+            0x37, 0xD3, 0x59, 0xC3, 0x34, 0x98, 0x36, 0xD8,
+            0x84, 0xE3, 0x10, 0xAD, 0xDF, 0x68, 0xC4, 0x49
+        }
     },
     {
-        { 0xE6, 0xCF, 0xA3, 0x5F, 0xC0, 0x2B, 0x13, 0x4A,
-          0x4D, 0x2C, 0x0B, 0x67, 0x37, 0xAC, 0x3E, 0xDA },
-        { 0x36, 0xCB, 0xEB, 0x73, 0xBD, 0x50, 0x4B, 0x40,
-          0x70, 0xB1, 0xB7, 0xDE, 0x2B, 0x21, 0xEB, 0x50 },
-        { 0xE3, 0x1A, 0x60, 0x55, 0x29, 0x7D, 0x96, 0xCA,
-          0x33, 0x30, 0xCD, 0xF1, 0xB1, 0x86, 0x0A, 0x83 }
+        {
+            0xE6, 0xCF, 0xA3, 0x5F, 0xC0, 0x2B, 0x13, 0x4A,
+            0x4D, 0x2C, 0x0B, 0x67, 0x37, 0xAC, 0x3E, 0xDA
+        },
+        {
+            0x36, 0xCB, 0xEB, 0x73, 0xBD, 0x50, 0x4B, 0x40,
+            0x70, 0xB1, 0xB7, 0xDE, 0x2B, 0x21, 0xEB, 0x50
+        },
+        {
+            0xE3, 0x1A, 0x60, 0x55, 0x29, 0x7D, 0x96, 0xCA,
+            0x33, 0x30, 0xCD, 0xF1, 0xB1, 0x86, 0x0A, 0x83
+        }
     }
 };
 #endif /* MBEDTLS_CIPHER_MODE_CBC */
@@ -830,66 +885,86 @@ static const unsigned char camellia_test_cbc_cipher[3][CAMELLIA_TESTS_CBC][16] =
  * http://www.faqs.org/rfcs/rfc5528.html
  */
 
-static const unsigned char camellia_test_ctr_key[3][16] =
-{
-    { 0xAE, 0x68, 0x52, 0xF8, 0x12, 0x10, 0x67, 0xCC,
-      0x4B, 0xF7, 0xA5, 0x76, 0x55, 0x77, 0xF3, 0x9E },
-    { 0x7E, 0x24, 0x06, 0x78, 0x17, 0xFA, 0xE0, 0xD7,
-      0x43, 0xD6, 0xCE, 0x1F, 0x32, 0x53, 0x91, 0x63 },
-    { 0x76, 0x91, 0xBE, 0x03, 0x5E, 0x50, 0x20, 0xA8,
-      0xAC, 0x6E, 0x61, 0x85, 0x29, 0xF9, 0xA0, 0xDC }
+static const unsigned char camellia_test_ctr_key[3][16] = {
+    {
+        0xAE, 0x68, 0x52, 0xF8, 0x12, 0x10, 0x67, 0xCC,
+        0x4B, 0xF7, 0xA5, 0x76, 0x55, 0x77, 0xF3, 0x9E
+    },
+    {
+        0x7E, 0x24, 0x06, 0x78, 0x17, 0xFA, 0xE0, 0xD7,
+        0x43, 0xD6, 0xCE, 0x1F, 0x32, 0x53, 0x91, 0x63
+    },
+    {
+        0x76, 0x91, 0xBE, 0x03, 0x5E, 0x50, 0x20, 0xA8,
+        0xAC, 0x6E, 0x61, 0x85, 0x29, 0xF9, 0xA0, 0xDC
+    }
 };
 
-static const unsigned char camellia_test_ctr_nonce_counter[3][16] =
-{
-    { 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 },
-    { 0x00, 0x6C, 0xB6, 0xDB, 0xC0, 0x54, 0x3B, 0x59,
-      0xDA, 0x48, 0xD9, 0x0B, 0x00, 0x00, 0x00, 0x01 },
-    { 0x00, 0xE0, 0x01, 0x7B, 0x27, 0x77, 0x7F, 0x3F,
-      0x4A, 0x17, 0x86, 0xF0, 0x00, 0x00, 0x00, 0x01 }
+static const unsigned char camellia_test_ctr_nonce_counter[3][16] = {
+    {
+        0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01
+    },
+    {
+        0x00, 0x6C, 0xB6, 0xDB, 0xC0, 0x54, 0x3B, 0x59,
+        0xDA, 0x48, 0xD9, 0x0B, 0x00, 0x00, 0x00, 0x01
+    },
+    {
+        0x00, 0xE0, 0x01, 0x7B, 0x27, 0x77, 0x7F, 0x3F,
+        0x4A, 0x17, 0x86, 0xF0, 0x00, 0x00, 0x00, 0x01
+    }
 };
 
-static const unsigned char camellia_test_ctr_pt[3][48] =
-{
-    { 0x53, 0x69, 0x6E, 0x67, 0x6C, 0x65, 0x20, 0x62,
-      0x6C, 0x6F, 0x63, 0x6B, 0x20, 0x6D, 0x73, 0x67 },
+static const unsigned char camellia_test_ctr_pt[3][48] = {
+    {
+        0x53, 0x69, 0x6E, 0x67, 0x6C, 0x65, 0x20, 0x62,
+        0x6C, 0x6F, 0x63, 0x6B, 0x20, 0x6D, 0x73, 0x67
+    },
 
-    { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-      0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
-      0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
-      0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F },
+    {
+        0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+        0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
+        0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+        0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F
+    },
 
-    { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-      0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
-      0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
-      0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F,
-      0x20, 0x21, 0x22, 0x23 }
+    {
+        0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+        0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
+        0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+        0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F,
+        0x20, 0x21, 0x22, 0x23
+    }
 };
 
-static const unsigned char camellia_test_ctr_ct[3][48] =
-{
-    { 0xD0, 0x9D, 0xC2, 0x9A, 0x82, 0x14, 0x61, 0x9A,
-      0x20, 0x87, 0x7C, 0x76, 0xDB, 0x1F, 0x0B, 0x3F },
-    { 0xDB, 0xF3, 0xC7, 0x8D, 0xC0, 0x83, 0x96, 0xD4,
-      0xDA, 0x7C, 0x90, 0x77, 0x65, 0xBB, 0xCB, 0x44,
-      0x2B, 0x8E, 0x8E, 0x0F, 0x31, 0xF0, 0xDC, 0xA7,
-      0x2C, 0x74, 0x17, 0xE3, 0x53, 0x60, 0xE0, 0x48 },
-    { 0xB1, 0x9D, 0x1F, 0xCD, 0xCB, 0x75, 0xEB, 0x88,
-      0x2F, 0x84, 0x9C, 0xE2, 0x4D, 0x85, 0xCF, 0x73,
-      0x9C, 0xE6, 0x4B, 0x2B, 0x5C, 0x9D, 0x73, 0xF1,
-      0x4F, 0x2D, 0x5D, 0x9D, 0xCE, 0x98, 0x89, 0xCD,
-      0xDF, 0x50, 0x86, 0x96 }
+static const unsigned char camellia_test_ctr_ct[3][48] = {
+    {
+        0xD0, 0x9D, 0xC2, 0x9A, 0x82, 0x14, 0x61, 0x9A,
+        0x20, 0x87, 0x7C, 0x76, 0xDB, 0x1F, 0x0B, 0x3F
+    },
+    {
+        0xDB, 0xF3, 0xC7, 0x8D, 0xC0, 0x83, 0x96, 0xD4,
+        0xDA, 0x7C, 0x90, 0x77, 0x65, 0xBB, 0xCB, 0x44,
+        0x2B, 0x8E, 0x8E, 0x0F, 0x31, 0xF0, 0xDC, 0xA7,
+        0x2C, 0x74, 0x17, 0xE3, 0x53, 0x60, 0xE0, 0x48
+    },
+    {
+        0xB1, 0x9D, 0x1F, 0xCD, 0xCB, 0x75, 0xEB, 0x88,
+        0x2F, 0x84, 0x9C, 0xE2, 0x4D, 0x85, 0xCF, 0x73,
+        0x9C, 0xE6, 0x4B, 0x2B, 0x5C, 0x9D, 0x73, 0xF1,
+        0x4F, 0x2D, 0x5D, 0x9D, 0xCE, 0x98, 0x89, 0xCD,
+        0xDF, 0x50, 0x86, 0x96
+    }
 };
 
 static const int camellia_test_ctr_len[3] =
-    { 16, 32, 36 };
+{ 16, 32, 36 };
 #endif /* MBEDTLS_CIPHER_MODE_CTR */
 
 /*
  * Checkup routine
  */
-int mbedtls_camellia_self_test( int verbose )
+int mbedtls_camellia_self_test(int verbose)
 {
     int i, j, u, v;
     unsigned char key[32];
@@ -907,162 +982,153 @@ int mbedtls_camellia_self_test( int verbose )
 
     mbedtls_camellia_context ctx;
 
-    memset( key, 0, 32 );
+    memset(key, 0, 32);
 
-    for( j = 0; j < 6; j++ ) {
+    for (j = 0; j < 6; j++) {
         u = j >> 1;
-    v = j & 1;
+        v = j & 1;
 
-    if( verbose != 0 )
-        mbedtls_printf( "  CAMELLIA-ECB-%3d (%s): ", 128 + u * 64,
-                         (v == MBEDTLS_CAMELLIA_DECRYPT) ? "dec" : "enc");
+        if (verbose != 0)
+            mbedtls_printf("  CAMELLIA-ECB-%3d (%s): ", 128 + u * 64,
+                           (v == MBEDTLS_CAMELLIA_DECRYPT) ? "dec" : "enc");
 
-    for( i = 0; i < CAMELLIA_TESTS_ECB; i++ ) {
-        memcpy( key, camellia_test_ecb_key[u][i], 16 + 8 * u );
+        for (i = 0; i < CAMELLIA_TESTS_ECB; i++) {
+            memcpy(key, camellia_test_ecb_key[u][i], 16 + 8 * u);
 
-        if( v == MBEDTLS_CAMELLIA_DECRYPT ) {
-            mbedtls_camellia_setkey_dec( &ctx, key, 128 + u * 64 );
-            memcpy( src, camellia_test_ecb_cipher[u][i], 16 );
-            memcpy( dst, camellia_test_ecb_plain[i], 16 );
-        } else { /* MBEDTLS_CAMELLIA_ENCRYPT */
-            mbedtls_camellia_setkey_enc( &ctx, key, 128 + u * 64 );
-            memcpy( src, camellia_test_ecb_plain[i], 16 );
-            memcpy( dst, camellia_test_ecb_cipher[u][i], 16 );
+            if (v == MBEDTLS_CAMELLIA_DECRYPT) {
+                mbedtls_camellia_setkey_dec(&ctx, key, 128 + u * 64);
+                memcpy(src, camellia_test_ecb_cipher[u][i], 16);
+                memcpy(dst, camellia_test_ecb_plain[i], 16);
+            } else { /* MBEDTLS_CAMELLIA_ENCRYPT */
+                mbedtls_camellia_setkey_enc(&ctx, key, 128 + u * 64);
+                memcpy(src, camellia_test_ecb_plain[i], 16);
+                memcpy(dst, camellia_test_ecb_cipher[u][i], 16);
+            }
+
+            mbedtls_camellia_crypt_ecb(&ctx, v, src, buf);
+
+            if (memcmp(buf, dst, 16) != 0) {
+                if (verbose != 0)
+                    mbedtls_printf("failed\n");
+
+                return (1);
+            }
         }
 
-        mbedtls_camellia_crypt_ecb( &ctx, v, src, buf );
-
-        if( memcmp( buf, dst, 16 ) != 0 )
-        {
-            if( verbose != 0 )
-                mbedtls_printf( "failed\n" );
-
-            return( 1 );
-        }
+        if (verbose != 0)
+            mbedtls_printf("passed\n");
     }
 
-    if( verbose != 0 )
-        mbedtls_printf( "passed\n" );
-    }
-
-    if( verbose != 0 )
-        mbedtls_printf( "\n" );
+    if (verbose != 0)
+        mbedtls_printf("\n");
 
 #if defined(MBEDTLS_CIPHER_MODE_CBC)
     /*
      * CBC mode
      */
-    for( j = 0; j < 6; j++ )
-    {
+    for (j = 0; j < 6; j++) {
         u = j >> 1;
         v = j  & 1;
 
-        if( verbose != 0 )
-            mbedtls_printf( "  CAMELLIA-CBC-%3d (%s): ", 128 + u * 64,
-                             ( v == MBEDTLS_CAMELLIA_DECRYPT ) ? "dec" : "enc" );
+        if (verbose != 0)
+            mbedtls_printf("  CAMELLIA-CBC-%3d (%s): ", 128 + u * 64,
+                           (v == MBEDTLS_CAMELLIA_DECRYPT) ? "dec" : "enc");
 
-        memcpy( src, camellia_test_cbc_iv, 16 );
-        memcpy( dst, camellia_test_cbc_iv, 16 );
-        memcpy( key, camellia_test_cbc_key[u], 16 + 8 * u );
+        memcpy(src, camellia_test_cbc_iv, 16);
+        memcpy(dst, camellia_test_cbc_iv, 16);
+        memcpy(key, camellia_test_cbc_key[u], 16 + 8 * u);
 
-        if( v == MBEDTLS_CAMELLIA_DECRYPT ) {
-            mbedtls_camellia_setkey_dec( &ctx, key, 128 + u * 64 );
+        if (v == MBEDTLS_CAMELLIA_DECRYPT) {
+            mbedtls_camellia_setkey_dec(&ctx, key, 128 + u * 64);
         } else {
-            mbedtls_camellia_setkey_enc( &ctx, key, 128 + u * 64 );
+            mbedtls_camellia_setkey_enc(&ctx, key, 128 + u * 64);
         }
 
-        for( i = 0; i < CAMELLIA_TESTS_CBC; i++ ) {
+        for (i = 0; i < CAMELLIA_TESTS_CBC; i++) {
 
-            if( v == MBEDTLS_CAMELLIA_DECRYPT ) {
-                memcpy( iv , src, 16 );
-                memcpy( src, camellia_test_cbc_cipher[u][i], 16 );
-                memcpy( dst, camellia_test_cbc_plain[i], 16 );
+            if (v == MBEDTLS_CAMELLIA_DECRYPT) {
+                memcpy(iv, src, 16);
+                memcpy(src, camellia_test_cbc_cipher[u][i], 16);
+                memcpy(dst, camellia_test_cbc_plain[i], 16);
             } else { /* MBEDTLS_CAMELLIA_ENCRYPT */
-                memcpy( iv , dst, 16 );
-                memcpy( src, camellia_test_cbc_plain[i], 16 );
-                memcpy( dst, camellia_test_cbc_cipher[u][i], 16 );
+                memcpy(iv, dst, 16);
+                memcpy(src, camellia_test_cbc_plain[i], 16);
+                memcpy(dst, camellia_test_cbc_cipher[u][i], 16);
             }
 
-            mbedtls_camellia_crypt_cbc( &ctx, v, 16, iv, src, buf );
+            mbedtls_camellia_crypt_cbc(&ctx, v, 16, iv, src, buf);
 
-            if( memcmp( buf, dst, 16 ) != 0 )
-            {
-                if( verbose != 0 )
-                    mbedtls_printf( "failed\n" );
+            if (memcmp(buf, dst, 16) != 0) {
+                if (verbose != 0)
+                    mbedtls_printf("failed\n");
 
-                return( 1 );
+                return (1);
             }
         }
 
-        if( verbose != 0 )
-            mbedtls_printf( "passed\n" );
+        if (verbose != 0)
+            mbedtls_printf("passed\n");
     }
 #endif /* MBEDTLS_CIPHER_MODE_CBC */
 
-    if( verbose != 0 )
-        mbedtls_printf( "\n" );
+    if (verbose != 0)
+        mbedtls_printf("\n");
 
 #if defined(MBEDTLS_CIPHER_MODE_CTR)
     /*
      * CTR mode
      */
-    for( i = 0; i < 6; i++ )
-    {
+    for (i = 0; i < 6; i++) {
         u = i >> 1;
         v = i  & 1;
 
-        if( verbose != 0 )
-            mbedtls_printf( "  CAMELLIA-CTR-128 (%s): ",
-                             ( v == MBEDTLS_CAMELLIA_DECRYPT ) ? "dec" : "enc" );
+        if (verbose != 0)
+            mbedtls_printf("  CAMELLIA-CTR-128 (%s): ",
+                           (v == MBEDTLS_CAMELLIA_DECRYPT) ? "dec" : "enc");
 
-        memcpy( nonce_counter, camellia_test_ctr_nonce_counter[u], 16 );
-        memcpy( key, camellia_test_ctr_key[u], 16 );
+        memcpy(nonce_counter, camellia_test_ctr_nonce_counter[u], 16);
+        memcpy(key, camellia_test_ctr_key[u], 16);
 
         offset = 0;
-        mbedtls_camellia_setkey_enc( &ctx, key, 128 );
+        mbedtls_camellia_setkey_enc(&ctx, key, 128);
 
-        if( v == MBEDTLS_CAMELLIA_DECRYPT )
-        {
+        if (v == MBEDTLS_CAMELLIA_DECRYPT) {
             len = camellia_test_ctr_len[u];
-            memcpy( buf, camellia_test_ctr_ct[u], len );
+            memcpy(buf, camellia_test_ctr_ct[u], len);
 
-            mbedtls_camellia_crypt_ctr( &ctx, len, &offset, nonce_counter, stream_block,
-                                buf, buf );
+            mbedtls_camellia_crypt_ctr(&ctx, len, &offset, nonce_counter, stream_block,
+                                       buf, buf);
 
-            if( memcmp( buf, camellia_test_ctr_pt[u], len ) != 0 )
-            {
-                if( verbose != 0 )
-                    mbedtls_printf( "failed\n" );
+            if (memcmp(buf, camellia_test_ctr_pt[u], len) != 0) {
+                if (verbose != 0)
+                    mbedtls_printf("failed\n");
 
-                return( 1 );
+                return (1);
             }
-        }
-        else
-        {
+        } else {
             len = camellia_test_ctr_len[u];
-            memcpy( buf, camellia_test_ctr_pt[u], len );
+            memcpy(buf, camellia_test_ctr_pt[u], len);
 
-            mbedtls_camellia_crypt_ctr( &ctx, len, &offset, nonce_counter, stream_block,
-                                buf, buf );
+            mbedtls_camellia_crypt_ctr(&ctx, len, &offset, nonce_counter, stream_block,
+                                       buf, buf);
 
-            if( memcmp( buf, camellia_test_ctr_ct[u], len ) != 0 )
-            {
-                if( verbose != 0 )
-                    mbedtls_printf( "failed\n" );
+            if (memcmp(buf, camellia_test_ctr_ct[u], len) != 0) {
+                if (verbose != 0)
+                    mbedtls_printf("failed\n");
 
-                return( 1 );
+                return (1);
             }
         }
 
-        if( verbose != 0 )
-            mbedtls_printf( "passed\n" );
+        if (verbose != 0)
+            mbedtls_printf("passed\n");
     }
 
-    if( verbose != 0 )
-        mbedtls_printf( "\n" );
+    if (verbose != 0)
+        mbedtls_printf("\n");
 #endif /* MBEDTLS_CIPHER_MODE_CTR */
 
-    return( 0 );
+    return (0);
 }
 
 #endif /* MBEDTLS_SELF_TEST */
diff --git a/common/mbedtls/camellia.h b/common/mbedtls/camellia.h
index cb36312b4..561606e57 100644
--- a/common/mbedtls/camellia.h
+++ b/common/mbedtls/camellia.h
@@ -53,8 +53,7 @@ extern "C" {
 /**
  * \brief          CAMELLIA context structure
  */
-typedef struct mbedtls_camellia_context
-{
+typedef struct mbedtls_camellia_context {
     int nr;                     /*!<  number of rounds  */
     uint32_t rk[68];            /*!<  CAMELLIA round keys    */
 }
@@ -69,14 +68,14 @@ mbedtls_camellia_context;
  *
  * \param ctx      CAMELLIA context to be initialized
  */
-void mbedtls_camellia_init( mbedtls_camellia_context *ctx );
+void mbedtls_camellia_init(mbedtls_camellia_context *ctx);
 
 /**
  * \brief          Clear CAMELLIA context
  *
  * \param ctx      CAMELLIA context to be cleared
  */
-void mbedtls_camellia_free( mbedtls_camellia_context *ctx );
+void mbedtls_camellia_free(mbedtls_camellia_context *ctx);
 
 /**
  * \brief          CAMELLIA key schedule (encryption)
@@ -87,8 +86,8 @@ void mbedtls_camellia_free( mbedtls_camellia_context *ctx );
  *
  * \return         0 if successful, or MBEDTLS_ERR_CAMELLIA_INVALID_KEY_LENGTH
  */
-int mbedtls_camellia_setkey_enc( mbedtls_camellia_context *ctx, const unsigned char *key,
-                         unsigned int keybits );
+int mbedtls_camellia_setkey_enc(mbedtls_camellia_context *ctx, const unsigned char *key,
+                                unsigned int keybits);
 
 /**
  * \brief          CAMELLIA key schedule (decryption)
@@ -99,8 +98,8 @@ int mbedtls_camellia_setkey_enc( mbedtls_camellia_context *ctx, const unsigned c
  *
  * \return         0 if successful, or MBEDTLS_ERR_CAMELLIA_INVALID_KEY_LENGTH
  */
-int mbedtls_camellia_setkey_dec( mbedtls_camellia_context *ctx, const unsigned char *key,
-                         unsigned int keybits );
+int mbedtls_camellia_setkey_dec(mbedtls_camellia_context *ctx, const unsigned char *key,
+                                unsigned int keybits);
 
 /**
  * \brief          CAMELLIA-ECB block encryption/decryption
@@ -112,10 +111,10 @@ int mbedtls_camellia_setkey_dec( mbedtls_camellia_context *ctx, const unsigned c
  *
  * \return         0 if successful
  */
-int mbedtls_camellia_crypt_ecb( mbedtls_camellia_context *ctx,
-                    int mode,
-                    const unsigned char input[16],
-                    unsigned char output[16] );
+int mbedtls_camellia_crypt_ecb(mbedtls_camellia_context *ctx,
+                               int mode,
+                               const unsigned char input[16],
+                               unsigned char output[16]);
 
 #if defined(MBEDTLS_CIPHER_MODE_CBC)
 /**
@@ -141,12 +140,12 @@ int mbedtls_camellia_crypt_ecb( mbedtls_camellia_context *ctx,
  * \return         0 if successful, or
  *                 MBEDTLS_ERR_CAMELLIA_INVALID_INPUT_LENGTH
  */
-int mbedtls_camellia_crypt_cbc( mbedtls_camellia_context *ctx,
-                    int mode,
-                    size_t length,
-                    unsigned char iv[16],
-                    const unsigned char *input,
-                    unsigned char *output );
+int mbedtls_camellia_crypt_cbc(mbedtls_camellia_context *ctx,
+                               int mode,
+                               size_t length,
+                               unsigned char iv[16],
+                               const unsigned char *input,
+                               unsigned char *output);
 #endif /* MBEDTLS_CIPHER_MODE_CBC */
 
 #if defined(MBEDTLS_CIPHER_MODE_CFB)
@@ -176,13 +175,13 @@ int mbedtls_camellia_crypt_cbc( mbedtls_camellia_context *ctx,
  * \return         0 if successful, or
  *                 MBEDTLS_ERR_CAMELLIA_INVALID_INPUT_LENGTH
  */
-int mbedtls_camellia_crypt_cfb128( mbedtls_camellia_context *ctx,
-                       int mode,
-                       size_t length,
-                       size_t *iv_off,
-                       unsigned char iv[16],
-                       const unsigned char *input,
-                       unsigned char *output );
+int mbedtls_camellia_crypt_cfb128(mbedtls_camellia_context *ctx,
+                                  int mode,
+                                  size_t length,
+                                  size_t *iv_off,
+                                  unsigned char iv[16],
+                                  const unsigned char *input,
+                                  unsigned char *output);
 #endif /* MBEDTLS_CIPHER_MODE_CFB */
 
 #if defined(MBEDTLS_CIPHER_MODE_CTR)
@@ -250,13 +249,13 @@ int mbedtls_camellia_crypt_cfb128( mbedtls_camellia_context *ctx,
  *
  * \return         0 if successful
  */
-int mbedtls_camellia_crypt_ctr( mbedtls_camellia_context *ctx,
-                       size_t length,
-                       size_t *nc_off,
-                       unsigned char nonce_counter[16],
-                       unsigned char stream_block[16],
-                       const unsigned char *input,
-                       unsigned char *output );
+int mbedtls_camellia_crypt_ctr(mbedtls_camellia_context *ctx,
+                               size_t length,
+                               size_t *nc_off,
+                               unsigned char nonce_counter[16],
+                               unsigned char stream_block[16],
+                               const unsigned char *input,
+                               unsigned char *output);
 #endif /* MBEDTLS_CIPHER_MODE_CTR */
 
 /**
@@ -264,7 +263,7 @@ int mbedtls_camellia_crypt_ctr( mbedtls_camellia_context *ctx,
  *
  * \return         0 if successful, or 1 if the test failed
  */
-int mbedtls_camellia_self_test( int verbose );
+int mbedtls_camellia_self_test(int verbose);
 
 #ifdef __cplusplus
 }
diff --git a/common/mbedtls/certs.c b/common/mbedtls/certs.c
index dd9d02ba3..6df61d24e 100644
--- a/common/mbedtls/certs.c
+++ b/common/mbedtls/certs.c
@@ -33,118 +33,118 @@
 
 #if defined(MBEDTLS_ECDSA_C)
 #define TEST_CA_CRT_EC                                                  \
-"-----BEGIN CERTIFICATE-----\r\n"                                       \
-"MIICUjCCAdegAwIBAgIJAMFD4n5iQ8zoMAoGCCqGSM49BAMCMD4xCzAJBgNVBAYT\r\n"  \
-"Ak5MMREwDwYDVQQKEwhQb2xhclNTTDEcMBoGA1UEAxMTUG9sYXJzc2wgVGVzdCBF\r\n"  \
-"QyBDQTAeFw0xMzA5MjQxNTQ5NDhaFw0yMzA5MjIxNTQ5NDhaMD4xCzAJBgNVBAYT\r\n"  \
-"Ak5MMREwDwYDVQQKEwhQb2xhclNTTDEcMBoGA1UEAxMTUG9sYXJzc2wgVGVzdCBF\r\n"  \
-"QyBDQTB2MBAGByqGSM49AgEGBSuBBAAiA2IABMPaKzRBN1gvh1b+/Im6KUNLTuBu\r\n"  \
-"ww5XUzM5WNRStJGVOQsj318XJGJI/BqVKc4sLYfCiFKAr9ZqqyHduNMcbli4yuiy\r\n"  \
-"aY7zQa0pw7RfdadHb9UZKVVpmlM7ILRmFmAzHqOBoDCBnTAdBgNVHQ4EFgQUnW0g\r\n"  \
-"JEkBPyvLeLUZvH4kydv7NnwwbgYDVR0jBGcwZYAUnW0gJEkBPyvLeLUZvH4kydv7\r\n"  \
-"NnyhQqRAMD4xCzAJBgNVBAYTAk5MMREwDwYDVQQKEwhQb2xhclNTTDEcMBoGA1UE\r\n"  \
-"AxMTUG9sYXJzc2wgVGVzdCBFQyBDQYIJAMFD4n5iQ8zoMAwGA1UdEwQFMAMBAf8w\r\n"  \
-"CgYIKoZIzj0EAwIDaQAwZgIxAMO0YnNWKJUAfXgSJtJxexn4ipg+kv4znuR50v56\r\n"  \
-"t4d0PCu412mUC6Nnd7izvtE2MgIxAP1nnJQjZ8BWukszFQDG48wxCCyci9qpdSMv\r\n"  \
-"uCjn8pwUOkABXK8Mss90fzCfCEOtIA==\r\n"                                  \
-"-----END CERTIFICATE-----\r\n"
+    "-----BEGIN CERTIFICATE-----\r\n"                                       \
+    "MIICUjCCAdegAwIBAgIJAMFD4n5iQ8zoMAoGCCqGSM49BAMCMD4xCzAJBgNVBAYT\r\n"  \
+    "Ak5MMREwDwYDVQQKEwhQb2xhclNTTDEcMBoGA1UEAxMTUG9sYXJzc2wgVGVzdCBF\r\n"  \
+    "QyBDQTAeFw0xMzA5MjQxNTQ5NDhaFw0yMzA5MjIxNTQ5NDhaMD4xCzAJBgNVBAYT\r\n"  \
+    "Ak5MMREwDwYDVQQKEwhQb2xhclNTTDEcMBoGA1UEAxMTUG9sYXJzc2wgVGVzdCBF\r\n"  \
+    "QyBDQTB2MBAGByqGSM49AgEGBSuBBAAiA2IABMPaKzRBN1gvh1b+/Im6KUNLTuBu\r\n"  \
+    "ww5XUzM5WNRStJGVOQsj318XJGJI/BqVKc4sLYfCiFKAr9ZqqyHduNMcbli4yuiy\r\n"  \
+    "aY7zQa0pw7RfdadHb9UZKVVpmlM7ILRmFmAzHqOBoDCBnTAdBgNVHQ4EFgQUnW0g\r\n"  \
+    "JEkBPyvLeLUZvH4kydv7NnwwbgYDVR0jBGcwZYAUnW0gJEkBPyvLeLUZvH4kydv7\r\n"  \
+    "NnyhQqRAMD4xCzAJBgNVBAYTAk5MMREwDwYDVQQKEwhQb2xhclNTTDEcMBoGA1UE\r\n"  \
+    "AxMTUG9sYXJzc2wgVGVzdCBFQyBDQYIJAMFD4n5iQ8zoMAwGA1UdEwQFMAMBAf8w\r\n"  \
+    "CgYIKoZIzj0EAwIDaQAwZgIxAMO0YnNWKJUAfXgSJtJxexn4ipg+kv4znuR50v56\r\n"  \
+    "t4d0PCu412mUC6Nnd7izvtE2MgIxAP1nnJQjZ8BWukszFQDG48wxCCyci9qpdSMv\r\n"  \
+    "uCjn8pwUOkABXK8Mss90fzCfCEOtIA==\r\n"                                  \
+    "-----END CERTIFICATE-----\r\n"
 const char mbedtls_test_ca_crt_ec[] = TEST_CA_CRT_EC;
-const size_t mbedtls_test_ca_crt_ec_len = sizeof( mbedtls_test_ca_crt_ec );
+const size_t mbedtls_test_ca_crt_ec_len = sizeof(mbedtls_test_ca_crt_ec);
 
 const char mbedtls_test_ca_key_ec[] =
-"-----BEGIN EC PRIVATE KEY-----\r\n"
-"Proc-Type: 4,ENCRYPTED\r\n"
-"DEK-Info: DES-EDE3-CBC,307EAB469933D64E\r\n"
-"\r\n"
-"IxbrRmKcAzctJqPdTQLA4SWyBYYGYJVkYEna+F7Pa5t5Yg/gKADrFKcm6B72e7DG\r\n"
-"ihExtZI648s0zdYw6qSJ74vrPSuWDe5qm93BqsfVH9svtCzWHW0pm1p0KTBCFfUq\r\n"
-"UsuWTITwJImcnlAs1gaRZ3sAWm7cOUidL0fo2G0fYUFNcYoCSLffCFTEHBuPnagb\r\n"
-"a77x/sY1Bvii8S9/XhDTb6pTMx06wzrm\r\n"
-"-----END EC PRIVATE KEY-----\r\n";
-const size_t mbedtls_test_ca_key_ec_len = sizeof( mbedtls_test_ca_key_ec );
+    "-----BEGIN EC PRIVATE KEY-----\r\n"
+    "Proc-Type: 4,ENCRYPTED\r\n"
+    "DEK-Info: DES-EDE3-CBC,307EAB469933D64E\r\n"
+    "\r\n"
+    "IxbrRmKcAzctJqPdTQLA4SWyBYYGYJVkYEna+F7Pa5t5Yg/gKADrFKcm6B72e7DG\r\n"
+    "ihExtZI648s0zdYw6qSJ74vrPSuWDe5qm93BqsfVH9svtCzWHW0pm1p0KTBCFfUq\r\n"
+    "UsuWTITwJImcnlAs1gaRZ3sAWm7cOUidL0fo2G0fYUFNcYoCSLffCFTEHBuPnagb\r\n"
+    "a77x/sY1Bvii8S9/XhDTb6pTMx06wzrm\r\n"
+    "-----END EC PRIVATE KEY-----\r\n";
+const size_t mbedtls_test_ca_key_ec_len = sizeof(mbedtls_test_ca_key_ec);
 
 const char mbedtls_test_ca_pwd_ec[] = "PolarSSLTest";
-const size_t mbedtls_test_ca_pwd_ec_len = sizeof( mbedtls_test_ca_pwd_ec ) - 1;
+const size_t mbedtls_test_ca_pwd_ec_len = sizeof(mbedtls_test_ca_pwd_ec) - 1;
 
 const char mbedtls_test_srv_crt_ec[] =
-"-----BEGIN CERTIFICATE-----\r\n"
-"MIICHzCCAaWgAwIBAgIBCTAKBggqhkjOPQQDAjA+MQswCQYDVQQGEwJOTDERMA8G\r\n"
-"A1UEChMIUG9sYXJTU0wxHDAaBgNVBAMTE1BvbGFyc3NsIFRlc3QgRUMgQ0EwHhcN\r\n"
-"MTMwOTI0MTU1MjA0WhcNMjMwOTIyMTU1MjA0WjA0MQswCQYDVQQGEwJOTDERMA8G\r\n"
-"A1UEChMIUG9sYXJTU0wxEjAQBgNVBAMTCWxvY2FsaG9zdDBZMBMGByqGSM49AgEG\r\n"
-"CCqGSM49AwEHA0IABDfMVtl2CR5acj7HWS3/IG7ufPkGkXTQrRS192giWWKSTuUA\r\n"
-"2CMR/+ov0jRdXRa9iojCa3cNVc2KKg76Aci07f+jgZ0wgZowCQYDVR0TBAIwADAd\r\n"
-"BgNVHQ4EFgQUUGGlj9QH2deCAQzlZX+MY0anE74wbgYDVR0jBGcwZYAUnW0gJEkB\r\n"
-"PyvLeLUZvH4kydv7NnyhQqRAMD4xCzAJBgNVBAYTAk5MMREwDwYDVQQKEwhQb2xh\r\n"
-"clNTTDEcMBoGA1UEAxMTUG9sYXJzc2wgVGVzdCBFQyBDQYIJAMFD4n5iQ8zoMAoG\r\n"
-"CCqGSM49BAMCA2gAMGUCMQCaLFzXptui5WQN8LlO3ddh1hMxx6tzgLvT03MTVK2S\r\n"
-"C12r0Lz3ri/moSEpNZWqPjkCMCE2f53GXcYLqyfyJR078c/xNSUU5+Xxl7VZ414V\r\n"
-"fGa5kHvHARBPc8YAIVIqDvHH1Q==\r\n"
-"-----END CERTIFICATE-----\r\n";
-const size_t mbedtls_test_srv_crt_ec_len = sizeof( mbedtls_test_srv_crt_ec );
+    "-----BEGIN CERTIFICATE-----\r\n"
+    "MIICHzCCAaWgAwIBAgIBCTAKBggqhkjOPQQDAjA+MQswCQYDVQQGEwJOTDERMA8G\r\n"
+    "A1UEChMIUG9sYXJTU0wxHDAaBgNVBAMTE1BvbGFyc3NsIFRlc3QgRUMgQ0EwHhcN\r\n"
+    "MTMwOTI0MTU1MjA0WhcNMjMwOTIyMTU1MjA0WjA0MQswCQYDVQQGEwJOTDERMA8G\r\n"
+    "A1UEChMIUG9sYXJTU0wxEjAQBgNVBAMTCWxvY2FsaG9zdDBZMBMGByqGSM49AgEG\r\n"
+    "CCqGSM49AwEHA0IABDfMVtl2CR5acj7HWS3/IG7ufPkGkXTQrRS192giWWKSTuUA\r\n"
+    "2CMR/+ov0jRdXRa9iojCa3cNVc2KKg76Aci07f+jgZ0wgZowCQYDVR0TBAIwADAd\r\n"
+    "BgNVHQ4EFgQUUGGlj9QH2deCAQzlZX+MY0anE74wbgYDVR0jBGcwZYAUnW0gJEkB\r\n"
+    "PyvLeLUZvH4kydv7NnyhQqRAMD4xCzAJBgNVBAYTAk5MMREwDwYDVQQKEwhQb2xh\r\n"
+    "clNTTDEcMBoGA1UEAxMTUG9sYXJzc2wgVGVzdCBFQyBDQYIJAMFD4n5iQ8zoMAoG\r\n"
+    "CCqGSM49BAMCA2gAMGUCMQCaLFzXptui5WQN8LlO3ddh1hMxx6tzgLvT03MTVK2S\r\n"
+    "C12r0Lz3ri/moSEpNZWqPjkCMCE2f53GXcYLqyfyJR078c/xNSUU5+Xxl7VZ414V\r\n"
+    "fGa5kHvHARBPc8YAIVIqDvHH1Q==\r\n"
+    "-----END CERTIFICATE-----\r\n";
+const size_t mbedtls_test_srv_crt_ec_len = sizeof(mbedtls_test_srv_crt_ec);
 
 const char mbedtls_test_srv_key_ec[] =
-"-----BEGIN EC PRIVATE KEY-----\r\n"
-"MHcCAQEEIPEqEyB2AnCoPL/9U/YDHvdqXYbIogTywwyp6/UfDw6noAoGCCqGSM49\r\n"
-"AwEHoUQDQgAEN8xW2XYJHlpyPsdZLf8gbu58+QaRdNCtFLX3aCJZYpJO5QDYIxH/\r\n"
-"6i/SNF1dFr2KiMJrdw1VzYoqDvoByLTt/w==\r\n"
-"-----END EC PRIVATE KEY-----\r\n";
-const size_t mbedtls_test_srv_key_ec_len = sizeof( mbedtls_test_srv_key_ec );
+    "-----BEGIN EC PRIVATE KEY-----\r\n"
+    "MHcCAQEEIPEqEyB2AnCoPL/9U/YDHvdqXYbIogTywwyp6/UfDw6noAoGCCqGSM49\r\n"
+    "AwEHoUQDQgAEN8xW2XYJHlpyPsdZLf8gbu58+QaRdNCtFLX3aCJZYpJO5QDYIxH/\r\n"
+    "6i/SNF1dFr2KiMJrdw1VzYoqDvoByLTt/w==\r\n"
+    "-----END EC PRIVATE KEY-----\r\n";
+const size_t mbedtls_test_srv_key_ec_len = sizeof(mbedtls_test_srv_key_ec);
 
 const char mbedtls_test_cli_crt_ec[] =
-"-----BEGIN CERTIFICATE-----\r\n"
-"MIICLDCCAbKgAwIBAgIBDTAKBggqhkjOPQQDAjA+MQswCQYDVQQGEwJOTDERMA8G\r\n"
-"A1UEChMIUG9sYXJTU0wxHDAaBgNVBAMTE1BvbGFyc3NsIFRlc3QgRUMgQ0EwHhcN\r\n"
-"MTMwOTI0MTU1MjA0WhcNMjMwOTIyMTU1MjA0WjBBMQswCQYDVQQGEwJOTDERMA8G\r\n"
-"A1UEChMIUG9sYXJTU0wxHzAdBgNVBAMTFlBvbGFyU1NMIFRlc3QgQ2xpZW50IDIw\r\n"
-"WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARX5a6xc9/TrLuTuIH/Eq7u5lOszlVT\r\n"
-"9jQOzC7jYyUL35ji81xgNpbA1RgUcOV/n9VLRRjlsGzVXPiWj4dwo+THo4GdMIGa\r\n"
-"MAkGA1UdEwQCMAAwHQYDVR0OBBYEFHoAX4Zk/OBd5REQO7LmO8QmP8/iMG4GA1Ud\r\n"
-"IwRnMGWAFJ1tICRJAT8ry3i1Gbx+JMnb+zZ8oUKkQDA+MQswCQYDVQQGEwJOTDER\r\n"
-"MA8GA1UEChMIUG9sYXJTU0wxHDAaBgNVBAMTE1BvbGFyc3NsIFRlc3QgRUMgQ0GC\r\n"
-"CQDBQ+J+YkPM6DAKBggqhkjOPQQDAgNoADBlAjBKZQ17IIOimbmoD/yN7o89u3BM\r\n"
-"lgOsjnhw3fIOoLIWy2WOGsk/LGF++DzvrRzuNiACMQCd8iem1XS4JK7haj8xocpU\r\n"
-"LwjQje5PDGHfd3h9tP38Qknu5bJqws0md2KOKHyeV0U=\r\n"
-"-----END CERTIFICATE-----\r\n";
-const size_t mbedtls_test_cli_crt_ec_len = sizeof( mbedtls_test_cli_crt_ec );
+    "-----BEGIN CERTIFICATE-----\r\n"
+    "MIICLDCCAbKgAwIBAgIBDTAKBggqhkjOPQQDAjA+MQswCQYDVQQGEwJOTDERMA8G\r\n"
+    "A1UEChMIUG9sYXJTU0wxHDAaBgNVBAMTE1BvbGFyc3NsIFRlc3QgRUMgQ0EwHhcN\r\n"
+    "MTMwOTI0MTU1MjA0WhcNMjMwOTIyMTU1MjA0WjBBMQswCQYDVQQGEwJOTDERMA8G\r\n"
+    "A1UEChMIUG9sYXJTU0wxHzAdBgNVBAMTFlBvbGFyU1NMIFRlc3QgQ2xpZW50IDIw\r\n"
+    "WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARX5a6xc9/TrLuTuIH/Eq7u5lOszlVT\r\n"
+    "9jQOzC7jYyUL35ji81xgNpbA1RgUcOV/n9VLRRjlsGzVXPiWj4dwo+THo4GdMIGa\r\n"
+    "MAkGA1UdEwQCMAAwHQYDVR0OBBYEFHoAX4Zk/OBd5REQO7LmO8QmP8/iMG4GA1Ud\r\n"
+    "IwRnMGWAFJ1tICRJAT8ry3i1Gbx+JMnb+zZ8oUKkQDA+MQswCQYDVQQGEwJOTDER\r\n"
+    "MA8GA1UEChMIUG9sYXJTU0wxHDAaBgNVBAMTE1BvbGFyc3NsIFRlc3QgRUMgQ0GC\r\n"
+    "CQDBQ+J+YkPM6DAKBggqhkjOPQQDAgNoADBlAjBKZQ17IIOimbmoD/yN7o89u3BM\r\n"
+    "lgOsjnhw3fIOoLIWy2WOGsk/LGF++DzvrRzuNiACMQCd8iem1XS4JK7haj8xocpU\r\n"
+    "LwjQje5PDGHfd3h9tP38Qknu5bJqws0md2KOKHyeV0U=\r\n"
+    "-----END CERTIFICATE-----\r\n";
+const size_t mbedtls_test_cli_crt_ec_len = sizeof(mbedtls_test_cli_crt_ec);
 
 const char mbedtls_test_cli_key_ec[] =
-"-----BEGIN EC PRIVATE KEY-----\r\n"
-"MHcCAQEEIPb3hmTxZ3/mZI3vyk7p3U3wBf+WIop6hDhkFzJhmLcqoAoGCCqGSM49\r\n"
-"AwEHoUQDQgAEV+WusXPf06y7k7iB/xKu7uZTrM5VU/Y0Dswu42MlC9+Y4vNcYDaW\r\n"
-"wNUYFHDlf5/VS0UY5bBs1Vz4lo+HcKPkxw==\r\n"
-"-----END EC PRIVATE KEY-----\r\n";
-const size_t mbedtls_test_cli_key_ec_len = sizeof( mbedtls_test_cli_key_ec );
+    "-----BEGIN EC PRIVATE KEY-----\r\n"
+    "MHcCAQEEIPb3hmTxZ3/mZI3vyk7p3U3wBf+WIop6hDhkFzJhmLcqoAoGCCqGSM49\r\n"
+    "AwEHoUQDQgAEV+WusXPf06y7k7iB/xKu7uZTrM5VU/Y0Dswu42MlC9+Y4vNcYDaW\r\n"
+    "wNUYFHDlf5/VS0UY5bBs1Vz4lo+HcKPkxw==\r\n"
+    "-----END EC PRIVATE KEY-----\r\n";
+const size_t mbedtls_test_cli_key_ec_len = sizeof(mbedtls_test_cli_key_ec);
 #endif /* MBEDTLS_ECDSA_C */
 
 #if defined(MBEDTLS_RSA_C)
 
 #if defined(MBEDTLS_SHA256_C)
 #define TEST_CA_CRT_RSA_SHA256                                          \
-"-----BEGIN CERTIFICATE-----\r\n"                                       \
-"MIIDhzCCAm+gAwIBAgIBADANBgkqhkiG9w0BAQsFADA7MQswCQYDVQQGEwJOTDER\r\n"  \
-"MA8GA1UECgwIUG9sYXJTU0wxGTAXBgNVBAMMEFBvbGFyU1NMIFRlc3QgQ0EwHhcN\r\n"  \
-"MTcwNTA0MTY1NzAxWhcNMjcwNTA1MTY1NzAxWjA7MQswCQYDVQQGEwJOTDERMA8G\r\n"  \
-"A1UECgwIUG9sYXJTU0wxGTAXBgNVBAMMEFBvbGFyU1NMIFRlc3QgQ0EwggEiMA0G\r\n"  \
-"CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDA3zf8F7vglp0/ht6WMn1EpRagzSHx\r\n"  \
-"mdTs6st8GFgIlKXsm8WL3xoemTiZhx57wI053zhdcHgH057Zk+i5clHFzqMwUqny\r\n"  \
-"50BwFMtEonILwuVA+T7lpg6z+exKY8C4KQB0nFc7qKUEkHHxvYPZP9al4jwqj+8n\r\n"  \
-"YMPGn8u67GB9t+aEMr5P+1gmIgNb1LTV+/Xjli5wwOQuvfwu7uJBVcA0Ln0kcmnL\r\n"  \
-"R7EUQIN9Z/SG9jGr8XmksrUuEvmEF/Bibyc+E1ixVA0hmnM3oTDPb5Lc9un8rNsu\r\n"  \
-"KNF+AksjoBXyOGVkCeoMbo4bF6BxyLObyavpw/LPh5aPgAIynplYb6LVAgMBAAGj\r\n"  \
-"gZUwgZIwHQYDVR0OBBYEFLRa5KWz3tJS9rnVppUP6z68x/3/MGMGA1UdIwRcMFqA\r\n"  \
-"FLRa5KWz3tJS9rnVppUP6z68x/3/oT+kPTA7MQswCQYDVQQGEwJOTDERMA8GA1UE\r\n"  \
-"CgwIUG9sYXJTU0wxGTAXBgNVBAMMEFBvbGFyU1NMIFRlc3QgQ0GCAQAwDAYDVR0T\r\n"  \
-"BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAHK/HHrTZMnnVMpde1io+voAtql7j\r\n"  \
-"4sRhLrjD7o3THtwRbDa2diCvpq0Sq23Ng2LMYoXsOxoL/RQK3iN7UKxV3MKPEr0w\r\n"  \
-"XQS+kKQqiT2bsfrjnWMVHZtUOMpm6FNqcdGm/Rss3vKda2lcKl8kUnq/ylc1+QbB\r\n"  \
-"G6A6tUvQcr2ZyWfVg+mM5XkhTrOOXus2OLikb4WwEtJTJRNE0f+yPODSUz0/vT57\r\n"  \
-"ApH0CnB80bYJshYHPHHymOtleAB8KSYtqm75g/YNobjnjB6cm4HkW3OZRVIl6fYY\r\n"  \
-"n20NRVA1Vjs6GAROr4NqW4k/+LofY9y0LLDE+p0oIEKXIsIvhPr39swxSA==\r\n"      \
-"-----END CERTIFICATE-----\r\n"
+    "-----BEGIN CERTIFICATE-----\r\n"                                       \
+    "MIIDhzCCAm+gAwIBAgIBADANBgkqhkiG9w0BAQsFADA7MQswCQYDVQQGEwJOTDER\r\n"  \
+    "MA8GA1UECgwIUG9sYXJTU0wxGTAXBgNVBAMMEFBvbGFyU1NMIFRlc3QgQ0EwHhcN\r\n"  \
+    "MTcwNTA0MTY1NzAxWhcNMjcwNTA1MTY1NzAxWjA7MQswCQYDVQQGEwJOTDERMA8G\r\n"  \
+    "A1UECgwIUG9sYXJTU0wxGTAXBgNVBAMMEFBvbGFyU1NMIFRlc3QgQ0EwggEiMA0G\r\n"  \
+    "CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDA3zf8F7vglp0/ht6WMn1EpRagzSHx\r\n"  \
+    "mdTs6st8GFgIlKXsm8WL3xoemTiZhx57wI053zhdcHgH057Zk+i5clHFzqMwUqny\r\n"  \
+    "50BwFMtEonILwuVA+T7lpg6z+exKY8C4KQB0nFc7qKUEkHHxvYPZP9al4jwqj+8n\r\n"  \
+    "YMPGn8u67GB9t+aEMr5P+1gmIgNb1LTV+/Xjli5wwOQuvfwu7uJBVcA0Ln0kcmnL\r\n"  \
+    "R7EUQIN9Z/SG9jGr8XmksrUuEvmEF/Bibyc+E1ixVA0hmnM3oTDPb5Lc9un8rNsu\r\n"  \
+    "KNF+AksjoBXyOGVkCeoMbo4bF6BxyLObyavpw/LPh5aPgAIynplYb6LVAgMBAAGj\r\n"  \
+    "gZUwgZIwHQYDVR0OBBYEFLRa5KWz3tJS9rnVppUP6z68x/3/MGMGA1UdIwRcMFqA\r\n"  \
+    "FLRa5KWz3tJS9rnVppUP6z68x/3/oT+kPTA7MQswCQYDVQQGEwJOTDERMA8GA1UE\r\n"  \
+    "CgwIUG9sYXJTU0wxGTAXBgNVBAMMEFBvbGFyU1NMIFRlc3QgQ0GCAQAwDAYDVR0T\r\n"  \
+    "BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAHK/HHrTZMnnVMpde1io+voAtql7j\r\n"  \
+    "4sRhLrjD7o3THtwRbDa2diCvpq0Sq23Ng2LMYoXsOxoL/RQK3iN7UKxV3MKPEr0w\r\n"  \
+    "XQS+kKQqiT2bsfrjnWMVHZtUOMpm6FNqcdGm/Rss3vKda2lcKl8kUnq/ylc1+QbB\r\n"  \
+    "G6A6tUvQcr2ZyWfVg+mM5XkhTrOOXus2OLikb4WwEtJTJRNE0f+yPODSUz0/vT57\r\n"  \
+    "ApH0CnB80bYJshYHPHHymOtleAB8KSYtqm75g/YNobjnjB6cm4HkW3OZRVIl6fYY\r\n"  \
+    "n20NRVA1Vjs6GAROr4NqW4k/+LofY9y0LLDE+p0oIEKXIsIvhPr39swxSA==\r\n"      \
+    "-----END CERTIFICATE-----\r\n"
 
 const char   mbedtls_test_ca_crt_rsa[]   = TEST_CA_CRT_RSA_SHA256;
-const size_t mbedtls_test_ca_crt_rsa_len = sizeof( mbedtls_test_ca_crt_rsa );
+const size_t mbedtls_test_ca_crt_rsa_len = sizeof(mbedtls_test_ca_crt_rsa);
 #define TEST_CA_CRT_RSA_SOME
 
 static const char mbedtls_test_ca_crt_rsa_sha256[] = TEST_CA_CRT_RSA_SHA256;
@@ -153,31 +153,31 @@ static const char mbedtls_test_ca_crt_rsa_sha256[] = TEST_CA_CRT_RSA_SHA256;
 
 #if !defined(TEST_CA_CRT_RSA_SOME) || defined(MBEDTLS_SHA1_C)
 #define TEST_CA_CRT_RSA_SHA1                                            \
-"-----BEGIN CERTIFICATE-----\r\n"                                       \
-"MIIDhzCCAm+gAwIBAgIBADANBgkqhkiG9w0BAQUFADA7MQswCQYDVQQGEwJOTDER\r\n"  \
-"MA8GA1UEChMIUG9sYXJTU0wxGTAXBgNVBAMTEFBvbGFyU1NMIFRlc3QgQ0EwHhcN\r\n"  \
-"MTEwMjEyMTQ0NDAwWhcNMjEwMjEyMTQ0NDAwWjA7MQswCQYDVQQGEwJOTDERMA8G\r\n"  \
-"A1UEChMIUG9sYXJTU0wxGTAXBgNVBAMTEFBvbGFyU1NMIFRlc3QgQ0EwggEiMA0G\r\n"  \
-"CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDA3zf8F7vglp0/ht6WMn1EpRagzSHx\r\n"  \
-"mdTs6st8GFgIlKXsm8WL3xoemTiZhx57wI053zhdcHgH057Zk+i5clHFzqMwUqny\r\n"  \
-"50BwFMtEonILwuVA+T7lpg6z+exKY8C4KQB0nFc7qKUEkHHxvYPZP9al4jwqj+8n\r\n"  \
-"YMPGn8u67GB9t+aEMr5P+1gmIgNb1LTV+/Xjli5wwOQuvfwu7uJBVcA0Ln0kcmnL\r\n"  \
-"R7EUQIN9Z/SG9jGr8XmksrUuEvmEF/Bibyc+E1ixVA0hmnM3oTDPb5Lc9un8rNsu\r\n"  \
-"KNF+AksjoBXyOGVkCeoMbo4bF6BxyLObyavpw/LPh5aPgAIynplYb6LVAgMBAAGj\r\n"  \
-"gZUwgZIwDAYDVR0TBAUwAwEB/zAdBgNVHQ4EFgQUtFrkpbPe0lL2udWmlQ/rPrzH\r\n"  \
-"/f8wYwYDVR0jBFwwWoAUtFrkpbPe0lL2udWmlQ/rPrzH/f+hP6Q9MDsxCzAJBgNV\r\n"  \
-"BAYTAk5MMREwDwYDVQQKEwhQb2xhclNTTDEZMBcGA1UEAxMQUG9sYXJTU0wgVGVz\r\n"  \
-"dCBDQYIBADANBgkqhkiG9w0BAQUFAAOCAQEAuP1U2ABUkIslsCfdlc2i94QHHYeJ\r\n"  \
-"SsR4EdgHtdciUI5I62J6Mom+Y0dT/7a+8S6MVMCZP6C5NyNyXw1GWY/YR82XTJ8H\r\n"  \
-"DBJiCTok5DbZ6SzaONBzdWHXwWwmi5vg1dxn7YxrM9d0IjxM27WNKs4sDQhZBQkF\r\n"  \
-"pjmfs2cb4oPl4Y9T9meTx/lvdkRYEug61Jfn6cA+qHpyPYdTH+UshITnmp5/Ztkf\r\n"  \
-"m/UTSLBNFNHesiTZeH31NcxYGdHSme9Nc/gfidRa0FLOCfWxRlFqAI47zG9jAQCZ\r\n"  \
-"7Z2mCGDNMhjQc+BYcdnl0lPXjdDK6V0qCg1dVewhUBcW5gZKzV7e9+DpVA==\r\n"      \
-"-----END CERTIFICATE-----\r\n"
+    "-----BEGIN CERTIFICATE-----\r\n"                                       \
+    "MIIDhzCCAm+gAwIBAgIBADANBgkqhkiG9w0BAQUFADA7MQswCQYDVQQGEwJOTDER\r\n"  \
+    "MA8GA1UEChMIUG9sYXJTU0wxGTAXBgNVBAMTEFBvbGFyU1NMIFRlc3QgQ0EwHhcN\r\n"  \
+    "MTEwMjEyMTQ0NDAwWhcNMjEwMjEyMTQ0NDAwWjA7MQswCQYDVQQGEwJOTDERMA8G\r\n"  \
+    "A1UEChMIUG9sYXJTU0wxGTAXBgNVBAMTEFBvbGFyU1NMIFRlc3QgQ0EwggEiMA0G\r\n"  \
+    "CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDA3zf8F7vglp0/ht6WMn1EpRagzSHx\r\n"  \
+    "mdTs6st8GFgIlKXsm8WL3xoemTiZhx57wI053zhdcHgH057Zk+i5clHFzqMwUqny\r\n"  \
+    "50BwFMtEonILwuVA+T7lpg6z+exKY8C4KQB0nFc7qKUEkHHxvYPZP9al4jwqj+8n\r\n"  \
+    "YMPGn8u67GB9t+aEMr5P+1gmIgNb1LTV+/Xjli5wwOQuvfwu7uJBVcA0Ln0kcmnL\r\n"  \
+    "R7EUQIN9Z/SG9jGr8XmksrUuEvmEF/Bibyc+E1ixVA0hmnM3oTDPb5Lc9un8rNsu\r\n"  \
+    "KNF+AksjoBXyOGVkCeoMbo4bF6BxyLObyavpw/LPh5aPgAIynplYb6LVAgMBAAGj\r\n"  \
+    "gZUwgZIwDAYDVR0TBAUwAwEB/zAdBgNVHQ4EFgQUtFrkpbPe0lL2udWmlQ/rPrzH\r\n"  \
+    "/f8wYwYDVR0jBFwwWoAUtFrkpbPe0lL2udWmlQ/rPrzH/f+hP6Q9MDsxCzAJBgNV\r\n"  \
+    "BAYTAk5MMREwDwYDVQQKEwhQb2xhclNTTDEZMBcGA1UEAxMQUG9sYXJTU0wgVGVz\r\n"  \
+    "dCBDQYIBADANBgkqhkiG9w0BAQUFAAOCAQEAuP1U2ABUkIslsCfdlc2i94QHHYeJ\r\n"  \
+    "SsR4EdgHtdciUI5I62J6Mom+Y0dT/7a+8S6MVMCZP6C5NyNyXw1GWY/YR82XTJ8H\r\n"  \
+    "DBJiCTok5DbZ6SzaONBzdWHXwWwmi5vg1dxn7YxrM9d0IjxM27WNKs4sDQhZBQkF\r\n"  \
+    "pjmfs2cb4oPl4Y9T9meTx/lvdkRYEug61Jfn6cA+qHpyPYdTH+UshITnmp5/Ztkf\r\n"  \
+    "m/UTSLBNFNHesiTZeH31NcxYGdHSme9Nc/gfidRa0FLOCfWxRlFqAI47zG9jAQCZ\r\n"  \
+    "7Z2mCGDNMhjQc+BYcdnl0lPXjdDK6V0qCg1dVewhUBcW5gZKzV7e9+DpVA==\r\n"      \
+    "-----END CERTIFICATE-----\r\n"
 
 #if !defined (TEST_CA_CRT_RSA_SOME)
 const char   mbedtls_test_ca_crt_rsa[]   = TEST_CA_CRT_RSA_SHA1;
-const size_t mbedtls_test_ca_crt_rsa_len = sizeof( mbedtls_test_ca_crt_rsa );
+const size_t mbedtls_test_ca_crt_rsa_len = sizeof(mbedtls_test_ca_crt_rsa);
 #endif
 
 static const char mbedtls_test_ca_crt_rsa_sha1[] = TEST_CA_CRT_RSA_SHA1;
@@ -185,147 +185,147 @@ static const char mbedtls_test_ca_crt_rsa_sha1[] = TEST_CA_CRT_RSA_SHA1;
 #endif
 
 const char mbedtls_test_ca_key_rsa[] =
-"-----BEGIN RSA PRIVATE KEY-----\r\n"
-"Proc-Type: 4,ENCRYPTED\r\n"
-"DEK-Info: DES-EDE3-CBC,A8A95B05D5B7206B\r\n"
-"\r\n"
-"9Qd9GeArejl1GDVh2lLV1bHt0cPtfbh5h/5zVpAVaFpqtSPMrElp50Rntn9et+JA\r\n"
-"7VOyboR+Iy2t/HU4WvA687k3Bppe9GwKHjHhtl//8xFKwZr3Xb5yO5JUP8AUctQq\r\n"
-"Nb8CLlZyuUC+52REAAthdWgsX+7dJO4yabzUcQ22Tp9JSD0hiL43BlkWYUNK3dAo\r\n"
-"PZlmiptjnzVTjg1MxsBSydZinWOLBV8/JQgxSPo2yD4uEfig28qbvQ2wNIn0pnAb\r\n"
-"GxnSAOazkongEGfvcjIIs+LZN9gXFhxcOh6kc4Q/c99B7QWETwLLkYgZ+z1a9VY9\r\n"
-"gEU7CwCxYCD+h9hY6FPmsK0/lC4O7aeRKpYq00rPPxs6i7phiexg6ax6yTMmArQq\r\n"
-"QmK3TAsJm8V/J5AWpLEV6jAFgRGymGGHnof0DXzVWZidrcZJWTNuGEX90nB3ee2w\r\n"
-"PXJEFWKoD3K3aFcSLdHYr3mLGxP7H9ThQai9VsycxZKS5kwvBKQ//YMrmFfwPk8x\r\n"
-"vTeY4KZMaUrveEel5tWZC94RSMKgxR6cyE1nBXyTQnDOGbfpNNgBKxyKbINWoOJU\r\n"
-"WJZAwlsQn+QzCDwpri7+sV1mS3gBE6UY7aQmnmiiaC2V3Hbphxct/en5QsfDOt1X\r\n"
-"JczSfpRWLlbPznZg8OQh/VgCMA58N5DjOzTIK7sJJ5r+94ZBTCpgAMbF588f0NTR\r\n"
-"KCe4yrxGJR7X02M4nvD4IwOlpsQ8xQxZtOSgXv4LkxvdU9XJJKWZ/XNKJeWztxSe\r\n"
-"Z1vdTc2YfsDBA2SEv33vxHx2g1vqtw8SjDRT2RaQSS0QuSaMJimdOX6mTOCBKk1J\r\n"
-"9Q5mXTrER+/LnK0jEmXsBXWA5bqqVZIyahXSx4VYZ7l7w/PHiUDtDgyRhMMKi4n2\r\n"
-"iQvQcWSQTjrpnlJbca1/DkpRt3YwrvJwdqb8asZU2VrNETh5x0QVefDRLFiVpif/\r\n"
-"tUaeAe/P1F8OkS7OIZDs1SUbv/sD2vMbhNkUoCms3/PvNtdnvgL4F0zhaDpKCmlT\r\n"
-"P8vx49E7v5CyRNmED9zZg4o3wmMqrQO93PtTug3Eu9oVx1zPQM1NVMyBa2+f29DL\r\n"
-"1nuTCeXdo9+ni45xx+jAI4DCwrRdhJ9uzZyC6962H37H6D+5naNvClFR1s6li1Gb\r\n"
-"nqPoiy/OBsEx9CaDGcqQBp5Wme/3XW+6z1ISOx+igwNTVCT14mHdBMbya0eIKft5\r\n"
-"X+GnwtgEMyCYyyWuUct8g4RzErcY9+yW9Om5Hzpx4zOuW4NPZgPDTgK+t2RSL/Yq\r\n"
-"rE1njrgeGYcVeG3f+OftH4s6fPbq7t1A5ZgUscbLMBqr9tK+OqygR4EgKBPsH6Cz\r\n"
-"L6zlv/2RV0qAHvVuDJcIDIgwY5rJtINEm32rhOeFNJwZS5MNIC1czXZx5//ugX7l\r\n"
-"I4sy5nbVhwSjtAk8Xg5dZbdTZ6mIrb7xqH+fdakZor1khG7bC2uIwibD3cSl2XkR\r\n"
-"wN48lslbHnqqagr6Xm1nNOSVl8C/6kbJEsMpLhAezfRtGwvOucoaE+WbeUNolGde\r\n"
-"P/eQiddSf0brnpiLJRh7qZrl9XuqYdpUqnoEdMAfotDOID8OtV7gt8a48ad8VPW2\r\n"
-"-----END RSA PRIVATE KEY-----\r\n";
-const size_t mbedtls_test_ca_key_rsa_len = sizeof( mbedtls_test_ca_key_rsa );
+    "-----BEGIN RSA PRIVATE KEY-----\r\n"
+    "Proc-Type: 4,ENCRYPTED\r\n"
+    "DEK-Info: DES-EDE3-CBC,A8A95B05D5B7206B\r\n"
+    "\r\n"
+    "9Qd9GeArejl1GDVh2lLV1bHt0cPtfbh5h/5zVpAVaFpqtSPMrElp50Rntn9et+JA\r\n"
+    "7VOyboR+Iy2t/HU4WvA687k3Bppe9GwKHjHhtl//8xFKwZr3Xb5yO5JUP8AUctQq\r\n"
+    "Nb8CLlZyuUC+52REAAthdWgsX+7dJO4yabzUcQ22Tp9JSD0hiL43BlkWYUNK3dAo\r\n"
+    "PZlmiptjnzVTjg1MxsBSydZinWOLBV8/JQgxSPo2yD4uEfig28qbvQ2wNIn0pnAb\r\n"
+    "GxnSAOazkongEGfvcjIIs+LZN9gXFhxcOh6kc4Q/c99B7QWETwLLkYgZ+z1a9VY9\r\n"
+    "gEU7CwCxYCD+h9hY6FPmsK0/lC4O7aeRKpYq00rPPxs6i7phiexg6ax6yTMmArQq\r\n"
+    "QmK3TAsJm8V/J5AWpLEV6jAFgRGymGGHnof0DXzVWZidrcZJWTNuGEX90nB3ee2w\r\n"
+    "PXJEFWKoD3K3aFcSLdHYr3mLGxP7H9ThQai9VsycxZKS5kwvBKQ//YMrmFfwPk8x\r\n"
+    "vTeY4KZMaUrveEel5tWZC94RSMKgxR6cyE1nBXyTQnDOGbfpNNgBKxyKbINWoOJU\r\n"
+    "WJZAwlsQn+QzCDwpri7+sV1mS3gBE6UY7aQmnmiiaC2V3Hbphxct/en5QsfDOt1X\r\n"
+    "JczSfpRWLlbPznZg8OQh/VgCMA58N5DjOzTIK7sJJ5r+94ZBTCpgAMbF588f0NTR\r\n"
+    "KCe4yrxGJR7X02M4nvD4IwOlpsQ8xQxZtOSgXv4LkxvdU9XJJKWZ/XNKJeWztxSe\r\n"
+    "Z1vdTc2YfsDBA2SEv33vxHx2g1vqtw8SjDRT2RaQSS0QuSaMJimdOX6mTOCBKk1J\r\n"
+    "9Q5mXTrER+/LnK0jEmXsBXWA5bqqVZIyahXSx4VYZ7l7w/PHiUDtDgyRhMMKi4n2\r\n"
+    "iQvQcWSQTjrpnlJbca1/DkpRt3YwrvJwdqb8asZU2VrNETh5x0QVefDRLFiVpif/\r\n"
+    "tUaeAe/P1F8OkS7OIZDs1SUbv/sD2vMbhNkUoCms3/PvNtdnvgL4F0zhaDpKCmlT\r\n"
+    "P8vx49E7v5CyRNmED9zZg4o3wmMqrQO93PtTug3Eu9oVx1zPQM1NVMyBa2+f29DL\r\n"
+    "1nuTCeXdo9+ni45xx+jAI4DCwrRdhJ9uzZyC6962H37H6D+5naNvClFR1s6li1Gb\r\n"
+    "nqPoiy/OBsEx9CaDGcqQBp5Wme/3XW+6z1ISOx+igwNTVCT14mHdBMbya0eIKft5\r\n"
+    "X+GnwtgEMyCYyyWuUct8g4RzErcY9+yW9Om5Hzpx4zOuW4NPZgPDTgK+t2RSL/Yq\r\n"
+    "rE1njrgeGYcVeG3f+OftH4s6fPbq7t1A5ZgUscbLMBqr9tK+OqygR4EgKBPsH6Cz\r\n"
+    "L6zlv/2RV0qAHvVuDJcIDIgwY5rJtINEm32rhOeFNJwZS5MNIC1czXZx5//ugX7l\r\n"
+    "I4sy5nbVhwSjtAk8Xg5dZbdTZ6mIrb7xqH+fdakZor1khG7bC2uIwibD3cSl2XkR\r\n"
+    "wN48lslbHnqqagr6Xm1nNOSVl8C/6kbJEsMpLhAezfRtGwvOucoaE+WbeUNolGde\r\n"
+    "P/eQiddSf0brnpiLJRh7qZrl9XuqYdpUqnoEdMAfotDOID8OtV7gt8a48ad8VPW2\r\n"
+    "-----END RSA PRIVATE KEY-----\r\n";
+const size_t mbedtls_test_ca_key_rsa_len = sizeof(mbedtls_test_ca_key_rsa);
 
 const char mbedtls_test_ca_pwd_rsa[] = "PolarSSLTest";
-const size_t mbedtls_test_ca_pwd_rsa_len = sizeof( mbedtls_test_ca_pwd_rsa ) - 1;
+const size_t mbedtls_test_ca_pwd_rsa_len = sizeof(mbedtls_test_ca_pwd_rsa) - 1;
 
 const char mbedtls_test_srv_crt_rsa[] =
-"-----BEGIN CERTIFICATE-----\r\n"
-"MIIDNzCCAh+gAwIBAgIBAjANBgkqhkiG9w0BAQUFADA7MQswCQYDVQQGEwJOTDER\r\n"
-"MA8GA1UEChMIUG9sYXJTU0wxGTAXBgNVBAMTEFBvbGFyU1NMIFRlc3QgQ0EwHhcN\r\n"
-"MTEwMjEyMTQ0NDA2WhcNMjEwMjEyMTQ0NDA2WjA0MQswCQYDVQQGEwJOTDERMA8G\r\n"
-"A1UEChMIUG9sYXJTU0wxEjAQBgNVBAMTCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcN\r\n"
-"AQEBBQADggEPADCCAQoCggEBAMFNo93nzR3RBNdJcriZrA545Do8Ss86ExbQWuTN\r\n"
-"owCIp+4ea5anUrSQ7y1yej4kmvy2NKwk9XfgJmSMnLAofaHa6ozmyRyWvP7BBFKz\r\n"
-"NtSj+uGxdtiQwWG0ZlI2oiZTqqt0Xgd9GYLbKtgfoNkNHC1JZvdbJXNG6AuKT2kM\r\n"
-"tQCQ4dqCEGZ9rlQri2V5kaHiYcPNQEkI7mgM8YuG0ka/0LiqEQMef1aoGh5EGA8P\r\n"
-"hYvai0Re4hjGYi/HZo36Xdh98yeJKQHFkA4/J/EwyEoO79bex8cna8cFPXrEAjya\r\n"
-"HT4P6DSYW8tzS1KW2BGiLICIaTla0w+w3lkvEcf36hIBMJcCAwEAAaNNMEswCQYD\r\n"
-"VR0TBAIwADAdBgNVHQ4EFgQUpQXoZLjc32APUBJNYKhkr02LQ5MwHwYDVR0jBBgw\r\n"
-"FoAUtFrkpbPe0lL2udWmlQ/rPrzH/f8wDQYJKoZIhvcNAQEFBQADggEBAJxnXClY\r\n"
-"oHkbp70cqBrsGXLybA74czbO5RdLEgFs7rHVS9r+c293luS/KdliLScZqAzYVylw\r\n"
-"UfRWvKMoWhHYKp3dEIS4xTXk6/5zXxhv9Rw8SGc8qn6vITHk1S1mPevtekgasY5Y\r\n"
-"iWQuM3h4YVlRH3HHEMAD1TnAexfXHHDFQGe+Bd1iAbz1/sH9H8l4StwX6egvTK3M\r\n"
-"wXRwkKkvjKaEDA9ATbZx0mI8LGsxSuCqe9r9dyjmttd47J1p1Rulz3CLzaRcVIuS\r\n"
-"RRQfaD8neM9c1S/iJ/amTVqJxA1KOdOS5780WhPfSArA+g4qAmSjelc3p4wWpha8\r\n"
-"zhuYwjVuX6JHG0c=\r\n"
-"-----END CERTIFICATE-----\r\n";
-const size_t mbedtls_test_srv_crt_rsa_len = sizeof( mbedtls_test_srv_crt_rsa );
+    "-----BEGIN CERTIFICATE-----\r\n"
+    "MIIDNzCCAh+gAwIBAgIBAjANBgkqhkiG9w0BAQUFADA7MQswCQYDVQQGEwJOTDER\r\n"
+    "MA8GA1UEChMIUG9sYXJTU0wxGTAXBgNVBAMTEFBvbGFyU1NMIFRlc3QgQ0EwHhcN\r\n"
+    "MTEwMjEyMTQ0NDA2WhcNMjEwMjEyMTQ0NDA2WjA0MQswCQYDVQQGEwJOTDERMA8G\r\n"
+    "A1UEChMIUG9sYXJTU0wxEjAQBgNVBAMTCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcN\r\n"
+    "AQEBBQADggEPADCCAQoCggEBAMFNo93nzR3RBNdJcriZrA545Do8Ss86ExbQWuTN\r\n"
+    "owCIp+4ea5anUrSQ7y1yej4kmvy2NKwk9XfgJmSMnLAofaHa6ozmyRyWvP7BBFKz\r\n"
+    "NtSj+uGxdtiQwWG0ZlI2oiZTqqt0Xgd9GYLbKtgfoNkNHC1JZvdbJXNG6AuKT2kM\r\n"
+    "tQCQ4dqCEGZ9rlQri2V5kaHiYcPNQEkI7mgM8YuG0ka/0LiqEQMef1aoGh5EGA8P\r\n"
+    "hYvai0Re4hjGYi/HZo36Xdh98yeJKQHFkA4/J/EwyEoO79bex8cna8cFPXrEAjya\r\n"
+    "HT4P6DSYW8tzS1KW2BGiLICIaTla0w+w3lkvEcf36hIBMJcCAwEAAaNNMEswCQYD\r\n"
+    "VR0TBAIwADAdBgNVHQ4EFgQUpQXoZLjc32APUBJNYKhkr02LQ5MwHwYDVR0jBBgw\r\n"
+    "FoAUtFrkpbPe0lL2udWmlQ/rPrzH/f8wDQYJKoZIhvcNAQEFBQADggEBAJxnXClY\r\n"
+    "oHkbp70cqBrsGXLybA74czbO5RdLEgFs7rHVS9r+c293luS/KdliLScZqAzYVylw\r\n"
+    "UfRWvKMoWhHYKp3dEIS4xTXk6/5zXxhv9Rw8SGc8qn6vITHk1S1mPevtekgasY5Y\r\n"
+    "iWQuM3h4YVlRH3HHEMAD1TnAexfXHHDFQGe+Bd1iAbz1/sH9H8l4StwX6egvTK3M\r\n"
+    "wXRwkKkvjKaEDA9ATbZx0mI8LGsxSuCqe9r9dyjmttd47J1p1Rulz3CLzaRcVIuS\r\n"
+    "RRQfaD8neM9c1S/iJ/amTVqJxA1KOdOS5780WhPfSArA+g4qAmSjelc3p4wWpha8\r\n"
+    "zhuYwjVuX6JHG0c=\r\n"
+    "-----END CERTIFICATE-----\r\n";
+const size_t mbedtls_test_srv_crt_rsa_len = sizeof(mbedtls_test_srv_crt_rsa);
 
 const char mbedtls_test_srv_key_rsa[] =
-"-----BEGIN RSA PRIVATE KEY-----\r\n"
-"MIIEpAIBAAKCAQEAwU2j3efNHdEE10lyuJmsDnjkOjxKzzoTFtBa5M2jAIin7h5r\r\n"
-"lqdStJDvLXJ6PiSa/LY0rCT1d+AmZIycsCh9odrqjObJHJa8/sEEUrM21KP64bF2\r\n"
-"2JDBYbRmUjaiJlOqq3ReB30Zgtsq2B+g2Q0cLUlm91slc0boC4pPaQy1AJDh2oIQ\r\n"
-"Zn2uVCuLZXmRoeJhw81ASQjuaAzxi4bSRr/QuKoRAx5/VqgaHkQYDw+Fi9qLRF7i\r\n"
-"GMZiL8dmjfpd2H3zJ4kpAcWQDj8n8TDISg7v1t7HxydrxwU9esQCPJodPg/oNJhb\r\n"
-"y3NLUpbYEaIsgIhpOVrTD7DeWS8Rx/fqEgEwlwIDAQABAoIBAQCXR0S8EIHFGORZ\r\n"
-"++AtOg6eENxD+xVs0f1IeGz57Tjo3QnXX7VBZNdj+p1ECvhCE/G7XnkgU5hLZX+G\r\n"
-"Z0jkz/tqJOI0vRSdLBbipHnWouyBQ4e/A1yIJdlBtqXxJ1KE/ituHRbNc4j4kL8Z\r\n"
-"/r6pvwnTI0PSx2Eqs048YdS92LT6qAv4flbNDxMn2uY7s4ycS4Q8w1JXnCeaAnYm\r\n"
-"WYI5wxO+bvRELR2Mcz5DmVnL8jRyml6l6582bSv5oufReFIbyPZbQWlXgYnpu6He\r\n"
-"GTc7E1zKYQGG/9+DQUl/1vQuCPqQwny0tQoX2w5tdYpdMdVm+zkLtbajzdTviJJa\r\n"
-"TWzL6lt5AoGBAN86+SVeJDcmQJcv4Eq6UhtRr4QGMiQMz0Sod6ettYxYzMgxtw28\r\n"
-"CIrgpozCc+UaZJLo7UxvC6an85r1b2nKPCLQFaggJ0H4Q0J/sZOhBIXaoBzWxveK\r\n"
-"nupceKdVxGsFi8CDy86DBfiyFivfBj+47BbaQzPBj7C4rK7UlLjab2rDAoGBAN2u\r\n"
-"AM2gchoFiu4v1HFL8D7lweEpi6ZnMJjnEu/dEgGQJFjwdpLnPbsj4c75odQ4Gz8g\r\n"
-"sw9lao9VVzbusoRE/JGI4aTdO0pATXyG7eG1Qu+5Yc1YGXcCrliA2xM9xx+d7f+s\r\n"
-"mPzN+WIEg5GJDYZDjAzHG5BNvi/FfM1C9dOtjv2dAoGAF0t5KmwbjWHBhcVqO4Ic\r\n"
-"BVvN3BIlc1ue2YRXEDlxY5b0r8N4XceMgKmW18OHApZxfl8uPDauWZLXOgl4uepv\r\n"
-"whZC3EuWrSyyICNhLY21Ah7hbIEBPF3L3ZsOwC+UErL+dXWLdB56Jgy3gZaBeW7b\r\n"
-"vDrEnocJbqCm7IukhXHOBK8CgYEAwqdHB0hqyNSzIOGY7v9abzB6pUdA3BZiQvEs\r\n"
-"3LjHVd4HPJ2x0N8CgrBIWOE0q8+0hSMmeE96WW/7jD3fPWwCR5zlXknxBQsfv0gP\r\n"
-"3BC5PR0Qdypz+d+9zfMf625kyit4T/hzwhDveZUzHnk1Cf+IG7Q+TOEnLnWAWBED\r\n"
-"ISOWmrUCgYAFEmRxgwAc/u+D6t0syCwAYh6POtscq9Y0i9GyWk89NzgC4NdwwbBH\r\n"
-"4AgahOxIxXx2gxJnq3yfkJfIjwf0s2DyP0kY2y6Ua1OeomPeY9mrIS4tCuDQ6LrE\r\n"
-"TB6l9VGoxJL4fyHnZb8L5gGvnB1bbD8cL6YPaDiOhcRseC9vBiEuVg==\r\n"
-"-----END RSA PRIVATE KEY-----\r\n";
-const size_t mbedtls_test_srv_key_rsa_len = sizeof( mbedtls_test_srv_key_rsa );
+    "-----BEGIN RSA PRIVATE KEY-----\r\n"
+    "MIIEpAIBAAKCAQEAwU2j3efNHdEE10lyuJmsDnjkOjxKzzoTFtBa5M2jAIin7h5r\r\n"
+    "lqdStJDvLXJ6PiSa/LY0rCT1d+AmZIycsCh9odrqjObJHJa8/sEEUrM21KP64bF2\r\n"
+    "2JDBYbRmUjaiJlOqq3ReB30Zgtsq2B+g2Q0cLUlm91slc0boC4pPaQy1AJDh2oIQ\r\n"
+    "Zn2uVCuLZXmRoeJhw81ASQjuaAzxi4bSRr/QuKoRAx5/VqgaHkQYDw+Fi9qLRF7i\r\n"
+    "GMZiL8dmjfpd2H3zJ4kpAcWQDj8n8TDISg7v1t7HxydrxwU9esQCPJodPg/oNJhb\r\n"
+    "y3NLUpbYEaIsgIhpOVrTD7DeWS8Rx/fqEgEwlwIDAQABAoIBAQCXR0S8EIHFGORZ\r\n"
+    "++AtOg6eENxD+xVs0f1IeGz57Tjo3QnXX7VBZNdj+p1ECvhCE/G7XnkgU5hLZX+G\r\n"
+    "Z0jkz/tqJOI0vRSdLBbipHnWouyBQ4e/A1yIJdlBtqXxJ1KE/ituHRbNc4j4kL8Z\r\n"
+    "/r6pvwnTI0PSx2Eqs048YdS92LT6qAv4flbNDxMn2uY7s4ycS4Q8w1JXnCeaAnYm\r\n"
+    "WYI5wxO+bvRELR2Mcz5DmVnL8jRyml6l6582bSv5oufReFIbyPZbQWlXgYnpu6He\r\n"
+    "GTc7E1zKYQGG/9+DQUl/1vQuCPqQwny0tQoX2w5tdYpdMdVm+zkLtbajzdTviJJa\r\n"
+    "TWzL6lt5AoGBAN86+SVeJDcmQJcv4Eq6UhtRr4QGMiQMz0Sod6ettYxYzMgxtw28\r\n"
+    "CIrgpozCc+UaZJLo7UxvC6an85r1b2nKPCLQFaggJ0H4Q0J/sZOhBIXaoBzWxveK\r\n"
+    "nupceKdVxGsFi8CDy86DBfiyFivfBj+47BbaQzPBj7C4rK7UlLjab2rDAoGBAN2u\r\n"
+    "AM2gchoFiu4v1HFL8D7lweEpi6ZnMJjnEu/dEgGQJFjwdpLnPbsj4c75odQ4Gz8g\r\n"
+    "sw9lao9VVzbusoRE/JGI4aTdO0pATXyG7eG1Qu+5Yc1YGXcCrliA2xM9xx+d7f+s\r\n"
+    "mPzN+WIEg5GJDYZDjAzHG5BNvi/FfM1C9dOtjv2dAoGAF0t5KmwbjWHBhcVqO4Ic\r\n"
+    "BVvN3BIlc1ue2YRXEDlxY5b0r8N4XceMgKmW18OHApZxfl8uPDauWZLXOgl4uepv\r\n"
+    "whZC3EuWrSyyICNhLY21Ah7hbIEBPF3L3ZsOwC+UErL+dXWLdB56Jgy3gZaBeW7b\r\n"
+    "vDrEnocJbqCm7IukhXHOBK8CgYEAwqdHB0hqyNSzIOGY7v9abzB6pUdA3BZiQvEs\r\n"
+    "3LjHVd4HPJ2x0N8CgrBIWOE0q8+0hSMmeE96WW/7jD3fPWwCR5zlXknxBQsfv0gP\r\n"
+    "3BC5PR0Qdypz+d+9zfMf625kyit4T/hzwhDveZUzHnk1Cf+IG7Q+TOEnLnWAWBED\r\n"
+    "ISOWmrUCgYAFEmRxgwAc/u+D6t0syCwAYh6POtscq9Y0i9GyWk89NzgC4NdwwbBH\r\n"
+    "4AgahOxIxXx2gxJnq3yfkJfIjwf0s2DyP0kY2y6Ua1OeomPeY9mrIS4tCuDQ6LrE\r\n"
+    "TB6l9VGoxJL4fyHnZb8L5gGvnB1bbD8cL6YPaDiOhcRseC9vBiEuVg==\r\n"
+    "-----END RSA PRIVATE KEY-----\r\n";
+const size_t mbedtls_test_srv_key_rsa_len = sizeof(mbedtls_test_srv_key_rsa);
 
 const char mbedtls_test_cli_crt_rsa[] =
-"-----BEGIN CERTIFICATE-----\r\n"
-"MIIDhTCCAm2gAwIBAgIBBDANBgkqhkiG9w0BAQsFADA7MQswCQYDVQQGEwJOTDER\r\n"
-"MA8GA1UECgwIUG9sYXJTU0wxGTAXBgNVBAMMEFBvbGFyU1NMIFRlc3QgQ0EwHhcN\r\n"
-"MTcwNTA1MTMwNzU5WhcNMjcwNTA2MTMwNzU5WjA8MQswCQYDVQQGEwJOTDERMA8G\r\n"
-"A1UECgwIUG9sYXJTU0wxGjAYBgNVBAMMEVBvbGFyU1NMIENsaWVudCAyMIIBIjAN\r\n"
-"BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyHTEzLn5tXnpRdkUYLB9u5Pyax6f\r\n"
-"M60Nj4o8VmXl3ETZzGaFB9X4J7BKNdBjngpuG7fa8H6r7gwQk4ZJGDTzqCrSV/Uu\r\n"
-"1C93KYRhTYJQj6eVSHD1bk2y1RPD0hrt5kPqQhTrdOrA7R/UV06p86jt0uDBMHEw\r\n"
-"MjDV0/YI0FZPRo7yX/k9Z5GIMC5Cst99++UMd//sMcB4j7/Cf8qtbCHWjdmLao5v\r\n"
-"4Jv4EFbMs44TFeY0BGbH7vk2DmqV9gmaBmf0ZXH4yqSxJeD+PIs1BGe64E92hfx/\r\n"
-"/DZrtenNLQNiTrM9AM+vdqBpVoNq0qjU51Bx5rU2BXcFbXvI5MT9TNUhXwIDAQAB\r\n"
-"o4GSMIGPMB0GA1UdDgQWBBRxoQBzckAvVHZeM/xSj7zx3WtGITBjBgNVHSMEXDBa\r\n"
-"gBS0WuSls97SUva51aaVD+s+vMf9/6E/pD0wOzELMAkGA1UEBhMCTkwxETAPBgNV\r\n"
-"BAoMCFBvbGFyU1NMMRkwFwYDVQQDDBBQb2xhclNTTCBUZXN0IENBggEAMAkGA1Ud\r\n"
-"EwQCMAAwDQYJKoZIhvcNAQELBQADggEBAC7yO786NvcHpK8UovKIG9cB32oSQQom\r\n"
-"LoR0eHDRzdqEkoq7yGZufHFiRAAzbMqJfogRtxlrWAeB4y/jGaMBV25IbFOIcH2W\r\n"
-"iCEaMMbG+VQLKNvuC63kmw/Zewc9ThM6Pa1Hcy0axT0faf1B/U01j0FIcw/6mTfK\r\n"
-"D8w48OIwc1yr0JtutCVjig5DC0yznGMt32RyseOLcUe+lfq005v2PAiCozr5X8rE\r\n"
-"ofGZpiM2NqRPePgYy+Vc75Zk28xkRQq1ncprgQb3S4vTsZdScpM9hLf+eMlrgqlj\r\n"
-"c5PLSkXBeLE5+fedkyfTaLxxQlgCpuoOhKBm04/R1pWNzUHyqagjO9Q=\r\n"
-"-----END CERTIFICATE-----\r\n";
-const size_t mbedtls_test_cli_crt_rsa_len = sizeof( mbedtls_test_cli_crt_rsa );
+    "-----BEGIN CERTIFICATE-----\r\n"
+    "MIIDhTCCAm2gAwIBAgIBBDANBgkqhkiG9w0BAQsFADA7MQswCQYDVQQGEwJOTDER\r\n"
+    "MA8GA1UECgwIUG9sYXJTU0wxGTAXBgNVBAMMEFBvbGFyU1NMIFRlc3QgQ0EwHhcN\r\n"
+    "MTcwNTA1MTMwNzU5WhcNMjcwNTA2MTMwNzU5WjA8MQswCQYDVQQGEwJOTDERMA8G\r\n"
+    "A1UECgwIUG9sYXJTU0wxGjAYBgNVBAMMEVBvbGFyU1NMIENsaWVudCAyMIIBIjAN\r\n"
+    "BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyHTEzLn5tXnpRdkUYLB9u5Pyax6f\r\n"
+    "M60Nj4o8VmXl3ETZzGaFB9X4J7BKNdBjngpuG7fa8H6r7gwQk4ZJGDTzqCrSV/Uu\r\n"
+    "1C93KYRhTYJQj6eVSHD1bk2y1RPD0hrt5kPqQhTrdOrA7R/UV06p86jt0uDBMHEw\r\n"
+    "MjDV0/YI0FZPRo7yX/k9Z5GIMC5Cst99++UMd//sMcB4j7/Cf8qtbCHWjdmLao5v\r\n"
+    "4Jv4EFbMs44TFeY0BGbH7vk2DmqV9gmaBmf0ZXH4yqSxJeD+PIs1BGe64E92hfx/\r\n"
+    "/DZrtenNLQNiTrM9AM+vdqBpVoNq0qjU51Bx5rU2BXcFbXvI5MT9TNUhXwIDAQAB\r\n"
+    "o4GSMIGPMB0GA1UdDgQWBBRxoQBzckAvVHZeM/xSj7zx3WtGITBjBgNVHSMEXDBa\r\n"
+    "gBS0WuSls97SUva51aaVD+s+vMf9/6E/pD0wOzELMAkGA1UEBhMCTkwxETAPBgNV\r\n"
+    "BAoMCFBvbGFyU1NMMRkwFwYDVQQDDBBQb2xhclNTTCBUZXN0IENBggEAMAkGA1Ud\r\n"
+    "EwQCMAAwDQYJKoZIhvcNAQELBQADggEBAC7yO786NvcHpK8UovKIG9cB32oSQQom\r\n"
+    "LoR0eHDRzdqEkoq7yGZufHFiRAAzbMqJfogRtxlrWAeB4y/jGaMBV25IbFOIcH2W\r\n"
+    "iCEaMMbG+VQLKNvuC63kmw/Zewc9ThM6Pa1Hcy0axT0faf1B/U01j0FIcw/6mTfK\r\n"
+    "D8w48OIwc1yr0JtutCVjig5DC0yznGMt32RyseOLcUe+lfq005v2PAiCozr5X8rE\r\n"
+    "ofGZpiM2NqRPePgYy+Vc75Zk28xkRQq1ncprgQb3S4vTsZdScpM9hLf+eMlrgqlj\r\n"
+    "c5PLSkXBeLE5+fedkyfTaLxxQlgCpuoOhKBm04/R1pWNzUHyqagjO9Q=\r\n"
+    "-----END CERTIFICATE-----\r\n";
+const size_t mbedtls_test_cli_crt_rsa_len = sizeof(mbedtls_test_cli_crt_rsa);
 
 const char mbedtls_test_cli_key_rsa[] =
-"-----BEGIN RSA PRIVATE KEY-----\r\n"
-"MIIEpAIBAAKCAQEAyHTEzLn5tXnpRdkUYLB9u5Pyax6fM60Nj4o8VmXl3ETZzGaF\r\n"
-"B9X4J7BKNdBjngpuG7fa8H6r7gwQk4ZJGDTzqCrSV/Uu1C93KYRhTYJQj6eVSHD1\r\n"
-"bk2y1RPD0hrt5kPqQhTrdOrA7R/UV06p86jt0uDBMHEwMjDV0/YI0FZPRo7yX/k9\r\n"
-"Z5GIMC5Cst99++UMd//sMcB4j7/Cf8qtbCHWjdmLao5v4Jv4EFbMs44TFeY0BGbH\r\n"
-"7vk2DmqV9gmaBmf0ZXH4yqSxJeD+PIs1BGe64E92hfx//DZrtenNLQNiTrM9AM+v\r\n"
-"dqBpVoNq0qjU51Bx5rU2BXcFbXvI5MT9TNUhXwIDAQABAoIBAGdNtfYDiap6bzst\r\n"
-"yhCiI8m9TtrhZw4MisaEaN/ll3XSjaOG2dvV6xMZCMV+5TeXDHOAZnY18Yi18vzz\r\n"
-"4Ut2TnNFzizCECYNaA2fST3WgInnxUkV3YXAyP6CNxJaCmv2aA0yFr2kFVSeaKGt\r\n"
-"ymvljNp2NVkvm7Th8fBQBO7I7AXhz43k0mR7XmPgewe8ApZOG3hstkOaMvbWAvWA\r\n"
-"zCZupdDjZYjOJqlA4eEA4H8/w7F83r5CugeBE8LgEREjLPiyejrU5H1fubEY+h0d\r\n"
-"l5HZBJ68ybTXfQ5U9o/QKA3dd0toBEhhdRUDGzWtjvwkEQfqF1reGWj/tod/gCpf\r\n"
-"DFi6X0ECgYEA4wOv/pjSC3ty6TuOvKX2rOUiBrLXXv2JSxZnMoMiWI5ipLQt+RYT\r\n"
-"VPafL/m7Dn6MbwjayOkcZhBwk5CNz5A6Q4lJ64Mq/lqHznRCQQ2Mc1G8eyDF/fYL\r\n"
-"Ze2pLvwP9VD5jTc2miDfw+MnvJhywRRLcemDFP8k4hQVtm8PMp3ZmNECgYEA4gz7\r\n"
-"wzObR4gn8ibe617uQPZjWzUj9dUHYd+in1gwBCIrtNnaRn9I9U/Q6tegRYpii4ys\r\n"
-"c176NmU+umy6XmuSKV5qD9bSpZWG2nLFnslrN15Lm3fhZxoeMNhBaEDTnLT26yoi\r\n"
-"33gp0mSSWy94ZEqipms+ULF6sY1ZtFW6tpGFoy8CgYAQHhnnvJflIs2ky4q10B60\r\n"
-"ZcxFp3rtDpkp0JxhFLhiizFrujMtZSjYNm5U7KkgPVHhLELEUvCmOnKTt4ap/vZ0\r\n"
-"BxJNe1GZH3pW6SAvGDQpl9sG7uu/vTFP+lCxukmzxB0DrrDcvorEkKMom7ZCCRvW\r\n"
-"KZsZ6YeH2Z81BauRj218kQKBgQCUV/DgKP2985xDTT79N08jUo3hTP5MVYCCuj/+\r\n"
-"UeEw1TvZcx3LJby7P6Xad6a1/BqveaGyFKIfEFIaBUBItk801sDDpDaYc4gL00Xc\r\n"
-"7lFuBHOZkxJYlss5QrGpuOEl9ZwUt5IrFLBdYaKqNHzNVC1pCPfb/JyH6Dr2HUxq\r\n"
-"gxUwAQKBgQCcU6G2L8AG9d9c0UpOyL1tMvFe5Ttw0KjlQVdsh1MP6yigYo9DYuwu\r\n"
-"bHFVW2r0dBTqegP2/KTOxKzaHfC1qf0RGDsUoJCNJrd1cwoCLG8P2EF4w3OBrKqv\r\n"
-"8u4ytY0F+Vlanj5lm3TaoHSVF1+NWPyOTiwevIECGKwSxvlki4fDAA==\r\n"
-"-----END RSA PRIVATE KEY-----\r\n";
-const size_t mbedtls_test_cli_key_rsa_len = sizeof( mbedtls_test_cli_key_rsa );
+    "-----BEGIN RSA PRIVATE KEY-----\r\n"
+    "MIIEpAIBAAKCAQEAyHTEzLn5tXnpRdkUYLB9u5Pyax6fM60Nj4o8VmXl3ETZzGaF\r\n"
+    "B9X4J7BKNdBjngpuG7fa8H6r7gwQk4ZJGDTzqCrSV/Uu1C93KYRhTYJQj6eVSHD1\r\n"
+    "bk2y1RPD0hrt5kPqQhTrdOrA7R/UV06p86jt0uDBMHEwMjDV0/YI0FZPRo7yX/k9\r\n"
+    "Z5GIMC5Cst99++UMd//sMcB4j7/Cf8qtbCHWjdmLao5v4Jv4EFbMs44TFeY0BGbH\r\n"
+    "7vk2DmqV9gmaBmf0ZXH4yqSxJeD+PIs1BGe64E92hfx//DZrtenNLQNiTrM9AM+v\r\n"
+    "dqBpVoNq0qjU51Bx5rU2BXcFbXvI5MT9TNUhXwIDAQABAoIBAGdNtfYDiap6bzst\r\n"
+    "yhCiI8m9TtrhZw4MisaEaN/ll3XSjaOG2dvV6xMZCMV+5TeXDHOAZnY18Yi18vzz\r\n"
+    "4Ut2TnNFzizCECYNaA2fST3WgInnxUkV3YXAyP6CNxJaCmv2aA0yFr2kFVSeaKGt\r\n"
+    "ymvljNp2NVkvm7Th8fBQBO7I7AXhz43k0mR7XmPgewe8ApZOG3hstkOaMvbWAvWA\r\n"
+    "zCZupdDjZYjOJqlA4eEA4H8/w7F83r5CugeBE8LgEREjLPiyejrU5H1fubEY+h0d\r\n"
+    "l5HZBJ68ybTXfQ5U9o/QKA3dd0toBEhhdRUDGzWtjvwkEQfqF1reGWj/tod/gCpf\r\n"
+    "DFi6X0ECgYEA4wOv/pjSC3ty6TuOvKX2rOUiBrLXXv2JSxZnMoMiWI5ipLQt+RYT\r\n"
+    "VPafL/m7Dn6MbwjayOkcZhBwk5CNz5A6Q4lJ64Mq/lqHznRCQQ2Mc1G8eyDF/fYL\r\n"
+    "Ze2pLvwP9VD5jTc2miDfw+MnvJhywRRLcemDFP8k4hQVtm8PMp3ZmNECgYEA4gz7\r\n"
+    "wzObR4gn8ibe617uQPZjWzUj9dUHYd+in1gwBCIrtNnaRn9I9U/Q6tegRYpii4ys\r\n"
+    "c176NmU+umy6XmuSKV5qD9bSpZWG2nLFnslrN15Lm3fhZxoeMNhBaEDTnLT26yoi\r\n"
+    "33gp0mSSWy94ZEqipms+ULF6sY1ZtFW6tpGFoy8CgYAQHhnnvJflIs2ky4q10B60\r\n"
+    "ZcxFp3rtDpkp0JxhFLhiizFrujMtZSjYNm5U7KkgPVHhLELEUvCmOnKTt4ap/vZ0\r\n"
+    "BxJNe1GZH3pW6SAvGDQpl9sG7uu/vTFP+lCxukmzxB0DrrDcvorEkKMom7ZCCRvW\r\n"
+    "KZsZ6YeH2Z81BauRj218kQKBgQCUV/DgKP2985xDTT79N08jUo3hTP5MVYCCuj/+\r\n"
+    "UeEw1TvZcx3LJby7P6Xad6a1/BqveaGyFKIfEFIaBUBItk801sDDpDaYc4gL00Xc\r\n"
+    "7lFuBHOZkxJYlss5QrGpuOEl9ZwUt5IrFLBdYaKqNHzNVC1pCPfb/JyH6Dr2HUxq\r\n"
+    "gxUwAQKBgQCcU6G2L8AG9d9c0UpOyL1tMvFe5Ttw0KjlQVdsh1MP6yigYo9DYuwu\r\n"
+    "bHFVW2r0dBTqegP2/KTOxKzaHfC1qf0RGDsUoJCNJrd1cwoCLG8P2EF4w3OBrKqv\r\n"
+    "8u4ytY0F+Vlanj5lm3TaoHSVF1+NWPyOTiwevIECGKwSxvlki4fDAA==\r\n"
+    "-----END RSA PRIVATE KEY-----\r\n";
+const size_t mbedtls_test_cli_key_rsa_len = sizeof(mbedtls_test_cli_key_rsa);
 #endif /* MBEDTLS_RSA_C */
 
 #if defined(MBEDTLS_PEM_PARSE_C)
@@ -341,11 +341,11 @@ const char mbedtls_test_cas_pem[] =
     TEST_CA_CRT_EC
 #endif
     "";
-const size_t mbedtls_test_cas_pem_len = sizeof( mbedtls_test_cas_pem );
+const size_t mbedtls_test_cas_pem_len = sizeof(mbedtls_test_cas_pem);
 #endif
 
 /* List of all available CA certificates */
-const char * mbedtls_test_cas[] = {
+const char *mbedtls_test_cas[] = {
 #if defined(TEST_CA_CRT_RSA_SHA1)
     mbedtls_test_ca_crt_rsa_sha1,
 #endif
@@ -359,13 +359,13 @@ const char * mbedtls_test_cas[] = {
 };
 const size_t mbedtls_test_cas_len[] = {
 #if defined(TEST_CA_CRT_RSA_SHA1)
-    sizeof( mbedtls_test_ca_crt_rsa_sha1 ),
+    sizeof(mbedtls_test_ca_crt_rsa_sha1),
 #endif
 #if defined(TEST_CA_CRT_RSA_SHA256)
-    sizeof( mbedtls_test_ca_crt_rsa_sha256 ),
+    sizeof(mbedtls_test_ca_crt_rsa_sha256),
 #endif
 #if defined(MBEDTLS_ECDSA_C)
-    sizeof( mbedtls_test_ca_crt_ec ),
+    sizeof(mbedtls_test_ca_crt_ec),
 #endif
     0
 };
@@ -378,13 +378,13 @@ const char *mbedtls_test_srv_crt = mbedtls_test_srv_crt_rsa;
 const char *mbedtls_test_srv_key = mbedtls_test_srv_key_rsa;
 const char *mbedtls_test_cli_crt = mbedtls_test_cli_crt_rsa;
 const char *mbedtls_test_cli_key = mbedtls_test_cli_key_rsa;
-const size_t mbedtls_test_ca_crt_len  = sizeof( mbedtls_test_ca_crt_rsa );
-const size_t mbedtls_test_ca_key_len  = sizeof( mbedtls_test_ca_key_rsa );
-const size_t mbedtls_test_ca_pwd_len  = sizeof( mbedtls_test_ca_pwd_rsa ) - 1;
-const size_t mbedtls_test_srv_crt_len = sizeof( mbedtls_test_srv_crt_rsa );
-const size_t mbedtls_test_srv_key_len = sizeof( mbedtls_test_srv_key_rsa );
-const size_t mbedtls_test_cli_crt_len = sizeof( mbedtls_test_cli_crt_rsa );
-const size_t mbedtls_test_cli_key_len = sizeof( mbedtls_test_cli_key_rsa );
+const size_t mbedtls_test_ca_crt_len  = sizeof(mbedtls_test_ca_crt_rsa);
+const size_t mbedtls_test_ca_key_len  = sizeof(mbedtls_test_ca_key_rsa);
+const size_t mbedtls_test_ca_pwd_len  = sizeof(mbedtls_test_ca_pwd_rsa) - 1;
+const size_t mbedtls_test_srv_crt_len = sizeof(mbedtls_test_srv_crt_rsa);
+const size_t mbedtls_test_srv_key_len = sizeof(mbedtls_test_srv_key_rsa);
+const size_t mbedtls_test_cli_crt_len = sizeof(mbedtls_test_cli_crt_rsa);
+const size_t mbedtls_test_cli_key_len = sizeof(mbedtls_test_cli_key_rsa);
 #else /* ! MBEDTLS_RSA_C, so MBEDTLS_ECDSA_C */
 const char *mbedtls_test_ca_crt  = mbedtls_test_ca_crt_ec;
 const char *mbedtls_test_ca_key  = mbedtls_test_ca_key_ec;
@@ -393,13 +393,13 @@ const char *mbedtls_test_srv_crt = mbedtls_test_srv_crt_ec;
 const char *mbedtls_test_srv_key = mbedtls_test_srv_key_ec;
 const char *mbedtls_test_cli_crt = mbedtls_test_cli_crt_ec;
 const char *mbedtls_test_cli_key = mbedtls_test_cli_key_ec;
-const size_t mbedtls_test_ca_crt_len  = sizeof( mbedtls_test_ca_crt_ec );
-const size_t mbedtls_test_ca_key_len  = sizeof( mbedtls_test_ca_key_ec );
-const size_t mbedtls_test_ca_pwd_len  = sizeof( mbedtls_test_ca_pwd_ec ) - 1;
-const size_t mbedtls_test_srv_crt_len = sizeof( mbedtls_test_srv_crt_ec );
-const size_t mbedtls_test_srv_key_len = sizeof( mbedtls_test_srv_key_ec );
-const size_t mbedtls_test_cli_crt_len = sizeof( mbedtls_test_cli_crt_ec );
-const size_t mbedtls_test_cli_key_len = sizeof( mbedtls_test_cli_key_ec );
+const size_t mbedtls_test_ca_crt_len  = sizeof(mbedtls_test_ca_crt_ec);
+const size_t mbedtls_test_ca_key_len  = sizeof(mbedtls_test_ca_key_ec);
+const size_t mbedtls_test_ca_pwd_len  = sizeof(mbedtls_test_ca_pwd_ec) - 1;
+const size_t mbedtls_test_srv_crt_len = sizeof(mbedtls_test_srv_crt_ec);
+const size_t mbedtls_test_srv_key_len = sizeof(mbedtls_test_srv_key_ec);
+const size_t mbedtls_test_cli_crt_len = sizeof(mbedtls_test_cli_crt_ec);
+const size_t mbedtls_test_cli_key_len = sizeof(mbedtls_test_cli_key_ec);
 #endif /* MBEDTLS_RSA_C */
 
 #endif /* MBEDTLS_CERTS_C */
diff --git a/common/mbedtls/certs.h b/common/mbedtls/certs.h
index ae0f84a30..7522044e7 100644
--- a/common/mbedtls/certs.h
+++ b/common/mbedtls/certs.h
@@ -39,26 +39,26 @@ extern const size_t mbedtls_test_cas_pem_len;
 #endif
 
 /* List of all CA certificates, terminated by NULL */
-extern const char * mbedtls_test_cas[];
+extern const char *mbedtls_test_cas[];
 extern const size_t mbedtls_test_cas_len[];
 
 /*
  * Convenience for users who just want a certificate:
  * RSA by default, or ECDSA if RSA is not available
  */
-extern const char * mbedtls_test_ca_crt;
+extern const char *mbedtls_test_ca_crt;
 extern const size_t mbedtls_test_ca_crt_len;
-extern const char * mbedtls_test_ca_key;
+extern const char *mbedtls_test_ca_key;
 extern const size_t mbedtls_test_ca_key_len;
-extern const char * mbedtls_test_ca_pwd;
+extern const char *mbedtls_test_ca_pwd;
 extern const size_t mbedtls_test_ca_pwd_len;
-extern const char * mbedtls_test_srv_crt;
+extern const char *mbedtls_test_srv_crt;
 extern const size_t mbedtls_test_srv_crt_len;
-extern const char * mbedtls_test_srv_key;
+extern const char *mbedtls_test_srv_key;
 extern const size_t mbedtls_test_srv_key_len;
-extern const char * mbedtls_test_cli_crt;
+extern const char *mbedtls_test_cli_crt;
 extern const size_t mbedtls_test_cli_crt_len;
-extern const char * mbedtls_test_cli_key;
+extern const char *mbedtls_test_cli_key;
 extern const size_t mbedtls_test_cli_key_len;
 
 #if defined(MBEDTLS_ECDSA_C)
diff --git a/common/mbedtls/cipher.c b/common/mbedtls/cipher.c
index de9402a2f..9f4ab8efb 100644
--- a/common/mbedtls/cipher.c
+++ b/common/mbedtls/cipher.c
@@ -73,14 +73,14 @@
  * a non-zero value.
  * This is currently only used by GCM and ChaCha20+Poly1305.
  */
-static int mbedtls_constant_time_memcmp( const void *v1, const void *v2, size_t len )
+static int mbedtls_constant_time_memcmp(const void *v1, const void *v2, size_t len)
 {
-    const unsigned char *p1 = (const unsigned char*) v1;
-    const unsigned char *p2 = (const unsigned char*) v2;
+    const unsigned char *p1 = (const unsigned char *) v1;
+    const unsigned char *p2 = (const unsigned char *) v2;
     size_t i;
     unsigned char diff;
 
-    for( diff = 0, i = 0; i < len; i++ )
+    for (diff = 0, i = 0; i < len; i++)
         diff |= p1[i] ^ p2[i];
 
     return (int)diff;
@@ -89,17 +89,16 @@ static int mbedtls_constant_time_memcmp( const void *v1, const void *v2, size_t
 
 static int supported_init = 0;
 
-const int *mbedtls_cipher_list( void )
+const int *mbedtls_cipher_list(void)
 {
     const mbedtls_cipher_definition_t *def;
     int *type;
 
-    if( ! supported_init )
-    {
+    if (! supported_init) {
         def = mbedtls_cipher_definitions;
         type = mbedtls_cipher_supported;
 
-        while( def->type != 0 )
+        while (def->type != 0)
             *type++ = (*def++).type;
 
         *type = 0;
@@ -107,83 +106,82 @@ const int *mbedtls_cipher_list( void )
         supported_init = 1;
     }
 
-    return( mbedtls_cipher_supported );
+    return (mbedtls_cipher_supported);
 }
 
-const mbedtls_cipher_info_t *mbedtls_cipher_info_from_type( const mbedtls_cipher_type_t cipher_type )
+const mbedtls_cipher_info_t *mbedtls_cipher_info_from_type(const mbedtls_cipher_type_t cipher_type)
 {
     const mbedtls_cipher_definition_t *def;
 
-    for( def = mbedtls_cipher_definitions; def->info != NULL; def++ )
-        if( def->type == cipher_type )
-            return( def->info );
+    for (def = mbedtls_cipher_definitions; def->info != NULL; def++)
+        if (def->type == cipher_type)
+            return (def->info);
 
-    return( NULL );
+    return (NULL);
 }
 
-const mbedtls_cipher_info_t *mbedtls_cipher_info_from_string( const char *cipher_name )
+const mbedtls_cipher_info_t *mbedtls_cipher_info_from_string(const char *cipher_name)
 {
     const mbedtls_cipher_definition_t *def;
 
-    if( NULL == cipher_name )
-        return( NULL );
+    if (NULL == cipher_name)
+        return (NULL);
 
-    for( def = mbedtls_cipher_definitions; def->info != NULL; def++ )
-        if( !  strcmp( def->info->name, cipher_name ) )
-            return( def->info );
+    for (def = mbedtls_cipher_definitions; def->info != NULL; def++)
+        if (!  strcmp(def->info->name, cipher_name))
+            return (def->info);
 
-    return( NULL );
+    return (NULL);
 }
 
-const mbedtls_cipher_info_t *mbedtls_cipher_info_from_values( const mbedtls_cipher_id_t cipher_id,
-                                              int key_bitlen,
-                                              const mbedtls_cipher_mode_t mode )
+const mbedtls_cipher_info_t *mbedtls_cipher_info_from_values(const mbedtls_cipher_id_t cipher_id,
+        int key_bitlen,
+        const mbedtls_cipher_mode_t mode)
 {
     const mbedtls_cipher_definition_t *def;
 
-    for( def = mbedtls_cipher_definitions; def->info != NULL; def++ )
-        if( def->info->base->cipher == cipher_id &&
+    for (def = mbedtls_cipher_definitions; def->info != NULL; def++)
+        if (def->info->base->cipher == cipher_id &&
             def->info->key_bitlen == (unsigned) key_bitlen &&
-            def->info->mode == mode )
-            return( def->info );
+            def->info->mode == mode)
+            return (def->info);
 
-    return( NULL );
+    return (NULL);
 }
 
-void mbedtls_cipher_init( mbedtls_cipher_context_t *ctx )
+void mbedtls_cipher_init(mbedtls_cipher_context_t *ctx)
 {
-    memset( ctx, 0, sizeof( mbedtls_cipher_context_t ) );
+    memset(ctx, 0, sizeof(mbedtls_cipher_context_t));
 }
 
-void mbedtls_cipher_free( mbedtls_cipher_context_t *ctx )
+void mbedtls_cipher_free(mbedtls_cipher_context_t *ctx)
 {
-    if( ctx == NULL )
+    if (ctx == NULL)
         return;
 
 #if defined(MBEDTLS_CMAC_C)
-    if( ctx->cmac_ctx )
-    {
-       mbedtls_platform_zeroize( ctx->cmac_ctx,
-                                 sizeof( mbedtls_cmac_context_t ) );
-       mbedtls_free( ctx->cmac_ctx );
+    if (ctx->cmac_ctx) {
+        mbedtls_platform_zeroize(ctx->cmac_ctx,
+                                 sizeof(mbedtls_cmac_context_t));
+        mbedtls_free(ctx->cmac_ctx);
     }
 #endif
 
-    if( ctx->cipher_ctx )
-        ctx->cipher_info->base->ctx_free_func( ctx->cipher_ctx );
+    if (ctx->cipher_ctx)
+        ctx->cipher_info->base->ctx_free_func(ctx->cipher_ctx);
 
-    mbedtls_platform_zeroize( ctx, sizeof(mbedtls_cipher_context_t) );
+    mbedtls_platform_zeroize(ctx, sizeof(mbedtls_cipher_context_t));
 }
 
-int mbedtls_cipher_setup( mbedtls_cipher_context_t *ctx, const mbedtls_cipher_info_t *cipher_info )
+int mbedtls_cipher_setup(mbedtls_cipher_context_t *ctx, const mbedtls_cipher_info_t *cipher_info)
 {
-    if( NULL == cipher_info || NULL == ctx )
-        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+    if (NULL == cipher_info || NULL == ctx)
+        return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
 
-    memset( ctx, 0, sizeof( mbedtls_cipher_context_t ) );
+    memset(ctx, 0, sizeof(mbedtls_cipher_context_t));
 
-    if( NULL == ( ctx->cipher_ctx = cipher_info->base->ctx_alloc_func() ) )
-        return( MBEDTLS_ERR_CIPHER_ALLOC_FAILED );
+    if (NULL == (ctx->cipher_ctx = cipher_info->base->ctx_alloc_func()))
+        return (MBEDTLS_ERR_CIPHER_ALLOC_FAILED);
 
     ctx->cipher_info = cipher_info;
 
@@ -192,25 +190,24 @@ int mbedtls_cipher_setup( mbedtls_cipher_context_t *ctx, const mbedtls_cipher_in
      * Ignore possible errors caused by a cipher mode that doesn't use padding
      */
 #if defined(MBEDTLS_CIPHER_PADDING_PKCS7)
-    (void) mbedtls_cipher_set_padding_mode( ctx, MBEDTLS_PADDING_PKCS7 );
+    (void) mbedtls_cipher_set_padding_mode(ctx, MBEDTLS_PADDING_PKCS7);
 #else
-    (void) mbedtls_cipher_set_padding_mode( ctx, MBEDTLS_PADDING_NONE );
+    (void) mbedtls_cipher_set_padding_mode(ctx, MBEDTLS_PADDING_NONE);
 #endif
 #endif /* MBEDTLS_CIPHER_MODE_WITH_PADDING */
 
-    return( 0 );
+    return (0);
 }
 
-int mbedtls_cipher_setkey( mbedtls_cipher_context_t *ctx, const unsigned char *key,
-        int key_bitlen, const mbedtls_operation_t operation )
+int mbedtls_cipher_setkey(mbedtls_cipher_context_t *ctx, const unsigned char *key,
+                          int key_bitlen, const mbedtls_operation_t operation)
 {
-    if( NULL == ctx || NULL == ctx->cipher_info )
-        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+    if (NULL == ctx || NULL == ctx->cipher_info)
+        return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
 
-    if( ( ctx->cipher_info->flags & MBEDTLS_CIPHER_VARIABLE_KEY_LEN ) == 0 &&
-        (int) ctx->cipher_info->key_bitlen != key_bitlen )
-    {
-        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+    if ((ctx->cipher_info->flags & MBEDTLS_CIPHER_VARIABLE_KEY_LEN) == 0 &&
+        (int) ctx->cipher_info->key_bitlen != key_bitlen) {
+        return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
     }
 
     ctx->key_bitlen = key_bitlen;
@@ -219,209 +216,192 @@ int mbedtls_cipher_setkey( mbedtls_cipher_context_t *ctx, const unsigned char *k
     /*
      * For OFB, CFB and CTR mode always use the encryption key schedule
      */
-    if( MBEDTLS_ENCRYPT == operation ||
+    if (MBEDTLS_ENCRYPT == operation ||
         MBEDTLS_MODE_CFB == ctx->cipher_info->mode ||
         MBEDTLS_MODE_OFB == ctx->cipher_info->mode ||
-        MBEDTLS_MODE_CTR == ctx->cipher_info->mode )
-    {
-        return ctx->cipher_info->base->setkey_enc_func( ctx->cipher_ctx, key,
-                ctx->key_bitlen );
+        MBEDTLS_MODE_CTR == ctx->cipher_info->mode) {
+        return ctx->cipher_info->base->setkey_enc_func(ctx->cipher_ctx, key,
+                                                       ctx->key_bitlen);
     }
 
-    if( MBEDTLS_DECRYPT == operation )
-        return ctx->cipher_info->base->setkey_dec_func( ctx->cipher_ctx, key,
-                ctx->key_bitlen );
+    if (MBEDTLS_DECRYPT == operation)
+        return ctx->cipher_info->base->setkey_dec_func(ctx->cipher_ctx, key,
+                                                       ctx->key_bitlen);
 
-    return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+    return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
 }
 
-int mbedtls_cipher_set_iv( mbedtls_cipher_context_t *ctx,
-                   const unsigned char *iv, size_t iv_len )
+int mbedtls_cipher_set_iv(mbedtls_cipher_context_t *ctx,
+                          const unsigned char *iv, size_t iv_len)
 {
     size_t actual_iv_size;
 
-    if( NULL == ctx || NULL == ctx->cipher_info || NULL == iv )
-        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+    if (NULL == ctx || NULL == ctx->cipher_info || NULL == iv)
+        return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
 
     /* avoid buffer overflow in ctx->iv */
-    if( iv_len > MBEDTLS_MAX_IV_LENGTH )
-        return( MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE );
+    if (iv_len > MBEDTLS_MAX_IV_LENGTH)
+        return (MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE);
 
-    if( ( ctx->cipher_info->flags & MBEDTLS_CIPHER_VARIABLE_IV_LEN ) != 0 )
+    if ((ctx->cipher_info->flags & MBEDTLS_CIPHER_VARIABLE_IV_LEN) != 0)
         actual_iv_size = iv_len;
-    else
-    {
+    else {
         actual_iv_size = ctx->cipher_info->iv_size;
 
         /* avoid reading past the end of input buffer */
-        if( actual_iv_size > iv_len )
-            return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+        if (actual_iv_size > iv_len)
+            return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
     }
 
 #if defined(MBEDTLS_CHACHA20_C)
-    if ( ctx->cipher_info->type == MBEDTLS_CIPHER_CHACHA20 )
-    {
-        if ( 0 != mbedtls_chacha20_starts( (mbedtls_chacha20_context*)ctx->cipher_ctx,
-                                           iv,
-                                           0U ) ) /* Initial counter value */
-        {
-            return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+    if (ctx->cipher_info->type == MBEDTLS_CIPHER_CHACHA20) {
+        if (0 != mbedtls_chacha20_starts((mbedtls_chacha20_context *)ctx->cipher_ctx,
+                                         iv,
+                                         0U)) { /* Initial counter value */
+            return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
         }
     }
 #endif
 
-    memcpy( ctx->iv, iv, actual_iv_size );
+    memcpy(ctx->iv, iv, actual_iv_size);
     ctx->iv_size = actual_iv_size;
 
-    return( 0 );
+    return (0);
 }
 
-int mbedtls_cipher_reset( mbedtls_cipher_context_t *ctx )
+int mbedtls_cipher_reset(mbedtls_cipher_context_t *ctx)
 {
-    if( NULL == ctx || NULL == ctx->cipher_info )
-        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+    if (NULL == ctx || NULL == ctx->cipher_info)
+        return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
 
     ctx->unprocessed_len = 0;
 
-    return( 0 );
+    return (0);
 }
 
 #if defined(MBEDTLS_GCM_C) || defined(MBEDTLS_CHACHAPOLY_C)
-int mbedtls_cipher_update_ad( mbedtls_cipher_context_t *ctx,
-                      const unsigned char *ad, size_t ad_len )
+int mbedtls_cipher_update_ad(mbedtls_cipher_context_t *ctx,
+                             const unsigned char *ad, size_t ad_len)
 {
-    if( NULL == ctx || NULL == ctx->cipher_info )
-        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+    if (NULL == ctx || NULL == ctx->cipher_info)
+        return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
 
 #if defined(MBEDTLS_GCM_C)
-    if( MBEDTLS_MODE_GCM == ctx->cipher_info->mode )
-    {
-        return mbedtls_gcm_starts( (mbedtls_gcm_context *) ctx->cipher_ctx, ctx->operation,
-                           ctx->iv, ctx->iv_size, ad, ad_len );
+    if (MBEDTLS_MODE_GCM == ctx->cipher_info->mode) {
+        return mbedtls_gcm_starts((mbedtls_gcm_context *) ctx->cipher_ctx, ctx->operation,
+                                  ctx->iv, ctx->iv_size, ad, ad_len);
     }
 #endif
 
 #if defined(MBEDTLS_CHACHAPOLY_C)
-    if (MBEDTLS_CIPHER_CHACHA20_POLY1305 == ctx->cipher_info->type )
-    {
+    if (MBEDTLS_CIPHER_CHACHA20_POLY1305 == ctx->cipher_info->type) {
         int result;
         mbedtls_chachapoly_mode_t mode;
 
-        mode = ( ctx->operation == MBEDTLS_ENCRYPT )
-                ? MBEDTLS_CHACHAPOLY_ENCRYPT
-                : MBEDTLS_CHACHAPOLY_DECRYPT;
+        mode = (ctx->operation == MBEDTLS_ENCRYPT)
+               ? MBEDTLS_CHACHAPOLY_ENCRYPT
+               : MBEDTLS_CHACHAPOLY_DECRYPT;
 
-        result = mbedtls_chachapoly_starts( (mbedtls_chachapoly_context*) ctx->cipher_ctx,
-                                                        ctx->iv,
-                                                        mode );
-        if ( result != 0 )
-            return( result );
+        result = mbedtls_chachapoly_starts((mbedtls_chachapoly_context *) ctx->cipher_ctx,
+                                           ctx->iv,
+                                           mode);
+        if (result != 0)
+            return (result);
 
-        return mbedtls_chachapoly_update_aad( (mbedtls_chachapoly_context*) ctx->cipher_ctx,
-                                                          ad, ad_len );
+        return mbedtls_chachapoly_update_aad((mbedtls_chachapoly_context *) ctx->cipher_ctx,
+                                             ad, ad_len);
     }
 #endif
 
-    return( 0 );
+    return (0);
 }
 #endif /* MBEDTLS_GCM_C || MBEDTLS_CHACHAPOLY_C */
 
-int mbedtls_cipher_update( mbedtls_cipher_context_t *ctx, const unsigned char *input,
-                   size_t ilen, unsigned char *output, size_t *olen )
+int mbedtls_cipher_update(mbedtls_cipher_context_t *ctx, const unsigned char *input,
+                          size_t ilen, unsigned char *output, size_t *olen)
 {
     int ret;
     size_t block_size = 0;
 
-    if( NULL == ctx || NULL == ctx->cipher_info || NULL == olen )
-    {
-        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+    if (NULL == ctx || NULL == ctx->cipher_info || NULL == olen) {
+        return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
     }
 
     *olen = 0;
-    block_size = mbedtls_cipher_get_block_size( ctx );
+    block_size = mbedtls_cipher_get_block_size(ctx);
 
-    if( ctx->cipher_info->mode == MBEDTLS_MODE_ECB )
-    {
-        if( ilen != block_size )
-            return( MBEDTLS_ERR_CIPHER_FULL_BLOCK_EXPECTED );
+    if (ctx->cipher_info->mode == MBEDTLS_MODE_ECB) {
+        if (ilen != block_size)
+            return (MBEDTLS_ERR_CIPHER_FULL_BLOCK_EXPECTED);
 
         *olen = ilen;
 
-        if( 0 != ( ret = ctx->cipher_info->base->ecb_func( ctx->cipher_ctx,
-                    ctx->operation, input, output ) ) )
-        {
-            return( ret );
+        if (0 != (ret = ctx->cipher_info->base->ecb_func(ctx->cipher_ctx,
+                                                         ctx->operation, input, output))) {
+            return (ret);
         }
 
-        return( 0 );
+        return (0);
     }
 
 #if defined(MBEDTLS_GCM_C)
-    if( ctx->cipher_info->mode == MBEDTLS_MODE_GCM )
-    {
+    if (ctx->cipher_info->mode == MBEDTLS_MODE_GCM) {
         *olen = ilen;
-        return mbedtls_gcm_update( (mbedtls_gcm_context *) ctx->cipher_ctx, ilen, input,
-                           output );
+        return mbedtls_gcm_update((mbedtls_gcm_context *) ctx->cipher_ctx, ilen, input,
+                                  output);
     }
 #endif
 
 #if defined(MBEDTLS_CHACHAPOLY_C)
-    if ( ctx->cipher_info->type == MBEDTLS_CIPHER_CHACHA20_POLY1305 )
-    {
+    if (ctx->cipher_info->type == MBEDTLS_CIPHER_CHACHA20_POLY1305) {
         *olen = ilen;
-        return mbedtls_chachapoly_update( (mbedtls_chachapoly_context*) ctx->cipher_ctx,
-                                                      ilen, input, output );
+        return mbedtls_chachapoly_update((mbedtls_chachapoly_context *) ctx->cipher_ctx,
+                                         ilen, input, output);
     }
 #endif
 
-    if ( 0 == block_size )
-    {
+    if (0 == block_size) {
         return MBEDTLS_ERR_CIPHER_INVALID_CONTEXT;
     }
 
-    if( input == output &&
-       ( ctx->unprocessed_len != 0 || ilen % block_size ) )
-    {
-        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+    if (input == output &&
+        (ctx->unprocessed_len != 0 || ilen % block_size)) {
+        return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
     }
 
 #if defined(MBEDTLS_CIPHER_MODE_CBC)
-    if( ctx->cipher_info->mode == MBEDTLS_MODE_CBC )
-    {
+    if (ctx->cipher_info->mode == MBEDTLS_MODE_CBC) {
         size_t copy_len = 0;
 
         /*
          * If there is not enough data for a full block, cache it.
          */
-        if( ( ctx->operation == MBEDTLS_DECRYPT && NULL != ctx->add_padding &&
-                ilen <= block_size - ctx->unprocessed_len ) ||
-            ( ctx->operation == MBEDTLS_DECRYPT && NULL == ctx->add_padding &&
-                ilen < block_size - ctx->unprocessed_len ) ||
-             ( ctx->operation == MBEDTLS_ENCRYPT &&
-                ilen < block_size - ctx->unprocessed_len ) )
-        {
-            memcpy( &( ctx->unprocessed_data[ctx->unprocessed_len] ), input,
-                    ilen );
+        if ((ctx->operation == MBEDTLS_DECRYPT && NULL != ctx->add_padding &&
+             ilen <= block_size - ctx->unprocessed_len) ||
+            (ctx->operation == MBEDTLS_DECRYPT && NULL == ctx->add_padding &&
+             ilen < block_size - ctx->unprocessed_len) ||
+            (ctx->operation == MBEDTLS_ENCRYPT &&
+             ilen < block_size - ctx->unprocessed_len)) {
+            memcpy(&(ctx->unprocessed_data[ctx->unprocessed_len]), input,
+                   ilen);
 
             ctx->unprocessed_len += ilen;
-            return( 0 );
+            return (0);
         }
 
         /*
          * Process cached data first
          */
-        if( 0 != ctx->unprocessed_len )
-        {
+        if (0 != ctx->unprocessed_len) {
             copy_len = block_size - ctx->unprocessed_len;
 
-            memcpy( &( ctx->unprocessed_data[ctx->unprocessed_len] ), input,
-                    copy_len );
+            memcpy(&(ctx->unprocessed_data[ctx->unprocessed_len]), input,
+                   copy_len);
 
-            if( 0 != ( ret = ctx->cipher_info->base->cbc_func( ctx->cipher_ctx,
-                    ctx->operation, block_size, ctx->iv,
-                    ctx->unprocessed_data, output ) ) )
-            {
-                return( ret );
+            if (0 != (ret = ctx->cipher_info->base->cbc_func(ctx->cipher_ctx,
+                                                             ctx->operation, block_size, ctx->iv,
+                                                             ctx->unprocessed_data, output))) {
+                return (ret);
             }
 
             *olen += block_size;
@@ -435,10 +415,8 @@ int mbedtls_cipher_update( mbedtls_cipher_context_t *ctx, const unsigned char *i
         /*
          * Cache final, incomplete block
          */
-        if( 0 != ilen )
-        {
-            if( 0 == block_size )
-            {
+        if (0 != ilen) {
+            if (0 == block_size) {
                 return MBEDTLS_ERR_CIPHER_INVALID_CONTEXT;
             }
 
@@ -447,15 +425,14 @@ int mbedtls_cipher_update( mbedtls_cipher_context_t *ctx, const unsigned char *i
              * Decryption w/o padding: only cache partial blocks
              */
             copy_len = ilen % block_size;
-            if( copy_len == 0 &&
+            if (copy_len == 0 &&
                 ctx->operation == MBEDTLS_DECRYPT &&
-                NULL != ctx->add_padding)
-            {
+                NULL != ctx->add_padding) {
                 copy_len = block_size;
             }
 
-            memcpy( ctx->unprocessed_data, &( input[ilen - copy_len] ),
-                    copy_len );
+            memcpy(ctx->unprocessed_data, &(input[ilen - copy_len]),
+                   copy_len);
 
             ctx->unprocessed_len += copy_len;
             ilen -= copy_len;
@@ -464,105 +441,93 @@ int mbedtls_cipher_update( mbedtls_cipher_context_t *ctx, const unsigned char *i
         /*
          * Process remaining full blocks
          */
-        if( ilen )
-        {
-            if( 0 != ( ret = ctx->cipher_info->base->cbc_func( ctx->cipher_ctx,
-                    ctx->operation, ilen, ctx->iv, input, output ) ) )
-            {
-                return( ret );
+        if (ilen) {
+            if (0 != (ret = ctx->cipher_info->base->cbc_func(ctx->cipher_ctx,
+                                                             ctx->operation, ilen, ctx->iv, input, output))) {
+                return (ret);
             }
 
             *olen += ilen;
         }
 
-        return( 0 );
+        return (0);
     }
 #endif /* MBEDTLS_CIPHER_MODE_CBC */
 
 #if defined(MBEDTLS_CIPHER_MODE_CFB)
-    if( ctx->cipher_info->mode == MBEDTLS_MODE_CFB )
-    {
-        if( 0 != ( ret = ctx->cipher_info->base->cfb_func( ctx->cipher_ctx,
-                ctx->operation, ilen, &ctx->unprocessed_len, ctx->iv,
-                input, output ) ) )
-        {
-            return( ret );
+    if (ctx->cipher_info->mode == MBEDTLS_MODE_CFB) {
+        if (0 != (ret = ctx->cipher_info->base->cfb_func(ctx->cipher_ctx,
+                                                         ctx->operation, ilen, &ctx->unprocessed_len, ctx->iv,
+                                                         input, output))) {
+            return (ret);
         }
 
         *olen = ilen;
 
-        return( 0 );
+        return (0);
     }
 #endif /* MBEDTLS_CIPHER_MODE_CFB */
 
 #if defined(MBEDTLS_CIPHER_MODE_OFB)
-    if( ctx->cipher_info->mode == MBEDTLS_MODE_OFB )
-    {
-        if( 0 != ( ret = ctx->cipher_info->base->ofb_func( ctx->cipher_ctx,
-                ilen, &ctx->unprocessed_len, ctx->iv, input, output ) ) )
-        {
-            return( ret );
+    if (ctx->cipher_info->mode == MBEDTLS_MODE_OFB) {
+        if (0 != (ret = ctx->cipher_info->base->ofb_func(ctx->cipher_ctx,
+                                                         ilen, &ctx->unprocessed_len, ctx->iv, input, output))) {
+            return (ret);
         }
 
         *olen = ilen;
 
-        return( 0 );
+        return (0);
     }
 #endif /* MBEDTLS_CIPHER_MODE_OFB */
 
 #if defined(MBEDTLS_CIPHER_MODE_CTR)
-    if( ctx->cipher_info->mode == MBEDTLS_MODE_CTR )
-    {
-        if( 0 != ( ret = ctx->cipher_info->base->ctr_func( ctx->cipher_ctx,
-                ilen, &ctx->unprocessed_len, ctx->iv,
-                ctx->unprocessed_data, input, output ) ) )
-        {
-            return( ret );
+    if (ctx->cipher_info->mode == MBEDTLS_MODE_CTR) {
+        if (0 != (ret = ctx->cipher_info->base->ctr_func(ctx->cipher_ctx,
+                                                         ilen, &ctx->unprocessed_len, ctx->iv,
+                                                         ctx->unprocessed_data, input, output))) {
+            return (ret);
         }
 
         *olen = ilen;
 
-        return( 0 );
+        return (0);
     }
 #endif /* MBEDTLS_CIPHER_MODE_CTR */
 
 #if defined(MBEDTLS_CIPHER_MODE_XTS)
-    if( ctx->cipher_info->mode == MBEDTLS_MODE_XTS )
-    {
-        if( ctx->unprocessed_len > 0 ) {
+    if (ctx->cipher_info->mode == MBEDTLS_MODE_XTS) {
+        if (ctx->unprocessed_len > 0) {
             /* We can only process an entire data unit at a time. */
-            return( MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE );
+            return (MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE);
         }
 
-        ret = ctx->cipher_info->base->xts_func( ctx->cipher_ctx,
-                ctx->operation, ilen, ctx->iv, input, output );
-        if( ret != 0 )
-        {
-            return( ret );
+        ret = ctx->cipher_info->base->xts_func(ctx->cipher_ctx,
+                                               ctx->operation, ilen, ctx->iv, input, output);
+        if (ret != 0) {
+            return (ret);
         }
 
         *olen = ilen;
 
-        return( 0 );
+        return (0);
     }
 #endif /* MBEDTLS_CIPHER_MODE_XTS */
 
 #if defined(MBEDTLS_CIPHER_MODE_STREAM)
-    if( ctx->cipher_info->mode == MBEDTLS_MODE_STREAM )
-    {
-        if( 0 != ( ret = ctx->cipher_info->base->stream_func( ctx->cipher_ctx,
-                                                    ilen, input, output ) ) )
-        {
-            return( ret );
+    if (ctx->cipher_info->mode == MBEDTLS_MODE_STREAM) {
+        if (0 != (ret = ctx->cipher_info->base->stream_func(ctx->cipher_ctx,
+                                                            ilen, input, output))) {
+            return (ret);
         }
 
         *olen = ilen;
 
-        return( 0 );
+        return (0);
     }
 #endif /* MBEDTLS_CIPHER_MODE_STREAM */
 
-    return( MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE );
+    return (MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE);
 }
 
 #if defined(MBEDTLS_CIPHER_MODE_WITH_PADDING)
@@ -570,24 +535,24 @@ int mbedtls_cipher_update( mbedtls_cipher_context_t *ctx, const unsigned char *i
 /*
  * PKCS7 (and PKCS5) padding: fill with ll bytes, with ll = padding_len
  */
-static void add_pkcs_padding( unsigned char *output, size_t output_len,
-        size_t data_len )
+static void add_pkcs_padding(unsigned char *output, size_t output_len,
+                             size_t data_len)
 {
     size_t padding_len = output_len - data_len;
     unsigned char i;
 
-    for( i = 0; i < padding_len; i++ )
+    for (i = 0; i < padding_len; i++)
         output[data_len + i] = (unsigned char) padding_len;
 }
 
-static int get_pkcs_padding( unsigned char *input, size_t input_len,
-        size_t *data_len )
+static int get_pkcs_padding(unsigned char *input, size_t input_len,
+                            size_t *data_len)
 {
     size_t i, pad_idx;
     unsigned char padding_len, bad = 0;
 
-    if( NULL == input || NULL == data_len )
-        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+    if (NULL == input || NULL == data_len)
+        return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
 
     padding_len = input[input_len - 1];
     *data_len = input_len - padding_len;
@@ -599,10 +564,10 @@ static int get_pkcs_padding( unsigned char *input, size_t input_len,
     /* The number of bytes checked must be independent of padding_len,
      * so pick input_len, which is usually 8 or 16 (one block) */
     pad_idx = input_len - padding_len;
-    for( i = 0; i < input_len; i++ )
-        bad |= ( input[i] ^ padding_len ) * ( i >= pad_idx );
+    for (i = 0; i < input_len; i++)
+        bad |= (input[i] ^ padding_len) * (i >= pad_idx);
 
-    return( MBEDTLS_ERR_CIPHER_INVALID_PADDING * ( bad != 0 ) );
+    return (MBEDTLS_ERR_CIPHER_INVALID_PADDING * (bad != 0));
 }
 #endif /* MBEDTLS_CIPHER_PADDING_PKCS7 */
 
@@ -610,37 +575,36 @@ static int get_pkcs_padding( unsigned char *input, size_t input_len,
 /*
  * One and zeros padding: fill with 80 00 ... 00
  */
-static void add_one_and_zeros_padding( unsigned char *output,
-                                       size_t output_len, size_t data_len )
+static void add_one_and_zeros_padding(unsigned char *output,
+                                      size_t output_len, size_t data_len)
 {
     size_t padding_len = output_len - data_len;
     unsigned char i = 0;
 
     output[data_len] = 0x80;
-    for( i = 1; i < padding_len; i++ )
+    for (i = 1; i < padding_len; i++)
         output[data_len + i] = 0x00;
 }
 
-static int get_one_and_zeros_padding( unsigned char *input, size_t input_len,
-                                      size_t *data_len )
+static int get_one_and_zeros_padding(unsigned char *input, size_t input_len,
+                                     size_t *data_len)
 {
     size_t i;
     unsigned char done = 0, prev_done, bad;
 
-    if( NULL == input || NULL == data_len )
-        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+    if (NULL == input || NULL == data_len)
+        return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
 
     bad = 0x80;
     *data_len = 0;
-    for( i = input_len; i > 0; i-- )
-    {
+    for (i = input_len; i > 0; i--) {
         prev_done = done;
-        done |= ( input[i - 1] != 0 );
-        *data_len |= ( i - 1 ) * ( done != prev_done );
-        bad ^= input[i - 1] * ( done != prev_done );
+        done |= (input[i - 1] != 0);
+        *data_len |= (i - 1) * (done != prev_done);
+        bad ^= input[i - 1] * (done != prev_done);
     }
 
-    return( MBEDTLS_ERR_CIPHER_INVALID_PADDING * ( bad != 0 ) );
+    return (MBEDTLS_ERR_CIPHER_INVALID_PADDING * (bad != 0));
 
 }
 #endif /* MBEDTLS_CIPHER_PADDING_ONE_AND_ZEROS */
@@ -649,25 +613,25 @@ static int get_one_and_zeros_padding( unsigned char *input, size_t input_len,
 /*
  * Zeros and len padding: fill with 00 ... 00 ll, where ll is padding length
  */
-static void add_zeros_and_len_padding( unsigned char *output,
-                                       size_t output_len, size_t data_len )
+static void add_zeros_and_len_padding(unsigned char *output,
+                                      size_t output_len, size_t data_len)
 {
     size_t padding_len = output_len - data_len;
     unsigned char i = 0;
 
-    for( i = 1; i < padding_len; i++ )
+    for (i = 1; i < padding_len; i++)
         output[data_len + i - 1] = 0x00;
     output[output_len - 1] = (unsigned char) padding_len;
 }
 
-static int get_zeros_and_len_padding( unsigned char *input, size_t input_len,
-                                      size_t *data_len )
+static int get_zeros_and_len_padding(unsigned char *input, size_t input_len,
+                                     size_t *data_len)
 {
     size_t i, pad_idx;
     unsigned char padding_len, bad = 0;
 
-    if( NULL == input || NULL == data_len )
-        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+    if (NULL == input || NULL == data_len)
+        return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
 
     padding_len = input[input_len - 1];
     *data_len = input_len - padding_len;
@@ -678,10 +642,10 @@ static int get_zeros_and_len_padding( unsigned char *input, size_t input_len,
 
     /* The number of bytes checked must be independent of padding_len */
     pad_idx = input_len - padding_len;
-    for( i = 0; i < input_len - 1; i++ )
-        bad |= input[i] * ( i >= pad_idx );
+    for (i = 0; i < input_len - 1; i++)
+        bad |= input[i] * (i >= pad_idx);
 
-    return( MBEDTLS_ERR_CIPHER_INVALID_PADDING * ( bad != 0 ) );
+    return (MBEDTLS_ERR_CIPHER_INVALID_PADDING * (bad != 0));
 }
 #endif /* MBEDTLS_CIPHER_PADDING_ZEROS_AND_LEN */
 
@@ -689,33 +653,32 @@ static int get_zeros_and_len_padding( unsigned char *input, size_t input_len,
 /*
  * Zero padding: fill with 00 ... 00
  */
-static void add_zeros_padding( unsigned char *output,
-                               size_t output_len, size_t data_len )
+static void add_zeros_padding(unsigned char *output,
+                              size_t output_len, size_t data_len)
 {
     size_t i;
 
-    for( i = data_len; i < output_len; i++ )
+    for (i = data_len; i < output_len; i++)
         output[i] = 0x00;
 }
 
-static int get_zeros_padding( unsigned char *input, size_t input_len,
-                              size_t *data_len )
+static int get_zeros_padding(unsigned char *input, size_t input_len,
+                             size_t *data_len)
 {
     size_t i;
     unsigned char done = 0, prev_done;
 
-    if( NULL == input || NULL == data_len )
-        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+    if (NULL == input || NULL == data_len)
+        return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
 
     *data_len = 0;
-    for( i = input_len; i > 0; i-- )
-    {
+    for (i = input_len; i > 0; i--) {
         prev_done = done;
-        done |= ( input[i-1] != 0 );
-        *data_len |= i * ( done != prev_done );
+        done |= (input[i - 1] != 0);
+        *data_len |= i * (done != prev_done);
     }
 
-    return( 0 );
+    return (0);
 }
 #endif /* MBEDTLS_CIPHER_PADDING_ZEROS */
 
@@ -725,383 +688,358 @@ static int get_zeros_padding( unsigned char *input, size_t input_len,
  * There is no add_padding function (check for NULL in mbedtls_cipher_finish)
  * but a trivial get_padding function
  */
-static int get_no_padding( unsigned char *input, size_t input_len,
-                              size_t *data_len )
+static int get_no_padding(unsigned char *input, size_t input_len,
+                          size_t *data_len)
 {
-    if( NULL == input || NULL == data_len )
-        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+    if (NULL == input || NULL == data_len)
+        return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
 
     *data_len = input_len;
 
-    return( 0 );
+    return (0);
 }
 #endif /* MBEDTLS_CIPHER_MODE_WITH_PADDING */
 
-int mbedtls_cipher_finish( mbedtls_cipher_context_t *ctx,
-                   unsigned char *output, size_t *olen )
+int mbedtls_cipher_finish(mbedtls_cipher_context_t *ctx,
+                          unsigned char *output, size_t *olen)
 {
-    if( NULL == ctx || NULL == ctx->cipher_info || NULL == olen )
-        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+    if (NULL == ctx || NULL == ctx->cipher_info || NULL == olen)
+        return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
 
     *olen = 0;
 
-    if( MBEDTLS_MODE_CFB == ctx->cipher_info->mode ||
+    if (MBEDTLS_MODE_CFB == ctx->cipher_info->mode ||
         MBEDTLS_MODE_OFB == ctx->cipher_info->mode ||
         MBEDTLS_MODE_CTR == ctx->cipher_info->mode ||
         MBEDTLS_MODE_GCM == ctx->cipher_info->mode ||
         MBEDTLS_MODE_XTS == ctx->cipher_info->mode ||
-        MBEDTLS_MODE_STREAM == ctx->cipher_info->mode )
-    {
-        return( 0 );
+        MBEDTLS_MODE_STREAM == ctx->cipher_info->mode) {
+        return (0);
     }
 
-    if ( ( MBEDTLS_CIPHER_CHACHA20          == ctx->cipher_info->type ) ||
-         ( MBEDTLS_CIPHER_CHACHA20_POLY1305 == ctx->cipher_info->type ) )
-    {
-        return( 0 );
+    if ((MBEDTLS_CIPHER_CHACHA20          == ctx->cipher_info->type) ||
+        (MBEDTLS_CIPHER_CHACHA20_POLY1305 == ctx->cipher_info->type)) {
+        return (0);
     }
 
-    if( MBEDTLS_MODE_ECB == ctx->cipher_info->mode )
-    {
-        if( ctx->unprocessed_len != 0 )
-            return( MBEDTLS_ERR_CIPHER_FULL_BLOCK_EXPECTED );
+    if (MBEDTLS_MODE_ECB == ctx->cipher_info->mode) {
+        if (ctx->unprocessed_len != 0)
+            return (MBEDTLS_ERR_CIPHER_FULL_BLOCK_EXPECTED);
 
-        return( 0 );
+        return (0);
     }
 
 #if defined(MBEDTLS_CIPHER_MODE_CBC)
-    if( MBEDTLS_MODE_CBC == ctx->cipher_info->mode )
-    {
+    if (MBEDTLS_MODE_CBC == ctx->cipher_info->mode) {
         int ret = 0;
 
-        if( MBEDTLS_ENCRYPT == ctx->operation )
-        {
+        if (MBEDTLS_ENCRYPT == ctx->operation) {
             /* check for 'no padding' mode */
-            if( NULL == ctx->add_padding )
-            {
-                if( 0 != ctx->unprocessed_len )
-                    return( MBEDTLS_ERR_CIPHER_FULL_BLOCK_EXPECTED );
+            if (NULL == ctx->add_padding) {
+                if (0 != ctx->unprocessed_len)
+                    return (MBEDTLS_ERR_CIPHER_FULL_BLOCK_EXPECTED);
 
-                return( 0 );
+                return (0);
             }
 
-            ctx->add_padding( ctx->unprocessed_data, mbedtls_cipher_get_iv_size( ctx ),
-                    ctx->unprocessed_len );
-        }
-        else if( mbedtls_cipher_get_block_size( ctx ) != ctx->unprocessed_len )
-        {
+            ctx->add_padding(ctx->unprocessed_data, mbedtls_cipher_get_iv_size(ctx),
+                             ctx->unprocessed_len);
+        } else if (mbedtls_cipher_get_block_size(ctx) != ctx->unprocessed_len) {
             /*
              * For decrypt operations, expect a full block,
              * or an empty block if no padding
              */
-            if( NULL == ctx->add_padding && 0 == ctx->unprocessed_len )
-                return( 0 );
+            if (NULL == ctx->add_padding && 0 == ctx->unprocessed_len)
+                return (0);
 
-            return( MBEDTLS_ERR_CIPHER_FULL_BLOCK_EXPECTED );
+            return (MBEDTLS_ERR_CIPHER_FULL_BLOCK_EXPECTED);
         }
 
         /* cipher block */
-        if( 0 != ( ret = ctx->cipher_info->base->cbc_func( ctx->cipher_ctx,
-                ctx->operation, mbedtls_cipher_get_block_size( ctx ), ctx->iv,
-                ctx->unprocessed_data, output ) ) )
-        {
-            return( ret );
+        if (0 != (ret = ctx->cipher_info->base->cbc_func(ctx->cipher_ctx,
+                                                         ctx->operation, mbedtls_cipher_get_block_size(ctx), ctx->iv,
+                                                         ctx->unprocessed_data, output))) {
+            return (ret);
         }
 
         /* Set output size for decryption */
-        if( MBEDTLS_DECRYPT == ctx->operation )
-            return ctx->get_padding( output, mbedtls_cipher_get_block_size( ctx ),
-                                     olen );
+        if (MBEDTLS_DECRYPT == ctx->operation)
+            return ctx->get_padding(output, mbedtls_cipher_get_block_size(ctx),
+                                    olen);
 
         /* Set output size for encryption */
-        *olen = mbedtls_cipher_get_block_size( ctx );
-        return( 0 );
+        *olen = mbedtls_cipher_get_block_size(ctx);
+        return (0);
     }
 #else
     ((void) output);
 #endif /* MBEDTLS_CIPHER_MODE_CBC */
 
-    return( MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE );
+    return (MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE);
 }
 
 #if defined(MBEDTLS_CIPHER_MODE_WITH_PADDING)
-int mbedtls_cipher_set_padding_mode( mbedtls_cipher_context_t *ctx, mbedtls_cipher_padding_t mode )
+int mbedtls_cipher_set_padding_mode(mbedtls_cipher_context_t *ctx, mbedtls_cipher_padding_t mode)
 {
-    if( NULL == ctx ||
-        MBEDTLS_MODE_CBC != ctx->cipher_info->mode )
-    {
-        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+    if (NULL == ctx ||
+        MBEDTLS_MODE_CBC != ctx->cipher_info->mode) {
+        return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
     }
 
-    switch( mode )
-    {
+    switch (mode) {
 #if defined(MBEDTLS_CIPHER_PADDING_PKCS7)
-    case MBEDTLS_PADDING_PKCS7:
-        ctx->add_padding = add_pkcs_padding;
-        ctx->get_padding = get_pkcs_padding;
-        break;
+        case MBEDTLS_PADDING_PKCS7:
+            ctx->add_padding = add_pkcs_padding;
+            ctx->get_padding = get_pkcs_padding;
+            break;
 #endif
 #if defined(MBEDTLS_CIPHER_PADDING_ONE_AND_ZEROS)
-    case MBEDTLS_PADDING_ONE_AND_ZEROS:
-        ctx->add_padding = add_one_and_zeros_padding;
-        ctx->get_padding = get_one_and_zeros_padding;
-        break;
+        case MBEDTLS_PADDING_ONE_AND_ZEROS:
+            ctx->add_padding = add_one_and_zeros_padding;
+            ctx->get_padding = get_one_and_zeros_padding;
+            break;
 #endif
 #if defined(MBEDTLS_CIPHER_PADDING_ZEROS_AND_LEN)
-    case MBEDTLS_PADDING_ZEROS_AND_LEN:
-        ctx->add_padding = add_zeros_and_len_padding;
-        ctx->get_padding = get_zeros_and_len_padding;
-        break;
+        case MBEDTLS_PADDING_ZEROS_AND_LEN:
+            ctx->add_padding = add_zeros_and_len_padding;
+            ctx->get_padding = get_zeros_and_len_padding;
+            break;
 #endif
 #if defined(MBEDTLS_CIPHER_PADDING_ZEROS)
-    case MBEDTLS_PADDING_ZEROS:
-        ctx->add_padding = add_zeros_padding;
-        ctx->get_padding = get_zeros_padding;
-        break;
+        case MBEDTLS_PADDING_ZEROS:
+            ctx->add_padding = add_zeros_padding;
+            ctx->get_padding = get_zeros_padding;
+            break;
 #endif
-    case MBEDTLS_PADDING_NONE:
-        ctx->add_padding = NULL;
-        ctx->get_padding = get_no_padding;
-        break;
+        case MBEDTLS_PADDING_NONE:
+            ctx->add_padding = NULL;
+            ctx->get_padding = get_no_padding;
+            break;
 
-    default:
-        return( MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE );
+        default:
+            return (MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE);
     }
 
-    return( 0 );
+    return (0);
 }
 #endif /* MBEDTLS_CIPHER_MODE_WITH_PADDING */
 
 #if defined(MBEDTLS_GCM_C) || defined(MBEDTLS_CHACHAPOLY_C)
-int mbedtls_cipher_write_tag( mbedtls_cipher_context_t *ctx,
-                      unsigned char *tag, size_t tag_len )
+int mbedtls_cipher_write_tag(mbedtls_cipher_context_t *ctx,
+                             unsigned char *tag, size_t tag_len)
 {
-    if( NULL == ctx || NULL == ctx->cipher_info || NULL == tag )
-        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+    if (NULL == ctx || NULL == ctx->cipher_info || NULL == tag)
+        return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
 
-    if( MBEDTLS_ENCRYPT != ctx->operation )
-        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+    if (MBEDTLS_ENCRYPT != ctx->operation)
+        return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
 
 #if defined(MBEDTLS_GCM_C)
-    if( MBEDTLS_MODE_GCM == ctx->cipher_info->mode )
-        return mbedtls_gcm_finish( (mbedtls_gcm_context *) ctx->cipher_ctx, tag, tag_len );
+    if (MBEDTLS_MODE_GCM == ctx->cipher_info->mode)
+        return mbedtls_gcm_finish((mbedtls_gcm_context *) ctx->cipher_ctx, tag, tag_len);
 #endif
 
 #if defined(MBEDTLS_CHACHAPOLY_C)
-    if ( MBEDTLS_CIPHER_CHACHA20_POLY1305 == ctx->cipher_info->type )
-    {
+    if (MBEDTLS_CIPHER_CHACHA20_POLY1305 == ctx->cipher_info->type) {
         /* Don't allow truncated MAC for Poly1305 */
-        if ( tag_len != 16U )
-            return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+        if (tag_len != 16U)
+            return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
 
-        return mbedtls_chachapoly_finish( (mbedtls_chachapoly_context*) ctx->cipher_ctx,
-                                                      tag );
+        return mbedtls_chachapoly_finish((mbedtls_chachapoly_context *) ctx->cipher_ctx,
+                                         tag);
     }
 #endif
 
-    return( 0 );
+    return (0);
 }
 
-int mbedtls_cipher_check_tag( mbedtls_cipher_context_t *ctx,
-                      const unsigned char *tag, size_t tag_len )
+int mbedtls_cipher_check_tag(mbedtls_cipher_context_t *ctx,
+                             const unsigned char *tag, size_t tag_len)
 {
     unsigned char check_tag[16];
     int ret;
 
-    if( NULL == ctx || NULL == ctx->cipher_info ||
-        MBEDTLS_DECRYPT != ctx->operation )
-    {
-        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+    if (NULL == ctx || NULL == ctx->cipher_info ||
+        MBEDTLS_DECRYPT != ctx->operation) {
+        return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
     }
 
 #if defined(MBEDTLS_GCM_C)
-    if( MBEDTLS_MODE_GCM == ctx->cipher_info->mode )
-    {
-        if( tag_len > sizeof( check_tag ) )
-            return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+    if (MBEDTLS_MODE_GCM == ctx->cipher_info->mode) {
+        if (tag_len > sizeof(check_tag))
+            return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
 
-        if( 0 != ( ret = mbedtls_gcm_finish( (mbedtls_gcm_context *) ctx->cipher_ctx,
-                                     check_tag, tag_len ) ) )
-        {
-            return( ret );
+        if (0 != (ret = mbedtls_gcm_finish((mbedtls_gcm_context *) ctx->cipher_ctx,
+                                           check_tag, tag_len))) {
+            return (ret);
         }
 
         /* Check the tag in "constant-time" */
-        if( mbedtls_constant_time_memcmp( tag, check_tag, tag_len ) != 0 )
-            return( MBEDTLS_ERR_CIPHER_AUTH_FAILED );
+        if (mbedtls_constant_time_memcmp(tag, check_tag, tag_len) != 0)
+            return (MBEDTLS_ERR_CIPHER_AUTH_FAILED);
 
-        return( 0 );
+        return (0);
     }
 #endif /* MBEDTLS_GCM_C */
 
 #if defined(MBEDTLS_CHACHAPOLY_C)
-    if ( MBEDTLS_CIPHER_CHACHA20_POLY1305 == ctx->cipher_info->type )
-    {
+    if (MBEDTLS_CIPHER_CHACHA20_POLY1305 == ctx->cipher_info->type) {
         /* Don't allow truncated MAC for Poly1305 */
-        if ( tag_len != sizeof( check_tag ) )
-            return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+        if (tag_len != sizeof(check_tag))
+            return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
 
-        ret = mbedtls_chachapoly_finish( (mbedtls_chachapoly_context*) ctx->cipher_ctx,
-                                                     check_tag );
-        if ( ret != 0 )
-        {
-            return( ret );
+        ret = mbedtls_chachapoly_finish((mbedtls_chachapoly_context *) ctx->cipher_ctx,
+                                        check_tag);
+        if (ret != 0) {
+            return (ret);
         }
 
         /* Check the tag in "constant-time" */
-        if( mbedtls_constant_time_memcmp( tag, check_tag, tag_len ) != 0 )
-            return( MBEDTLS_ERR_CIPHER_AUTH_FAILED );
+        if (mbedtls_constant_time_memcmp(tag, check_tag, tag_len) != 0)
+            return (MBEDTLS_ERR_CIPHER_AUTH_FAILED);
 
-        return( 0 );
+        return (0);
     }
 #endif /* MBEDTLS_CHACHAPOLY_C */
 
-    return( 0 );
+    return (0);
 }
 #endif /* MBEDTLS_GCM_C || MBEDTLS_CHACHAPOLY_C */
 
 /*
  * Packet-oriented wrapper for non-AEAD modes
  */
-int mbedtls_cipher_crypt( mbedtls_cipher_context_t *ctx,
-                  const unsigned char *iv, size_t iv_len,
-                  const unsigned char *input, size_t ilen,
-                  unsigned char *output, size_t *olen )
+int mbedtls_cipher_crypt(mbedtls_cipher_context_t *ctx,
+                         const unsigned char *iv, size_t iv_len,
+                         const unsigned char *input, size_t ilen,
+                         unsigned char *output, size_t *olen)
 {
     int ret;
     size_t finish_olen;
 
-    if( ( ret = mbedtls_cipher_set_iv( ctx, iv, iv_len ) ) != 0 )
-        return( ret );
+    if ((ret = mbedtls_cipher_set_iv(ctx, iv, iv_len)) != 0)
+        return (ret);
 
-    if( ( ret = mbedtls_cipher_reset( ctx ) ) != 0 )
-        return( ret );
+    if ((ret = mbedtls_cipher_reset(ctx)) != 0)
+        return (ret);
 
-    if( ( ret = mbedtls_cipher_update( ctx, input, ilen, output, olen ) ) != 0 )
-        return( ret );
+    if ((ret = mbedtls_cipher_update(ctx, input, ilen, output, olen)) != 0)
+        return (ret);
 
-    if( ( ret = mbedtls_cipher_finish( ctx, output + *olen, &finish_olen ) ) != 0 )
-        return( ret );
+    if ((ret = mbedtls_cipher_finish(ctx, output + *olen, &finish_olen)) != 0)
+        return (ret);
 
     *olen += finish_olen;
 
-    return( 0 );
+    return (0);
 }
 
 #if defined(MBEDTLS_CIPHER_MODE_AEAD)
 /*
  * Packet-oriented encryption for AEAD modes
  */
-int mbedtls_cipher_auth_encrypt( mbedtls_cipher_context_t *ctx,
-                         const unsigned char *iv, size_t iv_len,
-                         const unsigned char *ad, size_t ad_len,
-                         const unsigned char *input, size_t ilen,
-                         unsigned char *output, size_t *olen,
-                         unsigned char *tag, size_t tag_len )
+int mbedtls_cipher_auth_encrypt(mbedtls_cipher_context_t *ctx,
+                                const unsigned char *iv, size_t iv_len,
+                                const unsigned char *ad, size_t ad_len,
+                                const unsigned char *input, size_t ilen,
+                                unsigned char *output, size_t *olen,
+                                unsigned char *tag, size_t tag_len)
 {
 #if defined(MBEDTLS_GCM_C)
-    if( MBEDTLS_MODE_GCM == ctx->cipher_info->mode )
-    {
+    if (MBEDTLS_MODE_GCM == ctx->cipher_info->mode) {
         *olen = ilen;
-        return( mbedtls_gcm_crypt_and_tag( ctx->cipher_ctx, MBEDTLS_GCM_ENCRYPT, ilen,
-                                   iv, iv_len, ad, ad_len, input, output,
-                                   tag_len, tag ) );
+        return (mbedtls_gcm_crypt_and_tag(ctx->cipher_ctx, MBEDTLS_GCM_ENCRYPT, ilen,
+                                          iv, iv_len, ad, ad_len, input, output,
+                                          tag_len, tag));
     }
 #endif /* MBEDTLS_GCM_C */
 #if defined(MBEDTLS_CCM_C)
-    if( MBEDTLS_MODE_CCM == ctx->cipher_info->mode )
-    {
+    if (MBEDTLS_MODE_CCM == ctx->cipher_info->mode) {
         *olen = ilen;
-        return( mbedtls_ccm_encrypt_and_tag( ctx->cipher_ctx, ilen,
-                                     iv, iv_len, ad, ad_len, input, output,
-                                     tag, tag_len ) );
+        return (mbedtls_ccm_encrypt_and_tag(ctx->cipher_ctx, ilen,
+                                            iv, iv_len, ad, ad_len, input, output,
+                                            tag, tag_len));
     }
 #endif /* MBEDTLS_CCM_C */
 #if defined(MBEDTLS_CHACHAPOLY_C)
-    if ( MBEDTLS_CIPHER_CHACHA20_POLY1305 == ctx->cipher_info->type )
-    {
+    if (MBEDTLS_CIPHER_CHACHA20_POLY1305 == ctx->cipher_info->type) {
         /* ChachaPoly has fixed length nonce and MAC (tag) */
-        if ( ( iv_len != ctx->cipher_info->iv_size ) ||
-             ( tag_len != 16U ) )
-        {
-            return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+        if ((iv_len != ctx->cipher_info->iv_size) ||
+            (tag_len != 16U)) {
+            return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
         }
 
         *olen = ilen;
-        return( mbedtls_chachapoly_encrypt_and_tag( ctx->cipher_ctx,
-                                ilen, iv, ad, ad_len, input, output, tag ) );
+        return (mbedtls_chachapoly_encrypt_and_tag(ctx->cipher_ctx,
+                                                   ilen, iv, ad, ad_len, input, output, tag));
     }
 #endif /* MBEDTLS_CHACHAPOLY_C */
 
-    return( MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE );
+    return (MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE);
 }
 
 /*
  * Packet-oriented decryption for AEAD modes
  */
-int mbedtls_cipher_auth_decrypt( mbedtls_cipher_context_t *ctx,
-                         const unsigned char *iv, size_t iv_len,
-                         const unsigned char *ad, size_t ad_len,
-                         const unsigned char *input, size_t ilen,
-                         unsigned char *output, size_t *olen,
-                         const unsigned char *tag, size_t tag_len )
+int mbedtls_cipher_auth_decrypt(mbedtls_cipher_context_t *ctx,
+                                const unsigned char *iv, size_t iv_len,
+                                const unsigned char *ad, size_t ad_len,
+                                const unsigned char *input, size_t ilen,
+                                unsigned char *output, size_t *olen,
+                                const unsigned char *tag, size_t tag_len)
 {
 #if defined(MBEDTLS_GCM_C)
-    if( MBEDTLS_MODE_GCM == ctx->cipher_info->mode )
-    {
+    if (MBEDTLS_MODE_GCM == ctx->cipher_info->mode) {
         int ret;
 
         *olen = ilen;
-        ret = mbedtls_gcm_auth_decrypt( ctx->cipher_ctx, ilen,
-                                iv, iv_len, ad, ad_len,
-                                tag, tag_len, input, output );
+        ret = mbedtls_gcm_auth_decrypt(ctx->cipher_ctx, ilen,
+                                       iv, iv_len, ad, ad_len,
+                                       tag, tag_len, input, output);
 
-        if( ret == MBEDTLS_ERR_GCM_AUTH_FAILED )
+        if (ret == MBEDTLS_ERR_GCM_AUTH_FAILED)
             ret = MBEDTLS_ERR_CIPHER_AUTH_FAILED;
 
-        return( ret );
+        return (ret);
     }
 #endif /* MBEDTLS_GCM_C */
 #if defined(MBEDTLS_CCM_C)
-    if( MBEDTLS_MODE_CCM == ctx->cipher_info->mode )
-    {
+    if (MBEDTLS_MODE_CCM == ctx->cipher_info->mode) {
         int ret;
 
         *olen = ilen;
-        ret = mbedtls_ccm_auth_decrypt( ctx->cipher_ctx, ilen,
-                                iv, iv_len, ad, ad_len,
-                                input, output, tag, tag_len );
+        ret = mbedtls_ccm_auth_decrypt(ctx->cipher_ctx, ilen,
+                                       iv, iv_len, ad, ad_len,
+                                       input, output, tag, tag_len);
 
-        if( ret == MBEDTLS_ERR_CCM_AUTH_FAILED )
+        if (ret == MBEDTLS_ERR_CCM_AUTH_FAILED)
             ret = MBEDTLS_ERR_CIPHER_AUTH_FAILED;
 
-        return( ret );
+        return (ret);
     }
 #endif /* MBEDTLS_CCM_C */
 #if defined(MBEDTLS_CHACHAPOLY_C)
-    if ( MBEDTLS_CIPHER_CHACHA20_POLY1305 == ctx->cipher_info->type )
-    {
+    if (MBEDTLS_CIPHER_CHACHA20_POLY1305 == ctx->cipher_info->type) {
         int ret;
 
         /* ChachaPoly has fixed length nonce and MAC (tag) */
-        if ( ( iv_len != ctx->cipher_info->iv_size ) ||
-             ( tag_len != 16U ) )
-        {
-            return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+        if ((iv_len != ctx->cipher_info->iv_size) ||
+            (tag_len != 16U)) {
+            return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
         }
 
         *olen = ilen;
-        ret = mbedtls_chachapoly_auth_decrypt( ctx->cipher_ctx, ilen,
-                                iv, ad, ad_len, tag, input, output );
+        ret = mbedtls_chachapoly_auth_decrypt(ctx->cipher_ctx, ilen,
+                                              iv, ad, ad_len, tag, input, output);
 
-        if( ret == MBEDTLS_ERR_CHACHAPOLY_AUTH_FAILED )
+        if (ret == MBEDTLS_ERR_CHACHAPOLY_AUTH_FAILED)
             ret = MBEDTLS_ERR_CIPHER_AUTH_FAILED;
 
-        return( ret );
+        return (ret);
     }
 #endif /* MBEDTLS_CHACHAPOLY_C */
 
-    return( MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE );
+    return (MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE);
 }
 #endif /* MBEDTLS_CIPHER_MODE_AEAD */
 
diff --git a/common/mbedtls/cipher.h b/common/mbedtls/cipher.h
index 9e3832dde..18b5d7140 100644
--- a/common/mbedtls/cipher.h
+++ b/common/mbedtls/cipher.h
@@ -238,8 +238,7 @@ typedef struct mbedtls_cmac_context_t mbedtls_cmac_context_t;
  * Cipher information. Allows calling cipher functions
  * in a generic way.
  */
-typedef struct mbedtls_cipher_info_t
-{
+typedef struct mbedtls_cipher_info_t {
     /** Full cipher identifier. For example,
      * MBEDTLS_CIPHER_AES_256_CBC.
      */
@@ -255,7 +254,7 @@ typedef struct mbedtls_cipher_info_t
     unsigned int key_bitlen;
 
     /** Name of the cipher. */
-    const char * name;
+    const char *name;
 
     /** IV or nonce size, in Bytes.
      * For ciphers that accept variable IV sizes,
@@ -280,8 +279,7 @@ typedef struct mbedtls_cipher_info_t
 /**
  * Generic cipher context.
  */
-typedef struct mbedtls_cipher_context_t
-{
+typedef struct mbedtls_cipher_context_t {
     /** Information about the associated cipher. */
     const mbedtls_cipher_info_t *cipher_info;
 
@@ -297,8 +295,8 @@ typedef struct mbedtls_cipher_context_t
     /** Padding functions to use, if relevant for
      * the specific cipher mode.
      */
-    void (*add_padding)( unsigned char *output, size_t olen, size_t data_len );
-    int (*get_padding)( unsigned char *input, size_t ilen, size_t *data_len );
+    void (*add_padding)(unsigned char *output, size_t olen, size_t data_len);
+    int (*get_padding)(unsigned char *input, size_t ilen, size_t *data_len);
 #endif
 
     /** Buffer for input that has not been processed yet. */
@@ -330,7 +328,7 @@ typedef struct mbedtls_cipher_context_t
  * \return      A statically-allocated array of ciphers. The last entry
  *              is zero.
  */
-const int *mbedtls_cipher_list( void );
+const int *mbedtls_cipher_list(void);
 
 /**
  * \brief               This function retrieves the cipher-information
@@ -342,7 +340,7 @@ const int *mbedtls_cipher_list( void );
  *                      given \p cipher_name.
  * \return              NULL if the associated cipher information is not found.
  */
-const mbedtls_cipher_info_t *mbedtls_cipher_info_from_string( const char *cipher_name );
+const mbedtls_cipher_info_t *mbedtls_cipher_info_from_string(const char *cipher_name);
 
 /**
  * \brief               This function retrieves the cipher-information
@@ -354,7 +352,7 @@ const mbedtls_cipher_info_t *mbedtls_cipher_info_from_string( const char *cipher
  *                      given \p cipher_type.
  * \return              NULL if the associated cipher information is not found.
  */
-const mbedtls_cipher_info_t *mbedtls_cipher_info_from_type( const mbedtls_cipher_type_t cipher_type );
+const mbedtls_cipher_info_t *mbedtls_cipher_info_from_type(const mbedtls_cipher_type_t cipher_type);
 
 /**
  * \brief               This function retrieves the cipher-information
@@ -370,21 +368,21 @@ const mbedtls_cipher_info_t *mbedtls_cipher_info_from_type( const mbedtls_cipher
  *                      given \p cipher_id.
  * \return              NULL if the associated cipher information is not found.
  */
-const mbedtls_cipher_info_t *mbedtls_cipher_info_from_values( const mbedtls_cipher_id_t cipher_id,
-                                              int key_bitlen,
-                                              const mbedtls_cipher_mode_t mode );
+const mbedtls_cipher_info_t *mbedtls_cipher_info_from_values(const mbedtls_cipher_id_t cipher_id,
+        int key_bitlen,
+        const mbedtls_cipher_mode_t mode);
 
 /**
  * \brief               This function initializes a \p cipher_context as NONE.
  */
-void mbedtls_cipher_init( mbedtls_cipher_context_t *ctx );
+void mbedtls_cipher_init(mbedtls_cipher_context_t *ctx);
 
 /**
  * \brief               This function frees and clears the cipher-specific
  *                      context of \p ctx. Freeing \p ctx itself remains the
  *                      responsibility of the caller.
  */
-void mbedtls_cipher_free( mbedtls_cipher_context_t *ctx );
+void mbedtls_cipher_free(mbedtls_cipher_context_t *ctx);
 
 
 /**
@@ -405,7 +403,7 @@ void mbedtls_cipher_free( mbedtls_cipher_context_t *ctx );
  * In future versions, the caller will be required to call
  * mbedtls_cipher_init() on the structure first.
  */
-int mbedtls_cipher_setup( mbedtls_cipher_context_t *ctx, const mbedtls_cipher_info_t *cipher_info );
+int mbedtls_cipher_setup(mbedtls_cipher_context_t *ctx, const mbedtls_cipher_info_t *cipher_info);
 
 /**
  * \brief        This function returns the block size of the given cipher.
@@ -415,9 +413,9 @@ int mbedtls_cipher_setup( mbedtls_cipher_context_t *ctx, const mbedtls_cipher_in
  * \return       The size of the blocks of the cipher.
  * \return       0 if \p ctx has not been initialized.
  */
-static inline unsigned int mbedtls_cipher_get_block_size( const mbedtls_cipher_context_t *ctx )
+static inline unsigned int mbedtls_cipher_get_block_size(const mbedtls_cipher_context_t *ctx)
 {
-    if( NULL == ctx || NULL == ctx->cipher_info )
+    if (NULL == ctx || NULL == ctx->cipher_info)
         return 0;
 
     return ctx->cipher_info->block_size;
@@ -432,9 +430,9 @@ static inline unsigned int mbedtls_cipher_get_block_size( const mbedtls_cipher_c
  * \return       The mode of operation.
  * \return       #MBEDTLS_MODE_NONE if \p ctx has not been initialized.
  */
-static inline mbedtls_cipher_mode_t mbedtls_cipher_get_cipher_mode( const mbedtls_cipher_context_t *ctx )
+static inline mbedtls_cipher_mode_t mbedtls_cipher_get_cipher_mode(const mbedtls_cipher_context_t *ctx)
 {
-    if( NULL == ctx || NULL == ctx->cipher_info )
+    if (NULL == ctx || NULL == ctx->cipher_info)
         return MBEDTLS_MODE_NONE;
 
     return ctx->cipher_info->mode;
@@ -450,12 +448,12 @@ static inline mbedtls_cipher_mode_t mbedtls_cipher_get_cipher_mode( const mbedtl
  * \return      \c 0 for ciphers not using an IV or a nonce.
  * \return      The actual size if an IV has been set.
  */
-static inline int mbedtls_cipher_get_iv_size( const mbedtls_cipher_context_t *ctx )
+static inline int mbedtls_cipher_get_iv_size(const mbedtls_cipher_context_t *ctx)
 {
-    if( NULL == ctx || NULL == ctx->cipher_info )
+    if (NULL == ctx || NULL == ctx->cipher_info)
         return 0;
 
-    if( ctx->iv_size != 0 )
+    if (ctx->iv_size != 0)
         return (int) ctx->iv_size;
 
     return (int) ctx->cipher_info->iv_size;
@@ -469,9 +467,9 @@ static inline int mbedtls_cipher_get_iv_size( const mbedtls_cipher_context_t *ct
  * \return              The type of the cipher.
  * \return              #MBEDTLS_CIPHER_NONE if \p ctx has not been initialized.
  */
-static inline mbedtls_cipher_type_t mbedtls_cipher_get_type( const mbedtls_cipher_context_t *ctx )
+static inline mbedtls_cipher_type_t mbedtls_cipher_get_type(const mbedtls_cipher_context_t *ctx)
 {
-    if( NULL == ctx || NULL == ctx->cipher_info )
+    if (NULL == ctx || NULL == ctx->cipher_info)
         return MBEDTLS_CIPHER_NONE;
 
     return ctx->cipher_info->type;
@@ -486,9 +484,9 @@ static inline mbedtls_cipher_type_t mbedtls_cipher_get_type( const mbedtls_ciphe
  * \return              The name of the cipher.
  * \return              NULL if \p ctx has not been not initialized.
  */
-static inline const char *mbedtls_cipher_get_name( const mbedtls_cipher_context_t *ctx )
+static inline const char *mbedtls_cipher_get_name(const mbedtls_cipher_context_t *ctx)
 {
-    if( NULL == ctx || NULL == ctx->cipher_info )
+    if (NULL == ctx || NULL == ctx->cipher_info)
         return 0;
 
     return ctx->cipher_info->name;
@@ -503,9 +501,9 @@ static inline const char *mbedtls_cipher_get_name( const mbedtls_cipher_context_
  * \return              #MBEDTLS_KEY_LENGTH_NONE if ctx \p has not been
  *                      initialized.
  */
-static inline int mbedtls_cipher_get_key_bitlen( const mbedtls_cipher_context_t *ctx )
+static inline int mbedtls_cipher_get_key_bitlen(const mbedtls_cipher_context_t *ctx)
 {
-    if( NULL == ctx || NULL == ctx->cipher_info )
+    if (NULL == ctx || NULL == ctx->cipher_info)
         return MBEDTLS_KEY_LENGTH_NONE;
 
     return (int) ctx->cipher_info->key_bitlen;
@@ -519,9 +517,9 @@ static inline int mbedtls_cipher_get_key_bitlen( const mbedtls_cipher_context_t
  * \return         The type of operation: #MBEDTLS_ENCRYPT or #MBEDTLS_DECRYPT.
  * \return         #MBEDTLS_OPERATION_NONE if \p ctx has not been initialized.
  */
-static inline mbedtls_operation_t mbedtls_cipher_get_operation( const mbedtls_cipher_context_t *ctx )
+static inline mbedtls_operation_t mbedtls_cipher_get_operation(const mbedtls_cipher_context_t *ctx)
 {
-    if( NULL == ctx || NULL == ctx->cipher_info )
+    if (NULL == ctx || NULL == ctx->cipher_info)
         return MBEDTLS_OPERATION_NONE;
 
     return ctx->operation;
@@ -543,8 +541,8 @@ static inline mbedtls_operation_t mbedtls_cipher_get_operation( const mbedtls_ci
  *                      parameter-verification failure.
  * \return              A cipher-specific error code on failure.
  */
-int mbedtls_cipher_setkey( mbedtls_cipher_context_t *ctx, const unsigned char *key,
-                   int key_bitlen, const mbedtls_operation_t operation );
+int mbedtls_cipher_setkey(mbedtls_cipher_context_t *ctx, const unsigned char *key,
+                          int key_bitlen, const mbedtls_operation_t operation);
 
 #if defined(MBEDTLS_CIPHER_MODE_WITH_PADDING)
 /**
@@ -562,7 +560,7 @@ int mbedtls_cipher_setkey( mbedtls_cipher_context_t *ctx, const unsigned char *k
  * \return              #MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA if the cipher mode
  *                      does not support padding.
  */
-int mbedtls_cipher_set_padding_mode( mbedtls_cipher_context_t *ctx, mbedtls_cipher_padding_t mode );
+int mbedtls_cipher_set_padding_mode(mbedtls_cipher_context_t *ctx, mbedtls_cipher_padding_t mode);
 #endif /* MBEDTLS_CIPHER_MODE_WITH_PADDING */
 
 /**
@@ -581,8 +579,8 @@ int mbedtls_cipher_set_padding_mode( mbedtls_cipher_context_t *ctx, mbedtls_ciph
  * \return          #MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA on
  *                  parameter-verification failure.
  */
-int mbedtls_cipher_set_iv( mbedtls_cipher_context_t *ctx,
-                   const unsigned char *iv, size_t iv_len );
+int mbedtls_cipher_set_iv(mbedtls_cipher_context_t *ctx,
+                          const unsigned char *iv, size_t iv_len);
 
 /**
  * \brief         This function resets the cipher state.
@@ -593,7 +591,7 @@ int mbedtls_cipher_set_iv( mbedtls_cipher_context_t *ctx,
  * \return        #MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA on
  *                parameter-verification failure.
  */
-int mbedtls_cipher_reset( mbedtls_cipher_context_t *ctx );
+int mbedtls_cipher_reset(mbedtls_cipher_context_t *ctx);
 
 #if defined(MBEDTLS_GCM_C) || defined(MBEDTLS_CHACHAPOLY_C)
 /**
@@ -608,8 +606,8 @@ int mbedtls_cipher_reset( mbedtls_cipher_context_t *ctx );
  * \return              \c 0 on success.
  * \return              A specific error code on failure.
  */
-int mbedtls_cipher_update_ad( mbedtls_cipher_context_t *ctx,
-                      const unsigned char *ad, size_t ad_len );
+int mbedtls_cipher_update_ad(mbedtls_cipher_context_t *ctx,
+                             const unsigned char *ad, size_t ad_len);
 #endif /* MBEDTLS_GCM_C || MBEDTLS_CHACHAPOLY_C */
 
 /**
@@ -643,8 +641,8 @@ int mbedtls_cipher_update_ad( mbedtls_cipher_context_t *ctx,
  *                      unsupported mode for a cipher.
  * \return              A cipher-specific error code on failure.
  */
-int mbedtls_cipher_update( mbedtls_cipher_context_t *ctx, const unsigned char *input,
-                   size_t ilen, unsigned char *output, size_t *olen );
+int mbedtls_cipher_update(mbedtls_cipher_context_t *ctx, const unsigned char *input,
+                          size_t ilen, unsigned char *output, size_t *olen);
 
 /**
  * \brief               The generic cipher finalization function. If data still
@@ -665,8 +663,8 @@ int mbedtls_cipher_update( mbedtls_cipher_context_t *ctx, const unsigned char *i
  *                      while decrypting.
  * \return              A cipher-specific error code on failure.
  */
-int mbedtls_cipher_finish( mbedtls_cipher_context_t *ctx,
-                   unsigned char *output, size_t *olen );
+int mbedtls_cipher_finish(mbedtls_cipher_context_t *ctx,
+                          unsigned char *output, size_t *olen);
 
 #if defined(MBEDTLS_GCM_C) || defined(MBEDTLS_CHACHAPOLY_C)
 /**
@@ -681,8 +679,8 @@ int mbedtls_cipher_finish( mbedtls_cipher_context_t *ctx,
  * \return              \c 0 on success.
  * \return              A specific error code on failure.
  */
-int mbedtls_cipher_write_tag( mbedtls_cipher_context_t *ctx,
-                      unsigned char *tag, size_t tag_len );
+int mbedtls_cipher_write_tag(mbedtls_cipher_context_t *ctx,
+                             unsigned char *tag, size_t tag_len);
 
 /**
  * \brief               This function checks the tag for AEAD ciphers.
@@ -696,8 +694,8 @@ int mbedtls_cipher_write_tag( mbedtls_cipher_context_t *ctx,
  * \return              \c 0 on success.
  * \return              A specific error code on failure.
  */
-int mbedtls_cipher_check_tag( mbedtls_cipher_context_t *ctx,
-                      const unsigned char *tag, size_t tag_len );
+int mbedtls_cipher_check_tag(mbedtls_cipher_context_t *ctx,
+                             const unsigned char *tag, size_t tag_len);
 #endif /* MBEDTLS_GCM_C || MBEDTLS_CHACHAPOLY_C */
 
 /**
@@ -729,10 +727,10 @@ int mbedtls_cipher_check_tag( mbedtls_cipher_context_t *ctx,
  *                      while decrypting.
  * \return              A cipher-specific error code on failure.
  */
-int mbedtls_cipher_crypt( mbedtls_cipher_context_t *ctx,
-                  const unsigned char *iv, size_t iv_len,
-                  const unsigned char *input, size_t ilen,
-                  unsigned char *output, size_t *olen );
+int mbedtls_cipher_crypt(mbedtls_cipher_context_t *ctx,
+                         const unsigned char *iv, size_t iv_len,
+                         const unsigned char *input, size_t ilen,
+                         unsigned char *output, size_t *olen);
 
 #if defined(MBEDTLS_CIPHER_MODE_AEAD)
 /**
@@ -758,12 +756,12 @@ int mbedtls_cipher_crypt( mbedtls_cipher_context_t *ctx,
  *                      parameter-verification failure.
  * \return              A cipher-specific error code on failure.
  */
-int mbedtls_cipher_auth_encrypt( mbedtls_cipher_context_t *ctx,
-                         const unsigned char *iv, size_t iv_len,
-                         const unsigned char *ad, size_t ad_len,
-                         const unsigned char *input, size_t ilen,
-                         unsigned char *output, size_t *olen,
-                         unsigned char *tag, size_t tag_len );
+int mbedtls_cipher_auth_encrypt(mbedtls_cipher_context_t *ctx,
+                                const unsigned char *iv, size_t iv_len,
+                                const unsigned char *ad, size_t ad_len,
+                                const unsigned char *input, size_t ilen,
+                                unsigned char *output, size_t *olen,
+                                unsigned char *tag, size_t tag_len);
 
 /**
  * \brief               The generic autenticated decryption (AEAD) function.
@@ -793,12 +791,12 @@ int mbedtls_cipher_auth_encrypt( mbedtls_cipher_context_t *ctx,
  * \return              #MBEDTLS_ERR_CIPHER_AUTH_FAILED if data is not authentic.
  * \return              A cipher-specific error code on failure.
  */
-int mbedtls_cipher_auth_decrypt( mbedtls_cipher_context_t *ctx,
-                         const unsigned char *iv, size_t iv_len,
-                         const unsigned char *ad, size_t ad_len,
-                         const unsigned char *input, size_t ilen,
-                         unsigned char *output, size_t *olen,
-                         const unsigned char *tag, size_t tag_len );
+int mbedtls_cipher_auth_decrypt(mbedtls_cipher_context_t *ctx,
+                                const unsigned char *iv, size_t iv_len,
+                                const unsigned char *ad, size_t ad_len,
+                                const unsigned char *input, size_t ilen,
+                                unsigned char *output, size_t *olen,
+                                const unsigned char *tag, size_t tag_len);
 #endif /* MBEDTLS_CIPHER_MODE_AEAD */
 
 #ifdef __cplusplus
diff --git a/common/mbedtls/cipher_internal.h b/common/mbedtls/cipher_internal.h
index 9f2858aae..1f43c7831 100644
--- a/common/mbedtls/cipher_internal.h
+++ b/common/mbedtls/cipher_internal.h
@@ -43,75 +43,73 @@ extern "C" {
 /**
  * Base cipher information. The non-mode specific functions and values.
  */
-struct mbedtls_cipher_base_t
-{
+struct mbedtls_cipher_base_t {
     /** Base Cipher type (e.g. MBEDTLS_CIPHER_ID_AES) */
     mbedtls_cipher_id_t cipher;
 
     /** Encrypt using ECB */
-    int (*ecb_func)( void *ctx, mbedtls_operation_t mode,
-                     const unsigned char *input, unsigned char *output );
+    int (*ecb_func)(void *ctx, mbedtls_operation_t mode,
+                    const unsigned char *input, unsigned char *output);
 
 #if defined(MBEDTLS_CIPHER_MODE_CBC)
     /** Encrypt using CBC */
-    int (*cbc_func)( void *ctx, mbedtls_operation_t mode, size_t length,
-                     unsigned char *iv, const unsigned char *input,
-                     unsigned char *output );
+    int (*cbc_func)(void *ctx, mbedtls_operation_t mode, size_t length,
+                    unsigned char *iv, const unsigned char *input,
+                    unsigned char *output);
 #endif
 
 #if defined(MBEDTLS_CIPHER_MODE_CFB)
     /** Encrypt using CFB (Full length) */
-    int (*cfb_func)( void *ctx, mbedtls_operation_t mode, size_t length, size_t *iv_off,
-                     unsigned char *iv, const unsigned char *input,
-                     unsigned char *output );
+    int (*cfb_func)(void *ctx, mbedtls_operation_t mode, size_t length, size_t *iv_off,
+                    unsigned char *iv, const unsigned char *input,
+                    unsigned char *output);
 #endif
 
 #if defined(MBEDTLS_CIPHER_MODE_OFB)
     /** Encrypt using OFB (Full length) */
-    int (*ofb_func)( void *ctx, size_t length, size_t *iv_off,
-                     unsigned char *iv,
-                     const unsigned char *input,
-                     unsigned char *output );
+    int (*ofb_func)(void *ctx, size_t length, size_t *iv_off,
+                    unsigned char *iv,
+                    const unsigned char *input,
+                    unsigned char *output);
 #endif
 
 #if defined(MBEDTLS_CIPHER_MODE_CTR)
     /** Encrypt using CTR */
-    int (*ctr_func)( void *ctx, size_t length, size_t *nc_off,
-                     unsigned char *nonce_counter, unsigned char *stream_block,
-                     const unsigned char *input, unsigned char *output );
+    int (*ctr_func)(void *ctx, size_t length, size_t *nc_off,
+                    unsigned char *nonce_counter, unsigned char *stream_block,
+                    const unsigned char *input, unsigned char *output);
 #endif
 
 #if defined(MBEDTLS_CIPHER_MODE_XTS)
     /** Encrypt or decrypt using XTS. */
-    int (*xts_func)( void *ctx, mbedtls_operation_t mode, size_t length,
-                     const unsigned char data_unit[16],
-                     const unsigned char *input, unsigned char *output );
+    int (*xts_func)(void *ctx, mbedtls_operation_t mode, size_t length,
+                    const unsigned char data_unit[16],
+                    const unsigned char *input, unsigned char *output);
 #endif
 
 #if defined(MBEDTLS_CIPHER_MODE_STREAM)
     /** Encrypt using STREAM */
-    int (*stream_func)( void *ctx, size_t length,
-                        const unsigned char *input, unsigned char *output );
+    int (*stream_func)(void *ctx, size_t length,
+                       const unsigned char *input, unsigned char *output);
 #endif
 
     /** Set key for encryption purposes */
-    int (*setkey_enc_func)( void *ctx, const unsigned char *key,
-                            unsigned int key_bitlen );
+    int (*setkey_enc_func)(void *ctx, const unsigned char *key,
+                           unsigned int key_bitlen);
 
     /** Set key for decryption purposes */
-    int (*setkey_dec_func)( void *ctx, const unsigned char *key,
-                            unsigned int key_bitlen);
+    int (*setkey_dec_func)(void *ctx, const unsigned char *key,
+                           unsigned int key_bitlen);
 
     /** Allocate a new context */
-    void * (*ctx_alloc_func)( void );
+    void *(*ctx_alloc_func)(void);
 
     /** Free the given context */
-    void (*ctx_free_func)( void *ctx );
+    void (*ctx_free_func)(void *ctx);
 
 };
 
-typedef struct
-{
+typedef struct {
     mbedtls_cipher_type_t type;
     const mbedtls_cipher_info_t *info;
 } mbedtls_cipher_definition_t;
diff --git a/common/mbedtls/cipher_wrap.c b/common/mbedtls/cipher_wrap.c
index 3f81729cc..ec562f463 100644
--- a/common/mbedtls/cipher_wrap.c
+++ b/common/mbedtls/cipher_wrap.c
@@ -89,100 +89,99 @@
 
 #if defined(MBEDTLS_GCM_C)
 /* shared by all GCM ciphers */
-static void *gcm_ctx_alloc( void )
+static void *gcm_ctx_alloc(void)
 {
-    void *ctx = mbedtls_calloc( 1, sizeof( mbedtls_gcm_context ) );
+    void *ctx = mbedtls_calloc(1, sizeof(mbedtls_gcm_context));
 
-    if( ctx != NULL )
-        mbedtls_gcm_init( (mbedtls_gcm_context *) ctx );
+    if (ctx != NULL)
+        mbedtls_gcm_init((mbedtls_gcm_context *) ctx);
 
-    return( ctx );
+    return (ctx);
 }
 
-static void gcm_ctx_free( void *ctx )
+static void gcm_ctx_free(void *ctx)
 {
-    mbedtls_gcm_free( ctx );
-    mbedtls_free( ctx );
+    mbedtls_gcm_free(ctx);
+    mbedtls_free(ctx);
 }
 #endif /* MBEDTLS_GCM_C */
 
 #if defined(MBEDTLS_CCM_C)
 /* shared by all CCM ciphers */
-static void *ccm_ctx_alloc( void )
+static void *ccm_ctx_alloc(void)
 {
-    void *ctx = mbedtls_calloc( 1, sizeof( mbedtls_ccm_context ) );
+    void *ctx = mbedtls_calloc(1, sizeof(mbedtls_ccm_context));
 
-    if( ctx != NULL )
-        mbedtls_ccm_init( (mbedtls_ccm_context *) ctx );
+    if (ctx != NULL)
+        mbedtls_ccm_init((mbedtls_ccm_context *) ctx);
 
-    return( ctx );
+    return (ctx);
 }
 
-static void ccm_ctx_free( void *ctx )
+static void ccm_ctx_free(void *ctx)
 {
-    mbedtls_ccm_free( ctx );
-    mbedtls_free( ctx );
+    mbedtls_ccm_free(ctx);
+    mbedtls_free(ctx);
 }
 #endif /* MBEDTLS_CCM_C */
 
 #if defined(MBEDTLS_AES_C)
 
-static int aes_crypt_ecb_wrap( void *ctx, mbedtls_operation_t operation,
-        const unsigned char *input, unsigned char *output )
+static int aes_crypt_ecb_wrap(void *ctx, mbedtls_operation_t operation,
+                              const unsigned char *input, unsigned char *output)
 {
-    return mbedtls_aes_crypt_ecb( (mbedtls_aes_context *) ctx, operation, input, output );
+    return mbedtls_aes_crypt_ecb((mbedtls_aes_context *) ctx, operation, input, output);
 }
 
 #if defined(MBEDTLS_CIPHER_MODE_CBC)
-static int aes_crypt_cbc_wrap( void *ctx, mbedtls_operation_t operation, size_t length,
-        unsigned char *iv, const unsigned char *input, unsigned char *output )
+static int aes_crypt_cbc_wrap(void *ctx, mbedtls_operation_t operation, size_t length,
+                              unsigned char *iv, const unsigned char *input, unsigned char *output)
 {
-    return mbedtls_aes_crypt_cbc( (mbedtls_aes_context *) ctx, operation, length, iv, input,
-                          output );
+    return mbedtls_aes_crypt_cbc((mbedtls_aes_context *) ctx, operation, length, iv, input,
+                                 output);
 }
 #endif /* MBEDTLS_CIPHER_MODE_CBC */
 
 #if defined(MBEDTLS_CIPHER_MODE_CFB)
-static int aes_crypt_cfb128_wrap( void *ctx, mbedtls_operation_t operation,
-        size_t length, size_t *iv_off, unsigned char *iv,
-        const unsigned char *input, unsigned char *output )
+static int aes_crypt_cfb128_wrap(void *ctx, mbedtls_operation_t operation,
+                                 size_t length, size_t *iv_off, unsigned char *iv,
+                                 const unsigned char *input, unsigned char *output)
 {
-    return mbedtls_aes_crypt_cfb128( (mbedtls_aes_context *) ctx, operation, length, iv_off, iv,
-                             input, output );
+    return mbedtls_aes_crypt_cfb128((mbedtls_aes_context *) ctx, operation, length, iv_off, iv,
+                                    input, output);
 }
 #endif /* MBEDTLS_CIPHER_MODE_CFB */
 
 #if defined(MBEDTLS_CIPHER_MODE_OFB)
-static int aes_crypt_ofb_wrap( void *ctx, size_t length, size_t *iv_off,
-        unsigned char *iv, const unsigned char *input, unsigned char *output )
+static int aes_crypt_ofb_wrap(void *ctx, size_t length, size_t *iv_off,
+                              unsigned char *iv, const unsigned char *input, unsigned char *output)
 {
-    return mbedtls_aes_crypt_ofb( (mbedtls_aes_context *) ctx, length, iv_off,
-                                    iv, input, output );
+    return mbedtls_aes_crypt_ofb((mbedtls_aes_context *) ctx, length, iv_off,
+                                 iv, input, output);
 }
 #endif /* MBEDTLS_CIPHER_MODE_OFB */
 
 #if defined(MBEDTLS_CIPHER_MODE_CTR)
-static int aes_crypt_ctr_wrap( void *ctx, size_t length, size_t *nc_off,
-        unsigned char *nonce_counter, unsigned char *stream_block,
-        const unsigned char *input, unsigned char *output )
+static int aes_crypt_ctr_wrap(void *ctx, size_t length, size_t *nc_off,
+                              unsigned char *nonce_counter, unsigned char *stream_block,
+                              const unsigned char *input, unsigned char *output)
 {
-    return mbedtls_aes_crypt_ctr( (mbedtls_aes_context *) ctx, length, nc_off, nonce_counter,
-                          stream_block, input, output );
+    return mbedtls_aes_crypt_ctr((mbedtls_aes_context *) ctx, length, nc_off, nonce_counter,
+                                 stream_block, input, output);
 }
 #endif /* MBEDTLS_CIPHER_MODE_CTR */
 
 #if defined(MBEDTLS_CIPHER_MODE_XTS)
-static int aes_crypt_xts_wrap( void *ctx, mbedtls_operation_t operation,
-                               size_t length,
-                               const unsigned char data_unit[16],
-                               const unsigned char *input,
-                               unsigned char *output )
+static int aes_crypt_xts_wrap(void *ctx, mbedtls_operation_t operation,
+                              size_t length,
+                              const unsigned char data_unit[16],
+                              const unsigned char *input,
+                              unsigned char *output)
 {
     mbedtls_aes_xts_context *xts_ctx = ctx;
     int mode;
 
-    switch( operation )
-    {
+    switch (operation) {
         case MBEDTLS_ENCRYPT:
             mode = MBEDTLS_AES_ENCRYPT;
             break;
@@ -193,39 +192,39 @@ static int aes_crypt_xts_wrap( void *ctx, mbedtls_operation_t operation,
             return MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA;
     }
 
-    return mbedtls_aes_crypt_xts( xts_ctx, mode, length,
-                                  data_unit, input, output );
+    return mbedtls_aes_crypt_xts(xts_ctx, mode, length,
+                                 data_unit, input, output);
 }
 #endif /* MBEDTLS_CIPHER_MODE_XTS */
 
-static int aes_setkey_dec_wrap( void *ctx, const unsigned char *key,
-                                unsigned int key_bitlen )
+static int aes_setkey_dec_wrap(void *ctx, const unsigned char *key,
+                               unsigned int key_bitlen)
 {
-    return mbedtls_aes_setkey_dec( (mbedtls_aes_context *) ctx, key, key_bitlen );
+    return mbedtls_aes_setkey_dec((mbedtls_aes_context *) ctx, key, key_bitlen);
 }
 
-static int aes_setkey_enc_wrap( void *ctx, const unsigned char *key,
-                                unsigned int key_bitlen )
+static int aes_setkey_enc_wrap(void *ctx, const unsigned char *key,
+                               unsigned int key_bitlen)
 {
-    return mbedtls_aes_setkey_enc( (mbedtls_aes_context *) ctx, key, key_bitlen );
+    return mbedtls_aes_setkey_enc((mbedtls_aes_context *) ctx, key, key_bitlen);
 }
 
-static void * aes_ctx_alloc( void )
+static void *aes_ctx_alloc(void)
 {
-    mbedtls_aes_context *aes = mbedtls_calloc( 1, sizeof( mbedtls_aes_context ) );
+    mbedtls_aes_context *aes = mbedtls_calloc(1, sizeof(mbedtls_aes_context));
 
-    if( aes == NULL )
-        return( NULL );
+    if (aes == NULL)
+        return (NULL);
 
-    mbedtls_aes_init( aes );
+    mbedtls_aes_init(aes);
 
-    return( aes );
+    return (aes);
 }
 
-static void aes_ctx_free( void *ctx )
+static void aes_ctx_free(void *ctx)
 {
-    mbedtls_aes_free( (mbedtls_aes_context *) ctx );
-    mbedtls_free( ctx );
+    mbedtls_aes_free((mbedtls_aes_context *) ctx);
+    mbedtls_free(ctx);
 }
 
 static const mbedtls_cipher_base_t aes_info = {
@@ -429,39 +428,39 @@ static const mbedtls_cipher_info_t aes_256_ctr_info = {
 #endif /* MBEDTLS_CIPHER_MODE_CTR */
 
 #if defined(MBEDTLS_CIPHER_MODE_XTS)
-static int xts_aes_setkey_enc_wrap( void *ctx, const unsigned char *key,
-                                    unsigned int key_bitlen )
+static int xts_aes_setkey_enc_wrap(void *ctx, const unsigned char *key,
+                                   unsigned int key_bitlen)
 {
     mbedtls_aes_xts_context *xts_ctx = ctx;
-    return( mbedtls_aes_xts_setkey_enc( xts_ctx, key, key_bitlen ) );
+    return (mbedtls_aes_xts_setkey_enc(xts_ctx, key, key_bitlen));
 }
 
-static int xts_aes_setkey_dec_wrap( void *ctx, const unsigned char *key,
-                                    unsigned int key_bitlen )
+static int xts_aes_setkey_dec_wrap(void *ctx, const unsigned char *key,
+                                   unsigned int key_bitlen)
 {
     mbedtls_aes_xts_context *xts_ctx = ctx;
-    return( mbedtls_aes_xts_setkey_dec( xts_ctx, key, key_bitlen ) );
+    return (mbedtls_aes_xts_setkey_dec(xts_ctx, key, key_bitlen));
 }
 
-static void *xts_aes_ctx_alloc( void )
+static void *xts_aes_ctx_alloc(void)
 {
-    mbedtls_aes_xts_context *xts_ctx = mbedtls_calloc( 1, sizeof( *xts_ctx ) );
+    mbedtls_aes_xts_context *xts_ctx = mbedtls_calloc(1, sizeof(*xts_ctx));
 
-    if( xts_ctx != NULL )
-        mbedtls_aes_xts_init( xts_ctx );
+    if (xts_ctx != NULL)
+        mbedtls_aes_xts_init(xts_ctx);
 
-    return( xts_ctx );
+    return (xts_ctx);
 }
 
-static void xts_aes_ctx_free( void *ctx )
+static void xts_aes_ctx_free(void *ctx)
 {
     mbedtls_aes_xts_context *xts_ctx = ctx;
 
-    if( xts_ctx == NULL )
+    if (xts_ctx == NULL)
         return;
 
-    mbedtls_aes_xts_free( xts_ctx );
-    mbedtls_free( xts_ctx );
+    mbedtls_aes_xts_free(xts_ctx);
+    mbedtls_free(xts_ctx);
 }
 
 static const mbedtls_cipher_base_t xts_aes_info = {
@@ -515,11 +514,11 @@ static const mbedtls_cipher_info_t aes_256_xts_info = {
 #endif /* MBEDTLS_CIPHER_MODE_XTS */
 
 #if defined(MBEDTLS_GCM_C)
-static int gcm_aes_setkey_wrap( void *ctx, const unsigned char *key,
-                                unsigned int key_bitlen )
+static int gcm_aes_setkey_wrap(void *ctx, const unsigned char *key,
+                               unsigned int key_bitlen)
 {
-    return mbedtls_gcm_setkey( (mbedtls_gcm_context *) ctx, MBEDTLS_CIPHER_ID_AES,
-                     key, key_bitlen );
+    return mbedtls_gcm_setkey((mbedtls_gcm_context *) ctx, MBEDTLS_CIPHER_ID_AES,
+                              key, key_bitlen);
 }
 
 static const mbedtls_cipher_base_t gcm_aes_info = {
@@ -584,11 +583,11 @@ static const mbedtls_cipher_info_t aes_256_gcm_info = {
 #endif /* MBEDTLS_GCM_C */
 
 #if defined(MBEDTLS_CCM_C)
-static int ccm_aes_setkey_wrap( void *ctx, const unsigned char *key,
-                                unsigned int key_bitlen )
+static int ccm_aes_setkey_wrap(void *ctx, const unsigned char *key,
+                               unsigned int key_bitlen)
 {
-    return mbedtls_ccm_setkey( (mbedtls_ccm_context *) ctx, MBEDTLS_CIPHER_ID_AES,
-                     key, key_bitlen );
+    return mbedtls_ccm_setkey((mbedtls_ccm_context *) ctx, MBEDTLS_CIPHER_ID_AES,
+                              key, key_bitlen);
 }
 
 static const mbedtls_cipher_base_t ccm_aes_info = {
@@ -656,72 +655,72 @@ static const mbedtls_cipher_info_t aes_256_ccm_info = {
 
 #if defined(MBEDTLS_CAMELLIA_C)
 
-static int camellia_crypt_ecb_wrap( void *ctx, mbedtls_operation_t operation,
-        const unsigned char *input, unsigned char *output )
+static int camellia_crypt_ecb_wrap(void *ctx, mbedtls_operation_t operation,
+                                   const unsigned char *input, unsigned char *output)
 {
-    return mbedtls_camellia_crypt_ecb( (mbedtls_camellia_context *) ctx, operation, input,
-                               output );
+    return mbedtls_camellia_crypt_ecb((mbedtls_camellia_context *) ctx, operation, input,
+                                      output);
 }
 
 #if defined(MBEDTLS_CIPHER_MODE_CBC)
-static int camellia_crypt_cbc_wrap( void *ctx, mbedtls_operation_t operation,
-        size_t length, unsigned char *iv,
-        const unsigned char *input, unsigned char *output )
+static int camellia_crypt_cbc_wrap(void *ctx, mbedtls_operation_t operation,
+                                   size_t length, unsigned char *iv,
+                                   const unsigned char *input, unsigned char *output)
 {
-    return mbedtls_camellia_crypt_cbc( (mbedtls_camellia_context *) ctx, operation, length, iv,
-                               input, output );
+    return mbedtls_camellia_crypt_cbc((mbedtls_camellia_context *) ctx, operation, length, iv,
+                                      input, output);
 }
 #endif /* MBEDTLS_CIPHER_MODE_CBC */
 
 #if defined(MBEDTLS_CIPHER_MODE_CFB)
-static int camellia_crypt_cfb128_wrap( void *ctx, mbedtls_operation_t operation,
-        size_t length, size_t *iv_off, unsigned char *iv,
-        const unsigned char *input, unsigned char *output )
+static int camellia_crypt_cfb128_wrap(void *ctx, mbedtls_operation_t operation,
+                                      size_t length, size_t *iv_off, unsigned char *iv,
+                                      const unsigned char *input, unsigned char *output)
 {
-    return mbedtls_camellia_crypt_cfb128( (mbedtls_camellia_context *) ctx, operation, length,
-                                  iv_off, iv, input, output );
+    return mbedtls_camellia_crypt_cfb128((mbedtls_camellia_context *) ctx, operation, length,
+                                         iv_off, iv, input, output);
 }
 #endif /* MBEDTLS_CIPHER_MODE_CFB */
 
 #if defined(MBEDTLS_CIPHER_MODE_CTR)
-static int camellia_crypt_ctr_wrap( void *ctx, size_t length, size_t *nc_off,
-        unsigned char *nonce_counter, unsigned char *stream_block,
-        const unsigned char *input, unsigned char *output )
+static int camellia_crypt_ctr_wrap(void *ctx, size_t length, size_t *nc_off,
+                                   unsigned char *nonce_counter, unsigned char *stream_block,
+                                   const unsigned char *input, unsigned char *output)
 {
-    return mbedtls_camellia_crypt_ctr( (mbedtls_camellia_context *) ctx, length, nc_off,
-                               nonce_counter, stream_block, input, output );
+    return mbedtls_camellia_crypt_ctr((mbedtls_camellia_context *) ctx, length, nc_off,
+                                      nonce_counter, stream_block, input, output);
 }
 #endif /* MBEDTLS_CIPHER_MODE_CTR */
 
-static int camellia_setkey_dec_wrap( void *ctx, const unsigned char *key,
-                                     unsigned int key_bitlen )
+static int camellia_setkey_dec_wrap(void *ctx, const unsigned char *key,
+                                    unsigned int key_bitlen)
 {
-    return mbedtls_camellia_setkey_dec( (mbedtls_camellia_context *) ctx, key, key_bitlen );
+    return mbedtls_camellia_setkey_dec((mbedtls_camellia_context *) ctx, key, key_bitlen);
 }
 
-static int camellia_setkey_enc_wrap( void *ctx, const unsigned char *key,
-                                     unsigned int key_bitlen )
+static int camellia_setkey_enc_wrap(void *ctx, const unsigned char *key,
+                                    unsigned int key_bitlen)
 {
-    return mbedtls_camellia_setkey_enc( (mbedtls_camellia_context *) ctx, key, key_bitlen );
+    return mbedtls_camellia_setkey_enc((mbedtls_camellia_context *) ctx, key, key_bitlen);
 }
 
-static void * camellia_ctx_alloc( void )
+static void *camellia_ctx_alloc(void)
 {
     mbedtls_camellia_context *ctx;
-    ctx = mbedtls_calloc( 1, sizeof( mbedtls_camellia_context ) );
+    ctx = mbedtls_calloc(1, sizeof(mbedtls_camellia_context));
 
-    if( ctx == NULL )
-        return( NULL );
+    if (ctx == NULL)
+        return (NULL);
 
-    mbedtls_camellia_init( ctx );
+    mbedtls_camellia_init(ctx);
 
-    return( ctx );
+    return (ctx);
 }
 
-static void camellia_ctx_free( void *ctx )
+static void camellia_ctx_free(void *ctx)
 {
-    mbedtls_camellia_free( (mbedtls_camellia_context *) ctx );
-    mbedtls_free( ctx );
+    mbedtls_camellia_free((mbedtls_camellia_context *) ctx);
+    mbedtls_free(ctx);
 }
 
 static const mbedtls_cipher_base_t camellia_info = {
@@ -890,11 +889,11 @@ static const mbedtls_cipher_info_t camellia_256_ctr_info = {
 #endif /* MBEDTLS_CIPHER_MODE_CTR */
 
 #if defined(MBEDTLS_GCM_C)
-static int gcm_camellia_setkey_wrap( void *ctx, const unsigned char *key,
-                                     unsigned int key_bitlen )
+static int gcm_camellia_setkey_wrap(void *ctx, const unsigned char *key,
+                                    unsigned int key_bitlen)
 {
-    return mbedtls_gcm_setkey( (mbedtls_gcm_context *) ctx, MBEDTLS_CIPHER_ID_CAMELLIA,
-                     key, key_bitlen );
+    return mbedtls_gcm_setkey((mbedtls_gcm_context *) ctx, MBEDTLS_CIPHER_ID_CAMELLIA,
+                              key, key_bitlen);
 }
 
 static const mbedtls_cipher_base_t gcm_camellia_info = {
@@ -959,11 +958,11 @@ static const mbedtls_cipher_info_t camellia_256_gcm_info = {
 #endif /* MBEDTLS_GCM_C */
 
 #if defined(MBEDTLS_CCM_C)
-static int ccm_camellia_setkey_wrap( void *ctx, const unsigned char *key,
-                                     unsigned int key_bitlen )
+static int ccm_camellia_setkey_wrap(void *ctx, const unsigned char *key,
+                                    unsigned int key_bitlen)
 {
-    return mbedtls_ccm_setkey( (mbedtls_ccm_context *) ctx, MBEDTLS_CIPHER_ID_CAMELLIA,
-                     key, key_bitlen );
+    return mbedtls_ccm_setkey((mbedtls_ccm_context *) ctx, MBEDTLS_CIPHER_ID_CAMELLIA,
+                              key, key_bitlen);
 }
 
 static const mbedtls_cipher_base_t ccm_camellia_info = {
@@ -1031,73 +1030,73 @@ static const mbedtls_cipher_info_t camellia_256_ccm_info = {
 
 #if defined(MBEDTLS_ARIA_C)
 
-static int aria_crypt_ecb_wrap( void *ctx, mbedtls_operation_t operation,
-        const unsigned char *input, unsigned char *output )
+static int aria_crypt_ecb_wrap(void *ctx, mbedtls_operation_t operation,
+                               const unsigned char *input, unsigned char *output)
 {
     (void) operation;
-    return mbedtls_aria_crypt_ecb( (mbedtls_aria_context *) ctx, input,
-                               output );
+    return mbedtls_aria_crypt_ecb((mbedtls_aria_context *) ctx, input,
+                                  output);
 }
 
 #if defined(MBEDTLS_CIPHER_MODE_CBC)
-static int aria_crypt_cbc_wrap( void *ctx, mbedtls_operation_t operation,
-        size_t length, unsigned char *iv,
-        const unsigned char *input, unsigned char *output )
+static int aria_crypt_cbc_wrap(void *ctx, mbedtls_operation_t operation,
+                               size_t length, unsigned char *iv,
+                               const unsigned char *input, unsigned char *output)
 {
-    return mbedtls_aria_crypt_cbc( (mbedtls_aria_context *) ctx, operation, length, iv,
-                               input, output );
+    return mbedtls_aria_crypt_cbc((mbedtls_aria_context *) ctx, operation, length, iv,
+                                  input, output);
 }
 #endif /* MBEDTLS_CIPHER_MODE_CBC */
 
 #if defined(MBEDTLS_CIPHER_MODE_CFB)
-static int aria_crypt_cfb128_wrap( void *ctx, mbedtls_operation_t operation,
-        size_t length, size_t *iv_off, unsigned char *iv,
-        const unsigned char *input, unsigned char *output )
+static int aria_crypt_cfb128_wrap(void *ctx, mbedtls_operation_t operation,
+                                  size_t length, size_t *iv_off, unsigned char *iv,
+                                  const unsigned char *input, unsigned char *output)
 {
-    return mbedtls_aria_crypt_cfb128( (mbedtls_aria_context *) ctx, operation, length,
-                                  iv_off, iv, input, output );
+    return mbedtls_aria_crypt_cfb128((mbedtls_aria_context *) ctx, operation, length,
+                                     iv_off, iv, input, output);
 }
 #endif /* MBEDTLS_CIPHER_MODE_CFB */
 
 #if defined(MBEDTLS_CIPHER_MODE_CTR)
-static int aria_crypt_ctr_wrap( void *ctx, size_t length, size_t *nc_off,
-        unsigned char *nonce_counter, unsigned char *stream_block,
-        const unsigned char *input, unsigned char *output )
+static int aria_crypt_ctr_wrap(void *ctx, size_t length, size_t *nc_off,
+                               unsigned char *nonce_counter, unsigned char *stream_block,
+                               const unsigned char *input, unsigned char *output)
 {
-    return mbedtls_aria_crypt_ctr( (mbedtls_aria_context *) ctx, length, nc_off,
-                               nonce_counter, stream_block, input, output );
+    return mbedtls_aria_crypt_ctr((mbedtls_aria_context *) ctx, length, nc_off,
+                                  nonce_counter, stream_block, input, output);
 }
 #endif /* MBEDTLS_CIPHER_MODE_CTR */
 
-static int aria_setkey_dec_wrap( void *ctx, const unsigned char *key,
-                                     unsigned int key_bitlen )
+static int aria_setkey_dec_wrap(void *ctx, const unsigned char *key,
+                                unsigned int key_bitlen)
 {
-    return mbedtls_aria_setkey_dec( (mbedtls_aria_context *) ctx, key, key_bitlen );
+    return mbedtls_aria_setkey_dec((mbedtls_aria_context *) ctx, key, key_bitlen);
 }
 
-static int aria_setkey_enc_wrap( void *ctx, const unsigned char *key,
-                                     unsigned int key_bitlen )
+static int aria_setkey_enc_wrap(void *ctx, const unsigned char *key,
+                                unsigned int key_bitlen)
 {
-    return mbedtls_aria_setkey_enc( (mbedtls_aria_context *) ctx, key, key_bitlen );
+    return mbedtls_aria_setkey_enc((mbedtls_aria_context *) ctx, key, key_bitlen);
 }
 
-static void * aria_ctx_alloc( void )
+static void *aria_ctx_alloc(void)
 {
     mbedtls_aria_context *ctx;
-    ctx = mbedtls_calloc( 1, sizeof( mbedtls_aria_context ) );
+    ctx = mbedtls_calloc(1, sizeof(mbedtls_aria_context));
 
-    if( ctx == NULL )
-        return( NULL );
+    if (ctx == NULL)
+        return (NULL);
 
-    mbedtls_aria_init( ctx );
+    mbedtls_aria_init(ctx);
 
-    return( ctx );
+    return (ctx);
 }
 
-static void aria_ctx_free( void *ctx )
+static void aria_ctx_free(void *ctx)
 {
-    mbedtls_aria_free( (mbedtls_aria_context *) ctx );
-    mbedtls_free( ctx );
+    mbedtls_aria_free((mbedtls_aria_context *) ctx);
+    mbedtls_free(ctx);
 }
 
 static const mbedtls_cipher_base_t aria_info = {
@@ -1266,11 +1265,11 @@ static const mbedtls_cipher_info_t aria_256_ctr_info = {
 #endif /* MBEDTLS_CIPHER_MODE_CTR */
 
 #if defined(MBEDTLS_GCM_C)
-static int gcm_aria_setkey_wrap( void *ctx, const unsigned char *key,
-                                     unsigned int key_bitlen )
+static int gcm_aria_setkey_wrap(void *ctx, const unsigned char *key,
+                                unsigned int key_bitlen)
 {
-    return mbedtls_gcm_setkey( (mbedtls_gcm_context *) ctx, MBEDTLS_CIPHER_ID_ARIA,
-                     key, key_bitlen );
+    return mbedtls_gcm_setkey((mbedtls_gcm_context *) ctx, MBEDTLS_CIPHER_ID_ARIA,
+                              key, key_bitlen);
 }
 
 static const mbedtls_cipher_base_t gcm_aria_info = {
@@ -1335,11 +1334,11 @@ static const mbedtls_cipher_info_t aria_256_gcm_info = {
 #endif /* MBEDTLS_GCM_C */
 
 #if defined(MBEDTLS_CCM_C)
-static int ccm_aria_setkey_wrap( void *ctx, const unsigned char *key,
-                                     unsigned int key_bitlen )
+static int ccm_aria_setkey_wrap(void *ctx, const unsigned char *key,
+                                unsigned int key_bitlen)
 {
-    return mbedtls_ccm_setkey( (mbedtls_ccm_context *) ctx, MBEDTLS_CIPHER_ID_ARIA,
-                     key, key_bitlen );
+    return mbedtls_ccm_setkey((mbedtls_ccm_context *) ctx, MBEDTLS_CIPHER_ID_ARIA,
+                              key, key_bitlen);
 }
 
 static const mbedtls_cipher_base_t ccm_aria_info = {
@@ -1407,121 +1406,121 @@ static const mbedtls_cipher_info_t aria_256_ccm_info = {
 
 #if defined(MBEDTLS_DES_C)
 
-static int des_crypt_ecb_wrap( void *ctx, mbedtls_operation_t operation,
-        const unsigned char *input, unsigned char *output )
+static int des_crypt_ecb_wrap(void *ctx, mbedtls_operation_t operation,
+                              const unsigned char *input, unsigned char *output)
 {
     ((void) operation);
-    return mbedtls_des_crypt_ecb( (mbedtls_des_context *) ctx, input, output );
+    return mbedtls_des_crypt_ecb((mbedtls_des_context *) ctx, input, output);
 }
 
-static int des3_crypt_ecb_wrap( void *ctx, mbedtls_operation_t operation,
-        const unsigned char *input, unsigned char *output )
+static int des3_crypt_ecb_wrap(void *ctx, mbedtls_operation_t operation,
+                               const unsigned char *input, unsigned char *output)
 {
     ((void) operation);
-    return mbedtls_des3_crypt_ecb( (mbedtls_des3_context *) ctx, input, output );
+    return mbedtls_des3_crypt_ecb((mbedtls_des3_context *) ctx, input, output);
 }
 
 #if defined(MBEDTLS_CIPHER_MODE_CBC)
-static int des_crypt_cbc_wrap( void *ctx, mbedtls_operation_t operation, size_t length,
-        unsigned char *iv, const unsigned char *input, unsigned char *output )
+static int des_crypt_cbc_wrap(void *ctx, mbedtls_operation_t operation, size_t length,
+                              unsigned char *iv, const unsigned char *input, unsigned char *output)
 {
-    return mbedtls_des_crypt_cbc( (mbedtls_des_context *) ctx, operation, length, iv, input,
-                          output );
+    return mbedtls_des_crypt_cbc((mbedtls_des_context *) ctx, operation, length, iv, input,
+                                 output);
 }
 #endif /* MBEDTLS_CIPHER_MODE_CBC */
 
 #if defined(MBEDTLS_CIPHER_MODE_CBC)
-static int des3_crypt_cbc_wrap( void *ctx, mbedtls_operation_t operation, size_t length,
-        unsigned char *iv, const unsigned char *input, unsigned char *output )
+static int des3_crypt_cbc_wrap(void *ctx, mbedtls_operation_t operation, size_t length,
+                               unsigned char *iv, const unsigned char *input, unsigned char *output)
 {
-    return mbedtls_des3_crypt_cbc( (mbedtls_des3_context *) ctx, operation, length, iv, input,
-                           output );
+    return mbedtls_des3_crypt_cbc((mbedtls_des3_context *) ctx, operation, length, iv, input,
+                                  output);
 }
 #endif /* MBEDTLS_CIPHER_MODE_CBC */
 
-static int des_setkey_dec_wrap( void *ctx, const unsigned char *key,
-                                unsigned int key_bitlen )
+static int des_setkey_dec_wrap(void *ctx, const unsigned char *key,
+                               unsigned int key_bitlen)
 {
     ((void) key_bitlen);
 
-    return mbedtls_des_setkey_dec( (mbedtls_des_context *) ctx, key );
+    return mbedtls_des_setkey_dec((mbedtls_des_context *) ctx, key);
 }
 
-static int des_setkey_enc_wrap( void *ctx, const unsigned char *key,
-                                unsigned int key_bitlen )
+static int des_setkey_enc_wrap(void *ctx, const unsigned char *key,
+                               unsigned int key_bitlen)
 {
     ((void) key_bitlen);
 
-    return mbedtls_des_setkey_enc( (mbedtls_des_context *) ctx, key );
+    return mbedtls_des_setkey_enc((mbedtls_des_context *) ctx, key);
 }
 
-static int des3_set2key_dec_wrap( void *ctx, const unsigned char *key,
-                                  unsigned int key_bitlen )
+static int des3_set2key_dec_wrap(void *ctx, const unsigned char *key,
+                                 unsigned int key_bitlen)
 {
     ((void) key_bitlen);
 
-    return mbedtls_des3_set2key_dec( (mbedtls_des3_context *) ctx, key );
+    return mbedtls_des3_set2key_dec((mbedtls_des3_context *) ctx, key);
 }
 
-static int des3_set2key_enc_wrap( void *ctx, const unsigned char *key,
-                                  unsigned int key_bitlen )
+static int des3_set2key_enc_wrap(void *ctx, const unsigned char *key,
+                                 unsigned int key_bitlen)
 {
     ((void) key_bitlen);
 
-    return mbedtls_des3_set2key_enc( (mbedtls_des3_context *) ctx, key );
+    return mbedtls_des3_set2key_enc((mbedtls_des3_context *) ctx, key);
 }
 
-static int des3_set3key_dec_wrap( void *ctx, const unsigned char *key,
-                                  unsigned int key_bitlen )
+static int des3_set3key_dec_wrap(void *ctx, const unsigned char *key,
+                                 unsigned int key_bitlen)
 {
     ((void) key_bitlen);
 
-    return mbedtls_des3_set3key_dec( (mbedtls_des3_context *) ctx, key );
+    return mbedtls_des3_set3key_dec((mbedtls_des3_context *) ctx, key);
 }
 
-static int des3_set3key_enc_wrap( void *ctx, const unsigned char *key,
-                                  unsigned int key_bitlen )
+static int des3_set3key_enc_wrap(void *ctx, const unsigned char *key,
+                                 unsigned int key_bitlen)
 {
     ((void) key_bitlen);
 
-    return mbedtls_des3_set3key_enc( (mbedtls_des3_context *) ctx, key );
+    return mbedtls_des3_set3key_enc((mbedtls_des3_context *) ctx, key);
 }
 
-static void * des_ctx_alloc( void )
+static void *des_ctx_alloc(void)
 {
-    mbedtls_des_context *des = mbedtls_calloc( 1, sizeof( mbedtls_des_context ) );
+    mbedtls_des_context *des = mbedtls_calloc(1, sizeof(mbedtls_des_context));
 
-    if( des == NULL )
-        return( NULL );
+    if (des == NULL)
+        return (NULL);
 
-    mbedtls_des_init( des );
+    mbedtls_des_init(des);
 
-    return( des );
+    return (des);
 }
 
-static void des_ctx_free( void *ctx )
+static void des_ctx_free(void *ctx)
 {
-    mbedtls_des_free( (mbedtls_des_context *) ctx );
-    mbedtls_free( ctx );
+    mbedtls_des_free((mbedtls_des_context *) ctx);
+    mbedtls_free(ctx);
 }
 
-static void * des3_ctx_alloc( void )
+static void *des3_ctx_alloc(void)
 {
     mbedtls_des3_context *des3;
-    des3 = mbedtls_calloc( 1, sizeof( mbedtls_des3_context ) );
+    des3 = mbedtls_calloc(1, sizeof(mbedtls_des3_context));
 
-    if( des3 == NULL )
-        return( NULL );
+    if (des3 == NULL)
+        return (NULL);
 
-    mbedtls_des3_init( des3 );
+    mbedtls_des3_init(des3);
 
-    return( des3 );
+    return (des3);
 }
 
-static void des3_ctx_free( void *ctx )
+static void des3_ctx_free(void *ctx)
 {
-    mbedtls_des3_free( (mbedtls_des3_context *) ctx );
-    mbedtls_free( ctx );
+    mbedtls_des3_free((mbedtls_des3_context *) ctx);
+    mbedtls_free(ctx);
 }
 
 static const mbedtls_cipher_base_t des_info = {
@@ -1679,66 +1678,66 @@ static const mbedtls_cipher_info_t des_ede3_cbc_info = {
 
 #if defined(MBEDTLS_BLOWFISH_C)
 
-static int blowfish_crypt_ecb_wrap( void *ctx, mbedtls_operation_t operation,
-        const unsigned char *input, unsigned char *output )
+static int blowfish_crypt_ecb_wrap(void *ctx, mbedtls_operation_t operation,
+                                   const unsigned char *input, unsigned char *output)
 {
-    return mbedtls_blowfish_crypt_ecb( (mbedtls_blowfish_context *) ctx, operation, input,
-                               output );
+    return mbedtls_blowfish_crypt_ecb((mbedtls_blowfish_context *) ctx, operation, input,
+                                      output);
 }
 
 #if defined(MBEDTLS_CIPHER_MODE_CBC)
-static int blowfish_crypt_cbc_wrap( void *ctx, mbedtls_operation_t operation,
-        size_t length, unsigned char *iv, const unsigned char *input,
-        unsigned char *output )
+static int blowfish_crypt_cbc_wrap(void *ctx, mbedtls_operation_t operation,
+                                   size_t length, unsigned char *iv, const unsigned char *input,
+                                   unsigned char *output)
 {
-    return mbedtls_blowfish_crypt_cbc( (mbedtls_blowfish_context *) ctx, operation, length, iv,
-                               input, output );
+    return mbedtls_blowfish_crypt_cbc((mbedtls_blowfish_context *) ctx, operation, length, iv,
+                                      input, output);
 }
 #endif /* MBEDTLS_CIPHER_MODE_CBC */
 
 #if defined(MBEDTLS_CIPHER_MODE_CFB)
-static int blowfish_crypt_cfb64_wrap( void *ctx, mbedtls_operation_t operation,
-        size_t length, size_t *iv_off, unsigned char *iv,
-        const unsigned char *input, unsigned char *output )
+static int blowfish_crypt_cfb64_wrap(void *ctx, mbedtls_operation_t operation,
+                                     size_t length, size_t *iv_off, unsigned char *iv,
+                                     const unsigned char *input, unsigned char *output)
 {
-    return mbedtls_blowfish_crypt_cfb64( (mbedtls_blowfish_context *) ctx, operation, length,
-                                 iv_off, iv, input, output );
+    return mbedtls_blowfish_crypt_cfb64((mbedtls_blowfish_context *) ctx, operation, length,
+                                        iv_off, iv, input, output);
 }
 #endif /* MBEDTLS_CIPHER_MODE_CFB */
 
 #if defined(MBEDTLS_CIPHER_MODE_CTR)
-static int blowfish_crypt_ctr_wrap( void *ctx, size_t length, size_t *nc_off,
-        unsigned char *nonce_counter, unsigned char *stream_block,
-        const unsigned char *input, unsigned char *output )
+static int blowfish_crypt_ctr_wrap(void *ctx, size_t length, size_t *nc_off,
+                                   unsigned char *nonce_counter, unsigned char *stream_block,
+                                   const unsigned char *input, unsigned char *output)
 {
-    return mbedtls_blowfish_crypt_ctr( (mbedtls_blowfish_context *) ctx, length, nc_off,
-                               nonce_counter, stream_block, input, output );
+    return mbedtls_blowfish_crypt_ctr((mbedtls_blowfish_context *) ctx, length, nc_off,
+                                      nonce_counter, stream_block, input, output);
 }
 #endif /* MBEDTLS_CIPHER_MODE_CTR */
 
-static int blowfish_setkey_wrap( void *ctx, const unsigned char *key,
-                                 unsigned int key_bitlen )
+static int blowfish_setkey_wrap(void *ctx, const unsigned char *key,
+                                unsigned int key_bitlen)
 {
-    return mbedtls_blowfish_setkey( (mbedtls_blowfish_context *) ctx, key, key_bitlen );
+    return mbedtls_blowfish_setkey((mbedtls_blowfish_context *) ctx, key, key_bitlen);
 }
 
-static void * blowfish_ctx_alloc( void )
+static void *blowfish_ctx_alloc(void)
 {
     mbedtls_blowfish_context *ctx;
-    ctx = mbedtls_calloc( 1, sizeof( mbedtls_blowfish_context ) );
+    ctx = mbedtls_calloc(1, sizeof(mbedtls_blowfish_context));
 
-    if( ctx == NULL )
-        return( NULL );
+    if (ctx == NULL)
+        return (NULL);
 
-    mbedtls_blowfish_init( ctx );
+    mbedtls_blowfish_init(ctx);
 
-    return( ctx );
+    return (ctx);
 }
 
-static void blowfish_ctx_free( void *ctx )
+static void blowfish_ctx_free(void *ctx)
 {
-    mbedtls_blowfish_free( (mbedtls_blowfish_context *) ctx );
-    mbedtls_free( ctx );
+    mbedtls_blowfish_free((mbedtls_blowfish_context *) ctx);
+    mbedtls_free(ctx);
 }
 
 static const mbedtls_cipher_base_t blowfish_info = {
@@ -1820,41 +1819,41 @@ static const mbedtls_cipher_info_t blowfish_ctr_info = {
 #endif /* MBEDTLS_BLOWFISH_C */
 
 #if defined(MBEDTLS_ARC4_C)
-static int arc4_crypt_stream_wrap( void *ctx, size_t length,
-                                   const unsigned char *input,
-                                   unsigned char *output )
+static int arc4_crypt_stream_wrap(void *ctx, size_t length,
+                                  const unsigned char *input,
+                                  unsigned char *output)
 {
-    return( mbedtls_arc4_crypt( (mbedtls_arc4_context *) ctx, length, input, output ) );
+    return (mbedtls_arc4_crypt((mbedtls_arc4_context *) ctx, length, input, output));
 }
 
-static int arc4_setkey_wrap( void *ctx, const unsigned char *key,
-                             unsigned int key_bitlen )
+static int arc4_setkey_wrap(void *ctx, const unsigned char *key,
+                            unsigned int key_bitlen)
 {
     /* we get key_bitlen in bits, arc4 expects it in bytes */
-    if( key_bitlen % 8 != 0 )
-        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+    if (key_bitlen % 8 != 0)
+        return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
 
-    mbedtls_arc4_setup( (mbedtls_arc4_context *) ctx, key, key_bitlen / 8 );
-    return( 0 );
+    mbedtls_arc4_setup((mbedtls_arc4_context *) ctx, key, key_bitlen / 8);
+    return (0);
 }
 
-static void * arc4_ctx_alloc( void )
+static void *arc4_ctx_alloc(void)
 {
     mbedtls_arc4_context *ctx;
-    ctx = mbedtls_calloc( 1, sizeof( mbedtls_arc4_context ) );
+    ctx = mbedtls_calloc(1, sizeof(mbedtls_arc4_context));
 
-    if( ctx == NULL )
-        return( NULL );
+    if (ctx == NULL)
+        return (NULL);
 
-    mbedtls_arc4_init( ctx );
+    mbedtls_arc4_init(ctx);
 
-    return( ctx );
+    return (ctx);
 }
 
-static void arc4_ctx_free( void *ctx )
+static void arc4_ctx_free(void *ctx)
 {
-    mbedtls_arc4_free( (mbedtls_arc4_context *) ctx );
-    mbedtls_free( ctx );
+    mbedtls_arc4_free((mbedtls_arc4_context *) ctx);
+    mbedtls_free(ctx);
 }
 
 static const mbedtls_cipher_base_t arc4_base_info = {
@@ -1898,48 +1897,48 @@ static const mbedtls_cipher_info_t arc4_128_info = {
 
 #if defined(MBEDTLS_CHACHA20_C)
 
-static int chacha20_setkey_wrap( void *ctx, const unsigned char *key,
-                                 unsigned int key_bitlen )
+static int chacha20_setkey_wrap(void *ctx, const unsigned char *key,
+                                unsigned int key_bitlen)
 {
-    if( key_bitlen != 256U )
-        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+    if (key_bitlen != 256U)
+        return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
 
-    if ( 0 != mbedtls_chacha20_setkey( (mbedtls_chacha20_context*)ctx, key ) )
-        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+    if (0 != mbedtls_chacha20_setkey((mbedtls_chacha20_context *)ctx, key))
+        return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
 
-    return( 0 );
+    return (0);
 }
 
-static int chacha20_stream_wrap( void *ctx,  size_t length,
-                                 const unsigned char *input,
-                                 unsigned char *output )
+static int chacha20_stream_wrap(void *ctx,  size_t length,
+                                const unsigned char *input,
+                                unsigned char *output)
 {
     int ret;
 
-    ret = mbedtls_chacha20_update( ctx, length, input, output );
-    if( ret == MBEDTLS_ERR_CHACHA20_BAD_INPUT_DATA )
-        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+    ret = mbedtls_chacha20_update(ctx, length, input, output);
+    if (ret == MBEDTLS_ERR_CHACHA20_BAD_INPUT_DATA)
+        return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
 
-    return( ret );
+    return (ret);
 }
 
-static void * chacha20_ctx_alloc( void )
+static void *chacha20_ctx_alloc(void)
 {
     mbedtls_chacha20_context *ctx;
-    ctx = mbedtls_calloc( 1, sizeof( mbedtls_chacha20_context ) );
+    ctx = mbedtls_calloc(1, sizeof(mbedtls_chacha20_context));
 
-    if( ctx == NULL )
-        return( NULL );
+    if (ctx == NULL)
+        return (NULL);
 
-    mbedtls_chacha20_init( ctx );
+    mbedtls_chacha20_init(ctx);
 
-    return( ctx );
+    return (ctx);
 }
 
-static void chacha20_ctx_free( void *ctx )
+static void chacha20_ctx_free(void *ctx)
 {
-    mbedtls_chacha20_free( (mbedtls_chacha20_context *) ctx );
-    mbedtls_free( ctx );
+    mbedtls_chacha20_free((mbedtls_chacha20_context *) ctx);
+    mbedtls_free(ctx);
 }
 
 static const mbedtls_cipher_base_t chacha20_base_info = {
@@ -1982,36 +1981,36 @@ static const mbedtls_cipher_info_t chacha20_info = {
 
 #if defined(MBEDTLS_CHACHAPOLY_C)
 
-static int chachapoly_setkey_wrap( void *ctx,
-                                   const unsigned char *key,
-                                   unsigned int key_bitlen )
+static int chachapoly_setkey_wrap(void *ctx,
+                                  const unsigned char *key,
+                                  unsigned int key_bitlen)
 {
-    if( key_bitlen != 256U )
-        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+    if (key_bitlen != 256U)
+        return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
 
-    if ( 0 != mbedtls_chachapoly_setkey( (mbedtls_chachapoly_context*)ctx, key ) )
-        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+    if (0 != mbedtls_chachapoly_setkey((mbedtls_chachapoly_context *)ctx, key))
+        return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
 
-    return( 0 );
+    return (0);
 }
 
-static void * chachapoly_ctx_alloc( void )
+static void *chachapoly_ctx_alloc(void)
 {
     mbedtls_chachapoly_context *ctx;
-    ctx = mbedtls_calloc( 1, sizeof( mbedtls_chachapoly_context ) );
+    ctx = mbedtls_calloc(1, sizeof(mbedtls_chachapoly_context));
 
-    if( ctx == NULL )
-        return( NULL );
+    if (ctx == NULL)
+        return (NULL);
 
-    mbedtls_chachapoly_init( ctx );
+    mbedtls_chachapoly_init(ctx);
 
-    return( ctx );
+    return (ctx);
 }
 
-static void chachapoly_ctx_free( void *ctx )
+static void chachapoly_ctx_free(void *ctx)
 {
-    mbedtls_chachapoly_free( (mbedtls_chachapoly_context *) ctx );
-    mbedtls_free( ctx );
+    mbedtls_chachapoly_free((mbedtls_chachapoly_context *) ctx);
+    mbedtls_free(ctx);
 }
 
 static const mbedtls_cipher_base_t chachapoly_base_info = {
@@ -2053,31 +2052,31 @@ static const mbedtls_cipher_info_t chachapoly_info = {
 #endif /* MBEDTLS_CHACHAPOLY_C */
 
 #if defined(MBEDTLS_CIPHER_NULL_CIPHER)
-static int null_crypt_stream( void *ctx, size_t length,
-                              const unsigned char *input,
-                              unsigned char *output )
+static int null_crypt_stream(void *ctx, size_t length,
+                             const unsigned char *input,
+                             unsigned char *output)
 {
     ((void) ctx);
-    memmove( output, input, length );
-    return( 0 );
+    memmove(output, input, length);
+    return (0);
 }
 
-static int null_setkey( void *ctx, const unsigned char *key,
-                        unsigned int key_bitlen )
+static int null_setkey(void *ctx, const unsigned char *key,
+                       unsigned int key_bitlen)
 {
     ((void) ctx);
     ((void) key);
     ((void) key_bitlen);
 
-    return( 0 );
+    return (0);
 }
 
-static void * null_ctx_alloc( void )
+static void *null_ctx_alloc(void)
 {
-    return( (void *) 1 );
+    return ((void *) 1);
 }
 
-static void null_ctx_free( void *ctx )
+static void null_ctx_free(void *ctx)
 {
     ((void) ctx);
 }
@@ -2121,8 +2120,7 @@ static const mbedtls_cipher_info_t null_cipher_info = {
 };
 #endif /* defined(MBEDTLS_CIPHER_NULL_CIPHER) */
 
-const mbedtls_cipher_definition_t mbedtls_cipher_definitions[] =
-{
+const mbedtls_cipher_definition_t mbedtls_cipher_definitions[] = {
 #if defined(MBEDTLS_AES_C)
     { MBEDTLS_CIPHER_AES_128_ECB,          &aes_128_ecb_info },
     { MBEDTLS_CIPHER_AES_192_ECB,          &aes_192_ecb_info },
diff --git a/common/mbedtls/cmac.c b/common/mbedtls/cmac.c
index db4a71d72..c1e603840 100644
--- a/common/mbedtls/cmac.c
+++ b/common/mbedtls/cmac.c
@@ -82,9 +82,9 @@
  * Input and output MUST NOT point to the same buffer
  * Block size must be 8 bytes or 16 bytes - the block sizes for DES and AES.
  */
-static int cmac_multiply_by_u( unsigned char *output,
-                               const unsigned char *input,
-                               size_t blocksize )
+static int cmac_multiply_by_u(unsigned char *output,
+                              const unsigned char *input,
+                              size_t blocksize)
 {
     const unsigned char R_128 = 0x87;
     const unsigned char R_64 = 0x1B;
@@ -92,21 +92,15 @@ static int cmac_multiply_by_u( unsigned char *output,
     unsigned char overflow = 0x00;
     int i;
 
-    if( blocksize == MBEDTLS_AES_BLOCK_SIZE )
-    {
+    if (blocksize == MBEDTLS_AES_BLOCK_SIZE) {
         R_n = R_128;
-    }
-    else if( blocksize == MBEDTLS_DES3_BLOCK_SIZE )
-    {
+    } else if (blocksize == MBEDTLS_DES3_BLOCK_SIZE) {
         R_n = R_64;
-    }
-    else
-    {
-        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+    } else {
+        return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
     }
 
-    for( i = (int)blocksize - 1; i >= 0; i-- )
-    {
+    for (i = (int)blocksize - 1; i >= 0; i--) {
         output[i] = input[i] << 1 | overflow;
         overflow = input[i] >> 7;
     }
@@ -120,14 +114,14 @@ static int cmac_multiply_by_u( unsigned char *output,
 #pragma warning( push )
 #pragma warning( disable : 4146 )
 #endif
-    mask = - ( input[0] >> 7 );
+    mask = - (input[0] >> 7);
 #if defined(_MSC_VER)
 #pragma warning( pop )
 #endif
 
     output[ blocksize - 1 ] ^= R_n & mask;
 
-    return( 0 );
+    return (0);
 }
 
 /*
@@ -135,45 +129,45 @@ static int cmac_multiply_by_u( unsigned char *output,
  *
  * - as specified by RFC 4493, section 2.3 Subkey Generation Algorithm
  */
-static int cmac_generate_subkeys( mbedtls_cipher_context_t *ctx,
-                                  unsigned char* K1, unsigned char* K2 )
+static int cmac_generate_subkeys(mbedtls_cipher_context_t *ctx,
+                                 unsigned char *K1, unsigned char *K2)
 {
     int ret;
     unsigned char L[MBEDTLS_CIPHER_BLKSIZE_MAX];
     size_t olen, block_size;
 
-    mbedtls_platform_zeroize( L, sizeof( L ) );
+    mbedtls_platform_zeroize(L, sizeof(L));
 
     block_size = ctx->cipher_info->block_size;
 
     /* Calculate Ek(0) */
-    if( ( ret = mbedtls_cipher_update( ctx, L, block_size, L, &olen ) ) != 0 )
+    if ((ret = mbedtls_cipher_update(ctx, L, block_size, L, &olen)) != 0)
         goto exit;
 
     /*
      * Generate K1 and K2
      */
-    if( ( ret = cmac_multiply_by_u( K1, L , block_size ) ) != 0 )
+    if ((ret = cmac_multiply_by_u(K1, L, block_size)) != 0)
         goto exit;
 
-    if( ( ret = cmac_multiply_by_u( K2, K1 , block_size ) ) != 0 )
+    if ((ret = cmac_multiply_by_u(K2, K1, block_size)) != 0)
         goto exit;
 
 exit:
-    mbedtls_platform_zeroize( L, sizeof( L ) );
+    mbedtls_platform_zeroize(L, sizeof(L));
 
-    return( ret );
+    return (ret);
 }
 #endif /* !defined(MBEDTLS_CMAC_ALT) || defined(MBEDTLS_SELF_TEST) */
 
 #if !defined(MBEDTLS_CMAC_ALT)
-static void cmac_xor_block( unsigned char *output, const unsigned char *input1,
-                            const unsigned char *input2,
-                            const size_t block_size )
+static void cmac_xor_block(unsigned char *output, const unsigned char *input1,
+                           const unsigned char *input2,
+                           const size_t block_size)
 {
     size_t idx;
 
-    for( idx = 0; idx < block_size; idx++ )
+    for (idx = 0; idx < block_size; idx++)
         output[ idx ] = input1[ idx ] ^ input2[ idx ];
 }
 
@@ -183,75 +177,73 @@ static void cmac_xor_block( unsigned char *output, const unsigned char *input1,
  * We can't use the padding option from the cipher layer, as it only works for
  * CBC and we use ECB mode, and anyway we need to XOR K1 or K2 in addition.
  */
-static void cmac_pad( unsigned char padded_block[MBEDTLS_CIPHER_BLKSIZE_MAX],
-                      size_t padded_block_len,
-                      const unsigned char *last_block,
-                      size_t last_block_len )
+static void cmac_pad(unsigned char padded_block[MBEDTLS_CIPHER_BLKSIZE_MAX],
+                     size_t padded_block_len,
+                     const unsigned char *last_block,
+                     size_t last_block_len)
 {
     size_t j;
 
-    for( j = 0; j < padded_block_len; j++ )
-    {
-        if( j < last_block_len )
+    for (j = 0; j < padded_block_len; j++) {
+        if (j < last_block_len)
             padded_block[j] = last_block[j];
-        else if( j == last_block_len )
+        else if (j == last_block_len)
             padded_block[j] = 0x80;
         else
             padded_block[j] = 0x00;
     }
 }
 
-int mbedtls_cipher_cmac_starts( mbedtls_cipher_context_t *ctx,
-                                const unsigned char *key, size_t keybits )
+int mbedtls_cipher_cmac_starts(mbedtls_cipher_context_t *ctx,
+                               const unsigned char *key, size_t keybits)
 {
     mbedtls_cipher_type_t type;
     mbedtls_cmac_context_t *cmac_ctx;
     int retval;
 
-    if( ctx == NULL || ctx->cipher_info == NULL || key == NULL )
-        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+    if (ctx == NULL || ctx->cipher_info == NULL || key == NULL)
+        return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
 
-    if( ( retval = mbedtls_cipher_setkey( ctx, key, (int)keybits,
-                                          MBEDTLS_ENCRYPT ) ) != 0 )
-        return( retval );
+    if ((retval = mbedtls_cipher_setkey(ctx, key, (int)keybits,
+                                        MBEDTLS_ENCRYPT)) != 0)
+        return (retval);
 
     type = ctx->cipher_info->type;
 
-    switch( type )
-    {
+    switch (type) {
         case MBEDTLS_CIPHER_AES_128_ECB:
         case MBEDTLS_CIPHER_AES_192_ECB:
         case MBEDTLS_CIPHER_AES_256_ECB:
         case MBEDTLS_CIPHER_DES_EDE3_ECB:
             break;
         default:
-            return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+            return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
     }
 
     /* Allocated and initialise in the cipher context memory for the CMAC
      * context */
-    cmac_ctx = mbedtls_calloc( 1, sizeof( mbedtls_cmac_context_t ) );
-    if( cmac_ctx == NULL )
-        return( MBEDTLS_ERR_CIPHER_ALLOC_FAILED );
+    cmac_ctx = mbedtls_calloc(1, sizeof(mbedtls_cmac_context_t));
+    if (cmac_ctx == NULL)
+        return (MBEDTLS_ERR_CIPHER_ALLOC_FAILED);
 
     ctx->cmac_ctx = cmac_ctx;
 
-    mbedtls_platform_zeroize( cmac_ctx->state, sizeof( cmac_ctx->state ) );
+    mbedtls_platform_zeroize(cmac_ctx->state, sizeof(cmac_ctx->state));
 
     return 0;
 }
 
-int mbedtls_cipher_cmac_update( mbedtls_cipher_context_t *ctx,
-                                const unsigned char *input, size_t ilen )
+int mbedtls_cipher_cmac_update(mbedtls_cipher_context_t *ctx,
+                               const unsigned char *input, size_t ilen)
 {
-    mbedtls_cmac_context_t* cmac_ctx;
+    mbedtls_cmac_context_t *cmac_ctx;
     unsigned char *state;
     int ret = 0;
     size_t n, j, olen, block_size;
 
-    if( ctx == NULL || ctx->cipher_info == NULL || input == NULL ||
-        ctx->cmac_ctx == NULL )
-        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+    if (ctx == NULL || ctx->cipher_info == NULL || input == NULL ||
+        ctx->cmac_ctx == NULL)
+        return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
 
     cmac_ctx = ctx->cmac_ctx;
     block_size = ctx->cipher_info->block_size;
@@ -259,19 +251,17 @@ int mbedtls_cipher_cmac_update( mbedtls_cipher_context_t *ctx,
 
     /* Is there data still to process from the last call, that's greater in
      * size than a block? */
-    if( cmac_ctx->unprocessed_len > 0 &&
-        ilen > block_size - cmac_ctx->unprocessed_len )
-    {
-        memcpy( &cmac_ctx->unprocessed_block[cmac_ctx->unprocessed_len],
-                input,
-                block_size - cmac_ctx->unprocessed_len );
+    if (cmac_ctx->unprocessed_len > 0 &&
+        ilen > block_size - cmac_ctx->unprocessed_len) {
+        memcpy(&cmac_ctx->unprocessed_block[cmac_ctx->unprocessed_len],
+               input,
+               block_size - cmac_ctx->unprocessed_len);
 
-        cmac_xor_block( state, cmac_ctx->unprocessed_block, state, block_size );
+        cmac_xor_block(state, cmac_ctx->unprocessed_block, state, block_size);
 
-        if( ( ret = mbedtls_cipher_update( ctx, state, block_size, state,
-                                           &olen ) ) != 0 )
-        {
-           goto exit;
+        if ((ret = mbedtls_cipher_update(ctx, state, block_size, state,
+                                         &olen)) != 0) {
+            goto exit;
         }
 
         input += block_size - cmac_ctx->unprocessed_len;
@@ -280,39 +270,37 @@ int mbedtls_cipher_cmac_update( mbedtls_cipher_context_t *ctx,
     }
 
     /* n is the number of blocks including any final partial block */
-    n = ( ilen + block_size - 1 ) / block_size;
+    n = (ilen + block_size - 1) / block_size;
 
     /* Iterate across the input data in block sized chunks, excluding any
      * final partial or complete block */
-    for( j = 1; j < n; j++ )
-    {
-        cmac_xor_block( state, input, state, block_size );
+    for (j = 1; j < n; j++) {
+        cmac_xor_block(state, input, state, block_size);
 
-        if( ( ret = mbedtls_cipher_update( ctx, state, block_size, state,
-                                           &olen ) ) != 0 )
-           goto exit;
+        if ((ret = mbedtls_cipher_update(ctx, state, block_size, state,
+                                         &olen)) != 0)
+            goto exit;
 
         ilen -= block_size;
         input += block_size;
     }
 
     /* If there is data left over that wasn't aligned to a block */
-    if( ilen > 0 )
-    {
-        memcpy( &cmac_ctx->unprocessed_block[cmac_ctx->unprocessed_len],
-                input,
-                ilen );
+    if (ilen > 0) {
+        memcpy(&cmac_ctx->unprocessed_block[cmac_ctx->unprocessed_len],
+               input,
+               ilen);
         cmac_ctx->unprocessed_len += ilen;
     }
 
 exit:
-    return( ret );
+    return (ret);
 }
 
-int mbedtls_cipher_cmac_finish( mbedtls_cipher_context_t *ctx,
-                                unsigned char *output )
+int mbedtls_cipher_cmac_finish(mbedtls_cipher_context_t *ctx,
+                               unsigned char *output)
 {
-    mbedtls_cmac_context_t* cmac_ctx;
+    mbedtls_cmac_context_t *cmac_ctx;
     unsigned char *state, *last_block;
     unsigned char K1[MBEDTLS_CIPHER_BLKSIZE_MAX];
     unsigned char K2[MBEDTLS_CIPHER_BLKSIZE_MAX];
@@ -320,153 +308,145 @@ int mbedtls_cipher_cmac_finish( mbedtls_cipher_context_t *ctx,
     int ret;
     size_t olen, block_size;
 
-    if( ctx == NULL || ctx->cipher_info == NULL || ctx->cmac_ctx == NULL ||
-        output == NULL )
-        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+    if (ctx == NULL || ctx->cipher_info == NULL || ctx->cmac_ctx == NULL ||
+        output == NULL)
+        return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
 
     cmac_ctx = ctx->cmac_ctx;
     block_size = ctx->cipher_info->block_size;
     state = cmac_ctx->state;
 
-    mbedtls_platform_zeroize( K1, sizeof( K1 ) );
-    mbedtls_platform_zeroize( K2, sizeof( K2 ) );
-    cmac_generate_subkeys( ctx, K1, K2 );
+    mbedtls_platform_zeroize(K1, sizeof(K1));
+    mbedtls_platform_zeroize(K2, sizeof(K2));
+    cmac_generate_subkeys(ctx, K1, K2);
 
     last_block = cmac_ctx->unprocessed_block;
 
     /* Calculate last block */
-    if( cmac_ctx->unprocessed_len < block_size )
-    {
-        cmac_pad( M_last, block_size, last_block, cmac_ctx->unprocessed_len );
-        cmac_xor_block( M_last, M_last, K2, block_size );
-    }
-    else
-    {
+    if (cmac_ctx->unprocessed_len < block_size) {
+        cmac_pad(M_last, block_size, last_block, cmac_ctx->unprocessed_len);
+        cmac_xor_block(M_last, M_last, K2, block_size);
+    } else {
         /* Last block is complete block */
-        cmac_xor_block( M_last, last_block, K1, block_size );
+        cmac_xor_block(M_last, last_block, K1, block_size);
     }
 
 
-    cmac_xor_block( state, M_last, state, block_size );
-    if( ( ret = mbedtls_cipher_update( ctx, state, block_size, state,
-                                       &olen ) ) != 0 )
-    {
+    cmac_xor_block(state, M_last, state, block_size);
+    if ((ret = mbedtls_cipher_update(ctx, state, block_size, state,
+                                     &olen)) != 0) {
         goto exit;
     }
 
-    memcpy( output, state, block_size );
+    memcpy(output, state, block_size);
 
 exit:
     /* Wipe the generated keys on the stack, and any other transients to avoid
      * side channel leakage */
-    mbedtls_platform_zeroize( K1, sizeof( K1 ) );
-    mbedtls_platform_zeroize( K2, sizeof( K2 ) );
+    mbedtls_platform_zeroize(K1, sizeof(K1));
+    mbedtls_platform_zeroize(K2, sizeof(K2));
 
     cmac_ctx->unprocessed_len = 0;
-    mbedtls_platform_zeroize( cmac_ctx->unprocessed_block,
-                              sizeof( cmac_ctx->unprocessed_block ) );
+    mbedtls_platform_zeroize(cmac_ctx->unprocessed_block,
+                             sizeof(cmac_ctx->unprocessed_block));
 
-    mbedtls_platform_zeroize( state, MBEDTLS_CIPHER_BLKSIZE_MAX );
-    return( ret );
+    mbedtls_platform_zeroize(state, MBEDTLS_CIPHER_BLKSIZE_MAX);
+    return (ret);
 }
 
-int mbedtls_cipher_cmac_reset( mbedtls_cipher_context_t *ctx )
+int mbedtls_cipher_cmac_reset(mbedtls_cipher_context_t *ctx)
 {
-    mbedtls_cmac_context_t* cmac_ctx;
+    mbedtls_cmac_context_t *cmac_ctx;
 
-    if( ctx == NULL || ctx->cipher_info == NULL || ctx->cmac_ctx == NULL )
-        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+    if (ctx == NULL || ctx->cipher_info == NULL || ctx->cmac_ctx == NULL)
+        return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
 
     cmac_ctx = ctx->cmac_ctx;
 
     /* Reset the internal state */
     cmac_ctx->unprocessed_len = 0;
-    mbedtls_platform_zeroize( cmac_ctx->unprocessed_block,
-                              sizeof( cmac_ctx->unprocessed_block ) );
-    mbedtls_platform_zeroize( cmac_ctx->state,
-                              sizeof( cmac_ctx->state ) );
+    mbedtls_platform_zeroize(cmac_ctx->unprocessed_block,
+                             sizeof(cmac_ctx->unprocessed_block));
+    mbedtls_platform_zeroize(cmac_ctx->state,
+                             sizeof(cmac_ctx->state));
 
-    return( 0 );
+    return (0);
 }
 
-int mbedtls_cipher_cmac( const mbedtls_cipher_info_t *cipher_info,
-                         const unsigned char *key, size_t keylen,
-                         const unsigned char *input, size_t ilen,
-                         unsigned char *output )
+int mbedtls_cipher_cmac(const mbedtls_cipher_info_t *cipher_info,
+                        const unsigned char *key, size_t keylen,
+                        const unsigned char *input, size_t ilen,
+                        unsigned char *output)
 {
     mbedtls_cipher_context_t ctx;
     int ret;
 
-    if( cipher_info == NULL || key == NULL || input == NULL || output == NULL )
-        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+    if (cipher_info == NULL || key == NULL || input == NULL || output == NULL)
+        return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
 
-    mbedtls_cipher_init( &ctx );
+    mbedtls_cipher_init(&ctx);
 
-    if( ( ret = mbedtls_cipher_setup( &ctx, cipher_info ) ) != 0 )
+    if ((ret = mbedtls_cipher_setup(&ctx, cipher_info)) != 0)
         goto exit;
 
-    ret = mbedtls_cipher_cmac_starts( &ctx, key, keylen );
-    if( ret != 0 )
+    ret = mbedtls_cipher_cmac_starts(&ctx, key, keylen);
+    if (ret != 0)
         goto exit;
 
-    ret = mbedtls_cipher_cmac_update( &ctx, input, ilen );
-    if( ret != 0 )
+    ret = mbedtls_cipher_cmac_update(&ctx, input, ilen);
+    if (ret != 0)
         goto exit;
 
-    ret = mbedtls_cipher_cmac_finish( &ctx, output );
+    ret = mbedtls_cipher_cmac_finish(&ctx, output);
 
 exit:
-    mbedtls_cipher_free( &ctx );
+    mbedtls_cipher_free(&ctx);
 
-    return( ret );
+    return (ret);
 }
 
 #if defined(MBEDTLS_AES_C)
 /*
  * Implementation of AES-CMAC-PRF-128 defined in RFC 4615
  */
-int mbedtls_aes_cmac_prf_128( const unsigned char *key, size_t key_length,
-                              const unsigned char *input, size_t in_len,
-                              unsigned char *output )
+int mbedtls_aes_cmac_prf_128(const unsigned char *key, size_t key_length,
+                             const unsigned char *input, size_t in_len,
+                             unsigned char *output)
 {
     int ret;
     const mbedtls_cipher_info_t *cipher_info;
     unsigned char zero_key[MBEDTLS_AES_BLOCK_SIZE];
     unsigned char int_key[MBEDTLS_AES_BLOCK_SIZE];
 
-    if( key == NULL || input == NULL || output == NULL )
-        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+    if (key == NULL || input == NULL || output == NULL)
+        return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
 
-    cipher_info = mbedtls_cipher_info_from_type( MBEDTLS_CIPHER_AES_128_ECB );
-    if( cipher_info == NULL )
-    {
+    cipher_info = mbedtls_cipher_info_from_type(MBEDTLS_CIPHER_AES_128_ECB);
+    if (cipher_info == NULL) {
         /* Failing at this point must be due to a build issue */
         ret = MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE;
         goto exit;
     }
 
-    if( key_length == MBEDTLS_AES_BLOCK_SIZE )
-    {
+    if (key_length == MBEDTLS_AES_BLOCK_SIZE) {
         /* Use key as is */
-        memcpy( int_key, key, MBEDTLS_AES_BLOCK_SIZE );
-    }
-    else
-    {
-        memset( zero_key, 0, MBEDTLS_AES_BLOCK_SIZE );
+        memcpy(int_key, key, MBEDTLS_AES_BLOCK_SIZE);
+    } else {
+        memset(zero_key, 0, MBEDTLS_AES_BLOCK_SIZE);
 
-        ret = mbedtls_cipher_cmac( cipher_info, zero_key, 128, key,
-                                   key_length, int_key );
-        if( ret != 0 )
+        ret = mbedtls_cipher_cmac(cipher_info, zero_key, 128, key,
+                                  key_length, int_key);
+        if (ret != 0)
             goto exit;
     }
 
-    ret = mbedtls_cipher_cmac( cipher_info, int_key, 128, input, in_len,
-                               output );
+    ret = mbedtls_cipher_cmac(cipher_info, int_key, 128, input, in_len,
+                              output);
 
 exit:
-    mbedtls_platform_zeroize( int_key, sizeof( int_key ) );
+    mbedtls_platform_zeroize(int_key, sizeof(int_key));
 
-    return( ret );
+    return (ret);
 }
 #endif /* MBEDTLS_AES_C */
 
@@ -760,14 +740,14 @@ static const unsigned char PRFT[NB_PRF_TESTS][16] = {
 };
 #endif /* MBEDTLS_AES_C */
 
-static int cmac_test_subkeys( int verbose,
-                              const char* testname,
-                              const unsigned char* key,
-                              int keybits,
-                              const unsigned char* subkeys,
-                              mbedtls_cipher_type_t cipher_type,
-                              int block_size,
-                              int num_tests )
+static int cmac_test_subkeys(int verbose,
+                             const char *testname,
+                             const unsigned char *key,
+                             int keybits,
+                             const unsigned char *subkeys,
+                             mbedtls_cipher_type_t cipher_type,
+                             int block_size,
+                             int num_tests)
 {
     int i, ret = 0;
     mbedtls_cipher_context_t ctx;
@@ -775,304 +755,280 @@ static int cmac_test_subkeys( int verbose,
     unsigned char K1[MBEDTLS_CIPHER_BLKSIZE_MAX];
     unsigned char K2[MBEDTLS_CIPHER_BLKSIZE_MAX];
 
-    cipher_info = mbedtls_cipher_info_from_type( cipher_type );
-    if( cipher_info == NULL )
-    {
+    cipher_info = mbedtls_cipher_info_from_type(cipher_type);
+    if (cipher_info == NULL) {
         /* Failing at this point must be due to a build issue */
-        return( MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE );
+        return (MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE);
     }
 
-    for( i = 0; i < num_tests; i++ )
-    {
-        if( verbose != 0 )
-            mbedtls_printf( "  %s CMAC subkey #%u: ", testname, i + 1 );
+    for (i = 0; i < num_tests; i++) {
+        if (verbose != 0)
+            mbedtls_printf("  %s CMAC subkey #%u: ", testname, i + 1);
 
-        mbedtls_cipher_init( &ctx );
+        mbedtls_cipher_init(&ctx);
 
-        if( ( ret = mbedtls_cipher_setup( &ctx, cipher_info ) ) != 0 )
-        {
-            if( verbose != 0 )
-                mbedtls_printf( "test execution failed\n" );
+        if ((ret = mbedtls_cipher_setup(&ctx, cipher_info)) != 0) {
+            if (verbose != 0)
+                mbedtls_printf("test execution failed\n");
 
             goto cleanup;
         }
 
-        if( ( ret = mbedtls_cipher_setkey( &ctx, key, keybits,
-                                       MBEDTLS_ENCRYPT ) ) != 0 )
-        {
-            if( verbose != 0 )
-                mbedtls_printf( "test execution failed\n" );
+        if ((ret = mbedtls_cipher_setkey(&ctx, key, keybits,
+                                         MBEDTLS_ENCRYPT)) != 0) {
+            if (verbose != 0)
+                mbedtls_printf("test execution failed\n");
 
             goto cleanup;
         }
 
-        ret = cmac_generate_subkeys( &ctx, K1, K2 );
-        if( ret != 0 )
-        {
-           if( verbose != 0 )
-                mbedtls_printf( "failed\n" );
+        ret = cmac_generate_subkeys(&ctx, K1, K2);
+        if (ret != 0) {
+            if (verbose != 0)
+                mbedtls_printf("failed\n");
 
             goto cleanup;
         }
 
-        if( ( ret = memcmp( K1, subkeys, block_size ) ) != 0  ||
-            ( ret = memcmp( K2, &subkeys[block_size], block_size ) ) != 0 )
-        {
-            if( verbose != 0 )
-                mbedtls_printf( "failed\n" );
+        if ((ret = memcmp(K1, subkeys, block_size)) != 0  ||
+            (ret = memcmp(K2, &subkeys[block_size], block_size)) != 0) {
+            if (verbose != 0)
+                mbedtls_printf("failed\n");
 
             goto cleanup;
         }
 
-        if( verbose != 0 )
-            mbedtls_printf( "passed\n" );
+        if (verbose != 0)
+            mbedtls_printf("passed\n");
 
-        mbedtls_cipher_free( &ctx );
+        mbedtls_cipher_free(&ctx);
     }
 
     ret = 0;
     goto exit;
 
 cleanup:
-    mbedtls_cipher_free( &ctx );
+    mbedtls_cipher_free(&ctx);
 
 exit:
-    return( ret );
+    return (ret);
 }
 
-static int cmac_test_wth_cipher( int verbose,
-                                 const char* testname,
-                                 const unsigned char* key,
-                                 int keybits,
-                                 const unsigned char* messages,
-                                 const unsigned int message_lengths[4],
-                                 const unsigned char* expected_result,
-                                 mbedtls_cipher_type_t cipher_type,
-                                 int block_size,
-                                 int num_tests )
+static int cmac_test_wth_cipher(int verbose,
+                                const char *testname,
+                                const unsigned char *key,
+                                int keybits,
+                                const unsigned char *messages,
+                                const unsigned int message_lengths[4],
+                                const unsigned char *expected_result,
+                                mbedtls_cipher_type_t cipher_type,
+                                int block_size,
+                                int num_tests)
 {
     const mbedtls_cipher_info_t *cipher_info;
     int i, ret = 0;
     unsigned char output[MBEDTLS_CIPHER_BLKSIZE_MAX];
 
-    cipher_info = mbedtls_cipher_info_from_type( cipher_type );
-    if( cipher_info == NULL )
-    {
+    cipher_info = mbedtls_cipher_info_from_type(cipher_type);
+    if (cipher_info == NULL) {
         /* Failing at this point must be due to a build issue */
         ret = MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE;
         goto exit;
     }
 
-    for( i = 0; i < num_tests; i++ )
-    {
-        if( verbose != 0 )
-            mbedtls_printf( "  %s CMAC #%u: ", testname, i + 1 );
+    for (i = 0; i < num_tests; i++) {
+        if (verbose != 0)
+            mbedtls_printf("  %s CMAC #%u: ", testname, i + 1);
 
-        if( ( ret = mbedtls_cipher_cmac( cipher_info, key, keybits, messages,
-                                         message_lengths[i], output ) ) != 0 )
-        {
-            if( verbose != 0 )
-                mbedtls_printf( "failed\n" );
+        if ((ret = mbedtls_cipher_cmac(cipher_info, key, keybits, messages,
+                                       message_lengths[i], output)) != 0) {
+            if (verbose != 0)
+                mbedtls_printf("failed\n");
             goto exit;
         }
 
-        if( ( ret = memcmp( output, &expected_result[i * block_size], block_size ) ) != 0 )
-        {
-            if( verbose != 0 )
-                mbedtls_printf( "failed\n" );
+        if ((ret = memcmp(output, &expected_result[i * block_size], block_size)) != 0) {
+            if (verbose != 0)
+                mbedtls_printf("failed\n");
             goto exit;
         }
 
-        if( verbose != 0 )
-            mbedtls_printf( "passed\n" );
+        if (verbose != 0)
+            mbedtls_printf("passed\n");
     }
     ret = 0;
 
 exit:
-    return( ret );
+    return (ret);
 }
 
 #if defined(MBEDTLS_AES_C)
-static int test_aes128_cmac_prf( int verbose )
+static int test_aes128_cmac_prf(int verbose)
 {
     int i;
     int ret;
     unsigned char output[MBEDTLS_AES_BLOCK_SIZE];
 
-    for( i = 0; i < NB_PRF_TESTS; i++ )
-    {
-        mbedtls_printf( "  AES CMAC 128 PRF #%u: ", i );
-        ret = mbedtls_aes_cmac_prf_128( PRFK, PRFKlen[i], PRFM, 20, output );
-        if( ret != 0 ||
-            memcmp( output, PRFT[i], MBEDTLS_AES_BLOCK_SIZE ) != 0 )
-        {
+    for (i = 0; i < NB_PRF_TESTS; i++) {
+        mbedtls_printf("  AES CMAC 128 PRF #%u: ", i);
+        ret = mbedtls_aes_cmac_prf_128(PRFK, PRFKlen[i], PRFM, 20, output);
+        if (ret != 0 ||
+            memcmp(output, PRFT[i], MBEDTLS_AES_BLOCK_SIZE) != 0) {
 
-            if( verbose != 0 )
-                mbedtls_printf( "failed\n" );
+            if (verbose != 0)
+                mbedtls_printf("failed\n");
 
-            return( ret );
-        }
-        else if( verbose != 0 )
-        {
-            mbedtls_printf( "passed\n" );
+            return (ret);
+        } else if (verbose != 0) {
+            mbedtls_printf("passed\n");
         }
     }
-    return( ret );
+    return (ret);
 }
 #endif /* MBEDTLS_AES_C */
 
-int mbedtls_cmac_self_test( int verbose )
+int mbedtls_cmac_self_test(int verbose)
 {
     int ret;
 
 #if defined(MBEDTLS_AES_C)
     /* AES-128 */
-    if( ( ret = cmac_test_subkeys( verbose,
-                                   "AES 128",
-                                   aes_128_key,
-                                   128,
-                                   (const unsigned char*)aes_128_subkeys,
-                                   MBEDTLS_CIPHER_AES_128_ECB,
-                                   MBEDTLS_AES_BLOCK_SIZE,
-                                   NB_CMAC_TESTS_PER_KEY ) ) != 0 )
-    {
-        return( ret );
+    if ((ret = cmac_test_subkeys(verbose,
+                                 "AES 128",
+                                 aes_128_key,
+                                 128,
+                                 (const unsigned char *)aes_128_subkeys,
+                                 MBEDTLS_CIPHER_AES_128_ECB,
+                                 MBEDTLS_AES_BLOCK_SIZE,
+                                 NB_CMAC_TESTS_PER_KEY)) != 0) {
+        return (ret);
     }
 
-    if( ( ret = cmac_test_wth_cipher( verbose,
-                                      "AES 128",
-                                      aes_128_key,
-                                      128,
-                                      test_message,
-                                      aes_message_lengths,
-                                      (const unsigned char*)aes_128_expected_result,
-                                      MBEDTLS_CIPHER_AES_128_ECB,
-                                      MBEDTLS_AES_BLOCK_SIZE,
-                                      NB_CMAC_TESTS_PER_KEY ) ) != 0 )
-    {
-        return( ret );
+    if ((ret = cmac_test_wth_cipher(verbose,
+                                    "AES 128",
+                                    aes_128_key,
+                                    128,
+                                    test_message,
+                                    aes_message_lengths,
+                                    (const unsigned char *)aes_128_expected_result,
+                                    MBEDTLS_CIPHER_AES_128_ECB,
+                                    MBEDTLS_AES_BLOCK_SIZE,
+                                    NB_CMAC_TESTS_PER_KEY)) != 0) {
+        return (ret);
     }
 
     /* AES-192 */
-    if( ( ret = cmac_test_subkeys( verbose,
-                                   "AES 192",
-                                   aes_192_key,
-                                   192,
-                                   (const unsigned char*)aes_192_subkeys,
-                                   MBEDTLS_CIPHER_AES_192_ECB,
-                                   MBEDTLS_AES_BLOCK_SIZE,
-                                   NB_CMAC_TESTS_PER_KEY ) ) != 0 )
-    {
-        return( ret );
+    if ((ret = cmac_test_subkeys(verbose,
+                                 "AES 192",
+                                 aes_192_key,
+                                 192,
+                                 (const unsigned char *)aes_192_subkeys,
+                                 MBEDTLS_CIPHER_AES_192_ECB,
+                                 MBEDTLS_AES_BLOCK_SIZE,
+                                 NB_CMAC_TESTS_PER_KEY)) != 0) {
+        return (ret);
     }
 
-    if( ( ret = cmac_test_wth_cipher( verbose,
-                                      "AES 192",
-                                      aes_192_key,
-                                      192,
-                                      test_message,
-                                      aes_message_lengths,
-                                      (const unsigned char*)aes_192_expected_result,
-                                      MBEDTLS_CIPHER_AES_192_ECB,
-                                      MBEDTLS_AES_BLOCK_SIZE,
-                                      NB_CMAC_TESTS_PER_KEY ) ) != 0 )
-    {
-        return( ret );
+    if ((ret = cmac_test_wth_cipher(verbose,
+                                    "AES 192",
+                                    aes_192_key,
+                                    192,
+                                    test_message,
+                                    aes_message_lengths,
+                                    (const unsigned char *)aes_192_expected_result,
+                                    MBEDTLS_CIPHER_AES_192_ECB,
+                                    MBEDTLS_AES_BLOCK_SIZE,
+                                    NB_CMAC_TESTS_PER_KEY)) != 0) {
+        return (ret);
     }
 
     /* AES-256 */
-    if( ( ret = cmac_test_subkeys( verbose,
-                                   "AES 256",
-                                   aes_256_key,
-                                   256,
-                                   (const unsigned char*)aes_256_subkeys,
-                                   MBEDTLS_CIPHER_AES_256_ECB,
-                                   MBEDTLS_AES_BLOCK_SIZE,
-                                   NB_CMAC_TESTS_PER_KEY ) ) != 0 )
-    {
-        return( ret );
+    if ((ret = cmac_test_subkeys(verbose,
+                                 "AES 256",
+                                 aes_256_key,
+                                 256,
+                                 (const unsigned char *)aes_256_subkeys,
+                                 MBEDTLS_CIPHER_AES_256_ECB,
+                                 MBEDTLS_AES_BLOCK_SIZE,
+                                 NB_CMAC_TESTS_PER_KEY)) != 0) {
+        return (ret);
     }
 
-    if( ( ret = cmac_test_wth_cipher ( verbose,
-                                       "AES 256",
-                                       aes_256_key,
-                                       256,
-                                       test_message,
-                                       aes_message_lengths,
-                                       (const unsigned char*)aes_256_expected_result,
-                                       MBEDTLS_CIPHER_AES_256_ECB,
-                                       MBEDTLS_AES_BLOCK_SIZE,
-                                       NB_CMAC_TESTS_PER_KEY ) ) != 0 )
-    {
-        return( ret );
+    if ((ret = cmac_test_wth_cipher(verbose,
+                                    "AES 256",
+                                    aes_256_key,
+                                    256,
+                                    test_message,
+                                    aes_message_lengths,
+                                    (const unsigned char *)aes_256_expected_result,
+                                    MBEDTLS_CIPHER_AES_256_ECB,
+                                    MBEDTLS_AES_BLOCK_SIZE,
+                                    NB_CMAC_TESTS_PER_KEY)) != 0) {
+        return (ret);
     }
 #endif /* MBEDTLS_AES_C */
 
 #if defined(MBEDTLS_DES_C)
     /* 3DES 2 key */
-    if( ( ret = cmac_test_subkeys( verbose,
-                                   "3DES 2 key",
-                                   des3_2key_key,
-                                   192,
-                                   (const unsigned char*)des3_2key_subkeys,
-                                   MBEDTLS_CIPHER_DES_EDE3_ECB,
-                                   MBEDTLS_DES3_BLOCK_SIZE,
-                                   NB_CMAC_TESTS_PER_KEY ) ) != 0 )
-    {
-        return( ret );
+    if ((ret = cmac_test_subkeys(verbose,
+                                 "3DES 2 key",
+                                 des3_2key_key,
+                                 192,
+                                 (const unsigned char *)des3_2key_subkeys,
+                                 MBEDTLS_CIPHER_DES_EDE3_ECB,
+                                 MBEDTLS_DES3_BLOCK_SIZE,
+                                 NB_CMAC_TESTS_PER_KEY)) != 0) {
+        return (ret);
     }
 
-    if( ( ret = cmac_test_wth_cipher( verbose,
-                                      "3DES 2 key",
-                                      des3_2key_key,
-                                      192,
-                                      test_message,
-                                      des3_message_lengths,
-                                      (const unsigned char*)des3_2key_expected_result,
-                                      MBEDTLS_CIPHER_DES_EDE3_ECB,
-                                      MBEDTLS_DES3_BLOCK_SIZE,
-                                      NB_CMAC_TESTS_PER_KEY ) ) != 0 )
-    {
-        return( ret );
+    if ((ret = cmac_test_wth_cipher(verbose,
+                                    "3DES 2 key",
+                                    des3_2key_key,
+                                    192,
+                                    test_message,
+                                    des3_message_lengths,
+                                    (const unsigned char *)des3_2key_expected_result,
+                                    MBEDTLS_CIPHER_DES_EDE3_ECB,
+                                    MBEDTLS_DES3_BLOCK_SIZE,
+                                    NB_CMAC_TESTS_PER_KEY)) != 0) {
+        return (ret);
     }
 
     /* 3DES 3 key */
-    if( ( ret = cmac_test_subkeys( verbose,
-                                   "3DES 3 key",
-                                   des3_3key_key,
-                                   192,
-                                   (const unsigned char*)des3_3key_subkeys,
-                                   MBEDTLS_CIPHER_DES_EDE3_ECB,
-                                   MBEDTLS_DES3_BLOCK_SIZE,
-                                   NB_CMAC_TESTS_PER_KEY ) ) != 0 )
-    {
-        return( ret );
+    if ((ret = cmac_test_subkeys(verbose,
+                                 "3DES 3 key",
+                                 des3_3key_key,
+                                 192,
+                                 (const unsigned char *)des3_3key_subkeys,
+                                 MBEDTLS_CIPHER_DES_EDE3_ECB,
+                                 MBEDTLS_DES3_BLOCK_SIZE,
+                                 NB_CMAC_TESTS_PER_KEY)) != 0) {
+        return (ret);
     }
 
-    if( ( ret = cmac_test_wth_cipher( verbose,
-                                      "3DES 3 key",
-                                      des3_3key_key,
-                                      192,
-                                      test_message,
-                                      des3_message_lengths,
-                                      (const unsigned char*)des3_3key_expected_result,
-                                      MBEDTLS_CIPHER_DES_EDE3_ECB,
-                                      MBEDTLS_DES3_BLOCK_SIZE,
-                                      NB_CMAC_TESTS_PER_KEY ) ) != 0 )
-    {
-        return( ret );
+    if ((ret = cmac_test_wth_cipher(verbose,
+                                    "3DES 3 key",
+                                    des3_3key_key,
+                                    192,
+                                    test_message,
+                                    des3_message_lengths,
+                                    (const unsigned char *)des3_3key_expected_result,
+                                    MBEDTLS_CIPHER_DES_EDE3_ECB,
+                                    MBEDTLS_DES3_BLOCK_SIZE,
+                                    NB_CMAC_TESTS_PER_KEY)) != 0) {
+        return (ret);
     }
 #endif /* MBEDTLS_DES_C */
 
 #if defined(MBEDTLS_AES_C)
-    if( ( ret = test_aes128_cmac_prf( verbose ) ) != 0 )
-        return( ret );
+    if ((ret = test_aes128_cmac_prf(verbose)) != 0)
+        return (ret);
 #endif /* MBEDTLS_AES_C */
 
-    if( verbose != 0 )
-        mbedtls_printf( "\n" );
+    if (verbose != 0)
+        mbedtls_printf("\n");
 
-    return( 0 );
+    return (0);
 }
 
 #endif /* MBEDTLS_SELF_TEST */
diff --git a/common/mbedtls/cmac.h b/common/mbedtls/cmac.h
index f6fc79b74..ba2dd50b6 100644
--- a/common/mbedtls/cmac.h
+++ b/common/mbedtls/cmac.h
@@ -52,8 +52,7 @@ extern "C" {
 /**
  * The CMAC context structure.
  */
-struct mbedtls_cmac_context_t
-{
+struct mbedtls_cmac_context_t {
     /** The internal state of the CMAC algorithm.  */
     unsigned char       state[MBEDTLS_CIPHER_BLKSIZE_MAX];
 
@@ -85,8 +84,8 @@ struct mbedtls_cmac_context_t
  * \return              \c 0 on success.
  * \return              A cipher-specific error code on failure.
  */
-int mbedtls_cipher_cmac_starts( mbedtls_cipher_context_t *ctx,
-                                const unsigned char *key, size_t keybits );
+int mbedtls_cipher_cmac_starts(mbedtls_cipher_context_t *ctx,
+                               const unsigned char *key, size_t keybits);
 
 /**
  * \brief               This function feeds an input buffer into an ongoing CMAC
@@ -104,8 +103,8 @@ int mbedtls_cipher_cmac_starts( mbedtls_cipher_context_t *ctx,
  * \return             #MBEDTLS_ERR_MD_BAD_INPUT_DATA
  *                     if parameter verification fails.
  */
-int mbedtls_cipher_cmac_update( mbedtls_cipher_context_t *ctx,
-                                const unsigned char *input, size_t ilen );
+int mbedtls_cipher_cmac_update(mbedtls_cipher_context_t *ctx,
+                               const unsigned char *input, size_t ilen);
 
 /**
  * \brief               This function finishes the CMAC operation, and writes
@@ -122,8 +121,8 @@ int mbedtls_cipher_cmac_update( mbedtls_cipher_context_t *ctx,
  * \return              #MBEDTLS_ERR_MD_BAD_INPUT_DATA
  *                      if parameter verification fails.
  */
-int mbedtls_cipher_cmac_finish( mbedtls_cipher_context_t *ctx,
-                                unsigned char *output );
+int mbedtls_cipher_cmac_finish(mbedtls_cipher_context_t *ctx,
+                               unsigned char *output);
 
 /**
  * \brief               This function prepares the authentication of another
@@ -139,7 +138,7 @@ int mbedtls_cipher_cmac_finish( mbedtls_cipher_context_t *ctx,
  * \return              #MBEDTLS_ERR_MD_BAD_INPUT_DATA
  *                      if parameter verification fails.
  */
-int mbedtls_cipher_cmac_reset( mbedtls_cipher_context_t *ctx );
+int mbedtls_cipher_cmac_reset(mbedtls_cipher_context_t *ctx);
 
 /**
  * \brief               This function calculates the full generic CMAC
@@ -163,10 +162,10 @@ int mbedtls_cipher_cmac_reset( mbedtls_cipher_context_t *ctx );
  * \return              #MBEDTLS_ERR_MD_BAD_INPUT_DATA
  *                      if parameter verification fails.
  */
-int mbedtls_cipher_cmac( const mbedtls_cipher_info_t *cipher_info,
-                         const unsigned char *key, size_t keylen,
-                         const unsigned char *input, size_t ilen,
-                         unsigned char *output );
+int mbedtls_cipher_cmac(const mbedtls_cipher_info_t *cipher_info,
+                        const unsigned char *key, size_t keylen,
+                        const unsigned char *input, size_t ilen,
+                        unsigned char *output);
 
 #if defined(MBEDTLS_AES_C)
 /**
@@ -186,9 +185,9 @@ int mbedtls_cipher_cmac( const mbedtls_cipher_info_t *cipher_info,
  *
  * \return          \c 0 on success.
  */
-int mbedtls_aes_cmac_prf_128( const unsigned char *key, size_t key_len,
-                              const unsigned char *input, size_t in_len,
-                              unsigned char output[16] );
+int mbedtls_aes_cmac_prf_128(const unsigned char *key, size_t key_len,
+                             const unsigned char *input, size_t in_len,
+                             unsigned char output[16]);
 #endif /* MBEDTLS_AES_C */
 
 #if defined(MBEDTLS_SELF_TEST) && ( defined(MBEDTLS_AES_C) || defined(MBEDTLS_DES_C) )
@@ -198,7 +197,7 @@ int mbedtls_aes_cmac_prf_128( const unsigned char *key, size_t key_len,
  * \return         \c 0 on success.
  * \return         \c 1 on failure.
  */
-int mbedtls_cmac_self_test( int verbose );
+int mbedtls_cmac_self_test(int verbose);
 #endif /* MBEDTLS_SELF_TEST && ( MBEDTLS_AES_C || MBEDTLS_DES_C ) */
 
 #ifdef __cplusplus
diff --git a/common/mbedtls/ctr_drbg.c b/common/mbedtls/ctr_drbg.c
index ebbba1a7d..f5b1af54c 100644
--- a/common/mbedtls/ctr_drbg.c
+++ b/common/mbedtls/ctr_drbg.c
@@ -55,12 +55,12 @@
 /*
  * CTR_DRBG context initialization
  */
-void mbedtls_ctr_drbg_init( mbedtls_ctr_drbg_context *ctx )
+void mbedtls_ctr_drbg_init(mbedtls_ctr_drbg_context *ctx)
 {
-    memset( ctx, 0, sizeof( mbedtls_ctr_drbg_context ) );
+    memset(ctx, 0, sizeof(mbedtls_ctr_drbg_context));
 
 #if defined(MBEDTLS_THREADING_C)
-    mbedtls_mutex_init( &ctx->mutex );
+    mbedtls_mutex_init(&ctx->mutex);
 #endif
 }
 
@@ -69,19 +69,19 @@ void mbedtls_ctr_drbg_init( mbedtls_ctr_drbg_context *ctx )
  * NIST tests to succeed (which require known length fixed entropy)
  */
 int mbedtls_ctr_drbg_seed_entropy_len(
-                   mbedtls_ctr_drbg_context *ctx,
-                   int (*f_entropy)(void *, unsigned char *, size_t),
-                   void *p_entropy,
-                   const unsigned char *custom,
-                   size_t len,
-                   size_t entropy_len )
+    mbedtls_ctr_drbg_context *ctx,
+    int (*f_entropy)(void *, unsigned char *, size_t),
+    void *p_entropy,
+    const unsigned char *custom,
+    size_t len,
+    size_t entropy_len)
 {
     int ret;
     unsigned char key[MBEDTLS_CTR_DRBG_KEYSIZE];
 
-    memset( key, 0, MBEDTLS_CTR_DRBG_KEYSIZE );
+    memset(key, 0, MBEDTLS_CTR_DRBG_KEYSIZE);
 
-    mbedtls_aes_init( &ctx->aes_ctx );
+    mbedtls_aes_init(&ctx->aes_ctx);
 
     ctx->f_entropy = f_entropy;
     ctx->p_entropy = p_entropy;
@@ -92,57 +92,55 @@ int mbedtls_ctr_drbg_seed_entropy_len(
     /*
      * Initialize with an empty key
      */
-    if( ( ret = mbedtls_aes_setkey_enc( &ctx->aes_ctx, key, MBEDTLS_CTR_DRBG_KEYBITS ) ) != 0 )
-    {
-        return( ret );
+    if ((ret = mbedtls_aes_setkey_enc(&ctx->aes_ctx, key, MBEDTLS_CTR_DRBG_KEYBITS)) != 0) {
+        return (ret);
     }
 
-    if( ( ret = mbedtls_ctr_drbg_reseed( ctx, custom, len ) ) != 0 )
-    {
-        return( ret );
+    if ((ret = mbedtls_ctr_drbg_reseed(ctx, custom, len)) != 0) {
+        return (ret);
     }
-    return( 0 );
+    return (0);
 }
 
-int mbedtls_ctr_drbg_seed( mbedtls_ctr_drbg_context *ctx,
-                   int (*f_entropy)(void *, unsigned char *, size_t),
-                   void *p_entropy,
-                   const unsigned char *custom,
-                   size_t len )
+int mbedtls_ctr_drbg_seed(mbedtls_ctr_drbg_context *ctx,
+                          int (*f_entropy)(void *, unsigned char *, size_t),
+                          void *p_entropy,
+                          const unsigned char *custom,
+                          size_t len)
 {
-    return( mbedtls_ctr_drbg_seed_entropy_len( ctx, f_entropy, p_entropy, custom, len,
-                                       MBEDTLS_CTR_DRBG_ENTROPY_LEN ) );
+    return (mbedtls_ctr_drbg_seed_entropy_len(ctx, f_entropy, p_entropy, custom, len,
+                                              MBEDTLS_CTR_DRBG_ENTROPY_LEN));
 }
 
-void mbedtls_ctr_drbg_free( mbedtls_ctr_drbg_context *ctx )
+void mbedtls_ctr_drbg_free(mbedtls_ctr_drbg_context *ctx)
 {
-    if( ctx == NULL )
+    if (ctx == NULL)
         return;
 
 #if defined(MBEDTLS_THREADING_C)
-    mbedtls_mutex_free( &ctx->mutex );
+    mbedtls_mutex_free(&ctx->mutex);
 #endif
-    mbedtls_aes_free( &ctx->aes_ctx );
-    mbedtls_platform_zeroize( ctx, sizeof( mbedtls_ctr_drbg_context ) );
+    mbedtls_aes_free(&ctx->aes_ctx);
+    mbedtls_platform_zeroize(ctx, sizeof(mbedtls_ctr_drbg_context));
 }
 
-void mbedtls_ctr_drbg_set_prediction_resistance( mbedtls_ctr_drbg_context *ctx, int resistance )
+void mbedtls_ctr_drbg_set_prediction_resistance(mbedtls_ctr_drbg_context *ctx, int resistance)
 {
     ctx->prediction_resistance = resistance;
 }
 
-void mbedtls_ctr_drbg_set_entropy_len( mbedtls_ctr_drbg_context *ctx, size_t len )
+void mbedtls_ctr_drbg_set_entropy_len(mbedtls_ctr_drbg_context *ctx, size_t len)
 {
     ctx->entropy_len = len;
 }
 
-void mbedtls_ctr_drbg_set_reseed_interval( mbedtls_ctr_drbg_context *ctx, int interval )
+void mbedtls_ctr_drbg_set_reseed_interval(mbedtls_ctr_drbg_context *ctx, int interval)
 {
     ctx->reseed_interval = interval;
 }
 
-static int block_cipher_df( unsigned char *output,
-                            const unsigned char *data, size_t data_len )
+static int block_cipher_df(unsigned char *output,
+                           const unsigned char *data, size_t data_len)
 {
     unsigned char buf[MBEDTLS_CTR_DRBG_MAX_SEED_INPUT + MBEDTLS_CTR_DRBG_BLOCKSIZE + 16];
     unsigned char tmp[MBEDTLS_CTR_DRBG_SEEDLEN];
@@ -155,11 +153,11 @@ static int block_cipher_df( unsigned char *output,
     int i, j;
     size_t buf_len, use_len;
 
-    if( data_len > MBEDTLS_CTR_DRBG_MAX_SEED_INPUT )
-        return( MBEDTLS_ERR_CTR_DRBG_INPUT_TOO_BIG );
+    if (data_len > MBEDTLS_CTR_DRBG_MAX_SEED_INPUT)
+        return (MBEDTLS_ERR_CTR_DRBG_INPUT_TOO_BIG);
 
-    memset( buf, 0, MBEDTLS_CTR_DRBG_MAX_SEED_INPUT + MBEDTLS_CTR_DRBG_BLOCKSIZE + 16 );
-    mbedtls_aes_init( &aes_ctx );
+    memset(buf, 0, MBEDTLS_CTR_DRBG_MAX_SEED_INPUT + MBEDTLS_CTR_DRBG_BLOCKSIZE + 16);
+    mbedtls_aes_init(&aes_ctx);
 
     /*
      * Construct IV (16 bytes) and S in buffer
@@ -169,49 +167,45 @@ static int block_cipher_df( unsigned char *output,
      *     (Total is padded to a multiple of 16-bytes with zeroes)
      */
     p = buf + MBEDTLS_CTR_DRBG_BLOCKSIZE;
-    *p++ = ( data_len >> 24 ) & 0xff;
-    *p++ = ( data_len >> 16 ) & 0xff;
-    *p++ = ( data_len >> 8  ) & 0xff;
-    *p++ = ( data_len       ) & 0xff;
+    *p++ = (data_len >> 24) & 0xff;
+    *p++ = (data_len >> 16) & 0xff;
+    *p++ = (data_len >> 8) & 0xff;
+    *p++ = (data_len) & 0xff;
     p += 3;
     *p++ = MBEDTLS_CTR_DRBG_SEEDLEN;
-    memcpy( p, data, data_len );
+    memcpy(p, data, data_len);
     p[data_len] = 0x80;
 
     buf_len = MBEDTLS_CTR_DRBG_BLOCKSIZE + 8 + data_len + 1;
 
-    for( i = 0; i < MBEDTLS_CTR_DRBG_KEYSIZE; i++ )
+    for (i = 0; i < MBEDTLS_CTR_DRBG_KEYSIZE; i++)
         key[i] = i;
 
-    if( ( ret = mbedtls_aes_setkey_enc( &aes_ctx, key, MBEDTLS_CTR_DRBG_KEYBITS ) ) != 0 )
-    {
+    if ((ret = mbedtls_aes_setkey_enc(&aes_ctx, key, MBEDTLS_CTR_DRBG_KEYBITS)) != 0) {
         goto exit;
     }
 
     /*
      * Reduce data to MBEDTLS_CTR_DRBG_SEEDLEN bytes of data
      */
-    for( j = 0; j < MBEDTLS_CTR_DRBG_SEEDLEN; j += MBEDTLS_CTR_DRBG_BLOCKSIZE )
-    {
+    for (j = 0; j < MBEDTLS_CTR_DRBG_SEEDLEN; j += MBEDTLS_CTR_DRBG_BLOCKSIZE) {
         p = buf;
-        memset( chain, 0, MBEDTLS_CTR_DRBG_BLOCKSIZE );
+        memset(chain, 0, MBEDTLS_CTR_DRBG_BLOCKSIZE);
         use_len = buf_len;
 
-        while( use_len > 0 )
-        {
-            for( i = 0; i < MBEDTLS_CTR_DRBG_BLOCKSIZE; i++ )
+        while (use_len > 0) {
+            for (i = 0; i < MBEDTLS_CTR_DRBG_BLOCKSIZE; i++)
                 chain[i] ^= p[i];
             p += MBEDTLS_CTR_DRBG_BLOCKSIZE;
-            use_len -= ( use_len >= MBEDTLS_CTR_DRBG_BLOCKSIZE ) ?
+            use_len -= (use_len >= MBEDTLS_CTR_DRBG_BLOCKSIZE) ?
                        MBEDTLS_CTR_DRBG_BLOCKSIZE : use_len;
 
-            if( ( ret = mbedtls_aes_crypt_ecb( &aes_ctx, MBEDTLS_AES_ENCRYPT, chain, chain ) ) != 0 )
-            {
+            if ((ret = mbedtls_aes_crypt_ecb(&aes_ctx, MBEDTLS_AES_ENCRYPT, chain, chain)) != 0) {
                 goto exit;
             }
         }
 
-        memcpy( tmp + j, chain, MBEDTLS_CTR_DRBG_BLOCKSIZE );
+        memcpy(tmp + j, chain, MBEDTLS_CTR_DRBG_BLOCKSIZE);
 
         /*
          * Update IV
@@ -222,124 +216,115 @@ static int block_cipher_df( unsigned char *output,
     /*
      * Do final encryption with reduced data
      */
-    if( ( ret = mbedtls_aes_setkey_enc( &aes_ctx, tmp, MBEDTLS_CTR_DRBG_KEYBITS ) ) != 0 )
-    {
+    if ((ret = mbedtls_aes_setkey_enc(&aes_ctx, tmp, MBEDTLS_CTR_DRBG_KEYBITS)) != 0) {
         goto exit;
     }
     iv = tmp + MBEDTLS_CTR_DRBG_KEYSIZE;
     p = output;
 
-    for( j = 0; j < MBEDTLS_CTR_DRBG_SEEDLEN; j += MBEDTLS_CTR_DRBG_BLOCKSIZE )
-    {
-        if( ( ret = mbedtls_aes_crypt_ecb( &aes_ctx, MBEDTLS_AES_ENCRYPT, iv, iv ) ) != 0 )
-        {
+    for (j = 0; j < MBEDTLS_CTR_DRBG_SEEDLEN; j += MBEDTLS_CTR_DRBG_BLOCKSIZE) {
+        if ((ret = mbedtls_aes_crypt_ecb(&aes_ctx, MBEDTLS_AES_ENCRYPT, iv, iv)) != 0) {
             goto exit;
         }
-        memcpy( p, iv, MBEDTLS_CTR_DRBG_BLOCKSIZE );
+        memcpy(p, iv, MBEDTLS_CTR_DRBG_BLOCKSIZE);
         p += MBEDTLS_CTR_DRBG_BLOCKSIZE;
     }
 exit:
-    mbedtls_aes_free( &aes_ctx );
+    mbedtls_aes_free(&aes_ctx);
     /*
     * tidy up the stack
     */
-    mbedtls_platform_zeroize( buf, sizeof( buf ) );
-    mbedtls_platform_zeroize( tmp, sizeof( tmp ) );
-    mbedtls_platform_zeroize( key, sizeof( key ) );
-    mbedtls_platform_zeroize( chain, sizeof( chain ) );
-    if( 0 != ret )
-    {
+    mbedtls_platform_zeroize(buf, sizeof(buf));
+    mbedtls_platform_zeroize(tmp, sizeof(tmp));
+    mbedtls_platform_zeroize(key, sizeof(key));
+    mbedtls_platform_zeroize(chain, sizeof(chain));
+    if (0 != ret) {
         /*
         * wipe partial seed from memory
         */
-        mbedtls_platform_zeroize( output, MBEDTLS_CTR_DRBG_SEEDLEN );
+        mbedtls_platform_zeroize(output, MBEDTLS_CTR_DRBG_SEEDLEN);
     }
 
-    return( ret );
+    return (ret);
 }
 
-static int ctr_drbg_update_internal( mbedtls_ctr_drbg_context *ctx,
-                              const unsigned char data[MBEDTLS_CTR_DRBG_SEEDLEN] )
+static int ctr_drbg_update_internal(mbedtls_ctr_drbg_context *ctx,
+                                    const unsigned char data[MBEDTLS_CTR_DRBG_SEEDLEN])
 {
     unsigned char tmp[MBEDTLS_CTR_DRBG_SEEDLEN];
     unsigned char *p = tmp;
     int i, j;
     int ret = 0;
 
-    memset( tmp, 0, MBEDTLS_CTR_DRBG_SEEDLEN );
+    memset(tmp, 0, MBEDTLS_CTR_DRBG_SEEDLEN);
 
-    for( j = 0; j < MBEDTLS_CTR_DRBG_SEEDLEN; j += MBEDTLS_CTR_DRBG_BLOCKSIZE )
-    {
+    for (j = 0; j < MBEDTLS_CTR_DRBG_SEEDLEN; j += MBEDTLS_CTR_DRBG_BLOCKSIZE) {
         /*
          * Increase counter
          */
-        for( i = MBEDTLS_CTR_DRBG_BLOCKSIZE; i > 0; i-- )
-            if( ++ctx->counter[i - 1] != 0 )
+        for (i = MBEDTLS_CTR_DRBG_BLOCKSIZE; i > 0; i--)
+            if (++ctx->counter[i - 1] != 0)
                 break;
 
         /*
          * Crypt counter block
          */
-        if( ( ret = mbedtls_aes_crypt_ecb( &ctx->aes_ctx, MBEDTLS_AES_ENCRYPT, ctx->counter, p ) ) != 0 )
-        {
-            return( ret );
+        if ((ret = mbedtls_aes_crypt_ecb(&ctx->aes_ctx, MBEDTLS_AES_ENCRYPT, ctx->counter, p)) != 0) {
+            return (ret);
         }
 
         p += MBEDTLS_CTR_DRBG_BLOCKSIZE;
     }
 
-    for( i = 0; i < MBEDTLS_CTR_DRBG_SEEDLEN; i++ )
+    for (i = 0; i < MBEDTLS_CTR_DRBG_SEEDLEN; i++)
         tmp[i] ^= data[i];
 
     /*
      * Update key and counter
      */
-    if( ( ret = mbedtls_aes_setkey_enc( &ctx->aes_ctx, tmp, MBEDTLS_CTR_DRBG_KEYBITS ) ) != 0 )
-    {
-        return( ret );
+    if ((ret = mbedtls_aes_setkey_enc(&ctx->aes_ctx, tmp, MBEDTLS_CTR_DRBG_KEYBITS)) != 0) {
+        return (ret);
     }
-    memcpy( ctx->counter, tmp + MBEDTLS_CTR_DRBG_KEYSIZE, MBEDTLS_CTR_DRBG_BLOCKSIZE );
+    memcpy(ctx->counter, tmp + MBEDTLS_CTR_DRBG_KEYSIZE, MBEDTLS_CTR_DRBG_BLOCKSIZE);
 
-    return( 0 );
+    return (0);
 }
 
-void mbedtls_ctr_drbg_update( mbedtls_ctr_drbg_context *ctx,
-                      const unsigned char *additional, size_t add_len )
+void mbedtls_ctr_drbg_update(mbedtls_ctr_drbg_context *ctx,
+                             const unsigned char *additional, size_t add_len)
 {
     unsigned char add_input[MBEDTLS_CTR_DRBG_SEEDLEN];
 
-    if( add_len > 0 )
-    {
+    if (add_len > 0) {
         /* MAX_INPUT would be more logical here, but we have to match
          * block_cipher_df()'s limits since we can't propagate errors */
-        if( add_len > MBEDTLS_CTR_DRBG_MAX_SEED_INPUT )
+        if (add_len > MBEDTLS_CTR_DRBG_MAX_SEED_INPUT)
             add_len = MBEDTLS_CTR_DRBG_MAX_SEED_INPUT;
 
-        block_cipher_df( add_input, additional, add_len );
-        ctr_drbg_update_internal( ctx, add_input );
+        block_cipher_df(add_input, additional, add_len);
+        ctr_drbg_update_internal(ctx, add_input);
     }
 }
 
-int mbedtls_ctr_drbg_reseed( mbedtls_ctr_drbg_context *ctx,
-                     const unsigned char *additional, size_t len )
+int mbedtls_ctr_drbg_reseed(mbedtls_ctr_drbg_context *ctx,
+                            const unsigned char *additional, size_t len)
 {
     unsigned char seed[MBEDTLS_CTR_DRBG_MAX_SEED_INPUT];
     size_t seedlen = 0;
     int ret;
 
-    if( ctx->entropy_len > MBEDTLS_CTR_DRBG_MAX_SEED_INPUT ||
-        len > MBEDTLS_CTR_DRBG_MAX_SEED_INPUT - ctx->entropy_len )
-        return( MBEDTLS_ERR_CTR_DRBG_INPUT_TOO_BIG );
+    if (ctx->entropy_len > MBEDTLS_CTR_DRBG_MAX_SEED_INPUT ||
+        len > MBEDTLS_CTR_DRBG_MAX_SEED_INPUT - ctx->entropy_len)
+        return (MBEDTLS_ERR_CTR_DRBG_INPUT_TOO_BIG);
 
-    memset( seed, 0, MBEDTLS_CTR_DRBG_MAX_SEED_INPUT );
+    memset(seed, 0, MBEDTLS_CTR_DRBG_MAX_SEED_INPUT);
 
     /*
      * Gather entropy_len bytes of entropy to seed state
      */
-    if( 0 != ctx->f_entropy( ctx->p_entropy, seed,
-                             ctx->entropy_len ) )
-    {
-        return( MBEDTLS_ERR_CTR_DRBG_ENTROPY_SOURCE_FAILED );
+    if (0 != ctx->f_entropy(ctx->p_entropy, seed,
+                            ctx->entropy_len)) {
+        return (MBEDTLS_ERR_CTR_DRBG_ENTROPY_SOURCE_FAILED);
     }
 
     seedlen += ctx->entropy_len;
@@ -347,35 +332,32 @@ int mbedtls_ctr_drbg_reseed( mbedtls_ctr_drbg_context *ctx,
     /*
      * Add additional data
      */
-    if( additional && len )
-    {
-        memcpy( seed + seedlen, additional, len );
+    if (additional && len) {
+        memcpy(seed + seedlen, additional, len);
         seedlen += len;
     }
 
     /*
      * Reduce to 384 bits
      */
-    if( ( ret = block_cipher_df( seed, seed, seedlen ) ) != 0 )
-    {
-        return( ret );
+    if ((ret = block_cipher_df(seed, seed, seedlen)) != 0) {
+        return (ret);
     }
 
     /*
      * Update state
      */
-    if( ( ret = ctr_drbg_update_internal( ctx, seed ) ) != 0 )
-    {
-        return( ret );
+    if ((ret = ctr_drbg_update_internal(ctx, seed)) != 0) {
+        return (ret);
     }
     ctx->reseed_counter = 1;
 
-    return( 0 );
+    return (0);
 }
 
-int mbedtls_ctr_drbg_random_with_add( void *p_rng,
-                              unsigned char *output, size_t output_len,
-                              const unsigned char *additional, size_t add_len )
+int mbedtls_ctr_drbg_random_with_add(void *p_rng,
+                                     unsigned char *output, size_t output_len,
+                                     const unsigned char *additional, size_t add_len)
 {
     int ret = 0;
     mbedtls_ctr_drbg_context *ctx = (mbedtls_ctr_drbg_context *) p_rng;
@@ -385,267 +367,264 @@ int mbedtls_ctr_drbg_random_with_add( void *p_rng,
     int i;
     size_t use_len;
 
-    if( output_len > MBEDTLS_CTR_DRBG_MAX_REQUEST )
-        return( MBEDTLS_ERR_CTR_DRBG_REQUEST_TOO_BIG );
+    if (output_len > MBEDTLS_CTR_DRBG_MAX_REQUEST)
+        return (MBEDTLS_ERR_CTR_DRBG_REQUEST_TOO_BIG);
 
-    if( add_len > MBEDTLS_CTR_DRBG_MAX_INPUT )
-        return( MBEDTLS_ERR_CTR_DRBG_INPUT_TOO_BIG );
+    if (add_len > MBEDTLS_CTR_DRBG_MAX_INPUT)
+        return (MBEDTLS_ERR_CTR_DRBG_INPUT_TOO_BIG);
 
-    memset( add_input, 0, MBEDTLS_CTR_DRBG_SEEDLEN );
+    memset(add_input, 0, MBEDTLS_CTR_DRBG_SEEDLEN);
 
-    if( ctx->reseed_counter > ctx->reseed_interval ||
-        ctx->prediction_resistance )
-    {
-        if( ( ret = mbedtls_ctr_drbg_reseed( ctx, additional, add_len ) ) != 0 )
-        {
-            return( ret );
+    if (ctx->reseed_counter > ctx->reseed_interval ||
+        ctx->prediction_resistance) {
+        if ((ret = mbedtls_ctr_drbg_reseed(ctx, additional, add_len)) != 0) {
+            return (ret);
         }
         add_len = 0;
     }
 
-    if( add_len > 0 )
-    {
-        if( ( ret = block_cipher_df( add_input, additional, add_len ) ) != 0 )
-        {
-            return( ret );
+    if (add_len > 0) {
+        if ((ret = block_cipher_df(add_input, additional, add_len)) != 0) {
+            return (ret);
         }
-        if( ( ret = ctr_drbg_update_internal( ctx, add_input ) ) != 0 )
-        {
-            return( ret );
+        if ((ret = ctr_drbg_update_internal(ctx, add_input)) != 0) {
+            return (ret);
         }
     }
 
-    while( output_len > 0 )
-    {
+    while (output_len > 0) {
         /*
          * Increase counter
          */
-        for( i = MBEDTLS_CTR_DRBG_BLOCKSIZE; i > 0; i-- )
-            if( ++ctx->counter[i - 1] != 0 )
+        for (i = MBEDTLS_CTR_DRBG_BLOCKSIZE; i > 0; i--)
+            if (++ctx->counter[i - 1] != 0)
                 break;
 
         /*
          * Crypt counter block
          */
-        if( ( ret = mbedtls_aes_crypt_ecb( &ctx->aes_ctx, MBEDTLS_AES_ENCRYPT, ctx->counter, tmp ) ) != 0 )
-        {
-            return( ret );
+        if ((ret = mbedtls_aes_crypt_ecb(&ctx->aes_ctx, MBEDTLS_AES_ENCRYPT, ctx->counter, tmp)) != 0) {
+            return (ret);
         }
 
-        use_len = ( output_len > MBEDTLS_CTR_DRBG_BLOCKSIZE ) ? MBEDTLS_CTR_DRBG_BLOCKSIZE :
-                                                       output_len;
+        use_len = (output_len > MBEDTLS_CTR_DRBG_BLOCKSIZE) ? MBEDTLS_CTR_DRBG_BLOCKSIZE :
+                  output_len;
         /*
          * Copy random block to destination
          */
-        memcpy( p, tmp, use_len );
+        memcpy(p, tmp, use_len);
         p += use_len;
         output_len -= use_len;
     }
 
-    if( ( ret = ctr_drbg_update_internal( ctx, add_input ) ) != 0 )
-    {
-        return( ret );
+    if ((ret = ctr_drbg_update_internal(ctx, add_input)) != 0) {
+        return (ret);
     }
 
     ctx->reseed_counter++;
 
-    return( 0 );
+    return (0);
 }
 
-int mbedtls_ctr_drbg_random( void *p_rng, unsigned char *output, size_t output_len )
+int mbedtls_ctr_drbg_random(void *p_rng, unsigned char *output, size_t output_len)
 {
     int ret;
     mbedtls_ctr_drbg_context *ctx = (mbedtls_ctr_drbg_context *) p_rng;
 
 #if defined(MBEDTLS_THREADING_C)
-    if( ( ret = mbedtls_mutex_lock( &ctx->mutex ) ) != 0 )
-        return( ret );
+    if ((ret = mbedtls_mutex_lock(&ctx->mutex)) != 0)
+        return (ret);
 #endif
 
-    ret = mbedtls_ctr_drbg_random_with_add( ctx, output, output_len, NULL, 0 );
+    ret = mbedtls_ctr_drbg_random_with_add(ctx, output, output_len, NULL, 0);
 
 #if defined(MBEDTLS_THREADING_C)
-    if( mbedtls_mutex_unlock( &ctx->mutex ) != 0 )
-        return( MBEDTLS_ERR_THREADING_MUTEX_ERROR );
+    if (mbedtls_mutex_unlock(&ctx->mutex) != 0)
+        return (MBEDTLS_ERR_THREADING_MUTEX_ERROR);
 #endif
 
-    return( ret );
+    return (ret);
 }
 
 #if defined(MBEDTLS_FS_IO)
-int mbedtls_ctr_drbg_write_seed_file( mbedtls_ctr_drbg_context *ctx, const char *path )
+int mbedtls_ctr_drbg_write_seed_file(mbedtls_ctr_drbg_context *ctx, const char *path)
 {
     int ret = MBEDTLS_ERR_CTR_DRBG_FILE_IO_ERROR;
     FILE *f;
     unsigned char buf[ MBEDTLS_CTR_DRBG_MAX_INPUT ];
 
-    if( ( f = fopen( path, "wb" ) ) == NULL )
-        return( MBEDTLS_ERR_CTR_DRBG_FILE_IO_ERROR );
+    if ((f = fopen(path, "wb")) == NULL)
+        return (MBEDTLS_ERR_CTR_DRBG_FILE_IO_ERROR);
 
-    if( ( ret = mbedtls_ctr_drbg_random( ctx, buf, MBEDTLS_CTR_DRBG_MAX_INPUT ) ) != 0 )
+    if ((ret = mbedtls_ctr_drbg_random(ctx, buf, MBEDTLS_CTR_DRBG_MAX_INPUT)) != 0)
         goto exit;
 
-    if( fwrite( buf, 1, MBEDTLS_CTR_DRBG_MAX_INPUT, f ) != MBEDTLS_CTR_DRBG_MAX_INPUT )
+    if (fwrite(buf, 1, MBEDTLS_CTR_DRBG_MAX_INPUT, f) != MBEDTLS_CTR_DRBG_MAX_INPUT)
         ret = MBEDTLS_ERR_CTR_DRBG_FILE_IO_ERROR;
     else
         ret = 0;
 
 exit:
-    mbedtls_platform_zeroize( buf, sizeof( buf ) );
+    mbedtls_platform_zeroize(buf, sizeof(buf));
 
-    fclose( f );
-    return( ret );
+    fclose(f);
+    return (ret);
 }
 
-int mbedtls_ctr_drbg_update_seed_file( mbedtls_ctr_drbg_context *ctx, const char *path )
+int mbedtls_ctr_drbg_update_seed_file(mbedtls_ctr_drbg_context *ctx, const char *path)
 {
     int ret = 0;
     FILE *f;
     size_t n;
     unsigned char buf[ MBEDTLS_CTR_DRBG_MAX_INPUT ];
 
-    if( ( f = fopen( path, "rb" ) ) == NULL )
-        return( MBEDTLS_ERR_CTR_DRBG_FILE_IO_ERROR );
+    if ((f = fopen(path, "rb")) == NULL)
+        return (MBEDTLS_ERR_CTR_DRBG_FILE_IO_ERROR);
 
-    fseek( f, 0, SEEK_END );
-    n = (size_t) ftell( f );
-    fseek( f, 0, SEEK_SET );
+    fseek(f, 0, SEEK_END);
+    n = (size_t) ftell(f);
+    fseek(f, 0, SEEK_SET);
 
-    if( n > MBEDTLS_CTR_DRBG_MAX_INPUT )
-    {
-        fclose( f );
-        return( MBEDTLS_ERR_CTR_DRBG_INPUT_TOO_BIG );
+    if (n > MBEDTLS_CTR_DRBG_MAX_INPUT) {
+        fclose(f);
+        return (MBEDTLS_ERR_CTR_DRBG_INPUT_TOO_BIG);
     }
 
-    if( fread( buf, 1, n, f ) != n )
+    if (fread(buf, 1, n, f) != n)
         ret = MBEDTLS_ERR_CTR_DRBG_FILE_IO_ERROR;
     else
-        mbedtls_ctr_drbg_update( ctx, buf, n );
+        mbedtls_ctr_drbg_update(ctx, buf, n);
 
-    fclose( f );
+    fclose(f);
 
-    mbedtls_platform_zeroize( buf, sizeof( buf ) );
+    mbedtls_platform_zeroize(buf, sizeof(buf));
 
-    if( ret != 0 )
-        return( ret );
+    if (ret != 0)
+        return (ret);
 
-    return( mbedtls_ctr_drbg_write_seed_file( ctx, path ) );
+    return (mbedtls_ctr_drbg_write_seed_file(ctx, path));
 }
 #endif /* MBEDTLS_FS_IO */
 
 #if defined(MBEDTLS_SELF_TEST)
 
-static const unsigned char entropy_source_pr[96] =
-    { 0xc1, 0x80, 0x81, 0xa6, 0x5d, 0x44, 0x02, 0x16,
-      0x19, 0xb3, 0xf1, 0x80, 0xb1, 0xc9, 0x20, 0x02,
-      0x6a, 0x54, 0x6f, 0x0c, 0x70, 0x81, 0x49, 0x8b,
-      0x6e, 0xa6, 0x62, 0x52, 0x6d, 0x51, 0xb1, 0xcb,
-      0x58, 0x3b, 0xfa, 0xd5, 0x37, 0x5f, 0xfb, 0xc9,
-      0xff, 0x46, 0xd2, 0x19, 0xc7, 0x22, 0x3e, 0x95,
-      0x45, 0x9d, 0x82, 0xe1, 0xe7, 0x22, 0x9f, 0x63,
-      0x31, 0x69, 0xd2, 0x6b, 0x57, 0x47, 0x4f, 0xa3,
-      0x37, 0xc9, 0x98, 0x1c, 0x0b, 0xfb, 0x91, 0x31,
-      0x4d, 0x55, 0xb9, 0xe9, 0x1c, 0x5a, 0x5e, 0xe4,
-      0x93, 0x92, 0xcf, 0xc5, 0x23, 0x12, 0xd5, 0x56,
-      0x2c, 0x4a, 0x6e, 0xff, 0xdc, 0x10, 0xd0, 0x68 };
+static const unsigned char entropy_source_pr[96] = {
+    0xc1, 0x80, 0x81, 0xa6, 0x5d, 0x44, 0x02, 0x16,
+    0x19, 0xb3, 0xf1, 0x80, 0xb1, 0xc9, 0x20, 0x02,
+    0x6a, 0x54, 0x6f, 0x0c, 0x70, 0x81, 0x49, 0x8b,
+    0x6e, 0xa6, 0x62, 0x52, 0x6d, 0x51, 0xb1, 0xcb,
+    0x58, 0x3b, 0xfa, 0xd5, 0x37, 0x5f, 0xfb, 0xc9,
+    0xff, 0x46, 0xd2, 0x19, 0xc7, 0x22, 0x3e, 0x95,
+    0x45, 0x9d, 0x82, 0xe1, 0xe7, 0x22, 0x9f, 0x63,
+    0x31, 0x69, 0xd2, 0x6b, 0x57, 0x47, 0x4f, 0xa3,
+    0x37, 0xc9, 0x98, 0x1c, 0x0b, 0xfb, 0x91, 0x31,
+    0x4d, 0x55, 0xb9, 0xe9, 0x1c, 0x5a, 0x5e, 0xe4,
+    0x93, 0x92, 0xcf, 0xc5, 0x23, 0x12, 0xd5, 0x56,
+    0x2c, 0x4a, 0x6e, 0xff, 0xdc, 0x10, 0xd0, 0x68
+};
 
-static const unsigned char entropy_source_nopr[64] =
-    { 0x5a, 0x19, 0x4d, 0x5e, 0x2b, 0x31, 0x58, 0x14,
-      0x54, 0xde, 0xf6, 0x75, 0xfb, 0x79, 0x58, 0xfe,
-      0xc7, 0xdb, 0x87, 0x3e, 0x56, 0x89, 0xfc, 0x9d,
-      0x03, 0x21, 0x7c, 0x68, 0xd8, 0x03, 0x38, 0x20,
-      0xf9, 0xe6, 0x5e, 0x04, 0xd8, 0x56, 0xf3, 0xa9,
-      0xc4, 0x4a, 0x4c, 0xbd, 0xc1, 0xd0, 0x08, 0x46,
-      0xf5, 0x98, 0x3d, 0x77, 0x1c, 0x1b, 0x13, 0x7e,
-      0x4e, 0x0f, 0x9d, 0x8e, 0xf4, 0x09, 0xf9, 0x2e };
+static const unsigned char entropy_source_nopr[64] = {
+    0x5a, 0x19, 0x4d, 0x5e, 0x2b, 0x31, 0x58, 0x14,
+    0x54, 0xde, 0xf6, 0x75, 0xfb, 0x79, 0x58, 0xfe,
+    0xc7, 0xdb, 0x87, 0x3e, 0x56, 0x89, 0xfc, 0x9d,
+    0x03, 0x21, 0x7c, 0x68, 0xd8, 0x03, 0x38, 0x20,
+    0xf9, 0xe6, 0x5e, 0x04, 0xd8, 0x56, 0xf3, 0xa9,
+    0xc4, 0x4a, 0x4c, 0xbd, 0xc1, 0xd0, 0x08, 0x46,
+    0xf5, 0x98, 0x3d, 0x77, 0x1c, 0x1b, 0x13, 0x7e,
+    0x4e, 0x0f, 0x9d, 0x8e, 0xf4, 0x09, 0xf9, 0x2e
+};
 
-static const unsigned char nonce_pers_pr[16] =
-    { 0xd2, 0x54, 0xfc, 0xff, 0x02, 0x1e, 0x69, 0xd2,
-      0x29, 0xc9, 0xcf, 0xad, 0x85, 0xfa, 0x48, 0x6c };
+static const unsigned char nonce_pers_pr[16] = {
+    0xd2, 0x54, 0xfc, 0xff, 0x02, 0x1e, 0x69, 0xd2,
+    0x29, 0xc9, 0xcf, 0xad, 0x85, 0xfa, 0x48, 0x6c
+};
 
-static const unsigned char nonce_pers_nopr[16] =
-    { 0x1b, 0x54, 0xb8, 0xff, 0x06, 0x42, 0xbf, 0xf5,
-      0x21, 0xf1, 0x5c, 0x1c, 0x0b, 0x66, 0x5f, 0x3f };
+static const unsigned char nonce_pers_nopr[16] = {
+    0x1b, 0x54, 0xb8, 0xff, 0x06, 0x42, 0xbf, 0xf5,
+    0x21, 0xf1, 0x5c, 0x1c, 0x0b, 0x66, 0x5f, 0x3f
+};
 
-static const unsigned char result_pr[16] =
-    { 0x34, 0x01, 0x16, 0x56, 0xb4, 0x29, 0x00, 0x8f,
-      0x35, 0x63, 0xec, 0xb5, 0xf2, 0x59, 0x07, 0x23 };
+static const unsigned char result_pr[16] = {
+    0x34, 0x01, 0x16, 0x56, 0xb4, 0x29, 0x00, 0x8f,
+    0x35, 0x63, 0xec, 0xb5, 0xf2, 0x59, 0x07, 0x23
+};
 
-static const unsigned char result_nopr[16] =
-    { 0xa0, 0x54, 0x30, 0x3d, 0x8a, 0x7e, 0xa9, 0x88,
-      0x9d, 0x90, 0x3e, 0x07, 0x7c, 0x6f, 0x21, 0x8f };
+static const unsigned char result_nopr[16] = {
+    0xa0, 0x54, 0x30, 0x3d, 0x8a, 0x7e, 0xa9, 0x88,
+    0x9d, 0x90, 0x3e, 0x07, 0x7c, 0x6f, 0x21, 0x8f
+};
 
 static size_t test_offset;
-static int ctr_drbg_self_test_entropy( void *data, unsigned char *buf,
-                                       size_t len )
+static int ctr_drbg_self_test_entropy(void *data, unsigned char *buf,
+                                      size_t len)
 {
     const unsigned char *p = data;
-    memcpy( buf, p + test_offset, len );
+    memcpy(buf, p + test_offset, len);
     test_offset += len;
-    return( 0 );
+    return (0);
 }
 
 #define CHK( c )    if( (c) != 0 )                          \
-                    {                                       \
-                        if( verbose != 0 )                  \
-                            mbedtls_printf( "failed\n" );  \
-                        return( 1 );                        \
-                    }
+    {                                       \
+        if( verbose != 0 )                  \
+            mbedtls_printf( "failed\n" );  \
+        return( 1 );                        \
+    }
 
 /*
  * Checkup routine
  */
-int mbedtls_ctr_drbg_self_test( int verbose )
+int mbedtls_ctr_drbg_self_test(int verbose)
 {
     mbedtls_ctr_drbg_context ctx;
     unsigned char buf[16];
 
-    mbedtls_ctr_drbg_init( &ctx );
+    mbedtls_ctr_drbg_init(&ctx);
 
     /*
      * Based on a NIST CTR_DRBG test vector (PR = True)
      */
-    if( verbose != 0 )
-        mbedtls_printf( "  CTR_DRBG (PR = TRUE) : " );
+    if (verbose != 0)
+        mbedtls_printf("  CTR_DRBG (PR = TRUE) : ");
 
     test_offset = 0;
-    CHK( mbedtls_ctr_drbg_seed_entropy_len( &ctx, ctr_drbg_self_test_entropy,
-                                (void *) entropy_source_pr, nonce_pers_pr, 16, 32 ) );
-    mbedtls_ctr_drbg_set_prediction_resistance( &ctx, MBEDTLS_CTR_DRBG_PR_ON );
-    CHK( mbedtls_ctr_drbg_random( &ctx, buf, MBEDTLS_CTR_DRBG_BLOCKSIZE ) );
-    CHK( mbedtls_ctr_drbg_random( &ctx, buf, MBEDTLS_CTR_DRBG_BLOCKSIZE ) );
-    CHK( memcmp( buf, result_pr, MBEDTLS_CTR_DRBG_BLOCKSIZE ) );
+    CHK(mbedtls_ctr_drbg_seed_entropy_len(&ctx, ctr_drbg_self_test_entropy,
+                                          (void *) entropy_source_pr, nonce_pers_pr, 16, 32));
+    mbedtls_ctr_drbg_set_prediction_resistance(&ctx, MBEDTLS_CTR_DRBG_PR_ON);
+    CHK(mbedtls_ctr_drbg_random(&ctx, buf, MBEDTLS_CTR_DRBG_BLOCKSIZE));
+    CHK(mbedtls_ctr_drbg_random(&ctx, buf, MBEDTLS_CTR_DRBG_BLOCKSIZE));
+    CHK(memcmp(buf, result_pr, MBEDTLS_CTR_DRBG_BLOCKSIZE));
 
-    mbedtls_ctr_drbg_free( &ctx );
+    mbedtls_ctr_drbg_free(&ctx);
 
-    if( verbose != 0 )
-        mbedtls_printf( "passed\n" );
+    if (verbose != 0)
+        mbedtls_printf("passed\n");
 
     /*
      * Based on a NIST CTR_DRBG test vector (PR = FALSE)
      */
-    if( verbose != 0 )
-        mbedtls_printf( "  CTR_DRBG (PR = FALSE): " );
+    if (verbose != 0)
+        mbedtls_printf("  CTR_DRBG (PR = FALSE): ");
 
-    mbedtls_ctr_drbg_init( &ctx );
+    mbedtls_ctr_drbg_init(&ctx);
 
     test_offset = 0;
-    CHK( mbedtls_ctr_drbg_seed_entropy_len( &ctx, ctr_drbg_self_test_entropy,
-                            (void *) entropy_source_nopr, nonce_pers_nopr, 16, 32 ) );
-    CHK( mbedtls_ctr_drbg_random( &ctx, buf, 16 ) );
-    CHK( mbedtls_ctr_drbg_reseed( &ctx, NULL, 0 ) );
-    CHK( mbedtls_ctr_drbg_random( &ctx, buf, 16 ) );
-    CHK( memcmp( buf, result_nopr, 16 ) );
+    CHK(mbedtls_ctr_drbg_seed_entropy_len(&ctx, ctr_drbg_self_test_entropy,
+                                          (void *) entropy_source_nopr, nonce_pers_nopr, 16, 32));
+    CHK(mbedtls_ctr_drbg_random(&ctx, buf, 16));
+    CHK(mbedtls_ctr_drbg_reseed(&ctx, NULL, 0));
+    CHK(mbedtls_ctr_drbg_random(&ctx, buf, 16));
+    CHK(memcmp(buf, result_nopr, 16));
 
-    mbedtls_ctr_drbg_free( &ctx );
+    mbedtls_ctr_drbg_free(&ctx);
 
-    if( verbose != 0 )
-        mbedtls_printf( "passed\n" );
+    if (verbose != 0)
+        mbedtls_printf("passed\n");
 
-    if( verbose != 0 )
-            mbedtls_printf( "\n" );
+    if (verbose != 0)
+        mbedtls_printf("\n");
 
-    return( 0 );
+    return (0);
 }
 #endif /* MBEDTLS_SELF_TEST */
 
diff --git a/common/mbedtls/ctr_drbg.h b/common/mbedtls/ctr_drbg.h
index 5d62f9bea..ddb699140 100644
--- a/common/mbedtls/ctr_drbg.h
+++ b/common/mbedtls/ctr_drbg.h
@@ -110,8 +110,7 @@ extern "C" {
 /**
  * \brief          The CTR_DRBG context structure.
  */
-typedef struct mbedtls_ctr_drbg_context
-{
+typedef struct mbedtls_ctr_drbg_context {
     unsigned char counter[16];  /*!< The counter (V). */
     int reseed_counter;         /*!< The reseed counter. */
     int prediction_resistance;  /*!< This determines whether prediction
@@ -128,7 +127,7 @@ typedef struct mbedtls_ctr_drbg_context
      * Callbacks (Entropy)
      */
     int (*f_entropy)(void *, unsigned char *, size_t);
-                                /*!< The entropy callback function. */
+    /*!< The entropy callback function. */
 
     void *p_entropy;            /*!< The context for the entropy function. */
 
@@ -145,7 +144,7 @@ mbedtls_ctr_drbg_context;
  *
  * \param ctx           The CTR_DRBG context to initialize.
  */
-void mbedtls_ctr_drbg_init( mbedtls_ctr_drbg_context *ctx );
+void mbedtls_ctr_drbg_init(mbedtls_ctr_drbg_context *ctx);
 
 /**
  * \brief               This function seeds and sets up the CTR_DRBG
@@ -166,18 +165,18 @@ void mbedtls_ctr_drbg_init( mbedtls_ctr_drbg_context *ctx );
  * \return              \c 0 on success.
  * \return              #MBEDTLS_ERR_CTR_DRBG_ENTROPY_SOURCE_FAILED on failure.
  */
-int mbedtls_ctr_drbg_seed( mbedtls_ctr_drbg_context *ctx,
-                   int (*f_entropy)(void *, unsigned char *, size_t),
-                   void *p_entropy,
-                   const unsigned char *custom,
-                   size_t len );
+int mbedtls_ctr_drbg_seed(mbedtls_ctr_drbg_context *ctx,
+                          int (*f_entropy)(void *, unsigned char *, size_t),
+                          void *p_entropy,
+                          const unsigned char *custom,
+                          size_t len);
 
 /**
  * \brief               This function clears CTR_CRBG context data.
  *
  * \param ctx           The CTR_DRBG context to clear.
  */
-void mbedtls_ctr_drbg_free( mbedtls_ctr_drbg_context *ctx );
+void mbedtls_ctr_drbg_free(mbedtls_ctr_drbg_context *ctx);
 
 /**
  * \brief               This function turns prediction resistance on or off.
@@ -191,8 +190,8 @@ void mbedtls_ctr_drbg_free( mbedtls_ctr_drbg_context *ctx );
  * \param ctx           The CTR_DRBG context.
  * \param resistance    #MBEDTLS_CTR_DRBG_PR_ON or #MBEDTLS_CTR_DRBG_PR_OFF.
  */
-void mbedtls_ctr_drbg_set_prediction_resistance( mbedtls_ctr_drbg_context *ctx,
-                                         int resistance );
+void mbedtls_ctr_drbg_set_prediction_resistance(mbedtls_ctr_drbg_context *ctx,
+                                                int resistance);
 
 /**
  * \brief               This function sets the amount of entropy grabbed on each
@@ -202,8 +201,8 @@ void mbedtls_ctr_drbg_set_prediction_resistance( mbedtls_ctr_drbg_context *ctx,
  * \param ctx           The CTR_DRBG context.
  * \param len           The amount of entropy to grab.
  */
-void mbedtls_ctr_drbg_set_entropy_len( mbedtls_ctr_drbg_context *ctx,
-                               size_t len );
+void mbedtls_ctr_drbg_set_entropy_len(mbedtls_ctr_drbg_context *ctx,
+                                      size_t len);
 
 /**
  * \brief               This function sets the reseed interval.
@@ -212,8 +211,8 @@ void mbedtls_ctr_drbg_set_entropy_len( mbedtls_ctr_drbg_context *ctx,
  * \param ctx           The CTR_DRBG context.
  * \param interval      The reseed interval.
  */
-void mbedtls_ctr_drbg_set_reseed_interval( mbedtls_ctr_drbg_context *ctx,
-                                   int interval );
+void mbedtls_ctr_drbg_set_reseed_interval(mbedtls_ctr_drbg_context *ctx,
+                                          int interval);
 
 /**
  * \brief               This function reseeds the CTR_DRBG context, that is
@@ -226,8 +225,8 @@ void mbedtls_ctr_drbg_set_reseed_interval( mbedtls_ctr_drbg_context *ctx,
  * \return              \c 0 on success.
  * \return              #MBEDTLS_ERR_CTR_DRBG_ENTROPY_SOURCE_FAILED on failure.
  */
-int mbedtls_ctr_drbg_reseed( mbedtls_ctr_drbg_context *ctx,
-                     const unsigned char *additional, size_t len );
+int mbedtls_ctr_drbg_reseed(mbedtls_ctr_drbg_context *ctx,
+                            const unsigned char *additional, size_t len);
 
 /**
  * \brief              This function updates the state of the CTR_DRBG context.
@@ -242,8 +241,8 @@ int mbedtls_ctr_drbg_reseed( mbedtls_ctr_drbg_context *ctx,
  * \param add_len      Length of \p additional data.
  *
  */
-void mbedtls_ctr_drbg_update( mbedtls_ctr_drbg_context *ctx,
-                      const unsigned char *additional, size_t add_len );
+void mbedtls_ctr_drbg_update(mbedtls_ctr_drbg_context *ctx,
+                             const unsigned char *additional, size_t add_len);
 
 /**
  * \brief   This function updates a CTR_DRBG instance with additional
@@ -262,9 +261,9 @@ void mbedtls_ctr_drbg_update( mbedtls_ctr_drbg_context *ctx,
  * \return    #MBEDTLS_ERR_CTR_DRBG_ENTROPY_SOURCE_FAILED or
  *            #MBEDTLS_ERR_CTR_DRBG_REQUEST_TOO_BIG on failure.
  */
-int mbedtls_ctr_drbg_random_with_add( void *p_rng,
-                              unsigned char *output, size_t output_len,
-                              const unsigned char *additional, size_t add_len );
+int mbedtls_ctr_drbg_random_with_add(void *p_rng,
+                                     unsigned char *output, size_t output_len,
+                                     const unsigned char *additional, size_t add_len);
 
 /**
  * \brief   This function uses CTR_DRBG to generate random data.
@@ -280,8 +279,8 @@ int mbedtls_ctr_drbg_random_with_add( void *p_rng,
  * \return              #MBEDTLS_ERR_CTR_DRBG_ENTROPY_SOURCE_FAILED or
  *                      #MBEDTLS_ERR_CTR_DRBG_REQUEST_TOO_BIG on failure.
  */
-int mbedtls_ctr_drbg_random( void *p_rng,
-                     unsigned char *output, size_t output_len );
+int mbedtls_ctr_drbg_random(void *p_rng,
+                            unsigned char *output, size_t output_len);
 
 #if defined(MBEDTLS_FS_IO)
 /**
@@ -295,7 +294,7 @@ int mbedtls_ctr_drbg_random( void *p_rng,
  * \return              #MBEDTLS_ERR_CTR_DRBG_ENTROPY_SOURCE_FAILED on
  *                      failure.
  */
-int mbedtls_ctr_drbg_write_seed_file( mbedtls_ctr_drbg_context *ctx, const char *path );
+int mbedtls_ctr_drbg_write_seed_file(mbedtls_ctr_drbg_context *ctx, const char *path);
 
 /**
  * \brief               This function reads and updates a seed file. The seed
@@ -309,7 +308,7 @@ int mbedtls_ctr_drbg_write_seed_file( mbedtls_ctr_drbg_context *ctx, const char
  * \return              #MBEDTLS_ERR_CTR_DRBG_ENTROPY_SOURCE_FAILED or
  *                      #MBEDTLS_ERR_CTR_DRBG_INPUT_TOO_BIG on failure.
  */
-int mbedtls_ctr_drbg_update_seed_file( mbedtls_ctr_drbg_context *ctx, const char *path );
+int mbedtls_ctr_drbg_update_seed_file(mbedtls_ctr_drbg_context *ctx, const char *path);
 #endif /* MBEDTLS_FS_IO */
 
 /**
@@ -318,12 +317,12 @@ int mbedtls_ctr_drbg_update_seed_file( mbedtls_ctr_drbg_context *ctx, const char
  * \return              \c 0 on success.
  * \return              \c 1 on failure.
  */
-int mbedtls_ctr_drbg_self_test( int verbose );
+int mbedtls_ctr_drbg_self_test(int verbose);
 
 /* Internal functions (do not call directly) */
-int mbedtls_ctr_drbg_seed_entropy_len( mbedtls_ctr_drbg_context *,
-                               int (*)(void *, unsigned char *, size_t), void *,
-                               const unsigned char *, size_t, size_t );
+int mbedtls_ctr_drbg_seed_entropy_len(mbedtls_ctr_drbg_context *,
+                                      int (*)(void *, unsigned char *, size_t), void *,
+                                      const unsigned char *, size_t, size_t);
 
 #ifdef __cplusplus
 }
diff --git a/common/mbedtls/des.c b/common/mbedtls/des.c
index 5c4e2cc98..54e206310 100644
--- a/common/mbedtls/des.c
+++ b/common/mbedtls/des.c
@@ -56,29 +56,28 @@
  */
 #ifndef GET_UINT32_BE
 #define GET_UINT32_BE(n,b,i)                            \
-{                                                       \
-    (n) = ( (uint32_t) (b)[(i)    ] << 24 )             \
-        | ( (uint32_t) (b)[(i) + 1] << 16 )             \
-        | ( (uint32_t) (b)[(i) + 2] <<  8 )             \
-        | ( (uint32_t) (b)[(i) + 3]       );            \
-}
+    {                                                       \
+        (n) = ( (uint32_t) (b)[(i)    ] << 24 )             \
+              | ( (uint32_t) (b)[(i) + 1] << 16 )             \
+              | ( (uint32_t) (b)[(i) + 2] <<  8 )             \
+              | ( (uint32_t) (b)[(i) + 3]       );            \
+    }
 #endif
 
 #ifndef PUT_UINT32_BE
 #define PUT_UINT32_BE(n,b,i)                            \
-{                                                       \
-    (b)[(i)    ] = (unsigned char) ( (n) >> 24 );       \
-    (b)[(i) + 1] = (unsigned char) ( (n) >> 16 );       \
-    (b)[(i) + 2] = (unsigned char) ( (n) >>  8 );       \
-    (b)[(i) + 3] = (unsigned char) ( (n)       );       \
-}
+    {                                                       \
+        (b)[(i)    ] = (unsigned char) ( (n) >> 24 );       \
+        (b)[(i) + 1] = (unsigned char) ( (n) >> 16 );       \
+        (b)[(i) + 2] = (unsigned char) ( (n) >>  8 );       \
+        (b)[(i) + 3] = (unsigned char) ( (n)       );       \
+    }
 #endif
 
 /*
  * Expanded DES S-boxes
  */
-static const uint32_t SB1[64] =
-{
+static const uint32_t SB1[64] = {
     0x01010400, 0x00000000, 0x00010000, 0x01010404,
     0x01010004, 0x00010404, 0x00000004, 0x00010000,
     0x00000400, 0x01010400, 0x01010404, 0x00000400,
@@ -97,8 +96,7 @@ static const uint32_t SB1[64] =
     0x00010004, 0x00010400, 0x00000000, 0x01010004
 };
 
-static const uint32_t SB2[64] =
-{
+static const uint32_t SB2[64] = {
     0x80108020, 0x80008000, 0x00008000, 0x00108020,
     0x00100000, 0x00000020, 0x80100020, 0x80008020,
     0x80000020, 0x80108020, 0x80108000, 0x80000000,
@@ -117,8 +115,7 @@ static const uint32_t SB2[64] =
     0x80000000, 0x80100020, 0x80108020, 0x00108000
 };
 
-static const uint32_t SB3[64] =
-{
+static const uint32_t SB3[64] = {
     0x00000208, 0x08020200, 0x00000000, 0x08020008,
     0x08000200, 0x00000000, 0x00020208, 0x08000200,
     0x00020008, 0x08000008, 0x08000008, 0x00020000,
@@ -137,8 +134,7 @@ static const uint32_t SB3[64] =
     0x00020208, 0x00000008, 0x08020008, 0x00020200
 };
 
-static const uint32_t SB4[64] =
-{
+static const uint32_t SB4[64] = {
     0x00802001, 0x00002081, 0x00002081, 0x00000080,
     0x00802080, 0x00800081, 0x00800001, 0x00002001,
     0x00000000, 0x00802000, 0x00802000, 0x00802081,
@@ -157,8 +153,7 @@ static const uint32_t SB4[64] =
     0x00000080, 0x00800000, 0x00002000, 0x00802080
 };
 
-static const uint32_t SB5[64] =
-{
+static const uint32_t SB5[64] = {
     0x00000100, 0x02080100, 0x02080000, 0x42000100,
     0x00080000, 0x00000100, 0x40000000, 0x02080000,
     0x40080100, 0x00080000, 0x02000100, 0x40080100,
@@ -177,8 +172,7 @@ static const uint32_t SB5[64] =
     0x00000000, 0x40080000, 0x02080100, 0x40000100
 };
 
-static const uint32_t SB6[64] =
-{
+static const uint32_t SB6[64] = {
     0x20000010, 0x20400000, 0x00004000, 0x20404010,
     0x20400000, 0x00000010, 0x20404010, 0x00400000,
     0x20004000, 0x00404010, 0x00400000, 0x20000010,
@@ -197,8 +191,7 @@ static const uint32_t SB6[64] =
     0x20404000, 0x20000000, 0x00400010, 0x20004010
 };
 
-static const uint32_t SB7[64] =
-{
+static const uint32_t SB7[64] = {
     0x00200000, 0x04200002, 0x04000802, 0x00000000,
     0x00000800, 0x04000802, 0x00200802, 0x04200800,
     0x04200802, 0x00200000, 0x00000000, 0x04000002,
@@ -217,8 +210,7 @@ static const uint32_t SB7[64] =
     0x04000002, 0x04000800, 0x00000800, 0x00200002
 };
 
-static const uint32_t SB8[64] =
-{
+static const uint32_t SB8[64] = {
     0x10001040, 0x00001000, 0x00040000, 0x10041040,
     0x10000000, 0x10001040, 0x00000040, 0x10000000,
     0x00040040, 0x10040000, 0x10041040, 0x00041000,
@@ -240,16 +232,14 @@ static const uint32_t SB8[64] =
 /*
  * PC1: left and right halves bit-swap
  */
-static const uint32_t LHs[16] =
-{
+static const uint32_t LHs[16] = {
     0x00000000, 0x00000001, 0x00000100, 0x00000101,
     0x00010000, 0x00010001, 0x00010100, 0x00010101,
     0x01000000, 0x01000001, 0x01000100, 0x01000101,
     0x01010000, 0x01010001, 0x01010100, 0x01010101
 };
 
-static const uint32_t RHs[16] =
-{
+static const uint32_t RHs[16] = {
     0x00000000, 0x01000000, 0x00010000, 0x01010000,
     0x00000100, 0x01000100, 0x00010100, 0x01010100,
     0x00000001, 0x01000001, 0x00010001, 0x01010001,
@@ -260,107 +250,108 @@ static const uint32_t RHs[16] =
  * Initial Permutation macro
  */
 #define DES_IP(X,Y)                                             \
-{                                                               \
-    T = ((X >>  4) ^ Y) & 0x0F0F0F0F; Y ^= T; X ^= (T <<  4);   \
-    T = ((X >> 16) ^ Y) & 0x0000FFFF; Y ^= T; X ^= (T << 16);   \
-    T = ((Y >>  2) ^ X) & 0x33333333; X ^= T; Y ^= (T <<  2);   \
-    T = ((Y >>  8) ^ X) & 0x00FF00FF; X ^= T; Y ^= (T <<  8);   \
-    Y = ((Y << 1) | (Y >> 31)) & 0xFFFFFFFF;                    \
-    T = (X ^ Y) & 0xAAAAAAAA; Y ^= T; X ^= T;                   \
-    X = ((X << 1) | (X >> 31)) & 0xFFFFFFFF;                    \
-}
+    {                                                               \
+        T = ((X >>  4) ^ Y) & 0x0F0F0F0F; Y ^= T; X ^= (T <<  4);   \
+        T = ((X >> 16) ^ Y) & 0x0000FFFF; Y ^= T; X ^= (T << 16);   \
+        T = ((Y >>  2) ^ X) & 0x33333333; X ^= T; Y ^= (T <<  2);   \
+        T = ((Y >>  8) ^ X) & 0x00FF00FF; X ^= T; Y ^= (T <<  8);   \
+        Y = ((Y << 1) | (Y >> 31)) & 0xFFFFFFFF;                    \
+        T = (X ^ Y) & 0xAAAAAAAA; Y ^= T; X ^= T;                   \
+        X = ((X << 1) | (X >> 31)) & 0xFFFFFFFF;                    \
+    }
 
 /*
  * Final Permutation macro
  */
 #define DES_FP(X,Y)                                             \
-{                                                               \
-    X = ((X << 31) | (X >> 1)) & 0xFFFFFFFF;                    \
-    T = (X ^ Y) & 0xAAAAAAAA; X ^= T; Y ^= T;                   \
-    Y = ((Y << 31) | (Y >> 1)) & 0xFFFFFFFF;                    \
-    T = ((Y >>  8) ^ X) & 0x00FF00FF; X ^= T; Y ^= (T <<  8);   \
-    T = ((Y >>  2) ^ X) & 0x33333333; X ^= T; Y ^= (T <<  2);   \
-    T = ((X >> 16) ^ Y) & 0x0000FFFF; Y ^= T; X ^= (T << 16);   \
-    T = ((X >>  4) ^ Y) & 0x0F0F0F0F; Y ^= T; X ^= (T <<  4);   \
-}
+    {                                                               \
+        X = ((X << 31) | (X >> 1)) & 0xFFFFFFFF;                    \
+        T = (X ^ Y) & 0xAAAAAAAA; X ^= T; Y ^= T;                   \
+        Y = ((Y << 31) | (Y >> 1)) & 0xFFFFFFFF;                    \
+        T = ((Y >>  8) ^ X) & 0x00FF00FF; X ^= T; Y ^= (T <<  8);   \
+        T = ((Y >>  2) ^ X) & 0x33333333; X ^= T; Y ^= (T <<  2);   \
+        T = ((X >> 16) ^ Y) & 0x0000FFFF; Y ^= T; X ^= (T << 16);   \
+        T = ((X >>  4) ^ Y) & 0x0F0F0F0F; Y ^= T; X ^= (T <<  4);   \
+    }
 
 /*
  * DES round macro
  */
 #define DES_ROUND(X,Y)                          \
-{                                               \
-    T = *SK++ ^ X;                              \
-    Y ^= SB8[ (T      ) & 0x3F ] ^              \
-         SB6[ (T >>  8) & 0x3F ] ^              \
-         SB4[ (T >> 16) & 0x3F ] ^              \
-         SB2[ (T >> 24) & 0x3F ];               \
-                                                \
-    T = *SK++ ^ ((X << 28) | (X >> 4));         \
-    Y ^= SB7[ (T      ) & 0x3F ] ^              \
-         SB5[ (T >>  8) & 0x3F ] ^              \
-         SB3[ (T >> 16) & 0x3F ] ^              \
-         SB1[ (T >> 24) & 0x3F ];               \
-}
+    {                                               \
+        T = *SK++ ^ X;                              \
+        Y ^= SB8[ (T      ) & 0x3F ] ^              \
+             SB6[ (T >>  8) & 0x3F ] ^              \
+             SB4[ (T >> 16) & 0x3F ] ^              \
+             SB2[ (T >> 24) & 0x3F ];               \
+        \
+        T = *SK++ ^ ((X << 28) | (X >> 4));         \
+        Y ^= SB7[ (T      ) & 0x3F ] ^              \
+             SB5[ (T >>  8) & 0x3F ] ^              \
+             SB3[ (T >> 16) & 0x3F ] ^              \
+             SB1[ (T >> 24) & 0x3F ];               \
+    }
 
 #define SWAP(a,b) { uint32_t t = a; a = b; b = t; t = 0; }
 
-void mbedtls_des_init( mbedtls_des_context *ctx )
+void mbedtls_des_init(mbedtls_des_context *ctx)
 {
-    memset( ctx, 0, sizeof( mbedtls_des_context ) );
+    memset(ctx, 0, sizeof(mbedtls_des_context));
 }
 
-void mbedtls_des_free( mbedtls_des_context *ctx )
+void mbedtls_des_free(mbedtls_des_context *ctx)
 {
-    if( ctx == NULL )
+    if (ctx == NULL)
         return;
 
-    mbedtls_platform_zeroize( ctx, sizeof( mbedtls_des_context ) );
+    mbedtls_platform_zeroize(ctx, sizeof(mbedtls_des_context));
 }
 
-void mbedtls_des3_init( mbedtls_des3_context *ctx )
+void mbedtls_des3_init(mbedtls_des3_context *ctx)
 {
-    memset( ctx, 0, sizeof( mbedtls_des3_context ) );
+    memset(ctx, 0, sizeof(mbedtls_des3_context));
 }
 
-void mbedtls_des3_free( mbedtls_des3_context *ctx )
+void mbedtls_des3_free(mbedtls_des3_context *ctx)
 {
-    if( ctx == NULL )
+    if (ctx == NULL)
         return;
 
-    mbedtls_platform_zeroize( ctx, sizeof( mbedtls_des3_context ) );
+    mbedtls_platform_zeroize(ctx, sizeof(mbedtls_des3_context));
 }
 
 static const unsigned char odd_parity_table[128] = { 1,  2,  4,  7,  8,
-        11, 13, 14, 16, 19, 21, 22, 25, 26, 28, 31, 32, 35, 37, 38, 41, 42, 44,
-        47, 49, 50, 52, 55, 56, 59, 61, 62, 64, 67, 69, 70, 73, 74, 76, 79, 81,
-        82, 84, 87, 88, 91, 93, 94, 97, 98, 100, 103, 104, 107, 109, 110, 112,
-        115, 117, 118, 121, 122, 124, 127, 128, 131, 133, 134, 137, 138, 140,
-        143, 145, 146, 148, 151, 152, 155, 157, 158, 161, 162, 164, 167, 168,
-        171, 173, 174, 176, 179, 181, 182, 185, 186, 188, 191, 193, 194, 196,
-        199, 200, 203, 205, 206, 208, 211, 213, 214, 217, 218, 220, 223, 224,
-        227, 229, 230, 233, 234, 236, 239, 241, 242, 244, 247, 248, 251, 253,
-        254 };
+                                                     11, 13, 14, 16, 19, 21, 22, 25, 26, 28, 31, 32, 35, 37, 38, 41, 42, 44,
+                                                     47, 49, 50, 52, 55, 56, 59, 61, 62, 64, 67, 69, 70, 73, 74, 76, 79, 81,
+                                                     82, 84, 87, 88, 91, 93, 94, 97, 98, 100, 103, 104, 107, 109, 110, 112,
+                                                     115, 117, 118, 121, 122, 124, 127, 128, 131, 133, 134, 137, 138, 140,
+                                                     143, 145, 146, 148, 151, 152, 155, 157, 158, 161, 162, 164, 167, 168,
+                                                     171, 173, 174, 176, 179, 181, 182, 185, 186, 188, 191, 193, 194, 196,
+                                                     199, 200, 203, 205, 206, 208, 211, 213, 214, 217, 218, 220, 223, 224,
+                                                     227, 229, 230, 233, 234, 236, 239, 241, 242, 244, 247, 248, 251, 253,
+                                                     254
+                                                   };
 
-void mbedtls_des_key_set_parity( unsigned char key[MBEDTLS_DES_KEY_SIZE] )
+void mbedtls_des_key_set_parity(unsigned char key[MBEDTLS_DES_KEY_SIZE])
 {
     int i;
 
-    for( i = 0; i < MBEDTLS_DES_KEY_SIZE; i++ )
+    for (i = 0; i < MBEDTLS_DES_KEY_SIZE; i++)
         key[i] = odd_parity_table[key[i] / 2];
 }
 
 /*
  * Check the given key's parity, returns 1 on failure, 0 on SUCCESS
  */
-int mbedtls_des_key_check_key_parity( const unsigned char key[MBEDTLS_DES_KEY_SIZE] )
+int mbedtls_des_key_check_key_parity(const unsigned char key[MBEDTLS_DES_KEY_SIZE])
 {
     int i;
 
-    for( i = 0; i < MBEDTLS_DES_KEY_SIZE; i++ )
-        if( key[i] != odd_parity_table[key[i] / 2] )
-            return( 1 );
+    for (i = 0; i < MBEDTLS_DES_KEY_SIZE; i++)
+        if (key[i] != odd_parity_table[key[i] / 2])
+            return (1);
 
-    return( 0 );
+    return (0);
 }
 
 /*
@@ -386,8 +377,7 @@ int mbedtls_des_key_check_key_parity( const unsigned char key[MBEDTLS_DES_KEY_SI
 
 #define WEAK_KEY_COUNT 16
 
-static const unsigned char weak_key_table[WEAK_KEY_COUNT][MBEDTLS_DES_KEY_SIZE] =
-{
+static const unsigned char weak_key_table[WEAK_KEY_COUNT][MBEDTLS_DES_KEY_SIZE] = {
     { 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 },
     { 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE },
     { 0x1F, 0x1F, 0x1F, 0x1F, 0x0E, 0x0E, 0x0E, 0x0E },
@@ -407,41 +397,45 @@ static const unsigned char weak_key_table[WEAK_KEY_COUNT][MBEDTLS_DES_KEY_SIZE]
     { 0xFE, 0xE0, 0xFE, 0xE0, 0xFE, 0xF1, 0xFE, 0xF1 }
 };
 
-int mbedtls_des_key_check_weak( const unsigned char key[MBEDTLS_DES_KEY_SIZE] )
+int mbedtls_des_key_check_weak(const unsigned char key[MBEDTLS_DES_KEY_SIZE])
 {
     int i;
 
-    for( i = 0; i < WEAK_KEY_COUNT; i++ )
-        if( memcmp( weak_key_table[i], key, MBEDTLS_DES_KEY_SIZE) == 0 )
-            return( 1 );
+    for (i = 0; i < WEAK_KEY_COUNT; i++)
+        if (memcmp(weak_key_table[i], key, MBEDTLS_DES_KEY_SIZE) == 0)
+            return (1);
 
-    return( 0 );
+    return (0);
 }
 
 #if !defined(MBEDTLS_DES_SETKEY_ALT)
-void mbedtls_des_setkey( uint32_t SK[32], const unsigned char key[MBEDTLS_DES_KEY_SIZE] )
+void mbedtls_des_setkey(uint32_t SK[32], const unsigned char key[MBEDTLS_DES_KEY_SIZE])
 {
     int i;
     uint32_t X, Y, T;
 
-    GET_UINT32_BE( X, key, 0 );
-    GET_UINT32_BE( Y, key, 4 );
+    GET_UINT32_BE(X, key, 0);
+    GET_UINT32_BE(Y, key, 4);
 
     /*
      * Permuted Choice 1
      */
-    T =  ((Y >>  4) ^ X) & 0x0F0F0F0F;  X ^= T; Y ^= (T <<  4);
-    T =  ((Y      ) ^ X) & 0x10101010;  X ^= T; Y ^= (T      );
+    T = ((Y >>  4) ^ X) & 0x0F0F0F0F;
+    X ^= T;
+    Y ^= (T <<  4);
+    T = ((Y) ^ X) & 0x10101010;
+    X ^= T;
+    Y ^= (T);
 
-    X =   (LHs[ (X      ) & 0xF] << 3) | (LHs[ (X >>  8) & 0xF ] << 2)
-        | (LHs[ (X >> 16) & 0xF] << 1) | (LHs[ (X >> 24) & 0xF ]     )
-        | (LHs[ (X >>  5) & 0xF] << 7) | (LHs[ (X >> 13) & 0xF ] << 6)
-        | (LHs[ (X >> 21) & 0xF] << 5) | (LHs[ (X >> 29) & 0xF ] << 4);
+    X = (LHs[(X) & 0xF] << 3) | (LHs[(X >>  8) & 0xF ] << 2)
+        | (LHs[(X >> 16) & 0xF] << 1) | (LHs[(X >> 24) & 0xF ])
+        | (LHs[(X >>  5) & 0xF] << 7) | (LHs[(X >> 13) & 0xF ] << 6)
+        | (LHs[(X >> 21) & 0xF] << 5) | (LHs[(X >> 29) & 0xF ] << 4);
 
-    Y =   (RHs[ (Y >>  1) & 0xF] << 3) | (RHs[ (Y >>  9) & 0xF ] << 2)
-        | (RHs[ (Y >> 17) & 0xF] << 1) | (RHs[ (Y >> 25) & 0xF ]     )
-        | (RHs[ (Y >>  4) & 0xF] << 7) | (RHs[ (Y >> 12) & 0xF ] << 6)
-        | (RHs[ (Y >> 20) & 0xF] << 5) | (RHs[ (Y >> 28) & 0xF ] << 4);
+    Y = (RHs[(Y >>  1) & 0xF] << 3) | (RHs[(Y >>  9) & 0xF ] << 2)
+        | (RHs[(Y >> 17) & 0xF] << 1) | (RHs[(Y >> 25) & 0xF ])
+        | (RHs[(Y >>  4) & 0xF] << 7) | (RHs[(Y >> 12) & 0xF ] << 6)
+        | (RHs[(Y >> 20) & 0xF] << 5) | (RHs[(Y >> 28) & 0xF ] << 4);
 
     X &= 0x0FFFFFFF;
     Y &= 0x0FFFFFFF;
@@ -449,32 +443,28 @@ void mbedtls_des_setkey( uint32_t SK[32], const unsigned char key[MBEDTLS_DES_KE
     /*
      * calculate subkeys
      */
-    for( i = 0; i < 16; i++ )
-    {
-        if( i < 2 || i == 8 || i == 15 )
-        {
+    for (i = 0; i < 16; i++) {
+        if (i < 2 || i == 8 || i == 15) {
             X = ((X <<  1) | (X >> 27)) & 0x0FFFFFFF;
             Y = ((Y <<  1) | (Y >> 27)) & 0x0FFFFFFF;
-        }
-        else
-        {
+        } else {
             X = ((X <<  2) | (X >> 26)) & 0x0FFFFFFF;
             Y = ((Y <<  2) | (Y >> 26)) & 0x0FFFFFFF;
         }
 
-        *SK++ =   ((X <<  4) & 0x24000000) | ((X << 28) & 0x10000000)
+        *SK++ = ((X <<  4) & 0x24000000) | ((X << 28) & 0x10000000)
                 | ((X << 14) & 0x08000000) | ((X << 18) & 0x02080000)
                 | ((X <<  6) & 0x01000000) | ((X <<  9) & 0x00200000)
                 | ((X >>  1) & 0x00100000) | ((X << 10) & 0x00040000)
                 | ((X <<  2) & 0x00020000) | ((X >> 10) & 0x00010000)
                 | ((Y >> 13) & 0x00002000) | ((Y >>  4) & 0x00001000)
                 | ((Y <<  6) & 0x00000800) | ((Y >>  1) & 0x00000400)
-                | ((Y >> 14) & 0x00000200) | ((Y      ) & 0x00000100)
+                | ((Y >> 14) & 0x00000200) | ((Y) & 0x00000100)
                 | ((Y >>  5) & 0x00000020) | ((Y >> 10) & 0x00000010)
                 | ((Y >>  3) & 0x00000008) | ((Y >> 18) & 0x00000004)
                 | ((Y >> 26) & 0x00000002) | ((Y >> 24) & 0x00000001);
 
-        *SK++ =   ((X << 15) & 0x20000000) | ((X << 17) & 0x10000000)
+        *SK++ = ((X << 15) & 0x20000000) | ((X << 17) & 0x10000000)
                 | ((X << 10) & 0x08000000) | ((X << 22) & 0x04000000)
                 | ((X >>  2) & 0x02000000) | ((X <<  1) & 0x01000000)
                 | ((X << 16) & 0x00200000) | ((X << 11) & 0x00100000)
@@ -482,7 +472,7 @@ void mbedtls_des_setkey( uint32_t SK[32], const unsigned char key[MBEDTLS_DES_KE
                 | ((X << 15) & 0x00020000) | ((X >>  4) & 0x00010000)
                 | ((Y >>  2) & 0x00002000) | ((Y <<  8) & 0x00001000)
                 | ((Y >> 14) & 0x00000808) | ((Y >>  9) & 0x00000400)
-                | ((Y      ) & 0x00000200) | ((Y <<  7) & 0x00000100)
+                | ((Y) & 0x00000200) | ((Y <<  7) & 0x00000100)
                 | ((Y >>  7) & 0x00000020) | ((Y >>  3) & 0x00000011)
                 | ((Y <<  2) & 0x00000004) | ((Y >> 21) & 0x00000002);
     }
@@ -492,42 +482,40 @@ void mbedtls_des_setkey( uint32_t SK[32], const unsigned char key[MBEDTLS_DES_KE
 /*
  * DES key schedule (56-bit, encryption)
  */
-int mbedtls_des_setkey_enc( mbedtls_des_context *ctx, const unsigned char key[MBEDTLS_DES_KEY_SIZE] )
+int mbedtls_des_setkey_enc(mbedtls_des_context *ctx, const unsigned char key[MBEDTLS_DES_KEY_SIZE])
 {
-    mbedtls_des_setkey( ctx->sk, key );
+    mbedtls_des_setkey(ctx->sk, key);
 
-    return( 0 );
+    return (0);
 }
 
 /*
  * DES key schedule (56-bit, decryption)
  */
-int mbedtls_des_setkey_dec( mbedtls_des_context *ctx, const unsigned char key[MBEDTLS_DES_KEY_SIZE] )
+int mbedtls_des_setkey_dec(mbedtls_des_context *ctx, const unsigned char key[MBEDTLS_DES_KEY_SIZE])
 {
     int i;
 
-    mbedtls_des_setkey( ctx->sk, key );
+    mbedtls_des_setkey(ctx->sk, key);
 
-    for( i = 0; i < 16; i += 2 )
-    {
-        SWAP( ctx->sk[i    ], ctx->sk[30 - i] );
-        SWAP( ctx->sk[i + 1], ctx->sk[31 - i] );
+    for (i = 0; i < 16; i += 2) {
+        SWAP(ctx->sk[i    ], ctx->sk[30 - i]);
+        SWAP(ctx->sk[i + 1], ctx->sk[31 - i]);
     }
 
-    return( 0 );
+    return (0);
 }
 
-static void des3_set2key( uint32_t esk[96],
-                          uint32_t dsk[96],
-                          const unsigned char key[MBEDTLS_DES_KEY_SIZE*2] )
+static void des3_set2key(uint32_t esk[96],
+                         uint32_t dsk[96],
+                         const unsigned char key[MBEDTLS_DES_KEY_SIZE * 2])
 {
     int i;
 
-    mbedtls_des_setkey( esk, key );
-    mbedtls_des_setkey( dsk + 32, key + 8 );
+    mbedtls_des_setkey(esk, key);
+    mbedtls_des_setkey(dsk + 32, key + 8);
 
-    for( i = 0; i < 32; i += 2 )
-    {
+    for (i = 0; i < 32; i += 2) {
         dsk[i     ] = esk[30 - i];
         dsk[i +  1] = esk[31 - i];
 
@@ -545,43 +533,42 @@ static void des3_set2key( uint32_t esk[96],
 /*
  * Triple-DES key schedule (112-bit, encryption)
  */
-int mbedtls_des3_set2key_enc( mbedtls_des3_context *ctx,
-                      const unsigned char key[MBEDTLS_DES_KEY_SIZE * 2] )
+int mbedtls_des3_set2key_enc(mbedtls_des3_context *ctx,
+                             const unsigned char key[MBEDTLS_DES_KEY_SIZE * 2])
 {
     uint32_t sk[96];
 
-    des3_set2key( ctx->sk, sk, key );
-    mbedtls_platform_zeroize( sk,  sizeof( sk ) );
+    des3_set2key(ctx->sk, sk, key);
+    mbedtls_platform_zeroize(sk,  sizeof(sk));
 
-    return( 0 );
+    return (0);
 }
 
 /*
  * Triple-DES key schedule (112-bit, decryption)
  */
-int mbedtls_des3_set2key_dec( mbedtls_des3_context *ctx,
-                      const unsigned char key[MBEDTLS_DES_KEY_SIZE * 2] )
+int mbedtls_des3_set2key_dec(mbedtls_des3_context *ctx,
+                             const unsigned char key[MBEDTLS_DES_KEY_SIZE * 2])
 {
     uint32_t sk[96];
 
-    des3_set2key( sk, ctx->sk, key );
-    mbedtls_platform_zeroize( sk,  sizeof( sk ) );
+    des3_set2key(sk, ctx->sk, key);
+    mbedtls_platform_zeroize(sk,  sizeof(sk));
 
-    return( 0 );
+    return (0);
 }
 
-static void des3_set3key( uint32_t esk[96],
-                          uint32_t dsk[96],
-                          const unsigned char key[24] )
+static void des3_set3key(uint32_t esk[96],
+                         uint32_t dsk[96],
+                         const unsigned char key[24])
 {
     int i;
 
-    mbedtls_des_setkey( esk, key );
-    mbedtls_des_setkey( dsk + 32, key +  8 );
-    mbedtls_des_setkey( esk + 64, key + 16 );
+    mbedtls_des_setkey(esk, key);
+    mbedtls_des_setkey(dsk + 32, key +  8);
+    mbedtls_des_setkey(esk + 64, key + 16);
 
-    for( i = 0; i < 32; i += 2 )
-    {
+    for (i = 0; i < 32; i += 2) {
         dsk[i     ] = esk[94 - i];
         dsk[i +  1] = esk[95 - i];
 
@@ -596,61 +583,60 @@ static void des3_set3key( uint32_t esk[96],
 /*
  * Triple-DES key schedule (168-bit, encryption)
  */
-int mbedtls_des3_set3key_enc( mbedtls_des3_context *ctx,
-                      const unsigned char key[MBEDTLS_DES_KEY_SIZE * 3] )
+int mbedtls_des3_set3key_enc(mbedtls_des3_context *ctx,
+                             const unsigned char key[MBEDTLS_DES_KEY_SIZE * 3])
 {
     uint32_t sk[96];
 
-    des3_set3key( ctx->sk, sk, key );
-    mbedtls_platform_zeroize( sk,  sizeof( sk ) );
+    des3_set3key(ctx->sk, sk, key);
+    mbedtls_platform_zeroize(sk,  sizeof(sk));
 
-    return( 0 );
+    return (0);
 }
 
 /*
  * Triple-DES key schedule (168-bit, decryption)
  */
-int mbedtls_des3_set3key_dec( mbedtls_des3_context *ctx,
-                      const unsigned char key[MBEDTLS_DES_KEY_SIZE * 3] )
+int mbedtls_des3_set3key_dec(mbedtls_des3_context *ctx,
+                             const unsigned char key[MBEDTLS_DES_KEY_SIZE * 3])
 {
     uint32_t sk[96];
 
-    des3_set3key( sk, ctx->sk, key );
-    mbedtls_platform_zeroize( sk,  sizeof( sk ) );
+    des3_set3key(sk, ctx->sk, key);
+    mbedtls_platform_zeroize(sk,  sizeof(sk));
 
-    return( 0 );
+    return (0);
 }
 
 /*
  * DES-ECB block encryption/decryption
  */
 #if !defined(MBEDTLS_DES_CRYPT_ECB_ALT)
-int mbedtls_des_crypt_ecb( mbedtls_des_context *ctx,
-                    const unsigned char input[8],
-                    unsigned char output[8] )
+int mbedtls_des_crypt_ecb(mbedtls_des_context *ctx,
+                          const unsigned char input[8],
+                          unsigned char output[8])
 {
     int i;
     uint32_t X, Y, T, *SK;
 
     SK = ctx->sk;
 
-    GET_UINT32_BE( X, input, 0 );
-    GET_UINT32_BE( Y, input, 4 );
+    GET_UINT32_BE(X, input, 0);
+    GET_UINT32_BE(Y, input, 4);
 
-    DES_IP( X, Y );
+    DES_IP(X, Y);
 
-    for( i = 0; i < 8; i++ )
-    {
-        DES_ROUND( Y, X );
-        DES_ROUND( X, Y );
+    for (i = 0; i < 8; i++) {
+        DES_ROUND(Y, X);
+        DES_ROUND(X, Y);
     }
 
-    DES_FP( Y, X );
+    DES_FP(Y, X);
 
-    PUT_UINT32_BE( Y, output, 0 );
-    PUT_UINT32_BE( X, output, 4 );
+    PUT_UINT32_BE(Y, output, 0);
+    PUT_UINT32_BE(X, output, 4);
 
-    return( 0 );
+    return (0);
 }
 #endif /* !MBEDTLS_DES_CRYPT_ECB_ALT */
 
@@ -658,45 +644,40 @@ int mbedtls_des_crypt_ecb( mbedtls_des_context *ctx,
 /*
  * DES-CBC buffer encryption/decryption
  */
-int mbedtls_des_crypt_cbc( mbedtls_des_context *ctx,
-                    int mode,
-                    size_t length,
-                    unsigned char iv[8],
-                    const unsigned char *input,
-                    unsigned char *output )
+int mbedtls_des_crypt_cbc(mbedtls_des_context *ctx,
+                          int mode,
+                          size_t length,
+                          unsigned char iv[8],
+                          const unsigned char *input,
+                          unsigned char *output)
 {
     int i;
     unsigned char temp[8];
 
-    if( length % 8 )
-        return( MBEDTLS_ERR_DES_INVALID_INPUT_LENGTH );
+    if (length % 8)
+        return (MBEDTLS_ERR_DES_INVALID_INPUT_LENGTH);
 
-    if( mode == MBEDTLS_DES_ENCRYPT )
-    {
-        while( length > 0 )
-        {
-            for( i = 0; i < 8; i++ )
-                output[i] = (unsigned char)( input[i] ^ iv[i] );
+    if (mode == MBEDTLS_DES_ENCRYPT) {
+        while (length > 0) {
+            for (i = 0; i < 8; i++)
+                output[i] = (unsigned char)(input[i] ^ iv[i]);
 
-            mbedtls_des_crypt_ecb( ctx, output, output );
-            memcpy( iv, output, 8 );
+            mbedtls_des_crypt_ecb(ctx, output, output);
+            memcpy(iv, output, 8);
 
             input  += 8;
             output += 8;
             length -= 8;
         }
-    }
-    else /* MBEDTLS_DES_DECRYPT */
-    {
-        while( length > 0 )
-        {
-            memcpy( temp, input, 8 );
-            mbedtls_des_crypt_ecb( ctx, input, output );
+    } else { /* MBEDTLS_DES_DECRYPT */
+        while (length > 0) {
+            memcpy(temp, input, 8);
+            mbedtls_des_crypt_ecb(ctx, input, output);
 
-            for( i = 0; i < 8; i++ )
-                output[i] = (unsigned char)( output[i] ^ iv[i] );
+            for (i = 0; i < 8; i++)
+                output[i] = (unsigned char)(output[i] ^ iv[i]);
 
-            memcpy( iv, temp, 8 );
+            memcpy(iv, temp, 8);
 
             input  += 8;
             output += 8;
@@ -704,7 +685,7 @@ int mbedtls_des_crypt_cbc( mbedtls_des_context *ctx,
         }
     }
 
-    return( 0 );
+    return (0);
 }
 #endif /* MBEDTLS_CIPHER_MODE_CBC */
 
@@ -712,44 +693,41 @@ int mbedtls_des_crypt_cbc( mbedtls_des_context *ctx,
  * 3DES-ECB block encryption/decryption
  */
 #if !defined(MBEDTLS_DES3_CRYPT_ECB_ALT)
-int mbedtls_des3_crypt_ecb( mbedtls_des3_context *ctx,
-                     const unsigned char input[8],
-                     unsigned char output[8] )
+int mbedtls_des3_crypt_ecb(mbedtls_des3_context *ctx,
+                           const unsigned char input[8],
+                           unsigned char output[8])
 {
     int i;
     uint32_t X, Y, T, *SK;
 
     SK = ctx->sk;
 
-    GET_UINT32_BE( X, input, 0 );
-    GET_UINT32_BE( Y, input, 4 );
+    GET_UINT32_BE(X, input, 0);
+    GET_UINT32_BE(Y, input, 4);
 
-    DES_IP( X, Y );
+    DES_IP(X, Y);
 
-    for( i = 0; i < 8; i++ )
-    {
-        DES_ROUND( Y, X );
-        DES_ROUND( X, Y );
+    for (i = 0; i < 8; i++) {
+        DES_ROUND(Y, X);
+        DES_ROUND(X, Y);
     }
 
-    for( i = 0; i < 8; i++ )
-    {
-        DES_ROUND( X, Y );
-        DES_ROUND( Y, X );
+    for (i = 0; i < 8; i++) {
+        DES_ROUND(X, Y);
+        DES_ROUND(Y, X);
     }
 
-    for( i = 0; i < 8; i++ )
-    {
-        DES_ROUND( Y, X );
-        DES_ROUND( X, Y );
+    for (i = 0; i < 8; i++) {
+        DES_ROUND(Y, X);
+        DES_ROUND(X, Y);
     }
 
-    DES_FP( Y, X );
+    DES_FP(Y, X);
 
-    PUT_UINT32_BE( Y, output, 0 );
-    PUT_UINT32_BE( X, output, 4 );
+    PUT_UINT32_BE(Y, output, 0);
+    PUT_UINT32_BE(X, output, 4);
 
-    return( 0 );
+    return (0);
 }
 #endif /* !MBEDTLS_DES3_CRYPT_ECB_ALT */
 
@@ -757,45 +735,40 @@ int mbedtls_des3_crypt_ecb( mbedtls_des3_context *ctx,
 /*
  * 3DES-CBC buffer encryption/decryption
  */
-int mbedtls_des3_crypt_cbc( mbedtls_des3_context *ctx,
-                     int mode,
-                     size_t length,
-                     unsigned char iv[8],
-                     const unsigned char *input,
-                     unsigned char *output )
+int mbedtls_des3_crypt_cbc(mbedtls_des3_context *ctx,
+                           int mode,
+                           size_t length,
+                           unsigned char iv[8],
+                           const unsigned char *input,
+                           unsigned char *output)
 {
     int i;
     unsigned char temp[8];
 
-    if( length % 8 )
-        return( MBEDTLS_ERR_DES_INVALID_INPUT_LENGTH );
+    if (length % 8)
+        return (MBEDTLS_ERR_DES_INVALID_INPUT_LENGTH);
 
-    if( mode == MBEDTLS_DES_ENCRYPT )
-    {
-        while( length > 0 )
-        {
-            for( i = 0; i < 8; i++ )
-                output[i] = (unsigned char)( input[i] ^ iv[i] );
+    if (mode == MBEDTLS_DES_ENCRYPT) {
+        while (length > 0) {
+            for (i = 0; i < 8; i++)
+                output[i] = (unsigned char)(input[i] ^ iv[i]);
 
-            mbedtls_des3_crypt_ecb( ctx, output, output );
-            memcpy( iv, output, 8 );
+            mbedtls_des3_crypt_ecb(ctx, output, output);
+            memcpy(iv, output, 8);
 
             input  += 8;
             output += 8;
             length -= 8;
         }
-    }
-    else /* MBEDTLS_DES_DECRYPT */
-    {
-        while( length > 0 )
-        {
-            memcpy( temp, input, 8 );
-            mbedtls_des3_crypt_ecb( ctx, input, output );
+    } else { /* MBEDTLS_DES_DECRYPT */
+        while (length > 0) {
+            memcpy(temp, input, 8);
+            mbedtls_des3_crypt_ecb(ctx, input, output);
 
-            for( i = 0; i < 8; i++ )
-                output[i] = (unsigned char)( output[i] ^ iv[i] );
+            for (i = 0; i < 8; i++)
+                output[i] = (unsigned char)(output[i] ^ iv[i]);
 
-            memcpy( iv, temp, 8 );
+            memcpy(iv, temp, 8);
 
             input  += 8;
             output += 8;
@@ -803,7 +776,7 @@ int mbedtls_des3_crypt_cbc( mbedtls_des3_context *ctx,
         }
     }
 
-    return( 0 );
+    return (0);
 }
 #endif /* MBEDTLS_CIPHER_MODE_CBC */
 
@@ -815,47 +788,40 @@ int mbedtls_des3_crypt_cbc( mbedtls_des3_context *ctx,
  *
  * http://csrc.nist.gov/groups/STM/cavp/documents/des/tripledes-vectors.zip
  */
-static const unsigned char des3_test_keys[24] =
-{
+static const unsigned char des3_test_keys[24] = {
     0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF,
     0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF, 0x01,
     0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF, 0x01, 0x23
 };
 
-static const unsigned char des3_test_buf[8] =
-{
+static const unsigned char des3_test_buf[8] = {
     0x4E, 0x6F, 0x77, 0x20, 0x69, 0x73, 0x20, 0x74
 };
 
-static const unsigned char des3_test_ecb_dec[3][8] =
-{
+static const unsigned char des3_test_ecb_dec[3][8] = {
     { 0xCD, 0xD6, 0x4F, 0x2F, 0x94, 0x27, 0xC1, 0x5D },
     { 0x69, 0x96, 0xC8, 0xFA, 0x47, 0xA2, 0xAB, 0xEB },
     { 0x83, 0x25, 0x39, 0x76, 0x44, 0x09, 0x1A, 0x0A }
 };
 
-static const unsigned char des3_test_ecb_enc[3][8] =
-{
+static const unsigned char des3_test_ecb_enc[3][8] = {
     { 0x6A, 0x2A, 0x19, 0xF4, 0x1E, 0xCA, 0x85, 0x4B },
     { 0x03, 0xE6, 0x9F, 0x5B, 0xFA, 0x58, 0xEB, 0x42 },
     { 0xDD, 0x17, 0xE8, 0xB8, 0xB4, 0x37, 0xD2, 0x32 }
 };
 
 #if defined(MBEDTLS_CIPHER_MODE_CBC)
-static const unsigned char des3_test_iv[8] =
-{
+static const unsigned char des3_test_iv[8] = {
     0x12, 0x34, 0x56, 0x78, 0x90, 0xAB, 0xCD, 0xEF,
 };
 
-static const unsigned char des3_test_cbc_dec[3][8] =
-{
+static const unsigned char des3_test_cbc_dec[3][8] = {
     { 0x12, 0x9F, 0x40, 0xB9, 0xD2, 0x00, 0x56, 0xB3 },
     { 0x47, 0x0E, 0xFC, 0x9A, 0x6B, 0x8E, 0xE3, 0x93 },
     { 0xC5, 0xCE, 0xCF, 0x63, 0xEC, 0xEC, 0x51, 0x4C }
 };
 
-static const unsigned char des3_test_cbc_enc[3][8] =
-{
+static const unsigned char des3_test_cbc_enc[3][8] = {
     { 0x54, 0xF1, 0x5A, 0xF6, 0xEB, 0xE3, 0xA4, 0xB4 },
     { 0x35, 0x76, 0x11, 0x56, 0x5F, 0xA1, 0x8E, 0x4D },
     { 0xCB, 0x19, 0x1F, 0x85, 0xD1, 0xED, 0x84, 0x39 }
@@ -865,7 +831,7 @@ static const unsigned char des3_test_cbc_enc[3][8] =
 /*
  * Checkup routine
  */
-int mbedtls_des_self_test( int verbose )
+int mbedtls_des_self_test(int verbose)
 {
     int i, j, u, v, ret = 0;
     mbedtls_des_context ctx;
@@ -876,182 +842,170 @@ int mbedtls_des_self_test( int verbose )
     unsigned char iv[8];
 #endif
 
-    mbedtls_des_init( &ctx );
-    mbedtls_des3_init( &ctx3 );
+    mbedtls_des_init(&ctx);
+    mbedtls_des3_init(&ctx3);
     /*
      * ECB mode
      */
-    for( i = 0; i < 6; i++ )
-    {
+    for (i = 0; i < 6; i++) {
         u = i >> 1;
         v = i  & 1;
 
-        if( verbose != 0 )
-            mbedtls_printf( "  DES%c-ECB-%3d (%s): ",
-                             ( u == 0 ) ? ' ' : '3', 56 + u * 56,
-                             ( v == MBEDTLS_DES_DECRYPT ) ? "dec" : "enc" );
+        if (verbose != 0)
+            mbedtls_printf("  DES%c-ECB-%3d (%s): ",
+                           (u == 0) ? ' ' : '3', 56 + u * 56,
+                           (v == MBEDTLS_DES_DECRYPT) ? "dec" : "enc");
 
-        memcpy( buf, des3_test_buf, 8 );
+        memcpy(buf, des3_test_buf, 8);
 
-        switch( i )
-        {
-        case 0:
-            mbedtls_des_setkey_dec( &ctx, des3_test_keys );
-            break;
+        switch (i) {
+            case 0:
+                mbedtls_des_setkey_dec(&ctx, des3_test_keys);
+                break;
 
-        case 1:
-            mbedtls_des_setkey_enc( &ctx, des3_test_keys );
-            break;
+            case 1:
+                mbedtls_des_setkey_enc(&ctx, des3_test_keys);
+                break;
 
-        case 2:
-            mbedtls_des3_set2key_dec( &ctx3, des3_test_keys );
-            break;
+            case 2:
+                mbedtls_des3_set2key_dec(&ctx3, des3_test_keys);
+                break;
 
-        case 3:
-            mbedtls_des3_set2key_enc( &ctx3, des3_test_keys );
-            break;
+            case 3:
+                mbedtls_des3_set2key_enc(&ctx3, des3_test_keys);
+                break;
 
-        case 4:
-            mbedtls_des3_set3key_dec( &ctx3, des3_test_keys );
-            break;
+            case 4:
+                mbedtls_des3_set3key_dec(&ctx3, des3_test_keys);
+                break;
 
-        case 5:
-            mbedtls_des3_set3key_enc( &ctx3, des3_test_keys );
-            break;
+            case 5:
+                mbedtls_des3_set3key_enc(&ctx3, des3_test_keys);
+                break;
 
-        default:
-            return( 1 );
+            default:
+                return (1);
         }
 
-        for( j = 0; j < 10000; j++ )
-        {
-            if( u == 0 )
-                mbedtls_des_crypt_ecb( &ctx, buf, buf );
+        for (j = 0; j < 10000; j++) {
+            if (u == 0)
+                mbedtls_des_crypt_ecb(&ctx, buf, buf);
             else
-                mbedtls_des3_crypt_ecb( &ctx3, buf, buf );
+                mbedtls_des3_crypt_ecb(&ctx3, buf, buf);
         }
 
-        if( ( v == MBEDTLS_DES_DECRYPT &&
-                memcmp( buf, des3_test_ecb_dec[u], 8 ) != 0 ) ||
-            ( v != MBEDTLS_DES_DECRYPT &&
-                memcmp( buf, des3_test_ecb_enc[u], 8 ) != 0 ) )
-        {
-            if( verbose != 0 )
-                mbedtls_printf( "failed\n" );
+        if ((v == MBEDTLS_DES_DECRYPT &&
+             memcmp(buf, des3_test_ecb_dec[u], 8) != 0) ||
+            (v != MBEDTLS_DES_DECRYPT &&
+             memcmp(buf, des3_test_ecb_enc[u], 8) != 0)) {
+            if (verbose != 0)
+                mbedtls_printf("failed\n");
 
             ret = 1;
             goto exit;
         }
 
-        if( verbose != 0 )
-            mbedtls_printf( "passed\n" );
+        if (verbose != 0)
+            mbedtls_printf("passed\n");
     }
 
-    if( verbose != 0 )
-        mbedtls_printf( "\n" );
+    if (verbose != 0)
+        mbedtls_printf("\n");
 
 #if defined(MBEDTLS_CIPHER_MODE_CBC)
     /*
      * CBC mode
      */
-    for( i = 0; i < 6; i++ )
-    {
+    for (i = 0; i < 6; i++) {
         u = i >> 1;
         v = i  & 1;
 
-        if( verbose != 0 )
-            mbedtls_printf( "  DES%c-CBC-%3d (%s): ",
-                             ( u == 0 ) ? ' ' : '3', 56 + u * 56,
-                             ( v == MBEDTLS_DES_DECRYPT ) ? "dec" : "enc" );
+        if (verbose != 0)
+            mbedtls_printf("  DES%c-CBC-%3d (%s): ",
+                           (u == 0) ? ' ' : '3', 56 + u * 56,
+                           (v == MBEDTLS_DES_DECRYPT) ? "dec" : "enc");
 
-        memcpy( iv,  des3_test_iv,  8 );
-        memcpy( prv, des3_test_iv,  8 );
-        memcpy( buf, des3_test_buf, 8 );
+        memcpy(iv,  des3_test_iv,  8);
+        memcpy(prv, des3_test_iv,  8);
+        memcpy(buf, des3_test_buf, 8);
 
-        switch( i )
-        {
-        case 0:
-            mbedtls_des_setkey_dec( &ctx, des3_test_keys );
-            break;
+        switch (i) {
+            case 0:
+                mbedtls_des_setkey_dec(&ctx, des3_test_keys);
+                break;
 
-        case 1:
-            mbedtls_des_setkey_enc( &ctx, des3_test_keys );
-            break;
+            case 1:
+                mbedtls_des_setkey_enc(&ctx, des3_test_keys);
+                break;
 
-        case 2:
-            mbedtls_des3_set2key_dec( &ctx3, des3_test_keys );
-            break;
+            case 2:
+                mbedtls_des3_set2key_dec(&ctx3, des3_test_keys);
+                break;
 
-        case 3:
-            mbedtls_des3_set2key_enc( &ctx3, des3_test_keys );
-            break;
+            case 3:
+                mbedtls_des3_set2key_enc(&ctx3, des3_test_keys);
+                break;
 
-        case 4:
-            mbedtls_des3_set3key_dec( &ctx3, des3_test_keys );
-            break;
+            case 4:
+                mbedtls_des3_set3key_dec(&ctx3, des3_test_keys);
+                break;
 
-        case 5:
-            mbedtls_des3_set3key_enc( &ctx3, des3_test_keys );
-            break;
+            case 5:
+                mbedtls_des3_set3key_enc(&ctx3, des3_test_keys);
+                break;
 
-        default:
-            return( 1 );
+            default:
+                return (1);
         }
 
-        if( v == MBEDTLS_DES_DECRYPT )
-        {
-            for( j = 0; j < 10000; j++ )
-            {
-                if( u == 0 )
-                    mbedtls_des_crypt_cbc( &ctx, v, 8, iv, buf, buf );
+        if (v == MBEDTLS_DES_DECRYPT) {
+            for (j = 0; j < 10000; j++) {
+                if (u == 0)
+                    mbedtls_des_crypt_cbc(&ctx, v, 8, iv, buf, buf);
                 else
-                    mbedtls_des3_crypt_cbc( &ctx3, v, 8, iv, buf, buf );
+                    mbedtls_des3_crypt_cbc(&ctx3, v, 8, iv, buf, buf);
             }
-        }
-        else
-        {
-            for( j = 0; j < 10000; j++ )
-            {
+        } else {
+            for (j = 0; j < 10000; j++) {
                 unsigned char tmp[8];
 
-                if( u == 0 )
-                    mbedtls_des_crypt_cbc( &ctx, v, 8, iv, buf, buf );
+                if (u == 0)
+                    mbedtls_des_crypt_cbc(&ctx, v, 8, iv, buf, buf);
                 else
-                    mbedtls_des3_crypt_cbc( &ctx3, v, 8, iv, buf, buf );
+                    mbedtls_des3_crypt_cbc(&ctx3, v, 8, iv, buf, buf);
 
-                memcpy( tmp, prv, 8 );
-                memcpy( prv, buf, 8 );
-                memcpy( buf, tmp, 8 );
+                memcpy(tmp, prv, 8);
+                memcpy(prv, buf, 8);
+                memcpy(buf, tmp, 8);
             }
 
-            memcpy( buf, prv, 8 );
+            memcpy(buf, prv, 8);
         }
 
-        if( ( v == MBEDTLS_DES_DECRYPT &&
-                memcmp( buf, des3_test_cbc_dec[u], 8 ) != 0 ) ||
-            ( v != MBEDTLS_DES_DECRYPT &&
-                memcmp( buf, des3_test_cbc_enc[u], 8 ) != 0 ) )
-        {
-            if( verbose != 0 )
-                mbedtls_printf( "failed\n" );
+        if ((v == MBEDTLS_DES_DECRYPT &&
+             memcmp(buf, des3_test_cbc_dec[u], 8) != 0) ||
+            (v != MBEDTLS_DES_DECRYPT &&
+             memcmp(buf, des3_test_cbc_enc[u], 8) != 0)) {
+            if (verbose != 0)
+                mbedtls_printf("failed\n");
 
             ret = 1;
             goto exit;
         }
 
-        if( verbose != 0 )
-            mbedtls_printf( "passed\n" );
+        if (verbose != 0)
+            mbedtls_printf("passed\n");
     }
 #endif /* MBEDTLS_CIPHER_MODE_CBC */
 
-    if( verbose != 0 )
-        mbedtls_printf( "\n" );
+    if (verbose != 0)
+        mbedtls_printf("\n");
 
 exit:
-    mbedtls_des_free( &ctx );
-    mbedtls_des3_free( &ctx3 );
+    mbedtls_des_free(&ctx);
+    mbedtls_des3_free(&ctx3);
 
-    return( ret );
+    return (ret);
 }
 
 #endif /* MBEDTLS_SELF_TEST */
diff --git a/common/mbedtls/des.h b/common/mbedtls/des.h
index 9406e0ae5..e326acd49 100644
--- a/common/mbedtls/des.h
+++ b/common/mbedtls/des.h
@@ -63,8 +63,7 @@ extern "C" {
  *                 security risk. We recommend considering stronger ciphers
  *                 instead.
  */
-typedef struct mbedtls_des_context
-{
+typedef struct mbedtls_des_context {
     uint32_t sk[32];            /*!<  DES subkeys       */
 }
 mbedtls_des_context;
@@ -72,8 +71,7 @@ mbedtls_des_context;
 /**
  * \brief          Triple-DES context structure
  */
-typedef struct mbedtls_des3_context
-{
+typedef struct mbedtls_des3_context {
     uint32_t sk[96];            /*!<  3DES subkeys      */
 }
 mbedtls_des3_context;
@@ -91,7 +89,7 @@ mbedtls_des3_context;
  *                 security risk. We recommend considering stronger ciphers
  *                 instead.
  */
-void mbedtls_des_init( mbedtls_des_context *ctx );
+void mbedtls_des_init(mbedtls_des_context *ctx);
 
 /**
  * \brief          Clear DES context
@@ -102,21 +100,21 @@ void mbedtls_des_init( mbedtls_des_context *ctx );
  *                 security risk. We recommend considering stronger ciphers
  *                 instead.
  */
-void mbedtls_des_free( mbedtls_des_context *ctx );
+void mbedtls_des_free(mbedtls_des_context *ctx);
 
 /**
  * \brief          Initialize Triple-DES context
  *
  * \param ctx      DES3 context to be initialized
  */
-void mbedtls_des3_init( mbedtls_des3_context *ctx );
+void mbedtls_des3_init(mbedtls_des3_context *ctx);
 
 /**
  * \brief          Clear Triple-DES context
  *
  * \param ctx      DES3 context to be cleared
  */
-void mbedtls_des3_free( mbedtls_des3_context *ctx );
+void mbedtls_des3_free(mbedtls_des3_context *ctx);
 
 /**
  * \brief          Set key parity on the given key to odd.
@@ -130,7 +128,7 @@ void mbedtls_des3_free( mbedtls_des3_context *ctx );
  *                 security risk. We recommend considering stronger ciphers
  *                 instead.
  */
-void mbedtls_des_key_set_parity( unsigned char key[MBEDTLS_DES_KEY_SIZE] );
+void mbedtls_des_key_set_parity(unsigned char key[MBEDTLS_DES_KEY_SIZE]);
 
 /**
  * \brief          Check that key parity on the given key is odd.
@@ -146,7 +144,7 @@ void mbedtls_des_key_set_parity( unsigned char key[MBEDTLS_DES_KEY_SIZE] );
  *                 security risk. We recommend considering stronger ciphers
  *                 instead.
  */
-int mbedtls_des_key_check_key_parity( const unsigned char key[MBEDTLS_DES_KEY_SIZE] );
+int mbedtls_des_key_check_key_parity(const unsigned char key[MBEDTLS_DES_KEY_SIZE]);
 
 /**
  * \brief          Check that key is not a weak or semi-weak DES key
@@ -159,7 +157,7 @@ int mbedtls_des_key_check_key_parity( const unsigned char key[MBEDTLS_DES_KEY_SI
  *                 security risk. We recommend considering stronger ciphers
  *                 instead.
  */
-int mbedtls_des_key_check_weak( const unsigned char key[MBEDTLS_DES_KEY_SIZE] );
+int mbedtls_des_key_check_weak(const unsigned char key[MBEDTLS_DES_KEY_SIZE]);
 
 /**
  * \brief          DES key schedule (56-bit, encryption)
@@ -173,7 +171,7 @@ int mbedtls_des_key_check_weak( const unsigned char key[MBEDTLS_DES_KEY_SIZE] );
  *                 security risk. We recommend considering stronger ciphers
  *                 instead.
  */
-int mbedtls_des_setkey_enc( mbedtls_des_context *ctx, const unsigned char key[MBEDTLS_DES_KEY_SIZE] );
+int mbedtls_des_setkey_enc(mbedtls_des_context *ctx, const unsigned char key[MBEDTLS_DES_KEY_SIZE]);
 
 /**
  * \brief          DES key schedule (56-bit, decryption)
@@ -187,7 +185,7 @@ int mbedtls_des_setkey_enc( mbedtls_des_context *ctx, const unsigned char key[MB
  *                 security risk. We recommend considering stronger ciphers
  *                 instead.
  */
-int mbedtls_des_setkey_dec( mbedtls_des_context *ctx, const unsigned char key[MBEDTLS_DES_KEY_SIZE] );
+int mbedtls_des_setkey_dec(mbedtls_des_context *ctx, const unsigned char key[MBEDTLS_DES_KEY_SIZE]);
 
 /**
  * \brief          Triple-DES key schedule (112-bit, encryption)
@@ -197,8 +195,8 @@ int mbedtls_des_setkey_dec( mbedtls_des_context *ctx, const unsigned char key[MB
  *
  * \return         0
  */
-int mbedtls_des3_set2key_enc( mbedtls_des3_context *ctx,
-                      const unsigned char key[MBEDTLS_DES_KEY_SIZE * 2] );
+int mbedtls_des3_set2key_enc(mbedtls_des3_context *ctx,
+                             const unsigned char key[MBEDTLS_DES_KEY_SIZE * 2]);
 
 /**
  * \brief          Triple-DES key schedule (112-bit, decryption)
@@ -208,8 +206,8 @@ int mbedtls_des3_set2key_enc( mbedtls_des3_context *ctx,
  *
  * \return         0
  */
-int mbedtls_des3_set2key_dec( mbedtls_des3_context *ctx,
-                      const unsigned char key[MBEDTLS_DES_KEY_SIZE * 2] );
+int mbedtls_des3_set2key_dec(mbedtls_des3_context *ctx,
+                             const unsigned char key[MBEDTLS_DES_KEY_SIZE * 2]);
 
 /**
  * \brief          Triple-DES key schedule (168-bit, encryption)
@@ -219,8 +217,8 @@ int mbedtls_des3_set2key_dec( mbedtls_des3_context *ctx,
  *
  * \return         0
  */
-int mbedtls_des3_set3key_enc( mbedtls_des3_context *ctx,
-                      const unsigned char key[MBEDTLS_DES_KEY_SIZE * 3] );
+int mbedtls_des3_set3key_enc(mbedtls_des3_context *ctx,
+                             const unsigned char key[MBEDTLS_DES_KEY_SIZE * 3]);
 
 /**
  * \brief          Triple-DES key schedule (168-bit, decryption)
@@ -230,8 +228,8 @@ int mbedtls_des3_set3key_enc( mbedtls_des3_context *ctx,
  *
  * \return         0
  */
-int mbedtls_des3_set3key_dec( mbedtls_des3_context *ctx,
-                      const unsigned char key[MBEDTLS_DES_KEY_SIZE * 3] );
+int mbedtls_des3_set3key_dec(mbedtls_des3_context *ctx,
+                             const unsigned char key[MBEDTLS_DES_KEY_SIZE * 3]);
 
 /**
  * \brief          DES-ECB block encryption/decryption
@@ -246,9 +244,9 @@ int mbedtls_des3_set3key_dec( mbedtls_des3_context *ctx,
  *                 security risk. We recommend considering stronger ciphers
  *                 instead.
  */
-int mbedtls_des_crypt_ecb( mbedtls_des_context *ctx,
-                    const unsigned char input[8],
-                    unsigned char output[8] );
+int mbedtls_des_crypt_ecb(mbedtls_des_context *ctx,
+                          const unsigned char input[8],
+                          unsigned char output[8]);
 
 #if defined(MBEDTLS_CIPHER_MODE_CBC)
 /**
@@ -273,12 +271,12 @@ int mbedtls_des_crypt_ecb( mbedtls_des_context *ctx,
  *                 security risk. We recommend considering stronger ciphers
  *                 instead.
  */
-int mbedtls_des_crypt_cbc( mbedtls_des_context *ctx,
-                    int mode,
-                    size_t length,
-                    unsigned char iv[8],
-                    const unsigned char *input,
-                    unsigned char *output );
+int mbedtls_des_crypt_cbc(mbedtls_des_context *ctx,
+                          int mode,
+                          size_t length,
+                          unsigned char iv[8],
+                          const unsigned char *input,
+                          unsigned char *output);
 #endif /* MBEDTLS_CIPHER_MODE_CBC */
 
 /**
@@ -290,9 +288,9 @@ int mbedtls_des_crypt_cbc( mbedtls_des_context *ctx,
  *
  * \return         0 if successful
  */
-int mbedtls_des3_crypt_ecb( mbedtls_des3_context *ctx,
-                     const unsigned char input[8],
-                     unsigned char output[8] );
+int mbedtls_des3_crypt_ecb(mbedtls_des3_context *ctx,
+                           const unsigned char input[8],
+                           unsigned char output[8]);
 
 #if defined(MBEDTLS_CIPHER_MODE_CBC)
 /**
@@ -315,12 +313,12 @@ int mbedtls_des3_crypt_ecb( mbedtls_des3_context *ctx,
  *
  * \return         0 if successful, or MBEDTLS_ERR_DES_INVALID_INPUT_LENGTH
  */
-int mbedtls_des3_crypt_cbc( mbedtls_des3_context *ctx,
-                     int mode,
-                     size_t length,
-                     unsigned char iv[8],
-                     const unsigned char *input,
-                     unsigned char *output );
+int mbedtls_des3_crypt_cbc(mbedtls_des3_context *ctx,
+                           int mode,
+                           size_t length,
+                           unsigned char iv[8],
+                           const unsigned char *input,
+                           unsigned char *output);
 #endif /* MBEDTLS_CIPHER_MODE_CBC */
 
 /**
@@ -335,15 +333,15 @@ int mbedtls_des3_crypt_cbc( mbedtls_des3_context *ctx,
  *                 security risk. We recommend considering stronger ciphers
  *                 instead.
  */
-void mbedtls_des_setkey( uint32_t SK[32],
-                         const unsigned char key[MBEDTLS_DES_KEY_SIZE] );
+void mbedtls_des_setkey(uint32_t SK[32],
+                        const unsigned char key[MBEDTLS_DES_KEY_SIZE]);
 
 /**
  * \brief          Checkup routine
  *
  * \return         0 if successful, or 1 if the test failed
  */
-int mbedtls_des_self_test( int verbose );
+int mbedtls_des_self_test(int verbose);
 
 #ifdef __cplusplus
 }
diff --git a/common/mbedtls/ecdsa.c b/common/mbedtls/ecdsa.c
index e97e6cb43..0dce37964 100644
--- a/common/mbedtls/ecdsa.c
+++ b/common/mbedtls/ecdsa.c
@@ -48,23 +48,23 @@
  * Derive a suitable integer for group grp from a buffer of length len
  * SEC1 4.1.3 step 5 aka SEC1 4.1.4 step 3
  */
-static int derive_mpi( const mbedtls_ecp_group *grp, mbedtls_mpi *x,
-                       const unsigned char *buf, size_t blen )
+static int derive_mpi(const mbedtls_ecp_group *grp, mbedtls_mpi *x,
+                      const unsigned char *buf, size_t blen)
 {
     int ret;
-    size_t n_size = ( grp->nbits + 7 ) / 8;
+    size_t n_size = (grp->nbits + 7) / 8;
     size_t use_size = blen > n_size ? n_size : blen;
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_read_binary( x, buf, use_size ) );
-    if( use_size * 8 > grp->nbits )
-        MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( x, use_size * 8 - grp->nbits ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_read_binary(x, buf, use_size));
+    if (use_size * 8 > grp->nbits)
+        MBEDTLS_MPI_CHK(mbedtls_mpi_shift_r(x, use_size * 8 - grp->nbits));
 
     /* While at it, reduce modulo N */
-    if( mbedtls_mpi_cmp_mpi( x, &grp->N ) >= 0 )
-        MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( x, x, &grp->N ) );
+    if (mbedtls_mpi_cmp_mpi(x, &grp->N) >= 0)
+        MBEDTLS_MPI_CHK(mbedtls_mpi_sub_mpi(x, x, &grp->N));
 
 cleanup:
-    return( ret );
+    return (ret);
 }
 
 #if !defined(MBEDTLS_ECDSA_SIGN_ALT)
@@ -72,93 +72,89 @@ cleanup:
  * Compute ECDSA signature of a hashed message (SEC1 4.1.3)
  * Obviously, compared to SEC1 4.1.3, we skip step 4 (hash message)
  */
-int mbedtls_ecdsa_sign( mbedtls_ecp_group *grp, mbedtls_mpi *r, mbedtls_mpi *s,
-                const mbedtls_mpi *d, const unsigned char *buf, size_t blen,
-                int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
+int mbedtls_ecdsa_sign(mbedtls_ecp_group *grp, mbedtls_mpi *r, mbedtls_mpi *s,
+                       const mbedtls_mpi *d, const unsigned char *buf, size_t blen,
+                       int (*f_rng)(void *, unsigned char *, size_t), void *p_rng)
 {
     int ret, key_tries, sign_tries, blind_tries;
     mbedtls_ecp_point R;
     mbedtls_mpi k, e, t;
 
     /* Fail cleanly on curves such as Curve25519 that can't be used for ECDSA */
-    if( grp->N.p == NULL )
-        return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
+    if (grp->N.p == NULL)
+        return (MBEDTLS_ERR_ECP_BAD_INPUT_DATA);
 
     /* Make sure d is in range 1..n-1 */
-    if( mbedtls_mpi_cmp_int( d, 1 ) < 0 || mbedtls_mpi_cmp_mpi( d, &grp->N ) >= 0 )
-        return( MBEDTLS_ERR_ECP_INVALID_KEY );
+    if (mbedtls_mpi_cmp_int(d, 1) < 0 || mbedtls_mpi_cmp_mpi(d, &grp->N) >= 0)
+        return (MBEDTLS_ERR_ECP_INVALID_KEY);
 
-    mbedtls_ecp_point_init( &R );
-    mbedtls_mpi_init( &k ); mbedtls_mpi_init( &e ); mbedtls_mpi_init( &t );
+    mbedtls_ecp_point_init(&R);
+    mbedtls_mpi_init(&k);
+    mbedtls_mpi_init(&e);
+    mbedtls_mpi_init(&t);
 
     sign_tries = 0;
-    do
-    {
+    do {
         /*
          * Steps 1-3: generate a suitable ephemeral keypair
          * and set r = xR mod n
          */
         key_tries = 0;
-        do
-        {
-            MBEDTLS_MPI_CHK( mbedtls_ecp_gen_keypair( grp, &k, &R, f_rng, p_rng ) );
-            MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi( r, &R.X, &grp->N ) );
+        do {
+            MBEDTLS_MPI_CHK(mbedtls_ecp_gen_keypair(grp, &k, &R, f_rng, p_rng));
+            MBEDTLS_MPI_CHK(mbedtls_mpi_mod_mpi(r, &R.X, &grp->N));
 
-            if( key_tries++ > 10 )
-            {
+            if (key_tries++ > 10) {
                 ret = MBEDTLS_ERR_ECP_RANDOM_FAILED;
                 goto cleanup;
             }
-        }
-        while( mbedtls_mpi_cmp_int( r, 0 ) == 0 );
+        } while (mbedtls_mpi_cmp_int(r, 0) == 0);
 
         /*
          * Step 5: derive MPI from hashed message
          */
-        MBEDTLS_MPI_CHK( derive_mpi( grp, &e, buf, blen ) );
+        MBEDTLS_MPI_CHK(derive_mpi(grp, &e, buf, blen));
 
         /*
          * Generate a random value to blind inv_mod in next step,
          * avoiding a potential timing leak.
          */
         blind_tries = 0;
-        do
-        {
-            size_t n_size = ( grp->nbits + 7 ) / 8;
-            MBEDTLS_MPI_CHK( mbedtls_mpi_fill_random( &t, n_size, f_rng, p_rng ) );
-            MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &t, 8 * n_size - grp->nbits ) );
+        do {
+            size_t n_size = (grp->nbits + 7) / 8;
+            MBEDTLS_MPI_CHK(mbedtls_mpi_fill_random(&t, n_size, f_rng, p_rng));
+            MBEDTLS_MPI_CHK(mbedtls_mpi_shift_r(&t, 8 * n_size - grp->nbits));
 
             /* See mbedtls_ecp_gen_keypair() */
-            if( ++blind_tries > 30 )
-                return( MBEDTLS_ERR_ECP_RANDOM_FAILED );
-        }
-        while( mbedtls_mpi_cmp_int( &t, 1 ) < 0 ||
-               mbedtls_mpi_cmp_mpi( &t, &grp->N ) >= 0 );
+            if (++blind_tries > 30)
+                return (MBEDTLS_ERR_ECP_RANDOM_FAILED);
+        } while (mbedtls_mpi_cmp_int(&t, 1) < 0 ||
+                 mbedtls_mpi_cmp_mpi(&t, &grp->N) >= 0);
 
         /*
          * Step 6: compute s = (e + r * d) / k = t (e + rd) / (kt) mod n
          */
-        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( s, r, d ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_add_mpi( &e, &e, s ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &e, &e, &t ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &k, &k, &t ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_inv_mod( s, &k, &grp->N ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( s, s, &e ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi( s, s, &grp->N ) );
+        MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(s, r, d));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_add_mpi(&e, &e, s));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&e, &e, &t));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&k, &k, &t));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_inv_mod(s, &k, &grp->N));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(s, s, &e));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_mod_mpi(s, s, &grp->N));
 
-        if( sign_tries++ > 10 )
-        {
+        if (sign_tries++ > 10) {
             ret = MBEDTLS_ERR_ECP_RANDOM_FAILED;
             goto cleanup;
         }
-    }
-    while( mbedtls_mpi_cmp_int( s, 0 ) == 0 );
+    } while (mbedtls_mpi_cmp_int(s, 0) == 0);
 
 cleanup:
-    mbedtls_ecp_point_free( &R );
-    mbedtls_mpi_free( &k ); mbedtls_mpi_free( &e ); mbedtls_mpi_free( &t );
+    mbedtls_ecp_point_free(&R);
+    mbedtls_mpi_free(&k);
+    mbedtls_mpi_free(&e);
+    mbedtls_mpi_free(&t);
 
-    return( ret );
+    return (ret);
 }
 #endif /* MBEDTLS_ECDSA_SIGN_ALT */
 
@@ -166,37 +162,37 @@ cleanup:
 /*
  * Deterministic signature wrapper
  */
-int mbedtls_ecdsa_sign_det( mbedtls_ecp_group *grp, mbedtls_mpi *r, mbedtls_mpi *s,
-                    const mbedtls_mpi *d, const unsigned char *buf, size_t blen,
-                    mbedtls_md_type_t md_alg )
+int mbedtls_ecdsa_sign_det(mbedtls_ecp_group *grp, mbedtls_mpi *r, mbedtls_mpi *s,
+                           const mbedtls_mpi *d, const unsigned char *buf, size_t blen,
+                           mbedtls_md_type_t md_alg)
 {
     int ret;
     mbedtls_hmac_drbg_context rng_ctx;
     unsigned char data[2 * MBEDTLS_ECP_MAX_BYTES];
-    size_t grp_len = ( grp->nbits + 7 ) / 8;
+    size_t grp_len = (grp->nbits + 7) / 8;
     const mbedtls_md_info_t *md_info;
     mbedtls_mpi h;
 
-    if( ( md_info = mbedtls_md_info_from_type( md_alg ) ) == NULL )
-        return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
+    if ((md_info = mbedtls_md_info_from_type(md_alg)) == NULL)
+        return (MBEDTLS_ERR_ECP_BAD_INPUT_DATA);
 
-    mbedtls_mpi_init( &h );
-    mbedtls_hmac_drbg_init( &rng_ctx );
+    mbedtls_mpi_init(&h);
+    mbedtls_hmac_drbg_init(&rng_ctx);
 
     /* Use private key and message hash (reduced) to initialize HMAC_DRBG */
-    MBEDTLS_MPI_CHK( mbedtls_mpi_write_binary( d, data, grp_len ) );
-    MBEDTLS_MPI_CHK( derive_mpi( grp, &h, buf, blen ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_write_binary( &h, data + grp_len, grp_len ) );
-    mbedtls_hmac_drbg_seed_buf( &rng_ctx, md_info, data, 2 * grp_len );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_write_binary(d, data, grp_len));
+    MBEDTLS_MPI_CHK(derive_mpi(grp, &h, buf, blen));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_write_binary(&h, data + grp_len, grp_len));
+    mbedtls_hmac_drbg_seed_buf(&rng_ctx, md_info, data, 2 * grp_len);
 
-    ret = mbedtls_ecdsa_sign( grp, r, s, d, buf, blen,
-                      mbedtls_hmac_drbg_random, &rng_ctx );
+    ret = mbedtls_ecdsa_sign(grp, r, s, d, buf, blen,
+                             mbedtls_hmac_drbg_random, &rng_ctx);
 
 cleanup:
-    mbedtls_hmac_drbg_free( &rng_ctx );
-    mbedtls_mpi_free( &h );
+    mbedtls_hmac_drbg_free(&rng_ctx);
+    mbedtls_mpi_free(&h);
 
-    return( ret );
+    return (ret);
 }
 #endif /* MBEDTLS_ECDSA_DETERMINISTIC */
 
@@ -205,27 +201,29 @@ cleanup:
  * Verify ECDSA signature of hashed message (SEC1 4.1.4)
  * Obviously, compared to SEC1 4.1.3, we skip step 2 (hash message)
  */
-int mbedtls_ecdsa_verify( mbedtls_ecp_group *grp,
-                  const unsigned char *buf, size_t blen,
-                  const mbedtls_ecp_point *Q, const mbedtls_mpi *r, const mbedtls_mpi *s)
+int mbedtls_ecdsa_verify(mbedtls_ecp_group *grp,
+                         const unsigned char *buf, size_t blen,
+                         const mbedtls_ecp_point *Q, const mbedtls_mpi *r, const mbedtls_mpi *s)
 {
     int ret;
     mbedtls_mpi e, s_inv, u1, u2;
     mbedtls_ecp_point R;
 
-    mbedtls_ecp_point_init( &R );
-    mbedtls_mpi_init( &e ); mbedtls_mpi_init( &s_inv ); mbedtls_mpi_init( &u1 ); mbedtls_mpi_init( &u2 );
+    mbedtls_ecp_point_init(&R);
+    mbedtls_mpi_init(&e);
+    mbedtls_mpi_init(&s_inv);
+    mbedtls_mpi_init(&u1);
+    mbedtls_mpi_init(&u2);
 
     /* Fail cleanly on curves such as Curve25519 that can't be used for ECDSA */
-    if( grp->N.p == NULL )
-        return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
+    if (grp->N.p == NULL)
+        return (MBEDTLS_ERR_ECP_BAD_INPUT_DATA);
 
     /*
      * Step 1: make sure r and s are in range 1..n-1
      */
-    if( mbedtls_mpi_cmp_int( r, 1 ) < 0 || mbedtls_mpi_cmp_mpi( r, &grp->N ) >= 0 ||
-        mbedtls_mpi_cmp_int( s, 1 ) < 0 || mbedtls_mpi_cmp_mpi( s, &grp->N ) >= 0 )
-    {
+    if (mbedtls_mpi_cmp_int(r, 1) < 0 || mbedtls_mpi_cmp_mpi(r, &grp->N) >= 0 ||
+        mbedtls_mpi_cmp_int(s, 1) < 0 || mbedtls_mpi_cmp_mpi(s, &grp->N) >= 0) {
         ret = MBEDTLS_ERR_ECP_VERIFY_FAILED;
         goto cleanup;
     }
@@ -233,23 +231,23 @@ int mbedtls_ecdsa_verify( mbedtls_ecp_group *grp,
     /*
      * Additional precaution: make sure Q is valid
      */
-    MBEDTLS_MPI_CHK( mbedtls_ecp_check_pubkey( grp, Q ) );
+    MBEDTLS_MPI_CHK(mbedtls_ecp_check_pubkey(grp, Q));
 
     /*
      * Step 3: derive MPI from hashed message
      */
-    MBEDTLS_MPI_CHK( derive_mpi( grp, &e, buf, blen ) );
+    MBEDTLS_MPI_CHK(derive_mpi(grp, &e, buf, blen));
 
     /*
      * Step 4: u1 = e / s mod n, u2 = r / s mod n
      */
-    MBEDTLS_MPI_CHK( mbedtls_mpi_inv_mod( &s_inv, s, &grp->N ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_inv_mod(&s_inv, s, &grp->N));
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &u1, &e, &s_inv ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi( &u1, &u1, &grp->N ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&u1, &e, &s_inv));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mod_mpi(&u1, &u1, &grp->N));
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &u2, r, &s_inv ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi( &u2, &u2, &grp->N ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&u2, r, &s_inv));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mod_mpi(&u2, &u2, &grp->N));
 
     /*
      * Step 5: R = u1 G + u2 Q
@@ -257,10 +255,9 @@ int mbedtls_ecdsa_verify( mbedtls_ecp_group *grp,
      * Since we're not using any secret data, no need to pass a RNG to
      * mbedtls_ecp_mul() for countermesures.
      */
-    MBEDTLS_MPI_CHK( mbedtls_ecp_muladd( grp, &R, &u1, &grp->G, &u2, Q ) );
+    MBEDTLS_MPI_CHK(mbedtls_ecp_muladd(grp, &R, &u1, &grp->G, &u2, Q));
 
-    if( mbedtls_ecp_is_zero( &R ) )
-    {
+    if (mbedtls_ecp_is_zero(&R)) {
         ret = MBEDTLS_ERR_ECP_VERIFY_FAILED;
         goto cleanup;
     }
@@ -269,104 +266,106 @@ int mbedtls_ecdsa_verify( mbedtls_ecp_group *grp,
      * Step 6: convert xR to an integer (no-op)
      * Step 7: reduce xR mod n (gives v)
      */
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi( &R.X, &R.X, &grp->N ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mod_mpi(&R.X, &R.X, &grp->N));
 
     /*
      * Step 8: check if v (that is, R.X) is equal to r
      */
-    if( mbedtls_mpi_cmp_mpi( &R.X, r ) != 0 )
-    {
+    if (mbedtls_mpi_cmp_mpi(&R.X, r) != 0) {
         ret = MBEDTLS_ERR_ECP_VERIFY_FAILED;
         goto cleanup;
     }
 
 cleanup:
-    mbedtls_ecp_point_free( &R );
-    mbedtls_mpi_free( &e ); mbedtls_mpi_free( &s_inv ); mbedtls_mpi_free( &u1 ); mbedtls_mpi_free( &u2 );
+    mbedtls_ecp_point_free(&R);
+    mbedtls_mpi_free(&e);
+    mbedtls_mpi_free(&s_inv);
+    mbedtls_mpi_free(&u1);
+    mbedtls_mpi_free(&u2);
 
-    return( ret );
+    return (ret);
 }
 #endif /* MBEDTLS_ECDSA_VERIFY_ALT */
 
 /*
  * Convert a signature (given by context) to ASN.1
  */
-static int ecdsa_signature_to_asn1( const mbedtls_mpi *r, const mbedtls_mpi *s,
-                                    unsigned char *sig, size_t *slen )
+static int ecdsa_signature_to_asn1(const mbedtls_mpi *r, const mbedtls_mpi *s,
+                                   unsigned char *sig, size_t *slen)
 {
     int ret;
     unsigned char buf[MBEDTLS_ECDSA_MAX_LEN];
-    unsigned char *p = buf + sizeof( buf );
+    unsigned char *p = buf + sizeof(buf);
     size_t len = 0;
 
-    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_mpi( &p, buf, s ) );
-    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_mpi( &p, buf, r ) );
+    MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_mpi(&p, buf, s));
+    MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_mpi(&p, buf, r));
 
-    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( &p, buf, len ) );
-    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( &p, buf,
-                                       MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) );
+    MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_len(&p, buf, len));
+    MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_tag(&p, buf,
+                                                     MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE));
 
-    memcpy( sig, p, len );
+    memcpy(sig, p, len);
     *slen = len;
 
-    return( 0 );
+    return (0);
 }
 
 /*
  * Compute and write signature
  */
-int mbedtls_ecdsa_write_signature( mbedtls_ecdsa_context *ctx, mbedtls_md_type_t md_alg,
-                           const unsigned char *hash, size_t hlen,
-                           unsigned char *sig, size_t *slen,
-                           int (*f_rng)(void *, unsigned char *, size_t),
-                           void *p_rng )
+int mbedtls_ecdsa_write_signature(mbedtls_ecdsa_context *ctx, mbedtls_md_type_t md_alg,
+                                  const unsigned char *hash, size_t hlen,
+                                  unsigned char *sig, size_t *slen,
+                                  int (*f_rng)(void *, unsigned char *, size_t),
+                                  void *p_rng)
 {
     int ret;
     mbedtls_mpi r, s;
 
-    mbedtls_mpi_init( &r );
-    mbedtls_mpi_init( &s );
+    mbedtls_mpi_init(&r);
+    mbedtls_mpi_init(&s);
 
 #if defined(MBEDTLS_ECDSA_DETERMINISTIC)
     (void) f_rng;
     (void) p_rng;
 
-    MBEDTLS_MPI_CHK( mbedtls_ecdsa_sign_det( &ctx->grp, &r, &s, &ctx->d,
-                             hash, hlen, md_alg ) );
+    MBEDTLS_MPI_CHK(mbedtls_ecdsa_sign_det(&ctx->grp, &r, &s, &ctx->d,
+                                           hash, hlen, md_alg));
 #else
     (void) md_alg;
 
-    MBEDTLS_MPI_CHK( mbedtls_ecdsa_sign( &ctx->grp, &r, &s, &ctx->d,
-                         hash, hlen, f_rng, p_rng ) );
+    MBEDTLS_MPI_CHK(mbedtls_ecdsa_sign(&ctx->grp, &r, &s, &ctx->d,
+                                       hash, hlen, f_rng, p_rng));
 #endif
 
-    MBEDTLS_MPI_CHK( ecdsa_signature_to_asn1( &r, &s, sig, slen ) );
+    MBEDTLS_MPI_CHK(ecdsa_signature_to_asn1(&r, &s, sig, slen));
 
 cleanup:
-    mbedtls_mpi_free( &r );
-    mbedtls_mpi_free( &s );
+    mbedtls_mpi_free(&r);
+    mbedtls_mpi_free(&s);
 
-    return( ret );
+    return (ret);
 }
 
 #if ! defined(MBEDTLS_DEPRECATED_REMOVED) && \
     defined(MBEDTLS_ECDSA_DETERMINISTIC)
-int mbedtls_ecdsa_write_signature_det( mbedtls_ecdsa_context *ctx,
-                               const unsigned char *hash, size_t hlen,
-                               unsigned char *sig, size_t *slen,
-                               mbedtls_md_type_t md_alg )
+int mbedtls_ecdsa_write_signature_det(mbedtls_ecdsa_context *ctx,
+                                      const unsigned char *hash, size_t hlen,
+                                      unsigned char *sig, size_t *slen,
+                                      mbedtls_md_type_t md_alg)
 {
-    return( mbedtls_ecdsa_write_signature( ctx, md_alg, hash, hlen, sig, slen,
-                                   NULL, NULL ) );
+    return (mbedtls_ecdsa_write_signature(ctx, md_alg, hash, hlen, sig, slen,
+                                          NULL, NULL));
 }
 #endif
 
 /*
  * Read and check signature
  */
-int mbedtls_ecdsa_read_signature( mbedtls_ecdsa_context *ctx,
-                          const unsigned char *hash, size_t hlen,
-                          const unsigned char *sig, size_t slen )
+int mbedtls_ecdsa_read_signature(mbedtls_ecdsa_context *ctx,
+                                 const unsigned char *hash, size_t hlen,
+                                 const unsigned char *sig, size_t slen)
 {
     int ret;
     unsigned char *p = (unsigned char *) sig;
@@ -374,90 +373,86 @@ int mbedtls_ecdsa_read_signature( mbedtls_ecdsa_context *ctx,
     size_t len;
     mbedtls_mpi r, s;
 
-    mbedtls_mpi_init( &r );
-    mbedtls_mpi_init( &s );
+    mbedtls_mpi_init(&r);
+    mbedtls_mpi_init(&s);
 
-    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len,
-                    MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
-    {
+    if ((ret = mbedtls_asn1_get_tag(&p, end, &len,
+                                    MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE)) != 0) {
         ret += MBEDTLS_ERR_ECP_BAD_INPUT_DATA;
         goto cleanup;
     }
 
-    if( p + len != end )
-    {
+    if (p + len != end) {
         ret = MBEDTLS_ERR_ECP_BAD_INPUT_DATA +
               MBEDTLS_ERR_ASN1_LENGTH_MISMATCH;
         goto cleanup;
     }
 
-    if( ( ret = mbedtls_asn1_get_mpi( &p, end, &r ) ) != 0 ||
-        ( ret = mbedtls_asn1_get_mpi( &p, end, &s ) ) != 0 )
-    {
+    if ((ret = mbedtls_asn1_get_mpi(&p, end, &r)) != 0 ||
+        (ret = mbedtls_asn1_get_mpi(&p, end, &s)) != 0) {
         ret += MBEDTLS_ERR_ECP_BAD_INPUT_DATA;
         goto cleanup;
     }
 
-    if( ( ret = mbedtls_ecdsa_verify( &ctx->grp, hash, hlen,
-                              &ctx->Q, &r, &s ) ) != 0 )
+    if ((ret = mbedtls_ecdsa_verify(&ctx->grp, hash, hlen,
+                                    &ctx->Q, &r, &s)) != 0)
         goto cleanup;
 
     /* At this point we know that the buffer starts with a valid signature.
      * Return 0 if the buffer just contains the signature, and a specific
      * error code if the valid signature is followed by more data. */
-    if( p != end )
+    if (p != end)
         ret = MBEDTLS_ERR_ECP_SIG_LEN_MISMATCH;
 
 cleanup:
-    mbedtls_mpi_free( &r );
-    mbedtls_mpi_free( &s );
+    mbedtls_mpi_free(&r);
+    mbedtls_mpi_free(&s);
 
-    return( ret );
+    return (ret);
 }
 
 #if !defined(MBEDTLS_ECDSA_GENKEY_ALT)
 /*
  * Generate key pair
  */
-int mbedtls_ecdsa_genkey( mbedtls_ecdsa_context *ctx, mbedtls_ecp_group_id gid,
-                  int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
+int mbedtls_ecdsa_genkey(mbedtls_ecdsa_context *ctx, mbedtls_ecp_group_id gid,
+                         int (*f_rng)(void *, unsigned char *, size_t), void *p_rng)
 {
-    return( mbedtls_ecp_group_load( &ctx->grp, gid ) ||
-            mbedtls_ecp_gen_keypair( &ctx->grp, &ctx->d, &ctx->Q, f_rng, p_rng ) );
+    return (mbedtls_ecp_group_load(&ctx->grp, gid) ||
+            mbedtls_ecp_gen_keypair(&ctx->grp, &ctx->d, &ctx->Q, f_rng, p_rng));
 }
 #endif /* MBEDTLS_ECDSA_GENKEY_ALT */
 
 /*
  * Set context from an mbedtls_ecp_keypair
  */
-int mbedtls_ecdsa_from_keypair( mbedtls_ecdsa_context *ctx, const mbedtls_ecp_keypair *key )
+int mbedtls_ecdsa_from_keypair(mbedtls_ecdsa_context *ctx, const mbedtls_ecp_keypair *key)
 {
     int ret;
 
-    if( ( ret = mbedtls_ecp_group_copy( &ctx->grp, &key->grp ) ) != 0 ||
-        ( ret = mbedtls_mpi_copy( &ctx->d, &key->d ) ) != 0 ||
-        ( ret = mbedtls_ecp_copy( &ctx->Q, &key->Q ) ) != 0 )
-    {
-        mbedtls_ecdsa_free( ctx );
+    if ((ret = mbedtls_ecp_group_copy(&ctx->grp, &key->grp)) != 0 ||
+        (ret = mbedtls_mpi_copy(&ctx->d, &key->d)) != 0 ||
+        (ret = mbedtls_ecp_copy(&ctx->Q, &key->Q)) != 0) {
+        mbedtls_ecdsa_free(ctx);
     }
 
-    return( ret );
+    return (ret);
 }
 
 /*
  * Initialize context
  */
-void mbedtls_ecdsa_init( mbedtls_ecdsa_context *ctx )
+void mbedtls_ecdsa_init(mbedtls_ecdsa_context *ctx)
 {
-    mbedtls_ecp_keypair_init( ctx );
+    mbedtls_ecp_keypair_init(ctx);
 }
 
 /*
  * Free context
  */
-void mbedtls_ecdsa_free( mbedtls_ecdsa_context *ctx )
+void mbedtls_ecdsa_free(mbedtls_ecdsa_context *ctx)
 {
-    mbedtls_ecp_keypair_free( ctx );
+    mbedtls_ecp_keypair_free(ctx);
 }
 
 #endif /* MBEDTLS_ECDSA_C */
diff --git a/common/mbedtls/ecdsa.h b/common/mbedtls/ecdsa.h
index a56cc0a54..0371e8c36 100644
--- a/common/mbedtls/ecdsa.h
+++ b/common/mbedtls/ecdsa.h
@@ -93,9 +93,9 @@ extern "C" {
  * \return          An \c MBEDTLS_ERR_ECP_XXX
  *                  or \c MBEDTLS_MPI_XXX error code on failure.
  */
-int mbedtls_ecdsa_sign( mbedtls_ecp_group *grp, mbedtls_mpi *r, mbedtls_mpi *s,
-                const mbedtls_mpi *d, const unsigned char *buf, size_t blen,
-                int (*f_rng)(void *, unsigned char *, size_t), void *p_rng );
+int mbedtls_ecdsa_sign(mbedtls_ecp_group *grp, mbedtls_mpi *r, mbedtls_mpi *s,
+                       const mbedtls_mpi *d, const unsigned char *buf, size_t blen,
+                       int (*f_rng)(void *, unsigned char *, size_t), void *p_rng);
 
 #if defined(MBEDTLS_ECDSA_DETERMINISTIC)
 /**
@@ -126,9 +126,9 @@ int mbedtls_ecdsa_sign( mbedtls_ecp_group *grp, mbedtls_mpi *r, mbedtls_mpi *s,
  * \return          An \c MBEDTLS_ERR_ECP_XXX or \c MBEDTLS_MPI_XXX
  *                  error code on failure.
  */
-int mbedtls_ecdsa_sign_det( mbedtls_ecp_group *grp, mbedtls_mpi *r, mbedtls_mpi *s,
-                    const mbedtls_mpi *d, const unsigned char *buf, size_t blen,
-                    mbedtls_md_type_t md_alg );
+int mbedtls_ecdsa_sign_det(mbedtls_ecp_group *grp, mbedtls_mpi *r, mbedtls_mpi *s,
+                           const mbedtls_mpi *d, const unsigned char *buf, size_t blen,
+                           mbedtls_md_type_t md_alg);
 #endif /* MBEDTLS_ECDSA_DETERMINISTIC */
 
 /**
@@ -156,9 +156,9 @@ int mbedtls_ecdsa_sign_det( mbedtls_ecp_group *grp, mbedtls_mpi *r, mbedtls_mpi
  * \return          An \c MBEDTLS_ERR_ECP_XXX or \c MBEDTLS_MPI_XXX
  *                  error code on failure for any other reason.
  */
-int mbedtls_ecdsa_verify( mbedtls_ecp_group *grp,
-                  const unsigned char *buf, size_t blen,
-                  const mbedtls_ecp_point *Q, const mbedtls_mpi *r, const mbedtls_mpi *s);
+int mbedtls_ecdsa_verify(mbedtls_ecp_group *grp,
+                         const unsigned char *buf, size_t blen,
+                         const mbedtls_ecp_point *Q, const mbedtls_mpi *r, const mbedtls_mpi *s);
 
 /**
  * \brief           This function computes the ECDSA signature and writes it
@@ -201,11 +201,11 @@ int mbedtls_ecdsa_verify( mbedtls_ecp_group *grp,
  * \return          An \c MBEDTLS_ERR_ECP_XXX, \c MBEDTLS_ERR_MPI_XXX or
  *                  \c MBEDTLS_ERR_ASN1_XXX error code on failure.
  */
-int mbedtls_ecdsa_write_signature( mbedtls_ecdsa_context *ctx, mbedtls_md_type_t md_alg,
-                           const unsigned char *hash, size_t hlen,
-                           unsigned char *sig, size_t *slen,
-                           int (*f_rng)(void *, unsigned char *, size_t),
-                           void *p_rng );
+int mbedtls_ecdsa_write_signature(mbedtls_ecdsa_context *ctx, mbedtls_md_type_t md_alg,
+                                  const unsigned char *hash, size_t hlen,
+                                  unsigned char *sig, size_t *slen,
+                                  int (*f_rng)(void *, unsigned char *, size_t),
+                                  void *p_rng);
 
 #if defined(MBEDTLS_ECDSA_DETERMINISTIC)
 #if ! defined(MBEDTLS_DEPRECATED_REMOVED)
@@ -254,10 +254,10 @@ int mbedtls_ecdsa_write_signature( mbedtls_ecdsa_context *ctx, mbedtls_md_type_t
  * \return          An \c MBEDTLS_ERR_ECP_XXX, \c MBEDTLS_ERR_MPI_XXX or
  *                  \c MBEDTLS_ERR_ASN1_XXX error code on failure.
  */
-int mbedtls_ecdsa_write_signature_det( mbedtls_ecdsa_context *ctx,
-                               const unsigned char *hash, size_t hlen,
-                               unsigned char *sig, size_t *slen,
-                               mbedtls_md_type_t md_alg ) MBEDTLS_DEPRECATED;
+int mbedtls_ecdsa_write_signature_det(mbedtls_ecdsa_context *ctx,
+                                      const unsigned char *hash, size_t hlen,
+                                      unsigned char *sig, size_t *slen,
+                                      mbedtls_md_type_t md_alg) MBEDTLS_DEPRECATED;
 #undef MBEDTLS_DEPRECATED
 #endif /* MBEDTLS_DEPRECATED_REMOVED */
 #endif /* MBEDTLS_ECDSA_DETERMINISTIC */
@@ -286,9 +286,9 @@ int mbedtls_ecdsa_write_signature_det( mbedtls_ecdsa_context *ctx,
  * \return          An \c MBEDTLS_ERR_ECP_XXX or \c MBEDTLS_ERR_MPI_XXX
  *                  error code on failure for any other reason.
  */
-int mbedtls_ecdsa_read_signature( mbedtls_ecdsa_context *ctx,
-                          const unsigned char *hash, size_t hlen,
-                          const unsigned char *sig, size_t slen );
+int mbedtls_ecdsa_read_signature(mbedtls_ecdsa_context *ctx,
+                                 const unsigned char *hash, size_t hlen,
+                                 const unsigned char *sig, size_t slen);
 
 /**
  * \brief          This function generates an ECDSA keypair on the given curve.
@@ -304,8 +304,8 @@ int mbedtls_ecdsa_read_signature( mbedtls_ecdsa_context *ctx,
  * \return         \c 0 on success.
  * \return         An \c MBEDTLS_ERR_ECP_XXX code on failure.
  */
-int mbedtls_ecdsa_genkey( mbedtls_ecdsa_context *ctx, mbedtls_ecp_group_id gid,
-                  int (*f_rng)(void *, unsigned char *, size_t), void *p_rng );
+int mbedtls_ecdsa_genkey(mbedtls_ecdsa_context *ctx, mbedtls_ecp_group_id gid,
+                         int (*f_rng)(void *, unsigned char *, size_t), void *p_rng);
 
 /**
  * \brief           This function sets an ECDSA context from an EC key pair.
@@ -318,21 +318,21 @@ int mbedtls_ecdsa_genkey( mbedtls_ecdsa_context *ctx, mbedtls_ecp_group_id gid,
  * \return          \c 0 on success.
  * \return          An \c MBEDTLS_ERR_ECP_XXX code on failure.
  */
-int mbedtls_ecdsa_from_keypair( mbedtls_ecdsa_context *ctx, const mbedtls_ecp_keypair *key );
+int mbedtls_ecdsa_from_keypair(mbedtls_ecdsa_context *ctx, const mbedtls_ecp_keypair *key);
 
 /**
  * \brief           This function initializes an ECDSA context.
  *
  * \param ctx       The ECDSA context to initialize.
  */
-void mbedtls_ecdsa_init( mbedtls_ecdsa_context *ctx );
+void mbedtls_ecdsa_init(mbedtls_ecdsa_context *ctx);
 
 /**
  * \brief           This function frees an ECDSA context.
  *
  * \param ctx       The ECDSA context to free.
  */
-void mbedtls_ecdsa_free( mbedtls_ecdsa_context *ctx );
+void mbedtls_ecdsa_free(mbedtls_ecdsa_context *ctx);
 
 #ifdef __cplusplus
 }
diff --git a/common/mbedtls/ecp.c b/common/mbedtls/ecp.c
index 028c7fe30..cbb741095 100644
--- a/common/mbedtls/ecp.c
+++ b/common/mbedtls/ecp.c
@@ -106,8 +106,7 @@ static unsigned long add_count, dbl_count, mul_count;
 /*
  * Curve types: internal for now, might be exposed later
  */
-typedef enum
-{
+typedef enum {
     ECP_TYPE_NONE = 0,
     ECP_TYPE_SHORT_WEIERSTRASS,    /* y^2 = x^3 + a x + b      */
     ECP_TYPE_MONTGOMERY,           /* y^2 = x^3 + a x^2 + x    */
@@ -125,8 +124,7 @@ typedef enum
  *
  * Reminder: update profiles in x509_crt.c when adding a new curves!
  */
-static const mbedtls_ecp_curve_info ecp_supported_curves[] =
-{
+static const mbedtls_ecp_curve_info ecp_supported_curves[] = {
 #if defined(MBEDTLS_ECP_DP_SECP521R1_ENABLED)
     { MBEDTLS_ECP_DP_SECP521R1,    25,     521,    "secp521r1"         },
 #endif
@@ -164,34 +162,32 @@ static const mbedtls_ecp_curve_info ecp_supported_curves[] =
 };
 
 #define ECP_NB_CURVES   sizeof( ecp_supported_curves ) /    \
-                        sizeof( ecp_supported_curves[0] )
+    sizeof( ecp_supported_curves[0] )
 
 static mbedtls_ecp_group_id ecp_supported_grp_id[ECP_NB_CURVES];
 
 /*
  * List of supported curves and associated info
  */
-const mbedtls_ecp_curve_info *mbedtls_ecp_curve_list( void )
+const mbedtls_ecp_curve_info *mbedtls_ecp_curve_list(void)
 {
-    return( ecp_supported_curves );
+    return (ecp_supported_curves);
 }
 
 /*
  * List of supported curves, group ID only
  */
-const mbedtls_ecp_group_id *mbedtls_ecp_grp_id_list( void )
+const mbedtls_ecp_group_id *mbedtls_ecp_grp_id_list(void)
 {
     static int init_done = 0;
 
-    if( ! init_done )
-    {
+    if (! init_done) {
         size_t i = 0;
         const mbedtls_ecp_curve_info *curve_info;
 
-        for( curve_info = mbedtls_ecp_curve_list();
+        for (curve_info = mbedtls_ecp_curve_list();
              curve_info->grp_id != MBEDTLS_ECP_DP_NONE;
-             curve_info++ )
-        {
+             curve_info++) {
             ecp_supported_grp_id[i++] = curve_info->grp_id;
         }
         ecp_supported_grp_id[i] = MBEDTLS_ECP_DP_NONE;
@@ -199,337 +195,326 @@ const mbedtls_ecp_group_id *mbedtls_ecp_grp_id_list( void )
         init_done = 1;
     }
 
-    return( ecp_supported_grp_id );
+    return (ecp_supported_grp_id);
 }
 
 /*
  * Get the curve info for the internal identifier
  */
-const mbedtls_ecp_curve_info *mbedtls_ecp_curve_info_from_grp_id( mbedtls_ecp_group_id grp_id )
+const mbedtls_ecp_curve_info *mbedtls_ecp_curve_info_from_grp_id(mbedtls_ecp_group_id grp_id)
 {
     const mbedtls_ecp_curve_info *curve_info;
 
-    for( curve_info = mbedtls_ecp_curve_list();
+    for (curve_info = mbedtls_ecp_curve_list();
          curve_info->grp_id != MBEDTLS_ECP_DP_NONE;
-         curve_info++ )
-    {
-        if( curve_info->grp_id == grp_id )
-            return( curve_info );
+         curve_info++) {
+        if (curve_info->grp_id == grp_id)
+            return (curve_info);
     }
 
-    return( NULL );
+    return (NULL);
 }
 
 /*
  * Get the curve info from the TLS identifier
  */
-const mbedtls_ecp_curve_info *mbedtls_ecp_curve_info_from_tls_id( uint16_t tls_id )
+const mbedtls_ecp_curve_info *mbedtls_ecp_curve_info_from_tls_id(uint16_t tls_id)
 {
     const mbedtls_ecp_curve_info *curve_info;
 
-    for( curve_info = mbedtls_ecp_curve_list();
+    for (curve_info = mbedtls_ecp_curve_list();
          curve_info->grp_id != MBEDTLS_ECP_DP_NONE;
-         curve_info++ )
-    {
-        if( curve_info->tls_id == tls_id )
-            return( curve_info );
+         curve_info++) {
+        if (curve_info->tls_id == tls_id)
+            return (curve_info);
     }
 
-    return( NULL );
+    return (NULL);
 }
 
 /*
  * Get the curve info from the name
  */
-const mbedtls_ecp_curve_info *mbedtls_ecp_curve_info_from_name( const char *name )
+const mbedtls_ecp_curve_info *mbedtls_ecp_curve_info_from_name(const char *name)
 {
     const mbedtls_ecp_curve_info *curve_info;
 
-    for( curve_info = mbedtls_ecp_curve_list();
+    for (curve_info = mbedtls_ecp_curve_list();
          curve_info->grp_id != MBEDTLS_ECP_DP_NONE;
-         curve_info++ )
-    {
-        if( strcmp( curve_info->name, name ) == 0 )
-            return( curve_info );
+         curve_info++) {
+        if (strcmp(curve_info->name, name) == 0)
+            return (curve_info);
     }
 
-    return( NULL );
+    return (NULL);
 }
 
 /*
  * Get the type of a curve
  */
-static inline ecp_curve_type ecp_get_type( const mbedtls_ecp_group *grp )
+static inline ecp_curve_type ecp_get_type(const mbedtls_ecp_group *grp)
 {
-    if( grp->G.X.p == NULL )
-        return( ECP_TYPE_NONE );
+    if (grp->G.X.p == NULL)
+        return (ECP_TYPE_NONE);
 
-    if( grp->G.Y.p == NULL )
-        return( ECP_TYPE_MONTGOMERY );
+    if (grp->G.Y.p == NULL)
+        return (ECP_TYPE_MONTGOMERY);
     else
-        return( ECP_TYPE_SHORT_WEIERSTRASS );
+        return (ECP_TYPE_SHORT_WEIERSTRASS);
 }
 
 /*
  * Initialize (the components of) a point
  */
-void mbedtls_ecp_point_init( mbedtls_ecp_point *pt )
+void mbedtls_ecp_point_init(mbedtls_ecp_point *pt)
 {
-    if( pt == NULL )
+    if (pt == NULL)
         return;
 
-    mbedtls_mpi_init( &pt->X );
-    mbedtls_mpi_init( &pt->Y );
-    mbedtls_mpi_init( &pt->Z );
+    mbedtls_mpi_init(&pt->X);
+    mbedtls_mpi_init(&pt->Y);
+    mbedtls_mpi_init(&pt->Z);
 }
 
 /*
  * Initialize (the components of) a group
  */
-void mbedtls_ecp_group_init( mbedtls_ecp_group *grp )
+void mbedtls_ecp_group_init(mbedtls_ecp_group *grp)
 {
-    if( grp == NULL )
+    if (grp == NULL)
         return;
 
-    memset( grp, 0, sizeof( mbedtls_ecp_group ) );
+    memset(grp, 0, sizeof(mbedtls_ecp_group));
 }
 
 /*
  * Initialize (the components of) a key pair
  */
-void mbedtls_ecp_keypair_init( mbedtls_ecp_keypair *key )
+void mbedtls_ecp_keypair_init(mbedtls_ecp_keypair *key)
 {
-    if( key == NULL )
+    if (key == NULL)
         return;
 
-    mbedtls_ecp_group_init( &key->grp );
-    mbedtls_mpi_init( &key->d );
-    mbedtls_ecp_point_init( &key->Q );
+    mbedtls_ecp_group_init(&key->grp);
+    mbedtls_mpi_init(&key->d);
+    mbedtls_ecp_point_init(&key->Q);
 }
 
 /*
  * Unallocate (the components of) a point
  */
-void mbedtls_ecp_point_free( mbedtls_ecp_point *pt )
+void mbedtls_ecp_point_free(mbedtls_ecp_point *pt)
 {
-    if( pt == NULL )
+    if (pt == NULL)
         return;
 
-    mbedtls_mpi_free( &( pt->X ) );
-    mbedtls_mpi_free( &( pt->Y ) );
-    mbedtls_mpi_free( &( pt->Z ) );
+    mbedtls_mpi_free(&(pt->X));
+    mbedtls_mpi_free(&(pt->Y));
+    mbedtls_mpi_free(&(pt->Z));
 }
 
 /*
  * Unallocate (the components of) a group
  */
-void mbedtls_ecp_group_free( mbedtls_ecp_group *grp )
+void mbedtls_ecp_group_free(mbedtls_ecp_group *grp)
 {
     size_t i;
 
-    if( grp == NULL )
+    if (grp == NULL)
         return;
 
-    if( grp->h != 1 )
-    {
-        mbedtls_mpi_free( &grp->P );
-        mbedtls_mpi_free( &grp->A );
-        mbedtls_mpi_free( &grp->B );
-        mbedtls_ecp_point_free( &grp->G );
-        mbedtls_mpi_free( &grp->N );
+    if (grp->h != 1) {
+        mbedtls_mpi_free(&grp->P);
+        mbedtls_mpi_free(&grp->A);
+        mbedtls_mpi_free(&grp->B);
+        mbedtls_ecp_point_free(&grp->G);
+        mbedtls_mpi_free(&grp->N);
     }
 
-    if( grp->T != NULL )
-    {
-        for( i = 0; i < grp->T_size; i++ )
-            mbedtls_ecp_point_free( &grp->T[i] );
-        mbedtls_free( grp->T );
+    if (grp->T != NULL) {
+        for (i = 0; i < grp->T_size; i++)
+            mbedtls_ecp_point_free(&grp->T[i]);
+        mbedtls_free(grp->T);
     }
 
-    mbedtls_platform_zeroize( grp, sizeof( mbedtls_ecp_group ) );
+    mbedtls_platform_zeroize(grp, sizeof(mbedtls_ecp_group));
 }
 
 /*
  * Unallocate (the components of) a key pair
  */
-void mbedtls_ecp_keypair_free( mbedtls_ecp_keypair *key )
+void mbedtls_ecp_keypair_free(mbedtls_ecp_keypair *key)
 {
-    if( key == NULL )
+    if (key == NULL)
         return;
 
-    mbedtls_ecp_group_free( &key->grp );
-    mbedtls_mpi_free( &key->d );
-    mbedtls_ecp_point_free( &key->Q );
+    mbedtls_ecp_group_free(&key->grp);
+    mbedtls_mpi_free(&key->d);
+    mbedtls_ecp_point_free(&key->Q);
 }
 
 /*
  * Copy the contents of a point
  */
-int mbedtls_ecp_copy( mbedtls_ecp_point *P, const mbedtls_ecp_point *Q )
+int mbedtls_ecp_copy(mbedtls_ecp_point *P, const mbedtls_ecp_point *Q)
 {
     int ret;
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &P->X, &Q->X ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &P->Y, &Q->Y ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &P->Z, &Q->Z ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_copy(&P->X, &Q->X));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_copy(&P->Y, &Q->Y));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_copy(&P->Z, &Q->Z));
 
 cleanup:
-    return( ret );
+    return (ret);
 }
 
 /*
  * Copy the contents of a group object
  */
-int mbedtls_ecp_group_copy( mbedtls_ecp_group *dst, const mbedtls_ecp_group *src )
+int mbedtls_ecp_group_copy(mbedtls_ecp_group *dst, const mbedtls_ecp_group *src)
 {
-    return mbedtls_ecp_group_load( dst, src->id );
+    return mbedtls_ecp_group_load(dst, src->id);
 }
 
 /*
  * Set point to zero
  */
-int mbedtls_ecp_set_zero( mbedtls_ecp_point *pt )
+int mbedtls_ecp_set_zero(mbedtls_ecp_point *pt)
 {
     int ret;
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &pt->X , 1 ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &pt->Y , 1 ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &pt->Z , 0 ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_lset(&pt->X, 1));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_lset(&pt->Y, 1));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_lset(&pt->Z, 0));
 
 cleanup:
-    return( ret );
+    return (ret);
 }
 
 /*
  * Tell if a point is zero
  */
-int mbedtls_ecp_is_zero( mbedtls_ecp_point *pt )
+int mbedtls_ecp_is_zero(mbedtls_ecp_point *pt)
 {
-    return( mbedtls_mpi_cmp_int( &pt->Z, 0 ) == 0 );
+    return (mbedtls_mpi_cmp_int(&pt->Z, 0) == 0);
 }
 
 /*
  * Compare two points lazyly
  */
-int mbedtls_ecp_point_cmp( const mbedtls_ecp_point *P,
-                           const mbedtls_ecp_point *Q )
+int mbedtls_ecp_point_cmp(const mbedtls_ecp_point *P,
+                          const mbedtls_ecp_point *Q)
 {
-    if( mbedtls_mpi_cmp_mpi( &P->X, &Q->X ) == 0 &&
-        mbedtls_mpi_cmp_mpi( &P->Y, &Q->Y ) == 0 &&
-        mbedtls_mpi_cmp_mpi( &P->Z, &Q->Z ) == 0 )
-    {
-        return( 0 );
+    if (mbedtls_mpi_cmp_mpi(&P->X, &Q->X) == 0 &&
+        mbedtls_mpi_cmp_mpi(&P->Y, &Q->Y) == 0 &&
+        mbedtls_mpi_cmp_mpi(&P->Z, &Q->Z) == 0) {
+        return (0);
     }
 
-    return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
+    return (MBEDTLS_ERR_ECP_BAD_INPUT_DATA);
 }
 
 /*
  * Import a non-zero point from ASCII strings
  */
-int mbedtls_ecp_point_read_string( mbedtls_ecp_point *P, int radix,
-                           const char *x, const char *y )
+int mbedtls_ecp_point_read_string(mbedtls_ecp_point *P, int radix,
+                                  const char *x, const char *y)
 {
     int ret;
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_read_string( &P->X, radix, x ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_read_string( &P->Y, radix, y ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &P->Z, 1 ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_read_string(&P->X, radix, x));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_read_string(&P->Y, radix, y));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_lset(&P->Z, 1));
 
 cleanup:
-    return( ret );
+    return (ret);
 }
 
 /*
  * Export a point into unsigned binary data (SEC1 2.3.3)
  */
-int mbedtls_ecp_point_write_binary( const mbedtls_ecp_group *grp, const mbedtls_ecp_point *P,
-                            int format, size_t *olen,
-                            unsigned char *buf, size_t buflen )
+int mbedtls_ecp_point_write_binary(const mbedtls_ecp_group *grp, const mbedtls_ecp_point *P,
+                                   int format, size_t *olen,
+                                   unsigned char *buf, size_t buflen)
 {
     int ret = 0;
     size_t plen;
 
-    if( format != MBEDTLS_ECP_PF_UNCOMPRESSED &&
-        format != MBEDTLS_ECP_PF_COMPRESSED )
-        return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
+    if (format != MBEDTLS_ECP_PF_UNCOMPRESSED &&
+        format != MBEDTLS_ECP_PF_COMPRESSED)
+        return (MBEDTLS_ERR_ECP_BAD_INPUT_DATA);
 
     /*
      * Common case: P == 0
      */
-    if( mbedtls_mpi_cmp_int( &P->Z, 0 ) == 0 )
-    {
-        if( buflen < 1 )
-            return( MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL );
+    if (mbedtls_mpi_cmp_int(&P->Z, 0) == 0) {
+        if (buflen < 1)
+            return (MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL);
 
         buf[0] = 0x00;
         *olen = 1;
 
-        return( 0 );
+        return (0);
     }
 
-    plen = mbedtls_mpi_size( &grp->P );
+    plen = mbedtls_mpi_size(&grp->P);
 
-    if( format == MBEDTLS_ECP_PF_UNCOMPRESSED )
-    {
+    if (format == MBEDTLS_ECP_PF_UNCOMPRESSED) {
         *olen = 2 * plen + 1;
 
-        if( buflen < *olen )
-            return( MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL );
+        if (buflen < *olen)
+            return (MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL);
 
         buf[0] = 0x04;
-        MBEDTLS_MPI_CHK( mbedtls_mpi_write_binary( &P->X, buf + 1, plen ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_write_binary( &P->Y, buf + 1 + plen, plen ) );
-    }
-    else if( format == MBEDTLS_ECP_PF_COMPRESSED )
-    {
+        MBEDTLS_MPI_CHK(mbedtls_mpi_write_binary(&P->X, buf + 1, plen));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_write_binary(&P->Y, buf + 1 + plen, plen));
+    } else if (format == MBEDTLS_ECP_PF_COMPRESSED) {
         *olen = plen + 1;
 
-        if( buflen < *olen )
-            return( MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL );
+        if (buflen < *olen)
+            return (MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL);
 
-        buf[0] = 0x02 + mbedtls_mpi_get_bit( &P->Y, 0 );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_write_binary( &P->X, buf + 1, plen ) );
+        buf[0] = 0x02 + mbedtls_mpi_get_bit(&P->Y, 0);
+        MBEDTLS_MPI_CHK(mbedtls_mpi_write_binary(&P->X, buf + 1, plen));
     }
 
 cleanup:
-    return( ret );
+    return (ret);
 }
 
 /*
  * Import a point from unsigned binary data (SEC1 2.3.4)
  */
-int mbedtls_ecp_point_read_binary( const mbedtls_ecp_group *grp, mbedtls_ecp_point *pt,
-                           const unsigned char *buf, size_t ilen )
+int mbedtls_ecp_point_read_binary(const mbedtls_ecp_group *grp, mbedtls_ecp_point *pt,
+                                  const unsigned char *buf, size_t ilen)
 {
     int ret;
     size_t plen;
 
-    if( ilen < 1 )
-        return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
+    if (ilen < 1)
+        return (MBEDTLS_ERR_ECP_BAD_INPUT_DATA);
 
-    if( buf[0] == 0x00 )
-    {
-        if( ilen == 1 )
-            return( mbedtls_ecp_set_zero( pt ) );
+    if (buf[0] == 0x00) {
+        if (ilen == 1)
+            return (mbedtls_ecp_set_zero(pt));
         else
-            return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
+            return (MBEDTLS_ERR_ECP_BAD_INPUT_DATA);
     }
 
-    plen = mbedtls_mpi_size( &grp->P );
+    plen = mbedtls_mpi_size(&grp->P);
 
-    if( buf[0] != 0x04 )
-        return( MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE );
+    if (buf[0] != 0x04)
+        return (MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE);
 
-    if( ilen != 2 * plen + 1 )
-        return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
+    if (ilen != 2 * plen + 1)
+        return (MBEDTLS_ERR_ECP_BAD_INPUT_DATA);
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_read_binary( &pt->X, buf + 1, plen ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_read_binary( &pt->Y, buf + 1 + plen, plen ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &pt->Z, 1 ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_read_binary(&pt->X, buf + 1, plen));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_read_binary(&pt->Y, buf + 1 + plen, plen));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_lset(&pt->Z, 1));
 
 cleanup:
-    return( ret );
+    return (ret);
 }
 
 /*
@@ -538,8 +523,8 @@ cleanup:
  *          opaque point <1..2^8-1>;
  *      } ECPoint;
  */
-int mbedtls_ecp_tls_read_point( const mbedtls_ecp_group *grp, mbedtls_ecp_point *pt,
-                        const unsigned char **buf, size_t buf_len )
+int mbedtls_ecp_tls_read_point(const mbedtls_ecp_group *grp, mbedtls_ecp_point *pt,
+                               const unsigned char **buf, size_t buf_len)
 {
     unsigned char data_len;
     const unsigned char *buf_start;
@@ -547,12 +532,12 @@ int mbedtls_ecp_tls_read_point( const mbedtls_ecp_group *grp, mbedtls_ecp_point
     /*
      * We must have at least two bytes (1 for length, at least one for data)
      */
-    if( buf_len < 2 )
-        return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
+    if (buf_len < 2)
+        return (MBEDTLS_ERR_ECP_BAD_INPUT_DATA);
 
     data_len = *(*buf)++;
-    if( data_len < 1 || data_len > buf_len - 1 )
-        return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
+    if (data_len < 1 || data_len > buf_len - 1)
+        return (MBEDTLS_ERR_ECP_BAD_INPUT_DATA);
 
     /*
      * Save buffer start for read_binary and update buf
@@ -560,7 +545,7 @@ int mbedtls_ecp_tls_read_point( const mbedtls_ecp_group *grp, mbedtls_ecp_point
     buf_start = *buf;
     *buf += data_len;
 
-    return mbedtls_ecp_point_read_binary( grp, pt, buf_start, data_len );
+    return mbedtls_ecp_point_read_binary(grp, pt, buf_start, data_len);
 }
 
 /*
@@ -569,35 +554,35 @@ int mbedtls_ecp_tls_read_point( const mbedtls_ecp_group *grp, mbedtls_ecp_point
  *          opaque point <1..2^8-1>;
  *      } ECPoint;
  */
-int mbedtls_ecp_tls_write_point( const mbedtls_ecp_group *grp, const mbedtls_ecp_point *pt,
-                         int format, size_t *olen,
-                         unsigned char *buf, size_t blen )
+int mbedtls_ecp_tls_write_point(const mbedtls_ecp_group *grp, const mbedtls_ecp_point *pt,
+                                int format, size_t *olen,
+                                unsigned char *buf, size_t blen)
 {
     int ret;
 
     /*
      * buffer length must be at least one, for our length byte
      */
-    if( blen < 1 )
-        return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
+    if (blen < 1)
+        return (MBEDTLS_ERR_ECP_BAD_INPUT_DATA);
 
-    if( ( ret = mbedtls_ecp_point_write_binary( grp, pt, format,
-                    olen, buf + 1, blen - 1) ) != 0 )
-        return( ret );
+    if ((ret = mbedtls_ecp_point_write_binary(grp, pt, format,
+                                              olen, buf + 1, blen - 1)) != 0)
+        return (ret);
 
     /*
      * write length to the first byte and update total length
      */
-    buf[0] = (unsigned char) *olen;
+    buf[0] = (unsigned char) * olen;
     ++*olen;
 
-    return( 0 );
+    return (0);
 }
 
 /*
  * Set a group from an ECParameters record (RFC 4492)
  */
-int mbedtls_ecp_tls_read_group( mbedtls_ecp_group *grp, const unsigned char **buf, size_t len )
+int mbedtls_ecp_tls_read_group(mbedtls_ecp_group *grp, const unsigned char **buf, size_t len)
 {
     uint16_t tls_id;
     const mbedtls_ecp_curve_info *curve_info;
@@ -605,14 +590,14 @@ int mbedtls_ecp_tls_read_group( mbedtls_ecp_group *grp, const unsigned char **bu
     /*
      * We expect at least three bytes (see below)
      */
-    if( len < 3 )
-        return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
+    if (len < 3)
+        return (MBEDTLS_ERR_ECP_BAD_INPUT_DATA);
 
     /*
      * First byte is curve_type; only named_curve is handled
      */
-    if( *(*buf)++ != MBEDTLS_ECP_TLS_NAMED_CURVE )
-        return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
+    if (*(*buf)++ != MBEDTLS_ECP_TLS_NAMED_CURVE)
+        return (MBEDTLS_ERR_ECP_BAD_INPUT_DATA);
 
     /*
      * Next two bytes are the namedcurve value
@@ -621,29 +606,29 @@ int mbedtls_ecp_tls_read_group( mbedtls_ecp_group *grp, const unsigned char **bu
     tls_id <<= 8;
     tls_id |= *(*buf)++;
 
-    if( ( curve_info = mbedtls_ecp_curve_info_from_tls_id( tls_id ) ) == NULL )
-        return( MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE );
+    if ((curve_info = mbedtls_ecp_curve_info_from_tls_id(tls_id)) == NULL)
+        return (MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE);
 
-    return mbedtls_ecp_group_load( grp, curve_info->grp_id );
+    return mbedtls_ecp_group_load(grp, curve_info->grp_id);
 }
 
 /*
  * Write the ECParameters record corresponding to a group (RFC 4492)
  */
-int mbedtls_ecp_tls_write_group( const mbedtls_ecp_group *grp, size_t *olen,
-                         unsigned char *buf, size_t blen )
+int mbedtls_ecp_tls_write_group(const mbedtls_ecp_group *grp, size_t *olen,
+                                unsigned char *buf, size_t blen)
 {
     const mbedtls_ecp_curve_info *curve_info;
 
-    if( ( curve_info = mbedtls_ecp_curve_info_from_grp_id( grp->id ) ) == NULL )
-        return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
+    if ((curve_info = mbedtls_ecp_curve_info_from_grp_id(grp->id)) == NULL)
+        return (MBEDTLS_ERR_ECP_BAD_INPUT_DATA);
 
     /*
      * We are going to write 3 bytes (see below)
      */
     *olen = 3;
-    if( blen < *olen )
-        return( MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL );
+    if (blen < *olen)
+        return (MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL);
 
     /*
      * First byte is curve_type, always named_curve
@@ -656,7 +641,7 @@ int mbedtls_ecp_tls_write_group( const mbedtls_ecp_group *grp, size_t *olen,
     buf[0] = curve_info->tls_id >> 8;
     buf[1] = curve_info->tls_id & 0xFF;
 
-    return( 0 );
+    return (0);
 }
 
 /*
@@ -665,32 +650,31 @@ int mbedtls_ecp_tls_write_group( const mbedtls_ecp_group *grp, size_t *olen,
  *
  * This function is in the critial loop for mbedtls_ecp_mul, so pay attention to perf.
  */
-static int ecp_modp( mbedtls_mpi *N, const mbedtls_ecp_group *grp )
+static int ecp_modp(mbedtls_mpi *N, const mbedtls_ecp_group *grp)
 {
     int ret;
 
-    if( grp->modp == NULL )
-        return( mbedtls_mpi_mod_mpi( N, N, &grp->P ) );
+    if (grp->modp == NULL)
+        return (mbedtls_mpi_mod_mpi(N, N, &grp->P));
 
     /* N->s < 0 is a much faster test, which fails only if N is 0 */
-    if( ( N->s < 0 && mbedtls_mpi_cmp_int( N, 0 ) != 0 ) ||
-        mbedtls_mpi_bitlen( N ) > 2 * grp->pbits )
-    {
-        return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
+    if ((N->s < 0 && mbedtls_mpi_cmp_int(N, 0) != 0) ||
+        mbedtls_mpi_bitlen(N) > 2 * grp->pbits) {
+        return (MBEDTLS_ERR_ECP_BAD_INPUT_DATA);
     }
 
-    MBEDTLS_MPI_CHK( grp->modp( N ) );
+    MBEDTLS_MPI_CHK(grp->modp(N));
 
     /* N->s < 0 is a much faster test, which fails only if N is 0 */
-    while( N->s < 0 && mbedtls_mpi_cmp_int( N, 0 ) != 0 )
-        MBEDTLS_MPI_CHK( mbedtls_mpi_add_mpi( N, N, &grp->P ) );
+    while (N->s < 0 && mbedtls_mpi_cmp_int(N, 0) != 0)
+        MBEDTLS_MPI_CHK(mbedtls_mpi_add_mpi(N, N, &grp->P));
 
-    while( mbedtls_mpi_cmp_mpi( N, &grp->P ) >= 0 )
+    while (mbedtls_mpi_cmp_mpi(N, &grp->P) >= 0)
         /* we known P, N and the result are positive */
-        MBEDTLS_MPI_CHK( mbedtls_mpi_sub_abs( N, N, &grp->P ) );
+        MBEDTLS_MPI_CHK(mbedtls_mpi_sub_abs(N, N, &grp->P));
 
 cleanup:
-    return( ret );
+    return (ret);
 }
 
 /*
@@ -713,7 +697,7 @@ cleanup:
 #endif
 
 #define MOD_MUL( N )    do { MBEDTLS_MPI_CHK( ecp_modp( &N, grp ) ); INC_MUL_COUNT } \
-                        while( 0 )
+    while( 0 )
 
 /*
  * Reduce a mbedtls_mpi mod p in-place, to use after mbedtls_mpi_sub_mpi
@@ -745,45 +729,50 @@ cleanup:
  * Normalize jacobian coordinates so that Z == 0 || Z == 1  (GECC 3.2.1)
  * Cost: 1N := 1I + 3M + 1S
  */
-static int ecp_normalize_jac( const mbedtls_ecp_group *grp, mbedtls_ecp_point *pt )
+static int ecp_normalize_jac(const mbedtls_ecp_group *grp, mbedtls_ecp_point *pt)
 {
     int ret;
     mbedtls_mpi Zi, ZZi;
 
-    if( mbedtls_mpi_cmp_int( &pt->Z, 0 ) == 0 )
-        return( 0 );
+    if (mbedtls_mpi_cmp_int(&pt->Z, 0) == 0)
+        return (0);
 
 #if defined(MBEDTLS_ECP_NORMALIZE_JAC_ALT)
-    if ( mbedtls_internal_ecp_grp_capable( grp ) )
-    {
-        return mbedtls_internal_ecp_normalize_jac( grp, pt );
+    if (mbedtls_internal_ecp_grp_capable(grp)) {
+        return mbedtls_internal_ecp_normalize_jac(grp, pt);
     }
 #endif /* MBEDTLS_ECP_NORMALIZE_JAC_ALT */
-    mbedtls_mpi_init( &Zi ); mbedtls_mpi_init( &ZZi );
+    mbedtls_mpi_init(&Zi);
+    mbedtls_mpi_init(&ZZi);
 
     /*
      * X = X / Z^2  mod p
      */
-    MBEDTLS_MPI_CHK( mbedtls_mpi_inv_mod( &Zi,      &pt->Z,     &grp->P ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &ZZi,     &Zi,        &Zi     ) ); MOD_MUL( ZZi );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &pt->X,   &pt->X,     &ZZi    ) ); MOD_MUL( pt->X );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_inv_mod(&Zi,      &pt->Z,     &grp->P));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&ZZi,     &Zi,        &Zi));
+    MOD_MUL(ZZi);
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&pt->X,   &pt->X,     &ZZi));
+    MOD_MUL(pt->X);
 
     /*
      * Y = Y / Z^3  mod p
      */
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &pt->Y,   &pt->Y,     &ZZi    ) ); MOD_MUL( pt->Y );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &pt->Y,   &pt->Y,     &Zi     ) ); MOD_MUL( pt->Y );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&pt->Y,   &pt->Y,     &ZZi));
+    MOD_MUL(pt->Y);
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&pt->Y,   &pt->Y,     &Zi));
+    MOD_MUL(pt->Y);
 
     /*
      * Z = 1
      */
-    MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &pt->Z, 1 ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_lset(&pt->Z, 1));
 
 cleanup:
 
-    mbedtls_mpi_free( &Zi ); mbedtls_mpi_free( &ZZi );
+    mbedtls_mpi_free(&Zi);
+    mbedtls_mpi_free(&ZZi);
 
-    return( ret );
+    return (ret);
 }
 
 /*
@@ -797,65 +786,68 @@ cleanup:
  *
  * Cost: 1N(t) := 1I + (6t - 3)M + 1S
  */
-static int ecp_normalize_jac_many( const mbedtls_ecp_group *grp,
-                                   mbedtls_ecp_point *T[], size_t t_len )
+static int ecp_normalize_jac_many(const mbedtls_ecp_group *grp,
+                                  mbedtls_ecp_point *T[], size_t t_len)
 {
     int ret;
     size_t i;
     mbedtls_mpi *c, u, Zi, ZZi;
 
-    if( t_len < 2 )
-        return( ecp_normalize_jac( grp, *T ) );
+    if (t_len < 2)
+        return (ecp_normalize_jac(grp, *T));
 
 #if defined(MBEDTLS_ECP_NORMALIZE_JAC_MANY_ALT)
-    if ( mbedtls_internal_ecp_grp_capable( grp ) )
-    {
+    if (mbedtls_internal_ecp_grp_capable(grp)) {
         return mbedtls_internal_ecp_normalize_jac_many(grp, T, t_len);
     }
 #endif
 
-    if( ( c = mbedtls_calloc( t_len, sizeof( mbedtls_mpi ) ) ) == NULL )
-        return( MBEDTLS_ERR_ECP_ALLOC_FAILED );
+    if ((c = mbedtls_calloc(t_len, sizeof(mbedtls_mpi))) == NULL)
+        return (MBEDTLS_ERR_ECP_ALLOC_FAILED);
 
-    mbedtls_mpi_init( &u ); mbedtls_mpi_init( &Zi ); mbedtls_mpi_init( &ZZi );
+    mbedtls_mpi_init(&u);
+    mbedtls_mpi_init(&Zi);
+    mbedtls_mpi_init(&ZZi);
 
     /*
      * c[i] = Z_0 * ... * Z_i
      */
-    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &c[0], &T[0]->Z ) );
-    for( i = 1; i < t_len; i++ )
-    {
-        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &c[i], &c[i-1], &T[i]->Z ) );
-        MOD_MUL( c[i] );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_copy(&c[0], &T[0]->Z));
+    for (i = 1; i < t_len; i++) {
+        MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&c[i], &c[i - 1], &T[i]->Z));
+        MOD_MUL(c[i]);
     }
 
     /*
      * u = 1 / (Z_0 * ... * Z_n) mod P
      */
-    MBEDTLS_MPI_CHK( mbedtls_mpi_inv_mod( &u, &c[t_len-1], &grp->P ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_inv_mod(&u, &c[t_len - 1], &grp->P));
 
-    for( i = t_len - 1; ; i-- )
-    {
+    for (i = t_len - 1; ; i--) {
         /*
          * Zi = 1 / Z_i mod p
          * u = 1 / (Z_0 * ... * Z_i) mod P
          */
-        if( i == 0 ) {
-            MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &Zi, &u ) );
-        }
-        else
-        {
-            MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &Zi, &u, &c[i-1]  ) ); MOD_MUL( Zi );
-            MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &u,  &u, &T[i]->Z ) ); MOD_MUL( u );
+        if (i == 0) {
+            MBEDTLS_MPI_CHK(mbedtls_mpi_copy(&Zi, &u));
+        } else {
+            MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&Zi, &u, &c[i - 1]));
+            MOD_MUL(Zi);
+            MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&u,  &u, &T[i]->Z));
+            MOD_MUL(u);
         }
 
         /*
          * proceed as in normalize()
          */
-        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &ZZi,     &Zi,      &Zi  ) ); MOD_MUL( ZZi );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &T[i]->X, &T[i]->X, &ZZi ) ); MOD_MUL( T[i]->X );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &T[i]->Y, &T[i]->Y, &ZZi ) ); MOD_MUL( T[i]->Y );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &T[i]->Y, &T[i]->Y, &Zi  ) ); MOD_MUL( T[i]->Y );
+        MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&ZZi,     &Zi,      &Zi));
+        MOD_MUL(ZZi);
+        MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&T[i]->X, &T[i]->X, &ZZi));
+        MOD_MUL(T[i]->X);
+        MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&T[i]->Y, &T[i]->Y, &ZZi));
+        MOD_MUL(T[i]->Y);
+        MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&T[i]->Y, &T[i]->Y, &Zi));
+        MOD_MUL(T[i]->Y);
 
         /*
          * Post-precessing: reclaim some memory by shrinking coordinates
@@ -863,47 +855,49 @@ static int ecp_normalize_jac_many( const mbedtls_ecp_group *grp,
          * - shrinking other coordinates, but still keeping the same number of
          *   limbs as P, as otherwise it will too likely be regrown too fast.
          */
-        MBEDTLS_MPI_CHK( mbedtls_mpi_shrink( &T[i]->X, grp->P.n ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_shrink( &T[i]->Y, grp->P.n ) );
-        mbedtls_mpi_free( &T[i]->Z );
+        MBEDTLS_MPI_CHK(mbedtls_mpi_shrink(&T[i]->X, grp->P.n));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_shrink(&T[i]->Y, grp->P.n));
+        mbedtls_mpi_free(&T[i]->Z);
 
-        if( i == 0 )
+        if (i == 0)
             break;
     }
 
 cleanup:
 
-    mbedtls_mpi_free( &u ); mbedtls_mpi_free( &Zi ); mbedtls_mpi_free( &ZZi );
-    for( i = 0; i < t_len; i++ )
-        mbedtls_mpi_free( &c[i] );
-    mbedtls_free( c );
+    mbedtls_mpi_free(&u);
+    mbedtls_mpi_free(&Zi);
+    mbedtls_mpi_free(&ZZi);
+    for (i = 0; i < t_len; i++)
+        mbedtls_mpi_free(&c[i]);
+    mbedtls_free(c);
 
-    return( ret );
+    return (ret);
 }
 
 /*
  * Conditional point inversion: Q -> -Q = (Q.X, -Q.Y, Q.Z) without leak.
  * "inv" must be 0 (don't invert) or 1 (invert) or the result will be invalid
  */
-static int ecp_safe_invert_jac( const mbedtls_ecp_group *grp,
-                            mbedtls_ecp_point *Q,
-                            unsigned char inv )
+static int ecp_safe_invert_jac(const mbedtls_ecp_group *grp,
+                               mbedtls_ecp_point *Q,
+                               unsigned char inv)
 {
     int ret;
     unsigned char nonzero;
     mbedtls_mpi mQY;
 
-    mbedtls_mpi_init( &mQY );
+    mbedtls_mpi_init(&mQY);
 
     /* Use the fact that -Q.Y mod P = P - Q.Y unless Q.Y == 0 */
-    MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &mQY, &grp->P, &Q->Y ) );
-    nonzero = mbedtls_mpi_cmp_int( &Q->Y, 0 ) != 0;
-    MBEDTLS_MPI_CHK( mbedtls_mpi_safe_cond_assign( &Q->Y, &mQY, inv & nonzero ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_sub_mpi(&mQY, &grp->P, &Q->Y));
+    nonzero = mbedtls_mpi_cmp_int(&Q->Y, 0) != 0;
+    MBEDTLS_MPI_CHK(mbedtls_mpi_safe_cond_assign(&Q->Y, &mQY, inv & nonzero));
 
 cleanup:
-    mbedtls_mpi_free( &mQY );
+    mbedtls_mpi_free(&mQY);
 
-    return( ret );
+    return (ret);
 }
 
 /*
@@ -920,8 +914,8 @@ cleanup:
  *             4M + 4S          (A == -3)
  *             3M + 6S + 1a     otherwise
  */
-static int ecp_double_jac( const mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
-                           const mbedtls_ecp_point *P )
+static int ecp_double_jac(const mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
+                          const mbedtls_ecp_point *P)
 {
     int ret;
     mbedtls_mpi M, S, T, U;
@@ -931,73 +925,99 @@ static int ecp_double_jac( const mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
 #endif
 
 #if defined(MBEDTLS_ECP_DOUBLE_JAC_ALT)
-    if ( mbedtls_internal_ecp_grp_capable( grp ) )
-    {
-        return mbedtls_internal_ecp_double_jac( grp, R, P );
+    if (mbedtls_internal_ecp_grp_capable(grp)) {
+        return mbedtls_internal_ecp_double_jac(grp, R, P);
     }
 #endif /* MBEDTLS_ECP_DOUBLE_JAC_ALT */
 
-    mbedtls_mpi_init( &M ); mbedtls_mpi_init( &S ); mbedtls_mpi_init( &T ); mbedtls_mpi_init( &U );
+    mbedtls_mpi_init(&M);
+    mbedtls_mpi_init(&S);
+    mbedtls_mpi_init(&T);
+    mbedtls_mpi_init(&U);
 
     /* Special case for A = -3 */
-    if( grp->A.p == NULL )
-    {
+    if (grp->A.p == NULL) {
         /* M = 3(X + Z^2)(X - Z^2) */
-        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &S,  &P->Z,  &P->Z   ) ); MOD_MUL( S );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_add_mpi( &T,  &P->X,  &S      ) ); MOD_ADD( T );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &U,  &P->X,  &S      ) ); MOD_SUB( U );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &S,  &T,     &U      ) ); MOD_MUL( S );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_int( &M,  &S,     3       ) ); MOD_ADD( M );
-    }
-    else
-    {
+        MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&S,  &P->Z,  &P->Z));
+        MOD_MUL(S);
+        MBEDTLS_MPI_CHK(mbedtls_mpi_add_mpi(&T,  &P->X,  &S));
+        MOD_ADD(T);
+        MBEDTLS_MPI_CHK(mbedtls_mpi_sub_mpi(&U,  &P->X,  &S));
+        MOD_SUB(U);
+        MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&S,  &T,     &U));
+        MOD_MUL(S);
+        MBEDTLS_MPI_CHK(mbedtls_mpi_mul_int(&M,  &S,     3));
+        MOD_ADD(M);
+    } else {
         /* M = 3.X^2 */
-        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &S,  &P->X,  &P->X   ) ); MOD_MUL( S );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_int( &M,  &S,     3       ) ); MOD_ADD( M );
+        MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&S,  &P->X,  &P->X));
+        MOD_MUL(S);
+        MBEDTLS_MPI_CHK(mbedtls_mpi_mul_int(&M,  &S,     3));
+        MOD_ADD(M);
 
         /* Optimize away for "koblitz" curves with A = 0 */
-        if( mbedtls_mpi_cmp_int( &grp->A, 0 ) != 0 )
-        {
+        if (mbedtls_mpi_cmp_int(&grp->A, 0) != 0) {
             /* M += A.Z^4 */
-            MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &S,  &P->Z,  &P->Z   ) ); MOD_MUL( S );
-            MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &T,  &S,     &S      ) ); MOD_MUL( T );
-            MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &S,  &T,     &grp->A ) ); MOD_MUL( S );
-            MBEDTLS_MPI_CHK( mbedtls_mpi_add_mpi( &M,  &M,     &S      ) ); MOD_ADD( M );
+            MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&S,  &P->Z,  &P->Z));
+            MOD_MUL(S);
+            MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&T,  &S,     &S));
+            MOD_MUL(T);
+            MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&S,  &T,     &grp->A));
+            MOD_MUL(S);
+            MBEDTLS_MPI_CHK(mbedtls_mpi_add_mpi(&M,  &M,     &S));
+            MOD_ADD(M);
         }
     }
 
     /* S = 4.X.Y^2 */
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &T,  &P->Y,  &P->Y   ) ); MOD_MUL( T );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_shift_l( &T,  1               ) ); MOD_ADD( T );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &S,  &P->X,  &T      ) ); MOD_MUL( S );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_shift_l( &S,  1               ) ); MOD_ADD( S );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&T,  &P->Y,  &P->Y));
+    MOD_MUL(T);
+    MBEDTLS_MPI_CHK(mbedtls_mpi_shift_l(&T,  1));
+    MOD_ADD(T);
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&S,  &P->X,  &T));
+    MOD_MUL(S);
+    MBEDTLS_MPI_CHK(mbedtls_mpi_shift_l(&S,  1));
+    MOD_ADD(S);
 
     /* U = 8.Y^4 */
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &U,  &T,     &T      ) ); MOD_MUL( U );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_shift_l( &U,  1               ) ); MOD_ADD( U );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&U,  &T,     &T));
+    MOD_MUL(U);
+    MBEDTLS_MPI_CHK(mbedtls_mpi_shift_l(&U,  1));
+    MOD_ADD(U);
 
     /* T = M^2 - 2.S */
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &T,  &M,     &M      ) ); MOD_MUL( T );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &T,  &T,     &S      ) ); MOD_SUB( T );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &T,  &T,     &S      ) ); MOD_SUB( T );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&T,  &M,     &M));
+    MOD_MUL(T);
+    MBEDTLS_MPI_CHK(mbedtls_mpi_sub_mpi(&T,  &T,     &S));
+    MOD_SUB(T);
+    MBEDTLS_MPI_CHK(mbedtls_mpi_sub_mpi(&T,  &T,     &S));
+    MOD_SUB(T);
 
     /* S = M(S - T) - U */
-    MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &S,  &S,     &T      ) ); MOD_SUB( S );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &S,  &S,     &M      ) ); MOD_MUL( S );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &S,  &S,     &U      ) ); MOD_SUB( S );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_sub_mpi(&S,  &S,     &T));
+    MOD_SUB(S);
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&S,  &S,     &M));
+    MOD_MUL(S);
+    MBEDTLS_MPI_CHK(mbedtls_mpi_sub_mpi(&S,  &S,     &U));
+    MOD_SUB(S);
 
     /* U = 2.Y.Z */
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &U,  &P->Y,  &P->Z   ) ); MOD_MUL( U );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_shift_l( &U,  1               ) ); MOD_ADD( U );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&U,  &P->Y,  &P->Z));
+    MOD_MUL(U);
+    MBEDTLS_MPI_CHK(mbedtls_mpi_shift_l(&U,  1));
+    MOD_ADD(U);
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &R->X, &T ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &R->Y, &S ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &R->Z, &U ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_copy(&R->X, &T));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_copy(&R->Y, &S));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_copy(&R->Z, &U));
 
 cleanup:
-    mbedtls_mpi_free( &M ); mbedtls_mpi_free( &S ); mbedtls_mpi_free( &T ); mbedtls_mpi_free( &U );
+    mbedtls_mpi_free(&M);
+    mbedtls_mpi_free(&S);
+    mbedtls_mpi_free(&T);
+    mbedtls_mpi_free(&U);
 
-    return( ret );
+    return (ret);
 }
 
 /*
@@ -1018,8 +1038,8 @@ cleanup:
  *
  * Cost: 1A := 8M + 3S
  */
-static int ecp_add_mixed( const mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
-                          const mbedtls_ecp_point *P, const mbedtls_ecp_point *Q )
+static int ecp_add_mixed(const mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
+                         const mbedtls_ecp_point *P, const mbedtls_ecp_point *Q)
 {
     int ret;
     mbedtls_mpi T1, T2, T3, T4, X, Y, Z;
@@ -1029,75 +1049,98 @@ static int ecp_add_mixed( const mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
 #endif
 
 #if defined(MBEDTLS_ECP_ADD_MIXED_ALT)
-    if ( mbedtls_internal_ecp_grp_capable( grp ) )
-    {
-        return mbedtls_internal_ecp_add_mixed( grp, R, P, Q );
+    if (mbedtls_internal_ecp_grp_capable(grp)) {
+        return mbedtls_internal_ecp_add_mixed(grp, R, P, Q);
     }
 #endif /* MBEDTLS_ECP_ADD_MIXED_ALT */
 
     /*
      * Trivial cases: P == 0 or Q == 0 (case 1)
      */
-    if( mbedtls_mpi_cmp_int( &P->Z, 0 ) == 0 )
-        return( mbedtls_ecp_copy( R, Q ) );
+    if (mbedtls_mpi_cmp_int(&P->Z, 0) == 0)
+        return (mbedtls_ecp_copy(R, Q));
 
-    if( Q->Z.p != NULL && mbedtls_mpi_cmp_int( &Q->Z, 0 ) == 0 )
-        return( mbedtls_ecp_copy( R, P ) );
+    if (Q->Z.p != NULL && mbedtls_mpi_cmp_int(&Q->Z, 0) == 0)
+        return (mbedtls_ecp_copy(R, P));
 
     /*
      * Make sure Q coordinates are normalized
      */
-    if( Q->Z.p != NULL && mbedtls_mpi_cmp_int( &Q->Z, 1 ) != 0 )
-        return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
+    if (Q->Z.p != NULL && mbedtls_mpi_cmp_int(&Q->Z, 1) != 0)
+        return (MBEDTLS_ERR_ECP_BAD_INPUT_DATA);
 
-    mbedtls_mpi_init( &T1 ); mbedtls_mpi_init( &T2 ); mbedtls_mpi_init( &T3 ); mbedtls_mpi_init( &T4 );
-    mbedtls_mpi_init( &X ); mbedtls_mpi_init( &Y ); mbedtls_mpi_init( &Z );
+    mbedtls_mpi_init(&T1);
+    mbedtls_mpi_init(&T2);
+    mbedtls_mpi_init(&T3);
+    mbedtls_mpi_init(&T4);
+    mbedtls_mpi_init(&X);
+    mbedtls_mpi_init(&Y);
+    mbedtls_mpi_init(&Z);
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &T1,  &P->Z,  &P->Z ) );  MOD_MUL( T1 );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &T2,  &T1,    &P->Z ) );  MOD_MUL( T2 );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &T1,  &T1,    &Q->X ) );  MOD_MUL( T1 );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &T2,  &T2,    &Q->Y ) );  MOD_MUL( T2 );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &T1,  &T1,    &P->X ) );  MOD_SUB( T1 );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &T2,  &T2,    &P->Y ) );  MOD_SUB( T2 );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&T1,  &P->Z,  &P->Z));
+    MOD_MUL(T1);
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&T2,  &T1,    &P->Z));
+    MOD_MUL(T2);
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&T1,  &T1,    &Q->X));
+    MOD_MUL(T1);
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&T2,  &T2,    &Q->Y));
+    MOD_MUL(T2);
+    MBEDTLS_MPI_CHK(mbedtls_mpi_sub_mpi(&T1,  &T1,    &P->X));
+    MOD_SUB(T1);
+    MBEDTLS_MPI_CHK(mbedtls_mpi_sub_mpi(&T2,  &T2,    &P->Y));
+    MOD_SUB(T2);
 
     /* Special cases (2) and (3) */
-    if( mbedtls_mpi_cmp_int( &T1, 0 ) == 0 )
-    {
-        if( mbedtls_mpi_cmp_int( &T2, 0 ) == 0 )
-        {
-            ret = ecp_double_jac( grp, R, P );
+    if (mbedtls_mpi_cmp_int(&T1, 0) == 0) {
+        if (mbedtls_mpi_cmp_int(&T2, 0) == 0) {
+            ret = ecp_double_jac(grp, R, P);
             goto cleanup;
-        }
-        else
-        {
-            ret = mbedtls_ecp_set_zero( R );
+        } else {
+            ret = mbedtls_ecp_set_zero(R);
             goto cleanup;
         }
     }
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &Z,   &P->Z,  &T1   ) );  MOD_MUL( Z  );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &T3,  &T1,    &T1   ) );  MOD_MUL( T3 );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &T4,  &T3,    &T1   ) );  MOD_MUL( T4 );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &T3,  &T3,    &P->X ) );  MOD_MUL( T3 );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_int( &T1,  &T3,    2     ) );  MOD_ADD( T1 );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &X,   &T2,    &T2   ) );  MOD_MUL( X  );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &X,   &X,     &T1   ) );  MOD_SUB( X  );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &X,   &X,     &T4   ) );  MOD_SUB( X  );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &T3,  &T3,    &X    ) );  MOD_SUB( T3 );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &T3,  &T3,    &T2   ) );  MOD_MUL( T3 );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &T4,  &T4,    &P->Y ) );  MOD_MUL( T4 );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &Y,   &T3,    &T4   ) );  MOD_SUB( Y  );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&Z,   &P->Z,  &T1));
+    MOD_MUL(Z);
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&T3,  &T1,    &T1));
+    MOD_MUL(T3);
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&T4,  &T3,    &T1));
+    MOD_MUL(T4);
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&T3,  &T3,    &P->X));
+    MOD_MUL(T3);
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_int(&T1,  &T3,    2));
+    MOD_ADD(T1);
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&X,   &T2,    &T2));
+    MOD_MUL(X);
+    MBEDTLS_MPI_CHK(mbedtls_mpi_sub_mpi(&X,   &X,     &T1));
+    MOD_SUB(X);
+    MBEDTLS_MPI_CHK(mbedtls_mpi_sub_mpi(&X,   &X,     &T4));
+    MOD_SUB(X);
+    MBEDTLS_MPI_CHK(mbedtls_mpi_sub_mpi(&T3,  &T3,    &X));
+    MOD_SUB(T3);
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&T3,  &T3,    &T2));
+    MOD_MUL(T3);
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&T4,  &T4,    &P->Y));
+    MOD_MUL(T4);
+    MBEDTLS_MPI_CHK(mbedtls_mpi_sub_mpi(&Y,   &T3,    &T4));
+    MOD_SUB(Y);
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &R->X, &X ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &R->Y, &Y ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &R->Z, &Z ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_copy(&R->X, &X));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_copy(&R->Y, &Y));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_copy(&R->Z, &Z));
 
 cleanup:
 
-    mbedtls_mpi_free( &T1 ); mbedtls_mpi_free( &T2 ); mbedtls_mpi_free( &T3 ); mbedtls_mpi_free( &T4 );
-    mbedtls_mpi_free( &X ); mbedtls_mpi_free( &Y ); mbedtls_mpi_free( &Z );
+    mbedtls_mpi_free(&T1);
+    mbedtls_mpi_free(&T2);
+    mbedtls_mpi_free(&T3);
+    mbedtls_mpi_free(&T4);
+    mbedtls_mpi_free(&X);
+    mbedtls_mpi_free(&Y);
+    mbedtls_mpi_free(&Z);
 
-    return( ret );
+    return (ret);
 }
 
 /*
@@ -1107,8 +1150,8 @@ cleanup:
  *
  * This countermeasure was first suggested in [2].
  */
-static int ecp_randomize_jac( const mbedtls_ecp_group *grp, mbedtls_ecp_point *pt,
-                int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
+static int ecp_randomize_jac(const mbedtls_ecp_group *grp, mbedtls_ecp_point *pt,
+                             int (*f_rng)(void *, unsigned char *, size_t), void *p_rng)
 {
     int ret;
     mbedtls_mpi l, ll;
@@ -1116,43 +1159,47 @@ static int ecp_randomize_jac( const mbedtls_ecp_group *grp, mbedtls_ecp_point *p
     int count = 0;
 
 #if defined(MBEDTLS_ECP_RANDOMIZE_JAC_ALT)
-    if ( mbedtls_internal_ecp_grp_capable( grp ) )
-    {
-        return mbedtls_internal_ecp_randomize_jac( grp, pt, f_rng, p_rng );
+    if (mbedtls_internal_ecp_grp_capable(grp)) {
+        return mbedtls_internal_ecp_randomize_jac(grp, pt, f_rng, p_rng);
     }
 #endif /* MBEDTLS_ECP_RANDOMIZE_JAC_ALT */
 
-    p_size = ( grp->pbits + 7 ) / 8;
-    mbedtls_mpi_init( &l ); mbedtls_mpi_init( &ll );
+    p_size = (grp->pbits + 7) / 8;
+    mbedtls_mpi_init(&l);
+    mbedtls_mpi_init(&ll);
 
     /* Generate l such that 1 < l < p */
-    do
-    {
-        MBEDTLS_MPI_CHK( mbedtls_mpi_fill_random( &l, p_size, f_rng, p_rng ) );
+    do {
+        MBEDTLS_MPI_CHK(mbedtls_mpi_fill_random(&l, p_size, f_rng, p_rng));
 
-        while( mbedtls_mpi_cmp_mpi( &l, &grp->P ) >= 0 )
-            MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &l, 1 ) );
+        while (mbedtls_mpi_cmp_mpi(&l, &grp->P) >= 0)
+            MBEDTLS_MPI_CHK(mbedtls_mpi_shift_r(&l, 1));
 
-        if( count++ > 10 )
-            return( MBEDTLS_ERR_ECP_RANDOM_FAILED );
-    }
-    while( mbedtls_mpi_cmp_int( &l, 1 ) <= 0 );
+        if (count++ > 10)
+            return (MBEDTLS_ERR_ECP_RANDOM_FAILED);
+    } while (mbedtls_mpi_cmp_int(&l, 1) <= 0);
 
     /* Z = l * Z */
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &pt->Z,   &pt->Z,     &l  ) ); MOD_MUL( pt->Z );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&pt->Z,   &pt->Z,     &l));
+    MOD_MUL(pt->Z);
 
     /* X = l^2 * X */
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &ll,      &l,         &l  ) ); MOD_MUL( ll );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &pt->X,   &pt->X,     &ll ) ); MOD_MUL( pt->X );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&ll,      &l,         &l));
+    MOD_MUL(ll);
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&pt->X,   &pt->X,     &ll));
+    MOD_MUL(pt->X);
 
     /* Y = l^3 * Y */
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &ll,      &ll,        &l  ) ); MOD_MUL( ll );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &pt->Y,   &pt->Y,     &ll ) ); MOD_MUL( pt->Y );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&ll,      &ll,        &l));
+    MOD_MUL(ll);
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&pt->Y,   &pt->Y,     &ll));
+    MOD_MUL(pt->Y);
 
 cleanup:
-    mbedtls_mpi_free( &l ); mbedtls_mpi_free( &ll );
+    mbedtls_mpi_free(&l);
+    mbedtls_mpi_free(&ll);
 
-    return( ret );
+    return (ret);
 }
 
 /*
@@ -1188,33 +1235,32 @@ cleanup:
  * - m is the MPI, expected to be odd and such that bitlength(m) <= w * d
  *   (the result will be incorrect if these assumptions are not satisfied)
  */
-static void ecp_comb_fixed( unsigned char x[], size_t d,
-                            unsigned char w, const mbedtls_mpi *m )
+static void ecp_comb_fixed(unsigned char x[], size_t d,
+                           unsigned char w, const mbedtls_mpi *m)
 {
     size_t i, j;
     unsigned char c, cc, adjust;
 
-    memset( x, 0, d+1 );
+    memset(x, 0, d + 1);
 
     /* First get the classical comb values (except for x_d = 0) */
-    for( i = 0; i < d; i++ )
-        for( j = 0; j < w; j++ )
-            x[i] |= mbedtls_mpi_get_bit( m, i + d * j ) << j;
+    for (i = 0; i < d; i++)
+        for (j = 0; j < w; j++)
+            x[i] |= mbedtls_mpi_get_bit(m, i + d * j) << j;
 
     /* Now make sure x_1 .. x_d are odd */
     c = 0;
-    for( i = 1; i <= d; i++ )
-    {
+    for (i = 1; i <= d; i++) {
         /* Add carry and update it */
         cc   = x[i] & c;
         x[i] = x[i] ^ c;
         c = cc;
 
         /* Adjust if needed, avoiding branches */
-        adjust = 1 - ( x[i] & 0x01 );
-        c   |= x[i] & ( x[i-1] * adjust );
-        x[i] = x[i] ^ ( x[i-1] * adjust );
-        x[i-1] |= adjust << 7;
+        adjust = 1 - (x[i] & 0x01);
+        c   |= x[i] & (x[i - 1] * adjust);
+        x[i] = x[i] ^ (x[i - 1] * adjust);
+        x[i - 1] |= adjust << 7;
     }
 }
 
@@ -1228,9 +1274,9 @@ static void ecp_comb_fixed( unsigned char x[], size_t d,
  *
  * Cost: d(w-1) D + (2^{w-1} - 1) A + 1 N(w-1) + 1 N(2^{w-1} - 1)
  */
-static int ecp_precompute_comb( const mbedtls_ecp_group *grp,
-                                mbedtls_ecp_point T[], const mbedtls_ecp_point *P,
-                                unsigned char w, size_t d )
+static int ecp_precompute_comb(const mbedtls_ecp_group *grp,
+                               mbedtls_ecp_point T[], const mbedtls_ecp_point *P,
+                               unsigned char w, size_t d)
 {
     int ret;
     unsigned char i, k;
@@ -1241,68 +1287,64 @@ static int ecp_precompute_comb( const mbedtls_ecp_group *grp,
      * Set T[0] = P and
      * T[2^{l-1}] = 2^{dl} P for l = 1 .. w-1 (this is not the final value)
      */
-    MBEDTLS_MPI_CHK( mbedtls_ecp_copy( &T[0], P ) );
+    MBEDTLS_MPI_CHK(mbedtls_ecp_copy(&T[0], P));
 
     k = 0;
-    for( i = 1; i < ( 1U << ( w - 1 ) ); i <<= 1 )
-    {
+    for (i = 1; i < (1U << (w - 1)); i <<= 1) {
         cur = T + i;
-        MBEDTLS_MPI_CHK( mbedtls_ecp_copy( cur, T + ( i >> 1 ) ) );
-        for( j = 0; j < d; j++ )
-            MBEDTLS_MPI_CHK( ecp_double_jac( grp, cur, cur ) );
+        MBEDTLS_MPI_CHK(mbedtls_ecp_copy(cur, T + (i >> 1)));
+        for (j = 0; j < d; j++)
+            MBEDTLS_MPI_CHK(ecp_double_jac(grp, cur, cur));
 
         TT[k++] = cur;
     }
 
-    MBEDTLS_MPI_CHK( ecp_normalize_jac_many( grp, TT, k ) );
+    MBEDTLS_MPI_CHK(ecp_normalize_jac_many(grp, TT, k));
 
     /*
      * Compute the remaining ones using the minimal number of additions
      * Be careful to update T[2^l] only after using it!
      */
     k = 0;
-    for( i = 1; i < ( 1U << ( w - 1 ) ); i <<= 1 )
-    {
+    for (i = 1; i < (1U << (w - 1)); i <<= 1) {
         j = i;
-        while( j-- )
-        {
-            MBEDTLS_MPI_CHK( ecp_add_mixed( grp, &T[i + j], &T[j], &T[i] ) );
+        while (j--) {
+            MBEDTLS_MPI_CHK(ecp_add_mixed(grp, &T[i + j], &T[j], &T[i]));
             TT[k++] = &T[i + j];
         }
     }
 
-    MBEDTLS_MPI_CHK( ecp_normalize_jac_many( grp, TT, k ) );
+    MBEDTLS_MPI_CHK(ecp_normalize_jac_many(grp, TT, k));
 
 cleanup:
 
-    return( ret );
+    return (ret);
 }
 
 /*
  * Select precomputed point: R = sign(i) * T[ abs(i) / 2 ]
  */
-static int ecp_select_comb( const mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
-                            const mbedtls_ecp_point T[], unsigned char t_len,
-                            unsigned char i )
+static int ecp_select_comb(const mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
+                           const mbedtls_ecp_point T[], unsigned char t_len,
+                           unsigned char i)
 {
     int ret;
     unsigned char ii, j;
 
     /* Ignore the "sign" bit and scale down */
-    ii =  ( i & 0x7Fu ) >> 1;
+    ii = (i & 0x7Fu) >> 1;
 
     /* Read the whole table to thwart cache-based timing attacks */
-    for( j = 0; j < t_len; j++ )
-    {
-        MBEDTLS_MPI_CHK( mbedtls_mpi_safe_cond_assign( &R->X, &T[j].X, j == ii ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_safe_cond_assign( &R->Y, &T[j].Y, j == ii ) );
+    for (j = 0; j < t_len; j++) {
+        MBEDTLS_MPI_CHK(mbedtls_mpi_safe_cond_assign(&R->X, &T[j].X, j == ii));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_safe_cond_assign(&R->Y, &T[j].Y, j == ii));
     }
 
     /* Safely invert result if i is "negative" */
-    MBEDTLS_MPI_CHK( ecp_safe_invert_jac( grp, R, i >> 7 ) );
+    MBEDTLS_MPI_CHK(ecp_safe_invert_jac(grp, R, i >> 7));
 
 cleanup:
-    return( ret );
+    return (ret);
 }
 
 /*
@@ -1311,47 +1353,46 @@ cleanup:
  *
  * Cost: d A + d D + 1 R
  */
-static int ecp_mul_comb_core( const mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
-                              const mbedtls_ecp_point T[], unsigned char t_len,
-                              const unsigned char x[], size_t d,
-                              int (*f_rng)(void *, unsigned char *, size_t),
-                              void *p_rng )
+static int ecp_mul_comb_core(const mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
+                             const mbedtls_ecp_point T[], unsigned char t_len,
+                             const unsigned char x[], size_t d,
+                             int (*f_rng)(void *, unsigned char *, size_t),
+                             void *p_rng)
 {
     int ret;
     mbedtls_ecp_point Txi;
     size_t i;
 
-    mbedtls_ecp_point_init( &Txi );
+    mbedtls_ecp_point_init(&Txi);
 
     /* Start with a non-zero point and randomize its coordinates */
     i = d;
-    MBEDTLS_MPI_CHK( ecp_select_comb( grp, R, T, t_len, x[i] ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &R->Z, 1 ) );
-    if( f_rng != 0 )
-        MBEDTLS_MPI_CHK( ecp_randomize_jac( grp, R, f_rng, p_rng ) );
+    MBEDTLS_MPI_CHK(ecp_select_comb(grp, R, T, t_len, x[i]));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_lset(&R->Z, 1));
+    if (f_rng != 0)
+        MBEDTLS_MPI_CHK(ecp_randomize_jac(grp, R, f_rng, p_rng));
 
-    while( i-- != 0 )
-    {
-        MBEDTLS_MPI_CHK( ecp_double_jac( grp, R, R ) );
-        MBEDTLS_MPI_CHK( ecp_select_comb( grp, &Txi, T, t_len, x[i] ) );
-        MBEDTLS_MPI_CHK( ecp_add_mixed( grp, R, R, &Txi ) );
+    while (i-- != 0) {
+        MBEDTLS_MPI_CHK(ecp_double_jac(grp, R, R));
+        MBEDTLS_MPI_CHK(ecp_select_comb(grp, &Txi, T, t_len, x[i]));
+        MBEDTLS_MPI_CHK(ecp_add_mixed(grp, R, R, &Txi));
     }
 
 cleanup:
 
-    mbedtls_ecp_point_free( &Txi );
+    mbedtls_ecp_point_free(&Txi);
 
-    return( ret );
+    return (ret);
 }
 
 /*
  * Multiplication using the comb method,
  * for curves in short Weierstrass form
  */
-static int ecp_mul_comb( mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
-                         const mbedtls_mpi *m, const mbedtls_ecp_point *P,
-                         int (*f_rng)(void *, unsigned char *, size_t),
-                         void *p_rng )
+static int ecp_mul_comb(mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
+                        const mbedtls_mpi *m, const mbedtls_ecp_point *P,
+                        int (*f_rng)(void *, unsigned char *, size_t),
+                        void *p_rng)
 {
     int ret;
     unsigned char w, m_is_odd, p_eq_g, pre_len, i;
@@ -1360,12 +1401,12 @@ static int ecp_mul_comb( mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
     mbedtls_ecp_point *T;
     mbedtls_mpi M, mm;
 
-    mbedtls_mpi_init( &M );
-    mbedtls_mpi_init( &mm );
+    mbedtls_mpi_init(&M);
+    mbedtls_mpi_init(&mm);
 
     /* we need N to be odd to trnaform m in an odd number, check now */
-    if( mbedtls_mpi_get_bit( &grp->N, 0 ) != 1 )
-        return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
+    if (mbedtls_mpi_get_bit(&grp->N, 0) != 1)
+        return (MBEDTLS_ERR_ECP_BAD_INPUT_DATA);
 
     /*
      * Minimize the number of multiplications, that is minimize
@@ -1380,9 +1421,9 @@ static int ecp_mul_comb( mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
      * and the memory cost too.
      */
 #if MBEDTLS_ECP_FIXED_POINT_OPTIM == 1
-    p_eq_g = ( mbedtls_mpi_cmp_mpi( &P->Y, &grp->G.Y ) == 0 &&
-               mbedtls_mpi_cmp_mpi( &P->X, &grp->G.X ) == 0 );
-    if( p_eq_g )
+    p_eq_g = (mbedtls_mpi_cmp_mpi(&P->Y, &grp->G.Y) == 0 &&
+              mbedtls_mpi_cmp_mpi(&P->X, &grp->G.X) == 0);
+    if (p_eq_g)
         w++;
 #else
     p_eq_g = 0;
@@ -1392,14 +1433,14 @@ static int ecp_mul_comb( mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
      * Make sure w is within bounds.
      * (The last test is useful only for very small curves in the test suite.)
      */
-    if( w > MBEDTLS_ECP_WINDOW_SIZE )
+    if (w > MBEDTLS_ECP_WINDOW_SIZE)
         w = MBEDTLS_ECP_WINDOW_SIZE;
-    if( w >= grp->nbits )
+    if (w >= grp->nbits)
         w = 2;
 
     /* Other sizes that depend on w */
-    pre_len = 1U << ( w - 1 );
-    d = ( grp->nbits + w - 1 ) / w;
+    pre_len = 1U << (w - 1);
+    d = (grp->nbits + w - 1) / w;
 
     /*
      * Prepare precomputed points: if P == G we want to
@@ -1407,19 +1448,16 @@ static int ecp_mul_comb( mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
      */
     T = p_eq_g ? grp->T : NULL;
 
-    if( T == NULL )
-    {
-        T = mbedtls_calloc( pre_len, sizeof( mbedtls_ecp_point ) );
-        if( T == NULL )
-        {
+    if (T == NULL) {
+        T = mbedtls_calloc(pre_len, sizeof(mbedtls_ecp_point));
+        if (T == NULL) {
             ret = MBEDTLS_ERR_ECP_ALLOC_FAILED;
             goto cleanup;
         }
 
-        MBEDTLS_MPI_CHK( ecp_precompute_comb( grp, T, P, w, d ) );
+        MBEDTLS_MPI_CHK(ecp_precompute_comb(grp, T, P, w, d));
 
-        if( p_eq_g )
-        {
+        if (p_eq_g) {
             grp->T = T;
             grp->T_size = pre_len;
         }
@@ -1429,22 +1467,22 @@ static int ecp_mul_comb( mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
      * Make sure M is odd (M = m or M = N - m, since N is odd)
      * using the fact that m * P = - (N - m) * P
      */
-    m_is_odd = ( mbedtls_mpi_get_bit( m, 0 ) == 1 );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &M, m ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &mm, &grp->N, m ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_safe_cond_assign( &M, &mm, ! m_is_odd ) );
+    m_is_odd = (mbedtls_mpi_get_bit(m, 0) == 1);
+    MBEDTLS_MPI_CHK(mbedtls_mpi_copy(&M, m));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_sub_mpi(&mm, &grp->N, m));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_safe_cond_assign(&M, &mm, ! m_is_odd));
 
     /*
      * Go for comb multiplication, R = M * P
      */
-    ecp_comb_fixed( k, d, w, &M );
-    MBEDTLS_MPI_CHK( ecp_mul_comb_core( grp, R, T, pre_len, k, d, f_rng, p_rng ) );
+    ecp_comb_fixed(k, d, w, &M);
+    MBEDTLS_MPI_CHK(ecp_mul_comb_core(grp, R, T, pre_len, k, d, f_rng, p_rng));
 
     /*
      * Now get m * P from M * P and normalize it
      */
-    MBEDTLS_MPI_CHK( ecp_safe_invert_jac( grp, R, ! m_is_odd ) );
-    MBEDTLS_MPI_CHK( ecp_normalize_jac( grp, R ) );
+    MBEDTLS_MPI_CHK(ecp_safe_invert_jac(grp, R, ! m_is_odd));
+    MBEDTLS_MPI_CHK(ecp_normalize_jac(grp, R));
 
 cleanup:
 
@@ -1453,20 +1491,19 @@ cleanup:
      * - An intermediate operation failed before setting grp->T
      * In either case, T must be freed.
      */
-    if( T != NULL && T != grp->T )
-    {
-        for( i = 0; i < pre_len; i++ )
-            mbedtls_ecp_point_free( &T[i] );
-        mbedtls_free( T );
+    if (T != NULL && T != grp->T) {
+        for (i = 0; i < pre_len; i++)
+            mbedtls_ecp_point_free(&T[i]);
+        mbedtls_free(T);
     }
 
-    mbedtls_mpi_free( &M );
-    mbedtls_mpi_free( &mm );
+    mbedtls_mpi_free(&M);
+    mbedtls_mpi_free(&mm);
 
-    if( ret != 0 )
-        mbedtls_ecp_point_free( R );
+    if (ret != 0)
+        mbedtls_ecp_point_free(R);
 
-    return( ret );
+    return (ret);
 }
 
 #endif /* ECP_SHORTWEIERSTRASS */
@@ -1484,23 +1521,23 @@ cleanup:
  * Normalize Montgomery x/z coordinates: X = X/Z, Z = 1
  * Cost: 1M + 1I
  */
-static int ecp_normalize_mxz( const mbedtls_ecp_group *grp, mbedtls_ecp_point *P )
+static int ecp_normalize_mxz(const mbedtls_ecp_group *grp, mbedtls_ecp_point *P)
 {
     int ret;
 
 #if defined(MBEDTLS_ECP_NORMALIZE_MXZ_ALT)
-    if ( mbedtls_internal_ecp_grp_capable( grp ) )
-    {
-        return mbedtls_internal_ecp_normalize_mxz( grp, P );
+    if (mbedtls_internal_ecp_grp_capable(grp)) {
+        return mbedtls_internal_ecp_normalize_mxz(grp, P);
     }
 #endif /* MBEDTLS_ECP_NORMALIZE_MXZ_ALT */
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_inv_mod( &P->Z, &P->Z, &grp->P ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &P->X, &P->X, &P->Z ) ); MOD_MUL( P->X );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &P->Z, 1 ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_inv_mod(&P->Z, &P->Z, &grp->P));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&P->X, &P->X, &P->Z));
+    MOD_MUL(P->X);
+    MBEDTLS_MPI_CHK(mbedtls_mpi_lset(&P->Z, 1));
 
 cleanup:
-    return( ret );
+    return (ret);
 }
 
 /*
@@ -1511,8 +1548,8 @@ cleanup:
  * This countermeasure was first suggested in [2].
  * Cost: 2M
  */
-static int ecp_randomize_mxz( const mbedtls_ecp_group *grp, mbedtls_ecp_point *P,
-                int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
+static int ecp_randomize_mxz(const mbedtls_ecp_group *grp, mbedtls_ecp_point *P,
+                             int (*f_rng)(void *, unsigned char *, size_t), void *p_rng)
 {
     int ret;
     mbedtls_mpi l;
@@ -1520,35 +1557,34 @@ static int ecp_randomize_mxz( const mbedtls_ecp_group *grp, mbedtls_ecp_point *P
     int count = 0;
 
 #if defined(MBEDTLS_ECP_RANDOMIZE_MXZ_ALT)
-    if ( mbedtls_internal_ecp_grp_capable( grp ) )
-    {
-        return mbedtls_internal_ecp_randomize_mxz( grp, P, f_rng, p_rng );
+    if (mbedtls_internal_ecp_grp_capable(grp)) {
+        return mbedtls_internal_ecp_randomize_mxz(grp, P, f_rng, p_rng);
     }
 #endif /* MBEDTLS_ECP_RANDOMIZE_MXZ_ALT */
 
-    p_size = ( grp->pbits + 7 ) / 8;
-    mbedtls_mpi_init( &l );
+    p_size = (grp->pbits + 7) / 8;
+    mbedtls_mpi_init(&l);
 
     /* Generate l such that 1 < l < p */
-    do
-    {
-        MBEDTLS_MPI_CHK( mbedtls_mpi_fill_random( &l, p_size, f_rng, p_rng ) );
+    do {
+        MBEDTLS_MPI_CHK(mbedtls_mpi_fill_random(&l, p_size, f_rng, p_rng));
 
-        while( mbedtls_mpi_cmp_mpi( &l, &grp->P ) >= 0 )
-            MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &l, 1 ) );
+        while (mbedtls_mpi_cmp_mpi(&l, &grp->P) >= 0)
+            MBEDTLS_MPI_CHK(mbedtls_mpi_shift_r(&l, 1));
 
-        if( count++ > 10 )
-            return( MBEDTLS_ERR_ECP_RANDOM_FAILED );
-    }
-    while( mbedtls_mpi_cmp_int( &l, 1 ) <= 0 );
+        if (count++ > 10)
+            return (MBEDTLS_ERR_ECP_RANDOM_FAILED);
+    } while (mbedtls_mpi_cmp_int(&l, 1) <= 0);
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &P->X, &P->X, &l ) ); MOD_MUL( P->X );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &P->Z, &P->Z, &l ) ); MOD_MUL( P->Z );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&P->X, &P->X, &l));
+    MOD_MUL(P->X);
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&P->Z, &P->Z, &l));
+    MOD_MUL(P->Z);
 
 cleanup:
-    mbedtls_mpi_free( &l );
+    mbedtls_mpi_free(&l);
 
-    return( ret );
+    return (ret);
 }
 
 /*
@@ -1566,60 +1602,89 @@ cleanup:
  *
  * Cost: 5M + 4S
  */
-static int ecp_double_add_mxz( const mbedtls_ecp_group *grp,
-                               mbedtls_ecp_point *R, mbedtls_ecp_point *S,
-                               const mbedtls_ecp_point *P, const mbedtls_ecp_point *Q,
-                               const mbedtls_mpi *d )
+static int ecp_double_add_mxz(const mbedtls_ecp_group *grp,
+                              mbedtls_ecp_point *R, mbedtls_ecp_point *S,
+                              const mbedtls_ecp_point *P, const mbedtls_ecp_point *Q,
+                              const mbedtls_mpi *d)
 {
     int ret;
     mbedtls_mpi A, AA, B, BB, E, C, D, DA, CB;
 
 #if defined(MBEDTLS_ECP_DOUBLE_ADD_MXZ_ALT)
-    if ( mbedtls_internal_ecp_grp_capable( grp ) )
-    {
-        return mbedtls_internal_ecp_double_add_mxz( grp, R, S, P, Q, d );
+    if (mbedtls_internal_ecp_grp_capable(grp)) {
+        return mbedtls_internal_ecp_double_add_mxz(grp, R, S, P, Q, d);
     }
 #endif /* MBEDTLS_ECP_DOUBLE_ADD_MXZ_ALT */
 
-    mbedtls_mpi_init( &A ); mbedtls_mpi_init( &AA ); mbedtls_mpi_init( &B );
-    mbedtls_mpi_init( &BB ); mbedtls_mpi_init( &E ); mbedtls_mpi_init( &C );
-    mbedtls_mpi_init( &D ); mbedtls_mpi_init( &DA ); mbedtls_mpi_init( &CB );
+    mbedtls_mpi_init(&A);
+    mbedtls_mpi_init(&AA);
+    mbedtls_mpi_init(&B);
+    mbedtls_mpi_init(&BB);
+    mbedtls_mpi_init(&E);
+    mbedtls_mpi_init(&C);
+    mbedtls_mpi_init(&D);
+    mbedtls_mpi_init(&DA);
+    mbedtls_mpi_init(&CB);
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_add_mpi( &A,    &P->X,   &P->Z ) ); MOD_ADD( A    );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &AA,   &A,      &A    ) ); MOD_MUL( AA   );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &B,    &P->X,   &P->Z ) ); MOD_SUB( B    );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &BB,   &B,      &B    ) ); MOD_MUL( BB   );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &E,    &AA,     &BB   ) ); MOD_SUB( E    );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_add_mpi( &C,    &Q->X,   &Q->Z ) ); MOD_ADD( C    );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &D,    &Q->X,   &Q->Z ) ); MOD_SUB( D    );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &DA,   &D,      &A    ) ); MOD_MUL( DA   );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &CB,   &C,      &B    ) ); MOD_MUL( CB   );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_add_mpi( &S->X, &DA,     &CB   ) ); MOD_MUL( S->X );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &S->X, &S->X,   &S->X ) ); MOD_MUL( S->X );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &S->Z, &DA,     &CB   ) ); MOD_SUB( S->Z );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &S->Z, &S->Z,   &S->Z ) ); MOD_MUL( S->Z );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &S->Z, d,       &S->Z ) ); MOD_MUL( S->Z );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &R->X, &AA,     &BB   ) ); MOD_MUL( R->X );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &R->Z, &grp->A, &E    ) ); MOD_MUL( R->Z );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_add_mpi( &R->Z, &BB,     &R->Z ) ); MOD_ADD( R->Z );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &R->Z, &E,      &R->Z ) ); MOD_MUL( R->Z );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_add_mpi(&A,    &P->X,   &P->Z));
+    MOD_ADD(A);
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&AA,   &A,      &A));
+    MOD_MUL(AA);
+    MBEDTLS_MPI_CHK(mbedtls_mpi_sub_mpi(&B,    &P->X,   &P->Z));
+    MOD_SUB(B);
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&BB,   &B,      &B));
+    MOD_MUL(BB);
+    MBEDTLS_MPI_CHK(mbedtls_mpi_sub_mpi(&E,    &AA,     &BB));
+    MOD_SUB(E);
+    MBEDTLS_MPI_CHK(mbedtls_mpi_add_mpi(&C,    &Q->X,   &Q->Z));
+    MOD_ADD(C);
+    MBEDTLS_MPI_CHK(mbedtls_mpi_sub_mpi(&D,    &Q->X,   &Q->Z));
+    MOD_SUB(D);
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&DA,   &D,      &A));
+    MOD_MUL(DA);
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&CB,   &C,      &B));
+    MOD_MUL(CB);
+    MBEDTLS_MPI_CHK(mbedtls_mpi_add_mpi(&S->X, &DA,     &CB));
+    MOD_MUL(S->X);
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&S->X, &S->X,   &S->X));
+    MOD_MUL(S->X);
+    MBEDTLS_MPI_CHK(mbedtls_mpi_sub_mpi(&S->Z, &DA,     &CB));
+    MOD_SUB(S->Z);
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&S->Z, &S->Z,   &S->Z));
+    MOD_MUL(S->Z);
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&S->Z, d,       &S->Z));
+    MOD_MUL(S->Z);
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&R->X, &AA,     &BB));
+    MOD_MUL(R->X);
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&R->Z, &grp->A, &E));
+    MOD_MUL(R->Z);
+    MBEDTLS_MPI_CHK(mbedtls_mpi_add_mpi(&R->Z, &BB,     &R->Z));
+    MOD_ADD(R->Z);
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&R->Z, &E,      &R->Z));
+    MOD_MUL(R->Z);
 
 cleanup:
-    mbedtls_mpi_free( &A ); mbedtls_mpi_free( &AA ); mbedtls_mpi_free( &B );
-    mbedtls_mpi_free( &BB ); mbedtls_mpi_free( &E ); mbedtls_mpi_free( &C );
-    mbedtls_mpi_free( &D ); mbedtls_mpi_free( &DA ); mbedtls_mpi_free( &CB );
+    mbedtls_mpi_free(&A);
+    mbedtls_mpi_free(&AA);
+    mbedtls_mpi_free(&B);
+    mbedtls_mpi_free(&BB);
+    mbedtls_mpi_free(&E);
+    mbedtls_mpi_free(&C);
+    mbedtls_mpi_free(&D);
+    mbedtls_mpi_free(&DA);
+    mbedtls_mpi_free(&CB);
 
-    return( ret );
+    return (ret);
 }
 
 /*
  * Multiplication with Montgomery ladder in x/z coordinates,
  * for curves in Montgomery form
  */
-static int ecp_mul_mxz( mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
-                        const mbedtls_mpi *m, const mbedtls_ecp_point *P,
-                        int (*f_rng)(void *, unsigned char *, size_t),
-                        void *p_rng )
+static int ecp_mul_mxz(mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
+                       const mbedtls_mpi *m, const mbedtls_ecp_point *P,
+                       int (*f_rng)(void *, unsigned char *, size_t),
+                       void *p_rng)
 {
     int ret;
     size_t i;
@@ -1627,29 +1692,29 @@ static int ecp_mul_mxz( mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
     mbedtls_ecp_point RP;
     mbedtls_mpi PX;
 
-    mbedtls_ecp_point_init( &RP ); mbedtls_mpi_init( &PX );
+    mbedtls_ecp_point_init(&RP);
+    mbedtls_mpi_init(&PX);
 
     /* Save PX and read from P before writing to R, in case P == R */
-    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &PX, &P->X ) );
-    MBEDTLS_MPI_CHK( mbedtls_ecp_copy( &RP, P ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_copy(&PX, &P->X));
+    MBEDTLS_MPI_CHK(mbedtls_ecp_copy(&RP, P));
 
     /* Set R to zero in modified x/z coordinates */
-    MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &R->X, 1 ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &R->Z, 0 ) );
-    mbedtls_mpi_free( &R->Y );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_lset(&R->X, 1));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_lset(&R->Z, 0));
+    mbedtls_mpi_free(&R->Y);
 
     /* RP.X might be sligtly larger than P, so reduce it */
-    MOD_ADD( RP.X );
+    MOD_ADD(RP.X);
 
     /* Randomize coordinates of the starting point */
-    if( f_rng != NULL )
-        MBEDTLS_MPI_CHK( ecp_randomize_mxz( grp, &RP, f_rng, p_rng ) );
+    if (f_rng != NULL)
+        MBEDTLS_MPI_CHK(ecp_randomize_mxz(grp, &RP, f_rng, p_rng));
 
     /* Loop invariant: R = result so far, RP = R + P */
-    i = mbedtls_mpi_bitlen( m ); /* one past the (zero-based) most significant bit */
-    while( i-- > 0 )
-    {
-        b = mbedtls_mpi_get_bit( m, i );
+    i = mbedtls_mpi_bitlen(m);   /* one past the (zero-based) most significant bit */
+    while (i-- > 0) {
+        b = mbedtls_mpi_get_bit(m, i);
         /*
          *  if (b) R = 2R + P else R = 2R,
          * which is:
@@ -1657,19 +1722,20 @@ static int ecp_mul_mxz( mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
          *  else   double_add( R, RP, R, RP )
          * but using safe conditional swaps to avoid leaks
          */
-        MBEDTLS_MPI_CHK( mbedtls_mpi_safe_cond_swap( &R->X, &RP.X, b ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_safe_cond_swap( &R->Z, &RP.Z, b ) );
-        MBEDTLS_MPI_CHK( ecp_double_add_mxz( grp, R, &RP, R, &RP, &PX ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_safe_cond_swap( &R->X, &RP.X, b ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_safe_cond_swap( &R->Z, &RP.Z, b ) );
+        MBEDTLS_MPI_CHK(mbedtls_mpi_safe_cond_swap(&R->X, &RP.X, b));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_safe_cond_swap(&R->Z, &RP.Z, b));
+        MBEDTLS_MPI_CHK(ecp_double_add_mxz(grp, R, &RP, R, &RP, &PX));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_safe_cond_swap(&R->X, &RP.X, b));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_safe_cond_swap(&R->Z, &RP.Z, b));
     }
 
-    MBEDTLS_MPI_CHK( ecp_normalize_mxz( grp, R ) );
+    MBEDTLS_MPI_CHK(ecp_normalize_mxz(grp, R));
 
 cleanup:
-    mbedtls_ecp_point_free( &RP ); mbedtls_mpi_free( &PX );
+    mbedtls_ecp_point_free(&RP);
+    mbedtls_mpi_free(&PX);
 
-    return( ret );
+    return (ret);
 }
 
 #endif /* ECP_MONTGOMERY */
@@ -1677,9 +1743,9 @@ cleanup:
 /*
  * Multiplication R = m * P
  */
-int mbedtls_ecp_mul( mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
-             const mbedtls_mpi *m, const mbedtls_ecp_point *P,
-             int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
+int mbedtls_ecp_mul(mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
+                    const mbedtls_mpi *m, const mbedtls_ecp_point *P,
+                    int (*f_rng)(void *, unsigned char *, size_t), void *p_rng)
 {
     int ret = MBEDTLS_ERR_ECP_BAD_INPUT_DATA;
 #if defined(MBEDTLS_ECP_INTERNAL_ALT)
@@ -1687,40 +1753,38 @@ int mbedtls_ecp_mul( mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
 #endif
 
     /* Common sanity checks */
-    if( mbedtls_mpi_cmp_int( &P->Z, 1 ) != 0 )
-        return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
+    if (mbedtls_mpi_cmp_int(&P->Z, 1) != 0)
+        return (MBEDTLS_ERR_ECP_BAD_INPUT_DATA);
 
-    if( ( ret = mbedtls_ecp_check_privkey( grp, m ) ) != 0 ||
-        ( ret = mbedtls_ecp_check_pubkey( grp, P ) ) != 0 )
-        return( ret );
+    if ((ret = mbedtls_ecp_check_privkey(grp, m)) != 0 ||
+        (ret = mbedtls_ecp_check_pubkey(grp, P)) != 0)
+        return (ret);
 
 #if defined(MBEDTLS_ECP_INTERNAL_ALT)
-    if ( is_grp_capable = mbedtls_internal_ecp_grp_capable( grp )  )
-    {
-        MBEDTLS_MPI_CHK( mbedtls_internal_ecp_init( grp ) );
+    if (is_grp_capable = mbedtls_internal_ecp_grp_capable(grp)) {
+        MBEDTLS_MPI_CHK(mbedtls_internal_ecp_init(grp));
     }
 
 #endif /* MBEDTLS_ECP_INTERNAL_ALT */
 #if defined(ECP_MONTGOMERY)
-    if( ecp_get_type( grp ) == ECP_TYPE_MONTGOMERY )
-        ret = ecp_mul_mxz( grp, R, m, P, f_rng, p_rng );
+    if (ecp_get_type(grp) == ECP_TYPE_MONTGOMERY)
+        ret = ecp_mul_mxz(grp, R, m, P, f_rng, p_rng);
 
 #endif
 #if defined(ECP_SHORTWEIERSTRASS)
-    if( ecp_get_type( grp ) == ECP_TYPE_SHORT_WEIERSTRASS )
-        ret = ecp_mul_comb( grp, R, m, P, f_rng, p_rng );
+    if (ecp_get_type(grp) == ECP_TYPE_SHORT_WEIERSTRASS)
+        ret = ecp_mul_comb(grp, R, m, P, f_rng, p_rng);
 
 #endif
 #if defined(MBEDTLS_ECP_INTERNAL_ALT)
 cleanup:
 
-    if ( is_grp_capable )
-    {
-        mbedtls_internal_ecp_free( grp );
+    if (is_grp_capable) {
+        mbedtls_internal_ecp_free(grp);
     }
 
 #endif /* MBEDTLS_ECP_INTERNAL_ALT */
-    return( ret );
+    return (ret);
 }
 
 #if defined(ECP_SHORTWEIERSTRASS)
@@ -1728,48 +1792,53 @@ cleanup:
  * Check that an affine point is valid as a public key,
  * short weierstrass curves (SEC1 3.2.3.1)
  */
-static int ecp_check_pubkey_sw( const mbedtls_ecp_group *grp, const mbedtls_ecp_point *pt )
+static int ecp_check_pubkey_sw(const mbedtls_ecp_group *grp, const mbedtls_ecp_point *pt)
 {
     int ret;
     mbedtls_mpi YY, RHS;
 
     /* pt coordinates must be normalized for our checks */
-    if( mbedtls_mpi_cmp_int( &pt->X, 0 ) < 0 ||
-        mbedtls_mpi_cmp_int( &pt->Y, 0 ) < 0 ||
-        mbedtls_mpi_cmp_mpi( &pt->X, &grp->P ) >= 0 ||
-        mbedtls_mpi_cmp_mpi( &pt->Y, &grp->P ) >= 0 )
-        return( MBEDTLS_ERR_ECP_INVALID_KEY );
+    if (mbedtls_mpi_cmp_int(&pt->X, 0) < 0 ||
+        mbedtls_mpi_cmp_int(&pt->Y, 0) < 0 ||
+        mbedtls_mpi_cmp_mpi(&pt->X, &grp->P) >= 0 ||
+        mbedtls_mpi_cmp_mpi(&pt->Y, &grp->P) >= 0)
+        return (MBEDTLS_ERR_ECP_INVALID_KEY);
 
-    mbedtls_mpi_init( &YY ); mbedtls_mpi_init( &RHS );
+    mbedtls_mpi_init(&YY);
+    mbedtls_mpi_init(&RHS);
 
     /*
      * YY = Y^2
      * RHS = X (X^2 + A) + B = X^3 + A X + B
      */
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &YY,  &pt->Y,   &pt->Y  ) );  MOD_MUL( YY  );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &RHS, &pt->X,   &pt->X  ) );  MOD_MUL( RHS );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&YY,  &pt->Y,   &pt->Y));
+    MOD_MUL(YY);
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&RHS, &pt->X,   &pt->X));
+    MOD_MUL(RHS);
 
     /* Special case for A = -3 */
-    if( grp->A.p == NULL )
-    {
-        MBEDTLS_MPI_CHK( mbedtls_mpi_sub_int( &RHS, &RHS, 3       ) );  MOD_SUB( RHS );
-    }
-    else
-    {
-        MBEDTLS_MPI_CHK( mbedtls_mpi_add_mpi( &RHS, &RHS, &grp->A ) );  MOD_ADD( RHS );
+    if (grp->A.p == NULL) {
+        MBEDTLS_MPI_CHK(mbedtls_mpi_sub_int(&RHS, &RHS, 3));
+        MOD_SUB(RHS);
+    } else {
+        MBEDTLS_MPI_CHK(mbedtls_mpi_add_mpi(&RHS, &RHS, &grp->A));
+        MOD_ADD(RHS);
     }
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &RHS, &RHS,     &pt->X  ) );  MOD_MUL( RHS );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_add_mpi( &RHS, &RHS,     &grp->B ) );  MOD_ADD( RHS );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&RHS, &RHS,     &pt->X));
+    MOD_MUL(RHS);
+    MBEDTLS_MPI_CHK(mbedtls_mpi_add_mpi(&RHS, &RHS,     &grp->B));
+    MOD_ADD(RHS);
 
-    if( mbedtls_mpi_cmp_mpi( &YY, &RHS ) != 0 )
+    if (mbedtls_mpi_cmp_mpi(&YY, &RHS) != 0)
         ret = MBEDTLS_ERR_ECP_INVALID_KEY;
 
 cleanup:
 
-    mbedtls_mpi_free( &YY ); mbedtls_mpi_free( &RHS );
+    mbedtls_mpi_free(&YY);
+    mbedtls_mpi_free(&RHS);
 
-    return( ret );
+    return (ret);
 }
 #endif /* ECP_SHORTWEIERSTRASS */
 
@@ -1777,39 +1846,34 @@ cleanup:
  * R = m * P with shortcuts for m == 1 and m == -1
  * NOT constant-time - ONLY for short Weierstrass!
  */
-static int mbedtls_ecp_mul_shortcuts( mbedtls_ecp_group *grp,
-                                      mbedtls_ecp_point *R,
-                                      const mbedtls_mpi *m,
-                                      const mbedtls_ecp_point *P )
+static int mbedtls_ecp_mul_shortcuts(mbedtls_ecp_group *grp,
+                                     mbedtls_ecp_point *R,
+                                     const mbedtls_mpi *m,
+                                     const mbedtls_ecp_point *P)
 {
     int ret;
 
-    if( mbedtls_mpi_cmp_int( m, 1 ) == 0 )
-    {
-        MBEDTLS_MPI_CHK( mbedtls_ecp_copy( R, P ) );
-    }
-    else if( mbedtls_mpi_cmp_int( m, -1 ) == 0 )
-    {
-        MBEDTLS_MPI_CHK( mbedtls_ecp_copy( R, P ) );
-        if( mbedtls_mpi_cmp_int( &R->Y, 0 ) != 0 )
-            MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &R->Y, &grp->P, &R->Y ) );
-    }
-    else
-    {
-        MBEDTLS_MPI_CHK( mbedtls_ecp_mul( grp, R, m, P, NULL, NULL ) );
+    if (mbedtls_mpi_cmp_int(m, 1) == 0) {
+        MBEDTLS_MPI_CHK(mbedtls_ecp_copy(R, P));
+    } else if (mbedtls_mpi_cmp_int(m, -1) == 0) {
+        MBEDTLS_MPI_CHK(mbedtls_ecp_copy(R, P));
+        if (mbedtls_mpi_cmp_int(&R->Y, 0) != 0)
+            MBEDTLS_MPI_CHK(mbedtls_mpi_sub_mpi(&R->Y, &grp->P, &R->Y));
+    } else {
+        MBEDTLS_MPI_CHK(mbedtls_ecp_mul(grp, R, m, P, NULL, NULL));
     }
 
 cleanup:
-    return( ret );
+    return (ret);
 }
 
 /*
  * Linear combination
  * NOT constant-time
  */
-int mbedtls_ecp_muladd( mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
-             const mbedtls_mpi *m, const mbedtls_ecp_point *P,
-             const mbedtls_mpi *n, const mbedtls_ecp_point *Q )
+int mbedtls_ecp_muladd(mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
+                       const mbedtls_mpi *m, const mbedtls_ecp_point *P,
+                       const mbedtls_mpi *n, const mbedtls_ecp_point *Q)
 {
     int ret;
     mbedtls_ecp_point mP;
@@ -1817,36 +1881,34 @@ int mbedtls_ecp_muladd( mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
     char is_grp_capable = 0;
 #endif
 
-    if( ecp_get_type( grp ) != ECP_TYPE_SHORT_WEIERSTRASS )
-        return( MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE );
+    if (ecp_get_type(grp) != ECP_TYPE_SHORT_WEIERSTRASS)
+        return (MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE);
 
-    mbedtls_ecp_point_init( &mP );
+    mbedtls_ecp_point_init(&mP);
 
-    MBEDTLS_MPI_CHK( mbedtls_ecp_mul_shortcuts( grp, &mP, m, P ) );
-    MBEDTLS_MPI_CHK( mbedtls_ecp_mul_shortcuts( grp, R,   n, Q ) );
+    MBEDTLS_MPI_CHK(mbedtls_ecp_mul_shortcuts(grp, &mP, m, P));
+    MBEDTLS_MPI_CHK(mbedtls_ecp_mul_shortcuts(grp, R,   n, Q));
 
 #if defined(MBEDTLS_ECP_INTERNAL_ALT)
-    if (  is_grp_capable = mbedtls_internal_ecp_grp_capable( grp )  )
-    {
-        MBEDTLS_MPI_CHK( mbedtls_internal_ecp_init( grp ) );
+    if (is_grp_capable = mbedtls_internal_ecp_grp_capable(grp)) {
+        MBEDTLS_MPI_CHK(mbedtls_internal_ecp_init(grp));
     }
 
 #endif /* MBEDTLS_ECP_INTERNAL_ALT */
-    MBEDTLS_MPI_CHK( ecp_add_mixed( grp, R, &mP, R ) );
-    MBEDTLS_MPI_CHK( ecp_normalize_jac( grp, R ) );
+    MBEDTLS_MPI_CHK(ecp_add_mixed(grp, R, &mP, R));
+    MBEDTLS_MPI_CHK(ecp_normalize_jac(grp, R));
 
 cleanup:
 
 #if defined(MBEDTLS_ECP_INTERNAL_ALT)
-    if ( is_grp_capable )
-    {
-        mbedtls_internal_ecp_free( grp );
+    if (is_grp_capable) {
+        mbedtls_internal_ecp_free(grp);
     }
 
 #endif /* MBEDTLS_ECP_INTERNAL_ALT */
-    mbedtls_ecp_point_free( &mP );
+    mbedtls_ecp_point_free(&mP);
 
-    return( ret );
+    return (ret);
 }
 
 
@@ -1854,223 +1916,212 @@ cleanup:
 /*
  * Check validity of a public key for Montgomery curves with x-only schemes
  */
-static int ecp_check_pubkey_mx( const mbedtls_ecp_group *grp, const mbedtls_ecp_point *pt )
+static int ecp_check_pubkey_mx(const mbedtls_ecp_group *grp, const mbedtls_ecp_point *pt)
 {
     /* [Curve25519 p. 5] Just check X is the correct number of bytes */
     /* Allow any public value, if it's too big then we'll just reduce it mod p
      * (RFC 7748 sec. 5 para. 3). */
-    if( mbedtls_mpi_size( &pt->X ) > ( grp->nbits + 7 ) / 8 )
-        return( MBEDTLS_ERR_ECP_INVALID_KEY );
+    if (mbedtls_mpi_size(&pt->X) > (grp->nbits + 7) / 8)
+        return (MBEDTLS_ERR_ECP_INVALID_KEY);
 
-    return( 0 );
+    return (0);
 }
 #endif /* ECP_MONTGOMERY */
 
 /*
  * Check that a point is valid as a public key
  */
-int mbedtls_ecp_check_pubkey( const mbedtls_ecp_group *grp, const mbedtls_ecp_point *pt )
+int mbedtls_ecp_check_pubkey(const mbedtls_ecp_group *grp, const mbedtls_ecp_point *pt)
 {
     /* Must use affine coordinates */
-    if( mbedtls_mpi_cmp_int( &pt->Z, 1 ) != 0 )
-        return( MBEDTLS_ERR_ECP_INVALID_KEY );
+    if (mbedtls_mpi_cmp_int(&pt->Z, 1) != 0)
+        return (MBEDTLS_ERR_ECP_INVALID_KEY);
 
 #if defined(ECP_MONTGOMERY)
-    if( ecp_get_type( grp ) == ECP_TYPE_MONTGOMERY )
-        return( ecp_check_pubkey_mx( grp, pt ) );
+    if (ecp_get_type(grp) == ECP_TYPE_MONTGOMERY)
+        return (ecp_check_pubkey_mx(grp, pt));
 #endif
 #if defined(ECP_SHORTWEIERSTRASS)
-    if( ecp_get_type( grp ) == ECP_TYPE_SHORT_WEIERSTRASS )
-        return( ecp_check_pubkey_sw( grp, pt ) );
+    if (ecp_get_type(grp) == ECP_TYPE_SHORT_WEIERSTRASS)
+        return (ecp_check_pubkey_sw(grp, pt));
 #endif
-    return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
+    return (MBEDTLS_ERR_ECP_BAD_INPUT_DATA);
 }
 
 /*
  * Check that an mbedtls_mpi is valid as a private key
  */
-int mbedtls_ecp_check_privkey( const mbedtls_ecp_group *grp, const mbedtls_mpi *d )
+int mbedtls_ecp_check_privkey(const mbedtls_ecp_group *grp, const mbedtls_mpi *d)
 {
 #if defined(ECP_MONTGOMERY)
-    if( ecp_get_type( grp ) == ECP_TYPE_MONTGOMERY )
-    {
+    if (ecp_get_type(grp) == ECP_TYPE_MONTGOMERY) {
         /* see RFC 7748 sec. 5 para. 5 */
-        if( mbedtls_mpi_get_bit( d, 0 ) != 0 ||
-            mbedtls_mpi_get_bit( d, 1 ) != 0 ||
-            mbedtls_mpi_bitlen( d ) - 1 != grp->nbits ) /* mbedtls_mpi_bitlen is one-based! */
-            return( MBEDTLS_ERR_ECP_INVALID_KEY );
+        if (mbedtls_mpi_get_bit(d, 0) != 0 ||
+            mbedtls_mpi_get_bit(d, 1) != 0 ||
+            mbedtls_mpi_bitlen(d) - 1 != grp->nbits)    /* mbedtls_mpi_bitlen is one-based! */
+            return (MBEDTLS_ERR_ECP_INVALID_KEY);
 
         /* see [Curve25519] page 5 */
-        if( grp->nbits == 254 && mbedtls_mpi_get_bit( d, 2 ) != 0 )
-            return( MBEDTLS_ERR_ECP_INVALID_KEY );
+        if (grp->nbits == 254 && mbedtls_mpi_get_bit(d, 2) != 0)
+            return (MBEDTLS_ERR_ECP_INVALID_KEY);
 
-        return( 0 );
+        return (0);
     }
 #endif /* ECP_MONTGOMERY */
 #if defined(ECP_SHORTWEIERSTRASS)
-    if( ecp_get_type( grp ) == ECP_TYPE_SHORT_WEIERSTRASS )
-    {
+    if (ecp_get_type(grp) == ECP_TYPE_SHORT_WEIERSTRASS) {
         /* see SEC1 3.2 */
-        if( mbedtls_mpi_cmp_int( d, 1 ) < 0 ||
-            mbedtls_mpi_cmp_mpi( d, &grp->N ) >= 0 )
-            return( MBEDTLS_ERR_ECP_INVALID_KEY );
+        if (mbedtls_mpi_cmp_int(d, 1) < 0 ||
+            mbedtls_mpi_cmp_mpi(d, &grp->N) >= 0)
+            return (MBEDTLS_ERR_ECP_INVALID_KEY);
         else
-            return( 0 );
+            return (0);
     }
 #endif /* ECP_SHORTWEIERSTRASS */
 
-    return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
+    return (MBEDTLS_ERR_ECP_BAD_INPUT_DATA);
 }
 
 /*
  * Generate a keypair with configurable base point
  */
-int mbedtls_ecp_gen_keypair_base( mbedtls_ecp_group *grp,
-                     const mbedtls_ecp_point *G,
-                     mbedtls_mpi *d, mbedtls_ecp_point *Q,
-                     int (*f_rng)(void *, unsigned char *, size_t),
-                     void *p_rng )
+int mbedtls_ecp_gen_keypair_base(mbedtls_ecp_group *grp,
+                                 const mbedtls_ecp_point *G,
+                                 mbedtls_mpi *d, mbedtls_ecp_point *Q,
+                                 int (*f_rng)(void *, unsigned char *, size_t),
+                                 void *p_rng)
 {
     int ret;
-    size_t n_size = ( grp->nbits + 7 ) / 8;
+    size_t n_size = (grp->nbits + 7) / 8;
 
 #if defined(ECP_MONTGOMERY)
-    if( ecp_get_type( grp ) == ECP_TYPE_MONTGOMERY )
-    {
+    if (ecp_get_type(grp) == ECP_TYPE_MONTGOMERY) {
         /* [M225] page 5 */
         size_t b;
 
         do {
-            MBEDTLS_MPI_CHK( mbedtls_mpi_fill_random( d, n_size, f_rng, p_rng ) );
-        } while( mbedtls_mpi_bitlen( d ) == 0);
+            MBEDTLS_MPI_CHK(mbedtls_mpi_fill_random(d, n_size, f_rng, p_rng));
+        } while (mbedtls_mpi_bitlen(d) == 0);
 
         /* Make sure the most significant bit is nbits */
-        b = mbedtls_mpi_bitlen( d ) - 1; /* mbedtls_mpi_bitlen is one-based */
-        if( b > grp->nbits )
-            MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( d, b - grp->nbits ) );
+        b = mbedtls_mpi_bitlen(d) - 1;   /* mbedtls_mpi_bitlen is one-based */
+        if (b > grp->nbits)
+            MBEDTLS_MPI_CHK(mbedtls_mpi_shift_r(d, b - grp->nbits));
         else
-            MBEDTLS_MPI_CHK( mbedtls_mpi_set_bit( d, grp->nbits, 1 ) );
+            MBEDTLS_MPI_CHK(mbedtls_mpi_set_bit(d, grp->nbits, 1));
 
         /* Make sure the last two bits are unset for Curve448, three bits for
            Curve25519 */
-        MBEDTLS_MPI_CHK( mbedtls_mpi_set_bit( d, 0, 0 ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_set_bit( d, 1, 0 ) );
-        if( grp->nbits == 254 )
-        {
-            MBEDTLS_MPI_CHK( mbedtls_mpi_set_bit( d, 2, 0 ) );
+        MBEDTLS_MPI_CHK(mbedtls_mpi_set_bit(d, 0, 0));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_set_bit(d, 1, 0));
+        if (grp->nbits == 254) {
+            MBEDTLS_MPI_CHK(mbedtls_mpi_set_bit(d, 2, 0));
         }
-    }
-    else
+    } else
 #endif /* ECP_MONTGOMERY */
 #if defined(ECP_SHORTWEIERSTRASS)
-    if( ecp_get_type( grp ) == ECP_TYPE_SHORT_WEIERSTRASS )
-    {
-        /* SEC1 3.2.1: Generate d such that 1 <= n < N */
-        int count = 0;
-
-        /*
-         * Match the procedure given in RFC 6979 (deterministic ECDSA):
-         * - use the same byte ordering;
-         * - keep the leftmost nbits bits of the generated octet string;
-         * - try until result is in the desired range.
-         * This also avoids any biais, which is especially important for ECDSA.
-         */
-        do
-        {
-            MBEDTLS_MPI_CHK( mbedtls_mpi_fill_random( d, n_size, f_rng, p_rng ) );
-            MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( d, 8 * n_size - grp->nbits ) );
+        if (ecp_get_type(grp) == ECP_TYPE_SHORT_WEIERSTRASS) {
+            /* SEC1 3.2.1: Generate d such that 1 <= n < N */
+            int count = 0;
 
             /*
-             * Each try has at worst a probability 1/2 of failing (the msb has
-             * a probability 1/2 of being 0, and then the result will be < N),
-             * so after 30 tries failure probability is a most 2**(-30).
-             *
-             * For most curves, 1 try is enough with overwhelming probability,
-             * since N starts with a lot of 1s in binary, but some curves
-             * such as secp224k1 are actually very close to the worst case.
+             * Match the procedure given in RFC 6979 (deterministic ECDSA):
+             * - use the same byte ordering;
+             * - keep the leftmost nbits bits of the generated octet string;
+             * - try until result is in the desired range.
+             * This also avoids any biais, which is especially important for ECDSA.
              */
-            if( ++count > 30 )
-                return( MBEDTLS_ERR_ECP_RANDOM_FAILED );
-        }
-        while( mbedtls_mpi_cmp_int( d, 1 ) < 0 ||
-               mbedtls_mpi_cmp_mpi( d, &grp->N ) >= 0 );
-    }
-    else
+            do {
+                MBEDTLS_MPI_CHK(mbedtls_mpi_fill_random(d, n_size, f_rng, p_rng));
+                MBEDTLS_MPI_CHK(mbedtls_mpi_shift_r(d, 8 * n_size - grp->nbits));
+
+                /*
+                 * Each try has at worst a probability 1/2 of failing (the msb has
+                 * a probability 1/2 of being 0, and then the result will be < N),
+                 * so after 30 tries failure probability is a most 2**(-30).
+                 *
+                 * For most curves, 1 try is enough with overwhelming probability,
+                 * since N starts with a lot of 1s in binary, but some curves
+                 * such as secp224k1 are actually very close to the worst case.
+                 */
+                if (++count > 30)
+                    return (MBEDTLS_ERR_ECP_RANDOM_FAILED);
+            } while (mbedtls_mpi_cmp_int(d, 1) < 0 ||
+                     mbedtls_mpi_cmp_mpi(d, &grp->N) >= 0);
+        } else
 #endif /* ECP_SHORTWEIERSTRASS */
-        return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
+            return (MBEDTLS_ERR_ECP_BAD_INPUT_DATA);
 
 cleanup:
-    if( ret != 0 )
-        return( ret );
+    if (ret != 0)
+        return (ret);
 
-    return( mbedtls_ecp_mul( grp, Q, d, G, f_rng, p_rng ) );
+    return (mbedtls_ecp_mul(grp, Q, d, G, f_rng, p_rng));
 }
 
 /*
  * Generate key pair, wrapper for conventional base point
  */
-int mbedtls_ecp_gen_keypair( mbedtls_ecp_group *grp,
-                             mbedtls_mpi *d, mbedtls_ecp_point *Q,
-                             int (*f_rng)(void *, unsigned char *, size_t),
-                             void *p_rng )
+int mbedtls_ecp_gen_keypair(mbedtls_ecp_group *grp,
+                            mbedtls_mpi *d, mbedtls_ecp_point *Q,
+                            int (*f_rng)(void *, unsigned char *, size_t),
+                            void *p_rng)
 {
-    return( mbedtls_ecp_gen_keypair_base( grp, &grp->G, d, Q, f_rng, p_rng ) );
+    return (mbedtls_ecp_gen_keypair_base(grp, &grp->G, d, Q, f_rng, p_rng));
 }
 
 /*
  * Generate a keypair, prettier wrapper
  */
-int mbedtls_ecp_gen_key( mbedtls_ecp_group_id grp_id, mbedtls_ecp_keypair *key,
-                int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
+int mbedtls_ecp_gen_key(mbedtls_ecp_group_id grp_id, mbedtls_ecp_keypair *key,
+                        int (*f_rng)(void *, unsigned char *, size_t), void *p_rng)
 {
     int ret;
 
-    if( ( ret = mbedtls_ecp_group_load( &key->grp, grp_id ) ) != 0 )
-        return( ret );
+    if ((ret = mbedtls_ecp_group_load(&key->grp, grp_id)) != 0)
+        return (ret);
 
-    return( mbedtls_ecp_gen_keypair( &key->grp, &key->d, &key->Q, f_rng, p_rng ) );
+    return (mbedtls_ecp_gen_keypair(&key->grp, &key->d, &key->Q, f_rng, p_rng));
 }
 
 /*
  * Check a public-private key pair
  */
-int mbedtls_ecp_check_pub_priv( const mbedtls_ecp_keypair *pub, const mbedtls_ecp_keypair *prv )
+int mbedtls_ecp_check_pub_priv(const mbedtls_ecp_keypair *pub, const mbedtls_ecp_keypair *prv)
 {
     int ret;
     mbedtls_ecp_point Q;
     mbedtls_ecp_group grp;
 
-    if( pub->grp.id == MBEDTLS_ECP_DP_NONE ||
+    if (pub->grp.id == MBEDTLS_ECP_DP_NONE ||
         pub->grp.id != prv->grp.id ||
-        mbedtls_mpi_cmp_mpi( &pub->Q.X, &prv->Q.X ) ||
-        mbedtls_mpi_cmp_mpi( &pub->Q.Y, &prv->Q.Y ) ||
-        mbedtls_mpi_cmp_mpi( &pub->Q.Z, &prv->Q.Z ) )
-    {
-        return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
+        mbedtls_mpi_cmp_mpi(&pub->Q.X, &prv->Q.X) ||
+        mbedtls_mpi_cmp_mpi(&pub->Q.Y, &prv->Q.Y) ||
+        mbedtls_mpi_cmp_mpi(&pub->Q.Z, &prv->Q.Z)) {
+        return (MBEDTLS_ERR_ECP_BAD_INPUT_DATA);
     }
 
-    mbedtls_ecp_point_init( &Q );
-    mbedtls_ecp_group_init( &grp );
+    mbedtls_ecp_point_init(&Q);
+    mbedtls_ecp_group_init(&grp);
 
     /* mbedtls_ecp_mul() needs a non-const group... */
-    mbedtls_ecp_group_copy( &grp, &prv->grp );
+    mbedtls_ecp_group_copy(&grp, &prv->grp);
 
     /* Also checks d is valid */
-    MBEDTLS_MPI_CHK( mbedtls_ecp_mul( &grp, &Q, &prv->d, &prv->grp.G, NULL, NULL ) );
+    MBEDTLS_MPI_CHK(mbedtls_ecp_mul(&grp, &Q, &prv->d, &prv->grp.G, NULL, NULL));
 
-    if( mbedtls_mpi_cmp_mpi( &Q.X, &prv->Q.X ) ||
-        mbedtls_mpi_cmp_mpi( &Q.Y, &prv->Q.Y ) ||
-        mbedtls_mpi_cmp_mpi( &Q.Z, &prv->Q.Z ) )
-    {
+    if (mbedtls_mpi_cmp_mpi(&Q.X, &prv->Q.X) ||
+        mbedtls_mpi_cmp_mpi(&Q.Y, &prv->Q.Y) ||
+        mbedtls_mpi_cmp_mpi(&Q.Z, &prv->Q.Z)) {
         ret = MBEDTLS_ERR_ECP_BAD_INPUT_DATA;
         goto cleanup;
     }
 
 cleanup:
-    mbedtls_ecp_point_free( &Q );
-    mbedtls_ecp_group_free( &grp );
+    mbedtls_ecp_point_free(&Q);
+    mbedtls_ecp_group_free(&grp);
 
-    return( ret );
+    return (ret);
 }
 
 #if defined(MBEDTLS_SELF_TEST)
@@ -2078,7 +2129,7 @@ cleanup:
 /*
  * Checkup routine
  */
-int mbedtls_ecp_self_test( int verbose )
+int mbedtls_ecp_self_test(int verbose)
 {
     int ret;
     size_t i;
@@ -2087,8 +2138,7 @@ int mbedtls_ecp_self_test( int verbose )
     mbedtls_mpi m;
     unsigned long add_c_prev, dbl_c_prev, mul_c_prev;
     /* exponents especially adapted for secp192r1 */
-    const char *exponents[] =
-    {
+    const char *exponents[] = {
         "000000000000000000000000000000000000000000000001", /* one */
         "FFFFFFFFFFFFFFFFFFFFFFFF99DEF836146BC9B1B4D22830", /* N - 1 */
         "5EA6F389A38B8BC81E767753B15AA5569E1782E30ABE7D25", /* random */
@@ -2097,33 +2147,32 @@ int mbedtls_ecp_self_test( int verbose )
         "555555555555555555555555555555555555555555555555", /* 101010... */
     };
 
-    mbedtls_ecp_group_init( &grp );
-    mbedtls_ecp_point_init( &R );
-    mbedtls_ecp_point_init( &P );
-    mbedtls_mpi_init( &m );
+    mbedtls_ecp_group_init(&grp);
+    mbedtls_ecp_point_init(&R);
+    mbedtls_ecp_point_init(&P);
+    mbedtls_mpi_init(&m);
 
     /* Use secp192r1 if available, or any available curve */
 #if defined(MBEDTLS_ECP_DP_SECP192R1_ENABLED)
-    MBEDTLS_MPI_CHK( mbedtls_ecp_group_load( &grp, MBEDTLS_ECP_DP_SECP192R1 ) );
+    MBEDTLS_MPI_CHK(mbedtls_ecp_group_load(&grp, MBEDTLS_ECP_DP_SECP192R1));
 #else
-    MBEDTLS_MPI_CHK( mbedtls_ecp_group_load( &grp, mbedtls_ecp_curve_list()->grp_id ) );
+    MBEDTLS_MPI_CHK(mbedtls_ecp_group_load(&grp, mbedtls_ecp_curve_list()->grp_id));
 #endif
 
-    if( verbose != 0 )
-        mbedtls_printf( "  ECP test #1 (constant op_count, base point G): " );
+    if (verbose != 0)
+        mbedtls_printf("  ECP test #1 (constant op_count, base point G): ");
 
     /* Do a dummy multiplication first to trigger precomputation */
-    MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &m, 2 ) );
-    MBEDTLS_MPI_CHK( mbedtls_ecp_mul( &grp, &P, &m, &grp.G, NULL, NULL ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_lset(&m, 2));
+    MBEDTLS_MPI_CHK(mbedtls_ecp_mul(&grp, &P, &m, &grp.G, NULL, NULL));
 
     add_count = 0;
     dbl_count = 0;
     mul_count = 0;
-    MBEDTLS_MPI_CHK( mbedtls_mpi_read_string( &m, 16, exponents[0] ) );
-    MBEDTLS_MPI_CHK( mbedtls_ecp_mul( &grp, &R, &m, &grp.G, NULL, NULL ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_read_string(&m, 16, exponents[0]));
+    MBEDTLS_MPI_CHK(mbedtls_ecp_mul(&grp, &R, &m, &grp.G, NULL, NULL));
 
-    for( i = 1; i < sizeof( exponents ) / sizeof( exponents[0] ); i++ )
-    {
+    for (i = 1; i < sizeof(exponents) / sizeof(exponents[0]); i++) {
         add_c_prev = add_count;
         dbl_c_prev = dbl_count;
         mul_c_prev = mul_count;
@@ -2131,36 +2180,34 @@ int mbedtls_ecp_self_test( int verbose )
         dbl_count = 0;
         mul_count = 0;
 
-        MBEDTLS_MPI_CHK( mbedtls_mpi_read_string( &m, 16, exponents[i] ) );
-        MBEDTLS_MPI_CHK( mbedtls_ecp_mul( &grp, &R, &m, &grp.G, NULL, NULL ) );
+        MBEDTLS_MPI_CHK(mbedtls_mpi_read_string(&m, 16, exponents[i]));
+        MBEDTLS_MPI_CHK(mbedtls_ecp_mul(&grp, &R, &m, &grp.G, NULL, NULL));
 
-        if( add_count != add_c_prev ||
+        if (add_count != add_c_prev ||
             dbl_count != dbl_c_prev ||
-            mul_count != mul_c_prev )
-        {
-            if( verbose != 0 )
-                mbedtls_printf( "failed (%u)\n", (unsigned int) i );
+            mul_count != mul_c_prev) {
+            if (verbose != 0)
+                mbedtls_printf("failed (%u)\n", (unsigned int) i);
 
             ret = 1;
             goto cleanup;
         }
     }
 
-    if( verbose != 0 )
-        mbedtls_printf( "passed\n" );
+    if (verbose != 0)
+        mbedtls_printf("passed\n");
 
-    if( verbose != 0 )
-        mbedtls_printf( "  ECP test #2 (constant op_count, other point): " );
+    if (verbose != 0)
+        mbedtls_printf("  ECP test #2 (constant op_count, other point): ");
     /* We computed P = 2G last time, use it */
 
     add_count = 0;
     dbl_count = 0;
     mul_count = 0;
-    MBEDTLS_MPI_CHK( mbedtls_mpi_read_string( &m, 16, exponents[0] ) );
-    MBEDTLS_MPI_CHK( mbedtls_ecp_mul( &grp, &R, &m, &P, NULL, NULL ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_read_string(&m, 16, exponents[0]));
+    MBEDTLS_MPI_CHK(mbedtls_ecp_mul(&grp, &R, &m, &P, NULL, NULL));
 
-    for( i = 1; i < sizeof( exponents ) / sizeof( exponents[0] ); i++ )
-    {
+    for (i = 1; i < sizeof(exponents) / sizeof(exponents[0]); i++) {
         add_c_prev = add_count;
         dbl_c_prev = dbl_count;
         mul_c_prev = mul_count;
@@ -2168,38 +2215,37 @@ int mbedtls_ecp_self_test( int verbose )
         dbl_count = 0;
         mul_count = 0;
 
-        MBEDTLS_MPI_CHK( mbedtls_mpi_read_string( &m, 16, exponents[i] ) );
-        MBEDTLS_MPI_CHK( mbedtls_ecp_mul( &grp, &R, &m, &P, NULL, NULL ) );
+        MBEDTLS_MPI_CHK(mbedtls_mpi_read_string(&m, 16, exponents[i]));
+        MBEDTLS_MPI_CHK(mbedtls_ecp_mul(&grp, &R, &m, &P, NULL, NULL));
 
-        if( add_count != add_c_prev ||
+        if (add_count != add_c_prev ||
             dbl_count != dbl_c_prev ||
-            mul_count != mul_c_prev )
-        {
-            if( verbose != 0 )
-                mbedtls_printf( "failed (%u)\n", (unsigned int) i );
+            mul_count != mul_c_prev) {
+            if (verbose != 0)
+                mbedtls_printf("failed (%u)\n", (unsigned int) i);
 
             ret = 1;
             goto cleanup;
         }
     }
 
-    if( verbose != 0 )
-        mbedtls_printf( "passed\n" );
+    if (verbose != 0)
+        mbedtls_printf("passed\n");
 
 cleanup:
 
-    if( ret < 0 && verbose != 0 )
-        mbedtls_printf( "Unexpected error, return code = %08X\n", ret );
+    if (ret < 0 && verbose != 0)
+        mbedtls_printf("Unexpected error, return code = %08X\n", ret);
 
-    mbedtls_ecp_group_free( &grp );
-    mbedtls_ecp_point_free( &R );
-    mbedtls_ecp_point_free( &P );
-    mbedtls_mpi_free( &m );
+    mbedtls_ecp_group_free(&grp);
+    mbedtls_ecp_point_free(&R);
+    mbedtls_ecp_point_free(&P);
+    mbedtls_mpi_free(&m);
 
-    if( verbose != 0 )
-        mbedtls_printf( "\n" );
+    if (verbose != 0)
+        mbedtls_printf("\n");
 
-    return( ret );
+    return (ret);
 }
 
 #endif /* MBEDTLS_SELF_TEST */
diff --git a/common/mbedtls/ecp.h b/common/mbedtls/ecp.h
index 1821a72f8..f7ca89493 100644
--- a/common/mbedtls/ecp.h
+++ b/common/mbedtls/ecp.h
@@ -66,8 +66,7 @@ extern "C" {
  * parameters. Therefore, only standardized domain parameters from trusted
  * sources should be used. See mbedtls_ecp_group_load().
  */
-typedef enum
-{
+typedef enum {
     MBEDTLS_ECP_DP_NONE = 0,       /*!< Curve not defined. */
     MBEDTLS_ECP_DP_SECP192R1,      /*!< Domain parameters for the 192-bit curve defined by FIPS 186-4 and SEC1. */
     MBEDTLS_ECP_DP_SECP224R1,      /*!< Domain parameters for the 224-bit curve defined by FIPS 186-4 and SEC1. */
@@ -94,8 +93,7 @@ typedef enum
 /**
  * Curve information, for use by other modules.
  */
-typedef struct mbedtls_ecp_curve_info
-{
+typedef struct mbedtls_ecp_curve_info {
     mbedtls_ecp_group_id grp_id;    /*!< An internal identifier. */
     uint16_t tls_id;                /*!< The TLS NamedCurve identifier. */
     uint16_t bit_size;              /*!< The curve size in bits. */
@@ -113,8 +111,7 @@ typedef struct mbedtls_ecp_curve_info
  *                  Otherwise, \p X and \p Y are its standard (affine)
  *                  coordinates.
  */
-typedef struct mbedtls_ecp_point
-{
+typedef struct mbedtls_ecp_point {
     mbedtls_mpi X;          /*!< The X coordinate of the ECP point. */
     mbedtls_mpi Y;          /*!< The Y coordinate of the ECP point. */
     mbedtls_mpi Z;          /*!< The Z coordinate of the ECP point. */
@@ -158,8 +155,7 @@ mbedtls_ecp_point;
  * reduction. It must return 0 on success and non-zero on failure.
  *
  */
-typedef struct mbedtls_ecp_group
-{
+typedef struct mbedtls_ecp_group {
     mbedtls_ecp_group_id id;    /*!< An internal group identifier. */
     mbedtls_mpi P;              /*!< The prime modulus of the base field. */
     mbedtls_mpi A;              /*!< For Short Weierstrass: \p A in the equation. For
@@ -253,8 +249,7 @@ mbedtls_ecp_group;
  * \note    Members are deliberately in the same order as in the
  *          ::mbedtls_ecdsa_context structure.
  */
-typedef struct mbedtls_ecp_keypair
-{
+typedef struct mbedtls_ecp_keypair {
     mbedtls_ecp_group grp;      /*!<  Elliptic curve and base point     */
     mbedtls_mpi d;              /*!<  our secret value                  */
     mbedtls_ecp_point Q;        /*!<  our public value                  */
@@ -279,7 +274,7 @@ mbedtls_ecp_keypair;
  *
  * \return          A statically allocated array. The last entry is 0.
  */
-const mbedtls_ecp_curve_info *mbedtls_ecp_curve_list( void );
+const mbedtls_ecp_curve_info *mbedtls_ecp_curve_list(void);
 
 /**
  * \brief           This function retrieves the list of internal group
@@ -289,7 +284,7 @@ const mbedtls_ecp_curve_info *mbedtls_ecp_curve_list( void );
  * \return          A statically allocated array,
  *                  terminated with MBEDTLS_ECP_DP_NONE.
  */
-const mbedtls_ecp_group_id *mbedtls_ecp_grp_id_list( void );
+const mbedtls_ecp_group_id *mbedtls_ecp_grp_id_list(void);
 
 /**
  * \brief           This function retrieves curve information from an internal
@@ -300,7 +295,7 @@ const mbedtls_ecp_group_id *mbedtls_ecp_grp_id_list( void );
  * \return          The associated curve information on success.
  * \return          NULL on failure.
  */
-const mbedtls_ecp_curve_info *mbedtls_ecp_curve_info_from_grp_id( mbedtls_ecp_group_id grp_id );
+const mbedtls_ecp_curve_info *mbedtls_ecp_curve_info_from_grp_id(mbedtls_ecp_group_id grp_id);
 
 /**
  * \brief           This function retrieves curve information from a TLS
@@ -311,7 +306,7 @@ const mbedtls_ecp_curve_info *mbedtls_ecp_curve_info_from_grp_id( mbedtls_ecp_gr
  * \return          The associated curve information on success.
  * \return          NULL on failure.
  */
-const mbedtls_ecp_curve_info *mbedtls_ecp_curve_info_from_tls_id( uint16_t tls_id );
+const mbedtls_ecp_curve_info *mbedtls_ecp_curve_info_from_tls_id(uint16_t tls_id);
 
 /**
  * \brief           This function retrieves curve information from a
@@ -322,14 +317,14 @@ const mbedtls_ecp_curve_info *mbedtls_ecp_curve_info_from_tls_id( uint16_t tls_i
  * \return          The associated curve information on success.
  * \return          NULL on failure.
  */
-const mbedtls_ecp_curve_info *mbedtls_ecp_curve_info_from_name( const char *name );
+const mbedtls_ecp_curve_info *mbedtls_ecp_curve_info_from_name(const char *name);
 
 /**
  * \brief           This function initializes a point as zero.
  *
  * \param pt        The point to initialize.
  */
-void mbedtls_ecp_point_init( mbedtls_ecp_point *pt );
+void mbedtls_ecp_point_init(mbedtls_ecp_point *pt);
 
 /**
  * \brief           This function initializes an ECP group context
@@ -340,33 +335,33 @@ void mbedtls_ecp_point_init( mbedtls_ecp_point *pt );
  *                  mbedtls_ecp_load() or mbedtls_ecp_tls_read_group()
  *                  functions.
  */
-void mbedtls_ecp_group_init( mbedtls_ecp_group *grp );
+void mbedtls_ecp_group_init(mbedtls_ecp_group *grp);
 
 /**
  * \brief           This function initializes a key pair as an invalid one.
  *
  * \param key       The key pair to initialize.
  */
-void mbedtls_ecp_keypair_init( mbedtls_ecp_keypair *key );
+void mbedtls_ecp_keypair_init(mbedtls_ecp_keypair *key);
 
 /**
  * \brief           This function frees the components of a point.
  *
  * \param pt        The point to free.
  */
-void mbedtls_ecp_point_free( mbedtls_ecp_point *pt );
+void mbedtls_ecp_point_free(mbedtls_ecp_point *pt);
 
 /**
  * \brief           This function frees the components of an ECP group.
  * \param grp       The group to free.
  */
-void mbedtls_ecp_group_free( mbedtls_ecp_group *grp );
+void mbedtls_ecp_group_free(mbedtls_ecp_group *grp);
 
 /**
  * \brief           This function frees the components of a key pair.
  * \param key       The key pair to free.
  */
-void mbedtls_ecp_keypair_free( mbedtls_ecp_keypair *key );
+void mbedtls_ecp_keypair_free(mbedtls_ecp_keypair *key);
 
 /**
  * \brief           This function copies the contents of point \p Q into
@@ -378,7 +373,7 @@ void mbedtls_ecp_keypair_free( mbedtls_ecp_keypair *key );
  * \return          \c 0 on success.
  * \return          #MBEDTLS_ERR_MPI_ALLOC_FAILED on memory-allocation failure.
  */
-int mbedtls_ecp_copy( mbedtls_ecp_point *P, const mbedtls_ecp_point *Q );
+int mbedtls_ecp_copy(mbedtls_ecp_point *P, const mbedtls_ecp_point *Q);
 
 /**
  * \brief           This function copies the contents of group \p src into
@@ -390,7 +385,7 @@ int mbedtls_ecp_copy( mbedtls_ecp_point *P, const mbedtls_ecp_point *Q );
  * \return          \c 0 on success.
  * \return          #MBEDTLS_ERR_MPI_ALLOC_FAILED on memory-allocation failure.
  */
-int mbedtls_ecp_group_copy( mbedtls_ecp_group *dst, const mbedtls_ecp_group *src );
+int mbedtls_ecp_group_copy(mbedtls_ecp_group *dst, const mbedtls_ecp_group *src);
 
 /**
  * \brief           This function sets a point to zero.
@@ -400,7 +395,7 @@ int mbedtls_ecp_group_copy( mbedtls_ecp_group *dst, const mbedtls_ecp_group *src
  * \return          \c 0 on success.
  * \return          #MBEDTLS_ERR_MPI_ALLOC_FAILED on memory-allocation failure.
  */
-int mbedtls_ecp_set_zero( mbedtls_ecp_point *pt );
+int mbedtls_ecp_set_zero(mbedtls_ecp_point *pt);
 
 /**
  * \brief           This function checks if a point is zero.
@@ -410,7 +405,7 @@ int mbedtls_ecp_set_zero( mbedtls_ecp_point *pt );
  * \return          \c 1 if the point is zero.
  * \return          \c 0 if the point is non-zero.
  */
-int mbedtls_ecp_is_zero( mbedtls_ecp_point *pt );
+int mbedtls_ecp_is_zero(mbedtls_ecp_point *pt);
 
 /**
  * \brief           This function compares two points.
@@ -424,8 +419,8 @@ int mbedtls_ecp_is_zero( mbedtls_ecp_point *pt );
  * \return          \c 0 if the points are equal.
  * \return          #MBEDTLS_ERR_ECP_BAD_INPUT_DATA if the points are not equal.
  */
-int mbedtls_ecp_point_cmp( const mbedtls_ecp_point *P,
-                           const mbedtls_ecp_point *Q );
+int mbedtls_ecp_point_cmp(const mbedtls_ecp_point *P,
+                          const mbedtls_ecp_point *Q);
 
 /**
  * \brief           This function imports a non-zero point from two ASCII
@@ -439,8 +434,8 @@ int mbedtls_ecp_point_cmp( const mbedtls_ecp_point *P,
  * \return          \c 0 on success.
  * \return          An \c MBEDTLS_ERR_MPI_XXX error code on failure.
  */
-int mbedtls_ecp_point_read_string( mbedtls_ecp_point *P, int radix,
-                           const char *x, const char *y );
+int mbedtls_ecp_point_read_string(mbedtls_ecp_point *P, int radix,
+                                  const char *x, const char *y);
 
 /**
  * \brief           This function exports a point into unsigned binary data.
@@ -456,9 +451,9 @@ int mbedtls_ecp_point_read_string( mbedtls_ecp_point *P, int radix,
  * \return          #MBEDTLS_ERR_ECP_BAD_INPUT_DATA
  *                  or #MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL on failure.
  */
-int mbedtls_ecp_point_write_binary( const mbedtls_ecp_group *grp, const mbedtls_ecp_point *P,
-                            int format, size_t *olen,
-                            unsigned char *buf, size_t buflen );
+int mbedtls_ecp_point_write_binary(const mbedtls_ecp_group *grp, const mbedtls_ecp_point *P,
+                                   int format, size_t *olen,
+                                   unsigned char *buf, size_t buflen);
 
 /**
  * \brief           This function imports a point from unsigned binary data.
@@ -479,8 +474,8 @@ int mbedtls_ecp_point_write_binary( const mbedtls_ecp_group *grp, const mbedtls_
  *                  is not implemented.
  *
  */
-int mbedtls_ecp_point_read_binary( const mbedtls_ecp_group *grp, mbedtls_ecp_point *P,
-                           const unsigned char *buf, size_t ilen );
+int mbedtls_ecp_point_read_binary(const mbedtls_ecp_group *grp, mbedtls_ecp_point *P,
+                                  const unsigned char *buf, size_t ilen);
 
 /**
  * \brief           This function imports a point from a TLS ECPoint record.
@@ -497,8 +492,8 @@ int mbedtls_ecp_point_read_binary( const mbedtls_ecp_group *grp, mbedtls_ecp_poi
  * \return          An \c MBEDTLS_ERR_MPI_XXX error code on initialization failure.
  * \return          #MBEDTLS_ERR_ECP_BAD_INPUT_DATA if input is invalid.
  */
-int mbedtls_ecp_tls_read_point( const mbedtls_ecp_group *grp, mbedtls_ecp_point *pt,
-                        const unsigned char **buf, size_t len );
+int mbedtls_ecp_tls_read_point(const mbedtls_ecp_group *grp, mbedtls_ecp_point *pt,
+                               const unsigned char **buf, size_t len);
 
 /**
  * \brief           This function exports a point as a TLS ECPoint record.
@@ -515,9 +510,9 @@ int mbedtls_ecp_tls_read_point( const mbedtls_ecp_group *grp, mbedtls_ecp_point
  * \return          #MBEDTLS_ERR_ECP_BAD_INPUT_DATA or
  *                  #MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL on failure.
  */
-int mbedtls_ecp_tls_write_point( const mbedtls_ecp_group *grp, const mbedtls_ecp_point *pt,
-                         int format, size_t *olen,
-                         unsigned char *buf, size_t blen );
+int mbedtls_ecp_tls_write_point(const mbedtls_ecp_group *grp, const mbedtls_ecp_point *pt,
+                                int format, size_t *olen,
+                                unsigned char *buf, size_t blen);
 
 /**
  * \brief           This function sets a group using standardized domain parameters.
@@ -535,7 +530,7 @@ int mbedtls_ecp_tls_write_point( const mbedtls_ecp_group *grp, const mbedtls_ecp
  * \return          #MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE for unkownn groups.
 
  */
-int mbedtls_ecp_group_load( mbedtls_ecp_group *grp, mbedtls_ecp_group_id id );
+int mbedtls_ecp_group_load(mbedtls_ecp_group *grp, mbedtls_ecp_group_id id);
 
 /**
  * \brief           This function sets a group from a TLS ECParameters record.
@@ -551,7 +546,7 @@ int mbedtls_ecp_group_load( mbedtls_ecp_group *grp, mbedtls_ecp_group_id id );
  * \return          An \c MBEDTLS_ERR_MPI_XXX error code on initialization failure.
  * \return          #MBEDTLS_ERR_ECP_BAD_INPUT_DATA if input is invalid.
  */
-int mbedtls_ecp_tls_read_group( mbedtls_ecp_group *grp, const unsigned char **buf, size_t len );
+int mbedtls_ecp_tls_read_group(mbedtls_ecp_group *grp, const unsigned char **buf, size_t len);
 
 /**
  * \brief           This function writes the TLS ECParameters record for a group.
@@ -564,8 +559,8 @@ int mbedtls_ecp_tls_read_group( mbedtls_ecp_group *grp, const unsigned char **bu
  * \return          \c 0 on success.
  * \return          #MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL on failure.
  */
-int mbedtls_ecp_tls_write_group( const mbedtls_ecp_group *grp, size_t *olen,
-                         unsigned char *buf, size_t blen );
+int mbedtls_ecp_tls_write_group(const mbedtls_ecp_group *grp, size_t *olen,
+                                unsigned char *buf, size_t blen);
 
 /**
  * \brief           This function performs multiplication of a point by
@@ -595,9 +590,9 @@ int mbedtls_ecp_tls_write_group( const mbedtls_ecp_group *grp, size_t *olen,
  *                  key, or \p P is not a valid public key.
  * \return          #MBEDTLS_ERR_MPI_ALLOC_FAILED on memory-allocation failure.
  */
-int mbedtls_ecp_mul( mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
-             const mbedtls_mpi *m, const mbedtls_ecp_point *P,
-             int (*f_rng)(void *, unsigned char *, size_t), void *p_rng );
+int mbedtls_ecp_mul(mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
+                    const mbedtls_mpi *m, const mbedtls_ecp_point *P,
+                    int (*f_rng)(void *, unsigned char *, size_t), void *p_rng);
 
 /**
  * \brief           This function performs multiplication and addition of two
@@ -621,9 +616,9 @@ int mbedtls_ecp_mul( mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
  *                  keys.
  * \return          #MBEDTLS_ERR_MPI_ALLOC_FAILED on memory-allocation failure.
  */
-int mbedtls_ecp_muladd( mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
-             const mbedtls_mpi *m, const mbedtls_ecp_point *P,
-             const mbedtls_mpi *n, const mbedtls_ecp_point *Q );
+int mbedtls_ecp_muladd(mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
+                       const mbedtls_mpi *m, const mbedtls_ecp_point *P,
+                       const mbedtls_mpi *n, const mbedtls_ecp_point *Q);
 
 /**
  * \brief           This function checks that a point is a valid public key
@@ -648,7 +643,7 @@ int mbedtls_ecp_muladd( mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
  * \return          \c 0 if the point is a valid public key.
  * \return          #MBEDTLS_ERR_ECP_INVALID_KEY on failure.
  */
-int mbedtls_ecp_check_pubkey( const mbedtls_ecp_group *grp, const mbedtls_ecp_point *pt );
+int mbedtls_ecp_check_pubkey(const mbedtls_ecp_group *grp, const mbedtls_ecp_point *pt);
 
 /**
  * \brief           This function checks that an \p mbedtls_mpi is a valid private
@@ -665,7 +660,7 @@ int mbedtls_ecp_check_pubkey( const mbedtls_ecp_group *grp, const mbedtls_ecp_po
  * \return          \c 0 if the point is a valid private key.
  * \return          #MBEDTLS_ERR_ECP_INVALID_KEY on failure.
  */
-int mbedtls_ecp_check_privkey( const mbedtls_ecp_group *grp, const mbedtls_mpi *d );
+int mbedtls_ecp_check_privkey(const mbedtls_ecp_group *grp, const mbedtls_mpi *d);
 
 /**
  * \brief           This function generates a keypair with a configurable base
@@ -687,11 +682,11 @@ int mbedtls_ecp_check_privkey( const mbedtls_ecp_group *grp, const mbedtls_mpi *
  * \return          An \c MBEDTLS_ERR_ECP_XXX or \c MBEDTLS_MPI_XXX error code
  *                  on failure.
  */
-int mbedtls_ecp_gen_keypair_base( mbedtls_ecp_group *grp,
-                     const mbedtls_ecp_point *G,
-                     mbedtls_mpi *d, mbedtls_ecp_point *Q,
-                     int (*f_rng)(void *, unsigned char *, size_t),
-                     void *p_rng );
+int mbedtls_ecp_gen_keypair_base(mbedtls_ecp_group *grp,
+                                 const mbedtls_ecp_point *G,
+                                 mbedtls_mpi *d, mbedtls_ecp_point *Q,
+                                 int (*f_rng)(void *, unsigned char *, size_t),
+                                 void *p_rng);
 
 /**
  * \brief           This function generates an ECP keypair.
@@ -711,9 +706,9 @@ int mbedtls_ecp_gen_keypair_base( mbedtls_ecp_group *grp,
  * \return          An \c MBEDTLS_ERR_ECP_XXX or \c MBEDTLS_MPI_XXX error code
  *                  on failure.
  */
-int mbedtls_ecp_gen_keypair( mbedtls_ecp_group *grp, mbedtls_mpi *d, mbedtls_ecp_point *Q,
-                     int (*f_rng)(void *, unsigned char *, size_t),
-                     void *p_rng );
+int mbedtls_ecp_gen_keypair(mbedtls_ecp_group *grp, mbedtls_mpi *d, mbedtls_ecp_point *Q,
+                            int (*f_rng)(void *, unsigned char *, size_t),
+                            void *p_rng);
 
 /**
  * \brief           This function generates an ECP key.
@@ -727,8 +722,8 @@ int mbedtls_ecp_gen_keypair( mbedtls_ecp_group *grp, mbedtls_mpi *d, mbedtls_ecp
  * \return          An \c MBEDTLS_ERR_ECP_XXX or \c MBEDTLS_MPI_XXX error code
  *                  on failure.
  */
-int mbedtls_ecp_gen_key( mbedtls_ecp_group_id grp_id, mbedtls_ecp_keypair *key,
-                int (*f_rng)(void *, unsigned char *, size_t), void *p_rng );
+int mbedtls_ecp_gen_key(mbedtls_ecp_group_id grp_id, mbedtls_ecp_keypair *key,
+                        int (*f_rng)(void *, unsigned char *, size_t), void *p_rng);
 
 /**
  * \brief           This function checks that the keypair objects
@@ -745,7 +740,7 @@ int mbedtls_ecp_gen_key( mbedtls_ecp_group_id grp_id, mbedtls_ecp_keypair *key,
  * \return          An \c MBEDTLS_ERR_ECP_XXX or an \c MBEDTLS_ERR_MPI_XXX
  *                  error code on calculation failure.
  */
-int mbedtls_ecp_check_pub_priv( const mbedtls_ecp_keypair *pub, const mbedtls_ecp_keypair *prv );
+int mbedtls_ecp_check_pub_priv(const mbedtls_ecp_keypair *pub, const mbedtls_ecp_keypair *prv);
 
 #if defined(MBEDTLS_SELF_TEST)
 
@@ -755,7 +750,7 @@ int mbedtls_ecp_check_pub_priv( const mbedtls_ecp_keypair *pub, const mbedtls_ec
  * \return         \c 0 on success.
  * \return         \c 1 on failure.
  */
-int mbedtls_ecp_self_test( int verbose );
+int mbedtls_ecp_self_test(int verbose);
 
 #endif /* MBEDTLS_SELF_TEST */
 
diff --git a/common/mbedtls/ecp_curves.c b/common/mbedtls/ecp_curves.c
index 01efe8ba9..8e7d915f2 100644
--- a/common/mbedtls/ecp_curves.c
+++ b/common/mbedtls/ecp_curves.c
@@ -89,29 +89,29 @@
  */
 #if defined(MBEDTLS_ECP_DP_SECP192R1_ENABLED)
 static const mbedtls_mpi_uint secp192r1_p[] = {
-    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
-    BYTES_TO_T_UINT_8( 0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
-    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8(0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF),
+    BYTES_TO_T_UINT_8(0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF),
+    BYTES_TO_T_UINT_8(0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF),
 };
 static const mbedtls_mpi_uint secp192r1_b[] = {
-    BYTES_TO_T_UINT_8( 0xB1, 0xB9, 0x46, 0xC1, 0xEC, 0xDE, 0xB8, 0xFE ),
-    BYTES_TO_T_UINT_8( 0x49, 0x30, 0x24, 0x72, 0xAB, 0xE9, 0xA7, 0x0F ),
-    BYTES_TO_T_UINT_8( 0xE7, 0x80, 0x9C, 0xE5, 0x19, 0x05, 0x21, 0x64 ),
+    BYTES_TO_T_UINT_8(0xB1, 0xB9, 0x46, 0xC1, 0xEC, 0xDE, 0xB8, 0xFE),
+    BYTES_TO_T_UINT_8(0x49, 0x30, 0x24, 0x72, 0xAB, 0xE9, 0xA7, 0x0F),
+    BYTES_TO_T_UINT_8(0xE7, 0x80, 0x9C, 0xE5, 0x19, 0x05, 0x21, 0x64),
 };
 static const mbedtls_mpi_uint secp192r1_gx[] = {
-    BYTES_TO_T_UINT_8( 0x12, 0x10, 0xFF, 0x82, 0xFD, 0x0A, 0xFF, 0xF4 ),
-    BYTES_TO_T_UINT_8( 0x00, 0x88, 0xA1, 0x43, 0xEB, 0x20, 0xBF, 0x7C ),
-    BYTES_TO_T_UINT_8( 0xF6, 0x90, 0x30, 0xB0, 0x0E, 0xA8, 0x8D, 0x18 ),
+    BYTES_TO_T_UINT_8(0x12, 0x10, 0xFF, 0x82, 0xFD, 0x0A, 0xFF, 0xF4),
+    BYTES_TO_T_UINT_8(0x00, 0x88, 0xA1, 0x43, 0xEB, 0x20, 0xBF, 0x7C),
+    BYTES_TO_T_UINT_8(0xF6, 0x90, 0x30, 0xB0, 0x0E, 0xA8, 0x8D, 0x18),
 };
 static const mbedtls_mpi_uint secp192r1_gy[] = {
-    BYTES_TO_T_UINT_8( 0x11, 0x48, 0x79, 0x1E, 0xA1, 0x77, 0xF9, 0x73 ),
-    BYTES_TO_T_UINT_8( 0xD5, 0xCD, 0x24, 0x6B, 0xED, 0x11, 0x10, 0x63 ),
-    BYTES_TO_T_UINT_8( 0x78, 0xDA, 0xC8, 0xFF, 0x95, 0x2B, 0x19, 0x07 ),
+    BYTES_TO_T_UINT_8(0x11, 0x48, 0x79, 0x1E, 0xA1, 0x77, 0xF9, 0x73),
+    BYTES_TO_T_UINT_8(0xD5, 0xCD, 0x24, 0x6B, 0xED, 0x11, 0x10, 0x63),
+    BYTES_TO_T_UINT_8(0x78, 0xDA, 0xC8, 0xFF, 0x95, 0x2B, 0x19, 0x07),
 };
 static const mbedtls_mpi_uint secp192r1_n[] = {
-    BYTES_TO_T_UINT_8( 0x31, 0x28, 0xD2, 0xB4, 0xB1, 0xC9, 0x6B, 0x14 ),
-    BYTES_TO_T_UINT_8( 0x36, 0xF8, 0xDE, 0x99, 0xFF, 0xFF, 0xFF, 0xFF ),
-    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8(0x31, 0x28, 0xD2, 0xB4, 0xB1, 0xC9, 0x6B, 0x14),
+    BYTES_TO_T_UINT_8(0x36, 0xF8, 0xDE, 0x99, 0xFF, 0xFF, 0xFF, 0xFF),
+    BYTES_TO_T_UINT_8(0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF),
 };
 #endif /* MBEDTLS_ECP_DP_SECP192R1_ENABLED */
 
@@ -120,34 +120,34 @@ static const mbedtls_mpi_uint secp192r1_n[] = {
  */
 #if defined(MBEDTLS_ECP_DP_SECP224R1_ENABLED)
 static const mbedtls_mpi_uint secp224r1_p[] = {
-    BYTES_TO_T_UINT_8( 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 ),
-    BYTES_TO_T_UINT_8( 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF ),
-    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
-    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00 ),
+    BYTES_TO_T_UINT_8(0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00),
+    BYTES_TO_T_UINT_8(0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF),
+    BYTES_TO_T_UINT_8(0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF),
+    BYTES_TO_T_UINT_8(0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00),
 };
 static const mbedtls_mpi_uint secp224r1_b[] = {
-    BYTES_TO_T_UINT_8( 0xB4, 0xFF, 0x55, 0x23, 0x43, 0x39, 0x0B, 0x27 ),
-    BYTES_TO_T_UINT_8( 0xBA, 0xD8, 0xBF, 0xD7, 0xB7, 0xB0, 0x44, 0x50 ),
-    BYTES_TO_T_UINT_8( 0x56, 0x32, 0x41, 0xF5, 0xAB, 0xB3, 0x04, 0x0C ),
-    BYTES_TO_T_UINT_4( 0x85, 0x0A, 0x05, 0xB4 ),
+    BYTES_TO_T_UINT_8(0xB4, 0xFF, 0x55, 0x23, 0x43, 0x39, 0x0B, 0x27),
+    BYTES_TO_T_UINT_8(0xBA, 0xD8, 0xBF, 0xD7, 0xB7, 0xB0, 0x44, 0x50),
+    BYTES_TO_T_UINT_8(0x56, 0x32, 0x41, 0xF5, 0xAB, 0xB3, 0x04, 0x0C),
+    BYTES_TO_T_UINT_4(0x85, 0x0A, 0x05, 0xB4),
 };
 static const mbedtls_mpi_uint secp224r1_gx[] = {
-    BYTES_TO_T_UINT_8( 0x21, 0x1D, 0x5C, 0x11, 0xD6, 0x80, 0x32, 0x34 ),
-    BYTES_TO_T_UINT_8( 0x22, 0x11, 0xC2, 0x56, 0xD3, 0xC1, 0x03, 0x4A ),
-    BYTES_TO_T_UINT_8( 0xB9, 0x90, 0x13, 0x32, 0x7F, 0xBF, 0xB4, 0x6B ),
-    BYTES_TO_T_UINT_4( 0xBD, 0x0C, 0x0E, 0xB7 ),
+    BYTES_TO_T_UINT_8(0x21, 0x1D, 0x5C, 0x11, 0xD6, 0x80, 0x32, 0x34),
+    BYTES_TO_T_UINT_8(0x22, 0x11, 0xC2, 0x56, 0xD3, 0xC1, 0x03, 0x4A),
+    BYTES_TO_T_UINT_8(0xB9, 0x90, 0x13, 0x32, 0x7F, 0xBF, 0xB4, 0x6B),
+    BYTES_TO_T_UINT_4(0xBD, 0x0C, 0x0E, 0xB7),
 };
 static const mbedtls_mpi_uint secp224r1_gy[] = {
-    BYTES_TO_T_UINT_8( 0x34, 0x7E, 0x00, 0x85, 0x99, 0x81, 0xD5, 0x44 ),
-    BYTES_TO_T_UINT_8( 0x64, 0x47, 0x07, 0x5A, 0xA0, 0x75, 0x43, 0xCD ),
-    BYTES_TO_T_UINT_8( 0xE6, 0xDF, 0x22, 0x4C, 0xFB, 0x23, 0xF7, 0xB5 ),
-    BYTES_TO_T_UINT_4( 0x88, 0x63, 0x37, 0xBD ),
+    BYTES_TO_T_UINT_8(0x34, 0x7E, 0x00, 0x85, 0x99, 0x81, 0xD5, 0x44),
+    BYTES_TO_T_UINT_8(0x64, 0x47, 0x07, 0x5A, 0xA0, 0x75, 0x43, 0xCD),
+    BYTES_TO_T_UINT_8(0xE6, 0xDF, 0x22, 0x4C, 0xFB, 0x23, 0xF7, 0xB5),
+    BYTES_TO_T_UINT_4(0x88, 0x63, 0x37, 0xBD),
 };
 static const mbedtls_mpi_uint secp224r1_n[] = {
-    BYTES_TO_T_UINT_8( 0x3D, 0x2A, 0x5C, 0x5C, 0x45, 0x29, 0xDD, 0x13 ),
-    BYTES_TO_T_UINT_8( 0x3E, 0xF0, 0xB8, 0xE0, 0xA2, 0x16, 0xFF, 0xFF ),
-    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
-    BYTES_TO_T_UINT_4( 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8(0x3D, 0x2A, 0x5C, 0x5C, 0x45, 0x29, 0xDD, 0x13),
+    BYTES_TO_T_UINT_8(0x3E, 0xF0, 0xB8, 0xE0, 0xA2, 0x16, 0xFF, 0xFF),
+    BYTES_TO_T_UINT_8(0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF),
+    BYTES_TO_T_UINT_4(0xFF, 0xFF, 0xFF, 0xFF),
 };
 #endif /* MBEDTLS_ECP_DP_SECP224R1_ENABLED */
 
@@ -156,34 +156,34 @@ static const mbedtls_mpi_uint secp224r1_n[] = {
  */
 #if defined(MBEDTLS_ECP_DP_SECP256R1_ENABLED)
 static const mbedtls_mpi_uint secp256r1_p[] = {
-    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
-    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00 ),
-    BYTES_TO_T_UINT_8( 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 ),
-    BYTES_TO_T_UINT_8( 0x01, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8(0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF),
+    BYTES_TO_T_UINT_8(0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00),
+    BYTES_TO_T_UINT_8(0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00),
+    BYTES_TO_T_UINT_8(0x01, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF),
 };
 static const mbedtls_mpi_uint secp256r1_b[] = {
-    BYTES_TO_T_UINT_8( 0x4B, 0x60, 0xD2, 0x27, 0x3E, 0x3C, 0xCE, 0x3B ),
-    BYTES_TO_T_UINT_8( 0xF6, 0xB0, 0x53, 0xCC, 0xB0, 0x06, 0x1D, 0x65 ),
-    BYTES_TO_T_UINT_8( 0xBC, 0x86, 0x98, 0x76, 0x55, 0xBD, 0xEB, 0xB3 ),
-    BYTES_TO_T_UINT_8( 0xE7, 0x93, 0x3A, 0xAA, 0xD8, 0x35, 0xC6, 0x5A ),
+    BYTES_TO_T_UINT_8(0x4B, 0x60, 0xD2, 0x27, 0x3E, 0x3C, 0xCE, 0x3B),
+    BYTES_TO_T_UINT_8(0xF6, 0xB0, 0x53, 0xCC, 0xB0, 0x06, 0x1D, 0x65),
+    BYTES_TO_T_UINT_8(0xBC, 0x86, 0x98, 0x76, 0x55, 0xBD, 0xEB, 0xB3),
+    BYTES_TO_T_UINT_8(0xE7, 0x93, 0x3A, 0xAA, 0xD8, 0x35, 0xC6, 0x5A),
 };
 static const mbedtls_mpi_uint secp256r1_gx[] = {
-    BYTES_TO_T_UINT_8( 0x96, 0xC2, 0x98, 0xD8, 0x45, 0x39, 0xA1, 0xF4 ),
-    BYTES_TO_T_UINT_8( 0xA0, 0x33, 0xEB, 0x2D, 0x81, 0x7D, 0x03, 0x77 ),
-    BYTES_TO_T_UINT_8( 0xF2, 0x40, 0xA4, 0x63, 0xE5, 0xE6, 0xBC, 0xF8 ),
-    BYTES_TO_T_UINT_8( 0x47, 0x42, 0x2C, 0xE1, 0xF2, 0xD1, 0x17, 0x6B ),
+    BYTES_TO_T_UINT_8(0x96, 0xC2, 0x98, 0xD8, 0x45, 0x39, 0xA1, 0xF4),
+    BYTES_TO_T_UINT_8(0xA0, 0x33, 0xEB, 0x2D, 0x81, 0x7D, 0x03, 0x77),
+    BYTES_TO_T_UINT_8(0xF2, 0x40, 0xA4, 0x63, 0xE5, 0xE6, 0xBC, 0xF8),
+    BYTES_TO_T_UINT_8(0x47, 0x42, 0x2C, 0xE1, 0xF2, 0xD1, 0x17, 0x6B),
 };
 static const mbedtls_mpi_uint secp256r1_gy[] = {
-    BYTES_TO_T_UINT_8( 0xF5, 0x51, 0xBF, 0x37, 0x68, 0x40, 0xB6, 0xCB ),
-    BYTES_TO_T_UINT_8( 0xCE, 0x5E, 0x31, 0x6B, 0x57, 0x33, 0xCE, 0x2B ),
-    BYTES_TO_T_UINT_8( 0x16, 0x9E, 0x0F, 0x7C, 0x4A, 0xEB, 0xE7, 0x8E ),
-    BYTES_TO_T_UINT_8( 0x9B, 0x7F, 0x1A, 0xFE, 0xE2, 0x42, 0xE3, 0x4F ),
+    BYTES_TO_T_UINT_8(0xF5, 0x51, 0xBF, 0x37, 0x68, 0x40, 0xB6, 0xCB),
+    BYTES_TO_T_UINT_8(0xCE, 0x5E, 0x31, 0x6B, 0x57, 0x33, 0xCE, 0x2B),
+    BYTES_TO_T_UINT_8(0x16, 0x9E, 0x0F, 0x7C, 0x4A, 0xEB, 0xE7, 0x8E),
+    BYTES_TO_T_UINT_8(0x9B, 0x7F, 0x1A, 0xFE, 0xE2, 0x42, 0xE3, 0x4F),
 };
 static const mbedtls_mpi_uint secp256r1_n[] = {
-    BYTES_TO_T_UINT_8( 0x51, 0x25, 0x63, 0xFC, 0xC2, 0xCA, 0xB9, 0xF3 ),
-    BYTES_TO_T_UINT_8( 0x84, 0x9E, 0x17, 0xA7, 0xAD, 0xFA, 0xE6, 0xBC ),
-    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
-    BYTES_TO_T_UINT_8( 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8(0x51, 0x25, 0x63, 0xFC, 0xC2, 0xCA, 0xB9, 0xF3),
+    BYTES_TO_T_UINT_8(0x84, 0x9E, 0x17, 0xA7, 0xAD, 0xFA, 0xE6, 0xBC),
+    BYTES_TO_T_UINT_8(0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF),
+    BYTES_TO_T_UINT_8(0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF),
 };
 #endif /* MBEDTLS_ECP_DP_SECP256R1_ENABLED */
 
@@ -192,44 +192,44 @@ static const mbedtls_mpi_uint secp256r1_n[] = {
  */
 #if defined(MBEDTLS_ECP_DP_SECP384R1_ENABLED)
 static const mbedtls_mpi_uint secp384r1_p[] = {
-    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00 ),
-    BYTES_TO_T_UINT_8( 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF ),
-    BYTES_TO_T_UINT_8( 0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
-    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
-    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
-    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8(0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00),
+    BYTES_TO_T_UINT_8(0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF),
+    BYTES_TO_T_UINT_8(0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF),
+    BYTES_TO_T_UINT_8(0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF),
+    BYTES_TO_T_UINT_8(0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF),
+    BYTES_TO_T_UINT_8(0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF),
 };
 static const mbedtls_mpi_uint secp384r1_b[] = {
-    BYTES_TO_T_UINT_8( 0xEF, 0x2A, 0xEC, 0xD3, 0xED, 0xC8, 0x85, 0x2A ),
-    BYTES_TO_T_UINT_8( 0x9D, 0xD1, 0x2E, 0x8A, 0x8D, 0x39, 0x56, 0xC6 ),
-    BYTES_TO_T_UINT_8( 0x5A, 0x87, 0x13, 0x50, 0x8F, 0x08, 0x14, 0x03 ),
-    BYTES_TO_T_UINT_8( 0x12, 0x41, 0x81, 0xFE, 0x6E, 0x9C, 0x1D, 0x18 ),
-    BYTES_TO_T_UINT_8( 0x19, 0x2D, 0xF8, 0xE3, 0x6B, 0x05, 0x8E, 0x98 ),
-    BYTES_TO_T_UINT_8( 0xE4, 0xE7, 0x3E, 0xE2, 0xA7, 0x2F, 0x31, 0xB3 ),
+    BYTES_TO_T_UINT_8(0xEF, 0x2A, 0xEC, 0xD3, 0xED, 0xC8, 0x85, 0x2A),
+    BYTES_TO_T_UINT_8(0x9D, 0xD1, 0x2E, 0x8A, 0x8D, 0x39, 0x56, 0xC6),
+    BYTES_TO_T_UINT_8(0x5A, 0x87, 0x13, 0x50, 0x8F, 0x08, 0x14, 0x03),
+    BYTES_TO_T_UINT_8(0x12, 0x41, 0x81, 0xFE, 0x6E, 0x9C, 0x1D, 0x18),
+    BYTES_TO_T_UINT_8(0x19, 0x2D, 0xF8, 0xE3, 0x6B, 0x05, 0x8E, 0x98),
+    BYTES_TO_T_UINT_8(0xE4, 0xE7, 0x3E, 0xE2, 0xA7, 0x2F, 0x31, 0xB3),
 };
 static const mbedtls_mpi_uint secp384r1_gx[] = {
-    BYTES_TO_T_UINT_8( 0xB7, 0x0A, 0x76, 0x72, 0x38, 0x5E, 0x54, 0x3A ),
-    BYTES_TO_T_UINT_8( 0x6C, 0x29, 0x55, 0xBF, 0x5D, 0xF2, 0x02, 0x55 ),
-    BYTES_TO_T_UINT_8( 0x38, 0x2A, 0x54, 0x82, 0xE0, 0x41, 0xF7, 0x59 ),
-    BYTES_TO_T_UINT_8( 0x98, 0x9B, 0xA7, 0x8B, 0x62, 0x3B, 0x1D, 0x6E ),
-    BYTES_TO_T_UINT_8( 0x74, 0xAD, 0x20, 0xF3, 0x1E, 0xC7, 0xB1, 0x8E ),
-    BYTES_TO_T_UINT_8( 0x37, 0x05, 0x8B, 0xBE, 0x22, 0xCA, 0x87, 0xAA ),
+    BYTES_TO_T_UINT_8(0xB7, 0x0A, 0x76, 0x72, 0x38, 0x5E, 0x54, 0x3A),
+    BYTES_TO_T_UINT_8(0x6C, 0x29, 0x55, 0xBF, 0x5D, 0xF2, 0x02, 0x55),
+    BYTES_TO_T_UINT_8(0x38, 0x2A, 0x54, 0x82, 0xE0, 0x41, 0xF7, 0x59),
+    BYTES_TO_T_UINT_8(0x98, 0x9B, 0xA7, 0x8B, 0x62, 0x3B, 0x1D, 0x6E),
+    BYTES_TO_T_UINT_8(0x74, 0xAD, 0x20, 0xF3, 0x1E, 0xC7, 0xB1, 0x8E),
+    BYTES_TO_T_UINT_8(0x37, 0x05, 0x8B, 0xBE, 0x22, 0xCA, 0x87, 0xAA),
 };
 static const mbedtls_mpi_uint secp384r1_gy[] = {
-    BYTES_TO_T_UINT_8( 0x5F, 0x0E, 0xEA, 0x90, 0x7C, 0x1D, 0x43, 0x7A ),
-    BYTES_TO_T_UINT_8( 0x9D, 0x81, 0x7E, 0x1D, 0xCE, 0xB1, 0x60, 0x0A ),
-    BYTES_TO_T_UINT_8( 0xC0, 0xB8, 0xF0, 0xB5, 0x13, 0x31, 0xDA, 0xE9 ),
-    BYTES_TO_T_UINT_8( 0x7C, 0x14, 0x9A, 0x28, 0xBD, 0x1D, 0xF4, 0xF8 ),
-    BYTES_TO_T_UINT_8( 0x29, 0xDC, 0x92, 0x92, 0xBF, 0x98, 0x9E, 0x5D ),
-    BYTES_TO_T_UINT_8( 0x6F, 0x2C, 0x26, 0x96, 0x4A, 0xDE, 0x17, 0x36 ),
+    BYTES_TO_T_UINT_8(0x5F, 0x0E, 0xEA, 0x90, 0x7C, 0x1D, 0x43, 0x7A),
+    BYTES_TO_T_UINT_8(0x9D, 0x81, 0x7E, 0x1D, 0xCE, 0xB1, 0x60, 0x0A),
+    BYTES_TO_T_UINT_8(0xC0, 0xB8, 0xF0, 0xB5, 0x13, 0x31, 0xDA, 0xE9),
+    BYTES_TO_T_UINT_8(0x7C, 0x14, 0x9A, 0x28, 0xBD, 0x1D, 0xF4, 0xF8),
+    BYTES_TO_T_UINT_8(0x29, 0xDC, 0x92, 0x92, 0xBF, 0x98, 0x9E, 0x5D),
+    BYTES_TO_T_UINT_8(0x6F, 0x2C, 0x26, 0x96, 0x4A, 0xDE, 0x17, 0x36),
 };
 static const mbedtls_mpi_uint secp384r1_n[] = {
-    BYTES_TO_T_UINT_8( 0x73, 0x29, 0xC5, 0xCC, 0x6A, 0x19, 0xEC, 0xEC ),
-    BYTES_TO_T_UINT_8( 0x7A, 0xA7, 0xB0, 0x48, 0xB2, 0x0D, 0x1A, 0x58 ),
-    BYTES_TO_T_UINT_8( 0xDF, 0x2D, 0x37, 0xF4, 0x81, 0x4D, 0x63, 0xC7 ),
-    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
-    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
-    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8(0x73, 0x29, 0xC5, 0xCC, 0x6A, 0x19, 0xEC, 0xEC),
+    BYTES_TO_T_UINT_8(0x7A, 0xA7, 0xB0, 0x48, 0xB2, 0x0D, 0x1A, 0x58),
+    BYTES_TO_T_UINT_8(0xDF, 0x2D, 0x37, 0xF4, 0x81, 0x4D, 0x63, 0xC7),
+    BYTES_TO_T_UINT_8(0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF),
+    BYTES_TO_T_UINT_8(0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF),
+    BYTES_TO_T_UINT_8(0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF),
 };
 #endif /* MBEDTLS_ECP_DP_SECP384R1_ENABLED */
 
@@ -238,154 +238,154 @@ static const mbedtls_mpi_uint secp384r1_n[] = {
  */
 #if defined(MBEDTLS_ECP_DP_SECP521R1_ENABLED)
 static const mbedtls_mpi_uint secp521r1_p[] = {
-    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
-    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
-    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
-    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
-    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
-    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
-    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
-    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
-    BYTES_TO_T_UINT_2( 0xFF, 0x01 ),
+    BYTES_TO_T_UINT_8(0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF),
+    BYTES_TO_T_UINT_8(0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF),
+    BYTES_TO_T_UINT_8(0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF),
+    BYTES_TO_T_UINT_8(0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF),
+    BYTES_TO_T_UINT_8(0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF),
+    BYTES_TO_T_UINT_8(0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF),
+    BYTES_TO_T_UINT_8(0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF),
+    BYTES_TO_T_UINT_8(0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF),
+    BYTES_TO_T_UINT_2(0xFF, 0x01),
 };
 static const mbedtls_mpi_uint secp521r1_b[] = {
-    BYTES_TO_T_UINT_8( 0x00, 0x3F, 0x50, 0x6B, 0xD4, 0x1F, 0x45, 0xEF ),
-    BYTES_TO_T_UINT_8( 0xF1, 0x34, 0x2C, 0x3D, 0x88, 0xDF, 0x73, 0x35 ),
-    BYTES_TO_T_UINT_8( 0x07, 0xBF, 0xB1, 0x3B, 0xBD, 0xC0, 0x52, 0x16 ),
-    BYTES_TO_T_UINT_8( 0x7B, 0x93, 0x7E, 0xEC, 0x51, 0x39, 0x19, 0x56 ),
-    BYTES_TO_T_UINT_8( 0xE1, 0x09, 0xF1, 0x8E, 0x91, 0x89, 0xB4, 0xB8 ),
-    BYTES_TO_T_UINT_8( 0xF3, 0x15, 0xB3, 0x99, 0x5B, 0x72, 0xDA, 0xA2 ),
-    BYTES_TO_T_UINT_8( 0xEE, 0x40, 0x85, 0xB6, 0xA0, 0x21, 0x9A, 0x92 ),
-    BYTES_TO_T_UINT_8( 0x1F, 0x9A, 0x1C, 0x8E, 0x61, 0xB9, 0x3E, 0x95 ),
-    BYTES_TO_T_UINT_2( 0x51, 0x00 ),
+    BYTES_TO_T_UINT_8(0x00, 0x3F, 0x50, 0x6B, 0xD4, 0x1F, 0x45, 0xEF),
+    BYTES_TO_T_UINT_8(0xF1, 0x34, 0x2C, 0x3D, 0x88, 0xDF, 0x73, 0x35),
+    BYTES_TO_T_UINT_8(0x07, 0xBF, 0xB1, 0x3B, 0xBD, 0xC0, 0x52, 0x16),
+    BYTES_TO_T_UINT_8(0x7B, 0x93, 0x7E, 0xEC, 0x51, 0x39, 0x19, 0x56),
+    BYTES_TO_T_UINT_8(0xE1, 0x09, 0xF1, 0x8E, 0x91, 0x89, 0xB4, 0xB8),
+    BYTES_TO_T_UINT_8(0xF3, 0x15, 0xB3, 0x99, 0x5B, 0x72, 0xDA, 0xA2),
+    BYTES_TO_T_UINT_8(0xEE, 0x40, 0x85, 0xB6, 0xA0, 0x21, 0x9A, 0x92),
+    BYTES_TO_T_UINT_8(0x1F, 0x9A, 0x1C, 0x8E, 0x61, 0xB9, 0x3E, 0x95),
+    BYTES_TO_T_UINT_2(0x51, 0x00),
 };
 static const mbedtls_mpi_uint secp521r1_gx[] = {
-    BYTES_TO_T_UINT_8( 0x66, 0xBD, 0xE5, 0xC2, 0x31, 0x7E, 0x7E, 0xF9 ),
-    BYTES_TO_T_UINT_8( 0x9B, 0x42, 0x6A, 0x85, 0xC1, 0xB3, 0x48, 0x33 ),
-    BYTES_TO_T_UINT_8( 0xDE, 0xA8, 0xFF, 0xA2, 0x27, 0xC1, 0x1D, 0xFE ),
-    BYTES_TO_T_UINT_8( 0x28, 0x59, 0xE7, 0xEF, 0x77, 0x5E, 0x4B, 0xA1 ),
-    BYTES_TO_T_UINT_8( 0xBA, 0x3D, 0x4D, 0x6B, 0x60, 0xAF, 0x28, 0xF8 ),
-    BYTES_TO_T_UINT_8( 0x21, 0xB5, 0x3F, 0x05, 0x39, 0x81, 0x64, 0x9C ),
-    BYTES_TO_T_UINT_8( 0x42, 0xB4, 0x95, 0x23, 0x66, 0xCB, 0x3E, 0x9E ),
-    BYTES_TO_T_UINT_8( 0xCD, 0xE9, 0x04, 0x04, 0xB7, 0x06, 0x8E, 0x85 ),
-    BYTES_TO_T_UINT_2( 0xC6, 0x00 ),
+    BYTES_TO_T_UINT_8(0x66, 0xBD, 0xE5, 0xC2, 0x31, 0x7E, 0x7E, 0xF9),
+    BYTES_TO_T_UINT_8(0x9B, 0x42, 0x6A, 0x85, 0xC1, 0xB3, 0x48, 0x33),
+    BYTES_TO_T_UINT_8(0xDE, 0xA8, 0xFF, 0xA2, 0x27, 0xC1, 0x1D, 0xFE),
+    BYTES_TO_T_UINT_8(0x28, 0x59, 0xE7, 0xEF, 0x77, 0x5E, 0x4B, 0xA1),
+    BYTES_TO_T_UINT_8(0xBA, 0x3D, 0x4D, 0x6B, 0x60, 0xAF, 0x28, 0xF8),
+    BYTES_TO_T_UINT_8(0x21, 0xB5, 0x3F, 0x05, 0x39, 0x81, 0x64, 0x9C),
+    BYTES_TO_T_UINT_8(0x42, 0xB4, 0x95, 0x23, 0x66, 0xCB, 0x3E, 0x9E),
+    BYTES_TO_T_UINT_8(0xCD, 0xE9, 0x04, 0x04, 0xB7, 0x06, 0x8E, 0x85),
+    BYTES_TO_T_UINT_2(0xC6, 0x00),
 };
 static const mbedtls_mpi_uint secp521r1_gy[] = {
-    BYTES_TO_T_UINT_8( 0x50, 0x66, 0xD1, 0x9F, 0x76, 0x94, 0xBE, 0x88 ),
-    BYTES_TO_T_UINT_8( 0x40, 0xC2, 0x72, 0xA2, 0x86, 0x70, 0x3C, 0x35 ),
-    BYTES_TO_T_UINT_8( 0x61, 0x07, 0xAD, 0x3F, 0x01, 0xB9, 0x50, 0xC5 ),
-    BYTES_TO_T_UINT_8( 0x40, 0x26, 0xF4, 0x5E, 0x99, 0x72, 0xEE, 0x97 ),
-    BYTES_TO_T_UINT_8( 0x2C, 0x66, 0x3E, 0x27, 0x17, 0xBD, 0xAF, 0x17 ),
-    BYTES_TO_T_UINT_8( 0x68, 0x44, 0x9B, 0x57, 0x49, 0x44, 0xF5, 0x98 ),
-    BYTES_TO_T_UINT_8( 0xD9, 0x1B, 0x7D, 0x2C, 0xB4, 0x5F, 0x8A, 0x5C ),
-    BYTES_TO_T_UINT_8( 0x04, 0xC0, 0x3B, 0x9A, 0x78, 0x6A, 0x29, 0x39 ),
-    BYTES_TO_T_UINT_2( 0x18, 0x01 ),
+    BYTES_TO_T_UINT_8(0x50, 0x66, 0xD1, 0x9F, 0x76, 0x94, 0xBE, 0x88),
+    BYTES_TO_T_UINT_8(0x40, 0xC2, 0x72, 0xA2, 0x86, 0x70, 0x3C, 0x35),
+    BYTES_TO_T_UINT_8(0x61, 0x07, 0xAD, 0x3F, 0x01, 0xB9, 0x50, 0xC5),
+    BYTES_TO_T_UINT_8(0x40, 0x26, 0xF4, 0x5E, 0x99, 0x72, 0xEE, 0x97),
+    BYTES_TO_T_UINT_8(0x2C, 0x66, 0x3E, 0x27, 0x17, 0xBD, 0xAF, 0x17),
+    BYTES_TO_T_UINT_8(0x68, 0x44, 0x9B, 0x57, 0x49, 0x44, 0xF5, 0x98),
+    BYTES_TO_T_UINT_8(0xD9, 0x1B, 0x7D, 0x2C, 0xB4, 0x5F, 0x8A, 0x5C),
+    BYTES_TO_T_UINT_8(0x04, 0xC0, 0x3B, 0x9A, 0x78, 0x6A, 0x29, 0x39),
+    BYTES_TO_T_UINT_2(0x18, 0x01),
 };
 static const mbedtls_mpi_uint secp521r1_n[] = {
-    BYTES_TO_T_UINT_8( 0x09, 0x64, 0x38, 0x91, 0x1E, 0xB7, 0x6F, 0xBB ),
-    BYTES_TO_T_UINT_8( 0xAE, 0x47, 0x9C, 0x89, 0xB8, 0xC9, 0xB5, 0x3B ),
-    BYTES_TO_T_UINT_8( 0xD0, 0xA5, 0x09, 0xF7, 0x48, 0x01, 0xCC, 0x7F ),
-    BYTES_TO_T_UINT_8( 0x6B, 0x96, 0x2F, 0xBF, 0x83, 0x87, 0x86, 0x51 ),
-    BYTES_TO_T_UINT_8( 0xFA, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
-    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
-    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
-    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
-    BYTES_TO_T_UINT_2( 0xFF, 0x01 ),
+    BYTES_TO_T_UINT_8(0x09, 0x64, 0x38, 0x91, 0x1E, 0xB7, 0x6F, 0xBB),
+    BYTES_TO_T_UINT_8(0xAE, 0x47, 0x9C, 0x89, 0xB8, 0xC9, 0xB5, 0x3B),
+    BYTES_TO_T_UINT_8(0xD0, 0xA5, 0x09, 0xF7, 0x48, 0x01, 0xCC, 0x7F),
+    BYTES_TO_T_UINT_8(0x6B, 0x96, 0x2F, 0xBF, 0x83, 0x87, 0x86, 0x51),
+    BYTES_TO_T_UINT_8(0xFA, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF),
+    BYTES_TO_T_UINT_8(0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF),
+    BYTES_TO_T_UINT_8(0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF),
+    BYTES_TO_T_UINT_8(0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF),
+    BYTES_TO_T_UINT_2(0xFF, 0x01),
 };
 #endif /* MBEDTLS_ECP_DP_SECP521R1_ENABLED */
 
 #if defined(MBEDTLS_ECP_DP_SECP192K1_ENABLED)
 static const mbedtls_mpi_uint secp192k1_p[] = {
-    BYTES_TO_T_UINT_8( 0x37, 0xEE, 0xFF, 0xFF, 0xFE, 0xFF, 0xFF, 0xFF ),
-    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
-    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8(0x37, 0xEE, 0xFF, 0xFF, 0xFE, 0xFF, 0xFF, 0xFF),
+    BYTES_TO_T_UINT_8(0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF),
+    BYTES_TO_T_UINT_8(0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF),
 };
 static const mbedtls_mpi_uint secp192k1_a[] = {
-    BYTES_TO_T_UINT_2( 0x00, 0x00 ),
+    BYTES_TO_T_UINT_2(0x00, 0x00),
 };
 static const mbedtls_mpi_uint secp192k1_b[] = {
-    BYTES_TO_T_UINT_2( 0x03, 0x00 ),
+    BYTES_TO_T_UINT_2(0x03, 0x00),
 };
 static const mbedtls_mpi_uint secp192k1_gx[] = {
-    BYTES_TO_T_UINT_8( 0x7D, 0x6C, 0xE0, 0xEA, 0xB1, 0xD1, 0xA5, 0x1D ),
-    BYTES_TO_T_UINT_8( 0x34, 0xF4, 0xB7, 0x80, 0x02, 0x7D, 0xB0, 0x26 ),
-    BYTES_TO_T_UINT_8( 0xAE, 0xE9, 0x57, 0xC0, 0x0E, 0xF1, 0x4F, 0xDB ),
+    BYTES_TO_T_UINT_8(0x7D, 0x6C, 0xE0, 0xEA, 0xB1, 0xD1, 0xA5, 0x1D),
+    BYTES_TO_T_UINT_8(0x34, 0xF4, 0xB7, 0x80, 0x02, 0x7D, 0xB0, 0x26),
+    BYTES_TO_T_UINT_8(0xAE, 0xE9, 0x57, 0xC0, 0x0E, 0xF1, 0x4F, 0xDB),
 };
 static const mbedtls_mpi_uint secp192k1_gy[] = {
-    BYTES_TO_T_UINT_8( 0x9D, 0x2F, 0x5E, 0xD9, 0x88, 0xAA, 0x82, 0x40 ),
-    BYTES_TO_T_UINT_8( 0x34, 0x86, 0xBE, 0x15, 0xD0, 0x63, 0x41, 0x84 ),
-    BYTES_TO_T_UINT_8( 0xA7, 0x28, 0x56, 0x9C, 0x6D, 0x2F, 0x2F, 0x9B ),
+    BYTES_TO_T_UINT_8(0x9D, 0x2F, 0x5E, 0xD9, 0x88, 0xAA, 0x82, 0x40),
+    BYTES_TO_T_UINT_8(0x34, 0x86, 0xBE, 0x15, 0xD0, 0x63, 0x41, 0x84),
+    BYTES_TO_T_UINT_8(0xA7, 0x28, 0x56, 0x9C, 0x6D, 0x2F, 0x2F, 0x9B),
 };
 static const mbedtls_mpi_uint secp192k1_n[] = {
-    BYTES_TO_T_UINT_8( 0x8D, 0xFD, 0xDE, 0x74, 0x6A, 0x46, 0x69, 0x0F ),
-    BYTES_TO_T_UINT_8( 0x17, 0xFC, 0xF2, 0x26, 0xFE, 0xFF, 0xFF, 0xFF ),
-    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8(0x8D, 0xFD, 0xDE, 0x74, 0x6A, 0x46, 0x69, 0x0F),
+    BYTES_TO_T_UINT_8(0x17, 0xFC, 0xF2, 0x26, 0xFE, 0xFF, 0xFF, 0xFF),
+    BYTES_TO_T_UINT_8(0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF),
 };
 #endif /* MBEDTLS_ECP_DP_SECP192K1_ENABLED */
 
 #if defined(MBEDTLS_ECP_DP_SECP224K1_ENABLED)
 static const mbedtls_mpi_uint secp224k1_p[] = {
-    BYTES_TO_T_UINT_8( 0x6D, 0xE5, 0xFF, 0xFF, 0xFE, 0xFF, 0xFF, 0xFF ),
-    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
-    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
-    BYTES_TO_T_UINT_4( 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8(0x6D, 0xE5, 0xFF, 0xFF, 0xFE, 0xFF, 0xFF, 0xFF),
+    BYTES_TO_T_UINT_8(0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF),
+    BYTES_TO_T_UINT_8(0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF),
+    BYTES_TO_T_UINT_4(0xFF, 0xFF, 0xFF, 0xFF),
 };
 static const mbedtls_mpi_uint secp224k1_a[] = {
-    BYTES_TO_T_UINT_2( 0x00, 0x00 ),
+    BYTES_TO_T_UINT_2(0x00, 0x00),
 };
 static const mbedtls_mpi_uint secp224k1_b[] = {
-    BYTES_TO_T_UINT_2( 0x05, 0x00 ),
+    BYTES_TO_T_UINT_2(0x05, 0x00),
 };
 static const mbedtls_mpi_uint secp224k1_gx[] = {
-    BYTES_TO_T_UINT_8( 0x5C, 0xA4, 0xB7, 0xB6, 0x0E, 0x65, 0x7E, 0x0F ),
-    BYTES_TO_T_UINT_8( 0xA9, 0x75, 0x70, 0xE4, 0xE9, 0x67, 0xA4, 0x69 ),
-    BYTES_TO_T_UINT_8( 0xA1, 0x28, 0xFC, 0x30, 0xDF, 0x99, 0xF0, 0x4D ),
-    BYTES_TO_T_UINT_4( 0x33, 0x5B, 0x45, 0xA1 ),
+    BYTES_TO_T_UINT_8(0x5C, 0xA4, 0xB7, 0xB6, 0x0E, 0x65, 0x7E, 0x0F),
+    BYTES_TO_T_UINT_8(0xA9, 0x75, 0x70, 0xE4, 0xE9, 0x67, 0xA4, 0x69),
+    BYTES_TO_T_UINT_8(0xA1, 0x28, 0xFC, 0x30, 0xDF, 0x99, 0xF0, 0x4D),
+    BYTES_TO_T_UINT_4(0x33, 0x5B, 0x45, 0xA1),
 };
 static const mbedtls_mpi_uint secp224k1_gy[] = {
-    BYTES_TO_T_UINT_8( 0xA5, 0x61, 0x6D, 0x55, 0xDB, 0x4B, 0xCA, 0xE2 ),
-    BYTES_TO_T_UINT_8( 0x59, 0xBD, 0xB0, 0xC0, 0xF7, 0x19, 0xE3, 0xF7 ),
-    BYTES_TO_T_UINT_8( 0xD6, 0xFB, 0xCA, 0x82, 0x42, 0x34, 0xBA, 0x7F ),
-    BYTES_TO_T_UINT_4( 0xED, 0x9F, 0x08, 0x7E ),
+    BYTES_TO_T_UINT_8(0xA5, 0x61, 0x6D, 0x55, 0xDB, 0x4B, 0xCA, 0xE2),
+    BYTES_TO_T_UINT_8(0x59, 0xBD, 0xB0, 0xC0, 0xF7, 0x19, 0xE3, 0xF7),
+    BYTES_TO_T_UINT_8(0xD6, 0xFB, 0xCA, 0x82, 0x42, 0x34, 0xBA, 0x7F),
+    BYTES_TO_T_UINT_4(0xED, 0x9F, 0x08, 0x7E),
 };
 static const mbedtls_mpi_uint secp224k1_n[] = {
-    BYTES_TO_T_UINT_8( 0xF7, 0xB1, 0x9F, 0x76, 0x71, 0xA9, 0xF0, 0xCA ),
-    BYTES_TO_T_UINT_8( 0x84, 0x61, 0xEC, 0xD2, 0xE8, 0xDC, 0x01, 0x00 ),
-    BYTES_TO_T_UINT_8( 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 ),
-    BYTES_TO_T_UINT_8( 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 ),
+    BYTES_TO_T_UINT_8(0xF7, 0xB1, 0x9F, 0x76, 0x71, 0xA9, 0xF0, 0xCA),
+    BYTES_TO_T_UINT_8(0x84, 0x61, 0xEC, 0xD2, 0xE8, 0xDC, 0x01, 0x00),
+    BYTES_TO_T_UINT_8(0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00),
+    BYTES_TO_T_UINT_8(0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00),
 };
 #endif /* MBEDTLS_ECP_DP_SECP224K1_ENABLED */
 
 #if defined(MBEDTLS_ECP_DP_SECP256K1_ENABLED)
 static const mbedtls_mpi_uint secp256k1_p[] = {
-    BYTES_TO_T_UINT_8( 0x2F, 0xFC, 0xFF, 0xFF, 0xFE, 0xFF, 0xFF, 0xFF ),
-    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
-    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
-    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8(0x2F, 0xFC, 0xFF, 0xFF, 0xFE, 0xFF, 0xFF, 0xFF),
+    BYTES_TO_T_UINT_8(0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF),
+    BYTES_TO_T_UINT_8(0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF),
+    BYTES_TO_T_UINT_8(0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF),
 };
 static const mbedtls_mpi_uint secp256k1_a[] = {
-    BYTES_TO_T_UINT_2( 0x00, 0x00 ),
+    BYTES_TO_T_UINT_2(0x00, 0x00),
 };
 static const mbedtls_mpi_uint secp256k1_b[] = {
-    BYTES_TO_T_UINT_2( 0x07, 0x00 ),
+    BYTES_TO_T_UINT_2(0x07, 0x00),
 };
 static const mbedtls_mpi_uint secp256k1_gx[] = {
-    BYTES_TO_T_UINT_8( 0x98, 0x17, 0xF8, 0x16, 0x5B, 0x81, 0xF2, 0x59 ),
-    BYTES_TO_T_UINT_8( 0xD9, 0x28, 0xCE, 0x2D, 0xDB, 0xFC, 0x9B, 0x02 ),
-    BYTES_TO_T_UINT_8( 0x07, 0x0B, 0x87, 0xCE, 0x95, 0x62, 0xA0, 0x55 ),
-    BYTES_TO_T_UINT_8( 0xAC, 0xBB, 0xDC, 0xF9, 0x7E, 0x66, 0xBE, 0x79 ),
+    BYTES_TO_T_UINT_8(0x98, 0x17, 0xF8, 0x16, 0x5B, 0x81, 0xF2, 0x59),
+    BYTES_TO_T_UINT_8(0xD9, 0x28, 0xCE, 0x2D, 0xDB, 0xFC, 0x9B, 0x02),
+    BYTES_TO_T_UINT_8(0x07, 0x0B, 0x87, 0xCE, 0x95, 0x62, 0xA0, 0x55),
+    BYTES_TO_T_UINT_8(0xAC, 0xBB, 0xDC, 0xF9, 0x7E, 0x66, 0xBE, 0x79),
 };
 static const mbedtls_mpi_uint secp256k1_gy[] = {
-    BYTES_TO_T_UINT_8( 0xB8, 0xD4, 0x10, 0xFB, 0x8F, 0xD0, 0x47, 0x9C ),
-    BYTES_TO_T_UINT_8( 0x19, 0x54, 0x85, 0xA6, 0x48, 0xB4, 0x17, 0xFD ),
-    BYTES_TO_T_UINT_8( 0xA8, 0x08, 0x11, 0x0E, 0xFC, 0xFB, 0xA4, 0x5D ),
-    BYTES_TO_T_UINT_8( 0x65, 0xC4, 0xA3, 0x26, 0x77, 0xDA, 0x3A, 0x48 ),
+    BYTES_TO_T_UINT_8(0xB8, 0xD4, 0x10, 0xFB, 0x8F, 0xD0, 0x47, 0x9C),
+    BYTES_TO_T_UINT_8(0x19, 0x54, 0x85, 0xA6, 0x48, 0xB4, 0x17, 0xFD),
+    BYTES_TO_T_UINT_8(0xA8, 0x08, 0x11, 0x0E, 0xFC, 0xFB, 0xA4, 0x5D),
+    BYTES_TO_T_UINT_8(0x65, 0xC4, 0xA3, 0x26, 0x77, 0xDA, 0x3A, 0x48),
 };
 static const mbedtls_mpi_uint secp256k1_n[] = {
-    BYTES_TO_T_UINT_8( 0x41, 0x41, 0x36, 0xD0, 0x8C, 0x5E, 0xD2, 0xBF ),
-    BYTES_TO_T_UINT_8( 0x3B, 0xA0, 0x48, 0xAF, 0xE6, 0xDC, 0xAE, 0xBA ),
-    BYTES_TO_T_UINT_8( 0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
-    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8(0x41, 0x41, 0x36, 0xD0, 0x8C, 0x5E, 0xD2, 0xBF),
+    BYTES_TO_T_UINT_8(0x3B, 0xA0, 0x48, 0xAF, 0xE6, 0xDC, 0xAE, 0xBA),
+    BYTES_TO_T_UINT_8(0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF),
+    BYTES_TO_T_UINT_8(0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF),
 };
 #endif /* MBEDTLS_ECP_DP_SECP256K1_ENABLED */
 
@@ -394,40 +394,40 @@ static const mbedtls_mpi_uint secp256k1_n[] = {
  */
 #if defined(MBEDTLS_ECP_DP_BP256R1_ENABLED)
 static const mbedtls_mpi_uint brainpoolP256r1_p[] = {
-    BYTES_TO_T_UINT_8( 0x77, 0x53, 0x6E, 0x1F, 0x1D, 0x48, 0x13, 0x20 ),
-    BYTES_TO_T_UINT_8( 0x28, 0x20, 0x26, 0xD5, 0x23, 0xF6, 0x3B, 0x6E ),
-    BYTES_TO_T_UINT_8( 0x72, 0x8D, 0x83, 0x9D, 0x90, 0x0A, 0x66, 0x3E ),
-    BYTES_TO_T_UINT_8( 0xBC, 0xA9, 0xEE, 0xA1, 0xDB, 0x57, 0xFB, 0xA9 ),
+    BYTES_TO_T_UINT_8(0x77, 0x53, 0x6E, 0x1F, 0x1D, 0x48, 0x13, 0x20),
+    BYTES_TO_T_UINT_8(0x28, 0x20, 0x26, 0xD5, 0x23, 0xF6, 0x3B, 0x6E),
+    BYTES_TO_T_UINT_8(0x72, 0x8D, 0x83, 0x9D, 0x90, 0x0A, 0x66, 0x3E),
+    BYTES_TO_T_UINT_8(0xBC, 0xA9, 0xEE, 0xA1, 0xDB, 0x57, 0xFB, 0xA9),
 };
 static const mbedtls_mpi_uint brainpoolP256r1_a[] = {
-    BYTES_TO_T_UINT_8( 0xD9, 0xB5, 0x30, 0xF3, 0x44, 0x4B, 0x4A, 0xE9 ),
-    BYTES_TO_T_UINT_8( 0x6C, 0x5C, 0xDC, 0x26, 0xC1, 0x55, 0x80, 0xFB ),
-    BYTES_TO_T_UINT_8( 0xE7, 0xFF, 0x7A, 0x41, 0x30, 0x75, 0xF6, 0xEE ),
-    BYTES_TO_T_UINT_8( 0x57, 0x30, 0x2C, 0xFC, 0x75, 0x09, 0x5A, 0x7D ),
+    BYTES_TO_T_UINT_8(0xD9, 0xB5, 0x30, 0xF3, 0x44, 0x4B, 0x4A, 0xE9),
+    BYTES_TO_T_UINT_8(0x6C, 0x5C, 0xDC, 0x26, 0xC1, 0x55, 0x80, 0xFB),
+    BYTES_TO_T_UINT_8(0xE7, 0xFF, 0x7A, 0x41, 0x30, 0x75, 0xF6, 0xEE),
+    BYTES_TO_T_UINT_8(0x57, 0x30, 0x2C, 0xFC, 0x75, 0x09, 0x5A, 0x7D),
 };
 static const mbedtls_mpi_uint brainpoolP256r1_b[] = {
-    BYTES_TO_T_UINT_8( 0xB6, 0x07, 0x8C, 0xFF, 0x18, 0xDC, 0xCC, 0x6B ),
-    BYTES_TO_T_UINT_8( 0xCE, 0xE1, 0xF7, 0x5C, 0x29, 0x16, 0x84, 0x95 ),
-    BYTES_TO_T_UINT_8( 0xBF, 0x7C, 0xD7, 0xBB, 0xD9, 0xB5, 0x30, 0xF3 ),
-    BYTES_TO_T_UINT_8( 0x44, 0x4B, 0x4A, 0xE9, 0x6C, 0x5C, 0xDC, 0x26 ),
+    BYTES_TO_T_UINT_8(0xB6, 0x07, 0x8C, 0xFF, 0x18, 0xDC, 0xCC, 0x6B),
+    BYTES_TO_T_UINT_8(0xCE, 0xE1, 0xF7, 0x5C, 0x29, 0x16, 0x84, 0x95),
+    BYTES_TO_T_UINT_8(0xBF, 0x7C, 0xD7, 0xBB, 0xD9, 0xB5, 0x30, 0xF3),
+    BYTES_TO_T_UINT_8(0x44, 0x4B, 0x4A, 0xE9, 0x6C, 0x5C, 0xDC, 0x26),
 };
 static const mbedtls_mpi_uint brainpoolP256r1_gx[] = {
-    BYTES_TO_T_UINT_8( 0x62, 0x32, 0xCE, 0x9A, 0xBD, 0x53, 0x44, 0x3A ),
-    BYTES_TO_T_UINT_8( 0xC2, 0x23, 0xBD, 0xE3, 0xE1, 0x27, 0xDE, 0xB9 ),
-    BYTES_TO_T_UINT_8( 0xAF, 0xB7, 0x81, 0xFC, 0x2F, 0x48, 0x4B, 0x2C ),
-    BYTES_TO_T_UINT_8( 0xCB, 0x57, 0x7E, 0xCB, 0xB9, 0xAE, 0xD2, 0x8B ),
+    BYTES_TO_T_UINT_8(0x62, 0x32, 0xCE, 0x9A, 0xBD, 0x53, 0x44, 0x3A),
+    BYTES_TO_T_UINT_8(0xC2, 0x23, 0xBD, 0xE3, 0xE1, 0x27, 0xDE, 0xB9),
+    BYTES_TO_T_UINT_8(0xAF, 0xB7, 0x81, 0xFC, 0x2F, 0x48, 0x4B, 0x2C),
+    BYTES_TO_T_UINT_8(0xCB, 0x57, 0x7E, 0xCB, 0xB9, 0xAE, 0xD2, 0x8B),
 };
 static const mbedtls_mpi_uint brainpoolP256r1_gy[] = {
-    BYTES_TO_T_UINT_8( 0x97, 0x69, 0x04, 0x2F, 0xC7, 0x54, 0x1D, 0x5C ),
-    BYTES_TO_T_UINT_8( 0x54, 0x8E, 0xED, 0x2D, 0x13, 0x45, 0x77, 0xC2 ),
-    BYTES_TO_T_UINT_8( 0xC9, 0x1D, 0x61, 0x14, 0x1A, 0x46, 0xF8, 0x97 ),
-    BYTES_TO_T_UINT_8( 0xFD, 0xC4, 0xDA, 0xC3, 0x35, 0xF8, 0x7E, 0x54 ),
+    BYTES_TO_T_UINT_8(0x97, 0x69, 0x04, 0x2F, 0xC7, 0x54, 0x1D, 0x5C),
+    BYTES_TO_T_UINT_8(0x54, 0x8E, 0xED, 0x2D, 0x13, 0x45, 0x77, 0xC2),
+    BYTES_TO_T_UINT_8(0xC9, 0x1D, 0x61, 0x14, 0x1A, 0x46, 0xF8, 0x97),
+    BYTES_TO_T_UINT_8(0xFD, 0xC4, 0xDA, 0xC3, 0x35, 0xF8, 0x7E, 0x54),
 };
 static const mbedtls_mpi_uint brainpoolP256r1_n[] = {
-    BYTES_TO_T_UINT_8( 0xA7, 0x56, 0x48, 0x97, 0x82, 0x0E, 0x1E, 0x90 ),
-    BYTES_TO_T_UINT_8( 0xF7, 0xA6, 0x61, 0xB5, 0xA3, 0x7A, 0x39, 0x8C ),
-    BYTES_TO_T_UINT_8( 0x71, 0x8D, 0x83, 0x9D, 0x90, 0x0A, 0x66, 0x3E ),
-    BYTES_TO_T_UINT_8( 0xBC, 0xA9, 0xEE, 0xA1, 0xDB, 0x57, 0xFB, 0xA9 ),
+    BYTES_TO_T_UINT_8(0xA7, 0x56, 0x48, 0x97, 0x82, 0x0E, 0x1E, 0x90),
+    BYTES_TO_T_UINT_8(0xF7, 0xA6, 0x61, 0xB5, 0xA3, 0x7A, 0x39, 0x8C),
+    BYTES_TO_T_UINT_8(0x71, 0x8D, 0x83, 0x9D, 0x90, 0x0A, 0x66, 0x3E),
+    BYTES_TO_T_UINT_8(0xBC, 0xA9, 0xEE, 0xA1, 0xDB, 0x57, 0xFB, 0xA9),
 };
 #endif /* MBEDTLS_ECP_DP_BP256R1_ENABLED */
 
@@ -436,52 +436,52 @@ static const mbedtls_mpi_uint brainpoolP256r1_n[] = {
  */
 #if defined(MBEDTLS_ECP_DP_BP384R1_ENABLED)
 static const mbedtls_mpi_uint brainpoolP384r1_p[] = {
-    BYTES_TO_T_UINT_8( 0x53, 0xEC, 0x07, 0x31, 0x13, 0x00, 0x47, 0x87 ),
-    BYTES_TO_T_UINT_8( 0x71, 0x1A, 0x1D, 0x90, 0x29, 0xA7, 0xD3, 0xAC ),
-    BYTES_TO_T_UINT_8( 0x23, 0x11, 0xB7, 0x7F, 0x19, 0xDA, 0xB1, 0x12 ),
-    BYTES_TO_T_UINT_8( 0xB4, 0x56, 0x54, 0xED, 0x09, 0x71, 0x2F, 0x15 ),
-    BYTES_TO_T_UINT_8( 0xDF, 0x41, 0xE6, 0x50, 0x7E, 0x6F, 0x5D, 0x0F ),
-    BYTES_TO_T_UINT_8( 0x28, 0x6D, 0x38, 0xA3, 0x82, 0x1E, 0xB9, 0x8C ),
+    BYTES_TO_T_UINT_8(0x53, 0xEC, 0x07, 0x31, 0x13, 0x00, 0x47, 0x87),
+    BYTES_TO_T_UINT_8(0x71, 0x1A, 0x1D, 0x90, 0x29, 0xA7, 0xD3, 0xAC),
+    BYTES_TO_T_UINT_8(0x23, 0x11, 0xB7, 0x7F, 0x19, 0xDA, 0xB1, 0x12),
+    BYTES_TO_T_UINT_8(0xB4, 0x56, 0x54, 0xED, 0x09, 0x71, 0x2F, 0x15),
+    BYTES_TO_T_UINT_8(0xDF, 0x41, 0xE6, 0x50, 0x7E, 0x6F, 0x5D, 0x0F),
+    BYTES_TO_T_UINT_8(0x28, 0x6D, 0x38, 0xA3, 0x82, 0x1E, 0xB9, 0x8C),
 };
 static const mbedtls_mpi_uint brainpoolP384r1_a[] = {
-    BYTES_TO_T_UINT_8( 0x26, 0x28, 0xCE, 0x22, 0xDD, 0xC7, 0xA8, 0x04 ),
-    BYTES_TO_T_UINT_8( 0xEB, 0xD4, 0x3A, 0x50, 0x4A, 0x81, 0xA5, 0x8A ),
-    BYTES_TO_T_UINT_8( 0x0F, 0xF9, 0x91, 0xBA, 0xEF, 0x65, 0x91, 0x13 ),
-    BYTES_TO_T_UINT_8( 0x87, 0x27, 0xB2, 0x4F, 0x8E, 0xA2, 0xBE, 0xC2 ),
-    BYTES_TO_T_UINT_8( 0xA0, 0xAF, 0x05, 0xCE, 0x0A, 0x08, 0x72, 0x3C ),
-    BYTES_TO_T_UINT_8( 0x0C, 0x15, 0x8C, 0x3D, 0xC6, 0x82, 0xC3, 0x7B ),
+    BYTES_TO_T_UINT_8(0x26, 0x28, 0xCE, 0x22, 0xDD, 0xC7, 0xA8, 0x04),
+    BYTES_TO_T_UINT_8(0xEB, 0xD4, 0x3A, 0x50, 0x4A, 0x81, 0xA5, 0x8A),
+    BYTES_TO_T_UINT_8(0x0F, 0xF9, 0x91, 0xBA, 0xEF, 0x65, 0x91, 0x13),
+    BYTES_TO_T_UINT_8(0x87, 0x27, 0xB2, 0x4F, 0x8E, 0xA2, 0xBE, 0xC2),
+    BYTES_TO_T_UINT_8(0xA0, 0xAF, 0x05, 0xCE, 0x0A, 0x08, 0x72, 0x3C),
+    BYTES_TO_T_UINT_8(0x0C, 0x15, 0x8C, 0x3D, 0xC6, 0x82, 0xC3, 0x7B),
 };
 static const mbedtls_mpi_uint brainpoolP384r1_b[] = {
-    BYTES_TO_T_UINT_8( 0x11, 0x4C, 0x50, 0xFA, 0x96, 0x86, 0xB7, 0x3A ),
-    BYTES_TO_T_UINT_8( 0x94, 0xC9, 0xDB, 0x95, 0x02, 0x39, 0xB4, 0x7C ),
-    BYTES_TO_T_UINT_8( 0xD5, 0x62, 0xEB, 0x3E, 0xA5, 0x0E, 0x88, 0x2E ),
-    BYTES_TO_T_UINT_8( 0xA6, 0xD2, 0xDC, 0x07, 0xE1, 0x7D, 0xB7, 0x2F ),
-    BYTES_TO_T_UINT_8( 0x7C, 0x44, 0xF0, 0x16, 0x54, 0xB5, 0x39, 0x8B ),
-    BYTES_TO_T_UINT_8( 0x26, 0x28, 0xCE, 0x22, 0xDD, 0xC7, 0xA8, 0x04 ),
+    BYTES_TO_T_UINT_8(0x11, 0x4C, 0x50, 0xFA, 0x96, 0x86, 0xB7, 0x3A),
+    BYTES_TO_T_UINT_8(0x94, 0xC9, 0xDB, 0x95, 0x02, 0x39, 0xB4, 0x7C),
+    BYTES_TO_T_UINT_8(0xD5, 0x62, 0xEB, 0x3E, 0xA5, 0x0E, 0x88, 0x2E),
+    BYTES_TO_T_UINT_8(0xA6, 0xD2, 0xDC, 0x07, 0xE1, 0x7D, 0xB7, 0x2F),
+    BYTES_TO_T_UINT_8(0x7C, 0x44, 0xF0, 0x16, 0x54, 0xB5, 0x39, 0x8B),
+    BYTES_TO_T_UINT_8(0x26, 0x28, 0xCE, 0x22, 0xDD, 0xC7, 0xA8, 0x04),
 };
 static const mbedtls_mpi_uint brainpoolP384r1_gx[] = {
-    BYTES_TO_T_UINT_8( 0x1E, 0xAF, 0xD4, 0x47, 0xE2, 0xB2, 0x87, 0xEF ),
-    BYTES_TO_T_UINT_8( 0xAA, 0x46, 0xD6, 0x36, 0x34, 0xE0, 0x26, 0xE8 ),
-    BYTES_TO_T_UINT_8( 0xE8, 0x10, 0xBD, 0x0C, 0xFE, 0xCA, 0x7F, 0xDB ),
-    BYTES_TO_T_UINT_8( 0xE3, 0x4F, 0xF1, 0x7E, 0xE7, 0xA3, 0x47, 0x88 ),
-    BYTES_TO_T_UINT_8( 0x6B, 0x3F, 0xC1, 0xB7, 0x81, 0x3A, 0xA6, 0xA2 ),
-    BYTES_TO_T_UINT_8( 0xFF, 0x45, 0xCF, 0x68, 0xF0, 0x64, 0x1C, 0x1D ),
+    BYTES_TO_T_UINT_8(0x1E, 0xAF, 0xD4, 0x47, 0xE2, 0xB2, 0x87, 0xEF),
+    BYTES_TO_T_UINT_8(0xAA, 0x46, 0xD6, 0x36, 0x34, 0xE0, 0x26, 0xE8),
+    BYTES_TO_T_UINT_8(0xE8, 0x10, 0xBD, 0x0C, 0xFE, 0xCA, 0x7F, 0xDB),
+    BYTES_TO_T_UINT_8(0xE3, 0x4F, 0xF1, 0x7E, 0xE7, 0xA3, 0x47, 0x88),
+    BYTES_TO_T_UINT_8(0x6B, 0x3F, 0xC1, 0xB7, 0x81, 0x3A, 0xA6, 0xA2),
+    BYTES_TO_T_UINT_8(0xFF, 0x45, 0xCF, 0x68, 0xF0, 0x64, 0x1C, 0x1D),
 };
 static const mbedtls_mpi_uint brainpoolP384r1_gy[] = {
-    BYTES_TO_T_UINT_8( 0x15, 0x53, 0x3C, 0x26, 0x41, 0x03, 0x82, 0x42 ),
-    BYTES_TO_T_UINT_8( 0x11, 0x81, 0x91, 0x77, 0x21, 0x46, 0x46, 0x0E ),
-    BYTES_TO_T_UINT_8( 0x28, 0x29, 0x91, 0xF9, 0x4F, 0x05, 0x9C, 0xE1 ),
-    BYTES_TO_T_UINT_8( 0x64, 0x58, 0xEC, 0xFE, 0x29, 0x0B, 0xB7, 0x62 ),
-    BYTES_TO_T_UINT_8( 0x52, 0xD5, 0xCF, 0x95, 0x8E, 0xEB, 0xB1, 0x5C ),
-    BYTES_TO_T_UINT_8( 0xA4, 0xC2, 0xF9, 0x20, 0x75, 0x1D, 0xBE, 0x8A ),
+    BYTES_TO_T_UINT_8(0x15, 0x53, 0x3C, 0x26, 0x41, 0x03, 0x82, 0x42),
+    BYTES_TO_T_UINT_8(0x11, 0x81, 0x91, 0x77, 0x21, 0x46, 0x46, 0x0E),
+    BYTES_TO_T_UINT_8(0x28, 0x29, 0x91, 0xF9, 0x4F, 0x05, 0x9C, 0xE1),
+    BYTES_TO_T_UINT_8(0x64, 0x58, 0xEC, 0xFE, 0x29, 0x0B, 0xB7, 0x62),
+    BYTES_TO_T_UINT_8(0x52, 0xD5, 0xCF, 0x95, 0x8E, 0xEB, 0xB1, 0x5C),
+    BYTES_TO_T_UINT_8(0xA4, 0xC2, 0xF9, 0x20, 0x75, 0x1D, 0xBE, 0x8A),
 };
 static const mbedtls_mpi_uint brainpoolP384r1_n[] = {
-    BYTES_TO_T_UINT_8( 0x65, 0x65, 0x04, 0xE9, 0x02, 0x32, 0x88, 0x3B ),
-    BYTES_TO_T_UINT_8( 0x10, 0xC3, 0x7F, 0x6B, 0xAF, 0xB6, 0x3A, 0xCF ),
-    BYTES_TO_T_UINT_8( 0xA7, 0x25, 0x04, 0xAC, 0x6C, 0x6E, 0x16, 0x1F ),
-    BYTES_TO_T_UINT_8( 0xB3, 0x56, 0x54, 0xED, 0x09, 0x71, 0x2F, 0x15 ),
-    BYTES_TO_T_UINT_8( 0xDF, 0x41, 0xE6, 0x50, 0x7E, 0x6F, 0x5D, 0x0F ),
-    BYTES_TO_T_UINT_8( 0x28, 0x6D, 0x38, 0xA3, 0x82, 0x1E, 0xB9, 0x8C ),
+    BYTES_TO_T_UINT_8(0x65, 0x65, 0x04, 0xE9, 0x02, 0x32, 0x88, 0x3B),
+    BYTES_TO_T_UINT_8(0x10, 0xC3, 0x7F, 0x6B, 0xAF, 0xB6, 0x3A, 0xCF),
+    BYTES_TO_T_UINT_8(0xA7, 0x25, 0x04, 0xAC, 0x6C, 0x6E, 0x16, 0x1F),
+    BYTES_TO_T_UINT_8(0xB3, 0x56, 0x54, 0xED, 0x09, 0x71, 0x2F, 0x15),
+    BYTES_TO_T_UINT_8(0xDF, 0x41, 0xE6, 0x50, 0x7E, 0x6F, 0x5D, 0x0F),
+    BYTES_TO_T_UINT_8(0x28, 0x6D, 0x38, 0xA3, 0x82, 0x1E, 0xB9, 0x8C),
 };
 #endif /* MBEDTLS_ECP_DP_BP384R1_ENABLED */
 
@@ -490,64 +490,64 @@ static const mbedtls_mpi_uint brainpoolP384r1_n[] = {
  */
 #if defined(MBEDTLS_ECP_DP_BP512R1_ENABLED)
 static const mbedtls_mpi_uint brainpoolP512r1_p[] = {
-    BYTES_TO_T_UINT_8( 0xF3, 0x48, 0x3A, 0x58, 0x56, 0x60, 0xAA, 0x28 ),
-    BYTES_TO_T_UINT_8( 0x85, 0xC6, 0x82, 0x2D, 0x2F, 0xFF, 0x81, 0x28 ),
-    BYTES_TO_T_UINT_8( 0xE6, 0x80, 0xA3, 0xE6, 0x2A, 0xA1, 0xCD, 0xAE ),
-    BYTES_TO_T_UINT_8( 0x42, 0x68, 0xC6, 0x9B, 0x00, 0x9B, 0x4D, 0x7D ),
-    BYTES_TO_T_UINT_8( 0x71, 0x08, 0x33, 0x70, 0xCA, 0x9C, 0x63, 0xD6 ),
-    BYTES_TO_T_UINT_8( 0x0E, 0xD2, 0xC9, 0xB3, 0xB3, 0x8D, 0x30, 0xCB ),
-    BYTES_TO_T_UINT_8( 0x07, 0xFC, 0xC9, 0x33, 0xAE, 0xE6, 0xD4, 0x3F ),
-    BYTES_TO_T_UINT_8( 0x8B, 0xC4, 0xE9, 0xDB, 0xB8, 0x9D, 0xDD, 0xAA ),
+    BYTES_TO_T_UINT_8(0xF3, 0x48, 0x3A, 0x58, 0x56, 0x60, 0xAA, 0x28),
+    BYTES_TO_T_UINT_8(0x85, 0xC6, 0x82, 0x2D, 0x2F, 0xFF, 0x81, 0x28),
+    BYTES_TO_T_UINT_8(0xE6, 0x80, 0xA3, 0xE6, 0x2A, 0xA1, 0xCD, 0xAE),
+    BYTES_TO_T_UINT_8(0x42, 0x68, 0xC6, 0x9B, 0x00, 0x9B, 0x4D, 0x7D),
+    BYTES_TO_T_UINT_8(0x71, 0x08, 0x33, 0x70, 0xCA, 0x9C, 0x63, 0xD6),
+    BYTES_TO_T_UINT_8(0x0E, 0xD2, 0xC9, 0xB3, 0xB3, 0x8D, 0x30, 0xCB),
+    BYTES_TO_T_UINT_8(0x07, 0xFC, 0xC9, 0x33, 0xAE, 0xE6, 0xD4, 0x3F),
+    BYTES_TO_T_UINT_8(0x8B, 0xC4, 0xE9, 0xDB, 0xB8, 0x9D, 0xDD, 0xAA),
 };
 static const mbedtls_mpi_uint brainpoolP512r1_a[] = {
-    BYTES_TO_T_UINT_8( 0xCA, 0x94, 0xFC, 0x77, 0x4D, 0xAC, 0xC1, 0xE7 ),
-    BYTES_TO_T_UINT_8( 0xB9, 0xC7, 0xF2, 0x2B, 0xA7, 0x17, 0x11, 0x7F ),
-    BYTES_TO_T_UINT_8( 0xB5, 0xC8, 0x9A, 0x8B, 0xC9, 0xF1, 0x2E, 0x0A ),
-    BYTES_TO_T_UINT_8( 0xA1, 0x3A, 0x25, 0xA8, 0x5A, 0x5D, 0xED, 0x2D ),
-    BYTES_TO_T_UINT_8( 0xBC, 0x63, 0x98, 0xEA, 0xCA, 0x41, 0x34, 0xA8 ),
-    BYTES_TO_T_UINT_8( 0x10, 0x16, 0xF9, 0x3D, 0x8D, 0xDD, 0xCB, 0x94 ),
-    BYTES_TO_T_UINT_8( 0xC5, 0x4C, 0x23, 0xAC, 0x45, 0x71, 0x32, 0xE2 ),
-    BYTES_TO_T_UINT_8( 0x89, 0x3B, 0x60, 0x8B, 0x31, 0xA3, 0x30, 0x78 ),
+    BYTES_TO_T_UINT_8(0xCA, 0x94, 0xFC, 0x77, 0x4D, 0xAC, 0xC1, 0xE7),
+    BYTES_TO_T_UINT_8(0xB9, 0xC7, 0xF2, 0x2B, 0xA7, 0x17, 0x11, 0x7F),
+    BYTES_TO_T_UINT_8(0xB5, 0xC8, 0x9A, 0x8B, 0xC9, 0xF1, 0x2E, 0x0A),
+    BYTES_TO_T_UINT_8(0xA1, 0x3A, 0x25, 0xA8, 0x5A, 0x5D, 0xED, 0x2D),
+    BYTES_TO_T_UINT_8(0xBC, 0x63, 0x98, 0xEA, 0xCA, 0x41, 0x34, 0xA8),
+    BYTES_TO_T_UINT_8(0x10, 0x16, 0xF9, 0x3D, 0x8D, 0xDD, 0xCB, 0x94),
+    BYTES_TO_T_UINT_8(0xC5, 0x4C, 0x23, 0xAC, 0x45, 0x71, 0x32, 0xE2),
+    BYTES_TO_T_UINT_8(0x89, 0x3B, 0x60, 0x8B, 0x31, 0xA3, 0x30, 0x78),
 };
 static const mbedtls_mpi_uint brainpoolP512r1_b[] = {
-    BYTES_TO_T_UINT_8( 0x23, 0xF7, 0x16, 0x80, 0x63, 0xBD, 0x09, 0x28 ),
-    BYTES_TO_T_UINT_8( 0xDD, 0xE5, 0xBA, 0x5E, 0xB7, 0x50, 0x40, 0x98 ),
-    BYTES_TO_T_UINT_8( 0x67, 0x3E, 0x08, 0xDC, 0xCA, 0x94, 0xFC, 0x77 ),
-    BYTES_TO_T_UINT_8( 0x4D, 0xAC, 0xC1, 0xE7, 0xB9, 0xC7, 0xF2, 0x2B ),
-    BYTES_TO_T_UINT_8( 0xA7, 0x17, 0x11, 0x7F, 0xB5, 0xC8, 0x9A, 0x8B ),
-    BYTES_TO_T_UINT_8( 0xC9, 0xF1, 0x2E, 0x0A, 0xA1, 0x3A, 0x25, 0xA8 ),
-    BYTES_TO_T_UINT_8( 0x5A, 0x5D, 0xED, 0x2D, 0xBC, 0x63, 0x98, 0xEA ),
-    BYTES_TO_T_UINT_8( 0xCA, 0x41, 0x34, 0xA8, 0x10, 0x16, 0xF9, 0x3D ),
+    BYTES_TO_T_UINT_8(0x23, 0xF7, 0x16, 0x80, 0x63, 0xBD, 0x09, 0x28),
+    BYTES_TO_T_UINT_8(0xDD, 0xE5, 0xBA, 0x5E, 0xB7, 0x50, 0x40, 0x98),
+    BYTES_TO_T_UINT_8(0x67, 0x3E, 0x08, 0xDC, 0xCA, 0x94, 0xFC, 0x77),
+    BYTES_TO_T_UINT_8(0x4D, 0xAC, 0xC1, 0xE7, 0xB9, 0xC7, 0xF2, 0x2B),
+    BYTES_TO_T_UINT_8(0xA7, 0x17, 0x11, 0x7F, 0xB5, 0xC8, 0x9A, 0x8B),
+    BYTES_TO_T_UINT_8(0xC9, 0xF1, 0x2E, 0x0A, 0xA1, 0x3A, 0x25, 0xA8),
+    BYTES_TO_T_UINT_8(0x5A, 0x5D, 0xED, 0x2D, 0xBC, 0x63, 0x98, 0xEA),
+    BYTES_TO_T_UINT_8(0xCA, 0x41, 0x34, 0xA8, 0x10, 0x16, 0xF9, 0x3D),
 };
 static const mbedtls_mpi_uint brainpoolP512r1_gx[] = {
-    BYTES_TO_T_UINT_8( 0x22, 0xF8, 0xB9, 0xBC, 0x09, 0x22, 0x35, 0x8B ),
-    BYTES_TO_T_UINT_8( 0x68, 0x5E, 0x6A, 0x40, 0x47, 0x50, 0x6D, 0x7C ),
-    BYTES_TO_T_UINT_8( 0x5F, 0x7D, 0xB9, 0x93, 0x7B, 0x68, 0xD1, 0x50 ),
-    BYTES_TO_T_UINT_8( 0x8D, 0xD4, 0xD0, 0xE2, 0x78, 0x1F, 0x3B, 0xFF ),
-    BYTES_TO_T_UINT_8( 0x8E, 0x09, 0xD0, 0xF4, 0xEE, 0x62, 0x3B, 0xB4 ),
-    BYTES_TO_T_UINT_8( 0xC1, 0x16, 0xD9, 0xB5, 0x70, 0x9F, 0xED, 0x85 ),
-    BYTES_TO_T_UINT_8( 0x93, 0x6A, 0x4C, 0x9C, 0x2E, 0x32, 0x21, 0x5A ),
-    BYTES_TO_T_UINT_8( 0x64, 0xD9, 0x2E, 0xD8, 0xBD, 0xE4, 0xAE, 0x81 ),
+    BYTES_TO_T_UINT_8(0x22, 0xF8, 0xB9, 0xBC, 0x09, 0x22, 0x35, 0x8B),
+    BYTES_TO_T_UINT_8(0x68, 0x5E, 0x6A, 0x40, 0x47, 0x50, 0x6D, 0x7C),
+    BYTES_TO_T_UINT_8(0x5F, 0x7D, 0xB9, 0x93, 0x7B, 0x68, 0xD1, 0x50),
+    BYTES_TO_T_UINT_8(0x8D, 0xD4, 0xD0, 0xE2, 0x78, 0x1F, 0x3B, 0xFF),
+    BYTES_TO_T_UINT_8(0x8E, 0x09, 0xD0, 0xF4, 0xEE, 0x62, 0x3B, 0xB4),
+    BYTES_TO_T_UINT_8(0xC1, 0x16, 0xD9, 0xB5, 0x70, 0x9F, 0xED, 0x85),
+    BYTES_TO_T_UINT_8(0x93, 0x6A, 0x4C, 0x9C, 0x2E, 0x32, 0x21, 0x5A),
+    BYTES_TO_T_UINT_8(0x64, 0xD9, 0x2E, 0xD8, 0xBD, 0xE4, 0xAE, 0x81),
 };
 static const mbedtls_mpi_uint brainpoolP512r1_gy[] = {
-    BYTES_TO_T_UINT_8( 0x92, 0x08, 0xD8, 0x3A, 0x0F, 0x1E, 0xCD, 0x78 ),
-    BYTES_TO_T_UINT_8( 0x06, 0x54, 0xF0, 0xA8, 0x2F, 0x2B, 0xCA, 0xD1 ),
-    BYTES_TO_T_UINT_8( 0xAE, 0x63, 0x27, 0x8A, 0xD8, 0x4B, 0xCA, 0x5B ),
-    BYTES_TO_T_UINT_8( 0x5E, 0x48, 0x5F, 0x4A, 0x49, 0xDE, 0xDC, 0xB2 ),
-    BYTES_TO_T_UINT_8( 0x11, 0x81, 0x1F, 0x88, 0x5B, 0xC5, 0x00, 0xA0 ),
-    BYTES_TO_T_UINT_8( 0x1A, 0x7B, 0xA5, 0x24, 0x00, 0xF7, 0x09, 0xF2 ),
-    BYTES_TO_T_UINT_8( 0xFD, 0x22, 0x78, 0xCF, 0xA9, 0xBF, 0xEA, 0xC0 ),
-    BYTES_TO_T_UINT_8( 0xEC, 0x32, 0x63, 0x56, 0x5D, 0x38, 0xDE, 0x7D ),
+    BYTES_TO_T_UINT_8(0x92, 0x08, 0xD8, 0x3A, 0x0F, 0x1E, 0xCD, 0x78),
+    BYTES_TO_T_UINT_8(0x06, 0x54, 0xF0, 0xA8, 0x2F, 0x2B, 0xCA, 0xD1),
+    BYTES_TO_T_UINT_8(0xAE, 0x63, 0x27, 0x8A, 0xD8, 0x4B, 0xCA, 0x5B),
+    BYTES_TO_T_UINT_8(0x5E, 0x48, 0x5F, 0x4A, 0x49, 0xDE, 0xDC, 0xB2),
+    BYTES_TO_T_UINT_8(0x11, 0x81, 0x1F, 0x88, 0x5B, 0xC5, 0x00, 0xA0),
+    BYTES_TO_T_UINT_8(0x1A, 0x7B, 0xA5, 0x24, 0x00, 0xF7, 0x09, 0xF2),
+    BYTES_TO_T_UINT_8(0xFD, 0x22, 0x78, 0xCF, 0xA9, 0xBF, 0xEA, 0xC0),
+    BYTES_TO_T_UINT_8(0xEC, 0x32, 0x63, 0x56, 0x5D, 0x38, 0xDE, 0x7D),
 };
 static const mbedtls_mpi_uint brainpoolP512r1_n[] = {
-    BYTES_TO_T_UINT_8( 0x69, 0x00, 0xA9, 0x9C, 0x82, 0x96, 0x87, 0xB5 ),
-    BYTES_TO_T_UINT_8( 0xDD, 0xDA, 0x5D, 0x08, 0x81, 0xD3, 0xB1, 0x1D ),
-    BYTES_TO_T_UINT_8( 0x47, 0x10, 0xAC, 0x7F, 0x19, 0x61, 0x86, 0x41 ),
-    BYTES_TO_T_UINT_8( 0x19, 0x26, 0xA9, 0x4C, 0x41, 0x5C, 0x3E, 0x55 ),
-    BYTES_TO_T_UINT_8( 0x70, 0x08, 0x33, 0x70, 0xCA, 0x9C, 0x63, 0xD6 ),
-    BYTES_TO_T_UINT_8( 0x0E, 0xD2, 0xC9, 0xB3, 0xB3, 0x8D, 0x30, 0xCB ),
-    BYTES_TO_T_UINT_8( 0x07, 0xFC, 0xC9, 0x33, 0xAE, 0xE6, 0xD4, 0x3F ),
-    BYTES_TO_T_UINT_8( 0x8B, 0xC4, 0xE9, 0xDB, 0xB8, 0x9D, 0xDD, 0xAA ),
+    BYTES_TO_T_UINT_8(0x69, 0x00, 0xA9, 0x9C, 0x82, 0x96, 0x87, 0xB5),
+    BYTES_TO_T_UINT_8(0xDD, 0xDA, 0x5D, 0x08, 0x81, 0xD3, 0xB1, 0x1D),
+    BYTES_TO_T_UINT_8(0x47, 0x10, 0xAC, 0x7F, 0x19, 0x61, 0x86, 0x41),
+    BYTES_TO_T_UINT_8(0x19, 0x26, 0xA9, 0x4C, 0x41, 0x5C, 0x3E, 0x55),
+    BYTES_TO_T_UINT_8(0x70, 0x08, 0x33, 0x70, 0xCA, 0x9C, 0x63, 0xD6),
+    BYTES_TO_T_UINT_8(0x0E, 0xD2, 0xC9, 0xB3, 0xB3, 0x8D, 0x30, 0xCB),
+    BYTES_TO_T_UINT_8(0x07, 0xFC, 0xC9, 0x33, 0xAE, 0xE6, 0xD4, 0x3F),
+    BYTES_TO_T_UINT_8(0x8B, 0xC4, 0xE9, 0xDB, 0xB8, 0x9D, 0xDD, 0xAA),
 };
 #endif /* MBEDTLS_ECP_DP_BP512R1_ENABLED */
 
@@ -555,17 +555,17 @@ static const mbedtls_mpi_uint brainpoolP512r1_n[] = {
  * Create an MPI from embedded constants
  * (assumes len is an exact multiple of sizeof mbedtls_mpi_uint)
  */
-static inline void ecp_mpi_load( mbedtls_mpi *X, const mbedtls_mpi_uint *p, size_t len )
+static inline void ecp_mpi_load(mbedtls_mpi *X, const mbedtls_mpi_uint *p, size_t len)
 {
     X->s = 1;
-    X->n = len / sizeof( mbedtls_mpi_uint );
+    X->n = len / sizeof(mbedtls_mpi_uint);
     X->p = (mbedtls_mpi_uint *) p;
 }
 
 /*
  * Set an MPI to static value 1
  */
-static inline void ecp_mpi_set1( mbedtls_mpi *X )
+static inline void ecp_mpi_set1(mbedtls_mpi *X)
 {
     static mbedtls_mpi_uint one[] = { 1 };
     X->s = 1;
@@ -576,48 +576,48 @@ static inline void ecp_mpi_set1( mbedtls_mpi *X )
 /*
  * Make group available from embedded constants
  */
-static int ecp_group_load( mbedtls_ecp_group *grp,
-                           const mbedtls_mpi_uint *p,  size_t plen,
-                           const mbedtls_mpi_uint *a,  size_t alen,
-                           const mbedtls_mpi_uint *b,  size_t blen,
-                           const mbedtls_mpi_uint *gx, size_t gxlen,
-                           const mbedtls_mpi_uint *gy, size_t gylen,
-                           const mbedtls_mpi_uint *n,  size_t nlen)
+static int ecp_group_load(mbedtls_ecp_group *grp,
+                          const mbedtls_mpi_uint *p,  size_t plen,
+                          const mbedtls_mpi_uint *a,  size_t alen,
+                          const mbedtls_mpi_uint *b,  size_t blen,
+                          const mbedtls_mpi_uint *gx, size_t gxlen,
+                          const mbedtls_mpi_uint *gy, size_t gylen,
+                          const mbedtls_mpi_uint *n,  size_t nlen)
 {
-    ecp_mpi_load( &grp->P, p, plen );
-    if( a != NULL )
-        ecp_mpi_load( &grp->A, a, alen );
-    ecp_mpi_load( &grp->B, b, blen );
-    ecp_mpi_load( &grp->N, n, nlen );
+    ecp_mpi_load(&grp->P, p, plen);
+    if (a != NULL)
+        ecp_mpi_load(&grp->A, a, alen);
+    ecp_mpi_load(&grp->B, b, blen);
+    ecp_mpi_load(&grp->N, n, nlen);
 
-    ecp_mpi_load( &grp->G.X, gx, gxlen );
-    ecp_mpi_load( &grp->G.Y, gy, gylen );
-    ecp_mpi_set1( &grp->G.Z );
+    ecp_mpi_load(&grp->G.X, gx, gxlen);
+    ecp_mpi_load(&grp->G.Y, gy, gylen);
+    ecp_mpi_set1(&grp->G.Z);
 
-    grp->pbits = mbedtls_mpi_bitlen( &grp->P );
-    grp->nbits = mbedtls_mpi_bitlen( &grp->N );
+    grp->pbits = mbedtls_mpi_bitlen(&grp->P);
+    grp->nbits = mbedtls_mpi_bitlen(&grp->N);
 
     grp->h = 1;
 
-    return( 0 );
+    return (0);
 }
 
 #if defined(MBEDTLS_ECP_NIST_OPTIM)
 /* Forward declarations */
 #if defined(MBEDTLS_ECP_DP_SECP192R1_ENABLED)
-static int ecp_mod_p192( mbedtls_mpi * );
+static int ecp_mod_p192(mbedtls_mpi *);
 #endif
 #if defined(MBEDTLS_ECP_DP_SECP224R1_ENABLED)
-static int ecp_mod_p224( mbedtls_mpi * );
+static int ecp_mod_p224(mbedtls_mpi *);
 #endif
 #if defined(MBEDTLS_ECP_DP_SECP256R1_ENABLED)
-static int ecp_mod_p256( mbedtls_mpi * );
+static int ecp_mod_p256(mbedtls_mpi *);
 #endif
 #if defined(MBEDTLS_ECP_DP_SECP384R1_ENABLED)
-static int ecp_mod_p384( mbedtls_mpi * );
+static int ecp_mod_p384(mbedtls_mpi *);
 #endif
 #if defined(MBEDTLS_ECP_DP_SECP521R1_ENABLED)
-static int ecp_mod_p521( mbedtls_mpi * );
+static int ecp_mod_p521(mbedtls_mpi *);
 #endif
 
 #define NIST_MODP( P )      grp->modp = ecp_mod_ ## P;
@@ -627,73 +627,73 @@ static int ecp_mod_p521( mbedtls_mpi * );
 
 /* Additional forward declarations */
 #if defined(MBEDTLS_ECP_DP_CURVE25519_ENABLED)
-static int ecp_mod_p255( mbedtls_mpi * );
+static int ecp_mod_p255(mbedtls_mpi *);
 #endif
 #if defined(MBEDTLS_ECP_DP_CURVE448_ENABLED)
-static int ecp_mod_p448( mbedtls_mpi * );
+static int ecp_mod_p448(mbedtls_mpi *);
 #endif
 #if defined(MBEDTLS_ECP_DP_SECP192K1_ENABLED)
-static int ecp_mod_p192k1( mbedtls_mpi * );
+static int ecp_mod_p192k1(mbedtls_mpi *);
 #endif
 #if defined(MBEDTLS_ECP_DP_SECP224K1_ENABLED)
-static int ecp_mod_p224k1( mbedtls_mpi * );
+static int ecp_mod_p224k1(mbedtls_mpi *);
 #endif
 #if defined(MBEDTLS_ECP_DP_SECP256K1_ENABLED)
-static int ecp_mod_p256k1( mbedtls_mpi * );
+static int ecp_mod_p256k1(mbedtls_mpi *);
 #endif
 
 #define LOAD_GROUP_A( G )   ecp_group_load( grp,            \
-                            G ## _p,  sizeof( G ## _p  ),   \
-                            G ## _a,  sizeof( G ## _a  ),   \
-                            G ## _b,  sizeof( G ## _b  ),   \
-                            G ## _gx, sizeof( G ## _gx ),   \
-                            G ## _gy, sizeof( G ## _gy ),   \
-                            G ## _n,  sizeof( G ## _n  ) )
+                                            G ## _p,  sizeof( G ## _p  ),   \
+                                            G ## _a,  sizeof( G ## _a  ),   \
+                                            G ## _b,  sizeof( G ## _b  ),   \
+                                            G ## _gx, sizeof( G ## _gx ),   \
+                                            G ## _gy, sizeof( G ## _gy ),   \
+                                            G ## _n,  sizeof( G ## _n  ) )
 
 #define LOAD_GROUP( G )     ecp_group_load( grp,            \
-                            G ## _p,  sizeof( G ## _p  ),   \
-                            NULL,     0,                    \
-                            G ## _b,  sizeof( G ## _b  ),   \
-                            G ## _gx, sizeof( G ## _gx ),   \
-                            G ## _gy, sizeof( G ## _gy ),   \
-                            G ## _n,  sizeof( G ## _n  ) )
+                                            G ## _p,  sizeof( G ## _p  ),   \
+                                            NULL,     0,                    \
+                                            G ## _b,  sizeof( G ## _b  ),   \
+                                            G ## _gx, sizeof( G ## _gx ),   \
+                                            G ## _gy, sizeof( G ## _gy ),   \
+                                            G ## _n,  sizeof( G ## _n  ) )
 
 #if defined(MBEDTLS_ECP_DP_CURVE25519_ENABLED)
 /*
  * Specialized function for creating the Curve25519 group
  */
-static int ecp_use_curve25519( mbedtls_ecp_group *grp )
+static int ecp_use_curve25519(mbedtls_ecp_group *grp)
 {
     int ret;
 
     /* Actually ( A + 2 ) / 4 */
-    MBEDTLS_MPI_CHK( mbedtls_mpi_read_string( &grp->A, 16, "01DB42" ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_read_string(&grp->A, 16, "01DB42"));
 
     /* P = 2^255 - 19 */
-    MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &grp->P, 1 ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_shift_l( &grp->P, 255 ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_sub_int( &grp->P, &grp->P, 19 ) );
-    grp->pbits = mbedtls_mpi_bitlen( &grp->P );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_lset(&grp->P, 1));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_shift_l(&grp->P, 255));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_sub_int(&grp->P, &grp->P, 19));
+    grp->pbits = mbedtls_mpi_bitlen(&grp->P);
 
     /* N = 2^252 + 27742317777372353535851937790883648493 */
-    MBEDTLS_MPI_CHK( mbedtls_mpi_read_string( &grp->N, 16,
-                                              "14DEF9DEA2F79CD65812631A5CF5D3ED" ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_set_bit( &grp->N, 252, 1 ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_read_string(&grp->N, 16,
+                                            "14DEF9DEA2F79CD65812631A5CF5D3ED"));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_set_bit(&grp->N, 252, 1));
 
     /* Y intentionally not set, since we use x/z coordinates.
      * This is used as a marker to identify Montgomery curves! */
-    MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &grp->G.X, 9 ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &grp->G.Z, 1 ) );
-    mbedtls_mpi_free( &grp->G.Y );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_lset(&grp->G.X, 9));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_lset(&grp->G.Z, 1));
+    mbedtls_mpi_free(&grp->G.Y);
 
     /* Actually, the required msb for private keys */
     grp->nbits = 254;
 
 cleanup:
-    if( ret != 0 )
-        mbedtls_ecp_group_free( grp );
+    if (ret != 0)
+        mbedtls_ecp_group_free(grp);
 
-    return( ret );
+    return (ret);
 }
 #endif /* MBEDTLS_ECP_DP_CURVE25519_ENABLED */
 
@@ -701,137 +701,136 @@ cleanup:
 /*
  * Specialized function for creating the Curve448 group
  */
-static int ecp_use_curve448( mbedtls_ecp_group *grp )
+static int ecp_use_curve448(mbedtls_ecp_group *grp)
 {
     mbedtls_mpi Ns;
     int ret;
 
-    mbedtls_mpi_init( &Ns );
+    mbedtls_mpi_init(&Ns);
 
     /* Actually ( A + 2 ) / 4 */
-    MBEDTLS_MPI_CHK( mbedtls_mpi_read_string( &grp->A, 16, "98AA" ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_read_string(&grp->A, 16, "98AA"));
 
     /* P = 2^448 - 2^224 - 1 */
-    MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &grp->P, 1 ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_shift_l( &grp->P, 224 ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_sub_int( &grp->P, &grp->P, 1 ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_shift_l( &grp->P, 224 ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_sub_int( &grp->P, &grp->P, 1 ) );
-    grp->pbits = mbedtls_mpi_bitlen( &grp->P );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_lset(&grp->P, 1));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_shift_l(&grp->P, 224));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_sub_int(&grp->P, &grp->P, 1));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_shift_l(&grp->P, 224));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_sub_int(&grp->P, &grp->P, 1));
+    grp->pbits = mbedtls_mpi_bitlen(&grp->P);
 
     /* Y intentionally not set, since we use x/z coordinates.
      * This is used as a marker to identify Montgomery curves! */
-    MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &grp->G.X, 5 ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &grp->G.Z, 1 ) );
-    mbedtls_mpi_free( &grp->G.Y );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_lset(&grp->G.X, 5));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_lset(&grp->G.Z, 1));
+    mbedtls_mpi_free(&grp->G.Y);
 
     /* N = 2^446 - 13818066809895115352007386748515426880336692474882178609894547503885 */
-    MBEDTLS_MPI_CHK( mbedtls_mpi_set_bit( &grp->N, 446, 1 ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_read_string( &Ns, 16,
-                                              "8335DC163BB124B65129C96FDE933D8D723A70AADC873D6D54A7BB0D" ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &grp->N, &grp->N, &Ns ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_set_bit(&grp->N, 446, 1));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_read_string(&Ns, 16,
+                                            "8335DC163BB124B65129C96FDE933D8D723A70AADC873D6D54A7BB0D"));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_sub_mpi(&grp->N, &grp->N, &Ns));
 
     /* Actually, the required msb for private keys */
     grp->nbits = 447;
 
 cleanup:
-    mbedtls_mpi_free( &Ns );
-    if( ret != 0 )
-        mbedtls_ecp_group_free( grp );
+    mbedtls_mpi_free(&Ns);
+    if (ret != 0)
+        mbedtls_ecp_group_free(grp);
 
-    return( ret );
+    return (ret);
 }
 #endif /* MBEDTLS_ECP_DP_CURVE448_ENABLED */
 
 /*
  * Set a group using well-known domain parameters
  */
-int mbedtls_ecp_group_load( mbedtls_ecp_group *grp, mbedtls_ecp_group_id id )
+int mbedtls_ecp_group_load(mbedtls_ecp_group *grp, mbedtls_ecp_group_id id)
 {
-    mbedtls_ecp_group_free( grp );
+    mbedtls_ecp_group_free(grp);
 
     grp->id = id;
 
-    switch( id )
-    {
+    switch (id) {
 #if defined(MBEDTLS_ECP_DP_SECP192R1_ENABLED)
         case MBEDTLS_ECP_DP_SECP192R1:
-            NIST_MODP( p192 );
-            return( LOAD_GROUP( secp192r1 ) );
+            NIST_MODP(p192);
+            return (LOAD_GROUP(secp192r1));
 #endif /* MBEDTLS_ECP_DP_SECP192R1_ENABLED */
 
 #if defined(MBEDTLS_ECP_DP_SECP224R1_ENABLED)
         case MBEDTLS_ECP_DP_SECP224R1:
-            NIST_MODP( p224 );
-            return( LOAD_GROUP( secp224r1 ) );
+            NIST_MODP(p224);
+            return (LOAD_GROUP(secp224r1));
 #endif /* MBEDTLS_ECP_DP_SECP224R1_ENABLED */
 
 #if defined(MBEDTLS_ECP_DP_SECP256R1_ENABLED)
         case MBEDTLS_ECP_DP_SECP256R1:
-            NIST_MODP( p256 );
-            return( LOAD_GROUP( secp256r1 ) );
+            NIST_MODP(p256);
+            return (LOAD_GROUP(secp256r1));
 #endif /* MBEDTLS_ECP_DP_SECP256R1_ENABLED */
 
 #if defined(MBEDTLS_ECP_DP_SECP384R1_ENABLED)
         case MBEDTLS_ECP_DP_SECP384R1:
-            NIST_MODP( p384 );
-            return( LOAD_GROUP( secp384r1 ) );
+            NIST_MODP(p384);
+            return (LOAD_GROUP(secp384r1));
 #endif /* MBEDTLS_ECP_DP_SECP384R1_ENABLED */
 
 #if defined(MBEDTLS_ECP_DP_SECP521R1_ENABLED)
         case MBEDTLS_ECP_DP_SECP521R1:
-            NIST_MODP( p521 );
-            return( LOAD_GROUP( secp521r1 ) );
+            NIST_MODP(p521);
+            return (LOAD_GROUP(secp521r1));
 #endif /* MBEDTLS_ECP_DP_SECP521R1_ENABLED */
 
 #if defined(MBEDTLS_ECP_DP_SECP192K1_ENABLED)
         case MBEDTLS_ECP_DP_SECP192K1:
             grp->modp = ecp_mod_p192k1;
-            return( LOAD_GROUP_A( secp192k1 ) );
+            return (LOAD_GROUP_A(secp192k1));
 #endif /* MBEDTLS_ECP_DP_SECP192K1_ENABLED */
 
 #if defined(MBEDTLS_ECP_DP_SECP224K1_ENABLED)
         case MBEDTLS_ECP_DP_SECP224K1:
             grp->modp = ecp_mod_p224k1;
-            return( LOAD_GROUP_A( secp224k1 ) );
+            return (LOAD_GROUP_A(secp224k1));
 #endif /* MBEDTLS_ECP_DP_SECP224K1_ENABLED */
 
 #if defined(MBEDTLS_ECP_DP_SECP256K1_ENABLED)
         case MBEDTLS_ECP_DP_SECP256K1:
             grp->modp = ecp_mod_p256k1;
-            return( LOAD_GROUP_A( secp256k1 ) );
+            return (LOAD_GROUP_A(secp256k1));
 #endif /* MBEDTLS_ECP_DP_SECP256K1_ENABLED */
 
 #if defined(MBEDTLS_ECP_DP_BP256R1_ENABLED)
         case MBEDTLS_ECP_DP_BP256R1:
-            return( LOAD_GROUP_A( brainpoolP256r1 ) );
+            return (LOAD_GROUP_A(brainpoolP256r1));
 #endif /* MBEDTLS_ECP_DP_BP256R1_ENABLED */
 
 #if defined(MBEDTLS_ECP_DP_BP384R1_ENABLED)
         case MBEDTLS_ECP_DP_BP384R1:
-            return( LOAD_GROUP_A( brainpoolP384r1 ) );
+            return (LOAD_GROUP_A(brainpoolP384r1));
 #endif /* MBEDTLS_ECP_DP_BP384R1_ENABLED */
 
 #if defined(MBEDTLS_ECP_DP_BP512R1_ENABLED)
         case MBEDTLS_ECP_DP_BP512R1:
-            return( LOAD_GROUP_A( brainpoolP512r1 ) );
+            return (LOAD_GROUP_A(brainpoolP512r1));
 #endif /* MBEDTLS_ECP_DP_BP512R1_ENABLED */
 
 #if defined(MBEDTLS_ECP_DP_CURVE25519_ENABLED)
         case MBEDTLS_ECP_DP_CURVE25519:
             grp->modp = ecp_mod_p255;
-            return( ecp_use_curve25519( grp ) );
+            return (ecp_use_curve25519(grp));
 #endif /* MBEDTLS_ECP_DP_CURVE25519_ENABLED */
 
 #if defined(MBEDTLS_ECP_DP_CURVE448_ENABLED)
         case MBEDTLS_ECP_DP_CURVE448:
             grp->modp = ecp_mod_p448;
-            return( ecp_use_curve448( grp ) );
+            return (ecp_use_curve448(grp));
 #endif /* MBEDTLS_ECP_DP_CURVE448_ENABLED */
 
         default:
-            mbedtls_ecp_group_free( grp );
-            return( MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE );
+            mbedtls_ecp_group_free(grp);
+            return (MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE);
     }
 }
 
@@ -860,26 +859,26 @@ int mbedtls_ecp_group_load( mbedtls_ecp_group *grp, mbedtls_ecp_group_id id )
  */
 
 /* Add 64-bit chunks (dst += src) and update carry */
-static inline void add64( mbedtls_mpi_uint *dst, mbedtls_mpi_uint *src, mbedtls_mpi_uint *carry )
+static inline void add64(mbedtls_mpi_uint *dst, mbedtls_mpi_uint *src, mbedtls_mpi_uint *carry)
 {
     unsigned char i;
     mbedtls_mpi_uint c = 0;
-    for( i = 0; i < 8 / sizeof( mbedtls_mpi_uint ); i++, dst++, src++ )
-    {
-        *dst += c;      c  = ( *dst < c );
-        *dst += *src;   c += ( *dst < *src );
+    for (i = 0; i < 8 / sizeof(mbedtls_mpi_uint); i++, dst++, src++) {
+        *dst += c;
+        c  = (*dst < c);
+        *dst += *src;
+        c += (*dst < *src);
     }
     *carry += c;
 }
 
 /* Add carry to a 64-bit chunk and update carry */
-static inline void carry64( mbedtls_mpi_uint *dst, mbedtls_mpi_uint *carry )
+static inline void carry64(mbedtls_mpi_uint *dst, mbedtls_mpi_uint *carry)
 {
     unsigned char i;
-    for( i = 0; i < 8 / sizeof( mbedtls_mpi_uint ); i++, dst++ )
-    {
+    for (i = 0; i < 8 / sizeof(mbedtls_mpi_uint); i++, dst++) {
         *dst += *carry;
-        *carry  = ( *dst < *carry );
+        *carry  = (*dst < *carry);
     }
 }
 
@@ -892,24 +891,31 @@ static inline void carry64( mbedtls_mpi_uint *dst, mbedtls_mpi_uint *carry )
 /*
  * Fast quasi-reduction modulo p192 (FIPS 186-3 D.2.1)
  */
-static int ecp_mod_p192( mbedtls_mpi *N )
+static int ecp_mod_p192(mbedtls_mpi *N)
 {
     int ret;
     mbedtls_mpi_uint c = 0;
     mbedtls_mpi_uint *p, *end;
 
     /* Make sure we have enough blocks so that A(5) is legal */
-    MBEDTLS_MPI_CHK( mbedtls_mpi_grow( N, 6 * WIDTH ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_grow(N, 6 * WIDTH));
 
     p = N->p;
     end = p + N->n;
 
-    ADD( 3 ); ADD( 5 );             NEXT; // A0 += A3 + A5
-    ADD( 3 ); ADD( 4 ); ADD( 5 );   NEXT; // A1 += A3 + A4 + A5
-    ADD( 4 ); ADD( 5 );             LAST; // A2 += A4 + A5
+    ADD(3);
+    ADD(5);
+    NEXT; // A0 += A3 + A5
+    ADD(3);
+    ADD(4);
+    ADD(5);
+    NEXT; // A1 += A3 + A4 + A5
+    ADD(4);
+    ADD(5);
+    LAST; // A2 += A4 + A5
 
 cleanup:
-    return( ret );
+    return (ret);
 }
 
 #undef WIDTH
@@ -964,15 +970,15 @@ cleanup:
 /*
  * Helpers for addition and subtraction of chunks, with signed carry.
  */
-static inline void add32( uint32_t *dst, uint32_t src, signed char *carry )
+static inline void add32(uint32_t *dst, uint32_t src, signed char *carry)
 {
     *dst += src;
-    *carry += ( *dst < src );
+    *carry += (*dst < src);
 }
 
-static inline void sub32( uint32_t *dst, uint32_t src, signed char *carry )
+static inline void sub32(uint32_t *dst, uint32_t src, signed char *carry)
 {
-    *carry -= ( *dst < src );
+    *carry -= (*dst < src);
     *dst -= src;
 }
 
@@ -990,12 +996,12 @@ static inline void sub32( uint32_t *dst, uint32_t src, signed char *carry )
     size_t i = 0, bits = b;                                 \
     mbedtls_mpi C;                                                  \
     mbedtls_mpi_uint Cp[ b / 8 / sizeof( mbedtls_mpi_uint) + 1 ];               \
-                                                            \
+    \
     C.s = 1;                                                \
     C.n = b / 8 / sizeof( mbedtls_mpi_uint) + 1;                      \
     C.p = Cp;                                               \
     memset( Cp, 0, C.n * sizeof( mbedtls_mpi_uint ) );                \
-                                                            \
+    \
     MBEDTLS_MPI_CHK( mbedtls_mpi_grow( N, b * 2 / 8 / sizeof( mbedtls_mpi_uint ) ) ); \
     LOAD32;
 
@@ -1017,7 +1023,7 @@ static inline void sub32( uint32_t *dst, uint32_t src, signed char *carry )
  * If the result is negative, we get it in the form
  * c * 2^(bits + 32) + N, with c negative and N positive shorter than 'bits'
  */
-static inline int fix_negative( mbedtls_mpi *N, signed char c, mbedtls_mpi *C, size_t bits )
+static inline int fix_negative(mbedtls_mpi *N, signed char c, mbedtls_mpi *C, size_t bits)
 {
     int ret;
 
@@ -1025,39 +1031,56 @@ static inline int fix_negative( mbedtls_mpi *N, signed char c, mbedtls_mpi *C, s
 #if !defined(MBEDTLS_HAVE_INT64)
     ((void) bits);
 #else
-    if( bits == 224 )
-        C->p[ C->n - 1 ] = ((mbedtls_mpi_uint) -c) << 32;
+    if (bits == 224)
+        C->p[ C->n - 1 ] = ((mbedtls_mpi_uint) - c) << 32;
     else
 #endif
-        C->p[ C->n - 1 ] = (mbedtls_mpi_uint) -c;
+    C->p[ C->n - 1 ] = (mbedtls_mpi_uint) - c;
 
     /* N = - ( C - N ) */
-    MBEDTLS_MPI_CHK( mbedtls_mpi_sub_abs( N, C, N ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_sub_abs(N, C, N));
     N->s = -1;
 
 cleanup:
 
-    return( ret );
+    return (ret);
 }
 
 #if defined(MBEDTLS_ECP_DP_SECP224R1_ENABLED)
 /*
  * Fast quasi-reduction modulo p224 (FIPS 186-3 D.2.2)
  */
-static int ecp_mod_p224( mbedtls_mpi *N )
+static int ecp_mod_p224(mbedtls_mpi *N)
 {
-    INIT( 224 );
+    INIT(224);
 
-    SUB(  7 ); SUB( 11 );               NEXT; // A0 += -A7 - A11
-    SUB(  8 ); SUB( 12 );               NEXT; // A1 += -A8 - A12
-    SUB(  9 ); SUB( 13 );               NEXT; // A2 += -A9 - A13
-    SUB( 10 ); ADD(  7 ); ADD( 11 );    NEXT; // A3 += -A10 + A7 + A11
-    SUB( 11 ); ADD(  8 ); ADD( 12 );    NEXT; // A4 += -A11 + A8 + A12
-    SUB( 12 ); ADD(  9 ); ADD( 13 );    NEXT; // A5 += -A12 + A9 + A13
-    SUB( 13 ); ADD( 10 );               LAST; // A6 += -A13 + A10
+    SUB(7);
+    SUB(11);
+    NEXT; // A0 += -A7 - A11
+    SUB(8);
+    SUB(12);
+    NEXT; // A1 += -A8 - A12
+    SUB(9);
+    SUB(13);
+    NEXT; // A2 += -A9 - A13
+    SUB(10);
+    ADD(7);
+    ADD(11);
+    NEXT; // A3 += -A10 + A7 + A11
+    SUB(11);
+    ADD(8);
+    ADD(12);
+    NEXT; // A4 += -A11 + A8 + A12
+    SUB(12);
+    ADD(9);
+    ADD(13);
+    NEXT; // A5 += -A12 + A9 + A13
+    SUB(13);
+    ADD(10);
+    LAST; // A6 += -A13 + A10
 
 cleanup:
-    return( ret );
+    return (ret);
 }
 #endif /* MBEDTLS_ECP_DP_SECP224R1_ENABLED */
 
@@ -1065,36 +1088,83 @@ cleanup:
 /*
  * Fast quasi-reduction modulo p256 (FIPS 186-3 D.2.3)
  */
-static int ecp_mod_p256( mbedtls_mpi *N )
+static int ecp_mod_p256(mbedtls_mpi *N)
 {
-    INIT( 256 );
+    INIT(256);
 
-    ADD(  8 ); ADD(  9 );
-    SUB( 11 ); SUB( 12 ); SUB( 13 ); SUB( 14 );             NEXT; // A0
+    ADD(8);
+    ADD(9);
+    SUB(11);
+    SUB(12);
+    SUB(13);
+    SUB(14);
+    NEXT; // A0
 
-    ADD(  9 ); ADD( 10 );
-    SUB( 12 ); SUB( 13 ); SUB( 14 ); SUB( 15 );             NEXT; // A1
+    ADD(9);
+    ADD(10);
+    SUB(12);
+    SUB(13);
+    SUB(14);
+    SUB(15);
+    NEXT; // A1
 
-    ADD( 10 ); ADD( 11 );
-    SUB( 13 ); SUB( 14 ); SUB( 15 );                        NEXT; // A2
+    ADD(10);
+    ADD(11);
+    SUB(13);
+    SUB(14);
+    SUB(15);
+    NEXT; // A2
 
-    ADD( 11 ); ADD( 11 ); ADD( 12 ); ADD( 12 ); ADD( 13 );
-    SUB( 15 ); SUB(  8 ); SUB(  9 );                        NEXT; // A3
+    ADD(11);
+    ADD(11);
+    ADD(12);
+    ADD(12);
+    ADD(13);
+    SUB(15);
+    SUB(8);
+    SUB(9);
+    NEXT; // A3
 
-    ADD( 12 ); ADD( 12 ); ADD( 13 ); ADD( 13 ); ADD( 14 );
-    SUB(  9 ); SUB( 10 );                                   NEXT; // A4
+    ADD(12);
+    ADD(12);
+    ADD(13);
+    ADD(13);
+    ADD(14);
+    SUB(9);
+    SUB(10);
+    NEXT; // A4
 
-    ADD( 13 ); ADD( 13 ); ADD( 14 ); ADD( 14 ); ADD( 15 );
-    SUB( 10 ); SUB( 11 );                                   NEXT; // A5
+    ADD(13);
+    ADD(13);
+    ADD(14);
+    ADD(14);
+    ADD(15);
+    SUB(10);
+    SUB(11);
+    NEXT; // A5
 
-    ADD( 14 ); ADD( 14 ); ADD( 15 ); ADD( 15 ); ADD( 14 ); ADD( 13 );
-    SUB(  8 ); SUB(  9 );                                   NEXT; // A6
+    ADD(14);
+    ADD(14);
+    ADD(15);
+    ADD(15);
+    ADD(14);
+    ADD(13);
+    SUB(8);
+    SUB(9);
+    NEXT; // A6
 
-    ADD( 15 ); ADD( 15 ); ADD( 15 ); ADD( 8 );
-    SUB( 10 ); SUB( 11 ); SUB( 12 ); SUB( 13 );             LAST; // A7
+    ADD(15);
+    ADD(15);
+    ADD(15);
+    ADD(8);
+    SUB(10);
+    SUB(11);
+    SUB(12);
+    SUB(13);
+    LAST; // A7
 
 cleanup:
-    return( ret );
+    return (ret);
 }
 #endif /* MBEDTLS_ECP_DP_SECP256R1_ENABLED */
 
@@ -1102,48 +1172,102 @@ cleanup:
 /*
  * Fast quasi-reduction modulo p384 (FIPS 186-3 D.2.4)
  */
-static int ecp_mod_p384( mbedtls_mpi *N )
+static int ecp_mod_p384(mbedtls_mpi *N)
 {
-    INIT( 384 );
+    INIT(384);
 
-    ADD( 12 ); ADD( 21 ); ADD( 20 );
-    SUB( 23 );                                              NEXT; // A0
+    ADD(12);
+    ADD(21);
+    ADD(20);
+    SUB(23);
+    NEXT; // A0
 
-    ADD( 13 ); ADD( 22 ); ADD( 23 );
-    SUB( 12 ); SUB( 20 );                                   NEXT; // A2
+    ADD(13);
+    ADD(22);
+    ADD(23);
+    SUB(12);
+    SUB(20);
+    NEXT; // A2
 
-    ADD( 14 ); ADD( 23 );
-    SUB( 13 ); SUB( 21 );                                   NEXT; // A2
+    ADD(14);
+    ADD(23);
+    SUB(13);
+    SUB(21);
+    NEXT; // A2
 
-    ADD( 15 ); ADD( 12 ); ADD( 20 ); ADD( 21 );
-    SUB( 14 ); SUB( 22 ); SUB( 23 );                        NEXT; // A3
+    ADD(15);
+    ADD(12);
+    ADD(20);
+    ADD(21);
+    SUB(14);
+    SUB(22);
+    SUB(23);
+    NEXT; // A3
 
-    ADD( 21 ); ADD( 21 ); ADD( 16 ); ADD( 13 ); ADD( 12 ); ADD( 20 ); ADD( 22 );
-    SUB( 15 ); SUB( 23 ); SUB( 23 );                        NEXT; // A4
+    ADD(21);
+    ADD(21);
+    ADD(16);
+    ADD(13);
+    ADD(12);
+    ADD(20);
+    ADD(22);
+    SUB(15);
+    SUB(23);
+    SUB(23);
+    NEXT; // A4
 
-    ADD( 22 ); ADD( 22 ); ADD( 17 ); ADD( 14 ); ADD( 13 ); ADD( 21 ); ADD( 23 );
-    SUB( 16 );                                              NEXT; // A5
+    ADD(22);
+    ADD(22);
+    ADD(17);
+    ADD(14);
+    ADD(13);
+    ADD(21);
+    ADD(23);
+    SUB(16);
+    NEXT; // A5
 
-    ADD( 23 ); ADD( 23 ); ADD( 18 ); ADD( 15 ); ADD( 14 ); ADD( 22 );
-    SUB( 17 );                                              NEXT; // A6
+    ADD(23);
+    ADD(23);
+    ADD(18);
+    ADD(15);
+    ADD(14);
+    ADD(22);
+    SUB(17);
+    NEXT; // A6
 
-    ADD( 19 ); ADD( 16 ); ADD( 15 ); ADD( 23 );
-    SUB( 18 );                                              NEXT; // A7
+    ADD(19);
+    ADD(16);
+    ADD(15);
+    ADD(23);
+    SUB(18);
+    NEXT; // A7
 
-    ADD( 20 ); ADD( 17 ); ADD( 16 );
-    SUB( 19 );                                              NEXT; // A8
+    ADD(20);
+    ADD(17);
+    ADD(16);
+    SUB(19);
+    NEXT; // A8
 
-    ADD( 21 ); ADD( 18 ); ADD( 17 );
-    SUB( 20 );                                              NEXT; // A9
+    ADD(21);
+    ADD(18);
+    ADD(17);
+    SUB(20);
+    NEXT; // A9
 
-    ADD( 22 ); ADD( 19 ); ADD( 18 );
-    SUB( 21 );                                              NEXT; // A10
+    ADD(22);
+    ADD(19);
+    ADD(18);
+    SUB(21);
+    NEXT; // A10
 
-    ADD( 23 ); ADD( 20 ); ADD( 19 );
-    SUB( 22 );                                              LAST; // A11
+    ADD(23);
+    ADD(20);
+    ADD(19);
+    SUB(22);
+    LAST; // A11
 
 cleanup:
-    return( ret );
+    return (ret);
 }
 #endif /* MBEDTLS_ECP_DP_SECP384R1_ENABLED */
 
@@ -1175,7 +1299,7 @@ cleanup:
  * Fast quasi-reduction modulo p521 (FIPS 186-3 D.2.5)
  * Write N as A1 + 2^521 A0, return A0 + A1
  */
-static int ecp_mod_p521( mbedtls_mpi *N )
+static int ecp_mod_p521(mbedtls_mpi *N)
 {
     int ret;
     size_t i;
@@ -1185,28 +1309,28 @@ static int ecp_mod_p521( mbedtls_mpi *N )
      * we need to hold bits 513 to 1056, which is 34 limbs, that is
      * P521_WIDTH + 1. Otherwise P521_WIDTH is enough. */
 
-    if( N->n < P521_WIDTH )
-        return( 0 );
+    if (N->n < P521_WIDTH)
+        return (0);
 
     /* M = A1 */
     M.s = 1;
-    M.n = N->n - ( P521_WIDTH - 1 );
-    if( M.n > P521_WIDTH + 1 )
+    M.n = N->n - (P521_WIDTH - 1);
+    if (M.n > P521_WIDTH + 1)
         M.n = P521_WIDTH + 1;
     M.p = Mp;
-    memcpy( Mp, N->p + P521_WIDTH - 1, M.n * sizeof( mbedtls_mpi_uint ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &M, 521 % ( 8 * sizeof( mbedtls_mpi_uint ) ) ) );
+    memcpy(Mp, N->p + P521_WIDTH - 1, M.n * sizeof(mbedtls_mpi_uint));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_shift_r(&M, 521 % (8 * sizeof(mbedtls_mpi_uint))));
 
     /* N = A0 */
     N->p[P521_WIDTH - 1] &= P521_MASK;
-    for( i = P521_WIDTH; i < N->n; i++ )
+    for (i = P521_WIDTH; i < N->n; i++)
         N->p[i] = 0;
 
     /* N = A0 + A1 */
-    MBEDTLS_MPI_CHK( mbedtls_mpi_add_abs( N, N, &M ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_add_abs(N, N, &M));
 
 cleanup:
-    return( ret );
+    return (ret);
 }
 
 #undef P521_WIDTH
@@ -1224,38 +1348,38 @@ cleanup:
  * Fast quasi-reduction modulo p255 = 2^255 - 19
  * Write N as A0 + 2^255 A1, return A0 + 19 * A1
  */
-static int ecp_mod_p255( mbedtls_mpi *N )
+static int ecp_mod_p255(mbedtls_mpi *N)
 {
     int ret;
     size_t i;
     mbedtls_mpi M;
     mbedtls_mpi_uint Mp[P255_WIDTH + 2];
 
-    if( N->n < P255_WIDTH )
-        return( 0 );
+    if (N->n < P255_WIDTH)
+        return (0);
 
     /* M = A1 */
     M.s = 1;
-    M.n = N->n - ( P255_WIDTH - 1 );
-    if( M.n > P255_WIDTH + 1 )
-        return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
+    M.n = N->n - (P255_WIDTH - 1);
+    if (M.n > P255_WIDTH + 1)
+        return (MBEDTLS_ERR_ECP_BAD_INPUT_DATA);
     M.p = Mp;
-    memset( Mp, 0, sizeof Mp );
-    memcpy( Mp, N->p + P255_WIDTH - 1, M.n * sizeof( mbedtls_mpi_uint ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &M, 255 % ( 8 * sizeof( mbedtls_mpi_uint ) ) ) );
+    memset(Mp, 0, sizeof Mp);
+    memcpy(Mp, N->p + P255_WIDTH - 1, M.n * sizeof(mbedtls_mpi_uint));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_shift_r(&M, 255 % (8 * sizeof(mbedtls_mpi_uint))));
     M.n++; /* Make room for multiplication by 19 */
 
     /* N = A0 */
-    MBEDTLS_MPI_CHK( mbedtls_mpi_set_bit( N, 255, 0 ) );
-    for( i = P255_WIDTH; i < N->n; i++ )
+    MBEDTLS_MPI_CHK(mbedtls_mpi_set_bit(N, 255, 0));
+    for (i = P255_WIDTH; i < N->n; i++)
         N->p[i] = 0;
 
     /* N = A0 + 19 * A1 */
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_int( &M, &M, 19 ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_add_abs( N, N, &M ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_int(&M, &M, 19));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_add_abs(N, N, &M));
 
 cleanup:
-    return( ret );
+    return (ret);
 }
 #endif /* MBEDTLS_ECP_DP_CURVE25519_ENABLED */
 
@@ -1281,52 +1405,52 @@ cleanup:
  * but for 64-bit targets it should use half the number of operations if we do
  * the reduction with 224-bit limbs, since mpi_add_mpi will then use 64-bit adds.
  */
-static int ecp_mod_p448( mbedtls_mpi *N )
+static int ecp_mod_p448(mbedtls_mpi *N)
 {
     int ret;
     size_t i;
     mbedtls_mpi M, Q;
     mbedtls_mpi_uint Mp[P448_WIDTH + 1], Qp[P448_WIDTH];
 
-    if( N->n <= P448_WIDTH )
-        return( 0 );
+    if (N->n <= P448_WIDTH)
+        return (0);
 
     /* M = A1 */
     M.s = 1;
-    M.n = N->n - ( P448_WIDTH );
-    if( M.n > P448_WIDTH )
+    M.n = N->n - (P448_WIDTH);
+    if (M.n > P448_WIDTH)
         /* Shouldn't be called with N larger than 2^896! */
-        return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
+        return (MBEDTLS_ERR_ECP_BAD_INPUT_DATA);
     M.p = Mp;
-    memset( Mp, 0, sizeof( Mp ) );
-    memcpy( Mp, N->p + P448_WIDTH, M.n * sizeof( mbedtls_mpi_uint ) );
+    memset(Mp, 0, sizeof(Mp));
+    memcpy(Mp, N->p + P448_WIDTH, M.n * sizeof(mbedtls_mpi_uint));
 
     /* N = A0 */
-    for( i = P448_WIDTH; i < N->n; i++ )
+    for (i = P448_WIDTH; i < N->n; i++)
         N->p[i] = 0;
 
     /* N += A1 */
-    MBEDTLS_MPI_CHK( mbedtls_mpi_add_mpi( N, N, &M ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_add_mpi(N, N, &M));
 
     /* Q = B1, N += B1 */
     Q = M;
     Q.p = Qp;
-    memcpy( Qp, Mp, sizeof( Qp ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &Q, 224 ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_add_mpi( N, N, &Q ) );
+    memcpy(Qp, Mp, sizeof(Qp));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_shift_r(&Q, 224));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_add_mpi(N, N, &Q));
 
     /* M = (B0 + B1) * 2^224, N += M */
-    if( sizeof( mbedtls_mpi_uint ) > 4 )
-        Mp[P224_WIDTH_MIN] &= ( (mbedtls_mpi_uint)-1 ) >> ( P224_UNUSED_BITS );
-    for( i = P224_WIDTH_MAX; i < M.n; ++i )
+    if (sizeof(mbedtls_mpi_uint) > 4)
+        Mp[P224_WIDTH_MIN] &= ((mbedtls_mpi_uint) - 1) >> (P224_UNUSED_BITS);
+    for (i = P224_WIDTH_MAX; i < M.n; ++i)
         Mp[i] = 0;
-    MBEDTLS_MPI_CHK( mbedtls_mpi_add_mpi( &M, &M, &Q ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_add_mpi(&M, &M, &Q));
     M.n = P448_WIDTH + 1; /* Make room for shifted carry bit from the addition */
-    MBEDTLS_MPI_CHK( mbedtls_mpi_shift_l( &M, 224 ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_add_mpi( N, N, &M ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_shift_l(&M, 224));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_add_mpi(N, N, &M));
 
 cleanup:
-    return( ret );
+    return (ret);
 }
 #endif /* MBEDTLS_ECP_DP_CURVE448_ENABLED */
 
@@ -1342,16 +1466,16 @@ cleanup:
  */
 #define P_KOBLITZ_MAX   ( 256 / 8 / sizeof( mbedtls_mpi_uint ) )  // Max limbs in P
 #define P_KOBLITZ_R     ( 8 / sizeof( mbedtls_mpi_uint ) )        // Limbs in R
-static inline int ecp_mod_koblitz( mbedtls_mpi *N, mbedtls_mpi_uint *Rp, size_t p_limbs,
-                                   size_t adjust, size_t shift, mbedtls_mpi_uint mask )
+static inline int ecp_mod_koblitz(mbedtls_mpi *N, mbedtls_mpi_uint *Rp, size_t p_limbs,
+                                  size_t adjust, size_t shift, mbedtls_mpi_uint mask)
 {
     int ret;
     size_t i;
     mbedtls_mpi M, R;
     mbedtls_mpi_uint Mp[P_KOBLITZ_MAX + P_KOBLITZ_R + 1];
 
-    if( N->n < p_limbs )
-        return( 0 );
+    if (N->n < p_limbs)
+        return (0);
 
     /* Init R */
     R.s = 1;
@@ -1363,49 +1487,49 @@ static inline int ecp_mod_koblitz( mbedtls_mpi *N, mbedtls_mpi_uint *Rp, size_t
     M.p = Mp;
 
     /* M = A1 */
-    M.n = N->n - ( p_limbs - adjust );
-    if( M.n > p_limbs + adjust )
+    M.n = N->n - (p_limbs - adjust);
+    if (M.n > p_limbs + adjust)
         M.n = p_limbs + adjust;
-    memset( Mp, 0, sizeof Mp );
-    memcpy( Mp, N->p + p_limbs - adjust, M.n * sizeof( mbedtls_mpi_uint ) );
-    if( shift != 0 )
-        MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &M, shift ) );
+    memset(Mp, 0, sizeof Mp);
+    memcpy(Mp, N->p + p_limbs - adjust, M.n * sizeof(mbedtls_mpi_uint));
+    if (shift != 0)
+        MBEDTLS_MPI_CHK(mbedtls_mpi_shift_r(&M, shift));
     M.n += R.n; /* Make room for multiplication by R */
 
     /* N = A0 */
-    if( mask != 0 )
+    if (mask != 0)
         N->p[p_limbs - 1] &= mask;
-    for( i = p_limbs; i < N->n; i++ )
+    for (i = p_limbs; i < N->n; i++)
         N->p[i] = 0;
 
     /* N = A0 + R * A1 */
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &M, &M, &R ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_add_abs( N, N, &M ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&M, &M, &R));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_add_abs(N, N, &M));
 
     /* Second pass */
 
     /* M = A1 */
-    M.n = N->n - ( p_limbs - adjust );
-    if( M.n > p_limbs + adjust )
+    M.n = N->n - (p_limbs - adjust);
+    if (M.n > p_limbs + adjust)
         M.n = p_limbs + adjust;
-    memset( Mp, 0, sizeof Mp );
-    memcpy( Mp, N->p + p_limbs - adjust, M.n * sizeof( mbedtls_mpi_uint ) );
-    if( shift != 0 )
-        MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &M, shift ) );
+    memset(Mp, 0, sizeof Mp);
+    memcpy(Mp, N->p + p_limbs - adjust, M.n * sizeof(mbedtls_mpi_uint));
+    if (shift != 0)
+        MBEDTLS_MPI_CHK(mbedtls_mpi_shift_r(&M, shift));
     M.n += R.n; /* Make room for multiplication by R */
 
     /* N = A0 */
-    if( mask != 0 )
+    if (mask != 0)
         N->p[p_limbs - 1] &= mask;
-    for( i = p_limbs; i < N->n; i++ )
+    for (i = p_limbs; i < N->n; i++)
         N->p[i] = 0;
 
     /* N = A0 + R * A1 */
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &M, &M, &R ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_add_abs( N, N, &M ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&M, &M, &R));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_add_abs(N, N, &M));
 
 cleanup:
-    return( ret );
+    return (ret);
 }
 #endif /* MBEDTLS_ECP_DP_SECP192K1_ENABLED) ||
           MBEDTLS_ECP_DP_SECP224K1_ENABLED) ||
@@ -1416,12 +1540,13 @@ cleanup:
  * Fast quasi-reduction modulo p192k1 = 2^192 - R,
  * with R = 2^32 + 2^12 + 2^8 + 2^7 + 2^6 + 2^3 + 1 = 0x0100001119
  */
-static int ecp_mod_p192k1( mbedtls_mpi *N )
+static int ecp_mod_p192k1(mbedtls_mpi *N)
 {
     static mbedtls_mpi_uint Rp[] = {
-        BYTES_TO_T_UINT_8( 0xC9, 0x11, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 ) };
+        BYTES_TO_T_UINT_8(0xC9, 0x11, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00)
+    };
 
-    return( ecp_mod_koblitz( N, Rp, 192 / 8 / sizeof( mbedtls_mpi_uint ), 0, 0, 0 ) );
+    return (ecp_mod_koblitz(N, Rp, 192 / 8 / sizeof(mbedtls_mpi_uint), 0, 0, 0));
 }
 #endif /* MBEDTLS_ECP_DP_SECP192K1_ENABLED */
 
@@ -1430,15 +1555,16 @@ static int ecp_mod_p192k1( mbedtls_mpi *N )
  * Fast quasi-reduction modulo p224k1 = 2^224 - R,
  * with R = 2^32 + 2^12 + 2^11 + 2^9 + 2^7 + 2^4 + 2 + 1 = 0x0100001A93
  */
-static int ecp_mod_p224k1( mbedtls_mpi *N )
+static int ecp_mod_p224k1(mbedtls_mpi *N)
 {
     static mbedtls_mpi_uint Rp[] = {
-        BYTES_TO_T_UINT_8( 0x93, 0x1A, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 ) };
+        BYTES_TO_T_UINT_8(0x93, 0x1A, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00)
+    };
 
 #if defined(MBEDTLS_HAVE_INT64)
-    return( ecp_mod_koblitz( N, Rp, 4, 1, 32, 0xFFFFFFFF ) );
+    return (ecp_mod_koblitz(N, Rp, 4, 1, 32, 0xFFFFFFFF));
 #else
-    return( ecp_mod_koblitz( N, Rp, 224 / 8 / sizeof( mbedtls_mpi_uint ), 0, 0, 0 ) );
+    return (ecp_mod_koblitz(N, Rp, 224 / 8 / sizeof(mbedtls_mpi_uint), 0, 0, 0));
 #endif
 }
 
@@ -1449,11 +1575,12 @@ static int ecp_mod_p224k1( mbedtls_mpi *N )
  * Fast quasi-reduction modulo p256k1 = 2^256 - R,
  * with R = 2^32 + 2^9 + 2^8 + 2^7 + 2^6 + 2^4 + 1 = 0x01000003D1
  */
-static int ecp_mod_p256k1( mbedtls_mpi *N )
+static int ecp_mod_p256k1(mbedtls_mpi *N)
 {
     static mbedtls_mpi_uint Rp[] = {
-        BYTES_TO_T_UINT_8( 0xD1, 0x03, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 ) };
-    return( ecp_mod_koblitz( N, Rp, 256 / 8 / sizeof( mbedtls_mpi_uint ), 0, 0, 0 ) );
+        BYTES_TO_T_UINT_8(0xD1, 0x03, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00)
+    };
+    return (ecp_mod_koblitz(N, Rp, 256 / 8 / sizeof(mbedtls_mpi_uint), 0, 0, 0));
 }
 #endif /* MBEDTLS_ECP_DP_SECP256K1_ENABLED */
 
diff --git a/common/mbedtls/ecp_internal.h b/common/mbedtls/ecp_internal.h
index 73bccd426..50ae6e353 100644
--- a/common/mbedtls/ecp_internal.h
+++ b/common/mbedtls/ecp_internal.h
@@ -74,7 +74,7 @@
  *
  * \return          Non-zero if successful.
  */
-unsigned char mbedtls_internal_ecp_grp_capable( const mbedtls_ecp_group *grp );
+unsigned char mbedtls_internal_ecp_grp_capable(const mbedtls_ecp_group *grp);
 
 /**
  * \brief           Initialise the Elliptic Curve Point module extension.
@@ -91,7 +91,7 @@ unsigned char mbedtls_internal_ecp_grp_capable( const mbedtls_ecp_group *grp );
  *
  * \return          0 if successful.
  */
-int mbedtls_internal_ecp_init( const mbedtls_ecp_group *grp );
+int mbedtls_internal_ecp_init(const mbedtls_ecp_group *grp);
 
 /**
  * \brief           Frees and deallocates the Elliptic Curve Point module
@@ -99,7 +99,7 @@ int mbedtls_internal_ecp_init( const mbedtls_ecp_group *grp );
  *
  * \param grp       The pointer to the group the module was initialised for.
  */
-void mbedtls_internal_ecp_free( const mbedtls_ecp_group *grp );
+void mbedtls_internal_ecp_free(const mbedtls_ecp_group *grp);
 
 #if defined(ECP_SHORTWEIERSTRASS)
 
@@ -119,9 +119,9 @@ void mbedtls_internal_ecp_free( const mbedtls_ecp_group *grp );
  *
  * \return          0 if successful.
  */
-int mbedtls_internal_ecp_randomize_jac( const mbedtls_ecp_group *grp,
-        mbedtls_ecp_point *pt, int (*f_rng)(void *, unsigned char *, size_t),
-        void *p_rng );
+int mbedtls_internal_ecp_randomize_jac(const mbedtls_ecp_group *grp,
+                                       mbedtls_ecp_point *pt, int (*f_rng)(void *, unsigned char *, size_t),
+                                       void *p_rng);
 #endif
 
 #if defined(MBEDTLS_ECP_ADD_MIXED_ALT)
@@ -164,9 +164,9 @@ int mbedtls_internal_ecp_randomize_jac( const mbedtls_ecp_group *grp,
  *
  * \return          0 if successful.
  */
-int mbedtls_internal_ecp_add_mixed( const mbedtls_ecp_group *grp,
-        mbedtls_ecp_point *R, const mbedtls_ecp_point *P,
-        const mbedtls_ecp_point *Q );
+int mbedtls_internal_ecp_add_mixed(const mbedtls_ecp_group *grp,
+                                   mbedtls_ecp_point *R, const mbedtls_ecp_point *P,
+                                   const mbedtls_ecp_point *Q);
 #endif
 
 /**
@@ -189,8 +189,8 @@ int mbedtls_internal_ecp_add_mixed( const mbedtls_ecp_group *grp,
  * \return          0 if successful.
  */
 #if defined(MBEDTLS_ECP_DOUBLE_JAC_ALT)
-int mbedtls_internal_ecp_double_jac( const mbedtls_ecp_group *grp,
-        mbedtls_ecp_point *R, const mbedtls_ecp_point *P );
+int mbedtls_internal_ecp_double_jac(const mbedtls_ecp_group *grp,
+                                    mbedtls_ecp_point *R, const mbedtls_ecp_point *P);
 #endif
 
 /**
@@ -219,8 +219,8 @@ int mbedtls_internal_ecp_double_jac( const mbedtls_ecp_group *grp,
  *                      an error if one of the points is zero.
  */
 #if defined(MBEDTLS_ECP_NORMALIZE_JAC_MANY_ALT)
-int mbedtls_internal_ecp_normalize_jac_many( const mbedtls_ecp_group *grp,
-        mbedtls_ecp_point *T[], size_t t_len );
+int mbedtls_internal_ecp_normalize_jac_many(const mbedtls_ecp_group *grp,
+                                            mbedtls_ecp_point *T[], size_t t_len);
 #endif
 
 /**
@@ -237,8 +237,8 @@ int mbedtls_internal_ecp_normalize_jac_many( const mbedtls_ecp_group *grp,
  * \return          0 if successful.
  */
 #if defined(MBEDTLS_ECP_NORMALIZE_JAC_ALT)
-int mbedtls_internal_ecp_normalize_jac( const mbedtls_ecp_group *grp,
-        mbedtls_ecp_point *pt );
+int mbedtls_internal_ecp_normalize_jac(const mbedtls_ecp_group *grp,
+                                       mbedtls_ecp_point *pt);
 #endif
 
 #endif /* ECP_SHORTWEIERSTRASS */
@@ -246,9 +246,9 @@ int mbedtls_internal_ecp_normalize_jac( const mbedtls_ecp_group *grp,
 #if defined(ECP_MONTGOMERY)
 
 #if defined(MBEDTLS_ECP_DOUBLE_ADD_MXZ_ALT)
-int mbedtls_internal_ecp_double_add_mxz( const mbedtls_ecp_group *grp,
-        mbedtls_ecp_point *R, mbedtls_ecp_point *S, const mbedtls_ecp_point *P,
-        const mbedtls_ecp_point *Q, const mbedtls_mpi *d );
+int mbedtls_internal_ecp_double_add_mxz(const mbedtls_ecp_group *grp,
+                                        mbedtls_ecp_point *R, mbedtls_ecp_point *S, const mbedtls_ecp_point *P,
+                                        const mbedtls_ecp_point *Q, const mbedtls_mpi *d);
 #endif
 
 /**
@@ -267,9 +267,9 @@ int mbedtls_internal_ecp_double_add_mxz( const mbedtls_ecp_group *grp,
  * \return          0 if successful
  */
 #if defined(MBEDTLS_ECP_RANDOMIZE_MXZ_ALT)
-int mbedtls_internal_ecp_randomize_mxz( const mbedtls_ecp_group *grp,
-        mbedtls_ecp_point *P, int (*f_rng)(void *, unsigned char *, size_t),
-        void *p_rng );
+int mbedtls_internal_ecp_randomize_mxz(const mbedtls_ecp_group *grp,
+                                       mbedtls_ecp_point *P, int (*f_rng)(void *, unsigned char *, size_t),
+                                       void *p_rng);
 #endif
 
 /**
@@ -283,8 +283,8 @@ int mbedtls_internal_ecp_randomize_mxz( const mbedtls_ecp_group *grp,
  * \return          0 if successful
  */
 #if defined(MBEDTLS_ECP_NORMALIZE_MXZ_ALT)
-int mbedtls_internal_ecp_normalize_mxz( const mbedtls_ecp_group *grp,
-        mbedtls_ecp_point *P );
+int mbedtls_internal_ecp_normalize_mxz(const mbedtls_ecp_group *grp,
+                                       mbedtls_ecp_point *P);
 #endif
 
 #endif /* ECP_MONTGOMERY */
diff --git a/common/mbedtls/entropy.c b/common/mbedtls/entropy.c
index 33f925155..0d510c5c0 100644
--- a/common/mbedtls/entropy.c
+++ b/common/mbedtls/entropy.c
@@ -64,98 +64,97 @@
 
 #define ENTROPY_MAX_LOOP    256     /**< Maximum amount to loop before error */
 
-void mbedtls_entropy_init( mbedtls_entropy_context *ctx )
+void mbedtls_entropy_init(mbedtls_entropy_context *ctx)
 {
     ctx->source_count = 0;
-    memset( ctx->source, 0, sizeof( ctx->source ) );
+    memset(ctx->source, 0, sizeof(ctx->source));
 
 #if defined(MBEDTLS_THREADING_C)
-    mbedtls_mutex_init( &ctx->mutex );
+    mbedtls_mutex_init(&ctx->mutex);
 #endif
 
     ctx->accumulator_started = 0;
 #if defined(MBEDTLS_ENTROPY_SHA512_ACCUMULATOR)
-    mbedtls_sha512_init( &ctx->accumulator );
+    mbedtls_sha512_init(&ctx->accumulator);
 #else
-    mbedtls_sha256_init( &ctx->accumulator );
+    mbedtls_sha256_init(&ctx->accumulator);
 #endif
 #if defined(MBEDTLS_HAVEGE_C)
-    mbedtls_havege_init( &ctx->havege_data );
+    mbedtls_havege_init(&ctx->havege_data);
 #endif
 
     /* Reminder: Update ENTROPY_HAVE_STRONG in the test files
      *           when adding more strong entropy sources here. */
 
 #if defined(MBEDTLS_TEST_NULL_ENTROPY)
-    mbedtls_entropy_add_source( ctx, mbedtls_null_entropy_poll, NULL,
-                                1, MBEDTLS_ENTROPY_SOURCE_STRONG );
+    mbedtls_entropy_add_source(ctx, mbedtls_null_entropy_poll, NULL,
+                               1, MBEDTLS_ENTROPY_SOURCE_STRONG);
 #endif
 
 #if !defined(MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES)
 #if !defined(MBEDTLS_NO_PLATFORM_ENTROPY)
-    mbedtls_entropy_add_source( ctx, mbedtls_platform_entropy_poll, NULL,
-                                MBEDTLS_ENTROPY_MIN_PLATFORM,
-                                MBEDTLS_ENTROPY_SOURCE_STRONG );
+    mbedtls_entropy_add_source(ctx, mbedtls_platform_entropy_poll, NULL,
+                               MBEDTLS_ENTROPY_MIN_PLATFORM,
+                               MBEDTLS_ENTROPY_SOURCE_STRONG);
 #endif
 #if defined(MBEDTLS_TIMING_C)
-    mbedtls_entropy_add_source( ctx, mbedtls_hardclock_poll, NULL,
-                                MBEDTLS_ENTROPY_MIN_HARDCLOCK,
-                                MBEDTLS_ENTROPY_SOURCE_WEAK );
+    mbedtls_entropy_add_source(ctx, mbedtls_hardclock_poll, NULL,
+                               MBEDTLS_ENTROPY_MIN_HARDCLOCK,
+                               MBEDTLS_ENTROPY_SOURCE_WEAK);
 #endif
 #if defined(MBEDTLS_HAVEGE_C)
-    mbedtls_entropy_add_source( ctx, mbedtls_havege_poll, &ctx->havege_data,
-                                MBEDTLS_ENTROPY_MIN_HAVEGE,
-                                MBEDTLS_ENTROPY_SOURCE_STRONG );
+    mbedtls_entropy_add_source(ctx, mbedtls_havege_poll, &ctx->havege_data,
+                               MBEDTLS_ENTROPY_MIN_HAVEGE,
+                               MBEDTLS_ENTROPY_SOURCE_STRONG);
 #endif
 #if defined(MBEDTLS_ENTROPY_HARDWARE_ALT)
-    mbedtls_entropy_add_source( ctx, mbedtls_hardware_poll, NULL,
-                                MBEDTLS_ENTROPY_MIN_HARDWARE,
-                                MBEDTLS_ENTROPY_SOURCE_STRONG );
+    mbedtls_entropy_add_source(ctx, mbedtls_hardware_poll, NULL,
+                               MBEDTLS_ENTROPY_MIN_HARDWARE,
+                               MBEDTLS_ENTROPY_SOURCE_STRONG);
 #endif
 #if defined(MBEDTLS_ENTROPY_NV_SEED)
-    mbedtls_entropy_add_source( ctx, mbedtls_nv_seed_poll, NULL,
-                                MBEDTLS_ENTROPY_BLOCK_SIZE,
-                                MBEDTLS_ENTROPY_SOURCE_STRONG );
+    mbedtls_entropy_add_source(ctx, mbedtls_nv_seed_poll, NULL,
+                               MBEDTLS_ENTROPY_BLOCK_SIZE,
+                               MBEDTLS_ENTROPY_SOURCE_STRONG);
     ctx->initial_entropy_run = 0;
 #endif
 #endif /* MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES */
 }
 
-void mbedtls_entropy_free( mbedtls_entropy_context *ctx )
+void mbedtls_entropy_free(mbedtls_entropy_context *ctx)
 {
 #if defined(MBEDTLS_HAVEGE_C)
-    mbedtls_havege_free( &ctx->havege_data );
+    mbedtls_havege_free(&ctx->havege_data);
 #endif
 #if defined(MBEDTLS_THREADING_C)
-    mbedtls_mutex_free( &ctx->mutex );
+    mbedtls_mutex_free(&ctx->mutex);
 #endif
 #if defined(MBEDTLS_ENTROPY_SHA512_ACCUMULATOR)
-    mbedtls_sha512_free( &ctx->accumulator );
+    mbedtls_sha512_free(&ctx->accumulator);
 #else
-    mbedtls_sha256_free( &ctx->accumulator );
+    mbedtls_sha256_free(&ctx->accumulator);
 #endif
 #if defined(MBEDTLS_ENTROPY_NV_SEED)
     ctx->initial_entropy_run = 0;
 #endif
     ctx->source_count = 0;
-    mbedtls_platform_zeroize( ctx->source, sizeof( ctx->source ) );
+    mbedtls_platform_zeroize(ctx->source, sizeof(ctx->source));
     ctx->accumulator_started = 0;
 }
 
-int mbedtls_entropy_add_source( mbedtls_entropy_context *ctx,
-                        mbedtls_entropy_f_source_ptr f_source, void *p_source,
-                        size_t threshold, int strong )
+int mbedtls_entropy_add_source(mbedtls_entropy_context *ctx,
+                               mbedtls_entropy_f_source_ptr f_source, void *p_source,
+                               size_t threshold, int strong)
 {
     int idx, ret = 0;
 
 #if defined(MBEDTLS_THREADING_C)
-    if( ( ret = mbedtls_mutex_lock( &ctx->mutex ) ) != 0 )
-        return( ret );
+    if ((ret = mbedtls_mutex_lock(&ctx->mutex)) != 0)
+        return (ret);
 #endif
 
     idx = ctx->source_count;
-    if( idx >= MBEDTLS_ENTROPY_MAX_SOURCES )
-    {
+    if (idx >= MBEDTLS_ENTROPY_MAX_SOURCES) {
         ret = MBEDTLS_ERR_ENTROPY_MAX_SOURCES;
         goto exit;
     }
@@ -169,18 +168,18 @@ int mbedtls_entropy_add_source( mbedtls_entropy_context *ctx,
 
 exit:
 #if defined(MBEDTLS_THREADING_C)
-    if( mbedtls_mutex_unlock( &ctx->mutex ) != 0 )
-        return( MBEDTLS_ERR_THREADING_MUTEX_ERROR );
+    if (mbedtls_mutex_unlock(&ctx->mutex) != 0)
+        return (MBEDTLS_ERR_THREADING_MUTEX_ERROR);
 #endif
 
-    return( ret );
+    return (ret);
 }
 
 /*
  * Entropy accumulator update
  */
-static int entropy_update( mbedtls_entropy_context *ctx, unsigned char source_id,
-                           const unsigned char *data, size_t len )
+static int entropy_update(mbedtls_entropy_context *ctx, unsigned char source_id,
+                          const unsigned char *data, size_t len)
 {
     unsigned char header[2];
     unsigned char tmp[MBEDTLS_ENTROPY_BLOCK_SIZE];
@@ -188,13 +187,12 @@ static int entropy_update( mbedtls_entropy_context *ctx, unsigned char source_id
     const unsigned char *p = data;
     int ret = 0;
 
-    if( use_len > MBEDTLS_ENTROPY_BLOCK_SIZE )
-    {
+    if (use_len > MBEDTLS_ENTROPY_BLOCK_SIZE) {
 #if defined(MBEDTLS_ENTROPY_SHA512_ACCUMULATOR)
-        if( ( ret = mbedtls_sha512_ret( data, len, tmp, 0 ) ) != 0 )
+        if ((ret = mbedtls_sha512_ret(data, len, tmp, 0)) != 0)
             goto cleanup;
 #else
-        if( ( ret = mbedtls_sha256_ret( data, len, tmp, 0 ) ) != 0 )
+        if ((ret = mbedtls_sha256_ret(data, len, tmp, 0)) != 0)
             goto cleanup;
 #endif
         p = tmp;
@@ -210,169 +208,162 @@ static int entropy_update( mbedtls_entropy_context *ctx, unsigned char source_id
      * gather entropy eventually execute this code.
      */
 #if defined(MBEDTLS_ENTROPY_SHA512_ACCUMULATOR)
-    if( ctx->accumulator_started == 0 &&
-        ( ret = mbedtls_sha512_starts_ret( &ctx->accumulator, 0 ) ) != 0 )
+    if (ctx->accumulator_started == 0 &&
+        (ret = mbedtls_sha512_starts_ret(&ctx->accumulator, 0)) != 0)
         goto cleanup;
     else
         ctx->accumulator_started = 1;
-    if( ( ret = mbedtls_sha512_update_ret( &ctx->accumulator, header, 2 ) ) != 0 )
+    if ((ret = mbedtls_sha512_update_ret(&ctx->accumulator, header, 2)) != 0)
         goto cleanup;
-    ret = mbedtls_sha512_update_ret( &ctx->accumulator, p, use_len );
+    ret = mbedtls_sha512_update_ret(&ctx->accumulator, p, use_len);
 #else
-    if( ctx->accumulator_started == 0 &&
-        ( ret = mbedtls_sha256_starts_ret( &ctx->accumulator, 0 ) ) != 0 )
+    if (ctx->accumulator_started == 0 &&
+        (ret = mbedtls_sha256_starts_ret(&ctx->accumulator, 0)) != 0)
         goto cleanup;
     else
         ctx->accumulator_started = 1;
-    if( ( ret = mbedtls_sha256_update_ret( &ctx->accumulator, header, 2 ) ) != 0 )
+    if ((ret = mbedtls_sha256_update_ret(&ctx->accumulator, header, 2)) != 0)
         goto cleanup;
-    ret = mbedtls_sha256_update_ret( &ctx->accumulator, p, use_len );
+    ret = mbedtls_sha256_update_ret(&ctx->accumulator, p, use_len);
 #endif
 
 cleanup:
-    mbedtls_platform_zeroize( tmp, sizeof( tmp ) );
+    mbedtls_platform_zeroize(tmp, sizeof(tmp));
 
-    return( ret );
+    return (ret);
 }
 
-int mbedtls_entropy_update_manual( mbedtls_entropy_context *ctx,
-                           const unsigned char *data, size_t len )
+int mbedtls_entropy_update_manual(mbedtls_entropy_context *ctx,
+                                  const unsigned char *data, size_t len)
 {
     int ret;
 
 #if defined(MBEDTLS_THREADING_C)
-    if( ( ret = mbedtls_mutex_lock( &ctx->mutex ) ) != 0 )
-        return( ret );
+    if ((ret = mbedtls_mutex_lock(&ctx->mutex)) != 0)
+        return (ret);
 #endif
 
-    ret = entropy_update( ctx, MBEDTLS_ENTROPY_SOURCE_MANUAL, data, len );
+    ret = entropy_update(ctx, MBEDTLS_ENTROPY_SOURCE_MANUAL, data, len);
 
 #if defined(MBEDTLS_THREADING_C)
-    if( mbedtls_mutex_unlock( &ctx->mutex ) != 0 )
-        return( MBEDTLS_ERR_THREADING_MUTEX_ERROR );
+    if (mbedtls_mutex_unlock(&ctx->mutex) != 0)
+        return (MBEDTLS_ERR_THREADING_MUTEX_ERROR);
 #endif
 
-    return( ret );
+    return (ret);
 }
 
 /*
  * Run through the different sources to add entropy to our accumulator
  */
-static int entropy_gather_internal( mbedtls_entropy_context *ctx )
+static int entropy_gather_internal(mbedtls_entropy_context *ctx)
 {
     int ret, i, have_one_strong = 0;
     unsigned char buf[MBEDTLS_ENTROPY_MAX_GATHER];
     size_t olen;
 
-    if( ctx->source_count == 0 )
-        return( MBEDTLS_ERR_ENTROPY_NO_SOURCES_DEFINED );
+    if (ctx->source_count == 0)
+        return (MBEDTLS_ERR_ENTROPY_NO_SOURCES_DEFINED);
 
     /*
      * Run through our entropy sources
      */
-    for( i = 0; i < ctx->source_count; i++ )
-    {
-        if( ctx->source[i].strong == MBEDTLS_ENTROPY_SOURCE_STRONG )
+    for (i = 0; i < ctx->source_count; i++) {
+        if (ctx->source[i].strong == MBEDTLS_ENTROPY_SOURCE_STRONG)
             have_one_strong = 1;
 
         olen = 0;
-        if( ( ret = ctx->source[i].f_source( ctx->source[i].p_source,
-                        buf, MBEDTLS_ENTROPY_MAX_GATHER, &olen ) ) != 0 )
-        {
+        if ((ret = ctx->source[i].f_source(ctx->source[i].p_source,
+                                           buf, MBEDTLS_ENTROPY_MAX_GATHER, &olen)) != 0) {
             goto cleanup;
         }
 
         /*
          * Add if we actually gathered something
          */
-        if( olen > 0 )
-        {
-            if( ( ret = entropy_update( ctx, (unsigned char) i,
-                                        buf, olen ) ) != 0 )
-                return( ret );
+        if (olen > 0) {
+            if ((ret = entropy_update(ctx, (unsigned char) i,
+                                      buf, olen)) != 0)
+                return (ret);
             ctx->source[i].size += olen;
         }
     }
 
-    if( have_one_strong == 0 )
+    if (have_one_strong == 0)
         ret = MBEDTLS_ERR_ENTROPY_NO_STRONG_SOURCE;
 
 cleanup:
-    mbedtls_platform_zeroize( buf, sizeof( buf ) );
+    mbedtls_platform_zeroize(buf, sizeof(buf));
 
-    return( ret );
+    return (ret);
 }
 
 /*
  * Thread-safe wrapper for entropy_gather_internal()
  */
-int mbedtls_entropy_gather( mbedtls_entropy_context *ctx )
+int mbedtls_entropy_gather(mbedtls_entropy_context *ctx)
 {
     int ret;
 
 #if defined(MBEDTLS_THREADING_C)
-    if( ( ret = mbedtls_mutex_lock( &ctx->mutex ) ) != 0 )
-        return( ret );
+    if ((ret = mbedtls_mutex_lock(&ctx->mutex)) != 0)
+        return (ret);
 #endif
 
-    ret = entropy_gather_internal( ctx );
+    ret = entropy_gather_internal(ctx);
 
 #if defined(MBEDTLS_THREADING_C)
-    if( mbedtls_mutex_unlock( &ctx->mutex ) != 0 )
-        return( MBEDTLS_ERR_THREADING_MUTEX_ERROR );
+    if (mbedtls_mutex_unlock(&ctx->mutex) != 0)
+        return (MBEDTLS_ERR_THREADING_MUTEX_ERROR);
 #endif
 
-    return( ret );
+    return (ret);
 }
 
-int mbedtls_entropy_func( void *data, unsigned char *output, size_t len )
+int mbedtls_entropy_func(void *data, unsigned char *output, size_t len)
 {
     int ret, count = 0, i, done;
     mbedtls_entropy_context *ctx = (mbedtls_entropy_context *) data;
     unsigned char buf[MBEDTLS_ENTROPY_BLOCK_SIZE];
 
-    if( len > MBEDTLS_ENTROPY_BLOCK_SIZE )
-        return( MBEDTLS_ERR_ENTROPY_SOURCE_FAILED );
+    if (len > MBEDTLS_ENTROPY_BLOCK_SIZE)
+        return (MBEDTLS_ERR_ENTROPY_SOURCE_FAILED);
 
 #if defined(MBEDTLS_ENTROPY_NV_SEED)
     /* Update the NV entropy seed before generating any entropy for outside
      * use.
      */
-    if( ctx->initial_entropy_run == 0 )
-    {
+    if (ctx->initial_entropy_run == 0) {
         ctx->initial_entropy_run = 1;
-        if( ( ret = mbedtls_entropy_update_nv_seed( ctx ) ) != 0 )
-            return( ret );
+        if ((ret = mbedtls_entropy_update_nv_seed(ctx)) != 0)
+            return (ret);
     }
 #endif
 
 #if defined(MBEDTLS_THREADING_C)
-    if( ( ret = mbedtls_mutex_lock( &ctx->mutex ) ) != 0 )
-        return( ret );
+    if ((ret = mbedtls_mutex_lock(&ctx->mutex)) != 0)
+        return (ret);
 #endif
 
     /*
      * Always gather extra entropy before a call
      */
-    do
-    {
-        if( count++ > ENTROPY_MAX_LOOP )
-        {
+    do {
+        if (count++ > ENTROPY_MAX_LOOP) {
             ret = MBEDTLS_ERR_ENTROPY_SOURCE_FAILED;
             goto exit;
         }
 
-        if( ( ret = entropy_gather_internal( ctx ) ) != 0 )
+        if ((ret = entropy_gather_internal(ctx)) != 0)
             goto exit;
 
         done = 1;
-        for( i = 0; i < ctx->source_count; i++ )
-            if( ctx->source[i].size < ctx->source[i].threshold )
+        for (i = 0; i < ctx->source_count; i++)
+            if (ctx->source[i].size < ctx->source[i].threshold)
                 done = 0;
-    }
-    while( ! done );
+    } while (! done);
 
-    memset( buf, 0, MBEDTLS_ENTROPY_BLOCK_SIZE );
+    memset(buf, 0, MBEDTLS_ENTROPY_BLOCK_SIZE);
 
 #if defined(MBEDTLS_ENTROPY_SHA512_ACCUMULATOR)
     /*
@@ -380,103 +371,102 @@ int mbedtls_entropy_func( void *data, unsigned char *output, size_t len )
      * in a previous call to entropy_update(). If this is not guaranteed, the
      * code below will fail.
      */
-    if( ( ret = mbedtls_sha512_finish_ret( &ctx->accumulator, buf ) ) != 0 )
+    if ((ret = mbedtls_sha512_finish_ret(&ctx->accumulator, buf)) != 0)
         goto exit;
 
     /*
      * Reset accumulator and counters and recycle existing entropy
      */
-    mbedtls_sha512_free( &ctx->accumulator );
-    mbedtls_sha512_init( &ctx->accumulator );
-    if( ( ret = mbedtls_sha512_starts_ret( &ctx->accumulator, 0 ) ) != 0 )
+    mbedtls_sha512_free(&ctx->accumulator);
+    mbedtls_sha512_init(&ctx->accumulator);
+    if ((ret = mbedtls_sha512_starts_ret(&ctx->accumulator, 0)) != 0)
         goto exit;
-    if( ( ret = mbedtls_sha512_update_ret( &ctx->accumulator, buf,
-                                           MBEDTLS_ENTROPY_BLOCK_SIZE ) ) != 0 )
+    if ((ret = mbedtls_sha512_update_ret(&ctx->accumulator, buf,
+                                         MBEDTLS_ENTROPY_BLOCK_SIZE)) != 0)
         goto exit;
 
     /*
      * Perform second SHA-512 on entropy
      */
-    if( ( ret = mbedtls_sha512_ret( buf, MBEDTLS_ENTROPY_BLOCK_SIZE,
-                                    buf, 0 ) ) != 0 )
+    if ((ret = mbedtls_sha512_ret(buf, MBEDTLS_ENTROPY_BLOCK_SIZE,
+                                  buf, 0)) != 0)
         goto exit;
 #else /* MBEDTLS_ENTROPY_SHA512_ACCUMULATOR */
-    if( ( ret = mbedtls_sha256_finish_ret( &ctx->accumulator, buf ) ) != 0 )
+    if ((ret = mbedtls_sha256_finish_ret(&ctx->accumulator, buf)) != 0)
         goto exit;
 
     /*
      * Reset accumulator and counters and recycle existing entropy
      */
-    mbedtls_sha256_free( &ctx->accumulator );
-    mbedtls_sha256_init( &ctx->accumulator );
-    if( ( ret = mbedtls_sha256_starts_ret( &ctx->accumulator, 0 ) ) != 0 )
+    mbedtls_sha256_free(&ctx->accumulator);
+    mbedtls_sha256_init(&ctx->accumulator);
+    if ((ret = mbedtls_sha256_starts_ret(&ctx->accumulator, 0)) != 0)
         goto exit;
-    if( ( ret = mbedtls_sha256_update_ret( &ctx->accumulator, buf,
-                                           MBEDTLS_ENTROPY_BLOCK_SIZE ) ) != 0 )
+    if ((ret = mbedtls_sha256_update_ret(&ctx->accumulator, buf,
+                                         MBEDTLS_ENTROPY_BLOCK_SIZE)) != 0)
         goto exit;
 
     /*
      * Perform second SHA-256 on entropy
      */
-    if( ( ret = mbedtls_sha256_ret( buf, MBEDTLS_ENTROPY_BLOCK_SIZE,
-                                    buf, 0 ) ) != 0 )
+    if ((ret = mbedtls_sha256_ret(buf, MBEDTLS_ENTROPY_BLOCK_SIZE,
+                                  buf, 0)) != 0)
         goto exit;
 #endif /* MBEDTLS_ENTROPY_SHA512_ACCUMULATOR */
 
-    for( i = 0; i < ctx->source_count; i++ )
+    for (i = 0; i < ctx->source_count; i++)
         ctx->source[i].size = 0;
 
-    memcpy( output, buf, len );
+    memcpy(output, buf, len);
 
     ret = 0;
 
 exit:
-    mbedtls_platform_zeroize( buf, sizeof( buf ) );
+    mbedtls_platform_zeroize(buf, sizeof(buf));
 
 #if defined(MBEDTLS_THREADING_C)
-    if( mbedtls_mutex_unlock( &ctx->mutex ) != 0 )
-        return( MBEDTLS_ERR_THREADING_MUTEX_ERROR );
+    if (mbedtls_mutex_unlock(&ctx->mutex) != 0)
+        return (MBEDTLS_ERR_THREADING_MUTEX_ERROR);
 #endif
 
-    return( ret );
+    return (ret);
 }
 
 #if defined(MBEDTLS_ENTROPY_NV_SEED)
-int mbedtls_entropy_update_nv_seed( mbedtls_entropy_context *ctx )
+int mbedtls_entropy_update_nv_seed(mbedtls_entropy_context *ctx)
 {
     int ret = MBEDTLS_ERR_ENTROPY_FILE_IO_ERROR;
     unsigned char buf[MBEDTLS_ENTROPY_BLOCK_SIZE];
 
     /* Read new seed  and write it to NV */
-    if( ( ret = mbedtls_entropy_func( ctx, buf, MBEDTLS_ENTROPY_BLOCK_SIZE ) ) != 0 )
-        return( ret );
+    if ((ret = mbedtls_entropy_func(ctx, buf, MBEDTLS_ENTROPY_BLOCK_SIZE)) != 0)
+        return (ret);
 
-    if( mbedtls_nv_seed_write( buf, MBEDTLS_ENTROPY_BLOCK_SIZE ) < 0 )
-        return( MBEDTLS_ERR_ENTROPY_FILE_IO_ERROR );
+    if (mbedtls_nv_seed_write(buf, MBEDTLS_ENTROPY_BLOCK_SIZE) < 0)
+        return (MBEDTLS_ERR_ENTROPY_FILE_IO_ERROR);
 
     /* Manually update the remaining stream with a separator value to diverge */
-    memset( buf, 0, MBEDTLS_ENTROPY_BLOCK_SIZE );
-    ret = mbedtls_entropy_update_manual( ctx, buf, MBEDTLS_ENTROPY_BLOCK_SIZE );
+    memset(buf, 0, MBEDTLS_ENTROPY_BLOCK_SIZE);
+    ret = mbedtls_entropy_update_manual(ctx, buf, MBEDTLS_ENTROPY_BLOCK_SIZE);
 
-    return( ret );
+    return (ret);
 }
 #endif /* MBEDTLS_ENTROPY_NV_SEED */
 
 #if defined(MBEDTLS_FS_IO)
-int mbedtls_entropy_write_seed_file( mbedtls_entropy_context *ctx, const char *path )
+int mbedtls_entropy_write_seed_file(mbedtls_entropy_context *ctx, const char *path)
 {
     int ret = MBEDTLS_ERR_ENTROPY_FILE_IO_ERROR;
     FILE *f;
     unsigned char buf[MBEDTLS_ENTROPY_BLOCK_SIZE];
 
-    if( ( f = fopen( path, "wb" ) ) == NULL )
-        return( MBEDTLS_ERR_ENTROPY_FILE_IO_ERROR );
+    if ((f = fopen(path, "wb")) == NULL)
+        return (MBEDTLS_ERR_ENTROPY_FILE_IO_ERROR);
 
-    if( ( ret = mbedtls_entropy_func( ctx, buf, MBEDTLS_ENTROPY_BLOCK_SIZE ) ) != 0 )
+    if ((ret = mbedtls_entropy_func(ctx, buf, MBEDTLS_ENTROPY_BLOCK_SIZE)) != 0)
         goto exit;
 
-    if( fwrite( buf, 1, MBEDTLS_ENTROPY_BLOCK_SIZE, f ) != MBEDTLS_ENTROPY_BLOCK_SIZE )
-    {
+    if (fwrite(buf, 1, MBEDTLS_ENTROPY_BLOCK_SIZE, f) != MBEDTLS_ENTROPY_BLOCK_SIZE) {
         ret = MBEDTLS_ERR_ENTROPY_FILE_IO_ERROR;
         goto exit;
     }
@@ -484,42 +474,42 @@ int mbedtls_entropy_write_seed_file( mbedtls_entropy_context *ctx, const char *p
     ret = 0;
 
 exit:
-    mbedtls_platform_zeroize( buf, sizeof( buf ) );
+    mbedtls_platform_zeroize(buf, sizeof(buf));
 
-    fclose( f );
-    return( ret );
+    fclose(f);
+    return (ret);
 }
 
-int mbedtls_entropy_update_seed_file( mbedtls_entropy_context *ctx, const char *path )
+int mbedtls_entropy_update_seed_file(mbedtls_entropy_context *ctx, const char *path)
 {
     int ret = 0;
     FILE *f;
     size_t n;
     unsigned char buf[ MBEDTLS_ENTROPY_MAX_SEED_SIZE ];
 
-    if( ( f = fopen( path, "rb" ) ) == NULL )
-        return( MBEDTLS_ERR_ENTROPY_FILE_IO_ERROR );
+    if ((f = fopen(path, "rb")) == NULL)
+        return (MBEDTLS_ERR_ENTROPY_FILE_IO_ERROR);
 
-    fseek( f, 0, SEEK_END );
-    n = (size_t) ftell( f );
-    fseek( f, 0, SEEK_SET );
+    fseek(f, 0, SEEK_END);
+    n = (size_t) ftell(f);
+    fseek(f, 0, SEEK_SET);
 
-    if( n > MBEDTLS_ENTROPY_MAX_SEED_SIZE )
+    if (n > MBEDTLS_ENTROPY_MAX_SEED_SIZE)
         n = MBEDTLS_ENTROPY_MAX_SEED_SIZE;
 
-    if( fread( buf, 1, n, f ) != n )
+    if (fread(buf, 1, n, f) != n)
         ret = MBEDTLS_ERR_ENTROPY_FILE_IO_ERROR;
     else
-        ret = mbedtls_entropy_update_manual( ctx, buf, n );
+        ret = mbedtls_entropy_update_manual(ctx, buf, n);
 
-    fclose( f );
+    fclose(f);
 
-    mbedtls_platform_zeroize( buf, sizeof( buf ) );
+    mbedtls_platform_zeroize(buf, sizeof(buf));
 
-    if( ret != 0 )
-        return( ret );
+    if (ret != 0)
+        return (ret);
 
-    return( mbedtls_entropy_write_seed_file( ctx, path ) );
+    return (mbedtls_entropy_write_seed_file(ctx, path));
 }
 #endif /* MBEDTLS_FS_IO */
 
@@ -528,60 +518,57 @@ int mbedtls_entropy_update_seed_file( mbedtls_entropy_context *ctx, const char *
 /*
  * Dummy source function
  */
-static int entropy_dummy_source( void *data, unsigned char *output,
-                                 size_t len, size_t *olen )
+static int entropy_dummy_source(void *data, unsigned char *output,
+                                size_t len, size_t *olen)
 {
     ((void) data);
 
-    memset( output, 0x2a, len );
+    memset(output, 0x2a, len);
     *olen = len;
 
-    return( 0 );
+    return (0);
 }
 #endif /* !MBEDTLS_TEST_NULL_ENTROPY */
 
 #if defined(MBEDTLS_ENTROPY_HARDWARE_ALT)
 
-static int mbedtls_entropy_source_self_test_gather( unsigned char *buf, size_t buf_len )
+static int mbedtls_entropy_source_self_test_gather(unsigned char *buf, size_t buf_len)
 {
     int ret = 0;
     size_t entropy_len = 0;
     size_t olen = 0;
     size_t attempts = buf_len;
 
-    while( attempts > 0 && entropy_len < buf_len )
-    {
-        if( ( ret = mbedtls_hardware_poll( NULL, buf + entropy_len,
-            buf_len - entropy_len, &olen ) ) != 0 )
-            return( ret );
+    while (attempts > 0 && entropy_len < buf_len) {
+        if ((ret = mbedtls_hardware_poll(NULL, buf + entropy_len,
+                                         buf_len - entropy_len, &olen)) != 0)
+            return (ret);
 
         entropy_len += olen;
         attempts--;
     }
 
-    if( entropy_len < buf_len )
-    {
+    if (entropy_len < buf_len) {
         ret = 1;
     }
 
-    return( ret );
+    return (ret);
 }
 
 
-static int mbedtls_entropy_source_self_test_check_bits( const unsigned char *buf,
-                                                        size_t buf_len )
+static int mbedtls_entropy_source_self_test_check_bits(const unsigned char *buf,
+                                                       size_t buf_len)
 {
-    unsigned char set= 0xFF;
+    unsigned char set = 0xFF;
     unsigned char unset = 0x00;
     size_t i;
 
-    for( i = 0; i < buf_len; i++ )
-    {
+    for (i = 0; i < buf_len; i++) {
         set &= buf[i];
         unset |= buf[i];
     }
 
-    return( set == 0xFF || unset == 0x00 );
+    return (set == 0xFF || unset == 0x00);
 }
 
 /*
@@ -595,45 +582,44 @@ static int mbedtls_entropy_source_self_test_check_bits( const unsigned char *buf
  *    are not equal.
  *  - The error code returned by the entropy source is not an error.
  */
-int mbedtls_entropy_source_self_test( int verbose )
+int mbedtls_entropy_source_self_test(int verbose)
 {
     int ret = 0;
-    unsigned char buf0[2 * sizeof( unsigned long long int )];
-    unsigned char buf1[2 * sizeof( unsigned long long int )];
+    unsigned char buf0[2 * sizeof(unsigned long long int)];
+    unsigned char buf1[2 * sizeof(unsigned long long int)];
 
-    if( verbose != 0 )
-        mbedtls_printf( "  ENTROPY_BIAS test: " );
+    if (verbose != 0)
+        mbedtls_printf("  ENTROPY_BIAS test: ");
 
-    memset( buf0, 0x00, sizeof( buf0 ) );
-    memset( buf1, 0x00, sizeof( buf1 ) );
+    memset(buf0, 0x00, sizeof(buf0));
+    memset(buf1, 0x00, sizeof(buf1));
 
-    if( ( ret = mbedtls_entropy_source_self_test_gather( buf0, sizeof( buf0 ) ) ) != 0 )
+    if ((ret = mbedtls_entropy_source_self_test_gather(buf0, sizeof(buf0))) != 0)
         goto cleanup;
-    if( ( ret = mbedtls_entropy_source_self_test_gather( buf1, sizeof( buf1 ) ) ) != 0 )
+    if ((ret = mbedtls_entropy_source_self_test_gather(buf1, sizeof(buf1))) != 0)
         goto cleanup;
 
     /* Make sure that the returned values are not all 0 or 1 */
-    if( ( ret = mbedtls_entropy_source_self_test_check_bits( buf0, sizeof( buf0 ) ) ) != 0 )
+    if ((ret = mbedtls_entropy_source_self_test_check_bits(buf0, sizeof(buf0))) != 0)
         goto cleanup;
-    if( ( ret = mbedtls_entropy_source_self_test_check_bits( buf1, sizeof( buf1 ) ) ) != 0 )
+    if ((ret = mbedtls_entropy_source_self_test_check_bits(buf1, sizeof(buf1))) != 0)
         goto cleanup;
 
     /* Make sure that the entropy source is not returning values in a
      * pattern */
-    ret = memcmp( buf0, buf1, sizeof( buf0 ) ) == 0;
+    ret = memcmp(buf0, buf1, sizeof(buf0)) == 0;
 
 cleanup:
-    if( verbose != 0 )
-    {
-        if( ret != 0 )
-            mbedtls_printf( "failed\n" );
+    if (verbose != 0) {
+        if (ret != 0)
+            mbedtls_printf("failed\n");
         else
-            mbedtls_printf( "passed\n" );
+            mbedtls_printf("passed\n");
 
-        mbedtls_printf( "\n" );
+        mbedtls_printf("\n");
     }
 
-    return( ret != 0 );
+    return (ret != 0);
 }
 
 #endif /* MBEDTLS_ENTROPY_HARDWARE_ALT */
@@ -643,7 +629,7 @@ cleanup:
  * test that the functions don't cause errors and write the correct
  * amount of data to buffers.
  */
-int mbedtls_entropy_self_test( int verbose )
+int mbedtls_entropy_self_test(int verbose)
 {
     int ret = 1;
 #if !defined(MBEDTLS_TEST_NULL_ENTROPY)
@@ -653,22 +639,22 @@ int mbedtls_entropy_self_test( int verbose )
     size_t i, j;
 #endif /* !MBEDTLS_TEST_NULL_ENTROPY */
 
-    if( verbose != 0 )
-        mbedtls_printf( "  ENTROPY test: " );
+    if (verbose != 0)
+        mbedtls_printf("  ENTROPY test: ");
 
 #if !defined(MBEDTLS_TEST_NULL_ENTROPY)
-    mbedtls_entropy_init( &ctx );
+    mbedtls_entropy_init(&ctx);
 
     /* First do a gather to make sure we have default sources */
-    if( ( ret = mbedtls_entropy_gather( &ctx ) ) != 0 )
+    if ((ret = mbedtls_entropy_gather(&ctx)) != 0)
         goto cleanup;
 
-    ret = mbedtls_entropy_add_source( &ctx, entropy_dummy_source, NULL, 16,
-                                      MBEDTLS_ENTROPY_SOURCE_WEAK );
-    if( ret != 0 )
+    ret = mbedtls_entropy_add_source(&ctx, entropy_dummy_source, NULL, 16,
+                                     MBEDTLS_ENTROPY_SOURCE_WEAK);
+    if (ret != 0)
         goto cleanup;
 
-    if( ( ret = mbedtls_entropy_update_manual( &ctx, buf, sizeof buf ) ) != 0 )
+    if ((ret = mbedtls_entropy_update_manual(&ctx, buf, sizeof buf)) != 0)
         goto cleanup;
 
     /*
@@ -679,44 +665,40 @@ int mbedtls_entropy_self_test( int verbose )
      *   each of the 32 or 64 bytes to be non-zero has a false failure rate
      *   of at most 2^(-58) which is acceptable.
      */
-    for( i = 0; i < 8; i++ )
-    {
-        if( ( ret = mbedtls_entropy_func( &ctx, buf, sizeof( buf ) ) ) != 0 )
+    for (i = 0; i < 8; i++) {
+        if ((ret = mbedtls_entropy_func(&ctx, buf, sizeof(buf))) != 0)
             goto cleanup;
 
-        for( j = 0; j < sizeof( buf ); j++ )
+        for (j = 0; j < sizeof(buf); j++)
             acc[j] |= buf[j];
     }
 
-    for( j = 0; j < sizeof( buf ); j++ )
-    {
-        if( acc[j] == 0 )
-        {
+    for (j = 0; j < sizeof(buf); j++) {
+        if (acc[j] == 0) {
             ret = 1;
             goto cleanup;
         }
     }
 
 #if defined(MBEDTLS_ENTROPY_HARDWARE_ALT)
-    if( ( ret = mbedtls_entropy_source_self_test( 0 ) ) != 0 )
+    if ((ret = mbedtls_entropy_source_self_test(0)) != 0)
         goto cleanup;
 #endif
 
 cleanup:
-    mbedtls_entropy_free( &ctx );
+    mbedtls_entropy_free(&ctx);
 #endif /* !MBEDTLS_TEST_NULL_ENTROPY */
 
-    if( verbose != 0 )
-    {
-        if( ret != 0 )
-            mbedtls_printf( "failed\n" );
+    if (verbose != 0) {
+        if (ret != 0)
+            mbedtls_printf("failed\n");
         else
-            mbedtls_printf( "passed\n" );
+            mbedtls_printf("passed\n");
 
-        mbedtls_printf( "\n" );
+        mbedtls_printf("\n");
     }
 
-    return( ret != 0 );
+    return (ret != 0);
 }
 #endif /* MBEDTLS_SELF_TEST */
 
diff --git a/common/mbedtls/entropy.h b/common/mbedtls/entropy.h
index b1e8c4cd5..a7e4072ee 100644
--- a/common/mbedtls/entropy.h
+++ b/common/mbedtls/entropy.h
@@ -104,15 +104,14 @@ extern "C" {
  *                  MBEDTLS_ERR_ENTROPY_SOURCE_FAILED otherwise
  */
 typedef int (*mbedtls_entropy_f_source_ptr)(void *data, unsigned char *output, size_t len,
-                            size_t *olen);
+                                            size_t *olen);
 
 /**
  * \brief           Entropy source state
  */
-typedef struct mbedtls_entropy_source_state
-{
+typedef struct mbedtls_entropy_source_state {
     mbedtls_entropy_f_source_ptr    f_source;   /**< The entropy source callback */
-    void *          p_source;   /**< The callback data pointer */
+    void           *p_source;   /**< The callback data pointer */
     size_t          size;       /**< Amount received in bytes */
     size_t          threshold;  /**< Minimum bytes required before release */
     int             strong;     /**< Is the source strong? */
@@ -122,8 +121,7 @@ mbedtls_entropy_source_state;
 /**
  * \brief           Entropy context structure
  */
-typedef struct mbedtls_entropy_context
-{
+typedef struct mbedtls_entropy_context {
     int accumulator_started;
 #if defined(MBEDTLS_ENTROPY_SHA512_ACCUMULATOR)
     mbedtls_sha512_context  accumulator;
@@ -149,14 +147,14 @@ mbedtls_entropy_context;
  *
  * \param ctx       Entropy context to initialize
  */
-void mbedtls_entropy_init( mbedtls_entropy_context *ctx );
+void mbedtls_entropy_init(mbedtls_entropy_context *ctx);
 
 /**
  * \brief           Free the data in the context
  *
  * \param ctx       Entropy context to free
  */
-void mbedtls_entropy_free( mbedtls_entropy_context *ctx );
+void mbedtls_entropy_free(mbedtls_entropy_context *ctx);
 
 /**
  * \brief           Adds an entropy source to poll
@@ -175,9 +173,9 @@ void mbedtls_entropy_free( mbedtls_entropy_context *ctx );
  *
  * \return          0 if successful or MBEDTLS_ERR_ENTROPY_MAX_SOURCES
  */
-int mbedtls_entropy_add_source( mbedtls_entropy_context *ctx,
-                        mbedtls_entropy_f_source_ptr f_source, void *p_source,
-                        size_t threshold, int strong );
+int mbedtls_entropy_add_source(mbedtls_entropy_context *ctx,
+                               mbedtls_entropy_f_source_ptr f_source, void *p_source,
+                               size_t threshold, int strong);
 
 /**
  * \brief           Trigger an extra gather poll for the accumulator
@@ -187,7 +185,7 @@ int mbedtls_entropy_add_source( mbedtls_entropy_context *ctx,
  *
  * \return          0 if successful, or MBEDTLS_ERR_ENTROPY_SOURCE_FAILED
  */
-int mbedtls_entropy_gather( mbedtls_entropy_context *ctx );
+int mbedtls_entropy_gather(mbedtls_entropy_context *ctx);
 
 /**
  * \brief           Retrieve entropy from the accumulator
@@ -200,7 +198,7 @@ int mbedtls_entropy_gather( mbedtls_entropy_context *ctx );
  *
  * \return          0 if successful, or MBEDTLS_ERR_ENTROPY_SOURCE_FAILED
  */
-int mbedtls_entropy_func( void *data, unsigned char *output, size_t len );
+int mbedtls_entropy_func(void *data, unsigned char *output, size_t len);
 
 /**
  * \brief           Add data to the accumulator manually
@@ -212,8 +210,8 @@ int mbedtls_entropy_func( void *data, unsigned char *output, size_t len );
  *
  * \return          0 if successful
  */
-int mbedtls_entropy_update_manual( mbedtls_entropy_context *ctx,
-                           const unsigned char *data, size_t len );
+int mbedtls_entropy_update_manual(mbedtls_entropy_context *ctx,
+                                  const unsigned char *data, size_t len);
 
 #if defined(MBEDTLS_ENTROPY_NV_SEED)
 /**
@@ -224,7 +222,7 @@ int mbedtls_entropy_update_manual( mbedtls_entropy_context *ctx,
  *
  * \return          0 if successful
  */
-int mbedtls_entropy_update_nv_seed( mbedtls_entropy_context *ctx );
+int mbedtls_entropy_update_nv_seed(mbedtls_entropy_context *ctx);
 #endif /* MBEDTLS_ENTROPY_NV_SEED */
 
 #if defined(MBEDTLS_FS_IO)
@@ -238,7 +236,7 @@ int mbedtls_entropy_update_nv_seed( mbedtls_entropy_context *ctx );
  *                      MBEDTLS_ERR_ENTROPY_FILE_IO_ERROR on file error, or
  *                      MBEDTLS_ERR_ENTROPY_SOURCE_FAILED
  */
-int mbedtls_entropy_write_seed_file( mbedtls_entropy_context *ctx, const char *path );
+int mbedtls_entropy_write_seed_file(mbedtls_entropy_context *ctx, const char *path);
 
 /**
  * \brief               Read and update a seed file. Seed is added to this
@@ -252,7 +250,7 @@ int mbedtls_entropy_write_seed_file( mbedtls_entropy_context *ctx, const char *p
  *                      MBEDTLS_ERR_ENTROPY_FILE_IO_ERROR on file error,
  *                      MBEDTLS_ERR_ENTROPY_SOURCE_FAILED
  */
-int mbedtls_entropy_update_seed_file( mbedtls_entropy_context *ctx, const char *path );
+int mbedtls_entropy_update_seed_file(mbedtls_entropy_context *ctx, const char *path);
 #endif /* MBEDTLS_FS_IO */
 
 #if defined(MBEDTLS_SELF_TEST)
@@ -264,7 +262,7 @@ int mbedtls_entropy_update_seed_file( mbedtls_entropy_context *ctx, const char *
  *
  * \return         0 if successful, or 1 if a test failed
  */
-int mbedtls_entropy_self_test( int verbose );
+int mbedtls_entropy_self_test(int verbose);
 
 #if defined(MBEDTLS_ENTROPY_HARDWARE_ALT)
 /**
@@ -280,7 +278,7 @@ int mbedtls_entropy_self_test( int verbose );
  *
  * \return         0 if successful, or 1 if a test failed
  */
-int mbedtls_entropy_source_self_test( int verbose );
+int mbedtls_entropy_source_self_test(int verbose);
 #endif /* MBEDTLS_ENTROPY_HARDWARE_ALT */
 #endif /* MBEDTLS_SELF_TEST */
 
diff --git a/common/mbedtls/entropy_poll.c b/common/mbedtls/entropy_poll.c
index e8b8da86e..31fec8145 100644
--- a/common/mbedtls/entropy_poll.c
+++ b/common/mbedtls/entropy_poll.c
@@ -65,29 +65,27 @@
 #include <windows.h>
 #include <wincrypt.h>
 
-int mbedtls_platform_entropy_poll( void *data, unsigned char *output, size_t len,
-                           size_t *olen )
+int mbedtls_platform_entropy_poll(void *data, unsigned char *output, size_t len,
+                                  size_t *olen)
 {
     HCRYPTPROV provider;
     ((void) data);
     *olen = 0;
 
-    if( CryptAcquireContext( &provider, NULL, NULL,
-                              PROV_RSA_FULL, CRYPT_VERIFYCONTEXT ) == FALSE )
-    {
-        return( MBEDTLS_ERR_ENTROPY_SOURCE_FAILED );
+    if (CryptAcquireContext(&provider, NULL, NULL,
+                            PROV_RSA_FULL, CRYPT_VERIFYCONTEXT) == FALSE) {
+        return (MBEDTLS_ERR_ENTROPY_SOURCE_FAILED);
     }
 
-    if( CryptGenRandom( provider, (DWORD) len, output ) == FALSE )
-    {
-        CryptReleaseContext( provider, 0 );
-        return( MBEDTLS_ERR_ENTROPY_SOURCE_FAILED );
+    if (CryptGenRandom(provider, (DWORD) len, output) == FALSE) {
+        CryptReleaseContext(provider, 0);
+        return (MBEDTLS_ERR_ENTROPY_SOURCE_FAILED);
     }
 
-    CryptReleaseContext( provider, 0 );
+    CryptReleaseContext(provider, 0);
     *olen = len;
 
-    return( 0 );
+    return (0);
 }
 #else /* _WIN32 && !EFIX64 && !EFI32 */
 
@@ -102,21 +100,21 @@ int mbedtls_platform_entropy_poll( void *data, unsigned char *output, size_t len
 #if defined(SYS_getrandom)
 #define HAVE_GETRANDOM
 
-static int getrandom_wrapper( void *buf, size_t buflen, unsigned int flags )
+static int getrandom_wrapper(void *buf, size_t buflen, unsigned int flags)
 {
     /* MemSan cannot understand that the syscall writes to the buffer */
 #if defined(__has_feature)
 #if __has_feature(memory_sanitizer)
-    memset( buf, 0, buflen );
+    memset(buf, 0, buflen);
 #endif
 #endif
 
-    return( syscall( SYS_getrandom, buf, buflen, flags ) );
+    return (syscall(SYS_getrandom, buf, buflen, flags));
 }
 
 #include <sys/utsname.h>
 /* Check if version is at least 3.17.0 */
-static int check_version_3_17_plus( void )
+static int check_version_3_17_plus(void)
 {
     int minor;
     struct utsname un;
@@ -127,28 +125,28 @@ static int check_version_3_17_plus( void )
     ver = un.release;
 
     /* Check major version; assume a single digit */
-    if( ver[0] < '3' || ver[0] > '9' || ver [1] != '.' )
-        return( -1 );
+    if (ver[0] < '3' || ver[0] > '9' || ver [1] != '.')
+        return (-1);
 
-    if( ver[0] - '0' > 3 )
-        return( 0 );
+    if (ver[0] - '0' > 3)
+        return (0);
 
     /* Ok, so now we know major == 3, check minor.
      * Assume 1 or 2 digits. */
-    if( ver[2] < '0' || ver[2] > '9' )
-        return( -1 );
+    if (ver[2] < '0' || ver[2] > '9')
+        return (-1);
 
     minor = ver[2] - '0';
 
-    if( ver[3] >= '0' && ver[3] <= '9' )
+    if (ver[3] >= '0' && ver[3] <= '9')
         minor = 10 * minor + ver[3] - '0';
-    else if( ver [3] != '.' )
-        return( -1 );
+    else if (ver [3] != '.')
+        return (-1);
 
-    if( minor < 17 )
-        return( -1 );
+    if (minor < 17)
+        return (-1);
 
-    return( 0 );
+    return (0);
 }
 static int has_getrandom = -1;
 #endif /* SYS_getrandom */
@@ -156,121 +154,119 @@ static int has_getrandom = -1;
 
 #include <stdio.h>
 
-int mbedtls_platform_entropy_poll( void *data,
-                           unsigned char *output, size_t len, size_t *olen )
+int mbedtls_platform_entropy_poll(void *data,
+                                  unsigned char *output, size_t len, size_t *olen)
 {
     FILE *file;
     size_t read_len;
     ((void) data);
 
 #if defined(HAVE_GETRANDOM)
-    if( has_getrandom == -1 )
-        has_getrandom = ( check_version_3_17_plus() == 0 );
+    if (has_getrandom == -1)
+        has_getrandom = (check_version_3_17_plus() == 0);
 
-    if( has_getrandom )
-    {
+    if (has_getrandom) {
         int ret;
 
-        if( ( ret = getrandom_wrapper( output, len, 0 ) ) < 0 )
-            return( MBEDTLS_ERR_ENTROPY_SOURCE_FAILED );
+        if ((ret = getrandom_wrapper(output, len, 0)) < 0)
+            return (MBEDTLS_ERR_ENTROPY_SOURCE_FAILED);
 
         *olen = ret;
-        return( 0 );
+        return (0);
     }
 #endif /* HAVE_GETRANDOM */
 
     *olen = 0;
 
-    file = fopen( "/dev/urandom", "rb" );
-    if( file == NULL )
-        return( MBEDTLS_ERR_ENTROPY_SOURCE_FAILED );
+    file = fopen("/dev/urandom", "rb");
+    if (file == NULL)
+        return (MBEDTLS_ERR_ENTROPY_SOURCE_FAILED);
 
-    read_len = fread( output, 1, len, file );
-    if( read_len != len )
-    {
-        fclose( file );
-        return( MBEDTLS_ERR_ENTROPY_SOURCE_FAILED );
+    read_len = fread(output, 1, len, file);
+    if (read_len != len) {
+        fclose(file);
+        return (MBEDTLS_ERR_ENTROPY_SOURCE_FAILED);
     }
 
-    fclose( file );
+    fclose(file);
     *olen = len;
 
-    return( 0 );
+    return (0);
 }
 #endif /* _WIN32 && !EFIX64 && !EFI32 */
 #endif /* !MBEDTLS_NO_PLATFORM_ENTROPY */
 
 #if defined(MBEDTLS_TEST_NULL_ENTROPY)
-int mbedtls_null_entropy_poll( void *data,
-                    unsigned char *output, size_t len, size_t *olen )
+int mbedtls_null_entropy_poll(void *data,
+                              unsigned char *output, size_t len, size_t *olen)
 {
     ((void) data);
     ((void) output);
     *olen = 0;
 
-    if( len < sizeof(unsigned char) )
-        return( 0 );
+    if (len < sizeof(unsigned char))
+        return (0);
 
     *olen = sizeof(unsigned char);
 
-    return( 0 );
+    return (0);
 }
 #endif
 
 #if defined(MBEDTLS_TIMING_C)
-int mbedtls_hardclock_poll( void *data,
-                    unsigned char *output, size_t len, size_t *olen )
+int mbedtls_hardclock_poll(void *data,
+                           unsigned char *output, size_t len, size_t *olen)
 {
     unsigned long timer = mbedtls_timing_hardclock();
     ((void) data);
     *olen = 0;
 
-    if( len < sizeof(unsigned long) )
-        return( 0 );
+    if (len < sizeof(unsigned long))
+        return (0);
 
-    memcpy( output, &timer, sizeof(unsigned long) );
+    memcpy(output, &timer, sizeof(unsigned long));
     *olen = sizeof(unsigned long);
 
-    return( 0 );
+    return (0);
 }
 #endif /* MBEDTLS_TIMING_C */
 
 #if defined(MBEDTLS_HAVEGE_C)
-int mbedtls_havege_poll( void *data,
-                 unsigned char *output, size_t len, size_t *olen )
+int mbedtls_havege_poll(void *data,
+                        unsigned char *output, size_t len, size_t *olen)
 {
     mbedtls_havege_state *hs = (mbedtls_havege_state *) data;
     *olen = 0;
 
-    if( mbedtls_havege_random( hs, output, len ) != 0 )
-        return( MBEDTLS_ERR_ENTROPY_SOURCE_FAILED );
+    if (mbedtls_havege_random(hs, output, len) != 0)
+        return (MBEDTLS_ERR_ENTROPY_SOURCE_FAILED);
 
     *olen = len;
 
-    return( 0 );
+    return (0);
 }
 #endif /* MBEDTLS_HAVEGE_C */
 
 #if defined(MBEDTLS_ENTROPY_NV_SEED)
-int mbedtls_nv_seed_poll( void *data,
-                          unsigned char *output, size_t len, size_t *olen )
+int mbedtls_nv_seed_poll(void *data,
+                         unsigned char *output, size_t len, size_t *olen)
 {
     unsigned char buf[MBEDTLS_ENTROPY_BLOCK_SIZE];
     size_t use_len = MBEDTLS_ENTROPY_BLOCK_SIZE;
     ((void) data);
 
-    memset( buf, 0, MBEDTLS_ENTROPY_BLOCK_SIZE );
+    memset(buf, 0, MBEDTLS_ENTROPY_BLOCK_SIZE);
 
-    if( mbedtls_nv_seed_read( buf, MBEDTLS_ENTROPY_BLOCK_SIZE ) < 0 )
-      return( MBEDTLS_ERR_ENTROPY_SOURCE_FAILED );
+    if (mbedtls_nv_seed_read(buf, MBEDTLS_ENTROPY_BLOCK_SIZE) < 0)
+        return (MBEDTLS_ERR_ENTROPY_SOURCE_FAILED);
 
-    if( len < use_len )
-      use_len = len;
+    if (len < use_len)
+        use_len = len;
 
-    memcpy( output, buf, use_len );
+    memcpy(output, buf, use_len);
     *olen = use_len;
 
-    return( 0 );
+    return (0);
 }
 #endif /* MBEDTLS_ENTROPY_NV_SEED */
 
diff --git a/common/mbedtls/entropy_poll.h b/common/mbedtls/entropy_poll.h
index d48b8555b..fd49d8519 100644
--- a/common/mbedtls/entropy_poll.h
+++ b/common/mbedtls/entropy_poll.h
@@ -52,16 +52,16 @@ extern "C" {
  * \brief           Entropy poll callback that provides 0 entropy.
  */
 #if defined(MBEDTLS_TEST_NULL_ENTROPY)
-    int mbedtls_null_entropy_poll( void *data,
-                                unsigned char *output, size_t len, size_t *olen );
+int mbedtls_null_entropy_poll(void *data,
+                              unsigned char *output, size_t len, size_t *olen);
 #endif
 
 #if !defined(MBEDTLS_NO_PLATFORM_ENTROPY)
 /**
  * \brief           Platform-specific entropy poll callback
  */
-int mbedtls_platform_entropy_poll( void *data,
-                           unsigned char *output, size_t len, size_t *olen );
+int mbedtls_platform_entropy_poll(void *data,
+                                  unsigned char *output, size_t len, size_t *olen);
 #endif
 
 #if defined(MBEDTLS_HAVEGE_C)
@@ -70,16 +70,16 @@ int mbedtls_platform_entropy_poll( void *data,
  *
  * Requires an HAVEGE state as its data pointer.
  */
-int mbedtls_havege_poll( void *data,
-                 unsigned char *output, size_t len, size_t *olen );
+int mbedtls_havege_poll(void *data,
+                        unsigned char *output, size_t len, size_t *olen);
 #endif
 
 #if defined(MBEDTLS_TIMING_C)
 /**
  * \brief           mbedtls_timing_hardclock-based entropy poll callback
  */
-int mbedtls_hardclock_poll( void *data,
-                    unsigned char *output, size_t len, size_t *olen );
+int mbedtls_hardclock_poll(void *data,
+                           unsigned char *output, size_t len, size_t *olen);
 #endif
 
 #if defined(MBEDTLS_ENTROPY_HARDWARE_ALT)
@@ -91,8 +91,8 @@ int mbedtls_hardclock_poll( void *data,
  *
  * \note            This must accept NULL as its first argument.
  */
-int mbedtls_hardware_poll( void *data,
-                           unsigned char *output, size_t len, size_t *olen );
+int mbedtls_hardware_poll(void *data,
+                          unsigned char *output, size_t len, size_t *olen);
 #endif
 
 #if defined(MBEDTLS_ENTROPY_NV_SEED)
@@ -101,8 +101,8 @@ int mbedtls_hardware_poll( void *data,
  *
  * \note            This must accept NULL as its first argument.
  */
-int mbedtls_nv_seed_poll( void *data,
-                          unsigned char *output, size_t len, size_t *olen );
+int mbedtls_nv_seed_poll(void *data,
+                         unsigned char *output, size_t len, size_t *olen);
 #endif
 
 #ifdef __cplusplus
diff --git a/common/mbedtls/error.c b/common/mbedtls/error.c
index d8c0ddc60..c39831388 100644
--- a/common/mbedtls/error.c
+++ b/common/mbedtls/error.c
@@ -208,383 +208,380 @@
 #endif
 
 
-void mbedtls_strerror( int ret, char *buf, size_t buflen )
+void mbedtls_strerror(int ret, char *buf, size_t buflen)
 {
     size_t len;
     int use_ret;
 
-    if( buflen == 0 )
+    if (buflen == 0)
         return;
 
-    memset( buf, 0x00, buflen );
+    memset(buf, 0x00, buflen);
 
-    if( ret < 0 )
+    if (ret < 0)
         ret = -ret;
 
-    if( ret & 0xFF80 )
-    {
+    if (ret & 0xFF80) {
         use_ret = ret & 0xFF80;
 
         // High level error codes
         //
         // BEGIN generated code
 #if defined(MBEDTLS_CIPHER_C)
-        if( use_ret == -(MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE) )
-            mbedtls_snprintf( buf, buflen, "CIPHER - The selected feature is not available" );
-        if( use_ret == -(MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA) )
-            mbedtls_snprintf( buf, buflen, "CIPHER - Bad input parameters" );
-        if( use_ret == -(MBEDTLS_ERR_CIPHER_ALLOC_FAILED) )
-            mbedtls_snprintf( buf, buflen, "CIPHER - Failed to allocate memory" );
-        if( use_ret == -(MBEDTLS_ERR_CIPHER_INVALID_PADDING) )
-            mbedtls_snprintf( buf, buflen, "CIPHER - Input data contains invalid padding and is rejected" );
-        if( use_ret == -(MBEDTLS_ERR_CIPHER_FULL_BLOCK_EXPECTED) )
-            mbedtls_snprintf( buf, buflen, "CIPHER - Decryption of block requires a full block" );
-        if( use_ret == -(MBEDTLS_ERR_CIPHER_AUTH_FAILED) )
-            mbedtls_snprintf( buf, buflen, "CIPHER - Authentication failed (for AEAD modes)" );
-        if( use_ret == -(MBEDTLS_ERR_CIPHER_INVALID_CONTEXT) )
-            mbedtls_snprintf( buf, buflen, "CIPHER - The context is invalid. For example, because it was freed" );
-        if( use_ret == -(MBEDTLS_ERR_CIPHER_HW_ACCEL_FAILED) )
-            mbedtls_snprintf( buf, buflen, "CIPHER - Cipher hardware accelerator failed" );
+        if (use_ret == -(MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE))
+            mbedtls_snprintf(buf, buflen, "CIPHER - The selected feature is not available");
+        if (use_ret == -(MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA))
+            mbedtls_snprintf(buf, buflen, "CIPHER - Bad input parameters");
+        if (use_ret == -(MBEDTLS_ERR_CIPHER_ALLOC_FAILED))
+            mbedtls_snprintf(buf, buflen, "CIPHER - Failed to allocate memory");
+        if (use_ret == -(MBEDTLS_ERR_CIPHER_INVALID_PADDING))
+            mbedtls_snprintf(buf, buflen, "CIPHER - Input data contains invalid padding and is rejected");
+        if (use_ret == -(MBEDTLS_ERR_CIPHER_FULL_BLOCK_EXPECTED))
+            mbedtls_snprintf(buf, buflen, "CIPHER - Decryption of block requires a full block");
+        if (use_ret == -(MBEDTLS_ERR_CIPHER_AUTH_FAILED))
+            mbedtls_snprintf(buf, buflen, "CIPHER - Authentication failed (for AEAD modes)");
+        if (use_ret == -(MBEDTLS_ERR_CIPHER_INVALID_CONTEXT))
+            mbedtls_snprintf(buf, buflen, "CIPHER - The context is invalid. For example, because it was freed");
+        if (use_ret == -(MBEDTLS_ERR_CIPHER_HW_ACCEL_FAILED))
+            mbedtls_snprintf(buf, buflen, "CIPHER - Cipher hardware accelerator failed");
 #endif /* MBEDTLS_CIPHER_C */
 
 #if defined(MBEDTLS_DHM_C)
-        if( use_ret == -(MBEDTLS_ERR_DHM_BAD_INPUT_DATA) )
-            mbedtls_snprintf( buf, buflen, "DHM - Bad input parameters" );
-        if( use_ret == -(MBEDTLS_ERR_DHM_READ_PARAMS_FAILED) )
-            mbedtls_snprintf( buf, buflen, "DHM - Reading of the DHM parameters failed" );
-        if( use_ret == -(MBEDTLS_ERR_DHM_MAKE_PARAMS_FAILED) )
-            mbedtls_snprintf( buf, buflen, "DHM - Making of the DHM parameters failed" );
-        if( use_ret == -(MBEDTLS_ERR_DHM_READ_PUBLIC_FAILED) )
-            mbedtls_snprintf( buf, buflen, "DHM - Reading of the public values failed" );
-        if( use_ret == -(MBEDTLS_ERR_DHM_MAKE_PUBLIC_FAILED) )
-            mbedtls_snprintf( buf, buflen, "DHM - Making of the public value failed" );
-        if( use_ret == -(MBEDTLS_ERR_DHM_CALC_SECRET_FAILED) )
-            mbedtls_snprintf( buf, buflen, "DHM - Calculation of the DHM secret failed" );
-        if( use_ret == -(MBEDTLS_ERR_DHM_INVALID_FORMAT) )
-            mbedtls_snprintf( buf, buflen, "DHM - The ASN.1 data is not formatted correctly" );
-        if( use_ret == -(MBEDTLS_ERR_DHM_ALLOC_FAILED) )
-            mbedtls_snprintf( buf, buflen, "DHM - Allocation of memory failed" );
-        if( use_ret == -(MBEDTLS_ERR_DHM_FILE_IO_ERROR) )
-            mbedtls_snprintf( buf, buflen, "DHM - Read or write of file failed" );
-        if( use_ret == -(MBEDTLS_ERR_DHM_HW_ACCEL_FAILED) )
-            mbedtls_snprintf( buf, buflen, "DHM - DHM hardware accelerator failed" );
-        if( use_ret == -(MBEDTLS_ERR_DHM_SET_GROUP_FAILED) )
-            mbedtls_snprintf( buf, buflen, "DHM - Setting the modulus and generator failed" );
+        if (use_ret == -(MBEDTLS_ERR_DHM_BAD_INPUT_DATA))
+            mbedtls_snprintf(buf, buflen, "DHM - Bad input parameters");
+        if (use_ret == -(MBEDTLS_ERR_DHM_READ_PARAMS_FAILED))
+            mbedtls_snprintf(buf, buflen, "DHM - Reading of the DHM parameters failed");
+        if (use_ret == -(MBEDTLS_ERR_DHM_MAKE_PARAMS_FAILED))
+            mbedtls_snprintf(buf, buflen, "DHM - Making of the DHM parameters failed");
+        if (use_ret == -(MBEDTLS_ERR_DHM_READ_PUBLIC_FAILED))
+            mbedtls_snprintf(buf, buflen, "DHM - Reading of the public values failed");
+        if (use_ret == -(MBEDTLS_ERR_DHM_MAKE_PUBLIC_FAILED))
+            mbedtls_snprintf(buf, buflen, "DHM - Making of the public value failed");
+        if (use_ret == -(MBEDTLS_ERR_DHM_CALC_SECRET_FAILED))
+            mbedtls_snprintf(buf, buflen, "DHM - Calculation of the DHM secret failed");
+        if (use_ret == -(MBEDTLS_ERR_DHM_INVALID_FORMAT))
+            mbedtls_snprintf(buf, buflen, "DHM - The ASN.1 data is not formatted correctly");
+        if (use_ret == -(MBEDTLS_ERR_DHM_ALLOC_FAILED))
+            mbedtls_snprintf(buf, buflen, "DHM - Allocation of memory failed");
+        if (use_ret == -(MBEDTLS_ERR_DHM_FILE_IO_ERROR))
+            mbedtls_snprintf(buf, buflen, "DHM - Read or write of file failed");
+        if (use_ret == -(MBEDTLS_ERR_DHM_HW_ACCEL_FAILED))
+            mbedtls_snprintf(buf, buflen, "DHM - DHM hardware accelerator failed");
+        if (use_ret == -(MBEDTLS_ERR_DHM_SET_GROUP_FAILED))
+            mbedtls_snprintf(buf, buflen, "DHM - Setting the modulus and generator failed");
 #endif /* MBEDTLS_DHM_C */
 
 #if defined(MBEDTLS_ECP_C)
-        if( use_ret == -(MBEDTLS_ERR_ECP_BAD_INPUT_DATA) )
-            mbedtls_snprintf( buf, buflen, "ECP - Bad input parameters to function" );
-        if( use_ret == -(MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL) )
-            mbedtls_snprintf( buf, buflen, "ECP - The buffer is too small to write to" );
-        if( use_ret == -(MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE) )
-            mbedtls_snprintf( buf, buflen, "ECP - The requested feature is not available, for example, the requested curve is not supported" );
-        if( use_ret == -(MBEDTLS_ERR_ECP_VERIFY_FAILED) )
-            mbedtls_snprintf( buf, buflen, "ECP - The signature is not valid" );
-        if( use_ret == -(MBEDTLS_ERR_ECP_ALLOC_FAILED) )
-            mbedtls_snprintf( buf, buflen, "ECP - Memory allocation failed" );
-        if( use_ret == -(MBEDTLS_ERR_ECP_RANDOM_FAILED) )
-            mbedtls_snprintf( buf, buflen, "ECP - Generation of random value, such as ephemeral key, failed" );
-        if( use_ret == -(MBEDTLS_ERR_ECP_INVALID_KEY) )
-            mbedtls_snprintf( buf, buflen, "ECP - Invalid private or public key" );
-        if( use_ret == -(MBEDTLS_ERR_ECP_SIG_LEN_MISMATCH) )
-            mbedtls_snprintf( buf, buflen, "ECP - The buffer contains a valid signature followed by more data" );
-        if( use_ret == -(MBEDTLS_ERR_ECP_HW_ACCEL_FAILED) )
-            mbedtls_snprintf( buf, buflen, "ECP - The ECP hardware accelerator failed" );
+        if (use_ret == -(MBEDTLS_ERR_ECP_BAD_INPUT_DATA))
+            mbedtls_snprintf(buf, buflen, "ECP - Bad input parameters to function");
+        if (use_ret == -(MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL))
+            mbedtls_snprintf(buf, buflen, "ECP - The buffer is too small to write to");
+        if (use_ret == -(MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE))
+            mbedtls_snprintf(buf, buflen, "ECP - The requested feature is not available, for example, the requested curve is not supported");
+        if (use_ret == -(MBEDTLS_ERR_ECP_VERIFY_FAILED))
+            mbedtls_snprintf(buf, buflen, "ECP - The signature is not valid");
+        if (use_ret == -(MBEDTLS_ERR_ECP_ALLOC_FAILED))
+            mbedtls_snprintf(buf, buflen, "ECP - Memory allocation failed");
+        if (use_ret == -(MBEDTLS_ERR_ECP_RANDOM_FAILED))
+            mbedtls_snprintf(buf, buflen, "ECP - Generation of random value, such as ephemeral key, failed");
+        if (use_ret == -(MBEDTLS_ERR_ECP_INVALID_KEY))
+            mbedtls_snprintf(buf, buflen, "ECP - Invalid private or public key");
+        if (use_ret == -(MBEDTLS_ERR_ECP_SIG_LEN_MISMATCH))
+            mbedtls_snprintf(buf, buflen, "ECP - The buffer contains a valid signature followed by more data");
+        if (use_ret == -(MBEDTLS_ERR_ECP_HW_ACCEL_FAILED))
+            mbedtls_snprintf(buf, buflen, "ECP - The ECP hardware accelerator failed");
 #endif /* MBEDTLS_ECP_C */
 
 #if defined(MBEDTLS_MD_C)
-        if( use_ret == -(MBEDTLS_ERR_MD_FEATURE_UNAVAILABLE) )
-            mbedtls_snprintf( buf, buflen, "MD - The selected feature is not available" );
-        if( use_ret == -(MBEDTLS_ERR_MD_BAD_INPUT_DATA) )
-            mbedtls_snprintf( buf, buflen, "MD - Bad input parameters to function" );
-        if( use_ret == -(MBEDTLS_ERR_MD_ALLOC_FAILED) )
-            mbedtls_snprintf( buf, buflen, "MD - Failed to allocate memory" );
-        if( use_ret == -(MBEDTLS_ERR_MD_FILE_IO_ERROR) )
-            mbedtls_snprintf( buf, buflen, "MD - Opening or reading of file failed" );
-        if( use_ret == -(MBEDTLS_ERR_MD_HW_ACCEL_FAILED) )
-            mbedtls_snprintf( buf, buflen, "MD - MD hardware accelerator failed" );
+        if (use_ret == -(MBEDTLS_ERR_MD_FEATURE_UNAVAILABLE))
+            mbedtls_snprintf(buf, buflen, "MD - The selected feature is not available");
+        if (use_ret == -(MBEDTLS_ERR_MD_BAD_INPUT_DATA))
+            mbedtls_snprintf(buf, buflen, "MD - Bad input parameters to function");
+        if (use_ret == -(MBEDTLS_ERR_MD_ALLOC_FAILED))
+            mbedtls_snprintf(buf, buflen, "MD - Failed to allocate memory");
+        if (use_ret == -(MBEDTLS_ERR_MD_FILE_IO_ERROR))
+            mbedtls_snprintf(buf, buflen, "MD - Opening or reading of file failed");
+        if (use_ret == -(MBEDTLS_ERR_MD_HW_ACCEL_FAILED))
+            mbedtls_snprintf(buf, buflen, "MD - MD hardware accelerator failed");
 #endif /* MBEDTLS_MD_C */
 
 #if defined(MBEDTLS_PEM_PARSE_C) || defined(MBEDTLS_PEM_WRITE_C)
-        if( use_ret == -(MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT) )
-            mbedtls_snprintf( buf, buflen, "PEM - No PEM header or footer found" );
-        if( use_ret == -(MBEDTLS_ERR_PEM_INVALID_DATA) )
-            mbedtls_snprintf( buf, buflen, "PEM - PEM string is not as expected" );
-        if( use_ret == -(MBEDTLS_ERR_PEM_ALLOC_FAILED) )
-            mbedtls_snprintf( buf, buflen, "PEM - Failed to allocate memory" );
-        if( use_ret == -(MBEDTLS_ERR_PEM_INVALID_ENC_IV) )
-            mbedtls_snprintf( buf, buflen, "PEM - RSA IV is not in hex-format" );
-        if( use_ret == -(MBEDTLS_ERR_PEM_UNKNOWN_ENC_ALG) )
-            mbedtls_snprintf( buf, buflen, "PEM - Unsupported key encryption algorithm" );
-        if( use_ret == -(MBEDTLS_ERR_PEM_PASSWORD_REQUIRED) )
-            mbedtls_snprintf( buf, buflen, "PEM - Private key password can't be empty" );
-        if( use_ret == -(MBEDTLS_ERR_PEM_PASSWORD_MISMATCH) )
-            mbedtls_snprintf( buf, buflen, "PEM - Given private key password does not allow for correct decryption" );
-        if( use_ret == -(MBEDTLS_ERR_PEM_FEATURE_UNAVAILABLE) )
-            mbedtls_snprintf( buf, buflen, "PEM - Unavailable feature, e.g. hashing/encryption combination" );
-        if( use_ret == -(MBEDTLS_ERR_PEM_BAD_INPUT_DATA) )
-            mbedtls_snprintf( buf, buflen, "PEM - Bad input parameters to function" );
+        if (use_ret == -(MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT))
+            mbedtls_snprintf(buf, buflen, "PEM - No PEM header or footer found");
+        if (use_ret == -(MBEDTLS_ERR_PEM_INVALID_DATA))
+            mbedtls_snprintf(buf, buflen, "PEM - PEM string is not as expected");
+        if (use_ret == -(MBEDTLS_ERR_PEM_ALLOC_FAILED))
+            mbedtls_snprintf(buf, buflen, "PEM - Failed to allocate memory");
+        if (use_ret == -(MBEDTLS_ERR_PEM_INVALID_ENC_IV))
+            mbedtls_snprintf(buf, buflen, "PEM - RSA IV is not in hex-format");
+        if (use_ret == -(MBEDTLS_ERR_PEM_UNKNOWN_ENC_ALG))
+            mbedtls_snprintf(buf, buflen, "PEM - Unsupported key encryption algorithm");
+        if (use_ret == -(MBEDTLS_ERR_PEM_PASSWORD_REQUIRED))
+            mbedtls_snprintf(buf, buflen, "PEM - Private key password can't be empty");
+        if (use_ret == -(MBEDTLS_ERR_PEM_PASSWORD_MISMATCH))
+            mbedtls_snprintf(buf, buflen, "PEM - Given private key password does not allow for correct decryption");
+        if (use_ret == -(MBEDTLS_ERR_PEM_FEATURE_UNAVAILABLE))
+            mbedtls_snprintf(buf, buflen, "PEM - Unavailable feature, e.g. hashing/encryption combination");
+        if (use_ret == -(MBEDTLS_ERR_PEM_BAD_INPUT_DATA))
+            mbedtls_snprintf(buf, buflen, "PEM - Bad input parameters to function");
 #endif /* MBEDTLS_PEM_PARSE_C || MBEDTLS_PEM_WRITE_C */
 
 #if defined(MBEDTLS_PK_C)
-        if( use_ret == -(MBEDTLS_ERR_PK_ALLOC_FAILED) )
-            mbedtls_snprintf( buf, buflen, "PK - Memory allocation failed" );
-        if( use_ret == -(MBEDTLS_ERR_PK_TYPE_MISMATCH) )
-            mbedtls_snprintf( buf, buflen, "PK - Type mismatch, eg attempt to encrypt with an ECDSA key" );
-        if( use_ret == -(MBEDTLS_ERR_PK_BAD_INPUT_DATA) )
-            mbedtls_snprintf( buf, buflen, "PK - Bad input parameters to function" );
-        if( use_ret == -(MBEDTLS_ERR_PK_FILE_IO_ERROR) )
-            mbedtls_snprintf( buf, buflen, "PK - Read/write of file failed" );
-        if( use_ret == -(MBEDTLS_ERR_PK_KEY_INVALID_VERSION) )
-            mbedtls_snprintf( buf, buflen, "PK - Unsupported key version" );
-        if( use_ret == -(MBEDTLS_ERR_PK_KEY_INVALID_FORMAT) )
-            mbedtls_snprintf( buf, buflen, "PK - Invalid key tag or value" );
-        if( use_ret == -(MBEDTLS_ERR_PK_UNKNOWN_PK_ALG) )
-            mbedtls_snprintf( buf, buflen, "PK - Key algorithm is unsupported (only RSA and EC are supported)" );
-        if( use_ret == -(MBEDTLS_ERR_PK_PASSWORD_REQUIRED) )
-            mbedtls_snprintf( buf, buflen, "PK - Private key password can't be empty" );
-        if( use_ret == -(MBEDTLS_ERR_PK_PASSWORD_MISMATCH) )
-            mbedtls_snprintf( buf, buflen, "PK - Given private key password does not allow for correct decryption" );
-        if( use_ret == -(MBEDTLS_ERR_PK_INVALID_PUBKEY) )
-            mbedtls_snprintf( buf, buflen, "PK - The pubkey tag or value is invalid (only RSA and EC are supported)" );
-        if( use_ret == -(MBEDTLS_ERR_PK_INVALID_ALG) )
-            mbedtls_snprintf( buf, buflen, "PK - The algorithm tag or value is invalid" );
-        if( use_ret == -(MBEDTLS_ERR_PK_UNKNOWN_NAMED_CURVE) )
-            mbedtls_snprintf( buf, buflen, "PK - Elliptic curve is unsupported (only NIST curves are supported)" );
-        if( use_ret == -(MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE) )
-            mbedtls_snprintf( buf, buflen, "PK - Unavailable feature, e.g. RSA disabled for RSA key" );
-        if( use_ret == -(MBEDTLS_ERR_PK_SIG_LEN_MISMATCH) )
-            mbedtls_snprintf( buf, buflen, "PK - The buffer contains a valid signature followed by more data" );
-        if( use_ret == -(MBEDTLS_ERR_PK_HW_ACCEL_FAILED) )
-            mbedtls_snprintf( buf, buflen, "PK - PK hardware accelerator failed" );
+        if (use_ret == -(MBEDTLS_ERR_PK_ALLOC_FAILED))
+            mbedtls_snprintf(buf, buflen, "PK - Memory allocation failed");
+        if (use_ret == -(MBEDTLS_ERR_PK_TYPE_MISMATCH))
+            mbedtls_snprintf(buf, buflen, "PK - Type mismatch, eg attempt to encrypt with an ECDSA key");
+        if (use_ret == -(MBEDTLS_ERR_PK_BAD_INPUT_DATA))
+            mbedtls_snprintf(buf, buflen, "PK - Bad input parameters to function");
+        if (use_ret == -(MBEDTLS_ERR_PK_FILE_IO_ERROR))
+            mbedtls_snprintf(buf, buflen, "PK - Read/write of file failed");
+        if (use_ret == -(MBEDTLS_ERR_PK_KEY_INVALID_VERSION))
+            mbedtls_snprintf(buf, buflen, "PK - Unsupported key version");
+        if (use_ret == -(MBEDTLS_ERR_PK_KEY_INVALID_FORMAT))
+            mbedtls_snprintf(buf, buflen, "PK - Invalid key tag or value");
+        if (use_ret == -(MBEDTLS_ERR_PK_UNKNOWN_PK_ALG))
+            mbedtls_snprintf(buf, buflen, "PK - Key algorithm is unsupported (only RSA and EC are supported)");
+        if (use_ret == -(MBEDTLS_ERR_PK_PASSWORD_REQUIRED))
+            mbedtls_snprintf(buf, buflen, "PK - Private key password can't be empty");
+        if (use_ret == -(MBEDTLS_ERR_PK_PASSWORD_MISMATCH))
+            mbedtls_snprintf(buf, buflen, "PK - Given private key password does not allow for correct decryption");
+        if (use_ret == -(MBEDTLS_ERR_PK_INVALID_PUBKEY))
+            mbedtls_snprintf(buf, buflen, "PK - The pubkey tag or value is invalid (only RSA and EC are supported)");
+        if (use_ret == -(MBEDTLS_ERR_PK_INVALID_ALG))
+            mbedtls_snprintf(buf, buflen, "PK - The algorithm tag or value is invalid");
+        if (use_ret == -(MBEDTLS_ERR_PK_UNKNOWN_NAMED_CURVE))
+            mbedtls_snprintf(buf, buflen, "PK - Elliptic curve is unsupported (only NIST curves are supported)");
+        if (use_ret == -(MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE))
+            mbedtls_snprintf(buf, buflen, "PK - Unavailable feature, e.g. RSA disabled for RSA key");
+        if (use_ret == -(MBEDTLS_ERR_PK_SIG_LEN_MISMATCH))
+            mbedtls_snprintf(buf, buflen, "PK - The buffer contains a valid signature followed by more data");
+        if (use_ret == -(MBEDTLS_ERR_PK_HW_ACCEL_FAILED))
+            mbedtls_snprintf(buf, buflen, "PK - PK hardware accelerator failed");
 #endif /* MBEDTLS_PK_C */
 
 #if defined(MBEDTLS_PKCS12_C)
-        if( use_ret == -(MBEDTLS_ERR_PKCS12_BAD_INPUT_DATA) )
-            mbedtls_snprintf( buf, buflen, "PKCS12 - Bad input parameters to function" );
-        if( use_ret == -(MBEDTLS_ERR_PKCS12_FEATURE_UNAVAILABLE) )
-            mbedtls_snprintf( buf, buflen, "PKCS12 - Feature not available, e.g. unsupported encryption scheme" );
-        if( use_ret == -(MBEDTLS_ERR_PKCS12_PBE_INVALID_FORMAT) )
-            mbedtls_snprintf( buf, buflen, "PKCS12 - PBE ASN.1 data not as expected" );
-        if( use_ret == -(MBEDTLS_ERR_PKCS12_PASSWORD_MISMATCH) )
-            mbedtls_snprintf( buf, buflen, "PKCS12 - Given private key password does not allow for correct decryption" );
+        if (use_ret == -(MBEDTLS_ERR_PKCS12_BAD_INPUT_DATA))
+            mbedtls_snprintf(buf, buflen, "PKCS12 - Bad input parameters to function");
+        if (use_ret == -(MBEDTLS_ERR_PKCS12_FEATURE_UNAVAILABLE))
+            mbedtls_snprintf(buf, buflen, "PKCS12 - Feature not available, e.g. unsupported encryption scheme");
+        if (use_ret == -(MBEDTLS_ERR_PKCS12_PBE_INVALID_FORMAT))
+            mbedtls_snprintf(buf, buflen, "PKCS12 - PBE ASN.1 data not as expected");
+        if (use_ret == -(MBEDTLS_ERR_PKCS12_PASSWORD_MISMATCH))
+            mbedtls_snprintf(buf, buflen, "PKCS12 - Given private key password does not allow for correct decryption");
 #endif /* MBEDTLS_PKCS12_C */
 
 #if defined(MBEDTLS_PKCS5_C)
-        if( use_ret == -(MBEDTLS_ERR_PKCS5_BAD_INPUT_DATA) )
-            mbedtls_snprintf( buf, buflen, "PKCS5 - Bad input parameters to function" );
-        if( use_ret == -(MBEDTLS_ERR_PKCS5_INVALID_FORMAT) )
-            mbedtls_snprintf( buf, buflen, "PKCS5 - Unexpected ASN.1 data" );
-        if( use_ret == -(MBEDTLS_ERR_PKCS5_FEATURE_UNAVAILABLE) )
-            mbedtls_snprintf( buf, buflen, "PKCS5 - Requested encryption or digest alg not available" );
-        if( use_ret == -(MBEDTLS_ERR_PKCS5_PASSWORD_MISMATCH) )
-            mbedtls_snprintf( buf, buflen, "PKCS5 - Given private key password does not allow for correct decryption" );
+        if (use_ret == -(MBEDTLS_ERR_PKCS5_BAD_INPUT_DATA))
+            mbedtls_snprintf(buf, buflen, "PKCS5 - Bad input parameters to function");
+        if (use_ret == -(MBEDTLS_ERR_PKCS5_INVALID_FORMAT))
+            mbedtls_snprintf(buf, buflen, "PKCS5 - Unexpected ASN.1 data");
+        if (use_ret == -(MBEDTLS_ERR_PKCS5_FEATURE_UNAVAILABLE))
+            mbedtls_snprintf(buf, buflen, "PKCS5 - Requested encryption or digest alg not available");
+        if (use_ret == -(MBEDTLS_ERR_PKCS5_PASSWORD_MISMATCH))
+            mbedtls_snprintf(buf, buflen, "PKCS5 - Given private key password does not allow for correct decryption");
 #endif /* MBEDTLS_PKCS5_C */
 
 #if defined(MBEDTLS_RSA_C)
-        if( use_ret == -(MBEDTLS_ERR_RSA_BAD_INPUT_DATA) )
-            mbedtls_snprintf( buf, buflen, "RSA - Bad input parameters to function" );
-        if( use_ret == -(MBEDTLS_ERR_RSA_INVALID_PADDING) )
-            mbedtls_snprintf( buf, buflen, "RSA - Input data contains invalid padding and is rejected" );
-        if( use_ret == -(MBEDTLS_ERR_RSA_KEY_GEN_FAILED) )
-            mbedtls_snprintf( buf, buflen, "RSA - Something failed during generation of a key" );
-        if( use_ret == -(MBEDTLS_ERR_RSA_KEY_CHECK_FAILED) )
-            mbedtls_snprintf( buf, buflen, "RSA - Key failed to pass the validity check of the library" );
-        if( use_ret == -(MBEDTLS_ERR_RSA_PUBLIC_FAILED) )
-            mbedtls_snprintf( buf, buflen, "RSA - The public key operation failed" );
-        if( use_ret == -(MBEDTLS_ERR_RSA_PRIVATE_FAILED) )
-            mbedtls_snprintf( buf, buflen, "RSA - The private key operation failed" );
-        if( use_ret == -(MBEDTLS_ERR_RSA_VERIFY_FAILED) )
-            mbedtls_snprintf( buf, buflen, "RSA - The PKCS#1 verification failed" );
-        if( use_ret == -(MBEDTLS_ERR_RSA_OUTPUT_TOO_LARGE) )
-            mbedtls_snprintf( buf, buflen, "RSA - The output buffer for decryption is not large enough" );
-        if( use_ret == -(MBEDTLS_ERR_RSA_RNG_FAILED) )
-            mbedtls_snprintf( buf, buflen, "RSA - The random generator failed to generate non-zeros" );
-        if( use_ret == -(MBEDTLS_ERR_RSA_UNSUPPORTED_OPERATION) )
-            mbedtls_snprintf( buf, buflen, "RSA - The implementation does not offer the requested operation, for example, because of security violations or lack of functionality" );
-        if( use_ret == -(MBEDTLS_ERR_RSA_HW_ACCEL_FAILED) )
-            mbedtls_snprintf( buf, buflen, "RSA - RSA hardware accelerator failed" );
+        if (use_ret == -(MBEDTLS_ERR_RSA_BAD_INPUT_DATA))
+            mbedtls_snprintf(buf, buflen, "RSA - Bad input parameters to function");
+        if (use_ret == -(MBEDTLS_ERR_RSA_INVALID_PADDING))
+            mbedtls_snprintf(buf, buflen, "RSA - Input data contains invalid padding and is rejected");
+        if (use_ret == -(MBEDTLS_ERR_RSA_KEY_GEN_FAILED))
+            mbedtls_snprintf(buf, buflen, "RSA - Something failed during generation of a key");
+        if (use_ret == -(MBEDTLS_ERR_RSA_KEY_CHECK_FAILED))
+            mbedtls_snprintf(buf, buflen, "RSA - Key failed to pass the validity check of the library");
+        if (use_ret == -(MBEDTLS_ERR_RSA_PUBLIC_FAILED))
+            mbedtls_snprintf(buf, buflen, "RSA - The public key operation failed");
+        if (use_ret == -(MBEDTLS_ERR_RSA_PRIVATE_FAILED))
+            mbedtls_snprintf(buf, buflen, "RSA - The private key operation failed");
+        if (use_ret == -(MBEDTLS_ERR_RSA_VERIFY_FAILED))
+            mbedtls_snprintf(buf, buflen, "RSA - The PKCS#1 verification failed");
+        if (use_ret == -(MBEDTLS_ERR_RSA_OUTPUT_TOO_LARGE))
+            mbedtls_snprintf(buf, buflen, "RSA - The output buffer for decryption is not large enough");
+        if (use_ret == -(MBEDTLS_ERR_RSA_RNG_FAILED))
+            mbedtls_snprintf(buf, buflen, "RSA - The random generator failed to generate non-zeros");
+        if (use_ret == -(MBEDTLS_ERR_RSA_UNSUPPORTED_OPERATION))
+            mbedtls_snprintf(buf, buflen, "RSA - The implementation does not offer the requested operation, for example, because of security violations or lack of functionality");
+        if (use_ret == -(MBEDTLS_ERR_RSA_HW_ACCEL_FAILED))
+            mbedtls_snprintf(buf, buflen, "RSA - RSA hardware accelerator failed");
 #endif /* MBEDTLS_RSA_C */
 
 #if defined(MBEDTLS_SSL_TLS_C)
-        if( use_ret == -(MBEDTLS_ERR_SSL_FEATURE_UNAVAILABLE) )
-            mbedtls_snprintf( buf, buflen, "SSL - The requested feature is not available" );
-        if( use_ret == -(MBEDTLS_ERR_SSL_BAD_INPUT_DATA) )
-            mbedtls_snprintf( buf, buflen, "SSL - Bad input parameters to function" );
-        if( use_ret == -(MBEDTLS_ERR_SSL_INVALID_MAC) )
-            mbedtls_snprintf( buf, buflen, "SSL - Verification of the message MAC failed" );
-        if( use_ret == -(MBEDTLS_ERR_SSL_INVALID_RECORD) )
-            mbedtls_snprintf( buf, buflen, "SSL - An invalid SSL record was received" );
-        if( use_ret == -(MBEDTLS_ERR_SSL_CONN_EOF) )
-            mbedtls_snprintf( buf, buflen, "SSL - The connection indicated an EOF" );
-        if( use_ret == -(MBEDTLS_ERR_SSL_UNKNOWN_CIPHER) )
-            mbedtls_snprintf( buf, buflen, "SSL - An unknown cipher was received" );
-        if( use_ret == -(MBEDTLS_ERR_SSL_NO_CIPHER_CHOSEN) )
-            mbedtls_snprintf( buf, buflen, "SSL - The server has no ciphersuites in common with the client" );
-        if( use_ret == -(MBEDTLS_ERR_SSL_NO_RNG) )
-            mbedtls_snprintf( buf, buflen, "SSL - No RNG was provided to the SSL module" );
-        if( use_ret == -(MBEDTLS_ERR_SSL_NO_CLIENT_CERTIFICATE) )
-            mbedtls_snprintf( buf, buflen, "SSL - No client certification received from the client, but required by the authentication mode" );
-        if( use_ret == -(MBEDTLS_ERR_SSL_CERTIFICATE_TOO_LARGE) )
-            mbedtls_snprintf( buf, buflen, "SSL - Our own certificate(s) is/are too large to send in an SSL message" );
-        if( use_ret == -(MBEDTLS_ERR_SSL_CERTIFICATE_REQUIRED) )
-            mbedtls_snprintf( buf, buflen, "SSL - The own certificate is not set, but needed by the server" );
-        if( use_ret == -(MBEDTLS_ERR_SSL_PRIVATE_KEY_REQUIRED) )
-            mbedtls_snprintf( buf, buflen, "SSL - The own private key or pre-shared key is not set, but needed" );
-        if( use_ret == -(MBEDTLS_ERR_SSL_CA_CHAIN_REQUIRED) )
-            mbedtls_snprintf( buf, buflen, "SSL - No CA Chain is set, but required to operate" );
-        if( use_ret == -(MBEDTLS_ERR_SSL_UNEXPECTED_MESSAGE) )
-            mbedtls_snprintf( buf, buflen, "SSL - An unexpected message was received from our peer" );
-        if( use_ret == -(MBEDTLS_ERR_SSL_FATAL_ALERT_MESSAGE) )
-        {
-            mbedtls_snprintf( buf, buflen, "SSL - A fatal alert message was received from our peer" );
+        if (use_ret == -(MBEDTLS_ERR_SSL_FEATURE_UNAVAILABLE))
+            mbedtls_snprintf(buf, buflen, "SSL - The requested feature is not available");
+        if (use_ret == -(MBEDTLS_ERR_SSL_BAD_INPUT_DATA))
+            mbedtls_snprintf(buf, buflen, "SSL - Bad input parameters to function");
+        if (use_ret == -(MBEDTLS_ERR_SSL_INVALID_MAC))
+            mbedtls_snprintf(buf, buflen, "SSL - Verification of the message MAC failed");
+        if (use_ret == -(MBEDTLS_ERR_SSL_INVALID_RECORD))
+            mbedtls_snprintf(buf, buflen, "SSL - An invalid SSL record was received");
+        if (use_ret == -(MBEDTLS_ERR_SSL_CONN_EOF))
+            mbedtls_snprintf(buf, buflen, "SSL - The connection indicated an EOF");
+        if (use_ret == -(MBEDTLS_ERR_SSL_UNKNOWN_CIPHER))
+            mbedtls_snprintf(buf, buflen, "SSL - An unknown cipher was received");
+        if (use_ret == -(MBEDTLS_ERR_SSL_NO_CIPHER_CHOSEN))
+            mbedtls_snprintf(buf, buflen, "SSL - The server has no ciphersuites in common with the client");
+        if (use_ret == -(MBEDTLS_ERR_SSL_NO_RNG))
+            mbedtls_snprintf(buf, buflen, "SSL - No RNG was provided to the SSL module");
+        if (use_ret == -(MBEDTLS_ERR_SSL_NO_CLIENT_CERTIFICATE))
+            mbedtls_snprintf(buf, buflen, "SSL - No client certification received from the client, but required by the authentication mode");
+        if (use_ret == -(MBEDTLS_ERR_SSL_CERTIFICATE_TOO_LARGE))
+            mbedtls_snprintf(buf, buflen, "SSL - Our own certificate(s) is/are too large to send in an SSL message");
+        if (use_ret == -(MBEDTLS_ERR_SSL_CERTIFICATE_REQUIRED))
+            mbedtls_snprintf(buf, buflen, "SSL - The own certificate is not set, but needed by the server");
+        if (use_ret == -(MBEDTLS_ERR_SSL_PRIVATE_KEY_REQUIRED))
+            mbedtls_snprintf(buf, buflen, "SSL - The own private key or pre-shared key is not set, but needed");
+        if (use_ret == -(MBEDTLS_ERR_SSL_CA_CHAIN_REQUIRED))
+            mbedtls_snprintf(buf, buflen, "SSL - No CA Chain is set, but required to operate");
+        if (use_ret == -(MBEDTLS_ERR_SSL_UNEXPECTED_MESSAGE))
+            mbedtls_snprintf(buf, buflen, "SSL - An unexpected message was received from our peer");
+        if (use_ret == -(MBEDTLS_ERR_SSL_FATAL_ALERT_MESSAGE)) {
+            mbedtls_snprintf(buf, buflen, "SSL - A fatal alert message was received from our peer");
             return;
         }
-        if( use_ret == -(MBEDTLS_ERR_SSL_PEER_VERIFY_FAILED) )
-            mbedtls_snprintf( buf, buflen, "SSL - Verification of our peer failed" );
-        if( use_ret == -(MBEDTLS_ERR_SSL_PEER_CLOSE_NOTIFY) )
-            mbedtls_snprintf( buf, buflen, "SSL - The peer notified us that the connection is going to be closed" );
-        if( use_ret == -(MBEDTLS_ERR_SSL_BAD_HS_CLIENT_HELLO) )
-            mbedtls_snprintf( buf, buflen, "SSL - Processing of the ClientHello handshake message failed" );
-        if( use_ret == -(MBEDTLS_ERR_SSL_BAD_HS_SERVER_HELLO) )
-            mbedtls_snprintf( buf, buflen, "SSL - Processing of the ServerHello handshake message failed" );
-        if( use_ret == -(MBEDTLS_ERR_SSL_BAD_HS_CERTIFICATE) )
-            mbedtls_snprintf( buf, buflen, "SSL - Processing of the Certificate handshake message failed" );
-        if( use_ret == -(MBEDTLS_ERR_SSL_BAD_HS_CERTIFICATE_REQUEST) )
-            mbedtls_snprintf( buf, buflen, "SSL - Processing of the CertificateRequest handshake message failed" );
-        if( use_ret == -(MBEDTLS_ERR_SSL_BAD_HS_SERVER_KEY_EXCHANGE) )
-            mbedtls_snprintf( buf, buflen, "SSL - Processing of the ServerKeyExchange handshake message failed" );
-        if( use_ret == -(MBEDTLS_ERR_SSL_BAD_HS_SERVER_HELLO_DONE) )
-            mbedtls_snprintf( buf, buflen, "SSL - Processing of the ServerHelloDone handshake message failed" );
-        if( use_ret == -(MBEDTLS_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE) )
-            mbedtls_snprintf( buf, buflen, "SSL - Processing of the ClientKeyExchange handshake message failed" );
-        if( use_ret == -(MBEDTLS_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE_RP) )
-            mbedtls_snprintf( buf, buflen, "SSL - Processing of the ClientKeyExchange handshake message failed in DHM / ECDH Read Public" );
-        if( use_ret == -(MBEDTLS_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE_CS) )
-            mbedtls_snprintf( buf, buflen, "SSL - Processing of the ClientKeyExchange handshake message failed in DHM / ECDH Calculate Secret" );
-        if( use_ret == -(MBEDTLS_ERR_SSL_BAD_HS_CERTIFICATE_VERIFY) )
-            mbedtls_snprintf( buf, buflen, "SSL - Processing of the CertificateVerify handshake message failed" );
-        if( use_ret == -(MBEDTLS_ERR_SSL_BAD_HS_CHANGE_CIPHER_SPEC) )
-            mbedtls_snprintf( buf, buflen, "SSL - Processing of the ChangeCipherSpec handshake message failed" );
-        if( use_ret == -(MBEDTLS_ERR_SSL_BAD_HS_FINISHED) )
-            mbedtls_snprintf( buf, buflen, "SSL - Processing of the Finished handshake message failed" );
-        if( use_ret == -(MBEDTLS_ERR_SSL_ALLOC_FAILED) )
-            mbedtls_snprintf( buf, buflen, "SSL - Memory allocation failed" );
-        if( use_ret == -(MBEDTLS_ERR_SSL_HW_ACCEL_FAILED) )
-            mbedtls_snprintf( buf, buflen, "SSL - Hardware acceleration function returned with error" );
-        if( use_ret == -(MBEDTLS_ERR_SSL_HW_ACCEL_FALLTHROUGH) )
-            mbedtls_snprintf( buf, buflen, "SSL - Hardware acceleration function skipped / left alone data" );
-        if( use_ret == -(MBEDTLS_ERR_SSL_COMPRESSION_FAILED) )
-            mbedtls_snprintf( buf, buflen, "SSL - Processing of the compression / decompression failed" );
-        if( use_ret == -(MBEDTLS_ERR_SSL_BAD_HS_PROTOCOL_VERSION) )
-            mbedtls_snprintf( buf, buflen, "SSL - Handshake protocol not within min/max boundaries" );
-        if( use_ret == -(MBEDTLS_ERR_SSL_BAD_HS_NEW_SESSION_TICKET) )
-            mbedtls_snprintf( buf, buflen, "SSL - Processing of the NewSessionTicket handshake message failed" );
-        if( use_ret == -(MBEDTLS_ERR_SSL_SESSION_TICKET_EXPIRED) )
-            mbedtls_snprintf( buf, buflen, "SSL - Session ticket has expired" );
-        if( use_ret == -(MBEDTLS_ERR_SSL_PK_TYPE_MISMATCH) )
-            mbedtls_snprintf( buf, buflen, "SSL - Public key type mismatch (eg, asked for RSA key exchange and presented EC key)" );
-        if( use_ret == -(MBEDTLS_ERR_SSL_UNKNOWN_IDENTITY) )
-            mbedtls_snprintf( buf, buflen, "SSL - Unknown identity received (eg, PSK identity)" );
-        if( use_ret == -(MBEDTLS_ERR_SSL_INTERNAL_ERROR) )
-            mbedtls_snprintf( buf, buflen, "SSL - Internal error (eg, unexpected failure in lower-level module)" );
-        if( use_ret == -(MBEDTLS_ERR_SSL_COUNTER_WRAPPING) )
-            mbedtls_snprintf( buf, buflen, "SSL - A counter would wrap (eg, too many messages exchanged)" );
-        if( use_ret == -(MBEDTLS_ERR_SSL_WAITING_SERVER_HELLO_RENEGO) )
-            mbedtls_snprintf( buf, buflen, "SSL - Unexpected message at ServerHello in renegotiation" );
-        if( use_ret == -(MBEDTLS_ERR_SSL_HELLO_VERIFY_REQUIRED) )
-            mbedtls_snprintf( buf, buflen, "SSL - DTLS client must retry for hello verification" );
-        if( use_ret == -(MBEDTLS_ERR_SSL_BUFFER_TOO_SMALL) )
-            mbedtls_snprintf( buf, buflen, "SSL - A buffer is too small to receive or write a message" );
-        if( use_ret == -(MBEDTLS_ERR_SSL_NO_USABLE_CIPHERSUITE) )
-            mbedtls_snprintf( buf, buflen, "SSL - None of the common ciphersuites is usable (eg, no suitable certificate, see debug messages)" );
-        if( use_ret == -(MBEDTLS_ERR_SSL_WANT_READ) )
-            mbedtls_snprintf( buf, buflen, "SSL - No data of requested type currently available on underlying transport" );
-        if( use_ret == -(MBEDTLS_ERR_SSL_WANT_WRITE) )
-            mbedtls_snprintf( buf, buflen, "SSL - Connection requires a write call" );
-        if( use_ret == -(MBEDTLS_ERR_SSL_TIMEOUT) )
-            mbedtls_snprintf( buf, buflen, "SSL - The operation timed out" );
-        if( use_ret == -(MBEDTLS_ERR_SSL_CLIENT_RECONNECT) )
-            mbedtls_snprintf( buf, buflen, "SSL - The client initiated a reconnect from the same port" );
-        if( use_ret == -(MBEDTLS_ERR_SSL_UNEXPECTED_RECORD) )
-            mbedtls_snprintf( buf, buflen, "SSL - Record header looks valid but is not expected" );
-        if( use_ret == -(MBEDTLS_ERR_SSL_NON_FATAL) )
-            mbedtls_snprintf( buf, buflen, "SSL - The alert message received indicates a non-fatal error" );
-        if( use_ret == -(MBEDTLS_ERR_SSL_INVALID_VERIFY_HASH) )
-            mbedtls_snprintf( buf, buflen, "SSL - Couldn't set the hash for verifying CertificateVerify" );
-        if( use_ret == -(MBEDTLS_ERR_SSL_CONTINUE_PROCESSING) )
-            mbedtls_snprintf( buf, buflen, "SSL - Internal-only message signaling that further message-processing should be done" );
-        if( use_ret == -(MBEDTLS_ERR_SSL_ASYNC_IN_PROGRESS) )
-            mbedtls_snprintf( buf, buflen, "SSL - The asynchronous operation is not completed yet" );
-        if( use_ret == -(MBEDTLS_ERR_SSL_EARLY_MESSAGE) )
-            mbedtls_snprintf( buf, buflen, "SSL - Internal-only message signaling that a message arrived early" );
+        if (use_ret == -(MBEDTLS_ERR_SSL_PEER_VERIFY_FAILED))
+            mbedtls_snprintf(buf, buflen, "SSL - Verification of our peer failed");
+        if (use_ret == -(MBEDTLS_ERR_SSL_PEER_CLOSE_NOTIFY))
+            mbedtls_snprintf(buf, buflen, "SSL - The peer notified us that the connection is going to be closed");
+        if (use_ret == -(MBEDTLS_ERR_SSL_BAD_HS_CLIENT_HELLO))
+            mbedtls_snprintf(buf, buflen, "SSL - Processing of the ClientHello handshake message failed");
+        if (use_ret == -(MBEDTLS_ERR_SSL_BAD_HS_SERVER_HELLO))
+            mbedtls_snprintf(buf, buflen, "SSL - Processing of the ServerHello handshake message failed");
+        if (use_ret == -(MBEDTLS_ERR_SSL_BAD_HS_CERTIFICATE))
+            mbedtls_snprintf(buf, buflen, "SSL - Processing of the Certificate handshake message failed");
+        if (use_ret == -(MBEDTLS_ERR_SSL_BAD_HS_CERTIFICATE_REQUEST))
+            mbedtls_snprintf(buf, buflen, "SSL - Processing of the CertificateRequest handshake message failed");
+        if (use_ret == -(MBEDTLS_ERR_SSL_BAD_HS_SERVER_KEY_EXCHANGE))
+            mbedtls_snprintf(buf, buflen, "SSL - Processing of the ServerKeyExchange handshake message failed");
+        if (use_ret == -(MBEDTLS_ERR_SSL_BAD_HS_SERVER_HELLO_DONE))
+            mbedtls_snprintf(buf, buflen, "SSL - Processing of the ServerHelloDone handshake message failed");
+        if (use_ret == -(MBEDTLS_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE))
+            mbedtls_snprintf(buf, buflen, "SSL - Processing of the ClientKeyExchange handshake message failed");
+        if (use_ret == -(MBEDTLS_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE_RP))
+            mbedtls_snprintf(buf, buflen, "SSL - Processing of the ClientKeyExchange handshake message failed in DHM / ECDH Read Public");
+        if (use_ret == -(MBEDTLS_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE_CS))
+            mbedtls_snprintf(buf, buflen, "SSL - Processing of the ClientKeyExchange handshake message failed in DHM / ECDH Calculate Secret");
+        if (use_ret == -(MBEDTLS_ERR_SSL_BAD_HS_CERTIFICATE_VERIFY))
+            mbedtls_snprintf(buf, buflen, "SSL - Processing of the CertificateVerify handshake message failed");
+        if (use_ret == -(MBEDTLS_ERR_SSL_BAD_HS_CHANGE_CIPHER_SPEC))
+            mbedtls_snprintf(buf, buflen, "SSL - Processing of the ChangeCipherSpec handshake message failed");
+        if (use_ret == -(MBEDTLS_ERR_SSL_BAD_HS_FINISHED))
+            mbedtls_snprintf(buf, buflen, "SSL - Processing of the Finished handshake message failed");
+        if (use_ret == -(MBEDTLS_ERR_SSL_ALLOC_FAILED))
+            mbedtls_snprintf(buf, buflen, "SSL - Memory allocation failed");
+        if (use_ret == -(MBEDTLS_ERR_SSL_HW_ACCEL_FAILED))
+            mbedtls_snprintf(buf, buflen, "SSL - Hardware acceleration function returned with error");
+        if (use_ret == -(MBEDTLS_ERR_SSL_HW_ACCEL_FALLTHROUGH))
+            mbedtls_snprintf(buf, buflen, "SSL - Hardware acceleration function skipped / left alone data");
+        if (use_ret == -(MBEDTLS_ERR_SSL_COMPRESSION_FAILED))
+            mbedtls_snprintf(buf, buflen, "SSL - Processing of the compression / decompression failed");
+        if (use_ret == -(MBEDTLS_ERR_SSL_BAD_HS_PROTOCOL_VERSION))
+            mbedtls_snprintf(buf, buflen, "SSL - Handshake protocol not within min/max boundaries");
+        if (use_ret == -(MBEDTLS_ERR_SSL_BAD_HS_NEW_SESSION_TICKET))
+            mbedtls_snprintf(buf, buflen, "SSL - Processing of the NewSessionTicket handshake message failed");
+        if (use_ret == -(MBEDTLS_ERR_SSL_SESSION_TICKET_EXPIRED))
+            mbedtls_snprintf(buf, buflen, "SSL - Session ticket has expired");
+        if (use_ret == -(MBEDTLS_ERR_SSL_PK_TYPE_MISMATCH))
+            mbedtls_snprintf(buf, buflen, "SSL - Public key type mismatch (eg, asked for RSA key exchange and presented EC key)");
+        if (use_ret == -(MBEDTLS_ERR_SSL_UNKNOWN_IDENTITY))
+            mbedtls_snprintf(buf, buflen, "SSL - Unknown identity received (eg, PSK identity)");
+        if (use_ret == -(MBEDTLS_ERR_SSL_INTERNAL_ERROR))
+            mbedtls_snprintf(buf, buflen, "SSL - Internal error (eg, unexpected failure in lower-level module)");
+        if (use_ret == -(MBEDTLS_ERR_SSL_COUNTER_WRAPPING))
+            mbedtls_snprintf(buf, buflen, "SSL - A counter would wrap (eg, too many messages exchanged)");
+        if (use_ret == -(MBEDTLS_ERR_SSL_WAITING_SERVER_HELLO_RENEGO))
+            mbedtls_snprintf(buf, buflen, "SSL - Unexpected message at ServerHello in renegotiation");
+        if (use_ret == -(MBEDTLS_ERR_SSL_HELLO_VERIFY_REQUIRED))
+            mbedtls_snprintf(buf, buflen, "SSL - DTLS client must retry for hello verification");
+        if (use_ret == -(MBEDTLS_ERR_SSL_BUFFER_TOO_SMALL))
+            mbedtls_snprintf(buf, buflen, "SSL - A buffer is too small to receive or write a message");
+        if (use_ret == -(MBEDTLS_ERR_SSL_NO_USABLE_CIPHERSUITE))
+            mbedtls_snprintf(buf, buflen, "SSL - None of the common ciphersuites is usable (eg, no suitable certificate, see debug messages)");
+        if (use_ret == -(MBEDTLS_ERR_SSL_WANT_READ))
+            mbedtls_snprintf(buf, buflen, "SSL - No data of requested type currently available on underlying transport");
+        if (use_ret == -(MBEDTLS_ERR_SSL_WANT_WRITE))
+            mbedtls_snprintf(buf, buflen, "SSL - Connection requires a write call");
+        if (use_ret == -(MBEDTLS_ERR_SSL_TIMEOUT))
+            mbedtls_snprintf(buf, buflen, "SSL - The operation timed out");
+        if (use_ret == -(MBEDTLS_ERR_SSL_CLIENT_RECONNECT))
+            mbedtls_snprintf(buf, buflen, "SSL - The client initiated a reconnect from the same port");
+        if (use_ret == -(MBEDTLS_ERR_SSL_UNEXPECTED_RECORD))
+            mbedtls_snprintf(buf, buflen, "SSL - Record header looks valid but is not expected");
+        if (use_ret == -(MBEDTLS_ERR_SSL_NON_FATAL))
+            mbedtls_snprintf(buf, buflen, "SSL - The alert message received indicates a non-fatal error");
+        if (use_ret == -(MBEDTLS_ERR_SSL_INVALID_VERIFY_HASH))
+            mbedtls_snprintf(buf, buflen, "SSL - Couldn't set the hash for verifying CertificateVerify");
+        if (use_ret == -(MBEDTLS_ERR_SSL_CONTINUE_PROCESSING))
+            mbedtls_snprintf(buf, buflen, "SSL - Internal-only message signaling that further message-processing should be done");
+        if (use_ret == -(MBEDTLS_ERR_SSL_ASYNC_IN_PROGRESS))
+            mbedtls_snprintf(buf, buflen, "SSL - The asynchronous operation is not completed yet");
+        if (use_ret == -(MBEDTLS_ERR_SSL_EARLY_MESSAGE))
+            mbedtls_snprintf(buf, buflen, "SSL - Internal-only message signaling that a message arrived early");
 #endif /* MBEDTLS_SSL_TLS_C */
 
 #if defined(MBEDTLS_X509_USE_C) || defined(MBEDTLS_X509_CREATE_C)
-        if( use_ret == -(MBEDTLS_ERR_X509_FEATURE_UNAVAILABLE) )
-            mbedtls_snprintf( buf, buflen, "X509 - Unavailable feature, e.g. RSA hashing/encryption combination" );
-        if( use_ret == -(MBEDTLS_ERR_X509_UNKNOWN_OID) )
-            mbedtls_snprintf( buf, buflen, "X509 - Requested OID is unknown" );
-        if( use_ret == -(MBEDTLS_ERR_X509_INVALID_FORMAT) )
-            mbedtls_snprintf( buf, buflen, "X509 - The CRT/CRL/CSR format is invalid, e.g. different type expected" );
-        if( use_ret == -(MBEDTLS_ERR_X509_INVALID_VERSION) )
-            mbedtls_snprintf( buf, buflen, "X509 - The CRT/CRL/CSR version element is invalid" );
-        if( use_ret == -(MBEDTLS_ERR_X509_INVALID_SERIAL) )
-            mbedtls_snprintf( buf, buflen, "X509 - The serial tag or value is invalid" );
-        if( use_ret == -(MBEDTLS_ERR_X509_INVALID_ALG) )
-            mbedtls_snprintf( buf, buflen, "X509 - The algorithm tag or value is invalid" );
-        if( use_ret == -(MBEDTLS_ERR_X509_INVALID_NAME) )
-            mbedtls_snprintf( buf, buflen, "X509 - The name tag or value is invalid" );
-        if( use_ret == -(MBEDTLS_ERR_X509_INVALID_DATE) )
-            mbedtls_snprintf( buf, buflen, "X509 - The date tag or value is invalid" );
-        if( use_ret == -(MBEDTLS_ERR_X509_INVALID_SIGNATURE) )
-            mbedtls_snprintf( buf, buflen, "X509 - The signature tag or value invalid" );
-        if( use_ret == -(MBEDTLS_ERR_X509_INVALID_EXTENSIONS) )
-            mbedtls_snprintf( buf, buflen, "X509 - The extension tag or value is invalid" );
-        if( use_ret == -(MBEDTLS_ERR_X509_UNKNOWN_VERSION) )
-            mbedtls_snprintf( buf, buflen, "X509 - CRT/CRL/CSR has an unsupported version number" );
-        if( use_ret == -(MBEDTLS_ERR_X509_UNKNOWN_SIG_ALG) )
-            mbedtls_snprintf( buf, buflen, "X509 - Signature algorithm (oid) is unsupported" );
-        if( use_ret == -(MBEDTLS_ERR_X509_SIG_MISMATCH) )
-            mbedtls_snprintf( buf, buflen, "X509 - Signature algorithms do not match. (see \\c ::mbedtls_x509_crt sig_oid)" );
-        if( use_ret == -(MBEDTLS_ERR_X509_CERT_VERIFY_FAILED) )
-            mbedtls_snprintf( buf, buflen, "X509 - Certificate verification failed, e.g. CRL, CA or signature check failed" );
-        if( use_ret == -(MBEDTLS_ERR_X509_CERT_UNKNOWN_FORMAT) )
-            mbedtls_snprintf( buf, buflen, "X509 - Format not recognized as DER or PEM" );
-        if( use_ret == -(MBEDTLS_ERR_X509_BAD_INPUT_DATA) )
-            mbedtls_snprintf( buf, buflen, "X509 - Input invalid" );
-        if( use_ret == -(MBEDTLS_ERR_X509_ALLOC_FAILED) )
-            mbedtls_snprintf( buf, buflen, "X509 - Allocation of memory failed" );
-        if( use_ret == -(MBEDTLS_ERR_X509_FILE_IO_ERROR) )
-            mbedtls_snprintf( buf, buflen, "X509 - Read/write of file failed" );
-        if( use_ret == -(MBEDTLS_ERR_X509_BUFFER_TOO_SMALL) )
-            mbedtls_snprintf( buf, buflen, "X509 - Destination buffer is too small" );
-        if( use_ret == -(MBEDTLS_ERR_X509_FATAL_ERROR) )
-            mbedtls_snprintf( buf, buflen, "X509 - A fatal error occured, eg the chain is too long or the vrfy callback failed" );
+        if (use_ret == -(MBEDTLS_ERR_X509_FEATURE_UNAVAILABLE))
+            mbedtls_snprintf(buf, buflen, "X509 - Unavailable feature, e.g. RSA hashing/encryption combination");
+        if (use_ret == -(MBEDTLS_ERR_X509_UNKNOWN_OID))
+            mbedtls_snprintf(buf, buflen, "X509 - Requested OID is unknown");
+        if (use_ret == -(MBEDTLS_ERR_X509_INVALID_FORMAT))
+            mbedtls_snprintf(buf, buflen, "X509 - The CRT/CRL/CSR format is invalid, e.g. different type expected");
+        if (use_ret == -(MBEDTLS_ERR_X509_INVALID_VERSION))
+            mbedtls_snprintf(buf, buflen, "X509 - The CRT/CRL/CSR version element is invalid");
+        if (use_ret == -(MBEDTLS_ERR_X509_INVALID_SERIAL))
+            mbedtls_snprintf(buf, buflen, "X509 - The serial tag or value is invalid");
+        if (use_ret == -(MBEDTLS_ERR_X509_INVALID_ALG))
+            mbedtls_snprintf(buf, buflen, "X509 - The algorithm tag or value is invalid");
+        if (use_ret == -(MBEDTLS_ERR_X509_INVALID_NAME))
+            mbedtls_snprintf(buf, buflen, "X509 - The name tag or value is invalid");
+        if (use_ret == -(MBEDTLS_ERR_X509_INVALID_DATE))
+            mbedtls_snprintf(buf, buflen, "X509 - The date tag or value is invalid");
+        if (use_ret == -(MBEDTLS_ERR_X509_INVALID_SIGNATURE))
+            mbedtls_snprintf(buf, buflen, "X509 - The signature tag or value invalid");
+        if (use_ret == -(MBEDTLS_ERR_X509_INVALID_EXTENSIONS))
+            mbedtls_snprintf(buf, buflen, "X509 - The extension tag or value is invalid");
+        if (use_ret == -(MBEDTLS_ERR_X509_UNKNOWN_VERSION))
+            mbedtls_snprintf(buf, buflen, "X509 - CRT/CRL/CSR has an unsupported version number");
+        if (use_ret == -(MBEDTLS_ERR_X509_UNKNOWN_SIG_ALG))
+            mbedtls_snprintf(buf, buflen, "X509 - Signature algorithm (oid) is unsupported");
+        if (use_ret == -(MBEDTLS_ERR_X509_SIG_MISMATCH))
+            mbedtls_snprintf(buf, buflen, "X509 - Signature algorithms do not match. (see \\c ::mbedtls_x509_crt sig_oid)");
+        if (use_ret == -(MBEDTLS_ERR_X509_CERT_VERIFY_FAILED))
+            mbedtls_snprintf(buf, buflen, "X509 - Certificate verification failed, e.g. CRL, CA or signature check failed");
+        if (use_ret == -(MBEDTLS_ERR_X509_CERT_UNKNOWN_FORMAT))
+            mbedtls_snprintf(buf, buflen, "X509 - Format not recognized as DER or PEM");
+        if (use_ret == -(MBEDTLS_ERR_X509_BAD_INPUT_DATA))
+            mbedtls_snprintf(buf, buflen, "X509 - Input invalid");
+        if (use_ret == -(MBEDTLS_ERR_X509_ALLOC_FAILED))
+            mbedtls_snprintf(buf, buflen, "X509 - Allocation of memory failed");
+        if (use_ret == -(MBEDTLS_ERR_X509_FILE_IO_ERROR))
+            mbedtls_snprintf(buf, buflen, "X509 - Read/write of file failed");
+        if (use_ret == -(MBEDTLS_ERR_X509_BUFFER_TOO_SMALL))
+            mbedtls_snprintf(buf, buflen, "X509 - Destination buffer is too small");
+        if (use_ret == -(MBEDTLS_ERR_X509_FATAL_ERROR))
+            mbedtls_snprintf(buf, buflen, "X509 - A fatal error occured, eg the chain is too long or the vrfy callback failed");
 #endif /* MBEDTLS_X509_USE_C || MBEDTLS_X509_CREATE_C */
         // END generated code
 
-        if( strlen( buf ) == 0 )
-            mbedtls_snprintf( buf, buflen, "UNKNOWN ERROR CODE (%04X)", use_ret );
+        if (strlen(buf) == 0)
+            mbedtls_snprintf(buf, buflen, "UNKNOWN ERROR CODE (%04X)", use_ret);
     }
 
     use_ret = ret & ~0xFF80;
 
-    if( use_ret == 0 )
+    if (use_ret == 0)
         return;
 
     // If high level code is present, make a concatenation between both
     // error strings.
     //
-    len = strlen( buf );
+    len = strlen(buf);
 
-    if( len > 0 )
-    {
-        if( buflen - len < 5 )
+    if (len > 0) {
+        if (buflen - len < 5)
             return;
 
-        mbedtls_snprintf( buf + len, buflen - len, " : " );
+        mbedtls_snprintf(buf + len, buflen - len, " : ");
 
         buf += len + 3;
         buflen -= len + 3;
@@ -594,287 +591,287 @@ void mbedtls_strerror( int ret, char *buf, size_t buflen )
     //
     // BEGIN generated code
 #if defined(MBEDTLS_AES_C)
-    if( use_ret == -(MBEDTLS_ERR_AES_INVALID_KEY_LENGTH) )
-        mbedtls_snprintf( buf, buflen, "AES - Invalid key length" );
-    if( use_ret == -(MBEDTLS_ERR_AES_INVALID_INPUT_LENGTH) )
-        mbedtls_snprintf( buf, buflen, "AES - Invalid data input length" );
-    if( use_ret == -(MBEDTLS_ERR_AES_BAD_INPUT_DATA) )
-        mbedtls_snprintf( buf, buflen, "AES - Invalid input data" );
-    if( use_ret == -(MBEDTLS_ERR_AES_FEATURE_UNAVAILABLE) )
-        mbedtls_snprintf( buf, buflen, "AES - Feature not available. For example, an unsupported AES key size" );
-    if( use_ret == -(MBEDTLS_ERR_AES_HW_ACCEL_FAILED) )
-        mbedtls_snprintf( buf, buflen, "AES - AES hardware accelerator failed" );
+    if (use_ret == -(MBEDTLS_ERR_AES_INVALID_KEY_LENGTH))
+        mbedtls_snprintf(buf, buflen, "AES - Invalid key length");
+    if (use_ret == -(MBEDTLS_ERR_AES_INVALID_INPUT_LENGTH))
+        mbedtls_snprintf(buf, buflen, "AES - Invalid data input length");
+    if (use_ret == -(MBEDTLS_ERR_AES_BAD_INPUT_DATA))
+        mbedtls_snprintf(buf, buflen, "AES - Invalid input data");
+    if (use_ret == -(MBEDTLS_ERR_AES_FEATURE_UNAVAILABLE))
+        mbedtls_snprintf(buf, buflen, "AES - Feature not available. For example, an unsupported AES key size");
+    if (use_ret == -(MBEDTLS_ERR_AES_HW_ACCEL_FAILED))
+        mbedtls_snprintf(buf, buflen, "AES - AES hardware accelerator failed");
 #endif /* MBEDTLS_AES_C */
 
 #if defined(MBEDTLS_ARC4_C)
-    if( use_ret == -(MBEDTLS_ERR_ARC4_HW_ACCEL_FAILED) )
-        mbedtls_snprintf( buf, buflen, "ARC4 - ARC4 hardware accelerator failed" );
+    if (use_ret == -(MBEDTLS_ERR_ARC4_HW_ACCEL_FAILED))
+        mbedtls_snprintf(buf, buflen, "ARC4 - ARC4 hardware accelerator failed");
 #endif /* MBEDTLS_ARC4_C */
 
 #if defined(MBEDTLS_ARIA_C)
-    if( use_ret == -(MBEDTLS_ERR_ARIA_INVALID_KEY_LENGTH) )
-        mbedtls_snprintf( buf, buflen, "ARIA - Invalid key length" );
-    if( use_ret == -(MBEDTLS_ERR_ARIA_INVALID_INPUT_LENGTH) )
-        mbedtls_snprintf( buf, buflen, "ARIA - Invalid data input length" );
-    if( use_ret == -(MBEDTLS_ERR_ARIA_FEATURE_UNAVAILABLE) )
-        mbedtls_snprintf( buf, buflen, "ARIA - Feature not available. For example, an unsupported ARIA key size" );
-    if( use_ret == -(MBEDTLS_ERR_ARIA_HW_ACCEL_FAILED) )
-        mbedtls_snprintf( buf, buflen, "ARIA - ARIA hardware accelerator failed" );
+    if (use_ret == -(MBEDTLS_ERR_ARIA_INVALID_KEY_LENGTH))
+        mbedtls_snprintf(buf, buflen, "ARIA - Invalid key length");
+    if (use_ret == -(MBEDTLS_ERR_ARIA_INVALID_INPUT_LENGTH))
+        mbedtls_snprintf(buf, buflen, "ARIA - Invalid data input length");
+    if (use_ret == -(MBEDTLS_ERR_ARIA_FEATURE_UNAVAILABLE))
+        mbedtls_snprintf(buf, buflen, "ARIA - Feature not available. For example, an unsupported ARIA key size");
+    if (use_ret == -(MBEDTLS_ERR_ARIA_HW_ACCEL_FAILED))
+        mbedtls_snprintf(buf, buflen, "ARIA - ARIA hardware accelerator failed");
 #endif /* MBEDTLS_ARIA_C */
 
 #if defined(MBEDTLS_ASN1_PARSE_C)
-    if( use_ret == -(MBEDTLS_ERR_ASN1_OUT_OF_DATA) )
-        mbedtls_snprintf( buf, buflen, "ASN1 - Out of data when parsing an ASN1 data structure" );
-    if( use_ret == -(MBEDTLS_ERR_ASN1_UNEXPECTED_TAG) )
-        mbedtls_snprintf( buf, buflen, "ASN1 - ASN1 tag was of an unexpected value" );
-    if( use_ret == -(MBEDTLS_ERR_ASN1_INVALID_LENGTH) )
-        mbedtls_snprintf( buf, buflen, "ASN1 - Error when trying to determine the length or invalid length" );
-    if( use_ret == -(MBEDTLS_ERR_ASN1_LENGTH_MISMATCH) )
-        mbedtls_snprintf( buf, buflen, "ASN1 - Actual length differs from expected length" );
-    if( use_ret == -(MBEDTLS_ERR_ASN1_INVALID_DATA) )
-        mbedtls_snprintf( buf, buflen, "ASN1 - Data is invalid. (not used)" );
-    if( use_ret == -(MBEDTLS_ERR_ASN1_ALLOC_FAILED) )
-        mbedtls_snprintf( buf, buflen, "ASN1 - Memory allocation failed" );
-    if( use_ret == -(MBEDTLS_ERR_ASN1_BUF_TOO_SMALL) )
-        mbedtls_snprintf( buf, buflen, "ASN1 - Buffer too small when writing ASN.1 data structure" );
+    if (use_ret == -(MBEDTLS_ERR_ASN1_OUT_OF_DATA))
+        mbedtls_snprintf(buf, buflen, "ASN1 - Out of data when parsing an ASN1 data structure");
+    if (use_ret == -(MBEDTLS_ERR_ASN1_UNEXPECTED_TAG))
+        mbedtls_snprintf(buf, buflen, "ASN1 - ASN1 tag was of an unexpected value");
+    if (use_ret == -(MBEDTLS_ERR_ASN1_INVALID_LENGTH))
+        mbedtls_snprintf(buf, buflen, "ASN1 - Error when trying to determine the length or invalid length");
+    if (use_ret == -(MBEDTLS_ERR_ASN1_LENGTH_MISMATCH))
+        mbedtls_snprintf(buf, buflen, "ASN1 - Actual length differs from expected length");
+    if (use_ret == -(MBEDTLS_ERR_ASN1_INVALID_DATA))
+        mbedtls_snprintf(buf, buflen, "ASN1 - Data is invalid. (not used)");
+    if (use_ret == -(MBEDTLS_ERR_ASN1_ALLOC_FAILED))
+        mbedtls_snprintf(buf, buflen, "ASN1 - Memory allocation failed");
+    if (use_ret == -(MBEDTLS_ERR_ASN1_BUF_TOO_SMALL))
+        mbedtls_snprintf(buf, buflen, "ASN1 - Buffer too small when writing ASN.1 data structure");
 #endif /* MBEDTLS_ASN1_PARSE_C */
 
 #if defined(MBEDTLS_BASE64_C)
-    if( use_ret == -(MBEDTLS_ERR_BASE64_BUFFER_TOO_SMALL) )
-        mbedtls_snprintf( buf, buflen, "BASE64 - Output buffer too small" );
-    if( use_ret == -(MBEDTLS_ERR_BASE64_INVALID_CHARACTER) )
-        mbedtls_snprintf( buf, buflen, "BASE64 - Invalid character in input" );
+    if (use_ret == -(MBEDTLS_ERR_BASE64_BUFFER_TOO_SMALL))
+        mbedtls_snprintf(buf, buflen, "BASE64 - Output buffer too small");
+    if (use_ret == -(MBEDTLS_ERR_BASE64_INVALID_CHARACTER))
+        mbedtls_snprintf(buf, buflen, "BASE64 - Invalid character in input");
 #endif /* MBEDTLS_BASE64_C */
 
 #if defined(MBEDTLS_BIGNUM_C)
-    if( use_ret == -(MBEDTLS_ERR_MPI_FILE_IO_ERROR) )
-        mbedtls_snprintf( buf, buflen, "BIGNUM - An error occurred while reading from or writing to a file" );
-    if( use_ret == -(MBEDTLS_ERR_MPI_BAD_INPUT_DATA) )
-        mbedtls_snprintf( buf, buflen, "BIGNUM - Bad input parameters to function" );
-    if( use_ret == -(MBEDTLS_ERR_MPI_INVALID_CHARACTER) )
-        mbedtls_snprintf( buf, buflen, "BIGNUM - There is an invalid character in the digit string" );
-    if( use_ret == -(MBEDTLS_ERR_MPI_BUFFER_TOO_SMALL) )
-        mbedtls_snprintf( buf, buflen, "BIGNUM - The buffer is too small to write to" );
-    if( use_ret == -(MBEDTLS_ERR_MPI_NEGATIVE_VALUE) )
-        mbedtls_snprintf( buf, buflen, "BIGNUM - The input arguments are negative or result in illegal output" );
-    if( use_ret == -(MBEDTLS_ERR_MPI_DIVISION_BY_ZERO) )
-        mbedtls_snprintf( buf, buflen, "BIGNUM - The input argument for division is zero, which is not allowed" );
-    if( use_ret == -(MBEDTLS_ERR_MPI_NOT_ACCEPTABLE) )
-        mbedtls_snprintf( buf, buflen, "BIGNUM - The input arguments are not acceptable" );
-    if( use_ret == -(MBEDTLS_ERR_MPI_ALLOC_FAILED) )
-        mbedtls_snprintf( buf, buflen, "BIGNUM - Memory allocation failed" );
+    if (use_ret == -(MBEDTLS_ERR_MPI_FILE_IO_ERROR))
+        mbedtls_snprintf(buf, buflen, "BIGNUM - An error occurred while reading from or writing to a file");
+    if (use_ret == -(MBEDTLS_ERR_MPI_BAD_INPUT_DATA))
+        mbedtls_snprintf(buf, buflen, "BIGNUM - Bad input parameters to function");
+    if (use_ret == -(MBEDTLS_ERR_MPI_INVALID_CHARACTER))
+        mbedtls_snprintf(buf, buflen, "BIGNUM - There is an invalid character in the digit string");
+    if (use_ret == -(MBEDTLS_ERR_MPI_BUFFER_TOO_SMALL))
+        mbedtls_snprintf(buf, buflen, "BIGNUM - The buffer is too small to write to");
+    if (use_ret == -(MBEDTLS_ERR_MPI_NEGATIVE_VALUE))
+        mbedtls_snprintf(buf, buflen, "BIGNUM - The input arguments are negative or result in illegal output");
+    if (use_ret == -(MBEDTLS_ERR_MPI_DIVISION_BY_ZERO))
+        mbedtls_snprintf(buf, buflen, "BIGNUM - The input argument for division is zero, which is not allowed");
+    if (use_ret == -(MBEDTLS_ERR_MPI_NOT_ACCEPTABLE))
+        mbedtls_snprintf(buf, buflen, "BIGNUM - The input arguments are not acceptable");
+    if (use_ret == -(MBEDTLS_ERR_MPI_ALLOC_FAILED))
+        mbedtls_snprintf(buf, buflen, "BIGNUM - Memory allocation failed");
 #endif /* MBEDTLS_BIGNUM_C */
 
 #if defined(MBEDTLS_BLOWFISH_C)
-    if( use_ret == -(MBEDTLS_ERR_BLOWFISH_INVALID_KEY_LENGTH) )
-        mbedtls_snprintf( buf, buflen, "BLOWFISH - Invalid key length" );
-    if( use_ret == -(MBEDTLS_ERR_BLOWFISH_HW_ACCEL_FAILED) )
-        mbedtls_snprintf( buf, buflen, "BLOWFISH - Blowfish hardware accelerator failed" );
-    if( use_ret == -(MBEDTLS_ERR_BLOWFISH_INVALID_INPUT_LENGTH) )
-        mbedtls_snprintf( buf, buflen, "BLOWFISH - Invalid data input length" );
+    if (use_ret == -(MBEDTLS_ERR_BLOWFISH_INVALID_KEY_LENGTH))
+        mbedtls_snprintf(buf, buflen, "BLOWFISH - Invalid key length");
+    if (use_ret == -(MBEDTLS_ERR_BLOWFISH_HW_ACCEL_FAILED))
+        mbedtls_snprintf(buf, buflen, "BLOWFISH - Blowfish hardware accelerator failed");
+    if (use_ret == -(MBEDTLS_ERR_BLOWFISH_INVALID_INPUT_LENGTH))
+        mbedtls_snprintf(buf, buflen, "BLOWFISH - Invalid data input length");
 #endif /* MBEDTLS_BLOWFISH_C */
 
 #if defined(MBEDTLS_CAMELLIA_C)
-    if( use_ret == -(MBEDTLS_ERR_CAMELLIA_INVALID_KEY_LENGTH) )
-        mbedtls_snprintf( buf, buflen, "CAMELLIA - Invalid key length" );
-    if( use_ret == -(MBEDTLS_ERR_CAMELLIA_INVALID_INPUT_LENGTH) )
-        mbedtls_snprintf( buf, buflen, "CAMELLIA - Invalid data input length" );
-    if( use_ret == -(MBEDTLS_ERR_CAMELLIA_HW_ACCEL_FAILED) )
-        mbedtls_snprintf( buf, buflen, "CAMELLIA - Camellia hardware accelerator failed" );
+    if (use_ret == -(MBEDTLS_ERR_CAMELLIA_INVALID_KEY_LENGTH))
+        mbedtls_snprintf(buf, buflen, "CAMELLIA - Invalid key length");
+    if (use_ret == -(MBEDTLS_ERR_CAMELLIA_INVALID_INPUT_LENGTH))
+        mbedtls_snprintf(buf, buflen, "CAMELLIA - Invalid data input length");
+    if (use_ret == -(MBEDTLS_ERR_CAMELLIA_HW_ACCEL_FAILED))
+        mbedtls_snprintf(buf, buflen, "CAMELLIA - Camellia hardware accelerator failed");
 #endif /* MBEDTLS_CAMELLIA_C */
 
 #if defined(MBEDTLS_CCM_C)
-    if( use_ret == -(MBEDTLS_ERR_CCM_BAD_INPUT) )
-        mbedtls_snprintf( buf, buflen, "CCM - Bad input parameters to the function" );
-    if( use_ret == -(MBEDTLS_ERR_CCM_AUTH_FAILED) )
-        mbedtls_snprintf( buf, buflen, "CCM - Authenticated decryption failed" );
-    if( use_ret == -(MBEDTLS_ERR_CCM_HW_ACCEL_FAILED) )
-        mbedtls_snprintf( buf, buflen, "CCM - CCM hardware accelerator failed" );
+    if (use_ret == -(MBEDTLS_ERR_CCM_BAD_INPUT))
+        mbedtls_snprintf(buf, buflen, "CCM - Bad input parameters to the function");
+    if (use_ret == -(MBEDTLS_ERR_CCM_AUTH_FAILED))
+        mbedtls_snprintf(buf, buflen, "CCM - Authenticated decryption failed");
+    if (use_ret == -(MBEDTLS_ERR_CCM_HW_ACCEL_FAILED))
+        mbedtls_snprintf(buf, buflen, "CCM - CCM hardware accelerator failed");
 #endif /* MBEDTLS_CCM_C */
 
 #if defined(MBEDTLS_CHACHA20_C)
-    if( use_ret == -(MBEDTLS_ERR_CHACHA20_BAD_INPUT_DATA) )
-        mbedtls_snprintf( buf, buflen, "CHACHA20 - Invalid input parameter(s)" );
-    if( use_ret == -(MBEDTLS_ERR_CHACHA20_FEATURE_UNAVAILABLE) )
-        mbedtls_snprintf( buf, buflen, "CHACHA20 - Feature not available. For example, s part of the API is not implemented" );
-    if( use_ret == -(MBEDTLS_ERR_CHACHA20_HW_ACCEL_FAILED) )
-        mbedtls_snprintf( buf, buflen, "CHACHA20 - Chacha20 hardware accelerator failed" );
+    if (use_ret == -(MBEDTLS_ERR_CHACHA20_BAD_INPUT_DATA))
+        mbedtls_snprintf(buf, buflen, "CHACHA20 - Invalid input parameter(s)");
+    if (use_ret == -(MBEDTLS_ERR_CHACHA20_FEATURE_UNAVAILABLE))
+        mbedtls_snprintf(buf, buflen, "CHACHA20 - Feature not available. For example, s part of the API is not implemented");
+    if (use_ret == -(MBEDTLS_ERR_CHACHA20_HW_ACCEL_FAILED))
+        mbedtls_snprintf(buf, buflen, "CHACHA20 - Chacha20 hardware accelerator failed");
 #endif /* MBEDTLS_CHACHA20_C */
 
 #if defined(MBEDTLS_CHACHAPOLY_C)
-    if( use_ret == -(MBEDTLS_ERR_CHACHAPOLY_BAD_STATE) )
-        mbedtls_snprintf( buf, buflen, "CHACHAPOLY - The requested operation is not permitted in the current state" );
-    if( use_ret == -(MBEDTLS_ERR_CHACHAPOLY_AUTH_FAILED) )
-        mbedtls_snprintf( buf, buflen, "CHACHAPOLY - Authenticated decryption failed: data was not authentic" );
+    if (use_ret == -(MBEDTLS_ERR_CHACHAPOLY_BAD_STATE))
+        mbedtls_snprintf(buf, buflen, "CHACHAPOLY - The requested operation is not permitted in the current state");
+    if (use_ret == -(MBEDTLS_ERR_CHACHAPOLY_AUTH_FAILED))
+        mbedtls_snprintf(buf, buflen, "CHACHAPOLY - Authenticated decryption failed: data was not authentic");
 #endif /* MBEDTLS_CHACHAPOLY_C */
 
 #if defined(MBEDTLS_CMAC_C)
-    if( use_ret == -(MBEDTLS_ERR_CMAC_HW_ACCEL_FAILED) )
-        mbedtls_snprintf( buf, buflen, "CMAC - CMAC hardware accelerator failed" );
+    if (use_ret == -(MBEDTLS_ERR_CMAC_HW_ACCEL_FAILED))
+        mbedtls_snprintf(buf, buflen, "CMAC - CMAC hardware accelerator failed");
 #endif /* MBEDTLS_CMAC_C */
 
 #if defined(MBEDTLS_CTR_DRBG_C)
-    if( use_ret == -(MBEDTLS_ERR_CTR_DRBG_ENTROPY_SOURCE_FAILED) )
-        mbedtls_snprintf( buf, buflen, "CTR_DRBG - The entropy source failed" );
-    if( use_ret == -(MBEDTLS_ERR_CTR_DRBG_REQUEST_TOO_BIG) )
-        mbedtls_snprintf( buf, buflen, "CTR_DRBG - The requested random buffer length is too big" );
-    if( use_ret == -(MBEDTLS_ERR_CTR_DRBG_INPUT_TOO_BIG) )
-        mbedtls_snprintf( buf, buflen, "CTR_DRBG - The input (entropy + additional data) is too large" );
-    if( use_ret == -(MBEDTLS_ERR_CTR_DRBG_FILE_IO_ERROR) )
-        mbedtls_snprintf( buf, buflen, "CTR_DRBG - Read or write error in file" );
+    if (use_ret == -(MBEDTLS_ERR_CTR_DRBG_ENTROPY_SOURCE_FAILED))
+        mbedtls_snprintf(buf, buflen, "CTR_DRBG - The entropy source failed");
+    if (use_ret == -(MBEDTLS_ERR_CTR_DRBG_REQUEST_TOO_BIG))
+        mbedtls_snprintf(buf, buflen, "CTR_DRBG - The requested random buffer length is too big");
+    if (use_ret == -(MBEDTLS_ERR_CTR_DRBG_INPUT_TOO_BIG))
+        mbedtls_snprintf(buf, buflen, "CTR_DRBG - The input (entropy + additional data) is too large");
+    if (use_ret == -(MBEDTLS_ERR_CTR_DRBG_FILE_IO_ERROR))
+        mbedtls_snprintf(buf, buflen, "CTR_DRBG - Read or write error in file");
 #endif /* MBEDTLS_CTR_DRBG_C */
 
 #if defined(MBEDTLS_DES_C)
-    if( use_ret == -(MBEDTLS_ERR_DES_INVALID_INPUT_LENGTH) )
-        mbedtls_snprintf( buf, buflen, "DES - The data input has an invalid length" );
-    if( use_ret == -(MBEDTLS_ERR_DES_HW_ACCEL_FAILED) )
-        mbedtls_snprintf( buf, buflen, "DES - DES hardware accelerator failed" );
+    if (use_ret == -(MBEDTLS_ERR_DES_INVALID_INPUT_LENGTH))
+        mbedtls_snprintf(buf, buflen, "DES - The data input has an invalid length");
+    if (use_ret == -(MBEDTLS_ERR_DES_HW_ACCEL_FAILED))
+        mbedtls_snprintf(buf, buflen, "DES - DES hardware accelerator failed");
 #endif /* MBEDTLS_DES_C */
 
 #if defined(MBEDTLS_ENTROPY_C)
-    if( use_ret == -(MBEDTLS_ERR_ENTROPY_SOURCE_FAILED) )
-        mbedtls_snprintf( buf, buflen, "ENTROPY - Critical entropy source failure" );
-    if( use_ret == -(MBEDTLS_ERR_ENTROPY_MAX_SOURCES) )
-        mbedtls_snprintf( buf, buflen, "ENTROPY - No more sources can be added" );
-    if( use_ret == -(MBEDTLS_ERR_ENTROPY_NO_SOURCES_DEFINED) )
-        mbedtls_snprintf( buf, buflen, "ENTROPY - No sources have been added to poll" );
-    if( use_ret == -(MBEDTLS_ERR_ENTROPY_NO_STRONG_SOURCE) )
-        mbedtls_snprintf( buf, buflen, "ENTROPY - No strong sources have been added to poll" );
-    if( use_ret == -(MBEDTLS_ERR_ENTROPY_FILE_IO_ERROR) )
-        mbedtls_snprintf( buf, buflen, "ENTROPY - Read/write error in file" );
+    if (use_ret == -(MBEDTLS_ERR_ENTROPY_SOURCE_FAILED))
+        mbedtls_snprintf(buf, buflen, "ENTROPY - Critical entropy source failure");
+    if (use_ret == -(MBEDTLS_ERR_ENTROPY_MAX_SOURCES))
+        mbedtls_snprintf(buf, buflen, "ENTROPY - No more sources can be added");
+    if (use_ret == -(MBEDTLS_ERR_ENTROPY_NO_SOURCES_DEFINED))
+        mbedtls_snprintf(buf, buflen, "ENTROPY - No sources have been added to poll");
+    if (use_ret == -(MBEDTLS_ERR_ENTROPY_NO_STRONG_SOURCE))
+        mbedtls_snprintf(buf, buflen, "ENTROPY - No strong sources have been added to poll");
+    if (use_ret == -(MBEDTLS_ERR_ENTROPY_FILE_IO_ERROR))
+        mbedtls_snprintf(buf, buflen, "ENTROPY - Read/write error in file");
 #endif /* MBEDTLS_ENTROPY_C */
 
 #if defined(MBEDTLS_GCM_C)
-    if( use_ret == -(MBEDTLS_ERR_GCM_AUTH_FAILED) )
-        mbedtls_snprintf( buf, buflen, "GCM - Authenticated decryption failed" );
-    if( use_ret == -(MBEDTLS_ERR_GCM_HW_ACCEL_FAILED) )
-        mbedtls_snprintf( buf, buflen, "GCM - GCM hardware accelerator failed" );
-    if( use_ret == -(MBEDTLS_ERR_GCM_BAD_INPUT) )
-        mbedtls_snprintf( buf, buflen, "GCM - Bad input parameters to function" );
+    if (use_ret == -(MBEDTLS_ERR_GCM_AUTH_FAILED))
+        mbedtls_snprintf(buf, buflen, "GCM - Authenticated decryption failed");
+    if (use_ret == -(MBEDTLS_ERR_GCM_HW_ACCEL_FAILED))
+        mbedtls_snprintf(buf, buflen, "GCM - GCM hardware accelerator failed");
+    if (use_ret == -(MBEDTLS_ERR_GCM_BAD_INPUT))
+        mbedtls_snprintf(buf, buflen, "GCM - Bad input parameters to function");
 #endif /* MBEDTLS_GCM_C */
 
 #if defined(MBEDTLS_HKDF_C)
-    if( use_ret == -(MBEDTLS_ERR_HKDF_BAD_INPUT_DATA) )
-        mbedtls_snprintf( buf, buflen, "HKDF - Bad input parameters to function" );
+    if (use_ret == -(MBEDTLS_ERR_HKDF_BAD_INPUT_DATA))
+        mbedtls_snprintf(buf, buflen, "HKDF - Bad input parameters to function");
 #endif /* MBEDTLS_HKDF_C */
 
 #if defined(MBEDTLS_HMAC_DRBG_C)
-    if( use_ret == -(MBEDTLS_ERR_HMAC_DRBG_REQUEST_TOO_BIG) )
-        mbedtls_snprintf( buf, buflen, "HMAC_DRBG - Too many random requested in single call" );
-    if( use_ret == -(MBEDTLS_ERR_HMAC_DRBG_INPUT_TOO_BIG) )
-        mbedtls_snprintf( buf, buflen, "HMAC_DRBG - Input too large (Entropy + additional)" );
-    if( use_ret == -(MBEDTLS_ERR_HMAC_DRBG_FILE_IO_ERROR) )
-        mbedtls_snprintf( buf, buflen, "HMAC_DRBG - Read/write error in file" );
-    if( use_ret == -(MBEDTLS_ERR_HMAC_DRBG_ENTROPY_SOURCE_FAILED) )
-        mbedtls_snprintf( buf, buflen, "HMAC_DRBG - The entropy source failed" );
+    if (use_ret == -(MBEDTLS_ERR_HMAC_DRBG_REQUEST_TOO_BIG))
+        mbedtls_snprintf(buf, buflen, "HMAC_DRBG - Too many random requested in single call");
+    if (use_ret == -(MBEDTLS_ERR_HMAC_DRBG_INPUT_TOO_BIG))
+        mbedtls_snprintf(buf, buflen, "HMAC_DRBG - Input too large (Entropy + additional)");
+    if (use_ret == -(MBEDTLS_ERR_HMAC_DRBG_FILE_IO_ERROR))
+        mbedtls_snprintf(buf, buflen, "HMAC_DRBG - Read/write error in file");
+    if (use_ret == -(MBEDTLS_ERR_HMAC_DRBG_ENTROPY_SOURCE_FAILED))
+        mbedtls_snprintf(buf, buflen, "HMAC_DRBG - The entropy source failed");
 #endif /* MBEDTLS_HMAC_DRBG_C */
 
 #if defined(MBEDTLS_MD2_C)
-    if( use_ret == -(MBEDTLS_ERR_MD2_HW_ACCEL_FAILED) )
-        mbedtls_snprintf( buf, buflen, "MD2 - MD2 hardware accelerator failed" );
+    if (use_ret == -(MBEDTLS_ERR_MD2_HW_ACCEL_FAILED))
+        mbedtls_snprintf(buf, buflen, "MD2 - MD2 hardware accelerator failed");
 #endif /* MBEDTLS_MD2_C */
 
 #if defined(MBEDTLS_MD4_C)
-    if( use_ret == -(MBEDTLS_ERR_MD4_HW_ACCEL_FAILED) )
-        mbedtls_snprintf( buf, buflen, "MD4 - MD4 hardware accelerator failed" );
+    if (use_ret == -(MBEDTLS_ERR_MD4_HW_ACCEL_FAILED))
+        mbedtls_snprintf(buf, buflen, "MD4 - MD4 hardware accelerator failed");
 #endif /* MBEDTLS_MD4_C */
 
 #if defined(MBEDTLS_MD5_C)
-    if( use_ret == -(MBEDTLS_ERR_MD5_HW_ACCEL_FAILED) )
-        mbedtls_snprintf( buf, buflen, "MD5 - MD5 hardware accelerator failed" );
+    if (use_ret == -(MBEDTLS_ERR_MD5_HW_ACCEL_FAILED))
+        mbedtls_snprintf(buf, buflen, "MD5 - MD5 hardware accelerator failed");
 #endif /* MBEDTLS_MD5_C */
 
 #if defined(MBEDTLS_NET_C)
-    if( use_ret == -(MBEDTLS_ERR_NET_SOCKET_FAILED) )
-        mbedtls_snprintf( buf, buflen, "NET - Failed to open a socket" );
-    if( use_ret == -(MBEDTLS_ERR_NET_CONNECT_FAILED) )
-        mbedtls_snprintf( buf, buflen, "NET - The connection to the given server / port failed" );
-    if( use_ret == -(MBEDTLS_ERR_NET_BIND_FAILED) )
-        mbedtls_snprintf( buf, buflen, "NET - Binding of the socket failed" );
-    if( use_ret == -(MBEDTLS_ERR_NET_LISTEN_FAILED) )
-        mbedtls_snprintf( buf, buflen, "NET - Could not listen on the socket" );
-    if( use_ret == -(MBEDTLS_ERR_NET_ACCEPT_FAILED) )
-        mbedtls_snprintf( buf, buflen, "NET - Could not accept the incoming connection" );
-    if( use_ret == -(MBEDTLS_ERR_NET_RECV_FAILED) )
-        mbedtls_snprintf( buf, buflen, "NET - Reading information from the socket failed" );
-    if( use_ret == -(MBEDTLS_ERR_NET_SEND_FAILED) )
-        mbedtls_snprintf( buf, buflen, "NET - Sending information through the socket failed" );
-    if( use_ret == -(MBEDTLS_ERR_NET_CONN_RESET) )
-        mbedtls_snprintf( buf, buflen, "NET - Connection was reset by peer" );
-    if( use_ret == -(MBEDTLS_ERR_NET_UNKNOWN_HOST) )
-        mbedtls_snprintf( buf, buflen, "NET - Failed to get an IP address for the given hostname" );
-    if( use_ret == -(MBEDTLS_ERR_NET_BUFFER_TOO_SMALL) )
-        mbedtls_snprintf( buf, buflen, "NET - Buffer is too small to hold the data" );
-    if( use_ret == -(MBEDTLS_ERR_NET_INVALID_CONTEXT) )
-        mbedtls_snprintf( buf, buflen, "NET - The context is invalid, eg because it was free()ed" );
-    if( use_ret == -(MBEDTLS_ERR_NET_POLL_FAILED) )
-        mbedtls_snprintf( buf, buflen, "NET - Polling the net context failed" );
-    if( use_ret == -(MBEDTLS_ERR_NET_BAD_INPUT_DATA) )
-        mbedtls_snprintf( buf, buflen, "NET - Input invalid" );
+    if (use_ret == -(MBEDTLS_ERR_NET_SOCKET_FAILED))
+        mbedtls_snprintf(buf, buflen, "NET - Failed to open a socket");
+    if (use_ret == -(MBEDTLS_ERR_NET_CONNECT_FAILED))
+        mbedtls_snprintf(buf, buflen, "NET - The connection to the given server / port failed");
+    if (use_ret == -(MBEDTLS_ERR_NET_BIND_FAILED))
+        mbedtls_snprintf(buf, buflen, "NET - Binding of the socket failed");
+    if (use_ret == -(MBEDTLS_ERR_NET_LISTEN_FAILED))
+        mbedtls_snprintf(buf, buflen, "NET - Could not listen on the socket");
+    if (use_ret == -(MBEDTLS_ERR_NET_ACCEPT_FAILED))
+        mbedtls_snprintf(buf, buflen, "NET - Could not accept the incoming connection");
+    if (use_ret == -(MBEDTLS_ERR_NET_RECV_FAILED))
+        mbedtls_snprintf(buf, buflen, "NET - Reading information from the socket failed");
+    if (use_ret == -(MBEDTLS_ERR_NET_SEND_FAILED))
+        mbedtls_snprintf(buf, buflen, "NET - Sending information through the socket failed");
+    if (use_ret == -(MBEDTLS_ERR_NET_CONN_RESET))
+        mbedtls_snprintf(buf, buflen, "NET - Connection was reset by peer");
+    if (use_ret == -(MBEDTLS_ERR_NET_UNKNOWN_HOST))
+        mbedtls_snprintf(buf, buflen, "NET - Failed to get an IP address for the given hostname");
+    if (use_ret == -(MBEDTLS_ERR_NET_BUFFER_TOO_SMALL))
+        mbedtls_snprintf(buf, buflen, "NET - Buffer is too small to hold the data");
+    if (use_ret == -(MBEDTLS_ERR_NET_INVALID_CONTEXT))
+        mbedtls_snprintf(buf, buflen, "NET - The context is invalid, eg because it was free()ed");
+    if (use_ret == -(MBEDTLS_ERR_NET_POLL_FAILED))
+        mbedtls_snprintf(buf, buflen, "NET - Polling the net context failed");
+    if (use_ret == -(MBEDTLS_ERR_NET_BAD_INPUT_DATA))
+        mbedtls_snprintf(buf, buflen, "NET - Input invalid");
 #endif /* MBEDTLS_NET_C */
 
 #if defined(MBEDTLS_OID_C)
-    if( use_ret == -(MBEDTLS_ERR_OID_NOT_FOUND) )
-        mbedtls_snprintf( buf, buflen, "OID - OID is not found" );
-    if( use_ret == -(MBEDTLS_ERR_OID_BUF_TOO_SMALL) )
-        mbedtls_snprintf( buf, buflen, "OID - output buffer is too small" );
+    if (use_ret == -(MBEDTLS_ERR_OID_NOT_FOUND))
+        mbedtls_snprintf(buf, buflen, "OID - OID is not found");
+    if (use_ret == -(MBEDTLS_ERR_OID_BUF_TOO_SMALL))
+        mbedtls_snprintf(buf, buflen, "OID - output buffer is too small");
 #endif /* MBEDTLS_OID_C */
 
 #if defined(MBEDTLS_PADLOCK_C)
-    if( use_ret == -(MBEDTLS_ERR_PADLOCK_DATA_MISALIGNED) )
-        mbedtls_snprintf( buf, buflen, "PADLOCK - Input data should be aligned" );
+    if (use_ret == -(MBEDTLS_ERR_PADLOCK_DATA_MISALIGNED))
+        mbedtls_snprintf(buf, buflen, "PADLOCK - Input data should be aligned");
 #endif /* MBEDTLS_PADLOCK_C */
 
 #if defined(MBEDTLS_POLY1305_C)
-    if( use_ret == -(MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA) )
-        mbedtls_snprintf( buf, buflen, "POLY1305 - Invalid input parameter(s)" );
-    if( use_ret == -(MBEDTLS_ERR_POLY1305_FEATURE_UNAVAILABLE) )
-        mbedtls_snprintf( buf, buflen, "POLY1305 - Feature not available. For example, s part of the API is not implemented" );
-    if( use_ret == -(MBEDTLS_ERR_POLY1305_HW_ACCEL_FAILED) )
-        mbedtls_snprintf( buf, buflen, "POLY1305 - Poly1305 hardware accelerator failed" );
+    if (use_ret == -(MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA))
+        mbedtls_snprintf(buf, buflen, "POLY1305 - Invalid input parameter(s)");
+    if (use_ret == -(MBEDTLS_ERR_POLY1305_FEATURE_UNAVAILABLE))
+        mbedtls_snprintf(buf, buflen, "POLY1305 - Feature not available. For example, s part of the API is not implemented");
+    if (use_ret == -(MBEDTLS_ERR_POLY1305_HW_ACCEL_FAILED))
+        mbedtls_snprintf(buf, buflen, "POLY1305 - Poly1305 hardware accelerator failed");
 #endif /* MBEDTLS_POLY1305_C */
 
 #if defined(MBEDTLS_RIPEMD160_C)
-    if( use_ret == -(MBEDTLS_ERR_RIPEMD160_HW_ACCEL_FAILED) )
-        mbedtls_snprintf( buf, buflen, "RIPEMD160 - RIPEMD160 hardware accelerator failed" );
+    if (use_ret == -(MBEDTLS_ERR_RIPEMD160_HW_ACCEL_FAILED))
+        mbedtls_snprintf(buf, buflen, "RIPEMD160 - RIPEMD160 hardware accelerator failed");
 #endif /* MBEDTLS_RIPEMD160_C */
 
 #if defined(MBEDTLS_SHA1_C)
-    if( use_ret == -(MBEDTLS_ERR_SHA1_HW_ACCEL_FAILED) )
-        mbedtls_snprintf( buf, buflen, "SHA1 - SHA-1 hardware accelerator failed" );
+    if (use_ret == -(MBEDTLS_ERR_SHA1_HW_ACCEL_FAILED))
+        mbedtls_snprintf(buf, buflen, "SHA1 - SHA-1 hardware accelerator failed");
 #endif /* MBEDTLS_SHA1_C */
 
 #if defined(MBEDTLS_SHA256_C)
-    if( use_ret == -(MBEDTLS_ERR_SHA256_HW_ACCEL_FAILED) )
-        mbedtls_snprintf( buf, buflen, "SHA256 - SHA-256 hardware accelerator failed" );
+    if (use_ret == -(MBEDTLS_ERR_SHA256_HW_ACCEL_FAILED))
+        mbedtls_snprintf(buf, buflen, "SHA256 - SHA-256 hardware accelerator failed");
 #endif /* MBEDTLS_SHA256_C */
 
 #if defined(MBEDTLS_SHA512_C)
-    if( use_ret == -(MBEDTLS_ERR_SHA512_HW_ACCEL_FAILED) )
-        mbedtls_snprintf( buf, buflen, "SHA512 - SHA-512 hardware accelerator failed" );
+    if (use_ret == -(MBEDTLS_ERR_SHA512_HW_ACCEL_FAILED))
+        mbedtls_snprintf(buf, buflen, "SHA512 - SHA-512 hardware accelerator failed");
 #endif /* MBEDTLS_SHA512_C */
 
 #if defined(MBEDTLS_THREADING_C)
-    if( use_ret == -(MBEDTLS_ERR_THREADING_FEATURE_UNAVAILABLE) )
-        mbedtls_snprintf( buf, buflen, "THREADING - The selected feature is not available" );
-    if( use_ret == -(MBEDTLS_ERR_THREADING_BAD_INPUT_DATA) )
-        mbedtls_snprintf( buf, buflen, "THREADING - Bad input parameters to function" );
-    if( use_ret == -(MBEDTLS_ERR_THREADING_MUTEX_ERROR) )
-        mbedtls_snprintf( buf, buflen, "THREADING - Locking / unlocking / free failed with error code" );
+    if (use_ret == -(MBEDTLS_ERR_THREADING_FEATURE_UNAVAILABLE))
+        mbedtls_snprintf(buf, buflen, "THREADING - The selected feature is not available");
+    if (use_ret == -(MBEDTLS_ERR_THREADING_BAD_INPUT_DATA))
+        mbedtls_snprintf(buf, buflen, "THREADING - Bad input parameters to function");
+    if (use_ret == -(MBEDTLS_ERR_THREADING_MUTEX_ERROR))
+        mbedtls_snprintf(buf, buflen, "THREADING - Locking / unlocking / free failed with error code");
 #endif /* MBEDTLS_THREADING_C */
 
 #if defined(MBEDTLS_XTEA_C)
-    if( use_ret == -(MBEDTLS_ERR_XTEA_INVALID_INPUT_LENGTH) )
-        mbedtls_snprintf( buf, buflen, "XTEA - The data input has an invalid length" );
-    if( use_ret == -(MBEDTLS_ERR_XTEA_HW_ACCEL_FAILED) )
-        mbedtls_snprintf( buf, buflen, "XTEA - XTEA hardware accelerator failed" );
+    if (use_ret == -(MBEDTLS_ERR_XTEA_INVALID_INPUT_LENGTH))
+        mbedtls_snprintf(buf, buflen, "XTEA - The data input has an invalid length");
+    if (use_ret == -(MBEDTLS_ERR_XTEA_HW_ACCEL_FAILED))
+        mbedtls_snprintf(buf, buflen, "XTEA - XTEA hardware accelerator failed");
 #endif /* MBEDTLS_XTEA_C */
     // END generated code
 
-    if( strlen( buf ) != 0 )
+    if (strlen(buf) != 0)
         return;
 
-    mbedtls_snprintf( buf, buflen, "UNKNOWN ERROR CODE (%04X)", use_ret );
+    mbedtls_snprintf(buf, buflen, "UNKNOWN ERROR CODE (%04X)", use_ret);
 }
 
 #else /* MBEDTLS_ERROR_C */
@@ -884,11 +881,11 @@ void mbedtls_strerror( int ret, char *buf, size_t buflen )
 /*
  * Provide an non-function in case MBEDTLS_ERROR_C is not defined
  */
-void mbedtls_strerror( int ret, char *buf, size_t buflen )
+void mbedtls_strerror(int ret, char *buf, size_t buflen)
 {
     ((void) ret);
 
-    if( buflen > 0 )
+    if (buflen > 0)
         buf[0] = '\0';
 }
 
diff --git a/common/mbedtls/error.h b/common/mbedtls/error.h
index 432179084..9e1867f32 100644
--- a/common/mbedtls/error.h
+++ b/common/mbedtls/error.h
@@ -115,7 +115,7 @@ extern "C" {
  * \param buffer    buffer to place representation in
  * \param buflen    length of the buffer
  */
-void mbedtls_strerror( int errnum, char *buffer, size_t buflen );
+void mbedtls_strerror(int errnum, char *buffer, size_t buflen);
 
 #ifdef __cplusplus
 }
diff --git a/common/mbedtls/md.c b/common/mbedtls/md.c
index 0530621b0..fd4c696b7 100644
--- a/common/mbedtls/md.c
+++ b/common/mbedtls/md.c
@@ -57,228 +57,223 @@
 static const int supported_digests[] = {
 
 #if defined(MBEDTLS_SHA512_C)
-        MBEDTLS_MD_SHA512,
-        MBEDTLS_MD_SHA384,
+    MBEDTLS_MD_SHA512,
+    MBEDTLS_MD_SHA384,
 #endif
 
 #if defined(MBEDTLS_SHA256_C)
-        MBEDTLS_MD_SHA256,
-        MBEDTLS_MD_SHA224,
+    MBEDTLS_MD_SHA256,
+    MBEDTLS_MD_SHA224,
 #endif
 
 #if defined(MBEDTLS_SHA1_C)
-        MBEDTLS_MD_SHA1,
+    MBEDTLS_MD_SHA1,
 #endif
 
 #if defined(MBEDTLS_RIPEMD160_C)
-        MBEDTLS_MD_RIPEMD160,
+    MBEDTLS_MD_RIPEMD160,
 #endif
 
 #if defined(MBEDTLS_MD5_C)
-        MBEDTLS_MD_MD5,
+    MBEDTLS_MD_MD5,
 #endif
 
 #if defined(MBEDTLS_MD4_C)
-        MBEDTLS_MD_MD4,
+    MBEDTLS_MD_MD4,
 #endif
 
 #if defined(MBEDTLS_MD2_C)
-        MBEDTLS_MD_MD2,
+    MBEDTLS_MD_MD2,
 #endif
 
-        MBEDTLS_MD_NONE
+    MBEDTLS_MD_NONE
 };
 
-const int *mbedtls_md_list( void )
+const int *mbedtls_md_list(void)
 {
-    return( supported_digests );
+    return (supported_digests);
 }
 
-const mbedtls_md_info_t *mbedtls_md_info_from_string( const char *md_name )
+const mbedtls_md_info_t *mbedtls_md_info_from_string(const char *md_name)
 {
-    if( NULL == md_name )
-        return( NULL );
+    if (NULL == md_name)
+        return (NULL);
 
     /* Get the appropriate digest information */
 #if defined(MBEDTLS_MD2_C)
-    if( !strcmp( "MD2", md_name ) )
-        return mbedtls_md_info_from_type( MBEDTLS_MD_MD2 );
+    if (!strcmp("MD2", md_name))
+        return mbedtls_md_info_from_type(MBEDTLS_MD_MD2);
 #endif
 #if defined(MBEDTLS_MD4_C)
-    if( !strcmp( "MD4", md_name ) )
-        return mbedtls_md_info_from_type( MBEDTLS_MD_MD4 );
+    if (!strcmp("MD4", md_name))
+        return mbedtls_md_info_from_type(MBEDTLS_MD_MD4);
 #endif
 #if defined(MBEDTLS_MD5_C)
-    if( !strcmp( "MD5", md_name ) )
-        return mbedtls_md_info_from_type( MBEDTLS_MD_MD5 );
+    if (!strcmp("MD5", md_name))
+        return mbedtls_md_info_from_type(MBEDTLS_MD_MD5);
 #endif
 #if defined(MBEDTLS_RIPEMD160_C)
-    if( !strcmp( "RIPEMD160", md_name ) )
-        return mbedtls_md_info_from_type( MBEDTLS_MD_RIPEMD160 );
+    if (!strcmp("RIPEMD160", md_name))
+        return mbedtls_md_info_from_type(MBEDTLS_MD_RIPEMD160);
 #endif
 #if defined(MBEDTLS_SHA1_C)
-    if( !strcmp( "SHA1", md_name ) || !strcmp( "SHA", md_name ) )
-        return mbedtls_md_info_from_type( MBEDTLS_MD_SHA1 );
+    if (!strcmp("SHA1", md_name) || !strcmp("SHA", md_name))
+        return mbedtls_md_info_from_type(MBEDTLS_MD_SHA1);
 #endif
 #if defined(MBEDTLS_SHA256_C)
-    if( !strcmp( "SHA224", md_name ) )
-        return mbedtls_md_info_from_type( MBEDTLS_MD_SHA224 );
-    if( !strcmp( "SHA256", md_name ) )
-        return mbedtls_md_info_from_type( MBEDTLS_MD_SHA256 );
+    if (!strcmp("SHA224", md_name))
+        return mbedtls_md_info_from_type(MBEDTLS_MD_SHA224);
+    if (!strcmp("SHA256", md_name))
+        return mbedtls_md_info_from_type(MBEDTLS_MD_SHA256);
 #endif
 #if defined(MBEDTLS_SHA512_C)
-    if( !strcmp( "SHA384", md_name ) )
-        return mbedtls_md_info_from_type( MBEDTLS_MD_SHA384 );
-    if( !strcmp( "SHA512", md_name ) )
-        return mbedtls_md_info_from_type( MBEDTLS_MD_SHA512 );
+    if (!strcmp("SHA384", md_name))
+        return mbedtls_md_info_from_type(MBEDTLS_MD_SHA384);
+    if (!strcmp("SHA512", md_name))
+        return mbedtls_md_info_from_type(MBEDTLS_MD_SHA512);
 #endif
-    return( NULL );
+    return (NULL);
 }
 
-const mbedtls_md_info_t *mbedtls_md_info_from_type( mbedtls_md_type_t md_type )
+const mbedtls_md_info_t *mbedtls_md_info_from_type(mbedtls_md_type_t md_type)
 {
-    switch( md_type )
-    {
+    switch (md_type) {
 #if defined(MBEDTLS_MD2_C)
         case MBEDTLS_MD_MD2:
-            return( &mbedtls_md2_info );
+            return (&mbedtls_md2_info);
 #endif
 #if defined(MBEDTLS_MD4_C)
         case MBEDTLS_MD_MD4:
-            return( &mbedtls_md4_info );
+            return (&mbedtls_md4_info);
 #endif
 #if defined(MBEDTLS_MD5_C)
         case MBEDTLS_MD_MD5:
-            return( &mbedtls_md5_info );
+            return (&mbedtls_md5_info);
 #endif
 #if defined(MBEDTLS_RIPEMD160_C)
         case MBEDTLS_MD_RIPEMD160:
-            return( &mbedtls_ripemd160_info );
+            return (&mbedtls_ripemd160_info);
 #endif
 #if defined(MBEDTLS_SHA1_C)
         case MBEDTLS_MD_SHA1:
-            return( &mbedtls_sha1_info );
+            return (&mbedtls_sha1_info);
 #endif
 #if defined(MBEDTLS_SHA256_C)
         case MBEDTLS_MD_SHA224:
-            return( &mbedtls_sha224_info );
+            return (&mbedtls_sha224_info);
         case MBEDTLS_MD_SHA256:
-            return( &mbedtls_sha256_info );
+            return (&mbedtls_sha256_info);
 #endif
 #if defined(MBEDTLS_SHA512_C)
         case MBEDTLS_MD_SHA384:
-            return( &mbedtls_sha384_info );
+            return (&mbedtls_sha384_info);
         case MBEDTLS_MD_SHA512:
-            return( &mbedtls_sha512_info );
+            return (&mbedtls_sha512_info);
 #endif
         default:
-            return( NULL );
+            return (NULL);
     }
 }
 
-void mbedtls_md_init( mbedtls_md_context_t *ctx )
+void mbedtls_md_init(mbedtls_md_context_t *ctx)
 {
-    memset( ctx, 0, sizeof( mbedtls_md_context_t ) );
+    memset(ctx, 0, sizeof(mbedtls_md_context_t));
 }
 
-void mbedtls_md_free( mbedtls_md_context_t *ctx )
+void mbedtls_md_free(mbedtls_md_context_t *ctx)
 {
-    if( ctx == NULL || ctx->md_info == NULL )
+    if (ctx == NULL || ctx->md_info == NULL)
         return;
 
-    if( ctx->md_ctx != NULL )
-        ctx->md_info->ctx_free_func( ctx->md_ctx );
+    if (ctx->md_ctx != NULL)
+        ctx->md_info->ctx_free_func(ctx->md_ctx);
 
-    if( ctx->hmac_ctx != NULL )
-    {
-        mbedtls_platform_zeroize( ctx->hmac_ctx,
-                                  2 * ctx->md_info->block_size );
-        mbedtls_free( ctx->hmac_ctx );
+    if (ctx->hmac_ctx != NULL) {
+        mbedtls_platform_zeroize(ctx->hmac_ctx,
+                                 2 * ctx->md_info->block_size);
+        mbedtls_free(ctx->hmac_ctx);
     }
 
-    mbedtls_platform_zeroize( ctx, sizeof( mbedtls_md_context_t ) );
+    mbedtls_platform_zeroize(ctx, sizeof(mbedtls_md_context_t));
 }
 
-int mbedtls_md_clone( mbedtls_md_context_t *dst,
-                      const mbedtls_md_context_t *src )
+int mbedtls_md_clone(mbedtls_md_context_t *dst,
+                     const mbedtls_md_context_t *src)
 {
-    if( dst == NULL || dst->md_info == NULL ||
+    if (dst == NULL || dst->md_info == NULL ||
         src == NULL || src->md_info == NULL ||
-        dst->md_info != src->md_info )
-    {
-        return( MBEDTLS_ERR_MD_BAD_INPUT_DATA );
+        dst->md_info != src->md_info) {
+        return (MBEDTLS_ERR_MD_BAD_INPUT_DATA);
     }
 
-    dst->md_info->clone_func( dst->md_ctx, src->md_ctx );
+    dst->md_info->clone_func(dst->md_ctx, src->md_ctx);
 
-    return( 0 );
+    return (0);
 }
 
 #if ! defined(MBEDTLS_DEPRECATED_REMOVED)
-int mbedtls_md_init_ctx( mbedtls_md_context_t *ctx, const mbedtls_md_info_t *md_info )
+int mbedtls_md_init_ctx(mbedtls_md_context_t *ctx, const mbedtls_md_info_t *md_info)
 {
-    return mbedtls_md_setup( ctx, md_info, 1 );
+    return mbedtls_md_setup(ctx, md_info, 1);
 }
 #endif
 
-int mbedtls_md_setup( mbedtls_md_context_t *ctx, const mbedtls_md_info_t *md_info, int hmac )
+int mbedtls_md_setup(mbedtls_md_context_t *ctx, const mbedtls_md_info_t *md_info, int hmac)
 {
-    if( md_info == NULL || ctx == NULL )
-        return( MBEDTLS_ERR_MD_BAD_INPUT_DATA );
+    if (md_info == NULL || ctx == NULL)
+        return (MBEDTLS_ERR_MD_BAD_INPUT_DATA);
 
-    if( ( ctx->md_ctx = md_info->ctx_alloc_func() ) == NULL )
-        return( MBEDTLS_ERR_MD_ALLOC_FAILED );
+    if ((ctx->md_ctx = md_info->ctx_alloc_func()) == NULL)
+        return (MBEDTLS_ERR_MD_ALLOC_FAILED);
 
-    if( hmac != 0 )
-    {
-        ctx->hmac_ctx = mbedtls_calloc( 2, md_info->block_size );
-        if( ctx->hmac_ctx == NULL )
-        {
-            md_info->ctx_free_func( ctx->md_ctx );
-            return( MBEDTLS_ERR_MD_ALLOC_FAILED );
+    if (hmac != 0) {
+        ctx->hmac_ctx = mbedtls_calloc(2, md_info->block_size);
+        if (ctx->hmac_ctx == NULL) {
+            md_info->ctx_free_func(ctx->md_ctx);
+            return (MBEDTLS_ERR_MD_ALLOC_FAILED);
         }
     }
 
     ctx->md_info = md_info;
 
-    return( 0 );
+    return (0);
 }
 
-int mbedtls_md_starts( mbedtls_md_context_t *ctx )
+int mbedtls_md_starts(mbedtls_md_context_t *ctx)
 {
-    if( ctx == NULL || ctx->md_info == NULL )
-        return( MBEDTLS_ERR_MD_BAD_INPUT_DATA );
+    if (ctx == NULL || ctx->md_info == NULL)
+        return (MBEDTLS_ERR_MD_BAD_INPUT_DATA);
 
-    return( ctx->md_info->starts_func( ctx->md_ctx ) );
+    return (ctx->md_info->starts_func(ctx->md_ctx));
 }
 
-int mbedtls_md_update( mbedtls_md_context_t *ctx, const unsigned char *input, size_t ilen )
+int mbedtls_md_update(mbedtls_md_context_t *ctx, const unsigned char *input, size_t ilen)
 {
-    if( ctx == NULL || ctx->md_info == NULL )
-        return( MBEDTLS_ERR_MD_BAD_INPUT_DATA );
+    if (ctx == NULL || ctx->md_info == NULL)
+        return (MBEDTLS_ERR_MD_BAD_INPUT_DATA);
 
-    return( ctx->md_info->update_func( ctx->md_ctx, input, ilen ) );
+    return (ctx->md_info->update_func(ctx->md_ctx, input, ilen));
 }
 
-int mbedtls_md_finish( mbedtls_md_context_t *ctx, unsigned char *output )
+int mbedtls_md_finish(mbedtls_md_context_t *ctx, unsigned char *output)
 {
-    if( ctx == NULL || ctx->md_info == NULL )
-        return( MBEDTLS_ERR_MD_BAD_INPUT_DATA );
+    if (ctx == NULL || ctx->md_info == NULL)
+        return (MBEDTLS_ERR_MD_BAD_INPUT_DATA);
 
-    return( ctx->md_info->finish_func( ctx->md_ctx, output ) );
+    return (ctx->md_info->finish_func(ctx->md_ctx, output));
 }
 
-int mbedtls_md( const mbedtls_md_info_t *md_info, const unsigned char *input, size_t ilen,
-            unsigned char *output )
+int mbedtls_md(const mbedtls_md_info_t *md_info, const unsigned char *input, size_t ilen,
+               unsigned char *output)
 {
-    if( md_info == NULL )
-        return( MBEDTLS_ERR_MD_BAD_INPUT_DATA );
+    if (md_info == NULL)
+        return (MBEDTLS_ERR_MD_BAD_INPUT_DATA);
 
-    return( md_info->digest_func( input, ilen, output ) );
+    return (md_info->digest_func(input, ilen, output));
 }
 
 #if defined(MBEDTLS_FS_IO)
-int mbedtls_md_file( const mbedtls_md_info_t *md_info, const char *path, unsigned char *output )
+int mbedtls_md_file(const mbedtls_md_info_t *md_info, const char *path, unsigned char *output)
 {
     int ret;
     FILE *f;
@@ -286,55 +281,54 @@ int mbedtls_md_file( const mbedtls_md_info_t *md_info, const char *path, unsigne
     mbedtls_md_context_t ctx;
     unsigned char buf[1024];
 
-    if( md_info == NULL )
-        return( MBEDTLS_ERR_MD_BAD_INPUT_DATA );
+    if (md_info == NULL)
+        return (MBEDTLS_ERR_MD_BAD_INPUT_DATA);
 
-    if( ( f = fopen( path, "rb" ) ) == NULL )
-        return( MBEDTLS_ERR_MD_FILE_IO_ERROR );
+    if ((f = fopen(path, "rb")) == NULL)
+        return (MBEDTLS_ERR_MD_FILE_IO_ERROR);
 
-    mbedtls_md_init( &ctx );
+    mbedtls_md_init(&ctx);
 
-    if( ( ret = mbedtls_md_setup( &ctx, md_info, 0 ) ) != 0 )
+    if ((ret = mbedtls_md_setup(&ctx, md_info, 0)) != 0)
         goto cleanup;
 
-    if( ( ret = md_info->starts_func( ctx.md_ctx ) ) != 0 )
+    if ((ret = md_info->starts_func(ctx.md_ctx)) != 0)
         goto cleanup;
 
-    while( ( n = fread( buf, 1, sizeof( buf ), f ) ) > 0 )
-        if( ( ret = md_info->update_func( ctx.md_ctx, buf, n ) ) != 0 )
+    while ((n = fread(buf, 1, sizeof(buf), f)) > 0)
+        if ((ret = md_info->update_func(ctx.md_ctx, buf, n)) != 0)
             goto cleanup;
 
-    if( ferror( f ) != 0 )
+    if (ferror(f) != 0)
         ret = MBEDTLS_ERR_MD_FILE_IO_ERROR;
     else
-        ret = md_info->finish_func( ctx.md_ctx, output );
+        ret = md_info->finish_func(ctx.md_ctx, output);
 
 cleanup:
-    mbedtls_platform_zeroize( buf, sizeof( buf ) );
-    fclose( f );
-    mbedtls_md_free( &ctx );
+    mbedtls_platform_zeroize(buf, sizeof(buf));
+    fclose(f);
+    mbedtls_md_free(&ctx);
 
-    return( ret );
+    return (ret);
 }
 #endif /* MBEDTLS_FS_IO */
 
-int mbedtls_md_hmac_starts( mbedtls_md_context_t *ctx, const unsigned char *key, size_t keylen )
+int mbedtls_md_hmac_starts(mbedtls_md_context_t *ctx, const unsigned char *key, size_t keylen)
 {
     int ret;
     unsigned char sum[MBEDTLS_MD_MAX_SIZE];
     unsigned char *ipad, *opad;
     size_t i;
 
-    if( ctx == NULL || ctx->md_info == NULL || ctx->hmac_ctx == NULL )
-        return( MBEDTLS_ERR_MD_BAD_INPUT_DATA );
+    if (ctx == NULL || ctx->md_info == NULL || ctx->hmac_ctx == NULL)
+        return (MBEDTLS_ERR_MD_BAD_INPUT_DATA);
 
-    if( keylen > (size_t) ctx->md_info->block_size )
-    {
-        if( ( ret = ctx->md_info->starts_func( ctx->md_ctx ) ) != 0 )
+    if (keylen > (size_t) ctx->md_info->block_size) {
+        if ((ret = ctx->md_info->starts_func(ctx->md_ctx)) != 0)
             goto cleanup;
-        if( ( ret = ctx->md_info->update_func( ctx->md_ctx, key, keylen ) ) != 0 )
+        if ((ret = ctx->md_info->update_func(ctx->md_ctx, key, keylen)) != 0)
             goto cleanup;
-        if( ( ret = ctx->md_info->finish_func( ctx->md_ctx, sum ) ) != 0 )
+        if ((ret = ctx->md_info->finish_func(ctx->md_ctx, sum)) != 0)
             goto cleanup;
 
         keylen = ctx->md_info->size;
@@ -344,132 +338,131 @@ int mbedtls_md_hmac_starts( mbedtls_md_context_t *ctx, const unsigned char *key,
     ipad = (unsigned char *) ctx->hmac_ctx;
     opad = (unsigned char *) ctx->hmac_ctx + ctx->md_info->block_size;
 
-    memset( ipad, 0x36, ctx->md_info->block_size );
-    memset( opad, 0x5C, ctx->md_info->block_size );
+    memset(ipad, 0x36, ctx->md_info->block_size);
+    memset(opad, 0x5C, ctx->md_info->block_size);
 
-    for( i = 0; i < keylen; i++ )
-    {
-        ipad[i] = (unsigned char)( ipad[i] ^ key[i] );
-        opad[i] = (unsigned char)( opad[i] ^ key[i] );
+    for (i = 0; i < keylen; i++) {
+        ipad[i] = (unsigned char)(ipad[i] ^ key[i]);
+        opad[i] = (unsigned char)(opad[i] ^ key[i]);
     }
 
-    if( ( ret = ctx->md_info->starts_func( ctx->md_ctx ) ) != 0 )
+    if ((ret = ctx->md_info->starts_func(ctx->md_ctx)) != 0)
         goto cleanup;
-    if( ( ret = ctx->md_info->update_func( ctx->md_ctx, ipad,
-                                           ctx->md_info->block_size ) ) != 0 )
+    if ((ret = ctx->md_info->update_func(ctx->md_ctx, ipad,
+                                         ctx->md_info->block_size)) != 0)
         goto cleanup;
 
 cleanup:
-    mbedtls_platform_zeroize( sum, sizeof( sum ) );
+    mbedtls_platform_zeroize(sum, sizeof(sum));
 
-    return( ret );
+    return (ret);
 }
 
-int mbedtls_md_hmac_update( mbedtls_md_context_t *ctx, const unsigned char *input, size_t ilen )
+int mbedtls_md_hmac_update(mbedtls_md_context_t *ctx, const unsigned char *input, size_t ilen)
 {
-    if( ctx == NULL || ctx->md_info == NULL || ctx->hmac_ctx == NULL )
-        return( MBEDTLS_ERR_MD_BAD_INPUT_DATA );
+    if (ctx == NULL || ctx->md_info == NULL || ctx->hmac_ctx == NULL)
+        return (MBEDTLS_ERR_MD_BAD_INPUT_DATA);
 
-    return( ctx->md_info->update_func( ctx->md_ctx, input, ilen ) );
+    return (ctx->md_info->update_func(ctx->md_ctx, input, ilen));
 }
 
-int mbedtls_md_hmac_finish( mbedtls_md_context_t *ctx, unsigned char *output )
+int mbedtls_md_hmac_finish(mbedtls_md_context_t *ctx, unsigned char *output)
 {
     int ret;
     unsigned char tmp[MBEDTLS_MD_MAX_SIZE];
     unsigned char *opad;
 
-    if( ctx == NULL || ctx->md_info == NULL || ctx->hmac_ctx == NULL )
-        return( MBEDTLS_ERR_MD_BAD_INPUT_DATA );
+    if (ctx == NULL || ctx->md_info == NULL || ctx->hmac_ctx == NULL)
+        return (MBEDTLS_ERR_MD_BAD_INPUT_DATA);
 
     opad = (unsigned char *) ctx->hmac_ctx + ctx->md_info->block_size;
 
-    if( ( ret = ctx->md_info->finish_func( ctx->md_ctx, tmp ) ) != 0 )
-        return( ret );
-    if( ( ret = ctx->md_info->starts_func( ctx->md_ctx ) ) != 0 )
-        return( ret );
-    if( ( ret = ctx->md_info->update_func( ctx->md_ctx, opad,
-                                           ctx->md_info->block_size ) ) != 0 )
-        return( ret );
-    if( ( ret = ctx->md_info->update_func( ctx->md_ctx, tmp,
-                                           ctx->md_info->size ) ) != 0 )
-        return( ret );
-    return( ctx->md_info->finish_func( ctx->md_ctx, output ) );
+    if ((ret = ctx->md_info->finish_func(ctx->md_ctx, tmp)) != 0)
+        return (ret);
+    if ((ret = ctx->md_info->starts_func(ctx->md_ctx)) != 0)
+        return (ret);
+    if ((ret = ctx->md_info->update_func(ctx->md_ctx, opad,
+                                         ctx->md_info->block_size)) != 0)
+        return (ret);
+    if ((ret = ctx->md_info->update_func(ctx->md_ctx, tmp,
+                                         ctx->md_info->size)) != 0)
+        return (ret);
+    return (ctx->md_info->finish_func(ctx->md_ctx, output));
 }
 
-int mbedtls_md_hmac_reset( mbedtls_md_context_t *ctx )
+int mbedtls_md_hmac_reset(mbedtls_md_context_t *ctx)
 {
     int ret;
     unsigned char *ipad;
 
-    if( ctx == NULL || ctx->md_info == NULL || ctx->hmac_ctx == NULL )
-        return( MBEDTLS_ERR_MD_BAD_INPUT_DATA );
+    if (ctx == NULL || ctx->md_info == NULL || ctx->hmac_ctx == NULL)
+        return (MBEDTLS_ERR_MD_BAD_INPUT_DATA);
 
     ipad = (unsigned char *) ctx->hmac_ctx;
 
-    if( ( ret = ctx->md_info->starts_func( ctx->md_ctx ) ) != 0 )
-        return( ret );
-    return( ctx->md_info->update_func( ctx->md_ctx, ipad,
-                                       ctx->md_info->block_size ) );
+    if ((ret = ctx->md_info->starts_func(ctx->md_ctx)) != 0)
+        return (ret);
+    return (ctx->md_info->update_func(ctx->md_ctx, ipad,
+                                      ctx->md_info->block_size));
 }
 
-int mbedtls_md_hmac( const mbedtls_md_info_t *md_info,
-                     const unsigned char *key, size_t keylen,
-                     const unsigned char *input, size_t ilen,
-                     unsigned char *output )
+int mbedtls_md_hmac(const mbedtls_md_info_t *md_info,
+                    const unsigned char *key, size_t keylen,
+                    const unsigned char *input, size_t ilen,
+                    unsigned char *output)
 {
     mbedtls_md_context_t ctx;
     int ret;
 
-    if( md_info == NULL )
-        return( MBEDTLS_ERR_MD_BAD_INPUT_DATA );
+    if (md_info == NULL)
+        return (MBEDTLS_ERR_MD_BAD_INPUT_DATA);
 
-    mbedtls_md_init( &ctx );
+    mbedtls_md_init(&ctx);
 
-    if( ( ret = mbedtls_md_setup( &ctx, md_info, 1 ) ) != 0 )
+    if ((ret = mbedtls_md_setup(&ctx, md_info, 1)) != 0)
         goto cleanup;
 
-    if( ( ret = mbedtls_md_hmac_starts( &ctx, key, keylen ) ) != 0 )
+    if ((ret = mbedtls_md_hmac_starts(&ctx, key, keylen)) != 0)
         goto cleanup;
-    if( ( ret = mbedtls_md_hmac_update( &ctx, input, ilen ) ) != 0 )
+    if ((ret = mbedtls_md_hmac_update(&ctx, input, ilen)) != 0)
         goto cleanup;
-    if( ( ret = mbedtls_md_hmac_finish( &ctx, output ) ) != 0 )
+    if ((ret = mbedtls_md_hmac_finish(&ctx, output)) != 0)
         goto cleanup;
 
 cleanup:
-    mbedtls_md_free( &ctx );
+    mbedtls_md_free(&ctx);
 
-    return( ret );
+    return (ret);
 }
 
-int mbedtls_md_process( mbedtls_md_context_t *ctx, const unsigned char *data )
+int mbedtls_md_process(mbedtls_md_context_t *ctx, const unsigned char *data)
 {
-    if( ctx == NULL || ctx->md_info == NULL )
-        return( MBEDTLS_ERR_MD_BAD_INPUT_DATA );
+    if (ctx == NULL || ctx->md_info == NULL)
+        return (MBEDTLS_ERR_MD_BAD_INPUT_DATA);
 
-    return( ctx->md_info->process_func( ctx->md_ctx, data ) );
+    return (ctx->md_info->process_func(ctx->md_ctx, data));
 }
 
-unsigned char mbedtls_md_get_size( const mbedtls_md_info_t *md_info )
+unsigned char mbedtls_md_get_size(const mbedtls_md_info_t *md_info)
 {
-    if( md_info == NULL )
-        return( 0 );
+    if (md_info == NULL)
+        return (0);
 
     return md_info->size;
 }
 
-mbedtls_md_type_t mbedtls_md_get_type( const mbedtls_md_info_t *md_info )
+mbedtls_md_type_t mbedtls_md_get_type(const mbedtls_md_info_t *md_info)
 {
-    if( md_info == NULL )
-        return( MBEDTLS_MD_NONE );
+    if (md_info == NULL)
+        return (MBEDTLS_MD_NONE);
 
     return md_info->type;
 }
 
-const char *mbedtls_md_get_name( const mbedtls_md_info_t *md_info )
+const char *mbedtls_md_get_name(const mbedtls_md_info_t *md_info)
 {
-    if( md_info == NULL )
-        return( NULL );
+    if (md_info == NULL)
+        return (NULL);
 
     return md_info->name;
 }
diff --git a/common/mbedtls/md.h b/common/mbedtls/md.h
index 797d5ff3e..a127160f3 100644
--- a/common/mbedtls/md.h
+++ b/common/mbedtls/md.h
@@ -1,10 +1,10 @@
- /**
- * \file md.h
- *
- * \brief This file contains the generic message-digest wrapper.
- *
- * \author Adriaan de Jong <dejong@fox-it.com>
- */
+/**
+* \file md.h
+*
+* \brief This file contains the generic message-digest wrapper.
+*
+* \author Adriaan de Jong <dejong@fox-it.com>
+*/
 /*
  *  Copyright (C) 2006-2018, Arm Limited (or its affiliates), All Rights Reserved
  *  SPDX-License-Identifier: GPL-2.0
@@ -56,7 +56,7 @@ extern "C" {
  *
  */
 typedef enum {
-    MBEDTLS_MD_NONE=0,    /**< None. */
+    MBEDTLS_MD_NONE = 0,  /**< None. */
     MBEDTLS_MD_MD2,       /**< The MD2 message digest. */
     MBEDTLS_MD_MD4,       /**< The MD4 message digest. */
     MBEDTLS_MD_MD5,       /**< The MD5 message digest. */
@@ -82,8 +82,7 @@ typedef struct mbedtls_md_info_t mbedtls_md_info_t;
 /**
  * The generic message-digest context.
  */
-typedef struct mbedtls_md_context_t
-{
+typedef struct mbedtls_md_context_t {
     /** Information about the associated message digest. */
     const mbedtls_md_info_t *md_info;
 
@@ -103,7 +102,7 @@ typedef struct mbedtls_md_context_t
  *                  message-digest enumeration #mbedtls_md_type_t.
  *                  The last entry is 0.
  */
-const int *mbedtls_md_list( void );
+const int *mbedtls_md_list(void);
 
 /**
  * \brief           This function returns the message-digest information
@@ -114,7 +113,7 @@ const int *mbedtls_md_list( void );
  * \return          The message-digest information associated with \p md_name.
  * \return          NULL if the associated message-digest information is not found.
  */
-const mbedtls_md_info_t *mbedtls_md_info_from_string( const char *md_name );
+const mbedtls_md_info_t *mbedtls_md_info_from_string(const char *md_name);
 
 /**
  * \brief           This function returns the message-digest information
@@ -125,7 +124,7 @@ const mbedtls_md_info_t *mbedtls_md_info_from_string( const char *md_name );
  * \return          The message-digest information associated with \p md_type.
  * \return          NULL if the associated message-digest information is not found.
  */
-const mbedtls_md_info_t *mbedtls_md_info_from_type( mbedtls_md_type_t md_type );
+const mbedtls_md_info_t *mbedtls_md_info_from_type(mbedtls_md_type_t md_type);
 
 /**
  * \brief           This function initializes a message-digest context without
@@ -135,7 +134,7 @@ const mbedtls_md_info_t *mbedtls_md_info_from_type( mbedtls_md_type_t md_type );
  *                  context for mbedtls_md_setup() for binding it to a
  *                  message-digest algorithm.
  */
-void mbedtls_md_init( mbedtls_md_context_t *ctx );
+void mbedtls_md_init(mbedtls_md_context_t *ctx);
 
 /**
  * \brief           This function clears the internal structure of \p ctx and
@@ -150,7 +149,7 @@ void mbedtls_md_init( mbedtls_md_context_t *ctx );
  *                  You must not call this function if you have not called
  *                  mbedtls_md_init().
  */
-void mbedtls_md_free( mbedtls_md_context_t *ctx );
+void mbedtls_md_free(mbedtls_md_context_t *ctx);
 
 #if ! defined(MBEDTLS_DEPRECATED_REMOVED)
 #if defined(MBEDTLS_DEPRECATED_WARNING)
@@ -176,7 +175,7 @@ void mbedtls_md_free( mbedtls_md_context_t *ctx );
  *                  failure.
  * \return          #MBEDTLS_ERR_MD_ALLOC_FAILED on memory-allocation failure.
  */
-int mbedtls_md_init_ctx( mbedtls_md_context_t *ctx, const mbedtls_md_info_t *md_info ) MBEDTLS_DEPRECATED;
+int mbedtls_md_init_ctx(mbedtls_md_context_t *ctx, const mbedtls_md_info_t *md_info) MBEDTLS_DEPRECATED;
 #undef MBEDTLS_DEPRECATED
 #endif /* MBEDTLS_DEPRECATED_REMOVED */
 
@@ -199,7 +198,7 @@ int mbedtls_md_init_ctx( mbedtls_md_context_t *ctx, const mbedtls_md_info_t *md_
  *                  failure.
  * \return          #MBEDTLS_ERR_MD_ALLOC_FAILED on memory-allocation failure.
  */
-int mbedtls_md_setup( mbedtls_md_context_t *ctx, const mbedtls_md_info_t *md_info, int hmac );
+int mbedtls_md_setup(mbedtls_md_context_t *ctx, const mbedtls_md_info_t *md_info, int hmac);
 
 /**
  * \brief           This function clones the state of an message-digest
@@ -220,8 +219,8 @@ int mbedtls_md_setup( mbedtls_md_context_t *ctx, const mbedtls_md_info_t *md_inf
  * \return          \c 0 on success.
  * \return          #MBEDTLS_ERR_MD_BAD_INPUT_DATA on parameter-verification failure.
  */
-int mbedtls_md_clone( mbedtls_md_context_t *dst,
-                      const mbedtls_md_context_t *src );
+int mbedtls_md_clone(mbedtls_md_context_t *dst,
+                     const mbedtls_md_context_t *src);
 
 /**
  * \brief           This function extracts the message-digest size from the
@@ -232,7 +231,7 @@ int mbedtls_md_clone( mbedtls_md_context_t *dst,
  *
  * \return          The size of the message-digest output in Bytes.
  */
-unsigned char mbedtls_md_get_size( const mbedtls_md_info_t *md_info );
+unsigned char mbedtls_md_get_size(const mbedtls_md_info_t *md_info);
 
 /**
  * \brief           This function extracts the message-digest type from the
@@ -243,7 +242,7 @@ unsigned char mbedtls_md_get_size( const mbedtls_md_info_t *md_info );
  *
  * \return          The type of the message digest.
  */
-mbedtls_md_type_t mbedtls_md_get_type( const mbedtls_md_info_t *md_info );
+mbedtls_md_type_t mbedtls_md_get_type(const mbedtls_md_info_t *md_info);
 
 /**
  * \brief           This function extracts the message-digest name from the
@@ -254,7 +253,7 @@ mbedtls_md_type_t mbedtls_md_get_type( const mbedtls_md_info_t *md_info );
  *
  * \return          The name of the message digest.
  */
-const char *mbedtls_md_get_name( const mbedtls_md_info_t *md_info );
+const char *mbedtls_md_get_name(const mbedtls_md_info_t *md_info);
 
 /**
  * \brief           This function starts a message-digest computation.
@@ -269,7 +268,7 @@ const char *mbedtls_md_get_name( const mbedtls_md_info_t *md_info );
  * \return          #MBEDTLS_ERR_MD_BAD_INPUT_DATA on parameter-verification
  *                  failure.
  */
-int mbedtls_md_starts( mbedtls_md_context_t *ctx );
+int mbedtls_md_starts(mbedtls_md_context_t *ctx);
 
 /**
  * \brief           This function feeds an input buffer into an ongoing
@@ -287,7 +286,7 @@ int mbedtls_md_starts( mbedtls_md_context_t *ctx );
  * \return          #MBEDTLS_ERR_MD_BAD_INPUT_DATA on parameter-verification
  *                  failure.
  */
-int mbedtls_md_update( mbedtls_md_context_t *ctx, const unsigned char *input, size_t ilen );
+int mbedtls_md_update(mbedtls_md_context_t *ctx, const unsigned char *input, size_t ilen);
 
 /**
  * \brief           This function finishes the digest operation,
@@ -307,7 +306,7 @@ int mbedtls_md_update( mbedtls_md_context_t *ctx, const unsigned char *input, si
  * \return          #MBEDTLS_ERR_MD_BAD_INPUT_DATA on parameter-verification
  *                  failure.
  */
-int mbedtls_md_finish( mbedtls_md_context_t *ctx, unsigned char *output );
+int mbedtls_md_finish(mbedtls_md_context_t *ctx, unsigned char *output);
 
 /**
  * \brief          This function calculates the message-digest of a buffer,
@@ -327,8 +326,8 @@ int mbedtls_md_finish( mbedtls_md_context_t *ctx, unsigned char *output );
  * \return         #MBEDTLS_ERR_MD_BAD_INPUT_DATA on parameter-verification
  *                 failure.
  */
-int mbedtls_md( const mbedtls_md_info_t *md_info, const unsigned char *input, size_t ilen,
-        unsigned char *output );
+int mbedtls_md(const mbedtls_md_info_t *md_info, const unsigned char *input, size_t ilen,
+               unsigned char *output);
 
 #if defined(MBEDTLS_FS_IO)
 /**
@@ -348,8 +347,8 @@ int mbedtls_md( const mbedtls_md_info_t *md_info, const unsigned char *input, si
  *                 the file pointed by \p path.
  * \return         #MBEDTLS_ERR_MD_BAD_INPUT_DATA if \p md_info was NULL.
  */
-int mbedtls_md_file( const mbedtls_md_info_t *md_info, const char *path,
-                     unsigned char *output );
+int mbedtls_md_file(const mbedtls_md_info_t *md_info, const char *path,
+                    unsigned char *output);
 #endif /* MBEDTLS_FS_IO */
 
 /**
@@ -370,8 +369,8 @@ int mbedtls_md_file( const mbedtls_md_info_t *md_info, const char *path,
  * \return          #MBEDTLS_ERR_MD_BAD_INPUT_DATA on parameter-verification
  *                  failure.
  */
-int mbedtls_md_hmac_starts( mbedtls_md_context_t *ctx, const unsigned char *key,
-                    size_t keylen );
+int mbedtls_md_hmac_starts(mbedtls_md_context_t *ctx, const unsigned char *key,
+                           size_t keylen);
 
 /**
  * \brief           This function feeds an input buffer into an ongoing HMAC
@@ -392,8 +391,8 @@ int mbedtls_md_hmac_starts( mbedtls_md_context_t *ctx, const unsigned char *key,
  * \return          #MBEDTLS_ERR_MD_BAD_INPUT_DATA on parameter-verification
  *                  failure.
  */
-int mbedtls_md_hmac_update( mbedtls_md_context_t *ctx, const unsigned char *input,
-                    size_t ilen );
+int mbedtls_md_hmac_update(mbedtls_md_context_t *ctx, const unsigned char *input,
+                           size_t ilen);
 
 /**
  * \brief           This function finishes the HMAC operation, and writes
@@ -413,7 +412,7 @@ int mbedtls_md_hmac_update( mbedtls_md_context_t *ctx, const unsigned char *inpu
  * \return          #MBEDTLS_ERR_MD_BAD_INPUT_DATA on parameter-verification
  *                  failure.
  */
-int mbedtls_md_hmac_finish( mbedtls_md_context_t *ctx, unsigned char *output);
+int mbedtls_md_hmac_finish(mbedtls_md_context_t *ctx, unsigned char *output);
 
 /**
  * \brief           This function prepares to authenticate a new message with
@@ -430,7 +429,7 @@ int mbedtls_md_hmac_finish( mbedtls_md_context_t *ctx, unsigned char *output);
  * \return          #MBEDTLS_ERR_MD_BAD_INPUT_DATA on parameter-verification
  *                  failure.
  */
-int mbedtls_md_hmac_reset( mbedtls_md_context_t *ctx );
+int mbedtls_md_hmac_reset(mbedtls_md_context_t *ctx);
 
 /**
  * \brief          This function calculates the full generic HMAC
@@ -454,12 +453,12 @@ int mbedtls_md_hmac_reset( mbedtls_md_context_t *ctx );
  * \return         #MBEDTLS_ERR_MD_BAD_INPUT_DATA on parameter-verification
  *                 failure.
  */
-int mbedtls_md_hmac( const mbedtls_md_info_t *md_info, const unsigned char *key, size_t keylen,
-                const unsigned char *input, size_t ilen,
-                unsigned char *output );
+int mbedtls_md_hmac(const mbedtls_md_info_t *md_info, const unsigned char *key, size_t keylen,
+                    const unsigned char *input, size_t ilen,
+                    unsigned char *output);
 
 /* Internal use */
-int mbedtls_md_process( mbedtls_md_context_t *ctx, const unsigned char *data );
+int mbedtls_md_process(mbedtls_md_context_t *ctx, const unsigned char *data);
 
 #ifdef __cplusplus
 }
diff --git a/common/mbedtls/md5.c b/common/mbedtls/md5.c
index e0b4c768b..a606c4f23 100644
--- a/common/mbedtls/md5.c
+++ b/common/mbedtls/md5.c
@@ -55,39 +55,39 @@
  */
 #ifndef GET_UINT32_LE
 #define GET_UINT32_LE(n,b,i)                            \
-{                                                       \
-    (n) = ( (uint32_t) (b)[(i)    ]       )             \
-        | ( (uint32_t) (b)[(i) + 1] <<  8 )             \
-        | ( (uint32_t) (b)[(i) + 2] << 16 )             \
-        | ( (uint32_t) (b)[(i) + 3] << 24 );            \
-}
+    {                                                       \
+        (n) = ( (uint32_t) (b)[(i)    ]       )             \
+              | ( (uint32_t) (b)[(i) + 1] <<  8 )             \
+              | ( (uint32_t) (b)[(i) + 2] << 16 )             \
+              | ( (uint32_t) (b)[(i) + 3] << 24 );            \
+    }
 #endif
 
 #ifndef PUT_UINT32_LE
 #define PUT_UINT32_LE(n,b,i)                                    \
-{                                                               \
-    (b)[(i)    ] = (unsigned char) ( ( (n)       ) & 0xFF );    \
-    (b)[(i) + 1] = (unsigned char) ( ( (n) >>  8 ) & 0xFF );    \
-    (b)[(i) + 2] = (unsigned char) ( ( (n) >> 16 ) & 0xFF );    \
-    (b)[(i) + 3] = (unsigned char) ( ( (n) >> 24 ) & 0xFF );    \
-}
+    {                                                               \
+        (b)[(i)    ] = (unsigned char) ( ( (n)       ) & 0xFF );    \
+        (b)[(i) + 1] = (unsigned char) ( ( (n) >>  8 ) & 0xFF );    \
+        (b)[(i) + 2] = (unsigned char) ( ( (n) >> 16 ) & 0xFF );    \
+        (b)[(i) + 3] = (unsigned char) ( ( (n) >> 24 ) & 0xFF );    \
+    }
 #endif
 
-void mbedtls_md5_init( mbedtls_md5_context *ctx )
+void mbedtls_md5_init(mbedtls_md5_context *ctx)
 {
-    memset( ctx, 0, sizeof( mbedtls_md5_context ) );
+    memset(ctx, 0, sizeof(mbedtls_md5_context));
 }
 
-void mbedtls_md5_free( mbedtls_md5_context *ctx )
+void mbedtls_md5_free(mbedtls_md5_context *ctx)
 {
-    if( ctx == NULL )
+    if (ctx == NULL)
         return;
 
-    mbedtls_platform_zeroize( ctx, sizeof( mbedtls_md5_context ) );
+    mbedtls_platform_zeroize(ctx, sizeof(mbedtls_md5_context));
 }
 
-void mbedtls_md5_clone( mbedtls_md5_context *dst,
-                        const mbedtls_md5_context *src )
+void mbedtls_md5_clone(mbedtls_md5_context *dst,
+                       const mbedtls_md5_context *src)
 {
     *dst = *src;
 }
@@ -95,7 +95,7 @@ void mbedtls_md5_clone( mbedtls_md5_context *dst,
 /*
  * MD5 context setup
  */
-int mbedtls_md5_starts_ret( mbedtls_md5_context *ctx )
+int mbedtls_md5_starts_ret(mbedtls_md5_context *ctx)
 {
     ctx->total[0] = 0;
     ctx->total[1] = 0;
@@ -105,45 +105,45 @@ int mbedtls_md5_starts_ret( mbedtls_md5_context *ctx )
     ctx->state[2] = 0x98BADCFE;
     ctx->state[3] = 0x10325476;
 
-    return( 0 );
+    return (0);
 }
 
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
-void mbedtls_md5_starts( mbedtls_md5_context *ctx )
+void mbedtls_md5_starts(mbedtls_md5_context *ctx)
 {
-    mbedtls_md5_starts_ret( ctx );
+    mbedtls_md5_starts_ret(ctx);
 }
 #endif
 
 #if !defined(MBEDTLS_MD5_PROCESS_ALT)
-int mbedtls_internal_md5_process( mbedtls_md5_context *ctx,
-                                  const unsigned char data[64] )
+int mbedtls_internal_md5_process(mbedtls_md5_context *ctx,
+                                 const unsigned char data[64])
 {
     uint32_t X[16], A, B, C, D;
 
-    GET_UINT32_LE( X[ 0], data,  0 );
-    GET_UINT32_LE( X[ 1], data,  4 );
-    GET_UINT32_LE( X[ 2], data,  8 );
-    GET_UINT32_LE( X[ 3], data, 12 );
-    GET_UINT32_LE( X[ 4], data, 16 );
-    GET_UINT32_LE( X[ 5], data, 20 );
-    GET_UINT32_LE( X[ 6], data, 24 );
-    GET_UINT32_LE( X[ 7], data, 28 );
-    GET_UINT32_LE( X[ 8], data, 32 );
-    GET_UINT32_LE( X[ 9], data, 36 );
-    GET_UINT32_LE( X[10], data, 40 );
-    GET_UINT32_LE( X[11], data, 44 );
-    GET_UINT32_LE( X[12], data, 48 );
-    GET_UINT32_LE( X[13], data, 52 );
-    GET_UINT32_LE( X[14], data, 56 );
-    GET_UINT32_LE( X[15], data, 60 );
+    GET_UINT32_LE(X[ 0], data,  0);
+    GET_UINT32_LE(X[ 1], data,  4);
+    GET_UINT32_LE(X[ 2], data,  8);
+    GET_UINT32_LE(X[ 3], data, 12);
+    GET_UINT32_LE(X[ 4], data, 16);
+    GET_UINT32_LE(X[ 5], data, 20);
+    GET_UINT32_LE(X[ 6], data, 24);
+    GET_UINT32_LE(X[ 7], data, 28);
+    GET_UINT32_LE(X[ 8], data, 32);
+    GET_UINT32_LE(X[ 9], data, 36);
+    GET_UINT32_LE(X[10], data, 40);
+    GET_UINT32_LE(X[11], data, 44);
+    GET_UINT32_LE(X[12], data, 48);
+    GET_UINT32_LE(X[13], data, 52);
+    GET_UINT32_LE(X[14], data, 56);
+    GET_UINT32_LE(X[15], data, 60);
 
 #define S(x,n) ((x << n) | ((x & 0xFFFFFFFF) >> (32 - n)))
 
 #define P(a,b,c,d,k,s,t)                                \
-{                                                       \
-    a += F(b,c,d) + X[k] + t; a = S(a,s) + b;           \
-}
+    {                                                       \
+        a += F(b,c,d) + X[k] + t; a = S(a,s) + b;           \
+    }
 
     A = ctx->state[0];
     B = ctx->state[1];
@@ -152,85 +152,85 @@ int mbedtls_internal_md5_process( mbedtls_md5_context *ctx,
 
 #define F(x,y,z) (z ^ (x & (y ^ z)))
 
-    P( A, B, C, D,  0,  7, 0xD76AA478 );
-    P( D, A, B, C,  1, 12, 0xE8C7B756 );
-    P( C, D, A, B,  2, 17, 0x242070DB );
-    P( B, C, D, A,  3, 22, 0xC1BDCEEE );
-    P( A, B, C, D,  4,  7, 0xF57C0FAF );
-    P( D, A, B, C,  5, 12, 0x4787C62A );
-    P( C, D, A, B,  6, 17, 0xA8304613 );
-    P( B, C, D, A,  7, 22, 0xFD469501 );
-    P( A, B, C, D,  8,  7, 0x698098D8 );
-    P( D, A, B, C,  9, 12, 0x8B44F7AF );
-    P( C, D, A, B, 10, 17, 0xFFFF5BB1 );
-    P( B, C, D, A, 11, 22, 0x895CD7BE );
-    P( A, B, C, D, 12,  7, 0x6B901122 );
-    P( D, A, B, C, 13, 12, 0xFD987193 );
-    P( C, D, A, B, 14, 17, 0xA679438E );
-    P( B, C, D, A, 15, 22, 0x49B40821 );
+    P(A, B, C, D,  0,  7, 0xD76AA478);
+    P(D, A, B, C,  1, 12, 0xE8C7B756);
+    P(C, D, A, B,  2, 17, 0x242070DB);
+    P(B, C, D, A,  3, 22, 0xC1BDCEEE);
+    P(A, B, C, D,  4,  7, 0xF57C0FAF);
+    P(D, A, B, C,  5, 12, 0x4787C62A);
+    P(C, D, A, B,  6, 17, 0xA8304613);
+    P(B, C, D, A,  7, 22, 0xFD469501);
+    P(A, B, C, D,  8,  7, 0x698098D8);
+    P(D, A, B, C,  9, 12, 0x8B44F7AF);
+    P(C, D, A, B, 10, 17, 0xFFFF5BB1);
+    P(B, C, D, A, 11, 22, 0x895CD7BE);
+    P(A, B, C, D, 12,  7, 0x6B901122);
+    P(D, A, B, C, 13, 12, 0xFD987193);
+    P(C, D, A, B, 14, 17, 0xA679438E);
+    P(B, C, D, A, 15, 22, 0x49B40821);
 
 #undef F
 
 #define F(x,y,z) (y ^ (z & (x ^ y)))
 
-    P( A, B, C, D,  1,  5, 0xF61E2562 );
-    P( D, A, B, C,  6,  9, 0xC040B340 );
-    P( C, D, A, B, 11, 14, 0x265E5A51 );
-    P( B, C, D, A,  0, 20, 0xE9B6C7AA );
-    P( A, B, C, D,  5,  5, 0xD62F105D );
-    P( D, A, B, C, 10,  9, 0x02441453 );
-    P( C, D, A, B, 15, 14, 0xD8A1E681 );
-    P( B, C, D, A,  4, 20, 0xE7D3FBC8 );
-    P( A, B, C, D,  9,  5, 0x21E1CDE6 );
-    P( D, A, B, C, 14,  9, 0xC33707D6 );
-    P( C, D, A, B,  3, 14, 0xF4D50D87 );
-    P( B, C, D, A,  8, 20, 0x455A14ED );
-    P( A, B, C, D, 13,  5, 0xA9E3E905 );
-    P( D, A, B, C,  2,  9, 0xFCEFA3F8 );
-    P( C, D, A, B,  7, 14, 0x676F02D9 );
-    P( B, C, D, A, 12, 20, 0x8D2A4C8A );
+    P(A, B, C, D,  1,  5, 0xF61E2562);
+    P(D, A, B, C,  6,  9, 0xC040B340);
+    P(C, D, A, B, 11, 14, 0x265E5A51);
+    P(B, C, D, A,  0, 20, 0xE9B6C7AA);
+    P(A, B, C, D,  5,  5, 0xD62F105D);
+    P(D, A, B, C, 10,  9, 0x02441453);
+    P(C, D, A, B, 15, 14, 0xD8A1E681);
+    P(B, C, D, A,  4, 20, 0xE7D3FBC8);
+    P(A, B, C, D,  9,  5, 0x21E1CDE6);
+    P(D, A, B, C, 14,  9, 0xC33707D6);
+    P(C, D, A, B,  3, 14, 0xF4D50D87);
+    P(B, C, D, A,  8, 20, 0x455A14ED);
+    P(A, B, C, D, 13,  5, 0xA9E3E905);
+    P(D, A, B, C,  2,  9, 0xFCEFA3F8);
+    P(C, D, A, B,  7, 14, 0x676F02D9);
+    P(B, C, D, A, 12, 20, 0x8D2A4C8A);
 
 #undef F
 
 #define F(x,y,z) (x ^ y ^ z)
 
-    P( A, B, C, D,  5,  4, 0xFFFA3942 );
-    P( D, A, B, C,  8, 11, 0x8771F681 );
-    P( C, D, A, B, 11, 16, 0x6D9D6122 );
-    P( B, C, D, A, 14, 23, 0xFDE5380C );
-    P( A, B, C, D,  1,  4, 0xA4BEEA44 );
-    P( D, A, B, C,  4, 11, 0x4BDECFA9 );
-    P( C, D, A, B,  7, 16, 0xF6BB4B60 );
-    P( B, C, D, A, 10, 23, 0xBEBFBC70 );
-    P( A, B, C, D, 13,  4, 0x289B7EC6 );
-    P( D, A, B, C,  0, 11, 0xEAA127FA );
-    P( C, D, A, B,  3, 16, 0xD4EF3085 );
-    P( B, C, D, A,  6, 23, 0x04881D05 );
-    P( A, B, C, D,  9,  4, 0xD9D4D039 );
-    P( D, A, B, C, 12, 11, 0xE6DB99E5 );
-    P( C, D, A, B, 15, 16, 0x1FA27CF8 );
-    P( B, C, D, A,  2, 23, 0xC4AC5665 );
+    P(A, B, C, D,  5,  4, 0xFFFA3942);
+    P(D, A, B, C,  8, 11, 0x8771F681);
+    P(C, D, A, B, 11, 16, 0x6D9D6122);
+    P(B, C, D, A, 14, 23, 0xFDE5380C);
+    P(A, B, C, D,  1,  4, 0xA4BEEA44);
+    P(D, A, B, C,  4, 11, 0x4BDECFA9);
+    P(C, D, A, B,  7, 16, 0xF6BB4B60);
+    P(B, C, D, A, 10, 23, 0xBEBFBC70);
+    P(A, B, C, D, 13,  4, 0x289B7EC6);
+    P(D, A, B, C,  0, 11, 0xEAA127FA);
+    P(C, D, A, B,  3, 16, 0xD4EF3085);
+    P(B, C, D, A,  6, 23, 0x04881D05);
+    P(A, B, C, D,  9,  4, 0xD9D4D039);
+    P(D, A, B, C, 12, 11, 0xE6DB99E5);
+    P(C, D, A, B, 15, 16, 0x1FA27CF8);
+    P(B, C, D, A,  2, 23, 0xC4AC5665);
 
 #undef F
 
 #define F(x,y,z) (y ^ (x | ~z))
 
-    P( A, B, C, D,  0,  6, 0xF4292244 );
-    P( D, A, B, C,  7, 10, 0x432AFF97 );
-    P( C, D, A, B, 14, 15, 0xAB9423A7 );
-    P( B, C, D, A,  5, 21, 0xFC93A039 );
-    P( A, B, C, D, 12,  6, 0x655B59C3 );
-    P( D, A, B, C,  3, 10, 0x8F0CCC92 );
-    P( C, D, A, B, 10, 15, 0xFFEFF47D );
-    P( B, C, D, A,  1, 21, 0x85845DD1 );
-    P( A, B, C, D,  8,  6, 0x6FA87E4F );
-    P( D, A, B, C, 15, 10, 0xFE2CE6E0 );
-    P( C, D, A, B,  6, 15, 0xA3014314 );
-    P( B, C, D, A, 13, 21, 0x4E0811A1 );
-    P( A, B, C, D,  4,  6, 0xF7537E82 );
-    P( D, A, B, C, 11, 10, 0xBD3AF235 );
-    P( C, D, A, B,  2, 15, 0x2AD7D2BB );
-    P( B, C, D, A,  9, 21, 0xEB86D391 );
+    P(A, B, C, D,  0,  6, 0xF4292244);
+    P(D, A, B, C,  7, 10, 0x432AFF97);
+    P(C, D, A, B, 14, 15, 0xAB9423A7);
+    P(B, C, D, A,  5, 21, 0xFC93A039);
+    P(A, B, C, D, 12,  6, 0x655B59C3);
+    P(D, A, B, C,  3, 10, 0x8F0CCC92);
+    P(C, D, A, B, 10, 15, 0xFFEFF47D);
+    P(B, C, D, A,  1, 21, 0x85845DD1);
+    P(A, B, C, D,  8,  6, 0x6FA87E4F);
+    P(D, A, B, C, 15, 10, 0xFE2CE6E0);
+    P(C, D, A, B,  6, 15, 0xA3014314);
+    P(B, C, D, A, 13, 21, 0x4E0811A1);
+    P(A, B, C, D,  4,  6, 0xF7537E82);
+    P(D, A, B, C, 11, 10, 0xBD3AF235);
+    P(C, D, A, B,  2, 15, 0x2AD7D2BB);
+    P(B, C, D, A,  9, 21, 0xEB86D391);
 
 #undef F
 
@@ -239,14 +239,14 @@ int mbedtls_internal_md5_process( mbedtls_md5_context *ctx,
     ctx->state[2] += C;
     ctx->state[3] += D;
 
-    return( 0 );
+    return (0);
 }
 
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
-void mbedtls_md5_process( mbedtls_md5_context *ctx,
-                          const unsigned char data[64] )
+void mbedtls_md5_process(mbedtls_md5_context *ctx,
+                         const unsigned char data[64])
 {
-    mbedtls_internal_md5_process( ctx, data );
+    mbedtls_internal_md5_process(ctx, data);
 }
 #endif
 #endif /* !MBEDTLS_MD5_PROCESS_ALT */
@@ -254,16 +254,16 @@ void mbedtls_md5_process( mbedtls_md5_context *ctx,
 /*
  * MD5 process buffer
  */
-int mbedtls_md5_update_ret( mbedtls_md5_context *ctx,
-                            const unsigned char *input,
-                            size_t ilen )
+int mbedtls_md5_update_ret(mbedtls_md5_context *ctx,
+                           const unsigned char *input,
+                           size_t ilen)
 {
     int ret;
     size_t fill;
     uint32_t left;
 
-    if( ilen == 0 )
-        return( 0 );
+    if (ilen == 0)
+        return (0);
 
     left = ctx->total[0] & 0x3F;
     fill = 64 - left;
@@ -271,51 +271,48 @@ int mbedtls_md5_update_ret( mbedtls_md5_context *ctx,
     ctx->total[0] += (uint32_t) ilen;
     ctx->total[0] &= 0xFFFFFFFF;
 
-    if( ctx->total[0] < (uint32_t) ilen )
+    if (ctx->total[0] < (uint32_t) ilen)
         ctx->total[1]++;
 
-    if( left && ilen >= fill )
-    {
-        memcpy( (void *) (ctx->buffer + left), input, fill );
-        if( ( ret = mbedtls_internal_md5_process( ctx, ctx->buffer ) ) != 0 )
-            return( ret );
+    if (left && ilen >= fill) {
+        memcpy((void *)(ctx->buffer + left), input, fill);
+        if ((ret = mbedtls_internal_md5_process(ctx, ctx->buffer)) != 0)
+            return (ret);
 
         input += fill;
         ilen  -= fill;
         left = 0;
     }
 
-    while( ilen >= 64 )
-    {
-        if( ( ret = mbedtls_internal_md5_process( ctx, input ) ) != 0 )
-            return( ret );
+    while (ilen >= 64) {
+        if ((ret = mbedtls_internal_md5_process(ctx, input)) != 0)
+            return (ret);
 
         input += 64;
         ilen  -= 64;
     }
 
-    if( ilen > 0 )
-    {
-        memcpy( (void *) (ctx->buffer + left), input, ilen );
+    if (ilen > 0) {
+        memcpy((void *)(ctx->buffer + left), input, ilen);
     }
 
-    return( 0 );
+    return (0);
 }
 
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
-void mbedtls_md5_update( mbedtls_md5_context *ctx,
-                         const unsigned char *input,
-                         size_t ilen )
+void mbedtls_md5_update(mbedtls_md5_context *ctx,
+                        const unsigned char *input,
+                        size_t ilen)
 {
-    mbedtls_md5_update_ret( ctx, input, ilen );
+    mbedtls_md5_update_ret(ctx, input, ilen);
 }
 #endif
 
 /*
  * MD5 final digest
  */
-int mbedtls_md5_finish_ret( mbedtls_md5_context *ctx,
-                            unsigned char output[16] )
+int mbedtls_md5_finish_ret(mbedtls_md5_context *ctx,
+                           unsigned char output[16])
 {
     int ret;
     uint32_t used;
@@ -328,51 +325,48 @@ int mbedtls_md5_finish_ret( mbedtls_md5_context *ctx,
 
     ctx->buffer[used++] = 0x80;
 
-    if( used <= 56 )
-    {
+    if (used <= 56) {
         /* Enough room for padding + length in current block */
-        memset( ctx->buffer + used, 0, 56 - used );
-    }
-    else
-    {
+        memset(ctx->buffer + used, 0, 56 - used);
+    } else {
         /* We'll need an extra block */
-        memset( ctx->buffer + used, 0, 64 - used );
+        memset(ctx->buffer + used, 0, 64 - used);
 
-        if( ( ret = mbedtls_internal_md5_process( ctx, ctx->buffer ) ) != 0 )
-            return( ret );
+        if ((ret = mbedtls_internal_md5_process(ctx, ctx->buffer)) != 0)
+            return (ret);
 
-        memset( ctx->buffer, 0, 56 );
+        memset(ctx->buffer, 0, 56);
     }
 
     /*
      * Add message length
      */
-    high = ( ctx->total[0] >> 29 )
-         | ( ctx->total[1] <<  3 );
-    low  = ( ctx->total[0] <<  3 );
+    high = (ctx->total[0] >> 29)
+           | (ctx->total[1] <<  3);
+    low  = (ctx->total[0] <<  3);
 
-    PUT_UINT32_LE( low,  ctx->buffer, 56 );
-    PUT_UINT32_LE( high, ctx->buffer, 60 );
+    PUT_UINT32_LE(low,  ctx->buffer, 56);
+    PUT_UINT32_LE(high, ctx->buffer, 60);
 
-    if( ( ret = mbedtls_internal_md5_process( ctx, ctx->buffer ) ) != 0 )
-        return( ret );
+    if ((ret = mbedtls_internal_md5_process(ctx, ctx->buffer)) != 0)
+        return (ret);
 
     /*
      * Output final state
      */
-    PUT_UINT32_LE( ctx->state[0], output,  0 );
-    PUT_UINT32_LE( ctx->state[1], output,  4 );
-    PUT_UINT32_LE( ctx->state[2], output,  8 );
-    PUT_UINT32_LE( ctx->state[3], output, 12 );
+    PUT_UINT32_LE(ctx->state[0], output,  0);
+    PUT_UINT32_LE(ctx->state[1], output,  4);
+    PUT_UINT32_LE(ctx->state[2], output,  8);
+    PUT_UINT32_LE(ctx->state[3], output, 12);
 
-    return( 0 );
+    return (0);
 }
 
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
-void mbedtls_md5_finish( mbedtls_md5_context *ctx,
-                         unsigned char output[16] )
+void mbedtls_md5_finish(mbedtls_md5_context *ctx,
+                        unsigned char output[16])
 {
-    mbedtls_md5_finish_ret( ctx, output );
+    mbedtls_md5_finish_ret(ctx, output);
 }
 #endif
 
@@ -381,36 +375,36 @@ void mbedtls_md5_finish( mbedtls_md5_context *ctx,
 /*
  * output = MD5( input buffer )
  */
-int mbedtls_md5_ret( const unsigned char *input,
-                     size_t ilen,
-                     unsigned char output[16] )
+int mbedtls_md5_ret(const unsigned char *input,
+                    size_t ilen,
+                    unsigned char output[16])
 {
     int ret;
     mbedtls_md5_context ctx;
 
-    mbedtls_md5_init( &ctx );
+    mbedtls_md5_init(&ctx);
 
-    if( ( ret = mbedtls_md5_starts_ret( &ctx ) ) != 0 )
+    if ((ret = mbedtls_md5_starts_ret(&ctx)) != 0)
         goto exit;
 
-    if( ( ret = mbedtls_md5_update_ret( &ctx, input, ilen ) ) != 0 )
+    if ((ret = mbedtls_md5_update_ret(&ctx, input, ilen)) != 0)
         goto exit;
 
-    if( ( ret = mbedtls_md5_finish_ret( &ctx, output ) ) != 0 )
+    if ((ret = mbedtls_md5_finish_ret(&ctx, output)) != 0)
         goto exit;
 
 exit:
-    mbedtls_md5_free( &ctx );
+    mbedtls_md5_free(&ctx);
 
-    return( ret );
+    return (ret);
 }
 
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
-void mbedtls_md5( const unsigned char *input,
-                  size_t ilen,
-                  unsigned char output[16] )
+void mbedtls_md5(const unsigned char *input,
+                 size_t ilen,
+                 unsigned char output[16])
 {
-    mbedtls_md5_ret( input, ilen, output );
+    mbedtls_md5_ret(input, ilen, output);
 }
 #endif
 
@@ -418,78 +412,89 @@ void mbedtls_md5( const unsigned char *input,
 /*
  * RFC 1321 test vectors
  */
-static const unsigned char md5_test_buf[7][81] =
-{
+static const unsigned char md5_test_buf[7][81] = {
     { "" },
     { "a" },
     { "abc" },
     { "message digest" },
     { "abcdefghijklmnopqrstuvwxyz" },
     { "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789" },
-    { "12345678901234567890123456789012345678901234567890123456789012"
-      "345678901234567890" }
+    {
+        "12345678901234567890123456789012345678901234567890123456789012"
+        "345678901234567890"
+    }
 };
 
-static const size_t md5_test_buflen[7] =
-{
+static const size_t md5_test_buflen[7] = {
     0, 1, 3, 14, 26, 62, 80
 };
 
-static const unsigned char md5_test_sum[7][16] =
-{
-    { 0xD4, 0x1D, 0x8C, 0xD9, 0x8F, 0x00, 0xB2, 0x04,
-      0xE9, 0x80, 0x09, 0x98, 0xEC, 0xF8, 0x42, 0x7E },
-    { 0x0C, 0xC1, 0x75, 0xB9, 0xC0, 0xF1, 0xB6, 0xA8,
-      0x31, 0xC3, 0x99, 0xE2, 0x69, 0x77, 0x26, 0x61 },
-    { 0x90, 0x01, 0x50, 0x98, 0x3C, 0xD2, 0x4F, 0xB0,
-      0xD6, 0x96, 0x3F, 0x7D, 0x28, 0xE1, 0x7F, 0x72 },
-    { 0xF9, 0x6B, 0x69, 0x7D, 0x7C, 0xB7, 0x93, 0x8D,
-      0x52, 0x5A, 0x2F, 0x31, 0xAA, 0xF1, 0x61, 0xD0 },
-    { 0xC3, 0xFC, 0xD3, 0xD7, 0x61, 0x92, 0xE4, 0x00,
-      0x7D, 0xFB, 0x49, 0x6C, 0xCA, 0x67, 0xE1, 0x3B },
-    { 0xD1, 0x74, 0xAB, 0x98, 0xD2, 0x77, 0xD9, 0xF5,
-      0xA5, 0x61, 0x1C, 0x2C, 0x9F, 0x41, 0x9D, 0x9F },
-    { 0x57, 0xED, 0xF4, 0xA2, 0x2B, 0xE3, 0xC9, 0x55,
-      0xAC, 0x49, 0xDA, 0x2E, 0x21, 0x07, 0xB6, 0x7A }
+static const unsigned char md5_test_sum[7][16] = {
+    {
+        0xD4, 0x1D, 0x8C, 0xD9, 0x8F, 0x00, 0xB2, 0x04,
+        0xE9, 0x80, 0x09, 0x98, 0xEC, 0xF8, 0x42, 0x7E
+    },
+    {
+        0x0C, 0xC1, 0x75, 0xB9, 0xC0, 0xF1, 0xB6, 0xA8,
+        0x31, 0xC3, 0x99, 0xE2, 0x69, 0x77, 0x26, 0x61
+    },
+    {
+        0x90, 0x01, 0x50, 0x98, 0x3C, 0xD2, 0x4F, 0xB0,
+        0xD6, 0x96, 0x3F, 0x7D, 0x28, 0xE1, 0x7F, 0x72
+    },
+    {
+        0xF9, 0x6B, 0x69, 0x7D, 0x7C, 0xB7, 0x93, 0x8D,
+        0x52, 0x5A, 0x2F, 0x31, 0xAA, 0xF1, 0x61, 0xD0
+    },
+    {
+        0xC3, 0xFC, 0xD3, 0xD7, 0x61, 0x92, 0xE4, 0x00,
+        0x7D, 0xFB, 0x49, 0x6C, 0xCA, 0x67, 0xE1, 0x3B
+    },
+    {
+        0xD1, 0x74, 0xAB, 0x98, 0xD2, 0x77, 0xD9, 0xF5,
+        0xA5, 0x61, 0x1C, 0x2C, 0x9F, 0x41, 0x9D, 0x9F
+    },
+    {
+        0x57, 0xED, 0xF4, 0xA2, 0x2B, 0xE3, 0xC9, 0x55,
+        0xAC, 0x49, 0xDA, 0x2E, 0x21, 0x07, 0xB6, 0x7A
+    }
 };
 
 /*
  * Checkup routine
  */
-int mbedtls_md5_self_test( int verbose )
+int mbedtls_md5_self_test(int verbose)
 {
     int i, ret = 0;
     unsigned char md5sum[16];
 
-    for( i = 0; i < 7; i++ )
-    {
-        if( verbose != 0 )
-            mbedtls_printf( "  MD5 test #%d: ", i + 1 );
+    for (i = 0; i < 7; i++) {
+        if (verbose != 0)
+            mbedtls_printf("  MD5 test #%d: ", i + 1);
 
-        ret = mbedtls_md5_ret( md5_test_buf[i], md5_test_buflen[i], md5sum );
-        if( ret != 0 )
+        ret = mbedtls_md5_ret(md5_test_buf[i], md5_test_buflen[i], md5sum);
+        if (ret != 0)
             goto fail;
 
-        if( memcmp( md5sum, md5_test_sum[i], 16 ) != 0 )
-        {
+        if (memcmp(md5sum, md5_test_sum[i], 16) != 0) {
             ret = 1;
             goto fail;
         }
 
-        if( verbose != 0 )
-            mbedtls_printf( "passed\n" );
+        if (verbose != 0)
+            mbedtls_printf("passed\n");
     }
 
-    if( verbose != 0 )
-        mbedtls_printf( "\n" );
+    if (verbose != 0)
+        mbedtls_printf("\n");
 
-    return( 0 );
+    return (0);
 
 fail:
-    if( verbose != 0 )
-        mbedtls_printf( "failed\n" );
+    if (verbose != 0)
+        mbedtls_printf("failed\n");
 
-    return( ret );
+    return (ret);
 }
 
 #endif /* MBEDTLS_SELF_TEST */
diff --git a/common/mbedtls/md5.h b/common/mbedtls/md5.h
index d3af51fb0..1e12fc3cb 100644
--- a/common/mbedtls/md5.h
+++ b/common/mbedtls/md5.h
@@ -57,8 +57,7 @@ extern "C" {
  *                 stronger message digests instead.
  *
  */
-typedef struct mbedtls_md5_context
-{
+typedef struct mbedtls_md5_context {
     uint32_t total[2];          /*!< number of bytes processed  */
     uint32_t state[4];          /*!< intermediate digest state  */
     unsigned char buffer[64];   /*!< data block being processed */
@@ -79,7 +78,7 @@ mbedtls_md5_context;
  *                 stronger message digests instead.
  *
  */
-void mbedtls_md5_init( mbedtls_md5_context *ctx );
+void mbedtls_md5_init(mbedtls_md5_context *ctx);
 
 /**
  * \brief          Clear MD5 context
@@ -91,7 +90,7 @@ void mbedtls_md5_init( mbedtls_md5_context *ctx );
  *                 stronger message digests instead.
  *
  */
-void mbedtls_md5_free( mbedtls_md5_context *ctx );
+void mbedtls_md5_free(mbedtls_md5_context *ctx);
 
 /**
  * \brief          Clone (the state of) an MD5 context
@@ -104,8 +103,8 @@ void mbedtls_md5_free( mbedtls_md5_context *ctx );
  *                 stronger message digests instead.
  *
  */
-void mbedtls_md5_clone( mbedtls_md5_context *dst,
-                        const mbedtls_md5_context *src );
+void mbedtls_md5_clone(mbedtls_md5_context *dst,
+                       const mbedtls_md5_context *src);
 
 /**
  * \brief          MD5 context setup
@@ -119,7 +118,7 @@ void mbedtls_md5_clone( mbedtls_md5_context *dst,
  *                 stronger message digests instead.
  *
  */
-int mbedtls_md5_starts_ret( mbedtls_md5_context *ctx );
+int mbedtls_md5_starts_ret(mbedtls_md5_context *ctx);
 
 /**
  * \brief          MD5 process buffer
@@ -135,9 +134,9 @@ int mbedtls_md5_starts_ret( mbedtls_md5_context *ctx );
  *                 stronger message digests instead.
  *
  */
-int mbedtls_md5_update_ret( mbedtls_md5_context *ctx,
-                            const unsigned char *input,
-                            size_t ilen );
+int mbedtls_md5_update_ret(mbedtls_md5_context *ctx,
+                           const unsigned char *input,
+                           size_t ilen);
 
 /**
  * \brief          MD5 final digest
@@ -152,8 +151,8 @@ int mbedtls_md5_update_ret( mbedtls_md5_context *ctx,
  *                 stronger message digests instead.
  *
  */
-int mbedtls_md5_finish_ret( mbedtls_md5_context *ctx,
-                            unsigned char output[16] );
+int mbedtls_md5_finish_ret(mbedtls_md5_context *ctx,
+                           unsigned char output[16]);
 
 /**
  * \brief          MD5 process data block (internal use only)
@@ -168,8 +167,8 @@ int mbedtls_md5_finish_ret( mbedtls_md5_context *ctx,
  *                 stronger message digests instead.
  *
  */
-int mbedtls_internal_md5_process( mbedtls_md5_context *ctx,
-                                  const unsigned char data[64] );
+int mbedtls_internal_md5_process(mbedtls_md5_context *ctx,
+                                 const unsigned char data[64]);
 
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
 #if defined(MBEDTLS_DEPRECATED_WARNING)
@@ -189,7 +188,7 @@ int mbedtls_internal_md5_process( mbedtls_md5_context *ctx,
  *                 stronger message digests instead.
  *
  */
-MBEDTLS_DEPRECATED void mbedtls_md5_starts( mbedtls_md5_context *ctx );
+MBEDTLS_DEPRECATED void mbedtls_md5_starts(mbedtls_md5_context *ctx);
 
 /**
  * \brief          MD5 process buffer
@@ -205,9 +204,9 @@ MBEDTLS_DEPRECATED void mbedtls_md5_starts( mbedtls_md5_context *ctx );
  *                 stronger message digests instead.
  *
  */
-MBEDTLS_DEPRECATED void mbedtls_md5_update( mbedtls_md5_context *ctx,
-                                            const unsigned char *input,
-                                            size_t ilen );
+MBEDTLS_DEPRECATED void mbedtls_md5_update(mbedtls_md5_context *ctx,
+                                           const unsigned char *input,
+                                           size_t ilen);
 
 /**
  * \brief          MD5 final digest
@@ -222,8 +221,8 @@ MBEDTLS_DEPRECATED void mbedtls_md5_update( mbedtls_md5_context *ctx,
  *                 stronger message digests instead.
  *
  */
-MBEDTLS_DEPRECATED void mbedtls_md5_finish( mbedtls_md5_context *ctx,
-                                            unsigned char output[16] );
+MBEDTLS_DEPRECATED void mbedtls_md5_finish(mbedtls_md5_context *ctx,
+                                           unsigned char output[16]);
 
 /**
  * \brief          MD5 process data block (internal use only)
@@ -238,8 +237,8 @@ MBEDTLS_DEPRECATED void mbedtls_md5_finish( mbedtls_md5_context *ctx,
  *                 stronger message digests instead.
  *
  */
-MBEDTLS_DEPRECATED void mbedtls_md5_process( mbedtls_md5_context *ctx,
-                                             const unsigned char data[64] );
+MBEDTLS_DEPRECATED void mbedtls_md5_process(mbedtls_md5_context *ctx,
+                                            const unsigned char data[64]);
 
 #undef MBEDTLS_DEPRECATED
 #endif /* !MBEDTLS_DEPRECATED_REMOVED */
@@ -258,9 +257,9 @@ MBEDTLS_DEPRECATED void mbedtls_md5_process( mbedtls_md5_context *ctx,
  *                 stronger message digests instead.
  *
  */
-int mbedtls_md5_ret( const unsigned char *input,
-                     size_t ilen,
-                     unsigned char output[16] );
+int mbedtls_md5_ret(const unsigned char *input,
+                    size_t ilen,
+                    unsigned char output[16]);
 
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
 #if defined(MBEDTLS_DEPRECATED_WARNING)
@@ -282,9 +281,9 @@ int mbedtls_md5_ret( const unsigned char *input,
  *                 stronger message digests instead.
  *
  */
-MBEDTLS_DEPRECATED void mbedtls_md5( const unsigned char *input,
-                                     size_t ilen,
-                                     unsigned char output[16] );
+MBEDTLS_DEPRECATED void mbedtls_md5(const unsigned char *input,
+                                    size_t ilen,
+                                    unsigned char output[16]);
 
 #undef MBEDTLS_DEPRECATED
 #endif /* !MBEDTLS_DEPRECATED_REMOVED */
@@ -299,7 +298,7 @@ MBEDTLS_DEPRECATED void mbedtls_md5( const unsigned char *input,
  *                 stronger message digests instead.
  *
  */
-int mbedtls_md5_self_test( int verbose );
+int mbedtls_md5_self_test(int verbose);
 
 #ifdef __cplusplus
 }
diff --git a/common/mbedtls/md_internal.h b/common/mbedtls/md_internal.h
index b917cf34d..c30a0067c 100644
--- a/common/mbedtls/md_internal.h
+++ b/common/mbedtls/md_internal.h
@@ -46,13 +46,12 @@ extern "C" {
  * Message digest information.
  * Allows message digest functions to be called in a generic way.
  */
-struct mbedtls_md_info_t
-{
+struct mbedtls_md_info_t {
     /** Digest identifier */
     mbedtls_md_type_t type;
 
     /** Name of the message digest */
-    const char * name;
+    const char *name;
 
     /** Output length of the digest function in bytes */
     int size;
@@ -61,29 +60,29 @@ struct mbedtls_md_info_t
     int block_size;
 
     /** Digest initialisation function */
-    int (*starts_func)( void *ctx );
+    int (*starts_func)(void *ctx);
 
     /** Digest update function */
-    int (*update_func)( void *ctx, const unsigned char *input, size_t ilen );
+    int (*update_func)(void *ctx, const unsigned char *input, size_t ilen);
 
     /** Digest finalisation function */
-    int (*finish_func)( void *ctx, unsigned char *output );
+    int (*finish_func)(void *ctx, unsigned char *output);
 
     /** Generic digest function */
-    int (*digest_func)( const unsigned char *input, size_t ilen,
-                        unsigned char *output );
+    int (*digest_func)(const unsigned char *input, size_t ilen,
+                       unsigned char *output);
 
     /** Allocate a new context */
-    void * (*ctx_alloc_func)( void );
+    void *(*ctx_alloc_func)(void);
 
     /** Free the given context */
-    void (*ctx_free_func)( void *ctx );
+    void (*ctx_free_func)(void *ctx);
 
     /** Clone state from a context */
-    void (*clone_func)( void *dst, const void *src );
+    void (*clone_func)(void *dst, const void *src);
 
     /** Internal use only */
-    int (*process_func)( void *ctx, const unsigned char *input );
+    int (*process_func)(void *ctx, const unsigned char *input);
 };
 
 #if defined(MBEDTLS_MD2_C)
diff --git a/common/mbedtls/md_wrap.c b/common/mbedtls/md_wrap.c
index 97067b042..0288d3c01 100644
--- a/common/mbedtls/md_wrap.c
+++ b/common/mbedtls/md_wrap.c
@@ -73,49 +73,49 @@
 
 #if defined(MBEDTLS_MD2_C)
 
-static int md2_starts_wrap( void *ctx )
+static int md2_starts_wrap(void *ctx)
 {
-    return( mbedtls_md2_starts_ret( (mbedtls_md2_context *) ctx ) );
+    return (mbedtls_md2_starts_ret((mbedtls_md2_context *) ctx));
 }
 
-static int md2_update_wrap( void *ctx, const unsigned char *input,
-                             size_t ilen )
+static int md2_update_wrap(void *ctx, const unsigned char *input,
+                           size_t ilen)
 {
-    return( mbedtls_md2_update_ret( (mbedtls_md2_context *) ctx, input, ilen ) );
+    return (mbedtls_md2_update_ret((mbedtls_md2_context *) ctx, input, ilen));
 }
 
-static int md2_finish_wrap( void *ctx, unsigned char *output )
+static int md2_finish_wrap(void *ctx, unsigned char *output)
 {
-    return( mbedtls_md2_finish_ret( (mbedtls_md2_context *) ctx, output ) );
+    return (mbedtls_md2_finish_ret((mbedtls_md2_context *) ctx, output));
 }
 
-static void *md2_ctx_alloc( void )
+static void *md2_ctx_alloc(void)
 {
-    void *ctx = mbedtls_calloc( 1, sizeof( mbedtls_md2_context ) );
+    void *ctx = mbedtls_calloc(1, sizeof(mbedtls_md2_context));
 
-    if( ctx != NULL )
-        mbedtls_md2_init( (mbedtls_md2_context *) ctx );
+    if (ctx != NULL)
+        mbedtls_md2_init((mbedtls_md2_context *) ctx);
 
-    return( ctx );
+    return (ctx);
 }
 
-static void md2_ctx_free( void *ctx )
+static void md2_ctx_free(void *ctx)
 {
-    mbedtls_md2_free( (mbedtls_md2_context *) ctx );
-    mbedtls_free( ctx );
+    mbedtls_md2_free((mbedtls_md2_context *) ctx);
+    mbedtls_free(ctx);
 }
 
-static void md2_clone_wrap( void *dst, const void *src )
+static void md2_clone_wrap(void *dst, const void *src)
 {
-    mbedtls_md2_clone( (mbedtls_md2_context *) dst,
-                 (const mbedtls_md2_context *) src );
+    mbedtls_md2_clone((mbedtls_md2_context *) dst,
+                      (const mbedtls_md2_context *) src);
 }
 
-static int md2_process_wrap( void *ctx, const unsigned char *data )
+static int md2_process_wrap(void *ctx, const unsigned char *data)
 {
     ((void) data);
 
-    return( mbedtls_internal_md2_process( (mbedtls_md2_context *) ctx ) );
+    return (mbedtls_internal_md2_process((mbedtls_md2_context *) ctx));
 }
 
 const mbedtls_md_info_t mbedtls_md2_info = {
@@ -137,47 +137,47 @@ const mbedtls_md_info_t mbedtls_md2_info = {
 
 #if defined(MBEDTLS_MD4_C)
 
-static int md4_starts_wrap( void *ctx )
+static int md4_starts_wrap(void *ctx)
 {
-    return( mbedtls_md4_starts_ret( (mbedtls_md4_context *) ctx ) );
+    return (mbedtls_md4_starts_ret((mbedtls_md4_context *) ctx));
 }
 
-static int md4_update_wrap( void *ctx, const unsigned char *input,
-                             size_t ilen )
+static int md4_update_wrap(void *ctx, const unsigned char *input,
+                           size_t ilen)
 {
-    return( mbedtls_md4_update_ret( (mbedtls_md4_context *) ctx, input, ilen ) );
+    return (mbedtls_md4_update_ret((mbedtls_md4_context *) ctx, input, ilen));
 }
 
-static int md4_finish_wrap( void *ctx, unsigned char *output )
+static int md4_finish_wrap(void *ctx, unsigned char *output)
 {
-    return( mbedtls_md4_finish_ret( (mbedtls_md4_context *) ctx, output ) );
+    return (mbedtls_md4_finish_ret((mbedtls_md4_context *) ctx, output));
 }
 
-static void *md4_ctx_alloc( void )
+static void *md4_ctx_alloc(void)
 {
-    void *ctx = mbedtls_calloc( 1, sizeof( mbedtls_md4_context ) );
+    void *ctx = mbedtls_calloc(1, sizeof(mbedtls_md4_context));
 
-    if( ctx != NULL )
-        mbedtls_md4_init( (mbedtls_md4_context *) ctx );
+    if (ctx != NULL)
+        mbedtls_md4_init((mbedtls_md4_context *) ctx);
 
-    return( ctx );
+    return (ctx);
 }
 
-static void md4_ctx_free( void *ctx )
+static void md4_ctx_free(void *ctx)
 {
-    mbedtls_md4_free( (mbedtls_md4_context *) ctx );
-    mbedtls_free( ctx );
+    mbedtls_md4_free((mbedtls_md4_context *) ctx);
+    mbedtls_free(ctx);
 }
 
-static void md4_clone_wrap( void *dst, const void *src )
+static void md4_clone_wrap(void *dst, const void *src)
 {
-    mbedtls_md4_clone( (mbedtls_md4_context *) dst,
-                       (const mbedtls_md4_context *) src );
+    mbedtls_md4_clone((mbedtls_md4_context *) dst,
+                      (const mbedtls_md4_context *) src);
 }
 
-static int md4_process_wrap( void *ctx, const unsigned char *data )
+static int md4_process_wrap(void *ctx, const unsigned char *data)
 {
-    return( mbedtls_internal_md4_process( (mbedtls_md4_context *) ctx, data ) );
+    return (mbedtls_internal_md4_process((mbedtls_md4_context *) ctx, data));
 }
 
 const mbedtls_md_info_t mbedtls_md4_info = {
@@ -199,47 +199,47 @@ const mbedtls_md_info_t mbedtls_md4_info = {
 
 #if defined(MBEDTLS_MD5_C)
 
-static int md5_starts_wrap( void *ctx )
+static int md5_starts_wrap(void *ctx)
 {
-    return( mbedtls_md5_starts_ret( (mbedtls_md5_context *) ctx ) );
+    return (mbedtls_md5_starts_ret((mbedtls_md5_context *) ctx));
 }
 
-static int md5_update_wrap( void *ctx, const unsigned char *input,
-                             size_t ilen )
+static int md5_update_wrap(void *ctx, const unsigned char *input,
+                           size_t ilen)
 {
-    return( mbedtls_md5_update_ret( (mbedtls_md5_context *) ctx, input, ilen ) );
+    return (mbedtls_md5_update_ret((mbedtls_md5_context *) ctx, input, ilen));
 }
 
-static int md5_finish_wrap( void *ctx, unsigned char *output )
+static int md5_finish_wrap(void *ctx, unsigned char *output)
 {
-    return( mbedtls_md5_finish_ret( (mbedtls_md5_context *) ctx, output ) );
+    return (mbedtls_md5_finish_ret((mbedtls_md5_context *) ctx, output));
 }
 
-static void *md5_ctx_alloc( void )
+static void *md5_ctx_alloc(void)
 {
-    void *ctx = mbedtls_calloc( 1, sizeof( mbedtls_md5_context ) );
+    void *ctx = mbedtls_calloc(1, sizeof(mbedtls_md5_context));
 
-    if( ctx != NULL )
-        mbedtls_md5_init( (mbedtls_md5_context *) ctx );
+    if (ctx != NULL)
+        mbedtls_md5_init((mbedtls_md5_context *) ctx);
 
-    return( ctx );
+    return (ctx);
 }
 
-static void md5_ctx_free( void *ctx )
+static void md5_ctx_free(void *ctx)
 {
-    mbedtls_md5_free( (mbedtls_md5_context *) ctx );
-    mbedtls_free( ctx );
+    mbedtls_md5_free((mbedtls_md5_context *) ctx);
+    mbedtls_free(ctx);
 }
 
-static void md5_clone_wrap( void *dst, const void *src )
+static void md5_clone_wrap(void *dst, const void *src)
 {
-    mbedtls_md5_clone( (mbedtls_md5_context *) dst,
-                       (const mbedtls_md5_context *) src );
+    mbedtls_md5_clone((mbedtls_md5_context *) dst,
+                      (const mbedtls_md5_context *) src);
 }
 
-static int md5_process_wrap( void *ctx, const unsigned char *data )
+static int md5_process_wrap(void *ctx, const unsigned char *data)
 {
-    return( mbedtls_internal_md5_process( (mbedtls_md5_context *) ctx, data ) );
+    return (mbedtls_internal_md5_process((mbedtls_md5_context *) ctx, data));
 }
 
 const mbedtls_md_info_t mbedtls_md5_info = {
@@ -261,50 +261,50 @@ const mbedtls_md_info_t mbedtls_md5_info = {
 
 #if defined(MBEDTLS_RIPEMD160_C)
 
-static int ripemd160_starts_wrap( void *ctx )
+static int ripemd160_starts_wrap(void *ctx)
 {
-    return( mbedtls_ripemd160_starts_ret( (mbedtls_ripemd160_context *) ctx ) );
+    return (mbedtls_ripemd160_starts_ret((mbedtls_ripemd160_context *) ctx));
 }
 
-static int ripemd160_update_wrap( void *ctx, const unsigned char *input,
-                                   size_t ilen )
+static int ripemd160_update_wrap(void *ctx, const unsigned char *input,
+                                 size_t ilen)
 {
-    return( mbedtls_ripemd160_update_ret( (mbedtls_ripemd160_context *) ctx,
-                                          input, ilen ) );
+    return (mbedtls_ripemd160_update_ret((mbedtls_ripemd160_context *) ctx,
+                                         input, ilen));
 }
 
-static int ripemd160_finish_wrap( void *ctx, unsigned char *output )
+static int ripemd160_finish_wrap(void *ctx, unsigned char *output)
 {
-    return( mbedtls_ripemd160_finish_ret( (mbedtls_ripemd160_context *) ctx,
-                                          output ) );
+    return (mbedtls_ripemd160_finish_ret((mbedtls_ripemd160_context *) ctx,
+                                         output));
 }
 
-static void *ripemd160_ctx_alloc( void )
+static void *ripemd160_ctx_alloc(void)
 {
-    void *ctx = mbedtls_calloc( 1, sizeof( mbedtls_ripemd160_context ) );
+    void *ctx = mbedtls_calloc(1, sizeof(mbedtls_ripemd160_context));
 
-    if( ctx != NULL )
-        mbedtls_ripemd160_init( (mbedtls_ripemd160_context *) ctx );
+    if (ctx != NULL)
+        mbedtls_ripemd160_init((mbedtls_ripemd160_context *) ctx);
 
-    return( ctx );
+    return (ctx);
 }
 
-static void ripemd160_ctx_free( void *ctx )
+static void ripemd160_ctx_free(void *ctx)
 {
-    mbedtls_ripemd160_free( (mbedtls_ripemd160_context *) ctx );
-    mbedtls_free( ctx );
+    mbedtls_ripemd160_free((mbedtls_ripemd160_context *) ctx);
+    mbedtls_free(ctx);
 }
 
-static void ripemd160_clone_wrap( void *dst, const void *src )
+static void ripemd160_clone_wrap(void *dst, const void *src)
 {
-    mbedtls_ripemd160_clone( (mbedtls_ripemd160_context *) dst,
-                       (const mbedtls_ripemd160_context *) src );
+    mbedtls_ripemd160_clone((mbedtls_ripemd160_context *) dst,
+                            (const mbedtls_ripemd160_context *) src);
 }
 
-static int ripemd160_process_wrap( void *ctx, const unsigned char *data )
+static int ripemd160_process_wrap(void *ctx, const unsigned char *data)
 {
-    return( mbedtls_internal_ripemd160_process(
-                                (mbedtls_ripemd160_context *) ctx, data ) );
+    return (mbedtls_internal_ripemd160_process(
+                (mbedtls_ripemd160_context *) ctx, data));
 }
 
 const mbedtls_md_info_t mbedtls_ripemd160_info = {
@@ -326,49 +326,49 @@ const mbedtls_md_info_t mbedtls_ripemd160_info = {
 
 #if defined(MBEDTLS_SHA1_C)
 
-static int sha1_starts_wrap( void *ctx )
+static int sha1_starts_wrap(void *ctx)
 {
-    return( mbedtls_sha1_starts_ret( (mbedtls_sha1_context *) ctx ) );
+    return (mbedtls_sha1_starts_ret((mbedtls_sha1_context *) ctx));
 }
 
-static int sha1_update_wrap( void *ctx, const unsigned char *input,
-                              size_t ilen )
+static int sha1_update_wrap(void *ctx, const unsigned char *input,
+                            size_t ilen)
 {
-    return( mbedtls_sha1_update_ret( (mbedtls_sha1_context *) ctx,
-                                     input, ilen ) );
+    return (mbedtls_sha1_update_ret((mbedtls_sha1_context *) ctx,
+                                    input, ilen));
 }
 
-static int sha1_finish_wrap( void *ctx, unsigned char *output )
+static int sha1_finish_wrap(void *ctx, unsigned char *output)
 {
-    return( mbedtls_sha1_finish_ret( (mbedtls_sha1_context *) ctx, output ) );
+    return (mbedtls_sha1_finish_ret((mbedtls_sha1_context *) ctx, output));
 }
 
-static void *sha1_ctx_alloc( void )
+static void *sha1_ctx_alloc(void)
 {
-    void *ctx = mbedtls_calloc( 1, sizeof( mbedtls_sha1_context ) );
+    void *ctx = mbedtls_calloc(1, sizeof(mbedtls_sha1_context));
 
-    if( ctx != NULL )
-        mbedtls_sha1_init( (mbedtls_sha1_context *) ctx );
+    if (ctx != NULL)
+        mbedtls_sha1_init((mbedtls_sha1_context *) ctx);
 
-    return( ctx );
+    return (ctx);
 }
 
-static void sha1_clone_wrap( void *dst, const void *src )
+static void sha1_clone_wrap(void *dst, const void *src)
 {
-    mbedtls_sha1_clone( (mbedtls_sha1_context *) dst,
-                  (const mbedtls_sha1_context *) src );
+    mbedtls_sha1_clone((mbedtls_sha1_context *) dst,
+                       (const mbedtls_sha1_context *) src);
 }
 
-static void sha1_ctx_free( void *ctx )
+static void sha1_ctx_free(void *ctx)
 {
-    mbedtls_sha1_free( (mbedtls_sha1_context *) ctx );
-    mbedtls_free( ctx );
+    mbedtls_sha1_free((mbedtls_sha1_context *) ctx);
+    mbedtls_free(ctx);
 }
 
-static int sha1_process_wrap( void *ctx, const unsigned char *data )
+static int sha1_process_wrap(void *ctx, const unsigned char *data)
 {
-    return( mbedtls_internal_sha1_process( (mbedtls_sha1_context *) ctx,
-                                           data ) );
+    return (mbedtls_internal_sha1_process((mbedtls_sha1_context *) ctx,
+                                          data));
 }
 
 const mbedtls_md_info_t mbedtls_sha1_info = {
@@ -393,56 +393,56 @@ const mbedtls_md_info_t mbedtls_sha1_info = {
  */
 #if defined(MBEDTLS_SHA256_C)
 
-static int sha224_starts_wrap( void *ctx )
+static int sha224_starts_wrap(void *ctx)
 {
-    return( mbedtls_sha256_starts_ret( (mbedtls_sha256_context *) ctx, 1 ) );
+    return (mbedtls_sha256_starts_ret((mbedtls_sha256_context *) ctx, 1));
 }
 
-static int sha224_update_wrap( void *ctx, const unsigned char *input,
-                                size_t ilen )
+static int sha224_update_wrap(void *ctx, const unsigned char *input,
+                              size_t ilen)
 {
-    return( mbedtls_sha256_update_ret( (mbedtls_sha256_context *) ctx,
-                                       input, ilen ) );
+    return (mbedtls_sha256_update_ret((mbedtls_sha256_context *) ctx,
+                                      input, ilen));
 }
 
-static int sha224_finish_wrap( void *ctx, unsigned char *output )
+static int sha224_finish_wrap(void *ctx, unsigned char *output)
 {
-    return( mbedtls_sha256_finish_ret( (mbedtls_sha256_context *) ctx,
-                                       output ) );
+    return (mbedtls_sha256_finish_ret((mbedtls_sha256_context *) ctx,
+                                      output));
 }
 
-static int sha224_wrap( const unsigned char *input, size_t ilen,
-                        unsigned char *output )
+static int sha224_wrap(const unsigned char *input, size_t ilen,
+                       unsigned char *output)
 {
-    return( mbedtls_sha256_ret( input, ilen, output, 1 ) );
+    return (mbedtls_sha256_ret(input, ilen, output, 1));
 }
 
-static void *sha224_ctx_alloc( void )
+static void *sha224_ctx_alloc(void)
 {
-    void *ctx = mbedtls_calloc( 1, sizeof( mbedtls_sha256_context ) );
+    void *ctx = mbedtls_calloc(1, sizeof(mbedtls_sha256_context));
 
-    if( ctx != NULL )
-        mbedtls_sha256_init( (mbedtls_sha256_context *) ctx );
+    if (ctx != NULL)
+        mbedtls_sha256_init((mbedtls_sha256_context *) ctx);
 
-    return( ctx );
+    return (ctx);
 }
 
-static void sha224_ctx_free( void *ctx )
+static void sha224_ctx_free(void *ctx)
 {
-    mbedtls_sha256_free( (mbedtls_sha256_context *) ctx );
-    mbedtls_free( ctx );
+    mbedtls_sha256_free((mbedtls_sha256_context *) ctx);
+    mbedtls_free(ctx);
 }
 
-static void sha224_clone_wrap( void *dst, const void *src )
+static void sha224_clone_wrap(void *dst, const void *src)
 {
-    mbedtls_sha256_clone( (mbedtls_sha256_context *) dst,
-                    (const mbedtls_sha256_context *) src );
+    mbedtls_sha256_clone((mbedtls_sha256_context *) dst,
+                         (const mbedtls_sha256_context *) src);
 }
 
-static int sha224_process_wrap( void *ctx, const unsigned char *data )
+static int sha224_process_wrap(void *ctx, const unsigned char *data)
 {
-    return( mbedtls_internal_sha256_process( (mbedtls_sha256_context *) ctx,
-                                             data ) );
+    return (mbedtls_internal_sha256_process((mbedtls_sha256_context *) ctx,
+                                            data));
 }
 
 const mbedtls_md_info_t mbedtls_sha224_info = {
@@ -460,15 +460,15 @@ const mbedtls_md_info_t mbedtls_sha224_info = {
     sha224_process_wrap,
 };
 
-static int sha256_starts_wrap( void *ctx )
+static int sha256_starts_wrap(void *ctx)
 {
-    return( mbedtls_sha256_starts_ret( (mbedtls_sha256_context *) ctx, 0 ) );
+    return (mbedtls_sha256_starts_ret((mbedtls_sha256_context *) ctx, 0));
 }
 
-static int sha256_wrap( const unsigned char *input, size_t ilen,
-                        unsigned char *output )
+static int sha256_wrap(const unsigned char *input, size_t ilen,
+                       unsigned char *output)
 {
-    return( mbedtls_sha256_ret( input, ilen, output, 0 ) );
+    return (mbedtls_sha256_ret(input, ilen, output, 0));
 }
 
 const mbedtls_md_info_t mbedtls_sha256_info = {
@@ -490,56 +490,56 @@ const mbedtls_md_info_t mbedtls_sha256_info = {
 
 #if defined(MBEDTLS_SHA512_C)
 
-static int sha384_starts_wrap( void *ctx )
+static int sha384_starts_wrap(void *ctx)
 {
-    return( mbedtls_sha512_starts_ret( (mbedtls_sha512_context *) ctx, 1 ) );
+    return (mbedtls_sha512_starts_ret((mbedtls_sha512_context *) ctx, 1));
 }
 
-static int sha384_update_wrap( void *ctx, const unsigned char *input,
-                               size_t ilen )
+static int sha384_update_wrap(void *ctx, const unsigned char *input,
+                              size_t ilen)
 {
-    return( mbedtls_sha512_update_ret( (mbedtls_sha512_context *) ctx,
-                                       input, ilen ) );
+    return (mbedtls_sha512_update_ret((mbedtls_sha512_context *) ctx,
+                                      input, ilen));
 }
 
-static int sha384_finish_wrap( void *ctx, unsigned char *output )
+static int sha384_finish_wrap(void *ctx, unsigned char *output)
 {
-    return( mbedtls_sha512_finish_ret( (mbedtls_sha512_context *) ctx,
-                                       output ) );
+    return (mbedtls_sha512_finish_ret((mbedtls_sha512_context *) ctx,
+                                      output));
 }
 
-static int sha384_wrap( const unsigned char *input, size_t ilen,
-                        unsigned char *output )
+static int sha384_wrap(const unsigned char *input, size_t ilen,
+                       unsigned char *output)
 {
-    return( mbedtls_sha512_ret( input, ilen, output, 1 ) );
+    return (mbedtls_sha512_ret(input, ilen, output, 1));
 }
 
-static void *sha384_ctx_alloc( void )
+static void *sha384_ctx_alloc(void)
 {
-    void *ctx = mbedtls_calloc( 1, sizeof( mbedtls_sha512_context ) );
+    void *ctx = mbedtls_calloc(1, sizeof(mbedtls_sha512_context));
 
-    if( ctx != NULL )
-        mbedtls_sha512_init( (mbedtls_sha512_context *) ctx );
+    if (ctx != NULL)
+        mbedtls_sha512_init((mbedtls_sha512_context *) ctx);
 
-    return( ctx );
+    return (ctx);
 }
 
-static void sha384_ctx_free( void *ctx )
+static void sha384_ctx_free(void *ctx)
 {
-    mbedtls_sha512_free( (mbedtls_sha512_context *) ctx );
-    mbedtls_free( ctx );
+    mbedtls_sha512_free((mbedtls_sha512_context *) ctx);
+    mbedtls_free(ctx);
 }
 
-static void sha384_clone_wrap( void *dst, const void *src )
+static void sha384_clone_wrap(void *dst, const void *src)
 {
-    mbedtls_sha512_clone( (mbedtls_sha512_context *) dst,
-                    (const mbedtls_sha512_context *) src );
+    mbedtls_sha512_clone((mbedtls_sha512_context *) dst,
+                         (const mbedtls_sha512_context *) src);
 }
 
-static int sha384_process_wrap( void *ctx, const unsigned char *data )
+static int sha384_process_wrap(void *ctx, const unsigned char *data)
 {
-    return( mbedtls_internal_sha512_process( (mbedtls_sha512_context *) ctx,
-                                             data ) );
+    return (mbedtls_internal_sha512_process((mbedtls_sha512_context *) ctx,
+                                            data));
 }
 
 const mbedtls_md_info_t mbedtls_sha384_info = {
@@ -557,15 +557,15 @@ const mbedtls_md_info_t mbedtls_sha384_info = {
     sha384_process_wrap,
 };
 
-static int sha512_starts_wrap( void *ctx )
+static int sha512_starts_wrap(void *ctx)
 {
-    return( mbedtls_sha512_starts_ret( (mbedtls_sha512_context *) ctx, 0 ) );
+    return (mbedtls_sha512_starts_ret((mbedtls_sha512_context *) ctx, 0));
 }
 
-static int sha512_wrap( const unsigned char *input, size_t ilen,
-                        unsigned char *output )
+static int sha512_wrap(const unsigned char *input, size_t ilen,
+                       unsigned char *output)
 {
-    return( mbedtls_sha512_ret( input, ilen, output, 0 ) );
+    return (mbedtls_sha512_ret(input, ilen, output, 0));
 }
 
 const mbedtls_md_info_t mbedtls_sha512_info = {
diff --git a/common/mbedtls/oid.c b/common/mbedtls/oid.c
index 962bd189a..41770f593 100644
--- a/common/mbedtls/oid.c
+++ b/common/mbedtls/oid.c
@@ -57,47 +57,47 @@
  * the other functions)
  */
 #define FN_OID_TYPED_FROM_ASN1( TYPE_T, NAME, LIST )                        \
-static const TYPE_T * oid_ ## NAME ## _from_asn1( const mbedtls_asn1_buf *oid )     \
-{                                                                           \
-    const TYPE_T *p = LIST;                                                 \
-    const mbedtls_oid_descriptor_t *cur = (const mbedtls_oid_descriptor_t *) p;             \
-    if( p == NULL || oid == NULL ) return( NULL );                          \
-    while( cur->asn1 != NULL ) {                                            \
-        if( cur->asn1_len == oid->len &&                                    \
-            memcmp( cur->asn1, oid->p, oid->len ) == 0 ) {                  \
-            return( p );                                                    \
-        }                                                                   \
-        p++;                                                                \
-        cur = (const mbedtls_oid_descriptor_t *) p;                                 \
-    }                                                                       \
-    return( NULL );                                                         \
-}
+    static const TYPE_T * oid_ ## NAME ## _from_asn1( const mbedtls_asn1_buf *oid )     \
+    {                                                                           \
+        const TYPE_T *p = LIST;                                                 \
+        const mbedtls_oid_descriptor_t *cur = (const mbedtls_oid_descriptor_t *) p;             \
+        if( p == NULL || oid == NULL ) return( NULL );                          \
+        while( cur->asn1 != NULL ) {                                            \
+            if( cur->asn1_len == oid->len &&                                    \
+                memcmp( cur->asn1, oid->p, oid->len ) == 0 ) {                  \
+                return( p );                                                    \
+            }                                                                   \
+            p++;                                                                \
+            cur = (const mbedtls_oid_descriptor_t *) p;                                 \
+        }                                                                       \
+        return( NULL );                                                         \
+    }
 
 /*
  * Macro to generate a function for retrieving a single attribute from the
  * descriptor of an mbedtls_oid_descriptor_t wrapper.
  */
 #define FN_OID_GET_DESCRIPTOR_ATTR1(FN_NAME, TYPE_T, TYPE_NAME, ATTR1_TYPE, ATTR1) \
-int FN_NAME( const mbedtls_asn1_buf *oid, ATTR1_TYPE * ATTR1 )                  \
-{                                                                       \
-    const TYPE_T *data = oid_ ## TYPE_NAME ## _from_asn1( oid );        \
-    if( data == NULL ) return( MBEDTLS_ERR_OID_NOT_FOUND );            \
-    *ATTR1 = data->descriptor.ATTR1;                                    \
-    return( 0 );                                                        \
-}
+    int FN_NAME( const mbedtls_asn1_buf *oid, ATTR1_TYPE * ATTR1 )                  \
+    {                                                                       \
+        const TYPE_T *data = oid_ ## TYPE_NAME ## _from_asn1( oid );        \
+        if( data == NULL ) return( MBEDTLS_ERR_OID_NOT_FOUND );            \
+        *ATTR1 = data->descriptor.ATTR1;                                    \
+        return( 0 );                                                        \
+    }
 
 /*
  * Macro to generate a function for retrieving a single attribute from an
  * mbedtls_oid_descriptor_t wrapper.
  */
 #define FN_OID_GET_ATTR1(FN_NAME, TYPE_T, TYPE_NAME, ATTR1_TYPE, ATTR1) \
-int FN_NAME( const mbedtls_asn1_buf *oid, ATTR1_TYPE * ATTR1 )                  \
-{                                                                       \
-    const TYPE_T *data = oid_ ## TYPE_NAME ## _from_asn1( oid );        \
-    if( data == NULL ) return( MBEDTLS_ERR_OID_NOT_FOUND );            \
-    *ATTR1 = data->ATTR1;                                               \
-    return( 0 );                                                        \
-}
+    int FN_NAME( const mbedtls_asn1_buf *oid, ATTR1_TYPE * ATTR1 )                  \
+    {                                                                       \
+        const TYPE_T *data = oid_ ## TYPE_NAME ## _from_asn1( oid );        \
+        if( data == NULL ) return( MBEDTLS_ERR_OID_NOT_FOUND );            \
+        *ATTR1 = data->ATTR1;                                               \
+        return( 0 );                                                        \
+    }
 
 /*
  * Macro to generate a function for retrieving two attributes from an
@@ -119,19 +119,19 @@ int FN_NAME( const mbedtls_asn1_buf *oid, ATTR1_TYPE * ATTR1, ATTR2_TYPE * ATTR2
  * attribute from a mbedtls_oid_descriptor_t wrapper.
  */
 #define FN_OID_GET_OID_BY_ATTR1(FN_NAME, TYPE_T, LIST, ATTR1_TYPE, ATTR1)   \
-int FN_NAME( ATTR1_TYPE ATTR1, const char **oid, size_t *olen )             \
-{                                                                           \
-    const TYPE_T *cur = LIST;                                               \
-    while( cur->descriptor.asn1 != NULL ) {                                 \
-        if( cur->ATTR1 == ATTR1 ) {                                         \
-            *oid = cur->descriptor.asn1;                                    \
-            *olen = cur->descriptor.asn1_len;                               \
-            return( 0 );                                                    \
-        }                                                                   \
-        cur++;                                                              \
-    }                                                                       \
-    return( MBEDTLS_ERR_OID_NOT_FOUND );                                   \
-}
+    int FN_NAME( ATTR1_TYPE ATTR1, const char **oid, size_t *olen )             \
+    {                                                                           \
+        const TYPE_T *cur = LIST;                                               \
+        while( cur->descriptor.asn1 != NULL ) {                                 \
+            if( cur->ATTR1 == ATTR1 ) {                                         \
+                *oid = cur->descriptor.asn1;                                    \
+                *olen = cur->descriptor.asn1_len;                               \
+                return( 0 );                                                    \
+            }                                                                   \
+            cur++;                                                              \
+        }                                                                       \
+        return( MBEDTLS_ERR_OID_NOT_FOUND );                                   \
+    }
 
 /*
  * Macro to generate a function for retrieving the OID based on two
@@ -163,82 +163,81 @@ typedef struct {
     const char          *short_name;
 } oid_x520_attr_t;
 
-static const oid_x520_attr_t oid_x520_attr_type[] =
-{
+static const oid_x520_attr_t oid_x520_attr_type[] = {
     {
-        { ADD_LEN( MBEDTLS_OID_AT_CN ),          "id-at-commonName",               "Common Name" },
+        { ADD_LEN(MBEDTLS_OID_AT_CN),          "id-at-commonName",               "Common Name" },
         "CN",
     },
     {
-        { ADD_LEN( MBEDTLS_OID_AT_COUNTRY ),     "id-at-countryName",              "Country" },
+        { ADD_LEN(MBEDTLS_OID_AT_COUNTRY),     "id-at-countryName",              "Country" },
         "C",
     },
     {
-        { ADD_LEN( MBEDTLS_OID_AT_LOCALITY ),    "id-at-locality",                 "Locality" },
+        { ADD_LEN(MBEDTLS_OID_AT_LOCALITY),    "id-at-locality",                 "Locality" },
         "L",
     },
     {
-        { ADD_LEN( MBEDTLS_OID_AT_STATE ),       "id-at-state",                    "State" },
+        { ADD_LEN(MBEDTLS_OID_AT_STATE),       "id-at-state",                    "State" },
         "ST",
     },
     {
-        { ADD_LEN( MBEDTLS_OID_AT_ORGANIZATION ),"id-at-organizationName",         "Organization" },
+        { ADD_LEN(MBEDTLS_OID_AT_ORGANIZATION), "id-at-organizationName",         "Organization" },
         "O",
     },
     {
-        { ADD_LEN( MBEDTLS_OID_AT_ORG_UNIT ),    "id-at-organizationalUnitName",   "Org Unit" },
+        { ADD_LEN(MBEDTLS_OID_AT_ORG_UNIT),    "id-at-organizationalUnitName",   "Org Unit" },
         "OU",
     },
     {
-        { ADD_LEN( MBEDTLS_OID_PKCS9_EMAIL ),    "emailAddress",                   "E-mail address" },
+        { ADD_LEN(MBEDTLS_OID_PKCS9_EMAIL),    "emailAddress",                   "E-mail address" },
         "emailAddress",
     },
     {
-        { ADD_LEN( MBEDTLS_OID_AT_SERIAL_NUMBER ),"id-at-serialNumber",            "Serial number" },
+        { ADD_LEN(MBEDTLS_OID_AT_SERIAL_NUMBER), "id-at-serialNumber",            "Serial number" },
         "serialNumber",
     },
     {
-        { ADD_LEN( MBEDTLS_OID_AT_POSTAL_ADDRESS ),"id-at-postalAddress",          "Postal address" },
+        { ADD_LEN(MBEDTLS_OID_AT_POSTAL_ADDRESS), "id-at-postalAddress",          "Postal address" },
         "postalAddress",
     },
     {
-        { ADD_LEN( MBEDTLS_OID_AT_POSTAL_CODE ), "id-at-postalCode",               "Postal code" },
+        { ADD_LEN(MBEDTLS_OID_AT_POSTAL_CODE), "id-at-postalCode",               "Postal code" },
         "postalCode",
     },
     {
-        { ADD_LEN( MBEDTLS_OID_AT_SUR_NAME ),    "id-at-surName",                  "Surname" },
+        { ADD_LEN(MBEDTLS_OID_AT_SUR_NAME),    "id-at-surName",                  "Surname" },
         "SN",
     },
     {
-        { ADD_LEN( MBEDTLS_OID_AT_GIVEN_NAME ),  "id-at-givenName",                "Given name" },
+        { ADD_LEN(MBEDTLS_OID_AT_GIVEN_NAME),  "id-at-givenName",                "Given name" },
         "GN",
     },
     {
-        { ADD_LEN( MBEDTLS_OID_AT_INITIALS ),    "id-at-initials",                 "Initials" },
+        { ADD_LEN(MBEDTLS_OID_AT_INITIALS),    "id-at-initials",                 "Initials" },
         "initials",
     },
     {
-        { ADD_LEN( MBEDTLS_OID_AT_GENERATION_QUALIFIER ), "id-at-generationQualifier", "Generation qualifier" },
+        { ADD_LEN(MBEDTLS_OID_AT_GENERATION_QUALIFIER), "id-at-generationQualifier", "Generation qualifier" },
         "generationQualifier",
     },
     {
-        { ADD_LEN( MBEDTLS_OID_AT_TITLE ),       "id-at-title",                    "Title" },
+        { ADD_LEN(MBEDTLS_OID_AT_TITLE),       "id-at-title",                    "Title" },
         "title",
     },
     {
-        { ADD_LEN( MBEDTLS_OID_AT_DN_QUALIFIER ),"id-at-dnQualifier",              "Distinguished Name qualifier" },
+        { ADD_LEN(MBEDTLS_OID_AT_DN_QUALIFIER), "id-at-dnQualifier",              "Distinguished Name qualifier" },
         "dnQualifier",
     },
     {
-        { ADD_LEN( MBEDTLS_OID_AT_PSEUDONYM ),   "id-at-pseudonym",                "Pseudonym" },
+        { ADD_LEN(MBEDTLS_OID_AT_PSEUDONYM),   "id-at-pseudonym",                "Pseudonym" },
         "pseudonym",
     },
     {
-        { ADD_LEN( MBEDTLS_OID_DOMAIN_COMPONENT ), "id-domainComponent",           "Domain component" },
+        { ADD_LEN(MBEDTLS_OID_DOMAIN_COMPONENT), "id-domainComponent",           "Domain component" },
         "DC",
     },
     {
-        { ADD_LEN( MBEDTLS_OID_AT_UNIQUE_IDENTIFIER ), "id-at-uniqueIdentifier",    "Unique Identifier" },
+        { ADD_LEN(MBEDTLS_OID_AT_UNIQUE_IDENTIFIER), "id-at-uniqueIdentifier",    "Unique Identifier" },
         "uniqueIdentifier",
     },
     {
@@ -258,26 +257,25 @@ typedef struct {
     int                 ext_type;
 } oid_x509_ext_t;
 
-static const oid_x509_ext_t oid_x509_ext[] =
-{
+static const oid_x509_ext_t oid_x509_ext[] = {
     {
-        { ADD_LEN( MBEDTLS_OID_BASIC_CONSTRAINTS ),    "id-ce-basicConstraints",   "Basic Constraints" },
+        { ADD_LEN(MBEDTLS_OID_BASIC_CONSTRAINTS),    "id-ce-basicConstraints",   "Basic Constraints" },
         MBEDTLS_X509_EXT_BASIC_CONSTRAINTS,
     },
     {
-        { ADD_LEN( MBEDTLS_OID_KEY_USAGE ),            "id-ce-keyUsage",           "Key Usage" },
+        { ADD_LEN(MBEDTLS_OID_KEY_USAGE),            "id-ce-keyUsage",           "Key Usage" },
         MBEDTLS_X509_EXT_KEY_USAGE,
     },
     {
-        { ADD_LEN( MBEDTLS_OID_EXTENDED_KEY_USAGE ),   "id-ce-extKeyUsage",        "Extended Key Usage" },
+        { ADD_LEN(MBEDTLS_OID_EXTENDED_KEY_USAGE),   "id-ce-extKeyUsage",        "Extended Key Usage" },
         MBEDTLS_X509_EXT_EXTENDED_KEY_USAGE,
     },
     {
-        { ADD_LEN( MBEDTLS_OID_SUBJECT_ALT_NAME ),     "id-ce-subjectAltName",     "Subject Alt Name" },
+        { ADD_LEN(MBEDTLS_OID_SUBJECT_ALT_NAME),     "id-ce-subjectAltName",     "Subject Alt Name" },
         MBEDTLS_X509_EXT_SUBJECT_ALT_NAME,
     },
     {
-        { ADD_LEN( MBEDTLS_OID_NS_CERT_TYPE ),         "id-netscape-certtype",     "Netscape Certificate Type" },
+        { ADD_LEN(MBEDTLS_OID_NS_CERT_TYPE),         "id-netscape-certtype",     "Netscape Certificate Type" },
         MBEDTLS_X509_EXT_NS_CERT_TYPE,
     },
     {
@@ -289,14 +287,13 @@ static const oid_x509_ext_t oid_x509_ext[] =
 FN_OID_TYPED_FROM_ASN1(oid_x509_ext_t, x509_ext, oid_x509_ext)
 FN_OID_GET_ATTR1(mbedtls_oid_get_x509_ext_type, oid_x509_ext_t, x509_ext, int, ext_type)
 
-static const mbedtls_oid_descriptor_t oid_ext_key_usage[] =
-{
-    { ADD_LEN( MBEDTLS_OID_SERVER_AUTH ),      "id-kp-serverAuth",      "TLS Web Server Authentication" },
-    { ADD_LEN( MBEDTLS_OID_CLIENT_AUTH ),      "id-kp-clientAuth",      "TLS Web Client Authentication" },
-    { ADD_LEN( MBEDTLS_OID_CODE_SIGNING ),     "id-kp-codeSigning",     "Code Signing" },
-    { ADD_LEN( MBEDTLS_OID_EMAIL_PROTECTION ), "id-kp-emailProtection", "E-mail Protection" },
-    { ADD_LEN( MBEDTLS_OID_TIME_STAMPING ),    "id-kp-timeStamping",    "Time Stamping" },
-    { ADD_LEN( MBEDTLS_OID_OCSP_SIGNING ),     "id-kp-OCSPSigning",     "OCSP Signing" },
+static const mbedtls_oid_descriptor_t oid_ext_key_usage[] = {
+    { ADD_LEN(MBEDTLS_OID_SERVER_AUTH),      "id-kp-serverAuth",      "TLS Web Server Authentication" },
+    { ADD_LEN(MBEDTLS_OID_CLIENT_AUTH),      "id-kp-clientAuth",      "TLS Web Client Authentication" },
+    { ADD_LEN(MBEDTLS_OID_CODE_SIGNING),     "id-kp-codeSigning",     "Code Signing" },
+    { ADD_LEN(MBEDTLS_OID_EMAIL_PROTECTION), "id-kp-emailProtection", "E-mail Protection" },
+    { ADD_LEN(MBEDTLS_OID_TIME_STAMPING),    "id-kp-timeStamping",    "Time Stamping" },
+    { ADD_LEN(MBEDTLS_OID_OCSP_SIGNING),     "id-kp-OCSPSigning",     "OCSP Signing" },
     { NULL, 0, NULL, NULL },
 };
 
@@ -314,56 +311,55 @@ typedef struct {
     mbedtls_pk_type_t           pk_alg;
 } oid_sig_alg_t;
 
-static const oid_sig_alg_t oid_sig_alg[] =
-{
+static const oid_sig_alg_t oid_sig_alg[] = {
 #if defined(MBEDTLS_RSA_C)
 #if defined(MBEDTLS_MD2_C)
     {
-        { ADD_LEN( MBEDTLS_OID_PKCS1_MD2 ),        "md2WithRSAEncryption",     "RSA with MD2" },
+        { ADD_LEN(MBEDTLS_OID_PKCS1_MD2),        "md2WithRSAEncryption",     "RSA with MD2" },
         MBEDTLS_MD_MD2,      MBEDTLS_PK_RSA,
     },
 #endif /* MBEDTLS_MD2_C */
 #if defined(MBEDTLS_MD4_C)
     {
-        { ADD_LEN( MBEDTLS_OID_PKCS1_MD4 ),        "md4WithRSAEncryption",     "RSA with MD4" },
+        { ADD_LEN(MBEDTLS_OID_PKCS1_MD4),        "md4WithRSAEncryption",     "RSA with MD4" },
         MBEDTLS_MD_MD4,      MBEDTLS_PK_RSA,
     },
 #endif /* MBEDTLS_MD4_C */
 #if defined(MBEDTLS_MD5_C)
     {
-        { ADD_LEN( MBEDTLS_OID_PKCS1_MD5 ),        "md5WithRSAEncryption",     "RSA with MD5" },
+        { ADD_LEN(MBEDTLS_OID_PKCS1_MD5),        "md5WithRSAEncryption",     "RSA with MD5" },
         MBEDTLS_MD_MD5,      MBEDTLS_PK_RSA,
     },
 #endif /* MBEDTLS_MD5_C */
 #if defined(MBEDTLS_SHA1_C)
     {
-        { ADD_LEN( MBEDTLS_OID_PKCS1_SHA1 ),       "sha-1WithRSAEncryption",   "RSA with SHA1" },
+        { ADD_LEN(MBEDTLS_OID_PKCS1_SHA1),       "sha-1WithRSAEncryption",   "RSA with SHA1" },
         MBEDTLS_MD_SHA1,     MBEDTLS_PK_RSA,
     },
 #endif /* MBEDTLS_SHA1_C */
 #if defined(MBEDTLS_SHA256_C)
     {
-        { ADD_LEN( MBEDTLS_OID_PKCS1_SHA224 ),     "sha224WithRSAEncryption",  "RSA with SHA-224" },
+        { ADD_LEN(MBEDTLS_OID_PKCS1_SHA224),     "sha224WithRSAEncryption",  "RSA with SHA-224" },
         MBEDTLS_MD_SHA224,   MBEDTLS_PK_RSA,
     },
     {
-        { ADD_LEN( MBEDTLS_OID_PKCS1_SHA256 ),     "sha256WithRSAEncryption",  "RSA with SHA-256" },
+        { ADD_LEN(MBEDTLS_OID_PKCS1_SHA256),     "sha256WithRSAEncryption",  "RSA with SHA-256" },
         MBEDTLS_MD_SHA256,   MBEDTLS_PK_RSA,
     },
 #endif /* MBEDTLS_SHA256_C */
 #if defined(MBEDTLS_SHA512_C)
     {
-        { ADD_LEN( MBEDTLS_OID_PKCS1_SHA384 ),     "sha384WithRSAEncryption",  "RSA with SHA-384" },
+        { ADD_LEN(MBEDTLS_OID_PKCS1_SHA384),     "sha384WithRSAEncryption",  "RSA with SHA-384" },
         MBEDTLS_MD_SHA384,   MBEDTLS_PK_RSA,
     },
     {
-        { ADD_LEN( MBEDTLS_OID_PKCS1_SHA512 ),     "sha512WithRSAEncryption",  "RSA with SHA-512" },
+        { ADD_LEN(MBEDTLS_OID_PKCS1_SHA512),     "sha512WithRSAEncryption",  "RSA with SHA-512" },
         MBEDTLS_MD_SHA512,   MBEDTLS_PK_RSA,
     },
 #endif /* MBEDTLS_SHA512_C */
 #if defined(MBEDTLS_SHA1_C)
     {
-        { ADD_LEN( MBEDTLS_OID_RSA_SHA_OBS ),      "sha-1WithRSAEncryption",   "RSA with SHA1" },
+        { ADD_LEN(MBEDTLS_OID_RSA_SHA_OBS),      "sha-1WithRSAEncryption",   "RSA with SHA1" },
         MBEDTLS_MD_SHA1,     MBEDTLS_PK_RSA,
     },
 #endif /* MBEDTLS_SHA1_C */
@@ -371,34 +367,34 @@ static const oid_sig_alg_t oid_sig_alg[] =
 #if defined(MBEDTLS_ECDSA_C)
 #if defined(MBEDTLS_SHA1_C)
     {
-        { ADD_LEN( MBEDTLS_OID_ECDSA_SHA1 ),       "ecdsa-with-SHA1",      "ECDSA with SHA1" },
+        { ADD_LEN(MBEDTLS_OID_ECDSA_SHA1),       "ecdsa-with-SHA1",      "ECDSA with SHA1" },
         MBEDTLS_MD_SHA1,     MBEDTLS_PK_ECDSA,
     },
 #endif /* MBEDTLS_SHA1_C */
 #if defined(MBEDTLS_SHA256_C)
     {
-        { ADD_LEN( MBEDTLS_OID_ECDSA_SHA224 ),     "ecdsa-with-SHA224",    "ECDSA with SHA224" },
+        { ADD_LEN(MBEDTLS_OID_ECDSA_SHA224),     "ecdsa-with-SHA224",    "ECDSA with SHA224" },
         MBEDTLS_MD_SHA224,   MBEDTLS_PK_ECDSA,
     },
     {
-        { ADD_LEN( MBEDTLS_OID_ECDSA_SHA256 ),     "ecdsa-with-SHA256",    "ECDSA with SHA256" },
+        { ADD_LEN(MBEDTLS_OID_ECDSA_SHA256),     "ecdsa-with-SHA256",    "ECDSA with SHA256" },
         MBEDTLS_MD_SHA256,   MBEDTLS_PK_ECDSA,
     },
 #endif /* MBEDTLS_SHA256_C */
 #if defined(MBEDTLS_SHA512_C)
     {
-        { ADD_LEN( MBEDTLS_OID_ECDSA_SHA384 ),     "ecdsa-with-SHA384",    "ECDSA with SHA384" },
+        { ADD_LEN(MBEDTLS_OID_ECDSA_SHA384),     "ecdsa-with-SHA384",    "ECDSA with SHA384" },
         MBEDTLS_MD_SHA384,   MBEDTLS_PK_ECDSA,
     },
     {
-        { ADD_LEN( MBEDTLS_OID_ECDSA_SHA512 ),     "ecdsa-with-SHA512",    "ECDSA with SHA512" },
+        { ADD_LEN(MBEDTLS_OID_ECDSA_SHA512),     "ecdsa-with-SHA512",    "ECDSA with SHA512" },
         MBEDTLS_MD_SHA512,   MBEDTLS_PK_ECDSA,
     },
 #endif /* MBEDTLS_SHA512_C */
 #endif /* MBEDTLS_ECDSA_C */
 #if defined(MBEDTLS_RSA_C)
     {
-        { ADD_LEN( MBEDTLS_OID_RSASSA_PSS ),        "RSASSA-PSS",           "RSASSA-PSS" },
+        { ADD_LEN(MBEDTLS_OID_RSASSA_PSS),        "RSASSA-PSS",           "RSASSA-PSS" },
         MBEDTLS_MD_NONE,     MBEDTLS_PK_RSASSA_PSS,
     },
 #endif /* MBEDTLS_RSA_C */
@@ -422,18 +418,17 @@ typedef struct {
     mbedtls_pk_type_t           pk_alg;
 } oid_pk_alg_t;
 
-static const oid_pk_alg_t oid_pk_alg[] =
-{
+static const oid_pk_alg_t oid_pk_alg[] = {
     {
-        { ADD_LEN( MBEDTLS_OID_PKCS1_RSA ),      "rsaEncryption",   "RSA" },
+        { ADD_LEN(MBEDTLS_OID_PKCS1_RSA),      "rsaEncryption",   "RSA" },
         MBEDTLS_PK_RSA,
     },
     {
-        { ADD_LEN( MBEDTLS_OID_EC_ALG_UNRESTRICTED ),  "id-ecPublicKey",   "Generic EC key" },
+        { ADD_LEN(MBEDTLS_OID_EC_ALG_UNRESTRICTED),  "id-ecPublicKey",   "Generic EC key" },
         MBEDTLS_PK_ECKEY,
     },
     {
-        { ADD_LEN( MBEDTLS_OID_EC_ALG_ECDH ),          "id-ecDH",          "EC key for ECDH" },
+        { ADD_LEN(MBEDTLS_OID_EC_ALG_ECDH),          "id-ecDH",          "EC key for ECDH" },
         MBEDTLS_PK_ECKEY_DH,
     },
     {
@@ -455,71 +450,70 @@ typedef struct {
     mbedtls_ecp_group_id        grp_id;
 } oid_ecp_grp_t;
 
-static const oid_ecp_grp_t oid_ecp_grp[] =
-{
+static const oid_ecp_grp_t oid_ecp_grp[] = {
 #if defined(MBEDTLS_ECP_DP_SECP192R1_ENABLED)
     {
-        { ADD_LEN( MBEDTLS_OID_EC_GRP_SECP192R1 ), "secp192r1",    "secp192r1" },
+        { ADD_LEN(MBEDTLS_OID_EC_GRP_SECP192R1), "secp192r1",    "secp192r1" },
         MBEDTLS_ECP_DP_SECP192R1,
     },
 #endif /* MBEDTLS_ECP_DP_SECP192R1_ENABLED */
 #if defined(MBEDTLS_ECP_DP_SECP224R1_ENABLED)
     {
-        { ADD_LEN( MBEDTLS_OID_EC_GRP_SECP224R1 ), "secp224r1",    "secp224r1" },
+        { ADD_LEN(MBEDTLS_OID_EC_GRP_SECP224R1), "secp224r1",    "secp224r1" },
         MBEDTLS_ECP_DP_SECP224R1,
     },
 #endif /* MBEDTLS_ECP_DP_SECP224R1_ENABLED */
 #if defined(MBEDTLS_ECP_DP_SECP256R1_ENABLED)
     {
-        { ADD_LEN( MBEDTLS_OID_EC_GRP_SECP256R1 ), "secp256r1",    "secp256r1" },
+        { ADD_LEN(MBEDTLS_OID_EC_GRP_SECP256R1), "secp256r1",    "secp256r1" },
         MBEDTLS_ECP_DP_SECP256R1,
     },
 #endif /* MBEDTLS_ECP_DP_SECP256R1_ENABLED */
 #if defined(MBEDTLS_ECP_DP_SECP384R1_ENABLED)
     {
-        { ADD_LEN( MBEDTLS_OID_EC_GRP_SECP384R1 ), "secp384r1",    "secp384r1" },
+        { ADD_LEN(MBEDTLS_OID_EC_GRP_SECP384R1), "secp384r1",    "secp384r1" },
         MBEDTLS_ECP_DP_SECP384R1,
     },
 #endif /* MBEDTLS_ECP_DP_SECP384R1_ENABLED */
 #if defined(MBEDTLS_ECP_DP_SECP521R1_ENABLED)
     {
-        { ADD_LEN( MBEDTLS_OID_EC_GRP_SECP521R1 ), "secp521r1",    "secp521r1" },
+        { ADD_LEN(MBEDTLS_OID_EC_GRP_SECP521R1), "secp521r1",    "secp521r1" },
         MBEDTLS_ECP_DP_SECP521R1,
     },
 #endif /* MBEDTLS_ECP_DP_SECP521R1_ENABLED */
 #if defined(MBEDTLS_ECP_DP_SECP192K1_ENABLED)
     {
-        { ADD_LEN( MBEDTLS_OID_EC_GRP_SECP192K1 ), "secp192k1",    "secp192k1" },
+        { ADD_LEN(MBEDTLS_OID_EC_GRP_SECP192K1), "secp192k1",    "secp192k1" },
         MBEDTLS_ECP_DP_SECP192K1,
     },
 #endif /* MBEDTLS_ECP_DP_SECP192K1_ENABLED */
 #if defined(MBEDTLS_ECP_DP_SECP224K1_ENABLED)
     {
-        { ADD_LEN( MBEDTLS_OID_EC_GRP_SECP224K1 ), "secp224k1",    "secp224k1" },
+        { ADD_LEN(MBEDTLS_OID_EC_GRP_SECP224K1), "secp224k1",    "secp224k1" },
         MBEDTLS_ECP_DP_SECP224K1,
     },
 #endif /* MBEDTLS_ECP_DP_SECP224K1_ENABLED */
 #if defined(MBEDTLS_ECP_DP_SECP256K1_ENABLED)
     {
-        { ADD_LEN( MBEDTLS_OID_EC_GRP_SECP256K1 ), "secp256k1",    "secp256k1" },
+        { ADD_LEN(MBEDTLS_OID_EC_GRP_SECP256K1), "secp256k1",    "secp256k1" },
         MBEDTLS_ECP_DP_SECP256K1,
     },
 #endif /* MBEDTLS_ECP_DP_SECP256K1_ENABLED */
 #if defined(MBEDTLS_ECP_DP_BP256R1_ENABLED)
     {
-        { ADD_LEN( MBEDTLS_OID_EC_GRP_BP256R1 ),   "brainpoolP256r1","brainpool256r1" },
+        { ADD_LEN(MBEDTLS_OID_EC_GRP_BP256R1),   "brainpoolP256r1", "brainpool256r1" },
         MBEDTLS_ECP_DP_BP256R1,
     },
 #endif /* MBEDTLS_ECP_DP_BP256R1_ENABLED */
 #if defined(MBEDTLS_ECP_DP_BP384R1_ENABLED)
     {
-        { ADD_LEN( MBEDTLS_OID_EC_GRP_BP384R1 ),   "brainpoolP384r1","brainpool384r1" },
+        { ADD_LEN(MBEDTLS_OID_EC_GRP_BP384R1),   "brainpoolP384r1", "brainpool384r1" },
         MBEDTLS_ECP_DP_BP384R1,
     },
 #endif /* MBEDTLS_ECP_DP_BP384R1_ENABLED */
 #if defined(MBEDTLS_ECP_DP_BP512R1_ENABLED)
     {
-        { ADD_LEN( MBEDTLS_OID_EC_GRP_BP512R1 ),   "brainpoolP512r1","brainpool512r1" },
+        { ADD_LEN(MBEDTLS_OID_EC_GRP_BP512R1),   "brainpoolP512r1", "brainpool512r1" },
         MBEDTLS_ECP_DP_BP512R1,
     },
 #endif /* MBEDTLS_ECP_DP_BP512R1_ENABLED */
@@ -543,14 +537,13 @@ typedef struct {
     mbedtls_cipher_type_t       cipher_alg;
 } oid_cipher_alg_t;
 
-static const oid_cipher_alg_t oid_cipher_alg[] =
-{
+static const oid_cipher_alg_t oid_cipher_alg[] = {
     {
-        { ADD_LEN( MBEDTLS_OID_DES_CBC ),              "desCBC",       "DES-CBC" },
+        { ADD_LEN(MBEDTLS_OID_DES_CBC),              "desCBC",       "DES-CBC" },
         MBEDTLS_CIPHER_DES_CBC,
     },
     {
-        { ADD_LEN( MBEDTLS_OID_DES_EDE3_CBC ),         "des-ede3-cbc", "DES-EDE3-CBC" },
+        { ADD_LEN(MBEDTLS_OID_DES_EDE3_CBC),         "des-ede3-cbc", "DES-EDE3-CBC" },
         MBEDTLS_CIPHER_DES_EDE3_CBC,
     },
     {
@@ -572,49 +565,48 @@ typedef struct {
     mbedtls_md_type_t           md_alg;
 } oid_md_alg_t;
 
-static const oid_md_alg_t oid_md_alg[] =
-{
+static const oid_md_alg_t oid_md_alg[] = {
 #if defined(MBEDTLS_MD2_C)
     {
-        { ADD_LEN( MBEDTLS_OID_DIGEST_ALG_MD2 ),       "id-md2",       "MD2" },
+        { ADD_LEN(MBEDTLS_OID_DIGEST_ALG_MD2),       "id-md2",       "MD2" },
         MBEDTLS_MD_MD2,
     },
 #endif /* MBEDTLS_MD2_C */
 #if defined(MBEDTLS_MD4_C)
     {
-        { ADD_LEN( MBEDTLS_OID_DIGEST_ALG_MD4 ),       "id-md4",       "MD4" },
+        { ADD_LEN(MBEDTLS_OID_DIGEST_ALG_MD4),       "id-md4",       "MD4" },
         MBEDTLS_MD_MD4,
     },
 #endif /* MBEDTLS_MD4_C */
 #if defined(MBEDTLS_MD5_C)
     {
-        { ADD_LEN( MBEDTLS_OID_DIGEST_ALG_MD5 ),       "id-md5",       "MD5" },
+        { ADD_LEN(MBEDTLS_OID_DIGEST_ALG_MD5),       "id-md5",       "MD5" },
         MBEDTLS_MD_MD5,
     },
 #endif /* MBEDTLS_MD5_C */
 #if defined(MBEDTLS_SHA1_C)
     {
-        { ADD_LEN( MBEDTLS_OID_DIGEST_ALG_SHA1 ),      "id-sha1",      "SHA-1" },
+        { ADD_LEN(MBEDTLS_OID_DIGEST_ALG_SHA1),      "id-sha1",      "SHA-1" },
         MBEDTLS_MD_SHA1,
     },
 #endif /* MBEDTLS_SHA1_C */
 #if defined(MBEDTLS_SHA256_C)
     {
-        { ADD_LEN( MBEDTLS_OID_DIGEST_ALG_SHA224 ),    "id-sha224",    "SHA-224" },
+        { ADD_LEN(MBEDTLS_OID_DIGEST_ALG_SHA224),    "id-sha224",    "SHA-224" },
         MBEDTLS_MD_SHA224,
     },
     {
-        { ADD_LEN( MBEDTLS_OID_DIGEST_ALG_SHA256 ),    "id-sha256",    "SHA-256" },
+        { ADD_LEN(MBEDTLS_OID_DIGEST_ALG_SHA256),    "id-sha256",    "SHA-256" },
         MBEDTLS_MD_SHA256,
     },
 #endif /* MBEDTLS_SHA256_C */
 #if defined(MBEDTLS_SHA512_C)
     {
-        { ADD_LEN( MBEDTLS_OID_DIGEST_ALG_SHA384 ),    "id-sha384",    "SHA-384" },
+        { ADD_LEN(MBEDTLS_OID_DIGEST_ALG_SHA384),    "id-sha384",    "SHA-384" },
         MBEDTLS_MD_SHA384,
     },
     {
-        { ADD_LEN( MBEDTLS_OID_DIGEST_ALG_SHA512 ),    "id-sha512",    "SHA-512" },
+        { ADD_LEN(MBEDTLS_OID_DIGEST_ALG_SHA512),    "id-sha512",    "SHA-512" },
         MBEDTLS_MD_SHA512,
     },
 #endif /* MBEDTLS_SHA512_C */
@@ -636,31 +628,30 @@ typedef struct {
     mbedtls_md_type_t           md_hmac;
 } oid_md_hmac_t;
 
-static const oid_md_hmac_t oid_md_hmac[] =
-{
+static const oid_md_hmac_t oid_md_hmac[] = {
 #if defined(MBEDTLS_SHA1_C)
     {
-        { ADD_LEN( MBEDTLS_OID_HMAC_SHA1 ),      "hmacSHA1",      "HMAC-SHA-1" },
+        { ADD_LEN(MBEDTLS_OID_HMAC_SHA1),      "hmacSHA1",      "HMAC-SHA-1" },
         MBEDTLS_MD_SHA1,
     },
 #endif /* MBEDTLS_SHA1_C */
 #if defined(MBEDTLS_SHA256_C)
     {
-        { ADD_LEN( MBEDTLS_OID_HMAC_SHA224 ),    "hmacSHA224",    "HMAC-SHA-224" },
+        { ADD_LEN(MBEDTLS_OID_HMAC_SHA224),    "hmacSHA224",    "HMAC-SHA-224" },
         MBEDTLS_MD_SHA224,
     },
     {
-        { ADD_LEN( MBEDTLS_OID_HMAC_SHA256 ),    "hmacSHA256",    "HMAC-SHA-256" },
+        { ADD_LEN(MBEDTLS_OID_HMAC_SHA256),    "hmacSHA256",    "HMAC-SHA-256" },
         MBEDTLS_MD_SHA256,
     },
 #endif /* MBEDTLS_SHA256_C */
 #if defined(MBEDTLS_SHA512_C)
     {
-        { ADD_LEN( MBEDTLS_OID_HMAC_SHA384 ),    "hmacSHA384",    "HMAC-SHA-384" },
+        { ADD_LEN(MBEDTLS_OID_HMAC_SHA384),    "hmacSHA384",    "HMAC-SHA-384" },
         MBEDTLS_MD_SHA384,
     },
     {
-        { ADD_LEN( MBEDTLS_OID_HMAC_SHA512 ),    "hmacSHA512",    "HMAC-SHA-512" },
+        { ADD_LEN(MBEDTLS_OID_HMAC_SHA512),    "hmacSHA512",    "HMAC-SHA-512" },
         MBEDTLS_MD_SHA512,
     },
 #endif /* MBEDTLS_SHA512_C */
@@ -684,14 +675,13 @@ typedef struct {
     mbedtls_cipher_type_t       cipher_alg;
 } oid_pkcs12_pbe_alg_t;
 
-static const oid_pkcs12_pbe_alg_t oid_pkcs12_pbe_alg[] =
-{
+static const oid_pkcs12_pbe_alg_t oid_pkcs12_pbe_alg[] = {
     {
-        { ADD_LEN( MBEDTLS_OID_PKCS12_PBE_SHA1_DES3_EDE_CBC ), "pbeWithSHAAnd3-KeyTripleDES-CBC", "PBE with SHA1 and 3-Key 3DES" },
+        { ADD_LEN(MBEDTLS_OID_PKCS12_PBE_SHA1_DES3_EDE_CBC), "pbeWithSHAAnd3-KeyTripleDES-CBC", "PBE with SHA1 and 3-Key 3DES" },
         MBEDTLS_MD_SHA1,      MBEDTLS_CIPHER_DES_EDE3_CBC,
     },
     {
-        { ADD_LEN( MBEDTLS_OID_PKCS12_PBE_SHA1_DES2_EDE_CBC ), "pbeWithSHAAnd2-KeyTripleDES-CBC", "PBE with SHA1 and 2-Key 3DES" },
+        { ADD_LEN(MBEDTLS_OID_PKCS12_PBE_SHA1_DES2_EDE_CBC), "pbeWithSHAAnd2-KeyTripleDES-CBC", "PBE with SHA1 and 2-Key 3DES" },
         MBEDTLS_MD_SHA1,      MBEDTLS_CIPHER_DES_EDE_CBC,
     },
     {
@@ -708,14 +698,14 @@ FN_OID_GET_ATTR2(mbedtls_oid_get_pkcs12_pbe_alg, oid_pkcs12_pbe_alg_t, pkcs12_pb
     do {                                                \
         if( ret < 0 || (size_t) ret >= n )              \
             return( MBEDTLS_ERR_OID_BUF_TOO_SMALL );    \
-                                                        \
+        \
         n -= (size_t) ret;                              \
         p += (size_t) ret;                              \
     } while( 0 )
 
 /* Return the x.y.z.... style numeric string for the given OID */
-int mbedtls_oid_get_numeric_string( char *buf, size_t size,
-                            const mbedtls_asn1_buf *oid )
+int mbedtls_oid_get_numeric_string(char *buf, size_t size,
+                                   const mbedtls_asn1_buf *oid)
 {
     int ret;
     size_t i, n;
@@ -726,32 +716,29 @@ int mbedtls_oid_get_numeric_string( char *buf, size_t size,
     n = size;
 
     /* First byte contains first two dots */
-    if( oid->len > 0 )
-    {
-        ret = mbedtls_snprintf( p, n, "%d.%d", oid->p[0] / 40, oid->p[0] % 40 );
+    if (oid->len > 0) {
+        ret = mbedtls_snprintf(p, n, "%d.%d", oid->p[0] / 40, oid->p[0] % 40);
         OID_SAFE_SNPRINTF;
     }
 
     value = 0;
-    for( i = 1; i < oid->len; i++ )
-    {
+    for (i = 1; i < oid->len; i++) {
         /* Prevent overflow in value. */
-        if( ( ( value << 7 ) >> 7 ) != value )
-            return( MBEDTLS_ERR_OID_BUF_TOO_SMALL );
+        if (((value << 7) >> 7) != value)
+            return (MBEDTLS_ERR_OID_BUF_TOO_SMALL);
 
         value <<= 7;
         value += oid->p[i] & 0x7F;
 
-        if( !( oid->p[i] & 0x80 ) )
-        {
+        if (!(oid->p[i] & 0x80)) {
             /* Last byte */
-            ret = mbedtls_snprintf( p, n, ".%d", value );
+            ret = mbedtls_snprintf(p, n, ".%d", value);
             OID_SAFE_SNPRINTF;
             value = 0;
         }
     }
 
-    return( (int) ( size - n ) );
+    return ((int)(size - n));
 }
 
 #endif /* MBEDTLS_OID_C */
diff --git a/common/mbedtls/oid.h b/common/mbedtls/oid.h
index 1ea4a3f16..f29ba4acd 100644
--- a/common/mbedtls/oid.h
+++ b/common/mbedtls/oid.h
@@ -66,10 +66,10 @@
 #define MBEDTLS_OID_COUNTRY_US                  "\x86\x48"      /* {us(840)} */
 #define MBEDTLS_OID_ORG_RSA_DATA_SECURITY       "\x86\xf7\x0d"  /* {rsadsi(113549)} */
 #define MBEDTLS_OID_RSA_COMPANY                 MBEDTLS_OID_ISO_MEMBER_BODIES MBEDTLS_OID_COUNTRY_US \
-                                        MBEDTLS_OID_ORG_RSA_DATA_SECURITY /* {iso(1) member-body(2) us(840) rsadsi(113549)} */
+    MBEDTLS_OID_ORG_RSA_DATA_SECURITY /* {iso(1) member-body(2) us(840) rsadsi(113549)} */
 #define MBEDTLS_OID_ORG_ANSI_X9_62              "\xce\x3d" /* ansi-X9-62(10045) */
 #define MBEDTLS_OID_ANSI_X9_62                  MBEDTLS_OID_ISO_MEMBER_BODIES MBEDTLS_OID_COUNTRY_US \
-                                        MBEDTLS_OID_ORG_ANSI_X9_62
+    MBEDTLS_OID_ORG_ANSI_X9_62
 
 /*
  * ISO Identified organization OID parts
@@ -405,8 +405,7 @@ extern "C" {
 /**
  * \brief Base OID descriptor structure
  */
-typedef struct mbedtls_oid_descriptor_t
-{
+typedef struct mbedtls_oid_descriptor_t {
     const char *asn1;               /*!< OID ASN.1 representation       */
     size_t asn1_len;                /*!< length of asn1                 */
     const char *name;               /*!< official name (e.g. from RFC)  */
@@ -424,7 +423,7 @@ typedef struct mbedtls_oid_descriptor_t
  * \return          Length of the string written (excluding final NULL) or
  *                  MBEDTLS_ERR_OID_BUF_TOO_SMALL in case of error
  */
-int mbedtls_oid_get_numeric_string( char *buf, size_t size, const mbedtls_asn1_buf *oid );
+int mbedtls_oid_get_numeric_string(char *buf, size_t size, const mbedtls_asn1_buf *oid);
 
 #if defined(MBEDTLS_X509_USE_C) || defined(MBEDTLS_X509_CREATE_C)
 /**
@@ -435,7 +434,7 @@ int mbedtls_oid_get_numeric_string( char *buf, size_t size, const mbedtls_asn1_b
  *
  * \return         0 if successful, or MBEDTLS_ERR_OID_NOT_FOUND
  */
-int mbedtls_oid_get_x509_ext_type( const mbedtls_asn1_buf *oid, int *ext_type );
+int mbedtls_oid_get_x509_ext_type(const mbedtls_asn1_buf *oid, int *ext_type);
 #endif
 
 /**
@@ -447,7 +446,7 @@ int mbedtls_oid_get_x509_ext_type( const mbedtls_asn1_buf *oid, int *ext_type );
  *
  * \return         0 if successful, or MBEDTLS_ERR_OID_NOT_FOUND
  */
-int mbedtls_oid_get_attr_short_name( const mbedtls_asn1_buf *oid, const char **short_name );
+int mbedtls_oid_get_attr_short_name(const mbedtls_asn1_buf *oid, const char **short_name);
 
 /**
  * \brief          Translate PublicKeyAlgorithm OID into pk_type
@@ -457,7 +456,7 @@ int mbedtls_oid_get_attr_short_name( const mbedtls_asn1_buf *oid, const char **s
  *
  * \return         0 if successful, or MBEDTLS_ERR_OID_NOT_FOUND
  */
-int mbedtls_oid_get_pk_alg( const mbedtls_asn1_buf *oid, mbedtls_pk_type_t *pk_alg );
+int mbedtls_oid_get_pk_alg(const mbedtls_asn1_buf *oid, mbedtls_pk_type_t *pk_alg);
 
 /**
  * \brief          Translate pk_type into PublicKeyAlgorithm OID
@@ -468,8 +467,8 @@ int mbedtls_oid_get_pk_alg( const mbedtls_asn1_buf *oid, mbedtls_pk_type_t *pk_a
  *
  * \return         0 if successful, or MBEDTLS_ERR_OID_NOT_FOUND
  */
-int mbedtls_oid_get_oid_by_pk_alg( mbedtls_pk_type_t pk_alg,
-                           const char **oid, size_t *olen );
+int mbedtls_oid_get_oid_by_pk_alg(mbedtls_pk_type_t pk_alg,
+                                  const char **oid, size_t *olen);
 
 #if defined(MBEDTLS_ECP_C)
 /**
@@ -480,7 +479,7 @@ int mbedtls_oid_get_oid_by_pk_alg( mbedtls_pk_type_t pk_alg,
  *
  * \return         0 if successful, or MBEDTLS_ERR_OID_NOT_FOUND
  */
-int mbedtls_oid_get_ec_grp( const mbedtls_asn1_buf *oid, mbedtls_ecp_group_id *grp_id );
+int mbedtls_oid_get_ec_grp(const mbedtls_asn1_buf *oid, mbedtls_ecp_group_id *grp_id);
 
 /**
  * \brief          Translate EC group identifier into NamedCurve OID
@@ -491,8 +490,8 @@ int mbedtls_oid_get_ec_grp( const mbedtls_asn1_buf *oid, mbedtls_ecp_group_id *g
  *
  * \return         0 if successful, or MBEDTLS_ERR_OID_NOT_FOUND
  */
-int mbedtls_oid_get_oid_by_ec_grp( mbedtls_ecp_group_id grp_id,
-                           const char **oid, size_t *olen );
+int mbedtls_oid_get_oid_by_ec_grp(mbedtls_ecp_group_id grp_id,
+                                  const char **oid, size_t *olen);
 #endif /* MBEDTLS_ECP_C */
 
 #if defined(MBEDTLS_MD_C)
@@ -505,8 +504,8 @@ int mbedtls_oid_get_oid_by_ec_grp( mbedtls_ecp_group_id grp_id,
  *
  * \return         0 if successful, or MBEDTLS_ERR_OID_NOT_FOUND
  */
-int mbedtls_oid_get_sig_alg( const mbedtls_asn1_buf *oid,
-                     mbedtls_md_type_t *md_alg, mbedtls_pk_type_t *pk_alg );
+int mbedtls_oid_get_sig_alg(const mbedtls_asn1_buf *oid,
+                            mbedtls_md_type_t *md_alg, mbedtls_pk_type_t *pk_alg);
 
 /**
  * \brief          Translate SignatureAlgorithm OID into description
@@ -516,7 +515,7 @@ int mbedtls_oid_get_sig_alg( const mbedtls_asn1_buf *oid,
  *
  * \return         0 if successful, or MBEDTLS_ERR_OID_NOT_FOUND
  */
-int mbedtls_oid_get_sig_alg_desc( const mbedtls_asn1_buf *oid, const char **desc );
+int mbedtls_oid_get_sig_alg_desc(const mbedtls_asn1_buf *oid, const char **desc);
 
 /**
  * \brief          Translate md_type and pk_type into SignatureAlgorithm OID
@@ -528,8 +527,8 @@ int mbedtls_oid_get_sig_alg_desc( const mbedtls_asn1_buf *oid, const char **desc
  *
  * \return         0 if successful, or MBEDTLS_ERR_OID_NOT_FOUND
  */
-int mbedtls_oid_get_oid_by_sig_alg( mbedtls_pk_type_t pk_alg, mbedtls_md_type_t md_alg,
-                            const char **oid, size_t *olen );
+int mbedtls_oid_get_oid_by_sig_alg(mbedtls_pk_type_t pk_alg, mbedtls_md_type_t md_alg,
+                                   const char **oid, size_t *olen);
 
 /**
  * \brief          Translate hash algorithm OID into md_type
@@ -539,7 +538,7 @@ int mbedtls_oid_get_oid_by_sig_alg( mbedtls_pk_type_t pk_alg, mbedtls_md_type_t
  *
  * \return         0 if successful, or MBEDTLS_ERR_OID_NOT_FOUND
  */
-int mbedtls_oid_get_md_alg( const mbedtls_asn1_buf *oid, mbedtls_md_type_t *md_alg );
+int mbedtls_oid_get_md_alg(const mbedtls_asn1_buf *oid, mbedtls_md_type_t *md_alg);
 
 /**
  * \brief          Translate hmac algorithm OID into md_type
@@ -549,7 +548,7 @@ int mbedtls_oid_get_md_alg( const mbedtls_asn1_buf *oid, mbedtls_md_type_t *md_a
  *
  * \return         0 if successful, or MBEDTLS_ERR_OID_NOT_FOUND
  */
-int mbedtls_oid_get_md_hmac( const mbedtls_asn1_buf *oid, mbedtls_md_type_t *md_hmac );
+int mbedtls_oid_get_md_hmac(const mbedtls_asn1_buf *oid, mbedtls_md_type_t *md_hmac);
 #endif /* MBEDTLS_MD_C */
 
 /**
@@ -560,7 +559,7 @@ int mbedtls_oid_get_md_hmac( const mbedtls_asn1_buf *oid, mbedtls_md_type_t *md_
  *
  * \return         0 if successful, or MBEDTLS_ERR_OID_NOT_FOUND
  */
-int mbedtls_oid_get_extended_key_usage( const mbedtls_asn1_buf *oid, const char **desc );
+int mbedtls_oid_get_extended_key_usage(const mbedtls_asn1_buf *oid, const char **desc);
 
 /**
  * \brief          Translate md_type into hash algorithm OID
@@ -571,7 +570,7 @@ int mbedtls_oid_get_extended_key_usage( const mbedtls_asn1_buf *oid, const char
  *
  * \return         0 if successful, or MBEDTLS_ERR_OID_NOT_FOUND
  */
-int mbedtls_oid_get_oid_by_md( mbedtls_md_type_t md_alg, const char **oid, size_t *olen );
+int mbedtls_oid_get_oid_by_md(mbedtls_md_type_t md_alg, const char **oid, size_t *olen);
 
 #if defined(MBEDTLS_CIPHER_C)
 /**
@@ -582,7 +581,7 @@ int mbedtls_oid_get_oid_by_md( mbedtls_md_type_t md_alg, const char **oid, size_
  *
  * \return         0 if successful, or MBEDTLS_ERR_OID_NOT_FOUND
  */
-int mbedtls_oid_get_cipher_alg( const mbedtls_asn1_buf *oid, mbedtls_cipher_type_t *cipher_alg );
+int mbedtls_oid_get_cipher_alg(const mbedtls_asn1_buf *oid, mbedtls_cipher_type_t *cipher_alg);
 #endif /* MBEDTLS_CIPHER_C */
 
 #if defined(MBEDTLS_PKCS12_C)
@@ -596,8 +595,8 @@ int mbedtls_oid_get_cipher_alg( const mbedtls_asn1_buf *oid, mbedtls_cipher_type
  *
  * \return         0 if successful, or MBEDTLS_ERR_OID_NOT_FOUND
  */
-int mbedtls_oid_get_pkcs12_pbe_alg( const mbedtls_asn1_buf *oid, mbedtls_md_type_t *md_alg,
-                            mbedtls_cipher_type_t *cipher_alg );
+int mbedtls_oid_get_pkcs12_pbe_alg(const mbedtls_asn1_buf *oid, mbedtls_md_type_t *md_alg,
+                                   mbedtls_cipher_type_t *cipher_alg);
 #endif /* MBEDTLS_PKCS12_C */
 
 #ifdef __cplusplus
diff --git a/common/mbedtls/pem.c b/common/mbedtls/pem.c
index 3436d07ef..55d529547 100644
--- a/common/mbedtls/pem.c
+++ b/common/mbedtls/pem.c
@@ -48,9 +48,9 @@
 #endif
 
 #if defined(MBEDTLS_PEM_PARSE_C)
-void mbedtls_pem_init( mbedtls_pem_context *ctx )
+void mbedtls_pem_init(mbedtls_pem_context *ctx)
 {
-    memset( ctx, 0, sizeof( mbedtls_pem_context ) );
+    memset(ctx, 0, sizeof(mbedtls_pem_context));
 }
 
 #if defined(MBEDTLS_MD5_C) && defined(MBEDTLS_CIPHER_MODE_CBC) &&         \
@@ -58,141 +58,140 @@ void mbedtls_pem_init( mbedtls_pem_context *ctx )
 /*
  * Read a 16-byte hex string and convert it to binary
  */
-static int pem_get_iv( const unsigned char *s, unsigned char *iv,
-                       size_t iv_len )
+static int pem_get_iv(const unsigned char *s, unsigned char *iv,
+                      size_t iv_len)
 {
     size_t i, j, k;
 
-    memset( iv, 0, iv_len );
+    memset(iv, 0, iv_len);
 
-    for( i = 0; i < iv_len * 2; i++, s++ )
-    {
-        if( *s >= '0' && *s <= '9' ) j = *s - '0'; else
-        if( *s >= 'A' && *s <= 'F' ) j = *s - '7'; else
-        if( *s >= 'a' && *s <= 'f' ) j = *s - 'W'; else
-            return( MBEDTLS_ERR_PEM_INVALID_ENC_IV );
+    for (i = 0; i < iv_len * 2; i++, s++) {
+        if (*s >= '0' && *s <= '9') j = *s - '0';
+        else if (*s >= 'A' && *s <= 'F') j = *s - '7';
+        else if (*s >= 'a' && *s <= 'f') j = *s - 'W';
+        else
+            return (MBEDTLS_ERR_PEM_INVALID_ENC_IV);
 
-        k = ( ( i & 1 ) != 0 ) ? j : j << 4;
+        k = ((i & 1) != 0) ? j : j << 4;
 
-        iv[i >> 1] = (unsigned char)( iv[i >> 1] | k );
+        iv[i >> 1] = (unsigned char)(iv[i >> 1] | k);
     }
 
-    return( 0 );
+    return (0);
 }
 
-static int pem_pbkdf1( unsigned char *key, size_t keylen,
-                       unsigned char *iv,
-                       const unsigned char *pwd, size_t pwdlen )
+static int pem_pbkdf1(unsigned char *key, size_t keylen,
+                      unsigned char *iv,
+                      const unsigned char *pwd, size_t pwdlen)
 {
     mbedtls_md5_context md5_ctx;
     unsigned char md5sum[16];
     size_t use_len;
     int ret;
 
-    mbedtls_md5_init( &md5_ctx );
+    mbedtls_md5_init(&md5_ctx);
 
     /*
      * key[ 0..15] = MD5(pwd || IV)
      */
-    if( ( ret = mbedtls_md5_starts_ret( &md5_ctx ) ) != 0 )
+    if ((ret = mbedtls_md5_starts_ret(&md5_ctx)) != 0)
         goto exit;
-    if( ( ret = mbedtls_md5_update_ret( &md5_ctx, pwd, pwdlen ) ) != 0 )
+    if ((ret = mbedtls_md5_update_ret(&md5_ctx, pwd, pwdlen)) != 0)
         goto exit;
-    if( ( ret = mbedtls_md5_update_ret( &md5_ctx, iv,  8 ) ) != 0 )
+    if ((ret = mbedtls_md5_update_ret(&md5_ctx, iv,  8)) != 0)
         goto exit;
-    if( ( ret = mbedtls_md5_finish_ret( &md5_ctx, md5sum ) ) != 0 )
+    if ((ret = mbedtls_md5_finish_ret(&md5_ctx, md5sum)) != 0)
         goto exit;
 
-    if( keylen <= 16 )
-    {
-        memcpy( key, md5sum, keylen );
+    if (keylen <= 16) {
+        memcpy(key, md5sum, keylen);
         goto exit;
     }
 
-    memcpy( key, md5sum, 16 );
+    memcpy(key, md5sum, 16);
 
     /*
      * key[16..23] = MD5(key[ 0..15] || pwd || IV])
      */
-    if( ( ret = mbedtls_md5_starts_ret( &md5_ctx ) ) != 0 )
+    if ((ret = mbedtls_md5_starts_ret(&md5_ctx)) != 0)
         goto exit;
-    if( ( ret = mbedtls_md5_update_ret( &md5_ctx, md5sum, 16 ) ) != 0 )
+    if ((ret = mbedtls_md5_update_ret(&md5_ctx, md5sum, 16)) != 0)
         goto exit;
-    if( ( ret = mbedtls_md5_update_ret( &md5_ctx, pwd, pwdlen ) ) != 0 )
+    if ((ret = mbedtls_md5_update_ret(&md5_ctx, pwd, pwdlen)) != 0)
         goto exit;
-    if( ( ret = mbedtls_md5_update_ret( &md5_ctx, iv, 8 ) ) != 0 )
+    if ((ret = mbedtls_md5_update_ret(&md5_ctx, iv, 8)) != 0)
         goto exit;
-    if( ( ret = mbedtls_md5_finish_ret( &md5_ctx, md5sum ) ) != 0 )
+    if ((ret = mbedtls_md5_finish_ret(&md5_ctx, md5sum)) != 0)
         goto exit;
 
     use_len = 16;
-    if( keylen < 32 )
+    if (keylen < 32)
         use_len = keylen - 16;
 
-    memcpy( key + 16, md5sum, use_len );
+    memcpy(key + 16, md5sum, use_len);
 
 exit:
-    mbedtls_md5_free( &md5_ctx );
-    mbedtls_platform_zeroize( md5sum, 16 );
+    mbedtls_md5_free(&md5_ctx);
+    mbedtls_platform_zeroize(md5sum, 16);
 
-    return( ret );
+    return (ret);
 }
 
 #if defined(MBEDTLS_DES_C)
 /*
  * Decrypt with DES-CBC, using PBKDF1 for key derivation
  */
-static int pem_des_decrypt( unsigned char des_iv[8],
-                            unsigned char *buf, size_t buflen,
-                            const unsigned char *pwd, size_t pwdlen )
+static int pem_des_decrypt(unsigned char des_iv[8],
+                           unsigned char *buf, size_t buflen,
+                           const unsigned char *pwd, size_t pwdlen)
 {
     mbedtls_des_context des_ctx;
     unsigned char des_key[8];
     int ret;
 
-    mbedtls_des_init( &des_ctx );
+    mbedtls_des_init(&des_ctx);
 
-    if( ( ret = pem_pbkdf1( des_key, 8, des_iv, pwd, pwdlen ) ) != 0 )
+    if ((ret = pem_pbkdf1(des_key, 8, des_iv, pwd, pwdlen)) != 0)
         goto exit;
 
-    if( ( ret = mbedtls_des_setkey_dec( &des_ctx, des_key ) ) != 0 )
+    if ((ret = mbedtls_des_setkey_dec(&des_ctx, des_key)) != 0)
         goto exit;
-    ret = mbedtls_des_crypt_cbc( &des_ctx, MBEDTLS_DES_DECRYPT, buflen,
-                     des_iv, buf, buf );
+    ret = mbedtls_des_crypt_cbc(&des_ctx, MBEDTLS_DES_DECRYPT, buflen,
+                                des_iv, buf, buf);
 
 exit:
-    mbedtls_des_free( &des_ctx );
-    mbedtls_platform_zeroize( des_key, 8 );
+    mbedtls_des_free(&des_ctx);
+    mbedtls_platform_zeroize(des_key, 8);
 
-    return( ret );
+    return (ret);
 }
 
 /*
  * Decrypt with 3DES-CBC, using PBKDF1 for key derivation
  */
-static int pem_des3_decrypt( unsigned char des3_iv[8],
-                             unsigned char *buf, size_t buflen,
-                             const unsigned char *pwd, size_t pwdlen )
+static int pem_des3_decrypt(unsigned char des3_iv[8],
+                            unsigned char *buf, size_t buflen,
+                            const unsigned char *pwd, size_t pwdlen)
 {
     mbedtls_des3_context des3_ctx;
     unsigned char des3_key[24];
     int ret;
 
-    mbedtls_des3_init( &des3_ctx );
+    mbedtls_des3_init(&des3_ctx);
 
-    if( ( ret = pem_pbkdf1( des3_key, 24, des3_iv, pwd, pwdlen ) ) != 0 )
+    if ((ret = pem_pbkdf1(des3_key, 24, des3_iv, pwd, pwdlen)) != 0)
         goto exit;
 
-    if( ( ret = mbedtls_des3_set3key_dec( &des3_ctx, des3_key ) ) != 0 )
+    if ((ret = mbedtls_des3_set3key_dec(&des3_ctx, des3_key)) != 0)
         goto exit;
-    ret = mbedtls_des3_crypt_cbc( &des3_ctx, MBEDTLS_DES_DECRYPT, buflen,
-                     des3_iv, buf, buf );
+    ret = mbedtls_des3_crypt_cbc(&des3_ctx, MBEDTLS_DES_DECRYPT, buflen,
+                                 des3_iv, buf, buf);
 
 exit:
-    mbedtls_des3_free( &des3_ctx );
-    mbedtls_platform_zeroize( des3_key, 24 );
+    mbedtls_des3_free(&des3_ctx);
+    mbedtls_platform_zeroize(des3_key, 24);
 
-    return( ret );
+    return (ret);
 }
 #endif /* MBEDTLS_DES_C */
 
@@ -200,38 +199,38 @@ exit:
 /*
  * Decrypt with AES-XXX-CBC, using PBKDF1 for key derivation
  */
-static int pem_aes_decrypt( unsigned char aes_iv[16], unsigned int keylen,
-                            unsigned char *buf, size_t buflen,
-                            const unsigned char *pwd, size_t pwdlen )
+static int pem_aes_decrypt(unsigned char aes_iv[16], unsigned int keylen,
+                           unsigned char *buf, size_t buflen,
+                           const unsigned char *pwd, size_t pwdlen)
 {
     mbedtls_aes_context aes_ctx;
     unsigned char aes_key[32];
     int ret;
 
-    mbedtls_aes_init( &aes_ctx );
+    mbedtls_aes_init(&aes_ctx);
 
-    if( ( ret = pem_pbkdf1( aes_key, keylen, aes_iv, pwd, pwdlen ) ) != 0 )
+    if ((ret = pem_pbkdf1(aes_key, keylen, aes_iv, pwd, pwdlen)) != 0)
         goto exit;
 
-    if( ( ret = mbedtls_aes_setkey_dec( &aes_ctx, aes_key, keylen * 8 ) ) != 0 )
+    if ((ret = mbedtls_aes_setkey_dec(&aes_ctx, aes_key, keylen * 8)) != 0)
         goto exit;
-    ret = mbedtls_aes_crypt_cbc( &aes_ctx, MBEDTLS_AES_DECRYPT, buflen,
-                     aes_iv, buf, buf );
+    ret = mbedtls_aes_crypt_cbc(&aes_ctx, MBEDTLS_AES_DECRYPT, buflen,
+                                aes_iv, buf, buf);
 
 exit:
-    mbedtls_aes_free( &aes_ctx );
-    mbedtls_platform_zeroize( aes_key, keylen );
+    mbedtls_aes_free(&aes_ctx);
+    mbedtls_platform_zeroize(aes_key, keylen);
 
-    return( ret );
+    return (ret);
 }
 #endif /* MBEDTLS_AES_C */
 
 #endif /* MBEDTLS_MD5_C && MBEDTLS_CIPHER_MODE_CBC &&
           ( MBEDTLS_AES_C || MBEDTLS_DES_C ) */
 
-int mbedtls_pem_read_buffer( mbedtls_pem_context *ctx, const char *header, const char *footer,
-                     const unsigned char *data, const unsigned char *pwd,
-                     size_t pwdlen, size_t *use_len )
+int mbedtls_pem_read_buffer(mbedtls_pem_context *ctx, const char *header, const char *footer,
+                            const unsigned char *data, const unsigned char *pwd,
+                            size_t pwdlen, size_t *use_len)
 {
     int ret, enc;
     size_t len;
@@ -247,154 +246,145 @@ int mbedtls_pem_read_buffer( mbedtls_pem_context *ctx, const char *header, const
 #endif /* MBEDTLS_MD5_C && MBEDTLS_CIPHER_MODE_CBC &&
           ( MBEDTLS_AES_C || MBEDTLS_DES_C ) */
 
-    if( ctx == NULL )
-        return( MBEDTLS_ERR_PEM_BAD_INPUT_DATA );
+    if (ctx == NULL)
+        return (MBEDTLS_ERR_PEM_BAD_INPUT_DATA);
 
-    s1 = (unsigned char *) strstr( (const char *) data, header );
+    s1 = (unsigned char *) strstr((const char *) data, header);
 
-    if( s1 == NULL )
-        return( MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT );
+    if (s1 == NULL)
+        return (MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT);
 
-    s2 = (unsigned char *) strstr( (const char *) data, footer );
+    s2 = (unsigned char *) strstr((const char *) data, footer);
 
-    if( s2 == NULL || s2 <= s1 )
-        return( MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT );
+    if (s2 == NULL || s2 <= s1)
+        return (MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT);
 
-    s1 += strlen( header );
-    if( *s1 == ' '  ) s1++;
-    if( *s1 == '\r' ) s1++;
-    if( *s1 == '\n' ) s1++;
-    else return( MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT );
+    s1 += strlen(header);
+    if (*s1 == ' ') s1++;
+    if (*s1 == '\r') s1++;
+    if (*s1 == '\n') s1++;
+    else return (MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT);
 
     end = s2;
-    end += strlen( footer );
-    if( *end == ' '  ) end++;
-    if( *end == '\r' ) end++;
-    if( *end == '\n' ) end++;
+    end += strlen(footer);
+    if (*end == ' ') end++;
+    if (*end == '\r') end++;
+    if (*end == '\n') end++;
     *use_len = end - data;
 
     enc = 0;
 
-    if( s2 - s1 >= 22 && memcmp( s1, "Proc-Type: 4,ENCRYPTED", 22 ) == 0 )
-    {
+    if (s2 - s1 >= 22 && memcmp(s1, "Proc-Type: 4,ENCRYPTED", 22) == 0) {
 #if defined(MBEDTLS_MD5_C) && defined(MBEDTLS_CIPHER_MODE_CBC) &&         \
     ( defined(MBEDTLS_DES_C) || defined(MBEDTLS_AES_C) )
         enc++;
 
         s1 += 22;
-        if( *s1 == '\r' ) s1++;
-        if( *s1 == '\n' ) s1++;
-        else return( MBEDTLS_ERR_PEM_INVALID_DATA );
+        if (*s1 == '\r') s1++;
+        if (*s1 == '\n') s1++;
+        else return (MBEDTLS_ERR_PEM_INVALID_DATA);
 
 
 #if defined(MBEDTLS_DES_C)
-        if( s2 - s1 >= 23 && memcmp( s1, "DEK-Info: DES-EDE3-CBC,", 23 ) == 0 )
-        {
+        if (s2 - s1 >= 23 && memcmp(s1, "DEK-Info: DES-EDE3-CBC,", 23) == 0) {
             enc_alg = MBEDTLS_CIPHER_DES_EDE3_CBC;
 
             s1 += 23;
-            if( s2 - s1 < 16 || pem_get_iv( s1, pem_iv, 8 ) != 0 )
-                return( MBEDTLS_ERR_PEM_INVALID_ENC_IV );
+            if (s2 - s1 < 16 || pem_get_iv(s1, pem_iv, 8) != 0)
+                return (MBEDTLS_ERR_PEM_INVALID_ENC_IV);
 
             s1 += 16;
-        }
-        else if( s2 - s1 >= 18 && memcmp( s1, "DEK-Info: DES-CBC,", 18 ) == 0 )
-        {
+        } else if (s2 - s1 >= 18 && memcmp(s1, "DEK-Info: DES-CBC,", 18) == 0) {
             enc_alg = MBEDTLS_CIPHER_DES_CBC;
 
             s1 += 18;
-            if( s2 - s1 < 16 || pem_get_iv( s1, pem_iv, 8) != 0 )
-                return( MBEDTLS_ERR_PEM_INVALID_ENC_IV );
+            if (s2 - s1 < 16 || pem_get_iv(s1, pem_iv, 8) != 0)
+                return (MBEDTLS_ERR_PEM_INVALID_ENC_IV);
 
             s1 += 16;
         }
 #endif /* MBEDTLS_DES_C */
 
 #if defined(MBEDTLS_AES_C)
-        if( s2 - s1 >= 14 && memcmp( s1, "DEK-Info: AES-", 14 ) == 0 )
-        {
-            if( s2 - s1 < 22 )
-                return( MBEDTLS_ERR_PEM_UNKNOWN_ENC_ALG );
-            else if( memcmp( s1, "DEK-Info: AES-128-CBC,", 22 ) == 0 )
+        if (s2 - s1 >= 14 && memcmp(s1, "DEK-Info: AES-", 14) == 0) {
+            if (s2 - s1 < 22)
+                return (MBEDTLS_ERR_PEM_UNKNOWN_ENC_ALG);
+            else if (memcmp(s1, "DEK-Info: AES-128-CBC,", 22) == 0)
                 enc_alg = MBEDTLS_CIPHER_AES_128_CBC;
-            else if( memcmp( s1, "DEK-Info: AES-192-CBC,", 22 ) == 0 )
+            else if (memcmp(s1, "DEK-Info: AES-192-CBC,", 22) == 0)
                 enc_alg = MBEDTLS_CIPHER_AES_192_CBC;
-            else if( memcmp( s1, "DEK-Info: AES-256-CBC,", 22 ) == 0 )
+            else if (memcmp(s1, "DEK-Info: AES-256-CBC,", 22) == 0)
                 enc_alg = MBEDTLS_CIPHER_AES_256_CBC;
             else
-                return( MBEDTLS_ERR_PEM_UNKNOWN_ENC_ALG );
+                return (MBEDTLS_ERR_PEM_UNKNOWN_ENC_ALG);
 
             s1 += 22;
-            if( s2 - s1 < 32 || pem_get_iv( s1, pem_iv, 16 ) != 0 )
-                return( MBEDTLS_ERR_PEM_INVALID_ENC_IV );
+            if (s2 - s1 < 32 || pem_get_iv(s1, pem_iv, 16) != 0)
+                return (MBEDTLS_ERR_PEM_INVALID_ENC_IV);
 
             s1 += 32;
         }
 #endif /* MBEDTLS_AES_C */
 
-        if( enc_alg == MBEDTLS_CIPHER_NONE )
-            return( MBEDTLS_ERR_PEM_UNKNOWN_ENC_ALG );
+        if (enc_alg == MBEDTLS_CIPHER_NONE)
+            return (MBEDTLS_ERR_PEM_UNKNOWN_ENC_ALG);
 
-        if( *s1 == '\r' ) s1++;
-        if( *s1 == '\n' ) s1++;
-        else return( MBEDTLS_ERR_PEM_INVALID_DATA );
+        if (*s1 == '\r') s1++;
+        if (*s1 == '\n') s1++;
+        else return (MBEDTLS_ERR_PEM_INVALID_DATA);
 #else
-        return( MBEDTLS_ERR_PEM_FEATURE_UNAVAILABLE );
+        return (MBEDTLS_ERR_PEM_FEATURE_UNAVAILABLE);
 #endif /* MBEDTLS_MD5_C && MBEDTLS_CIPHER_MODE_CBC &&
           ( MBEDTLS_AES_C || MBEDTLS_DES_C ) */
     }
 
-    if( s1 >= s2 )
-        return( MBEDTLS_ERR_PEM_INVALID_DATA );
+    if (s1 >= s2)
+        return (MBEDTLS_ERR_PEM_INVALID_DATA);
 
-    ret = mbedtls_base64_decode( NULL, 0, &len, s1, s2 - s1 );
+    ret = mbedtls_base64_decode(NULL, 0, &len, s1, s2 - s1);
 
-    if( ret == MBEDTLS_ERR_BASE64_INVALID_CHARACTER )
-        return( MBEDTLS_ERR_PEM_INVALID_DATA + ret );
+    if (ret == MBEDTLS_ERR_BASE64_INVALID_CHARACTER)
+        return (MBEDTLS_ERR_PEM_INVALID_DATA + ret);
 
-    if( ( buf = mbedtls_calloc( 1, len ) ) == NULL )
-        return( MBEDTLS_ERR_PEM_ALLOC_FAILED );
+    if ((buf = mbedtls_calloc(1, len)) == NULL)
+        return (MBEDTLS_ERR_PEM_ALLOC_FAILED);
 
-    if( ( ret = mbedtls_base64_decode( buf, len, &len, s1, s2 - s1 ) ) != 0 )
-    {
-        mbedtls_platform_zeroize( buf, len );
-        mbedtls_free( buf );
-        return( MBEDTLS_ERR_PEM_INVALID_DATA + ret );
+    if ((ret = mbedtls_base64_decode(buf, len, &len, s1, s2 - s1)) != 0) {
+        mbedtls_platform_zeroize(buf, len);
+        mbedtls_free(buf);
+        return (MBEDTLS_ERR_PEM_INVALID_DATA + ret);
     }
 
-    if( enc != 0 )
-    {
+    if (enc != 0) {
 #if defined(MBEDTLS_MD5_C) && defined(MBEDTLS_CIPHER_MODE_CBC) &&         \
     ( defined(MBEDTLS_DES_C) || defined(MBEDTLS_AES_C) )
-        if( pwd == NULL )
-        {
-            mbedtls_platform_zeroize( buf, len );
-            mbedtls_free( buf );
-            return( MBEDTLS_ERR_PEM_PASSWORD_REQUIRED );
+        if (pwd == NULL) {
+            mbedtls_platform_zeroize(buf, len);
+            mbedtls_free(buf);
+            return (MBEDTLS_ERR_PEM_PASSWORD_REQUIRED);
         }
 
         ret = 0;
 
 #if defined(MBEDTLS_DES_C)
-        if( enc_alg == MBEDTLS_CIPHER_DES_EDE3_CBC )
-            ret = pem_des3_decrypt( pem_iv, buf, len, pwd, pwdlen );
-        else if( enc_alg == MBEDTLS_CIPHER_DES_CBC )
-            ret = pem_des_decrypt( pem_iv, buf, len, pwd, pwdlen );
+        if (enc_alg == MBEDTLS_CIPHER_DES_EDE3_CBC)
+            ret = pem_des3_decrypt(pem_iv, buf, len, pwd, pwdlen);
+        else if (enc_alg == MBEDTLS_CIPHER_DES_CBC)
+            ret = pem_des_decrypt(pem_iv, buf, len, pwd, pwdlen);
 #endif /* MBEDTLS_DES_C */
 
 #if defined(MBEDTLS_AES_C)
-        if( enc_alg == MBEDTLS_CIPHER_AES_128_CBC )
-            ret = pem_aes_decrypt( pem_iv, 16, buf, len, pwd, pwdlen );
-        else if( enc_alg == MBEDTLS_CIPHER_AES_192_CBC )
-            ret = pem_aes_decrypt( pem_iv, 24, buf, len, pwd, pwdlen );
-        else if( enc_alg == MBEDTLS_CIPHER_AES_256_CBC )
-            ret = pem_aes_decrypt( pem_iv, 32, buf, len, pwd, pwdlen );
+        if (enc_alg == MBEDTLS_CIPHER_AES_128_CBC)
+            ret = pem_aes_decrypt(pem_iv, 16, buf, len, pwd, pwdlen);
+        else if (enc_alg == MBEDTLS_CIPHER_AES_192_CBC)
+            ret = pem_aes_decrypt(pem_iv, 24, buf, len, pwd, pwdlen);
+        else if (enc_alg == MBEDTLS_CIPHER_AES_256_CBC)
+            ret = pem_aes_decrypt(pem_iv, 32, buf, len, pwd, pwdlen);
 #endif /* MBEDTLS_AES_C */
 
-        if( ret != 0 )
-        {
-            mbedtls_free( buf );
-            return( ret );
+        if (ret != 0) {
+            mbedtls_free(buf);
+            return (ret);
         }
 
         /*
@@ -403,16 +393,15 @@ int mbedtls_pem_read_buffer( mbedtls_pem_context *ctx, const char *header, const
          *
          * Use that as a heuristic to try to detect password mismatches.
          */
-        if( len <= 2 || buf[0] != 0x30 || buf[1] > 0x83 )
-        {
-            mbedtls_platform_zeroize( buf, len );
-            mbedtls_free( buf );
-            return( MBEDTLS_ERR_PEM_PASSWORD_MISMATCH );
+        if (len <= 2 || buf[0] != 0x30 || buf[1] > 0x83) {
+            mbedtls_platform_zeroize(buf, len);
+            mbedtls_free(buf);
+            return (MBEDTLS_ERR_PEM_PASSWORD_MISMATCH);
         }
 #else
-        mbedtls_platform_zeroize( buf, len );
-        mbedtls_free( buf );
-        return( MBEDTLS_ERR_PEM_FEATURE_UNAVAILABLE );
+        mbedtls_platform_zeroize(buf, len);
+        mbedtls_free(buf);
+        return (MBEDTLS_ERR_PEM_FEATURE_UNAVAILABLE);
 #endif /* MBEDTLS_MD5_C && MBEDTLS_CIPHER_MODE_CBC &&
           ( MBEDTLS_AES_C || MBEDTLS_DES_C ) */
     }
@@ -420,71 +409,68 @@ int mbedtls_pem_read_buffer( mbedtls_pem_context *ctx, const char *header, const
     ctx->buf = buf;
     ctx->buflen = len;
 
-    return( 0 );
+    return (0);
 }
 
-void mbedtls_pem_free( mbedtls_pem_context *ctx )
+void mbedtls_pem_free(mbedtls_pem_context *ctx)
 {
-    if( ctx->buf != NULL )
-        mbedtls_platform_zeroize( ctx->buf, ctx->buflen );
-    mbedtls_free( ctx->buf );
-    mbedtls_free( ctx->info );
+    if (ctx->buf != NULL)
+        mbedtls_platform_zeroize(ctx->buf, ctx->buflen);
+    mbedtls_free(ctx->buf);
+    mbedtls_free(ctx->info);
 
-    mbedtls_platform_zeroize( ctx, sizeof( mbedtls_pem_context ) );
+    mbedtls_platform_zeroize(ctx, sizeof(mbedtls_pem_context));
 }
 #endif /* MBEDTLS_PEM_PARSE_C */
 
 #if defined(MBEDTLS_PEM_WRITE_C)
-int mbedtls_pem_write_buffer( const char *header, const char *footer,
-                      const unsigned char *der_data, size_t der_len,
-                      unsigned char *buf, size_t buf_len, size_t *olen )
+int mbedtls_pem_write_buffer(const char *header, const char *footer,
+                             const unsigned char *der_data, size_t der_len,
+                             unsigned char *buf, size_t buf_len, size_t *olen)
 {
     int ret;
     unsigned char *encode_buf = NULL, *c, *p = buf;
     size_t len = 0, use_len, add_len = 0;
 
-    mbedtls_base64_encode( NULL, 0, &use_len, der_data, der_len );
-    add_len = strlen( header ) + strlen( footer ) + ( use_len / 64 ) + 1;
+    mbedtls_base64_encode(NULL, 0, &use_len, der_data, der_len);
+    add_len = strlen(header) + strlen(footer) + (use_len / 64) + 1;
 
-    if( use_len + add_len > buf_len )
-    {
+    if (use_len + add_len > buf_len) {
         *olen = use_len + add_len;
-        return( MBEDTLS_ERR_BASE64_BUFFER_TOO_SMALL );
+        return (MBEDTLS_ERR_BASE64_BUFFER_TOO_SMALL);
     }
 
-    if( use_len != 0 &&
-        ( ( encode_buf = mbedtls_calloc( 1, use_len ) ) == NULL ) )
-        return( MBEDTLS_ERR_PEM_ALLOC_FAILED );
+    if (use_len != 0 &&
+        ((encode_buf = mbedtls_calloc(1, use_len)) == NULL))
+        return (MBEDTLS_ERR_PEM_ALLOC_FAILED);
 
-    if( ( ret = mbedtls_base64_encode( encode_buf, use_len, &use_len, der_data,
-                               der_len ) ) != 0 )
-    {
-        mbedtls_free( encode_buf );
-        return( ret );
+    if ((ret = mbedtls_base64_encode(encode_buf, use_len, &use_len, der_data,
+                                     der_len)) != 0) {
+        mbedtls_free(encode_buf);
+        return (ret);
     }
 
-    memcpy( p, header, strlen( header ) );
-    p += strlen( header );
+    memcpy(p, header, strlen(header));
+    p += strlen(header);
     c = encode_buf;
 
-    while( use_len )
-    {
-        len = ( use_len > 64 ) ? 64 : use_len;
-        memcpy( p, c, len );
+    while (use_len) {
+        len = (use_len > 64) ? 64 : use_len;
+        memcpy(p, c, len);
         use_len -= len;
         p += len;
         c += len;
         *p++ = '\n';
     }
 
-    memcpy( p, footer, strlen( footer ) );
-    p += strlen( footer );
+    memcpy(p, footer, strlen(footer));
+    p += strlen(footer);
 
     *p++ = '\0';
     *olen = p - buf;
 
-    mbedtls_free( encode_buf );
-    return( 0 );
+    mbedtls_free(encode_buf);
+    return (0);
 }
 #endif /* MBEDTLS_PEM_WRITE_C */
 #endif /* MBEDTLS_PEM_PARSE_C || MBEDTLS_PEM_WRITE_C */
diff --git a/common/mbedtls/pem.h b/common/mbedtls/pem.h
index c0e5e025c..14ffefa31 100644
--- a/common/mbedtls/pem.h
+++ b/common/mbedtls/pem.h
@@ -53,8 +53,7 @@ extern "C" {
 /**
  * \brief       PEM context structure
  */
-typedef struct mbedtls_pem_context
-{
+typedef struct mbedtls_pem_context {
     unsigned char *buf;     /*!< buffer for decoded data             */
     size_t buflen;          /*!< length of the buffer                */
     unsigned char *info;    /*!< buffer for extra header information */
@@ -66,7 +65,7 @@ mbedtls_pem_context;
  *
  * \param ctx   context to be initialized
  */
-void mbedtls_pem_init( mbedtls_pem_context *ctx );
+void mbedtls_pem_init(mbedtls_pem_context *ctx);
 
 /**
  * \brief       Read a buffer for PEM information and store the resulting
@@ -90,17 +89,17 @@ void mbedtls_pem_init( mbedtls_pem_context *ctx );
  *
  * \return          0 on success, or a specific PEM error code
  */
-int mbedtls_pem_read_buffer( mbedtls_pem_context *ctx, const char *header, const char *footer,
-                     const unsigned char *data,
-                     const unsigned char *pwd,
-                     size_t pwdlen, size_t *use_len );
+int mbedtls_pem_read_buffer(mbedtls_pem_context *ctx, const char *header, const char *footer,
+                            const unsigned char *data,
+                            const unsigned char *pwd,
+                            size_t pwdlen, size_t *use_len);
 
 /**
  * \brief       PEM context memory freeing
  *
  * \param ctx   context to be freed
  */
-void mbedtls_pem_free( mbedtls_pem_context *ctx );
+void mbedtls_pem_free(mbedtls_pem_context *ctx);
 #endif /* MBEDTLS_PEM_PARSE_C */
 
 #if defined(MBEDTLS_PEM_WRITE_C)
@@ -120,9 +119,9 @@ void mbedtls_pem_free( mbedtls_pem_context *ctx );
  *                  MBEDTLS_ERR_BASE64_BUFFER_TOO_SMALL olen is the required
  *                  size.
  */
-int mbedtls_pem_write_buffer( const char *header, const char *footer,
-                      const unsigned char *der_data, size_t der_len,
-                      unsigned char *buf, size_t buf_len, size_t *olen );
+int mbedtls_pem_write_buffer(const char *header, const char *footer,
+                             const unsigned char *der_data, size_t der_len,
+                             unsigned char *buf, size_t buf_len, size_t *olen);
 #endif /* MBEDTLS_PEM_WRITE_C */
 
 #ifdef __cplusplus
diff --git a/common/mbedtls/pk.c b/common/mbedtls/pk.c
index 784b66963..72887d9ce 100644
--- a/common/mbedtls/pk.c
+++ b/common/mbedtls/pk.c
@@ -49,9 +49,9 @@
 /*
  * Initialise a mbedtls_pk_context
  */
-void mbedtls_pk_init( mbedtls_pk_context *ctx )
+void mbedtls_pk_init(mbedtls_pk_context *ctx)
 {
-    if( ctx == NULL )
+    if (ctx == NULL)
         return;
 
     ctx->pk_info = NULL;
@@ -61,75 +61,75 @@ void mbedtls_pk_init( mbedtls_pk_context *ctx )
 /*
  * Free (the components of) a mbedtls_pk_context
  */
-void mbedtls_pk_free( mbedtls_pk_context *ctx )
+void mbedtls_pk_free(mbedtls_pk_context *ctx)
 {
-    if( ctx == NULL || ctx->pk_info == NULL )
+    if (ctx == NULL || ctx->pk_info == NULL)
         return;
 
-    ctx->pk_info->ctx_free_func( ctx->pk_ctx );
+    ctx->pk_info->ctx_free_func(ctx->pk_ctx);
 
-    mbedtls_platform_zeroize( ctx, sizeof( mbedtls_pk_context ) );
+    mbedtls_platform_zeroize(ctx, sizeof(mbedtls_pk_context));
 }
 
 /*
  * Get pk_info structure from type
  */
-const mbedtls_pk_info_t * mbedtls_pk_info_from_type( mbedtls_pk_type_t pk_type )
+const mbedtls_pk_info_t *mbedtls_pk_info_from_type(mbedtls_pk_type_t pk_type)
 {
-    switch( pk_type ) {
+    switch (pk_type) {
 #if defined(MBEDTLS_RSA_C)
         case MBEDTLS_PK_RSA:
-            return( &mbedtls_rsa_info );
+            return (&mbedtls_rsa_info);
 #endif
 #if defined(MBEDTLS_ECP_C)
         case MBEDTLS_PK_ECKEY:
-            return( &mbedtls_eckey_info );
+            return (&mbedtls_eckey_info);
         case MBEDTLS_PK_ECKEY_DH:
-            return( &mbedtls_eckeydh_info );
+            return (&mbedtls_eckeydh_info);
 #endif
 #if defined(MBEDTLS_ECDSA_C)
         case MBEDTLS_PK_ECDSA:
-            return( &mbedtls_ecdsa_info );
+            return (&mbedtls_ecdsa_info);
 #endif
         /* MBEDTLS_PK_RSA_ALT omitted on purpose */
         default:
-            return( NULL );
+            return (NULL);
     }
 }
 
 /*
  * Initialise context
  */
-int mbedtls_pk_setup( mbedtls_pk_context *ctx, const mbedtls_pk_info_t *info )
+int mbedtls_pk_setup(mbedtls_pk_context *ctx, const mbedtls_pk_info_t *info)
 {
-    if( ctx == NULL || info == NULL || ctx->pk_info != NULL )
-        return( MBEDTLS_ERR_PK_BAD_INPUT_DATA );
+    if (ctx == NULL || info == NULL || ctx->pk_info != NULL)
+        return (MBEDTLS_ERR_PK_BAD_INPUT_DATA);
 
-    if( ( ctx->pk_ctx = info->ctx_alloc_func() ) == NULL )
-        return( MBEDTLS_ERR_PK_ALLOC_FAILED );
+    if ((ctx->pk_ctx = info->ctx_alloc_func()) == NULL)
+        return (MBEDTLS_ERR_PK_ALLOC_FAILED);
 
     ctx->pk_info = info;
 
-    return( 0 );
+    return (0);
 }
 
 #if defined(MBEDTLS_PK_RSA_ALT_SUPPORT)
 /*
  * Initialize an RSA-alt context
  */
-int mbedtls_pk_setup_rsa_alt( mbedtls_pk_context *ctx, void * key,
-                         mbedtls_pk_rsa_alt_decrypt_func decrypt_func,
-                         mbedtls_pk_rsa_alt_sign_func sign_func,
-                         mbedtls_pk_rsa_alt_key_len_func key_len_func )
+int mbedtls_pk_setup_rsa_alt(mbedtls_pk_context *ctx, void *key,
+                             mbedtls_pk_rsa_alt_decrypt_func decrypt_func,
+                             mbedtls_pk_rsa_alt_sign_func sign_func,
+                             mbedtls_pk_rsa_alt_key_len_func key_len_func)
 {
     mbedtls_rsa_alt_context *rsa_alt;
     const mbedtls_pk_info_t *info = &mbedtls_rsa_alt_info;
 
-    if( ctx == NULL || ctx->pk_info != NULL )
-        return( MBEDTLS_ERR_PK_BAD_INPUT_DATA );
+    if (ctx == NULL || ctx->pk_info != NULL)
+        return (MBEDTLS_ERR_PK_BAD_INPUT_DATA);
 
-    if( ( ctx->pk_ctx = info->ctx_alloc_func() ) == NULL )
-        return( MBEDTLS_ERR_PK_ALLOC_FAILED );
+    if ((ctx->pk_ctx = info->ctx_alloc_func()) == NULL)
+        return (MBEDTLS_ERR_PK_ALLOC_FAILED);
 
     ctx->pk_info = info;
 
@@ -140,242 +140,237 @@ int mbedtls_pk_setup_rsa_alt( mbedtls_pk_context *ctx, void * key,
     rsa_alt->sign_func = sign_func;
     rsa_alt->key_len_func = key_len_func;
 
-    return( 0 );
+    return (0);
 }
 #endif /* MBEDTLS_PK_RSA_ALT_SUPPORT */
 
 /*
  * Tell if a PK can do the operations of the given type
  */
-int mbedtls_pk_can_do( const mbedtls_pk_context *ctx, mbedtls_pk_type_t type )
+int mbedtls_pk_can_do(const mbedtls_pk_context *ctx, mbedtls_pk_type_t type)
 {
     /* null or NONE context can't do anything */
-    if( ctx == NULL || ctx->pk_info == NULL )
-        return( 0 );
+    if (ctx == NULL || ctx->pk_info == NULL)
+        return (0);
 
-    return( ctx->pk_info->can_do( type ) );
+    return (ctx->pk_info->can_do(type));
 }
 
 /*
  * Helper for mbedtls_pk_sign and mbedtls_pk_verify
  */
-static inline int pk_hashlen_helper( mbedtls_md_type_t md_alg, size_t *hash_len )
+static inline int pk_hashlen_helper(mbedtls_md_type_t md_alg, size_t *hash_len)
 {
     const mbedtls_md_info_t *md_info;
 
-    if( *hash_len != 0 )
-        return( 0 );
+    if (*hash_len != 0)
+        return (0);
 
-    if( ( md_info = mbedtls_md_info_from_type( md_alg ) ) == NULL )
-        return( -1 );
+    if ((md_info = mbedtls_md_info_from_type(md_alg)) == NULL)
+        return (-1);
 
-    *hash_len = mbedtls_md_get_size( md_info );
-    return( 0 );
+    *hash_len = mbedtls_md_get_size(md_info);
+    return (0);
 }
 
 /*
  * Verify a signature
  */
-int mbedtls_pk_verify( mbedtls_pk_context *ctx, mbedtls_md_type_t md_alg,
-               const unsigned char *hash, size_t hash_len,
-               const unsigned char *sig, size_t sig_len )
+int mbedtls_pk_verify(mbedtls_pk_context *ctx, mbedtls_md_type_t md_alg,
+                      const unsigned char *hash, size_t hash_len,
+                      const unsigned char *sig, size_t sig_len)
 {
-    if( ctx == NULL || ctx->pk_info == NULL ||
-        pk_hashlen_helper( md_alg, &hash_len ) != 0 )
-        return( MBEDTLS_ERR_PK_BAD_INPUT_DATA );
+    if (ctx == NULL || ctx->pk_info == NULL ||
+        pk_hashlen_helper(md_alg, &hash_len) != 0)
+        return (MBEDTLS_ERR_PK_BAD_INPUT_DATA);
 
-    if( ctx->pk_info->verify_func == NULL )
-        return( MBEDTLS_ERR_PK_TYPE_MISMATCH );
+    if (ctx->pk_info->verify_func == NULL)
+        return (MBEDTLS_ERR_PK_TYPE_MISMATCH);
 
-    return( ctx->pk_info->verify_func( ctx->pk_ctx, md_alg, hash, hash_len,
-                                       sig, sig_len ) );
+    return (ctx->pk_info->verify_func(ctx->pk_ctx, md_alg, hash, hash_len,
+                                      sig, sig_len));
 }
 
 /*
  * Verify a signature with options
  */
-int mbedtls_pk_verify_ext( mbedtls_pk_type_t type, const void *options,
-                   mbedtls_pk_context *ctx, mbedtls_md_type_t md_alg,
-                   const unsigned char *hash, size_t hash_len,
-                   const unsigned char *sig, size_t sig_len )
+int mbedtls_pk_verify_ext(mbedtls_pk_type_t type, const void *options,
+                          mbedtls_pk_context *ctx, mbedtls_md_type_t md_alg,
+                          const unsigned char *hash, size_t hash_len,
+                          const unsigned char *sig, size_t sig_len)
 {
-    if( ctx == NULL || ctx->pk_info == NULL )
-        return( MBEDTLS_ERR_PK_BAD_INPUT_DATA );
+    if (ctx == NULL || ctx->pk_info == NULL)
+        return (MBEDTLS_ERR_PK_BAD_INPUT_DATA);
 
-    if( ! mbedtls_pk_can_do( ctx, type ) )
-        return( MBEDTLS_ERR_PK_TYPE_MISMATCH );
+    if (! mbedtls_pk_can_do(ctx, type))
+        return (MBEDTLS_ERR_PK_TYPE_MISMATCH);
 
-    if( type == MBEDTLS_PK_RSASSA_PSS )
-    {
+    if (type == MBEDTLS_PK_RSASSA_PSS) {
 #if defined(MBEDTLS_RSA_C) && defined(MBEDTLS_PKCS1_V21)
         int ret;
         const mbedtls_pk_rsassa_pss_options *pss_opts;
 
 #if SIZE_MAX > UINT_MAX
-        if( md_alg == MBEDTLS_MD_NONE && UINT_MAX < hash_len )
-            return( MBEDTLS_ERR_PK_BAD_INPUT_DATA );
+        if (md_alg == MBEDTLS_MD_NONE && UINT_MAX < hash_len)
+            return (MBEDTLS_ERR_PK_BAD_INPUT_DATA);
 #endif /* SIZE_MAX > UINT_MAX */
 
-        if( options == NULL )
-            return( MBEDTLS_ERR_PK_BAD_INPUT_DATA );
+        if (options == NULL)
+            return (MBEDTLS_ERR_PK_BAD_INPUT_DATA);
 
         pss_opts = (const mbedtls_pk_rsassa_pss_options *) options;
 
-        if( sig_len < mbedtls_pk_get_len( ctx ) )
-            return( MBEDTLS_ERR_RSA_VERIFY_FAILED );
+        if (sig_len < mbedtls_pk_get_len(ctx))
+            return (MBEDTLS_ERR_RSA_VERIFY_FAILED);
 
-        ret = mbedtls_rsa_rsassa_pss_verify_ext( mbedtls_pk_rsa( *ctx ),
-                NULL, NULL, MBEDTLS_RSA_PUBLIC,
-                md_alg, (unsigned int) hash_len, hash,
-                pss_opts->mgf1_hash_id,
-                pss_opts->expected_salt_len,
-                sig );
-        if( ret != 0 )
-            return( ret );
+        ret = mbedtls_rsa_rsassa_pss_verify_ext(mbedtls_pk_rsa(*ctx),
+                                                NULL, NULL, MBEDTLS_RSA_PUBLIC,
+                                                md_alg, (unsigned int) hash_len, hash,
+                                                pss_opts->mgf1_hash_id,
+                                                pss_opts->expected_salt_len,
+                                                sig);
+        if (ret != 0)
+            return (ret);
 
-        if( sig_len > mbedtls_pk_get_len( ctx ) )
-            return( MBEDTLS_ERR_PK_SIG_LEN_MISMATCH );
+        if (sig_len > mbedtls_pk_get_len(ctx))
+            return (MBEDTLS_ERR_PK_SIG_LEN_MISMATCH);
 
-        return( 0 );
+        return (0);
 #else
-        return( MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE );
+        return (MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE);
 #endif /* MBEDTLS_RSA_C && MBEDTLS_PKCS1_V21 */
     }
 
     /* General case: no options */
-    if( options != NULL )
-        return( MBEDTLS_ERR_PK_BAD_INPUT_DATA );
+    if (options != NULL)
+        return (MBEDTLS_ERR_PK_BAD_INPUT_DATA);
 
-    return( mbedtls_pk_verify( ctx, md_alg, hash, hash_len, sig, sig_len ) );
+    return (mbedtls_pk_verify(ctx, md_alg, hash, hash_len, sig, sig_len));
 }
 
 /*
  * Make a signature
  */
-int mbedtls_pk_sign( mbedtls_pk_context *ctx, mbedtls_md_type_t md_alg,
-             const unsigned char *hash, size_t hash_len,
-             unsigned char *sig, size_t *sig_len,
-             int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
+int mbedtls_pk_sign(mbedtls_pk_context *ctx, mbedtls_md_type_t md_alg,
+                    const unsigned char *hash, size_t hash_len,
+                    unsigned char *sig, size_t *sig_len,
+                    int (*f_rng)(void *, unsigned char *, size_t), void *p_rng)
 {
-    if( ctx == NULL || ctx->pk_info == NULL ||
-        pk_hashlen_helper( md_alg, &hash_len ) != 0 )
-        return( MBEDTLS_ERR_PK_BAD_INPUT_DATA );
+    if (ctx == NULL || ctx->pk_info == NULL ||
+        pk_hashlen_helper(md_alg, &hash_len) != 0)
+        return (MBEDTLS_ERR_PK_BAD_INPUT_DATA);
 
-    if( ctx->pk_info->sign_func == NULL )
-        return( MBEDTLS_ERR_PK_TYPE_MISMATCH );
+    if (ctx->pk_info->sign_func == NULL)
+        return (MBEDTLS_ERR_PK_TYPE_MISMATCH);
 
-    return( ctx->pk_info->sign_func( ctx->pk_ctx, md_alg, hash, hash_len,
-                                     sig, sig_len, f_rng, p_rng ) );
+    return (ctx->pk_info->sign_func(ctx->pk_ctx, md_alg, hash, hash_len,
+                                    sig, sig_len, f_rng, p_rng));
 }
 
 /*
  * Decrypt message
  */
-int mbedtls_pk_decrypt( mbedtls_pk_context *ctx,
-                const unsigned char *input, size_t ilen,
-                unsigned char *output, size_t *olen, size_t osize,
-                int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
+int mbedtls_pk_decrypt(mbedtls_pk_context *ctx,
+                       const unsigned char *input, size_t ilen,
+                       unsigned char *output, size_t *olen, size_t osize,
+                       int (*f_rng)(void *, unsigned char *, size_t), void *p_rng)
 {
-    if( ctx == NULL || ctx->pk_info == NULL )
-        return( MBEDTLS_ERR_PK_BAD_INPUT_DATA );
+    if (ctx == NULL || ctx->pk_info == NULL)
+        return (MBEDTLS_ERR_PK_BAD_INPUT_DATA);
 
-    if( ctx->pk_info->decrypt_func == NULL )
-        return( MBEDTLS_ERR_PK_TYPE_MISMATCH );
+    if (ctx->pk_info->decrypt_func == NULL)
+        return (MBEDTLS_ERR_PK_TYPE_MISMATCH);
 
-    return( ctx->pk_info->decrypt_func( ctx->pk_ctx, input, ilen,
-                output, olen, osize, f_rng, p_rng ) );
+    return (ctx->pk_info->decrypt_func(ctx->pk_ctx, input, ilen,
+                                       output, olen, osize, f_rng, p_rng));
 }
 
 /*
  * Encrypt message
  */
-int mbedtls_pk_encrypt( mbedtls_pk_context *ctx,
-                const unsigned char *input, size_t ilen,
-                unsigned char *output, size_t *olen, size_t osize,
-                int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
+int mbedtls_pk_encrypt(mbedtls_pk_context *ctx,
+                       const unsigned char *input, size_t ilen,
+                       unsigned char *output, size_t *olen, size_t osize,
+                       int (*f_rng)(void *, unsigned char *, size_t), void *p_rng)
 {
-    if( ctx == NULL || ctx->pk_info == NULL )
-        return( MBEDTLS_ERR_PK_BAD_INPUT_DATA );
+    if (ctx == NULL || ctx->pk_info == NULL)
+        return (MBEDTLS_ERR_PK_BAD_INPUT_DATA);
 
-    if( ctx->pk_info->encrypt_func == NULL )
-        return( MBEDTLS_ERR_PK_TYPE_MISMATCH );
+    if (ctx->pk_info->encrypt_func == NULL)
+        return (MBEDTLS_ERR_PK_TYPE_MISMATCH);
 
-    return( ctx->pk_info->encrypt_func( ctx->pk_ctx, input, ilen,
-                output, olen, osize, f_rng, p_rng ) );
+    return (ctx->pk_info->encrypt_func(ctx->pk_ctx, input, ilen,
+                                       output, olen, osize, f_rng, p_rng));
 }
 
 /*
  * Check public-private key pair
  */
-int mbedtls_pk_check_pair( const mbedtls_pk_context *pub, const mbedtls_pk_context *prv )
+int mbedtls_pk_check_pair(const mbedtls_pk_context *pub, const mbedtls_pk_context *prv)
 {
-    if( pub == NULL || pub->pk_info == NULL ||
+    if (pub == NULL || pub->pk_info == NULL ||
         prv == NULL || prv->pk_info == NULL ||
-        prv->pk_info->check_pair_func == NULL )
-    {
-        return( MBEDTLS_ERR_PK_BAD_INPUT_DATA );
+        prv->pk_info->check_pair_func == NULL) {
+        return (MBEDTLS_ERR_PK_BAD_INPUT_DATA);
     }
 
-    if( prv->pk_info->type == MBEDTLS_PK_RSA_ALT )
-    {
-        if( pub->pk_info->type != MBEDTLS_PK_RSA )
-            return( MBEDTLS_ERR_PK_TYPE_MISMATCH );
-    }
-    else
-    {
-        if( pub->pk_info != prv->pk_info )
-            return( MBEDTLS_ERR_PK_TYPE_MISMATCH );
+    if (prv->pk_info->type == MBEDTLS_PK_RSA_ALT) {
+        if (pub->pk_info->type != MBEDTLS_PK_RSA)
+            return (MBEDTLS_ERR_PK_TYPE_MISMATCH);
+    } else {
+        if (pub->pk_info != prv->pk_info)
+            return (MBEDTLS_ERR_PK_TYPE_MISMATCH);
     }
 
-    return( prv->pk_info->check_pair_func( pub->pk_ctx, prv->pk_ctx ) );
+    return (prv->pk_info->check_pair_func(pub->pk_ctx, prv->pk_ctx));
 }
 
 /*
  * Get key size in bits
  */
-size_t mbedtls_pk_get_bitlen( const mbedtls_pk_context *ctx )
+size_t mbedtls_pk_get_bitlen(const mbedtls_pk_context *ctx)
 {
-    if( ctx == NULL || ctx->pk_info == NULL )
-        return( 0 );
+    if (ctx == NULL || ctx->pk_info == NULL)
+        return (0);
 
-    return( ctx->pk_info->get_bitlen( ctx->pk_ctx ) );
+    return (ctx->pk_info->get_bitlen(ctx->pk_ctx));
 }
 
 /*
  * Export debug information
  */
-int mbedtls_pk_debug( const mbedtls_pk_context *ctx, mbedtls_pk_debug_item *items )
+int mbedtls_pk_debug(const mbedtls_pk_context *ctx, mbedtls_pk_debug_item *items)
 {
-    if( ctx == NULL || ctx->pk_info == NULL )
-        return( MBEDTLS_ERR_PK_BAD_INPUT_DATA );
+    if (ctx == NULL || ctx->pk_info == NULL)
+        return (MBEDTLS_ERR_PK_BAD_INPUT_DATA);
 
-    if( ctx->pk_info->debug_func == NULL )
-        return( MBEDTLS_ERR_PK_TYPE_MISMATCH );
+    if (ctx->pk_info->debug_func == NULL)
+        return (MBEDTLS_ERR_PK_TYPE_MISMATCH);
 
-    ctx->pk_info->debug_func( ctx->pk_ctx, items );
-    return( 0 );
+    ctx->pk_info->debug_func(ctx->pk_ctx, items);
+    return (0);
 }
 
 /*
  * Access the PK type name
  */
-const char *mbedtls_pk_get_name( const mbedtls_pk_context *ctx )
+const char *mbedtls_pk_get_name(const mbedtls_pk_context *ctx)
 {
-    if( ctx == NULL || ctx->pk_info == NULL )
-        return( "invalid PK" );
+    if (ctx == NULL || ctx->pk_info == NULL)
+        return ("invalid PK");
 
-    return( ctx->pk_info->name );
+    return (ctx->pk_info->name);
 }
 
 /*
  * Access the PK type
  */
-mbedtls_pk_type_t mbedtls_pk_get_type( const mbedtls_pk_context *ctx )
+mbedtls_pk_type_t mbedtls_pk_get_type(const mbedtls_pk_context *ctx)
 {
-    if( ctx == NULL || ctx->pk_info == NULL )
-        return( MBEDTLS_PK_NONE );
+    if (ctx == NULL || ctx->pk_info == NULL)
+        return (MBEDTLS_PK_NONE);
 
-    return( ctx->pk_info->type );
+    return (ctx->pk_info->type);
 }
 
 #endif /* MBEDTLS_PK_C */
diff --git a/common/mbedtls/pk.h b/common/mbedtls/pk.h
index f75dc2f8d..3b5de00f2 100644
--- a/common/mbedtls/pk.h
+++ b/common/mbedtls/pk.h
@@ -76,7 +76,7 @@ extern "C" {
  * \brief          Public key types
  */
 typedef enum {
-    MBEDTLS_PK_NONE=0,
+    MBEDTLS_PK_NONE = 0,
     MBEDTLS_PK_RSA,
     MBEDTLS_PK_ECKEY,
     MBEDTLS_PK_ECKEY_DH,
@@ -89,8 +89,7 @@ typedef enum {
  * \brief           Options for RSASSA-PSS signature verification.
  *                  See \c mbedtls_rsa_rsassa_pss_verify_ext()
  */
-typedef struct mbedtls_pk_rsassa_pss_options
-{
+typedef struct mbedtls_pk_rsassa_pss_options {
     mbedtls_md_type_t mgf1_hash_id;
     int expected_salt_len;
 
@@ -99,8 +98,7 @@ typedef struct mbedtls_pk_rsassa_pss_options
 /**
  * \brief           Types for interfacing with the debug module
  */
-typedef enum
-{
+typedef enum {
     MBEDTLS_PK_DEBUG_NONE = 0,
     MBEDTLS_PK_DEBUG_MPI,
     MBEDTLS_PK_DEBUG_ECP,
@@ -109,8 +107,7 @@ typedef enum
 /**
  * \brief           Item to send to the debug module
  */
-typedef struct mbedtls_pk_debug_item
-{
+typedef struct mbedtls_pk_debug_item {
     mbedtls_pk_debug_type type;
     const char *name;
     void *value;
@@ -127,10 +124,9 @@ typedef struct mbedtls_pk_info_t mbedtls_pk_info_t;
 /**
  * \brief           Public key container
  */
-typedef struct mbedtls_pk_context
-{
-    const mbedtls_pk_info_t *   pk_info; /**< Public key informations        */
-    void *                      pk_ctx;  /**< Underlying public key context  */
+typedef struct mbedtls_pk_context {
+    const mbedtls_pk_info_t    *pk_info; /**< Public key informations        */
+    void                       *pk_ctx;  /**< Underlying public key context  */
 } mbedtls_pk_context;
 
 #if defined(MBEDTLS_RSA_C)
@@ -140,9 +136,9 @@ typedef struct mbedtls_pk_context
  * \warning You must make sure the PK context actually holds an RSA context
  * before using this function!
  */
-static inline mbedtls_rsa_context *mbedtls_pk_rsa( const mbedtls_pk_context pk )
+static inline mbedtls_rsa_context *mbedtls_pk_rsa(const mbedtls_pk_context pk)
 {
-    return( (mbedtls_rsa_context *) (pk).pk_ctx );
+    return ((mbedtls_rsa_context *)(pk).pk_ctx);
 }
 #endif /* MBEDTLS_RSA_C */
 
@@ -153,9 +149,9 @@ static inline mbedtls_rsa_context *mbedtls_pk_rsa( const mbedtls_pk_context pk )
  * \warning You must make sure the PK context actually holds an EC context
  * before using this function!
  */
-static inline mbedtls_ecp_keypair *mbedtls_pk_ec( const mbedtls_pk_context pk )
+static inline mbedtls_ecp_keypair *mbedtls_pk_ec(const mbedtls_pk_context pk)
 {
-    return( (mbedtls_ecp_keypair *) (pk).pk_ctx );
+    return ((mbedtls_ecp_keypair *)(pk).pk_ctx);
 }
 #endif /* MBEDTLS_ECP_C */
 
@@ -163,14 +159,14 @@ static inline mbedtls_ecp_keypair *mbedtls_pk_ec( const mbedtls_pk_context pk )
 /**
  * \brief           Types for RSA-alt abstraction
  */
-typedef int (*mbedtls_pk_rsa_alt_decrypt_func)( void *ctx, int mode, size_t *olen,
-                    const unsigned char *input, unsigned char *output,
-                    size_t output_max_len );
-typedef int (*mbedtls_pk_rsa_alt_sign_func)( void *ctx,
-                    int (*f_rng)(void *, unsigned char *, size_t), void *p_rng,
-                    int mode, mbedtls_md_type_t md_alg, unsigned int hashlen,
-                    const unsigned char *hash, unsigned char *sig );
-typedef size_t (*mbedtls_pk_rsa_alt_key_len_func)( void *ctx );
+typedef int (*mbedtls_pk_rsa_alt_decrypt_func)(void *ctx, int mode, size_t *olen,
+                                               const unsigned char *input, unsigned char *output,
+                                               size_t output_max_len);
+typedef int (*mbedtls_pk_rsa_alt_sign_func)(void *ctx,
+                                            int (*f_rng)(void *, unsigned char *, size_t), void *p_rng,
+                                            int mode, mbedtls_md_type_t md_alg, unsigned int hashlen,
+                                            const unsigned char *hash, unsigned char *sig);
+typedef size_t (*mbedtls_pk_rsa_alt_key_len_func)(void *ctx);
 #endif /* MBEDTLS_PK_RSA_ALT_SUPPORT */
 
 /**
@@ -180,17 +176,17 @@ typedef size_t (*mbedtls_pk_rsa_alt_key_len_func)( void *ctx );
  *
  * \return          The PK info associated with the type or NULL if not found.
  */
-const mbedtls_pk_info_t *mbedtls_pk_info_from_type( mbedtls_pk_type_t pk_type );
+const mbedtls_pk_info_t *mbedtls_pk_info_from_type(mbedtls_pk_type_t pk_type);
 
 /**
  * \brief           Initialize a mbedtls_pk_context (as NONE)
  */
-void mbedtls_pk_init( mbedtls_pk_context *ctx );
+void mbedtls_pk_init(mbedtls_pk_context *ctx);
 
 /**
  * \brief           Free a mbedtls_pk_context
  */
-void mbedtls_pk_free( mbedtls_pk_context *ctx );
+void mbedtls_pk_free(mbedtls_pk_context *ctx);
 
 /**
  * \brief           Initialize a PK context with the information given
@@ -206,7 +202,7 @@ void mbedtls_pk_free( mbedtls_pk_context *ctx );
  * \note            For contexts holding an RSA-alt key, use
  *                  \c mbedtls_pk_setup_rsa_alt() instead.
  */
-int mbedtls_pk_setup( mbedtls_pk_context *ctx, const mbedtls_pk_info_t *info );
+int mbedtls_pk_setup(mbedtls_pk_context *ctx, const mbedtls_pk_info_t *info);
 
 #if defined(MBEDTLS_PK_RSA_ALT_SUPPORT)
 /**
@@ -223,10 +219,10 @@ int mbedtls_pk_setup( mbedtls_pk_context *ctx, const mbedtls_pk_info_t *info );
  *
  * \note            This function replaces \c mbedtls_pk_setup() for RSA-alt.
  */
-int mbedtls_pk_setup_rsa_alt( mbedtls_pk_context *ctx, void * key,
-                         mbedtls_pk_rsa_alt_decrypt_func decrypt_func,
-                         mbedtls_pk_rsa_alt_sign_func sign_func,
-                         mbedtls_pk_rsa_alt_key_len_func key_len_func );
+int mbedtls_pk_setup_rsa_alt(mbedtls_pk_context *ctx, void *key,
+                             mbedtls_pk_rsa_alt_decrypt_func decrypt_func,
+                             mbedtls_pk_rsa_alt_sign_func sign_func,
+                             mbedtls_pk_rsa_alt_key_len_func key_len_func);
 #endif /* MBEDTLS_PK_RSA_ALT_SUPPORT */
 
 /**
@@ -236,7 +232,7 @@ int mbedtls_pk_setup_rsa_alt( mbedtls_pk_context *ctx, void * key,
  *
  * \return          Key size in bits, or 0 on error
  */
-size_t mbedtls_pk_get_bitlen( const mbedtls_pk_context *ctx );
+size_t mbedtls_pk_get_bitlen(const mbedtls_pk_context *ctx);
 
 /**
  * \brief           Get the length in bytes of the underlying key
@@ -244,9 +240,9 @@ size_t mbedtls_pk_get_bitlen( const mbedtls_pk_context *ctx );
  *
  * \return          Key length in bytes, or 0 on error
  */
-static inline size_t mbedtls_pk_get_len( const mbedtls_pk_context *ctx )
+static inline size_t mbedtls_pk_get_len(const mbedtls_pk_context *ctx)
 {
-    return( ( mbedtls_pk_get_bitlen( ctx ) + 7 ) / 8 );
+    return ((mbedtls_pk_get_bitlen(ctx) + 7) / 8);
 }
 
 /**
@@ -258,7 +254,7 @@ static inline size_t mbedtls_pk_get_len( const mbedtls_pk_context *ctx )
  * \return          0 if context can't do the operations,
  *                  1 otherwise.
  */
-int mbedtls_pk_can_do( const mbedtls_pk_context *ctx, mbedtls_pk_type_t type );
+int mbedtls_pk_can_do(const mbedtls_pk_context *ctx, mbedtls_pk_type_t type);
 
 /**
  * \brief           Verify signature (including padding if relevant).
@@ -284,9 +280,9 @@ int mbedtls_pk_can_do( const mbedtls_pk_context *ctx, mbedtls_pk_type_t type );
  *
  * \note            md_alg may be MBEDTLS_MD_NONE, only if hash_len != 0
  */
-int mbedtls_pk_verify( mbedtls_pk_context *ctx, mbedtls_md_type_t md_alg,
-               const unsigned char *hash, size_t hash_len,
-               const unsigned char *sig, size_t sig_len );
+int mbedtls_pk_verify(mbedtls_pk_context *ctx, mbedtls_md_type_t md_alg,
+                      const unsigned char *hash, size_t hash_len,
+                      const unsigned char *sig, size_t sig_len);
 
 /**
  * \brief           Verify signature, with options.
@@ -317,10 +313,10 @@ int mbedtls_pk_verify( mbedtls_pk_context *ctx, mbedtls_md_type_t md_alg,
  *                  to a mbedtls_pk_rsassa_pss_options structure,
  *                  otherwise it must be NULL.
  */
-int mbedtls_pk_verify_ext( mbedtls_pk_type_t type, const void *options,
-                   mbedtls_pk_context *ctx, mbedtls_md_type_t md_alg,
-                   const unsigned char *hash, size_t hash_len,
-                   const unsigned char *sig, size_t sig_len );
+int mbedtls_pk_verify_ext(mbedtls_pk_type_t type, const void *options,
+                          mbedtls_pk_context *ctx, mbedtls_md_type_t md_alg,
+                          const unsigned char *hash, size_t hash_len,
+                          const unsigned char *sig, size_t sig_len);
 
 /**
  * \brief           Make signature, including padding if relevant.
@@ -346,10 +342,10 @@ int mbedtls_pk_verify_ext( mbedtls_pk_type_t type, const void *options,
  * \note            For RSA, md_alg may be MBEDTLS_MD_NONE if hash_len != 0.
  *                  For ECDSA, md_alg may never be MBEDTLS_MD_NONE.
  */
-int mbedtls_pk_sign( mbedtls_pk_context *ctx, mbedtls_md_type_t md_alg,
-             const unsigned char *hash, size_t hash_len,
-             unsigned char *sig, size_t *sig_len,
-             int (*f_rng)(void *, unsigned char *, size_t), void *p_rng );
+int mbedtls_pk_sign(mbedtls_pk_context *ctx, mbedtls_md_type_t md_alg,
+                    const unsigned char *hash, size_t hash_len,
+                    unsigned char *sig, size_t *sig_len,
+                    int (*f_rng)(void *, unsigned char *, size_t), void *p_rng);
 
 /**
  * \brief           Decrypt message (including padding if relevant).
@@ -367,10 +363,10 @@ int mbedtls_pk_sign( mbedtls_pk_context *ctx, mbedtls_md_type_t md_alg,
  *
  * \return          0 on success, or a specific error code.
  */
-int mbedtls_pk_decrypt( mbedtls_pk_context *ctx,
-                const unsigned char *input, size_t ilen,
-                unsigned char *output, size_t *olen, size_t osize,
-                int (*f_rng)(void *, unsigned char *, size_t), void *p_rng );
+int mbedtls_pk_decrypt(mbedtls_pk_context *ctx,
+                       const unsigned char *input, size_t ilen,
+                       unsigned char *output, size_t *olen, size_t osize,
+                       int (*f_rng)(void *, unsigned char *, size_t), void *p_rng);
 
 /**
  * \brief           Encrypt message (including padding if relevant).
@@ -388,10 +384,10 @@ int mbedtls_pk_decrypt( mbedtls_pk_context *ctx,
  *
  * \return          0 on success, or a specific error code.
  */
-int mbedtls_pk_encrypt( mbedtls_pk_context *ctx,
-                const unsigned char *input, size_t ilen,
-                unsigned char *output, size_t *olen, size_t osize,
-                int (*f_rng)(void *, unsigned char *, size_t), void *p_rng );
+int mbedtls_pk_encrypt(mbedtls_pk_context *ctx,
+                       const unsigned char *input, size_t ilen,
+                       unsigned char *output, size_t *olen, size_t osize,
+                       int (*f_rng)(void *, unsigned char *, size_t), void *p_rng);
 
 /**
  * \brief           Check if a public-private pair of keys matches.
@@ -401,7 +397,7 @@ int mbedtls_pk_encrypt( mbedtls_pk_context *ctx,
  *
  * \return          0 on success or MBEDTLS_ERR_PK_BAD_INPUT_DATA
  */
-int mbedtls_pk_check_pair( const mbedtls_pk_context *pub, const mbedtls_pk_context *prv );
+int mbedtls_pk_check_pair(const mbedtls_pk_context *pub, const mbedtls_pk_context *prv);
 
 /**
  * \brief           Export debug information
@@ -411,7 +407,7 @@ int mbedtls_pk_check_pair( const mbedtls_pk_context *pub, const mbedtls_pk_conte
  *
  * \return          0 on success or MBEDTLS_ERR_PK_BAD_INPUT_DATA
  */
-int mbedtls_pk_debug( const mbedtls_pk_context *ctx, mbedtls_pk_debug_item *items );
+int mbedtls_pk_debug(const mbedtls_pk_context *ctx, mbedtls_pk_debug_item *items);
 
 /**
  * \brief           Access the type name
@@ -420,7 +416,7 @@ int mbedtls_pk_debug( const mbedtls_pk_context *ctx, mbedtls_pk_debug_item *item
  *
  * \return          Type name on success, or "invalid PK"
  */
-const char * mbedtls_pk_get_name( const mbedtls_pk_context *ctx );
+const char *mbedtls_pk_get_name(const mbedtls_pk_context *ctx);
 
 /**
  * \brief           Get the key type
@@ -429,7 +425,7 @@ const char * mbedtls_pk_get_name( const mbedtls_pk_context *ctx );
  *
  * \return          Type on success, or MBEDTLS_PK_NONE
  */
-mbedtls_pk_type_t mbedtls_pk_get_type( const mbedtls_pk_context *ctx );
+mbedtls_pk_type_t mbedtls_pk_get_type(const mbedtls_pk_context *ctx);
 
 #if defined(MBEDTLS_PK_PARSE_C)
 /** \ingroup pk_module */
@@ -451,9 +447,9 @@ mbedtls_pk_type_t mbedtls_pk_get_type( const mbedtls_pk_context *ctx );
  *
  * \return          0 if successful, or a specific PK or PEM error code
  */
-int mbedtls_pk_parse_key( mbedtls_pk_context *ctx,
-                  const unsigned char *key, size_t keylen,
-                  const unsigned char *pwd, size_t pwdlen );
+int mbedtls_pk_parse_key(mbedtls_pk_context *ctx,
+                         const unsigned char *key, size_t keylen,
+                         const unsigned char *pwd, size_t pwdlen);
 
 /** \ingroup pk_module */
 /**
@@ -472,8 +468,8 @@ int mbedtls_pk_parse_key( mbedtls_pk_context *ctx,
  *
  * \return          0 if successful, or a specific PK or PEM error code
  */
-int mbedtls_pk_parse_public_key( mbedtls_pk_context *ctx,
-                         const unsigned char *key, size_t keylen );
+int mbedtls_pk_parse_public_key(mbedtls_pk_context *ctx,
+                                const unsigned char *key, size_t keylen);
 
 #if defined(MBEDTLS_FS_IO)
 /** \ingroup pk_module */
@@ -492,8 +488,8 @@ int mbedtls_pk_parse_public_key( mbedtls_pk_context *ctx,
  *
  * \return          0 if successful, or a specific PK or PEM error code
  */
-int mbedtls_pk_parse_keyfile( mbedtls_pk_context *ctx,
-                      const char *path, const char *password );
+int mbedtls_pk_parse_keyfile(mbedtls_pk_context *ctx,
+                             const char *path, const char *password);
 
 /** \ingroup pk_module */
 /**
@@ -511,7 +507,7 @@ int mbedtls_pk_parse_keyfile( mbedtls_pk_context *ctx,
  *
  * \return          0 if successful, or a specific PK or PEM error code
  */
-int mbedtls_pk_parse_public_keyfile( mbedtls_pk_context *ctx, const char *path );
+int mbedtls_pk_parse_public_keyfile(mbedtls_pk_context *ctx, const char *path);
 #endif /* MBEDTLS_FS_IO */
 #endif /* MBEDTLS_PK_PARSE_C */
 
@@ -529,7 +525,7 @@ int mbedtls_pk_parse_public_keyfile( mbedtls_pk_context *ctx, const char *path )
  * \return          length of data written if successful, or a specific
  *                  error code
  */
-int mbedtls_pk_write_key_der( mbedtls_pk_context *ctx, unsigned char *buf, size_t size );
+int mbedtls_pk_write_key_der(mbedtls_pk_context *ctx, unsigned char *buf, size_t size);
 
 /**
  * \brief           Write a public key to a SubjectPublicKeyInfo DER structure
@@ -544,7 +540,7 @@ int mbedtls_pk_write_key_der( mbedtls_pk_context *ctx, unsigned char *buf, size_
  * \return          length of data written if successful, or a specific
  *                  error code
  */
-int mbedtls_pk_write_pubkey_der( mbedtls_pk_context *ctx, unsigned char *buf, size_t size );
+int mbedtls_pk_write_pubkey_der(mbedtls_pk_context *ctx, unsigned char *buf, size_t size);
 
 #if defined(MBEDTLS_PEM_WRITE_C)
 /**
@@ -556,7 +552,7 @@ int mbedtls_pk_write_pubkey_der( mbedtls_pk_context *ctx, unsigned char *buf, si
  *
  * \return          0 if successful, or a specific error code
  */
-int mbedtls_pk_write_pubkey_pem( mbedtls_pk_context *ctx, unsigned char *buf, size_t size );
+int mbedtls_pk_write_pubkey_pem(mbedtls_pk_context *ctx, unsigned char *buf, size_t size);
 
 /**
  * \brief           Write a private key to a PKCS#1 or SEC1 PEM string
@@ -567,7 +563,7 @@ int mbedtls_pk_write_pubkey_pem( mbedtls_pk_context *ctx, unsigned char *buf, si
  *
  * \return          0 if successful, or a specific error code
  */
-int mbedtls_pk_write_key_pem( mbedtls_pk_context *ctx, unsigned char *buf, size_t size );
+int mbedtls_pk_write_key_pem(mbedtls_pk_context *ctx, unsigned char *buf, size_t size);
 #endif /* MBEDTLS_PEM_WRITE_C */
 #endif /* MBEDTLS_PK_WRITE_C */
 
@@ -586,8 +582,8 @@ int mbedtls_pk_write_key_pem( mbedtls_pk_context *ctx, unsigned char *buf, size_
  *
  * \return          0 if successful, or a specific PK error code
  */
-int mbedtls_pk_parse_subpubkey( unsigned char **p, const unsigned char *end,
-                        mbedtls_pk_context *pk );
+int mbedtls_pk_parse_subpubkey(unsigned char **p, const unsigned char *end,
+                               mbedtls_pk_context *pk);
 #endif /* MBEDTLS_PK_PARSE_C */
 
 #if defined(MBEDTLS_PK_WRITE_C)
@@ -601,8 +597,8 @@ int mbedtls_pk_parse_subpubkey( unsigned char **p, const unsigned char *end,
  *
  * \return          the length written or a negative error code
  */
-int mbedtls_pk_write_pubkey( unsigned char **p, unsigned char *start,
-                     const mbedtls_pk_context *key );
+int mbedtls_pk_write_pubkey(unsigned char **p, unsigned char *start,
+                            const mbedtls_pk_context *key);
 #endif /* MBEDTLS_PK_WRITE_C */
 
 /*
@@ -610,7 +606,7 @@ int mbedtls_pk_write_pubkey( unsigned char **p, unsigned char *start,
  * know you do.
  */
 #if defined(MBEDTLS_FS_IO)
-int mbedtls_pk_load_file( const char *path, unsigned char **buf, size_t *n );
+int mbedtls_pk_load_file(const char *path, unsigned char **buf, size_t *n);
 #endif
 
 #ifdef __cplusplus
diff --git a/common/mbedtls/pk_internal.h b/common/mbedtls/pk_internal.h
index 685cd5757..009b976ea 100644
--- a/common/mbedtls/pk_internal.h
+++ b/common/mbedtls/pk_internal.h
@@ -35,8 +35,7 @@
 
 #include "pk.h"
 
-struct mbedtls_pk_info_t
-{
+struct mbedtls_pk_info_t {
     /** Public key type */
     mbedtls_pk_type_t type;
 
@@ -44,52 +43,51 @@ struct mbedtls_pk_info_t
     const char *name;
 
     /** Get key size in bits */
-    size_t (*get_bitlen)( const void * );
+    size_t (*get_bitlen)(const void *);
 
     /** Tell if the context implements this type (e.g. ECKEY can do ECDSA) */
-    int (*can_do)( mbedtls_pk_type_t type );
+    int (*can_do)(mbedtls_pk_type_t type);
 
     /** Verify signature */
-    int (*verify_func)( void *ctx, mbedtls_md_type_t md_alg,
-                        const unsigned char *hash, size_t hash_len,
-                        const unsigned char *sig, size_t sig_len );
+    int (*verify_func)(void *ctx, mbedtls_md_type_t md_alg,
+                       const unsigned char *hash, size_t hash_len,
+                       const unsigned char *sig, size_t sig_len);
 
     /** Make signature */
-    int (*sign_func)( void *ctx, mbedtls_md_type_t md_alg,
-                      const unsigned char *hash, size_t hash_len,
-                      unsigned char *sig, size_t *sig_len,
-                      int (*f_rng)(void *, unsigned char *, size_t),
-                      void *p_rng );
+    int (*sign_func)(void *ctx, mbedtls_md_type_t md_alg,
+                     const unsigned char *hash, size_t hash_len,
+                     unsigned char *sig, size_t *sig_len,
+                     int (*f_rng)(void *, unsigned char *, size_t),
+                     void *p_rng);
 
     /** Decrypt message */
-    int (*decrypt_func)( void *ctx, const unsigned char *input, size_t ilen,
-                         unsigned char *output, size_t *olen, size_t osize,
-                         int (*f_rng)(void *, unsigned char *, size_t),
-                         void *p_rng );
+    int (*decrypt_func)(void *ctx, const unsigned char *input, size_t ilen,
+                        unsigned char *output, size_t *olen, size_t osize,
+                        int (*f_rng)(void *, unsigned char *, size_t),
+                        void *p_rng);
 
     /** Encrypt message */
-    int (*encrypt_func)( void *ctx, const unsigned char *input, size_t ilen,
-                         unsigned char *output, size_t *olen, size_t osize,
-                         int (*f_rng)(void *, unsigned char *, size_t),
-                         void *p_rng );
+    int (*encrypt_func)(void *ctx, const unsigned char *input, size_t ilen,
+                        unsigned char *output, size_t *olen, size_t osize,
+                        int (*f_rng)(void *, unsigned char *, size_t),
+                        void *p_rng);
 
     /** Check public-private key pair */
-    int (*check_pair_func)( const void *pub, const void *prv );
+    int (*check_pair_func)(const void *pub, const void *prv);
 
     /** Allocate a new context */
-    void * (*ctx_alloc_func)( void );
+    void *(*ctx_alloc_func)(void);
 
     /** Free the given context */
-    void (*ctx_free_func)( void *ctx );
+    void (*ctx_free_func)(void *ctx);
 
     /** Interface with the debug module */
-    void (*debug_func)( const void *ctx, mbedtls_pk_debug_item *items );
+    void (*debug_func)(const void *ctx, mbedtls_pk_debug_item *items);
 
 };
 #if defined(MBEDTLS_PK_RSA_ALT_SUPPORT)
 /* Container for RSA-alt */
-typedef struct
-{
+typedef struct {
     void *key;
     mbedtls_pk_rsa_alt_decrypt_func decrypt_func;
     mbedtls_pk_rsa_alt_sign_func sign_func;
diff --git a/common/mbedtls/pk_wrap.c b/common/mbedtls/pk_wrap.c
index 7c4275ec5..fdf4224ba 100644
--- a/common/mbedtls/pk_wrap.c
+++ b/common/mbedtls/pk_wrap.c
@@ -59,130 +59,130 @@
 #include <stdint.h>
 
 #if defined(MBEDTLS_RSA_C)
-static int rsa_can_do( mbedtls_pk_type_t type )
+static int rsa_can_do(mbedtls_pk_type_t type)
 {
-    return( type == MBEDTLS_PK_RSA ||
-            type == MBEDTLS_PK_RSASSA_PSS );
+    return (type == MBEDTLS_PK_RSA ||
+            type == MBEDTLS_PK_RSASSA_PSS);
 }
 
-static size_t rsa_get_bitlen( const void *ctx )
+static size_t rsa_get_bitlen(const void *ctx)
 {
-    const mbedtls_rsa_context * rsa = (const mbedtls_rsa_context *) ctx;
-    return( 8 * mbedtls_rsa_get_len( rsa ) );
+    const mbedtls_rsa_context *rsa = (const mbedtls_rsa_context *) ctx;
+    return (8 * mbedtls_rsa_get_len(rsa));
 }
 
-static int rsa_verify_wrap( void *ctx, mbedtls_md_type_t md_alg,
-                   const unsigned char *hash, size_t hash_len,
-                   const unsigned char *sig, size_t sig_len )
+static int rsa_verify_wrap(void *ctx, mbedtls_md_type_t md_alg,
+                           const unsigned char *hash, size_t hash_len,
+                           const unsigned char *sig, size_t sig_len)
 {
     int ret;
-    mbedtls_rsa_context * rsa = (mbedtls_rsa_context *) ctx;
-    size_t rsa_len = mbedtls_rsa_get_len( rsa );
+    mbedtls_rsa_context *rsa = (mbedtls_rsa_context *) ctx;
+    size_t rsa_len = mbedtls_rsa_get_len(rsa);
 
 #if SIZE_MAX > UINT_MAX
-    if( md_alg == MBEDTLS_MD_NONE && UINT_MAX < hash_len )
-        return( MBEDTLS_ERR_PK_BAD_INPUT_DATA );
+    if (md_alg == MBEDTLS_MD_NONE && UINT_MAX < hash_len)
+        return (MBEDTLS_ERR_PK_BAD_INPUT_DATA);
 #endif /* SIZE_MAX > UINT_MAX */
 
-    if( sig_len < rsa_len )
-        return( MBEDTLS_ERR_RSA_VERIFY_FAILED );
+    if (sig_len < rsa_len)
+        return (MBEDTLS_ERR_RSA_VERIFY_FAILED);
 
-    if( ( ret = mbedtls_rsa_pkcs1_verify( rsa, NULL, NULL,
-                                  MBEDTLS_RSA_PUBLIC, md_alg,
-                                  (unsigned int) hash_len, hash, sig ) ) != 0 )
-        return( ret );
+    if ((ret = mbedtls_rsa_pkcs1_verify(rsa, NULL, NULL,
+                                        MBEDTLS_RSA_PUBLIC, md_alg,
+                                        (unsigned int) hash_len, hash, sig)) != 0)
+        return (ret);
 
     /* The buffer contains a valid signature followed by extra data.
      * We have a special error code for that so that so that callers can
      * use mbedtls_pk_verify() to check "Does the buffer start with a
      * valid signature?" and not just "Does the buffer contain a valid
      * signature?". */
-    if( sig_len > rsa_len )
-        return( MBEDTLS_ERR_PK_SIG_LEN_MISMATCH );
+    if (sig_len > rsa_len)
+        return (MBEDTLS_ERR_PK_SIG_LEN_MISMATCH);
 
-    return( 0 );
+    return (0);
 }
 
-static int rsa_sign_wrap( void *ctx, mbedtls_md_type_t md_alg,
-                   const unsigned char *hash, size_t hash_len,
-                   unsigned char *sig, size_t *sig_len,
-                   int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
+static int rsa_sign_wrap(void *ctx, mbedtls_md_type_t md_alg,
+                         const unsigned char *hash, size_t hash_len,
+                         unsigned char *sig, size_t *sig_len,
+                         int (*f_rng)(void *, unsigned char *, size_t), void *p_rng)
 {
-    mbedtls_rsa_context * rsa = (mbedtls_rsa_context *) ctx;
+    mbedtls_rsa_context *rsa = (mbedtls_rsa_context *) ctx;
 
 #if SIZE_MAX > UINT_MAX
-    if( md_alg == MBEDTLS_MD_NONE && UINT_MAX < hash_len )
-        return( MBEDTLS_ERR_PK_BAD_INPUT_DATA );
+    if (md_alg == MBEDTLS_MD_NONE && UINT_MAX < hash_len)
+        return (MBEDTLS_ERR_PK_BAD_INPUT_DATA);
 #endif /* SIZE_MAX > UINT_MAX */
 
-    *sig_len = mbedtls_rsa_get_len( rsa );
+    *sig_len = mbedtls_rsa_get_len(rsa);
 
-    return( mbedtls_rsa_pkcs1_sign( rsa, f_rng, p_rng, MBEDTLS_RSA_PRIVATE,
-                md_alg, (unsigned int) hash_len, hash, sig ) );
+    return (mbedtls_rsa_pkcs1_sign(rsa, f_rng, p_rng, MBEDTLS_RSA_PRIVATE,
+                                   md_alg, (unsigned int) hash_len, hash, sig));
 }
 
-static int rsa_decrypt_wrap( void *ctx,
-                    const unsigned char *input, size_t ilen,
-                    unsigned char *output, size_t *olen, size_t osize,
-                    int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
+static int rsa_decrypt_wrap(void *ctx,
+                            const unsigned char *input, size_t ilen,
+                            unsigned char *output, size_t *olen, size_t osize,
+                            int (*f_rng)(void *, unsigned char *, size_t), void *p_rng)
 {
-    mbedtls_rsa_context * rsa = (mbedtls_rsa_context *) ctx;
+    mbedtls_rsa_context *rsa = (mbedtls_rsa_context *) ctx;
 
-    if( ilen != mbedtls_rsa_get_len( rsa ) )
-        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    if (ilen != mbedtls_rsa_get_len(rsa))
+        return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
 
-    return( mbedtls_rsa_pkcs1_decrypt( rsa, f_rng, p_rng,
-                MBEDTLS_RSA_PRIVATE, olen, input, output, osize ) );
+    return (mbedtls_rsa_pkcs1_decrypt(rsa, f_rng, p_rng,
+                                      MBEDTLS_RSA_PRIVATE, olen, input, output, osize));
 }
 
-static int rsa_encrypt_wrap( void *ctx,
-                    const unsigned char *input, size_t ilen,
-                    unsigned char *output, size_t *olen, size_t osize,
-                    int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
+static int rsa_encrypt_wrap(void *ctx,
+                            const unsigned char *input, size_t ilen,
+                            unsigned char *output, size_t *olen, size_t osize,
+                            int (*f_rng)(void *, unsigned char *, size_t), void *p_rng)
 {
-    mbedtls_rsa_context * rsa = (mbedtls_rsa_context *) ctx;
-    *olen = mbedtls_rsa_get_len( rsa );
+    mbedtls_rsa_context *rsa = (mbedtls_rsa_context *) ctx;
+    *olen = mbedtls_rsa_get_len(rsa);
 
-    if( *olen > osize )
-        return( MBEDTLS_ERR_RSA_OUTPUT_TOO_LARGE );
+    if (*olen > osize)
+        return (MBEDTLS_ERR_RSA_OUTPUT_TOO_LARGE);
 
-    return( mbedtls_rsa_pkcs1_encrypt( rsa, f_rng, p_rng, MBEDTLS_RSA_PUBLIC,
-                                       ilen, input, output ) );
+    return (mbedtls_rsa_pkcs1_encrypt(rsa, f_rng, p_rng, MBEDTLS_RSA_PUBLIC,
+                                      ilen, input, output));
 }
 
-static int rsa_check_pair_wrap( const void *pub, const void *prv )
+static int rsa_check_pair_wrap(const void *pub, const void *prv)
 {
-    return( mbedtls_rsa_check_pub_priv( (const mbedtls_rsa_context *) pub,
-                                (const mbedtls_rsa_context *) prv ) );
+    return (mbedtls_rsa_check_pub_priv((const mbedtls_rsa_context *) pub,
+                                       (const mbedtls_rsa_context *) prv));
 }
 
-static void *rsa_alloc_wrap( void )
+static void *rsa_alloc_wrap(void)
 {
-    void *ctx = mbedtls_calloc( 1, sizeof( mbedtls_rsa_context ) );
+    void *ctx = mbedtls_calloc(1, sizeof(mbedtls_rsa_context));
 
-    if( ctx != NULL )
-        mbedtls_rsa_init( (mbedtls_rsa_context *) ctx, 0, 0 );
+    if (ctx != NULL)
+        mbedtls_rsa_init((mbedtls_rsa_context *) ctx, 0, 0);
 
-    return( ctx );
+    return (ctx);
 }
 
-static void rsa_free_wrap( void *ctx )
+static void rsa_free_wrap(void *ctx)
 {
-    mbedtls_rsa_free( (mbedtls_rsa_context *) ctx );
-    mbedtls_free( ctx );
+    mbedtls_rsa_free((mbedtls_rsa_context *) ctx);
+    mbedtls_free(ctx);
 }
 
-static void rsa_debug( const void *ctx, mbedtls_pk_debug_item *items )
+static void rsa_debug(const void *ctx, mbedtls_pk_debug_item *items)
 {
     items->type = MBEDTLS_PK_DEBUG_MPI;
     items->name = "rsa.N";
-    items->value = &( ((mbedtls_rsa_context *) ctx)->N );
+    items->value = &(((mbedtls_rsa_context *) ctx)->N);
 
     items++;
 
     items->type = MBEDTLS_PK_DEBUG_MPI;
     items->name = "rsa.E";
-    items->value = &( ((mbedtls_rsa_context *) ctx)->E );
+    items->value = &(((mbedtls_rsa_context *) ctx)->E);
 }
 
 const mbedtls_pk_info_t mbedtls_rsa_info = {
@@ -205,94 +205,94 @@ const mbedtls_pk_info_t mbedtls_rsa_info = {
 /*
  * Generic EC key
  */
-static int eckey_can_do( mbedtls_pk_type_t type )
+static int eckey_can_do(mbedtls_pk_type_t type)
 {
-    return( type == MBEDTLS_PK_ECKEY ||
+    return (type == MBEDTLS_PK_ECKEY ||
             type == MBEDTLS_PK_ECKEY_DH ||
-            type == MBEDTLS_PK_ECDSA );
+            type == MBEDTLS_PK_ECDSA);
 }
 
-static size_t eckey_get_bitlen( const void *ctx )
+static size_t eckey_get_bitlen(const void *ctx)
 {
-    return( ((mbedtls_ecp_keypair *) ctx)->grp.pbits );
+    return (((mbedtls_ecp_keypair *) ctx)->grp.pbits);
 }
 
 #if defined(MBEDTLS_ECDSA_C)
 /* Forward declarations */
-static int ecdsa_verify_wrap( void *ctx, mbedtls_md_type_t md_alg,
-                       const unsigned char *hash, size_t hash_len,
-                       const unsigned char *sig, size_t sig_len );
+static int ecdsa_verify_wrap(void *ctx, mbedtls_md_type_t md_alg,
+                             const unsigned char *hash, size_t hash_len,
+                             const unsigned char *sig, size_t sig_len);
 
-static int ecdsa_sign_wrap( void *ctx, mbedtls_md_type_t md_alg,
-                   const unsigned char *hash, size_t hash_len,
-                   unsigned char *sig, size_t *sig_len,
-                   int (*f_rng)(void *, unsigned char *, size_t), void *p_rng );
+static int ecdsa_sign_wrap(void *ctx, mbedtls_md_type_t md_alg,
+                           const unsigned char *hash, size_t hash_len,
+                           unsigned char *sig, size_t *sig_len,
+                           int (*f_rng)(void *, unsigned char *, size_t), void *p_rng);
 
-static int eckey_verify_wrap( void *ctx, mbedtls_md_type_t md_alg,
-                       const unsigned char *hash, size_t hash_len,
-                       const unsigned char *sig, size_t sig_len )
+static int eckey_verify_wrap(void *ctx, mbedtls_md_type_t md_alg,
+                             const unsigned char *hash, size_t hash_len,
+                             const unsigned char *sig, size_t sig_len)
 {
     int ret;
     mbedtls_ecdsa_context ecdsa;
 
-    mbedtls_ecdsa_init( &ecdsa );
+    mbedtls_ecdsa_init(&ecdsa);
 
-    if( ( ret = mbedtls_ecdsa_from_keypair( &ecdsa, ctx ) ) == 0 )
-        ret = ecdsa_verify_wrap( &ecdsa, md_alg, hash, hash_len, sig, sig_len );
+    if ((ret = mbedtls_ecdsa_from_keypair(&ecdsa, ctx)) == 0)
+        ret = ecdsa_verify_wrap(&ecdsa, md_alg, hash, hash_len, sig, sig_len);
 
-    mbedtls_ecdsa_free( &ecdsa );
+    mbedtls_ecdsa_free(&ecdsa);
 
-    return( ret );
+    return (ret);
 }
 
-static int eckey_sign_wrap( void *ctx, mbedtls_md_type_t md_alg,
-                   const unsigned char *hash, size_t hash_len,
-                   unsigned char *sig, size_t *sig_len,
-                   int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
+static int eckey_sign_wrap(void *ctx, mbedtls_md_type_t md_alg,
+                           const unsigned char *hash, size_t hash_len,
+                           unsigned char *sig, size_t *sig_len,
+                           int (*f_rng)(void *, unsigned char *, size_t), void *p_rng)
 {
     int ret;
     mbedtls_ecdsa_context ecdsa;
 
-    mbedtls_ecdsa_init( &ecdsa );
+    mbedtls_ecdsa_init(&ecdsa);
 
-    if( ( ret = mbedtls_ecdsa_from_keypair( &ecdsa, ctx ) ) == 0 )
-        ret = ecdsa_sign_wrap( &ecdsa, md_alg, hash, hash_len, sig, sig_len,
-                               f_rng, p_rng );
+    if ((ret = mbedtls_ecdsa_from_keypair(&ecdsa, ctx)) == 0)
+        ret = ecdsa_sign_wrap(&ecdsa, md_alg, hash, hash_len, sig, sig_len,
+                              f_rng, p_rng);
 
-    mbedtls_ecdsa_free( &ecdsa );
+    mbedtls_ecdsa_free(&ecdsa);
 
-    return( ret );
+    return (ret);
 }
 
 #endif /* MBEDTLS_ECDSA_C */
 
-static int eckey_check_pair( const void *pub, const void *prv )
+static int eckey_check_pair(const void *pub, const void *prv)
 {
-    return( mbedtls_ecp_check_pub_priv( (const mbedtls_ecp_keypair *) pub,
-                                (const mbedtls_ecp_keypair *) prv ) );
+    return (mbedtls_ecp_check_pub_priv((const mbedtls_ecp_keypair *) pub,
+                                       (const mbedtls_ecp_keypair *) prv));
 }
 
-static void *eckey_alloc_wrap( void )
+static void *eckey_alloc_wrap(void)
 {
-    void *ctx = mbedtls_calloc( 1, sizeof( mbedtls_ecp_keypair ) );
+    void *ctx = mbedtls_calloc(1, sizeof(mbedtls_ecp_keypair));
 
-    if( ctx != NULL )
-        mbedtls_ecp_keypair_init( ctx );
+    if (ctx != NULL)
+        mbedtls_ecp_keypair_init(ctx);
 
-    return( ctx );
+    return (ctx);
 }
 
-static void eckey_free_wrap( void *ctx )
+static void eckey_free_wrap(void *ctx)
 {
-    mbedtls_ecp_keypair_free( (mbedtls_ecp_keypair *) ctx );
-    mbedtls_free( ctx );
+    mbedtls_ecp_keypair_free((mbedtls_ecp_keypair *) ctx);
+    mbedtls_free(ctx);
 }
 
-static void eckey_debug( const void *ctx, mbedtls_pk_debug_item *items )
+static void eckey_debug(const void *ctx, mbedtls_pk_debug_item *items)
 {
     items->type = MBEDTLS_PK_DEBUG_ECP;
     items->name = "eckey.Q";
-    items->value = &( ((mbedtls_ecp_keypair *) ctx)->Q );
+    items->value = &(((mbedtls_ecp_keypair *) ctx)->Q);
 }
 
 const mbedtls_pk_info_t mbedtls_eckey_info = {
@@ -318,10 +318,10 @@ const mbedtls_pk_info_t mbedtls_eckey_info = {
 /*
  * EC key restricted to ECDH
  */
-static int eckeydh_can_do( mbedtls_pk_type_t type )
+static int eckeydh_can_do(mbedtls_pk_type_t type)
 {
-    return( type == MBEDTLS_PK_ECKEY ||
-            type == MBEDTLS_PK_ECKEY_DH );
+    return (type == MBEDTLS_PK_ECKEY ||
+            type == MBEDTLS_PK_ECKEY_DH);
 }
 
 const mbedtls_pk_info_t mbedtls_eckeydh_info = {
@@ -341,50 +341,50 @@ const mbedtls_pk_info_t mbedtls_eckeydh_info = {
 #endif /* MBEDTLS_ECP_C */
 
 #if defined(MBEDTLS_ECDSA_C)
-static int ecdsa_can_do( mbedtls_pk_type_t type )
+static int ecdsa_can_do(mbedtls_pk_type_t type)
 {
-    return( type == MBEDTLS_PK_ECDSA );
+    return (type == MBEDTLS_PK_ECDSA);
 }
 
-static int ecdsa_verify_wrap( void *ctx, mbedtls_md_type_t md_alg,
-                       const unsigned char *hash, size_t hash_len,
-                       const unsigned char *sig, size_t sig_len )
+static int ecdsa_verify_wrap(void *ctx, mbedtls_md_type_t md_alg,
+                             const unsigned char *hash, size_t hash_len,
+                             const unsigned char *sig, size_t sig_len)
 {
     int ret;
     ((void) md_alg);
 
-    ret = mbedtls_ecdsa_read_signature( (mbedtls_ecdsa_context *) ctx,
-                                hash, hash_len, sig, sig_len );
+    ret = mbedtls_ecdsa_read_signature((mbedtls_ecdsa_context *) ctx,
+                                       hash, hash_len, sig, sig_len);
 
-    if( ret == MBEDTLS_ERR_ECP_SIG_LEN_MISMATCH )
-        return( MBEDTLS_ERR_PK_SIG_LEN_MISMATCH );
+    if (ret == MBEDTLS_ERR_ECP_SIG_LEN_MISMATCH)
+        return (MBEDTLS_ERR_PK_SIG_LEN_MISMATCH);
 
-    return( ret );
+    return (ret);
 }
 
-static int ecdsa_sign_wrap( void *ctx, mbedtls_md_type_t md_alg,
-                   const unsigned char *hash, size_t hash_len,
-                   unsigned char *sig, size_t *sig_len,
-                   int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
+static int ecdsa_sign_wrap(void *ctx, mbedtls_md_type_t md_alg,
+                           const unsigned char *hash, size_t hash_len,
+                           unsigned char *sig, size_t *sig_len,
+                           int (*f_rng)(void *, unsigned char *, size_t), void *p_rng)
 {
-    return( mbedtls_ecdsa_write_signature( (mbedtls_ecdsa_context *) ctx,
-                md_alg, hash, hash_len, sig, sig_len, f_rng, p_rng ) );
+    return (mbedtls_ecdsa_write_signature((mbedtls_ecdsa_context *) ctx,
+                                          md_alg, hash, hash_len, sig, sig_len, f_rng, p_rng));
 }
 
-static void *ecdsa_alloc_wrap( void )
+static void *ecdsa_alloc_wrap(void)
 {
-    void *ctx = mbedtls_calloc( 1, sizeof( mbedtls_ecdsa_context ) );
+    void *ctx = mbedtls_calloc(1, sizeof(mbedtls_ecdsa_context));
 
-    if( ctx != NULL )
-        mbedtls_ecdsa_init( (mbedtls_ecdsa_context *) ctx );
+    if (ctx != NULL)
+        mbedtls_ecdsa_init((mbedtls_ecdsa_context *) ctx);
 
-    return( ctx );
+    return (ctx);
 }
 
-static void ecdsa_free_wrap( void *ctx )
+static void ecdsa_free_wrap(void *ctx)
 {
-    mbedtls_ecdsa_free( (mbedtls_ecdsa_context *) ctx );
-    mbedtls_free( ctx );
+    mbedtls_ecdsa_free((mbedtls_ecdsa_context *) ctx);
+    mbedtls_free(ctx);
 }
 
 const mbedtls_pk_info_t mbedtls_ecdsa_info = {
@@ -408,97 +408,95 @@ const mbedtls_pk_info_t mbedtls_ecdsa_info = {
  * Support for alternative RSA-private implementations
  */
 
-static int rsa_alt_can_do( mbedtls_pk_type_t type )
+static int rsa_alt_can_do(mbedtls_pk_type_t type)
 {
-    return( type == MBEDTLS_PK_RSA );
+    return (type == MBEDTLS_PK_RSA);
 }
 
-static size_t rsa_alt_get_bitlen( const void *ctx )
+static size_t rsa_alt_get_bitlen(const void *ctx)
 {
     const mbedtls_rsa_alt_context *rsa_alt = (const mbedtls_rsa_alt_context *) ctx;
 
-    return( 8 * rsa_alt->key_len_func( rsa_alt->key ) );
+    return (8 * rsa_alt->key_len_func(rsa_alt->key));
 }
 
-static int rsa_alt_sign_wrap( void *ctx, mbedtls_md_type_t md_alg,
-                   const unsigned char *hash, size_t hash_len,
-                   unsigned char *sig, size_t *sig_len,
-                   int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
+static int rsa_alt_sign_wrap(void *ctx, mbedtls_md_type_t md_alg,
+                             const unsigned char *hash, size_t hash_len,
+                             unsigned char *sig, size_t *sig_len,
+                             int (*f_rng)(void *, unsigned char *, size_t), void *p_rng)
 {
     mbedtls_rsa_alt_context *rsa_alt = (mbedtls_rsa_alt_context *) ctx;
 
 #if SIZE_MAX > UINT_MAX
-    if( UINT_MAX < hash_len )
-        return( MBEDTLS_ERR_PK_BAD_INPUT_DATA );
+    if (UINT_MAX < hash_len)
+        return (MBEDTLS_ERR_PK_BAD_INPUT_DATA);
 #endif /* SIZE_MAX > UINT_MAX */
 
-    *sig_len = rsa_alt->key_len_func( rsa_alt->key );
+    *sig_len = rsa_alt->key_len_func(rsa_alt->key);
 
-    return( rsa_alt->sign_func( rsa_alt->key, f_rng, p_rng, MBEDTLS_RSA_PRIVATE,
-                md_alg, (unsigned int) hash_len, hash, sig ) );
+    return (rsa_alt->sign_func(rsa_alt->key, f_rng, p_rng, MBEDTLS_RSA_PRIVATE,
+                               md_alg, (unsigned int) hash_len, hash, sig));
 }
 
-static int rsa_alt_decrypt_wrap( void *ctx,
-                    const unsigned char *input, size_t ilen,
-                    unsigned char *output, size_t *olen, size_t osize,
-                    int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
+static int rsa_alt_decrypt_wrap(void *ctx,
+                                const unsigned char *input, size_t ilen,
+                                unsigned char *output, size_t *olen, size_t osize,
+                                int (*f_rng)(void *, unsigned char *, size_t), void *p_rng)
 {
     mbedtls_rsa_alt_context *rsa_alt = (mbedtls_rsa_alt_context *) ctx;
 
     ((void) f_rng);
     ((void) p_rng);
 
-    if( ilen != rsa_alt->key_len_func( rsa_alt->key ) )
-        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    if (ilen != rsa_alt->key_len_func(rsa_alt->key))
+        return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
 
-    return( rsa_alt->decrypt_func( rsa_alt->key,
-                MBEDTLS_RSA_PRIVATE, olen, input, output, osize ) );
+    return (rsa_alt->decrypt_func(rsa_alt->key,
+                                  MBEDTLS_RSA_PRIVATE, olen, input, output, osize));
 }
 
 #if defined(MBEDTLS_RSA_C)
-static int rsa_alt_check_pair( const void *pub, const void *prv )
+static int rsa_alt_check_pair(const void *pub, const void *prv)
 {
     unsigned char sig[MBEDTLS_MPI_MAX_SIZE];
     unsigned char hash[32];
     size_t sig_len = 0;
     int ret;
 
-    if( rsa_alt_get_bitlen( prv ) != rsa_get_bitlen( pub ) )
-        return( MBEDTLS_ERR_RSA_KEY_CHECK_FAILED );
+    if (rsa_alt_get_bitlen(prv) != rsa_get_bitlen(pub))
+        return (MBEDTLS_ERR_RSA_KEY_CHECK_FAILED);
 
-    memset( hash, 0x2a, sizeof( hash ) );
+    memset(hash, 0x2a, sizeof(hash));
 
-    if( ( ret = rsa_alt_sign_wrap( (void *) prv, MBEDTLS_MD_NONE,
-                                   hash, sizeof( hash ),
-                                   sig, &sig_len, NULL, NULL ) ) != 0 )
-    {
-        return( ret );
+    if ((ret = rsa_alt_sign_wrap((void *) prv, MBEDTLS_MD_NONE,
+                                 hash, sizeof(hash),
+                                 sig, &sig_len, NULL, NULL)) != 0) {
+        return (ret);
     }
 
-    if( rsa_verify_wrap( (void *) pub, MBEDTLS_MD_NONE,
-                         hash, sizeof( hash ), sig, sig_len ) != 0 )
-    {
-        return( MBEDTLS_ERR_RSA_KEY_CHECK_FAILED );
+    if (rsa_verify_wrap((void *) pub, MBEDTLS_MD_NONE,
+                        hash, sizeof(hash), sig, sig_len) != 0) {
+        return (MBEDTLS_ERR_RSA_KEY_CHECK_FAILED);
     }
 
-    return( 0 );
+    return (0);
 }
 #endif /* MBEDTLS_RSA_C */
 
-static void *rsa_alt_alloc_wrap( void )
+static void *rsa_alt_alloc_wrap(void)
 {
-    void *ctx = mbedtls_calloc( 1, sizeof( mbedtls_rsa_alt_context ) );
+    void *ctx = mbedtls_calloc(1, sizeof(mbedtls_rsa_alt_context));
 
-    if( ctx != NULL )
-        memset( ctx, 0, sizeof( mbedtls_rsa_alt_context ) );
+    if (ctx != NULL)
+        memset(ctx, 0, sizeof(mbedtls_rsa_alt_context));
 
-    return( ctx );
+    return (ctx);
 }
 
-static void rsa_alt_free_wrap( void *ctx )
+static void rsa_alt_free_wrap(void *ctx)
 {
-    mbedtls_platform_zeroize( ctx, sizeof( mbedtls_rsa_alt_context ) );
-    mbedtls_free( ctx );
+    mbedtls_platform_zeroize(ctx, sizeof(mbedtls_rsa_alt_context));
+    mbedtls_free(ctx);
 }
 
 const mbedtls_pk_info_t mbedtls_rsa_alt_info = {
diff --git a/common/mbedtls/pkcs12.c b/common/mbedtls/pkcs12.c
index 3d93bfe93..a3d1c81ad 100644
--- a/common/mbedtls/pkcs12.c
+++ b/common/mbedtls/pkcs12.c
@@ -50,8 +50,8 @@
 #include "mbedtls/des.h"
 #endif
 
-static int pkcs12_parse_pbe_params( mbedtls_asn1_buf *params,
-                                    mbedtls_asn1_buf *salt, int *iterations )
+static int pkcs12_parse_pbe_params(mbedtls_asn1_buf *params,
+                                   mbedtls_asn1_buf *salt, int *iterations)
 {
     int ret;
     unsigned char **p = &params->p;
@@ -64,76 +64,74 @@ static int pkcs12_parse_pbe_params( mbedtls_asn1_buf *params,
      *  }
      *
      */
-    if( params->tag != ( MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) )
-        return( MBEDTLS_ERR_PKCS12_PBE_INVALID_FORMAT +
-                MBEDTLS_ERR_ASN1_UNEXPECTED_TAG );
+    if (params->tag != (MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE))
+        return (MBEDTLS_ERR_PKCS12_PBE_INVALID_FORMAT +
+                MBEDTLS_ERR_ASN1_UNEXPECTED_TAG);
 
-    if( ( ret = mbedtls_asn1_get_tag( p, end, &salt->len, MBEDTLS_ASN1_OCTET_STRING ) ) != 0 )
-        return( MBEDTLS_ERR_PKCS12_PBE_INVALID_FORMAT + ret );
+    if ((ret = mbedtls_asn1_get_tag(p, end, &salt->len, MBEDTLS_ASN1_OCTET_STRING)) != 0)
+        return (MBEDTLS_ERR_PKCS12_PBE_INVALID_FORMAT + ret);
 
     salt->p = *p;
     *p += salt->len;
 
-    if( ( ret = mbedtls_asn1_get_int( p, end, iterations ) ) != 0 )
-        return( MBEDTLS_ERR_PKCS12_PBE_INVALID_FORMAT + ret );
+    if ((ret = mbedtls_asn1_get_int(p, end, iterations)) != 0)
+        return (MBEDTLS_ERR_PKCS12_PBE_INVALID_FORMAT + ret);
 
-    if( *p != end )
-        return( MBEDTLS_ERR_PKCS12_PBE_INVALID_FORMAT +
-                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+    if (*p != end)
+        return (MBEDTLS_ERR_PKCS12_PBE_INVALID_FORMAT +
+                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH);
 
-    return( 0 );
+    return (0);
 }
 
 #define PKCS12_MAX_PWDLEN 128
 
-static int pkcs12_pbe_derive_key_iv( mbedtls_asn1_buf *pbe_params, mbedtls_md_type_t md_type,
-                                     const unsigned char *pwd,  size_t pwdlen,
-                                     unsigned char *key, size_t keylen,
-                                     unsigned char *iv,  size_t ivlen )
+static int pkcs12_pbe_derive_key_iv(mbedtls_asn1_buf *pbe_params, mbedtls_md_type_t md_type,
+                                    const unsigned char *pwd,  size_t pwdlen,
+                                    unsigned char *key, size_t keylen,
+                                    unsigned char *iv,  size_t ivlen)
 {
     int ret, iterations = 0;
     mbedtls_asn1_buf salt;
     size_t i;
     unsigned char unipwd[PKCS12_MAX_PWDLEN * 2 + 2];
 
-    if( pwdlen > PKCS12_MAX_PWDLEN )
-        return( MBEDTLS_ERR_PKCS12_BAD_INPUT_DATA );
+    if (pwdlen > PKCS12_MAX_PWDLEN)
+        return (MBEDTLS_ERR_PKCS12_BAD_INPUT_DATA);
 
-    memset( &salt, 0, sizeof(mbedtls_asn1_buf) );
-    memset( &unipwd, 0, sizeof(unipwd) );
+    memset(&salt, 0, sizeof(mbedtls_asn1_buf));
+    memset(&unipwd, 0, sizeof(unipwd));
 
-    if( ( ret = pkcs12_parse_pbe_params( pbe_params, &salt,
-                                         &iterations ) ) != 0 )
-        return( ret );
+    if ((ret = pkcs12_parse_pbe_params(pbe_params, &salt,
+                                       &iterations)) != 0)
+        return (ret);
 
-    for( i = 0; i < pwdlen; i++ )
+    for (i = 0; i < pwdlen; i++)
         unipwd[i * 2 + 1] = pwd[i];
 
-    if( ( ret = mbedtls_pkcs12_derivation( key, keylen, unipwd, pwdlen * 2 + 2,
-                                   salt.p, salt.len, md_type,
-                                   MBEDTLS_PKCS12_DERIVE_KEY, iterations ) ) != 0 )
-    {
-        return( ret );
+    if ((ret = mbedtls_pkcs12_derivation(key, keylen, unipwd, pwdlen * 2 + 2,
+                                         salt.p, salt.len, md_type,
+                                         MBEDTLS_PKCS12_DERIVE_KEY, iterations)) != 0) {
+        return (ret);
     }
 
-    if( iv == NULL || ivlen == 0 )
-        return( 0 );
+    if (iv == NULL || ivlen == 0)
+        return (0);
 
-    if( ( ret = mbedtls_pkcs12_derivation( iv, ivlen, unipwd, pwdlen * 2 + 2,
-                                   salt.p, salt.len, md_type,
-                                   MBEDTLS_PKCS12_DERIVE_IV, iterations ) ) != 0 )
-    {
-        return( ret );
+    if ((ret = mbedtls_pkcs12_derivation(iv, ivlen, unipwd, pwdlen * 2 + 2,
+                                         salt.p, salt.len, md_type,
+                                         MBEDTLS_PKCS12_DERIVE_IV, iterations)) != 0) {
+        return (ret);
     }
-    return( 0 );
+    return (0);
 }
 
 #undef PKCS12_MAX_PWDLEN
 
-int mbedtls_pkcs12_pbe_sha1_rc4_128( mbedtls_asn1_buf *pbe_params, int mode,
-                             const unsigned char *pwd,  size_t pwdlen,
-                             const unsigned char *data, size_t len,
-                             unsigned char *output )
+int mbedtls_pkcs12_pbe_sha1_rc4_128(mbedtls_asn1_buf *pbe_params, int mode,
+                                    const unsigned char *pwd,  size_t pwdlen,
+                                    const unsigned char *data, size_t len,
+                                    unsigned char *output)
 {
 #if !defined(MBEDTLS_ARC4_C)
     ((void) pbe_params);
@@ -143,39 +141,38 @@ int mbedtls_pkcs12_pbe_sha1_rc4_128( mbedtls_asn1_buf *pbe_params, int mode,
     ((void) data);
     ((void) len);
     ((void) output);
-    return( MBEDTLS_ERR_PKCS12_FEATURE_UNAVAILABLE );
+    return (MBEDTLS_ERR_PKCS12_FEATURE_UNAVAILABLE);
 #else
     int ret;
     unsigned char key[16];
     mbedtls_arc4_context ctx;
     ((void) mode);
 
-    mbedtls_arc4_init( &ctx );
+    mbedtls_arc4_init(&ctx);
 
-    if( ( ret = pkcs12_pbe_derive_key_iv( pbe_params, MBEDTLS_MD_SHA1,
-                                          pwd, pwdlen,
-                                          key, 16, NULL, 0 ) ) != 0 )
-    {
-        return( ret );
+    if ((ret = pkcs12_pbe_derive_key_iv(pbe_params, MBEDTLS_MD_SHA1,
+                                        pwd, pwdlen,
+                                        key, 16, NULL, 0)) != 0) {
+        return (ret);
     }
 
-    mbedtls_arc4_setup( &ctx, key, 16 );
-    if( ( ret = mbedtls_arc4_crypt( &ctx, len, data, output ) ) != 0 )
+    mbedtls_arc4_setup(&ctx, key, 16);
+    if ((ret = mbedtls_arc4_crypt(&ctx, len, data, output)) != 0)
         goto exit;
 
 exit:
-    mbedtls_platform_zeroize( key, sizeof( key ) );
-    mbedtls_arc4_free( &ctx );
+    mbedtls_platform_zeroize(key, sizeof(key));
+    mbedtls_arc4_free(&ctx);
 
-    return( ret );
+    return (ret);
 #endif /* MBEDTLS_ARC4_C */
 }
 
-int mbedtls_pkcs12_pbe( mbedtls_asn1_buf *pbe_params, int mode,
-                mbedtls_cipher_type_t cipher_type, mbedtls_md_type_t md_type,
-                const unsigned char *pwd,  size_t pwdlen,
-                const unsigned char *data, size_t len,
-                unsigned char *output )
+int mbedtls_pkcs12_pbe(mbedtls_asn1_buf *pbe_params, int mode,
+                       mbedtls_cipher_type_t cipher_type, mbedtls_md_type_t md_type,
+                       const unsigned char *pwd,  size_t pwdlen,
+                       const unsigned char *data, size_t len,
+                       unsigned char *output)
 {
     int ret, keylen = 0;
     unsigned char key[32];
@@ -184,69 +181,66 @@ int mbedtls_pkcs12_pbe( mbedtls_asn1_buf *pbe_params, int mode,
     mbedtls_cipher_context_t cipher_ctx;
     size_t olen = 0;
 
-    cipher_info = mbedtls_cipher_info_from_type( cipher_type );
-    if( cipher_info == NULL )
-        return( MBEDTLS_ERR_PKCS12_FEATURE_UNAVAILABLE );
+    cipher_info = mbedtls_cipher_info_from_type(cipher_type);
+    if (cipher_info == NULL)
+        return (MBEDTLS_ERR_PKCS12_FEATURE_UNAVAILABLE);
 
     keylen = cipher_info->key_bitlen / 8;
 
-    if( ( ret = pkcs12_pbe_derive_key_iv( pbe_params, md_type, pwd, pwdlen,
-                                          key, keylen,
-                                          iv, cipher_info->iv_size ) ) != 0 )
-    {
-        return( ret );
+    if ((ret = pkcs12_pbe_derive_key_iv(pbe_params, md_type, pwd, pwdlen,
+                                        key, keylen,
+                                        iv, cipher_info->iv_size)) != 0) {
+        return (ret);
     }
 
-    mbedtls_cipher_init( &cipher_ctx );
+    mbedtls_cipher_init(&cipher_ctx);
 
-    if( ( ret = mbedtls_cipher_setup( &cipher_ctx, cipher_info ) ) != 0 )
+    if ((ret = mbedtls_cipher_setup(&cipher_ctx, cipher_info)) != 0)
         goto exit;
 
-    if( ( ret = mbedtls_cipher_setkey( &cipher_ctx, key, 8 * keylen, (mbedtls_operation_t) mode ) ) != 0 )
+    if ((ret = mbedtls_cipher_setkey(&cipher_ctx, key, 8 * keylen, (mbedtls_operation_t) mode)) != 0)
         goto exit;
 
-    if( ( ret = mbedtls_cipher_set_iv( &cipher_ctx, iv, cipher_info->iv_size ) ) != 0 )
+    if ((ret = mbedtls_cipher_set_iv(&cipher_ctx, iv, cipher_info->iv_size)) != 0)
         goto exit;
 
-    if( ( ret = mbedtls_cipher_reset( &cipher_ctx ) ) != 0 )
+    if ((ret = mbedtls_cipher_reset(&cipher_ctx)) != 0)
         goto exit;
 
-    if( ( ret = mbedtls_cipher_update( &cipher_ctx, data, len,
-                                output, &olen ) ) != 0 )
-    {
+    if ((ret = mbedtls_cipher_update(&cipher_ctx, data, len,
+                                     output, &olen)) != 0) {
         goto exit;
     }
 
-    if( ( ret = mbedtls_cipher_finish( &cipher_ctx, output + olen, &olen ) ) != 0 )
+    if ((ret = mbedtls_cipher_finish(&cipher_ctx, output + olen, &olen)) != 0)
         ret = MBEDTLS_ERR_PKCS12_PASSWORD_MISMATCH;
 
 exit:
-    mbedtls_platform_zeroize( key, sizeof( key ) );
-    mbedtls_platform_zeroize( iv,  sizeof( iv  ) );
-    mbedtls_cipher_free( &cipher_ctx );
+    mbedtls_platform_zeroize(key, sizeof(key));
+    mbedtls_platform_zeroize(iv,  sizeof(iv));
+    mbedtls_cipher_free(&cipher_ctx);
 
-    return( ret );
+    return (ret);
 }
 
-static void pkcs12_fill_buffer( unsigned char *data, size_t data_len,
-                                const unsigned char *filler, size_t fill_len )
+static void pkcs12_fill_buffer(unsigned char *data, size_t data_len,
+                               const unsigned char *filler, size_t fill_len)
 {
     unsigned char *p = data;
     size_t use_len;
 
-    while( data_len > 0 )
-    {
-        use_len = ( data_len > fill_len ) ? fill_len : data_len;
-        memcpy( p, filler, use_len );
+    while (data_len > 0) {
+        use_len = (data_len > fill_len) ? fill_len : data_len;
+        memcpy(p, filler, use_len);
         p += use_len;
         data_len -= use_len;
     }
 }
 
-int mbedtls_pkcs12_derivation( unsigned char *data, size_t datalen,
-                       const unsigned char *pwd, size_t pwdlen,
-                       const unsigned char *salt, size_t saltlen,
-                       mbedtls_md_type_t md_type, int id, int iterations )
+int mbedtls_pkcs12_derivation(unsigned char *data, size_t datalen,
+                              const unsigned char *pwd, size_t pwdlen,
+                              const unsigned char *salt, size_t saltlen,
+                              mbedtls_md_type_t md_type, int id, int iterations)
 {
     int ret;
     unsigned int j;
@@ -263,86 +257,82 @@ int mbedtls_pkcs12_derivation( unsigned char *data, size_t datalen,
     mbedtls_md_context_t md_ctx;
 
     // This version only allows max of 64 bytes of password or salt
-    if( datalen > 128 || pwdlen > 64 || saltlen > 64 )
-        return( MBEDTLS_ERR_PKCS12_BAD_INPUT_DATA );
+    if (datalen > 128 || pwdlen > 64 || saltlen > 64)
+        return (MBEDTLS_ERR_PKCS12_BAD_INPUT_DATA);
 
-    md_info = mbedtls_md_info_from_type( md_type );
-    if( md_info == NULL )
-        return( MBEDTLS_ERR_PKCS12_FEATURE_UNAVAILABLE );
+    md_info = mbedtls_md_info_from_type(md_type);
+    if (md_info == NULL)
+        return (MBEDTLS_ERR_PKCS12_FEATURE_UNAVAILABLE);
 
-    mbedtls_md_init( &md_ctx );
+    mbedtls_md_init(&md_ctx);
 
-    if( ( ret = mbedtls_md_setup( &md_ctx, md_info, 0 ) ) != 0 )
-        return( ret );
-    hlen = mbedtls_md_get_size( md_info );
+    if ((ret = mbedtls_md_setup(&md_ctx, md_info, 0)) != 0)
+        return (ret);
+    hlen = mbedtls_md_get_size(md_info);
 
-    if( hlen <= 32 )
+    if (hlen <= 32)
         v = 64;
     else
         v = 128;
 
-    memset( diversifier, (unsigned char) id, v );
+    memset(diversifier, (unsigned char) id, v);
 
-    pkcs12_fill_buffer( salt_block, v, salt, saltlen );
-    pkcs12_fill_buffer( pwd_block,  v, pwd,  pwdlen  );
+    pkcs12_fill_buffer(salt_block, v, salt, saltlen);
+    pkcs12_fill_buffer(pwd_block,  v, pwd,  pwdlen);
 
     p = data;
-    while( datalen > 0 )
-    {
+    while (datalen > 0) {
         // Calculate hash( diversifier || salt_block || pwd_block )
-        if( ( ret = mbedtls_md_starts( &md_ctx ) ) != 0 )
+        if ((ret = mbedtls_md_starts(&md_ctx)) != 0)
             goto exit;
 
-        if( ( ret = mbedtls_md_update( &md_ctx, diversifier, v ) ) != 0 )
+        if ((ret = mbedtls_md_update(&md_ctx, diversifier, v)) != 0)
             goto exit;
 
-        if( ( ret = mbedtls_md_update( &md_ctx, salt_block, v ) ) != 0 )
+        if ((ret = mbedtls_md_update(&md_ctx, salt_block, v)) != 0)
             goto exit;
 
-        if( ( ret = mbedtls_md_update( &md_ctx, pwd_block, v ) ) != 0 )
+        if ((ret = mbedtls_md_update(&md_ctx, pwd_block, v)) != 0)
             goto exit;
 
-        if( ( ret = mbedtls_md_finish( &md_ctx, hash_output ) ) != 0 )
+        if ((ret = mbedtls_md_finish(&md_ctx, hash_output)) != 0)
             goto exit;
 
         // Perform remaining ( iterations - 1 ) recursive hash calculations
-        for( i = 1; i < (size_t) iterations; i++ )
-        {
-            if( ( ret = mbedtls_md( md_info, hash_output, hlen, hash_output ) ) != 0 )
+        for (i = 1; i < (size_t) iterations; i++) {
+            if ((ret = mbedtls_md(md_info, hash_output, hlen, hash_output)) != 0)
                 goto exit;
         }
 
-        use_len = ( datalen > hlen ) ? hlen : datalen;
-        memcpy( p, hash_output, use_len );
+        use_len = (datalen > hlen) ? hlen : datalen;
+        memcpy(p, hash_output, use_len);
         datalen -= use_len;
         p += use_len;
 
-        if( datalen == 0 )
+        if (datalen == 0)
             break;
 
         // Concatenating copies of hash_output into hash_block (B)
-        pkcs12_fill_buffer( hash_block, v, hash_output, hlen );
+        pkcs12_fill_buffer(hash_block, v, hash_output, hlen);
 
         // B += 1
-        for( i = v; i > 0; i-- )
-            if( ++hash_block[i - 1] != 0 )
+        for (i = v; i > 0; i--)
+            if (++hash_block[i - 1] != 0)
                 break;
 
         // salt_block += B
         c = 0;
-        for( i = v; i > 0; i-- )
-        {
+        for (i = v; i > 0; i--) {
             j = salt_block[i - 1] + hash_block[i - 1] + c;
-            c = (unsigned char) (j >> 8);
+            c = (unsigned char)(j >> 8);
             salt_block[i - 1] = j & 0xFF;
         }
 
         // pwd_block  += B
         c = 0;
-        for( i = v; i > 0; i-- )
-        {
+        for (i = v; i > 0; i--) {
             j = pwd_block[i - 1] + hash_block[i - 1] + c;
-            c = (unsigned char) (j >> 8);
+            c = (unsigned char)(j >> 8);
             pwd_block[i - 1] = j & 0xFF;
         }
     }
@@ -350,14 +340,14 @@ int mbedtls_pkcs12_derivation( unsigned char *data, size_t datalen,
     ret = 0;
 
 exit:
-    mbedtls_platform_zeroize( salt_block, sizeof( salt_block ) );
-    mbedtls_platform_zeroize( pwd_block, sizeof( pwd_block ) );
-    mbedtls_platform_zeroize( hash_block, sizeof( hash_block ) );
-    mbedtls_platform_zeroize( hash_output, sizeof( hash_output ) );
+    mbedtls_platform_zeroize(salt_block, sizeof(salt_block));
+    mbedtls_platform_zeroize(pwd_block, sizeof(pwd_block));
+    mbedtls_platform_zeroize(hash_block, sizeof(hash_block));
+    mbedtls_platform_zeroize(hash_output, sizeof(hash_output));
 
-    mbedtls_md_free( &md_ctx );
+    mbedtls_md_free(&md_ctx);
 
-    return( ret );
+    return (ret);
 }
 
 #endif /* MBEDTLS_PKCS12_C */
diff --git a/common/mbedtls/pkcs12.h b/common/mbedtls/pkcs12.h
index f2230fa9b..917eaceb4 100644
--- a/common/mbedtls/pkcs12.h
+++ b/common/mbedtls/pkcs12.h
@@ -62,10 +62,10 @@ extern "C" {
  *
  * \return           0 if successful, or a MBEDTLS_ERR_XXX code
  */
-int mbedtls_pkcs12_pbe_sha1_rc4_128( mbedtls_asn1_buf *pbe_params, int mode,
-                             const unsigned char *pwd,  size_t pwdlen,
-                             const unsigned char *input, size_t len,
-                             unsigned char *output );
+int mbedtls_pkcs12_pbe_sha1_rc4_128(mbedtls_asn1_buf *pbe_params, int mode,
+                                    const unsigned char *pwd,  size_t pwdlen,
+                                    const unsigned char *input, size_t len,
+                                    unsigned char *output);
 
 /**
  * \brief            PKCS12 Password Based function (encryption / decryption)
@@ -83,11 +83,11 @@ int mbedtls_pkcs12_pbe_sha1_rc4_128( mbedtls_asn1_buf *pbe_params, int mode,
  *
  * \return           0 if successful, or a MBEDTLS_ERR_XXX code
  */
-int mbedtls_pkcs12_pbe( mbedtls_asn1_buf *pbe_params, int mode,
-                mbedtls_cipher_type_t cipher_type, mbedtls_md_type_t md_type,
-                const unsigned char *pwd,  size_t pwdlen,
-                const unsigned char *input, size_t len,
-                unsigned char *output );
+int mbedtls_pkcs12_pbe(mbedtls_asn1_buf *pbe_params, int mode,
+                       mbedtls_cipher_type_t cipher_type, mbedtls_md_type_t md_type,
+                       const unsigned char *pwd,  size_t pwdlen,
+                       const unsigned char *input, size_t len,
+                       unsigned char *output);
 
 /**
  * \brief            The PKCS#12 derivation function uses a password and a salt
@@ -110,10 +110,10 @@ int mbedtls_pkcs12_pbe( mbedtls_asn1_buf *pbe_params, int mode,
  *
  * \return          0 if successful, or a MD, BIGNUM type error.
  */
-int mbedtls_pkcs12_derivation( unsigned char *data, size_t datalen,
-                       const unsigned char *pwd, size_t pwdlen,
-                       const unsigned char *salt, size_t saltlen,
-                       mbedtls_md_type_t mbedtls_md, int id, int iterations );
+int mbedtls_pkcs12_derivation(unsigned char *data, size_t datalen,
+                              const unsigned char *pwd, size_t pwdlen,
+                              const unsigned char *salt, size_t saltlen,
+                              mbedtls_md_type_t mbedtls_md, int id, int iterations);
 
 #ifdef __cplusplus
 }
diff --git a/common/mbedtls/pkcs5.c b/common/mbedtls/pkcs5.c
index e62d663d2..f6d3b9612 100644
--- a/common/mbedtls/pkcs5.c
+++ b/common/mbedtls/pkcs5.c
@@ -57,10 +57,10 @@
 #endif
 
 #if !defined(MBEDTLS_ASN1_PARSE_C)
-int mbedtls_pkcs5_pbes2( const mbedtls_asn1_buf *pbe_params, int mode,
-                 const unsigned char *pwd,  size_t pwdlen,
-                 const unsigned char *data, size_t datalen,
-                 unsigned char *output )
+int mbedtls_pkcs5_pbes2(const mbedtls_asn1_buf *pbe_params, int mode,
+                        const unsigned char *pwd,  size_t pwdlen,
+                        const unsigned char *data, size_t datalen,
+                        unsigned char *output)
 {
     ((void) pbe_params);
     ((void) mode);
@@ -69,21 +69,21 @@ int mbedtls_pkcs5_pbes2( const mbedtls_asn1_buf *pbe_params, int mode,
     ((void) data);
     ((void) datalen);
     ((void) output);
-    return( MBEDTLS_ERR_PKCS5_FEATURE_UNAVAILABLE );
+    return (MBEDTLS_ERR_PKCS5_FEATURE_UNAVAILABLE);
 }
 #else
-static int pkcs5_parse_pbkdf2_params( const mbedtls_asn1_buf *params,
-                                      mbedtls_asn1_buf *salt, int *iterations,
-                                      int *keylen, mbedtls_md_type_t *md_type )
+static int pkcs5_parse_pbkdf2_params(const mbedtls_asn1_buf *params,
+                                     mbedtls_asn1_buf *salt, int *iterations,
+                                     int *keylen, mbedtls_md_type_t *md_type)
 {
     int ret;
     mbedtls_asn1_buf prf_alg_oid;
     unsigned char *p = params->p;
     const unsigned char *end = params->p + params->len;
 
-    if( params->tag != ( MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) )
-        return( MBEDTLS_ERR_PKCS5_INVALID_FORMAT +
-                MBEDTLS_ERR_ASN1_UNEXPECTED_TAG );
+    if (params->tag != (MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE))
+        return (MBEDTLS_ERR_PKCS5_INVALID_FORMAT +
+                MBEDTLS_ERR_ASN1_UNEXPECTED_TAG);
     /*
      *  PBKDF2-params ::= SEQUENCE {
      *    salt              OCTET STRING,
@@ -93,44 +93,43 @@ static int pkcs5_parse_pbkdf2_params( const mbedtls_asn1_buf *params,
      *  }
      *
      */
-    if( ( ret = mbedtls_asn1_get_tag( &p, end, &salt->len, MBEDTLS_ASN1_OCTET_STRING ) ) != 0 )
-        return( MBEDTLS_ERR_PKCS5_INVALID_FORMAT + ret );
+    if ((ret = mbedtls_asn1_get_tag(&p, end, &salt->len, MBEDTLS_ASN1_OCTET_STRING)) != 0)
+        return (MBEDTLS_ERR_PKCS5_INVALID_FORMAT + ret);
 
     salt->p = p;
     p += salt->len;
 
-    if( ( ret = mbedtls_asn1_get_int( &p, end, iterations ) ) != 0 )
-        return( MBEDTLS_ERR_PKCS5_INVALID_FORMAT + ret );
+    if ((ret = mbedtls_asn1_get_int(&p, end, iterations)) != 0)
+        return (MBEDTLS_ERR_PKCS5_INVALID_FORMAT + ret);
 
-    if( p == end )
-        return( 0 );
+    if (p == end)
+        return (0);
 
-    if( ( ret = mbedtls_asn1_get_int( &p, end, keylen ) ) != 0 )
-    {
-        if( ret != MBEDTLS_ERR_ASN1_UNEXPECTED_TAG )
-            return( MBEDTLS_ERR_PKCS5_INVALID_FORMAT + ret );
+    if ((ret = mbedtls_asn1_get_int(&p, end, keylen)) != 0) {
+        if (ret != MBEDTLS_ERR_ASN1_UNEXPECTED_TAG)
+            return (MBEDTLS_ERR_PKCS5_INVALID_FORMAT + ret);
     }
 
-    if( p == end )
-        return( 0 );
+    if (p == end)
+        return (0);
 
-    if( ( ret = mbedtls_asn1_get_alg_null( &p, end, &prf_alg_oid ) ) != 0 )
-        return( MBEDTLS_ERR_PKCS5_INVALID_FORMAT + ret );
+    if ((ret = mbedtls_asn1_get_alg_null(&p, end, &prf_alg_oid)) != 0)
+        return (MBEDTLS_ERR_PKCS5_INVALID_FORMAT + ret);
 
-    if( mbedtls_oid_get_md_hmac( &prf_alg_oid, md_type ) != 0 )
-        return( MBEDTLS_ERR_PKCS5_FEATURE_UNAVAILABLE );
+    if (mbedtls_oid_get_md_hmac(&prf_alg_oid, md_type) != 0)
+        return (MBEDTLS_ERR_PKCS5_FEATURE_UNAVAILABLE);
 
-    if( p != end )
-        return( MBEDTLS_ERR_PKCS5_INVALID_FORMAT +
-                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+    if (p != end)
+        return (MBEDTLS_ERR_PKCS5_INVALID_FORMAT +
+                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH);
 
-    return( 0 );
+    return (0);
 }
 
-int mbedtls_pkcs5_pbes2( const mbedtls_asn1_buf *pbe_params, int mode,
-                 const unsigned char *pwd,  size_t pwdlen,
-                 const unsigned char *data, size_t datalen,
-                 unsigned char *output )
+int mbedtls_pkcs5_pbes2(const mbedtls_asn1_buf *pbe_params, int mode,
+                        const unsigned char *pwd,  size_t pwdlen,
+                        const unsigned char *data, size_t datalen,
+                        unsigned char *output)
 {
     int ret, iterations = 0, keylen = 0;
     unsigned char *p, *end;
@@ -154,41 +153,39 @@ int mbedtls_pkcs5_pbes2( const mbedtls_asn1_buf *pbe_params, int mode,
      *    encryptionScheme AlgorithmIdentifier {{PBES2-Encs}}
      *  }
      */
-    if( pbe_params->tag != ( MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) )
-        return( MBEDTLS_ERR_PKCS5_INVALID_FORMAT +
-                MBEDTLS_ERR_ASN1_UNEXPECTED_TAG );
+    if (pbe_params->tag != (MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE))
+        return (MBEDTLS_ERR_PKCS5_INVALID_FORMAT +
+                MBEDTLS_ERR_ASN1_UNEXPECTED_TAG);
 
-    if( ( ret = mbedtls_asn1_get_alg( &p, end, &kdf_alg_oid, &kdf_alg_params ) ) != 0 )
-        return( MBEDTLS_ERR_PKCS5_INVALID_FORMAT + ret );
+    if ((ret = mbedtls_asn1_get_alg(&p, end, &kdf_alg_oid, &kdf_alg_params)) != 0)
+        return (MBEDTLS_ERR_PKCS5_INVALID_FORMAT + ret);
 
     // Only PBKDF2 supported at the moment
     //
-    if( MBEDTLS_OID_CMP( MBEDTLS_OID_PKCS5_PBKDF2, &kdf_alg_oid ) != 0 )
-        return( MBEDTLS_ERR_PKCS5_FEATURE_UNAVAILABLE );
+    if (MBEDTLS_OID_CMP(MBEDTLS_OID_PKCS5_PBKDF2, &kdf_alg_oid) != 0)
+        return (MBEDTLS_ERR_PKCS5_FEATURE_UNAVAILABLE);
 
-    if( ( ret = pkcs5_parse_pbkdf2_params( &kdf_alg_params,
-                                           &salt, &iterations, &keylen,
-                                           &md_type ) ) != 0 )
-    {
-        return( ret );
+    if ((ret = pkcs5_parse_pbkdf2_params(&kdf_alg_params,
+                                         &salt, &iterations, &keylen,
+                                         &md_type)) != 0) {
+        return (ret);
     }
 
-    md_info = mbedtls_md_info_from_type( md_type );
-    if( md_info == NULL )
-        return( MBEDTLS_ERR_PKCS5_FEATURE_UNAVAILABLE );
+    md_info = mbedtls_md_info_from_type(md_type);
+    if (md_info == NULL)
+        return (MBEDTLS_ERR_PKCS5_FEATURE_UNAVAILABLE);
 
-    if( ( ret = mbedtls_asn1_get_alg( &p, end, &enc_scheme_oid,
-                              &enc_scheme_params ) ) != 0 )
-    {
-        return( MBEDTLS_ERR_PKCS5_INVALID_FORMAT + ret );
+    if ((ret = mbedtls_asn1_get_alg(&p, end, &enc_scheme_oid,
+                                    &enc_scheme_params)) != 0) {
+        return (MBEDTLS_ERR_PKCS5_INVALID_FORMAT + ret);
     }
 
-    if( mbedtls_oid_get_cipher_alg( &enc_scheme_oid, &cipher_alg ) != 0 )
-        return( MBEDTLS_ERR_PKCS5_FEATURE_UNAVAILABLE );
+    if (mbedtls_oid_get_cipher_alg(&enc_scheme_oid, &cipher_alg) != 0)
+        return (MBEDTLS_ERR_PKCS5_FEATURE_UNAVAILABLE);
 
-    cipher_info = mbedtls_cipher_info_from_type( cipher_alg );
-    if( cipher_info == NULL )
-        return( MBEDTLS_ERR_PKCS5_FEATURE_UNAVAILABLE );
+    cipher_info = mbedtls_cipher_info_from_type(cipher_alg);
+    if (cipher_info == NULL)
+        return (MBEDTLS_ERR_PKCS5_FEATURE_UNAVAILABLE);
 
     /*
      * The value of keylen from pkcs5_parse_pbkdf2_params() is ignored
@@ -196,136 +193,131 @@ int mbedtls_pkcs5_pbes2( const mbedtls_asn1_buf *pbe_params, int mode,
      */
     keylen = cipher_info->key_bitlen / 8;
 
-    if( enc_scheme_params.tag != MBEDTLS_ASN1_OCTET_STRING ||
-        enc_scheme_params.len != cipher_info->iv_size )
-    {
-        return( MBEDTLS_ERR_PKCS5_INVALID_FORMAT );
+    if (enc_scheme_params.tag != MBEDTLS_ASN1_OCTET_STRING ||
+        enc_scheme_params.len != cipher_info->iv_size) {
+        return (MBEDTLS_ERR_PKCS5_INVALID_FORMAT);
     }
 
-    mbedtls_md_init( &md_ctx );
-    mbedtls_cipher_init( &cipher_ctx );
+    mbedtls_md_init(&md_ctx);
+    mbedtls_cipher_init(&cipher_ctx);
 
-    memcpy( iv, enc_scheme_params.p, enc_scheme_params.len );
+    memcpy(iv, enc_scheme_params.p, enc_scheme_params.len);
 
-    if( ( ret = mbedtls_md_setup( &md_ctx, md_info, 1 ) ) != 0 )
+    if ((ret = mbedtls_md_setup(&md_ctx, md_info, 1)) != 0)
         goto exit;
 
-    if( ( ret = mbedtls_pkcs5_pbkdf2_hmac( &md_ctx, pwd, pwdlen, salt.p, salt.len,
-                                   iterations, keylen, key ) ) != 0 )
-    {
+    if ((ret = mbedtls_pkcs5_pbkdf2_hmac(&md_ctx, pwd, pwdlen, salt.p, salt.len,
+                                         iterations, keylen, key)) != 0) {
         goto exit;
     }
 
-    if( ( ret = mbedtls_cipher_setup( &cipher_ctx, cipher_info ) ) != 0 )
+    if ((ret = mbedtls_cipher_setup(&cipher_ctx, cipher_info)) != 0)
         goto exit;
 
-    if( ( ret = mbedtls_cipher_setkey( &cipher_ctx, key, 8 * keylen, (mbedtls_operation_t) mode ) ) != 0 )
+    if ((ret = mbedtls_cipher_setkey(&cipher_ctx, key, 8 * keylen, (mbedtls_operation_t) mode)) != 0)
         goto exit;
 
-    if( ( ret = mbedtls_cipher_crypt( &cipher_ctx, iv, enc_scheme_params.len,
-                              data, datalen, output, &olen ) ) != 0 )
+    if ((ret = mbedtls_cipher_crypt(&cipher_ctx, iv, enc_scheme_params.len,
+                                    data, datalen, output, &olen)) != 0)
         ret = MBEDTLS_ERR_PKCS5_PASSWORD_MISMATCH;
 
 exit:
-    mbedtls_md_free( &md_ctx );
-    mbedtls_cipher_free( &cipher_ctx );
+    mbedtls_md_free(&md_ctx);
+    mbedtls_cipher_free(&cipher_ctx);
 
-    return( ret );
+    return (ret);
 }
 #endif /* MBEDTLS_ASN1_PARSE_C */
 
-int mbedtls_pkcs5_pbkdf2_hmac( mbedtls_md_context_t *ctx, const unsigned char *password,
-                       size_t plen, const unsigned char *salt, size_t slen,
-                       unsigned int iteration_count,
-                       uint32_t key_length, unsigned char *output )
+int mbedtls_pkcs5_pbkdf2_hmac(mbedtls_md_context_t *ctx, const unsigned char *password,
+                              size_t plen, const unsigned char *salt, size_t slen,
+                              unsigned int iteration_count,
+                              uint32_t key_length, unsigned char *output)
 {
     int ret, j;
     unsigned int i;
     unsigned char md1[MBEDTLS_MD_MAX_SIZE];
     unsigned char work[MBEDTLS_MD_MAX_SIZE];
-    unsigned char md_size = mbedtls_md_get_size( ctx->md_info );
+    unsigned char md_size = mbedtls_md_get_size(ctx->md_info);
     size_t use_len;
     unsigned char *out_p = output;
     unsigned char counter[4];
 
-    memset( counter, 0, 4 );
+    memset(counter, 0, 4);
     counter[3] = 1;
 
 #if UINT_MAX > 0xFFFFFFFF
-    if( iteration_count > 0xFFFFFFFF )
-        return( MBEDTLS_ERR_PKCS5_BAD_INPUT_DATA );
+    if (iteration_count > 0xFFFFFFFF)
+        return (MBEDTLS_ERR_PKCS5_BAD_INPUT_DATA);
 #endif
 
-    while( key_length )
-    {
+    while (key_length) {
         // U1 ends up in work
         //
-        if( ( ret = mbedtls_md_hmac_starts( ctx, password, plen ) ) != 0 )
-            return( ret );
+        if ((ret = mbedtls_md_hmac_starts(ctx, password, plen)) != 0)
+            return (ret);
 
-        if( ( ret = mbedtls_md_hmac_update( ctx, salt, slen ) ) != 0 )
-            return( ret );
+        if ((ret = mbedtls_md_hmac_update(ctx, salt, slen)) != 0)
+            return (ret);
 
-        if( ( ret = mbedtls_md_hmac_update( ctx, counter, 4 ) ) != 0 )
-            return( ret );
+        if ((ret = mbedtls_md_hmac_update(ctx, counter, 4)) != 0)
+            return (ret);
 
-        if( ( ret = mbedtls_md_hmac_finish( ctx, work ) ) != 0 )
-            return( ret );
+        if ((ret = mbedtls_md_hmac_finish(ctx, work)) != 0)
+            return (ret);
 
-        memcpy( md1, work, md_size );
+        memcpy(md1, work, md_size);
 
-        for( i = 1; i < iteration_count; i++ )
-        {
+        for (i = 1; i < iteration_count; i++) {
             // U2 ends up in md1
             //
-            if( ( ret = mbedtls_md_hmac_starts( ctx, password, plen ) ) != 0 )
-                return( ret );
+            if ((ret = mbedtls_md_hmac_starts(ctx, password, plen)) != 0)
+                return (ret);
 
-            if( ( ret = mbedtls_md_hmac_update( ctx, md1, md_size ) ) != 0 )
-                return( ret );
+            if ((ret = mbedtls_md_hmac_update(ctx, md1, md_size)) != 0)
+                return (ret);
 
-            if( ( ret = mbedtls_md_hmac_finish( ctx, md1 ) ) != 0 )
-                return( ret );
+            if ((ret = mbedtls_md_hmac_finish(ctx, md1)) != 0)
+                return (ret);
 
             // U1 xor U2
             //
-            for( j = 0; j < md_size; j++ )
+            for (j = 0; j < md_size; j++)
                 work[j] ^= md1[j];
         }
 
-        use_len = ( key_length < md_size ) ? key_length : md_size;
-        memcpy( out_p, work, use_len );
+        use_len = (key_length < md_size) ? key_length : md_size;
+        memcpy(out_p, work, use_len);
 
         key_length -= (uint32_t) use_len;
         out_p += use_len;
 
-        for( i = 4; i > 0; i-- )
-            if( ++counter[i - 1] != 0 )
+        for (i = 4; i > 0; i--)
+            if (++counter[i - 1] != 0)
                 break;
     }
 
-    return( 0 );
+    return (0);
 }
 
 #if defined(MBEDTLS_SELF_TEST)
 
 #if !defined(MBEDTLS_SHA1_C)
-int mbedtls_pkcs5_self_test( int verbose )
+int mbedtls_pkcs5_self_test(int verbose)
 {
-    if( verbose != 0 )
-        mbedtls_printf( "  PBKDF2 (SHA1): skipped\n\n" );
+    if (verbose != 0)
+        mbedtls_printf("  PBKDF2 (SHA1): skipped\n\n");
 
-    return( 0 );
+    return (0);
 }
 #else
 
 #define MAX_TESTS   6
 
 static const size_t plen[MAX_TESTS] =
-    { 8, 8, 8, 24, 9 };
+{ 8, 8, 8, 24, 9 };
 
-static const unsigned char password[MAX_TESTS][32] =
-{
+static const unsigned char password[MAX_TESTS][32] = {
     "password",
     "password",
     "password",
@@ -334,10 +326,9 @@ static const unsigned char password[MAX_TESTS][32] =
 };
 
 static const size_t slen[MAX_TESTS] =
-    { 4, 4, 4, 36, 5 };
+{ 4, 4, 4, 36, 5 };
 
-static const unsigned char salt[MAX_TESTS][40] =
-{
+static const unsigned char salt[MAX_TESTS][40] = {
     "salt",
     "salt",
     "salt",
@@ -346,80 +337,85 @@ static const unsigned char salt[MAX_TESTS][40] =
 };
 
 static const uint32_t it_cnt[MAX_TESTS] =
-    { 1, 2, 4096, 4096, 4096 };
+{ 1, 2, 4096, 4096, 4096 };
 
 static const uint32_t key_len[MAX_TESTS] =
-    { 20, 20, 20, 25, 16 };
+{ 20, 20, 20, 25, 16 };
 
-static const unsigned char result_key[MAX_TESTS][32] =
-{
-    { 0x0c, 0x60, 0xc8, 0x0f, 0x96, 0x1f, 0x0e, 0x71,
-      0xf3, 0xa9, 0xb5, 0x24, 0xaf, 0x60, 0x12, 0x06,
-      0x2f, 0xe0, 0x37, 0xa6 },
-    { 0xea, 0x6c, 0x01, 0x4d, 0xc7, 0x2d, 0x6f, 0x8c,
-      0xcd, 0x1e, 0xd9, 0x2a, 0xce, 0x1d, 0x41, 0xf0,
-      0xd8, 0xde, 0x89, 0x57 },
-    { 0x4b, 0x00, 0x79, 0x01, 0xb7, 0x65, 0x48, 0x9a,
-      0xbe, 0xad, 0x49, 0xd9, 0x26, 0xf7, 0x21, 0xd0,
-      0x65, 0xa4, 0x29, 0xc1 },
-    { 0x3d, 0x2e, 0xec, 0x4f, 0xe4, 0x1c, 0x84, 0x9b,
-      0x80, 0xc8, 0xd8, 0x36, 0x62, 0xc0, 0xe4, 0x4a,
-      0x8b, 0x29, 0x1a, 0x96, 0x4c, 0xf2, 0xf0, 0x70,
-      0x38 },
-    { 0x56, 0xfa, 0x6a, 0xa7, 0x55, 0x48, 0x09, 0x9d,
-      0xcc, 0x37, 0xd7, 0xf0, 0x34, 0x25, 0xe0, 0xc3 },
+static const unsigned char result_key[MAX_TESTS][32] = {
+    {
+        0x0c, 0x60, 0xc8, 0x0f, 0x96, 0x1f, 0x0e, 0x71,
+        0xf3, 0xa9, 0xb5, 0x24, 0xaf, 0x60, 0x12, 0x06,
+        0x2f, 0xe0, 0x37, 0xa6
+    },
+    {
+        0xea, 0x6c, 0x01, 0x4d, 0xc7, 0x2d, 0x6f, 0x8c,
+        0xcd, 0x1e, 0xd9, 0x2a, 0xce, 0x1d, 0x41, 0xf0,
+        0xd8, 0xde, 0x89, 0x57
+    },
+    {
+        0x4b, 0x00, 0x79, 0x01, 0xb7, 0x65, 0x48, 0x9a,
+        0xbe, 0xad, 0x49, 0xd9, 0x26, 0xf7, 0x21, 0xd0,
+        0x65, 0xa4, 0x29, 0xc1
+    },
+    {
+        0x3d, 0x2e, 0xec, 0x4f, 0xe4, 0x1c, 0x84, 0x9b,
+        0x80, 0xc8, 0xd8, 0x36, 0x62, 0xc0, 0xe4, 0x4a,
+        0x8b, 0x29, 0x1a, 0x96, 0x4c, 0xf2, 0xf0, 0x70,
+        0x38
+    },
+    {
+        0x56, 0xfa, 0x6a, 0xa7, 0x55, 0x48, 0x09, 0x9d,
+        0xcc, 0x37, 0xd7, 0xf0, 0x34, 0x25, 0xe0, 0xc3
+    },
 };
 
-int mbedtls_pkcs5_self_test( int verbose )
+int mbedtls_pkcs5_self_test(int verbose)
 {
     mbedtls_md_context_t sha1_ctx;
     const mbedtls_md_info_t *info_sha1;
     int ret, i;
     unsigned char key[64];
 
-    mbedtls_md_init( &sha1_ctx );
+    mbedtls_md_init(&sha1_ctx);
 
-    info_sha1 = mbedtls_md_info_from_type( MBEDTLS_MD_SHA1 );
-    if( info_sha1 == NULL )
-    {
+    info_sha1 = mbedtls_md_info_from_type(MBEDTLS_MD_SHA1);
+    if (info_sha1 == NULL) {
         ret = 1;
         goto exit;
     }
 
-    if( ( ret = mbedtls_md_setup( &sha1_ctx, info_sha1, 1 ) ) != 0 )
-    {
+    if ((ret = mbedtls_md_setup(&sha1_ctx, info_sha1, 1)) != 0) {
         ret = 1;
         goto exit;
     }
 
-    for( i = 0; i < MAX_TESTS; i++ )
-    {
-        if( verbose != 0 )
-            mbedtls_printf( "  PBKDF2 (SHA1) #%d: ", i );
+    for (i = 0; i < MAX_TESTS; i++) {
+        if (verbose != 0)
+            mbedtls_printf("  PBKDF2 (SHA1) #%d: ", i);
 
-        ret = mbedtls_pkcs5_pbkdf2_hmac( &sha1_ctx, password[i], plen[i], salt[i],
-                                  slen[i], it_cnt[i], key_len[i], key );
-        if( ret != 0 ||
-            memcmp( result_key[i], key, key_len[i] ) != 0 )
-        {
-            if( verbose != 0 )
-                mbedtls_printf( "failed\n" );
+        ret = mbedtls_pkcs5_pbkdf2_hmac(&sha1_ctx, password[i], plen[i], salt[i],
+                                        slen[i], it_cnt[i], key_len[i], key);
+        if (ret != 0 ||
+            memcmp(result_key[i], key, key_len[i]) != 0) {
+            if (verbose != 0)
+                mbedtls_printf("failed\n");
 
             ret = 1;
             goto exit;
         }
 
-        if( verbose != 0 )
-            mbedtls_printf( "passed\n" );
+        if (verbose != 0)
+            mbedtls_printf("passed\n");
     }
 
-    if( verbose != 0 )
-        mbedtls_printf( "\n" );
+    if (verbose != 0)
+        mbedtls_printf("\n");
 
 exit:
-    mbedtls_md_free( &sha1_ctx );
+    mbedtls_md_free(&sha1_ctx);
 
-    return( ret );
+    return (ret);
 }
 #endif /* MBEDTLS_SHA1_C */
 
diff --git a/common/mbedtls/pkcs5.h b/common/mbedtls/pkcs5.h
index 7b6acf580..c60f15834 100644
--- a/common/mbedtls/pkcs5.h
+++ b/common/mbedtls/pkcs5.h
@@ -59,10 +59,10 @@ extern "C" {
  *
  * \returns        0 on success, or a MBEDTLS_ERR_XXX code if verification fails.
  */
-int mbedtls_pkcs5_pbes2( const mbedtls_asn1_buf *pbe_params, int mode,
-                 const unsigned char *pwd,  size_t pwdlen,
-                 const unsigned char *data, size_t datalen,
-                 unsigned char *output );
+int mbedtls_pkcs5_pbes2(const mbedtls_asn1_buf *pbe_params, int mode,
+                        const unsigned char *pwd,  size_t pwdlen,
+                        const unsigned char *data, size_t datalen,
+                        unsigned char *output);
 
 /**
  * \brief          PKCS#5 PBKDF2 using HMAC
@@ -78,17 +78,17 @@ int mbedtls_pkcs5_pbes2( const mbedtls_asn1_buf *pbe_params, int mode,
  *
  * \returns        0 on success, or a MBEDTLS_ERR_XXX code if verification fails.
  */
-int mbedtls_pkcs5_pbkdf2_hmac( mbedtls_md_context_t *ctx, const unsigned char *password,
-                       size_t plen, const unsigned char *salt, size_t slen,
-                       unsigned int iteration_count,
-                       uint32_t key_length, unsigned char *output );
+int mbedtls_pkcs5_pbkdf2_hmac(mbedtls_md_context_t *ctx, const unsigned char *password,
+                              size_t plen, const unsigned char *salt, size_t slen,
+                              unsigned int iteration_count,
+                              uint32_t key_length, unsigned char *output);
 
 /**
  * \brief          Checkup routine
  *
  * \return         0 if successful, or 1 if the test failed
  */
-int mbedtls_pkcs5_self_test( int verbose );
+int mbedtls_pkcs5_self_test(int verbose);
 
 #ifdef __cplusplus
 }
diff --git a/common/mbedtls/pkparse.c b/common/mbedtls/pkparse.c
index a687076b0..8a2725f12 100644
--- a/common/mbedtls/pkparse.c
+++ b/common/mbedtls/pkparse.c
@@ -71,94 +71,91 @@
  * A terminating null byte is always appended. It is included in the announced
  * length only if the data looks like it is PEM encoded.
  */
-int mbedtls_pk_load_file( const char *path, unsigned char **buf, size_t *n )
+int mbedtls_pk_load_file(const char *path, unsigned char **buf, size_t *n)
 {
     FILE *f;
     long size;
 
-    if( ( f = fopen( path, "rb" ) ) == NULL )
-        return( MBEDTLS_ERR_PK_FILE_IO_ERROR );
+    if ((f = fopen(path, "rb")) == NULL)
+        return (MBEDTLS_ERR_PK_FILE_IO_ERROR);
 
-    fseek( f, 0, SEEK_END );
-    if( ( size = ftell( f ) ) == -1 )
-    {
-        fclose( f );
-        return( MBEDTLS_ERR_PK_FILE_IO_ERROR );
+    fseek(f, 0, SEEK_END);
+    if ((size = ftell(f)) == -1) {
+        fclose(f);
+        return (MBEDTLS_ERR_PK_FILE_IO_ERROR);
     }
-    fseek( f, 0, SEEK_SET );
+    fseek(f, 0, SEEK_SET);
 
     *n = (size_t) size;
 
-    if( *n + 1 == 0 ||
-        ( *buf = mbedtls_calloc( 1, *n + 1 ) ) == NULL )
-    {
-        fclose( f );
-        return( MBEDTLS_ERR_PK_ALLOC_FAILED );
+    if (*n + 1 == 0 ||
+        (*buf = mbedtls_calloc(1, *n + 1)) == NULL) {
+        fclose(f);
+        return (MBEDTLS_ERR_PK_ALLOC_FAILED);
     }
 
-    if( fread( *buf, 1, *n, f ) != *n )
-    {
-        fclose( f );
+    if (fread(*buf, 1, *n, f) != *n) {
+        fclose(f);
 
-        mbedtls_platform_zeroize( *buf, *n );
-        mbedtls_free( *buf );
+        mbedtls_platform_zeroize(*buf, *n);
+        mbedtls_free(*buf);
 
-        return( MBEDTLS_ERR_PK_FILE_IO_ERROR );
+        return (MBEDTLS_ERR_PK_FILE_IO_ERROR);
     }
 
-    fclose( f );
+    fclose(f);
 
     (*buf)[*n] = '\0';
 
-    if( strstr( (const char *) *buf, "-----BEGIN " ) != NULL )
+    if (strstr((const char *) *buf, "-----BEGIN ") != NULL)
         ++*n;
 
-    return( 0 );
+    return (0);
 }
 
 /*
  * Load and parse a private key
  */
-int mbedtls_pk_parse_keyfile( mbedtls_pk_context *ctx,
-                      const char *path, const char *pwd )
+int mbedtls_pk_parse_keyfile(mbedtls_pk_context *ctx,
+                             const char *path, const char *pwd)
 {
     int ret;
     size_t n;
     unsigned char *buf;
 
-    if( ( ret = mbedtls_pk_load_file( path, &buf, &n ) ) != 0 )
-        return( ret );
+    if ((ret = mbedtls_pk_load_file(path, &buf, &n)) != 0)
+        return (ret);
 
-    if( pwd == NULL )
-        ret = mbedtls_pk_parse_key( ctx, buf, n, NULL, 0 );
+    if (pwd == NULL)
+        ret = mbedtls_pk_parse_key(ctx, buf, n, NULL, 0);
     else
-        ret = mbedtls_pk_parse_key( ctx, buf, n,
-                (const unsigned char *) pwd, strlen( pwd ) );
+        ret = mbedtls_pk_parse_key(ctx, buf, n,
+                                   (const unsigned char *) pwd, strlen(pwd));
 
-    mbedtls_platform_zeroize( buf, n );
-    mbedtls_free( buf );
+    mbedtls_platform_zeroize(buf, n);
+    mbedtls_free(buf);
 
-    return( ret );
+    return (ret);
 }
 
 /*
  * Load and parse a public key
  */
-int mbedtls_pk_parse_public_keyfile( mbedtls_pk_context *ctx, const char *path )
+int mbedtls_pk_parse_public_keyfile(mbedtls_pk_context *ctx, const char *path)
 {
     int ret;
     size_t n;
     unsigned char *buf;
 
-    if( ( ret = mbedtls_pk_load_file( path, &buf, &n ) ) != 0 )
-        return( ret );
+    if ((ret = mbedtls_pk_load_file(path, &buf, &n)) != 0)
+        return (ret);
 
-    ret = mbedtls_pk_parse_public_key( ctx, buf, n );
+    ret = mbedtls_pk_parse_public_key(ctx, buf, n);
 
-    mbedtls_platform_zeroize( buf, n );
-    mbedtls_free( buf );
+    mbedtls_platform_zeroize(buf, n);
+    mbedtls_free(buf);
 
-    return( ret );
+    return (ret);
 }
 #endif /* MBEDTLS_FS_IO */
 
@@ -171,40 +168,38 @@ int mbedtls_pk_parse_public_keyfile( mbedtls_pk_context *ctx, const char *path )
  *   -- implicitCurve   NULL
  * }
  */
-static int pk_get_ecparams( unsigned char **p, const unsigned char *end,
-                            mbedtls_asn1_buf *params )
+static int pk_get_ecparams(unsigned char **p, const unsigned char *end,
+                           mbedtls_asn1_buf *params)
 {
     int ret;
 
-    if ( end - *p < 1 )
-        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT +
-                MBEDTLS_ERR_ASN1_OUT_OF_DATA );
+    if (end - *p < 1)
+        return (MBEDTLS_ERR_PK_KEY_INVALID_FORMAT +
+                MBEDTLS_ERR_ASN1_OUT_OF_DATA);
 
     /* Tag may be either OID or SEQUENCE */
     params->tag = **p;
-    if( params->tag != MBEDTLS_ASN1_OID
+    if (params->tag != MBEDTLS_ASN1_OID
 #if defined(MBEDTLS_PK_PARSE_EC_EXTENDED)
-            && params->tag != ( MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE )
+        && params->tag != (MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE)
 #endif
-            )
-    {
-        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT +
-                MBEDTLS_ERR_ASN1_UNEXPECTED_TAG );
+       ) {
+        return (MBEDTLS_ERR_PK_KEY_INVALID_FORMAT +
+                MBEDTLS_ERR_ASN1_UNEXPECTED_TAG);
     }
 
-    if( ( ret = mbedtls_asn1_get_tag( p, end, &params->len, params->tag ) ) != 0 )
-    {
-        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret );
+    if ((ret = mbedtls_asn1_get_tag(p, end, &params->len, params->tag)) != 0) {
+        return (MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret);
     }
 
     params->p = *p;
     *p += params->len;
 
-    if( *p != end )
-        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT +
-                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+    if (*p != end)
+        return (MBEDTLS_ERR_PK_KEY_INVALID_FORMAT +
+                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH);
 
-    return( 0 );
+    return (0);
 }
 
 #if defined(MBEDTLS_PK_PARSE_EC_EXTENDED)
@@ -227,21 +222,21 @@ static int pk_get_ecparams( unsigned char **p, const unsigned char *end,
  *
  * We only support prime-field as field type, and ignore hash and cofactor.
  */
-static int pk_group_from_specified( const mbedtls_asn1_buf *params, mbedtls_ecp_group *grp )
+static int pk_group_from_specified(const mbedtls_asn1_buf *params, mbedtls_ecp_group *grp)
 {
     int ret;
     unsigned char *p = params->p;
-    const unsigned char * const end = params->p + params->len;
+    const unsigned char *const end = params->p + params->len;
     const unsigned char *end_field, *end_curve;
     size_t len;
     int ver;
 
     /* SpecifiedECDomainVersion ::= INTEGER { 1, 2, 3 } */
-    if( ( ret = mbedtls_asn1_get_int( &p, end, &ver ) ) != 0 )
-        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret );
+    if ((ret = mbedtls_asn1_get_int(&p, end, &ver)) != 0)
+        return (MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret);
 
-    if( ver < 1 || ver > 3 )
-        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT );
+    if (ver < 1 || ver > 3)
+        return (MBEDTLS_ERR_PK_KEY_INVALID_FORMAT);
 
     /*
      * FieldID { FIELD-ID:IOSet } ::= SEQUENCE { -- Finite field
@@ -249,9 +244,9 @@ static int pk_group_from_specified( const mbedtls_asn1_buf *params, mbedtls_ecp_
      *       parameters FIELD-ID.&Type({IOSet}{@fieldType})
      * }
      */
-    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len,
-            MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
-        return( ret );
+    if ((ret = mbedtls_asn1_get_tag(&p, end, &len,
+                                    MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE)) != 0)
+        return (ret);
 
     end_field = p + len;
 
@@ -263,26 +258,25 @@ static int pk_group_from_specified( const mbedtls_asn1_buf *params, mbedtls_ecp_
      * }
      * prime-field OBJECT IDENTIFIER ::= { id-fieldType 1 }
      */
-    if( ( ret = mbedtls_asn1_get_tag( &p, end_field, &len, MBEDTLS_ASN1_OID ) ) != 0 )
-        return( ret );
+    if ((ret = mbedtls_asn1_get_tag(&p, end_field, &len, MBEDTLS_ASN1_OID)) != 0)
+        return (ret);
 
-    if( len != MBEDTLS_OID_SIZE( MBEDTLS_OID_ANSI_X9_62_PRIME_FIELD ) ||
-        memcmp( p, MBEDTLS_OID_ANSI_X9_62_PRIME_FIELD, len ) != 0 )
-    {
-        return( MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE );
+    if (len != MBEDTLS_OID_SIZE(MBEDTLS_OID_ANSI_X9_62_PRIME_FIELD) ||
+        memcmp(p, MBEDTLS_OID_ANSI_X9_62_PRIME_FIELD, len) != 0) {
+        return (MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE);
     }
 
     p += len;
 
     /* Prime-p ::= INTEGER -- Field of size p. */
-    if( ( ret = mbedtls_asn1_get_mpi( &p, end_field, &grp->P ) ) != 0 )
-        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret );
+    if ((ret = mbedtls_asn1_get_mpi(&p, end_field, &grp->P)) != 0)
+        return (MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret);
 
-    grp->pbits = mbedtls_mpi_bitlen( &grp->P );
+    grp->pbits = mbedtls_mpi_bitlen(&grp->P);
 
-    if( p != end_field )
-        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT +
-                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+    if (p != end_field)
+        return (MBEDTLS_ERR_PK_KEY_INVALID_FORMAT +
+                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH);
 
     /*
      * Curve ::= SEQUENCE {
@@ -293,9 +287,9 @@ static int pk_group_from_specified( const mbedtls_asn1_buf *params, mbedtls_ecp_
      *       -- with version equal to ecdpVer2 or ecdpVer3
      * }
      */
-    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len,
-            MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
-        return( ret );
+    if ((ret = mbedtls_asn1_get_tag(&p, end, &len,
+                                    MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE)) != 0)
+        return (ret);
 
     end_curve = p + len;
 
@@ -303,51 +297,47 @@ static int pk_group_from_specified( const mbedtls_asn1_buf *params, mbedtls_ecp_
      * FieldElement ::= OCTET STRING
      * containing an integer in the case of a prime field
      */
-    if( ( ret = mbedtls_asn1_get_tag( &p, end_curve, &len, MBEDTLS_ASN1_OCTET_STRING ) ) != 0 ||
-        ( ret = mbedtls_mpi_read_binary( &grp->A, p, len ) ) != 0 )
-    {
-        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret );
+    if ((ret = mbedtls_asn1_get_tag(&p, end_curve, &len, MBEDTLS_ASN1_OCTET_STRING)) != 0 ||
+        (ret = mbedtls_mpi_read_binary(&grp->A, p, len)) != 0) {
+        return (MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret);
     }
 
     p += len;
 
-    if( ( ret = mbedtls_asn1_get_tag( &p, end_curve, &len, MBEDTLS_ASN1_OCTET_STRING ) ) != 0 ||
-        ( ret = mbedtls_mpi_read_binary( &grp->B, p, len ) ) != 0 )
-    {
-        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret );
+    if ((ret = mbedtls_asn1_get_tag(&p, end_curve, &len, MBEDTLS_ASN1_OCTET_STRING)) != 0 ||
+        (ret = mbedtls_mpi_read_binary(&grp->B, p, len)) != 0) {
+        return (MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret);
     }
 
     p += len;
 
     /* Ignore seed BIT STRING OPTIONAL */
-    if( ( ret = mbedtls_asn1_get_tag( &p, end_curve, &len, MBEDTLS_ASN1_BIT_STRING ) ) == 0 )
+    if ((ret = mbedtls_asn1_get_tag(&p, end_curve, &len, MBEDTLS_ASN1_BIT_STRING)) == 0)
         p += len;
 
-    if( p != end_curve )
-        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT +
-                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+    if (p != end_curve)
+        return (MBEDTLS_ERR_PK_KEY_INVALID_FORMAT +
+                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH);
 
     /*
      * ECPoint ::= OCTET STRING
      */
-    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len, MBEDTLS_ASN1_OCTET_STRING ) ) != 0 )
-        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret );
+    if ((ret = mbedtls_asn1_get_tag(&p, end, &len, MBEDTLS_ASN1_OCTET_STRING)) != 0)
+        return (MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret);
 
-    if( ( ret = mbedtls_ecp_point_read_binary( grp, &grp->G,
-                                      ( const unsigned char *) p, len ) ) != 0 )
-    {
+    if ((ret = mbedtls_ecp_point_read_binary(grp, &grp->G,
+                                             (const unsigned char *) p, len)) != 0) {
         /*
          * If we can't read the point because it's compressed, cheat by
          * reading only the X coordinate and the parity bit of Y.
          */
-        if( ret != MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE ||
-            ( p[0] != 0x02 && p[0] != 0x03 ) ||
-            len != mbedtls_mpi_size( &grp->P ) + 1 ||
-            mbedtls_mpi_read_binary( &grp->G.X, p + 1, len - 1 ) != 0 ||
-            mbedtls_mpi_lset( &grp->G.Y, p[0] - 2 ) != 0 ||
-            mbedtls_mpi_lset( &grp->G.Z, 1 ) != 0 )
-        {
-            return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT );
+        if (ret != MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE ||
+            (p[0] != 0x02 && p[0] != 0x03) ||
+            len != mbedtls_mpi_size(&grp->P) + 1 ||
+            mbedtls_mpi_read_binary(&grp->G.X, p + 1, len - 1) != 0 ||
+            mbedtls_mpi_lset(&grp->G.Y, p[0] - 2) != 0 ||
+            mbedtls_mpi_lset(&grp->G.Z, 1) != 0) {
+            return (MBEDTLS_ERR_PK_KEY_INVALID_FORMAT);
         }
     }
 
@@ -356,83 +346,81 @@ static int pk_group_from_specified( const mbedtls_asn1_buf *params, mbedtls_ecp_
     /*
      * order INTEGER
      */
-    if( ( ret = mbedtls_asn1_get_mpi( &p, end, &grp->N ) ) != 0 )
-        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret );
+    if ((ret = mbedtls_asn1_get_mpi(&p, end, &grp->N)) != 0)
+        return (MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret);
 
-    grp->nbits = mbedtls_mpi_bitlen( &grp->N );
+    grp->nbits = mbedtls_mpi_bitlen(&grp->N);
 
     /*
      * Allow optional elements by purposefully not enforcing p == end here.
      */
 
-    return( 0 );
+    return (0);
 }
 
 /*
  * Find the group id associated with an (almost filled) group as generated by
  * pk_group_from_specified(), or return an error if unknown.
  */
-static int pk_group_id_from_group( const mbedtls_ecp_group *grp, mbedtls_ecp_group_id *grp_id )
+static int pk_group_id_from_group(const mbedtls_ecp_group *grp, mbedtls_ecp_group_id *grp_id)
 {
     int ret = 0;
     mbedtls_ecp_group ref;
     const mbedtls_ecp_group_id *id;
 
-    mbedtls_ecp_group_init( &ref );
+    mbedtls_ecp_group_init(&ref);
 
-    for( id = mbedtls_ecp_grp_id_list(); *id != MBEDTLS_ECP_DP_NONE; id++ )
-    {
+    for (id = mbedtls_ecp_grp_id_list(); *id != MBEDTLS_ECP_DP_NONE; id++) {
         /* Load the group associated to that id */
-        mbedtls_ecp_group_free( &ref );
-        MBEDTLS_MPI_CHK( mbedtls_ecp_group_load( &ref, *id ) );
+        mbedtls_ecp_group_free(&ref);
+        MBEDTLS_MPI_CHK(mbedtls_ecp_group_load(&ref, *id));
 
         /* Compare to the group we were given, starting with easy tests */
-        if( grp->pbits == ref.pbits && grp->nbits == ref.nbits &&
-            mbedtls_mpi_cmp_mpi( &grp->P, &ref.P ) == 0 &&
-            mbedtls_mpi_cmp_mpi( &grp->A, &ref.A ) == 0 &&
-            mbedtls_mpi_cmp_mpi( &grp->B, &ref.B ) == 0 &&
-            mbedtls_mpi_cmp_mpi( &grp->N, &ref.N ) == 0 &&
-            mbedtls_mpi_cmp_mpi( &grp->G.X, &ref.G.X ) == 0 &&
-            mbedtls_mpi_cmp_mpi( &grp->G.Z, &ref.G.Z ) == 0 &&
+        if (grp->pbits == ref.pbits && grp->nbits == ref.nbits &&
+            mbedtls_mpi_cmp_mpi(&grp->P, &ref.P) == 0 &&
+            mbedtls_mpi_cmp_mpi(&grp->A, &ref.A) == 0 &&
+            mbedtls_mpi_cmp_mpi(&grp->B, &ref.B) == 0 &&
+            mbedtls_mpi_cmp_mpi(&grp->N, &ref.N) == 0 &&
+            mbedtls_mpi_cmp_mpi(&grp->G.X, &ref.G.X) == 0 &&
+            mbedtls_mpi_cmp_mpi(&grp->G.Z, &ref.G.Z) == 0 &&
             /* For Y we may only know the parity bit, so compare only that */
-            mbedtls_mpi_get_bit( &grp->G.Y, 0 ) == mbedtls_mpi_get_bit( &ref.G.Y, 0 ) )
-        {
+            mbedtls_mpi_get_bit(&grp->G.Y, 0) == mbedtls_mpi_get_bit(&ref.G.Y, 0)) {
             break;
         }
 
     }
 
 cleanup:
-    mbedtls_ecp_group_free( &ref );
+    mbedtls_ecp_group_free(&ref);
 
     *grp_id = *id;
 
-    if( ret == 0 && *id == MBEDTLS_ECP_DP_NONE )
+    if (ret == 0 && *id == MBEDTLS_ECP_DP_NONE)
         ret = MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE;
 
-    return( ret );
+    return (ret);
 }
 
 /*
  * Parse a SpecifiedECDomain (SEC 1 C.2) and find the associated group ID
  */
-static int pk_group_id_from_specified( const mbedtls_asn1_buf *params,
-                                       mbedtls_ecp_group_id *grp_id )
+static int pk_group_id_from_specified(const mbedtls_asn1_buf *params,
+                                      mbedtls_ecp_group_id *grp_id)
 {
     int ret;
     mbedtls_ecp_group grp;
 
-    mbedtls_ecp_group_init( &grp );
+    mbedtls_ecp_group_init(&grp);
 
-    if( ( ret = pk_group_from_specified( params, &grp ) ) != 0 )
+    if ((ret = pk_group_from_specified(params, &grp)) != 0)
         goto cleanup;
 
-    ret = pk_group_id_from_group( &grp, grp_id );
+    ret = pk_group_id_from_group(&grp, grp_id);
 
 cleanup:
-    mbedtls_ecp_group_free( &grp );
+    mbedtls_ecp_group_free(&grp);
 
-    return( ret );
+    return (ret);
 }
 #endif /* MBEDTLS_PK_PARSE_EC_EXTENDED */
 
@@ -444,36 +432,33 @@ cleanup:
  *   specifiedCurve     SpecifiedECDomain -- = SEQUENCE { ... }
  *   -- implicitCurve   NULL
  */
-static int pk_use_ecparams( const mbedtls_asn1_buf *params, mbedtls_ecp_group *grp )
+static int pk_use_ecparams(const mbedtls_asn1_buf *params, mbedtls_ecp_group *grp)
 {
     int ret;
     mbedtls_ecp_group_id grp_id;
 
-    if( params->tag == MBEDTLS_ASN1_OID )
-    {
-        if( mbedtls_oid_get_ec_grp( params, &grp_id ) != 0 )
-            return( MBEDTLS_ERR_PK_UNKNOWN_NAMED_CURVE );
-    }
-    else
-    {
+    if (params->tag == MBEDTLS_ASN1_OID) {
+        if (mbedtls_oid_get_ec_grp(params, &grp_id) != 0)
+            return (MBEDTLS_ERR_PK_UNKNOWN_NAMED_CURVE);
+    } else {
 #if defined(MBEDTLS_PK_PARSE_EC_EXTENDED)
-        if( ( ret = pk_group_id_from_specified( params, &grp_id ) ) != 0 )
-            return( ret );
+        if ((ret = pk_group_id_from_specified(params, &grp_id)) != 0)
+            return (ret);
 #else
-        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT );
+        return (MBEDTLS_ERR_PK_KEY_INVALID_FORMAT);
 #endif
     }
 
     /*
      * grp may already be initilialized; if so, make sure IDs match
      */
-    if( grp->id != MBEDTLS_ECP_DP_NONE && grp->id != grp_id )
-        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT );
+    if (grp->id != MBEDTLS_ECP_DP_NONE && grp->id != grp_id)
+        return (MBEDTLS_ERR_PK_KEY_INVALID_FORMAT);
 
-    if( ( ret = mbedtls_ecp_group_load( grp, grp_id ) ) != 0 )
-        return( ret );
+    if ((ret = mbedtls_ecp_group_load(grp, grp_id)) != 0)
+        return (ret);
 
-    return( 0 );
+    return (0);
 }
 
 /*
@@ -483,15 +468,14 @@ static int pk_use_ecparams( const mbedtls_asn1_buf *params, mbedtls_ecp_group *g
  * desired. Take care to pass along the possible ECP_FEATURE_UNAVAILABLE
  * return code of mbedtls_ecp_point_read_binary() and leave p in a usable state.
  */
-static int pk_get_ecpubkey( unsigned char **p, const unsigned char *end,
-                            mbedtls_ecp_keypair *key )
+static int pk_get_ecpubkey(unsigned char **p, const unsigned char *end,
+                           mbedtls_ecp_keypair *key)
 {
     int ret;
 
-    if( ( ret = mbedtls_ecp_point_read_binary( &key->grp, &key->Q,
-                    (const unsigned char *) *p, end - *p ) ) == 0 )
-    {
-        ret = mbedtls_ecp_check_pubkey( &key->grp, &key->Q );
+    if ((ret = mbedtls_ecp_point_read_binary(&key->grp, &key->Q,
+                                             (const unsigned char *) *p, end - *p)) == 0) {
+        ret = mbedtls_ecp_check_pubkey(&key->grp, &key->Q);
     }
 
     /*
@@ -499,7 +483,7 @@ static int pk_get_ecpubkey( unsigned char **p, const unsigned char *end,
      */
     *p = (unsigned char *) end;
 
-    return( ret );
+    return (ret);
 }
 #endif /* MBEDTLS_ECP_C */
 
@@ -510,52 +494,51 @@ static int pk_get_ecpubkey( unsigned char **p, const unsigned char *end,
  *      publicExponent    INTEGER   -- e
  *  }
  */
-static int pk_get_rsapubkey( unsigned char **p,
-                             const unsigned char *end,
-                             mbedtls_rsa_context *rsa )
+static int pk_get_rsapubkey(unsigned char **p,
+                            const unsigned char *end,
+                            mbedtls_rsa_context *rsa)
 {
     int ret;
     size_t len;
 
-    if( ( ret = mbedtls_asn1_get_tag( p, end, &len,
-            MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
-        return( MBEDTLS_ERR_PK_INVALID_PUBKEY + ret );
+    if ((ret = mbedtls_asn1_get_tag(p, end, &len,
+                                    MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE)) != 0)
+        return (MBEDTLS_ERR_PK_INVALID_PUBKEY + ret);
 
-    if( *p + len != end )
-        return( MBEDTLS_ERR_PK_INVALID_PUBKEY +
-                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+    if (*p + len != end)
+        return (MBEDTLS_ERR_PK_INVALID_PUBKEY +
+                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH);
 
     /* Import N */
-    if( ( ret = mbedtls_asn1_get_tag( p, end, &len, MBEDTLS_ASN1_INTEGER ) ) != 0 )
-        return( MBEDTLS_ERR_PK_INVALID_PUBKEY + ret );
+    if ((ret = mbedtls_asn1_get_tag(p, end, &len, MBEDTLS_ASN1_INTEGER)) != 0)
+        return (MBEDTLS_ERR_PK_INVALID_PUBKEY + ret);
 
-    if( ( ret = mbedtls_rsa_import_raw( rsa, *p, len, NULL, 0, NULL, 0,
-                                        NULL, 0, NULL, 0 ) ) != 0 )
-        return( MBEDTLS_ERR_PK_INVALID_PUBKEY );
+    if ((ret = mbedtls_rsa_import_raw(rsa, *p, len, NULL, 0, NULL, 0,
+                                      NULL, 0, NULL, 0)) != 0)
+        return (MBEDTLS_ERR_PK_INVALID_PUBKEY);
 
     *p += len;
 
     /* Import E */
-    if( ( ret = mbedtls_asn1_get_tag( p, end, &len, MBEDTLS_ASN1_INTEGER ) ) != 0 )
-        return( MBEDTLS_ERR_PK_INVALID_PUBKEY + ret );
+    if ((ret = mbedtls_asn1_get_tag(p, end, &len, MBEDTLS_ASN1_INTEGER)) != 0)
+        return (MBEDTLS_ERR_PK_INVALID_PUBKEY + ret);
 
-    if( ( ret = mbedtls_rsa_import_raw( rsa, NULL, 0, NULL, 0, NULL, 0,
-                                        NULL, 0, *p, len ) ) != 0 )
-        return( MBEDTLS_ERR_PK_INVALID_PUBKEY );
+    if ((ret = mbedtls_rsa_import_raw(rsa, NULL, 0, NULL, 0, NULL, 0,
+                                      NULL, 0, *p, len)) != 0)
+        return (MBEDTLS_ERR_PK_INVALID_PUBKEY);
 
     *p += len;
 
-    if( mbedtls_rsa_complete( rsa ) != 0 ||
-        mbedtls_rsa_check_pubkey( rsa ) != 0 )
-    {
-        return( MBEDTLS_ERR_PK_INVALID_PUBKEY );
+    if (mbedtls_rsa_complete(rsa) != 0 ||
+        mbedtls_rsa_check_pubkey(rsa) != 0) {
+        return (MBEDTLS_ERR_PK_INVALID_PUBKEY);
     }
 
-    if( *p != end )
-        return( MBEDTLS_ERR_PK_INVALID_PUBKEY +
-                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+    if (*p != end)
+        return (MBEDTLS_ERR_PK_INVALID_PUBKEY +
+                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH);
 
-    return( 0 );
+    return (0);
 }
 #endif /* MBEDTLS_RSA_C */
 
@@ -565,32 +548,31 @@ static int pk_get_rsapubkey( unsigned char **p,
  *       algorithm               OBJECT IDENTIFIER,
  *       parameters              ANY DEFINED BY algorithm OPTIONAL  }
  */
-static int pk_get_pk_alg( unsigned char **p,
-                          const unsigned char *end,
-                          mbedtls_pk_type_t *pk_alg, mbedtls_asn1_buf *params )
+static int pk_get_pk_alg(unsigned char **p,
+                         const unsigned char *end,
+                         mbedtls_pk_type_t *pk_alg, mbedtls_asn1_buf *params)
 {
     int ret;
     mbedtls_asn1_buf alg_oid;
 
-    memset( params, 0, sizeof(mbedtls_asn1_buf) );
+    memset(params, 0, sizeof(mbedtls_asn1_buf));
 
-    if( ( ret = mbedtls_asn1_get_alg( p, end, &alg_oid, params ) ) != 0 )
-        return( MBEDTLS_ERR_PK_INVALID_ALG + ret );
+    if ((ret = mbedtls_asn1_get_alg(p, end, &alg_oid, params)) != 0)
+        return (MBEDTLS_ERR_PK_INVALID_ALG + ret);
 
-    if( mbedtls_oid_get_pk_alg( &alg_oid, pk_alg ) != 0 )
-        return( MBEDTLS_ERR_PK_UNKNOWN_PK_ALG );
+    if (mbedtls_oid_get_pk_alg(&alg_oid, pk_alg) != 0)
+        return (MBEDTLS_ERR_PK_UNKNOWN_PK_ALG);
 
     /*
      * No parameters with RSA (only for EC)
      */
-    if( *pk_alg == MBEDTLS_PK_RSA &&
-            ( ( params->tag != MBEDTLS_ASN1_NULL && params->tag != 0 ) ||
-                params->len != 0 ) )
-    {
-        return( MBEDTLS_ERR_PK_INVALID_ALG );
+    if (*pk_alg == MBEDTLS_PK_RSA &&
+        ((params->tag != MBEDTLS_ASN1_NULL && params->tag != 0) ||
+         params->len != 0)) {
+        return (MBEDTLS_ERR_PK_INVALID_ALG);
     }
 
-    return( 0 );
+    return (0);
 }
 
 /*
@@ -598,8 +580,8 @@ static int pk_get_pk_alg( unsigned char **p,
  *       algorithm            AlgorithmIdentifier,
  *       subjectPublicKey     BIT STRING }
  */
-int mbedtls_pk_parse_subpubkey( unsigned char **p, const unsigned char *end,
-                        mbedtls_pk_context *pk )
+int mbedtls_pk_parse_subpubkey(unsigned char **p, const unsigned char *end,
+                               mbedtls_pk_context *pk)
 {
     int ret;
     size_t len;
@@ -607,70 +589,67 @@ int mbedtls_pk_parse_subpubkey( unsigned char **p, const unsigned char *end,
     mbedtls_pk_type_t pk_alg = MBEDTLS_PK_NONE;
     const mbedtls_pk_info_t *pk_info;
 
-    if( ( ret = mbedtls_asn1_get_tag( p, end, &len,
-                    MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
-    {
-        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret );
+    if ((ret = mbedtls_asn1_get_tag(p, end, &len,
+                                    MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE)) != 0) {
+        return (MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret);
     }
 
     end = *p + len;
 
-    if( ( ret = pk_get_pk_alg( p, end, &pk_alg, &alg_params ) ) != 0 )
-        return( ret );
+    if ((ret = pk_get_pk_alg(p, end, &pk_alg, &alg_params)) != 0)
+        return (ret);
 
-    if( ( ret = mbedtls_asn1_get_bitstring_null( p, end, &len ) ) != 0 )
-        return( MBEDTLS_ERR_PK_INVALID_PUBKEY + ret );
+    if ((ret = mbedtls_asn1_get_bitstring_null(p, end, &len)) != 0)
+        return (MBEDTLS_ERR_PK_INVALID_PUBKEY + ret);
 
-    if( *p + len != end )
-        return( MBEDTLS_ERR_PK_INVALID_PUBKEY +
-                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+    if (*p + len != end)
+        return (MBEDTLS_ERR_PK_INVALID_PUBKEY +
+                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH);
 
-    if( ( pk_info = mbedtls_pk_info_from_type( pk_alg ) ) == NULL )
-        return( MBEDTLS_ERR_PK_UNKNOWN_PK_ALG );
+    if ((pk_info = mbedtls_pk_info_from_type(pk_alg)) == NULL)
+        return (MBEDTLS_ERR_PK_UNKNOWN_PK_ALG);
 
-    if( ( ret = mbedtls_pk_setup( pk, pk_info ) ) != 0 )
-        return( ret );
+    if ((ret = mbedtls_pk_setup(pk, pk_info)) != 0)
+        return (ret);
 
 #if defined(MBEDTLS_RSA_C)
-    if( pk_alg == MBEDTLS_PK_RSA )
-    {
-        ret = pk_get_rsapubkey( p, end, mbedtls_pk_rsa( *pk ) );
+    if (pk_alg == MBEDTLS_PK_RSA) {
+        ret = pk_get_rsapubkey(p, end, mbedtls_pk_rsa(*pk));
     } else
 #endif /* MBEDTLS_RSA_C */
 #if defined(MBEDTLS_ECP_C)
-    if( pk_alg == MBEDTLS_PK_ECKEY_DH || pk_alg == MBEDTLS_PK_ECKEY )
-    {
-        ret = pk_use_ecparams( &alg_params, &mbedtls_pk_ec( *pk )->grp );
-        if( ret == 0 )
-            ret = pk_get_ecpubkey( p, end, mbedtls_pk_ec( *pk ) );
-    } else
+        if (pk_alg == MBEDTLS_PK_ECKEY_DH || pk_alg == MBEDTLS_PK_ECKEY) {
+            ret = pk_use_ecparams(&alg_params, &mbedtls_pk_ec(*pk)->grp);
+            if (ret == 0)
+                ret = pk_get_ecpubkey(p, end, mbedtls_pk_ec(*pk));
+        } else
 #endif /* MBEDTLS_ECP_C */
-        ret = MBEDTLS_ERR_PK_UNKNOWN_PK_ALG;
+            ret = MBEDTLS_ERR_PK_UNKNOWN_PK_ALG;
 
-    if( ret == 0 && *p != end )
+    if (ret == 0 && *p != end)
         ret = MBEDTLS_ERR_PK_INVALID_PUBKEY
               MBEDTLS_ERR_ASN1_LENGTH_MISMATCH;
 
-    if( ret != 0 )
-        mbedtls_pk_free( pk );
+    if (ret != 0)
+        mbedtls_pk_free(pk);
 
-    return( ret );
+    return (ret);
 }
 
 #if defined(MBEDTLS_RSA_C)
 /*
  * Parse a PKCS#1 encoded private RSA key
  */
-static int pk_parse_key_pkcs1_der( mbedtls_rsa_context *rsa,
-                                   const unsigned char *key,
-                                   size_t keylen )
+static int pk_parse_key_pkcs1_der(mbedtls_rsa_context *rsa,
+                                  const unsigned char *key,
+                                  size_t keylen)
 {
     int ret, version;
     size_t len;
     unsigned char *p, *end;
 
     mbedtls_mpi T;
-    mbedtls_mpi_init( &T );
+    mbedtls_mpi_init(&T);
 
     p = (unsigned char *) key;
     end = p + keylen;
@@ -691,96 +670,91 @@ static int pk_parse_key_pkcs1_der( mbedtls_rsa_context *rsa,
      *      otherPrimeInfos   OtherPrimeInfos OPTIONAL
      *  }
      */
-    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len,
-            MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
-    {
-        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret );
+    if ((ret = mbedtls_asn1_get_tag(&p, end, &len,
+                                    MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE)) != 0) {
+        return (MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret);
     }
 
     end = p + len;
 
-    if( ( ret = mbedtls_asn1_get_int( &p, end, &version ) ) != 0 )
-    {
-        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret );
+    if ((ret = mbedtls_asn1_get_int(&p, end, &version)) != 0) {
+        return (MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret);
     }
 
-    if( version != 0 )
-    {
-        return( MBEDTLS_ERR_PK_KEY_INVALID_VERSION );
+    if (version != 0) {
+        return (MBEDTLS_ERR_PK_KEY_INVALID_VERSION);
     }
 
     /* Import N */
-    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len,
-                                      MBEDTLS_ASN1_INTEGER ) ) != 0 ||
-        ( ret = mbedtls_rsa_import_raw( rsa, p, len, NULL, 0, NULL, 0,
-                                        NULL, 0, NULL, 0 ) ) != 0 )
+    if ((ret = mbedtls_asn1_get_tag(&p, end, &len,
+                                    MBEDTLS_ASN1_INTEGER)) != 0 ||
+        (ret = mbedtls_rsa_import_raw(rsa, p, len, NULL, 0, NULL, 0,
+                                      NULL, 0, NULL, 0)) != 0)
         goto cleanup;
     p += len;
 
     /* Import E */
-    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len,
-                                      MBEDTLS_ASN1_INTEGER ) ) != 0 ||
-        ( ret = mbedtls_rsa_import_raw( rsa, NULL, 0, NULL, 0, NULL, 0,
-                                        NULL, 0, p, len ) ) != 0 )
+    if ((ret = mbedtls_asn1_get_tag(&p, end, &len,
+                                    MBEDTLS_ASN1_INTEGER)) != 0 ||
+        (ret = mbedtls_rsa_import_raw(rsa, NULL, 0, NULL, 0, NULL, 0,
+                                      NULL, 0, p, len)) != 0)
         goto cleanup;
     p += len;
 
     /* Import D */
-    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len,
-                                      MBEDTLS_ASN1_INTEGER ) ) != 0 ||
-        ( ret = mbedtls_rsa_import_raw( rsa, NULL, 0, NULL, 0, NULL, 0,
-                                        p, len, NULL, 0 ) ) != 0 )
+    if ((ret = mbedtls_asn1_get_tag(&p, end, &len,
+                                    MBEDTLS_ASN1_INTEGER)) != 0 ||
+        (ret = mbedtls_rsa_import_raw(rsa, NULL, 0, NULL, 0, NULL, 0,
+                                      p, len, NULL, 0)) != 0)
         goto cleanup;
     p += len;
 
     /* Import P */
-    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len,
-                                      MBEDTLS_ASN1_INTEGER ) ) != 0 ||
-        ( ret = mbedtls_rsa_import_raw( rsa, NULL, 0, p, len, NULL, 0,
-                                        NULL, 0, NULL, 0 ) ) != 0 )
+    if ((ret = mbedtls_asn1_get_tag(&p, end, &len,
+                                    MBEDTLS_ASN1_INTEGER)) != 0 ||
+        (ret = mbedtls_rsa_import_raw(rsa, NULL, 0, p, len, NULL, 0,
+                                      NULL, 0, NULL, 0)) != 0)
         goto cleanup;
     p += len;
 
     /* Import Q */
-    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len,
-                                      MBEDTLS_ASN1_INTEGER ) ) != 0 ||
-        ( ret = mbedtls_rsa_import_raw( rsa, NULL, 0, NULL, 0, p, len,
-                                        NULL, 0, NULL, 0 ) ) != 0 )
+    if ((ret = mbedtls_asn1_get_tag(&p, end, &len,
+                                    MBEDTLS_ASN1_INTEGER)) != 0 ||
+        (ret = mbedtls_rsa_import_raw(rsa, NULL, 0, NULL, 0, p, len,
+                                      NULL, 0, NULL, 0)) != 0)
         goto cleanup;
     p += len;
 
     /* Complete the RSA private key */
-    if( ( ret = mbedtls_rsa_complete( rsa ) ) != 0 )
+    if ((ret = mbedtls_rsa_complete(rsa)) != 0)
         goto cleanup;
 
     /* Check optional parameters */
-    if( ( ret = mbedtls_asn1_get_mpi( &p, end, &T ) ) != 0 ||
-        ( ret = mbedtls_asn1_get_mpi( &p, end, &T ) ) != 0 ||
-        ( ret = mbedtls_asn1_get_mpi( &p, end, &T ) ) != 0 )
+    if ((ret = mbedtls_asn1_get_mpi(&p, end, &T)) != 0 ||
+        (ret = mbedtls_asn1_get_mpi(&p, end, &T)) != 0 ||
+        (ret = mbedtls_asn1_get_mpi(&p, end, &T)) != 0)
         goto cleanup;
 
-    if( p != end )
-    {
+    if (p != end) {
         ret = MBEDTLS_ERR_PK_KEY_INVALID_FORMAT +
               MBEDTLS_ERR_ASN1_LENGTH_MISMATCH ;
     }
 
 cleanup:
 
-    mbedtls_mpi_free( &T );
+    mbedtls_mpi_free(&T);
 
-    if( ret != 0 )
-    {
+    if (ret != 0) {
         /* Wrap error code if it's coming from a lower level */
-        if( ( ret & 0xff80 ) == 0 )
+        if ((ret & 0xff80) == 0)
             ret = MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret;
         else
             ret = MBEDTLS_ERR_PK_KEY_INVALID_FORMAT;
 
-        mbedtls_rsa_free( rsa );
+        mbedtls_rsa_free(rsa);
     }
 
-    return( ret );
+    return (ret);
 }
 #endif /* MBEDTLS_RSA_C */
 
@@ -788,9 +762,9 @@ cleanup:
 /*
  * Parse a SEC1 encoded private EC key
  */
-static int pk_parse_key_sec1_der( mbedtls_ecp_keypair *eck,
-                                  const unsigned char *key,
-                                  size_t keylen )
+static int pk_parse_key_sec1_der(mbedtls_ecp_keypair *eck,
+                                 const unsigned char *key,
+                                 size_t keylen)
 {
     int ret;
     int version, pubkey_done;
@@ -810,106 +784,92 @@ static int pk_parse_key_sec1_der( mbedtls_ecp_keypair *eck,
      *      publicKey  [1] BIT STRING OPTIONAL
      *    }
      */
-    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len,
-            MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
-    {
-        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret );
+    if ((ret = mbedtls_asn1_get_tag(&p, end, &len,
+                                    MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE)) != 0) {
+        return (MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret);
     }
 
     end = p + len;
 
-    if( ( ret = mbedtls_asn1_get_int( &p, end, &version ) ) != 0 )
-        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret );
+    if ((ret = mbedtls_asn1_get_int(&p, end, &version)) != 0)
+        return (MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret);
 
-    if( version != 1 )
-        return( MBEDTLS_ERR_PK_KEY_INVALID_VERSION );
+    if (version != 1)
+        return (MBEDTLS_ERR_PK_KEY_INVALID_VERSION);
 
-    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len, MBEDTLS_ASN1_OCTET_STRING ) ) != 0 )
-        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret );
+    if ((ret = mbedtls_asn1_get_tag(&p, end, &len, MBEDTLS_ASN1_OCTET_STRING)) != 0)
+        return (MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret);
 
-    if( ( ret = mbedtls_mpi_read_binary( &eck->d, p, len ) ) != 0 )
-    {
-        mbedtls_ecp_keypair_free( eck );
-        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret );
+    if ((ret = mbedtls_mpi_read_binary(&eck->d, p, len)) != 0) {
+        mbedtls_ecp_keypair_free(eck);
+        return (MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret);
     }
 
     p += len;
 
     pubkey_done = 0;
-    if( p != end )
-    {
+    if (p != end) {
         /*
          * Is 'parameters' present?
          */
-        if( ( ret = mbedtls_asn1_get_tag( &p, end, &len,
-                        MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_CONSTRUCTED | 0 ) ) == 0 )
-        {
-            if( ( ret = pk_get_ecparams( &p, p + len, &params) ) != 0 ||
-                ( ret = pk_use_ecparams( &params, &eck->grp )  ) != 0 )
-            {
-                mbedtls_ecp_keypair_free( eck );
-                return( ret );
+        if ((ret = mbedtls_asn1_get_tag(&p, end, &len,
+                                        MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_CONSTRUCTED | 0)) == 0) {
+            if ((ret = pk_get_ecparams(&p, p + len, &params)) != 0 ||
+                (ret = pk_use_ecparams(&params, &eck->grp)) != 0) {
+                mbedtls_ecp_keypair_free(eck);
+                return (ret);
             }
-        }
-        else if( ret != MBEDTLS_ERR_ASN1_UNEXPECTED_TAG )
-        {
-            mbedtls_ecp_keypair_free( eck );
-            return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret );
+        } else if (ret != MBEDTLS_ERR_ASN1_UNEXPECTED_TAG) {
+            mbedtls_ecp_keypair_free(eck);
+            return (MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret);
         }
     }
 
-    if( p != end )
-    {
+    if (p != end) {
         /*
          * Is 'publickey' present? If not, or if we can't read it (eg because it
          * is compressed), create it from the private key.
          */
-        if( ( ret = mbedtls_asn1_get_tag( &p, end, &len,
-                        MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_CONSTRUCTED | 1 ) ) == 0 )
-        {
+        if ((ret = mbedtls_asn1_get_tag(&p, end, &len,
+                                        MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_CONSTRUCTED | 1)) == 0) {
             end2 = p + len;
 
-            if( ( ret = mbedtls_asn1_get_bitstring_null( &p, end2, &len ) ) != 0 )
-                return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret );
+            if ((ret = mbedtls_asn1_get_bitstring_null(&p, end2, &len)) != 0)
+                return (MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret);
 
-            if( p + len != end2 )
-                return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT +
-                        MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+            if (p + len != end2)
+                return (MBEDTLS_ERR_PK_KEY_INVALID_FORMAT +
+                        MBEDTLS_ERR_ASN1_LENGTH_MISMATCH);
 
-            if( ( ret = pk_get_ecpubkey( &p, end2, eck ) ) == 0 )
+            if ((ret = pk_get_ecpubkey(&p, end2, eck)) == 0)
                 pubkey_done = 1;
-            else
-            {
+            else {
                 /*
                  * The only acceptable failure mode of pk_get_ecpubkey() above
                  * is if the point format is not recognized.
                  */
-                if( ret != MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE )
-                    return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT );
+                if (ret != MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE)
+                    return (MBEDTLS_ERR_PK_KEY_INVALID_FORMAT);
             }
-        }
-        else if( ret != MBEDTLS_ERR_ASN1_UNEXPECTED_TAG )
-        {
-            mbedtls_ecp_keypair_free( eck );
-            return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret );
+        } else if (ret != MBEDTLS_ERR_ASN1_UNEXPECTED_TAG) {
+            mbedtls_ecp_keypair_free(eck);
+            return (MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret);
         }
     }
 
-    if( ! pubkey_done &&
-        ( ret = mbedtls_ecp_mul( &eck->grp, &eck->Q, &eck->d, &eck->grp.G,
-                                                      NULL, NULL ) ) != 0 )
-    {
-        mbedtls_ecp_keypair_free( eck );
-        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret );
+    if (! pubkey_done &&
+        (ret = mbedtls_ecp_mul(&eck->grp, &eck->Q, &eck->d, &eck->grp.G,
+                               NULL, NULL)) != 0) {
+        mbedtls_ecp_keypair_free(eck);
+        return (MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret);
     }
 
-    if( ( ret = mbedtls_ecp_check_privkey( &eck->grp, &eck->d ) ) != 0 )
-    {
-        mbedtls_ecp_keypair_free( eck );
-        return( ret );
+    if ((ret = mbedtls_ecp_check_privkey(&eck->grp, &eck->d)) != 0) {
+        mbedtls_ecp_keypair_free(eck);
+        return (ret);
     }
 
-    return( 0 );
+    return (0);
 }
 #endif /* MBEDTLS_ECP_C */
 
@@ -927,9 +887,9 @@ static int pk_parse_key_sec1_der( mbedtls_ecp_keypair *eck,
  *
  */
 static int pk_parse_key_pkcs8_unencrypted_der(
-                                    mbedtls_pk_context *pk,
-                                    const unsigned char* key,
-                                    size_t keylen )
+    mbedtls_pk_context *pk,
+    const unsigned char *key,
+    size_t keylen)
 {
     int ret, version;
     size_t len;
@@ -955,60 +915,55 @@ static int pk_parse_key_pkcs8_unencrypted_der(
      *  The PrivateKey OCTET STRING is a SEC1 ECPrivateKey
      */
 
-    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len,
-            MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
-    {
-        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret );
+    if ((ret = mbedtls_asn1_get_tag(&p, end, &len,
+                                    MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE)) != 0) {
+        return (MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret);
     }
 
     end = p + len;
 
-    if( ( ret = mbedtls_asn1_get_int( &p, end, &version ) ) != 0 )
-        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret );
+    if ((ret = mbedtls_asn1_get_int(&p, end, &version)) != 0)
+        return (MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret);
 
-    if( version != 0 )
-        return( MBEDTLS_ERR_PK_KEY_INVALID_VERSION + ret );
+    if (version != 0)
+        return (MBEDTLS_ERR_PK_KEY_INVALID_VERSION + ret);
 
-    if( ( ret = pk_get_pk_alg( &p, end, &pk_alg, &params ) ) != 0 )
-        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret );
+    if ((ret = pk_get_pk_alg(&p, end, &pk_alg, &params)) != 0)
+        return (MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret);
 
-    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len, MBEDTLS_ASN1_OCTET_STRING ) ) != 0 )
-        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret );
+    if ((ret = mbedtls_asn1_get_tag(&p, end, &len, MBEDTLS_ASN1_OCTET_STRING)) != 0)
+        return (MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret);
 
-    if( len < 1 )
-        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT +
-                MBEDTLS_ERR_ASN1_OUT_OF_DATA );
+    if (len < 1)
+        return (MBEDTLS_ERR_PK_KEY_INVALID_FORMAT +
+                MBEDTLS_ERR_ASN1_OUT_OF_DATA);
 
-    if( ( pk_info = mbedtls_pk_info_from_type( pk_alg ) ) == NULL )
-        return( MBEDTLS_ERR_PK_UNKNOWN_PK_ALG );
+    if ((pk_info = mbedtls_pk_info_from_type(pk_alg)) == NULL)
+        return (MBEDTLS_ERR_PK_UNKNOWN_PK_ALG);
 
-    if( ( ret = mbedtls_pk_setup( pk, pk_info ) ) != 0 )
-        return( ret );
+    if ((ret = mbedtls_pk_setup(pk, pk_info)) != 0)
+        return (ret);
 
 #if defined(MBEDTLS_RSA_C)
-    if( pk_alg == MBEDTLS_PK_RSA )
-    {
-        if( ( ret = pk_parse_key_pkcs1_der( mbedtls_pk_rsa( *pk ), p, len ) ) != 0 )
-        {
-            mbedtls_pk_free( pk );
-            return( ret );
+    if (pk_alg == MBEDTLS_PK_RSA) {
+        if ((ret = pk_parse_key_pkcs1_der(mbedtls_pk_rsa(*pk), p, len)) != 0) {
+            mbedtls_pk_free(pk);
+            return (ret);
         }
     } else
 #endif /* MBEDTLS_RSA_C */
 #if defined(MBEDTLS_ECP_C)
-    if( pk_alg == MBEDTLS_PK_ECKEY || pk_alg == MBEDTLS_PK_ECKEY_DH )
-    {
-        if( ( ret = pk_use_ecparams( &params, &mbedtls_pk_ec( *pk )->grp ) ) != 0 ||
-            ( ret = pk_parse_key_sec1_der( mbedtls_pk_ec( *pk ), p, len )  ) != 0 )
-        {
-            mbedtls_pk_free( pk );
-            return( ret );
-        }
-    } else
+        if (pk_alg == MBEDTLS_PK_ECKEY || pk_alg == MBEDTLS_PK_ECKEY_DH) {
+            if ((ret = pk_use_ecparams(&params, &mbedtls_pk_ec(*pk)->grp)) != 0 ||
+                (ret = pk_parse_key_sec1_der(mbedtls_pk_ec(*pk), p, len)) != 0) {
+                mbedtls_pk_free(pk);
+                return (ret);
+            }
+        } else
 #endif /* MBEDTLS_ECP_C */
-        return( MBEDTLS_ERR_PK_UNKNOWN_PK_ALG );
+            return (MBEDTLS_ERR_PK_UNKNOWN_PK_ALG);
 
-    return( 0 );
+    return (0);
 }
 
 /*
@@ -1022,9 +977,9 @@ static int pk_parse_key_pkcs8_unencrypted_der(
  */
 #if defined(MBEDTLS_PKCS12_C) || defined(MBEDTLS_PKCS5_C)
 static int pk_parse_key_pkcs8_encrypted_der(
-                                    mbedtls_pk_context *pk,
-                                    unsigned char *key, size_t keylen,
-                                    const unsigned char *pwd, size_t pwdlen )
+    mbedtls_pk_context *pk,
+    unsigned char *key, size_t keylen,
+    const unsigned char *pwd, size_t pwdlen)
 {
     int ret, decrypted = 0;
     size_t len;
@@ -1039,8 +994,8 @@ static int pk_parse_key_pkcs8_encrypted_der(
     p = key;
     end = p + keylen;
 
-    if( pwdlen == 0 )
-        return( MBEDTLS_ERR_PK_PASSWORD_REQUIRED );
+    if (pwdlen == 0)
+        return (MBEDTLS_ERR_PK_PASSWORD_REQUIRED);
 
     /*
      * This function parses the EncryptedPrivateKeyInfo object (PKCS#8)
@@ -1057,19 +1012,18 @@ static int pk_parse_key_pkcs8_encrypted_der(
      *  The EncryptedData OCTET STRING is a PKCS#8 PrivateKeyInfo
      *
      */
-    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len,
-            MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
-    {
-        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret );
+    if ((ret = mbedtls_asn1_get_tag(&p, end, &len,
+                                    MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE)) != 0) {
+        return (MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret);
     }
 
     end = p + len;
 
-    if( ( ret = mbedtls_asn1_get_alg( &p, end, &pbe_alg_oid, &pbe_params ) ) != 0 )
-        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret );
+    if ((ret = mbedtls_asn1_get_alg(&p, end, &pbe_alg_oid, &pbe_params)) != 0)
+        return (MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret);
 
-    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len, MBEDTLS_ASN1_OCTET_STRING ) ) != 0 )
-        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret );
+    if ((ret = mbedtls_asn1_get_tag(&p, end, &len, MBEDTLS_ASN1_OCTET_STRING)) != 0)
+        return (MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret);
 
     buf = p;
 
@@ -1077,73 +1031,64 @@ static int pk_parse_key_pkcs8_encrypted_der(
      * Decrypt EncryptedData with appropriate PBE
      */
 #if defined(MBEDTLS_PKCS12_C)
-    if( mbedtls_oid_get_pkcs12_pbe_alg( &pbe_alg_oid, &md_alg, &cipher_alg ) == 0 )
-    {
-        if( ( ret = mbedtls_pkcs12_pbe( &pbe_params, MBEDTLS_PKCS12_PBE_DECRYPT,
-                                cipher_alg, md_alg,
-                                pwd, pwdlen, p, len, buf ) ) != 0 )
-        {
-            if( ret == MBEDTLS_ERR_PKCS12_PASSWORD_MISMATCH )
-                return( MBEDTLS_ERR_PK_PASSWORD_MISMATCH );
+    if (mbedtls_oid_get_pkcs12_pbe_alg(&pbe_alg_oid, &md_alg, &cipher_alg) == 0) {
+        if ((ret = mbedtls_pkcs12_pbe(&pbe_params, MBEDTLS_PKCS12_PBE_DECRYPT,
+                                      cipher_alg, md_alg,
+                                      pwd, pwdlen, p, len, buf)) != 0) {
+            if (ret == MBEDTLS_ERR_PKCS12_PASSWORD_MISMATCH)
+                return (MBEDTLS_ERR_PK_PASSWORD_MISMATCH);
 
-            return( ret );
+            return (ret);
         }
 
         decrypted = 1;
-    }
-    else if( MBEDTLS_OID_CMP( MBEDTLS_OID_PKCS12_PBE_SHA1_RC4_128, &pbe_alg_oid ) == 0 )
-    {
-        if( ( ret = mbedtls_pkcs12_pbe_sha1_rc4_128( &pbe_params,
-                                             MBEDTLS_PKCS12_PBE_DECRYPT,
-                                             pwd, pwdlen,
-                                             p, len, buf ) ) != 0 )
-        {
-            return( ret );
+    } else if (MBEDTLS_OID_CMP(MBEDTLS_OID_PKCS12_PBE_SHA1_RC4_128, &pbe_alg_oid) == 0) {
+        if ((ret = mbedtls_pkcs12_pbe_sha1_rc4_128(&pbe_params,
+                                                   MBEDTLS_PKCS12_PBE_DECRYPT,
+                                                   pwd, pwdlen,
+                                                   p, len, buf)) != 0) {
+            return (ret);
         }
 
         // Best guess for password mismatch when using RC4. If first tag is
         // not MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE
         //
-        if( *buf != ( MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) )
-            return( MBEDTLS_ERR_PK_PASSWORD_MISMATCH );
+        if (*buf != (MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE))
+            return (MBEDTLS_ERR_PK_PASSWORD_MISMATCH);
 
         decrypted = 1;
-    }
-    else
+    } else
 #endif /* MBEDTLS_PKCS12_C */
 #if defined(MBEDTLS_PKCS5_C)
-    if( MBEDTLS_OID_CMP( MBEDTLS_OID_PKCS5_PBES2, &pbe_alg_oid ) == 0 )
-    {
-        if( ( ret = mbedtls_pkcs5_pbes2( &pbe_params, MBEDTLS_PKCS5_DECRYPT, pwd, pwdlen,
-                                  p, len, buf ) ) != 0 )
-        {
-            if( ret == MBEDTLS_ERR_PKCS5_PASSWORD_MISMATCH )
-                return( MBEDTLS_ERR_PK_PASSWORD_MISMATCH );
+        if (MBEDTLS_OID_CMP(MBEDTLS_OID_PKCS5_PBES2, &pbe_alg_oid) == 0) {
+            if ((ret = mbedtls_pkcs5_pbes2(&pbe_params, MBEDTLS_PKCS5_DECRYPT, pwd, pwdlen,
+                                           p, len, buf)) != 0) {
+                if (ret == MBEDTLS_ERR_PKCS5_PASSWORD_MISMATCH)
+                    return (MBEDTLS_ERR_PK_PASSWORD_MISMATCH);
 
-            return( ret );
+                return (ret);
+            }
+
+            decrypted = 1;
+        } else
+#endif /* MBEDTLS_PKCS5_C */
+        {
+            ((void) pwd);
         }
 
-        decrypted = 1;
-    }
-    else
-#endif /* MBEDTLS_PKCS5_C */
-    {
-        ((void) pwd);
-    }
+    if (decrypted == 0)
+        return (MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE);
 
-    if( decrypted == 0 )
-        return( MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE );
-
-    return( pk_parse_key_pkcs8_unencrypted_der( pk, buf, len ) );
+    return (pk_parse_key_pkcs8_unencrypted_der(pk, buf, len));
 }
 #endif /* MBEDTLS_PKCS12_C || MBEDTLS_PKCS5_C */
 
 /*
  * Parse a private key
  */
-int mbedtls_pk_parse_key( mbedtls_pk_context *pk,
-                  const unsigned char *key, size_t keylen,
-                  const unsigned char *pwd, size_t pwdlen )
+int mbedtls_pk_parse_key(mbedtls_pk_context *pk,
+                         const unsigned char *key, size_t keylen,
+                         const unsigned char *pwd, size_t pwdlen)
 {
     int ret;
     const mbedtls_pk_info_t *pk_info;
@@ -1152,115 +1097,103 @@ int mbedtls_pk_parse_key( mbedtls_pk_context *pk,
     size_t len;
     mbedtls_pem_context pem;
 
-    mbedtls_pem_init( &pem );
+    mbedtls_pem_init(&pem);
 
 #if defined(MBEDTLS_RSA_C)
     /* Avoid calling mbedtls_pem_read_buffer() on non-null-terminated string */
-    if( keylen == 0 || key[keylen - 1] != '\0' )
+    if (keylen == 0 || key[keylen - 1] != '\0')
         ret = MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT;
     else
-        ret = mbedtls_pem_read_buffer( &pem,
-                               "-----BEGIN RSA PRIVATE KEY-----",
-                               "-----END RSA PRIVATE KEY-----",
-                               key, pwd, pwdlen, &len );
+        ret = mbedtls_pem_read_buffer(&pem,
+                                      "-----BEGIN RSA PRIVATE KEY-----",
+                                      "-----END RSA PRIVATE KEY-----",
+                                      key, pwd, pwdlen, &len);
 
-    if( ret == 0 )
-    {
-        pk_info = mbedtls_pk_info_from_type( MBEDTLS_PK_RSA );
-        if( ( ret = mbedtls_pk_setup( pk, pk_info ) ) != 0 ||
-            ( ret = pk_parse_key_pkcs1_der( mbedtls_pk_rsa( *pk ),
-                                            pem.buf, pem.buflen ) ) != 0 )
-        {
-            mbedtls_pk_free( pk );
+    if (ret == 0) {
+        pk_info = mbedtls_pk_info_from_type(MBEDTLS_PK_RSA);
+        if ((ret = mbedtls_pk_setup(pk, pk_info)) != 0 ||
+            (ret = pk_parse_key_pkcs1_der(mbedtls_pk_rsa(*pk),
+                                          pem.buf, pem.buflen)) != 0) {
+            mbedtls_pk_free(pk);
         }
 
-        mbedtls_pem_free( &pem );
-        return( ret );
-    }
-    else if( ret == MBEDTLS_ERR_PEM_PASSWORD_MISMATCH )
-        return( MBEDTLS_ERR_PK_PASSWORD_MISMATCH );
-    else if( ret == MBEDTLS_ERR_PEM_PASSWORD_REQUIRED )
-        return( MBEDTLS_ERR_PK_PASSWORD_REQUIRED );
-    else if( ret != MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT )
-        return( ret );
+        mbedtls_pem_free(&pem);
+        return (ret);
+    } else if (ret == MBEDTLS_ERR_PEM_PASSWORD_MISMATCH)
+        return (MBEDTLS_ERR_PK_PASSWORD_MISMATCH);
+    else if (ret == MBEDTLS_ERR_PEM_PASSWORD_REQUIRED)
+        return (MBEDTLS_ERR_PK_PASSWORD_REQUIRED);
+    else if (ret != MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT)
+        return (ret);
 #endif /* MBEDTLS_RSA_C */
 
 #if defined(MBEDTLS_ECP_C)
     /* Avoid calling mbedtls_pem_read_buffer() on non-null-terminated string */
-    if( keylen == 0 || key[keylen - 1] != '\0' )
+    if (keylen == 0 || key[keylen - 1] != '\0')
         ret = MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT;
     else
-        ret = mbedtls_pem_read_buffer( &pem,
-                               "-----BEGIN EC PRIVATE KEY-----",
-                               "-----END EC PRIVATE KEY-----",
-                               key, pwd, pwdlen, &len );
-    if( ret == 0 )
-    {
-        pk_info = mbedtls_pk_info_from_type( MBEDTLS_PK_ECKEY );
+        ret = mbedtls_pem_read_buffer(&pem,
+                                      "-----BEGIN EC PRIVATE KEY-----",
+                                      "-----END EC PRIVATE KEY-----",
+                                      key, pwd, pwdlen, &len);
+    if (ret == 0) {
+        pk_info = mbedtls_pk_info_from_type(MBEDTLS_PK_ECKEY);
 
-        if( ( ret = mbedtls_pk_setup( pk, pk_info ) ) != 0 ||
-            ( ret = pk_parse_key_sec1_der( mbedtls_pk_ec( *pk ),
-                                           pem.buf, pem.buflen ) ) != 0 )
-        {
-            mbedtls_pk_free( pk );
+        if ((ret = mbedtls_pk_setup(pk, pk_info)) != 0 ||
+            (ret = pk_parse_key_sec1_der(mbedtls_pk_ec(*pk),
+                                         pem.buf, pem.buflen)) != 0) {
+            mbedtls_pk_free(pk);
         }
 
-        mbedtls_pem_free( &pem );
-        return( ret );
-    }
-    else if( ret == MBEDTLS_ERR_PEM_PASSWORD_MISMATCH )
-        return( MBEDTLS_ERR_PK_PASSWORD_MISMATCH );
-    else if( ret == MBEDTLS_ERR_PEM_PASSWORD_REQUIRED )
-        return( MBEDTLS_ERR_PK_PASSWORD_REQUIRED );
-    else if( ret != MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT )
-        return( ret );
+        mbedtls_pem_free(&pem);
+        return (ret);
+    } else if (ret == MBEDTLS_ERR_PEM_PASSWORD_MISMATCH)
+        return (MBEDTLS_ERR_PK_PASSWORD_MISMATCH);
+    else if (ret == MBEDTLS_ERR_PEM_PASSWORD_REQUIRED)
+        return (MBEDTLS_ERR_PK_PASSWORD_REQUIRED);
+    else if (ret != MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT)
+        return (ret);
 #endif /* MBEDTLS_ECP_C */
 
     /* Avoid calling mbedtls_pem_read_buffer() on non-null-terminated string */
-    if( keylen == 0 || key[keylen - 1] != '\0' )
+    if (keylen == 0 || key[keylen - 1] != '\0')
         ret = MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT;
     else
-        ret = mbedtls_pem_read_buffer( &pem,
-                               "-----BEGIN PRIVATE KEY-----",
-                               "-----END PRIVATE KEY-----",
-                               key, NULL, 0, &len );
-    if( ret == 0 )
-    {
-        if( ( ret = pk_parse_key_pkcs8_unencrypted_der( pk,
-                                                pem.buf, pem.buflen ) ) != 0 )
-        {
-            mbedtls_pk_free( pk );
+        ret = mbedtls_pem_read_buffer(&pem,
+                                      "-----BEGIN PRIVATE KEY-----",
+                                      "-----END PRIVATE KEY-----",
+                                      key, NULL, 0, &len);
+    if (ret == 0) {
+        if ((ret = pk_parse_key_pkcs8_unencrypted_der(pk,
+                                                      pem.buf, pem.buflen)) != 0) {
+            mbedtls_pk_free(pk);
         }
 
-        mbedtls_pem_free( &pem );
-        return( ret );
-    }
-    else if( ret != MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT )
-        return( ret );
+        mbedtls_pem_free(&pem);
+        return (ret);
+    } else if (ret != MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT)
+        return (ret);
 
 #if defined(MBEDTLS_PKCS12_C) || defined(MBEDTLS_PKCS5_C)
     /* Avoid calling mbedtls_pem_read_buffer() on non-null-terminated string */
-    if( keylen == 0 || key[keylen - 1] != '\0' )
+    if (keylen == 0 || key[keylen - 1] != '\0')
         ret = MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT;
     else
-        ret = mbedtls_pem_read_buffer( &pem,
-                               "-----BEGIN ENCRYPTED PRIVATE KEY-----",
-                               "-----END ENCRYPTED PRIVATE KEY-----",
-                               key, NULL, 0, &len );
-    if( ret == 0 )
-    {
-        if( ( ret = pk_parse_key_pkcs8_encrypted_der( pk,
-                                                      pem.buf, pem.buflen,
-                                                      pwd, pwdlen ) ) != 0 )
-        {
-            mbedtls_pk_free( pk );
+        ret = mbedtls_pem_read_buffer(&pem,
+                                      "-----BEGIN ENCRYPTED PRIVATE KEY-----",
+                                      "-----END ENCRYPTED PRIVATE KEY-----",
+                                      key, NULL, 0, &len);
+    if (ret == 0) {
+        if ((ret = pk_parse_key_pkcs8_encrypted_der(pk,
+                                                    pem.buf, pem.buflen,
+                                                    pwd, pwdlen)) != 0) {
+            mbedtls_pk_free(pk);
         }
 
-        mbedtls_pem_free( &pem );
-        return( ret );
-    }
-    else if( ret != MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT )
-        return( ret );
+        mbedtls_pem_free(&pem);
+        return (ret);
+    } else if (ret != MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT)
+        return (ret);
 #endif /* MBEDTLS_PKCS12_C || MBEDTLS_PKCS5_C */
 #else
     ((void) pwd);
@@ -1278,77 +1211,70 @@ int mbedtls_pk_parse_key( mbedtls_pk_context *pk,
     {
         unsigned char *key_copy;
 
-        if( keylen == 0 )
-            return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT );
+        if (keylen == 0)
+            return (MBEDTLS_ERR_PK_KEY_INVALID_FORMAT);
 
-        if( ( key_copy = mbedtls_calloc( 1, keylen ) ) == NULL )
-            return( MBEDTLS_ERR_PK_ALLOC_FAILED );
+        if ((key_copy = mbedtls_calloc(1, keylen)) == NULL)
+            return (MBEDTLS_ERR_PK_ALLOC_FAILED);
 
-        memcpy( key_copy, key, keylen );
+        memcpy(key_copy, key, keylen);
 
-        ret = pk_parse_key_pkcs8_encrypted_der( pk, key_copy, keylen,
-                                                pwd, pwdlen );
+        ret = pk_parse_key_pkcs8_encrypted_der(pk, key_copy, keylen,
+                                               pwd, pwdlen);
 
-        mbedtls_platform_zeroize( key_copy, keylen );
-        mbedtls_free( key_copy );
+        mbedtls_platform_zeroize(key_copy, keylen);
+        mbedtls_free(key_copy);
     }
 
-    if( ret == 0 )
-        return( 0 );
+    if (ret == 0)
+        return (0);
 
-    mbedtls_pk_free( pk );
+    mbedtls_pk_free(pk);
 
-    if( ret == MBEDTLS_ERR_PK_PASSWORD_MISMATCH )
-    {
-        return( ret );
+    if (ret == MBEDTLS_ERR_PK_PASSWORD_MISMATCH) {
+        return (ret);
     }
 #endif /* MBEDTLS_PKCS12_C || MBEDTLS_PKCS5_C */
 
-    if( ( ret = pk_parse_key_pkcs8_unencrypted_der( pk, key, keylen ) ) == 0 )
-        return( 0 );
+    if ((ret = pk_parse_key_pkcs8_unencrypted_der(pk, key, keylen)) == 0)
+        return (0);
 
-    mbedtls_pk_free( pk );
+    mbedtls_pk_free(pk);
 
 #if defined(MBEDTLS_RSA_C)
 
-    pk_info = mbedtls_pk_info_from_type( MBEDTLS_PK_RSA );
-    if( ( ret = mbedtls_pk_setup( pk, pk_info ) ) != 0 ||
-        ( ret = pk_parse_key_pkcs1_der( mbedtls_pk_rsa( *pk ),
-                                        key, keylen ) ) != 0 )
-    {
-        mbedtls_pk_free( pk );
-    }
-    else
-    {
-        return( 0 );
+    pk_info = mbedtls_pk_info_from_type(MBEDTLS_PK_RSA);
+    if ((ret = mbedtls_pk_setup(pk, pk_info)) != 0 ||
+        (ret = pk_parse_key_pkcs1_der(mbedtls_pk_rsa(*pk),
+                                      key, keylen)) != 0) {
+        mbedtls_pk_free(pk);
+    } else {
+        return (0);
     }
 
 #endif /* MBEDTLS_RSA_C */
 
 #if defined(MBEDTLS_ECP_C)
 
-    pk_info = mbedtls_pk_info_from_type( MBEDTLS_PK_ECKEY );
-    if( ( ret = mbedtls_pk_setup( pk, pk_info ) ) != 0 ||
-        ( ret = pk_parse_key_sec1_der( mbedtls_pk_ec( *pk ),
-                                       key, keylen ) ) != 0 )
-    {
-        mbedtls_pk_free( pk );
-    }
-    else
-    {
-        return( 0 );
+    pk_info = mbedtls_pk_info_from_type(MBEDTLS_PK_ECKEY);
+    if ((ret = mbedtls_pk_setup(pk, pk_info)) != 0 ||
+        (ret = pk_parse_key_sec1_der(mbedtls_pk_ec(*pk),
+                                     key, keylen)) != 0) {
+        mbedtls_pk_free(pk);
+    } else {
+        return (0);
     }
 
 #endif /* MBEDTLS_ECP_C */
 
-    return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT );
+    return (MBEDTLS_ERR_PK_KEY_INVALID_FORMAT);
 }
 
 /*
  * Parse a public key
  */
-int mbedtls_pk_parse_public_key( mbedtls_pk_context *ctx,
-                         const unsigned char *key, size_t keylen )
+int mbedtls_pk_parse_public_key(mbedtls_pk_context *ctx,
+                                const unsigned char *key, size_t keylen)
 {
     int ret;
     unsigned char *p;
@@ -1359,91 +1285,83 @@ int mbedtls_pk_parse_public_key( mbedtls_pk_context *ctx,
     size_t len;
     mbedtls_pem_context pem;
 
-    mbedtls_pem_init( &pem );
+    mbedtls_pem_init(&pem);
 #if defined(MBEDTLS_RSA_C)
     /* Avoid calling mbedtls_pem_read_buffer() on non-null-terminated string */
-    if( keylen == 0 || key[keylen - 1] != '\0' )
+    if (keylen == 0 || key[keylen - 1] != '\0')
         ret = MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT;
     else
-        ret = mbedtls_pem_read_buffer( &pem,
-                               "-----BEGIN RSA PUBLIC KEY-----",
-                               "-----END RSA PUBLIC KEY-----",
-                               key, NULL, 0, &len );
+        ret = mbedtls_pem_read_buffer(&pem,
+                                      "-----BEGIN RSA PUBLIC KEY-----",
+                                      "-----END RSA PUBLIC KEY-----",
+                                      key, NULL, 0, &len);
 
-    if( ret == 0 )
-    {
+    if (ret == 0) {
         p = pem.buf;
-        if( ( pk_info = mbedtls_pk_info_from_type( MBEDTLS_PK_RSA ) ) == NULL )
-            return( MBEDTLS_ERR_PK_UNKNOWN_PK_ALG );
+        if ((pk_info = mbedtls_pk_info_from_type(MBEDTLS_PK_RSA)) == NULL)
+            return (MBEDTLS_ERR_PK_UNKNOWN_PK_ALG);
 
-        if( ( ret = mbedtls_pk_setup( ctx, pk_info ) ) != 0 )
-            return( ret );
+        if ((ret = mbedtls_pk_setup(ctx, pk_info)) != 0)
+            return (ret);
 
-        if ( ( ret = pk_get_rsapubkey( &p, p + pem.buflen, mbedtls_pk_rsa( *ctx ) ) ) != 0 )
-            mbedtls_pk_free( ctx );
+        if ((ret = pk_get_rsapubkey(&p, p + pem.buflen, mbedtls_pk_rsa(*ctx))) != 0)
+            mbedtls_pk_free(ctx);
 
-        mbedtls_pem_free( &pem );
-        return( ret );
-    }
-    else if( ret != MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT )
-    {
-        mbedtls_pem_free( &pem );
-        return( ret );
+        mbedtls_pem_free(&pem);
+        return (ret);
+    } else if (ret != MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT) {
+        mbedtls_pem_free(&pem);
+        return (ret);
     }
 #endif /* MBEDTLS_RSA_C */
 
     /* Avoid calling mbedtls_pem_read_buffer() on non-null-terminated string */
-    if( keylen == 0 || key[keylen - 1] != '\0' )
+    if (keylen == 0 || key[keylen - 1] != '\0')
         ret = MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT;
     else
-        ret = mbedtls_pem_read_buffer( &pem,
-                "-----BEGIN PUBLIC KEY-----",
-                "-----END PUBLIC KEY-----",
-                key, NULL, 0, &len );
+        ret = mbedtls_pem_read_buffer(&pem,
+                                      "-----BEGIN PUBLIC KEY-----",
+                                      "-----END PUBLIC KEY-----",
+                                      key, NULL, 0, &len);
 
-    if( ret == 0 )
-    {
+    if (ret == 0) {
         /*
          * Was PEM encoded
          */
         p = pem.buf;
 
-        ret = mbedtls_pk_parse_subpubkey( &p,  p + pem.buflen, ctx );
-        mbedtls_pem_free( &pem );
-        return( ret );
+        ret = mbedtls_pk_parse_subpubkey(&p,  p + pem.buflen, ctx);
+        mbedtls_pem_free(&pem);
+        return (ret);
+    } else if (ret != MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT) {
+        mbedtls_pem_free(&pem);
+        return (ret);
     }
-    else if( ret != MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT )
-    {
-        mbedtls_pem_free( &pem );
-        return( ret );
-    }
-    mbedtls_pem_free( &pem );
+    mbedtls_pem_free(&pem);
 #endif /* MBEDTLS_PEM_PARSE_C */
 
 #if defined(MBEDTLS_RSA_C)
-    if( ( pk_info = mbedtls_pk_info_from_type( MBEDTLS_PK_RSA ) ) == NULL )
-        return( MBEDTLS_ERR_PK_UNKNOWN_PK_ALG );
+    if ((pk_info = mbedtls_pk_info_from_type(MBEDTLS_PK_RSA)) == NULL)
+        return (MBEDTLS_ERR_PK_UNKNOWN_PK_ALG);
 
-    if( ( ret = mbedtls_pk_setup( ctx, pk_info ) ) != 0 )
-        return( ret );
+    if ((ret = mbedtls_pk_setup(ctx, pk_info)) != 0)
+        return (ret);
 
     p = (unsigned char *)key;
-    ret = pk_get_rsapubkey( &p, p + keylen, mbedtls_pk_rsa( *ctx ) );
-    if( ret == 0 )
-    {
-        return( ret );
+    ret = pk_get_rsapubkey(&p, p + keylen, mbedtls_pk_rsa(*ctx));
+    if (ret == 0) {
+        return (ret);
     }
-    mbedtls_pk_free( ctx );
-    if( ret != ( MBEDTLS_ERR_PK_INVALID_PUBKEY + MBEDTLS_ERR_ASN1_UNEXPECTED_TAG ) )
-    {
-        return( ret );
+    mbedtls_pk_free(ctx);
+    if (ret != (MBEDTLS_ERR_PK_INVALID_PUBKEY + MBEDTLS_ERR_ASN1_UNEXPECTED_TAG)) {
+        return (ret);
     }
 #endif /* MBEDTLS_RSA_C */
     p = (unsigned char *) key;
 
-    ret = mbedtls_pk_parse_subpubkey( &p, p + keylen, ctx );
+    ret = mbedtls_pk_parse_subpubkey(&p, p + keylen, ctx);
 
-    return( ret );
+    return (ret);
 }
 
 #endif /* MBEDTLS_PK_PARSE_C */
diff --git a/common/mbedtls/pkwrite.c b/common/mbedtls/pkwrite.c
index 8e0bb2e60..eab151d46 100644
--- a/common/mbedtls/pkwrite.c
+++ b/common/mbedtls/pkwrite.c
@@ -63,38 +63,38 @@
  *      publicExponent    INTEGER   -- e
  *  }
  */
-static int pk_write_rsa_pubkey( unsigned char **p, unsigned char *start,
-                                mbedtls_rsa_context *rsa )
+static int pk_write_rsa_pubkey(unsigned char **p, unsigned char *start,
+                               mbedtls_rsa_context *rsa)
 {
     int ret;
     size_t len = 0;
     mbedtls_mpi T;
 
-    mbedtls_mpi_init( &T );
+    mbedtls_mpi_init(&T);
 
     /* Export E */
-    if ( ( ret = mbedtls_rsa_export( rsa, NULL, NULL, NULL, NULL, &T ) ) != 0 ||
-         ( ret = mbedtls_asn1_write_mpi( p, start, &T ) ) < 0 )
+    if ((ret = mbedtls_rsa_export(rsa, NULL, NULL, NULL, NULL, &T)) != 0 ||
+        (ret = mbedtls_asn1_write_mpi(p, start, &T)) < 0)
         goto end_of_export;
     len += ret;
 
     /* Export N */
-    if ( ( ret = mbedtls_rsa_export( rsa, &T, NULL, NULL, NULL, NULL ) ) != 0 ||
-         ( ret = mbedtls_asn1_write_mpi( p, start, &T ) ) < 0 )
+    if ((ret = mbedtls_rsa_export(rsa, &T, NULL, NULL, NULL, NULL)) != 0 ||
+        (ret = mbedtls_asn1_write_mpi(p, start, &T)) < 0)
         goto end_of_export;
     len += ret;
 
 end_of_export:
 
-    mbedtls_mpi_free( &T );
-    if( ret < 0 )
-        return( ret );
+    mbedtls_mpi_free(&T);
+    if (ret < 0)
+        return (ret);
 
-    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( p, start, len ) );
-    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( p, start, MBEDTLS_ASN1_CONSTRUCTED |
-                                                 MBEDTLS_ASN1_SEQUENCE ) );
+    MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_len(p, start, len));
+    MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_tag(p, start, MBEDTLS_ASN1_CONSTRUCTED |
+                                                     MBEDTLS_ASN1_SEQUENCE));
 
-    return( (int) len );
+    return ((int) len);
 }
 #endif /* MBEDTLS_RSA_C */
 
@@ -102,27 +102,26 @@ end_of_export:
 /*
  * EC public key is an EC point
  */
-static int pk_write_ec_pubkey( unsigned char **p, unsigned char *start,
-                               mbedtls_ecp_keypair *ec )
+static int pk_write_ec_pubkey(unsigned char **p, unsigned char *start,
+                              mbedtls_ecp_keypair *ec)
 {
     int ret;
     size_t len = 0;
     unsigned char buf[MBEDTLS_ECP_MAX_PT_LEN];
 
-    if( ( ret = mbedtls_ecp_point_write_binary( &ec->grp, &ec->Q,
-                                        MBEDTLS_ECP_PF_UNCOMPRESSED,
-                                        &len, buf, sizeof( buf ) ) ) != 0 )
-    {
-        return( ret );
+    if ((ret = mbedtls_ecp_point_write_binary(&ec->grp, &ec->Q,
+                                              MBEDTLS_ECP_PF_UNCOMPRESSED,
+                                              &len, buf, sizeof(buf))) != 0) {
+        return (ret);
     }
 
-    if( *p < start || (size_t)( *p - start ) < len )
-        return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
+    if (*p < start || (size_t)(*p - start) < len)
+        return (MBEDTLS_ERR_ASN1_BUF_TOO_SMALL);
 
     *p -= len;
-    memcpy( *p, buf, len );
+    memcpy(*p, buf, len);
 
-    return( (int) len );
+    return ((int) len);
 }
 
 /*
@@ -130,45 +129,45 @@ static int pk_write_ec_pubkey( unsigned char **p, unsigned char *start,
  *   namedCurve         OBJECT IDENTIFIER
  * }
  */
-static int pk_write_ec_param( unsigned char **p, unsigned char *start,
-                              mbedtls_ecp_keypair *ec )
+static int pk_write_ec_param(unsigned char **p, unsigned char *start,
+                             mbedtls_ecp_keypair *ec)
 {
     int ret;
     size_t len = 0;
     const char *oid;
     size_t oid_len;
 
-    if( ( ret = mbedtls_oid_get_oid_by_ec_grp( ec->grp.id, &oid, &oid_len ) ) != 0 )
-        return( ret );
+    if ((ret = mbedtls_oid_get_oid_by_ec_grp(ec->grp.id, &oid, &oid_len)) != 0)
+        return (ret);
 
-    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_oid( p, start, oid, oid_len ) );
+    MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_oid(p, start, oid, oid_len));
 
-    return( (int) len );
+    return ((int) len);
 }
 #endif /* MBEDTLS_ECP_C */
 
-int mbedtls_pk_write_pubkey( unsigned char **p, unsigned char *start,
-                             const mbedtls_pk_context *key )
+int mbedtls_pk_write_pubkey(unsigned char **p, unsigned char *start,
+                            const mbedtls_pk_context *key)
 {
     int ret;
     size_t len = 0;
 
 #if defined(MBEDTLS_RSA_C)
-    if( mbedtls_pk_get_type( key ) == MBEDTLS_PK_RSA )
-        MBEDTLS_ASN1_CHK_ADD( len, pk_write_rsa_pubkey( p, start, mbedtls_pk_rsa( *key ) ) );
+    if (mbedtls_pk_get_type(key) == MBEDTLS_PK_RSA)
+        MBEDTLS_ASN1_CHK_ADD(len, pk_write_rsa_pubkey(p, start, mbedtls_pk_rsa(*key)));
     else
 #endif
 #if defined(MBEDTLS_ECP_C)
-    if( mbedtls_pk_get_type( key ) == MBEDTLS_PK_ECKEY )
-        MBEDTLS_ASN1_CHK_ADD( len, pk_write_ec_pubkey( p, start, mbedtls_pk_ec( *key ) ) );
-    else
+        if (mbedtls_pk_get_type(key) == MBEDTLS_PK_ECKEY)
+            MBEDTLS_ASN1_CHK_ADD(len, pk_write_ec_pubkey(p, start, mbedtls_pk_ec(*key)));
+        else
 #endif
-        return( MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE );
+            return (MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE);
 
-    return( (int) len );
+    return ((int) len);
 }
 
-int mbedtls_pk_write_pubkey_der( mbedtls_pk_context *key, unsigned char *buf, size_t size )
+int mbedtls_pk_write_pubkey_der(mbedtls_pk_context *key, unsigned char *buf, size_t size)
 {
     int ret;
     unsigned char *c;
@@ -177,10 +176,10 @@ int mbedtls_pk_write_pubkey_der( mbedtls_pk_context *key, unsigned char *buf, si
 
     c = buf + size;
 
-    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_pk_write_pubkey( &c, buf, key ) );
+    MBEDTLS_ASN1_CHK_ADD(len, mbedtls_pk_write_pubkey(&c, buf, key));
 
-    if( c - buf < 1 )
-        return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
+    if (c - buf < 1)
+        return (MBEDTLS_ERR_ASN1_BUF_TOO_SMALL);
 
     /*
      *  SubjectPublicKeyInfo  ::=  SEQUENCE  {
@@ -190,174 +189,168 @@ int mbedtls_pk_write_pubkey_der( mbedtls_pk_context *key, unsigned char *buf, si
     *--c = 0;
     len += 1;
 
-    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( &c, buf, len ) );
-    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( &c, buf, MBEDTLS_ASN1_BIT_STRING ) );
+    MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_len(&c, buf, len));
+    MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_tag(&c, buf, MBEDTLS_ASN1_BIT_STRING));
 
-    if( ( ret = mbedtls_oid_get_oid_by_pk_alg( mbedtls_pk_get_type( key ),
-                                       &oid, &oid_len ) ) != 0 )
-    {
-        return( ret );
+    if ((ret = mbedtls_oid_get_oid_by_pk_alg(mbedtls_pk_get_type(key),
+                                             &oid, &oid_len)) != 0) {
+        return (ret);
     }
 
 #if defined(MBEDTLS_ECP_C)
-    if( mbedtls_pk_get_type( key ) == MBEDTLS_PK_ECKEY )
-    {
-        MBEDTLS_ASN1_CHK_ADD( par_len, pk_write_ec_param( &c, buf, mbedtls_pk_ec( *key ) ) );
+    if (mbedtls_pk_get_type(key) == MBEDTLS_PK_ECKEY) {
+        MBEDTLS_ASN1_CHK_ADD(par_len, pk_write_ec_param(&c, buf, mbedtls_pk_ec(*key)));
     }
 #endif
 
-    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_algorithm_identifier( &c, buf, oid, oid_len,
-                                                        par_len ) );
+    MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_algorithm_identifier(&c, buf, oid, oid_len,
+                         par_len));
 
-    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( &c, buf, len ) );
-    MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( &c, buf, MBEDTLS_ASN1_CONSTRUCTED |
-                                                MBEDTLS_ASN1_SEQUENCE ) );
+    MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_len(&c, buf, len));
+    MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_tag(&c, buf, MBEDTLS_ASN1_CONSTRUCTED |
+                                                     MBEDTLS_ASN1_SEQUENCE));
 
-    return( (int) len );
+    return ((int) len);
 }
 
-int mbedtls_pk_write_key_der( mbedtls_pk_context *key, unsigned char *buf, size_t size )
+int mbedtls_pk_write_key_der(mbedtls_pk_context *key, unsigned char *buf, size_t size)
 {
     int ret;
     unsigned char *c = buf + size;
     size_t len = 0;
 
 #if defined(MBEDTLS_RSA_C)
-    if( mbedtls_pk_get_type( key ) == MBEDTLS_PK_RSA )
-    {
+    if (mbedtls_pk_get_type(key) == MBEDTLS_PK_RSA) {
         mbedtls_mpi T; /* Temporary holding the exported parameters */
-        mbedtls_rsa_context *rsa = mbedtls_pk_rsa( *key );
+        mbedtls_rsa_context *rsa = mbedtls_pk_rsa(*key);
 
         /*
          * Export the parameters one after another to avoid simultaneous copies.
          */
 
-        mbedtls_mpi_init( &T );
+        mbedtls_mpi_init(&T);
 
         /* Export QP */
-        if( ( ret = mbedtls_rsa_export_crt( rsa, NULL, NULL, &T ) ) != 0 ||
-            ( ret = mbedtls_asn1_write_mpi( &c, buf, &T ) ) < 0 )
+        if ((ret = mbedtls_rsa_export_crt(rsa, NULL, NULL, &T)) != 0 ||
+            (ret = mbedtls_asn1_write_mpi(&c, buf, &T)) < 0)
             goto end_of_export;
         len += ret;
 
         /* Export DQ */
-        if( ( ret = mbedtls_rsa_export_crt( rsa, NULL, &T, NULL ) ) != 0 ||
-            ( ret = mbedtls_asn1_write_mpi( &c, buf, &T ) ) < 0 )
+        if ((ret = mbedtls_rsa_export_crt(rsa, NULL, &T, NULL)) != 0 ||
+            (ret = mbedtls_asn1_write_mpi(&c, buf, &T)) < 0)
             goto end_of_export;
         len += ret;
 
         /* Export DP */
-        if( ( ret = mbedtls_rsa_export_crt( rsa, &T, NULL, NULL ) ) != 0 ||
-            ( ret = mbedtls_asn1_write_mpi( &c, buf, &T ) ) < 0 )
+        if ((ret = mbedtls_rsa_export_crt(rsa, &T, NULL, NULL)) != 0 ||
+            (ret = mbedtls_asn1_write_mpi(&c, buf, &T)) < 0)
             goto end_of_export;
         len += ret;
 
         /* Export Q */
-        if ( ( ret = mbedtls_rsa_export( rsa, NULL, NULL,
-                                         &T, NULL, NULL ) ) != 0 ||
-             ( ret = mbedtls_asn1_write_mpi( &c, buf, &T ) ) < 0 )
+        if ((ret = mbedtls_rsa_export(rsa, NULL, NULL,
+                                      &T, NULL, NULL)) != 0 ||
+            (ret = mbedtls_asn1_write_mpi(&c, buf, &T)) < 0)
             goto end_of_export;
         len += ret;
 
         /* Export P */
-        if ( ( ret = mbedtls_rsa_export( rsa, NULL, &T,
-                                         NULL, NULL, NULL ) ) != 0 ||
-             ( ret = mbedtls_asn1_write_mpi( &c, buf, &T ) ) < 0 )
+        if ((ret = mbedtls_rsa_export(rsa, NULL, &T,
+                                      NULL, NULL, NULL)) != 0 ||
+            (ret = mbedtls_asn1_write_mpi(&c, buf, &T)) < 0)
             goto end_of_export;
         len += ret;
 
         /* Export D */
-        if ( ( ret = mbedtls_rsa_export( rsa, NULL, NULL,
-                                         NULL, &T, NULL ) ) != 0 ||
-             ( ret = mbedtls_asn1_write_mpi( &c, buf, &T ) ) < 0 )
+        if ((ret = mbedtls_rsa_export(rsa, NULL, NULL,
+                                      NULL, &T, NULL)) != 0 ||
+            (ret = mbedtls_asn1_write_mpi(&c, buf, &T)) < 0)
             goto end_of_export;
         len += ret;
 
         /* Export E */
-        if ( ( ret = mbedtls_rsa_export( rsa, NULL, NULL,
-                                         NULL, NULL, &T ) ) != 0 ||
-             ( ret = mbedtls_asn1_write_mpi( &c, buf, &T ) ) < 0 )
+        if ((ret = mbedtls_rsa_export(rsa, NULL, NULL,
+                                      NULL, NULL, &T)) != 0 ||
+            (ret = mbedtls_asn1_write_mpi(&c, buf, &T)) < 0)
             goto end_of_export;
         len += ret;
 
         /* Export N */
-        if ( ( ret = mbedtls_rsa_export( rsa, &T, NULL,
-                                         NULL, NULL, NULL ) ) != 0 ||
-             ( ret = mbedtls_asn1_write_mpi( &c, buf, &T ) ) < 0 )
+        if ((ret = mbedtls_rsa_export(rsa, &T, NULL,
+                                      NULL, NULL, NULL)) != 0 ||
+            (ret = mbedtls_asn1_write_mpi(&c, buf, &T)) < 0)
             goto end_of_export;
         len += ret;
 
-    end_of_export:
+end_of_export:
 
-        mbedtls_mpi_free( &T );
-        if( ret < 0 )
-            return( ret );
+        mbedtls_mpi_free(&T);
+        if (ret < 0)
+            return (ret);
 
-        MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_int( &c, buf, 0 ) );
-        MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( &c, buf, len ) );
-        MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( &c,
-                                               buf, MBEDTLS_ASN1_CONSTRUCTED |
-                                               MBEDTLS_ASN1_SEQUENCE ) );
-    }
-    else
+        MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_int(&c, buf, 0));
+        MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_len(&c, buf, len));
+        MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_tag(&c,
+                                                         buf, MBEDTLS_ASN1_CONSTRUCTED |
+                                                         MBEDTLS_ASN1_SEQUENCE));
+    } else
 #endif /* MBEDTLS_RSA_C */
 #if defined(MBEDTLS_ECP_C)
-    if( mbedtls_pk_get_type( key ) == MBEDTLS_PK_ECKEY )
-    {
-        mbedtls_ecp_keypair *ec = mbedtls_pk_ec( *key );
-        size_t pub_len = 0, par_len = 0;
+        if (mbedtls_pk_get_type(key) == MBEDTLS_PK_ECKEY) {
+            mbedtls_ecp_keypair *ec = mbedtls_pk_ec(*key);
+            size_t pub_len = 0, par_len = 0;
 
-        /*
-         * RFC 5915, or SEC1 Appendix C.4
-         *
-         * ECPrivateKey ::= SEQUENCE {
-         *      version        INTEGER { ecPrivkeyVer1(1) } (ecPrivkeyVer1),
-         *      privateKey     OCTET STRING,
-         *      parameters [0] ECParameters {{ NamedCurve }} OPTIONAL,
-         *      publicKey  [1] BIT STRING OPTIONAL
-         *    }
-         */
+            /*
+             * RFC 5915, or SEC1 Appendix C.4
+             *
+             * ECPrivateKey ::= SEQUENCE {
+             *      version        INTEGER { ecPrivkeyVer1(1) } (ecPrivkeyVer1),
+             *      privateKey     OCTET STRING,
+             *      parameters [0] ECParameters {{ NamedCurve }} OPTIONAL,
+             *      publicKey  [1] BIT STRING OPTIONAL
+             *    }
+             */
 
-        /* publicKey */
-        MBEDTLS_ASN1_CHK_ADD( pub_len, pk_write_ec_pubkey( &c, buf, ec ) );
+            /* publicKey */
+            MBEDTLS_ASN1_CHK_ADD(pub_len, pk_write_ec_pubkey(&c, buf, ec));
 
-        if( c - buf < 1 )
-            return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
-        *--c = 0;
-        pub_len += 1;
+            if (c - buf < 1)
+                return (MBEDTLS_ERR_ASN1_BUF_TOO_SMALL);
+            *--c = 0;
+            pub_len += 1;
 
-        MBEDTLS_ASN1_CHK_ADD( pub_len, mbedtls_asn1_write_len( &c, buf, pub_len ) );
-        MBEDTLS_ASN1_CHK_ADD( pub_len, mbedtls_asn1_write_tag( &c, buf, MBEDTLS_ASN1_BIT_STRING ) );
+            MBEDTLS_ASN1_CHK_ADD(pub_len, mbedtls_asn1_write_len(&c, buf, pub_len));
+            MBEDTLS_ASN1_CHK_ADD(pub_len, mbedtls_asn1_write_tag(&c, buf, MBEDTLS_ASN1_BIT_STRING));
 
-        MBEDTLS_ASN1_CHK_ADD( pub_len, mbedtls_asn1_write_len( &c, buf, pub_len ) );
-        MBEDTLS_ASN1_CHK_ADD( pub_len, mbedtls_asn1_write_tag( &c, buf,
-                            MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_CONSTRUCTED | 1 ) );
-        len += pub_len;
+            MBEDTLS_ASN1_CHK_ADD(pub_len, mbedtls_asn1_write_len(&c, buf, pub_len));
+            MBEDTLS_ASN1_CHK_ADD(pub_len, mbedtls_asn1_write_tag(&c, buf,
+                                                                 MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_CONSTRUCTED | 1));
+            len += pub_len;
 
-        /* parameters */
-        MBEDTLS_ASN1_CHK_ADD( par_len, pk_write_ec_param( &c, buf, ec ) );
+            /* parameters */
+            MBEDTLS_ASN1_CHK_ADD(par_len, pk_write_ec_param(&c, buf, ec));
 
-        MBEDTLS_ASN1_CHK_ADD( par_len, mbedtls_asn1_write_len( &c, buf, par_len ) );
-        MBEDTLS_ASN1_CHK_ADD( par_len, mbedtls_asn1_write_tag( &c, buf,
-                            MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_CONSTRUCTED | 0 ) );
-        len += par_len;
+            MBEDTLS_ASN1_CHK_ADD(par_len, mbedtls_asn1_write_len(&c, buf, par_len));
+            MBEDTLS_ASN1_CHK_ADD(par_len, mbedtls_asn1_write_tag(&c, buf,
+                                                                 MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_CONSTRUCTED | 0));
+            len += par_len;
 
-        /* privateKey: write as MPI then fix tag */
-        MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_mpi( &c, buf, &ec->d ) );
-        *c = MBEDTLS_ASN1_OCTET_STRING;
+            /* privateKey: write as MPI then fix tag */
+            MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_mpi(&c, buf, &ec->d));
+            *c = MBEDTLS_ASN1_OCTET_STRING;
 
-        /* version */
-        MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_int( &c, buf, 1 ) );
+            /* version */
+            MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_int(&c, buf, 1));
 
-        MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( &c, buf, len ) );
-        MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( &c, buf, MBEDTLS_ASN1_CONSTRUCTED |
-                                                    MBEDTLS_ASN1_SEQUENCE ) );
-    }
-    else
+            MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_len(&c, buf, len));
+            MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_tag(&c, buf, MBEDTLS_ASN1_CONSTRUCTED |
+                                                             MBEDTLS_ASN1_SEQUENCE));
+        } else
 #endif /* MBEDTLS_ECP_C */
-        return( MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE );
+            return (MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE);
 
-    return( (int) len );
+    return ((int) len);
 }
 
 #if defined(MBEDTLS_PEM_WRITE_C)
@@ -405,9 +398,9 @@ int mbedtls_pk_write_key_der( mbedtls_pk_context *key, unsigned char *buf, size_
  *  }
  */
 #define MPI_MAX_SIZE_2          MBEDTLS_MPI_MAX_SIZE / 2 + \
-                                MBEDTLS_MPI_MAX_SIZE % 2
+    MBEDTLS_MPI_MAX_SIZE % 2
 #define RSA_PRV_DER_MAX_BYTES   47 + 3 * MBEDTLS_MPI_MAX_SIZE \
-                                   + 5 * MPI_MAX_SIZE_2
+    + 5 * MPI_MAX_SIZE_2
 
 #else /* MBEDTLS_RSA_C */
 
@@ -449,68 +442,61 @@ int mbedtls_pk_write_key_der( mbedtls_pk_context *key, unsigned char *buf, size_
 #endif /* MBEDTLS_ECP_C */
 
 #define PUB_DER_MAX_BYTES   RSA_PUB_DER_MAX_BYTES > ECP_PUB_DER_MAX_BYTES ? \
-                            RSA_PUB_DER_MAX_BYTES : ECP_PUB_DER_MAX_BYTES
+    RSA_PUB_DER_MAX_BYTES : ECP_PUB_DER_MAX_BYTES
 #define PRV_DER_MAX_BYTES   RSA_PRV_DER_MAX_BYTES > ECP_PRV_DER_MAX_BYTES ? \
-                            RSA_PRV_DER_MAX_BYTES : ECP_PRV_DER_MAX_BYTES
+    RSA_PRV_DER_MAX_BYTES : ECP_PRV_DER_MAX_BYTES
 
-int mbedtls_pk_write_pubkey_pem( mbedtls_pk_context *key, unsigned char *buf, size_t size )
+int mbedtls_pk_write_pubkey_pem(mbedtls_pk_context *key, unsigned char *buf, size_t size)
 {
     int ret;
     unsigned char output_buf[PUB_DER_MAX_BYTES];
     size_t olen = 0;
 
-    if( ( ret = mbedtls_pk_write_pubkey_der( key, output_buf,
-                                     sizeof(output_buf) ) ) < 0 )
-    {
-        return( ret );
+    if ((ret = mbedtls_pk_write_pubkey_der(key, output_buf,
+                                           sizeof(output_buf))) < 0) {
+        return (ret);
     }
 
-    if( ( ret = mbedtls_pem_write_buffer( PEM_BEGIN_PUBLIC_KEY, PEM_END_PUBLIC_KEY,
-                                  output_buf + sizeof(output_buf) - ret,
-                                  ret, buf, size, &olen ) ) != 0 )
-    {
-        return( ret );
+    if ((ret = mbedtls_pem_write_buffer(PEM_BEGIN_PUBLIC_KEY, PEM_END_PUBLIC_KEY,
+                                        output_buf + sizeof(output_buf) - ret,
+                                        ret, buf, size, &olen)) != 0) {
+        return (ret);
     }
 
-    return( 0 );
+    return (0);
 }
 
-int mbedtls_pk_write_key_pem( mbedtls_pk_context *key, unsigned char *buf, size_t size )
+int mbedtls_pk_write_key_pem(mbedtls_pk_context *key, unsigned char *buf, size_t size)
 {
     int ret;
     unsigned char output_buf[PRV_DER_MAX_BYTES];
     const char *begin, *end;
     size_t olen = 0;
 
-    if( ( ret = mbedtls_pk_write_key_der( key, output_buf, sizeof(output_buf) ) ) < 0 )
-        return( ret );
+    if ((ret = mbedtls_pk_write_key_der(key, output_buf, sizeof(output_buf))) < 0)
+        return (ret);
 
 #if defined(MBEDTLS_RSA_C)
-    if( mbedtls_pk_get_type( key ) == MBEDTLS_PK_RSA )
-    {
+    if (mbedtls_pk_get_type(key) == MBEDTLS_PK_RSA) {
         begin = PEM_BEGIN_PRIVATE_KEY_RSA;
         end = PEM_END_PRIVATE_KEY_RSA;
-    }
-    else
+    } else
 #endif
 #if defined(MBEDTLS_ECP_C)
-    if( mbedtls_pk_get_type( key ) == MBEDTLS_PK_ECKEY )
-    {
-        begin = PEM_BEGIN_PRIVATE_KEY_EC;
-        end = PEM_END_PRIVATE_KEY_EC;
-    }
-    else
+        if (mbedtls_pk_get_type(key) == MBEDTLS_PK_ECKEY) {
+            begin = PEM_BEGIN_PRIVATE_KEY_EC;
+            end = PEM_END_PRIVATE_KEY_EC;
+        } else
 #endif
-        return( MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE );
+            return (MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE);
 
-    if( ( ret = mbedtls_pem_write_buffer( begin, end,
-                                  output_buf + sizeof(output_buf) - ret,
-                                  ret, buf, size, &olen ) ) != 0 )
-    {
-        return( ret );
+    if ((ret = mbedtls_pem_write_buffer(begin, end,
+                                        output_buf + sizeof(output_buf) - ret,
+                                        ret, buf, size, &olen)) != 0) {
+        return (ret);
     }
 
-    return( 0 );
+    return (0);
 }
 #endif /* MBEDTLS_PEM_WRITE_C */
 
diff --git a/common/mbedtls/platform.c b/common/mbedtls/platform.c
index 3ddb7f7ad..9d8e8f73d 100644
--- a/common/mbedtls/platform.c
+++ b/common/mbedtls/platform.c
@@ -34,18 +34,18 @@
 
 #if defined(MBEDTLS_PLATFORM_MEMORY)
 #if !defined(MBEDTLS_PLATFORM_STD_CALLOC)
-static void *platform_calloc_uninit( size_t n, size_t size )
+static void *platform_calloc_uninit(size_t n, size_t size)
 {
     ((void) n);
     ((void) size);
-    return( NULL );
+    return (NULL);
 }
 
 #define MBEDTLS_PLATFORM_STD_CALLOC   platform_calloc_uninit
 #endif /* !MBEDTLS_PLATFORM_STD_CALLOC */
 
 #if !defined(MBEDTLS_PLATFORM_STD_FREE)
-static void platform_free_uninit( void *ptr )
+static void platform_free_uninit(void *ptr)
 {
     ((void) ptr);
 }
@@ -53,53 +53,52 @@ static void platform_free_uninit( void *ptr )
 #define MBEDTLS_PLATFORM_STD_FREE     platform_free_uninit
 #endif /* !MBEDTLS_PLATFORM_STD_FREE */
 
-static void * (*mbedtls_calloc_func)( size_t, size_t ) = MBEDTLS_PLATFORM_STD_CALLOC;
-static void (*mbedtls_free_func)( void * ) = MBEDTLS_PLATFORM_STD_FREE;
+static void *(*mbedtls_calloc_func)(size_t, size_t) = MBEDTLS_PLATFORM_STD_CALLOC;
+static void (*mbedtls_free_func)(void *) = MBEDTLS_PLATFORM_STD_FREE;
 
-void * mbedtls_calloc( size_t nmemb, size_t size )
+void *mbedtls_calloc(size_t nmemb, size_t size)
 {
-    return (*mbedtls_calloc_func)( nmemb, size );
+    return (*mbedtls_calloc_func)(nmemb, size);
 }
 
-void mbedtls_free( void * ptr )
+void mbedtls_free(void *ptr)
 {
-    (*mbedtls_free_func)( ptr );
+    (*mbedtls_free_func)(ptr);
 }
 
-int mbedtls_platform_set_calloc_free( void * (*calloc_func)( size_t, size_t ),
-                              void (*free_func)( void * ) )
+int mbedtls_platform_set_calloc_free(void *(*calloc_func)(size_t, size_t),
+                                     void (*free_func)(void *))
 {
     mbedtls_calloc_func = calloc_func;
     mbedtls_free_func = free_func;
-    return( 0 );
+    return (0);
 }
 #endif /* MBEDTLS_PLATFORM_MEMORY */
 
 #if defined(_WIN32)
 #include <stdarg.h>
-int mbedtls_platform_win32_snprintf( char *s, size_t n, const char *fmt, ... )
+int mbedtls_platform_win32_snprintf(char *s, size_t n, const char *fmt, ...)
 {
     int ret;
     va_list argp;
 
     /* Avoid calling the invalid parameter handler by checking ourselves */
-    if( s == NULL || n == 0 || fmt == NULL )
-        return( -1 );
+    if (s == NULL || n == 0 || fmt == NULL)
+        return (-1);
 
-    va_start( argp, fmt );
+    va_start(argp, fmt);
 #if defined(_TRUNCATE) && !defined(__MINGW32__)
-    ret = _vsnprintf_s( s, n, _TRUNCATE, fmt, argp );
+    ret = _vsnprintf_s(s, n, _TRUNCATE, fmt, argp);
 #else
-    ret = _vsnprintf( s, n, fmt, argp );
-    if( ret < 0 || (size_t) ret == n )
-    {
-        s[n-1] = '\0';
+    ret = _vsnprintf(s, n, fmt, argp);
+    if (ret < 0 || (size_t) ret == n) {
+        s[n - 1] = '\0';
         ret = -1;
     }
 #endif
-    va_end( argp );
+    va_end(argp);
 
-    return( ret );
+    return (ret);
 }
 #endif
 
@@ -108,28 +107,28 @@ int mbedtls_platform_win32_snprintf( char *s, size_t n, const char *fmt, ... )
 /*
  * Make dummy function to prevent NULL pointer dereferences
  */
-static int platform_snprintf_uninit( char * s, size_t n,
-                                     const char * format, ... )
+static int platform_snprintf_uninit(char *s, size_t n,
+                                    const char *format, ...)
 {
     ((void) s);
     ((void) n);
     ((void) format);
-    return( 0 );
+    return (0);
 }
 
 #define MBEDTLS_PLATFORM_STD_SNPRINTF    platform_snprintf_uninit
 #endif /* !MBEDTLS_PLATFORM_STD_SNPRINTF */
 
-int (*mbedtls_snprintf)( char * s, size_t n,
-                          const char * format,
-                          ... ) = MBEDTLS_PLATFORM_STD_SNPRINTF;
+int (*mbedtls_snprintf)(char *s, size_t n,
+                        const char *format,
+                        ...) = MBEDTLS_PLATFORM_STD_SNPRINTF;
 
-int mbedtls_platform_set_snprintf( int (*snprintf_func)( char * s, size_t n,
-                                                 const char * format,
-                                                 ... ) )
+int mbedtls_platform_set_snprintf(int (*snprintf_func)(char *s, size_t n,
+                                                       const char *format,
+                                                       ...))
 {
     mbedtls_snprintf = snprintf_func;
-    return( 0 );
+    return (0);
 }
 #endif /* MBEDTLS_PLATFORM_SNPRINTF_ALT */
 
@@ -138,21 +137,21 @@ int mbedtls_platform_set_snprintf( int (*snprintf_func)( char * s, size_t n,
 /*
  * Make dummy function to prevent NULL pointer dereferences
  */
-static int platform_printf_uninit( const char *format, ... )
+static int platform_printf_uninit(const char *format, ...)
 {
     ((void) format);
-    return( 0 );
+    return (0);
 }
 
 #define MBEDTLS_PLATFORM_STD_PRINTF    platform_printf_uninit
 #endif /* !MBEDTLS_PLATFORM_STD_PRINTF */
 
-int (*mbedtls_printf)( const char *, ... ) = MBEDTLS_PLATFORM_STD_PRINTF;
+int (*mbedtls_printf)(const char *, ...) = MBEDTLS_PLATFORM_STD_PRINTF;
 
-int mbedtls_platform_set_printf( int (*printf_func)( const char *, ... ) )
+int mbedtls_platform_set_printf(int (*printf_func)(const char *, ...))
 {
     mbedtls_printf = printf_func;
-    return( 0 );
+    return (0);
 }
 #endif /* MBEDTLS_PLATFORM_PRINTF_ALT */
 
@@ -161,23 +160,23 @@ int mbedtls_platform_set_printf( int (*printf_func)( const char *, ... ) )
 /*
  * Make dummy function to prevent NULL pointer dereferences
  */
-static int platform_fprintf_uninit( FILE *stream, const char *format, ... )
+static int platform_fprintf_uninit(FILE *stream, const char *format, ...)
 {
     ((void) stream);
     ((void) format);
-    return( 0 );
+    return (0);
 }
 
 #define MBEDTLS_PLATFORM_STD_FPRINTF   platform_fprintf_uninit
 #endif /* !MBEDTLS_PLATFORM_STD_FPRINTF */
 
-int (*mbedtls_fprintf)( FILE *, const char *, ... ) =
-                                        MBEDTLS_PLATFORM_STD_FPRINTF;
+int (*mbedtls_fprintf)(FILE *, const char *, ...) =
+    MBEDTLS_PLATFORM_STD_FPRINTF;
 
-int mbedtls_platform_set_fprintf( int (*fprintf_func)( FILE *, const char *, ... ) )
+int mbedtls_platform_set_fprintf(int (*fprintf_func)(FILE *, const char *, ...))
 {
     mbedtls_fprintf = fprintf_func;
-    return( 0 );
+    return (0);
 }
 #endif /* MBEDTLS_PLATFORM_FPRINTF_ALT */
 
@@ -186,7 +185,7 @@ int mbedtls_platform_set_fprintf( int (*fprintf_func)( FILE *, const char *, ...
 /*
  * Make dummy function to prevent NULL pointer dereferences
  */
-static void platform_exit_uninit( int status )
+static void platform_exit_uninit(int status)
 {
     ((void) status);
 }
@@ -194,12 +193,12 @@ static void platform_exit_uninit( int status )
 #define MBEDTLS_PLATFORM_STD_EXIT   platform_exit_uninit
 #endif /* !MBEDTLS_PLATFORM_STD_EXIT */
 
-void (*mbedtls_exit)( int status ) = MBEDTLS_PLATFORM_STD_EXIT;
+void (*mbedtls_exit)(int status) = MBEDTLS_PLATFORM_STD_EXIT;
 
-int mbedtls_platform_set_exit( void (*exit_func)( int status ) )
+int mbedtls_platform_set_exit(void (*exit_func)(int status))
 {
     mbedtls_exit = exit_func;
-    return( 0 );
+    return (0);
 }
 #endif /* MBEDTLS_PLATFORM_EXIT_ALT */
 
@@ -210,21 +209,21 @@ int mbedtls_platform_set_exit( void (*exit_func)( int status ) )
 /*
  * Make dummy function to prevent NULL pointer dereferences
  */
-static mbedtls_time_t platform_time_uninit( mbedtls_time_t* timer )
+static mbedtls_time_t platform_time_uninit(mbedtls_time_t *timer)
 {
     ((void) timer);
-    return( 0 );
+    return (0);
 }
 
 #define MBEDTLS_PLATFORM_STD_TIME   platform_time_uninit
 #endif /* !MBEDTLS_PLATFORM_STD_TIME */
 
-mbedtls_time_t (*mbedtls_time)( mbedtls_time_t* timer ) = MBEDTLS_PLATFORM_STD_TIME;
+mbedtls_time_t (*mbedtls_time)(mbedtls_time_t *timer) = MBEDTLS_PLATFORM_STD_TIME;
 
-int mbedtls_platform_set_time( mbedtls_time_t (*time_func)( mbedtls_time_t* timer ) )
+int mbedtls_platform_set_time(mbedtls_time_t (*time_func)(mbedtls_time_t *timer))
 {
     mbedtls_time = time_func;
-    return( 0 );
+    return (0);
 }
 #endif /* MBEDTLS_PLATFORM_TIME_ALT */
 
@@ -235,41 +234,39 @@ int mbedtls_platform_set_time( mbedtls_time_t (*time_func)( mbedtls_time_t* time
 /* Default implementations for the platform independent seed functions use
  * standard libc file functions to read from and write to a pre-defined filename
  */
-int mbedtls_platform_std_nv_seed_read( unsigned char *buf, size_t buf_len )
+int mbedtls_platform_std_nv_seed_read(unsigned char *buf, size_t buf_len)
 {
     FILE *file;
     size_t n;
 
-    if( ( file = fopen( MBEDTLS_PLATFORM_STD_NV_SEED_FILE, "rb" ) ) == NULL )
-        return( -1 );
+    if ((file = fopen(MBEDTLS_PLATFORM_STD_NV_SEED_FILE, "rb")) == NULL)
+        return (-1);
 
-    if( ( n = fread( buf, 1, buf_len, file ) ) != buf_len )
-    {
-        fclose( file );
-        mbedtls_platform_zeroize( buf, buf_len );
-        return( -1 );
+    if ((n = fread(buf, 1, buf_len, file)) != buf_len) {
+        fclose(file);
+        mbedtls_platform_zeroize(buf, buf_len);
+        return (-1);
     }
 
-    fclose( file );
-    return( (int)n );
+    fclose(file);
+    return ((int)n);
 }
 
-int mbedtls_platform_std_nv_seed_write( unsigned char *buf, size_t buf_len )
+int mbedtls_platform_std_nv_seed_write(unsigned char *buf, size_t buf_len)
 {
     FILE *file;
     size_t n;
 
-    if( ( file = fopen( MBEDTLS_PLATFORM_STD_NV_SEED_FILE, "w" ) ) == NULL )
+    if ((file = fopen(MBEDTLS_PLATFORM_STD_NV_SEED_FILE, "w")) == NULL)
         return -1;
 
-    if( ( n = fwrite( buf, 1, buf_len, file ) ) != buf_len )
-    {
-        fclose( file );
+    if ((n = fwrite(buf, 1, buf_len, file)) != buf_len) {
+        fclose(file);
         return -1;
     }
 
-    fclose( file );
-    return( (int)n );
+    fclose(file);
+    return ((int)n);
 }
 #endif /* MBEDTLS_PLATFORM_NO_STD_FUNCTIONS */
 
@@ -278,11 +275,11 @@ int mbedtls_platform_std_nv_seed_write( unsigned char *buf, size_t buf_len )
 /*
  * Make dummy function to prevent NULL pointer dereferences
  */
-static int platform_nv_seed_read_uninit( unsigned char *buf, size_t buf_len )
+static int platform_nv_seed_read_uninit(unsigned char *buf, size_t buf_len)
 {
     ((void) buf);
     ((void) buf_len);
-    return( -1 );
+    return (-1);
 }
 
 #define MBEDTLS_PLATFORM_STD_NV_SEED_READ   platform_nv_seed_read_uninit
@@ -292,28 +289,28 @@ static int platform_nv_seed_read_uninit( unsigned char *buf, size_t buf_len )
 /*
  * Make dummy function to prevent NULL pointer dereferences
  */
-static int platform_nv_seed_write_uninit( unsigned char *buf, size_t buf_len )
+static int platform_nv_seed_write_uninit(unsigned char *buf, size_t buf_len)
 {
     ((void) buf);
     ((void) buf_len);
-    return( -1 );
+    return (-1);
 }
 
 #define MBEDTLS_PLATFORM_STD_NV_SEED_WRITE   platform_nv_seed_write_uninit
 #endif /* !MBEDTLS_PLATFORM_STD_NV_SEED_WRITE */
 
-int (*mbedtls_nv_seed_read)( unsigned char *buf, size_t buf_len ) =
-            MBEDTLS_PLATFORM_STD_NV_SEED_READ;
-int (*mbedtls_nv_seed_write)( unsigned char *buf, size_t buf_len ) =
-            MBEDTLS_PLATFORM_STD_NV_SEED_WRITE;
+int (*mbedtls_nv_seed_read)(unsigned char *buf, size_t buf_len) =
+    MBEDTLS_PLATFORM_STD_NV_SEED_READ;
+int (*mbedtls_nv_seed_write)(unsigned char *buf, size_t buf_len) =
+    MBEDTLS_PLATFORM_STD_NV_SEED_WRITE;
 
 int mbedtls_platform_set_nv_seed(
-        int (*nv_seed_read_func)( unsigned char *buf, size_t buf_len ),
-        int (*nv_seed_write_func)( unsigned char *buf, size_t buf_len ) )
+    int (*nv_seed_read_func)(unsigned char *buf, size_t buf_len),
+    int (*nv_seed_write_func)(unsigned char *buf, size_t buf_len))
 {
     mbedtls_nv_seed_read = nv_seed_read_func;
     mbedtls_nv_seed_write = nv_seed_write_func;
-    return( 0 );
+    return (0);
 }
 #endif /* MBEDTLS_PLATFORM_NV_SEED_ALT */
 #endif /* MBEDTLS_ENTROPY_NV_SEED */
@@ -322,17 +319,17 @@ int mbedtls_platform_set_nv_seed(
 /*
  * Placeholder platform setup that does nothing by default
  */
-int mbedtls_platform_setup( mbedtls_platform_context *ctx )
+int mbedtls_platform_setup(mbedtls_platform_context *ctx)
 {
     (void)ctx;
 
-    return( 0 );
+    return (0);
 }
 
 /*
  * Placeholder platform teardown that does nothing by default
  */
-void mbedtls_platform_teardown( mbedtls_platform_context *ctx )
+void mbedtls_platform_teardown(mbedtls_platform_context *ctx)
 {
     (void)ctx;
 }
diff --git a/common/mbedtls/platform.h b/common/mbedtls/platform.h
index 818f44d4d..b32f0bb6e 100644
--- a/common/mbedtls/platform.h
+++ b/common/mbedtls/platform.h
@@ -123,8 +123,8 @@ extern "C" {
 #else
 /* For size_t */
 #include <stddef.h>
-extern void *mbedtls_calloc( size_t n, size_t size );
-extern void mbedtls_free( void *ptr );
+extern void *mbedtls_calloc(size_t n, size_t size);
+extern void mbedtls_free(void *ptr);
 
 /**
  * \brief               This function dynamically sets the memory-management
@@ -135,8 +135,8 @@ extern void mbedtls_free( void *ptr );
  *
  * \return              \c 0.
  */
-int mbedtls_platform_set_calloc_free( void * (*calloc_func)( size_t, size_t ),
-                              void (*free_func)( void * ) );
+int mbedtls_platform_set_calloc_free(void *(*calloc_func)(size_t, size_t),
+                                     void (*free_func)(void *));
 #endif /* MBEDTLS_PLATFORM_FREE_MACRO && MBEDTLS_PLATFORM_CALLOC_MACRO */
 #else /* !MBEDTLS_PLATFORM_MEMORY */
 #define mbedtls_free       free
@@ -149,7 +149,7 @@ int mbedtls_platform_set_calloc_free( void * (*calloc_func)( size_t, size_t ),
 #if defined(MBEDTLS_PLATFORM_FPRINTF_ALT)
 /* We need FILE * */
 #include <stdio.h>
-extern int (*mbedtls_fprintf)( FILE *stream, const char *format, ... );
+extern int (*mbedtls_fprintf)(FILE *stream, const char *format, ...);
 
 /**
  * \brief                This function dynamically configures the fprintf
@@ -160,8 +160,8 @@ extern int (*mbedtls_fprintf)( FILE *stream, const char *format, ... );
  *
  * \return               \c 0.
  */
-int mbedtls_platform_set_fprintf( int (*fprintf_func)( FILE *stream, const char *,
-                                               ... ) );
+int mbedtls_platform_set_fprintf(int (*fprintf_func)(FILE *stream, const char *,
+                                                     ...));
 #else
 #if defined(MBEDTLS_PLATFORM_FPRINTF_MACRO)
 #define mbedtls_fprintf    MBEDTLS_PLATFORM_FPRINTF_MACRO
@@ -174,7 +174,7 @@ int mbedtls_platform_set_fprintf( int (*fprintf_func)( FILE *stream, const char
  * The function pointers for printf
  */
 #if defined(MBEDTLS_PLATFORM_PRINTF_ALT)
-extern int (*mbedtls_printf)( const char *format, ... );
+extern int (*mbedtls_printf)(const char *format, ...);
 
 /**
  * \brief               This function dynamically configures the snprintf
@@ -185,7 +185,7 @@ extern int (*mbedtls_printf)( const char *format, ... );
  *
  * \return              \c 0 on success.
  */
-int mbedtls_platform_set_printf( int (*printf_func)( const char *, ... ) );
+int mbedtls_platform_set_printf(int (*printf_func)(const char *, ...));
 #else /* !MBEDTLS_PLATFORM_PRINTF_ALT */
 #if defined(MBEDTLS_PLATFORM_PRINTF_MACRO)
 #define mbedtls_printf     MBEDTLS_PLATFORM_PRINTF_MACRO
@@ -205,11 +205,11 @@ int mbedtls_platform_set_printf( int (*printf_func)( const char *, ... ) );
  */
 #if defined(_WIN32)
 /* For Windows (inc. MSYS2), we provide our own fixed implementation */
-int mbedtls_platform_win32_snprintf( char *s, size_t n, const char *fmt, ... );
+int mbedtls_platform_win32_snprintf(char *s, size_t n, const char *fmt, ...);
 #endif
 
 #if defined(MBEDTLS_PLATFORM_SNPRINTF_ALT)
-extern int (*mbedtls_snprintf)( char * s, size_t n, const char * format, ... );
+extern int (*mbedtls_snprintf)(char *s, size_t n, const char *format, ...);
 
 /**
  * \brief                 This function allows configuring a custom
@@ -219,8 +219,8 @@ extern int (*mbedtls_snprintf)( char * s, size_t n, const char * format, ... );
  *
  * \return                \c 0 on success.
  */
-int mbedtls_platform_set_snprintf( int (*snprintf_func)( char * s, size_t n,
-                                                 const char * format, ... ) );
+int mbedtls_platform_set_snprintf(int (*snprintf_func)(char *s, size_t n,
+                                                       const char *format, ...));
 #else /* MBEDTLS_PLATFORM_SNPRINTF_ALT */
 #if defined(MBEDTLS_PLATFORM_SNPRINTF_MACRO)
 #define mbedtls_snprintf   MBEDTLS_PLATFORM_SNPRINTF_MACRO
@@ -233,7 +233,7 @@ int mbedtls_platform_set_snprintf( int (*snprintf_func)( char * s, size_t n,
  * The function pointers for exit
  */
 #if defined(MBEDTLS_PLATFORM_EXIT_ALT)
-extern void (*mbedtls_exit)( int status );
+extern void (*mbedtls_exit)(int status);
 
 /**
  * \brief             This function dynamically configures the exit
@@ -244,7 +244,7 @@ extern void (*mbedtls_exit)( int status );
  *
  * \return            \c 0 on success.
  */
-int mbedtls_platform_set_exit( void (*exit_func)( int status ) );
+int mbedtls_platform_set_exit(void (*exit_func)(int status));
 #else
 #if defined(MBEDTLS_PLATFORM_EXIT_MACRO)
 #define mbedtls_exit   MBEDTLS_PLATFORM_EXIT_MACRO
@@ -276,13 +276,13 @@ int mbedtls_platform_set_exit( void (*exit_func)( int status ) );
 #if defined(MBEDTLS_ENTROPY_NV_SEED)
 #if !defined(MBEDTLS_PLATFORM_NO_STD_FUNCTIONS) && defined(MBEDTLS_FS_IO)
 /* Internal standard platform definitions */
-int mbedtls_platform_std_nv_seed_read( unsigned char *buf, size_t buf_len );
-int mbedtls_platform_std_nv_seed_write( unsigned char *buf, size_t buf_len );
+int mbedtls_platform_std_nv_seed_read(unsigned char *buf, size_t buf_len);
+int mbedtls_platform_std_nv_seed_write(unsigned char *buf, size_t buf_len);
 #endif
 
 #if defined(MBEDTLS_PLATFORM_NV_SEED_ALT)
-extern int (*mbedtls_nv_seed_read)( unsigned char *buf, size_t buf_len );
-extern int (*mbedtls_nv_seed_write)( unsigned char *buf, size_t buf_len );
+extern int (*mbedtls_nv_seed_read)(unsigned char *buf, size_t buf_len);
+extern int (*mbedtls_nv_seed_write)(unsigned char *buf, size_t buf_len);
 
 /**
  * \brief   This function allows configuring custom seed file writing and
@@ -294,9 +294,9 @@ extern int (*mbedtls_nv_seed_write)( unsigned char *buf, size_t buf_len );
  * \return  \c 0 on success.
  */
 int mbedtls_platform_set_nv_seed(
-            int (*nv_seed_read_func)( unsigned char *buf, size_t buf_len ),
-            int (*nv_seed_write_func)( unsigned char *buf, size_t buf_len )
-            );
+    int (*nv_seed_read_func)(unsigned char *buf, size_t buf_len),
+    int (*nv_seed_write_func)(unsigned char *buf, size_t buf_len)
+);
 #else
 #if defined(MBEDTLS_PLATFORM_NV_SEED_READ_MACRO) && \
     defined(MBEDTLS_PLATFORM_NV_SEED_WRITE_MACRO)
@@ -317,8 +317,7 @@ int mbedtls_platform_set_nv_seed(
  * \note    This structure may be used to assist platform-specific
  *          setup or teardown operations.
  */
-typedef struct mbedtls_platform_context
-{
+typedef struct mbedtls_platform_context {
     char dummy; /**< A placeholder member, as empty structs are not portable. */
 }
 mbedtls_platform_context;
@@ -342,7 +341,7 @@ mbedtls_platform_context;
  *
  * \return  \c 0 on success.
  */
-int mbedtls_platform_setup( mbedtls_platform_context *ctx );
+int mbedtls_platform_setup(mbedtls_platform_context *ctx);
 /**
  * \brief   This function performs any platform teardown operations.
  *
@@ -357,7 +356,7 @@ int mbedtls_platform_setup( mbedtls_platform_context *ctx );
  * \param   ctx     The platform context.
  *
  */
-void mbedtls_platform_teardown( mbedtls_platform_context *ctx );
+void mbedtls_platform_teardown(mbedtls_platform_context *ctx);
 
 #ifdef __cplusplus
 }
diff --git a/common/mbedtls/platform_util.c b/common/mbedtls/platform_util.c
index 0be18aca6..5c185f565 100644
--- a/common/mbedtls/platform_util.c
+++ b/common/mbedtls/platform_util.c
@@ -60,10 +60,10 @@
  * mbedtls_platform_zeroize() to use a suitable implementation for their
  * platform and needs.
  */
-static void * (* const volatile memset_func)( void *, int, size_t ) = memset;
+static void *(* const volatile memset_func)(void *, int, size_t) = memset;
 
-void mbedtls_platform_zeroize( void *buf, size_t len )
+void mbedtls_platform_zeroize(void *buf, size_t len)
 {
-    memset_func( buf, 0, len );
+    memset_func(buf, 0, len);
 }
 #endif /* MBEDTLS_PLATFORM_ZEROIZE_ALT */
diff --git a/common/mbedtls/platform_util.h b/common/mbedtls/platform_util.h
index 79404ce67..5e56c6004 100644
--- a/common/mbedtls/platform_util.h
+++ b/common/mbedtls/platform_util.h
@@ -55,7 +55,7 @@ extern "C" {
  * \param len   Length of the buffer in bytes
  *
  */
-void mbedtls_platform_zeroize( void *buf, size_t len );
+void mbedtls_platform_zeroize(void *buf, size_t len);
 
 #ifdef __cplusplus
 }
diff --git a/common/mbedtls/rsa.c b/common/mbedtls/rsa.c
index f26cf6a8b..d6250b0af 100644
--- a/common/mbedtls/rsa.c
+++ b/common/mbedtls/rsa.c
@@ -75,75 +75,73 @@
 
 #if defined(MBEDTLS_PKCS1_V15)
 /* constant-time buffer comparison */
-static inline int mbedtls_safer_memcmp( const void *a, const void *b, size_t n )
+static inline int mbedtls_safer_memcmp(const void *a, const void *b, size_t n)
 {
     size_t i;
     const unsigned char *A = (const unsigned char *) a;
     const unsigned char *B = (const unsigned char *) b;
     unsigned char diff = 0;
 
-    for( i = 0; i < n; i++ )
+    for (i = 0; i < n; i++)
         diff |= A[i] ^ B[i];
 
-    return( diff );
+    return (diff);
 }
 #endif /* MBEDTLS_PKCS1_V15 */
 
-int mbedtls_rsa_import( mbedtls_rsa_context *ctx,
-                        const mbedtls_mpi *N,
-                        const mbedtls_mpi *P, const mbedtls_mpi *Q,
-                        const mbedtls_mpi *D, const mbedtls_mpi *E )
+int mbedtls_rsa_import(mbedtls_rsa_context *ctx,
+                       const mbedtls_mpi *N,
+                       const mbedtls_mpi *P, const mbedtls_mpi *Q,
+                       const mbedtls_mpi *D, const mbedtls_mpi *E)
 {
     int ret;
 
-    if( ( N != NULL && ( ret = mbedtls_mpi_copy( &ctx->N, N ) ) != 0 ) ||
-        ( P != NULL && ( ret = mbedtls_mpi_copy( &ctx->P, P ) ) != 0 ) ||
-        ( Q != NULL && ( ret = mbedtls_mpi_copy( &ctx->Q, Q ) ) != 0 ) ||
-        ( D != NULL && ( ret = mbedtls_mpi_copy( &ctx->D, D ) ) != 0 ) ||
-        ( E != NULL && ( ret = mbedtls_mpi_copy( &ctx->E, E ) ) != 0 ) )
-    {
-        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA + ret );
+    if ((N != NULL && (ret = mbedtls_mpi_copy(&ctx->N, N)) != 0) ||
+        (P != NULL && (ret = mbedtls_mpi_copy(&ctx->P, P)) != 0) ||
+        (Q != NULL && (ret = mbedtls_mpi_copy(&ctx->Q, Q)) != 0) ||
+        (D != NULL && (ret = mbedtls_mpi_copy(&ctx->D, D)) != 0) ||
+        (E != NULL && (ret = mbedtls_mpi_copy(&ctx->E, E)) != 0)) {
+        return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA + ret);
     }
 
-    if( N != NULL )
-        ctx->len = mbedtls_mpi_size( &ctx->N );
+    if (N != NULL)
+        ctx->len = mbedtls_mpi_size(&ctx->N);
 
-    return( 0 );
+    return (0);
 }
 
-int mbedtls_rsa_import_raw( mbedtls_rsa_context *ctx,
-                            unsigned char const *N, size_t N_len,
-                            unsigned char const *P, size_t P_len,
-                            unsigned char const *Q, size_t Q_len,
-                            unsigned char const *D, size_t D_len,
-                            unsigned char const *E, size_t E_len )
+int mbedtls_rsa_import_raw(mbedtls_rsa_context *ctx,
+                           unsigned char const *N, size_t N_len,
+                           unsigned char const *P, size_t P_len,
+                           unsigned char const *Q, size_t Q_len,
+                           unsigned char const *D, size_t D_len,
+                           unsigned char const *E, size_t E_len)
 {
     int ret = 0;
 
-    if( N != NULL )
-    {
-        MBEDTLS_MPI_CHK( mbedtls_mpi_read_binary( &ctx->N, N, N_len ) );
-        ctx->len = mbedtls_mpi_size( &ctx->N );
+    if (N != NULL) {
+        MBEDTLS_MPI_CHK(mbedtls_mpi_read_binary(&ctx->N, N, N_len));
+        ctx->len = mbedtls_mpi_size(&ctx->N);
     }
 
-    if( P != NULL )
-        MBEDTLS_MPI_CHK( mbedtls_mpi_read_binary( &ctx->P, P, P_len ) );
+    if (P != NULL)
+        MBEDTLS_MPI_CHK(mbedtls_mpi_read_binary(&ctx->P, P, P_len));
 
-    if( Q != NULL )
-        MBEDTLS_MPI_CHK( mbedtls_mpi_read_binary( &ctx->Q, Q, Q_len ) );
+    if (Q != NULL)
+        MBEDTLS_MPI_CHK(mbedtls_mpi_read_binary(&ctx->Q, Q, Q_len));
 
-    if( D != NULL )
-        MBEDTLS_MPI_CHK( mbedtls_mpi_read_binary( &ctx->D, D, D_len ) );
+    if (D != NULL)
+        MBEDTLS_MPI_CHK(mbedtls_mpi_read_binary(&ctx->D, D, D_len));
 
-    if( E != NULL )
-        MBEDTLS_MPI_CHK( mbedtls_mpi_read_binary( &ctx->E, E, E_len ) );
+    if (E != NULL)
+        MBEDTLS_MPI_CHK(mbedtls_mpi_read_binary(&ctx->E, E, E_len));
 
 cleanup:
 
-    if( ret != 0 )
-        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA + ret );
+    if (ret != 0)
+        return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA + ret);
 
-    return( 0 );
+    return (0);
 }
 
 /*
@@ -151,8 +149,8 @@ cleanup:
  * that the RSA primitives will be able to execute without error.
  * It does *not* make guarantees for consistency of the parameters.
  */
-static int rsa_check_context( mbedtls_rsa_context const *ctx, int is_priv,
-                              int blinding_needed )
+static int rsa_check_context(mbedtls_rsa_context const *ctx, int is_priv,
+                             int blinding_needed)
 {
 #if !defined(MBEDTLS_RSA_NO_CRT)
     /* blinding_needed is only used for NO_CRT to decide whether
@@ -160,10 +158,9 @@ static int rsa_check_context( mbedtls_rsa_context const *ctx, int is_priv,
     ((void) blinding_needed);
 #endif
 
-    if( ctx->len != mbedtls_mpi_size( &ctx->N ) ||
-        ctx->len > MBEDTLS_MPI_MAX_SIZE )
-    {
-        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    if (ctx->len != mbedtls_mpi_size(&ctx->N) ||
+        ctx->len > MBEDTLS_MPI_MAX_SIZE) {
+        return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
     }
 
     /*
@@ -172,23 +169,21 @@ static int rsa_check_context( mbedtls_rsa_context const *ctx, int is_priv,
 
     /* Modular exponentiation wrt. N is always used for
      * RSA public key operations. */
-    if( mbedtls_mpi_cmp_int( &ctx->N, 0 ) <= 0 ||
-        mbedtls_mpi_get_bit( &ctx->N, 0 ) == 0  )
-    {
-        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    if (mbedtls_mpi_cmp_int(&ctx->N, 0) <= 0 ||
+        mbedtls_mpi_get_bit(&ctx->N, 0) == 0) {
+        return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
     }
 
 #if !defined(MBEDTLS_RSA_NO_CRT)
     /* Modular exponentiation for P and Q is only
      * used for private key operations and if CRT
      * is used. */
-    if( is_priv &&
-        ( mbedtls_mpi_cmp_int( &ctx->P, 0 ) <= 0 ||
-          mbedtls_mpi_get_bit( &ctx->P, 0 ) == 0 ||
-          mbedtls_mpi_cmp_int( &ctx->Q, 0 ) <= 0 ||
-          mbedtls_mpi_get_bit( &ctx->Q, 0 ) == 0  ) )
-    {
-        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    if (is_priv &&
+        (mbedtls_mpi_cmp_int(&ctx->P, 0) <= 0 ||
+         mbedtls_mpi_get_bit(&ctx->P, 0) == 0 ||
+         mbedtls_mpi_cmp_int(&ctx->Q, 0) <= 0 ||
+         mbedtls_mpi_get_bit(&ctx->Q, 0) == 0)) {
+        return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
     }
 #endif /* !MBEDTLS_RSA_NO_CRT */
 
@@ -197,20 +192,19 @@ static int rsa_check_context( mbedtls_rsa_context const *ctx, int is_priv,
      */
 
     /* Always need E for public key operations */
-    if( mbedtls_mpi_cmp_int( &ctx->E, 0 ) <= 0 )
-        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    if (mbedtls_mpi_cmp_int(&ctx->E, 0) <= 0)
+        return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
 
 #if defined(MBEDTLS_RSA_NO_CRT)
     /* For private key operations, use D or DP & DQ
      * as (unblinded) exponents. */
-    if( is_priv && mbedtls_mpi_cmp_int( &ctx->D, 0 ) <= 0 )
-        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    if (is_priv && mbedtls_mpi_cmp_int(&ctx->D, 0) <= 0)
+        return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
 #else
-    if( is_priv &&
-        ( mbedtls_mpi_cmp_int( &ctx->DP, 0 ) <= 0 ||
-          mbedtls_mpi_cmp_int( &ctx->DQ, 0 ) <= 0  ) )
-    {
-        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    if (is_priv &&
+        (mbedtls_mpi_cmp_int(&ctx->DP, 0) <= 0 ||
+         mbedtls_mpi_cmp_int(&ctx->DQ, 0) <= 0)) {
+        return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
     }
 #endif /* MBEDTLS_RSA_NO_CRT */
 
@@ -218,36 +212,34 @@ static int rsa_check_context( mbedtls_rsa_context const *ctx, int is_priv,
      * so check that P, Q >= 1 if that hasn't yet been
      * done as part of 1. */
 #if defined(MBEDTLS_RSA_NO_CRT)
-    if( is_priv && blinding_needed &&
-        ( mbedtls_mpi_cmp_int( &ctx->P, 0 ) <= 0 ||
-          mbedtls_mpi_cmp_int( &ctx->Q, 0 ) <= 0 ) )
-    {
-        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    if (is_priv && blinding_needed &&
+        (mbedtls_mpi_cmp_int(&ctx->P, 0) <= 0 ||
+         mbedtls_mpi_cmp_int(&ctx->Q, 0) <= 0)) {
+        return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
     }
 #endif
 
     /* It wouldn't lead to an error if it wasn't satisfied,
      * but check for QP >= 1 nonetheless. */
 #if !defined(MBEDTLS_RSA_NO_CRT)
-    if( is_priv &&
-        mbedtls_mpi_cmp_int( &ctx->QP, 0 ) <= 0 )
-    {
-        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    if (is_priv &&
+        mbedtls_mpi_cmp_int(&ctx->QP, 0) <= 0) {
+        return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
     }
 #endif
 
-    return( 0 );
+    return (0);
 }
 
-int mbedtls_rsa_complete( mbedtls_rsa_context *ctx )
+int mbedtls_rsa_complete(mbedtls_rsa_context *ctx)
 {
     int ret = 0;
 
-    const int have_N = ( mbedtls_mpi_cmp_int( &ctx->N, 0 ) != 0 );
-    const int have_P = ( mbedtls_mpi_cmp_int( &ctx->P, 0 ) != 0 );
-    const int have_Q = ( mbedtls_mpi_cmp_int( &ctx->Q, 0 ) != 0 );
-    const int have_D = ( mbedtls_mpi_cmp_int( &ctx->D, 0 ) != 0 );
-    const int have_E = ( mbedtls_mpi_cmp_int( &ctx->E, 0 ) != 0 );
+    const int have_N = (mbedtls_mpi_cmp_int(&ctx->N, 0) != 0);
+    const int have_P = (mbedtls_mpi_cmp_int(&ctx->P, 0) != 0);
+    const int have_Q = (mbedtls_mpi_cmp_int(&ctx->Q, 0) != 0);
+    const int have_D = (mbedtls_mpi_cmp_int(&ctx->D, 0) != 0);
+    const int have_E = (mbedtls_mpi_cmp_int(&ctx->E, 0) != 0);
 
     /*
      * Check whether provided parameters are enough
@@ -267,44 +259,38 @@ int mbedtls_rsa_complete( mbedtls_rsa_context *ctx )
     /* These three alternatives are mutually exclusive */
     const int is_priv = n_missing || pq_missing || d_missing;
 
-    if( !is_priv && !is_pub )
-        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    if (!is_priv && !is_pub)
+        return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
 
     /*
      * Step 1: Deduce N if P, Q are provided.
      */
 
-    if( !have_N && have_P && have_Q )
-    {
-        if( ( ret = mbedtls_mpi_mul_mpi( &ctx->N, &ctx->P,
-                                         &ctx->Q ) ) != 0 )
-        {
-            return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA + ret );
+    if (!have_N && have_P && have_Q) {
+        if ((ret = mbedtls_mpi_mul_mpi(&ctx->N, &ctx->P,
+                                       &ctx->Q)) != 0) {
+            return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA + ret);
         }
 
-        ctx->len = mbedtls_mpi_size( &ctx->N );
+        ctx->len = mbedtls_mpi_size(&ctx->N);
     }
 
     /*
      * Step 2: Deduce and verify all remaining core parameters.
      */
 
-    if( pq_missing )
-    {
-        ret = mbedtls_rsa_deduce_primes( &ctx->N, &ctx->E, &ctx->D,
-                                         &ctx->P, &ctx->Q );
-        if( ret != 0 )
-            return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA + ret );
+    if (pq_missing) {
+        ret = mbedtls_rsa_deduce_primes(&ctx->N, &ctx->E, &ctx->D,
+                                        &ctx->P, &ctx->Q);
+        if (ret != 0)
+            return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA + ret);
 
-    }
-    else if( d_missing )
-    {
-        if( ( ret = mbedtls_rsa_deduce_private_exponent( &ctx->P,
-                                                         &ctx->Q,
-                                                         &ctx->E,
-                                                         &ctx->D ) ) != 0 )
-        {
-            return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA + ret );
+    } else if (d_missing) {
+        if ((ret = mbedtls_rsa_deduce_private_exponent(&ctx->P,
+                                                       &ctx->Q,
+                                                       &ctx->E,
+                                                       &ctx->D)) != 0) {
+            return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA + ret);
         }
     }
 
@@ -314,12 +300,11 @@ int mbedtls_rsa_complete( mbedtls_rsa_context *ctx )
      */
 
 #if !defined(MBEDTLS_RSA_NO_CRT)
-    if( is_priv )
-    {
-        ret = mbedtls_rsa_deduce_crt( &ctx->P,  &ctx->Q,  &ctx->D,
-                                      &ctx->DP, &ctx->DQ, &ctx->QP );
-        if( ret != 0 )
-            return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA + ret );
+    if (is_priv) {
+        ret = mbedtls_rsa_deduce_crt(&ctx->P,  &ctx->Q,  &ctx->D,
+                                     &ctx->DP, &ctx->DQ, &ctx->QP);
+        if (ret != 0)
+            return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA + ret);
     }
 #endif /* MBEDTLS_RSA_NO_CRT */
 
@@ -327,90 +312,87 @@ int mbedtls_rsa_complete( mbedtls_rsa_context *ctx )
      * Step 3: Basic sanity checks
      */
 
-    return( rsa_check_context( ctx, is_priv, 1 ) );
+    return (rsa_check_context(ctx, is_priv, 1));
 }
 
-int mbedtls_rsa_export_raw( const mbedtls_rsa_context *ctx,
-                            unsigned char *N, size_t N_len,
-                            unsigned char *P, size_t P_len,
-                            unsigned char *Q, size_t Q_len,
-                            unsigned char *D, size_t D_len,
-                            unsigned char *E, size_t E_len )
+int mbedtls_rsa_export_raw(const mbedtls_rsa_context *ctx,
+                           unsigned char *N, size_t N_len,
+                           unsigned char *P, size_t P_len,
+                           unsigned char *Q, size_t Q_len,
+                           unsigned char *D, size_t D_len,
+                           unsigned char *E, size_t E_len)
 {
     int ret = 0;
 
     /* Check if key is private or public */
     const int is_priv =
-        mbedtls_mpi_cmp_int( &ctx->N, 0 ) != 0 &&
-        mbedtls_mpi_cmp_int( &ctx->P, 0 ) != 0 &&
-        mbedtls_mpi_cmp_int( &ctx->Q, 0 ) != 0 &&
-        mbedtls_mpi_cmp_int( &ctx->D, 0 ) != 0 &&
-        mbedtls_mpi_cmp_int( &ctx->E, 0 ) != 0;
+        mbedtls_mpi_cmp_int(&ctx->N, 0) != 0 &&
+        mbedtls_mpi_cmp_int(&ctx->P, 0) != 0 &&
+        mbedtls_mpi_cmp_int(&ctx->Q, 0) != 0 &&
+        mbedtls_mpi_cmp_int(&ctx->D, 0) != 0 &&
+        mbedtls_mpi_cmp_int(&ctx->E, 0) != 0;
 
-    if( !is_priv )
-    {
+    if (!is_priv) {
         /* If we're trying to export private parameters for a public key,
          * something must be wrong. */
-        if( P != NULL || Q != NULL || D != NULL )
-            return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+        if (P != NULL || Q != NULL || D != NULL)
+            return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
 
     }
 
-    if( N != NULL )
-        MBEDTLS_MPI_CHK( mbedtls_mpi_write_binary( &ctx->N, N, N_len ) );
+    if (N != NULL)
+        MBEDTLS_MPI_CHK(mbedtls_mpi_write_binary(&ctx->N, N, N_len));
 
-    if( P != NULL )
-        MBEDTLS_MPI_CHK( mbedtls_mpi_write_binary( &ctx->P, P, P_len ) );
+    if (P != NULL)
+        MBEDTLS_MPI_CHK(mbedtls_mpi_write_binary(&ctx->P, P, P_len));
 
-    if( Q != NULL )
-        MBEDTLS_MPI_CHK( mbedtls_mpi_write_binary( &ctx->Q, Q, Q_len ) );
+    if (Q != NULL)
+        MBEDTLS_MPI_CHK(mbedtls_mpi_write_binary(&ctx->Q, Q, Q_len));
 
-    if( D != NULL )
-        MBEDTLS_MPI_CHK( mbedtls_mpi_write_binary( &ctx->D, D, D_len ) );
+    if (D != NULL)
+        MBEDTLS_MPI_CHK(mbedtls_mpi_write_binary(&ctx->D, D, D_len));
 
-    if( E != NULL )
-        MBEDTLS_MPI_CHK( mbedtls_mpi_write_binary( &ctx->E, E, E_len ) );
+    if (E != NULL)
+        MBEDTLS_MPI_CHK(mbedtls_mpi_write_binary(&ctx->E, E, E_len));
 
 cleanup:
 
-    return( ret );
+    return (ret);
 }
 
-int mbedtls_rsa_export( const mbedtls_rsa_context *ctx,
-                        mbedtls_mpi *N, mbedtls_mpi *P, mbedtls_mpi *Q,
-                        mbedtls_mpi *D, mbedtls_mpi *E )
+int mbedtls_rsa_export(const mbedtls_rsa_context *ctx,
+                       mbedtls_mpi *N, mbedtls_mpi *P, mbedtls_mpi *Q,
+                       mbedtls_mpi *D, mbedtls_mpi *E)
 {
     int ret;
 
     /* Check if key is private or public */
     int is_priv =
-        mbedtls_mpi_cmp_int( &ctx->N, 0 ) != 0 &&
-        mbedtls_mpi_cmp_int( &ctx->P, 0 ) != 0 &&
-        mbedtls_mpi_cmp_int( &ctx->Q, 0 ) != 0 &&
-        mbedtls_mpi_cmp_int( &ctx->D, 0 ) != 0 &&
-        mbedtls_mpi_cmp_int( &ctx->E, 0 ) != 0;
+        mbedtls_mpi_cmp_int(&ctx->N, 0) != 0 &&
+        mbedtls_mpi_cmp_int(&ctx->P, 0) != 0 &&
+        mbedtls_mpi_cmp_int(&ctx->Q, 0) != 0 &&
+        mbedtls_mpi_cmp_int(&ctx->D, 0) != 0 &&
+        mbedtls_mpi_cmp_int(&ctx->E, 0) != 0;
 
-    if( !is_priv )
-    {
+    if (!is_priv) {
         /* If we're trying to export private parameters for a public key,
          * something must be wrong. */
-        if( P != NULL || Q != NULL || D != NULL )
-            return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+        if (P != NULL || Q != NULL || D != NULL)
+            return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
 
     }
 
     /* Export all requested core parameters. */
 
-    if( ( N != NULL && ( ret = mbedtls_mpi_copy( N, &ctx->N ) ) != 0 ) ||
-        ( P != NULL && ( ret = mbedtls_mpi_copy( P, &ctx->P ) ) != 0 ) ||
-        ( Q != NULL && ( ret = mbedtls_mpi_copy( Q, &ctx->Q ) ) != 0 ) ||
-        ( D != NULL && ( ret = mbedtls_mpi_copy( D, &ctx->D ) ) != 0 ) ||
-        ( E != NULL && ( ret = mbedtls_mpi_copy( E, &ctx->E ) ) != 0 ) )
-    {
-        return( ret );
+    if ((N != NULL && (ret = mbedtls_mpi_copy(N, &ctx->N)) != 0) ||
+        (P != NULL && (ret = mbedtls_mpi_copy(P, &ctx->P)) != 0) ||
+        (Q != NULL && (ret = mbedtls_mpi_copy(Q, &ctx->Q)) != 0) ||
+        (D != NULL && (ret = mbedtls_mpi_copy(D, &ctx->D)) != 0) ||
+        (E != NULL && (ret = mbedtls_mpi_copy(E, &ctx->E)) != 0)) {
+        return (ret);
     }
 
-    return( 0 );
+    return (0);
 }
 
 /*
@@ -419,61 +401,59 @@ int mbedtls_rsa_export( const mbedtls_rsa_context *ctx,
  * write DER encoded RSA keys. The helper function mbedtls_rsa_deduce_crt
  * can be used in this case.
  */
-int mbedtls_rsa_export_crt( const mbedtls_rsa_context *ctx,
-                            mbedtls_mpi *DP, mbedtls_mpi *DQ, mbedtls_mpi *QP )
+int mbedtls_rsa_export_crt(const mbedtls_rsa_context *ctx,
+                           mbedtls_mpi *DP, mbedtls_mpi *DQ, mbedtls_mpi *QP)
 {
     int ret;
 
     /* Check if key is private or public */
     int is_priv =
-        mbedtls_mpi_cmp_int( &ctx->N, 0 ) != 0 &&
-        mbedtls_mpi_cmp_int( &ctx->P, 0 ) != 0 &&
-        mbedtls_mpi_cmp_int( &ctx->Q, 0 ) != 0 &&
-        mbedtls_mpi_cmp_int( &ctx->D, 0 ) != 0 &&
-        mbedtls_mpi_cmp_int( &ctx->E, 0 ) != 0;
+        mbedtls_mpi_cmp_int(&ctx->N, 0) != 0 &&
+        mbedtls_mpi_cmp_int(&ctx->P, 0) != 0 &&
+        mbedtls_mpi_cmp_int(&ctx->Q, 0) != 0 &&
+        mbedtls_mpi_cmp_int(&ctx->D, 0) != 0 &&
+        mbedtls_mpi_cmp_int(&ctx->E, 0) != 0;
 
-    if( !is_priv )
-        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    if (!is_priv)
+        return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
 
 #if !defined(MBEDTLS_RSA_NO_CRT)
     /* Export all requested blinding parameters. */
-    if( ( DP != NULL && ( ret = mbedtls_mpi_copy( DP, &ctx->DP ) ) != 0 ) ||
-        ( DQ != NULL && ( ret = mbedtls_mpi_copy( DQ, &ctx->DQ ) ) != 0 ) ||
-        ( QP != NULL && ( ret = mbedtls_mpi_copy( QP, &ctx->QP ) ) != 0 ) )
-    {
-        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA + ret );
+    if ((DP != NULL && (ret = mbedtls_mpi_copy(DP, &ctx->DP)) != 0) ||
+        (DQ != NULL && (ret = mbedtls_mpi_copy(DQ, &ctx->DQ)) != 0) ||
+        (QP != NULL && (ret = mbedtls_mpi_copy(QP, &ctx->QP)) != 0)) {
+        return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA + ret);
     }
 #else
-    if( ( ret = mbedtls_rsa_deduce_crt( &ctx->P, &ctx->Q, &ctx->D,
-                                        DP, DQ, QP ) ) != 0 )
-    {
-        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA + ret );
+    if ((ret = mbedtls_rsa_deduce_crt(&ctx->P, &ctx->Q, &ctx->D,
+                                      DP, DQ, QP)) != 0) {
+        return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA + ret);
     }
 #endif
 
-    return( 0 );
+    return (0);
 }
 
 /*
  * Initialize an RSA context
  */
-void mbedtls_rsa_init( mbedtls_rsa_context *ctx,
-               int padding,
-               int hash_id )
+void mbedtls_rsa_init(mbedtls_rsa_context *ctx,
+                      int padding,
+                      int hash_id)
 {
-    memset( ctx, 0, sizeof( mbedtls_rsa_context ) );
+    memset(ctx, 0, sizeof(mbedtls_rsa_context));
 
-    mbedtls_rsa_set_padding( ctx, padding, hash_id );
+    mbedtls_rsa_set_padding(ctx, padding, hash_id);
 
 #if defined(MBEDTLS_THREADING_C)
-    mbedtls_mutex_init( &ctx->mutex );
+    mbedtls_mutex_init(&ctx->mutex);
 #endif
 }
 
 /*
  * Set padding for an existing RSA context
  */
-void mbedtls_rsa_set_padding( mbedtls_rsa_context *ctx, int padding, int hash_id )
+void mbedtls_rsa_set_padding(mbedtls_rsa_context *ctx, int padding, int hash_id)
 {
     ctx->padding = padding;
     ctx->hash_id = hash_id;
@@ -483,9 +463,9 @@ void mbedtls_rsa_set_padding( mbedtls_rsa_context *ctx, int padding, int hash_id
  * Get length in bytes of RSA modulus
  */
 
-size_t mbedtls_rsa_get_len( const mbedtls_rsa_context *ctx )
+size_t mbedtls_rsa_get_len(const mbedtls_rsa_context *ctx)
 {
-    return( ctx->len );
+    return (ctx->len);
 }
 
 
@@ -497,23 +477,23 @@ size_t mbedtls_rsa_get_len( const mbedtls_rsa_context *ctx )
  * This generation method follows the RSA key pair generation procedure of
  * FIPS 186-4 if 2^16 < exponent < 2^256 and nbits = 2048 or nbits = 3072.
  */
-int mbedtls_rsa_gen_key( mbedtls_rsa_context *ctx,
-                 int (*f_rng)(void *, unsigned char *, size_t),
-                 void *p_rng,
-                 unsigned int nbits, int exponent )
+int mbedtls_rsa_gen_key(mbedtls_rsa_context *ctx,
+                        int (*f_rng)(void *, unsigned char *, size_t),
+                        void *p_rng,
+                        unsigned int nbits, int exponent)
 {
     int ret;
     mbedtls_mpi H, G, L;
 
-    if( f_rng == NULL || nbits < 128 || exponent < 3 )
-        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    if (f_rng == NULL || nbits < 128 || exponent < 3)
+        return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
 
-    if( nbits % 2 )
-        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    if (nbits % 2)
+        return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
 
-    mbedtls_mpi_init( &H );
-    mbedtls_mpi_init( &G );
-    mbedtls_mpi_init( &L );
+    mbedtls_mpi_init(&H);
+    mbedtls_mpi_init(&G);
+    mbedtls_mpi_init(&L);
 
     /*
      * find primes P and Q with Q < P so that:
@@ -521,54 +501,52 @@ int mbedtls_rsa_gen_key( mbedtls_rsa_context *ctx,
      * 2.  GCD( E, (P-1)*(Q-1) ) == 1
      * 3.  E^-1 mod LCM(P-1, Q-1) > 2^( nbits / 2 )
      */
-    MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &ctx->E, exponent ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_lset(&ctx->E, exponent));
 
-    do
-    {
-        MBEDTLS_MPI_CHK( mbedtls_mpi_gen_prime( &ctx->P, nbits >> 1, 0,
-                                                f_rng, p_rng ) );
+    do {
+        MBEDTLS_MPI_CHK(mbedtls_mpi_gen_prime(&ctx->P, nbits >> 1, 0,
+                                              f_rng, p_rng));
 
-        MBEDTLS_MPI_CHK( mbedtls_mpi_gen_prime( &ctx->Q, nbits >> 1, 0,
-                                                f_rng, p_rng ) );
+        MBEDTLS_MPI_CHK(mbedtls_mpi_gen_prime(&ctx->Q, nbits >> 1, 0,
+                                              f_rng, p_rng));
 
         /* make sure the difference between p and q is not too small (FIPS 186-4 §B.3.3 step 5.4) */
-        MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &H, &ctx->P, &ctx->Q ) );
-        if( mbedtls_mpi_bitlen( &H ) <= ( ( nbits >= 200 ) ? ( ( nbits >> 1 ) - 99 ) : 0 ) )
+        MBEDTLS_MPI_CHK(mbedtls_mpi_sub_mpi(&H, &ctx->P, &ctx->Q));
+        if (mbedtls_mpi_bitlen(&H) <= ((nbits >= 200) ? ((nbits >> 1) - 99) : 0))
             continue;
 
         /* not required by any standards, but some users rely on the fact that P > Q */
-        if( H.s < 0 )
-            mbedtls_mpi_swap( &ctx->P, &ctx->Q );
+        if (H.s < 0)
+            mbedtls_mpi_swap(&ctx->P, &ctx->Q);
 
         /* Temporarily replace P,Q by P-1, Q-1 */
-        MBEDTLS_MPI_CHK( mbedtls_mpi_sub_int( &ctx->P, &ctx->P, 1 ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_sub_int( &ctx->Q, &ctx->Q, 1 ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &H, &ctx->P, &ctx->Q ) );
+        MBEDTLS_MPI_CHK(mbedtls_mpi_sub_int(&ctx->P, &ctx->P, 1));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_sub_int(&ctx->Q, &ctx->Q, 1));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&H, &ctx->P, &ctx->Q));
 
         /* check GCD( E, (P-1)*(Q-1) ) == 1 (FIPS 186-4 §B.3.1 criterion 2(a)) */
-        MBEDTLS_MPI_CHK( mbedtls_mpi_gcd( &G, &ctx->E, &H  ) );
-        if( mbedtls_mpi_cmp_int( &G, 1 ) != 0 )
+        MBEDTLS_MPI_CHK(mbedtls_mpi_gcd(&G, &ctx->E, &H));
+        if (mbedtls_mpi_cmp_int(&G, 1) != 0)
             continue;
 
         /* compute smallest possible D = E^-1 mod LCM(P-1, Q-1) (FIPS 186-4 §B.3.1 criterion 3(b)) */
-        MBEDTLS_MPI_CHK( mbedtls_mpi_gcd( &G, &ctx->P, &ctx->Q ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_div_mpi( &L, NULL, &H, &G ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_inv_mod( &ctx->D, &ctx->E, &L ) );
+        MBEDTLS_MPI_CHK(mbedtls_mpi_gcd(&G, &ctx->P, &ctx->Q));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_div_mpi(&L, NULL, &H, &G));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_inv_mod(&ctx->D, &ctx->E, &L));
 
-        if( mbedtls_mpi_bitlen( &ctx->D ) <= ( ( nbits + 1 ) / 2 ) ) // (FIPS 186-4 §B.3.1 criterion 3(a))
+        if (mbedtls_mpi_bitlen(&ctx->D) <= ((nbits + 1) / 2))        // (FIPS 186-4 §B.3.1 criterion 3(a))
             continue;
 
         break;
-    }
-    while( 1 );
+    } while (1);
 
     /* Restore P,Q */
-    MBEDTLS_MPI_CHK( mbedtls_mpi_add_int( &ctx->P,  &ctx->P, 1 ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_add_int( &ctx->Q,  &ctx->Q, 1 ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_add_int(&ctx->P,  &ctx->P, 1));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_add_int(&ctx->Q,  &ctx->Q, 1));
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &ctx->N, &ctx->P, &ctx->Q ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&ctx->N, &ctx->P, &ctx->Q));
 
-    ctx->len = mbedtls_mpi_size( &ctx->N );
+    ctx->len = mbedtls_mpi_size(&ctx->N);
 
 #if !defined(MBEDTLS_RSA_NO_CRT)
     /*
@@ -576,26 +554,25 @@ int mbedtls_rsa_gen_key( mbedtls_rsa_context *ctx,
      * DQ = D mod (Q - 1)
      * QP = Q^-1 mod P
      */
-    MBEDTLS_MPI_CHK( mbedtls_rsa_deduce_crt( &ctx->P, &ctx->Q, &ctx->D,
-                                             &ctx->DP, &ctx->DQ, &ctx->QP ) );
+    MBEDTLS_MPI_CHK(mbedtls_rsa_deduce_crt(&ctx->P, &ctx->Q, &ctx->D,
+                                           &ctx->DP, &ctx->DQ, &ctx->QP));
 #endif /* MBEDTLS_RSA_NO_CRT */
 
     /* Double-check */
-    MBEDTLS_MPI_CHK( mbedtls_rsa_check_privkey( ctx ) );
+    MBEDTLS_MPI_CHK(mbedtls_rsa_check_privkey(ctx));
 
 cleanup:
 
-    mbedtls_mpi_free( &H );
-    mbedtls_mpi_free( &G );
-    mbedtls_mpi_free( &L );
+    mbedtls_mpi_free(&H);
+    mbedtls_mpi_free(&G);
+    mbedtls_mpi_free(&L);
 
-    if( ret != 0 )
-    {
-        mbedtls_rsa_free( ctx );
-        return( MBEDTLS_ERR_RSA_KEY_GEN_FAILED + ret );
+    if (ret != 0) {
+        mbedtls_rsa_free(ctx);
+        return (MBEDTLS_ERR_RSA_KEY_GEN_FAILED + ret);
     }
 
-    return( 0 );
+    return (0);
 }
 
 #endif /* MBEDTLS_GENPRIME */
@@ -603,120 +580,112 @@ cleanup:
 /*
  * Check a public RSA key
  */
-int mbedtls_rsa_check_pubkey( const mbedtls_rsa_context *ctx )
+int mbedtls_rsa_check_pubkey(const mbedtls_rsa_context *ctx)
 {
-    if( rsa_check_context( ctx, 0 /* public */, 0 /* no blinding */ ) != 0 )
-        return( MBEDTLS_ERR_RSA_KEY_CHECK_FAILED );
+    if (rsa_check_context(ctx, 0 /* public */, 0 /* no blinding */) != 0)
+        return (MBEDTLS_ERR_RSA_KEY_CHECK_FAILED);
 
-    if( mbedtls_mpi_bitlen( &ctx->N ) < 128 )
-    {
-        return( MBEDTLS_ERR_RSA_KEY_CHECK_FAILED );
+    if (mbedtls_mpi_bitlen(&ctx->N) < 128) {
+        return (MBEDTLS_ERR_RSA_KEY_CHECK_FAILED);
     }
 
-    if( mbedtls_mpi_get_bit( &ctx->E, 0 ) == 0 ||
-        mbedtls_mpi_bitlen( &ctx->E )     < 2  ||
-        mbedtls_mpi_cmp_mpi( &ctx->E, &ctx->N ) >= 0 )
-    {
-        return( MBEDTLS_ERR_RSA_KEY_CHECK_FAILED );
+    if (mbedtls_mpi_get_bit(&ctx->E, 0) == 0 ||
+        mbedtls_mpi_bitlen(&ctx->E)     < 2  ||
+        mbedtls_mpi_cmp_mpi(&ctx->E, &ctx->N) >= 0) {
+        return (MBEDTLS_ERR_RSA_KEY_CHECK_FAILED);
     }
 
-    return( 0 );
+    return (0);
 }
 
 /*
  * Check for the consistency of all fields in an RSA private key context
  */
-int mbedtls_rsa_check_privkey( const mbedtls_rsa_context *ctx )
+int mbedtls_rsa_check_privkey(const mbedtls_rsa_context *ctx)
 {
-    if( mbedtls_rsa_check_pubkey( ctx ) != 0 ||
-        rsa_check_context( ctx, 1 /* private */, 1 /* blinding */ ) != 0 )
-    {
-        return( MBEDTLS_ERR_RSA_KEY_CHECK_FAILED );
+    if (mbedtls_rsa_check_pubkey(ctx) != 0 ||
+        rsa_check_context(ctx, 1 /* private */, 1 /* blinding */) != 0) {
+        return (MBEDTLS_ERR_RSA_KEY_CHECK_FAILED);
     }
 
-    if( mbedtls_rsa_validate_params( &ctx->N, &ctx->P, &ctx->Q,
-                                     &ctx->D, &ctx->E, NULL, NULL ) != 0 )
-    {
-        return( MBEDTLS_ERR_RSA_KEY_CHECK_FAILED );
+    if (mbedtls_rsa_validate_params(&ctx->N, &ctx->P, &ctx->Q,
+                                    &ctx->D, &ctx->E, NULL, NULL) != 0) {
+        return (MBEDTLS_ERR_RSA_KEY_CHECK_FAILED);
     }
 
 #if !defined(MBEDTLS_RSA_NO_CRT)
-    else if( mbedtls_rsa_validate_crt( &ctx->P, &ctx->Q, &ctx->D,
-                                       &ctx->DP, &ctx->DQ, &ctx->QP ) != 0 )
-    {
-        return( MBEDTLS_ERR_RSA_KEY_CHECK_FAILED );
+    else if (mbedtls_rsa_validate_crt(&ctx->P, &ctx->Q, &ctx->D,
+                                      &ctx->DP, &ctx->DQ, &ctx->QP) != 0) {
+        return (MBEDTLS_ERR_RSA_KEY_CHECK_FAILED);
     }
 #endif
 
-    return( 0 );
+    return (0);
 }
 
 /*
  * Check if contexts holding a public and private key match
  */
-int mbedtls_rsa_check_pub_priv( const mbedtls_rsa_context *pub,
-                                const mbedtls_rsa_context *prv )
+int mbedtls_rsa_check_pub_priv(const mbedtls_rsa_context *pub,
+                               const mbedtls_rsa_context *prv)
 {
-    if( mbedtls_rsa_check_pubkey( pub )  != 0 ||
-        mbedtls_rsa_check_privkey( prv ) != 0 )
-    {
-        return( MBEDTLS_ERR_RSA_KEY_CHECK_FAILED );
+    if (mbedtls_rsa_check_pubkey(pub)  != 0 ||
+        mbedtls_rsa_check_privkey(prv) != 0) {
+        return (MBEDTLS_ERR_RSA_KEY_CHECK_FAILED);
     }
 
-    if( mbedtls_mpi_cmp_mpi( &pub->N, &prv->N ) != 0 ||
-        mbedtls_mpi_cmp_mpi( &pub->E, &prv->E ) != 0 )
-    {
-        return( MBEDTLS_ERR_RSA_KEY_CHECK_FAILED );
+    if (mbedtls_mpi_cmp_mpi(&pub->N, &prv->N) != 0 ||
+        mbedtls_mpi_cmp_mpi(&pub->E, &prv->E) != 0) {
+        return (MBEDTLS_ERR_RSA_KEY_CHECK_FAILED);
     }
 
-    return( 0 );
+    return (0);
 }
 
 /*
  * Do an RSA public key operation
  */
-int mbedtls_rsa_public( mbedtls_rsa_context *ctx,
-                const unsigned char *input,
-                unsigned char *output )
+int mbedtls_rsa_public(mbedtls_rsa_context *ctx,
+                       const unsigned char *input,
+                       unsigned char *output)
 {
     int ret;
     size_t olen;
     mbedtls_mpi T;
 
-    if( rsa_check_context( ctx, 0 /* public */, 0 /* no blinding */ ) )
-        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    if (rsa_check_context(ctx, 0 /* public */, 0 /* no blinding */))
+        return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
 
-    mbedtls_mpi_init( &T );
+    mbedtls_mpi_init(&T);
 
 #if defined(MBEDTLS_THREADING_C)
-    if( ( ret = mbedtls_mutex_lock( &ctx->mutex ) ) != 0 )
-        return( ret );
+    if ((ret = mbedtls_mutex_lock(&ctx->mutex)) != 0)
+        return (ret);
 #endif
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_read_binary( &T, input, ctx->len ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_read_binary(&T, input, ctx->len));
 
-    if( mbedtls_mpi_cmp_mpi( &T, &ctx->N ) >= 0 )
-    {
+    if (mbedtls_mpi_cmp_mpi(&T, &ctx->N) >= 0) {
         ret = MBEDTLS_ERR_MPI_BAD_INPUT_DATA;
         goto cleanup;
     }
 
     olen = ctx->len;
-    MBEDTLS_MPI_CHK( mbedtls_mpi_exp_mod( &T, &T, &ctx->E, &ctx->N, &ctx->RN ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_write_binary( &T, output, olen ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_exp_mod(&T, &T, &ctx->E, &ctx->N, &ctx->RN));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_write_binary(&T, output, olen));
 
 cleanup:
 #if defined(MBEDTLS_THREADING_C)
-    if( mbedtls_mutex_unlock( &ctx->mutex ) != 0 )
-        return( MBEDTLS_ERR_THREADING_MUTEX_ERROR );
+    if (mbedtls_mutex_unlock(&ctx->mutex) != 0)
+        return (MBEDTLS_ERR_THREADING_MUTEX_ERROR);
 #endif
 
-    mbedtls_mpi_free( &T );
+    mbedtls_mpi_free(&T);
 
-    if( ret != 0 )
-        return( MBEDTLS_ERR_RSA_PUBLIC_FAILED + ret );
+    if (ret != 0)
+        return (MBEDTLS_ERR_RSA_PUBLIC_FAILED + ret);
 
-    return( 0 );
+    return (0);
 }
 
 /*
@@ -725,38 +694,37 @@ cleanup:
  *  DSS, and other systems. In : Advances in Cryptology-CRYPTO'96. Springer
  *  Berlin Heidelberg, 1996. p. 104-113.
  */
-static int rsa_prepare_blinding( mbedtls_rsa_context *ctx,
-                 int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
+static int rsa_prepare_blinding(mbedtls_rsa_context *ctx,
+                                int (*f_rng)(void *, unsigned char *, size_t), void *p_rng)
 {
     int ret, count = 0;
 
-    if( ctx->Vf.p != NULL )
-    {
+    if (ctx->Vf.p != NULL) {
         /* We already have blinding values, just update them by squaring */
-        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &ctx->Vi, &ctx->Vi, &ctx->Vi ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi( &ctx->Vi, &ctx->Vi, &ctx->N ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &ctx->Vf, &ctx->Vf, &ctx->Vf ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi( &ctx->Vf, &ctx->Vf, &ctx->N ) );
+        MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&ctx->Vi, &ctx->Vi, &ctx->Vi));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_mod_mpi(&ctx->Vi, &ctx->Vi, &ctx->N));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&ctx->Vf, &ctx->Vf, &ctx->Vf));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_mod_mpi(&ctx->Vf, &ctx->Vf, &ctx->N));
 
         goto cleanup;
     }
 
     /* Unblinding value: Vf = random number, invertible mod N */
     do {
-        if( count++ > 10 )
-            return( MBEDTLS_ERR_RSA_RNG_FAILED );
+        if (count++ > 10)
+            return (MBEDTLS_ERR_RSA_RNG_FAILED);
 
-        MBEDTLS_MPI_CHK( mbedtls_mpi_fill_random( &ctx->Vf, ctx->len - 1, f_rng, p_rng ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_gcd( &ctx->Vi, &ctx->Vf, &ctx->N ) );
-    } while( mbedtls_mpi_cmp_int( &ctx->Vi, 1 ) != 0 );
+        MBEDTLS_MPI_CHK(mbedtls_mpi_fill_random(&ctx->Vf, ctx->len - 1, f_rng, p_rng));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_gcd(&ctx->Vi, &ctx->Vf, &ctx->N));
+    } while (mbedtls_mpi_cmp_int(&ctx->Vi, 1) != 0);
 
     /* Blinding value: Vi =  Vf^(-e) mod N */
-    MBEDTLS_MPI_CHK( mbedtls_mpi_inv_mod( &ctx->Vi, &ctx->Vf, &ctx->N ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_exp_mod( &ctx->Vi, &ctx->Vi, &ctx->E, &ctx->N, &ctx->RN ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_inv_mod(&ctx->Vi, &ctx->Vf, &ctx->N));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_exp_mod(&ctx->Vi, &ctx->Vi, &ctx->E, &ctx->N, &ctx->RN));
 
 
 cleanup:
-    return( ret );
+    return (ret);
 }
 
 /*
@@ -783,11 +751,11 @@ cleanup:
 /*
  * Do an RSA private key operation
  */
-int mbedtls_rsa_private( mbedtls_rsa_context *ctx,
-                 int (*f_rng)(void *, unsigned char *, size_t),
-                 void *p_rng,
-                 const unsigned char *input,
-                 unsigned char *output )
+int mbedtls_rsa_private(mbedtls_rsa_context *ctx,
+                        int (*f_rng)(void *, unsigned char *, size_t),
+                        void *p_rng,
+                        const unsigned char *input,
+                        unsigned char *output)
 {
     int ret;
     size_t olen;
@@ -824,106 +792,103 @@ int mbedtls_rsa_private( mbedtls_rsa_context *ctx,
      * checked result; should be the same in the end. */
     mbedtls_mpi I, C;
 
-    if( rsa_check_context( ctx, 1             /* private key checks */,
-                                f_rng != NULL /* blinding y/n       */ ) != 0 )
-    {
-        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    if (rsa_check_context(ctx, 1             /* private key checks */,
+                          f_rng != NULL /* blinding y/n       */) != 0) {
+        return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
     }
 
 #if defined(MBEDTLS_THREADING_C)
-    if( ( ret = mbedtls_mutex_lock( &ctx->mutex ) ) != 0 )
-        return( ret );
+    if ((ret = mbedtls_mutex_lock(&ctx->mutex)) != 0)
+        return (ret);
 #endif
 
     /* MPI Initialization */
-    mbedtls_mpi_init( &T );
+    mbedtls_mpi_init(&T);
 
-    mbedtls_mpi_init( &P1 );
-    mbedtls_mpi_init( &Q1 );
-    mbedtls_mpi_init( &R );
+    mbedtls_mpi_init(&P1);
+    mbedtls_mpi_init(&Q1);
+    mbedtls_mpi_init(&R);
 
-    if( f_rng != NULL )
-    {
+    if (f_rng != NULL) {
 #if defined(MBEDTLS_RSA_NO_CRT)
-        mbedtls_mpi_init( &D_blind );
+        mbedtls_mpi_init(&D_blind);
 #else
-        mbedtls_mpi_init( &DP_blind );
-        mbedtls_mpi_init( &DQ_blind );
+        mbedtls_mpi_init(&DP_blind);
+        mbedtls_mpi_init(&DQ_blind);
 #endif
     }
 
 #if !defined(MBEDTLS_RSA_NO_CRT)
-    mbedtls_mpi_init( &TP ); mbedtls_mpi_init( &TQ );
+    mbedtls_mpi_init(&TP);
+    mbedtls_mpi_init(&TQ);
 #endif
 
-    mbedtls_mpi_init( &I );
-    mbedtls_mpi_init( &C );
+    mbedtls_mpi_init(&I);
+    mbedtls_mpi_init(&C);
 
     /* End of MPI initialization */
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_read_binary( &T, input, ctx->len ) );
-    if( mbedtls_mpi_cmp_mpi( &T, &ctx->N ) >= 0 )
-    {
+    MBEDTLS_MPI_CHK(mbedtls_mpi_read_binary(&T, input, ctx->len));
+    if (mbedtls_mpi_cmp_mpi(&T, &ctx->N) >= 0) {
         ret = MBEDTLS_ERR_MPI_BAD_INPUT_DATA;
         goto cleanup;
     }
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &I, &T ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_copy(&I, &T));
 
-    if( f_rng != NULL )
-    {
+    if (f_rng != NULL) {
         /*
          * Blinding
          * T = T * Vi mod N
          */
-        MBEDTLS_MPI_CHK( rsa_prepare_blinding( ctx, f_rng, p_rng ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &T, &T, &ctx->Vi ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi( &T, &T, &ctx->N ) );
+        MBEDTLS_MPI_CHK(rsa_prepare_blinding(ctx, f_rng, p_rng));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&T, &T, &ctx->Vi));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_mod_mpi(&T, &T, &ctx->N));
 
         /*
          * Exponent blinding
          */
-        MBEDTLS_MPI_CHK( mbedtls_mpi_sub_int( &P1, &ctx->P, 1 ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_sub_int( &Q1, &ctx->Q, 1 ) );
+        MBEDTLS_MPI_CHK(mbedtls_mpi_sub_int(&P1, &ctx->P, 1));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_sub_int(&Q1, &ctx->Q, 1));
 
 #if defined(MBEDTLS_RSA_NO_CRT)
         /*
          * D_blind = ( P - 1 ) * ( Q - 1 ) * R + D
          */
-        MBEDTLS_MPI_CHK( mbedtls_mpi_fill_random( &R, RSA_EXPONENT_BLINDING,
-                         f_rng, p_rng ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &D_blind, &P1, &Q1 ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &D_blind, &D_blind, &R ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_add_mpi( &D_blind, &D_blind, &ctx->D ) );
+        MBEDTLS_MPI_CHK(mbedtls_mpi_fill_random(&R, RSA_EXPONENT_BLINDING,
+                                                f_rng, p_rng));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&D_blind, &P1, &Q1));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&D_blind, &D_blind, &R));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_add_mpi(&D_blind, &D_blind, &ctx->D));
 
         D = &D_blind;
 #else
         /*
          * DP_blind = ( P - 1 ) * R + DP
          */
-        MBEDTLS_MPI_CHK( mbedtls_mpi_fill_random( &R, RSA_EXPONENT_BLINDING,
-                         f_rng, p_rng ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &DP_blind, &P1, &R ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_add_mpi( &DP_blind, &DP_blind,
-                    &ctx->DP ) );
+        MBEDTLS_MPI_CHK(mbedtls_mpi_fill_random(&R, RSA_EXPONENT_BLINDING,
+                                                f_rng, p_rng));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&DP_blind, &P1, &R));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_add_mpi(&DP_blind, &DP_blind,
+                                            &ctx->DP));
 
         DP = &DP_blind;
 
         /*
          * DQ_blind = ( Q - 1 ) * R + DQ
          */
-        MBEDTLS_MPI_CHK( mbedtls_mpi_fill_random( &R, RSA_EXPONENT_BLINDING,
-                         f_rng, p_rng ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &DQ_blind, &Q1, &R ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_add_mpi( &DQ_blind, &DQ_blind,
-                    &ctx->DQ ) );
+        MBEDTLS_MPI_CHK(mbedtls_mpi_fill_random(&R, RSA_EXPONENT_BLINDING,
+                                                f_rng, p_rng));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&DQ_blind, &Q1, &R));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_add_mpi(&DQ_blind, &DQ_blind,
+                                            &ctx->DQ));
 
         DQ = &DQ_blind;
 #endif /* MBEDTLS_RSA_NO_CRT */
     }
 
 #if defined(MBEDTLS_RSA_NO_CRT)
-    MBEDTLS_MPI_CHK( mbedtls_mpi_exp_mod( &T, &T, D, &ctx->N, &ctx->RN ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_exp_mod(&T, &T, D, &ctx->N, &ctx->RN));
 #else
     /*
      * Faster decryption using the CRT
@@ -932,78 +897,76 @@ int mbedtls_rsa_private( mbedtls_rsa_context *ctx,
      * TQ = input ^ dQ mod Q
      */
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_exp_mod( &TP, &T, DP, &ctx->P, &ctx->RP ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_exp_mod( &TQ, &T, DQ, &ctx->Q, &ctx->RQ ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_exp_mod(&TP, &T, DP, &ctx->P, &ctx->RP));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_exp_mod(&TQ, &T, DQ, &ctx->Q, &ctx->RQ));
 
     /*
      * T = (TP - TQ) * (Q^-1 mod P) mod P
      */
-    MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &T, &TP, &TQ ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &TP, &T, &ctx->QP ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi( &T, &TP, &ctx->P ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_sub_mpi(&T, &TP, &TQ));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&TP, &T, &ctx->QP));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mod_mpi(&T, &TP, &ctx->P));
 
     /*
      * T = TQ + T * Q
      */
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &TP, &T, &ctx->Q ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_add_mpi( &T, &TQ, &TP ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&TP, &T, &ctx->Q));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_add_mpi(&T, &TQ, &TP));
 #endif /* MBEDTLS_RSA_NO_CRT */
 
-    if( f_rng != NULL )
-    {
+    if (f_rng != NULL) {
         /*
          * Unblind
          * T = T * Vf mod N
          */
-        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &T, &T, &ctx->Vf ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi( &T, &T, &ctx->N ) );
+        MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&T, &T, &ctx->Vf));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_mod_mpi(&T, &T, &ctx->N));
     }
 
     /* Verify the result to prevent glitching attacks. */
-    MBEDTLS_MPI_CHK( mbedtls_mpi_exp_mod( &C, &T, &ctx->E,
-                                          &ctx->N, &ctx->RN ) );
-    if( mbedtls_mpi_cmp_mpi( &C, &I ) != 0 )
-    {
+    MBEDTLS_MPI_CHK(mbedtls_mpi_exp_mod(&C, &T, &ctx->E,
+                                        &ctx->N, &ctx->RN));
+    if (mbedtls_mpi_cmp_mpi(&C, &I) != 0) {
         ret = MBEDTLS_ERR_RSA_VERIFY_FAILED;
         goto cleanup;
     }
 
     olen = ctx->len;
-    MBEDTLS_MPI_CHK( mbedtls_mpi_write_binary( &T, output, olen ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_write_binary(&T, output, olen));
 
 cleanup:
 #if defined(MBEDTLS_THREADING_C)
-    if( mbedtls_mutex_unlock( &ctx->mutex ) != 0 )
-        return( MBEDTLS_ERR_THREADING_MUTEX_ERROR );
+    if (mbedtls_mutex_unlock(&ctx->mutex) != 0)
+        return (MBEDTLS_ERR_THREADING_MUTEX_ERROR);
 #endif
 
-    mbedtls_mpi_free( &P1 );
-    mbedtls_mpi_free( &Q1 );
-    mbedtls_mpi_free( &R );
+    mbedtls_mpi_free(&P1);
+    mbedtls_mpi_free(&Q1);
+    mbedtls_mpi_free(&R);
 
-    if( f_rng != NULL )
-    {
+    if (f_rng != NULL) {
 #if defined(MBEDTLS_RSA_NO_CRT)
-        mbedtls_mpi_free( &D_blind );
+        mbedtls_mpi_free(&D_blind);
 #else
-        mbedtls_mpi_free( &DP_blind );
-        mbedtls_mpi_free( &DQ_blind );
+        mbedtls_mpi_free(&DP_blind);
+        mbedtls_mpi_free(&DQ_blind);
 #endif
     }
 
-    mbedtls_mpi_free( &T );
+    mbedtls_mpi_free(&T);
 
 #if !defined(MBEDTLS_RSA_NO_CRT)
-    mbedtls_mpi_free( &TP ); mbedtls_mpi_free( &TQ );
+    mbedtls_mpi_free(&TP);
+    mbedtls_mpi_free(&TQ);
 #endif
 
-    mbedtls_mpi_free( &C );
-    mbedtls_mpi_free( &I );
+    mbedtls_mpi_free(&C);
+    mbedtls_mpi_free(&I);
 
-    if( ret != 0 )
-        return( MBEDTLS_ERR_RSA_PRIVATE_FAILED + ret );
+    if (ret != 0)
+        return (MBEDTLS_ERR_RSA_PRIVATE_FAILED + ret);
 
-    return( 0 );
+    return (0);
 }
 
 #if defined(MBEDTLS_PKCS1_V21)
@@ -1016,8 +979,8 @@ cleanup:
  * \param slen      length of the source buffer
  * \param md_ctx    message digest context to use
  */
-static int mgf_mask( unsigned char *dst, size_t dlen, unsigned char *src,
-                      size_t slen, mbedtls_md_context_t *md_ctx )
+static int mgf_mask(unsigned char *dst, size_t dlen, unsigned char *src,
+                    size_t slen, mbedtls_md_context_t *md_ctx)
 {
     unsigned char mask[MBEDTLS_MD_MAX_SIZE];
     unsigned char counter[4];
@@ -1026,30 +989,29 @@ static int mgf_mask( unsigned char *dst, size_t dlen, unsigned char *src,
     size_t i, use_len;
     int ret = 0;
 
-    memset( mask, 0, MBEDTLS_MD_MAX_SIZE );
-    memset( counter, 0, 4 );
+    memset(mask, 0, MBEDTLS_MD_MAX_SIZE);
+    memset(counter, 0, 4);
 
-    hlen = mbedtls_md_get_size( md_ctx->md_info );
+    hlen = mbedtls_md_get_size(md_ctx->md_info);
 
     /* Generate and apply dbMask */
     p = dst;
 
-    while( dlen > 0 )
-    {
+    while (dlen > 0) {
         use_len = hlen;
-        if( dlen < hlen )
+        if (dlen < hlen)
             use_len = dlen;
 
-        if( ( ret = mbedtls_md_starts( md_ctx ) ) != 0 )
+        if ((ret = mbedtls_md_starts(md_ctx)) != 0)
             goto exit;
-        if( ( ret = mbedtls_md_update( md_ctx, src, slen ) ) != 0 )
+        if ((ret = mbedtls_md_update(md_ctx, src, slen)) != 0)
             goto exit;
-        if( ( ret = mbedtls_md_update( md_ctx, counter, 4 ) ) != 0 )
+        if ((ret = mbedtls_md_update(md_ctx, counter, 4)) != 0)
             goto exit;
-        if( ( ret = mbedtls_md_finish( md_ctx, mask ) ) != 0 )
+        if ((ret = mbedtls_md_finish(md_ctx, mask)) != 0)
             goto exit;
 
-        for( i = 0; i < use_len; ++i )
+        for (i = 0; i < use_len; ++i)
             *p++ ^= mask[i];
 
         counter[3]++;
@@ -1058,9 +1020,9 @@ static int mgf_mask( unsigned char *dst, size_t dlen, unsigned char *src,
     }
 
 exit:
-    mbedtls_platform_zeroize( mask, sizeof( mask ) );
+    mbedtls_platform_zeroize(mask, sizeof(mask));
 
-    return( ret );
+    return (ret);
 }
 #endif /* MBEDTLS_PKCS1_V21 */
 
@@ -1068,14 +1030,14 @@ exit:
 /*
  * Implementation of the PKCS#1 v2.1 RSAES-OAEP-ENCRYPT function
  */
-int mbedtls_rsa_rsaes_oaep_encrypt( mbedtls_rsa_context *ctx,
-                            int (*f_rng)(void *, unsigned char *, size_t),
-                            void *p_rng,
-                            int mode,
-                            const unsigned char *label, size_t label_len,
-                            size_t ilen,
-                            const unsigned char *input,
-                            unsigned char *output )
+int mbedtls_rsa_rsaes_oaep_encrypt(mbedtls_rsa_context *ctx,
+                                   int (*f_rng)(void *, unsigned char *, size_t),
+                                   void *p_rng,
+                                   int mode,
+                                   const unsigned char *label, size_t label_len,
+                                   size_t ilen,
+                                   const unsigned char *input,
+                                   unsigned char *output)
 {
     size_t olen;
     int ret;
@@ -1084,64 +1046,64 @@ int mbedtls_rsa_rsaes_oaep_encrypt( mbedtls_rsa_context *ctx,
     const mbedtls_md_info_t *md_info;
     mbedtls_md_context_t md_ctx;
 
-    if( mode == MBEDTLS_RSA_PRIVATE && ctx->padding != MBEDTLS_RSA_PKCS_V21 )
-        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    if (mode == MBEDTLS_RSA_PRIVATE && ctx->padding != MBEDTLS_RSA_PKCS_V21)
+        return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
 
-    if( f_rng == NULL )
-        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    if (f_rng == NULL)
+        return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
 
-    md_info = mbedtls_md_info_from_type( (mbedtls_md_type_t) ctx->hash_id );
-    if( md_info == NULL )
-        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    md_info = mbedtls_md_info_from_type((mbedtls_md_type_t) ctx->hash_id);
+    if (md_info == NULL)
+        return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
 
     olen = ctx->len;
-    hlen = mbedtls_md_get_size( md_info );
+    hlen = mbedtls_md_get_size(md_info);
 
     /* first comparison checks for overflow */
-    if( ilen + 2 * hlen + 2 < ilen || olen < ilen + 2 * hlen + 2 )
-        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    if (ilen + 2 * hlen + 2 < ilen || olen < ilen + 2 * hlen + 2)
+        return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
 
-    memset( output, 0, olen );
+    memset(output, 0, olen);
 
     *p++ = 0;
 
     /* Generate a random octet string seed */
-    if( ( ret = f_rng( p_rng, p, hlen ) ) != 0 )
-        return( MBEDTLS_ERR_RSA_RNG_FAILED + ret );
+    if ((ret = f_rng(p_rng, p, hlen)) != 0)
+        return (MBEDTLS_ERR_RSA_RNG_FAILED + ret);
 
     p += hlen;
 
     /* Construct DB */
-    if( ( ret = mbedtls_md( md_info, label, label_len, p ) ) != 0 )
-        return( ret );
+    if ((ret = mbedtls_md(md_info, label, label_len, p)) != 0)
+        return (ret);
     p += hlen;
     p += olen - 2 * hlen - 2 - ilen;
     *p++ = 1;
-    memcpy( p, input, ilen );
+    memcpy(p, input, ilen);
 
-    mbedtls_md_init( &md_ctx );
-    if( ( ret = mbedtls_md_setup( &md_ctx, md_info, 0 ) ) != 0 )
+    mbedtls_md_init(&md_ctx);
+    if ((ret = mbedtls_md_setup(&md_ctx, md_info, 0)) != 0)
         goto exit;
 
     /* maskedDB: Apply dbMask to DB */
-    if( ( ret = mgf_mask( output + hlen + 1, olen - hlen - 1, output + 1, hlen,
-                          &md_ctx ) ) != 0 )
+    if ((ret = mgf_mask(output + hlen + 1, olen - hlen - 1, output + 1, hlen,
+                        &md_ctx)) != 0)
         goto exit;
 
     /* maskedSeed: Apply seedMask to seed */
-    if( ( ret = mgf_mask( output + 1, hlen, output + hlen + 1, olen - hlen - 1,
-                          &md_ctx ) ) != 0 )
+    if ((ret = mgf_mask(output + 1, hlen, output + hlen + 1, olen - hlen - 1,
+                        &md_ctx)) != 0)
         goto exit;
 
 exit:
-    mbedtls_md_free( &md_ctx );
+    mbedtls_md_free(&md_ctx);
 
-    if( ret != 0 )
-        return( ret );
+    if (ret != 0)
+        return (ret);
 
-    return( ( mode == MBEDTLS_RSA_PUBLIC )
-            ? mbedtls_rsa_public(  ctx, output, output )
-            : mbedtls_rsa_private( ctx, f_rng, p_rng, output, output ) );
+    return ((mode == MBEDTLS_RSA_PUBLIC)
+            ? mbedtls_rsa_public(ctx, output, output)
+            : mbedtls_rsa_private(ctx, f_rng, p_rng, output, output));
 }
 #endif /* MBEDTLS_PKCS1_V21 */
 
@@ -1149,95 +1111,90 @@ exit:
 /*
  * Implementation of the PKCS#1 v2.1 RSAES-PKCS1-V1_5-ENCRYPT function
  */
-int mbedtls_rsa_rsaes_pkcs1_v15_encrypt( mbedtls_rsa_context *ctx,
-                                 int (*f_rng)(void *, unsigned char *, size_t),
-                                 void *p_rng,
-                                 int mode, size_t ilen,
-                                 const unsigned char *input,
-                                 unsigned char *output )
+int mbedtls_rsa_rsaes_pkcs1_v15_encrypt(mbedtls_rsa_context *ctx,
+                                        int (*f_rng)(void *, unsigned char *, size_t),
+                                        void *p_rng,
+                                        int mode, size_t ilen,
+                                        const unsigned char *input,
+                                        unsigned char *output)
 {
     size_t nb_pad, olen;
     int ret;
     unsigned char *p = output;
 
-    if( mode == MBEDTLS_RSA_PRIVATE && ctx->padding != MBEDTLS_RSA_PKCS_V15 )
-        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    if (mode == MBEDTLS_RSA_PRIVATE && ctx->padding != MBEDTLS_RSA_PKCS_V15)
+        return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
 
     // We don't check p_rng because it won't be dereferenced here
-    if( f_rng == NULL || input == NULL || output == NULL )
-        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    if (f_rng == NULL || input == NULL || output == NULL)
+        return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
 
     olen = ctx->len;
 
     /* first comparison checks for overflow */
-    if( ilen + 11 < ilen || olen < ilen + 11 )
-        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    if (ilen + 11 < ilen || olen < ilen + 11)
+        return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
 
     nb_pad = olen - 3 - ilen;
 
     *p++ = 0;
-    if( mode == MBEDTLS_RSA_PUBLIC )
-    {
+    if (mode == MBEDTLS_RSA_PUBLIC) {
         *p++ = MBEDTLS_RSA_CRYPT;
 
-        while( nb_pad-- > 0 )
-        {
+        while (nb_pad-- > 0) {
             int rng_dl = 100;
 
             do {
-                ret = f_rng( p_rng, p, 1 );
-            } while( *p == 0 && --rng_dl && ret == 0 );
+                ret = f_rng(p_rng, p, 1);
+            } while (*p == 0 && --rng_dl && ret == 0);
 
             /* Check if RNG failed to generate data */
-            if( rng_dl == 0 || ret != 0 )
-                return( MBEDTLS_ERR_RSA_RNG_FAILED + ret );
+            if (rng_dl == 0 || ret != 0)
+                return (MBEDTLS_ERR_RSA_RNG_FAILED + ret);
 
             p++;
         }
-    }
-    else
-    {
+    } else {
         *p++ = MBEDTLS_RSA_SIGN;
 
-        while( nb_pad-- > 0 )
+        while (nb_pad-- > 0)
             *p++ = 0xFF;
     }
 
     *p++ = 0;
-    memcpy( p, input, ilen );
+    memcpy(p, input, ilen);
 
-    return( ( mode == MBEDTLS_RSA_PUBLIC )
-            ? mbedtls_rsa_public(  ctx, output, output )
-            : mbedtls_rsa_private( ctx, f_rng, p_rng, output, output ) );
+    return ((mode == MBEDTLS_RSA_PUBLIC)
+            ? mbedtls_rsa_public(ctx, output, output)
+            : mbedtls_rsa_private(ctx, f_rng, p_rng, output, output));
 }
 #endif /* MBEDTLS_PKCS1_V15 */
 
 /*
  * Add the message padding, then do an RSA operation
  */
-int mbedtls_rsa_pkcs1_encrypt( mbedtls_rsa_context *ctx,
-                       int (*f_rng)(void *, unsigned char *, size_t),
-                       void *p_rng,
-                       int mode, size_t ilen,
-                       const unsigned char *input,
-                       unsigned char *output )
+int mbedtls_rsa_pkcs1_encrypt(mbedtls_rsa_context *ctx,
+                              int (*f_rng)(void *, unsigned char *, size_t),
+                              void *p_rng,
+                              int mode, size_t ilen,
+                              const unsigned char *input,
+                              unsigned char *output)
 {
-    switch( ctx->padding )
-    {
+    switch (ctx->padding) {
 #if defined(MBEDTLS_PKCS1_V15)
         case MBEDTLS_RSA_PKCS_V15:
-            return mbedtls_rsa_rsaes_pkcs1_v15_encrypt( ctx, f_rng, p_rng, mode, ilen,
-                                                input, output );
+            return mbedtls_rsa_rsaes_pkcs1_v15_encrypt(ctx, f_rng, p_rng, mode, ilen,
+                                                       input, output);
 #endif
 
 #if defined(MBEDTLS_PKCS1_V21)
         case MBEDTLS_RSA_PKCS_V21:
-            return mbedtls_rsa_rsaes_oaep_encrypt( ctx, f_rng, p_rng, mode, NULL, 0,
-                                           ilen, input, output );
+            return mbedtls_rsa_rsaes_oaep_encrypt(ctx, f_rng, p_rng, mode, NULL, 0,
+                                                  ilen, input, output);
 #endif
 
         default:
-            return( MBEDTLS_ERR_RSA_INVALID_PADDING );
+            return (MBEDTLS_ERR_RSA_INVALID_PADDING);
     }
 }
 
@@ -1245,15 +1202,15 @@ int mbedtls_rsa_pkcs1_encrypt( mbedtls_rsa_context *ctx,
 /*
  * Implementation of the PKCS#1 v2.1 RSAES-OAEP-DECRYPT function
  */
-int mbedtls_rsa_rsaes_oaep_decrypt( mbedtls_rsa_context *ctx,
-                            int (*f_rng)(void *, unsigned char *, size_t),
-                            void *p_rng,
-                            int mode,
-                            const unsigned char *label, size_t label_len,
-                            size_t *olen,
-                            const unsigned char *input,
-                            unsigned char *output,
-                            size_t output_max_len )
+int mbedtls_rsa_rsaes_oaep_decrypt(mbedtls_rsa_context *ctx,
+                                   int (*f_rng)(void *, unsigned char *, size_t),
+                                   void *p_rng,
+                                   int mode,
+                                   const unsigned char *label, size_t label_len,
+                                   size_t *olen,
+                                   const unsigned char *input,
+                                   unsigned char *output,
+                                   size_t output_max_len)
 {
     int ret;
     size_t ilen, i, pad_len;
@@ -1267,59 +1224,57 @@ int mbedtls_rsa_rsaes_oaep_decrypt( mbedtls_rsa_context *ctx,
     /*
      * Parameters sanity checks
      */
-    if( mode == MBEDTLS_RSA_PRIVATE && ctx->padding != MBEDTLS_RSA_PKCS_V21 )
-        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    if (mode == MBEDTLS_RSA_PRIVATE && ctx->padding != MBEDTLS_RSA_PKCS_V21)
+        return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
 
     ilen = ctx->len;
 
-    if( ilen < 16 || ilen > sizeof( buf ) )
-        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    if (ilen < 16 || ilen > sizeof(buf))
+        return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
 
-    md_info = mbedtls_md_info_from_type( (mbedtls_md_type_t) ctx->hash_id );
-    if( md_info == NULL )
-        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    md_info = mbedtls_md_info_from_type((mbedtls_md_type_t) ctx->hash_id);
+    if (md_info == NULL)
+        return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
 
-    hlen = mbedtls_md_get_size( md_info );
+    hlen = mbedtls_md_get_size(md_info);
 
     // checking for integer underflow
-    if( 2 * hlen + 2 > ilen )
-        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    if (2 * hlen + 2 > ilen)
+        return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
 
     /*
      * RSA operation
      */
-    ret = ( mode == MBEDTLS_RSA_PUBLIC )
-          ? mbedtls_rsa_public(  ctx, input, buf )
-          : mbedtls_rsa_private( ctx, f_rng, p_rng, input, buf );
+    ret = (mode == MBEDTLS_RSA_PUBLIC)
+          ? mbedtls_rsa_public(ctx, input, buf)
+          : mbedtls_rsa_private(ctx, f_rng, p_rng, input, buf);
 
-    if( ret != 0 )
+    if (ret != 0)
         goto cleanup;
 
     /*
      * Unmask data and generate lHash
      */
-    mbedtls_md_init( &md_ctx );
-    if( ( ret = mbedtls_md_setup( &md_ctx, md_info, 0 ) ) != 0 )
-    {
-        mbedtls_md_free( &md_ctx );
+    mbedtls_md_init(&md_ctx);
+    if ((ret = mbedtls_md_setup(&md_ctx, md_info, 0)) != 0) {
+        mbedtls_md_free(&md_ctx);
         goto cleanup;
     }
 
     /* seed: Apply seedMask to maskedSeed */
-    if( ( ret = mgf_mask( buf + 1, hlen, buf + hlen + 1, ilen - hlen - 1,
-                          &md_ctx ) ) != 0 ||
-    /* DB: Apply dbMask to maskedDB */
-        ( ret = mgf_mask( buf + hlen + 1, ilen - hlen - 1, buf + 1, hlen,
-                          &md_ctx ) ) != 0 )
-    {
-        mbedtls_md_free( &md_ctx );
+    if ((ret = mgf_mask(buf + 1, hlen, buf + hlen + 1, ilen - hlen - 1,
+                        &md_ctx)) != 0 ||
+        /* DB: Apply dbMask to maskedDB */
+        (ret = mgf_mask(buf + hlen + 1, ilen - hlen - 1, buf + 1, hlen,
+                        &md_ctx)) != 0) {
+        mbedtls_md_free(&md_ctx);
         goto cleanup;
     }
 
-    mbedtls_md_free( &md_ctx );
+    mbedtls_md_free(&md_ctx);
 
     /* Generate lHash */
-    if( ( ret = mbedtls_md( md_info, label, label_len, lhash ) ) != 0 )
+    if ((ret = mbedtls_md(md_info, label, label_len, lhash)) != 0)
         goto cleanup;
 
     /*
@@ -1333,17 +1288,16 @@ int mbedtls_rsa_rsaes_oaep_decrypt( mbedtls_rsa_context *ctx,
     p += hlen; /* Skip seed */
 
     /* Check lHash */
-    for( i = 0; i < hlen; i++ )
+    for (i = 0; i < hlen; i++)
         bad |= lhash[i] ^ *p++;
 
     /* Get zero-padding len, but always read till end of buffer
      * (minus one, for the 01 byte) */
     pad_len = 0;
     pad_done = 0;
-    for( i = 0; i < ilen - 2 * hlen - 2; i++ )
-    {
+    for (i = 0; i < ilen - 2 * hlen - 2; i++) {
         pad_done |= p[i];
-        pad_len += ((pad_done | (unsigned char)-pad_done) >> 7) ^ 1;
+        pad_len += ((pad_done | (unsigned char) - pad_done) >> 7) ^ 1;
     }
 
     p += pad_len;
@@ -1355,27 +1309,25 @@ int mbedtls_rsa_rsaes_oaep_decrypt( mbedtls_rsa_context *ctx,
      * recommendations in PKCS#1 v2.2: an opponent cannot distinguish between
      * the different error conditions.
      */
-    if( bad != 0 )
-    {
+    if (bad != 0) {
         ret = MBEDTLS_ERR_RSA_INVALID_PADDING;
         goto cleanup;
     }
 
-    if( ilen - ( p - buf ) > output_max_len )
-    {
+    if (ilen - (p - buf) > output_max_len) {
         ret = MBEDTLS_ERR_RSA_OUTPUT_TOO_LARGE;
         goto cleanup;
     }
 
     *olen = ilen - (p - buf);
-    memcpy( output, p, *olen );
+    memcpy(output, p, *olen);
     ret = 0;
 
 cleanup:
-    mbedtls_platform_zeroize( buf, sizeof( buf ) );
-    mbedtls_platform_zeroize( lhash, sizeof( lhash ) );
+    mbedtls_platform_zeroize(buf, sizeof(buf));
+    mbedtls_platform_zeroize(lhash, sizeof(lhash));
 
-    return( ret );
+    return (ret);
 }
 #endif /* MBEDTLS_PKCS1_V21 */
 
@@ -1383,32 +1335,32 @@ cleanup:
 /*
  * Implementation of the PKCS#1 v2.1 RSAES-PKCS1-V1_5-DECRYPT function
  */
-int mbedtls_rsa_rsaes_pkcs1_v15_decrypt( mbedtls_rsa_context *ctx,
-                                 int (*f_rng)(void *, unsigned char *, size_t),
-                                 void *p_rng,
-                                 int mode, size_t *olen,
-                                 const unsigned char *input,
-                                 unsigned char *output,
-                                 size_t output_max_len)
+int mbedtls_rsa_rsaes_pkcs1_v15_decrypt(mbedtls_rsa_context *ctx,
+                                        int (*f_rng)(void *, unsigned char *, size_t),
+                                        void *p_rng,
+                                        int mode, size_t *olen,
+                                        const unsigned char *input,
+                                        unsigned char *output,
+                                        size_t output_max_len)
 {
     int ret;
     size_t ilen, pad_count = 0, i;
     unsigned char *p, bad, pad_done = 0;
     unsigned char buf[MBEDTLS_MPI_MAX_SIZE];
 
-    if( mode == MBEDTLS_RSA_PRIVATE && ctx->padding != MBEDTLS_RSA_PKCS_V15 )
-        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    if (mode == MBEDTLS_RSA_PRIVATE && ctx->padding != MBEDTLS_RSA_PKCS_V15)
+        return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
 
     ilen = ctx->len;
 
-    if( ilen < 16 || ilen > sizeof( buf ) )
-        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    if (ilen < 16 || ilen > sizeof(buf))
+        return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
 
-    ret = ( mode == MBEDTLS_RSA_PUBLIC )
-          ? mbedtls_rsa_public(  ctx, input, buf )
-          : mbedtls_rsa_private( ctx, f_rng, p_rng, input, buf );
+    ret = (mode == MBEDTLS_RSA_PUBLIC)
+          ? mbedtls_rsa_public(ctx, input, buf)
+          : mbedtls_rsa_private(ctx, f_rng, p_rng, input, buf);
 
-    if( ret != 0 )
+    if (ret != 0)
         goto cleanup;
 
     p = buf;
@@ -1420,90 +1372,82 @@ int mbedtls_rsa_rsaes_pkcs1_v15_decrypt( mbedtls_rsa_context *ctx,
     bad |= *p++; /* First byte must be 0 */
 
     /* This test does not depend on secret data */
-    if( mode == MBEDTLS_RSA_PRIVATE )
-    {
+    if (mode == MBEDTLS_RSA_PRIVATE) {
         bad |= *p++ ^ MBEDTLS_RSA_CRYPT;
 
         /* Get padding len, but always read till end of buffer
          * (minus one, for the 00 byte) */
-        for( i = 0; i < ilen - 3; i++ )
-        {
-            pad_done  |= ((p[i] | (unsigned char)-p[i]) >> 7) ^ 1;
-            pad_count += ((pad_done | (unsigned char)-pad_done) >> 7) ^ 1;
+        for (i = 0; i < ilen - 3; i++) {
+            pad_done  |= ((p[i] | (unsigned char) - p[i]) >> 7) ^ 1;
+            pad_count += ((pad_done | (unsigned char) - pad_done) >> 7) ^ 1;
         }
 
         p += pad_count;
         bad |= *p++; /* Must be zero */
-    }
-    else
-    {
+    } else {
         bad |= *p++ ^ MBEDTLS_RSA_SIGN;
 
         /* Get padding len, but always read till end of buffer
          * (minus one, for the 00 byte) */
-        for( i = 0; i < ilen - 3; i++ )
-        {
-            pad_done |= ( p[i] != 0xFF );
-            pad_count += ( pad_done == 0 );
+        for (i = 0; i < ilen - 3; i++) {
+            pad_done |= (p[i] != 0xFF);
+            pad_count += (pad_done == 0);
         }
 
         p += pad_count;
         bad |= *p++; /* Must be zero */
     }
 
-    bad |= ( pad_count < 8 );
+    bad |= (pad_count < 8);
 
-    if( bad )
-    {
+    if (bad) {
         ret = MBEDTLS_ERR_RSA_INVALID_PADDING;
         goto cleanup;
     }
 
-    if( ilen - ( p - buf ) > output_max_len )
-    {
+    if (ilen - (p - buf) > output_max_len) {
         ret = MBEDTLS_ERR_RSA_OUTPUT_TOO_LARGE;
         goto cleanup;
     }
 
     *olen = ilen - (p - buf);
-    memcpy( output, p, *olen );
+    memcpy(output, p, *olen);
     ret = 0;
 
 cleanup:
-    mbedtls_platform_zeroize( buf, sizeof( buf ) );
+    mbedtls_platform_zeroize(buf, sizeof(buf));
 
-    return( ret );
+    return (ret);
 }
 #endif /* MBEDTLS_PKCS1_V15 */
 
 /*
  * Do an RSA operation, then remove the message padding
  */
-int mbedtls_rsa_pkcs1_decrypt( mbedtls_rsa_context *ctx,
-                       int (*f_rng)(void *, unsigned char *, size_t),
-                       void *p_rng,
-                       int mode, size_t *olen,
-                       const unsigned char *input,
-                       unsigned char *output,
-                       size_t output_max_len)
+int mbedtls_rsa_pkcs1_decrypt(mbedtls_rsa_context *ctx,
+                              int (*f_rng)(void *, unsigned char *, size_t),
+                              void *p_rng,
+                              int mode, size_t *olen,
+                              const unsigned char *input,
+                              unsigned char *output,
+                              size_t output_max_len)
 {
-    switch( ctx->padding )
-    {
+    switch (ctx->padding) {
 #if defined(MBEDTLS_PKCS1_V15)
         case MBEDTLS_RSA_PKCS_V15:
-            return mbedtls_rsa_rsaes_pkcs1_v15_decrypt( ctx, f_rng, p_rng, mode, olen,
-                                                input, output, output_max_len );
+            return mbedtls_rsa_rsaes_pkcs1_v15_decrypt(ctx, f_rng, p_rng, mode, olen,
+                                                       input, output, output_max_len);
 #endif
 
 #if defined(MBEDTLS_PKCS1_V21)
         case MBEDTLS_RSA_PKCS_V21:
-            return mbedtls_rsa_rsaes_oaep_decrypt( ctx, f_rng, p_rng, mode, NULL, 0,
-                                           olen, input, output,
-                                           output_max_len );
+            return mbedtls_rsa_rsaes_oaep_decrypt(ctx, f_rng, p_rng, mode, NULL, 0,
+                                                  olen, input, output,
+                                                  output_max_len);
 #endif
 
         default:
-            return( MBEDTLS_ERR_RSA_INVALID_PADDING );
+            return (MBEDTLS_ERR_RSA_INVALID_PADDING);
     }
 }
 
@@ -1511,14 +1455,14 @@ int mbedtls_rsa_pkcs1_decrypt( mbedtls_rsa_context *ctx,
 /*
  * Implementation of the PKCS#1 v2.1 RSASSA-PSS-SIGN function
  */
-int mbedtls_rsa_rsassa_pss_sign( mbedtls_rsa_context *ctx,
-                         int (*f_rng)(void *, unsigned char *, size_t),
-                         void *p_rng,
-                         int mode,
-                         mbedtls_md_type_t md_alg,
-                         unsigned int hashlen,
-                         const unsigned char *hash,
-                         unsigned char *sig )
+int mbedtls_rsa_rsassa_pss_sign(mbedtls_rsa_context *ctx,
+                                int (*f_rng)(void *, unsigned char *, size_t),
+                                void *p_rng,
+                                int mode,
+                                mbedtls_md_type_t md_alg,
+                                unsigned int hashlen,
+                                const unsigned char *hash,
+                                unsigned char *sig)
 {
     size_t olen;
     unsigned char *p = sig;
@@ -1529,89 +1473,88 @@ int mbedtls_rsa_rsassa_pss_sign( mbedtls_rsa_context *ctx,
     const mbedtls_md_info_t *md_info;
     mbedtls_md_context_t md_ctx;
 
-    if( mode == MBEDTLS_RSA_PRIVATE && ctx->padding != MBEDTLS_RSA_PKCS_V21 )
-        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    if (mode == MBEDTLS_RSA_PRIVATE && ctx->padding != MBEDTLS_RSA_PKCS_V21)
+        return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
 
-    if( f_rng == NULL )
-        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    if (f_rng == NULL)
+        return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
 
     olen = ctx->len;
 
-    if( md_alg != MBEDTLS_MD_NONE )
-    {
+    if (md_alg != MBEDTLS_MD_NONE) {
         /* Gather length of hash to sign */
-        md_info = mbedtls_md_info_from_type( md_alg );
-        if( md_info == NULL )
-            return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+        md_info = mbedtls_md_info_from_type(md_alg);
+        if (md_info == NULL)
+            return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
 
-        hashlen = mbedtls_md_get_size( md_info );
+        hashlen = mbedtls_md_get_size(md_info);
     }
 
-    md_info = mbedtls_md_info_from_type( (mbedtls_md_type_t) ctx->hash_id );
-    if( md_info == NULL )
-        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    md_info = mbedtls_md_info_from_type((mbedtls_md_type_t) ctx->hash_id);
+    if (md_info == NULL)
+        return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
 
-    hlen = mbedtls_md_get_size( md_info );
+    hlen = mbedtls_md_get_size(md_info);
     slen = hlen;
 
-    if( olen < hlen + slen + 2 )
-        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    if (olen < hlen + slen + 2)
+        return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
 
-    memset( sig, 0, olen );
+    memset(sig, 0, olen);
 
     /* Generate salt of length slen */
-    if( ( ret = f_rng( p_rng, salt, slen ) ) != 0 )
-        return( MBEDTLS_ERR_RSA_RNG_FAILED + ret );
+    if ((ret = f_rng(p_rng, salt, slen)) != 0)
+        return (MBEDTLS_ERR_RSA_RNG_FAILED + ret);
 
     /* Note: EMSA-PSS encoding is over the length of N - 1 bits */
-    msb = mbedtls_mpi_bitlen( &ctx->N ) - 1;
+    msb = mbedtls_mpi_bitlen(&ctx->N) - 1;
     p += olen - hlen * 2 - 2;
     *p++ = 0x01;
-    memcpy( p, salt, slen );
+    memcpy(p, salt, slen);
     p += slen;
 
-    mbedtls_md_init( &md_ctx );
-    if( ( ret = mbedtls_md_setup( &md_ctx, md_info, 0 ) ) != 0 )
+    mbedtls_md_init(&md_ctx);
+    if ((ret = mbedtls_md_setup(&md_ctx, md_info, 0)) != 0)
         goto exit;
 
     /* Generate H = Hash( M' ) */
-    if( ( ret = mbedtls_md_starts( &md_ctx ) ) != 0 )
+    if ((ret = mbedtls_md_starts(&md_ctx)) != 0)
         goto exit;
-    if( ( ret = mbedtls_md_update( &md_ctx, p, 8 ) ) != 0 )
+    if ((ret = mbedtls_md_update(&md_ctx, p, 8)) != 0)
         goto exit;
-    if( ( ret = mbedtls_md_update( &md_ctx, hash, hashlen ) ) != 0 )
+    if ((ret = mbedtls_md_update(&md_ctx, hash, hashlen)) != 0)
         goto exit;
-    if( ( ret = mbedtls_md_update( &md_ctx, salt, slen ) ) != 0 )
+    if ((ret = mbedtls_md_update(&md_ctx, salt, slen)) != 0)
         goto exit;
-    if( ( ret = mbedtls_md_finish( &md_ctx, p ) ) != 0 )
+    if ((ret = mbedtls_md_finish(&md_ctx, p)) != 0)
         goto exit;
 
     /* Compensate for boundary condition when applying mask */
-    if( msb % 8 == 0 )
+    if (msb % 8 == 0)
         offset = 1;
 
     /* maskedDB: Apply dbMask to DB */
-    if( ( ret = mgf_mask( sig + offset, olen - hlen - 1 - offset, p, hlen,
-                          &md_ctx ) ) != 0 )
+    if ((ret = mgf_mask(sig + offset, olen - hlen - 1 - offset, p, hlen,
+                        &md_ctx)) != 0)
         goto exit;
 
-    msb = mbedtls_mpi_bitlen( &ctx->N ) - 1;
-    sig[0] &= 0xFF >> ( olen * 8 - msb );
+    msb = mbedtls_mpi_bitlen(&ctx->N) - 1;
+    sig[0] &= 0xFF >> (olen * 8 - msb);
 
     p += hlen;
     *p++ = 0xBC;
 
-    mbedtls_platform_zeroize( salt, sizeof( salt ) );
+    mbedtls_platform_zeroize(salt, sizeof(salt));
 
 exit:
-    mbedtls_md_free( &md_ctx );
+    mbedtls_md_free(&md_ctx);
 
-    if( ret != 0 )
-        return( ret );
+    if (ret != 0)
+        return (ret);
 
-    return( ( mode == MBEDTLS_RSA_PUBLIC )
-            ? mbedtls_rsa_public(  ctx, sig, sig )
-            : mbedtls_rsa_private( ctx, f_rng, p_rng, sig, sig ) );
+    return ((mode == MBEDTLS_RSA_PUBLIC)
+            ? mbedtls_rsa_public(ctx, sig, sig)
+            : mbedtls_rsa_private(ctx, f_rng, p_rng, sig, sig));
 }
 #endif /* MBEDTLS_PKCS1_V21 */
 
@@ -1638,11 +1581,11 @@ exit:
  * - dst points to a buffer of size at least dst_len.
  *
  */
-static int rsa_rsassa_pkcs1_v15_encode( mbedtls_md_type_t md_alg,
-                                        unsigned int hashlen,
-                                        const unsigned char *hash,
-                                        size_t dst_len,
-                                        unsigned char *dst )
+static int rsa_rsassa_pkcs1_v15_encode(mbedtls_md_type_t md_alg,
+                                       unsigned int hashlen,
+                                       const unsigned char *hash,
+                                       size_t dst_len,
+                                       unsigned char *dst)
 {
     size_t oid_size  = 0;
     size_t nb_pad    = dst_len;
@@ -1650,23 +1593,22 @@ static int rsa_rsassa_pkcs1_v15_encode( mbedtls_md_type_t md_alg,
     const char *oid  = NULL;
 
     /* Are we signing hashed or raw data? */
-    if( md_alg != MBEDTLS_MD_NONE )
-    {
-        const mbedtls_md_info_t *md_info = mbedtls_md_info_from_type( md_alg );
-        if( md_info == NULL )
-            return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    if (md_alg != MBEDTLS_MD_NONE) {
+        const mbedtls_md_info_t *md_info = mbedtls_md_info_from_type(md_alg);
+        if (md_info == NULL)
+            return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
 
-        if( mbedtls_oid_get_oid_by_md( md_alg, &oid, &oid_size ) != 0 )
-            return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+        if (mbedtls_oid_get_oid_by_md(md_alg, &oid, &oid_size) != 0)
+            return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
 
-        hashlen = mbedtls_md_get_size( md_info );
+        hashlen = mbedtls_md_get_size(md_info);
 
         /* Double-check that 8 + hashlen + oid_size can be used as a
          * 1-byte ASN.1 length encoding and that there's no overflow. */
-        if( 8 + hashlen + oid_size  >= 0x80         ||
+        if (8 + hashlen + oid_size  >= 0x80         ||
             10 + hashlen            <  hashlen      ||
-            10 + hashlen + oid_size <  10 + hashlen )
-            return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+            10 + hashlen + oid_size <  10 + hashlen)
+            return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
 
         /*
          * Static bounds check:
@@ -1676,22 +1618,20 @@ static int rsa_rsassa_pkcs1_v15_encode( mbedtls_md_type_t md_alg,
          * - Need hashlen bytes for hash
          * - Need oid_size bytes for hash alg OID.
          */
-        if( nb_pad < 10 + hashlen + oid_size )
-            return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+        if (nb_pad < 10 + hashlen + oid_size)
+            return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
         nb_pad -= 10 + hashlen + oid_size;
-    }
-    else
-    {
-        if( nb_pad < hashlen )
-            return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    } else {
+        if (nb_pad < hashlen)
+            return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
 
         nb_pad -= hashlen;
     }
 
     /* Need space for signature header and padding delimiter (3 bytes),
      * and 8 bytes for the minimal padding */
-    if( nb_pad < 3 + 8 )
-        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    if (nb_pad < 3 + 8)
+        return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
     nb_pad -= 3;
 
     /* Now nb_pad is the amount of memory to be filled
@@ -1700,15 +1640,14 @@ static int rsa_rsassa_pkcs1_v15_encode( mbedtls_md_type_t md_alg,
     /* Write signature header and padding */
     *p++ = 0;
     *p++ = MBEDTLS_RSA_SIGN;
-    memset( p, 0xFF, nb_pad );
+    memset(p, 0xFF, nb_pad);
     p += nb_pad;
     *p++ = 0;
 
     /* Are we signing raw data? */
-    if( md_alg == MBEDTLS_MD_NONE )
-    {
-        memcpy( p, hash, hashlen );
-        return( 0 );
+    if (md_alg == MBEDTLS_MD_NONE) {
+        memcpy(p, hash, hashlen);
+        return (0);
     }
 
     /* Signing hashed data, add corresponding ASN.1 structure
@@ -1725,65 +1664,63 @@ static int rsa_rsassa_pkcs1_v15_encode( mbedtls_md_type_t md_alg,
      *                 TAG-OCTET + LEN [ HASH ] ]
      */
     *p++ = MBEDTLS_ASN1_SEQUENCE | MBEDTLS_ASN1_CONSTRUCTED;
-    *p++ = (unsigned char)( 0x08 + oid_size + hashlen );
+    *p++ = (unsigned char)(0x08 + oid_size + hashlen);
     *p++ = MBEDTLS_ASN1_SEQUENCE | MBEDTLS_ASN1_CONSTRUCTED;
-    *p++ = (unsigned char)( 0x04 + oid_size );
+    *p++ = (unsigned char)(0x04 + oid_size);
     *p++ = MBEDTLS_ASN1_OID;
     *p++ = (unsigned char) oid_size;
-    memcpy( p, oid, oid_size );
+    memcpy(p, oid, oid_size);
     p += oid_size;
     *p++ = MBEDTLS_ASN1_NULL;
     *p++ = 0x00;
     *p++ = MBEDTLS_ASN1_OCTET_STRING;
     *p++ = (unsigned char) hashlen;
-    memcpy( p, hash, hashlen );
+    memcpy(p, hash, hashlen);
     p += hashlen;
 
     /* Just a sanity-check, should be automatic
      * after the initial bounds check. */
-    if( p != dst + dst_len )
-    {
-        mbedtls_platform_zeroize( dst, dst_len );
-        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    if (p != dst + dst_len) {
+        mbedtls_platform_zeroize(dst, dst_len);
+        return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
     }
 
-    return( 0 );
+    return (0);
 }
 
 /*
  * Do an RSA operation to sign the message digest
  */
-int mbedtls_rsa_rsassa_pkcs1_v15_sign( mbedtls_rsa_context *ctx,
-                               int (*f_rng)(void *, unsigned char *, size_t),
-                               void *p_rng,
-                               int mode,
-                               mbedtls_md_type_t md_alg,
-                               unsigned int hashlen,
-                               const unsigned char *hash,
-                               unsigned char *sig )
+int mbedtls_rsa_rsassa_pkcs1_v15_sign(mbedtls_rsa_context *ctx,
+                                      int (*f_rng)(void *, unsigned char *, size_t),
+                                      void *p_rng,
+                                      int mode,
+                                      mbedtls_md_type_t md_alg,
+                                      unsigned int hashlen,
+                                      const unsigned char *hash,
+                                      unsigned char *sig)
 {
     int ret;
     unsigned char *sig_try = NULL, *verif = NULL;
 
-    if( mode == MBEDTLS_RSA_PRIVATE && ctx->padding != MBEDTLS_RSA_PKCS_V15 )
-        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    if (mode == MBEDTLS_RSA_PRIVATE && ctx->padding != MBEDTLS_RSA_PKCS_V15)
+        return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
 
     /*
      * Prepare PKCS1-v1.5 encoding (padding and hash identifier)
      */
 
-    if( ( ret = rsa_rsassa_pkcs1_v15_encode( md_alg, hashlen, hash,
-                                             ctx->len, sig ) ) != 0 )
-        return( ret );
+    if ((ret = rsa_rsassa_pkcs1_v15_encode(md_alg, hashlen, hash,
+                                           ctx->len, sig)) != 0)
+        return (ret);
 
     /*
      * Call respective RSA primitive
      */
 
-    if( mode == MBEDTLS_RSA_PUBLIC )
-    {
+    if (mode == MBEDTLS_RSA_PUBLIC) {
         /* Skip verification on a public key operation */
-        return( mbedtls_rsa_public( ctx, sig, sig ) );
+        return (mbedtls_rsa_public(ctx, sig, sig));
     }
 
     /* Private key operation
@@ -1792,64 +1729,61 @@ int mbedtls_rsa_rsassa_pkcs1_v15_sign( mbedtls_rsa_context *ctx,
      * temporary buffer and check it before returning it.
      */
 
-    sig_try = mbedtls_calloc( 1, ctx->len );
-    if( sig_try == NULL )
-        return( MBEDTLS_ERR_MPI_ALLOC_FAILED );
+    sig_try = mbedtls_calloc(1, ctx->len);
+    if (sig_try == NULL)
+        return (MBEDTLS_ERR_MPI_ALLOC_FAILED);
 
-    verif = mbedtls_calloc( 1, ctx->len );
-    if( verif == NULL )
-    {
-        mbedtls_free( sig_try );
-        return( MBEDTLS_ERR_MPI_ALLOC_FAILED );
+    verif = mbedtls_calloc(1, ctx->len);
+    if (verif == NULL) {
+        mbedtls_free(sig_try);
+        return (MBEDTLS_ERR_MPI_ALLOC_FAILED);
     }
 
-    MBEDTLS_MPI_CHK( mbedtls_rsa_private( ctx, f_rng, p_rng, sig, sig_try ) );
-    MBEDTLS_MPI_CHK( mbedtls_rsa_public( ctx, sig_try, verif ) );
+    MBEDTLS_MPI_CHK(mbedtls_rsa_private(ctx, f_rng, p_rng, sig, sig_try));
+    MBEDTLS_MPI_CHK(mbedtls_rsa_public(ctx, sig_try, verif));
 
-    if( mbedtls_safer_memcmp( verif, sig, ctx->len ) != 0 )
-    {
+    if (mbedtls_safer_memcmp(verif, sig, ctx->len) != 0) {
         ret = MBEDTLS_ERR_RSA_PRIVATE_FAILED;
         goto cleanup;
     }
 
-    memcpy( sig, sig_try, ctx->len );
+    memcpy(sig, sig_try, ctx->len);
 
 cleanup:
-    mbedtls_free( sig_try );
-    mbedtls_free( verif );
+    mbedtls_free(sig_try);
+    mbedtls_free(verif);
 
-    return( ret );
+    return (ret);
 }
 #endif /* MBEDTLS_PKCS1_V15 */
 
 /*
  * Do an RSA operation to sign the message digest
  */
-int mbedtls_rsa_pkcs1_sign( mbedtls_rsa_context *ctx,
-                    int (*f_rng)(void *, unsigned char *, size_t),
-                    void *p_rng,
-                    int mode,
-                    mbedtls_md_type_t md_alg,
-                    unsigned int hashlen,
-                    const unsigned char *hash,
-                    unsigned char *sig )
+int mbedtls_rsa_pkcs1_sign(mbedtls_rsa_context *ctx,
+                           int (*f_rng)(void *, unsigned char *, size_t),
+                           void *p_rng,
+                           int mode,
+                           mbedtls_md_type_t md_alg,
+                           unsigned int hashlen,
+                           const unsigned char *hash,
+                           unsigned char *sig)
 {
-    switch( ctx->padding )
-    {
+    switch (ctx->padding) {
 #if defined(MBEDTLS_PKCS1_V15)
         case MBEDTLS_RSA_PKCS_V15:
-            return mbedtls_rsa_rsassa_pkcs1_v15_sign( ctx, f_rng, p_rng, mode, md_alg,
-                                              hashlen, hash, sig );
+            return mbedtls_rsa_rsassa_pkcs1_v15_sign(ctx, f_rng, p_rng, mode, md_alg,
+                                                     hashlen, hash, sig);
 #endif
 
 #if defined(MBEDTLS_PKCS1_V21)
         case MBEDTLS_RSA_PKCS_V21:
-            return mbedtls_rsa_rsassa_pss_sign( ctx, f_rng, p_rng, mode, md_alg,
-                                        hashlen, hash, sig );
+            return mbedtls_rsa_rsassa_pss_sign(ctx, f_rng, p_rng, mode, md_alg,
+                                               hashlen, hash, sig);
 #endif
 
         default:
-            return( MBEDTLS_ERR_RSA_INVALID_PADDING );
+            return (MBEDTLS_ERR_RSA_INVALID_PADDING);
     }
 }
 
@@ -1857,16 +1791,16 @@ int mbedtls_rsa_pkcs1_sign( mbedtls_rsa_context *ctx,
 /*
  * Implementation of the PKCS#1 v2.1 RSASSA-PSS-VERIFY function
  */
-int mbedtls_rsa_rsassa_pss_verify_ext( mbedtls_rsa_context *ctx,
-                               int (*f_rng)(void *, unsigned char *, size_t),
-                               void *p_rng,
-                               int mode,
-                               mbedtls_md_type_t md_alg,
-                               unsigned int hashlen,
-                               const unsigned char *hash,
-                               mbedtls_md_type_t mgf1_hash_id,
-                               int expected_salt_len,
-                               const unsigned char *sig )
+int mbedtls_rsa_rsassa_pss_verify_ext(mbedtls_rsa_context *ctx,
+                                      int (*f_rng)(void *, unsigned char *, size_t),
+                                      void *p_rng,
+                                      int mode,
+                                      mbedtls_md_type_t md_alg,
+                                      unsigned int hashlen,
+                                      const unsigned char *hash,
+                                      mbedtls_md_type_t mgf1_hash_id,
+                                      int expected_salt_len,
+                                      const unsigned char *sig)
 {
     int ret;
     size_t siglen;
@@ -1880,87 +1814,83 @@ int mbedtls_rsa_rsassa_pss_verify_ext( mbedtls_rsa_context *ctx,
     mbedtls_md_context_t md_ctx;
     unsigned char buf[MBEDTLS_MPI_MAX_SIZE];
 
-    if( mode == MBEDTLS_RSA_PRIVATE && ctx->padding != MBEDTLS_RSA_PKCS_V21 )
-        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    if (mode == MBEDTLS_RSA_PRIVATE && ctx->padding != MBEDTLS_RSA_PKCS_V21)
+        return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
 
     siglen = ctx->len;
 
-    if( siglen < 16 || siglen > sizeof( buf ) )
-        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    if (siglen < 16 || siglen > sizeof(buf))
+        return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
 
-    ret = ( mode == MBEDTLS_RSA_PUBLIC )
-          ? mbedtls_rsa_public(  ctx, sig, buf )
-          : mbedtls_rsa_private( ctx, f_rng, p_rng, sig, buf );
+    ret = (mode == MBEDTLS_RSA_PUBLIC)
+          ? mbedtls_rsa_public(ctx, sig, buf)
+          : mbedtls_rsa_private(ctx, f_rng, p_rng, sig, buf);
 
-    if( ret != 0 )
-        return( ret );
+    if (ret != 0)
+        return (ret);
 
     p = buf;
 
-    if( buf[siglen - 1] != 0xBC )
-        return( MBEDTLS_ERR_RSA_INVALID_PADDING );
+    if (buf[siglen - 1] != 0xBC)
+        return (MBEDTLS_ERR_RSA_INVALID_PADDING);
 
-    if( md_alg != MBEDTLS_MD_NONE )
-    {
+    if (md_alg != MBEDTLS_MD_NONE) {
         /* Gather length of hash to sign */
-        md_info = mbedtls_md_info_from_type( md_alg );
-        if( md_info == NULL )
-            return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+        md_info = mbedtls_md_info_from_type(md_alg);
+        if (md_info == NULL)
+            return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
 
-        hashlen = mbedtls_md_get_size( md_info );
+        hashlen = mbedtls_md_get_size(md_info);
     }
 
-    md_info = mbedtls_md_info_from_type( mgf1_hash_id );
-    if( md_info == NULL )
-        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    md_info = mbedtls_md_info_from_type(mgf1_hash_id);
+    if (md_info == NULL)
+        return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
 
-    hlen = mbedtls_md_get_size( md_info );
+    hlen = mbedtls_md_get_size(md_info);
 
-    memset( zeros, 0, 8 );
+    memset(zeros, 0, 8);
 
     /*
      * Note: EMSA-PSS verification is over the length of N - 1 bits
      */
-    msb = mbedtls_mpi_bitlen( &ctx->N ) - 1;
+    msb = mbedtls_mpi_bitlen(&ctx->N) - 1;
 
-    if( buf[0] >> ( 8 - siglen * 8 + msb ) )
-        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    if (buf[0] >> (8 - siglen * 8 + msb))
+        return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
 
     /* Compensate for boundary condition when applying mask */
-    if( msb % 8 == 0 )
-    {
+    if (msb % 8 == 0) {
         p++;
         siglen -= 1;
     }
 
-    if( siglen < hlen + 2 )
-        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    if (siglen < hlen + 2)
+        return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
     hash_start = p + siglen - hlen - 1;
 
-    mbedtls_md_init( &md_ctx );
-    if( ( ret = mbedtls_md_setup( &md_ctx, md_info, 0 ) ) != 0 )
+    mbedtls_md_init(&md_ctx);
+    if ((ret = mbedtls_md_setup(&md_ctx, md_info, 0)) != 0)
         goto exit;
 
-    ret = mgf_mask( p, siglen - hlen - 1, hash_start, hlen, &md_ctx );
-    if( ret != 0 )
+    ret = mgf_mask(p, siglen - hlen - 1, hash_start, hlen, &md_ctx);
+    if (ret != 0)
         goto exit;
 
-    buf[0] &= 0xFF >> ( siglen * 8 - msb );
+    buf[0] &= 0xFF >> (siglen * 8 - msb);
 
-    while( p < hash_start - 1 && *p == 0 )
+    while (p < hash_start - 1 && *p == 0)
         p++;
 
-    if( *p++ != 0x01 )
-    {
+    if (*p++ != 0x01) {
         ret = MBEDTLS_ERR_RSA_INVALID_PADDING;
         goto exit;
     }
 
     observed_salt_len = hash_start - p;
 
-    if( expected_salt_len != MBEDTLS_RSA_SALT_LEN_ANY &&
-        observed_salt_len != (size_t) expected_salt_len )
-    {
+    if (expected_salt_len != MBEDTLS_RSA_SALT_LEN_ANY &&
+        observed_salt_len != (size_t) expected_salt_len) {
         ret = MBEDTLS_ERR_RSA_INVALID_PADDING;
         goto exit;
     }
@@ -1968,54 +1898,53 @@ int mbedtls_rsa_rsassa_pss_verify_ext( mbedtls_rsa_context *ctx,
     /*
      * Generate H = Hash( M' )
      */
-    ret = mbedtls_md_starts( &md_ctx );
-    if ( ret != 0 )
+    ret = mbedtls_md_starts(&md_ctx);
+    if (ret != 0)
         goto exit;
-    ret = mbedtls_md_update( &md_ctx, zeros, 8 );
-    if ( ret != 0 )
+    ret = mbedtls_md_update(&md_ctx, zeros, 8);
+    if (ret != 0)
         goto exit;
-    ret = mbedtls_md_update( &md_ctx, hash, hashlen );
-    if ( ret != 0 )
+    ret = mbedtls_md_update(&md_ctx, hash, hashlen);
+    if (ret != 0)
         goto exit;
-    ret = mbedtls_md_update( &md_ctx, p, observed_salt_len );
-    if ( ret != 0 )
+    ret = mbedtls_md_update(&md_ctx, p, observed_salt_len);
+    if (ret != 0)
         goto exit;
-    ret = mbedtls_md_finish( &md_ctx, result );
-    if ( ret != 0 )
+    ret = mbedtls_md_finish(&md_ctx, result);
+    if (ret != 0)
         goto exit;
 
-    if( memcmp( hash_start, result, hlen ) != 0 )
-    {
+    if (memcmp(hash_start, result, hlen) != 0) {
         ret = MBEDTLS_ERR_RSA_VERIFY_FAILED;
         goto exit;
     }
 
 exit:
-    mbedtls_md_free( &md_ctx );
+    mbedtls_md_free(&md_ctx);
 
-    return( ret );
+    return (ret);
 }
 
 /*
  * Simplified PKCS#1 v2.1 RSASSA-PSS-VERIFY function
  */
-int mbedtls_rsa_rsassa_pss_verify( mbedtls_rsa_context *ctx,
-                           int (*f_rng)(void *, unsigned char *, size_t),
-                           void *p_rng,
-                           int mode,
-                           mbedtls_md_type_t md_alg,
-                           unsigned int hashlen,
-                           const unsigned char *hash,
-                           const unsigned char *sig )
+int mbedtls_rsa_rsassa_pss_verify(mbedtls_rsa_context *ctx,
+                                  int (*f_rng)(void *, unsigned char *, size_t),
+                                  void *p_rng,
+                                  int mode,
+                                  mbedtls_md_type_t md_alg,
+                                  unsigned int hashlen,
+                                  const unsigned char *hash,
+                                  const unsigned char *sig)
 {
-    mbedtls_md_type_t mgf1_hash_id = ( ctx->hash_id != MBEDTLS_MD_NONE )
-                             ? (mbedtls_md_type_t) ctx->hash_id
-                             : md_alg;
+    mbedtls_md_type_t mgf1_hash_id = (ctx->hash_id != MBEDTLS_MD_NONE)
+                                     ? (mbedtls_md_type_t) ctx->hash_id
+                                     : md_alg;
 
-    return( mbedtls_rsa_rsassa_pss_verify_ext( ctx, f_rng, p_rng, mode,
-                                       md_alg, hashlen, hash,
-                                       mgf1_hash_id, MBEDTLS_RSA_SALT_LEN_ANY,
-                                       sig ) );
+    return (mbedtls_rsa_rsassa_pss_verify_ext(ctx, f_rng, p_rng, mode,
+                                              md_alg, hashlen, hash,
+                                              mgf1_hash_id, MBEDTLS_RSA_SALT_LEN_ANY,
+                                              sig));
 
 }
 #endif /* MBEDTLS_PKCS1_V21 */
@@ -2024,165 +1953,166 @@ int mbedtls_rsa_rsassa_pss_verify( mbedtls_rsa_context *ctx,
 /*
  * Implementation of the PKCS#1 v2.1 RSASSA-PKCS1-v1_5-VERIFY function
  */
-int mbedtls_rsa_rsassa_pkcs1_v15_verify( mbedtls_rsa_context *ctx,
-                                 int (*f_rng)(void *, unsigned char *, size_t),
-                                 void *p_rng,
-                                 int mode,
-                                 mbedtls_md_type_t md_alg,
-                                 unsigned int hashlen,
-                                 const unsigned char *hash,
-                                 const unsigned char *sig )
+int mbedtls_rsa_rsassa_pkcs1_v15_verify(mbedtls_rsa_context *ctx,
+                                        int (*f_rng)(void *, unsigned char *, size_t),
+                                        void *p_rng,
+                                        int mode,
+                                        mbedtls_md_type_t md_alg,
+                                        unsigned int hashlen,
+                                        const unsigned char *hash,
+                                        const unsigned char *sig)
 {
     int ret = 0;
     const size_t sig_len = ctx->len;
     unsigned char *encoded = NULL, *encoded_expected = NULL;
 
-    if( mode == MBEDTLS_RSA_PRIVATE && ctx->padding != MBEDTLS_RSA_PKCS_V15 )
-        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    if (mode == MBEDTLS_RSA_PRIVATE && ctx->padding != MBEDTLS_RSA_PKCS_V15)
+        return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
 
     /*
      * Prepare expected PKCS1 v1.5 encoding of hash.
      */
 
-    if( ( encoded          = mbedtls_calloc( 1, sig_len ) ) == NULL ||
-        ( encoded_expected = mbedtls_calloc( 1, sig_len ) ) == NULL )
-    {
+    if ((encoded          = mbedtls_calloc(1, sig_len)) == NULL ||
+        (encoded_expected = mbedtls_calloc(1, sig_len)) == NULL) {
         ret = MBEDTLS_ERR_MPI_ALLOC_FAILED;
         goto cleanup;
     }
 
-    if( ( ret = rsa_rsassa_pkcs1_v15_encode( md_alg, hashlen, hash, sig_len,
-                                             encoded_expected ) ) != 0 )
+    if ((ret = rsa_rsassa_pkcs1_v15_encode(md_alg, hashlen, hash, sig_len,
+                                           encoded_expected)) != 0)
         goto cleanup;
 
     /*
      * Apply RSA primitive to get what should be PKCS1 encoded hash.
      */
 
-    ret = ( mode == MBEDTLS_RSA_PUBLIC )
-          ? mbedtls_rsa_public(  ctx, sig, encoded )
-          : mbedtls_rsa_private( ctx, f_rng, p_rng, sig, encoded );
-    if( ret != 0 )
+    ret = (mode == MBEDTLS_RSA_PUBLIC)
+          ? mbedtls_rsa_public(ctx, sig, encoded)
+          : mbedtls_rsa_private(ctx, f_rng, p_rng, sig, encoded);
+    if (ret != 0)
         goto cleanup;
 
     /*
      * Compare
      */
 
-    if( ( ret = mbedtls_safer_memcmp( encoded, encoded_expected,
-                                      sig_len ) ) != 0 )
-    {
+    if ((ret = mbedtls_safer_memcmp(encoded, encoded_expected,
+                                    sig_len)) != 0) {
         ret = MBEDTLS_ERR_RSA_VERIFY_FAILED;
         goto cleanup;
     }
 
 cleanup:
 
-    if( encoded != NULL )
-    {
-        mbedtls_platform_zeroize( encoded, sig_len );
-        mbedtls_free( encoded );
+    if (encoded != NULL) {
+        mbedtls_platform_zeroize(encoded, sig_len);
+        mbedtls_free(encoded);
     }
 
-    if( encoded_expected != NULL )
-    {
-        mbedtls_platform_zeroize( encoded_expected, sig_len );
-        mbedtls_free( encoded_expected );
+    if (encoded_expected != NULL) {
+        mbedtls_platform_zeroize(encoded_expected, sig_len);
+        mbedtls_free(encoded_expected);
     }
 
-    return( ret );
+    return (ret);
 }
 #endif /* MBEDTLS_PKCS1_V15 */
 
 /*
  * Do an RSA operation and check the message digest
  */
-int mbedtls_rsa_pkcs1_verify( mbedtls_rsa_context *ctx,
-                      int (*f_rng)(void *, unsigned char *, size_t),
-                      void *p_rng,
-                      int mode,
-                      mbedtls_md_type_t md_alg,
-                      unsigned int hashlen,
-                      const unsigned char *hash,
-                      const unsigned char *sig )
+int mbedtls_rsa_pkcs1_verify(mbedtls_rsa_context *ctx,
+                             int (*f_rng)(void *, unsigned char *, size_t),
+                             void *p_rng,
+                             int mode,
+                             mbedtls_md_type_t md_alg,
+                             unsigned int hashlen,
+                             const unsigned char *hash,
+                             const unsigned char *sig)
 {
-    switch( ctx->padding )
-    {
+    switch (ctx->padding) {
 #if defined(MBEDTLS_PKCS1_V15)
         case MBEDTLS_RSA_PKCS_V15:
-            return mbedtls_rsa_rsassa_pkcs1_v15_verify( ctx, f_rng, p_rng, mode, md_alg,
-                                                hashlen, hash, sig );
+            return mbedtls_rsa_rsassa_pkcs1_v15_verify(ctx, f_rng, p_rng, mode, md_alg,
+                                                       hashlen, hash, sig);
 #endif
 
 #if defined(MBEDTLS_PKCS1_V21)
         case MBEDTLS_RSA_PKCS_V21:
-            return mbedtls_rsa_rsassa_pss_verify( ctx, f_rng, p_rng, mode, md_alg,
-                                          hashlen, hash, sig );
+            return mbedtls_rsa_rsassa_pss_verify(ctx, f_rng, p_rng, mode, md_alg,
+                                                 hashlen, hash, sig);
 #endif
 
         default:
-            return( MBEDTLS_ERR_RSA_INVALID_PADDING );
+            return (MBEDTLS_ERR_RSA_INVALID_PADDING);
     }
 }
 
 /*
  * Copy the components of an RSA key
  */
-int mbedtls_rsa_copy( mbedtls_rsa_context *dst, const mbedtls_rsa_context *src )
+int mbedtls_rsa_copy(mbedtls_rsa_context *dst, const mbedtls_rsa_context *src)
 {
     int ret;
 
     dst->ver = src->ver;
     dst->len = src->len;
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &dst->N, &src->N ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &dst->E, &src->E ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_copy(&dst->N, &src->N));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_copy(&dst->E, &src->E));
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &dst->D, &src->D ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &dst->P, &src->P ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &dst->Q, &src->Q ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_copy(&dst->D, &src->D));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_copy(&dst->P, &src->P));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_copy(&dst->Q, &src->Q));
 
 #if !defined(MBEDTLS_RSA_NO_CRT)
-    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &dst->DP, &src->DP ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &dst->DQ, &src->DQ ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &dst->QP, &src->QP ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &dst->RP, &src->RP ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &dst->RQ, &src->RQ ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_copy(&dst->DP, &src->DP));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_copy(&dst->DQ, &src->DQ));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_copy(&dst->QP, &src->QP));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_copy(&dst->RP, &src->RP));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_copy(&dst->RQ, &src->RQ));
 #endif
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &dst->RN, &src->RN ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_copy(&dst->RN, &src->RN));
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &dst->Vi, &src->Vi ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &dst->Vf, &src->Vf ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_copy(&dst->Vi, &src->Vi));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_copy(&dst->Vf, &src->Vf));
 
     dst->padding = src->padding;
     dst->hash_id = src->hash_id;
 
 cleanup:
-    if( ret != 0 )
-        mbedtls_rsa_free( dst );
+    if (ret != 0)
+        mbedtls_rsa_free(dst);
 
-    return( ret );
+    return (ret);
 }
 
 /*
  * Free the components of an RSA key
  */
-void mbedtls_rsa_free( mbedtls_rsa_context *ctx )
+void mbedtls_rsa_free(mbedtls_rsa_context *ctx)
 {
-    mbedtls_mpi_free( &ctx->Vi ); mbedtls_mpi_free( &ctx->Vf );
-    mbedtls_mpi_free( &ctx->RN ); mbedtls_mpi_free( &ctx->D  );
-    mbedtls_mpi_free( &ctx->Q  ); mbedtls_mpi_free( &ctx->P  );
-    mbedtls_mpi_free( &ctx->E  ); mbedtls_mpi_free( &ctx->N  );
+    mbedtls_mpi_free(&ctx->Vi);
+    mbedtls_mpi_free(&ctx->Vf);
+    mbedtls_mpi_free(&ctx->RN);
+    mbedtls_mpi_free(&ctx->D);
+    mbedtls_mpi_free(&ctx->Q);
+    mbedtls_mpi_free(&ctx->P);
+    mbedtls_mpi_free(&ctx->E);
+    mbedtls_mpi_free(&ctx->N);
 
 #if !defined(MBEDTLS_RSA_NO_CRT)
-    mbedtls_mpi_free( &ctx->RQ ); mbedtls_mpi_free( &ctx->RP );
-    mbedtls_mpi_free( &ctx->QP ); mbedtls_mpi_free( &ctx->DQ );
-    mbedtls_mpi_free( &ctx->DP );
+    mbedtls_mpi_free(&ctx->RQ);
+    mbedtls_mpi_free(&ctx->RP);
+    mbedtls_mpi_free(&ctx->QP);
+    mbedtls_mpi_free(&ctx->DQ);
+    mbedtls_mpi_free(&ctx->DP);
 #endif /* MBEDTLS_RSA_NO_CRT */
 
 #if defined(MBEDTLS_THREADING_C)
-    mbedtls_mutex_free( &ctx->mutex );
+    mbedtls_mutex_free(&ctx->mutex);
 #endif
 }
 
@@ -2198,65 +2128,65 @@ void mbedtls_rsa_free( mbedtls_rsa_context *ctx )
 #define KEY_LEN 128
 
 #define RSA_N   "9292758453063D803DD603D5E777D788" \
-                "8ED1D5BF35786190FA2F23EBC0848AEA" \
-                "DDA92CA6C3D80B32C4D109BE0F36D6AE" \
-                "7130B9CED7ACDF54CFC7555AC14EEBAB" \
-                "93A89813FBF3C4F8066D2D800F7C38A8" \
-                "1AE31942917403FF4946B0A83D3D3E05" \
-                "EE57C6F5F5606FB5D4BC6CD34EE0801A" \
-                "5E94BB77B07507233A0BC7BAC8F90F79"
+    "8ED1D5BF35786190FA2F23EBC0848AEA" \
+    "DDA92CA6C3D80B32C4D109BE0F36D6AE" \
+    "7130B9CED7ACDF54CFC7555AC14EEBAB" \
+    "93A89813FBF3C4F8066D2D800F7C38A8" \
+    "1AE31942917403FF4946B0A83D3D3E05" \
+    "EE57C6F5F5606FB5D4BC6CD34EE0801A" \
+    "5E94BB77B07507233A0BC7BAC8F90F79"
 
 #define RSA_E   "10001"
 
 #define RSA_D   "24BF6185468786FDD303083D25E64EFC" \
-                "66CA472BC44D253102F8B4A9D3BFA750" \
-                "91386C0077937FE33FA3252D28855837" \
-                "AE1B484A8A9A45F7EE8C0C634F99E8CD" \
-                "DF79C5CE07EE72C7F123142198164234" \
-                "CABB724CF78B8173B9F880FC86322407" \
-                "AF1FEDFDDE2BEB674CA15F3E81A1521E" \
-                "071513A1E85B5DFA031F21ECAE91A34D"
+    "66CA472BC44D253102F8B4A9D3BFA750" \
+    "91386C0077937FE33FA3252D28855837" \
+    "AE1B484A8A9A45F7EE8C0C634F99E8CD" \
+    "DF79C5CE07EE72C7F123142198164234" \
+    "CABB724CF78B8173B9F880FC86322407" \
+    "AF1FEDFDDE2BEB674CA15F3E81A1521E" \
+    "071513A1E85B5DFA031F21ECAE91A34D"
 
 #define RSA_P   "C36D0EB7FCD285223CFB5AABA5BDA3D8" \
-                "2C01CAD19EA484A87EA4377637E75500" \
-                "FCB2005C5C7DD6EC4AC023CDA285D796" \
-                "C3D9E75E1EFC42488BB4F1D13AC30A57"
+    "2C01CAD19EA484A87EA4377637E75500" \
+    "FCB2005C5C7DD6EC4AC023CDA285D796" \
+    "C3D9E75E1EFC42488BB4F1D13AC30A57"
 
 #define RSA_Q   "C000DF51A7C77AE8D7C7370C1FF55B69" \
-                "E211C2B9E5DB1ED0BF61D0D9899620F4" \
-                "910E4168387E3C30AA1E00C339A79508" \
-                "8452DD96A9A5EA5D9DCA68DA636032AF"
+    "E211C2B9E5DB1ED0BF61D0D9899620F4" \
+    "910E4168387E3C30AA1E00C339A79508" \
+    "8452DD96A9A5EA5D9DCA68DA636032AF"
 
 #define PT_LEN  24
 #define RSA_PT  "\xAA\xBB\xCC\x03\x02\x01\x00\xFF\xFF\xFF\xFF\xFF" \
-                "\x11\x22\x33\x0A\x0B\x0C\xCC\xDD\xDD\xDD\xDD\xDD"
+    "\x11\x22\x33\x0A\x0B\x0C\xCC\xDD\xDD\xDD\xDD\xDD"
 
 #if defined(MBEDTLS_PKCS1_V15)
-static int myrand( void *rng_state, unsigned char *output, size_t len )
+static int myrand(void *rng_state, unsigned char *output, size_t len)
 {
 #if !defined(__OpenBSD__)
     size_t i;
 
-    if( rng_state != NULL )
+    if (rng_state != NULL)
         rng_state  = NULL;
 
-    for( i = 0; i < len; ++i )
+    for (i = 0; i < len; ++i)
         output[i] = rand();
 #else
-    if( rng_state != NULL )
+    if (rng_state != NULL)
         rng_state = NULL;
 
-    arc4random_buf( output, len );
+    arc4random_buf(output, len);
 #endif /* !OpenBSD */
 
-    return( 0 );
+    return (0);
 }
 #endif /* MBEDTLS_PKCS1_V15 */
 
 /*
  * Checkup routine
  */
-int mbedtls_rsa_self_test( int verbose )
+int mbedtls_rsa_self_test(int verbose)
 {
     int ret = 0;
 #if defined(MBEDTLS_PKCS1_V15)
@@ -2271,128 +2201,121 @@ int mbedtls_rsa_self_test( int verbose )
 
     mbedtls_mpi K;
 
-    mbedtls_mpi_init( &K );
-    mbedtls_rsa_init( &rsa, MBEDTLS_RSA_PKCS_V15, 0 );
+    mbedtls_mpi_init(&K);
+    mbedtls_rsa_init(&rsa, MBEDTLS_RSA_PKCS_V15, 0);
 
-    MBEDTLS_MPI_CHK( mbedtls_mpi_read_string( &K, 16, RSA_N  ) );
-    MBEDTLS_MPI_CHK( mbedtls_rsa_import( &rsa, &K, NULL, NULL, NULL, NULL ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_read_string( &K, 16, RSA_P  ) );
-    MBEDTLS_MPI_CHK( mbedtls_rsa_import( &rsa, NULL, &K, NULL, NULL, NULL ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_read_string( &K, 16, RSA_Q  ) );
-    MBEDTLS_MPI_CHK( mbedtls_rsa_import( &rsa, NULL, NULL, &K, NULL, NULL ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_read_string( &K, 16, RSA_D  ) );
-    MBEDTLS_MPI_CHK( mbedtls_rsa_import( &rsa, NULL, NULL, NULL, &K, NULL ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_read_string( &K, 16, RSA_E  ) );
-    MBEDTLS_MPI_CHK( mbedtls_rsa_import( &rsa, NULL, NULL, NULL, NULL, &K ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_read_string(&K, 16, RSA_N));
+    MBEDTLS_MPI_CHK(mbedtls_rsa_import(&rsa, &K, NULL, NULL, NULL, NULL));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_read_string(&K, 16, RSA_P));
+    MBEDTLS_MPI_CHK(mbedtls_rsa_import(&rsa, NULL, &K, NULL, NULL, NULL));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_read_string(&K, 16, RSA_Q));
+    MBEDTLS_MPI_CHK(mbedtls_rsa_import(&rsa, NULL, NULL, &K, NULL, NULL));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_read_string(&K, 16, RSA_D));
+    MBEDTLS_MPI_CHK(mbedtls_rsa_import(&rsa, NULL, NULL, NULL, &K, NULL));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_read_string(&K, 16, RSA_E));
+    MBEDTLS_MPI_CHK(mbedtls_rsa_import(&rsa, NULL, NULL, NULL, NULL, &K));
 
-    MBEDTLS_MPI_CHK( mbedtls_rsa_complete( &rsa ) );
+    MBEDTLS_MPI_CHK(mbedtls_rsa_complete(&rsa));
 
-    if( verbose != 0 )
-        mbedtls_printf( "  RSA key validation: " );
+    if (verbose != 0)
+        mbedtls_printf("  RSA key validation: ");
 
-    if( mbedtls_rsa_check_pubkey(  &rsa ) != 0 ||
-        mbedtls_rsa_check_privkey( &rsa ) != 0 )
-    {
-        if( verbose != 0 )
-            mbedtls_printf( "failed\n" );
+    if (mbedtls_rsa_check_pubkey(&rsa) != 0 ||
+        mbedtls_rsa_check_privkey(&rsa) != 0) {
+        if (verbose != 0)
+            mbedtls_printf("failed\n");
 
         ret = 1;
         goto cleanup;
     }
 
-    if( verbose != 0 )
-        mbedtls_printf( "passed\n  PKCS#1 encryption : " );
+    if (verbose != 0)
+        mbedtls_printf("passed\n  PKCS#1 encryption : ");
 
-    memcpy( rsa_plaintext, RSA_PT, PT_LEN );
+    memcpy(rsa_plaintext, RSA_PT, PT_LEN);
 
-    if( mbedtls_rsa_pkcs1_encrypt( &rsa, myrand, NULL, MBEDTLS_RSA_PUBLIC,
-                                   PT_LEN, rsa_plaintext,
-                                   rsa_ciphertext ) != 0 )
-    {
-        if( verbose != 0 )
-            mbedtls_printf( "failed\n" );
+    if (mbedtls_rsa_pkcs1_encrypt(&rsa, myrand, NULL, MBEDTLS_RSA_PUBLIC,
+                                  PT_LEN, rsa_plaintext,
+                                  rsa_ciphertext) != 0) {
+        if (verbose != 0)
+            mbedtls_printf("failed\n");
 
         ret = 1;
         goto cleanup;
     }
 
-    if( verbose != 0 )
-        mbedtls_printf( "passed\n  PKCS#1 decryption : " );
+    if (verbose != 0)
+        mbedtls_printf("passed\n  PKCS#1 decryption : ");
 
-    if( mbedtls_rsa_pkcs1_decrypt( &rsa, myrand, NULL, MBEDTLS_RSA_PRIVATE,
-                                   &len, rsa_ciphertext, rsa_decrypted,
-                                   sizeof(rsa_decrypted) ) != 0 )
-    {
-        if( verbose != 0 )
-            mbedtls_printf( "failed\n" );
+    if (mbedtls_rsa_pkcs1_decrypt(&rsa, myrand, NULL, MBEDTLS_RSA_PRIVATE,
+                                  &len, rsa_ciphertext, rsa_decrypted,
+                                  sizeof(rsa_decrypted)) != 0) {
+        if (verbose != 0)
+            mbedtls_printf("failed\n");
 
         ret = 1;
         goto cleanup;
     }
 
-    if( memcmp( rsa_decrypted, rsa_plaintext, len ) != 0 )
-    {
-        if( verbose != 0 )
-            mbedtls_printf( "failed\n" );
+    if (memcmp(rsa_decrypted, rsa_plaintext, len) != 0) {
+        if (verbose != 0)
+            mbedtls_printf("failed\n");
 
         ret = 1;
         goto cleanup;
     }
 
-    if( verbose != 0 )
-        mbedtls_printf( "passed\n" );
+    if (verbose != 0)
+        mbedtls_printf("passed\n");
 
 #if defined(MBEDTLS_SHA1_C)
-    if( verbose != 0 )
-        mbedtls_printf( "  PKCS#1 data sign  : " );
+    if (verbose != 0)
+        mbedtls_printf("  PKCS#1 data sign  : ");
 
-    if( mbedtls_sha1_ret( rsa_plaintext, PT_LEN, sha1sum ) != 0 )
-    {
-        if( verbose != 0 )
-            mbedtls_printf( "failed\n" );
+    if (mbedtls_sha1_ret(rsa_plaintext, PT_LEN, sha1sum) != 0) {
+        if (verbose != 0)
+            mbedtls_printf("failed\n");
 
-        return( 1 );
+        return (1);
     }
 
-    if( mbedtls_rsa_pkcs1_sign( &rsa, myrand, NULL,
-                                MBEDTLS_RSA_PRIVATE, MBEDTLS_MD_SHA1, 0,
-                                sha1sum, rsa_ciphertext ) != 0 )
-    {
-        if( verbose != 0 )
-            mbedtls_printf( "failed\n" );
+    if (mbedtls_rsa_pkcs1_sign(&rsa, myrand, NULL,
+                               MBEDTLS_RSA_PRIVATE, MBEDTLS_MD_SHA1, 0,
+                               sha1sum, rsa_ciphertext) != 0) {
+        if (verbose != 0)
+            mbedtls_printf("failed\n");
 
         ret = 1;
         goto cleanup;
     }
 
-    if( verbose != 0 )
-        mbedtls_printf( "passed\n  PKCS#1 sig. verify: " );
+    if (verbose != 0)
+        mbedtls_printf("passed\n  PKCS#1 sig. verify: ");
 
-    if( mbedtls_rsa_pkcs1_verify( &rsa, NULL, NULL,
-                                  MBEDTLS_RSA_PUBLIC, MBEDTLS_MD_SHA1, 0,
-                                  sha1sum, rsa_ciphertext ) != 0 )
-    {
-        if( verbose != 0 )
-            mbedtls_printf( "failed\n" );
+    if (mbedtls_rsa_pkcs1_verify(&rsa, NULL, NULL,
+                                 MBEDTLS_RSA_PUBLIC, MBEDTLS_MD_SHA1, 0,
+                                 sha1sum, rsa_ciphertext) != 0) {
+        if (verbose != 0)
+            mbedtls_printf("failed\n");
 
         ret = 1;
         goto cleanup;
     }
 
-    if( verbose != 0 )
-        mbedtls_printf( "passed\n" );
+    if (verbose != 0)
+        mbedtls_printf("passed\n");
 #endif /* MBEDTLS_SHA1_C */
 
-    if( verbose != 0 )
-        mbedtls_printf( "\n" );
+    if (verbose != 0)
+        mbedtls_printf("\n");
 
 cleanup:
-    mbedtls_mpi_free( &K );
-    mbedtls_rsa_free( &rsa );
+    mbedtls_mpi_free(&K);
+    mbedtls_rsa_free(&rsa);
 #else /* MBEDTLS_PKCS1_V15 */
     ((void) verbose);
 #endif /* MBEDTLS_PKCS1_V15 */
-    return( ret );
+    return (ret);
 }
 
 #endif /* MBEDTLS_SELF_TEST */
diff --git a/common/mbedtls/rsa.h b/common/mbedtls/rsa.h
index 7be7863c8..3972d961f 100644
--- a/common/mbedtls/rsa.h
+++ b/common/mbedtls/rsa.h
@@ -94,8 +94,7 @@ extern "C" {
  *          is deprecated. All manipulation should instead be done through
  *          the public interface functions.
  */
-typedef struct mbedtls_rsa_context
-{
+typedef struct mbedtls_rsa_context {
     int ver;                    /*!<  Always 0.*/
     size_t len;                 /*!<  The size of \p N in Bytes. */
 
@@ -161,9 +160,9 @@ mbedtls_rsa_context;
  * \param hash_id  The hash identifier of #mbedtls_md_type_t type, if
  *                 \p padding is #MBEDTLS_RSA_PKCS_V21.
  */
-void mbedtls_rsa_init( mbedtls_rsa_context *ctx,
-                       int padding,
-                       int hash_id);
+void mbedtls_rsa_init(mbedtls_rsa_context *ctx,
+                      int padding,
+                      int hash_id);
 
 /**
  * \brief          This function imports a set of core parameters into an
@@ -194,10 +193,10 @@ void mbedtls_rsa_init( mbedtls_rsa_context *ctx,
  * \return         \c 0 on success.
  * \return         A non-zero error code on failure.
  */
-int mbedtls_rsa_import( mbedtls_rsa_context *ctx,
-                        const mbedtls_mpi *N,
-                        const mbedtls_mpi *P, const mbedtls_mpi *Q,
-                        const mbedtls_mpi *D, const mbedtls_mpi *E );
+int mbedtls_rsa_import(mbedtls_rsa_context *ctx,
+                       const mbedtls_mpi *N,
+                       const mbedtls_mpi *P, const mbedtls_mpi *Q,
+                       const mbedtls_mpi *D, const mbedtls_mpi *E);
 
 /**
  * \brief          This function imports core RSA parameters, in raw big-endian
@@ -233,12 +232,12 @@ int mbedtls_rsa_import( mbedtls_rsa_context *ctx,
  * \return         \c 0 on success.
  * \return         A non-zero error code on failure.
  */
-int mbedtls_rsa_import_raw( mbedtls_rsa_context *ctx,
-                            unsigned char const *N, size_t N_len,
-                            unsigned char const *P, size_t P_len,
-                            unsigned char const *Q, size_t Q_len,
-                            unsigned char const *D, size_t D_len,
-                            unsigned char const *E, size_t E_len );
+int mbedtls_rsa_import_raw(mbedtls_rsa_context *ctx,
+                           unsigned char const *N, size_t N_len,
+                           unsigned char const *P, size_t P_len,
+                           unsigned char const *Q, size_t Q_len,
+                           unsigned char const *D, size_t D_len,
+                           unsigned char const *E, size_t E_len);
 
 /**
  * \brief          This function completes an RSA context from
@@ -272,7 +271,7 @@ int mbedtls_rsa_import_raw( mbedtls_rsa_context *ctx,
  *                 failed.
  *
  */
-int mbedtls_rsa_complete( mbedtls_rsa_context *ctx );
+int mbedtls_rsa_complete(mbedtls_rsa_context *ctx);
 
 /**
  * \brief          This function exports the core parameters of an RSA key.
@@ -309,9 +308,9 @@ int mbedtls_rsa_complete( mbedtls_rsa_context *ctx );
  * \return         A non-zero return code on any other failure.
  *
  */
-int mbedtls_rsa_export( const mbedtls_rsa_context *ctx,
-                        mbedtls_mpi *N, mbedtls_mpi *P, mbedtls_mpi *Q,
-                        mbedtls_mpi *D, mbedtls_mpi *E );
+int mbedtls_rsa_export(const mbedtls_rsa_context *ctx,
+                       mbedtls_mpi *N, mbedtls_mpi *P, mbedtls_mpi *Q,
+                       mbedtls_mpi *D, mbedtls_mpi *E);
 
 /**
  * \brief          This function exports core parameters of an RSA key
@@ -357,12 +356,12 @@ int mbedtls_rsa_export( const mbedtls_rsa_context *ctx,
  *                 functionality or because of security policies.
  * \return         A non-zero return code on any other failure.
  */
-int mbedtls_rsa_export_raw( const mbedtls_rsa_context *ctx,
-                            unsigned char *N, size_t N_len,
-                            unsigned char *P, size_t P_len,
-                            unsigned char *Q, size_t Q_len,
-                            unsigned char *D, size_t D_len,
-                            unsigned char *E, size_t E_len );
+int mbedtls_rsa_export_raw(const mbedtls_rsa_context *ctx,
+                           unsigned char *N, size_t N_len,
+                           unsigned char *P, size_t P_len,
+                           unsigned char *Q, size_t Q_len,
+                           unsigned char *D, size_t D_len,
+                           unsigned char *E, size_t E_len);
 
 /**
  * \brief          This function exports CRT parameters of a private RSA key.
@@ -380,8 +379,8 @@ int mbedtls_rsa_export_raw( const mbedtls_rsa_context *ctx,
  * \return         A non-zero error code on failure.
  *
  */
-int mbedtls_rsa_export_crt( const mbedtls_rsa_context *ctx,
-                            mbedtls_mpi *DP, mbedtls_mpi *DQ, mbedtls_mpi *QP );
+int mbedtls_rsa_export_crt(const mbedtls_rsa_context *ctx,
+                           mbedtls_mpi *DP, mbedtls_mpi *DQ, mbedtls_mpi *QP);
 
 /**
  * \brief          This function sets padding for an already initialized RSA
@@ -392,8 +391,8 @@ int mbedtls_rsa_export_crt( const mbedtls_rsa_context *ctx,
  *                 #MBEDTLS_RSA_PKCS_V21.
  * \param hash_id  The #MBEDTLS_RSA_PKCS_V21 hash identifier.
  */
-void mbedtls_rsa_set_padding( mbedtls_rsa_context *ctx, int padding,
-                              int hash_id);
+void mbedtls_rsa_set_padding(mbedtls_rsa_context *ctx, int padding,
+                             int hash_id);
 
 /**
  * \brief          This function retrieves the length of RSA modulus in Bytes.
@@ -403,7 +402,7 @@ void mbedtls_rsa_set_padding( mbedtls_rsa_context *ctx, int padding,
  * \return         The length of the RSA modulus in Bytes.
  *
  */
-size_t mbedtls_rsa_get_len( const mbedtls_rsa_context *ctx );
+size_t mbedtls_rsa_get_len(const mbedtls_rsa_context *ctx);
 
 /**
  * \brief          This function generates an RSA keypair.
@@ -420,10 +419,10 @@ size_t mbedtls_rsa_get_len( const mbedtls_rsa_context *ctx );
  * \return         \c 0 on success.
  * \return         An \c MBEDTLS_ERR_RSA_XXX error code on failure.
  */
-int mbedtls_rsa_gen_key( mbedtls_rsa_context *ctx,
-                         int (*f_rng)(void *, unsigned char *, size_t),
-                         void *p_rng,
-                         unsigned int nbits, int exponent );
+int mbedtls_rsa_gen_key(mbedtls_rsa_context *ctx,
+                        int (*f_rng)(void *, unsigned char *, size_t),
+                        void *p_rng,
+                        unsigned int nbits, int exponent);
 
 /**
  * \brief          This function checks if a context contains at least an RSA
@@ -439,7 +438,7 @@ int mbedtls_rsa_gen_key( mbedtls_rsa_context *ctx,
  * \return         An \c MBEDTLS_ERR_RSA_XXX error code on failure.
  *
  */
-int mbedtls_rsa_check_pubkey( const mbedtls_rsa_context *ctx );
+int mbedtls_rsa_check_pubkey(const mbedtls_rsa_context *ctx);
 
 /**
  * \brief      This function checks if a context contains an RSA private key
@@ -477,7 +476,7 @@ int mbedtls_rsa_check_pubkey( const mbedtls_rsa_context *ctx );
  * \return     \c 0 on success.
  * \return     An \c MBEDTLS_ERR_RSA_XXX error code on failure.
  */
-int mbedtls_rsa_check_privkey( const mbedtls_rsa_context *ctx );
+int mbedtls_rsa_check_privkey(const mbedtls_rsa_context *ctx);
 
 /**
  * \brief          This function checks a public-private RSA key pair.
@@ -490,8 +489,8 @@ int mbedtls_rsa_check_privkey( const mbedtls_rsa_context *ctx );
  * \return         \c 0 on success.
  * \return         An \c MBEDTLS_ERR_RSA_XXX error code on failure.
  */
-int mbedtls_rsa_check_pub_priv( const mbedtls_rsa_context *pub,
-                                const mbedtls_rsa_context *prv );
+int mbedtls_rsa_check_pub_priv(const mbedtls_rsa_context *pub,
+                               const mbedtls_rsa_context *prv);
 
 /**
  * \brief          This function performs an RSA public key operation.
@@ -511,9 +510,9 @@ int mbedtls_rsa_check_pub_priv( const mbedtls_rsa_context *pub,
  * \return         \c 0 on success.
  * \return         An \c MBEDTLS_ERR_RSA_XXX error code on failure.
  */
-int mbedtls_rsa_public( mbedtls_rsa_context *ctx,
-                const unsigned char *input,
-                unsigned char *output );
+int mbedtls_rsa_public(mbedtls_rsa_context *ctx,
+                       const unsigned char *input,
+                       unsigned char *output);
 
 /**
  * \brief          This function performs an RSA private key operation.
@@ -542,11 +541,11 @@ int mbedtls_rsa_public( mbedtls_rsa_context *ctx,
  * \return         An \c MBEDTLS_ERR_RSA_XXX error code on failure.
  *
  */
-int mbedtls_rsa_private( mbedtls_rsa_context *ctx,
-                 int (*f_rng)(void *, unsigned char *, size_t),
-                 void *p_rng,
-                 const unsigned char *input,
-                 unsigned char *output );
+int mbedtls_rsa_private(mbedtls_rsa_context *ctx,
+                        int (*f_rng)(void *, unsigned char *, size_t),
+                        void *p_rng,
+                        const unsigned char *input,
+                        unsigned char *output);
 
 /**
  * \brief          This function adds the message padding, then performs an RSA
@@ -579,12 +578,12 @@ int mbedtls_rsa_private( mbedtls_rsa_context *ctx,
  * \return         \c 0 on success.
  * \return         An \c MBEDTLS_ERR_RSA_XXX error code on failure.
  */
-int mbedtls_rsa_pkcs1_encrypt( mbedtls_rsa_context *ctx,
-                       int (*f_rng)(void *, unsigned char *, size_t),
-                       void *p_rng,
-                       int mode, size_t ilen,
-                       const unsigned char *input,
-                       unsigned char *output );
+int mbedtls_rsa_pkcs1_encrypt(mbedtls_rsa_context *ctx,
+                              int (*f_rng)(void *, unsigned char *, size_t),
+                              void *p_rng,
+                              int mode, size_t ilen,
+                              const unsigned char *input,
+                              unsigned char *output);
 
 /**
  * \brief          This function performs a PKCS#1 v1.5 encryption operation
@@ -614,12 +613,12 @@ int mbedtls_rsa_pkcs1_encrypt( mbedtls_rsa_context *ctx,
  * \return         \c 0 on success.
  * \return         An \c MBEDTLS_ERR_RSA_XXX error code on failure.
  */
-int mbedtls_rsa_rsaes_pkcs1_v15_encrypt( mbedtls_rsa_context *ctx,
-                                 int (*f_rng)(void *, unsigned char *, size_t),
-                                 void *p_rng,
-                                 int mode, size_t ilen,
-                                 const unsigned char *input,
-                                 unsigned char *output );
+int mbedtls_rsa_rsaes_pkcs1_v15_encrypt(mbedtls_rsa_context *ctx,
+                                        int (*f_rng)(void *, unsigned char *, size_t),
+                                        void *p_rng,
+                                        int mode, size_t ilen,
+                                        const unsigned char *input,
+                                        unsigned char *output);
 
 /**
  * \brief            This function performs a PKCS#1 v2.1 OAEP encryption
@@ -651,14 +650,14 @@ int mbedtls_rsa_rsaes_pkcs1_v15_encrypt( mbedtls_rsa_context *ctx,
  * \return           \c 0 on success.
  * \return           An \c MBEDTLS_ERR_RSA_XXX error code on failure.
  */
-int mbedtls_rsa_rsaes_oaep_encrypt( mbedtls_rsa_context *ctx,
-                            int (*f_rng)(void *, unsigned char *, size_t),
-                            void *p_rng,
-                            int mode,
-                            const unsigned char *label, size_t label_len,
-                            size_t ilen,
-                            const unsigned char *input,
-                            unsigned char *output );
+int mbedtls_rsa_rsaes_oaep_encrypt(mbedtls_rsa_context *ctx,
+                                   int (*f_rng)(void *, unsigned char *, size_t),
+                                   void *p_rng,
+                                   int mode,
+                                   const unsigned char *label, size_t label_len,
+                                   size_t ilen,
+                                   const unsigned char *input,
+                                   unsigned char *output);
 
 /**
  * \brief          This function performs an RSA operation, then removes the
@@ -698,13 +697,13 @@ int mbedtls_rsa_rsaes_oaep_encrypt( mbedtls_rsa_context *ctx,
  * \return         \c 0 on success.
  * \return         An \c MBEDTLS_ERR_RSA_XXX error code on failure.
  */
-int mbedtls_rsa_pkcs1_decrypt( mbedtls_rsa_context *ctx,
-                       int (*f_rng)(void *, unsigned char *, size_t),
-                       void *p_rng,
-                       int mode, size_t *olen,
-                       const unsigned char *input,
-                       unsigned char *output,
-                       size_t output_max_len );
+int mbedtls_rsa_pkcs1_decrypt(mbedtls_rsa_context *ctx,
+                              int (*f_rng)(void *, unsigned char *, size_t),
+                              void *p_rng,
+                              int mode, size_t *olen,
+                              const unsigned char *input,
+                              unsigned char *output,
+                              size_t output_max_len);
 
 /**
  * \brief          This function performs a PKCS#1 v1.5 decryption
@@ -742,13 +741,13 @@ int mbedtls_rsa_pkcs1_decrypt( mbedtls_rsa_context *ctx,
  * \return         An \c MBEDTLS_ERR_RSA_XXX error code on failure.
  *
  */
-int mbedtls_rsa_rsaes_pkcs1_v15_decrypt( mbedtls_rsa_context *ctx,
-                                 int (*f_rng)(void *, unsigned char *, size_t),
-                                 void *p_rng,
-                                 int mode, size_t *olen,
-                                 const unsigned char *input,
-                                 unsigned char *output,
-                                 size_t output_max_len );
+int mbedtls_rsa_rsaes_pkcs1_v15_decrypt(mbedtls_rsa_context *ctx,
+                                        int (*f_rng)(void *, unsigned char *, size_t),
+                                        void *p_rng,
+                                        int mode, size_t *olen,
+                                        const unsigned char *input,
+                                        unsigned char *output,
+                                        size_t output_max_len);
 
 /**
  * \brief            This function performs a PKCS#1 v2.1 OAEP decryption
@@ -788,15 +787,15 @@ int mbedtls_rsa_rsaes_pkcs1_v15_decrypt( mbedtls_rsa_context *ctx,
  * \return         \c 0 on success.
  * \return         An \c MBEDTLS_ERR_RSA_XXX error code on failure.
  */
-int mbedtls_rsa_rsaes_oaep_decrypt( mbedtls_rsa_context *ctx,
-                            int (*f_rng)(void *, unsigned char *, size_t),
-                            void *p_rng,
-                            int mode,
-                            const unsigned char *label, size_t label_len,
-                            size_t *olen,
-                            const unsigned char *input,
-                            unsigned char *output,
-                            size_t output_max_len );
+int mbedtls_rsa_rsaes_oaep_decrypt(mbedtls_rsa_context *ctx,
+                                   int (*f_rng)(void *, unsigned char *, size_t),
+                                   void *p_rng,
+                                   int mode,
+                                   const unsigned char *label, size_t label_len,
+                                   size_t *olen,
+                                   const unsigned char *input,
+                                   unsigned char *output,
+                                   size_t output_max_len);
 
 /**
  * \brief          This function performs a private RSA operation to sign
@@ -835,14 +834,14 @@ int mbedtls_rsa_rsaes_oaep_decrypt( mbedtls_rsa_context *ctx,
  * \return         \c 0 if the signing operation was successful.
  * \return         An \c MBEDTLS_ERR_RSA_XXX error code on failure.
  */
-int mbedtls_rsa_pkcs1_sign( mbedtls_rsa_context *ctx,
-                    int (*f_rng)(void *, unsigned char *, size_t),
-                    void *p_rng,
-                    int mode,
-                    mbedtls_md_type_t md_alg,
-                    unsigned int hashlen,
-                    const unsigned char *hash,
-                    unsigned char *sig );
+int mbedtls_rsa_pkcs1_sign(mbedtls_rsa_context *ctx,
+                           int (*f_rng)(void *, unsigned char *, size_t),
+                           void *p_rng,
+                           int mode,
+                           mbedtls_md_type_t md_alg,
+                           unsigned int hashlen,
+                           const unsigned char *hash,
+                           unsigned char *sig);
 
 /**
  * \brief          This function performs a PKCS#1 v1.5 signature
@@ -873,14 +872,14 @@ int mbedtls_rsa_pkcs1_sign( mbedtls_rsa_context *ctx,
  * \return         \c 0 if the signing operation was successful.
  * \return         An \c MBEDTLS_ERR_RSA_XXX error code on failure.
  */
-int mbedtls_rsa_rsassa_pkcs1_v15_sign( mbedtls_rsa_context *ctx,
-                               int (*f_rng)(void *, unsigned char *, size_t),
-                               void *p_rng,
-                               int mode,
-                               mbedtls_md_type_t md_alg,
-                               unsigned int hashlen,
-                               const unsigned char *hash,
-                               unsigned char *sig );
+int mbedtls_rsa_rsassa_pkcs1_v15_sign(mbedtls_rsa_context *ctx,
+                                      int (*f_rng)(void *, unsigned char *, size_t),
+                                      void *p_rng,
+                                      int mode,
+                                      mbedtls_md_type_t md_alg,
+                                      unsigned int hashlen,
+                                      const unsigned char *hash,
+                                      unsigned char *sig);
 
 /**
  * \brief          This function performs a PKCS#1 v2.1 PSS signature
@@ -919,14 +918,14 @@ int mbedtls_rsa_rsassa_pkcs1_v15_sign( mbedtls_rsa_context *ctx,
  * \return         \c 0 if the signing operation was successful.
  * \return         An \c MBEDTLS_ERR_RSA_XXX error code on failure.
  */
-int mbedtls_rsa_rsassa_pss_sign( mbedtls_rsa_context *ctx,
-                         int (*f_rng)(void *, unsigned char *, size_t),
-                         void *p_rng,
-                         int mode,
-                         mbedtls_md_type_t md_alg,
-                         unsigned int hashlen,
-                         const unsigned char *hash,
-                         unsigned char *sig );
+int mbedtls_rsa_rsassa_pss_sign(mbedtls_rsa_context *ctx,
+                                int (*f_rng)(void *, unsigned char *, size_t),
+                                void *p_rng,
+                                int mode,
+                                mbedtls_md_type_t md_alg,
+                                unsigned int hashlen,
+                                const unsigned char *hash,
+                                unsigned char *sig);
 
 /**
  * \brief          This function performs a public RSA operation and checks
@@ -964,14 +963,14 @@ int mbedtls_rsa_rsassa_pss_sign( mbedtls_rsa_context *ctx,
  * \return         \c 0 if the verify operation was successful.
  * \return         An \c MBEDTLS_ERR_RSA_XXX error code on failure.
  */
-int mbedtls_rsa_pkcs1_verify( mbedtls_rsa_context *ctx,
-                      int (*f_rng)(void *, unsigned char *, size_t),
-                      void *p_rng,
-                      int mode,
-                      mbedtls_md_type_t md_alg,
-                      unsigned int hashlen,
-                      const unsigned char *hash,
-                      const unsigned char *sig );
+int mbedtls_rsa_pkcs1_verify(mbedtls_rsa_context *ctx,
+                             int (*f_rng)(void *, unsigned char *, size_t),
+                             void *p_rng,
+                             int mode,
+                             mbedtls_md_type_t md_alg,
+                             unsigned int hashlen,
+                             const unsigned char *hash,
+                             const unsigned char *sig);
 
 /**
  * \brief          This function performs a PKCS#1 v1.5 verification
@@ -1002,14 +1001,14 @@ int mbedtls_rsa_pkcs1_verify( mbedtls_rsa_context *ctx,
  * \return         \c 0 if the verify operation was successful.
  * \return         An \c MBEDTLS_ERR_RSA_XXX error code on failure.
  */
-int mbedtls_rsa_rsassa_pkcs1_v15_verify( mbedtls_rsa_context *ctx,
-                                 int (*f_rng)(void *, unsigned char *, size_t),
-                                 void *p_rng,
-                                 int mode,
-                                 mbedtls_md_type_t md_alg,
-                                 unsigned int hashlen,
-                                 const unsigned char *hash,
-                                 const unsigned char *sig );
+int mbedtls_rsa_rsassa_pkcs1_v15_verify(mbedtls_rsa_context *ctx,
+                                        int (*f_rng)(void *, unsigned char *, size_t),
+                                        void *p_rng,
+                                        int mode,
+                                        mbedtls_md_type_t md_alg,
+                                        unsigned int hashlen,
+                                        const unsigned char *hash,
+                                        const unsigned char *sig);
 
 /**
  * \brief          This function performs a PKCS#1 v2.1 PSS verification
@@ -1051,14 +1050,14 @@ int mbedtls_rsa_rsassa_pkcs1_v15_verify( mbedtls_rsa_context *ctx,
  * \return         \c 0 if the verify operation was successful.
  * \return         An \c MBEDTLS_ERR_RSA_XXX error code on failure.
  */
-int mbedtls_rsa_rsassa_pss_verify( mbedtls_rsa_context *ctx,
-                           int (*f_rng)(void *, unsigned char *, size_t),
-                           void *p_rng,
-                           int mode,
-                           mbedtls_md_type_t md_alg,
-                           unsigned int hashlen,
-                           const unsigned char *hash,
-                           const unsigned char *sig );
+int mbedtls_rsa_rsassa_pss_verify(mbedtls_rsa_context *ctx,
+                                  int (*f_rng)(void *, unsigned char *, size_t),
+                                  void *p_rng,
+                                  int mode,
+                                  mbedtls_md_type_t md_alg,
+                                  unsigned int hashlen,
+                                  const unsigned char *hash,
+                                  const unsigned char *sig);
 
 /**
  * \brief          This function performs a PKCS#1 v2.1 PSS verification
@@ -1089,16 +1088,16 @@ int mbedtls_rsa_rsassa_pss_verify( mbedtls_rsa_context *ctx,
  * \return         \c 0 if the verify operation was successful.
  * \return         An \c MBEDTLS_ERR_RSA_XXX error code on failure.
  */
-int mbedtls_rsa_rsassa_pss_verify_ext( mbedtls_rsa_context *ctx,
-                               int (*f_rng)(void *, unsigned char *, size_t),
-                               void *p_rng,
-                               int mode,
-                               mbedtls_md_type_t md_alg,
-                               unsigned int hashlen,
-                               const unsigned char *hash,
-                               mbedtls_md_type_t mgf1_hash_id,
-                               int expected_salt_len,
-                               const unsigned char *sig );
+int mbedtls_rsa_rsassa_pss_verify_ext(mbedtls_rsa_context *ctx,
+                                      int (*f_rng)(void *, unsigned char *, size_t),
+                                      void *p_rng,
+                                      int mode,
+                                      mbedtls_md_type_t md_alg,
+                                      unsigned int hashlen,
+                                      const unsigned char *hash,
+                                      mbedtls_md_type_t mgf1_hash_id,
+                                      int expected_salt_len,
+                                      const unsigned char *sig);
 
 /**
  * \brief          This function copies the components of an RSA context.
@@ -1109,14 +1108,14 @@ int mbedtls_rsa_rsassa_pss_verify_ext( mbedtls_rsa_context *ctx,
  * \return         \c 0 on success.
  * \return         #MBEDTLS_ERR_MPI_ALLOC_FAILED on memory allocation failure.
  */
-int mbedtls_rsa_copy( mbedtls_rsa_context *dst, const mbedtls_rsa_context *src );
+int mbedtls_rsa_copy(mbedtls_rsa_context *dst, const mbedtls_rsa_context *src);
 
 /**
  * \brief          This function frees the components of an RSA key.
  *
  * \param ctx      The RSA Context to free.
  */
-void mbedtls_rsa_free( mbedtls_rsa_context *ctx );
+void mbedtls_rsa_free(mbedtls_rsa_context *ctx);
 
 /**
  * \brief          The RSA checkup routine.
@@ -1124,7 +1123,7 @@ void mbedtls_rsa_free( mbedtls_rsa_context *ctx );
  * \return         \c 0 on success.
  * \return         \c 1 on failure.
  */
-int mbedtls_rsa_self_test( int verbose );
+int mbedtls_rsa_self_test(int verbose);
 
 #ifdef __cplusplus
 }
diff --git a/common/mbedtls/rsa_internal.c b/common/mbedtls/rsa_internal.c
index 36c37f893..226e3e7a3 100644
--- a/common/mbedtls/rsa_internal.c
+++ b/common/mbedtls/rsa_internal.c
@@ -67,9 +67,9 @@
  * of (a) and (b) above to attempt to factor N.
  *
  */
-int mbedtls_rsa_deduce_primes( mbedtls_mpi const *N,
-                     mbedtls_mpi const *E, mbedtls_mpi const *D,
-                     mbedtls_mpi *P, mbedtls_mpi *Q )
+int mbedtls_rsa_deduce_primes(mbedtls_mpi const *N,
+                              mbedtls_mpi const *E, mbedtls_mpi const *D,
+                              mbedtls_mpi *P, mbedtls_mpi *Q)
 {
     int ret = 0;
 
@@ -82,48 +82,46 @@ int mbedtls_rsa_deduce_primes( mbedtls_mpi const *N,
     mbedtls_mpi K;  /* Temporary holding the current candidate */
 
     const unsigned char primes[] = { 2,
-           3,    5,    7,   11,   13,   17,   19,   23,
-          29,   31,   37,   41,   43,   47,   53,   59,
-          61,   67,   71,   73,   79,   83,   89,   97,
-         101,  103,  107,  109,  113,  127,  131,  137,
-         139,  149,  151,  157,  163,  167,  173,  179,
-         181,  191,  193,  197,  199,  211,  223,  227,
-         229,  233,  239,  241,  251
-    };
+                                     3,    5,    7,   11,   13,   17,   19,   23,
+                                     29,   31,   37,   41,   43,   47,   53,   59,
+                                     61,   67,   71,   73,   79,   83,   89,   97,
+                                     101,  103,  107,  109,  113,  127,  131,  137,
+                                     139,  149,  151,  157,  163,  167,  173,  179,
+                                     181,  191,  193,  197,  199,  211,  223,  227,
+                                     229,  233,  239,  241,  251
+                                   };
 
-    const size_t num_primes = sizeof( primes ) / sizeof( *primes );
+    const size_t num_primes = sizeof(primes) / sizeof(*primes);
 
-    if( P == NULL || Q == NULL || P->p != NULL || Q->p != NULL )
-        return( MBEDTLS_ERR_MPI_BAD_INPUT_DATA );
+    if (P == NULL || Q == NULL || P->p != NULL || Q->p != NULL)
+        return (MBEDTLS_ERR_MPI_BAD_INPUT_DATA);
 
-    if( mbedtls_mpi_cmp_int( N, 0 ) <= 0 ||
-        mbedtls_mpi_cmp_int( D, 1 ) <= 0 ||
-        mbedtls_mpi_cmp_mpi( D, N ) >= 0 ||
-        mbedtls_mpi_cmp_int( E, 1 ) <= 0 ||
-        mbedtls_mpi_cmp_mpi( E, N ) >= 0 )
-    {
-        return( MBEDTLS_ERR_MPI_BAD_INPUT_DATA );
+    if (mbedtls_mpi_cmp_int(N, 0) <= 0 ||
+        mbedtls_mpi_cmp_int(D, 1) <= 0 ||
+        mbedtls_mpi_cmp_mpi(D, N) >= 0 ||
+        mbedtls_mpi_cmp_int(E, 1) <= 0 ||
+        mbedtls_mpi_cmp_mpi(E, N) >= 0) {
+        return (MBEDTLS_ERR_MPI_BAD_INPUT_DATA);
     }
 
     /*
      * Initializations and temporary changes
      */
 
-    mbedtls_mpi_init( &K );
-    mbedtls_mpi_init( &T );
+    mbedtls_mpi_init(&K);
+    mbedtls_mpi_init(&T);
 
     /* T := DE - 1 */
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &T, D,  E ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_sub_int( &T, &T, 1 ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&T, D,  E));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_sub_int(&T, &T, 1));
 
-    if( ( order = (uint16_t) mbedtls_mpi_lsb( &T ) ) == 0 )
-    {
+    if ((order = (uint16_t) mbedtls_mpi_lsb(&T)) == 0) {
         ret = MBEDTLS_ERR_MPI_BAD_INPUT_DATA;
         goto cleanup;
     }
 
     /* After this operation, T holds the largest odd divisor of DE - 1. */
-    MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &T, order ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_shift_r(&T, order));
 
     /*
      * Actual work
@@ -131,49 +129,46 @@ int mbedtls_rsa_deduce_primes( mbedtls_mpi const *N,
 
     /* Skip trying 2 if N == 1 mod 8 */
     attempt = 0;
-    if( N->p[0] % 8 == 1 )
+    if (N->p[0] % 8 == 1)
         attempt = 1;
 
-    for( ; attempt < num_primes; ++attempt )
-    {
-        mbedtls_mpi_lset( &K, primes[attempt] );
+    for (; attempt < num_primes; ++attempt) {
+        mbedtls_mpi_lset(&K, primes[attempt]);
 
         /* Check if gcd(K,N) = 1 */
-        MBEDTLS_MPI_CHK( mbedtls_mpi_gcd( P, &K, N ) );
-        if( mbedtls_mpi_cmp_int( P, 1 ) != 0 )
+        MBEDTLS_MPI_CHK(mbedtls_mpi_gcd(P, &K, N));
+        if (mbedtls_mpi_cmp_int(P, 1) != 0)
             continue;
 
         /* Go through K^T + 1, K^(2T) + 1, K^(4T) + 1, ...
          * and check whether they have nontrivial GCD with N. */
-        MBEDTLS_MPI_CHK( mbedtls_mpi_exp_mod( &K, &K, &T, N,
-                             Q /* temporarily use Q for storing Montgomery
-                                * multiplication helper values */ ) );
+        MBEDTLS_MPI_CHK(mbedtls_mpi_exp_mod(&K, &K, &T, N,
+                                            Q /* temporarily use Q for storing Montgomery
+                                * multiplication helper values */));
 
-        for( iter = 1; iter <= order; ++iter )
-        {
+        for (iter = 1; iter <= order; ++iter) {
             /* If we reach 1 prematurely, there's no point
              * in continuing to square K */
-            if( mbedtls_mpi_cmp_int( &K, 1 ) == 0 )
+            if (mbedtls_mpi_cmp_int(&K, 1) == 0)
                 break;
 
-            MBEDTLS_MPI_CHK( mbedtls_mpi_add_int( &K, &K, 1 ) );
-            MBEDTLS_MPI_CHK( mbedtls_mpi_gcd( P, &K, N ) );
+            MBEDTLS_MPI_CHK(mbedtls_mpi_add_int(&K, &K, 1));
+            MBEDTLS_MPI_CHK(mbedtls_mpi_gcd(P, &K, N));
 
-            if( mbedtls_mpi_cmp_int( P, 1 ) ==  1 &&
-                mbedtls_mpi_cmp_mpi( P, N ) == -1 )
-            {
+            if (mbedtls_mpi_cmp_int(P, 1) ==  1 &&
+                mbedtls_mpi_cmp_mpi(P, N) == -1) {
                 /*
                  * Have found a nontrivial divisor P of N.
                  * Set Q := N / P.
                  */
 
-                MBEDTLS_MPI_CHK( mbedtls_mpi_div_mpi( Q, NULL, N, P ) );
+                MBEDTLS_MPI_CHK(mbedtls_mpi_div_mpi(Q, NULL, N, P));
                 goto cleanup;
             }
 
-            MBEDTLS_MPI_CHK( mbedtls_mpi_sub_int( &K, &K, 1 ) );
-            MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &K, &K, &K ) );
-            MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi( &K, &K, N ) );
+            MBEDTLS_MPI_CHK(mbedtls_mpi_sub_int(&K, &K, 1));
+            MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&K, &K, &K));
+            MBEDTLS_MPI_CHK(mbedtls_mpi_mod_mpi(&K, &K, N));
         }
 
         /*
@@ -183,8 +178,7 @@ int mbedtls_rsa_deduce_primes( mbedtls_mpi const *N,
          * Check if that's the case and abort if not, to avoid very long,
          * yet eventually failing, computations if N,D,E were not sane.
          */
-        if( mbedtls_mpi_cmp_int( &K, 1 ) != 0 )
-        {
+        if (mbedtls_mpi_cmp_int(&K, 1) != 0) {
             break;
         }
     }
@@ -193,125 +187,115 @@ int mbedtls_rsa_deduce_primes( mbedtls_mpi const *N,
 
 cleanup:
 
-    mbedtls_mpi_free( &K );
-    mbedtls_mpi_free( &T );
-    return( ret );
+    mbedtls_mpi_free(&K);
+    mbedtls_mpi_free(&T);
+    return (ret);
 }
 
 /*
  * Given P, Q and the public exponent E, deduce D.
  * This is essentially a modular inversion.
  */
-int mbedtls_rsa_deduce_private_exponent( mbedtls_mpi const *P,
-                                         mbedtls_mpi const *Q,
-                                         mbedtls_mpi const *E,
-                                         mbedtls_mpi *D )
+int mbedtls_rsa_deduce_private_exponent(mbedtls_mpi const *P,
+                                        mbedtls_mpi const *Q,
+                                        mbedtls_mpi const *E,
+                                        mbedtls_mpi *D)
 {
     int ret = 0;
     mbedtls_mpi K, L;
 
-    if( D == NULL || mbedtls_mpi_cmp_int( D, 0 ) != 0 )
-        return( MBEDTLS_ERR_MPI_BAD_INPUT_DATA );
+    if (D == NULL || mbedtls_mpi_cmp_int(D, 0) != 0)
+        return (MBEDTLS_ERR_MPI_BAD_INPUT_DATA);
 
-    if( mbedtls_mpi_cmp_int( P, 1 ) <= 0 ||
-        mbedtls_mpi_cmp_int( Q, 1 ) <= 0 ||
-        mbedtls_mpi_cmp_int( E, 0 ) == 0 )
-    {
-        return( MBEDTLS_ERR_MPI_BAD_INPUT_DATA );
+    if (mbedtls_mpi_cmp_int(P, 1) <= 0 ||
+        mbedtls_mpi_cmp_int(Q, 1) <= 0 ||
+        mbedtls_mpi_cmp_int(E, 0) == 0) {
+        return (MBEDTLS_ERR_MPI_BAD_INPUT_DATA);
     }
 
-    mbedtls_mpi_init( &K );
-    mbedtls_mpi_init( &L );
+    mbedtls_mpi_init(&K);
+    mbedtls_mpi_init(&L);
 
     /* Temporarily put K := P-1 and L := Q-1 */
-    MBEDTLS_MPI_CHK( mbedtls_mpi_sub_int( &K, P, 1 ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_sub_int( &L, Q, 1 ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_sub_int(&K, P, 1));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_sub_int(&L, Q, 1));
 
     /* Temporarily put D := gcd(P-1, Q-1) */
-    MBEDTLS_MPI_CHK( mbedtls_mpi_gcd( D, &K, &L ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_gcd(D, &K, &L));
 
     /* K := LCM(P-1, Q-1) */
-    MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &K, &K, &L ) );
-    MBEDTLS_MPI_CHK( mbedtls_mpi_div_mpi( &K, NULL, &K, D ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&K, &K, &L));
+    MBEDTLS_MPI_CHK(mbedtls_mpi_div_mpi(&K, NULL, &K, D));
 
     /* Compute modular inverse of E in LCM(P-1, Q-1) */
-    MBEDTLS_MPI_CHK( mbedtls_mpi_inv_mod( D, E, &K ) );
+    MBEDTLS_MPI_CHK(mbedtls_mpi_inv_mod(D, E, &K));
 
 cleanup:
 
-    mbedtls_mpi_free( &K );
-    mbedtls_mpi_free( &L );
+    mbedtls_mpi_free(&K);
+    mbedtls_mpi_free(&L);
 
-    return( ret );
+    return (ret);
 }
 
 /*
  * Check that RSA CRT parameters are in accordance with core parameters.
  */
-int mbedtls_rsa_validate_crt( const mbedtls_mpi *P,  const mbedtls_mpi *Q,
-                              const mbedtls_mpi *D,  const mbedtls_mpi *DP,
-                              const mbedtls_mpi *DQ, const mbedtls_mpi *QP )
+int mbedtls_rsa_validate_crt(const mbedtls_mpi *P,  const mbedtls_mpi *Q,
+                             const mbedtls_mpi *D,  const mbedtls_mpi *DP,
+                             const mbedtls_mpi *DQ, const mbedtls_mpi *QP)
 {
     int ret = 0;
 
     mbedtls_mpi K, L;
-    mbedtls_mpi_init( &K );
-    mbedtls_mpi_init( &L );
+    mbedtls_mpi_init(&K);
+    mbedtls_mpi_init(&L);
 
     /* Check that DP - D == 0 mod P - 1 */
-    if( DP != NULL )
-    {
-        if( P == NULL )
-        {
+    if (DP != NULL) {
+        if (P == NULL) {
             ret = MBEDTLS_ERR_RSA_BAD_INPUT_DATA;
             goto cleanup;
         }
 
-        MBEDTLS_MPI_CHK( mbedtls_mpi_sub_int( &K, P, 1 ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &L, DP, D ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi( &L, &L, &K ) );
+        MBEDTLS_MPI_CHK(mbedtls_mpi_sub_int(&K, P, 1));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_sub_mpi(&L, DP, D));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_mod_mpi(&L, &L, &K));
 
-        if( mbedtls_mpi_cmp_int( &L, 0 ) != 0 )
-        {
+        if (mbedtls_mpi_cmp_int(&L, 0) != 0) {
             ret = MBEDTLS_ERR_RSA_KEY_CHECK_FAILED;
             goto cleanup;
         }
     }
 
     /* Check that DQ - D == 0 mod Q - 1 */
-    if( DQ != NULL )
-    {
-        if( Q == NULL )
-        {
+    if (DQ != NULL) {
+        if (Q == NULL) {
             ret = MBEDTLS_ERR_RSA_BAD_INPUT_DATA;
             goto cleanup;
         }
 
-        MBEDTLS_MPI_CHK( mbedtls_mpi_sub_int( &K, Q, 1 ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_sub_mpi( &L, DQ, D ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi( &L, &L, &K ) );
+        MBEDTLS_MPI_CHK(mbedtls_mpi_sub_int(&K, Q, 1));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_sub_mpi(&L, DQ, D));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_mod_mpi(&L, &L, &K));
 
-        if( mbedtls_mpi_cmp_int( &L, 0 ) != 0 )
-        {
+        if (mbedtls_mpi_cmp_int(&L, 0) != 0) {
             ret = MBEDTLS_ERR_RSA_KEY_CHECK_FAILED;
             goto cleanup;
         }
     }
 
     /* Check that QP * Q - 1 == 0 mod P */
-    if( QP != NULL )
-    {
-        if( P == NULL || Q == NULL )
-        {
+    if (QP != NULL) {
+        if (P == NULL || Q == NULL) {
             ret = MBEDTLS_ERR_RSA_BAD_INPUT_DATA;
             goto cleanup;
         }
 
-        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &K, QP, Q ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_sub_int( &K, &K, 1 ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi( &K, &K, P ) );
-        if( mbedtls_mpi_cmp_int( &K, 0 ) != 0 )
-        {
+        MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&K, QP, Q));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_sub_int(&K, &K, 1));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_mod_mpi(&K, &K, P));
+        if (mbedtls_mpi_cmp_int(&K, 0) != 0) {
             ret = MBEDTLS_ERR_RSA_KEY_CHECK_FAILED;
             goto cleanup;
         }
@@ -320,49 +304,46 @@ int mbedtls_rsa_validate_crt( const mbedtls_mpi *P,  const mbedtls_mpi *Q,
 cleanup:
 
     /* Wrap MPI error codes by RSA check failure error code */
-    if( ret != 0 &&
+    if (ret != 0 &&
         ret != MBEDTLS_ERR_RSA_KEY_CHECK_FAILED &&
-        ret != MBEDTLS_ERR_RSA_BAD_INPUT_DATA )
-    {
+        ret != MBEDTLS_ERR_RSA_BAD_INPUT_DATA) {
         ret += MBEDTLS_ERR_RSA_KEY_CHECK_FAILED;
     }
 
-    mbedtls_mpi_free( &K );
-    mbedtls_mpi_free( &L );
+    mbedtls_mpi_free(&K);
+    mbedtls_mpi_free(&L);
 
-    return( ret );
+    return (ret);
 }
 
 /*
  * Check that core RSA parameters are sane.
  */
-int mbedtls_rsa_validate_params( const mbedtls_mpi *N, const mbedtls_mpi *P,
-                                 const mbedtls_mpi *Q, const mbedtls_mpi *D,
-                                 const mbedtls_mpi *E,
-                                 int (*f_rng)(void *, unsigned char *, size_t),
-                                 void *p_rng )
+int mbedtls_rsa_validate_params(const mbedtls_mpi *N, const mbedtls_mpi *P,
+                                const mbedtls_mpi *Q, const mbedtls_mpi *D,
+                                const mbedtls_mpi *E,
+                                int (*f_rng)(void *, unsigned char *, size_t),
+                                void *p_rng)
 {
     int ret = 0;
     mbedtls_mpi K, L;
 
-    mbedtls_mpi_init( &K );
-    mbedtls_mpi_init( &L );
+    mbedtls_mpi_init(&K);
+    mbedtls_mpi_init(&L);
 
     /*
      * Step 1: If PRNG provided, check that P and Q are prime
      */
 
 #if defined(MBEDTLS_GENPRIME)
-    if( f_rng != NULL && P != NULL &&
-        ( ret = mbedtls_mpi_is_prime( P, f_rng, p_rng ) ) != 0 )
-    {
+    if (f_rng != NULL && P != NULL &&
+        (ret = mbedtls_mpi_is_prime(P, f_rng, p_rng)) != 0) {
         ret = MBEDTLS_ERR_RSA_KEY_CHECK_FAILED;
         goto cleanup;
     }
 
-    if( f_rng != NULL && Q != NULL &&
-        ( ret = mbedtls_mpi_is_prime( Q, f_rng, p_rng ) ) != 0 )
-    {
+    if (f_rng != NULL && Q != NULL &&
+        (ret = mbedtls_mpi_is_prime(Q, f_rng, p_rng)) != 0) {
         ret = MBEDTLS_ERR_RSA_KEY_CHECK_FAILED;
         goto cleanup;
     }
@@ -375,12 +356,10 @@ int mbedtls_rsa_validate_params( const mbedtls_mpi *N, const mbedtls_mpi *P,
      * Step 2: Check that 1 < N = P * Q
      */
 
-    if( P != NULL && Q != NULL && N != NULL )
-    {
-        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &K, P, Q ) );
-        if( mbedtls_mpi_cmp_int( N, 1 )  <= 0 ||
-            mbedtls_mpi_cmp_mpi( &K, N ) != 0 )
-        {
+    if (P != NULL && Q != NULL && N != NULL) {
+        MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&K, P, Q));
+        if (mbedtls_mpi_cmp_int(N, 1)  <= 0 ||
+            mbedtls_mpi_cmp_mpi(&K, N) != 0) {
             ret = MBEDTLS_ERR_RSA_KEY_CHECK_FAILED;
             goto cleanup;
         }
@@ -390,13 +369,11 @@ int mbedtls_rsa_validate_params( const mbedtls_mpi *N, const mbedtls_mpi *P,
      * Step 3: Check and 1 < D, E < N if present.
      */
 
-    if( N != NULL && D != NULL && E != NULL )
-    {
-        if ( mbedtls_mpi_cmp_int( D, 1 ) <= 0 ||
-             mbedtls_mpi_cmp_int( E, 1 ) <= 0 ||
-             mbedtls_mpi_cmp_mpi( D, N ) >= 0 ||
-             mbedtls_mpi_cmp_mpi( E, N ) >= 0 )
-        {
+    if (N != NULL && D != NULL && E != NULL) {
+        if (mbedtls_mpi_cmp_int(D, 1) <= 0 ||
+            mbedtls_mpi_cmp_int(E, 1) <= 0 ||
+            mbedtls_mpi_cmp_mpi(D, N) >= 0 ||
+            mbedtls_mpi_cmp_mpi(E, N) >= 0) {
             ret = MBEDTLS_ERR_RSA_KEY_CHECK_FAILED;
             goto cleanup;
         }
@@ -406,33 +383,29 @@ int mbedtls_rsa_validate_params( const mbedtls_mpi *N, const mbedtls_mpi *P,
      * Step 4: Check that D, E are inverse modulo P-1 and Q-1
      */
 
-    if( P != NULL && Q != NULL && D != NULL && E != NULL )
-    {
-        if( mbedtls_mpi_cmp_int( P, 1 ) <= 0 ||
-            mbedtls_mpi_cmp_int( Q, 1 ) <= 0 )
-        {
+    if (P != NULL && Q != NULL && D != NULL && E != NULL) {
+        if (mbedtls_mpi_cmp_int(P, 1) <= 0 ||
+            mbedtls_mpi_cmp_int(Q, 1) <= 0) {
             ret = MBEDTLS_ERR_RSA_KEY_CHECK_FAILED;
             goto cleanup;
         }
 
         /* Compute DE-1 mod P-1 */
-        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &K, D, E ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_sub_int( &K, &K, 1 ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_sub_int( &L, P, 1 ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi( &K, &K, &L ) );
-        if( mbedtls_mpi_cmp_int( &K, 0 ) != 0 )
-        {
+        MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&K, D, E));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_sub_int(&K, &K, 1));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_sub_int(&L, P, 1));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_mod_mpi(&K, &K, &L));
+        if (mbedtls_mpi_cmp_int(&K, 0) != 0) {
             ret = MBEDTLS_ERR_RSA_KEY_CHECK_FAILED;
             goto cleanup;
         }
 
         /* Compute DE-1 mod Q-1 */
-        MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &K, D, E ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_sub_int( &K, &K, 1 ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_sub_int( &L, Q, 1 ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi( &K, &K, &L ) );
-        if( mbedtls_mpi_cmp_int( &K, 0 ) != 0 )
-        {
+        MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&K, D, E));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_sub_int(&K, &K, 1));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_sub_int(&L, Q, 1));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_mod_mpi(&K, &K, &L));
+        if (mbedtls_mpi_cmp_int(&K, 0) != 0) {
             ret = MBEDTLS_ERR_RSA_KEY_CHECK_FAILED;
             goto cleanup;
         }
@@ -440,50 +413,46 @@ int mbedtls_rsa_validate_params( const mbedtls_mpi *N, const mbedtls_mpi *P,
 
 cleanup:
 
-    mbedtls_mpi_free( &K );
-    mbedtls_mpi_free( &L );
+    mbedtls_mpi_free(&K);
+    mbedtls_mpi_free(&L);
 
     /* Wrap MPI error codes by RSA check failure error code */
-    if( ret != 0 && ret != MBEDTLS_ERR_RSA_KEY_CHECK_FAILED )
-    {
+    if (ret != 0 && ret != MBEDTLS_ERR_RSA_KEY_CHECK_FAILED) {
         ret += MBEDTLS_ERR_RSA_KEY_CHECK_FAILED;
     }
 
-    return( ret );
+    return (ret);
 }
 
-int mbedtls_rsa_deduce_crt( const mbedtls_mpi *P, const mbedtls_mpi *Q,
-                            const mbedtls_mpi *D, mbedtls_mpi *DP,
-                            mbedtls_mpi *DQ, mbedtls_mpi *QP )
+int mbedtls_rsa_deduce_crt(const mbedtls_mpi *P, const mbedtls_mpi *Q,
+                           const mbedtls_mpi *D, mbedtls_mpi *DP,
+                           mbedtls_mpi *DQ, mbedtls_mpi *QP)
 {
     int ret = 0;
     mbedtls_mpi K;
-    mbedtls_mpi_init( &K );
+    mbedtls_mpi_init(&K);
 
     /* DP = D mod P-1 */
-    if( DP != NULL )
-    {
-        MBEDTLS_MPI_CHK( mbedtls_mpi_sub_int( &K, P, 1  ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi( DP, D, &K ) );
+    if (DP != NULL) {
+        MBEDTLS_MPI_CHK(mbedtls_mpi_sub_int(&K, P, 1));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_mod_mpi(DP, D, &K));
     }
 
     /* DQ = D mod Q-1 */
-    if( DQ != NULL )
-    {
-        MBEDTLS_MPI_CHK( mbedtls_mpi_sub_int( &K, Q, 1  ) );
-        MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi( DQ, D, &K ) );
+    if (DQ != NULL) {
+        MBEDTLS_MPI_CHK(mbedtls_mpi_sub_int(&K, Q, 1));
+        MBEDTLS_MPI_CHK(mbedtls_mpi_mod_mpi(DQ, D, &K));
     }
 
     /* QP = Q^{-1} mod P */
-    if( QP != NULL )
-    {
-        MBEDTLS_MPI_CHK( mbedtls_mpi_inv_mod( QP, Q, P ) );
+    if (QP != NULL) {
+        MBEDTLS_MPI_CHK(mbedtls_mpi_inv_mod(QP, Q, P));
     }
 
 cleanup:
-    mbedtls_mpi_free( &K );
+    mbedtls_mpi_free(&K);
 
-    return( ret );
+    return (ret);
 }
 
 #endif /* MBEDTLS_RSA_C */
diff --git a/common/mbedtls/rsa_internal.h b/common/mbedtls/rsa_internal.h
index 8ee0bfe34..65a1304b4 100644
--- a/common/mbedtls/rsa_internal.h
+++ b/common/mbedtls/rsa_internal.h
@@ -96,9 +96,9 @@ extern "C" {
  *                 use the helper function \c mbedtls_rsa_validate_params.
  *
  */
-int mbedtls_rsa_deduce_primes( mbedtls_mpi const *N, mbedtls_mpi const *E,
-                               mbedtls_mpi const *D,
-                               mbedtls_mpi *P, mbedtls_mpi *Q );
+int mbedtls_rsa_deduce_primes(mbedtls_mpi const *N, mbedtls_mpi const *E,
+                              mbedtls_mpi const *D,
+                              mbedtls_mpi *P, mbedtls_mpi *Q);
 
 /**
  * \brief          Compute RSA private exponent from
@@ -121,10 +121,10 @@ int mbedtls_rsa_deduce_primes( mbedtls_mpi const *N, mbedtls_mpi const *E,
  * \note           This function does not check whether P and Q are primes.
  *
  */
-int mbedtls_rsa_deduce_private_exponent( mbedtls_mpi const *P,
-                                         mbedtls_mpi const *Q,
-                                         mbedtls_mpi const *E,
-                                         mbedtls_mpi *D );
+int mbedtls_rsa_deduce_private_exponent(mbedtls_mpi const *P,
+                                        mbedtls_mpi const *Q,
+                                        mbedtls_mpi const *E,
+                                        mbedtls_mpi *D);
 
 
 /**
@@ -147,9 +147,9 @@ int mbedtls_rsa_deduce_private_exponent( mbedtls_mpi const *P,
  *                 prime and whether D is a valid private exponent.
  *
  */
-int mbedtls_rsa_deduce_crt( const mbedtls_mpi *P, const mbedtls_mpi *Q,
-                            const mbedtls_mpi *D, mbedtls_mpi *DP,
-                            mbedtls_mpi *DQ, mbedtls_mpi *QP );
+int mbedtls_rsa_deduce_crt(const mbedtls_mpi *P, const mbedtls_mpi *Q,
+                           const mbedtls_mpi *D, mbedtls_mpi *DP,
+                           mbedtls_mpi *DQ, mbedtls_mpi *QP);
 
 
 /**
@@ -182,11 +182,11 @@ int mbedtls_rsa_deduce_crt( const mbedtls_mpi *P, const mbedtls_mpi *Q,
  *                 to perform specific checks only. E.g., calling it with
  *                 (-,P,-,-,-) and a PRNG amounts to a primality check for P.
  */
-int mbedtls_rsa_validate_params( const mbedtls_mpi *N, const mbedtls_mpi *P,
-                                 const mbedtls_mpi *Q, const mbedtls_mpi *D,
-                                 const mbedtls_mpi *E,
-                                 int (*f_rng)(void *, unsigned char *, size_t),
-                                 void *p_rng );
+int mbedtls_rsa_validate_params(const mbedtls_mpi *N, const mbedtls_mpi *P,
+                                const mbedtls_mpi *Q, const mbedtls_mpi *D,
+                                const mbedtls_mpi *E,
+                                int (*f_rng)(void *, unsigned char *, size_t),
+                                void *p_rng);
 
 /**
  * \brief          Check validity of RSA CRT parameters
@@ -217,9 +217,9 @@ int mbedtls_rsa_validate_params( const mbedtls_mpi *N, const mbedtls_mpi *P,
  *                 to perform specific checks only. E.g., calling it with the
  *                 parameters (P, -, D, DP, -, -) will check DP = D mod P-1.
  */
-int mbedtls_rsa_validate_crt( const mbedtls_mpi *P,  const mbedtls_mpi *Q,
-                              const mbedtls_mpi *D,  const mbedtls_mpi *DP,
-                              const mbedtls_mpi *DQ, const mbedtls_mpi *QP );
+int mbedtls_rsa_validate_crt(const mbedtls_mpi *P,  const mbedtls_mpi *Q,
+                             const mbedtls_mpi *D,  const mbedtls_mpi *DP,
+                             const mbedtls_mpi *DQ, const mbedtls_mpi *QP);
 
 #ifdef __cplusplus
 }
diff --git a/common/mbedtls/sha1.c b/common/mbedtls/sha1.c
index 9981c5a9d..82dc14f5c 100644
--- a/common/mbedtls/sha1.c
+++ b/common/mbedtls/sha1.c
@@ -55,39 +55,39 @@
  */
 #ifndef GET_UINT32_BE
 #define GET_UINT32_BE(n,b,i)                            \
-{                                                       \
-    (n) = ( (uint32_t) (b)[(i)    ] << 24 )             \
-        | ( (uint32_t) (b)[(i) + 1] << 16 )             \
-        | ( (uint32_t) (b)[(i) + 2] <<  8 )             \
-        | ( (uint32_t) (b)[(i) + 3]       );            \
-}
+    {                                                       \
+        (n) = ( (uint32_t) (b)[(i)    ] << 24 )             \
+              | ( (uint32_t) (b)[(i) + 1] << 16 )             \
+              | ( (uint32_t) (b)[(i) + 2] <<  8 )             \
+              | ( (uint32_t) (b)[(i) + 3]       );            \
+    }
 #endif
 
 #ifndef PUT_UINT32_BE
 #define PUT_UINT32_BE(n,b,i)                            \
-{                                                       \
-    (b)[(i)    ] = (unsigned char) ( (n) >> 24 );       \
-    (b)[(i) + 1] = (unsigned char) ( (n) >> 16 );       \
-    (b)[(i) + 2] = (unsigned char) ( (n) >>  8 );       \
-    (b)[(i) + 3] = (unsigned char) ( (n)       );       \
-}
+    {                                                       \
+        (b)[(i)    ] = (unsigned char) ( (n) >> 24 );       \
+        (b)[(i) + 1] = (unsigned char) ( (n) >> 16 );       \
+        (b)[(i) + 2] = (unsigned char) ( (n) >>  8 );       \
+        (b)[(i) + 3] = (unsigned char) ( (n)       );       \
+    }
 #endif
 
-void mbedtls_sha1_init( mbedtls_sha1_context *ctx )
+void mbedtls_sha1_init(mbedtls_sha1_context *ctx)
 {
-    memset( ctx, 0, sizeof( mbedtls_sha1_context ) );
+    memset(ctx, 0, sizeof(mbedtls_sha1_context));
 }
 
-void mbedtls_sha1_free( mbedtls_sha1_context *ctx )
+void mbedtls_sha1_free(mbedtls_sha1_context *ctx)
 {
-    if( ctx == NULL )
+    if (ctx == NULL)
         return;
 
-    mbedtls_platform_zeroize( ctx, sizeof( mbedtls_sha1_context ) );
+    mbedtls_platform_zeroize(ctx, sizeof(mbedtls_sha1_context));
 }
 
-void mbedtls_sha1_clone( mbedtls_sha1_context *dst,
-                         const mbedtls_sha1_context *src )
+void mbedtls_sha1_clone(mbedtls_sha1_context *dst,
+                        const mbedtls_sha1_context *src)
 {
     *dst = *src;
 }
@@ -95,7 +95,7 @@ void mbedtls_sha1_clone( mbedtls_sha1_context *dst,
 /*
  * SHA-1 context setup
  */
-int mbedtls_sha1_starts_ret( mbedtls_sha1_context *ctx )
+int mbedtls_sha1_starts_ret(mbedtls_sha1_context *ctx)
 {
     ctx->total[0] = 0;
     ctx->total[1] = 0;
@@ -106,52 +106,52 @@ int mbedtls_sha1_starts_ret( mbedtls_sha1_context *ctx )
     ctx->state[3] = 0x10325476;
     ctx->state[4] = 0xC3D2E1F0;
 
-    return( 0 );
+    return (0);
 }
 
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
-void mbedtls_sha1_starts( mbedtls_sha1_context *ctx )
+void mbedtls_sha1_starts(mbedtls_sha1_context *ctx)
 {
-    mbedtls_sha1_starts_ret( ctx );
+    mbedtls_sha1_starts_ret(ctx);
 }
 #endif
 
 #if !defined(MBEDTLS_SHA1_PROCESS_ALT)
-int mbedtls_internal_sha1_process( mbedtls_sha1_context *ctx,
-                                   const unsigned char data[64] )
+int mbedtls_internal_sha1_process(mbedtls_sha1_context *ctx,
+                                  const unsigned char data[64])
 {
     uint32_t temp, W[16], A, B, C, D, E;
 
-    GET_UINT32_BE( W[ 0], data,  0 );
-    GET_UINT32_BE( W[ 1], data,  4 );
-    GET_UINT32_BE( W[ 2], data,  8 );
-    GET_UINT32_BE( W[ 3], data, 12 );
-    GET_UINT32_BE( W[ 4], data, 16 );
-    GET_UINT32_BE( W[ 5], data, 20 );
-    GET_UINT32_BE( W[ 6], data, 24 );
-    GET_UINT32_BE( W[ 7], data, 28 );
-    GET_UINT32_BE( W[ 8], data, 32 );
-    GET_UINT32_BE( W[ 9], data, 36 );
-    GET_UINT32_BE( W[10], data, 40 );
-    GET_UINT32_BE( W[11], data, 44 );
-    GET_UINT32_BE( W[12], data, 48 );
-    GET_UINT32_BE( W[13], data, 52 );
-    GET_UINT32_BE( W[14], data, 56 );
-    GET_UINT32_BE( W[15], data, 60 );
+    GET_UINT32_BE(W[ 0], data,  0);
+    GET_UINT32_BE(W[ 1], data,  4);
+    GET_UINT32_BE(W[ 2], data,  8);
+    GET_UINT32_BE(W[ 3], data, 12);
+    GET_UINT32_BE(W[ 4], data, 16);
+    GET_UINT32_BE(W[ 5], data, 20);
+    GET_UINT32_BE(W[ 6], data, 24);
+    GET_UINT32_BE(W[ 7], data, 28);
+    GET_UINT32_BE(W[ 8], data, 32);
+    GET_UINT32_BE(W[ 9], data, 36);
+    GET_UINT32_BE(W[10], data, 40);
+    GET_UINT32_BE(W[11], data, 44);
+    GET_UINT32_BE(W[12], data, 48);
+    GET_UINT32_BE(W[13], data, 52);
+    GET_UINT32_BE(W[14], data, 56);
+    GET_UINT32_BE(W[15], data, 60);
 
 #define S(x,n) ((x << n) | ((x & 0xFFFFFFFF) >> (32 - n)))
 
 #define R(t)                                            \
-(                                                       \
-    temp = W[( t -  3 ) & 0x0F] ^ W[( t - 8 ) & 0x0F] ^ \
-           W[( t - 14 ) & 0x0F] ^ W[  t       & 0x0F],  \
-    ( W[t & 0x0F] = S(temp,1) )                         \
-)
+    (                                                       \
+                                                            temp = W[( t -  3 ) & 0x0F] ^ W[( t - 8 ) & 0x0F] ^ \
+                                                                    W[( t - 14 ) & 0x0F] ^ W[  t       & 0x0F],  \
+                                                            ( W[t & 0x0F] = S(temp,1) )                         \
+    )
 
 #define P(a,b,c,d,e,x)                                  \
-{                                                       \
-    e += S(a,5) + F(b,c,d) + K + x; b = S(b,30);        \
-}
+    {                                                       \
+        e += S(a,5) + F(b,c,d) + K + x; b = S(b,30);        \
+    }
 
     A = ctx->state[0];
     B = ctx->state[1];
@@ -162,26 +162,26 @@ int mbedtls_internal_sha1_process( mbedtls_sha1_context *ctx,
 #define F(x,y,z) (z ^ (x & (y ^ z)))
 #define K 0x5A827999
 
-    P( A, B, C, D, E, W[0]  );
-    P( E, A, B, C, D, W[1]  );
-    P( D, E, A, B, C, W[2]  );
-    P( C, D, E, A, B, W[3]  );
-    P( B, C, D, E, A, W[4]  );
-    P( A, B, C, D, E, W[5]  );
-    P( E, A, B, C, D, W[6]  );
-    P( D, E, A, B, C, W[7]  );
-    P( C, D, E, A, B, W[8]  );
-    P( B, C, D, E, A, W[9]  );
-    P( A, B, C, D, E, W[10] );
-    P( E, A, B, C, D, W[11] );
-    P( D, E, A, B, C, W[12] );
-    P( C, D, E, A, B, W[13] );
-    P( B, C, D, E, A, W[14] );
-    P( A, B, C, D, E, W[15] );
-    P( E, A, B, C, D, R(16) );
-    P( D, E, A, B, C, R(17) );
-    P( C, D, E, A, B, R(18) );
-    P( B, C, D, E, A, R(19) );
+    P(A, B, C, D, E, W[0]);
+    P(E, A, B, C, D, W[1]);
+    P(D, E, A, B, C, W[2]);
+    P(C, D, E, A, B, W[3]);
+    P(B, C, D, E, A, W[4]);
+    P(A, B, C, D, E, W[5]);
+    P(E, A, B, C, D, W[6]);
+    P(D, E, A, B, C, W[7]);
+    P(C, D, E, A, B, W[8]);
+    P(B, C, D, E, A, W[9]);
+    P(A, B, C, D, E, W[10]);
+    P(E, A, B, C, D, W[11]);
+    P(D, E, A, B, C, W[12]);
+    P(C, D, E, A, B, W[13]);
+    P(B, C, D, E, A, W[14]);
+    P(A, B, C, D, E, W[15]);
+    P(E, A, B, C, D, R(16));
+    P(D, E, A, B, C, R(17));
+    P(C, D, E, A, B, R(18));
+    P(B, C, D, E, A, R(19));
 
 #undef K
 #undef F
@@ -189,26 +189,26 @@ int mbedtls_internal_sha1_process( mbedtls_sha1_context *ctx,
 #define F(x,y,z) (x ^ y ^ z)
 #define K 0x6ED9EBA1
 
-    P( A, B, C, D, E, R(20) );
-    P( E, A, B, C, D, R(21) );
-    P( D, E, A, B, C, R(22) );
-    P( C, D, E, A, B, R(23) );
-    P( B, C, D, E, A, R(24) );
-    P( A, B, C, D, E, R(25) );
-    P( E, A, B, C, D, R(26) );
-    P( D, E, A, B, C, R(27) );
-    P( C, D, E, A, B, R(28) );
-    P( B, C, D, E, A, R(29) );
-    P( A, B, C, D, E, R(30) );
-    P( E, A, B, C, D, R(31) );
-    P( D, E, A, B, C, R(32) );
-    P( C, D, E, A, B, R(33) );
-    P( B, C, D, E, A, R(34) );
-    P( A, B, C, D, E, R(35) );
-    P( E, A, B, C, D, R(36) );
-    P( D, E, A, B, C, R(37) );
-    P( C, D, E, A, B, R(38) );
-    P( B, C, D, E, A, R(39) );
+    P(A, B, C, D, E, R(20));
+    P(E, A, B, C, D, R(21));
+    P(D, E, A, B, C, R(22));
+    P(C, D, E, A, B, R(23));
+    P(B, C, D, E, A, R(24));
+    P(A, B, C, D, E, R(25));
+    P(E, A, B, C, D, R(26));
+    P(D, E, A, B, C, R(27));
+    P(C, D, E, A, B, R(28));
+    P(B, C, D, E, A, R(29));
+    P(A, B, C, D, E, R(30));
+    P(E, A, B, C, D, R(31));
+    P(D, E, A, B, C, R(32));
+    P(C, D, E, A, B, R(33));
+    P(B, C, D, E, A, R(34));
+    P(A, B, C, D, E, R(35));
+    P(E, A, B, C, D, R(36));
+    P(D, E, A, B, C, R(37));
+    P(C, D, E, A, B, R(38));
+    P(B, C, D, E, A, R(39));
 
 #undef K
 #undef F
@@ -216,26 +216,26 @@ int mbedtls_internal_sha1_process( mbedtls_sha1_context *ctx,
 #define F(x,y,z) ((x & y) | (z & (x | y)))
 #define K 0x8F1BBCDC
 
-    P( A, B, C, D, E, R(40) );
-    P( E, A, B, C, D, R(41) );
-    P( D, E, A, B, C, R(42) );
-    P( C, D, E, A, B, R(43) );
-    P( B, C, D, E, A, R(44) );
-    P( A, B, C, D, E, R(45) );
-    P( E, A, B, C, D, R(46) );
-    P( D, E, A, B, C, R(47) );
-    P( C, D, E, A, B, R(48) );
-    P( B, C, D, E, A, R(49) );
-    P( A, B, C, D, E, R(50) );
-    P( E, A, B, C, D, R(51) );
-    P( D, E, A, B, C, R(52) );
-    P( C, D, E, A, B, R(53) );
-    P( B, C, D, E, A, R(54) );
-    P( A, B, C, D, E, R(55) );
-    P( E, A, B, C, D, R(56) );
-    P( D, E, A, B, C, R(57) );
-    P( C, D, E, A, B, R(58) );
-    P( B, C, D, E, A, R(59) );
+    P(A, B, C, D, E, R(40));
+    P(E, A, B, C, D, R(41));
+    P(D, E, A, B, C, R(42));
+    P(C, D, E, A, B, R(43));
+    P(B, C, D, E, A, R(44));
+    P(A, B, C, D, E, R(45));
+    P(E, A, B, C, D, R(46));
+    P(D, E, A, B, C, R(47));
+    P(C, D, E, A, B, R(48));
+    P(B, C, D, E, A, R(49));
+    P(A, B, C, D, E, R(50));
+    P(E, A, B, C, D, R(51));
+    P(D, E, A, B, C, R(52));
+    P(C, D, E, A, B, R(53));
+    P(B, C, D, E, A, R(54));
+    P(A, B, C, D, E, R(55));
+    P(E, A, B, C, D, R(56));
+    P(D, E, A, B, C, R(57));
+    P(C, D, E, A, B, R(58));
+    P(B, C, D, E, A, R(59));
 
 #undef K
 #undef F
@@ -243,26 +243,26 @@ int mbedtls_internal_sha1_process( mbedtls_sha1_context *ctx,
 #define F(x,y,z) (x ^ y ^ z)
 #define K 0xCA62C1D6
 
-    P( A, B, C, D, E, R(60) );
-    P( E, A, B, C, D, R(61) );
-    P( D, E, A, B, C, R(62) );
-    P( C, D, E, A, B, R(63) );
-    P( B, C, D, E, A, R(64) );
-    P( A, B, C, D, E, R(65) );
-    P( E, A, B, C, D, R(66) );
-    P( D, E, A, B, C, R(67) );
-    P( C, D, E, A, B, R(68) );
-    P( B, C, D, E, A, R(69) );
-    P( A, B, C, D, E, R(70) );
-    P( E, A, B, C, D, R(71) );
-    P( D, E, A, B, C, R(72) );
-    P( C, D, E, A, B, R(73) );
-    P( B, C, D, E, A, R(74) );
-    P( A, B, C, D, E, R(75) );
-    P( E, A, B, C, D, R(76) );
-    P( D, E, A, B, C, R(77) );
-    P( C, D, E, A, B, R(78) );
-    P( B, C, D, E, A, R(79) );
+    P(A, B, C, D, E, R(60));
+    P(E, A, B, C, D, R(61));
+    P(D, E, A, B, C, R(62));
+    P(C, D, E, A, B, R(63));
+    P(B, C, D, E, A, R(64));
+    P(A, B, C, D, E, R(65));
+    P(E, A, B, C, D, R(66));
+    P(D, E, A, B, C, R(67));
+    P(C, D, E, A, B, R(68));
+    P(B, C, D, E, A, R(69));
+    P(A, B, C, D, E, R(70));
+    P(E, A, B, C, D, R(71));
+    P(D, E, A, B, C, R(72));
+    P(C, D, E, A, B, R(73));
+    P(B, C, D, E, A, R(74));
+    P(A, B, C, D, E, R(75));
+    P(E, A, B, C, D, R(76));
+    P(D, E, A, B, C, R(77));
+    P(C, D, E, A, B, R(78));
+    P(B, C, D, E, A, R(79));
 
 #undef K
 #undef F
@@ -273,14 +273,14 @@ int mbedtls_internal_sha1_process( mbedtls_sha1_context *ctx,
     ctx->state[3] += D;
     ctx->state[4] += E;
 
-    return( 0 );
+    return (0);
 }
 
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
-void mbedtls_sha1_process( mbedtls_sha1_context *ctx,
-                           const unsigned char data[64] )
+void mbedtls_sha1_process(mbedtls_sha1_context *ctx,
+                          const unsigned char data[64])
 {
-    mbedtls_internal_sha1_process( ctx, data );
+    mbedtls_internal_sha1_process(ctx, data);
 }
 #endif
 #endif /* !MBEDTLS_SHA1_PROCESS_ALT */
@@ -288,16 +288,16 @@ void mbedtls_sha1_process( mbedtls_sha1_context *ctx,
 /*
  * SHA-1 process buffer
  */
-int mbedtls_sha1_update_ret( mbedtls_sha1_context *ctx,
-                             const unsigned char *input,
-                             size_t ilen )
+int mbedtls_sha1_update_ret(mbedtls_sha1_context *ctx,
+                            const unsigned char *input,
+                            size_t ilen)
 {
     int ret;
     size_t fill;
     uint32_t left;
 
-    if( ilen == 0 )
-        return( 0 );
+    if (ilen == 0)
+        return (0);
 
     left = ctx->total[0] & 0x3F;
     fill = 64 - left;
@@ -305,50 +305,48 @@ int mbedtls_sha1_update_ret( mbedtls_sha1_context *ctx,
     ctx->total[0] += (uint32_t) ilen;
     ctx->total[0] &= 0xFFFFFFFF;
 
-    if( ctx->total[0] < (uint32_t) ilen )
+    if (ctx->total[0] < (uint32_t) ilen)
         ctx->total[1]++;
 
-    if( left && ilen >= fill )
-    {
-        memcpy( (void *) (ctx->buffer + left), input, fill );
+    if (left && ilen >= fill) {
+        memcpy((void *)(ctx->buffer + left), input, fill);
 
-        if( ( ret = mbedtls_internal_sha1_process( ctx, ctx->buffer ) ) != 0 )
-            return( ret );
+        if ((ret = mbedtls_internal_sha1_process(ctx, ctx->buffer)) != 0)
+            return (ret);
 
         input += fill;
         ilen  -= fill;
         left = 0;
     }
 
-    while( ilen >= 64 )
-    {
-        if( ( ret = mbedtls_internal_sha1_process( ctx, input ) ) != 0 )
-            return( ret );
+    while (ilen >= 64) {
+        if ((ret = mbedtls_internal_sha1_process(ctx, input)) != 0)
+            return (ret);
 
         input += 64;
         ilen  -= 64;
     }
 
-    if( ilen > 0 )
-        memcpy( (void *) (ctx->buffer + left), input, ilen );
+    if (ilen > 0)
+        memcpy((void *)(ctx->buffer + left), input, ilen);
 
-    return( 0 );
+    return (0);
 }
 
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
-void mbedtls_sha1_update( mbedtls_sha1_context *ctx,
-                          const unsigned char *input,
-                          size_t ilen )
+void mbedtls_sha1_update(mbedtls_sha1_context *ctx,
+                         const unsigned char *input,
+                         size_t ilen)
 {
-    mbedtls_sha1_update_ret( ctx, input, ilen );
+    mbedtls_sha1_update_ret(ctx, input, ilen);
 }
 #endif
 
 /*
  * SHA-1 final digest
  */
-int mbedtls_sha1_finish_ret( mbedtls_sha1_context *ctx,
-                             unsigned char output[20] )
+int mbedtls_sha1_finish_ret(mbedtls_sha1_context *ctx,
+                            unsigned char output[20])
 {
     int ret;
     uint32_t used;
@@ -361,52 +359,49 @@ int mbedtls_sha1_finish_ret( mbedtls_sha1_context *ctx,
 
     ctx->buffer[used++] = 0x80;
 
-    if( used <= 56 )
-    {
+    if (used <= 56) {
         /* Enough room for padding + length in current block */
-        memset( ctx->buffer + used, 0, 56 - used );
-    }
-    else
-    {
+        memset(ctx->buffer + used, 0, 56 - used);
+    } else {
         /* We'll need an extra block */
-        memset( ctx->buffer + used, 0, 64 - used );
+        memset(ctx->buffer + used, 0, 64 - used);
 
-        if( ( ret = mbedtls_internal_sha1_process( ctx, ctx->buffer ) ) != 0 )
-            return( ret );
+        if ((ret = mbedtls_internal_sha1_process(ctx, ctx->buffer)) != 0)
+            return (ret);
 
-        memset( ctx->buffer, 0, 56 );
+        memset(ctx->buffer, 0, 56);
     }
 
     /*
      * Add message length
      */
-    high = ( ctx->total[0] >> 29 )
-         | ( ctx->total[1] <<  3 );
-    low  = ( ctx->total[0] <<  3 );
+    high = (ctx->total[0] >> 29)
+           | (ctx->total[1] <<  3);
+    low  = (ctx->total[0] <<  3);
 
-    PUT_UINT32_BE( high, ctx->buffer, 56 );
-    PUT_UINT32_BE( low,  ctx->buffer, 60 );
+    PUT_UINT32_BE(high, ctx->buffer, 56);
+    PUT_UINT32_BE(low,  ctx->buffer, 60);
 
-    if( ( ret = mbedtls_internal_sha1_process( ctx, ctx->buffer ) ) != 0 )
-        return( ret );
+    if ((ret = mbedtls_internal_sha1_process(ctx, ctx->buffer)) != 0)
+        return (ret);
 
     /*
      * Output final state
      */
-    PUT_UINT32_BE( ctx->state[0], output,  0 );
-    PUT_UINT32_BE( ctx->state[1], output,  4 );
-    PUT_UINT32_BE( ctx->state[2], output,  8 );
-    PUT_UINT32_BE( ctx->state[3], output, 12 );
-    PUT_UINT32_BE( ctx->state[4], output, 16 );
+    PUT_UINT32_BE(ctx->state[0], output,  0);
+    PUT_UINT32_BE(ctx->state[1], output,  4);
+    PUT_UINT32_BE(ctx->state[2], output,  8);
+    PUT_UINT32_BE(ctx->state[3], output, 12);
+    PUT_UINT32_BE(ctx->state[4], output, 16);
 
-    return( 0 );
+    return (0);
 }
 
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
-void mbedtls_sha1_finish( mbedtls_sha1_context *ctx,
-                          unsigned char output[20] )
+void mbedtls_sha1_finish(mbedtls_sha1_context *ctx,
+                         unsigned char output[20])
 {
-    mbedtls_sha1_finish_ret( ctx, output );
+    mbedtls_sha1_finish_ret(ctx, output);
 }
 #endif
 
@@ -415,36 +410,36 @@ void mbedtls_sha1_finish( mbedtls_sha1_context *ctx,
 /*
  * output = SHA-1( input buffer )
  */
-int mbedtls_sha1_ret( const unsigned char *input,
-                      size_t ilen,
-                      unsigned char output[20] )
+int mbedtls_sha1_ret(const unsigned char *input,
+                     size_t ilen,
+                     unsigned char output[20])
 {
     int ret;
     mbedtls_sha1_context ctx;
 
-    mbedtls_sha1_init( &ctx );
+    mbedtls_sha1_init(&ctx);
 
-    if( ( ret = mbedtls_sha1_starts_ret( &ctx ) ) != 0 )
+    if ((ret = mbedtls_sha1_starts_ret(&ctx)) != 0)
         goto exit;
 
-    if( ( ret = mbedtls_sha1_update_ret( &ctx, input, ilen ) ) != 0 )
+    if ((ret = mbedtls_sha1_update_ret(&ctx, input, ilen)) != 0)
         goto exit;
 
-    if( ( ret = mbedtls_sha1_finish_ret( &ctx, output ) ) != 0 )
+    if ((ret = mbedtls_sha1_finish_ret(&ctx, output)) != 0)
         goto exit;
 
 exit:
-    mbedtls_sha1_free( &ctx );
+    mbedtls_sha1_free(&ctx);
 
-    return( ret );
+    return (ret);
 }
 
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
-void mbedtls_sha1( const unsigned char *input,
-                   size_t ilen,
-                   unsigned char output[20] )
+void mbedtls_sha1(const unsigned char *input,
+                  size_t ilen,
+                  unsigned char output[20])
 {
-    mbedtls_sha1_ret( input, ilen, output );
+    mbedtls_sha1_ret(input, ilen, output);
 }
 #endif
 
@@ -452,96 +447,93 @@ void mbedtls_sha1( const unsigned char *input,
 /*
  * FIPS-180-1 test vectors
  */
-static const unsigned char sha1_test_buf[3][57] =
-{
+static const unsigned char sha1_test_buf[3][57] = {
     { "abc" },
     { "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq" },
     { "" }
 };
 
-static const size_t sha1_test_buflen[3] =
-{
+static const size_t sha1_test_buflen[3] = {
     3, 56, 1000
 };
 
-static const unsigned char sha1_test_sum[3][20] =
-{
-    { 0xA9, 0x99, 0x3E, 0x36, 0x47, 0x06, 0x81, 0x6A, 0xBA, 0x3E,
-      0x25, 0x71, 0x78, 0x50, 0xC2, 0x6C, 0x9C, 0xD0, 0xD8, 0x9D },
-    { 0x84, 0x98, 0x3E, 0x44, 0x1C, 0x3B, 0xD2, 0x6E, 0xBA, 0xAE,
-      0x4A, 0xA1, 0xF9, 0x51, 0x29, 0xE5, 0xE5, 0x46, 0x70, 0xF1 },
-    { 0x34, 0xAA, 0x97, 0x3C, 0xD4, 0xC4, 0xDA, 0xA4, 0xF6, 0x1E,
-      0xEB, 0x2B, 0xDB, 0xAD, 0x27, 0x31, 0x65, 0x34, 0x01, 0x6F }
+static const unsigned char sha1_test_sum[3][20] = {
+    {
+        0xA9, 0x99, 0x3E, 0x36, 0x47, 0x06, 0x81, 0x6A, 0xBA, 0x3E,
+        0x25, 0x71, 0x78, 0x50, 0xC2, 0x6C, 0x9C, 0xD0, 0xD8, 0x9D
+    },
+    {
+        0x84, 0x98, 0x3E, 0x44, 0x1C, 0x3B, 0xD2, 0x6E, 0xBA, 0xAE,
+        0x4A, 0xA1, 0xF9, 0x51, 0x29, 0xE5, 0xE5, 0x46, 0x70, 0xF1
+    },
+    {
+        0x34, 0xAA, 0x97, 0x3C, 0xD4, 0xC4, 0xDA, 0xA4, 0xF6, 0x1E,
+        0xEB, 0x2B, 0xDB, 0xAD, 0x27, 0x31, 0x65, 0x34, 0x01, 0x6F
+    }
 };
 
 /*
  * Checkup routine
  */
-int mbedtls_sha1_self_test( int verbose )
+int mbedtls_sha1_self_test(int verbose)
 {
     int i, j, buflen, ret = 0;
     unsigned char buf[1024];
     unsigned char sha1sum[20];
     mbedtls_sha1_context ctx;
 
-    mbedtls_sha1_init( &ctx );
+    mbedtls_sha1_init(&ctx);
 
     /*
      * SHA-1
      */
-    for( i = 0; i < 3; i++ )
-    {
-        if( verbose != 0 )
-            mbedtls_printf( "  SHA-1 test #%d: ", i + 1 );
+    for (i = 0; i < 3; i++) {
+        if (verbose != 0)
+            mbedtls_printf("  SHA-1 test #%d: ", i + 1);
 
-        if( ( ret = mbedtls_sha1_starts_ret( &ctx ) ) != 0 )
+        if ((ret = mbedtls_sha1_starts_ret(&ctx)) != 0)
             goto fail;
 
-        if( i == 2 )
-        {
-            memset( buf, 'a', buflen = 1000 );
+        if (i == 2) {
+            memset(buf, 'a', buflen = 1000);
 
-            for( j = 0; j < 1000; j++ )
-            {
-                ret = mbedtls_sha1_update_ret( &ctx, buf, buflen );
-                if( ret != 0 )
+            for (j = 0; j < 1000; j++) {
+                ret = mbedtls_sha1_update_ret(&ctx, buf, buflen);
+                if (ret != 0)
                     goto fail;
             }
-        }
-        else
-        {
-            ret = mbedtls_sha1_update_ret( &ctx, sha1_test_buf[i],
-                                           sha1_test_buflen[i] );
-            if( ret != 0 )
+        } else {
+            ret = mbedtls_sha1_update_ret(&ctx, sha1_test_buf[i],
+                                          sha1_test_buflen[i]);
+            if (ret != 0)
                 goto fail;
         }
 
-        if( ( ret = mbedtls_sha1_finish_ret( &ctx, sha1sum ) ) != 0 )
+        if ((ret = mbedtls_sha1_finish_ret(&ctx, sha1sum)) != 0)
             goto fail;
 
-        if( memcmp( sha1sum, sha1_test_sum[i], 20 ) != 0 )
-        {
+        if (memcmp(sha1sum, sha1_test_sum[i], 20) != 0) {
             ret = 1;
             goto fail;
         }
 
-        if( verbose != 0 )
-            mbedtls_printf( "passed\n" );
+        if (verbose != 0)
+            mbedtls_printf("passed\n");
     }
 
-    if( verbose != 0 )
-        mbedtls_printf( "\n" );
+    if (verbose != 0)
+        mbedtls_printf("\n");
 
     goto exit;
 
 fail:
-    if( verbose != 0 )
-        mbedtls_printf( "failed\n" );
+    if (verbose != 0)
+        mbedtls_printf("failed\n");
 
 exit:
-    mbedtls_sha1_free( &ctx );
+    mbedtls_sha1_free(&ctx);
 
-    return( ret );
+    return (ret);
 }
 
 #endif /* MBEDTLS_SELF_TEST */
diff --git a/common/mbedtls/sha1.h b/common/mbedtls/sha1.h
index 872fe1b05..c57f6b99b 100644
--- a/common/mbedtls/sha1.h
+++ b/common/mbedtls/sha1.h
@@ -60,8 +60,7 @@ extern "C" {
  *                 stronger message digests instead.
  *
  */
-typedef struct mbedtls_sha1_context
-{
+typedef struct mbedtls_sha1_context {
     uint32_t total[2];          /*!< The number of Bytes processed.  */
     uint32_t state[5];          /*!< The intermediate digest state.  */
     unsigned char buffer[64];   /*!< The data block being processed. */
@@ -82,7 +81,7 @@ mbedtls_sha1_context;
  * \param ctx      The SHA-1 context to initialize.
  *
  */
-void mbedtls_sha1_init( mbedtls_sha1_context *ctx );
+void mbedtls_sha1_init(mbedtls_sha1_context *ctx);
 
 /**
  * \brief          This function clears a SHA-1 context.
@@ -94,7 +93,7 @@ void mbedtls_sha1_init( mbedtls_sha1_context *ctx );
  * \param ctx      The SHA-1 context to clear.
  *
  */
-void mbedtls_sha1_free( mbedtls_sha1_context *ctx );
+void mbedtls_sha1_free(mbedtls_sha1_context *ctx);
 
 /**
  * \brief          This function clones the state of a SHA-1 context.
@@ -107,8 +106,8 @@ void mbedtls_sha1_free( mbedtls_sha1_context *ctx );
  * \param src      The SHA-1 context to clone from.
  *
  */
-void mbedtls_sha1_clone( mbedtls_sha1_context *dst,
-                         const mbedtls_sha1_context *src );
+void mbedtls_sha1_clone(mbedtls_sha1_context *dst,
+                        const mbedtls_sha1_context *src);
 
 /**
  * \brief          This function starts a SHA-1 checksum calculation.
@@ -122,7 +121,7 @@ void mbedtls_sha1_clone( mbedtls_sha1_context *dst,
  * \return         \c 0 on success.
  *
  */
-int mbedtls_sha1_starts_ret( mbedtls_sha1_context *ctx );
+int mbedtls_sha1_starts_ret(mbedtls_sha1_context *ctx);
 
 /**
  * \brief          This function feeds an input buffer into an ongoing SHA-1
@@ -138,9 +137,9 @@ int mbedtls_sha1_starts_ret( mbedtls_sha1_context *ctx );
  *
  * \return         \c 0 on success.
  */
-int mbedtls_sha1_update_ret( mbedtls_sha1_context *ctx,
-                             const unsigned char *input,
-                             size_t ilen );
+int mbedtls_sha1_update_ret(mbedtls_sha1_context *ctx,
+                            const unsigned char *input,
+                            size_t ilen);
 
 /**
  * \brief          This function finishes the SHA-1 operation, and writes
@@ -155,8 +154,8 @@ int mbedtls_sha1_update_ret( mbedtls_sha1_context *ctx,
  *
  * \return         \c 0 on success.
  */
-int mbedtls_sha1_finish_ret( mbedtls_sha1_context *ctx,
-                             unsigned char output[20] );
+int mbedtls_sha1_finish_ret(mbedtls_sha1_context *ctx,
+                            unsigned char output[20]);
 
 /**
  * \brief          SHA-1 process data block (internal use only).
@@ -171,8 +170,8 @@ int mbedtls_sha1_finish_ret( mbedtls_sha1_context *ctx,
  * \return         \c 0 on success.
  *
  */
-int mbedtls_internal_sha1_process( mbedtls_sha1_context *ctx,
-                                   const unsigned char data[64] );
+int mbedtls_internal_sha1_process(mbedtls_sha1_context *ctx,
+                                  const unsigned char data[64]);
 
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
 #if defined(MBEDTLS_DEPRECATED_WARNING)
@@ -192,7 +191,7 @@ int mbedtls_internal_sha1_process( mbedtls_sha1_context *ctx,
  * \param ctx      The SHA-1 context to initialize.
  *
  */
-MBEDTLS_DEPRECATED void mbedtls_sha1_starts( mbedtls_sha1_context *ctx );
+MBEDTLS_DEPRECATED void mbedtls_sha1_starts(mbedtls_sha1_context *ctx);
 
 /**
  * \brief          This function feeds an input buffer into an ongoing SHA-1
@@ -209,9 +208,9 @@ MBEDTLS_DEPRECATED void mbedtls_sha1_starts( mbedtls_sha1_context *ctx );
  * \param ilen     The length of the input data.
  *
  */
-MBEDTLS_DEPRECATED void mbedtls_sha1_update( mbedtls_sha1_context *ctx,
-                                             const unsigned char *input,
-                                             size_t ilen );
+MBEDTLS_DEPRECATED void mbedtls_sha1_update(mbedtls_sha1_context *ctx,
+                                            const unsigned char *input,
+                                            size_t ilen);
 
 /**
  * \brief          This function finishes the SHA-1 operation, and writes
@@ -227,8 +226,8 @@ MBEDTLS_DEPRECATED void mbedtls_sha1_update( mbedtls_sha1_context *ctx,
  * \param output   The SHA-1 checksum result.
  *
  */
-MBEDTLS_DEPRECATED void mbedtls_sha1_finish( mbedtls_sha1_context *ctx,
-                                             unsigned char output[20] );
+MBEDTLS_DEPRECATED void mbedtls_sha1_finish(mbedtls_sha1_context *ctx,
+                                            unsigned char output[20]);
 
 /**
  * \brief          SHA-1 process data block (internal use only).
@@ -243,8 +242,8 @@ MBEDTLS_DEPRECATED void mbedtls_sha1_finish( mbedtls_sha1_context *ctx,
  * \param data     The data block being processed.
  *
  */
-MBEDTLS_DEPRECATED void mbedtls_sha1_process( mbedtls_sha1_context *ctx,
-                                              const unsigned char data[64] );
+MBEDTLS_DEPRECATED void mbedtls_sha1_process(mbedtls_sha1_context *ctx,
+                                             const unsigned char data[64]);
 
 #undef MBEDTLS_DEPRECATED
 #endif /* !MBEDTLS_DEPRECATED_REMOVED */
@@ -269,9 +268,9 @@ MBEDTLS_DEPRECATED void mbedtls_sha1_process( mbedtls_sha1_context *ctx,
  * \return         \c 0 on success.
  *
  */
-int mbedtls_sha1_ret( const unsigned char *input,
-                      size_t ilen,
-                      unsigned char output[20] );
+int mbedtls_sha1_ret(const unsigned char *input,
+                     size_t ilen,
+                     unsigned char output[20]);
 
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
 #if defined(MBEDTLS_DEPRECATED_WARNING)
@@ -299,9 +298,9 @@ int mbedtls_sha1_ret( const unsigned char *input,
  * \param output   The SHA-1 checksum result.
  *
  */
-MBEDTLS_DEPRECATED void mbedtls_sha1( const unsigned char *input,
-                                      size_t ilen,
-                                      unsigned char output[20] );
+MBEDTLS_DEPRECATED void mbedtls_sha1(const unsigned char *input,
+                                     size_t ilen,
+                                     unsigned char output[20]);
 
 #undef MBEDTLS_DEPRECATED
 #endif /* !MBEDTLS_DEPRECATED_REMOVED */
@@ -317,7 +316,7 @@ MBEDTLS_DEPRECATED void mbedtls_sha1( const unsigned char *input,
  * \return         \c 1 on failure.
  *
  */
-int mbedtls_sha1_self_test( int verbose );
+int mbedtls_sha1_self_test(int verbose);
 
 #ifdef __cplusplus
 }
diff --git a/common/mbedtls/sha256.c b/common/mbedtls/sha256.c
index 06b5f7a7b..a1af184b2 100644
--- a/common/mbedtls/sha256.c
+++ b/common/mbedtls/sha256.c
@@ -58,39 +58,39 @@
  */
 #ifndef GET_UINT32_BE
 #define GET_UINT32_BE(n,b,i)                            \
-do {                                                    \
-    (n) = ( (uint32_t) (b)[(i)    ] << 24 )             \
-        | ( (uint32_t) (b)[(i) + 1] << 16 )             \
-        | ( (uint32_t) (b)[(i) + 2] <<  8 )             \
-        | ( (uint32_t) (b)[(i) + 3]       );            \
-} while( 0 )
+    do {                                                    \
+        (n) = ( (uint32_t) (b)[(i)    ] << 24 )             \
+              | ( (uint32_t) (b)[(i) + 1] << 16 )             \
+              | ( (uint32_t) (b)[(i) + 2] <<  8 )             \
+              | ( (uint32_t) (b)[(i) + 3]       );            \
+    } while( 0 )
 #endif
 
 #ifndef PUT_UINT32_BE
 #define PUT_UINT32_BE(n,b,i)                            \
-do {                                                    \
-    (b)[(i)    ] = (unsigned char) ( (n) >> 24 );       \
-    (b)[(i) + 1] = (unsigned char) ( (n) >> 16 );       \
-    (b)[(i) + 2] = (unsigned char) ( (n) >>  8 );       \
-    (b)[(i) + 3] = (unsigned char) ( (n)       );       \
-} while( 0 )
+    do {                                                    \
+        (b)[(i)    ] = (unsigned char) ( (n) >> 24 );       \
+        (b)[(i) + 1] = (unsigned char) ( (n) >> 16 );       \
+        (b)[(i) + 2] = (unsigned char) ( (n) >>  8 );       \
+        (b)[(i) + 3] = (unsigned char) ( (n)       );       \
+    } while( 0 )
 #endif
 
-void mbedtls_sha256_init( mbedtls_sha256_context *ctx )
+void mbedtls_sha256_init(mbedtls_sha256_context *ctx)
 {
-    memset( ctx, 0, sizeof( mbedtls_sha256_context ) );
+    memset(ctx, 0, sizeof(mbedtls_sha256_context));
 }
 
-void mbedtls_sha256_free( mbedtls_sha256_context *ctx )
+void mbedtls_sha256_free(mbedtls_sha256_context *ctx)
 {
-    if( ctx == NULL )
+    if (ctx == NULL)
         return;
 
-    mbedtls_platform_zeroize( ctx, sizeof( mbedtls_sha256_context ) );
+    mbedtls_platform_zeroize(ctx, sizeof(mbedtls_sha256_context));
 }
 
-void mbedtls_sha256_clone( mbedtls_sha256_context *dst,
-                           const mbedtls_sha256_context *src )
+void mbedtls_sha256_clone(mbedtls_sha256_context *dst,
+                          const mbedtls_sha256_context *src)
 {
     *dst = *src;
 }
@@ -98,13 +98,12 @@ void mbedtls_sha256_clone( mbedtls_sha256_context *dst,
 /*
  * SHA-256 context setup
  */
-int mbedtls_sha256_starts_ret( mbedtls_sha256_context *ctx, int is224 )
+int mbedtls_sha256_starts_ret(mbedtls_sha256_context *ctx, int is224)
 {
     ctx->total[0] = 0;
     ctx->total[1] = 0;
 
-    if( is224 == 0 )
-    {
+    if (is224 == 0) {
         /* SHA-256 */
         ctx->state[0] = 0x6A09E667;
         ctx->state[1] = 0xBB67AE85;
@@ -114,9 +113,7 @@ int mbedtls_sha256_starts_ret( mbedtls_sha256_context *ctx, int is224 )
         ctx->state[5] = 0x9B05688C;
         ctx->state[6] = 0x1F83D9AB;
         ctx->state[7] = 0x5BE0CD19;
-    }
-    else
-    {
+    } else {
         /* SHA-224 */
         ctx->state[0] = 0xC1059ED8;
         ctx->state[1] = 0x367CD507;
@@ -130,20 +127,19 @@ int mbedtls_sha256_starts_ret( mbedtls_sha256_context *ctx, int is224 )
 
     ctx->is224 = is224;
 
-    return( 0 );
+    return (0);
 }
 
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
-void mbedtls_sha256_starts( mbedtls_sha256_context *ctx,
-                            int is224 )
+void mbedtls_sha256_starts(mbedtls_sha256_context *ctx,
+                           int is224)
 {
-    mbedtls_sha256_starts_ret( ctx, is224 );
+    mbedtls_sha256_starts_ret(ctx, is224);
 }
 #endif
 
 #if !defined(MBEDTLS_SHA256_PROCESS_ALT)
-static const uint32_t K[] =
-{
+static const uint32_t K[] = {
     0x428A2F98, 0x71374491, 0xB5C0FBCF, 0xE9B5DBA5,
     0x3956C25B, 0x59F111F1, 0x923F82A4, 0xAB1C5ED5,
     0xD807AA98, 0x12835B01, 0x243185BE, 0x550C7DC3,
@@ -175,81 +171,85 @@ static const uint32_t K[] =
 #define F1(x,y,z) (z ^ (x & (y ^ z)))
 
 #define R(t)                                    \
-(                                               \
-    W[t] = S1(W[t -  2]) + W[t -  7] +          \
-           S0(W[t - 15]) + W[t - 16]            \
-)
+    (                                               \
+                                                    W[t] = S1(W[t -  2]) + W[t -  7] +          \
+                                                           S0(W[t - 15]) + W[t - 16]            \
+    )
 
 #define P(a,b,c,d,e,f,g,h,x,K)                  \
-{                                               \
-    temp1 = h + S3(e) + F1(e,f,g) + K + x;      \
-    temp2 = S2(a) + F0(a,b,c);                  \
-    d += temp1; h = temp1 + temp2;              \
-}
+    {                                               \
+        temp1 = h + S3(e) + F1(e,f,g) + K + x;      \
+        temp2 = S2(a) + F0(a,b,c);                  \
+        d += temp1; h = temp1 + temp2;              \
+    }
 
-int mbedtls_internal_sha256_process( mbedtls_sha256_context *ctx,
-                                const unsigned char data[64] )
+int mbedtls_internal_sha256_process(mbedtls_sha256_context *ctx,
+                                    const unsigned char data[64])
 {
     uint32_t temp1, temp2, W[64];
     uint32_t A[8];
     unsigned int i;
 
-    for( i = 0; i < 8; i++ )
+    for (i = 0; i < 8; i++)
         A[i] = ctx->state[i];
 
 #if defined(MBEDTLS_SHA256_SMALLER)
-    for( i = 0; i < 64; i++ )
-    {
-        if( i < 16 )
-            GET_UINT32_BE( W[i], data, 4 * i );
+    for (i = 0; i < 64; i++) {
+        if (i < 16)
+            GET_UINT32_BE(W[i], data, 4 * i);
         else
-            R( i );
+            R(i);
 
-        P( A[0], A[1], A[2], A[3], A[4], A[5], A[6], A[7], W[i], K[i] );
+        P(A[0], A[1], A[2], A[3], A[4], A[5], A[6], A[7], W[i], K[i]);
 
-        temp1 = A[7]; A[7] = A[6]; A[6] = A[5]; A[5] = A[4]; A[4] = A[3];
-        A[3] = A[2]; A[2] = A[1]; A[1] = A[0]; A[0] = temp1;
+        temp1 = A[7];
+        A[7] = A[6];
+        A[6] = A[5];
+        A[5] = A[4];
+        A[4] = A[3];
+        A[3] = A[2];
+        A[2] = A[1];
+        A[1] = A[0];
+        A[0] = temp1;
     }
 #else /* MBEDTLS_SHA256_SMALLER */
-    for( i = 0; i < 16; i++ )
-        GET_UINT32_BE( W[i], data, 4 * i );
+    for (i = 0; i < 16; i++)
+        GET_UINT32_BE(W[i], data, 4 * i);
 
-    for( i = 0; i < 16; i += 8 )
-    {
-        P( A[0], A[1], A[2], A[3], A[4], A[5], A[6], A[7], W[i+0], K[i+0] );
-        P( A[7], A[0], A[1], A[2], A[3], A[4], A[5], A[6], W[i+1], K[i+1] );
-        P( A[6], A[7], A[0], A[1], A[2], A[3], A[4], A[5], W[i+2], K[i+2] );
-        P( A[5], A[6], A[7], A[0], A[1], A[2], A[3], A[4], W[i+3], K[i+3] );
-        P( A[4], A[5], A[6], A[7], A[0], A[1], A[2], A[3], W[i+4], K[i+4] );
-        P( A[3], A[4], A[5], A[6], A[7], A[0], A[1], A[2], W[i+5], K[i+5] );
-        P( A[2], A[3], A[4], A[5], A[6], A[7], A[0], A[1], W[i+6], K[i+6] );
-        P( A[1], A[2], A[3], A[4], A[5], A[6], A[7], A[0], W[i+7], K[i+7] );
+    for (i = 0; i < 16; i += 8) {
+        P(A[0], A[1], A[2], A[3], A[4], A[5], A[6], A[7], W[i + 0], K[i + 0]);
+        P(A[7], A[0], A[1], A[2], A[3], A[4], A[5], A[6], W[i + 1], K[i + 1]);
+        P(A[6], A[7], A[0], A[1], A[2], A[3], A[4], A[5], W[i + 2], K[i + 2]);
+        P(A[5], A[6], A[7], A[0], A[1], A[2], A[3], A[4], W[i + 3], K[i + 3]);
+        P(A[4], A[5], A[6], A[7], A[0], A[1], A[2], A[3], W[i + 4], K[i + 4]);
+        P(A[3], A[4], A[5], A[6], A[7], A[0], A[1], A[2], W[i + 5], K[i + 5]);
+        P(A[2], A[3], A[4], A[5], A[6], A[7], A[0], A[1], W[i + 6], K[i + 6]);
+        P(A[1], A[2], A[3], A[4], A[5], A[6], A[7], A[0], W[i + 7], K[i + 7]);
     }
 
-    for( i = 16; i < 64; i += 8 )
-    {
-        P( A[0], A[1], A[2], A[3], A[4], A[5], A[6], A[7], R(i+0), K[i+0] );
-        P( A[7], A[0], A[1], A[2], A[3], A[4], A[5], A[6], R(i+1), K[i+1] );
-        P( A[6], A[7], A[0], A[1], A[2], A[3], A[4], A[5], R(i+2), K[i+2] );
-        P( A[5], A[6], A[7], A[0], A[1], A[2], A[3], A[4], R(i+3), K[i+3] );
-        P( A[4], A[5], A[6], A[7], A[0], A[1], A[2], A[3], R(i+4), K[i+4] );
-        P( A[3], A[4], A[5], A[6], A[7], A[0], A[1], A[2], R(i+5), K[i+5] );
-        P( A[2], A[3], A[4], A[5], A[6], A[7], A[0], A[1], R(i+6), K[i+6] );
-        P( A[1], A[2], A[3], A[4], A[5], A[6], A[7], A[0], R(i+7), K[i+7] );
+    for (i = 16; i < 64; i += 8) {
+        P(A[0], A[1], A[2], A[3], A[4], A[5], A[6], A[7], R(i + 0), K[i + 0]);
+        P(A[7], A[0], A[1], A[2], A[3], A[4], A[5], A[6], R(i + 1), K[i + 1]);
+        P(A[6], A[7], A[0], A[1], A[2], A[3], A[4], A[5], R(i + 2), K[i + 2]);
+        P(A[5], A[6], A[7], A[0], A[1], A[2], A[3], A[4], R(i + 3), K[i + 3]);
+        P(A[4], A[5], A[6], A[7], A[0], A[1], A[2], A[3], R(i + 4), K[i + 4]);
+        P(A[3], A[4], A[5], A[6], A[7], A[0], A[1], A[2], R(i + 5), K[i + 5]);
+        P(A[2], A[3], A[4], A[5], A[6], A[7], A[0], A[1], R(i + 6), K[i + 6]);
+        P(A[1], A[2], A[3], A[4], A[5], A[6], A[7], A[0], R(i + 7), K[i + 7]);
     }
 #endif /* MBEDTLS_SHA256_SMALLER */
 
-    for( i = 0; i < 8; i++ )
+    for (i = 0; i < 8; i++)
         ctx->state[i] += A[i];
 
-    return( 0 );
+    return (0);
 }
 
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
-void mbedtls_sha256_process( mbedtls_sha256_context *ctx,
-                             const unsigned char data[64] )
+void mbedtls_sha256_process(mbedtls_sha256_context *ctx,
+                            const unsigned char data[64])
 {
-    mbedtls_internal_sha256_process( ctx, data );
+    mbedtls_internal_sha256_process(ctx, data);
 }
 #endif
 #endif /* !MBEDTLS_SHA256_PROCESS_ALT */
@@ -257,16 +257,16 @@ void mbedtls_sha256_process( mbedtls_sha256_context *ctx,
 /*
  * SHA-256 process buffer
  */
-int mbedtls_sha256_update_ret( mbedtls_sha256_context *ctx,
-                               const unsigned char *input,
-                               size_t ilen )
+int mbedtls_sha256_update_ret(mbedtls_sha256_context *ctx,
+                              const unsigned char *input,
+                              size_t ilen)
 {
     int ret;
     size_t fill;
     uint32_t left;
 
-    if( ilen == 0 )
-        return( 0 );
+    if (ilen == 0)
+        return (0);
 
     left = ctx->total[0] & 0x3F;
     fill = 64 - left;
@@ -274,50 +274,48 @@ int mbedtls_sha256_update_ret( mbedtls_sha256_context *ctx,
     ctx->total[0] += (uint32_t) ilen;
     ctx->total[0] &= 0xFFFFFFFF;
 
-    if( ctx->total[0] < (uint32_t) ilen )
+    if (ctx->total[0] < (uint32_t) ilen)
         ctx->total[1]++;
 
-    if( left && ilen >= fill )
-    {
-        memcpy( (void *) (ctx->buffer + left), input, fill );
+    if (left && ilen >= fill) {
+        memcpy((void *)(ctx->buffer + left), input, fill);
 
-        if( ( ret = mbedtls_internal_sha256_process( ctx, ctx->buffer ) ) != 0 )
-            return( ret );
+        if ((ret = mbedtls_internal_sha256_process(ctx, ctx->buffer)) != 0)
+            return (ret);
 
         input += fill;
         ilen  -= fill;
         left = 0;
     }
 
-    while( ilen >= 64 )
-    {
-        if( ( ret = mbedtls_internal_sha256_process( ctx, input ) ) != 0 )
-            return( ret );
+    while (ilen >= 64) {
+        if ((ret = mbedtls_internal_sha256_process(ctx, input)) != 0)
+            return (ret);
 
         input += 64;
         ilen  -= 64;
     }
 
-    if( ilen > 0 )
-        memcpy( (void *) (ctx->buffer + left), input, ilen );
+    if (ilen > 0)
+        memcpy((void *)(ctx->buffer + left), input, ilen);
 
-    return( 0 );
+    return (0);
 }
 
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
-void mbedtls_sha256_update( mbedtls_sha256_context *ctx,
-                            const unsigned char *input,
-                            size_t ilen )
+void mbedtls_sha256_update(mbedtls_sha256_context *ctx,
+                           const unsigned char *input,
+                           size_t ilen)
 {
-    mbedtls_sha256_update_ret( ctx, input, ilen );
+    mbedtls_sha256_update_ret(ctx, input, ilen);
 }
 #endif
 
 /*
  * SHA-256 final digest
  */
-int mbedtls_sha256_finish_ret( mbedtls_sha256_context *ctx,
-                               unsigned char output[32] )
+int mbedtls_sha256_finish_ret(mbedtls_sha256_context *ctx,
+                              unsigned char output[32])
 {
     int ret;
     uint32_t used;
@@ -330,57 +328,54 @@ int mbedtls_sha256_finish_ret( mbedtls_sha256_context *ctx,
 
     ctx->buffer[used++] = 0x80;
 
-    if( used <= 56 )
-    {
+    if (used <= 56) {
         /* Enough room for padding + length in current block */
-        memset( ctx->buffer + used, 0, 56 - used );
-    }
-    else
-    {
+        memset(ctx->buffer + used, 0, 56 - used);
+    } else {
         /* We'll need an extra block */
-        memset( ctx->buffer + used, 0, 64 - used );
+        memset(ctx->buffer + used, 0, 64 - used);
 
-        if( ( ret = mbedtls_internal_sha256_process( ctx, ctx->buffer ) ) != 0 )
-            return( ret );
+        if ((ret = mbedtls_internal_sha256_process(ctx, ctx->buffer)) != 0)
+            return (ret);
 
-        memset( ctx->buffer, 0, 56 );
+        memset(ctx->buffer, 0, 56);
     }
 
     /*
      * Add message length
      */
-    high = ( ctx->total[0] >> 29 )
-         | ( ctx->total[1] <<  3 );
-    low  = ( ctx->total[0] <<  3 );
+    high = (ctx->total[0] >> 29)
+           | (ctx->total[1] <<  3);
+    low  = (ctx->total[0] <<  3);
 
-    PUT_UINT32_BE( high, ctx->buffer, 56 );
-    PUT_UINT32_BE( low,  ctx->buffer, 60 );
+    PUT_UINT32_BE(high, ctx->buffer, 56);
+    PUT_UINT32_BE(low,  ctx->buffer, 60);
 
-    if( ( ret = mbedtls_internal_sha256_process( ctx, ctx->buffer ) ) != 0 )
-        return( ret );
+    if ((ret = mbedtls_internal_sha256_process(ctx, ctx->buffer)) != 0)
+        return (ret);
 
     /*
      * Output final state
      */
-    PUT_UINT32_BE( ctx->state[0], output,  0 );
-    PUT_UINT32_BE( ctx->state[1], output,  4 );
-    PUT_UINT32_BE( ctx->state[2], output,  8 );
-    PUT_UINT32_BE( ctx->state[3], output, 12 );
-    PUT_UINT32_BE( ctx->state[4], output, 16 );
-    PUT_UINT32_BE( ctx->state[5], output, 20 );
-    PUT_UINT32_BE( ctx->state[6], output, 24 );
+    PUT_UINT32_BE(ctx->state[0], output,  0);
+    PUT_UINT32_BE(ctx->state[1], output,  4);
+    PUT_UINT32_BE(ctx->state[2], output,  8);
+    PUT_UINT32_BE(ctx->state[3], output, 12);
+    PUT_UINT32_BE(ctx->state[4], output, 16);
+    PUT_UINT32_BE(ctx->state[5], output, 20);
+    PUT_UINT32_BE(ctx->state[6], output, 24);
 
-    if( ctx->is224 == 0 )
-        PUT_UINT32_BE( ctx->state[7], output, 28 );
+    if (ctx->is224 == 0)
+        PUT_UINT32_BE(ctx->state[7], output, 28);
 
-    return( 0 );
+    return (0);
 }
 
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
-void mbedtls_sha256_finish( mbedtls_sha256_context *ctx,
-                            unsigned char output[32] )
+void mbedtls_sha256_finish(mbedtls_sha256_context *ctx,
+                           unsigned char output[32])
 {
-    mbedtls_sha256_finish_ret( ctx, output );
+    mbedtls_sha256_finish_ret(ctx, output);
 }
 #endif
 
@@ -389,38 +384,38 @@ void mbedtls_sha256_finish( mbedtls_sha256_context *ctx,
 /*
  * output = SHA-256( input buffer )
  */
-int mbedtls_sha256_ret( const unsigned char *input,
-                        size_t ilen,
-                        unsigned char output[32],
-                        int is224 )
+int mbedtls_sha256_ret(const unsigned char *input,
+                       size_t ilen,
+                       unsigned char output[32],
+                       int is224)
 {
     int ret;
     mbedtls_sha256_context ctx;
 
-    mbedtls_sha256_init( &ctx );
+    mbedtls_sha256_init(&ctx);
 
-    if( ( ret = mbedtls_sha256_starts_ret( &ctx, is224 ) ) != 0 )
+    if ((ret = mbedtls_sha256_starts_ret(&ctx, is224)) != 0)
         goto exit;
 
-    if( ( ret = mbedtls_sha256_update_ret( &ctx, input, ilen ) ) != 0 )
+    if ((ret = mbedtls_sha256_update_ret(&ctx, input, ilen)) != 0)
         goto exit;
 
-    if( ( ret = mbedtls_sha256_finish_ret( &ctx, output ) ) != 0 )
+    if ((ret = mbedtls_sha256_finish_ret(&ctx, output)) != 0)
         goto exit;
 
 exit:
-    mbedtls_sha256_free( &ctx );
+    mbedtls_sha256_free(&ctx);
 
-    return( ret );
+    return (ret);
 }
 
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
-void mbedtls_sha256( const unsigned char *input,
-                     size_t ilen,
-                     unsigned char output[32],
-                     int is224 )
+void mbedtls_sha256(const unsigned char *input,
+                    size_t ilen,
+                    unsigned char output[32],
+                    int is224)
 {
-    mbedtls_sha256_ret( input, ilen, output, is224 );
+    mbedtls_sha256_ret(input, ilen, output, is224);
 }
 #endif
 
@@ -428,133 +423,135 @@ void mbedtls_sha256( const unsigned char *input,
 /*
  * FIPS-180-2 test vectors
  */
-static const unsigned char sha256_test_buf[3][57] =
-{
+static const unsigned char sha256_test_buf[3][57] = {
     { "abc" },
     { "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq" },
     { "" }
 };
 
-static const size_t sha256_test_buflen[3] =
-{
+static const size_t sha256_test_buflen[3] = {
     3, 56, 1000
 };
 
-static const unsigned char sha256_test_sum[6][32] =
-{
+static const unsigned char sha256_test_sum[6][32] = {
     /*
      * SHA-224 test vectors
      */
-    { 0x23, 0x09, 0x7D, 0x22, 0x34, 0x05, 0xD8, 0x22,
-      0x86, 0x42, 0xA4, 0x77, 0xBD, 0xA2, 0x55, 0xB3,
-      0x2A, 0xAD, 0xBC, 0xE4, 0xBD, 0xA0, 0xB3, 0xF7,
-      0xE3, 0x6C, 0x9D, 0xA7 },
-    { 0x75, 0x38, 0x8B, 0x16, 0x51, 0x27, 0x76, 0xCC,
-      0x5D, 0xBA, 0x5D, 0xA1, 0xFD, 0x89, 0x01, 0x50,
-      0xB0, 0xC6, 0x45, 0x5C, 0xB4, 0xF5, 0x8B, 0x19,
-      0x52, 0x52, 0x25, 0x25 },
-    { 0x20, 0x79, 0x46, 0x55, 0x98, 0x0C, 0x91, 0xD8,
-      0xBB, 0xB4, 0xC1, 0xEA, 0x97, 0x61, 0x8A, 0x4B,
-      0xF0, 0x3F, 0x42, 0x58, 0x19, 0x48, 0xB2, 0xEE,
-      0x4E, 0xE7, 0xAD, 0x67 },
+    {
+        0x23, 0x09, 0x7D, 0x22, 0x34, 0x05, 0xD8, 0x22,
+        0x86, 0x42, 0xA4, 0x77, 0xBD, 0xA2, 0x55, 0xB3,
+        0x2A, 0xAD, 0xBC, 0xE4, 0xBD, 0xA0, 0xB3, 0xF7,
+        0xE3, 0x6C, 0x9D, 0xA7
+    },
+    {
+        0x75, 0x38, 0x8B, 0x16, 0x51, 0x27, 0x76, 0xCC,
+        0x5D, 0xBA, 0x5D, 0xA1, 0xFD, 0x89, 0x01, 0x50,
+        0xB0, 0xC6, 0x45, 0x5C, 0xB4, 0xF5, 0x8B, 0x19,
+        0x52, 0x52, 0x25, 0x25
+    },
+    {
+        0x20, 0x79, 0x46, 0x55, 0x98, 0x0C, 0x91, 0xD8,
+        0xBB, 0xB4, 0xC1, 0xEA, 0x97, 0x61, 0x8A, 0x4B,
+        0xF0, 0x3F, 0x42, 0x58, 0x19, 0x48, 0xB2, 0xEE,
+        0x4E, 0xE7, 0xAD, 0x67
+    },
 
     /*
      * SHA-256 test vectors
      */
-    { 0xBA, 0x78, 0x16, 0xBF, 0x8F, 0x01, 0xCF, 0xEA,
-      0x41, 0x41, 0x40, 0xDE, 0x5D, 0xAE, 0x22, 0x23,
-      0xB0, 0x03, 0x61, 0xA3, 0x96, 0x17, 0x7A, 0x9C,
-      0xB4, 0x10, 0xFF, 0x61, 0xF2, 0x00, 0x15, 0xAD },
-    { 0x24, 0x8D, 0x6A, 0x61, 0xD2, 0x06, 0x38, 0xB8,
-      0xE5, 0xC0, 0x26, 0x93, 0x0C, 0x3E, 0x60, 0x39,
-      0xA3, 0x3C, 0xE4, 0x59, 0x64, 0xFF, 0x21, 0x67,
-      0xF6, 0xEC, 0xED, 0xD4, 0x19, 0xDB, 0x06, 0xC1 },
-    { 0xCD, 0xC7, 0x6E, 0x5C, 0x99, 0x14, 0xFB, 0x92,
-      0x81, 0xA1, 0xC7, 0xE2, 0x84, 0xD7, 0x3E, 0x67,
-      0xF1, 0x80, 0x9A, 0x48, 0xA4, 0x97, 0x20, 0x0E,
-      0x04, 0x6D, 0x39, 0xCC, 0xC7, 0x11, 0x2C, 0xD0 }
+    {
+        0xBA, 0x78, 0x16, 0xBF, 0x8F, 0x01, 0xCF, 0xEA,
+        0x41, 0x41, 0x40, 0xDE, 0x5D, 0xAE, 0x22, 0x23,
+        0xB0, 0x03, 0x61, 0xA3, 0x96, 0x17, 0x7A, 0x9C,
+        0xB4, 0x10, 0xFF, 0x61, 0xF2, 0x00, 0x15, 0xAD
+    },
+    {
+        0x24, 0x8D, 0x6A, 0x61, 0xD2, 0x06, 0x38, 0xB8,
+        0xE5, 0xC0, 0x26, 0x93, 0x0C, 0x3E, 0x60, 0x39,
+        0xA3, 0x3C, 0xE4, 0x59, 0x64, 0xFF, 0x21, 0x67,
+        0xF6, 0xEC, 0xED, 0xD4, 0x19, 0xDB, 0x06, 0xC1
+    },
+    {
+        0xCD, 0xC7, 0x6E, 0x5C, 0x99, 0x14, 0xFB, 0x92,
+        0x81, 0xA1, 0xC7, 0xE2, 0x84, 0xD7, 0x3E, 0x67,
+        0xF1, 0x80, 0x9A, 0x48, 0xA4, 0x97, 0x20, 0x0E,
+        0x04, 0x6D, 0x39, 0xCC, 0xC7, 0x11, 0x2C, 0xD0
+    }
 };
 
 /*
  * Checkup routine
  */
-int mbedtls_sha256_self_test( int verbose )
+int mbedtls_sha256_self_test(int verbose)
 {
     int i, j, k, buflen, ret = 0;
     unsigned char *buf;
     unsigned char sha256sum[32];
     mbedtls_sha256_context ctx;
 
-    buf = mbedtls_calloc( 1024, sizeof(unsigned char) );
-    if( NULL == buf )
-    {
-        if( verbose != 0 )
-            mbedtls_printf( "Buffer allocation failed\n" );
+    buf = mbedtls_calloc(1024, sizeof(unsigned char));
+    if (NULL == buf) {
+        if (verbose != 0)
+            mbedtls_printf("Buffer allocation failed\n");
 
-        return( 1 );
+        return (1);
     }
 
-    mbedtls_sha256_init( &ctx );
+    mbedtls_sha256_init(&ctx);
 
-    for( i = 0; i < 6; i++ )
-    {
+    for (i = 0; i < 6; i++) {
         j = i % 3;
         k = i < 3;
 
-        if( verbose != 0 )
-            mbedtls_printf( "  SHA-%d test #%d: ", 256 - k * 32, j + 1 );
+        if (verbose != 0)
+            mbedtls_printf("  SHA-%d test #%d: ", 256 - k * 32, j + 1);
 
-        if( ( ret = mbedtls_sha256_starts_ret( &ctx, k ) ) != 0 )
+        if ((ret = mbedtls_sha256_starts_ret(&ctx, k)) != 0)
             goto fail;
 
-        if( j == 2 )
-        {
-            memset( buf, 'a', buflen = 1000 );
+        if (j == 2) {
+            memset(buf, 'a', buflen = 1000);
 
-            for( j = 0; j < 1000; j++ )
-            {
-                ret = mbedtls_sha256_update_ret( &ctx, buf, buflen );
-                if( ret != 0 )
+            for (j = 0; j < 1000; j++) {
+                ret = mbedtls_sha256_update_ret(&ctx, buf, buflen);
+                if (ret != 0)
                     goto fail;
             }
 
-        }
-        else
-        {
-            ret = mbedtls_sha256_update_ret( &ctx, sha256_test_buf[j],
-                                             sha256_test_buflen[j] );
-            if( ret != 0 )
-                 goto fail;
+        } else {
+            ret = mbedtls_sha256_update_ret(&ctx, sha256_test_buf[j],
+                                            sha256_test_buflen[j]);
+            if (ret != 0)
+                goto fail;
         }
 
-        if( ( ret = mbedtls_sha256_finish_ret( &ctx, sha256sum ) ) != 0 )
+        if ((ret = mbedtls_sha256_finish_ret(&ctx, sha256sum)) != 0)
             goto fail;
 
 
-        if( memcmp( sha256sum, sha256_test_sum[i], 32 - k * 4 ) != 0 )
-        {
+        if (memcmp(sha256sum, sha256_test_sum[i], 32 - k * 4) != 0) {
             ret = 1;
             goto fail;
         }
 
-        if( verbose != 0 )
-            mbedtls_printf( "passed\n" );
+        if (verbose != 0)
+            mbedtls_printf("passed\n");
     }
 
-    if( verbose != 0 )
-        mbedtls_printf( "\n" );
+    if (verbose != 0)
+        mbedtls_printf("\n");
 
     goto exit;
 
 fail:
-    if( verbose != 0 )
-        mbedtls_printf( "failed\n" );
+    if (verbose != 0)
+        mbedtls_printf("failed\n");
 
 exit:
-    mbedtls_sha256_free( &ctx );
-    mbedtls_free( buf );
+    mbedtls_sha256_free(&ctx);
+    mbedtls_free(buf);
 
-    return( ret );
+    return (ret);
 }
 
 #endif /* MBEDTLS_SELF_TEST */
diff --git a/common/mbedtls/sha256.h b/common/mbedtls/sha256.h
index 0aebdde25..760b2e443 100644
--- a/common/mbedtls/sha256.h
+++ b/common/mbedtls/sha256.h
@@ -55,8 +55,7 @@ extern "C" {
  *                 checksum calculations. The choice between these two is
  *                 made in the call to mbedtls_sha256_starts_ret().
  */
-typedef struct mbedtls_sha256_context
-{
+typedef struct mbedtls_sha256_context {
     uint32_t total[2];          /*!< The number of Bytes processed.  */
     uint32_t state[8];          /*!< The intermediate digest state.  */
     unsigned char buffer[64];   /*!< The data block being processed. */
@@ -74,14 +73,14 @@ mbedtls_sha256_context;
  *
  * \param ctx      The SHA-256 context to initialize.
  */
-void mbedtls_sha256_init( mbedtls_sha256_context *ctx );
+void mbedtls_sha256_init(mbedtls_sha256_context *ctx);
 
 /**
  * \brief          This function clears a SHA-256 context.
  *
  * \param ctx      The SHA-256 context to clear.
  */
-void mbedtls_sha256_free( mbedtls_sha256_context *ctx );
+void mbedtls_sha256_free(mbedtls_sha256_context *ctx);
 
 /**
  * \brief          This function clones the state of a SHA-256 context.
@@ -89,8 +88,8 @@ void mbedtls_sha256_free( mbedtls_sha256_context *ctx );
  * \param dst      The destination context.
  * \param src      The context to clone.
  */
-void mbedtls_sha256_clone( mbedtls_sha256_context *dst,
-                           const mbedtls_sha256_context *src );
+void mbedtls_sha256_clone(mbedtls_sha256_context *dst,
+                          const mbedtls_sha256_context *src);
 
 /**
  * \brief          This function starts a SHA-224 or SHA-256 checksum
@@ -102,7 +101,7 @@ void mbedtls_sha256_clone( mbedtls_sha256_context *dst,
  *
  * \return         \c 0 on success.
  */
-int mbedtls_sha256_starts_ret( mbedtls_sha256_context *ctx, int is224 );
+int mbedtls_sha256_starts_ret(mbedtls_sha256_context *ctx, int is224);
 
 /**
  * \brief          This function feeds an input buffer into an ongoing
@@ -114,9 +113,9 @@ int mbedtls_sha256_starts_ret( mbedtls_sha256_context *ctx, int is224 );
  *
  * \return         \c 0 on success.
  */
-int mbedtls_sha256_update_ret( mbedtls_sha256_context *ctx,
-                               const unsigned char *input,
-                               size_t ilen );
+int mbedtls_sha256_update_ret(mbedtls_sha256_context *ctx,
+                              const unsigned char *input,
+                              size_t ilen);
 
 /**
  * \brief          This function finishes the SHA-256 operation, and writes
@@ -127,8 +126,8 @@ int mbedtls_sha256_update_ret( mbedtls_sha256_context *ctx,
  *
  * \return         \c 0 on success.
  */
-int mbedtls_sha256_finish_ret( mbedtls_sha256_context *ctx,
-                               unsigned char output[32] );
+int mbedtls_sha256_finish_ret(mbedtls_sha256_context *ctx,
+                              unsigned char output[32]);
 
 /**
  * \brief          This function processes a single data block within
@@ -140,8 +139,8 @@ int mbedtls_sha256_finish_ret( mbedtls_sha256_context *ctx,
  *
  * \return         \c 0 on success.
  */
-int mbedtls_internal_sha256_process( mbedtls_sha256_context *ctx,
-                                     const unsigned char data[64] );
+int mbedtls_internal_sha256_process(mbedtls_sha256_context *ctx,
+                                    const unsigned char data[64]);
 
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
 #if defined(MBEDTLS_DEPRECATED_WARNING)
@@ -160,8 +159,8 @@ int mbedtls_internal_sha256_process( mbedtls_sha256_context *ctx,
  * \param is224    Determines which function to use:
  *                 0: Use SHA-256, or 1: Use SHA-224.
  */
-MBEDTLS_DEPRECATED void mbedtls_sha256_starts( mbedtls_sha256_context *ctx,
-                                               int is224 );
+MBEDTLS_DEPRECATED void mbedtls_sha256_starts(mbedtls_sha256_context *ctx,
+                                              int is224);
 
 /**
  * \brief          This function feeds an input buffer into an ongoing
@@ -173,9 +172,9 @@ MBEDTLS_DEPRECATED void mbedtls_sha256_starts( mbedtls_sha256_context *ctx,
  * \param input    The buffer holding the data.
  * \param ilen     The length of the input data.
  */
-MBEDTLS_DEPRECATED void mbedtls_sha256_update( mbedtls_sha256_context *ctx,
-                                               const unsigned char *input,
-                                               size_t ilen );
+MBEDTLS_DEPRECATED void mbedtls_sha256_update(mbedtls_sha256_context *ctx,
+                                              const unsigned char *input,
+                                              size_t ilen);
 
 /**
  * \brief          This function finishes the SHA-256 operation, and writes
@@ -186,8 +185,8 @@ MBEDTLS_DEPRECATED void mbedtls_sha256_update( mbedtls_sha256_context *ctx,
  * \param ctx      The SHA-256 context.
  * \param output   The SHA-224 or SHA-256 checksum result.
  */
-MBEDTLS_DEPRECATED void mbedtls_sha256_finish( mbedtls_sha256_context *ctx,
-                                               unsigned char output[32] );
+MBEDTLS_DEPRECATED void mbedtls_sha256_finish(mbedtls_sha256_context *ctx,
+                                              unsigned char output[32]);
 
 /**
  * \brief          This function processes a single data block within
@@ -199,8 +198,8 @@ MBEDTLS_DEPRECATED void mbedtls_sha256_finish( mbedtls_sha256_context *ctx,
  * \param ctx      The SHA-256 context.
  * \param data     The buffer holding one block of data.
  */
-MBEDTLS_DEPRECATED void mbedtls_sha256_process( mbedtls_sha256_context *ctx,
-                                                const unsigned char data[64] );
+MBEDTLS_DEPRECATED void mbedtls_sha256_process(mbedtls_sha256_context *ctx,
+                                               const unsigned char data[64]);
 
 #undef MBEDTLS_DEPRECATED
 #endif /* !MBEDTLS_DEPRECATED_REMOVED */
@@ -221,10 +220,10 @@ MBEDTLS_DEPRECATED void mbedtls_sha256_process( mbedtls_sha256_context *ctx,
  * \param is224    Determines which function to use:
  *                 0: Use SHA-256, or 1: Use SHA-224.
  */
-int mbedtls_sha256_ret( const unsigned char *input,
-                        size_t ilen,
-                        unsigned char output[32],
-                        int is224 );
+int mbedtls_sha256_ret(const unsigned char *input,
+                       size_t ilen,
+                       unsigned char output[32],
+                       int is224);
 
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
 #if defined(MBEDTLS_DEPRECATED_WARNING)
@@ -251,10 +250,10 @@ int mbedtls_sha256_ret( const unsigned char *input,
  * \param is224    Determines which function to use:
  *                 0: Use SHA-256, or 1: Use SHA-224.
  */
-MBEDTLS_DEPRECATED void mbedtls_sha256( const unsigned char *input,
-                                        size_t ilen,
-                                        unsigned char output[32],
-                                        int is224 );
+MBEDTLS_DEPRECATED void mbedtls_sha256(const unsigned char *input,
+                                       size_t ilen,
+                                       unsigned char output[32],
+                                       int is224);
 
 #undef MBEDTLS_DEPRECATED
 #endif /* !MBEDTLS_DEPRECATED_REMOVED */
@@ -265,7 +264,7 @@ MBEDTLS_DEPRECATED void mbedtls_sha256( const unsigned char *input,
  * \return         \c 0 on success.
  * \return         \c 1 on failure.
  */
-int mbedtls_sha256_self_test( int verbose );
+int mbedtls_sha256_self_test(int verbose);
 
 #ifdef __cplusplus
 }
diff --git a/common/mbedtls/sha512.c b/common/mbedtls/sha512.c
index 331965dae..cee8df41f 100644
--- a/common/mbedtls/sha512.c
+++ b/common/mbedtls/sha512.c
@@ -38,9 +38,9 @@
 #include "mbedtls/platform_util.h"
 
 #if defined(_MSC_VER) || defined(__WATCOMC__)
-  #define UL64(x) x##ui64
+#define UL64(x) x##ui64
 #else
-  #define UL64(x) x##ULL
+#define UL64(x) x##ULL
 #endif
 
 #include <string.h>
@@ -64,47 +64,47 @@
  */
 #ifndef GET_UINT64_BE
 #define GET_UINT64_BE(n,b,i)                            \
-{                                                       \
-    (n) = ( (uint64_t) (b)[(i)    ] << 56 )       \
-        | ( (uint64_t) (b)[(i) + 1] << 48 )       \
-        | ( (uint64_t) (b)[(i) + 2] << 40 )       \
-        | ( (uint64_t) (b)[(i) + 3] << 32 )       \
-        | ( (uint64_t) (b)[(i) + 4] << 24 )       \
-        | ( (uint64_t) (b)[(i) + 5] << 16 )       \
-        | ( (uint64_t) (b)[(i) + 6] <<  8 )       \
-        | ( (uint64_t) (b)[(i) + 7]       );      \
-}
+    {                                                       \
+        (n) = ( (uint64_t) (b)[(i)    ] << 56 )       \
+              | ( (uint64_t) (b)[(i) + 1] << 48 )       \
+              | ( (uint64_t) (b)[(i) + 2] << 40 )       \
+              | ( (uint64_t) (b)[(i) + 3] << 32 )       \
+              | ( (uint64_t) (b)[(i) + 4] << 24 )       \
+              | ( (uint64_t) (b)[(i) + 5] << 16 )       \
+              | ( (uint64_t) (b)[(i) + 6] <<  8 )       \
+              | ( (uint64_t) (b)[(i) + 7]       );      \
+    }
 #endif /* GET_UINT64_BE */
 
 #ifndef PUT_UINT64_BE
 #define PUT_UINT64_BE(n,b,i)                            \
-{                                                       \
-    (b)[(i)    ] = (unsigned char) ( (n) >> 56 );       \
-    (b)[(i) + 1] = (unsigned char) ( (n) >> 48 );       \
-    (b)[(i) + 2] = (unsigned char) ( (n) >> 40 );       \
-    (b)[(i) + 3] = (unsigned char) ( (n) >> 32 );       \
-    (b)[(i) + 4] = (unsigned char) ( (n) >> 24 );       \
-    (b)[(i) + 5] = (unsigned char) ( (n) >> 16 );       \
-    (b)[(i) + 6] = (unsigned char) ( (n) >>  8 );       \
-    (b)[(i) + 7] = (unsigned char) ( (n)       );       \
-}
+    {                                                       \
+        (b)[(i)    ] = (unsigned char) ( (n) >> 56 );       \
+        (b)[(i) + 1] = (unsigned char) ( (n) >> 48 );       \
+        (b)[(i) + 2] = (unsigned char) ( (n) >> 40 );       \
+        (b)[(i) + 3] = (unsigned char) ( (n) >> 32 );       \
+        (b)[(i) + 4] = (unsigned char) ( (n) >> 24 );       \
+        (b)[(i) + 5] = (unsigned char) ( (n) >> 16 );       \
+        (b)[(i) + 6] = (unsigned char) ( (n) >>  8 );       \
+        (b)[(i) + 7] = (unsigned char) ( (n)       );       \
+    }
 #endif /* PUT_UINT64_BE */
 
-void mbedtls_sha512_init( mbedtls_sha512_context *ctx )
+void mbedtls_sha512_init(mbedtls_sha512_context *ctx)
 {
-    memset( ctx, 0, sizeof( mbedtls_sha512_context ) );
+    memset(ctx, 0, sizeof(mbedtls_sha512_context));
 }
 
-void mbedtls_sha512_free( mbedtls_sha512_context *ctx )
+void mbedtls_sha512_free(mbedtls_sha512_context *ctx)
 {
-    if( ctx == NULL )
+    if (ctx == NULL)
         return;
 
-    mbedtls_platform_zeroize( ctx, sizeof( mbedtls_sha512_context ) );
+    mbedtls_platform_zeroize(ctx, sizeof(mbedtls_sha512_context));
 }
 
-void mbedtls_sha512_clone( mbedtls_sha512_context *dst,
-                           const mbedtls_sha512_context *src )
+void mbedtls_sha512_clone(mbedtls_sha512_context *dst,
+                          const mbedtls_sha512_context *src)
 {
     *dst = *src;
 }
@@ -112,13 +112,12 @@ void mbedtls_sha512_clone( mbedtls_sha512_context *dst,
 /*
  * SHA-512 context setup
  */
-int mbedtls_sha512_starts_ret( mbedtls_sha512_context *ctx, int is384 )
+int mbedtls_sha512_starts_ret(mbedtls_sha512_context *ctx, int is384)
 {
     ctx->total[0] = 0;
     ctx->total[1] = 0;
 
-    if( is384 == 0 )
-    {
+    if (is384 == 0) {
         /* SHA-512 */
         ctx->state[0] = UL64(0x6A09E667F3BCC908);
         ctx->state[1] = UL64(0xBB67AE8584CAA73B);
@@ -128,9 +127,7 @@ int mbedtls_sha512_starts_ret( mbedtls_sha512_context *ctx, int is384 )
         ctx->state[5] = UL64(0x9B05688C2B3E6C1F);
         ctx->state[6] = UL64(0x1F83D9ABFB41BD6B);
         ctx->state[7] = UL64(0x5BE0CD19137E2179);
-    }
-    else
-    {
+    } else {
         /* SHA-384 */
         ctx->state[0] = UL64(0xCBBB9D5DC1059ED8);
         ctx->state[1] = UL64(0x629A292A367CD507);
@@ -144,14 +141,14 @@ int mbedtls_sha512_starts_ret( mbedtls_sha512_context *ctx, int is384 )
 
     ctx->is384 = is384;
 
-    return( 0 );
+    return (0);
 }
 
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
-void mbedtls_sha512_starts( mbedtls_sha512_context *ctx,
-                            int is384 )
+void mbedtls_sha512_starts(mbedtls_sha512_context *ctx,
+                           int is384)
 {
-    mbedtls_sha512_starts_ret( ctx, is384 );
+    mbedtls_sha512_starts_ret(ctx, is384);
 }
 #endif
 
@@ -160,8 +157,7 @@ void mbedtls_sha512_starts( mbedtls_sha512_context *ctx,
 /*
  * Round constants
  */
-static const uint64_t K[80] =
-{
+static const uint64_t K[80] = {
     UL64(0x428A2F98D728AE22),  UL64(0x7137449123EF65CD),
     UL64(0xB5C0FBCFEC4D3B2F),  UL64(0xE9B5DBA58189DBBC),
     UL64(0x3956C25BF348B538),  UL64(0x59F111F1B605D019),
@@ -204,8 +200,8 @@ static const uint64_t K[80] =
     UL64(0x5FCB6FAB3AD6FAEC),  UL64(0x6C44198C4A475817)
 };
 
-int mbedtls_internal_sha512_process( mbedtls_sha512_context *ctx,
-                                     const unsigned char data[128] )
+int mbedtls_internal_sha512_process(mbedtls_sha512_context *ctx,
+                                    const unsigned char data[128])
 {
     int i;
     uint64_t temp1, temp2, W[80];
@@ -224,19 +220,17 @@ int mbedtls_internal_sha512_process( mbedtls_sha512_context *ctx,
 #define F1(x,y,z) (z ^ (x & (y ^ z)))
 
 #define P(a,b,c,d,e,f,g,h,x,K)                  \
-{                                               \
-    temp1 = h + S3(e) + F1(e,f,g) + K + x;      \
-    temp2 = S2(a) + F0(a,b,c);                  \
-    d += temp1; h = temp1 + temp2;              \
-}
-
-    for( i = 0; i < 16; i++ )
-    {
-        GET_UINT64_BE( W[i], data, i << 3 );
+    {                                               \
+        temp1 = h + S3(e) + F1(e,f,g) + K + x;      \
+        temp2 = S2(a) + F0(a,b,c);                  \
+        d += temp1; h = temp1 + temp2;              \
     }
 
-    for( ; i < 80; i++ )
-    {
+    for (i = 0; i < 16; i++) {
+        GET_UINT64_BE(W[i], data, i << 3);
+    }
+
+    for (; i < 80; i++) {
         W[i] = S1(W[i -  2]) + W[i -  7] +
                S0(W[i - 15]) + W[i - 16];
     }
@@ -251,18 +245,24 @@ int mbedtls_internal_sha512_process( mbedtls_sha512_context *ctx,
     H = ctx->state[7];
     i = 0;
 
-    do
-    {
-        P( A, B, C, D, E, F, G, H, W[i], K[i] ); i++;
-        P( H, A, B, C, D, E, F, G, W[i], K[i] ); i++;
-        P( G, H, A, B, C, D, E, F, W[i], K[i] ); i++;
-        P( F, G, H, A, B, C, D, E, W[i], K[i] ); i++;
-        P( E, F, G, H, A, B, C, D, W[i], K[i] ); i++;
-        P( D, E, F, G, H, A, B, C, W[i], K[i] ); i++;
-        P( C, D, E, F, G, H, A, B, W[i], K[i] ); i++;
-        P( B, C, D, E, F, G, H, A, W[i], K[i] ); i++;
-    }
-    while( i < 80 );
+    do {
+        P(A, B, C, D, E, F, G, H, W[i], K[i]);
+        i++;
+        P(H, A, B, C, D, E, F, G, W[i], K[i]);
+        i++;
+        P(G, H, A, B, C, D, E, F, W[i], K[i]);
+        i++;
+        P(F, G, H, A, B, C, D, E, W[i], K[i]);
+        i++;
+        P(E, F, G, H, A, B, C, D, W[i], K[i]);
+        i++;
+        P(D, E, F, G, H, A, B, C, W[i], K[i]);
+        i++;
+        P(C, D, E, F, G, H, A, B, W[i], K[i]);
+        i++;
+        P(B, C, D, E, F, G, H, A, W[i], K[i]);
+        i++;
+    } while (i < 80);
 
     ctx->state[0] += A;
     ctx->state[1] += B;
@@ -273,14 +273,14 @@ int mbedtls_internal_sha512_process( mbedtls_sha512_context *ctx,
     ctx->state[6] += G;
     ctx->state[7] += H;
 
-    return( 0 );
+    return (0);
 }
 
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
-void mbedtls_sha512_process( mbedtls_sha512_context *ctx,
-                             const unsigned char data[128] )
+void mbedtls_sha512_process(mbedtls_sha512_context *ctx,
+                            const unsigned char data[128])
 {
-    mbedtls_internal_sha512_process( ctx, data );
+    mbedtls_internal_sha512_process(ctx, data);
 }
 #endif
 #endif /* !MBEDTLS_SHA512_PROCESS_ALT */
@@ -288,66 +288,64 @@ void mbedtls_sha512_process( mbedtls_sha512_context *ctx,
 /*
  * SHA-512 process buffer
  */
-int mbedtls_sha512_update_ret( mbedtls_sha512_context *ctx,
-                               const unsigned char *input,
-                               size_t ilen )
+int mbedtls_sha512_update_ret(mbedtls_sha512_context *ctx,
+                              const unsigned char *input,
+                              size_t ilen)
 {
     int ret;
     size_t fill;
     unsigned int left;
 
-    if( ilen == 0 )
-        return( 0 );
+    if (ilen == 0)
+        return (0);
 
-    left = (unsigned int) (ctx->total[0] & 0x7F);
+    left = (unsigned int)(ctx->total[0] & 0x7F);
     fill = 128 - left;
 
     ctx->total[0] += (uint64_t) ilen;
 
-    if( ctx->total[0] < (uint64_t) ilen )
+    if (ctx->total[0] < (uint64_t) ilen)
         ctx->total[1]++;
 
-    if( left && ilen >= fill )
-    {
-        memcpy( (void *) (ctx->buffer + left), input, fill );
+    if (left && ilen >= fill) {
+        memcpy((void *)(ctx->buffer + left), input, fill);
 
-        if( ( ret = mbedtls_internal_sha512_process( ctx, ctx->buffer ) ) != 0 )
-            return( ret );
+        if ((ret = mbedtls_internal_sha512_process(ctx, ctx->buffer)) != 0)
+            return (ret);
 
         input += fill;
         ilen  -= fill;
         left = 0;
     }
 
-    while( ilen >= 128 )
-    {
-        if( ( ret = mbedtls_internal_sha512_process( ctx, input ) ) != 0 )
-            return( ret );
+    while (ilen >= 128) {
+        if ((ret = mbedtls_internal_sha512_process(ctx, input)) != 0)
+            return (ret);
 
         input += 128;
         ilen  -= 128;
     }
 
-    if( ilen > 0 )
-        memcpy( (void *) (ctx->buffer + left), input, ilen );
+    if (ilen > 0)
+        memcpy((void *)(ctx->buffer + left), input, ilen);
 
-    return( 0 );
+    return (0);
 }
 
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
-void mbedtls_sha512_update( mbedtls_sha512_context *ctx,
-                            const unsigned char *input,
-                            size_t ilen )
+void mbedtls_sha512_update(mbedtls_sha512_context *ctx,
+                           const unsigned char *input,
+                           size_t ilen)
 {
-    mbedtls_sha512_update_ret( ctx, input, ilen );
+    mbedtls_sha512_update_ret(ctx, input, ilen);
 }
 #endif
 
 /*
  * SHA-512 final digest
  */
-int mbedtls_sha512_finish_ret( mbedtls_sha512_context *ctx,
-                               unsigned char output[64] )
+int mbedtls_sha512_finish_ret(mbedtls_sha512_context *ctx,
+                              unsigned char output[64])
 {
     int ret;
     unsigned used;
@@ -360,59 +358,55 @@ int mbedtls_sha512_finish_ret( mbedtls_sha512_context *ctx,
 
     ctx->buffer[used++] = 0x80;
 
-    if( used <= 112 )
-    {
+    if (used <= 112) {
         /* Enough room for padding + length in current block */
-        memset( ctx->buffer + used, 0, 112 - used );
-    }
-    else
-    {
+        memset(ctx->buffer + used, 0, 112 - used);
+    } else {
         /* We'll need an extra block */
-        memset( ctx->buffer + used, 0, 128 - used );
+        memset(ctx->buffer + used, 0, 128 - used);
 
-        if( ( ret = mbedtls_internal_sha512_process( ctx, ctx->buffer ) ) != 0 )
-            return( ret );
+        if ((ret = mbedtls_internal_sha512_process(ctx, ctx->buffer)) != 0)
+            return (ret);
 
-        memset( ctx->buffer, 0, 112 );
+        memset(ctx->buffer, 0, 112);
     }
 
     /*
      * Add message length
      */
-    high = ( ctx->total[0] >> 61 )
-         | ( ctx->total[1] <<  3 );
-    low  = ( ctx->total[0] <<  3 );
+    high = (ctx->total[0] >> 61)
+           | (ctx->total[1] <<  3);
+    low  = (ctx->total[0] <<  3);
 
-    PUT_UINT64_BE( high, ctx->buffer, 112 );
-    PUT_UINT64_BE( low,  ctx->buffer, 120 );
+    PUT_UINT64_BE(high, ctx->buffer, 112);
+    PUT_UINT64_BE(low,  ctx->buffer, 120);
 
-    if( ( ret = mbedtls_internal_sha512_process( ctx, ctx->buffer ) ) != 0 )
-        return( ret );
+    if ((ret = mbedtls_internal_sha512_process(ctx, ctx->buffer)) != 0)
+        return (ret);
 
     /*
      * Output final state
      */
-    PUT_UINT64_BE( ctx->state[0], output,  0 );
-    PUT_UINT64_BE( ctx->state[1], output,  8 );
-    PUT_UINT64_BE( ctx->state[2], output, 16 );
-    PUT_UINT64_BE( ctx->state[3], output, 24 );
-    PUT_UINT64_BE( ctx->state[4], output, 32 );
-    PUT_UINT64_BE( ctx->state[5], output, 40 );
+    PUT_UINT64_BE(ctx->state[0], output,  0);
+    PUT_UINT64_BE(ctx->state[1], output,  8);
+    PUT_UINT64_BE(ctx->state[2], output, 16);
+    PUT_UINT64_BE(ctx->state[3], output, 24);
+    PUT_UINT64_BE(ctx->state[4], output, 32);
+    PUT_UINT64_BE(ctx->state[5], output, 40);
 
-    if( ctx->is384 == 0 )
-    {
-        PUT_UINT64_BE( ctx->state[6], output, 48 );
-        PUT_UINT64_BE( ctx->state[7], output, 56 );
+    if (ctx->is384 == 0) {
+        PUT_UINT64_BE(ctx->state[6], output, 48);
+        PUT_UINT64_BE(ctx->state[7], output, 56);
     }
 
-    return( 0 );
+    return (0);
 }
 
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
-void mbedtls_sha512_finish( mbedtls_sha512_context *ctx,
-                            unsigned char output[64] )
+void mbedtls_sha512_finish(mbedtls_sha512_context *ctx,
+                           unsigned char output[64])
 {
-    mbedtls_sha512_finish_ret( ctx, output );
+    mbedtls_sha512_finish_ret(ctx, output);
 }
 #endif
 
@@ -421,38 +415,38 @@ void mbedtls_sha512_finish( mbedtls_sha512_context *ctx,
 /*
  * output = SHA-512( input buffer )
  */
-int mbedtls_sha512_ret( const unsigned char *input,
-                    size_t ilen,
-                    unsigned char output[64],
-                    int is384 )
+int mbedtls_sha512_ret(const unsigned char *input,
+                       size_t ilen,
+                       unsigned char output[64],
+                       int is384)
 {
     int ret;
     mbedtls_sha512_context ctx;
 
-    mbedtls_sha512_init( &ctx );
+    mbedtls_sha512_init(&ctx);
 
-    if( ( ret = mbedtls_sha512_starts_ret( &ctx, is384 ) ) != 0 )
+    if ((ret = mbedtls_sha512_starts_ret(&ctx, is384)) != 0)
         goto exit;
 
-    if( ( ret = mbedtls_sha512_update_ret( &ctx, input, ilen ) ) != 0 )
+    if ((ret = mbedtls_sha512_update_ret(&ctx, input, ilen)) != 0)
         goto exit;
 
-    if( ( ret = mbedtls_sha512_finish_ret( &ctx, output ) ) != 0 )
+    if ((ret = mbedtls_sha512_finish_ret(&ctx, output)) != 0)
         goto exit;
 
 exit:
-    mbedtls_sha512_free( &ctx );
+    mbedtls_sha512_free(&ctx);
 
-    return( ret );
+    return (ret);
 }
 
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
-void mbedtls_sha512( const unsigned char *input,
-                     size_t ilen,
-                     unsigned char output[64],
-                     int is384 )
+void mbedtls_sha512(const unsigned char *input,
+                    size_t ilen,
+                    unsigned char output[64],
+                    int is384)
 {
-    mbedtls_sha512_ret( input, ilen, output, is384 );
+    mbedtls_sha512_ret(input, ilen, output, is384);
 }
 #endif
 
@@ -461,150 +455,154 @@ void mbedtls_sha512( const unsigned char *input,
 /*
  * FIPS-180-2 test vectors
  */
-static const unsigned char sha512_test_buf[3][113] =
-{
+static const unsigned char sha512_test_buf[3][113] = {
     { "abc" },
-    { "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmn"
-      "hijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu" },
+    {
+        "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmn"
+        "hijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu"
+    },
     { "" }
 };
 
-static const size_t sha512_test_buflen[3] =
-{
+static const size_t sha512_test_buflen[3] = {
     3, 112, 1000
 };
 
-static const unsigned char sha512_test_sum[6][64] =
-{
+static const unsigned char sha512_test_sum[6][64] = {
     /*
      * SHA-384 test vectors
      */
-    { 0xCB, 0x00, 0x75, 0x3F, 0x45, 0xA3, 0x5E, 0x8B,
-      0xB5, 0xA0, 0x3D, 0x69, 0x9A, 0xC6, 0x50, 0x07,
-      0x27, 0x2C, 0x32, 0xAB, 0x0E, 0xDE, 0xD1, 0x63,
-      0x1A, 0x8B, 0x60, 0x5A, 0x43, 0xFF, 0x5B, 0xED,
-      0x80, 0x86, 0x07, 0x2B, 0xA1, 0xE7, 0xCC, 0x23,
-      0x58, 0xBA, 0xEC, 0xA1, 0x34, 0xC8, 0x25, 0xA7 },
-    { 0x09, 0x33, 0x0C, 0x33, 0xF7, 0x11, 0x47, 0xE8,
-      0x3D, 0x19, 0x2F, 0xC7, 0x82, 0xCD, 0x1B, 0x47,
-      0x53, 0x11, 0x1B, 0x17, 0x3B, 0x3B, 0x05, 0xD2,
-      0x2F, 0xA0, 0x80, 0x86, 0xE3, 0xB0, 0xF7, 0x12,
-      0xFC, 0xC7, 0xC7, 0x1A, 0x55, 0x7E, 0x2D, 0xB9,
-      0x66, 0xC3, 0xE9, 0xFA, 0x91, 0x74, 0x60, 0x39 },
-    { 0x9D, 0x0E, 0x18, 0x09, 0x71, 0x64, 0x74, 0xCB,
-      0x08, 0x6E, 0x83, 0x4E, 0x31, 0x0A, 0x4A, 0x1C,
-      0xED, 0x14, 0x9E, 0x9C, 0x00, 0xF2, 0x48, 0x52,
-      0x79, 0x72, 0xCE, 0xC5, 0x70, 0x4C, 0x2A, 0x5B,
-      0x07, 0xB8, 0xB3, 0xDC, 0x38, 0xEC, 0xC4, 0xEB,
-      0xAE, 0x97, 0xDD, 0xD8, 0x7F, 0x3D, 0x89, 0x85 },
+    {
+        0xCB, 0x00, 0x75, 0x3F, 0x45, 0xA3, 0x5E, 0x8B,
+        0xB5, 0xA0, 0x3D, 0x69, 0x9A, 0xC6, 0x50, 0x07,
+        0x27, 0x2C, 0x32, 0xAB, 0x0E, 0xDE, 0xD1, 0x63,
+        0x1A, 0x8B, 0x60, 0x5A, 0x43, 0xFF, 0x5B, 0xED,
+        0x80, 0x86, 0x07, 0x2B, 0xA1, 0xE7, 0xCC, 0x23,
+        0x58, 0xBA, 0xEC, 0xA1, 0x34, 0xC8, 0x25, 0xA7
+    },
+    {
+        0x09, 0x33, 0x0C, 0x33, 0xF7, 0x11, 0x47, 0xE8,
+        0x3D, 0x19, 0x2F, 0xC7, 0x82, 0xCD, 0x1B, 0x47,
+        0x53, 0x11, 0x1B, 0x17, 0x3B, 0x3B, 0x05, 0xD2,
+        0x2F, 0xA0, 0x80, 0x86, 0xE3, 0xB0, 0xF7, 0x12,
+        0xFC, 0xC7, 0xC7, 0x1A, 0x55, 0x7E, 0x2D, 0xB9,
+        0x66, 0xC3, 0xE9, 0xFA, 0x91, 0x74, 0x60, 0x39
+    },
+    {
+        0x9D, 0x0E, 0x18, 0x09, 0x71, 0x64, 0x74, 0xCB,
+        0x08, 0x6E, 0x83, 0x4E, 0x31, 0x0A, 0x4A, 0x1C,
+        0xED, 0x14, 0x9E, 0x9C, 0x00, 0xF2, 0x48, 0x52,
+        0x79, 0x72, 0xCE, 0xC5, 0x70, 0x4C, 0x2A, 0x5B,
+        0x07, 0xB8, 0xB3, 0xDC, 0x38, 0xEC, 0xC4, 0xEB,
+        0xAE, 0x97, 0xDD, 0xD8, 0x7F, 0x3D, 0x89, 0x85
+    },
 
     /*
      * SHA-512 test vectors
      */
-    { 0xDD, 0xAF, 0x35, 0xA1, 0x93, 0x61, 0x7A, 0xBA,
-      0xCC, 0x41, 0x73, 0x49, 0xAE, 0x20, 0x41, 0x31,
-      0x12, 0xE6, 0xFA, 0x4E, 0x89, 0xA9, 0x7E, 0xA2,
-      0x0A, 0x9E, 0xEE, 0xE6, 0x4B, 0x55, 0xD3, 0x9A,
-      0x21, 0x92, 0x99, 0x2A, 0x27, 0x4F, 0xC1, 0xA8,
-      0x36, 0xBA, 0x3C, 0x23, 0xA3, 0xFE, 0xEB, 0xBD,
-      0x45, 0x4D, 0x44, 0x23, 0x64, 0x3C, 0xE8, 0x0E,
-      0x2A, 0x9A, 0xC9, 0x4F, 0xA5, 0x4C, 0xA4, 0x9F },
-    { 0x8E, 0x95, 0x9B, 0x75, 0xDA, 0xE3, 0x13, 0xDA,
-      0x8C, 0xF4, 0xF7, 0x28, 0x14, 0xFC, 0x14, 0x3F,
-      0x8F, 0x77, 0x79, 0xC6, 0xEB, 0x9F, 0x7F, 0xA1,
-      0x72, 0x99, 0xAE, 0xAD, 0xB6, 0x88, 0x90, 0x18,
-      0x50, 0x1D, 0x28, 0x9E, 0x49, 0x00, 0xF7, 0xE4,
-      0x33, 0x1B, 0x99, 0xDE, 0xC4, 0xB5, 0x43, 0x3A,
-      0xC7, 0xD3, 0x29, 0xEE, 0xB6, 0xDD, 0x26, 0x54,
-      0x5E, 0x96, 0xE5, 0x5B, 0x87, 0x4B, 0xE9, 0x09 },
-    { 0xE7, 0x18, 0x48, 0x3D, 0x0C, 0xE7, 0x69, 0x64,
-      0x4E, 0x2E, 0x42, 0xC7, 0xBC, 0x15, 0xB4, 0x63,
-      0x8E, 0x1F, 0x98, 0xB1, 0x3B, 0x20, 0x44, 0x28,
-      0x56, 0x32, 0xA8, 0x03, 0xAF, 0xA9, 0x73, 0xEB,
-      0xDE, 0x0F, 0xF2, 0x44, 0x87, 0x7E, 0xA6, 0x0A,
-      0x4C, 0xB0, 0x43, 0x2C, 0xE5, 0x77, 0xC3, 0x1B,
-      0xEB, 0x00, 0x9C, 0x5C, 0x2C, 0x49, 0xAA, 0x2E,
-      0x4E, 0xAD, 0xB2, 0x17, 0xAD, 0x8C, 0xC0, 0x9B }
+    {
+        0xDD, 0xAF, 0x35, 0xA1, 0x93, 0x61, 0x7A, 0xBA,
+        0xCC, 0x41, 0x73, 0x49, 0xAE, 0x20, 0x41, 0x31,
+        0x12, 0xE6, 0xFA, 0x4E, 0x89, 0xA9, 0x7E, 0xA2,
+        0x0A, 0x9E, 0xEE, 0xE6, 0x4B, 0x55, 0xD3, 0x9A,
+        0x21, 0x92, 0x99, 0x2A, 0x27, 0x4F, 0xC1, 0xA8,
+        0x36, 0xBA, 0x3C, 0x23, 0xA3, 0xFE, 0xEB, 0xBD,
+        0x45, 0x4D, 0x44, 0x23, 0x64, 0x3C, 0xE8, 0x0E,
+        0x2A, 0x9A, 0xC9, 0x4F, 0xA5, 0x4C, 0xA4, 0x9F
+    },
+    {
+        0x8E, 0x95, 0x9B, 0x75, 0xDA, 0xE3, 0x13, 0xDA,
+        0x8C, 0xF4, 0xF7, 0x28, 0x14, 0xFC, 0x14, 0x3F,
+        0x8F, 0x77, 0x79, 0xC6, 0xEB, 0x9F, 0x7F, 0xA1,
+        0x72, 0x99, 0xAE, 0xAD, 0xB6, 0x88, 0x90, 0x18,
+        0x50, 0x1D, 0x28, 0x9E, 0x49, 0x00, 0xF7, 0xE4,
+        0x33, 0x1B, 0x99, 0xDE, 0xC4, 0xB5, 0x43, 0x3A,
+        0xC7, 0xD3, 0x29, 0xEE, 0xB6, 0xDD, 0x26, 0x54,
+        0x5E, 0x96, 0xE5, 0x5B, 0x87, 0x4B, 0xE9, 0x09
+    },
+    {
+        0xE7, 0x18, 0x48, 0x3D, 0x0C, 0xE7, 0x69, 0x64,
+        0x4E, 0x2E, 0x42, 0xC7, 0xBC, 0x15, 0xB4, 0x63,
+        0x8E, 0x1F, 0x98, 0xB1, 0x3B, 0x20, 0x44, 0x28,
+        0x56, 0x32, 0xA8, 0x03, 0xAF, 0xA9, 0x73, 0xEB,
+        0xDE, 0x0F, 0xF2, 0x44, 0x87, 0x7E, 0xA6, 0x0A,
+        0x4C, 0xB0, 0x43, 0x2C, 0xE5, 0x77, 0xC3, 0x1B,
+        0xEB, 0x00, 0x9C, 0x5C, 0x2C, 0x49, 0xAA, 0x2E,
+        0x4E, 0xAD, 0xB2, 0x17, 0xAD, 0x8C, 0xC0, 0x9B
+    }
 };
 
 /*
  * Checkup routine
  */
-int mbedtls_sha512_self_test( int verbose )
+int mbedtls_sha512_self_test(int verbose)
 {
     int i, j, k, buflen, ret = 0;
     unsigned char *buf;
     unsigned char sha512sum[64];
     mbedtls_sha512_context ctx;
 
-    buf = mbedtls_calloc( 1024, sizeof(unsigned char) );
-    if( NULL == buf )
-    {
-        if( verbose != 0 )
-            mbedtls_printf( "Buffer allocation failed\n" );
+    buf = mbedtls_calloc(1024, sizeof(unsigned char));
+    if (NULL == buf) {
+        if (verbose != 0)
+            mbedtls_printf("Buffer allocation failed\n");
 
-        return( 1 );
+        return (1);
     }
 
-    mbedtls_sha512_init( &ctx );
+    mbedtls_sha512_init(&ctx);
 
-    for( i = 0; i < 6; i++ )
-    {
+    for (i = 0; i < 6; i++) {
         j = i % 3;
         k = i < 3;
 
-        if( verbose != 0 )
-            mbedtls_printf( "  SHA-%d test #%d: ", 512 - k * 128, j + 1 );
+        if (verbose != 0)
+            mbedtls_printf("  SHA-%d test #%d: ", 512 - k * 128, j + 1);
 
-        if( ( ret = mbedtls_sha512_starts_ret( &ctx, k ) ) != 0 )
+        if ((ret = mbedtls_sha512_starts_ret(&ctx, k)) != 0)
             goto fail;
 
-        if( j == 2 )
-        {
-            memset( buf, 'a', buflen = 1000 );
+        if (j == 2) {
+            memset(buf, 'a', buflen = 1000);
 
-            for( j = 0; j < 1000; j++ )
-            {
-                ret = mbedtls_sha512_update_ret( &ctx, buf, buflen );
-                if( ret != 0 )
+            for (j = 0; j < 1000; j++) {
+                ret = mbedtls_sha512_update_ret(&ctx, buf, buflen);
+                if (ret != 0)
                     goto fail;
             }
-        }
-        else
-        {
-            ret = mbedtls_sha512_update_ret( &ctx, sha512_test_buf[j],
-                                             sha512_test_buflen[j] );
-            if( ret != 0 )
+        } else {
+            ret = mbedtls_sha512_update_ret(&ctx, sha512_test_buf[j],
+                                            sha512_test_buflen[j]);
+            if (ret != 0)
                 goto fail;
         }
 
-        if( ( ret = mbedtls_sha512_finish_ret( &ctx, sha512sum ) ) != 0 )
+        if ((ret = mbedtls_sha512_finish_ret(&ctx, sha512sum)) != 0)
             goto fail;
 
-        if( memcmp( sha512sum, sha512_test_sum[i], 64 - k * 16 ) != 0 )
-        {
+        if (memcmp(sha512sum, sha512_test_sum[i], 64 - k * 16) != 0) {
             ret = 1;
             goto fail;
         }
 
-        if( verbose != 0 )
-            mbedtls_printf( "passed\n" );
+        if (verbose != 0)
+            mbedtls_printf("passed\n");
     }
 
-    if( verbose != 0 )
-        mbedtls_printf( "\n" );
+    if (verbose != 0)
+        mbedtls_printf("\n");
 
     goto exit;
 
 fail:
-    if( verbose != 0 )
-        mbedtls_printf( "failed\n" );
+    if (verbose != 0)
+        mbedtls_printf("failed\n");
 
 exit:
-    mbedtls_sha512_free( &ctx );
-    mbedtls_free( buf );
+    mbedtls_sha512_free(&ctx);
+    mbedtls_free(buf);
 
-    return( ret );
+    return (ret);
 }
 
 #endif /* MBEDTLS_SELF_TEST */
diff --git a/common/mbedtls/sha512.h b/common/mbedtls/sha512.h
index 18f6a1802..cc03222a2 100644
--- a/common/mbedtls/sha512.h
+++ b/common/mbedtls/sha512.h
@@ -54,8 +54,7 @@ extern "C" {
  *                 checksum calculations. The choice between these two is
  *                 made in the call to mbedtls_sha512_starts_ret().
  */
-typedef struct mbedtls_sha512_context
-{
+typedef struct mbedtls_sha512_context {
     uint64_t total[2];          /*!< The number of Bytes processed. */
     uint64_t state[8];          /*!< The intermediate digest state. */
     unsigned char buffer[128];  /*!< The data block being processed. */
@@ -73,14 +72,14 @@ mbedtls_sha512_context;
  *
  * \param ctx      The SHA-512 context to initialize.
  */
-void mbedtls_sha512_init( mbedtls_sha512_context *ctx );
+void mbedtls_sha512_init(mbedtls_sha512_context *ctx);
 
 /**
  * \brief          This function clears a SHA-512 context.
  *
  * \param ctx      The SHA-512 context to clear.
  */
-void mbedtls_sha512_free( mbedtls_sha512_context *ctx );
+void mbedtls_sha512_free(mbedtls_sha512_context *ctx);
 
 /**
  * \brief          This function clones the state of a SHA-512 context.
@@ -88,8 +87,8 @@ void mbedtls_sha512_free( mbedtls_sha512_context *ctx );
  * \param dst      The destination context.
  * \param src      The context to clone.
  */
-void mbedtls_sha512_clone( mbedtls_sha512_context *dst,
-                           const mbedtls_sha512_context *src );
+void mbedtls_sha512_clone(mbedtls_sha512_context *dst,
+                          const mbedtls_sha512_context *src);
 
 /**
  * \brief          This function starts a SHA-384 or SHA-512 checksum
@@ -101,7 +100,7 @@ void mbedtls_sha512_clone( mbedtls_sha512_context *dst,
  *
  * \return         \c 0 on success.
  */
-int mbedtls_sha512_starts_ret( mbedtls_sha512_context *ctx, int is384 );
+int mbedtls_sha512_starts_ret(mbedtls_sha512_context *ctx, int is384);
 
 /**
  * \brief          This function feeds an input buffer into an ongoing
@@ -113,9 +112,9 @@ int mbedtls_sha512_starts_ret( mbedtls_sha512_context *ctx, int is384 );
  *
  * \return         \c 0 on success.
  */
-int mbedtls_sha512_update_ret( mbedtls_sha512_context *ctx,
-                    const unsigned char *input,
-                    size_t ilen );
+int mbedtls_sha512_update_ret(mbedtls_sha512_context *ctx,
+                              const unsigned char *input,
+                              size_t ilen);
 
 /**
  * \brief          This function finishes the SHA-512 operation, and writes
@@ -127,8 +126,8 @@ int mbedtls_sha512_update_ret( mbedtls_sha512_context *ctx,
  *
  * \return         \c 0 on success.
  */
-int mbedtls_sha512_finish_ret( mbedtls_sha512_context *ctx,
-                               unsigned char output[64] );
+int mbedtls_sha512_finish_ret(mbedtls_sha512_context *ctx,
+                              unsigned char output[64]);
 
 /**
  * \brief          This function processes a single data block within
@@ -139,8 +138,8 @@ int mbedtls_sha512_finish_ret( mbedtls_sha512_context *ctx,
  *
  * \return         \c 0 on success.
  */
-int mbedtls_internal_sha512_process( mbedtls_sha512_context *ctx,
-                                     const unsigned char data[128] );
+int mbedtls_internal_sha512_process(mbedtls_sha512_context *ctx,
+                                    const unsigned char data[128]);
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
 #if defined(MBEDTLS_DEPRECATED_WARNING)
 #define MBEDTLS_DEPRECATED      __attribute__((deprecated))
@@ -157,8 +156,8 @@ int mbedtls_internal_sha512_process( mbedtls_sha512_context *ctx,
  * \param is384    Determines which function to use:
  *                 0: Use SHA-512, or 1: Use SHA-384.
  */
-MBEDTLS_DEPRECATED void mbedtls_sha512_starts( mbedtls_sha512_context *ctx,
-                                               int is384 );
+MBEDTLS_DEPRECATED void mbedtls_sha512_starts(mbedtls_sha512_context *ctx,
+                                              int is384);
 
 /**
  * \brief          This function feeds an input buffer into an ongoing
@@ -170,9 +169,9 @@ MBEDTLS_DEPRECATED void mbedtls_sha512_starts( mbedtls_sha512_context *ctx,
  * \param input    The buffer holding the data.
  * \param ilen     The length of the input data.
  */
-MBEDTLS_DEPRECATED void mbedtls_sha512_update( mbedtls_sha512_context *ctx,
-                                               const unsigned char *input,
-                                               size_t ilen );
+MBEDTLS_DEPRECATED void mbedtls_sha512_update(mbedtls_sha512_context *ctx,
+                                              const unsigned char *input,
+                                              size_t ilen);
 
 /**
  * \brief          This function finishes the SHA-512 operation, and writes
@@ -183,8 +182,8 @@ MBEDTLS_DEPRECATED void mbedtls_sha512_update( mbedtls_sha512_context *ctx,
  * \param ctx      The SHA-512 context.
  * \param output   The SHA-384 or SHA-512 checksum result.
  */
-MBEDTLS_DEPRECATED void mbedtls_sha512_finish( mbedtls_sha512_context *ctx,
-                                               unsigned char output[64] );
+MBEDTLS_DEPRECATED void mbedtls_sha512_finish(mbedtls_sha512_context *ctx,
+                                              unsigned char output[64]);
 
 /**
  * \brief          This function processes a single data block within
@@ -197,8 +196,8 @@ MBEDTLS_DEPRECATED void mbedtls_sha512_finish( mbedtls_sha512_context *ctx,
  * \param data     The buffer holding one block of data.
  */
 MBEDTLS_DEPRECATED void mbedtls_sha512_process(
-                                            mbedtls_sha512_context *ctx,
-                                            const unsigned char data[128] );
+    mbedtls_sha512_context *ctx,
+    const unsigned char data[128]);
 
 #undef MBEDTLS_DEPRECATED
 #endif /* !MBEDTLS_DEPRECATED_REMOVED */
@@ -221,10 +220,10 @@ MBEDTLS_DEPRECATED void mbedtls_sha512_process(
  *
  * \return         \c 0 on success.
  */
-int mbedtls_sha512_ret( const unsigned char *input,
-                        size_t ilen,
-                        unsigned char output[64],
-                        int is384 );
+int mbedtls_sha512_ret(const unsigned char *input,
+                       size_t ilen,
+                       unsigned char output[64],
+                       int is384);
 
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
 #if defined(MBEDTLS_DEPRECATED_WARNING)
@@ -250,20 +249,20 @@ int mbedtls_sha512_ret( const unsigned char *input,
  * \param is384    Determines which function to use:
  *                 0: Use SHA-512, or 1: Use SHA-384.
  */
-MBEDTLS_DEPRECATED void mbedtls_sha512( const unsigned char *input,
-                                        size_t ilen,
-                                        unsigned char output[64],
-                                        int is384 );
+MBEDTLS_DEPRECATED void mbedtls_sha512(const unsigned char *input,
+                                       size_t ilen,
+                                       unsigned char output[64],
+                                       int is384);
 
 #undef MBEDTLS_DEPRECATED
 #endif /* !MBEDTLS_DEPRECATED_REMOVED */
- /**
- * \brief          The SHA-384 or SHA-512 checkup routine.
- *
- * \return         \c 0 on success.
- * \return         \c 1 on failure.
- */
-int mbedtls_sha512_self_test( int verbose );
+/**
+* \brief          The SHA-384 or SHA-512 checkup routine.
+*
+* \return         \c 0 on success.
+* \return         \c 1 on failure.
+*/
+int mbedtls_sha512_self_test(int verbose);
 
 #ifdef __cplusplus
 }
diff --git a/common/mbedtls/threading.c b/common/mbedtls/threading.c
index f7997ac95..c84f5b334 100644
--- a/common/mbedtls/threading.c
+++ b/common/mbedtls/threading.c
@@ -32,49 +32,49 @@
 #include "mbedtls/threading.h"
 
 #if defined(MBEDTLS_THREADING_PTHREAD)
-static void threading_mutex_init_pthread( mbedtls_threading_mutex_t *mutex )
+static void threading_mutex_init_pthread(mbedtls_threading_mutex_t *mutex)
 {
-    if( mutex == NULL )
+    if (mutex == NULL)
         return;
 
-    mutex->is_valid = pthread_mutex_init( &mutex->mutex, NULL ) == 0;
+    mutex->is_valid = pthread_mutex_init(&mutex->mutex, NULL) == 0;
 }
 
-static void threading_mutex_free_pthread( mbedtls_threading_mutex_t *mutex )
+static void threading_mutex_free_pthread(mbedtls_threading_mutex_t *mutex)
 {
-    if( mutex == NULL || !mutex->is_valid )
+    if (mutex == NULL || !mutex->is_valid)
         return;
 
-    (void) pthread_mutex_destroy( &mutex->mutex );
+    (void) pthread_mutex_destroy(&mutex->mutex);
     mutex->is_valid = 0;
 }
 
-static int threading_mutex_lock_pthread( mbedtls_threading_mutex_t *mutex )
+static int threading_mutex_lock_pthread(mbedtls_threading_mutex_t *mutex)
 {
-    if( mutex == NULL || ! mutex->is_valid )
-        return( MBEDTLS_ERR_THREADING_BAD_INPUT_DATA );
+    if (mutex == NULL || ! mutex->is_valid)
+        return (MBEDTLS_ERR_THREADING_BAD_INPUT_DATA);
 
-    if( pthread_mutex_lock( &mutex->mutex ) != 0 )
-        return( MBEDTLS_ERR_THREADING_MUTEX_ERROR );
+    if (pthread_mutex_lock(&mutex->mutex) != 0)
+        return (MBEDTLS_ERR_THREADING_MUTEX_ERROR);
 
-    return( 0 );
+    return (0);
 }
 
-static int threading_mutex_unlock_pthread( mbedtls_threading_mutex_t *mutex )
+static int threading_mutex_unlock_pthread(mbedtls_threading_mutex_t *mutex)
 {
-    if( mutex == NULL || ! mutex->is_valid )
-        return( MBEDTLS_ERR_THREADING_BAD_INPUT_DATA );
+    if (mutex == NULL || ! mutex->is_valid)
+        return (MBEDTLS_ERR_THREADING_BAD_INPUT_DATA);
 
-    if( pthread_mutex_unlock( &mutex->mutex ) != 0 )
-        return( MBEDTLS_ERR_THREADING_MUTEX_ERROR );
+    if (pthread_mutex_unlock(&mutex->mutex) != 0)
+        return (MBEDTLS_ERR_THREADING_MUTEX_ERROR);
 
-    return( 0 );
+    return (0);
 }
 
-void (*mbedtls_mutex_init)( mbedtls_threading_mutex_t * ) = threading_mutex_init_pthread;
-void (*mbedtls_mutex_free)( mbedtls_threading_mutex_t * ) = threading_mutex_free_pthread;
-int (*mbedtls_mutex_lock)( mbedtls_threading_mutex_t * ) = threading_mutex_lock_pthread;
-int (*mbedtls_mutex_unlock)( mbedtls_threading_mutex_t * ) = threading_mutex_unlock_pthread;
+void (*mbedtls_mutex_init)(mbedtls_threading_mutex_t *) = threading_mutex_init_pthread;
+void (*mbedtls_mutex_free)(mbedtls_threading_mutex_t *) = threading_mutex_free_pthread;
+int (*mbedtls_mutex_lock)(mbedtls_threading_mutex_t *) = threading_mutex_lock_pthread;
+int (*mbedtls_mutex_unlock)(mbedtls_threading_mutex_t *) = threading_mutex_unlock_pthread;
 
 /*
  * With phtreads we can statically initialize mutexes
@@ -84,29 +84,29 @@ int (*mbedtls_mutex_unlock)( mbedtls_threading_mutex_t * ) = threading_mutex_unl
 #endif /* MBEDTLS_THREADING_PTHREAD */
 
 #if defined(MBEDTLS_THREADING_ALT)
-static int threading_mutex_fail( mbedtls_threading_mutex_t *mutex )
+static int threading_mutex_fail(mbedtls_threading_mutex_t *mutex)
 {
-    ((void) mutex );
-    return( MBEDTLS_ERR_THREADING_BAD_INPUT_DATA );
+    ((void) mutex);
+    return (MBEDTLS_ERR_THREADING_BAD_INPUT_DATA);
 }
-static void threading_mutex_dummy( mbedtls_threading_mutex_t *mutex )
+static void threading_mutex_dummy(mbedtls_threading_mutex_t *mutex)
 {
-    ((void) mutex );
+    ((void) mutex);
     return;
 }
 
-void (*mbedtls_mutex_init)( mbedtls_threading_mutex_t * ) = threading_mutex_dummy;
-void (*mbedtls_mutex_free)( mbedtls_threading_mutex_t * ) = threading_mutex_dummy;
-int (*mbedtls_mutex_lock)( mbedtls_threading_mutex_t * ) = threading_mutex_fail;
-int (*mbedtls_mutex_unlock)( mbedtls_threading_mutex_t * ) = threading_mutex_fail;
+void (*mbedtls_mutex_init)(mbedtls_threading_mutex_t *) = threading_mutex_dummy;
+void (*mbedtls_mutex_free)(mbedtls_threading_mutex_t *) = threading_mutex_dummy;
+int (*mbedtls_mutex_lock)(mbedtls_threading_mutex_t *) = threading_mutex_fail;
+int (*mbedtls_mutex_unlock)(mbedtls_threading_mutex_t *) = threading_mutex_fail;
 
 /*
  * Set functions pointers and initialize global mutexes
  */
-void mbedtls_threading_set_alt( void (*mutex_init)( mbedtls_threading_mutex_t * ),
-                       void (*mutex_free)( mbedtls_threading_mutex_t * ),
-                       int (*mutex_lock)( mbedtls_threading_mutex_t * ),
-                       int (*mutex_unlock)( mbedtls_threading_mutex_t * ) )
+void mbedtls_threading_set_alt(void (*mutex_init)(mbedtls_threading_mutex_t *),
+                               void (*mutex_free)(mbedtls_threading_mutex_t *),
+                               int (*mutex_lock)(mbedtls_threading_mutex_t *),
+                               int (*mutex_unlock)(mbedtls_threading_mutex_t *))
 {
     mbedtls_mutex_init = mutex_init;
     mbedtls_mutex_free = mutex_free;
@@ -114,17 +114,17 @@ void mbedtls_threading_set_alt( void (*mutex_init)( mbedtls_threading_mutex_t *
     mbedtls_mutex_unlock = mutex_unlock;
 
 #if defined(MBEDTLS_FS_IO)
-    mbedtls_mutex_init( &mbedtls_threading_readdir_mutex );
+    mbedtls_mutex_init(&mbedtls_threading_readdir_mutex);
 #endif
 }
 
 /*
  * Free global mutexes
  */
-void mbedtls_threading_free_alt( void )
+void mbedtls_threading_free_alt(void)
 {
 #if defined(MBEDTLS_FS_IO)
-    mbedtls_mutex_free( &mbedtls_threading_readdir_mutex );
+    mbedtls_mutex_free(&mbedtls_threading_readdir_mutex);
 #endif
 }
 #endif /* MBEDTLS_THREADING_ALT */
diff --git a/common/mbedtls/threading.h b/common/mbedtls/threading.h
index bd68d5aa9..2cac7fbd9 100644
--- a/common/mbedtls/threading.h
+++ b/common/mbedtls/threading.h
@@ -44,8 +44,7 @@ extern "C" {
 
 #if defined(MBEDTLS_THREADING_PTHREAD)
 #include <pthread.h>
-typedef struct mbedtls_threading_mutex_t
-{
+typedef struct mbedtls_threading_mutex_t {
     pthread_mutex_t mutex;
     char is_valid;
 } mbedtls_threading_mutex_t;
@@ -73,15 +72,15 @@ typedef struct mbedtls_threading_mutex_t
  * \param mutex_lock    the lock function implementation
  * \param mutex_unlock  the unlock function implementation
  */
-void mbedtls_threading_set_alt( void (*mutex_init)( mbedtls_threading_mutex_t * ),
-                       void (*mutex_free)( mbedtls_threading_mutex_t * ),
-                       int (*mutex_lock)( mbedtls_threading_mutex_t * ),
-                       int (*mutex_unlock)( mbedtls_threading_mutex_t * ) );
+void mbedtls_threading_set_alt(void (*mutex_init)(mbedtls_threading_mutex_t *),
+                               void (*mutex_free)(mbedtls_threading_mutex_t *),
+                               int (*mutex_lock)(mbedtls_threading_mutex_t *),
+                               int (*mutex_unlock)(mbedtls_threading_mutex_t *));
 
 /**
  * \brief               Free global mutexes.
  */
-void mbedtls_threading_free_alt( void );
+void mbedtls_threading_free_alt(void);
 #endif /* MBEDTLS_THREADING_ALT */
 
 #if defined(MBEDTLS_THREADING_C)
@@ -90,10 +89,10 @@ void mbedtls_threading_free_alt( void );
  *
  * All these functions are expected to work or the result will be undefined.
  */
-extern void (*mbedtls_mutex_init)( mbedtls_threading_mutex_t *mutex );
-extern void (*mbedtls_mutex_free)( mbedtls_threading_mutex_t *mutex );
-extern int (*mbedtls_mutex_lock)( mbedtls_threading_mutex_t *mutex );
-extern int (*mbedtls_mutex_unlock)( mbedtls_threading_mutex_t *mutex );
+extern void (*mbedtls_mutex_init)(mbedtls_threading_mutex_t *mutex);
+extern void (*mbedtls_mutex_free)(mbedtls_threading_mutex_t *mutex);
+extern int (*mbedtls_mutex_lock)(mbedtls_threading_mutex_t *mutex);
+extern int (*mbedtls_mutex_unlock)(mbedtls_threading_mutex_t *mutex);
 
 /*
  * Global mutexes
diff --git a/common/mbedtls/timing.c b/common/mbedtls/timing.c
index fb2519181..8539641f6 100644
--- a/common/mbedtls/timing.c
+++ b/common/mbedtls/timing.c
@@ -55,8 +55,7 @@
 #include <windows.h>
 #include <winbase.h>
 
-struct _hr_time
-{
+struct _hr_time {
     LARGE_INTEGER start;
 };
 
@@ -68,8 +67,7 @@ struct _hr_time
 #include <signal.h>
 #include <time.h>
 
-struct _hr_time
-{
+struct _hr_time {
     struct timeval start;
 };
 
@@ -80,12 +78,12 @@ struct _hr_time
 
 #define HAVE_HARDCLOCK
 
-unsigned long mbedtls_timing_hardclock( void )
+unsigned long mbedtls_timing_hardclock(void)
 {
     unsigned long tsc;
     __asm   rdtsc
     __asm   mov  [tsc], eax
-    return( tsc );
+    return (tsc);
 }
 #endif /* !HAVE_HARDCLOCK && MBEDTLS_HAVE_ASM &&
           ( _MSC_VER && _M_IX86 ) || __WATCOMC__ */
@@ -97,11 +95,11 @@ unsigned long mbedtls_timing_hardclock( void )
 
 #define HAVE_HARDCLOCK
 
-unsigned long mbedtls_timing_hardclock( void )
+unsigned long mbedtls_timing_hardclock(void)
 {
     unsigned long lo, hi;
-    asm volatile( "rdtsc" : "=a" (lo), "=d" (hi) );
-    return( lo );
+    asm volatile("rdtsc" : "=a"(lo), "=d"(hi));
+    return (lo);
 }
 #endif /* !HAVE_HARDCLOCK && MBEDTLS_HAVE_ASM &&
           __GNUC__ && __i386__ */
@@ -111,11 +109,11 @@ unsigned long mbedtls_timing_hardclock( void )
 
 #define HAVE_HARDCLOCK
 
-unsigned long mbedtls_timing_hardclock( void )
+unsigned long mbedtls_timing_hardclock(void)
 {
     unsigned long lo, hi;
-    asm volatile( "rdtsc" : "=a" (lo), "=d" (hi) );
-    return( lo | ( hi << 32 ) );
+    asm volatile("rdtsc" : "=a"(lo), "=d"(hi));
+    return (lo | (hi << 32));
 }
 #endif /* !HAVE_HARDCLOCK && MBEDTLS_HAVE_ASM &&
           __GNUC__ && ( __amd64__ || __x86_64__ ) */
@@ -125,19 +123,17 @@ unsigned long mbedtls_timing_hardclock( void )
 
 #define HAVE_HARDCLOCK
 
-unsigned long mbedtls_timing_hardclock( void )
+unsigned long mbedtls_timing_hardclock(void)
 {
     unsigned long tbl, tbu0, tbu1;
 
-    do
-    {
-        asm volatile( "mftbu %0" : "=r" (tbu0) );
-        asm volatile( "mftb  %0" : "=r" (tbl ) );
-        asm volatile( "mftbu %0" : "=r" (tbu1) );
-    }
-    while( tbu0 != tbu1 );
+    do {
+        asm volatile("mftbu %0" : "=r"(tbu0));
+        asm volatile("mftb  %0" : "=r"(tbl));
+        asm volatile("mftbu %0" : "=r"(tbu1));
+    } while (tbu0 != tbu1);
 
-    return( tbl );
+    return (tbl);
 }
 #endif /* !HAVE_HARDCLOCK && MBEDTLS_HAVE_ASM &&
           __GNUC__ && ( __powerpc__ || __ppc__ ) */
@@ -150,11 +146,11 @@ unsigned long mbedtls_timing_hardclock( void )
 #else
 #define HAVE_HARDCLOCK
 
-unsigned long mbedtls_timing_hardclock( void )
+unsigned long mbedtls_timing_hardclock(void)
 {
     unsigned long tick;
-    asm volatile( "rdpr %%tick, %0;" : "=&r" (tick) );
-    return( tick );
+    asm volatile("rdpr %%tick, %0;" : "=&r"(tick));
+    return (tick);
 }
 #endif /* __OpenBSD__ */
 #endif /* !HAVE_HARDCLOCK && MBEDTLS_HAVE_ASM &&
@@ -165,12 +161,12 @@ unsigned long mbedtls_timing_hardclock( void )
 
 #define HAVE_HARDCLOCK
 
-unsigned long mbedtls_timing_hardclock( void )
+unsigned long mbedtls_timing_hardclock(void)
 {
     unsigned long tick;
-    asm volatile( ".byte 0x83, 0x41, 0x00, 0x00" );
-    asm volatile( "mov   %%g1, %0" : "=r" (tick) );
-    return( tick );
+    asm volatile(".byte 0x83, 0x41, 0x00, 0x00");
+    asm volatile("mov   %%g1, %0" : "=r"(tick));
+    return (tick);
 }
 #endif /* !HAVE_HARDCLOCK && MBEDTLS_HAVE_ASM &&
           __GNUC__ && __sparc__ && !__sparc64__ */
@@ -180,11 +176,11 @@ unsigned long mbedtls_timing_hardclock( void )
 
 #define HAVE_HARDCLOCK
 
-unsigned long mbedtls_timing_hardclock( void )
+unsigned long mbedtls_timing_hardclock(void)
 {
     unsigned long cc;
-    asm volatile( "rpcc %0" : "=r" (cc) );
-    return( cc & 0xFFFFFFFF );
+    asm volatile("rpcc %0" : "=r"(cc));
+    return (cc & 0xFFFFFFFF);
 }
 #endif /* !HAVE_HARDCLOCK && MBEDTLS_HAVE_ASM &&
           __GNUC__ && __alpha__ */
@@ -194,11 +190,11 @@ unsigned long mbedtls_timing_hardclock( void )
 
 #define HAVE_HARDCLOCK
 
-unsigned long mbedtls_timing_hardclock( void )
+unsigned long mbedtls_timing_hardclock(void)
 {
     unsigned long itc;
-    asm volatile( "mov %0 = ar.itc" : "=r" (itc) );
-    return( itc );
+    asm volatile("mov %0 = ar.itc" : "=r"(itc));
+    return (itc);
 }
 #endif /* !HAVE_HARDCLOCK && MBEDTLS_HAVE_ASM &&
           __GNUC__ && __ia64__ */
@@ -208,13 +204,13 @@ unsigned long mbedtls_timing_hardclock( void )
 
 #define HAVE_HARDCLOCK
 
-unsigned long mbedtls_timing_hardclock( void )
+unsigned long mbedtls_timing_hardclock(void)
 {
     LARGE_INTEGER offset;
 
-    QueryPerformanceCounter( &offset );
+    QueryPerformanceCounter(&offset);
 
-    return( (unsigned long)( offset.QuadPart ) );
+    return ((unsigned long)(offset.QuadPart));
 }
 #endif /* !HAVE_HARDCLOCK && _MSC_VER && !EFIX64 && !EFI32 */
 
@@ -225,27 +221,26 @@ unsigned long mbedtls_timing_hardclock( void )
 static int hardclock_init = 0;
 static struct timeval tv_init;
 
-unsigned long mbedtls_timing_hardclock( void )
+unsigned long mbedtls_timing_hardclock(void)
 {
     struct timeval tv_cur;
 
-    if( hardclock_init == 0 )
-    {
+    if (hardclock_init == 0) {
 #ifdef __MINGW32__
-        mingw_gettimeofday( &tv_init, NULL );
+        mingw_gettimeofday(&tv_init, NULL);
 #else
-        gettimeofday( &tv_init, NULL );
+        gettimeofday(&tv_init, NULL);
 #endif
         hardclock_init = 1;
     }
 
 #ifdef __MINGW32__
-    mingw_gettimeofday( &tv_cur, NULL );
+    mingw_gettimeofday(&tv_cur, NULL);
 #else
-    gettimeofday( &tv_cur, NULL );
+    gettimeofday(&tv_cur, NULL);
 #endif
-    return( ( tv_cur.tv_sec  - tv_init.tv_sec  ) * 1000000
-          + ( tv_cur.tv_usec - tv_init.tv_usec ) );
+    return ((tv_cur.tv_sec  - tv_init.tv_sec) * 1000000
+            + (tv_cur.tv_usec - tv_init.tv_usec));
 }
 #endif /* !HAVE_HARDCLOCK */
 
@@ -253,44 +248,40 @@ volatile int mbedtls_timing_alarmed = 0;
 
 #if defined(_WIN32) && !defined(EFIX64) && !defined(EFI32)
 
-unsigned long mbedtls_timing_get_timer( struct mbedtls_timing_hr_time *val, int reset )
+unsigned long mbedtls_timing_get_timer(struct mbedtls_timing_hr_time *val, int reset)
 {
     struct _hr_time *t = (struct _hr_time *) val;
 
-    if( reset )
-    {
-        QueryPerformanceCounter( &t->start );
-        return( 0 );
-    }
-    else
-    {
+    if (reset) {
+        QueryPerformanceCounter(&t->start);
+        return (0);
+    } else {
         unsigned long delta;
         LARGE_INTEGER now, hfreq;
-        QueryPerformanceCounter(  &now );
-        QueryPerformanceFrequency( &hfreq );
-        delta = (unsigned long)( ( now.QuadPart - t->start.QuadPart ) * 1000ul
-                                 / hfreq.QuadPart );
-        return( delta );
+        QueryPerformanceCounter(&now);
+        QueryPerformanceFrequency(&hfreq);
+        delta = (unsigned long)((now.QuadPart - t->start.QuadPart) * 1000ul
+                                / hfreq.QuadPart);
+        return (delta);
     }
 }
 
 /* It's OK to use a global because alarm() is supposed to be global anyway */
 static DWORD alarmMs;
 
-static DWORD WINAPI TimerProc( LPVOID TimerContext )
+static DWORD WINAPI TimerProc(LPVOID TimerContext)
 {
     ((void) TimerContext);
-    Sleep( alarmMs );
+    Sleep(alarmMs);
     mbedtls_timing_alarmed = 1;
-    return( TRUE );
+    return (TRUE);
 }
 
-void mbedtls_set_alarm( int seconds )
+void mbedtls_set_alarm(int seconds)
 {
     DWORD ThreadId;
 
-    if( seconds == 0 )
-    {
+    if (seconds == 0) {
         /* No need to create a thread for this simple case.
          * Also, this shorcut is more reliable at least on MinGW32 */
         mbedtls_timing_alarmed = 1;
@@ -299,44 +290,40 @@ void mbedtls_set_alarm( int seconds )
 
     mbedtls_timing_alarmed = 0;
     alarmMs = seconds * 1000;
-    CloseHandle( CreateThread( NULL, 0, TimerProc, NULL, 0, &ThreadId ) );
+    CloseHandle(CreateThread(NULL, 0, TimerProc, NULL, 0, &ThreadId));
 }
 
 #else /* _WIN32 && !EFIX64 && !EFI32 */
 
-unsigned long mbedtls_timing_get_timer( struct mbedtls_timing_hr_time *val, int reset )
+unsigned long mbedtls_timing_get_timer(struct mbedtls_timing_hr_time *val, int reset)
 {
     struct _hr_time *t = (struct _hr_time *) val;
 
-    if( reset )
-    {
-        gettimeofday( &t->start, NULL );
-        return( 0 );
-    }
-    else
-    {
+    if (reset) {
+        gettimeofday(&t->start, NULL);
+        return (0);
+    } else {
         unsigned long delta;
         struct timeval now;
-        gettimeofday( &now, NULL );
-        delta = ( now.tv_sec  - t->start.tv_sec  ) * 1000ul
-              + ( now.tv_usec - t->start.tv_usec ) / 1000;
-        return( delta );
+        gettimeofday(&now, NULL);
+        delta = (now.tv_sec  - t->start.tv_sec) * 1000ul
+                + (now.tv_usec - t->start.tv_usec) / 1000;
+        return (delta);
     }
 }
 
-static void sighandler( int signum )
+static void sighandler(int signum)
 {
     mbedtls_timing_alarmed = 1;
-    signal( signum, sighandler );
+    signal(signum, sighandler);
 }
 
-void mbedtls_set_alarm( int seconds )
+void mbedtls_set_alarm(int seconds)
 {
     mbedtls_timing_alarmed = 0;
-    signal( SIGALRM, sighandler );
-    alarm( seconds );
-    if( seconds == 0 )
-    {
+    signal(SIGALRM, sighandler);
+    alarm(seconds);
+    if (seconds == 0) {
         /* alarm(0) cancelled any previous pending alarm, but the
            handler won't fire, so raise the flag straight away. */
         mbedtls_timing_alarmed = 1;
@@ -348,37 +335,37 @@ void mbedtls_set_alarm( int seconds )
 /*
  * Set delays to watch
  */
-void mbedtls_timing_set_delay( void *data, uint32_t int_ms, uint32_t fin_ms )
+void mbedtls_timing_set_delay(void *data, uint32_t int_ms, uint32_t fin_ms)
 {
     mbedtls_timing_delay_context *ctx = (mbedtls_timing_delay_context *) data;
 
     ctx->int_ms = int_ms;
     ctx->fin_ms = fin_ms;
 
-    if( fin_ms != 0 )
-        (void) mbedtls_timing_get_timer( &ctx->timer, 1 );
+    if (fin_ms != 0)
+        (void) mbedtls_timing_get_timer(&ctx->timer, 1);
 }
 
 /*
  * Get number of delays expired
  */
-int mbedtls_timing_get_delay( void *data )
+int mbedtls_timing_get_delay(void *data)
 {
     mbedtls_timing_delay_context *ctx = (mbedtls_timing_delay_context *) data;
     unsigned long elapsed_ms;
 
-    if( ctx->fin_ms == 0 )
-        return( -1 );
+    if (ctx->fin_ms == 0)
+        return (-1);
 
-    elapsed_ms = mbedtls_timing_get_timer( &ctx->timer, 0 );
+    elapsed_ms = mbedtls_timing_get_timer(&ctx->timer, 0);
 
-    if( elapsed_ms >= ctx->fin_ms )
-        return( 2 );
+    if (elapsed_ms >= ctx->fin_ms)
+        return (2);
 
-    if( elapsed_ms >= ctx->int_ms )
-        return( 1 );
+    if (elapsed_ms >= ctx->int_ms)
+        return (1);
 
-    return( 0 );
+    return (0);
 }
 
 #endif /* !MBEDTLS_TIMING_ALT */
@@ -389,15 +376,15 @@ int mbedtls_timing_get_delay( void *data )
  * Busy-waits for the given number of milliseconds.
  * Used for testing mbedtls_timing_hardclock.
  */
-static void busy_msleep( unsigned long msec )
+static void busy_msleep(unsigned long msec)
 {
     struct mbedtls_timing_hr_time hires;
     unsigned long i = 0; /* for busy-waiting */
     volatile unsigned long j; /* to prevent optimisation */
 
-    (void) mbedtls_timing_get_timer( &hires, 1 );
+    (void) mbedtls_timing_get_timer(&hires, 1);
 
-    while( mbedtls_timing_get_timer( &hires, 0 ) < msec )
+    while (mbedtls_timing_get_timer(&hires, 0) < msec)
         i++;
 
     j = i;
@@ -426,7 +413,7 @@ static void busy_msleep( unsigned long msec )
  * Warning: this is work in progress, some tests may not be reliable enough
  * yet! False positives may happen.
  */
-int mbedtls_timing_self_test( int verbose )
+int mbedtls_timing_self_test(int verbose)
 {
     unsigned long cycles = 0, ratio = 0;
     unsigned long millisecs = 0, secs = 0;
@@ -435,63 +422,63 @@ int mbedtls_timing_self_test( int verbose )
     uint32_t a = 0, b = 0;
     mbedtls_timing_delay_context ctx;
 
-    if( verbose != 0 )
-        mbedtls_printf( "  TIMING tests note: will take some time!\n" );
+    if (verbose != 0)
+        mbedtls_printf("  TIMING tests note: will take some time!\n");
 
-    if( verbose != 0 )
-        mbedtls_printf( "  TIMING test #1 (set_alarm / get_timer): " );
+    if (verbose != 0)
+        mbedtls_printf("  TIMING test #1 (set_alarm / get_timer): ");
 
     {
         secs = 1;
 
-        (void) mbedtls_timing_get_timer( &hires, 1 );
+        (void) mbedtls_timing_get_timer(&hires, 1);
 
-        mbedtls_set_alarm( (int) secs );
-        while( !mbedtls_timing_alarmed )
+        mbedtls_set_alarm((int) secs);
+        while (!mbedtls_timing_alarmed)
             ;
 
-        millisecs = mbedtls_timing_get_timer( &hires, 0 );
+        millisecs = mbedtls_timing_get_timer(&hires, 0);
 
         /* For some reason on Windows it looks like alarm has an extra delay
          * (maybe related to creating a new thread). Allow some room here. */
-        if( millisecs < 800 * secs || millisecs > 1200 * secs + 300 )
+        if (millisecs < 800 * secs || millisecs > 1200 * secs + 300)
             FAIL;
     }
 
-    if( verbose != 0 )
-        mbedtls_printf( "passed\n" );
+    if (verbose != 0)
+        mbedtls_printf("passed\n");
 
-    if( verbose != 0 )
-        mbedtls_printf( "  TIMING test #2 (set/get_delay        ): " );
+    if (verbose != 0)
+        mbedtls_printf("  TIMING test #2 (set/get_delay        ): ");
 
     {
         a = 800;
         b = 400;
-        mbedtls_timing_set_delay( &ctx, a, a + b );          /* T = 0 */
+        mbedtls_timing_set_delay(&ctx, a, a + b);            /* T = 0 */
 
-        busy_msleep( a - a / 4 );                      /* T = a - a/4 */
-        if( mbedtls_timing_get_delay( &ctx ) != 0 )
+        busy_msleep(a - a / 4);                        /* T = a - a/4 */
+        if (mbedtls_timing_get_delay(&ctx) != 0)
             FAIL;
 
-        busy_msleep( a / 4 + b / 4 );                  /* T = a + b/4 */
-        if( mbedtls_timing_get_delay( &ctx ) != 1 )
+        busy_msleep(a / 4 + b / 4);                    /* T = a + b/4 */
+        if (mbedtls_timing_get_delay(&ctx) != 1)
             FAIL;
 
-        busy_msleep( b );                          /* T = a + b + b/4 */
-        if( mbedtls_timing_get_delay( &ctx ) != 2 )
+        busy_msleep(b);                            /* T = a + b + b/4 */
+        if (mbedtls_timing_get_delay(&ctx) != 2)
             FAIL;
     }
 
-    mbedtls_timing_set_delay( &ctx, 0, 0 );
-    busy_msleep( 200 );
-    if( mbedtls_timing_get_delay( &ctx ) != -1 )
+    mbedtls_timing_set_delay(&ctx, 0, 0);
+    busy_msleep(200);
+    if (mbedtls_timing_get_delay(&ctx) != -1)
         FAIL;
 
-    if( verbose != 0 )
-        mbedtls_printf( "passed\n" );
+    if (verbose != 0)
+        mbedtls_printf("passed\n");
 
-    if( verbose != 0 )
-        mbedtls_printf( "  TIMING test #3 (hardclock / get_timer): " );
+    if (verbose != 0)
+        mbedtls_printf("  TIMING test #3 (hardclock / get_timer): ");
 
     /*
      * Allow one failure for possible counter wrapping.
@@ -500,10 +487,9 @@ int mbedtls_timing_self_test( int verbose )
      */
 
 hard_test:
-    if( hardfail > 1 )
-    {
-        if( verbose != 0 )
-            mbedtls_printf( "failed (ignored)\n" );
+    if (hardfail > 1) {
+        if (verbose != 0)
+            mbedtls_printf("failed (ignored)\n");
 
         goto hard_test_done;
     }
@@ -511,35 +497,33 @@ hard_test:
     /* Get a reference ratio cycles/ms */
     millisecs = 1;
     cycles = mbedtls_timing_hardclock();
-    busy_msleep( millisecs );
+    busy_msleep(millisecs);
     cycles = mbedtls_timing_hardclock() - cycles;
     ratio = cycles / millisecs;
 
     /* Check that the ratio is mostly constant */
-    for( millisecs = 2; millisecs <= 4; millisecs++ )
-    {
+    for (millisecs = 2; millisecs <= 4; millisecs++) {
         cycles = mbedtls_timing_hardclock();
-        busy_msleep( millisecs );
+        busy_msleep(millisecs);
         cycles = mbedtls_timing_hardclock() - cycles;
 
         /* Allow variation up to 20% */
-        if( cycles / millisecs < ratio - ratio / 5 ||
-            cycles / millisecs > ratio + ratio / 5 )
-        {
+        if (cycles / millisecs < ratio - ratio / 5 ||
+            cycles / millisecs > ratio + ratio / 5) {
             hardfail++;
             goto hard_test;
         }
     }
 
-    if( verbose != 0 )
-        mbedtls_printf( "passed\n" );
+    if (verbose != 0)
+        mbedtls_printf("passed\n");
 
 hard_test_done:
 
-    if( verbose != 0 )
-        mbedtls_printf( "\n" );
+    if (verbose != 0)
+        mbedtls_printf("\n");
 
-    return( 0 );
+    return (0);
 }
 
 #endif /* MBEDTLS_SELF_TEST */
diff --git a/common/mbedtls/timing.h b/common/mbedtls/timing.h
index 74b5f7108..733585a87 100644
--- a/common/mbedtls/timing.h
+++ b/common/mbedtls/timing.h
@@ -45,16 +45,14 @@ extern "C" {
 /**
  * \brief          timer structure
  */
-struct mbedtls_timing_hr_time
-{
+struct mbedtls_timing_hr_time {
     unsigned char opaque[32];
 };
 
 /**
  * \brief          Context for mbedtls_timing_set/get_delay()
  */
-typedef struct mbedtls_timing_delay_context
-{
+typedef struct mbedtls_timing_delay_context {
     struct mbedtls_timing_hr_time   timer;
     uint32_t                        int_ms;
     uint32_t                        fin_ms;
@@ -76,7 +74,7 @@ extern volatile int mbedtls_timing_alarmed;
  * \note           This value starts at an unspecified origin and
  *                 may wrap around.
  */
-unsigned long mbedtls_timing_hardclock( void );
+unsigned long mbedtls_timing_hardclock(void);
 
 /**
  * \brief          Return the elapsed time in milliseconds
@@ -95,7 +93,7 @@ unsigned long mbedtls_timing_hardclock( void );
  *                 get_timer(0) }` the value time1+time2 is only approximately
  *                 the delay since the first reset.
  */
-unsigned long mbedtls_timing_get_timer( struct mbedtls_timing_hr_time *val, int reset );
+unsigned long mbedtls_timing_get_timer(struct mbedtls_timing_hr_time *val, int reset);
 
 /**
  * \brief          Setup an alarm clock
@@ -107,7 +105,7 @@ unsigned long mbedtls_timing_get_timer( struct mbedtls_timing_hr_time *val, int
  *                 context, this means one for the whole process, not one per
  *                 thread.
  */
-void mbedtls_set_alarm( int seconds );
+void mbedtls_set_alarm(int seconds);
 
 /**
  * \brief          Set a pair of delays to watch
@@ -123,7 +121,7 @@ void mbedtls_set_alarm( int seconds );
  * \note           To set a single delay, either use \c mbedtls_timing_set_timer
  *                 directly or use this function with int_ms == fin_ms.
  */
-void mbedtls_timing_set_delay( void *data, uint32_t int_ms, uint32_t fin_ms );
+void mbedtls_timing_set_delay(void *data, uint32_t int_ms, uint32_t fin_ms);
 
 /**
  * \brief          Get the status of delays
@@ -137,7 +135,7 @@ void mbedtls_timing_set_delay( void *data, uint32_t int_ms, uint32_t fin_ms );
  *                  1 if only the intermediate delay is passed,
  *                  2 if the final delay is passed.
  */
-int mbedtls_timing_get_delay( void *data );
+int mbedtls_timing_get_delay(void *data);
 
 #if defined(MBEDTLS_SELF_TEST)
 /**
@@ -145,7 +143,7 @@ int mbedtls_timing_get_delay( void *data );
  *
  * \return         0 if successful, or 1 if a test failed
  */
-int mbedtls_timing_self_test( int verbose );
+int mbedtls_timing_self_test(int verbose);
 #endif
 
 #ifdef __cplusplus
diff --git a/common/mbedtls/x509.c b/common/mbedtls/x509.c
index c2f72a52b..cd5f5c07a 100644
--- a/common/mbedtls/x509.c
+++ b/common/mbedtls/x509.c
@@ -78,29 +78,29 @@
 /*
  *  CertificateSerialNumber  ::=  INTEGER
  */
-int mbedtls_x509_get_serial( unsigned char **p, const unsigned char *end,
-                     mbedtls_x509_buf *serial )
+int mbedtls_x509_get_serial(unsigned char **p, const unsigned char *end,
+                            mbedtls_x509_buf *serial)
 {
     int ret;
 
-    if( ( end - *p ) < 1 )
-        return( MBEDTLS_ERR_X509_INVALID_SERIAL +
-                MBEDTLS_ERR_ASN1_OUT_OF_DATA );
+    if ((end - *p) < 1)
+        return (MBEDTLS_ERR_X509_INVALID_SERIAL +
+                MBEDTLS_ERR_ASN1_OUT_OF_DATA);
 
-    if( **p != ( MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_PRIMITIVE | 2 ) &&
-        **p !=   MBEDTLS_ASN1_INTEGER )
-        return( MBEDTLS_ERR_X509_INVALID_SERIAL +
-                MBEDTLS_ERR_ASN1_UNEXPECTED_TAG );
+    if (**p != (MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_PRIMITIVE | 2) &&
+        **p !=   MBEDTLS_ASN1_INTEGER)
+        return (MBEDTLS_ERR_X509_INVALID_SERIAL +
+                MBEDTLS_ERR_ASN1_UNEXPECTED_TAG);
 
     serial->tag = *(*p)++;
 
-    if( ( ret = mbedtls_asn1_get_len( p, end, &serial->len ) ) != 0 )
-        return( MBEDTLS_ERR_X509_INVALID_SERIAL + ret );
+    if ((ret = mbedtls_asn1_get_len(p, end, &serial->len)) != 0)
+        return (MBEDTLS_ERR_X509_INVALID_SERIAL + ret);
 
     serial->p = *p;
     *p += serial->len;
 
-    return( 0 );
+    return (0);
 }
 
 /* Get an algorithm identifier without parameters (eg for signatures)
@@ -109,29 +109,29 @@ int mbedtls_x509_get_serial( unsigned char **p, const unsigned char *end,
  *       algorithm               OBJECT IDENTIFIER,
  *       parameters              ANY DEFINED BY algorithm OPTIONAL  }
  */
-int mbedtls_x509_get_alg_null( unsigned char **p, const unsigned char *end,
-                       mbedtls_x509_buf *alg )
+int mbedtls_x509_get_alg_null(unsigned char **p, const unsigned char *end,
+                              mbedtls_x509_buf *alg)
 {
     int ret;
 
-    if( ( ret = mbedtls_asn1_get_alg_null( p, end, alg ) ) != 0 )
-        return( MBEDTLS_ERR_X509_INVALID_ALG + ret );
+    if ((ret = mbedtls_asn1_get_alg_null(p, end, alg)) != 0)
+        return (MBEDTLS_ERR_X509_INVALID_ALG + ret);
 
-    return( 0 );
+    return (0);
 }
 
 /*
  * Parse an algorithm identifier with (optional) paramaters
  */
-int mbedtls_x509_get_alg( unsigned char **p, const unsigned char *end,
-                  mbedtls_x509_buf *alg, mbedtls_x509_buf *params )
+int mbedtls_x509_get_alg(unsigned char **p, const unsigned char *end,
+                         mbedtls_x509_buf *alg, mbedtls_x509_buf *params)
 {
     int ret;
 
-    if( ( ret = mbedtls_asn1_get_alg( p, end, alg, params ) ) != 0 )
-        return( MBEDTLS_ERR_X509_INVALID_ALG + ret );
+    if ((ret = mbedtls_asn1_get_alg(p, end, alg, params)) != 0)
+        return (MBEDTLS_ERR_X509_INVALID_ALG + ret);
 
-    return( 0 );
+    return (0);
 }
 
 #if defined(MBEDTLS_X509_RSASSA_PSS_SUPPORT)
@@ -144,7 +144,7 @@ int mbedtls_x509_get_alg( unsigned char **p, const unsigned char *end,
  *
  * For HashAlgorithm, parameters MUST be NULL or absent.
  */
-static int x509_get_hash_alg( const mbedtls_x509_buf *alg, mbedtls_md_type_t *md_alg )
+static int x509_get_hash_alg(const mbedtls_x509_buf *alg, mbedtls_md_type_t *md_alg)
 {
     int ret;
     unsigned char *p;
@@ -153,42 +153,42 @@ static int x509_get_hash_alg( const mbedtls_x509_buf *alg, mbedtls_md_type_t *md
     size_t len;
 
     /* Make sure we got a SEQUENCE and setup bounds */
-    if( alg->tag != ( MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) )
-        return( MBEDTLS_ERR_X509_INVALID_ALG +
-                MBEDTLS_ERR_ASN1_UNEXPECTED_TAG );
+    if (alg->tag != (MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE))
+        return (MBEDTLS_ERR_X509_INVALID_ALG +
+                MBEDTLS_ERR_ASN1_UNEXPECTED_TAG);
 
     p = (unsigned char *) alg->p;
     end = p + alg->len;
 
-    if( p >= end )
-        return( MBEDTLS_ERR_X509_INVALID_ALG +
-                MBEDTLS_ERR_ASN1_OUT_OF_DATA );
+    if (p >= end)
+        return (MBEDTLS_ERR_X509_INVALID_ALG +
+                MBEDTLS_ERR_ASN1_OUT_OF_DATA);
 
     /* Parse md_oid */
     md_oid.tag = *p;
 
-    if( ( ret = mbedtls_asn1_get_tag( &p, end, &md_oid.len, MBEDTLS_ASN1_OID ) ) != 0 )
-        return( MBEDTLS_ERR_X509_INVALID_ALG + ret );
+    if ((ret = mbedtls_asn1_get_tag(&p, end, &md_oid.len, MBEDTLS_ASN1_OID)) != 0)
+        return (MBEDTLS_ERR_X509_INVALID_ALG + ret);
 
     md_oid.p = p;
     p += md_oid.len;
 
     /* Get md_alg from md_oid */
-    if( ( ret = mbedtls_oid_get_md_alg( &md_oid, md_alg ) ) != 0 )
-        return( MBEDTLS_ERR_X509_INVALID_ALG + ret );
+    if ((ret = mbedtls_oid_get_md_alg(&md_oid, md_alg)) != 0)
+        return (MBEDTLS_ERR_X509_INVALID_ALG + ret);
 
     /* Make sure params is absent of NULL */
-    if( p == end )
-        return( 0 );
+    if (p == end)
+        return (0);
 
-    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len, MBEDTLS_ASN1_NULL ) ) != 0 || len != 0 )
-        return( MBEDTLS_ERR_X509_INVALID_ALG + ret );
+    if ((ret = mbedtls_asn1_get_tag(&p, end, &len, MBEDTLS_ASN1_NULL)) != 0 || len != 0)
+        return (MBEDTLS_ERR_X509_INVALID_ALG + ret);
 
-    if( p != end )
-        return( MBEDTLS_ERR_X509_INVALID_ALG +
-                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+    if (p != end)
+        return (MBEDTLS_ERR_X509_INVALID_ALG +
+                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH);
 
-    return( 0 );
+    return (0);
 }
 
 /*
@@ -203,9 +203,9 @@ static int x509_get_hash_alg( const mbedtls_x509_buf *alg, mbedtls_md_type_t *md
  * of trailerField MUST be 1, and PKCS#1 v2.2 doesn't even define any other
  * option. Enfore this at parsing time.
  */
-int mbedtls_x509_get_rsassa_pss_params( const mbedtls_x509_buf *params,
-                                mbedtls_md_type_t *md_alg, mbedtls_md_type_t *mgf_md,
-                                int *salt_len )
+int mbedtls_x509_get_rsassa_pss_params(const mbedtls_x509_buf *params,
+                                       mbedtls_md_type_t *md_alg, mbedtls_md_type_t *mgf_md,
+                                       int *salt_len)
 {
     int ret;
     unsigned char *p;
@@ -219,121 +219,113 @@ int mbedtls_x509_get_rsassa_pss_params( const mbedtls_x509_buf *params,
     *salt_len = 20;
 
     /* Make sure params is a SEQUENCE and setup bounds */
-    if( params->tag != ( MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) )
-        return( MBEDTLS_ERR_X509_INVALID_ALG +
-                MBEDTLS_ERR_ASN1_UNEXPECTED_TAG );
+    if (params->tag != (MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE))
+        return (MBEDTLS_ERR_X509_INVALID_ALG +
+                MBEDTLS_ERR_ASN1_UNEXPECTED_TAG);
 
     p = (unsigned char *) params->p;
     end = p + params->len;
 
-    if( p == end )
-        return( 0 );
+    if (p == end)
+        return (0);
 
     /*
      * HashAlgorithm
      */
-    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len,
-                    MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_CONSTRUCTED | 0 ) ) == 0 )
-    {
+    if ((ret = mbedtls_asn1_get_tag(&p, end, &len,
+                                    MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_CONSTRUCTED | 0)) == 0) {
         end2 = p + len;
 
         /* HashAlgorithm ::= AlgorithmIdentifier (without parameters) */
-        if( ( ret = mbedtls_x509_get_alg_null( &p, end2, &alg_id ) ) != 0 )
-            return( ret );
+        if ((ret = mbedtls_x509_get_alg_null(&p, end2, &alg_id)) != 0)
+            return (ret);
 
-        if( ( ret = mbedtls_oid_get_md_alg( &alg_id, md_alg ) ) != 0 )
-            return( MBEDTLS_ERR_X509_INVALID_ALG + ret );
+        if ((ret = mbedtls_oid_get_md_alg(&alg_id, md_alg)) != 0)
+            return (MBEDTLS_ERR_X509_INVALID_ALG + ret);
 
-        if( p != end2 )
-            return( MBEDTLS_ERR_X509_INVALID_ALG +
-                    MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
-    }
-    else if( ret != MBEDTLS_ERR_ASN1_UNEXPECTED_TAG )
-        return( MBEDTLS_ERR_X509_INVALID_ALG + ret );
+        if (p != end2)
+            return (MBEDTLS_ERR_X509_INVALID_ALG +
+                    MBEDTLS_ERR_ASN1_LENGTH_MISMATCH);
+    } else if (ret != MBEDTLS_ERR_ASN1_UNEXPECTED_TAG)
+        return (MBEDTLS_ERR_X509_INVALID_ALG + ret);
 
-    if( p == end )
-        return( 0 );
+    if (p == end)
+        return (0);
 
     /*
      * MaskGenAlgorithm
      */
-    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len,
-                    MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_CONSTRUCTED | 1 ) ) == 0 )
-    {
+    if ((ret = mbedtls_asn1_get_tag(&p, end, &len,
+                                    MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_CONSTRUCTED | 1)) == 0) {
         end2 = p + len;
 
         /* MaskGenAlgorithm ::= AlgorithmIdentifier (params = HashAlgorithm) */
-        if( ( ret = mbedtls_x509_get_alg( &p, end2, &alg_id, &alg_params ) ) != 0 )
-            return( ret );
+        if ((ret = mbedtls_x509_get_alg(&p, end2, &alg_id, &alg_params)) != 0)
+            return (ret);
 
         /* Only MFG1 is recognised for now */
-        if( MBEDTLS_OID_CMP( MBEDTLS_OID_MGF1, &alg_id ) != 0 )
-            return( MBEDTLS_ERR_X509_FEATURE_UNAVAILABLE +
-                    MBEDTLS_ERR_OID_NOT_FOUND );
+        if (MBEDTLS_OID_CMP(MBEDTLS_OID_MGF1, &alg_id) != 0)
+            return (MBEDTLS_ERR_X509_FEATURE_UNAVAILABLE +
+                    MBEDTLS_ERR_OID_NOT_FOUND);
 
         /* Parse HashAlgorithm */
-        if( ( ret = x509_get_hash_alg( &alg_params, mgf_md ) ) != 0 )
-            return( ret );
+        if ((ret = x509_get_hash_alg(&alg_params, mgf_md)) != 0)
+            return (ret);
 
-        if( p != end2 )
-            return( MBEDTLS_ERR_X509_INVALID_ALG +
-                    MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
-    }
-    else if( ret != MBEDTLS_ERR_ASN1_UNEXPECTED_TAG )
-        return( MBEDTLS_ERR_X509_INVALID_ALG + ret );
+        if (p != end2)
+            return (MBEDTLS_ERR_X509_INVALID_ALG +
+                    MBEDTLS_ERR_ASN1_LENGTH_MISMATCH);
+    } else if (ret != MBEDTLS_ERR_ASN1_UNEXPECTED_TAG)
+        return (MBEDTLS_ERR_X509_INVALID_ALG + ret);
 
-    if( p == end )
-        return( 0 );
+    if (p == end)
+        return (0);
 
     /*
      * salt_len
      */
-    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len,
-                    MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_CONSTRUCTED | 2 ) ) == 0 )
-    {
+    if ((ret = mbedtls_asn1_get_tag(&p, end, &len,
+                                    MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_CONSTRUCTED | 2)) == 0) {
         end2 = p + len;
 
-        if( ( ret = mbedtls_asn1_get_int( &p, end2, salt_len ) ) != 0 )
-            return( MBEDTLS_ERR_X509_INVALID_ALG + ret );
+        if ((ret = mbedtls_asn1_get_int(&p, end2, salt_len)) != 0)
+            return (MBEDTLS_ERR_X509_INVALID_ALG + ret);
 
-        if( p != end2 )
-            return( MBEDTLS_ERR_X509_INVALID_ALG +
-                    MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
-    }
-    else if( ret != MBEDTLS_ERR_ASN1_UNEXPECTED_TAG )
-        return( MBEDTLS_ERR_X509_INVALID_ALG + ret );
+        if (p != end2)
+            return (MBEDTLS_ERR_X509_INVALID_ALG +
+                    MBEDTLS_ERR_ASN1_LENGTH_MISMATCH);
+    } else if (ret != MBEDTLS_ERR_ASN1_UNEXPECTED_TAG)
+        return (MBEDTLS_ERR_X509_INVALID_ALG + ret);
 
-    if( p == end )
-        return( 0 );
+    if (p == end)
+        return (0);
 
     /*
      * trailer_field (if present, must be 1)
      */
-    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len,
-                    MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_CONSTRUCTED | 3 ) ) == 0 )
-    {
+    if ((ret = mbedtls_asn1_get_tag(&p, end, &len,
+                                    MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_CONSTRUCTED | 3)) == 0) {
         int trailer_field;
 
         end2 = p + len;
 
-        if( ( ret = mbedtls_asn1_get_int( &p, end2, &trailer_field ) ) != 0 )
-            return( MBEDTLS_ERR_X509_INVALID_ALG + ret );
+        if ((ret = mbedtls_asn1_get_int(&p, end2, &trailer_field)) != 0)
+            return (MBEDTLS_ERR_X509_INVALID_ALG + ret);
 
-        if( p != end2 )
-            return( MBEDTLS_ERR_X509_INVALID_ALG +
-                    MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+        if (p != end2)
+            return (MBEDTLS_ERR_X509_INVALID_ALG +
+                    MBEDTLS_ERR_ASN1_LENGTH_MISMATCH);
 
-        if( trailer_field != 1 )
-            return( MBEDTLS_ERR_X509_INVALID_ALG );
-    }
-    else if( ret != MBEDTLS_ERR_ASN1_UNEXPECTED_TAG )
-        return( MBEDTLS_ERR_X509_INVALID_ALG + ret );
+        if (trailer_field != 1)
+            return (MBEDTLS_ERR_X509_INVALID_ALG);
+    } else if (ret != MBEDTLS_ERR_ASN1_UNEXPECTED_TAG)
+        return (MBEDTLS_ERR_X509_INVALID_ALG + ret);
 
-    if( p != end )
-        return( MBEDTLS_ERR_X509_INVALID_ALG +
-                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+    if (p != end)
+        return (MBEDTLS_ERR_X509_INVALID_ALG +
+                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH);
 
-    return( 0 );
+    return (0);
 }
 #endif /* MBEDTLS_X509_RSASSA_PSS_SUPPORT */
 
@@ -346,55 +338,55 @@ int mbedtls_x509_get_rsassa_pss_params( const mbedtls_x509_buf *params,
  *
  *  AttributeValue ::= ANY DEFINED BY AttributeType
  */
-static int x509_get_attr_type_value( unsigned char **p,
-                                     const unsigned char *end,
-                                     mbedtls_x509_name *cur )
+static int x509_get_attr_type_value(unsigned char **p,
+                                    const unsigned char *end,
+                                    mbedtls_x509_name *cur)
 {
     int ret;
     size_t len;
     mbedtls_x509_buf *oid;
     mbedtls_x509_buf *val;
 
-    if( ( ret = mbedtls_asn1_get_tag( p, end, &len,
-            MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
-        return( MBEDTLS_ERR_X509_INVALID_NAME + ret );
+    if ((ret = mbedtls_asn1_get_tag(p, end, &len,
+                                    MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE)) != 0)
+        return (MBEDTLS_ERR_X509_INVALID_NAME + ret);
 
-    if( ( end - *p ) < 1 )
-        return( MBEDTLS_ERR_X509_INVALID_NAME +
-                MBEDTLS_ERR_ASN1_OUT_OF_DATA );
+    if ((end - *p) < 1)
+        return (MBEDTLS_ERR_X509_INVALID_NAME +
+                MBEDTLS_ERR_ASN1_OUT_OF_DATA);
 
     oid = &cur->oid;
     oid->tag = **p;
 
-    if( ( ret = mbedtls_asn1_get_tag( p, end, &oid->len, MBEDTLS_ASN1_OID ) ) != 0 )
-        return( MBEDTLS_ERR_X509_INVALID_NAME + ret );
+    if ((ret = mbedtls_asn1_get_tag(p, end, &oid->len, MBEDTLS_ASN1_OID)) != 0)
+        return (MBEDTLS_ERR_X509_INVALID_NAME + ret);
 
     oid->p = *p;
     *p += oid->len;
 
-    if( ( end - *p ) < 1 )
-        return( MBEDTLS_ERR_X509_INVALID_NAME +
-                MBEDTLS_ERR_ASN1_OUT_OF_DATA );
+    if ((end - *p) < 1)
+        return (MBEDTLS_ERR_X509_INVALID_NAME +
+                MBEDTLS_ERR_ASN1_OUT_OF_DATA);
 
-    if( **p != MBEDTLS_ASN1_BMP_STRING && **p != MBEDTLS_ASN1_UTF8_STRING      &&
+    if (**p != MBEDTLS_ASN1_BMP_STRING && **p != MBEDTLS_ASN1_UTF8_STRING      &&
         **p != MBEDTLS_ASN1_T61_STRING && **p != MBEDTLS_ASN1_PRINTABLE_STRING &&
         **p != MBEDTLS_ASN1_IA5_STRING && **p != MBEDTLS_ASN1_UNIVERSAL_STRING &&
-        **p != MBEDTLS_ASN1_BIT_STRING )
-        return( MBEDTLS_ERR_X509_INVALID_NAME +
-                MBEDTLS_ERR_ASN1_UNEXPECTED_TAG );
+        **p != MBEDTLS_ASN1_BIT_STRING)
+        return (MBEDTLS_ERR_X509_INVALID_NAME +
+                MBEDTLS_ERR_ASN1_UNEXPECTED_TAG);
 
     val = &cur->val;
     val->tag = *(*p)++;
 
-    if( ( ret = mbedtls_asn1_get_len( p, end, &val->len ) ) != 0 )
-        return( MBEDTLS_ERR_X509_INVALID_NAME + ret );
+    if ((ret = mbedtls_asn1_get_len(p, end, &val->len)) != 0)
+        return (MBEDTLS_ERR_X509_INVALID_NAME + ret);
 
     val->p = *p;
     *p += val->len;
 
     cur->next = NULL;
 
-    return( 0 );
+    return (0);
 }
 
 /*
@@ -420,40 +412,38 @@ static int x509_get_attr_type_value( unsigned char **p,
  * same set so that they are "merged" together in the functions that consume
  * this list, eg mbedtls_x509_dn_gets().
  */
-int mbedtls_x509_get_name( unsigned char **p, const unsigned char *end,
-                   mbedtls_x509_name *cur )
+int mbedtls_x509_get_name(unsigned char **p, const unsigned char *end,
+                          mbedtls_x509_name *cur)
 {
     int ret;
     size_t set_len;
     const unsigned char *end_set;
 
     /* don't use recursion, we'd risk stack overflow if not optimized */
-    while( 1 )
-    {
+    while (1) {
         /*
          * parse SET
          */
-        if( ( ret = mbedtls_asn1_get_tag( p, end, &set_len,
-                MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SET ) ) != 0 )
-            return( MBEDTLS_ERR_X509_INVALID_NAME + ret );
+        if ((ret = mbedtls_asn1_get_tag(p, end, &set_len,
+                                        MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SET)) != 0)
+            return (MBEDTLS_ERR_X509_INVALID_NAME + ret);
 
         end_set  = *p + set_len;
 
-        while( 1 )
-        {
-            if( ( ret = x509_get_attr_type_value( p, end_set, cur ) ) != 0 )
-                return( ret );
+        while (1) {
+            if ((ret = x509_get_attr_type_value(p, end_set, cur)) != 0)
+                return (ret);
 
-            if( *p == end_set )
+            if (*p == end_set)
                 break;
 
             /* Mark this item as being no the only one in a set */
             cur->next_merged = 1;
 
-            cur->next = mbedtls_calloc( 1, sizeof( mbedtls_x509_name ) );
+            cur->next = mbedtls_calloc(1, sizeof(mbedtls_x509_name));
 
-            if( cur->next == NULL )
-                return( MBEDTLS_ERR_X509_ALLOC_FAILED );
+            if (cur->next == NULL)
+                return (MBEDTLS_ERR_X509_ALLOC_FAILED);
 
             cur = cur->next;
         }
@@ -461,116 +451,119 @@ int mbedtls_x509_get_name( unsigned char **p, const unsigned char *end,
         /*
          * continue until end of SEQUENCE is reached
          */
-        if( *p == end )
-            return( 0 );
+        if (*p == end)
+            return (0);
 
-        cur->next = mbedtls_calloc( 1, sizeof( mbedtls_x509_name ) );
+        cur->next = mbedtls_calloc(1, sizeof(mbedtls_x509_name));
 
-        if( cur->next == NULL )
-            return( MBEDTLS_ERR_X509_ALLOC_FAILED );
+        if (cur->next == NULL)
+            return (MBEDTLS_ERR_X509_ALLOC_FAILED);
 
         cur = cur->next;
     }
 }
 
-static int x509_parse_int( unsigned char **p, size_t n, int *res )
+static int x509_parse_int(unsigned char **p, size_t n, int *res)
 {
     *res = 0;
 
-    for( ; n > 0; --n )
-    {
-        if( ( **p < '0') || ( **p > '9' ) )
-            return ( MBEDTLS_ERR_X509_INVALID_DATE );
+    for (; n > 0; --n) {
+        if ((**p < '0') || (**p > '9'))
+            return (MBEDTLS_ERR_X509_INVALID_DATE);
 
         *res *= 10;
-        *res += ( *(*p)++ - '0' );
+        *res += (*(*p)++ - '0');
     }
 
-    return( 0 );
+    return (0);
 }
 
-static int x509_date_is_valid(const mbedtls_x509_time *t )
+static int x509_date_is_valid(const mbedtls_x509_time *t)
 {
     int ret = MBEDTLS_ERR_X509_INVALID_DATE;
     int month_len;
 
-    CHECK_RANGE( 0, 9999, t->year );
-    CHECK_RANGE( 0, 23,   t->hour );
-    CHECK_RANGE( 0, 59,   t->min  );
-    CHECK_RANGE( 0, 59,   t->sec  );
+    CHECK_RANGE(0, 9999, t->year);
+    CHECK_RANGE(0, 23,   t->hour);
+    CHECK_RANGE(0, 59,   t->min);
+    CHECK_RANGE(0, 59,   t->sec);
 
-    switch( t->mon )
-    {
-        case 1: case 3: case 5: case 7: case 8: case 10: case 12:
+    switch (t->mon) {
+        case 1:
+        case 3:
+        case 5:
+        case 7:
+        case 8:
+        case 10:
+        case 12:
             month_len = 31;
             break;
-        case 4: case 6: case 9: case 11:
+        case 4:
+        case 6:
+        case 9:
+        case 11:
             month_len = 30;
             break;
         case 2:
-            if( ( !( t->year % 4 ) && t->year % 100 ) ||
-                !( t->year % 400 ) )
+            if ((!(t->year % 4) && t->year % 100) ||
+                !(t->year % 400))
                 month_len = 29;
             else
                 month_len = 28;
             break;
         default:
-            return( ret );
+            return (ret);
     }
-    CHECK_RANGE( 1, month_len, t->day );
+    CHECK_RANGE(1, month_len, t->day);
 
-    return( 0 );
+    return (0);
 }
 
 /*
  * Parse an ASN1_UTC_TIME (yearlen=2) or ASN1_GENERALIZED_TIME (yearlen=4)
  * field.
  */
-static int x509_parse_time( unsigned char **p, size_t len, size_t yearlen,
-                            mbedtls_x509_time *tm )
+static int x509_parse_time(unsigned char **p, size_t len, size_t yearlen,
+                           mbedtls_x509_time *tm)
 {
     int ret;
 
     /*
      * Minimum length is 10 or 12 depending on yearlen
      */
-    if ( len < yearlen + 8 )
-        return ( MBEDTLS_ERR_X509_INVALID_DATE );
+    if (len < yearlen + 8)
+        return (MBEDTLS_ERR_X509_INVALID_DATE);
     len -= yearlen + 8;
 
     /*
      * Parse year, month, day, hour, minute
      */
-    CHECK( x509_parse_int( p, yearlen, &tm->year ) );
-    if ( 2 == yearlen )
-    {
-        if ( tm->year < 50 )
+    CHECK(x509_parse_int(p, yearlen, &tm->year));
+    if (2 == yearlen) {
+        if (tm->year < 50)
             tm->year += 100;
 
         tm->year += 1900;
     }
 
-    CHECK( x509_parse_int( p, 2, &tm->mon ) );
-    CHECK( x509_parse_int( p, 2, &tm->day ) );
-    CHECK( x509_parse_int( p, 2, &tm->hour ) );
-    CHECK( x509_parse_int( p, 2, &tm->min ) );
+    CHECK(x509_parse_int(p, 2, &tm->mon));
+    CHECK(x509_parse_int(p, 2, &tm->day));
+    CHECK(x509_parse_int(p, 2, &tm->hour));
+    CHECK(x509_parse_int(p, 2, &tm->min));
 
     /*
      * Parse seconds if present
      */
-    if ( len >= 2 )
-    {
-        CHECK( x509_parse_int( p, 2, &tm->sec ) );
+    if (len >= 2) {
+        CHECK(x509_parse_int(p, 2, &tm->sec));
         len -= 2;
-    }
-    else
-        return ( MBEDTLS_ERR_X509_INVALID_DATE );
+    } else
+        return (MBEDTLS_ERR_X509_INVALID_DATE);
 
     /*
      * Parse trailing 'Z' if present
      */
-    if ( 1 == len && 'Z' == **p )
-    {
+    if (1 == len && 'Z' == **p) {
         (*p)++;
         len--;
     }
@@ -578,12 +571,12 @@ static int x509_parse_time( unsigned char **p, size_t len, size_t yearlen,
     /*
      * We should have parsed all characters at this point
      */
-    if ( 0 != len )
-        return ( MBEDTLS_ERR_X509_INVALID_DATE );
+    if (0 != len)
+        return (MBEDTLS_ERR_X509_INVALID_DATE);
 
-    CHECK( x509_date_is_valid( tm ) );
+    CHECK(x509_date_is_valid(tm));
 
-    return ( 0 );
+    return (0);
 }
 
 /*
@@ -591,50 +584,50 @@ static int x509_parse_time( unsigned char **p, size_t len, size_t yearlen,
  *       utcTime        UTCTime,
  *       generalTime    GeneralizedTime }
  */
-int mbedtls_x509_get_time( unsigned char **p, const unsigned char *end,
-                           mbedtls_x509_time *tm )
+int mbedtls_x509_get_time(unsigned char **p, const unsigned char *end,
+                          mbedtls_x509_time *tm)
 {
     int ret;
     size_t len, year_len;
     unsigned char tag;
 
-    if( ( end - *p ) < 1 )
-        return( MBEDTLS_ERR_X509_INVALID_DATE +
-                MBEDTLS_ERR_ASN1_OUT_OF_DATA );
+    if ((end - *p) < 1)
+        return (MBEDTLS_ERR_X509_INVALID_DATE +
+                MBEDTLS_ERR_ASN1_OUT_OF_DATA);
 
     tag = **p;
 
-    if( tag == MBEDTLS_ASN1_UTC_TIME )
+    if (tag == MBEDTLS_ASN1_UTC_TIME)
         year_len = 2;
-    else if( tag == MBEDTLS_ASN1_GENERALIZED_TIME )
+    else if (tag == MBEDTLS_ASN1_GENERALIZED_TIME)
         year_len = 4;
     else
-        return( MBEDTLS_ERR_X509_INVALID_DATE +
-                MBEDTLS_ERR_ASN1_UNEXPECTED_TAG );
+        return (MBEDTLS_ERR_X509_INVALID_DATE +
+                MBEDTLS_ERR_ASN1_UNEXPECTED_TAG);
 
     (*p)++;
-    ret = mbedtls_asn1_get_len( p, end, &len );
+    ret = mbedtls_asn1_get_len(p, end, &len);
 
-    if( ret != 0 )
-        return( MBEDTLS_ERR_X509_INVALID_DATE + ret );
+    if (ret != 0)
+        return (MBEDTLS_ERR_X509_INVALID_DATE + ret);
 
-    return x509_parse_time( p, len, year_len, tm );
+    return x509_parse_time(p, len, year_len, tm);
 }
 
-int mbedtls_x509_get_sig( unsigned char **p, const unsigned char *end, mbedtls_x509_buf *sig )
+int mbedtls_x509_get_sig(unsigned char **p, const unsigned char *end, mbedtls_x509_buf *sig)
 {
     int ret;
     size_t len;
     int tag_type;
 
-    if( ( end - *p ) < 1 )
-        return( MBEDTLS_ERR_X509_INVALID_SIGNATURE +
-                MBEDTLS_ERR_ASN1_OUT_OF_DATA );
+    if ((end - *p) < 1)
+        return (MBEDTLS_ERR_X509_INVALID_SIGNATURE +
+                MBEDTLS_ERR_ASN1_OUT_OF_DATA);
 
     tag_type = **p;
 
-    if( ( ret = mbedtls_asn1_get_bitstring_null( p, end, &len ) ) != 0 )
-        return( MBEDTLS_ERR_X509_INVALID_SIGNATURE + ret );
+    if ((ret = mbedtls_asn1_get_bitstring_null(p, end, &len)) != 0)
+        return (MBEDTLS_ERR_X509_INVALID_SIGNATURE + ret);
 
     sig->tag = tag_type;
     sig->len = len;
@@ -642,75 +635,72 @@ int mbedtls_x509_get_sig( unsigned char **p, const unsigned char *end, mbedtls_x
 
     *p += len;
 
-    return( 0 );
+    return (0);
 }
 
 /*
  * Get signature algorithm from alg OID and optional parameters
  */
-int mbedtls_x509_get_sig_alg( const mbedtls_x509_buf *sig_oid, const mbedtls_x509_buf *sig_params,
-                      mbedtls_md_type_t *md_alg, mbedtls_pk_type_t *pk_alg,
-                      void **sig_opts )
+int mbedtls_x509_get_sig_alg(const mbedtls_x509_buf *sig_oid, const mbedtls_x509_buf *sig_params,
+                             mbedtls_md_type_t *md_alg, mbedtls_pk_type_t *pk_alg,
+                             void **sig_opts)
 {
     int ret;
 
-    if( *sig_opts != NULL )
-        return( MBEDTLS_ERR_X509_BAD_INPUT_DATA );
+    if (*sig_opts != NULL)
+        return (MBEDTLS_ERR_X509_BAD_INPUT_DATA);
 
-    if( ( ret = mbedtls_oid_get_sig_alg( sig_oid, md_alg, pk_alg ) ) != 0 )
-        return( MBEDTLS_ERR_X509_UNKNOWN_SIG_ALG + ret );
+    if ((ret = mbedtls_oid_get_sig_alg(sig_oid, md_alg, pk_alg)) != 0)
+        return (MBEDTLS_ERR_X509_UNKNOWN_SIG_ALG + ret);
 
 #if defined(MBEDTLS_X509_RSASSA_PSS_SUPPORT)
-    if( *pk_alg == MBEDTLS_PK_RSASSA_PSS )
-    {
+    if (*pk_alg == MBEDTLS_PK_RSASSA_PSS) {
         mbedtls_pk_rsassa_pss_options *pss_opts;
 
-        pss_opts = mbedtls_calloc( 1, sizeof( mbedtls_pk_rsassa_pss_options ) );
-        if( pss_opts == NULL )
-            return( MBEDTLS_ERR_X509_ALLOC_FAILED );
+        pss_opts = mbedtls_calloc(1, sizeof(mbedtls_pk_rsassa_pss_options));
+        if (pss_opts == NULL)
+            return (MBEDTLS_ERR_X509_ALLOC_FAILED);
 
-        ret = mbedtls_x509_get_rsassa_pss_params( sig_params,
-                                          md_alg,
-                                          &pss_opts->mgf1_hash_id,
-                                          &pss_opts->expected_salt_len );
-        if( ret != 0 )
-        {
-            mbedtls_free( pss_opts );
-            return( ret );
+        ret = mbedtls_x509_get_rsassa_pss_params(sig_params,
+                                                 md_alg,
+                                                 &pss_opts->mgf1_hash_id,
+                                                 &pss_opts->expected_salt_len);
+        if (ret != 0) {
+            mbedtls_free(pss_opts);
+            return (ret);
         }
 
         *sig_opts = (void *) pss_opts;
-    }
-    else
+    } else
 #endif /* MBEDTLS_X509_RSASSA_PSS_SUPPORT */
     {
         /* Make sure parameters are absent or NULL */
-        if( ( sig_params->tag != MBEDTLS_ASN1_NULL && sig_params->tag != 0 ) ||
-              sig_params->len != 0 )
-        return( MBEDTLS_ERR_X509_INVALID_ALG );
+        if ((sig_params->tag != MBEDTLS_ASN1_NULL && sig_params->tag != 0) ||
+            sig_params->len != 0)
+            return (MBEDTLS_ERR_X509_INVALID_ALG);
     }
 
-    return( 0 );
+    return (0);
 }
 
 /*
  * X.509 Extensions (No parsing of extensions, pointer should
  * be either manually updated or extensions should be parsed!)
  */
-int mbedtls_x509_get_ext( unsigned char **p, const unsigned char *end,
-                  mbedtls_x509_buf *ext, int tag )
+int mbedtls_x509_get_ext(unsigned char **p, const unsigned char *end,
+                         mbedtls_x509_buf *ext, int tag)
 {
     int ret;
     size_t len;
 
-    if( *p == end )
-        return( 0 );
+    if (*p == end)
+        return (0);
 
     ext->tag = **p;
 
-    if( ( ret = mbedtls_asn1_get_tag( p, end, &ext->len,
-            MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_CONSTRUCTED | tag ) ) != 0 )
-        return( ret );
+    if ((ret = mbedtls_asn1_get_tag(p, end, &ext->len,
+                                    MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_CONSTRUCTED | tag)) != 0)
+        return (ret);
 
     ext->p = *p;
     end = *p + ext->len;
@@ -723,22 +713,22 @@ int mbedtls_x509_get_ext( unsigned char **p, const unsigned char *end,
      *      critical    BOOLEAN DEFAULT FALSE,
      *      extnValue   OCTET STRING  }
      */
-    if( ( ret = mbedtls_asn1_get_tag( p, end, &len,
-            MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
-        return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret );
+    if ((ret = mbedtls_asn1_get_tag(p, end, &len,
+                                    MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE)) != 0)
+        return (MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret);
 
-    if( end != *p + len )
-        return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
-                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+    if (end != *p + len)
+        return (MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
+                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH);
 
-    return( 0 );
+    return (0);
 }
 
 /*
  * Store the name in printable form into buf; no more
  * than size characters will be written
  */
-int mbedtls_x509_dn_gets( char *buf, size_t size, const mbedtls_x509_name *dn )
+int mbedtls_x509_dn_gets(char *buf, size_t size, const mbedtls_x509_name *dn)
 {
     int ret;
     size_t i, n;
@@ -747,60 +737,56 @@ int mbedtls_x509_dn_gets( char *buf, size_t size, const mbedtls_x509_name *dn )
     const char *short_name = NULL;
     char s[MBEDTLS_X509_MAX_DN_NAME_SIZE], *p;
 
-    memset( s, 0, sizeof( s ) );
+    memset(s, 0, sizeof(s));
 
     name = dn;
     p = buf;
     n = size;
 
-    while( name != NULL )
-    {
-        if( !name->oid.p )
-        {
+    while (name != NULL) {
+        if (!name->oid.p) {
             name = name->next;
             continue;
         }
 
-        if( name != dn )
-        {
-            ret = mbedtls_snprintf( p, n, merge ? " + " : ", " );
+        if (name != dn) {
+            ret = mbedtls_snprintf(p, n, merge ? " + " : ", ");
             MBEDTLS_X509_SAFE_SNPRINTF;
         }
 
-        ret = mbedtls_oid_get_attr_short_name( &name->oid, &short_name );
+        ret = mbedtls_oid_get_attr_short_name(&name->oid, &short_name);
 
-        if( ret == 0 )
-            ret = mbedtls_snprintf( p, n, "%s=", short_name );
+        if (ret == 0)
+            ret = mbedtls_snprintf(p, n, "%s=", short_name);
         else
-            ret = mbedtls_snprintf( p, n, "\?\?=" );
+            ret = mbedtls_snprintf(p, n, "\?\?=");
         MBEDTLS_X509_SAFE_SNPRINTF;
 
-        for( i = 0; i < name->val.len; i++ )
-        {
-            if( i >= sizeof( s ) - 1 )
+        for (i = 0; i < name->val.len; i++) {
+            if (i >= sizeof(s) - 1)
                 break;
 
             c = name->val.p[i];
-            if( c < 32 || c == 127 || ( c > 128 && c < 160 ) )
-                 s[i] = '?';
+            if (c < 32 || c == 127 || (c > 128 && c < 160))
+                s[i] = '?';
             else s[i] = c;
         }
         s[i] = '\0';
-        ret = mbedtls_snprintf( p, n, "%s", s );
+        ret = mbedtls_snprintf(p, n, "%s", s);
         MBEDTLS_X509_SAFE_SNPRINTF;
 
         merge = name->next_merged;
         name = name->next;
     }
 
-    return( (int) ( size - n ) );
+    return ((int)(size - n));
 }
 
 /*
  * Store the serial in printable form into buf; no more
  * than size characters will be written
  */
-int mbedtls_x509_serial_gets( char *buf, size_t size, const mbedtls_x509_buf *serial )
+int mbedtls_x509_serial_gets(char *buf, size_t size, const mbedtls_x509_buf *serial)
 {
     int ret;
     size_t i, n, nr;
@@ -809,62 +795,59 @@ int mbedtls_x509_serial_gets( char *buf, size_t size, const mbedtls_x509_buf *se
     p = buf;
     n = size;
 
-    nr = ( serial->len <= 32 )
-        ? serial->len  : 28;
+    nr = (serial->len <= 32)
+         ? serial->len  : 28;
 
-    for( i = 0; i < nr; i++ )
-    {
-        if( i == 0 && nr > 1 && serial->p[i] == 0x0 )
+    for (i = 0; i < nr; i++) {
+        if (i == 0 && nr > 1 && serial->p[i] == 0x0)
             continue;
 
-        ret = mbedtls_snprintf( p, n, "%02X%s",
-                serial->p[i], ( i < nr - 1 ) ? ":" : "" );
+        ret = mbedtls_snprintf(p, n, "%02X%s",
+                               serial->p[i], (i < nr - 1) ? ":" : "");
         MBEDTLS_X509_SAFE_SNPRINTF;
     }
 
-    if( nr != serial->len )
-    {
-        ret = mbedtls_snprintf( p, n, "...." );
+    if (nr != serial->len) {
+        ret = mbedtls_snprintf(p, n, "....");
         MBEDTLS_X509_SAFE_SNPRINTF;
     }
 
-    return( (int) ( size - n ) );
+    return ((int)(size - n));
 }
 
 /*
  * Helper for writing signature algorithms
  */
-int mbedtls_x509_sig_alg_gets( char *buf, size_t size, const mbedtls_x509_buf *sig_oid,
-                       mbedtls_pk_type_t pk_alg, mbedtls_md_type_t md_alg,
-                       const void *sig_opts )
+int mbedtls_x509_sig_alg_gets(char *buf, size_t size, const mbedtls_x509_buf *sig_oid,
+                              mbedtls_pk_type_t pk_alg, mbedtls_md_type_t md_alg,
+                              const void *sig_opts)
 {
     int ret;
     char *p = buf;
     size_t n = size;
     const char *desc = NULL;
 
-    ret = mbedtls_oid_get_sig_alg_desc( sig_oid, &desc );
-    if( ret != 0 )
-        ret = mbedtls_snprintf( p, n, "???"  );
+    ret = mbedtls_oid_get_sig_alg_desc(sig_oid, &desc);
+    if (ret != 0)
+        ret = mbedtls_snprintf(p, n, "???");
     else
-        ret = mbedtls_snprintf( p, n, "%s", desc );
+        ret = mbedtls_snprintf(p, n, "%s", desc);
     MBEDTLS_X509_SAFE_SNPRINTF;
 
 #if defined(MBEDTLS_X509_RSASSA_PSS_SUPPORT)
-    if( pk_alg == MBEDTLS_PK_RSASSA_PSS )
-    {
+    if (pk_alg == MBEDTLS_PK_RSASSA_PSS) {
         const mbedtls_pk_rsassa_pss_options *pss_opts;
         const mbedtls_md_info_t *md_info, *mgf_md_info;
 
         pss_opts = (const mbedtls_pk_rsassa_pss_options *) sig_opts;
 
-        md_info = mbedtls_md_info_from_type( md_alg );
-        mgf_md_info = mbedtls_md_info_from_type( pss_opts->mgf1_hash_id );
+        md_info = mbedtls_md_info_from_type(md_alg);
+        mgf_md_info = mbedtls_md_info_from_type(pss_opts->mgf1_hash_id);
 
-        ret = mbedtls_snprintf( p, n, " (%s, MGF1-%s, 0x%02X)",
-                              md_info ? mbedtls_md_get_name( md_info ) : "???",
-                              mgf_md_info ? mbedtls_md_get_name( mgf_md_info ) : "???",
-                              pss_opts->expected_salt_len );
+        ret = mbedtls_snprintf(p, n, " (%s, MGF1-%s, 0x%02X)",
+                               md_info ? mbedtls_md_get_name(md_info) : "???",
+                               mgf_md_info ? mbedtls_md_get_name(mgf_md_info) : "???",
+                               pss_opts->expected_salt_len);
         MBEDTLS_X509_SAFE_SNPRINTF;
     }
 #else
@@ -873,22 +856,22 @@ int mbedtls_x509_sig_alg_gets( char *buf, size_t size, const mbedtls_x509_buf *s
     ((void) sig_opts);
 #endif /* MBEDTLS_X509_RSASSA_PSS_SUPPORT */
 
-    return( (int)( size - n ) );
+    return ((int)(size - n));
 }
 
 /*
  * Helper for writing "RSA key size", "EC key size", etc
  */
-int mbedtls_x509_key_size_helper( char *buf, size_t buf_size, const char *name )
+int mbedtls_x509_key_size_helper(char *buf, size_t buf_size, const char *name)
 {
     char *p = buf;
     size_t n = buf_size;
     int ret;
 
-    ret = mbedtls_snprintf( p, n, "%s key size", name );
+    ret = mbedtls_snprintf(p, n, "%s key size", name);
     MBEDTLS_X509_SAFE_SNPRINTF;
 
-    return( 0 );
+    return (0);
 }
 
 #if defined(MBEDTLS_HAVE_TIME_DATE)
@@ -896,23 +879,22 @@ int mbedtls_x509_key_size_helper( char *buf, size_t buf_size, const char *name )
  * Set the time structure to the current time.
  * Return 0 on success, non-zero on failure.
  */
-static int x509_get_current_time( mbedtls_x509_time *now )
+static int x509_get_current_time(mbedtls_x509_time *now)
 {
     struct tm *lt, tm_buf;
     mbedtls_time_t tt;
     int ret = 0;
 
-    tt = mbedtls_time( NULL );
+    tt = mbedtls_time(NULL);
 #if defined(_WIN32) && !defined(EFIX64) && !defined(EFI32)
-    lt = gmtime_s( &tm_buf, &tt ) == 0 ? &tm_buf : NULL;
+    lt = gmtime_s(&tm_buf, &tt) == 0 ? &tm_buf : NULL;
 #else
-    lt = gmtime_r( &tt, &tm_buf );
+    lt = gmtime_r(&tt, &tm_buf);
 #endif
 
-    if( lt == NULL )
+    if (lt == NULL)
         ret = -1;
-    else
-    {
+    else {
         now->year = lt->tm_year + 1900;
         now->mon  = lt->tm_mon  + 1;
         now->day  = lt->tm_mday;
@@ -921,82 +903,82 @@ static int x509_get_current_time( mbedtls_x509_time *now )
         now->sec  = lt->tm_sec;
     }
 
-    return( ret );
+    return (ret);
 }
 
 /*
  * Return 0 if before <= after, 1 otherwise
  */
-static int x509_check_time( const mbedtls_x509_time *before, const mbedtls_x509_time *after )
+static int x509_check_time(const mbedtls_x509_time *before, const mbedtls_x509_time *after)
 {
-    if( before->year  > after->year )
-        return( 1 );
+    if (before->year  > after->year)
+        return (1);
 
-    if( before->year == after->year &&
-        before->mon   > after->mon )
-        return( 1 );
+    if (before->year == after->year &&
+        before->mon   > after->mon)
+        return (1);
 
-    if( before->year == after->year &&
+    if (before->year == after->year &&
         before->mon  == after->mon  &&
-        before->day   > after->day )
-        return( 1 );
+        before->day   > after->day)
+        return (1);
 
-    if( before->year == after->year &&
+    if (before->year == after->year &&
         before->mon  == after->mon  &&
         before->day  == after->day  &&
-        before->hour  > after->hour )
-        return( 1 );
+        before->hour  > after->hour)
+        return (1);
 
-    if( before->year == after->year &&
+    if (before->year == after->year &&
         before->mon  == after->mon  &&
         before->day  == after->day  &&
         before->hour == after->hour &&
-        before->min   > after->min  )
-        return( 1 );
+        before->min   > after->min)
+        return (1);
 
-    if( before->year == after->year &&
+    if (before->year == after->year &&
         before->mon  == after->mon  &&
         before->day  == after->day  &&
         before->hour == after->hour &&
         before->min  == after->min  &&
-        before->sec   > after->sec  )
-        return( 1 );
+        before->sec   > after->sec)
+        return (1);
 
-    return( 0 );
+    return (0);
 }
 
-int mbedtls_x509_time_is_past( const mbedtls_x509_time *to )
+int mbedtls_x509_time_is_past(const mbedtls_x509_time *to)
 {
     mbedtls_x509_time now;
 
-    if( x509_get_current_time( &now ) != 0 )
-        return( 1 );
+    if (x509_get_current_time(&now) != 0)
+        return (1);
 
-    return( x509_check_time( &now, to ) );
+    return (x509_check_time(&now, to));
 }
 
-int mbedtls_x509_time_is_future( const mbedtls_x509_time *from )
+int mbedtls_x509_time_is_future(const mbedtls_x509_time *from)
 {
     mbedtls_x509_time now;
 
-    if( x509_get_current_time( &now ) != 0 )
-        return( 1 );
+    if (x509_get_current_time(&now) != 0)
+        return (1);
 
-    return( x509_check_time( from, &now ) );
+    return (x509_check_time(from, &now));
 }
 
 #else  /* MBEDTLS_HAVE_TIME_DATE */
 
-int mbedtls_x509_time_is_past( const mbedtls_x509_time *to )
+int mbedtls_x509_time_is_past(const mbedtls_x509_time *to)
 {
     ((void) to);
-    return( 0 );
+    return (0);
 }
 
-int mbedtls_x509_time_is_future( const mbedtls_x509_time *from )
+int mbedtls_x509_time_is_future(const mbedtls_x509_time *from)
 {
     ((void) from);
-    return( 0 );
+    return (0);
 }
 #endif /* MBEDTLS_HAVE_TIME_DATE */
 
@@ -1008,7 +990,7 @@ int mbedtls_x509_time_is_future( const mbedtls_x509_time *from )
 /*
  * Checkup routine
  */
-int mbedtls_x509_self_test( int verbose )
+int mbedtls_x509_self_test(int verbose)
 {
 #if defined(MBEDTLS_CERTS_C) && defined(MBEDTLS_SHA256_C)
     int ret;
@@ -1016,55 +998,52 @@ int mbedtls_x509_self_test( int verbose )
     mbedtls_x509_crt cacert;
     mbedtls_x509_crt clicert;
 
-    if( verbose != 0 )
-        mbedtls_printf( "  X.509 certificate load: " );
+    if (verbose != 0)
+        mbedtls_printf("  X.509 certificate load: ");
 
-    mbedtls_x509_crt_init( &clicert );
+    mbedtls_x509_crt_init(&clicert);
 
-    ret = mbedtls_x509_crt_parse( &clicert, (const unsigned char *) mbedtls_test_cli_crt,
-                           mbedtls_test_cli_crt_len );
-    if( ret != 0 )
-    {
-        if( verbose != 0 )
-            mbedtls_printf( "failed\n" );
+    ret = mbedtls_x509_crt_parse(&clicert, (const unsigned char *) mbedtls_test_cli_crt,
+                                 mbedtls_test_cli_crt_len);
+    if (ret != 0) {
+        if (verbose != 0)
+            mbedtls_printf("failed\n");
 
-        return( ret );
+        return (ret);
     }
 
-    mbedtls_x509_crt_init( &cacert );
+    mbedtls_x509_crt_init(&cacert);
 
-    ret = mbedtls_x509_crt_parse( &cacert, (const unsigned char *) mbedtls_test_ca_crt,
-                          mbedtls_test_ca_crt_len );
-    if( ret != 0 )
-    {
-        if( verbose != 0 )
-            mbedtls_printf( "failed\n" );
+    ret = mbedtls_x509_crt_parse(&cacert, (const unsigned char *) mbedtls_test_ca_crt,
+                                 mbedtls_test_ca_crt_len);
+    if (ret != 0) {
+        if (verbose != 0)
+            mbedtls_printf("failed\n");
 
-        return( ret );
+        return (ret);
     }
 
-    if( verbose != 0 )
-        mbedtls_printf( "passed\n  X.509 signature verify: ");
+    if (verbose != 0)
+        mbedtls_printf("passed\n  X.509 signature verify: ");
 
-    ret = mbedtls_x509_crt_verify( &clicert, &cacert, NULL, NULL, &flags, NULL, NULL );
-    if( ret != 0 )
-    {
-        if( verbose != 0 )
-            mbedtls_printf( "failed\n" );
+    ret = mbedtls_x509_crt_verify(&clicert, &cacert, NULL, NULL, &flags, NULL, NULL);
+    if (ret != 0) {
+        if (verbose != 0)
+            mbedtls_printf("failed\n");
 
-        return( ret );
+        return (ret);
     }
 
-    if( verbose != 0 )
-        mbedtls_printf( "passed\n\n");
+    if (verbose != 0)
+        mbedtls_printf("passed\n\n");
 
-    mbedtls_x509_crt_free( &cacert  );
-    mbedtls_x509_crt_free( &clicert );
+    mbedtls_x509_crt_free(&cacert);
+    mbedtls_x509_crt_free(&clicert);
 
-    return( 0 );
+    return (0);
 #else
     ((void) verbose);
-    return( 0 );
+    return (0);
 #endif /* MBEDTLS_CERTS_C && MBEDTLS_SHA1_C */
 }
 
diff --git a/common/mbedtls/x509.h b/common/mbedtls/x509.h
index 0f0ef2eed..01ec3df70 100644
--- a/common/mbedtls/x509.h
+++ b/common/mbedtls/x509.h
@@ -207,8 +207,7 @@ typedef mbedtls_asn1_named_data mbedtls_x509_name;
 typedef mbedtls_asn1_sequence mbedtls_x509_sequence;
 
 /** Container for date and time (precision in seconds). */
-typedef struct mbedtls_x509_time
-{
+typedef struct mbedtls_x509_time {
     int year, mon, day;         /**< Date. */
     int hour, min, sec;         /**< Time. */
 }
@@ -228,7 +227,7 @@ mbedtls_x509_time;
  * \return         The length of the string written (not including the
  *                 terminated nul byte), or a negative error code.
  */
-int mbedtls_x509_dn_gets( char *buf, size_t size, const mbedtls_x509_name *dn );
+int mbedtls_x509_dn_gets(char *buf, size_t size, const mbedtls_x509_name *dn);
 
 /**
  * \brief          Store the certificate serial in printable form into buf;
@@ -241,7 +240,7 @@ int mbedtls_x509_dn_gets( char *buf, size_t size, const mbedtls_x509_name *dn );
  * \return         The length of the string written (not including the
  *                 terminated nul byte), or a negative error code.
  */
-int mbedtls_x509_serial_gets( char *buf, size_t size, const mbedtls_x509_buf *serial );
+int mbedtls_x509_serial_gets(char *buf, size_t size, const mbedtls_x509_buf *serial);
 
 /**
  * \brief          Check a given mbedtls_x509_time against the system time
@@ -255,7 +254,7 @@ int mbedtls_x509_serial_gets( char *buf, size_t size, const mbedtls_x509_buf *se
  * \return         1 if the given time is in the past or an error occured,
  *                 0 otherwise.
  */
-int mbedtls_x509_time_is_past( const mbedtls_x509_time *to );
+int mbedtls_x509_time_is_past(const mbedtls_x509_time *to);
 
 /**
  * \brief          Check a given mbedtls_x509_time against the system time
@@ -269,61 +268,61 @@ int mbedtls_x509_time_is_past( const mbedtls_x509_time *to );
  * \return         1 if the given time is in the future or an error occured,
  *                 0 otherwise.
  */
-int mbedtls_x509_time_is_future( const mbedtls_x509_time *from );
+int mbedtls_x509_time_is_future(const mbedtls_x509_time *from);
 
 /**
  * \brief          Checkup routine
  *
  * \return         0 if successful, or 1 if the test failed
  */
-int mbedtls_x509_self_test( int verbose );
+int mbedtls_x509_self_test(int verbose);
 
 /*
  * Internal module functions. You probably do not want to use these unless you
  * know you do.
  */
-int mbedtls_x509_get_name( unsigned char **p, const unsigned char *end,
-                   mbedtls_x509_name *cur );
-int mbedtls_x509_get_alg_null( unsigned char **p, const unsigned char *end,
-                       mbedtls_x509_buf *alg );
-int mbedtls_x509_get_alg( unsigned char **p, const unsigned char *end,
-                  mbedtls_x509_buf *alg, mbedtls_x509_buf *params );
+int mbedtls_x509_get_name(unsigned char **p, const unsigned char *end,
+                          mbedtls_x509_name *cur);
+int mbedtls_x509_get_alg_null(unsigned char **p, const unsigned char *end,
+                              mbedtls_x509_buf *alg);
+int mbedtls_x509_get_alg(unsigned char **p, const unsigned char *end,
+                         mbedtls_x509_buf *alg, mbedtls_x509_buf *params);
 #if defined(MBEDTLS_X509_RSASSA_PSS_SUPPORT)
-int mbedtls_x509_get_rsassa_pss_params( const mbedtls_x509_buf *params,
-                                mbedtls_md_type_t *md_alg, mbedtls_md_type_t *mgf_md,
-                                int *salt_len );
+int mbedtls_x509_get_rsassa_pss_params(const mbedtls_x509_buf *params,
+                                       mbedtls_md_type_t *md_alg, mbedtls_md_type_t *mgf_md,
+                                       int *salt_len);
 #endif
-int mbedtls_x509_get_sig( unsigned char **p, const unsigned char *end, mbedtls_x509_buf *sig );
-int mbedtls_x509_get_sig_alg( const mbedtls_x509_buf *sig_oid, const mbedtls_x509_buf *sig_params,
-                      mbedtls_md_type_t *md_alg, mbedtls_pk_type_t *pk_alg,
-                      void **sig_opts );
-int mbedtls_x509_get_time( unsigned char **p, const unsigned char *end,
-                   mbedtls_x509_time *t );
-int mbedtls_x509_get_serial( unsigned char **p, const unsigned char *end,
-                     mbedtls_x509_buf *serial );
-int mbedtls_x509_get_ext( unsigned char **p, const unsigned char *end,
-                  mbedtls_x509_buf *ext, int tag );
-int mbedtls_x509_sig_alg_gets( char *buf, size_t size, const mbedtls_x509_buf *sig_oid,
-                       mbedtls_pk_type_t pk_alg, mbedtls_md_type_t md_alg,
-                       const void *sig_opts );
-int mbedtls_x509_key_size_helper( char *buf, size_t buf_size, const char *name );
-int mbedtls_x509_string_to_names( mbedtls_asn1_named_data **head, const char *name );
-int mbedtls_x509_set_extension( mbedtls_asn1_named_data **head, const char *oid, size_t oid_len,
-                        int critical, const unsigned char *val,
-                        size_t val_len );
-int mbedtls_x509_write_extensions( unsigned char **p, unsigned char *start,
-                           mbedtls_asn1_named_data *first );
-int mbedtls_x509_write_names( unsigned char **p, unsigned char *start,
-                      mbedtls_asn1_named_data *first );
-int mbedtls_x509_write_sig( unsigned char **p, unsigned char *start,
-                    const char *oid, size_t oid_len,
-                    unsigned char *sig, size_t size );
+int mbedtls_x509_get_sig(unsigned char **p, const unsigned char *end, mbedtls_x509_buf *sig);
+int mbedtls_x509_get_sig_alg(const mbedtls_x509_buf *sig_oid, const mbedtls_x509_buf *sig_params,
+                             mbedtls_md_type_t *md_alg, mbedtls_pk_type_t *pk_alg,
+                             void **sig_opts);
+int mbedtls_x509_get_time(unsigned char **p, const unsigned char *end,
+                          mbedtls_x509_time *t);
+int mbedtls_x509_get_serial(unsigned char **p, const unsigned char *end,
+                            mbedtls_x509_buf *serial);
+int mbedtls_x509_get_ext(unsigned char **p, const unsigned char *end,
+                         mbedtls_x509_buf *ext, int tag);
+int mbedtls_x509_sig_alg_gets(char *buf, size_t size, const mbedtls_x509_buf *sig_oid,
+                              mbedtls_pk_type_t pk_alg, mbedtls_md_type_t md_alg,
+                              const void *sig_opts);
+int mbedtls_x509_key_size_helper(char *buf, size_t buf_size, const char *name);
+int mbedtls_x509_string_to_names(mbedtls_asn1_named_data **head, const char *name);
+int mbedtls_x509_set_extension(mbedtls_asn1_named_data **head, const char *oid, size_t oid_len,
+                               int critical, const unsigned char *val,
+                               size_t val_len);
+int mbedtls_x509_write_extensions(unsigned char **p, unsigned char *start,
+                                  mbedtls_asn1_named_data *first);
+int mbedtls_x509_write_names(unsigned char **p, unsigned char *start,
+                             mbedtls_asn1_named_data *first);
+int mbedtls_x509_write_sig(unsigned char **p, unsigned char *start,
+                           const char *oid, size_t oid_len,
+                           unsigned char *sig, size_t size);
 
 #define MBEDTLS_X509_SAFE_SNPRINTF                          \
     do {                                                    \
         if( ret < 0 || (size_t) ret >= n )                  \
             return( MBEDTLS_ERR_X509_BUFFER_TOO_SMALL );    \
-                                                            \
+        \
         n -= (size_t) ret;                                  \
         p += (size_t) ret;                                  \
     } while( 0 )
diff --git a/common/mbedtls/x509_crl.c b/common/mbedtls/x509_crl.c
index 12e196a30..d02667e62 100644
--- a/common/mbedtls/x509_crl.c
+++ b/common/mbedtls/x509_crl.c
@@ -72,24 +72,22 @@
 /*
  *  Version  ::=  INTEGER  {  v1(0), v2(1)  }
  */
-static int x509_crl_get_version( unsigned char **p,
-                             const unsigned char *end,
-                             int *ver )
+static int x509_crl_get_version(unsigned char **p,
+                                const unsigned char *end,
+                                int *ver)
 {
     int ret;
 
-    if( ( ret = mbedtls_asn1_get_int( p, end, ver ) ) != 0 )
-    {
-        if( ret == MBEDTLS_ERR_ASN1_UNEXPECTED_TAG )
-        {
+    if ((ret = mbedtls_asn1_get_int(p, end, ver)) != 0) {
+        if (ret == MBEDTLS_ERR_ASN1_UNEXPECTED_TAG) {
             *ver = 0;
-            return( 0 );
+            return (0);
         }
 
-        return( MBEDTLS_ERR_X509_INVALID_VERSION + ret );
+        return (MBEDTLS_ERR_X509_INVALID_VERSION + ret);
     }
 
-    return( 0 );
+    return (0);
 }
 
 /*
@@ -99,9 +97,9 @@ static int x509_crl_get_version( unsigned char **p,
  * list of extensions is well-formed and abort on critical extensions (that
  * are unsupported as we don't support any extension so far)
  */
-static int x509_get_crl_ext( unsigned char **p,
-                             const unsigned char *end,
-                             mbedtls_x509_buf *ext )
+static int x509_get_crl_ext(unsigned char **p,
+                            const unsigned char *end,
+                            mbedtls_x509_buf *ext)
 {
     int ret;
 
@@ -109,16 +107,14 @@ static int x509_get_crl_ext( unsigned char **p,
      * crlExtensions           [0]  EXPLICIT Extensions OPTIONAL
      *                              -- if present, version MUST be v2
      */
-    if( ( ret = mbedtls_x509_get_ext( p, end, ext, 0 ) ) != 0 )
-    {
-        if( ret == MBEDTLS_ERR_ASN1_UNEXPECTED_TAG )
-            return( 0 );
+    if ((ret = mbedtls_x509_get_ext(p, end, ext, 0)) != 0) {
+        if (ret == MBEDTLS_ERR_ASN1_UNEXPECTED_TAG)
+            return (0);
 
-        return( ret );
+        return (ret);
     }
 
-    while( *p < end )
-    {
+    while (*p < end) {
         /*
          * Extension  ::=  SEQUENCE  {
          *      extnID      OBJECT IDENTIFIER,
@@ -130,65 +126,63 @@ static int x509_get_crl_ext( unsigned char **p,
         size_t len;
 
         /* Get enclosing sequence tag */
-        if( ( ret = mbedtls_asn1_get_tag( p, end, &len,
-                MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
-            return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret );
+        if ((ret = mbedtls_asn1_get_tag(p, end, &len,
+                                        MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE)) != 0)
+            return (MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret);
 
         end_ext_data = *p + len;
 
         /* Get OID (currently ignored) */
-        if( ( ret = mbedtls_asn1_get_tag( p, end_ext_data, &len,
-                                          MBEDTLS_ASN1_OID ) ) != 0 )
-        {
-            return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret );
+        if ((ret = mbedtls_asn1_get_tag(p, end_ext_data, &len,
+                                        MBEDTLS_ASN1_OID)) != 0) {
+            return (MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret);
         }
         *p += len;
 
         /* Get optional critical */
-        if( ( ret = mbedtls_asn1_get_bool( p, end_ext_data,
-                                           &is_critical ) ) != 0 &&
-            ( ret != MBEDTLS_ERR_ASN1_UNEXPECTED_TAG ) )
-        {
-            return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret );
+        if ((ret = mbedtls_asn1_get_bool(p, end_ext_data,
+                                         &is_critical)) != 0 &&
+            (ret != MBEDTLS_ERR_ASN1_UNEXPECTED_TAG)) {
+            return (MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret);
         }
 
         /* Data should be octet string type */
-        if( ( ret = mbedtls_asn1_get_tag( p, end_ext_data, &len,
-                MBEDTLS_ASN1_OCTET_STRING ) ) != 0 )
-            return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret );
+        if ((ret = mbedtls_asn1_get_tag(p, end_ext_data, &len,
+                                        MBEDTLS_ASN1_OCTET_STRING)) != 0)
+            return (MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret);
 
         /* Ignore data so far and just check its length */
         *p += len;
-        if( *p != end_ext_data )
-            return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
-                    MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+        if (*p != end_ext_data)
+            return (MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
+                    MBEDTLS_ERR_ASN1_LENGTH_MISMATCH);
 
         /* Abort on (unsupported) critical extensions */
-        if( is_critical )
-            return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
-                    MBEDTLS_ERR_ASN1_UNEXPECTED_TAG );
+        if (is_critical)
+            return (MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
+                    MBEDTLS_ERR_ASN1_UNEXPECTED_TAG);
     }
 
-    if( *p != end )
-        return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
-                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+    if (*p != end)
+        return (MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
+                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH);
 
-    return( 0 );
+    return (0);
 }
 
 /*
  * X.509 CRL v2 entry extensions (no extensions parsed yet.)
  */
-static int x509_get_crl_entry_ext( unsigned char **p,
-                             const unsigned char *end,
-                             mbedtls_x509_buf *ext )
+static int x509_get_crl_entry_ext(unsigned char **p,
+                                  const unsigned char *end,
+                                  mbedtls_x509_buf *ext)
 {
     int ret;
     size_t len = 0;
 
     /* OPTIONAL */
-    if( end <= *p )
-        return( 0 );
+    if (end <= *p)
+        return (0);
 
     ext->tag = **p;
     ext->p = *p;
@@ -197,73 +191,67 @@ static int x509_get_crl_entry_ext( unsigned char **p,
      * Get CRL-entry extension sequence header
      * crlEntryExtensions      Extensions OPTIONAL  -- if present, MUST be v2
      */
-    if( ( ret = mbedtls_asn1_get_tag( p, end, &ext->len,
-            MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
-    {
-        if( ret == MBEDTLS_ERR_ASN1_UNEXPECTED_TAG )
-        {
+    if ((ret = mbedtls_asn1_get_tag(p, end, &ext->len,
+                                    MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE)) != 0) {
+        if (ret == MBEDTLS_ERR_ASN1_UNEXPECTED_TAG) {
             ext->p = NULL;
-            return( 0 );
+            return (0);
         }
-        return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret );
+        return (MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret);
     }
 
     end = *p + ext->len;
 
-    if( end != *p + ext->len )
-        return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
-                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+    if (end != *p + ext->len)
+        return (MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
+                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH);
 
-    while( *p < end )
-    {
-        if( ( ret = mbedtls_asn1_get_tag( p, end, &len,
-                MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
-            return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret );
+    while (*p < end) {
+        if ((ret = mbedtls_asn1_get_tag(p, end, &len,
+                                        MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE)) != 0)
+            return (MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret);
 
         *p += len;
     }
 
-    if( *p != end )
-        return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
-                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+    if (*p != end)
+        return (MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
+                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH);
 
-    return( 0 );
+    return (0);
 }
 
 /*
  * X.509 CRL Entries
  */
-static int x509_get_entries( unsigned char **p,
-                             const unsigned char *end,
-                             mbedtls_x509_crl_entry *entry )
+static int x509_get_entries(unsigned char **p,
+                            const unsigned char *end,
+                            mbedtls_x509_crl_entry *entry)
 {
     int ret;
     size_t entry_len;
     mbedtls_x509_crl_entry *cur_entry = entry;
 
-    if( *p == end )
-        return( 0 );
+    if (*p == end)
+        return (0);
 
-    if( ( ret = mbedtls_asn1_get_tag( p, end, &entry_len,
-            MBEDTLS_ASN1_SEQUENCE | MBEDTLS_ASN1_CONSTRUCTED ) ) != 0 )
-    {
-        if( ret == MBEDTLS_ERR_ASN1_UNEXPECTED_TAG )
-            return( 0 );
+    if ((ret = mbedtls_asn1_get_tag(p, end, &entry_len,
+                                    MBEDTLS_ASN1_SEQUENCE | MBEDTLS_ASN1_CONSTRUCTED)) != 0) {
+        if (ret == MBEDTLS_ERR_ASN1_UNEXPECTED_TAG)
+            return (0);
 
-        return( ret );
+        return (ret);
     }
 
     end = *p + entry_len;
 
-    while( *p < end )
-    {
+    while (*p < end) {
         size_t len2;
         const unsigned char *end2;
 
-        if( ( ret = mbedtls_asn1_get_tag( p, end, &len2,
-                MBEDTLS_ASN1_SEQUENCE | MBEDTLS_ASN1_CONSTRUCTED ) ) != 0 )
-        {
-            return( ret );
+        if ((ret = mbedtls_asn1_get_tag(p, end, &len2,
+                                        MBEDTLS_ASN1_SEQUENCE | MBEDTLS_ASN1_CONSTRUCTED)) != 0) {
+            return (ret);
         }
 
         cur_entry->raw.tag = **p;
@@ -271,36 +259,35 @@ static int x509_get_entries( unsigned char **p,
         cur_entry->raw.len = len2;
         end2 = *p + len2;
 
-        if( ( ret = mbedtls_x509_get_serial( p, end2, &cur_entry->serial ) ) != 0 )
-            return( ret );
+        if ((ret = mbedtls_x509_get_serial(p, end2, &cur_entry->serial)) != 0)
+            return (ret);
 
-        if( ( ret = mbedtls_x509_get_time( p, end2,
-                                   &cur_entry->revocation_date ) ) != 0 )
-            return( ret );
+        if ((ret = mbedtls_x509_get_time(p, end2,
+                                         &cur_entry->revocation_date)) != 0)
+            return (ret);
 
-        if( ( ret = x509_get_crl_entry_ext( p, end2,
-                                            &cur_entry->entry_ext ) ) != 0 )
-            return( ret );
+        if ((ret = x509_get_crl_entry_ext(p, end2,
+                                          &cur_entry->entry_ext)) != 0)
+            return (ret);
 
-        if( *p < end )
-        {
-            cur_entry->next = mbedtls_calloc( 1, sizeof( mbedtls_x509_crl_entry ) );
+        if (*p < end) {
+            cur_entry->next = mbedtls_calloc(1, sizeof(mbedtls_x509_crl_entry));
 
-            if( cur_entry->next == NULL )
-                return( MBEDTLS_ERR_X509_ALLOC_FAILED );
+            if (cur_entry->next == NULL)
+                return (MBEDTLS_ERR_X509_ALLOC_FAILED);
 
             cur_entry = cur_entry->next;
         }
     }
 
-    return( 0 );
+    return (0);
 }
 
 /*
  * Parse one  CRLs in DER format and append it to the chained list
  */
-int mbedtls_x509_crl_parse_der( mbedtls_x509_crl *chain,
-                        const unsigned char *buf, size_t buflen )
+int mbedtls_x509_crl_parse_der(mbedtls_x509_crl *chain,
+                               const unsigned char *buf, size_t buflen)
 {
     int ret;
     size_t len;
@@ -311,44 +298,42 @@ int mbedtls_x509_crl_parse_der( mbedtls_x509_crl *chain,
     /*
      * Check for valid input
      */
-    if( crl == NULL || buf == NULL )
-        return( MBEDTLS_ERR_X509_BAD_INPUT_DATA );
+    if (crl == NULL || buf == NULL)
+        return (MBEDTLS_ERR_X509_BAD_INPUT_DATA);
 
-    memset( &sig_params1, 0, sizeof( mbedtls_x509_buf ) );
-    memset( &sig_params2, 0, sizeof( mbedtls_x509_buf ) );
-    memset( &sig_oid2, 0, sizeof( mbedtls_x509_buf ) );
+    memset(&sig_params1, 0, sizeof(mbedtls_x509_buf));
+    memset(&sig_params2, 0, sizeof(mbedtls_x509_buf));
+    memset(&sig_oid2, 0, sizeof(mbedtls_x509_buf));
 
     /*
      * Add new CRL on the end of the chain if needed.
      */
-    while( crl->version != 0 && crl->next != NULL )
+    while (crl->version != 0 && crl->next != NULL)
         crl = crl->next;
 
-    if( crl->version != 0 && crl->next == NULL )
-    {
-        crl->next = mbedtls_calloc( 1, sizeof( mbedtls_x509_crl ) );
+    if (crl->version != 0 && crl->next == NULL) {
+        crl->next = mbedtls_calloc(1, sizeof(mbedtls_x509_crl));
 
-        if( crl->next == NULL )
-        {
-            mbedtls_x509_crl_free( crl );
-            return( MBEDTLS_ERR_X509_ALLOC_FAILED );
+        if (crl->next == NULL) {
+            mbedtls_x509_crl_free(crl);
+            return (MBEDTLS_ERR_X509_ALLOC_FAILED);
         }
 
-        mbedtls_x509_crl_init( crl->next );
+        mbedtls_x509_crl_init(crl->next);
         crl = crl->next;
     }
 
     /*
      * Copy raw DER-encoded CRL
      */
-    if( buflen == 0 )
-        return( MBEDTLS_ERR_X509_INVALID_FORMAT );
+    if (buflen == 0)
+        return (MBEDTLS_ERR_X509_INVALID_FORMAT);
 
-    p = mbedtls_calloc( 1, buflen );
-    if( p == NULL )
-        return( MBEDTLS_ERR_X509_ALLOC_FAILED );
+    p = mbedtls_calloc(1, buflen);
+    if (p == NULL)
+        return (MBEDTLS_ERR_X509_ALLOC_FAILED);
 
-    memcpy( p, buf, buflen );
+    memcpy(p, buf, buflen);
 
     crl->raw.p = p;
     crl->raw.len = buflen;
@@ -361,18 +346,16 @@ int mbedtls_x509_crl_parse_der( mbedtls_x509_crl *chain,
      *      signatureAlgorithm   AlgorithmIdentifier,
      *      signatureValue       BIT STRING  }
      */
-    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len,
-            MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
-    {
-        mbedtls_x509_crl_free( crl );
-        return( MBEDTLS_ERR_X509_INVALID_FORMAT );
+    if ((ret = mbedtls_asn1_get_tag(&p, end, &len,
+                                    MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE)) != 0) {
+        mbedtls_x509_crl_free(crl);
+        return (MBEDTLS_ERR_X509_INVALID_FORMAT);
     }
 
-    if( len != (size_t) ( end - p ) )
-    {
-        mbedtls_x509_crl_free( crl );
-        return( MBEDTLS_ERR_X509_INVALID_FORMAT +
-                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+    if (len != (size_t)(end - p)) {
+        mbedtls_x509_crl_free(crl);
+        return (MBEDTLS_ERR_X509_INVALID_FORMAT +
+                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH);
     }
 
     /*
@@ -380,11 +363,10 @@ int mbedtls_x509_crl_parse_der( mbedtls_x509_crl *chain,
      */
     crl->tbs.p = p;
 
-    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len,
-            MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
-    {
-        mbedtls_x509_crl_free( crl );
-        return( MBEDTLS_ERR_X509_INVALID_FORMAT + ret );
+    if ((ret = mbedtls_asn1_get_tag(&p, end, &len,
+                                    MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE)) != 0) {
+        mbedtls_x509_crl_free(crl);
+        return (MBEDTLS_ERR_X509_INVALID_FORMAT + ret);
     }
 
     end = p + len;
@@ -396,27 +378,24 @@ int mbedtls_x509_crl_parse_der( mbedtls_x509_crl *chain,
      *
      * signature            AlgorithmIdentifier
      */
-    if( ( ret = x509_crl_get_version( &p, end, &crl->version ) ) != 0 ||
-        ( ret = mbedtls_x509_get_alg( &p, end, &crl->sig_oid, &sig_params1 ) ) != 0 )
-    {
-        mbedtls_x509_crl_free( crl );
-        return( ret );
+    if ((ret = x509_crl_get_version(&p, end, &crl->version)) != 0 ||
+        (ret = mbedtls_x509_get_alg(&p, end, &crl->sig_oid, &sig_params1)) != 0) {
+        mbedtls_x509_crl_free(crl);
+        return (ret);
     }
 
-    if( crl->version < 0 || crl->version > 1 )
-    {
-        mbedtls_x509_crl_free( crl );
-        return( MBEDTLS_ERR_X509_UNKNOWN_VERSION );
+    if (crl->version < 0 || crl->version > 1) {
+        mbedtls_x509_crl_free(crl);
+        return (MBEDTLS_ERR_X509_UNKNOWN_VERSION);
     }
 
     crl->version++;
 
-    if( ( ret = mbedtls_x509_get_sig_alg( &crl->sig_oid, &sig_params1,
-                                  &crl->sig_md, &crl->sig_pk,
-                                  &crl->sig_opts ) ) != 0 )
-    {
-        mbedtls_x509_crl_free( crl );
-        return( MBEDTLS_ERR_X509_UNKNOWN_SIG_ALG );
+    if ((ret = mbedtls_x509_get_sig_alg(&crl->sig_oid, &sig_params1,
+                                        &crl->sig_md, &crl->sig_pk,
+                                        &crl->sig_opts)) != 0) {
+        mbedtls_x509_crl_free(crl);
+        return (MBEDTLS_ERR_X509_UNKNOWN_SIG_ALG);
     }
 
     /*
@@ -424,17 +403,15 @@ int mbedtls_x509_crl_parse_der( mbedtls_x509_crl *chain,
      */
     crl->issuer_raw.p = p;
 
-    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len,
-            MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
-    {
-        mbedtls_x509_crl_free( crl );
-        return( MBEDTLS_ERR_X509_INVALID_FORMAT + ret );
+    if ((ret = mbedtls_asn1_get_tag(&p, end, &len,
+                                    MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE)) != 0) {
+        mbedtls_x509_crl_free(crl);
+        return (MBEDTLS_ERR_X509_INVALID_FORMAT + ret);
     }
 
-    if( ( ret = mbedtls_x509_get_name( &p, p + len, &crl->issuer ) ) != 0 )
-    {
-        mbedtls_x509_crl_free( crl );
-        return( ret );
+    if ((ret = mbedtls_x509_get_name(&p, p + len, &crl->issuer)) != 0) {
+        mbedtls_x509_crl_free(crl);
+        return (ret);
     }
 
     crl->issuer_raw.len = p - crl->issuer_raw.p;
@@ -443,21 +420,18 @@ int mbedtls_x509_crl_parse_der( mbedtls_x509_crl *chain,
      * thisUpdate          Time
      * nextUpdate          Time OPTIONAL
      */
-    if( ( ret = mbedtls_x509_get_time( &p, end, &crl->this_update ) ) != 0 )
-    {
-        mbedtls_x509_crl_free( crl );
-        return( ret );
+    if ((ret = mbedtls_x509_get_time(&p, end, &crl->this_update)) != 0) {
+        mbedtls_x509_crl_free(crl);
+        return (ret);
     }
 
-    if( ( ret = mbedtls_x509_get_time( &p, end, &crl->next_update ) ) != 0 )
-    {
-        if( ret != ( MBEDTLS_ERR_X509_INVALID_DATE +
-                        MBEDTLS_ERR_ASN1_UNEXPECTED_TAG ) &&
-            ret != ( MBEDTLS_ERR_X509_INVALID_DATE +
-                        MBEDTLS_ERR_ASN1_OUT_OF_DATA ) )
-        {
-            mbedtls_x509_crl_free( crl );
-            return( ret );
+    if ((ret = mbedtls_x509_get_time(&p, end, &crl->next_update)) != 0) {
+        if (ret != (MBEDTLS_ERR_X509_INVALID_DATE +
+                    MBEDTLS_ERR_ASN1_UNEXPECTED_TAG) &&
+            ret != (MBEDTLS_ERR_X509_INVALID_DATE +
+                    MBEDTLS_ERR_ASN1_OUT_OF_DATA)) {
+            mbedtls_x509_crl_free(crl);
+            return (ret);
         }
     }
 
@@ -469,32 +443,28 @@ int mbedtls_x509_crl_parse_der( mbedtls_x509_crl *chain,
      *                                   -- if present, MUST be v2
      *                        } OPTIONAL
      */
-    if( ( ret = x509_get_entries( &p, end, &crl->entry ) ) != 0 )
-    {
-        mbedtls_x509_crl_free( crl );
-        return( ret );
+    if ((ret = x509_get_entries(&p, end, &crl->entry)) != 0) {
+        mbedtls_x509_crl_free(crl);
+        return (ret);
     }
 
     /*
      * crlExtensions          EXPLICIT Extensions OPTIONAL
      *                              -- if present, MUST be v2
      */
-    if( crl->version == 2 )
-    {
-        ret = x509_get_crl_ext( &p, end, &crl->crl_ext );
+    if (crl->version == 2) {
+        ret = x509_get_crl_ext(&p, end, &crl->crl_ext);
 
-        if( ret != 0 )
-        {
-            mbedtls_x509_crl_free( crl );
-            return( ret );
+        if (ret != 0) {
+            mbedtls_x509_crl_free(crl);
+            return (ret);
         }
     }
 
-    if( p != end )
-    {
-        mbedtls_x509_crl_free( crl );
-        return( MBEDTLS_ERR_X509_INVALID_FORMAT +
-                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+    if (p != end) {
+        mbedtls_x509_crl_free(crl);
+        return (MBEDTLS_ERR_X509_INVALID_FORMAT +
+                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH);
     }
 
     end = crl->raw.p + crl->raw.len;
@@ -503,42 +473,38 @@ int mbedtls_x509_crl_parse_der( mbedtls_x509_crl *chain,
      *  signatureAlgorithm   AlgorithmIdentifier,
      *  signatureValue       BIT STRING
      */
-    if( ( ret = mbedtls_x509_get_alg( &p, end, &sig_oid2, &sig_params2 ) ) != 0 )
-    {
-        mbedtls_x509_crl_free( crl );
-        return( ret );
+    if ((ret = mbedtls_x509_get_alg(&p, end, &sig_oid2, &sig_params2)) != 0) {
+        mbedtls_x509_crl_free(crl);
+        return (ret);
     }
 
-    if( crl->sig_oid.len != sig_oid2.len ||
-        memcmp( crl->sig_oid.p, sig_oid2.p, crl->sig_oid.len ) != 0 ||
+    if (crl->sig_oid.len != sig_oid2.len ||
+        memcmp(crl->sig_oid.p, sig_oid2.p, crl->sig_oid.len) != 0 ||
         sig_params1.len != sig_params2.len ||
-        ( sig_params1.len != 0 &&
-          memcmp( sig_params1.p, sig_params2.p, sig_params1.len ) != 0 ) )
-    {
-        mbedtls_x509_crl_free( crl );
-        return( MBEDTLS_ERR_X509_SIG_MISMATCH );
+        (sig_params1.len != 0 &&
+         memcmp(sig_params1.p, sig_params2.p, sig_params1.len) != 0)) {
+        mbedtls_x509_crl_free(crl);
+        return (MBEDTLS_ERR_X509_SIG_MISMATCH);
     }
 
-    if( ( ret = mbedtls_x509_get_sig( &p, end, &crl->sig ) ) != 0 )
-    {
-        mbedtls_x509_crl_free( crl );
-        return( ret );
+    if ((ret = mbedtls_x509_get_sig(&p, end, &crl->sig)) != 0) {
+        mbedtls_x509_crl_free(crl);
+        return (ret);
     }
 
-    if( p != end )
-    {
-        mbedtls_x509_crl_free( crl );
-        return( MBEDTLS_ERR_X509_INVALID_FORMAT +
-                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+    if (p != end) {
+        mbedtls_x509_crl_free(crl);
+        return (MBEDTLS_ERR_X509_INVALID_FORMAT +
+                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH);
     }
 
-    return( 0 );
+    return (0);
 }
 
 /*
  * Parse one or more CRLs and add them to the chained list
  */
-int mbedtls_x509_crl_parse( mbedtls_x509_crl *chain, const unsigned char *buf, size_t buflen )
+int mbedtls_x509_crl_parse(mbedtls_x509_crl *chain, const unsigned char *buf, size_t buflen)
 {
 #if defined(MBEDTLS_PEM_PARSE_C)
     int ret;
@@ -546,25 +512,23 @@ int mbedtls_x509_crl_parse( mbedtls_x509_crl *chain, const unsigned char *buf, s
     mbedtls_pem_context pem;
     int is_pem = 0;
 
-    if( chain == NULL || buf == NULL )
-        return( MBEDTLS_ERR_X509_BAD_INPUT_DATA );
+    if (chain == NULL || buf == NULL)
+        return (MBEDTLS_ERR_X509_BAD_INPUT_DATA);
 
-    do
-    {
-        mbedtls_pem_init( &pem );
+    do {
+        mbedtls_pem_init(&pem);
 
         // Avoid calling mbedtls_pem_read_buffer() on non-null-terminated
         // string
-        if( buflen == 0 || buf[buflen - 1] != '\0' )
+        if (buflen == 0 || buf[buflen - 1] != '\0')
             ret = MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT;
         else
-            ret = mbedtls_pem_read_buffer( &pem,
-                                           "-----BEGIN X509 CRL-----",
-                                           "-----END X509 CRL-----",
-                                            buf, NULL, 0, &use_len );
+            ret = mbedtls_pem_read_buffer(&pem,
+                                          "-----BEGIN X509 CRL-----",
+                                          "-----END X509 CRL-----",
+                                          buf, NULL, 0, &use_len);
 
-        if( ret == 0 )
-        {
+        if (ret == 0) {
             /*
              * Was PEM encoded
              */
@@ -573,51 +537,48 @@ int mbedtls_x509_crl_parse( mbedtls_x509_crl *chain, const unsigned char *buf, s
             buflen -= use_len;
             buf += use_len;
 
-            if( ( ret = mbedtls_x509_crl_parse_der( chain,
-                                            pem.buf, pem.buflen ) ) != 0 )
-            {
-                mbedtls_pem_free( &pem );
-                return( ret );
+            if ((ret = mbedtls_x509_crl_parse_der(chain,
+                                                  pem.buf, pem.buflen)) != 0) {
+                mbedtls_pem_free(&pem);
+                return (ret);
             }
-        }
-        else if( is_pem )
-        {
-            mbedtls_pem_free( &pem );
-            return( ret );
+        } else if (is_pem) {
+            mbedtls_pem_free(&pem);
+            return (ret);
         }
 
-        mbedtls_pem_free( &pem );
+        mbedtls_pem_free(&pem);
     }
     /* In the PEM case, buflen is 1 at the end, for the terminated NULL byte.
      * And a valid CRL cannot be less than 1 byte anyway. */
-    while( is_pem && buflen > 1 );
+    while (is_pem && buflen > 1);
 
-    if( is_pem )
-        return( 0 );
+    if (is_pem)
+        return (0);
     else
 #endif /* MBEDTLS_PEM_PARSE_C */
-        return( mbedtls_x509_crl_parse_der( chain, buf, buflen ) );
+        return (mbedtls_x509_crl_parse_der(chain, buf, buflen));
 }
 
 #if defined(MBEDTLS_FS_IO)
 /*
  * Load one or more CRLs and add them to the chained list
  */
-int mbedtls_x509_crl_parse_file( mbedtls_x509_crl *chain, const char *path )
+int mbedtls_x509_crl_parse_file(mbedtls_x509_crl *chain, const char *path)
 {
     int ret;
     size_t n;
     unsigned char *buf;
 
-    if( ( ret = mbedtls_pk_load_file( path, &buf, &n ) ) != 0 )
-        return( ret );
+    if ((ret = mbedtls_pk_load_file(path, &buf, &n)) != 0)
+        return (ret);
 
-    ret = mbedtls_x509_crl_parse( chain, buf, n );
+    ret = mbedtls_x509_crl_parse(chain, buf, n);
 
-    mbedtls_platform_zeroize( buf, n );
-    mbedtls_free( buf );
+    mbedtls_platform_zeroize(buf, n);
+    mbedtls_free(buf);
 
-    return( ret );
+    return (ret);
 }
 #endif /* MBEDTLS_FS_IO */
 
@@ -629,8 +590,8 @@ int mbedtls_x509_crl_parse_file( mbedtls_x509_crl *chain, const char *path )
 /*
  * Return an informational string about the CRL.
  */
-int mbedtls_x509_crl_info( char *buf, size_t size, const char *prefix,
-                   const mbedtls_x509_crl *crl )
+int mbedtls_x509_crl_info(char *buf, size_t size, const char *prefix,
+                          const mbedtls_x509_crl *crl)
 {
     int ret;
     size_t n;
@@ -640,79 +601,78 @@ int mbedtls_x509_crl_info( char *buf, size_t size, const char *prefix,
     p = buf;
     n = size;
 
-    ret = mbedtls_snprintf( p, n, "%sCRL version   : %d",
-                               prefix, crl->version );
+    ret = mbedtls_snprintf(p, n, "%sCRL version   : %d",
+                           prefix, crl->version);
     MBEDTLS_X509_SAFE_SNPRINTF;
 
-    ret = mbedtls_snprintf( p, n, "\n%sissuer name   : ", prefix );
+    ret = mbedtls_snprintf(p, n, "\n%sissuer name   : ", prefix);
     MBEDTLS_X509_SAFE_SNPRINTF;
-    ret = mbedtls_x509_dn_gets( p, n, &crl->issuer );
+    ret = mbedtls_x509_dn_gets(p, n, &crl->issuer);
     MBEDTLS_X509_SAFE_SNPRINTF;
 
-    ret = mbedtls_snprintf( p, n, "\n%sthis update   : " \
-                   "%04d-%02d-%02d %02d:%02d:%02d", prefix,
-                   crl->this_update.year, crl->this_update.mon,
-                   crl->this_update.day,  crl->this_update.hour,
-                   crl->this_update.min,  crl->this_update.sec );
+    ret = mbedtls_snprintf(p, n, "\n%sthis update   : " \
+                           "%04d-%02d-%02d %02d:%02d:%02d", prefix,
+                           crl->this_update.year, crl->this_update.mon,
+                           crl->this_update.day,  crl->this_update.hour,
+                           crl->this_update.min,  crl->this_update.sec);
     MBEDTLS_X509_SAFE_SNPRINTF;
 
-    ret = mbedtls_snprintf( p, n, "\n%snext update   : " \
-                   "%04d-%02d-%02d %02d:%02d:%02d", prefix,
-                   crl->next_update.year, crl->next_update.mon,
-                   crl->next_update.day,  crl->next_update.hour,
-                   crl->next_update.min,  crl->next_update.sec );
+    ret = mbedtls_snprintf(p, n, "\n%snext update   : " \
+                           "%04d-%02d-%02d %02d:%02d:%02d", prefix,
+                           crl->next_update.year, crl->next_update.mon,
+                           crl->next_update.day,  crl->next_update.hour,
+                           crl->next_update.min,  crl->next_update.sec);
     MBEDTLS_X509_SAFE_SNPRINTF;
 
     entry = &crl->entry;
 
-    ret = mbedtls_snprintf( p, n, "\n%sRevoked certificates:",
-                               prefix );
+    ret = mbedtls_snprintf(p, n, "\n%sRevoked certificates:",
+                           prefix);
     MBEDTLS_X509_SAFE_SNPRINTF;
 
-    while( entry != NULL && entry->raw.len != 0 )
-    {
-        ret = mbedtls_snprintf( p, n, "\n%sserial number: ",
-                               prefix );
+    while (entry != NULL && entry->raw.len != 0) {
+        ret = mbedtls_snprintf(p, n, "\n%sserial number: ",
+                               prefix);
         MBEDTLS_X509_SAFE_SNPRINTF;
 
-        ret = mbedtls_x509_serial_gets( p, n, &entry->serial );
+        ret = mbedtls_x509_serial_gets(p, n, &entry->serial);
         MBEDTLS_X509_SAFE_SNPRINTF;
 
-        ret = mbedtls_snprintf( p, n, " revocation date: " \
-                   "%04d-%02d-%02d %02d:%02d:%02d",
-                   entry->revocation_date.year, entry->revocation_date.mon,
-                   entry->revocation_date.day,  entry->revocation_date.hour,
-                   entry->revocation_date.min,  entry->revocation_date.sec );
+        ret = mbedtls_snprintf(p, n, " revocation date: " \
+                               "%04d-%02d-%02d %02d:%02d:%02d",
+                               entry->revocation_date.year, entry->revocation_date.mon,
+                               entry->revocation_date.day,  entry->revocation_date.hour,
+                               entry->revocation_date.min,  entry->revocation_date.sec);
         MBEDTLS_X509_SAFE_SNPRINTF;
 
         entry = entry->next;
     }
 
-    ret = mbedtls_snprintf( p, n, "\n%ssigned using  : ", prefix );
+    ret = mbedtls_snprintf(p, n, "\n%ssigned using  : ", prefix);
     MBEDTLS_X509_SAFE_SNPRINTF;
 
-    ret = mbedtls_x509_sig_alg_gets( p, n, &crl->sig_oid, crl->sig_pk, crl->sig_md,
-                             crl->sig_opts );
+    ret = mbedtls_x509_sig_alg_gets(p, n, &crl->sig_oid, crl->sig_pk, crl->sig_md,
+                                    crl->sig_opts);
     MBEDTLS_X509_SAFE_SNPRINTF;
 
-    ret = mbedtls_snprintf( p, n, "\n" );
+    ret = mbedtls_snprintf(p, n, "\n");
     MBEDTLS_X509_SAFE_SNPRINTF;
 
-    return( (int) ( size - n ) );
+    return ((int)(size - n));
 }
 
 /*
  * Initialize a CRL chain
  */
-void mbedtls_x509_crl_init( mbedtls_x509_crl *crl )
+void mbedtls_x509_crl_init(mbedtls_x509_crl *crl)
 {
-    memset( crl, 0, sizeof(mbedtls_x509_crl) );
+    memset(crl, 0, sizeof(mbedtls_x509_crl));
 }
 
 /*
  * Unallocate all CRL data
  */
-void mbedtls_x509_crl_free( mbedtls_x509_crl *crl )
+void mbedtls_x509_crl_free(mbedtls_x509_crl *crl)
 {
     mbedtls_x509_crl *crl_cur = crl;
     mbedtls_x509_crl *crl_prv;
@@ -721,55 +681,48 @@ void mbedtls_x509_crl_free( mbedtls_x509_crl *crl )
     mbedtls_x509_crl_entry *entry_cur;
     mbedtls_x509_crl_entry *entry_prv;
 
-    if( crl == NULL )
+    if (crl == NULL)
         return;
 
-    do
-    {
+    do {
 #if defined(MBEDTLS_X509_RSASSA_PSS_SUPPORT)
-        mbedtls_free( crl_cur->sig_opts );
+        mbedtls_free(crl_cur->sig_opts);
 #endif
 
         name_cur = crl_cur->issuer.next;
-        while( name_cur != NULL )
-        {
+        while (name_cur != NULL) {
             name_prv = name_cur;
             name_cur = name_cur->next;
-            mbedtls_platform_zeroize( name_prv, sizeof( mbedtls_x509_name ) );
-            mbedtls_free( name_prv );
+            mbedtls_platform_zeroize(name_prv, sizeof(mbedtls_x509_name));
+            mbedtls_free(name_prv);
         }
 
         entry_cur = crl_cur->entry.next;
-        while( entry_cur != NULL )
-        {
+        while (entry_cur != NULL) {
             entry_prv = entry_cur;
             entry_cur = entry_cur->next;
-            mbedtls_platform_zeroize( entry_prv,
-                                      sizeof( mbedtls_x509_crl_entry ) );
-            mbedtls_free( entry_prv );
+            mbedtls_platform_zeroize(entry_prv,
+                                     sizeof(mbedtls_x509_crl_entry));
+            mbedtls_free(entry_prv);
         }
 
-        if( crl_cur->raw.p != NULL )
-        {
-            mbedtls_platform_zeroize( crl_cur->raw.p, crl_cur->raw.len );
-            mbedtls_free( crl_cur->raw.p );
+        if (crl_cur->raw.p != NULL) {
+            mbedtls_platform_zeroize(crl_cur->raw.p, crl_cur->raw.len);
+            mbedtls_free(crl_cur->raw.p);
         }
 
         crl_cur = crl_cur->next;
-    }
-    while( crl_cur != NULL );
+    } while (crl_cur != NULL);
 
     crl_cur = crl;
-    do
-    {
+    do {
         crl_prv = crl_cur;
         crl_cur = crl_cur->next;
 
-        mbedtls_platform_zeroize( crl_prv, sizeof( mbedtls_x509_crl ) );
-        if( crl_prv != crl )
-            mbedtls_free( crl_prv );
-    }
-    while( crl_cur != NULL );
+        mbedtls_platform_zeroize(crl_prv, sizeof(mbedtls_x509_crl));
+        if (crl_prv != crl)
+            mbedtls_free(crl_prv);
+    } while (crl_cur != NULL);
 }
 
 #endif /* MBEDTLS_X509_CRL_PARSE_C */
diff --git a/common/mbedtls/x509_crl.h b/common/mbedtls/x509_crl.h
index 99f6e7126..dc4bce8fc 100644
--- a/common/mbedtls/x509_crl.h
+++ b/common/mbedtls/x509_crl.h
@@ -51,8 +51,7 @@ extern "C" {
  * Certificate revocation list entry.
  * Contains the CA-specific serial numbers and revocation dates.
  */
-typedef struct mbedtls_x509_crl_entry
-{
+typedef struct mbedtls_x509_crl_entry {
     mbedtls_x509_buf raw;
 
     mbedtls_x509_buf serial;
@@ -69,8 +68,7 @@ mbedtls_x509_crl_entry;
  * Certificate revocation list structure.
  * Every CRL may have multiple entries.
  */
-typedef struct mbedtls_x509_crl
-{
+typedef struct mbedtls_x509_crl {
     mbedtls_x509_buf raw;           /**< The raw certificate data (DER). */
     mbedtls_x509_buf tbs;           /**< The raw certificate body (DER). The part that is To Be Signed. */
 
@@ -108,8 +106,8 @@ mbedtls_x509_crl;
  *
  * \return         0 if successful, or a specific X509 or PEM error code
  */
-int mbedtls_x509_crl_parse_der( mbedtls_x509_crl *chain,
-                        const unsigned char *buf, size_t buflen );
+int mbedtls_x509_crl_parse_der(mbedtls_x509_crl *chain,
+                               const unsigned char *buf, size_t buflen);
 /**
  * \brief          Parse one or more CRLs and append them to the chained list
  *
@@ -122,7 +120,7 @@ int mbedtls_x509_crl_parse_der( mbedtls_x509_crl *chain,
  *
  * \return         0 if successful, or a specific X509 or PEM error code
  */
-int mbedtls_x509_crl_parse( mbedtls_x509_crl *chain, const unsigned char *buf, size_t buflen );
+int mbedtls_x509_crl_parse(mbedtls_x509_crl *chain, const unsigned char *buf, size_t buflen);
 
 #if defined(MBEDTLS_FS_IO)
 /**
@@ -135,7 +133,7 @@ int mbedtls_x509_crl_parse( mbedtls_x509_crl *chain, const unsigned char *buf, s
  *
  * \return         0 if successful, or a specific X509 or PEM error code
  */
-int mbedtls_x509_crl_parse_file( mbedtls_x509_crl *chain, const char *path );
+int mbedtls_x509_crl_parse_file(mbedtls_x509_crl *chain, const char *path);
 #endif /* MBEDTLS_FS_IO */
 
 /**
@@ -149,22 +147,22 @@ int mbedtls_x509_crl_parse_file( mbedtls_x509_crl *chain, const char *path );
  * \return         The length of the string written (not including the
  *                 terminated nul byte), or a negative error code.
  */
-int mbedtls_x509_crl_info( char *buf, size_t size, const char *prefix,
-                   const mbedtls_x509_crl *crl );
+int mbedtls_x509_crl_info(char *buf, size_t size, const char *prefix,
+                          const mbedtls_x509_crl *crl);
 
 /**
  * \brief          Initialize a CRL (chain)
  *
  * \param crl      CRL chain to initialize
  */
-void mbedtls_x509_crl_init( mbedtls_x509_crl *crl );
+void mbedtls_x509_crl_init(mbedtls_x509_crl *crl);
 
 /**
  * \brief          Unallocate all CRL data
  *
  * \param crl      CRL chain to free
  */
-void mbedtls_x509_crl_free( mbedtls_x509_crl *crl );
+void mbedtls_x509_crl_free(mbedtls_x509_crl *crl);
 
 /* \} name */
 /* \} addtogroup x509_module */
diff --git a/common/mbedtls/x509_crt.c b/common/mbedtls/x509_crt.c
index 925bddf1c..4a6567a19 100644
--- a/common/mbedtls/x509_crt.c
+++ b/common/mbedtls/x509_crt.c
@@ -96,17 +96,16 @@ typedef struct {
 /*
  * Default profile
  */
-const mbedtls_x509_crt_profile mbedtls_x509_crt_profile_default =
-{
+const mbedtls_x509_crt_profile mbedtls_x509_crt_profile_default = {
 #if defined(MBEDTLS_TLS_DEFAULT_ALLOW_SHA1_IN_CERTIFICATES)
     /* Allow SHA-1 (weak, but still safe in controlled environments) */
-    MBEDTLS_X509_ID_FLAG( MBEDTLS_MD_SHA1 ) |
+    MBEDTLS_X509_ID_FLAG(MBEDTLS_MD_SHA1) |
 #endif
     /* Only SHA-2 hashes */
-    MBEDTLS_X509_ID_FLAG( MBEDTLS_MD_SHA224 ) |
-    MBEDTLS_X509_ID_FLAG( MBEDTLS_MD_SHA256 ) |
-    MBEDTLS_X509_ID_FLAG( MBEDTLS_MD_SHA384 ) |
-    MBEDTLS_X509_ID_FLAG( MBEDTLS_MD_SHA512 ),
+    MBEDTLS_X509_ID_FLAG(MBEDTLS_MD_SHA224) |
+    MBEDTLS_X509_ID_FLAG(MBEDTLS_MD_SHA256) |
+    MBEDTLS_X509_ID_FLAG(MBEDTLS_MD_SHA384) |
+    MBEDTLS_X509_ID_FLAG(MBEDTLS_MD_SHA512),
     0xFFFFFFF, /* Any PK alg    */
     0xFFFFFFF, /* Any curve     */
     2048,
@@ -115,22 +114,21 @@ const mbedtls_x509_crt_profile mbedtls_x509_crt_profile_default =
 /*
  * Next-default profile
  */
-const mbedtls_x509_crt_profile mbedtls_x509_crt_profile_next =
-{
+const mbedtls_x509_crt_profile mbedtls_x509_crt_profile_next = {
     /* Hashes from SHA-256 and above */
-    MBEDTLS_X509_ID_FLAG( MBEDTLS_MD_SHA256 ) |
-    MBEDTLS_X509_ID_FLAG( MBEDTLS_MD_SHA384 ) |
-    MBEDTLS_X509_ID_FLAG( MBEDTLS_MD_SHA512 ),
+    MBEDTLS_X509_ID_FLAG(MBEDTLS_MD_SHA256) |
+    MBEDTLS_X509_ID_FLAG(MBEDTLS_MD_SHA384) |
+    MBEDTLS_X509_ID_FLAG(MBEDTLS_MD_SHA512),
     0xFFFFFFF, /* Any PK alg    */
 #if defined(MBEDTLS_ECP_C)
     /* Curves at or above 128-bit security level */
-    MBEDTLS_X509_ID_FLAG( MBEDTLS_ECP_DP_SECP256R1 ) |
-    MBEDTLS_X509_ID_FLAG( MBEDTLS_ECP_DP_SECP384R1 ) |
-    MBEDTLS_X509_ID_FLAG( MBEDTLS_ECP_DP_SECP521R1 ) |
-    MBEDTLS_X509_ID_FLAG( MBEDTLS_ECP_DP_BP256R1 ) |
-    MBEDTLS_X509_ID_FLAG( MBEDTLS_ECP_DP_BP384R1 ) |
-    MBEDTLS_X509_ID_FLAG( MBEDTLS_ECP_DP_BP512R1 ) |
-    MBEDTLS_X509_ID_FLAG( MBEDTLS_ECP_DP_SECP256K1 ),
+    MBEDTLS_X509_ID_FLAG(MBEDTLS_ECP_DP_SECP256R1) |
+    MBEDTLS_X509_ID_FLAG(MBEDTLS_ECP_DP_SECP384R1) |
+    MBEDTLS_X509_ID_FLAG(MBEDTLS_ECP_DP_SECP521R1) |
+    MBEDTLS_X509_ID_FLAG(MBEDTLS_ECP_DP_BP256R1) |
+    MBEDTLS_X509_ID_FLAG(MBEDTLS_ECP_DP_BP384R1) |
+    MBEDTLS_X509_ID_FLAG(MBEDTLS_ECP_DP_BP512R1) |
+    MBEDTLS_X509_ID_FLAG(MBEDTLS_ECP_DP_SECP256K1),
 #else
     0,
 #endif
@@ -140,18 +138,17 @@ const mbedtls_x509_crt_profile mbedtls_x509_crt_profile_next =
 /*
  * NSA Suite B Profile
  */
-const mbedtls_x509_crt_profile mbedtls_x509_crt_profile_suiteb =
-{
+const mbedtls_x509_crt_profile mbedtls_x509_crt_profile_suiteb = {
     /* Only SHA-256 and 384 */
-    MBEDTLS_X509_ID_FLAG( MBEDTLS_MD_SHA256 ) |
-    MBEDTLS_X509_ID_FLAG( MBEDTLS_MD_SHA384 ),
+    MBEDTLS_X509_ID_FLAG(MBEDTLS_MD_SHA256) |
+    MBEDTLS_X509_ID_FLAG(MBEDTLS_MD_SHA384),
     /* Only ECDSA */
-    MBEDTLS_X509_ID_FLAG( MBEDTLS_PK_ECDSA ) |
-    MBEDTLS_X509_ID_FLAG( MBEDTLS_PK_ECKEY ),
+    MBEDTLS_X509_ID_FLAG(MBEDTLS_PK_ECDSA) |
+    MBEDTLS_X509_ID_FLAG(MBEDTLS_PK_ECKEY),
 #if defined(MBEDTLS_ECP_C)
     /* Only NIST P-256 and P-384 */
-    MBEDTLS_X509_ID_FLAG( MBEDTLS_ECP_DP_SECP256R1 ) |
-    MBEDTLS_X509_ID_FLAG( MBEDTLS_ECP_DP_SECP384R1 ),
+    MBEDTLS_X509_ID_FLAG(MBEDTLS_ECP_DP_SECP256R1) |
+    MBEDTLS_X509_ID_FLAG(MBEDTLS_ECP_DP_SECP384R1),
 #else
     0,
 #endif
@@ -162,105 +159,101 @@ const mbedtls_x509_crt_profile mbedtls_x509_crt_profile_suiteb =
  * Check md_alg against profile
  * Return 0 if md_alg is acceptable for this profile, -1 otherwise
  */
-static int x509_profile_check_md_alg( const mbedtls_x509_crt_profile *profile,
-                                      mbedtls_md_type_t md_alg )
+static int x509_profile_check_md_alg(const mbedtls_x509_crt_profile *profile,
+                                     mbedtls_md_type_t md_alg)
 {
-    if( md_alg == MBEDTLS_MD_NONE )
-        return( -1 );
+    if (md_alg == MBEDTLS_MD_NONE)
+        return (-1);
 
-    if( ( profile->allowed_mds & MBEDTLS_X509_ID_FLAG( md_alg ) ) != 0 )
-        return( 0 );
+    if ((profile->allowed_mds & MBEDTLS_X509_ID_FLAG(md_alg)) != 0)
+        return (0);
 
-    return( -1 );
+    return (-1);
 }
 
 /*
  * Check pk_alg against profile
  * Return 0 if pk_alg is acceptable for this profile, -1 otherwise
  */
-static int x509_profile_check_pk_alg( const mbedtls_x509_crt_profile *profile,
-                                      mbedtls_pk_type_t pk_alg )
+static int x509_profile_check_pk_alg(const mbedtls_x509_crt_profile *profile,
+                                     mbedtls_pk_type_t pk_alg)
 {
-    if( pk_alg == MBEDTLS_PK_NONE )
-        return( -1 );
+    if (pk_alg == MBEDTLS_PK_NONE)
+        return (-1);
 
-    if( ( profile->allowed_pks & MBEDTLS_X509_ID_FLAG( pk_alg ) ) != 0 )
-        return( 0 );
+    if ((profile->allowed_pks & MBEDTLS_X509_ID_FLAG(pk_alg)) != 0)
+        return (0);
 
-    return( -1 );
+    return (-1);
 }
 
 /*
  * Check key against profile
  * Return 0 if pk is acceptable for this profile, -1 otherwise
  */
-static int x509_profile_check_key( const mbedtls_x509_crt_profile *profile,
-                                   const mbedtls_pk_context *pk )
+static int x509_profile_check_key(const mbedtls_x509_crt_profile *profile,
+                                  const mbedtls_pk_context *pk)
 {
-    const mbedtls_pk_type_t pk_alg = mbedtls_pk_get_type( pk );
+    const mbedtls_pk_type_t pk_alg = mbedtls_pk_get_type(pk);
 
 #if defined(MBEDTLS_RSA_C)
-    if( pk_alg == MBEDTLS_PK_RSA || pk_alg == MBEDTLS_PK_RSASSA_PSS )
-    {
-        if( mbedtls_pk_get_bitlen( pk ) >= profile->rsa_min_bitlen )
-            return( 0 );
+    if (pk_alg == MBEDTLS_PK_RSA || pk_alg == MBEDTLS_PK_RSASSA_PSS) {
+        if (mbedtls_pk_get_bitlen(pk) >= profile->rsa_min_bitlen)
+            return (0);
 
-        return( -1 );
+        return (-1);
     }
 #endif
 
 #if defined(MBEDTLS_ECP_C)
-    if( pk_alg == MBEDTLS_PK_ECDSA ||
+    if (pk_alg == MBEDTLS_PK_ECDSA ||
         pk_alg == MBEDTLS_PK_ECKEY ||
-        pk_alg == MBEDTLS_PK_ECKEY_DH )
-    {
-        const mbedtls_ecp_group_id gid = mbedtls_pk_ec( *pk )->grp.id;
+        pk_alg == MBEDTLS_PK_ECKEY_DH) {
+        const mbedtls_ecp_group_id gid = mbedtls_pk_ec(*pk)->grp.id;
 
-        if( gid == MBEDTLS_ECP_DP_NONE )
-            return( -1 );
+        if (gid == MBEDTLS_ECP_DP_NONE)
+            return (-1);
 
-        if( ( profile->allowed_curves & MBEDTLS_X509_ID_FLAG( gid ) ) != 0 )
-            return( 0 );
+        if ((profile->allowed_curves & MBEDTLS_X509_ID_FLAG(gid)) != 0)
+            return (0);
 
-        return( -1 );
+        return (-1);
     }
 #endif
 
-    return( -1 );
+    return (-1);
 }
 
 /*
  *  Version  ::=  INTEGER  {  v1(0), v2(1), v3(2)  }
  */
-static int x509_get_version( unsigned char **p,
-                             const unsigned char *end,
-                             int *ver )
+static int x509_get_version(unsigned char **p,
+                            const unsigned char *end,
+                            int *ver)
 {
     int ret;
     size_t len;
 
-    if( ( ret = mbedtls_asn1_get_tag( p, end, &len,
-            MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_CONSTRUCTED | 0 ) ) != 0 )
-    {
-        if( ret == MBEDTLS_ERR_ASN1_UNEXPECTED_TAG )
-        {
+    if ((ret = mbedtls_asn1_get_tag(p, end, &len,
+                                    MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_CONSTRUCTED | 0)) != 0) {
+        if (ret == MBEDTLS_ERR_ASN1_UNEXPECTED_TAG) {
             *ver = 0;
-            return( 0 );
+            return (0);
         }
 
-        return( ret );
+        return (ret);
     }
 
     end = *p + len;
 
-    if( ( ret = mbedtls_asn1_get_int( p, end, ver ) ) != 0 )
-        return( MBEDTLS_ERR_X509_INVALID_VERSION + ret );
+    if ((ret = mbedtls_asn1_get_int(p, end, ver)) != 0)
+        return (MBEDTLS_ERR_X509_INVALID_VERSION + ret);
 
-    if( *p != end )
-        return( MBEDTLS_ERR_X509_INVALID_VERSION +
-                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+    if (*p != end)
+        return (MBEDTLS_ERR_X509_INVALID_VERSION +
+                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH);
 
-    return( 0 );
+    return (0);
 }
 
 /*
@@ -268,66 +261,65 @@ static int x509_get_version( unsigned char **p,
  *       notBefore      Time,
  *       notAfter       Time }
  */
-static int x509_get_dates( unsigned char **p,
-                           const unsigned char *end,
-                           mbedtls_x509_time *from,
-                           mbedtls_x509_time *to )
+static int x509_get_dates(unsigned char **p,
+                          const unsigned char *end,
+                          mbedtls_x509_time *from,
+                          mbedtls_x509_time *to)
 {
     int ret;
     size_t len;
 
-    if( ( ret = mbedtls_asn1_get_tag( p, end, &len,
-            MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
-        return( MBEDTLS_ERR_X509_INVALID_DATE + ret );
+    if ((ret = mbedtls_asn1_get_tag(p, end, &len,
+                                    MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE)) != 0)
+        return (MBEDTLS_ERR_X509_INVALID_DATE + ret);
 
     end = *p + len;
 
-    if( ( ret = mbedtls_x509_get_time( p, end, from ) ) != 0 )
-        return( ret );
+    if ((ret = mbedtls_x509_get_time(p, end, from)) != 0)
+        return (ret);
 
-    if( ( ret = mbedtls_x509_get_time( p, end, to ) ) != 0 )
-        return( ret );
+    if ((ret = mbedtls_x509_get_time(p, end, to)) != 0)
+        return (ret);
 
-    if( *p != end )
-        return( MBEDTLS_ERR_X509_INVALID_DATE +
-                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+    if (*p != end)
+        return (MBEDTLS_ERR_X509_INVALID_DATE +
+                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH);
 
-    return( 0 );
+    return (0);
 }
 
 /*
  * X.509 v2/v3 unique identifier (not parsed)
  */
-static int x509_get_uid( unsigned char **p,
-                         const unsigned char *end,
-                         mbedtls_x509_buf *uid, int n )
+static int x509_get_uid(unsigned char **p,
+                        const unsigned char *end,
+                        mbedtls_x509_buf *uid, int n)
 {
     int ret;
 
-    if( *p == end )
-        return( 0 );
+    if (*p == end)
+        return (0);
 
     uid->tag = **p;
 
-    if( ( ret = mbedtls_asn1_get_tag( p, end, &uid->len,
-            MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_CONSTRUCTED | n ) ) != 0 )
-    {
-        if( ret == MBEDTLS_ERR_ASN1_UNEXPECTED_TAG )
-            return( 0 );
+    if ((ret = mbedtls_asn1_get_tag(p, end, &uid->len,
+                                    MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_CONSTRUCTED | n)) != 0) {
+        if (ret == MBEDTLS_ERR_ASN1_UNEXPECTED_TAG)
+            return (0);
 
-        return( ret );
+        return (ret);
     }
 
     uid->p = *p;
     *p += uid->len;
 
-    return( 0 );
+    return (0);
 }
 
-static int x509_get_basic_constraints( unsigned char **p,
-                                       const unsigned char *end,
-                                       int *ca_istrue,
-                                       int *max_pathlen )
+static int x509_get_basic_constraints(unsigned char **p,
+                                      const unsigned char *end,
+                                      int *ca_istrue,
+                                      int *max_pathlen)
 {
     int ret;
     size_t len;
@@ -340,82 +332,80 @@ static int x509_get_basic_constraints( unsigned char **p,
     *ca_istrue = 0; /* DEFAULT FALSE */
     *max_pathlen = 0; /* endless */
 
-    if( ( ret = mbedtls_asn1_get_tag( p, end, &len,
-            MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
-        return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret );
+    if ((ret = mbedtls_asn1_get_tag(p, end, &len,
+                                    MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE)) != 0)
+        return (MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret);
 
-    if( *p == end )
-        return( 0 );
+    if (*p == end)
+        return (0);
 
-    if( ( ret = mbedtls_asn1_get_bool( p, end, ca_istrue ) ) != 0 )
-    {
-        if( ret == MBEDTLS_ERR_ASN1_UNEXPECTED_TAG )
-            ret = mbedtls_asn1_get_int( p, end, ca_istrue );
+    if ((ret = mbedtls_asn1_get_bool(p, end, ca_istrue)) != 0) {
+        if (ret == MBEDTLS_ERR_ASN1_UNEXPECTED_TAG)
+            ret = mbedtls_asn1_get_int(p, end, ca_istrue);
 
-        if( ret != 0 )
-            return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret );
+        if (ret != 0)
+            return (MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret);
 
-        if( *ca_istrue != 0 )
+        if (*ca_istrue != 0)
             *ca_istrue = 1;
     }
 
-    if( *p == end )
-        return( 0 );
+    if (*p == end)
+        return (0);
 
-    if( ( ret = mbedtls_asn1_get_int( p, end, max_pathlen ) ) != 0 )
-        return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret );
+    if ((ret = mbedtls_asn1_get_int(p, end, max_pathlen)) != 0)
+        return (MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret);
 
-    if( *p != end )
-        return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
-                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+    if (*p != end)
+        return (MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
+                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH);
 
     (*max_pathlen)++;
 
-    return( 0 );
+    return (0);
 }
 
-static int x509_get_ns_cert_type( unsigned char **p,
-                                       const unsigned char *end,
-                                       unsigned char *ns_cert_type)
+static int x509_get_ns_cert_type(unsigned char **p,
+                                 const unsigned char *end,
+                                 unsigned char *ns_cert_type)
 {
     int ret;
     mbedtls_x509_bitstring bs = { 0, 0, NULL };
 
-    if( ( ret = mbedtls_asn1_get_bitstring( p, end, &bs ) ) != 0 )
-        return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret );
+    if ((ret = mbedtls_asn1_get_bitstring(p, end, &bs)) != 0)
+        return (MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret);
 
-    if( bs.len != 1 )
-        return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
-                MBEDTLS_ERR_ASN1_INVALID_LENGTH );
+    if (bs.len != 1)
+        return (MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
+                MBEDTLS_ERR_ASN1_INVALID_LENGTH);
 
     /* Get actual bitstring */
     *ns_cert_type = *bs.p;
-    return( 0 );
+    return (0);
 }
 
-static int x509_get_key_usage( unsigned char **p,
-                               const unsigned char *end,
-                               unsigned int *key_usage)
+static int x509_get_key_usage(unsigned char **p,
+                              const unsigned char *end,
+                              unsigned int *key_usage)
 {
     int ret;
     size_t i;
     mbedtls_x509_bitstring bs = { 0, 0, NULL };
 
-    if( ( ret = mbedtls_asn1_get_bitstring( p, end, &bs ) ) != 0 )
-        return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret );
+    if ((ret = mbedtls_asn1_get_bitstring(p, end, &bs)) != 0)
+        return (MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret);
 
-    if( bs.len < 1 )
-        return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
-                MBEDTLS_ERR_ASN1_INVALID_LENGTH );
+    if (bs.len < 1)
+        return (MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
+                MBEDTLS_ERR_ASN1_INVALID_LENGTH);
 
     /* Get actual bitstring */
     *key_usage = 0;
-    for( i = 0; i < bs.len && i < sizeof( unsigned int ); i++ )
-    {
-        *key_usage |= (unsigned int) bs.p[i] << (8*i);
+    for (i = 0; i < bs.len && i < sizeof(unsigned int); i++) {
+        *key_usage |= (unsigned int) bs.p[i] << (8 * i);
     }
 
-    return( 0 );
+    return (0);
 }
 
 /*
@@ -423,21 +413,21 @@ static int x509_get_key_usage( unsigned char **p,
  *
  * KeyPurposeId ::= OBJECT IDENTIFIER
  */
-static int x509_get_ext_key_usage( unsigned char **p,
-                               const unsigned char *end,
-                               mbedtls_x509_sequence *ext_key_usage)
+static int x509_get_ext_key_usage(unsigned char **p,
+                                  const unsigned char *end,
+                                  mbedtls_x509_sequence *ext_key_usage)
 {
     int ret;
 
-    if( ( ret = mbedtls_asn1_get_sequence_of( p, end, ext_key_usage, MBEDTLS_ASN1_OID ) ) != 0 )
-        return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret );
+    if ((ret = mbedtls_asn1_get_sequence_of(p, end, ext_key_usage, MBEDTLS_ASN1_OID)) != 0)
+        return (MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret);
 
     /* Sequence length must be >= 1 */
-    if( ext_key_usage->buf.p == NULL )
-        return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
-                MBEDTLS_ERR_ASN1_INVALID_LENGTH );
+    if (ext_key_usage->buf.p == NULL)
+        return (MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
+                MBEDTLS_ERR_ASN1_INVALID_LENGTH);
 
-    return( 0 );
+    return (0);
 }
 
 /*
@@ -466,9 +456,9 @@ static int x509_get_ext_key_usage( unsigned char **p,
  *
  * NOTE: we only parse and use dNSName at this point.
  */
-static int x509_get_subject_alt_name( unsigned char **p,
-                                      const unsigned char *end,
-                                      mbedtls_x509_sequence *subject_alt_name )
+static int x509_get_subject_alt_name(unsigned char **p,
+                                     const unsigned char *end,
+                                     mbedtls_x509_sequence *subject_alt_name)
 {
     int ret;
     size_t len, tag_len;
@@ -477,50 +467,46 @@ static int x509_get_subject_alt_name( unsigned char **p,
     mbedtls_asn1_sequence *cur = subject_alt_name;
 
     /* Get main sequence tag */
-    if( ( ret = mbedtls_asn1_get_tag( p, end, &len,
-            MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
-        return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret );
+    if ((ret = mbedtls_asn1_get_tag(p, end, &len,
+                                    MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE)) != 0)
+        return (MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret);
 
-    if( *p + len != end )
-        return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
-                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+    if (*p + len != end)
+        return (MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
+                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH);
 
-    while( *p < end )
-    {
-        if( ( end - *p ) < 1 )
-            return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
-                    MBEDTLS_ERR_ASN1_OUT_OF_DATA );
+    while (*p < end) {
+        if ((end - *p) < 1)
+            return (MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
+                    MBEDTLS_ERR_ASN1_OUT_OF_DATA);
 
         tag = **p;
         (*p)++;
-        if( ( ret = mbedtls_asn1_get_len( p, end, &tag_len ) ) != 0 )
-            return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret );
+        if ((ret = mbedtls_asn1_get_len(p, end, &tag_len)) != 0)
+            return (MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret);
 
-        if( ( tag & MBEDTLS_ASN1_TAG_CLASS_MASK ) !=
-                MBEDTLS_ASN1_CONTEXT_SPECIFIC )
-        {
-            return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
-                    MBEDTLS_ERR_ASN1_UNEXPECTED_TAG );
+        if ((tag & MBEDTLS_ASN1_TAG_CLASS_MASK) !=
+            MBEDTLS_ASN1_CONTEXT_SPECIFIC) {
+            return (MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
+                    MBEDTLS_ERR_ASN1_UNEXPECTED_TAG);
         }
 
         /* Skip everything but DNS name */
-        if( tag != ( MBEDTLS_ASN1_CONTEXT_SPECIFIC | 2 ) )
-        {
+        if (tag != (MBEDTLS_ASN1_CONTEXT_SPECIFIC | 2)) {
             *p += tag_len;
             continue;
         }
 
         /* Allocate and assign next pointer */
-        if( cur->buf.p != NULL )
-        {
-            if( cur->next != NULL )
-                return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS );
+        if (cur->buf.p != NULL) {
+            if (cur->next != NULL)
+                return (MBEDTLS_ERR_X509_INVALID_EXTENSIONS);
 
-            cur->next = mbedtls_calloc( 1, sizeof( mbedtls_asn1_sequence ) );
+            cur->next = mbedtls_calloc(1, sizeof(mbedtls_asn1_sequence));
 
-            if( cur->next == NULL )
-                return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
-                        MBEDTLS_ERR_ASN1_ALLOC_FAILED );
+            if (cur->next == NULL)
+                return (MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
+                        MBEDTLS_ERR_ASN1_ALLOC_FAILED);
 
             cur = cur->next;
         }
@@ -535,35 +521,33 @@ static int x509_get_subject_alt_name( unsigned char **p,
     /* Set final sequence entry's next pointer to NULL */
     cur->next = NULL;
 
-    if( *p != end )
-        return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
-                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+    if (*p != end)
+        return (MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
+                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH);
 
-    return( 0 );
+    return (0);
 }
 
 /*
  * X.509 v3 extensions
  *
  */
-static int x509_get_crt_ext( unsigned char **p,
-                             const unsigned char *end,
-                             mbedtls_x509_crt *crt )
+static int x509_get_crt_ext(unsigned char **p,
+                            const unsigned char *end,
+                            mbedtls_x509_crt *crt)
 {
     int ret;
     size_t len;
     unsigned char *end_ext_data, *end_ext_octet;
 
-    if( ( ret = mbedtls_x509_get_ext( p, end, &crt->v3_ext, 3 ) ) != 0 )
-    {
-        if( ret == MBEDTLS_ERR_ASN1_UNEXPECTED_TAG )
-            return( 0 );
+    if ((ret = mbedtls_x509_get_ext(p, end, &crt->v3_ext, 3)) != 0) {
+        if (ret == MBEDTLS_ERR_ASN1_UNEXPECTED_TAG)
+            return (0);
 
-        return( ret );
+        return (ret);
     }
 
-    while( *p < end )
-    {
+    while (*p < end) {
         /*
          * Extension  ::=  SEQUENCE  {
          *      extnID      OBJECT IDENTIFIER,
@@ -574,136 +558,133 @@ static int x509_get_crt_ext( unsigned char **p,
         int is_critical = 0; /* DEFAULT FALSE */
         int ext_type = 0;
 
-        if( ( ret = mbedtls_asn1_get_tag( p, end, &len,
-                MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
-            return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret );
+        if ((ret = mbedtls_asn1_get_tag(p, end, &len,
+                                        MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE)) != 0)
+            return (MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret);
 
         end_ext_data = *p + len;
 
         /* Get extension ID */
-        if( ( ret = mbedtls_asn1_get_tag( p, end_ext_data, &extn_oid.len,
-                                          MBEDTLS_ASN1_OID ) ) != 0 )
-            return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret );
+        if ((ret = mbedtls_asn1_get_tag(p, end_ext_data, &extn_oid.len,
+                                        MBEDTLS_ASN1_OID)) != 0)
+            return (MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret);
 
         extn_oid.tag = MBEDTLS_ASN1_OID;
         extn_oid.p = *p;
         *p += extn_oid.len;
 
         /* Get optional critical */
-        if( ( ret = mbedtls_asn1_get_bool( p, end_ext_data, &is_critical ) ) != 0 &&
-            ( ret != MBEDTLS_ERR_ASN1_UNEXPECTED_TAG ) )
-            return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret );
+        if ((ret = mbedtls_asn1_get_bool(p, end_ext_data, &is_critical)) != 0 &&
+            (ret != MBEDTLS_ERR_ASN1_UNEXPECTED_TAG))
+            return (MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret);
 
         /* Data should be octet string type */
-        if( ( ret = mbedtls_asn1_get_tag( p, end_ext_data, &len,
-                MBEDTLS_ASN1_OCTET_STRING ) ) != 0 )
-            return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret );
+        if ((ret = mbedtls_asn1_get_tag(p, end_ext_data, &len,
+                                        MBEDTLS_ASN1_OCTET_STRING)) != 0)
+            return (MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret);
 
         end_ext_octet = *p + len;
 
-        if( end_ext_octet != end_ext_data )
-            return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
-                    MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+        if (end_ext_octet != end_ext_data)
+            return (MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
+                    MBEDTLS_ERR_ASN1_LENGTH_MISMATCH);
 
         /*
          * Detect supported extensions
          */
-        ret = mbedtls_oid_get_x509_ext_type( &extn_oid, &ext_type );
+        ret = mbedtls_oid_get_x509_ext_type(&extn_oid, &ext_type);
 
-        if( ret != 0 )
-        {
+        if (ret != 0) {
             /* No parser found, skip extension */
             *p = end_ext_octet;
 
 #if !defined(MBEDTLS_X509_ALLOW_UNSUPPORTED_CRITICAL_EXTENSION)
-            if( is_critical )
-            {
+            if (is_critical) {
                 /* Data is marked as critical: fail */
-                return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
-                        MBEDTLS_ERR_ASN1_UNEXPECTED_TAG );
+                return (MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
+                        MBEDTLS_ERR_ASN1_UNEXPECTED_TAG);
             }
 #endif
             continue;
         }
 
         /* Forbid repeated extensions */
-        if( ( crt->ext_types & ext_type ) != 0 )
-            return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS );
+        if ((crt->ext_types & ext_type) != 0)
+            return (MBEDTLS_ERR_X509_INVALID_EXTENSIONS);
 
         crt->ext_types |= ext_type;
 
-        switch( ext_type )
-        {
-        case MBEDTLS_X509_EXT_BASIC_CONSTRAINTS:
-            /* Parse basic constraints */
-            if( ( ret = x509_get_basic_constraints( p, end_ext_octet,
-                    &crt->ca_istrue, &crt->max_pathlen ) ) != 0 )
-                return( ret );
-            break;
+        switch (ext_type) {
+            case MBEDTLS_X509_EXT_BASIC_CONSTRAINTS:
+                /* Parse basic constraints */
+                if ((ret = x509_get_basic_constraints(p, end_ext_octet,
+                                                      &crt->ca_istrue, &crt->max_pathlen)) != 0)
+                    return (ret);
+                break;
 
-        case MBEDTLS_X509_EXT_KEY_USAGE:
-            /* Parse key usage */
-            if( ( ret = x509_get_key_usage( p, end_ext_octet,
-                    &crt->key_usage ) ) != 0 )
-                return( ret );
-            break;
+            case MBEDTLS_X509_EXT_KEY_USAGE:
+                /* Parse key usage */
+                if ((ret = x509_get_key_usage(p, end_ext_octet,
+                                              &crt->key_usage)) != 0)
+                    return (ret);
+                break;
 
-        case MBEDTLS_X509_EXT_EXTENDED_KEY_USAGE:
-            /* Parse extended key usage */
-            if( ( ret = x509_get_ext_key_usage( p, end_ext_octet,
-                    &crt->ext_key_usage ) ) != 0 )
-                return( ret );
-            break;
+            case MBEDTLS_X509_EXT_EXTENDED_KEY_USAGE:
+                /* Parse extended key usage */
+                if ((ret = x509_get_ext_key_usage(p, end_ext_octet,
+                                                  &crt->ext_key_usage)) != 0)
+                    return (ret);
+                break;
 
-        case MBEDTLS_X509_EXT_SUBJECT_ALT_NAME:
-            /* Parse subject alt name */
-            if( ( ret = x509_get_subject_alt_name( p, end_ext_octet,
-                    &crt->subject_alt_names ) ) != 0 )
-                return( ret );
-            break;
+            case MBEDTLS_X509_EXT_SUBJECT_ALT_NAME:
+                /* Parse subject alt name */
+                if ((ret = x509_get_subject_alt_name(p, end_ext_octet,
+                                                     &crt->subject_alt_names)) != 0)
+                    return (ret);
+                break;
 
-        case MBEDTLS_X509_EXT_NS_CERT_TYPE:
-            /* Parse netscape certificate type */
-            if( ( ret = x509_get_ns_cert_type( p, end_ext_octet,
-                    &crt->ns_cert_type ) ) != 0 )
-                return( ret );
-            break;
+            case MBEDTLS_X509_EXT_NS_CERT_TYPE:
+                /* Parse netscape certificate type */
+                if ((ret = x509_get_ns_cert_type(p, end_ext_octet,
+                                                 &crt->ns_cert_type)) != 0)
+                    return (ret);
+                break;
 
-        default:
-            return( MBEDTLS_ERR_X509_FEATURE_UNAVAILABLE );
+            default:
+                return (MBEDTLS_ERR_X509_FEATURE_UNAVAILABLE);
         }
     }
 
-    if( *p != end )
-        return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
-                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+    if (*p != end)
+        return (MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
+                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH);
 
-    return( 0 );
+    return (0);
 }
 
 /*
  * Parse and fill a single X.509 certificate in DER format
  */
-static int x509_crt_parse_der_core( mbedtls_x509_crt *crt, const unsigned char *buf,
-                                    size_t buflen )
+static int x509_crt_parse_der_core(mbedtls_x509_crt *crt, const unsigned char *buf,
+                                   size_t buflen)
 {
     int ret;
     size_t len;
     unsigned char *p, *end, *crt_end;
     mbedtls_x509_buf sig_params1, sig_params2, sig_oid2;
 
-    memset( &sig_params1, 0, sizeof( mbedtls_x509_buf ) );
-    memset( &sig_params2, 0, sizeof( mbedtls_x509_buf ) );
-    memset( &sig_oid2, 0, sizeof( mbedtls_x509_buf ) );
+    memset(&sig_params1, 0, sizeof(mbedtls_x509_buf));
+    memset(&sig_params2, 0, sizeof(mbedtls_x509_buf));
+    memset(&sig_oid2, 0, sizeof(mbedtls_x509_buf));
 
     /*
      * Check for valid input
      */
-    if( crt == NULL || buf == NULL )
-        return( MBEDTLS_ERR_X509_BAD_INPUT_DATA );
+    if (crt == NULL || buf == NULL)
+        return (MBEDTLS_ERR_X509_BAD_INPUT_DATA);
 
     // Use the original buffer until we figure out actual length
-    p = (unsigned char*) buf;
+    p = (unsigned char *) buf;
     len = buflen;
     end = p + len;
 
@@ -713,28 +694,26 @@ static int x509_crt_parse_der_core( mbedtls_x509_crt *crt, const unsigned char *
      *      signatureAlgorithm   AlgorithmIdentifier,
      *      signatureValue       BIT STRING  }
      */
-    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len,
-            MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
-    {
-        mbedtls_x509_crt_free( crt );
-        return( MBEDTLS_ERR_X509_INVALID_FORMAT );
+    if ((ret = mbedtls_asn1_get_tag(&p, end, &len,
+                                    MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE)) != 0) {
+        mbedtls_x509_crt_free(crt);
+        return (MBEDTLS_ERR_X509_INVALID_FORMAT);
     }
 
-    if( len > (size_t) ( end - p ) )
-    {
-        mbedtls_x509_crt_free( crt );
-        return( MBEDTLS_ERR_X509_INVALID_FORMAT +
-                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+    if (len > (size_t)(end - p)) {
+        mbedtls_x509_crt_free(crt);
+        return (MBEDTLS_ERR_X509_INVALID_FORMAT +
+                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH);
     }
     crt_end = p + len;
 
     // Create and populate a new buffer for the raw field
     crt->raw.len = crt_end - buf;
-    crt->raw.p = p = mbedtls_calloc( 1, crt->raw.len );
-    if( p == NULL )
-        return( MBEDTLS_ERR_X509_ALLOC_FAILED );
+    crt->raw.p = p = mbedtls_calloc(1, crt->raw.len);
+    if (p == NULL)
+        return (MBEDTLS_ERR_X509_ALLOC_FAILED);
 
-    memcpy( p, buf, crt->raw.len );
+    memcpy(p, buf, crt->raw.len);
 
     // Direct pointers to the new buffer
     p += crt->raw.len - len;
@@ -745,11 +724,10 @@ static int x509_crt_parse_der_core( mbedtls_x509_crt *crt, const unsigned char *
      */
     crt->tbs.p = p;
 
-    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len,
-            MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
-    {
-        mbedtls_x509_crt_free( crt );
-        return( MBEDTLS_ERR_X509_INVALID_FORMAT + ret );
+    if ((ret = mbedtls_asn1_get_tag(&p, end, &len,
+                                    MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE)) != 0) {
+        mbedtls_x509_crt_free(crt);
+        return (MBEDTLS_ERR_X509_INVALID_FORMAT + ret);
     }
 
     end = p + len;
@@ -762,29 +740,26 @@ static int x509_crt_parse_der_core( mbedtls_x509_crt *crt, const unsigned char *
      *
      * signature            AlgorithmIdentifier
      */
-    if( ( ret = x509_get_version(  &p, end, &crt->version  ) ) != 0 ||
-        ( ret = mbedtls_x509_get_serial(   &p, end, &crt->serial   ) ) != 0 ||
-        ( ret = mbedtls_x509_get_alg(      &p, end, &crt->sig_oid,
-                                            &sig_params1 ) ) != 0 )
-    {
-        mbedtls_x509_crt_free( crt );
-        return( ret );
+    if ((ret = x509_get_version(&p, end, &crt->version)) != 0 ||
+        (ret = mbedtls_x509_get_serial(&p, end, &crt->serial)) != 0 ||
+        (ret = mbedtls_x509_get_alg(&p, end, &crt->sig_oid,
+                                    &sig_params1)) != 0) {
+        mbedtls_x509_crt_free(crt);
+        return (ret);
     }
 
-    if( crt->version < 0 || crt->version > 2 )
-    {
-        mbedtls_x509_crt_free( crt );
-        return( MBEDTLS_ERR_X509_UNKNOWN_VERSION );
+    if (crt->version < 0 || crt->version > 2) {
+        mbedtls_x509_crt_free(crt);
+        return (MBEDTLS_ERR_X509_UNKNOWN_VERSION);
     }
 
     crt->version++;
 
-    if( ( ret = mbedtls_x509_get_sig_alg( &crt->sig_oid, &sig_params1,
-                                  &crt->sig_md, &crt->sig_pk,
-                                  &crt->sig_opts ) ) != 0 )
-    {
-        mbedtls_x509_crt_free( crt );
-        return( ret );
+    if ((ret = mbedtls_x509_get_sig_alg(&crt->sig_oid, &sig_params1,
+                                        &crt->sig_md, &crt->sig_pk,
+                                        &crt->sig_opts)) != 0) {
+        mbedtls_x509_crt_free(crt);
+        return (ret);
     }
 
     /*
@@ -792,17 +767,15 @@ static int x509_crt_parse_der_core( mbedtls_x509_crt *crt, const unsigned char *
      */
     crt->issuer_raw.p = p;
 
-    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len,
-            MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
-    {
-        mbedtls_x509_crt_free( crt );
-        return( MBEDTLS_ERR_X509_INVALID_FORMAT + ret );
+    if ((ret = mbedtls_asn1_get_tag(&p, end, &len,
+                                    MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE)) != 0) {
+        mbedtls_x509_crt_free(crt);
+        return (MBEDTLS_ERR_X509_INVALID_FORMAT + ret);
     }
 
-    if( ( ret = mbedtls_x509_get_name( &p, p + len, &crt->issuer ) ) != 0 )
-    {
-        mbedtls_x509_crt_free( crt );
-        return( ret );
+    if ((ret = mbedtls_x509_get_name(&p, p + len, &crt->issuer)) != 0) {
+        mbedtls_x509_crt_free(crt);
+        return (ret);
     }
 
     crt->issuer_raw.len = p - crt->issuer_raw.p;
@@ -813,11 +786,10 @@ static int x509_crt_parse_der_core( mbedtls_x509_crt *crt, const unsigned char *
      *      notAfter       Time }
      *
      */
-    if( ( ret = x509_get_dates( &p, end, &crt->valid_from,
-                                         &crt->valid_to ) ) != 0 )
-    {
-        mbedtls_x509_crt_free( crt );
-        return( ret );
+    if ((ret = x509_get_dates(&p, end, &crt->valid_from,
+                              &crt->valid_to)) != 0) {
+        mbedtls_x509_crt_free(crt);
+        return (ret);
     }
 
     /*
@@ -825,17 +797,15 @@ static int x509_crt_parse_der_core( mbedtls_x509_crt *crt, const unsigned char *
      */
     crt->subject_raw.p = p;
 
-    if( ( ret = mbedtls_asn1_get_tag( &p, end, &len,
-            MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
-    {
-        mbedtls_x509_crt_free( crt );
-        return( MBEDTLS_ERR_X509_INVALID_FORMAT + ret );
+    if ((ret = mbedtls_asn1_get_tag(&p, end, &len,
+                                    MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE)) != 0) {
+        mbedtls_x509_crt_free(crt);
+        return (MBEDTLS_ERR_X509_INVALID_FORMAT + ret);
     }
 
-    if( len && ( ret = mbedtls_x509_get_name( &p, p + len, &crt->subject ) ) != 0 )
-    {
-        mbedtls_x509_crt_free( crt );
-        return( ret );
+    if (len && (ret = mbedtls_x509_get_name(&p, p + len, &crt->subject)) != 0) {
+        mbedtls_x509_crt_free(crt);
+        return (ret);
     }
 
     crt->subject_raw.len = p - crt->subject_raw.p;
@@ -843,10 +813,9 @@ static int x509_crt_parse_der_core( mbedtls_x509_crt *crt, const unsigned char *
     /*
      * SubjectPublicKeyInfo
      */
-    if( ( ret = mbedtls_pk_parse_subpubkey( &p, end, &crt->pk ) ) != 0 )
-    {
-        mbedtls_x509_crt_free( crt );
-        return( ret );
+    if ((ret = mbedtls_pk_parse_subpubkey(&p, end, &crt->pk)) != 0) {
+        mbedtls_x509_crt_free(crt);
+        return (ret);
     }
 
     /*
@@ -857,43 +826,37 @@ static int x509_crt_parse_der_core( mbedtls_x509_crt *crt, const unsigned char *
      *  extensions      [3]  EXPLICIT Extensions OPTIONAL
      *                       -- If present, version shall be v3
      */
-    if( crt->version == 2 || crt->version == 3 )
-    {
-        ret = x509_get_uid( &p, end, &crt->issuer_id,  1 );
-        if( ret != 0 )
-        {
-            mbedtls_x509_crt_free( crt );
-            return( ret );
+    if (crt->version == 2 || crt->version == 3) {
+        ret = x509_get_uid(&p, end, &crt->issuer_id,  1);
+        if (ret != 0) {
+            mbedtls_x509_crt_free(crt);
+            return (ret);
         }
     }
 
-    if( crt->version == 2 || crt->version == 3 )
-    {
-        ret = x509_get_uid( &p, end, &crt->subject_id,  2 );
-        if( ret != 0 )
-        {
-            mbedtls_x509_crt_free( crt );
-            return( ret );
+    if (crt->version == 2 || crt->version == 3) {
+        ret = x509_get_uid(&p, end, &crt->subject_id,  2);
+        if (ret != 0) {
+            mbedtls_x509_crt_free(crt);
+            return (ret);
         }
     }
 
 #if !defined(MBEDTLS_X509_ALLOW_EXTENSIONS_NON_V3)
-    if( crt->version == 3 )
+    if (crt->version == 3)
 #endif
     {
-        ret = x509_get_crt_ext( &p, end, crt );
-        if( ret != 0 )
-        {
-            mbedtls_x509_crt_free( crt );
-            return( ret );
+        ret = x509_get_crt_ext(&p, end, crt);
+        if (ret != 0) {
+            mbedtls_x509_crt_free(crt);
+            return (ret);
         }
     }
 
-    if( p != end )
-    {
-        mbedtls_x509_crt_free( crt );
-        return( MBEDTLS_ERR_X509_INVALID_FORMAT +
-                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+    if (p != end) {
+        mbedtls_x509_crt_free(crt);
+        return (MBEDTLS_ERR_X509_INVALID_FORMAT +
+                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH);
     }
 
     end = crt_end;
@@ -905,44 +868,40 @@ static int x509_crt_parse_der_core( mbedtls_x509_crt *crt, const unsigned char *
      *  signatureAlgorithm   AlgorithmIdentifier,
      *  signatureValue       BIT STRING
      */
-    if( ( ret = mbedtls_x509_get_alg( &p, end, &sig_oid2, &sig_params2 ) ) != 0 )
-    {
-        mbedtls_x509_crt_free( crt );
-        return( ret );
+    if ((ret = mbedtls_x509_get_alg(&p, end, &sig_oid2, &sig_params2)) != 0) {
+        mbedtls_x509_crt_free(crt);
+        return (ret);
     }
 
-    if( crt->sig_oid.len != sig_oid2.len ||
-        memcmp( crt->sig_oid.p, sig_oid2.p, crt->sig_oid.len ) != 0 ||
+    if (crt->sig_oid.len != sig_oid2.len ||
+        memcmp(crt->sig_oid.p, sig_oid2.p, crt->sig_oid.len) != 0 ||
         sig_params1.len != sig_params2.len ||
-        ( sig_params1.len != 0 &&
-          memcmp( sig_params1.p, sig_params2.p, sig_params1.len ) != 0 ) )
-    {
-        mbedtls_x509_crt_free( crt );
-        return( MBEDTLS_ERR_X509_SIG_MISMATCH );
+        (sig_params1.len != 0 &&
+         memcmp(sig_params1.p, sig_params2.p, sig_params1.len) != 0)) {
+        mbedtls_x509_crt_free(crt);
+        return (MBEDTLS_ERR_X509_SIG_MISMATCH);
     }
 
-    if( ( ret = mbedtls_x509_get_sig( &p, end, &crt->sig ) ) != 0 )
-    {
-        mbedtls_x509_crt_free( crt );
-        return( ret );
+    if ((ret = mbedtls_x509_get_sig(&p, end, &crt->sig)) != 0) {
+        mbedtls_x509_crt_free(crt);
+        return (ret);
     }
 
-    if( p != end )
-    {
-        mbedtls_x509_crt_free( crt );
-        return( MBEDTLS_ERR_X509_INVALID_FORMAT +
-                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+    if (p != end) {
+        mbedtls_x509_crt_free(crt);
+        return (MBEDTLS_ERR_X509_INVALID_FORMAT +
+                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH);
     }
 
-    return( 0 );
+    return (0);
 }
 
 /*
  * Parse one X.509 certificate in DER format from a buffer and add them to a
  * chained list
  */
-int mbedtls_x509_crt_parse_der( mbedtls_x509_crt *chain, const unsigned char *buf,
-                        size_t buflen )
+int mbedtls_x509_crt_parse_der(mbedtls_x509_crt *chain, const unsigned char *buf,
+                               size_t buflen)
 {
     int ret;
     mbedtls_x509_crt *crt = chain, *prev = NULL;
@@ -950,11 +909,10 @@ int mbedtls_x509_crt_parse_der( mbedtls_x509_crt *chain, const unsigned char *bu
     /*
      * Check for valid input
      */
-    if( crt == NULL || buf == NULL )
-        return( MBEDTLS_ERR_X509_BAD_INPUT_DATA );
+    if (crt == NULL || buf == NULL)
+        return (MBEDTLS_ERR_X509_BAD_INPUT_DATA);
 
-    while( crt->version != 0 && crt->next != NULL )
-    {
+    while (crt->version != 0 && crt->next != NULL) {
         prev = crt;
         crt = crt->next;
     }
@@ -962,37 +920,35 @@ int mbedtls_x509_crt_parse_der( mbedtls_x509_crt *chain, const unsigned char *bu
     /*
      * Add new certificate on the end of the chain if needed.
      */
-    if( crt->version != 0 && crt->next == NULL )
-    {
-        crt->next = mbedtls_calloc( 1, sizeof( mbedtls_x509_crt ) );
+    if (crt->version != 0 && crt->next == NULL) {
+        crt->next = mbedtls_calloc(1, sizeof(mbedtls_x509_crt));
 
-        if( crt->next == NULL )
-            return( MBEDTLS_ERR_X509_ALLOC_FAILED );
+        if (crt->next == NULL)
+            return (MBEDTLS_ERR_X509_ALLOC_FAILED);
 
         prev = crt;
-        mbedtls_x509_crt_init( crt->next );
+        mbedtls_x509_crt_init(crt->next);
         crt = crt->next;
     }
 
-    if( ( ret = x509_crt_parse_der_core( crt, buf, buflen ) ) != 0 )
-    {
-        if( prev )
+    if ((ret = x509_crt_parse_der_core(crt, buf, buflen)) != 0) {
+        if (prev)
             prev->next = NULL;
 
-        if( crt != chain )
-            mbedtls_free( crt );
+        if (crt != chain)
+            mbedtls_free(crt);
 
-        return( ret );
+        return (ret);
     }
 
-    return( 0 );
+    return (0);
 }
 
 /*
  * Parse one or more PEM certificates from a buffer and add them to the chained
  * list
  */
-int mbedtls_x509_crt_parse( mbedtls_x509_crt *chain, const unsigned char *buf, size_t buflen )
+int mbedtls_x509_crt_parse(mbedtls_x509_crt *chain, const unsigned char *buf, size_t buflen)
 {
 #if defined(MBEDTLS_PEM_PARSE_C)
     int success = 0, first_error = 0, total_failed = 0;
@@ -1002,59 +958,51 @@ int mbedtls_x509_crt_parse( mbedtls_x509_crt *chain, const unsigned char *buf, s
     /*
      * Check for valid input
      */
-    if( chain == NULL || buf == NULL )
-        return( MBEDTLS_ERR_X509_BAD_INPUT_DATA );
+    if (chain == NULL || buf == NULL)
+        return (MBEDTLS_ERR_X509_BAD_INPUT_DATA);
 
     /*
      * Determine buffer content. Buffer contains either one DER certificate or
      * one or more PEM certificates.
      */
 #if defined(MBEDTLS_PEM_PARSE_C)
-    if( buflen != 0 && buf[buflen - 1] == '\0' &&
-        strstr( (const char *) buf, "-----BEGIN CERTIFICATE-----" ) != NULL )
-    {
+    if (buflen != 0 && buf[buflen - 1] == '\0' &&
+        strstr((const char *) buf, "-----BEGIN CERTIFICATE-----") != NULL) {
         buf_format = MBEDTLS_X509_FORMAT_PEM;
     }
 
-    if( buf_format == MBEDTLS_X509_FORMAT_DER )
-        return mbedtls_x509_crt_parse_der( chain, buf, buflen );
+    if (buf_format == MBEDTLS_X509_FORMAT_DER)
+        return mbedtls_x509_crt_parse_der(chain, buf, buflen);
 #else
-    return mbedtls_x509_crt_parse_der( chain, buf, buflen );
+    return mbedtls_x509_crt_parse_der(chain, buf, buflen);
 #endif
 
 #if defined(MBEDTLS_PEM_PARSE_C)
-    if( buf_format == MBEDTLS_X509_FORMAT_PEM )
-    {
+    if (buf_format == MBEDTLS_X509_FORMAT_PEM) {
         int ret;
         mbedtls_pem_context pem;
 
         /* 1 rather than 0 since the terminating NULL byte is counted in */
-        while( buflen > 1 )
-        {
+        while (buflen > 1) {
             size_t use_len;
-            mbedtls_pem_init( &pem );
+            mbedtls_pem_init(&pem);
 
             /* If we get there, we know the string is null-terminated */
-            ret = mbedtls_pem_read_buffer( &pem,
-                           "-----BEGIN CERTIFICATE-----",
-                           "-----END CERTIFICATE-----",
-                           buf, NULL, 0, &use_len );
+            ret = mbedtls_pem_read_buffer(&pem,
+                                          "-----BEGIN CERTIFICATE-----",
+                                          "-----END CERTIFICATE-----",
+                                          buf, NULL, 0, &use_len);
 
-            if( ret == 0 )
-            {
+            if (ret == 0) {
                 /*
                  * Was PEM encoded
                  */
                 buflen -= use_len;
                 buf += use_len;
-            }
-            else if( ret == MBEDTLS_ERR_PEM_BAD_INPUT_DATA )
-            {
-                return( ret );
-            }
-            else if( ret != MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT )
-            {
-                mbedtls_pem_free( &pem );
+            } else if (ret == MBEDTLS_ERR_PEM_BAD_INPUT_DATA) {
+                return (ret);
+            } else if (ret != MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT) {
+                mbedtls_pem_free(&pem);
 
                 /*
                  * PEM header and footer were found
@@ -1062,28 +1010,26 @@ int mbedtls_x509_crt_parse( mbedtls_x509_crt *chain, const unsigned char *buf, s
                 buflen -= use_len;
                 buf += use_len;
 
-                if( first_error == 0 )
+                if (first_error == 0)
                     first_error = ret;
 
                 total_failed++;
                 continue;
-            }
-            else
+            } else
                 break;
 
-            ret = mbedtls_x509_crt_parse_der( chain, pem.buf, pem.buflen );
+            ret = mbedtls_x509_crt_parse_der(chain, pem.buf, pem.buflen);
 
-            mbedtls_pem_free( &pem );
+            mbedtls_pem_free(&pem);
 
-            if( ret != 0 )
-            {
+            if (ret != 0) {
                 /*
                  * Quit parsing on a memory error
                  */
-                if( ret == MBEDTLS_ERR_X509_ALLOC_FAILED )
-                    return( ret );
+                if (ret == MBEDTLS_ERR_X509_ALLOC_FAILED)
+                    return (ret);
 
-                if( first_error == 0 )
+                if (first_error == 0)
                     first_error = ret;
 
                 total_failed++;
@@ -1094,12 +1040,12 @@ int mbedtls_x509_crt_parse( mbedtls_x509_crt *chain, const unsigned char *buf, s
         }
     }
 
-    if( success )
-        return( total_failed );
-    else if( first_error )
-        return( first_error );
+    if (success)
+        return (total_failed);
+    else if (first_error)
+        return (first_error);
     else
-        return( MBEDTLS_ERR_X509_CERT_UNKNOWN_FORMAT );
+        return (MBEDTLS_ERR_X509_CERT_UNKNOWN_FORMAT);
 #endif /* MBEDTLS_PEM_PARSE_C */
 }
 
@@ -1107,24 +1053,24 @@ int mbedtls_x509_crt_parse( mbedtls_x509_crt *chain, const unsigned char *buf, s
 /*
  * Load one or more certificates and add them to the chained list
  */
-int mbedtls_x509_crt_parse_file( mbedtls_x509_crt *chain, const char *path )
+int mbedtls_x509_crt_parse_file(mbedtls_x509_crt *chain, const char *path)
 {
     int ret;
     size_t n;
     unsigned char *buf;
 
-    if( ( ret = mbedtls_pk_load_file( path, &buf, &n ) ) != 0 )
-        return( ret );
+    if ((ret = mbedtls_pk_load_file(path, &buf, &n)) != 0)
+        return (ret);
 
-    ret = mbedtls_x509_crt_parse( chain, buf, n );
+    ret = mbedtls_x509_crt_parse(chain, buf, n);
 
-    mbedtls_platform_zeroize( buf, n );
-    mbedtls_free( buf );
+    mbedtls_platform_zeroize(buf, n);
+    mbedtls_free(buf);
 
-    return( ret );
+    return (ret);
 }
 
-int mbedtls_x509_crt_parse_path( mbedtls_x509_crt *chain, const char *path )
+int mbedtls_x509_crt_parse_path(mbedtls_x509_crt *chain, const char *path)
 {
     int ret = 0;
 #if defined(_WIN32) && !defined(EFIX64) && !defined(EFI32)
@@ -1132,124 +1078,116 @@ int mbedtls_x509_crt_parse_path( mbedtls_x509_crt *chain, const char *path )
     WCHAR szDir[MAX_PATH];
     char filename[MAX_PATH];
     char *p;
-    size_t len = strlen( path );
+    size_t len = strlen(path);
 
     WIN32_FIND_DATAW file_data;
     HANDLE hFind;
 
-    if( len > MAX_PATH - 3 )
-        return( MBEDTLS_ERR_X509_BAD_INPUT_DATA );
+    if (len > MAX_PATH - 3)
+        return (MBEDTLS_ERR_X509_BAD_INPUT_DATA);
 
-    memset( szDir, 0, sizeof(szDir) );
-    memset( filename, 0, MAX_PATH );
-    memcpy( filename, path, len );
+    memset(szDir, 0, sizeof(szDir));
+    memset(filename, 0, MAX_PATH);
+    memcpy(filename, path, len);
     filename[len++] = '\\';
     p = filename + len;
     filename[len++] = '*';
 
-    w_ret = MultiByteToWideChar( CP_ACP, 0, filename, (int)len, szDir,
-                                 MAX_PATH - 3 );
-    if( w_ret == 0 )
-        return( MBEDTLS_ERR_X509_BAD_INPUT_DATA );
+    w_ret = MultiByteToWideChar(CP_ACP, 0, filename, (int)len, szDir,
+                                MAX_PATH - 3);
+    if (w_ret == 0)
+        return (MBEDTLS_ERR_X509_BAD_INPUT_DATA);
 
-    hFind = FindFirstFileW( szDir, &file_data );
-    if( hFind == INVALID_HANDLE_VALUE )
-        return( MBEDTLS_ERR_X509_FILE_IO_ERROR );
+    hFind = FindFirstFileW(szDir, &file_data);
+    if (hFind == INVALID_HANDLE_VALUE)
+        return (MBEDTLS_ERR_X509_FILE_IO_ERROR);
 
     len = MAX_PATH - len;
-    do
-    {
-        memset( p, 0, len );
+    do {
+        memset(p, 0, len);
 
-        if( file_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY )
+        if (file_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
             continue;
 
-        w_ret = WideCharToMultiByte( CP_ACP, 0, file_data.cFileName,
-                                     lstrlenW( file_data.cFileName ),
-                                     p, (int) len - 1,
-                                     NULL, NULL );
-        if( w_ret == 0 )
-        {
+        w_ret = WideCharToMultiByte(CP_ACP, 0, file_data.cFileName,
+                                    lstrlenW(file_data.cFileName),
+                                    p, (int) len - 1,
+                                    NULL, NULL);
+        if (w_ret == 0) {
             ret = MBEDTLS_ERR_X509_FILE_IO_ERROR;
             goto cleanup;
         }
 
-        w_ret = mbedtls_x509_crt_parse_file( chain, filename );
-        if( w_ret < 0 )
+        w_ret = mbedtls_x509_crt_parse_file(chain, filename);
+        if (w_ret < 0)
             ret++;
         else
             ret += w_ret;
-    }
-    while( FindNextFileW( hFind, &file_data ) != 0 );
+    } while (FindNextFileW(hFind, &file_data) != 0);
 
-    if( GetLastError() != ERROR_NO_MORE_FILES )
+    if (GetLastError() != ERROR_NO_MORE_FILES)
         ret = MBEDTLS_ERR_X509_FILE_IO_ERROR;
 
 cleanup:
-    FindClose( hFind );
+    FindClose(hFind);
 #else /* _WIN32 */
     int t_ret;
     int snp_ret;
     struct stat sb;
     struct dirent *entry;
     char entry_name[MBEDTLS_X509_MAX_FILE_PATH_LEN];
-    DIR *dir = opendir( path );
+    DIR *dir = opendir(path);
 
-    if( dir == NULL )
-        return( MBEDTLS_ERR_X509_FILE_IO_ERROR );
+    if (dir == NULL)
+        return (MBEDTLS_ERR_X509_FILE_IO_ERROR);
 
 #if defined(MBEDTLS_THREADING_C)
-    if( ( ret = mbedtls_mutex_lock( &mbedtls_threading_readdir_mutex ) ) != 0 )
-    {
-        closedir( dir );
-        return( ret );
+    if ((ret = mbedtls_mutex_lock(&mbedtls_threading_readdir_mutex)) != 0) {
+        closedir(dir);
+        return (ret);
     }
 #endif /* MBEDTLS_THREADING_C */
 
-    while( ( entry = readdir( dir ) ) != NULL )
-    {
-        snp_ret = mbedtls_snprintf( entry_name, sizeof entry_name,
-                                    "%s/%s", path, entry->d_name );
+    while ((entry = readdir(dir)) != NULL) {
+        snp_ret = mbedtls_snprintf(entry_name, sizeof entry_name,
+                                   "%s/%s", path, entry->d_name);
 
-        if( snp_ret < 0 || (size_t)snp_ret >= sizeof entry_name )
-        {
+        if (snp_ret < 0 || (size_t)snp_ret >= sizeof entry_name) {
             ret = MBEDTLS_ERR_X509_BUFFER_TOO_SMALL;
             goto cleanup;
-        }
-        else if( stat( entry_name, &sb ) == -1 )
-        {
+        } else if (stat(entry_name, &sb) == -1) {
             ret = MBEDTLS_ERR_X509_FILE_IO_ERROR;
             goto cleanup;
         }
 
-        if( !S_ISREG( sb.st_mode ) )
+        if (!S_ISREG(sb.st_mode))
             continue;
 
         // Ignore parse errors
         //
-        t_ret = mbedtls_x509_crt_parse_file( chain, entry_name );
-        if( t_ret < 0 )
+        t_ret = mbedtls_x509_crt_parse_file(chain, entry_name);
+        if (t_ret < 0)
             ret++;
         else
             ret += t_ret;
     }
 
 cleanup:
-    closedir( dir );
+    closedir(dir);
 
 #if defined(MBEDTLS_THREADING_C)
-    if( mbedtls_mutex_unlock( &mbedtls_threading_readdir_mutex ) != 0 )
+    if (mbedtls_mutex_unlock(&mbedtls_threading_readdir_mutex) != 0)
         ret = MBEDTLS_ERR_THREADING_MUTEX_ERROR;
 #endif /* MBEDTLS_THREADING_C */
 
 #endif /* _WIN32 */
 
-    return( ret );
+    return (ret);
 }
 #endif /* MBEDTLS_FS_IO */
 
-static int x509_info_subject_alt_name( char **buf, size_t *size,
-                                       const mbedtls_x509_sequence *subject_alt_name )
+static int x509_info_subject_alt_name(char **buf, size_t *size,
+                                      const mbedtls_x509_sequence *subject_alt_name)
 {
     size_t i;
     size_t n = *size;
@@ -1258,18 +1196,16 @@ static int x509_info_subject_alt_name( char **buf, size_t *size,
     const char *sep = "";
     size_t sep_len = 0;
 
-    while( cur != NULL )
-    {
-        if( cur->buf.len + sep_len >= n )
-        {
+    while (cur != NULL) {
+        if (cur->buf.len + sep_len >= n) {
             *p = '\0';
-            return( MBEDTLS_ERR_X509_BUFFER_TOO_SMALL );
+            return (MBEDTLS_ERR_X509_BUFFER_TOO_SMALL);
         }
 
         n -= cur->buf.len + sep_len;
-        for( i = 0; i < sep_len; i++ )
+        for (i = 0; i < sep_len; i++)
             *p++ = sep[i];
-        for( i = 0; i < cur->buf.len; i++ )
+        for (i = 0; i < cur->buf.len; i++)
             *p++ = cur->buf.p[i];
 
         sep = ", ";
@@ -1283,7 +1219,7 @@ static int x509_info_subject_alt_name( char **buf, size_t *size,
     *size = n;
     *buf = p;
 
-    return( 0 );
+    return (0);
 }
 
 #define PRINT_ITEM(i)                           \
@@ -1297,59 +1233,59 @@ static int x509_info_subject_alt_name( char **buf, size_t *size,
     if( ns_cert_type & type )                   \
         PRINT_ITEM( name );
 
-static int x509_info_cert_type( char **buf, size_t *size,
-                                unsigned char ns_cert_type )
+static int x509_info_cert_type(char **buf, size_t *size,
+                               unsigned char ns_cert_type)
 {
     int ret;
     size_t n = *size;
     char *p = *buf;
     const char *sep = "";
 
-    CERT_TYPE( MBEDTLS_X509_NS_CERT_TYPE_SSL_CLIENT,         "SSL Client" );
-    CERT_TYPE( MBEDTLS_X509_NS_CERT_TYPE_SSL_SERVER,         "SSL Server" );
-    CERT_TYPE( MBEDTLS_X509_NS_CERT_TYPE_EMAIL,              "Email" );
-    CERT_TYPE( MBEDTLS_X509_NS_CERT_TYPE_OBJECT_SIGNING,     "Object Signing" );
-    CERT_TYPE( MBEDTLS_X509_NS_CERT_TYPE_RESERVED,           "Reserved" );
-    CERT_TYPE( MBEDTLS_X509_NS_CERT_TYPE_SSL_CA,             "SSL CA" );
-    CERT_TYPE( MBEDTLS_X509_NS_CERT_TYPE_EMAIL_CA,           "Email CA" );
-    CERT_TYPE( MBEDTLS_X509_NS_CERT_TYPE_OBJECT_SIGNING_CA,  "Object Signing CA" );
+    CERT_TYPE(MBEDTLS_X509_NS_CERT_TYPE_SSL_CLIENT,         "SSL Client");
+    CERT_TYPE(MBEDTLS_X509_NS_CERT_TYPE_SSL_SERVER,         "SSL Server");
+    CERT_TYPE(MBEDTLS_X509_NS_CERT_TYPE_EMAIL,              "Email");
+    CERT_TYPE(MBEDTLS_X509_NS_CERT_TYPE_OBJECT_SIGNING,     "Object Signing");
+    CERT_TYPE(MBEDTLS_X509_NS_CERT_TYPE_RESERVED,           "Reserved");
+    CERT_TYPE(MBEDTLS_X509_NS_CERT_TYPE_SSL_CA,             "SSL CA");
+    CERT_TYPE(MBEDTLS_X509_NS_CERT_TYPE_EMAIL_CA,           "Email CA");
+    CERT_TYPE(MBEDTLS_X509_NS_CERT_TYPE_OBJECT_SIGNING_CA,  "Object Signing CA");
 
     *size = n;
     *buf = p;
 
-    return( 0 );
+    return (0);
 }
 
 #define KEY_USAGE(code,name)    \
     if( key_usage & code )      \
         PRINT_ITEM( name );
 
-static int x509_info_key_usage( char **buf, size_t *size,
-                                unsigned int key_usage )
+static int x509_info_key_usage(char **buf, size_t *size,
+                               unsigned int key_usage)
 {
     int ret;
     size_t n = *size;
     char *p = *buf;
     const char *sep = "";
 
-    KEY_USAGE( MBEDTLS_X509_KU_DIGITAL_SIGNATURE,    "Digital Signature" );
-    KEY_USAGE( MBEDTLS_X509_KU_NON_REPUDIATION,      "Non Repudiation" );
-    KEY_USAGE( MBEDTLS_X509_KU_KEY_ENCIPHERMENT,     "Key Encipherment" );
-    KEY_USAGE( MBEDTLS_X509_KU_DATA_ENCIPHERMENT,    "Data Encipherment" );
-    KEY_USAGE( MBEDTLS_X509_KU_KEY_AGREEMENT,        "Key Agreement" );
-    KEY_USAGE( MBEDTLS_X509_KU_KEY_CERT_SIGN,        "Key Cert Sign" );
-    KEY_USAGE( MBEDTLS_X509_KU_CRL_SIGN,             "CRL Sign" );
-    KEY_USAGE( MBEDTLS_X509_KU_ENCIPHER_ONLY,        "Encipher Only" );
-    KEY_USAGE( MBEDTLS_X509_KU_DECIPHER_ONLY,        "Decipher Only" );
+    KEY_USAGE(MBEDTLS_X509_KU_DIGITAL_SIGNATURE,    "Digital Signature");
+    KEY_USAGE(MBEDTLS_X509_KU_NON_REPUDIATION,      "Non Repudiation");
+    KEY_USAGE(MBEDTLS_X509_KU_KEY_ENCIPHERMENT,     "Key Encipherment");
+    KEY_USAGE(MBEDTLS_X509_KU_DATA_ENCIPHERMENT,    "Data Encipherment");
+    KEY_USAGE(MBEDTLS_X509_KU_KEY_AGREEMENT,        "Key Agreement");
+    KEY_USAGE(MBEDTLS_X509_KU_KEY_CERT_SIGN,        "Key Cert Sign");
+    KEY_USAGE(MBEDTLS_X509_KU_CRL_SIGN,             "CRL Sign");
+    KEY_USAGE(MBEDTLS_X509_KU_ENCIPHER_ONLY,        "Encipher Only");
+    KEY_USAGE(MBEDTLS_X509_KU_DECIPHER_ONLY,        "Decipher Only");
 
     *size = n;
     *buf = p;
 
-    return( 0 );
+    return (0);
 }
 
-static int x509_info_ext_key_usage( char **buf, size_t *size,
-                                    const mbedtls_x509_sequence *extended_key_usage )
+static int x509_info_ext_key_usage(char **buf, size_t *size,
+                                   const mbedtls_x509_sequence *extended_key_usage)
 {
     int ret;
     const char *desc;
@@ -1358,12 +1294,11 @@ static int x509_info_ext_key_usage( char **buf, size_t *size,
     const mbedtls_x509_sequence *cur = extended_key_usage;
     const char *sep = "";
 
-    while( cur != NULL )
-    {
-        if( mbedtls_oid_get_extended_key_usage( &cur->buf, &desc ) != 0 )
+    while (cur != NULL) {
+        if (mbedtls_oid_get_extended_key_usage(&cur->buf, &desc) != 0)
             desc = "???";
 
-        ret = mbedtls_snprintf( p, n, "%s%s", sep, desc );
+        ret = mbedtls_snprintf(p, n, "%s%s", sep, desc);
         MBEDTLS_X509_SAFE_SNPRINTF;
 
         sep = ", ";
@@ -1374,7 +1309,7 @@ static int x509_info_ext_key_usage( char **buf, size_t *size,
     *size = n;
     *buf = p;
 
-    return( 0 );
+    return (0);
 }
 
 /*
@@ -1382,8 +1317,8 @@ static int x509_info_ext_key_usage( char **buf, size_t *size,
  */
 #define BEFORE_COLON    18
 #define BC              "18"
-int mbedtls_x509_crt_info( char *buf, size_t size, const char *prefix,
-                   const mbedtls_x509_crt *crt )
+int mbedtls_x509_crt_info(char *buf, size_t size, const char *prefix,
+                          const mbedtls_x509_crt *crt)
 {
     int ret;
     size_t n;
@@ -1393,125 +1328,117 @@ int mbedtls_x509_crt_info( char *buf, size_t size, const char *prefix,
     p = buf;
     n = size;
 
-    if( NULL == crt )
-    {
-        ret = mbedtls_snprintf( p, n, "\nCertificate is uninitialised!\n" );
+    if (NULL == crt) {
+        ret = mbedtls_snprintf(p, n, "\nCertificate is uninitialised!\n");
         MBEDTLS_X509_SAFE_SNPRINTF;
 
-        return( (int) ( size - n ) );
+        return ((int)(size - n));
     }
 
-    ret = mbedtls_snprintf( p, n, "%scert. version     : %d\n",
-                               prefix, crt->version );
+    ret = mbedtls_snprintf(p, n, "%scert. version     : %d\n",
+                           prefix, crt->version);
     MBEDTLS_X509_SAFE_SNPRINTF;
-    ret = mbedtls_snprintf( p, n, "%sserial number     : ",
-                               prefix );
+    ret = mbedtls_snprintf(p, n, "%sserial number     : ",
+                           prefix);
     MBEDTLS_X509_SAFE_SNPRINTF;
 
-    ret = mbedtls_x509_serial_gets( p, n, &crt->serial );
+    ret = mbedtls_x509_serial_gets(p, n, &crt->serial);
     MBEDTLS_X509_SAFE_SNPRINTF;
 
-    ret = mbedtls_snprintf( p, n, "\n%sissuer name       : ", prefix );
+    ret = mbedtls_snprintf(p, n, "\n%sissuer name       : ", prefix);
     MBEDTLS_X509_SAFE_SNPRINTF;
-    ret = mbedtls_x509_dn_gets( p, n, &crt->issuer  );
+    ret = mbedtls_x509_dn_gets(p, n, &crt->issuer);
     MBEDTLS_X509_SAFE_SNPRINTF;
 
-    ret = mbedtls_snprintf( p, n, "\n%ssubject name      : ", prefix );
+    ret = mbedtls_snprintf(p, n, "\n%ssubject name      : ", prefix);
     MBEDTLS_X509_SAFE_SNPRINTF;
-    ret = mbedtls_x509_dn_gets( p, n, &crt->subject );
+    ret = mbedtls_x509_dn_gets(p, n, &crt->subject);
     MBEDTLS_X509_SAFE_SNPRINTF;
 
-    ret = mbedtls_snprintf( p, n, "\n%sissued  on        : " \
-                   "%04d-%02d-%02d %02d:%02d:%02d", prefix,
-                   crt->valid_from.year, crt->valid_from.mon,
-                   crt->valid_from.day,  crt->valid_from.hour,
-                   crt->valid_from.min,  crt->valid_from.sec );
+    ret = mbedtls_snprintf(p, n, "\n%sissued  on        : " \
+                           "%04d-%02d-%02d %02d:%02d:%02d", prefix,
+                           crt->valid_from.year, crt->valid_from.mon,
+                           crt->valid_from.day,  crt->valid_from.hour,
+                           crt->valid_from.min,  crt->valid_from.sec);
     MBEDTLS_X509_SAFE_SNPRINTF;
 
-    ret = mbedtls_snprintf( p, n, "\n%sexpires on        : " \
-                   "%04d-%02d-%02d %02d:%02d:%02d", prefix,
-                   crt->valid_to.year, crt->valid_to.mon,
-                   crt->valid_to.day,  crt->valid_to.hour,
-                   crt->valid_to.min,  crt->valid_to.sec );
+    ret = mbedtls_snprintf(p, n, "\n%sexpires on        : " \
+                           "%04d-%02d-%02d %02d:%02d:%02d", prefix,
+                           crt->valid_to.year, crt->valid_to.mon,
+                           crt->valid_to.day,  crt->valid_to.hour,
+                           crt->valid_to.min,  crt->valid_to.sec);
     MBEDTLS_X509_SAFE_SNPRINTF;
 
-    ret = mbedtls_snprintf( p, n, "\n%ssigned using      : ", prefix );
+    ret = mbedtls_snprintf(p, n, "\n%ssigned using      : ", prefix);
     MBEDTLS_X509_SAFE_SNPRINTF;
 
-    ret = mbedtls_x509_sig_alg_gets( p, n, &crt->sig_oid, crt->sig_pk,
-                             crt->sig_md, crt->sig_opts );
+    ret = mbedtls_x509_sig_alg_gets(p, n, &crt->sig_oid, crt->sig_pk,
+                                    crt->sig_md, crt->sig_opts);
     MBEDTLS_X509_SAFE_SNPRINTF;
 
     /* Key size */
-    if( ( ret = mbedtls_x509_key_size_helper( key_size_str, BEFORE_COLON,
-                                      mbedtls_pk_get_name( &crt->pk ) ) ) != 0 )
-    {
-        return( ret );
+    if ((ret = mbedtls_x509_key_size_helper(key_size_str, BEFORE_COLON,
+                                            mbedtls_pk_get_name(&crt->pk))) != 0) {
+        return (ret);
     }
 
-    ret = mbedtls_snprintf( p, n, "\n%s%-" BC "s: %d bits", prefix, key_size_str,
-                          (int) mbedtls_pk_get_bitlen( &crt->pk ) );
+    ret = mbedtls_snprintf(p, n, "\n%s%-" BC "s: %d bits", prefix, key_size_str,
+                           (int) mbedtls_pk_get_bitlen(&crt->pk));
     MBEDTLS_X509_SAFE_SNPRINTF;
 
     /*
      * Optional extensions
      */
 
-    if( crt->ext_types & MBEDTLS_X509_EXT_BASIC_CONSTRAINTS )
-    {
-        ret = mbedtls_snprintf( p, n, "\n%sbasic constraints : CA=%s", prefix,
-                        crt->ca_istrue ? "true" : "false" );
+    if (crt->ext_types & MBEDTLS_X509_EXT_BASIC_CONSTRAINTS) {
+        ret = mbedtls_snprintf(p, n, "\n%sbasic constraints : CA=%s", prefix,
+                               crt->ca_istrue ? "true" : "false");
         MBEDTLS_X509_SAFE_SNPRINTF;
 
-        if( crt->max_pathlen > 0 )
-        {
-            ret = mbedtls_snprintf( p, n, ", max_pathlen=%d", crt->max_pathlen - 1 );
+        if (crt->max_pathlen > 0) {
+            ret = mbedtls_snprintf(p, n, ", max_pathlen=%d", crt->max_pathlen - 1);
             MBEDTLS_X509_SAFE_SNPRINTF;
         }
     }
 
-    if( crt->ext_types & MBEDTLS_X509_EXT_SUBJECT_ALT_NAME )
-    {
-        ret = mbedtls_snprintf( p, n, "\n%ssubject alt name  : ", prefix );
+    if (crt->ext_types & MBEDTLS_X509_EXT_SUBJECT_ALT_NAME) {
+        ret = mbedtls_snprintf(p, n, "\n%ssubject alt name  : ", prefix);
         MBEDTLS_X509_SAFE_SNPRINTF;
 
-        if( ( ret = x509_info_subject_alt_name( &p, &n,
-                                            &crt->subject_alt_names ) ) != 0 )
-            return( ret );
+        if ((ret = x509_info_subject_alt_name(&p, &n,
+                                              &crt->subject_alt_names)) != 0)
+            return (ret);
     }
 
-    if( crt->ext_types & MBEDTLS_X509_EXT_NS_CERT_TYPE )
-    {
-        ret = mbedtls_snprintf( p, n, "\n%scert. type        : ", prefix );
+    if (crt->ext_types & MBEDTLS_X509_EXT_NS_CERT_TYPE) {
+        ret = mbedtls_snprintf(p, n, "\n%scert. type        : ", prefix);
         MBEDTLS_X509_SAFE_SNPRINTF;
 
-        if( ( ret = x509_info_cert_type( &p, &n, crt->ns_cert_type ) ) != 0 )
-            return( ret );
+        if ((ret = x509_info_cert_type(&p, &n, crt->ns_cert_type)) != 0)
+            return (ret);
     }
 
-    if( crt->ext_types & MBEDTLS_X509_EXT_KEY_USAGE )
-    {
-        ret = mbedtls_snprintf( p, n, "\n%skey usage         : ", prefix );
+    if (crt->ext_types & MBEDTLS_X509_EXT_KEY_USAGE) {
+        ret = mbedtls_snprintf(p, n, "\n%skey usage         : ", prefix);
         MBEDTLS_X509_SAFE_SNPRINTF;
 
-        if( ( ret = x509_info_key_usage( &p, &n, crt->key_usage ) ) != 0 )
-            return( ret );
+        if ((ret = x509_info_key_usage(&p, &n, crt->key_usage)) != 0)
+            return (ret);
     }
 
-    if( crt->ext_types & MBEDTLS_X509_EXT_EXTENDED_KEY_USAGE )
-    {
-        ret = mbedtls_snprintf( p, n, "\n%sext key usage     : ", prefix );
+    if (crt->ext_types & MBEDTLS_X509_EXT_EXTENDED_KEY_USAGE) {
+        ret = mbedtls_snprintf(p, n, "\n%sext key usage     : ", prefix);
         MBEDTLS_X509_SAFE_SNPRINTF;
 
-        if( ( ret = x509_info_ext_key_usage( &p, &n,
-                                             &crt->ext_key_usage ) ) != 0 )
-            return( ret );
+        if ((ret = x509_info_ext_key_usage(&p, &n,
+                                           &crt->ext_key_usage)) != 0)
+            return (ret);
     }
 
-    ret = mbedtls_snprintf( p, n, "\n" );
+    ret = mbedtls_snprintf(p, n, "\n");
     MBEDTLS_X509_SAFE_SNPRINTF;
 
-    return( (int) ( size - n ) );
+    return ((int)(size - n));
 }
 
 struct x509_crt_verify_string {
@@ -1543,88 +1470,84 @@ static const struct x509_crt_verify_string x509_crt_verify_strings[] = {
     { 0, NULL }
 };
 
-int mbedtls_x509_crt_verify_info( char *buf, size_t size, const char *prefix,
-                          uint32_t flags )
+int mbedtls_x509_crt_verify_info(char *buf, size_t size, const char *prefix,
+                                 uint32_t flags)
 {
     int ret;
     const struct x509_crt_verify_string *cur;
     char *p = buf;
     size_t n = size;
 
-    for( cur = x509_crt_verify_strings; cur->string != NULL ; cur++ )
-    {
-        if( ( flags & cur->code ) == 0 )
+    for (cur = x509_crt_verify_strings; cur->string != NULL ; cur++) {
+        if ((flags & cur->code) == 0)
             continue;
 
-        ret = mbedtls_snprintf( p, n, "%s%s\n", prefix, cur->string );
+        ret = mbedtls_snprintf(p, n, "%s%s\n", prefix, cur->string);
         MBEDTLS_X509_SAFE_SNPRINTF;
         flags ^= cur->code;
     }
 
-    if( flags != 0 )
-    {
-        ret = mbedtls_snprintf( p, n, "%sUnknown reason "
-                                       "(this should not happen)\n", prefix );
+    if (flags != 0) {
+        ret = mbedtls_snprintf(p, n, "%sUnknown reason "
+                               "(this should not happen)\n", prefix);
         MBEDTLS_X509_SAFE_SNPRINTF;
     }
 
-    return( (int) ( size - n ) );
+    return ((int)(size - n));
 }
 
 #if defined(MBEDTLS_X509_CHECK_KEY_USAGE)
-int mbedtls_x509_crt_check_key_usage( const mbedtls_x509_crt *crt,
-                                      unsigned int usage )
+int mbedtls_x509_crt_check_key_usage(const mbedtls_x509_crt *crt,
+                                     unsigned int usage)
 {
     unsigned int usage_must, usage_may;
     unsigned int may_mask = MBEDTLS_X509_KU_ENCIPHER_ONLY
-                          | MBEDTLS_X509_KU_DECIPHER_ONLY;
+                            | MBEDTLS_X509_KU_DECIPHER_ONLY;
 
-    if( ( crt->ext_types & MBEDTLS_X509_EXT_KEY_USAGE ) == 0 )
-        return( 0 );
+    if ((crt->ext_types & MBEDTLS_X509_EXT_KEY_USAGE) == 0)
+        return (0);
 
     usage_must = usage & ~may_mask;
 
-    if( ( ( crt->key_usage & ~may_mask ) & usage_must ) != usage_must )
-        return( MBEDTLS_ERR_X509_BAD_INPUT_DATA );
+    if (((crt->key_usage & ~may_mask) & usage_must) != usage_must)
+        return (MBEDTLS_ERR_X509_BAD_INPUT_DATA);
 
     usage_may = usage & may_mask;
 
-    if( ( ( crt->key_usage & may_mask ) | usage_may ) != usage_may )
-        return( MBEDTLS_ERR_X509_BAD_INPUT_DATA );
+    if (((crt->key_usage & may_mask) | usage_may) != usage_may)
+        return (MBEDTLS_ERR_X509_BAD_INPUT_DATA);
 
-    return( 0 );
+    return (0);
 }
 #endif
 
 #if defined(MBEDTLS_X509_CHECK_EXTENDED_KEY_USAGE)
-int mbedtls_x509_crt_check_extended_key_usage( const mbedtls_x509_crt *crt,
-                                       const char *usage_oid,
-                                       size_t usage_len )
+int mbedtls_x509_crt_check_extended_key_usage(const mbedtls_x509_crt *crt,
+                                              const char *usage_oid,
+                                              size_t usage_len)
 {
     const mbedtls_x509_sequence *cur;
 
     /* Extension is not mandatory, absent means no restriction */
-    if( ( crt->ext_types & MBEDTLS_X509_EXT_EXTENDED_KEY_USAGE ) == 0 )
-        return( 0 );
+    if ((crt->ext_types & MBEDTLS_X509_EXT_EXTENDED_KEY_USAGE) == 0)
+        return (0);
 
     /*
      * Look for the requested usage (or wildcard ANY) in our list
      */
-    for( cur = &crt->ext_key_usage; cur != NULL; cur = cur->next )
-    {
+    for (cur = &crt->ext_key_usage; cur != NULL; cur = cur->next) {
         const mbedtls_x509_buf *cur_oid = &cur->buf;
 
-        if( cur_oid->len == usage_len &&
-            memcmp( cur_oid->p, usage_oid, usage_len ) == 0 )
-        {
-            return( 0 );
+        if (cur_oid->len == usage_len &&
+            memcmp(cur_oid->p, usage_oid, usage_len) == 0) {
+            return (0);
         }
 
-        if( MBEDTLS_OID_CMP( MBEDTLS_OID_ANY_EXTENDED_KEY_USAGE, cur_oid ) == 0 )
-            return( 0 );
+        if (MBEDTLS_OID_CMP(MBEDTLS_OID_ANY_EXTENDED_KEY_USAGE, cur_oid) == 0)
+            return (0);
     }
 
-    return( MBEDTLS_ERR_X509_BAD_INPUT_DATA );
+    return (MBEDTLS_ERR_X509_BAD_INPUT_DATA);
 }
 #endif /* MBEDTLS_X509_CHECK_EXTENDED_KEY_USAGE */
 
@@ -1632,47 +1555,43 @@ int mbedtls_x509_crt_check_extended_key_usage( const mbedtls_x509_crt *crt,
 /*
  * Return 1 if the certificate is revoked, or 0 otherwise.
  */
-int mbedtls_x509_crt_is_revoked( const mbedtls_x509_crt *crt, const mbedtls_x509_crl *crl )
+int mbedtls_x509_crt_is_revoked(const mbedtls_x509_crt *crt, const mbedtls_x509_crl *crl)
 {
     const mbedtls_x509_crl_entry *cur = &crl->entry;
 
-    while( cur != NULL && cur->serial.len != 0 )
-    {
-        if( crt->serial.len == cur->serial.len &&
-            memcmp( crt->serial.p, cur->serial.p, crt->serial.len ) == 0 )
-        {
-            if( mbedtls_x509_time_is_past( &cur->revocation_date ) )
-                return( 1 );
+    while (cur != NULL && cur->serial.len != 0) {
+        if (crt->serial.len == cur->serial.len &&
+            memcmp(crt->serial.p, cur->serial.p, crt->serial.len) == 0) {
+            if (mbedtls_x509_time_is_past(&cur->revocation_date))
+                return (1);
         }
 
         cur = cur->next;
     }
 
-    return( 0 );
+    return (0);
 }
 
 /*
  * Check that the given certificate is not revoked according to the CRL.
  * Skip validation if no CRL for the given CA is present.
  */
-static int x509_crt_verifycrl( mbedtls_x509_crt *crt, mbedtls_x509_crt *ca,
-                               mbedtls_x509_crl *crl_list,
-                               const mbedtls_x509_crt_profile *profile )
+static int x509_crt_verifycrl(mbedtls_x509_crt *crt, mbedtls_x509_crt *ca,
+                              mbedtls_x509_crl *crl_list,
+                              const mbedtls_x509_crt_profile *profile)
 {
     int flags = 0;
     unsigned char hash[MBEDTLS_MD_MAX_SIZE];
     const mbedtls_md_info_t *md_info;
 
-    if( ca == NULL )
-        return( flags );
+    if (ca == NULL)
+        return (flags);
 
-    while( crl_list != NULL )
-    {
-        if( crl_list->version == 0 ||
+    while (crl_list != NULL) {
+        if (crl_list->version == 0 ||
             crl_list->issuer_raw.len != ca->subject_raw.len ||
-            memcmp( crl_list->issuer_raw.p, ca->subject_raw.p,
-                    crl_list->issuer_raw.len ) != 0 )
-        {
+            memcmp(crl_list->issuer_raw.p, ca->subject_raw.p,
+                   crl_list->issuer_raw.len) != 0) {
             crl_list = crl_list->next;
             continue;
         }
@@ -1681,8 +1600,7 @@ static int x509_crt_verifycrl( mbedtls_x509_crt *crt, mbedtls_x509_crt *ca,
          * Check if the CA is configured to sign CRLs
          */
 #if defined(MBEDTLS_X509_CHECK_KEY_USAGE)
-        if( mbedtls_x509_crt_check_key_usage( ca, MBEDTLS_X509_KU_CRL_SIGN ) != 0 )
-        {
+        if (mbedtls_x509_crt_check_key_usage(ca, MBEDTLS_X509_KU_CRL_SIGN) != 0) {
             flags |= MBEDTLS_X509_BADCRL_NOT_TRUSTED;
             break;
         }
@@ -1691,27 +1609,25 @@ static int x509_crt_verifycrl( mbedtls_x509_crt *crt, mbedtls_x509_crt *ca,
         /*
          * Check if CRL is correctly signed by the trusted CA
          */
-        if( x509_profile_check_md_alg( profile, crl_list->sig_md ) != 0 )
+        if (x509_profile_check_md_alg(profile, crl_list->sig_md) != 0)
             flags |= MBEDTLS_X509_BADCRL_BAD_MD;
 
-        if( x509_profile_check_pk_alg( profile, crl_list->sig_pk ) != 0 )
+        if (x509_profile_check_pk_alg(profile, crl_list->sig_pk) != 0)
             flags |= MBEDTLS_X509_BADCRL_BAD_PK;
 
-        md_info = mbedtls_md_info_from_type( crl_list->sig_md );
-        if( mbedtls_md( md_info, crl_list->tbs.p, crl_list->tbs.len, hash ) != 0 )
-        {
+        md_info = mbedtls_md_info_from_type(crl_list->sig_md);
+        if (mbedtls_md(md_info, crl_list->tbs.p, crl_list->tbs.len, hash) != 0) {
             /* Note: this can't happen except after an internal error */
             flags |= MBEDTLS_X509_BADCRL_NOT_TRUSTED;
             break;
         }
 
-        if( x509_profile_check_key( profile, &ca->pk ) != 0 )
+        if (x509_profile_check_key(profile, &ca->pk) != 0)
             flags |= MBEDTLS_X509_BADCERT_BAD_KEY;
 
-        if( mbedtls_pk_verify_ext( crl_list->sig_pk, crl_list->sig_opts, &ca->pk,
-                           crl_list->sig_md, hash, mbedtls_md_get_size( md_info ),
-                           crl_list->sig.p, crl_list->sig.len ) != 0 )
-        {
+        if (mbedtls_pk_verify_ext(crl_list->sig_pk, crl_list->sig_opts, &ca->pk,
+                                  crl_list->sig_md, hash, mbedtls_md_get_size(md_info),
+                                  crl_list->sig.p, crl_list->sig.len) != 0) {
             flags |= MBEDTLS_X509_BADCRL_NOT_TRUSTED;
             break;
         }
@@ -1719,17 +1635,16 @@ static int x509_crt_verifycrl( mbedtls_x509_crt *crt, mbedtls_x509_crt *ca,
         /*
          * Check for validity of CRL (Do not drop out)
          */
-        if( mbedtls_x509_time_is_past( &crl_list->next_update ) )
+        if (mbedtls_x509_time_is_past(&crl_list->next_update))
             flags |= MBEDTLS_X509_BADCRL_EXPIRED;
 
-        if( mbedtls_x509_time_is_future( &crl_list->this_update ) )
+        if (mbedtls_x509_time_is_future(&crl_list->this_update))
             flags |= MBEDTLS_X509_BADCRL_FUTURE;
 
         /*
          * Check if certificate is revoked
          */
-        if( mbedtls_x509_crt_is_revoked( crt, crl_list ) )
-        {
+        if (mbedtls_x509_crt_is_revoked(crt, crl_list)) {
             flags |= MBEDTLS_X509_BADCERT_REVOKED;
             break;
         }
@@ -1737,70 +1652,65 @@ static int x509_crt_verifycrl( mbedtls_x509_crt *crt, mbedtls_x509_crt *ca,
         crl_list = crl_list->next;
     }
 
-    return( flags );
+    return (flags);
 }
 #endif /* MBEDTLS_X509_CRL_PARSE_C */
 
 /*
  * Like memcmp, but case-insensitive and always returns -1 if different
  */
-static int x509_memcasecmp( const void *s1, const void *s2, size_t len )
+static int x509_memcasecmp(const void *s1, const void *s2, size_t len)
 {
     size_t i;
     unsigned char diff;
     const unsigned char *n1 = s1, *n2 = s2;
 
-    for( i = 0; i < len; i++ )
-    {
+    for (i = 0; i < len; i++) {
         diff = n1[i] ^ n2[i];
 
-        if( diff == 0 )
+        if (diff == 0)
             continue;
 
-        if( diff == 32 &&
-            ( ( n1[i] >= 'a' && n1[i] <= 'z' ) ||
-              ( n1[i] >= 'A' && n1[i] <= 'Z' ) ) )
-        {
+        if (diff == 32 &&
+            ((n1[i] >= 'a' && n1[i] <= 'z') ||
+             (n1[i] >= 'A' && n1[i] <= 'Z'))) {
             continue;
         }
 
-        return( -1 );
+        return (-1);
     }
 
-    return( 0 );
+    return (0);
 }
 
 /*
  * Return 0 if name matches wildcard, -1 otherwise
  */
-static int x509_check_wildcard( const char *cn, const mbedtls_x509_buf *name )
+static int x509_check_wildcard(const char *cn, const mbedtls_x509_buf *name)
 {
     size_t i;
-    size_t cn_idx = 0, cn_len = strlen( cn );
+    size_t cn_idx = 0, cn_len = strlen(cn);
 
     /* We can't have a match if there is no wildcard to match */
-    if( name->len < 3 || name->p[0] != '*' || name->p[1] != '.' )
-        return( -1 );
+    if (name->len < 3 || name->p[0] != '*' || name->p[1] != '.')
+        return (-1);
 
-    for( i = 0; i < cn_len; ++i )
-    {
-        if( cn[i] == '.' )
-        {
+    for (i = 0; i < cn_len; ++i) {
+        if (cn[i] == '.') {
             cn_idx = i;
             break;
         }
     }
 
-    if( cn_idx == 0 )
-        return( -1 );
+    if (cn_idx == 0)
+        return (-1);
 
-    if( cn_len - cn_idx == name->len - 1 &&
-        x509_memcasecmp( name->p + 1, cn + cn_idx, name->len - 1 ) == 0 )
-    {
-        return( 0 );
+    if (cn_len - cn_idx == name->len - 1 &&
+        x509_memcasecmp(name->p + 1, cn + cn_idx, name->len - 1) == 0) {
+        return (0);
     }
 
-    return( -1 );
+    return (-1);
 }
 
 /*
@@ -1809,24 +1719,22 @@ static int x509_check_wildcard( const char *cn, const mbedtls_x509_buf *name )
  *
  * Return 0 if equal, -1 otherwise.
  */
-static int x509_string_cmp( const mbedtls_x509_buf *a, const mbedtls_x509_buf *b )
+static int x509_string_cmp(const mbedtls_x509_buf *a, const mbedtls_x509_buf *b)
 {
-    if( a->tag == b->tag &&
+    if (a->tag == b->tag &&
         a->len == b->len &&
-        memcmp( a->p, b->p, b->len ) == 0 )
-    {
-        return( 0 );
+        memcmp(a->p, b->p, b->len) == 0) {
+        return (0);
     }
 
-    if( ( a->tag == MBEDTLS_ASN1_UTF8_STRING || a->tag == MBEDTLS_ASN1_PRINTABLE_STRING ) &&
-        ( b->tag == MBEDTLS_ASN1_UTF8_STRING || b->tag == MBEDTLS_ASN1_PRINTABLE_STRING ) &&
+    if ((a->tag == MBEDTLS_ASN1_UTF8_STRING || a->tag == MBEDTLS_ASN1_PRINTABLE_STRING) &&
+        (b->tag == MBEDTLS_ASN1_UTF8_STRING || b->tag == MBEDTLS_ASN1_PRINTABLE_STRING) &&
         a->len == b->len &&
-        x509_memcasecmp( a->p, b->p, b->len ) == 0 )
-    {
-        return( 0 );
+        x509_memcasecmp(a->p, b->p, b->len) == 0) {
+        return (0);
     }
 
-    return( -1 );
+    return (-1);
 }
 
 /*
@@ -1839,62 +1747,58 @@ static int x509_string_cmp( const mbedtls_x509_buf *a, const mbedtls_x509_buf *b
  *
  * Return 0 if equal, -1 otherwise.
  */
-static int x509_name_cmp( const mbedtls_x509_name *a, const mbedtls_x509_name *b )
+static int x509_name_cmp(const mbedtls_x509_name *a, const mbedtls_x509_name *b)
 {
     /* Avoid recursion, it might not be optimised by the compiler */
-    while( a != NULL || b != NULL )
-    {
-        if( a == NULL || b == NULL )
-            return( -1 );
+    while (a != NULL || b != NULL) {
+        if (a == NULL || b == NULL)
+            return (-1);
 
         /* type */
-        if( a->oid.tag != b->oid.tag ||
+        if (a->oid.tag != b->oid.tag ||
             a->oid.len != b->oid.len ||
-            memcmp( a->oid.p, b->oid.p, b->oid.len ) != 0 )
-        {
-            return( -1 );
+            memcmp(a->oid.p, b->oid.p, b->oid.len) != 0) {
+            return (-1);
         }
 
         /* value */
-        if( x509_string_cmp( &a->val, &b->val ) != 0 )
-            return( -1 );
+        if (x509_string_cmp(&a->val, &b->val) != 0)
+            return (-1);
 
         /* structure of the list of sets */
-        if( a->next_merged != b->next_merged )
-            return( -1 );
+        if (a->next_merged != b->next_merged)
+            return (-1);
 
         a = a->next;
         b = b->next;
     }
 
     /* a == NULL == b */
-    return( 0 );
+    return (0);
 }
 
 /*
  * Check the signature of a certificate by its parent
  */
-static int x509_crt_check_signature( const mbedtls_x509_crt *child,
-                                     mbedtls_x509_crt *parent )
+static int x509_crt_check_signature(const mbedtls_x509_crt *child,
+                                    mbedtls_x509_crt *parent)
 {
     const mbedtls_md_info_t *md_info;
     unsigned char hash[MBEDTLS_MD_MAX_SIZE];
 
-    md_info = mbedtls_md_info_from_type( child->sig_md );
-    if( mbedtls_md( md_info, child->tbs.p, child->tbs.len, hash ) != 0 )
-    {
+    md_info = mbedtls_md_info_from_type(child->sig_md);
+    if (mbedtls_md(md_info, child->tbs.p, child->tbs.len, hash) != 0) {
         /* Note: this can't happen except after an internal error */
-        return( -1 );
+        return (-1);
     }
 
-    if( mbedtls_pk_verify_ext( child->sig_pk, child->sig_opts, &parent->pk,
-                child->sig_md, hash, mbedtls_md_get_size( md_info ),
-                child->sig.p, child->sig.len ) != 0 )
-    {
-        return( -1 );
+    if (mbedtls_pk_verify_ext(child->sig_pk, child->sig_opts, &parent->pk,
+                              child->sig_md, hash, mbedtls_md_get_size(md_info),
+                              child->sig.p, child->sig.len) != 0) {
+        return (-1);
     }
 
-    return( 0 );
+    return (0);
 }
 
 /*
@@ -1903,35 +1807,34 @@ static int x509_crt_check_signature( const mbedtls_x509_crt *child,
  *
  * top means parent is a locally-trusted certificate
  */
-static int x509_crt_check_parent( const mbedtls_x509_crt *child,
-                                  const mbedtls_x509_crt *parent,
-                                  int top )
+static int x509_crt_check_parent(const mbedtls_x509_crt *child,
+                                 const mbedtls_x509_crt *parent,
+                                 int top)
 {
     int need_ca_bit;
 
     /* Parent must be the issuer */
-    if( x509_name_cmp( &child->issuer, &parent->subject ) != 0 )
-        return( -1 );
+    if (x509_name_cmp(&child->issuer, &parent->subject) != 0)
+        return (-1);
 
     /* Parent must have the basicConstraints CA bit set as a general rule */
     need_ca_bit = 1;
 
     /* Exception: v1/v2 certificates that are locally trusted. */
-    if( top && parent->version < 3 )
+    if (top && parent->version < 3)
         need_ca_bit = 0;
 
-    if( need_ca_bit && ! parent->ca_istrue )
-        return( -1 );
+    if (need_ca_bit && ! parent->ca_istrue)
+        return (-1);
 
 #if defined(MBEDTLS_X509_CHECK_KEY_USAGE)
-    if( need_ca_bit &&
-        mbedtls_x509_crt_check_key_usage( parent, MBEDTLS_X509_KU_KEY_CERT_SIGN ) != 0 )
-    {
-        return( -1 );
+    if (need_ca_bit &&
+        mbedtls_x509_crt_check_key_usage(parent, MBEDTLS_X509_KU_KEY_CERT_SIGN) != 0) {
+        return (-1);
     }
 #endif
 
-    return( 0 );
+    return (0);
 }
 
 /*
@@ -1973,38 +1876,34 @@ static int x509_crt_check_parent( const mbedtls_x509_crt *child,
  *  - the first suitable parent found (see above regarding time-validity)
  *  - NULL if no suitable parent was found
  */
-static mbedtls_x509_crt *x509_crt_find_parent_in( mbedtls_x509_crt *child,
-                                                  mbedtls_x509_crt *candidates,
-                                                  int top,
-                                                  size_t path_cnt,
-                                                  size_t self_cnt )
+static mbedtls_x509_crt *x509_crt_find_parent_in(mbedtls_x509_crt *child,
+                                                 mbedtls_x509_crt *candidates,
+                                                 int top,
+                                                 size_t path_cnt,
+                                                 size_t self_cnt)
 {
     mbedtls_x509_crt *parent, *badtime_parent = NULL;
 
-    for( parent = candidates; parent != NULL; parent = parent->next )
-    {
+    for (parent = candidates; parent != NULL; parent = parent->next) {
         /* basic parenting skills (name, CA bit, key usage) */
-        if( x509_crt_check_parent( child, parent, top ) != 0 )
+        if (x509_crt_check_parent(child, parent, top) != 0)
             continue;
 
         /* +1 because stored max_pathlen is 1 higher that the actual value */
-        if( parent->max_pathlen > 0 &&
-            (size_t) parent->max_pathlen < 1 + path_cnt - self_cnt )
-        {
+        if (parent->max_pathlen > 0 &&
+            (size_t) parent->max_pathlen < 1 + path_cnt - self_cnt) {
             continue;
         }
 
         /* Signature */
-        if( top && x509_crt_check_signature( child, parent ) != 0 )
-        {
+        if (top && x509_crt_check_signature(child, parent) != 0) {
             continue;
         }
 
         /* optional time check */
-        if( mbedtls_x509_time_is_past( &parent->valid_to ) ||
-            mbedtls_x509_time_is_future( &parent->valid_from ) )
-        {
-            if( badtime_parent == NULL )
+        if (mbedtls_x509_time_is_past(&parent->valid_to) ||
+            mbedtls_x509_time_is_future(&parent->valid_from)) {
+            if (badtime_parent == NULL)
                 badtime_parent = parent;
 
             continue;
@@ -2013,10 +1912,10 @@ static mbedtls_x509_crt *x509_crt_find_parent_in( mbedtls_x509_crt *child,
         break;
     }
 
-    if( parent == NULL )
+    if (parent == NULL)
         parent = badtime_parent;
 
-    return( parent );
+    return (parent);
 }
 
 /*
@@ -2038,24 +1937,24 @@ static mbedtls_x509_crt *x509_crt_find_parent_in( mbedtls_x509_crt *child,
  *  - the first suitable parent found (see find_parent_in() for "suitable")
  *  - NULL if no suitable parent was found
  */
-static mbedtls_x509_crt *x509_crt_find_parent( mbedtls_x509_crt *child,
-                                               mbedtls_x509_crt *trust_ca,
-                                               int *parent_is_trusted,
-                                               size_t path_cnt,
-                                               size_t self_cnt )
+static mbedtls_x509_crt *x509_crt_find_parent(mbedtls_x509_crt *child,
+                                              mbedtls_x509_crt *trust_ca,
+                                              int *parent_is_trusted,
+                                              size_t path_cnt,
+                                              size_t self_cnt)
 {
     mbedtls_x509_crt *parent;
 
     /* Look for a parent in trusted CAs */
     *parent_is_trusted = 1;
-    parent = x509_crt_find_parent_in( child, trust_ca, 1, path_cnt, self_cnt );
+    parent = x509_crt_find_parent_in(child, trust_ca, 1, path_cnt, self_cnt);
 
-    if( parent != NULL )
-        return( parent );
+    if (parent != NULL)
+        return (parent);
 
     /* Look for a parent upwards the chain */
     *parent_is_trusted = 0;
-    return( x509_crt_find_parent_in( child, child->next, 0, path_cnt, self_cnt ) );
+    return (x509_crt_find_parent_in(child, child->next, 0, path_cnt, self_cnt));
 }
 
 /*
@@ -2065,27 +1964,25 @@ static mbedtls_x509_crt *x509_crt_find_parent( mbedtls_x509_crt *child,
  * check for self-issued as self-signatures are not checked)
  */
 static int x509_crt_check_ee_locally_trusted(
-                    mbedtls_x509_crt *crt,
-                    mbedtls_x509_crt *trust_ca )
+    mbedtls_x509_crt *crt,
+    mbedtls_x509_crt *trust_ca)
 {
     mbedtls_x509_crt *cur;
 
     /* must be self-issued */
-    if( x509_name_cmp( &crt->issuer, &crt->subject ) != 0 )
-        return( -1 );
+    if (x509_name_cmp(&crt->issuer, &crt->subject) != 0)
+        return (-1);
 
     /* look for an exact match with trusted cert */
-    for( cur = trust_ca; cur != NULL; cur = cur->next )
-    {
-        if( crt->raw.len == cur->raw.len &&
-            memcmp( crt->raw.p, cur->raw.p, crt->raw.len ) == 0 )
-        {
-            return( 0 );
+    for (cur = trust_ca; cur != NULL; cur = cur->next) {
+        if (crt->raw.len == cur->raw.len &&
+            memcmp(crt->raw.p, cur->raw.p, crt->raw.len) == 0) {
+            return (0);
         }
     }
 
     /* too bad */
-    return( -1 );
+    return (-1);
 }
 
 /*
@@ -2116,12 +2013,12 @@ static int x509_crt_check_ee_locally_trusted(
  *      even if it was found to be invalid
  */
 static int x509_crt_verify_chain(
-                mbedtls_x509_crt *crt,
-                mbedtls_x509_crt *trust_ca,
-                mbedtls_x509_crl *ca_crl,
-                const mbedtls_x509_crt_profile *profile,
-                x509_crt_verify_chain_item ver_chain[X509_MAX_VERIFY_CHAIN_SIZE],
-                size_t *chain_len )
+    mbedtls_x509_crt *crt,
+    mbedtls_x509_crt *trust_ca,
+    mbedtls_x509_crl *ca_crl,
+    const mbedtls_x509_crt_profile *profile,
+    x509_crt_verify_chain_item ver_chain[X509_MAX_VERIFY_CHAIN_SIZE],
+    size_t *chain_len)
 {
     uint32_t *flags;
     mbedtls_x509_crt *child;
@@ -2133,77 +2030,73 @@ static int x509_crt_verify_chain(
     child = crt;
     *chain_len = 0;
 
-    while( 1 ) {
+    while (1) {
         /* Add certificate to the verification chain */
         ver_chain[*chain_len].crt = child;
         flags = &ver_chain[*chain_len].flags;
         ++*chain_len;
 
         /* Check time-validity (all certificates) */
-        if( mbedtls_x509_time_is_past( &child->valid_to ) )
+        if (mbedtls_x509_time_is_past(&child->valid_to))
             *flags |= MBEDTLS_X509_BADCERT_EXPIRED;
 
-        if( mbedtls_x509_time_is_future( &child->valid_from ) )
+        if (mbedtls_x509_time_is_future(&child->valid_from))
             *flags |= MBEDTLS_X509_BADCERT_FUTURE;
 
         /* Stop here for trusted roots (but not for trusted EE certs) */
-        if( child_is_trusted )
-            return( 0 );
+        if (child_is_trusted)
+            return (0);
 
         /* Check signature algorithm: MD & PK algs */
-        if( x509_profile_check_md_alg( profile, child->sig_md ) != 0 )
+        if (x509_profile_check_md_alg(profile, child->sig_md) != 0)
             *flags |= MBEDTLS_X509_BADCERT_BAD_MD;
 
-        if( x509_profile_check_pk_alg( profile, child->sig_pk ) != 0 )
+        if (x509_profile_check_pk_alg(profile, child->sig_pk) != 0)
             *flags |= MBEDTLS_X509_BADCERT_BAD_PK;
 
         /* Special case: EE certs that are locally trusted */
-        if( *chain_len == 1 &&
-            x509_crt_check_ee_locally_trusted( child, trust_ca ) == 0 )
-        {
-            return( 0 );
+        if (*chain_len == 1 &&
+            x509_crt_check_ee_locally_trusted(child, trust_ca) == 0) {
+            return (0);
         }
 
         /* Look for a parent in trusted CAs or up the chain */
-        parent = x509_crt_find_parent( child, trust_ca, &parent_is_trusted,
-                                       *chain_len - 1, self_cnt );
+        parent = x509_crt_find_parent(child, trust_ca, &parent_is_trusted,
+                                      *chain_len - 1, self_cnt);
 
         /* No parent? We're done here */
-        if( parent == NULL )
-        {
+        if (parent == NULL) {
             *flags |= MBEDTLS_X509_BADCERT_NOT_TRUSTED;
-            return( 0 );
+            return (0);
         }
 
         /* Count intermediate self-issued (not necessarily self-signed) certs.
          * These can occur with some strategies for key rollover, see [SIRO],
          * and should be excluded from max_pathlen checks. */
-        if( *chain_len != 1 &&
-            x509_name_cmp( &child->issuer, &child->subject ) == 0 )
-        {
+        if (*chain_len != 1 &&
+            x509_name_cmp(&child->issuer, &child->subject) == 0) {
             self_cnt++;
         }
 
         /* path_cnt is 0 for the first intermediate CA,
          * and if parent is trusted it's not an intermediate CA */
-        if( ! parent_is_trusted &&
-            *chain_len > MBEDTLS_X509_MAX_INTERMEDIATE_CA )
-        {
+        if (! parent_is_trusted &&
+            *chain_len > MBEDTLS_X509_MAX_INTERMEDIATE_CA) {
             /* return immediately to avoid overflow the chain array */
-            return( MBEDTLS_ERR_X509_FATAL_ERROR );
+            return (MBEDTLS_ERR_X509_FATAL_ERROR);
         }
 
         /* if parent is trusted, the signature was checked by find_parent() */
-        if( ! parent_is_trusted && x509_crt_check_signature( child, parent ) != 0 )
+        if (! parent_is_trusted && x509_crt_check_signature(child, parent) != 0)
             *flags |= MBEDTLS_X509_BADCERT_NOT_TRUSTED;
 
         /* check size of signing key */
-        if( x509_profile_check_key( profile, &parent->pk ) != 0 )
+        if (x509_profile_check_key(profile, &parent->pk) != 0)
             *flags |= MBEDTLS_X509_BADCERT_BAD_KEY;
 
 #if defined(MBEDTLS_X509_CRL_PARSE_C)
         /* Check trusted CA's CRL for the given crt */
-        *flags |= x509_crt_verifycrl( child, parent, ca_crl, profile );
+        *flags |= x509_crt_verifycrl(child, parent, ca_crl, profile);
 #else
         (void) ca_crl;
 #endif
@@ -2218,59 +2111,51 @@ static int x509_crt_verify_chain(
 /*
  * Check for CN match
  */
-static int x509_crt_check_cn( const mbedtls_x509_buf *name,
-                              const char *cn, size_t cn_len )
+static int x509_crt_check_cn(const mbedtls_x509_buf *name,
+                             const char *cn, size_t cn_len)
 {
     /* try exact match */
-    if( name->len == cn_len &&
-        x509_memcasecmp( cn, name->p, cn_len ) == 0 )
-    {
-        return( 0 );
+    if (name->len == cn_len &&
+        x509_memcasecmp(cn, name->p, cn_len) == 0) {
+        return (0);
     }
 
     /* try wildcard match */
-    if( x509_check_wildcard( cn, name ) == 0 )
-    {
-        return( 0 );
+    if (x509_check_wildcard(cn, name) == 0) {
+        return (0);
     }
 
-    return( -1 );
+    return (-1);
 }
 
 /*
  * Verify the requested CN - only call this if cn is not NULL!
  */
-static void x509_crt_verify_name( const mbedtls_x509_crt *crt,
-                                  const char *cn,
-                                  uint32_t *flags )
+static void x509_crt_verify_name(const mbedtls_x509_crt *crt,
+                                 const char *cn,
+                                 uint32_t *flags)
 {
     const mbedtls_x509_name *name;
     const mbedtls_x509_sequence *cur;
-    size_t cn_len = strlen( cn );
+    size_t cn_len = strlen(cn);
 
-    if( crt->ext_types & MBEDTLS_X509_EXT_SUBJECT_ALT_NAME )
-    {
-        for( cur = &crt->subject_alt_names; cur != NULL; cur = cur->next )
-        {
-            if( x509_crt_check_cn( &cur->buf, cn, cn_len ) == 0 )
+    if (crt->ext_types & MBEDTLS_X509_EXT_SUBJECT_ALT_NAME) {
+        for (cur = &crt->subject_alt_names; cur != NULL; cur = cur->next) {
+            if (x509_crt_check_cn(&cur->buf, cn, cn_len) == 0)
                 break;
         }
 
-        if( cur == NULL )
+        if (cur == NULL)
             *flags |= MBEDTLS_X509_BADCERT_CN_MISMATCH;
-    }
-    else
-    {
-        for( name = &crt->subject; name != NULL; name = name->next )
-        {
-            if( MBEDTLS_OID_CMP( MBEDTLS_OID_AT_CN, &name->oid ) == 0 &&
-                x509_crt_check_cn( &name->val, cn, cn_len ) == 0 )
-            {
+    } else {
+        for (name = &crt->subject; name != NULL; name = name->next) {
+            if (MBEDTLS_OID_CMP(MBEDTLS_OID_AT_CN, &name->oid) == 0 &&
+                x509_crt_check_cn(&name->val, cn, cn_len) == 0) {
                 break;
             }
         }
 
-        if( name == NULL )
+        if (name == NULL)
             *flags |= MBEDTLS_X509_BADCERT_CN_MISMATCH;
     }
 }
@@ -2279,42 +2164,41 @@ static void x509_crt_verify_name( const mbedtls_x509_crt *crt,
  * Merge the flags for all certs in the chain, after calling callback
  */
 static int x509_crt_merge_flags_with_cb(
-           uint32_t *flags,
-           x509_crt_verify_chain_item ver_chain[X509_MAX_VERIFY_CHAIN_SIZE],
-           size_t chain_len,
-           int (*f_vrfy)(void *, mbedtls_x509_crt *, int, uint32_t *),
-           void *p_vrfy )
+    uint32_t *flags,
+    x509_crt_verify_chain_item ver_chain[X509_MAX_VERIFY_CHAIN_SIZE],
+    size_t chain_len,
+    int (*f_vrfy)(void *, mbedtls_x509_crt *, int, uint32_t *),
+    void *p_vrfy)
 {
     int ret;
     size_t i;
     uint32_t cur_flags;
 
-    for( i = chain_len; i != 0; --i )
-    {
-        cur_flags = ver_chain[i-1].flags;
+    for (i = chain_len; i != 0; --i) {
+        cur_flags = ver_chain[i - 1].flags;
 
-        if( NULL != f_vrfy )
-            if( ( ret = f_vrfy( p_vrfy, ver_chain[i-1].crt, (int) i-1, &cur_flags ) ) != 0 )
-                return( ret );
+        if (NULL != f_vrfy)
+            if ((ret = f_vrfy(p_vrfy, ver_chain[i - 1].crt, (int) i - 1, &cur_flags)) != 0)
+                return (ret);
 
         *flags |= cur_flags;
     }
 
-    return( 0 );
+    return (0);
 }
 
 /*
  * Verify the certificate validity
  */
-int mbedtls_x509_crt_verify( mbedtls_x509_crt *crt,
-                     mbedtls_x509_crt *trust_ca,
-                     mbedtls_x509_crl *ca_crl,
-                     const char *cn, uint32_t *flags,
-                     int (*f_vrfy)(void *, mbedtls_x509_crt *, int, uint32_t *),
-                     void *p_vrfy )
+int mbedtls_x509_crt_verify(mbedtls_x509_crt *crt,
+                            mbedtls_x509_crt *trust_ca,
+                            mbedtls_x509_crl *ca_crl,
+                            const char *cn, uint32_t *flags,
+                            int (*f_vrfy)(void *, mbedtls_x509_crt *, int, uint32_t *),
+                            void *p_vrfy)
 {
-    return( mbedtls_x509_crt_verify_with_profile( crt, trust_ca, ca_crl,
-                &mbedtls_x509_crt_profile_default, cn, flags, f_vrfy, p_vrfy ) );
+    return (mbedtls_x509_crt_verify_with_profile(crt, trust_ca, ca_crl,
+                                                 &mbedtls_x509_crt_profile_default, cn, flags, f_vrfy, p_vrfy));
 }
 
 /*
@@ -2327,13 +2211,13 @@ int mbedtls_x509_crt_verify( mbedtls_x509_crt *crt,
  *  - builds and verifies the chain
  *  - then calls the callback and merges the flags
  */
-int mbedtls_x509_crt_verify_with_profile( mbedtls_x509_crt *crt,
-                     mbedtls_x509_crt *trust_ca,
-                     mbedtls_x509_crl *ca_crl,
-                     const mbedtls_x509_crt_profile *profile,
-                     const char *cn, uint32_t *flags,
-                     int (*f_vrfy)(void *, mbedtls_x509_crt *, int, uint32_t *),
-                     void *p_vrfy )
+int mbedtls_x509_crt_verify_with_profile(mbedtls_x509_crt *crt,
+                                         mbedtls_x509_crt *trust_ca,
+                                         mbedtls_x509_crl *ca_crl,
+                                         const mbedtls_x509_crt_profile *profile,
+                                         const char *cn, uint32_t *flags,
+                                         int (*f_vrfy)(void *, mbedtls_x509_crt *, int, uint32_t *),
+                                         void *p_vrfy)
 {
     int ret;
     mbedtls_pk_type_t pk_type;
@@ -2342,69 +2226,67 @@ int mbedtls_x509_crt_verify_with_profile( mbedtls_x509_crt *crt,
     uint32_t *ee_flags = &ver_chain[0].flags;
 
     *flags = 0;
-    memset( ver_chain, 0, sizeof( ver_chain ) );
+    memset(ver_chain, 0, sizeof(ver_chain));
     chain_len = 0;
 
-    if( profile == NULL )
-    {
+    if (profile == NULL) {
         ret = MBEDTLS_ERR_X509_BAD_INPUT_DATA;
         goto exit;
     }
 
     /* check name if requested */
-    if( cn != NULL )
-        x509_crt_verify_name( crt, cn, ee_flags );
+    if (cn != NULL)
+        x509_crt_verify_name(crt, cn, ee_flags);
 
     /* Check the type and size of the key */
-    pk_type = mbedtls_pk_get_type( &crt->pk );
+    pk_type = mbedtls_pk_get_type(&crt->pk);
 
-    if( x509_profile_check_pk_alg( profile, pk_type ) != 0 )
+    if (x509_profile_check_pk_alg(profile, pk_type) != 0)
         *ee_flags |= MBEDTLS_X509_BADCERT_BAD_PK;
 
-    if( x509_profile_check_key( profile, &crt->pk ) != 0 )
+    if (x509_profile_check_key(profile, &crt->pk) != 0)
         *ee_flags |= MBEDTLS_X509_BADCERT_BAD_KEY;
 
     /* Check the chain */
-    ret = x509_crt_verify_chain( crt, trust_ca, ca_crl, profile,
-                                 ver_chain, &chain_len );
-    if( ret != 0 )
+    ret = x509_crt_verify_chain(crt, trust_ca, ca_crl, profile,
+                                ver_chain, &chain_len);
+    if (ret != 0)
         goto exit;
 
     /* Build final flags, calling callback on the way if any */
-    ret = x509_crt_merge_flags_with_cb( flags,
-                                        ver_chain, chain_len, f_vrfy, p_vrfy );
+    ret = x509_crt_merge_flags_with_cb(flags,
+                                       ver_chain, chain_len, f_vrfy, p_vrfy);
 
 exit:
     /* prevent misuse of the vrfy callback - VERIFY_FAILED would be ignored by
      * the SSL module for authmode optional, but non-zero return from the
      * callback means a fatal error so it shouldn't be ignored */
-    if( ret == MBEDTLS_ERR_X509_CERT_VERIFY_FAILED )
+    if (ret == MBEDTLS_ERR_X509_CERT_VERIFY_FAILED)
         ret = MBEDTLS_ERR_X509_FATAL_ERROR;
 
-    if( ret != 0 )
-    {
+    if (ret != 0) {
         *flags = (uint32_t) -1;
-        return( ret );
+        return (ret);
     }
 
-    if( *flags != 0 )
-        return( MBEDTLS_ERR_X509_CERT_VERIFY_FAILED );
+    if (*flags != 0)
+        return (MBEDTLS_ERR_X509_CERT_VERIFY_FAILED);
 
-    return( 0 );
+    return (0);
 }
 
 /*
  * Initialize a certificate chain
  */
-void mbedtls_x509_crt_init( mbedtls_x509_crt *crt )
+void mbedtls_x509_crt_init(mbedtls_x509_crt *crt)
 {
-    memset( crt, 0, sizeof(mbedtls_x509_crt) );
+    memset(crt, 0, sizeof(mbedtls_x509_crt));
 }
 
 /*
  * Unallocate all certificate data
  */
-void mbedtls_x509_crt_free( mbedtls_x509_crt *crt )
+void mbedtls_x509_crt_free(mbedtls_x509_crt *crt)
 {
     mbedtls_x509_crt *cert_cur = crt;
     mbedtls_x509_crt *cert_prv;
@@ -2413,76 +2295,67 @@ void mbedtls_x509_crt_free( mbedtls_x509_crt *crt )
     mbedtls_x509_sequence *seq_cur;
     mbedtls_x509_sequence *seq_prv;
 
-    if( crt == NULL )
+    if (crt == NULL)
         return;
 
-    do
-    {
-        mbedtls_pk_free( &cert_cur->pk );
+    do {
+        mbedtls_pk_free(&cert_cur->pk);
 
 #if defined(MBEDTLS_X509_RSASSA_PSS_SUPPORT)
-        mbedtls_free( cert_cur->sig_opts );
+        mbedtls_free(cert_cur->sig_opts);
 #endif
 
         name_cur = cert_cur->issuer.next;
-        while( name_cur != NULL )
-        {
+        while (name_cur != NULL) {
             name_prv = name_cur;
             name_cur = name_cur->next;
-            mbedtls_platform_zeroize( name_prv, sizeof( mbedtls_x509_name ) );
-            mbedtls_free( name_prv );
+            mbedtls_platform_zeroize(name_prv, sizeof(mbedtls_x509_name));
+            mbedtls_free(name_prv);
         }
 
         name_cur = cert_cur->subject.next;
-        while( name_cur != NULL )
-        {
+        while (name_cur != NULL) {
             name_prv = name_cur;
             name_cur = name_cur->next;
-            mbedtls_platform_zeroize( name_prv, sizeof( mbedtls_x509_name ) );
-            mbedtls_free( name_prv );
+            mbedtls_platform_zeroize(name_prv, sizeof(mbedtls_x509_name));
+            mbedtls_free(name_prv);
         }
 
         seq_cur = cert_cur->ext_key_usage.next;
-        while( seq_cur != NULL )
-        {
+        while (seq_cur != NULL) {
             seq_prv = seq_cur;
             seq_cur = seq_cur->next;
-            mbedtls_platform_zeroize( seq_prv,
-                                      sizeof( mbedtls_x509_sequence ) );
-            mbedtls_free( seq_prv );
+            mbedtls_platform_zeroize(seq_prv,
+                                     sizeof(mbedtls_x509_sequence));
+            mbedtls_free(seq_prv);
         }
 
         seq_cur = cert_cur->subject_alt_names.next;
-        while( seq_cur != NULL )
-        {
+        while (seq_cur != NULL) {
             seq_prv = seq_cur;
             seq_cur = seq_cur->next;
-            mbedtls_platform_zeroize( seq_prv,
-                                      sizeof( mbedtls_x509_sequence ) );
-            mbedtls_free( seq_prv );
+            mbedtls_platform_zeroize(seq_prv,
+                                     sizeof(mbedtls_x509_sequence));
+            mbedtls_free(seq_prv);
         }
 
-        if( cert_cur->raw.p != NULL )
-        {
-            mbedtls_platform_zeroize( cert_cur->raw.p, cert_cur->raw.len );
-            mbedtls_free( cert_cur->raw.p );
+        if (cert_cur->raw.p != NULL) {
+            mbedtls_platform_zeroize(cert_cur->raw.p, cert_cur->raw.len);
+            mbedtls_free(cert_cur->raw.p);
         }
 
         cert_cur = cert_cur->next;
-    }
-    while( cert_cur != NULL );
+    } while (cert_cur != NULL);
 
     cert_cur = crt;
-    do
-    {
+    do {
         cert_prv = cert_cur;
         cert_cur = cert_cur->next;
 
-        mbedtls_platform_zeroize( cert_prv, sizeof( mbedtls_x509_crt ) );
-        if( cert_prv != crt )
-            mbedtls_free( cert_prv );
-    }
-    while( cert_cur != NULL );
+        mbedtls_platform_zeroize(cert_prv, sizeof(mbedtls_x509_crt));
+        if (cert_prv != crt)
+            mbedtls_free(cert_prv);
+    } while (cert_cur != NULL);
 }
 
 #endif /* MBEDTLS_X509_CRT_PARSE_C */
diff --git a/common/mbedtls/x509_crt.h b/common/mbedtls/x509_crt.h
index 4f7f7afb9..3217ff0a5 100644
--- a/common/mbedtls/x509_crt.h
+++ b/common/mbedtls/x509_crt.h
@@ -52,8 +52,7 @@ extern "C" {
 /**
  * Container for an X.509 certificate. The certificate may be chained.
  */
-typedef struct mbedtls_x509_crt
-{
+typedef struct mbedtls_x509_crt {
     mbedtls_x509_buf raw;               /**< The raw certificate data (DER). */
     mbedtls_x509_buf tbs;               /**< The raw certificate body (DER). The part that is To Be Signed. */
 
@@ -107,8 +106,7 @@ mbedtls_x509_crt;
  *
  * All lists are bitfields, built by ORing flags from MBEDTLS_X509_ID_FLAG().
  */
-typedef struct mbedtls_x509_crt_profile
-{
+typedef struct mbedtls_x509_crt_profile {
     uint32_t allowed_mds;       /**< MDs for signatures         */
     uint32_t allowed_pks;       /**< PK algs for signatures     */
     uint32_t allowed_curves;    /**< Elliptic curves for ECDSA  */
@@ -130,8 +128,7 @@ mbedtls_x509_crt_profile;
 /**
  * Container for writing a certificate (CRT)
  */
-typedef struct mbedtls_x509write_cert
-{
+typedef struct mbedtls_x509write_cert {
     int version;
     mbedtls_mpi serial;
     mbedtls_pk_context *subject_key;
@@ -173,8 +170,8 @@ extern const mbedtls_x509_crt_profile mbedtls_x509_crt_profile_suiteb;
  *
  * \return         0 if successful, or a specific X509 or PEM error code
  */
-int mbedtls_x509_crt_parse_der( mbedtls_x509_crt *chain, const unsigned char *buf,
-                        size_t buflen );
+int mbedtls_x509_crt_parse_der(mbedtls_x509_crt *chain, const unsigned char *buf,
+                               size_t buflen);
 
 /**
  * \brief          Parse one or more certificates and add them
@@ -191,7 +188,7 @@ int mbedtls_x509_crt_parse_der( mbedtls_x509_crt *chain, const unsigned char *bu
  * \return         0 if all certificates parsed successfully, a positive number
  *                 if partly successful or a specific X509 or PEM error code
  */
-int mbedtls_x509_crt_parse( mbedtls_x509_crt *chain, const unsigned char *buf, size_t buflen );
+int mbedtls_x509_crt_parse(mbedtls_x509_crt *chain, const unsigned char *buf, size_t buflen);
 
 #if defined(MBEDTLS_FS_IO)
 /**
@@ -207,7 +204,7 @@ int mbedtls_x509_crt_parse( mbedtls_x509_crt *chain, const unsigned char *buf, s
  * \return         0 if all certificates parsed successfully, a positive number
  *                 if partly successful or a specific X509 or PEM error code
  */
-int mbedtls_x509_crt_parse_file( mbedtls_x509_crt *chain, const char *path );
+int mbedtls_x509_crt_parse_file(mbedtls_x509_crt *chain, const char *path);
 
 /**
  * \brief          Load one or more certificate files from a path and add them
@@ -222,7 +219,7 @@ int mbedtls_x509_crt_parse_file( mbedtls_x509_crt *chain, const char *path );
  * \return         0 if all certificates parsed successfully, a positive number
  *                 if partly successful or a specific X509 or PEM error code
  */
-int mbedtls_x509_crt_parse_path( mbedtls_x509_crt *chain, const char *path );
+int mbedtls_x509_crt_parse_path(mbedtls_x509_crt *chain, const char *path);
 #endif /* MBEDTLS_FS_IO */
 
 /**
@@ -237,8 +234,8 @@ int mbedtls_x509_crt_parse_path( mbedtls_x509_crt *chain, const char *path );
  * \return         The length of the string written (not including the
  *                 terminated nul byte), or a negative error code.
  */
-int mbedtls_x509_crt_info( char *buf, size_t size, const char *prefix,
-                   const mbedtls_x509_crt *crt );
+int mbedtls_x509_crt_info(char *buf, size_t size, const char *prefix,
+                          const mbedtls_x509_crt *crt);
 
 /**
  * \brief          Returns an informational string about the
@@ -252,8 +249,8 @@ int mbedtls_x509_crt_info( char *buf, size_t size, const char *prefix,
  * \return         The length of the string written (not including the
  *                 terminated nul byte), or a negative error code.
  */
-int mbedtls_x509_crt_verify_info( char *buf, size_t size, const char *prefix,
-                          uint32_t flags );
+int mbedtls_x509_crt_verify_info(char *buf, size_t size, const char *prefix,
+                                 uint32_t flags);
 
 /**
  * \brief          Verify the certificate signature
@@ -313,12 +310,12 @@ int mbedtls_x509_crt_verify_info( char *buf, size_t size, const char *prefix,
  *                 in case of a fatal error encountered during the
  *                 verification process.
  */
-int mbedtls_x509_crt_verify( mbedtls_x509_crt *crt,
-                     mbedtls_x509_crt *trust_ca,
-                     mbedtls_x509_crl *ca_crl,
-                     const char *cn, uint32_t *flags,
-                     int (*f_vrfy)(void *, mbedtls_x509_crt *, int, uint32_t *),
-                     void *p_vrfy );
+int mbedtls_x509_crt_verify(mbedtls_x509_crt *crt,
+                            mbedtls_x509_crt *trust_ca,
+                            mbedtls_x509_crl *ca_crl,
+                            const char *cn, uint32_t *flags,
+                            int (*f_vrfy)(void *, mbedtls_x509_crt *, int, uint32_t *),
+                            void *p_vrfy);
 
 /**
  * \brief          Verify the certificate signature according to profile
@@ -347,13 +344,13 @@ int mbedtls_x509_crt_verify( mbedtls_x509_crt *crt,
  *                 or another error in case of a fatal error encountered
  *                 during the verification process.
  */
-int mbedtls_x509_crt_verify_with_profile( mbedtls_x509_crt *crt,
-                     mbedtls_x509_crt *trust_ca,
-                     mbedtls_x509_crl *ca_crl,
-                     const mbedtls_x509_crt_profile *profile,
-                     const char *cn, uint32_t *flags,
-                     int (*f_vrfy)(void *, mbedtls_x509_crt *, int, uint32_t *),
-                     void *p_vrfy );
+int mbedtls_x509_crt_verify_with_profile(mbedtls_x509_crt *crt,
+                                         mbedtls_x509_crt *trust_ca,
+                                         mbedtls_x509_crl *ca_crl,
+                                         const mbedtls_x509_crt_profile *profile,
+                                         const char *cn, uint32_t *flags,
+                                         int (*f_vrfy)(void *, mbedtls_x509_crt *, int, uint32_t *),
+                                         void *p_vrfy);
 
 #if defined(MBEDTLS_X509_CHECK_KEY_USAGE)
 /**
@@ -377,8 +374,8 @@ int mbedtls_x509_crt_verify_with_profile( mbedtls_x509_crt *crt,
  *                 (intermediate) CAs the keyUsage extension is automatically
  *                 checked by \c mbedtls_x509_crt_verify().
  */
-int mbedtls_x509_crt_check_key_usage( const mbedtls_x509_crt *crt,
-                                      unsigned int usage );
+int mbedtls_x509_crt_check_key_usage(const mbedtls_x509_crt *crt,
+                                     unsigned int usage);
 #endif /* MBEDTLS_X509_CHECK_KEY_USAGE) */
 
 #if defined(MBEDTLS_X509_CHECK_EXTENDED_KEY_USAGE)
@@ -395,9 +392,9 @@ int mbedtls_x509_crt_check_key_usage( const mbedtls_x509_crt *crt,
  *
  * \note            Usually only makes sense on leaf certificates.
  */
-int mbedtls_x509_crt_check_extended_key_usage( const mbedtls_x509_crt *crt,
-                                               const char *usage_oid,
-                                               size_t usage_len );
+int mbedtls_x509_crt_check_extended_key_usage(const mbedtls_x509_crt *crt,
+                                              const char *usage_oid,
+                                              size_t usage_len);
 #endif /* MBEDTLS_X509_CHECK_EXTENDED_KEY_USAGE */
 
 #if defined(MBEDTLS_X509_CRL_PARSE_C)
@@ -410,7 +407,7 @@ int mbedtls_x509_crt_check_extended_key_usage( const mbedtls_x509_crt *crt,
  * \return         1 if the certificate is revoked, 0 otherwise
  *
  */
-int mbedtls_x509_crt_is_revoked( const mbedtls_x509_crt *crt, const mbedtls_x509_crl *crl );
+int mbedtls_x509_crt_is_revoked(const mbedtls_x509_crt *crt, const mbedtls_x509_crl *crl);
 #endif /* MBEDTLS_X509_CRL_PARSE_C */
 
 /**
@@ -418,14 +415,14 @@ int mbedtls_x509_crt_is_revoked( const mbedtls_x509_crt *crt, const mbedtls_x509
  *
  * \param crt      Certificate chain to initialize
  */
-void mbedtls_x509_crt_init( mbedtls_x509_crt *crt );
+void mbedtls_x509_crt_init(mbedtls_x509_crt *crt);
 
 /**
  * \brief          Unallocate all certificate data
  *
  * \param crt      Certificate chain to free
  */
-void mbedtls_x509_crt_free( mbedtls_x509_crt *crt );
+void mbedtls_x509_crt_free(mbedtls_x509_crt *crt);
 #endif /* MBEDTLS_X509_CRT_PARSE_C */
 
 /* \} name */
@@ -437,7 +434,7 @@ void mbedtls_x509_crt_free( mbedtls_x509_crt *crt );
  *
  * \param ctx       CRT context to initialize
  */
-void mbedtls_x509write_crt_init( mbedtls_x509write_cert *ctx );
+void mbedtls_x509write_crt_init(mbedtls_x509write_cert *ctx);
 
 /**
  * \brief           Set the verion for a Certificate
@@ -447,7 +444,7 @@ void mbedtls_x509write_crt_init( mbedtls_x509write_cert *ctx );
  * \param version   version to set (MBEDTLS_X509_CRT_VERSION_1, MBEDTLS_X509_CRT_VERSION_2 or
  *                                  MBEDTLS_X509_CRT_VERSION_3)
  */
-void mbedtls_x509write_crt_set_version( mbedtls_x509write_cert *ctx, int version );
+void mbedtls_x509write_crt_set_version(mbedtls_x509write_cert *ctx, int version);
 
 /**
  * \brief           Set the serial number for a Certificate.
@@ -457,7 +454,7 @@ void mbedtls_x509write_crt_set_version( mbedtls_x509write_cert *ctx, int version
  *
  * \return          0 if successful
  */
-int mbedtls_x509write_crt_set_serial( mbedtls_x509write_cert *ctx, const mbedtls_mpi *serial );
+int mbedtls_x509write_crt_set_serial(mbedtls_x509write_cert *ctx, const mbedtls_mpi *serial);
 
 /**
  * \brief           Set the validity period for a Certificate
@@ -473,8 +470,8 @@ int mbedtls_x509write_crt_set_serial( mbedtls_x509write_cert *ctx, const mbedtls
  * \return          0 if timestamp was parsed successfully, or
  *                  a specific error code
  */
-int mbedtls_x509write_crt_set_validity( mbedtls_x509write_cert *ctx, const char *not_before,
-                                const char *not_after );
+int mbedtls_x509write_crt_set_validity(mbedtls_x509write_cert *ctx, const char *not_before,
+                                       const char *not_after);
 
 /**
  * \brief           Set the issuer name for a Certificate
@@ -488,8 +485,8 @@ int mbedtls_x509write_crt_set_validity( mbedtls_x509write_cert *ctx, const char
  * \return          0 if issuer name was parsed successfully, or
  *                  a specific error code
  */
-int mbedtls_x509write_crt_set_issuer_name( mbedtls_x509write_cert *ctx,
-                                   const char *issuer_name );
+int mbedtls_x509write_crt_set_issuer_name(mbedtls_x509write_cert *ctx,
+                                          const char *issuer_name);
 
 /**
  * \brief           Set the subject name for a Certificate
@@ -503,8 +500,8 @@ int mbedtls_x509write_crt_set_issuer_name( mbedtls_x509write_cert *ctx,
  * \return          0 if subject name was parsed successfully, or
  *                  a specific error code
  */
-int mbedtls_x509write_crt_set_subject_name( mbedtls_x509write_cert *ctx,
-                                    const char *subject_name );
+int mbedtls_x509write_crt_set_subject_name(mbedtls_x509write_cert *ctx,
+                                           const char *subject_name);
 
 /**
  * \brief           Set the subject public key for the certificate
@@ -512,7 +509,7 @@ int mbedtls_x509write_crt_set_subject_name( mbedtls_x509write_cert *ctx,
  * \param ctx       CRT context to use
  * \param key       public key to include
  */
-void mbedtls_x509write_crt_set_subject_key( mbedtls_x509write_cert *ctx, mbedtls_pk_context *key );
+void mbedtls_x509write_crt_set_subject_key(mbedtls_x509write_cert *ctx, mbedtls_pk_context *key);
 
 /**
  * \brief           Set the issuer key used for signing the certificate
@@ -520,7 +517,7 @@ void mbedtls_x509write_crt_set_subject_key( mbedtls_x509write_cert *ctx, mbedtls
  * \param ctx       CRT context to use
  * \param key       private key to sign with
  */
-void mbedtls_x509write_crt_set_issuer_key( mbedtls_x509write_cert *ctx, mbedtls_pk_context *key );
+void mbedtls_x509write_crt_set_issuer_key(mbedtls_x509write_cert *ctx, mbedtls_pk_context *key);
 
 /**
  * \brief           Set the MD algorithm to use for the signature
@@ -529,7 +526,7 @@ void mbedtls_x509write_crt_set_issuer_key( mbedtls_x509write_cert *ctx, mbedtls_
  * \param ctx       CRT context to use
  * \param md_alg    MD algorithm to use
  */
-void mbedtls_x509write_crt_set_md_alg( mbedtls_x509write_cert *ctx, mbedtls_md_type_t md_alg );
+void mbedtls_x509write_crt_set_md_alg(mbedtls_x509write_cert *ctx, mbedtls_md_type_t md_alg);
 
 /**
  * \brief           Generic function to add to or replace an extension in the
@@ -544,10 +541,10 @@ void mbedtls_x509write_crt_set_md_alg( mbedtls_x509write_cert *ctx, mbedtls_md_t
  *
  * \return          0 if successful, or a MBEDTLS_ERR_X509_ALLOC_FAILED
  */
-int mbedtls_x509write_crt_set_extension( mbedtls_x509write_cert *ctx,
-                                 const char *oid, size_t oid_len,
-                                 int critical,
-                                 const unsigned char *val, size_t val_len );
+int mbedtls_x509write_crt_set_extension(mbedtls_x509write_cert *ctx,
+                                        const char *oid, size_t oid_len,
+                                        int critical,
+                                        const unsigned char *val, size_t val_len);
 
 /**
  * \brief           Set the basicConstraints extension for a CRT
@@ -560,8 +557,8 @@ int mbedtls_x509write_crt_set_extension( mbedtls_x509write_cert *ctx,
  *
  * \return          0 if successful, or a MBEDTLS_ERR_X509_ALLOC_FAILED
  */
-int mbedtls_x509write_crt_set_basic_constraints( mbedtls_x509write_cert *ctx,
-                                         int is_ca, int max_pathlen );
+int mbedtls_x509write_crt_set_basic_constraints(mbedtls_x509write_cert *ctx,
+                                                int is_ca, int max_pathlen);
 
 #if defined(MBEDTLS_SHA1_C)
 /**
@@ -573,7 +570,7 @@ int mbedtls_x509write_crt_set_basic_constraints( mbedtls_x509write_cert *ctx,
  *
  * \return          0 if successful, or a MBEDTLS_ERR_X509_ALLOC_FAILED
  */
-int mbedtls_x509write_crt_set_subject_key_identifier( mbedtls_x509write_cert *ctx );
+int mbedtls_x509write_crt_set_subject_key_identifier(mbedtls_x509write_cert *ctx);
 
 /**
  * \brief           Set the authorityKeyIdentifier extension for a CRT
@@ -584,7 +581,7 @@ int mbedtls_x509write_crt_set_subject_key_identifier( mbedtls_x509write_cert *ct
  *
  * \return          0 if successful, or a MBEDTLS_ERR_X509_ALLOC_FAILED
  */
-int mbedtls_x509write_crt_set_authority_key_identifier( mbedtls_x509write_cert *ctx );
+int mbedtls_x509write_crt_set_authority_key_identifier(mbedtls_x509write_cert *ctx);
 #endif /* MBEDTLS_SHA1_C */
 
 /**
@@ -596,8 +593,8 @@ int mbedtls_x509write_crt_set_authority_key_identifier( mbedtls_x509write_cert *
  *
  * \return          0 if successful, or MBEDTLS_ERR_X509_ALLOC_FAILED
  */
-int mbedtls_x509write_crt_set_key_usage( mbedtls_x509write_cert *ctx,
-                                         unsigned int key_usage );
+int mbedtls_x509write_crt_set_key_usage(mbedtls_x509write_cert *ctx,
+                                        unsigned int key_usage);
 
 /**
  * \brief           Set the Netscape Cert Type flags
@@ -608,15 +605,15 @@ int mbedtls_x509write_crt_set_key_usage( mbedtls_x509write_cert *ctx,
  *
  * \return          0 if successful, or MBEDTLS_ERR_X509_ALLOC_FAILED
  */
-int mbedtls_x509write_crt_set_ns_cert_type( mbedtls_x509write_cert *ctx,
-                                    unsigned char ns_cert_type );
+int mbedtls_x509write_crt_set_ns_cert_type(mbedtls_x509write_cert *ctx,
+                                           unsigned char ns_cert_type);
 
 /**
  * \brief           Free the contents of a CRT write context
  *
  * \param ctx       CRT context to free
  */
-void mbedtls_x509write_crt_free( mbedtls_x509write_cert *ctx );
+void mbedtls_x509write_crt_free(mbedtls_x509write_cert *ctx);
 
 /**
  * \brief           Write a built up certificate to a X509 DER structure
@@ -638,9 +635,9 @@ void mbedtls_x509write_crt_free( mbedtls_x509write_cert *ctx );
  *                  for countermeasures against timing attacks).
  *                  ECDSA signatures always require a non-NULL f_rng.
  */
-int mbedtls_x509write_crt_der( mbedtls_x509write_cert *ctx, unsigned char *buf, size_t size,
-                       int (*f_rng)(void *, unsigned char *, size_t),
-                       void *p_rng );
+int mbedtls_x509write_crt_der(mbedtls_x509write_cert *ctx, unsigned char *buf, size_t size,
+                              int (*f_rng)(void *, unsigned char *, size_t),
+                              void *p_rng);
 
 #if defined(MBEDTLS_PEM_WRITE_C)
 /**
@@ -659,9 +656,9 @@ int mbedtls_x509write_crt_der( mbedtls_x509write_cert *ctx, unsigned char *buf,
  *                  for countermeasures against timing attacks).
  *                  ECDSA signatures always require a non-NULL f_rng.
  */
-int mbedtls_x509write_crt_pem( mbedtls_x509write_cert *ctx, unsigned char *buf, size_t size,
-                       int (*f_rng)(void *, unsigned char *, size_t),
-                       void *p_rng );
+int mbedtls_x509write_crt_pem(mbedtls_x509write_cert *ctx, unsigned char *buf, size_t size,
+                              int (*f_rng)(void *, unsigned char *, size_t),
+                              void *p_rng);
 #endif /* MBEDTLS_PEM_WRITE_C */
 #endif /* MBEDTLS_X509_CRT_WRITE_C */
 
diff --git a/common/parity.c b/common/parity.c
index cd997ceb1..2a1d6281c 100644
--- a/common/parity.c
+++ b/common/parity.c
@@ -9,40 +9,40 @@
 #include <stdint.h>
 
 const uint8_t OddByteParity[256] = {
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1
+    1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
+    0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
+    0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
+    1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
+    0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
+    1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
+    1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
+    0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
+    0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
+    1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
+    1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
+    0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
+    1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
+    0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
+    0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
+    1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1
 };
 
 const uint8_t EvenByteParity[256] = {
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0
+    0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
+    1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
+    1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
+    0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
+    1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
+    0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
+    0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
+    1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
+    1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
+    0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
+    0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
+    1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
+    0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
+    1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
+    1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
+    0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0
 };
 
diff --git a/common/parity.h b/common/parity.h
index 94d98d913..9b812e4f3 100644
--- a/common/parity.h
+++ b/common/parity.h
@@ -21,12 +21,14 @@ extern "C" {
 extern const uint8_t OddByteParity[256];
 
 
-static inline bool oddparity8(const uint8_t x) {
+static inline bool oddparity8(const uint8_t x)
+{
     return OddByteParity[x];
 }
 
 
-static inline bool evenparity8(const uint8_t x) {
+static inline bool evenparity8(const uint8_t x)
+{
     return !OddByteParity[x];
 }
 
diff --git a/common/prng.c b/common/prng.c
index fb39dd11c..d9761e643 100644
--- a/common/prng.c
+++ b/common/prng.c
@@ -6,7 +6,8 @@
 #include "prng.h"
 
 #define rot(x,k) (((x)<<(k))|((x)>>(32-(k))))
-uint32_t burtle_get_mod( prng_ctx *x ) {
+uint32_t burtle_get_mod(prng_ctx *x)
+{
     uint32_t e = x->a - rot(x->b, 21);
     x->a = x->b ^ rot(x->c, 19);
     x->b = x->c + rot(x->d, 6);
@@ -15,24 +16,27 @@ uint32_t burtle_get_mod( prng_ctx *x ) {
     return x->d;
 }
 
-void burtle_init_mod(prng_ctx *x, uint32_t seed ) {
+void burtle_init_mod(prng_ctx *x, uint32_t seed)
+{
     x->a = 0xf1ea5eed;
     x->b = x->c = x->d = seed;
-    for (uint8_t i=0; i < 42; ++i) {
+    for (uint8_t i = 0; i < 42; ++i) {
         (void)burtle_get_mod(x);
     }
 }
 
-void burtle_init(prng_ctx *x, uint32_t seed ) {
+void burtle_init(prng_ctx *x, uint32_t seed)
+{
     uint32_t i;
     x->a = 0xf1ea5eed, x->b = x->c = x->d = seed;
-    for (i=0; i < 20; ++i) {
+    for (i = 0; i < 20; ++i) {
         (void)burtle_get_mod(x);
     }
 }
 
 
-uint32_t GetSimplePrng( uint32_t seed ){
+uint32_t GetSimplePrng(uint32_t seed)
+{
     seed *= 0x19660D;
     seed += 0x3C6EF35F;
     return seed;
diff --git a/common/prng.h b/common/prng.h
index fc9abd346..f160d6b30 100644
--- a/common/prng.h
+++ b/common/prng.h
@@ -16,9 +16,9 @@ typedef struct prng_ctx {
 } prng_ctx;
 
 //uint32_t burtle_get( prng_ctx *x );
-uint32_t burtle_get_mod( prng_ctx *x );
-void burtle_init_mod(prng_ctx *x, uint32_t seed );
-void burtle_init(prng_ctx *x, uint32_t seed );
+uint32_t burtle_get_mod(prng_ctx *x);
+void burtle_init_mod(prng_ctx *x, uint32_t seed);
+void burtle_init(prng_ctx *x, uint32_t seed);
 
-uint32_t GetSimplePrng( uint32_t seed );
+uint32_t GetSimplePrng(uint32_t seed);
 #endif /* __PRNG_H */
\ No newline at end of file
diff --git a/common/protocols.c b/common/protocols.c
index be1076846..46c0c36eb 100644
--- a/common/protocols.c
+++ b/common/protocols.c
@@ -1,17 +1,27 @@
 #include "protocols.h"
 
 // ATA55xx shared presets & routines
-uint32_t GetT55xxClockBit(uint32_t clock) {
+uint32_t GetT55xxClockBit(uint32_t clock)
+{
     switch (clock) {
-        case 128: return T55x7_BITRATE_RF_128;
-        case 100: return T55x7_BITRATE_RF_100;
-        case  64: return T55x7_BITRATE_RF_64;
-        case  50: return T55x7_BITRATE_RF_50;
-        case  40: return T55x7_BITRATE_RF_40;
-        case  32: return T55x7_BITRATE_RF_32;
-        case  16: return T55x7_BITRATE_RF_16;
-        case   8: return T55x7_BITRATE_RF_8;
-        default : return 0;
+        case 128:
+            return T55x7_BITRATE_RF_128;
+        case 100:
+            return T55x7_BITRATE_RF_100;
+        case  64:
+            return T55x7_BITRATE_RF_64;
+        case  50:
+            return T55x7_BITRATE_RF_50;
+        case  40:
+            return T55x7_BITRATE_RF_40;
+        case  32:
+            return T55x7_BITRATE_RF_32;
+        case  16:
+            return T55x7_BITRATE_RF_16;
+        case   8:
+            return T55x7_BITRATE_RF_8;
+        default :
+            return 0;
     }
 }
 
@@ -19,18 +29,21 @@ uint32_t GetT55xxClockBit(uint32_t clock) {
 #include "ui.h"
 #define PrintAndLogDevice(level, format, args...)  PrintAndLogEx(level, format , ## args)
 
-uint8_t isset(uint8_t val, uint8_t mask) {
+uint8_t isset(uint8_t val, uint8_t mask)
+{
     return (val & mask);
 }
 
-uint8_t notset(uint8_t val, uint8_t mask){
+uint8_t notset(uint8_t val, uint8_t mask)
+{
     return !(val & mask);
 }
 
-void fuse_config(const picopass_hdr *hdr) {
+void fuse_config(const picopass_hdr *hdr)
+{
     uint8_t fuses = hdr->conf.fuses;
 
-    if (isset(fuses,FUSE_FPERS))
+    if (isset(fuses, FUSE_FPERS))
         PrintAndLogDevice(SUCCESS, "\tMode: Personalization [Programmable]");
     else
         PrintAndLogDevice(NORMAL, "\tMode: Application [Locked]");
@@ -38,49 +51,50 @@ void fuse_config(const picopass_hdr *hdr) {
     if (isset(fuses, FUSE_CODING1)) {
         PrintAndLogDevice(NORMAL, "\tCoding: RFU");
     } else {
-        if( isset( fuses , FUSE_CODING0))
+        if (isset(fuses, FUSE_CODING0))
             PrintAndLogDevice(NORMAL, "\tCoding: ISO 14443-2 B/ISO 15693");
         else
             PrintAndLogDevice(NORMAL, "\tCoding: ISO 14443B only");
     }
     // 1 1
-    if( isset (fuses,FUSE_CRYPT1) && isset(fuses, FUSE_CRYPT0 )) PrintAndLogDevice(SUCCESS, "\tCrypt: Secured page, keys not locked");
+    if (isset(fuses, FUSE_CRYPT1) && isset(fuses, FUSE_CRYPT0)) PrintAndLogDevice(SUCCESS, "\tCrypt: Secured page, keys not locked");
     // 1 0
-    if( isset (fuses,FUSE_CRYPT1) && notset( fuses, FUSE_CRYPT0 )) PrintAndLogDevice(NORMAL, "\tCrypt: Secured page, keys locked");
+    if (isset(fuses, FUSE_CRYPT1) && notset(fuses, FUSE_CRYPT0)) PrintAndLogDevice(NORMAL, "\tCrypt: Secured page, keys locked");
     // 0 1
-    if( notset (fuses,FUSE_CRYPT1) && isset( fuses, FUSE_CRYPT0 )) PrintAndLogDevice(SUCCESS, "\tCrypt: Non secured page");
+    if (notset(fuses, FUSE_CRYPT1) && isset(fuses, FUSE_CRYPT0)) PrintAndLogDevice(SUCCESS, "\tCrypt: Non secured page");
     // 0 0
-    if( notset (fuses,FUSE_CRYPT1) && notset( fuses, FUSE_CRYPT0 )) PrintAndLogDevice(NORMAL, "\tCrypt: No auth possible. Read only if RA is enabled");
+    if (notset(fuses, FUSE_CRYPT1) && notset(fuses, FUSE_CRYPT0)) PrintAndLogDevice(NORMAL, "\tCrypt: No auth possible. Read only if RA is enabled");
 
-    if( isset( fuses, FUSE_RA))
+    if (isset(fuses, FUSE_RA))
         PrintAndLogDevice(NORMAL, "\tRA: Read access enabled");
     else
         PrintAndLogDevice(WARNING, "\tRA: Read access not enabled");
 }
 
-void getMemConfig(uint8_t mem_cfg, uint8_t chip_cfg, uint8_t *max_blk, uint8_t *app_areas, uint8_t *kb) {
+void getMemConfig(uint8_t mem_cfg, uint8_t chip_cfg, uint8_t *max_blk, uint8_t *app_areas, uint8_t *kb)
+{
     // mem-bit 5, mem-bit 7, chip-bit 4: defines chip type
     uint8_t k16 = isset(mem_cfg, 0x80);
     //uint8_t k2 = isset(mem_cfg, 0x08);
     uint8_t book = isset(mem_cfg, 0x20);
 
-    if(isset(chip_cfg, 0x10) && !k16 && !book) {
+    if (isset(chip_cfg, 0x10) && !k16 && !book) {
         *kb = 2;
         *app_areas = 2;
         *max_blk = 31;
-    } else if(isset(chip_cfg, 0x10) && k16 && !book) {
+    } else if (isset(chip_cfg, 0x10) && k16 && !book) {
         *kb = 16;
         *app_areas = 2;
         *max_blk = 255; //16kb
-    } else if(notset(chip_cfg, 0x10) && !k16 && !book) {
+    } else if (notset(chip_cfg, 0x10) && !k16 && !book) {
         *kb = 16;
         *app_areas = 16;
         *max_blk = 255; //16kb
-    } else if(isset(chip_cfg, 0x10) && k16 && book) {
+    } else if (isset(chip_cfg, 0x10) && k16 && book) {
         *kb = 32;
         *app_areas = 3;
         *max_blk = 255; //16kb
-    } else if(notset(chip_cfg, 0x10) && !k16 && book) {
+    } else if (notset(chip_cfg, 0x10) && !k16 && book) {
         *kb = 32;
         *app_areas = 17;
         *max_blk = 255; //16kb
@@ -91,7 +105,8 @@ void getMemConfig(uint8_t mem_cfg, uint8_t chip_cfg, uint8_t *max_blk, uint8_t *
     }
 }
 
-void mem_app_config(const picopass_hdr *hdr) {
+void mem_app_config(const picopass_hdr *hdr)
+{
     uint8_t mem = hdr->conf.mem_config;
     uint8_t chip = hdr->conf.chip_config;
     uint8_t applimit = hdr->conf.app_limit;
@@ -102,11 +117,11 @@ void mem_app_config(const picopass_hdr *hdr) {
     getMemConfig(mem, chip, &max_blk, &app_areas, &kb);
 
     if (applimit < 6) applimit = 26;
-    if (kb == 2 && (applimit > 0x1f) ) applimit = 26;
+    if (kb == 2 && (applimit > 0x1f)) applimit = 26;
 
     PrintAndLogDevice(NORMAL, " Mem: %u KBits/%u App Areas (%u * 8 bytes) [%02X]", kb, app_areas, max_blk, mem);
     PrintAndLogDevice(NORMAL, "\tAA1: blocks 06-%02X", applimit);
-    PrintAndLogDevice(NORMAL, "\tAA2: blocks %02X-%02X", applimit+1, max_blk);
+    PrintAndLogDevice(NORMAL, "\tAA2: blocks %02X-%02X", applimit + 1, max_blk);
     PrintAndLogDevice(NORMAL, "\tOTP: 0x%02X%02X", hdr->conf.otp[1],  hdr->conf.otp[0]);
     PrintAndLogDevice(NORMAL, "\nKeyAccess:");
 
@@ -117,8 +132,8 @@ void mem_app_config(const picopass_hdr *hdr) {
         PrintAndLogDevice(NORMAL, "\tWrite A - Kd");
         PrintAndLogDevice(NORMAL, "\tWrite B - Kc");
         PrintAndLogDevice(NORMAL, "\tDebit  - Kd or Kc");
-        PrintAndLogDevice(NORMAL,"\tCredit - Kc");
-    } else{
+        PrintAndLogDevice(NORMAL, "\tCredit - Kc");
+    } else {
         PrintAndLogDevice(NORMAL, "\tRead A - Kd or Kc");
         PrintAndLogDevice(NORMAL, "\tRead B - Kd or Kc");
         PrintAndLogDevice(NORMAL, "\tWrite A - Kc");
@@ -127,15 +142,17 @@ void mem_app_config(const picopass_hdr *hdr) {
         PrintAndLogDevice(NORMAL, "\tCredit - Kc");
     }
 }
-void print_picopass_info(const picopass_hdr *hdr) {
+void print_picopass_info(const picopass_hdr *hdr)
+{
     fuse_config(hdr);
     mem_app_config(hdr);
 }
-void printIclassDumpInfo(uint8_t* iclass_dump) {
+void printIclassDumpInfo(uint8_t *iclass_dump)
+{
     print_picopass_info((picopass_hdr *) iclass_dump);
 }
 
 #else
-    #define PrintAndLogDevice(level, format, ...) { }
+#define PrintAndLogDevice(level, format, ...) { }
 #endif
 //ON_DEVICE
diff --git a/common/protocols.h b/common/protocols.h
index 8091ca7ba..fde10f38a 100644
--- a/common/protocols.h
+++ b/common/protocols.h
@@ -357,7 +357,7 @@ ISO 7816-4 Basic interindustry commands. For command APDU's.
 #define LEGIC_READ                      0x01
 #define LEGIC_WRITE                     0x00
 
-void printIclassDumpInfo(uint8_t* iclass_dump);
+void printIclassDumpInfo(uint8_t *iclass_dump);
 void getMemConfig(uint8_t mem_cfg, uint8_t chip_cfg, uint8_t *max_blk, uint8_t *app_areas, uint8_t *kb);
 
 /* T55x7 configuration register definitions */
diff --git a/common/radixsort.c b/common/radixsort.c
index fa0643216..e5509880a 100644
--- a/common/radixsort.c
+++ b/common/radixsort.c
@@ -1,14 +1,15 @@
 #include "radixsort.h"
 
-uint64_t * radixSort(uint64_t * array, uint32_t size) {
+uint64_t *radixSort(uint64_t *array, uint32_t size)
+{
     rscounts_t counts;
     memset(&counts, 0, 256 * 8 * sizeof(uint32_t));
-    uint64_t * cpy = (uint64_t *)calloc(size * sizeof(uint64_t), sizeof(uint8_t));
-    uint32_t o8=0, o7=0, o6=0, o5=0, o4=0, o3=0, o2=0, o1=0;
+    uint64_t *cpy = (uint64_t *)calloc(size * sizeof(uint64_t), sizeof(uint8_t));
+    uint32_t o8 = 0, o7 = 0, o6 = 0, o5 = 0, o4 = 0, o3 = 0, o2 = 0, o1 = 0;
     uint32_t t8, t7, t6, t5, t4, t3, t2, t1;
     uint32_t x;
     // calculate counts
-    for(x = 0; x < size; ++x) {
+    for (x = 0; x < size; ++x) {
         t8 = array[x] & 0xff;
         t7 = (array[x] >> 8) & 0xff;
         t6 = (array[x] >> 16) & 0xff;
@@ -27,7 +28,7 @@ uint64_t * radixSort(uint64_t * array, uint32_t size) {
         counts.c1[t1]++;
     }
     // convert counts to offsets
-    for(x = 0; x < 256; ++x) {
+    for (x = 0; x < 256; ++x) {
         t8 = o8 + counts.c8[x];
         t7 = o7 + counts.c7[x];
         t6 = o6 + counts.c6[x];
@@ -54,42 +55,42 @@ uint64_t * radixSort(uint64_t * array, uint32_t size) {
         o1 = t1;
     }
     // radix
-    for(x = 0; x < size; ++x) {
+    for (x = 0; x < size; ++x) {
         t8 = array[x] & 0xff;
         cpy[counts.c8[t8]] = array[x];
         counts.c8[t8]++;
     }
-    for(x = 0; x < size; ++x) {
+    for (x = 0; x < size; ++x) {
         t7 = (cpy[x] >> 8) & 0xff;
         array[counts.c7[t7]] = cpy[x];
         counts.c7[t7]++;
     }
-    for(x = 0; x < size; ++x) {
+    for (x = 0; x < size; ++x) {
         t6 = (array[x] >> 16) & 0xff;
         cpy[counts.c6[t6]] = array[x];
         counts.c6[t6]++;
     }
-    for(x = 0; x < size; ++x) {
+    for (x = 0; x < size; ++x) {
         t5 = (cpy[x] >> 24) & 0xff;
         array[counts.c5[t5]] = cpy[x];
         counts.c5[t5]++;
     }
-    for(x = 0; x < size; ++x) {
+    for (x = 0; x < size; ++x) {
         t4 = (array[x] >> 32) & 0xff;
         cpy[counts.c4[t4]] = array[x];
         counts.c4[t4]++;
     }
-    for(x = 0; x < size; ++x) {
+    for (x = 0; x < size; ++x) {
         t3 = (cpy[x] >> 40) & 0xff;
         array[counts.c3[t3]] = cpy[x];
         counts.c3[t3]++;
     }
-    for(x = 0; x < size; ++x) {
+    for (x = 0; x < size; ++x) {
         t2 = (array[x] >> 48) & 0xff;
         cpy[counts.c2[t2]] = array[x];
         counts.c2[t2]++;
     }
-    for(x = 0; x < size; ++x) {
+    for (x = 0; x < size; ++x) {
         t1 = (cpy[x] >> 56) & 0xff;
         array[counts.c1[t1]] = cpy[x];
         counts.c1[t1]++;
diff --git a/common/radixsort.h b/common/radixsort.h
index 30a4ca0fa..29faf9825 100644
--- a/common/radixsort.h
+++ b/common/radixsort.h
@@ -19,5 +19,5 @@ typedef union {
     uint32_t counts[256 * 8];
 } rscounts_t;
 
-uint64_t * radixSort(uint64_t * array, uint32_t size);
+uint64_t *radixSort(uint64_t *array, uint32_t size);
 #endif // RADIXSORT_H__
\ No newline at end of file
diff --git a/common/random.c b/common/random.c
index 060f0bd7a..66269a19b 100644
--- a/common/random.c
+++ b/common/random.c
@@ -13,18 +13,21 @@ static uint32_t g_nextrandom;
  * https://software.intel.com/en-us/articles/fast-random-number-generator-on-the-intel-pentiumr-4-processor/
  */
 
-inline void fast_prand(){
+inline void fast_prand()
+{
     fast_prandEx(GetTickCount());
 }
-inline void fast_prandEx(uint32_t seed) {
+inline void fast_prandEx(uint32_t seed)
+{
     g_nextrandom = seed;
 }
 
-uint32_t prand() {
+uint32_t prand()
+{
 // g_nextrandom *= 6364136223846793005;
 // g_nextrandom += 1;
 //return (uint32_t)(g_nextrandom >> 32) % 0xffffffff;
     g_nextrandom = (214013 * g_nextrandom + 2531011);
-    return (g_nextrandom>>16) & 0xFFFF;
+    return (g_nextrandom >> 16) & 0xFFFF;
 }
 
diff --git a/common/tea.c b/common/tea.c
index 287a12de9..a7de87fc3 100644
--- a/common/tea.c
+++ b/common/tea.c
@@ -11,54 +11,56 @@
 #define DELTA  0x9E3779B9
 #define SUM    0xC6EF3720
 
-void tea_encrypt(uint8_t *v, uint8_t *key) {
+void tea_encrypt(uint8_t *v, uint8_t *key)
+{
 
-    uint32_t a=0,b=0,c=0,d=0,y=0,z=0;
+    uint32_t a = 0, b = 0, c = 0, d = 0, y = 0, z = 0;
     uint32_t sum = 0;
     uint8_t n = ROUNDS;
 
     //key
     a = bytes_to_num(key, 4);
-    b = bytes_to_num(key+4, 4);
-    c = bytes_to_num(key+8, 4);
-    d = bytes_to_num(key+12, 4);
+    b = bytes_to_num(key + 4, 4);
+    c = bytes_to_num(key + 8, 4);
+    d = bytes_to_num(key + 12, 4);
 
     //input
     y = bytes_to_num(v, 4);
-    z = bytes_to_num(v+4, 4);
+    z = bytes_to_num(v + 4, 4);
 
-    while ( n-- > 0 ) {
+    while (n-- > 0) {
         sum += DELTA;
         y += ((z << 4) + a) ^ (z + sum) ^ ((z >> 5) + b);
         z += ((y << 4) + c) ^ (y + sum) ^ ((y >> 5) + d);
     }
 
     num_to_bytes(y, 4, v);
-    num_to_bytes(z, 4, v+4);
+    num_to_bytes(z, 4, v + 4);
 }
 
-void tea_decrypt(uint8_t *v, uint8_t *key) {
+void tea_decrypt(uint8_t *v, uint8_t *key)
+{
 
-    uint32_t a=0,b=0,c=0,d=0,y=0,z=0;
+    uint32_t a = 0, b = 0, c = 0, d = 0, y = 0, z = 0;
     uint32_t sum = SUM;
     uint8_t n = ROUNDS;
 
     //key
     a = bytes_to_num(key, 4);
-    b = bytes_to_num(key+4, 4);
-    c = bytes_to_num(key+8, 4);
-    d = bytes_to_num(key+12, 4);
+    b = bytes_to_num(key + 4, 4);
+    c = bytes_to_num(key + 8, 4);
+    d = bytes_to_num(key + 12, 4);
 
     //input
     y = bytes_to_num(v, 4);
-    z = bytes_to_num(v+4, 4);
+    z = bytes_to_num(v + 4, 4);
 
     /* sum = delta<<5, in general sum = delta * n */
-    while ( n-- > 0 ) {
+    while (n-- > 0) {
         z -= ((y << 4) + c) ^ (y + sum) ^ ((y >> 5) + d);
         y -= ((z << 4) + a) ^ (z + sum) ^ ((z >> 5) + b);
         sum -= DELTA;
     }
     num_to_bytes(y, 4, v);
-    num_to_bytes(z, 4, v+4);
+    num_to_bytes(z, 4, v + 4);
 }
diff --git a/common/usart.c b/common/usart.c
index 9371e6243..260b8ff75 100644
--- a/common/usart.c
+++ b/common/usart.c
@@ -44,7 +44,8 @@ static uint8_t us_outbuf[sizeof(UsbCommand)];
 /// Reads data from an USART peripheral
 /// \param data  Pointer to the buffer where the received data will be stored.
 /// \param len  Size of the data buffer (in bytes).
-inline int16_t usart_readbuffer(uint8_t *data, size_t len) {
+inline int16_t usart_readbuffer(uint8_t *data, size_t len)
+{
 
     // Check if the first PDC bank is free
     if (!(pUS1->US_RCR)) {
@@ -68,7 +69,8 @@ inline int16_t usart_readbuffer(uint8_t *data, size_t len) {
 
 
 // transfer from device to client
-inline int16_t usart_writebuffer(uint8_t *data, size_t len) {
+inline int16_t usart_writebuffer(uint8_t *data, size_t len)
+{
 
     // Check if the first PDC bank is free
     if (!(pUS1->US_TCR)) {
@@ -92,7 +94,8 @@ inline int16_t usart_writebuffer(uint8_t *data, size_t len) {
     }
 }
 
-void usart_init(void) {
+void usart_init(void)
+{
 
     // disable & reset receiver / transmitter for configuration
     pUS1->US_CR = (AT91C_US_RSTRX | AT91C_US_RSTTX | AT91C_US_RXDIS | AT91C_US_TXDIS);
@@ -112,11 +115,11 @@ void usart_init(void) {
 
     // set mode
     pUS1->US_MR = AT91C_US_USMODE_NORMAL |      // normal mode
-               AT91C_US_CLKS_CLOCK |            // MCK (48MHz)
-               AT91C_US_CHRL_8_BITS |           // 8 bits
-               AT91C_US_PAR_NONE |              // parity: none
-               AT91C_US_NBSTOP_1_BIT |          // 1 stop bit
-               AT91C_US_CHMODE_NORMAL;          // channel mode: normal
+                  AT91C_US_CLKS_CLOCK |            // MCK (48MHz)
+                  AT91C_US_CHRL_8_BITS |           // 8 bits
+                  AT91C_US_PAR_NONE |              // parity: none
+                  AT91C_US_NBSTOP_1_BIT |          // 1 stop bit
+                  AT91C_US_CHMODE_NORMAL;          // channel mode: normal
 
     // all interrupts disabled
     pUS1->US_IDR = 0xFFFF;
diff --git a/common/usb_cdc.c b/common/usb_cdc.c
index b60ec8176..f37737aa8 100644
--- a/common/usb_cdc.c
+++ b/common/usb_cdc.c
@@ -135,14 +135,14 @@ static const char devDescriptor[] = {
     /* Device descriptor */
     0x12,      // Length
     USB_DESCRIPTOR_DEVICE,      // Descriptor Type (DEVICE)
-    0x00,0x02, // Complies with USB Spec. Release (0200h = release 2.00)  0210 == release 2.10
+    0x00, 0x02, // Complies with USB Spec. Release (0200h = release 2.00)  0210 == release 2.10
     2,      // Device Class:    Communication Device Class
     0,      // Device Subclass: CDC class sub code ACM [ice 0x02 = win10 virtual comport ]
     0,      // Device Protocol: CDC Device protocol (unused)
     AT91C_EP_CONTROL_SIZE,      // MaxPacketSize0
-    0xc4,0x9a, // Vendor ID  [0x9ac4 = J. Westhues]
-    0x8f,0x4b, // Product ID [0x4b8f = Proxmark-3 RFID Instrument]
-    0x00,0x01, // BCD Device release number (1.00)
+    0xc4, 0x9a, // Vendor ID  [0x9ac4 = J. Westhues]
+    0x8f, 0x4b, // Product ID [0x4b8f = Proxmark-3 RFID Instrument]
+    0x00, 0x01, // BCD Device release number (1.00)
     1,      // index Manufacturer
     2,      // index Product
     3,      // index SerialNumber
@@ -155,7 +155,7 @@ static const char cfgDescriptor[] = {
     // -----------------------------
     9,         // Length
     USB_DESCRIPTOR_CONFIGURATION, // Descriptor Type
-    (9+9+5+5+4+5+7+9+7+7), 0,     // Total Length 2 EP + Control
+    (9 + 9 + 5 + 5 + 4 + 5 + 7 + 9 + 7 + 7), 0, // Total Length 2 EP + Control
     2,         // Number of Interfaces
     1,         // Index value of this Configuration (used in SetConfiguration from Host)
     0,         // Configuration string index
@@ -164,16 +164,16 @@ static const char cfgDescriptor[] = {
 
     // IAD to associate the one CDC interface
     // --------------------------------------
-/*
-    8,         // Length
-    USB_DESCRIPTOR_IAD, // IAD_DESCRIPTOR (0x0B)
-    0,         // CDC_INT_INTERFACE NUMBER  (
-    2,         // IAD INTERFACE COUNT (two interfaces)
-    2,         // Function Class: CDC_CLASS
-    2,         // Function SubClass: ACM
-    1,         // Function Protocol: v.25term
-    0,         // iInterface
-*/
+    /*
+        8,         // Length
+        USB_DESCRIPTOR_IAD, // IAD_DESCRIPTOR (0x0B)
+        0,         // CDC_INT_INTERFACE NUMBER  (
+        2,         // IAD INTERFACE COUNT (two interfaces)
+        2,         // Function Class: CDC_CLASS
+        2,         // Function SubClass: ACM
+        1,         // Function Protocol: v.25term
+        0,         // iInterface
+    */
 
     /* Interface 0 Descriptor */
     /* CDC Communication Class Interface Descriptor Requirement for Notification*/
@@ -192,7 +192,7 @@ static const char cfgDescriptor[] = {
     5,         // Function Length
     0x24,      // Descriptor type:    CS_INTERFACE
     0,         // Descriptor subtype: Header Functional Descriptor
-    0x10,0x01, // bcd CDC:1.1
+    0x10, 0x01, // bcd CDC:1.1
 
     /* ACM Functional Descriptor */
     4,         // Function Length
@@ -264,18 +264,18 @@ static const char cfgDescriptor[] = {
 
 // BOS descriptor
 static const char bosDescriptor[] = {
-        0x5,
-        USB_DESCRIPTOR_TYPE_BO,
-        0xC,
-        0x0,
-        0x1,  // 1 device capability
-        0x7,
-        0x10, // USB_DEVICE_CAPABITY_TYPE,
-        0x2,
-        0x2,  // LPM capability bit set
-        0x0,
-        0x0,
-        0x0
+    0x5,
+    USB_DESCRIPTOR_TYPE_BO,
+    0xC,
+    0x0,
+    0x1,  // 1 device capability
+    0x7,
+    0x10, // USB_DEVICE_CAPABITY_TYPE,
+    0x2,
+    0x2,  // LPM capability bit set
+    0x0,
+    0x0,
+    0x0
 };
 
 // Microsoft OS Extended Configuration Compatible ID Descriptor
@@ -369,62 +369,68 @@ static const char StrLanguageCodes[] = {
 static const char StrManufacturer[] = {
     26,         // Length
     0x03,       // Type is string
-    'p',0,'r',0,'o',0,'x',0,'m',0,'a',0,'r',0,'k',0,'.',0,'o',0,'r',0,'g',0,
+    'p', 0, 'r', 0, 'o', 0, 'x', 0, 'm', 0, 'a', 0, 'r', 0, 'k', 0, '.', 0, 'o', 0, 'r', 0, 'g', 0,
 };
 
 static const char StrProduct[] = {
     20,         // Length
     0x03,       // Type is string
-    'p',0,'r',0,'o',0,'x',0,'m',0,'a',0,'r',0,'k',0,'3',0
+    'p', 0, 'r', 0, 'o', 0, 'x', 0, 'm', 0, 'a', 0, 'r', 0, 'k', 0, '3', 0
 };
 
 static const char StrSerialNumber[] = {
     14,         // Length
     0x03,       // Type is string
-    'i',0,'c',0,'e',0,'m',0,'a',0,'n',0
+    'i', 0, 'c', 0, 'e', 0, 'm', 0, 'a', 0, 'n', 0
 };
 
 // size includes their own field.
 static const char StrMS_OSDescriptor[] = {
     18,         // length 0x12
     0x03,       // Type is string
-    'M',0,'S',0,'F',0,'T',0,'1',0,'0',0,'0',0,MS_VENDOR_CODE,0
+    'M', 0, 'S', 0, 'F', 0, 'T', 0, '1', 0, '0', 0, '0', 0, MS_VENDOR_CODE, 0
 };
 
-const char* getStringDescriptor(uint8_t idx) {
-    switch(idx) {
-        case 0: return StrLanguageCodes;
-        case 1: return StrManufacturer;
-        case 2: return StrProduct;
-        case 3: return StrSerialNumber;
-        case MS_OS_DESCRIPTOR_INDEX: return StrMS_OSDescriptor;
+const char *getStringDescriptor(uint8_t idx)
+{
+    switch (idx) {
+        case 0:
+            return StrLanguageCodes;
+        case 1:
+            return StrManufacturer;
+        case 2:
+            return StrProduct;
+        case 3:
+            return StrSerialNumber;
+        case MS_OS_DESCRIPTOR_INDEX:
+            return StrMS_OSDescriptor;
         default:
-            return(NULL);
+            return (NULL);
     }
 }
 
 // Bitmap for all status bits in CSR which must be written as 1 to cause no effect
 #define REG_NO_EFFECT_1_ALL      AT91C_UDP_RX_DATA_BK0 | AT91C_UDP_RX_DATA_BK1 \
-                                |AT91C_UDP_STALLSENT   | AT91C_UDP_RXSETUP \
-                                |AT91C_UDP_TXCOMP
+    |AT91C_UDP_STALLSENT   | AT91C_UDP_RXSETUP \
+    |AT91C_UDP_TXCOMP
 
 // Clear flags in the UDP_CSR register and waits for synchronization
 #define UDP_CLEAR_EP_FLAGS(endpoint, flags) { \
-    volatile unsigned int reg; \
-    reg = pUdp->UDP_CSR[(endpoint)]; \
-    reg |= REG_NO_EFFECT_1_ALL; \
-    reg &= ~(flags); \
-    pUdp->UDP_CSR[(endpoint)] = reg; \
-} \
+        volatile unsigned int reg; \
+        reg = pUdp->UDP_CSR[(endpoint)]; \
+        reg |= REG_NO_EFFECT_1_ALL; \
+        reg &= ~(flags); \
+        pUdp->UDP_CSR[(endpoint)] = reg; \
+    } \
 
 // reset flags in the UDP_CSR register and waits for synchronization
 #define UDP_SET_EP_FLAGS(endpoint, flags) { \
-    volatile unsigned int reg; \
-    reg = pUdp->UDP_CSR[(endpoint)]; \
-    reg |= REG_NO_EFFECT_1_ALL; \
-    reg |= (flags); \
-    pUdp->UDP_CSR[(endpoint)] = reg; \
-} \
+        volatile unsigned int reg; \
+        reg = pUdp->UDP_CSR[(endpoint)]; \
+        reg |= REG_NO_EFFECT_1_ALL; \
+        reg |= (flags); \
+        pUdp->UDP_CSR[(endpoint)] = reg; \
+    } \
 
 
 typedef struct {
@@ -438,9 +444,11 @@ AT91S_CDC_LINE_CODING line = {
     115200, // baudrate
     0,      // 1 Stop Bit
     0,      // None Parity
-    8};     // 8 Data bits
+    8
+};     // 8 Data bits
 
-static void SpinDelay(int ms) {
+static void SpinDelay(int ms)
+{
     int us = ms * 1000;
     int ticks = (48 * us) >> 10;
 
@@ -454,7 +462,7 @@ static void SpinDelay(int ms) {
 
     uint16_t start = AT91C_BASE_PWMC_CH0->PWMC_CCNTR;
 
-    for(;;) {
+    for (;;) {
         uint16_t now = AT91C_BASE_PWMC_CH0->PWMC_CCNTR;
         if (now == (uint16_t)(start + ticks))
             return;
@@ -467,7 +475,8 @@ static void SpinDelay(int ms) {
 //* \fn    usb_disable
 //* \brief This function deactivates the USB device
 //*----------------------------------------------------------------------------
-void usb_disable() {
+void usb_disable()
+{
     // Disconnect the USB device
     AT91C_BASE_PIOA->PIO_ODR = GPIO_USB_PU;
 
@@ -481,7 +490,8 @@ void usb_disable() {
 //* \fn    usb_enable
 //* \brief This function Activates the USB device
 //*----------------------------------------------------------------------------
-void usb_enable() {
+void usb_enable()
+{
     // Set the PLL USB Divider
     AT91C_BASE_CKGR->CKGR_PLLR |= AT91C_CKGR_USBDIV_1 ;
 
@@ -519,20 +529,25 @@ void usb_enable() {
 //*----------------------------------------------------------------------------
 static int usb_reconnect = 0;
 static int usb_configured = 0;
-void SetUSBreconnect(int value) {
+void SetUSBreconnect(int value)
+{
     usb_reconnect = value;
 }
-int GetUSBreconnect(void) {
+int GetUSBreconnect(void)
+{
     return usb_reconnect;
 }
-void SetUSBconfigured(int value) {
+void SetUSBconfigured(int value)
+{
     usb_configured = value;
 }
-int GetUSBconfigured(void){
+int GetUSBconfigured(void)
+{
     return usb_configured;
 }
 
-bool usb_check() {
+bool usb_check()
+{
 
     /*
     // reconnected ONCE and
@@ -563,14 +578,13 @@ bool usb_check() {
     if (isr & AT91C_UDP_ENDBUSRES) {
         pUdp->UDP_ICR = AT91C_UDP_ENDBUSRES;
         // reset all endpoints
-        pUdp->UDP_RSTEP  = (unsigned int)-1;
+        pUdp->UDP_RSTEP  = (unsigned int) -1;
         pUdp->UDP_RSTEP  = 0;
         // Enable the function
         pUdp->UDP_FADDR = AT91C_UDP_FEN;
         // Configure endpoint 0  (enable control endpoint)
         pUdp->UDP_CSR[AT91C_EP_CONTROL] = (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_CTRL);
-    }
-    else if (isr & AT91C_UDP_EPINT0) {
+    } else if (isr & AT91C_UDP_EPINT0) {
         pUdp->UDP_ICR = AT91C_UDP_EPINT0;
         AT91F_CDC_Enumerate();
     }
@@ -584,7 +598,8 @@ bool usb_check() {
     return (btConfiguration) ? true : false;
 }
 
-bool usb_poll() {
+bool usb_poll()
+{
     if (!usb_check()) return false;
     return (pUdp->UDP_CSR[AT91C_EP_OUT] & btReceiveBank);
 }
@@ -597,7 +612,8 @@ bool usb_poll() {
     that the length available to read is non-zero, thus hopefully fixes the
     bug.
 **/
-bool usb_poll_validate_length() {
+bool usb_poll_validate_length()
+{
     if (!usb_check()) return false;
     if (!(pUdp->UDP_CSR[AT91C_EP_OUT] & btReceiveBank)) return false;
     return ((pUdp->UDP_CSR[AT91C_EP_OUT] & AT91C_UDP_RXBYTECNT) >> 16) >  0;
@@ -607,9 +623,10 @@ bool usb_poll_validate_length() {
 //* \fn    usb_read
 //* \brief Read available data from Endpoint 1 OUT (host to device)
 //*----------------------------------------------------------------------------
-uint32_t usb_read(byte_t* data, size_t len) {
+uint32_t usb_read(byte_t *data, size_t len)
+{
 
-    if ( len == 0 ) return 0;
+    if (len == 0) return 0;
 
     uint8_t bank = btReceiveBank;
     uint32_t packetSize, nbBytesRcv = 0;
@@ -618,10 +635,10 @@ uint32_t usb_read(byte_t* data, size_t len) {
     while (len)  {
         if (!usb_check()) break;
 
-        if ( pUdp->UDP_CSR[AT91C_EP_OUT] & bank ) {
+        if (pUdp->UDP_CSR[AT91C_EP_OUT] & bank) {
 
             packetSize = (pUdp->UDP_CSR[AT91C_EP_OUT] & AT91C_UDP_RXBYTECNT) >> 16;
-            packetSize = MIN( packetSize, len);
+            packetSize = MIN(packetSize, len);
             len -= packetSize;
             while (packetSize--)
                 data[nbBytesRcv++] = pUdp->UDP_FDR[AT91C_EP_OUT];
@@ -645,13 +662,14 @@ uint32_t usb_read(byte_t* data, size_t len) {
 //* \fn    usb_write
 //* \brief Send through endpoint 2 (device to host)
 //*----------------------------------------------------------------------------
-uint32_t usb_write(const byte_t* data, const size_t len) {
+uint32_t usb_write(const byte_t *data, const size_t len)
+{
 
     if (!len) return 0;
     if (!usb_check()) return 0;
 
     // can we write?
-    if ( (pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXPKTRDY) != 0 ) return 0;
+    if ((pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXPKTRDY) != 0) return 0;
 
     size_t length = len;
     uint32_t cpt = 0;
@@ -701,7 +719,8 @@ uint32_t usb_write(const byte_t* data, const size_t len) {
 //* \fn    AT91F_USB_SendData
 //* \brief Send Data through the control endpoint
 //*----------------------------------------------------------------------------
-void AT91F_USB_SendData(AT91PS_UDP pUdp, const char *pData, uint32_t length) {
+void AT91F_USB_SendData(AT91PS_UDP pUdp, const char *pData, uint32_t length)
+{
     uint32_t cpt = 0;
     AT91_REG csr;
 
@@ -722,12 +741,12 @@ void AT91F_USB_SendData(AT91PS_UDP pUdp, const char *pData, uint32_t length) {
         do {
             csr = pUdp->UDP_CSR[AT91C_EP_CONTROL];
             // Data IN stage has been stopped by a status OUT
-            if ( csr & AT91C_UDP_RX_DATA_BK0) {
+            if (csr & AT91C_UDP_RX_DATA_BK0) {
 
                 UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_RX_DATA_BK0)
                 return;
             }
-        } while ( !(csr & AT91C_UDP_TXCOMP) );
+        } while (!(csr & AT91C_UDP_TXCOMP));
 
     } while (length);
 
@@ -742,9 +761,10 @@ void AT91F_USB_SendData(AT91PS_UDP pUdp, const char *pData, uint32_t length) {
 //* \fn    AT91F_USB_SendZlp
 //* \brief Send zero length packet through the control endpoint
 //*----------------------------------------------------------------------------
-void AT91F_USB_SendZlp(AT91PS_UDP pUdp) {
+void AT91F_USB_SendZlp(AT91PS_UDP pUdp)
+{
     UDP_SET_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_TXPKTRDY);
-    while ( !(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_TXCOMP) );
+    while (!(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_TXCOMP));
     UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_TXCOMP);
     while (pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_TXCOMP);
 }
@@ -753,10 +773,11 @@ void AT91F_USB_SendZlp(AT91PS_UDP pUdp) {
 //* \fn    AT91F_USB_SendStall
 //* \brief Stall the control endpoint
 //*----------------------------------------------------------------------------
-void AT91F_USB_SendStall(AT91PS_UDP pUdp) {
+void AT91F_USB_SendStall(AT91PS_UDP pUdp)
+{
     UDP_SET_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_FORCESTALL);
-    while ( !(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_ISOERROR) );
-    UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, (AT91C_UDP_FORCESTALL | AT91C_UDP_ISOERROR) );
+    while (!(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_ISOERROR));
+    UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, (AT91C_UDP_FORCESTALL | AT91C_UDP_ISOERROR));
     while (pUdp->UDP_CSR[AT91C_EP_CONTROL] & (AT91C_UDP_FORCESTALL | AT91C_UDP_ISOERROR));
 }
 
@@ -767,11 +788,12 @@ void AT91F_USB_SendStall(AT91PS_UDP pUdp) {
 //* 1. this is for USB endpoint0.  the control endpoint.
 //* 2. mixed with CDC ACM endpoint3 , interrupt, control endpoint
 //*----------------------------------------------------------------------------
-void AT91F_CDC_Enumerate() {
+void AT91F_CDC_Enumerate()
+{
     byte_t bmRequestType, bRequest;
     uint16_t wValue, wIndex, wLength, wStatus;
 
-    if ( !(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_RXSETUP) )
+    if (!(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_RXSETUP))
         return;
 
     bmRequestType = pUdp->UDP_FDR[AT91C_EP_CONTROL];
@@ -785,10 +807,10 @@ void AT91F_CDC_Enumerate() {
 
     if (bmRequestType & 0x80) {        // Data Phase Transfer Direction Device to Host
         UDP_SET_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_DIR);
-        while ( !(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_DIR) );
+        while (!(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_DIR));
     }
     UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_RXSETUP);
-    while ( (pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_RXSETUP)  );
+    while ((pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_RXSETUP));
 
     /*
     if ( bRequest == MS_VENDOR_CODE) {
@@ -810,15 +832,15 @@ void AT91F_CDC_Enumerate() {
 
     // Handle supported standard device request Cf Table 9-3 in USB specification Rev 1.1
     switch ((bRequest << 8) | bmRequestType) {
-    case STD_GET_DESCRIPTOR: {
+        case STD_GET_DESCRIPTOR: {
 
-            if ( wValue == 0x100 )       // Return Device Descriptor
+            if (wValue == 0x100)         // Return Device Descriptor
                 AT91F_USB_SendData(pUdp, devDescriptor, MIN(sizeof(devDescriptor), wLength));
-            else if ( wValue == 0x200 )  // Return Configuration Descriptor
+            else if (wValue == 0x200)    // Return Configuration Descriptor
                 AT91F_USB_SendData(pUdp, cfgDescriptor, MIN(sizeof(cfgDescriptor), wLength));
-            else if ( (wValue & 0xF00) == 0xF00) // Return BOS Descriptor
+            else if ((wValue & 0xF00) == 0xF00)  // Return BOS Descriptor
                 AT91F_USB_SendData(pUdp, bosDescriptor, MIN(sizeof(bosDescriptor), wLength));
-            else if ( (wValue & 0x300) == 0x300) { // Return String Descriptor
+            else if ((wValue & 0x300) == 0x300) {  // Return String Descriptor
 
                 const char *strDescriptor = getStringDescriptor(wValue & 0xff);
                 if (strDescriptor != NULL) {
@@ -831,118 +853,117 @@ void AT91F_CDC_Enumerate() {
             }
         }
         break;
-    case STD_SET_ADDRESS:
-        AT91F_USB_SendZlp(pUdp);
-        pUdp->UDP_FADDR = (AT91C_UDP_FEN | (wValue & 0x7F) );
-        pUdp->UDP_GLBSTATE  = (wValue) ? AT91C_UDP_FADDEN : 0;
-        break;
-    case STD_SET_CONFIGURATION:
-
-        /*
-        *   Set or clear the device "configured" state.
-        *   The LSB of wValue is the "Configuration Number". If this value is non-zero,
-        *   it should be the same number as defined in the Configuration Descriptor;
-        *   otherwise an error must have occurred.
-        *   This device has only one configuration and its Config Number is CONF_NB (= 1).
-        */
-        AT91F_USB_SendZlp(pUdp);
-        btConfiguration = wValue;
-        pUdp->UDP_GLBSTATE  = (wValue) ? AT91C_UDP_CONFG : AT91C_UDP_FADDEN;
-
-        // make sure we are not stalled
-        /*
-        UDP_CLEAR_EP_FLAGS(AT91C_EP_OUT   , AT91C_UDP_FORCESTALL);
-        UDP_CLEAR_EP_FLAGS(AT91C_EP_IN    , AT91C_UDP_FORCESTALL);
-        UDP_CLEAR_EP_FLAGS(AT91C_EP_NOTIFY, AT91C_UDP_FORCESTALL);
-        */
-
-        // enable endpoints
-        pUdp->UDP_CSR[AT91C_EP_OUT]    = (wValue) ? (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_BULK_OUT) : 0;
-        pUdp->UDP_CSR[AT91C_EP_IN]     = (wValue) ? (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_BULK_IN)  : 0;
-        pUdp->UDP_CSR[AT91C_EP_NOTIFY] = (wValue) ? (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_INT_IN)   : 0;
-        break;
-    case STD_GET_CONFIGURATION:
-        AT91F_USB_SendData(pUdp, (char *) &(btConfiguration), sizeof(btConfiguration));
-        break;
-    case STD_GET_STATUS_ZERO:
-        wStatus = 0;   // Device is Bus powered, remote wakeup disabled
-        AT91F_USB_SendData(pUdp, (char *) &wStatus, sizeof(wStatus));
-        break;
-    case STD_GET_STATUS_INTERFACE:
-        wStatus = 0;   // reserved for future use
-        AT91F_USB_SendData(pUdp, (char *) &wStatus, sizeof(wStatus));
-        break;
-    case STD_GET_STATUS_ENDPOINT:
-        wStatus = 0;
-        wIndex &= 0x0F;
-        if ((pUdp->UDP_GLBSTATE & AT91C_UDP_CONFG) && (wIndex <= AT91C_EP_NOTIFY)) {
-            wStatus = (pUdp->UDP_CSR[wIndex] & AT91C_UDP_EPEDS) ? 0 : 1;
-            AT91F_USB_SendData(pUdp, (char *) &wStatus, sizeof(wStatus));
-        }
-        else if ((pUdp->UDP_GLBSTATE & AT91C_UDP_FADDEN) && (wIndex == AT91C_EP_CONTROL)) {
-            wStatus = (pUdp->UDP_CSR[wIndex] & AT91C_UDP_EPEDS) ? 0 : 1;
-            AT91F_USB_SendData(pUdp, (char *) &wStatus, sizeof(wStatus));
-        } else {
-            AT91F_USB_SendStall(pUdp);
-        }
-        break;
-    case STD_SET_FEATURE_ZERO:
-        AT91F_USB_SendStall(pUdp);
-        break;
-    case STD_SET_FEATURE_INTERFACE:
-        AT91F_USB_SendZlp(pUdp);
-        break;
-    case STD_SET_FEATURE_ENDPOINT:
-        wIndex &= 0x0F;
-        if ((wValue == 0) && (wIndex >= AT91C_EP_OUT) && (wIndex <= AT91C_EP_NOTIFY)) {
-            pUdp->UDP_CSR[wIndex] = 0;
+        case STD_SET_ADDRESS:
             AT91F_USB_SendZlp(pUdp);
-        } else {
-            AT91F_USB_SendStall(pUdp);
-        }
-        break;
-    case STD_CLEAR_FEATURE_ZERO:
-        AT91F_USB_SendStall(pUdp);
-        break;
-    case STD_CLEAR_FEATURE_INTERFACE:
-        AT91F_USB_SendZlp(pUdp);
-        break;
-    case STD_CLEAR_FEATURE_ENDPOINT:
-        wIndex &= 0x0F;
-        if ((wValue == 0) && (wIndex >= AT91C_EP_OUT) && (wIndex <= AT91C_EP_NOTIFY)) {
-
-            if (wIndex == AT91C_EP_OUT)         pUdp->UDP_CSR[AT91C_EP_OUT] = (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_BULK_OUT);
-            else if (wIndex == AT91C_EP_IN)     pUdp->UDP_CSR[AT91C_EP_IN] = (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_BULK_IN);
-            else if (wIndex == AT91C_EP_NOTIFY) pUdp->UDP_CSR[AT91C_EP_NOTIFY] = (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_INT_IN);
+            pUdp->UDP_FADDR = (AT91C_UDP_FEN | (wValue & 0x7F));
+            pUdp->UDP_GLBSTATE  = (wValue) ? AT91C_UDP_FADDEN : 0;
+            break;
+        case STD_SET_CONFIGURATION:
 
+            /*
+            *   Set or clear the device "configured" state.
+            *   The LSB of wValue is the "Configuration Number". If this value is non-zero,
+            *   it should be the same number as defined in the Configuration Descriptor;
+            *   otherwise an error must have occurred.
+            *   This device has only one configuration and its Config Number is CONF_NB (= 1).
+            */
             AT91F_USB_SendZlp(pUdp);
-        } else {
-            AT91F_USB_SendStall(pUdp);
-        }
-        break;
+            btConfiguration = wValue;
+            pUdp->UDP_GLBSTATE  = (wValue) ? AT91C_UDP_CONFG : AT91C_UDP_FADDEN;
 
-    // handle CDC class requests
-    case SET_LINE_CODING: {
-    /*
-        uint8_t i;
-        for ( i = 0 ; i < 7 ; i++ )  {
-            ((uint8_t*)&line)[i] =  pUdp->UDP_FDR[AT91C_EP_CONTROL];
-        }  */
-        // ignore SET_LINE_CODING...
-        while ( !(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_RX_DATA_BK0) );
-        UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_RX_DATA_BK0);
-        AT91F_USB_SendZlp(pUdp);
-        break;
-    }
-    case GET_LINE_CODING:
-        AT91F_USB_SendData(pUdp, (char *) &line, MIN(sizeof(line), wLength));
-        break;
-    case SET_CONTROL_LINE_STATE:
-        btConnection = wValue;
-        AT91F_USB_SendZlp(pUdp);
-        break;
-    default:
-        AT91F_USB_SendStall(pUdp);
-        break;
+            // make sure we are not stalled
+            /*
+            UDP_CLEAR_EP_FLAGS(AT91C_EP_OUT   , AT91C_UDP_FORCESTALL);
+            UDP_CLEAR_EP_FLAGS(AT91C_EP_IN    , AT91C_UDP_FORCESTALL);
+            UDP_CLEAR_EP_FLAGS(AT91C_EP_NOTIFY, AT91C_UDP_FORCESTALL);
+            */
+
+            // enable endpoints
+            pUdp->UDP_CSR[AT91C_EP_OUT]    = (wValue) ? (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_BULK_OUT) : 0;
+            pUdp->UDP_CSR[AT91C_EP_IN]     = (wValue) ? (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_BULK_IN)  : 0;
+            pUdp->UDP_CSR[AT91C_EP_NOTIFY] = (wValue) ? (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_INT_IN)   : 0;
+            break;
+        case STD_GET_CONFIGURATION:
+            AT91F_USB_SendData(pUdp, (char *) & (btConfiguration), sizeof(btConfiguration));
+            break;
+        case STD_GET_STATUS_ZERO:
+            wStatus = 0;   // Device is Bus powered, remote wakeup disabled
+            AT91F_USB_SendData(pUdp, (char *) &wStatus, sizeof(wStatus));
+            break;
+        case STD_GET_STATUS_INTERFACE:
+            wStatus = 0;   // reserved for future use
+            AT91F_USB_SendData(pUdp, (char *) &wStatus, sizeof(wStatus));
+            break;
+        case STD_GET_STATUS_ENDPOINT:
+            wStatus = 0;
+            wIndex &= 0x0F;
+            if ((pUdp->UDP_GLBSTATE & AT91C_UDP_CONFG) && (wIndex <= AT91C_EP_NOTIFY)) {
+                wStatus = (pUdp->UDP_CSR[wIndex] & AT91C_UDP_EPEDS) ? 0 : 1;
+                AT91F_USB_SendData(pUdp, (char *) &wStatus, sizeof(wStatus));
+            } else if ((pUdp->UDP_GLBSTATE & AT91C_UDP_FADDEN) && (wIndex == AT91C_EP_CONTROL)) {
+                wStatus = (pUdp->UDP_CSR[wIndex] & AT91C_UDP_EPEDS) ? 0 : 1;
+                AT91F_USB_SendData(pUdp, (char *) &wStatus, sizeof(wStatus));
+            } else {
+                AT91F_USB_SendStall(pUdp);
+            }
+            break;
+        case STD_SET_FEATURE_ZERO:
+            AT91F_USB_SendStall(pUdp);
+            break;
+        case STD_SET_FEATURE_INTERFACE:
+            AT91F_USB_SendZlp(pUdp);
+            break;
+        case STD_SET_FEATURE_ENDPOINT:
+            wIndex &= 0x0F;
+            if ((wValue == 0) && (wIndex >= AT91C_EP_OUT) && (wIndex <= AT91C_EP_NOTIFY)) {
+                pUdp->UDP_CSR[wIndex] = 0;
+                AT91F_USB_SendZlp(pUdp);
+            } else {
+                AT91F_USB_SendStall(pUdp);
+            }
+            break;
+        case STD_CLEAR_FEATURE_ZERO:
+            AT91F_USB_SendStall(pUdp);
+            break;
+        case STD_CLEAR_FEATURE_INTERFACE:
+            AT91F_USB_SendZlp(pUdp);
+            break;
+        case STD_CLEAR_FEATURE_ENDPOINT:
+            wIndex &= 0x0F;
+            if ((wValue == 0) && (wIndex >= AT91C_EP_OUT) && (wIndex <= AT91C_EP_NOTIFY)) {
+
+                if (wIndex == AT91C_EP_OUT)         pUdp->UDP_CSR[AT91C_EP_OUT] = (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_BULK_OUT);
+                else if (wIndex == AT91C_EP_IN)     pUdp->UDP_CSR[AT91C_EP_IN] = (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_BULK_IN);
+                else if (wIndex == AT91C_EP_NOTIFY) pUdp->UDP_CSR[AT91C_EP_NOTIFY] = (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_INT_IN);
+
+                AT91F_USB_SendZlp(pUdp);
+            } else {
+                AT91F_USB_SendStall(pUdp);
+            }
+            break;
+
+        // handle CDC class requests
+        case SET_LINE_CODING: {
+            /*
+                uint8_t i;
+                for ( i = 0 ; i < 7 ; i++ )  {
+                    ((uint8_t*)&line)[i] =  pUdp->UDP_FDR[AT91C_EP_CONTROL];
+                }  */
+            // ignore SET_LINE_CODING...
+            while (!(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_RX_DATA_BK0));
+            UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_RX_DATA_BK0);
+            AT91F_USB_SendZlp(pUdp);
+            break;
+        }
+        case GET_LINE_CODING:
+            AT91F_USB_SendData(pUdp, (char *) &line, MIN(sizeof(line), wLength));
+            break;
+        case SET_CONTROL_LINE_STATE:
+            btConnection = wValue;
+            AT91F_USB_SendZlp(pUdp);
+            break;
+        default:
+            AT91F_USB_SendStall(pUdp);
+            break;
     }
 }
\ No newline at end of file
diff --git a/common/usb_cdc.h b/common/usb_cdc.h
index aad046cc1..d364a9b3a 100644
--- a/common/usb_cdc.h
+++ b/common/usb_cdc.h
@@ -46,8 +46,8 @@ extern void usb_enable();
 extern bool usb_check();
 extern bool usb_poll();
 extern bool usb_poll_validate_length();
-extern uint32_t usb_read(byte_t* data, size_t len);
-extern uint32_t usb_write(const byte_t* data, const size_t len);
+extern uint32_t usb_read(byte_t *data, size_t len);
+extern uint32_t usb_write(const byte_t *data, const size_t len);
 
 extern void SetUSBreconnect(int value);
 extern int GetUSBreconnect(void);
diff --git a/common/wiegand.c b/common/wiegand.c
index 18f1bca7d..96b6b1dde 100644
--- a/common/wiegand.c
+++ b/common/wiegand.c
@@ -15,12 +15,13 @@
 * @param type     use the defined values  EVEN|ODD
 * @return parity bit required to match type
 */
-uint8_t getParity( uint8_t *bits, uint8_t len, uint8_t type ) {
+uint8_t getParity(uint8_t *bits, uint8_t len, uint8_t type)
+{
     uint8_t x = 0;
-    for(; len > 0; --len)
+    for (; len > 0; --len)
         x += bits[len - 1];
 
-    return (x & 1 ) ^ type;
+    return (x & 1) ^ type;
 }
 
 // by marshmellow
@@ -36,23 +37,29 @@ uint8_t checkParity(uint32_t bits, uint8_t len, uint8_t type);
 // by marshmellow
 // takes a array of binary values, start position, length of bits per parity (includes parity bit),
 // Parity Type (1 for odd; 0 for even; 2 for Always 1's; 3 for Always 0's), and binary Length (length to run)
-size_t removeParity(uint8_t *bitstream, size_t startIdx, uint8_t pLen, uint8_t pType, size_t bLen) {
+size_t removeParity(uint8_t *bitstream, size_t startIdx, uint8_t pLen, uint8_t pType, size_t bLen)
+{
     uint32_t parityWd = 0;
     size_t j = 0, bitcount = 0;
-    for (int word = 0; word < (bLen); word += pLen){
-        for (int bit = 0; bit < pLen; ++bit){
-            parityWd = (parityWd << 1) | bitstream[startIdx+word+bit];
+    for (int word = 0; word < (bLen); word += pLen) {
+        for (int bit = 0; bit < pLen; ++bit) {
+            parityWd = (parityWd << 1) | bitstream[startIdx + word + bit];
             bitstream[j++] = (bitstream[startIdx + word + bit]);
         }
         j--; // overwrite parity with next data
         // if parity fails then return 0
         switch (pType) {
-            case 3: if (bitstream[j] == 1) return 0; break; //should be 0 spacer bit
-            case 2: if (bitstream[j] == 0) return 0; break; //should be 1 spacer bit
+            case 3:
+                if (bitstream[j] == 1) return 0;
+                break; //should be 0 spacer bit
+            case 2:
+                if (bitstream[j] == 0) return 0;
+                break; //should be 1 spacer bit
             default: //test parity
-                if (parityTest(parityWd, pLen, pType) == 0) return 0; break;
+                if (parityTest(parityWd, pLen, pType) == 0) return 0;
+                break;
         }
-        bitcount += ( pLen - 1 );
+        bitcount += (pLen - 1);
         parityWd = 0;
     }
     // if we got here then all the parities passed
@@ -78,18 +85,22 @@ size_t addParity(uint8_t *bits, uint8_t *dest, uint8_t sourceLen, uint8_t pLen,
 {
     uint32_t parityWd = 0;
     size_t j = 0, bitCnt = 0;
-    for (int word = 0; word < sourceLen; word += pLen-1) {
-        for (int bit = 0; bit < pLen-1; ++bit){
-            parityWd = (parityWd << 1) | bits[word+bit];
-            dest[j++] = (bits[word+bit]);
+    for (int word = 0; word < sourceLen; word += pLen - 1) {
+        for (int bit = 0; bit < pLen - 1; ++bit) {
+            parityWd = (parityWd << 1) | bits[word + bit];
+            dest[j++] = (bits[word + bit]);
         }
 
         // if parity fails then return 0
         switch (pType) {
-            case 3: dest[j++] = 0; break; // marker bit which should be a 0
-            case 2: dest[j++] = 1; break; // marker bit which should be a 1
+            case 3:
+                dest[j++] = 0;
+                break; // marker bit which should be a 0
+            case 2:
+                dest[j++] = 1;
+                break; // marker bit which should be a 1
             default:
-                dest[j++] = parityTest(parityWd, pLen-1, pType) ^ 1;
+                dest[j++] = parityTest(parityWd, pLen - 1, pType) ^ 1;
                 break;
         }
         bitCnt += pLen;
@@ -108,10 +119,11 @@ size_t addParity(uint8_t *bits, uint8_t *dest, uint8_t sourceLen, uint8_t pLen,
 * @param dest    pointer to the destination where wiegandparity has been appended
 * @param len     number of bits which wiegand parity shall be calculated over. This number is without parities, so a wiegand 26 has 24 bits of data
 */
-void wiegand_add_parity(uint8_t *source, uint8_t *dest, uint8_t len) {
+void wiegand_add_parity(uint8_t *source, uint8_t *dest, uint8_t len)
+{
 
     // Copy to destination, shifted one step to make room for EVEN parity
-    memcpy(dest+1, source, length);
+    memcpy(dest + 1, source, length);
 
     // half length, Even and Odd is calculated to the middle.
     uint8_t len_h2 = length >> 1;
@@ -136,7 +148,8 @@ void wiegand_add_parity(uint8_t *source, uint8_t *dest, uint8_t len) {
 * @param dest      pointer to the destination where wiegand bytes will be stored
 * @param formatlen
 */
-void num_to_wiegand_bytes(uint64_t oem, uint64_t fc, uint64_t cn, uint8_t *dest, uint8_t formatlen){
+void num_to_wiegand_bytes(uint64_t oem, uint64_t fc, uint64_t cn, uint8_t *dest, uint8_t formatlen)
+{
 
     uint8_t data[MAX_BITS_TXX55] = {0};
     memset(data, 0, sizeof(data));
@@ -146,9 +159,9 @@ void num_to_wiegand_bytes(uint64_t oem, uint64_t fc, uint64_t cn, uint8_t *dest,
     // loop
     // (formatlen / 32 ) + 1
     // (formatlen >> 5) + 1
-    for (int i = 0; i < formatlen ; ++i){
-        uint32_t value  = bytebits_to_byte( data + (i * 32), 32);
-        num_to_bytes(value, 32, dest + (i*4) );
+    for (int i = 0; i < formatlen ; ++i) {
+        uint32_t value  = bytebits_to_byte(data + (i * 32), 32);
+        num_to_bytes(value, 32, dest + (i * 4));
     }
 
 }
@@ -160,14 +173,15 @@ void num_to_wiegand_bytes(uint64_t oem, uint64_t fc, uint64_t cn, uint8_t *dest,
 * @param dest      pointer to the destination where wiegand bits will be stored
 * @param formatlen
 */
-void num_to_wiegand_bits(uint64_t oem, uint64_t fc, uint64_t cn, uint8_t *dest, uint8_t formatlen){
+void num_to_wiegand_bits(uint64_t oem, uint64_t fc, uint64_t cn, uint8_t *dest, uint8_t formatlen)
+{
 
     uint8_t bits[MAX_BITS_TXX55] = {0};
     memset(bits, 0, sizeof(bits));
     uint8_t *temp = bits;
     uint64_t value = 0;
 
-    switch ( formatlen ){
+    switch (formatlen) {
         case 26 :               // 26bit HID H10301
             fc &= 0xFF;         // 8bits
             cn &= 0xFFFF;       // 16bits
@@ -221,7 +235,7 @@ void num_to_wiegand_bits(uint64_t oem, uint64_t fc, uint64_t cn, uint8_t *dest,
         case 50 :               // AWID 50 RBH
             fc &= 0xFFFF;       // 16bits
             cn &= 0xFFFFFFFF    // 32bits
-            value = fc << 32 | cn;
+                  value = fc << 32 | cn;
             num_to_bytebits(value, 48, temp);
             wiegand_add_parity(temp, dest, 48);  // verify!
             break;
diff --git a/common/wiegand.h b/common/wiegand.h
index b9a5770cf..d856e3993 100644
--- a/common/wiegand.h
+++ b/common/wiegand.h
@@ -12,7 +12,7 @@
 #include "common.h"
 #include "util.h"
 
-uint8_t getParity( uint8_t *bits, uint8_t length, uint8_t type);
+uint8_t getParity(uint8_t *bits, uint8_t length, uint8_t type);
 uint8_t checkParity(uint32_t bits, uint8_t bitlen, uint8_t type);
 
 void num_to_wiegand_bytes(uint64_t oem, uint64_t fc, uint64_t cn, uint8_t *dest, uint8_t formatlen);
diff --git a/include/common.h b/include/common.h
index 4f856ac8e..2c3febc98 100644
--- a/include/common.h
+++ b/include/common.h
@@ -83,25 +83,25 @@ extern uint32_t FLASHMEM_SPIBAUDRATE;
 #endif
 
 #ifdef WITH_FLASH
-    #ifndef T55XX_CONFIG_LEN
-    # define T55XX_CONFIG_LEN sizeof( t55xx_config )
-    #endif
+#ifndef T55XX_CONFIG_LEN
+# define T55XX_CONFIG_LEN sizeof( t55xx_config )
+#endif
 
-    #ifndef T55XX_CONFIG_OFFSET
-    # define T55XX_CONFIG_OFFSET (FLASH_MEM_MAX_4K_SECTOR - 0x2000)
-    #endif
+#ifndef T55XX_CONFIG_OFFSET
+# define T55XX_CONFIG_OFFSET (FLASH_MEM_MAX_4K_SECTOR - 0x2000)
+#endif
 
-    #ifndef DEFAULT_T55XX_KEYS_OFFSET
-    # define DEFAULT_T55XX_KEYS_OFFSET (FLASH_MEM_MAX_4K_SECTOR - 0x3000)
-    #endif
+#ifndef DEFAULT_T55XX_KEYS_OFFSET
+# define DEFAULT_T55XX_KEYS_OFFSET (FLASH_MEM_MAX_4K_SECTOR - 0x3000)
+#endif
 
-    #ifndef DEFAULT_MF_KEYS_OFFSET
-    # define DEFAULT_MF_KEYS_OFFSET (FLASH_MEM_MAX_4K_SECTOR - 0x4000)
-    #endif
+#ifndef DEFAULT_MF_KEYS_OFFSET
+# define DEFAULT_MF_KEYS_OFFSET (FLASH_MEM_MAX_4K_SECTOR - 0x4000)
+#endif
 
-    #ifndef DEFAULT_ICLASS_KEYS_OFFSET
-    # define DEFAULT_ICLASS_KEYS_OFFSET (FLASH_MEM_MAX_4K_SECTOR - 0x5000)
-    #endif
+#ifndef DEFAULT_ICLASS_KEYS_OFFSET
+# define DEFAULT_ICLASS_KEYS_OFFSET (FLASH_MEM_MAX_4K_SECTOR - 0x5000)
+#endif
 #endif
 
 // RDV40,  validation structure to help identifying that client/firmware is talking with RDV40
diff --git a/include/hitagS.h b/include/hitagS.h
index 307e456b3..a2f67e464 100644
--- a/include/hitagS.h
+++ b/include/hitagS.h
@@ -18,29 +18,32 @@
 
 //protocol-state
 typedef enum PROTO_STATE {
-    HT_READY=0,
+    HT_READY = 0,
     HT_INIT,
     HT_AUTHENTICATE,
     HT_SELECTED,
     HT_QUIET,
     HT_TTF,
-    HT_FAIL} PSTATE;
+    HT_FAIL
+} PSTATE;
 
 //tag-state
 typedef enum TAG_STATE {
-    HT_NO_OP=0,
+    HT_NO_OP = 0,
     HT_READING_PAGE,
     HT_WRITING_PAGE_ACK,
     HT_WRITING_PAGE_DATA,
-    HT_WRITING_BLOCK_DATA} TSATE;
+    HT_WRITING_BLOCK_DATA
+} TSATE;
 
 //number of start-of-frame bits
 typedef enum SOF_TYPE {
-    HT_STANDARD=0,
+    HT_STANDARD = 0,
     HT_ADVANCED,
     HT_FAST_ADVANCED,
     HT_ONE,
-    HT_NO_BITS} stype;
+    HT_NO_BITS
+} stype;
 
 struct hitagS_tag {
     PSTATE pstate; //protocol-state
diff --git a/include/mifare.h b/include/mifare.h
index 222719188..104d5cf09 100644
--- a/include/mifare.h
+++ b/include/mifare.h
@@ -32,23 +32,23 @@ typedef struct {
 } __attribute__((__packed__)) iso14a_card_select_t;
 
 typedef enum ISO14A_COMMAND {
-    ISO14A_CONNECT =         (1 << 0),
-    ISO14A_NO_DISCONNECT =   (1 << 1),
-    ISO14A_APDU =            (1 << 2),
-    ISO14A_RAW =             (1 << 3),
+    ISO14A_CONNECT = (1 << 0),
+    ISO14A_NO_DISCONNECT = (1 << 1),
+    ISO14A_APDU = (1 << 2),
+    ISO14A_RAW = (1 << 3),
     ISO14A_REQUEST_TRIGGER = (1 << 4),
-    ISO14A_APPEND_CRC =      (1 << 5),
-    ISO14A_SET_TIMEOUT =     (1 << 6),
-    ISO14A_NO_SELECT =       (1 << 7),
-    ISO14A_TOPAZMODE =       (1 << 8),
-    ISO14A_NO_RATS =         (1 << 9),
-    ISO14A_SEND_CHAINING =   (1 << 10)
+    ISO14A_APPEND_CRC = (1 << 5),
+    ISO14A_SET_TIMEOUT = (1 << 6),
+    ISO14A_NO_SELECT = (1 << 7),
+    ISO14A_TOPAZMODE = (1 << 8),
+    ISO14A_NO_RATS = (1 << 9),
+    ISO14A_SEND_CHAINING = (1 << 10)
 } iso14a_command_t;
 
 typedef struct {
-    uint8_t* response;
+    uint8_t *response;
     size_t   response_n;
-    uint8_t* modulation;
+    uint8_t *modulation;
     size_t   modulation_n;
     uint32_t ProxToAirDuration;
 } tag_response_info_t;
@@ -64,23 +64,23 @@ typedef struct {
 } __attribute__((__packed__)) iso14b_card_select_t;
 
 typedef enum ISO14B_COMMAND {
-    ISO14B_CONNECT =         (1 << 0),
-    ISO14B_DISCONNECT =      (1 << 1),
-    ISO14B_APDU =            (1 << 2),
-    ISO14B_RAW =             (1 << 3),
+    ISO14B_CONNECT = (1 << 0),
+    ISO14B_DISCONNECT = (1 << 1),
+    ISO14B_APDU = (1 << 2),
+    ISO14B_RAW = (1 << 3),
     ISO14B_REQUEST_TRIGGER = (1 << 4),
-    ISO14B_APPEND_CRC =      (1 << 5),
-    ISO14B_SELECT_STD =      (1 << 6),
-    ISO14B_SELECT_SR =       (1 << 7)
+    ISO14B_APPEND_CRC = (1 << 5),
+    ISO14B_SELECT_STD = (1 << 6),
+    ISO14B_SELECT_SR = (1 << 7)
 } iso14b_command_t;
 
 typedef enum ISO15_COMMAND {
-    ISO15_CONNECT =          (1 << 0),
-    ISO15_NO_DISCONNECT =    (1 << 1),
-    ISO15_RAW =              (1 << 2),
-    ISO15_APPEND_CRC =       (1 << 3),
-    ISO15_HIGH_SPEED =       (1 << 4),
-    ISO15_READ_RESPONSE =    (1 << 5)
+    ISO15_CONNECT = (1 << 0),
+    ISO15_NO_DISCONNECT = (1 << 1),
+    ISO15_RAW = (1 << 2),
+    ISO15_APPEND_CRC = (1 << 3),
+    ISO15_HIGH_SPEED = (1 << 4),
+    ISO15_READ_RESPONSE = (1 << 5)
 } iso15_command_t;
 
 //-----------------------------------------------------------------------------
@@ -113,11 +113,11 @@ typedef struct {
 } __attribute__((__packed__)) smart_card_atr_t;
 
 typedef enum SMARTCARD_COMMAND {
-    SC_CONNECT =             (1 << 0),
-    SC_NO_DISCONNECT =       (1 << 1),
-    SC_RAW =                 (1 << 2),
-    SC_SELECT =              (1 << 3),
-    SC_RAW_T0 =              (1 << 4),
+    SC_CONNECT = (1 << 0),
+    SC_NO_DISCONNECT = (1 << 1),
+    SC_RAW = (1 << 2),
+    SC_SELECT = (1 << 3),
+    SC_RAW_T0 = (1 << 4),
 } smartcard_command_t;
 
 //-----------------------------------------------------------------------------
@@ -151,11 +151,11 @@ typedef struct {
 } __attribute__((__packed__)) felica_card_select_t;
 
 typedef enum FELICA_COMMAND {
-    FELICA_CONNECT =         (1 << 0),
-    FELICA_NO_DISCONNECT =   (1 << 1),
-    FELICA_RAW =             (1 << 3),
-    FELICA_APPEND_CRC =      (1 << 5),
-    FELICA_NO_SELECT =       (1 << 6),
+    FELICA_CONNECT = (1 << 0),
+    FELICA_NO_DISCONNECT = (1 << 1),
+    FELICA_RAW = (1 << 3),
+    FELICA_APPEND_CRC = (1 << 5),
+    FELICA_NO_SELECT = (1 << 6),
 } felica_command_t;
 
 #endif // _MIFARE_H_
diff --git a/include/proxmark3.h b/include/proxmark3.h
index ff3a8dfde..8fedafb3e 100644
--- a/include/proxmark3.h
+++ b/include/proxmark3.h
@@ -126,8 +126,8 @@ struct common_area {
     char version; /* Must be 1 */
     char command;
     struct {
-        unsigned int bootrom_present:1; /* Set when a bootrom that is capable of parsing the common area is present */
-        unsigned int osimage_present:1; /* Set when a osimage that is capable of parsing the common area is present */
+        unsigned int bootrom_present: 1; /* Set when a bootrom that is capable of parsing the common area is present */
+        unsigned int osimage_present: 1; /* Set when a osimage that is capable of parsing the common area is present */
     } __attribute__((packed)) flags;
     int arg1, arg2;
 } __attribute__((packed));
diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index 2e2526bf3..94ae66eaa 100644
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -14,28 +14,28 @@
 #define __USB_CMD_H
 
 #ifdef _MSC_VER
-   typedef DWORD uint32_t;
-   typedef BYTE uint8_t;
-   #define PACKED
-   // stuff
+typedef DWORD uint32_t;
+typedef BYTE uint8_t;
+#define PACKED
+// stuff
 #else
-  #include <stdint.h>
-  #include <stdbool.h>
-  #define PACKED __attribute__((packed))
+#include <stdint.h>
+#include <stdbool.h>
+#define PACKED __attribute__((packed))
 #endif
 
 #define USB_CMD_DATA_SIZE 512
 
 typedef struct {
-  uint64_t cmd;
-  uint64_t arg[3];
-  union {
-    uint8_t  asBytes[USB_CMD_DATA_SIZE];
-    uint32_t asDwords[USB_CMD_DATA_SIZE/4];
-  } d;
+    uint64_t cmd;
+    uint64_t arg[3];
+    union {
+        uint8_t  asBytes[USB_CMD_DATA_SIZE];
+        uint32_t asDwords[USB_CMD_DATA_SIZE / 4];
+    } d;
 } PACKED UsbCommand;
 // A struct used to send sample-configs over USB
-typedef struct{
+typedef struct {
     uint8_t decimation;
     uint8_t bits_per_sample;
     bool averaging;
@@ -43,7 +43,7 @@ typedef struct{
     int trigger_threshold;
 } sample_config;
 
-typedef struct{
+typedef struct {
     uint16_t start_gap;
     uint16_t write_gap;
     uint16_t write_0;
diff --git a/liblua/lapi.c b/liblua/lapi.c
index 3d7fa5701..b1f470fb1 100644
--- a/liblua/lapi.c
+++ b/liblua/lapi.c
@@ -30,8 +30,8 @@
 
 
 const char lua_ident[] =
-  "$LuaVersion: " LUA_COPYRIGHT " $"
-  "$LuaAuthors: " LUA_AUTHORS " $";
+    "$LuaVersion: " LUA_COPYRIGHT " $"
+    "$LuaAuthors: " LUA_AUTHORS " $";
 
 
 /* value at a non-valid index */
@@ -52,30 +52,29 @@ const char lua_ident[] =
     api_check(L, isstackindex(i, o), "index not in the stack")
 
 
-static TValue *index2addr (lua_State *L, int idx) {
-  CallInfo *ci = L->ci;
-  if (idx > 0) {
-    TValue *o = ci->func + idx;
-    api_check(L, idx <= ci->top - (ci->func + 1), "unacceptable index");
-    if (o >= L->top) return NONVALIDVALUE;
-    else return o;
-  }
-  else if (!ispseudo(idx)) {  /* negative index */
-    api_check(L, idx != 0 && -idx <= L->top - (ci->func + 1), "invalid index");
-    return L->top + idx;
-  }
-  else if (idx == LUA_REGISTRYINDEX)
-    return &G(L)->l_registry;
-  else {  /* upvalues */
-    idx = LUA_REGISTRYINDEX - idx;
-    api_check(L, idx <= MAXUPVAL + 1, "upvalue index too large");
-    if (ttislcf(ci->func))  /* light C function? */
-      return NONVALIDVALUE;  /* it has no upvalues */
-    else {
-      CClosure *func = clCvalue(ci->func);
-      return (idx <= func->nupvalues) ? &func->upvalue[idx-1] : NONVALIDVALUE;
+static TValue *index2addr(lua_State *L, int idx)
+{
+    CallInfo *ci = L->ci;
+    if (idx > 0) {
+        TValue *o = ci->func + idx;
+        api_check(L, idx <= ci->top - (ci->func + 1), "unacceptable index");
+        if (o >= L->top) return NONVALIDVALUE;
+        else return o;
+    } else if (!ispseudo(idx)) { /* negative index */
+        api_check(L, idx != 0 && -idx <= L->top - (ci->func + 1), "invalid index");
+        return L->top + idx;
+    } else if (idx == LUA_REGISTRYINDEX)
+        return &G(L)->l_registry;
+    else {  /* upvalues */
+        idx = LUA_REGISTRYINDEX - idx;
+        api_check(L, idx <= MAXUPVAL + 1, "upvalue index too large");
+        if (ttislcf(ci->func))  /* light C function? */
+            return NONVALIDVALUE;  /* it has no upvalues */
+        else {
+            CClosure *func = clCvalue(ci->func);
+            return (idx <= func->nupvalues) ? &func->upvalue[idx - 1] : NONVALIDVALUE;
+        }
     }
-  }
 }
 
 
@@ -83,61 +82,66 @@ static TValue *index2addr (lua_State *L, int idx) {
 ** to be called by 'lua_checkstack' in protected mode, to grow stack
 ** capturing memory errors
 */
-static void growstack (lua_State *L, void *ud) {
-  int size = *(int *)ud;
-  luaD_growstack(L, size);
+static void growstack(lua_State *L, void *ud)
+{
+    int size = *(int *)ud;
+    luaD_growstack(L, size);
 }
 
 
-LUA_API int lua_checkstack (lua_State *L, int size) {
-  int res;
-  CallInfo *ci = L->ci;
-  lua_lock(L);
-  if (L->stack_last - L->top > size)  /* stack large enough? */
-    res = 1;  /* yes; check is OK */
-  else {  /* no; need to grow stack */
-    int inuse = cast_int(L->top - L->stack) + EXTRA_STACK;
-    if (inuse > LUAI_MAXSTACK - size)  /* can grow without overflow? */
-      res = 0;  /* no */
-    else  /* try to grow stack */
-      res = (luaD_rawrunprotected(L, &growstack, &size) == LUA_OK);
-  }
-  if (res && ci->top < L->top + size)
-    ci->top = L->top + size;  /* adjust frame top */
-  lua_unlock(L);
-  return res;
+LUA_API int lua_checkstack(lua_State *L, int size)
+{
+    int res;
+    CallInfo *ci = L->ci;
+    lua_lock(L);
+    if (L->stack_last - L->top > size)  /* stack large enough? */
+        res = 1;  /* yes; check is OK */
+    else {  /* no; need to grow stack */
+        int inuse = cast_int(L->top - L->stack) + EXTRA_STACK;
+        if (inuse > LUAI_MAXSTACK - size)  /* can grow without overflow? */
+            res = 0;  /* no */
+        else  /* try to grow stack */
+            res = (luaD_rawrunprotected(L, &growstack, &size) == LUA_OK);
+    }
+    if (res && ci->top < L->top + size)
+        ci->top = L->top + size;  /* adjust frame top */
+    lua_unlock(L);
+    return res;
 }
 
 
-LUA_API void lua_xmove (lua_State *from, lua_State *to, int n) {
-  int i;
-  if (from == to) return;
-  lua_lock(to);
-  api_checknelems(from, n);
-  api_check(from, G(from) == G(to), "moving among independent states");
-  api_check(from, to->ci->top - to->top >= n, "not enough elements to move");
-  from->top -= n;
-  for (i = 0; i < n; i++) {
-    setobj2s(to, to->top++, from->top + i);
-  }
-  lua_unlock(to);
+LUA_API void lua_xmove(lua_State *from, lua_State *to, int n)
+{
+    int i;
+    if (from == to) return;
+    lua_lock(to);
+    api_checknelems(from, n);
+    api_check(from, G(from) == G(to), "moving among independent states");
+    api_check(from, to->ci->top - to->top >= n, "not enough elements to move");
+    from->top -= n;
+    for (i = 0; i < n; i++) {
+        setobj2s(to, to->top++, from->top + i);
+    }
+    lua_unlock(to);
 }
 
 
-LUA_API lua_CFunction lua_atpanic (lua_State *L, lua_CFunction panicf) {
-  lua_CFunction old;
-  lua_lock(L);
-  old = G(L)->panic;
-  G(L)->panic = panicf;
-  lua_unlock(L);
-  return old;
+LUA_API lua_CFunction lua_atpanic(lua_State *L, lua_CFunction panicf)
+{
+    lua_CFunction old;
+    lua_lock(L);
+    old = G(L)->panic;
+    G(L)->panic = panicf;
+    lua_unlock(L);
+    return old;
 }
 
 
-LUA_API const lua_Number *lua_version (lua_State *L) {
-  static const lua_Number version = LUA_VERSION_NUM;
-  if (L == NULL) return &version;
-  else return G(L)->version;
+LUA_API const lua_Number *lua_version(lua_State *L)
+{
+    static const lua_Number version = LUA_VERSION_NUM;
+    if (L == NULL) return &version;
+    else return G(L)->version;
 }
 
 
@@ -150,93 +154,101 @@ LUA_API const lua_Number *lua_version (lua_State *L) {
 /*
 ** convert an acceptable stack index into an absolute index
 */
-LUA_API int lua_absindex (lua_State *L, int idx) {
-  return (idx > 0 || ispseudo(idx))
-         ? idx
-         : cast_int(L->top - L->ci->func + idx);
+LUA_API int lua_absindex(lua_State *L, int idx)
+{
+    return (idx > 0 || ispseudo(idx))
+           ? idx
+           : cast_int(L->top - L->ci->func + idx);
 }
 
 
-LUA_API int lua_gettop (lua_State *L) {
-  return cast_int(L->top - (L->ci->func + 1));
+LUA_API int lua_gettop(lua_State *L)
+{
+    return cast_int(L->top - (L->ci->func + 1));
 }
 
 
-LUA_API void lua_settop (lua_State *L, int idx) {
-  StkId func = L->ci->func;
-  lua_lock(L);
-  if (idx >= 0) {
-    api_check(L, idx <= L->stack_last - (func + 1), "new top too large");
-    while (L->top < (func + 1) + idx)
-      setnilvalue(L->top++);
-    L->top = (func + 1) + idx;
-  }
-  else {
-    api_check(L, -(idx+1) <= (L->top - (func + 1)), "invalid new top");
-    L->top += idx+1;  /* `subtract' index (index is negative) */
-  }
-  lua_unlock(L);
+LUA_API void lua_settop(lua_State *L, int idx)
+{
+    StkId func = L->ci->func;
+    lua_lock(L);
+    if (idx >= 0) {
+        api_check(L, idx <= L->stack_last - (func + 1), "new top too large");
+        while (L->top < (func + 1) + idx)
+            setnilvalue(L->top++);
+        L->top = (func + 1) + idx;
+    } else {
+        api_check(L, -(idx + 1) <= (L->top - (func + 1)), "invalid new top");
+        L->top += idx + 1; /* `subtract' index (index is negative) */
+    }
+    lua_unlock(L);
 }
 
 
-LUA_API void lua_remove (lua_State *L, int idx) {
-  StkId p;
-  lua_lock(L);
-  p = index2addr(L, idx);
-  api_checkstackindex(L, idx, p);
-  while (++p < L->top) setobjs2s(L, p-1, p);
-  L->top--;
-  lua_unlock(L);
+LUA_API void lua_remove(lua_State *L, int idx)
+{
+    StkId p;
+    lua_lock(L);
+    p = index2addr(L, idx);
+    api_checkstackindex(L, idx, p);
+    while (++p < L->top) setobjs2s(L, p - 1, p);
+    L->top--;
+    lua_unlock(L);
 }
 
 
-LUA_API void lua_insert (lua_State *L, int idx) {
-  StkId p;
-  StkId q;
-  lua_lock(L);
-  p = index2addr(L, idx);
-  api_checkstackindex(L, idx, p);
-  for (q = L->top; q > p; q--)  /* use L->top as a temporary */
-    setobjs2s(L, q, q - 1);
-  setobjs2s(L, p, L->top);
-  lua_unlock(L);
+LUA_API void lua_insert(lua_State *L, int idx)
+{
+    StkId p;
+    StkId q;
+    lua_lock(L);
+    p = index2addr(L, idx);
+    api_checkstackindex(L, idx, p);
+    for (q = L->top; q > p; q--)  /* use L->top as a temporary */
+        setobjs2s(L, q, q - 1);
+    setobjs2s(L, p, L->top);
+    lua_unlock(L);
 }
 
 
-static void moveto (lua_State *L, TValue *fr, int idx) {
-  TValue *to = index2addr(L, idx);
-  api_checkvalidindex(L, to);
-  setobj(L, to, fr);
-  if (idx < LUA_REGISTRYINDEX)  /* function upvalue? */
-    luaC_barrier(L, clCvalue(L->ci->func), fr);
-  /* LUA_REGISTRYINDEX does not need gc barrier
-     (collector revisits it before finishing collection) */
+static void moveto(lua_State *L, TValue *fr, int idx)
+{
+    TValue *to = index2addr(L, idx);
+    api_checkvalidindex(L, to);
+    setobj(L, to, fr);
+    if (idx < LUA_REGISTRYINDEX)  /* function upvalue? */
+        luaC_barrier(L, clCvalue(L->ci->func), fr);
+    /* LUA_REGISTRYINDEX does not need gc barrier
+       (collector revisits it before finishing collection) */
 }
 
 
-LUA_API void lua_replace (lua_State *L, int idx) {
-  lua_lock(L);
-  api_checknelems(L, 1);
-  moveto(L, L->top - 1, idx);
-  L->top--;
-  lua_unlock(L);
+LUA_API void lua_replace(lua_State *L, int idx)
+{
+    lua_lock(L);
+    api_checknelems(L, 1);
+    moveto(L, L->top - 1, idx);
+    L->top--;
+    lua_unlock(L);
 }
 
 
-LUA_API void lua_copy (lua_State *L, int fromidx, int toidx) {
-  TValue *fr;
-  lua_lock(L);
-  fr = index2addr(L, fromidx);
-  moveto(L, fr, toidx);
-  lua_unlock(L);
+LUA_API void lua_copy(lua_State *L, int fromidx, int toidx)
+{
+    TValue *fr;
+    lua_lock(L);
+    fr = index2addr(L, fromidx);
+    moveto(L, fr, toidx);
+    lua_unlock(L);
 }
 
 
-LUA_API void lua_pushvalue (lua_State *L, int idx) {
-  lua_lock(L);
-  setobj2s(L, L->top, index2addr(L, idx));
-  api_incr_top(L);
-  lua_unlock(L);
+LUA_API void lua_pushvalue(lua_State *L, int idx)
+{
+    lua_lock(L);
+    setobj2s(L, L->top, index2addr(L, idx));
+    api_incr_top(L);
+    lua_unlock(L);
 }
 
 
@@ -246,213 +258,248 @@ LUA_API void lua_pushvalue (lua_State *L, int idx) {
 */
 
 
-LUA_API int lua_type (lua_State *L, int idx) {
-  StkId o = index2addr(L, idx);
-  return (isvalid(o) ? ttypenv(o) : LUA_TNONE);
+LUA_API int lua_type(lua_State *L, int idx)
+{
+    StkId o = index2addr(L, idx);
+    return (isvalid(o) ? ttypenv(o) : LUA_TNONE);
 }
 
 
-LUA_API const char *lua_typename (lua_State *L, int t) {
-  UNUSED(L);
-  return ttypename(t);
+LUA_API const char *lua_typename(lua_State *L, int t)
+{
+    UNUSED(L);
+    return ttypename(t);
 }
 
 
-LUA_API int lua_iscfunction (lua_State *L, int idx) {
-  StkId o = index2addr(L, idx);
-  return (ttislcf(o) || (ttisCclosure(o)));
+LUA_API int lua_iscfunction(lua_State *L, int idx)
+{
+    StkId o = index2addr(L, idx);
+    return (ttislcf(o) || (ttisCclosure(o)));
 }
 
 
-LUA_API int lua_isnumber (lua_State *L, int idx) {
-  TValue n;
-  const TValue *o = index2addr(L, idx);
-  return tonumber(o, &n);
+LUA_API int lua_isnumber(lua_State *L, int idx)
+{
+    TValue n;
+    const TValue *o = index2addr(L, idx);
+    return tonumber(o, &n);
 }
 
 
-LUA_API int lua_isstring (lua_State *L, int idx) {
-  int t = lua_type(L, idx);
-  return (t == LUA_TSTRING || t == LUA_TNUMBER);
+LUA_API int lua_isstring(lua_State *L, int idx)
+{
+    int t = lua_type(L, idx);
+    return (t == LUA_TSTRING || t == LUA_TNUMBER);
 }
 
 
-LUA_API int lua_isuserdata (lua_State *L, int idx) {
-  const TValue *o = index2addr(L, idx);
-  return (ttisuserdata(o) || ttislightuserdata(o));
+LUA_API int lua_isuserdata(lua_State *L, int idx)
+{
+    const TValue *o = index2addr(L, idx);
+    return (ttisuserdata(o) || ttislightuserdata(o));
 }
 
 
-LUA_API int lua_rawequal (lua_State *L, int index1, int index2) {
-  StkId o1 = index2addr(L, index1);
-  StkId o2 = index2addr(L, index2);
-  return (isvalid(o1) && isvalid(o2)) ? luaV_rawequalobj(o1, o2) : 0;
+LUA_API int lua_rawequal(lua_State *L, int index1, int index2)
+{
+    StkId o1 = index2addr(L, index1);
+    StkId o2 = index2addr(L, index2);
+    return (isvalid(o1) && isvalid(o2)) ? luaV_rawequalobj(o1, o2) : 0;
 }
 
 
-LUA_API void lua_arith (lua_State *L, int op) {
-  StkId o1;  /* 1st operand */
-  StkId o2;  /* 2nd operand */
-  lua_lock(L);
-  if (op != LUA_OPUNM) /* all other operations expect two operands */
-    api_checknelems(L, 2);
-  else {  /* for unary minus, add fake 2nd operand */
-    api_checknelems(L, 1);
-    setobjs2s(L, L->top, L->top - 1);
-    L->top++;
-  }
-  o1 = L->top - 2;
-  o2 = L->top - 1;
-  if (ttisnumber(o1) && ttisnumber(o2)) {
-    setnvalue(o1, luaO_arith(op, nvalue(o1), nvalue(o2)));
-  }
-  else
-    luaV_arith(L, o1, o1, o2, cast(TMS, op - LUA_OPADD + TM_ADD));
-  L->top--;
-  lua_unlock(L);
-}
-
-
-LUA_API int lua_compare (lua_State *L, int index1, int index2, int op) {
-  StkId o1, o2;
-  int i = 0;
-  lua_lock(L);  /* may call tag method */
-  o1 = index2addr(L, index1);
-  o2 = index2addr(L, index2);
-  if (isvalid(o1) && isvalid(o2)) {
-    switch (op) {
-      case LUA_OPEQ: i = equalobj(L, o1, o2); break;
-      case LUA_OPLT: i = luaV_lessthan(L, o1, o2); break;
-      case LUA_OPLE: i = luaV_lessequal(L, o1, o2); break;
-      default: api_check(L, 0, "invalid option");
+LUA_API void lua_arith(lua_State *L, int op)
+{
+    StkId o1;  /* 1st operand */
+    StkId o2;  /* 2nd operand */
+    lua_lock(L);
+    if (op != LUA_OPUNM) /* all other operations expect two operands */
+        api_checknelems(L, 2);
+    else {  /* for unary minus, add fake 2nd operand */
+        api_checknelems(L, 1);
+        setobjs2s(L, L->top, L->top - 1);
+        L->top++;
     }
-  }
-  lua_unlock(L);
-  return i;
-}
-
-
-LUA_API lua_Number lua_tonumberx (lua_State *L, int idx, int *isnum) {
-  TValue n;
-  const TValue *o = index2addr(L, idx);
-  if (tonumber(o, &n)) {
-    if (isnum) *isnum = 1;
-    return nvalue(o);
-  }
-  else {
-    if (isnum) *isnum = 0;
-    return 0;
-  }
-}
-
-
-LUA_API lua_Integer lua_tointegerx (lua_State *L, int idx, int *isnum) {
-  TValue n;
-  const TValue *o = index2addr(L, idx);
-  if (tonumber(o, &n)) {
-    lua_Integer res;
-    lua_Number num = nvalue(o);
-    lua_number2integer(res, num);
-    if (isnum) *isnum = 1;
-    return res;
-  }
-  else {
-    if (isnum) *isnum = 0;
-    return 0;
-  }
-}
-
-
-LUA_API lua_Unsigned lua_tounsignedx (lua_State *L, int idx, int *isnum) {
-  TValue n;
-  const TValue *o = index2addr(L, idx);
-  if (tonumber(o, &n)) {
-    lua_Unsigned res;
-    lua_Number num = nvalue(o);
-    lua_number2unsigned(res, num);
-    if (isnum) *isnum = 1;
-    return res;
-  }
-  else {
-    if (isnum) *isnum = 0;
-    return 0;
-  }
-}
-
-
-LUA_API int lua_toboolean (lua_State *L, int idx) {
-  const TValue *o = index2addr(L, idx);
-  return !l_isfalse(o);
-}
-
-
-LUA_API const char *lua_tolstring (lua_State *L, int idx, size_t *len) {
-  StkId o = index2addr(L, idx);
-  if (!ttisstring(o)) {
-    lua_lock(L);  /* `luaV_tostring' may create a new string */
-    if (!luaV_tostring(L, o)) {  /* conversion failed? */
-      if (len != NULL) *len = 0;
-      lua_unlock(L);
-      return NULL;
-    }
-    luaC_checkGC(L);
-    o = index2addr(L, idx);  /* previous call may reallocate the stack */
+    o1 = L->top - 2;
+    o2 = L->top - 1;
+    if (ttisnumber(o1) && ttisnumber(o2)) {
+        setnvalue(o1, luaO_arith(op, nvalue(o1), nvalue(o2)));
+    } else
+        luaV_arith(L, o1, o1, o2, cast(TMS, op - LUA_OPADD + TM_ADD));
+    L->top--;
     lua_unlock(L);
-  }
-  if (len != NULL) *len = tsvalue(o)->len;
-  return svalue(o);
 }
 
 
-LUA_API size_t lua_rawlen (lua_State *L, int idx) {
-  StkId o = index2addr(L, idx);
-  switch (ttypenv(o)) {
-    case LUA_TSTRING: return tsvalue(o)->len;
-    case LUA_TUSERDATA: return uvalue(o)->len;
-    case LUA_TTABLE: return luaH_getn(hvalue(o));
-    default: return 0;
-  }
+LUA_API int lua_compare(lua_State *L, int index1, int index2, int op)
+{
+    StkId o1, o2;
+    int i = 0;
+    lua_lock(L);  /* may call tag method */
+    o1 = index2addr(L, index1);
+    o2 = index2addr(L, index2);
+    if (isvalid(o1) && isvalid(o2)) {
+        switch (op) {
+            case LUA_OPEQ:
+                i = equalobj(L, o1, o2);
+                break;
+            case LUA_OPLT:
+                i = luaV_lessthan(L, o1, o2);
+                break;
+            case LUA_OPLE:
+                i = luaV_lessequal(L, o1, o2);
+                break;
+            default:
+                api_check(L, 0, "invalid option");
+        }
+    }
+    lua_unlock(L);
+    return i;
 }
 
 
-LUA_API lua_CFunction lua_tocfunction (lua_State *L, int idx) {
-  StkId o = index2addr(L, idx);
-  if (ttislcf(o)) return fvalue(o);
-  else if (ttisCclosure(o))
-    return clCvalue(o)->f;
-  else return NULL;  /* not a C function */
+LUA_API lua_Number lua_tonumberx(lua_State *L, int idx, int *isnum)
+{
+    TValue n;
+    const TValue *o = index2addr(L, idx);
+    if (tonumber(o, &n)) {
+        if (isnum) *isnum = 1;
+        return nvalue(o);
+    } else {
+        if (isnum) *isnum = 0;
+        return 0;
+    }
 }
 
 
-LUA_API void *lua_touserdata (lua_State *L, int idx) {
-  StkId o = index2addr(L, idx);
-  switch (ttypenv(o)) {
-    case LUA_TUSERDATA: return (rawuvalue(o) + 1);
-    case LUA_TLIGHTUSERDATA: return pvalue(o);
-    default: return NULL;
-  }
+LUA_API lua_Integer lua_tointegerx(lua_State *L, int idx, int *isnum)
+{
+    TValue n;
+    const TValue *o = index2addr(L, idx);
+    if (tonumber(o, &n)) {
+        lua_Integer res;
+        lua_Number num = nvalue(o);
+        lua_number2integer(res, num);
+        if (isnum) *isnum = 1;
+        return res;
+    } else {
+        if (isnum) *isnum = 0;
+        return 0;
+    }
 }
 
 
-LUA_API lua_State *lua_tothread (lua_State *L, int idx) {
-  StkId o = index2addr(L, idx);
-  return (!ttisthread(o)) ? NULL : thvalue(o);
+LUA_API lua_Unsigned lua_tounsignedx(lua_State *L, int idx, int *isnum)
+{
+    TValue n;
+    const TValue *o = index2addr(L, idx);
+    if (tonumber(o, &n)) {
+        lua_Unsigned res;
+        lua_Number num = nvalue(o);
+        lua_number2unsigned(res, num);
+        if (isnum) *isnum = 1;
+        return res;
+    } else {
+        if (isnum) *isnum = 0;
+        return 0;
+    }
 }
 
 
-LUA_API const void *lua_topointer (lua_State *L, int idx) {
-  StkId o = index2addr(L, idx);
-  switch (ttype(o)) {
-    case LUA_TTABLE: return hvalue(o);
-    case LUA_TLCL: return clLvalue(o);
-    case LUA_TCCL: return clCvalue(o);
-    case LUA_TLCF: return cast(void *, cast(size_t, fvalue(o)));
-    case LUA_TTHREAD: return thvalue(o);
-    case LUA_TUSERDATA:
-    case LUA_TLIGHTUSERDATA:
-      return lua_touserdata(L, idx);
-    default: return NULL;
-  }
+LUA_API int lua_toboolean(lua_State *L, int idx)
+{
+    const TValue *o = index2addr(L, idx);
+    return !l_isfalse(o);
+}
+
+
+LUA_API const char *lua_tolstring(lua_State *L, int idx, size_t *len)
+{
+    StkId o = index2addr(L, idx);
+    if (!ttisstring(o)) {
+        lua_lock(L);  /* `luaV_tostring' may create a new string */
+        if (!luaV_tostring(L, o)) {  /* conversion failed? */
+            if (len != NULL) *len = 0;
+            lua_unlock(L);
+            return NULL;
+        }
+        luaC_checkGC(L);
+        o = index2addr(L, idx);  /* previous call may reallocate the stack */
+        lua_unlock(L);
+    }
+    if (len != NULL) *len = tsvalue(o)->len;
+    return svalue(o);
+}
+
+
+LUA_API size_t lua_rawlen(lua_State *L, int idx)
+{
+    StkId o = index2addr(L, idx);
+    switch (ttypenv(o)) {
+        case LUA_TSTRING:
+            return tsvalue(o)->len;
+        case LUA_TUSERDATA:
+            return uvalue(o)->len;
+        case LUA_TTABLE:
+            return luaH_getn(hvalue(o));
+        default:
+            return 0;
+    }
+}
+
+
+LUA_API lua_CFunction lua_tocfunction(lua_State *L, int idx)
+{
+    StkId o = index2addr(L, idx);
+    if (ttislcf(o)) return fvalue(o);
+    else if (ttisCclosure(o))
+        return clCvalue(o)->f;
+    else return NULL;  /* not a C function */
+}
+
+
+LUA_API void *lua_touserdata(lua_State *L, int idx)
+{
+    StkId o = index2addr(L, idx);
+    switch (ttypenv(o)) {
+        case LUA_TUSERDATA:
+            return (rawuvalue(o) + 1);
+        case LUA_TLIGHTUSERDATA:
+            return pvalue(o);
+        default:
+            return NULL;
+    }
+}
+
+
+LUA_API lua_State *lua_tothread(lua_State *L, int idx)
+{
+    StkId o = index2addr(L, idx);
+    return (!ttisthread(o)) ? NULL : thvalue(o);
+}
+
+
+LUA_API const void *lua_topointer(lua_State *L, int idx)
+{
+    StkId o = index2addr(L, idx);
+    switch (ttype(o)) {
+        case LUA_TTABLE:
+            return hvalue(o);
+        case LUA_TLCL:
+            return clLvalue(o);
+        case LUA_TCCL:
+            return clCvalue(o);
+        case LUA_TLCF:
+            return cast(void *, cast(size_t, fvalue(o)));
+        case LUA_TTHREAD:
+            return thvalue(o);
+        case LUA_TUSERDATA:
+        case LUA_TLIGHTUSERDATA:
+            return lua_touserdata(L, idx);
+        default:
+            return NULL;
+    }
 }
 
 
@@ -462,140 +509,150 @@ LUA_API const void *lua_topointer (lua_State *L, int idx) {
 */
 
 
-LUA_API void lua_pushnil (lua_State *L) {
-  lua_lock(L);
-  setnilvalue(L->top);
-  api_incr_top(L);
-  lua_unlock(L);
+LUA_API void lua_pushnil(lua_State *L)
+{
+    lua_lock(L);
+    setnilvalue(L->top);
+    api_incr_top(L);
+    lua_unlock(L);
 }
 
 
-LUA_API void lua_pushnumber (lua_State *L, lua_Number n) {
-  lua_lock(L);
-  setnvalue(L->top, n);
-  luai_checknum(L, L->top,
-    luaG_runerror(L, "C API - attempt to push a signaling NaN"));
-  api_incr_top(L);
-  lua_unlock(L);
+LUA_API void lua_pushnumber(lua_State *L, lua_Number n)
+{
+    lua_lock(L);
+    setnvalue(L->top, n);
+    luai_checknum(L, L->top,
+                  luaG_runerror(L, "C API - attempt to push a signaling NaN"));
+    api_incr_top(L);
+    lua_unlock(L);
 }
 
 
-LUA_API void lua_pushinteger (lua_State *L, lua_Integer n) {
-  lua_lock(L);
-  setnvalue(L->top, cast_num(n));
-  api_incr_top(L);
-  lua_unlock(L);
+LUA_API void lua_pushinteger(lua_State *L, lua_Integer n)
+{
+    lua_lock(L);
+    setnvalue(L->top, cast_num(n));
+    api_incr_top(L);
+    lua_unlock(L);
 }
 
 
-LUA_API void lua_pushunsigned (lua_State *L, lua_Unsigned u) {
-  lua_Number n;
-  lua_lock(L);
-  n = lua_unsigned2number(u);
-  setnvalue(L->top, n);
-  api_incr_top(L);
-  lua_unlock(L);
+LUA_API void lua_pushunsigned(lua_State *L, lua_Unsigned u)
+{
+    lua_Number n;
+    lua_lock(L);
+    n = lua_unsigned2number(u);
+    setnvalue(L->top, n);
+    api_incr_top(L);
+    lua_unlock(L);
 }
 
 
-LUA_API const char *lua_pushlstring (lua_State *L, const char *s, size_t len) {
-  TString *ts;
-  lua_lock(L);
-  luaC_checkGC(L);
-  ts = luaS_newlstr(L, s, len);
-  setsvalue2s(L, L->top, ts);
-  api_incr_top(L);
-  lua_unlock(L);
-  return getstr(ts);
-}
-
-
-LUA_API const char *lua_pushstring (lua_State *L, const char *s) {
-  if (s == NULL) {
-    lua_pushnil(L);
-    return NULL;
-  }
-  else {
+LUA_API const char *lua_pushlstring(lua_State *L, const char *s, size_t len)
+{
     TString *ts;
     lua_lock(L);
     luaC_checkGC(L);
-    ts = luaS_new(L, s);
+    ts = luaS_newlstr(L, s, len);
     setsvalue2s(L, L->top, ts);
     api_incr_top(L);
     lua_unlock(L);
     return getstr(ts);
-  }
 }
 
 
-LUA_API const char *lua_pushvfstring (lua_State *L, const char *fmt,
-                                      va_list argp) {
-  const char *ret;
-  lua_lock(L);
-  luaC_checkGC(L);
-  ret = luaO_pushvfstring(L, fmt, argp);
-  lua_unlock(L);
-  return ret;
+LUA_API const char *lua_pushstring(lua_State *L, const char *s)
+{
+    if (s == NULL) {
+        lua_pushnil(L);
+        return NULL;
+    } else {
+        TString *ts;
+        lua_lock(L);
+        luaC_checkGC(L);
+        ts = luaS_new(L, s);
+        setsvalue2s(L, L->top, ts);
+        api_incr_top(L);
+        lua_unlock(L);
+        return getstr(ts);
+    }
 }
 
 
-LUA_API const char *lua_pushfstring (lua_State *L, const char *fmt, ...) {
-  const char *ret;
-  va_list argp;
-  lua_lock(L);
-  luaC_checkGC(L);
-  va_start(argp, fmt);
-  ret = luaO_pushvfstring(L, fmt, argp);
-  va_end(argp);
-  lua_unlock(L);
-  return ret;
-}
-
-
-LUA_API void lua_pushcclosure (lua_State *L, lua_CFunction fn, int n) {
-  lua_lock(L);
-  if (n == 0) {
-    setfvalue(L->top, fn);
-  }
-  else {
-    Closure *cl;
-    api_checknelems(L, n);
-    api_check(L, n <= MAXUPVAL, "upvalue index too large");
+LUA_API const char *lua_pushvfstring(lua_State *L, const char *fmt,
+                                     va_list argp)
+{
+    const char *ret;
+    lua_lock(L);
     luaC_checkGC(L);
-    cl = luaF_newCclosure(L, n);
-    cl->c.f = fn;
-    L->top -= n;
-    while (n--)
-      setobj2n(L, &cl->c.upvalue[n], L->top + n);
-    setclCvalue(L, L->top, cl);
-  }
-  api_incr_top(L);
-  lua_unlock(L);
+    ret = luaO_pushvfstring(L, fmt, argp);
+    lua_unlock(L);
+    return ret;
 }
 
 
-LUA_API void lua_pushboolean (lua_State *L, int b) {
-  lua_lock(L);
-  setbvalue(L->top, (b != 0));  /* ensure that true is 1 */
-  api_incr_top(L);
-  lua_unlock(L);
+LUA_API const char *lua_pushfstring(lua_State *L, const char *fmt, ...)
+{
+    const char *ret;
+    va_list argp;
+    lua_lock(L);
+    luaC_checkGC(L);
+    va_start(argp, fmt);
+    ret = luaO_pushvfstring(L, fmt, argp);
+    va_end(argp);
+    lua_unlock(L);
+    return ret;
 }
 
 
-LUA_API void lua_pushlightuserdata (lua_State *L, void *p) {
-  lua_lock(L);
-  setpvalue(L->top, p);
-  api_incr_top(L);
-  lua_unlock(L);
+LUA_API void lua_pushcclosure(lua_State *L, lua_CFunction fn, int n)
+{
+    lua_lock(L);
+    if (n == 0) {
+        setfvalue(L->top, fn);
+    } else {
+        Closure *cl;
+        api_checknelems(L, n);
+        api_check(L, n <= MAXUPVAL, "upvalue index too large");
+        luaC_checkGC(L);
+        cl = luaF_newCclosure(L, n);
+        cl->c.f = fn;
+        L->top -= n;
+        while (n--)
+            setobj2n(L, &cl->c.upvalue[n], L->top + n);
+        setclCvalue(L, L->top, cl);
+    }
+    api_incr_top(L);
+    lua_unlock(L);
 }
 
 
-LUA_API int lua_pushthread (lua_State *L) {
-  lua_lock(L);
-  setthvalue(L, L->top, L);
-  api_incr_top(L);
-  lua_unlock(L);
-  return (G(L)->mainthread == L);
+LUA_API void lua_pushboolean(lua_State *L, int b)
+{
+    lua_lock(L);
+    setbvalue(L->top, (b != 0));  /* ensure that true is 1 */
+    api_incr_top(L);
+    lua_unlock(L);
+}
+
+
+LUA_API void lua_pushlightuserdata(lua_State *L, void *p)
+{
+    lua_lock(L);
+    setpvalue(L->top, p);
+    api_incr_top(L);
+    lua_unlock(L);
+}
+
+
+LUA_API int lua_pushthread(lua_State *L)
+{
+    lua_lock(L);
+    setthvalue(L, L->top, L);
+    api_incr_top(L);
+    lua_unlock(L);
+    return (G(L)->mainthread == L);
 }
 
 
@@ -605,124 +662,133 @@ LUA_API int lua_pushthread (lua_State *L) {
 */
 
 
-LUA_API void lua_getglobal (lua_State *L, const char *var) {
-  Table *reg = hvalue(&G(L)->l_registry);
-  const TValue *gt;  /* global table */
-  lua_lock(L);
-  gt = luaH_getint(reg, LUA_RIDX_GLOBALS);
-  setsvalue2s(L, L->top++, luaS_new(L, var));
-  luaV_gettable(L, gt, L->top - 1, L->top - 1);
-  lua_unlock(L);
+LUA_API void lua_getglobal(lua_State *L, const char *var)
+{
+    Table *reg = hvalue(&G(L)->l_registry);
+    const TValue *gt;  /* global table */
+    lua_lock(L);
+    gt = luaH_getint(reg, LUA_RIDX_GLOBALS);
+    setsvalue2s(L, L->top++, luaS_new(L, var));
+    luaV_gettable(L, gt, L->top - 1, L->top - 1);
+    lua_unlock(L);
 }
 
 
-LUA_API void lua_gettable (lua_State *L, int idx) {
-  StkId t;
-  lua_lock(L);
-  t = index2addr(L, idx);
-  luaV_gettable(L, t, L->top - 1, L->top - 1);
-  lua_unlock(L);
+LUA_API void lua_gettable(lua_State *L, int idx)
+{
+    StkId t;
+    lua_lock(L);
+    t = index2addr(L, idx);
+    luaV_gettable(L, t, L->top - 1, L->top - 1);
+    lua_unlock(L);
 }
 
 
-LUA_API void lua_getfield (lua_State *L, int idx, const char *k) {
-  StkId t;
-  lua_lock(L);
-  t = index2addr(L, idx);
-  setsvalue2s(L, L->top, luaS_new(L, k));
-  api_incr_top(L);
-  luaV_gettable(L, t, L->top - 1, L->top - 1);
-  lua_unlock(L);
-}
-
-
-LUA_API void lua_rawget (lua_State *L, int idx) {
-  StkId t;
-  lua_lock(L);
-  t = index2addr(L, idx);
-  api_check(L, ttistable(t), "table expected");
-  setobj2s(L, L->top - 1, luaH_get(hvalue(t), L->top - 1));
-  lua_unlock(L);
-}
-
-
-LUA_API void lua_rawgeti (lua_State *L, int idx, int n) {
-  StkId t;
-  lua_lock(L);
-  t = index2addr(L, idx);
-  api_check(L, ttistable(t), "table expected");
-  setobj2s(L, L->top, luaH_getint(hvalue(t), n));
-  api_incr_top(L);
-  lua_unlock(L);
-}
-
-
-LUA_API void lua_rawgetp (lua_State *L, int idx, const void *p) {
-  StkId t;
-  TValue k;
-  lua_lock(L);
-  t = index2addr(L, idx);
-  api_check(L, ttistable(t), "table expected");
-  setpvalue(&k, cast(void *, p));
-  setobj2s(L, L->top, luaH_get(hvalue(t), &k));
-  api_incr_top(L);
-  lua_unlock(L);
-}
-
-
-LUA_API void lua_createtable (lua_State *L, int narray, int nrec) {
-  Table *t;
-  lua_lock(L);
-  luaC_checkGC(L);
-  t = luaH_new(L);
-  sethvalue(L, L->top, t);
-  api_incr_top(L);
-  if (narray > 0 || nrec > 0)
-    luaH_resize(L, t, narray, nrec);
-  lua_unlock(L);
-}
-
-
-LUA_API int lua_getmetatable (lua_State *L, int objindex) {
-  const TValue *obj;
-  Table *mt = NULL;
-  int res;
-  lua_lock(L);
-  obj = index2addr(L, objindex);
-  switch (ttypenv(obj)) {
-    case LUA_TTABLE:
-      mt = hvalue(obj)->metatable;
-      break;
-    case LUA_TUSERDATA:
-      mt = uvalue(obj)->metatable;
-      break;
-    default:
-      mt = G(L)->mt[ttypenv(obj)];
-      break;
-  }
-  if (mt == NULL)
-    res = 0;
-  else {
-    sethvalue(L, L->top, mt);
+LUA_API void lua_getfield(lua_State *L, int idx, const char *k)
+{
+    StkId t;
+    lua_lock(L);
+    t = index2addr(L, idx);
+    setsvalue2s(L, L->top, luaS_new(L, k));
     api_incr_top(L);
-    res = 1;
-  }
-  lua_unlock(L);
-  return res;
+    luaV_gettable(L, t, L->top - 1, L->top - 1);
+    lua_unlock(L);
 }
 
 
-LUA_API void lua_getuservalue (lua_State *L, int idx) {
-  StkId o;
-  lua_lock(L);
-  o = index2addr(L, idx);
-  api_check(L, ttisuserdata(o), "userdata expected");
-  if (uvalue(o)->env) {
-    sethvalue(L, L->top, uvalue(o)->env);
-  } else
-    setnilvalue(L->top);
-  api_incr_top(L);
-  lua_unlock(L);
+LUA_API void lua_rawget(lua_State *L, int idx)
+{
+    StkId t;
+    lua_lock(L);
+    t = index2addr(L, idx);
+    api_check(L, ttistable(t), "table expected");
+    setobj2s(L, L->top - 1, luaH_get(hvalue(t), L->top - 1));
+    lua_unlock(L);
+}
+
+
+LUA_API void lua_rawgeti(lua_State *L, int idx, int n)
+{
+    StkId t;
+    lua_lock(L);
+    t = index2addr(L, idx);
+    api_check(L, ttistable(t), "table expected");
+    setobj2s(L, L->top, luaH_getint(hvalue(t), n));
+    api_incr_top(L);
+    lua_unlock(L);
+}
+
+
+LUA_API void lua_rawgetp(lua_State *L, int idx, const void *p)
+{
+    StkId t;
+    TValue k;
+    lua_lock(L);
+    t = index2addr(L, idx);
+    api_check(L, ttistable(t), "table expected");
+    setpvalue(&k, cast(void *, p));
+    setobj2s(L, L->top, luaH_get(hvalue(t), &k));
+    api_incr_top(L);
+    lua_unlock(L);
+}
+
+
+LUA_API void lua_createtable(lua_State *L, int narray, int nrec)
+{
+    Table *t;
+    lua_lock(L);
+    luaC_checkGC(L);
+    t = luaH_new(L);
+    sethvalue(L, L->top, t);
+    api_incr_top(L);
+    if (narray > 0 || nrec > 0)
+        luaH_resize(L, t, narray, nrec);
+    lua_unlock(L);
+}
+
+
+LUA_API int lua_getmetatable(lua_State *L, int objindex)
+{
+    const TValue *obj;
+    Table *mt = NULL;
+    int res;
+    lua_lock(L);
+    obj = index2addr(L, objindex);
+    switch (ttypenv(obj)) {
+        case LUA_TTABLE:
+            mt = hvalue(obj)->metatable;
+            break;
+        case LUA_TUSERDATA:
+            mt = uvalue(obj)->metatable;
+            break;
+        default:
+            mt = G(L)->mt[ttypenv(obj)];
+            break;
+    }
+    if (mt == NULL)
+        res = 0;
+    else {
+        sethvalue(L, L->top, mt);
+        api_incr_top(L);
+        res = 1;
+    }
+    lua_unlock(L);
+    return res;
+}
+
+
+LUA_API void lua_getuservalue(lua_State *L, int idx)
+{
+    StkId o;
+    lua_lock(L);
+    o = index2addr(L, idx);
+    api_check(L, ttisuserdata(o), "userdata expected");
+    if (uvalue(o)->env) {
+        sethvalue(L, L->top, uvalue(o)->env);
+    } else
+        setnilvalue(L->top);
+    api_incr_top(L);
+    lua_unlock(L);
 }
 
 
@@ -731,139 +797,147 @@ LUA_API void lua_getuservalue (lua_State *L, int idx) {
 */
 
 
-LUA_API void lua_setglobal (lua_State *L, const char *var) {
-  Table *reg = hvalue(&G(L)->l_registry);
-  const TValue *gt;  /* global table */
-  lua_lock(L);
-  api_checknelems(L, 1);
-  gt = luaH_getint(reg, LUA_RIDX_GLOBALS);
-  setsvalue2s(L, L->top++, luaS_new(L, var));
-  luaV_settable(L, gt, L->top - 1, L->top - 2);
-  L->top -= 2;  /* pop value and key */
-  lua_unlock(L);
+LUA_API void lua_setglobal(lua_State *L, const char *var)
+{
+    Table *reg = hvalue(&G(L)->l_registry);
+    const TValue *gt;  /* global table */
+    lua_lock(L);
+    api_checknelems(L, 1);
+    gt = luaH_getint(reg, LUA_RIDX_GLOBALS);
+    setsvalue2s(L, L->top++, luaS_new(L, var));
+    luaV_settable(L, gt, L->top - 1, L->top - 2);
+    L->top -= 2;  /* pop value and key */
+    lua_unlock(L);
 }
 
 
-LUA_API void lua_settable (lua_State *L, int idx) {
-  StkId t;
-  lua_lock(L);
-  api_checknelems(L, 2);
-  t = index2addr(L, idx);
-  luaV_settable(L, t, L->top - 2, L->top - 1);
-  L->top -= 2;  /* pop index and value */
-  lua_unlock(L);
+LUA_API void lua_settable(lua_State *L, int idx)
+{
+    StkId t;
+    lua_lock(L);
+    api_checknelems(L, 2);
+    t = index2addr(L, idx);
+    luaV_settable(L, t, L->top - 2, L->top - 1);
+    L->top -= 2;  /* pop index and value */
+    lua_unlock(L);
 }
 
 
-LUA_API void lua_setfield (lua_State *L, int idx, const char *k) {
-  StkId t;
-  lua_lock(L);
-  api_checknelems(L, 1);
-  t = index2addr(L, idx);
-  setsvalue2s(L, L->top++, luaS_new(L, k));
-  luaV_settable(L, t, L->top - 1, L->top - 2);
-  L->top -= 2;  /* pop value and key */
-  lua_unlock(L);
+LUA_API void lua_setfield(lua_State *L, int idx, const char *k)
+{
+    StkId t;
+    lua_lock(L);
+    api_checknelems(L, 1);
+    t = index2addr(L, idx);
+    setsvalue2s(L, L->top++, luaS_new(L, k));
+    luaV_settable(L, t, L->top - 1, L->top - 2);
+    L->top -= 2;  /* pop value and key */
+    lua_unlock(L);
 }
 
 
-LUA_API void lua_rawset (lua_State *L, int idx) {
-  StkId t;
-  lua_lock(L);
-  api_checknelems(L, 2);
-  t = index2addr(L, idx);
-  api_check(L, ttistable(t), "table expected");
-  setobj2t(L, luaH_set(L, hvalue(t), L->top-2), L->top-1);
-  invalidateTMcache(hvalue(t));
-  luaC_barrierback(L, gcvalue(t), L->top-1);
-  L->top -= 2;
-  lua_unlock(L);
+LUA_API void lua_rawset(lua_State *L, int idx)
+{
+    StkId t;
+    lua_lock(L);
+    api_checknelems(L, 2);
+    t = index2addr(L, idx);
+    api_check(L, ttistable(t), "table expected");
+    setobj2t(L, luaH_set(L, hvalue(t), L->top - 2), L->top - 1);
+    invalidateTMcache(hvalue(t));
+    luaC_barrierback(L, gcvalue(t), L->top - 1);
+    L->top -= 2;
+    lua_unlock(L);
 }
 
 
-LUA_API void lua_rawseti (lua_State *L, int idx, int n) {
-  StkId t;
-  lua_lock(L);
-  api_checknelems(L, 1);
-  t = index2addr(L, idx);
-  api_check(L, ttistable(t), "table expected");
-  luaH_setint(L, hvalue(t), n, L->top - 1);
-  luaC_barrierback(L, gcvalue(t), L->top-1);
-  L->top--;
-  lua_unlock(L);
+LUA_API void lua_rawseti(lua_State *L, int idx, int n)
+{
+    StkId t;
+    lua_lock(L);
+    api_checknelems(L, 1);
+    t = index2addr(L, idx);
+    api_check(L, ttistable(t), "table expected");
+    luaH_setint(L, hvalue(t), n, L->top - 1);
+    luaC_barrierback(L, gcvalue(t), L->top - 1);
+    L->top--;
+    lua_unlock(L);
 }
 
 
-LUA_API void lua_rawsetp (lua_State *L, int idx, const void *p) {
-  StkId t;
-  TValue k;
-  lua_lock(L);
-  api_checknelems(L, 1);
-  t = index2addr(L, idx);
-  api_check(L, ttistable(t), "table expected");
-  setpvalue(&k, cast(void *, p));
-  setobj2t(L, luaH_set(L, hvalue(t), &k), L->top - 1);
-  luaC_barrierback(L, gcvalue(t), L->top - 1);
-  L->top--;
-  lua_unlock(L);
+LUA_API void lua_rawsetp(lua_State *L, int idx, const void *p)
+{
+    StkId t;
+    TValue k;
+    lua_lock(L);
+    api_checknelems(L, 1);
+    t = index2addr(L, idx);
+    api_check(L, ttistable(t), "table expected");
+    setpvalue(&k, cast(void *, p));
+    setobj2t(L, luaH_set(L, hvalue(t), &k), L->top - 1);
+    luaC_barrierback(L, gcvalue(t), L->top - 1);
+    L->top--;
+    lua_unlock(L);
 }
 
 
-LUA_API int lua_setmetatable (lua_State *L, int objindex) {
-  TValue *obj;
-  Table *mt;
-  lua_lock(L);
-  api_checknelems(L, 1);
-  obj = index2addr(L, objindex);
-  if (ttisnil(L->top - 1))
-    mt = NULL;
-  else {
-    api_check(L, ttistable(L->top - 1), "table expected");
-    mt = hvalue(L->top - 1);
-  }
-  switch (ttypenv(obj)) {
-    case LUA_TTABLE: {
-      hvalue(obj)->metatable = mt;
-      if (mt) {
-        luaC_objbarrierback(L, gcvalue(obj), mt);
-        luaC_checkfinalizer(L, gcvalue(obj), mt);
-      }
-      break;
+LUA_API int lua_setmetatable(lua_State *L, int objindex)
+{
+    TValue *obj;
+    Table *mt;
+    lua_lock(L);
+    api_checknelems(L, 1);
+    obj = index2addr(L, objindex);
+    if (ttisnil(L->top - 1))
+        mt = NULL;
+    else {
+        api_check(L, ttistable(L->top - 1), "table expected");
+        mt = hvalue(L->top - 1);
     }
-    case LUA_TUSERDATA: {
-      uvalue(obj)->metatable = mt;
-      if (mt) {
-        luaC_objbarrier(L, rawuvalue(obj), mt);
-        luaC_checkfinalizer(L, gcvalue(obj), mt);
-      }
-      break;
+    switch (ttypenv(obj)) {
+        case LUA_TTABLE: {
+            hvalue(obj)->metatable = mt;
+            if (mt) {
+                luaC_objbarrierback(L, gcvalue(obj), mt);
+                luaC_checkfinalizer(L, gcvalue(obj), mt);
+            }
+            break;
+        }
+        case LUA_TUSERDATA: {
+            uvalue(obj)->metatable = mt;
+            if (mt) {
+                luaC_objbarrier(L, rawuvalue(obj), mt);
+                luaC_checkfinalizer(L, gcvalue(obj), mt);
+            }
+            break;
+        }
+        default: {
+            G(L)->mt[ttypenv(obj)] = mt;
+            break;
+        }
     }
-    default: {
-      G(L)->mt[ttypenv(obj)] = mt;
-      break;
-    }
-  }
-  L->top--;
-  lua_unlock(L);
-  return 1;
+    L->top--;
+    lua_unlock(L);
+    return 1;
 }
 
 
-LUA_API void lua_setuservalue (lua_State *L, int idx) {
-  StkId o;
-  lua_lock(L);
-  api_checknelems(L, 1);
-  o = index2addr(L, idx);
-  api_check(L, ttisuserdata(o), "userdata expected");
-  if (ttisnil(L->top - 1))
-    uvalue(o)->env = NULL;
-  else {
-    api_check(L, ttistable(L->top - 1), "table expected");
-    uvalue(o)->env = hvalue(L->top - 1);
-    luaC_objbarrier(L, gcvalue(o), hvalue(L->top - 1));
-  }
-  L->top--;
-  lua_unlock(L);
+LUA_API void lua_setuservalue(lua_State *L, int idx)
+{
+    StkId o;
+    lua_lock(L);
+    api_checknelems(L, 1);
+    o = index2addr(L, idx);
+    api_check(L, ttisuserdata(o), "userdata expected");
+    if (ttisnil(L->top - 1))
+        uvalue(o)->env = NULL;
+    else {
+        api_check(L, ttistable(L->top - 1), "table expected");
+        uvalue(o)->env = hvalue(L->top - 1);
+        luaC_objbarrier(L, gcvalue(o), hvalue(L->top - 1));
+    }
+    L->top--;
+    lua_unlock(L);
 }
 
 
@@ -873,38 +947,38 @@ LUA_API void lua_setuservalue (lua_State *L, int idx) {
 
 
 #define checkresults(L,na,nr) \
-     api_check(L, (nr) == LUA_MULTRET || (L->ci->top - L->top >= (nr) - (na)), \
-    "results from function overflow current stack size")
+    api_check(L, (nr) == LUA_MULTRET || (L->ci->top - L->top >= (nr) - (na)), \
+              "results from function overflow current stack size")
 
 
-LUA_API int lua_getctx (lua_State *L, int *ctx) {
-  if (L->ci->callstatus & CIST_YIELDED) {
-    if (ctx) *ctx = L->ci->u.c.ctx;
-    return L->ci->u.c.status;
-  }
-  else return LUA_OK;
+LUA_API int lua_getctx(lua_State *L, int *ctx)
+{
+    if (L->ci->callstatus & CIST_YIELDED) {
+        if (ctx) *ctx = L->ci->u.c.ctx;
+        return L->ci->u.c.status;
+    } else return LUA_OK;
 }
 
 
-LUA_API void lua_callk (lua_State *L, int nargs, int nresults, int ctx,
-                        lua_CFunction k) {
-  StkId func;
-  lua_lock(L);
-  api_check(L, k == NULL || !isLua(L->ci),
-    "cannot use continuations inside hooks");
-  api_checknelems(L, nargs+1);
-  api_check(L, L->status == LUA_OK, "cannot do calls on non-normal thread");
-  checkresults(L, nargs, nresults);
-  func = L->top - (nargs+1);
-  if (k != NULL && L->nny == 0) {  /* need to prepare continuation? */
-    L->ci->u.c.k = k;  /* save continuation */
-    L->ci->u.c.ctx = ctx;  /* save context */
-    luaD_call(L, func, nresults, 1);  /* do the call */
-  }
-  else  /* no continuation or no yieldable */
-    luaD_call(L, func, nresults, 0);  /* just do the call */
-  adjustresults(L, nresults);
-  lua_unlock(L);
+LUA_API void lua_callk(lua_State *L, int nargs, int nresults, int ctx,
+                       lua_CFunction k)
+{
+    StkId func;
+    lua_lock(L);
+    api_check(L, k == NULL || !isLua(L->ci),
+              "cannot use continuations inside hooks");
+    api_checknelems(L, nargs + 1);
+    api_check(L, L->status == LUA_OK, "cannot do calls on non-normal thread");
+    checkresults(L, nargs, nresults);
+    func = L->top - (nargs + 1);
+    if (k != NULL && L->nny == 0) {  /* need to prepare continuation? */
+        L->ci->u.c.k = k;  /* save continuation */
+        L->ci->u.c.ctx = ctx;  /* save context */
+        luaD_call(L, func, nresults, 1);  /* do the call */
+    } else /* no continuation or no yieldable */
+        luaD_call(L, func, nresults, 0);  /* just do the call */
+    adjustresults(L, nresults);
+    lua_unlock(L);
 }
 
 
@@ -913,104 +987,108 @@ LUA_API void lua_callk (lua_State *L, int nargs, int nresults, int ctx,
 ** Execute a protected call.
 */
 struct CallS {  /* data to `f_call' */
-  StkId func;
-  int nresults;
+    StkId func;
+    int nresults;
 };
 
 
-static void f_call (lua_State *L, void *ud) {
-  struct CallS *c = cast(struct CallS *, ud);
-  luaD_call(L, c->func, c->nresults, 0);
+static void f_call(lua_State *L, void *ud)
+{
+    struct CallS *c = cast(struct CallS *, ud);
+    luaD_call(L, c->func, c->nresults, 0);
 }
 
 
 
-LUA_API int lua_pcallk (lua_State *L, int nargs, int nresults, int errfunc,
-                        int ctx, lua_CFunction k) {
-  struct CallS c;
-  int status;
-  ptrdiff_t func;
-  lua_lock(L);
-  api_check(L, k == NULL || !isLua(L->ci),
-    "cannot use continuations inside hooks");
-  api_checknelems(L, nargs+1);
-  api_check(L, L->status == LUA_OK, "cannot do calls on non-normal thread");
-  checkresults(L, nargs, nresults);
-  if (errfunc == 0)
-    func = 0;
-  else {
-    StkId o = index2addr(L, errfunc);
-    api_checkstackindex(L, errfunc, o);
-    func = savestack(L, o);
-  }
-  c.func = L->top - (nargs+1);  /* function to be called */
-  if (k == NULL || L->nny > 0) {  /* no continuation or no yieldable? */
-    c.nresults = nresults;  /* do a 'conventional' protected call */
-    status = luaD_pcall(L, f_call, &c, savestack(L, c.func), func);
-  }
-  else {  /* prepare continuation (call is already protected by 'resume') */
-    CallInfo *ci = L->ci;
-    ci->u.c.k = k;  /* save continuation */
-    ci->u.c.ctx = ctx;  /* save context */
-    /* save information for error recovery */
-    ci->extra = savestack(L, c.func);
-    ci->u.c.old_allowhook = L->allowhook;
-    ci->u.c.old_errfunc = L->errfunc;
-    L->errfunc = func;
-    /* mark that function may do error recovery */
-    ci->callstatus |= CIST_YPCALL;
-    luaD_call(L, c.func, nresults, 1);  /* do the call */
-    ci->callstatus &= ~CIST_YPCALL;
-    L->errfunc = ci->u.c.old_errfunc;
-    status = LUA_OK;  /* if it is here, there were no errors */
-  }
-  adjustresults(L, nresults);
-  lua_unlock(L);
-  return status;
-}
-
-
-LUA_API int lua_load (lua_State *L, lua_Reader reader, void *data,
-                      const char *chunkname, const char *mode) {
-  ZIO z;
-  int status;
-  lua_lock(L);
-  if (!chunkname) chunkname = "?";
-  luaZ_init(L, &z, reader, data);
-  status = luaD_protectedparser(L, &z, chunkname, mode);
-  if (status == LUA_OK) {  /* no errors? */
-    LClosure *f = clLvalue(L->top - 1);  /* get newly created function */
-    if (f->nupvalues == 1) {  /* does it have one upvalue? */
-      /* get global table from registry */
-      Table *reg = hvalue(&G(L)->l_registry);
-      const TValue *gt = luaH_getint(reg, LUA_RIDX_GLOBALS);
-      /* set global table as 1st upvalue of 'f' (may be LUA_ENV) */
-      setobj(L, f->upvals[0]->v, gt);
-      luaC_barrier(L, f->upvals[0], gt);
+LUA_API int lua_pcallk(lua_State *L, int nargs, int nresults, int errfunc,
+                       int ctx, lua_CFunction k)
+{
+    struct CallS c;
+    int status;
+    ptrdiff_t func;
+    lua_lock(L);
+    api_check(L, k == NULL || !isLua(L->ci),
+              "cannot use continuations inside hooks");
+    api_checknelems(L, nargs + 1);
+    api_check(L, L->status == LUA_OK, "cannot do calls on non-normal thread");
+    checkresults(L, nargs, nresults);
+    if (errfunc == 0)
+        func = 0;
+    else {
+        StkId o = index2addr(L, errfunc);
+        api_checkstackindex(L, errfunc, o);
+        func = savestack(L, o);
     }
-  }
-  lua_unlock(L);
-  return status;
+    c.func = L->top - (nargs + 1); /* function to be called */
+    if (k == NULL || L->nny > 0) {  /* no continuation or no yieldable? */
+        c.nresults = nresults;  /* do a 'conventional' protected call */
+        status = luaD_pcall(L, f_call, &c, savestack(L, c.func), func);
+    } else { /* prepare continuation (call is already protected by 'resume') */
+        CallInfo *ci = L->ci;
+        ci->u.c.k = k;  /* save continuation */
+        ci->u.c.ctx = ctx;  /* save context */
+        /* save information for error recovery */
+        ci->extra = savestack(L, c.func);
+        ci->u.c.old_allowhook = L->allowhook;
+        ci->u.c.old_errfunc = L->errfunc;
+        L->errfunc = func;
+        /* mark that function may do error recovery */
+        ci->callstatus |= CIST_YPCALL;
+        luaD_call(L, c.func, nresults, 1);  /* do the call */
+        ci->callstatus &= ~CIST_YPCALL;
+        L->errfunc = ci->u.c.old_errfunc;
+        status = LUA_OK;  /* if it is here, there were no errors */
+    }
+    adjustresults(L, nresults);
+    lua_unlock(L);
+    return status;
 }
 
 
-LUA_API int lua_dump (lua_State *L, lua_Writer writer, void *data) {
-  int status;
-  TValue *o;
-  lua_lock(L);
-  api_checknelems(L, 1);
-  o = L->top - 1;
-  if (isLfunction(o))
-    status = luaU_dump(L, getproto(o), writer, data, 0);
-  else
-    status = 1;
-  lua_unlock(L);
-  return status;
+LUA_API int lua_load(lua_State *L, lua_Reader reader, void *data,
+                     const char *chunkname, const char *mode)
+{
+    ZIO z;
+    int status;
+    lua_lock(L);
+    if (!chunkname) chunkname = "?";
+    luaZ_init(L, &z, reader, data);
+    status = luaD_protectedparser(L, &z, chunkname, mode);
+    if (status == LUA_OK) {  /* no errors? */
+        LClosure *f = clLvalue(L->top - 1);  /* get newly created function */
+        if (f->nupvalues == 1) {  /* does it have one upvalue? */
+            /* get global table from registry */
+            Table *reg = hvalue(&G(L)->l_registry);
+            const TValue *gt = luaH_getint(reg, LUA_RIDX_GLOBALS);
+            /* set global table as 1st upvalue of 'f' (may be LUA_ENV) */
+            setobj(L, f->upvals[0]->v, gt);
+            luaC_barrier(L, f->upvals[0], gt);
+        }
+    }
+    lua_unlock(L);
+    return status;
 }
 
 
-LUA_API int lua_status (lua_State *L) {
-  return L->status;
+LUA_API int lua_dump(lua_State *L, lua_Writer writer, void *data)
+{
+    int status;
+    TValue *o;
+    lua_lock(L);
+    api_checknelems(L, 1);
+    o = L->top - 1;
+    if (isLfunction(o))
+        status = luaU_dump(L, getproto(o), writer, data, 0);
+    else
+        status = 1;
+    lua_unlock(L);
+    return status;
+}
+
+
+LUA_API int lua_status(lua_State *L)
+{
+    return L->status;
 }
 
 
@@ -1018,81 +1096,82 @@ LUA_API int lua_status (lua_State *L) {
 ** Garbage-collection function
 */
 
-LUA_API int lua_gc (lua_State *L, int what, int data) {
-  int res = 0;
-  global_State *g;
-  lua_lock(L);
-  g = G(L);
-  switch (what) {
-    case LUA_GCSTOP: {
-      g->gcrunning = 0;
-      break;
+LUA_API int lua_gc(lua_State *L, int what, int data)
+{
+    int res = 0;
+    global_State *g;
+    lua_lock(L);
+    g = G(L);
+    switch (what) {
+        case LUA_GCSTOP: {
+            g->gcrunning = 0;
+            break;
+        }
+        case LUA_GCRESTART: {
+            luaE_setdebt(g, 0);
+            g->gcrunning = 1;
+            break;
+        }
+        case LUA_GCCOLLECT: {
+            luaC_fullgc(L, 0);
+            break;
+        }
+        case LUA_GCCOUNT: {
+            /* GC values are expressed in Kbytes: #bytes/2^10 */
+            res = cast_int(gettotalbytes(g) >> 10);
+            break;
+        }
+        case LUA_GCCOUNTB: {
+            res = cast_int(gettotalbytes(g) & 0x3ff);
+            break;
+        }
+        case LUA_GCSTEP: {
+            if (g->gckind == KGC_GEN) {  /* generational mode? */
+                res = (g->GCestimate == 0);  /* true if it will do major collection */
+                luaC_forcestep(L);  /* do a single step */
+            } else {
+                lu_mem debt = cast(lu_mem, data) * 1024 - GCSTEPSIZE;
+                if (g->gcrunning)
+                    debt += g->GCdebt;  /* include current debt */
+                luaE_setdebt(g, debt);
+                luaC_forcestep(L);
+                if (g->gcstate == GCSpause)  /* end of cycle? */
+                    res = 1;  /* signal it */
+            }
+            break;
+        }
+        case LUA_GCSETPAUSE: {
+            res = g->gcpause;
+            g->gcpause = data;
+            break;
+        }
+        case LUA_GCSETMAJORINC: {
+            res = g->gcmajorinc;
+            g->gcmajorinc = data;
+            break;
+        }
+        case LUA_GCSETSTEPMUL: {
+            res = g->gcstepmul;
+            g->gcstepmul = data;
+            break;
+        }
+        case LUA_GCISRUNNING: {
+            res = g->gcrunning;
+            break;
+        }
+        case LUA_GCGEN: {  /* change collector to generational mode */
+            luaC_changemode(L, KGC_GEN);
+            break;
+        }
+        case LUA_GCINC: {  /* change collector to incremental mode */
+            luaC_changemode(L, KGC_NORMAL);
+            break;
+        }
+        default:
+            res = -1;  /* invalid option */
     }
-    case LUA_GCRESTART: {
-      luaE_setdebt(g, 0);
-      g->gcrunning = 1;
-      break;
-    }
-    case LUA_GCCOLLECT: {
-      luaC_fullgc(L, 0);
-      break;
-    }
-    case LUA_GCCOUNT: {
-      /* GC values are expressed in Kbytes: #bytes/2^10 */
-      res = cast_int(gettotalbytes(g) >> 10);
-      break;
-    }
-    case LUA_GCCOUNTB: {
-      res = cast_int(gettotalbytes(g) & 0x3ff);
-      break;
-    }
-    case LUA_GCSTEP: {
-      if (g->gckind == KGC_GEN) {  /* generational mode? */
-        res = (g->GCestimate == 0);  /* true if it will do major collection */
-        luaC_forcestep(L);  /* do a single step */
-      }
-      else {
-       lu_mem debt = cast(lu_mem, data) * 1024 - GCSTEPSIZE;
-       if (g->gcrunning)
-         debt += g->GCdebt;  /* include current debt */
-       luaE_setdebt(g, debt);
-       luaC_forcestep(L);
-       if (g->gcstate == GCSpause)  /* end of cycle? */
-         res = 1;  /* signal it */
-      }
-      break;
-    }
-    case LUA_GCSETPAUSE: {
-      res = g->gcpause;
-      g->gcpause = data;
-      break;
-    }
-    case LUA_GCSETMAJORINC: {
-      res = g->gcmajorinc;
-      g->gcmajorinc = data;
-      break;
-    }
-    case LUA_GCSETSTEPMUL: {
-      res = g->gcstepmul;
-      g->gcstepmul = data;
-      break;
-    }
-    case LUA_GCISRUNNING: {
-      res = g->gcrunning;
-      break;
-    }
-    case LUA_GCGEN: {  /* change collector to generational mode */
-      luaC_changemode(L, KGC_GEN);
-      break;
-    }
-    case LUA_GCINC: {  /* change collector to incremental mode */
-      luaC_changemode(L, KGC_NORMAL);
-      break;
-    }
-    default: res = -1;  /* invalid option */
-  }
-  lua_unlock(L);
-  return res;
+    lua_unlock(L);
+    return res;
 }
 
 
@@ -1102,183 +1181,195 @@ LUA_API int lua_gc (lua_State *L, int what, int data) {
 */
 
 
-LUA_API int lua_error (lua_State *L) {
-  lua_lock(L);
-  api_checknelems(L, 1);
-  luaG_errormsg(L);
-  /* code unreachable; will unlock when control actually leaves the kernel */
-  return 0;  /* to avoid warnings */
+LUA_API int lua_error(lua_State *L)
+{
+    lua_lock(L);
+    api_checknelems(L, 1);
+    luaG_errormsg(L);
+    /* code unreachable; will unlock when control actually leaves the kernel */
+    return 0;  /* to avoid warnings */
 }
 
 
-LUA_API int lua_next (lua_State *L, int idx) {
-  StkId t;
-  int more;
-  lua_lock(L);
-  t = index2addr(L, idx);
-  api_check(L, ttistable(t), "table expected");
-  more = luaH_next(L, hvalue(t), L->top - 1);
-  if (more) {
+LUA_API int lua_next(lua_State *L, int idx)
+{
+    StkId t;
+    int more;
+    lua_lock(L);
+    t = index2addr(L, idx);
+    api_check(L, ttistable(t), "table expected");
+    more = luaH_next(L, hvalue(t), L->top - 1);
+    if (more) {
+        api_incr_top(L);
+    } else /* no more elements */
+        L->top -= 1;  /* remove key */
+    lua_unlock(L);
+    return more;
+}
+
+
+LUA_API void lua_concat(lua_State *L, int n)
+{
+    lua_lock(L);
+    api_checknelems(L, n);
+    if (n >= 2) {
+        luaC_checkGC(L);
+        luaV_concat(L, n);
+    } else if (n == 0) { /* push empty string */
+        setsvalue2s(L, L->top, luaS_newlstr(L, "", 0));
+        api_incr_top(L);
+    }
+    /* else n == 1; nothing to do */
+    lua_unlock(L);
+}
+
+
+LUA_API void lua_len(lua_State *L, int idx)
+{
+    StkId t;
+    lua_lock(L);
+    t = index2addr(L, idx);
+    luaV_objlen(L, L->top, t);
     api_incr_top(L);
-  }
-  else  /* no more elements */
-    L->top -= 1;  /* remove key */
-  lua_unlock(L);
-  return more;
+    lua_unlock(L);
 }
 
 
-LUA_API void lua_concat (lua_State *L, int n) {
-  lua_lock(L);
-  api_checknelems(L, n);
-  if (n >= 2) {
+LUA_API lua_Alloc lua_getallocf(lua_State *L, void **ud)
+{
+    lua_Alloc f;
+    lua_lock(L);
+    if (ud) *ud = G(L)->ud;
+    f = G(L)->frealloc;
+    lua_unlock(L);
+    return f;
+}
+
+
+LUA_API void lua_setallocf(lua_State *L, lua_Alloc f, void *ud)
+{
+    lua_lock(L);
+    G(L)->ud = ud;
+    G(L)->frealloc = f;
+    lua_unlock(L);
+}
+
+
+LUA_API void *lua_newuserdata(lua_State *L, size_t size)
+{
+    Udata *u;
+    lua_lock(L);
     luaC_checkGC(L);
-    luaV_concat(L, n);
-  }
-  else if (n == 0) {  /* push empty string */
-    setsvalue2s(L, L->top, luaS_newlstr(L, "", 0));
+    u = luaS_newudata(L, size, NULL);
+    setuvalue(L, L->top, u);
     api_incr_top(L);
-  }
-  /* else n == 1; nothing to do */
-  lua_unlock(L);
-}
-
-
-LUA_API void lua_len (lua_State *L, int idx) {
-  StkId t;
-  lua_lock(L);
-  t = index2addr(L, idx);
-  luaV_objlen(L, L->top, t);
-  api_incr_top(L);
-  lua_unlock(L);
-}
-
-
-LUA_API lua_Alloc lua_getallocf (lua_State *L, void **ud) {
-  lua_Alloc f;
-  lua_lock(L);
-  if (ud) *ud = G(L)->ud;
-  f = G(L)->frealloc;
-  lua_unlock(L);
-  return f;
-}
-
-
-LUA_API void lua_setallocf (lua_State *L, lua_Alloc f, void *ud) {
-  lua_lock(L);
-  G(L)->ud = ud;
-  G(L)->frealloc = f;
-  lua_unlock(L);
-}
-
-
-LUA_API void *lua_newuserdata (lua_State *L, size_t size) {
-  Udata *u;
-  lua_lock(L);
-  luaC_checkGC(L);
-  u = luaS_newudata(L, size, NULL);
-  setuvalue(L, L->top, u);
-  api_incr_top(L);
-  lua_unlock(L);
-  return u + 1;
+    lua_unlock(L);
+    return u + 1;
 }
 
 
 
-static const char *aux_upvalue (StkId fi, int n, TValue **val,
-                                GCObject **owner) {
-  switch (ttype(fi)) {
-    case LUA_TCCL: {  /* C closure */
-      CClosure *f = clCvalue(fi);
-      if (!(1 <= n && n <= f->nupvalues)) return NULL;
-      *val = &f->upvalue[n-1];
-      if (owner) *owner = obj2gco(f);
-      return "";
+static const char *aux_upvalue(StkId fi, int n, TValue **val,
+                               GCObject **owner)
+{
+    switch (ttype(fi)) {
+        case LUA_TCCL: {  /* C closure */
+            CClosure *f = clCvalue(fi);
+            if (!(1 <= n && n <= f->nupvalues)) return NULL;
+            *val = &f->upvalue[n - 1];
+            if (owner) *owner = obj2gco(f);
+            return "";
+        }
+        case LUA_TLCL: {  /* Lua closure */
+            LClosure *f = clLvalue(fi);
+            TString *name;
+            Proto *p = f->p;
+            if (!(1 <= n && n <= p->sizeupvalues)) return NULL;
+            *val = f->upvals[n - 1]->v;
+            if (owner) *owner = obj2gco(f->upvals[n - 1]);
+            name = p->upvalues[n - 1].name;
+            return (name == NULL) ? "" : getstr(name);
+        }
+        default:
+            return NULL;  /* not a closure */
     }
-    case LUA_TLCL: {  /* Lua closure */
-      LClosure *f = clLvalue(fi);
-      TString *name;
-      Proto *p = f->p;
-      if (!(1 <= n && n <= p->sizeupvalues)) return NULL;
-      *val = f->upvals[n-1]->v;
-      if (owner) *owner = obj2gco(f->upvals[n - 1]);
-      name = p->upvalues[n-1].name;
-      return (name == NULL) ? "" : getstr(name);
+}
+
+
+LUA_API const char *lua_getupvalue(lua_State *L, int funcindex, int n)
+{
+    const char *name;
+    TValue *val = NULL;  /* to avoid warnings */
+    lua_lock(L);
+    name = aux_upvalue(index2addr(L, funcindex), n, &val, NULL);
+    if (name) {
+        setobj2s(L, L->top, val);
+        api_incr_top(L);
     }
-    default: return NULL;  /* not a closure */
-  }
+    lua_unlock(L);
+    return name;
 }
 
 
-LUA_API const char *lua_getupvalue (lua_State *L, int funcindex, int n) {
-  const char *name;
-  TValue *val = NULL;  /* to avoid warnings */
-  lua_lock(L);
-  name = aux_upvalue(index2addr(L, funcindex), n, &val, NULL);
-  if (name) {
-    setobj2s(L, L->top, val);
-    api_incr_top(L);
-  }
-  lua_unlock(L);
-  return name;
-}
-
-
-LUA_API const char *lua_setupvalue (lua_State *L, int funcindex, int n) {
-  const char *name;
-  TValue *val = NULL;  /* to avoid warnings */
-  GCObject *owner = NULL;  /* to avoid warnings */
-  StkId fi;
-  lua_lock(L);
-  fi = index2addr(L, funcindex);
-  api_checknelems(L, 1);
-  name = aux_upvalue(fi, n, &val, &owner);
-  if (name) {
-    L->top--;
-    setobj(L, val, L->top);
-    luaC_barrier(L, owner, L->top);
-  }
-  lua_unlock(L);
-  return name;
-}
-
-
-static UpVal **getupvalref (lua_State *L, int fidx, int n, LClosure **pf) {
-  LClosure *f;
-  StkId fi = index2addr(L, fidx);
-  api_check(L, ttisLclosure(fi), "Lua function expected");
-  f = clLvalue(fi);
-  api_check(L, (1 <= n && n <= f->p->sizeupvalues), "invalid upvalue index");
-  if (pf) *pf = f;
-  return &f->upvals[n - 1];  /* get its upvalue pointer */
-}
-
-
-LUA_API void *lua_upvalueid (lua_State *L, int fidx, int n) {
-  StkId fi = index2addr(L, fidx);
-  switch (ttype(fi)) {
-    case LUA_TLCL: {  /* lua closure */
-      return *getupvalref(L, fidx, n, NULL);
+LUA_API const char *lua_setupvalue(lua_State *L, int funcindex, int n)
+{
+    const char *name;
+    TValue *val = NULL;  /* to avoid warnings */
+    GCObject *owner = NULL;  /* to avoid warnings */
+    StkId fi;
+    lua_lock(L);
+    fi = index2addr(L, funcindex);
+    api_checknelems(L, 1);
+    name = aux_upvalue(fi, n, &val, &owner);
+    if (name) {
+        L->top--;
+        setobj(L, val, L->top);
+        luaC_barrier(L, owner, L->top);
     }
-    case LUA_TCCL: {  /* C closure */
-      CClosure *f = clCvalue(fi);
-      api_check(L, 1 <= n && n <= f->nupvalues, "invalid upvalue index");
-      return &f->upvalue[n - 1];
-    }
-    default: {
-      api_check(L, 0, "closure expected");
-      return NULL;
-    }
-  }
+    lua_unlock(L);
+    return name;
 }
 
 
-LUA_API void lua_upvaluejoin (lua_State *L, int fidx1, int n1,
-                                            int fidx2, int n2) {
-  LClosure *f1;
-  UpVal **up1 = getupvalref(L, fidx1, n1, &f1);
-  UpVal **up2 = getupvalref(L, fidx2, n2, NULL);
-  *up1 = *up2;
-  luaC_objbarrier(L, f1, *up2);
+static UpVal **getupvalref(lua_State *L, int fidx, int n, LClosure **pf)
+{
+    LClosure *f;
+    StkId fi = index2addr(L, fidx);
+    api_check(L, ttisLclosure(fi), "Lua function expected");
+    f = clLvalue(fi);
+    api_check(L, (1 <= n && n <= f->p->sizeupvalues), "invalid upvalue index");
+    if (pf) *pf = f;
+    return &f->upvals[n - 1];  /* get its upvalue pointer */
+}
+
+
+LUA_API void *lua_upvalueid(lua_State *L, int fidx, int n)
+{
+    StkId fi = index2addr(L, fidx);
+    switch (ttype(fi)) {
+        case LUA_TLCL: {  /* lua closure */
+            return *getupvalref(L, fidx, n, NULL);
+        }
+        case LUA_TCCL: {  /* C closure */
+            CClosure *f = clCvalue(fi);
+            api_check(L, 1 <= n && n <= f->nupvalues, "invalid upvalue index");
+            return &f->upvalue[n - 1];
+        }
+        default: {
+            api_check(L, 0, "closure expected");
+            return NULL;
+        }
+    }
+}
+
+
+LUA_API void lua_upvaluejoin(lua_State *L, int fidx1, int n1,
+                             int fidx2, int n2)
+{
+    LClosure *f1;
+    UpVal **up1 = getupvalref(L, fidx1, n1, &f1);
+    UpVal **up2 = getupvalref(L, fidx2, n2, NULL);
+    *up1 = *up2;
+    luaC_objbarrier(L, f1, *up2);
 }
 
diff --git a/liblua/lapi.h b/liblua/lapi.h
index 3d45c0b66..fcee6a8a6 100644
--- a/liblua/lapi.h
+++ b/liblua/lapi.h
@@ -12,13 +12,13 @@
 #include "lstate.h"
 
 #define api_incr_top(L)   {L->top++; api_check(L, L->top <= L->ci->top, \
-                "stack overflow");}
+                                                   "stack overflow");}
 
 #define adjustresults(L,nres) \
     { if ((nres) == LUA_MULTRET && L->ci->top < L->top) L->ci->top = L->top; }
 
 #define api_checknelems(L,n) api_check(L, (n) < (L->top - L->ci->func), \
-                  "not enough elements in the stack")
+                                       "not enough elements in the stack")
 
 
 #endif
diff --git a/liblua/lauxlib.c b/liblua/lauxlib.c
index 9a91a2a4b..86666b444 100644
--- a/liblua/lauxlib.c
+++ b/liblua/lauxlib.c
@@ -40,105 +40,105 @@
 ** search for 'objidx' in table at index -1.
 ** return 1 + string at top if find a good name.
 */
-static int findfield (lua_State *L, int objidx, int level) {
-  if (level == 0 || !lua_istable(L, -1))
+static int findfield(lua_State *L, int objidx, int level)
+{
+    if (level == 0 || !lua_istable(L, -1))
+        return 0;  /* not found */
+    lua_pushnil(L);  /* start 'next' loop */
+    while (lua_next(L, -2)) {  /* for each pair in table */
+        if (lua_type(L, -2) == LUA_TSTRING) {  /* ignore non-string keys */
+            if (lua_rawequal(L, objidx, -1)) {  /* found object? */
+                lua_pop(L, 1);  /* remove value (but keep name) */
+                return 1;
+            } else if (findfield(L, objidx, level - 1)) { /* try recursively */
+                lua_remove(L, -2);  /* remove table (but keep name) */
+                lua_pushliteral(L, ".");
+                lua_insert(L, -2);  /* place '.' between the two names */
+                lua_concat(L, 3);
+                return 1;
+            }
+        }
+        lua_pop(L, 1);  /* remove value */
+    }
     return 0;  /* not found */
-  lua_pushnil(L);  /* start 'next' loop */
-  while (lua_next(L, -2)) {  /* for each pair in table */
-    if (lua_type(L, -2) == LUA_TSTRING) {  /* ignore non-string keys */
-      if (lua_rawequal(L, objidx, -1)) {  /* found object? */
-        lua_pop(L, 1);  /* remove value (but keep name) */
+}
+
+
+static int pushglobalfuncname(lua_State *L, lua_Debug *ar)
+{
+    int top = lua_gettop(L);
+    lua_getinfo(L, "f", ar);  /* push function */
+    lua_pushglobaltable(L);
+    if (findfield(L, top + 1, 2)) {
+        lua_copy(L, -1, top + 1);  /* move name to proper place */
+        lua_pop(L, 2);  /* remove pushed values */
         return 1;
-      }
-      else if (findfield(L, objidx, level - 1)) {  /* try recursively */
-        lua_remove(L, -2);  /* remove table (but keep name) */
-        lua_pushliteral(L, ".");
-        lua_insert(L, -2);  /* place '.' between the two names */
-        lua_concat(L, 3);
-        return 1;
-      }
+    } else {
+        lua_settop(L, top);  /* remove function and global table */
+        return 0;
     }
-    lua_pop(L, 1);  /* remove value */
-  }
-  return 0;  /* not found */
 }
 
 
-static int pushglobalfuncname (lua_State *L, lua_Debug *ar) {
-  int top = lua_gettop(L);
-  lua_getinfo(L, "f", ar);  /* push function */
-  lua_pushglobaltable(L);
-  if (findfield(L, top + 1, 2)) {
-    lua_copy(L, -1, top + 1);  /* move name to proper place */
-    lua_pop(L, 2);  /* remove pushed values */
-    return 1;
-  }
-  else {
-    lua_settop(L, top);  /* remove function and global table */
-    return 0;
-  }
+static void pushfuncname(lua_State *L, lua_Debug *ar)
+{
+    if (*ar->namewhat != '\0')  /* is there a name? */
+        lua_pushfstring(L, "function " LUA_QS, ar->name);
+    else if (*ar->what == 'm')  /* main? */
+        lua_pushliteral(L, "main chunk");
+    else if (*ar->what == 'C') {
+        if (pushglobalfuncname(L, ar)) {
+            lua_pushfstring(L, "function " LUA_QS, lua_tostring(L, -1));
+            lua_remove(L, -2);  /* remove name */
+        } else
+            lua_pushliteral(L, "?");
+    } else
+        lua_pushfstring(L, "function <%s:%d>", ar->short_src, ar->linedefined);
 }
 
 
-static void pushfuncname (lua_State *L, lua_Debug *ar) {
-  if (*ar->namewhat != '\0')  /* is there a name? */
-    lua_pushfstring(L, "function " LUA_QS, ar->name);
-  else if (*ar->what == 'm')  /* main? */
-      lua_pushliteral(L, "main chunk");
-  else if (*ar->what == 'C') {
-    if (pushglobalfuncname(L, ar)) {
-      lua_pushfstring(L, "function " LUA_QS, lua_tostring(L, -1));
-      lua_remove(L, -2);  /* remove name */
+static int countlevels(lua_State *L)
+{
+    lua_Debug ar;
+    int li = 1, le = 1;
+    /* find an upper bound */
+    while (lua_getstack(L, le, &ar)) { li = le; le *= 2; }
+    /* do a binary search */
+    while (li < le) {
+        int m = (li + le) / 2;
+        if (lua_getstack(L, m, &ar)) li = m + 1;
+        else le = m;
     }
-    else
-      lua_pushliteral(L, "?");
-  }
-  else
-    lua_pushfstring(L, "function <%s:%d>", ar->short_src, ar->linedefined);
+    return le - 1;
 }
 
 
-static int countlevels (lua_State *L) {
-  lua_Debug ar;
-  int li = 1, le = 1;
-  /* find an upper bound */
-  while (lua_getstack(L, le, &ar)) { li = le; le *= 2; }
-  /* do a binary search */
-  while (li < le) {
-    int m = (li + le)/2;
-    if (lua_getstack(L, m, &ar)) li = m + 1;
-    else le = m;
-  }
-  return le - 1;
-}
-
-
-LUALIB_API void luaL_traceback (lua_State *L, lua_State *L1,
-                                const char *msg, int level) {
-  lua_Debug ar;
-  int top = lua_gettop(L);
-  int numlevels = countlevels(L1);
-  int mark = (numlevels > LEVELS1 + LEVELS2) ? LEVELS1 : 0;
-  if (msg) lua_pushfstring(L, "%s\n", msg);
-  lua_pushliteral(L, "stack traceback:");
-  while (lua_getstack(L1, level++, &ar)) {
-    if (level == mark) {  /* too many levels? */
-      lua_pushliteral(L, "\n\t...");  /* add a '...' */
-      level = numlevels - LEVELS2;  /* and skip to last ones */
+LUALIB_API void luaL_traceback(lua_State *L, lua_State *L1,
+                               const char *msg, int level)
+{
+    lua_Debug ar;
+    int top = lua_gettop(L);
+    int numlevels = countlevels(L1);
+    int mark = (numlevels > LEVELS1 + LEVELS2) ? LEVELS1 : 0;
+    if (msg) lua_pushfstring(L, "%s\n", msg);
+    lua_pushliteral(L, "stack traceback:");
+    while (lua_getstack(L1, level++, &ar)) {
+        if (level == mark) {  /* too many levels? */
+            lua_pushliteral(L, "\n\t...");  /* add a '...' */
+            level = numlevels - LEVELS2;  /* and skip to last ones */
+        } else {
+            lua_getinfo(L1, "Slnt", &ar);
+            lua_pushfstring(L, "\n\t%s:", ar.short_src);
+            if (ar.currentline > 0)
+                lua_pushfstring(L, "%d:", ar.currentline);
+            lua_pushliteral(L, " in ");
+            pushfuncname(L, &ar);
+            if (ar.istailcall)
+                lua_pushliteral(L, "\n\t(...tail calls...)");
+            lua_concat(L, lua_gettop(L) - top);
+        }
     }
-    else {
-      lua_getinfo(L1, "Slnt", &ar);
-      lua_pushfstring(L, "\n\t%s:", ar.short_src);
-      if (ar.currentline > 0)
-        lua_pushfstring(L, "%d:", ar.currentline);
-      lua_pushliteral(L, " in ");
-      pushfuncname(L, &ar);
-      if (ar.istailcall)
-        lua_pushliteral(L, "\n\t(...tail calls...)");
-      lua_concat(L, lua_gettop(L) - top);
-    }
-  }
-  lua_concat(L, lua_gettop(L) - top);
+    lua_concat(L, lua_gettop(L) - top);
 }
 
 /* }====================================================== */
@@ -150,75 +150,80 @@ LUALIB_API void luaL_traceback (lua_State *L, lua_State *L1,
 ** =======================================================
 */
 
-LUALIB_API int luaL_argerror (lua_State *L, int narg, const char *extramsg) {
-  lua_Debug ar;
-  if (!lua_getstack(L, 0, &ar))  /* no stack frame? */
-    return luaL_error(L, "bad argument #%d (%s)", narg, extramsg);
-  lua_getinfo(L, "n", &ar);
-  if (strcmp(ar.namewhat, "method") == 0) {
-    narg--;  /* do not count `self' */
-    if (narg == 0)  /* error is in the self argument itself? */
-      return luaL_error(L, "calling " LUA_QS " on bad self (%s)",
-                           ar.name, extramsg);
-  }
-  if (ar.name == NULL)
-    ar.name = (pushglobalfuncname(L, &ar)) ? lua_tostring(L, -1) : "?";
-  return luaL_error(L, "bad argument #%d to " LUA_QS " (%s)",
-                        narg, ar.name, extramsg);
-}
-
-
-static int typeerror (lua_State *L, int narg, const char *tname) {
-  const char *msg = lua_pushfstring(L, "%s expected, got %s",
-                                    tname, luaL_typename(L, narg));
-  return luaL_argerror(L, narg, msg);
-}
-
-
-static void tag_error (lua_State *L, int narg, int tag) {
-  typeerror(L, narg, lua_typename(L, tag));
-}
-
-
-LUALIB_API void luaL_where (lua_State *L, int level) {
-  lua_Debug ar;
-  if (lua_getstack(L, level, &ar)) {  /* check function at level */
-    lua_getinfo(L, "Sl", &ar);  /* get info about it */
-    if (ar.currentline > 0) {  /* is there info? */
-      lua_pushfstring(L, "%s:%d: ", ar.short_src, ar.currentline);
-      return;
+LUALIB_API int luaL_argerror(lua_State *L, int narg, const char *extramsg)
+{
+    lua_Debug ar;
+    if (!lua_getstack(L, 0, &ar))  /* no stack frame? */
+        return luaL_error(L, "bad argument #%d (%s)", narg, extramsg);
+    lua_getinfo(L, "n", &ar);
+    if (strcmp(ar.namewhat, "method") == 0) {
+        narg--;  /* do not count `self' */
+        if (narg == 0)  /* error is in the self argument itself? */
+            return luaL_error(L, "calling " LUA_QS " on bad self (%s)",
+                              ar.name, extramsg);
     }
-  }
-  lua_pushliteral(L, "");  /* else, no information available... */
+    if (ar.name == NULL)
+        ar.name = (pushglobalfuncname(L, &ar)) ? lua_tostring(L, -1) : "?";
+    return luaL_error(L, "bad argument #%d to " LUA_QS " (%s)",
+                      narg, ar.name, extramsg);
 }
 
 
-LUALIB_API int luaL_error (lua_State *L, const char *fmt, ...) {
-  va_list argp;
-  va_start(argp, fmt);
-  luaL_where(L, 1);
-  lua_pushvfstring(L, fmt, argp);
-  va_end(argp);
-  lua_concat(L, 2);
-  return lua_error(L);
+static int typeerror(lua_State *L, int narg, const char *tname)
+{
+    const char *msg = lua_pushfstring(L, "%s expected, got %s",
+                                      tname, luaL_typename(L, narg));
+    return luaL_argerror(L, narg, msg);
 }
 
 
-LUALIB_API int luaL_fileresult (lua_State *L, int stat, const char *fname) {
-  int en = errno;  /* calls to Lua API may change this value */
-  if (stat) {
-    lua_pushboolean(L, 1);
-    return 1;
-  }
-  else {
-    lua_pushnil(L);
-    if (fname)
-      lua_pushfstring(L, "%s: %s", fname, strerror(en));
-    else
-      lua_pushstring(L, strerror(en));
-    lua_pushinteger(L, en);
-    return 3;
-  }
+static void tag_error(lua_State *L, int narg, int tag)
+{
+    typeerror(L, narg, lua_typename(L, tag));
+}
+
+
+LUALIB_API void luaL_where(lua_State *L, int level)
+{
+    lua_Debug ar;
+    if (lua_getstack(L, level, &ar)) {  /* check function at level */
+        lua_getinfo(L, "Sl", &ar);  /* get info about it */
+        if (ar.currentline > 0) {  /* is there info? */
+            lua_pushfstring(L, "%s:%d: ", ar.short_src, ar.currentline);
+            return;
+        }
+    }
+    lua_pushliteral(L, "");  /* else, no information available... */
+}
+
+
+LUALIB_API int luaL_error(lua_State *L, const char *fmt, ...)
+{
+    va_list argp;
+    va_start(argp, fmt);
+    luaL_where(L, 1);
+    lua_pushvfstring(L, fmt, argp);
+    va_end(argp);
+    lua_concat(L, 2);
+    return lua_error(L);
+}
+
+
+LUALIB_API int luaL_fileresult(lua_State *L, int stat, const char *fname)
+{
+    int en = errno;  /* calls to Lua API may change this value */
+    if (stat) {
+        lua_pushboolean(L, 1);
+        return 1;
+    } else {
+        lua_pushnil(L);
+        if (fname)
+            lua_pushfstring(L, "%s: %s", fname, strerror(en));
+        else
+            lua_pushstring(L, strerror(en));
+        lua_pushinteger(L, en);
+        return 3;
+    }
 }
 
 
@@ -232,8 +237,8 @@ LUALIB_API int luaL_fileresult (lua_State *L, int stat, const char *fname) {
 ** use appropriate macros to interpret 'pclose' return status
 */
 #define inspectstat(stat,what)  \
-   if (WIFEXITED(stat)) { stat = WEXITSTATUS(stat); } \
-   else if (WIFSIGNALED(stat)) { stat = WTERMSIG(stat); what = "signal"; }
+    if (WIFEXITED(stat)) { stat = WEXITSTATUS(stat); } \
+    else if (WIFSIGNALED(stat)) { stat = WTERMSIG(stat); what = "signal"; }
 
 #else
 
@@ -244,20 +249,21 @@ LUALIB_API int luaL_fileresult (lua_State *L, int stat, const char *fname) {
 #endif                    /* } */
 
 
-LUALIB_API int luaL_execresult (lua_State *L, int stat) {
-  const char *what = "exit";  /* type of termination */
-  if (stat == -1)  /* error? */
-    return luaL_fileresult(L, 0, NULL);
-  else {
-    inspectstat(stat, what);  /* interpret result */
-    if (*what == 'e' && stat == 0)  /* successful termination? */
-      lua_pushboolean(L, 1);
-    else
-      lua_pushnil(L);
-    lua_pushstring(L, what);
-    lua_pushinteger(L, stat);
-    return 3;  /* return true/nil,what,code */
-  }
+LUALIB_API int luaL_execresult(lua_State *L, int stat)
+{
+    const char *what = "exit";  /* type of termination */
+    if (stat == -1)  /* error? */
+        return luaL_fileresult(L, 0, NULL);
+    else {
+        inspectstat(stat, what);  /* interpret result */
+        if (*what == 'e' && stat == 0)  /* successful termination? */
+            lua_pushboolean(L, 1);
+        else
+            lua_pushnil(L);
+        lua_pushstring(L, what);
+        lua_pushinteger(L, stat);
+        return 3;  /* return true/nil,what,code */
+    }
 }
 
 /* }====================================================== */
@@ -269,43 +275,47 @@ LUALIB_API int luaL_execresult (lua_State *L, int stat) {
 ** =======================================================
 */
 
-LUALIB_API int luaL_newmetatable (lua_State *L, const char *tname) {
-  luaL_getmetatable(L, tname);  /* try to get metatable */
-  if (!lua_isnil(L, -1))  /* name already in use? */
-    return 0;  /* leave previous value on top, but return 0 */
-  lua_pop(L, 1);
-  lua_newtable(L);  /* create metatable */
-  lua_pushvalue(L, -1);
-  lua_setfield(L, LUA_REGISTRYINDEX, tname);  /* registry.name = metatable */
-  return 1;
+LUALIB_API int luaL_newmetatable(lua_State *L, const char *tname)
+{
+    luaL_getmetatable(L, tname);  /* try to get metatable */
+    if (!lua_isnil(L, -1))  /* name already in use? */
+        return 0;  /* leave previous value on top, but return 0 */
+    lua_pop(L, 1);
+    lua_newtable(L);  /* create metatable */
+    lua_pushvalue(L, -1);
+    lua_setfield(L, LUA_REGISTRYINDEX, tname);  /* registry.name = metatable */
+    return 1;
 }
 
 
-LUALIB_API void luaL_setmetatable (lua_State *L, const char *tname) {
-  luaL_getmetatable(L, tname);
-  lua_setmetatable(L, -2);
+LUALIB_API void luaL_setmetatable(lua_State *L, const char *tname)
+{
+    luaL_getmetatable(L, tname);
+    lua_setmetatable(L, -2);
 }
 
 
-LUALIB_API void *luaL_testudata (lua_State *L, int ud, const char *tname) {
-  void *p = lua_touserdata(L, ud);
-  if (p != NULL) {  /* value is a userdata? */
-    if (lua_getmetatable(L, ud)) {  /* does it have a metatable? */
-      luaL_getmetatable(L, tname);  /* get correct metatable */
-      if (!lua_rawequal(L, -1, -2))  /* not the same? */
-        p = NULL;  /* value is a userdata with wrong metatable */
-      lua_pop(L, 2);  /* remove both metatables */
-      return p;
+LUALIB_API void *luaL_testudata(lua_State *L, int ud, const char *tname)
+{
+    void *p = lua_touserdata(L, ud);
+    if (p != NULL) {  /* value is a userdata? */
+        if (lua_getmetatable(L, ud)) {  /* does it have a metatable? */
+            luaL_getmetatable(L, tname);  /* get correct metatable */
+            if (!lua_rawequal(L, -1, -2))  /* not the same? */
+                p = NULL;  /* value is a userdata with wrong metatable */
+            lua_pop(L, 2);  /* remove both metatables */
+            return p;
+        }
     }
-  }
-  return NULL;  /* value is not a userdata with a metatable */
+    return NULL;  /* value is not a userdata with a metatable */
 }
 
 
-LUALIB_API void *luaL_checkudata (lua_State *L, int ud, const char *tname) {
-  void *p = luaL_testudata(L, ud, tname);
-  if (p == NULL) typeerror(L, ud, tname);
-  return p;
+LUALIB_API void *luaL_checkudata(lua_State *L, int ud, const char *tname)
+{
+    void *p = luaL_testudata(L, ud, tname);
+    if (p == NULL) typeerror(L, ud, tname);
+    return p;
 }
 
 /* }====================================================== */
@@ -317,102 +327,113 @@ LUALIB_API void *luaL_checkudata (lua_State *L, int ud, const char *tname) {
 ** =======================================================
 */
 
-LUALIB_API int luaL_checkoption (lua_State *L, int narg, const char *def,
-                                 const char *const lst[]) {
-  const char *name = (def) ? luaL_optstring(L, narg, def) :
-                             luaL_checkstring(L, narg);
-  int i;
-  for (i=0; lst[i]; i++)
-    if (strcmp(lst[i], name) == 0)
-      return i;
-  return luaL_argerror(L, narg,
-                       lua_pushfstring(L, "invalid option " LUA_QS, name));
+LUALIB_API int luaL_checkoption(lua_State *L, int narg, const char *def,
+                                const char *const lst[])
+{
+    const char *name = (def) ? luaL_optstring(L, narg, def) :
+                       luaL_checkstring(L, narg);
+    int i;
+    for (i = 0; lst[i]; i++)
+        if (strcmp(lst[i], name) == 0)
+            return i;
+    return luaL_argerror(L, narg,
+                         lua_pushfstring(L, "invalid option " LUA_QS, name));
 }
 
 
-LUALIB_API void luaL_checkstack (lua_State *L, int space, const char *msg) {
-  /* keep some extra space to run error routines, if needed */
-  const int extra = LUA_MINSTACK;
-  if (!lua_checkstack(L, space + extra)) {
-    if (msg)
-      luaL_error(L, "stack overflow (%s)", msg);
-    else
-      luaL_error(L, "stack overflow");
-  }
+LUALIB_API void luaL_checkstack(lua_State *L, int space, const char *msg)
+{
+    /* keep some extra space to run error routines, if needed */
+    const int extra = LUA_MINSTACK;
+    if (!lua_checkstack(L, space + extra)) {
+        if (msg)
+            luaL_error(L, "stack overflow (%s)", msg);
+        else
+            luaL_error(L, "stack overflow");
+    }
 }
 
 
-LUALIB_API void luaL_checktype (lua_State *L, int narg, int t) {
-  if (lua_type(L, narg) != t)
-    tag_error(L, narg, t);
+LUALIB_API void luaL_checktype(lua_State *L, int narg, int t)
+{
+    if (lua_type(L, narg) != t)
+        tag_error(L, narg, t);
 }
 
 
-LUALIB_API void luaL_checkany (lua_State *L, int narg) {
-  if (lua_type(L, narg) == LUA_TNONE)
-    luaL_argerror(L, narg, "value expected");
+LUALIB_API void luaL_checkany(lua_State *L, int narg)
+{
+    if (lua_type(L, narg) == LUA_TNONE)
+        luaL_argerror(L, narg, "value expected");
 }
 
 
-LUALIB_API const char *luaL_checklstring (lua_State *L, int narg, size_t *len) {
-  const char *s = lua_tolstring(L, narg, len);
-  if (!s) tag_error(L, narg, LUA_TSTRING);
-  return s;
+LUALIB_API const char *luaL_checklstring(lua_State *L, int narg, size_t *len)
+{
+    const char *s = lua_tolstring(L, narg, len);
+    if (!s) tag_error(L, narg, LUA_TSTRING);
+    return s;
 }
 
 
-LUALIB_API const char *luaL_optlstring (lua_State *L, int narg,
-                                        const char *def, size_t *len) {
-  if (lua_isnoneornil(L, narg)) {
-    if (len)
-      *len = (def ? strlen(def) : 0);
-    return def;
-  }
-  else return luaL_checklstring(L, narg, len);
+LUALIB_API const char *luaL_optlstring(lua_State *L, int narg,
+                                       const char *def, size_t *len)
+{
+    if (lua_isnoneornil(L, narg)) {
+        if (len)
+            *len = (def ? strlen(def) : 0);
+        return def;
+    } else return luaL_checklstring(L, narg, len);
 }
 
 
-LUALIB_API lua_Number luaL_checknumber (lua_State *L, int narg) {
-  int isnum;
-  lua_Number d = lua_tonumberx(L, narg, &isnum);
-  if (!isnum)
-    tag_error(L, narg, LUA_TNUMBER);
-  return d;
+LUALIB_API lua_Number luaL_checknumber(lua_State *L, int narg)
+{
+    int isnum;
+    lua_Number d = lua_tonumberx(L, narg, &isnum);
+    if (!isnum)
+        tag_error(L, narg, LUA_TNUMBER);
+    return d;
 }
 
 
-LUALIB_API lua_Number luaL_optnumber (lua_State *L, int narg, lua_Number def) {
-  return luaL_opt(L, luaL_checknumber, narg, def);
+LUALIB_API lua_Number luaL_optnumber(lua_State *L, int narg, lua_Number def)
+{
+    return luaL_opt(L, luaL_checknumber, narg, def);
 }
 
 
-LUALIB_API lua_Integer luaL_checkinteger (lua_State *L, int narg) {
-  int isnum;
-  lua_Integer d = lua_tointegerx(L, narg, &isnum);
-  if (!isnum)
-    tag_error(L, narg, LUA_TNUMBER);
-  return d;
+LUALIB_API lua_Integer luaL_checkinteger(lua_State *L, int narg)
+{
+    int isnum;
+    lua_Integer d = lua_tointegerx(L, narg, &isnum);
+    if (!isnum)
+        tag_error(L, narg, LUA_TNUMBER);
+    return d;
 }
 
 
-LUALIB_API lua_Unsigned luaL_checkunsigned (lua_State *L, int narg) {
-  int isnum;
-  lua_Unsigned d = lua_tounsignedx(L, narg, &isnum);
-  if (!isnum)
-    tag_error(L, narg, LUA_TNUMBER);
-  return d;
+LUALIB_API lua_Unsigned luaL_checkunsigned(lua_State *L, int narg)
+{
+    int isnum;
+    lua_Unsigned d = lua_tounsignedx(L, narg, &isnum);
+    if (!isnum)
+        tag_error(L, narg, LUA_TNUMBER);
+    return d;
 }
 
 
-LUALIB_API lua_Integer luaL_optinteger (lua_State *L, int narg,
-                                                      lua_Integer def) {
-  return luaL_opt(L, luaL_checkinteger, narg, def);
+LUALIB_API lua_Integer luaL_optinteger(lua_State *L, int narg,
+                                       lua_Integer def)
+{
+    return luaL_opt(L, luaL_checkinteger, narg, def);
 }
 
 
-LUALIB_API lua_Unsigned luaL_optunsigned (lua_State *L, int narg,
-                                                        lua_Unsigned def) {
-  return luaL_opt(L, luaL_checkunsigned, narg, def);
+LUALIB_API lua_Unsigned luaL_optunsigned(lua_State *L, int narg,
+                                         lua_Unsigned def)
+{
+    return luaL_opt(L, luaL_checkunsigned, narg, def);
 }
 
 /* }====================================================== */
@@ -434,76 +455,84 @@ LUALIB_API lua_Unsigned luaL_optunsigned (lua_State *L, int narg,
 /*
 ** returns a pointer to a free area with at least 'sz' bytes
 */
-LUALIB_API char *luaL_prepbuffsize (luaL_Buffer *B, size_t sz) {
-  lua_State *L = B->L;
-  if (B->size - B->n < sz) {  /* not enough space? */
-    char *newbuff;
-    size_t newsize = B->size * 2;  /* double buffer size */
-    if (newsize - B->n < sz)  /* not big enough? */
-      newsize = B->n + sz;
-    if (newsize < B->n || newsize - B->n < sz)
-      luaL_error(L, "buffer too large");
-    /* create larger buffer */
-    newbuff = (char *)lua_newuserdata(L, newsize * sizeof(char));
-    /* move content to new buffer */
-    memcpy(newbuff, B->b, B->n * sizeof(char));
+LUALIB_API char *luaL_prepbuffsize(luaL_Buffer *B, size_t sz)
+{
+    lua_State *L = B->L;
+    if (B->size - B->n < sz) {  /* not enough space? */
+        char *newbuff;
+        size_t newsize = B->size * 2;  /* double buffer size */
+        if (newsize - B->n < sz)  /* not big enough? */
+            newsize = B->n + sz;
+        if (newsize < B->n || newsize - B->n < sz)
+            luaL_error(L, "buffer too large");
+        /* create larger buffer */
+        newbuff = (char *)lua_newuserdata(L, newsize * sizeof(char));
+        /* move content to new buffer */
+        memcpy(newbuff, B->b, B->n * sizeof(char));
+        if (buffonstack(B))
+            lua_remove(L, -2);  /* remove old buffer */
+        B->b = newbuff;
+        B->size = newsize;
+    }
+    return &B->b[B->n];
+}
+
+
+LUALIB_API void luaL_addlstring(luaL_Buffer *B, const char *s, size_t l)
+{
+    char *b = luaL_prepbuffsize(B, l);
+    memcpy(b, s, l * sizeof(char));
+    luaL_addsize(B, l);
+}
+
+
+LUALIB_API void luaL_addstring(luaL_Buffer *B, const char *s)
+{
+    luaL_addlstring(B, s, strlen(s));
+}
+
+
+LUALIB_API void luaL_pushresult(luaL_Buffer *B)
+{
+    lua_State *L = B->L;
+    lua_pushlstring(L, B->b, B->n);
     if (buffonstack(B))
-      lua_remove(L, -2);  /* remove old buffer */
-    B->b = newbuff;
-    B->size = newsize;
-  }
-  return &B->b[B->n];
+        lua_remove(L, -2);  /* remove old buffer */
 }
 
 
-LUALIB_API void luaL_addlstring (luaL_Buffer *B, const char *s, size_t l) {
-  char *b = luaL_prepbuffsize(B, l);
-  memcpy(b, s, l * sizeof(char));
-  luaL_addsize(B, l);
+LUALIB_API void luaL_pushresultsize(luaL_Buffer *B, size_t sz)
+{
+    luaL_addsize(B, sz);
+    luaL_pushresult(B);
 }
 
 
-LUALIB_API void luaL_addstring (luaL_Buffer *B, const char *s) {
-  luaL_addlstring(B, s, strlen(s));
+LUALIB_API void luaL_addvalue(luaL_Buffer *B)
+{
+    lua_State *L = B->L;
+    size_t l;
+    const char *s = lua_tolstring(L, -1, &l);
+    if (buffonstack(B))
+        lua_insert(L, -2);  /* put value below buffer */
+    luaL_addlstring(B, s, l);
+    lua_remove(L, (buffonstack(B)) ? -2 : -1);  /* remove value */
 }
 
 
-LUALIB_API void luaL_pushresult (luaL_Buffer *B) {
-  lua_State *L = B->L;
-  lua_pushlstring(L, B->b, B->n);
-  if (buffonstack(B))
-    lua_remove(L, -2);  /* remove old buffer */
+LUALIB_API void luaL_buffinit(lua_State *L, luaL_Buffer *B)
+{
+    B->L = L;
+    B->b = B->initb;
+    B->n = 0;
+    B->size = LUAL_BUFFERSIZE;
 }
 
 
-LUALIB_API void luaL_pushresultsize (luaL_Buffer *B, size_t sz) {
-  luaL_addsize(B, sz);
-  luaL_pushresult(B);
-}
-
-
-LUALIB_API void luaL_addvalue (luaL_Buffer *B) {
-  lua_State *L = B->L;
-  size_t l;
-  const char *s = lua_tolstring(L, -1, &l);
-  if (buffonstack(B))
-    lua_insert(L, -2);  /* put value below buffer */
-  luaL_addlstring(B, s, l);
-  lua_remove(L, (buffonstack(B)) ? -2 : -1);  /* remove value */
-}
-
-
-LUALIB_API void luaL_buffinit (lua_State *L, luaL_Buffer *B) {
-  B->L = L;
-  B->b = B->initb;
-  B->n = 0;
-  B->size = LUAL_BUFFERSIZE;
-}
-
-
-LUALIB_API char *luaL_buffinitsize (lua_State *L, luaL_Buffer *B, size_t sz) {
-  luaL_buffinit(L, B);
-  return luaL_prepbuffsize(B, sz);
+LUALIB_API char *luaL_buffinitsize(lua_State *L, luaL_Buffer *B, size_t sz)
+{
+    luaL_buffinit(L, B);
+    return luaL_prepbuffsize(B, sz);
 }
 
 /* }====================================================== */
@@ -519,35 +548,36 @@ LUALIB_API char *luaL_buffinitsize (lua_State *L, luaL_Buffer *B, size_t sz) {
 #define freelist 0
 
 
-LUALIB_API int luaL_ref (lua_State *L, int t) {
-  int ref;
-  if (lua_isnil(L, -1)) {
-    lua_pop(L, 1);  /* remove from stack */
-    return LUA_REFNIL;  /* `nil' has a unique fixed reference */
-  }
-  t = lua_absindex(L, t);
-  lua_rawgeti(L, t, freelist);  /* get first free element */
-  ref = (int)lua_tointeger(L, -1);  /* ref = t[freelist] */
-  lua_pop(L, 1);  /* remove it from stack */
-  if (ref != 0) {  /* any free element? */
-    lua_rawgeti(L, t, ref);  /* remove it from list */
-    lua_rawseti(L, t, freelist);  /* (t[freelist] = t[ref]) */
-  }
-  else  /* no free elements */
-    ref = (int)lua_rawlen(L, t) + 1;  /* get a new reference */
-  lua_rawseti(L, t, ref);
-  return ref;
+LUALIB_API int luaL_ref(lua_State *L, int t)
+{
+    int ref;
+    if (lua_isnil(L, -1)) {
+        lua_pop(L, 1);  /* remove from stack */
+        return LUA_REFNIL;  /* `nil' has a unique fixed reference */
+    }
+    t = lua_absindex(L, t);
+    lua_rawgeti(L, t, freelist);  /* get first free element */
+    ref = (int)lua_tointeger(L, -1);  /* ref = t[freelist] */
+    lua_pop(L, 1);  /* remove it from stack */
+    if (ref != 0) {  /* any free element? */
+        lua_rawgeti(L, t, ref);  /* remove it from list */
+        lua_rawseti(L, t, freelist);  /* (t[freelist] = t[ref]) */
+    } else /* no free elements */
+        ref = (int)lua_rawlen(L, t) + 1;  /* get a new reference */
+    lua_rawseti(L, t, ref);
+    return ref;
 }
 
 
-LUALIB_API void luaL_unref (lua_State *L, int t, int ref) {
-  if (ref >= 0) {
-    t = lua_absindex(L, t);
-    lua_rawgeti(L, t, freelist);
-    lua_rawseti(L, t, ref);  /* t[ref] = t[freelist] */
-    lua_pushinteger(L, ref);
-    lua_rawseti(L, t, freelist);  /* t[freelist] = ref */
-  }
+LUALIB_API void luaL_unref(lua_State *L, int t, int ref)
+{
+    if (ref >= 0) {
+        t = lua_absindex(L, t);
+        lua_rawgeti(L, t, freelist);
+        lua_rawseti(L, t, ref);  /* t[ref] = t[freelist] */
+        lua_pushinteger(L, ref);
+        lua_rawseti(L, t, freelist);  /* t[freelist] = ref */
+    }
 }
 
 /* }====================================================== */
@@ -560,50 +590,52 @@ LUALIB_API void luaL_unref (lua_State *L, int t, int ref) {
 */
 
 typedef struct LoadF {
-  int n;  /* number of pre-read characters */
-  FILE *f;  /* file being read */
-  char buff[LUAL_BUFFERSIZE];  /* area for reading file */
+    int n;  /* number of pre-read characters */
+    FILE *f;  /* file being read */
+    char buff[LUAL_BUFFERSIZE];  /* area for reading file */
 } LoadF;
 
 
-static const char *getF (lua_State *L, void *ud, size_t *size) {
-  LoadF *lf = (LoadF *)ud;
-  (void)L;  /* not used */
-  if (lf->n > 0) {  /* are there pre-read characters to be read? */
-    *size = lf->n;  /* return them (chars already in buffer) */
-    lf->n = 0;  /* no more pre-read characters */
-  }
-  else {  /* read a block from file */
-    /* 'fread' can return > 0 *and* set the EOF flag. If next call to
-       'getF' called 'fread', it might still wait for user input.
-       The next check avoids this problem. */
-    if (feof(lf->f)) return NULL;
-    *size = fread(lf->buff, 1, sizeof(lf->buff), lf->f);  /* read block */
-  }
-  return lf->buff;
+static const char *getF(lua_State *L, void *ud, size_t *size)
+{
+    LoadF *lf = (LoadF *)ud;
+    (void)L;  /* not used */
+    if (lf->n > 0) {  /* are there pre-read characters to be read? */
+        *size = lf->n;  /* return them (chars already in buffer) */
+        lf->n = 0;  /* no more pre-read characters */
+    } else { /* read a block from file */
+        /* 'fread' can return > 0 *and* set the EOF flag. If next call to
+           'getF' called 'fread', it might still wait for user input.
+           The next check avoids this problem. */
+        if (feof(lf->f)) return NULL;
+        *size = fread(lf->buff, 1, sizeof(lf->buff), lf->f);  /* read block */
+    }
+    return lf->buff;
 }
 
 
-static int errfile (lua_State *L, const char *what, int fnameindex) {
-  const char *serr = strerror(errno);
-  const char *filename = lua_tostring(L, fnameindex) + 1;
-  lua_pushfstring(L, "cannot %s %s: %s", what, filename, serr);
-  lua_remove(L, fnameindex);
-  return LUA_ERRFILE;
+static int errfile(lua_State *L, const char *what, int fnameindex)
+{
+    const char *serr = strerror(errno);
+    const char *filename = lua_tostring(L, fnameindex) + 1;
+    lua_pushfstring(L, "cannot %s %s: %s", what, filename, serr);
+    lua_remove(L, fnameindex);
+    return LUA_ERRFILE;
 }
 
 
-static int skipBOM (LoadF *lf) {
-  const char *p = "\xEF\xBB\xBF";  /* Utf8 BOM mark */
-  int c;
-  lf->n = 0;
-  do {
-    c = getc(lf->f);
-    if (c == EOF || c != *(const unsigned char *)p++) return c;
-    lf->buff[lf->n++] = c;  /* to be read by the parser */
-  } while (*p != '\0');
-  lf->n = 0;  /* prefix matched; discard it */
-  return getc(lf->f);  /* return next character */
+static int skipBOM(LoadF *lf)
+{
+    const char *p = "\xEF\xBB\xBF";  /* Utf8 BOM mark */
+    int c;
+    lf->n = 0;
+    do {
+        c = getc(lf->f);
+        if (c == EOF || c != *(const unsigned char *)p++) return c;
+        lf->buff[lf->n++] = c;  /* to be read by the parser */
+    } while (*p != '\0');
+    lf->n = 0;  /* prefix matched; discard it */
+    return getc(lf->f);  /* return next character */
 }
 
 
@@ -614,146 +646,152 @@ static int skipBOM (LoadF *lf) {
 ** first "valid" character of the file (after the optional BOM and
 ** a first-line comment).
 */
-static int skipcomment (LoadF *lf, int *cp) {
-  int c = *cp = skipBOM(lf);
-  if (c == '#') {  /* first line is a comment (Unix exec. file)? */
-    do {  /* skip first line */
-      c = getc(lf->f);
-    } while (c != EOF && c != '\n') ;
-    *cp = getc(lf->f);  /* skip end-of-line, if present */
-    return 1;  /* there was a comment */
-  }
-  else return 0;  /* no comment */
+static int skipcomment(LoadF *lf, int *cp)
+{
+    int c = *cp = skipBOM(lf);
+    if (c == '#') {  /* first line is a comment (Unix exec. file)? */
+        do {  /* skip first line */
+            c = getc(lf->f);
+        } while (c != EOF && c != '\n') ;
+        *cp = getc(lf->f);  /* skip end-of-line, if present */
+        return 1;  /* there was a comment */
+    } else return 0; /* no comment */
 }
 
 
-LUALIB_API int luaL_loadfilex (lua_State *L, const char *filename,
-                                             const char *mode) {
-  LoadF lf;
-  int status, readstatus;
-  int c;
-  int fnameindex = lua_gettop(L) + 1;  /* index of filename on the stack */
-  if (filename == NULL) {
-    lua_pushliteral(L, "=stdin");
-    lf.f = stdin;
-  }
-  else {
-    lua_pushfstring(L, "@%s", filename);
-    lf.f = fopen(filename, "r");
-    if (lf.f == NULL) return errfile(L, "open", fnameindex);
-  }
-  if (skipcomment(&lf, &c))  /* read initial portion */
-    lf.buff[lf.n++] = '\n';  /* add line to correct line numbers */
-  if (c == LUA_SIGNATURE[0] && filename) {  /* binary file? */
-    lf.f = freopen(filename, "rb", lf.f);  /* reopen in binary mode */
-    if (lf.f == NULL) return errfile(L, "reopen", fnameindex);
-    skipcomment(&lf, &c);  /* re-read initial portion */
-  }
-  if (c != EOF)
-    lf.buff[lf.n++] = c;  /* 'c' is the first character of the stream */
-  status = lua_load(L, getF, &lf, lua_tostring(L, -1), mode);
-  readstatus = ferror(lf.f);
-  if (filename) fclose(lf.f);  /* close file (even in case of errors) */
-  if (readstatus) {
-    lua_settop(L, fnameindex);  /* ignore results from `lua_load' */
-    return errfile(L, "read", fnameindex);
-  }
-  lua_remove(L, fnameindex);
-  return status;
+LUALIB_API int luaL_loadfilex(lua_State *L, const char *filename,
+                              const char *mode)
+{
+    LoadF lf;
+    int status, readstatus;
+    int c;
+    int fnameindex = lua_gettop(L) + 1;  /* index of filename on the stack */
+    if (filename == NULL) {
+        lua_pushliteral(L, "=stdin");
+        lf.f = stdin;
+    } else {
+        lua_pushfstring(L, "@%s", filename);
+        lf.f = fopen(filename, "r");
+        if (lf.f == NULL) return errfile(L, "open", fnameindex);
+    }
+    if (skipcomment(&lf, &c))  /* read initial portion */
+        lf.buff[lf.n++] = '\n';  /* add line to correct line numbers */
+    if (c == LUA_SIGNATURE[0] && filename) {  /* binary file? */
+        lf.f = freopen(filename, "rb", lf.f);  /* reopen in binary mode */
+        if (lf.f == NULL) return errfile(L, "reopen", fnameindex);
+        skipcomment(&lf, &c);  /* re-read initial portion */
+    }
+    if (c != EOF)
+        lf.buff[lf.n++] = c;  /* 'c' is the first character of the stream */
+    status = lua_load(L, getF, &lf, lua_tostring(L, -1), mode);
+    readstatus = ferror(lf.f);
+    if (filename) fclose(lf.f);  /* close file (even in case of errors) */
+    if (readstatus) {
+        lua_settop(L, fnameindex);  /* ignore results from `lua_load' */
+        return errfile(L, "read", fnameindex);
+    }
+    lua_remove(L, fnameindex);
+    return status;
 }
 
 
 typedef struct LoadS {
-  const char *s;
-  size_t size;
+    const char *s;
+    size_t size;
 } LoadS;
 
 
-static const char *getS (lua_State *L, void *ud, size_t *size) {
-  LoadS *ls = (LoadS *)ud;
-  (void)L;  /* not used */
-  if (ls->size == 0) return NULL;
-  *size = ls->size;
-  ls->size = 0;
-  return ls->s;
+static const char *getS(lua_State *L, void *ud, size_t *size)
+{
+    LoadS *ls = (LoadS *)ud;
+    (void)L;  /* not used */
+    if (ls->size == 0) return NULL;
+    *size = ls->size;
+    ls->size = 0;
+    return ls->s;
 }
 
 
-LUALIB_API int luaL_loadbufferx (lua_State *L, const char *buff, size_t size,
-                                 const char *name, const char *mode) {
-  LoadS ls;
-  ls.s = buff;
-  ls.size = size;
-  return lua_load(L, getS, &ls, name, mode);
+LUALIB_API int luaL_loadbufferx(lua_State *L, const char *buff, size_t size,
+                                const char *name, const char *mode)
+{
+    LoadS ls;
+    ls.s = buff;
+    ls.size = size;
+    return lua_load(L, getS, &ls, name, mode);
 }
 
 
-LUALIB_API int luaL_loadstring (lua_State *L, const char *s) {
-  return luaL_loadbuffer(L, s, strlen(s), s);
+LUALIB_API int luaL_loadstring(lua_State *L, const char *s)
+{
+    return luaL_loadbuffer(L, s, strlen(s), s);
 }
 
 /* }====================================================== */
 
 
 
-LUALIB_API int luaL_getmetafield (lua_State *L, int obj, const char *event) {
-  if (!lua_getmetatable(L, obj))  /* no metatable? */
-    return 0;
-  lua_pushstring(L, event);
-  lua_rawget(L, -2);
-  if (lua_isnil(L, -1)) {
-    lua_pop(L, 2);  /* remove metatable and metafield */
-    return 0;
-  }
-  else {
-    lua_remove(L, -2);  /* remove only metatable */
-    return 1;
-  }
-}
-
-
-LUALIB_API int luaL_callmeta (lua_State *L, int obj, const char *event) {
-  obj = lua_absindex(L, obj);
-  if (!luaL_getmetafield(L, obj, event))  /* no metafield? */
-    return 0;
-  lua_pushvalue(L, obj);
-  lua_call(L, 1, 1);
-  return 1;
-}
-
-
-LUALIB_API int luaL_len (lua_State *L, int idx) {
-  int l;
-  int isnum;
-  lua_len(L, idx);
-  l = (int)lua_tointegerx(L, -1, &isnum);
-  if (!isnum)
-    luaL_error(L, "object length is not a number");
-  lua_pop(L, 1);  /* remove object */
-  return l;
-}
-
-
-LUALIB_API const char *luaL_tolstring (lua_State *L, int idx, size_t *len) {
-  if (!luaL_callmeta(L, idx, "__tostring")) {  /* no metafield? */
-    switch (lua_type(L, idx)) {
-      case LUA_TNUMBER:
-      case LUA_TSTRING:
-        lua_pushvalue(L, idx);
-        break;
-      case LUA_TBOOLEAN:
-        lua_pushstring(L, (lua_toboolean(L, idx) ? "true" : "false"));
-        break;
-      case LUA_TNIL:
-        lua_pushliteral(L, "nil");
-        break;
-      default:
-        lua_pushfstring(L, "%s: %p", luaL_typename(L, idx),
-                                            lua_topointer(L, idx));
-        break;
+LUALIB_API int luaL_getmetafield(lua_State *L, int obj, const char *event)
+{
+    if (!lua_getmetatable(L, obj))  /* no metatable? */
+        return 0;
+    lua_pushstring(L, event);
+    lua_rawget(L, -2);
+    if (lua_isnil(L, -1)) {
+        lua_pop(L, 2);  /* remove metatable and metafield */
+        return 0;
+    } else {
+        lua_remove(L, -2);  /* remove only metatable */
+        return 1;
     }
-  }
-  return lua_tolstring(L, -1, len);
+}
+
+
+LUALIB_API int luaL_callmeta(lua_State *L, int obj, const char *event)
+{
+    obj = lua_absindex(L, obj);
+    if (!luaL_getmetafield(L, obj, event))  /* no metafield? */
+        return 0;
+    lua_pushvalue(L, obj);
+    lua_call(L, 1, 1);
+    return 1;
+}
+
+
+LUALIB_API int luaL_len(lua_State *L, int idx)
+{
+    int l;
+    int isnum;
+    lua_len(L, idx);
+    l = (int)lua_tointegerx(L, -1, &isnum);
+    if (!isnum)
+        luaL_error(L, "object length is not a number");
+    lua_pop(L, 1);  /* remove object */
+    return l;
+}
+
+
+LUALIB_API const char *luaL_tolstring(lua_State *L, int idx, size_t *len)
+{
+    if (!luaL_callmeta(L, idx, "__tostring")) {  /* no metafield? */
+        switch (lua_type(L, idx)) {
+            case LUA_TNUMBER:
+            case LUA_TSTRING:
+                lua_pushvalue(L, idx);
+                break;
+            case LUA_TBOOLEAN:
+                lua_pushstring(L, (lua_toboolean(L, idx) ? "true" : "false"));
+                break;
+            case LUA_TNIL:
+                lua_pushliteral(L, "nil");
+                break;
+            default:
+                lua_pushfstring(L, "%s: %p", luaL_typename(L, idx),
+                                lua_topointer(L, idx));
+                break;
+        }
+    }
+    return lua_tolstring(L, -1, len);
 }
 
 
@@ -764,40 +802,41 @@ LUALIB_API const char *luaL_tolstring (lua_State *L, int idx, size_t *len) {
 */
 #if defined(LUA_COMPAT_MODULE)
 
-static const char *luaL_findtable (lua_State *L, int idx,
-                                   const char *fname, int szhint) {
-  const char *e;
-  if (idx) lua_pushvalue(L, idx);
-  do {
-    e = strchr(fname, '.');
-    if (e == NULL) e = fname + strlen(fname);
-    lua_pushlstring(L, fname, e - fname);
-    lua_rawget(L, -2);
-    if (lua_isnil(L, -1)) {  /* no such field? */
-      lua_pop(L, 1);  /* remove this nil */
-      lua_createtable(L, 0, (*e == '.' ? 1 : szhint)); /* new table for field */
-      lua_pushlstring(L, fname, e - fname);
-      lua_pushvalue(L, -2);
-      lua_settable(L, -4);  /* set new table into field */
-    }
-    else if (!lua_istable(L, -1)) {  /* field has a non-table value? */
-      lua_pop(L, 2);  /* remove table and value */
-      return fname;  /* return problematic part of the name */
-    }
-    lua_remove(L, -2);  /* remove previous table */
-    fname = e + 1;
-  } while (*e == '.');
-  return NULL;
+static const char *luaL_findtable(lua_State *L, int idx,
+                                  const char *fname, int szhint)
+{
+    const char *e;
+    if (idx) lua_pushvalue(L, idx);
+    do {
+        e = strchr(fname, '.');
+        if (e == NULL) e = fname + strlen(fname);
+        lua_pushlstring(L, fname, e - fname);
+        lua_rawget(L, -2);
+        if (lua_isnil(L, -1)) {  /* no such field? */
+            lua_pop(L, 1);  /* remove this nil */
+            lua_createtable(L, 0, (*e == '.' ? 1 : szhint)); /* new table for field */
+            lua_pushlstring(L, fname, e - fname);
+            lua_pushvalue(L, -2);
+            lua_settable(L, -4);  /* set new table into field */
+        } else if (!lua_istable(L, -1)) { /* field has a non-table value? */
+            lua_pop(L, 2);  /* remove table and value */
+            return fname;  /* return problematic part of the name */
+        }
+        lua_remove(L, -2);  /* remove previous table */
+        fname = e + 1;
+    } while (*e == '.');
+    return NULL;
 }
 
 
 /*
 ** Count number of elements in a luaL_Reg list.
 */
-static int libsize (const luaL_Reg *l) {
-  int size = 0;
-  for (; l && l->name; l++) size++;
-  return size;
+static int libsize(const luaL_Reg *l)
+{
+    int size = 0;
+    for (; l && l->name; l++) size++;
+    return size;
 }
 
 
@@ -807,34 +846,36 @@ static int libsize (const luaL_Reg *l) {
 ** global variable with that name. In any case, leaves on the stack
 ** the module table.
 */
-LUALIB_API void luaL_pushmodule (lua_State *L, const char *modname,
-                                 int sizehint) {
-  luaL_findtable(L, LUA_REGISTRYINDEX, "_LOADED", 1);  /* get _LOADED table */
-  lua_getfield(L, -1, modname);  /* get _LOADED[modname] */
-  if (!lua_istable(L, -1)) {  /* not found? */
-    lua_pop(L, 1);  /* remove previous result */
-    /* try global variable (and create one if it does not exist) */
-    lua_pushglobaltable(L);
-    if (luaL_findtable(L, 0, modname, sizehint) != NULL)
-      luaL_error(L, "name conflict for module " LUA_QS, modname);
-    lua_pushvalue(L, -1);
-    lua_setfield(L, -3, modname);  /* _LOADED[modname] = new table */
-  }
-  lua_remove(L, -2);  /* remove _LOADED table */
+LUALIB_API void luaL_pushmodule(lua_State *L, const char *modname,
+                                int sizehint)
+{
+    luaL_findtable(L, LUA_REGISTRYINDEX, "_LOADED", 1);  /* get _LOADED table */
+    lua_getfield(L, -1, modname);  /* get _LOADED[modname] */
+    if (!lua_istable(L, -1)) {  /* not found? */
+        lua_pop(L, 1);  /* remove previous result */
+        /* try global variable (and create one if it does not exist) */
+        lua_pushglobaltable(L);
+        if (luaL_findtable(L, 0, modname, sizehint) != NULL)
+            luaL_error(L, "name conflict for module " LUA_QS, modname);
+        lua_pushvalue(L, -1);
+        lua_setfield(L, -3, modname);  /* _LOADED[modname] = new table */
+    }
+    lua_remove(L, -2);  /* remove _LOADED table */
 }
 
 
-LUALIB_API void luaL_openlib (lua_State *L, const char *libname,
-                               const luaL_Reg *l, int nup) {
-  luaL_checkversion(L);
-  if (libname) {
-    luaL_pushmodule(L, libname, libsize(l));  /* get/create library table */
-    lua_insert(L, -(nup + 1));  /* move library table to below upvalues */
-  }
-  if (l)
-    luaL_setfuncs(L, l, nup);
-  else
-    lua_pop(L, nup);  /* remove upvalues */
+LUALIB_API void luaL_openlib(lua_State *L, const char *libname,
+                             const luaL_Reg *l, int nup)
+{
+    luaL_checkversion(L);
+    if (libname) {
+        luaL_pushmodule(L, libname, libsize(l));  /* get/create library table */
+        lua_insert(L, -(nup + 1));  /* move library table to below upvalues */
+    }
+    if (l)
+        luaL_setfuncs(L, l, nup);
+    else
+        lua_pop(L, nup);  /* remove upvalues */
 }
 
 #endif
@@ -845,17 +886,18 @@ LUALIB_API void luaL_openlib (lua_State *L, const char *libname,
 ** function gets the 'nup' elements at the top as upvalues.
 ** Returns with only the table at the stack.
 */
-LUALIB_API void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup) {
-  luaL_checkversion(L);
-  luaL_checkstack(L, nup, "too many upvalues");
-  for (; l->name != NULL; l++) {  /* fill the table with given functions */
-    int i;
-    for (i = 0; i < nup; i++)  /* copy upvalues to the top */
-      lua_pushvalue(L, -nup);
-    lua_pushcclosure(L, l->func, nup);  /* closure with those upvalues */
-    lua_setfield(L, -(nup + 2), l->name);
-  }
-  lua_pop(L, nup);  /* remove upvalues */
+LUALIB_API void luaL_setfuncs(lua_State *L, const luaL_Reg *l, int nup)
+{
+    luaL_checkversion(L);
+    luaL_checkstack(L, nup, "too many upvalues");
+    for (; l->name != NULL; l++) {  /* fill the table with given functions */
+        int i;
+        for (i = 0; i < nup; i++)  /* copy upvalues to the top */
+            lua_pushvalue(L, -nup);
+        lua_pushcclosure(L, l->func, nup);  /* closure with those upvalues */
+        lua_setfield(L, -(nup + 2), l->name);
+    }
+    lua_pop(L, nup);  /* remove upvalues */
 }
 
 
@@ -863,17 +905,18 @@ LUALIB_API void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup) {
 ** ensure that stack[idx][fname] has a table and push that table
 ** into the stack
 */
-LUALIB_API int luaL_getsubtable (lua_State *L, int idx, const char *fname) {
-  lua_getfield(L, idx, fname);
-  if (lua_istable(L, -1)) return 1;  /* table already there */
-  else {
-    lua_pop(L, 1);  /* remove previous result */
-    idx = lua_absindex(L, idx);
-    lua_newtable(L);
-    lua_pushvalue(L, -1);  /* copy to be left at top */
-    lua_setfield(L, idx, fname);  /* assign new table to field */
-    return 0;  /* false, because did not find table there */
-  }
+LUALIB_API int luaL_getsubtable(lua_State *L, int idx, const char *fname)
+{
+    lua_getfield(L, idx, fname);
+    if (lua_istable(L, -1)) return 1;  /* table already there */
+    else {
+        lua_pop(L, 1);  /* remove previous result */
+        idx = lua_absindex(L, idx);
+        lua_newtable(L);
+        lua_pushvalue(L, -1);  /* copy to be left at top */
+        lua_setfield(L, idx, fname);  /* assign new table to field */
+        return 0;  /* false, because did not find table there */
+    }
 }
 
 
@@ -883,77 +926,83 @@ LUALIB_API int luaL_getsubtable (lua_State *L, int idx, const char *fname) {
 ** is true, also registers the result in the global table.
 ** Leaves resulting module on the top.
 */
-LUALIB_API void luaL_requiref (lua_State *L, const char *modname,
-                               lua_CFunction openf, int glb) {
-  lua_pushcfunction(L, openf);
-  lua_pushstring(L, modname);  /* argument to open function */
-  lua_call(L, 1, 1);  /* open module */
-  luaL_getsubtable(L, LUA_REGISTRYINDEX, "_LOADED");
-  lua_pushvalue(L, -2);  /* make copy of module (call result) */
-  lua_setfield(L, -2, modname);  /* _LOADED[modname] = module */
-  lua_pop(L, 1);  /* remove _LOADED table */
-  if (glb) {
-    lua_pushvalue(L, -1);  /* copy of 'mod' */
-    lua_setglobal(L, modname);  /* _G[modname] = module */
-  }
+LUALIB_API void luaL_requiref(lua_State *L, const char *modname,
+                              lua_CFunction openf, int glb)
+{
+    lua_pushcfunction(L, openf);
+    lua_pushstring(L, modname);  /* argument to open function */
+    lua_call(L, 1, 1);  /* open module */
+    luaL_getsubtable(L, LUA_REGISTRYINDEX, "_LOADED");
+    lua_pushvalue(L, -2);  /* make copy of module (call result) */
+    lua_setfield(L, -2, modname);  /* _LOADED[modname] = module */
+    lua_pop(L, 1);  /* remove _LOADED table */
+    if (glb) {
+        lua_pushvalue(L, -1);  /* copy of 'mod' */
+        lua_setglobal(L, modname);  /* _G[modname] = module */
+    }
 }
 
 
-LUALIB_API const char *luaL_gsub (lua_State *L, const char *s, const char *p,
-                                                               const char *r) {
-  const char *wild;
-  size_t l = strlen(p);
-  luaL_Buffer b;
-  luaL_buffinit(L, &b);
-  while ((wild = strstr(s, p)) != NULL) {
-    luaL_addlstring(&b, s, wild - s);  /* push prefix */
-    luaL_addstring(&b, r);  /* push replacement in place of pattern */
-    s = wild + l;  /* continue after `p' */
-  }
-  luaL_addstring(&b, s);  /* push last suffix */
-  luaL_pushresult(&b);
-  return lua_tostring(L, -1);
+LUALIB_API const char *luaL_gsub(lua_State *L, const char *s, const char *p,
+                                 const char *r)
+{
+    const char *wild;
+    size_t l = strlen(p);
+    luaL_Buffer b;
+    luaL_buffinit(L, &b);
+    while ((wild = strstr(s, p)) != NULL) {
+        luaL_addlstring(&b, s, wild - s);  /* push prefix */
+        luaL_addstring(&b, r);  /* push replacement in place of pattern */
+        s = wild + l;  /* continue after `p' */
+    }
+    luaL_addstring(&b, s);  /* push last suffix */
+    luaL_pushresult(&b);
+    return lua_tostring(L, -1);
 }
 
 
-static void *l_alloc (void *ud, void *ptr, size_t osize, size_t nsize) {
-  (void)ud; (void)osize;  /* not used */
-  if (nsize == 0) {
-    free(ptr);
-    return NULL;
-  }
-  else
-    return realloc(ptr, nsize);
+static void *l_alloc(void *ud, void *ptr, size_t osize, size_t nsize)
+{
+    (void)ud;
+    (void)osize;  /* not used */
+    if (nsize == 0) {
+        free(ptr);
+        return NULL;
+    } else
+        return realloc(ptr, nsize);
 }
 
 
-static int panic (lua_State *L) {
-  luai_writestringerror("PANIC: unprotected error in call to Lua API (%s)\n",
-                   lua_tostring(L, -1));
-  return 0;  /* return to Lua to abort */
+static int panic(lua_State *L)
+{
+    luai_writestringerror("PANIC: unprotected error in call to Lua API (%s)\n",
+                          lua_tostring(L, -1));
+    return 0;  /* return to Lua to abort */
 }
 
 
-LUALIB_API lua_State *luaL_newstate (void) {
-  lua_State *L = lua_newstate(l_alloc, NULL);
-  if (L) lua_atpanic(L, &panic);
-  return L;
+LUALIB_API lua_State *luaL_newstate(void)
+{
+    lua_State *L = lua_newstate(l_alloc, NULL);
+    if (L) lua_atpanic(L, &panic);
+    return L;
 }
 
 
-LUALIB_API void luaL_checkversion_ (lua_State *L, lua_Number ver) {
-  const lua_Number *v = lua_version(L);
-  if (v != lua_version(NULL))
-    luaL_error(L, "multiple Lua VMs detected");
-  else if (*v != ver)
-    luaL_error(L, "version mismatch: app. needs %f, Lua core provides %f",
-                  ver, *v);
-  /* check conversions number -> integer types */
-  lua_pushnumber(L, -(lua_Number)0x1234);
-  if (lua_tointeger(L, -1) != -0x1234 ||
-      lua_tounsigned(L, -1) != (lua_Unsigned)-0x1234)
-    luaL_error(L, "bad conversion number->int;"
-                  " must recompile Lua with proper settings");
-  lua_pop(L, 1);
+LUALIB_API void luaL_checkversion_(lua_State *L, lua_Number ver)
+{
+    const lua_Number *v = lua_version(L);
+    if (v != lua_version(NULL))
+        luaL_error(L, "multiple Lua VMs detected");
+    else if (*v != ver)
+        luaL_error(L, "version mismatch: app. needs %f, Lua core provides %f",
+                   ver, *v);
+    /* check conversions number -> integer types */
+    lua_pushnumber(L, -(lua_Number)0x1234);
+    if (lua_tointeger(L, -1) != -0x1234 ||
+        lua_tounsigned(L, -1) != (lua_Unsigned) - 0x1234)
+        luaL_error(L, "bad conversion number->int;"
+                   " must recompile Lua with proper settings");
+    lua_pop(L, 1);
 }
 
diff --git a/liblua/lauxlib.h b/liblua/lauxlib.h
index e9f4130a6..76326a350 100644
--- a/liblua/lauxlib.h
+++ b/liblua/lauxlib.h
@@ -21,82 +21,82 @@
 
 
 typedef struct luaL_Reg {
-  const char *name;
-  lua_CFunction func;
+    const char *name;
+    lua_CFunction func;
 } luaL_Reg;
 
 
-LUALIB_API void (luaL_checkversion_) (lua_State *L, lua_Number ver);
+LUALIB_API void (luaL_checkversion_)(lua_State *L, lua_Number ver);
 #define luaL_checkversion(L) luaL_checkversion_(L, LUA_VERSION_NUM)
 
-LUALIB_API int (luaL_getmetafield) (lua_State *L, int obj, const char *e);
-LUALIB_API int (luaL_callmeta) (lua_State *L, int obj, const char *e);
-LUALIB_API const char *(luaL_tolstring) (lua_State *L, int idx, size_t *len);
-LUALIB_API int (luaL_argerror) (lua_State *L, int numarg, const char *extramsg);
-LUALIB_API const char *(luaL_checklstring) (lua_State *L, int numArg,
-                                                          size_t *l);
-LUALIB_API const char *(luaL_optlstring) (lua_State *L, int numArg,
-                                          const char *def, size_t *l);
-LUALIB_API lua_Number (luaL_checknumber) (lua_State *L, int numArg);
-LUALIB_API lua_Number (luaL_optnumber) (lua_State *L, int nArg, lua_Number def);
+LUALIB_API int (luaL_getmetafield)(lua_State *L, int obj, const char *e);
+LUALIB_API int (luaL_callmeta)(lua_State *L, int obj, const char *e);
+LUALIB_API const char *(luaL_tolstring)(lua_State *L, int idx, size_t *len);
+LUALIB_API int (luaL_argerror)(lua_State *L, int numarg, const char *extramsg);
+LUALIB_API const char *(luaL_checklstring)(lua_State *L, int numArg,
+                                           size_t *l);
+LUALIB_API const char *(luaL_optlstring)(lua_State *L, int numArg,
+                                         const char *def, size_t *l);
+LUALIB_API lua_Number(luaL_checknumber)(lua_State *L, int numArg);
+LUALIB_API lua_Number(luaL_optnumber)(lua_State *L, int nArg, lua_Number def);
 
-LUALIB_API lua_Integer (luaL_checkinteger) (lua_State *L, int numArg);
-LUALIB_API lua_Integer (luaL_optinteger) (lua_State *L, int nArg,
-                                          lua_Integer def);
-LUALIB_API lua_Unsigned (luaL_checkunsigned) (lua_State *L, int numArg);
-LUALIB_API lua_Unsigned (luaL_optunsigned) (lua_State *L, int numArg,
-                                            lua_Unsigned def);
+LUALIB_API lua_Integer(luaL_checkinteger)(lua_State *L, int numArg);
+LUALIB_API lua_Integer(luaL_optinteger)(lua_State *L, int nArg,
+                                        lua_Integer def);
+LUALIB_API lua_Unsigned(luaL_checkunsigned)(lua_State *L, int numArg);
+LUALIB_API lua_Unsigned(luaL_optunsigned)(lua_State *L, int numArg,
+                                          lua_Unsigned def);
 
-LUALIB_API void (luaL_checkstack) (lua_State *L, int sz, const char *msg);
-LUALIB_API void (luaL_checktype) (lua_State *L, int narg, int t);
-LUALIB_API void (luaL_checkany) (lua_State *L, int narg);
+LUALIB_API void (luaL_checkstack)(lua_State *L, int sz, const char *msg);
+LUALIB_API void (luaL_checktype)(lua_State *L, int narg, int t);
+LUALIB_API void (luaL_checkany)(lua_State *L, int narg);
 
-LUALIB_API int   (luaL_newmetatable) (lua_State *L, const char *tname);
-LUALIB_API void  (luaL_setmetatable) (lua_State *L, const char *tname);
-LUALIB_API void *(luaL_testudata) (lua_State *L, int ud, const char *tname);
-LUALIB_API void *(luaL_checkudata) (lua_State *L, int ud, const char *tname);
+LUALIB_API int (luaL_newmetatable)(lua_State *L, const char *tname);
+LUALIB_API void (luaL_setmetatable)(lua_State *L, const char *tname);
+LUALIB_API void *(luaL_testudata)(lua_State *L, int ud, const char *tname);
+LUALIB_API void *(luaL_checkudata)(lua_State *L, int ud, const char *tname);
 
-LUALIB_API void (luaL_where) (lua_State *L, int lvl);
-LUALIB_API int (luaL_error) (lua_State *L, const char *fmt, ...);
+LUALIB_API void (luaL_where)(lua_State *L, int lvl);
+LUALIB_API int (luaL_error)(lua_State *L, const char *fmt, ...);
 
-LUALIB_API int (luaL_checkoption) (lua_State *L, int narg, const char *def,
-                                   const char *const lst[]);
+LUALIB_API int (luaL_checkoption)(lua_State *L, int narg, const char *def,
+                                  const char *const lst[]);
 
-LUALIB_API int (luaL_fileresult) (lua_State *L, int stat, const char *fname);
-LUALIB_API int (luaL_execresult) (lua_State *L, int stat);
+LUALIB_API int (luaL_fileresult)(lua_State *L, int stat, const char *fname);
+LUALIB_API int (luaL_execresult)(lua_State *L, int stat);
 
 /* pre-defined references */
 #define LUA_NOREF       (-2)
 #define LUA_REFNIL      (-1)
 
-LUALIB_API int (luaL_ref) (lua_State *L, int t);
-LUALIB_API void (luaL_unref) (lua_State *L, int t, int ref);
+LUALIB_API int (luaL_ref)(lua_State *L, int t);
+LUALIB_API void (luaL_unref)(lua_State *L, int t, int ref);
 
-LUALIB_API int (luaL_loadfilex) (lua_State *L, const char *filename,
-                                               const char *mode);
+LUALIB_API int (luaL_loadfilex)(lua_State *L, const char *filename,
+                                const char *mode);
 
 #define luaL_loadfile(L,f) luaL_loadfilex(L,f,NULL)
 
-LUALIB_API int (luaL_loadbufferx) (lua_State *L, const char *buff, size_t sz,
-                                   const char *name, const char *mode);
-LUALIB_API int (luaL_loadstring) (lua_State *L, const char *s);
+LUALIB_API int (luaL_loadbufferx)(lua_State *L, const char *buff, size_t sz,
+                                  const char *name, const char *mode);
+LUALIB_API int (luaL_loadstring)(lua_State *L, const char *s);
 
-LUALIB_API lua_State *(luaL_newstate) (void);
+LUALIB_API lua_State *(luaL_newstate)(void);
 
-LUALIB_API int (luaL_len) (lua_State *L, int idx);
+LUALIB_API int (luaL_len)(lua_State *L, int idx);
 
-LUALIB_API const char *(luaL_gsub) (lua_State *L, const char *s, const char *p,
-                                                  const char *r);
+LUALIB_API const char *(luaL_gsub)(lua_State *L, const char *s, const char *p,
+                                   const char *r);
 
-LUALIB_API void (luaL_setfuncs) (lua_State *L, const luaL_Reg *l, int nup);
+LUALIB_API void (luaL_setfuncs)(lua_State *L, const luaL_Reg *l, int nup);
 
-LUALIB_API int (luaL_getsubtable) (lua_State *L, int idx, const char *fname);
+LUALIB_API int (luaL_getsubtable)(lua_State *L, int idx, const char *fname);
 
-LUALIB_API void (luaL_traceback) (lua_State *L, lua_State *L1,
-                                  const char *msg, int level);
+LUALIB_API void (luaL_traceback)(lua_State *L, lua_State *L1,
+                                 const char *msg, int level);
 
-LUALIB_API void (luaL_requiref) (lua_State *L, const char *modname,
-                                 lua_CFunction openf, int glb);
+LUALIB_API void (luaL_requiref)(lua_State *L, const char *modname,
+                                lua_CFunction openf, int glb);
 
 /*
 ** ===============================================================
@@ -106,12 +106,12 @@ LUALIB_API void (luaL_requiref) (lua_State *L, const char *modname,
 
 
 #define luaL_newlibtable(L,l) \
-  lua_createtable(L, 0, sizeof(l)/sizeof((l)[0]) - 1)
+    lua_createtable(L, 0, sizeof(l)/sizeof((l)[0]) - 1)
 
 #define luaL_newlib(L,l) (luaL_newlibtable(L,l), luaL_setfuncs(L,l,0))
 
 #define luaL_argcheck(L, cond,numarg,extramsg) \
-        ((void)((cond) || luaL_argerror(L, (numarg), (extramsg))))
+    ((void)((cond) || luaL_argerror(L, (numarg), (extramsg))))
 #define luaL_checkstring(L,n) (luaL_checklstring(L, (n), NULL))
 #define luaL_optstring(L,n,d) (luaL_optlstring(L, (n), (d), NULL))
 #define luaL_checkint(L,n) ((int)luaL_checkinteger(L, (n)))
@@ -141,28 +141,28 @@ LUALIB_API void (luaL_requiref) (lua_State *L, const char *modname,
 */
 
 typedef struct luaL_Buffer {
-  char *b;  /* buffer address */
-  size_t size;  /* buffer size */
-  size_t n;  /* number of characters in buffer */
-  lua_State *L;
-  char initb[LUAL_BUFFERSIZE];  /* initial buffer */
+    char *b;  /* buffer address */
+    size_t size;  /* buffer size */
+    size_t n;  /* number of characters in buffer */
+    lua_State *L;
+    char initb[LUAL_BUFFERSIZE];  /* initial buffer */
 } luaL_Buffer;
 
 
 #define luaL_addchar(B,c) \
-  ((void)((B)->n < (B)->size || luaL_prepbuffsize((B), 1)), \
-   ((B)->b[(B)->n++] = (c)))
+    ((void)((B)->n < (B)->size || luaL_prepbuffsize((B), 1)), \
+     ((B)->b[(B)->n++] = (c)))
 
 #define luaL_addsize(B,s) ((B)->n += (s))
 
-LUALIB_API void (luaL_buffinit) (lua_State *L, luaL_Buffer *B);
-LUALIB_API char *(luaL_prepbuffsize) (luaL_Buffer *B, size_t sz);
-LUALIB_API void (luaL_addlstring) (luaL_Buffer *B, const char *s, size_t l);
-LUALIB_API void (luaL_addstring) (luaL_Buffer *B, const char *s);
-LUALIB_API void (luaL_addvalue) (luaL_Buffer *B);
-LUALIB_API void (luaL_pushresult) (luaL_Buffer *B);
-LUALIB_API void (luaL_pushresultsize) (luaL_Buffer *B, size_t sz);
-LUALIB_API char *(luaL_buffinitsize) (lua_State *L, luaL_Buffer *B, size_t sz);
+LUALIB_API void (luaL_buffinit)(lua_State *L, luaL_Buffer *B);
+LUALIB_API char *(luaL_prepbuffsize)(luaL_Buffer *B, size_t sz);
+LUALIB_API void (luaL_addlstring)(luaL_Buffer *B, const char *s, size_t l);
+LUALIB_API void (luaL_addstring)(luaL_Buffer *B, const char *s);
+LUALIB_API void (luaL_addvalue)(luaL_Buffer *B);
+LUALIB_API void (luaL_pushresult)(luaL_Buffer *B);
+LUALIB_API void (luaL_pushresultsize)(luaL_Buffer *B, size_t sz);
+LUALIB_API char *(luaL_buffinitsize)(lua_State *L, luaL_Buffer *B, size_t sz);
 
 #define luaL_prepbuffer(B) luaL_prepbuffsize(B, LUAL_BUFFERSIZE)
 
@@ -186,8 +186,8 @@ LUALIB_API char *(luaL_buffinitsize) (lua_State *L, luaL_Buffer *B, size_t sz);
 
 
 typedef struct luaL_Stream {
-  FILE *f;  /* stream (NULL for incompletely created streams) */
-  lua_CFunction closef;  /* to close stream (NULL for closed streams) */
+    FILE *f;  /* stream (NULL for incompletely created streams) */
+    lua_CFunction closef;  /* to close stream (NULL for closed streams) */
 } luaL_Stream;
 
 /* }====================================================== */
@@ -197,10 +197,10 @@ typedef struct luaL_Stream {
 /* compatibility with old module system */
 #if defined(LUA_COMPAT_MODULE)
 
-LUALIB_API void (luaL_pushmodule) (lua_State *L, const char *modname,
-                                   int sizehint);
-LUALIB_API void (luaL_openlib) (lua_State *L, const char *libname,
-                                const luaL_Reg *l, int nup);
+LUALIB_API void (luaL_pushmodule)(lua_State *L, const char *modname,
+                                  int sizehint);
+LUALIB_API void (luaL_openlib)(lua_State *L, const char *libname,
+                               const luaL_Reg *l, int nup);
 
 #define luaL_register(L,n,l) (luaL_openlib(L,(n),(l),0))
 
diff --git a/liblua/lbaselib.c b/liblua/lbaselib.c
index f5db0b9fe..858b7fb4d 100644
--- a/liblua/lbaselib.c
+++ b/liblua/lbaselib.c
@@ -20,251 +20,269 @@
 #include "lualib.h"
 
 
-static int luaB_print (lua_State *L) {
-  int n = lua_gettop(L);  /* number of arguments */
-  int i;
-  lua_getglobal(L, "tostring");
-  for (i=1; i<=n; i++) {
-    const char *s;
-    size_t l;
-    lua_pushvalue(L, -1);  /* function to be called */
-    lua_pushvalue(L, i);   /* value to print */
-    lua_call(L, 1, 1);
-    s = lua_tolstring(L, -1, &l);  /* get result */
-    if (s == NULL)
-      return luaL_error(L,
-         LUA_QL("tostring") " must return a string to " LUA_QL("print"));
-    if (i>1) luai_writestring("\t", 1);
-    luai_writestring(s, l);
-    lua_pop(L, 1);  /* pop result */
-  }
-  luai_writeline();
-  return 0;
+static int luaB_print(lua_State *L)
+{
+    int n = lua_gettop(L);  /* number of arguments */
+    int i;
+    lua_getglobal(L, "tostring");
+    for (i = 1; i <= n; i++) {
+        const char *s;
+        size_t l;
+        lua_pushvalue(L, -1);  /* function to be called */
+        lua_pushvalue(L, i);   /* value to print */
+        lua_call(L, 1, 1);
+        s = lua_tolstring(L, -1, &l);  /* get result */
+        if (s == NULL)
+            return luaL_error(L,
+                              LUA_QL("tostring") " must return a string to " LUA_QL("print"));
+        if (i > 1) luai_writestring("\t", 1);
+        luai_writestring(s, l);
+        lua_pop(L, 1);  /* pop result */
+    }
+    luai_writeline();
+    return 0;
 }
 
 
 #define SPACECHARS " \f\n\r\t\v"
 
-static int luaB_tonumber (lua_State *L) {
-  if (lua_isnoneornil(L, 2)) {  /* standard conversion */
-    int isnum;
-    lua_Number n = lua_tonumberx(L, 1, &isnum);
-    if (isnum) {
-      lua_pushnumber(L, n);
-      return 1;
-    }  /* else not a number; must be something */
+static int luaB_tonumber(lua_State *L)
+{
+    if (lua_isnoneornil(L, 2)) {  /* standard conversion */
+        int isnum;
+        lua_Number n = lua_tonumberx(L, 1, &isnum);
+        if (isnum) {
+            lua_pushnumber(L, n);
+            return 1;
+        }  /* else not a number; must be something */
+        luaL_checkany(L, 1);
+    } else {
+        size_t l;
+        const char *s = luaL_checklstring(L, 1, &l);
+        const char *e = s + l;  /* end point for 's' */
+        int base = luaL_checkint(L, 2);
+        int neg = 0;
+        luaL_argcheck(L, 2 <= base && base <= 36, 2, "base out of range");
+        s += strspn(s, SPACECHARS);  /* skip initial spaces */
+        if (*s == '-') { s++; neg = 1; }  /* handle signal */
+        else if (*s == '+') s++;
+        if (isalnum((unsigned char)*s)) {
+            lua_Number n = 0;
+            do {
+                int digit = (isdigit((unsigned char) * s)) ? *s - '0'
+                            : toupper((unsigned char) * s) - 'A' + 10;
+                if (digit >= base) break;  /* invalid numeral; force a fail */
+                n = n * (lua_Number)base + (lua_Number)digit;
+                s++;
+            } while (isalnum((unsigned char)*s));
+            s += strspn(s, SPACECHARS);  /* skip trailing spaces */
+            if (s == e) {  /* no invalid trailing characters? */
+                lua_pushnumber(L, (neg) ? -n : n);
+                return 1;
+            }  /* else not a number */
+        }  /* else not a number */
+    }
+    lua_pushnil(L);  /* not a number */
+    return 1;
+}
+
+
+static int luaB_error(lua_State *L)
+{
+    int level = luaL_optint(L, 2, 1);
+    lua_settop(L, 1);
+    if (lua_isstring(L, 1) && level > 0) {  /* add extra information? */
+        luaL_where(L, level);
+        lua_pushvalue(L, 1);
+        lua_concat(L, 2);
+    }
+    return lua_error(L);
+}
+
+
+static int luaB_getmetatable(lua_State *L)
+{
     luaL_checkany(L, 1);
-  }
-  else {
-    size_t l;
-    const char *s = luaL_checklstring(L, 1, &l);
-    const char *e = s + l;  /* end point for 's' */
-    int base = luaL_checkint(L, 2);
-    int neg = 0;
-    luaL_argcheck(L, 2 <= base && base <= 36, 2, "base out of range");
-    s += strspn(s, SPACECHARS);  /* skip initial spaces */
-    if (*s == '-') { s++; neg = 1; }  /* handle signal */
-    else if (*s == '+') s++;
-    if (isalnum((unsigned char)*s)) {
-      lua_Number n = 0;
-      do {
-        int digit = (isdigit((unsigned char)*s)) ? *s - '0'
-                       : toupper((unsigned char)*s) - 'A' + 10;
-        if (digit >= base) break;  /* invalid numeral; force a fail */
-        n = n * (lua_Number)base + (lua_Number)digit;
-        s++;
-      } while (isalnum((unsigned char)*s));
-      s += strspn(s, SPACECHARS);  /* skip trailing spaces */
-      if (s == e) {  /* no invalid trailing characters? */
-        lua_pushnumber(L, (neg) ? -n : n);
+    if (!lua_getmetatable(L, 1)) {
+        lua_pushnil(L);
+        return 1;  /* no metatable */
+    }
+    luaL_getmetafield(L, 1, "__metatable");
+    return 1;  /* returns either __metatable field (if present) or metatable */
+}
+
+
+static int luaB_setmetatable(lua_State *L)
+{
+    int t = lua_type(L, 2);
+    luaL_checktype(L, 1, LUA_TTABLE);
+    luaL_argcheck(L, t == LUA_TNIL || t == LUA_TTABLE, 2,
+                  "nil or table expected");
+    if (luaL_getmetafield(L, 1, "__metatable"))
+        return luaL_error(L, "cannot change a protected metatable");
+    lua_settop(L, 2);
+    lua_setmetatable(L, 1);
+    return 1;
+}
+
+
+static int luaB_rawequal(lua_State *L)
+{
+    luaL_checkany(L, 1);
+    luaL_checkany(L, 2);
+    lua_pushboolean(L, lua_rawequal(L, 1, 2));
+    return 1;
+}
+
+
+static int luaB_rawlen(lua_State *L)
+{
+    int t = lua_type(L, 1);
+    luaL_argcheck(L, t == LUA_TTABLE || t == LUA_TSTRING, 1,
+                  "table or string expected");
+    lua_pushinteger(L, lua_rawlen(L, 1));
+    return 1;
+}
+
+
+static int luaB_rawget(lua_State *L)
+{
+    luaL_checktype(L, 1, LUA_TTABLE);
+    luaL_checkany(L, 2);
+    lua_settop(L, 2);
+    lua_rawget(L, 1);
+    return 1;
+}
+
+static int luaB_rawset(lua_State *L)
+{
+    luaL_checktype(L, 1, LUA_TTABLE);
+    luaL_checkany(L, 2);
+    luaL_checkany(L, 3);
+    lua_settop(L, 3);
+    lua_rawset(L, 1);
+    return 1;
+}
+
+
+static int luaB_collectgarbage(lua_State *L)
+{
+    static const char *const opts[] = {"stop", "restart", "collect",
+                                       "count", "step", "setpause", "setstepmul",
+                                       "setmajorinc", "isrunning", "generational", "incremental", NULL
+                                      };
+    static const int optsnum[] = {LUA_GCSTOP, LUA_GCRESTART, LUA_GCCOLLECT,
+                                  LUA_GCCOUNT, LUA_GCSTEP, LUA_GCSETPAUSE, LUA_GCSETSTEPMUL,
+                                  LUA_GCSETMAJORINC, LUA_GCISRUNNING, LUA_GCGEN, LUA_GCINC
+                                 };
+    int o = optsnum[luaL_checkoption(L, 1, "collect", opts)];
+    int ex = luaL_optint(L, 2, 0);
+    int res = lua_gc(L, o, ex);
+    switch (o) {
+        case LUA_GCCOUNT: {
+            int b = lua_gc(L, LUA_GCCOUNTB, 0);
+            lua_pushnumber(L, res + ((lua_Number)b / 1024));
+            lua_pushinteger(L, b);
+            return 2;
+        }
+        case LUA_GCSTEP:
+        case LUA_GCISRUNNING: {
+            lua_pushboolean(L, res);
+            return 1;
+        }
+        default: {
+            lua_pushinteger(L, res);
+            return 1;
+        }
+    }
+}
+
+
+static int luaB_type(lua_State *L)
+{
+    luaL_checkany(L, 1);
+    lua_pushstring(L, luaL_typename(L, 1));
+    return 1;
+}
+
+
+static int pairsmeta(lua_State *L, const char *method, int iszero,
+                     lua_CFunction iter)
+{
+    if (!luaL_getmetafield(L, 1, method)) {  /* no metamethod? */
+        luaL_checktype(L, 1, LUA_TTABLE);  /* argument must be a table */
+        lua_pushcfunction(L, iter);  /* will return generator, */
+        lua_pushvalue(L, 1);  /* state, */
+        if (iszero) lua_pushinteger(L, 0);  /* and initial value */
+        else lua_pushnil(L);
+    } else {
+        lua_pushvalue(L, 1);  /* argument 'self' to metamethod */
+        lua_call(L, 1, 3);  /* get 3 values from metamethod */
+    }
+    return 3;
+}
+
+
+static int luaB_next(lua_State *L)
+{
+    luaL_checktype(L, 1, LUA_TTABLE);
+    lua_settop(L, 2);  /* create a 2nd argument if there isn't one */
+    if (lua_next(L, 1))
+        return 2;
+    else {
+        lua_pushnil(L);
         return 1;
-      }  /* else not a number */
-    }  /* else not a number */
-  }
-  lua_pushnil(L);  /* not a number */
-  return 1;
-}
-
-
-static int luaB_error (lua_State *L) {
-  int level = luaL_optint(L, 2, 1);
-  lua_settop(L, 1);
-  if (lua_isstring(L, 1) && level > 0) {  /* add extra information? */
-    luaL_where(L, level);
-    lua_pushvalue(L, 1);
-    lua_concat(L, 2);
-  }
-  return lua_error(L);
-}
-
-
-static int luaB_getmetatable (lua_State *L) {
-  luaL_checkany(L, 1);
-  if (!lua_getmetatable(L, 1)) {
-    lua_pushnil(L);
-    return 1;  /* no metatable */
-  }
-  luaL_getmetafield(L, 1, "__metatable");
-  return 1;  /* returns either __metatable field (if present) or metatable */
-}
-
-
-static int luaB_setmetatable (lua_State *L) {
-  int t = lua_type(L, 2);
-  luaL_checktype(L, 1, LUA_TTABLE);
-  luaL_argcheck(L, t == LUA_TNIL || t == LUA_TTABLE, 2,
-                    "nil or table expected");
-  if (luaL_getmetafield(L, 1, "__metatable"))
-    return luaL_error(L, "cannot change a protected metatable");
-  lua_settop(L, 2);
-  lua_setmetatable(L, 1);
-  return 1;
-}
-
-
-static int luaB_rawequal (lua_State *L) {
-  luaL_checkany(L, 1);
-  luaL_checkany(L, 2);
-  lua_pushboolean(L, lua_rawequal(L, 1, 2));
-  return 1;
-}
-
-
-static int luaB_rawlen (lua_State *L) {
-  int t = lua_type(L, 1);
-  luaL_argcheck(L, t == LUA_TTABLE || t == LUA_TSTRING, 1,
-                   "table or string expected");
-  lua_pushinteger(L, lua_rawlen(L, 1));
-  return 1;
-}
-
-
-static int luaB_rawget (lua_State *L) {
-  luaL_checktype(L, 1, LUA_TTABLE);
-  luaL_checkany(L, 2);
-  lua_settop(L, 2);
-  lua_rawget(L, 1);
-  return 1;
-}
-
-static int luaB_rawset (lua_State *L) {
-  luaL_checktype(L, 1, LUA_TTABLE);
-  luaL_checkany(L, 2);
-  luaL_checkany(L, 3);
-  lua_settop(L, 3);
-  lua_rawset(L, 1);
-  return 1;
-}
-
-
-static int luaB_collectgarbage (lua_State *L) {
-  static const char *const opts[] = {"stop", "restart", "collect",
-    "count", "step", "setpause", "setstepmul",
-    "setmajorinc", "isrunning", "generational", "incremental", NULL};
-  static const int optsnum[] = {LUA_GCSTOP, LUA_GCRESTART, LUA_GCCOLLECT,
-    LUA_GCCOUNT, LUA_GCSTEP, LUA_GCSETPAUSE, LUA_GCSETSTEPMUL,
-    LUA_GCSETMAJORINC, LUA_GCISRUNNING, LUA_GCGEN, LUA_GCINC};
-  int o = optsnum[luaL_checkoption(L, 1, "collect", opts)];
-  int ex = luaL_optint(L, 2, 0);
-  int res = lua_gc(L, o, ex);
-  switch (o) {
-    case LUA_GCCOUNT: {
-      int b = lua_gc(L, LUA_GCCOUNTB, 0);
-      lua_pushnumber(L, res + ((lua_Number)b/1024));
-      lua_pushinteger(L, b);
-      return 2;
     }
-    case LUA_GCSTEP: case LUA_GCISRUNNING: {
-      lua_pushboolean(L, res);
-      return 1;
+}
+
+
+static int luaB_pairs(lua_State *L)
+{
+    return pairsmeta(L, "__pairs", 0, luaB_next);
+}
+
+
+static int ipairsaux(lua_State *L)
+{
+    int i = luaL_checkint(L, 2);
+    luaL_checktype(L, 1, LUA_TTABLE);
+    i++;  /* next value */
+    lua_pushinteger(L, i);
+    lua_rawgeti(L, 1, i);
+    return (lua_isnil(L, -1)) ? 1 : 2;
+}
+
+
+static int luaB_ipairs(lua_State *L)
+{
+    return pairsmeta(L, "__ipairs", 1, ipairsaux);
+}
+
+
+static int load_aux(lua_State *L, int status, int envidx)
+{
+    if (status == LUA_OK) {
+        if (envidx != 0) {  /* 'env' parameter? */
+            lua_pushvalue(L, envidx);  /* environment for loaded function */
+            if (!lua_setupvalue(L, -2, 1))  /* set it as 1st upvalue */
+                lua_pop(L, 1);  /* remove 'env' if not used by previous call */
+        }
+        return 1;
+    } else { /* error (message is on top of the stack) */
+        lua_pushnil(L);
+        lua_insert(L, -2);  /* put before error message */
+        return 2;  /* return nil plus error message */
     }
-    default: {
-      lua_pushinteger(L, res);
-      return 1;
-    }
-  }
 }
 
 
-static int luaB_type (lua_State *L) {
-  luaL_checkany(L, 1);
-  lua_pushstring(L, luaL_typename(L, 1));
-  return 1;
-}
-
-
-static int pairsmeta (lua_State *L, const char *method, int iszero,
-                      lua_CFunction iter) {
-  if (!luaL_getmetafield(L, 1, method)) {  /* no metamethod? */
-    luaL_checktype(L, 1, LUA_TTABLE);  /* argument must be a table */
-    lua_pushcfunction(L, iter);  /* will return generator, */
-    lua_pushvalue(L, 1);  /* state, */
-    if (iszero) lua_pushinteger(L, 0);  /* and initial value */
-    else lua_pushnil(L);
-  }
-  else {
-    lua_pushvalue(L, 1);  /* argument 'self' to metamethod */
-    lua_call(L, 1, 3);  /* get 3 values from metamethod */
-  }
-  return 3;
-}
-
-
-static int luaB_next (lua_State *L) {
-  luaL_checktype(L, 1, LUA_TTABLE);
-  lua_settop(L, 2);  /* create a 2nd argument if there isn't one */
-  if (lua_next(L, 1))
-    return 2;
-  else {
-    lua_pushnil(L);
-    return 1;
-  }
-}
-
-
-static int luaB_pairs (lua_State *L) {
-  return pairsmeta(L, "__pairs", 0, luaB_next);
-}
-
-
-static int ipairsaux (lua_State *L) {
-  int i = luaL_checkint(L, 2);
-  luaL_checktype(L, 1, LUA_TTABLE);
-  i++;  /* next value */
-  lua_pushinteger(L, i);
-  lua_rawgeti(L, 1, i);
-  return (lua_isnil(L, -1)) ? 1 : 2;
-}
-
-
-static int luaB_ipairs (lua_State *L) {
-  return pairsmeta(L, "__ipairs", 1, ipairsaux);
-}
-
-
-static int load_aux (lua_State *L, int status, int envidx) {
-  if (status == LUA_OK) {
-    if (envidx != 0) {  /* 'env' parameter? */
-      lua_pushvalue(L, envidx);  /* environment for loaded function */
-      if (!lua_setupvalue(L, -2, 1))  /* set it as 1st upvalue */
-        lua_pop(L, 1);  /* remove 'env' if not used by previous call */
-    }
-    return 1;
-  }
-  else {  /* error (message is on top of the stack) */
-    lua_pushnil(L);
-    lua_insert(L, -2);  /* put before error message */
-    return 2;  /* return nil plus error message */
-  }
-}
-
-
-static int luaB_loadfile (lua_State *L) {
-  const char *fname = luaL_optstring(L, 1, NULL);
-  const char *mode = luaL_optstring(L, 2, NULL);
-  int env = (!lua_isnone(L, 3) ? 3 : 0);  /* 'env' index or 0 if no 'env' */
-  int status = luaL_loadfilex(L, fname, mode);
-  return load_aux(L, status, env);
+static int luaB_loadfile(lua_State *L)
+{
+    const char *fname = luaL_optstring(L, 1, NULL);
+    const char *mode = luaL_optstring(L, 2, NULL);
+    int env = (!lua_isnone(L, 3) ? 3 : 0);  /* 'env' index or 0 if no 'env' */
+    int status = luaL_loadfilex(L, fname, mode);
+    return load_aux(L, status, env);
 }
 
 
@@ -289,170 +307,179 @@ static int luaB_loadfile (lua_State *L) {
 ** stack top. Instead, it keeps its resulting string in a
 ** reserved slot inside the stack.
 */
-static const char *generic_reader (lua_State *L, void *ud, size_t *size) {
-  (void)(ud);  /* not used */
-  luaL_checkstack(L, 2, "too many nested functions");
-  lua_pushvalue(L, 1);  /* get function */
-  lua_call(L, 0, 1);  /* call it */
-  if (lua_isnil(L, -1)) {
-    lua_pop(L, 1);  /* pop result */
-    *size = 0;
-    return NULL;
-  }
-  else if (!lua_isstring(L, -1))
-    luaL_error(L, "reader function must return a string");
-  lua_replace(L, RESERVEDSLOT);  /* save string in reserved slot */
-  return lua_tolstring(L, RESERVEDSLOT, size);
+static const char *generic_reader(lua_State *L, void *ud, size_t *size)
+{
+    (void)(ud);  /* not used */
+    luaL_checkstack(L, 2, "too many nested functions");
+    lua_pushvalue(L, 1);  /* get function */
+    lua_call(L, 0, 1);  /* call it */
+    if (lua_isnil(L, -1)) {
+        lua_pop(L, 1);  /* pop result */
+        *size = 0;
+        return NULL;
+    } else if (!lua_isstring(L, -1))
+        luaL_error(L, "reader function must return a string");
+    lua_replace(L, RESERVEDSLOT);  /* save string in reserved slot */
+    return lua_tolstring(L, RESERVEDSLOT, size);
 }
 
 
-static int luaB_load (lua_State *L) {
-  int status;
-  size_t l;
-  const char *s = lua_tolstring(L, 1, &l);
-  const char *mode = luaL_optstring(L, 3, "bt");
-  int env = (!lua_isnone(L, 4) ? 4 : 0);  /* 'env' index or 0 if no 'env' */
-  if (s != NULL) {  /* loading a string? */
-    const char *chunkname = luaL_optstring(L, 2, s);
-    status = luaL_loadbufferx(L, s, l, chunkname, mode);
-  }
-  else {  /* loading from a reader function */
-    const char *chunkname = luaL_optstring(L, 2, "=(load)");
-    luaL_checktype(L, 1, LUA_TFUNCTION);
-    lua_settop(L, RESERVEDSLOT);  /* create reserved slot */
-    status = lua_load(L, generic_reader, NULL, chunkname, mode);
-  }
-  return load_aux(L, status, env);
+static int luaB_load(lua_State *L)
+{
+    int status;
+    size_t l;
+    const char *s = lua_tolstring(L, 1, &l);
+    const char *mode = luaL_optstring(L, 3, "bt");
+    int env = (!lua_isnone(L, 4) ? 4 : 0);  /* 'env' index or 0 if no 'env' */
+    if (s != NULL) {  /* loading a string? */
+        const char *chunkname = luaL_optstring(L, 2, s);
+        status = luaL_loadbufferx(L, s, l, chunkname, mode);
+    } else { /* loading from a reader function */
+        const char *chunkname = luaL_optstring(L, 2, "=(load)");
+        luaL_checktype(L, 1, LUA_TFUNCTION);
+        lua_settop(L, RESERVEDSLOT);  /* create reserved slot */
+        status = lua_load(L, generic_reader, NULL, chunkname, mode);
+    }
+    return load_aux(L, status, env);
 }
 
 /* }====================================================== */
 
 
-static int dofilecont (lua_State *L) {
-  return lua_gettop(L) - 1;
+static int dofilecont(lua_State *L)
+{
+    return lua_gettop(L) - 1;
 }
 
 
-static int luaB_dofile (lua_State *L) {
-  const char *fname = luaL_optstring(L, 1, NULL);
-  lua_settop(L, 1);
-  if (luaL_loadfile(L, fname) != LUA_OK)
-    return lua_error(L);
-  lua_callk(L, 0, LUA_MULTRET, 0, dofilecont);
-  return dofilecont(L);
+static int luaB_dofile(lua_State *L)
+{
+    const char *fname = luaL_optstring(L, 1, NULL);
+    lua_settop(L, 1);
+    if (luaL_loadfile(L, fname) != LUA_OK)
+        return lua_error(L);
+    lua_callk(L, 0, LUA_MULTRET, 0, dofilecont);
+    return dofilecont(L);
 }
 
 
-static int luaB_assert (lua_State *L) {
-  if (!lua_toboolean(L, 1))
-    return luaL_error(L, "%s", luaL_optstring(L, 2, "assertion failed!"));
-  return lua_gettop(L);
+static int luaB_assert(lua_State *L)
+{
+    if (!lua_toboolean(L, 1))
+        return luaL_error(L, "%s", luaL_optstring(L, 2, "assertion failed!"));
+    return lua_gettop(L);
 }
 
 
-static int luaB_select (lua_State *L) {
-  int n = lua_gettop(L);
-  if (lua_type(L, 1) == LUA_TSTRING && *lua_tostring(L, 1) == '#') {
-    lua_pushinteger(L, n-1);
+static int luaB_select(lua_State *L)
+{
+    int n = lua_gettop(L);
+    if (lua_type(L, 1) == LUA_TSTRING && *lua_tostring(L, 1) == '#') {
+        lua_pushinteger(L, n - 1);
+        return 1;
+    } else {
+        int i = luaL_checkint(L, 1);
+        if (i < 0) i = n + i;
+        else if (i > n) i = n;
+        luaL_argcheck(L, 1 <= i, 1, "index out of range");
+        return n - i;
+    }
+}
+
+
+static int finishpcall(lua_State *L, int status)
+{
+    if (!lua_checkstack(L, 1)) {  /* no space for extra boolean? */
+        lua_settop(L, 0);  /* create space for return values */
+        lua_pushboolean(L, 0);
+        lua_pushstring(L, "stack overflow");
+        return 2;  /* return false, msg */
+    }
+    lua_pushboolean(L, status);  /* first result (status) */
+    lua_replace(L, 1);  /* put first result in first slot */
+    return lua_gettop(L);
+}
+
+
+static int pcallcont(lua_State *L)
+{
+    int status = lua_getctx(L, NULL);
+    return finishpcall(L, (status == LUA_YIELD));
+}
+
+
+static int luaB_pcall(lua_State *L)
+{
+    int status;
+    luaL_checkany(L, 1);
+    lua_pushnil(L);
+    lua_insert(L, 1);  /* create space for status result */
+    status = lua_pcallk(L, lua_gettop(L) - 2, LUA_MULTRET, 0, 0, pcallcont);
+    return finishpcall(L, (status == LUA_OK));
+}
+
+
+static int luaB_xpcall(lua_State *L)
+{
+    int status;
+    int n = lua_gettop(L);
+    luaL_argcheck(L, n >= 2, 2, "value expected");
+    lua_pushvalue(L, 1);  /* exchange function... */
+    lua_copy(L, 2, 1);  /* ...and error handler */
+    lua_replace(L, 2);
+    status = lua_pcallk(L, n - 2, LUA_MULTRET, 1, 0, pcallcont);
+    return finishpcall(L, (status == LUA_OK));
+}
+
+
+static int luaB_tostring(lua_State *L)
+{
+    luaL_checkany(L, 1);
+    luaL_tolstring(L, 1, NULL);
     return 1;
-  }
-  else {
-    int i = luaL_checkint(L, 1);
-    if (i < 0) i = n + i;
-    else if (i > n) i = n;
-    luaL_argcheck(L, 1 <= i, 1, "index out of range");
-    return n - i;
-  }
-}
-
-
-static int finishpcall (lua_State *L, int status) {
-  if (!lua_checkstack(L, 1)) {  /* no space for extra boolean? */
-    lua_settop(L, 0);  /* create space for return values */
-    lua_pushboolean(L, 0);
-    lua_pushstring(L, "stack overflow");
-    return 2;  /* return false, msg */
-  }
-  lua_pushboolean(L, status);  /* first result (status) */
-  lua_replace(L, 1);  /* put first result in first slot */
-  return lua_gettop(L);
-}
-
-
-static int pcallcont (lua_State *L) {
-  int status = lua_getctx(L, NULL);
-  return finishpcall(L, (status == LUA_YIELD));
-}
-
-
-static int luaB_pcall (lua_State *L) {
-  int status;
-  luaL_checkany(L, 1);
-  lua_pushnil(L);
-  lua_insert(L, 1);  /* create space for status result */
-  status = lua_pcallk(L, lua_gettop(L) - 2, LUA_MULTRET, 0, 0, pcallcont);
-  return finishpcall(L, (status == LUA_OK));
-}
-
-
-static int luaB_xpcall (lua_State *L) {
-  int status;
-  int n = lua_gettop(L);
-  luaL_argcheck(L, n >= 2, 2, "value expected");
-  lua_pushvalue(L, 1);  /* exchange function... */
-  lua_copy(L, 2, 1);  /* ...and error handler */
-  lua_replace(L, 2);
-  status = lua_pcallk(L, n - 2, LUA_MULTRET, 1, 0, pcallcont);
-  return finishpcall(L, (status == LUA_OK));
-}
-
-
-static int luaB_tostring (lua_State *L) {
-  luaL_checkany(L, 1);
-  luaL_tolstring(L, 1, NULL);
-  return 1;
 }
 
 
 static const luaL_Reg base_funcs[] = {
-  {"assert", luaB_assert},
-  {"collectgarbage", luaB_collectgarbage},
-  {"dofile", luaB_dofile},
-  {"error", luaB_error},
-  {"getmetatable", luaB_getmetatable},
-  {"ipairs", luaB_ipairs},
-  {"loadfile", luaB_loadfile},
-  {"load", luaB_load},
+    {"assert", luaB_assert},
+    {"collectgarbage", luaB_collectgarbage},
+    {"dofile", luaB_dofile},
+    {"error", luaB_error},
+    {"getmetatable", luaB_getmetatable},
+    {"ipairs", luaB_ipairs},
+    {"loadfile", luaB_loadfile},
+    {"load", luaB_load},
 #if defined(LUA_COMPAT_LOADSTRING)
-  {"loadstring", luaB_load},
+    {"loadstring", luaB_load},
 #endif
-  {"next", luaB_next},
-  {"pairs", luaB_pairs},
-  {"pcall", luaB_pcall},
-  {"print", luaB_print},
-  {"rawequal", luaB_rawequal},
-  {"rawlen", luaB_rawlen},
-  {"rawget", luaB_rawget},
-  {"rawset", luaB_rawset},
-  {"select", luaB_select},
-  {"setmetatable", luaB_setmetatable},
-  {"tonumber", luaB_tonumber},
-  {"tostring", luaB_tostring},
-  {"type", luaB_type},
-  {"xpcall", luaB_xpcall},
-  {NULL, NULL}
+    {"next", luaB_next},
+    {"pairs", luaB_pairs},
+    {"pcall", luaB_pcall},
+    {"print", luaB_print},
+    {"rawequal", luaB_rawequal},
+    {"rawlen", luaB_rawlen},
+    {"rawget", luaB_rawget},
+    {"rawset", luaB_rawset},
+    {"select", luaB_select},
+    {"setmetatable", luaB_setmetatable},
+    {"tonumber", luaB_tonumber},
+    {"tostring", luaB_tostring},
+    {"type", luaB_type},
+    {"xpcall", luaB_xpcall},
+    {NULL, NULL}
 };
 
 
-LUAMOD_API int luaopen_base (lua_State *L) {
-  /* set global _G */
-  lua_pushglobaltable(L);
-  lua_pushglobaltable(L);
-  lua_setfield(L, -2, "_G");
-  /* open lib into global table */
-  luaL_setfuncs(L, base_funcs, 0);
-  lua_pushliteral(L, LUA_VERSION);
-  lua_setfield(L, -2, "_VERSION");  /* set global _VERSION */
-  return 1;
+LUAMOD_API int luaopen_base(lua_State *L)
+{
+    /* set global _G */
+    lua_pushglobaltable(L);
+    lua_pushglobaltable(L);
+    lua_setfield(L, -2, "_G");
+    /* open lib into global table */
+    luaL_setfuncs(L, base_funcs, 0);
+    lua_pushliteral(L, LUA_VERSION);
+    lua_setfield(L, -2, "_VERSION");  /* set global _VERSION */
+    return 1;
 }
 
diff --git a/liblua/lbitlib.c b/liblua/lbitlib.c
index b1c0e2839..66c95a5d6 100644
--- a/liblua/lbitlib.c
+++ b/liblua/lbitlib.c
@@ -33,115 +33,127 @@ typedef lua_Unsigned b_uint;
 
 
 
-static b_uint andaux (lua_State *L) {
-  int i, n = lua_gettop(L);
-  b_uint r = ~(b_uint)0;
-  for (i = 1; i <= n; i++)
-    r &= luaL_checkunsigned(L, i);
-  return trim(r);
+static b_uint andaux(lua_State *L)
+{
+    int i, n = lua_gettop(L);
+    b_uint r = ~(b_uint)0;
+    for (i = 1; i <= n; i++)
+        r &= luaL_checkunsigned(L, i);
+    return trim(r);
 }
 
 
-static int b_and (lua_State *L) {
-  b_uint r = andaux(L);
-  lua_pushunsigned(L, r);
-  return 1;
-}
-
-
-static int b_test (lua_State *L) {
-  b_uint r = andaux(L);
-  lua_pushboolean(L, r != 0);
-  return 1;
-}
-
-
-static int b_or (lua_State *L) {
-  int i, n = lua_gettop(L);
-  b_uint r = 0;
-  for (i = 1; i <= n; i++)
-    r |= luaL_checkunsigned(L, i);
-  lua_pushunsigned(L, trim(r));
-  return 1;
-}
-
-
-static int b_xor (lua_State *L) {
-  int i, n = lua_gettop(L);
-  b_uint r = 0;
-  for (i = 1; i <= n; i++)
-    r ^= luaL_checkunsigned(L, i);
-  lua_pushunsigned(L, trim(r));
-  return 1;
-}
-
-
-static int b_not (lua_State *L) {
-  b_uint r = ~luaL_checkunsigned(L, 1);
-  lua_pushunsigned(L, trim(r));
-  return 1;
-}
-
-
-static int b_shift (lua_State *L, b_uint r, int i) {
-  if (i < 0) {  /* shift right? */
-    i = -i;
-    r = trim(r);
-    if (i >= LUA_NBITS) r = 0;
-    else r >>= i;
-  }
-  else {  /* shift left */
-    if (i >= LUA_NBITS) r = 0;
-    else r <<= i;
-    r = trim(r);
-  }
-  lua_pushunsigned(L, r);
-  return 1;
-}
-
-
-static int b_lshift (lua_State *L) {
-  return b_shift(L, luaL_checkunsigned(L, 1), luaL_checkint(L, 2));
-}
-
-
-static int b_rshift (lua_State *L) {
-  return b_shift(L, luaL_checkunsigned(L, 1), -luaL_checkint(L, 2));
-}
-
-
-static int b_arshift (lua_State *L) {
-  b_uint r = luaL_checkunsigned(L, 1);
-  int i = luaL_checkint(L, 2);
-  if (i < 0 || !(r & ((b_uint)1 << (LUA_NBITS - 1))))
-    return b_shift(L, r, -i);
-  else {  /* arithmetic shift for 'negative' number */
-    if (i >= LUA_NBITS) r = ALLONES;
-    else
-      r = trim((r >> i) | ~(~(b_uint)0 >> i));  /* add signal bit */
+static int b_and(lua_State *L)
+{
+    b_uint r = andaux(L);
     lua_pushunsigned(L, r);
     return 1;
-  }
 }
 
 
-static int b_rot (lua_State *L, int i) {
-  b_uint r = luaL_checkunsigned(L, 1);
-  i &= (LUA_NBITS - 1);  /* i = i % NBITS */
-  r = trim(r);
-  r = (r << i) | (r >> (LUA_NBITS - i));
-  lua_pushunsigned(L, trim(r));
-  return 1;
+static int b_test(lua_State *L)
+{
+    b_uint r = andaux(L);
+    lua_pushboolean(L, r != 0);
+    return 1;
 }
 
 
-static int b_lrot (lua_State *L) {
-  return b_rot(L, luaL_checkint(L, 2));
+static int b_or(lua_State *L)
+{
+    int i, n = lua_gettop(L);
+    b_uint r = 0;
+    for (i = 1; i <= n; i++)
+        r |= luaL_checkunsigned(L, i);
+    lua_pushunsigned(L, trim(r));
+    return 1;
 }
 
 
-static int b_rrot (lua_State *L) {
-  return b_rot(L, -luaL_checkint(L, 2));
+static int b_xor(lua_State *L)
+{
+    int i, n = lua_gettop(L);
+    b_uint r = 0;
+    for (i = 1; i <= n; i++)
+        r ^= luaL_checkunsigned(L, i);
+    lua_pushunsigned(L, trim(r));
+    return 1;
+}
+
+
+static int b_not(lua_State *L)
+{
+    b_uint r = ~luaL_checkunsigned(L, 1);
+    lua_pushunsigned(L, trim(r));
+    return 1;
+}
+
+
+static int b_shift(lua_State *L, b_uint r, int i)
+{
+    if (i < 0) {  /* shift right? */
+        i = -i;
+        r = trim(r);
+        if (i >= LUA_NBITS) r = 0;
+        else r >>= i;
+    } else { /* shift left */
+        if (i >= LUA_NBITS) r = 0;
+        else r <<= i;
+        r = trim(r);
+    }
+    lua_pushunsigned(L, r);
+    return 1;
+}
+
+
+static int b_lshift(lua_State *L)
+{
+    return b_shift(L, luaL_checkunsigned(L, 1), luaL_checkint(L, 2));
+}
+
+
+static int b_rshift(lua_State *L)
+{
+    return b_shift(L, luaL_checkunsigned(L, 1), -luaL_checkint(L, 2));
+}
+
+
+static int b_arshift(lua_State *L)
+{
+    b_uint r = luaL_checkunsigned(L, 1);
+    int i = luaL_checkint(L, 2);
+    if (i < 0 || !(r & ((b_uint)1 << (LUA_NBITS - 1))))
+        return b_shift(L, r, -i);
+    else {  /* arithmetic shift for 'negative' number */
+        if (i >= LUA_NBITS) r = ALLONES;
+        else
+            r = trim((r >> i) | ~(~(b_uint)0 >> i));  /* add signal bit */
+        lua_pushunsigned(L, r);
+        return 1;
+    }
+}
+
+
+static int b_rot(lua_State *L, int i)
+{
+    b_uint r = luaL_checkunsigned(L, 1);
+    i &= (LUA_NBITS - 1);  /* i = i % NBITS */
+    r = trim(r);
+    r = (r << i) | (r >> (LUA_NBITS - i));
+    lua_pushunsigned(L, trim(r));
+    return 1;
+}
+
+
+static int b_lrot(lua_State *L)
+{
+    return b_rot(L, luaL_checkint(L, 2));
+}
+
+
+static int b_rrot(lua_State *L)
+{
+    return b_rot(L, -luaL_checkint(L, 2));
 }
 
 
@@ -151,61 +163,65 @@ static int b_rrot (lua_State *L) {
 ** ('luaL_error' called without 'return' to avoid later warnings about
 ** 'width' being used uninitialized.)
 */
-static int fieldargs (lua_State *L, int farg, int *width) {
-  int f = luaL_checkint(L, farg);
-  int w = luaL_optint(L, farg + 1, 1);
-  luaL_argcheck(L, 0 <= f, farg, "field cannot be negative");
-  luaL_argcheck(L, 0 < w, farg + 1, "width must be positive");
-  if (f + w > LUA_NBITS)
-    luaL_error(L, "trying to access non-existent bits");
-  *width = w;
-  return f;
+static int fieldargs(lua_State *L, int farg, int *width)
+{
+    int f = luaL_checkint(L, farg);
+    int w = luaL_optint(L, farg + 1, 1);
+    luaL_argcheck(L, 0 <= f, farg, "field cannot be negative");
+    luaL_argcheck(L, 0 < w, farg + 1, "width must be positive");
+    if (f + w > LUA_NBITS)
+        luaL_error(L, "trying to access non-existent bits");
+    *width = w;
+    return f;
 }
 
 
-static int b_extract (lua_State *L) {
-  int w;
-  b_uint r = luaL_checkunsigned(L, 1);
-  int f = fieldargs(L, 2, &w);
-  r = (r >> f) & mask(w);
-  lua_pushunsigned(L, r);
-  return 1;
+static int b_extract(lua_State *L)
+{
+    int w;
+    b_uint r = luaL_checkunsigned(L, 1);
+    int f = fieldargs(L, 2, &w);
+    r = (r >> f) & mask(w);
+    lua_pushunsigned(L, r);
+    return 1;
 }
 
 
-static int b_replace (lua_State *L) {
-  int w;
-  b_uint r = luaL_checkunsigned(L, 1);
-  b_uint v = luaL_checkunsigned(L, 2);
-  int f = fieldargs(L, 3, &w);
-  int m = mask(w);
-  v &= m;  /* erase bits outside given width */
-  r = (r & ~(m << f)) | (v << f);
-  lua_pushunsigned(L, r);
-  return 1;
+static int b_replace(lua_State *L)
+{
+    int w;
+    b_uint r = luaL_checkunsigned(L, 1);
+    b_uint v = luaL_checkunsigned(L, 2);
+    int f = fieldargs(L, 3, &w);
+    int m = mask(w);
+    v &= m;  /* erase bits outside given width */
+    r = (r & ~(m << f)) | (v << f);
+    lua_pushunsigned(L, r);
+    return 1;
 }
 
 
 static const luaL_Reg bitlib[] = {
-  {"arshift", b_arshift},
-  {"band", b_and},
-  {"bnot", b_not},
-  {"bor", b_or},
-  {"bxor", b_xor},
-  {"btest", b_test},
-  {"extract", b_extract},
-  {"lrotate", b_lrot},
-  {"lshift", b_lshift},
-  {"replace", b_replace},
-  {"rrotate", b_rrot},
-  {"rshift", b_rshift},
-  {NULL, NULL}
+    {"arshift", b_arshift},
+    {"band", b_and},
+    {"bnot", b_not},
+    {"bor", b_or},
+    {"bxor", b_xor},
+    {"btest", b_test},
+    {"extract", b_extract},
+    {"lrotate", b_lrot},
+    {"lshift", b_lshift},
+    {"replace", b_replace},
+    {"rrotate", b_rrot},
+    {"rshift", b_rshift},
+    {NULL, NULL}
 };
 
 
 
-LUAMOD_API int luaopen_bit32 (lua_State *L) {
-  luaL_newlib(L, bitlib);
-  return 1;
+LUAMOD_API int luaopen_bit32(lua_State *L)
+{
+    luaL_newlib(L, bitlib);
+    return 1;
 }
 
diff --git a/liblua/lcode.c b/liblua/lcode.c
index df9ee6d86..ce163923e 100644
--- a/liblua/lcode.c
+++ b/liblua/lcode.c
@@ -29,61 +29,67 @@
 #define hasjumps(e) ((e)->t != (e)->f)
 
 
-static int isnumeral(expdesc *e) {
-  return (e->k == VKNUM && e->t == NO_JUMP && e->f == NO_JUMP);
+static int isnumeral(expdesc *e)
+{
+    return (e->k == VKNUM && e->t == NO_JUMP && e->f == NO_JUMP);
 }
 
 
-void luaK_nil (FuncState *fs, int from, int n) {
-  Instruction *previous;
-  int l = from + n - 1;  /* last register to set nil */
-  if (fs->pc > fs->lasttarget) {  /* no jumps to current position? */
-    previous = &fs->f->code[fs->pc-1];
-    if (GET_OPCODE(*previous) == OP_LOADNIL) {
-      int pfrom = GETARG_A(*previous);
-      int pl = pfrom + GETARG_B(*previous);
-      if ((pfrom <= from && from <= pl + 1) ||
-          (from <= pfrom && pfrom <= l + 1)) {  /* can connect both? */
-        if (pfrom < from) from = pfrom;  /* from = min(from, pfrom) */
-        if (pl > l) l = pl;  /* l = max(l, pl) */
-        SETARG_A(*previous, from);
-        SETARG_B(*previous, l - from);
-        return;
-      }
-    }  /* else go through */
-  }
-  luaK_codeABC(fs, OP_LOADNIL, from, n - 1, 0);  /* else no optimization */
+void luaK_nil(FuncState *fs, int from, int n)
+{
+    Instruction *previous;
+    int l = from + n - 1;  /* last register to set nil */
+    if (fs->pc > fs->lasttarget) {  /* no jumps to current position? */
+        previous = &fs->f->code[fs->pc - 1];
+        if (GET_OPCODE(*previous) == OP_LOADNIL) {
+            int pfrom = GETARG_A(*previous);
+            int pl = pfrom + GETARG_B(*previous);
+            if ((pfrom <= from && from <= pl + 1) ||
+                (from <= pfrom && pfrom <= l + 1)) {  /* can connect both? */
+                if (pfrom < from) from = pfrom;  /* from = min(from, pfrom) */
+                if (pl > l) l = pl;  /* l = max(l, pl) */
+                SETARG_A(*previous, from);
+                SETARG_B(*previous, l - from);
+                return;
+            }
+        }  /* else go through */
+    }
+    luaK_codeABC(fs, OP_LOADNIL, from, n - 1, 0);  /* else no optimization */
 }
 
 
-int luaK_jump (FuncState *fs) {
-  int jpc = fs->jpc;  /* save list of jumps to here */
-  int j;
-  fs->jpc = NO_JUMP;
-  j = luaK_codeAsBx(fs, OP_JMP, 0, NO_JUMP);
-  luaK_concat(fs, &j, jpc);  /* keep them on hold */
-  return j;
+int luaK_jump(FuncState *fs)
+{
+    int jpc = fs->jpc;  /* save list of jumps to here */
+    int j;
+    fs->jpc = NO_JUMP;
+    j = luaK_codeAsBx(fs, OP_JMP, 0, NO_JUMP);
+    luaK_concat(fs, &j, jpc);  /* keep them on hold */
+    return j;
 }
 
 
-void luaK_ret (FuncState *fs, int first, int nret) {
-  luaK_codeABC(fs, OP_RETURN, first, nret+1, 0);
+void luaK_ret(FuncState *fs, int first, int nret)
+{
+    luaK_codeABC(fs, OP_RETURN, first, nret + 1, 0);
 }
 
 
-static int condjump (FuncState *fs, OpCode op, int A, int B, int C) {
-  luaK_codeABC(fs, op, A, B, C);
-  return luaK_jump(fs);
+static int condjump(FuncState *fs, OpCode op, int A, int B, int C)
+{
+    luaK_codeABC(fs, op, A, B, C);
+    return luaK_jump(fs);
 }
 
 
-static void fixjump (FuncState *fs, int pc, int dest) {
-  Instruction *jmp = &fs->f->code[pc];
-  int offset = dest-(pc+1);
-  lua_assert(dest != NO_JUMP);
-  if (abs(offset) > MAXARG_sBx)
-    luaX_syntaxerror(fs->ls, "control structure too long");
-  SETARG_sBx(*jmp, offset);
+static void fixjump(FuncState *fs, int pc, int dest)
+{
+    Instruction *jmp = &fs->f->code[pc];
+    int offset = dest - (pc + 1);
+    lua_assert(dest != NO_JUMP);
+    if (abs(offset) > MAXARG_sBx)
+        luaX_syntaxerror(fs->ls, "control structure too long");
+    SETARG_sBx(*jmp, offset);
 }
 
 
@@ -91,27 +97,30 @@ static void fixjump (FuncState *fs, int pc, int dest) {
 ** returns current `pc' and marks it as a jump target (to avoid wrong
 ** optimizations with consecutive instructions not in the same basic block).
 */
-int luaK_getlabel (FuncState *fs) {
-  fs->lasttarget = fs->pc;
-  return fs->pc;
+int luaK_getlabel(FuncState *fs)
+{
+    fs->lasttarget = fs->pc;
+    return fs->pc;
 }
 
 
-static int getjump (FuncState *fs, int pc) {
-  int offset = GETARG_sBx(fs->f->code[pc]);
-  if (offset == NO_JUMP)  /* point to itself represents end of list */
-    return NO_JUMP;  /* end of list */
-  else
-    return (pc+1)+offset;  /* turn offset into absolute position */
+static int getjump(FuncState *fs, int pc)
+{
+    int offset = GETARG_sBx(fs->f->code[pc]);
+    if (offset == NO_JUMP)  /* point to itself represents end of list */
+        return NO_JUMP;  /* end of list */
+    else
+        return (pc + 1) + offset; /* turn offset into absolute position */
 }
 
 
-static Instruction *getjumpcontrol (FuncState *fs, int pc) {
-  Instruction *pi = &fs->f->code[pc];
-  if (pc >= 1 && testTMode(GET_OPCODE(*(pi-1))))
-    return pi-1;
-  else
-    return pi;
+static Instruction *getjumpcontrol(FuncState *fs, int pc)
+{
+    Instruction *pi = &fs->f->code[pc];
+    if (pc >= 1 && testTMode(GET_OPCODE(*(pi - 1))))
+        return pi - 1;
+    else
+        return pi;
 }
 
 
@@ -119,763 +128,837 @@ static Instruction *getjumpcontrol (FuncState *fs, int pc) {
 ** check whether list has any jump that do not produce a value
 ** (or produce an inverted value)
 */
-static int need_value (FuncState *fs, int list) {
-  for (; list != NO_JUMP; list = getjump(fs, list)) {
-    Instruction i = *getjumpcontrol(fs, list);
-    if (GET_OPCODE(i) != OP_TESTSET) return 1;
-  }
-  return 0;  /* not found */
-}
-
-
-static int patchtestreg (FuncState *fs, int node, int reg) {
-  Instruction *i = getjumpcontrol(fs, node);
-  if (GET_OPCODE(*i) != OP_TESTSET)
-    return 0;  /* cannot patch other instructions */
-  if (reg != NO_REG && reg != GETARG_B(*i))
-    SETARG_A(*i, reg);
-  else  /* no register to put value or register already has the value */
-    *i = CREATE_ABC(OP_TEST, GETARG_B(*i), 0, GETARG_C(*i));
-
-  return 1;
-}
-
-
-static void removevalues (FuncState *fs, int list) {
-  for (; list != NO_JUMP; list = getjump(fs, list))
-      patchtestreg(fs, list, NO_REG);
-}
-
-
-static void patchlistaux (FuncState *fs, int list, int vtarget, int reg,
-                          int dtarget) {
-  while (list != NO_JUMP) {
-    int next = getjump(fs, list);
-    if (patchtestreg(fs, list, reg))
-      fixjump(fs, list, vtarget);
-    else
-      fixjump(fs, list, dtarget);  /* jump to default target */
-    list = next;
-  }
-}
-
-
-static void dischargejpc (FuncState *fs) {
-  patchlistaux(fs, fs->jpc, fs->pc, NO_REG, fs->pc);
-  fs->jpc = NO_JUMP;
-}
-
-
-void luaK_patchlist (FuncState *fs, int list, int target) {
-  if (target == fs->pc)
-    luaK_patchtohere(fs, list);
-  else {
-    lua_assert(target < fs->pc);
-    patchlistaux(fs, list, target, NO_REG, target);
-  }
-}
-
-
-LUAI_FUNC void luaK_patchclose (FuncState *fs, int list, int level) {
-  level++;  /* argument is +1 to reserve 0 as non-op */
-  while (list != NO_JUMP) {
-    int next = getjump(fs, list);
-    lua_assert(GET_OPCODE(fs->f->code[list]) == OP_JMP &&
-                (GETARG_A(fs->f->code[list]) == 0 ||
-                 GETARG_A(fs->f->code[list]) >= level));
-    SETARG_A(fs->f->code[list], level);
-    list = next;
-  }
-}
-
-
-void luaK_patchtohere (FuncState *fs, int list) {
-  luaK_getlabel(fs);
-  luaK_concat(fs, &fs->jpc, list);
-}
-
-
-void luaK_concat (FuncState *fs, int *l1, int l2) {
-  if (l2 == NO_JUMP) return;
-  else if (*l1 == NO_JUMP)
-    *l1 = l2;
-  else {
-    int list = *l1;
-    int next;
-    while ((next = getjump(fs, list)) != NO_JUMP)  /* find last element */
-      list = next;
-    fixjump(fs, list, l2);
-  }
-}
-
-
-static int luaK_code (FuncState *fs, Instruction i) {
-  Proto *f = fs->f;
-  dischargejpc(fs);  /* `pc' will change */
-  /* put new instruction in code array */
-  luaM_growvector(fs->ls->L, f->code, fs->pc, f->sizecode, Instruction,
-                  MAX_INT, "opcodes");
-  f->code[fs->pc] = i;
-  /* save corresponding line information */
-  luaM_growvector(fs->ls->L, f->lineinfo, fs->pc, f->sizelineinfo, int,
-                  MAX_INT, "opcodes");
-  f->lineinfo[fs->pc] = fs->ls->lastline;
-  return fs->pc++;
-}
-
-
-int luaK_codeABC (FuncState *fs, OpCode o, int a, int b, int c) {
-  lua_assert(getOpMode(o) == iABC);
-  lua_assert(getBMode(o) != OpArgN || b == 0);
-  lua_assert(getCMode(o) != OpArgN || c == 0);
-  lua_assert(a <= MAXARG_A && b <= MAXARG_B && c <= MAXARG_C);
-  return luaK_code(fs, CREATE_ABC(o, a, b, c));
-}
-
-
-int luaK_codeABx (FuncState *fs, OpCode o, int a, unsigned int bc) {
-  lua_assert(getOpMode(o) == iABx || getOpMode(o) == iAsBx);
-  lua_assert(getCMode(o) == OpArgN);
-  lua_assert(a <= MAXARG_A && bc <= MAXARG_Bx);
-  return luaK_code(fs, CREATE_ABx(o, a, bc));
-}
-
-
-static int codeextraarg (FuncState *fs, int a) {
-  lua_assert(a <= MAXARG_Ax);
-  return luaK_code(fs, CREATE_Ax(OP_EXTRAARG, a));
-}
-
-
-int luaK_codek (FuncState *fs, int reg, int k) {
-  if (k <= MAXARG_Bx)
-    return luaK_codeABx(fs, OP_LOADK, reg, k);
-  else {
-    int p = luaK_codeABx(fs, OP_LOADKX, reg, 0);
-    codeextraarg(fs, k);
-    return p;
-  }
-}
-
-
-void luaK_checkstack (FuncState *fs, int n) {
-  int newstack = fs->freereg + n;
-  if (newstack > fs->f->maxstacksize) {
-    if (newstack >= MAXSTACK)
-      luaX_syntaxerror(fs->ls, "function or expression too complex");
-    fs->f->maxstacksize = cast_byte(newstack);
-  }
-}
-
-
-void luaK_reserveregs (FuncState *fs, int n) {
-  luaK_checkstack(fs, n);
-  fs->freereg += n;
-}
-
-
-static void freereg (FuncState *fs, int reg) {
-  if (!ISK(reg) && reg >= fs->nactvar) {
-    fs->freereg--;
-    lua_assert(reg == fs->freereg);
-  }
-}
-
-
-static void freeexp (FuncState *fs, expdesc *e) {
-  if (e->k == VNONRELOC)
-    freereg(fs, e->u.info);
-}
-
-
-static int addk (FuncState *fs, TValue *key, TValue *v) {
-  lua_State *L = fs->ls->L;
-  TValue *idx = luaH_set(L, fs->h, key);
-  Proto *f = fs->f;
-  int k, oldsize;
-  if (ttisnumber(idx)) {
-    lua_Number n = nvalue(idx);
-    lua_number2int(k, n);
-    if (luaV_rawequalobj(&f->k[k], v))
-      return k;
-    /* else may be a collision (e.g., between 0.0 and "\0\0\0\0\0\0\0\0");
-       go through and create a new entry for this value */
-  }
-  /* constant not found; create a new entry */
-  oldsize = f->sizek;
-  k = fs->nk;
-  /* numerical value does not need GC barrier;
-     table has no metatable, so it does not need to invalidate cache */
-  setnvalue(idx, cast_num(k));
-  luaM_growvector(L, f->k, k, f->sizek, TValue, MAXARG_Ax, "constants");
-  while (oldsize < f->sizek) setnilvalue(&f->k[oldsize++]);
-  setobj(L, &f->k[k], v);
-  fs->nk++;
-  luaC_barrier(L, f, v);
-  return k;
-}
-
-
-int luaK_stringK (FuncState *fs, TString *s) {
-  TValue o;
-  setsvalue(fs->ls->L, &o, s);
-  return addk(fs, &o, &o);
-}
-
-
-int luaK_numberK (FuncState *fs, lua_Number r) {
-  int n;
-  lua_State *L = fs->ls->L;
-  TValue o;
-  setnvalue(&o, r);
-  if (r == 0 || luai_numisnan(NULL, r)) {  /* handle -0 and NaN */
-    /* use raw representation as key to avoid numeric problems */
-    setsvalue(L, L->top++, luaS_newlstr(L, (char *)&r, sizeof(r)));
-    n = addk(fs, L->top - 1, &o);
-    L->top--;
-  }
-  else
-    n = addk(fs, &o, &o);  /* regular case */
-  return n;
-}
-
-
-static int boolK (FuncState *fs, int b) {
-  TValue o;
-  setbvalue(&o, b);
-  return addk(fs, &o, &o);
-}
-
-
-static int nilK (FuncState *fs) {
-  TValue k, v;
-  setnilvalue(&v);
-  /* cannot use nil as key; instead use table itself to represent nil */
-  sethvalue(fs->ls->L, &k, fs->h);
-  return addk(fs, &k, &v);
-}
-
-
-void luaK_setreturns (FuncState *fs, expdesc *e, int nresults) {
-  if (e->k == VCALL) {  /* expression is an open function call? */
-    SETARG_C(getcode(fs, e), nresults+1);
-  }
-  else if (e->k == VVARARG) {
-    SETARG_B(getcode(fs, e), nresults+1);
-    SETARG_A(getcode(fs, e), fs->freereg);
-    luaK_reserveregs(fs, 1);
-  }
-}
-
-
-void luaK_setoneret (FuncState *fs, expdesc *e) {
-  if (e->k == VCALL) {  /* expression is an open function call? */
-    e->k = VNONRELOC;
-    e->u.info = GETARG_A(getcode(fs, e));
-  }
-  else if (e->k == VVARARG) {
-    SETARG_B(getcode(fs, e), 2);
-    e->k = VRELOCABLE;  /* can relocate its simple result */
-  }
-}
-
-
-void luaK_dischargevars (FuncState *fs, expdesc *e) {
-  switch (e->k) {
-    case VLOCAL: {
-      e->k = VNONRELOC;
-      break;
+static int need_value(FuncState *fs, int list)
+{
+    for (; list != NO_JUMP; list = getjump(fs, list)) {
+        Instruction i = *getjumpcontrol(fs, list);
+        if (GET_OPCODE(i) != OP_TESTSET) return 1;
     }
-    case VUPVAL: {
-      e->u.info = luaK_codeABC(fs, OP_GETUPVAL, 0, e->u.info, 0);
-      e->k = VRELOCABLE;
-      break;
-    }
-    case VINDEXED: {
-      OpCode op = OP_GETTABUP;  /* assume 't' is in an upvalue */
-      freereg(fs, e->u.ind.idx);
-      if (e->u.ind.vt == VLOCAL) {  /* 't' is in a register? */
-        freereg(fs, e->u.ind.t);
-        op = OP_GETTABLE;
-      }
-      e->u.info = luaK_codeABC(fs, op, 0, e->u.ind.t, e->u.ind.idx);
-      e->k = VRELOCABLE;
-      break;
-    }
-    case VVARARG:
-    case VCALL: {
-      luaK_setoneret(fs, e);
-      break;
-    }
-    default: break;  /* there is one value available (somewhere) */
-  }
+    return 0;  /* not found */
 }
 
 
-static int code_label (FuncState *fs, int A, int b, int jump) {
-  luaK_getlabel(fs);  /* those instructions may be jump targets */
-  return luaK_codeABC(fs, OP_LOADBOOL, A, b, jump);
+static int patchtestreg(FuncState *fs, int node, int reg)
+{
+    Instruction *i = getjumpcontrol(fs, node);
+    if (GET_OPCODE(*i) != OP_TESTSET)
+        return 0;  /* cannot patch other instructions */
+    if (reg != NO_REG && reg != GETARG_B(*i))
+        SETARG_A(*i, reg);
+    else  /* no register to put value or register already has the value */
+        *i = CREATE_ABC(OP_TEST, GETARG_B(*i), 0, GETARG_C(*i));
+
+    return 1;
 }
 
 
-static void discharge2reg (FuncState *fs, expdesc *e, int reg) {
-  luaK_dischargevars(fs, e);
-  switch (e->k) {
-    case VNIL: {
-      luaK_nil(fs, reg, 1);
-      break;
-    }
-    case VFALSE: case VTRUE: {
-      luaK_codeABC(fs, OP_LOADBOOL, reg, e->k == VTRUE, 0);
-      break;
-    }
-    case VK: {
-      luaK_codek(fs, reg, e->u.info);
-      break;
-    }
-    case VKNUM: {
-      luaK_codek(fs, reg, luaK_numberK(fs, e->u.nval));
-      break;
-    }
-    case VRELOCABLE: {
-      Instruction *pc = &getcode(fs, e);
-      SETARG_A(*pc, reg);
-      break;
-    }
-    case VNONRELOC: {
-      if (reg != e->u.info)
-        luaK_codeABC(fs, OP_MOVE, reg, e->u.info, 0);
-      break;
-    }
-    default: {
-      lua_assert(e->k == VVOID || e->k == VJMP);
-      return;  /* nothing to do... */
-    }
-  }
-  e->u.info = reg;
-  e->k = VNONRELOC;
+static void removevalues(FuncState *fs, int list)
+{
+    for (; list != NO_JUMP; list = getjump(fs, list))
+        patchtestreg(fs, list, NO_REG);
 }
 
 
-static void discharge2anyreg (FuncState *fs, expdesc *e) {
-  if (e->k != VNONRELOC) {
-    luaK_reserveregs(fs, 1);
-    discharge2reg(fs, e, fs->freereg-1);
-  }
+static void patchlistaux(FuncState *fs, int list, int vtarget, int reg,
+                         int dtarget)
+{
+    while (list != NO_JUMP) {
+        int next = getjump(fs, list);
+        if (patchtestreg(fs, list, reg))
+            fixjump(fs, list, vtarget);
+        else
+            fixjump(fs, list, dtarget);  /* jump to default target */
+        list = next;
+    }
 }
 
 
-static void exp2reg (FuncState *fs, expdesc *e, int reg) {
-  discharge2reg(fs, e, reg);
-  if (e->k == VJMP)
-    luaK_concat(fs, &e->t, e->u.info);  /* put this jump in `t' list */
-  if (hasjumps(e)) {
-    int final;  /* position after whole expression */
-    int p_f = NO_JUMP;  /* position of an eventual LOAD false */
-    int p_t = NO_JUMP;  /* position of an eventual LOAD true */
-    if (need_value(fs, e->t) || need_value(fs, e->f)) {
-      int fj = (e->k == VJMP) ? NO_JUMP : luaK_jump(fs);
-      p_f = code_label(fs, reg, 0, 1);
-      p_t = code_label(fs, reg, 1, 0);
-      luaK_patchtohere(fs, fj);
-    }
-    final = luaK_getlabel(fs);
-    patchlistaux(fs, e->f, final, reg, p_f);
-    patchlistaux(fs, e->t, final, reg, p_t);
-  }
-  e->f = e->t = NO_JUMP;
-  e->u.info = reg;
-  e->k = VNONRELOC;
+static void dischargejpc(FuncState *fs)
+{
+    patchlistaux(fs, fs->jpc, fs->pc, NO_REG, fs->pc);
+    fs->jpc = NO_JUMP;
 }
 
 
-void luaK_exp2nextreg (FuncState *fs, expdesc *e) {
-  luaK_dischargevars(fs, e);
-  freeexp(fs, e);
-  luaK_reserveregs(fs, 1);
-  exp2reg(fs, e, fs->freereg - 1);
-}
-
-
-int luaK_exp2anyreg (FuncState *fs, expdesc *e) {
-  luaK_dischargevars(fs, e);
-  if (e->k == VNONRELOC) {
-    if (!hasjumps(e)) return e->u.info;  /* exp is already in a register */
-    if (e->u.info >= fs->nactvar) {  /* reg. is not a local? */
-      exp2reg(fs, e, e->u.info);  /* put value on it */
-      return e->u.info;
-    }
-  }
-  luaK_exp2nextreg(fs, e);  /* default */
-  return e->u.info;
-}
-
-
-void luaK_exp2anyregup (FuncState *fs, expdesc *e) {
-  if (e->k != VUPVAL || hasjumps(e))
-    luaK_exp2anyreg(fs, e);
-}
-
-
-void luaK_exp2val (FuncState *fs, expdesc *e) {
-  if (hasjumps(e))
-    luaK_exp2anyreg(fs, e);
-  else
-    luaK_dischargevars(fs, e);
-}
-
-
-int luaK_exp2RK (FuncState *fs, expdesc *e) {
-  luaK_exp2val(fs, e);
-  switch (e->k) {
-    case VTRUE:
-    case VFALSE:
-    case VNIL: {
-      if (fs->nk <= MAXINDEXRK) {  /* constant fits in RK operand? */
-        e->u.info = (e->k == VNIL) ? nilK(fs) : boolK(fs, (e->k == VTRUE));
-        e->k = VK;
-        return RKASK(e->u.info);
-      }
-      else break;
-    }
-    case VKNUM: {
-      e->u.info = luaK_numberK(fs, e->u.nval);
-      e->k = VK;
-      /* go through */
-    }
-    case VK: {
-      if (e->u.info <= MAXINDEXRK)  /* constant fits in argC? */
-        return RKASK(e->u.info);
-      else break;
-    }
-    default: break;
-  }
-  /* not a constant in the right range: put it in a register */
-  return luaK_exp2anyreg(fs, e);
-}
-
-
-void luaK_storevar (FuncState *fs, expdesc *var, expdesc *ex) {
-  switch (var->k) {
-    case VLOCAL: {
-      freeexp(fs, ex);
-      exp2reg(fs, ex, var->u.info);
-      return;
-    }
-    case VUPVAL: {
-      int e = luaK_exp2anyreg(fs, ex);
-      luaK_codeABC(fs, OP_SETUPVAL, e, var->u.info, 0);
-      break;
-    }
-    case VINDEXED: {
-      OpCode op = (var->u.ind.vt == VLOCAL) ? OP_SETTABLE : OP_SETTABUP;
-      int e = luaK_exp2RK(fs, ex);
-      luaK_codeABC(fs, op, var->u.ind.t, var->u.ind.idx, e);
-      break;
-    }
-    default: {
-      lua_assert(0);  /* invalid var kind to store */
-      break;
-    }
-  }
-  freeexp(fs, ex);
-}
-
-
-void luaK_self (FuncState *fs, expdesc *e, expdesc *key) {
-  int ereg;
-  luaK_exp2anyreg(fs, e);
-  ereg = e->u.info;  /* register where 'e' was placed */
-  freeexp(fs, e);
-  e->u.info = fs->freereg;  /* base register for op_self */
-  e->k = VNONRELOC;
-  luaK_reserveregs(fs, 2);  /* function and 'self' produced by op_self */
-  luaK_codeABC(fs, OP_SELF, e->u.info, ereg, luaK_exp2RK(fs, key));
-  freeexp(fs, key);
-}
-
-
-static void invertjump (FuncState *fs, expdesc *e) {
-  Instruction *pc = getjumpcontrol(fs, e->u.info);
-  lua_assert(testTMode(GET_OPCODE(*pc)) && GET_OPCODE(*pc) != OP_TESTSET &&
-                                           GET_OPCODE(*pc) != OP_TEST);
-  SETARG_A(*pc, !(GETARG_A(*pc)));
-}
-
-
-static int jumponcond (FuncState *fs, expdesc *e, int cond) {
-  if (e->k == VRELOCABLE) {
-    Instruction ie = getcode(fs, e);
-    if (GET_OPCODE(ie) == OP_NOT) {
-      fs->pc--;  /* remove previous OP_NOT */
-      return condjump(fs, OP_TEST, GETARG_B(ie), 0, !cond);
-    }
-    /* else go through */
-  }
-  discharge2anyreg(fs, e);
-  freeexp(fs, e);
-  return condjump(fs, OP_TESTSET, NO_REG, e->u.info, cond);
-}
-
-
-void luaK_goiftrue (FuncState *fs, expdesc *e) {
-  int pc;  /* pc of last jump */
-  luaK_dischargevars(fs, e);
-  switch (e->k) {
-    case VJMP: {
-      invertjump(fs, e);
-      pc = e->u.info;
-      break;
-    }
-    case VK: case VKNUM: case VTRUE: {
-      pc = NO_JUMP;  /* always true; do nothing */
-      break;
-    }
-    default: {
-      pc = jumponcond(fs, e, 0);
-      break;
-    }
-  }
-  luaK_concat(fs, &e->f, pc);  /* insert last jump in `f' list */
-  luaK_patchtohere(fs, e->t);
-  e->t = NO_JUMP;
-}
-
-
-void luaK_goiffalse (FuncState *fs, expdesc *e) {
-  int pc;  /* pc of last jump */
-  luaK_dischargevars(fs, e);
-  switch (e->k) {
-    case VJMP: {
-      pc = e->u.info;
-      break;
-    }
-    case VNIL: case VFALSE: {
-      pc = NO_JUMP;  /* always false; do nothing */
-      break;
-    }
-    default: {
-      pc = jumponcond(fs, e, 1);
-      break;
-    }
-  }
-  luaK_concat(fs, &e->t, pc);  /* insert last jump in `t' list */
-  luaK_patchtohere(fs, e->f);
-  e->f = NO_JUMP;
-}
-
-
-static void codenot (FuncState *fs, expdesc *e) {
-  luaK_dischargevars(fs, e);
-  switch (e->k) {
-    case VNIL: case VFALSE: {
-      e->k = VTRUE;
-      break;
-    }
-    case VK: case VKNUM: case VTRUE: {
-      e->k = VFALSE;
-      break;
-    }
-    case VJMP: {
-      invertjump(fs, e);
-      break;
-    }
-    case VRELOCABLE:
-    case VNONRELOC: {
-      discharge2anyreg(fs, e);
-      freeexp(fs, e);
-      e->u.info = luaK_codeABC(fs, OP_NOT, 0, e->u.info, 0);
-      e->k = VRELOCABLE;
-      break;
-    }
-    default: {
-      lua_assert(0);  /* cannot happen */
-      break;
-    }
-  }
-  /* interchange true and false lists */
-  { int temp = e->f; e->f = e->t; e->t = temp; }
-  removevalues(fs, e->f);
-  removevalues(fs, e->t);
-}
-
-
-void luaK_indexed (FuncState *fs, expdesc *t, expdesc *k) {
-  lua_assert(!hasjumps(t));
-  t->u.ind.t = t->u.info;
-  t->u.ind.idx = luaK_exp2RK(fs, k);
-  t->u.ind.vt = (t->k == VUPVAL) ? VUPVAL
-                                 : check_exp(vkisinreg(t->k), VLOCAL);
-  t->k = VINDEXED;
-}
-
-
-static int constfolding (OpCode op, expdesc *e1, expdesc *e2) {
-  lua_Number r;
-  if (!isnumeral(e1) || !isnumeral(e2)) return 0;
-  if ((op == OP_DIV || op == OP_MOD) && e2->u.nval == 0)
-    return 0;  /* do not attempt to divide by 0 */
-  r = luaO_arith(op - OP_ADD + LUA_OPADD, e1->u.nval, e2->u.nval);
-  e1->u.nval = r;
-  return 1;
-}
-
-
-static void codearith (FuncState *fs, OpCode op,
-                       expdesc *e1, expdesc *e2, int line) {
-  if (constfolding(op, e1, e2))
-    return;
-  else {
-    int o2 = (op != OP_UNM && op != OP_LEN) ? luaK_exp2RK(fs, e2) : 0;
-    int o1 = luaK_exp2RK(fs, e1);
-    if (o1 > o2) {
-      freeexp(fs, e1);
-      freeexp(fs, e2);
-    }
+void luaK_patchlist(FuncState *fs, int list, int target)
+{
+    if (target == fs->pc)
+        luaK_patchtohere(fs, list);
     else {
-      freeexp(fs, e2);
-      freeexp(fs, e1);
+        lua_assert(target < fs->pc);
+        patchlistaux(fs, list, target, NO_REG, target);
     }
-    e1->u.info = luaK_codeABC(fs, op, 0, o1, o2);
-    e1->k = VRELOCABLE;
-    luaK_fixline(fs, line);
-  }
 }
 
 
-static void codecomp (FuncState *fs, OpCode op, int cond, expdesc *e1,
-                                                          expdesc *e2) {
-  int o1 = luaK_exp2RK(fs, e1);
-  int o2 = luaK_exp2RK(fs, e2);
-  freeexp(fs, e2);
-  freeexp(fs, e1);
-  if (cond == 0 && op != OP_EQ) {
-    int temp;  /* exchange args to replace by `<' or `<=' */
-    temp = o1; o1 = o2; o2 = temp;  /* o1 <==> o2 */
-    cond = 1;
-  }
-  e1->u.info = condjump(fs, op, cond, o1, o2);
-  e1->k = VJMP;
+LUAI_FUNC void luaK_patchclose(FuncState *fs, int list, int level)
+{
+    level++;  /* argument is +1 to reserve 0 as non-op */
+    while (list != NO_JUMP) {
+        int next = getjump(fs, list);
+        lua_assert(GET_OPCODE(fs->f->code[list]) == OP_JMP &&
+                   (GETARG_A(fs->f->code[list]) == 0 ||
+                    GETARG_A(fs->f->code[list]) >= level));
+        SETARG_A(fs->f->code[list], level);
+        list = next;
+    }
 }
 
 
-void luaK_prefix (FuncState *fs, UnOpr op, expdesc *e, int line) {
-  expdesc e2;
-  e2.t = e2.f = NO_JUMP; e2.k = VKNUM; e2.u.nval = 0;
-  switch (op) {
-    case OPR_MINUS: {
-      if (isnumeral(e))  /* minus constant? */
-        e->u.nval = luai_numunm(NULL, e->u.nval);  /* fold it */
-      else {
+void luaK_patchtohere(FuncState *fs, int list)
+{
+    luaK_getlabel(fs);
+    luaK_concat(fs, &fs->jpc, list);
+}
+
+
+void luaK_concat(FuncState *fs, int *l1, int l2)
+{
+    if (l2 == NO_JUMP) return;
+    else if (*l1 == NO_JUMP)
+        *l1 = l2;
+    else {
+        int list = *l1;
+        int next;
+        while ((next = getjump(fs, list)) != NO_JUMP)  /* find last element */
+            list = next;
+        fixjump(fs, list, l2);
+    }
+}
+
+
+static int luaK_code(FuncState *fs, Instruction i)
+{
+    Proto *f = fs->f;
+    dischargejpc(fs);  /* `pc' will change */
+    /* put new instruction in code array */
+    luaM_growvector(fs->ls->L, f->code, fs->pc, f->sizecode, Instruction,
+                    MAX_INT, "opcodes");
+    f->code[fs->pc] = i;
+    /* save corresponding line information */
+    luaM_growvector(fs->ls->L, f->lineinfo, fs->pc, f->sizelineinfo, int,
+                    MAX_INT, "opcodes");
+    f->lineinfo[fs->pc] = fs->ls->lastline;
+    return fs->pc++;
+}
+
+
+int luaK_codeABC(FuncState *fs, OpCode o, int a, int b, int c)
+{
+    lua_assert(getOpMode(o) == iABC);
+    lua_assert(getBMode(o) != OpArgN || b == 0);
+    lua_assert(getCMode(o) != OpArgN || c == 0);
+    lua_assert(a <= MAXARG_A && b <= MAXARG_B && c <= MAXARG_C);
+    return luaK_code(fs, CREATE_ABC(o, a, b, c));
+}
+
+
+int luaK_codeABx(FuncState *fs, OpCode o, int a, unsigned int bc)
+{
+    lua_assert(getOpMode(o) == iABx || getOpMode(o) == iAsBx);
+    lua_assert(getCMode(o) == OpArgN);
+    lua_assert(a <= MAXARG_A && bc <= MAXARG_Bx);
+    return luaK_code(fs, CREATE_ABx(o, a, bc));
+}
+
+
+static int codeextraarg(FuncState *fs, int a)
+{
+    lua_assert(a <= MAXARG_Ax);
+    return luaK_code(fs, CREATE_Ax(OP_EXTRAARG, a));
+}
+
+
+int luaK_codek(FuncState *fs, int reg, int k)
+{
+    if (k <= MAXARG_Bx)
+        return luaK_codeABx(fs, OP_LOADK, reg, k);
+    else {
+        int p = luaK_codeABx(fs, OP_LOADKX, reg, 0);
+        codeextraarg(fs, k);
+        return p;
+    }
+}
+
+
+void luaK_checkstack(FuncState *fs, int n)
+{
+    int newstack = fs->freereg + n;
+    if (newstack > fs->f->maxstacksize) {
+        if (newstack >= MAXSTACK)
+            luaX_syntaxerror(fs->ls, "function or expression too complex");
+        fs->f->maxstacksize = cast_byte(newstack);
+    }
+}
+
+
+void luaK_reserveregs(FuncState *fs, int n)
+{
+    luaK_checkstack(fs, n);
+    fs->freereg += n;
+}
+
+
+static void freereg(FuncState *fs, int reg)
+{
+    if (!ISK(reg) && reg >= fs->nactvar) {
+        fs->freereg--;
+        lua_assert(reg == fs->freereg);
+    }
+}
+
+
+static void freeexp(FuncState *fs, expdesc *e)
+{
+    if (e->k == VNONRELOC)
+        freereg(fs, e->u.info);
+}
+
+
+static int addk(FuncState *fs, TValue *key, TValue *v)
+{
+    lua_State *L = fs->ls->L;
+    TValue *idx = luaH_set(L, fs->h, key);
+    Proto *f = fs->f;
+    int k, oldsize;
+    if (ttisnumber(idx)) {
+        lua_Number n = nvalue(idx);
+        lua_number2int(k, n);
+        if (luaV_rawequalobj(&f->k[k], v))
+            return k;
+        /* else may be a collision (e.g., between 0.0 and "\0\0\0\0\0\0\0\0");
+           go through and create a new entry for this value */
+    }
+    /* constant not found; create a new entry */
+    oldsize = f->sizek;
+    k = fs->nk;
+    /* numerical value does not need GC barrier;
+       table has no metatable, so it does not need to invalidate cache */
+    setnvalue(idx, cast_num(k));
+    luaM_growvector(L, f->k, k, f->sizek, TValue, MAXARG_Ax, "constants");
+    while (oldsize < f->sizek) setnilvalue(&f->k[oldsize++]);
+    setobj(L, &f->k[k], v);
+    fs->nk++;
+    luaC_barrier(L, f, v);
+    return k;
+}
+
+
+int luaK_stringK(FuncState *fs, TString *s)
+{
+    TValue o;
+    setsvalue(fs->ls->L, &o, s);
+    return addk(fs, &o, &o);
+}
+
+
+int luaK_numberK(FuncState *fs, lua_Number r)
+{
+    int n;
+    lua_State *L = fs->ls->L;
+    TValue o;
+    setnvalue(&o, r);
+    if (r == 0 || luai_numisnan(NULL, r)) {  /* handle -0 and NaN */
+        /* use raw representation as key to avoid numeric problems */
+        setsvalue(L, L->top++, luaS_newlstr(L, (char *)&r, sizeof(r)));
+        n = addk(fs, L->top - 1, &o);
+        L->top--;
+    } else
+        n = addk(fs, &o, &o);  /* regular case */
+    return n;
+}
+
+
+static int boolK(FuncState *fs, int b)
+{
+    TValue o;
+    setbvalue(&o, b);
+    return addk(fs, &o, &o);
+}
+
+
+static int nilK(FuncState *fs)
+{
+    TValue k, v;
+    setnilvalue(&v);
+    /* cannot use nil as key; instead use table itself to represent nil */
+    sethvalue(fs->ls->L, &k, fs->h);
+    return addk(fs, &k, &v);
+}
+
+
+void luaK_setreturns(FuncState *fs, expdesc *e, int nresults)
+{
+    if (e->k == VCALL) {  /* expression is an open function call? */
+        SETARG_C(getcode(fs, e), nresults + 1);
+    } else if (e->k == VVARARG) {
+        SETARG_B(getcode(fs, e), nresults + 1);
+        SETARG_A(getcode(fs, e), fs->freereg);
+        luaK_reserveregs(fs, 1);
+    }
+}
+
+
+void luaK_setoneret(FuncState *fs, expdesc *e)
+{
+    if (e->k == VCALL) {  /* expression is an open function call? */
+        e->k = VNONRELOC;
+        e->u.info = GETARG_A(getcode(fs, e));
+    } else if (e->k == VVARARG) {
+        SETARG_B(getcode(fs, e), 2);
+        e->k = VRELOCABLE;  /* can relocate its simple result */
+    }
+}
+
+
+void luaK_dischargevars(FuncState *fs, expdesc *e)
+{
+    switch (e->k) {
+        case VLOCAL: {
+            e->k = VNONRELOC;
+            break;
+        }
+        case VUPVAL: {
+            e->u.info = luaK_codeABC(fs, OP_GETUPVAL, 0, e->u.info, 0);
+            e->k = VRELOCABLE;
+            break;
+        }
+        case VINDEXED: {
+            OpCode op = OP_GETTABUP;  /* assume 't' is in an upvalue */
+            freereg(fs, e->u.ind.idx);
+            if (e->u.ind.vt == VLOCAL) {  /* 't' is in a register? */
+                freereg(fs, e->u.ind.t);
+                op = OP_GETTABLE;
+            }
+            e->u.info = luaK_codeABC(fs, op, 0, e->u.ind.t, e->u.ind.idx);
+            e->k = VRELOCABLE;
+            break;
+        }
+        case VVARARG:
+        case VCALL: {
+            luaK_setoneret(fs, e);
+            break;
+        }
+        default:
+            break;  /* there is one value available (somewhere) */
+    }
+}
+
+
+static int code_label(FuncState *fs, int A, int b, int jump)
+{
+    luaK_getlabel(fs);  /* those instructions may be jump targets */
+    return luaK_codeABC(fs, OP_LOADBOOL, A, b, jump);
+}
+
+
+static void discharge2reg(FuncState *fs, expdesc *e, int reg)
+{
+    luaK_dischargevars(fs, e);
+    switch (e->k) {
+        case VNIL: {
+            luaK_nil(fs, reg, 1);
+            break;
+        }
+        case VFALSE:
+        case VTRUE: {
+            luaK_codeABC(fs, OP_LOADBOOL, reg, e->k == VTRUE, 0);
+            break;
+        }
+        case VK: {
+            luaK_codek(fs, reg, e->u.info);
+            break;
+        }
+        case VKNUM: {
+            luaK_codek(fs, reg, luaK_numberK(fs, e->u.nval));
+            break;
+        }
+        case VRELOCABLE: {
+            Instruction *pc = &getcode(fs, e);
+            SETARG_A(*pc, reg);
+            break;
+        }
+        case VNONRELOC: {
+            if (reg != e->u.info)
+                luaK_codeABC(fs, OP_MOVE, reg, e->u.info, 0);
+            break;
+        }
+        default: {
+            lua_assert(e->k == VVOID || e->k == VJMP);
+            return;  /* nothing to do... */
+        }
+    }
+    e->u.info = reg;
+    e->k = VNONRELOC;
+}
+
+
+static void discharge2anyreg(FuncState *fs, expdesc *e)
+{
+    if (e->k != VNONRELOC) {
+        luaK_reserveregs(fs, 1);
+        discharge2reg(fs, e, fs->freereg - 1);
+    }
+}
+
+
+static void exp2reg(FuncState *fs, expdesc *e, int reg)
+{
+    discharge2reg(fs, e, reg);
+    if (e->k == VJMP)
+        luaK_concat(fs, &e->t, e->u.info);  /* put this jump in `t' list */
+    if (hasjumps(e)) {
+        int final;  /* position after whole expression */
+        int p_f = NO_JUMP;  /* position of an eventual LOAD false */
+        int p_t = NO_JUMP;  /* position of an eventual LOAD true */
+        if (need_value(fs, e->t) || need_value(fs, e->f)) {
+            int fj = (e->k == VJMP) ? NO_JUMP : luaK_jump(fs);
+            p_f = code_label(fs, reg, 0, 1);
+            p_t = code_label(fs, reg, 1, 0);
+            luaK_patchtohere(fs, fj);
+        }
+        final = luaK_getlabel(fs);
+        patchlistaux(fs, e->f, final, reg, p_f);
+        patchlistaux(fs, e->t, final, reg, p_t);
+    }
+    e->f = e->t = NO_JUMP;
+    e->u.info = reg;
+    e->k = VNONRELOC;
+}
+
+
+void luaK_exp2nextreg(FuncState *fs, expdesc *e)
+{
+    luaK_dischargevars(fs, e);
+    freeexp(fs, e);
+    luaK_reserveregs(fs, 1);
+    exp2reg(fs, e, fs->freereg - 1);
+}
+
+
+int luaK_exp2anyreg(FuncState *fs, expdesc *e)
+{
+    luaK_dischargevars(fs, e);
+    if (e->k == VNONRELOC) {
+        if (!hasjumps(e)) return e->u.info;  /* exp is already in a register */
+        if (e->u.info >= fs->nactvar) {  /* reg. is not a local? */
+            exp2reg(fs, e, e->u.info);  /* put value on it */
+            return e->u.info;
+        }
+    }
+    luaK_exp2nextreg(fs, e);  /* default */
+    return e->u.info;
+}
+
+
+void luaK_exp2anyregup(FuncState *fs, expdesc *e)
+{
+    if (e->k != VUPVAL || hasjumps(e))
         luaK_exp2anyreg(fs, e);
-        codearith(fs, OP_UNM, e, &e2, line);
-      }
-      break;
-    }
-    case OPR_NOT: codenot(fs, e); break;
-    case OPR_LEN: {
-      luaK_exp2anyreg(fs, e);  /* cannot operate on constants */
-      codearith(fs, OP_LEN, e, &e2, line);
-      break;
-    }
-    default: lua_assert(0);
-  }
 }
 
 
-void luaK_infix (FuncState *fs, BinOpr op, expdesc *v) {
-  switch (op) {
-    case OPR_AND: {
-      luaK_goiftrue(fs, v);
-      break;
-    }
-    case OPR_OR: {
-      luaK_goiffalse(fs, v);
-      break;
-    }
-    case OPR_CONCAT: {
-      luaK_exp2nextreg(fs, v);  /* operand must be on the `stack' */
-      break;
-    }
-    case OPR_ADD: case OPR_SUB: case OPR_MUL: case OPR_DIV:
-    case OPR_MOD: case OPR_POW: {
-      if (!isnumeral(v)) luaK_exp2RK(fs, v);
-      break;
-    }
-    default: {
-      luaK_exp2RK(fs, v);
-      break;
-    }
-  }
+void luaK_exp2val(FuncState *fs, expdesc *e)
+{
+    if (hasjumps(e))
+        luaK_exp2anyreg(fs, e);
+    else
+        luaK_dischargevars(fs, e);
 }
 
 
-void luaK_posfix (FuncState *fs, BinOpr op,
-                  expdesc *e1, expdesc *e2, int line) {
-  switch (op) {
-    case OPR_AND: {
-      lua_assert(e1->t == NO_JUMP);  /* list must be closed */
-      luaK_dischargevars(fs, e2);
-      luaK_concat(fs, &e2->f, e1->f);
-      *e1 = *e2;
-      break;
+int luaK_exp2RK(FuncState *fs, expdesc *e)
+{
+    luaK_exp2val(fs, e);
+    switch (e->k) {
+        case VTRUE:
+        case VFALSE:
+        case VNIL: {
+            if (fs->nk <= MAXINDEXRK) {  /* constant fits in RK operand? */
+                e->u.info = (e->k == VNIL) ? nilK(fs) : boolK(fs, (e->k == VTRUE));
+                e->k = VK;
+                return RKASK(e->u.info);
+            } else break;
+        }
+        case VKNUM: {
+            e->u.info = luaK_numberK(fs, e->u.nval);
+            e->k = VK;
+            /* go through */
+        }
+        case VK: {
+            if (e->u.info <= MAXINDEXRK)  /* constant fits in argC? */
+                return RKASK(e->u.info);
+            else break;
+        }
+        default:
+            break;
     }
-    case OPR_OR: {
-      lua_assert(e1->f == NO_JUMP);  /* list must be closed */
-      luaK_dischargevars(fs, e2);
-      luaK_concat(fs, &e2->t, e1->t);
-      *e1 = *e2;
-      break;
-    }
-    case OPR_CONCAT: {
-      luaK_exp2val(fs, e2);
-      if (e2->k == VRELOCABLE && GET_OPCODE(getcode(fs, e2)) == OP_CONCAT) {
-        lua_assert(e1->u.info == GETARG_B(getcode(fs, e2))-1);
-        freeexp(fs, e1);
-        SETARG_B(getcode(fs, e2), e1->u.info);
-        e1->k = VRELOCABLE; e1->u.info = e2->u.info;
-      }
-      else {
-        luaK_exp2nextreg(fs, e2);  /* operand must be on the 'stack' */
-        codearith(fs, OP_CONCAT, e1, e2, line);
-      }
-      break;
-    }
-    case OPR_ADD: case OPR_SUB: case OPR_MUL: case OPR_DIV:
-    case OPR_MOD: case OPR_POW: {
-      codearith(fs, cast(OpCode, op - OPR_ADD + OP_ADD), e1, e2, line);
-      break;
-    }
-    case OPR_EQ: case OPR_LT: case OPR_LE: {
-      codecomp(fs, cast(OpCode, op - OPR_EQ + OP_EQ), 1, e1, e2);
-      break;
-    }
-    case OPR_NE: case OPR_GT: case OPR_GE: {
-      codecomp(fs, cast(OpCode, op - OPR_NE + OP_EQ), 0, e1, e2);
-      break;
-    }
-    default: lua_assert(0);
-  }
+    /* not a constant in the right range: put it in a register */
+    return luaK_exp2anyreg(fs, e);
 }
 
 
-void luaK_fixline (FuncState *fs, int line) {
-  fs->f->lineinfo[fs->pc - 1] = line;
+void luaK_storevar(FuncState *fs, expdesc *var, expdesc *ex)
+{
+    switch (var->k) {
+        case VLOCAL: {
+            freeexp(fs, ex);
+            exp2reg(fs, ex, var->u.info);
+            return;
+        }
+        case VUPVAL: {
+            int e = luaK_exp2anyreg(fs, ex);
+            luaK_codeABC(fs, OP_SETUPVAL, e, var->u.info, 0);
+            break;
+        }
+        case VINDEXED: {
+            OpCode op = (var->u.ind.vt == VLOCAL) ? OP_SETTABLE : OP_SETTABUP;
+            int e = luaK_exp2RK(fs, ex);
+            luaK_codeABC(fs, op, var->u.ind.t, var->u.ind.idx, e);
+            break;
+        }
+        default: {
+            lua_assert(0);  /* invalid var kind to store */
+            break;
+        }
+    }
+    freeexp(fs, ex);
 }
 
 
-void luaK_setlist (FuncState *fs, int base, int nelems, int tostore) {
-  int c =  (nelems - 1)/LFIELDS_PER_FLUSH + 1;
-  int b = (tostore == LUA_MULTRET) ? 0 : tostore;
-  lua_assert(tostore != 0);
-  if (c <= MAXARG_C)
-    luaK_codeABC(fs, OP_SETLIST, base, b, c);
-  else if (c <= MAXARG_Ax) {
-    luaK_codeABC(fs, OP_SETLIST, base, b, 0);
-    codeextraarg(fs, c);
-  }
-  else
-    luaX_syntaxerror(fs->ls, "constructor too long");
-  fs->freereg = base + 1;  /* free registers with list values */
+void luaK_self(FuncState *fs, expdesc *e, expdesc *key)
+{
+    int ereg;
+    luaK_exp2anyreg(fs, e);
+    ereg = e->u.info;  /* register where 'e' was placed */
+    freeexp(fs, e);
+    e->u.info = fs->freereg;  /* base register for op_self */
+    e->k = VNONRELOC;
+    luaK_reserveregs(fs, 2);  /* function and 'self' produced by op_self */
+    luaK_codeABC(fs, OP_SELF, e->u.info, ereg, luaK_exp2RK(fs, key));
+    freeexp(fs, key);
+}
+
+
+static void invertjump(FuncState *fs, expdesc *e)
+{
+    Instruction *pc = getjumpcontrol(fs, e->u.info);
+    lua_assert(testTMode(GET_OPCODE(*pc)) && GET_OPCODE(*pc) != OP_TESTSET &&
+               GET_OPCODE(*pc) != OP_TEST);
+    SETARG_A(*pc, !(GETARG_A(*pc)));
+}
+
+
+static int jumponcond(FuncState *fs, expdesc *e, int cond)
+{
+    if (e->k == VRELOCABLE) {
+        Instruction ie = getcode(fs, e);
+        if (GET_OPCODE(ie) == OP_NOT) {
+            fs->pc--;  /* remove previous OP_NOT */
+            return condjump(fs, OP_TEST, GETARG_B(ie), 0, !cond);
+        }
+        /* else go through */
+    }
+    discharge2anyreg(fs, e);
+    freeexp(fs, e);
+    return condjump(fs, OP_TESTSET, NO_REG, e->u.info, cond);
+}
+
+
+void luaK_goiftrue(FuncState *fs, expdesc *e)
+{
+    int pc;  /* pc of last jump */
+    luaK_dischargevars(fs, e);
+    switch (e->k) {
+        case VJMP: {
+            invertjump(fs, e);
+            pc = e->u.info;
+            break;
+        }
+        case VK:
+        case VKNUM:
+        case VTRUE: {
+            pc = NO_JUMP;  /* always true; do nothing */
+            break;
+        }
+        default: {
+            pc = jumponcond(fs, e, 0);
+            break;
+        }
+    }
+    luaK_concat(fs, &e->f, pc);  /* insert last jump in `f' list */
+    luaK_patchtohere(fs, e->t);
+    e->t = NO_JUMP;
+}
+
+
+void luaK_goiffalse(FuncState *fs, expdesc *e)
+{
+    int pc;  /* pc of last jump */
+    luaK_dischargevars(fs, e);
+    switch (e->k) {
+        case VJMP: {
+            pc = e->u.info;
+            break;
+        }
+        case VNIL:
+        case VFALSE: {
+            pc = NO_JUMP;  /* always false; do nothing */
+            break;
+        }
+        default: {
+            pc = jumponcond(fs, e, 1);
+            break;
+        }
+    }
+    luaK_concat(fs, &e->t, pc);  /* insert last jump in `t' list */
+    luaK_patchtohere(fs, e->f);
+    e->f = NO_JUMP;
+}
+
+
+static void codenot(FuncState *fs, expdesc *e)
+{
+    luaK_dischargevars(fs, e);
+    switch (e->k) {
+        case VNIL:
+        case VFALSE: {
+            e->k = VTRUE;
+            break;
+        }
+        case VK:
+        case VKNUM:
+        case VTRUE: {
+            e->k = VFALSE;
+            break;
+        }
+        case VJMP: {
+            invertjump(fs, e);
+            break;
+        }
+        case VRELOCABLE:
+        case VNONRELOC: {
+            discharge2anyreg(fs, e);
+            freeexp(fs, e);
+            e->u.info = luaK_codeABC(fs, OP_NOT, 0, e->u.info, 0);
+            e->k = VRELOCABLE;
+            break;
+        }
+        default: {
+            lua_assert(0);  /* cannot happen */
+            break;
+        }
+    }
+    /* interchange true and false lists */
+    { int temp = e->f; e->f = e->t; e->t = temp; }
+    removevalues(fs, e->f);
+    removevalues(fs, e->t);
+}
+
+
+void luaK_indexed(FuncState *fs, expdesc *t, expdesc *k)
+{
+    lua_assert(!hasjumps(t));
+    t->u.ind.t = t->u.info;
+    t->u.ind.idx = luaK_exp2RK(fs, k);
+    t->u.ind.vt = (t->k == VUPVAL) ? VUPVAL
+                  : check_exp(vkisinreg(t->k), VLOCAL);
+    t->k = VINDEXED;
+}
+
+
+static int constfolding(OpCode op, expdesc *e1, expdesc *e2)
+{
+    lua_Number r;
+    if (!isnumeral(e1) || !isnumeral(e2)) return 0;
+    if ((op == OP_DIV || op == OP_MOD) && e2->u.nval == 0)
+        return 0;  /* do not attempt to divide by 0 */
+    r = luaO_arith(op - OP_ADD + LUA_OPADD, e1->u.nval, e2->u.nval);
+    e1->u.nval = r;
+    return 1;
+}
+
+
+static void codearith(FuncState *fs, OpCode op,
+                      expdesc *e1, expdesc *e2, int line)
+{
+    if (constfolding(op, e1, e2))
+        return;
+    else {
+        int o2 = (op != OP_UNM && op != OP_LEN) ? luaK_exp2RK(fs, e2) : 0;
+        int o1 = luaK_exp2RK(fs, e1);
+        if (o1 > o2) {
+            freeexp(fs, e1);
+            freeexp(fs, e2);
+        } else {
+            freeexp(fs, e2);
+            freeexp(fs, e1);
+        }
+        e1->u.info = luaK_codeABC(fs, op, 0, o1, o2);
+        e1->k = VRELOCABLE;
+        luaK_fixline(fs, line);
+    }
+}
+
+
+static void codecomp(FuncState *fs, OpCode op, int cond, expdesc *e1,
+                     expdesc *e2)
+{
+    int o1 = luaK_exp2RK(fs, e1);
+    int o2 = luaK_exp2RK(fs, e2);
+    freeexp(fs, e2);
+    freeexp(fs, e1);
+    if (cond == 0 && op != OP_EQ) {
+        int temp;  /* exchange args to replace by `<' or `<=' */
+        temp = o1;
+        o1 = o2;
+        o2 = temp;  /* o1 <==> o2 */
+        cond = 1;
+    }
+    e1->u.info = condjump(fs, op, cond, o1, o2);
+    e1->k = VJMP;
+}
+
+
+void luaK_prefix(FuncState *fs, UnOpr op, expdesc *e, int line)
+{
+    expdesc e2;
+    e2.t = e2.f = NO_JUMP;
+    e2.k = VKNUM;
+    e2.u.nval = 0;
+    switch (op) {
+        case OPR_MINUS: {
+            if (isnumeral(e))  /* minus constant? */
+                e->u.nval = luai_numunm(NULL, e->u.nval);  /* fold it */
+            else {
+                luaK_exp2anyreg(fs, e);
+                codearith(fs, OP_UNM, e, &e2, line);
+            }
+            break;
+        }
+        case OPR_NOT:
+            codenot(fs, e);
+            break;
+        case OPR_LEN: {
+            luaK_exp2anyreg(fs, e);  /* cannot operate on constants */
+            codearith(fs, OP_LEN, e, &e2, line);
+            break;
+        }
+        default:
+            lua_assert(0);
+    }
+}
+
+
+void luaK_infix(FuncState *fs, BinOpr op, expdesc *v)
+{
+    switch (op) {
+        case OPR_AND: {
+            luaK_goiftrue(fs, v);
+            break;
+        }
+        case OPR_OR: {
+            luaK_goiffalse(fs, v);
+            break;
+        }
+        case OPR_CONCAT: {
+            luaK_exp2nextreg(fs, v);  /* operand must be on the `stack' */
+            break;
+        }
+        case OPR_ADD:
+        case OPR_SUB:
+        case OPR_MUL:
+        case OPR_DIV:
+        case OPR_MOD:
+        case OPR_POW: {
+            if (!isnumeral(v)) luaK_exp2RK(fs, v);
+            break;
+        }
+        default: {
+            luaK_exp2RK(fs, v);
+            break;
+        }
+    }
+}
+
+
+void luaK_posfix(FuncState *fs, BinOpr op,
+                 expdesc *e1, expdesc *e2, int line)
+{
+    switch (op) {
+        case OPR_AND: {
+            lua_assert(e1->t == NO_JUMP);  /* list must be closed */
+            luaK_dischargevars(fs, e2);
+            luaK_concat(fs, &e2->f, e1->f);
+            *e1 = *e2;
+            break;
+        }
+        case OPR_OR: {
+            lua_assert(e1->f == NO_JUMP);  /* list must be closed */
+            luaK_dischargevars(fs, e2);
+            luaK_concat(fs, &e2->t, e1->t);
+            *e1 = *e2;
+            break;
+        }
+        case OPR_CONCAT: {
+            luaK_exp2val(fs, e2);
+            if (e2->k == VRELOCABLE && GET_OPCODE(getcode(fs, e2)) == OP_CONCAT) {
+                lua_assert(e1->u.info == GETARG_B(getcode(fs, e2)) - 1);
+                freeexp(fs, e1);
+                SETARG_B(getcode(fs, e2), e1->u.info);
+                e1->k = VRELOCABLE;
+                e1->u.info = e2->u.info;
+            } else {
+                luaK_exp2nextreg(fs, e2);  /* operand must be on the 'stack' */
+                codearith(fs, OP_CONCAT, e1, e2, line);
+            }
+            break;
+        }
+        case OPR_ADD:
+        case OPR_SUB:
+        case OPR_MUL:
+        case OPR_DIV:
+        case OPR_MOD:
+        case OPR_POW: {
+            codearith(fs, cast(OpCode, op - OPR_ADD + OP_ADD), e1, e2, line);
+            break;
+        }
+        case OPR_EQ:
+        case OPR_LT:
+        case OPR_LE: {
+            codecomp(fs, cast(OpCode, op - OPR_EQ + OP_EQ), 1, e1, e2);
+            break;
+        }
+        case OPR_NE:
+        case OPR_GT:
+        case OPR_GE: {
+            codecomp(fs, cast(OpCode, op - OPR_NE + OP_EQ), 0, e1, e2);
+            break;
+        }
+        default:
+            lua_assert(0);
+    }
+}
+
+
+void luaK_fixline(FuncState *fs, int line)
+{
+    fs->f->lineinfo[fs->pc - 1] = line;
+}
+
+
+void luaK_setlist(FuncState *fs, int base, int nelems, int tostore)
+{
+    int c = (nelems - 1) / LFIELDS_PER_FLUSH + 1;
+    int b = (tostore == LUA_MULTRET) ? 0 : tostore;
+    lua_assert(tostore != 0);
+    if (c <= MAXARG_C)
+        luaK_codeABC(fs, OP_SETLIST, base, b, c);
+    else if (c <= MAXARG_Ax) {
+        luaK_codeABC(fs, OP_SETLIST, base, b, 0);
+        codeextraarg(fs, c);
+    } else
+        luaX_syntaxerror(fs->ls, "constructor too long");
+    fs->freereg = base + 1;  /* free registers with list values */
 }
 
diff --git a/liblua/lcode.h b/liblua/lcode.h
index 17337f1cb..e40c63abc 100644
--- a/liblua/lcode.h
+++ b/liblua/lcode.h
@@ -24,12 +24,12 @@
 ** grep "ORDER OPR" if you change these enums  (ORDER OP)
 */
 typedef enum BinOpr {
-  OPR_ADD, OPR_SUB, OPR_MUL, OPR_DIV, OPR_MOD, OPR_POW,
-  OPR_CONCAT,
-  OPR_EQ, OPR_LT, OPR_LE,
-  OPR_NE, OPR_GT, OPR_GE,
-  OPR_AND, OPR_OR,
-  OPR_NOBINOPR
+    OPR_ADD, OPR_SUB, OPR_MUL, OPR_DIV, OPR_MOD, OPR_POW,
+    OPR_CONCAT,
+    OPR_EQ, OPR_LT, OPR_LE,
+    OPR_NE, OPR_GT, OPR_GE,
+    OPR_AND, OPR_OR,
+    OPR_NOBINOPR
 } BinOpr;
 
 
@@ -44,40 +44,40 @@ typedef enum UnOpr { OPR_MINUS, OPR_NOT, OPR_LEN, OPR_NOUNOPR } UnOpr;
 
 #define luaK_jumpto(fs,t) luaK_patchlist(fs, luaK_jump(fs), t)
 
-LUAI_FUNC int luaK_codeABx (FuncState *fs, OpCode o, int A, unsigned int Bx);
-LUAI_FUNC int luaK_codeABC (FuncState *fs, OpCode o, int A, int B, int C);
-LUAI_FUNC int luaK_codek (FuncState *fs, int reg, int k);
-LUAI_FUNC void luaK_fixline (FuncState *fs, int line);
-LUAI_FUNC void luaK_nil (FuncState *fs, int from, int n);
-LUAI_FUNC void luaK_reserveregs (FuncState *fs, int n);
-LUAI_FUNC void luaK_checkstack (FuncState *fs, int n);
-LUAI_FUNC int luaK_stringK (FuncState *fs, TString *s);
-LUAI_FUNC int luaK_numberK (FuncState *fs, lua_Number r);
-LUAI_FUNC void luaK_dischargevars (FuncState *fs, expdesc *e);
-LUAI_FUNC int luaK_exp2anyreg (FuncState *fs, expdesc *e);
-LUAI_FUNC void luaK_exp2anyregup (FuncState *fs, expdesc *e);
-LUAI_FUNC void luaK_exp2nextreg (FuncState *fs, expdesc *e);
-LUAI_FUNC void luaK_exp2val (FuncState *fs, expdesc *e);
-LUAI_FUNC int luaK_exp2RK (FuncState *fs, expdesc *e);
-LUAI_FUNC void luaK_self (FuncState *fs, expdesc *e, expdesc *key);
-LUAI_FUNC void luaK_indexed (FuncState *fs, expdesc *t, expdesc *k);
-LUAI_FUNC void luaK_goiftrue (FuncState *fs, expdesc *e);
-LUAI_FUNC void luaK_goiffalse (FuncState *fs, expdesc *e);
-LUAI_FUNC void luaK_storevar (FuncState *fs, expdesc *var, expdesc *e);
-LUAI_FUNC void luaK_setreturns (FuncState *fs, expdesc *e, int nresults);
-LUAI_FUNC void luaK_setoneret (FuncState *fs, expdesc *e);
-LUAI_FUNC int luaK_jump (FuncState *fs);
-LUAI_FUNC void luaK_ret (FuncState *fs, int first, int nret);
-LUAI_FUNC void luaK_patchlist (FuncState *fs, int list, int target);
-LUAI_FUNC void luaK_patchtohere (FuncState *fs, int list);
-LUAI_FUNC void luaK_patchclose (FuncState *fs, int list, int level);
-LUAI_FUNC void luaK_concat (FuncState *fs, int *l1, int l2);
-LUAI_FUNC int luaK_getlabel (FuncState *fs);
-LUAI_FUNC void luaK_prefix (FuncState *fs, UnOpr op, expdesc *v, int line);
-LUAI_FUNC void luaK_infix (FuncState *fs, BinOpr op, expdesc *v);
-LUAI_FUNC void luaK_posfix (FuncState *fs, BinOpr op, expdesc *v1,
-                            expdesc *v2, int line);
-LUAI_FUNC void luaK_setlist (FuncState *fs, int base, int nelems, int tostore);
+LUAI_FUNC int luaK_codeABx(FuncState *fs, OpCode o, int A, unsigned int Bx);
+LUAI_FUNC int luaK_codeABC(FuncState *fs, OpCode o, int A, int B, int C);
+LUAI_FUNC int luaK_codek(FuncState *fs, int reg, int k);
+LUAI_FUNC void luaK_fixline(FuncState *fs, int line);
+LUAI_FUNC void luaK_nil(FuncState *fs, int from, int n);
+LUAI_FUNC void luaK_reserveregs(FuncState *fs, int n);
+LUAI_FUNC void luaK_checkstack(FuncState *fs, int n);
+LUAI_FUNC int luaK_stringK(FuncState *fs, TString *s);
+LUAI_FUNC int luaK_numberK(FuncState *fs, lua_Number r);
+LUAI_FUNC void luaK_dischargevars(FuncState *fs, expdesc *e);
+LUAI_FUNC int luaK_exp2anyreg(FuncState *fs, expdesc *e);
+LUAI_FUNC void luaK_exp2anyregup(FuncState *fs, expdesc *e);
+LUAI_FUNC void luaK_exp2nextreg(FuncState *fs, expdesc *e);
+LUAI_FUNC void luaK_exp2val(FuncState *fs, expdesc *e);
+LUAI_FUNC int luaK_exp2RK(FuncState *fs, expdesc *e);
+LUAI_FUNC void luaK_self(FuncState *fs, expdesc *e, expdesc *key);
+LUAI_FUNC void luaK_indexed(FuncState *fs, expdesc *t, expdesc *k);
+LUAI_FUNC void luaK_goiftrue(FuncState *fs, expdesc *e);
+LUAI_FUNC void luaK_goiffalse(FuncState *fs, expdesc *e);
+LUAI_FUNC void luaK_storevar(FuncState *fs, expdesc *var, expdesc *e);
+LUAI_FUNC void luaK_setreturns(FuncState *fs, expdesc *e, int nresults);
+LUAI_FUNC void luaK_setoneret(FuncState *fs, expdesc *e);
+LUAI_FUNC int luaK_jump(FuncState *fs);
+LUAI_FUNC void luaK_ret(FuncState *fs, int first, int nret);
+LUAI_FUNC void luaK_patchlist(FuncState *fs, int list, int target);
+LUAI_FUNC void luaK_patchtohere(FuncState *fs, int list);
+LUAI_FUNC void luaK_patchclose(FuncState *fs, int list, int level);
+LUAI_FUNC void luaK_concat(FuncState *fs, int *l1, int l2);
+LUAI_FUNC int luaK_getlabel(FuncState *fs);
+LUAI_FUNC void luaK_prefix(FuncState *fs, UnOpr op, expdesc *v, int line);
+LUAI_FUNC void luaK_infix(FuncState *fs, BinOpr op, expdesc *v);
+LUAI_FUNC void luaK_posfix(FuncState *fs, BinOpr op, expdesc *v1,
+                           expdesc *v2, int line);
+LUAI_FUNC void luaK_setlist(FuncState *fs, int base, int nelems, int tostore);
 
 
 #endif
diff --git a/liblua/lcorolib.c b/liblua/lcorolib.c
index 1326c8146..2f7f5fc92 100644
--- a/liblua/lcorolib.c
+++ b/liblua/lcorolib.c
@@ -17,139 +17,146 @@
 #include "lualib.h"
 
 
-static int auxresume (lua_State *L, lua_State *co, int narg) {
-  int status;
-  if (!lua_checkstack(co, narg)) {
-    lua_pushliteral(L, "too many arguments to resume");
-    return -1;  /* error flag */
-  }
-  if (lua_status(co) == LUA_OK && lua_gettop(co) == 0) {
-    lua_pushliteral(L, "cannot resume dead coroutine");
-    return -1;  /* error flag */
-  }
-  lua_xmove(L, co, narg);
-  status = lua_resume(co, L, narg);
-  if (status == LUA_OK || status == LUA_YIELD) {
-    int nres = lua_gettop(co);
-    if (!lua_checkstack(L, nres + 1)) {
-      lua_pop(co, nres);  /* remove results anyway */
-      lua_pushliteral(L, "too many results to resume");
-      return -1;  /* error flag */
+static int auxresume(lua_State *L, lua_State *co, int narg)
+{
+    int status;
+    if (!lua_checkstack(co, narg)) {
+        lua_pushliteral(L, "too many arguments to resume");
+        return -1;  /* error flag */
     }
-    lua_xmove(co, L, nres);  /* move yielded values */
-    return nres;
-  }
-  else {
-    lua_xmove(co, L, 1);  /* move error message */
-    return -1;  /* error flag */
-  }
-}
-
-
-static int luaB_coresume (lua_State *L) {
-  lua_State *co = lua_tothread(L, 1);
-  int r;
-  luaL_argcheck(L, co, 1, "coroutine expected");
-  r = auxresume(L, co, lua_gettop(L) - 1);
-  if (r < 0) {
-    lua_pushboolean(L, 0);
-    lua_insert(L, -2);
-    return 2;  /* return false + error message */
-  }
-  else {
-    lua_pushboolean(L, 1);
-    lua_insert(L, -(r + 1));
-    return r + 1;  /* return true + `resume' returns */
-  }
-}
-
-
-static int luaB_auxwrap (lua_State *L) {
-  lua_State *co = lua_tothread(L, lua_upvalueindex(1));
-  int r = auxresume(L, co, lua_gettop(L));
-  if (r < 0) {
-    if (lua_isstring(L, -1)) {  /* error object is a string? */
-      luaL_where(L, 1);  /* add extra info */
-      lua_insert(L, -2);
-      lua_concat(L, 2);
+    if (lua_status(co) == LUA_OK && lua_gettop(co) == 0) {
+        lua_pushliteral(L, "cannot resume dead coroutine");
+        return -1;  /* error flag */
     }
-    return lua_error(L);  /* propagate error */
-  }
-  return r;
-}
-
-
-static int luaB_cocreate (lua_State *L) {
-  lua_State *NL;
-  luaL_checktype(L, 1, LUA_TFUNCTION);
-  NL = lua_newthread(L);
-  lua_pushvalue(L, 1);  /* move function to top */
-  lua_xmove(L, NL, 1);  /* move function from L to NL */
-  return 1;
-}
-
-
-static int luaB_cowrap (lua_State *L) {
-  luaB_cocreate(L);
-  lua_pushcclosure(L, luaB_auxwrap, 1);
-  return 1;
-}
-
-
-static int luaB_yield (lua_State *L) {
-  return lua_yield(L, lua_gettop(L));
-}
-
-
-static int luaB_costatus (lua_State *L) {
-  lua_State *co = lua_tothread(L, 1);
-  luaL_argcheck(L, co, 1, "coroutine expected");
-  if (L == co) lua_pushliteral(L, "running");
-  else {
-    switch (lua_status(co)) {
-      case LUA_YIELD:
-        lua_pushliteral(L, "suspended");
-        break;
-      case LUA_OK: {
-        lua_Debug ar;
-        if (lua_getstack(co, 0, &ar) > 0)  /* does it have frames? */
-          lua_pushliteral(L, "normal");  /* it is running */
-        else if (lua_gettop(co) == 0)
-            lua_pushliteral(L, "dead");
-        else
-          lua_pushliteral(L, "suspended");  /* initial state */
-        break;
-      }
-      default:  /* some error occurred */
-        lua_pushliteral(L, "dead");
-        break;
+    lua_xmove(L, co, narg);
+    status = lua_resume(co, L, narg);
+    if (status == LUA_OK || status == LUA_YIELD) {
+        int nres = lua_gettop(co);
+        if (!lua_checkstack(L, nres + 1)) {
+            lua_pop(co, nres);  /* remove results anyway */
+            lua_pushliteral(L, "too many results to resume");
+            return -1;  /* error flag */
+        }
+        lua_xmove(co, L, nres);  /* move yielded values */
+        return nres;
+    } else {
+        lua_xmove(co, L, 1);  /* move error message */
+        return -1;  /* error flag */
     }
-  }
-  return 1;
 }
 
 
-static int luaB_corunning (lua_State *L) {
-  int ismain = lua_pushthread(L);
-  lua_pushboolean(L, ismain);
-  return 2;
+static int luaB_coresume(lua_State *L)
+{
+    lua_State *co = lua_tothread(L, 1);
+    int r;
+    luaL_argcheck(L, co, 1, "coroutine expected");
+    r = auxresume(L, co, lua_gettop(L) - 1);
+    if (r < 0) {
+        lua_pushboolean(L, 0);
+        lua_insert(L, -2);
+        return 2;  /* return false + error message */
+    } else {
+        lua_pushboolean(L, 1);
+        lua_insert(L, -(r + 1));
+        return r + 1;  /* return true + `resume' returns */
+    }
+}
+
+
+static int luaB_auxwrap(lua_State *L)
+{
+    lua_State *co = lua_tothread(L, lua_upvalueindex(1));
+    int r = auxresume(L, co, lua_gettop(L));
+    if (r < 0) {
+        if (lua_isstring(L, -1)) {  /* error object is a string? */
+            luaL_where(L, 1);  /* add extra info */
+            lua_insert(L, -2);
+            lua_concat(L, 2);
+        }
+        return lua_error(L);  /* propagate error */
+    }
+    return r;
+}
+
+
+static int luaB_cocreate(lua_State *L)
+{
+    lua_State *NL;
+    luaL_checktype(L, 1, LUA_TFUNCTION);
+    NL = lua_newthread(L);
+    lua_pushvalue(L, 1);  /* move function to top */
+    lua_xmove(L, NL, 1);  /* move function from L to NL */
+    return 1;
+}
+
+
+static int luaB_cowrap(lua_State *L)
+{
+    luaB_cocreate(L);
+    lua_pushcclosure(L, luaB_auxwrap, 1);
+    return 1;
+}
+
+
+static int luaB_yield(lua_State *L)
+{
+    return lua_yield(L, lua_gettop(L));
+}
+
+
+static int luaB_costatus(lua_State *L)
+{
+    lua_State *co = lua_tothread(L, 1);
+    luaL_argcheck(L, co, 1, "coroutine expected");
+    if (L == co) lua_pushliteral(L, "running");
+    else {
+        switch (lua_status(co)) {
+            case LUA_YIELD:
+                lua_pushliteral(L, "suspended");
+                break;
+            case LUA_OK: {
+                lua_Debug ar;
+                if (lua_getstack(co, 0, &ar) > 0)  /* does it have frames? */
+                    lua_pushliteral(L, "normal");  /* it is running */
+                else if (lua_gettop(co) == 0)
+                    lua_pushliteral(L, "dead");
+                else
+                    lua_pushliteral(L, "suspended");  /* initial state */
+                break;
+            }
+            default:  /* some error occurred */
+                lua_pushliteral(L, "dead");
+                break;
+        }
+    }
+    return 1;
+}
+
+
+static int luaB_corunning(lua_State *L)
+{
+    int ismain = lua_pushthread(L);
+    lua_pushboolean(L, ismain);
+    return 2;
 }
 
 
 static const luaL_Reg co_funcs[] = {
-  {"create", luaB_cocreate},
-  {"resume", luaB_coresume},
-  {"running", luaB_corunning},
-  {"status", luaB_costatus},
-  {"wrap", luaB_cowrap},
-  {"yield", luaB_yield},
-  {NULL, NULL}
+    {"create", luaB_cocreate},
+    {"resume", luaB_coresume},
+    {"running", luaB_corunning},
+    {"status", luaB_costatus},
+    {"wrap", luaB_cowrap},
+    {"yield", luaB_yield},
+    {NULL, NULL}
 };
 
 
 
-LUAMOD_API int luaopen_coroutine (lua_State *L) {
-  luaL_newlib(L, co_funcs);
-  return 1;
+LUAMOD_API int luaopen_coroutine(lua_State *L)
+{
+    luaL_newlib(L, co_funcs);
+    return 1;
 }
 
diff --git a/liblua/lctype.c b/liblua/lctype.c
index 2afccf0bb..df2c3ede3 100644
--- a/liblua/lctype.c
+++ b/liblua/lctype.c
@@ -14,39 +14,39 @@
 #include <limits.h>
 
 LUAI_DDEF const lu_byte luai_ctype_[UCHAR_MAX + 2] = {
-  0x00,  /* EOZ */
-  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,    /* 0. */
-  0x00,  0x08,  0x08,  0x08,  0x08,  0x08,  0x00,  0x00,
-  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,    /* 1. */
-  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
-  0x0c,  0x04,  0x04,  0x04,  0x04,  0x04,  0x04,  0x04,    /* 2. */
-  0x04,  0x04,  0x04,  0x04,  0x04,  0x04,  0x04,  0x04,
-  0x16,  0x16,  0x16,  0x16,  0x16,  0x16,  0x16,  0x16,    /* 3. */
-  0x16,  0x16,  0x04,  0x04,  0x04,  0x04,  0x04,  0x04,
-  0x04,  0x15,  0x15,  0x15,  0x15,  0x15,  0x15,  0x05,    /* 4. */
-  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,
-  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,    /* 5. */
-  0x05,  0x05,  0x05,  0x04,  0x04,  0x04,  0x04,  0x05,
-  0x04,  0x15,  0x15,  0x15,  0x15,  0x15,  0x15,  0x05,    /* 6. */
-  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,
-  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,    /* 7. */
-  0x05,  0x05,  0x05,  0x04,  0x04,  0x04,  0x04,  0x00,
-  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,    /* 8. */
-  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
-  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,    /* 9. */
-  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
-  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,    /* a. */
-  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
-  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,    /* b. */
-  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
-  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,    /* c. */
-  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
-  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,    /* d. */
-  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
-  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,    /* e. */
-  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
-  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,    /* f. */
-  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
+    0x00,  /* EOZ */
+    0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,    /* 0. */
+    0x00,  0x08,  0x08,  0x08,  0x08,  0x08,  0x00,  0x00,
+    0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,    /* 1. */
+    0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
+    0x0c,  0x04,  0x04,  0x04,  0x04,  0x04,  0x04,  0x04,    /* 2. */
+    0x04,  0x04,  0x04,  0x04,  0x04,  0x04,  0x04,  0x04,
+    0x16,  0x16,  0x16,  0x16,  0x16,  0x16,  0x16,  0x16,    /* 3. */
+    0x16,  0x16,  0x04,  0x04,  0x04,  0x04,  0x04,  0x04,
+    0x04,  0x15,  0x15,  0x15,  0x15,  0x15,  0x15,  0x05,    /* 4. */
+    0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,
+    0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,    /* 5. */
+    0x05,  0x05,  0x05,  0x04,  0x04,  0x04,  0x04,  0x05,
+    0x04,  0x15,  0x15,  0x15,  0x15,  0x15,  0x15,  0x05,    /* 6. */
+    0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,
+    0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,    /* 7. */
+    0x05,  0x05,  0x05,  0x04,  0x04,  0x04,  0x04,  0x00,
+    0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,    /* 8. */
+    0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
+    0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,    /* 9. */
+    0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
+    0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,    /* a. */
+    0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
+    0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,    /* b. */
+    0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
+    0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,    /* c. */
+    0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
+    0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,    /* d. */
+    0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
+    0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,    /* e. */
+    0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
+    0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,    /* f. */
+    0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
 };
 
 #endif             /* } */
diff --git a/liblua/ldblib.c b/liblua/ldblib.c
index 65d2c971e..f31815876 100644
--- a/liblua/ldblib.c
+++ b/liblua/ldblib.c
@@ -22,377 +22,402 @@
 
 
 
-static int db_getregistry (lua_State *L) {
-  lua_pushvalue(L, LUA_REGISTRYINDEX);
-  return 1;
-}
-
-
-static int db_getmetatable (lua_State *L) {
-  luaL_checkany(L, 1);
-  if (!lua_getmetatable(L, 1)) {
-    lua_pushnil(L);  /* no metatable */
-  }
-  return 1;
-}
-
-
-static int db_setmetatable (lua_State *L) {
-  int t = lua_type(L, 2);
-  luaL_argcheck(L, t == LUA_TNIL || t == LUA_TTABLE, 2,
-                    "nil or table expected");
-  lua_settop(L, 2);
-  lua_setmetatable(L, 1);
-  return 1;  /* return 1st argument */
-}
-
-
-static int db_getuservalue (lua_State *L) {
-  if (lua_type(L, 1) != LUA_TUSERDATA)
-    lua_pushnil(L);
-  else
-    lua_getuservalue(L, 1);
-  return 1;
-}
-
-
-static int db_setuservalue (lua_State *L) {
-  if (lua_type(L, 1) == LUA_TLIGHTUSERDATA)
-    luaL_argerror(L, 1, "full userdata expected, got light userdata");
-  luaL_checktype(L, 1, LUA_TUSERDATA);
-  if (!lua_isnoneornil(L, 2))
-    luaL_checktype(L, 2, LUA_TTABLE);
-  lua_settop(L, 2);
-  lua_setuservalue(L, 1);
-  return 1;
-}
-
-
-static void settabss (lua_State *L, const char *i, const char *v) {
-  lua_pushstring(L, v);
-  lua_setfield(L, -2, i);
-}
-
-
-static void settabsi (lua_State *L, const char *i, int v) {
-  lua_pushinteger(L, v);
-  lua_setfield(L, -2, i);
-}
-
-
-static void settabsb (lua_State *L, const char *i, int v) {
-  lua_pushboolean(L, v);
-  lua_setfield(L, -2, i);
-}
-
-
-static lua_State *getthread (lua_State *L, int *arg) {
-  if (lua_isthread(L, 1)) {
-    *arg = 1;
-    return lua_tothread(L, 1);
-  }
-  else {
-    *arg = 0;
-    return L;
-  }
-}
-
-
-static void treatstackoption (lua_State *L, lua_State *L1, const char *fname) {
-  if (L == L1) {
-    lua_pushvalue(L, -2);
-    lua_remove(L, -3);
-  }
-  else
-    lua_xmove(L1, L, 1);
-  lua_setfield(L, -2, fname);
-}
-
-
-static int db_getinfo (lua_State *L) {
-  lua_Debug ar;
-  int arg;
-  lua_State *L1 = getthread(L, &arg);
-  const char *options = luaL_optstring(L, arg+2, "flnStu");
-  if (lua_isnumber(L, arg+1)) {
-    if (!lua_getstack(L1, (int)lua_tointeger(L, arg+1), &ar)) {
-      lua_pushnil(L);  /* level out of range */
-      return 1;
-    }
-  }
-  else if (lua_isfunction(L, arg+1)) {
-    lua_pushfstring(L, ">%s", options);
-    options = lua_tostring(L, -1);
-    lua_pushvalue(L, arg+1);
-    lua_xmove(L, L1, 1);
-  }
-  else
-    return luaL_argerror(L, arg+1, "function or level expected");
-  if (!lua_getinfo(L1, options, &ar))
-    return luaL_argerror(L, arg+2, "invalid option");
-  lua_createtable(L, 0, 2);
-  if (strchr(options, 'S')) {
-    settabss(L, "source", ar.source);
-    settabss(L, "short_src", ar.short_src);
-    settabsi(L, "linedefined", ar.linedefined);
-    settabsi(L, "lastlinedefined", ar.lastlinedefined);
-    settabss(L, "what", ar.what);
-  }
-  if (strchr(options, 'l'))
-    settabsi(L, "currentline", ar.currentline);
-  if (strchr(options, 'u')) {
-    settabsi(L, "nups", ar.nups);
-    settabsi(L, "nparams", ar.nparams);
-    settabsb(L, "isvararg", ar.isvararg);
-  }
-  if (strchr(options, 'n')) {
-    settabss(L, "name", ar.name);
-    settabss(L, "namewhat", ar.namewhat);
-  }
-  if (strchr(options, 't'))
-    settabsb(L, "istailcall", ar.istailcall);
-  if (strchr(options, 'L'))
-    treatstackoption(L, L1, "activelines");
-  if (strchr(options, 'f'))
-    treatstackoption(L, L1, "func");
-  return 1;  /* return table */
-}
-
-
-static int db_getlocal (lua_State *L) {
-  int arg;
-  lua_State *L1 = getthread(L, &arg);
-  lua_Debug ar;
-  const char *name;
-  int nvar = luaL_checkint(L, arg+2);  /* local-variable index */
-  if (lua_isfunction(L, arg + 1)) {  /* function argument? */
-    lua_pushvalue(L, arg + 1);  /* push function */
-    lua_pushstring(L, lua_getlocal(L, NULL, nvar));  /* push local name */
+static int db_getregistry(lua_State *L)
+{
+    lua_pushvalue(L, LUA_REGISTRYINDEX);
     return 1;
-  }
-  else {  /* stack-level argument */
-    if (!lua_getstack(L1, luaL_checkint(L, arg+1), &ar))  /* out of range? */
-      return luaL_argerror(L, arg+1, "level out of range");
-    name = lua_getlocal(L1, &ar, nvar);
-    if (name) {
-      lua_xmove(L1, L, 1);  /* push local value */
-      lua_pushstring(L, name);  /* push name */
-      lua_pushvalue(L, -2);  /* re-order */
-      return 2;
+}
+
+
+static int db_getmetatable(lua_State *L)
+{
+    luaL_checkany(L, 1);
+    if (!lua_getmetatable(L, 1)) {
+        lua_pushnil(L);  /* no metatable */
     }
-    else {
-      lua_pushnil(L);  /* no name (nor value) */
-      return 1;
+    return 1;
+}
+
+
+static int db_setmetatable(lua_State *L)
+{
+    int t = lua_type(L, 2);
+    luaL_argcheck(L, t == LUA_TNIL || t == LUA_TTABLE, 2,
+                  "nil or table expected");
+    lua_settop(L, 2);
+    lua_setmetatable(L, 1);
+    return 1;  /* return 1st argument */
+}
+
+
+static int db_getuservalue(lua_State *L)
+{
+    if (lua_type(L, 1) != LUA_TUSERDATA)
+        lua_pushnil(L);
+    else
+        lua_getuservalue(L, 1);
+    return 1;
+}
+
+
+static int db_setuservalue(lua_State *L)
+{
+    if (lua_type(L, 1) == LUA_TLIGHTUSERDATA)
+        luaL_argerror(L, 1, "full userdata expected, got light userdata");
+    luaL_checktype(L, 1, LUA_TUSERDATA);
+    if (!lua_isnoneornil(L, 2))
+        luaL_checktype(L, 2, LUA_TTABLE);
+    lua_settop(L, 2);
+    lua_setuservalue(L, 1);
+    return 1;
+}
+
+
+static void settabss(lua_State *L, const char *i, const char *v)
+{
+    lua_pushstring(L, v);
+    lua_setfield(L, -2, i);
+}
+
+
+static void settabsi(lua_State *L, const char *i, int v)
+{
+    lua_pushinteger(L, v);
+    lua_setfield(L, -2, i);
+}
+
+
+static void settabsb(lua_State *L, const char *i, int v)
+{
+    lua_pushboolean(L, v);
+    lua_setfield(L, -2, i);
+}
+
+
+static lua_State *getthread(lua_State *L, int *arg)
+{
+    if (lua_isthread(L, 1)) {
+        *arg = 1;
+        return lua_tothread(L, 1);
+    } else {
+        *arg = 0;
+        return L;
     }
-  }
 }
 
 
-static int db_setlocal (lua_State *L) {
-  int arg;
-  lua_State *L1 = getthread(L, &arg);
-  lua_Debug ar;
-  if (!lua_getstack(L1, luaL_checkint(L, arg+1), &ar))  /* out of range? */
-    return luaL_argerror(L, arg+1, "level out of range");
-  luaL_checkany(L, arg+3);
-  lua_settop(L, arg+3);
-  lua_xmove(L, L1, 1);
-  lua_pushstring(L, lua_setlocal(L1, &ar, luaL_checkint(L, arg+2)));
-  return 1;
+static void treatstackoption(lua_State *L, lua_State *L1, const char *fname)
+{
+    if (L == L1) {
+        lua_pushvalue(L, -2);
+        lua_remove(L, -3);
+    } else
+        lua_xmove(L1, L, 1);
+    lua_setfield(L, -2, fname);
 }
 
 
-static int auxupvalue (lua_State *L, int get) {
-  const char *name;
-  int n = luaL_checkint(L, 2);
-  luaL_checktype(L, 1, LUA_TFUNCTION);
-  name = get ? lua_getupvalue(L, 1, n) : lua_setupvalue(L, 1, n);
-  if (name == NULL) return 0;
-  lua_pushstring(L, name);
-  lua_insert(L, -(get+1));
-  return get + 1;
+static int db_getinfo(lua_State *L)
+{
+    lua_Debug ar;
+    int arg;
+    lua_State *L1 = getthread(L, &arg);
+    const char *options = luaL_optstring(L, arg + 2, "flnStu");
+    if (lua_isnumber(L, arg + 1)) {
+        if (!lua_getstack(L1, (int)lua_tointeger(L, arg + 1), &ar)) {
+            lua_pushnil(L);  /* level out of range */
+            return 1;
+        }
+    } else if (lua_isfunction(L, arg + 1)) {
+        lua_pushfstring(L, ">%s", options);
+        options = lua_tostring(L, -1);
+        lua_pushvalue(L, arg + 1);
+        lua_xmove(L, L1, 1);
+    } else
+        return luaL_argerror(L, arg + 1, "function or level expected");
+    if (!lua_getinfo(L1, options, &ar))
+        return luaL_argerror(L, arg + 2, "invalid option");
+    lua_createtable(L, 0, 2);
+    if (strchr(options, 'S')) {
+        settabss(L, "source", ar.source);
+        settabss(L, "short_src", ar.short_src);
+        settabsi(L, "linedefined", ar.linedefined);
+        settabsi(L, "lastlinedefined", ar.lastlinedefined);
+        settabss(L, "what", ar.what);
+    }
+    if (strchr(options, 'l'))
+        settabsi(L, "currentline", ar.currentline);
+    if (strchr(options, 'u')) {
+        settabsi(L, "nups", ar.nups);
+        settabsi(L, "nparams", ar.nparams);
+        settabsb(L, "isvararg", ar.isvararg);
+    }
+    if (strchr(options, 'n')) {
+        settabss(L, "name", ar.name);
+        settabss(L, "namewhat", ar.namewhat);
+    }
+    if (strchr(options, 't'))
+        settabsb(L, "istailcall", ar.istailcall);
+    if (strchr(options, 'L'))
+        treatstackoption(L, L1, "activelines");
+    if (strchr(options, 'f'))
+        treatstackoption(L, L1, "func");
+    return 1;  /* return table */
 }
 
 
-static int db_getupvalue (lua_State *L) {
-  return auxupvalue(L, 1);
+static int db_getlocal(lua_State *L)
+{
+    int arg;
+    lua_State *L1 = getthread(L, &arg);
+    lua_Debug ar;
+    const char *name;
+    int nvar = luaL_checkint(L, arg + 2); /* local-variable index */
+    if (lua_isfunction(L, arg + 1)) {  /* function argument? */
+        lua_pushvalue(L, arg + 1);  /* push function */
+        lua_pushstring(L, lua_getlocal(L, NULL, nvar));  /* push local name */
+        return 1;
+    } else { /* stack-level argument */
+        if (!lua_getstack(L1, luaL_checkint(L, arg + 1), &ar)) /* out of range? */
+            return luaL_argerror(L, arg + 1, "level out of range");
+        name = lua_getlocal(L1, &ar, nvar);
+        if (name) {
+            lua_xmove(L1, L, 1);  /* push local value */
+            lua_pushstring(L, name);  /* push name */
+            lua_pushvalue(L, -2);  /* re-order */
+            return 2;
+        } else {
+            lua_pushnil(L);  /* no name (nor value) */
+            return 1;
+        }
+    }
 }
 
 
-static int db_setupvalue (lua_State *L) {
-  luaL_checkany(L, 3);
-  return auxupvalue(L, 0);
+static int db_setlocal(lua_State *L)
+{
+    int arg;
+    lua_State *L1 = getthread(L, &arg);
+    lua_Debug ar;
+    if (!lua_getstack(L1, luaL_checkint(L, arg + 1), &ar)) /* out of range? */
+        return luaL_argerror(L, arg + 1, "level out of range");
+    luaL_checkany(L, arg + 3);
+    lua_settop(L, arg + 3);
+    lua_xmove(L, L1, 1);
+    lua_pushstring(L, lua_setlocal(L1, &ar, luaL_checkint(L, arg + 2)));
+    return 1;
 }
 
 
-static int checkupval (lua_State *L, int argf, int argnup) {
-  lua_Debug ar;
-  int nup = luaL_checkint(L, argnup);
-  luaL_checktype(L, argf, LUA_TFUNCTION);
-  lua_pushvalue(L, argf);
-  lua_getinfo(L, ">u", &ar);
-  luaL_argcheck(L, 1 <= nup && nup <= ar.nups, argnup, "invalid upvalue index");
-  return nup;
+static int auxupvalue(lua_State *L, int get)
+{
+    const char *name;
+    int n = luaL_checkint(L, 2);
+    luaL_checktype(L, 1, LUA_TFUNCTION);
+    name = get ? lua_getupvalue(L, 1, n) : lua_setupvalue(L, 1, n);
+    if (name == NULL) return 0;
+    lua_pushstring(L, name);
+    lua_insert(L, -(get + 1));
+    return get + 1;
 }
 
 
-static int db_upvalueid (lua_State *L) {
-  int n = checkupval(L, 1, 2);
-  lua_pushlightuserdata(L, lua_upvalueid(L, 1, n));
-  return 1;
+static int db_getupvalue(lua_State *L)
+{
+    return auxupvalue(L, 1);
 }
 
 
-static int db_upvaluejoin (lua_State *L) {
-  int n1 = checkupval(L, 1, 2);
-  int n2 = checkupval(L, 3, 4);
-  luaL_argcheck(L, !lua_iscfunction(L, 1), 1, "Lua function expected");
-  luaL_argcheck(L, !lua_iscfunction(L, 3), 3, "Lua function expected");
-  lua_upvaluejoin(L, 1, n1, 3, n2);
-  return 0;
+static int db_setupvalue(lua_State *L)
+{
+    luaL_checkany(L, 3);
+    return auxupvalue(L, 0);
+}
+
+
+static int checkupval(lua_State *L, int argf, int argnup)
+{
+    lua_Debug ar;
+    int nup = luaL_checkint(L, argnup);
+    luaL_checktype(L, argf, LUA_TFUNCTION);
+    lua_pushvalue(L, argf);
+    lua_getinfo(L, ">u", &ar);
+    luaL_argcheck(L, 1 <= nup && nup <= ar.nups, argnup, "invalid upvalue index");
+    return nup;
+}
+
+
+static int db_upvalueid(lua_State *L)
+{
+    int n = checkupval(L, 1, 2);
+    lua_pushlightuserdata(L, lua_upvalueid(L, 1, n));
+    return 1;
+}
+
+
+static int db_upvaluejoin(lua_State *L)
+{
+    int n1 = checkupval(L, 1, 2);
+    int n2 = checkupval(L, 3, 4);
+    luaL_argcheck(L, !lua_iscfunction(L, 1), 1, "Lua function expected");
+    luaL_argcheck(L, !lua_iscfunction(L, 3), 3, "Lua function expected");
+    lua_upvaluejoin(L, 1, n1, 3, n2);
+    return 0;
 }
 
 
 #define gethooktable(L) luaL_getsubtable(L, LUA_REGISTRYINDEX, HOOKKEY)
 
 
-static void hookf (lua_State *L, lua_Debug *ar) {
-  static const char *const hooknames[] =
+static void hookf(lua_State *L, lua_Debug *ar)
+{
+    static const char *const hooknames[] =
     {"call", "return", "line", "count", "tail call"};
-  gethooktable(L);
-  lua_pushthread(L);
-  lua_rawget(L, -2);
-  if (lua_isfunction(L, -1)) {
-    lua_pushstring(L, hooknames[(int)ar->event]);
-    if (ar->currentline >= 0)
-      lua_pushinteger(L, ar->currentline);
-    else lua_pushnil(L);
-    lua_assert(lua_getinfo(L, "lS", ar));
-    lua_call(L, 2, 0);
-  }
-}
-
-
-static int makemask (const char *smask, int count) {
-  int mask = 0;
-  if (strchr(smask, 'c')) mask |= LUA_MASKCALL;
-  if (strchr(smask, 'r')) mask |= LUA_MASKRET;
-  if (strchr(smask, 'l')) mask |= LUA_MASKLINE;
-  if (count > 0) mask |= LUA_MASKCOUNT;
-  return mask;
-}
-
-
-static char *unmakemask (int mask, char *smask) {
-  int i = 0;
-  if (mask & LUA_MASKCALL) smask[i++] = 'c';
-  if (mask & LUA_MASKRET) smask[i++] = 'r';
-  if (mask & LUA_MASKLINE) smask[i++] = 'l';
-  smask[i] = '\0';
-  return smask;
-}
-
-
-static int db_sethook (lua_State *L) {
-  int arg, mask, count;
-  lua_Hook func;
-  lua_State *L1 = getthread(L, &arg);
-  if (lua_isnoneornil(L, arg+1)) {
-    lua_settop(L, arg+1);
-    func = NULL; mask = 0; count = 0;  /* turn off hooks */
-  }
-  else {
-    const char *smask = luaL_checkstring(L, arg+2);
-    luaL_checktype(L, arg+1, LUA_TFUNCTION);
-    count = luaL_optint(L, arg+3, 0);
-    func = hookf; mask = makemask(smask, count);
-  }
-  if (gethooktable(L) == 0) {  /* creating hook table? */
-    lua_pushstring(L, "k");
-    lua_setfield(L, -2, "__mode");  /** hooktable.__mode = "k" */
-    lua_pushvalue(L, -1);
-    lua_setmetatable(L, -2);  /* setmetatable(hooktable) = hooktable */
-  }
-  lua_pushthread(L1); lua_xmove(L1, L, 1);
-  lua_pushvalue(L, arg+1);
-  lua_rawset(L, -3);  /* set new hook */
-  lua_sethook(L1, func, mask, count);  /* set hooks */
-  return 0;
-}
-
-
-static int db_gethook (lua_State *L) {
-  int arg;
-  lua_State *L1 = getthread(L, &arg);
-  char buff[5];
-  int mask = lua_gethookmask(L1);
-  lua_Hook hook = lua_gethook(L1);
-  if (hook != NULL && hook != hookf)  /* external hook? */
-    lua_pushliteral(L, "external hook");
-  else {
     gethooktable(L);
-    lua_pushthread(L1); lua_xmove(L1, L, 1);
-    lua_rawget(L, -2);   /* get hook */
-    lua_remove(L, -2);  /* remove hook table */
-  }
-  lua_pushstring(L, unmakemask(mask, buff));
-  lua_pushinteger(L, lua_gethookcount(L1));
-  return 3;
+    lua_pushthread(L);
+    lua_rawget(L, -2);
+    if (lua_isfunction(L, -1)) {
+        lua_pushstring(L, hooknames[(int)ar->event]);
+        if (ar->currentline >= 0)
+            lua_pushinteger(L, ar->currentline);
+        else lua_pushnil(L);
+        lua_assert(lua_getinfo(L, "lS", ar));
+        lua_call(L, 2, 0);
+    }
 }
 
 
-static int db_debug (lua_State *L) {
-  for (;;) {
-    char buffer[250];
-    luai_writestringerror("%s", "lua_debug> ");
-    if (fgets(buffer, sizeof(buffer), stdin) == 0 ||
-        strcmp(buffer, "cont\n") == 0)
-      return 0;
-    if (luaL_loadbuffer(L, buffer, strlen(buffer), "=(debug command)") ||
-        lua_pcall(L, 0, 0, 0))
-      luai_writestringerror("%s\n", lua_tostring(L, -1));
-    lua_settop(L, 0);  /* remove eventual returns */
-  }
+static int makemask(const char *smask, int count)
+{
+    int mask = 0;
+    if (strchr(smask, 'c')) mask |= LUA_MASKCALL;
+    if (strchr(smask, 'r')) mask |= LUA_MASKRET;
+    if (strchr(smask, 'l')) mask |= LUA_MASKLINE;
+    if (count > 0) mask |= LUA_MASKCOUNT;
+    return mask;
 }
 
 
-static int db_traceback (lua_State *L) {
-  int arg;
-  lua_State *L1 = getthread(L, &arg);
-  const char *msg = lua_tostring(L, arg + 1);
-  if (msg == NULL && !lua_isnoneornil(L, arg + 1))  /* non-string 'msg'? */
-    lua_pushvalue(L, arg + 1);  /* return it untouched */
-  else {
-    int level = luaL_optint(L, arg + 2, (L == L1) ? 1 : 0);
-    luaL_traceback(L, L1, msg, level);
-  }
-  return 1;
+static char *unmakemask(int mask, char *smask)
+{
+    int i = 0;
+    if (mask & LUA_MASKCALL) smask[i++] = 'c';
+    if (mask & LUA_MASKRET) smask[i++] = 'r';
+    if (mask & LUA_MASKLINE) smask[i++] = 'l';
+    smask[i] = '\0';
+    return smask;
+}
+
+
+static int db_sethook(lua_State *L)
+{
+    int arg, mask, count;
+    lua_Hook func;
+    lua_State *L1 = getthread(L, &arg);
+    if (lua_isnoneornil(L, arg + 1)) {
+        lua_settop(L, arg + 1);
+        func = NULL;
+        mask = 0;
+        count = 0;  /* turn off hooks */
+    } else {
+        const char *smask = luaL_checkstring(L, arg + 2);
+        luaL_checktype(L, arg + 1, LUA_TFUNCTION);
+        count = luaL_optint(L, arg + 3, 0);
+        func = hookf;
+        mask = makemask(smask, count);
+    }
+    if (gethooktable(L) == 0) {  /* creating hook table? */
+        lua_pushstring(L, "k");
+        lua_setfield(L, -2, "__mode");  /** hooktable.__mode = "k" */
+        lua_pushvalue(L, -1);
+        lua_setmetatable(L, -2);  /* setmetatable(hooktable) = hooktable */
+    }
+    lua_pushthread(L1);
+    lua_xmove(L1, L, 1);
+    lua_pushvalue(L, arg + 1);
+    lua_rawset(L, -3);  /* set new hook */
+    lua_sethook(L1, func, mask, count);  /* set hooks */
+    return 0;
+}
+
+
+static int db_gethook(lua_State *L)
+{
+    int arg;
+    lua_State *L1 = getthread(L, &arg);
+    char buff[5];
+    int mask = lua_gethookmask(L1);
+    lua_Hook hook = lua_gethook(L1);
+    if (hook != NULL && hook != hookf)  /* external hook? */
+        lua_pushliteral(L, "external hook");
+    else {
+        gethooktable(L);
+        lua_pushthread(L1);
+        lua_xmove(L1, L, 1);
+        lua_rawget(L, -2);   /* get hook */
+        lua_remove(L, -2);  /* remove hook table */
+    }
+    lua_pushstring(L, unmakemask(mask, buff));
+    lua_pushinteger(L, lua_gethookcount(L1));
+    return 3;
+}
+
+
+static int db_debug(lua_State *L)
+{
+    for (;;) {
+        char buffer[250];
+        luai_writestringerror("%s", "lua_debug> ");
+        if (fgets(buffer, sizeof(buffer), stdin) == 0 ||
+            strcmp(buffer, "cont\n") == 0)
+            return 0;
+        if (luaL_loadbuffer(L, buffer, strlen(buffer), "=(debug command)") ||
+            lua_pcall(L, 0, 0, 0))
+            luai_writestringerror("%s\n", lua_tostring(L, -1));
+        lua_settop(L, 0);  /* remove eventual returns */
+    }
+}
+
+
+static int db_traceback(lua_State *L)
+{
+    int arg;
+    lua_State *L1 = getthread(L, &arg);
+    const char *msg = lua_tostring(L, arg + 1);
+    if (msg == NULL && !lua_isnoneornil(L, arg + 1))  /* non-string 'msg'? */
+        lua_pushvalue(L, arg + 1);  /* return it untouched */
+    else {
+        int level = luaL_optint(L, arg + 2, (L == L1) ? 1 : 0);
+        luaL_traceback(L, L1, msg, level);
+    }
+    return 1;
 }
 
 
 static const luaL_Reg dblib[] = {
-  {"debug", db_debug},
-  {"getuservalue", db_getuservalue},
-  {"gethook", db_gethook},
-  {"getinfo", db_getinfo},
-  {"getlocal", db_getlocal},
-  {"getregistry", db_getregistry},
-  {"getmetatable", db_getmetatable},
-  {"getupvalue", db_getupvalue},
-  {"upvaluejoin", db_upvaluejoin},
-  {"upvalueid", db_upvalueid},
-  {"setuservalue", db_setuservalue},
-  {"sethook", db_sethook},
-  {"setlocal", db_setlocal},
-  {"setmetatable", db_setmetatable},
-  {"setupvalue", db_setupvalue},
-  {"traceback", db_traceback},
-  {NULL, NULL}
+    {"debug", db_debug},
+    {"getuservalue", db_getuservalue},
+    {"gethook", db_gethook},
+    {"getinfo", db_getinfo},
+    {"getlocal", db_getlocal},
+    {"getregistry", db_getregistry},
+    {"getmetatable", db_getmetatable},
+    {"getupvalue", db_getupvalue},
+    {"upvaluejoin", db_upvaluejoin},
+    {"upvalueid", db_upvalueid},
+    {"setuservalue", db_setuservalue},
+    {"sethook", db_sethook},
+    {"setlocal", db_setlocal},
+    {"setmetatable", db_setmetatable},
+    {"setupvalue", db_setupvalue},
+    {"traceback", db_traceback},
+    {NULL, NULL}
 };
 
 
-LUAMOD_API int luaopen_debug (lua_State *L) {
-  luaL_newlib(L, dblib);
-  return 1;
+LUAMOD_API int luaopen_debug(lua_State *L)
+{
+    luaL_newlib(L, dblib);
+    return 1;
 }
 
diff --git a/liblua/ldebug.c b/liblua/ldebug.c
index 3c3f32e90..2d221450c 100644
--- a/liblua/ldebug.c
+++ b/liblua/ldebug.c
@@ -33,264 +33,274 @@
 #define noLuaClosure(f) ((f) == NULL || (f)->c.tt == LUA_TCCL)
 
 
-static const char *getfuncname (lua_State *L, CallInfo *ci, const char **name);
+static const char *getfuncname(lua_State *L, CallInfo *ci, const char **name);
 
 
-static int currentpc (CallInfo *ci) {
-  lua_assert(isLua(ci));
-  return pcRel(ci->u.l.savedpc, ci_func(ci)->p);
+static int currentpc(CallInfo *ci)
+{
+    lua_assert(isLua(ci));
+    return pcRel(ci->u.l.savedpc, ci_func(ci)->p);
 }
 
 
-static int currentline (CallInfo *ci) {
-  return getfuncline(ci_func(ci)->p, currentpc(ci));
+static int currentline(CallInfo *ci)
+{
+    return getfuncline(ci_func(ci)->p, currentpc(ci));
 }
 
 
 /*
 ** this function can be called asynchronous (e.g. during a signal)
 */
-LUA_API int lua_sethook (lua_State *L, lua_Hook func, int mask, int count) {
-  if (func == NULL || mask == 0) {  /* turn off hooks? */
-    mask = 0;
-    func = NULL;
-  }
-  if (isLua(L->ci))
-    L->oldpc = L->ci->u.l.savedpc;
-  L->hook = func;
-  L->basehookcount = count;
-  resethookcount(L);
-  L->hookmask = cast_byte(mask);
-  return 1;
+LUA_API int lua_sethook(lua_State *L, lua_Hook func, int mask, int count)
+{
+    if (func == NULL || mask == 0) {  /* turn off hooks? */
+        mask = 0;
+        func = NULL;
+    }
+    if (isLua(L->ci))
+        L->oldpc = L->ci->u.l.savedpc;
+    L->hook = func;
+    L->basehookcount = count;
+    resethookcount(L);
+    L->hookmask = cast_byte(mask);
+    return 1;
 }
 
 
-LUA_API lua_Hook lua_gethook (lua_State *L) {
-  return L->hook;
+LUA_API lua_Hook lua_gethook(lua_State *L)
+{
+    return L->hook;
 }
 
 
-LUA_API int lua_gethookmask (lua_State *L) {
-  return L->hookmask;
+LUA_API int lua_gethookmask(lua_State *L)
+{
+    return L->hookmask;
 }
 
 
-LUA_API int lua_gethookcount (lua_State *L) {
-  return L->basehookcount;
+LUA_API int lua_gethookcount(lua_State *L)
+{
+    return L->basehookcount;
 }
 
 
-LUA_API int lua_getstack (lua_State *L, int level, lua_Debug *ar) {
-  int status;
-  CallInfo *ci;
-  if (level < 0) return 0;  /* invalid (negative) level */
-  lua_lock(L);
-  for (ci = L->ci; level > 0 && ci != &L->base_ci; ci = ci->previous)
-    level--;
-  if (level == 0 && ci != &L->base_ci) {  /* level found? */
-    status = 1;
-    ar->i_ci = ci;
-  }
-  else status = 0;  /* no such level */
-  lua_unlock(L);
-  return status;
+LUA_API int lua_getstack(lua_State *L, int level, lua_Debug *ar)
+{
+    int status;
+    CallInfo *ci;
+    if (level < 0) return 0;  /* invalid (negative) level */
+    lua_lock(L);
+    for (ci = L->ci; level > 0 && ci != &L->base_ci; ci = ci->previous)
+        level--;
+    if (level == 0 && ci != &L->base_ci) {  /* level found? */
+        status = 1;
+        ar->i_ci = ci;
+    } else status = 0; /* no such level */
+    lua_unlock(L);
+    return status;
 }
 
 
-static const char *upvalname (Proto *p, int uv) {
-  TString *s = check_exp(uv < p->sizeupvalues, p->upvalues[uv].name);
-  if (s == NULL) return "?";
-  else return getstr(s);
+static const char *upvalname(Proto *p, int uv)
+{
+    TString *s = check_exp(uv < p->sizeupvalues, p->upvalues[uv].name);
+    if (s == NULL) return "?";
+    else return getstr(s);
 }
 
 
-static const char *findvararg (CallInfo *ci, int n, StkId *pos) {
-  int nparams = clLvalue(ci->func)->p->numparams;
-  if (n >= ci->u.l.base - ci->func - nparams)
-    return NULL;  /* no such vararg */
-  else {
-    *pos = ci->func + nparams + n;
-    return "(*vararg)";  /* generic name for any vararg */
-  }
-}
-
-
-static const char *findlocal (lua_State *L, CallInfo *ci, int n,
-                              StkId *pos) {
-  const char *name = NULL;
-  StkId base;
-  if (isLua(ci)) {
-    if (n < 0)  /* access to vararg values? */
-      return findvararg(ci, -n, pos);
+static const char *findvararg(CallInfo *ci, int n, StkId *pos)
+{
+    int nparams = clLvalue(ci->func)->p->numparams;
+    if (n >= ci->u.l.base - ci->func - nparams)
+        return NULL;  /* no such vararg */
     else {
-      base = ci->u.l.base;
-      name = luaF_getlocalname(ci_func(ci)->p, n, currentpc(ci));
+        *pos = ci->func + nparams + n;
+        return "(*vararg)";  /* generic name for any vararg */
     }
-  }
-  else
-    base = ci->func + 1;
-  if (name == NULL) {  /* no 'standard' name? */
-    StkId limit = (ci == L->ci) ? L->top : ci->next->func;
-    if (limit - base >= n && n > 0)  /* is 'n' inside 'ci' stack? */
-      name = "(*temporary)";  /* generic name for any valid slot */
-    else
-      return NULL;  /* no name */
-  }
-  *pos = base + (n - 1);
-  return name;
 }
 
 
-LUA_API const char *lua_getlocal (lua_State *L, const lua_Debug *ar, int n) {
-  const char *name;
-  lua_lock(L);
-  if (ar == NULL) {  /* information about non-active function? */
-    if (!isLfunction(L->top - 1))  /* not a Lua function? */
-      name = NULL;
-    else  /* consider live variables at function start (parameters) */
-      name = luaF_getlocalname(clLvalue(L->top - 1)->p, n, 0);
-  }
-  else {  /* active function; get information through 'ar' */
-    StkId pos = 0;  /* to avoid warnings */
-    name = findlocal(L, ar->i_ci, n, &pos);
-    if (name) {
-      setobj2s(L, L->top, pos);
-      api_incr_top(L);
-    }
-  }
-  lua_unlock(L);
-  return name;
-}
-
-
-LUA_API const char *lua_setlocal (lua_State *L, const lua_Debug *ar, int n) {
-  StkId pos = 0;  /* to avoid warnings */
-  const char *name = findlocal(L, ar->i_ci, n, &pos);
-  lua_lock(L);
-  if (name)
-    setobjs2s(L, pos, L->top - 1);
-  L->top--;  /* pop value */
-  lua_unlock(L);
-  return name;
-}
-
-
-static void funcinfo (lua_Debug *ar, Closure *cl) {
-  if (noLuaClosure(cl)) {
-    ar->source = "=[C]";
-    ar->linedefined = -1;
-    ar->lastlinedefined = -1;
-    ar->what = "C";
-  }
-  else {
-    Proto *p = cl->l.p;
-    ar->source = p->source ? getstr(p->source) : "=?";
-    ar->linedefined = p->linedefined;
-    ar->lastlinedefined = p->lastlinedefined;
-    ar->what = (ar->linedefined == 0) ? "main" : "Lua";
-  }
-  luaO_chunkid(ar->short_src, ar->source, LUA_IDSIZE);
-}
-
-
-static void collectvalidlines (lua_State *L, Closure *f) {
-  if (noLuaClosure(f)) {
-    setnilvalue(L->top);
-    api_incr_top(L);
-  }
-  else {
-    int i;
-    TValue v;
-    int *lineinfo = f->l.p->lineinfo;
-    Table *t = luaH_new(L);  /* new table to store active lines */
-    sethvalue(L, L->top, t);  /* push it on stack */
-    api_incr_top(L);
-    setbvalue(&v, 1);  /* boolean 'true' to be the value of all indices */
-    for (i = 0; i < f->l.p->sizelineinfo; i++)  /* for all lines with code */
-      luaH_setint(L, t, lineinfo[i], &v);  /* table[line] = true */
-  }
-}
-
-
-static int auxgetinfo (lua_State *L, const char *what, lua_Debug *ar,
-                       Closure *f, CallInfo *ci) {
-  int status = 1;
-  for (; *what; what++) {
-    switch (*what) {
-      case 'S': {
-        funcinfo(ar, f);
-        break;
-      }
-      case 'l': {
-        ar->currentline = (ci && isLua(ci)) ? currentline(ci) : -1;
-        break;
-      }
-      case 'u': {
-        ar->nups = (f == NULL) ? 0 : f->c.nupvalues;
-        if (noLuaClosure(f)) {
-          ar->isvararg = 1;
-          ar->nparams = 0;
-        }
+static const char *findlocal(lua_State *L, CallInfo *ci, int n,
+                             StkId *pos)
+{
+    const char *name = NULL;
+    StkId base;
+    if (isLua(ci)) {
+        if (n < 0)  /* access to vararg values? */
+            return findvararg(ci, -n, pos);
         else {
-          ar->isvararg = f->l.p->is_vararg;
-          ar->nparams = f->l.p->numparams;
+            base = ci->u.l.base;
+            name = luaF_getlocalname(ci_func(ci)->p, n, currentpc(ci));
         }
-        break;
-      }
-      case 't': {
-        ar->istailcall = (ci) ? ci->callstatus & CIST_TAIL : 0;
-        break;
-      }
-      case 'n': {
-        /* calling function is a known Lua function? */
-        if (ci && !(ci->callstatus & CIST_TAIL) && isLua(ci->previous))
-          ar->namewhat = getfuncname(L, ci->previous, &ar->name);
+    } else
+        base = ci->func + 1;
+    if (name == NULL) {  /* no 'standard' name? */
+        StkId limit = (ci == L->ci) ? L->top : ci->next->func;
+        if (limit - base >= n && n > 0)  /* is 'n' inside 'ci' stack? */
+            name = "(*temporary)";  /* generic name for any valid slot */
         else
-          ar->namewhat = NULL;
-        if (ar->namewhat == NULL) {
-          ar->namewhat = "";  /* not found */
-          ar->name = NULL;
-        }
-        break;
-      }
-      case 'L':
-      case 'f':  /* handled by lua_getinfo */
-        break;
-      default: status = 0;  /* invalid option */
+            return NULL;  /* no name */
     }
-  }
-  return status;
+    *pos = base + (n - 1);
+    return name;
 }
 
 
-LUA_API int lua_getinfo (lua_State *L, const char *what, lua_Debug *ar) {
-  int status;
-  Closure *cl;
-  CallInfo *ci;
-  StkId func;
-  lua_lock(L);
-  if (*what == '>') {
-    ci = NULL;
-    func = L->top - 1;
-    api_check(L, ttisfunction(func), "function expected");
-    what++;  /* skip the '>' */
-    L->top--;  /* pop function */
-  }
-  else {
-    ci = ar->i_ci;
-    func = ci->func;
-    lua_assert(ttisfunction(ci->func));
-  }
-  cl = ttisclosure(func) ? clvalue(func) : NULL;
-  status = auxgetinfo(L, what, ar, cl, ci);
-  if (strchr(what, 'f')) {
-    setobjs2s(L, L->top, func);
-    api_incr_top(L);
-  }
-  if (strchr(what, 'L'))
-    collectvalidlines(L, cl);
-  lua_unlock(L);
-  return status;
+LUA_API const char *lua_getlocal(lua_State *L, const lua_Debug *ar, int n)
+{
+    const char *name;
+    lua_lock(L);
+    if (ar == NULL) {  /* information about non-active function? */
+        if (!isLfunction(L->top - 1))  /* not a Lua function? */
+            name = NULL;
+        else  /* consider live variables at function start (parameters) */
+            name = luaF_getlocalname(clLvalue(L->top - 1)->p, n, 0);
+    } else { /* active function; get information through 'ar' */
+        StkId pos = 0;  /* to avoid warnings */
+        name = findlocal(L, ar->i_ci, n, &pos);
+        if (name) {
+            setobj2s(L, L->top, pos);
+            api_incr_top(L);
+        }
+    }
+    lua_unlock(L);
+    return name;
+}
+
+
+LUA_API const char *lua_setlocal(lua_State *L, const lua_Debug *ar, int n)
+{
+    StkId pos = 0;  /* to avoid warnings */
+    const char *name = findlocal(L, ar->i_ci, n, &pos);
+    lua_lock(L);
+    if (name)
+        setobjs2s(L, pos, L->top - 1);
+    L->top--;  /* pop value */
+    lua_unlock(L);
+    return name;
+}
+
+
+static void funcinfo(lua_Debug *ar, Closure *cl)
+{
+    if (noLuaClosure(cl)) {
+        ar->source = "=[C]";
+        ar->linedefined = -1;
+        ar->lastlinedefined = -1;
+        ar->what = "C";
+    } else {
+        Proto *p = cl->l.p;
+        ar->source = p->source ? getstr(p->source) : "=?";
+        ar->linedefined = p->linedefined;
+        ar->lastlinedefined = p->lastlinedefined;
+        ar->what = (ar->linedefined == 0) ? "main" : "Lua";
+    }
+    luaO_chunkid(ar->short_src, ar->source, LUA_IDSIZE);
+}
+
+
+static void collectvalidlines(lua_State *L, Closure *f)
+{
+    if (noLuaClosure(f)) {
+        setnilvalue(L->top);
+        api_incr_top(L);
+    } else {
+        int i;
+        TValue v;
+        int *lineinfo = f->l.p->lineinfo;
+        Table *t = luaH_new(L);  /* new table to store active lines */
+        sethvalue(L, L->top, t);  /* push it on stack */
+        api_incr_top(L);
+        setbvalue(&v, 1);  /* boolean 'true' to be the value of all indices */
+        for (i = 0; i < f->l.p->sizelineinfo; i++)  /* for all lines with code */
+            luaH_setint(L, t, lineinfo[i], &v);  /* table[line] = true */
+    }
+}
+
+
+static int auxgetinfo(lua_State *L, const char *what, lua_Debug *ar,
+                      Closure *f, CallInfo *ci)
+{
+    int status = 1;
+    for (; *what; what++) {
+        switch (*what) {
+            case 'S': {
+                funcinfo(ar, f);
+                break;
+            }
+            case 'l': {
+                ar->currentline = (ci && isLua(ci)) ? currentline(ci) : -1;
+                break;
+            }
+            case 'u': {
+                ar->nups = (f == NULL) ? 0 : f->c.nupvalues;
+                if (noLuaClosure(f)) {
+                    ar->isvararg = 1;
+                    ar->nparams = 0;
+                } else {
+                    ar->isvararg = f->l.p->is_vararg;
+                    ar->nparams = f->l.p->numparams;
+                }
+                break;
+            }
+            case 't': {
+                ar->istailcall = (ci) ? ci->callstatus & CIST_TAIL : 0;
+                break;
+            }
+            case 'n': {
+                /* calling function is a known Lua function? */
+                if (ci && !(ci->callstatus & CIST_TAIL) && isLua(ci->previous))
+                    ar->namewhat = getfuncname(L, ci->previous, &ar->name);
+                else
+                    ar->namewhat = NULL;
+                if (ar->namewhat == NULL) {
+                    ar->namewhat = "";  /* not found */
+                    ar->name = NULL;
+                }
+                break;
+            }
+            case 'L':
+            case 'f':  /* handled by lua_getinfo */
+                break;
+            default:
+                status = 0;  /* invalid option */
+        }
+    }
+    return status;
+}
+
+
+LUA_API int lua_getinfo(lua_State *L, const char *what, lua_Debug *ar)
+{
+    int status;
+    Closure *cl;
+    CallInfo *ci;
+    StkId func;
+    lua_lock(L);
+    if (*what == '>') {
+        ci = NULL;
+        func = L->top - 1;
+        api_check(L, ttisfunction(func), "function expected");
+        what++;  /* skip the '>' */
+        L->top--;  /* pop function */
+    } else {
+        ci = ar->i_ci;
+        func = ci->func;
+        lua_assert(ttisfunction(ci->func));
+    }
+    cl = ttisclosure(func) ? clvalue(func) : NULL;
+    status = auxgetinfo(L, what, ar, cl, ci);
+    if (strchr(what, 'f')) {
+        setobjs2s(L, L->top, func);
+        api_incr_top(L);
+    }
+    if (strchr(what, 'L'))
+        collectvalidlines(L, cl);
+    lua_unlock(L);
+    return status;
 }
 
 
@@ -300,171 +310,203 @@ LUA_API int lua_getinfo (lua_State *L, const char *what, lua_Debug *ar) {
 ** =======================================================
 */
 
-static const char *getobjname (Proto *p, int lastpc, int reg,
-                               const char **name);
+static const char *getobjname(Proto *p, int lastpc, int reg,
+                              const char **name);
 
 
 /*
 ** find a "name" for the RK value 'c'
 */
-static void kname (Proto *p, int pc, int c, const char **name) {
-  if (ISK(c)) {  /* is 'c' a constant? */
-    TValue *kvalue = &p->k[INDEXK(c)];
-    if (ttisstring(kvalue)) {  /* literal constant? */
-      *name = svalue(kvalue);  /* it is its own name */
-      return;
+static void kname(Proto *p, int pc, int c, const char **name)
+{
+    if (ISK(c)) {  /* is 'c' a constant? */
+        TValue *kvalue = &p->k[INDEXK(c)];
+        if (ttisstring(kvalue)) {  /* literal constant? */
+            *name = svalue(kvalue);  /* it is its own name */
+            return;
+        }
+        /* else no reasonable name found */
+    } else { /* 'c' is a register */
+        const char *what = getobjname(p, pc, c, name); /* search for 'c' */
+        if (what && *what == 'c') {  /* found a constant name? */
+            return;  /* 'name' already filled */
+        }
+        /* else no reasonable name found */
     }
-    /* else no reasonable name found */
-  }
-  else {  /* 'c' is a register */
-    const char *what = getobjname(p, pc, c, name); /* search for 'c' */
-    if (what && *what == 'c') {  /* found a constant name? */
-      return;  /* 'name' already filled */
-    }
-    /* else no reasonable name found */
-  }
-  *name = "?";  /* no reasonable name found */
+    *name = "?";  /* no reasonable name found */
 }
 
 
 /*
 ** try to find last instruction before 'lastpc' that modified register 'reg'
 */
-static int findsetreg (Proto *p, int lastpc, int reg) {
-  int pc;
-  int setreg = -1;  /* keep last instruction that changed 'reg' */
-  for (pc = 0; pc < lastpc; pc++) {
-    Instruction i = p->code[pc];
-    OpCode op = GET_OPCODE(i);
-    int a = GETARG_A(i);
-    switch (op) {
-      case OP_LOADNIL: {
-        int b = GETARG_B(i);
-        if (a <= reg && reg <= a + b)  /* set registers from 'a' to 'a+b' */
-          setreg = pc;
-        break;
-      }
-      case OP_TFORCALL: {
-        if (reg >= a + 2) setreg = pc;  /* affect all regs above its base */
-        break;
-      }
-      case OP_CALL:
-      case OP_TAILCALL: {
-        if (reg >= a) setreg = pc;  /* affect all registers above base */
-        break;
-      }
-      case OP_JMP: {
-        int b = GETARG_sBx(i);
-        int dest = pc + 1 + b;
-        /* jump is forward and do not skip `lastpc'? */
-        if (pc < dest && dest <= lastpc)
-          pc += b;  /* do the jump */
-        break;
-      }
-      case OP_TEST: {
-        if (reg == a) setreg = pc;  /* jumped code can change 'a' */
-        break;
-      }
-      default:
-        if (testAMode(op) && reg == a)  /* any instruction that set A */
-          setreg = pc;
-        break;
-    }
-  }
-  return setreg;
-}
-
-
-static const char *getobjname (Proto *p, int lastpc, int reg,
-                               const char **name) {
-  int pc;
-  *name = luaF_getlocalname(p, reg + 1, lastpc);
-  if (*name)  /* is a local? */
-    return "local";
-  /* else try symbolic execution */
-  pc = findsetreg(p, lastpc, reg);
-  if (pc != -1) {  /* could find instruction? */
-    Instruction i = p->code[pc];
-    OpCode op = GET_OPCODE(i);
-    switch (op) {
-      case OP_MOVE: {
-        int b = GETARG_B(i);  /* move from 'b' to 'a' */
-        if (b < GETARG_A(i))
-          return getobjname(p, pc, b, name);  /* get name for 'b' */
-        break;
-      }
-      case OP_GETTABUP:
-      case OP_GETTABLE: {
-        int k = GETARG_C(i);  /* key index */
-        int t = GETARG_B(i);  /* table index */
-        const char *vn = (op == OP_GETTABLE)  /* name of indexed variable */
-                         ? luaF_getlocalname(p, t + 1, pc)
-                         : upvalname(p, t);
-        kname(p, pc, k, name);
-        return (vn && strcmp(vn, LUA_ENV) == 0) ? "global" : "field";
-      }
-      case OP_GETUPVAL: {
-        *name = upvalname(p, GETARG_B(i));
-        return "upvalue";
-      }
-      case OP_LOADK:
-      case OP_LOADKX: {
-        int b = (op == OP_LOADK) ? GETARG_Bx(i)
-                                 : GETARG_Ax(p->code[pc + 1]);
-        if (ttisstring(&p->k[b])) {
-          *name = svalue(&p->k[b]);
-          return "constant";
+static int findsetreg(Proto *p, int lastpc, int reg)
+{
+    int pc;
+    int setreg = -1;  /* keep last instruction that changed 'reg' */
+    for (pc = 0; pc < lastpc; pc++) {
+        Instruction i = p->code[pc];
+        OpCode op = GET_OPCODE(i);
+        int a = GETARG_A(i);
+        switch (op) {
+            case OP_LOADNIL: {
+                int b = GETARG_B(i);
+                if (a <= reg && reg <= a + b)  /* set registers from 'a' to 'a+b' */
+                    setreg = pc;
+                break;
+            }
+            case OP_TFORCALL: {
+                if (reg >= a + 2) setreg = pc;  /* affect all regs above its base */
+                break;
+            }
+            case OP_CALL:
+            case OP_TAILCALL: {
+                if (reg >= a) setreg = pc;  /* affect all registers above base */
+                break;
+            }
+            case OP_JMP: {
+                int b = GETARG_sBx(i);
+                int dest = pc + 1 + b;
+                /* jump is forward and do not skip `lastpc'? */
+                if (pc < dest && dest <= lastpc)
+                    pc += b;  /* do the jump */
+                break;
+            }
+            case OP_TEST: {
+                if (reg == a) setreg = pc;  /* jumped code can change 'a' */
+                break;
+            }
+            default:
+                if (testAMode(op) && reg == a)  /* any instruction that set A */
+                    setreg = pc;
+                break;
         }
-        break;
-      }
-      case OP_SELF: {
-        int k = GETARG_C(i);  /* key index */
-        kname(p, pc, k, name);
-        return "method";
-      }
-      default: break;  /* go through to return NULL */
     }
-  }
-  return NULL;  /* could not find reasonable name */
+    return setreg;
 }
 
 
-static const char *getfuncname (lua_State *L, CallInfo *ci, const char **name) {
-  TMS tm;
-  Proto *p = ci_func(ci)->p;  /* calling function */
-  int pc = currentpc(ci);  /* calling instruction index */
-  Instruction i = p->code[pc];  /* calling instruction */
-  switch (GET_OPCODE(i)) {
-    case OP_CALL:
-    case OP_TAILCALL:  /* get function name */
-      return getobjname(p, pc, GETARG_A(i), name);
-    case OP_TFORCALL: {  /* for iterator */
-      *name = "for iterator";
-       return "for iterator";
+static const char *getobjname(Proto *p, int lastpc, int reg,
+                              const char **name)
+{
+    int pc;
+    *name = luaF_getlocalname(p, reg + 1, lastpc);
+    if (*name)  /* is a local? */
+        return "local";
+    /* else try symbolic execution */
+    pc = findsetreg(p, lastpc, reg);
+    if (pc != -1) {  /* could find instruction? */
+        Instruction i = p->code[pc];
+        OpCode op = GET_OPCODE(i);
+        switch (op) {
+            case OP_MOVE: {
+                int b = GETARG_B(i);  /* move from 'b' to 'a' */
+                if (b < GETARG_A(i))
+                    return getobjname(p, pc, b, name);  /* get name for 'b' */
+                break;
+            }
+            case OP_GETTABUP:
+            case OP_GETTABLE: {
+                int k = GETARG_C(i);  /* key index */
+                int t = GETARG_B(i);  /* table index */
+                const char *vn = (op == OP_GETTABLE)  /* name of indexed variable */
+                                 ? luaF_getlocalname(p, t + 1, pc)
+                                 : upvalname(p, t);
+                kname(p, pc, k, name);
+                return (vn && strcmp(vn, LUA_ENV) == 0) ? "global" : "field";
+            }
+            case OP_GETUPVAL: {
+                *name = upvalname(p, GETARG_B(i));
+                return "upvalue";
+            }
+            case OP_LOADK:
+            case OP_LOADKX: {
+                int b = (op == OP_LOADK) ? GETARG_Bx(i)
+                        : GETARG_Ax(p->code[pc + 1]);
+                if (ttisstring(&p->k[b])) {
+                    *name = svalue(&p->k[b]);
+                    return "constant";
+                }
+                break;
+            }
+            case OP_SELF: {
+                int k = GETARG_C(i);  /* key index */
+                kname(p, pc, k, name);
+                return "method";
+            }
+            default:
+                break;  /* go through to return NULL */
+        }
     }
-    /* all other instructions can call only through metamethods */
-    case OP_SELF:
-    case OP_GETTABUP:
-    case OP_GETTABLE: tm = TM_INDEX; break;
-    case OP_SETTABUP:
-    case OP_SETTABLE: tm = TM_NEWINDEX; break;
-    case OP_EQ: tm = TM_EQ; break;
-    case OP_ADD: tm = TM_ADD; break;
-    case OP_SUB: tm = TM_SUB; break;
-    case OP_MUL: tm = TM_MUL; break;
-    case OP_DIV: tm = TM_DIV; break;
-    case OP_MOD: tm = TM_MOD; break;
-    case OP_POW: tm = TM_POW; break;
-    case OP_UNM: tm = TM_UNM; break;
-    case OP_LEN: tm = TM_LEN; break;
-    case OP_LT: tm = TM_LT; break;
-    case OP_LE: tm = TM_LE; break;
-    case OP_CONCAT: tm = TM_CONCAT; break;
-    default:
-      return NULL;  /* else no useful name can be found */
-  }
-  *name = getstr(G(L)->tmname[tm]);
-  return "metamethod";
+    return NULL;  /* could not find reasonable name */
+}
+
+
+static const char *getfuncname(lua_State *L, CallInfo *ci, const char **name)
+{
+    TMS tm;
+    Proto *p = ci_func(ci)->p;  /* calling function */
+    int pc = currentpc(ci);  /* calling instruction index */
+    Instruction i = p->code[pc];  /* calling instruction */
+    switch (GET_OPCODE(i)) {
+        case OP_CALL:
+        case OP_TAILCALL:  /* get function name */
+            return getobjname(p, pc, GETARG_A(i), name);
+        case OP_TFORCALL: {  /* for iterator */
+            *name = "for iterator";
+            return "for iterator";
+        }
+        /* all other instructions can call only through metamethods */
+        case OP_SELF:
+        case OP_GETTABUP:
+        case OP_GETTABLE:
+            tm = TM_INDEX;
+            break;
+        case OP_SETTABUP:
+        case OP_SETTABLE:
+            tm = TM_NEWINDEX;
+            break;
+        case OP_EQ:
+            tm = TM_EQ;
+            break;
+        case OP_ADD:
+            tm = TM_ADD;
+            break;
+        case OP_SUB:
+            tm = TM_SUB;
+            break;
+        case OP_MUL:
+            tm = TM_MUL;
+            break;
+        case OP_DIV:
+            tm = TM_DIV;
+            break;
+        case OP_MOD:
+            tm = TM_MOD;
+            break;
+        case OP_POW:
+            tm = TM_POW;
+            break;
+        case OP_UNM:
+            tm = TM_UNM;
+            break;
+        case OP_LEN:
+            tm = TM_LEN;
+            break;
+        case OP_LT:
+            tm = TM_LT;
+            break;
+        case OP_LE:
+            tm = TM_LE;
+            break;
+        case OP_CONCAT:
+            tm = TM_CONCAT;
+            break;
+        default:
+            return NULL;  /* else no useful name can be found */
+    }
+    *name = getstr(G(L)->tmname[tm]);
+    return "metamethod";
 }
 
 /* }====================================================== */
@@ -475,106 +517,116 @@ static const char *getfuncname (lua_State *L, CallInfo *ci, const char **name) {
 ** only ANSI way to check whether a pointer points to an array
 ** (used only for error messages, so efficiency is not a big concern)
 */
-static int isinstack (CallInfo *ci, const TValue *o) {
-  StkId p;
-  for (p = ci->u.l.base; p < ci->top; p++)
-    if (o == p) return 1;
-  return 0;
+static int isinstack(CallInfo *ci, const TValue *o)
+{
+    StkId p;
+    for (p = ci->u.l.base; p < ci->top; p++)
+        if (o == p) return 1;
+    return 0;
 }
 
 
-static const char *getupvalname (CallInfo *ci, const TValue *o,
-                                 const char **name) {
-  LClosure *c = ci_func(ci);
-  int i;
-  for (i = 0; i < c->nupvalues; i++) {
-    if (c->upvals[i]->v == o) {
-      *name = upvalname(c->p, i);
-      return "upvalue";
+static const char *getupvalname(CallInfo *ci, const TValue *o,
+                                const char **name)
+{
+    LClosure *c = ci_func(ci);
+    int i;
+    for (i = 0; i < c->nupvalues; i++) {
+        if (c->upvals[i]->v == o) {
+            *name = upvalname(c->p, i);
+            return "upvalue";
+        }
     }
-  }
-  return NULL;
+    return NULL;
 }
 
 
-l_noret luaG_typeerror (lua_State *L, const TValue *o, const char *op) {
-  CallInfo *ci = L->ci;
-  const char *name = NULL;
-  const char *t = objtypename(o);
-  const char *kind = NULL;
-  if (isLua(ci)) {
-    kind = getupvalname(ci, o, &name);  /* check whether 'o' is an upvalue */
-    if (!kind && isinstack(ci, o))  /* no? try a register */
-      kind = getobjname(ci_func(ci)->p, currentpc(ci),
-                        cast_int(o - ci->u.l.base), &name);
-  }
-  if (kind)
-    luaG_runerror(L, "attempt to %s %s " LUA_QS " (a %s value)",
-                op, kind, name, t);
-  else
-    luaG_runerror(L, "attempt to %s a %s value", op, t);
-}
-
-
-l_noret luaG_concaterror (lua_State *L, StkId p1, StkId p2) {
-  if (ttisstring(p1) || ttisnumber(p1)) p1 = p2;
-  lua_assert(!ttisstring(p1) && !ttisnumber(p2));
-  luaG_typeerror(L, p1, "concatenate");
-}
-
-
-l_noret luaG_aritherror (lua_State *L, const TValue *p1, const TValue *p2) {
-  TValue temp;
-  if (luaV_tonumber(p1, &temp) == NULL)
-    p2 = p1;  /* first operand is wrong */
-  luaG_typeerror(L, p2, "perform arithmetic on");
-}
-
-
-l_noret luaG_ordererror (lua_State *L, const TValue *p1, const TValue *p2) {
-  const char *t1 = objtypename(p1);
-  const char *t2 = objtypename(p2);
-  if (t1 == t2)
-    luaG_runerror(L, "attempt to compare two %s values", t1);
-  else
-    luaG_runerror(L, "attempt to compare %s with %s", t1, t2);
-}
-
-
-static void addinfo (lua_State *L, const char *msg) {
-  CallInfo *ci = L->ci;
-  if (isLua(ci)) {  /* is Lua code? */
-    char buff[LUA_IDSIZE];  /* add file:line information */
-    int line = currentline(ci);
-    TString *src = ci_func(ci)->p->source;
-    if (src)
-      luaO_chunkid(buff, getstr(src), LUA_IDSIZE);
-    else {  /* no source available; use "?" instead */
-      buff[0] = '?'; buff[1] = '\0';
+l_noret luaG_typeerror(lua_State *L, const TValue *o, const char *op)
+{
+    CallInfo *ci = L->ci;
+    const char *name = NULL;
+    const char *t = objtypename(o);
+    const char *kind = NULL;
+    if (isLua(ci)) {
+        kind = getupvalname(ci, o, &name);  /* check whether 'o' is an upvalue */
+        if (!kind && isinstack(ci, o))  /* no? try a register */
+            kind = getobjname(ci_func(ci)->p, currentpc(ci),
+                              cast_int(o - ci->u.l.base), &name);
     }
-    luaO_pushfstring(L, "%s:%d: %s", buff, line, msg);
-  }
+    if (kind)
+        luaG_runerror(L, "attempt to %s %s " LUA_QS " (a %s value)",
+                      op, kind, name, t);
+    else
+        luaG_runerror(L, "attempt to %s a %s value", op, t);
 }
 
 
-l_noret luaG_errormsg (lua_State *L) {
-  if (L->errfunc != 0) {  /* is there an error handling function? */
-    StkId errfunc = restorestack(L, L->errfunc);
-    if (!ttisfunction(errfunc)) luaD_throw(L, LUA_ERRERR);
-    setobjs2s(L, L->top, L->top - 1);  /* move argument */
-    setobjs2s(L, L->top - 1, errfunc);  /* push function */
-    L->top++;
-    luaD_call(L, L->top - 2, 1, 0);  /* call it */
-  }
-  luaD_throw(L, LUA_ERRRUN);
+l_noret luaG_concaterror(lua_State *L, StkId p1, StkId p2)
+{
+    if (ttisstring(p1) || ttisnumber(p1)) p1 = p2;
+    lua_assert(!ttisstring(p1) && !ttisnumber(p2));
+    luaG_typeerror(L, p1, "concatenate");
 }
 
 
-l_noret luaG_runerror (lua_State *L, const char *fmt, ...) {
-  va_list argp;
-  va_start(argp, fmt);
-  addinfo(L, luaO_pushvfstring(L, fmt, argp));
-  va_end(argp);
-  luaG_errormsg(L);
+l_noret luaG_aritherror(lua_State *L, const TValue *p1, const TValue *p2)
+{
+    TValue temp;
+    if (luaV_tonumber(p1, &temp) == NULL)
+        p2 = p1;  /* first operand is wrong */
+    luaG_typeerror(L, p2, "perform arithmetic on");
+}
+
+
+l_noret luaG_ordererror(lua_State *L, const TValue *p1, const TValue *p2)
+{
+    const char *t1 = objtypename(p1);
+    const char *t2 = objtypename(p2);
+    if (t1 == t2)
+        luaG_runerror(L, "attempt to compare two %s values", t1);
+    else
+        luaG_runerror(L, "attempt to compare %s with %s", t1, t2);
+}
+
+
+static void addinfo(lua_State *L, const char *msg)
+{
+    CallInfo *ci = L->ci;
+    if (isLua(ci)) {  /* is Lua code? */
+        char buff[LUA_IDSIZE];  /* add file:line information */
+        int line = currentline(ci);
+        TString *src = ci_func(ci)->p->source;
+        if (src)
+            luaO_chunkid(buff, getstr(src), LUA_IDSIZE);
+        else {  /* no source available; use "?" instead */
+            buff[0] = '?';
+            buff[1] = '\0';
+        }
+        luaO_pushfstring(L, "%s:%d: %s", buff, line, msg);
+    }
+}
+
+
+l_noret luaG_errormsg(lua_State *L)
+{
+    if (L->errfunc != 0) {  /* is there an error handling function? */
+        StkId errfunc = restorestack(L, L->errfunc);
+        if (!ttisfunction(errfunc)) luaD_throw(L, LUA_ERRERR);
+        setobjs2s(L, L->top, L->top - 1);  /* move argument */
+        setobjs2s(L, L->top - 1, errfunc);  /* push function */
+        L->top++;
+        luaD_call(L, L->top - 2, 1, 0);  /* call it */
+    }
+    luaD_throw(L, LUA_ERRRUN);
+}
+
+
+l_noret luaG_runerror(lua_State *L, const char *fmt, ...)
+{
+    va_list argp;
+    va_start(argp, fmt);
+    addinfo(L, luaO_pushvfstring(L, fmt, argp));
+    va_end(argp);
+    luaG_errormsg(L);
 }
 
diff --git a/liblua/ldebug.h b/liblua/ldebug.h
index f95965029..ba2487202 100644
--- a/liblua/ldebug.h
+++ b/liblua/ldebug.h
@@ -21,14 +21,14 @@
 #define ci_func(ci) (clLvalue((ci)->func))
 
 
-LUAI_FUNC l_noret luaG_typeerror (lua_State *L, const TValue *o,
-                                                const char *opname);
-LUAI_FUNC l_noret luaG_concaterror (lua_State *L, StkId p1, StkId p2);
-LUAI_FUNC l_noret luaG_aritherror (lua_State *L, const TValue *p1,
-                                                 const TValue *p2);
-LUAI_FUNC l_noret luaG_ordererror (lua_State *L, const TValue *p1,
-                                                 const TValue *p2);
-LUAI_FUNC l_noret luaG_runerror (lua_State *L, const char *fmt, ...);
-LUAI_FUNC l_noret luaG_errormsg (lua_State *L);
+LUAI_FUNC l_noret luaG_typeerror(lua_State *L, const TValue *o,
+                                 const char *opname);
+LUAI_FUNC l_noret luaG_concaterror(lua_State *L, StkId p1, StkId p2);
+LUAI_FUNC l_noret luaG_aritherror(lua_State *L, const TValue *p1,
+                                  const TValue *p2);
+LUAI_FUNC l_noret luaG_ordererror(lua_State *L, const TValue *p1,
+                                  const TValue *p2);
+LUAI_FUNC l_noret luaG_runerror(lua_State *L, const char *fmt, ...);
+LUAI_FUNC l_noret luaG_errormsg(lua_State *L);
 
 #endif
diff --git a/liblua/ldo.c b/liblua/ldo.c
index 6c97ba5bf..f7d962450 100644
--- a/liblua/ldo.c
+++ b/liblua/ldo.c
@@ -75,82 +75,84 @@
 
 /* chain list of long jump buffers */
 struct lua_longjmp {
-  struct lua_longjmp *previous;
-  luai_jmpbuf b;
-  volatile int status;  /* error code */
+    struct lua_longjmp *previous;
+    luai_jmpbuf b;
+    volatile int status;  /* error code */
 };
 
 
-static void seterrorobj (lua_State *L, int errcode, StkId oldtop) {
-  switch (errcode) {
-    case LUA_ERRMEM: {  /* memory error? */
-      setsvalue2s(L, oldtop, G(L)->memerrmsg); /* reuse preregistered msg. */
-      break;
+static void seterrorobj(lua_State *L, int errcode, StkId oldtop)
+{
+    switch (errcode) {
+        case LUA_ERRMEM: {  /* memory error? */
+            setsvalue2s(L, oldtop, G(L)->memerrmsg); /* reuse preregistered msg. */
+            break;
+        }
+        case LUA_ERRERR: {
+            setsvalue2s(L, oldtop, luaS_newliteral(L, "error in error handling"));
+            break;
+        }
+        default: {
+            setobjs2s(L, oldtop, L->top - 1);  /* error message on current top */
+            break;
+        }
     }
-    case LUA_ERRERR: {
-      setsvalue2s(L, oldtop, luaS_newliteral(L, "error in error handling"));
-      break;
-    }
-    default: {
-      setobjs2s(L, oldtop, L->top - 1);  /* error message on current top */
-      break;
-    }
-  }
-  L->top = oldtop + 1;
+    L->top = oldtop + 1;
 }
 
 
-l_noret luaD_throw (lua_State *L, int errcode) {
-  if (L->errorJmp) {  /* thread has an error handler? */
-    L->errorJmp->status = errcode;  /* set status */
-    LUAI_THROW(L, L->errorJmp);  /* jump to it */
-  }
-  else {  /* thread has no error handler */
-    L->status = cast_byte(errcode);  /* mark it as dead */
-    if (G(L)->mainthread->errorJmp) {  /* main thread has a handler? */
-      setobjs2s(L, G(L)->mainthread->top++, L->top - 1);  /* copy error obj. */
-      luaD_throw(G(L)->mainthread, errcode);  /* re-throw in main thread */
+l_noret luaD_throw(lua_State *L, int errcode)
+{
+    if (L->errorJmp) {  /* thread has an error handler? */
+        L->errorJmp->status = errcode;  /* set status */
+        LUAI_THROW(L, L->errorJmp);  /* jump to it */
+    } else { /* thread has no error handler */
+        L->status = cast_byte(errcode);  /* mark it as dead */
+        if (G(L)->mainthread->errorJmp) {  /* main thread has a handler? */
+            setobjs2s(L, G(L)->mainthread->top++, L->top - 1);  /* copy error obj. */
+            luaD_throw(G(L)->mainthread, errcode);  /* re-throw in main thread */
+        } else { /* no handler at all; abort */
+            if (G(L)->panic) {  /* panic function? */
+                lua_unlock(L);
+                G(L)->panic(L);  /* call it (last chance to jump out) */
+            }
+            abort();
+        }
     }
-    else {  /* no handler at all; abort */
-      if (G(L)->panic) {  /* panic function? */
-        lua_unlock(L);
-        G(L)->panic(L);  /* call it (last chance to jump out) */
-      }
-      abort();
-    }
-  }
 }
 
 
-int luaD_rawrunprotected (lua_State *L, Pfunc f, void *ud) {
-  unsigned short oldnCcalls = L->nCcalls;
-  struct lua_longjmp lj;
-  lj.status = LUA_OK;
-  lj.previous = L->errorJmp;  /* chain new error handler */
-  L->errorJmp = &lj;
-  LUAI_TRY(L, &lj,
-    (*f)(L, ud);
-  );
-  L->errorJmp = lj.previous;  /* restore old error handler */
-  L->nCcalls = oldnCcalls;
-  return lj.status;
+int luaD_rawrunprotected(lua_State *L, Pfunc f, void *ud)
+{
+    unsigned short oldnCcalls = L->nCcalls;
+    struct lua_longjmp lj;
+    lj.status = LUA_OK;
+    lj.previous = L->errorJmp;  /* chain new error handler */
+    L->errorJmp = &lj;
+    LUAI_TRY(L, &lj,
+             (*f)(L, ud);
+            );
+    L->errorJmp = lj.previous;  /* restore old error handler */
+    L->nCcalls = oldnCcalls;
+    return lj.status;
 }
 
 /* }====================================================== */
 
 
-static void correctstack (lua_State *L, TValue *oldstack) {
-  CallInfo *ci;
-  GCObject *up;
-  L->top = (L->top - oldstack) + L->stack;
-  for (up = L->openupval; up != NULL; up = up->gch.next)
-    gco2uv(up)->v = (gco2uv(up)->v - oldstack) + L->stack;
-  for (ci = L->ci; ci != NULL; ci = ci->previous) {
-    ci->top = (ci->top - oldstack) + L->stack;
-    ci->func = (ci->func - oldstack) + L->stack;
-    if (isLua(ci))
-      ci->u.l.base = (ci->u.l.base - oldstack) + L->stack;
-  }
+static void correctstack(lua_State *L, TValue *oldstack)
+{
+    CallInfo *ci;
+    GCObject *up;
+    L->top = (L->top - oldstack) + L->stack;
+    for (up = L->openupval; up != NULL; up = up->gch.next)
+        gco2uv(up)->v = (gco2uv(up)->v - oldstack) + L->stack;
+    for (ci = L->ci; ci != NULL; ci = ci->previous) {
+        ci->top = (ci->top - oldstack) + L->stack;
+        ci->func = (ci->func - oldstack) + L->stack;
+        if (isLua(ci))
+            ci->u.l.base = (ci->u.l.base - oldstack) + L->stack;
+    }
 }
 
 
@@ -158,130 +160,137 @@ static void correctstack (lua_State *L, TValue *oldstack) {
 #define ERRORSTACKSIZE (LUAI_MAXSTACK + 200)
 
 
-void luaD_reallocstack (lua_State *L, int newsize) {
-  TValue *oldstack = L->stack;
-  int lim = L->stacksize;
-  lua_assert(newsize <= LUAI_MAXSTACK || newsize == ERRORSTACKSIZE);
-  lua_assert(L->stack_last - L->stack == L->stacksize - EXTRA_STACK);
-  luaM_reallocvector(L, L->stack, L->stacksize, newsize, TValue);
-  for (; lim < newsize; lim++)
-    setnilvalue(L->stack + lim); /* erase new segment */
-  L->stacksize = newsize;
-  L->stack_last = L->stack + newsize - EXTRA_STACK;
-  correctstack(L, oldstack);
+void luaD_reallocstack(lua_State *L, int newsize)
+{
+    TValue *oldstack = L->stack;
+    int lim = L->stacksize;
+    lua_assert(newsize <= LUAI_MAXSTACK || newsize == ERRORSTACKSIZE);
+    lua_assert(L->stack_last - L->stack == L->stacksize - EXTRA_STACK);
+    luaM_reallocvector(L, L->stack, L->stacksize, newsize, TValue);
+    for (; lim < newsize; lim++)
+        setnilvalue(L->stack + lim); /* erase new segment */
+    L->stacksize = newsize;
+    L->stack_last = L->stack + newsize - EXTRA_STACK;
+    correctstack(L, oldstack);
 }
 
 
-void luaD_growstack (lua_State *L, int n) {
-  int size = L->stacksize;
-  if (size > LUAI_MAXSTACK)  /* error after extra size? */
-    luaD_throw(L, LUA_ERRERR);
-  else {
-    int needed = cast_int(L->top - L->stack) + n + EXTRA_STACK;
-    int newsize = 2 * size;
-    if (newsize > LUAI_MAXSTACK) newsize = LUAI_MAXSTACK;
-    if (newsize < needed) newsize = needed;
-    if (newsize > LUAI_MAXSTACK) {  /* stack overflow? */
-      luaD_reallocstack(L, ERRORSTACKSIZE);
-      luaG_runerror(L, "stack overflow");
+void luaD_growstack(lua_State *L, int n)
+{
+    int size = L->stacksize;
+    if (size > LUAI_MAXSTACK)  /* error after extra size? */
+        luaD_throw(L, LUA_ERRERR);
+    else {
+        int needed = cast_int(L->top - L->stack) + n + EXTRA_STACK;
+        int newsize = 2 * size;
+        if (newsize > LUAI_MAXSTACK) newsize = LUAI_MAXSTACK;
+        if (newsize < needed) newsize = needed;
+        if (newsize > LUAI_MAXSTACK) {  /* stack overflow? */
+            luaD_reallocstack(L, ERRORSTACKSIZE);
+            luaG_runerror(L, "stack overflow");
+        } else
+            luaD_reallocstack(L, newsize);
     }
+}
+
+
+static int stackinuse(lua_State *L)
+{
+    CallInfo *ci;
+    StkId lim = L->top;
+    for (ci = L->ci; ci != NULL; ci = ci->previous) {
+        lua_assert(ci->top <= L->stack_last);
+        if (lim < ci->top) lim = ci->top;
+    }
+    return cast_int(lim - L->stack) + 1;  /* part of stack in use */
+}
+
+
+void luaD_shrinkstack(lua_State *L)
+{
+    int inuse = stackinuse(L);
+    int goodsize = inuse + (inuse / 8) + 2 * EXTRA_STACK;
+    if (goodsize > LUAI_MAXSTACK) goodsize = LUAI_MAXSTACK;
+    if (inuse > LUAI_MAXSTACK ||  /* handling stack overflow? */
+        goodsize >= L->stacksize)  /* would grow instead of shrink? */
+        condmovestack(L);  /* don't change stack (change only for debugging) */
     else
-      luaD_reallocstack(L, newsize);
-  }
+        luaD_reallocstack(L, goodsize);  /* shrink it */
 }
 
 
-static int stackinuse (lua_State *L) {
-  CallInfo *ci;
-  StkId lim = L->top;
-  for (ci = L->ci; ci != NULL; ci = ci->previous) {
-    lua_assert(ci->top <= L->stack_last);
-    if (lim < ci->top) lim = ci->top;
-  }
-  return cast_int(lim - L->stack) + 1;  /* part of stack in use */
+void luaD_hook(lua_State *L, int event, int line)
+{
+    lua_Hook hook = L->hook;
+    if (hook && L->allowhook) {
+        CallInfo *ci = L->ci;
+        ptrdiff_t top = savestack(L, L->top);
+        ptrdiff_t ci_top = savestack(L, ci->top);
+        lua_Debug ar;
+        ar.event = event;
+        ar.currentline = line;
+        ar.i_ci = ci;
+        luaD_checkstack(L, LUA_MINSTACK);  /* ensure minimum stack size */
+        ci->top = L->top + LUA_MINSTACK;
+        lua_assert(ci->top <= L->stack_last);
+        L->allowhook = 0;  /* cannot call hooks inside a hook */
+        ci->callstatus |= CIST_HOOKED;
+        lua_unlock(L);
+        (*hook)(L, &ar);
+        lua_lock(L);
+        lua_assert(!L->allowhook);
+        L->allowhook = 1;
+        ci->top = restorestack(L, ci_top);
+        L->top = restorestack(L, top);
+        ci->callstatus &= ~CIST_HOOKED;
+    }
 }
 
 
-void luaD_shrinkstack (lua_State *L) {
-  int inuse = stackinuse(L);
-  int goodsize = inuse + (inuse / 8) + 2*EXTRA_STACK;
-  if (goodsize > LUAI_MAXSTACK) goodsize = LUAI_MAXSTACK;
-  if (inuse > LUAI_MAXSTACK ||  /* handling stack overflow? */
-      goodsize >= L->stacksize)  /* would grow instead of shrink? */
-    condmovestack(L);  /* don't change stack (change only for debugging) */
-  else
-    luaD_reallocstack(L, goodsize);  /* shrink it */
+static void callhook(lua_State *L, CallInfo *ci)
+{
+    int hook = LUA_HOOKCALL;
+    ci->u.l.savedpc++;  /* hooks assume 'pc' is already incremented */
+    if (isLua(ci->previous) &&
+        GET_OPCODE(*(ci->previous->u.l.savedpc - 1)) == OP_TAILCALL) {
+        ci->callstatus |= CIST_TAIL;
+        hook = LUA_HOOKTAILCALL;
+    }
+    luaD_hook(L, hook, -1);
+    ci->u.l.savedpc--;  /* correct 'pc' */
 }
 
 
-void luaD_hook (lua_State *L, int event, int line) {
-  lua_Hook hook = L->hook;
-  if (hook && L->allowhook) {
-    CallInfo *ci = L->ci;
-    ptrdiff_t top = savestack(L, L->top);
-    ptrdiff_t ci_top = savestack(L, ci->top);
-    lua_Debug ar;
-    ar.event = event;
-    ar.currentline = line;
-    ar.i_ci = ci;
-    luaD_checkstack(L, LUA_MINSTACK);  /* ensure minimum stack size */
-    ci->top = L->top + LUA_MINSTACK;
-    lua_assert(ci->top <= L->stack_last);
-    L->allowhook = 0;  /* cannot call hooks inside a hook */
-    ci->callstatus |= CIST_HOOKED;
-    lua_unlock(L);
-    (*hook)(L, &ar);
-    lua_lock(L);
-    lua_assert(!L->allowhook);
-    L->allowhook = 1;
-    ci->top = restorestack(L, ci_top);
-    L->top = restorestack(L, top);
-    ci->callstatus &= ~CIST_HOOKED;
-  }
+static StkId adjust_varargs(lua_State *L, Proto *p, int actual)
+{
+    int i;
+    int nfixargs = p->numparams;
+    StkId base, fixed;
+    lua_assert(actual >= nfixargs);
+    /* move fixed parameters to final position */
+    fixed = L->top - actual;  /* first fixed argument */
+    base = L->top;  /* final position of first argument */
+    for (i = 0; i < nfixargs; i++) {
+        setobjs2s(L, L->top++, fixed + i);
+        setnilvalue(fixed + i);
+    }
+    return base;
 }
 
 
-static void callhook (lua_State *L, CallInfo *ci) {
-  int hook = LUA_HOOKCALL;
-  ci->u.l.savedpc++;  /* hooks assume 'pc' is already incremented */
-  if (isLua(ci->previous) &&
-      GET_OPCODE(*(ci->previous->u.l.savedpc - 1)) == OP_TAILCALL) {
-    ci->callstatus |= CIST_TAIL;
-    hook = LUA_HOOKTAILCALL;
-  }
-  luaD_hook(L, hook, -1);
-  ci->u.l.savedpc--;  /* correct 'pc' */
-}
-
-
-static StkId adjust_varargs (lua_State *L, Proto *p, int actual) {
-  int i;
-  int nfixargs = p->numparams;
-  StkId base, fixed;
-  lua_assert(actual >= nfixargs);
-  /* move fixed parameters to final position */
-  fixed = L->top - actual;  /* first fixed argument */
-  base = L->top;  /* final position of first argument */
-  for (i=0; i<nfixargs; i++) {
-    setobjs2s(L, L->top++, fixed + i);
-    setnilvalue(fixed + i);
-  }
-  return base;
-}
-
-
-static StkId tryfuncTM (lua_State *L, StkId func) {
-  const TValue *tm = luaT_gettmbyobj(L, func, TM_CALL);
-  StkId p;
-  ptrdiff_t funcr = savestack(L, func);
-  if (!ttisfunction(tm))
-    luaG_typeerror(L, func, "call");
-  /* Open a hole inside the stack at `func' */
-  for (p = L->top; p > func; p--) setobjs2s(L, p, p-1);
-  incr_top(L);
-  func = restorestack(L, funcr);  /* previous call may change stack */
-  setobj2s(L, func, tm);  /* tag method is the new function to be called */
-  return func;
+static StkId tryfuncTM(lua_State *L, StkId func)
+{
+    const TValue *tm = luaT_gettmbyobj(L, func, TM_CALL);
+    StkId p;
+    ptrdiff_t funcr = savestack(L, func);
+    if (!ttisfunction(tm))
+        luaG_typeerror(L, func, "call");
+    /* Open a hole inside the stack at `func' */
+    for (p = L->top; p > func; p--) setobjs2s(L, p, p - 1);
+    incr_top(L);
+    func = restorestack(L, funcr);  /* previous call may change stack */
+    setobj2s(L, func, tm);  /* tag method is the new function to be called */
+    return func;
 }
 
 
@@ -292,88 +301,90 @@ static StkId tryfuncTM (lua_State *L, StkId func) {
 /*
 ** returns true if function has been executed (C function)
 */
-int luaD_precall (lua_State *L, StkId func, int nresults) {
-  lua_CFunction f;
-  CallInfo *ci;
-  int n;  /* number of arguments (Lua) or returns (C) */
-  ptrdiff_t funcr = savestack(L, func);
-  switch (ttype(func)) {
-    case LUA_TLCF:  /* light C function */
-      f = fvalue(func);
-      goto Cfunc;
-    case LUA_TCCL: {  /* C closure */
-      f = clCvalue(func)->f;
-     Cfunc:
-      luaD_checkstack(L, LUA_MINSTACK);  /* ensure minimum stack size */
-      ci = next_ci(L);  /* now 'enter' new function */
-      ci->nresults = nresults;
-      ci->func = restorestack(L, funcr);
-      ci->top = L->top + LUA_MINSTACK;
-      lua_assert(ci->top <= L->stack_last);
-      ci->callstatus = 0;
-      luaC_checkGC(L);  /* stack grow uses memory */
-      if (L->hookmask & LUA_MASKCALL)
-        luaD_hook(L, LUA_HOOKCALL, -1);
-      lua_unlock(L);
-      n = (*f)(L);  /* do the actual call */
-      lua_lock(L);
-      api_checknelems(L, n);
-      luaD_poscall(L, L->top - n);
-      return 1;
+int luaD_precall(lua_State *L, StkId func, int nresults)
+{
+    lua_CFunction f;
+    CallInfo *ci;
+    int n;  /* number of arguments (Lua) or returns (C) */
+    ptrdiff_t funcr = savestack(L, func);
+    switch (ttype(func)) {
+        case LUA_TLCF:  /* light C function */
+            f = fvalue(func);
+            goto Cfunc;
+        case LUA_TCCL: {  /* C closure */
+            f = clCvalue(func)->f;
+Cfunc:
+            luaD_checkstack(L, LUA_MINSTACK);  /* ensure minimum stack size */
+            ci = next_ci(L);  /* now 'enter' new function */
+            ci->nresults = nresults;
+            ci->func = restorestack(L, funcr);
+            ci->top = L->top + LUA_MINSTACK;
+            lua_assert(ci->top <= L->stack_last);
+            ci->callstatus = 0;
+            luaC_checkGC(L);  /* stack grow uses memory */
+            if (L->hookmask & LUA_MASKCALL)
+                luaD_hook(L, LUA_HOOKCALL, -1);
+            lua_unlock(L);
+            n = (*f)(L);  /* do the actual call */
+            lua_lock(L);
+            api_checknelems(L, n);
+            luaD_poscall(L, L->top - n);
+            return 1;
+        }
+        case LUA_TLCL: {  /* Lua function: prepare its call */
+            StkId base;
+            Proto *p = clLvalue(func)->p;
+            luaD_checkstack(L, p->maxstacksize);
+            func = restorestack(L, funcr);
+            n = cast_int(L->top - func) - 1;  /* number of real arguments */
+            for (; n < p->numparams; n++)
+                setnilvalue(L->top++);  /* complete missing arguments */
+            base = (!p->is_vararg) ? func + 1 : adjust_varargs(L, p, n);
+            ci = next_ci(L);  /* now 'enter' new function */
+            ci->nresults = nresults;
+            ci->func = func;
+            ci->u.l.base = base;
+            ci->top = base + p->maxstacksize;
+            lua_assert(ci->top <= L->stack_last);
+            ci->u.l.savedpc = p->code;  /* starting point */
+            ci->callstatus = CIST_LUA;
+            L->top = ci->top;
+            luaC_checkGC(L);  /* stack grow uses memory */
+            if (L->hookmask & LUA_MASKCALL)
+                callhook(L, ci);
+            return 0;
+        }
+        default: {  /* not a function */
+            func = tryfuncTM(L, func);  /* retry with 'function' tag method */
+            return luaD_precall(L, func, nresults);  /* now it must be a function */
+        }
     }
-    case LUA_TLCL: {  /* Lua function: prepare its call */
-      StkId base;
-      Proto *p = clLvalue(func)->p;
-      luaD_checkstack(L, p->maxstacksize);
-      func = restorestack(L, funcr);
-      n = cast_int(L->top - func) - 1;  /* number of real arguments */
-      for (; n < p->numparams; n++)
-        setnilvalue(L->top++);  /* complete missing arguments */
-      base = (!p->is_vararg) ? func + 1 : adjust_varargs(L, p, n);
-      ci = next_ci(L);  /* now 'enter' new function */
-      ci->nresults = nresults;
-      ci->func = func;
-      ci->u.l.base = base;
-      ci->top = base + p->maxstacksize;
-      lua_assert(ci->top <= L->stack_last);
-      ci->u.l.savedpc = p->code;  /* starting point */
-      ci->callstatus = CIST_LUA;
-      L->top = ci->top;
-      luaC_checkGC(L);  /* stack grow uses memory */
-      if (L->hookmask & LUA_MASKCALL)
-        callhook(L, ci);
-      return 0;
-    }
-    default: {  /* not a function */
-      func = tryfuncTM(L, func);  /* retry with 'function' tag method */
-      return luaD_precall(L, func, nresults);  /* now it must be a function */
-    }
-  }
 }
 
 
-int luaD_poscall (lua_State *L, StkId firstResult) {
-  StkId res;
-  int wanted, i;
-  CallInfo *ci = L->ci;
-  if (L->hookmask & (LUA_MASKRET | LUA_MASKLINE)) {
-    if (L->hookmask & LUA_MASKRET) {
-      ptrdiff_t fr = savestack(L, firstResult);  /* hook may change stack */
-      luaD_hook(L, LUA_HOOKRET, -1);
-      firstResult = restorestack(L, fr);
+int luaD_poscall(lua_State *L, StkId firstResult)
+{
+    StkId res;
+    int wanted, i;
+    CallInfo *ci = L->ci;
+    if (L->hookmask & (LUA_MASKRET | LUA_MASKLINE)) {
+        if (L->hookmask & LUA_MASKRET) {
+            ptrdiff_t fr = savestack(L, firstResult);  /* hook may change stack */
+            luaD_hook(L, LUA_HOOKRET, -1);
+            firstResult = restorestack(L, fr);
+        }
+        L->oldpc = ci->previous->u.l.savedpc;  /* 'oldpc' for caller function */
     }
-    L->oldpc = ci->previous->u.l.savedpc;  /* 'oldpc' for caller function */
-  }
-  res = ci->func;  /* res == final position of 1st result */
-  wanted = ci->nresults;
-  L->ci = ci = ci->previous;  /* back to caller */
-  /* move results to correct place */
-  for (i = wanted; i != 0 && firstResult < L->top; i--)
-    setobjs2s(L, res++, firstResult++);
-  while (i-- > 0)
-    setnilvalue(res++);
-  L->top = res;
-  return (wanted - LUA_MULTRET);  /* 0 iff wanted == LUA_MULTRET */
+    res = ci->func;  /* res == final position of 1st result */
+    wanted = ci->nresults;
+    L->ci = ci = ci->previous;  /* back to caller */
+    /* move results to correct place */
+    for (i = wanted; i != 0 && firstResult < L->top; i--)
+        setobjs2s(L, res++, firstResult++);
+    while (i-- > 0)
+        setnilvalue(res++);
+    L->top = res;
+    return (wanted - LUA_MULTRET);  /* 0 iff wanted == LUA_MULTRET */
 }
 
 
@@ -383,90 +394,95 @@ int luaD_poscall (lua_State *L, StkId firstResult) {
 ** When returns, all the results are on the stack, starting at the original
 ** function position.
 */
-void luaD_call (lua_State *L, StkId func, int nResults, int allowyield) {
-  if (++L->nCcalls >= LUAI_MAXCCALLS) {
-    if (L->nCcalls == LUAI_MAXCCALLS)
-      luaG_runerror(L, "C stack overflow");
-    else if (L->nCcalls >= (LUAI_MAXCCALLS + (LUAI_MAXCCALLS>>3)))
-      luaD_throw(L, LUA_ERRERR);  /* error while handing stack error */
-  }
-  if (!allowyield) L->nny++;
-  if (!luaD_precall(L, func, nResults))  /* is a Lua function? */
-    luaV_execute(L);  /* call it */
-  if (!allowyield) L->nny--;
-  L->nCcalls--;
-}
-
-
-static void finishCcall (lua_State *L) {
-  CallInfo *ci = L->ci;
-  int n;
-  lua_assert(ci->u.c.k != NULL);  /* must have a continuation */
-  lua_assert(L->nny == 0);
-  if (ci->callstatus & CIST_YPCALL) {  /* was inside a pcall? */
-    ci->callstatus &= ~CIST_YPCALL;  /* finish 'lua_pcall' */
-    L->errfunc = ci->u.c.old_errfunc;
-  }
-  /* finish 'lua_callk'/'lua_pcall' */
-  adjustresults(L, ci->nresults);
-  /* call continuation function */
-  if (!(ci->callstatus & CIST_STAT))  /* no call status? */
-    ci->u.c.status = LUA_YIELD;  /* 'default' status */
-  lua_assert(ci->u.c.status != LUA_OK);
-  ci->callstatus = (ci->callstatus & ~(CIST_YPCALL | CIST_STAT)) | CIST_YIELDED;
-  lua_unlock(L);
-  n = (*ci->u.c.k)(L);
-  lua_lock(L);
-  api_checknelems(L, n);
-  /* finish 'luaD_precall' */
-  luaD_poscall(L, L->top - n);
-}
-
-
-static void unroll (lua_State *L, void *ud) {
-  UNUSED(ud);
-  for (;;) {
-    if (L->ci == &L->base_ci)  /* stack is empty? */
-      return;  /* coroutine finished normally */
-    if (!isLua(L->ci))  /* C function? */
-      finishCcall(L);
-    else {  /* Lua function */
-      luaV_finishOp(L);  /* finish interrupted instruction */
-      luaV_execute(L);  /* execute down to higher C 'boundary' */
+void luaD_call(lua_State *L, StkId func, int nResults, int allowyield)
+{
+    if (++L->nCcalls >= LUAI_MAXCCALLS) {
+        if (L->nCcalls == LUAI_MAXCCALLS)
+            luaG_runerror(L, "C stack overflow");
+        else if (L->nCcalls >= (LUAI_MAXCCALLS + (LUAI_MAXCCALLS >> 3)))
+            luaD_throw(L, LUA_ERRERR);  /* error while handing stack error */
+    }
+    if (!allowyield) L->nny++;
+    if (!luaD_precall(L, func, nResults))  /* is a Lua function? */
+        luaV_execute(L);  /* call it */
+    if (!allowyield) L->nny--;
+    L->nCcalls--;
+}
+
+
+static void finishCcall(lua_State *L)
+{
+    CallInfo *ci = L->ci;
+    int n;
+    lua_assert(ci->u.c.k != NULL);  /* must have a continuation */
+    lua_assert(L->nny == 0);
+    if (ci->callstatus & CIST_YPCALL) {  /* was inside a pcall? */
+        ci->callstatus &= ~CIST_YPCALL;  /* finish 'lua_pcall' */
+        L->errfunc = ci->u.c.old_errfunc;
+    }
+    /* finish 'lua_callk'/'lua_pcall' */
+    adjustresults(L, ci->nresults);
+    /* call continuation function */
+    if (!(ci->callstatus & CIST_STAT))  /* no call status? */
+        ci->u.c.status = LUA_YIELD;  /* 'default' status */
+    lua_assert(ci->u.c.status != LUA_OK);
+    ci->callstatus = (ci->callstatus & ~(CIST_YPCALL | CIST_STAT)) | CIST_YIELDED;
+    lua_unlock(L);
+    n = (*ci->u.c.k)(L);
+    lua_lock(L);
+    api_checknelems(L, n);
+    /* finish 'luaD_precall' */
+    luaD_poscall(L, L->top - n);
+}
+
+
+static void unroll(lua_State *L, void *ud)
+{
+    UNUSED(ud);
+    for (;;) {
+        if (L->ci == &L->base_ci)  /* stack is empty? */
+            return;  /* coroutine finished normally */
+        if (!isLua(L->ci))  /* C function? */
+            finishCcall(L);
+        else {  /* Lua function */
+            luaV_finishOp(L);  /* finish interrupted instruction */
+            luaV_execute(L);  /* execute down to higher C 'boundary' */
+        }
     }
-  }
 }
 
 
 /*
 ** check whether thread has a suspended protected call
 */
-static CallInfo *findpcall (lua_State *L) {
-  CallInfo *ci;
-  for (ci = L->ci; ci != NULL; ci = ci->previous) {  /* search for a pcall */
-    if (ci->callstatus & CIST_YPCALL)
-      return ci;
-  }
-  return NULL;  /* no pending pcall */
+static CallInfo *findpcall(lua_State *L)
+{
+    CallInfo *ci;
+    for (ci = L->ci; ci != NULL; ci = ci->previous) {  /* search for a pcall */
+        if (ci->callstatus & CIST_YPCALL)
+            return ci;
+    }
+    return NULL;  /* no pending pcall */
 }
 
 
-static int recover (lua_State *L, int status) {
-  StkId oldtop;
-  CallInfo *ci = findpcall(L);
-  if (ci == NULL) return 0;  /* no recovery point */
-  /* "finish" luaD_pcall */
-  oldtop = restorestack(L, ci->extra);
-  luaF_close(L, oldtop);
-  seterrorobj(L, status, oldtop);
-  L->ci = ci;
-  L->allowhook = ci->u.c.old_allowhook;
-  L->nny = 0;  /* should be zero to be yieldable */
-  luaD_shrinkstack(L);
-  L->errfunc = ci->u.c.old_errfunc;
-  ci->callstatus |= CIST_STAT;  /* call has error status */
-  ci->u.c.status = status;  /* (here it is) */
-  return 1;  /* continue running the coroutine */
+static int recover(lua_State *L, int status)
+{
+    StkId oldtop;
+    CallInfo *ci = findpcall(L);
+    if (ci == NULL) return 0;  /* no recovery point */
+    /* "finish" luaD_pcall */
+    oldtop = restorestack(L, ci->extra);
+    luaF_close(L, oldtop);
+    seterrorobj(L, status, oldtop);
+    L->ci = ci;
+    L->allowhook = ci->u.c.old_allowhook;
+    L->nny = 0;  /* should be zero to be yieldable */
+    luaD_shrinkstack(L);
+    L->errfunc = ci->u.c.old_errfunc;
+    ci->callstatus |= CIST_STAT;  /* call has error status */
+    ci->u.c.status = status;  /* (here it is) */
+    return 1;  /* continue running the coroutine */
 }
 
 
@@ -475,135 +491,138 @@ static int recover (lua_State *L, int status) {
 ** coroutine itself. (Such errors should not be handled by any coroutine
 ** error handler and should not kill the coroutine.)
 */
-static l_noret resume_error (lua_State *L, const char *msg, StkId firstArg) {
-  L->top = firstArg;  /* remove args from the stack */
-  setsvalue2s(L, L->top, luaS_new(L, msg));  /* push error message */
-  api_incr_top(L);
-  luaD_throw(L, -1);  /* jump back to 'lua_resume' */
+static l_noret resume_error(lua_State *L, const char *msg, StkId firstArg)
+{
+    L->top = firstArg;  /* remove args from the stack */
+    setsvalue2s(L, L->top, luaS_new(L, msg));  /* push error message */
+    api_incr_top(L);
+    luaD_throw(L, -1);  /* jump back to 'lua_resume' */
 }
 
 
 /*
 ** do the work for 'lua_resume' in protected mode
 */
-static void resume (lua_State *L, void *ud) {
-  int nCcalls = L->nCcalls;
-  StkId firstArg = cast(StkId, ud);
-  CallInfo *ci = L->ci;
-  if (nCcalls >= LUAI_MAXCCALLS)
-    resume_error(L, "C stack overflow", firstArg);
-  if (L->status == LUA_OK) {  /* may be starting a coroutine */
-    if (ci != &L->base_ci)  /* not in base level? */
-      resume_error(L, "cannot resume non-suspended coroutine", firstArg);
-    /* coroutine is in base level; start running it */
-    if (!luaD_precall(L, firstArg - 1, LUA_MULTRET))  /* Lua function? */
-      luaV_execute(L);  /* call it */
-  }
-  else if (L->status != LUA_YIELD)
-    resume_error(L, "cannot resume dead coroutine", firstArg);
-  else {  /* resuming from previous yield */
-    L->status = LUA_OK;
-    ci->func = restorestack(L, ci->extra);
-    if (isLua(ci))  /* yielded inside a hook? */
-      luaV_execute(L);  /* just continue running Lua code */
-    else {  /* 'common' yield */
-      if (ci->u.c.k != NULL) {  /* does it have a continuation? */
-        int n;
-        ci->u.c.status = LUA_YIELD;  /* 'default' status */
-        ci->callstatus |= CIST_YIELDED;
-        lua_unlock(L);
-        n = (*ci->u.c.k)(L);  /* call continuation */
-        lua_lock(L);
-        api_checknelems(L, n);
-        firstArg = L->top - n;  /* yield results come from continuation */
-      }
-      luaD_poscall(L, firstArg);  /* finish 'luaD_precall' */
+static void resume(lua_State *L, void *ud)
+{
+    int nCcalls = L->nCcalls;
+    StkId firstArg = cast(StkId, ud);
+    CallInfo *ci = L->ci;
+    if (nCcalls >= LUAI_MAXCCALLS)
+        resume_error(L, "C stack overflow", firstArg);
+    if (L->status == LUA_OK) {  /* may be starting a coroutine */
+        if (ci != &L->base_ci)  /* not in base level? */
+            resume_error(L, "cannot resume non-suspended coroutine", firstArg);
+        /* coroutine is in base level; start running it */
+        if (!luaD_precall(L, firstArg - 1, LUA_MULTRET))  /* Lua function? */
+            luaV_execute(L);  /* call it */
+    } else if (L->status != LUA_YIELD)
+        resume_error(L, "cannot resume dead coroutine", firstArg);
+    else {  /* resuming from previous yield */
+        L->status = LUA_OK;
+        ci->func = restorestack(L, ci->extra);
+        if (isLua(ci))  /* yielded inside a hook? */
+            luaV_execute(L);  /* just continue running Lua code */
+        else {  /* 'common' yield */
+            if (ci->u.c.k != NULL) {  /* does it have a continuation? */
+                int n;
+                ci->u.c.status = LUA_YIELD;  /* 'default' status */
+                ci->callstatus |= CIST_YIELDED;
+                lua_unlock(L);
+                n = (*ci->u.c.k)(L);  /* call continuation */
+                lua_lock(L);
+                api_checknelems(L, n);
+                firstArg = L->top - n;  /* yield results come from continuation */
+            }
+            luaD_poscall(L, firstArg);  /* finish 'luaD_precall' */
+        }
+        unroll(L, NULL);
     }
-    unroll(L, NULL);
-  }
-  lua_assert(nCcalls == L->nCcalls);
+    lua_assert(nCcalls == L->nCcalls);
 }
 
 
-LUA_API int lua_resume (lua_State *L, lua_State *from, int nargs) {
-  int status;
-  lua_lock(L);
-  luai_userstateresume(L, nargs);
-  L->nCcalls = (from) ? from->nCcalls + 1 : 1;
-  L->nny = 0;  /* allow yields */
-  api_checknelems(L, (L->status == LUA_OK) ? nargs + 1 : nargs);
-  status = luaD_rawrunprotected(L, resume, L->top - nargs);
-  if (status == -1)  /* error calling 'lua_resume'? */
-    status = LUA_ERRRUN;
-  else {  /* yield or regular error */
-    while (status != LUA_OK && status != LUA_YIELD) {  /* error? */
-      if (recover(L, status))  /* recover point? */
-        status = luaD_rawrunprotected(L, unroll, NULL);  /* run continuation */
-      else {  /* unrecoverable error */
-        L->status = cast_byte(status);  /* mark thread as `dead' */
-        seterrorobj(L, status, L->top);
-        L->ci->top = L->top;
-        break;
-      }
+LUA_API int lua_resume(lua_State *L, lua_State *from, int nargs)
+{
+    int status;
+    lua_lock(L);
+    luai_userstateresume(L, nargs);
+    L->nCcalls = (from) ? from->nCcalls + 1 : 1;
+    L->nny = 0;  /* allow yields */
+    api_checknelems(L, (L->status == LUA_OK) ? nargs + 1 : nargs);
+    status = luaD_rawrunprotected(L, resume, L->top - nargs);
+    if (status == -1)  /* error calling 'lua_resume'? */
+        status = LUA_ERRRUN;
+    else {  /* yield or regular error */
+        while (status != LUA_OK && status != LUA_YIELD) {  /* error? */
+            if (recover(L, status))  /* recover point? */
+                status = luaD_rawrunprotected(L, unroll, NULL);  /* run continuation */
+            else {  /* unrecoverable error */
+                L->status = cast_byte(status);  /* mark thread as `dead' */
+                seterrorobj(L, status, L->top);
+                L->ci->top = L->top;
+                break;
+            }
+        }
+        lua_assert(status == L->status);
     }
-    lua_assert(status == L->status);
-  }
-  L->nny = 1;  /* do not allow yields */
-  L->nCcalls--;
-  lua_assert(L->nCcalls == ((from) ? from->nCcalls : 0));
-  lua_unlock(L);
-  return status;
+    L->nny = 1;  /* do not allow yields */
+    L->nCcalls--;
+    lua_assert(L->nCcalls == ((from) ? from->nCcalls : 0));
+    lua_unlock(L);
+    return status;
 }
 
 
-LUA_API int lua_yieldk (lua_State *L, int nresults, int ctx, lua_CFunction k) {
-  CallInfo *ci = L->ci;
-  luai_userstateyield(L, nresults);
-  lua_lock(L);
-  api_checknelems(L, nresults);
-  if (L->nny > 0) {
-    if (L != G(L)->mainthread)
-      luaG_runerror(L, "attempt to yield across a C-call boundary");
-    else
-      luaG_runerror(L, "attempt to yield from outside a coroutine");
-  }
-  L->status = LUA_YIELD;
-  ci->extra = savestack(L, ci->func);  /* save current 'func' */
-  if (isLua(ci)) {  /* inside a hook? */
-    api_check(L, k == NULL, "hooks cannot continue after yielding");
-  }
-  else {
-    if ((ci->u.c.k = k) != NULL)  /* is there a continuation? */
-      ci->u.c.ctx = ctx;  /* save context */
-    ci->func = L->top - nresults - 1;  /* protect stack below results */
-    luaD_throw(L, LUA_YIELD);
-  }
-  lua_assert(ci->callstatus & CIST_HOOKED);  /* must be inside a hook */
-  lua_unlock(L);
-  return 0;  /* return to 'luaD_hook' */
+LUA_API int lua_yieldk(lua_State *L, int nresults, int ctx, lua_CFunction k)
+{
+    CallInfo *ci = L->ci;
+    luai_userstateyield(L, nresults);
+    lua_lock(L);
+    api_checknelems(L, nresults);
+    if (L->nny > 0) {
+        if (L != G(L)->mainthread)
+            luaG_runerror(L, "attempt to yield across a C-call boundary");
+        else
+            luaG_runerror(L, "attempt to yield from outside a coroutine");
+    }
+    L->status = LUA_YIELD;
+    ci->extra = savestack(L, ci->func);  /* save current 'func' */
+    if (isLua(ci)) {  /* inside a hook? */
+        api_check(L, k == NULL, "hooks cannot continue after yielding");
+    } else {
+        if ((ci->u.c.k = k) != NULL)  /* is there a continuation? */
+            ci->u.c.ctx = ctx;  /* save context */
+        ci->func = L->top - nresults - 1;  /* protect stack below results */
+        luaD_throw(L, LUA_YIELD);
+    }
+    lua_assert(ci->callstatus & CIST_HOOKED);  /* must be inside a hook */
+    lua_unlock(L);
+    return 0;  /* return to 'luaD_hook' */
 }
 
 
-int luaD_pcall (lua_State *L, Pfunc func, void *u,
-                ptrdiff_t old_top, ptrdiff_t ef) {
-  int status;
-  CallInfo *old_ci = L->ci;
-  lu_byte old_allowhooks = L->allowhook;
-  unsigned short old_nny = L->nny;
-  ptrdiff_t old_errfunc = L->errfunc;
-  L->errfunc = ef;
-  status = luaD_rawrunprotected(L, func, u);
-  if (status != LUA_OK) {  /* an error occurred? */
-    StkId oldtop = restorestack(L, old_top);
-    luaF_close(L, oldtop);  /* close possible pending closures */
-    seterrorobj(L, status, oldtop);
-    L->ci = old_ci;
-    L->allowhook = old_allowhooks;
-    L->nny = old_nny;
-    luaD_shrinkstack(L);
-  }
-  L->errfunc = old_errfunc;
-  return status;
+int luaD_pcall(lua_State *L, Pfunc func, void *u,
+               ptrdiff_t old_top, ptrdiff_t ef)
+{
+    int status;
+    CallInfo *old_ci = L->ci;
+    lu_byte old_allowhooks = L->allowhook;
+    unsigned short old_nny = L->nny;
+    ptrdiff_t old_errfunc = L->errfunc;
+    L->errfunc = ef;
+    status = luaD_rawrunprotected(L, func, u);
+    if (status != LUA_OK) {  /* an error occurred? */
+        StkId oldtop = restorestack(L, old_top);
+        luaF_close(L, oldtop);  /* close possible pending closures */
+        seterrorobj(L, status, oldtop);
+        L->ci = old_ci;
+        L->allowhook = old_allowhooks;
+        L->nny = old_nny;
+        luaD_shrinkstack(L);
+    }
+    L->errfunc = old_errfunc;
+    return status;
 }
 
 
@@ -612,62 +631,69 @@ int luaD_pcall (lua_State *L, Pfunc func, void *u,
 ** Execute a protected parser.
 */
 struct SParser {  /* data to `f_parser' */
-  ZIO *z;
-  Mbuffer buff;  /* dynamic structure used by the scanner */
-  Dyndata dyd;  /* dynamic structures used by the parser */
-  const char *mode;
-  const char *name;
+    ZIO *z;
+    Mbuffer buff;  /* dynamic structure used by the scanner */
+    Dyndata dyd;  /* dynamic structures used by the parser */
+    const char *mode;
+    const char *name;
 };
 
 
-static void checkmode (lua_State *L, const char *mode, const char *x) {
-  if (mode && strchr(mode, x[0]) == NULL) {
-    luaO_pushfstring(L,
-       "attempt to load a %s chunk (mode is " LUA_QS ")", x, mode);
-    luaD_throw(L, LUA_ERRSYNTAX);
-  }
+static void checkmode(lua_State *L, const char *mode, const char *x)
+{
+    if (mode && strchr(mode, x[0]) == NULL) {
+        luaO_pushfstring(L,
+                         "attempt to load a %s chunk (mode is " LUA_QS ")", x, mode);
+        luaD_throw(L, LUA_ERRSYNTAX);
+    }
 }
 
 
-static void f_parser (lua_State *L, void *ud) {
-  int i;
-  Closure *cl;
-  struct SParser *p = cast(struct SParser *, ud);
-  int c = zgetc(p->z);  /* read first character */
-  if (c == LUA_SIGNATURE[0]) {
-    checkmode(L, p->mode, "binary");
-    cl = luaU_undump(L, p->z, &p->buff, p->name);
-  }
-  else {
-    checkmode(L, p->mode, "text");
-    cl = luaY_parser(L, p->z, &p->buff, &p->dyd, p->name, c);
-  }
-  lua_assert(cl->l.nupvalues == cl->l.p->sizeupvalues);
-  for (i = 0; i < cl->l.nupvalues; i++) {  /* initialize upvalues */
-    UpVal *up = luaF_newupval(L);
-    cl->l.upvals[i] = up;
-    luaC_objbarrier(L, cl, up);
-  }
+static void f_parser(lua_State *L, void *ud)
+{
+    int i;
+    Closure *cl;
+    struct SParser *p = cast(struct SParser *, ud);
+    int c = zgetc(p->z);  /* read first character */
+    if (c == LUA_SIGNATURE[0]) {
+        checkmode(L, p->mode, "binary");
+        cl = luaU_undump(L, p->z, &p->buff, p->name);
+    } else {
+        checkmode(L, p->mode, "text");
+        cl = luaY_parser(L, p->z, &p->buff, &p->dyd, p->name, c);
+    }
+    lua_assert(cl->l.nupvalues == cl->l.p->sizeupvalues);
+    for (i = 0; i < cl->l.nupvalues; i++) {  /* initialize upvalues */
+        UpVal *up = luaF_newupval(L);
+        cl->l.upvals[i] = up;
+        luaC_objbarrier(L, cl, up);
+    }
 }
 
 
-int luaD_protectedparser (lua_State *L, ZIO *z, const char *name,
-                                        const char *mode) {
-  struct SParser p;
-  int status;
-  L->nny++;  /* cannot yield during parsing */
-  p.z = z; p.name = name; p.mode = mode;
-  p.dyd.actvar.arr = NULL; p.dyd.actvar.size = 0;
-  p.dyd.gt.arr = NULL; p.dyd.gt.size = 0;
-  p.dyd.label.arr = NULL; p.dyd.label.size = 0;
-  luaZ_initbuffer(L, &p.buff);
-  status = luaD_pcall(L, f_parser, &p, savestack(L, L->top), L->errfunc);
-  luaZ_freebuffer(L, &p.buff);
-  luaM_freearray(L, p.dyd.actvar.arr, p.dyd.actvar.size);
-  luaM_freearray(L, p.dyd.gt.arr, p.dyd.gt.size);
-  luaM_freearray(L, p.dyd.label.arr, p.dyd.label.size);
-  L->nny--;
-  return status;
+int luaD_protectedparser(lua_State *L, ZIO *z, const char *name,
+                         const char *mode)
+{
+    struct SParser p;
+    int status;
+    L->nny++;  /* cannot yield during parsing */
+    p.z = z;
+    p.name = name;
+    p.mode = mode;
+    p.dyd.actvar.arr = NULL;
+    p.dyd.actvar.size = 0;
+    p.dyd.gt.arr = NULL;
+    p.dyd.gt.size = 0;
+    p.dyd.label.arr = NULL;
+    p.dyd.label.size = 0;
+    luaZ_initbuffer(L, &p.buff);
+    status = luaD_pcall(L, f_parser, &p, savestack(L, L->top), L->errfunc);
+    luaZ_freebuffer(L, &p.buff);
+    luaM_freearray(L, p.dyd.actvar.arr, p.dyd.actvar.size);
+    luaM_freearray(L, p.dyd.gt.arr, p.dyd.gt.size);
+    luaM_freearray(L, p.dyd.label.arr, p.dyd.label.size);
+    L->nny--;
+    return status;
 }
 
 
diff --git a/liblua/ldo.h b/liblua/ldo.h
index f1c1b48d8..1530aaadf 100644
--- a/liblua/ldo.h
+++ b/liblua/ldo.h
@@ -14,7 +14,7 @@
 
 
 #define luaD_checkstack(L,n) if (L->stack_last - L->top <= (n)) \
-                    luaD_growstack(L, n); else condmovestack(L);
+        luaD_growstack(L, n); else condmovestack(L);
 
 
 #define incr_top(L) {L->top++; luaD_checkstack(L,0);}
@@ -24,23 +24,23 @@
 
 
 /* type of protected functions, to be ran by `runprotected' */
-typedef void (*Pfunc) (lua_State *L, void *ud);
+typedef void (*Pfunc)(lua_State *L, void *ud);
 
-LUAI_FUNC int luaD_protectedparser (lua_State *L, ZIO *z, const char *name,
-                                                  const char *mode);
-LUAI_FUNC void luaD_hook (lua_State *L, int event, int line);
-LUAI_FUNC int luaD_precall (lua_State *L, StkId func, int nresults);
-LUAI_FUNC void luaD_call (lua_State *L, StkId func, int nResults,
-                                        int allowyield);
-LUAI_FUNC int luaD_pcall (lua_State *L, Pfunc func, void *u,
-                                        ptrdiff_t oldtop, ptrdiff_t ef);
-LUAI_FUNC int luaD_poscall (lua_State *L, StkId firstResult);
-LUAI_FUNC void luaD_reallocstack (lua_State *L, int newsize);
-LUAI_FUNC void luaD_growstack (lua_State *L, int n);
-LUAI_FUNC void luaD_shrinkstack (lua_State *L);
+LUAI_FUNC int luaD_protectedparser(lua_State *L, ZIO *z, const char *name,
+                                   const char *mode);
+LUAI_FUNC void luaD_hook(lua_State *L, int event, int line);
+LUAI_FUNC int luaD_precall(lua_State *L, StkId func, int nresults);
+LUAI_FUNC void luaD_call(lua_State *L, StkId func, int nResults,
+                         int allowyield);
+LUAI_FUNC int luaD_pcall(lua_State *L, Pfunc func, void *u,
+                         ptrdiff_t oldtop, ptrdiff_t ef);
+LUAI_FUNC int luaD_poscall(lua_State *L, StkId firstResult);
+LUAI_FUNC void luaD_reallocstack(lua_State *L, int newsize);
+LUAI_FUNC void luaD_growstack(lua_State *L, int n);
+LUAI_FUNC void luaD_shrinkstack(lua_State *L);
 
-LUAI_FUNC l_noret luaD_throw (lua_State *L, int errcode);
-LUAI_FUNC int luaD_rawrunprotected (lua_State *L, Pfunc f, void *ud);
+LUAI_FUNC l_noret luaD_throw(lua_State *L, int errcode);
+LUAI_FUNC int luaD_rawrunprotected(lua_State *L, Pfunc f, void *ud);
 
 #endif
 
diff --git a/liblua/ldump.c b/liblua/ldump.c
index aca840679..df3810a9d 100644
--- a/liblua/ldump.c
+++ b/liblua/ldump.c
@@ -16,158 +16,151 @@
 #include "lundump.h"
 
 typedef struct {
- lua_State* L;
- lua_Writer writer;
- void* data;
- int strip;
- int status;
+    lua_State *L;
+    lua_Writer writer;
+    void *data;
+    int strip;
+    int status;
 } DumpState;
 
 #define DumpMem(b,n,size,D) DumpBlock(b,(n)*(size),D)
 #define DumpVar(x,D)        DumpMem(&x,1,sizeof(x),D)
 
-static void DumpBlock(const void* b, size_t size, DumpState* D)
+static void DumpBlock(const void *b, size_t size, DumpState *D)
 {
- if (D->status==0)
- {
-  lua_unlock(D->L);
-  D->status=(*D->writer)(D->L,b,size,D->data);
-  lua_lock(D->L);
- }
+    if (D->status == 0) {
+        lua_unlock(D->L);
+        D->status = (*D->writer)(D->L, b, size, D->data);
+        lua_lock(D->L);
+    }
 }
 
-static void DumpChar(int y, DumpState* D)
+static void DumpChar(int y, DumpState *D)
 {
- char x=(char)y;
- DumpVar(x,D);
+    char x = (char)y;
+    DumpVar(x, D);
 }
 
-static void DumpInt(int x, DumpState* D)
+static void DumpInt(int x, DumpState *D)
 {
- DumpVar(x,D);
+    DumpVar(x, D);
 }
 
-static void DumpNumber(lua_Number x, DumpState* D)
+static void DumpNumber(lua_Number x, DumpState *D)
 {
- DumpVar(x,D);
+    DumpVar(x, D);
 }
 
-static void DumpVector(const void* b, int n, size_t size, DumpState* D)
+static void DumpVector(const void *b, int n, size_t size, DumpState *D)
 {
- DumpInt(n,D);
- DumpMem(b,n,size,D);
+    DumpInt(n, D);
+    DumpMem(b, n, size, D);
 }
 
-static void DumpString(const TString* s, DumpState* D)
+static void DumpString(const TString *s, DumpState *D)
 {
- if (s==NULL)
- {
-  size_t size=0;
-  DumpVar(size,D);
- }
- else
- {
-  size_t size=s->tsv.len+1; /* include trailing '\0' */
-  DumpVar(size,D);
-  DumpBlock(getstr(s),size*sizeof(char),D);
- }
+    if (s == NULL) {
+        size_t size = 0;
+        DumpVar(size, D);
+    } else {
+        size_t size = s->tsv.len + 1; /* include trailing '\0' */
+        DumpVar(size, D);
+        DumpBlock(getstr(s), size * sizeof(char), D);
+    }
 }
 
 #define DumpCode(f,D) DumpVector(f->code,f->sizecode,sizeof(Instruction),D)
 
-static void DumpFunction(const Proto* f, DumpState* D);
+static void DumpFunction(const Proto *f, DumpState *D);
 
-static void DumpConstants(const Proto* f, DumpState* D)
+static void DumpConstants(const Proto *f, DumpState *D)
 {
- int i,n=f->sizek;
- DumpInt(n,D);
- for (i=0; i<n; i++)
- {
-  const TValue* o=&f->k[i];
-  DumpChar(ttypenv(o),D);
-  switch (ttypenv(o))
-  {
-   case LUA_TNIL:
-    break;
-   case LUA_TBOOLEAN:
-    DumpChar(bvalue(o),D);
-    break;
-   case LUA_TNUMBER:
-    DumpNumber(nvalue(o),D);
-    break;
-   case LUA_TSTRING:
-    DumpString(rawtsvalue(o),D);
-    break;
-    default: lua_assert(0);
-  }
- }
- n=f->sizep;
- DumpInt(n,D);
- for (i=0; i<n; i++) DumpFunction(f->p[i],D);
+    int i, n = f->sizek;
+    DumpInt(n, D);
+    for (i = 0; i < n; i++) {
+        const TValue *o = &f->k[i];
+        DumpChar(ttypenv(o), D);
+        switch (ttypenv(o)) {
+            case LUA_TNIL:
+                break;
+            case LUA_TBOOLEAN:
+                DumpChar(bvalue(o), D);
+                break;
+            case LUA_TNUMBER:
+                DumpNumber(nvalue(o), D);
+                break;
+            case LUA_TSTRING:
+                DumpString(rawtsvalue(o), D);
+                break;
+            default:
+                lua_assert(0);
+        }
+    }
+    n = f->sizep;
+    DumpInt(n, D);
+    for (i = 0; i < n; i++) DumpFunction(f->p[i], D);
 }
 
-static void DumpUpvalues(const Proto* f, DumpState* D)
+static void DumpUpvalues(const Proto *f, DumpState *D)
 {
- int i,n=f->sizeupvalues;
- DumpInt(n,D);
- for (i=0; i<n; i++)
- {
-  DumpChar(f->upvalues[i].instack,D);
-  DumpChar(f->upvalues[i].idx,D);
- }
+    int i, n = f->sizeupvalues;
+    DumpInt(n, D);
+    for (i = 0; i < n; i++) {
+        DumpChar(f->upvalues[i].instack, D);
+        DumpChar(f->upvalues[i].idx, D);
+    }
 }
 
-static void DumpDebug(const Proto* f, DumpState* D)
+static void DumpDebug(const Proto *f, DumpState *D)
 {
- int i,n;
- DumpString((D->strip) ? NULL : f->source,D);
- n= (D->strip) ? 0 : f->sizelineinfo;
- DumpVector(f->lineinfo,n,sizeof(int),D);
- n= (D->strip) ? 0 : f->sizelocvars;
- DumpInt(n,D);
- for (i=0; i<n; i++)
- {
-  DumpString(f->locvars[i].varname,D);
-  DumpInt(f->locvars[i].startpc,D);
-  DumpInt(f->locvars[i].endpc,D);
- }
- n= (D->strip) ? 0 : f->sizeupvalues;
- DumpInt(n,D);
- for (i=0; i<n; i++) DumpString(f->upvalues[i].name,D);
+    int i, n;
+    DumpString((D->strip) ? NULL : f->source, D);
+    n = (D->strip) ? 0 : f->sizelineinfo;
+    DumpVector(f->lineinfo, n, sizeof(int), D);
+    n = (D->strip) ? 0 : f->sizelocvars;
+    DumpInt(n, D);
+    for (i = 0; i < n; i++) {
+        DumpString(f->locvars[i].varname, D);
+        DumpInt(f->locvars[i].startpc, D);
+        DumpInt(f->locvars[i].endpc, D);
+    }
+    n = (D->strip) ? 0 : f->sizeupvalues;
+    DumpInt(n, D);
+    for (i = 0; i < n; i++) DumpString(f->upvalues[i].name, D);
 }
 
-static void DumpFunction(const Proto* f, DumpState* D)
+static void DumpFunction(const Proto *f, DumpState *D)
 {
- DumpInt(f->linedefined,D);
- DumpInt(f->lastlinedefined,D);
- DumpChar(f->numparams,D);
- DumpChar(f->is_vararg,D);
- DumpChar(f->maxstacksize,D);
- DumpCode(f,D);
- DumpConstants(f,D);
- DumpUpvalues(f,D);
- DumpDebug(f,D);
+    DumpInt(f->linedefined, D);
+    DumpInt(f->lastlinedefined, D);
+    DumpChar(f->numparams, D);
+    DumpChar(f->is_vararg, D);
+    DumpChar(f->maxstacksize, D);
+    DumpCode(f, D);
+    DumpConstants(f, D);
+    DumpUpvalues(f, D);
+    DumpDebug(f, D);
 }
 
-static void DumpHeader(DumpState* D)
+static void DumpHeader(DumpState *D)
 {
- lu_byte h[LUAC_HEADERSIZE];
- luaU_header(h);
- DumpBlock(h,LUAC_HEADERSIZE,D);
+    lu_byte h[LUAC_HEADERSIZE];
+    luaU_header(h);
+    DumpBlock(h, LUAC_HEADERSIZE, D);
 }
 
 /*
 ** dump Lua function as precompiled chunk
 */
-int luaU_dump (lua_State* L, const Proto* f, lua_Writer w, void* data, int strip)
+int luaU_dump(lua_State *L, const Proto *f, lua_Writer w, void *data, int strip)
 {
- DumpState D;
- D.L=L;
- D.writer=w;
- D.data=data;
- D.strip=strip;
- D.status=0;
- DumpHeader(&D);
- DumpFunction(f,&D);
- return D.status;
+    DumpState D;
+    D.L = L;
+    D.writer = w;
+    D.data = data;
+    D.strip = strip;
+    D.status = 0;
+    DumpHeader(&D);
+    DumpFunction(f, &D);
+    return D.status;
 }
diff --git a/liblua/lfunc.c b/liblua/lfunc.c
index c2128405b..167b54056 100644
--- a/liblua/lfunc.c
+++ b/liblua/lfunc.c
@@ -20,126 +20,135 @@
 
 
 
-Closure *luaF_newCclosure (lua_State *L, int n) {
-  Closure *c = &luaC_newobj(L, LUA_TCCL, sizeCclosure(n), NULL, 0)->cl;
-  c->c.nupvalues = cast_byte(n);
-  return c;
+Closure *luaF_newCclosure(lua_State *L, int n)
+{
+    Closure *c = &luaC_newobj(L, LUA_TCCL, sizeCclosure(n), NULL, 0)->cl;
+    c->c.nupvalues = cast_byte(n);
+    return c;
 }
 
 
-Closure *luaF_newLclosure (lua_State *L, int n) {
-  Closure *c = &luaC_newobj(L, LUA_TLCL, sizeLclosure(n), NULL, 0)->cl;
-  c->l.p = NULL;
-  c->l.nupvalues = cast_byte(n);
-  while (n--) c->l.upvals[n] = NULL;
-  return c;
+Closure *luaF_newLclosure(lua_State *L, int n)
+{
+    Closure *c = &luaC_newobj(L, LUA_TLCL, sizeLclosure(n), NULL, 0)->cl;
+    c->l.p = NULL;
+    c->l.nupvalues = cast_byte(n);
+    while (n--) c->l.upvals[n] = NULL;
+    return c;
 }
 
 
-UpVal *luaF_newupval (lua_State *L) {
-  UpVal *uv = &luaC_newobj(L, LUA_TUPVAL, sizeof(UpVal), NULL, 0)->uv;
-  uv->v = &uv->u.value;
-  setnilvalue(uv->v);
-  return uv;
+UpVal *luaF_newupval(lua_State *L)
+{
+    UpVal *uv = &luaC_newobj(L, LUA_TUPVAL, sizeof(UpVal), NULL, 0)->uv;
+    uv->v = &uv->u.value;
+    setnilvalue(uv->v);
+    return uv;
 }
 
 
-UpVal *luaF_findupval (lua_State *L, StkId level) {
-  global_State *g = G(L);
-  GCObject **pp = &L->openupval;
-  UpVal *p;
-  UpVal *uv;
-  while (*pp != NULL && (p = gco2uv(*pp))->v >= level) {
-    GCObject *o = obj2gco(p);
-    lua_assert(p->v != &p->u.value);
-    lua_assert(!isold(o) || isold(obj2gco(L)));
-    if (p->v == level) {  /* found a corresponding upvalue? */
-      if (isdead(g, o))  /* is it dead? */
-        changewhite(o);  /* resurrect it */
-      return p;
+UpVal *luaF_findupval(lua_State *L, StkId level)
+{
+    global_State *g = G(L);
+    GCObject **pp = &L->openupval;
+    UpVal *p;
+    UpVal *uv;
+    while (*pp != NULL && (p = gco2uv(*pp))->v >= level) {
+        GCObject *o = obj2gco(p);
+        lua_assert(p->v != &p->u.value);
+        lua_assert(!isold(o) || isold(obj2gco(L)));
+        if (p->v == level) {  /* found a corresponding upvalue? */
+            if (isdead(g, o))  /* is it dead? */
+                changewhite(o);  /* resurrect it */
+            return p;
+        }
+        pp = &p->next;
     }
-    pp = &p->next;
-  }
-  /* not found: create a new one */
-  uv = &luaC_newobj(L, LUA_TUPVAL, sizeof(UpVal), pp, 0)->uv;
-  uv->v = level;  /* current value lives in the stack */
-  uv->u.l.prev = &g->uvhead;  /* double link it in `uvhead' list */
-  uv->u.l.next = g->uvhead.u.l.next;
-  uv->u.l.next->u.l.prev = uv;
-  g->uvhead.u.l.next = uv;
-  lua_assert(uv->u.l.next->u.l.prev == uv && uv->u.l.prev->u.l.next == uv);
-  return uv;
+    /* not found: create a new one */
+    uv = &luaC_newobj(L, LUA_TUPVAL, sizeof(UpVal), pp, 0)->uv;
+    uv->v = level;  /* current value lives in the stack */
+    uv->u.l.prev = &g->uvhead;  /* double link it in `uvhead' list */
+    uv->u.l.next = g->uvhead.u.l.next;
+    uv->u.l.next->u.l.prev = uv;
+    g->uvhead.u.l.next = uv;
+    lua_assert(uv->u.l.next->u.l.prev == uv && uv->u.l.prev->u.l.next == uv);
+    return uv;
 }
 
 
-static void unlinkupval (UpVal *uv) {
-  lua_assert(uv->u.l.next->u.l.prev == uv && uv->u.l.prev->u.l.next == uv);
-  uv->u.l.next->u.l.prev = uv->u.l.prev;  /* remove from `uvhead' list */
-  uv->u.l.prev->u.l.next = uv->u.l.next;
+static void unlinkupval(UpVal *uv)
+{
+    lua_assert(uv->u.l.next->u.l.prev == uv && uv->u.l.prev->u.l.next == uv);
+    uv->u.l.next->u.l.prev = uv->u.l.prev;  /* remove from `uvhead' list */
+    uv->u.l.prev->u.l.next = uv->u.l.next;
 }
 
 
-void luaF_freeupval (lua_State *L, UpVal *uv) {
-  if (uv->v != &uv->u.value)  /* is it open? */
-    unlinkupval(uv);  /* remove from open list */
-  luaM_free(L, uv);  /* free upvalue */
+void luaF_freeupval(lua_State *L, UpVal *uv)
+{
+    if (uv->v != &uv->u.value)  /* is it open? */
+        unlinkupval(uv);  /* remove from open list */
+    luaM_free(L, uv);  /* free upvalue */
 }
 
 
-void luaF_close (lua_State *L, StkId level) {
-  UpVal *uv;
-  global_State *g = G(L);
-  while (L->openupval != NULL && (uv = gco2uv(L->openupval))->v >= level) {
-    GCObject *o = obj2gco(uv);
-    lua_assert(!isblack(o) && uv->v != &uv->u.value);
-    L->openupval = uv->next;  /* remove from `open' list */
-    if (isdead(g, o))
-      luaF_freeupval(L, uv);  /* free upvalue */
-    else {
-      unlinkupval(uv);  /* remove upvalue from 'uvhead' list */
-      setobj(L, &uv->u.value, uv->v);  /* move value to upvalue slot */
-      uv->v = &uv->u.value;  /* now current value lives here */
-      gch(o)->next = g->allgc;  /* link upvalue into 'allgc' list */
-      g->allgc = o;
-      luaC_checkupvalcolor(g, uv);
+void luaF_close(lua_State *L, StkId level)
+{
+    UpVal *uv;
+    global_State *g = G(L);
+    while (L->openupval != NULL && (uv = gco2uv(L->openupval))->v >= level) {
+        GCObject *o = obj2gco(uv);
+        lua_assert(!isblack(o) && uv->v != &uv->u.value);
+        L->openupval = uv->next;  /* remove from `open' list */
+        if (isdead(g, o))
+            luaF_freeupval(L, uv);  /* free upvalue */
+        else {
+            unlinkupval(uv);  /* remove upvalue from 'uvhead' list */
+            setobj(L, &uv->u.value, uv->v);  /* move value to upvalue slot */
+            uv->v = &uv->u.value;  /* now current value lives here */
+            gch(o)->next = g->allgc;  /* link upvalue into 'allgc' list */
+            g->allgc = o;
+            luaC_checkupvalcolor(g, uv);
+        }
     }
-  }
 }
 
 
-Proto *luaF_newproto (lua_State *L) {
-  Proto *f = &luaC_newobj(L, LUA_TPROTO, sizeof(Proto), NULL, 0)->p;
-  f->k = NULL;
-  f->sizek = 0;
-  f->p = NULL;
-  f->sizep = 0;
-  f->code = NULL;
-  f->cache = NULL;
-  f->sizecode = 0;
-  f->lineinfo = NULL;
-  f->sizelineinfo = 0;
-  f->upvalues = NULL;
-  f->sizeupvalues = 0;
-  f->numparams = 0;
-  f->is_vararg = 0;
-  f->maxstacksize = 0;
-  f->locvars = NULL;
-  f->sizelocvars = 0;
-  f->linedefined = 0;
-  f->lastlinedefined = 0;
-  f->source = NULL;
-  return f;
+Proto *luaF_newproto(lua_State *L)
+{
+    Proto *f = &luaC_newobj(L, LUA_TPROTO, sizeof(Proto), NULL, 0)->p;
+    f->k = NULL;
+    f->sizek = 0;
+    f->p = NULL;
+    f->sizep = 0;
+    f->code = NULL;
+    f->cache = NULL;
+    f->sizecode = 0;
+    f->lineinfo = NULL;
+    f->sizelineinfo = 0;
+    f->upvalues = NULL;
+    f->sizeupvalues = 0;
+    f->numparams = 0;
+    f->is_vararg = 0;
+    f->maxstacksize = 0;
+    f->locvars = NULL;
+    f->sizelocvars = 0;
+    f->linedefined = 0;
+    f->lastlinedefined = 0;
+    f->source = NULL;
+    return f;
 }
 
 
-void luaF_freeproto (lua_State *L, Proto *f) {
-  luaM_freearray(L, f->code, f->sizecode);
-  luaM_freearray(L, f->p, f->sizep);
-  luaM_freearray(L, f->k, f->sizek);
-  luaM_freearray(L, f->lineinfo, f->sizelineinfo);
-  luaM_freearray(L, f->locvars, f->sizelocvars);
-  luaM_freearray(L, f->upvalues, f->sizeupvalues);
-  luaM_free(L, f);
+void luaF_freeproto(lua_State *L, Proto *f)
+{
+    luaM_freearray(L, f->code, f->sizecode);
+    luaM_freearray(L, f->p, f->sizep);
+    luaM_freearray(L, f->k, f->sizek);
+    luaM_freearray(L, f->lineinfo, f->sizelineinfo);
+    luaM_freearray(L, f->locvars, f->sizelocvars);
+    luaM_freearray(L, f->upvalues, f->sizeupvalues);
+    luaM_free(L, f);
 }
 
 
@@ -147,15 +156,16 @@ void luaF_freeproto (lua_State *L, Proto *f) {
 ** Look for n-th local variable at line `line' in function `func'.
 ** Returns NULL if not found.
 */
-const char *luaF_getlocalname (const Proto *f, int local_number, int pc) {
-  int i;
-  for (i = 0; i<f->sizelocvars && f->locvars[i].startpc <= pc; i++) {
-    if (pc < f->locvars[i].endpc) {  /* is variable active? */
-      local_number--;
-      if (local_number == 0)
-        return getstr(f->locvars[i].varname);
+const char *luaF_getlocalname(const Proto *f, int local_number, int pc)
+{
+    int i;
+    for (i = 0; i < f->sizelocvars && f->locvars[i].startpc <= pc; i++) {
+        if (pc < f->locvars[i].endpc) {  /* is variable active? */
+            local_number--;
+            if (local_number == 0)
+                return getstr(f->locvars[i].varname);
+        }
     }
-  }
-  return NULL;  /* not found */
+    return NULL;  /* not found */
 }
 
diff --git a/liblua/lfunc.h b/liblua/lfunc.h
index fee3205ad..e6c8c01e7 100644
--- a/liblua/lfunc.h
+++ b/liblua/lfunc.h
@@ -18,16 +18,16 @@
                          cast(int, sizeof(TValue *)*((n)-1)))
 
 
-LUAI_FUNC Proto *luaF_newproto (lua_State *L);
-LUAI_FUNC Closure *luaF_newCclosure (lua_State *L, int nelems);
-LUAI_FUNC Closure *luaF_newLclosure (lua_State *L, int nelems);
-LUAI_FUNC UpVal *luaF_newupval (lua_State *L);
-LUAI_FUNC UpVal *luaF_findupval (lua_State *L, StkId level);
-LUAI_FUNC void luaF_close (lua_State *L, StkId level);
-LUAI_FUNC void luaF_freeproto (lua_State *L, Proto *f);
-LUAI_FUNC void luaF_freeupval (lua_State *L, UpVal *uv);
-LUAI_FUNC const char *luaF_getlocalname (const Proto *func, int local_number,
-                                         int pc);
+LUAI_FUNC Proto *luaF_newproto(lua_State *L);
+LUAI_FUNC Closure *luaF_newCclosure(lua_State *L, int nelems);
+LUAI_FUNC Closure *luaF_newLclosure(lua_State *L, int nelems);
+LUAI_FUNC UpVal *luaF_newupval(lua_State *L);
+LUAI_FUNC UpVal *luaF_findupval(lua_State *L, StkId level);
+LUAI_FUNC void luaF_close(lua_State *L, StkId level);
+LUAI_FUNC void luaF_freeproto(lua_State *L, Proto *f);
+LUAI_FUNC void luaF_freeupval(lua_State *L, UpVal *uv);
+LUAI_FUNC const char *luaF_getlocalname(const Proto *func, int local_number,
+                                        int pc);
 
 
 #endif
diff --git a/liblua/lgc.c b/liblua/lgc.c
index 7388d1b28..12a4fddd5 100644
--- a/liblua/lgc.c
+++ b/liblua/lgc.c
@@ -57,7 +57,7 @@
 */
 #define maskcolors (~(bit2mask(BLACKBIT, OLDBIT) | WHITEBITS))
 #define makewhite(g,x) \
- (gch(x)->marked = cast_byte((gch(x)->marked & maskcolors) | luaC_white(g)))
+    (gch(x)->marked = cast_byte((gch(x)->marked & maskcolors) | luaC_white(g)))
 
 #define white2gray(x) resetbits(gch(x)->marked, WHITEBITS)
 #define black2gray(x) resetbit(gch(x)->marked, BLACKBIT)
@@ -69,16 +69,16 @@
 
 
 #define checkconsistency(obj)  \
-  lua_longassert(!iscollectable(obj) || righttt(obj))
+    lua_longassert(!iscollectable(obj) || righttt(obj))
 
 
 #define markvalue(g,o) { checkconsistency(o); \
-  if (valiswhite(o)) reallymarkobject(g,gcvalue(o)); }
+        if (valiswhite(o)) reallymarkobject(g,gcvalue(o)); }
 
 #define markobject(g,t) { if ((t) && iswhite(obj2gco(t))) \
-        reallymarkobject(g, obj2gco(t)); }
+            reallymarkobject(g, obj2gco(t)); }
 
-static void reallymarkobject (global_State *g, GCObject *o);
+static void reallymarkobject(global_State *g, GCObject *o);
 
 
 /*
@@ -104,10 +104,11 @@ static void reallymarkobject (global_State *g, GCObject *o);
 ** if key is not marked, mark its entry as dead (therefore removing it
 ** from the table)
 */
-static void removeentry (Node *n) {
-  lua_assert(ttisnil(gval(n)));
-  if (valiswhite(gkey(n)))
-    setdeadvalue(gkey(n));  /* unused and unmarked key; remove it */
+static void removeentry(Node *n)
+{
+    lua_assert(ttisnil(gval(n)));
+    if (valiswhite(gkey(n)))
+        setdeadvalue(gkey(n));  /* unused and unmarked key; remove it */
 }
 
 
@@ -118,13 +119,13 @@ static void removeentry (Node *n) {
 ** other objects: if really collected, cannot keep them; for objects
 ** being finalized, keep them in keys, but not in values
 */
-static int iscleared (global_State *g, const TValue *o) {
-  if (!iscollectable(o)) return 0;
-  else if (ttisstring(o)) {
-    markobject(g, rawtsvalue(o));  /* strings are `values', so are never weak */
-    return 0;
-  }
-  else return iswhite(gcvalue(o));
+static int iscleared(global_State *g, const TValue *o)
+{
+    if (!iscollectable(o)) return 0;
+    else if (ttisstring(o)) {
+        markobject(g, rawtsvalue(o));  /* strings are `values', so are never weak */
+        return 0;
+    } else return iswhite(gcvalue(o));
 }
 
 
@@ -132,17 +133,18 @@ static int iscleared (global_State *g, const TValue *o) {
 ** barrier that moves collector forward, that is, mark the white object
 ** being pointed by a black object.
 */
-void luaC_barrier_ (lua_State *L, GCObject *o, GCObject *v) {
-  global_State *g = G(L);
-  lua_assert(isblack(o) && iswhite(v) && !isdead(g, v) && !isdead(g, o));
-  lua_assert(g->gcstate != GCSpause);
-  lua_assert(gch(o)->tt != LUA_TTABLE);
-  if (keepinvariantout(g))  /* must keep invariant? */
-    reallymarkobject(g, v);  /* restore invariant */
-  else {  /* sweep phase */
-    lua_assert(issweepphase(g));
-    makewhite(g, o);  /* mark main obj. as white to avoid other barriers */
-  }
+void luaC_barrier_(lua_State *L, GCObject *o, GCObject *v)
+{
+    global_State *g = G(L);
+    lua_assert(isblack(o) && iswhite(v) && !isdead(g, v) && !isdead(g, o));
+    lua_assert(g->gcstate != GCSpause);
+    lua_assert(gch(o)->tt != LUA_TTABLE);
+    if (keepinvariantout(g))  /* must keep invariant? */
+        reallymarkobject(g, v);  /* restore invariant */
+    else {  /* sweep phase */
+        lua_assert(issweepphase(g));
+        makewhite(g, o);  /* mark main obj. as white to avoid other barriers */
+    }
 }
 
 
@@ -152,12 +154,13 @@ void luaC_barrier_ (lua_State *L, GCObject *o, GCObject *v) {
 ** only works for tables; access to 'gclist' is not uniform across
 ** different types.)
 */
-void luaC_barrierback_ (lua_State *L, GCObject *o) {
-  global_State *g = G(L);
-  lua_assert(isblack(o) && !isdead(g, o) && gch(o)->tt == LUA_TTABLE);
-  black2gray(o);  /* make object gray (again) */
-  gco2t(o)->gclist = g->grayagain;
-  g->grayagain = o;
+void luaC_barrierback_(lua_State *L, GCObject *o)
+{
+    global_State *g = G(L);
+    lua_assert(isblack(o) && !isdead(g, o) && gch(o)->tt == LUA_TTABLE);
+    black2gray(o);  /* make object gray (again) */
+    gco2t(o)->gclist = g->grayagain;
+    g->grayagain = o;
 }
 
 
@@ -169,17 +172,17 @@ void luaC_barrierback_ (lua_State *L, GCObject *o) {
 ** it again. Otherwise, use a backward barrier, to avoid marking all
 ** possible instances.
 */
-LUAI_FUNC void luaC_barrierproto_ (lua_State *L, Proto *p, Closure *c) {
-  global_State *g = G(L);
-  lua_assert(isblack(obj2gco(p)));
-  if (p->cache == NULL) {  /* first time? */
-    luaC_objbarrier(L, p, c);
-  }
-  else {  /* use a backward barrier */
-    black2gray(obj2gco(p));  /* make prototype gray (again) */
-    p->gclist = g->grayagain;
-    g->grayagain = obj2gco(p);
-  }
+LUAI_FUNC void luaC_barrierproto_(lua_State *L, Proto *p, Closure *c)
+{
+    global_State *g = G(L);
+    lua_assert(isblack(obj2gco(p)));
+    if (p->cache == NULL) {  /* first time? */
+        luaC_objbarrier(L, p, c);
+    } else { /* use a backward barrier */
+        black2gray(obj2gco(p));  /* make prototype gray (again) */
+        p->gclist = g->grayagain;
+        g->grayagain = obj2gco(p);
+    }
 }
 
 
@@ -187,20 +190,20 @@ LUAI_FUNC void luaC_barrierproto_ (lua_State *L, Proto *p, Closure *c) {
 ** check color (and invariants) for an upvalue that was closed,
 ** i.e., moved into the 'allgc' list
 */
-void luaC_checkupvalcolor (global_State *g, UpVal *uv) {
-  GCObject *o = obj2gco(uv);
-  lua_assert(!isblack(o));  /* open upvalues are never black */
-  if (isgray(o)) {
-    if (keepinvariant(g)) {
-      resetoldbit(o);  /* see MOVE OLD rule */
-      gray2black(o);  /* it is being visited now */
-      markvalue(g, uv->v);
+void luaC_checkupvalcolor(global_State *g, UpVal *uv)
+{
+    GCObject *o = obj2gco(uv);
+    lua_assert(!isblack(o));  /* open upvalues are never black */
+    if (isgray(o)) {
+        if (keepinvariant(g)) {
+            resetoldbit(o);  /* see MOVE OLD rule */
+            gray2black(o);  /* it is being visited now */
+            markvalue(g, uv->v);
+        } else {
+            lua_assert(issweepphase(g));
+            makewhite(g, o);
+        }
     }
-    else {
-      lua_assert(issweepphase(g));
-      makewhite(g, o);
-    }
-  }
 }
 
 
@@ -209,18 +212,19 @@ void luaC_checkupvalcolor (global_State *g, UpVal *uv) {
 ** it to '*list'. 'offset' tells how many bytes to allocate before the
 ** object itself (used only by states).
 */
-GCObject *luaC_newobj (lua_State *L, int tt, size_t sz, GCObject **list,
-                       int offset) {
-  global_State *g = G(L);
-  char *raw = cast(char *, luaM_newobject(L, novariant(tt), sz));
-  GCObject *o = obj2gco(raw + offset);
-  if (list == NULL)
-    list = &g->allgc;  /* standard list for collectable objects */
-  gch(o)->marked = luaC_white(g);
-  gch(o)->tt = tt;
-  gch(o)->next = *list;
-  *list = o;
-  return o;
+GCObject *luaC_newobj(lua_State *L, int tt, size_t sz, GCObject **list,
+                      int offset)
+{
+    global_State *g = G(L);
+    char *raw = cast(char *, luaM_newobject(L, novariant(tt), sz));
+    GCObject *o = obj2gco(raw + offset);
+    if (list == NULL)
+        list = &g->allgc;  /* standard list for collectable objects */
+    gch(o)->marked = luaC_white(g);
+    gch(o)->tt = tt;
+    gch(o)->next = *list;
+    *list = o;
+    return o;
 }
 
 /* }====================================================== */
@@ -240,80 +244,85 @@ GCObject *luaC_newobj (lua_State *L, int tt, size_t sz, GCObject **list,
 ** to appropriate list to be visited (and turned black) later. (Open
 ** upvalues are already linked in 'headuv' list.)
 */
-static void reallymarkobject (global_State *g, GCObject *o) {
-  lu_mem size;
-  white2gray(o);
-  switch (gch(o)->tt) {
-    case LUA_TSHRSTR:
-    case LUA_TLNGSTR: {
-      size = sizestring(gco2ts(o));
-      break;  /* nothing else to mark; make it black */
+static void reallymarkobject(global_State *g, GCObject *o)
+{
+    lu_mem size;
+    white2gray(o);
+    switch (gch(o)->tt) {
+        case LUA_TSHRSTR:
+        case LUA_TLNGSTR: {
+            size = sizestring(gco2ts(o));
+            break;  /* nothing else to mark; make it black */
+        }
+        case LUA_TUSERDATA: {
+            Table *mt = gco2u(o)->metatable;
+            markobject(g, mt);
+            markobject(g, gco2u(o)->env);
+            size = sizeudata(gco2u(o));
+            break;
+        }
+        case LUA_TUPVAL: {
+            UpVal *uv = gco2uv(o);
+            markvalue(g, uv->v);
+            if (uv->v != &uv->u.value)  /* open? */
+                return;  /* open upvalues remain gray */
+            size = sizeof(UpVal);
+            break;
+        }
+        case LUA_TLCL: {
+            gco2lcl(o)->gclist = g->gray;
+            g->gray = o;
+            return;
+        }
+        case LUA_TCCL: {
+            gco2ccl(o)->gclist = g->gray;
+            g->gray = o;
+            return;
+        }
+        case LUA_TTABLE: {
+            linktable(gco2t(o), &g->gray);
+            return;
+        }
+        case LUA_TTHREAD: {
+            gco2th(o)->gclist = g->gray;
+            g->gray = o;
+            return;
+        }
+        case LUA_TPROTO: {
+            gco2p(o)->gclist = g->gray;
+            g->gray = o;
+            return;
+        }
+        default:
+            lua_assert(0);
+            return;
     }
-    case LUA_TUSERDATA: {
-      Table *mt = gco2u(o)->metatable;
-      markobject(g, mt);
-      markobject(g, gco2u(o)->env);
-      size = sizeudata(gco2u(o));
-      break;
-    }
-    case LUA_TUPVAL: {
-      UpVal *uv = gco2uv(o);
-      markvalue(g, uv->v);
-      if (uv->v != &uv->u.value)  /* open? */
-        return;  /* open upvalues remain gray */
-      size = sizeof(UpVal);
-      break;
-    }
-    case LUA_TLCL: {
-      gco2lcl(o)->gclist = g->gray;
-      g->gray = o;
-      return;
-    }
-    case LUA_TCCL: {
-      gco2ccl(o)->gclist = g->gray;
-      g->gray = o;
-      return;
-    }
-    case LUA_TTABLE: {
-      linktable(gco2t(o), &g->gray);
-      return;
-    }
-    case LUA_TTHREAD: {
-      gco2th(o)->gclist = g->gray;
-      g->gray = o;
-      return;
-    }
-    case LUA_TPROTO: {
-      gco2p(o)->gclist = g->gray;
-      g->gray = o;
-      return;
-    }
-    default: lua_assert(0); return;
-  }
-  gray2black(o);
-  g->GCmemtrav += size;
+    gray2black(o);
+    g->GCmemtrav += size;
 }
 
 
 /*
 ** mark metamethods for basic types
 */
-static void markmt (global_State *g) {
-  int i;
-  for (i=0; i < LUA_NUMTAGS; i++)
-    markobject(g, g->mt[i]);
+static void markmt(global_State *g)
+{
+    int i;
+    for (i = 0; i < LUA_NUMTAGS; i++)
+        markobject(g, g->mt[i]);
 }
 
 
 /*
 ** mark all objects in list of being-finalized
 */
-static void markbeingfnz (global_State *g) {
-  GCObject *o;
-  for (o = g->tobefnz; o != NULL; o = gch(o)->next) {
-    makewhite(g, o);
-    reallymarkobject(g, o);
-  }
+static void markbeingfnz(global_State *g)
+{
+    GCObject *o;
+    for (o = g->tobefnz; o != NULL; o = gch(o)->next) {
+        makewhite(g, o);
+        reallymarkobject(g, o);
+    }
 }
 
 
@@ -321,12 +330,13 @@ static void markbeingfnz (global_State *g) {
 ** mark all values stored in marked open upvalues. (See comment in
 ** 'lstate.h'.)
 */
-static void remarkupvals (global_State *g) {
-  UpVal *uv;
-  for (uv = g->uvhead.u.l.next; uv != &g->uvhead; uv = uv->u.l.next) {
-    if (isgray(obj2gco(uv)))
-      markvalue(g, uv->v);
-  }
+static void remarkupvals(global_State *g)
+{
+    UpVal *uv;
+    for (uv = g->uvhead.u.l.next; uv != &g->uvhead; uv = uv->u.l.next) {
+        if (isgray(obj2gco(uv)))
+            markvalue(g, uv->v);
+    }
 }
 
 
@@ -334,13 +344,14 @@ static void remarkupvals (global_State *g) {
 ** mark root set and reset all gray lists, to start a new
 ** incremental (or full) collection
 */
-static void restartcollection (global_State *g) {
-  g->gray = g->grayagain = NULL;
-  g->weak = g->allweak = g->ephemeron = NULL;
-  markobject(g, g->mainthread);
-  markvalue(g, &g->l_registry);
-  markmt(g);
-  markbeingfnz(g);  /* mark any finalizing object left from previous cycle */
+static void restartcollection(global_State *g)
+{
+    g->gray = g->grayagain = NULL;
+    g->weak = g->allweak = g->ephemeron = NULL;
+    markobject(g, g->mainthread);
+    markvalue(g, &g->l_registry);
+    markmt(g);
+    markbeingfnz(g);  /* mark any finalizing object left from previous cycle */
 }
 
 /* }====================================================== */
@@ -352,158 +363,164 @@ static void restartcollection (global_State *g) {
 ** =======================================================
 */
 
-static void traverseweakvalue (global_State *g, Table *h) {
-  Node *n, *limit = gnodelast(h);
-  /* if there is array part, assume it may have white values (do not
-     traverse it just to check) */
-  int hasclears = (h->sizearray > 0);
-  for (n = gnode(h, 0); n < limit; n++) {
-    checkdeadkey(n);
-    if (ttisnil(gval(n)))  /* entry is empty? */
-      removeentry(n);  /* remove it */
-    else {
-      lua_assert(!ttisnil(gkey(n)));
-      markvalue(g, gkey(n));  /* mark key */
-      if (!hasclears && iscleared(g, gval(n)))  /* is there a white value? */
-        hasclears = 1;  /* table will have to be cleared */
+static void traverseweakvalue(global_State *g, Table *h)
+{
+    Node *n, *limit = gnodelast(h);
+    /* if there is array part, assume it may have white values (do not
+       traverse it just to check) */
+    int hasclears = (h->sizearray > 0);
+    for (n = gnode(h, 0); n < limit; n++) {
+        checkdeadkey(n);
+        if (ttisnil(gval(n)))  /* entry is empty? */
+            removeentry(n);  /* remove it */
+        else {
+            lua_assert(!ttisnil(gkey(n)));
+            markvalue(g, gkey(n));  /* mark key */
+            if (!hasclears && iscleared(g, gval(n)))  /* is there a white value? */
+                hasclears = 1;  /* table will have to be cleared */
+        }
     }
-  }
-  if (hasclears)
-    linktable(h, &g->weak);  /* has to be cleared later */
-  else  /* no white values */
-    linktable(h, &g->grayagain);  /* no need to clean */
+    if (hasclears)
+        linktable(h, &g->weak);  /* has to be cleared later */
+    else  /* no white values */
+        linktable(h, &g->grayagain);  /* no need to clean */
 }
 
 
-static int traverseephemeron (global_State *g, Table *h) {
-  int marked = 0;  /* true if an object is marked in this traversal */
-  int hasclears = 0;  /* true if table has white keys */
-  int prop = 0;  /* true if table has entry "white-key -> white-value" */
-  Node *n, *limit = gnodelast(h);
-  int i;
-  /* traverse array part (numeric keys are 'strong') */
-  for (i = 0; i < h->sizearray; i++) {
-    if (valiswhite(&h->array[i])) {
-      marked = 1;
-      reallymarkobject(g, gcvalue(&h->array[i]));
+static int traverseephemeron(global_State *g, Table *h)
+{
+    int marked = 0;  /* true if an object is marked in this traversal */
+    int hasclears = 0;  /* true if table has white keys */
+    int prop = 0;  /* true if table has entry "white-key -> white-value" */
+    Node *n, *limit = gnodelast(h);
+    int i;
+    /* traverse array part (numeric keys are 'strong') */
+    for (i = 0; i < h->sizearray; i++) {
+        if (valiswhite(&h->array[i])) {
+            marked = 1;
+            reallymarkobject(g, gcvalue(&h->array[i]));
+        }
     }
-  }
-  /* traverse hash part */
-  for (n = gnode(h, 0); n < limit; n++) {
-    checkdeadkey(n);
-    if (ttisnil(gval(n)))  /* entry is empty? */
-      removeentry(n);  /* remove it */
-    else if (iscleared(g, gkey(n))) {  /* key is not marked (yet)? */
-      hasclears = 1;  /* table must be cleared */
-      if (valiswhite(gval(n)))  /* value not marked yet? */
-        prop = 1;  /* must propagate again */
+    /* traverse hash part */
+    for (n = gnode(h, 0); n < limit; n++) {
+        checkdeadkey(n);
+        if (ttisnil(gval(n)))  /* entry is empty? */
+            removeentry(n);  /* remove it */
+        else if (iscleared(g, gkey(n))) {  /* key is not marked (yet)? */
+            hasclears = 1;  /* table must be cleared */
+            if (valiswhite(gval(n)))  /* value not marked yet? */
+                prop = 1;  /* must propagate again */
+        } else if (valiswhite(gval(n))) { /* value not marked yet? */
+            marked = 1;
+            reallymarkobject(g, gcvalue(gval(n)));  /* mark it now */
+        }
     }
-    else if (valiswhite(gval(n))) {  /* value not marked yet? */
-      marked = 1;
-      reallymarkobject(g, gcvalue(gval(n)));  /* mark it now */
+    if (prop)
+        linktable(h, &g->ephemeron);  /* have to propagate again */
+    else if (hasclears)  /* does table have white keys? */
+        linktable(h, &g->allweak);  /* may have to clean white keys */
+    else  /* no white keys */
+        linktable(h, &g->grayagain);  /* no need to clean */
+    return marked;
+}
+
+
+static void traversestrongtable(global_State *g, Table *h)
+{
+    Node *n, *limit = gnodelast(h);
+    int i;
+    for (i = 0; i < h->sizearray; i++)  /* traverse array part */
+        markvalue(g, &h->array[i]);
+    for (n = gnode(h, 0); n < limit; n++) {  /* traverse hash part */
+        checkdeadkey(n);
+        if (ttisnil(gval(n)))  /* entry is empty? */
+            removeentry(n);  /* remove it */
+        else {
+            lua_assert(!ttisnil(gkey(n)));
+            markvalue(g, gkey(n));  /* mark key */
+            markvalue(g, gval(n));  /* mark value */
+        }
     }
-  }
-  if (prop)
-    linktable(h, &g->ephemeron);  /* have to propagate again */
-  else if (hasclears)  /* does table have white keys? */
-    linktable(h, &g->allweak);  /* may have to clean white keys */
-  else  /* no white keys */
-    linktable(h, &g->grayagain);  /* no need to clean */
-  return marked;
 }
 
 
-static void traversestrongtable (global_State *g, Table *h) {
-  Node *n, *limit = gnodelast(h);
-  int i;
-  for (i = 0; i < h->sizearray; i++)  /* traverse array part */
-    markvalue(g, &h->array[i]);
-  for (n = gnode(h, 0); n < limit; n++) {  /* traverse hash part */
-    checkdeadkey(n);
-    if (ttisnil(gval(n)))  /* entry is empty? */
-      removeentry(n);  /* remove it */
-    else {
-      lua_assert(!ttisnil(gkey(n)));
-      markvalue(g, gkey(n));  /* mark key */
-      markvalue(g, gval(n));  /* mark value */
+static lu_mem traversetable(global_State *g, Table *h)
+{
+    const char *weakkey, *weakvalue;
+    const TValue *mode = gfasttm(g, h->metatable, TM_MODE);
+    markobject(g, h->metatable);
+    if (mode && ttisstring(mode) &&  /* is there a weak mode? */
+        ((weakkey = strchr(svalue(mode), 'k')),
+         (weakvalue = strchr(svalue(mode), 'v')),
+         (weakkey || weakvalue))) {  /* is really weak? */
+        black2gray(obj2gco(h));  /* keep table gray */
+        if (!weakkey)  /* strong keys? */
+            traverseweakvalue(g, h);
+        else if (!weakvalue)  /* strong values? */
+            traverseephemeron(g, h);
+        else  /* all weak */
+            linktable(h, &g->allweak);  /* nothing to traverse now */
+    } else /* not weak */
+        traversestrongtable(g, h);
+    return sizeof(Table) + sizeof(TValue) * h->sizearray +
+           sizeof(Node) * cast(size_t, sizenode(h));
+}
+
+
+static int traverseproto(global_State *g, Proto *f)
+{
+    int i;
+    if (f->cache && iswhite(obj2gco(f->cache)))
+        f->cache = NULL;  /* allow cache to be collected */
+    markobject(g, f->source);
+    for (i = 0; i < f->sizek; i++)  /* mark literals */
+        markvalue(g, &f->k[i]);
+    for (i = 0; i < f->sizeupvalues; i++)  /* mark upvalue names */
+        markobject(g, f->upvalues[i].name);
+    for (i = 0; i < f->sizep; i++)  /* mark nested protos */
+        markobject(g, f->p[i]);
+    for (i = 0; i < f->sizelocvars; i++)  /* mark local-variable names */
+        markobject(g, f->locvars[i].varname);
+    return sizeof(Proto) + sizeof(Instruction) * f->sizecode +
+           sizeof(Proto *) * f->sizep +
+           sizeof(TValue) * f->sizek +
+           sizeof(int) * f->sizelineinfo +
+           sizeof(LocVar) * f->sizelocvars +
+           sizeof(Upvaldesc) * f->sizeupvalues;
+}
+
+
+static lu_mem traverseCclosure(global_State *g, CClosure *cl)
+{
+    int i;
+    for (i = 0; i < cl->nupvalues; i++)  /* mark its upvalues */
+        markvalue(g, &cl->upvalue[i]);
+    return sizeCclosure(cl->nupvalues);
+}
+
+static lu_mem traverseLclosure(global_State *g, LClosure *cl)
+{
+    int i;
+    markobject(g, cl->p);  /* mark its prototype */
+    for (i = 0; i < cl->nupvalues; i++)  /* mark its upvalues */
+        markobject(g, cl->upvals[i]);
+    return sizeLclosure(cl->nupvalues);
+}
+
+
+static lu_mem traversestack(global_State *g, lua_State *th)
+{
+    StkId o = th->stack;
+    if (o == NULL)
+        return 1;  /* stack not completely built yet */
+    for (; o < th->top; o++)
+        markvalue(g, o);
+    if (g->gcstate == GCSatomic) {  /* final traversal? */
+        StkId lim = th->stack + th->stacksize;  /* real end of stack */
+        for (; o < lim; o++)  /* clear not-marked stack slice */
+            setnilvalue(o);
     }
-  }
-}
-
-
-static lu_mem traversetable (global_State *g, Table *h) {
-  const char *weakkey, *weakvalue;
-  const TValue *mode = gfasttm(g, h->metatable, TM_MODE);
-  markobject(g, h->metatable);
-  if (mode && ttisstring(mode) &&  /* is there a weak mode? */
-      ((weakkey = strchr(svalue(mode), 'k')),
-       (weakvalue = strchr(svalue(mode), 'v')),
-       (weakkey || weakvalue))) {  /* is really weak? */
-    black2gray(obj2gco(h));  /* keep table gray */
-    if (!weakkey)  /* strong keys? */
-      traverseweakvalue(g, h);
-    else if (!weakvalue)  /* strong values? */
-      traverseephemeron(g, h);
-    else  /* all weak */
-      linktable(h, &g->allweak);  /* nothing to traverse now */
-  }
-  else  /* not weak */
-    traversestrongtable(g, h);
-  return sizeof(Table) + sizeof(TValue) * h->sizearray +
-                         sizeof(Node) * cast(size_t, sizenode(h));
-}
-
-
-static int traverseproto (global_State *g, Proto *f) {
-  int i;
-  if (f->cache && iswhite(obj2gco(f->cache)))
-    f->cache = NULL;  /* allow cache to be collected */
-  markobject(g, f->source);
-  for (i = 0; i < f->sizek; i++)  /* mark literals */
-    markvalue(g, &f->k[i]);
-  for (i = 0; i < f->sizeupvalues; i++)  /* mark upvalue names */
-    markobject(g, f->upvalues[i].name);
-  for (i = 0; i < f->sizep; i++)  /* mark nested protos */
-    markobject(g, f->p[i]);
-  for (i = 0; i < f->sizelocvars; i++)  /* mark local-variable names */
-    markobject(g, f->locvars[i].varname);
-  return sizeof(Proto) + sizeof(Instruction) * f->sizecode +
-                         sizeof(Proto *) * f->sizep +
-                         sizeof(TValue) * f->sizek +
-                         sizeof(int) * f->sizelineinfo +
-                         sizeof(LocVar) * f->sizelocvars +
-                         sizeof(Upvaldesc) * f->sizeupvalues;
-}
-
-
-static lu_mem traverseCclosure (global_State *g, CClosure *cl) {
-  int i;
-  for (i = 0; i < cl->nupvalues; i++)  /* mark its upvalues */
-    markvalue(g, &cl->upvalue[i]);
-  return sizeCclosure(cl->nupvalues);
-}
-
-static lu_mem traverseLclosure (global_State *g, LClosure *cl) {
-  int i;
-  markobject(g, cl->p);  /* mark its prototype */
-  for (i = 0; i < cl->nupvalues; i++)  /* mark its upvalues */
-    markobject(g, cl->upvals[i]);
-  return sizeLclosure(cl->nupvalues);
-}
-
-
-static lu_mem traversestack (global_State *g, lua_State *th) {
-  StkId o = th->stack;
-  if (o == NULL)
-    return 1;  /* stack not completely built yet */
-  for (; o < th->top; o++)
-    markvalue(g, o);
-  if (g->gcstate == GCSatomic) {  /* final traversal? */
-    StkId lim = th->stack + th->stacksize;  /* real end of stack */
-    for (; o < lim; o++)  /* clear not-marked stack slice */
-      setnilvalue(o);
-  }
-  return sizeof(lua_State) + sizeof(TValue) * th->stacksize;
+    return sizeof(lua_State) + sizeof(TValue) * th->stacksize;
 }
 
 
@@ -511,60 +528,65 @@ static lu_mem traversestack (global_State *g, lua_State *th) {
 ** traverse one gray object, turning it to black (except for threads,
 ** which are always gray).
 */
-static void propagatemark (global_State *g) {
-  lu_mem size;
-  GCObject *o = g->gray;
-  lua_assert(isgray(o));
-  gray2black(o);
-  switch (gch(o)->tt) {
-    case LUA_TTABLE: {
-      Table *h = gco2t(o);
-      g->gray = h->gclist;  /* remove from 'gray' list */
-      size = traversetable(g, h);
-      break;
+static void propagatemark(global_State *g)
+{
+    lu_mem size;
+    GCObject *o = g->gray;
+    lua_assert(isgray(o));
+    gray2black(o);
+    switch (gch(o)->tt) {
+        case LUA_TTABLE: {
+            Table *h = gco2t(o);
+            g->gray = h->gclist;  /* remove from 'gray' list */
+            size = traversetable(g, h);
+            break;
+        }
+        case LUA_TLCL: {
+            LClosure *cl = gco2lcl(o);
+            g->gray = cl->gclist;  /* remove from 'gray' list */
+            size = traverseLclosure(g, cl);
+            break;
+        }
+        case LUA_TCCL: {
+            CClosure *cl = gco2ccl(o);
+            g->gray = cl->gclist;  /* remove from 'gray' list */
+            size = traverseCclosure(g, cl);
+            break;
+        }
+        case LUA_TTHREAD: {
+            lua_State *th = gco2th(o);
+            g->gray = th->gclist;  /* remove from 'gray' list */
+            th->gclist = g->grayagain;
+            g->grayagain = o;  /* insert into 'grayagain' list */
+            black2gray(o);
+            size = traversestack(g, th);
+            break;
+        }
+        case LUA_TPROTO: {
+            Proto *p = gco2p(o);
+            g->gray = p->gclist;  /* remove from 'gray' list */
+            size = traverseproto(g, p);
+            break;
+        }
+        default:
+            lua_assert(0);
+            return;
     }
-    case LUA_TLCL: {
-      LClosure *cl = gco2lcl(o);
-      g->gray = cl->gclist;  /* remove from 'gray' list */
-      size = traverseLclosure(g, cl);
-      break;
-    }
-    case LUA_TCCL: {
-      CClosure *cl = gco2ccl(o);
-      g->gray = cl->gclist;  /* remove from 'gray' list */
-      size = traverseCclosure(g, cl);
-      break;
-    }
-    case LUA_TTHREAD: {
-      lua_State *th = gco2th(o);
-      g->gray = th->gclist;  /* remove from 'gray' list */
-      th->gclist = g->grayagain;
-      g->grayagain = o;  /* insert into 'grayagain' list */
-      black2gray(o);
-      size = traversestack(g, th);
-      break;
-    }
-    case LUA_TPROTO: {
-      Proto *p = gco2p(o);
-      g->gray = p->gclist;  /* remove from 'gray' list */
-      size = traverseproto(g, p);
-      break;
-    }
-    default: lua_assert(0); return;
-  }
-  g->GCmemtrav += size;
+    g->GCmemtrav += size;
 }
 
 
-static void propagateall (global_State *g) {
-  while (g->gray) propagatemark(g);
+static void propagateall(global_State *g)
+{
+    while (g->gray) propagatemark(g);
 }
 
 
-static void propagatelist (global_State *g, GCObject *l) {
-  lua_assert(g->gray == NULL);  /* no grays left */
-  g->gray = l;
-  propagateall(g);  /* traverse all elements from 'l' */
+static void propagatelist(global_State *g, GCObject *l)
+{
+    lua_assert(g->gray == NULL);  /* no grays left */
+    g->gray = l;
+    propagateall(g);  /* traverse all elements from 'l' */
 }
 
 /*
@@ -572,33 +594,35 @@ static void propagatelist (global_State *g, GCObject *l) {
 ** lists when traversed, traverse the original lists to avoid traversing
 ** twice the same table (which is not wrong, but inefficient)
 */
-static void retraversegrays (global_State *g) {
-  GCObject *weak = g->weak;  /* save original lists */
-  GCObject *grayagain = g->grayagain;
-  GCObject *ephemeron = g->ephemeron;
-  g->weak = g->grayagain = g->ephemeron = NULL;
-  propagateall(g);  /* traverse main gray list */
-  propagatelist(g, grayagain);
-  propagatelist(g, weak);
-  propagatelist(g, ephemeron);
+static void retraversegrays(global_State *g)
+{
+    GCObject *weak = g->weak;  /* save original lists */
+    GCObject *grayagain = g->grayagain;
+    GCObject *ephemeron = g->ephemeron;
+    g->weak = g->grayagain = g->ephemeron = NULL;
+    propagateall(g);  /* traverse main gray list */
+    propagatelist(g, grayagain);
+    propagatelist(g, weak);
+    propagatelist(g, ephemeron);
 }
 
 
-static void convergeephemerons (global_State *g) {
-  int changed;
-  do {
-    GCObject *w;
-    GCObject *next = g->ephemeron;  /* get ephemeron list */
-    g->ephemeron = NULL;  /* tables will return to this list when traversed */
-    changed = 0;
-    while ((w = next) != NULL) {
-      next = gco2t(w)->gclist;
-      if (traverseephemeron(g, gco2t(w))) {  /* traverse marked some value? */
-        propagateall(g);  /* propagate changes */
-        changed = 1;  /* will have to revisit all ephemeron tables */
-      }
-    }
-  } while (changed);
+static void convergeephemerons(global_State *g)
+{
+    int changed;
+    do {
+        GCObject *w;
+        GCObject *next = g->ephemeron;  /* get ephemeron list */
+        g->ephemeron = NULL;  /* tables will return to this list when traversed */
+        changed = 0;
+        while ((w = next) != NULL) {
+            next = gco2t(w)->gclist;
+            if (traverseephemeron(g, gco2t(w))) {  /* traverse marked some value? */
+                propagateall(g);  /* propagate changes */
+                changed = 1;  /* will have to revisit all ephemeron tables */
+            }
+        }
+    } while (changed);
 }
 
 /* }====================================================== */
@@ -615,17 +639,18 @@ static void convergeephemerons (global_State *g) {
 ** clear entries with unmarked keys from all weaktables in list 'l' up
 ** to element 'f'
 */
-static void clearkeys (global_State *g, GCObject *l, GCObject *f) {
-  for (; l != f; l = gco2t(l)->gclist) {
-    Table *h = gco2t(l);
-    Node *n, *limit = gnodelast(h);
-    for (n = gnode(h, 0); n < limit; n++) {
-      if (!ttisnil(gval(n)) && (iscleared(g, gkey(n)))) {
-        setnilvalue(gval(n));  /* remove value ... */
-        removeentry(n);  /* and remove entry from table */
-      }
+static void clearkeys(global_State *g, GCObject *l, GCObject *f)
+{
+    for (; l != f; l = gco2t(l)->gclist) {
+        Table *h = gco2t(l);
+        Node *n, *limit = gnodelast(h);
+        for (n = gnode(h, 0); n < limit; n++) {
+            if (!ttisnil(gval(n)) && (iscleared(g, gkey(n)))) {
+                setnilvalue(gval(n));  /* remove value ... */
+                removeentry(n);  /* and remove entry from table */
+            }
+        }
     }
-  }
 }
 
 
@@ -633,68 +658,82 @@ static void clearkeys (global_State *g, GCObject *l, GCObject *f) {
 ** clear entries with unmarked values from all weaktables in list 'l' up
 ** to element 'f'
 */
-static void clearvalues (global_State *g, GCObject *l, GCObject *f) {
-  for (; l != f; l = gco2t(l)->gclist) {
-    Table *h = gco2t(l);
-    Node *n, *limit = gnodelast(h);
-    int i;
-    for (i = 0; i < h->sizearray; i++) {
-      TValue *o = &h->array[i];
-      if (iscleared(g, o))  /* value was collected? */
-        setnilvalue(o);  /* remove value */
+static void clearvalues(global_State *g, GCObject *l, GCObject *f)
+{
+    for (; l != f; l = gco2t(l)->gclist) {
+        Table *h = gco2t(l);
+        Node *n, *limit = gnodelast(h);
+        int i;
+        for (i = 0; i < h->sizearray; i++) {
+            TValue *o = &h->array[i];
+            if (iscleared(g, o))  /* value was collected? */
+                setnilvalue(o);  /* remove value */
+        }
+        for (n = gnode(h, 0); n < limit; n++) {
+            if (!ttisnil(gval(n)) && iscleared(g, gval(n))) {
+                setnilvalue(gval(n));  /* remove value ... */
+                removeentry(n);  /* and remove entry from table */
+            }
+        }
     }
-    for (n = gnode(h, 0); n < limit; n++) {
-      if (!ttisnil(gval(n)) && iscleared(g, gval(n))) {
-        setnilvalue(gval(n));  /* remove value ... */
-        removeentry(n);  /* and remove entry from table */
-      }
-    }
-  }
 }
 
 
-static void freeobj (lua_State *L, GCObject *o) {
-  switch (gch(o)->tt) {
-    case LUA_TPROTO: luaF_freeproto(L, gco2p(o)); break;
-    case LUA_TLCL: {
-      luaM_freemem(L, o, sizeLclosure(gco2lcl(o)->nupvalues));
-      break;
+static void freeobj(lua_State *L, GCObject *o)
+{
+    switch (gch(o)->tt) {
+        case LUA_TPROTO:
+            luaF_freeproto(L, gco2p(o));
+            break;
+        case LUA_TLCL: {
+            luaM_freemem(L, o, sizeLclosure(gco2lcl(o)->nupvalues));
+            break;
+        }
+        case LUA_TCCL: {
+            luaM_freemem(L, o, sizeCclosure(gco2ccl(o)->nupvalues));
+            break;
+        }
+        case LUA_TUPVAL:
+            luaF_freeupval(L, gco2uv(o));
+            break;
+        case LUA_TTABLE:
+            luaH_free(L, gco2t(o));
+            break;
+        case LUA_TTHREAD:
+            luaE_freethread(L, gco2th(o));
+            break;
+        case LUA_TUSERDATA:
+            luaM_freemem(L, o, sizeudata(gco2u(o)));
+            break;
+        case LUA_TSHRSTR:
+            G(L)->strt.nuse--;
+        /* go through */
+        case LUA_TLNGSTR: {
+            luaM_freemem(L, o, sizestring(gco2ts(o)));
+            break;
+        }
+        default:
+            lua_assert(0);
     }
-    case LUA_TCCL: {
-      luaM_freemem(L, o, sizeCclosure(gco2ccl(o)->nupvalues));
-      break;
-    }
-    case LUA_TUPVAL: luaF_freeupval(L, gco2uv(o)); break;
-    case LUA_TTABLE: luaH_free(L, gco2t(o)); break;
-    case LUA_TTHREAD: luaE_freethread(L, gco2th(o)); break;
-    case LUA_TUSERDATA: luaM_freemem(L, o, sizeudata(gco2u(o))); break;
-    case LUA_TSHRSTR:
-      G(L)->strt.nuse--;
-      /* go through */
-    case LUA_TLNGSTR: {
-      luaM_freemem(L, o, sizestring(gco2ts(o)));
-      break;
-    }
-    default: lua_assert(0);
-  }
 }
 
 
 #define sweepwholelist(L,p) sweeplist(L,p,MAX_LUMEM)
-static GCObject **sweeplist (lua_State *L, GCObject **p, lu_mem count);
+static GCObject **sweeplist(lua_State *L, GCObject **p, lu_mem count);
 
 
 /*
 ** sweep the (open) upvalues of a thread and resize its stack and
 ** list of call-info structures.
 */
-static void sweepthread (lua_State *L, lua_State *L1) {
-  if (L1->stack == NULL) return;  /* stack not completely built yet */
-  sweepwholelist(L, &L1->openupval);  /* sweep open upvalues */
-  luaE_freeCI(L1);  /* free extra CallInfo slots */
-  /* should not change the stack during an emergency gc cycle */
-  if (G(L)->gckind != KGC_EMERGENCY)
-    luaD_shrinkstack(L1);
+static void sweepthread(lua_State *L, lua_State *L1)
+{
+    if (L1->stack == NULL) return;  /* stack not completely built yet */
+    sweepwholelist(L, &L1->openupval);  /* sweep open upvalues */
+    luaE_freeCI(L1);  /* free extra CallInfo slots */
+    /* should not change the stack during an emergency gc cycle */
+    if (G(L)->gckind != KGC_EMERGENCY)
+        luaD_shrinkstack(L1);
 }
 
 
@@ -709,54 +748,54 @@ static void sweepthread (lua_State *L, lua_State *L1) {
 ** one will be old too.
 ** When object is a thread, sweep its list of open upvalues too.
 */
-static GCObject **sweeplist (lua_State *L, GCObject **p, lu_mem count) {
-  global_State *g = G(L);
-  int ow = otherwhite(g);
-  int toclear, toset;  /* bits to clear and to set in all live objects */
-  int tostop;  /* stop sweep when this is true */
-  if (isgenerational(g)) {  /* generational mode? */
-    toclear = ~0;  /* clear nothing */
-    toset = bitmask(OLDBIT);  /* set the old bit of all surviving objects */
-    tostop = bitmask(OLDBIT);  /* do not sweep old generation */
-  }
-  else {  /* normal mode */
-    toclear = maskcolors;  /* clear all color bits + old bit */
-    toset = luaC_white(g);  /* make object white */
-    tostop = 0;  /* do not stop */
-  }
-  while (*p != NULL && count-- > 0) {
-    GCObject *curr = *p;
-    int marked = gch(curr)->marked;
-    if (isdeadm(ow, marked)) {  /* is 'curr' dead? */
-      *p = gch(curr)->next;  /* remove 'curr' from list */
-      freeobj(L, curr);  /* erase 'curr' */
+static GCObject **sweeplist(lua_State *L, GCObject **p, lu_mem count)
+{
+    global_State *g = G(L);
+    int ow = otherwhite(g);
+    int toclear, toset;  /* bits to clear and to set in all live objects */
+    int tostop;  /* stop sweep when this is true */
+    if (isgenerational(g)) {  /* generational mode? */
+        toclear = ~0;  /* clear nothing */
+        toset = bitmask(OLDBIT);  /* set the old bit of all surviving objects */
+        tostop = bitmask(OLDBIT);  /* do not sweep old generation */
+    } else { /* normal mode */
+        toclear = maskcolors;  /* clear all color bits + old bit */
+        toset = luaC_white(g);  /* make object white */
+        tostop = 0;  /* do not stop */
     }
-    else {
-      if (testbits(marked, tostop))
-        return NULL;  /* stop sweeping this list */
-      if (gch(curr)->tt == LUA_TTHREAD)
-        sweepthread(L, gco2th(curr));  /* sweep thread's upvalues */
-      /* update marks */
-      gch(curr)->marked = cast_byte((marked & toclear) | toset);
-      p = &gch(curr)->next;  /* go to next element */
+    while (*p != NULL && count-- > 0) {
+        GCObject *curr = *p;
+        int marked = gch(curr)->marked;
+        if (isdeadm(ow, marked)) {  /* is 'curr' dead? */
+            *p = gch(curr)->next;  /* remove 'curr' from list */
+            freeobj(L, curr);  /* erase 'curr' */
+        } else {
+            if (testbits(marked, tostop))
+                return NULL;  /* stop sweeping this list */
+            if (gch(curr)->tt == LUA_TTHREAD)
+                sweepthread(L, gco2th(curr));  /* sweep thread's upvalues */
+            /* update marks */
+            gch(curr)->marked = cast_byte((marked & toclear) | toset);
+            p = &gch(curr)->next;  /* go to next element */
+        }
     }
-  }
-  return (*p == NULL) ? NULL : p;
+    return (*p == NULL) ? NULL : p;
 }
 
 
 /*
 ** sweep a list until a live object (or end of list)
 */
-static GCObject **sweeptolive (lua_State *L, GCObject **p, int *n) {
-  GCObject ** old = p;
-  int i = 0;
-  do {
-    i++;
-    p = sweeplist(L, p, 1);
-  } while (p == old);
-  if (n) *n += i;
-  return p;
+static GCObject **sweeptolive(lua_State *L, GCObject **p, int *n)
+{
+    GCObject **old = p;
+    int i = 0;
+    do {
+        i++;
+        p = sweeplist(L, p, 1);
+    } while (p == old);
+    if (n) *n += i;
+    return p;
 }
 
 /* }====================================================== */
@@ -768,66 +807,70 @@ static GCObject **sweeptolive (lua_State *L, GCObject **p, int *n) {
 ** =======================================================
 */
 
-static void checkSizes (lua_State *L) {
-  global_State *g = G(L);
-  if (g->gckind != KGC_EMERGENCY) {  /* do not change sizes in emergency */
-    int hs = g->strt.size / 2;  /* half the size of the string table */
-    if (g->strt.nuse < cast(lu_int32, hs))  /* using less than that half? */
-      luaS_resize(L, hs);  /* halve its size */
-    luaZ_freebuffer(L, &g->buff);  /* free concatenation buffer */
-  }
-}
-
-
-static GCObject *udata2finalize (global_State *g) {
-  GCObject *o = g->tobefnz;  /* get first element */
-  lua_assert(isfinalized(o));
-  g->tobefnz = gch(o)->next;  /* remove it from 'tobefnz' list */
-  gch(o)->next = g->allgc;  /* return it to 'allgc' list */
-  g->allgc = o;
-  resetbit(gch(o)->marked, SEPARATED);  /* mark that it is not in 'tobefnz' */
-  lua_assert(!isold(o));  /* see MOVE OLD rule */
-  if (!keepinvariantout(g))  /* not keeping invariant? */
-    makewhite(g, o);  /* "sweep" object */
-  return o;
-}
-
-
-static void dothecall (lua_State *L, void *ud) {
-  UNUSED(ud);
-  luaD_call(L, L->top - 2, 0, 0);
-}
-
-
-static void GCTM (lua_State *L, int propagateerrors) {
-  global_State *g = G(L);
-  const TValue *tm;
-  TValue v;
-  setgcovalue(L, &v, udata2finalize(g));
-  tm = luaT_gettmbyobj(L, &v, TM_GC);
-  if (tm != NULL && ttisfunction(tm)) {  /* is there a finalizer? */
-    int status;
-    lu_byte oldah = L->allowhook;
-    int running  = g->gcrunning;
-    L->allowhook = 0;  /* stop debug hooks during GC metamethod */
-    g->gcrunning = 0;  /* avoid GC steps */
-    setobj2s(L, L->top, tm);  /* push finalizer... */
-    setobj2s(L, L->top + 1, &v);  /* ... and its argument */
-    L->top += 2;  /* and (next line) call the finalizer */
-    status = luaD_pcall(L, dothecall, NULL, savestack(L, L->top - 2), 0);
-    L->allowhook = oldah;  /* restore hooks */
-    g->gcrunning = running;  /* restore state */
-    if (status != LUA_OK && propagateerrors) {  /* error while running __gc? */
-      if (status == LUA_ERRRUN) {  /* is there an error object? */
-        const char *msg = (ttisstring(L->top - 1))
-                            ? svalue(L->top - 1)
-                            : "no message";
-        luaO_pushfstring(L, "error in __gc metamethod (%s)", msg);
-        status = LUA_ERRGCMM;  /* error in __gc metamethod */
-      }
-      luaD_throw(L, status);  /* re-throw error */
+static void checkSizes(lua_State *L)
+{
+    global_State *g = G(L);
+    if (g->gckind != KGC_EMERGENCY) {  /* do not change sizes in emergency */
+        int hs = g->strt.size / 2;  /* half the size of the string table */
+        if (g->strt.nuse < cast(lu_int32, hs))  /* using less than that half? */
+            luaS_resize(L, hs);  /* halve its size */
+        luaZ_freebuffer(L, &g->buff);  /* free concatenation buffer */
+    }
+}
+
+
+static GCObject *udata2finalize(global_State *g)
+{
+    GCObject *o = g->tobefnz;  /* get first element */
+    lua_assert(isfinalized(o));
+    g->tobefnz = gch(o)->next;  /* remove it from 'tobefnz' list */
+    gch(o)->next = g->allgc;  /* return it to 'allgc' list */
+    g->allgc = o;
+    resetbit(gch(o)->marked, SEPARATED);  /* mark that it is not in 'tobefnz' */
+    lua_assert(!isold(o));  /* see MOVE OLD rule */
+    if (!keepinvariantout(g))  /* not keeping invariant? */
+        makewhite(g, o);  /* "sweep" object */
+    return o;
+}
+
+
+static void dothecall(lua_State *L, void *ud)
+{
+    UNUSED(ud);
+    luaD_call(L, L->top - 2, 0, 0);
+}
+
+
+static void GCTM(lua_State *L, int propagateerrors)
+{
+    global_State *g = G(L);
+    const TValue *tm;
+    TValue v;
+    setgcovalue(L, &v, udata2finalize(g));
+    tm = luaT_gettmbyobj(L, &v, TM_GC);
+    if (tm != NULL && ttisfunction(tm)) {  /* is there a finalizer? */
+        int status;
+        lu_byte oldah = L->allowhook;
+        int running  = g->gcrunning;
+        L->allowhook = 0;  /* stop debug hooks during GC metamethod */
+        g->gcrunning = 0;  /* avoid GC steps */
+        setobj2s(L, L->top, tm);  /* push finalizer... */
+        setobj2s(L, L->top + 1, &v);  /* ... and its argument */
+        L->top += 2;  /* and (next line) call the finalizer */
+        status = luaD_pcall(L, dothecall, NULL, savestack(L, L->top - 2), 0);
+        L->allowhook = oldah;  /* restore hooks */
+        g->gcrunning = running;  /* restore state */
+        if (status != LUA_OK && propagateerrors) {  /* error while running __gc? */
+            if (status == LUA_ERRRUN) {  /* is there an error object? */
+                const char *msg = (ttisstring(L->top - 1))
+                                  ? svalue(L->top - 1)
+                                  : "no message";
+                luaO_pushfstring(L, "error in __gc metamethod (%s)", msg);
+                status = LUA_ERRGCMM;  /* error in __gc metamethod */
+            }
+            luaD_throw(L, status);  /* re-throw error */
+        }
     }
-  }
 }
 
 
@@ -835,27 +878,28 @@ static void GCTM (lua_State *L, int propagateerrors) {
 ** move all unreachable objects (or 'all' objects) that need
 ** finalization from list 'finobj' to list 'tobefnz' (to be finalized)
 */
-static void separatetobefnz (lua_State *L, int all) {
-  global_State *g = G(L);
-  GCObject **p = &g->finobj;
-  GCObject *curr;
-  GCObject **lastnext = &g->tobefnz;
-  /* find last 'next' field in 'tobefnz' list (to add elements in its end) */
-  while (*lastnext != NULL)
-    lastnext = &gch(*lastnext)->next;
-  while ((curr = *p) != NULL) {  /* traverse all finalizable objects */
-    lua_assert(!isfinalized(curr));
-    lua_assert(testbit(gch(curr)->marked, SEPARATED));
-    if (!(iswhite(curr) || all))  /* not being collected? */
-      p = &gch(curr)->next;  /* don't bother with it */
-    else {
-      l_setbit(gch(curr)->marked, FINALIZEDBIT); /* won't be finalized again */
-      *p = gch(curr)->next;  /* remove 'curr' from 'finobj' list */
-      gch(curr)->next = *lastnext;  /* link at the end of 'tobefnz' list */
-      *lastnext = curr;
-      lastnext = &gch(curr)->next;
+static void separatetobefnz(lua_State *L, int all)
+{
+    global_State *g = G(L);
+    GCObject **p = &g->finobj;
+    GCObject *curr;
+    GCObject **lastnext = &g->tobefnz;
+    /* find last 'next' field in 'tobefnz' list (to add elements in its end) */
+    while (*lastnext != NULL)
+        lastnext = &gch(*lastnext)->next;
+    while ((curr = *p) != NULL) {  /* traverse all finalizable objects */
+        lua_assert(!isfinalized(curr));
+        lua_assert(testbit(gch(curr)->marked, SEPARATED));
+        if (!(iswhite(curr) || all))  /* not being collected? */
+            p = &gch(curr)->next;  /* don't bother with it */
+        else {
+            l_setbit(gch(curr)->marked, FINALIZEDBIT); /* won't be finalized again */
+            *p = gch(curr)->next;  /* remove 'curr' from 'finobj' list */
+            gch(curr)->next = *lastnext;  /* link at the end of 'tobefnz' list */
+            *lastnext = curr;
+            lastnext = &gch(curr)->next;
+        }
     }
-  }
 }
 
 
@@ -863,30 +907,31 @@ static void separatetobefnz (lua_State *L, int all) {
 ** if object 'o' has a finalizer, remove it from 'allgc' list (must
 ** search the list to find it) and link it in 'finobj' list.
 */
-void luaC_checkfinalizer (lua_State *L, GCObject *o, Table *mt) {
-  global_State *g = G(L);
-  if (testbit(gch(o)->marked, SEPARATED) || /* obj. is already separated... */
-      isfinalized(o) ||                           /* ... or is finalized... */
-      gfasttm(g, mt, TM_GC) == NULL)                /* or has no finalizer? */
-    return;  /* nothing to be done */
-  else {  /* move 'o' to 'finobj' list */
-    GCObject **p;
-    GCheader *ho = gch(o);
-    if (g->sweepgc == &ho->next) {  /* avoid removing current sweep object */
-      lua_assert(issweepphase(g));
-      g->sweepgc = sweeptolive(L, g->sweepgc, NULL);
+void luaC_checkfinalizer(lua_State *L, GCObject *o, Table *mt)
+{
+    global_State *g = G(L);
+    if (testbit(gch(o)->marked, SEPARATED) || /* obj. is already separated... */
+        isfinalized(o) ||                           /* ... or is finalized... */
+        gfasttm(g, mt, TM_GC) == NULL)                /* or has no finalizer? */
+        return;  /* nothing to be done */
+    else {  /* move 'o' to 'finobj' list */
+        GCObject **p;
+        GCheader *ho = gch(o);
+        if (g->sweepgc == &ho->next) {  /* avoid removing current sweep object */
+            lua_assert(issweepphase(g));
+            g->sweepgc = sweeptolive(L, g->sweepgc, NULL);
+        }
+        /* search for pointer pointing to 'o' */
+        for (p = &g->allgc; *p != o; p = &gch(*p)->next) { /* empty */ }
+        *p = ho->next;  /* remove 'o' from root list */
+        ho->next = g->finobj;  /* link it in list 'finobj' */
+        g->finobj = o;
+        l_setbit(ho->marked, SEPARATED);  /* mark it as such */
+        if (!keepinvariantout(g))  /* not keeping invariant? */
+            makewhite(g, o);  /* "sweep" object */
+        else
+            resetoldbit(o);  /* see MOVE OLD rule */
     }
-    /* search for pointer pointing to 'o' */
-    for (p = &g->allgc; *p != o; p = &gch(*p)->next) { /* empty */ }
-    *p = ho->next;  /* remove 'o' from root list */
-    ho->next = g->finobj;  /* link it in list 'finobj' */
-    g->finobj = o;
-    l_setbit(ho->marked, SEPARATED);  /* mark it as such */
-    if (!keepinvariantout(g))  /* not keeping invariant? */
-      makewhite(g, o);  /* "sweep" object */
-    else
-      resetoldbit(o);  /* see MOVE OLD rule */
-  }
 }
 
 /* }====================================================== */
@@ -903,14 +948,15 @@ void luaC_checkfinalizer (lua_State *L, GCObject *o, Table *mt) {
 ** set a reasonable "time" to wait before starting a new GC cycle;
 ** cycle will start when memory use hits threshold
 */
-static void setpause (global_State *g, l_mem estimate) {
-  l_mem debt, threshold;
-  estimate = estimate / PAUSEADJ;  /* adjust 'estimate' */
-  threshold = (g->gcpause < MAX_LMEM / estimate)  /* overflow? */
-            ? estimate * g->gcpause  /* no overflow */
-            : MAX_LMEM;  /* overflow; truncate to maximum */
-  debt = -cast(l_mem, threshold - gettotalbytes(g));
-  luaE_setdebt(g, debt);
+static void setpause(global_State *g, l_mem estimate)
+{
+    l_mem debt, threshold;
+    estimate = estimate / PAUSEADJ;  /* adjust 'estimate' */
+    threshold = (g->gcpause < MAX_LMEM / estimate)  /* overflow? */
+                ? estimate * g->gcpause  /* no overflow */
+                : MAX_LMEM;  /* overflow; truncate to maximum */
+    debt = -cast(l_mem, threshold - gettotalbytes(g));
+    luaE_setdebt(g, debt);
 }
 
 
@@ -926,173 +972,178 @@ static void setpause (global_State *g, l_mem estimate) {
 ** of the real sweep.
 ** Returns how many objects it swept.
 */
-static int entersweep (lua_State *L) {
-  global_State *g = G(L);
-  int n = 0;
-  g->gcstate = GCSsweepstring;
-  lua_assert(g->sweepgc == NULL && g->sweepfin == NULL);
-  /* prepare to sweep strings, finalizable objects, and regular objects */
-  g->sweepstrgc = 0;
-  g->sweepfin = sweeptolive(L, &g->finobj, &n);
-  g->sweepgc = sweeptolive(L, &g->allgc, &n);
-  return n;
+static int entersweep(lua_State *L)
+{
+    global_State *g = G(L);
+    int n = 0;
+    g->gcstate = GCSsweepstring;
+    lua_assert(g->sweepgc == NULL && g->sweepfin == NULL);
+    /* prepare to sweep strings, finalizable objects, and regular objects */
+    g->sweepstrgc = 0;
+    g->sweepfin = sweeptolive(L, &g->finobj, &n);
+    g->sweepgc = sweeptolive(L, &g->allgc, &n);
+    return n;
 }
 
 
 /*
 ** change GC mode
 */
-void luaC_changemode (lua_State *L, int mode) {
-  global_State *g = G(L);
-  if (mode == g->gckind) return;  /* nothing to change */
-  if (mode == KGC_GEN) {  /* change to generational mode */
-    /* make sure gray lists are consistent */
-    luaC_runtilstate(L, bitmask(GCSpropagate));
-    g->GCestimate = gettotalbytes(g);
-    g->gckind = KGC_GEN;
-  }
-  else {  /* change to incremental mode */
-    /* sweep all objects to turn them back to white
-       (as white has not changed, nothing extra will be collected) */
-    g->gckind = KGC_NORMAL;
-    entersweep(L);
-    luaC_runtilstate(L, ~sweepphases);
-  }
+void luaC_changemode(lua_State *L, int mode)
+{
+    global_State *g = G(L);
+    if (mode == g->gckind) return;  /* nothing to change */
+    if (mode == KGC_GEN) {  /* change to generational mode */
+        /* make sure gray lists are consistent */
+        luaC_runtilstate(L, bitmask(GCSpropagate));
+        g->GCestimate = gettotalbytes(g);
+        g->gckind = KGC_GEN;
+    } else { /* change to incremental mode */
+        /* sweep all objects to turn them back to white
+           (as white has not changed, nothing extra will be collected) */
+        g->gckind = KGC_NORMAL;
+        entersweep(L);
+        luaC_runtilstate(L, ~sweepphases);
+    }
 }
 
 
 /*
 ** call all pending finalizers
 */
-static void callallpendingfinalizers (lua_State *L, int propagateerrors) {
-  global_State *g = G(L);
-  while (g->tobefnz) {
-    resetoldbit(g->tobefnz);
-    GCTM(L, propagateerrors);
-  }
+static void callallpendingfinalizers(lua_State *L, int propagateerrors)
+{
+    global_State *g = G(L);
+    while (g->tobefnz) {
+        resetoldbit(g->tobefnz);
+        GCTM(L, propagateerrors);
+    }
 }
 
 
-void luaC_freeallobjects (lua_State *L) {
-  global_State *g = G(L);
-  int i;
-  separatetobefnz(L, 1);  /* separate all objects with finalizers */
-  lua_assert(g->finobj == NULL);
-  callallpendingfinalizers(L, 0);
-  g->currentwhite = WHITEBITS; /* this "white" makes all objects look dead */
-  g->gckind = KGC_NORMAL;
-  sweepwholelist(L, &g->finobj);  /* finalizers can create objs. in 'finobj' */
-  sweepwholelist(L, &g->allgc);
-  for (i = 0; i < g->strt.size; i++)  /* free all string lists */
-    sweepwholelist(L, &g->strt.hash[i]);
-  lua_assert(g->strt.nuse == 0);
+void luaC_freeallobjects(lua_State *L)
+{
+    global_State *g = G(L);
+    int i;
+    separatetobefnz(L, 1);  /* separate all objects with finalizers */
+    lua_assert(g->finobj == NULL);
+    callallpendingfinalizers(L, 0);
+    g->currentwhite = WHITEBITS; /* this "white" makes all objects look dead */
+    g->gckind = KGC_NORMAL;
+    sweepwholelist(L, &g->finobj);  /* finalizers can create objs. in 'finobj' */
+    sweepwholelist(L, &g->allgc);
+    for (i = 0; i < g->strt.size; i++)  /* free all string lists */
+        sweepwholelist(L, &g->strt.hash[i]);
+    lua_assert(g->strt.nuse == 0);
 }
 
 
-static l_mem atomic (lua_State *L) {
-  global_State *g = G(L);
-  l_mem work = -cast(l_mem, g->GCmemtrav);  /* start counting work */
-  GCObject *origweak, *origall;
-  lua_assert(!iswhite(obj2gco(g->mainthread)));
-  markobject(g, L);  /* mark running thread */
-  /* registry and global metatables may be changed by API */
-  markvalue(g, &g->l_registry);
-  markmt(g);  /* mark basic metatables */
-  /* remark occasional upvalues of (maybe) dead threads */
-  remarkupvals(g);
-  propagateall(g);  /* propagate changes */
-  work += g->GCmemtrav;  /* stop counting (do not (re)count grays) */
-  /* traverse objects caught by write barrier and by 'remarkupvals' */
-  retraversegrays(g);
-  work -= g->GCmemtrav;  /* restart counting */
-  convergeephemerons(g);
-  /* at this point, all strongly accessible objects are marked. */
-  /* clear values from weak tables, before checking finalizers */
-  clearvalues(g, g->weak, NULL);
-  clearvalues(g, g->allweak, NULL);
-  origweak = g->weak; origall = g->allweak;
-  work += g->GCmemtrav;  /* stop counting (objects being finalized) */
-  separatetobefnz(L, 0);  /* separate objects to be finalized */
-  markbeingfnz(g);  /* mark objects that will be finalized */
-  propagateall(g);  /* remark, to propagate `preserveness' */
-  work -= g->GCmemtrav;  /* restart counting */
-  convergeephemerons(g);
-  /* at this point, all resurrected objects are marked. */
-  /* remove dead objects from weak tables */
-  clearkeys(g, g->ephemeron, NULL);  /* clear keys from all ephemeron tables */
-  clearkeys(g, g->allweak, NULL);  /* clear keys from all allweak tables */
-  /* clear values from resurrected weak tables */
-  clearvalues(g, g->weak, origweak);
-  clearvalues(g, g->allweak, origall);
-  g->currentwhite = cast_byte(otherwhite(g));  /* flip current white */
-  work += g->GCmemtrav;  /* complete counting */
-  return work;  /* estimate of memory marked by 'atomic' */
+static l_mem atomic(lua_State *L)
+{
+    global_State *g = G(L);
+    l_mem work = -cast(l_mem, g->GCmemtrav);  /* start counting work */
+    GCObject *origweak, *origall;
+    lua_assert(!iswhite(obj2gco(g->mainthread)));
+    markobject(g, L);  /* mark running thread */
+    /* registry and global metatables may be changed by API */
+    markvalue(g, &g->l_registry);
+    markmt(g);  /* mark basic metatables */
+    /* remark occasional upvalues of (maybe) dead threads */
+    remarkupvals(g);
+    propagateall(g);  /* propagate changes */
+    work += g->GCmemtrav;  /* stop counting (do not (re)count grays) */
+    /* traverse objects caught by write barrier and by 'remarkupvals' */
+    retraversegrays(g);
+    work -= g->GCmemtrav;  /* restart counting */
+    convergeephemerons(g);
+    /* at this point, all strongly accessible objects are marked. */
+    /* clear values from weak tables, before checking finalizers */
+    clearvalues(g, g->weak, NULL);
+    clearvalues(g, g->allweak, NULL);
+    origweak = g->weak;
+    origall = g->allweak;
+    work += g->GCmemtrav;  /* stop counting (objects being finalized) */
+    separatetobefnz(L, 0);  /* separate objects to be finalized */
+    markbeingfnz(g);  /* mark objects that will be finalized */
+    propagateall(g);  /* remark, to propagate `preserveness' */
+    work -= g->GCmemtrav;  /* restart counting */
+    convergeephemerons(g);
+    /* at this point, all resurrected objects are marked. */
+    /* remove dead objects from weak tables */
+    clearkeys(g, g->ephemeron, NULL);  /* clear keys from all ephemeron tables */
+    clearkeys(g, g->allweak, NULL);  /* clear keys from all allweak tables */
+    /* clear values from resurrected weak tables */
+    clearvalues(g, g->weak, origweak);
+    clearvalues(g, g->allweak, origall);
+    g->currentwhite = cast_byte(otherwhite(g));  /* flip current white */
+    work += g->GCmemtrav;  /* complete counting */
+    return work;  /* estimate of memory marked by 'atomic' */
 }
 
 
-static lu_mem singlestep (lua_State *L) {
-  global_State *g = G(L);
-  switch (g->gcstate) {
-    case GCSpause: {
-      /* start to count memory traversed */
-      g->GCmemtrav = g->strt.size * sizeof(GCObject*);
-      lua_assert(!isgenerational(g));
-      restartcollection(g);
-      g->gcstate = GCSpropagate;
-      return g->GCmemtrav;
+static lu_mem singlestep(lua_State *L)
+{
+    global_State *g = G(L);
+    switch (g->gcstate) {
+        case GCSpause: {
+            /* start to count memory traversed */
+            g->GCmemtrav = g->strt.size * sizeof(GCObject *);
+            lua_assert(!isgenerational(g));
+            restartcollection(g);
+            g->gcstate = GCSpropagate;
+            return g->GCmemtrav;
+        }
+        case GCSpropagate: {
+            if (g->gray) {
+                lu_mem oldtrav = g->GCmemtrav;
+                propagatemark(g);
+                return g->GCmemtrav - oldtrav;  /* memory traversed in this step */
+            } else { /* no more `gray' objects */
+                lu_mem work;
+                int sw;
+                g->gcstate = GCSatomic;  /* finish mark phase */
+                g->GCestimate = g->GCmemtrav;  /* save what was counted */;
+                work = atomic(L);  /* add what was traversed by 'atomic' */
+                g->GCestimate += work;  /* estimate of total memory traversed */
+                sw = entersweep(L);
+                return work + sw * GCSWEEPCOST;
+            }
+        }
+        case GCSsweepstring: {
+            int i;
+            for (i = 0; i < GCSWEEPMAX && g->sweepstrgc + i < g->strt.size; i++)
+                sweepwholelist(L, &g->strt.hash[g->sweepstrgc + i]);
+            g->sweepstrgc += i;
+            if (g->sweepstrgc >= g->strt.size)  /* no more strings to sweep? */
+                g->gcstate = GCSsweepudata;
+            return i * GCSWEEPCOST;
+        }
+        case GCSsweepudata: {
+            if (g->sweepfin) {
+                g->sweepfin = sweeplist(L, g->sweepfin, GCSWEEPMAX);
+                return GCSWEEPMAX * GCSWEEPCOST;
+            } else {
+                g->gcstate = GCSsweep;
+                return 0;
+            }
+        }
+        case GCSsweep: {
+            if (g->sweepgc) {
+                g->sweepgc = sweeplist(L, g->sweepgc, GCSWEEPMAX);
+                return GCSWEEPMAX * GCSWEEPCOST;
+            } else {
+                /* sweep main thread */
+                GCObject *mt = obj2gco(g->mainthread);
+                sweeplist(L, &mt, 1);
+                checkSizes(L);
+                g->gcstate = GCSpause;  /* finish collection */
+                return GCSWEEPCOST;
+            }
+        }
+        default:
+            lua_assert(0);
+            return 0;
     }
-    case GCSpropagate: {
-      if (g->gray) {
-        lu_mem oldtrav = g->GCmemtrav;
-        propagatemark(g);
-        return g->GCmemtrav - oldtrav;  /* memory traversed in this step */
-      }
-      else {  /* no more `gray' objects */
-        lu_mem work;
-        int sw;
-        g->gcstate = GCSatomic;  /* finish mark phase */
-        g->GCestimate = g->GCmemtrav;  /* save what was counted */;
-        work = atomic(L);  /* add what was traversed by 'atomic' */
-        g->GCestimate += work;  /* estimate of total memory traversed */
-        sw = entersweep(L);
-        return work + sw * GCSWEEPCOST;
-      }
-    }
-    case GCSsweepstring: {
-      int i;
-      for (i = 0; i < GCSWEEPMAX && g->sweepstrgc + i < g->strt.size; i++)
-        sweepwholelist(L, &g->strt.hash[g->sweepstrgc + i]);
-      g->sweepstrgc += i;
-      if (g->sweepstrgc >= g->strt.size)  /* no more strings to sweep? */
-        g->gcstate = GCSsweepudata;
-      return i * GCSWEEPCOST;
-    }
-    case GCSsweepudata: {
-      if (g->sweepfin) {
-        g->sweepfin = sweeplist(L, g->sweepfin, GCSWEEPMAX);
-        return GCSWEEPMAX*GCSWEEPCOST;
-      }
-      else {
-        g->gcstate = GCSsweep;
-        return 0;
-      }
-    }
-    case GCSsweep: {
-      if (g->sweepgc) {
-        g->sweepgc = sweeplist(L, g->sweepgc, GCSWEEPMAX);
-        return GCSWEEPMAX*GCSWEEPCOST;
-      }
-      else {
-        /* sweep main thread */
-        GCObject *mt = obj2gco(g->mainthread);
-        sweeplist(L, &mt, 1);
-        checkSizes(L);
-        g->gcstate = GCSpause;  /* finish collection */
-        return GCSWEEPCOST;
-      }
-    }
-    default: lua_assert(0); return 0;
-  }
 }
 
 
@@ -1100,77 +1151,81 @@ static lu_mem singlestep (lua_State *L) {
 ** advances the garbage collector until it reaches a state allowed
 ** by 'statemask'
 */
-void luaC_runtilstate (lua_State *L, int statesmask) {
-  global_State *g = G(L);
-  while (!testbit(statesmask, g->gcstate))
-    singlestep(L);
+void luaC_runtilstate(lua_State *L, int statesmask)
+{
+    global_State *g = G(L);
+    while (!testbit(statesmask, g->gcstate))
+        singlestep(L);
 }
 
 
-static void generationalcollection (lua_State *L) {
-  global_State *g = G(L);
-  lua_assert(g->gcstate == GCSpropagate);
-  if (g->GCestimate == 0) {  /* signal for another major collection? */
-    luaC_fullgc(L, 0);  /* perform a full regular collection */
-    g->GCestimate = gettotalbytes(g);  /* update control */
-  }
-  else {
-    lu_mem estimate = g->GCestimate;
-    luaC_runtilstate(L, bitmask(GCSpause));  /* run complete (minor) cycle */
-    g->gcstate = GCSpropagate;  /* skip restart */
-    if (gettotalbytes(g) > (estimate / 100) * g->gcmajorinc)
-      g->GCestimate = 0;  /* signal for a major collection */
-    else
-      g->GCestimate = estimate;  /* keep estimate from last major coll. */
+static void generationalcollection(lua_State *L)
+{
+    global_State *g = G(L);
+    lua_assert(g->gcstate == GCSpropagate);
+    if (g->GCestimate == 0) {  /* signal for another major collection? */
+        luaC_fullgc(L, 0);  /* perform a full regular collection */
+        g->GCestimate = gettotalbytes(g);  /* update control */
+    } else {
+        lu_mem estimate = g->GCestimate;
+        luaC_runtilstate(L, bitmask(GCSpause));  /* run complete (minor) cycle */
+        g->gcstate = GCSpropagate;  /* skip restart */
+        if (gettotalbytes(g) > (estimate / 100) * g->gcmajorinc)
+            g->GCestimate = 0;  /* signal for a major collection */
+        else
+            g->GCestimate = estimate;  /* keep estimate from last major coll. */
 
-  }
-  setpause(g, gettotalbytes(g));
-  lua_assert(g->gcstate == GCSpropagate);
+    }
+    setpause(g, gettotalbytes(g));
+    lua_assert(g->gcstate == GCSpropagate);
 }
 
 
-static void incstep (lua_State *L) {
-  global_State *g = G(L);
-  l_mem debt = g->GCdebt;
-  int stepmul = g->gcstepmul;
-  if (stepmul < 40) stepmul = 40;  /* avoid ridiculous low values (and 0) */
-  /* convert debt from Kb to 'work units' (avoid zero debt and overflows) */
-  debt = (debt / STEPMULADJ) + 1;
-  debt = (debt < MAX_LMEM / stepmul) ? debt * stepmul : MAX_LMEM;
-  do {  /* always perform at least one single step */
-    lu_mem work = singlestep(L);  /* do some work */
-    debt -= work;
-  } while (debt > -GCSTEPSIZE && g->gcstate != GCSpause);
-  if (g->gcstate == GCSpause)
-    setpause(g, g->GCestimate);  /* pause until next cycle */
-  else {
-    debt = (debt / stepmul) * STEPMULADJ;  /* convert 'work units' to Kb */
-    luaE_setdebt(g, debt);
-  }
+static void incstep(lua_State *L)
+{
+    global_State *g = G(L);
+    l_mem debt = g->GCdebt;
+    int stepmul = g->gcstepmul;
+    if (stepmul < 40) stepmul = 40;  /* avoid ridiculous low values (and 0) */
+    /* convert debt from Kb to 'work units' (avoid zero debt and overflows) */
+    debt = (debt / STEPMULADJ) + 1;
+    debt = (debt < MAX_LMEM / stepmul) ? debt * stepmul : MAX_LMEM;
+    do {  /* always perform at least one single step */
+        lu_mem work = singlestep(L);  /* do some work */
+        debt -= work;
+    } while (debt > -GCSTEPSIZE && g->gcstate != GCSpause);
+    if (g->gcstate == GCSpause)
+        setpause(g, g->GCestimate);  /* pause until next cycle */
+    else {
+        debt = (debt / stepmul) * STEPMULADJ;  /* convert 'work units' to Kb */
+        luaE_setdebt(g, debt);
+    }
 }
 
 
 /*
 ** performs a basic GC step
 */
-void luaC_forcestep (lua_State *L) {
-  global_State *g = G(L);
-  int i;
-  if (isgenerational(g)) generationalcollection(L);
-  else incstep(L);
-  /* run a few finalizers (or all of them at the end of a collect cycle) */
-  for (i = 0; g->tobefnz && (i < GCFINALIZENUM || g->gcstate == GCSpause); i++)
-    GCTM(L, 1);  /* call one finalizer */
+void luaC_forcestep(lua_State *L)
+{
+    global_State *g = G(L);
+    int i;
+    if (isgenerational(g)) generationalcollection(L);
+    else incstep(L);
+    /* run a few finalizers (or all of them at the end of a collect cycle) */
+    for (i = 0; g->tobefnz && (i < GCFINALIZENUM || g->gcstate == GCSpause); i++)
+        GCTM(L, 1);  /* call one finalizer */
 }
 
 
 /*
 ** performs a basic GC step only if collector is running
 */
-void luaC_step (lua_State *L) {
-  global_State *g = G(L);
-  if (g->gcrunning) luaC_forcestep(L);
-  else luaE_setdebt(g, -GCSTEPSIZE);  /* avoid being called too often */
+void luaC_step(lua_State *L)
+{
+    global_State *g = G(L);
+    if (g->gcrunning) luaC_forcestep(L);
+    else luaE_setdebt(g, -GCSTEPSIZE);  /* avoid being called too often */
 }
 
 
@@ -1179,33 +1234,34 @@ void luaC_step (lua_State *L) {
 ** performs a full GC cycle; if "isemergency", does not call
 ** finalizers (which could change stack positions)
 */
-void luaC_fullgc (lua_State *L, int isemergency) {
-  global_State *g = G(L);
-  int origkind = g->gckind;
-  lua_assert(origkind != KGC_EMERGENCY);
-  if (isemergency)  /* do not run finalizers during emergency GC */
-    g->gckind = KGC_EMERGENCY;
-  else {
-    g->gckind = KGC_NORMAL;
-    callallpendingfinalizers(L, 1);
-  }
-  if (keepinvariant(g)) {  /* may there be some black objects? */
-    /* must sweep all objects to turn them back to white
-       (as white has not changed, nothing will be collected) */
-    entersweep(L);
-  }
-  /* finish any pending sweep phase to start a new cycle */
-  luaC_runtilstate(L, bitmask(GCSpause));
-  luaC_runtilstate(L, ~bitmask(GCSpause));  /* start new collection */
-  luaC_runtilstate(L, bitmask(GCSpause));  /* run entire collection */
-  if (origkind == KGC_GEN) {  /* generational mode? */
-    /* generational mode must be kept in propagate phase */
-    luaC_runtilstate(L, bitmask(GCSpropagate));
-  }
-  g->gckind = origkind;
-  setpause(g, gettotalbytes(g));
-  if (!isemergency)   /* do not run finalizers during emergency GC */
-    callallpendingfinalizers(L, 1);
+void luaC_fullgc(lua_State *L, int isemergency)
+{
+    global_State *g = G(L);
+    int origkind = g->gckind;
+    lua_assert(origkind != KGC_EMERGENCY);
+    if (isemergency)  /* do not run finalizers during emergency GC */
+        g->gckind = KGC_EMERGENCY;
+    else {
+        g->gckind = KGC_NORMAL;
+        callallpendingfinalizers(L, 1);
+    }
+    if (keepinvariant(g)) {  /* may there be some black objects? */
+        /* must sweep all objects to turn them back to white
+           (as white has not changed, nothing will be collected) */
+        entersweep(L);
+    }
+    /* finish any pending sweep phase to start a new cycle */
+    luaC_runtilstate(L, bitmask(GCSpause));
+    luaC_runtilstate(L, ~bitmask(GCSpause));  /* start new collection */
+    luaC_runtilstate(L, bitmask(GCSpause));  /* run entire collection */
+    if (origkind == KGC_GEN) {  /* generational mode? */
+        /* generational mode must be kept in propagate phase */
+        luaC_runtilstate(L, bitmask(GCSpropagate));
+    }
+    g->gckind = origkind;
+    setpause(g, gettotalbytes(g));
+    if (!isemergency)   /* do not run finalizers during emergency GC */
+        callallpendingfinalizers(L, 1);
 }
 
 /* }====================================================== */
diff --git a/liblua/lgc.h b/liblua/lgc.h
index 1c92199a5..c3bb35c14 100644
--- a/liblua/lgc.h
+++ b/liblua/lgc.h
@@ -66,8 +66,8 @@
 ** 'propagate', so 'keepinvariant' is always true.
 */
 #define keepinvariantout(g)  \
-  check_exp(g->gcstate == GCSpropagate || !isgenerational(g),  \
-            g->gcstate <= GCSatomic)
+    check_exp(g->gcstate == GCSpropagate || !isgenerational(g),  \
+              g->gcstate <= GCSatomic)
 
 
 /*
@@ -125,33 +125,33 @@
 
 
 #define luaC_barrier(L,p,v) { if (valiswhite(v) && isblack(obj2gco(p)))  \
-    luaC_barrier_(L,obj2gco(p),gcvalue(v)); }
+            luaC_barrier_(L,obj2gco(p),gcvalue(v)); }
 
 #define luaC_barrierback(L,p,v) { if (valiswhite(v) && isblack(obj2gco(p)))  \
-    luaC_barrierback_(L,p); }
+            luaC_barrierback_(L,p); }
 
 #define luaC_objbarrier(L,p,o)  \
     { if (iswhite(obj2gco(o)) && isblack(obj2gco(p))) \
-        luaC_barrier_(L,obj2gco(p),obj2gco(o)); }
+            luaC_barrier_(L,obj2gco(p),obj2gco(o)); }
 
 #define luaC_objbarrierback(L,p,o)  \
-   { if (iswhite(obj2gco(o)) && isblack(obj2gco(p))) luaC_barrierback_(L,p); }
+    { if (iswhite(obj2gco(o)) && isblack(obj2gco(p))) luaC_barrierback_(L,p); }
 
 #define luaC_barrierproto(L,p,c) \
-   { if (isblack(obj2gco(p))) luaC_barrierproto_(L,p,c); }
+    { if (isblack(obj2gco(p))) luaC_barrierproto_(L,p,c); }
 
-LUAI_FUNC void luaC_freeallobjects (lua_State *L);
-LUAI_FUNC void luaC_step (lua_State *L);
-LUAI_FUNC void luaC_forcestep (lua_State *L);
-LUAI_FUNC void luaC_runtilstate (lua_State *L, int statesmask);
-LUAI_FUNC void luaC_fullgc (lua_State *L, int isemergency);
-LUAI_FUNC GCObject *luaC_newobj (lua_State *L, int tt, size_t sz,
-                                 GCObject **list, int offset);
-LUAI_FUNC void luaC_barrier_ (lua_State *L, GCObject *o, GCObject *v);
-LUAI_FUNC void luaC_barrierback_ (lua_State *L, GCObject *o);
-LUAI_FUNC void luaC_barrierproto_ (lua_State *L, Proto *p, Closure *c);
-LUAI_FUNC void luaC_checkfinalizer (lua_State *L, GCObject *o, Table *mt);
-LUAI_FUNC void luaC_checkupvalcolor (global_State *g, UpVal *uv);
-LUAI_FUNC void luaC_changemode (lua_State *L, int mode);
+LUAI_FUNC void luaC_freeallobjects(lua_State *L);
+LUAI_FUNC void luaC_step(lua_State *L);
+LUAI_FUNC void luaC_forcestep(lua_State *L);
+LUAI_FUNC void luaC_runtilstate(lua_State *L, int statesmask);
+LUAI_FUNC void luaC_fullgc(lua_State *L, int isemergency);
+LUAI_FUNC GCObject *luaC_newobj(lua_State *L, int tt, size_t sz,
+                                GCObject **list, int offset);
+LUAI_FUNC void luaC_barrier_(lua_State *L, GCObject *o, GCObject *v);
+LUAI_FUNC void luaC_barrierback_(lua_State *L, GCObject *o);
+LUAI_FUNC void luaC_barrierproto_(lua_State *L, Proto *p, Closure *c);
+LUAI_FUNC void luaC_checkfinalizer(lua_State *L, GCObject *o, Table *mt);
+LUAI_FUNC void luaC_checkupvalcolor(global_State *g, UpVal *uv);
+LUAI_FUNC void luaC_changemode(lua_State *L, int mode);
 
 #endif
diff --git a/liblua/linit.c b/liblua/linit.c
index 8d3aa6576..be9c4a34e 100644
--- a/liblua/linit.c
+++ b/liblua/linit.c
@@ -27,17 +27,17 @@
 ** program
 */
 static const luaL_Reg loadedlibs[] = {
-  {"_G", luaopen_base},
-  {LUA_LOADLIBNAME, luaopen_package},
-  {LUA_COLIBNAME, luaopen_coroutine},
-  {LUA_TABLIBNAME, luaopen_table},
-  {LUA_IOLIBNAME, luaopen_io},
-  {LUA_OSLIBNAME, luaopen_os},
-  {LUA_STRLIBNAME, luaopen_string},
-  {LUA_BITLIBNAME, luaopen_bit32},
-  {LUA_MATHLIBNAME, luaopen_math},
-  {LUA_DBLIBNAME, luaopen_debug},
-  {NULL, NULL}
+    {"_G", luaopen_base},
+    {LUA_LOADLIBNAME, luaopen_package},
+    {LUA_COLIBNAME, luaopen_coroutine},
+    {LUA_TABLIBNAME, luaopen_table},
+    {LUA_IOLIBNAME, luaopen_io},
+    {LUA_OSLIBNAME, luaopen_os},
+    {LUA_STRLIBNAME, luaopen_string},
+    {LUA_BITLIBNAME, luaopen_bit32},
+    {LUA_MATHLIBNAME, luaopen_math},
+    {LUA_DBLIBNAME, luaopen_debug},
+    {NULL, NULL}
 };
 
 
@@ -45,23 +45,24 @@ static const luaL_Reg loadedlibs[] = {
 ** these libs are preloaded and must be required before used
 */
 static const luaL_Reg preloadedlibs[] = {
-  {NULL, NULL}
+    {NULL, NULL}
 };
 
 
-LUALIB_API void luaL_openlibs (lua_State *L) {
-  const luaL_Reg *lib;
-  /* call open functions from 'loadedlibs' and set results to global table */
-  for (lib = loadedlibs; lib->func; lib++) {
-    luaL_requiref(L, lib->name, lib->func, 1);
-    lua_pop(L, 1);  /* remove lib */
-  }
-  /* add open functions from 'preloadedlibs' into 'package.preload' table */
-  luaL_getsubtable(L, LUA_REGISTRYINDEX, "_PRELOAD");
-  for (lib = preloadedlibs; lib->func; lib++) {
-    lua_pushcfunction(L, lib->func);
-    lua_setfield(L, -2, lib->name);
-  }
-  lua_pop(L, 1);  /* remove _PRELOAD table */
+LUALIB_API void luaL_openlibs(lua_State *L)
+{
+    const luaL_Reg *lib;
+    /* call open functions from 'loadedlibs' and set results to global table */
+    for (lib = loadedlibs; lib->func; lib++) {
+        luaL_requiref(L, lib->name, lib->func, 1);
+        lua_pop(L, 1);  /* remove lib */
+    }
+    /* add open functions from 'preloadedlibs' into 'package.preload' table */
+    luaL_getsubtable(L, LUA_REGISTRYINDEX, "_PRELOAD");
+    for (lib = preloadedlibs; lib->func; lib++) {
+        lua_pushcfunction(L, lib->func);
+        lua_setfield(L, -2, lib->name);
+    }
+    lua_pop(L, 1);  /* remove _PRELOAD table */
 }
 
diff --git a/liblua/liolib.c b/liblua/liolib.c
index 9db6f6f87..7cfe9750b 100644
--- a/liblua/liolib.c
+++ b/liblua/liolib.c
@@ -38,9 +38,9 @@
 */
 #define lua_checkmode(mode) \
     (*mode != '\0' && strchr("rwa", *(mode++)) != NULL && \
-    (*mode != '+' || ++mode) &&  /* skip if char is '+' */ \
-    (*mode != 'b' || ++mode) &&  /* skip if char is 'b' */ \
-    (*mode == '\0'))
+     (*mode != '+' || ++mode) &&  /* skip if char is '+' */ \
+     (*mode != 'b' || ++mode) &&  /* skip if char is 'b' */ \
+     (*mode == '\0'))
 
 #endif
 
@@ -67,7 +67,7 @@
 #else                      /* }{ */
 
 #define lua_popen(L,c,m) ((void)((void)c, m),  \
-        luaL_error(L, LUA_QL("popen") " not supported"), (FILE*)0)
+                          luaL_error(L, LUA_QL("popen") " not supported"), (FILE*)0)
 #define lua_pclose(L,file) ((void)((void)L, file), -1)
 
 
@@ -126,36 +126,39 @@ typedef luaL_Stream LStream;
 #define isclosed(p) ((p)->closef == NULL)
 
 
-static int io_type (lua_State *L) {
-  LStream *p;
-  luaL_checkany(L, 1);
-  p = (LStream *)luaL_testudata(L, 1, LUA_FILEHANDLE);
-  if (p == NULL)
-    lua_pushnil(L);  /* not a file */
-  else if (isclosed(p))
-    lua_pushliteral(L, "closed file");
-  else
-    lua_pushliteral(L, "file");
-  return 1;
+static int io_type(lua_State *L)
+{
+    LStream *p;
+    luaL_checkany(L, 1);
+    p = (LStream *)luaL_testudata(L, 1, LUA_FILEHANDLE);
+    if (p == NULL)
+        lua_pushnil(L);  /* not a file */
+    else if (isclosed(p))
+        lua_pushliteral(L, "closed file");
+    else
+        lua_pushliteral(L, "file");
+    return 1;
 }
 
 
-static int f_tostring (lua_State *L) {
-  LStream *p = tolstream(L);
-  if (isclosed(p))
-    lua_pushliteral(L, "file (closed)");
-  else
-    lua_pushfstring(L, "file (%p)", p->f);
-  return 1;
+static int f_tostring(lua_State *L)
+{
+    LStream *p = tolstream(L);
+    if (isclosed(p))
+        lua_pushliteral(L, "file (closed)");
+    else
+        lua_pushfstring(L, "file (%p)", p->f);
+    return 1;
 }
 
 
-static FILE *tofile (lua_State *L) {
-  LStream *p = tolstream(L);
-  if (isclosed(p))
-    luaL_error(L, "attempt to use a closed file");
-  lua_assert(p->f);
-  return p->f;
+static FILE *tofile(lua_State *L)
+{
+    LStream *p = tolstream(L);
+    if (isclosed(p))
+        luaL_error(L, "attempt to use a closed file");
+    lua_assert(p->f);
+    return p->f;
 }
 
 
@@ -164,178 +167,195 @@ static FILE *tofile (lua_State *L) {
 ** before opening the actual file; so, if there is a memory error, the
 ** file is not left opened.
 */
-static LStream *newprefile (lua_State *L) {
-  LStream *p = (LStream *)lua_newuserdata(L, sizeof(LStream));
-  p->closef = NULL;  /* mark file handle as 'closed' */
-  luaL_setmetatable(L, LUA_FILEHANDLE);
-  return p;
+static LStream *newprefile(lua_State *L)
+{
+    LStream *p = (LStream *)lua_newuserdata(L, sizeof(LStream));
+    p->closef = NULL;  /* mark file handle as 'closed' */
+    luaL_setmetatable(L, LUA_FILEHANDLE);
+    return p;
 }
 
 
-static int aux_close (lua_State *L) {
-  LStream *p = tolstream(L);
-  lua_CFunction cf = p->closef;
-  p->closef = NULL;  /* mark stream as closed */
-  return (*cf)(L);  /* close it */
+static int aux_close(lua_State *L)
+{
+    LStream *p = tolstream(L);
+    lua_CFunction cf = p->closef;
+    p->closef = NULL;  /* mark stream as closed */
+    return (*cf)(L);  /* close it */
 }
 
 
-static int io_close (lua_State *L) {
-  if (lua_isnone(L, 1))  /* no argument? */
-    lua_getfield(L, LUA_REGISTRYINDEX, IO_OUTPUT);  /* use standard output */
-  tofile(L);  /* make sure argument is an open stream */
-  return aux_close(L);
+static int io_close(lua_State *L)
+{
+    if (lua_isnone(L, 1))  /* no argument? */
+        lua_getfield(L, LUA_REGISTRYINDEX, IO_OUTPUT);  /* use standard output */
+    tofile(L);  /* make sure argument is an open stream */
+    return aux_close(L);
 }
 
 
-static int f_gc (lua_State *L) {
-  LStream *p = tolstream(L);
-  if (!isclosed(p) && p->f != NULL)
-    aux_close(L);  /* ignore closed and incompletely open files */
-  return 0;
+static int f_gc(lua_State *L)
+{
+    LStream *p = tolstream(L);
+    if (!isclosed(p) && p->f != NULL)
+        aux_close(L);  /* ignore closed and incompletely open files */
+    return 0;
 }
 
 
 /*
 ** function to close regular files
 */
-static int io_fclose (lua_State *L) {
-  LStream *p = tolstream(L);
-  int res = fclose(p->f);
-  return luaL_fileresult(L, (res == 0), NULL);
+static int io_fclose(lua_State *L)
+{
+    LStream *p = tolstream(L);
+    int res = fclose(p->f);
+    return luaL_fileresult(L, (res == 0), NULL);
 }
 
 
-static LStream *newfile (lua_State *L) {
-  LStream *p = newprefile(L);
-  p->f = NULL;
-  p->closef = &io_fclose;
-  return p;
+static LStream *newfile(lua_State *L)
+{
+    LStream *p = newprefile(L);
+    p->f = NULL;
+    p->closef = &io_fclose;
+    return p;
 }
 
 
-static void opencheck (lua_State *L, const char *fname, const char *mode) {
-  LStream *p = newfile(L);
-  p->f = fopen(fname, mode);
-  if (p->f == NULL)
-    luaL_error(L, "cannot open file " LUA_QS " (%s)", fname, strerror(errno));
+static void opencheck(lua_State *L, const char *fname, const char *mode)
+{
+    LStream *p = newfile(L);
+    p->f = fopen(fname, mode);
+    if (p->f == NULL)
+        luaL_error(L, "cannot open file " LUA_QS " (%s)", fname, strerror(errno));
 }
 
 
-static int io_open (lua_State *L) {
-  const char *filename = luaL_checkstring(L, 1);
-  const char *mode = luaL_optstring(L, 2, "r");
-  LStream *p = newfile(L);
-  const char *md = mode;  /* to traverse/check mode */
-  luaL_argcheck(L, lua_checkmode(md), 2, "invalid mode");
-  p->f = fopen(filename, mode);
-  return (p->f == NULL) ? luaL_fileresult(L, 0, filename) : 1;
+static int io_open(lua_State *L)
+{
+    const char *filename = luaL_checkstring(L, 1);
+    const char *mode = luaL_optstring(L, 2, "r");
+    LStream *p = newfile(L);
+    const char *md = mode;  /* to traverse/check mode */
+    luaL_argcheck(L, lua_checkmode(md), 2, "invalid mode");
+    p->f = fopen(filename, mode);
+    return (p->f == NULL) ? luaL_fileresult(L, 0, filename) : 1;
 }
 
 
 /*
 ** function to close 'popen' files
 */
-static int io_pclose (lua_State *L) {
-  LStream *p = tolstream(L);
-  return luaL_execresult(L, lua_pclose(L, p->f));
+static int io_pclose(lua_State *L)
+{
+    LStream *p = tolstream(L);
+    return luaL_execresult(L, lua_pclose(L, p->f));
 }
 
 
-static int io_popen (lua_State *L) {
-  const char *filename = luaL_checkstring(L, 1);
-  const char *mode = luaL_optstring(L, 2, "r");
-  LStream *p = newprefile(L);
-  p->f = lua_popen(L, filename, mode);
-  p->closef = &io_pclose;
-  return (p->f == NULL) ? luaL_fileresult(L, 0, filename) : 1;
-}
-
-
-static int io_tmpfile (lua_State *L) {
-  LStream *p = newfile(L);
-  p->f = tmpfile();
-  return (p->f == NULL) ? luaL_fileresult(L, 0, NULL) : 1;
-}
-
-
-static FILE *getiofile (lua_State *L, const char *findex) {
-  LStream *p;
-  lua_getfield(L, LUA_REGISTRYINDEX, findex);
-  p = (LStream *)lua_touserdata(L, -1);
-  if (isclosed(p))
-    luaL_error(L, "standard %s file is closed", findex + strlen(IO_PREFIX));
-  return p->f;
-}
-
-
-static int g_iofile (lua_State *L, const char *f, const char *mode) {
-  if (!lua_isnoneornil(L, 1)) {
-    const char *filename = lua_tostring(L, 1);
-    if (filename)
-      opencheck(L, filename, mode);
-    else {
-      tofile(L);  /* check that it's a valid file handle */
-      lua_pushvalue(L, 1);
-    }
-    lua_setfield(L, LUA_REGISTRYINDEX, f);
-  }
-  /* return current value */
-  lua_getfield(L, LUA_REGISTRYINDEX, f);
-  return 1;
-}
-
-
-static int io_input (lua_State *L) {
-  return g_iofile(L, IO_INPUT, "r");
-}
-
-
-static int io_output (lua_State *L) {
-  return g_iofile(L, IO_OUTPUT, "w");
-}
-
-
-static int io_readline (lua_State *L);
-
-
-static void aux_lines (lua_State *L, int toclose) {
-  int i;
-  int n = lua_gettop(L) - 1;  /* number of arguments to read */
-  /* ensure that arguments will fit here and into 'io_readline' stack */
-  luaL_argcheck(L, n <= LUA_MINSTACK - 3, LUA_MINSTACK - 3, "too many options");
-  lua_pushvalue(L, 1);  /* file handle */
-  lua_pushinteger(L, n);  /* number of arguments to read */
-  lua_pushboolean(L, toclose);  /* close/not close file when finished */
-  for (i = 1; i <= n; i++) lua_pushvalue(L, i + 1);  /* copy arguments */
-  lua_pushcclosure(L, io_readline, 3 + n);
-}
-
-
-static int f_lines (lua_State *L) {
-  tofile(L);  /* check that it's a valid file handle */
-  aux_lines(L, 0);
-  return 1;
-}
-
-
-static int io_lines (lua_State *L) {
-  int toclose;
-  if (lua_isnone(L, 1)) lua_pushnil(L);  /* at least one argument */
-  if (lua_isnil(L, 1)) {  /* no file name? */
-    lua_getfield(L, LUA_REGISTRYINDEX, IO_INPUT);  /* get default input */
-    lua_replace(L, 1);  /* put it at index 1 */
-    tofile(L);  /* check that it's a valid file handle */
-    toclose = 0;  /* do not close it after iteration */
-  }
-  else {  /* open a new file */
+static int io_popen(lua_State *L)
+{
     const char *filename = luaL_checkstring(L, 1);
-    opencheck(L, filename, "r");
-    lua_replace(L, 1);  /* put file at index 1 */
-    toclose = 1;  /* close it after iteration */
-  }
-  aux_lines(L, toclose);
-  return 1;
+    const char *mode = luaL_optstring(L, 2, "r");
+    LStream *p = newprefile(L);
+    p->f = lua_popen(L, filename, mode);
+    p->closef = &io_pclose;
+    return (p->f == NULL) ? luaL_fileresult(L, 0, filename) : 1;
+}
+
+
+static int io_tmpfile(lua_State *L)
+{
+    LStream *p = newfile(L);
+    p->f = tmpfile();
+    return (p->f == NULL) ? luaL_fileresult(L, 0, NULL) : 1;
+}
+
+
+static FILE *getiofile(lua_State *L, const char *findex)
+{
+    LStream *p;
+    lua_getfield(L, LUA_REGISTRYINDEX, findex);
+    p = (LStream *)lua_touserdata(L, -1);
+    if (isclosed(p))
+        luaL_error(L, "standard %s file is closed", findex + strlen(IO_PREFIX));
+    return p->f;
+}
+
+
+static int g_iofile(lua_State *L, const char *f, const char *mode)
+{
+    if (!lua_isnoneornil(L, 1)) {
+        const char *filename = lua_tostring(L, 1);
+        if (filename)
+            opencheck(L, filename, mode);
+        else {
+            tofile(L);  /* check that it's a valid file handle */
+            lua_pushvalue(L, 1);
+        }
+        lua_setfield(L, LUA_REGISTRYINDEX, f);
+    }
+    /* return current value */
+    lua_getfield(L, LUA_REGISTRYINDEX, f);
+    return 1;
+}
+
+
+static int io_input(lua_State *L)
+{
+    return g_iofile(L, IO_INPUT, "r");
+}
+
+
+static int io_output(lua_State *L)
+{
+    return g_iofile(L, IO_OUTPUT, "w");
+}
+
+
+static int io_readline(lua_State *L);
+
+
+static void aux_lines(lua_State *L, int toclose)
+{
+    int i;
+    int n = lua_gettop(L) - 1;  /* number of arguments to read */
+    /* ensure that arguments will fit here and into 'io_readline' stack */
+    luaL_argcheck(L, n <= LUA_MINSTACK - 3, LUA_MINSTACK - 3, "too many options");
+    lua_pushvalue(L, 1);  /* file handle */
+    lua_pushinteger(L, n);  /* number of arguments to read */
+    lua_pushboolean(L, toclose);  /* close/not close file when finished */
+    for (i = 1; i <= n; i++) lua_pushvalue(L, i + 1);  /* copy arguments */
+    lua_pushcclosure(L, io_readline, 3 + n);
+}
+
+
+static int f_lines(lua_State *L)
+{
+    tofile(L);  /* check that it's a valid file handle */
+    aux_lines(L, 0);
+    return 1;
+}
+
+
+static int io_lines(lua_State *L)
+{
+    int toclose;
+    if (lua_isnone(L, 1)) lua_pushnil(L);  /* at least one argument */
+    if (lua_isnil(L, 1)) {  /* no file name? */
+        lua_getfield(L, LUA_REGISTRYINDEX, IO_INPUT);  /* get default input */
+        lua_replace(L, 1);  /* put it at index 1 */
+        tofile(L);  /* check that it's a valid file handle */
+        toclose = 0;  /* do not close it after iteration */
+    } else { /* open a new file */
+        const char *filename = luaL_checkstring(L, 1);
+        opencheck(L, filename, "r");
+        lua_replace(L, 1);  /* put file at index 1 */
+        toclose = 1;  /* close it after iteration */
+    }
+    aux_lines(L, toclose);
+    return 1;
 }
 
 
@@ -346,240 +366,252 @@ static int io_lines (lua_State *L) {
 */
 
 
-static int read_number (lua_State *L, FILE *f) {
-  lua_Number d;
-  if (fscanf(f, LUA_NUMBER_SCAN, &d) == 1) {
-    lua_pushnumber(L, d);
-    return 1;
-  }
-  else {
-   lua_pushnil(L);  /* "result" to be removed */
-   return 0;  /* read fails */
-  }
+static int read_number(lua_State *L, FILE *f)
+{
+    lua_Number d;
+    if (fscanf(f, LUA_NUMBER_SCAN, &d) == 1) {
+        lua_pushnumber(L, d);
+        return 1;
+    } else {
+        lua_pushnil(L);  /* "result" to be removed */
+        return 0;  /* read fails */
+    }
 }
 
 
-static int test_eof (lua_State *L, FILE *f) {
-  int c = getc(f);
-  ungetc(c, f);
-  lua_pushlstring(L, NULL, 0);
-  return (c != EOF);
+static int test_eof(lua_State *L, FILE *f)
+{
+    int c = getc(f);
+    ungetc(c, f);
+    lua_pushlstring(L, NULL, 0);
+    return (c != EOF);
 }
 
 
-static int read_line (lua_State *L, FILE *f, int chop) {
-  luaL_Buffer b;
-  luaL_buffinit(L, &b);
-  for (;;) {
-    size_t l;
-    char *p = luaL_prepbuffer(&b);
-    if (fgets(p, LUAL_BUFFERSIZE, f) == NULL) {  /* eof? */
-      luaL_pushresult(&b);  /* close buffer */
-      return (lua_rawlen(L, -1) > 0);  /* check whether read something */
+static int read_line(lua_State *L, FILE *f, int chop)
+{
+    luaL_Buffer b;
+    luaL_buffinit(L, &b);
+    for (;;) {
+        size_t l;
+        char *p = luaL_prepbuffer(&b);
+        if (fgets(p, LUAL_BUFFERSIZE, f) == NULL) {  /* eof? */
+            luaL_pushresult(&b);  /* close buffer */
+            return (lua_rawlen(L, -1) > 0);  /* check whether read something */
+        }
+        l = strlen(p);
+        if (l == 0 || p[l - 1] != '\n')
+            luaL_addsize(&b, l);
+        else {
+            luaL_addsize(&b, l - chop);  /* chop 'eol' if needed */
+            luaL_pushresult(&b);  /* close buffer */
+            return 1;  /* read at least an `eol' */
+        }
     }
-    l = strlen(p);
-    if (l == 0 || p[l-1] != '\n')
-      luaL_addsize(&b, l);
-    else {
-      luaL_addsize(&b, l - chop);  /* chop 'eol' if needed */
-      luaL_pushresult(&b);  /* close buffer */
-      return 1;  /* read at least an `eol' */
-    }
-  }
 }
 
 
 #define MAX_SIZE_T (~(size_t)0)
 
-static void read_all (lua_State *L, FILE *f) {
-  size_t rlen = LUAL_BUFFERSIZE;  /* how much to read in each cycle */
-  luaL_Buffer b;
-  luaL_buffinit(L, &b);
-  for (;;) {
-    char *p = luaL_prepbuffsize(&b, rlen);
-    size_t nr = fread(p, sizeof(char), rlen, f);
+static void read_all(lua_State *L, FILE *f)
+{
+    size_t rlen = LUAL_BUFFERSIZE;  /* how much to read in each cycle */
+    luaL_Buffer b;
+    luaL_buffinit(L, &b);
+    for (;;) {
+        char *p = luaL_prepbuffsize(&b, rlen);
+        size_t nr = fread(p, sizeof(char), rlen, f);
+        luaL_addsize(&b, nr);
+        if (nr < rlen) break;  /* eof? */
+        else if (rlen <= (MAX_SIZE_T / 4))  /* avoid buffers too large */
+            rlen *= 2;  /* double buffer size at each iteration */
+    }
+    luaL_pushresult(&b);  /* close buffer */
+}
+
+
+static int read_chars(lua_State *L, FILE *f, size_t n)
+{
+    size_t nr;  /* number of chars actually read */
+    char *p;
+    luaL_Buffer b;
+    luaL_buffinit(L, &b);
+    p = luaL_prepbuffsize(&b, n);  /* prepare buffer to read whole block */
+    nr = fread(p, sizeof(char), n, f);  /* try to read 'n' chars */
     luaL_addsize(&b, nr);
-    if (nr < rlen) break;  /* eof? */
-    else if (rlen <= (MAX_SIZE_T / 4))  /* avoid buffers too large */
-      rlen *= 2;  /* double buffer size at each iteration */
-  }
-  luaL_pushresult(&b);  /* close buffer */
+    luaL_pushresult(&b);  /* close buffer */
+    return (nr > 0);  /* true iff read something */
 }
 
 
-static int read_chars (lua_State *L, FILE *f, size_t n) {
-  size_t nr;  /* number of chars actually read */
-  char *p;
-  luaL_Buffer b;
-  luaL_buffinit(L, &b);
-  p = luaL_prepbuffsize(&b, n);  /* prepare buffer to read whole block */
-  nr = fread(p, sizeof(char), n, f);  /* try to read 'n' chars */
-  luaL_addsize(&b, nr);
-  luaL_pushresult(&b);  /* close buffer */
-  return (nr > 0);  /* true iff read something */
-}
-
-
-static int g_read (lua_State *L, FILE *f, int first) {
-  int nargs = lua_gettop(L) - 1;
-  int success;
-  int n;
-  clearerr(f);
-  if (nargs == 0) {  /* no arguments? */
-    success = read_line(L, f, 1);
-    n = first+1;  /* to return 1 result */
-  }
-  else {  /* ensure stack space for all results and for auxlib's buffer */
-    luaL_checkstack(L, nargs+LUA_MINSTACK, "too many arguments");
-    success = 1;
-    for (n = first; nargs-- && success; n++) {
-      if (lua_type(L, n) == LUA_TNUMBER) {
-        size_t l = (size_t)lua_tointeger(L, n);
-        success = (l == 0) ? test_eof(L, f) : read_chars(L, f, l);
-      }
-      else {
-        const char *p = lua_tostring(L, n);
-        luaL_argcheck(L, p && p[0] == '*', n, "invalid option");
-        switch (p[1]) {
-          case 'n':  /* number */
-            success = read_number(L, f);
-            break;
-          case 'l':  /* line */
-            success = read_line(L, f, 1);
-            break;
-          case 'L':  /* line with end-of-line */
-            success = read_line(L, f, 0);
-            break;
-          case 'a':  /* file */
-            read_all(L, f);  /* read entire file */
-            success = 1; /* always success */
-            break;
-          default:
-            return luaL_argerror(L, n, "invalid format");
+static int g_read(lua_State *L, FILE *f, int first)
+{
+    int nargs = lua_gettop(L) - 1;
+    int success;
+    int n;
+    clearerr(f);
+    if (nargs == 0) {  /* no arguments? */
+        success = read_line(L, f, 1);
+        n = first + 1; /* to return 1 result */
+    } else { /* ensure stack space for all results and for auxlib's buffer */
+        luaL_checkstack(L, nargs + LUA_MINSTACK, "too many arguments");
+        success = 1;
+        for (n = first; nargs-- && success; n++) {
+            if (lua_type(L, n) == LUA_TNUMBER) {
+                size_t l = (size_t)lua_tointeger(L, n);
+                success = (l == 0) ? test_eof(L, f) : read_chars(L, f, l);
+            } else {
+                const char *p = lua_tostring(L, n);
+                luaL_argcheck(L, p && p[0] == '*', n, "invalid option");
+                switch (p[1]) {
+                    case 'n':  /* number */
+                        success = read_number(L, f);
+                        break;
+                    case 'l':  /* line */
+                        success = read_line(L, f, 1);
+                        break;
+                    case 'L':  /* line with end-of-line */
+                        success = read_line(L, f, 0);
+                        break;
+                    case 'a':  /* file */
+                        read_all(L, f);  /* read entire file */
+                        success = 1; /* always success */
+                        break;
+                    default:
+                        return luaL_argerror(L, n, "invalid format");
+                }
+            }
         }
-      }
     }
-  }
-  if (ferror(f))
-    return luaL_fileresult(L, 0, NULL);
-  if (!success) {
-    lua_pop(L, 1);  /* remove last result */
-    lua_pushnil(L);  /* push nil instead */
-  }
-  return n - first;
+    if (ferror(f))
+        return luaL_fileresult(L, 0, NULL);
+    if (!success) {
+        lua_pop(L, 1);  /* remove last result */
+        lua_pushnil(L);  /* push nil instead */
+    }
+    return n - first;
 }
 
 
-static int io_read (lua_State *L) {
-  return g_read(L, getiofile(L, IO_INPUT), 1);
+static int io_read(lua_State *L)
+{
+    return g_read(L, getiofile(L, IO_INPUT), 1);
 }
 
 
-static int f_read (lua_State *L) {
-  return g_read(L, tofile(L), 2);
+static int f_read(lua_State *L)
+{
+    return g_read(L, tofile(L), 2);
 }
 
 
-static int io_readline (lua_State *L) {
-  LStream *p = (LStream *)lua_touserdata(L, lua_upvalueindex(1));
-  int i;
-  int n = (int)lua_tointeger(L, lua_upvalueindex(2));
-  if (isclosed(p))  /* file is already closed? */
-    return luaL_error(L, "file is already closed");
-  lua_settop(L , 1);
-  for (i = 1; i <= n; i++)  /* push arguments to 'g_read' */
-    lua_pushvalue(L, lua_upvalueindex(3 + i));
-  n = g_read(L, p->f, 2);  /* 'n' is number of results */
-  lua_assert(n > 0);  /* should return at least a nil */
-  if (!lua_isnil(L, -n))  /* read at least one value? */
-    return n;  /* return them */
-  else {  /* first result is nil: EOF or error */
-    if (n > 1) {  /* is there error information? */
-      /* 2nd result is error message */
-      return luaL_error(L, "%s", lua_tostring(L, -n + 1));
+static int io_readline(lua_State *L)
+{
+    LStream *p = (LStream *)lua_touserdata(L, lua_upvalueindex(1));
+    int i;
+    int n = (int)lua_tointeger(L, lua_upvalueindex(2));
+    if (isclosed(p))  /* file is already closed? */
+        return luaL_error(L, "file is already closed");
+    lua_settop(L, 1);
+    for (i = 1; i <= n; i++)  /* push arguments to 'g_read' */
+        lua_pushvalue(L, lua_upvalueindex(3 + i));
+    n = g_read(L, p->f, 2);  /* 'n' is number of results */
+    lua_assert(n > 0);  /* should return at least a nil */
+    if (!lua_isnil(L, -n))  /* read at least one value? */
+        return n;  /* return them */
+    else {  /* first result is nil: EOF or error */
+        if (n > 1) {  /* is there error information? */
+            /* 2nd result is error message */
+            return luaL_error(L, "%s", lua_tostring(L, -n + 1));
+        }
+        if (lua_toboolean(L, lua_upvalueindex(3))) {  /* generator created file? */
+            lua_settop(L, 0);
+            lua_pushvalue(L, lua_upvalueindex(1));
+            aux_close(L);  /* close it */
+        }
+        return 0;
     }
-    if (lua_toboolean(L, lua_upvalueindex(3))) {  /* generator created file? */
-      lua_settop(L, 0);
-      lua_pushvalue(L, lua_upvalueindex(1));
-      aux_close(L);  /* close it */
-    }
-    return 0;
-  }
 }
 
 /* }====================================================== */
 
 
-static int g_write (lua_State *L, FILE *f, int arg) {
-  int nargs = lua_gettop(L) - arg;
-  int status = 1;
-  for (; nargs--; arg++) {
-    if (lua_type(L, arg) == LUA_TNUMBER) {
-      /* optimization: could be done exactly as for strings */
-      status = status &&
-          fprintf(f, LUA_NUMBER_FMT, lua_tonumber(L, arg)) > 0;
+static int g_write(lua_State *L, FILE *f, int arg)
+{
+    int nargs = lua_gettop(L) - arg;
+    int status = 1;
+    for (; nargs--; arg++) {
+        if (lua_type(L, arg) == LUA_TNUMBER) {
+            /* optimization: could be done exactly as for strings */
+            status = status &&
+                     fprintf(f, LUA_NUMBER_FMT, lua_tonumber(L, arg)) > 0;
+        } else {
+            size_t l;
+            const char *s = luaL_checklstring(L, arg, &l);
+            status = status && (fwrite(s, sizeof(char), l, f) == l);
+        }
     }
-    else {
-      size_t l;
-      const char *s = luaL_checklstring(L, arg, &l);
-      status = status && (fwrite(s, sizeof(char), l, f) == l);
-    }
-  }
-  if (status) return 1;  /* file handle already on stack top */
-  else return luaL_fileresult(L, status, NULL);
+    if (status) return 1;  /* file handle already on stack top */
+    else return luaL_fileresult(L, status, NULL);
 }
 
 
-static int io_write (lua_State *L) {
-  return g_write(L, getiofile(L, IO_OUTPUT), 1);
+static int io_write(lua_State *L)
+{
+    return g_write(L, getiofile(L, IO_OUTPUT), 1);
 }
 
 
-static int f_write (lua_State *L) {
-  FILE *f = tofile(L);
-  lua_pushvalue(L, 1);  /* push file at the stack top (to be returned) */
-  return g_write(L, f, 2);
+static int f_write(lua_State *L)
+{
+    FILE *f = tofile(L);
+    lua_pushvalue(L, 1);  /* push file at the stack top (to be returned) */
+    return g_write(L, f, 2);
 }
 
 
-static int f_seek (lua_State *L) {
-  static const int mode[] = {SEEK_SET, SEEK_CUR, SEEK_END};
-  static const char *const modenames[] = {"set", "cur", "end", NULL};
-  FILE *f = tofile(L);
-  int op = luaL_checkoption(L, 2, "cur", modenames);
-  lua_Number p3 = luaL_optnumber(L, 3, 0);
-  l_seeknum offset = (l_seeknum)p3;
-  luaL_argcheck(L, (lua_Number)offset == p3, 3,
+static int f_seek(lua_State *L)
+{
+    static const int mode[] = {SEEK_SET, SEEK_CUR, SEEK_END};
+    static const char *const modenames[] = {"set", "cur", "end", NULL};
+    FILE *f = tofile(L);
+    int op = luaL_checkoption(L, 2, "cur", modenames);
+    lua_Number p3 = luaL_optnumber(L, 3, 0);
+    l_seeknum offset = (l_seeknum)p3;
+    luaL_argcheck(L, (lua_Number)offset == p3, 3,
                   "not an integer in proper range");
-  op = l_fseek(f, offset, mode[op]);
-  if (op)
-    return luaL_fileresult(L, 0, NULL);  /* error */
-  else {
-    lua_pushnumber(L, (lua_Number)l_ftell(f));
-    return 1;
-  }
+    op = l_fseek(f, offset, mode[op]);
+    if (op)
+        return luaL_fileresult(L, 0, NULL);  /* error */
+    else {
+        lua_pushnumber(L, (lua_Number)l_ftell(f));
+        return 1;
+    }
 }
 
 
-static int f_setvbuf (lua_State *L) {
-  static const int mode[] = {_IONBF, _IOFBF, _IOLBF};
-  static const char *const modenames[] = {"no", "full", "line", NULL};
-  FILE *f = tofile(L);
-  int op = luaL_checkoption(L, 2, NULL, modenames);
-  lua_Integer sz = luaL_optinteger(L, 3, LUAL_BUFFERSIZE);
-  int res = setvbuf(f, NULL, mode[op], sz);
-  return luaL_fileresult(L, res == 0, NULL);
+static int f_setvbuf(lua_State *L)
+{
+    static const int mode[] = {_IONBF, _IOFBF, _IOLBF};
+    static const char *const modenames[] = {"no", "full", "line", NULL};
+    FILE *f = tofile(L);
+    int op = luaL_checkoption(L, 2, NULL, modenames);
+    lua_Integer sz = luaL_optinteger(L, 3, LUAL_BUFFERSIZE);
+    int res = setvbuf(f, NULL, mode[op], sz);
+    return luaL_fileresult(L, res == 0, NULL);
 }
 
 
 
-static int io_flush (lua_State *L) {
-  return luaL_fileresult(L, fflush(getiofile(L, IO_OUTPUT)) == 0, NULL);
+static int io_flush(lua_State *L)
+{
+    return luaL_fileresult(L, fflush(getiofile(L, IO_OUTPUT)) == 0, NULL);
 }
 
 
-static int f_flush (lua_State *L) {
-  return luaL_fileresult(L, fflush(tofile(L)) == 0, NULL);
+static int f_flush(lua_State *L)
+{
+    return luaL_fileresult(L, fflush(tofile(L)) == 0, NULL);
 }
 
 
@@ -587,18 +619,18 @@ static int f_flush (lua_State *L) {
 ** functions for 'io' library
 */
 static const luaL_Reg iolib[] = {
-  {"close", io_close},
-  {"flush", io_flush},
-  {"input", io_input},
-  {"lines", io_lines},
-  {"open", io_open},
-  {"output", io_output},
-  {"popen", io_popen},
-  {"read", io_read},
-  {"tmpfile", io_tmpfile},
-  {"type", io_type},
-  {"write", io_write},
-  {NULL, NULL}
+    {"close", io_close},
+    {"flush", io_flush},
+    {"input", io_input},
+    {"lines", io_lines},
+    {"open", io_open},
+    {"output", io_output},
+    {"popen", io_popen},
+    {"read", io_read},
+    {"tmpfile", io_tmpfile},
+    {"type", io_type},
+    {"write", io_write},
+    {NULL, NULL}
 };
 
 
@@ -606,60 +638,64 @@ static const luaL_Reg iolib[] = {
 ** methods for file handles
 */
 static const luaL_Reg flib[] = {
-  {"close", io_close},
-  {"flush", f_flush},
-  {"lines", f_lines},
-  {"read", f_read},
-  {"seek", f_seek},
-  {"setvbuf", f_setvbuf},
-  {"write", f_write},
-  {"__gc", f_gc},
-  {"__tostring", f_tostring},
-  {NULL, NULL}
+    {"close", io_close},
+    {"flush", f_flush},
+    {"lines", f_lines},
+    {"read", f_read},
+    {"seek", f_seek},
+    {"setvbuf", f_setvbuf},
+    {"write", f_write},
+    {"__gc", f_gc},
+    {"__tostring", f_tostring},
+    {NULL, NULL}
 };
 
 
-static void createmeta (lua_State *L) {
-  luaL_newmetatable(L, LUA_FILEHANDLE);  /* create metatable for file handles */
-  lua_pushvalue(L, -1);  /* push metatable */
-  lua_setfield(L, -2, "__index");  /* metatable.__index = metatable */
-  luaL_setfuncs(L, flib, 0);  /* add file methods to new metatable */
-  lua_pop(L, 1);  /* pop new metatable */
+static void createmeta(lua_State *L)
+{
+    luaL_newmetatable(L, LUA_FILEHANDLE);  /* create metatable for file handles */
+    lua_pushvalue(L, -1);  /* push metatable */
+    lua_setfield(L, -2, "__index");  /* metatable.__index = metatable */
+    luaL_setfuncs(L, flib, 0);  /* add file methods to new metatable */
+    lua_pop(L, 1);  /* pop new metatable */
 }
 
 
 /*
 ** function to (not) close the standard files stdin, stdout, and stderr
 */
-static int io_noclose (lua_State *L) {
-  LStream *p = tolstream(L);
-  p->closef = &io_noclose;  /* keep file opened */
-  lua_pushnil(L);
-  lua_pushliteral(L, "cannot close standard file");
-  return 2;
+static int io_noclose(lua_State *L)
+{
+    LStream *p = tolstream(L);
+    p->closef = &io_noclose;  /* keep file opened */
+    lua_pushnil(L);
+    lua_pushliteral(L, "cannot close standard file");
+    return 2;
 }
 
 
-static void createstdfile (lua_State *L, FILE *f, const char *k,
-                           const char *fname) {
-  LStream *p = newprefile(L);
-  p->f = f;
-  p->closef = &io_noclose;
-  if (k != NULL) {
-    lua_pushvalue(L, -1);
-    lua_setfield(L, LUA_REGISTRYINDEX, k);  /* add file to registry */
-  }
-  lua_setfield(L, -2, fname);  /* add file to module */
+static void createstdfile(lua_State *L, FILE *f, const char *k,
+                          const char *fname)
+{
+    LStream *p = newprefile(L);
+    p->f = f;
+    p->closef = &io_noclose;
+    if (k != NULL) {
+        lua_pushvalue(L, -1);
+        lua_setfield(L, LUA_REGISTRYINDEX, k);  /* add file to registry */
+    }
+    lua_setfield(L, -2, fname);  /* add file to module */
 }
 
 
-LUAMOD_API int luaopen_io (lua_State *L) {
-  luaL_newlib(L, iolib);  /* new module */
-  createmeta(L);
-  /* create (and set) default files */
-  createstdfile(L, stdin, IO_INPUT, "stdin");
-  createstdfile(L, stdout, IO_OUTPUT, "stdout");
-  createstdfile(L, stderr, NULL, "stderr");
-  return 1;
+LUAMOD_API int luaopen_io(lua_State *L)
+{
+    luaL_newlib(L, iolib);  /* new module */
+    createmeta(L);
+    /* create (and set) default files */
+    createstdfile(L, stdin, IO_INPUT, "stdin");
+    createstdfile(L, stdout, IO_OUTPUT, "stdout");
+    createstdfile(L, stderr, NULL, "stderr");
+    return 1;
 }
 
diff --git a/liblua/llex.c b/liblua/llex.c
index bd83444ce..0a688cd2b 100644
--- a/liblua/llex.c
+++ b/liblua/llex.c
@@ -46,73 +46,78 @@ static const char *const luaX_tokens [] = {
 #define save_and_next(ls) (save(ls, ls->current), next(ls))
 
 
-static l_noret lexerror (LexState *ls, const char *msg, int token);
+static l_noret lexerror(LexState *ls, const char *msg, int token);
 
 
-static void save (LexState *ls, int c) {
-  Mbuffer *b = ls->buff;
-  if (luaZ_bufflen(b) + 1 > luaZ_sizebuffer(b)) {
-    size_t newsize;
-    if (luaZ_sizebuffer(b) >= MAX_SIZET/2)
-      lexerror(ls, "lexical element too long", 0);
-    newsize = luaZ_sizebuffer(b) * 2;
-    luaZ_resizebuffer(ls->L, b, newsize);
-  }
-  b->buffer[luaZ_bufflen(b)++] = cast(char, c);
+static void save(LexState *ls, int c)
+{
+    Mbuffer *b = ls->buff;
+    if (luaZ_bufflen(b) + 1 > luaZ_sizebuffer(b)) {
+        size_t newsize;
+        if (luaZ_sizebuffer(b) >= MAX_SIZET / 2)
+            lexerror(ls, "lexical element too long", 0);
+        newsize = luaZ_sizebuffer(b) * 2;
+        luaZ_resizebuffer(ls->L, b, newsize);
+    }
+    b->buffer[luaZ_bufflen(b)++] = cast(char, c);
 }
 
 
-void luaX_init (lua_State *L) {
-  int i;
-  for (i=0; i<NUM_RESERVED; i++) {
-    TString *ts = luaS_new(L, luaX_tokens[i]);
-    luaS_fix(ts);  /* reserved words are never collected */
-    ts->tsv.extra = cast_byte(i+1);  /* reserved word */
-  }
+void luaX_init(lua_State *L)
+{
+    int i;
+    for (i = 0; i < NUM_RESERVED; i++) {
+        TString *ts = luaS_new(L, luaX_tokens[i]);
+        luaS_fix(ts);  /* reserved words are never collected */
+        ts->tsv.extra = cast_byte(i + 1); /* reserved word */
+    }
 }
 
 
-const char *luaX_token2str (LexState *ls, int token) {
-  if (token < FIRST_RESERVED) {  /* single-byte symbols? */
-    lua_assert(token == cast(unsigned char, token));
-    return (lisprint(token)) ? luaO_pushfstring(ls->L, LUA_QL("%c"), token) :
-                              luaO_pushfstring(ls->L, "char(%d)", token);
-  }
-  else {
-    const char *s = luaX_tokens[token - FIRST_RESERVED];
-    if (token < TK_EOS)  /* fixed format (symbols and reserved words)? */
-      return luaO_pushfstring(ls->L, LUA_QS, s);
-    else  /* names, strings, and numerals */
-      return s;
-  }
+const char *luaX_token2str(LexState *ls, int token)
+{
+    if (token < FIRST_RESERVED) {  /* single-byte symbols? */
+        lua_assert(token == cast(unsigned char, token));
+        return (lisprint(token)) ? luaO_pushfstring(ls->L, LUA_QL("%c"), token) :
+               luaO_pushfstring(ls->L, "char(%d)", token);
+    } else {
+        const char *s = luaX_tokens[token - FIRST_RESERVED];
+        if (token < TK_EOS)  /* fixed format (symbols and reserved words)? */
+            return luaO_pushfstring(ls->L, LUA_QS, s);
+        else  /* names, strings, and numerals */
+            return s;
+    }
 }
 
 
-static const char *txtToken (LexState *ls, int token) {
-  switch (token) {
-    case TK_NAME:
-    case TK_STRING:
-    case TK_NUMBER:
-      save(ls, '\0');
-      return luaO_pushfstring(ls->L, LUA_QS, luaZ_buffer(ls->buff));
-    default:
-      return luaX_token2str(ls, token);
-  }
+static const char *txtToken(LexState *ls, int token)
+{
+    switch (token) {
+        case TK_NAME:
+        case TK_STRING:
+        case TK_NUMBER:
+            save(ls, '\0');
+            return luaO_pushfstring(ls->L, LUA_QS, luaZ_buffer(ls->buff));
+        default:
+            return luaX_token2str(ls, token);
+    }
 }
 
 
-static l_noret lexerror (LexState *ls, const char *msg, int token) {
-  char buff[LUA_IDSIZE];
-  luaO_chunkid(buff, getstr(ls->source), LUA_IDSIZE);
-  msg = luaO_pushfstring(ls->L, "%s:%d: %s", buff, ls->linenumber, msg);
-  if (token)
-    luaO_pushfstring(ls->L, "%s near %s", msg, txtToken(ls, token));
-  luaD_throw(ls->L, LUA_ERRSYNTAX);
+static l_noret lexerror(LexState *ls, const char *msg, int token)
+{
+    char buff[LUA_IDSIZE];
+    luaO_chunkid(buff, getstr(ls->source), LUA_IDSIZE);
+    msg = luaO_pushfstring(ls->L, "%s:%d: %s", buff, ls->linenumber, msg);
+    if (token)
+        luaO_pushfstring(ls->L, "%s near %s", msg, txtToken(ls, token));
+    luaD_throw(ls->L, LUA_ERRSYNTAX);
 }
 
 
-l_noret luaX_syntaxerror (LexState *ls, const char *msg) {
-  lexerror(ls, msg, ls->t.token);
+l_noret luaX_syntaxerror(LexState *ls, const char *msg)
+{
+    lexerror(ls, msg, ls->t.token);
 }
 
 
@@ -121,20 +126,21 @@ l_noret luaX_syntaxerror (LexState *ls, const char *msg) {
 ** it will not be collected until the end of the function's compilation
 ** (by that time it should be anchored in function's prototype)
 */
-TString *luaX_newstring (LexState *ls, const char *str, size_t l) {
-  lua_State *L = ls->L;
-  TValue *o;  /* entry for `str' */
-  TString *ts = luaS_newlstr(L, str, l);  /* create new string */
-  setsvalue2s(L, L->top++, ts);  /* temporarily anchor it in stack */
-  o = luaH_set(L, ls->fs->h, L->top - 1);
-  if (ttisnil(o)) {  /* not in use yet? (see 'addK') */
-    /* boolean value does not need GC barrier;
-       table has no metatable, so it does not need to invalidate cache */
-    setbvalue(o, 1);  /* t[string] = true */
-    luaC_checkGC(L);
-  }
-  L->top--;  /* remove string from stack */
-  return ts;
+TString *luaX_newstring(LexState *ls, const char *str, size_t l)
+{
+    lua_State *L = ls->L;
+    TValue *o;  /* entry for `str' */
+    TString *ts = luaS_newlstr(L, str, l);  /* create new string */
+    setsvalue2s(L, L->top++, ts);  /* temporarily anchor it in stack */
+    o = luaH_set(L, ls->fs->h, L->top - 1);
+    if (ttisnil(o)) {  /* not in use yet? (see 'addK') */
+        /* boolean value does not need GC barrier;
+           table has no metatable, so it does not need to invalidate cache */
+        setbvalue(o, 1);  /* t[string] = true */
+        luaC_checkGC(L);
+    }
+    L->top--;  /* remove string from stack */
+    return ts;
 }
 
 
@@ -142,31 +148,33 @@ TString *luaX_newstring (LexState *ls, const char *str, size_t l) {
 ** increment line number and skips newline sequence (any of
 ** \n, \r, \n\r, or \r\n)
 */
-static void inclinenumber (LexState *ls) {
-  int old = ls->current;
-  lua_assert(currIsNewline(ls));
-  next(ls);  /* skip `\n' or `\r' */
-  if (currIsNewline(ls) && ls->current != old)
-    next(ls);  /* skip `\n\r' or `\r\n' */
-  if (++ls->linenumber >= MAX_INT)
-    luaX_syntaxerror(ls, "chunk has too many lines");
+static void inclinenumber(LexState *ls)
+{
+    int old = ls->current;
+    lua_assert(currIsNewline(ls));
+    next(ls);  /* skip `\n' or `\r' */
+    if (currIsNewline(ls) && ls->current != old)
+        next(ls);  /* skip `\n\r' or `\r\n' */
+    if (++ls->linenumber >= MAX_INT)
+        luaX_syntaxerror(ls, "chunk has too many lines");
 }
 
 
-void luaX_setinput (lua_State *L, LexState *ls, ZIO *z, TString *source,
-                    int firstchar) {
-  ls->decpoint = '.';
-  ls->L = L;
-  ls->current = firstchar;
-  ls->lookahead.token = TK_EOS;  /* no look-ahead token */
-  ls->z = z;
-  ls->fs = NULL;
-  ls->linenumber = 1;
-  ls->lastline = 1;
-  ls->source = source;
-  ls->envn = luaS_new(L, LUA_ENV);  /* create env name */
-  luaS_fix(ls->envn);  /* never collect this name */
-  luaZ_resizebuffer(ls->L, ls->buff, LUA_MINBUFFER);  /* initialize buffer */
+void luaX_setinput(lua_State *L, LexState *ls, ZIO *z, TString *source,
+                   int firstchar)
+{
+    ls->decpoint = '.';
+    ls->L = L;
+    ls->current = firstchar;
+    ls->lookahead.token = TK_EOS;  /* no look-ahead token */
+    ls->z = z;
+    ls->fs = NULL;
+    ls->linenumber = 1;
+    ls->lastline = 1;
+    ls->source = source;
+    ls->envn = luaS_new(L, LUA_ENV);  /* create env name */
+    luaS_fix(ls->envn);  /* never collect this name */
+    luaZ_resizebuffer(ls->L, ls->buff, LUA_MINBUFFER);  /* initialize buffer */
 }
 
 
@@ -179,22 +187,24 @@ void luaX_setinput (lua_State *L, LexState *ls, ZIO *z, TString *source,
 
 
 
-static int check_next (LexState *ls, const char *set) {
-  if (ls->current == '\0' || !strchr(set, ls->current))
-    return 0;
-  save_and_next(ls);
-  return 1;
+static int check_next(LexState *ls, const char *set)
+{
+    if (ls->current == '\0' || !strchr(set, ls->current))
+        return 0;
+    save_and_next(ls);
+    return 1;
 }
 
 
 /*
 ** change all characters 'from' in buffer to 'to'
 */
-static void buffreplace (LexState *ls, char from, char to) {
-  size_t n = luaZ_bufflen(ls->buff);
-  char *p = luaZ_buffer(ls->buff);
-  while (n--)
-    if (p[n] == from) p[n] = to;
+static void buffreplace(LexState *ls, char from, char to)
+{
+    size_t n = luaZ_bufflen(ls->buff);
+    char *p = luaZ_buffer(ls->buff);
+    while (n--)
+        if (p[n] == from) p[n] = to;
 }
 
 
@@ -211,15 +221,16 @@ static void buffreplace (LexState *ls, char from, char to) {
 ** in case of format error, try to change decimal point separator to
 ** the one defined in the current locale and check again
 */
-static void trydecpoint (LexState *ls, SemInfo *seminfo) {
-  char old = ls->decpoint;
-  ls->decpoint = getlocaledecpoint();
-  buffreplace(ls, old, ls->decpoint);  /* try new decimal separator */
-  if (!buff2d(ls->buff, &seminfo->r)) {
-    /* format error with correct decimal point: no more options */
-    buffreplace(ls, ls->decpoint, '.');  /* undo change (for error message) */
-    lexerror(ls, "malformed number", TK_NUMBER);
-  }
+static void trydecpoint(LexState *ls, SemInfo *seminfo)
+{
+    char old = ls->decpoint;
+    ls->decpoint = getlocaledecpoint();
+    buffreplace(ls, old, ls->decpoint);  /* try new decimal separator */
+    if (!buff2d(ls->buff, &seminfo->r)) {
+        /* format error with correct decimal point: no more options */
+        buffreplace(ls, ls->decpoint, '.');  /* undo change (for error message) */
+        lexerror(ls, "malformed number", TK_NUMBER);
+    }
 }
 
 
@@ -228,24 +239,25 @@ static void trydecpoint (LexState *ls, SemInfo *seminfo) {
 ** this function is quite liberal in what it accepts, as 'luaO_str2d'
 ** will reject ill-formed numerals.
 */
-static void read_numeral (LexState *ls, SemInfo *seminfo) {
-  const char *expo = "Ee";
-  int first = ls->current;
-  lua_assert(lisdigit(ls->current));
-  save_and_next(ls);
-  if (first == '0' && check_next(ls, "Xx"))  /* hexadecimal? */
-    expo = "Pp";
-  for (;;) {
-    if (check_next(ls, expo))  /* exponent part? */
-      check_next(ls, "+-");  /* optional exponent sign */
-    if (lisxdigit(ls->current) || ls->current == '.')
-      save_and_next(ls);
-    else  break;
-  }
-  save(ls, '\0');
-  buffreplace(ls, '.', ls->decpoint);  /* follow locale for decimal point */
-  if (!buff2d(ls->buff, &seminfo->r))  /* format error? */
-    trydecpoint(ls, seminfo); /* try to update decimal point separator */
+static void read_numeral(LexState *ls, SemInfo *seminfo)
+{
+    const char *expo = "Ee";
+    int first = ls->current;
+    lua_assert(lisdigit(ls->current));
+    save_and_next(ls);
+    if (first == '0' && check_next(ls, "Xx"))  /* hexadecimal? */
+        expo = "Pp";
+    for (;;) {
+        if (check_next(ls, expo))  /* exponent part? */
+            check_next(ls, "+-");  /* optional exponent sign */
+        if (lisxdigit(ls->current) || ls->current == '.')
+            save_and_next(ls);
+        else  break;
+    }
+    save(ls, '\0');
+    buffreplace(ls, '.', ls->decpoint);  /* follow locale for decimal point */
+    if (!buff2d(ls->buff, &seminfo->r))  /* format error? */
+        trydecpoint(ls, seminfo); /* try to update decimal point separator */
 }
 
 
@@ -253,277 +265,323 @@ static void read_numeral (LexState *ls, SemInfo *seminfo) {
 ** skip a sequence '[=*[' or ']=*]' and return its number of '='s or
 ** -1 if sequence is malformed
 */
-static int skip_sep (LexState *ls) {
-  int count = 0;
-  int s = ls->current;
-  lua_assert(s == '[' || s == ']');
-  save_and_next(ls);
-  while (ls->current == '=') {
+static int skip_sep(LexState *ls)
+{
+    int count = 0;
+    int s = ls->current;
+    lua_assert(s == '[' || s == ']');
     save_and_next(ls);
-    count++;
-  }
-  return (ls->current == s) ? count : (-count) - 1;
-}
-
-
-static void read_long_string (LexState *ls, SemInfo *seminfo, int sep) {
-  save_and_next(ls);  /* skip 2nd `[' */
-  if (currIsNewline(ls))  /* string starts with a newline? */
-    inclinenumber(ls);  /* skip it */
-  for (;;) {
-    switch (ls->current) {
-      case EOZ:
-        lexerror(ls, (seminfo) ? "unfinished long string" :
-                                 "unfinished long comment", TK_EOS);
-        break;  /* to avoid warnings */
-      case ']': {
-        if (skip_sep(ls) == sep) {
-          save_and_next(ls);  /* skip 2nd `]' */
-          goto endloop;
-        }
-        break;
-      }
-      case '\n': case '\r': {
-        save(ls, '\n');
-        inclinenumber(ls);
-        if (!seminfo) luaZ_resetbuffer(ls->buff);  /* avoid wasting space */
-        break;
-      }
-      default: {
-        if (seminfo) save_and_next(ls);
-        else next(ls);
-      }
+    while (ls->current == '=') {
+        save_and_next(ls);
+        count++;
     }
-  } endloop:
-  if (seminfo)
-    seminfo->ts = luaX_newstring(ls, luaZ_buffer(ls->buff) + (2 + sep),
-                                     luaZ_bufflen(ls->buff) - 2*(2 + sep));
+    return (ls->current == s) ? count : (-count) - 1;
 }
 
 
-static void escerror (LexState *ls, int *c, int n, const char *msg) {
-  int i;
-  luaZ_resetbuffer(ls->buff);  /* prepare error message */
-  save(ls, '\\');
-  for (i = 0; i < n && c[i] != EOZ; i++)
-    save(ls, c[i]);
-  lexerror(ls, msg, TK_STRING);
-}
-
-
-static int readhexaesc (LexState *ls) {
-  int c[3], i;  /* keep input for error message */
-  int r = 0;  /* result accumulator */
-  c[0] = 'x';  /* for error message */
-  for (i = 1; i < 3; i++) {  /* read two hexadecimal digits */
-    c[i] = next(ls);
-    if (!lisxdigit(c[i]))
-      escerror(ls, c, i + 1, "hexadecimal digit expected");
-    r = (r << 4) + luaO_hexavalue(c[i]);
-  }
-  return r;
-}
-
-
-static int readdecesc (LexState *ls) {
-  int c[3], i;
-  int r = 0;  /* result accumulator */
-  for (i = 0; i < 3 && lisdigit(ls->current); i++) {  /* read up to 3 digits */
-    c[i] = ls->current;
-    r = 10*r + c[i] - '0';
-    next(ls);
-  }
-  if (r > UCHAR_MAX)
-    escerror(ls, c, i, "decimal escape too large");
-  return r;
-}
-
-
-static void read_string (LexState *ls, int del, SemInfo *seminfo) {
-  save_and_next(ls);  /* keep delimiter (for error messages) */
-  while (ls->current != del) {
-    switch (ls->current) {
-      case EOZ:
-        lexerror(ls, "unfinished string", TK_EOS);
-        break;  /* to avoid warnings */
-      case '\n':
-      case '\r':
-        lexerror(ls, "unfinished string", TK_STRING);
-        break;  /* to avoid warnings */
-      case '\\': {  /* escape sequences */
-        int c;  /* final character to be saved */
-        next(ls);  /* do not save the `\' */
+static void read_long_string(LexState *ls, SemInfo *seminfo, int sep)
+{
+    save_and_next(ls);  /* skip 2nd `[' */
+    if (currIsNewline(ls))  /* string starts with a newline? */
+        inclinenumber(ls);  /* skip it */
+    for (;;) {
         switch (ls->current) {
-          case 'a': c = '\a'; goto read_save;
-          case 'b': c = '\b'; goto read_save;
-          case 'f': c = '\f'; goto read_save;
-          case 'n': c = '\n'; goto read_save;
-          case 'r': c = '\r'; goto read_save;
-          case 't': c = '\t'; goto read_save;
-          case 'v': c = '\v'; goto read_save;
-          case 'x': c = readhexaesc(ls); goto read_save;
-          case '\n': case '\r':
-            inclinenumber(ls); c = '\n'; goto only_save;
-          case '\\': case '\"': case '\'':
-            c = ls->current; goto read_save;
-          case EOZ: goto no_save;  /* will raise an error next loop */
-          case 'z': {  /* zap following span of spaces */
-            next(ls);  /* skip the 'z' */
-            while (lisspace(ls->current)) {
-              if (currIsNewline(ls)) inclinenumber(ls);
-              else next(ls);
+            case EOZ:
+                lexerror(ls, (seminfo) ? "unfinished long string" :
+                         "unfinished long comment", TK_EOS);
+                break;  /* to avoid warnings */
+            case ']': {
+                if (skip_sep(ls) == sep) {
+                    save_and_next(ls);  /* skip 2nd `]' */
+                    goto endloop;
+                }
+                break;
+            }
+            case '\n':
+            case '\r': {
+                save(ls, '\n');
+                inclinenumber(ls);
+                if (!seminfo) luaZ_resetbuffer(ls->buff);  /* avoid wasting space */
+                break;
+            }
+            default: {
+                if (seminfo) save_and_next(ls);
+                else next(ls);
             }
-            goto no_save;
-          }
-          default: {
-            if (!lisdigit(ls->current))
-              escerror(ls, &ls->current, 1, "invalid escape sequence");
-            /* digital escape \ddd */
-            c = readdecesc(ls);
-            goto only_save;
-          }
         }
-       read_save: next(ls);  /* read next character */
-       only_save: save(ls, c);  /* save 'c' */
-       no_save: break;
-      }
-      default:
-        save_and_next(ls);
     }
-  }
-  save_and_next(ls);  /* skip delimiter */
-  seminfo->ts = luaX_newstring(ls, luaZ_buffer(ls->buff) + 1,
-                                   luaZ_bufflen(ls->buff) - 2);
+endloop:
+    if (seminfo)
+        seminfo->ts = luaX_newstring(ls, luaZ_buffer(ls->buff) + (2 + sep),
+                                     luaZ_bufflen(ls->buff) - 2 * (2 + sep));
 }
 
 
-static int llex (LexState *ls, SemInfo *seminfo) {
-  luaZ_resetbuffer(ls->buff);
-  for (;;) {
-    switch (ls->current) {
-      case '\n': case '\r': {  /* line breaks */
-        inclinenumber(ls);
-        break;
-      }
-      case ' ': case '\f': case '\t': case '\v': {  /* spaces */
-        next(ls);
-        break;
-      }
-      case '-': {  /* '-' or '--' (comment) */
-        next(ls);
-        if (ls->current != '-') return '-';
-        /* else is a comment */
-        next(ls);
-        if (ls->current == '[') {  /* long comment? */
-          int sep = skip_sep(ls);
-          luaZ_resetbuffer(ls->buff);  /* `skip_sep' may dirty the buffer */
-          if (sep >= 0) {
-            read_long_string(ls, NULL, sep);  /* skip long comment */
-            luaZ_resetbuffer(ls->buff);  /* previous call may dirty the buff. */
-            break;
-          }
-        }
-        /* else short comment */
-        while (!currIsNewline(ls) && ls->current != EOZ)
-          next(ls);  /* skip until end of line (or end of file) */
-        break;
-      }
-      case '[': {  /* long string or simply '[' */
-        int sep = skip_sep(ls);
-        if (sep >= 0) {
-          read_long_string(ls, seminfo, sep);
-          return TK_STRING;
-        }
-        else if (sep == -1) return '[';
-        else lexerror(ls, "invalid long string delimiter", TK_STRING);
-      }
-      case '=': {
-        next(ls);
-        if (ls->current != '=') return '=';
-        else { next(ls); return TK_EQ; }
-      }
-      case '<': {
-        next(ls);
-        if (ls->current != '=') return '<';
-        else { next(ls); return TK_LE; }
-      }
-      case '>': {
-        next(ls);
-        if (ls->current != '=') return '>';
-        else { next(ls); return TK_GE; }
-      }
-      case '~': {
-        next(ls);
-        if (ls->current != '=') return '~';
-        else { next(ls); return TK_NE; }
-      }
-      case ':': {
-        next(ls);
-        if (ls->current != ':') return ':';
-        else { next(ls); return TK_DBCOLON; }
-      }
-      case '"': case '\'': {  /* short literal strings */
-        read_string(ls, ls->current, seminfo);
-        return TK_STRING;
-      }
-      case '.': {  /* '.', '..', '...', or number */
-        save_and_next(ls);
-        if (check_next(ls, ".")) {
-          if (check_next(ls, "."))
-            return TK_DOTS;   /* '...' */
-          else return TK_CONCAT;   /* '..' */
-        }
-        else if (!lisdigit(ls->current)) return '.';
-        /* else go through */
-      }
-      case '0': case '1': case '2': case '3': case '4':
-      case '5': case '6': case '7': case '8': case '9': {
-        read_numeral(ls, seminfo);
-        return TK_NUMBER;
-      }
-      case EOZ: {
-        return TK_EOS;
-      }
-      default: {
-        if (lislalpha(ls->current)) {  /* identifier or reserved word? */
-          TString *ts;
-          do {
-            save_and_next(ls);
-          } while (lislalnum(ls->current));
-          ts = luaX_newstring(ls, luaZ_buffer(ls->buff),
-                                  luaZ_bufflen(ls->buff));
-          seminfo->ts = ts;
-          if (isreserved(ts))  /* reserved word? */
-            return ts->tsv.extra - 1 + FIRST_RESERVED;
-          else {
-            return TK_NAME;
-          }
-        }
-        else {  /* single-char tokens (+ - / ...) */
-          int c = ls->current;
-          next(ls);
-          return c;
-        }
-      }
+static void escerror(LexState *ls, int *c, int n, const char *msg)
+{
+    int i;
+    luaZ_resetbuffer(ls->buff);  /* prepare error message */
+    save(ls, '\\');
+    for (i = 0; i < n && c[i] != EOZ; i++)
+        save(ls, c[i]);
+    lexerror(ls, msg, TK_STRING);
+}
+
+
+static int readhexaesc(LexState *ls)
+{
+    int c[3], i;  /* keep input for error message */
+    int r = 0;  /* result accumulator */
+    c[0] = 'x';  /* for error message */
+    for (i = 1; i < 3; i++) {  /* read two hexadecimal digits */
+        c[i] = next(ls);
+        if (!lisxdigit(c[i]))
+            escerror(ls, c, i + 1, "hexadecimal digit expected");
+        r = (r << 4) + luaO_hexavalue(c[i]);
     }
-  }
+    return r;
 }
 
 
-void luaX_next (LexState *ls) {
-  ls->lastline = ls->linenumber;
-  if (ls->lookahead.token != TK_EOS) {  /* is there a look-ahead token? */
-    ls->t = ls->lookahead;  /* use this one */
-    ls->lookahead.token = TK_EOS;  /* and discharge it */
-  }
-  else
-    ls->t.token = llex(ls, &ls->t.seminfo);  /* read next token */
+static int readdecesc(LexState *ls)
+{
+    int c[3], i;
+    int r = 0;  /* result accumulator */
+    for (i = 0; i < 3 && lisdigit(ls->current); i++) {  /* read up to 3 digits */
+        c[i] = ls->current;
+        r = 10 * r + c[i] - '0';
+        next(ls);
+    }
+    if (r > UCHAR_MAX)
+        escerror(ls, c, i, "decimal escape too large");
+    return r;
 }
 
 
-int luaX_lookahead (LexState *ls) {
-  lua_assert(ls->lookahead.token == TK_EOS);
-  ls->lookahead.token = llex(ls, &ls->lookahead.seminfo);
-  return ls->lookahead.token;
+static void read_string(LexState *ls, int del, SemInfo *seminfo)
+{
+    save_and_next(ls);  /* keep delimiter (for error messages) */
+    while (ls->current != del) {
+        switch (ls->current) {
+            case EOZ:
+                lexerror(ls, "unfinished string", TK_EOS);
+                break;  /* to avoid warnings */
+            case '\n':
+            case '\r':
+                lexerror(ls, "unfinished string", TK_STRING);
+                break;  /* to avoid warnings */
+            case '\\': {  /* escape sequences */
+                int c;  /* final character to be saved */
+                next(ls);  /* do not save the `\' */
+                switch (ls->current) {
+                    case 'a':
+                        c = '\a';
+                        goto read_save;
+                    case 'b':
+                        c = '\b';
+                        goto read_save;
+                    case 'f':
+                        c = '\f';
+                        goto read_save;
+                    case 'n':
+                        c = '\n';
+                        goto read_save;
+                    case 'r':
+                        c = '\r';
+                        goto read_save;
+                    case 't':
+                        c = '\t';
+                        goto read_save;
+                    case 'v':
+                        c = '\v';
+                        goto read_save;
+                    case 'x':
+                        c = readhexaesc(ls);
+                        goto read_save;
+                    case '\n':
+                    case '\r':
+                        inclinenumber(ls);
+                        c = '\n';
+                        goto only_save;
+                    case '\\':
+                    case '\"':
+                    case '\'':
+                        c = ls->current;
+                        goto read_save;
+                    case EOZ:
+                        goto no_save;  /* will raise an error next loop */
+                    case 'z': {  /* zap following span of spaces */
+                        next(ls);  /* skip the 'z' */
+                        while (lisspace(ls->current)) {
+                            if (currIsNewline(ls)) inclinenumber(ls);
+                            else next(ls);
+                        }
+                        goto no_save;
+                    }
+                    default: {
+                        if (!lisdigit(ls->current))
+                            escerror(ls, &ls->current, 1, "invalid escape sequence");
+                        /* digital escape \ddd */
+                        c = readdecesc(ls);
+                        goto only_save;
+                    }
+                }
+read_save:
+                next(ls);  /* read next character */
+only_save:
+                save(ls, c);  /* save 'c' */
+no_save:
+                break;
+            }
+            default:
+                save_and_next(ls);
+        }
+    }
+    save_and_next(ls);  /* skip delimiter */
+    seminfo->ts = luaX_newstring(ls, luaZ_buffer(ls->buff) + 1,
+                                 luaZ_bufflen(ls->buff) - 2);
+}
+
+
+static int llex(LexState *ls, SemInfo *seminfo)
+{
+    luaZ_resetbuffer(ls->buff);
+    for (;;) {
+        switch (ls->current) {
+            case '\n':
+            case '\r': {  /* line breaks */
+                inclinenumber(ls);
+                break;
+            }
+            case ' ':
+            case '\f':
+            case '\t':
+            case '\v': {  /* spaces */
+                next(ls);
+                break;
+            }
+            case '-': {  /* '-' or '--' (comment) */
+                next(ls);
+                if (ls->current != '-') return '-';
+                /* else is a comment */
+                next(ls);
+                if (ls->current == '[') {  /* long comment? */
+                    int sep = skip_sep(ls);
+                    luaZ_resetbuffer(ls->buff);  /* `skip_sep' may dirty the buffer */
+                    if (sep >= 0) {
+                        read_long_string(ls, NULL, sep);  /* skip long comment */
+                        luaZ_resetbuffer(ls->buff);  /* previous call may dirty the buff. */
+                        break;
+                    }
+                }
+                /* else short comment */
+                while (!currIsNewline(ls) && ls->current != EOZ)
+                    next(ls);  /* skip until end of line (or end of file) */
+                break;
+            }
+            case '[': {  /* long string or simply '[' */
+                int sep = skip_sep(ls);
+                if (sep >= 0) {
+                    read_long_string(ls, seminfo, sep);
+                    return TK_STRING;
+                } else if (sep == -1) return '[';
+                else lexerror(ls, "invalid long string delimiter", TK_STRING);
+            }
+            case '=': {
+                next(ls);
+                if (ls->current != '=') return '=';
+                else { next(ls); return TK_EQ; }
+            }
+            case '<': {
+                next(ls);
+                if (ls->current != '=') return '<';
+                else { next(ls); return TK_LE; }
+            }
+            case '>': {
+                next(ls);
+                if (ls->current != '=') return '>';
+                else { next(ls); return TK_GE; }
+            }
+            case '~': {
+                next(ls);
+                if (ls->current != '=') return '~';
+                else { next(ls); return TK_NE; }
+            }
+            case ':': {
+                next(ls);
+                if (ls->current != ':') return ':';
+                else { next(ls); return TK_DBCOLON; }
+            }
+            case '"':
+            case '\'': {  /* short literal strings */
+                read_string(ls, ls->current, seminfo);
+                return TK_STRING;
+            }
+            case '.': {  /* '.', '..', '...', or number */
+                save_and_next(ls);
+                if (check_next(ls, ".")) {
+                    if (check_next(ls, "."))
+                        return TK_DOTS;   /* '...' */
+                    else return TK_CONCAT;   /* '..' */
+                } else if (!lisdigit(ls->current)) return '.';
+                /* else go through */
+            }
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9': {
+                read_numeral(ls, seminfo);
+                return TK_NUMBER;
+            }
+            case EOZ: {
+                return TK_EOS;
+            }
+            default: {
+                if (lislalpha(ls->current)) {  /* identifier or reserved word? */
+                    TString *ts;
+                    do {
+                        save_and_next(ls);
+                    } while (lislalnum(ls->current));
+                    ts = luaX_newstring(ls, luaZ_buffer(ls->buff),
+                                        luaZ_bufflen(ls->buff));
+                    seminfo->ts = ts;
+                    if (isreserved(ts))  /* reserved word? */
+                        return ts->tsv.extra - 1 + FIRST_RESERVED;
+                    else {
+                        return TK_NAME;
+                    }
+                } else { /* single-char tokens (+ - / ...) */
+                    int c = ls->current;
+                    next(ls);
+                    return c;
+                }
+            }
+        }
+    }
+}
+
+
+void luaX_next(LexState *ls)
+{
+    ls->lastline = ls->linenumber;
+    if (ls->lookahead.token != TK_EOS) {  /* is there a look-ahead token? */
+        ls->t = ls->lookahead;  /* use this one */
+        ls->lookahead.token = TK_EOS;  /* and discharge it */
+    } else
+        ls->t.token = llex(ls, &ls->t.seminfo);  /* read next token */
+}
+
+
+int luaX_lookahead(LexState *ls)
+{
+    lua_assert(ls->lookahead.token == TK_EOS);
+    ls->lookahead.token = llex(ls, &ls->lookahead.seminfo);
+    return ls->lookahead.token;
 }
 
diff --git a/liblua/llex.h b/liblua/llex.h
index f78926d66..31eb24580 100644
--- a/liblua/llex.h
+++ b/liblua/llex.h
@@ -20,14 +20,14 @@
 * grep "ORDER RESERVED"
 */
 enum RESERVED {
-  /* terminal symbols denoted by reserved words */
-  TK_AND = FIRST_RESERVED, TK_BREAK,
-  TK_DO, TK_ELSE, TK_ELSEIF, TK_END, TK_FALSE, TK_FOR, TK_FUNCTION,
-  TK_GOTO, TK_IF, TK_IN, TK_LOCAL, TK_NIL, TK_NOT, TK_OR, TK_REPEAT,
-  TK_RETURN, TK_THEN, TK_TRUE, TK_UNTIL, TK_WHILE,
-  /* other terminal symbols */
-  TK_CONCAT, TK_DOTS, TK_EQ, TK_GE, TK_LE, TK_NE, TK_DBCOLON, TK_EOS,
-  TK_NUMBER, TK_NAME, TK_STRING
+    /* terminal symbols denoted by reserved words */
+    TK_AND = FIRST_RESERVED, TK_BREAK,
+    TK_DO, TK_ELSE, TK_ELSEIF, TK_END, TK_FALSE, TK_FOR, TK_FUNCTION,
+    TK_GOTO, TK_IF, TK_IN, TK_LOCAL, TK_NIL, TK_NOT, TK_OR, TK_REPEAT,
+    TK_RETURN, TK_THEN, TK_TRUE, TK_UNTIL, TK_WHILE,
+    /* other terminal symbols */
+    TK_CONCAT, TK_DOTS, TK_EQ, TK_GE, TK_LE, TK_NE, TK_DBCOLON, TK_EOS,
+    TK_NUMBER, TK_NAME, TK_STRING
 };
 
 /* number of reserved words */
@@ -35,44 +35,44 @@ enum RESERVED {
 
 
 typedef union {
-  lua_Number r;
-  TString *ts;
+    lua_Number r;
+    TString *ts;
 } SemInfo;  /* semantics information */
 
 
 typedef struct Token {
-  int token;
-  SemInfo seminfo;
+    int token;
+    SemInfo seminfo;
 } Token;
 
 
 /* state of the lexer plus state of the parser when shared by all
    functions */
 typedef struct LexState {
-  int current;  /* current character (charint) */
-  int linenumber;  /* input line counter */
-  int lastline;  /* line of last token `consumed' */
-  Token t;  /* current token */
-  Token lookahead;  /* look ahead token */
-  struct FuncState *fs;  /* current function (parser) */
-  struct lua_State *L;
-  ZIO *z;  /* input stream */
-  Mbuffer *buff;  /* buffer for tokens */
-  struct Dyndata *dyd;  /* dynamic structures used by the parser */
-  TString *source;  /* current source name */
-  TString *envn;  /* environment variable name */
-  char decpoint;  /* locale decimal point */
+    int current;  /* current character (charint) */
+    int linenumber;  /* input line counter */
+    int lastline;  /* line of last token `consumed' */
+    Token t;  /* current token */
+    Token lookahead;  /* look ahead token */
+    struct FuncState *fs;  /* current function (parser) */
+    struct lua_State *L;
+    ZIO *z;  /* input stream */
+    Mbuffer *buff;  /* buffer for tokens */
+    struct Dyndata *dyd;  /* dynamic structures used by the parser */
+    TString *source;  /* current source name */
+    TString *envn;  /* environment variable name */
+    char decpoint;  /* locale decimal point */
 } LexState;
 
 
-LUAI_FUNC void luaX_init (lua_State *L);
-LUAI_FUNC void luaX_setinput (lua_State *L, LexState *ls, ZIO *z,
-                              TString *source, int firstchar);
-LUAI_FUNC TString *luaX_newstring (LexState *ls, const char *str, size_t l);
-LUAI_FUNC void luaX_next (LexState *ls);
-LUAI_FUNC int luaX_lookahead (LexState *ls);
-LUAI_FUNC l_noret luaX_syntaxerror (LexState *ls, const char *s);
-LUAI_FUNC const char *luaX_token2str (LexState *ls, int token);
+LUAI_FUNC void luaX_init(lua_State *L);
+LUAI_FUNC void luaX_setinput(lua_State *L, LexState *ls, ZIO *z,
+                             TString *source, int firstchar);
+LUAI_FUNC TString *luaX_newstring(LexState *ls, const char *str, size_t l);
+LUAI_FUNC void luaX_next(LexState *ls);
+LUAI_FUNC int luaX_lookahead(LexState *ls);
+LUAI_FUNC l_noret luaX_syntaxerror(LexState *ls, const char *s);
+LUAI_FUNC const char *luaX_token2str(LexState *ls, int token);
 
 
 #endif
diff --git a/liblua/llimits.h b/liblua/llimits.h
index f5f8ed9e1..101478284 100644
--- a/liblua/llimits.h
+++ b/liblua/llimits.h
@@ -206,7 +206,7 @@ typedef lu_int32 Instruction;
 #define lua_number2int(i,n)  __asm {__asm fld n   __asm fistp i}
 #define lua_number2integer(i,n) lua_number2int(i, n)
 #define lua_number2unsigned(i,n)  \
-  {__int64 l; __asm {__asm fld n   __asm fistp l} i = (unsigned int)l;}
+    {__int64 l; __asm {__asm fld n   __asm fistp l} i = (unsigned int)l;}
 
 
 #elif defined(LUA_IEEE754TRICK) /* }{ */
@@ -217,7 +217,7 @@ union luai_Cast { double l_d; LUA_INT32 l_p[2]; };
 
 #if !defined(LUA_IEEEENDIAN) /* { */
 #define LUAI_EXTRAIEEE \
-  static const union luai_Cast ieeeendian = {-(33.0 + 6755399441055744.0)};
+    static const union luai_Cast ieeeendian = {-(33.0 + 6755399441055744.0)};
 #define LUA_IEEEENDIANLOC (ieeeendian.l_p[1] == 33)
 #else
 #define LUA_IEEEENDIANLOC LUA_IEEEENDIAN
@@ -225,13 +225,13 @@ union luai_Cast { double l_d; LUA_INT32 l_p[2]; };
 #endif                       /* } */
 
 #define lua_number2int32(i,n,t) \
-  { LUAI_EXTRAIEEE \
-    volatile union luai_Cast u; u.l_d = (n) + 6755399441055744.0; \
-    (i) = (t)u.l_p[LUA_IEEEENDIANLOC]; }
+    { LUAI_EXTRAIEEE \
+        volatile union luai_Cast u; u.l_d = (n) + 6755399441055744.0; \
+        (i) = (t)u.l_p[LUA_IEEEENDIANLOC]; }
 
 #define luai_hashnum(i,n)  \
-  { volatile union luai_Cast u; u.l_d = (n) + 1.0;  /* avoid -0 */ \
-    (i) = u.l_p[0]; (i) += u.l_p[1]; }  /* add double bits for his hash */
+    { volatile union luai_Cast u; u.l_d = (n) + 1.0;  /* avoid -0 */ \
+        (i) = u.l_p[0]; (i) += u.l_p[1]; }  /* add double bits for his hash */
 
 #define lua_number2int(i,n) lua_number2int32(i, n, int)
 #define lua_number2unsigned(i,n) lua_number2int32(i, n, lua_Unsigned)
@@ -282,8 +282,8 @@ union luai_Cast { double l_d; LUA_INT32 l_p[2]; };
 #include <math.h>
 
 #define luai_hashnum(i,n) { int e;  \
-  n = l_mathop(frexp)(n, &e) * (lua_Number)(INT_MAX - DBL_MAX_EXP);  \
-  lua_number2int(i, n); i += e; }
+        n = l_mathop(frexp)(n, &e) * (lua_Number)(INT_MAX - DBL_MAX_EXP);  \
+        lua_number2int(i, n); i += e; }
 
 #endif
 
diff --git a/liblua/lmathlib.c b/liblua/lmathlib.c
index 835a5494b..71ac69bbe 100644
--- a/liblua/lmathlib.c
+++ b/liblua/lmathlib.c
@@ -23,257 +23,287 @@
 
 
 
-static int math_abs (lua_State *L) {
-  lua_pushnumber(L, l_mathop(fabs)(luaL_checknumber(L, 1)));
-  return 1;
+static int math_abs(lua_State *L)
+{
+    lua_pushnumber(L, l_mathop(fabs)(luaL_checknumber(L, 1)));
+    return 1;
 }
 
-static int math_sin (lua_State *L) {
-  lua_pushnumber(L, l_mathop(sin)(luaL_checknumber(L, 1)));
-  return 1;
+static int math_sin(lua_State *L)
+{
+    lua_pushnumber(L, l_mathop(sin)(luaL_checknumber(L, 1)));
+    return 1;
 }
 
-static int math_sinh (lua_State *L) {
-  lua_pushnumber(L, l_mathop(sinh)(luaL_checknumber(L, 1)));
-  return 1;
+static int math_sinh(lua_State *L)
+{
+    lua_pushnumber(L, l_mathop(sinh)(luaL_checknumber(L, 1)));
+    return 1;
 }
 
-static int math_cos (lua_State *L) {
-  lua_pushnumber(L, l_mathop(cos)(luaL_checknumber(L, 1)));
-  return 1;
+static int math_cos(lua_State *L)
+{
+    lua_pushnumber(L, l_mathop(cos)(luaL_checknumber(L, 1)));
+    return 1;
 }
 
-static int math_cosh (lua_State *L) {
-  lua_pushnumber(L, l_mathop(cosh)(luaL_checknumber(L, 1)));
-  return 1;
+static int math_cosh(lua_State *L)
+{
+    lua_pushnumber(L, l_mathop(cosh)(luaL_checknumber(L, 1)));
+    return 1;
 }
 
-static int math_tan (lua_State *L) {
-  lua_pushnumber(L, l_mathop(tan)(luaL_checknumber(L, 1)));
-  return 1;
+static int math_tan(lua_State *L)
+{
+    lua_pushnumber(L, l_mathop(tan)(luaL_checknumber(L, 1)));
+    return 1;
 }
 
-static int math_tanh (lua_State *L) {
-  lua_pushnumber(L, l_mathop(tanh)(luaL_checknumber(L, 1)));
-  return 1;
+static int math_tanh(lua_State *L)
+{
+    lua_pushnumber(L, l_mathop(tanh)(luaL_checknumber(L, 1)));
+    return 1;
 }
 
-static int math_asin (lua_State *L) {
-  lua_pushnumber(L, l_mathop(asin)(luaL_checknumber(L, 1)));
-  return 1;
+static int math_asin(lua_State *L)
+{
+    lua_pushnumber(L, l_mathop(asin)(luaL_checknumber(L, 1)));
+    return 1;
 }
 
-static int math_acos (lua_State *L) {
-  lua_pushnumber(L, l_mathop(acos)(luaL_checknumber(L, 1)));
-  return 1;
+static int math_acos(lua_State *L)
+{
+    lua_pushnumber(L, l_mathop(acos)(luaL_checknumber(L, 1)));
+    return 1;
 }
 
-static int math_atan (lua_State *L) {
-  lua_pushnumber(L, l_mathop(atan)(luaL_checknumber(L, 1)));
-  return 1;
+static int math_atan(lua_State *L)
+{
+    lua_pushnumber(L, l_mathop(atan)(luaL_checknumber(L, 1)));
+    return 1;
 }
 
-static int math_atan2 (lua_State *L) {
-  lua_pushnumber(L, l_mathop(atan2)(luaL_checknumber(L, 1),
-                                luaL_checknumber(L, 2)));
-  return 1;
+static int math_atan2(lua_State *L)
+{
+    lua_pushnumber(L, l_mathop(atan2)(luaL_checknumber(L, 1),
+                                      luaL_checknumber(L, 2)));
+    return 1;
 }
 
-static int math_ceil (lua_State *L) {
-  lua_pushnumber(L, l_mathop(ceil)(luaL_checknumber(L, 1)));
-  return 1;
+static int math_ceil(lua_State *L)
+{
+    lua_pushnumber(L, l_mathop(ceil)(luaL_checknumber(L, 1)));
+    return 1;
 }
 
-static int math_floor (lua_State *L) {
-  lua_pushnumber(L, l_mathop(floor)(luaL_checknumber(L, 1)));
-  return 1;
+static int math_floor(lua_State *L)
+{
+    lua_pushnumber(L, l_mathop(floor)(luaL_checknumber(L, 1)));
+    return 1;
 }
 
-static int math_fmod (lua_State *L) {
-  lua_pushnumber(L, l_mathop(fmod)(luaL_checknumber(L, 1),
-                               luaL_checknumber(L, 2)));
-  return 1;
+static int math_fmod(lua_State *L)
+{
+    lua_pushnumber(L, l_mathop(fmod)(luaL_checknumber(L, 1),
+                                     luaL_checknumber(L, 2)));
+    return 1;
 }
 
-static int math_modf (lua_State *L) {
-  lua_Number ip;
-  lua_Number fp = l_mathop(modf)(luaL_checknumber(L, 1), &ip);
-  lua_pushnumber(L, ip);
-  lua_pushnumber(L, fp);
-  return 2;
+static int math_modf(lua_State *L)
+{
+    lua_Number ip;
+    lua_Number fp = l_mathop(modf)(luaL_checknumber(L, 1), &ip);
+    lua_pushnumber(L, ip);
+    lua_pushnumber(L, fp);
+    return 2;
 }
 
-static int math_sqrt (lua_State *L) {
-  lua_pushnumber(L, l_mathop(sqrt)(luaL_checknumber(L, 1)));
-  return 1;
+static int math_sqrt(lua_State *L)
+{
+    lua_pushnumber(L, l_mathop(sqrt)(luaL_checknumber(L, 1)));
+    return 1;
 }
 
-static int math_pow (lua_State *L) {
-  lua_Number x = luaL_checknumber(L, 1);
-  lua_Number y = luaL_checknumber(L, 2);
-  lua_pushnumber(L, l_mathop(pow)(x, y));
-  return 1;
+static int math_pow(lua_State *L)
+{
+    lua_Number x = luaL_checknumber(L, 1);
+    lua_Number y = luaL_checknumber(L, 2);
+    lua_pushnumber(L, l_mathop(pow)(x, y));
+    return 1;
 }
 
-static int math_log (lua_State *L) {
-  lua_Number x = luaL_checknumber(L, 1);
-  lua_Number res;
-  if (lua_isnoneornil(L, 2))
-    res = l_mathop(log)(x);
-  else {
-    lua_Number base = luaL_checknumber(L, 2);
-    if (base == (lua_Number)10.0) res = l_mathop(log10)(x);
-    else res = l_mathop(log)(x)/l_mathop(log)(base);
-  }
-  lua_pushnumber(L, res);
-  return 1;
+static int math_log(lua_State *L)
+{
+    lua_Number x = luaL_checknumber(L, 1);
+    lua_Number res;
+    if (lua_isnoneornil(L, 2))
+        res = l_mathop(log)(x);
+    else {
+        lua_Number base = luaL_checknumber(L, 2);
+        if (base == (lua_Number)10.0) res = l_mathop(log10)(x);
+        else res = l_mathop(log)(x) / l_mathop(log)(base);
+    }
+    lua_pushnumber(L, res);
+    return 1;
 }
 
 #if defined(LUA_COMPAT_LOG10)
-static int math_log10 (lua_State *L) {
-  lua_pushnumber(L, l_mathop(log10)(luaL_checknumber(L, 1)));
-  return 1;
+static int math_log10(lua_State *L)
+{
+    lua_pushnumber(L, l_mathop(log10)(luaL_checknumber(L, 1)));
+    return 1;
 }
 #endif
 
-static int math_exp (lua_State *L) {
-  lua_pushnumber(L, l_mathop(exp)(luaL_checknumber(L, 1)));
-  return 1;
+static int math_exp(lua_State *L)
+{
+    lua_pushnumber(L, l_mathop(exp)(luaL_checknumber(L, 1)));
+    return 1;
 }
 
-static int math_deg (lua_State *L) {
-  lua_pushnumber(L, luaL_checknumber(L, 1)/RADIANS_PER_DEGREE);
-  return 1;
+static int math_deg(lua_State *L)
+{
+    lua_pushnumber(L, luaL_checknumber(L, 1) / RADIANS_PER_DEGREE);
+    return 1;
 }
 
-static int math_rad (lua_State *L) {
-  lua_pushnumber(L, luaL_checknumber(L, 1)*RADIANS_PER_DEGREE);
-  return 1;
+static int math_rad(lua_State *L)
+{
+    lua_pushnumber(L, luaL_checknumber(L, 1)*RADIANS_PER_DEGREE);
+    return 1;
 }
 
-static int math_frexp (lua_State *L) {
-  int e;
-  lua_pushnumber(L, l_mathop(frexp)(luaL_checknumber(L, 1), &e));
-  lua_pushinteger(L, e);
-  return 2;
+static int math_frexp(lua_State *L)
+{
+    int e;
+    lua_pushnumber(L, l_mathop(frexp)(luaL_checknumber(L, 1), &e));
+    lua_pushinteger(L, e);
+    return 2;
 }
 
-static int math_ldexp (lua_State *L) {
-  lua_Number x = luaL_checknumber(L, 1);
-  int ep = luaL_checkint(L, 2);
-  lua_pushnumber(L, l_mathop(ldexp)(x, ep));
-  return 1;
+static int math_ldexp(lua_State *L)
+{
+    lua_Number x = luaL_checknumber(L, 1);
+    int ep = luaL_checkint(L, 2);
+    lua_pushnumber(L, l_mathop(ldexp)(x, ep));
+    return 1;
 }
 
 
 
-static int math_min (lua_State *L) {
-  int n = lua_gettop(L);  /* number of arguments */
-  lua_Number dmin = luaL_checknumber(L, 1);
-  int i;
-  for (i=2; i<=n; i++) {
-    lua_Number d = luaL_checknumber(L, i);
-    if (d < dmin)
-      dmin = d;
-  }
-  lua_pushnumber(L, dmin);
-  return 1;
-}
-
-
-static int math_max (lua_State *L) {
-  int n = lua_gettop(L);  /* number of arguments */
-  lua_Number dmax = luaL_checknumber(L, 1);
-  int i;
-  for (i=2; i<=n; i++) {
-    lua_Number d = luaL_checknumber(L, i);
-    if (d > dmax)
-      dmax = d;
-  }
-  lua_pushnumber(L, dmax);
-  return 1;
-}
-
-
-static int math_random (lua_State *L) {
-  /* the `%' avoids the (rare) case of r==1, and is needed also because on
-     some systems (SunOS!) `rand()' may return a value larger than RAND_MAX */
-  lua_Number r = (lua_Number)(rand()%RAND_MAX) / (lua_Number)RAND_MAX;
-  switch (lua_gettop(L)) {  /* check number of arguments */
-    case 0: {  /* no arguments */
-      lua_pushnumber(L, r);  /* Number between 0 and 1 */
-      break;
+static int math_min(lua_State *L)
+{
+    int n = lua_gettop(L);  /* number of arguments */
+    lua_Number dmin = luaL_checknumber(L, 1);
+    int i;
+    for (i = 2; i <= n; i++) {
+        lua_Number d = luaL_checknumber(L, i);
+        if (d < dmin)
+            dmin = d;
     }
-    case 1: {  /* only upper limit */
-      lua_Number u = luaL_checknumber(L, 1);
-      luaL_argcheck(L, (lua_Number)1.0 <= u, 1, "interval is empty");
-      lua_pushnumber(L, l_mathop(floor)(r*u) + (lua_Number)(1.0));  /* [1, u] */
-      break;
-    }
-    case 2: {  /* lower and upper limits */
-      lua_Number l = luaL_checknumber(L, 1);
-      lua_Number u = luaL_checknumber(L, 2);
-      luaL_argcheck(L, l <= u, 2, "interval is empty");
-      lua_pushnumber(L, l_mathop(floor)(r*(u-l+1)) + l);  /* [l, u] */
-      break;
-    }
-    default: return luaL_error(L, "wrong number of arguments");
-  }
-  return 1;
+    lua_pushnumber(L, dmin);
+    return 1;
 }
 
 
-static int math_randomseed (lua_State *L) {
-  srand(luaL_checkunsigned(L, 1));
-  (void)rand(); /* discard first value to avoid undesirable correlations */
-  return 0;
+static int math_max(lua_State *L)
+{
+    int n = lua_gettop(L);  /* number of arguments */
+    lua_Number dmax = luaL_checknumber(L, 1);
+    int i;
+    for (i = 2; i <= n; i++) {
+        lua_Number d = luaL_checknumber(L, i);
+        if (d > dmax)
+            dmax = d;
+    }
+    lua_pushnumber(L, dmax);
+    return 1;
+}
+
+
+static int math_random(lua_State *L)
+{
+    /* the `%' avoids the (rare) case of r==1, and is needed also because on
+       some systems (SunOS!) `rand()' may return a value larger than RAND_MAX */
+    lua_Number r = (lua_Number)(rand() % RAND_MAX) / (lua_Number)RAND_MAX;
+    switch (lua_gettop(L)) {  /* check number of arguments */
+        case 0: {  /* no arguments */
+            lua_pushnumber(L, r);  /* Number between 0 and 1 */
+            break;
+        }
+        case 1: {  /* only upper limit */
+            lua_Number u = luaL_checknumber(L, 1);
+            luaL_argcheck(L, (lua_Number)1.0 <= u, 1, "interval is empty");
+            lua_pushnumber(L, l_mathop(floor)(r * u) + (lua_Number)(1.0)); /* [1, u] */
+            break;
+        }
+        case 2: {  /* lower and upper limits */
+            lua_Number l = luaL_checknumber(L, 1);
+            lua_Number u = luaL_checknumber(L, 2);
+            luaL_argcheck(L, l <= u, 2, "interval is empty");
+            lua_pushnumber(L, l_mathop(floor)(r * (u - l + 1)) + l); /* [l, u] */
+            break;
+        }
+        default:
+            return luaL_error(L, "wrong number of arguments");
+    }
+    return 1;
+}
+
+
+static int math_randomseed(lua_State *L)
+{
+    srand(luaL_checkunsigned(L, 1));
+    (void)rand(); /* discard first value to avoid undesirable correlations */
+    return 0;
 }
 
 
 static const luaL_Reg mathlib[] = {
-  {"abs",   math_abs},
-  {"acos",  math_acos},
-  {"asin",  math_asin},
-  {"atan2", math_atan2},
-  {"atan",  math_atan},
-  {"ceil",  math_ceil},
-  {"cosh",   math_cosh},
-  {"cos",   math_cos},
-  {"deg",   math_deg},
-  {"exp",   math_exp},
-  {"floor", math_floor},
-  {"fmod",   math_fmod},
-  {"frexp", math_frexp},
-  {"ldexp", math_ldexp},
+    {"abs",   math_abs},
+    {"acos",  math_acos},
+    {"asin",  math_asin},
+    {"atan2", math_atan2},
+    {"atan",  math_atan},
+    {"ceil",  math_ceil},
+    {"cosh",   math_cosh},
+    {"cos",   math_cos},
+    {"deg",   math_deg},
+    {"exp",   math_exp},
+    {"floor", math_floor},
+    {"fmod",   math_fmod},
+    {"frexp", math_frexp},
+    {"ldexp", math_ldexp},
 #if defined(LUA_COMPAT_LOG10)
-  {"log10", math_log10},
+    {"log10", math_log10},
 #endif
-  {"log",   math_log},
-  {"max",   math_max},
-  {"min",   math_min},
-  {"modf",   math_modf},
-  {"pow",   math_pow},
-  {"rad",   math_rad},
-  {"random",     math_random},
-  {"randomseed", math_randomseed},
-  {"sinh",   math_sinh},
-  {"sin",   math_sin},
-  {"sqrt",  math_sqrt},
-  {"tanh",   math_tanh},
-  {"tan",   math_tan},
-  {NULL, NULL}
+    {"log",   math_log},
+    {"max",   math_max},
+    {"min",   math_min},
+    {"modf",   math_modf},
+    {"pow",   math_pow},
+    {"rad",   math_rad},
+    {"random",     math_random},
+    {"randomseed", math_randomseed},
+    {"sinh",   math_sinh},
+    {"sin",   math_sin},
+    {"sqrt",  math_sqrt},
+    {"tanh",   math_tanh},
+    {"tan",   math_tan},
+    {NULL, NULL}
 };
 
 
 /*
 ** Open math library
 */
-LUAMOD_API int luaopen_math (lua_State *L) {
-  luaL_newlib(L, mathlib);
-  lua_pushnumber(L, PI);
-  lua_setfield(L, -2, "pi");
-  lua_pushnumber(L, HUGE_VAL);
-  lua_setfield(L, -2, "huge");
-  return 1;
+LUAMOD_API int luaopen_math(lua_State *L)
+{
+    luaL_newlib(L, mathlib);
+    lua_pushnumber(L, PI);
+    lua_setfield(L, -2, "pi");
+    lua_pushnumber(L, HUGE_VAL);
+    lua_setfield(L, -2, "huge");
+    return 1;
 }
 
diff --git a/liblua/lmem.c b/liblua/lmem.c
index 6db0b791c..73ef2e657 100644
--- a/liblua/lmem.c
+++ b/liblua/lmem.c
@@ -43,28 +43,29 @@
 #define MINSIZEARRAY 4
 
 
-void *luaM_growaux_ (lua_State *L, void *block, int *size, size_t size_elems,
-                     int limit, const char *what) {
-  void *newblock;
-  int newsize;
-  if (*size >= limit/2) {  /* cannot double it? */
-    if (*size >= limit)  /* cannot grow even a little? */
-      luaG_runerror(L, "too many %s (limit is %d)", what, limit);
-    newsize = limit;  /* still have at least one free place */
-  }
-  else {
-    newsize = (*size)*2;
-    if (newsize < MINSIZEARRAY)
-      newsize = MINSIZEARRAY;  /* minimum size */
-  }
-  newblock = luaM_reallocv(L, block, *size, newsize, size_elems);
-  *size = newsize;  /* update only when everything else is OK */
-  return newblock;
+void *luaM_growaux_(lua_State *L, void *block, int *size, size_t size_elems,
+                    int limit, const char *what)
+{
+    void *newblock;
+    int newsize;
+    if (*size >= limit / 2) { /* cannot double it? */
+        if (*size >= limit)  /* cannot grow even a little? */
+            luaG_runerror(L, "too many %s (limit is %d)", what, limit);
+        newsize = limit;  /* still have at least one free place */
+    } else {
+        newsize = (*size) * 2;
+        if (newsize < MINSIZEARRAY)
+            newsize = MINSIZEARRAY;  /* minimum size */
+    }
+    newblock = luaM_reallocv(L, block, *size, newsize, size_elems);
+    *size = newsize;  /* update only when everything else is OK */
+    return newblock;
 }
 
 
-l_noret luaM_toobig (lua_State *L) {
-  luaG_runerror(L, "memory allocation error: block too big");
+l_noret luaM_toobig(lua_State *L)
+{
+    luaG_runerror(L, "memory allocation error: block too big");
 }
 
 
@@ -72,28 +73,29 @@ l_noret luaM_toobig (lua_State *L) {
 /*
 ** generic allocation routine.
 */
-void *luaM_realloc_ (lua_State *L, void *block, size_t osize, size_t nsize) {
-  void *newblock;
-  global_State *g = G(L);
-  size_t realosize = (block) ? osize : 0;
-  lua_assert((realosize == 0) == (block == NULL));
+void *luaM_realloc_(lua_State *L, void *block, size_t osize, size_t nsize)
+{
+    void *newblock;
+    global_State *g = G(L);
+    size_t realosize = (block) ? osize : 0;
+    lua_assert((realosize == 0) == (block == NULL));
 #if defined(HARDMEMTESTS)
-  if (nsize > realosize && g->gcrunning)
-    luaC_fullgc(L, 1);  /* force a GC whenever possible */
+    if (nsize > realosize && g->gcrunning)
+        luaC_fullgc(L, 1);  /* force a GC whenever possible */
 #endif
-  newblock = (*g->frealloc)(g->ud, block, osize, nsize);
-  if (newblock == NULL && nsize > 0) {
-    api_check(L, nsize > realosize,
-                 "realloc cannot fail when shrinking a block");
-    if (g->gcrunning) {
-      luaC_fullgc(L, 1);  /* try to free some memory... */
-      newblock = (*g->frealloc)(g->ud, block, osize, nsize);  /* try again */
+    newblock = (*g->frealloc)(g->ud, block, osize, nsize);
+    if (newblock == NULL && nsize > 0) {
+        api_check(L, nsize > realosize,
+                  "realloc cannot fail when shrinking a block");
+        if (g->gcrunning) {
+            luaC_fullgc(L, 1);  /* try to free some memory... */
+            newblock = (*g->frealloc)(g->ud, block, osize, nsize);  /* try again */
+        }
+        if (newblock == NULL)
+            luaD_throw(L, LUA_ERRMEM);
     }
-    if (newblock == NULL)
-      luaD_throw(L, LUA_ERRMEM);
-  }
-  lua_assert((nsize == 0) == (newblock == NULL));
-  g->GCdebt = (g->GCdebt + nsize) - realosize;
-  return newblock;
+    lua_assert((nsize == 0) == (newblock == NULL));
+    g->GCdebt = (g->GCdebt + nsize) - realosize;
+    return newblock;
 }
 
diff --git a/liblua/lmem.h b/liblua/lmem.h
index 4a9a3c27f..2fad8d41e 100644
--- a/liblua/lmem.h
+++ b/liblua/lmem.h
@@ -22,9 +22,9 @@
 ** cast to 'void' avoids warnings of "value unused".
 */
 #define luaM_reallocv(L,b,on,n,e) \
-  (cast(void, \
-     (cast(size_t, (n)+1) > MAX_SIZET/(e)) ? (luaM_toobig(L), 0) : 0), \
-   luaM_realloc_(L, (b), (on)*(e), (n)*(e)))
+    (cast(void, \
+          (cast(size_t, (n)+1) > MAX_SIZET/(e)) ? (luaM_toobig(L), 0) : 0), \
+     luaM_realloc_(L, (b), (on)*(e), (n)*(e)))
 
 #define luaM_freemem(L, b, s) luaM_realloc_(L, (b), (s), 0)
 #define luaM_free(L, b) luaM_realloc_(L, (b), sizeof(*(b)), 0)
@@ -33,25 +33,25 @@
 #define luaM_malloc(L,s) luaM_realloc_(L, NULL, 0, (s))
 #define luaM_new(L,t) cast(t *, luaM_malloc(L, sizeof(t)))
 #define luaM_newvector(L,n,t) \
-        cast(t *, luaM_reallocv(L, NULL, 0, n, sizeof(t)))
+    cast(t *, luaM_reallocv(L, NULL, 0, n, sizeof(t)))
 
 #define luaM_newobject(L,tag,s) luaM_realloc_(L, NULL, tag, (s))
 
 #define luaM_growvector(L,v,nelems,size,t,limit,e) \
-          if ((nelems)+1 > (size)) \
-            ((v)=cast(t *, luaM_growaux_(L,v,&(size),sizeof(t),limit,e)))
+    if ((nelems)+1 > (size)) \
+        ((v)=cast(t *, luaM_growaux_(L,v,&(size),sizeof(t),limit,e)))
 
 #define luaM_reallocvector(L, v,oldn,n,t) \
-   ((v)=cast(t *, luaM_reallocv(L, v, oldn, n, sizeof(t))))
+    ((v)=cast(t *, luaM_reallocv(L, v, oldn, n, sizeof(t))))
 
-LUAI_FUNC l_noret luaM_toobig (lua_State *L);
+LUAI_FUNC l_noret luaM_toobig(lua_State *L);
 
 /* not to be called directly */
-LUAI_FUNC void *luaM_realloc_ (lua_State *L, void *block, size_t oldsize,
-                                                          size_t size);
-LUAI_FUNC void *luaM_growaux_ (lua_State *L, void *block, int *size,
-                               size_t size_elem, int limit,
-                               const char *what);
+LUAI_FUNC void *luaM_realloc_(lua_State *L, void *block, size_t oldsize,
+                              size_t size);
+LUAI_FUNC void *luaM_growaux_(lua_State *L, void *block, int *size,
+                              size_t size_elem, int limit,
+                              const char *what);
 
 #endif
 
diff --git a/liblua/loadlib.c b/liblua/loadlib.c
index 52b48855d..942fde583 100644
--- a/liblua/loadlib.c
+++ b/liblua/loadlib.c
@@ -108,9 +108,9 @@
 /*
 ** system-dependent functions
 */
-static void ll_unloadlib (void *lib);
-static void *ll_load (lua_State *L, const char *path, int seeglb);
-static lua_CFunction ll_sym (lua_State *L, void *lib, const char *sym);
+static void ll_unloadlib(void *lib);
+static void *ll_load(lua_State *L, const char *path, int seeglb);
+static lua_CFunction ll_sym(lua_State *L, void *lib, const char *sym);
 
 
 
@@ -126,22 +126,25 @@ static lua_CFunction ll_sym (lua_State *L, void *lib, const char *sym);
 
 #include <dlfcn.h>
 
-static void ll_unloadlib (void *lib) {
-  dlclose(lib);
+static void ll_unloadlib(void *lib)
+{
+    dlclose(lib);
 }
 
 
-static void *ll_load (lua_State *L, const char *path, int seeglb) {
-  void *lib = dlopen(path, RTLD_NOW | (seeglb ? RTLD_GLOBAL : RTLD_LOCAL));
-  if (lib == NULL) lua_pushstring(L, dlerror());
-  return lib;
+static void *ll_load(lua_State *L, const char *path, int seeglb)
+{
+    void *lib = dlopen(path, RTLD_NOW | (seeglb ? RTLD_GLOBAL : RTLD_LOCAL));
+    if (lib == NULL) lua_pushstring(L, dlerror());
+    return lib;
 }
 
 
-static lua_CFunction ll_sym (lua_State *L, void *lib, const char *sym) {
-  lua_CFunction f = (lua_CFunction)dlsym(lib, sym);
-  if (f == NULL) lua_pushstring(L, dlerror());
-  return f;
+static lua_CFunction ll_sym(lua_State *L, void *lib, const char *sym)
+{
+    lua_CFunction f = (lua_CFunction)dlsym(lib, sym);
+    if (f == NULL) lua_pushstring(L, dlerror());
+    return f;
 }
 
 /* }====================================================== */
@@ -165,48 +168,53 @@ static lua_CFunction ll_sym (lua_State *L, void *lib, const char *sym) {
 #endif
 
 
-static void setprogdir (lua_State *L) {
-  char buff[MAX_PATH + 1];
-  char *lb;
-  DWORD nsize = sizeof(buff)/sizeof(char);
-  DWORD n = GetModuleFileNameA(NULL, buff, nsize);
-  if (n == 0 || n == nsize || (lb = strrchr(buff, '\\')) == NULL)
-    luaL_error(L, "unable to get ModuleFileName");
-  else {
-    *lb = '\0';
-    luaL_gsub(L, lua_tostring(L, -1), LUA_EXEC_DIR, buff);
-    lua_remove(L, -2);  /* remove original string */
-  }
+static void setprogdir(lua_State *L)
+{
+    char buff[MAX_PATH + 1];
+    char *lb;
+    DWORD nsize = sizeof(buff) / sizeof(char);
+    DWORD n = GetModuleFileNameA(NULL, buff, nsize);
+    if (n == 0 || n == nsize || (lb = strrchr(buff, '\\')) == NULL)
+        luaL_error(L, "unable to get ModuleFileName");
+    else {
+        *lb = '\0';
+        luaL_gsub(L, lua_tostring(L, -1), LUA_EXEC_DIR, buff);
+        lua_remove(L, -2);  /* remove original string */
+    }
 }
 
 
-static void pusherror (lua_State *L) {
-  int error = GetLastError();
-  char buffer[128];
-  if (FormatMessageA(FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_FROM_SYSTEM,
-      NULL, error, 0, buffer, sizeof(buffer)/sizeof(char), NULL))
-    lua_pushstring(L, buffer);
-  else
-    lua_pushfstring(L, "system error %d\n", error);
+static void pusherror(lua_State *L)
+{
+    int error = GetLastError();
+    char buffer[128];
+    if (FormatMessageA(FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_FROM_SYSTEM,
+                       NULL, error, 0, buffer, sizeof(buffer) / sizeof(char), NULL))
+        lua_pushstring(L, buffer);
+    else
+        lua_pushfstring(L, "system error %d\n", error);
 }
 
-static void ll_unloadlib (void *lib) {
-  FreeLibrary((HMODULE)lib);
+static void ll_unloadlib(void *lib)
+{
+    FreeLibrary((HMODULE)lib);
 }
 
 
-static void *ll_load (lua_State *L, const char *path, int seeglb) {
-  HMODULE lib = LoadLibraryExA(path, NULL, LUA_LLE_FLAGS);
-  (void)(seeglb);  /* not used: symbols are 'global' by default */
-  if (lib == NULL) pusherror(L);
-  return lib;
+static void *ll_load(lua_State *L, const char *path, int seeglb)
+{
+    HMODULE lib = LoadLibraryExA(path, NULL, LUA_LLE_FLAGS);
+    (void)(seeglb);  /* not used: symbols are 'global' by default */
+    if (lib == NULL) pusherror(L);
+    return lib;
 }
 
 
-static lua_CFunction ll_sym (lua_State *L, void *lib, const char *sym) {
-  lua_CFunction f = (lua_CFunction)GetProcAddress((HMODULE)lib, sym);
-  if (f == NULL) pusherror(L);
-  return f;
+static lua_CFunction ll_sym(lua_State *L, void *lib, const char *sym)
+{
+    lua_CFunction f = (lua_CFunction)GetProcAddress((HMODULE)lib, sym);
+    if (f == NULL) pusherror(L);
+    return f;
 }
 
 /* }====================================================== */
@@ -226,45 +234,52 @@ static lua_CFunction ll_sym (lua_State *L, void *lib, const char *sym) {
 #define DLMSG "dynamic libraries not enabled; check your Lua installation"
 
 
-static void ll_unloadlib (void *lib) {
-  (void)(lib);  /* not used */
+static void ll_unloadlib(void *lib)
+{
+    (void)(lib);  /* not used */
 }
 
 
-static void *ll_load (lua_State *L, const char *path, int seeglb) {
-  (void)(path); (void)(seeglb);  /* not used */
-  lua_pushliteral(L, DLMSG);
-  return NULL;
+static void *ll_load(lua_State *L, const char *path, int seeglb)
+{
+    (void)(path);
+    (void)(seeglb);  /* not used */
+    lua_pushliteral(L, DLMSG);
+    return NULL;
 }
 
 
-static lua_CFunction ll_sym (lua_State *L, void *lib, const char *sym) {
-  (void)(lib); (void)(sym);  /* not used */
-  lua_pushliteral(L, DLMSG);
-  return NULL;
+static lua_CFunction ll_sym(lua_State *L, void *lib, const char *sym)
+{
+    (void)(lib);
+    (void)(sym);  /* not used */
+    lua_pushliteral(L, DLMSG);
+    return NULL;
 }
 
 /* }====================================================== */
 #endif
 
 
-static void *ll_checkclib (lua_State *L, const char *path) {
-  void *plib;
-  lua_getfield(L, LUA_REGISTRYINDEX, CLIBS);
-  lua_getfield(L, -1, path);
-  plib = lua_touserdata(L, -1);  /* plib = CLIBS[path] */
-  lua_pop(L, 2);  /* pop CLIBS table and 'plib' */
-  return plib;
+static void *ll_checkclib(lua_State *L, const char *path)
+{
+    void *plib;
+    lua_getfield(L, LUA_REGISTRYINDEX, CLIBS);
+    lua_getfield(L, -1, path);
+    plib = lua_touserdata(L, -1);  /* plib = CLIBS[path] */
+    lua_pop(L, 2);  /* pop CLIBS table and 'plib' */
+    return plib;
 }
 
 
-static void ll_addtoclib (lua_State *L, const char *path, void *plib) {
-  lua_getfield(L, LUA_REGISTRYINDEX, CLIBS);
-  lua_pushlightuserdata(L, plib);
-  lua_pushvalue(L, -1);
-  lua_setfield(L, -3, path);  /* CLIBS[path] = plib */
-  lua_rawseti(L, -2, luaL_len(L, -2) + 1);  /* CLIBS[#CLIBS + 1] = plib */
-  lua_pop(L, 1);  /* pop CLIBS table */
+static void ll_addtoclib(lua_State *L, const char *path, void *plib)
+{
+    lua_getfield(L, LUA_REGISTRYINDEX, CLIBS);
+    lua_pushlightuserdata(L, plib);
+    lua_pushvalue(L, -1);
+    lua_setfield(L, -3, path);  /* CLIBS[path] = plib */
+    lua_rawseti(L, -2, luaL_len(L, -2) + 1);  /* CLIBS[#CLIBS + 1] = plib */
+    lua_pop(L, 1);  /* pop CLIBS table */
 }
 
 
@@ -272,50 +287,52 @@ static void ll_addtoclib (lua_State *L, const char *path, void *plib) {
 ** __gc tag method for CLIBS table: calls 'll_unloadlib' for all lib
 ** handles in list CLIBS
 */
-static int gctm (lua_State *L) {
-  int n = luaL_len(L, 1);
-  for (; n >= 1; n--) {  /* for each handle, in reverse order */
-    lua_rawgeti(L, 1, n);  /* get handle CLIBS[n] */
-    ll_unloadlib(lua_touserdata(L, -1));
-    lua_pop(L, 1);  /* pop handle */
-  }
-  return 0;
+static int gctm(lua_State *L)
+{
+    int n = luaL_len(L, 1);
+    for (; n >= 1; n--) {  /* for each handle, in reverse order */
+        lua_rawgeti(L, 1, n);  /* get handle CLIBS[n] */
+        ll_unloadlib(lua_touserdata(L, -1));
+        lua_pop(L, 1);  /* pop handle */
+    }
+    return 0;
 }
 
 
-static int ll_loadfunc (lua_State *L, const char *path, const char *sym) {
-  void *reg = ll_checkclib(L, path);  /* check loaded C libraries */
-  if (reg == NULL) {  /* must load library? */
-    reg = ll_load(L, path, *sym == '*');
-    if (reg == NULL) return ERRLIB;  /* unable to load library */
-    ll_addtoclib(L, path, reg);
-  }
-  if (*sym == '*') {  /* loading only library (no function)? */
-    lua_pushboolean(L, 1);  /* return 'true' */
-    return 0;  /* no errors */
-  }
-  else {
-    lua_CFunction f = ll_sym(L, reg, sym);
-    if (f == NULL)
-      return ERRFUNC;  /* unable to find function */
-    lua_pushcfunction(L, f);  /* else create new function */
-    return 0;  /* no errors */
-  }
+static int ll_loadfunc(lua_State *L, const char *path, const char *sym)
+{
+    void *reg = ll_checkclib(L, path);  /* check loaded C libraries */
+    if (reg == NULL) {  /* must load library? */
+        reg = ll_load(L, path, *sym == '*');
+        if (reg == NULL) return ERRLIB;  /* unable to load library */
+        ll_addtoclib(L, path, reg);
+    }
+    if (*sym == '*') {  /* loading only library (no function)? */
+        lua_pushboolean(L, 1);  /* return 'true' */
+        return 0;  /* no errors */
+    } else {
+        lua_CFunction f = ll_sym(L, reg, sym);
+        if (f == NULL)
+            return ERRFUNC;  /* unable to find function */
+        lua_pushcfunction(L, f);  /* else create new function */
+        return 0;  /* no errors */
+    }
 }
 
 
-static int ll_loadlib (lua_State *L) {
-  const char *path = luaL_checkstring(L, 1);
-  const char *init = luaL_checkstring(L, 2);
-  int stat = ll_loadfunc(L, path, init);
-  if (stat == 0)  /* no errors? */
-    return 1;  /* return the loaded function */
-  else {  /* error; error message is on stack top */
-    lua_pushnil(L);
-    lua_insert(L, -2);
-    lua_pushstring(L, (stat == ERRLIB) ?  LIB_FAIL : "init");
-    return 3;  /* return nil, error message, and where */
-  }
+static int ll_loadlib(lua_State *L)
+{
+    const char *path = luaL_checkstring(L, 1);
+    const char *init = luaL_checkstring(L, 2);
+    int stat = ll_loadfunc(L, path, init);
+    if (stat == 0)  /* no errors? */
+        return 1;  /* return the loaded function */
+    else {  /* error; error message is on stack top */
+        lua_pushnil(L);
+        lua_insert(L, -2);
+        lua_pushstring(L, (stat == ERRLIB) ?  LIB_FAIL : "init");
+        return 3;  /* return nil, error message, and where */
+    }
 }
 
 
@@ -327,206 +344,217 @@ static int ll_loadlib (lua_State *L) {
 */
 
 
-static int readable (const char *filename) {
-  FILE *f = fopen(filename, "r");  /* try to open file */
-  if (f == NULL) return 0;  /* open failed */
-  fclose(f);
-  return 1;
+static int readable(const char *filename)
+{
+    FILE *f = fopen(filename, "r");  /* try to open file */
+    if (f == NULL) return 0;  /* open failed */
+    fclose(f);
+    return 1;
 }
 
 
-static const char *pushnexttemplate (lua_State *L, const char *path) {
-  const char *l;
-  while (*path == *LUA_PATH_SEP) path++;  /* skip separators */
-  if (*path == '\0') return NULL;  /* no more templates */
-  l = strchr(path, *LUA_PATH_SEP);  /* find next separator */
-  if (l == NULL) l = path + strlen(path);
-  lua_pushlstring(L, path, l - path);  /* template */
-  return l;
+static const char *pushnexttemplate(lua_State *L, const char *path)
+{
+    const char *l;
+    while (*path == *LUA_PATH_SEP) path++;  /* skip separators */
+    if (*path == '\0') return NULL;  /* no more templates */
+    l = strchr(path, *LUA_PATH_SEP);  /* find next separator */
+    if (l == NULL) l = path + strlen(path);
+    lua_pushlstring(L, path, l - path);  /* template */
+    return l;
 }
 
 
-static const char *searchpath (lua_State *L, const char *name,
-                                             const char *path,
-                                             const char *sep,
-                                             const char *dirsep) {
-  luaL_Buffer msg;  /* to build error message */
-  luaL_buffinit(L, &msg);
-  if (*sep != '\0')  /* non-empty separator? */
-    name = luaL_gsub(L, name, sep, dirsep);  /* replace it by 'dirsep' */
-  while ((path = pushnexttemplate(L, path)) != NULL) {
-    const char *filename = luaL_gsub(L, lua_tostring(L, -1),
-                                     LUA_PATH_MARK, name);
-    lua_remove(L, -2);  /* remove path template */
-    if (readable(filename))  /* does file exist and is readable? */
-      return filename;  /* return that file name */
-    lua_pushfstring(L, "\n\tno file " LUA_QS, filename);
-    lua_remove(L, -2);  /* remove file name */
-    luaL_addvalue(&msg);  /* concatenate error msg. entry */
-  }
-  luaL_pushresult(&msg);  /* create error message */
-  return NULL;  /* not found */
+static const char *searchpath(lua_State *L, const char *name,
+                              const char *path,
+                              const char *sep,
+                              const char *dirsep)
+{
+    luaL_Buffer msg;  /* to build error message */
+    luaL_buffinit(L, &msg);
+    if (*sep != '\0')  /* non-empty separator? */
+        name = luaL_gsub(L, name, sep, dirsep);  /* replace it by 'dirsep' */
+    while ((path = pushnexttemplate(L, path)) != NULL) {
+        const char *filename = luaL_gsub(L, lua_tostring(L, -1),
+                                         LUA_PATH_MARK, name);
+        lua_remove(L, -2);  /* remove path template */
+        if (readable(filename))  /* does file exist and is readable? */
+            return filename;  /* return that file name */
+        lua_pushfstring(L, "\n\tno file " LUA_QS, filename);
+        lua_remove(L, -2);  /* remove file name */
+        luaL_addvalue(&msg);  /* concatenate error msg. entry */
+    }
+    luaL_pushresult(&msg);  /* create error message */
+    return NULL;  /* not found */
 }
 
 
-static int ll_searchpath (lua_State *L) {
-  const char *f = searchpath(L, luaL_checkstring(L, 1),
-                                luaL_checkstring(L, 2),
-                                luaL_optstring(L, 3, "."),
-                                luaL_optstring(L, 4, LUA_DIRSEP));
-  if (f != NULL) return 1;
-  else {  /* error message is on top of the stack */
-    lua_pushnil(L);
-    lua_insert(L, -2);
-    return 2;  /* return nil + error message */
-  }
+static int ll_searchpath(lua_State *L)
+{
+    const char *f = searchpath(L, luaL_checkstring(L, 1),
+                               luaL_checkstring(L, 2),
+                               luaL_optstring(L, 3, "."),
+                               luaL_optstring(L, 4, LUA_DIRSEP));
+    if (f != NULL) return 1;
+    else {  /* error message is on top of the stack */
+        lua_pushnil(L);
+        lua_insert(L, -2);
+        return 2;  /* return nil + error message */
+    }
 }
 
 
-static const char *findfile (lua_State *L, const char *name,
-                                           const char *pname,
-                                           const char *dirsep) {
-  const char *path;
-  lua_getfield(L, lua_upvalueindex(1), pname);
-  path = lua_tostring(L, -1);
-  if (path == NULL)
-    luaL_error(L, LUA_QL("package.%s") " must be a string", pname);
-  return searchpath(L, name, path, ".", dirsep);
+static const char *findfile(lua_State *L, const char *name,
+                            const char *pname,
+                            const char *dirsep)
+{
+    const char *path;
+    lua_getfield(L, lua_upvalueindex(1), pname);
+    path = lua_tostring(L, -1);
+    if (path == NULL)
+        luaL_error(L, LUA_QL("package.%s") " must be a string", pname);
+    return searchpath(L, name, path, ".", dirsep);
 }
 
 
-static int checkload (lua_State *L, int stat, const char *filename) {
-  if (stat) {  /* module loaded successfully? */
-    lua_pushstring(L, filename);  /* will be 2nd argument to module */
-    return 2;  /* return open function and file name */
-  }
-  else
-    return luaL_error(L, "error loading module " LUA_QS
-                         " from file " LUA_QS ":\n\t%s",
+static int checkload(lua_State *L, int stat, const char *filename)
+{
+    if (stat) {  /* module loaded successfully? */
+        lua_pushstring(L, filename);  /* will be 2nd argument to module */
+        return 2;  /* return open function and file name */
+    } else
+        return luaL_error(L, "error loading module " LUA_QS
+                          " from file " LUA_QS ":\n\t%s",
                           lua_tostring(L, 1), filename, lua_tostring(L, -1));
 }
 
 
-static int searcher_Lua (lua_State *L) {
-  const char *filename;
-  const char *name = luaL_checkstring(L, 1);
-  filename = findfile(L, name, "path", LUA_LSUBSEP);
-  if (filename == NULL) return 1;  /* module not found in this path */
-  return checkload(L, (luaL_loadfile(L, filename) == LUA_OK), filename);
+static int searcher_Lua(lua_State *L)
+{
+    const char *filename;
+    const char *name = luaL_checkstring(L, 1);
+    filename = findfile(L, name, "path", LUA_LSUBSEP);
+    if (filename == NULL) return 1;  /* module not found in this path */
+    return checkload(L, (luaL_loadfile(L, filename) == LUA_OK), filename);
 }
 
 
-static int loadfunc (lua_State *L, const char *filename, const char *modname) {
-  const char *funcname;
-  const char *mark;
-  modname = luaL_gsub(L, modname, ".", LUA_OFSEP);
-  mark = strchr(modname, *LUA_IGMARK);
-  if (mark) {
+static int loadfunc(lua_State *L, const char *filename, const char *modname)
+{
+    const char *funcname;
+    const char *mark;
+    modname = luaL_gsub(L, modname, ".", LUA_OFSEP);
+    mark = strchr(modname, *LUA_IGMARK);
+    if (mark) {
+        int stat;
+        funcname = lua_pushlstring(L, modname, mark - modname);
+        funcname = lua_pushfstring(L, LUA_POF"%s", funcname);
+        stat = ll_loadfunc(L, filename, funcname);
+        if (stat != ERRFUNC) return stat;
+        modname = mark + 1;  /* else go ahead and try old-style name */
+    }
+    funcname = lua_pushfstring(L, LUA_POF"%s", modname);
+    return ll_loadfunc(L, filename, funcname);
+}
+
+
+static int searcher_C(lua_State *L)
+{
+    const char *name = luaL_checkstring(L, 1);
+    const char *filename = findfile(L, name, "cpath", LUA_CSUBSEP);
+    if (filename == NULL) return 1;  /* module not found in this path */
+    return checkload(L, (loadfunc(L, filename, name) == 0), filename);
+}
+
+
+static int searcher_Croot(lua_State *L)
+{
+    const char *filename;
+    const char *name = luaL_checkstring(L, 1);
+    const char *p = strchr(name, '.');
     int stat;
-    funcname = lua_pushlstring(L, modname, mark - modname);
-    funcname = lua_pushfstring(L, LUA_POF"%s", funcname);
-    stat = ll_loadfunc(L, filename, funcname);
-    if (stat != ERRFUNC) return stat;
-    modname = mark + 1;  /* else go ahead and try old-style name */
-  }
-  funcname = lua_pushfstring(L, LUA_POF"%s", modname);
-  return ll_loadfunc(L, filename, funcname);
-}
-
-
-static int searcher_C (lua_State *L) {
-  const char *name = luaL_checkstring(L, 1);
-  const char *filename = findfile(L, name, "cpath", LUA_CSUBSEP);
-  if (filename == NULL) return 1;  /* module not found in this path */
-  return checkload(L, (loadfunc(L, filename, name) == 0), filename);
-}
-
-
-static int searcher_Croot (lua_State *L) {
-  const char *filename;
-  const char *name = luaL_checkstring(L, 1);
-  const char *p = strchr(name, '.');
-  int stat;
-  if (p == NULL) return 0;  /* is root */
-  lua_pushlstring(L, name, p - name);
-  filename = findfile(L, lua_tostring(L, -1), "cpath", LUA_CSUBSEP);
-  if (filename == NULL) return 1;  /* root not found */
-  if ((stat = loadfunc(L, filename, name)) != 0) {
-    if (stat != ERRFUNC)
-      return checkload(L, 0, filename);  /* real error */
-    else {  /* open function not found */
-      lua_pushfstring(L, "\n\tno module " LUA_QS " in file " LUA_QS,
-                         name, filename);
-      return 1;
+    if (p == NULL) return 0;  /* is root */
+    lua_pushlstring(L, name, p - name);
+    filename = findfile(L, lua_tostring(L, -1), "cpath", LUA_CSUBSEP);
+    if (filename == NULL) return 1;  /* root not found */
+    if ((stat = loadfunc(L, filename, name)) != 0) {
+        if (stat != ERRFUNC)
+            return checkload(L, 0, filename);  /* real error */
+        else {  /* open function not found */
+            lua_pushfstring(L, "\n\tno module " LUA_QS " in file " LUA_QS,
+                            name, filename);
+            return 1;
+        }
     }
-  }
-  lua_pushstring(L, filename);  /* will be 2nd argument to module */
-  return 2;
+    lua_pushstring(L, filename);  /* will be 2nd argument to module */
+    return 2;
 }
 
 
-static int searcher_preload (lua_State *L) {
-  const char *name = luaL_checkstring(L, 1);
-  lua_getfield(L, LUA_REGISTRYINDEX, "_PRELOAD");
-  lua_getfield(L, -1, name);
-  if (lua_isnil(L, -1))  /* not found? */
-    lua_pushfstring(L, "\n\tno field package.preload['%s']", name);
-  return 1;
+static int searcher_preload(lua_State *L)
+{
+    const char *name = luaL_checkstring(L, 1);
+    lua_getfield(L, LUA_REGISTRYINDEX, "_PRELOAD");
+    lua_getfield(L, -1, name);
+    if (lua_isnil(L, -1))  /* not found? */
+        lua_pushfstring(L, "\n\tno field package.preload['%s']", name);
+    return 1;
 }
 
 
-static void findloader (lua_State *L, const char *name) {
-  int i;
-  luaL_Buffer msg;  /* to build error message */
-  luaL_buffinit(L, &msg);
-  lua_getfield(L, lua_upvalueindex(1), "searchers");  /* will be at index 3 */
-  if (!lua_istable(L, 3))
-    luaL_error(L, LUA_QL("package.searchers") " must be a table");
-  /*  iterate over available searchers to find a loader */
-  for (i = 1; ; i++) {
-    lua_rawgeti(L, 3, i);  /* get a searcher */
-    if (lua_isnil(L, -1)) {  /* no more searchers? */
-      lua_pop(L, 1);  /* remove nil */
-      luaL_pushresult(&msg);  /* create error message */
-      luaL_error(L, "module " LUA_QS " not found:%s",
-                    name, lua_tostring(L, -1));
+static void findloader(lua_State *L, const char *name)
+{
+    int i;
+    luaL_Buffer msg;  /* to build error message */
+    luaL_buffinit(L, &msg);
+    lua_getfield(L, lua_upvalueindex(1), "searchers");  /* will be at index 3 */
+    if (!lua_istable(L, 3))
+        luaL_error(L, LUA_QL("package.searchers") " must be a table");
+    /*  iterate over available searchers to find a loader */
+    for (i = 1; ; i++) {
+        lua_rawgeti(L, 3, i);  /* get a searcher */
+        if (lua_isnil(L, -1)) {  /* no more searchers? */
+            lua_pop(L, 1);  /* remove nil */
+            luaL_pushresult(&msg);  /* create error message */
+            luaL_error(L, "module " LUA_QS " not found:%s",
+                       name, lua_tostring(L, -1));
+        }
+        lua_pushstring(L, name);
+        lua_call(L, 1, 2);  /* call it */
+        if (lua_isfunction(L, -2))  /* did it find a loader? */
+            return;  /* module loader found */
+        else if (lua_isstring(L, -2)) {  /* searcher returned error message? */
+            lua_pop(L, 1);  /* remove extra return */
+            luaL_addvalue(&msg);  /* concatenate error message */
+        } else
+            lua_pop(L, 2);  /* remove both returns */
     }
-    lua_pushstring(L, name);
-    lua_call(L, 1, 2);  /* call it */
-    if (lua_isfunction(L, -2))  /* did it find a loader? */
-      return;  /* module loader found */
-    else if (lua_isstring(L, -2)) {  /* searcher returned error message? */
-      lua_pop(L, 1);  /* remove extra return */
-      luaL_addvalue(&msg);  /* concatenate error message */
-    }
-    else
-      lua_pop(L, 2);  /* remove both returns */
-  }
 }
 
 
-static int ll_require (lua_State *L) {
-  const char *name = luaL_checkstring(L, 1);
-  lua_settop(L, 1);  /* _LOADED table will be at index 2 */
-  lua_getfield(L, LUA_REGISTRYINDEX, "_LOADED");
-  lua_getfield(L, 2, name);  /* _LOADED[name] */
-  if (lua_toboolean(L, -1))  /* is it there? */
-    return 1;  /* package is already loaded */
-  /* else must load package */
-  lua_pop(L, 1);  /* remove 'getfield' result */
-  findloader(L, name);
-  lua_pushstring(L, name);  /* pass name as argument to module loader */
-  lua_insert(L, -2);  /* name is 1st argument (before search data) */
-  lua_call(L, 2, 1);  /* run loader to load module */
-  if (!lua_isnil(L, -1))  /* non-nil return? */
-    lua_setfield(L, 2, name);  /* _LOADED[name] = returned value */
-  lua_getfield(L, 2, name);
-  if (lua_isnil(L, -1)) {   /* module did not set a value? */
-    lua_pushboolean(L, 1);  /* use true as result */
-    lua_pushvalue(L, -1);  /* extra copy to be returned */
-    lua_setfield(L, 2, name);  /* _LOADED[name] = true */
-  }
-  return 1;
+static int ll_require(lua_State *L)
+{
+    const char *name = luaL_checkstring(L, 1);
+    lua_settop(L, 1);  /* _LOADED table will be at index 2 */
+    lua_getfield(L, LUA_REGISTRYINDEX, "_LOADED");
+    lua_getfield(L, 2, name);  /* _LOADED[name] */
+    if (lua_toboolean(L, -1))  /* is it there? */
+        return 1;  /* package is already loaded */
+    /* else must load package */
+    lua_pop(L, 1);  /* remove 'getfield' result */
+    findloader(L, name);
+    lua_pushstring(L, name);  /* pass name as argument to module loader */
+    lua_insert(L, -2);  /* name is 1st argument (before search data) */
+    lua_call(L, 2, 1);  /* run loader to load module */
+    if (!lua_isnil(L, -1))  /* non-nil return? */
+        lua_setfield(L, 2, name);  /* _LOADED[name] = returned value */
+    lua_getfield(L, 2, name);
+    if (lua_isnil(L, -1)) {   /* module did not set a value? */
+        lua_pushboolean(L, 1);  /* use true as result */
+        lua_pushvalue(L, -1);  /* extra copy to be returned */
+        lua_setfield(L, 2, name);  /* _LOADED[name] = true */
+    }
+    return 1;
 }
 
 /* }====================================================== */
@@ -543,74 +571,79 @@ static int ll_require (lua_State *L) {
 /*
 ** changes the environment variable of calling function
 */
-static void set_env (lua_State *L) {
-  lua_Debug ar;
-  if (lua_getstack(L, 1, &ar) == 0 ||
-      lua_getinfo(L, "f", &ar) == 0 ||  /* get calling function */
-      lua_iscfunction(L, -1))
-    luaL_error(L, LUA_QL("module") " not called from a Lua function");
-  lua_pushvalue(L, -2);  /* copy new environment table to top */
-  lua_setupvalue(L, -2, 1);
-  lua_pop(L, 1);  /* remove function */
+static void set_env(lua_State *L)
+{
+    lua_Debug ar;
+    if (lua_getstack(L, 1, &ar) == 0 ||
+        lua_getinfo(L, "f", &ar) == 0 ||  /* get calling function */
+        lua_iscfunction(L, -1))
+        luaL_error(L, LUA_QL("module") " not called from a Lua function");
+    lua_pushvalue(L, -2);  /* copy new environment table to top */
+    lua_setupvalue(L, -2, 1);
+    lua_pop(L, 1);  /* remove function */
 }
 
 
-static void dooptions (lua_State *L, int n) {
-  int i;
-  for (i = 2; i <= n; i++) {
-    if (lua_isfunction(L, i)) {  /* avoid 'calling' extra info. */
-      lua_pushvalue(L, i);  /* get option (a function) */
-      lua_pushvalue(L, -2);  /* module */
-      lua_call(L, 1, 0);
+static void dooptions(lua_State *L, int n)
+{
+    int i;
+    for (i = 2; i <= n; i++) {
+        if (lua_isfunction(L, i)) {  /* avoid 'calling' extra info. */
+            lua_pushvalue(L, i);  /* get option (a function) */
+            lua_pushvalue(L, -2);  /* module */
+            lua_call(L, 1, 0);
+        }
     }
-  }
 }
 
 
-static void modinit (lua_State *L, const char *modname) {
-  const char *dot;
-  lua_pushvalue(L, -1);
-  lua_setfield(L, -2, "_M");  /* module._M = module */
-  lua_pushstring(L, modname);
-  lua_setfield(L, -2, "_NAME");
-  dot = strrchr(modname, '.');  /* look for last dot in module name */
-  if (dot == NULL) dot = modname;
-  else dot++;
-  /* set _PACKAGE as package name (full module name minus last part) */
-  lua_pushlstring(L, modname, dot - modname);
-  lua_setfield(L, -2, "_PACKAGE");
-}
-
-
-static int ll_module (lua_State *L) {
-  const char *modname = luaL_checkstring(L, 1);
-  int lastarg = lua_gettop(L);  /* last parameter */
-  luaL_pushmodule(L, modname, 1);  /* get/create module table */
-  /* check whether table already has a _NAME field */
-  lua_getfield(L, -1, "_NAME");
-  if (!lua_isnil(L, -1))  /* is table an initialized module? */
-    lua_pop(L, 1);
-  else {  /* no; initialize it */
-    lua_pop(L, 1);
-    modinit(L, modname);
-  }
-  lua_pushvalue(L, -1);
-  set_env(L);
-  dooptions(L, lastarg);
-  return 1;
-}
-
-
-static int ll_seeall (lua_State *L) {
-  luaL_checktype(L, 1, LUA_TTABLE);
-  if (!lua_getmetatable(L, 1)) {
-    lua_createtable(L, 0, 1); /* create new metatable */
+static void modinit(lua_State *L, const char *modname)
+{
+    const char *dot;
     lua_pushvalue(L, -1);
-    lua_setmetatable(L, 1);
-  }
-  lua_pushglobaltable(L);
-  lua_setfield(L, -2, "__index");  /* mt.__index = _G */
-  return 0;
+    lua_setfield(L, -2, "_M");  /* module._M = module */
+    lua_pushstring(L, modname);
+    lua_setfield(L, -2, "_NAME");
+    dot = strrchr(modname, '.');  /* look for last dot in module name */
+    if (dot == NULL) dot = modname;
+    else dot++;
+    /* set _PACKAGE as package name (full module name minus last part) */
+    lua_pushlstring(L, modname, dot - modname);
+    lua_setfield(L, -2, "_PACKAGE");
+}
+
+
+static int ll_module(lua_State *L)
+{
+    const char *modname = luaL_checkstring(L, 1);
+    int lastarg = lua_gettop(L);  /* last parameter */
+    luaL_pushmodule(L, modname, 1);  /* get/create module table */
+    /* check whether table already has a _NAME field */
+    lua_getfield(L, -1, "_NAME");
+    if (!lua_isnil(L, -1))  /* is table an initialized module? */
+        lua_pop(L, 1);
+    else {  /* no; initialize it */
+        lua_pop(L, 1);
+        modinit(L, modname);
+    }
+    lua_pushvalue(L, -1);
+    set_env(L);
+    dooptions(L, lastarg);
+    return 1;
+}
+
+
+static int ll_seeall(lua_State *L)
+{
+    luaL_checktype(L, 1, LUA_TTABLE);
+    if (!lua_getmetatable(L, 1)) {
+        lua_createtable(L, 0, 1); /* create new metatable */
+        lua_pushvalue(L, -1);
+        lua_setmetatable(L, 1);
+    }
+    lua_pushglobaltable(L);
+    lua_setfield(L, -2, "__index");  /* mt.__index = _G */
+    return 0;
 }
 
 #endif
@@ -625,101 +658,105 @@ static int ll_seeall (lua_State *L) {
 /*
 ** return registry.LUA_NOENV as a boolean
 */
-static int noenv (lua_State *L) {
-  int b;
-  lua_getfield(L, LUA_REGISTRYINDEX, "LUA_NOENV");
-  b = lua_toboolean(L, -1);
-  lua_pop(L, 1);  /* remove value */
-  return b;
+static int noenv(lua_State *L)
+{
+    int b;
+    lua_getfield(L, LUA_REGISTRYINDEX, "LUA_NOENV");
+    b = lua_toboolean(L, -1);
+    lua_pop(L, 1);  /* remove value */
+    return b;
 }
 
 
-static void setpath (lua_State *L, const char *fieldname, const char *envname1,
-                                   const char *envname2, const char *def) {
-  const char *path = getenv(envname1);
-  if (path == NULL)  /* no environment variable? */
-    path = getenv(envname2);  /* try alternative name */
-  if (path == NULL || noenv(L))  /* no environment variable? */
-    lua_pushstring(L, def);  /* use default */
-  else {
-    /* replace ";;" by ";AUXMARK;" and then AUXMARK by default path */
-    path = luaL_gsub(L, path, LUA_PATH_SEP LUA_PATH_SEP,
-                              LUA_PATH_SEP AUXMARK LUA_PATH_SEP);
-    luaL_gsub(L, path, AUXMARK, def);
-    lua_remove(L, -2);
-  }
-  setprogdir(L);
-  lua_setfield(L, -2, fieldname);
+static void setpath(lua_State *L, const char *fieldname, const char *envname1,
+                    const char *envname2, const char *def)
+{
+    const char *path = getenv(envname1);
+    if (path == NULL)  /* no environment variable? */
+        path = getenv(envname2);  /* try alternative name */
+    if (path == NULL || noenv(L))  /* no environment variable? */
+        lua_pushstring(L, def);  /* use default */
+    else {
+        /* replace ";;" by ";AUXMARK;" and then AUXMARK by default path */
+        path = luaL_gsub(L, path, LUA_PATH_SEP LUA_PATH_SEP,
+                         LUA_PATH_SEP AUXMARK LUA_PATH_SEP);
+        luaL_gsub(L, path, AUXMARK, def);
+        lua_remove(L, -2);
+    }
+    setprogdir(L);
+    lua_setfield(L, -2, fieldname);
 }
 
 
 static const luaL_Reg pk_funcs[] = {
-  {"loadlib", ll_loadlib},
-  {"searchpath", ll_searchpath},
+    {"loadlib", ll_loadlib},
+    {"searchpath", ll_searchpath},
 #if defined(LUA_COMPAT_MODULE)
-  {"seeall", ll_seeall},
+    {"seeall", ll_seeall},
 #endif
-  {NULL, NULL}
+    {NULL, NULL}
 };
 
 
 static const luaL_Reg ll_funcs[] = {
 #if defined(LUA_COMPAT_MODULE)
-  {"module", ll_module},
+    {"module", ll_module},
 #endif
-  {"require", ll_require},
-  {NULL, NULL}
+    {"require", ll_require},
+    {NULL, NULL}
 };
 
 
-static void createsearcherstable (lua_State *L) {
-  static const lua_CFunction searchers[] =
+static void createsearcherstable(lua_State *L)
+{
+    static const lua_CFunction searchers[] =
     {searcher_preload, searcher_Lua, searcher_C, searcher_Croot, NULL};
-  int i;
-  /* create 'searchers' table */
-  lua_createtable(L, sizeof(searchers)/sizeof(searchers[0]) - 1, 0);
-  /* fill it with pre-defined searchers */
-  for (i=0; searchers[i] != NULL; i++) {
-    lua_pushvalue(L, -2);  /* set 'package' as upvalue for all searchers */
-    lua_pushcclosure(L, searchers[i], 1);
-    lua_rawseti(L, -2, i+1);
-  }
+    int i;
+    /* create 'searchers' table */
+    lua_createtable(L, sizeof(searchers) / sizeof(searchers[0]) - 1, 0);
+    /* fill it with pre-defined searchers */
+    for (i = 0; searchers[i] != NULL; i++) {
+        lua_pushvalue(L, -2);  /* set 'package' as upvalue for all searchers */
+        lua_pushcclosure(L, searchers[i], 1);
+        lua_rawseti(L, -2, i + 1);
+    }
 }
 
 
-LUAMOD_API int luaopen_package (lua_State *L) {
-  /* create table CLIBS to keep track of loaded C libraries */
-  luaL_getsubtable(L, LUA_REGISTRYINDEX, CLIBS);
-  lua_createtable(L, 0, 1);  /* metatable for CLIBS */
-  lua_pushcfunction(L, gctm);
-  lua_setfield(L, -2, "__gc");  /* set finalizer for CLIBS table */
-  lua_setmetatable(L, -2);
-  /* create `package' table */
-  luaL_newlib(L, pk_funcs);
-  createsearcherstable(L);
+LUAMOD_API int luaopen_package(lua_State *L)
+{
+    /* create table CLIBS to keep track of loaded C libraries */
+    luaL_getsubtable(L, LUA_REGISTRYINDEX, CLIBS);
+    lua_createtable(L, 0, 1);  /* metatable for CLIBS */
+    lua_pushcfunction(L, gctm);
+    lua_setfield(L, -2, "__gc");  /* set finalizer for CLIBS table */
+    lua_setmetatable(L, -2);
+    /* create `package' table */
+    luaL_newlib(L, pk_funcs);
+    createsearcherstable(L);
 #if defined(LUA_COMPAT_LOADERS)
-  lua_pushvalue(L, -1);  /* make a copy of 'searchers' table */
-  lua_setfield(L, -3, "loaders");  /* put it in field `loaders' */
+    lua_pushvalue(L, -1);  /* make a copy of 'searchers' table */
+    lua_setfield(L, -3, "loaders");  /* put it in field `loaders' */
 #endif
-  lua_setfield(L, -2, "searchers");  /* put it in field 'searchers' */
-  /* set field 'path' */
-  setpath(L, "path", LUA_PATHVERSION, LUA_PATH, LUA_PATH_DEFAULT);
-  /* set field 'cpath' */
-  setpath(L, "cpath", LUA_CPATHVERSION, LUA_CPATH, LUA_CPATH_DEFAULT);
-  /* store config information */
-  lua_pushliteral(L, LUA_DIRSEP "\n" LUA_PATH_SEP "\n" LUA_PATH_MARK "\n"
-                     LUA_EXEC_DIR "\n" LUA_IGMARK "\n");
-  lua_setfield(L, -2, "config");
-  /* set field `loaded' */
-  luaL_getsubtable(L, LUA_REGISTRYINDEX, "_LOADED");
-  lua_setfield(L, -2, "loaded");
-  /* set field `preload' */
-  luaL_getsubtable(L, LUA_REGISTRYINDEX, "_PRELOAD");
-  lua_setfield(L, -2, "preload");
-  lua_pushglobaltable(L);
-  lua_pushvalue(L, -2);  /* set 'package' as upvalue for next lib */
-  luaL_setfuncs(L, ll_funcs, 1);  /* open lib into global table */
-  lua_pop(L, 1);  /* pop global table */
-  return 1;  /* return 'package' table */
+    lua_setfield(L, -2, "searchers");  /* put it in field 'searchers' */
+    /* set field 'path' */
+    setpath(L, "path", LUA_PATHVERSION, LUA_PATH, LUA_PATH_DEFAULT);
+    /* set field 'cpath' */
+    setpath(L, "cpath", LUA_CPATHVERSION, LUA_CPATH, LUA_CPATH_DEFAULT);
+    /* store config information */
+    lua_pushliteral(L, LUA_DIRSEP "\n" LUA_PATH_SEP "\n" LUA_PATH_MARK "\n"
+                    LUA_EXEC_DIR "\n" LUA_IGMARK "\n");
+    lua_setfield(L, -2, "config");
+    /* set field `loaded' */
+    luaL_getsubtable(L, LUA_REGISTRYINDEX, "_LOADED");
+    lua_setfield(L, -2, "loaded");
+    /* set field `preload' */
+    luaL_getsubtable(L, LUA_REGISTRYINDEX, "_PRELOAD");
+    lua_setfield(L, -2, "preload");
+    lua_pushglobaltable(L);
+    lua_pushvalue(L, -2);  /* set 'package' as upvalue for next lib */
+    luaL_setfuncs(L, ll_funcs, 1);  /* open lib into global table */
+    lua_pop(L, 1);  /* pop global table */
+    return 1;  /* return 'package' table */
 }
 
diff --git a/liblua/lobject.c b/liblua/lobject.c
index 2e6f2b95a..e4a56e148 100644
--- a/liblua/lobject.c
+++ b/liblua/lobject.c
@@ -33,60 +33,74 @@ LUAI_DDEF const TValue luaO_nilobject_ = {NILCONSTANT};
 ** (eeeeexxx), where the real value is (1xxx) * 2^(eeeee - 1) if
 ** eeeee != 0 and (xxx) otherwise.
 */
-int luaO_int2fb (unsigned int x) {
-  int e = 0;  /* exponent */
-  if (x < 8) return x;
-  while (x >= 0x10) {
-    x = (x+1) >> 1;
-    e++;
-  }
-  return ((e+1) << 3) | (cast_int(x) - 8);
+int luaO_int2fb(unsigned int x)
+{
+    int e = 0;  /* exponent */
+    if (x < 8) return x;
+    while (x >= 0x10) {
+        x = (x + 1) >> 1;
+        e++;
+    }
+    return ((e + 1) << 3) | (cast_int(x) - 8);
 }
 
 
 /* converts back */
-int luaO_fb2int (int x) {
-  int e = (x >> 3) & 0x1f;
-  if (e == 0) return x;
-  else return ((x & 7) + 8) << (e - 1);
+int luaO_fb2int(int x)
+{
+    int e = (x >> 3) & 0x1f;
+    if (e == 0) return x;
+    else return ((x & 7) + 8) << (e - 1);
 }
 
 
-int luaO_ceillog2 (unsigned int x) {
-  static const lu_byte log_2[256] = {
-    0,1,2,2,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
-    6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
-    7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
-    7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
-    8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-    8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-    8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-    8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8
-  };
-  int l = 0;
-  x--;
-  while (x >= 256) { l += 8; x >>= 8; }
-  return l + log_2[x];
+int luaO_ceillog2(unsigned int x)
+{
+    static const lu_byte log_2[256] = {
+        0, 1, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+        6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+        7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+        7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+        8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+        8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+        8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+        8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8
+    };
+    int l = 0;
+    x--;
+    while (x >= 256) { l += 8; x >>= 8; }
+    return l + log_2[x];
 }
 
 
-lua_Number luaO_arith (int op, lua_Number v1, lua_Number v2) {
-  switch (op) {
-    case LUA_OPADD: return luai_numadd(NULL, v1, v2);
-    case LUA_OPSUB: return luai_numsub(NULL, v1, v2);
-    case LUA_OPMUL: return luai_nummul(NULL, v1, v2);
-    case LUA_OPDIV: return luai_numdiv(NULL, v1, v2);
-    case LUA_OPMOD: return luai_nummod(NULL, v1, v2);
-    case LUA_OPPOW: return luai_numpow(NULL, v1, v2);
-    case LUA_OPUNM: return luai_numunm(NULL, v1);
-    default: lua_assert(0); return 0;
-  }
+lua_Number luaO_arith(int op, lua_Number v1, lua_Number v2)
+{
+    switch (op) {
+        case LUA_OPADD:
+            return luai_numadd(NULL, v1, v2);
+        case LUA_OPSUB:
+            return luai_numsub(NULL, v1, v2);
+        case LUA_OPMUL:
+            return luai_nummul(NULL, v1, v2);
+        case LUA_OPDIV:
+            return luai_numdiv(NULL, v1, v2);
+        case LUA_OPMOD:
+            return luai_nummod(NULL, v1, v2);
+        case LUA_OPPOW:
+            return luai_numpow(NULL, v1, v2);
+        case LUA_OPUNM:
+            return luai_numunm(NULL, v1);
+        default:
+            lua_assert(0);
+            return 0;
+    }
 }
 
 
-int luaO_hexavalue (int c) {
-  if (lisdigit(c)) return c - '0';
-  else return ltolower(c) - 'a' + 10;
+int luaO_hexavalue(int c)
+{
+    if (lisdigit(c)) return c - '0';
+    else return ltolower(c) - 'a' + 10;
 }
 
 
@@ -95,19 +109,21 @@ int luaO_hexavalue (int c) {
 #include <math.h>
 
 
-static int isneg (const char **s) {
-  if (**s == '-') { (*s)++; return 1; }
-  else if (**s == '+') (*s)++;
-  return 0;
+static int isneg(const char **s)
+{
+    if (**s == '-') { (*s)++; return 1; }
+    else if (**s == '+')(*s)++;
+    return 0;
 }
 
 
-static lua_Number readhexa (const char **s, lua_Number r, int *count) {
-  for (; lisxdigit(cast_uchar(**s)); (*s)++) {  /* read integer part */
-    r = (r * cast_num(16.0)) + cast_num(luaO_hexavalue(cast_uchar(**s)));
-    (*count)++;
-  }
-  return r;
+static lua_Number readhexa(const char **s, lua_Number r, int *count)
+{
+    for (; lisxdigit(cast_uchar(**s)); (*s)++) {  /* read integer part */
+        r = (r * cast_num(16.0)) + cast_num(luaO_hexavalue(cast_uchar(**s)));
+        (*count)++;
+    }
+    return r;
 }
 
 
@@ -115,128 +131,133 @@ static lua_Number readhexa (const char **s, lua_Number r, int *count) {
 ** convert an hexadecimal numeric string to a number, following
 ** C99 specification for 'strtod'
 */
-static lua_Number lua_strx2number (const char *s, char **endptr) {
-  lua_Number r = 0.0;
-  int e = 0, i = 0;
-  int neg = 0;  /* 1 if number is negative */
-  *endptr = cast(char *, s);  /* nothing is valid yet */
-  while (lisspace(cast_uchar(*s))) s++;  /* skip initial spaces */
-  neg = isneg(&s);  /* check signal */
-  if (!(*s == '0' && (*(s + 1) == 'x' || *(s + 1) == 'X')))  /* check '0x' */
-    return 0.0;  /* invalid format (no '0x') */
-  s += 2;  /* skip '0x' */
-  r = readhexa(&s, r, &i);  /* read integer part */
-  if (*s == '.') {
-    s++;  /* skip dot */
-    r = readhexa(&s, r, &e);  /* read fractional part */
-  }
-  if (i == 0 && e == 0)
-    return 0.0;  /* invalid format (no digit) */
-  e *= -4;  /* each fractional digit divides value by 2^-4 */
-  *endptr = cast(char *, s);  /* valid up to here */
-  if (*s == 'p' || *s == 'P') {  /* exponent part? */
-    int exp1 = 0;
-    int neg1;
-    s++;  /* skip 'p' */
-    neg1 = isneg(&s);  /* signal */
-    if (!lisdigit(cast_uchar(*s)))
-      goto ret;  /* must have at least one digit */
-    while (lisdigit(cast_uchar(*s)))  /* read exponent */
-      exp1 = exp1 * 10 + *(s++) - '0';
-    if (neg1) exp1 = -exp1;
-    e += exp1;
-  }
-  *endptr = cast(char *, s);  /* valid up to here */
- ret:
-  if (neg) r = -r;
-  return l_mathop(ldexp)(r, e);
+static lua_Number lua_strx2number(const char *s, char **endptr)
+{
+    lua_Number r = 0.0;
+    int e = 0, i = 0;
+    int neg = 0;  /* 1 if number is negative */
+    *endptr = cast(char *, s);  /* nothing is valid yet */
+    while (lisspace(cast_uchar(*s))) s++;  /* skip initial spaces */
+    neg = isneg(&s);  /* check signal */
+    if (!(*s == '0' && (*(s + 1) == 'x' || *(s + 1) == 'X')))  /* check '0x' */
+        return 0.0;  /* invalid format (no '0x') */
+    s += 2;  /* skip '0x' */
+    r = readhexa(&s, r, &i);  /* read integer part */
+    if (*s == '.') {
+        s++;  /* skip dot */
+        r = readhexa(&s, r, &e);  /* read fractional part */
+    }
+    if (i == 0 && e == 0)
+        return 0.0;  /* invalid format (no digit) */
+    e *= -4;  /* each fractional digit divides value by 2^-4 */
+    *endptr = cast(char *, s);  /* valid up to here */
+    if (*s == 'p' || *s == 'P') {  /* exponent part? */
+        int exp1 = 0;
+        int neg1;
+        s++;  /* skip 'p' */
+        neg1 = isneg(&s);  /* signal */
+        if (!lisdigit(cast_uchar(*s)))
+            goto ret;  /* must have at least one digit */
+        while (lisdigit(cast_uchar(*s)))  /* read exponent */
+            exp1 = exp1 * 10 + *(s++) - '0';
+        if (neg1) exp1 = -exp1;
+        e += exp1;
+    }
+    *endptr = cast(char *, s);  /* valid up to here */
+ret:
+    if (neg) r = -r;
+    return l_mathop(ldexp)(r, e);
 }
 
 #endif
 
 
-int luaO_str2d (const char *s, size_t len, lua_Number *result) {
-  char *endptr;
-  if (strpbrk(s, "nN"))  /* reject 'inf' and 'nan' */
-    return 0;
-  else if (strpbrk(s, "xX"))  /* hexa? */
-    *result = lua_strx2number(s, &endptr);
-  else
-    *result = lua_str2number(s, &endptr);
-  if (endptr == s) return 0;  /* nothing recognized */
-  while (lisspace(cast_uchar(*endptr))) endptr++;
-  return (endptr == s + len);  /* OK if no trailing characters */
+int luaO_str2d(const char *s, size_t len, lua_Number *result)
+{
+    char *endptr;
+    if (strpbrk(s, "nN"))  /* reject 'inf' and 'nan' */
+        return 0;
+    else if (strpbrk(s, "xX"))  /* hexa? */
+        *result = lua_strx2number(s, &endptr);
+    else
+        *result = lua_str2number(s, &endptr);
+    if (endptr == s) return 0;  /* nothing recognized */
+    while (lisspace(cast_uchar(*endptr))) endptr++;
+    return (endptr == s + len);  /* OK if no trailing characters */
 }
 
 
 
-static void pushstr (lua_State *L, const char *str, size_t l) {
-  setsvalue2s(L, L->top++, luaS_newlstr(L, str, l));
+static void pushstr(lua_State *L, const char *str, size_t l)
+{
+    setsvalue2s(L, L->top++, luaS_newlstr(L, str, l));
 }
 
 
 /* this function handles only `%d', `%c', %f, %p, and `%s' formats */
-const char *luaO_pushvfstring (lua_State *L, const char *fmt, va_list argp) {
-  int n = 0;
-  for (;;) {
-    const char *e = strchr(fmt, '%');
-    if (e == NULL) break;
-    luaD_checkstack(L, 2);  /* fmt + item */
-    pushstr(L, fmt, e - fmt);
-    switch (*(e+1)) {
-      case 's': {
-        const char *s = va_arg(argp, char *);
-        if (s == NULL) s = "(null)";
-        pushstr(L, s, strlen(s));
-        break;
-      }
-      case 'c': {
-        char buff;
-        buff = cast(char, va_arg(argp, int));
-        pushstr(L, &buff, 1);
-        break;
-      }
-      case 'd': {
-        setnvalue(L->top++, cast_num(va_arg(argp, int)));
-        break;
-      }
-      case 'f': {
-        setnvalue(L->top++, cast_num(va_arg(argp, l_uacNumber)));
-        break;
-      }
-      case 'p': {
-        char buff[4*sizeof(void *) + 8]; /* should be enough space for a `%p' */
-        int l = sprintf(buff, "%p", va_arg(argp, void *));
-        pushstr(L, buff, l);
-        break;
-      }
-      case '%': {
-        pushstr(L, "%", 1);
-        break;
-      }
-      default: {
-        luaG_runerror(L,
-            "invalid option " LUA_QL("%%%c") " to " LUA_QL("lua_pushfstring"),
-            *(e + 1));
-      }
+const char *luaO_pushvfstring(lua_State *L, const char *fmt, va_list argp)
+{
+    int n = 0;
+    for (;;) {
+        const char *e = strchr(fmt, '%');
+        if (e == NULL) break;
+        luaD_checkstack(L, 2);  /* fmt + item */
+        pushstr(L, fmt, e - fmt);
+        switch (*(e + 1)) {
+            case 's': {
+                const char *s = va_arg(argp, char *);
+                if (s == NULL) s = "(null)";
+                pushstr(L, s, strlen(s));
+                break;
+            }
+            case 'c': {
+                char buff;
+                buff = cast(char, va_arg(argp, int));
+                pushstr(L, &buff, 1);
+                break;
+            }
+            case 'd': {
+                setnvalue(L->top++, cast_num(va_arg(argp, int)));
+                break;
+            }
+            case 'f': {
+                setnvalue(L->top++, cast_num(va_arg(argp, l_uacNumber)));
+                break;
+            }
+            case 'p': {
+                char buff[4 * sizeof(void *) + 8]; /* should be enough space for a `%p' */
+                int l = sprintf(buff, "%p", va_arg(argp, void *));
+                pushstr(L, buff, l);
+                break;
+            }
+            case '%': {
+                pushstr(L, "%", 1);
+                break;
+            }
+            default: {
+                luaG_runerror(L,
+                              "invalid option " LUA_QL("%%%c") " to " LUA_QL("lua_pushfstring"),
+                              *(e + 1));
+            }
+        }
+        n += 2;
+        fmt = e + 2;
     }
-    n += 2;
-    fmt = e+2;
-  }
-  luaD_checkstack(L, 1);
-  pushstr(L, fmt, strlen(fmt));
-  if (n > 0) luaV_concat(L, n + 1);
-  return svalue(L->top - 1);
+    luaD_checkstack(L, 1);
+    pushstr(L, fmt, strlen(fmt));
+    if (n > 0) luaV_concat(L, n + 1);
+    return svalue(L->top - 1);
 }
 
 
-const char *luaO_pushfstring (lua_State *L, const char *fmt, ...) {
-  const char *msg;
-  va_list argp;
-  va_start(argp, fmt);
-  msg = luaO_pushvfstring(L, fmt, argp);
-  va_end(argp);
-  return msg;
+const char *luaO_pushfstring(lua_State *L, const char *fmt, ...)
+{
+    const char *msg;
+    va_list argp;
+    va_start(argp, fmt);
+    msg = luaO_pushvfstring(L, fmt, argp);
+    va_end(argp);
+    return msg;
 }
 
 
@@ -249,39 +270,37 @@ const char *luaO_pushfstring (lua_State *L, const char *fmt, ...) {
 
 #define addstr(a,b,l) ( memcpy(a,b,(l) * sizeof(char)), a += (l) )
 
-void luaO_chunkid (char *out, const char *source, size_t bufflen) {
-  size_t l = strlen(source);
-  if (*source == '=') {  /* 'literal' source */
-    if (l <= bufflen)  /* small enough? */
-      memcpy(out, source + 1, l * sizeof(char));
-    else {  /* truncate it */
-      addstr(out, source + 1, bufflen - 1);
-      *out = '\0';
+void luaO_chunkid(char *out, const char *source, size_t bufflen)
+{
+    size_t l = strlen(source);
+    if (*source == '=') {  /* 'literal' source */
+        if (l <= bufflen)  /* small enough? */
+            memcpy(out, source + 1, l * sizeof(char));
+        else {  /* truncate it */
+            addstr(out, source + 1, bufflen - 1);
+            *out = '\0';
+        }
+    } else if (*source == '@') { /* file name */
+        if (l <= bufflen)  /* small enough? */
+            memcpy(out, source + 1, l * sizeof(char));
+        else {  /* add '...' before rest of name */
+            addstr(out, RETS, LL(RETS));
+            bufflen -= LL(RETS);
+            memcpy(out, source + 1 + l - bufflen, bufflen * sizeof(char));
+        }
+    } else { /* string; format as [string "source"] */
+        const char *nl = strchr(source, '\n');  /* find first new line (if any) */
+        addstr(out, PRE, LL(PRE));  /* add prefix */
+        bufflen -= LL(PRE RETS POS) + 1;  /* save space for prefix+suffix+'\0' */
+        if (l < bufflen && nl == NULL) {  /* small one-line source? */
+            addstr(out, source, l);  /* keep it */
+        } else {
+            if (nl != NULL) l = nl - source;  /* stop at first newline */
+            if (l > bufflen) l = bufflen;
+            addstr(out, source, l);
+            addstr(out, RETS, LL(RETS));
+        }
+        memcpy(out, POS, (LL(POS) + 1) * sizeof(char));
     }
-  }
-  else if (*source == '@') {  /* file name */
-    if (l <= bufflen)  /* small enough? */
-      memcpy(out, source + 1, l * sizeof(char));
-    else {  /* add '...' before rest of name */
-      addstr(out, RETS, LL(RETS));
-      bufflen -= LL(RETS);
-      memcpy(out, source + 1 + l - bufflen, bufflen * sizeof(char));
-    }
-  }
-  else {  /* string; format as [string "source"] */
-    const char *nl = strchr(source, '\n');  /* find first new line (if any) */
-    addstr(out, PRE, LL(PRE));  /* add prefix */
-    bufflen -= LL(PRE RETS POS) + 1;  /* save space for prefix+suffix+'\0' */
-    if (l < bufflen && nl == NULL) {  /* small one-line source? */
-      addstr(out, source, l);  /* keep it */
-    }
-    else {
-      if (nl != NULL) l = nl - source;  /* stop at first newline */
-      if (l > bufflen) l = bufflen;
-      addstr(out, source, l);
-      addstr(out, RETS, LL(RETS));
-    }
-    memcpy(out, POS, (LL(POS) + 1) * sizeof(char));
-  }
 }
 
diff --git a/liblua/lobject.h b/liblua/lobject.h
index acf95689d..840cdc8c9 100644
--- a/liblua/lobject.h
+++ b/liblua/lobject.h
@@ -81,7 +81,7 @@ typedef union GCObject GCObject;
 ** Common header in struct form
 */
 typedef struct GCheader {
-  CommonHeader;
+    CommonHeader;
 } GCheader;
 
 
@@ -178,60 +178,60 @@ typedef struct lua_TValue TValue;
 
 #define checkliveness(g,obj) \
     lua_longassert(!iscollectable(obj) || \
-            (righttt(obj) && !isdead(g,gcvalue(obj))))
+                   (righttt(obj) && !isdead(g,gcvalue(obj))))
 
 
 /* Macros to set values */
 #define settt_(o,t) ((o)->tt_=(t))
 
 #define setnvalue(obj,x) \
-  { TValue *io=(obj); num_(io)=(x); settt_(io, LUA_TNUMBER); }
+    { TValue *io=(obj); num_(io)=(x); settt_(io, LUA_TNUMBER); }
 
 #define setnilvalue(obj) settt_(obj, LUA_TNIL)
 
 #define setfvalue(obj,x) \
-  { TValue *io=(obj); val_(io).f=(x); settt_(io, LUA_TLCF); }
+    { TValue *io=(obj); val_(io).f=(x); settt_(io, LUA_TLCF); }
 
 #define setpvalue(obj,x) \
-  { TValue *io=(obj); val_(io).p=(x); settt_(io, LUA_TLIGHTUSERDATA); }
+    { TValue *io=(obj); val_(io).p=(x); settt_(io, LUA_TLIGHTUSERDATA); }
 
 #define setbvalue(obj,x) \
-  { TValue *io=(obj); val_(io).b=(x); settt_(io, LUA_TBOOLEAN); }
+    { TValue *io=(obj); val_(io).b=(x); settt_(io, LUA_TBOOLEAN); }
 
 #define setgcovalue(L,obj,x) \
-  { TValue *io=(obj); GCObject *i_g=(x); \
-    val_(io).gc=i_g; settt_(io, ctb(gch(i_g)->tt)); }
+    { TValue *io=(obj); GCObject *i_g=(x); \
+        val_(io).gc=i_g; settt_(io, ctb(gch(i_g)->tt)); }
 
 #define setsvalue(L,obj,x) \
-  { TValue *io=(obj); \
-    TString *x_ = (x); \
-    val_(io).gc=cast(GCObject *, x_); settt_(io, ctb(x_->tsv.tt)); \
-    checkliveness(G(L),io); }
+    { TValue *io=(obj); \
+        TString *x_ = (x); \
+        val_(io).gc=cast(GCObject *, x_); settt_(io, ctb(x_->tsv.tt)); \
+        checkliveness(G(L),io); }
 
 #define setuvalue(L,obj,x) \
-  { TValue *io=(obj); \
-    val_(io).gc=cast(GCObject *, (x)); settt_(io, ctb(LUA_TUSERDATA)); \
-    checkliveness(G(L),io); }
+    { TValue *io=(obj); \
+        val_(io).gc=cast(GCObject *, (x)); settt_(io, ctb(LUA_TUSERDATA)); \
+        checkliveness(G(L),io); }
 
 #define setthvalue(L,obj,x) \
-  { TValue *io=(obj); \
-    val_(io).gc=cast(GCObject *, (x)); settt_(io, ctb(LUA_TTHREAD)); \
-    checkliveness(G(L),io); }
+    { TValue *io=(obj); \
+        val_(io).gc=cast(GCObject *, (x)); settt_(io, ctb(LUA_TTHREAD)); \
+        checkliveness(G(L),io); }
 
 #define setclLvalue(L,obj,x) \
-  { TValue *io=(obj); \
-    val_(io).gc=cast(GCObject *, (x)); settt_(io, ctb(LUA_TLCL)); \
-    checkliveness(G(L),io); }
+    { TValue *io=(obj); \
+        val_(io).gc=cast(GCObject *, (x)); settt_(io, ctb(LUA_TLCL)); \
+        checkliveness(G(L),io); }
 
 #define setclCvalue(L,obj,x) \
-  { TValue *io=(obj); \
-    val_(io).gc=cast(GCObject *, (x)); settt_(io, ctb(LUA_TCCL)); \
-    checkliveness(G(L),io); }
+    { TValue *io=(obj); \
+        val_(io).gc=cast(GCObject *, (x)); settt_(io, ctb(LUA_TCCL)); \
+        checkliveness(G(L),io); }
 
 #define sethvalue(L,obj,x) \
-  { TValue *io=(obj); \
-    val_(io).gc=cast(GCObject *, (x)); settt_(io, ctb(LUA_TTABLE)); \
-    checkliveness(G(L),io); }
+    { TValue *io=(obj); \
+        val_(io).gc=cast(GCObject *, (x)); settt_(io, ctb(LUA_TTABLE)); \
+        checkliveness(G(L),io); }
 
 #define setdeadvalue(obj) settt_(obj, LUA_TDEADKEY)
 
@@ -239,8 +239,8 @@ typedef struct lua_TValue TValue;
 
 #define setobj(L,obj1,obj2) \
     { const TValue *io2=(obj2); TValue *io1=(obj1); \
-      io1->value_ = io2->value_; io1->tt_ = io2->tt_; \
-      checkliveness(G(L),io1); }
+        io1->value_ = io2->value_; io1->tt_ = io2->tt_; \
+        checkliveness(G(L),io1); }
 
 
 /*
@@ -352,8 +352,8 @@ typedef struct lua_TValue TValue;
 #undef setobj
 #define setobj(L,obj1,obj2) \
     { const TValue *o2_=(obj2); TValue *o1_=(obj1); \
-      o1_->u = o2_->u; \
-      checkliveness(G(L),o1_); }
+        o1_->u = o2_->u; \
+        checkliveness(G(L),o1_); }
 
 
 /*
@@ -386,16 +386,16 @@ typedef struct lua_TValue TValue;
 
 
 union Value {
-  GCObject *gc;    /* collectable objects */
-  void *p;         /* light userdata */
-  int b;           /* booleans */
-  lua_CFunction f; /* light C functions */
-  numfield         /* numbers */
+    GCObject *gc;    /* collectable objects */
+    void *p;         /* light userdata */
+    int b;           /* booleans */
+    lua_CFunction f; /* light C functions */
+    numfield         /* numbers */
 };
 
 
 struct lua_TValue {
-  TValuefields;
+    TValuefields;
 };
 
 
@@ -408,13 +408,13 @@ typedef TValue *StkId;  /* index to stack elements */
 ** Header for string value; string bytes follow the end of this structure
 */
 typedef union TString {
-  L_Umaxalign dummy;  /* ensures maximum alignment for strings */
-  struct {
-    CommonHeader;
-    lu_byte extra;  /* reserved words for short strings; "has hash" for longs */
-    unsigned int hash;
-    size_t len;  /* number of characters in string */
-  } tsv;
+    L_Umaxalign dummy;  /* ensures maximum alignment for strings */
+    struct {
+        CommonHeader;
+        lu_byte extra;  /* reserved words for short strings; "has hash" for longs */
+        unsigned int hash;
+        size_t len;  /* number of characters in string */
+    } tsv;
 } TString;
 
 
@@ -429,13 +429,13 @@ typedef union TString {
 ** Header for userdata; memory area follows the end of this structure
 */
 typedef union Udata {
-  L_Umaxalign dummy;  /* ensures maximum alignment for `local' udata */
-  struct {
-    CommonHeader;
-    struct Table *metatable;
-    struct Table *env;
-    size_t len;  /* number of bytes */
-  } uv;
+    L_Umaxalign dummy;  /* ensures maximum alignment for `local' udata */
+    struct {
+        CommonHeader;
+        struct Table *metatable;
+        struct Table *env;
+        size_t len;  /* number of bytes */
+    } uv;
 } Udata;
 
 
@@ -444,9 +444,9 @@ typedef union Udata {
 ** Description of an upvalue for function prototypes
 */
 typedef struct Upvaldesc {
-  TString *name;  /* upvalue name (for debug information) */
-  lu_byte instack;  /* whether it is in stack */
-  lu_byte idx;  /* index of upvalue (in stack or in outer function's list) */
+    TString *name;  /* upvalue name (for debug information) */
+    lu_byte instack;  /* whether it is in stack */
+    lu_byte idx;  /* index of upvalue (in stack or in outer function's list) */
 } Upvaldesc;
 
 
@@ -455,9 +455,9 @@ typedef struct Upvaldesc {
 ** (used for debug information)
 */
 typedef struct LocVar {
-  TString *varname;
-  int startpc;  /* first point where variable is active */
-  int endpc;    /* first point where variable is dead */
+    TString *varname;
+    int startpc;  /* first point where variable is active */
+    int endpc;    /* first point where variable is dead */
 } LocVar;
 
 
@@ -465,27 +465,27 @@ typedef struct LocVar {
 ** Function Prototypes
 */
 typedef struct Proto {
-  CommonHeader;
-  TValue *k;  /* constants used by the function */
-  Instruction *code;
-  struct Proto **p;  /* functions defined inside the function */
-  int *lineinfo;  /* map from opcodes to source lines (debug information) */
-  LocVar *locvars;  /* information about local variables (debug information) */
-  Upvaldesc *upvalues;  /* upvalue information */
-  union Closure *cache;  /* last created closure with this prototype */
-  TString  *source;  /* used for debug information */
-  int sizeupvalues;  /* size of 'upvalues' */
-  int sizek;  /* size of `k' */
-  int sizecode;
-  int sizelineinfo;
-  int sizep;  /* size of `p' */
-  int sizelocvars;
-  int linedefined;
-  int lastlinedefined;
-  GCObject *gclist;
-  lu_byte numparams;  /* number of fixed parameters */
-  lu_byte is_vararg;
-  lu_byte maxstacksize;  /* maximum stack used by this function */
+    CommonHeader;
+    TValue *k;  /* constants used by the function */
+    Instruction *code;
+    struct Proto **p;  /* functions defined inside the function */
+    int *lineinfo;  /* map from opcodes to source lines (debug information) */
+    LocVar *locvars;  /* information about local variables (debug information) */
+    Upvaldesc *upvalues;  /* upvalue information */
+    union Closure *cache;  /* last created closure with this prototype */
+    TString  *source;  /* used for debug information */
+    int sizeupvalues;  /* size of 'upvalues' */
+    int sizek;  /* size of `k' */
+    int sizecode;
+    int sizelineinfo;
+    int sizep;  /* size of `p' */
+    int sizelocvars;
+    int linedefined;
+    int lastlinedefined;
+    GCObject *gclist;
+    lu_byte numparams;  /* number of fixed parameters */
+    lu_byte is_vararg;
+    lu_byte maxstacksize;  /* maximum stack used by this function */
 } Proto;
 
 
@@ -494,15 +494,15 @@ typedef struct Proto {
 ** Lua Upvalues
 */
 typedef struct UpVal {
-  CommonHeader;
-  TValue *v;  /* points to stack or to its own value */
-  union {
-    TValue value;  /* the value (when closed) */
-    struct {  /* double linked list (when open) */
-      struct UpVal *prev;
-      struct UpVal *next;
-    } l;
-  } u;
+    CommonHeader;
+    TValue *v;  /* points to stack or to its own value */
+    union {
+        TValue value;  /* the value (when closed) */
+        struct {  /* double linked list (when open) */
+            struct UpVal *prev;
+            struct UpVal *next;
+        } l;
+    } u;
 } UpVal;
 
 
@@ -514,22 +514,22 @@ typedef struct UpVal {
     CommonHeader; lu_byte nupvalues; GCObject *gclist
 
 typedef struct CClosure {
-  ClosureHeader;
-  lua_CFunction f;
-  TValue upvalue[1];  /* list of upvalues */
+    ClosureHeader;
+    lua_CFunction f;
+    TValue upvalue[1];  /* list of upvalues */
 } CClosure;
 
 
 typedef struct LClosure {
-  ClosureHeader;
-  struct Proto *p;
-  UpVal *upvals[1];  /* list of upvalues */
+    ClosureHeader;
+    struct Proto *p;
+    UpVal *upvals[1];  /* list of upvalues */
 } LClosure;
 
 
 typedef union Closure {
-  CClosure c;
-  LClosure l;
+    CClosure c;
+    LClosure l;
 } Closure;
 
 
@@ -543,30 +543,30 @@ typedef union Closure {
 */
 
 typedef union TKey {
-  struct {
-    TValuefields;
-    struct Node *next;  /* for chaining */
-  } nk;
-  TValue tvk;
+    struct {
+        TValuefields;
+        struct Node *next;  /* for chaining */
+    } nk;
+    TValue tvk;
 } TKey;
 
 
 typedef struct Node {
-  TValue i_val;
-  TKey i_key;
+    TValue i_val;
+    TKey i_key;
 } Node;
 
 
 typedef struct Table {
-  CommonHeader;
-  lu_byte flags;  /* 1<<p means tagmethod(p) is not present */
-  lu_byte lsizenode;  /* log2 of size of `node' array */
-  struct Table *metatable;
-  TValue *array;  /* array part */
-  Node *node;
-  Node *lastfree;  /* any free position is before this position */
-  GCObject *gclist;
-  int sizearray;  /* size of `array' array */
+    CommonHeader;
+    lu_byte flags;  /* 1<<p means tagmethod(p) is not present */
+    lu_byte lsizenode;  /* log2 of size of `node' array */
+    struct Table *metatable;
+    TValue *array;  /* array part */
+    Node *node;
+    Node *lastfree;  /* any free position is before this position */
+    GCObject *gclist;
+    int sizearray;  /* size of `array' array */
 } Table;
 
 
@@ -591,16 +591,16 @@ typedef struct Table {
 LUAI_DDEC const TValue luaO_nilobject_;
 
 
-LUAI_FUNC int luaO_int2fb (unsigned int x);
-LUAI_FUNC int luaO_fb2int (int x);
-LUAI_FUNC int luaO_ceillog2 (unsigned int x);
-LUAI_FUNC lua_Number luaO_arith (int op, lua_Number v1, lua_Number v2);
-LUAI_FUNC int luaO_str2d (const char *s, size_t len, lua_Number *result);
-LUAI_FUNC int luaO_hexavalue (int c);
-LUAI_FUNC const char *luaO_pushvfstring (lua_State *L, const char *fmt,
-                                                       va_list argp);
-LUAI_FUNC const char *luaO_pushfstring (lua_State *L, const char *fmt, ...);
-LUAI_FUNC void luaO_chunkid (char *out, const char *source, size_t len);
+LUAI_FUNC int luaO_int2fb(unsigned int x);
+LUAI_FUNC int luaO_fb2int(int x);
+LUAI_FUNC int luaO_ceillog2(unsigned int x);
+LUAI_FUNC lua_Number luaO_arith(int op, lua_Number v1, lua_Number v2);
+LUAI_FUNC int luaO_str2d(const char *s, size_t len, lua_Number *result);
+LUAI_FUNC int luaO_hexavalue(int c);
+LUAI_FUNC const char *luaO_pushvfstring(lua_State *L, const char *fmt,
+                                        va_list argp);
+LUAI_FUNC const char *luaO_pushfstring(lua_State *L, const char *fmt, ...);
+LUAI_FUNC void luaO_chunkid(char *out, const char *source, size_t len);
 
 
 #endif
diff --git a/liblua/lopcodes.c b/liblua/lopcodes.c
index 5dcb89eaa..24b0af564 100644
--- a/liblua/lopcodes.c
+++ b/liblua/lopcodes.c
@@ -14,94 +14,94 @@
 
 /* ORDER OP */
 
-LUAI_DDEF const char *const luaP_opnames[NUM_OPCODES+1] = {
-  "MOVE",
-  "LOADK",
-  "LOADKX",
-  "LOADBOOL",
-  "LOADNIL",
-  "GETUPVAL",
-  "GETTABUP",
-  "GETTABLE",
-  "SETTABUP",
-  "SETUPVAL",
-  "SETTABLE",
-  "NEWTABLE",
-  "SELF",
-  "ADD",
-  "SUB",
-  "MUL",
-  "DIV",
-  "MOD",
-  "POW",
-  "UNM",
-  "NOT",
-  "LEN",
-  "CONCAT",
-  "JMP",
-  "EQ",
-  "LT",
-  "LE",
-  "TEST",
-  "TESTSET",
-  "CALL",
-  "TAILCALL",
-  "RETURN",
-  "FORLOOP",
-  "FORPREP",
-  "TFORCALL",
-  "TFORLOOP",
-  "SETLIST",
-  "CLOSURE",
-  "VARARG",
-  "EXTRAARG",
-  NULL
+LUAI_DDEF const char *const luaP_opnames[NUM_OPCODES + 1] = {
+    "MOVE",
+    "LOADK",
+    "LOADKX",
+    "LOADBOOL",
+    "LOADNIL",
+    "GETUPVAL",
+    "GETTABUP",
+    "GETTABLE",
+    "SETTABUP",
+    "SETUPVAL",
+    "SETTABLE",
+    "NEWTABLE",
+    "SELF",
+    "ADD",
+    "SUB",
+    "MUL",
+    "DIV",
+    "MOD",
+    "POW",
+    "UNM",
+    "NOT",
+    "LEN",
+    "CONCAT",
+    "JMP",
+    "EQ",
+    "LT",
+    "LE",
+    "TEST",
+    "TESTSET",
+    "CALL",
+    "TAILCALL",
+    "RETURN",
+    "FORLOOP",
+    "FORPREP",
+    "TFORCALL",
+    "TFORLOOP",
+    "SETLIST",
+    "CLOSURE",
+    "VARARG",
+    "EXTRAARG",
+    NULL
 };
 
 
 #define opmode(t,a,b,c,m) (((t)<<7) | ((a)<<6) | ((b)<<4) | ((c)<<2) | (m))
 
 LUAI_DDEF const lu_byte luaP_opmodes[NUM_OPCODES] = {
-/*       T  A    B       C     mode     opcode */
-  opmode(0, 1, OpArgR, OpArgN, iABC)    /* OP_MOVE */
- ,opmode(0, 1, OpArgK, OpArgN, iABx)    /* OP_LOADK */
- ,opmode(0, 1, OpArgN, OpArgN, iABx)    /* OP_LOADKX */
- ,opmode(0, 1, OpArgU, OpArgU, iABC)    /* OP_LOADBOOL */
- ,opmode(0, 1, OpArgU, OpArgN, iABC)    /* OP_LOADNIL */
- ,opmode(0, 1, OpArgU, OpArgN, iABC)    /* OP_GETUPVAL */
- ,opmode(0, 1, OpArgU, OpArgK, iABC)    /* OP_GETTABUP */
- ,opmode(0, 1, OpArgR, OpArgK, iABC)    /* OP_GETTABLE */
- ,opmode(0, 0, OpArgK, OpArgK, iABC)    /* OP_SETTABUP */
- ,opmode(0, 0, OpArgU, OpArgN, iABC)    /* OP_SETUPVAL */
- ,opmode(0, 0, OpArgK, OpArgK, iABC)    /* OP_SETTABLE */
- ,opmode(0, 1, OpArgU, OpArgU, iABC)    /* OP_NEWTABLE */
- ,opmode(0, 1, OpArgR, OpArgK, iABC)    /* OP_SELF */
- ,opmode(0, 1, OpArgK, OpArgK, iABC)    /* OP_ADD */
- ,opmode(0, 1, OpArgK, OpArgK, iABC)    /* OP_SUB */
- ,opmode(0, 1, OpArgK, OpArgK, iABC)    /* OP_MUL */
- ,opmode(0, 1, OpArgK, OpArgK, iABC)    /* OP_DIV */
- ,opmode(0, 1, OpArgK, OpArgK, iABC)    /* OP_MOD */
- ,opmode(0, 1, OpArgK, OpArgK, iABC)    /* OP_POW */
- ,opmode(0, 1, OpArgR, OpArgN, iABC)    /* OP_UNM */
- ,opmode(0, 1, OpArgR, OpArgN, iABC)    /* OP_NOT */
- ,opmode(0, 1, OpArgR, OpArgN, iABC)    /* OP_LEN */
- ,opmode(0, 1, OpArgR, OpArgR, iABC)    /* OP_CONCAT */
- ,opmode(0, 0, OpArgR, OpArgN, iAsBx)   /* OP_JMP */
- ,opmode(1, 0, OpArgK, OpArgK, iABC)    /* OP_EQ */
- ,opmode(1, 0, OpArgK, OpArgK, iABC)    /* OP_LT */
- ,opmode(1, 0, OpArgK, OpArgK, iABC)    /* OP_LE */
- ,opmode(1, 0, OpArgN, OpArgU, iABC)    /* OP_TEST */
- ,opmode(1, 1, OpArgR, OpArgU, iABC)    /* OP_TESTSET */
- ,opmode(0, 1, OpArgU, OpArgU, iABC)    /* OP_CALL */
- ,opmode(0, 1, OpArgU, OpArgU, iABC)    /* OP_TAILCALL */
- ,opmode(0, 0, OpArgU, OpArgN, iABC)    /* OP_RETURN */
- ,opmode(0, 1, OpArgR, OpArgN, iAsBx)   /* OP_FORLOOP */
- ,opmode(0, 1, OpArgR, OpArgN, iAsBx)   /* OP_FORPREP */
- ,opmode(0, 0, OpArgN, OpArgU, iABC)    /* OP_TFORCALL */
- ,opmode(0, 1, OpArgR, OpArgN, iAsBx)   /* OP_TFORLOOP */
- ,opmode(0, 0, OpArgU, OpArgU, iABC)    /* OP_SETLIST */
- ,opmode(0, 1, OpArgU, OpArgN, iABx)    /* OP_CLOSURE */
- ,opmode(0, 1, OpArgU, OpArgN, iABC)    /* OP_VARARG */
- ,opmode(0, 0, OpArgU, OpArgU, iAx)     /* OP_EXTRAARG */
+    /*       T  A    B       C     mode     opcode */
+    opmode(0, 1, OpArgR, OpArgN, iABC)    /* OP_MOVE */
+    , opmode(0, 1, OpArgK, OpArgN, iABx)   /* OP_LOADK */
+    , opmode(0, 1, OpArgN, OpArgN, iABx)   /* OP_LOADKX */
+    , opmode(0, 1, OpArgU, OpArgU, iABC)   /* OP_LOADBOOL */
+    , opmode(0, 1, OpArgU, OpArgN, iABC)   /* OP_LOADNIL */
+    , opmode(0, 1, OpArgU, OpArgN, iABC)   /* OP_GETUPVAL */
+    , opmode(0, 1, OpArgU, OpArgK, iABC)   /* OP_GETTABUP */
+    , opmode(0, 1, OpArgR, OpArgK, iABC)   /* OP_GETTABLE */
+    , opmode(0, 0, OpArgK, OpArgK, iABC)   /* OP_SETTABUP */
+    , opmode(0, 0, OpArgU, OpArgN, iABC)   /* OP_SETUPVAL */
+    , opmode(0, 0, OpArgK, OpArgK, iABC)   /* OP_SETTABLE */
+    , opmode(0, 1, OpArgU, OpArgU, iABC)   /* OP_NEWTABLE */
+    , opmode(0, 1, OpArgR, OpArgK, iABC)   /* OP_SELF */
+    , opmode(0, 1, OpArgK, OpArgK, iABC)   /* OP_ADD */
+    , opmode(0, 1, OpArgK, OpArgK, iABC)   /* OP_SUB */
+    , opmode(0, 1, OpArgK, OpArgK, iABC)   /* OP_MUL */
+    , opmode(0, 1, OpArgK, OpArgK, iABC)   /* OP_DIV */
+    , opmode(0, 1, OpArgK, OpArgK, iABC)   /* OP_MOD */
+    , opmode(0, 1, OpArgK, OpArgK, iABC)   /* OP_POW */
+    , opmode(0, 1, OpArgR, OpArgN, iABC)   /* OP_UNM */
+    , opmode(0, 1, OpArgR, OpArgN, iABC)   /* OP_NOT */
+    , opmode(0, 1, OpArgR, OpArgN, iABC)   /* OP_LEN */
+    , opmode(0, 1, OpArgR, OpArgR, iABC)   /* OP_CONCAT */
+    , opmode(0, 0, OpArgR, OpArgN, iAsBx)  /* OP_JMP */
+    , opmode(1, 0, OpArgK, OpArgK, iABC)   /* OP_EQ */
+    , opmode(1, 0, OpArgK, OpArgK, iABC)   /* OP_LT */
+    , opmode(1, 0, OpArgK, OpArgK, iABC)   /* OP_LE */
+    , opmode(1, 0, OpArgN, OpArgU, iABC)   /* OP_TEST */
+    , opmode(1, 1, OpArgR, OpArgU, iABC)   /* OP_TESTSET */
+    , opmode(0, 1, OpArgU, OpArgU, iABC)   /* OP_CALL */
+    , opmode(0, 1, OpArgU, OpArgU, iABC)   /* OP_TAILCALL */
+    , opmode(0, 0, OpArgU, OpArgN, iABC)   /* OP_RETURN */
+    , opmode(0, 1, OpArgR, OpArgN, iAsBx)  /* OP_FORLOOP */
+    , opmode(0, 1, OpArgR, OpArgN, iAsBx)  /* OP_FORPREP */
+    , opmode(0, 0, OpArgN, OpArgU, iABC)   /* OP_TFORCALL */
+    , opmode(0, 1, OpArgR, OpArgN, iAsBx)  /* OP_TFORLOOP */
+    , opmode(0, 0, OpArgU, OpArgU, iABC)   /* OP_SETLIST */
+    , opmode(0, 1, OpArgU, OpArgN, iABx)   /* OP_CLOSURE */
+    , opmode(0, 1, OpArgU, OpArgN, iABC)   /* OP_VARARG */
+    , opmode(0, 0, OpArgU, OpArgU, iAx)    /* OP_EXTRAARG */
 };
 
diff --git a/liblua/lopcodes.h b/liblua/lopcodes.h
index 3c8948440..e8d8d019b 100644
--- a/liblua/lopcodes.h
+++ b/liblua/lopcodes.h
@@ -88,11 +88,11 @@ enum OpMode {iABC, iABx, iAsBx, iAx};  /* basic instruction format */
 
 #define GET_OPCODE(i) (cast(OpCode, ((i)>>POS_OP) & MASK1(SIZE_OP,0)))
 #define SET_OPCODE(i,o) ((i) = (((i)&MASK0(SIZE_OP,POS_OP)) | \
-        ((cast(Instruction, o)<<POS_OP)&MASK1(SIZE_OP,POS_OP))))
+                                ((cast(Instruction, o)<<POS_OP)&MASK1(SIZE_OP,POS_OP))))
 
 #define getarg(i,pos,size) (cast(int, ((i)>>pos) & MASK1(size,0)))
 #define setarg(i,v,pos,size) ((i) = (((i)&MASK0(size,pos)) | \
-                ((cast(Instruction, v)<<pos)&MASK1(size,pos))))
+                                     ((cast(Instruction, v)<<pos)&MASK1(size,pos))))
 
 #define GETARG_A(i)     getarg(i, POS_A, SIZE_A)
 #define SETARG_A(i,v)   setarg(i, v, POS_A, SIZE_A)
@@ -114,16 +114,16 @@ enum OpMode {iABC, iABx, iAsBx, iAx};  /* basic instruction format */
 
 
 #define CREATE_ABC(o,a,b,c)    ((cast(Instruction, o)<<POS_OP) \
-            | (cast(Instruction, a)<<POS_A) \
-            | (cast(Instruction, b)<<POS_B) \
-            | (cast(Instruction, c)<<POS_C))
+                                | (cast(Instruction, a)<<POS_A) \
+                                | (cast(Instruction, b)<<POS_B) \
+                                | (cast(Instruction, c)<<POS_C))
 
 #define CREATE_ABx(o,a,bc)     ((cast(Instruction, o)<<POS_OP) \
-            | (cast(Instruction, a)<<POS_A) \
-            | (cast(Instruction, bc)<<POS_Bx))
+                                | (cast(Instruction, a)<<POS_A) \
+                                | (cast(Instruction, bc)<<POS_Bx))
 
 #define CREATE_Ax(o,a)         ((cast(Instruction, o)<<POS_OP) \
-            | (cast(Instruction, a)<<POS_Ax))
+                                | (cast(Instruction, a)<<POS_Ax))
 
 
 /*
@@ -163,65 +163,65 @@ enum OpMode {iABC, iABx, iAsBx, iAx};  /* basic instruction format */
 */
 
 typedef enum {
-/*----------------------------------------------------------------------
-name            args    description
-------------------------------------------------------------------------*/
-OP_MOVE,/*      A B     R(A) := R(B)                                    */
-OP_LOADK,/*     A Bx    R(A) := Kst(Bx)                                 */
-OP_LOADKX,/*    A       R(A) := Kst(extra arg)                          */
-OP_LOADBOOL,/*  A B C   R(A) := (Bool)B; if (C) pc++                    */
-OP_LOADNIL,/*   A B     R(A), R(A+1), ..., R(A+B) := nil                */
-OP_GETUPVAL,/*  A B     R(A) := UpValue[B]                              */
+    /*----------------------------------------------------------------------
+    name            args    description
+    ------------------------------------------------------------------------*/
+    OP_MOVE,/*      A B     R(A) := R(B)                                    */
+    OP_LOADK,/*     A Bx    R(A) := Kst(Bx)                                 */
+    OP_LOADKX,/*    A       R(A) := Kst(extra arg)                          */
+    OP_LOADBOOL,/*  A B C   R(A) := (Bool)B; if (C) pc++                    */
+    OP_LOADNIL,/*   A B     R(A), R(A+1), ..., R(A+B) := nil                */
+    OP_GETUPVAL,/*  A B     R(A) := UpValue[B]                              */
 
-OP_GETTABUP,/*  A B C   R(A) := UpValue[B][RK(C)]                       */
-OP_GETTABLE,/*  A B C   R(A) := R(B)[RK(C)]                             */
+    OP_GETTABUP,/*  A B C   R(A) := UpValue[B][RK(C)]                       */
+    OP_GETTABLE,/*  A B C   R(A) := R(B)[RK(C)]                             */
 
-OP_SETTABUP,/*  A B C   UpValue[A][RK(B)] := RK(C)                      */
-OP_SETUPVAL,/*  A B     UpValue[B] := R(A)                              */
-OP_SETTABLE,/*  A B C   R(A)[RK(B)] := RK(C)                            */
+    OP_SETTABUP,/*  A B C   UpValue[A][RK(B)] := RK(C)                      */
+    OP_SETUPVAL,/*  A B     UpValue[B] := R(A)                              */
+    OP_SETTABLE,/*  A B C   R(A)[RK(B)] := RK(C)                            */
 
-OP_NEWTABLE,/*  A B C   R(A) := {} (size = B,C)                         */
+    OP_NEWTABLE,/*  A B C   R(A) := {} (size = B,C)                         */
 
-OP_SELF,/*      A B C   R(A+1) := R(B); R(A) := R(B)[RK(C)]             */
+    OP_SELF,/*      A B C   R(A+1) := R(B); R(A) := R(B)[RK(C)]             */
 
-OP_ADD,/*       A B C   R(A) := RK(B) + RK(C)                           */
-OP_SUB,/*       A B C   R(A) := RK(B) - RK(C)                           */
-OP_MUL,/*       A B C   R(A) := RK(B) * RK(C)                           */
-OP_DIV,/*       A B C   R(A) := RK(B) / RK(C)                           */
-OP_MOD,/*       A B C   R(A) := RK(B) % RK(C)                           */
-OP_POW,/*       A B C   R(A) := RK(B) ^ RK(C)                           */
-OP_UNM,/*       A B     R(A) := -R(B)                                   */
-OP_NOT,/*       A B     R(A) := not R(B)                                */
-OP_LEN,/*       A B     R(A) := length of R(B)                          */
+    OP_ADD,/*       A B C   R(A) := RK(B) + RK(C)                           */
+    OP_SUB,/*       A B C   R(A) := RK(B) - RK(C)                           */
+    OP_MUL,/*       A B C   R(A) := RK(B) * RK(C)                           */
+    OP_DIV,/*       A B C   R(A) := RK(B) / RK(C)                           */
+    OP_MOD,/*       A B C   R(A) := RK(B) % RK(C)                           */
+    OP_POW,/*       A B C   R(A) := RK(B) ^ RK(C)                           */
+    OP_UNM,/*       A B     R(A) := -R(B)                                   */
+    OP_NOT,/*       A B     R(A) := not R(B)                                */
+    OP_LEN,/*       A B     R(A) := length of R(B)                          */
 
-OP_CONCAT,/*    A B C   R(A) := R(B).. ... ..R(C)                       */
+    OP_CONCAT,/*    A B C   R(A) := R(B).. ... ..R(C)                       */
 
-OP_JMP,/*       A sBx   pc+=sBx; if (A) close all upvalues >= R(A) + 1  */
-OP_EQ,/*        A B C   if ((RK(B) == RK(C)) ~= A) then pc++            */
-OP_LT,/*        A B C   if ((RK(B) <  RK(C)) ~= A) then pc++            */
-OP_LE,/*        A B C   if ((RK(B) <= RK(C)) ~= A) then pc++            */
+    OP_JMP,/*       A sBx   pc+=sBx; if (A) close all upvalues >= R(A) + 1  */
+    OP_EQ,/*        A B C   if ((RK(B) == RK(C)) ~= A) then pc++            */
+    OP_LT,/*        A B C   if ((RK(B) <  RK(C)) ~= A) then pc++            */
+    OP_LE,/*        A B C   if ((RK(B) <= RK(C)) ~= A) then pc++            */
 
-OP_TEST,/*      A C     if not (R(A) <=> C) then pc++                   */
-OP_TESTSET,/*   A B C   if (R(B) <=> C) then R(A) := R(B) else pc++     */
+    OP_TEST,/*      A C     if not (R(A) <=> C) then pc++                   */
+    OP_TESTSET,/*   A B C   if (R(B) <=> C) then R(A) := R(B) else pc++     */
 
-OP_CALL,/*      A B C   R(A), ... ,R(A+C-2) := R(A)(R(A+1), ... ,R(A+B-1)) */
-OP_TAILCALL,/*  A B C   return R(A)(R(A+1), ... ,R(A+B-1))              */
-OP_RETURN,/*    A B     return R(A), ... ,R(A+B-2)        (see note)    */
+    OP_CALL,/*      A B C   R(A), ... ,R(A+C-2) := R(A)(R(A+1), ... ,R(A+B-1)) */
+    OP_TAILCALL,/*  A B C   return R(A)(R(A+1), ... ,R(A+B-1))              */
+    OP_RETURN,/*    A B     return R(A), ... ,R(A+B-2)        (see note)    */
 
-OP_FORLOOP,/*   A sBx   R(A)+=R(A+2);
+    OP_FORLOOP,/*   A sBx   R(A)+=R(A+2);
             if R(A) <?= R(A+1) then { pc+=sBx; R(A+3)=R(A) }*/
-OP_FORPREP,/*   A sBx   R(A)-=R(A+2); pc+=sBx                           */
+    OP_FORPREP,/*   A sBx   R(A)-=R(A+2); pc+=sBx                           */
 
-OP_TFORCALL,/*  A C     R(A+3), ... ,R(A+2+C) := R(A)(R(A+1), R(A+2));  */
-OP_TFORLOOP,/*  A sBx   if R(A+1) ~= nil then { R(A)=R(A+1); pc += sBx }*/
+    OP_TFORCALL,/*  A C     R(A+3), ... ,R(A+2+C) := R(A)(R(A+1), R(A+2));  */
+    OP_TFORLOOP,/*  A sBx   if R(A+1) ~= nil then { R(A)=R(A+1); pc += sBx }*/
 
-OP_SETLIST,/*   A B C   R(A)[(C-1)*FPF+i] := R(A+i), 1 <= i <= B        */
+    OP_SETLIST,/*   A B C   R(A)[(C-1)*FPF+i] := R(A+i), 1 <= i <= B        */
 
-OP_CLOSURE,/*   A Bx    R(A) := closure(KPROTO[Bx])                      */
+    OP_CLOSURE,/*   A Bx    R(A) := closure(KPROTO[Bx])                      */
 
-OP_VARARG,/*    A B     R(A), R(A+1), ..., R(A+B-2) = vararg            */
+    OP_VARARG,/*    A B     R(A), R(A+1), ..., R(A+B-2) = vararg            */
 
-OP_EXTRAARG/*   Ax      extra (larger) argument for previous opcode     */
+    OP_EXTRAARG/*   Ax      extra (larger) argument for previous opcode     */
 } OpCode;
 
 
@@ -263,10 +263,10 @@ OP_EXTRAARG/*   Ax      extra (larger) argument for previous opcode     */
 */
 
 enum OpArgMask {
-  OpArgN,  /* argument is not used */
-  OpArgU,  /* argument is used */
-  OpArgR,  /* argument is a register or a jump offset */
-  OpArgK   /* argument is a constant or register/constant */
+    OpArgN,  /* argument is not used */
+    OpArgU,  /* argument is used */
+    OpArgR,  /* argument is a register or a jump offset */
+    OpArgK   /* argument is a constant or register/constant */
 };
 
 LUAI_DDEC const lu_byte luaP_opmodes[NUM_OPCODES];
@@ -278,7 +278,7 @@ LUAI_DDEC const lu_byte luaP_opmodes[NUM_OPCODES];
 #define testTMode(m) (luaP_opmodes[m] & (1 << 7))
 
 
-LUAI_DDEC const char *const luaP_opnames[NUM_OPCODES+1];  /* opcode names */
+LUAI_DDEC const char *const luaP_opnames[NUM_OPCODES + 1]; /* opcode names */
 
 
 /* number of list items to accumulate before a SETLIST instruction */
diff --git a/liblua/loslib.c b/liblua/loslib.c
index 2b7a8b5f6..cbffd0bb8 100644
--- a/liblua/loslib.c
+++ b/liblua/loslib.c
@@ -30,8 +30,8 @@
 #else
 #define LUA_STRFTIMEOPTIONS \
     { "aAbBcCdDeFgGhHIjmMnprRStTuUVwWxXyYzZ%", "" \
-      "", "E", "cCxXyY",  \
-      "O", "deHImMSuUVwWy" }
+        "", "E", "cCxXyY",  \
+        "O", "deHImMSuUVwWy" }
 #endif
 
 #endif
@@ -77,51 +77,57 @@
 
 
 
-static int os_execute (lua_State *L) {
-  const char *cmd = luaL_optstring(L, 1, NULL);
-  int stat = system(cmd);
-  if (cmd != NULL)
-    return luaL_execresult(L, stat);
-  else {
-    lua_pushboolean(L, stat);  /* true if there is a shell */
+static int os_execute(lua_State *L)
+{
+    const char *cmd = luaL_optstring(L, 1, NULL);
+    int stat = system(cmd);
+    if (cmd != NULL)
+        return luaL_execresult(L, stat);
+    else {
+        lua_pushboolean(L, stat);  /* true if there is a shell */
+        return 1;
+    }
+}
+
+
+static int os_remove(lua_State *L)
+{
+    const char *filename = luaL_checkstring(L, 1);
+    return luaL_fileresult(L, remove(filename) == 0, filename);
+}
+
+
+static int os_rename(lua_State *L)
+{
+    const char *fromname = luaL_checkstring(L, 1);
+    const char *toname = luaL_checkstring(L, 2);
+    return luaL_fileresult(L, rename(fromname, toname) == 0, NULL);
+}
+
+
+static int os_tmpname(lua_State *L)
+{
+    char buff[LUA_TMPNAMBUFSIZE];
+    int err;
+    lua_tmpnam(buff, err);
+    if (err)
+        return luaL_error(L, "unable to generate a unique filename");
+    lua_pushstring(L, buff);
     return 1;
-  }
 }
 
 
-static int os_remove (lua_State *L) {
-  const char *filename = luaL_checkstring(L, 1);
-  return luaL_fileresult(L, remove(filename) == 0, filename);
+static int os_getenv(lua_State *L)
+{
+    lua_pushstring(L, getenv(luaL_checkstring(L, 1)));  /* if NULL push nil */
+    return 1;
 }
 
 
-static int os_rename (lua_State *L) {
-  const char *fromname = luaL_checkstring(L, 1);
-  const char *toname = luaL_checkstring(L, 2);
-  return luaL_fileresult(L, rename(fromname, toname) == 0, NULL);
-}
-
-
-static int os_tmpname (lua_State *L) {
-  char buff[LUA_TMPNAMBUFSIZE];
-  int err;
-  lua_tmpnam(buff, err);
-  if (err)
-    return luaL_error(L, "unable to generate a unique filename");
-  lua_pushstring(L, buff);
-  return 1;
-}
-
-
-static int os_getenv (lua_State *L) {
-  lua_pushstring(L, getenv(luaL_checkstring(L, 1)));  /* if NULL push nil */
-  return 1;
-}
-
-
-static int os_clock (lua_State *L) {
-  lua_pushnumber(L, ((lua_Number)clock())/(lua_Number)CLOCKS_PER_SEC);
-  return 1;
+static int os_clock(lua_State *L)
+{
+    lua_pushnumber(L, ((lua_Number)clock()) / (lua_Number)CLOCKS_PER_SEC);
+    return 1;
 }
 
 
@@ -133,191 +139,201 @@ static int os_clock (lua_State *L) {
 ** =======================================================
 */
 
-static void setfield (lua_State *L, const char *key, int value) {
-  lua_pushinteger(L, value);
-  lua_setfield(L, -2, key);
+static void setfield(lua_State *L, const char *key, int value)
+{
+    lua_pushinteger(L, value);
+    lua_setfield(L, -2, key);
 }
 
-static void setboolfield (lua_State *L, const char *key, int value) {
-  if (value < 0)  /* undefined? */
-    return;  /* does not set field */
-  lua_pushboolean(L, value);
-  lua_setfield(L, -2, key);
+static void setboolfield(lua_State *L, const char *key, int value)
+{
+    if (value < 0)  /* undefined? */
+        return;  /* does not set field */
+    lua_pushboolean(L, value);
+    lua_setfield(L, -2, key);
 }
 
-static int getboolfield (lua_State *L, const char *key) {
-  int res;
-  lua_getfield(L, -1, key);
-  res = lua_isnil(L, -1) ? -1 : lua_toboolean(L, -1);
-  lua_pop(L, 1);
-  return res;
+static int getboolfield(lua_State *L, const char *key)
+{
+    int res;
+    lua_getfield(L, -1, key);
+    res = lua_isnil(L, -1) ? -1 : lua_toboolean(L, -1);
+    lua_pop(L, 1);
+    return res;
 }
 
 
-static int getfield (lua_State *L, const char *key, int d) {
-  int res, isnum;
-  lua_getfield(L, -1, key);
-  res = (int)lua_tointegerx(L, -1, &isnum);
-  if (!isnum) {
-    if (d < 0)
-      return luaL_error(L, "field " LUA_QS " missing in date table", key);
-    res = d;
-  }
-  lua_pop(L, 1);
-  return res;
-}
-
-
-static const char *checkoption (lua_State *L, const char *conv, char *buff) {
-  static const char *const options[] = LUA_STRFTIMEOPTIONS;
-  unsigned int i;
-  for (i = 0; i < sizeof(options)/sizeof(options[0]); i += 2) {
-    if (*conv != '\0' && strchr(options[i], *conv) != NULL) {
-      buff[1] = *conv;
-      if (*options[i + 1] == '\0') {  /* one-char conversion specifier? */
-        buff[2] = '\0';  /* end buffer */
-        return conv + 1;
-      }
-      else if (*(conv + 1) != '\0' &&
-               strchr(options[i + 1], *(conv + 1)) != NULL) {
-        buff[2] = *(conv + 1);  /* valid two-char conversion specifier */
-        buff[3] = '\0';  /* end buffer */
-        return conv + 2;
-      }
+static int getfield(lua_State *L, const char *key, int d)
+{
+    int res, isnum;
+    lua_getfield(L, -1, key);
+    res = (int)lua_tointegerx(L, -1, &isnum);
+    if (!isnum) {
+        if (d < 0)
+            return luaL_error(L, "field " LUA_QS " missing in date table", key);
+        res = d;
     }
-  }
-  luaL_argerror(L, 1,
-    lua_pushfstring(L, "invalid conversion specifier '%%%s'", conv));
-  return conv;  /* to avoid warnings */
+    lua_pop(L, 1);
+    return res;
 }
 
 
-static int os_date (lua_State *L) {
-  const char *s = luaL_optstring(L, 1, "%c");
-  time_t t = luaL_opt(L, (time_t)luaL_checknumber, 2, time(NULL));
-  struct tm tmr, *stm;
-  if (*s == '!') {  /* UTC? */
-    stm = l_gmtime(&t, &tmr);
-    s++;  /* skip `!' */
-  }
-  else
-    stm = l_localtime(&t, &tmr);
-  if (stm == NULL)  /* invalid date? */
-    lua_pushnil(L);
-  else if (strcmp(s, "*t") == 0) {
-    lua_createtable(L, 0, 9);  /* 9 = number of fields */
-    setfield(L, "sec", stm->tm_sec);
-    setfield(L, "min", stm->tm_min);
-    setfield(L, "hour", stm->tm_hour);
-    setfield(L, "day", stm->tm_mday);
-    setfield(L, "month", stm->tm_mon+1);
-    setfield(L, "year", stm->tm_year+1900);
-    setfield(L, "wday", stm->tm_wday+1);
-    setfield(L, "yday", stm->tm_yday+1);
-    setboolfield(L, "isdst", stm->tm_isdst);
-  }
-  else {
-    char cc[4];
-    luaL_Buffer b;
-    cc[0] = '%';
-    luaL_buffinit(L, &b);
-    while (*s) {
-      if (*s != '%')  /* no conversion specifier? */
-        luaL_addchar(&b, *s++);
-      else {
-        size_t reslen;
-        char buff[200];  /* should be big enough for any conversion result */
-        s = checkoption(L, s + 1, cc);
-        reslen = strftime(buff, sizeof(buff), cc, stm);
-        luaL_addlstring(&b, buff, reslen);
-      }
+static const char *checkoption(lua_State *L, const char *conv, char *buff)
+{
+    static const char *const options[] = LUA_STRFTIMEOPTIONS;
+    unsigned int i;
+    for (i = 0; i < sizeof(options) / sizeof(options[0]); i += 2) {
+        if (*conv != '\0' && strchr(options[i], *conv) != NULL) {
+            buff[1] = *conv;
+            if (*options[i + 1] == '\0') {  /* one-char conversion specifier? */
+                buff[2] = '\0';  /* end buffer */
+                return conv + 1;
+            } else if (*(conv + 1) != '\0' &&
+                       strchr(options[i + 1], *(conv + 1)) != NULL) {
+                buff[2] = *(conv + 1);  /* valid two-char conversion specifier */
+                buff[3] = '\0';  /* end buffer */
+                return conv + 2;
+            }
+        }
     }
-    luaL_pushresult(&b);
-  }
-  return 1;
+    luaL_argerror(L, 1,
+                  lua_pushfstring(L, "invalid conversion specifier '%%%s'", conv));
+    return conv;  /* to avoid warnings */
 }
 
 
-static int os_time (lua_State *L) {
-  time_t t;
-  if (lua_isnoneornil(L, 1))  /* called without args? */
-    t = time(NULL);  /* get current time */
-  else {
-    struct tm ts;
-    luaL_checktype(L, 1, LUA_TTABLE);
-    lua_settop(L, 1);  /* make sure table is at the top */
-    ts.tm_sec = getfield(L, "sec", 0);
-    ts.tm_min = getfield(L, "min", 0);
-    ts.tm_hour = getfield(L, "hour", 12);
-    ts.tm_mday = getfield(L, "day", -1);
-    ts.tm_mon = getfield(L, "month", -1) - 1;
-    ts.tm_year = getfield(L, "year", -1) - 1900;
-    ts.tm_isdst = getboolfield(L, "isdst");
-    t = mktime(&ts);
-  }
-  if (t == (time_t)(-1))
-    lua_pushnil(L);
-  else
-    lua_pushnumber(L, (lua_Number)t);
-  return 1;
+static int os_date(lua_State *L)
+{
+    const char *s = luaL_optstring(L, 1, "%c");
+    time_t t = luaL_opt(L, (time_t)luaL_checknumber, 2, time(NULL));
+    struct tm tmr, *stm;
+    if (*s == '!') {  /* UTC? */
+        stm = l_gmtime(&t, &tmr);
+        s++;  /* skip `!' */
+    } else
+        stm = l_localtime(&t, &tmr);
+    if (stm == NULL)  /* invalid date? */
+        lua_pushnil(L);
+    else if (strcmp(s, "*t") == 0) {
+        lua_createtable(L, 0, 9);  /* 9 = number of fields */
+        setfield(L, "sec", stm->tm_sec);
+        setfield(L, "min", stm->tm_min);
+        setfield(L, "hour", stm->tm_hour);
+        setfield(L, "day", stm->tm_mday);
+        setfield(L, "month", stm->tm_mon + 1);
+        setfield(L, "year", stm->tm_year + 1900);
+        setfield(L, "wday", stm->tm_wday + 1);
+        setfield(L, "yday", stm->tm_yday + 1);
+        setboolfield(L, "isdst", stm->tm_isdst);
+    } else {
+        char cc[4];
+        luaL_Buffer b;
+        cc[0] = '%';
+        luaL_buffinit(L, &b);
+        while (*s) {
+            if (*s != '%')  /* no conversion specifier? */
+                luaL_addchar(&b, *s++);
+            else {
+                size_t reslen;
+                char buff[200];  /* should be big enough for any conversion result */
+                s = checkoption(L, s + 1, cc);
+                reslen = strftime(buff, sizeof(buff), cc, stm);
+                luaL_addlstring(&b, buff, reslen);
+            }
+        }
+        luaL_pushresult(&b);
+    }
+    return 1;
 }
 
 
-static int os_difftime (lua_State *L) {
-  lua_pushnumber(L, difftime((time_t)(luaL_checknumber(L, 1)),
-                             (time_t)(luaL_optnumber(L, 2, 0))));
-  return 1;
+static int os_time(lua_State *L)
+{
+    time_t t;
+    if (lua_isnoneornil(L, 1))  /* called without args? */
+        t = time(NULL);  /* get current time */
+    else {
+        struct tm ts;
+        luaL_checktype(L, 1, LUA_TTABLE);
+        lua_settop(L, 1);  /* make sure table is at the top */
+        ts.tm_sec = getfield(L, "sec", 0);
+        ts.tm_min = getfield(L, "min", 0);
+        ts.tm_hour = getfield(L, "hour", 12);
+        ts.tm_mday = getfield(L, "day", -1);
+        ts.tm_mon = getfield(L, "month", -1) - 1;
+        ts.tm_year = getfield(L, "year", -1) - 1900;
+        ts.tm_isdst = getboolfield(L, "isdst");
+        t = mktime(&ts);
+    }
+    if (t == (time_t)(-1))
+        lua_pushnil(L);
+    else
+        lua_pushnumber(L, (lua_Number)t);
+    return 1;
+}
+
+
+static int os_difftime(lua_State *L)
+{
+    lua_pushnumber(L, difftime((time_t)(luaL_checknumber(L, 1)),
+                               (time_t)(luaL_optnumber(L, 2, 0))));
+    return 1;
 }
 
 /* }====================================================== */
 
 
-static int os_setlocale (lua_State *L) {
-  static const int cat[] = {LC_ALL, LC_COLLATE, LC_CTYPE, LC_MONETARY,
-                      LC_NUMERIC, LC_TIME};
-  static const char *const catnames[] = {"all", "collate", "ctype", "monetary",
-     "numeric", "time", NULL};
-  const char *l = luaL_optstring(L, 1, NULL);
-  int op = luaL_checkoption(L, 2, "all", catnames);
-  lua_pushstring(L, setlocale(cat[op], l));
-  return 1;
+static int os_setlocale(lua_State *L)
+{
+    static const int cat[] = {LC_ALL, LC_COLLATE, LC_CTYPE, LC_MONETARY,
+                              LC_NUMERIC, LC_TIME
+                             };
+    static const char *const catnames[] = {"all", "collate", "ctype", "monetary",
+                                           "numeric", "time", NULL
+                                          };
+    const char *l = luaL_optstring(L, 1, NULL);
+    int op = luaL_checkoption(L, 2, "all", catnames);
+    lua_pushstring(L, setlocale(cat[op], l));
+    return 1;
 }
 
 
-static int os_exit (lua_State *L) {
-  int status;
-  if (lua_isboolean(L, 1))
-    status = (lua_toboolean(L, 1) ? EXIT_SUCCESS : EXIT_FAILURE);
-  else
-    status = luaL_optint(L, 1, EXIT_SUCCESS);
-  if (lua_toboolean(L, 2))
-    lua_close(L);
-  if (L) exit(status);  /* 'if' to avoid warnings for unreachable 'return' */
-  return 0;
+static int os_exit(lua_State *L)
+{
+    int status;
+    if (lua_isboolean(L, 1))
+        status = (lua_toboolean(L, 1) ? EXIT_SUCCESS : EXIT_FAILURE);
+    else
+        status = luaL_optint(L, 1, EXIT_SUCCESS);
+    if (lua_toboolean(L, 2))
+        lua_close(L);
+    if (L) exit(status);  /* 'if' to avoid warnings for unreachable 'return' */
+    return 0;
 }
 
 
 static const luaL_Reg syslib[] = {
-  {"clock",     os_clock},
-  {"date",      os_date},
-  {"difftime",  os_difftime},
-  {"execute",   os_execute},
-  {"exit",      os_exit},
-  {"getenv",    os_getenv},
-  {"remove",    os_remove},
-  {"rename",    os_rename},
-  {"setlocale", os_setlocale},
-  {"time",      os_time},
-  {"tmpname",   os_tmpname},
-  {NULL, NULL}
+    {"clock",     os_clock},
+    {"date",      os_date},
+    {"difftime",  os_difftime},
+    {"execute",   os_execute},
+    {"exit",      os_exit},
+    {"getenv",    os_getenv},
+    {"remove",    os_remove},
+    {"rename",    os_rename},
+    {"setlocale", os_setlocale},
+    {"time",      os_time},
+    {"tmpname",   os_tmpname},
+    {NULL, NULL}
 };
 
 /* }====================================================== */
 
 
 
-LUAMOD_API int luaopen_os (lua_State *L) {
-  luaL_newlib(L, syslib);
-  return 1;
+LUAMOD_API int luaopen_os(lua_State *L)
+{
+    luaL_newlib(L, syslib);
+    return 1;
 }
 
diff --git a/liblua/lparser.c b/liblua/lparser.c
index 453452298..c751fcbb7 100644
--- a/liblua/lparser.c
+++ b/liblua/lparser.c
@@ -40,12 +40,12 @@
 ** nodes for block list (list of active blocks)
 */
 typedef struct BlockCnt {
-  struct BlockCnt *previous;  /* chain */
-  short firstlabel;  /* index of first label in this block */
-  short firstgoto;  /* index of first pending goto in this block */
-  lu_byte nactvar;  /* # active locals outside the block */
-  lu_byte upval;  /* true if some variable in the block is an upvalue */
-  lu_byte isloop;  /* true if `block' is a loop */
+    struct BlockCnt *previous;  /* chain */
+    short firstlabel;  /* index of first label in this block */
+    short firstgoto;  /* index of first pending goto in this block */
+    lu_byte nactvar;  /* # active locals outside the block */
+    lu_byte upval;  /* true if some variable in the block is an upvalue */
+    lu_byte isloop;  /* true if `block' is a loop */
 } BlockCnt;
 
 
@@ -53,69 +53,76 @@ typedef struct BlockCnt {
 /*
 ** prototypes for recursive non-terminal functions
 */
-static void statement (LexState *ls);
-static void expr (LexState *ls, expdesc *v);
+static void statement(LexState *ls);
+static void expr(LexState *ls, expdesc *v);
 
 
-static void anchor_token (LexState *ls) {
-  /* last token from outer function must be EOS */
-  lua_assert(ls->fs != NULL || ls->t.token == TK_EOS);
-  if (ls->t.token == TK_NAME || ls->t.token == TK_STRING) {
-    TString *ts = ls->t.seminfo.ts;
-    luaX_newstring(ls, getstr(ts), ts->tsv.len);
-  }
+static void anchor_token(LexState *ls)
+{
+    /* last token from outer function must be EOS */
+    lua_assert(ls->fs != NULL || ls->t.token == TK_EOS);
+    if (ls->t.token == TK_NAME || ls->t.token == TK_STRING) {
+        TString *ts = ls->t.seminfo.ts;
+        luaX_newstring(ls, getstr(ts), ts->tsv.len);
+    }
 }
 
 
 /* semantic error */
-static l_noret semerror (LexState *ls, const char *msg) {
-  ls->t.token = 0;  /* remove 'near to' from final message */
-  luaX_syntaxerror(ls, msg);
+static l_noret semerror(LexState *ls, const char *msg)
+{
+    ls->t.token = 0;  /* remove 'near to' from final message */
+    luaX_syntaxerror(ls, msg);
 }
 
 
-static l_noret error_expected (LexState *ls, int token) {
-  luaX_syntaxerror(ls,
-      luaO_pushfstring(ls->L, "%s expected", luaX_token2str(ls, token)));
+static l_noret error_expected(LexState *ls, int token)
+{
+    luaX_syntaxerror(ls,
+                     luaO_pushfstring(ls->L, "%s expected", luaX_token2str(ls, token)));
 }
 
 
-static l_noret errorlimit (FuncState *fs, int limit, const char *what) {
-  lua_State *L = fs->ls->L;
-  const char *msg;
-  int line = fs->f->linedefined;
-  const char *where = (line == 0)
-                      ? "main function"
-                      : luaO_pushfstring(L, "function at line %d", line);
-  msg = luaO_pushfstring(L, "too many %s (limit is %d) in %s",
-                             what, limit, where);
-  luaX_syntaxerror(fs->ls, msg);
+static l_noret errorlimit(FuncState *fs, int limit, const char *what)
+{
+    lua_State *L = fs->ls->L;
+    const char *msg;
+    int line = fs->f->linedefined;
+    const char *where = (line == 0)
+                        ? "main function"
+                        : luaO_pushfstring(L, "function at line %d", line);
+    msg = luaO_pushfstring(L, "too many %s (limit is %d) in %s",
+                           what, limit, where);
+    luaX_syntaxerror(fs->ls, msg);
 }
 
 
-static void checklimit (FuncState *fs, int v, int l, const char *what) {
-  if (v > l) errorlimit(fs, l, what);
+static void checklimit(FuncState *fs, int v, int l, const char *what)
+{
+    if (v > l) errorlimit(fs, l, what);
 }
 
 
-static int testnext (LexState *ls, int c) {
-  if (ls->t.token == c) {
+static int testnext(LexState *ls, int c)
+{
+    if (ls->t.token == c) {
+        luaX_next(ls);
+        return 1;
+    } else return 0;
+}
+
+
+static void check(LexState *ls, int c)
+{
+    if (ls->t.token != c)
+        error_expected(ls, c);
+}
+
+
+static void checknext(LexState *ls, int c)
+{
+    check(ls, c);
     luaX_next(ls);
-    return 1;
-  }
-  else return 0;
-}
-
-
-static void check (LexState *ls, int c) {
-  if (ls->t.token != c)
-    error_expected(ls, c);
-}
-
-
-static void checknext (LexState *ls, int c) {
-  check(ls, c);
-  luaX_next(ls);
 }
 
 
@@ -123,133 +130,147 @@ static void checknext (LexState *ls, int c) {
 
 
 
-static void check_match (LexState *ls, int what, int who, int where) {
-  if (!testnext(ls, what)) {
-    if (where == ls->linenumber)
-      error_expected(ls, what);
-    else {
-      luaX_syntaxerror(ls, luaO_pushfstring(ls->L,
-             "%s expected (to close %s at line %d)",
-              luaX_token2str(ls, what), luaX_token2str(ls, who), where));
+static void check_match(LexState *ls, int what, int who, int where)
+{
+    if (!testnext(ls, what)) {
+        if (where == ls->linenumber)
+            error_expected(ls, what);
+        else {
+            luaX_syntaxerror(ls, luaO_pushfstring(ls->L,
+                                                  "%s expected (to close %s at line %d)",
+                                                  luaX_token2str(ls, what), luaX_token2str(ls, who), where));
+        }
     }
-  }
 }
 
 
-static TString *str_checkname (LexState *ls) {
-  TString *ts;
-  check(ls, TK_NAME);
-  ts = ls->t.seminfo.ts;
-  luaX_next(ls);
-  return ts;
+static TString *str_checkname(LexState *ls)
+{
+    TString *ts;
+    check(ls, TK_NAME);
+    ts = ls->t.seminfo.ts;
+    luaX_next(ls);
+    return ts;
 }
 
 
-static void init_exp (expdesc *e, expkind k, int i) {
-  e->f = e->t = NO_JUMP;
-  e->k = k;
-  e->u.info = i;
+static void init_exp(expdesc *e, expkind k, int i)
+{
+    e->f = e->t = NO_JUMP;
+    e->k = k;
+    e->u.info = i;
 }
 
 
-static void codestring (LexState *ls, expdesc *e, TString *s) {
-  init_exp(e, VK, luaK_stringK(ls->fs, s));
+static void codestring(LexState *ls, expdesc *e, TString *s)
+{
+    init_exp(e, VK, luaK_stringK(ls->fs, s));
 }
 
 
-static void checkname (LexState *ls, expdesc *e) {
-  codestring(ls, e, str_checkname(ls));
+static void checkname(LexState *ls, expdesc *e)
+{
+    codestring(ls, e, str_checkname(ls));
 }
 
 
-static int registerlocalvar (LexState *ls, TString *varname) {
-  FuncState *fs = ls->fs;
-  Proto *f = fs->f;
-  int oldsize = f->sizelocvars;
-  luaM_growvector(ls->L, f->locvars, fs->nlocvars, f->sizelocvars,
-                  LocVar, SHRT_MAX, "local variables");
-  while (oldsize < f->sizelocvars) f->locvars[oldsize++].varname = NULL;
-  f->locvars[fs->nlocvars].varname = varname;
-  luaC_objbarrier(ls->L, f, varname);
-  return fs->nlocvars++;
+static int registerlocalvar(LexState *ls, TString *varname)
+{
+    FuncState *fs = ls->fs;
+    Proto *f = fs->f;
+    int oldsize = f->sizelocvars;
+    luaM_growvector(ls->L, f->locvars, fs->nlocvars, f->sizelocvars,
+                    LocVar, SHRT_MAX, "local variables");
+    while (oldsize < f->sizelocvars) f->locvars[oldsize++].varname = NULL;
+    f->locvars[fs->nlocvars].varname = varname;
+    luaC_objbarrier(ls->L, f, varname);
+    return fs->nlocvars++;
 }
 
 
-static void new_localvar (LexState *ls, TString *name) {
-  FuncState *fs = ls->fs;
-  Dyndata *dyd = ls->dyd;
-  int reg = registerlocalvar(ls, name);
-  checklimit(fs, dyd->actvar.n + 1 - fs->firstlocal,
-                  MAXVARS, "local variables");
-  luaM_growvector(ls->L, dyd->actvar.arr, dyd->actvar.n + 1,
-                  dyd->actvar.size, Vardesc, MAX_INT, "local variables");
-  dyd->actvar.arr[dyd->actvar.n++].idx = cast(short, reg);
+static void new_localvar(LexState *ls, TString *name)
+{
+    FuncState *fs = ls->fs;
+    Dyndata *dyd = ls->dyd;
+    int reg = registerlocalvar(ls, name);
+    checklimit(fs, dyd->actvar.n + 1 - fs->firstlocal,
+               MAXVARS, "local variables");
+    luaM_growvector(ls->L, dyd->actvar.arr, dyd->actvar.n + 1,
+                    dyd->actvar.size, Vardesc, MAX_INT, "local variables");
+    dyd->actvar.arr[dyd->actvar.n++].idx = cast(short, reg);
 }
 
 
-static void new_localvarliteral_ (LexState *ls, const char *name, size_t sz) {
-  new_localvar(ls, luaX_newstring(ls, name, sz));
+static void new_localvarliteral_(LexState *ls, const char *name, size_t sz)
+{
+    new_localvar(ls, luaX_newstring(ls, name, sz));
 }
 
 #define new_localvarliteral(ls,v) \
     new_localvarliteral_(ls, "" v, (sizeof(v)/sizeof(char))-1)
 
 
-static LocVar *getlocvar (FuncState *fs, int i) {
-  int idx = fs->ls->dyd->actvar.arr[fs->firstlocal + i].idx;
-  lua_assert(idx < fs->nlocvars);
-  return &fs->f->locvars[idx];
+static LocVar *getlocvar(FuncState *fs, int i)
+{
+    int idx = fs->ls->dyd->actvar.arr[fs->firstlocal + i].idx;
+    lua_assert(idx < fs->nlocvars);
+    return &fs->f->locvars[idx];
 }
 
 
-static void adjustlocalvars (LexState *ls, int nvars) {
-  FuncState *fs = ls->fs;
-  fs->nactvar = cast_byte(fs->nactvar + nvars);
-  for (; nvars; nvars--) {
-    getlocvar(fs, fs->nactvar - nvars)->startpc = fs->pc;
-  }
+static void adjustlocalvars(LexState *ls, int nvars)
+{
+    FuncState *fs = ls->fs;
+    fs->nactvar = cast_byte(fs->nactvar + nvars);
+    for (; nvars; nvars--) {
+        getlocvar(fs, fs->nactvar - nvars)->startpc = fs->pc;
+    }
 }
 
 
-static void removevars (FuncState *fs, int tolevel) {
-  fs->ls->dyd->actvar.n -= (fs->nactvar - tolevel);
-  while (fs->nactvar > tolevel)
-    getlocvar(fs, --fs->nactvar)->endpc = fs->pc;
+static void removevars(FuncState *fs, int tolevel)
+{
+    fs->ls->dyd->actvar.n -= (fs->nactvar - tolevel);
+    while (fs->nactvar > tolevel)
+        getlocvar(fs, --fs->nactvar)->endpc = fs->pc;
 }
 
 
-static int searchupvalue (FuncState *fs, TString *name) {
-  int i;
-  Upvaldesc *up = fs->f->upvalues;
-  for (i = 0; i < fs->nups; i++) {
-    if (luaS_eqstr(up[i].name, name)) return i;
-  }
-  return -1;  /* not found */
+static int searchupvalue(FuncState *fs, TString *name)
+{
+    int i;
+    Upvaldesc *up = fs->f->upvalues;
+    for (i = 0; i < fs->nups; i++) {
+        if (luaS_eqstr(up[i].name, name)) return i;
+    }
+    return -1;  /* not found */
 }
 
 
-static int newupvalue (FuncState *fs, TString *name, expdesc *v) {
-  Proto *f = fs->f;
-  int oldsize = f->sizeupvalues;
-  checklimit(fs, fs->nups + 1, MAXUPVAL, "upvalues");
-  luaM_growvector(fs->ls->L, f->upvalues, fs->nups, f->sizeupvalues,
-                  Upvaldesc, MAXUPVAL, "upvalues");
-  while (oldsize < f->sizeupvalues) f->upvalues[oldsize++].name = NULL;
-  f->upvalues[fs->nups].instack = (v->k == VLOCAL);
-  f->upvalues[fs->nups].idx = cast_byte(v->u.info);
-  f->upvalues[fs->nups].name = name;
-  luaC_objbarrier(fs->ls->L, f, name);
-  return fs->nups++;
+static int newupvalue(FuncState *fs, TString *name, expdesc *v)
+{
+    Proto *f = fs->f;
+    int oldsize = f->sizeupvalues;
+    checklimit(fs, fs->nups + 1, MAXUPVAL, "upvalues");
+    luaM_growvector(fs->ls->L, f->upvalues, fs->nups, f->sizeupvalues,
+                    Upvaldesc, MAXUPVAL, "upvalues");
+    while (oldsize < f->sizeupvalues) f->upvalues[oldsize++].name = NULL;
+    f->upvalues[fs->nups].instack = (v->k == VLOCAL);
+    f->upvalues[fs->nups].idx = cast_byte(v->u.info);
+    f->upvalues[fs->nups].name = name;
+    luaC_objbarrier(fs->ls->L, f, name);
+    return fs->nups++;
 }
 
 
-static int searchvar (FuncState *fs, TString *n) {
-  int i;
-  for (i = cast_int(fs->nactvar) - 1; i >= 0; i--) {
-    if (luaS_eqstr(n, getlocvar(fs, i)->varname))
-      return i;
-  }
-  return -1;  /* not found */
+static int searchvar(FuncState *fs, TString *n)
+{
+    int i;
+    for (i = cast_int(fs->nactvar) - 1; i >= 0; i--) {
+        if (luaS_eqstr(n, getlocvar(fs, i)->varname))
+            return i;
+    }
+    return -1;  /* not found */
 }
 
 
@@ -257,10 +278,11 @@ static int searchvar (FuncState *fs, TString *n) {
   Mark block where variable at given level was defined
   (to emit close instructions later).
 */
-static void markupval (FuncState *fs, int level) {
-  BlockCnt *bl = fs->bl;
-  while (bl->nactvar > level) bl = bl->previous;
-  bl->upval = 1;
+static void markupval(FuncState *fs, int level)
+{
+    BlockCnt *bl = fs->bl;
+    while (bl->nactvar > level) bl = bl->previous;
+    bl->upval = 1;
 }
 
 
@@ -268,130 +290,135 @@ static void markupval (FuncState *fs, int level) {
   Find variable with given name 'n'. If it is an upvalue, add this
   upvalue into all intermediate functions.
 */
-static int singlevaraux (FuncState *fs, TString *n, expdesc *var, int base) {
-  if (fs == NULL)  /* no more levels? */
-    return VVOID;  /* default is global */
-  else {
-    int v = searchvar(fs, n);  /* look up locals at current level */
-    if (v >= 0) {  /* found? */
-      init_exp(var, VLOCAL, v);  /* variable is local */
-      if (!base)
-        markupval(fs, v);  /* local will be used as an upval */
-      return VLOCAL;
+static int singlevaraux(FuncState *fs, TString *n, expdesc *var, int base)
+{
+    if (fs == NULL)  /* no more levels? */
+        return VVOID;  /* default is global */
+    else {
+        int v = searchvar(fs, n);  /* look up locals at current level */
+        if (v >= 0) {  /* found? */
+            init_exp(var, VLOCAL, v);  /* variable is local */
+            if (!base)
+                markupval(fs, v);  /* local will be used as an upval */
+            return VLOCAL;
+        } else { /* not found as local at current level; try upvalues */
+            int idx = searchupvalue(fs, n);  /* try existing upvalues */
+            if (idx < 0) {  /* not found? */
+                if (singlevaraux(fs->prev, n, var, 0) == VVOID) /* try upper levels */
+                    return VVOID;  /* not found; is a global */
+                /* else was LOCAL or UPVAL */
+                idx  = newupvalue(fs, n, var);  /* will be a new upvalue */
+            }
+            init_exp(var, VUPVAL, idx);
+            return VUPVAL;
+        }
     }
-    else {  /* not found as local at current level; try upvalues */
-      int idx = searchupvalue(fs, n);  /* try existing upvalues */
-      if (idx < 0) {  /* not found? */
-        if (singlevaraux(fs->prev, n, var, 0) == VVOID) /* try upper levels */
-          return VVOID;  /* not found; is a global */
-        /* else was LOCAL or UPVAL */
-        idx  = newupvalue(fs, n, var);  /* will be a new upvalue */
-      }
-      init_exp(var, VUPVAL, idx);
-      return VUPVAL;
-    }
-  }
 }
 
 
-static void singlevar (LexState *ls, expdesc *var) {
-  TString *varname = str_checkname(ls);
-  FuncState *fs = ls->fs;
-  if (singlevaraux(fs, varname, var, 1) == VVOID) {  /* global name? */
-    expdesc key;
-    singlevaraux(fs, ls->envn, var, 1);  /* get environment variable */
-    lua_assert(var->k == VLOCAL || var->k == VUPVAL);
-    codestring(ls, &key, varname);  /* key is variable name */
-    luaK_indexed(fs, var, &key);  /* env[varname] */
-  }
-}
-
-
-static void adjust_assign (LexState *ls, int nvars, int nexps, expdesc *e) {
-  FuncState *fs = ls->fs;
-  int extra = nvars - nexps;
-  if (hasmultret(e->k)) {
-    extra++;  /* includes call itself */
-    if (extra < 0) extra = 0;
-    luaK_setreturns(fs, e, extra);  /* last exp. provides the difference */
-    if (extra > 1) luaK_reserveregs(fs, extra-1);
-  }
-  else {
-    if (e->k != VVOID) luaK_exp2nextreg(fs, e);  /* close last expression */
-    if (extra > 0) {
-      int reg = fs->freereg;
-      luaK_reserveregs(fs, extra);
-      luaK_nil(fs, reg, extra);
+static void singlevar(LexState *ls, expdesc *var)
+{
+    TString *varname = str_checkname(ls);
+    FuncState *fs = ls->fs;
+    if (singlevaraux(fs, varname, var, 1) == VVOID) {  /* global name? */
+        expdesc key;
+        singlevaraux(fs, ls->envn, var, 1);  /* get environment variable */
+        lua_assert(var->k == VLOCAL || var->k == VUPVAL);
+        codestring(ls, &key, varname);  /* key is variable name */
+        luaK_indexed(fs, var, &key);  /* env[varname] */
     }
-  }
 }
 
 
-static void enterlevel (LexState *ls) {
-  lua_State *L = ls->L;
-  ++L->nCcalls;
-  checklimit(ls->fs, L->nCcalls, LUAI_MAXCCALLS, "C levels");
+static void adjust_assign(LexState *ls, int nvars, int nexps, expdesc *e)
+{
+    FuncState *fs = ls->fs;
+    int extra = nvars - nexps;
+    if (hasmultret(e->k)) {
+        extra++;  /* includes call itself */
+        if (extra < 0) extra = 0;
+        luaK_setreturns(fs, e, extra);  /* last exp. provides the difference */
+        if (extra > 1) luaK_reserveregs(fs, extra - 1);
+    } else {
+        if (e->k != VVOID) luaK_exp2nextreg(fs, e);  /* close last expression */
+        if (extra > 0) {
+            int reg = fs->freereg;
+            luaK_reserveregs(fs, extra);
+            luaK_nil(fs, reg, extra);
+        }
+    }
+}
+
+
+static void enterlevel(LexState *ls)
+{
+    lua_State *L = ls->L;
+    ++L->nCcalls;
+    checklimit(ls->fs, L->nCcalls, LUAI_MAXCCALLS, "C levels");
 }
 
 
 #define leavelevel(ls) ((ls)->L->nCcalls--)
 
 
-static void closegoto (LexState *ls, int g, Labeldesc *label) {
-  int i;
-  FuncState *fs = ls->fs;
-  Labellist *gl = &ls->dyd->gt;
-  Labeldesc *gt = &gl->arr[g];
-  lua_assert(luaS_eqstr(gt->name, label->name));
-  if (gt->nactvar < label->nactvar) {
-    TString *vname = getlocvar(fs, gt->nactvar)->varname;
-    const char *msg = luaO_pushfstring(ls->L,
-      "<goto %s> at line %d jumps into the scope of local " LUA_QS,
-      getstr(gt->name), gt->line, getstr(vname));
-    semerror(ls, msg);
-  }
-  luaK_patchlist(fs, gt->pc, label->pc);
-  /* remove goto from pending list */
-  for (i = g; i < gl->n - 1; i++)
-    gl->arr[i] = gl->arr[i + 1];
-  gl->n--;
+static void closegoto(LexState *ls, int g, Labeldesc *label)
+{
+    int i;
+    FuncState *fs = ls->fs;
+    Labellist *gl = &ls->dyd->gt;
+    Labeldesc *gt = &gl->arr[g];
+    lua_assert(luaS_eqstr(gt->name, label->name));
+    if (gt->nactvar < label->nactvar) {
+        TString *vname = getlocvar(fs, gt->nactvar)->varname;
+        const char *msg = luaO_pushfstring(ls->L,
+                                           "<goto %s> at line %d jumps into the scope of local " LUA_QS,
+                                           getstr(gt->name), gt->line, getstr(vname));
+        semerror(ls, msg);
+    }
+    luaK_patchlist(fs, gt->pc, label->pc);
+    /* remove goto from pending list */
+    for (i = g; i < gl->n - 1; i++)
+        gl->arr[i] = gl->arr[i + 1];
+    gl->n--;
 }
 
 
 /*
 ** try to close a goto with existing labels; this solves backward jumps
 */
-static int findlabel (LexState *ls, int g) {
-  int i;
-  BlockCnt *bl = ls->fs->bl;
-  Dyndata *dyd = ls->dyd;
-  Labeldesc *gt = &dyd->gt.arr[g];
-  /* check labels in current block for a match */
-  for (i = bl->firstlabel; i < dyd->label.n; i++) {
-    Labeldesc *lb = &dyd->label.arr[i];
-    if (luaS_eqstr(lb->name, gt->name)) {  /* correct label? */
-      if (gt->nactvar > lb->nactvar &&
-          (bl->upval || dyd->label.n > bl->firstlabel))
-        luaK_patchclose(ls->fs, gt->pc, lb->nactvar);
-      closegoto(ls, g, lb);  /* close it */
-      return 1;
+static int findlabel(LexState *ls, int g)
+{
+    int i;
+    BlockCnt *bl = ls->fs->bl;
+    Dyndata *dyd = ls->dyd;
+    Labeldesc *gt = &dyd->gt.arr[g];
+    /* check labels in current block for a match */
+    for (i = bl->firstlabel; i < dyd->label.n; i++) {
+        Labeldesc *lb = &dyd->label.arr[i];
+        if (luaS_eqstr(lb->name, gt->name)) {  /* correct label? */
+            if (gt->nactvar > lb->nactvar &&
+                (bl->upval || dyd->label.n > bl->firstlabel))
+                luaK_patchclose(ls->fs, gt->pc, lb->nactvar);
+            closegoto(ls, g, lb);  /* close it */
+            return 1;
+        }
     }
-  }
-  return 0;  /* label not found; cannot close goto */
+    return 0;  /* label not found; cannot close goto */
 }
 
 
-static int newlabelentry (LexState *ls, Labellist *l, TString *name,
-                          int line, int pc) {
-  int n = l->n;
-  luaM_growvector(ls->L, l->arr, n, l->size,
-                  Labeldesc, SHRT_MAX, "labels/gotos");
-  l->arr[n].name = name;
-  l->arr[n].line = line;
-  l->arr[n].nactvar = ls->fs->nactvar;
-  l->arr[n].pc = pc;
-  l->n++;
-  return n;
+static int newlabelentry(LexState *ls, Labellist *l, TString *name,
+                         int line, int pc)
+{
+    int n = l->n;
+    luaM_growvector(ls->L, l->arr, n, l->size,
+                    Labeldesc, SHRT_MAX, "labels/gotos");
+    l->arr[n].name = name;
+    l->arr[n].line = line;
+    l->arr[n].nactvar = ls->fs->nactvar;
+    l->arr[n].pc = pc;
+    l->n++;
+    return n;
 }
 
 
@@ -399,15 +426,16 @@ static int newlabelentry (LexState *ls, Labellist *l, TString *name,
 ** check whether new label 'lb' matches any pending gotos in current
 ** block; solves forward jumps
 */
-static void findgotos (LexState *ls, Labeldesc *lb) {
-  Labellist *gl = &ls->dyd->gt;
-  int i = ls->fs->bl->firstgoto;
-  while (i < gl->n) {
-    if (luaS_eqstr(gl->arr[i].name, lb->name))
-      closegoto(ls, i, lb);
-    else
-      i++;
-  }
+static void findgotos(LexState *ls, Labeldesc *lb)
+{
+    Labellist *gl = &ls->dyd->gt;
+    int i = ls->fs->bl->firstgoto;
+    while (i < gl->n) {
+        if (luaS_eqstr(gl->arr[i].name, lb->name))
+            closegoto(ls, i, lb);
+        else
+            i++;
+    }
 }
 
 
@@ -417,97 +445,103 @@ static void findgotos (LexState *ls, Labeldesc *lb) {
 ** the goto exits the scope of any variable (which can be the
 ** upvalue), close those variables being exited.
 */
-static void movegotosout (FuncState *fs, BlockCnt *bl) {
-  int i = bl->firstgoto;
-  Labellist *gl = &fs->ls->dyd->gt;
-  /* correct pending gotos to current block and try to close it
-     with visible labels */
-  while (i < gl->n) {
-    Labeldesc *gt = &gl->arr[i];
-    if (gt->nactvar > bl->nactvar) {
-      if (bl->upval)
-        luaK_patchclose(fs, gt->pc, bl->nactvar);
-      gt->nactvar = bl->nactvar;
+static void movegotosout(FuncState *fs, BlockCnt *bl)
+{
+    int i = bl->firstgoto;
+    Labellist *gl = &fs->ls->dyd->gt;
+    /* correct pending gotos to current block and try to close it
+       with visible labels */
+    while (i < gl->n) {
+        Labeldesc *gt = &gl->arr[i];
+        if (gt->nactvar > bl->nactvar) {
+            if (bl->upval)
+                luaK_patchclose(fs, gt->pc, bl->nactvar);
+            gt->nactvar = bl->nactvar;
+        }
+        if (!findlabel(fs->ls, i))
+            i++;  /* move to next one */
     }
-    if (!findlabel(fs->ls, i))
-      i++;  /* move to next one */
-  }
 }
 
 
-static void enterblock (FuncState *fs, BlockCnt *bl, lu_byte isloop) {
-  bl->isloop = isloop;
-  bl->nactvar = fs->nactvar;
-  bl->firstlabel = fs->ls->dyd->label.n;
-  bl->firstgoto = fs->ls->dyd->gt.n;
-  bl->upval = 0;
-  bl->previous = fs->bl;
-  fs->bl = bl;
-  lua_assert(fs->freereg == fs->nactvar);
+static void enterblock(FuncState *fs, BlockCnt *bl, lu_byte isloop)
+{
+    bl->isloop = isloop;
+    bl->nactvar = fs->nactvar;
+    bl->firstlabel = fs->ls->dyd->label.n;
+    bl->firstgoto = fs->ls->dyd->gt.n;
+    bl->upval = 0;
+    bl->previous = fs->bl;
+    fs->bl = bl;
+    lua_assert(fs->freereg == fs->nactvar);
 }
 
 
 /*
 ** create a label named "break" to resolve break statements
 */
-static void breaklabel (LexState *ls) {
-  TString *n = luaS_new(ls->L, "break");
-  int l = newlabelentry(ls, &ls->dyd->label, n, 0, ls->fs->pc);
-  findgotos(ls, &ls->dyd->label.arr[l]);
+static void breaklabel(LexState *ls)
+{
+    TString *n = luaS_new(ls->L, "break");
+    int l = newlabelentry(ls, &ls->dyd->label, n, 0, ls->fs->pc);
+    findgotos(ls, &ls->dyd->label.arr[l]);
 }
 
 /*
 ** generates an error for an undefined 'goto'; choose appropriate
 ** message when label name is a reserved word (which can only be 'break')
 */
-static l_noret undefgoto (LexState *ls, Labeldesc *gt) {
-  const char *msg = isreserved(gt->name)
-                    ? "<%s> at line %d not inside a loop"
-                    : "no visible label " LUA_QS " for <goto> at line %d";
-  msg = luaO_pushfstring(ls->L, msg, getstr(gt->name), gt->line);
-  semerror(ls, msg);
+static l_noret undefgoto(LexState *ls, Labeldesc *gt)
+{
+    const char *msg = isreserved(gt->name)
+                      ? "<%s> at line %d not inside a loop"
+                      : "no visible label " LUA_QS " for <goto> at line %d";
+    msg = luaO_pushfstring(ls->L, msg, getstr(gt->name), gt->line);
+    semerror(ls, msg);
 }
 
 
-static void leaveblock (FuncState *fs) {
-  BlockCnt *bl = fs->bl;
-  LexState *ls = fs->ls;
-  if (bl->previous && bl->upval) {
-    /* create a 'jump to here' to close upvalues */
-    int j = luaK_jump(fs);
-    luaK_patchclose(fs, j, bl->nactvar);
-    luaK_patchtohere(fs, j);
-  }
-  if (bl->isloop)
-    breaklabel(ls);  /* close pending breaks */
-  fs->bl = bl->previous;
-  removevars(fs, bl->nactvar);
-  lua_assert(bl->nactvar == fs->nactvar);
-  fs->freereg = fs->nactvar;  /* free registers */
-  ls->dyd->label.n = bl->firstlabel;  /* remove local labels */
-  if (bl->previous)  /* inner block? */
-    movegotosout(fs, bl);  /* update pending gotos to outer block */
-  else if (bl->firstgoto < ls->dyd->gt.n)  /* pending gotos in outer block? */
-    undefgoto(ls, &ls->dyd->gt.arr[bl->firstgoto]);  /* error */
+static void leaveblock(FuncState *fs)
+{
+    BlockCnt *bl = fs->bl;
+    LexState *ls = fs->ls;
+    if (bl->previous && bl->upval) {
+        /* create a 'jump to here' to close upvalues */
+        int j = luaK_jump(fs);
+        luaK_patchclose(fs, j, bl->nactvar);
+        luaK_patchtohere(fs, j);
+    }
+    if (bl->isloop)
+        breaklabel(ls);  /* close pending breaks */
+    fs->bl = bl->previous;
+    removevars(fs, bl->nactvar);
+    lua_assert(bl->nactvar == fs->nactvar);
+    fs->freereg = fs->nactvar;  /* free registers */
+    ls->dyd->label.n = bl->firstlabel;  /* remove local labels */
+    if (bl->previous)  /* inner block? */
+        movegotosout(fs, bl);  /* update pending gotos to outer block */
+    else if (bl->firstgoto < ls->dyd->gt.n)  /* pending gotos in outer block? */
+        undefgoto(ls, &ls->dyd->gt.arr[bl->firstgoto]);  /* error */
 }
 
 
 /*
 ** adds a new prototype into list of prototypes
 */
-static Proto *addprototype (LexState *ls) {
-  Proto *clp;
-  lua_State *L = ls->L;
-  FuncState *fs = ls->fs;
-  Proto *f = fs->f;  /* prototype of current function */
-  if (fs->np >= f->sizep) {
-    int oldsize = f->sizep;
-    luaM_growvector(L, f->p, fs->np, f->sizep, Proto *, MAXARG_Bx, "functions");
-    while (oldsize < f->sizep) f->p[oldsize++] = NULL;
-  }
-  f->p[fs->np++] = clp = luaF_newproto(L);
-  luaC_objbarrier(L, f, clp);
-  return clp;
+static Proto *addprototype(LexState *ls)
+{
+    Proto *clp;
+    lua_State *L = ls->L;
+    FuncState *fs = ls->fs;
+    Proto *f = fs->f;  /* prototype of current function */
+    if (fs->np >= f->sizep) {
+        int oldsize = f->sizep;
+        luaM_growvector(L, f->p, fs->np, f->sizep, Proto *, MAXARG_Bx, "functions");
+        while (oldsize < f->sizep) f->p[oldsize++] = NULL;
+    }
+    f->p[fs->np++] = clp = luaF_newproto(L);
+    luaC_objbarrier(L, f, clp);
+    return clp;
 }
 
 
@@ -517,65 +551,68 @@ static Proto *addprototype (LexState *ls) {
 ** so that, if it invokes the GC, the GC knows which registers
 ** are in use at that time.
 */
-static void codeclosure (LexState *ls, expdesc *v) {
-  FuncState *fs = ls->fs->prev;
-  init_exp(v, VRELOCABLE, luaK_codeABx(fs, OP_CLOSURE, 0, fs->np - 1));
-  luaK_exp2nextreg(fs, v);  /* fix it at the last register */
+static void codeclosure(LexState *ls, expdesc *v)
+{
+    FuncState *fs = ls->fs->prev;
+    init_exp(v, VRELOCABLE, luaK_codeABx(fs, OP_CLOSURE, 0, fs->np - 1));
+    luaK_exp2nextreg(fs, v);  /* fix it at the last register */
 }
 
 
-static void open_func (LexState *ls, FuncState *fs, BlockCnt *bl) {
-  lua_State *L = ls->L;
-  Proto *f;
-  fs->prev = ls->fs;  /* linked list of funcstates */
-  fs->ls = ls;
-  ls->fs = fs;
-  fs->pc = 0;
-  fs->lasttarget = 0;
-  fs->jpc = NO_JUMP;
-  fs->freereg = 0;
-  fs->nk = 0;
-  fs->np = 0;
-  fs->nups = 0;
-  fs->nlocvars = 0;
-  fs->nactvar = 0;
-  fs->firstlocal = ls->dyd->actvar.n;
-  fs->bl = NULL;
-  f = fs->f;
-  f->source = ls->source;
-  f->maxstacksize = 2;  /* registers 0/1 are always valid */
-  fs->h = luaH_new(L);
-  /* anchor table of constants (to avoid being collected) */
-  sethvalue2s(L, L->top, fs->h);
-  incr_top(L);
-  enterblock(fs, bl, 0);
+static void open_func(LexState *ls, FuncState *fs, BlockCnt *bl)
+{
+    lua_State *L = ls->L;
+    Proto *f;
+    fs->prev = ls->fs;  /* linked list of funcstates */
+    fs->ls = ls;
+    ls->fs = fs;
+    fs->pc = 0;
+    fs->lasttarget = 0;
+    fs->jpc = NO_JUMP;
+    fs->freereg = 0;
+    fs->nk = 0;
+    fs->np = 0;
+    fs->nups = 0;
+    fs->nlocvars = 0;
+    fs->nactvar = 0;
+    fs->firstlocal = ls->dyd->actvar.n;
+    fs->bl = NULL;
+    f = fs->f;
+    f->source = ls->source;
+    f->maxstacksize = 2;  /* registers 0/1 are always valid */
+    fs->h = luaH_new(L);
+    /* anchor table of constants (to avoid being collected) */
+    sethvalue2s(L, L->top, fs->h);
+    incr_top(L);
+    enterblock(fs, bl, 0);
 }
 
 
-static void close_func (LexState *ls) {
-  lua_State *L = ls->L;
-  FuncState *fs = ls->fs;
-  Proto *f = fs->f;
-  luaK_ret(fs, 0, 0);  /* final return */
-  leaveblock(fs);
-  luaM_reallocvector(L, f->code, f->sizecode, fs->pc, Instruction);
-  f->sizecode = fs->pc;
-  luaM_reallocvector(L, f->lineinfo, f->sizelineinfo, fs->pc, int);
-  f->sizelineinfo = fs->pc;
-  luaM_reallocvector(L, f->k, f->sizek, fs->nk, TValue);
-  f->sizek = fs->nk;
-  luaM_reallocvector(L, f->p, f->sizep, fs->np, Proto *);
-  f->sizep = fs->np;
-  luaM_reallocvector(L, f->locvars, f->sizelocvars, fs->nlocvars, LocVar);
-  f->sizelocvars = fs->nlocvars;
-  luaM_reallocvector(L, f->upvalues, f->sizeupvalues, fs->nups, Upvaldesc);
-  f->sizeupvalues = fs->nups;
-  lua_assert(fs->bl == NULL);
-  ls->fs = fs->prev;
-  /* last token read was anchored in defunct function; must re-anchor it */
-  anchor_token(ls);
-  L->top--;  /* pop table of constants */
-  luaC_checkGC(L);
+static void close_func(LexState *ls)
+{
+    lua_State *L = ls->L;
+    FuncState *fs = ls->fs;
+    Proto *f = fs->f;
+    luaK_ret(fs, 0, 0);  /* final return */
+    leaveblock(fs);
+    luaM_reallocvector(L, f->code, f->sizecode, fs->pc, Instruction);
+    f->sizecode = fs->pc;
+    luaM_reallocvector(L, f->lineinfo, f->sizelineinfo, fs->pc, int);
+    f->sizelineinfo = fs->pc;
+    luaM_reallocvector(L, f->k, f->sizek, fs->nk, TValue);
+    f->sizek = fs->nk;
+    luaM_reallocvector(L, f->p, f->sizep, fs->np, Proto *);
+    f->sizep = fs->np;
+    luaM_reallocvector(L, f->locvars, f->sizelocvars, fs->nlocvars, LocVar);
+    f->sizelocvars = fs->nlocvars;
+    luaM_reallocvector(L, f->upvalues, f->sizeupvalues, fs->nups, Upvaldesc);
+    f->sizeupvalues = fs->nups;
+    lua_assert(fs->bl == NULL);
+    ls->fs = fs->prev;
+    /* last token read was anchored in defunct function; must re-anchor it */
+    anchor_token(ls);
+    L->top--;  /* pop table of constants */
+    luaC_checkGC(L);
 }
 
 
@@ -590,46 +627,54 @@ static void close_func (LexState *ls) {
 ** 'until' closes syntactical blocks, but do not close scope,
 ** so it handled in separate.
 */
-static int block_follow (LexState *ls, int withuntil) {
-  switch (ls->t.token) {
-    case TK_ELSE: case TK_ELSEIF:
-    case TK_END: case TK_EOS:
-      return 1;
-    case TK_UNTIL: return withuntil;
-    default: return 0;
-  }
-}
-
-
-static void statlist (LexState *ls) {
-  /* statlist -> { stat [`;'] } */
-  while (!block_follow(ls, 1)) {
-    if (ls->t.token == TK_RETURN) {
-      statement(ls);
-      return;  /* 'return' must be last statement */
+static int block_follow(LexState *ls, int withuntil)
+{
+    switch (ls->t.token) {
+        case TK_ELSE:
+        case TK_ELSEIF:
+        case TK_END:
+        case TK_EOS:
+            return 1;
+        case TK_UNTIL:
+            return withuntil;
+        default:
+            return 0;
     }
-    statement(ls);
-  }
 }
 
 
-static void fieldsel (LexState *ls, expdesc *v) {
-  /* fieldsel -> ['.' | ':'] NAME */
-  FuncState *fs = ls->fs;
-  expdesc key;
-  luaK_exp2anyregup(fs, v);
-  luaX_next(ls);  /* skip the dot or colon */
-  checkname(ls, &key);
-  luaK_indexed(fs, v, &key);
+static void statlist(LexState *ls)
+{
+    /* statlist -> { stat [`;'] } */
+    while (!block_follow(ls, 1)) {
+        if (ls->t.token == TK_RETURN) {
+            statement(ls);
+            return;  /* 'return' must be last statement */
+        }
+        statement(ls);
+    }
 }
 
 
-static void yindex (LexState *ls, expdesc *v) {
-  /* index -> '[' expr ']' */
-  luaX_next(ls);  /* skip the '[' */
-  expr(ls, v);
-  luaK_exp2val(ls->fs, v);
-  checknext(ls, ']');
+static void fieldsel(LexState *ls, expdesc *v)
+{
+    /* fieldsel -> ['.' | ':'] NAME */
+    FuncState *fs = ls->fs;
+    expdesc key;
+    luaK_exp2anyregup(fs, v);
+    luaX_next(ls);  /* skip the dot or colon */
+    checkname(ls, &key);
+    luaK_indexed(fs, v, &key);
+}
+
+
+static void yindex(LexState *ls, expdesc *v)
+{
+    /* index -> '[' expr ']' */
+    luaX_next(ls);  /* skip the '[' */
+    expr(ls, v);
+    luaK_exp2val(ls->fs, v);
+    checknext(ls, ']');
 }
 
 
@@ -641,226 +686,235 @@ static void yindex (LexState *ls, expdesc *v) {
 
 
 struct ConsControl {
-  expdesc v;  /* last list item read */
-  expdesc *t;  /* table descriptor */
-  int nh;  /* total number of `record' elements */
-  int na;  /* total number of array elements */
-  int tostore;  /* number of array elements pending to be stored */
+    expdesc v;  /* last list item read */
+    expdesc *t;  /* table descriptor */
+    int nh;  /* total number of `record' elements */
+    int na;  /* total number of array elements */
+    int tostore;  /* number of array elements pending to be stored */
 };
 
 
-static void recfield (LexState *ls, struct ConsControl *cc) {
-  /* recfield -> (NAME | `['exp1`]') = exp1 */
-  FuncState *fs = ls->fs;
-  int reg = ls->fs->freereg;
-  expdesc key, val;
-  int rkkey;
-  if (ls->t.token == TK_NAME) {
-    checklimit(fs, cc->nh, MAX_INT, "items in a constructor");
-    checkname(ls, &key);
-  }
-  else  /* ls->t.token == '[' */
-    yindex(ls, &key);
-  cc->nh++;
-  checknext(ls, '=');
-  rkkey = luaK_exp2RK(fs, &key);
-  expr(ls, &val);
-  luaK_codeABC(fs, OP_SETTABLE, cc->t->u.info, rkkey, luaK_exp2RK(fs, &val));
-  fs->freereg = reg;  /* free registers */
+static void recfield(LexState *ls, struct ConsControl *cc)
+{
+    /* recfield -> (NAME | `['exp1`]') = exp1 */
+    FuncState *fs = ls->fs;
+    int reg = ls->fs->freereg;
+    expdesc key, val;
+    int rkkey;
+    if (ls->t.token == TK_NAME) {
+        checklimit(fs, cc->nh, MAX_INT, "items in a constructor");
+        checkname(ls, &key);
+    } else /* ls->t.token == '[' */
+        yindex(ls, &key);
+    cc->nh++;
+    checknext(ls, '=');
+    rkkey = luaK_exp2RK(fs, &key);
+    expr(ls, &val);
+    luaK_codeABC(fs, OP_SETTABLE, cc->t->u.info, rkkey, luaK_exp2RK(fs, &val));
+    fs->freereg = reg;  /* free registers */
 }
 
 
-static void closelistfield (FuncState *fs, struct ConsControl *cc) {
-  if (cc->v.k == VVOID) return;  /* there is no list item */
-  luaK_exp2nextreg(fs, &cc->v);
-  cc->v.k = VVOID;
-  if (cc->tostore == LFIELDS_PER_FLUSH) {
-    luaK_setlist(fs, cc->t->u.info, cc->na, cc->tostore);  /* flush */
-    cc->tostore = 0;  /* no more items pending */
-  }
-}
-
-
-static void lastlistfield (FuncState *fs, struct ConsControl *cc) {
-  if (cc->tostore == 0) return;
-  if (hasmultret(cc->v.k)) {
-    luaK_setmultret(fs, &cc->v);
-    luaK_setlist(fs, cc->t->u.info, cc->na, LUA_MULTRET);
-    cc->na--;  /* do not count last expression (unknown number of elements) */
-  }
-  else {
-    if (cc->v.k != VVOID)
-      luaK_exp2nextreg(fs, &cc->v);
-    luaK_setlist(fs, cc->t->u.info, cc->na, cc->tostore);
-  }
-}
-
-
-static void listfield (LexState *ls, struct ConsControl *cc) {
-  /* listfield -> exp */
-  expr(ls, &cc->v);
-  checklimit(ls->fs, cc->na, MAX_INT, "items in a constructor");
-  cc->na++;
-  cc->tostore++;
-}
-
-
-static void field (LexState *ls, struct ConsControl *cc) {
-  /* field -> listfield | recfield */
-  switch(ls->t.token) {
-    case TK_NAME: {  /* may be 'listfield' or 'recfield' */
-      if (luaX_lookahead(ls) != '=')  /* expression? */
-        listfield(ls, cc);
-      else
-        recfield(ls, cc);
-      break;
+static void closelistfield(FuncState *fs, struct ConsControl *cc)
+{
+    if (cc->v.k == VVOID) return;  /* there is no list item */
+    luaK_exp2nextreg(fs, &cc->v);
+    cc->v.k = VVOID;
+    if (cc->tostore == LFIELDS_PER_FLUSH) {
+        luaK_setlist(fs, cc->t->u.info, cc->na, cc->tostore);  /* flush */
+        cc->tostore = 0;  /* no more items pending */
     }
-    case '[': {
-      recfield(ls, cc);
-      break;
-    }
-    default: {
-      listfield(ls, cc);
-      break;
-    }
-  }
 }
 
 
-static void constructor (LexState *ls, expdesc *t) {
-  /* constructor -> '{' [ field { sep field } [sep] ] '}'
-     sep -> ',' | ';' */
-  FuncState *fs = ls->fs;
-  int line = ls->linenumber;
-  int pc = luaK_codeABC(fs, OP_NEWTABLE, 0, 0, 0);
-  struct ConsControl cc;
-  cc.na = cc.nh = cc.tostore = 0;
-  cc.t = t;
-  init_exp(t, VRELOCABLE, pc);
-  init_exp(&cc.v, VVOID, 0);  /* no value (yet) */
-  luaK_exp2nextreg(ls->fs, t);  /* fix it at stack top */
-  checknext(ls, '{');
-  do {
-    lua_assert(cc.v.k == VVOID || cc.tostore > 0);
-    if (ls->t.token == '}') break;
-    closelistfield(fs, &cc);
-    field(ls, &cc);
-  } while (testnext(ls, ',') || testnext(ls, ';'));
-  check_match(ls, '}', '{', line);
-  lastlistfield(fs, &cc);
-  SETARG_B(fs->f->code[pc], luaO_int2fb(cc.na)); /* set initial array size */
-  SETARG_C(fs->f->code[pc], luaO_int2fb(cc.nh));  /* set initial table size */
+static void lastlistfield(FuncState *fs, struct ConsControl *cc)
+{
+    if (cc->tostore == 0) return;
+    if (hasmultret(cc->v.k)) {
+        luaK_setmultret(fs, &cc->v);
+        luaK_setlist(fs, cc->t->u.info, cc->na, LUA_MULTRET);
+        cc->na--;  /* do not count last expression (unknown number of elements) */
+    } else {
+        if (cc->v.k != VVOID)
+            luaK_exp2nextreg(fs, &cc->v);
+        luaK_setlist(fs, cc->t->u.info, cc->na, cc->tostore);
+    }
+}
+
+
+static void listfield(LexState *ls, struct ConsControl *cc)
+{
+    /* listfield -> exp */
+    expr(ls, &cc->v);
+    checklimit(ls->fs, cc->na, MAX_INT, "items in a constructor");
+    cc->na++;
+    cc->tostore++;
+}
+
+
+static void field(LexState *ls, struct ConsControl *cc)
+{
+    /* field -> listfield | recfield */
+    switch (ls->t.token) {
+        case TK_NAME: {  /* may be 'listfield' or 'recfield' */
+            if (luaX_lookahead(ls) != '=')  /* expression? */
+                listfield(ls, cc);
+            else
+                recfield(ls, cc);
+            break;
+        }
+        case '[': {
+            recfield(ls, cc);
+            break;
+        }
+        default: {
+            listfield(ls, cc);
+            break;
+        }
+    }
+}
+
+
+static void constructor(LexState *ls, expdesc *t)
+{
+    /* constructor -> '{' [ field { sep field } [sep] ] '}'
+       sep -> ',' | ';' */
+    FuncState *fs = ls->fs;
+    int line = ls->linenumber;
+    int pc = luaK_codeABC(fs, OP_NEWTABLE, 0, 0, 0);
+    struct ConsControl cc;
+    cc.na = cc.nh = cc.tostore = 0;
+    cc.t = t;
+    init_exp(t, VRELOCABLE, pc);
+    init_exp(&cc.v, VVOID, 0);  /* no value (yet) */
+    luaK_exp2nextreg(ls->fs, t);  /* fix it at stack top */
+    checknext(ls, '{');
+    do {
+        lua_assert(cc.v.k == VVOID || cc.tostore > 0);
+        if (ls->t.token == '}') break;
+        closelistfield(fs, &cc);
+        field(ls, &cc);
+    } while (testnext(ls, ',') || testnext(ls, ';'));
+    check_match(ls, '}', '{', line);
+    lastlistfield(fs, &cc);
+    SETARG_B(fs->f->code[pc], luaO_int2fb(cc.na)); /* set initial array size */
+    SETARG_C(fs->f->code[pc], luaO_int2fb(cc.nh));  /* set initial table size */
 }
 
 /* }====================================================================== */
 
 
 
-static void parlist (LexState *ls) {
-  /* parlist -> [ param { `,' param } ] */
-  FuncState *fs = ls->fs;
-  Proto *f = fs->f;
-  int nparams = 0;
-  f->is_vararg = 0;
-  if (ls->t.token != ')') {  /* is `parlist' not empty? */
-    do {
-      switch (ls->t.token) {
-        case TK_NAME: {  /* param -> NAME */
-          new_localvar(ls, str_checkname(ls));
-          nparams++;
-          break;
-        }
-        case TK_DOTS: {  /* param -> `...' */
-          luaX_next(ls);
-          f->is_vararg = 1;
-          break;
-        }
-        default: luaX_syntaxerror(ls, "<name> or " LUA_QL("...") " expected");
-      }
-    } while (!f->is_vararg && testnext(ls, ','));
-  }
-  adjustlocalvars(ls, nparams);
-  f->numparams = cast_byte(fs->nactvar);
-  luaK_reserveregs(fs, fs->nactvar);  /* reserve register for parameters */
+static void parlist(LexState *ls)
+{
+    /* parlist -> [ param { `,' param } ] */
+    FuncState *fs = ls->fs;
+    Proto *f = fs->f;
+    int nparams = 0;
+    f->is_vararg = 0;
+    if (ls->t.token != ')') {  /* is `parlist' not empty? */
+        do {
+            switch (ls->t.token) {
+                case TK_NAME: {  /* param -> NAME */
+                    new_localvar(ls, str_checkname(ls));
+                    nparams++;
+                    break;
+                }
+                case TK_DOTS: {  /* param -> `...' */
+                    luaX_next(ls);
+                    f->is_vararg = 1;
+                    break;
+                }
+                default:
+                    luaX_syntaxerror(ls, "<name> or " LUA_QL("...") " expected");
+            }
+        } while (!f->is_vararg && testnext(ls, ','));
+    }
+    adjustlocalvars(ls, nparams);
+    f->numparams = cast_byte(fs->nactvar);
+    luaK_reserveregs(fs, fs->nactvar);  /* reserve register for parameters */
 }
 
 
-static void body (LexState *ls, expdesc *e, int ismethod, int line) {
-  /* body ->  `(' parlist `)' block END */
-  FuncState new_fs;
-  BlockCnt bl;
-  new_fs.f = addprototype(ls);
-  new_fs.f->linedefined = line;
-  open_func(ls, &new_fs, &bl);
-  checknext(ls, '(');
-  if (ismethod) {
-    new_localvarliteral(ls, "self");  /* create 'self' parameter */
-    adjustlocalvars(ls, 1);
-  }
-  parlist(ls);
-  checknext(ls, ')');
-  statlist(ls);
-  new_fs.f->lastlinedefined = ls->linenumber;
-  check_match(ls, TK_END, TK_FUNCTION, line);
-  codeclosure(ls, e);
-  close_func(ls);
+static void body(LexState *ls, expdesc *e, int ismethod, int line)
+{
+    /* body ->  `(' parlist `)' block END */
+    FuncState new_fs;
+    BlockCnt bl;
+    new_fs.f = addprototype(ls);
+    new_fs.f->linedefined = line;
+    open_func(ls, &new_fs, &bl);
+    checknext(ls, '(');
+    if (ismethod) {
+        new_localvarliteral(ls, "self");  /* create 'self' parameter */
+        adjustlocalvars(ls, 1);
+    }
+    parlist(ls);
+    checknext(ls, ')');
+    statlist(ls);
+    new_fs.f->lastlinedefined = ls->linenumber;
+    check_match(ls, TK_END, TK_FUNCTION, line);
+    codeclosure(ls, e);
+    close_func(ls);
 }
 
 
-static int explist (LexState *ls, expdesc *v) {
-  /* explist -> expr { `,' expr } */
-  int n = 1;  /* at least one expression */
-  expr(ls, v);
-  while (testnext(ls, ',')) {
-    luaK_exp2nextreg(ls->fs, v);
+static int explist(LexState *ls, expdesc *v)
+{
+    /* explist -> expr { `,' expr } */
+    int n = 1;  /* at least one expression */
     expr(ls, v);
-    n++;
-  }
-  return n;
+    while (testnext(ls, ',')) {
+        luaK_exp2nextreg(ls->fs, v);
+        expr(ls, v);
+        n++;
+    }
+    return n;
 }
 
 
-static void funcargs (LexState *ls, expdesc *f, int line) {
-  FuncState *fs = ls->fs;
-  expdesc args;
-  int base, nparams;
-  switch (ls->t.token) {
-    case '(': {  /* funcargs -> `(' [ explist ] `)' */
-      luaX_next(ls);
-      if (ls->t.token == ')')  /* arg list is empty? */
-        args.k = VVOID;
-      else {
-        explist(ls, &args);
-        luaK_setmultret(fs, &args);
-      }
-      check_match(ls, ')', '(', line);
-      break;
+static void funcargs(LexState *ls, expdesc *f, int line)
+{
+    FuncState *fs = ls->fs;
+    expdesc args;
+    int base, nparams;
+    switch (ls->t.token) {
+        case '(': {  /* funcargs -> `(' [ explist ] `)' */
+            luaX_next(ls);
+            if (ls->t.token == ')')  /* arg list is empty? */
+                args.k = VVOID;
+            else {
+                explist(ls, &args);
+                luaK_setmultret(fs, &args);
+            }
+            check_match(ls, ')', '(', line);
+            break;
+        }
+        case '{': {  /* funcargs -> constructor */
+            constructor(ls, &args);
+            break;
+        }
+        case TK_STRING: {  /* funcargs -> STRING */
+            codestring(ls, &args, ls->t.seminfo.ts);
+            luaX_next(ls);  /* must use `seminfo' before `next' */
+            break;
+        }
+        default: {
+            luaX_syntaxerror(ls, "function arguments expected");
+        }
     }
-    case '{': {  /* funcargs -> constructor */
-      constructor(ls, &args);
-      break;
+    lua_assert(f->k == VNONRELOC);
+    base = f->u.info;  /* base register for call */
+    if (hasmultret(args.k))
+        nparams = LUA_MULTRET;  /* open call */
+    else {
+        if (args.k != VVOID)
+            luaK_exp2nextreg(fs, &args);  /* close last argument */
+        nparams = fs->freereg - (base + 1);
     }
-    case TK_STRING: {  /* funcargs -> STRING */
-      codestring(ls, &args, ls->t.seminfo.ts);
-      luaX_next(ls);  /* must use `seminfo' before `next' */
-      break;
-    }
-    default: {
-      luaX_syntaxerror(ls, "function arguments expected");
-    }
-  }
-  lua_assert(f->k == VNONRELOC);
-  base = f->u.info;  /* base register for call */
-  if (hasmultret(args.k))
-    nparams = LUA_MULTRET;  /* open call */
-  else {
-    if (args.k != VVOID)
-      luaK_exp2nextreg(fs, &args);  /* close last argument */
-    nparams = fs->freereg - (base+1);
-  }
-  init_exp(f, VCALL, luaK_codeABC(fs, OP_CALL, base, nparams+1, 2));
-  luaK_fixline(fs, line);
-  fs->freereg = base+1;  /* call remove function and arguments and leaves
+    init_exp(f, VCALL, luaK_codeABC(fs, OP_CALL, base, nparams + 1, 2));
+    luaK_fixline(fs, line);
+    fs->freereg = base + 1;  /* call remove function and arguments and leaves
                             (unless changed) one result */
 }
 
@@ -874,157 +928,185 @@ static void funcargs (LexState *ls, expdesc *f, int line) {
 */
 
 
-static void primaryexp (LexState *ls, expdesc *v) {
-  /* primaryexp -> NAME | '(' expr ')' */
-  switch (ls->t.token) {
-    case '(': {
-      int line = ls->linenumber;
-      luaX_next(ls);
-      expr(ls, v);
-      check_match(ls, ')', '(', line);
-      luaK_dischargevars(ls->fs, v);
-      return;
-    }
-    case TK_NAME: {
-      singlevar(ls, v);
-      return;
-    }
-    default: {
-      luaX_syntaxerror(ls, "unexpected symbol");
-    }
-  }
-}
-
-
-static void suffixedexp (LexState *ls, expdesc *v) {
-  /* suffixedexp ->
-       primaryexp { '.' NAME | '[' exp ']' | ':' NAME funcargs | funcargs } */
-  FuncState *fs = ls->fs;
-  int line = ls->linenumber;
-  primaryexp(ls, v);
-  for (;;) {
+static void primaryexp(LexState *ls, expdesc *v)
+{
+    /* primaryexp -> NAME | '(' expr ')' */
     switch (ls->t.token) {
-      case '.': {  /* fieldsel */
-        fieldsel(ls, v);
-        break;
-      }
-      case '[': {  /* `[' exp1 `]' */
-        expdesc key;
-        luaK_exp2anyregup(fs, v);
-        yindex(ls, &key);
-        luaK_indexed(fs, v, &key);
-        break;
-      }
-      case ':': {  /* `:' NAME funcargs */
-        expdesc key;
-        luaX_next(ls);
-        checkname(ls, &key);
-        luaK_self(fs, v, &key);
-        funcargs(ls, v, line);
-        break;
-      }
-      case '(': case TK_STRING: case '{': {  /* funcargs */
-        luaK_exp2nextreg(fs, v);
-        funcargs(ls, v, line);
-        break;
-      }
-      default: return;
+        case '(': {
+            int line = ls->linenumber;
+            luaX_next(ls);
+            expr(ls, v);
+            check_match(ls, ')', '(', line);
+            luaK_dischargevars(ls->fs, v);
+            return;
+        }
+        case TK_NAME: {
+            singlevar(ls, v);
+            return;
+        }
+        default: {
+            luaX_syntaxerror(ls, "unexpected symbol");
+        }
     }
-  }
 }
 
 
-static void simpleexp (LexState *ls, expdesc *v) {
-  /* simpleexp -> NUMBER | STRING | NIL | TRUE | FALSE | ... |
-                  constructor | FUNCTION body | suffixedexp */
-  switch (ls->t.token) {
-    case TK_NUMBER: {
-      init_exp(v, VKNUM, 0);
-      v->u.nval = ls->t.seminfo.r;
-      break;
+static void suffixedexp(LexState *ls, expdesc *v)
+{
+    /* suffixedexp ->
+         primaryexp { '.' NAME | '[' exp ']' | ':' NAME funcargs | funcargs } */
+    FuncState *fs = ls->fs;
+    int line = ls->linenumber;
+    primaryexp(ls, v);
+    for (;;) {
+        switch (ls->t.token) {
+            case '.': {  /* fieldsel */
+                fieldsel(ls, v);
+                break;
+            }
+            case '[': {  /* `[' exp1 `]' */
+                expdesc key;
+                luaK_exp2anyregup(fs, v);
+                yindex(ls, &key);
+                luaK_indexed(fs, v, &key);
+                break;
+            }
+            case ':': {  /* `:' NAME funcargs */
+                expdesc key;
+                luaX_next(ls);
+                checkname(ls, &key);
+                luaK_self(fs, v, &key);
+                funcargs(ls, v, line);
+                break;
+            }
+            case '(':
+            case TK_STRING:
+            case '{': {  /* funcargs */
+                luaK_exp2nextreg(fs, v);
+                funcargs(ls, v, line);
+                break;
+            }
+            default:
+                return;
+        }
     }
-    case TK_STRING: {
-      codestring(ls, v, ls->t.seminfo.ts);
-      break;
-    }
-    case TK_NIL: {
-      init_exp(v, VNIL, 0);
-      break;
-    }
-    case TK_TRUE: {
-      init_exp(v, VTRUE, 0);
-      break;
-    }
-    case TK_FALSE: {
-      init_exp(v, VFALSE, 0);
-      break;
-    }
-    case TK_DOTS: {  /* vararg */
-      FuncState *fs = ls->fs;
-      check_condition(ls, fs->f->is_vararg,
-                      "cannot use " LUA_QL("...") " outside a vararg function");
-      init_exp(v, VVARARG, luaK_codeABC(fs, OP_VARARG, 0, 1, 0));
-      break;
-    }
-    case '{': {  /* constructor */
-      constructor(ls, v);
-      return;
-    }
-    case TK_FUNCTION: {
-      luaX_next(ls);
-      body(ls, v, 0, ls->linenumber);
-      return;
-    }
-    default: {
-      suffixedexp(ls, v);
-      return;
-    }
-  }
-  luaX_next(ls);
 }
 
 
-static UnOpr getunopr (int op) {
-  switch (op) {
-    case TK_NOT: return OPR_NOT;
-    case '-': return OPR_MINUS;
-    case '#': return OPR_LEN;
-    default: return OPR_NOUNOPR;
-  }
+static void simpleexp(LexState *ls, expdesc *v)
+{
+    /* simpleexp -> NUMBER | STRING | NIL | TRUE | FALSE | ... |
+                    constructor | FUNCTION body | suffixedexp */
+    switch (ls->t.token) {
+        case TK_NUMBER: {
+            init_exp(v, VKNUM, 0);
+            v->u.nval = ls->t.seminfo.r;
+            break;
+        }
+        case TK_STRING: {
+            codestring(ls, v, ls->t.seminfo.ts);
+            break;
+        }
+        case TK_NIL: {
+            init_exp(v, VNIL, 0);
+            break;
+        }
+        case TK_TRUE: {
+            init_exp(v, VTRUE, 0);
+            break;
+        }
+        case TK_FALSE: {
+            init_exp(v, VFALSE, 0);
+            break;
+        }
+        case TK_DOTS: {  /* vararg */
+            FuncState *fs = ls->fs;
+            check_condition(ls, fs->f->is_vararg,
+                            "cannot use " LUA_QL("...") " outside a vararg function");
+            init_exp(v, VVARARG, luaK_codeABC(fs, OP_VARARG, 0, 1, 0));
+            break;
+        }
+        case '{': {  /* constructor */
+            constructor(ls, v);
+            return;
+        }
+        case TK_FUNCTION: {
+            luaX_next(ls);
+            body(ls, v, 0, ls->linenumber);
+            return;
+        }
+        default: {
+            suffixedexp(ls, v);
+            return;
+        }
+    }
+    luaX_next(ls);
 }
 
 
-static BinOpr getbinopr (int op) {
-  switch (op) {
-    case '+': return OPR_ADD;
-    case '-': return OPR_SUB;
-    case '*': return OPR_MUL;
-    case '/': return OPR_DIV;
-    case '%': return OPR_MOD;
-    case '^': return OPR_POW;
-    case TK_CONCAT: return OPR_CONCAT;
-    case TK_NE: return OPR_NE;
-    case TK_EQ: return OPR_EQ;
-    case '<': return OPR_LT;
-    case TK_LE: return OPR_LE;
-    case '>': return OPR_GT;
-    case TK_GE: return OPR_GE;
-    case TK_AND: return OPR_AND;
-    case TK_OR: return OPR_OR;
-    default: return OPR_NOBINOPR;
-  }
+static UnOpr getunopr(int op)
+{
+    switch (op) {
+        case TK_NOT:
+            return OPR_NOT;
+        case '-':
+            return OPR_MINUS;
+        case '#':
+            return OPR_LEN;
+        default:
+            return OPR_NOUNOPR;
+    }
+}
+
+
+static BinOpr getbinopr(int op)
+{
+    switch (op) {
+        case '+':
+            return OPR_ADD;
+        case '-':
+            return OPR_SUB;
+        case '*':
+            return OPR_MUL;
+        case '/':
+            return OPR_DIV;
+        case '%':
+            return OPR_MOD;
+        case '^':
+            return OPR_POW;
+        case TK_CONCAT:
+            return OPR_CONCAT;
+        case TK_NE:
+            return OPR_NE;
+        case TK_EQ:
+            return OPR_EQ;
+        case '<':
+            return OPR_LT;
+        case TK_LE:
+            return OPR_LE;
+        case '>':
+            return OPR_GT;
+        case TK_GE:
+            return OPR_GE;
+        case TK_AND:
+            return OPR_AND;
+        case TK_OR:
+            return OPR_OR;
+        default:
+            return OPR_NOBINOPR;
+    }
 }
 
 
 static const struct {
-  lu_byte left;  /* left priority for each binary operator */
-  lu_byte right; /* right priority */
+    lu_byte left;  /* left priority for each binary operator */
+    lu_byte right; /* right priority */
 } priority[] = {  /* ORDER OPR */
-   {6, 6}, {6, 6}, {7, 7}, {7, 7}, {7, 7},  /* `+' `-' `*' `/' `%' */
-   {10, 9}, {5, 4},                 /* ^, .. (right associative) */
-   {3, 3}, {3, 3}, {3, 3},          /* ==, <, <= */
-   {3, 3}, {3, 3}, {3, 3},          /* ~=, >, >= */
-   {2, 2}, {1, 1}                   /* and, or */
+    {6, 6}, {6, 6}, {7, 7}, {7, 7}, {7, 7},  /* `+' `-' `*' `/' `%' */
+    {10, 9}, {5, 4},                 /* ^, .. (right associative) */
+    {3, 3}, {3, 3}, {3, 3},          /* ==, <, <= */
+    {3, 3}, {3, 3}, {3, 3},          /* ~=, >, >= */
+    {2, 2}, {1, 1}                   /* and, or */
 };
 
 #define UNARY_PRIORITY 8  /* priority for unary operators */
@@ -1034,38 +1116,39 @@ static const struct {
 ** subexpr -> (simpleexp | unop subexpr) { binop subexpr }
 ** where `binop' is any binary operator with a priority higher than `limit'
 */
-static BinOpr subexpr (LexState *ls, expdesc *v, int limit) {
-  BinOpr op;
-  UnOpr uop;
-  enterlevel(ls);
-  uop = getunopr(ls->t.token);
-  if (uop != OPR_NOUNOPR) {
-    int line = ls->linenumber;
-    luaX_next(ls);
-    subexpr(ls, v, UNARY_PRIORITY);
-    luaK_prefix(ls->fs, uop, v, line);
-  }
-  else simpleexp(ls, v);
-  /* expand while operators have priorities higher than `limit' */
-  op = getbinopr(ls->t.token);
-  while (op != OPR_NOBINOPR && priority[op].left > limit) {
-    expdesc v2;
-    BinOpr nextop;
-    int line = ls->linenumber;
-    luaX_next(ls);
-    luaK_infix(ls->fs, op, v);
-    /* read sub-expression with higher priority */
-    nextop = subexpr(ls, &v2, priority[op].right);
-    luaK_posfix(ls->fs, op, v, &v2, line);
-    op = nextop;
-  }
-  leavelevel(ls);
-  return op;  /* return first untreated operator */
+static BinOpr subexpr(LexState *ls, expdesc *v, int limit)
+{
+    BinOpr op;
+    UnOpr uop;
+    enterlevel(ls);
+    uop = getunopr(ls->t.token);
+    if (uop != OPR_NOUNOPR) {
+        int line = ls->linenumber;
+        luaX_next(ls);
+        subexpr(ls, v, UNARY_PRIORITY);
+        luaK_prefix(ls->fs, uop, v, line);
+    } else simpleexp(ls, v);
+    /* expand while operators have priorities higher than `limit' */
+    op = getbinopr(ls->t.token);
+    while (op != OPR_NOBINOPR && priority[op].left > limit) {
+        expdesc v2;
+        BinOpr nextop;
+        int line = ls->linenumber;
+        luaX_next(ls);
+        luaK_infix(ls->fs, op, v);
+        /* read sub-expression with higher priority */
+        nextop = subexpr(ls, &v2, priority[op].right);
+        luaK_posfix(ls->fs, op, v, &v2, line);
+        op = nextop;
+    }
+    leavelevel(ls);
+    return op;  /* return first untreated operator */
 }
 
 
-static void expr (LexState *ls, expdesc *v) {
-  subexpr(ls, v, 0);
+static void expr(LexState *ls, expdesc *v)
+{
+    subexpr(ls, v, 0);
 }
 
 /* }==================================================================== */
@@ -1079,13 +1162,14 @@ static void expr (LexState *ls, expdesc *v) {
 */
 
 
-static void block (LexState *ls) {
-  /* block -> statlist */
-  FuncState *fs = ls->fs;
-  BlockCnt bl;
-  enterblock(fs, &bl, 0);
-  statlist(ls);
-  leaveblock(fs);
+static void block(LexState *ls)
+{
+    /* block -> statlist */
+    FuncState *fs = ls->fs;
+    BlockCnt bl;
+    enterblock(fs, &bl, 0);
+    statlist(ls);
+    leaveblock(fs);
 }
 
 
@@ -1094,8 +1178,8 @@ static void block (LexState *ls) {
 ** assignment
 */
 struct LHS_assign {
-  struct LHS_assign *prev;
-  expdesc v;  /* variable (global, local, upvalue, or indexed) */
+    struct LHS_assign *prev;
+    expdesc v;  /* variable (global, local, upvalue, or indexed) */
 };
 
 
@@ -1105,493 +1189,516 @@ struct LHS_assign {
 ** table. If so, save original upvalue/local value in a safe place and
 ** use this safe copy in the previous assignment.
 */
-static void check_conflict (LexState *ls, struct LHS_assign *lh, expdesc *v) {
-  FuncState *fs = ls->fs;
-  int extra = fs->freereg;  /* eventual position to save local variable */
-  int conflict = 0;
-  for (; lh; lh = lh->prev) {  /* check all previous assignments */
-    if (lh->v.k == VINDEXED) {  /* assigning to a table? */
-      /* table is the upvalue/local being assigned now? */
-      if (lh->v.u.ind.vt == v->k && lh->v.u.ind.t == v->u.info) {
-        conflict = 1;
-        lh->v.u.ind.vt = VLOCAL;
-        lh->v.u.ind.t = extra;  /* previous assignment will use safe copy */
-      }
-      /* index is the local being assigned? (index cannot be upvalue) */
-      if (v->k == VLOCAL && lh->v.u.ind.idx == v->u.info) {
-        conflict = 1;
-        lh->v.u.ind.idx = extra;  /* previous assignment will use safe copy */
-      }
+static void check_conflict(LexState *ls, struct LHS_assign *lh, expdesc *v)
+{
+    FuncState *fs = ls->fs;
+    int extra = fs->freereg;  /* eventual position to save local variable */
+    int conflict = 0;
+    for (; lh; lh = lh->prev) {  /* check all previous assignments */
+        if (lh->v.k == VINDEXED) {  /* assigning to a table? */
+            /* table is the upvalue/local being assigned now? */
+            if (lh->v.u.ind.vt == v->k && lh->v.u.ind.t == v->u.info) {
+                conflict = 1;
+                lh->v.u.ind.vt = VLOCAL;
+                lh->v.u.ind.t = extra;  /* previous assignment will use safe copy */
+            }
+            /* index is the local being assigned? (index cannot be upvalue) */
+            if (v->k == VLOCAL && lh->v.u.ind.idx == v->u.info) {
+                conflict = 1;
+                lh->v.u.ind.idx = extra;  /* previous assignment will use safe copy */
+            }
+        }
+    }
+    if (conflict) {
+        /* copy upvalue/local value to a temporary (in position 'extra') */
+        OpCode op = (v->k == VLOCAL) ? OP_MOVE : OP_GETUPVAL;
+        luaK_codeABC(fs, op, extra, v->u.info, 0);
+        luaK_reserveregs(fs, 1);
     }
-  }
-  if (conflict) {
-    /* copy upvalue/local value to a temporary (in position 'extra') */
-    OpCode op = (v->k == VLOCAL) ? OP_MOVE : OP_GETUPVAL;
-    luaK_codeABC(fs, op, extra, v->u.info, 0);
-    luaK_reserveregs(fs, 1);
-  }
 }
 
 
-static void assignment (LexState *ls, struct LHS_assign *lh, int nvars) {
-  expdesc e;
-  check_condition(ls, vkisvar(lh->v.k), "syntax error");
-  if (testnext(ls, ',')) {  /* assignment -> ',' suffixedexp assignment */
-    struct LHS_assign nv;
-    nv.prev = lh;
-    suffixedexp(ls, &nv.v);
-    if (nv.v.k != VINDEXED)
-      check_conflict(ls, lh, &nv.v);
-    checklimit(ls->fs, nvars + ls->L->nCcalls, LUAI_MAXCCALLS,
-                    "C levels");
-    assignment(ls, &nv, nvars+1);
-  }
-  else {  /* assignment -> `=' explist */
-    int nexps;
-    checknext(ls, '=');
-    nexps = explist(ls, &e);
-    if (nexps != nvars) {
-      adjust_assign(ls, nvars, nexps, &e);
-      if (nexps > nvars)
-        ls->fs->freereg -= nexps - nvars;  /* remove extra values */
+static void assignment(LexState *ls, struct LHS_assign *lh, int nvars)
+{
+    expdesc e;
+    check_condition(ls, vkisvar(lh->v.k), "syntax error");
+    if (testnext(ls, ',')) {  /* assignment -> ',' suffixedexp assignment */
+        struct LHS_assign nv;
+        nv.prev = lh;
+        suffixedexp(ls, &nv.v);
+        if (nv.v.k != VINDEXED)
+            check_conflict(ls, lh, &nv.v);
+        checklimit(ls->fs, nvars + ls->L->nCcalls, LUAI_MAXCCALLS,
+                   "C levels");
+        assignment(ls, &nv, nvars + 1);
+    } else { /* assignment -> `=' explist */
+        int nexps;
+        checknext(ls, '=');
+        nexps = explist(ls, &e);
+        if (nexps != nvars) {
+            adjust_assign(ls, nvars, nexps, &e);
+            if (nexps > nvars)
+                ls->fs->freereg -= nexps - nvars;  /* remove extra values */
+        } else {
+            luaK_setoneret(ls->fs, &e);  /* close last expression */
+            luaK_storevar(ls->fs, &lh->v, &e);
+            return;  /* avoid default */
+        }
     }
+    init_exp(&e, VNONRELOC, ls->fs->freereg - 1); /* default assignment */
+    luaK_storevar(ls->fs, &lh->v, &e);
+}
+
+
+static int cond(LexState *ls)
+{
+    /* cond -> exp */
+    expdesc v;
+    expr(ls, &v);  /* read condition */
+    if (v.k == VNIL) v.k = VFALSE;  /* `falses' are all equal here */
+    luaK_goiftrue(ls->fs, &v);
+    return v.f;
+}
+
+
+static void gotostat(LexState *ls, int pc)
+{
+    int line = ls->linenumber;
+    TString *label;
+    int g;
+    if (testnext(ls, TK_GOTO))
+        label = str_checkname(ls);
     else {
-      luaK_setoneret(ls->fs, &e);  /* close last expression */
-      luaK_storevar(ls->fs, &lh->v, &e);
-      return;  /* avoid default */
+        luaX_next(ls);  /* skip break */
+        label = luaS_new(ls->L, "break");
     }
-  }
-  init_exp(&e, VNONRELOC, ls->fs->freereg-1);  /* default assignment */
-  luaK_storevar(ls->fs, &lh->v, &e);
-}
-
-
-static int cond (LexState *ls) {
-  /* cond -> exp */
-  expdesc v;
-  expr(ls, &v);  /* read condition */
-  if (v.k == VNIL) v.k = VFALSE;  /* `falses' are all equal here */
-  luaK_goiftrue(ls->fs, &v);
-  return v.f;
-}
-
-
-static void gotostat (LexState *ls, int pc) {
-  int line = ls->linenumber;
-  TString *label;
-  int g;
-  if (testnext(ls, TK_GOTO))
-    label = str_checkname(ls);
-  else {
-    luaX_next(ls);  /* skip break */
-    label = luaS_new(ls->L, "break");
-  }
-  g = newlabelentry(ls, &ls->dyd->gt, label, line, pc);
-  findlabel(ls, g);  /* close it if label already defined */
+    g = newlabelentry(ls, &ls->dyd->gt, label, line, pc);
+    findlabel(ls, g);  /* close it if label already defined */
 }
 
 
 /* check for repeated labels on the same block */
-static void checkrepeated (FuncState *fs, Labellist *ll, TString *label) {
-  int i;
-  for (i = fs->bl->firstlabel; i < ll->n; i++) {
-    if (luaS_eqstr(label, ll->arr[i].name)) {
-      const char *msg = luaO_pushfstring(fs->ls->L,
-                          "label " LUA_QS " already defined on line %d",
-                          getstr(label), ll->arr[i].line);
-      semerror(fs->ls, msg);
+static void checkrepeated(FuncState *fs, Labellist *ll, TString *label)
+{
+    int i;
+    for (i = fs->bl->firstlabel; i < ll->n; i++) {
+        if (luaS_eqstr(label, ll->arr[i].name)) {
+            const char *msg = luaO_pushfstring(fs->ls->L,
+                                               "label " LUA_QS " already defined on line %d",
+                                               getstr(label), ll->arr[i].line);
+            semerror(fs->ls, msg);
+        }
     }
-  }
 }
 
 
 /* skip no-op statements */
-static void skipnoopstat (LexState *ls) {
-  while (ls->t.token == ';' || ls->t.token == TK_DBCOLON)
-    statement(ls);
+static void skipnoopstat(LexState *ls)
+{
+    while (ls->t.token == ';' || ls->t.token == TK_DBCOLON)
+        statement(ls);
 }
 
 
-static void labelstat (LexState *ls, TString *label, int line) {
-  /* label -> '::' NAME '::' */
-  FuncState *fs = ls->fs;
-  Labellist *ll = &ls->dyd->label;
-  int l;  /* index of new label being created */
-  checkrepeated(fs, ll, label);  /* check for repeated labels */
-  checknext(ls, TK_DBCOLON);  /* skip double colon */
-  /* create new entry for this label */
-  l = newlabelentry(ls, ll, label, line, fs->pc);
-  skipnoopstat(ls);  /* skip other no-op statements */
-  if (block_follow(ls, 0)) {  /* label is last no-op statement in the block? */
-    /* assume that locals are already out of scope */
-    ll->arr[l].nactvar = fs->bl->nactvar;
-  }
-  findgotos(ls, &ll->arr[l]);
-}
-
-
-static void whilestat (LexState *ls, int line) {
-  /* whilestat -> WHILE cond DO block END */
-  FuncState *fs = ls->fs;
-  int whileinit;
-  int condexit;
-  BlockCnt bl;
-  luaX_next(ls);  /* skip WHILE */
-  whileinit = luaK_getlabel(fs);
-  condexit = cond(ls);
-  enterblock(fs, &bl, 1);
-  checknext(ls, TK_DO);
-  block(ls);
-  luaK_jumpto(fs, whileinit);
-  check_match(ls, TK_END, TK_WHILE, line);
-  leaveblock(fs);
-  luaK_patchtohere(fs, condexit);  /* false conditions finish the loop */
-}
-
-
-static void repeatstat (LexState *ls, int line) {
-  /* repeatstat -> REPEAT block UNTIL cond */
-  int condexit;
-  FuncState *fs = ls->fs;
-  int repeat_init = luaK_getlabel(fs);
-  BlockCnt bl1, bl2;
-  enterblock(fs, &bl1, 1);  /* loop block */
-  enterblock(fs, &bl2, 0);  /* scope block */
-  luaX_next(ls);  /* skip REPEAT */
-  statlist(ls);
-  check_match(ls, TK_UNTIL, TK_REPEAT, line);
-  condexit = cond(ls);  /* read condition (inside scope block) */
-  if (bl2.upval)  /* upvalues? */
-    luaK_patchclose(fs, condexit, bl2.nactvar);
-  leaveblock(fs);  /* finish scope */
-  luaK_patchlist(fs, condexit, repeat_init);  /* close the loop */
-  leaveblock(fs);  /* finish loop */
-}
-
-
-static int exp1 (LexState *ls) {
-  expdesc e;
-  int reg;
-  expr(ls, &e);
-  luaK_exp2nextreg(ls->fs, &e);
-  lua_assert(e.k == VNONRELOC);
-  reg = e.u.info;
-  return reg;
-}
-
-
-static void forbody (LexState *ls, int base, int line, int nvars, int isnum) {
-  /* forbody -> DO block */
-  BlockCnt bl;
-  FuncState *fs = ls->fs;
-  int prep, endfor;
-  adjustlocalvars(ls, 3);  /* control variables */
-  checknext(ls, TK_DO);
-  prep = isnum ? luaK_codeAsBx(fs, OP_FORPREP, base, NO_JUMP) : luaK_jump(fs);
-  enterblock(fs, &bl, 0);  /* scope for declared variables */
-  adjustlocalvars(ls, nvars);
-  luaK_reserveregs(fs, nvars);
-  block(ls);
-  leaveblock(fs);  /* end of scope for declared variables */
-  luaK_patchtohere(fs, prep);
-  if (isnum)  /* numeric for? */
-    endfor = luaK_codeAsBx(fs, OP_FORLOOP, base, NO_JUMP);
-  else {  /* generic for */
-    luaK_codeABC(fs, OP_TFORCALL, base, 0, nvars);
-    luaK_fixline(fs, line);
-    endfor = luaK_codeAsBx(fs, OP_TFORLOOP, base + 2, NO_JUMP);
-  }
-  luaK_patchlist(fs, endfor, prep + 1);
-  luaK_fixline(fs, line);
-}
-
-
-static void fornum (LexState *ls, TString *varname, int line) {
-  /* fornum -> NAME = exp1,exp1[,exp1] forbody */
-  FuncState *fs = ls->fs;
-  int base = fs->freereg;
-  new_localvarliteral(ls, "(for index)");
-  new_localvarliteral(ls, "(for limit)");
-  new_localvarliteral(ls, "(for step)");
-  new_localvar(ls, varname);
-  checknext(ls, '=');
-  exp1(ls);  /* initial value */
-  checknext(ls, ',');
-  exp1(ls);  /* limit */
-  if (testnext(ls, ','))
-    exp1(ls);  /* optional step */
-  else {  /* default step = 1 */
-    luaK_codek(fs, fs->freereg, luaK_numberK(fs, 1));
-    luaK_reserveregs(fs, 1);
-  }
-  forbody(ls, base, line, 1, 1);
-}
-
-
-static void forlist (LexState *ls, TString *indexname) {
-  /* forlist -> NAME {,NAME} IN explist forbody */
-  FuncState *fs = ls->fs;
-  expdesc e;
-  int nvars = 4;  /* gen, state, control, plus at least one declared var */
-  int line;
-  int base = fs->freereg;
-  /* create control variables */
-  new_localvarliteral(ls, "(for generator)");
-  new_localvarliteral(ls, "(for state)");
-  new_localvarliteral(ls, "(for control)");
-  /* create declared variables */
-  new_localvar(ls, indexname);
-  while (testnext(ls, ',')) {
-    new_localvar(ls, str_checkname(ls));
-    nvars++;
-  }
-  checknext(ls, TK_IN);
-  line = ls->linenumber;
-  adjust_assign(ls, 3, explist(ls, &e), &e);
-  luaK_checkstack(fs, 3);  /* extra space to call generator */
-  forbody(ls, base, line, nvars - 3, 0);
-}
-
-
-static void forstat (LexState *ls, int line) {
-  /* forstat -> FOR (fornum | forlist) END */
-  FuncState *fs = ls->fs;
-  TString *varname;
-  BlockCnt bl;
-  enterblock(fs, &bl, 1);  /* scope for loop and control variables */
-  luaX_next(ls);  /* skip `for' */
-  varname = str_checkname(ls);  /* first variable name */
-  switch (ls->t.token) {
-    case '=': fornum(ls, varname, line); break;
-    case ',': case TK_IN: forlist(ls, varname); break;
-    default: luaX_syntaxerror(ls, LUA_QL("=") " or " LUA_QL("in") " expected");
-  }
-  check_match(ls, TK_END, TK_FOR, line);
-  leaveblock(fs);  /* loop scope (`break' jumps to this point) */
-}
-
-
-static void test_then_block (LexState *ls, int *escapelist) {
-  /* test_then_block -> [IF | ELSEIF] cond THEN block */
-  BlockCnt bl;
-  FuncState *fs = ls->fs;
-  expdesc v;
-  int jf;  /* instruction to skip 'then' code (if condition is false) */
-  luaX_next(ls);  /* skip IF or ELSEIF */
-  expr(ls, &v);  /* read condition */
-  checknext(ls, TK_THEN);
-  if (ls->t.token == TK_GOTO || ls->t.token == TK_BREAK) {
-    luaK_goiffalse(ls->fs, &v);  /* will jump to label if condition is true */
-    enterblock(fs, &bl, 0);  /* must enter block before 'goto' */
-    gotostat(ls, v.t);  /* handle goto/break */
+static void labelstat(LexState *ls, TString *label, int line)
+{
+    /* label -> '::' NAME '::' */
+    FuncState *fs = ls->fs;
+    Labellist *ll = &ls->dyd->label;
+    int l;  /* index of new label being created */
+    checkrepeated(fs, ll, label);  /* check for repeated labels */
+    checknext(ls, TK_DBCOLON);  /* skip double colon */
+    /* create new entry for this label */
+    l = newlabelentry(ls, ll, label, line, fs->pc);
     skipnoopstat(ls);  /* skip other no-op statements */
-    if (block_follow(ls, 0)) {  /* 'goto' is the entire block? */
-      leaveblock(fs);
-      return;  /* and that is it */
+    if (block_follow(ls, 0)) {  /* label is last no-op statement in the block? */
+        /* assume that locals are already out of scope */
+        ll->arr[l].nactvar = fs->bl->nactvar;
     }
-    else  /* must skip over 'then' part if condition is false */
-      jf = luaK_jump(fs);
-  }
-  else {  /* regular case (not goto/break) */
-    luaK_goiftrue(ls->fs, &v);  /* skip over block if condition is false */
-    enterblock(fs, &bl, 0);
-    jf = v.f;
-  }
-  statlist(ls);  /* `then' part */
-  leaveblock(fs);
-  if (ls->t.token == TK_ELSE ||
-      ls->t.token == TK_ELSEIF)  /* followed by 'else'/'elseif'? */
-    luaK_concat(fs, escapelist, luaK_jump(fs));  /* must jump over it */
-  luaK_patchtohere(fs, jf);
+    findgotos(ls, &ll->arr[l]);
 }
 
 
-static void ifstat (LexState *ls, int line) {
-  /* ifstat -> IF cond THEN block {ELSEIF cond THEN block} [ELSE block] END */
-  FuncState *fs = ls->fs;
-  int escapelist = NO_JUMP;  /* exit list for finished parts */
-  test_then_block(ls, &escapelist);  /* IF cond THEN block */
-  while (ls->t.token == TK_ELSEIF)
-    test_then_block(ls, &escapelist);  /* ELSEIF cond THEN block */
-  if (testnext(ls, TK_ELSE))
-    block(ls);  /* `else' part */
-  check_match(ls, TK_END, TK_IF, line);
-  luaK_patchtohere(fs, escapelist);  /* patch escape list to 'if' end */
+static void whilestat(LexState *ls, int line)
+{
+    /* whilestat -> WHILE cond DO block END */
+    FuncState *fs = ls->fs;
+    int whileinit;
+    int condexit;
+    BlockCnt bl;
+    luaX_next(ls);  /* skip WHILE */
+    whileinit = luaK_getlabel(fs);
+    condexit = cond(ls);
+    enterblock(fs, &bl, 1);
+    checknext(ls, TK_DO);
+    block(ls);
+    luaK_jumpto(fs, whileinit);
+    check_match(ls, TK_END, TK_WHILE, line);
+    leaveblock(fs);
+    luaK_patchtohere(fs, condexit);  /* false conditions finish the loop */
 }
 
 
-static void localfunc (LexState *ls) {
-  expdesc b;
-  FuncState *fs = ls->fs;
-  new_localvar(ls, str_checkname(ls));  /* new local variable */
-  adjustlocalvars(ls, 1);  /* enter its scope */
-  body(ls, &b, 0, ls->linenumber);  /* function created in next register */
-  /* debug information will only see the variable after this point! */
-  getlocvar(fs, b.u.info)->startpc = fs->pc;
+static void repeatstat(LexState *ls, int line)
+{
+    /* repeatstat -> REPEAT block UNTIL cond */
+    int condexit;
+    FuncState *fs = ls->fs;
+    int repeat_init = luaK_getlabel(fs);
+    BlockCnt bl1, bl2;
+    enterblock(fs, &bl1, 1);  /* loop block */
+    enterblock(fs, &bl2, 0);  /* scope block */
+    luaX_next(ls);  /* skip REPEAT */
+    statlist(ls);
+    check_match(ls, TK_UNTIL, TK_REPEAT, line);
+    condexit = cond(ls);  /* read condition (inside scope block) */
+    if (bl2.upval)  /* upvalues? */
+        luaK_patchclose(fs, condexit, bl2.nactvar);
+    leaveblock(fs);  /* finish scope */
+    luaK_patchlist(fs, condexit, repeat_init);  /* close the loop */
+    leaveblock(fs);  /* finish loop */
 }
 
 
-static void localstat (LexState *ls) {
-  /* stat -> LOCAL NAME {`,' NAME} [`=' explist] */
-  int nvars = 0;
-  int nexps;
-  expdesc e;
-  do {
-    new_localvar(ls, str_checkname(ls));
-    nvars++;
-  } while (testnext(ls, ','));
-  if (testnext(ls, '='))
-    nexps = explist(ls, &e);
-  else {
-    e.k = VVOID;
-    nexps = 0;
-  }
-  adjust_assign(ls, nvars, nexps, &e);
-  adjustlocalvars(ls, nvars);
+static int exp1(LexState *ls)
+{
+    expdesc e;
+    int reg;
+    expr(ls, &e);
+    luaK_exp2nextreg(ls->fs, &e);
+    lua_assert(e.k == VNONRELOC);
+    reg = e.u.info;
+    return reg;
 }
 
 
-static int funcname (LexState *ls, expdesc *v) {
-  /* funcname -> NAME {fieldsel} [`:' NAME] */
-  int ismethod = 0;
-  singlevar(ls, v);
-  while (ls->t.token == '.')
-    fieldsel(ls, v);
-  if (ls->t.token == ':') {
-    ismethod = 1;
-    fieldsel(ls, v);
-  }
-  return ismethod;
-}
-
-
-static void funcstat (LexState *ls, int line) {
-  /* funcstat -> FUNCTION funcname body */
-  int ismethod;
-  expdesc v, b;
-  luaX_next(ls);  /* skip FUNCTION */
-  ismethod = funcname(ls, &v);
-  body(ls, &b, ismethod, line);
-  luaK_storevar(ls->fs, &v, &b);
-  luaK_fixline(ls->fs, line);  /* definition `happens' in the first line */
-}
-
-
-static void exprstat (LexState *ls) {
-  /* stat -> func | assignment */
-  FuncState *fs = ls->fs;
-  struct LHS_assign v;
-  suffixedexp(ls, &v.v);
-  if (ls->t.token == '=' || ls->t.token == ',') { /* stat -> assignment ? */
-    v.prev = NULL;
-    assignment(ls, &v, 1);
-  }
-  else {  /* stat -> func */
-    check_condition(ls, v.v.k == VCALL, "syntax error");
-    SETARG_C(getcode(fs, &v.v), 1);  /* call statement uses no results */
-  }
-}
-
-
-static void retstat (LexState *ls) {
-  /* stat -> RETURN [explist] [';'] */
-  FuncState *fs = ls->fs;
-  expdesc e;
-  int first, nret;  /* registers with returned values */
-  if (block_follow(ls, 1) || ls->t.token == ';')
-    first = nret = 0;  /* return no values */
-  else {
-    nret = explist(ls, &e);  /* optional return values */
-    if (hasmultret(e.k)) {
-      luaK_setmultret(fs, &e);
-      if (e.k == VCALL && nret == 1) {  /* tail call? */
-        SET_OPCODE(getcode(fs,&e), OP_TAILCALL);
-        lua_assert(GETARG_A(getcode(fs,&e)) == fs->nactvar);
-      }
-      first = fs->nactvar;
-      nret = LUA_MULTRET;  /* return all values */
+static void forbody(LexState *ls, int base, int line, int nvars, int isnum)
+{
+    /* forbody -> DO block */
+    BlockCnt bl;
+    FuncState *fs = ls->fs;
+    int prep, endfor;
+    adjustlocalvars(ls, 3);  /* control variables */
+    checknext(ls, TK_DO);
+    prep = isnum ? luaK_codeAsBx(fs, OP_FORPREP, base, NO_JUMP) : luaK_jump(fs);
+    enterblock(fs, &bl, 0);  /* scope for declared variables */
+    adjustlocalvars(ls, nvars);
+    luaK_reserveregs(fs, nvars);
+    block(ls);
+    leaveblock(fs);  /* end of scope for declared variables */
+    luaK_patchtohere(fs, prep);
+    if (isnum)  /* numeric for? */
+        endfor = luaK_codeAsBx(fs, OP_FORLOOP, base, NO_JUMP);
+    else {  /* generic for */
+        luaK_codeABC(fs, OP_TFORCALL, base, 0, nvars);
+        luaK_fixline(fs, line);
+        endfor = luaK_codeAsBx(fs, OP_TFORLOOP, base + 2, NO_JUMP);
     }
+    luaK_patchlist(fs, endfor, prep + 1);
+    luaK_fixline(fs, line);
+}
+
+
+static void fornum(LexState *ls, TString *varname, int line)
+{
+    /* fornum -> NAME = exp1,exp1[,exp1] forbody */
+    FuncState *fs = ls->fs;
+    int base = fs->freereg;
+    new_localvarliteral(ls, "(for index)");
+    new_localvarliteral(ls, "(for limit)");
+    new_localvarliteral(ls, "(for step)");
+    new_localvar(ls, varname);
+    checknext(ls, '=');
+    exp1(ls);  /* initial value */
+    checknext(ls, ',');
+    exp1(ls);  /* limit */
+    if (testnext(ls, ','))
+        exp1(ls);  /* optional step */
+    else {  /* default step = 1 */
+        luaK_codek(fs, fs->freereg, luaK_numberK(fs, 1));
+        luaK_reserveregs(fs, 1);
+    }
+    forbody(ls, base, line, 1, 1);
+}
+
+
+static void forlist(LexState *ls, TString *indexname)
+{
+    /* forlist -> NAME {,NAME} IN explist forbody */
+    FuncState *fs = ls->fs;
+    expdesc e;
+    int nvars = 4;  /* gen, state, control, plus at least one declared var */
+    int line;
+    int base = fs->freereg;
+    /* create control variables */
+    new_localvarliteral(ls, "(for generator)");
+    new_localvarliteral(ls, "(for state)");
+    new_localvarliteral(ls, "(for control)");
+    /* create declared variables */
+    new_localvar(ls, indexname);
+    while (testnext(ls, ',')) {
+        new_localvar(ls, str_checkname(ls));
+        nvars++;
+    }
+    checknext(ls, TK_IN);
+    line = ls->linenumber;
+    adjust_assign(ls, 3, explist(ls, &e), &e);
+    luaK_checkstack(fs, 3);  /* extra space to call generator */
+    forbody(ls, base, line, nvars - 3, 0);
+}
+
+
+static void forstat(LexState *ls, int line)
+{
+    /* forstat -> FOR (fornum | forlist) END */
+    FuncState *fs = ls->fs;
+    TString *varname;
+    BlockCnt bl;
+    enterblock(fs, &bl, 1);  /* scope for loop and control variables */
+    luaX_next(ls);  /* skip `for' */
+    varname = str_checkname(ls);  /* first variable name */
+    switch (ls->t.token) {
+        case '=':
+            fornum(ls, varname, line);
+            break;
+        case ',':
+        case TK_IN:
+            forlist(ls, varname);
+            break;
+        default:
+            luaX_syntaxerror(ls, LUA_QL("=") " or " LUA_QL("in") " expected");
+    }
+    check_match(ls, TK_END, TK_FOR, line);
+    leaveblock(fs);  /* loop scope (`break' jumps to this point) */
+}
+
+
+static void test_then_block(LexState *ls, int *escapelist)
+{
+    /* test_then_block -> [IF | ELSEIF] cond THEN block */
+    BlockCnt bl;
+    FuncState *fs = ls->fs;
+    expdesc v;
+    int jf;  /* instruction to skip 'then' code (if condition is false) */
+    luaX_next(ls);  /* skip IF or ELSEIF */
+    expr(ls, &v);  /* read condition */
+    checknext(ls, TK_THEN);
+    if (ls->t.token == TK_GOTO || ls->t.token == TK_BREAK) {
+        luaK_goiffalse(ls->fs, &v);  /* will jump to label if condition is true */
+        enterblock(fs, &bl, 0);  /* must enter block before 'goto' */
+        gotostat(ls, v.t);  /* handle goto/break */
+        skipnoopstat(ls);  /* skip other no-op statements */
+        if (block_follow(ls, 0)) {  /* 'goto' is the entire block? */
+            leaveblock(fs);
+            return;  /* and that is it */
+        } else /* must skip over 'then' part if condition is false */
+            jf = luaK_jump(fs);
+    } else { /* regular case (not goto/break) */
+        luaK_goiftrue(ls->fs, &v);  /* skip over block if condition is false */
+        enterblock(fs, &bl, 0);
+        jf = v.f;
+    }
+    statlist(ls);  /* `then' part */
+    leaveblock(fs);
+    if (ls->t.token == TK_ELSE ||
+        ls->t.token == TK_ELSEIF)  /* followed by 'else'/'elseif'? */
+        luaK_concat(fs, escapelist, luaK_jump(fs));  /* must jump over it */
+    luaK_patchtohere(fs, jf);
+}
+
+
+static void ifstat(LexState *ls, int line)
+{
+    /* ifstat -> IF cond THEN block {ELSEIF cond THEN block} [ELSE block] END */
+    FuncState *fs = ls->fs;
+    int escapelist = NO_JUMP;  /* exit list for finished parts */
+    test_then_block(ls, &escapelist);  /* IF cond THEN block */
+    while (ls->t.token == TK_ELSEIF)
+        test_then_block(ls, &escapelist);  /* ELSEIF cond THEN block */
+    if (testnext(ls, TK_ELSE))
+        block(ls);  /* `else' part */
+    check_match(ls, TK_END, TK_IF, line);
+    luaK_patchtohere(fs, escapelist);  /* patch escape list to 'if' end */
+}
+
+
+static void localfunc(LexState *ls)
+{
+    expdesc b;
+    FuncState *fs = ls->fs;
+    new_localvar(ls, str_checkname(ls));  /* new local variable */
+    adjustlocalvars(ls, 1);  /* enter its scope */
+    body(ls, &b, 0, ls->linenumber);  /* function created in next register */
+    /* debug information will only see the variable after this point! */
+    getlocvar(fs, b.u.info)->startpc = fs->pc;
+}
+
+
+static void localstat(LexState *ls)
+{
+    /* stat -> LOCAL NAME {`,' NAME} [`=' explist] */
+    int nvars = 0;
+    int nexps;
+    expdesc e;
+    do {
+        new_localvar(ls, str_checkname(ls));
+        nvars++;
+    } while (testnext(ls, ','));
+    if (testnext(ls, '='))
+        nexps = explist(ls, &e);
     else {
-      if (nret == 1)  /* only one single value? */
-        first = luaK_exp2anyreg(fs, &e);
-      else {
-        luaK_exp2nextreg(fs, &e);  /* values must go to the `stack' */
-        first = fs->nactvar;  /* return all `active' values */
-        lua_assert(nret == fs->freereg - first);
-      }
+        e.k = VVOID;
+        nexps = 0;
     }
-  }
-  luaK_ret(fs, first, nret);
-  testnext(ls, ';');  /* skip optional semicolon */
+    adjust_assign(ls, nvars, nexps, &e);
+    adjustlocalvars(ls, nvars);
 }
 
 
-static void statement (LexState *ls) {
-  int line = ls->linenumber;  /* may be needed for error messages */
-  enterlevel(ls);
-  switch (ls->t.token) {
-    case ';': {  /* stat -> ';' (empty statement) */
-      luaX_next(ls);  /* skip ';' */
-      break;
+static int funcname(LexState *ls, expdesc *v)
+{
+    /* funcname -> NAME {fieldsel} [`:' NAME] */
+    int ismethod = 0;
+    singlevar(ls, v);
+    while (ls->t.token == '.')
+        fieldsel(ls, v);
+    if (ls->t.token == ':') {
+        ismethod = 1;
+        fieldsel(ls, v);
     }
-    case TK_IF: {  /* stat -> ifstat */
-      ifstat(ls, line);
-      break;
+    return ismethod;
+}
+
+
+static void funcstat(LexState *ls, int line)
+{
+    /* funcstat -> FUNCTION funcname body */
+    int ismethod;
+    expdesc v, b;
+    luaX_next(ls);  /* skip FUNCTION */
+    ismethod = funcname(ls, &v);
+    body(ls, &b, ismethod, line);
+    luaK_storevar(ls->fs, &v, &b);
+    luaK_fixline(ls->fs, line);  /* definition `happens' in the first line */
+}
+
+
+static void exprstat(LexState *ls)
+{
+    /* stat -> func | assignment */
+    FuncState *fs = ls->fs;
+    struct LHS_assign v;
+    suffixedexp(ls, &v.v);
+    if (ls->t.token == '=' || ls->t.token == ',') { /* stat -> assignment ? */
+        v.prev = NULL;
+        assignment(ls, &v, 1);
+    } else { /* stat -> func */
+        check_condition(ls, v.v.k == VCALL, "syntax error");
+        SETARG_C(getcode(fs, &v.v), 1);  /* call statement uses no results */
     }
-    case TK_WHILE: {  /* stat -> whilestat */
-      whilestat(ls, line);
-      break;
+}
+
+
+static void retstat(LexState *ls)
+{
+    /* stat -> RETURN [explist] [';'] */
+    FuncState *fs = ls->fs;
+    expdesc e;
+    int first, nret;  /* registers with returned values */
+    if (block_follow(ls, 1) || ls->t.token == ';')
+        first = nret = 0;  /* return no values */
+    else {
+        nret = explist(ls, &e);  /* optional return values */
+        if (hasmultret(e.k)) {
+            luaK_setmultret(fs, &e);
+            if (e.k == VCALL && nret == 1) {  /* tail call? */
+                SET_OPCODE(getcode(fs, &e), OP_TAILCALL);
+                lua_assert(GETARG_A(getcode(fs, &e)) == fs->nactvar);
+            }
+            first = fs->nactvar;
+            nret = LUA_MULTRET;  /* return all values */
+        } else {
+            if (nret == 1)  /* only one single value? */
+                first = luaK_exp2anyreg(fs, &e);
+            else {
+                luaK_exp2nextreg(fs, &e);  /* values must go to the `stack' */
+                first = fs->nactvar;  /* return all `active' values */
+                lua_assert(nret == fs->freereg - first);
+            }
+        }
     }
-    case TK_DO: {  /* stat -> DO block END */
-      luaX_next(ls);  /* skip DO */
-      block(ls);
-      check_match(ls, TK_END, TK_DO, line);
-      break;
+    luaK_ret(fs, first, nret);
+    testnext(ls, ';');  /* skip optional semicolon */
+}
+
+
+static void statement(LexState *ls)
+{
+    int line = ls->linenumber;  /* may be needed for error messages */
+    enterlevel(ls);
+    switch (ls->t.token) {
+        case ';': {  /* stat -> ';' (empty statement) */
+            luaX_next(ls);  /* skip ';' */
+            break;
+        }
+        case TK_IF: {  /* stat -> ifstat */
+            ifstat(ls, line);
+            break;
+        }
+        case TK_WHILE: {  /* stat -> whilestat */
+            whilestat(ls, line);
+            break;
+        }
+        case TK_DO: {  /* stat -> DO block END */
+            luaX_next(ls);  /* skip DO */
+            block(ls);
+            check_match(ls, TK_END, TK_DO, line);
+            break;
+        }
+        case TK_FOR: {  /* stat -> forstat */
+            forstat(ls, line);
+            break;
+        }
+        case TK_REPEAT: {  /* stat -> repeatstat */
+            repeatstat(ls, line);
+            break;
+        }
+        case TK_FUNCTION: {  /* stat -> funcstat */
+            funcstat(ls, line);
+            break;
+        }
+        case TK_LOCAL: {  /* stat -> localstat */
+            luaX_next(ls);  /* skip LOCAL */
+            if (testnext(ls, TK_FUNCTION))  /* local function? */
+                localfunc(ls);
+            else
+                localstat(ls);
+            break;
+        }
+        case TK_DBCOLON: {  /* stat -> label */
+            luaX_next(ls);  /* skip double colon */
+            labelstat(ls, str_checkname(ls), line);
+            break;
+        }
+        case TK_RETURN: {  /* stat -> retstat */
+            luaX_next(ls);  /* skip RETURN */
+            retstat(ls);
+            break;
+        }
+        case TK_BREAK:   /* stat -> breakstat */
+        case TK_GOTO: {  /* stat -> 'goto' NAME */
+            gotostat(ls, luaK_jump(ls->fs));
+            break;
+        }
+        default: {  /* stat -> func | assignment */
+            exprstat(ls);
+            break;
+        }
     }
-    case TK_FOR: {  /* stat -> forstat */
-      forstat(ls, line);
-      break;
-    }
-    case TK_REPEAT: {  /* stat -> repeatstat */
-      repeatstat(ls, line);
-      break;
-    }
-    case TK_FUNCTION: {  /* stat -> funcstat */
-      funcstat(ls, line);
-      break;
-    }
-    case TK_LOCAL: {  /* stat -> localstat */
-      luaX_next(ls);  /* skip LOCAL */
-      if (testnext(ls, TK_FUNCTION))  /* local function? */
-        localfunc(ls);
-      else
-        localstat(ls);
-      break;
-    }
-    case TK_DBCOLON: {  /* stat -> label */
-      luaX_next(ls);  /* skip double colon */
-      labelstat(ls, str_checkname(ls), line);
-      break;
-    }
-    case TK_RETURN: {  /* stat -> retstat */
-      luaX_next(ls);  /* skip RETURN */
-      retstat(ls);
-      break;
-    }
-    case TK_BREAK:   /* stat -> breakstat */
-    case TK_GOTO: {  /* stat -> 'goto' NAME */
-      gotostat(ls, luaK_jump(ls->fs));
-      break;
-    }
-    default: {  /* stat -> func | assignment */
-      exprstat(ls);
-      break;
-    }
-  }
-  lua_assert(ls->fs->f->maxstacksize >= ls->fs->freereg &&
-             ls->fs->freereg >= ls->fs->nactvar);
-  ls->fs->freereg = ls->fs->nactvar;  /* free registers */
-  leavelevel(ls);
+    lua_assert(ls->fs->f->maxstacksize >= ls->fs->freereg &&
+               ls->fs->freereg >= ls->fs->nactvar);
+    ls->fs->freereg = ls->fs->nactvar;  /* free registers */
+    leavelevel(ls);
 }
 
 /* }====================================================================== */
@@ -1601,38 +1708,40 @@ static void statement (LexState *ls) {
 ** compiles the main function, which is a regular vararg function with an
 ** upvalue named LUA_ENV
 */
-static void mainfunc (LexState *ls, FuncState *fs) {
-  BlockCnt bl;
-  expdesc v;
-  open_func(ls, fs, &bl);
-  fs->f->is_vararg = 1;  /* main function is always vararg */
-  init_exp(&v, VLOCAL, 0);  /* create and... */
-  newupvalue(fs, ls->envn, &v);  /* ...set environment upvalue */
-  luaX_next(ls);  /* read first token */
-  statlist(ls);  /* parse main body */
-  check(ls, TK_EOS);
-  close_func(ls);
+static void mainfunc(LexState *ls, FuncState *fs)
+{
+    BlockCnt bl;
+    expdesc v;
+    open_func(ls, fs, &bl);
+    fs->f->is_vararg = 1;  /* main function is always vararg */
+    init_exp(&v, VLOCAL, 0);  /* create and... */
+    newupvalue(fs, ls->envn, &v);  /* ...set environment upvalue */
+    luaX_next(ls);  /* read first token */
+    statlist(ls);  /* parse main body */
+    check(ls, TK_EOS);
+    close_func(ls);
 }
 
 
-Closure *luaY_parser (lua_State *L, ZIO *z, Mbuffer *buff,
-                      Dyndata *dyd, const char *name, int firstchar) {
-  LexState lexstate;
-  FuncState funcstate;
-  Closure *cl = luaF_newLclosure(L, 1);  /* create main closure */
-  /* anchor closure (to avoid being collected) */
-  setclLvalue(L, L->top, cl);
-  incr_top(L);
-  funcstate.f = cl->l.p = luaF_newproto(L);
-  funcstate.f->source = luaS_new(L, name);  /* create and anchor TString */
-  lexstate.buff = buff;
-  lexstate.dyd = dyd;
-  dyd->actvar.n = dyd->gt.n = dyd->label.n = 0;
-  luaX_setinput(L, &lexstate, z, funcstate.f->source, firstchar);
-  mainfunc(&lexstate, &funcstate);
-  lua_assert(!funcstate.prev && funcstate.nups == 1 && !lexstate.fs);
-  /* all scopes should be correctly finished */
-  lua_assert(dyd->actvar.n == 0 && dyd->gt.n == 0 && dyd->label.n == 0);
-  return cl;  /* it's on the stack too */
+Closure *luaY_parser(lua_State *L, ZIO *z, Mbuffer *buff,
+                     Dyndata *dyd, const char *name, int firstchar)
+{
+    LexState lexstate;
+    FuncState funcstate;
+    Closure *cl = luaF_newLclosure(L, 1);  /* create main closure */
+    /* anchor closure (to avoid being collected) */
+    setclLvalue(L, L->top, cl);
+    incr_top(L);
+    funcstate.f = cl->l.p = luaF_newproto(L);
+    funcstate.f->source = luaS_new(L, name);  /* create and anchor TString */
+    lexstate.buff = buff;
+    lexstate.dyd = dyd;
+    dyd->actvar.n = dyd->gt.n = dyd->label.n = 0;
+    luaX_setinput(L, &lexstate, z, funcstate.f->source, firstchar);
+    mainfunc(&lexstate, &funcstate);
+    lua_assert(!funcstate.prev && funcstate.nups == 1 && !lexstate.fs);
+    /* all scopes should be correctly finished */
+    lua_assert(dyd->actvar.n == 0 && dyd->gt.n == 0 && dyd->label.n == 0);
+    return cl;  /* it's on the stack too */
 }
 
diff --git a/liblua/lparser.h b/liblua/lparser.h
index 4dbb6e21f..513383e6a 100644
--- a/liblua/lparser.h
+++ b/liblua/lparser.h
@@ -17,20 +17,20 @@
 */
 
 typedef enum {
-  VVOID,        /* no value */
-  VNIL,
-  VTRUE,
-  VFALSE,
-  VK,           /* info = index of constant in `k' */
-  VKNUM,        /* nval = numerical value */
-  VNONRELOC,    /* info = result register */
-  VLOCAL,       /* info = local register */
-  VUPVAL,       /* info = index of upvalue in 'upvalues' */
-  VINDEXED,     /* t = table register/upvalue; idx = index R/K */
-  VJMP,         /* info = instruction pc */
-  VRELOCABLE,   /* info = instruction pc */
-  VCALL,        /* info = instruction pc */
-  VVARARG       /* info = instruction pc */
+    VVOID,        /* no value */
+    VNIL,
+    VTRUE,
+    VFALSE,
+    VK,           /* info = index of constant in `k' */
+    VKNUM,        /* nval = numerical value */
+    VNONRELOC,    /* info = result register */
+    VLOCAL,       /* info = local register */
+    VUPVAL,       /* info = index of upvalue in 'upvalues' */
+    VINDEXED,     /* t = table register/upvalue; idx = index R/K */
+    VJMP,         /* info = instruction pc */
+    VRELOCABLE,   /* info = instruction pc */
+    VCALL,        /* info = instruction pc */
+    VVARARG       /* info = instruction pc */
 } expkind;
 
 
@@ -38,53 +38,53 @@ typedef enum {
 #define vkisinreg(k) ((k) == VNONRELOC || (k) == VLOCAL)
 
 typedef struct expdesc {
-  expkind k;
-  union {
-    struct {  /* for indexed variables (VINDEXED) */
-      short idx;  /* index (R/K) */
-      lu_byte t;  /* table (register or upvalue) */
-      lu_byte vt;  /* whether 't' is register (VLOCAL) or upvalue (VUPVAL) */
-    } ind;
-    int info;  /* for generic use */
-    lua_Number nval;  /* for VKNUM */
-  } u;
-  int t;  /* patch list of `exit when true' */
-  int f;  /* patch list of `exit when false' */
+    expkind k;
+    union {
+        struct {  /* for indexed variables (VINDEXED) */
+            short idx;  /* index (R/K) */
+            lu_byte t;  /* table (register or upvalue) */
+            lu_byte vt;  /* whether 't' is register (VLOCAL) or upvalue (VUPVAL) */
+        } ind;
+        int info;  /* for generic use */
+        lua_Number nval;  /* for VKNUM */
+    } u;
+    int t;  /* patch list of `exit when true' */
+    int f;  /* patch list of `exit when false' */
 } expdesc;
 
 
 /* description of active local variable */
 typedef struct Vardesc {
-  short idx;  /* variable index in stack */
+    short idx;  /* variable index in stack */
 } Vardesc;
 
 
 /* description of pending goto statements and label statements */
 typedef struct Labeldesc {
-  TString *name;  /* label identifier */
-  int pc;  /* position in code */
-  int line;  /* line where it appeared */
-  lu_byte nactvar;  /* local level where it appears in current block */
+    TString *name;  /* label identifier */
+    int pc;  /* position in code */
+    int line;  /* line where it appeared */
+    lu_byte nactvar;  /* local level where it appears in current block */
 } Labeldesc;
 
 
 /* list of labels or gotos */
 typedef struct Labellist {
-  Labeldesc *arr;  /* array */
-  int n;  /* number of entries in use */
-  int size;  /* array size */
+    Labeldesc *arr;  /* array */
+    int n;  /* number of entries in use */
+    int size;  /* array size */
 } Labellist;
 
 
 /* dynamic structures used by the parser */
 typedef struct Dyndata {
-  struct {  /* list of active local variables */
-    Vardesc *arr;
-    int n;
-    int size;
-  } actvar;
-  Labellist gt;  /* list of pending gotos */
-  Labellist label;   /* list of active labels */
+    struct {  /* list of active local variables */
+        Vardesc *arr;
+        int n;
+        int size;
+    } actvar;
+    Labellist gt;  /* list of pending gotos */
+    Labellist label;   /* list of active labels */
 } Dyndata;
 
 
@@ -94,26 +94,26 @@ struct BlockCnt;  /* defined in lparser.c */
 
 /* state needed to generate code for a given function */
 typedef struct FuncState {
-  Proto *f;  /* current function header */
-  Table *h;  /* table to find (and reuse) elements in `k' */
-  struct FuncState *prev;  /* enclosing function */
-  struct LexState *ls;  /* lexical state */
-  struct BlockCnt *bl;  /* chain of current blocks */
-  int pc;  /* next position to code (equivalent to `ncode') */
-  int lasttarget;   /* 'label' of last 'jump label' */
-  int jpc;  /* list of pending jumps to `pc' */
-  int nk;  /* number of elements in `k' */
-  int np;  /* number of elements in `p' */
-  int firstlocal;  /* index of first local var (in Dyndata array) */
-  short nlocvars;  /* number of elements in 'f->locvars' */
-  lu_byte nactvar;  /* number of active local variables */
-  lu_byte nups;  /* number of upvalues */
-  lu_byte freereg;  /* first free register */
+    Proto *f;  /* current function header */
+    Table *h;  /* table to find (and reuse) elements in `k' */
+    struct FuncState *prev;  /* enclosing function */
+    struct LexState *ls;  /* lexical state */
+    struct BlockCnt *bl;  /* chain of current blocks */
+    int pc;  /* next position to code (equivalent to `ncode') */
+    int lasttarget;   /* 'label' of last 'jump label' */
+    int jpc;  /* list of pending jumps to `pc' */
+    int nk;  /* number of elements in `k' */
+    int np;  /* number of elements in `p' */
+    int firstlocal;  /* index of first local var (in Dyndata array) */
+    short nlocvars;  /* number of elements in 'f->locvars' */
+    lu_byte nactvar;  /* number of active local variables */
+    lu_byte nups;  /* number of upvalues */
+    lu_byte freereg;  /* first free register */
 } FuncState;
 
 
-LUAI_FUNC Closure *luaY_parser (lua_State *L, ZIO *z, Mbuffer *buff,
-                                Dyndata *dyd, const char *name, int firstchar);
+LUAI_FUNC Closure *luaY_parser(lua_State *L, ZIO *z, Mbuffer *buff,
+                               Dyndata *dyd, const char *name, int firstchar);
 
 
 #endif
diff --git a/liblua/lstate.c b/liblua/lstate.c
index 486442ac7..9c189f89a 100644
--- a/liblua/lstate.c
+++ b/liblua/lstate.c
@@ -58,9 +58,9 @@
 */
 typedef struct LX {
 #if defined(LUAI_EXTRASPACE)
-  char buff[LUAI_EXTRASPACE];
+    char buff[LUAI_EXTRASPACE];
 #endif
-  lua_State l;
+    lua_State l;
 } LX;
 
 
@@ -68,8 +68,8 @@ typedef struct LX {
 ** Main thread combines a thread state and the global state
 */
 typedef struct LG {
-  LX l;
-  global_State g;
+    LX l;
+    global_State g;
 } LG;
 
 
@@ -83,19 +83,20 @@ typedef struct LG {
 ** randomness..
 */
 #define addbuff(b,p,e) \
-  { size_t t = cast(size_t, e); \
-    memcpy(buff + p, &t, sizeof(t)); p += sizeof(t); }
+    { size_t t = cast(size_t, e); \
+        memcpy(buff + p, &t, sizeof(t)); p += sizeof(t); }
 
-static unsigned int makeseed (lua_State *L) {
-  char buff[4 * sizeof(size_t)];
-  unsigned int h = luai_makeseed();
-  int p = 0;
-  addbuff(buff, p, L);  /* heap variable */
-  addbuff(buff, p, &h);  /* local variable */
-  addbuff(buff, p, luaO_nilobject);  /* global variable */
-  addbuff(buff, p, &lua_newstate);  /* public function */
-  lua_assert(p == sizeof(buff));
-  return luaS_hash(buff, p, h);
+static unsigned int makeseed(lua_State *L)
+{
+    char buff[4 * sizeof(size_t)];
+    unsigned int h = luai_makeseed();
+    int p = 0;
+    addbuff(buff, p, L);  /* heap variable */
+    addbuff(buff, p, &h);  /* local variable */
+    addbuff(buff, p, luaO_nilobject);  /* global variable */
+    addbuff(buff, p, &lua_newstate);  /* public function */
+    lua_assert(p == sizeof(buff));
+    return luaS_hash(buff, p, h);
 }
 
 
@@ -103,95 +104,103 @@ static unsigned int makeseed (lua_State *L) {
 ** set GCdebt to a new value keeping the value (totalbytes + GCdebt)
 ** invariant
 */
-void luaE_setdebt (global_State *g, l_mem debt) {
-  g->totalbytes -= (debt - g->GCdebt);
-  g->GCdebt = debt;
+void luaE_setdebt(global_State *g, l_mem debt)
+{
+    g->totalbytes -= (debt - g->GCdebt);
+    g->GCdebt = debt;
 }
 
 
-CallInfo *luaE_extendCI (lua_State *L) {
-  CallInfo *ci = luaM_new(L, CallInfo);
-  lua_assert(L->ci->next == NULL);
-  L->ci->next = ci;
-  ci->previous = L->ci;
-  ci->next = NULL;
-  return ci;
+CallInfo *luaE_extendCI(lua_State *L)
+{
+    CallInfo *ci = luaM_new(L, CallInfo);
+    lua_assert(L->ci->next == NULL);
+    L->ci->next = ci;
+    ci->previous = L->ci;
+    ci->next = NULL;
+    return ci;
 }
 
 
-void luaE_freeCI (lua_State *L) {
-  CallInfo *ci = L->ci;
-  CallInfo *next = ci->next;
-  ci->next = NULL;
-  while ((ci = next) != NULL) {
-    next = ci->next;
-    luaM_free(L, ci);
-  }
+void luaE_freeCI(lua_State *L)
+{
+    CallInfo *ci = L->ci;
+    CallInfo *next = ci->next;
+    ci->next = NULL;
+    while ((ci = next) != NULL) {
+        next = ci->next;
+        luaM_free(L, ci);
+    }
 }
 
 
-static void stack_init (lua_State *L1, lua_State *L) {
-  int i; CallInfo *ci;
-  /* initialize stack array */
-  L1->stack = luaM_newvector(L, BASIC_STACK_SIZE, TValue);
-  L1->stacksize = BASIC_STACK_SIZE;
-  for (i = 0; i < BASIC_STACK_SIZE; i++)
-    setnilvalue(L1->stack + i);  /* erase new stack */
-  L1->top = L1->stack;
-  L1->stack_last = L1->stack + L1->stacksize - EXTRA_STACK;
-  /* initialize first ci */
-  ci = &L1->base_ci;
-  ci->next = ci->previous = NULL;
-  ci->callstatus = 0;
-  ci->func = L1->top;
-  setnilvalue(L1->top++);  /* 'function' entry for this 'ci' */
-  ci->top = L1->top + LUA_MINSTACK;
-  L1->ci = ci;
+static void stack_init(lua_State *L1, lua_State *L)
+{
+    int i;
+    CallInfo *ci;
+    /* initialize stack array */
+    L1->stack = luaM_newvector(L, BASIC_STACK_SIZE, TValue);
+    L1->stacksize = BASIC_STACK_SIZE;
+    for (i = 0; i < BASIC_STACK_SIZE; i++)
+        setnilvalue(L1->stack + i);  /* erase new stack */
+    L1->top = L1->stack;
+    L1->stack_last = L1->stack + L1->stacksize - EXTRA_STACK;
+    /* initialize first ci */
+    ci = &L1->base_ci;
+    ci->next = ci->previous = NULL;
+    ci->callstatus = 0;
+    ci->func = L1->top;
+    setnilvalue(L1->top++);  /* 'function' entry for this 'ci' */
+    ci->top = L1->top + LUA_MINSTACK;
+    L1->ci = ci;
 }
 
 
-static void freestack (lua_State *L) {
-  if (L->stack == NULL)
-    return;  /* stack not completely built yet */
-  L->ci = &L->base_ci;  /* free the entire 'ci' list */
-  luaE_freeCI(L);
-  luaM_freearray(L, L->stack, L->stacksize);  /* free stack array */
+static void freestack(lua_State *L)
+{
+    if (L->stack == NULL)
+        return;  /* stack not completely built yet */
+    L->ci = &L->base_ci;  /* free the entire 'ci' list */
+    luaE_freeCI(L);
+    luaM_freearray(L, L->stack, L->stacksize);  /* free stack array */
 }
 
 
 /*
 ** Create registry table and its predefined values
 */
-static void init_registry (lua_State *L, global_State *g) {
-  TValue mt;
-  /* create registry */
-  Table *registry = luaH_new(L);
-  sethvalue(L, &g->l_registry, registry);
-  luaH_resize(L, registry, LUA_RIDX_LAST, 0);
-  /* registry[LUA_RIDX_MAINTHREAD] = L */
-  setthvalue(L, &mt, L);
-  luaH_setint(L, registry, LUA_RIDX_MAINTHREAD, &mt);
-  /* registry[LUA_RIDX_GLOBALS] = table of globals */
-  sethvalue(L, &mt, luaH_new(L));
-  luaH_setint(L, registry, LUA_RIDX_GLOBALS, &mt);
+static void init_registry(lua_State *L, global_State *g)
+{
+    TValue mt;
+    /* create registry */
+    Table *registry = luaH_new(L);
+    sethvalue(L, &g->l_registry, registry);
+    luaH_resize(L, registry, LUA_RIDX_LAST, 0);
+    /* registry[LUA_RIDX_MAINTHREAD] = L */
+    setthvalue(L, &mt, L);
+    luaH_setint(L, registry, LUA_RIDX_MAINTHREAD, &mt);
+    /* registry[LUA_RIDX_GLOBALS] = table of globals */
+    sethvalue(L, &mt, luaH_new(L));
+    luaH_setint(L, registry, LUA_RIDX_GLOBALS, &mt);
 }
 
 
 /*
 ** open parts of the state that may cause memory-allocation errors
 */
-static void f_luaopen (lua_State *L, void *ud) {
-  global_State *g = G(L);
-  UNUSED(ud);
-  stack_init(L, L);  /* init stack */
-  init_registry(L, g);
-  luaS_resize(L, MINSTRTABSIZE);  /* initial size of string table */
-  luaT_init(L);
-  luaX_init(L);
-  /* pre-create memory-error message */
-  g->memerrmsg = luaS_newliteral(L, MEMERRMSG);
-  luaS_fix(g->memerrmsg);  /* it should never be collected */
-  g->gcrunning = 1;  /* allow gc */
+static void f_luaopen(lua_State *L, void *ud)
+{
+    global_State *g = G(L);
+    UNUSED(ud);
+    stack_init(L, L);  /* init stack */
+    init_registry(L, g);
+    luaS_resize(L, MINSTRTABSIZE);  /* initial size of string table */
+    luaT_init(L);
+    luaX_init(L);
+    /* pre-create memory-error message */
+    g->memerrmsg = luaS_newliteral(L, MEMERRMSG);
+    luaS_fix(g->memerrmsg);  /* it should never be collected */
+    g->gcrunning = 1;  /* allow gc */
 }
 
 
@@ -199,124 +208,129 @@ static void f_luaopen (lua_State *L, void *ud) {
 ** preinitialize a state with consistent values without allocating
 ** any memory (to avoid errors)
 */
-static void preinit_state (lua_State *L, global_State *g) {
-  G(L) = g;
-  L->stack = NULL;
-  L->ci = NULL;
-  L->stacksize = 0;
-  L->errorJmp = NULL;
-  L->nCcalls = 0;
-  L->hook = NULL;
-  L->hookmask = 0;
-  L->basehookcount = 0;
-  L->allowhook = 1;
-  resethookcount(L);
-  L->openupval = NULL;
-  L->nny = 1;
-  L->status = LUA_OK;
-  L->errfunc = 0;
+static void preinit_state(lua_State *L, global_State *g)
+{
+    G(L) = g;
+    L->stack = NULL;
+    L->ci = NULL;
+    L->stacksize = 0;
+    L->errorJmp = NULL;
+    L->nCcalls = 0;
+    L->hook = NULL;
+    L->hookmask = 0;
+    L->basehookcount = 0;
+    L->allowhook = 1;
+    resethookcount(L);
+    L->openupval = NULL;
+    L->nny = 1;
+    L->status = LUA_OK;
+    L->errfunc = 0;
 }
 
 
-static void close_state (lua_State *L) {
-  global_State *g = G(L);
-  luaF_close(L, L->stack);  /* close all upvalues for this thread */
-  luaC_freeallobjects(L);  /* collect all objects */
-  luaM_freearray(L, G(L)->strt.hash, G(L)->strt.size);
-  luaZ_freebuffer(L, &g->buff);
-  freestack(L);
-  lua_assert(gettotalbytes(g) == sizeof(LG));
-  (*g->frealloc)(g->ud, fromstate(L), sizeof(LG), 0);  /* free main block */
+static void close_state(lua_State *L)
+{
+    global_State *g = G(L);
+    luaF_close(L, L->stack);  /* close all upvalues for this thread */
+    luaC_freeallobjects(L);  /* collect all objects */
+    luaM_freearray(L, G(L)->strt.hash, G(L)->strt.size);
+    luaZ_freebuffer(L, &g->buff);
+    freestack(L);
+    lua_assert(gettotalbytes(g) == sizeof(LG));
+    (*g->frealloc)(g->ud, fromstate(L), sizeof(LG), 0);  /* free main block */
 }
 
 
-LUA_API lua_State *lua_newthread (lua_State *L) {
-  lua_State *L1;
-  lua_lock(L);
-  luaC_checkGC(L);
-  L1 = &luaC_newobj(L, LUA_TTHREAD, sizeof(LX), NULL, offsetof(LX, l))->th;
-  setthvalue(L, L->top, L1);
-  api_incr_top(L);
-  preinit_state(L1, G(L));
-  L1->hookmask = L->hookmask;
-  L1->basehookcount = L->basehookcount;
-  L1->hook = L->hook;
-  resethookcount(L1);
-  luai_userstatethread(L, L1);
-  stack_init(L1, L);  /* init stack */
-  lua_unlock(L);
-  return L1;
+LUA_API lua_State *lua_newthread(lua_State *L)
+{
+    lua_State *L1;
+    lua_lock(L);
+    luaC_checkGC(L);
+    L1 = &luaC_newobj(L, LUA_TTHREAD, sizeof(LX), NULL, offsetof(LX, l))->th;
+    setthvalue(L, L->top, L1);
+    api_incr_top(L);
+    preinit_state(L1, G(L));
+    L1->hookmask = L->hookmask;
+    L1->basehookcount = L->basehookcount;
+    L1->hook = L->hook;
+    resethookcount(L1);
+    luai_userstatethread(L, L1);
+    stack_init(L1, L);  /* init stack */
+    lua_unlock(L);
+    return L1;
 }
 
 
-void luaE_freethread (lua_State *L, lua_State *L1) {
-  LX *l = fromstate(L1);
-  luaF_close(L1, L1->stack);  /* close all upvalues for this thread */
-  lua_assert(L1->openupval == NULL);
-  luai_userstatefree(L, L1);
-  freestack(L1);
-  luaM_free(L, l);
+void luaE_freethread(lua_State *L, lua_State *L1)
+{
+    LX *l = fromstate(L1);
+    luaF_close(L1, L1->stack);  /* close all upvalues for this thread */
+    lua_assert(L1->openupval == NULL);
+    luai_userstatefree(L, L1);
+    freestack(L1);
+    luaM_free(L, l);
 }
 
 
-LUA_API lua_State *lua_newstate (lua_Alloc f, void *ud) {
-  int i;
-  lua_State *L;
-  global_State *g;
-  LG *l = cast(LG *, (*f)(ud, NULL, LUA_TTHREAD, sizeof(LG)));
-  if (l == NULL) return NULL;
-  L = &l->l.l;
-  g = &l->g;
-  L->next = NULL;
-  L->tt = LUA_TTHREAD;
-  g->currentwhite = bit2mask(WHITE0BIT, FIXEDBIT);
-  L->marked = luaC_white(g);
-  g->gckind = KGC_NORMAL;
-  preinit_state(L, g);
-  g->frealloc = f;
-  g->ud = ud;
-  g->mainthread = L;
-  g->seed = makeseed(L);
-  g->uvhead.u.l.prev = &g->uvhead;
-  g->uvhead.u.l.next = &g->uvhead;
-  g->gcrunning = 0;  /* no GC while building state */
-  g->GCestimate = 0;
-  g->strt.size = 0;
-  g->strt.nuse = 0;
-  g->strt.hash = NULL;
-  setnilvalue(&g->l_registry);
-  luaZ_initbuffer(L, &g->buff);
-  g->panic = NULL;
-  g->version = lua_version(NULL);
-  g->gcstate = GCSpause;
-  g->allgc = NULL;
-  g->finobj = NULL;
-  g->tobefnz = NULL;
-  g->sweepgc = g->sweepfin = NULL;
-  g->gray = g->grayagain = NULL;
-  g->weak = g->ephemeron = g->allweak = NULL;
-  g->totalbytes = sizeof(LG);
-  g->GCdebt = 0;
-  g->gcpause = LUAI_GCPAUSE;
-  g->gcmajorinc = LUAI_GCMAJOR;
-  g->gcstepmul = LUAI_GCMUL;
-  for (i=0; i < LUA_NUMTAGS; i++) g->mt[i] = NULL;
-  if (luaD_rawrunprotected(L, f_luaopen, NULL) != LUA_OK) {
-    /* memory allocation error: free partial state */
+LUA_API lua_State *lua_newstate(lua_Alloc f, void *ud)
+{
+    int i;
+    lua_State *L;
+    global_State *g;
+    LG *l = cast(LG *, (*f)(ud, NULL, LUA_TTHREAD, sizeof(LG)));
+    if (l == NULL) return NULL;
+    L = &l->l.l;
+    g = &l->g;
+    L->next = NULL;
+    L->tt = LUA_TTHREAD;
+    g->currentwhite = bit2mask(WHITE0BIT, FIXEDBIT);
+    L->marked = luaC_white(g);
+    g->gckind = KGC_NORMAL;
+    preinit_state(L, g);
+    g->frealloc = f;
+    g->ud = ud;
+    g->mainthread = L;
+    g->seed = makeseed(L);
+    g->uvhead.u.l.prev = &g->uvhead;
+    g->uvhead.u.l.next = &g->uvhead;
+    g->gcrunning = 0;  /* no GC while building state */
+    g->GCestimate = 0;
+    g->strt.size = 0;
+    g->strt.nuse = 0;
+    g->strt.hash = NULL;
+    setnilvalue(&g->l_registry);
+    luaZ_initbuffer(L, &g->buff);
+    g->panic = NULL;
+    g->version = lua_version(NULL);
+    g->gcstate = GCSpause;
+    g->allgc = NULL;
+    g->finobj = NULL;
+    g->tobefnz = NULL;
+    g->sweepgc = g->sweepfin = NULL;
+    g->gray = g->grayagain = NULL;
+    g->weak = g->ephemeron = g->allweak = NULL;
+    g->totalbytes = sizeof(LG);
+    g->GCdebt = 0;
+    g->gcpause = LUAI_GCPAUSE;
+    g->gcmajorinc = LUAI_GCMAJOR;
+    g->gcstepmul = LUAI_GCMUL;
+    for (i = 0; i < LUA_NUMTAGS; i++) g->mt[i] = NULL;
+    if (luaD_rawrunprotected(L, f_luaopen, NULL) != LUA_OK) {
+        /* memory allocation error: free partial state */
+        close_state(L);
+        L = NULL;
+    } else
+        luai_userstateopen(L);
+    return L;
+}
+
+
+LUA_API void lua_close(lua_State *L)
+{
+    L = G(L)->mainthread;  /* only the main thread can be closed */
+    lua_lock(L);
+    luai_userstateclose(L);
     close_state(L);
-    L = NULL;
-  }
-  else
-    luai_userstateopen(L);
-  return L;
-}
-
-
-LUA_API void lua_close (lua_State *L) {
-  L = G(L)->mainthread;  /* only the main thread can be closed */
-  lua_lock(L);
-  luai_userstateclose(L);
-  close_state(L);
 }
 
 
diff --git a/liblua/lstate.h b/liblua/lstate.h
index f862da81f..caa913558 100644
--- a/liblua/lstate.h
+++ b/liblua/lstate.h
@@ -57,9 +57,9 @@ struct lua_longjmp;  /* defined in ldo.c */
 
 
 typedef struct stringtable {
-  GCObject **hash;
-  lu_int32 nuse;  /* number of elements */
-  int size;
+    GCObject **hash;
+    lu_int32 nuse;  /* number of elements */
+    int size;
 } stringtable;
 
 
@@ -67,25 +67,25 @@ typedef struct stringtable {
 ** information about a call
 */
 typedef struct CallInfo {
-  StkId func;  /* function index in the stack */
-  StkId top;  /* top for this function */
-  struct CallInfo *previous, *next;  /* dynamic call link */
-  short nresults;  /* expected number of results from this function */
-  lu_byte callstatus;
-  ptrdiff_t extra;
-  union {
-    struct {  /* only for Lua functions */
-      StkId base;  /* base for this function */
-      const Instruction *savedpc;
-    } l;
-    struct {  /* only for C functions */
-      int ctx;  /* context info. in case of yields */
-      lua_CFunction k;  /* continuation in case of yields */
-      ptrdiff_t old_errfunc;
-      lu_byte old_allowhook;
-      lu_byte status;
-    } c;
-  } u;
+    StkId func;  /* function index in the stack */
+    StkId top;  /* top for this function */
+    struct CallInfo *previous, *next;  /* dynamic call link */
+    short nresults;  /* expected number of results from this function */
+    lu_byte callstatus;
+    ptrdiff_t extra;
+    union {
+        struct {  /* only for Lua functions */
+            StkId base;  /* base for this function */
+            const Instruction *savedpc;
+        } l;
+        struct {  /* only for C functions */
+            int ctx;  /* context info. in case of yields */
+            lua_CFunction k;  /* continuation in case of yields */
+            ptrdiff_t old_errfunc;
+            lu_byte old_allowhook;
+            lu_byte status;
+        } c;
+    } u;
 } CallInfo;
 
 
@@ -110,41 +110,41 @@ typedef struct CallInfo {
 ** `global state', shared by all threads of this state
 */
 typedef struct global_State {
-  lua_Alloc frealloc;  /* function to reallocate memory */
-  void *ud;         /* auxiliary data to `frealloc' */
-  lu_mem totalbytes;  /* number of bytes currently allocated - GCdebt */
-  l_mem GCdebt;  /* bytes allocated not yet compensated by the collector */
-  lu_mem GCmemtrav;  /* memory traversed by the GC */
-  lu_mem GCestimate;  /* an estimate of the non-garbage memory in use */
-  stringtable strt;  /* hash table for strings */
-  TValue l_registry;
-  unsigned int seed;  /* randomized seed for hashes */
-  lu_byte currentwhite;
-  lu_byte gcstate;  /* state of garbage collector */
-  lu_byte gckind;  /* kind of GC running */
-  lu_byte gcrunning;  /* true if GC is running */
-  int sweepstrgc;  /* position of sweep in `strt' */
-  GCObject *allgc;  /* list of all collectable objects */
-  GCObject *finobj;  /* list of collectable objects with finalizers */
-  GCObject **sweepgc;  /* current position of sweep in list 'allgc' */
-  GCObject **sweepfin;  /* current position of sweep in list 'finobj' */
-  GCObject *gray;  /* list of gray objects */
-  GCObject *grayagain;  /* list of objects to be traversed atomically */
-  GCObject *weak;  /* list of tables with weak values */
-  GCObject *ephemeron;  /* list of ephemeron tables (weak keys) */
-  GCObject *allweak;  /* list of all-weak tables */
-  GCObject *tobefnz;  /* list of userdata to be GC */
-  UpVal uvhead;  /* head of double-linked list of all open upvalues */
-  Mbuffer buff;  /* temporary buffer for string concatenation */
-  int gcpause;  /* size of pause between successive GCs */
-  int gcmajorinc;  /* pause between major collections (only in gen. mode) */
-  int gcstepmul;  /* GC `granularity' */
-  lua_CFunction panic;  /* to be called in unprotected errors */
-  struct lua_State *mainthread;
-  const lua_Number *version;  /* pointer to version number */
-  TString *memerrmsg;  /* memory-error message */
-  TString *tmname[TM_N];  /* array with tag-method names */
-  struct Table *mt[LUA_NUMTAGS];  /* metatables for basic types */
+    lua_Alloc frealloc;  /* function to reallocate memory */
+    void *ud;         /* auxiliary data to `frealloc' */
+    lu_mem totalbytes;  /* number of bytes currently allocated - GCdebt */
+    l_mem GCdebt;  /* bytes allocated not yet compensated by the collector */
+    lu_mem GCmemtrav;  /* memory traversed by the GC */
+    lu_mem GCestimate;  /* an estimate of the non-garbage memory in use */
+    stringtable strt;  /* hash table for strings */
+    TValue l_registry;
+    unsigned int seed;  /* randomized seed for hashes */
+    lu_byte currentwhite;
+    lu_byte gcstate;  /* state of garbage collector */
+    lu_byte gckind;  /* kind of GC running */
+    lu_byte gcrunning;  /* true if GC is running */
+    int sweepstrgc;  /* position of sweep in `strt' */
+    GCObject *allgc;  /* list of all collectable objects */
+    GCObject *finobj;  /* list of collectable objects with finalizers */
+    GCObject **sweepgc;  /* current position of sweep in list 'allgc' */
+    GCObject **sweepfin;  /* current position of sweep in list 'finobj' */
+    GCObject *gray;  /* list of gray objects */
+    GCObject *grayagain;  /* list of objects to be traversed atomically */
+    GCObject *weak;  /* list of tables with weak values */
+    GCObject *ephemeron;  /* list of ephemeron tables (weak keys) */
+    GCObject *allweak;  /* list of all-weak tables */
+    GCObject *tobefnz;  /* list of userdata to be GC */
+    UpVal uvhead;  /* head of double-linked list of all open upvalues */
+    Mbuffer buff;  /* temporary buffer for string concatenation */
+    int gcpause;  /* size of pause between successive GCs */
+    int gcmajorinc;  /* pause between major collections (only in gen. mode) */
+    int gcstepmul;  /* GC `granularity' */
+    lua_CFunction panic;  /* to be called in unprotected errors */
+    struct lua_State *mainthread;
+    const lua_Number *version;  /* pointer to version number */
+    TString *memerrmsg;  /* memory-error message */
+    TString *tmname[TM_N];  /* array with tag-method names */
+    struct Table *mt[LUA_NUMTAGS];  /* metatables for basic types */
 } global_State;
 
 
@@ -152,27 +152,27 @@ typedef struct global_State {
 ** `per thread' state
 */
 struct lua_State {
-  CommonHeader;
-  lu_byte status;
-  StkId top;  /* first free slot in the stack */
-  global_State *l_G;
-  CallInfo *ci;  /* call info for current function */
-  const Instruction *oldpc;  /* last pc traced */
-  StkId stack_last;  /* last free slot in the stack */
-  StkId stack;  /* stack base */
-  int stacksize;
-  unsigned short nny;  /* number of non-yieldable calls in stack */
-  unsigned short nCcalls;  /* number of nested C calls */
-  lu_byte hookmask;
-  lu_byte allowhook;
-  int basehookcount;
-  int hookcount;
-  lua_Hook hook;
-  GCObject *openupval;  /* list of open upvalues in this stack */
-  GCObject *gclist;
-  struct lua_longjmp *errorJmp;  /* current error recover point */
-  ptrdiff_t errfunc;  /* current error handling function (stack index) */
-  CallInfo base_ci;  /* CallInfo for first level (C calling Lua) */
+    CommonHeader;
+    lu_byte status;
+    StkId top;  /* first free slot in the stack */
+    global_State *l_G;
+    CallInfo *ci;  /* call info for current function */
+    const Instruction *oldpc;  /* last pc traced */
+    StkId stack_last;  /* last free slot in the stack */
+    StkId stack;  /* stack base */
+    int stacksize;
+    unsigned short nny;  /* number of non-yieldable calls in stack */
+    unsigned short nCcalls;  /* number of nested C calls */
+    lu_byte hookmask;
+    lu_byte allowhook;
+    int basehookcount;
+    int hookcount;
+    lua_Hook hook;
+    GCObject *openupval;  /* list of open upvalues in this stack */
+    GCObject *gclist;
+    struct lua_longjmp *errorJmp;  /* current error recover point */
+    ptrdiff_t errfunc;  /* current error handling function (stack index) */
+    CallInfo base_ci;  /* CallInfo for first level (C calling Lua) */
 };
 
 
@@ -183,14 +183,14 @@ struct lua_State {
 ** Union of all collectable objects
 */
 union GCObject {
-  GCheader gch;  /* common header */
-  union TString ts;
-  union Udata u;
-  union Closure cl;
-  struct Table h;
-  struct Proto p;
-  struct UpVal uv;
-  struct lua_State th;  /* thread */
+    GCheader gch;  /* common header */
+    union TString ts;
+    union Udata u;
+    union Closure cl;
+    struct Table h;
+    struct Proto p;
+    struct UpVal uv;
+    struct lua_State th;  /* thread */
 };
 
 
@@ -218,10 +218,10 @@ union GCObject {
 /* actual number of total bytes allocated */
 #define gettotalbytes(g) ((g)->totalbytes + (g)->GCdebt)
 
-LUAI_FUNC void luaE_setdebt (global_State *g, l_mem debt);
-LUAI_FUNC void luaE_freethread (lua_State *L, lua_State *L1);
-LUAI_FUNC CallInfo *luaE_extendCI (lua_State *L);
-LUAI_FUNC void luaE_freeCI (lua_State *L);
+LUAI_FUNC void luaE_setdebt(global_State *g, l_mem debt);
+LUAI_FUNC void luaE_freethread(lua_State *L, lua_State *L1);
+LUAI_FUNC CallInfo *luaE_extendCI(lua_State *L);
+LUAI_FUNC void luaE_freeCI(lua_State *L);
 
 
 #endif
diff --git a/liblua/lstring.c b/liblua/lstring.c
index 049d09b67..e86e8f2c4 100644
--- a/liblua/lstring.c
+++ b/liblua/lstring.c
@@ -30,156 +30,166 @@
 /*
 ** equality for long strings
 */
-int luaS_eqlngstr (TString *a, TString *b) {
-  size_t len = a->tsv.len;
-  lua_assert(a->tsv.tt == LUA_TLNGSTR && b->tsv.tt == LUA_TLNGSTR);
-  return (a == b) ||  /* same instance or... */
-    ((len == b->tsv.len) &&  /* equal length and ... */
-     (memcmp(getstr(a), getstr(b), len) == 0));  /* equal contents */
+int luaS_eqlngstr(TString *a, TString *b)
+{
+    size_t len = a->tsv.len;
+    lua_assert(a->tsv.tt == LUA_TLNGSTR && b->tsv.tt == LUA_TLNGSTR);
+    return (a == b) ||  /* same instance or... */
+           ((len == b->tsv.len) &&  /* equal length and ... */
+            (memcmp(getstr(a), getstr(b), len) == 0));  /* equal contents */
 }
 
 
 /*
 ** equality for strings
 */
-int luaS_eqstr (TString *a, TString *b) {
-  return (a->tsv.tt == b->tsv.tt) &&
-         (a->tsv.tt == LUA_TSHRSTR ? eqshrstr(a, b) : luaS_eqlngstr(a, b));
+int luaS_eqstr(TString *a, TString *b)
+{
+    return (a->tsv.tt == b->tsv.tt) &&
+           (a->tsv.tt == LUA_TSHRSTR ? eqshrstr(a, b) : luaS_eqlngstr(a, b));
 }
 
 
-unsigned int luaS_hash (const char *str, size_t l, unsigned int seed) {
-  unsigned int h = seed ^ cast(unsigned int, l);
-  size_t l1;
-  size_t step = (l >> LUAI_HASHLIMIT) + 1;
-  for (l1 = l; l1 >= step; l1 -= step)
-    h = h ^ ((h<<5) + (h>>2) + cast_byte(str[l1 - 1]));
-  return h;
+unsigned int luaS_hash(const char *str, size_t l, unsigned int seed)
+{
+    unsigned int h = seed ^ cast(unsigned int, l);
+    size_t l1;
+    size_t step = (l >> LUAI_HASHLIMIT) + 1;
+    for (l1 = l; l1 >= step; l1 -= step)
+        h = h ^ ((h << 5) + (h >> 2) + cast_byte(str[l1 - 1]));
+    return h;
 }
 
 
 /*
 ** resizes the string table
 */
-void luaS_resize (lua_State *L, int newsize) {
-  int i;
-  stringtable *tb = &G(L)->strt;
-  /* cannot resize while GC is traversing strings */
-  luaC_runtilstate(L, ~bitmask(GCSsweepstring));
-  if (newsize > tb->size) {
-    luaM_reallocvector(L, tb->hash, tb->size, newsize, GCObject *);
-    for (i = tb->size; i < newsize; i++) tb->hash[i] = NULL;
-  }
-  /* rehash */
-  for (i=0; i<tb->size; i++) {
-    GCObject *p = tb->hash[i];
-    tb->hash[i] = NULL;
-    while (p) {  /* for each node in the list */
-      GCObject *next = gch(p)->next;  /* save next */
-      unsigned int h = lmod(gco2ts(p)->hash, newsize);  /* new position */
-      gch(p)->next = tb->hash[h];  /* chain it */
-      tb->hash[h] = p;
-      resetoldbit(p);  /* see MOVE OLD rule */
-      p = next;
+void luaS_resize(lua_State *L, int newsize)
+{
+    int i;
+    stringtable *tb = &G(L)->strt;
+    /* cannot resize while GC is traversing strings */
+    luaC_runtilstate(L, ~bitmask(GCSsweepstring));
+    if (newsize > tb->size) {
+        luaM_reallocvector(L, tb->hash, tb->size, newsize, GCObject *);
+        for (i = tb->size; i < newsize; i++) tb->hash[i] = NULL;
     }
-  }
-  if (newsize < tb->size) {
-    /* shrinking slice must be empty */
-    lua_assert(tb->hash[newsize] == NULL && tb->hash[tb->size - 1] == NULL);
-    luaM_reallocvector(L, tb->hash, tb->size, newsize, GCObject *);
-  }
-  tb->size = newsize;
+    /* rehash */
+    for (i = 0; i < tb->size; i++) {
+        GCObject *p = tb->hash[i];
+        tb->hash[i] = NULL;
+        while (p) {  /* for each node in the list */
+            GCObject *next = gch(p)->next;  /* save next */
+            unsigned int h = lmod(gco2ts(p)->hash, newsize);  /* new position */
+            gch(p)->next = tb->hash[h];  /* chain it */
+            tb->hash[h] = p;
+            resetoldbit(p);  /* see MOVE OLD rule */
+            p = next;
+        }
+    }
+    if (newsize < tb->size) {
+        /* shrinking slice must be empty */
+        lua_assert(tb->hash[newsize] == NULL && tb->hash[tb->size - 1] == NULL);
+        luaM_reallocvector(L, tb->hash, tb->size, newsize, GCObject *);
+    }
+    tb->size = newsize;
 }
 
 
 /*
 ** creates a new string object
 */
-static TString *createstrobj (lua_State *L, const char *str, size_t l,
-                              int tag, unsigned int h, GCObject **list) {
-  TString *ts;
-  size_t totalsize;  /* total size of TString object */
-  totalsize = sizeof(TString) + ((l + 1) * sizeof(char));
-  ts = &luaC_newobj(L, tag, totalsize, list, 0)->ts;
-  ts->tsv.len = l;
-  ts->tsv.hash = h;
-  ts->tsv.extra = 0;
-  memcpy(ts+1, str, l*sizeof(char));
-  ((char *)(ts+1))[l] = '\0';  /* ending 0 */
-  return ts;
+static TString *createstrobj(lua_State *L, const char *str, size_t l,
+                             int tag, unsigned int h, GCObject **list)
+{
+    TString *ts;
+    size_t totalsize;  /* total size of TString object */
+    totalsize = sizeof(TString) + ((l + 1) * sizeof(char));
+    ts = &luaC_newobj(L, tag, totalsize, list, 0)->ts;
+    ts->tsv.len = l;
+    ts->tsv.hash = h;
+    ts->tsv.extra = 0;
+    memcpy(ts + 1, str, l * sizeof(char));
+    ((char *)(ts + 1))[l] = '\0'; /* ending 0 */
+    return ts;
 }
 
 
 /*
 ** creates a new short string, inserting it into string table
 */
-static TString *newshrstr (lua_State *L, const char *str, size_t l,
-                                       unsigned int h) {
-  GCObject **list;  /* (pointer to) list where it will be inserted */
-  stringtable *tb = &G(L)->strt;
-  TString *s;
-  if (tb->nuse >= cast(lu_int32, tb->size) && tb->size <= MAX_INT/2)
-    luaS_resize(L, tb->size*2);  /* too crowded */
-  list = &tb->hash[lmod(h, tb->size)];
-  s = createstrobj(L, str, l, LUA_TSHRSTR, h, list);
-  tb->nuse++;
-  return s;
+static TString *newshrstr(lua_State *L, const char *str, size_t l,
+                          unsigned int h)
+{
+    GCObject **list;  /* (pointer to) list where it will be inserted */
+    stringtable *tb = &G(L)->strt;
+    TString *s;
+    if (tb->nuse >= cast(lu_int32, tb->size) && tb->size <= MAX_INT / 2)
+        luaS_resize(L, tb->size * 2); /* too crowded */
+    list = &tb->hash[lmod(h, tb->size)];
+    s = createstrobj(L, str, l, LUA_TSHRSTR, h, list);
+    tb->nuse++;
+    return s;
 }
 
 
 /*
 ** checks whether short string exists and reuses it or creates a new one
 */
-static TString *internshrstr (lua_State *L, const char *str, size_t l) {
-  GCObject *o;
-  global_State *g = G(L);
-  unsigned int h = luaS_hash(str, l, g->seed);
-  for (o = g->strt.hash[lmod(h, g->strt.size)];
-       o != NULL;
-       o = gch(o)->next) {
-    TString *ts = rawgco2ts(o);
-    if (h == ts->tsv.hash &&
-        l == ts->tsv.len &&
-        (memcmp(str, getstr(ts), l * sizeof(char)) == 0)) {
-      if (isdead(G(L), o))  /* string is dead (but was not collected yet)? */
-        changewhite(o);  /* resurrect it */
-      return ts;
+static TString *internshrstr(lua_State *L, const char *str, size_t l)
+{
+    GCObject *o;
+    global_State *g = G(L);
+    unsigned int h = luaS_hash(str, l, g->seed);
+    for (o = g->strt.hash[lmod(h, g->strt.size)];
+         o != NULL;
+         o = gch(o)->next) {
+        TString *ts = rawgco2ts(o);
+        if (h == ts->tsv.hash &&
+            l == ts->tsv.len &&
+            (memcmp(str, getstr(ts), l * sizeof(char)) == 0)) {
+            if (isdead(G(L), o))  /* string is dead (but was not collected yet)? */
+                changewhite(o);  /* resurrect it */
+            return ts;
+        }
     }
-  }
-  return newshrstr(L, str, l, h);  /* not found; create a new string */
+    return newshrstr(L, str, l, h);  /* not found; create a new string */
 }
 
 
 /*
 ** new string (with explicit length)
 */
-TString *luaS_newlstr (lua_State *L, const char *str, size_t l) {
-  if (l <= LUAI_MAXSHORTLEN)  /* short string? */
-    return internshrstr(L, str, l);
-  else {
-    if (l + 1 > (MAX_SIZET - sizeof(TString))/sizeof(char))
-      luaM_toobig(L);
-    return createstrobj(L, str, l, LUA_TLNGSTR, G(L)->seed, NULL);
-  }
+TString *luaS_newlstr(lua_State *L, const char *str, size_t l)
+{
+    if (l <= LUAI_MAXSHORTLEN)  /* short string? */
+        return internshrstr(L, str, l);
+    else {
+        if (l + 1 > (MAX_SIZET - sizeof(TString)) / sizeof(char))
+            luaM_toobig(L);
+        return createstrobj(L, str, l, LUA_TLNGSTR, G(L)->seed, NULL);
+    }
 }
 
 
 /*
 ** new zero-terminated string
 */
-TString *luaS_new (lua_State *L, const char *str) {
-  return luaS_newlstr(L, str, strlen(str));
+TString *luaS_new(lua_State *L, const char *str)
+{
+    return luaS_newlstr(L, str, strlen(str));
 }
 
 
-Udata *luaS_newudata (lua_State *L, size_t s, Table *e) {
-  Udata *u;
-  if (s > MAX_SIZET - sizeof(Udata))
-    luaM_toobig(L);
-  u = &luaC_newobj(L, LUA_TUSERDATA, sizeof(Udata) + s, NULL, 0)->u;
-  u->uv.len = s;
-  u->uv.metatable = NULL;
-  u->uv.env = e;
-  return u;
+Udata *luaS_newudata(lua_State *L, size_t s, Table *e)
+{
+    Udata *u;
+    if (s > MAX_SIZET - sizeof(Udata))
+        luaM_toobig(L);
+    u = &luaC_newobj(L, LUA_TUSERDATA, sizeof(Udata) + s, NULL, 0)->u;
+    u->uv.len = s;
+    u->uv.metatable = NULL;
+    u->uv.env = e;
+    return u;
 }
 
diff --git a/liblua/lstring.h b/liblua/lstring.h
index b7891d6b1..374483fca 100644
--- a/liblua/lstring.h
+++ b/liblua/lstring.h
@@ -17,7 +17,7 @@
 #define sizeudata(u) (sizeof(union Udata)+(u)->len)
 
 #define luaS_newliteral(L, s) (luaS_newlstr(L, "" s, \
-                                 (sizeof(s)/sizeof(char))-1))
+                                            (sizeof(s)/sizeof(char))-1))
 
 #define luaS_fix(s) l_setbit((s)->tsv.marked, FIXEDBIT)
 
@@ -34,13 +34,13 @@
 #define eqshrstr(a,b) check_exp((a)->tsv.tt == LUA_TSHRSTR, (a) == (b))
 
 
-LUAI_FUNC unsigned int luaS_hash (const char *str, size_t l, unsigned int seed);
-LUAI_FUNC int luaS_eqlngstr (TString *a, TString *b);
-LUAI_FUNC int luaS_eqstr (TString *a, TString *b);
-LUAI_FUNC void luaS_resize (lua_State *L, int newsize);
-LUAI_FUNC Udata *luaS_newudata (lua_State *L, size_t s, Table *e);
-LUAI_FUNC TString *luaS_newlstr (lua_State *L, const char *str, size_t l);
-LUAI_FUNC TString *luaS_new (lua_State *L, const char *str);
+LUAI_FUNC unsigned int luaS_hash(const char *str, size_t l, unsigned int seed);
+LUAI_FUNC int luaS_eqlngstr(TString *a, TString *b);
+LUAI_FUNC int luaS_eqstr(TString *a, TString *b);
+LUAI_FUNC void luaS_resize(lua_State *L, int newsize);
+LUAI_FUNC Udata *luaS_newudata(lua_State *L, size_t s, Table *e);
+LUAI_FUNC TString *luaS_newlstr(lua_State *L, const char *str, size_t l);
+LUAI_FUNC TString *luaS_new(lua_State *L, const char *str);
 
 
 #endif
diff --git a/liblua/lstrlib.c b/liblua/lstrlib.c
index 685beb77f..09ec93eb5 100644
--- a/liblua/lstrlib.c
+++ b/liblua/lstrlib.c
@@ -34,152 +34,165 @@
 
 
 
-static int str_len (lua_State *L) {
-  size_t l;
-  luaL_checklstring(L, 1, &l);
-  lua_pushinteger(L, (lua_Integer)l);
-  return 1;
+static int str_len(lua_State *L)
+{
+    size_t l;
+    luaL_checklstring(L, 1, &l);
+    lua_pushinteger(L, (lua_Integer)l);
+    return 1;
 }
 
 
 /* translate a relative string position: negative means back from end */
-static size_t posrelat (ptrdiff_t pos, size_t len) {
-  if (pos >= 0) return (size_t)pos;
-  else if (0u - (size_t)pos > len) return 0;
-  else return len - ((size_t)-pos) + 1;
+static size_t posrelat(ptrdiff_t pos, size_t len)
+{
+    if (pos >= 0) return (size_t)pos;
+    else if (0u - (size_t)pos > len) return 0;
+    else return len - ((size_t) - pos) + 1;
 }
 
 
-static int str_sub (lua_State *L) {
-  size_t l;
-  const char *s = luaL_checklstring(L, 1, &l);
-  size_t start = posrelat(luaL_checkinteger(L, 2), l);
-  size_t end = posrelat(luaL_optinteger(L, 3, -1), l);
-  if (start < 1) start = 1;
-  if (end > l) end = l;
-  if (start <= end)
-    lua_pushlstring(L, s + start - 1, end - start + 1);
-  else lua_pushliteral(L, "");
-  return 1;
+static int str_sub(lua_State *L)
+{
+    size_t l;
+    const char *s = luaL_checklstring(L, 1, &l);
+    size_t start = posrelat(luaL_checkinteger(L, 2), l);
+    size_t end = posrelat(luaL_optinteger(L, 3, -1), l);
+    if (start < 1) start = 1;
+    if (end > l) end = l;
+    if (start <= end)
+        lua_pushlstring(L, s + start - 1, end - start + 1);
+    else lua_pushliteral(L, "");
+    return 1;
 }
 
 
-static int str_reverse (lua_State *L) {
-  size_t l, i;
-  luaL_Buffer b;
-  const char *s = luaL_checklstring(L, 1, &l);
-  char *p = luaL_buffinitsize(L, &b, l);
-  for (i = 0; i < l; i++)
-    p[i] = s[l - i - 1];
-  luaL_pushresultsize(&b, l);
-  return 1;
+static int str_reverse(lua_State *L)
+{
+    size_t l, i;
+    luaL_Buffer b;
+    const char *s = luaL_checklstring(L, 1, &l);
+    char *p = luaL_buffinitsize(L, &b, l);
+    for (i = 0; i < l; i++)
+        p[i] = s[l - i - 1];
+    luaL_pushresultsize(&b, l);
+    return 1;
 }
 
 
-static int str_lower (lua_State *L) {
-  size_t l;
-  size_t i;
-  luaL_Buffer b;
-  const char *s = luaL_checklstring(L, 1, &l);
-  char *p = luaL_buffinitsize(L, &b, l);
-  for (i=0; i<l; i++)
-    p[i] = tolower(uchar(s[i]));
-  luaL_pushresultsize(&b, l);
-  return 1;
+static int str_lower(lua_State *L)
+{
+    size_t l;
+    size_t i;
+    luaL_Buffer b;
+    const char *s = luaL_checklstring(L, 1, &l);
+    char *p = luaL_buffinitsize(L, &b, l);
+    for (i = 0; i < l; i++)
+        p[i] = tolower(uchar(s[i]));
+    luaL_pushresultsize(&b, l);
+    return 1;
 }
 
 
-static int str_upper (lua_State *L) {
-  size_t l;
-  size_t i;
-  luaL_Buffer b;
-  const char *s = luaL_checklstring(L, 1, &l);
-  char *p = luaL_buffinitsize(L, &b, l);
-  for (i=0; i<l; i++)
-    p[i] = toupper(uchar(s[i]));
-  luaL_pushresultsize(&b, l);
-  return 1;
+static int str_upper(lua_State *L)
+{
+    size_t l;
+    size_t i;
+    luaL_Buffer b;
+    const char *s = luaL_checklstring(L, 1, &l);
+    char *p = luaL_buffinitsize(L, &b, l);
+    for (i = 0; i < l; i++)
+        p[i] = toupper(uchar(s[i]));
+    luaL_pushresultsize(&b, l);
+    return 1;
 }
 
 
 /* reasonable limit to avoid arithmetic overflow */
 #define MAXSIZE ((~(size_t)0) >> 1)
 
-static int str_rep (lua_State *L) {
-  size_t l, lsep;
-  const char *s = luaL_checklstring(L, 1, &l);
-  int n = luaL_checkint(L, 2);
-  const char *sep = luaL_optlstring(L, 3, "", &lsep);
-  if (n <= 0) lua_pushliteral(L, "");
-  else if (l + lsep < l || l + lsep >= MAXSIZE / n)  /* may overflow? */
-    return luaL_error(L, "resulting string too large");
-  else {
-    size_t totallen = n * l + (n - 1) * lsep;
-    luaL_Buffer b;
-    char *p = luaL_buffinitsize(L, &b, totallen);
-    while (n-- > 1) {  /* first n-1 copies (followed by separator) */
-      memcpy(p, s, l * sizeof(char)); p += l;
-      if (lsep > 0) {  /* avoid empty 'memcpy' (may be expensive) */
-        memcpy(p, sep, lsep * sizeof(char)); p += lsep;
-      }
+static int str_rep(lua_State *L)
+{
+    size_t l, lsep;
+    const char *s = luaL_checklstring(L, 1, &l);
+    int n = luaL_checkint(L, 2);
+    const char *sep = luaL_optlstring(L, 3, "", &lsep);
+    if (n <= 0) lua_pushliteral(L, "");
+    else if (l + lsep < l || l + lsep >= MAXSIZE / n)  /* may overflow? */
+        return luaL_error(L, "resulting string too large");
+    else {
+        size_t totallen = n * l + (n - 1) * lsep;
+        luaL_Buffer b;
+        char *p = luaL_buffinitsize(L, &b, totallen);
+        while (n-- > 1) {  /* first n-1 copies (followed by separator) */
+            memcpy(p, s, l * sizeof(char));
+            p += l;
+            if (lsep > 0) {  /* avoid empty 'memcpy' (may be expensive) */
+                memcpy(p, sep, lsep * sizeof(char));
+                p += lsep;
+            }
+        }
+        memcpy(p, s, l * sizeof(char));  /* last copy (not followed by separator) */
+        luaL_pushresultsize(&b, totallen);
     }
-    memcpy(p, s, l * sizeof(char));  /* last copy (not followed by separator) */
-    luaL_pushresultsize(&b, totallen);
-  }
-  return 1;
+    return 1;
 }
 
 
-static int str_byte (lua_State *L) {
-  size_t l;
-  const char *s = luaL_checklstring(L, 1, &l);
-  size_t posi = posrelat(luaL_optinteger(L, 2, 1), l);
-  size_t pose = posrelat(luaL_optinteger(L, 3, posi), l);
-  int n, i;
-  if (posi < 1) posi = 1;
-  if (pose > l) pose = l;
-  if (posi > pose) return 0;  /* empty interval; return no values */
-  n = (int)(pose -  posi + 1);
-  if (posi + n <= pose)  /* (size_t -> int) overflow? */
-    return luaL_error(L, "string slice too long");
-  luaL_checkstack(L, n, "string slice too long");
-  for (i=0; i<n; i++)
-    lua_pushinteger(L, uchar(s[posi+i-1]));
-  return n;
+static int str_byte(lua_State *L)
+{
+    size_t l;
+    const char *s = luaL_checklstring(L, 1, &l);
+    size_t posi = posrelat(luaL_optinteger(L, 2, 1), l);
+    size_t pose = posrelat(luaL_optinteger(L, 3, posi), l);
+    int n, i;
+    if (posi < 1) posi = 1;
+    if (pose > l) pose = l;
+    if (posi > pose) return 0;  /* empty interval; return no values */
+    n = (int)(pose -  posi + 1);
+    if (posi + n <= pose)  /* (size_t -> int) overflow? */
+        return luaL_error(L, "string slice too long");
+    luaL_checkstack(L, n, "string slice too long");
+    for (i = 0; i < n; i++)
+        lua_pushinteger(L, uchar(s[posi + i - 1]));
+    return n;
 }
 
 
-static int str_char (lua_State *L) {
-  int n = lua_gettop(L);  /* number of arguments */
-  int i;
-  luaL_Buffer b;
-  char *p = luaL_buffinitsize(L, &b, n);
-  for (i=1; i<=n; i++) {
-    int c = luaL_checkint(L, i);
-    luaL_argcheck(L, uchar(c) == c, i, "value out of range");
-    p[i - 1] = uchar(c);
-  }
-  luaL_pushresultsize(&b, n);
-  return 1;
+static int str_char(lua_State *L)
+{
+    int n = lua_gettop(L);  /* number of arguments */
+    int i;
+    luaL_Buffer b;
+    char *p = luaL_buffinitsize(L, &b, n);
+    for (i = 1; i <= n; i++) {
+        int c = luaL_checkint(L, i);
+        luaL_argcheck(L, uchar(c) == c, i, "value out of range");
+        p[i - 1] = uchar(c);
+    }
+    luaL_pushresultsize(&b, n);
+    return 1;
 }
 
 
-static int writer (lua_State *L, const void* b, size_t size, void* B) {
-  (void)L;
-  luaL_addlstring((luaL_Buffer*) B, (const char *)b, size);
-  return 0;
+static int writer(lua_State *L, const void *b, size_t size, void *B)
+{
+    (void)L;
+    luaL_addlstring((luaL_Buffer *) B, (const char *)b, size);
+    return 0;
 }
 
 
-static int str_dump (lua_State *L) {
-  luaL_Buffer b;
-  luaL_checktype(L, 1, LUA_TFUNCTION);
-  lua_settop(L, 1);
-  luaL_buffinit(L,&b);
-  if (lua_dump(L, writer, &b) != 0)
-    return luaL_error(L, "unable to dump given function");
-  luaL_pushresult(&b);
-  return 1;
+static int str_dump(lua_State *L)
+{
+    luaL_Buffer b;
+    luaL_checktype(L, 1, LUA_TFUNCTION);
+    lua_settop(L, 1);
+    luaL_buffinit(L, &b);
+    if (lua_dump(L, writer, &b) != 0)
+        return luaL_error(L, "unable to dump given function");
+    luaL_pushresult(&b);
+    return 1;
 }
 
 
@@ -196,21 +209,21 @@ static int str_dump (lua_State *L) {
 
 
 typedef struct MatchState {
-  int matchdepth;  /* control for recursive depth (to avoid C stack overflow) */
-  const char *src_init;  /* init of source string */
-  const char *src_end;  /* end ('\0') of source string */
-  const char *p_end;  /* end ('\0') of pattern */
-  lua_State *L;
-  int level;  /* total number of captures (finished or unfinished) */
-  struct {
-    const char *init;
-    ptrdiff_t len;
-  } capture[LUA_MAXCAPTURES];
+    int matchdepth;  /* control for recursive depth (to avoid C stack overflow) */
+    const char *src_init;  /* init of source string */
+    const char *src_end;  /* end ('\0') of source string */
+    const char *p_end;  /* end ('\0') of pattern */
+    lua_State *L;
+    int level;  /* total number of captures (finished or unfinished) */
+    struct {
+        const char *init;
+        ptrdiff_t len;
+    } capture[LUA_MAXCAPTURES];
 } MatchState;
 
 
 /* recursive function */
-static const char *match (MatchState *ms, const char *s, const char *p);
+static const char *match(MatchState *ms, const char *s, const char *p);
 
 
 /* maximum recursion depth for 'match' */
@@ -223,557 +236,618 @@ static const char *match (MatchState *ms, const char *s, const char *p);
 #define SPECIALS "^$*+?.([%-"
 
 
-static int check_capture (MatchState *ms, int l) {
-  l -= '1';
-  if (l < 0 || l >= ms->level || ms->capture[l].len == CAP_UNFINISHED)
-    return luaL_error(ms->L, "invalid capture index %%%d", l + 1);
-  return l;
+static int check_capture(MatchState *ms, int l)
+{
+    l -= '1';
+    if (l < 0 || l >= ms->level || ms->capture[l].len == CAP_UNFINISHED)
+        return luaL_error(ms->L, "invalid capture index %%%d", l + 1);
+    return l;
 }
 
 
-static int capture_to_close (MatchState *ms) {
-  int level = ms->level;
-  for (level--; level>=0; level--)
-    if (ms->capture[level].len == CAP_UNFINISHED) return level;
-  return luaL_error(ms->L, "invalid pattern capture");
+static int capture_to_close(MatchState *ms)
+{
+    int level = ms->level;
+    for (level--; level >= 0; level--)
+        if (ms->capture[level].len == CAP_UNFINISHED) return level;
+    return luaL_error(ms->L, "invalid pattern capture");
 }
 
 
-static const char *classend (MatchState *ms, const char *p) {
-  switch (*p++) {
-    case L_ESC: {
-      if (p == ms->p_end)
-        luaL_error(ms->L, "malformed pattern (ends with " LUA_QL("%%") ")");
-      return p+1;
+static const char *classend(MatchState *ms, const char *p)
+{
+    switch (*p++) {
+        case L_ESC: {
+            if (p == ms->p_end)
+                luaL_error(ms->L, "malformed pattern (ends with " LUA_QL("%%") ")");
+            return p + 1;
+        }
+        case '[': {
+            if (*p == '^') p++;
+            do {  /* look for a `]' */
+                if (p == ms->p_end)
+                    luaL_error(ms->L, "malformed pattern (missing " LUA_QL("]") ")");
+                if (*(p++) == L_ESC && p < ms->p_end)
+                    p++;  /* skip escapes (e.g. `%]') */
+            } while (*p != ']');
+            return p + 1;
+        }
+        default: {
+            return p;
+        }
     }
-    case '[': {
-      if (*p == '^') p++;
-      do {  /* look for a `]' */
-        if (p == ms->p_end)
-          luaL_error(ms->L, "malformed pattern (missing " LUA_QL("]") ")");
-        if (*(p++) == L_ESC && p < ms->p_end)
-          p++;  /* skip escapes (e.g. `%]') */
-      } while (*p != ']');
-      return p+1;
-    }
-    default: {
-      return p;
-    }
-  }
 }
 
 
-static int match_class (int c, int cl) {
-  int res;
-  switch (tolower(cl)) {
-    case 'a' : res = isalpha(c); break;
-    case 'c' : res = iscntrl(c); break;
-    case 'd' : res = isdigit(c); break;
-    case 'g' : res = isgraph(c); break;
-    case 'l' : res = islower(c); break;
-    case 'p' : res = ispunct(c); break;
-    case 's' : res = isspace(c); break;
-    case 'u' : res = isupper(c); break;
-    case 'w' : res = isalnum(c); break;
-    case 'x' : res = isxdigit(c); break;
-    case 'z' : res = (c == 0); break;  /* deprecated option */
-    default: return (cl == c);
-  }
-  return (islower(cl) ? res : !res);
-}
-
-
-static int matchbracketclass (int c, const char *p, const char *ec) {
-  int sig = 1;
-  if (*(p+1) == '^') {
-    sig = 0;
-    p++;  /* skip the `^' */
-  }
-  while (++p < ec) {
-    if (*p == L_ESC) {
-      p++;
-      if (match_class(c, uchar(*p)))
-        return sig;
-    }
-    else if ((*(p+1) == '-') && (p+2 < ec)) {
-      p+=2;
-      if (uchar(*(p-2)) <= c && c <= uchar(*p))
-        return sig;
-    }
-    else if (uchar(*p) == c) return sig;
-  }
-  return !sig;
-}
-
-
-static int singlematch (MatchState *ms, const char *s, const char *p,
-                        const char *ep) {
-  if (s >= ms->src_end)
-    return 0;
-  else {
-    int c = uchar(*s);
-    switch (*p) {
-      case '.': return 1;  /* matches any char */
-      case L_ESC: return match_class(c, uchar(*(p+1)));
-      case '[': return matchbracketclass(c, p, ep-1);
-      default:  return (uchar(*p) == c);
-    }
-  }
-}
-
-
-static const char *matchbalance (MatchState *ms, const char *s,
-                                   const char *p) {
-  if (p >= ms->p_end - 1)
-    luaL_error(ms->L, "malformed pattern "
-                      "(missing arguments to " LUA_QL("%%b") ")");
-  if (*s != *p) return NULL;
-  else {
-    int b = *p;
-    int e = *(p+1);
-    int cont = 1;
-    while (++s < ms->src_end) {
-      if (*s == e) {
-        if (--cont == 0) return s+1;
-      }
-      else if (*s == b) cont++;
-    }
-  }
-  return NULL;  /* string ends out of balance */
-}
-
-
-static const char *max_expand (MatchState *ms, const char *s,
-                                 const char *p, const char *ep) {
-  ptrdiff_t i = 0;  /* counts maximum expand for item */
-  while (singlematch(ms, s + i, p, ep))
-    i++;
-  /* keeps trying to match with the maximum repetitions */
-  while (i>=0) {
-    const char *res = match(ms, (s+i), ep+1);
-    if (res) return res;
-    i--;  /* else didn't match; reduce 1 repetition to try again */
-  }
-  return NULL;
-}
-
-
-static const char *min_expand (MatchState *ms, const char *s,
-                                 const char *p, const char *ep) {
-  for (;;) {
-    const char *res = match(ms, s, ep+1);
-    if (res != NULL)
-      return res;
-    else if (singlematch(ms, s, p, ep))
-      s++;  /* try with one more repetition */
-    else return NULL;
-  }
-}
-
-
-static const char *start_capture (MatchState *ms, const char *s,
-                                    const char *p, int what) {
-  const char *res;
-  int level = ms->level;
-  if (level >= LUA_MAXCAPTURES) luaL_error(ms->L, "too many captures");
-  ms->capture[level].init = s;
-  ms->capture[level].len = what;
-  ms->level = level+1;
-  if ((res=match(ms, s, p)) == NULL)  /* match failed? */
-    ms->level--;  /* undo capture */
-  return res;
-}
-
-
-static const char *end_capture (MatchState *ms, const char *s,
-                                  const char *p) {
-  int l = capture_to_close(ms);
-  const char *res;
-  ms->capture[l].len = s - ms->capture[l].init;  /* close capture */
-  if ((res = match(ms, s, p)) == NULL)  /* match failed? */
-    ms->capture[l].len = CAP_UNFINISHED;  /* undo capture */
-  return res;
-}
-
-
-static const char *match_capture (MatchState *ms, const char *s, int l) {
-  size_t len;
-  l = check_capture(ms, l);
-  len = ms->capture[l].len;
-  if ((size_t)(ms->src_end-s) >= len &&
-      memcmp(ms->capture[l].init, s, len) == 0)
-    return s+len;
-  else return NULL;
-}
-
-
-static const char *match (MatchState *ms, const char *s, const char *p) {
-  if (ms->matchdepth-- == 0)
-    luaL_error(ms->L, "pattern too complex");
-  init: /* using goto's to optimize tail recursion */
-  if (p != ms->p_end) {  /* end of pattern? */
-    switch (*p) {
-      case '(': {  /* start capture */
-        if (*(p + 1) == ')')  /* position capture? */
-          s = start_capture(ms, s, p + 2, CAP_POSITION);
-        else
-          s = start_capture(ms, s, p + 1, CAP_UNFINISHED);
-        break;
-      }
-      case ')': {  /* end capture */
-        s = end_capture(ms, s, p + 1);
-        break;
-      }
-      case '$': {
-        if ((p + 1) != ms->p_end)  /* is the `$' the last char in pattern? */
-          goto dflt;  /* no; go to default */
-        s = (s == ms->src_end) ? s : NULL;  /* check end of string */
-        break;
-      }
-      case L_ESC: {  /* escaped sequences not in the format class[*+?-]? */
-        switch (*(p + 1)) {
-          case 'b': {  /* balanced string? */
-            s = matchbalance(ms, s, p + 2);
-            if (s != NULL) {
-              p += 4; goto init;  /* return match(ms, s, p + 4); */
-            }  /* else fail (s == NULL) */
+static int match_class(int c, int cl)
+{
+    int res;
+    switch (tolower(cl)) {
+        case 'a' :
+            res = isalpha(c);
             break;
-          }
-          case 'f': {  /* frontier? */
-            const char *ep; char previous;
+        case 'c' :
+            res = iscntrl(c);
+            break;
+        case 'd' :
+            res = isdigit(c);
+            break;
+        case 'g' :
+            res = isgraph(c);
+            break;
+        case 'l' :
+            res = islower(c);
+            break;
+        case 'p' :
+            res = ispunct(c);
+            break;
+        case 's' :
+            res = isspace(c);
+            break;
+        case 'u' :
+            res = isupper(c);
+            break;
+        case 'w' :
+            res = isalnum(c);
+            break;
+        case 'x' :
+            res = isxdigit(c);
+            break;
+        case 'z' :
+            res = (c == 0);
+            break;  /* deprecated option */
+        default:
+            return (cl == c);
+    }
+    return (islower(cl) ? res : !res);
+}
+
+
+static int matchbracketclass(int c, const char *p, const char *ec)
+{
+    int sig = 1;
+    if (*(p + 1) == '^') {
+        sig = 0;
+        p++;  /* skip the `^' */
+    }
+    while (++p < ec) {
+        if (*p == L_ESC) {
+            p++;
+            if (match_class(c, uchar(*p)))
+                return sig;
+        } else if ((*(p + 1) == '-') && (p + 2 < ec)) {
             p += 2;
-            if (*p != '[')
-              luaL_error(ms->L, "missing " LUA_QL("[") " after "
-                                 LUA_QL("%%f") " in pattern");
-            ep = classend(ms, p);  /* points to what is next */
-            previous = (s == ms->src_init) ? '\0' : *(s - 1);
-            if (!matchbracketclass(uchar(previous), p, ep - 1) &&
-               matchbracketclass(uchar(*s), p, ep - 1)) {
-              p = ep; goto init;  /* return match(ms, s, ep); */
-            }
-            s = NULL;  /* match failed */
-            break;
-          }
-          case '0': case '1': case '2': case '3':
-          case '4': case '5': case '6': case '7':
-          case '8': case '9': {  /* capture results (%0-%9)? */
-            s = match_capture(ms, s, uchar(*(p + 1)));
-            if (s != NULL) {
-              p += 2; goto init;  /* return match(ms, s, p + 2) */
-            }
-            break;
-          }
-          default: goto dflt;
-        }
-        break;
-      }
-      default: dflt: {  /* pattern class plus optional suffix */
-        const char *ep = classend(ms, p);  /* points to optional suffix */
-        /* does not match at least once? */
-        if (!singlematch(ms, s, p, ep)) {
-          if (*ep == '*' || *ep == '?' || *ep == '-') {  /* accept empty? */
-            p = ep + 1; goto init;  /* return match(ms, s, ep + 1); */
-          }
-          else  /* '+' or no suffix */
-            s = NULL;  /* fail */
-        }
-        else {  /* matched once */
-          switch (*ep) {  /* handle optional suffix */
-            case '?': {  /* optional */
-              const char *res;
-              if ((res = match(ms, s + 1, ep + 1)) != NULL)
-                s = res;
-              else {
-                p = ep + 1; goto init;  /* else return match(ms, s, ep + 1); */
-              }
-              break;
-            }
-            case '+':  /* 1 or more repetitions */
-              s++;  /* 1 match already done */
-              /* go through */
-            case '*':  /* 0 or more repetitions */
-              s = max_expand(ms, s, p, ep);
-              break;
-            case '-':  /* 0 or more repetitions (minimum) */
-              s = min_expand(ms, s, p, ep);
-              break;
-            default:  /* no suffix */
-              s++; p = ep; goto init;  /* return match(ms, s + 1, ep); */
-          }
-        }
-        break;
-      }
+            if (uchar(*(p - 2)) <= c && c <= uchar(*p))
+                return sig;
+        } else if (uchar(*p) == c) return sig;
     }
-  }
-  ms->matchdepth++;
-  return s;
+    return !sig;
 }
 
 
-
-static const char *lmemfind (const char *s1, size_t l1,
-                               const char *s2, size_t l2) {
-  if (l2 == 0) return s1;  /* empty strings are everywhere */
-  else if (l2 > l1) return NULL;  /* avoids a negative `l1' */
-  else {
-    const char *init;  /* to search for a `*s2' inside `s1' */
-    l2--;  /* 1st char will be checked by `memchr' */
-    l1 = l1-l2;  /* `s2' cannot be found after that */
-    while (l1 > 0 && (init = (const char *)memchr(s1, *s2, l1)) != NULL) {
-      init++;   /* 1st char is already checked */
-      if (memcmp(init, s2+1, l2) == 0)
-        return init-1;
-      else {  /* correct `l1' and `s1' to try again */
-        l1 -= init-s1;
-        s1 = init;
-      }
+static int singlematch(MatchState *ms, const char *s, const char *p,
+                       const char *ep)
+{
+    if (s >= ms->src_end)
+        return 0;
+    else {
+        int c = uchar(*s);
+        switch (*p) {
+            case '.':
+                return 1;  /* matches any char */
+            case L_ESC:
+                return match_class(c, uchar(*(p + 1)));
+            case '[':
+                return matchbracketclass(c, p, ep - 1);
+            default:
+                return (uchar(*p) == c);
+        }
     }
-    return NULL;  /* not found */
-  }
 }
 
 
-static void push_onecapture (MatchState *ms, int i, const char *s,
-                                                    const char *e) {
-  if (i >= ms->level) {
-    if (i == 0)  /* ms->level == 0, too */
-      lua_pushlstring(ms->L, s, e - s);  /* add whole match */
-    else
-      luaL_error(ms->L, "invalid capture index");
-  }
-  else {
-    ptrdiff_t l = ms->capture[i].len;
-    if (l == CAP_UNFINISHED) luaL_error(ms->L, "unfinished capture");
-    if (l == CAP_POSITION)
-      lua_pushinteger(ms->L, ms->capture[i].init - ms->src_init + 1);
-    else
-      lua_pushlstring(ms->L, ms->capture[i].init, l);
-  }
+static const char *matchbalance(MatchState *ms, const char *s,
+                                const char *p)
+{
+    if (p >= ms->p_end - 1)
+        luaL_error(ms->L, "malformed pattern "
+                   "(missing arguments to " LUA_QL("%%b") ")");
+    if (*s != *p) return NULL;
+    else {
+        int b = *p;
+        int e = *(p + 1);
+        int cont = 1;
+        while (++s < ms->src_end) {
+            if (*s == e) {
+                if (--cont == 0) return s + 1;
+            } else if (*s == b) cont++;
+        }
+    }
+    return NULL;  /* string ends out of balance */
 }
 
 
-static int push_captures (MatchState *ms, const char *s, const char *e) {
-  int i;
-  int nlevels = (ms->level == 0 && s) ? 1 : ms->level;
-  luaL_checkstack(ms->L, nlevels, "too many captures");
-  for (i = 0; i < nlevels; i++)
-    push_onecapture(ms, i, s, e);
-  return nlevels;  /* number of strings pushed */
+static const char *max_expand(MatchState *ms, const char *s,
+                              const char *p, const char *ep)
+{
+    ptrdiff_t i = 0;  /* counts maximum expand for item */
+    while (singlematch(ms, s + i, p, ep))
+        i++;
+    /* keeps trying to match with the maximum repetitions */
+    while (i >= 0) {
+        const char *res = match(ms, (s + i), ep + 1);
+        if (res) return res;
+        i--;  /* else didn't match; reduce 1 repetition to try again */
+    }
+    return NULL;
+}
+
+
+static const char *min_expand(MatchState *ms, const char *s,
+                              const char *p, const char *ep)
+{
+    for (;;) {
+        const char *res = match(ms, s, ep + 1);
+        if (res != NULL)
+            return res;
+        else if (singlematch(ms, s, p, ep))
+            s++;  /* try with one more repetition */
+        else return NULL;
+    }
+}
+
+
+static const char *start_capture(MatchState *ms, const char *s,
+                                 const char *p, int what)
+{
+    const char *res;
+    int level = ms->level;
+    if (level >= LUA_MAXCAPTURES) luaL_error(ms->L, "too many captures");
+    ms->capture[level].init = s;
+    ms->capture[level].len = what;
+    ms->level = level + 1;
+    if ((res = match(ms, s, p)) == NULL) /* match failed? */
+        ms->level--;  /* undo capture */
+    return res;
+}
+
+
+static const char *end_capture(MatchState *ms, const char *s,
+                               const char *p)
+{
+    int l = capture_to_close(ms);
+    const char *res;
+    ms->capture[l].len = s - ms->capture[l].init;  /* close capture */
+    if ((res = match(ms, s, p)) == NULL)  /* match failed? */
+        ms->capture[l].len = CAP_UNFINISHED;  /* undo capture */
+    return res;
+}
+
+
+static const char *match_capture(MatchState *ms, const char *s, int l)
+{
+    size_t len;
+    l = check_capture(ms, l);
+    len = ms->capture[l].len;
+    if ((size_t)(ms->src_end - s) >= len &&
+        memcmp(ms->capture[l].init, s, len) == 0)
+        return s + len;
+    else return NULL;
+}
+
+
+static const char *match(MatchState *ms, const char *s, const char *p)
+{
+    if (ms->matchdepth-- == 0)
+        luaL_error(ms->L, "pattern too complex");
+init: /* using goto's to optimize tail recursion */
+    if (p != ms->p_end) {  /* end of pattern? */
+        switch (*p) {
+            case '(': {  /* start capture */
+                if (*(p + 1) == ')')  /* position capture? */
+                    s = start_capture(ms, s, p + 2, CAP_POSITION);
+                else
+                    s = start_capture(ms, s, p + 1, CAP_UNFINISHED);
+                break;
+            }
+            case ')': {  /* end capture */
+                s = end_capture(ms, s, p + 1);
+                break;
+            }
+            case '$': {
+                if ((p + 1) != ms->p_end)  /* is the `$' the last char in pattern? */
+                    goto dflt;  /* no; go to default */
+                s = (s == ms->src_end) ? s : NULL;  /* check end of string */
+                break;
+            }
+            case L_ESC: {  /* escaped sequences not in the format class[*+?-]? */
+                switch (*(p + 1)) {
+                    case 'b': {  /* balanced string? */
+                        s = matchbalance(ms, s, p + 2);
+                        if (s != NULL) {
+                            p += 4;
+                            goto init;  /* return match(ms, s, p + 4); */
+                        }  /* else fail (s == NULL) */
+                        break;
+                    }
+                    case 'f': {  /* frontier? */
+                        const char *ep;
+                        char previous;
+                        p += 2;
+                        if (*p != '[')
+                            luaL_error(ms->L, "missing " LUA_QL("[") " after "
+                                       LUA_QL("%%f") " in pattern");
+                        ep = classend(ms, p);  /* points to what is next */
+                        previous = (s == ms->src_init) ? '\0' : *(s - 1);
+                        if (!matchbracketclass(uchar(previous), p, ep - 1) &&
+                            matchbracketclass(uchar(*s), p, ep - 1)) {
+                            p = ep;
+                            goto init;  /* return match(ms, s, ep); */
+                        }
+                        s = NULL;  /* match failed */
+                        break;
+                    }
+                    case '0':
+                    case '1':
+                    case '2':
+                    case '3':
+                    case '4':
+                    case '5':
+                    case '6':
+                    case '7':
+                    case '8':
+                    case '9': {  /* capture results (%0-%9)? */
+                        s = match_capture(ms, s, uchar(*(p + 1)));
+                        if (s != NULL) {
+                            p += 2;
+                            goto init;  /* return match(ms, s, p + 2) */
+                        }
+                        break;
+                    }
+                    default:
+                        goto dflt;
+                }
+                break;
+            }
+            default:
+dflt: {  /* pattern class plus optional suffix */
+                    const char *ep = classend(ms, p);  /* points to optional suffix */
+                    /* does not match at least once? */
+                    if (!singlematch(ms, s, p, ep)) {
+                        if (*ep == '*' || *ep == '?' || *ep == '-') {  /* accept empty? */
+                            p = ep + 1;
+                            goto init;  /* return match(ms, s, ep + 1); */
+                        } else /* '+' or no suffix */
+                            s = NULL;  /* fail */
+                    } else { /* matched once */
+                        switch (*ep) {  /* handle optional suffix */
+                            case '?': {  /* optional */
+                                const char *res;
+                                if ((res = match(ms, s + 1, ep + 1)) != NULL)
+                                    s = res;
+                                else {
+                                    p = ep + 1;
+                                    goto init;  /* else return match(ms, s, ep + 1); */
+                                }
+                                break;
+                            }
+                            case '+':  /* 1 or more repetitions */
+                                s++;  /* 1 match already done */
+                            /* go through */
+                            case '*':  /* 0 or more repetitions */
+                                s = max_expand(ms, s, p, ep);
+                                break;
+                            case '-':  /* 0 or more repetitions (minimum) */
+                                s = min_expand(ms, s, p, ep);
+                                break;
+                            default:  /* no suffix */
+                                s++;
+                                p = ep;
+                                goto init;  /* return match(ms, s + 1, ep); */
+                        }
+                    }
+                    break;
+                }
+        }
+    }
+    ms->matchdepth++;
+    return s;
+}
+
+
+
+static const char *lmemfind(const char *s1, size_t l1,
+                            const char *s2, size_t l2)
+{
+    if (l2 == 0) return s1;  /* empty strings are everywhere */
+    else if (l2 > l1) return NULL;  /* avoids a negative `l1' */
+    else {
+        const char *init;  /* to search for a `*s2' inside `s1' */
+        l2--;  /* 1st char will be checked by `memchr' */
+        l1 = l1 - l2; /* `s2' cannot be found after that */
+        while (l1 > 0 && (init = (const char *)memchr(s1, *s2, l1)) != NULL) {
+            init++;   /* 1st char is already checked */
+            if (memcmp(init, s2 + 1, l2) == 0)
+                return init - 1;
+            else {  /* correct `l1' and `s1' to try again */
+                l1 -= init - s1;
+                s1 = init;
+            }
+        }
+        return NULL;  /* not found */
+    }
+}
+
+
+static void push_onecapture(MatchState *ms, int i, const char *s,
+                            const char *e)
+{
+    if (i >= ms->level) {
+        if (i == 0)  /* ms->level == 0, too */
+            lua_pushlstring(ms->L, s, e - s);  /* add whole match */
+        else
+            luaL_error(ms->L, "invalid capture index");
+    } else {
+        ptrdiff_t l = ms->capture[i].len;
+        if (l == CAP_UNFINISHED) luaL_error(ms->L, "unfinished capture");
+        if (l == CAP_POSITION)
+            lua_pushinteger(ms->L, ms->capture[i].init - ms->src_init + 1);
+        else
+            lua_pushlstring(ms->L, ms->capture[i].init, l);
+    }
+}
+
+
+static int push_captures(MatchState *ms, const char *s, const char *e)
+{
+    int i;
+    int nlevels = (ms->level == 0 && s) ? 1 : ms->level;
+    luaL_checkstack(ms->L, nlevels, "too many captures");
+    for (i = 0; i < nlevels; i++)
+        push_onecapture(ms, i, s, e);
+    return nlevels;  /* number of strings pushed */
 }
 
 
 /* check whether pattern has no special characters */
-static int nospecials (const char *p, size_t l) {
-  size_t upto = 0;
-  do {
-    if (strpbrk(p + upto, SPECIALS))
-      return 0;  /* pattern has a special character */
-    upto += strlen(p + upto) + 1;  /* may have more after \0 */
-  } while (upto <= l);
-  return 1;  /* no special chars found */
+static int nospecials(const char *p, size_t l)
+{
+    size_t upto = 0;
+    do {
+        if (strpbrk(p + upto, SPECIALS))
+            return 0;  /* pattern has a special character */
+        upto += strlen(p + upto) + 1;  /* may have more after \0 */
+    } while (upto <= l);
+    return 1;  /* no special chars found */
 }
 
 
-static int str_find_aux (lua_State *L, int find) {
-  size_t ls, lp;
-  const char *s = luaL_checklstring(L, 1, &ls);
-  const char *p = luaL_checklstring(L, 2, &lp);
-  size_t init = posrelat(luaL_optinteger(L, 3, 1), ls);
-  if (init < 1) init = 1;
-  else if (init > ls + 1) {  /* start after string's end? */
-    lua_pushnil(L);  /* cannot find anything */
+static int str_find_aux(lua_State *L, int find)
+{
+    size_t ls, lp;
+    const char *s = luaL_checklstring(L, 1, &ls);
+    const char *p = luaL_checklstring(L, 2, &lp);
+    size_t init = posrelat(luaL_optinteger(L, 3, 1), ls);
+    if (init < 1) init = 1;
+    else if (init > ls + 1) {  /* start after string's end? */
+        lua_pushnil(L);  /* cannot find anything */
+        return 1;
+    }
+    /* explicit request or no special characters? */
+    if (find && (lua_toboolean(L, 4) || nospecials(p, lp))) {
+        /* do a plain search */
+        const char *s2 = lmemfind(s + init - 1, ls - init + 1, p, lp);
+        if (s2) {
+            lua_pushinteger(L, s2 - s + 1);
+            lua_pushinteger(L, s2 - s + lp);
+            return 2;
+        }
+    } else {
+        MatchState ms;
+        const char *s1 = s + init - 1;
+        int anchor = (*p == '^');
+        if (anchor) {
+            p++;
+            lp--;  /* skip anchor character */
+        }
+        ms.L = L;
+        ms.matchdepth = MAXCCALLS;
+        ms.src_init = s;
+        ms.src_end = s + ls;
+        ms.p_end = p + lp;
+        do {
+            const char *res;
+            ms.level = 0;
+            lua_assert(ms.matchdepth == MAXCCALLS);
+            if ((res = match(&ms, s1, p)) != NULL) {
+                if (find) {
+                    lua_pushinteger(L, s1 - s + 1);  /* start */
+                    lua_pushinteger(L, res - s);   /* end */
+                    return push_captures(&ms, NULL, 0) + 2;
+                } else
+                    return push_captures(&ms, s1, res);
+            }
+        } while (s1++ < ms.src_end && !anchor);
+    }
+    lua_pushnil(L);  /* not found */
     return 1;
-  }
-  /* explicit request or no special characters? */
-  if (find && (lua_toboolean(L, 4) || nospecials(p, lp))) {
-    /* do a plain search */
-    const char *s2 = lmemfind(s + init - 1, ls - init + 1, p, lp);
-    if (s2) {
-      lua_pushinteger(L, s2 - s + 1);
-      lua_pushinteger(L, s2 - s + lp);
-      return 2;
-    }
-  }
-  else {
+}
+
+
+static int str_find(lua_State *L)
+{
+    return str_find_aux(L, 1);
+}
+
+
+static int str_match(lua_State *L)
+{
+    return str_find_aux(L, 0);
+}
+
+
+static int gmatch_aux(lua_State *L)
+{
     MatchState ms;
-    const char *s1 = s + init - 1;
-    int anchor = (*p == '^');
-    if (anchor) {
-      p++; lp--;  /* skip anchor character */
-    }
+    size_t ls, lp;
+    const char *s = lua_tolstring(L, lua_upvalueindex(1), &ls);
+    const char *p = lua_tolstring(L, lua_upvalueindex(2), &lp);
+    const char *src;
     ms.L = L;
     ms.matchdepth = MAXCCALLS;
     ms.src_init = s;
     ms.src_end = s + ls;
     ms.p_end = p + lp;
-    do {
-      const char *res;
-      ms.level = 0;
-      lua_assert(ms.matchdepth == MAXCCALLS);
-      if ((res=match(&ms, s1, p)) != NULL) {
-        if (find) {
-          lua_pushinteger(L, s1 - s + 1);  /* start */
-          lua_pushinteger(L, res - s);   /* end */
-          return push_captures(&ms, NULL, 0) + 2;
+    for (src = s + (size_t)lua_tointeger(L, lua_upvalueindex(3));
+         src <= ms.src_end;
+         src++) {
+        const char *e;
+        ms.level = 0;
+        lua_assert(ms.matchdepth == MAXCCALLS);
+        if ((e = match(&ms, src, p)) != NULL) {
+            lua_Integer newstart = e - s;
+            if (e == src) newstart++;  /* empty match? go at least one position */
+            lua_pushinteger(L, newstart);
+            lua_replace(L, lua_upvalueindex(3));
+            return push_captures(&ms, src, e);
         }
-        else
-          return push_captures(&ms, s1, res);
-      }
-    } while (s1++ < ms.src_end && !anchor);
-  }
-  lua_pushnil(L);  /* not found */
-  return 1;
-}
-
-
-static int str_find (lua_State *L) {
-  return str_find_aux(L, 1);
-}
-
-
-static int str_match (lua_State *L) {
-  return str_find_aux(L, 0);
-}
-
-
-static int gmatch_aux (lua_State *L) {
-  MatchState ms;
-  size_t ls, lp;
-  const char *s = lua_tolstring(L, lua_upvalueindex(1), &ls);
-  const char *p = lua_tolstring(L, lua_upvalueindex(2), &lp);
-  const char *src;
-  ms.L = L;
-  ms.matchdepth = MAXCCALLS;
-  ms.src_init = s;
-  ms.src_end = s+ls;
-  ms.p_end = p + lp;
-  for (src = s + (size_t)lua_tointeger(L, lua_upvalueindex(3));
-       src <= ms.src_end;
-       src++) {
-    const char *e;
-    ms.level = 0;
-    lua_assert(ms.matchdepth == MAXCCALLS);
-    if ((e = match(&ms, src, p)) != NULL) {
-      lua_Integer newstart = e-s;
-      if (e == src) newstart++;  /* empty match? go at least one position */
-      lua_pushinteger(L, newstart);
-      lua_replace(L, lua_upvalueindex(3));
-      return push_captures(&ms, src, e);
     }
-  }
-  return 0;  /* not found */
+    return 0;  /* not found */
 }
 
 
-static int gmatch (lua_State *L) {
-  luaL_checkstring(L, 1);
-  luaL_checkstring(L, 2);
-  lua_settop(L, 2);
-  lua_pushinteger(L, 0);
-  lua_pushcclosure(L, gmatch_aux, 3);
-  return 1;
+static int gmatch(lua_State *L)
+{
+    luaL_checkstring(L, 1);
+    luaL_checkstring(L, 2);
+    lua_settop(L, 2);
+    lua_pushinteger(L, 0);
+    lua_pushcclosure(L, gmatch_aux, 3);
+    return 1;
 }
 
 
-static void add_s (MatchState *ms, luaL_Buffer *b, const char *s,
-                                                   const char *e) {
-  size_t l, i;
-  const char *news = lua_tolstring(ms->L, 3, &l);
-  for (i = 0; i < l; i++) {
-    if (news[i] != L_ESC)
-      luaL_addchar(b, news[i]);
-    else {
-      i++;  /* skip ESC */
-      if (!isdigit(uchar(news[i]))) {
+static void add_s(MatchState *ms, luaL_Buffer *b, const char *s,
+                  const char *e)
+{
+    size_t l, i;
+    const char *news = lua_tolstring(ms->L, 3, &l);
+    for (i = 0; i < l; i++) {
         if (news[i] != L_ESC)
-          luaL_error(ms->L, "invalid use of " LUA_QL("%c")
-                           " in replacement string", L_ESC);
-        luaL_addchar(b, news[i]);
-      }
-      else if (news[i] == '0')
-          luaL_addlstring(b, s, e - s);
-      else {
-        push_onecapture(ms, news[i] - '1', s, e);
-        luaL_addvalue(b);  /* add capture to accumulated result */
-      }
+            luaL_addchar(b, news[i]);
+        else {
+            i++;  /* skip ESC */
+            if (!isdigit(uchar(news[i]))) {
+                if (news[i] != L_ESC)
+                    luaL_error(ms->L, "invalid use of " LUA_QL("%c")
+                               " in replacement string", L_ESC);
+                luaL_addchar(b, news[i]);
+            } else if (news[i] == '0')
+                luaL_addlstring(b, s, e - s);
+            else {
+                push_onecapture(ms, news[i] - '1', s, e);
+                luaL_addvalue(b);  /* add capture to accumulated result */
+            }
+        }
     }
-  }
 }
 
 
-static void add_value (MatchState *ms, luaL_Buffer *b, const char *s,
-                                       const char *e, int tr) {
-  lua_State *L = ms->L;
-  switch (tr) {
-    case LUA_TFUNCTION: {
-      int n;
-      lua_pushvalue(L, 3);
-      n = push_captures(ms, s, e);
-      lua_call(L, n, 1);
-      break;
+static void add_value(MatchState *ms, luaL_Buffer *b, const char *s,
+                      const char *e, int tr)
+{
+    lua_State *L = ms->L;
+    switch (tr) {
+        case LUA_TFUNCTION: {
+            int n;
+            lua_pushvalue(L, 3);
+            n = push_captures(ms, s, e);
+            lua_call(L, n, 1);
+            break;
+        }
+        case LUA_TTABLE: {
+            push_onecapture(ms, 0, s, e);
+            lua_gettable(L, 3);
+            break;
+        }
+        default: {  /* LUA_TNUMBER or LUA_TSTRING */
+            add_s(ms, b, s, e);
+            return;
+        }
     }
-    case LUA_TTABLE: {
-      push_onecapture(ms, 0, s, e);
-      lua_gettable(L, 3);
-      break;
-    }
-    default: {  /* LUA_TNUMBER or LUA_TSTRING */
-      add_s(ms, b, s, e);
-      return;
-    }
-  }
-  if (!lua_toboolean(L, -1)) {  /* nil or false? */
-    lua_pop(L, 1);
-    lua_pushlstring(L, s, e - s);  /* keep original text */
-  }
-  else if (!lua_isstring(L, -1))
-    luaL_error(L, "invalid replacement value (a %s)", luaL_typename(L, -1));
-  luaL_addvalue(b);  /* add result to accumulator */
+    if (!lua_toboolean(L, -1)) {  /* nil or false? */
+        lua_pop(L, 1);
+        lua_pushlstring(L, s, e - s);  /* keep original text */
+    } else if (!lua_isstring(L, -1))
+        luaL_error(L, "invalid replacement value (a %s)", luaL_typename(L, -1));
+    luaL_addvalue(b);  /* add result to accumulator */
 }
 
 
-static int str_gsub (lua_State *L) {
-  size_t srcl, lp;
-  const char *src = luaL_checklstring(L, 1, &srcl);
-  const char *p = luaL_checklstring(L, 2, &lp);
-  int tr = lua_type(L, 3);
-  size_t max_s = luaL_optinteger(L, 4, srcl+1);
-  int anchor = (*p == '^');
-  size_t n = 0;
-  MatchState ms;
-  luaL_Buffer b;
-  luaL_argcheck(L, tr == LUA_TNUMBER || tr == LUA_TSTRING ||
-                   tr == LUA_TFUNCTION || tr == LUA_TTABLE, 3,
-                      "string/function/table expected");
-  luaL_buffinit(L, &b);
-  if (anchor) {
-    p++; lp--;  /* skip anchor character */
-  }
-  ms.L = L;
-  ms.matchdepth = MAXCCALLS;
-  ms.src_init = src;
-  ms.src_end = src+srcl;
-  ms.p_end = p + lp;
-  while (n < max_s) {
-    const char *e;
-    ms.level = 0;
-    lua_assert(ms.matchdepth == MAXCCALLS);
-    e = match(&ms, src, p);
-    if (e) {
-      n++;
-      add_value(&ms, &b, src, e, tr);
+static int str_gsub(lua_State *L)
+{
+    size_t srcl, lp;
+    const char *src = luaL_checklstring(L, 1, &srcl);
+    const char *p = luaL_checklstring(L, 2, &lp);
+    int tr = lua_type(L, 3);
+    size_t max_s = luaL_optinteger(L, 4, srcl + 1);
+    int anchor = (*p == '^');
+    size_t n = 0;
+    MatchState ms;
+    luaL_Buffer b;
+    luaL_argcheck(L, tr == LUA_TNUMBER || tr == LUA_TSTRING ||
+                  tr == LUA_TFUNCTION || tr == LUA_TTABLE, 3,
+                  "string/function/table expected");
+    luaL_buffinit(L, &b);
+    if (anchor) {
+        p++;
+        lp--;  /* skip anchor character */
     }
-    if (e && e>src) /* non empty match? */
-      src = e;  /* skip it */
-    else if (src < ms.src_end)
-      luaL_addchar(&b, *src++);
-    else break;
-    if (anchor) break;
-  }
-  luaL_addlstring(&b, src, ms.src_end-src);
-  luaL_pushresult(&b);
-  lua_pushinteger(L, n);  /* number of substitutions */
-  return 2;
+    ms.L = L;
+    ms.matchdepth = MAXCCALLS;
+    ms.src_init = src;
+    ms.src_end = src + srcl;
+    ms.p_end = p + lp;
+    while (n < max_s) {
+        const char *e;
+        ms.level = 0;
+        lua_assert(ms.matchdepth == MAXCCALLS);
+        e = match(&ms, src, p);
+        if (e) {
+            n++;
+            add_value(&ms, &b, src, e, tr);
+        }
+        if (e && e > src) /* non empty match? */
+            src = e;  /* skip it */
+        else if (src < ms.src_end)
+            luaL_addchar(&b, *src++);
+        else break;
+        if (anchor) break;
+    }
+    luaL_addlstring(&b, src, ms.src_end - src);
+    luaL_pushresult(&b);
+    lua_pushinteger(L, n);  /* number of substitutions */
+    return 2;
 }
 
 /* }====================================================== */
@@ -830,190 +904,201 @@ static int str_gsub (lua_State *L) {
 #define MAX_FORMAT (sizeof(FLAGS) + sizeof(LUA_INTFRMLEN) + 10)
 
 
-static void addquoted (lua_State *L, luaL_Buffer *b, int arg) {
-  size_t l;
-  const char *s = luaL_checklstring(L, arg, &l);
-  luaL_addchar(b, '"');
-  while (l--) {
-    if (*s == '"' || *s == '\\' || *s == '\n') {
-      luaL_addchar(b, '\\');
-      luaL_addchar(b, *s);
+static void addquoted(lua_State *L, luaL_Buffer *b, int arg)
+{
+    size_t l;
+    const char *s = luaL_checklstring(L, arg, &l);
+    luaL_addchar(b, '"');
+    while (l--) {
+        if (*s == '"' || *s == '\\' || *s == '\n') {
+            luaL_addchar(b, '\\');
+            luaL_addchar(b, *s);
+        } else if (*s == '\0' || iscntrl(uchar(*s))) {
+            char buff[10];
+            if (!isdigit(uchar(*(s + 1))))
+                sprintf(buff, "\\%d", (int)uchar(*s));
+            else
+                sprintf(buff, "\\%03d", (int)uchar(*s));
+            luaL_addstring(b, buff);
+        } else
+            luaL_addchar(b, *s);
+        s++;
     }
-    else if (*s == '\0' || iscntrl(uchar(*s))) {
-      char buff[10];
-      if (!isdigit(uchar(*(s+1))))
-        sprintf(buff, "\\%d", (int)uchar(*s));
-      else
-        sprintf(buff, "\\%03d", (int)uchar(*s));
-      luaL_addstring(b, buff);
-    }
-    else
-      luaL_addchar(b, *s);
-    s++;
-  }
-  luaL_addchar(b, '"');
+    luaL_addchar(b, '"');
 }
 
-static const char *scanformat (lua_State *L, const char *strfrmt, char *form) {
-  const char *p = strfrmt;
-  while (*p != '\0' && strchr(FLAGS, *p) != NULL) p++;  /* skip flags */
-  if ((size_t)(p - strfrmt) >= sizeof(FLAGS)/sizeof(char))
-    luaL_error(L, "invalid format (repeated flags)");
-  if (isdigit(uchar(*p))) p++;  /* skip width */
-  if (isdigit(uchar(*p))) p++;  /* (2 digits at most) */
-  if (*p == '.') {
-    p++;
-    if (isdigit(uchar(*p))) p++;  /* skip precision */
+static const char *scanformat(lua_State *L, const char *strfrmt, char *form)
+{
+    const char *p = strfrmt;
+    while (*p != '\0' && strchr(FLAGS, *p) != NULL) p++;  /* skip flags */
+    if ((size_t)(p - strfrmt) >= sizeof(FLAGS) / sizeof(char))
+        luaL_error(L, "invalid format (repeated flags)");
+    if (isdigit(uchar(*p))) p++;  /* skip width */
     if (isdigit(uchar(*p))) p++;  /* (2 digits at most) */
-  }
-  if (isdigit(uchar(*p)))
-    luaL_error(L, "invalid format (width or precision too long)");
-  *(form++) = '%';
-  memcpy(form, strfrmt, (p - strfrmt + 1) * sizeof(char));
-  form += p - strfrmt + 1;
-  *form = '\0';
-  return p;
+    if (*p == '.') {
+        p++;
+        if (isdigit(uchar(*p))) p++;  /* skip precision */
+        if (isdigit(uchar(*p))) p++;  /* (2 digits at most) */
+    }
+    if (isdigit(uchar(*p)))
+        luaL_error(L, "invalid format (width or precision too long)");
+    *(form++) = '%';
+    memcpy(form, strfrmt, (p - strfrmt + 1) * sizeof(char));
+    form += p - strfrmt + 1;
+    *form = '\0';
+    return p;
 }
 
 
 /*
 ** add length modifier into formats
 */
-static void addlenmod (char *form, const char *lenmod) {
-  size_t l = strlen(form);
-  size_t lm = strlen(lenmod);
-  char spec = form[l - 1];
-  strcpy(form + l - 1, lenmod);
-  form[l + lm - 1] = spec;
-  form[l + lm] = '\0';
+static void addlenmod(char *form, const char *lenmod)
+{
+    size_t l = strlen(form);
+    size_t lm = strlen(lenmod);
+    char spec = form[l - 1];
+    strcpy(form + l - 1, lenmod);
+    form[l + lm - 1] = spec;
+    form[l + lm] = '\0';
 }
 
 
-static int str_format (lua_State *L) {
-  int top = lua_gettop(L);
-  int arg = 1;
-  size_t sfl;
-  const char *strfrmt = luaL_checklstring(L, arg, &sfl);
-  const char *strfrmt_end = strfrmt+sfl;
-  luaL_Buffer b;
-  luaL_buffinit(L, &b);
-  while (strfrmt < strfrmt_end) {
-    if (*strfrmt != L_ESC)
-      luaL_addchar(&b, *strfrmt++);
-    else if (*++strfrmt == L_ESC)
-      luaL_addchar(&b, *strfrmt++);  /* %% */
-    else { /* format item */
-      char form[MAX_FORMAT];  /* to store the format (`%...') */
-      char *buff = luaL_prepbuffsize(&b, MAX_ITEM);  /* to put formatted item */
-      int nb = 0;  /* number of bytes in added item */
-      if (++arg > top)
-        luaL_argerror(L, arg, "no value");
-      strfrmt = scanformat(L, strfrmt, form);
-      switch (*strfrmt++) {
-        case 'c': {
-          nb = sprintf(buff, form, luaL_checkint(L, arg));
-          break;
-        }
-        case 'd': case 'i': {
-          lua_Number n = luaL_checknumber(L, arg);
-          LUA_INTFRM_T ni = (LUA_INTFRM_T)n;
-          lua_Number diff = n - (lua_Number)ni;
-          luaL_argcheck(L, -1 < diff && diff < 1, arg,
-                        "not a number in proper range");
-          addlenmod(form, LUA_INTFRMLEN);
-          nb = sprintf(buff, form, ni);
-          break;
-        }
-        case 'o': case 'u': case 'x': case 'X': {
-          lua_Number n = luaL_checknumber(L, arg);
-          unsigned LUA_INTFRM_T ni = (unsigned LUA_INTFRM_T)n;
-          lua_Number diff = n - (lua_Number)ni;
-          luaL_argcheck(L, -1 < diff && diff < 1, arg,
-                        "not a non-negative number in proper range");
-          addlenmod(form, LUA_INTFRMLEN);
-          nb = sprintf(buff, form, ni);
-          break;
-        }
-        case 'e': case 'E': case 'f':
+static int str_format(lua_State *L)
+{
+    int top = lua_gettop(L);
+    int arg = 1;
+    size_t sfl;
+    const char *strfrmt = luaL_checklstring(L, arg, &sfl);
+    const char *strfrmt_end = strfrmt + sfl;
+    luaL_Buffer b;
+    luaL_buffinit(L, &b);
+    while (strfrmt < strfrmt_end) {
+        if (*strfrmt != L_ESC)
+            luaL_addchar(&b, *strfrmt++);
+        else if (*++strfrmt == L_ESC)
+            luaL_addchar(&b, *strfrmt++);  /* %% */
+        else { /* format item */
+            char form[MAX_FORMAT];  /* to store the format (`%...') */
+            char *buff = luaL_prepbuffsize(&b, MAX_ITEM);  /* to put formatted item */
+            int nb = 0;  /* number of bytes in added item */
+            if (++arg > top)
+                luaL_argerror(L, arg, "no value");
+            strfrmt = scanformat(L, strfrmt, form);
+            switch (*strfrmt++) {
+                case 'c': {
+                    nb = sprintf(buff, form, luaL_checkint(L, arg));
+                    break;
+                }
+                case 'd':
+                case 'i': {
+                    lua_Number n = luaL_checknumber(L, arg);
+                    LUA_INTFRM_T ni = (LUA_INTFRM_T)n;
+                    lua_Number diff = n - (lua_Number)ni;
+                    luaL_argcheck(L, -1 < diff && diff < 1, arg,
+                                  "not a number in proper range");
+                    addlenmod(form, LUA_INTFRMLEN);
+                    nb = sprintf(buff, form, ni);
+                    break;
+                }
+                case 'o':
+                case 'u':
+                case 'x':
+                case 'X': {
+                    lua_Number n = luaL_checknumber(L, arg);
+                    unsigned LUA_INTFRM_T ni = (unsigned LUA_INTFRM_T)n;
+                    lua_Number diff = n - (lua_Number)ni;
+                    luaL_argcheck(L, -1 < diff && diff < 1, arg,
+                                  "not a non-negative number in proper range");
+                    addlenmod(form, LUA_INTFRMLEN);
+                    nb = sprintf(buff, form, ni);
+                    break;
+                }
+                case 'e':
+                case 'E':
+                case 'f':
 #if defined(LUA_USE_AFORMAT)
-        case 'a': case 'A':
+                case 'a':
+                case 'A':
 #endif
-        case 'g': case 'G': {
-          addlenmod(form, LUA_FLTFRMLEN);
-          nb = sprintf(buff, form, (LUA_FLTFRM_T)luaL_checknumber(L, arg));
-          break;
+                case 'g':
+                case 'G': {
+                    addlenmod(form, LUA_FLTFRMLEN);
+                    nb = sprintf(buff, form, (LUA_FLTFRM_T)luaL_checknumber(L, arg));
+                    break;
+                }
+                case 'q': {
+                    addquoted(L, &b, arg);
+                    break;
+                }
+                case 's': {
+                    size_t l;
+                    const char *s = luaL_tolstring(L, arg, &l);
+                    if (!strchr(form, '.') && l >= 100) {
+                        /* no precision and string is too long to be formatted;
+                           keep original string */
+                        luaL_addvalue(&b);
+                        break;
+                    } else {
+                        nb = sprintf(buff, form, s);
+                        lua_pop(L, 1);  /* remove result from 'luaL_tolstring' */
+                        break;
+                    }
+                }
+                default: {  /* also treat cases `pnLlh' */
+                    return luaL_error(L, "invalid option " LUA_QL("%%%c") " to "
+                                      LUA_QL("format"), *(strfrmt - 1));
+                }
+            }
+            luaL_addsize(&b, nb);
         }
-        case 'q': {
-          addquoted(L, &b, arg);
-          break;
-        }
-        case 's': {
-          size_t l;
-          const char *s = luaL_tolstring(L, arg, &l);
-          if (!strchr(form, '.') && l >= 100) {
-            /* no precision and string is too long to be formatted;
-               keep original string */
-            luaL_addvalue(&b);
-            break;
-          }
-          else {
-            nb = sprintf(buff, form, s);
-            lua_pop(L, 1);  /* remove result from 'luaL_tolstring' */
-            break;
-          }
-        }
-        default: {  /* also treat cases `pnLlh' */
-          return luaL_error(L, "invalid option " LUA_QL("%%%c") " to "
-                               LUA_QL("format"), *(strfrmt - 1));
-        }
-      }
-      luaL_addsize(&b, nb);
     }
-  }
-  luaL_pushresult(&b);
-  return 1;
+    luaL_pushresult(&b);
+    return 1;
 }
 
 /* }====================================================== */
 
 
 static const luaL_Reg strlib[] = {
-  {"byte", str_byte},
-  {"char", str_char},
-  {"dump", str_dump},
-  {"find", str_find},
-  {"format", str_format},
-  {"gmatch", gmatch},
-  {"gsub", str_gsub},
-  {"len", str_len},
-  {"lower", str_lower},
-  {"match", str_match},
-  {"rep", str_rep},
-  {"reverse", str_reverse},
-  {"sub", str_sub},
-  {"upper", str_upper},
-  {NULL, NULL}
+    {"byte", str_byte},
+    {"char", str_char},
+    {"dump", str_dump},
+    {"find", str_find},
+    {"format", str_format},
+    {"gmatch", gmatch},
+    {"gsub", str_gsub},
+    {"len", str_len},
+    {"lower", str_lower},
+    {"match", str_match},
+    {"rep", str_rep},
+    {"reverse", str_reverse},
+    {"sub", str_sub},
+    {"upper", str_upper},
+    {NULL, NULL}
 };
 
 
-static void createmetatable (lua_State *L) {
-  lua_createtable(L, 0, 1);  /* table to be metatable for strings */
-  lua_pushliteral(L, "");  /* dummy string */
-  lua_pushvalue(L, -2);  /* copy table */
-  lua_setmetatable(L, -2);  /* set table as metatable for strings */
-  lua_pop(L, 1);  /* pop dummy string */
-  lua_pushvalue(L, -2);  /* get string library */
-  lua_setfield(L, -2, "__index");  /* metatable.__index = string */
-  lua_pop(L, 1);  /* pop metatable */
+static void createmetatable(lua_State *L)
+{
+    lua_createtable(L, 0, 1);  /* table to be metatable for strings */
+    lua_pushliteral(L, "");  /* dummy string */
+    lua_pushvalue(L, -2);  /* copy table */
+    lua_setmetatable(L, -2);  /* set table as metatable for strings */
+    lua_pop(L, 1);  /* pop dummy string */
+    lua_pushvalue(L, -2);  /* get string library */
+    lua_setfield(L, -2, "__index");  /* metatable.__index = string */
+    lua_pop(L, 1);  /* pop metatable */
 }
 
 
 /*
 ** Open string library
 */
-LUAMOD_API int luaopen_string (lua_State *L) {
-  luaL_newlib(L, strlib);
-  createmetatable(L);
-  return 1;
+LUAMOD_API int luaopen_string(lua_State *L)
+{
+    luaL_newlib(L, strlib);
+    createmetatable(L);
+    return 1;
 }
 
diff --git a/liblua/ltable.c b/liblua/ltable.c
index 713ff34c7..0b3290a6f 100644
--- a/liblua/ltable.c
+++ b/liblua/ltable.c
@@ -69,23 +69,24 @@
 #define isdummy(n) ((n) == dummynode)
 
 static const Node dummynode_ = {
-  {NILCONSTANT},  /* value */
-  {{NILCONSTANT, NULL}}  /* key */
+    {NILCONSTANT},  /* value */
+    {{NILCONSTANT, NULL}}  /* key */
 };
 
 
 /*
 ** hash for lua_Numbers
 */
-static Node *hashnum (const Table *t, lua_Number n) {
-  int i;
-  luai_hashnum(i, n);
-  if (i < 0) {
-    if (cast(unsigned int, i) == 0u - i)  /* use unsigned to avoid overflows */
-      i = 0;  /* handle INT_MIN */
-    i = -i;  /* must be a positive value */
-  }
-  return hashmod(t, i);
+static Node *hashnum(const Table *t, lua_Number n)
+{
+    int i;
+    luai_hashnum(i, n);
+    if (i < 0) {
+        if (cast(unsigned int, i) == 0u - i)  /* use unsigned to avoid overflows */
+            i = 0;  /* handle INT_MIN */
+        i = -i;  /* must be a positive value */
+    }
+    return hashmod(t, i);
 }
 
 
@@ -94,29 +95,30 @@ static Node *hashnum (const Table *t, lua_Number n) {
 ** returns the `main' position of an element in a table (that is, the index
 ** of its hash value)
 */
-static Node *mainposition (const Table *t, const TValue *key) {
-  switch (ttype(key)) {
-    case LUA_TNUMBER:
-      return hashnum(t, nvalue(key));
-    case LUA_TLNGSTR: {
-      TString *s = rawtsvalue(key);
-      if (s->tsv.extra == 0) {  /* no hash? */
-        s->tsv.hash = luaS_hash(getstr(s), s->tsv.len, s->tsv.hash);
-        s->tsv.extra = 1;  /* now it has its hash */
-      }
-      return hashstr(t, rawtsvalue(key));
+static Node *mainposition(const Table *t, const TValue *key)
+{
+    switch (ttype(key)) {
+        case LUA_TNUMBER:
+            return hashnum(t, nvalue(key));
+        case LUA_TLNGSTR: {
+            TString *s = rawtsvalue(key);
+            if (s->tsv.extra == 0) {  /* no hash? */
+                s->tsv.hash = luaS_hash(getstr(s), s->tsv.len, s->tsv.hash);
+                s->tsv.extra = 1;  /* now it has its hash */
+            }
+            return hashstr(t, rawtsvalue(key));
+        }
+        case LUA_TSHRSTR:
+            return hashstr(t, rawtsvalue(key));
+        case LUA_TBOOLEAN:
+            return hashboolean(t, bvalue(key));
+        case LUA_TLIGHTUSERDATA:
+            return hashpointer(t, pvalue(key));
+        case LUA_TLCF:
+            return hashpointer(t, fvalue(key));
+        default:
+            return hashpointer(t, gcvalue(key));
     }
-    case LUA_TSHRSTR:
-      return hashstr(t, rawtsvalue(key));
-    case LUA_TBOOLEAN:
-      return hashboolean(t, bvalue(key));
-    case LUA_TLIGHTUSERDATA:
-      return hashpointer(t, pvalue(key));
-    case LUA_TLCF:
-      return hashpointer(t, fvalue(key));
-    default:
-      return hashpointer(t, gcvalue(key));
-  }
 }
 
 
@@ -124,15 +126,16 @@ static Node *mainposition (const Table *t, const TValue *key) {
 ** returns the index for `key' if `key' is an appropriate key to live in
 ** the array part of the table, -1 otherwise.
 */
-static int arrayindex (const TValue *key) {
-  if (ttisnumber(key)) {
-    lua_Number n = nvalue(key);
-    int k;
-    lua_number2int(k, n);
-    if (luai_numeq(cast_num(k), n))
-      return k;
-  }
-  return -1;  /* `key' did not match some condition */
+static int arrayindex(const TValue *key)
+{
+    if (ttisnumber(key)) {
+        lua_Number n = nvalue(key);
+        int k;
+        lua_number2int(k, n);
+        if (luai_numeq(cast_num(k), n))
+            return k;
+    }
+    return -1;  /* `key' did not match some condition */
 }
 
 
@@ -141,48 +144,49 @@ static int arrayindex (const TValue *key) {
 ** elements in the array part, then elements in the hash part. The
 ** beginning of a traversal is signaled by -1.
 */
-static int findindex (lua_State *L, Table *t, StkId key) {
-  int i;
-  if (ttisnil(key)) return -1;  /* first iteration */
-  i = arrayindex(key);
-  if (0 < i && i <= t->sizearray)  /* is `key' inside array part? */
-    return i-1;  /* yes; that's the index (corrected to C) */
-  else {
-    Node *n = mainposition(t, key);
-    for (;;) {  /* check whether `key' is somewhere in the chain */
-      /* key may be dead already, but it is ok to use it in `next' */
-      if (luaV_rawequalobj(gkey(n), key) ||
-            (ttisdeadkey(gkey(n)) && iscollectable(key) &&
-             deadvalue(gkey(n)) == gcvalue(key))) {
-        i = cast_int(n - gnode(t, 0));  /* key index in hash table */
-        /* hash elements are numbered after array ones */
-        return i + t->sizearray;
-      }
-      else n = gnext(n);
-      if (n == NULL)
-        luaG_runerror(L, "invalid key to " LUA_QL("next"));  /* key not found */
+static int findindex(lua_State *L, Table *t, StkId key)
+{
+    int i;
+    if (ttisnil(key)) return -1;  /* first iteration */
+    i = arrayindex(key);
+    if (0 < i && i <= t->sizearray)  /* is `key' inside array part? */
+        return i - 1; /* yes; that's the index (corrected to C) */
+    else {
+        Node *n = mainposition(t, key);
+        for (;;) {  /* check whether `key' is somewhere in the chain */
+            /* key may be dead already, but it is ok to use it in `next' */
+            if (luaV_rawequalobj(gkey(n), key) ||
+                (ttisdeadkey(gkey(n)) && iscollectable(key) &&
+                 deadvalue(gkey(n)) == gcvalue(key))) {
+                i = cast_int(n - gnode(t, 0));  /* key index in hash table */
+                /* hash elements are numbered after array ones */
+                return i + t->sizearray;
+            } else n = gnext(n);
+            if (n == NULL)
+                luaG_runerror(L, "invalid key to " LUA_QL("next"));  /* key not found */
+        }
     }
-  }
 }
 
 
-int luaH_next (lua_State *L, Table *t, StkId key) {
-  int i = findindex(L, t, key);  /* find original element */
-  for (i++; i < t->sizearray; i++) {  /* try first array part */
-    if (!ttisnil(&t->array[i])) {  /* a non-nil value? */
-      setnvalue(key, cast_num(i+1));
-      setobj2s(L, key+1, &t->array[i]);
-      return 1;
+int luaH_next(lua_State *L, Table *t, StkId key)
+{
+    int i = findindex(L, t, key);  /* find original element */
+    for (i++; i < t->sizearray; i++) {  /* try first array part */
+        if (!ttisnil(&t->array[i])) {  /* a non-nil value? */
+            setnvalue(key, cast_num(i + 1));
+            setobj2s(L, key + 1, &t->array[i]);
+            return 1;
+        }
     }
-  }
-  for (i -= t->sizearray; i < sizenode(t); i++) {  /* then hash part */
-    if (!ttisnil(gval(gnode(t, i)))) {  /* a non-nil value? */
-      setobj2s(L, key, gkey(gnode(t, i)));
-      setobj2s(L, key+1, gval(gnode(t, i)));
-      return 1;
+    for (i -= t->sizearray; i < sizenode(t); i++) {  /* then hash part */
+        if (!ttisnil(gval(gnode(t, i)))) {  /* a non-nil value? */
+            setobj2s(L, key, gkey(gnode(t, i)));
+            setobj2s(L, key + 1, gval(gnode(t, i)));
+            return 1;
+        }
     }
-  }
-  return 0;  /* no more elements */
+    return 0;  /* no more elements */
 }
 
 
@@ -193,169 +197,176 @@ int luaH_next (lua_State *L, Table *t, StkId key) {
 */
 
 
-static int computesizes (int nums[], int *narray) {
-  int i;
-  int twotoi;  /* 2^i */
-  int a = 0;  /* number of elements smaller than 2^i */
-  int na = 0;  /* number of elements to go to array part */
-  int n = 0;  /* optimal size for array part */
-  for (i = 0, twotoi = 1; twotoi/2 < *narray; i++, twotoi *= 2) {
-    if (nums[i] > 0) {
-      a += nums[i];
-      if (a > twotoi/2) {  /* more than half elements present? */
-        n = twotoi;  /* optimal size (till now) */
-        na = a;  /* all elements smaller than n will go to array part */
-      }
-    }
-    if (a == *narray) break;  /* all elements already counted */
-  }
-  *narray = n;
-  lua_assert(*narray/2 <= na && na <= *narray);
-  return na;
-}
-
-
-static int countint (const TValue *key, int *nums) {
-  int k = arrayindex(key);
-  if (0 < k && k <= MAXASIZE) {  /* is `key' an appropriate array index? */
-    nums[luaO_ceillog2(k)]++;  /* count as such */
-    return 1;
-  }
-  else
-    return 0;
-}
-
-
-static int numusearray (const Table *t, int *nums) {
-  int lg;
-  int ttlg;  /* 2^lg */
-  int ause = 0;  /* summation of `nums' */
-  int i = 1;  /* count to traverse all array keys */
-  for (lg=0, ttlg=1; lg<=MAXBITS; lg++, ttlg*=2) {  /* for each slice */
-    int lc = 0;  /* counter */
-    int lim = ttlg;
-    if (lim > t->sizearray) {
-      lim = t->sizearray;  /* adjust upper limit */
-      if (i > lim)
-        break;  /* no more elements to count */
-    }
-    /* count elements in range (2^(lg-1), 2^lg] */
-    for (; i <= lim; i++) {
-      if (!ttisnil(&t->array[i-1]))
-        lc++;
-    }
-    nums[lg] += lc;
-    ause += lc;
-  }
-  return ause;
-}
-
-
-static int numusehash (const Table *t, int *nums, int *pnasize) {
-  int totaluse = 0;  /* total number of elements */
-  int ause = 0;  /* summation of `nums' */
-  int i = sizenode(t);
-  while (i--) {
-    Node *n = &t->node[i];
-    if (!ttisnil(gval(n))) {
-      ause += countint(gkey(n), nums);
-      totaluse++;
-    }
-  }
-  *pnasize += ause;
-  return totaluse;
-}
-
-
-static void setarrayvector (lua_State *L, Table *t, int size) {
-  int i;
-  luaM_reallocvector(L, t->array, t->sizearray, size, TValue);
-  for (i=t->sizearray; i<size; i++)
-     setnilvalue(&t->array[i]);
-  t->sizearray = size;
-}
-
-
-static void setnodevector (lua_State *L, Table *t, int size) {
-  int lsize;
-  if (size == 0) {  /* no elements to hash part? */
-    t->node = cast(Node *, dummynode);  /* use common `dummynode' */
-    lsize = 0;
-  }
-  else {
+static int computesizes(int nums[], int *narray)
+{
     int i;
-    lsize = luaO_ceillog2(size);
-    if (lsize > MAXBITS)
-      luaG_runerror(L, "table overflow");
-    size = twoto(lsize);
-    t->node = luaM_newvector(L, size, Node);
-    for (i=0; i<size; i++) {
-      Node *n = gnode(t, i);
-      gnext(n) = NULL;
-      setnilvalue(gkey(n));
-      setnilvalue(gval(n));
+    int twotoi;  /* 2^i */
+    int a = 0;  /* number of elements smaller than 2^i */
+    int na = 0;  /* number of elements to go to array part */
+    int n = 0;  /* optimal size for array part */
+    for (i = 0, twotoi = 1; twotoi / 2 < *narray; i++, twotoi *= 2) {
+        if (nums[i] > 0) {
+            a += nums[i];
+            if (a > twotoi / 2) { /* more than half elements present? */
+                n = twotoi;  /* optimal size (till now) */
+                na = a;  /* all elements smaller than n will go to array part */
+            }
+        }
+        if (a == *narray) break;  /* all elements already counted */
     }
-  }
-  t->lsizenode = cast_byte(lsize);
-  t->lastfree = gnode(t, size);  /* all positions are free */
+    *narray = n;
+    lua_assert(*narray / 2 <= na && na <= *narray);
+    return na;
 }
 
 
-void luaH_resize (lua_State *L, Table *t, int nasize, int nhsize) {
-  int i;
-  int oldasize = t->sizearray;
-  int oldhsize = t->lsizenode;
-  Node *nold = t->node;  /* save old hash ... */
-  if (nasize > oldasize)  /* array part must grow? */
-    setarrayvector(L, t, nasize);
-  /* create new hash part with appropriate size */
-  setnodevector(L, t, nhsize);
-  if (nasize < oldasize) {  /* array part must shrink? */
-    t->sizearray = nasize;
-    /* re-insert elements from vanishing slice */
-    for (i=nasize; i<oldasize; i++) {
-      if (!ttisnil(&t->array[i]))
-        luaH_setint(L, t, i + 1, &t->array[i]);
-    }
-    /* shrink array */
-    luaM_reallocvector(L, t->array, oldasize, nasize, TValue);
-  }
-  /* re-insert elements from hash part */
-  for (i = twoto(oldhsize) - 1; i >= 0; i--) {
-    Node *old = nold+i;
-    if (!ttisnil(gval(old))) {
-      /* doesn't need barrier/invalidate cache, as entry was
-         already present in the table */
-      setobjt2t(L, luaH_set(L, t, gkey(old)), gval(old));
-    }
-  }
-  if (!isdummy(nold))
-    luaM_freearray(L, nold, cast(size_t, twoto(oldhsize))); /* free old array */
+static int countint(const TValue *key, int *nums)
+{
+    int k = arrayindex(key);
+    if (0 < k && k <= MAXASIZE) {  /* is `key' an appropriate array index? */
+        nums[luaO_ceillog2(k)]++;  /* count as such */
+        return 1;
+    } else
+        return 0;
 }
 
 
-void luaH_resizearray (lua_State *L, Table *t, int nasize) {
-  int nsize = isdummy(t->node) ? 0 : sizenode(t);
-  luaH_resize(L, t, nasize, nsize);
+static int numusearray(const Table *t, int *nums)
+{
+    int lg;
+    int ttlg;  /* 2^lg */
+    int ause = 0;  /* summation of `nums' */
+    int i = 1;  /* count to traverse all array keys */
+    for (lg = 0, ttlg = 1; lg <= MAXBITS; lg++, ttlg *= 2) { /* for each slice */
+        int lc = 0;  /* counter */
+        int lim = ttlg;
+        if (lim > t->sizearray) {
+            lim = t->sizearray;  /* adjust upper limit */
+            if (i > lim)
+                break;  /* no more elements to count */
+        }
+        /* count elements in range (2^(lg-1), 2^lg] */
+        for (; i <= lim; i++) {
+            if (!ttisnil(&t->array[i - 1]))
+                lc++;
+        }
+        nums[lg] += lc;
+        ause += lc;
+    }
+    return ause;
 }
 
 
-static void rehash (lua_State *L, Table *t, const TValue *ek) {
-  int nasize, na;
-  int nums[MAXBITS+1];  /* nums[i] = number of keys with 2^(i-1) < k <= 2^i */
-  int i;
-  int totaluse;
-  for (i=0; i<=MAXBITS; i++) nums[i] = 0;  /* reset counts */
-  nasize = numusearray(t, nums);  /* count keys in array part */
-  totaluse = nasize;  /* all those keys are integer keys */
-  totaluse += numusehash(t, nums, &nasize);  /* count keys in hash part */
-  /* count extra key */
-  nasize += countint(ek, nums);
-  totaluse++;
-  /* compute new size for array part */
-  na = computesizes(nums, &nasize);
-  /* resize the table to new computed sizes */
-  luaH_resize(L, t, nasize, totaluse - na);
+static int numusehash(const Table *t, int *nums, int *pnasize)
+{
+    int totaluse = 0;  /* total number of elements */
+    int ause = 0;  /* summation of `nums' */
+    int i = sizenode(t);
+    while (i--) {
+        Node *n = &t->node[i];
+        if (!ttisnil(gval(n))) {
+            ause += countint(gkey(n), nums);
+            totaluse++;
+        }
+    }
+    *pnasize += ause;
+    return totaluse;
+}
+
+
+static void setarrayvector(lua_State *L, Table *t, int size)
+{
+    int i;
+    luaM_reallocvector(L, t->array, t->sizearray, size, TValue);
+    for (i = t->sizearray; i < size; i++)
+        setnilvalue(&t->array[i]);
+    t->sizearray = size;
+}
+
+
+static void setnodevector(lua_State *L, Table *t, int size)
+{
+    int lsize;
+    if (size == 0) {  /* no elements to hash part? */
+        t->node = cast(Node *, dummynode);  /* use common `dummynode' */
+        lsize = 0;
+    } else {
+        int i;
+        lsize = luaO_ceillog2(size);
+        if (lsize > MAXBITS)
+            luaG_runerror(L, "table overflow");
+        size = twoto(lsize);
+        t->node = luaM_newvector(L, size, Node);
+        for (i = 0; i < size; i++) {
+            Node *n = gnode(t, i);
+            gnext(n) = NULL;
+            setnilvalue(gkey(n));
+            setnilvalue(gval(n));
+        }
+    }
+    t->lsizenode = cast_byte(lsize);
+    t->lastfree = gnode(t, size);  /* all positions are free */
+}
+
+
+void luaH_resize(lua_State *L, Table *t, int nasize, int nhsize)
+{
+    int i;
+    int oldasize = t->sizearray;
+    int oldhsize = t->lsizenode;
+    Node *nold = t->node;  /* save old hash ... */
+    if (nasize > oldasize)  /* array part must grow? */
+        setarrayvector(L, t, nasize);
+    /* create new hash part with appropriate size */
+    setnodevector(L, t, nhsize);
+    if (nasize < oldasize) {  /* array part must shrink? */
+        t->sizearray = nasize;
+        /* re-insert elements from vanishing slice */
+        for (i = nasize; i < oldasize; i++) {
+            if (!ttisnil(&t->array[i]))
+                luaH_setint(L, t, i + 1, &t->array[i]);
+        }
+        /* shrink array */
+        luaM_reallocvector(L, t->array, oldasize, nasize, TValue);
+    }
+    /* re-insert elements from hash part */
+    for (i = twoto(oldhsize) - 1; i >= 0; i--) {
+        Node *old = nold + i;
+        if (!ttisnil(gval(old))) {
+            /* doesn't need barrier/invalidate cache, as entry was
+               already present in the table */
+            setobjt2t(L, luaH_set(L, t, gkey(old)), gval(old));
+        }
+    }
+    if (!isdummy(nold))
+        luaM_freearray(L, nold, cast(size_t, twoto(oldhsize))); /* free old array */
+}
+
+
+void luaH_resizearray(lua_State *L, Table *t, int nasize)
+{
+    int nsize = isdummy(t->node) ? 0 : sizenode(t);
+    luaH_resize(L, t, nasize, nsize);
+}
+
+
+static void rehash(lua_State *L, Table *t, const TValue *ek)
+{
+    int nasize, na;
+    int nums[MAXBITS + 1]; /* nums[i] = number of keys with 2^(i-1) < k <= 2^i */
+    int i;
+    int totaluse;
+    for (i = 0; i <= MAXBITS; i++) nums[i] = 0; /* reset counts */
+    nasize = numusearray(t, nums);  /* count keys in array part */
+    totaluse = nasize;  /* all those keys are integer keys */
+    totaluse += numusehash(t, nums, &nasize);  /* count keys in hash part */
+    /* count extra key */
+    nasize += countint(ek, nums);
+    totaluse++;
+    /* compute new size for array part */
+    na = computesizes(nums, &nasize);
+    /* resize the table to new computed sizes */
+    luaH_resize(L, t, nasize, totaluse - na);
 }
 
 
@@ -365,32 +376,35 @@ static void rehash (lua_State *L, Table *t, const TValue *ek) {
 */
 
 
-Table *luaH_new (lua_State *L) {
-  Table *t = &luaC_newobj(L, LUA_TTABLE, sizeof(Table), NULL, 0)->h;
-  t->metatable = NULL;
-  t->flags = cast_byte(~0);
-  t->array = NULL;
-  t->sizearray = 0;
-  setnodevector(L, t, 0);
-  return t;
+Table *luaH_new(lua_State *L)
+{
+    Table *t = &luaC_newobj(L, LUA_TTABLE, sizeof(Table), NULL, 0)->h;
+    t->metatable = NULL;
+    t->flags = cast_byte(~0);
+    t->array = NULL;
+    t->sizearray = 0;
+    setnodevector(L, t, 0);
+    return t;
 }
 
 
-void luaH_free (lua_State *L, Table *t) {
-  if (!isdummy(t->node))
-    luaM_freearray(L, t->node, cast(size_t, sizenode(t)));
-  luaM_freearray(L, t->array, t->sizearray);
-  luaM_free(L, t);
+void luaH_free(lua_State *L, Table *t)
+{
+    if (!isdummy(t->node))
+        luaM_freearray(L, t->node, cast(size_t, sizenode(t)));
+    luaM_freearray(L, t->array, t->sizearray);
+    luaM_free(L, t);
 }
 
 
-static Node *getfreepos (Table *t) {
-  while (t->lastfree > t->node) {
-    t->lastfree--;
-    if (ttisnil(gkey(t->lastfree)))
-      return t->lastfree;
-  }
-  return NULL;  /* could not find a free place */
+static Node *getfreepos(Table *t)
+{
+    while (t->lastfree > t->node) {
+        t->lastfree--;
+        if (ttisnil(gkey(t->lastfree)))
+            return t->lastfree;
+    }
+    return NULL;  /* could not find a free place */
 }
 
 
@@ -402,104 +416,109 @@ static Node *getfreepos (Table *t) {
 ** put new key in its main position; otherwise (colliding node is in its main
 ** position), new key goes to an empty position.
 */
-TValue *luaH_newkey (lua_State *L, Table *t, const TValue *key) {
-  Node *mp;
-  if (ttisnil(key)) luaG_runerror(L, "table index is nil");
-  else if (ttisnumber(key) && luai_numisnan(L, nvalue(key)))
-    luaG_runerror(L, "table index is NaN");
-  mp = mainposition(t, key);
-  if (!ttisnil(gval(mp)) || isdummy(mp)) {  /* main position is taken? */
-    Node *othern;
-    Node *n = getfreepos(t);  /* get a free place */
-    if (n == NULL) {  /* cannot find a free place? */
-      rehash(L, t, key);  /* grow table */
-      /* whatever called 'newkey' take care of TM cache and GC barrier */
-      return luaH_set(L, t, key);  /* insert key into grown table */
+TValue *luaH_newkey(lua_State *L, Table *t, const TValue *key)
+{
+    Node *mp;
+    if (ttisnil(key)) luaG_runerror(L, "table index is nil");
+    else if (ttisnumber(key) && luai_numisnan(L, nvalue(key)))
+        luaG_runerror(L, "table index is NaN");
+    mp = mainposition(t, key);
+    if (!ttisnil(gval(mp)) || isdummy(mp)) {  /* main position is taken? */
+        Node *othern;
+        Node *n = getfreepos(t);  /* get a free place */
+        if (n == NULL) {  /* cannot find a free place? */
+            rehash(L, t, key);  /* grow table */
+            /* whatever called 'newkey' take care of TM cache and GC barrier */
+            return luaH_set(L, t, key);  /* insert key into grown table */
+        }
+        lua_assert(!isdummy(n));
+        othern = mainposition(t, gkey(mp));
+        if (othern != mp) {  /* is colliding node out of its main position? */
+            /* yes; move colliding node into free position */
+            while (gnext(othern) != mp) othern = gnext(othern);  /* find previous */
+            gnext(othern) = n;  /* redo the chain with `n' in place of `mp' */
+            *n = *mp;  /* copy colliding node into free pos. (mp->next also goes) */
+            gnext(mp) = NULL;  /* now `mp' is free */
+            setnilvalue(gval(mp));
+        } else { /* colliding node is in its own main position */
+            /* new node will go into free position */
+            gnext(n) = gnext(mp);  /* chain new position */
+            gnext(mp) = n;
+            mp = n;
+        }
     }
-    lua_assert(!isdummy(n));
-    othern = mainposition(t, gkey(mp));
-    if (othern != mp) {  /* is colliding node out of its main position? */
-      /* yes; move colliding node into free position */
-      while (gnext(othern) != mp) othern = gnext(othern);  /* find previous */
-      gnext(othern) = n;  /* redo the chain with `n' in place of `mp' */
-      *n = *mp;  /* copy colliding node into free pos. (mp->next also goes) */
-      gnext(mp) = NULL;  /* now `mp' is free */
-      setnilvalue(gval(mp));
-    }
-    else {  /* colliding node is in its own main position */
-      /* new node will go into free position */
-      gnext(n) = gnext(mp);  /* chain new position */
-      gnext(mp) = n;
-      mp = n;
-    }
-  }
-  setobj2t(L, gkey(mp), key);
-  luaC_barrierback(L, obj2gco(t), key);
-  lua_assert(ttisnil(gval(mp)));
-  return gval(mp);
+    setobj2t(L, gkey(mp), key);
+    luaC_barrierback(L, obj2gco(t), key);
+    lua_assert(ttisnil(gval(mp)));
+    return gval(mp);
 }
 
 
 /*
 ** search function for integers
 */
-const TValue *luaH_getint (Table *t, int key) {
-  /* (1 <= key && key <= t->sizearray) */
-  if (cast(unsigned int, key-1) < cast(unsigned int, t->sizearray))
-    return &t->array[key-1];
-  else {
-    lua_Number nk = cast_num(key);
-    Node *n = hashnum(t, nk);
-    do {  /* check whether `key' is somewhere in the chain */
-      if (ttisnumber(gkey(n)) && luai_numeq(nvalue(gkey(n)), nk))
-        return gval(n);  /* that's it */
-      else n = gnext(n);
-    } while (n);
-    return luaO_nilobject;
-  }
+const TValue *luaH_getint(Table *t, int key)
+{
+    /* (1 <= key && key <= t->sizearray) */
+    if (cast(unsigned int, key - 1) < cast(unsigned int, t->sizearray))
+        return &t->array[key - 1];
+    else {
+        lua_Number nk = cast_num(key);
+        Node *n = hashnum(t, nk);
+        do {  /* check whether `key' is somewhere in the chain */
+            if (ttisnumber(gkey(n)) && luai_numeq(nvalue(gkey(n)), nk))
+                return gval(n);  /* that's it */
+            else n = gnext(n);
+        } while (n);
+        return luaO_nilobject;
+    }
 }
 
 
 /*
 ** search function for short strings
 */
-const TValue *luaH_getstr (Table *t, TString *key) {
-  Node *n = hashstr(t, key);
-  lua_assert(key->tsv.tt == LUA_TSHRSTR);
-  do {  /* check whether `key' is somewhere in the chain */
-    if (ttisshrstring(gkey(n)) && eqshrstr(rawtsvalue(gkey(n)), key))
-      return gval(n);  /* that's it */
-    else n = gnext(n);
-  } while (n);
-  return luaO_nilobject;
+const TValue *luaH_getstr(Table *t, TString *key)
+{
+    Node *n = hashstr(t, key);
+    lua_assert(key->tsv.tt == LUA_TSHRSTR);
+    do {  /* check whether `key' is somewhere in the chain */
+        if (ttisshrstring(gkey(n)) && eqshrstr(rawtsvalue(gkey(n)), key))
+            return gval(n);  /* that's it */
+        else n = gnext(n);
+    } while (n);
+    return luaO_nilobject;
 }
 
 
 /*
 ** main search function
 */
-const TValue *luaH_get (Table *t, const TValue *key) {
-  switch (ttype(key)) {
-    case LUA_TSHRSTR: return luaH_getstr(t, rawtsvalue(key));
-    case LUA_TNIL: return luaO_nilobject;
-    case LUA_TNUMBER: {
-      int k;
-      lua_Number n = nvalue(key);
-      lua_number2int(k, n);
-      if (luai_numeq(cast_num(k), n)) /* index is int? */
-        return luaH_getint(t, k);  /* use specialized version */
-      /* else go through */
+const TValue *luaH_get(Table *t, const TValue *key)
+{
+    switch (ttype(key)) {
+        case LUA_TSHRSTR:
+            return luaH_getstr(t, rawtsvalue(key));
+        case LUA_TNIL:
+            return luaO_nilobject;
+        case LUA_TNUMBER: {
+            int k;
+            lua_Number n = nvalue(key);
+            lua_number2int(k, n);
+            if (luai_numeq(cast_num(k), n)) /* index is int? */
+                return luaH_getint(t, k);  /* use specialized version */
+            /* else go through */
+        }
+        default: {
+            Node *n = mainposition(t, key);
+            do {  /* check whether `key' is somewhere in the chain */
+                if (luaV_rawequalobj(gkey(n), key))
+                    return gval(n);  /* that's it */
+                else n = gnext(n);
+            } while (n);
+            return luaO_nilobject;
+        }
     }
-    default: {
-      Node *n = mainposition(t, key);
-      do {  /* check whether `key' is somewhere in the chain */
-        if (luaV_rawequalobj(gkey(n), key))
-          return gval(n);  /* that's it */
-        else n = gnext(n);
-      } while (n);
-      return luaO_nilobject;
-    }
-  }
 }
 
 
@@ -507,49 +526,52 @@ const TValue *luaH_get (Table *t, const TValue *key) {
 ** beware: when using this function you probably need to check a GC
 ** barrier and invalidate the TM cache.
 */
-TValue *luaH_set (lua_State *L, Table *t, const TValue *key) {
-  const TValue *p = luaH_get(t, key);
-  if (p != luaO_nilobject)
-    return cast(TValue *, p);
-  else return luaH_newkey(L, t, key);
+TValue *luaH_set(lua_State *L, Table *t, const TValue *key)
+{
+    const TValue *p = luaH_get(t, key);
+    if (p != luaO_nilobject)
+        return cast(TValue *, p);
+    else return luaH_newkey(L, t, key);
 }
 
 
-void luaH_setint (lua_State *L, Table *t, int key, TValue *value) {
-  const TValue *p = luaH_getint(t, key);
-  TValue *cell;
-  if (p != luaO_nilobject)
-    cell = cast(TValue *, p);
-  else {
-    TValue k;
-    setnvalue(&k, cast_num(key));
-    cell = luaH_newkey(L, t, &k);
-  }
-  setobj2t(L, cell, value);
-}
-
-
-static int unbound_search (Table *t, unsigned int j) {
-  unsigned int i = j;  /* i is zero or a present index */
-  j++;
-  /* find `i' and `j' such that i is present and j is not */
-  while (!ttisnil(luaH_getint(t, j))) {
-    i = j;
-    j *= 2;
-    if (j > cast(unsigned int, MAX_INT)) {  /* overflow? */
-      /* table was built with bad purposes: resort to linear search */
-      i = 1;
-      while (!ttisnil(luaH_getint(t, i))) i++;
-      return i - 1;
+void luaH_setint(lua_State *L, Table *t, int key, TValue *value)
+{
+    const TValue *p = luaH_getint(t, key);
+    TValue *cell;
+    if (p != luaO_nilobject)
+        cell = cast(TValue *, p);
+    else {
+        TValue k;
+        setnvalue(&k, cast_num(key));
+        cell = luaH_newkey(L, t, &k);
     }
-  }
-  /* now do a binary search between them */
-  while (j - i > 1) {
-    unsigned int m = (i+j)/2;
-    if (ttisnil(luaH_getint(t, m))) j = m;
-    else i = m;
-  }
-  return i;
+    setobj2t(L, cell, value);
+}
+
+
+static int unbound_search(Table *t, unsigned int j)
+{
+    unsigned int i = j;  /* i is zero or a present index */
+    j++;
+    /* find `i' and `j' such that i is present and j is not */
+    while (!ttisnil(luaH_getint(t, j))) {
+        i = j;
+        j *= 2;
+        if (j > cast(unsigned int, MAX_INT)) {  /* overflow? */
+            /* table was built with bad purposes: resort to linear search */
+            i = 1;
+            while (!ttisnil(luaH_getint(t, i))) i++;
+            return i - 1;
+        }
+    }
+    /* now do a binary search between them */
+    while (j - i > 1) {
+        unsigned int m = (i + j) / 2;
+        if (ttisnil(luaH_getint(t, m))) j = m;
+        else i = m;
+    }
+    return i;
 }
 
 
@@ -557,32 +579,34 @@ static int unbound_search (Table *t, unsigned int j) {
 ** Try to find a boundary in table `t'. A `boundary' is an integer index
 ** such that t[i] is non-nil and t[i+1] is nil (and 0 if t[1] is nil).
 */
-int luaH_getn (Table *t) {
-  unsigned int j = t->sizearray;
-  if (j > 0 && ttisnil(&t->array[j - 1])) {
-    /* there is a boundary in the array part: (binary) search for it */
-    unsigned int i = 0;
-    while (j - i > 1) {
-      unsigned int m = (i+j)/2;
-      if (ttisnil(&t->array[m - 1])) j = m;
-      else i = m;
+int luaH_getn(Table *t)
+{
+    unsigned int j = t->sizearray;
+    if (j > 0 && ttisnil(&t->array[j - 1])) {
+        /* there is a boundary in the array part: (binary) search for it */
+        unsigned int i = 0;
+        while (j - i > 1) {
+            unsigned int m = (i + j) / 2;
+            if (ttisnil(&t->array[m - 1])) j = m;
+            else i = m;
+        }
+        return i;
     }
-    return i;
-  }
-  /* else must find a boundary in hash part */
-  else if (isdummy(t->node))  /* hash part is empty? */
-    return j;  /* that is easy... */
-  else return unbound_search(t, j);
+    /* else must find a boundary in hash part */
+    else if (isdummy(t->node))  /* hash part is empty? */
+        return j;  /* that is easy... */
+    else return unbound_search(t, j);
 }
 
 
 
 #if defined(LUA_DEBUG)
 
-Node *luaH_mainposition (const Table *t, const TValue *key) {
-  return mainposition(t, key);
+Node *luaH_mainposition(const Table *t, const TValue *key)
+{
+    return mainposition(t, key);
 }
 
-int luaH_isdummy (Node *n) { return isdummy(n); }
+int luaH_isdummy(Node *n) { return isdummy(n); }
 
 #endif
diff --git a/liblua/ltable.h b/liblua/ltable.h
index b7d4f7db9..7c3663abf 100644
--- a/liblua/ltable.h
+++ b/liblua/ltable.h
@@ -18,23 +18,23 @@
 #define invalidateTMcache(t) ((t)->flags = 0)
 
 
-LUAI_FUNC const TValue *luaH_getint (Table *t, int key);
-LUAI_FUNC void luaH_setint (lua_State *L, Table *t, int key, TValue *value);
-LUAI_FUNC const TValue *luaH_getstr (Table *t, TString *key);
-LUAI_FUNC const TValue *luaH_get (Table *t, const TValue *key);
-LUAI_FUNC TValue *luaH_newkey (lua_State *L, Table *t, const TValue *key);
-LUAI_FUNC TValue *luaH_set (lua_State *L, Table *t, const TValue *key);
-LUAI_FUNC Table *luaH_new (lua_State *L);
-LUAI_FUNC void luaH_resize (lua_State *L, Table *t, int nasize, int nhsize);
-LUAI_FUNC void luaH_resizearray (lua_State *L, Table *t, int nasize);
-LUAI_FUNC void luaH_free (lua_State *L, Table *t);
-LUAI_FUNC int luaH_next (lua_State *L, Table *t, StkId key);
-LUAI_FUNC int luaH_getn (Table *t);
+LUAI_FUNC const TValue *luaH_getint(Table *t, int key);
+LUAI_FUNC void luaH_setint(lua_State *L, Table *t, int key, TValue *value);
+LUAI_FUNC const TValue *luaH_getstr(Table *t, TString *key);
+LUAI_FUNC const TValue *luaH_get(Table *t, const TValue *key);
+LUAI_FUNC TValue *luaH_newkey(lua_State *L, Table *t, const TValue *key);
+LUAI_FUNC TValue *luaH_set(lua_State *L, Table *t, const TValue *key);
+LUAI_FUNC Table *luaH_new(lua_State *L);
+LUAI_FUNC void luaH_resize(lua_State *L, Table *t, int nasize, int nhsize);
+LUAI_FUNC void luaH_resizearray(lua_State *L, Table *t, int nasize);
+LUAI_FUNC void luaH_free(lua_State *L, Table *t);
+LUAI_FUNC int luaH_next(lua_State *L, Table *t, StkId key);
+LUAI_FUNC int luaH_getn(Table *t);
 
 
 #if defined(LUA_DEBUG)
-LUAI_FUNC Node *luaH_mainposition (const Table *t, const TValue *key);
-LUAI_FUNC int luaH_isdummy (Node *n);
+LUAI_FUNC Node *luaH_mainposition(const Table *t, const TValue *key);
+LUAI_FUNC int luaH_isdummy(Node *n);
 #endif
 
 
diff --git a/liblua/ltablib.c b/liblua/ltablib.c
index ba8de3f29..1ea05dbc5 100644
--- a/liblua/ltablib.c
+++ b/liblua/ltablib.c
@@ -21,92 +21,97 @@
 
 
 #if defined(LUA_COMPAT_MAXN)
-static int maxn (lua_State *L) {
-  lua_Number max = 0;
-  luaL_checktype(L, 1, LUA_TTABLE);
-  lua_pushnil(L);  /* first key */
-  while (lua_next(L, 1)) {
-    lua_pop(L, 1);  /* remove value */
-    if (lua_type(L, -1) == LUA_TNUMBER) {
-      lua_Number v = lua_tonumber(L, -1);
-      if (v > max) max = v;
+static int maxn(lua_State *L)
+{
+    lua_Number max = 0;
+    luaL_checktype(L, 1, LUA_TTABLE);
+    lua_pushnil(L);  /* first key */
+    while (lua_next(L, 1)) {
+        lua_pop(L, 1);  /* remove value */
+        if (lua_type(L, -1) == LUA_TNUMBER) {
+            lua_Number v = lua_tonumber(L, -1);
+            if (v > max) max = v;
+        }
     }
-  }
-  lua_pushnumber(L, max);
-  return 1;
+    lua_pushnumber(L, max);
+    return 1;
 }
 #endif
 
 
-static int tinsert (lua_State *L) {
-  int e = aux_getn(L, 1) + 1;  /* first empty element */
-  int pos;  /* where to insert new element */
-  switch (lua_gettop(L)) {
-    case 2: {  /* called with only 2 arguments */
-      pos = e;  /* insert new element at the end */
-      break;
+static int tinsert(lua_State *L)
+{
+    int e = aux_getn(L, 1) + 1;  /* first empty element */
+    int pos;  /* where to insert new element */
+    switch (lua_gettop(L)) {
+        case 2: {  /* called with only 2 arguments */
+            pos = e;  /* insert new element at the end */
+            break;
+        }
+        case 3: {
+            int i;
+            pos = luaL_checkint(L, 2);  /* 2nd argument is the position */
+            luaL_argcheck(L, 1 <= pos && pos <= e, 2, "position out of bounds");
+            for (i = e; i > pos; i--) {  /* move up elements */
+                lua_rawgeti(L, 1, i - 1);
+                lua_rawseti(L, 1, i);  /* t[i] = t[i-1] */
+            }
+            break;
+        }
+        default: {
+            return luaL_error(L, "wrong number of arguments to " LUA_QL("insert"));
+        }
     }
-    case 3: {
-      int i;
-      pos = luaL_checkint(L, 2);  /* 2nd argument is the position */
-      luaL_argcheck(L, 1 <= pos && pos <= e, 2, "position out of bounds");
-      for (i = e; i > pos; i--) {  /* move up elements */
-        lua_rawgeti(L, 1, i-1);
-        lua_rawseti(L, 1, i);  /* t[i] = t[i-1] */
-      }
-      break;
-    }
-    default: {
-      return luaL_error(L, "wrong number of arguments to " LUA_QL("insert"));
-    }
-  }
-  lua_rawseti(L, 1, pos);  /* t[pos] = v */
-  return 0;
+    lua_rawseti(L, 1, pos);  /* t[pos] = v */
+    return 0;
 }
 
 
-static int tremove (lua_State *L) {
-  int size = aux_getn(L, 1);
-  int pos = luaL_optint(L, 2, size);
-  if (pos != size)  /* validate 'pos' if given */
-    luaL_argcheck(L, 1 <= pos && pos <= size + 1, 1, "position out of bounds");
-  lua_rawgeti(L, 1, pos);  /* result = t[pos] */
-  for ( ; pos < size; pos++) {
-    lua_rawgeti(L, 1, pos+1);
-    lua_rawseti(L, 1, pos);  /* t[pos] = t[pos+1] */
-  }
-  lua_pushnil(L);
-  lua_rawseti(L, 1, pos);  /* t[pos] = nil */
-  return 1;
+static int tremove(lua_State *L)
+{
+    int size = aux_getn(L, 1);
+    int pos = luaL_optint(L, 2, size);
+    if (pos != size)  /* validate 'pos' if given */
+        luaL_argcheck(L, 1 <= pos && pos <= size + 1, 1, "position out of bounds");
+    lua_rawgeti(L, 1, pos);  /* result = t[pos] */
+    for (; pos < size; pos++) {
+        lua_rawgeti(L, 1, pos + 1);
+        lua_rawseti(L, 1, pos);  /* t[pos] = t[pos+1] */
+    }
+    lua_pushnil(L);
+    lua_rawseti(L, 1, pos);  /* t[pos] = nil */
+    return 1;
 }
 
 
-static void addfield (lua_State *L, luaL_Buffer *b, int i) {
-  lua_rawgeti(L, 1, i);
-  if (!lua_isstring(L, -1))
-    luaL_error(L, "invalid value (%s) at index %d in table for "
-                  LUA_QL("concat"), luaL_typename(L, -1), i);
-  luaL_addvalue(b);
+static void addfield(lua_State *L, luaL_Buffer *b, int i)
+{
+    lua_rawgeti(L, 1, i);
+    if (!lua_isstring(L, -1))
+        luaL_error(L, "invalid value (%s) at index %d in table for "
+                   LUA_QL("concat"), luaL_typename(L, -1), i);
+    luaL_addvalue(b);
 }
 
 
-static int tconcat (lua_State *L) {
-  luaL_Buffer b;
-  size_t lsep;
-  int i, last;
-  const char *sep = luaL_optlstring(L, 2, "", &lsep);
-  luaL_checktype(L, 1, LUA_TTABLE);
-  i = luaL_optint(L, 3, 1);
-  last = luaL_opt(L, luaL_checkint, 4, luaL_len(L, 1));
-  luaL_buffinit(L, &b);
-  for (; i < last; i++) {
-    addfield(L, &b, i);
-    luaL_addlstring(&b, sep, lsep);
-  }
-  if (i == last)  /* add last value (if interval was not empty) */
-    addfield(L, &b, i);
-  luaL_pushresult(&b);
-  return 1;
+static int tconcat(lua_State *L)
+{
+    luaL_Buffer b;
+    size_t lsep;
+    int i, last;
+    const char *sep = luaL_optlstring(L, 2, "", &lsep);
+    luaL_checktype(L, 1, LUA_TTABLE);
+    i = luaL_optint(L, 3, 1);
+    last = luaL_opt(L, luaL_checkint, 4, luaL_len(L, 1));
+    luaL_buffinit(L, &b);
+    for (; i < last; i++) {
+        addfield(L, &b, i);
+        luaL_addlstring(&b, sep, lsep);
+    }
+    if (i == last)  /* add last value (if interval was not empty) */
+        addfield(L, &b, i);
+    luaL_pushresult(&b);
+    return 1;
 }
 
 
@@ -116,36 +121,38 @@ static int tconcat (lua_State *L) {
 ** =======================================================
 */
 
-static int pack (lua_State *L) {
-  int n = lua_gettop(L);  /* number of elements to pack */
-  lua_createtable(L, n, 1);  /* create result table */
-  lua_pushinteger(L, n);
-  lua_setfield(L, -2, "n");  /* t.n = number of elements */
-  if (n > 0) {  /* at least one element? */
-    int i;
-    lua_pushvalue(L, 1);
-    lua_rawseti(L, -2, 1);  /* insert first element */
-    lua_replace(L, 1);  /* move table into index 1 */
-    for (i = n; i >= 2; i--)  /* assign other elements */
-      lua_rawseti(L, 1, i);
-  }
-  return 1;  /* return table */
+static int pack(lua_State *L)
+{
+    int n = lua_gettop(L);  /* number of elements to pack */
+    lua_createtable(L, n, 1);  /* create result table */
+    lua_pushinteger(L, n);
+    lua_setfield(L, -2, "n");  /* t.n = number of elements */
+    if (n > 0) {  /* at least one element? */
+        int i;
+        lua_pushvalue(L, 1);
+        lua_rawseti(L, -2, 1);  /* insert first element */
+        lua_replace(L, 1);  /* move table into index 1 */
+        for (i = n; i >= 2; i--)  /* assign other elements */
+            lua_rawseti(L, 1, i);
+    }
+    return 1;  /* return table */
 }
 
 
-static int unpack (lua_State *L) {
-  int i, e, n;
-  luaL_checktype(L, 1, LUA_TTABLE);
-  i = luaL_optint(L, 2, 1);
-  e = luaL_opt(L, luaL_checkint, 3, luaL_len(L, 1));
-  if (i > e) return 0;  /* empty range */
-  n = e - i + 1;  /* number of elements */
-  if (n <= 0 || !lua_checkstack(L, n))  /* n <= 0 means arith. overflow */
-    return luaL_error(L, "too many results to unpack");
-  lua_rawgeti(L, 1, i);  /* push arg[i] (avoiding overflow problems) */
-  while (i++ < e)  /* push arg[i + 1...e] */
-    lua_rawgeti(L, 1, i);
-  return n;
+static int unpack(lua_State *L)
+{
+    int i, e, n;
+    luaL_checktype(L, 1, LUA_TTABLE);
+    i = luaL_optint(L, 2, 1);
+    e = luaL_opt(L, luaL_checkint, 3, luaL_len(L, 1));
+    if (i > e) return 0;  /* empty range */
+    n = e - i + 1;  /* number of elements */
+    if (n <= 0 || !lua_checkstack(L, n))  /* n <= 0 means arith. overflow */
+        return luaL_error(L, "too many results to unpack");
+    lua_rawgeti(L, 1, i);  /* push arg[i] (avoiding overflow problems) */
+    while (i++ < e)  /* push arg[i + 1...e] */
+        lua_rawgeti(L, 1, i);
+    return n;
 }
 
 /* }====================================================== */
@@ -161,123 +168,131 @@ static int unpack (lua_State *L) {
 */
 
 
-static void set2 (lua_State *L, int i, int j) {
-  lua_rawseti(L, 1, i);
-  lua_rawseti(L, 1, j);
+static void set2(lua_State *L, int i, int j)
+{
+    lua_rawseti(L, 1, i);
+    lua_rawseti(L, 1, j);
 }
 
-static int sort_comp (lua_State *L, int a, int b) {
-  if (!lua_isnil(L, 2)) {  /* function? */
-    int res;
-    lua_pushvalue(L, 2);
-    lua_pushvalue(L, a-1);  /* -1 to compensate function */
-    lua_pushvalue(L, b-2);  /* -2 to compensate function and `a' */
-    lua_call(L, 2, 1);
-    res = lua_toboolean(L, -1);
-    lua_pop(L, 1);
-    return res;
-  }
-  else  /* a < b? */
-    return lua_compare(L, a, b, LUA_OPLT);
+static int sort_comp(lua_State *L, int a, int b)
+{
+    if (!lua_isnil(L, 2)) {  /* function? */
+        int res;
+        lua_pushvalue(L, 2);
+        lua_pushvalue(L, a - 1); /* -1 to compensate function */
+        lua_pushvalue(L, b - 2); /* -2 to compensate function and `a' */
+        lua_call(L, 2, 1);
+        res = lua_toboolean(L, -1);
+        lua_pop(L, 1);
+        return res;
+    } else /* a < b? */
+        return lua_compare(L, a, b, LUA_OPLT);
 }
 
-static void auxsort (lua_State *L, int l, int u) {
-  while (l < u) {  /* for tail recursion */
-    int i, j;
-    /* sort elements a[l], a[(l+u)/2] and a[u] */
-    lua_rawgeti(L, 1, l);
-    lua_rawgeti(L, 1, u);
-    if (sort_comp(L, -1, -2))  /* a[u] < a[l]? */
-      set2(L, l, u);  /* swap a[l] - a[u] */
-    else
-      lua_pop(L, 2);
-    if (u-l == 1) break;  /* only 2 elements */
-    i = (l+u)/2;
-    lua_rawgeti(L, 1, i);
-    lua_rawgeti(L, 1, l);
-    if (sort_comp(L, -2, -1))  /* a[i]<a[l]? */
-      set2(L, i, l);
-    else {
-      lua_pop(L, 1);  /* remove a[l] */
-      lua_rawgeti(L, 1, u);
-      if (sort_comp(L, -1, -2))  /* a[u]<a[i]? */
-        set2(L, i, u);
-      else
-        lua_pop(L, 2);
-    }
-    if (u-l == 2) break;  /* only 3 elements */
-    lua_rawgeti(L, 1, i);  /* Pivot */
-    lua_pushvalue(L, -1);
-    lua_rawgeti(L, 1, u-1);
-    set2(L, i, u-1);
-    /* a[l] <= P == a[u-1] <= a[u], only need to sort from l+1 to u-2 */
-    i = l; j = u-1;
-    for (;;) {  /* invariant: a[l..i] <= P <= a[j..u] */
-      /* repeat ++i until a[i] >= P */
-      while (lua_rawgeti(L, 1, ++i), sort_comp(L, -1, -2)) {
-        if (i>=u) luaL_error(L, "invalid order function for sorting");
-        lua_pop(L, 1);  /* remove a[i] */
-      }
-      /* repeat --j until a[j] <= P */
-      while (lua_rawgeti(L, 1, --j), sort_comp(L, -3, -1)) {
-        if (j<=l) luaL_error(L, "invalid order function for sorting");
-        lua_pop(L, 1);  /* remove a[j] */
-      }
-      if (j<i) {
-        lua_pop(L, 3);  /* pop pivot, a[i], a[j] */
-        break;
-      }
-      set2(L, i, j);
-    }
-    lua_rawgeti(L, 1, u-1);
-    lua_rawgeti(L, 1, i);
-    set2(L, u-1, i);  /* swap pivot (a[u-1]) with a[i] */
-    /* a[l..i-1] <= a[i] == P <= a[i+1..u] */
-    /* adjust so that smaller half is in [j..i] and larger one in [l..u] */
-    if (i-l < u-i) {
-      j=l; i=i-1; l=i+2;
-    }
-    else {
-      j=i+1; i=u; u=j-2;
-    }
-    auxsort(L, j, i);  /* call recursively the smaller one */
-  }  /* repeat the routine for the larger one */
+static void auxsort(lua_State *L, int l, int u)
+{
+    while (l < u) {  /* for tail recursion */
+        int i, j;
+        /* sort elements a[l], a[(l+u)/2] and a[u] */
+        lua_rawgeti(L, 1, l);
+        lua_rawgeti(L, 1, u);
+        if (sort_comp(L, -1, -2))  /* a[u] < a[l]? */
+            set2(L, l, u);  /* swap a[l] - a[u] */
+        else
+            lua_pop(L, 2);
+        if (u - l == 1) break; /* only 2 elements */
+        i = (l + u) / 2;
+        lua_rawgeti(L, 1, i);
+        lua_rawgeti(L, 1, l);
+        if (sort_comp(L, -2, -1))  /* a[i]<a[l]? */
+            set2(L, i, l);
+        else {
+            lua_pop(L, 1);  /* remove a[l] */
+            lua_rawgeti(L, 1, u);
+            if (sort_comp(L, -1, -2))  /* a[u]<a[i]? */
+                set2(L, i, u);
+            else
+                lua_pop(L, 2);
+        }
+        if (u - l == 2) break; /* only 3 elements */
+        lua_rawgeti(L, 1, i);  /* Pivot */
+        lua_pushvalue(L, -1);
+        lua_rawgeti(L, 1, u - 1);
+        set2(L, i, u - 1);
+        /* a[l] <= P == a[u-1] <= a[u], only need to sort from l+1 to u-2 */
+        i = l;
+        j = u - 1;
+        for (;;) {  /* invariant: a[l..i] <= P <= a[j..u] */
+            /* repeat ++i until a[i] >= P */
+            while (lua_rawgeti(L, 1, ++i), sort_comp(L, -1, -2)) {
+                if (i >= u) luaL_error(L, "invalid order function for sorting");
+                lua_pop(L, 1);  /* remove a[i] */
+            }
+            /* repeat --j until a[j] <= P */
+            while (lua_rawgeti(L, 1, --j), sort_comp(L, -3, -1)) {
+                if (j <= l) luaL_error(L, "invalid order function for sorting");
+                lua_pop(L, 1);  /* remove a[j] */
+            }
+            if (j < i) {
+                lua_pop(L, 3);  /* pop pivot, a[i], a[j] */
+                break;
+            }
+            set2(L, i, j);
+        }
+        lua_rawgeti(L, 1, u - 1);
+        lua_rawgeti(L, 1, i);
+        set2(L, u - 1, i); /* swap pivot (a[u-1]) with a[i] */
+        /* a[l..i-1] <= a[i] == P <= a[i+1..u] */
+        /* adjust so that smaller half is in [j..i] and larger one in [l..u] */
+        if (i - l < u - i) {
+            j = l;
+            i = i - 1;
+            l = i + 2;
+        } else {
+            j = i + 1;
+            i = u;
+            u = j - 2;
+        }
+        auxsort(L, j, i);  /* call recursively the smaller one */
+    }  /* repeat the routine for the larger one */
 }
 
-static int sort (lua_State *L) {
-  int n = aux_getn(L, 1);
-  luaL_checkstack(L, 40, "");  /* assume array is smaller than 2^40 */
-  if (!lua_isnoneornil(L, 2))  /* is there a 2nd argument? */
-    luaL_checktype(L, 2, LUA_TFUNCTION);
-  lua_settop(L, 2);  /* make sure there is two arguments */
-  auxsort(L, 1, n);
-  return 0;
+static int sort(lua_State *L)
+{
+    int n = aux_getn(L, 1);
+    luaL_checkstack(L, 40, "");  /* assume array is smaller than 2^40 */
+    if (!lua_isnoneornil(L, 2))  /* is there a 2nd argument? */
+        luaL_checktype(L, 2, LUA_TFUNCTION);
+    lua_settop(L, 2);  /* make sure there is two arguments */
+    auxsort(L, 1, n);
+    return 0;
 }
 
 /* }====================================================== */
 
 
 static const luaL_Reg tab_funcs[] = {
-  {"concat", tconcat},
+    {"concat", tconcat},
 #if defined(LUA_COMPAT_MAXN)
-  {"maxn", maxn},
+    {"maxn", maxn},
 #endif
-  {"insert", tinsert},
-  {"pack", pack},
-  {"unpack", unpack},
-  {"remove", tremove},
-  {"sort", sort},
-  {NULL, NULL}
+    {"insert", tinsert},
+    {"pack", pack},
+    {"unpack", unpack},
+    {"remove", tremove},
+    {"sort", sort},
+    {NULL, NULL}
 };
 
 
-LUAMOD_API int luaopen_table (lua_State *L) {
-  luaL_newlib(L, tab_funcs);
+LUAMOD_API int luaopen_table(lua_State *L)
+{
+    luaL_newlib(L, tab_funcs);
 #if defined(LUA_COMPAT_UNPACK)
-  /* _G.unpack = table.unpack */
-  lua_getfield(L, -1, "unpack");
-  lua_setglobal(L, "unpack");
+    /* _G.unpack = table.unpack */
+    lua_getfield(L, -1, "unpack");
+    lua_setglobal(L, "unpack");
 #endif
-  return 1;
+    return 1;
 }
 
diff --git a/liblua/ltm.c b/liblua/ltm.c
index e70006dd7..b451ba4e4 100644
--- a/liblua/ltm.c
+++ b/liblua/ltm.c
@@ -22,26 +22,27 @@
 static const char udatatypename[] = "userdata";
 
 LUAI_DDEF const char *const luaT_typenames_[LUA_TOTALTAGS] = {
-  "no value",
-  "nil", "boolean", udatatypename, "number",
-  "string", "table", "function", udatatypename, "thread",
-  "proto", "upval"  /* these last two cases are used for tests only */
+    "no value",
+    "nil", "boolean", udatatypename, "number",
+    "string", "table", "function", udatatypename, "thread",
+    "proto", "upval"  /* these last two cases are used for tests only */
 };
 
 
-void luaT_init (lua_State *L) {
-  static const char *const luaT_eventname[] = {  /* ORDER TM */
-    "__index", "__newindex",
-    "__gc", "__mode", "__len", "__eq",
-    "__add", "__sub", "__mul", "__div", "__mod",
-    "__pow", "__unm", "__lt", "__le",
-    "__concat", "__call"
-  };
-  int i;
-  for (i=0; i<TM_N; i++) {
-    G(L)->tmname[i] = luaS_new(L, luaT_eventname[i]);
-    luaS_fix(G(L)->tmname[i]);  /* never collect these names */
-  }
+void luaT_init(lua_State *L)
+{
+    static const char *const luaT_eventname[] = {  /* ORDER TM */
+        "__index", "__newindex",
+        "__gc", "__mode", "__len", "__eq",
+        "__add", "__sub", "__mul", "__div", "__mod",
+        "__pow", "__unm", "__lt", "__le",
+        "__concat", "__call"
+    };
+    int i;
+    for (i = 0; i < TM_N; i++) {
+        G(L)->tmname[i] = luaS_new(L, luaT_eventname[i]);
+        luaS_fix(G(L)->tmname[i]);  /* never collect these names */
+    }
 }
 
 
@@ -49,29 +50,30 @@ void luaT_init (lua_State *L) {
 ** function to be used with macro "fasttm": optimized for absence of
 ** tag methods
 */
-const TValue *luaT_gettm (Table *events, TMS event, TString *ename) {
-  const TValue *tm = luaH_getstr(events, ename);
-  lua_assert(event <= TM_EQ);
-  if (ttisnil(tm)) {  /* no tag method? */
-    events->flags |= cast_byte(1u<<event);  /* cache this fact */
-    return NULL;
-  }
-  else return tm;
+const TValue *luaT_gettm(Table *events, TMS event, TString *ename)
+{
+    const TValue *tm = luaH_getstr(events, ename);
+    lua_assert(event <= TM_EQ);
+    if (ttisnil(tm)) {  /* no tag method? */
+        events->flags |= cast_byte(1u << event); /* cache this fact */
+        return NULL;
+    } else return tm;
 }
 
 
-const TValue *luaT_gettmbyobj (lua_State *L, const TValue *o, TMS event) {
-  Table *mt;
-  switch (ttypenv(o)) {
-    case LUA_TTABLE:
-      mt = hvalue(o)->metatable;
-      break;
-    case LUA_TUSERDATA:
-      mt = uvalue(o)->metatable;
-      break;
-    default:
-      mt = G(L)->mt[ttypenv(o)];
-  }
-  return (mt ? luaH_getstr(mt, G(L)->tmname[event]) : luaO_nilobject);
+const TValue *luaT_gettmbyobj(lua_State *L, const TValue *o, TMS event)
+{
+    Table *mt;
+    switch (ttypenv(o)) {
+        case LUA_TTABLE:
+            mt = hvalue(o)->metatable;
+            break;
+        case LUA_TUSERDATA:
+            mt = uvalue(o)->metatable;
+            break;
+        default:
+            mt = G(L)->mt[ttypenv(o)];
+    }
+    return (mt ? luaH_getstr(mt, G(L)->tmname[event]) : luaO_nilobject);
 }
 
diff --git a/liblua/ltm.h b/liblua/ltm.h
index a12037628..638eb9370 100644
--- a/liblua/ltm.h
+++ b/liblua/ltm.h
@@ -16,30 +16,30 @@
 * grep "ORDER TM"
 */
 typedef enum {
-  TM_INDEX,
-  TM_NEWINDEX,
-  TM_GC,
-  TM_MODE,
-  TM_LEN,
-  TM_EQ,  /* last tag method with `fast' access */
-  TM_ADD,
-  TM_SUB,
-  TM_MUL,
-  TM_DIV,
-  TM_MOD,
-  TM_POW,
-  TM_UNM,
-  TM_LT,
-  TM_LE,
-  TM_CONCAT,
-  TM_CALL,
-  TM_N    /* number of elements in the enum */
+    TM_INDEX,
+    TM_NEWINDEX,
+    TM_GC,
+    TM_MODE,
+    TM_LEN,
+    TM_EQ,  /* last tag method with `fast' access */
+    TM_ADD,
+    TM_SUB,
+    TM_MUL,
+    TM_DIV,
+    TM_MOD,
+    TM_POW,
+    TM_UNM,
+    TM_LT,
+    TM_LE,
+    TM_CONCAT,
+    TM_CALL,
+    TM_N    /* number of elements in the enum */
 } TMS;
 
 
 
 #define gfasttm(g,et,e) ((et) == NULL ? NULL : \
-  ((et)->flags & (1u<<(e))) ? NULL : luaT_gettm(et, e, (g)->tmname[e]))
+                         ((et)->flags & (1u<<(e))) ? NULL : luaT_gettm(et, e, (g)->tmname[e]))
 
 #define fasttm(l,et,e) gfasttm(G(l), et, e)
 
@@ -49,9 +49,9 @@ typedef enum {
 LUAI_DDEC const char *const luaT_typenames_[LUA_TOTALTAGS];
 
 
-LUAI_FUNC const TValue *luaT_gettm (Table *events, TMS event, TString *ename);
-LUAI_FUNC const TValue *luaT_gettmbyobj (lua_State *L, const TValue *o,
-                                                       TMS event);
-LUAI_FUNC void luaT_init (lua_State *L);
+LUAI_FUNC const TValue *luaT_gettm(Table *events, TMS event, TString *ename);
+LUAI_FUNC const TValue *luaT_gettmbyobj(lua_State *L, const TValue *o,
+                                        TMS event);
+LUAI_FUNC void luaT_init(lua_State *L);
 
 #endif
diff --git a/liblua/lua.c b/liblua/lua.c
index cd6984494..17345d2c3 100644
--- a/liblua/lua.c
+++ b/liblua/lua.c
@@ -68,15 +68,15 @@
 #include <readline/history.h>
 #define lua_readline(L,b,p) ((void)L, ((b)=readline(p)) != NULL)
 #define lua_saveline(L,idx) \
-        if (lua_rawlen(L,idx) > 0)  /* non-empty line? */ \
-          add_history(lua_tostring(L, idx));  /* add it to history */
+    if (lua_rawlen(L,idx) > 0)  /* non-empty line? */ \
+        add_history(lua_tostring(L, idx));  /* add it to history */
 #define lua_freeline(L,b) ((void)L, free(b))
 
 #elif !defined(lua_readline)
 
 #define lua_readline(L,b,p) \
-        ((void)L, fputs(p, stdout), fflush(stdout),  /* show prompt */ \
-        fgets(b, LUA_MAXINPUT, stdin) != NULL)  /* get line */
+    ((void)L, fputs(p, stdout), fflush(stdout),  /* show prompt */ \
+     fgets(b, LUA_MAXINPUT, stdin) != NULL)  /* get line */
 #define lua_saveline(L,idx) { (void)L; (void)idx; }
 #define lua_freeline(L,b) { (void)L; (void)b; }
 
@@ -91,253 +91,272 @@ static const char *progname = LUA_PROGNAME;
 
 
 
-static void lstop (lua_State *L, lua_Debug *ar) {
-  (void)ar;  /* unused arg. */
-  lua_sethook(L, NULL, 0, 0);
-  luaL_error(L, "interrupted!");
+static void lstop(lua_State *L, lua_Debug *ar)
+{
+    (void)ar;  /* unused arg. */
+    lua_sethook(L, NULL, 0, 0);
+    luaL_error(L, "interrupted!");
 }
 
 
-static void laction (int i) {
-  signal(i, SIG_DFL); /* if another SIGINT happens before lstop,
+static void laction(int i)
+{
+    signal(i, SIG_DFL); /* if another SIGINT happens before lstop,
                               terminate process (default action) */
-  lua_sethook(globalL, lstop, LUA_MASKCALL | LUA_MASKRET | LUA_MASKCOUNT, 1);
+    lua_sethook(globalL, lstop, LUA_MASKCALL | LUA_MASKRET | LUA_MASKCOUNT, 1);
 }
 
 
-static void print_usage (const char *badoption) {
-  luai_writestringerror("%s: ", progname);
-  if (badoption[1] == 'e' || badoption[1] == 'l')
-    luai_writestringerror("'%s' needs argument\n", badoption);
-  else
-    luai_writestringerror("unrecognized option '%s'\n", badoption);
-  luai_writestringerror(
-  "usage: %s [options] [script [args]]\n"
-  "Available options are:\n"
-  "  -e stat  execute string " LUA_QL("stat") "\n"
-  "  -i       enter interactive mode after executing " LUA_QL("script") "\n"
-  "  -l name  require library " LUA_QL("name") "\n"
-  "  -v       show version information\n"
-  "  -E       ignore environment variables\n"
-  "  --       stop handling options\n"
-  "  -        stop handling options and execute stdin\n"
-  ,
-  progname);
+static void print_usage(const char *badoption)
+{
+    luai_writestringerror("%s: ", progname);
+    if (badoption[1] == 'e' || badoption[1] == 'l')
+        luai_writestringerror("'%s' needs argument\n", badoption);
+    else
+        luai_writestringerror("unrecognized option '%s'\n", badoption);
+    luai_writestringerror(
+        "usage: %s [options] [script [args]]\n"
+        "Available options are:\n"
+        "  -e stat  execute string " LUA_QL("stat") "\n"
+        "  -i       enter interactive mode after executing " LUA_QL("script") "\n"
+        "  -l name  require library " LUA_QL("name") "\n"
+        "  -v       show version information\n"
+        "  -E       ignore environment variables\n"
+        "  --       stop handling options\n"
+        "  -        stop handling options and execute stdin\n"
+        ,
+        progname);
 }
 
 
-static void l_message (const char *pname, const char *msg) {
-  if (pname) luai_writestringerror("%s: ", pname);
-  luai_writestringerror("%s\n", msg);
+static void l_message(const char *pname, const char *msg)
+{
+    if (pname) luai_writestringerror("%s: ", pname);
+    luai_writestringerror("%s\n", msg);
 }
 
 
-static int report (lua_State *L, int status) {
-  if (status != LUA_OK && !lua_isnil(L, -1)) {
-    const char *msg = lua_tostring(L, -1);
-    if (msg == NULL) msg = "(error object is not a string)";
-    l_message(progname, msg);
-    lua_pop(L, 1);
-    /* force a complete garbage collection in case of errors */
-    lua_gc(L, LUA_GCCOLLECT, 0);
-  }
-  return status;
+static int report(lua_State *L, int status)
+{
+    if (status != LUA_OK && !lua_isnil(L, -1)) {
+        const char *msg = lua_tostring(L, -1);
+        if (msg == NULL) msg = "(error object is not a string)";
+        l_message(progname, msg);
+        lua_pop(L, 1);
+        /* force a complete garbage collection in case of errors */
+        lua_gc(L, LUA_GCCOLLECT, 0);
+    }
+    return status;
 }
 
 
 /* the next function is called unprotected, so it must avoid errors */
-static void finalreport (lua_State *L, int status) {
-  if (status != LUA_OK) {
-    const char *msg = (lua_type(L, -1) == LUA_TSTRING) ? lua_tostring(L, -1)
-                                                       : NULL;
-    if (msg == NULL) msg = "(error object is not a string)";
-    l_message(progname, msg);
-    lua_pop(L, 1);
-  }
+static void finalreport(lua_State *L, int status)
+{
+    if (status != LUA_OK) {
+        const char *msg = (lua_type(L, -1) == LUA_TSTRING) ? lua_tostring(L, -1)
+                          : NULL;
+        if (msg == NULL) msg = "(error object is not a string)";
+        l_message(progname, msg);
+        lua_pop(L, 1);
+    }
 }
 
 
-static int traceback (lua_State *L) {
-  const char *msg = lua_tostring(L, 1);
-  if (msg)
-    luaL_traceback(L, L, msg, 1);
-  else if (!lua_isnoneornil(L, 1)) {  /* is there an error object? */
-    if (!luaL_callmeta(L, 1, "__tostring"))  /* try its 'tostring' metamethod */
-      lua_pushliteral(L, "(no error message)");
-  }
-  return 1;
+static int traceback(lua_State *L)
+{
+    const char *msg = lua_tostring(L, 1);
+    if (msg)
+        luaL_traceback(L, L, msg, 1);
+    else if (!lua_isnoneornil(L, 1)) {  /* is there an error object? */
+        if (!luaL_callmeta(L, 1, "__tostring"))  /* try its 'tostring' metamethod */
+            lua_pushliteral(L, "(no error message)");
+    }
+    return 1;
 }
 
 
-static int docall (lua_State *L, int narg, int nres) {
-  int status;
-  int base = lua_gettop(L) - narg;  /* function index */
-  lua_pushcfunction(L, traceback);  /* push traceback function */
-  lua_insert(L, base);  /* put it under chunk and args */
-  globalL = L;  /* to be available to 'laction' */
-  signal(SIGINT, laction);
-  status = lua_pcall(L, narg, nres, base);
-  signal(SIGINT, SIG_DFL);
-  lua_remove(L, base);  /* remove traceback function */
-  return status;
+static int docall(lua_State *L, int narg, int nres)
+{
+    int status;
+    int base = lua_gettop(L) - narg;  /* function index */
+    lua_pushcfunction(L, traceback);  /* push traceback function */
+    lua_insert(L, base);  /* put it under chunk and args */
+    globalL = L;  /* to be available to 'laction' */
+    signal(SIGINT, laction);
+    status = lua_pcall(L, narg, nres, base);
+    signal(SIGINT, SIG_DFL);
+    lua_remove(L, base);  /* remove traceback function */
+    return status;
 }
 
 
-static void print_version (void) {
-  luai_writestring(LUA_COPYRIGHT, strlen(LUA_COPYRIGHT));
-  luai_writeline();
+static void print_version(void)
+{
+    luai_writestring(LUA_COPYRIGHT, strlen(LUA_COPYRIGHT));
+    luai_writeline();
 }
 
 
-static int getargs (lua_State *L, char **argv, int n) {
-  int narg;
-  int i;
-  int argc = 0;
-  while (argv[argc]) argc++;  /* count total number of arguments */
-  narg = argc - (n + 1);  /* number of arguments to the script */
-  luaL_checkstack(L, narg + 3, "too many arguments to script");
-  for (i=n+1; i < argc; i++)
-    lua_pushstring(L, argv[i]);
-  lua_createtable(L, narg, n + 1);
-  for (i=0; i < argc; i++) {
-    lua_pushstring(L, argv[i]);
-    lua_rawseti(L, -2, i - n);
-  }
-  return narg;
+static int getargs(lua_State *L, char **argv, int n)
+{
+    int narg;
+    int i;
+    int argc = 0;
+    while (argv[argc]) argc++;  /* count total number of arguments */
+    narg = argc - (n + 1);  /* number of arguments to the script */
+    luaL_checkstack(L, narg + 3, "too many arguments to script");
+    for (i = n + 1; i < argc; i++)
+        lua_pushstring(L, argv[i]);
+    lua_createtable(L, narg, n + 1);
+    for (i = 0; i < argc; i++) {
+        lua_pushstring(L, argv[i]);
+        lua_rawseti(L, -2, i - n);
+    }
+    return narg;
 }
 
 
-static int dofile (lua_State *L, const char *name) {
-  int status = luaL_loadfile(L, name);
-  if (status == LUA_OK) status = docall(L, 0, 0);
-  return report(L, status);
+static int dofile(lua_State *L, const char *name)
+{
+    int status = luaL_loadfile(L, name);
+    if (status == LUA_OK) status = docall(L, 0, 0);
+    return report(L, status);
 }
 
 
-static int dostring (lua_State *L, const char *s, const char *name) {
-  int status = luaL_loadbuffer(L, s, strlen(s), name);
-  if (status == LUA_OK) status = docall(L, 0, 0);
-  return report(L, status);
+static int dostring(lua_State *L, const char *s, const char *name)
+{
+    int status = luaL_loadbuffer(L, s, strlen(s), name);
+    if (status == LUA_OK) status = docall(L, 0, 0);
+    return report(L, status);
 }
 
 
-static int dolibrary (lua_State *L, const char *name) {
-  int status;
-  lua_getglobal(L, "require");
-  lua_pushstring(L, name);
-  status = docall(L, 1, 1);  /* call 'require(name)' */
-  if (status == LUA_OK)
-    lua_setglobal(L, name);  /* global[name] = require return */
-  return report(L, status);
+static int dolibrary(lua_State *L, const char *name)
+{
+    int status;
+    lua_getglobal(L, "require");
+    lua_pushstring(L, name);
+    status = docall(L, 1, 1);  /* call 'require(name)' */
+    if (status == LUA_OK)
+        lua_setglobal(L, name);  /* global[name] = require return */
+    return report(L, status);
 }
 
 
-static const char *get_prompt (lua_State *L, int firstline) {
-  const char *p;
-  lua_getglobal(L, firstline ? "_PROMPT" : "_PROMPT2");
-  p = lua_tostring(L, -1);
-  if (p == NULL) p = (firstline ? LUA_PROMPT : LUA_PROMPT2);
-  return p;
+static const char *get_prompt(lua_State *L, int firstline)
+{
+    const char *p;
+    lua_getglobal(L, firstline ? "_PROMPT" : "_PROMPT2");
+    p = lua_tostring(L, -1);
+    if (p == NULL) p = (firstline ? LUA_PROMPT : LUA_PROMPT2);
+    return p;
 }
 
 /* mark in error messages for incomplete statements */
 #define EOFMARK "<eof>"
 #define marklen (sizeof(EOFMARK)/sizeof(char) - 1)
 
-static int incomplete (lua_State *L, int status) {
-  if (status == LUA_ERRSYNTAX) {
-    size_t lmsg;
-    const char *msg = lua_tolstring(L, -1, &lmsg);
-    if (lmsg >= marklen && strcmp(msg + lmsg - marklen, EOFMARK) == 0) {
-      lua_pop(L, 1);
-      return 1;
+static int incomplete(lua_State *L, int status)
+{
+    if (status == LUA_ERRSYNTAX) {
+        size_t lmsg;
+        const char *msg = lua_tolstring(L, -1, &lmsg);
+        if (lmsg >= marklen && strcmp(msg + lmsg - marklen, EOFMARK) == 0) {
+            lua_pop(L, 1);
+            return 1;
+        }
     }
-  }
-  return 0;  /* else... */
+    return 0;  /* else... */
 }
 
 
-static int pushline (lua_State *L, int firstline) {
-  char buffer[LUA_MAXINPUT];
-  char *b = buffer;
-  size_t l;
-  const char *prmt = get_prompt(L, firstline);
-  int readstatus = lua_readline(L, b, prmt);
-  lua_pop(L, 1);  /* remove result from 'get_prompt' */
-  if (readstatus == 0)
-    return 0;  /* no input */
-  l = strlen(b);
-  if (l > 0 && b[l-1] == '\n')  /* line ends with newline? */
-    b[l-1] = '\0';  /* remove it */
-  if (firstline && b[0] == '=')  /* first line starts with `=' ? */
-    lua_pushfstring(L, "return %s", b+1);  /* change it to `return' */
-  else
-    lua_pushstring(L, b);
-  lua_freeline(L, b);
-  return 1;
-}
-
-
-static int loadline (lua_State *L) {
-  int status;
-  lua_settop(L, 0);
-  if (!pushline(L, 1))
-    return -1;  /* no input */
-  for (;;) {  /* repeat until gets a complete line */
+static int pushline(lua_State *L, int firstline)
+{
+    char buffer[LUA_MAXINPUT];
+    char *b = buffer;
     size_t l;
-    const char *line = lua_tolstring(L, 1, &l);
-    status = luaL_loadbuffer(L, line, l, "=stdin");
-    if (!incomplete(L, status)) break;  /* cannot try to add lines? */
-    if (!pushline(L, 0))  /* no more input? */
-      return -1;
-    lua_pushliteral(L, "\n");  /* add a new line... */
-    lua_insert(L, -2);  /* ...between the two lines */
-    lua_concat(L, 3);  /* join them */
-  }
-  lua_saveline(L, 1);
-  lua_remove(L, 1);  /* remove line */
-  return status;
+    const char *prmt = get_prompt(L, firstline);
+    int readstatus = lua_readline(L, b, prmt);
+    lua_pop(L, 1);  /* remove result from 'get_prompt' */
+    if (readstatus == 0)
+        return 0;  /* no input */
+    l = strlen(b);
+    if (l > 0 && b[l - 1] == '\n') /* line ends with newline? */
+        b[l - 1] = '\0'; /* remove it */
+    if (firstline && b[0] == '=')  /* first line starts with `=' ? */
+        lua_pushfstring(L, "return %s", b + 1); /* change it to `return' */
+    else
+        lua_pushstring(L, b);
+    lua_freeline(L, b);
+    return 1;
 }
 
 
-static void dotty (lua_State *L) {
-  int status;
-  const char *oldprogname = progname;
-  progname = NULL;
-  while ((status = loadline(L)) != -1) {
-    if (status == LUA_OK) status = docall(L, 0, LUA_MULTRET);
-    report(L, status);
-    if (status == LUA_OK && lua_gettop(L) > 0) {  /* any result to print? */
-      luaL_checkstack(L, LUA_MINSTACK, "too many results to print");
-      lua_getglobal(L, "print");
-      lua_insert(L, 1);
-      if (lua_pcall(L, lua_gettop(L)-1, 0, 0) != LUA_OK)
-        l_message(progname, lua_pushfstring(L,
-                               "error calling " LUA_QL("print") " (%s)",
-                               lua_tostring(L, -1)));
+static int loadline(lua_State *L)
+{
+    int status;
+    lua_settop(L, 0);
+    if (!pushline(L, 1))
+        return -1;  /* no input */
+    for (;;) {  /* repeat until gets a complete line */
+        size_t l;
+        const char *line = lua_tolstring(L, 1, &l);
+        status = luaL_loadbuffer(L, line, l, "=stdin");
+        if (!incomplete(L, status)) break;  /* cannot try to add lines? */
+        if (!pushline(L, 0))  /* no more input? */
+            return -1;
+        lua_pushliteral(L, "\n");  /* add a new line... */
+        lua_insert(L, -2);  /* ...between the two lines */
+        lua_concat(L, 3);  /* join them */
     }
-  }
-  lua_settop(L, 0);  /* clear stack */
-  luai_writeline();
-  progname = oldprogname;
+    lua_saveline(L, 1);
+    lua_remove(L, 1);  /* remove line */
+    return status;
 }
 
 
-static int handle_script (lua_State *L, char **argv, int n) {
-  int status;
-  const char *fname;
-  int narg = getargs(L, argv, n);  /* collect arguments */
-  lua_setglobal(L, "arg");
-  fname = argv[n];
-  if (strcmp(fname, "-") == 0 && strcmp(argv[n-1], "--") != 0)
-    fname = NULL;  /* stdin */
-  status = luaL_loadfile(L, fname);
-  lua_insert(L, -(narg+1));
-  if (status == LUA_OK)
-    status = docall(L, narg, LUA_MULTRET);
-  else
-    lua_pop(L, narg);
-  return report(L, status);
+static void dotty(lua_State *L)
+{
+    int status;
+    const char *oldprogname = progname;
+    progname = NULL;
+    while ((status = loadline(L)) != -1) {
+        if (status == LUA_OK) status = docall(L, 0, LUA_MULTRET);
+        report(L, status);
+        if (status == LUA_OK && lua_gettop(L) > 0) {  /* any result to print? */
+            luaL_checkstack(L, LUA_MINSTACK, "too many results to print");
+            lua_getglobal(L, "print");
+            lua_insert(L, 1);
+            if (lua_pcall(L, lua_gettop(L) - 1, 0, 0) != LUA_OK)
+                l_message(progname, lua_pushfstring(L,
+                                                    "error calling " LUA_QL("print") " (%s)",
+                                                    lua_tostring(L, -1)));
+        }
+    }
+    lua_settop(L, 0);  /* clear stack */
+    luai_writeline();
+    progname = oldprogname;
+}
+
+
+static int handle_script(lua_State *L, char **argv, int n)
+{
+    int status;
+    const char *fname;
+    int narg = getargs(L, argv, n);  /* collect arguments */
+    lua_setglobal(L, "arg");
+    fname = argv[n];
+    if (strcmp(fname, "-") == 0 && strcmp(argv[n - 1], "--") != 0)
+        fname = NULL;  /* stdin */
+    status = luaL_loadfile(L, fname);
+    lua_insert(L, -(narg + 1));
+    if (status == LUA_OK)
+        status = docall(L, narg, LUA_MULTRET);
+    else
+        lua_pop(L, narg);
+    return report(L, status);
 }
 
 
@@ -354,144 +373,149 @@ static int handle_script (lua_State *L, char **argv, int n) {
 #define num_has 4 /* number of 'has_*' */
 
 
-static int collectargs (char **argv, int *args) {
-  int i;
-  for (i = 1; argv[i] != NULL; i++) {
-    if (argv[i][0] != '-')  /* not an option? */
-        return i;
-    switch (argv[i][1]) {  /* option */
-      case '-':
-        noextrachars(argv[i]);
-        return (argv[i+1] != NULL ? i+1 : 0);
-      case '\0':
-        return i;
-      case 'E':
-        args[has_E] = 1;
-        break;
-      case 'i':
-        noextrachars(argv[i]);
-        args[has_i] = 1;  /* go through */
-      case 'v':
-        noextrachars(argv[i]);
-        args[has_v] = 1;
-        break;
-      case 'e':
-        args[has_e] = 1;  /* go through */
-      case 'l':  /* both options need an argument */
-        if (argv[i][2] == '\0') {  /* no concatenated argument? */
-          i++;  /* try next 'argv' */
-          if (argv[i] == NULL || argv[i][0] == '-')
-            return -(i - 1);  /* no next argument or it is another option */
+static int collectargs(char **argv, int *args)
+{
+    int i;
+    for (i = 1; argv[i] != NULL; i++) {
+        if (argv[i][0] != '-')  /* not an option? */
+            return i;
+        switch (argv[i][1]) {  /* option */
+            case '-':
+                noextrachars(argv[i]);
+                return (argv[i + 1] != NULL ? i + 1 : 0);
+            case '\0':
+                return i;
+            case 'E':
+                args[has_E] = 1;
+                break;
+            case 'i':
+                noextrachars(argv[i]);
+                args[has_i] = 1;  /* go through */
+            case 'v':
+                noextrachars(argv[i]);
+                args[has_v] = 1;
+                break;
+            case 'e':
+                args[has_e] = 1;  /* go through */
+            case 'l':  /* both options need an argument */
+                if (argv[i][2] == '\0') {  /* no concatenated argument? */
+                    i++;  /* try next 'argv' */
+                    if (argv[i] == NULL || argv[i][0] == '-')
+                        return -(i - 1);  /* no next argument or it is another option */
+                }
+                break;
+            default:  /* invalid option; return its index... */
+                return -i;  /* ...as a negative value */
         }
-        break;
-      default:  /* invalid option; return its index... */
-        return -i;  /* ...as a negative value */
     }
-  }
-  return 0;
-}
-
-
-static int runargs (lua_State *L, char **argv, int n) {
-  int i;
-  for (i = 1; i < n; i++) {
-    lua_assert(argv[i][0] == '-');
-    switch (argv[i][1]) {  /* option */
-      case 'e': {
-        const char *chunk = argv[i] + 2;
-        if (*chunk == '\0') chunk = argv[++i];
-        lua_assert(chunk != NULL);
-        if (dostring(L, chunk, "=(command line)") != LUA_OK)
-          return 0;
-        break;
-      }
-      case 'l': {
-        const char *filename = argv[i] + 2;
-        if (*filename == '\0') filename = argv[++i];
-        lua_assert(filename != NULL);
-        if (dolibrary(L, filename) != LUA_OK)
-          return 0;  /* stop if file fails */
-        break;
-      }
-      default: break;
-    }
-  }
-  return 1;
-}
-
-
-static int handle_luainit (lua_State *L) {
-  const char *name = "=" LUA_INITVERSION;
-  const char *init = getenv(name + 1);
-  if (init == NULL) {
-    name = "=" LUA_INIT;
-    init = getenv(name + 1);  /* try alternative name */
-  }
-  if (init == NULL) return LUA_OK;
-  else if (init[0] == '@')
-    return dofile(L, init+1);
-  else
-    return dostring(L, init, name);
-}
-
-
-static int pmain (lua_State *L) {
-  int argc = (int)lua_tointeger(L, 1);
-  char **argv = (char **)lua_touserdata(L, 2);
-  int script;
-  int args[num_has];
-  args[has_i] = args[has_v] = args[has_e] = args[has_E] = 0;
-  if (argv[0] && argv[0][0]) progname = argv[0];
-  script = collectargs(argv, args);
-  if (script < 0) {  /* invalid arg? */
-    print_usage(argv[-script]);
     return 0;
-  }
-  if (args[has_v]) print_version();
-  if (args[has_E]) {  /* option '-E'? */
-    lua_pushboolean(L, 1);  /* signal for libraries to ignore env. vars. */
-    lua_setfield(L, LUA_REGISTRYINDEX, "LUA_NOENV");
-  }
-  /* open standard libraries */
-  luaL_checkversion(L);
-  lua_gc(L, LUA_GCSTOP, 0);  /* stop collector during initialization */
-  luaL_openlibs(L);  /* open libraries */
-  lua_gc(L, LUA_GCRESTART, 0);
-  if (!args[has_E] && handle_luainit(L) != LUA_OK)
-    return 0;  /* error running LUA_INIT */
-  /* execute arguments -e and -l */
-  if (!runargs(L, argv, (script > 0) ? script : argc)) return 0;
-  /* execute main script (if there is one) */
-  if (script && handle_script(L, argv, script) != LUA_OK) return 0;
-  if (args[has_i])  /* -i option? */
-    dotty(L);
-  else if (script == 0 && !args[has_e] && !args[has_v]) {  /* no arguments? */
-    if (lua_stdin_is_tty()) {
-      print_version();
-      dotty(L);
+}
+
+
+static int runargs(lua_State *L, char **argv, int n)
+{
+    int i;
+    for (i = 1; i < n; i++) {
+        lua_assert(argv[i][0] == '-');
+        switch (argv[i][1]) {  /* option */
+            case 'e': {
+                const char *chunk = argv[i] + 2;
+                if (*chunk == '\0') chunk = argv[++i];
+                lua_assert(chunk != NULL);
+                if (dostring(L, chunk, "=(command line)") != LUA_OK)
+                    return 0;
+                break;
+            }
+            case 'l': {
+                const char *filename = argv[i] + 2;
+                if (*filename == '\0') filename = argv[++i];
+                lua_assert(filename != NULL);
+                if (dolibrary(L, filename) != LUA_OK)
+                    return 0;  /* stop if file fails */
+                break;
+            }
+            default:
+                break;
+        }
     }
-    else dofile(L, NULL);  /* executes stdin as a file */
-  }
-  lua_pushboolean(L, 1);  /* signal no errors */
-  return 1;
+    return 1;
 }
 
 
-int main (int argc, char **argv) {
-  int status, result;
-  lua_State *L = luaL_newstate();  /* create state */
-  if (L == NULL) {
-    l_message(argv[0], "cannot create state: not enough memory");
-    return EXIT_FAILURE;
-  }
-  /* call 'pmain' in protected mode */
-  lua_pushcfunction(L, &pmain);
-  lua_pushinteger(L, argc);  /* 1st argument */
-  lua_pushlightuserdata(L, argv); /* 2nd argument */
-  status = lua_pcall(L, 2, 1, 0);
-  result = lua_toboolean(L, -1);  /* get result */
-  finalreport(L, status);
-  lua_close(L);
-  return (result && status == LUA_OK) ? EXIT_SUCCESS : EXIT_FAILURE;
+static int handle_luainit(lua_State *L)
+{
+    const char *name = "=" LUA_INITVERSION;
+    const char *init = getenv(name + 1);
+    if (init == NULL) {
+        name = "=" LUA_INIT;
+        init = getenv(name + 1);  /* try alternative name */
+    }
+    if (init == NULL) return LUA_OK;
+    else if (init[0] == '@')
+        return dofile(L, init + 1);
+    else
+        return dostring(L, init, name);
+}
+
+
+static int pmain(lua_State *L)
+{
+    int argc = (int)lua_tointeger(L, 1);
+    char **argv = (char **)lua_touserdata(L, 2);
+    int script;
+    int args[num_has];
+    args[has_i] = args[has_v] = args[has_e] = args[has_E] = 0;
+    if (argv[0] && argv[0][0]) progname = argv[0];
+    script = collectargs(argv, args);
+    if (script < 0) {  /* invalid arg? */
+        print_usage(argv[-script]);
+        return 0;
+    }
+    if (args[has_v]) print_version();
+    if (args[has_E]) {  /* option '-E'? */
+        lua_pushboolean(L, 1);  /* signal for libraries to ignore env. vars. */
+        lua_setfield(L, LUA_REGISTRYINDEX, "LUA_NOENV");
+    }
+    /* open standard libraries */
+    luaL_checkversion(L);
+    lua_gc(L, LUA_GCSTOP, 0);  /* stop collector during initialization */
+    luaL_openlibs(L);  /* open libraries */
+    lua_gc(L, LUA_GCRESTART, 0);
+    if (!args[has_E] && handle_luainit(L) != LUA_OK)
+        return 0;  /* error running LUA_INIT */
+    /* execute arguments -e and -l */
+    if (!runargs(L, argv, (script > 0) ? script : argc)) return 0;
+    /* execute main script (if there is one) */
+    if (script && handle_script(L, argv, script) != LUA_OK) return 0;
+    if (args[has_i])  /* -i option? */
+        dotty(L);
+    else if (script == 0 && !args[has_e] && !args[has_v]) {  /* no arguments? */
+        if (lua_stdin_is_tty()) {
+            print_version();
+            dotty(L);
+        } else dofile(L, NULL); /* executes stdin as a file */
+    }
+    lua_pushboolean(L, 1);  /* signal no errors */
+    return 1;
+}
+
+
+int main(int argc, char **argv)
+{
+    int status, result;
+    lua_State *L = luaL_newstate();  /* create state */
+    if (L == NULL) {
+        l_message(argv[0], "cannot create state: not enough memory");
+        return EXIT_FAILURE;
+    }
+    /* call 'pmain' in protected mode */
+    lua_pushcfunction(L, &pmain);
+    lua_pushinteger(L, argc);  /* 1st argument */
+    lua_pushlightuserdata(L, argv); /* 2nd argument */
+    status = lua_pcall(L, 2, 1, 0);
+    result = lua_toboolean(L, -1);  /* get result */
+    finalreport(L, status);
+    lua_close(L);
+    return (result && status == LUA_OK) ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
diff --git a/liblua/lua.h b/liblua/lua.h
index 8346e227a..1f0e8913b 100644
--- a/liblua/lua.h
+++ b/liblua/lua.h
@@ -53,21 +53,21 @@
 
 typedef struct lua_State lua_State;
 
-typedef int (*lua_CFunction) (lua_State *L);
+typedef int (*lua_CFunction)(lua_State *L);
 
 
 /*
 ** functions that read/write blocks when loading/dumping Lua chunks
 */
-typedef const char * (*lua_Reader) (lua_State *L, void *ud, size_t *sz);
+typedef const char *(*lua_Reader)(lua_State *L, void *ud, size_t *sz);
 
-typedef int (*lua_Writer) (lua_State *L, const void* p, size_t sz, void* ud);
+typedef int (*lua_Writer)(lua_State *L, const void *p, size_t sz, void *ud);
 
 
 /*
 ** prototype for memory-allocation functions
 */
-typedef void * (*lua_Alloc) (void *ud, void *ptr, size_t osize, size_t nsize);
+typedef void *(*lua_Alloc)(void *ud, void *ptr, size_t osize, size_t nsize);
 
 
 /*
@@ -128,53 +128,53 @@ extern const char lua_ident[];
 /*
 ** state manipulation
 */
-LUA_API lua_State *(lua_newstate) (lua_Alloc f, void *ud);
-LUA_API void       (lua_close) (lua_State *L);
-LUA_API lua_State *(lua_newthread) (lua_State *L);
+LUA_API lua_State *(lua_newstate)(lua_Alloc f, void *ud);
+LUA_API void (lua_close)(lua_State *L);
+LUA_API lua_State *(lua_newthread)(lua_State *L);
 
-LUA_API lua_CFunction (lua_atpanic) (lua_State *L, lua_CFunction panicf);
+LUA_API lua_CFunction(lua_atpanic)(lua_State *L, lua_CFunction panicf);
 
 
-LUA_API const lua_Number *(lua_version) (lua_State *L);
+LUA_API const lua_Number *(lua_version)(lua_State *L);
 
 
 /*
 ** basic stack manipulation
 */
-LUA_API int   (lua_absindex) (lua_State *L, int idx);
-LUA_API int   (lua_gettop) (lua_State *L);
-LUA_API void  (lua_settop) (lua_State *L, int idx);
-LUA_API void  (lua_pushvalue) (lua_State *L, int idx);
-LUA_API void  (lua_remove) (lua_State *L, int idx);
-LUA_API void  (lua_insert) (lua_State *L, int idx);
-LUA_API void  (lua_replace) (lua_State *L, int idx);
-LUA_API void  (lua_copy) (lua_State *L, int fromidx, int toidx);
-LUA_API int   (lua_checkstack) (lua_State *L, int sz);
+LUA_API int (lua_absindex)(lua_State *L, int idx);
+LUA_API int (lua_gettop)(lua_State *L);
+LUA_API void (lua_settop)(lua_State *L, int idx);
+LUA_API void (lua_pushvalue)(lua_State *L, int idx);
+LUA_API void (lua_remove)(lua_State *L, int idx);
+LUA_API void (lua_insert)(lua_State *L, int idx);
+LUA_API void (lua_replace)(lua_State *L, int idx);
+LUA_API void (lua_copy)(lua_State *L, int fromidx, int toidx);
+LUA_API int (lua_checkstack)(lua_State *L, int sz);
 
-LUA_API void  (lua_xmove) (lua_State *from, lua_State *to, int n);
+LUA_API void (lua_xmove)(lua_State *from, lua_State *to, int n);
 
 
 /*
 ** access functions (stack -> C)
 */
 
-LUA_API int             (lua_isnumber) (lua_State *L, int idx);
-LUA_API int             (lua_isstring) (lua_State *L, int idx);
-LUA_API int             (lua_iscfunction) (lua_State *L, int idx);
-LUA_API int             (lua_isuserdata) (lua_State *L, int idx);
-LUA_API int             (lua_type) (lua_State *L, int idx);
-LUA_API const char     *(lua_typename) (lua_State *L, int tp);
+LUA_API int (lua_isnumber)(lua_State *L, int idx);
+LUA_API int (lua_isstring)(lua_State *L, int idx);
+LUA_API int (lua_iscfunction)(lua_State *L, int idx);
+LUA_API int (lua_isuserdata)(lua_State *L, int idx);
+LUA_API int (lua_type)(lua_State *L, int idx);
+LUA_API const char     *(lua_typename)(lua_State *L, int tp);
 
-LUA_API lua_Number      (lua_tonumberx) (lua_State *L, int idx, int *isnum);
-LUA_API lua_Integer     (lua_tointegerx) (lua_State *L, int idx, int *isnum);
-LUA_API lua_Unsigned    (lua_tounsignedx) (lua_State *L, int idx, int *isnum);
-LUA_API int             (lua_toboolean) (lua_State *L, int idx);
-LUA_API const char     *(lua_tolstring) (lua_State *L, int idx, size_t *len);
-LUA_API size_t          (lua_rawlen) (lua_State *L, int idx);
-LUA_API lua_CFunction   (lua_tocfunction) (lua_State *L, int idx);
-LUA_API void           *(lua_touserdata) (lua_State *L, int idx);
-LUA_API lua_State      *(lua_tothread) (lua_State *L, int idx);
-LUA_API const void     *(lua_topointer) (lua_State *L, int idx);
+LUA_API lua_Number(lua_tonumberx)(lua_State *L, int idx, int *isnum);
+LUA_API lua_Integer(lua_tointegerx)(lua_State *L, int idx, int *isnum);
+LUA_API lua_Unsigned(lua_tounsignedx)(lua_State *L, int idx, int *isnum);
+LUA_API int (lua_toboolean)(lua_State *L, int idx);
+LUA_API const char     *(lua_tolstring)(lua_State *L, int idx, size_t *len);
+LUA_API size_t (lua_rawlen)(lua_State *L, int idx);
+LUA_API lua_CFunction(lua_tocfunction)(lua_State *L, int idx);
+LUA_API void           *(lua_touserdata)(lua_State *L, int idx);
+LUA_API lua_State      *(lua_tothread)(lua_State *L, int idx);
+LUA_API const void     *(lua_topointer)(lua_State *L, int idx);
 
 
 /*
@@ -189,90 +189,90 @@ LUA_API const void     *(lua_topointer) (lua_State *L, int idx);
 #define LUA_OPPOW 5
 #define LUA_OPUNM 6
 
-LUA_API void  (lua_arith) (lua_State *L, int op);
+LUA_API void (lua_arith)(lua_State *L, int op);
 
 #define LUA_OPEQ  0
 #define LUA_OPLT  1
 #define LUA_OPLE  2
 
-LUA_API int   (lua_rawequal) (lua_State *L, int idx1, int idx2);
-LUA_API int   (lua_compare) (lua_State *L, int idx1, int idx2, int op);
+LUA_API int (lua_rawequal)(lua_State *L, int idx1, int idx2);
+LUA_API int (lua_compare)(lua_State *L, int idx1, int idx2, int op);
 
 
 /*
 ** push functions (C -> stack)
 */
-LUA_API void        (lua_pushnil) (lua_State *L);
-LUA_API void        (lua_pushnumber) (lua_State *L, lua_Number n);
-LUA_API void        (lua_pushinteger) (lua_State *L, lua_Integer n);
-LUA_API void        (lua_pushunsigned) (lua_State *L, lua_Unsigned n);
-LUA_API const char *(lua_pushlstring) (lua_State *L, const char *s, size_t l);
-LUA_API const char *(lua_pushstring) (lua_State *L, const char *s);
-LUA_API const char *(lua_pushvfstring) (lua_State *L, const char *fmt,
-                                                      va_list argp);
-LUA_API const char *(lua_pushfstring) (lua_State *L, const char *fmt, ...);
-LUA_API void  (lua_pushcclosure) (lua_State *L, lua_CFunction fn, int n);
-LUA_API void  (lua_pushboolean) (lua_State *L, int b);
-LUA_API void  (lua_pushlightuserdata) (lua_State *L, void *p);
-LUA_API int   (lua_pushthread) (lua_State *L);
+LUA_API void (lua_pushnil)(lua_State *L);
+LUA_API void (lua_pushnumber)(lua_State *L, lua_Number n);
+LUA_API void (lua_pushinteger)(lua_State *L, lua_Integer n);
+LUA_API void (lua_pushunsigned)(lua_State *L, lua_Unsigned n);
+LUA_API const char *(lua_pushlstring)(lua_State *L, const char *s, size_t l);
+LUA_API const char *(lua_pushstring)(lua_State *L, const char *s);
+LUA_API const char *(lua_pushvfstring)(lua_State *L, const char *fmt,
+                                       va_list argp);
+LUA_API const char *(lua_pushfstring)(lua_State *L, const char *fmt, ...);
+LUA_API void (lua_pushcclosure)(lua_State *L, lua_CFunction fn, int n);
+LUA_API void (lua_pushboolean)(lua_State *L, int b);
+LUA_API void (lua_pushlightuserdata)(lua_State *L, void *p);
+LUA_API int (lua_pushthread)(lua_State *L);
 
 
 /*
 ** get functions (Lua -> stack)
 */
-LUA_API void  (lua_getglobal) (lua_State *L, const char *var);
-LUA_API void  (lua_gettable) (lua_State *L, int idx);
-LUA_API void  (lua_getfield) (lua_State *L, int idx, const char *k);
-LUA_API void  (lua_rawget) (lua_State *L, int idx);
-LUA_API void  (lua_rawgeti) (lua_State *L, int idx, int n);
-LUA_API void  (lua_rawgetp) (lua_State *L, int idx, const void *p);
-LUA_API void  (lua_createtable) (lua_State *L, int narr, int nrec);
-LUA_API void *(lua_newuserdata) (lua_State *L, size_t sz);
-LUA_API int   (lua_getmetatable) (lua_State *L, int objindex);
-LUA_API void  (lua_getuservalue) (lua_State *L, int idx);
+LUA_API void (lua_getglobal)(lua_State *L, const char *var);
+LUA_API void (lua_gettable)(lua_State *L, int idx);
+LUA_API void (lua_getfield)(lua_State *L, int idx, const char *k);
+LUA_API void (lua_rawget)(lua_State *L, int idx);
+LUA_API void (lua_rawgeti)(lua_State *L, int idx, int n);
+LUA_API void (lua_rawgetp)(lua_State *L, int idx, const void *p);
+LUA_API void (lua_createtable)(lua_State *L, int narr, int nrec);
+LUA_API void *(lua_newuserdata)(lua_State *L, size_t sz);
+LUA_API int (lua_getmetatable)(lua_State *L, int objindex);
+LUA_API void (lua_getuservalue)(lua_State *L, int idx);
 
 
 /*
 ** set functions (stack -> Lua)
 */
-LUA_API void  (lua_setglobal) (lua_State *L, const char *var);
-LUA_API void  (lua_settable) (lua_State *L, int idx);
-LUA_API void  (lua_setfield) (lua_State *L, int idx, const char *k);
-LUA_API void  (lua_rawset) (lua_State *L, int idx);
-LUA_API void  (lua_rawseti) (lua_State *L, int idx, int n);
-LUA_API void  (lua_rawsetp) (lua_State *L, int idx, const void *p);
-LUA_API int   (lua_setmetatable) (lua_State *L, int objindex);
-LUA_API void  (lua_setuservalue) (lua_State *L, int idx);
+LUA_API void (lua_setglobal)(lua_State *L, const char *var);
+LUA_API void (lua_settable)(lua_State *L, int idx);
+LUA_API void (lua_setfield)(lua_State *L, int idx, const char *k);
+LUA_API void (lua_rawset)(lua_State *L, int idx);
+LUA_API void (lua_rawseti)(lua_State *L, int idx, int n);
+LUA_API void (lua_rawsetp)(lua_State *L, int idx, const void *p);
+LUA_API int (lua_setmetatable)(lua_State *L, int objindex);
+LUA_API void (lua_setuservalue)(lua_State *L, int idx);
 
 
 /*
 ** 'load' and 'call' functions (load and run Lua code)
 */
-LUA_API void  (lua_callk) (lua_State *L, int nargs, int nresults, int ctx,
-                           lua_CFunction k);
+LUA_API void (lua_callk)(lua_State *L, int nargs, int nresults, int ctx,
+                         lua_CFunction k);
 #define lua_call(L,n,r) lua_callk(L, (n), (r), 0, NULL)
 
-LUA_API int   (lua_getctx) (lua_State *L, int *ctx);
+LUA_API int (lua_getctx)(lua_State *L, int *ctx);
 
-LUA_API int   (lua_pcallk) (lua_State *L, int nargs, int nresults, int errfunc,
-                            int ctx, lua_CFunction k);
+LUA_API int (lua_pcallk)(lua_State *L, int nargs, int nresults, int errfunc,
+                         int ctx, lua_CFunction k);
 #define lua_pcall(L,n,r,f) lua_pcallk(L, (n), (r), (f), 0, NULL)
 
-LUA_API int   (lua_load) (lua_State *L, lua_Reader reader, void *dt,
-                                        const char *chunkname,
-                                        const char *mode);
+LUA_API int (lua_load)(lua_State *L, lua_Reader reader, void *dt,
+                       const char *chunkname,
+                       const char *mode);
 
-LUA_API int (lua_dump) (lua_State *L, lua_Writer writer, void *data);
+LUA_API int (lua_dump)(lua_State *L, lua_Writer writer, void *data);
 
 
 /*
 ** coroutine functions
 */
-LUA_API int  (lua_yieldk) (lua_State *L, int nresults, int ctx,
-                           lua_CFunction k);
+LUA_API int (lua_yieldk)(lua_State *L, int nresults, int ctx,
+                         lua_CFunction k);
 #define lua_yield(L,n) lua_yieldk(L, (n), 0, NULL)
-LUA_API int  (lua_resume) (lua_State *L, lua_State *from, int narg);
-LUA_API int  (lua_status) (lua_State *L);
+LUA_API int (lua_resume)(lua_State *L, lua_State *from, int narg);
+LUA_API int (lua_status)(lua_State *L);
 
 /*
 ** garbage-collection function and options
@@ -291,22 +291,22 @@ LUA_API int  (lua_status) (lua_State *L);
 #define LUA_GCGEN          10
 #define LUA_GCINC          11
 
-LUA_API int (lua_gc) (lua_State *L, int what, int data);
+LUA_API int (lua_gc)(lua_State *L, int what, int data);
 
 
 /*
 ** miscellaneous functions
 */
 
-LUA_API int   (lua_error) (lua_State *L);
+LUA_API int (lua_error)(lua_State *L);
 
-LUA_API int   (lua_next) (lua_State *L, int idx);
+LUA_API int (lua_next)(lua_State *L, int idx);
 
-LUA_API void  (lua_concat) (lua_State *L, int n);
-LUA_API void  (lua_len)    (lua_State *L, int idx);
+LUA_API void (lua_concat)(lua_State *L, int n);
+LUA_API void (lua_len)(lua_State *L, int idx);
 
-LUA_API lua_Alloc (lua_getallocf) (lua_State *L, void **ud);
-LUA_API void      (lua_setallocf) (lua_State *L, lua_Alloc f, void *ud);
+LUA_API lua_Alloc(lua_getallocf)(lua_State *L, void **ud);
+LUA_API void (lua_setallocf)(lua_State *L, lua_Alloc f, void *ud);
 
 
 
@@ -377,42 +377,42 @@ typedef struct lua_Debug lua_Debug;  /* activation record */
 
 
 /* Functions to be called by the debugger in specific events */
-typedef void (*lua_Hook) (lua_State *L, lua_Debug *ar);
+typedef void (*lua_Hook)(lua_State *L, lua_Debug *ar);
 
 
-LUA_API int (lua_getstack) (lua_State *L, int level, lua_Debug *ar);
-LUA_API int (lua_getinfo) (lua_State *L, const char *what, lua_Debug *ar);
-LUA_API const char *(lua_getlocal) (lua_State *L, const lua_Debug *ar, int n);
-LUA_API const char *(lua_setlocal) (lua_State *L, const lua_Debug *ar, int n);
-LUA_API const char *(lua_getupvalue) (lua_State *L, int funcindex, int n);
-LUA_API const char *(lua_setupvalue) (lua_State *L, int funcindex, int n);
+LUA_API int (lua_getstack)(lua_State *L, int level, lua_Debug *ar);
+LUA_API int (lua_getinfo)(lua_State *L, const char *what, lua_Debug *ar);
+LUA_API const char *(lua_getlocal)(lua_State *L, const lua_Debug *ar, int n);
+LUA_API const char *(lua_setlocal)(lua_State *L, const lua_Debug *ar, int n);
+LUA_API const char *(lua_getupvalue)(lua_State *L, int funcindex, int n);
+LUA_API const char *(lua_setupvalue)(lua_State *L, int funcindex, int n);
 
-LUA_API void *(lua_upvalueid) (lua_State *L, int fidx, int n);
-LUA_API void  (lua_upvaluejoin) (lua_State *L, int fidx1, int n1,
-                                               int fidx2, int n2);
+LUA_API void *(lua_upvalueid)(lua_State *L, int fidx, int n);
+LUA_API void (lua_upvaluejoin)(lua_State *L, int fidx1, int n1,
+                               int fidx2, int n2);
 
-LUA_API int (lua_sethook) (lua_State *L, lua_Hook func, int mask, int count);
-LUA_API lua_Hook (lua_gethook) (lua_State *L);
-LUA_API int (lua_gethookmask) (lua_State *L);
-LUA_API int (lua_gethookcount) (lua_State *L);
+LUA_API int (lua_sethook)(lua_State *L, lua_Hook func, int mask, int count);
+LUA_API lua_Hook(lua_gethook)(lua_State *L);
+LUA_API int (lua_gethookmask)(lua_State *L);
+LUA_API int (lua_gethookcount)(lua_State *L);
 
 
 struct lua_Debug {
-  int event;
-  const char *name;     /* (n) */
-  const char *namewhat; /* (n) 'global', 'local', 'field', 'method' */
-  const char *what;     /* (S) 'Lua', 'C', 'main', 'tail' */
-  const char *source;   /* (S) */
-  int currentline;      /* (l) */
-  int linedefined;      /* (S) */
-  int lastlinedefined;  /* (S) */
-  unsigned char nups;   /* (u) number of upvalues */
-  unsigned char nparams;/* (u) number of parameters */
-  char isvararg;        /* (u) */
-  char istailcall;      /* (t) */
-  char short_src[LUA_IDSIZE]; /* (S) */
-  /* private part */
-  struct CallInfo *i_ci;  /* active function */
+    int event;
+    const char *name;     /* (n) */
+    const char *namewhat; /* (n) 'global', 'local', 'field', 'method' */
+    const char *what;     /* (S) 'Lua', 'C', 'main', 'tail' */
+    const char *source;   /* (S) */
+    int currentline;      /* (l) */
+    int linedefined;      /* (S) */
+    int lastlinedefined;  /* (S) */
+    unsigned char nups;   /* (u) number of upvalues */
+    unsigned char nparams;/* (u) number of parameters */
+    char isvararg;        /* (u) */
+    char istailcall;      /* (t) */
+    char short_src[LUA_IDSIZE]; /* (S) */
+    /* private part */
+    struct CallInfo *i_ci;  /* active function */
 };
 
 /* }====================================================================== */
diff --git a/liblua/luac.c b/liblua/luac.c
index d1533d4e7..b4aac7222 100644
--- a/liblua/luac.c
+++ b/liblua/luac.c
@@ -19,187 +19,174 @@
 #include "lstate.h"
 #include "lundump.h"
 
-static void PrintFunction(const Proto* f, int full);
+static void PrintFunction(const Proto *f, int full);
 #define luaU_print PrintFunction
 
 #define PROGNAME   "luac"               /* default program name */
 #define OUTPUT     PROGNAME ".out"      /* default output file */
 
-static int listing=0;                   /* list bytecodes? */
-static int dumping=1;                   /* dump bytecodes? */
-static int stripping=0;                 /* strip debug information? */
-static char Output[]={ OUTPUT };        /* default output file name */
-static const char* output=Output;       /* actual output file name */
-static const char* progname=PROGNAME;   /* actual program name */
+static int listing = 0;                 /* list bytecodes? */
+static int dumping = 1;                 /* dump bytecodes? */
+static int stripping = 0;               /* strip debug information? */
+static char Output[] = { OUTPUT };      /* default output file name */
+static const char *output = Output;     /* actual output file name */
+static const char *progname = PROGNAME; /* actual program name */
 
-static void fatal(const char* message)
+static void fatal(const char *message)
 {
- fprintf(stderr,"%s: %s\n",progname,message);
- exit(EXIT_FAILURE);
+    fprintf(stderr, "%s: %s\n", progname, message);
+    exit(EXIT_FAILURE);
 }
 
-static void cannot(const char* what)
+static void cannot(const char *what)
 {
- fprintf(stderr,"%s: cannot %s %s: %s\n",progname,what,output,strerror(errno));
- exit(EXIT_FAILURE);
+    fprintf(stderr, "%s: cannot %s %s: %s\n", progname, what, output, strerror(errno));
+    exit(EXIT_FAILURE);
 }
 
-static void usage(const char* message)
+static void usage(const char *message)
 {
- if (*message=='-')
-  fprintf(stderr,"%s: unrecognized option " LUA_QS "\n",progname,message);
- else
-  fprintf(stderr,"%s: %s\n",progname,message);
- fprintf(stderr,
-  "usage: %s [options] [filenames]\n"
-  "Available options are:\n"
-  "  -l       list (use -l -l for full listing)\n"
-  "  -o name  output to file " LUA_QL("name") " (default is \"%s\")\n"
-  "  -p       parse only\n"
-  "  -s       strip debug information\n"
-  "  -v       show version information\n"
-  "  --       stop handling options\n"
-  "  -        stop handling options and process stdin\n"
-  ,progname,Output);
- exit(EXIT_FAILURE);
+    if (*message == '-')
+        fprintf(stderr, "%s: unrecognized option " LUA_QS "\n", progname, message);
+    else
+        fprintf(stderr, "%s: %s\n", progname, message);
+    fprintf(stderr,
+            "usage: %s [options] [filenames]\n"
+            "Available options are:\n"
+            "  -l       list (use -l -l for full listing)\n"
+            "  -o name  output to file " LUA_QL("name") " (default is \"%s\")\n"
+            "  -p       parse only\n"
+            "  -s       strip debug information\n"
+            "  -v       show version information\n"
+            "  --       stop handling options\n"
+            "  -        stop handling options and process stdin\n"
+            , progname, Output);
+    exit(EXIT_FAILURE);
 }
 
 #define IS(s) (strcmp(argv[i],s)==0)
 
-static int doargs(int argc, char* argv[])
+static int doargs(int argc, char *argv[])
 {
- int i;
- int version=0;
- if (argv[0]!=NULL && *argv[0]!=0) progname=argv[0];
- for (i=1; i<argc; i++)
- {
-  if (*argv[i]!='-')                    /* end of options; keep it */
-   break;
-  else if (IS("--"))                    /* end of options; skip it */
-  {
-   ++i;
-   if (version) ++version;
-   break;
-  }
-  else if (IS("-"))                     /* end of options; use stdin */
-   break;
-  else if (IS("-l"))                    /* list */
-   ++listing;
-  else if (IS("-o"))                    /* output file */
-  {
-   output=argv[++i];
-   if (output==NULL || *output==0 || (*output=='-' && output[1]!=0))
-    usage(LUA_QL("-o") " needs argument");
-   if (IS("-")) output=NULL;
-  }
-  else if (IS("-p"))                    /* parse only */
-   dumping=0;
-  else if (IS("-s"))                    /* strip debug information */
-   stripping=1;
-  else if (IS("-v"))                    /* show version */
-   ++version;
-  else                                  /* unknown option */
-   usage(argv[i]);
- }
- if (i==argc && (listing || !dumping))
- {
-  dumping=0;
-  argv[--i]=Output;
- }
- if (version)
- {
-  printf("%s\n",LUA_COPYRIGHT);
-  if (version==argc-1) exit(EXIT_SUCCESS);
- }
- return i;
+    int i;
+    int version = 0;
+    if (argv[0] != NULL && *argv[0] != 0) progname = argv[0];
+    for (i = 1; i < argc; i++) {
+        if (*argv[i] != '-')                  /* end of options; keep it */
+            break;
+        else if (IS("--")) {                  /* end of options; skip it */
+            ++i;
+            if (version) ++version;
+            break;
+        } else if (IS("-"))                   /* end of options; use stdin */
+            break;
+        else if (IS("-l"))                    /* list */
+            ++listing;
+        else if (IS("-o")) {                  /* output file */
+            output = argv[++i];
+            if (output == NULL || *output == 0 || (*output == '-' && output[1] != 0))
+                usage(LUA_QL("-o") " needs argument");
+            if (IS("-")) output = NULL;
+        } else if (IS("-p"))                  /* parse only */
+            dumping = 0;
+        else if (IS("-s"))                    /* strip debug information */
+            stripping = 1;
+        else if (IS("-v"))                    /* show version */
+            ++version;
+        else                                  /* unknown option */
+            usage(argv[i]);
+    }
+    if (i == argc && (listing || !dumping)) {
+        dumping = 0;
+        argv[--i] = Output;
+    }
+    if (version) {
+        printf("%s\n", LUA_COPYRIGHT);
+        if (version == argc - 1) exit(EXIT_SUCCESS);
+    }
+    return i;
 }
 
 #define FUNCTION "(function()end)();"
 
-static const char* reader(lua_State *L, void *ud, size_t *size)
+static const char *reader(lua_State *L, void *ud, size_t *size)
 {
- UNUSED(L);
- if ((*(int*)ud)--)
- {
-  *size=sizeof(FUNCTION)-1;
-  return FUNCTION;
- }
- else
- {
-  *size=0;
-  return NULL;
- }
+    UNUSED(L);
+    if ((*(int *)ud)--) {
+        *size = sizeof(FUNCTION) - 1;
+        return FUNCTION;
+    } else {
+        *size = 0;
+        return NULL;
+    }
 }
 
 #define toproto(L,i) getproto(L->top+(i))
 
-static const Proto* combine(lua_State* L, int n)
+static const Proto *combine(lua_State *L, int n)
 {
- if (n==1)
-  return toproto(L,-1);
- else
- {
-  Proto* f;
-  int i=n;
-  if (lua_load(L,reader,&i,"=(" PROGNAME ")",NULL)!=LUA_OK) fatal(lua_tostring(L,-1));
-  f=toproto(L,-1);
-  for (i=0; i<n; i++)
-  {
-   f->p[i]=toproto(L,i-n-1);
-   if (f->p[i]->sizeupvalues>0) f->p[i]->upvalues[0].instack=0;
-  }
-  f->sizelineinfo=0;
-  return f;
- }
+    if (n == 1)
+        return toproto(L, -1);
+    else {
+        Proto *f;
+        int i = n;
+        if (lua_load(L, reader, &i, "=(" PROGNAME ")", NULL) != LUA_OK) fatal(lua_tostring(L, -1));
+        f = toproto(L, -1);
+        for (i = 0; i < n; i++) {
+            f->p[i] = toproto(L, i - n - 1);
+            if (f->p[i]->sizeupvalues > 0) f->p[i]->upvalues[0].instack = 0;
+        }
+        f->sizelineinfo = 0;
+        return f;
+    }
 }
 
-static int writer(lua_State* L, const void* p, size_t size, void* u)
+static int writer(lua_State *L, const void *p, size_t size, void *u)
 {
- UNUSED(L);
- return (fwrite(p,size,1,(FILE*)u)!=1) && (size!=0);
+    UNUSED(L);
+    return (fwrite(p, size, 1, (FILE *)u) != 1) && (size != 0);
 }
 
-static int pmain(lua_State* L)
+static int pmain(lua_State *L)
 {
- int argc=(int)lua_tointeger(L,1);
- char** argv=(char**)lua_touserdata(L,2);
- const Proto* f;
- int i;
- if (!lua_checkstack(L,argc)) fatal("too many input files");
- for (i=0; i<argc; i++)
- {
-  const char* filename=IS("-") ? NULL : argv[i];
-  if (luaL_loadfile(L,filename)!=LUA_OK) fatal(lua_tostring(L,-1));
- }
- f=combine(L,argc);
- if (listing) luaU_print(f,listing>1);
- if (dumping)
- {
-  FILE* D= (output==NULL) ? stdout : fopen(output,"wb");
-  if (D==NULL) cannot("open");
-  lua_lock(L);
-  luaU_dump(L,f,writer,D,stripping);
-  lua_unlock(L);
-  if (ferror(D)) cannot("write");
-  if (fclose(D)) cannot("close");
- }
- return 0;
+    int argc = (int)lua_tointeger(L, 1);
+    char **argv = (char **)lua_touserdata(L, 2);
+    const Proto *f;
+    int i;
+    if (!lua_checkstack(L, argc)) fatal("too many input files");
+    for (i = 0; i < argc; i++) {
+        const char *filename = IS("-") ? NULL : argv[i];
+        if (luaL_loadfile(L, filename) != LUA_OK) fatal(lua_tostring(L, -1));
+    }
+    f = combine(L, argc);
+    if (listing) luaU_print(f, listing > 1);
+    if (dumping) {
+        FILE *D = (output == NULL) ? stdout : fopen(output, "wb");
+        if (D == NULL) cannot("open");
+        lua_lock(L);
+        luaU_dump(L, f, writer, D, stripping);
+        lua_unlock(L);
+        if (ferror(D)) cannot("write");
+        if (fclose(D)) cannot("close");
+    }
+    return 0;
 }
 
-int main(int argc, char* argv[])
+int main(int argc, char *argv[])
 {
- lua_State* L;
- int i=doargs(argc,argv);
- argc-=i; argv+=i;
- if (argc<=0) usage("no input files given");
- L=luaL_newstate();
- if (L==NULL) fatal("cannot create state: not enough memory");
- lua_pushcfunction(L,&pmain);
- lua_pushinteger(L,argc);
- lua_pushlightuserdata(L,argv);
- if (lua_pcall(L,2,0,0)!=LUA_OK) fatal(lua_tostring(L,-1));
- lua_close(L);
- return EXIT_SUCCESS;
+    lua_State *L;
+    int i = doargs(argc, argv);
+    argc -= i;
+    argv += i;
+    if (argc <= 0) usage("no input files given");
+    L = luaL_newstate();
+    if (L == NULL) fatal("cannot create state: not enough memory");
+    lua_pushcfunction(L, &pmain);
+    lua_pushinteger(L, argc);
+    lua_pushlightuserdata(L, argv);
+    if (lua_pcall(L, 2, 0, 0) != LUA_OK) fatal(lua_tostring(L, -1));
+    lua_close(L);
+    return EXIT_SUCCESS;
 }
 
 /*
@@ -220,213 +207,228 @@ int main(int argc, char* argv[])
 
 #define VOID(p) ((const void*)(p))
 
-static void PrintString(const TString* ts)
+static void PrintString(const TString *ts)
 {
- const char* s=getstr(ts);
- size_t i,n=ts->tsv.len;
- printf("%c",'"');
- for (i=0; i<n; i++)
- {
-  int c=(int)(unsigned char)s[i];
-  switch (c)
-  {
-   case '"':  printf("\\\""); break;
-   case '\\': printf("\\\\"); break;
-   case '\a': printf("\\a"); break;
-   case '\b': printf("\\b"); break;
-   case '\f': printf("\\f"); break;
-   case '\n': printf("\\n"); break;
-   case '\r': printf("\\r"); break;
-   case '\t': printf("\\t"); break;
-   case '\v': printf("\\v"); break;
-   default: if (isprint(c))
-                printf("%c",c);
-            else
-                printf("\\%03d",c);
-  }
- }
- printf("%c",'"');
+    const char *s = getstr(ts);
+    size_t i, n = ts->tsv.len;
+    printf("%c", '"');
+    for (i = 0; i < n; i++) {
+        int c = (int)(unsigned char)s[i];
+        switch (c) {
+            case '"':
+                printf("\\\"");
+                break;
+            case '\\':
+                printf("\\\\");
+                break;
+            case '\a':
+                printf("\\a");
+                break;
+            case '\b':
+                printf("\\b");
+                break;
+            case '\f':
+                printf("\\f");
+                break;
+            case '\n':
+                printf("\\n");
+                break;
+            case '\r':
+                printf("\\r");
+                break;
+            case '\t':
+                printf("\\t");
+                break;
+            case '\v':
+                printf("\\v");
+                break;
+            default:
+                if (isprint(c))
+                    printf("%c", c);
+                else
+                    printf("\\%03d", c);
+        }
+    }
+    printf("%c", '"');
 }
 
-static void PrintConstant(const Proto* f, int i)
+static void PrintConstant(const Proto *f, int i)
 {
- const TValue* o=&f->k[i];
- switch (ttype(o))
- {
-  case LUA_TNIL:
-    printf("nil");
-    break;
-  case LUA_TBOOLEAN:
-    printf(bvalue(o) ? "true" : "false");
-    break;
-  case LUA_TNUMBER:
-    printf(LUA_NUMBER_FMT,nvalue(o));
-    break;
-  case LUA_TSTRING:
-    PrintString(rawtsvalue(o));
-    break;
-  default: /* cannot happen */
-    printf("? type=%d",ttype(o));
-    break;
- }
+    const TValue *o = &f->k[i];
+    switch (ttype(o)) {
+        case LUA_TNIL:
+            printf("nil");
+            break;
+        case LUA_TBOOLEAN:
+            printf(bvalue(o) ? "true" : "false");
+            break;
+        case LUA_TNUMBER:
+            printf(LUA_NUMBER_FMT, nvalue(o));
+            break;
+        case LUA_TSTRING:
+            PrintString(rawtsvalue(o));
+            break;
+        default: /* cannot happen */
+            printf("? type=%d", ttype(o));
+            break;
+    }
 }
 
 #define UPVALNAME(x) ((f->upvalues[x].name) ? getstr(f->upvalues[x].name) : "-")
 #define MYK(x) (-1-(x))
 
-static void PrintCode(const Proto* f)
+static void PrintCode(const Proto *f)
 {
- const Instruction* code=f->code;
- int pc,n=f->sizecode;
- for (pc=0; pc<n; pc++)
- {
-  Instruction i=code[pc];
-  OpCode o=GET_OPCODE(i);
-  int a=GETARG_A(i);
-  int b=GETARG_B(i);
-  int c=GETARG_C(i);
-  int ax=GETARG_Ax(i);
-  int bx=GETARG_Bx(i);
-  int sbx=GETARG_sBx(i);
-  int line=getfuncline(f,pc);
-  printf("\t%d\t",pc+1);
-  if (line>0) printf("[%d]\t",line); else printf("[-]\t");
-  printf("%-9s\t",luaP_opnames[o]);
-  switch (getOpMode(o))
-  {
-   case iABC:
-    printf("%d",a);
-    if (getBMode(o)!=OpArgN) printf(" %d",ISK(b) ? (MYK(INDEXK(b))) : b);
-    if (getCMode(o)!=OpArgN) printf(" %d",ISK(c) ? (MYK(INDEXK(c))) : c);
-    break;
-   case iABx:
-    printf("%d",a);
-    if (getBMode(o)==OpArgK) printf(" %d",MYK(bx));
-    if (getBMode(o)==OpArgU) printf(" %d",bx);
-    break;
-   case iAsBx:
-    printf("%d %d",a,sbx);
-    break;
-   case iAx:
-    printf("%d",MYK(ax));
-    break;
-  }
-  switch (o)
-  {
-   case OP_LOADK:
-    printf("\t; "); PrintConstant(f,bx);
-    break;
-   case OP_GETUPVAL:
-   case OP_SETUPVAL:
-    printf("\t; %s",UPVALNAME(b));
-    break;
-   case OP_GETTABUP:
-    printf("\t; %s",UPVALNAME(b));
-    if (ISK(c)) { printf(" "); PrintConstant(f,INDEXK(c)); }
-    break;
-   case OP_SETTABUP:
-    printf("\t; %s",UPVALNAME(a));
-    if (ISK(b)) { printf(" "); PrintConstant(f,INDEXK(b)); }
-    if (ISK(c)) { printf(" "); PrintConstant(f,INDEXK(c)); }
-    break;
-   case OP_GETTABLE:
-   case OP_SELF:
-    if (ISK(c)) { printf("\t; "); PrintConstant(f,INDEXK(c)); }
-    break;
-   case OP_SETTABLE:
-   case OP_ADD:
-   case OP_SUB:
-   case OP_MUL:
-   case OP_DIV:
-   case OP_POW:
-   case OP_EQ:
-   case OP_LT:
-   case OP_LE:
-    if (ISK(b) || ISK(c))
-    {
-     printf("\t; ");
-     if (ISK(b)) PrintConstant(f,INDEXK(b)); else printf("-");
-     printf(" ");
-     if (ISK(c)) PrintConstant(f,INDEXK(c)); else printf("-");
+    const Instruction *code = f->code;
+    int pc, n = f->sizecode;
+    for (pc = 0; pc < n; pc++) {
+        Instruction i = code[pc];
+        OpCode o = GET_OPCODE(i);
+        int a = GETARG_A(i);
+        int b = GETARG_B(i);
+        int c = GETARG_C(i);
+        int ax = GETARG_Ax(i);
+        int bx = GETARG_Bx(i);
+        int sbx = GETARG_sBx(i);
+        int line = getfuncline(f, pc);
+        printf("\t%d\t", pc + 1);
+        if (line > 0) printf("[%d]\t", line);
+        else printf("[-]\t");
+        printf("%-9s\t", luaP_opnames[o]);
+        switch (getOpMode(o)) {
+            case iABC:
+                printf("%d", a);
+                if (getBMode(o) != OpArgN) printf(" %d", ISK(b) ? (MYK(INDEXK(b))) : b);
+                if (getCMode(o) != OpArgN) printf(" %d", ISK(c) ? (MYK(INDEXK(c))) : c);
+                break;
+            case iABx:
+                printf("%d", a);
+                if (getBMode(o) == OpArgK) printf(" %d", MYK(bx));
+                if (getBMode(o) == OpArgU) printf(" %d", bx);
+                break;
+            case iAsBx:
+                printf("%d %d", a, sbx);
+                break;
+            case iAx:
+                printf("%d", MYK(ax));
+                break;
+        }
+        switch (o) {
+            case OP_LOADK:
+                printf("\t; ");
+                PrintConstant(f, bx);
+                break;
+            case OP_GETUPVAL:
+            case OP_SETUPVAL:
+                printf("\t; %s", UPVALNAME(b));
+                break;
+            case OP_GETTABUP:
+                printf("\t; %s", UPVALNAME(b));
+                if (ISK(c)) { printf(" "); PrintConstant(f, INDEXK(c)); }
+                break;
+            case OP_SETTABUP:
+                printf("\t; %s", UPVALNAME(a));
+                if (ISK(b)) { printf(" "); PrintConstant(f, INDEXK(b)); }
+                if (ISK(c)) { printf(" "); PrintConstant(f, INDEXK(c)); }
+                break;
+            case OP_GETTABLE:
+            case OP_SELF:
+                if (ISK(c)) { printf("\t; "); PrintConstant(f, INDEXK(c)); }
+                break;
+            case OP_SETTABLE:
+            case OP_ADD:
+            case OP_SUB:
+            case OP_MUL:
+            case OP_DIV:
+            case OP_POW:
+            case OP_EQ:
+            case OP_LT:
+            case OP_LE:
+                if (ISK(b) || ISK(c)) {
+                    printf("\t; ");
+                    if (ISK(b)) PrintConstant(f, INDEXK(b));
+                    else printf("-");
+                    printf(" ");
+                    if (ISK(c)) PrintConstant(f, INDEXK(c));
+                    else printf("-");
+                }
+                break;
+            case OP_JMP:
+            case OP_FORLOOP:
+            case OP_FORPREP:
+            case OP_TFORLOOP:
+                printf("\t; to %d", sbx + pc + 2);
+                break;
+            case OP_CLOSURE:
+                printf("\t; %p", VOID(f->p[bx]));
+                break;
+            case OP_SETLIST:
+                if (c == 0) printf("\t; %d", (int)code[++pc]);
+                else printf("\t; %d", c);
+                break;
+            case OP_EXTRAARG:
+                printf("\t; ");
+                PrintConstant(f, ax);
+                break;
+            default:
+                break;
+        }
+        printf("\n");
     }
-    break;
-   case OP_JMP:
-   case OP_FORLOOP:
-   case OP_FORPREP:
-   case OP_TFORLOOP:
-    printf("\t; to %d",sbx+pc+2);
-    break;
-   case OP_CLOSURE:
-    printf("\t; %p",VOID(f->p[bx]));
-    break;
-   case OP_SETLIST:
-    if (c==0) printf("\t; %d",(int)code[++pc]); else printf("\t; %d",c);
-    break;
-   case OP_EXTRAARG:
-    printf("\t; "); PrintConstant(f,ax);
-    break;
-   default:
-    break;
-  }
-  printf("\n");
- }
 }
 
 #define SS(x) ((x==1)?"":"s")
 #define S(x)  (int)(x),SS(x)
 
-static void PrintHeader(const Proto* f)
+static void PrintHeader(const Proto *f)
 {
- const char* s=f->source ? getstr(f->source) : "=?";
- if (*s=='@' || *s=='=')
-  s++;
- else if (*s==LUA_SIGNATURE[0])
-  s="(bstring)";
- else
-  s="(string)";
- printf("\n%s <%s:%d,%d> (%d instruction%s at %p)\n",
-    (f->linedefined==0)?"main":"function",s,
-    f->linedefined,f->lastlinedefined,
-    S(f->sizecode),VOID(f));
- printf("%d%s param%s, %d slot%s, %d upvalue%s, ",
-    (int)(f->numparams),f->is_vararg?"+":"",SS(f->numparams),
-    S(f->maxstacksize),S(f->sizeupvalues));
- printf("%d local%s, %d constant%s, %d function%s\n",
-    S(f->sizelocvars),S(f->sizek),S(f->sizep));
+    const char *s = f->source ? getstr(f->source) : "=?";
+    if (*s == '@' || *s == '=')
+        s++;
+    else if (*s == LUA_SIGNATURE[0])
+        s = "(bstring)";
+    else
+        s = "(string)";
+    printf("\n%s <%s:%d,%d> (%d instruction%s at %p)\n",
+           (f->linedefined == 0) ? "main" : "function", s,
+           f->linedefined, f->lastlinedefined,
+           S(f->sizecode), VOID(f));
+    printf("%d%s param%s, %d slot%s, %d upvalue%s, ",
+           (int)(f->numparams), f->is_vararg ? "+" : "", SS(f->numparams),
+           S(f->maxstacksize), S(f->sizeupvalues));
+    printf("%d local%s, %d constant%s, %d function%s\n",
+           S(f->sizelocvars), S(f->sizek), S(f->sizep));
 }
 
-static void PrintDebug(const Proto* f)
+static void PrintDebug(const Proto *f)
 {
- int i,n;
- n=f->sizek;
- printf("constants (%d) for %p:\n",n,VOID(f));
- for (i=0; i<n; i++)
- {
-  printf("\t%d\t",i+1);
-  PrintConstant(f,i);
-  printf("\n");
- }
- n=f->sizelocvars;
- printf("locals (%d) for %p:\n",n,VOID(f));
- for (i=0; i<n; i++)
- {
-  printf("\t%d\t%s\t%d\t%d\n",
-  i,getstr(f->locvars[i].varname),f->locvars[i].startpc+1,f->locvars[i].endpc+1);
- }
- n=f->sizeupvalues;
- printf("upvalues (%d) for %p:\n",n,VOID(f));
- for (i=0; i<n; i++)
- {
-  printf("\t%d\t%s\t%d\t%d\n",
-  i,UPVALNAME(i),f->upvalues[i].instack,f->upvalues[i].idx);
- }
+    int i, n;
+    n = f->sizek;
+    printf("constants (%d) for %p:\n", n, VOID(f));
+    for (i = 0; i < n; i++) {
+        printf("\t%d\t", i + 1);
+        PrintConstant(f, i);
+        printf("\n");
+    }
+    n = f->sizelocvars;
+    printf("locals (%d) for %p:\n", n, VOID(f));
+    for (i = 0; i < n; i++) {
+        printf("\t%d\t%s\t%d\t%d\n",
+               i, getstr(f->locvars[i].varname), f->locvars[i].startpc + 1, f->locvars[i].endpc + 1);
+    }
+    n = f->sizeupvalues;
+    printf("upvalues (%d) for %p:\n", n, VOID(f));
+    for (i = 0; i < n; i++) {
+        printf("\t%d\t%s\t%d\t%d\n",
+               i, UPVALNAME(i), f->upvalues[i].instack, f->upvalues[i].idx);
+    }
 }
 
-static void PrintFunction(const Proto* f, int full)
+static void PrintFunction(const Proto *f, int full)
 {
- int i,n=f->sizep;
- PrintHeader(f);
- PrintCode(f);
- if (full) PrintDebug(f);
- for (i=0; i<n; i++) PrintFunction(f->p[i],full);
+    int i, n = f->sizep;
+    PrintHeader(f);
+    PrintCode(f);
+    if (full) PrintDebug(f);
+    for (i = 0; i < n; i++) PrintFunction(f->p[i], full);
 }
diff --git a/liblua/luaconf.h b/liblua/luaconf.h
index f004c5a8a..676f91755 100644
--- a/liblua/luaconf.h
+++ b/liblua/luaconf.h
@@ -92,10 +92,10 @@
 #define LUA_LDIR "!\\lua\\"
 #define LUA_CDIR "!\\"
 #define LUA_PATH_DEFAULT  \
-        LUA_LDIR"?.lua;"  LUA_LDIR"?\\init.lua;" \
-        LUA_CDIR"?.lua;"  LUA_CDIR"?\\init.lua;" ".\\?.lua"
+    LUA_LDIR"?.lua;"  LUA_LDIR"?\\init.lua;" \
+    LUA_CDIR"?.lua;"  LUA_CDIR"?\\init.lua;" ".\\?.lua"
 #define LUA_CPATH_DEFAULT \
-        LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll;" ".\\?.dll"
+    LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll;" ".\\?.dll"
 
 #else               /* }{ */
 
@@ -104,10 +104,10 @@
 #define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR
 #define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR
 #define LUA_PATH_DEFAULT  \
-        LUA_LDIR"?.lua;"  LUA_LDIR"?/init.lua;" \
-        LUA_CDIR"?.lua;"  LUA_CDIR"?/init.lua;" "./?.lua"
+    LUA_LDIR"?.lua;"  LUA_LDIR"?/init.lua;" \
+    LUA_CDIR"?.lua;"  LUA_CDIR"?/init.lua;" "./?.lua"
 #define LUA_CPATH_DEFAULT \
-        LUA_CDIR"?.so;" LUA_CDIR"loadall.so;" "./?.so"
+    LUA_CDIR"?.so;" LUA_CDIR"loadall.so;" "./?.so"
 #endif              /* } */
 
 
diff --git a/liblua/lualib.h b/liblua/lualib.h
index 0a123aa2c..f6651cf0a 100644
--- a/liblua/lualib.h
+++ b/liblua/lualib.h
@@ -12,38 +12,38 @@
 
 
 
-LUAMOD_API int (luaopen_base) (lua_State *L);
+LUAMOD_API int (luaopen_base)(lua_State *L);
 
 #define LUA_COLIBNAME "coroutine"
-LUAMOD_API int (luaopen_coroutine) (lua_State *L);
+LUAMOD_API int (luaopen_coroutine)(lua_State *L);
 
 #define LUA_TABLIBNAME "table"
-LUAMOD_API int (luaopen_table) (lua_State *L);
+LUAMOD_API int (luaopen_table)(lua_State *L);
 
 #define LUA_IOLIBNAME "io"
-LUAMOD_API int (luaopen_io) (lua_State *L);
+LUAMOD_API int (luaopen_io)(lua_State *L);
 
 #define LUA_OSLIBNAME "os"
-LUAMOD_API int (luaopen_os) (lua_State *L);
+LUAMOD_API int (luaopen_os)(lua_State *L);
 
 #define LUA_STRLIBNAME "string"
-LUAMOD_API int (luaopen_string) (lua_State *L);
+LUAMOD_API int (luaopen_string)(lua_State *L);
 
 #define LUA_BITLIBNAME "bit32"
-LUAMOD_API int (luaopen_bit32) (lua_State *L);
+LUAMOD_API int (luaopen_bit32)(lua_State *L);
 
 #define LUA_MATHLIBNAME "math"
-LUAMOD_API int (luaopen_math) (lua_State *L);
+LUAMOD_API int (luaopen_math)(lua_State *L);
 
 #define LUA_DBLIBNAME "debug"
-LUAMOD_API int (luaopen_debug) (lua_State *L);
+LUAMOD_API int (luaopen_debug)(lua_State *L);
 
 #define LUA_LOADLIBNAME "package"
-LUAMOD_API int (luaopen_package) (lua_State *L);
+LUAMOD_API int (luaopen_package)(lua_State *L);
 
 
 /* open all previous libraries */
-LUALIB_API void (luaL_openlibs) (lua_State *L);
+LUALIB_API void (luaL_openlibs)(lua_State *L);
 
 
 
diff --git a/liblua/lundump.c b/liblua/lundump.c
index 0ee0f3527..b353d3717 100644
--- a/liblua/lundump.c
+++ b/liblua/lundump.c
@@ -21,16 +21,16 @@
 #include "lzio.h"
 
 typedef struct {
- lua_State* L;
- ZIO* Z;
- Mbuffer* b;
- const char* name;
+    lua_State *L;
+    ZIO *Z;
+    Mbuffer *b;
+    const char *name;
 } LoadState;
 
-static l_noret error(LoadState* S, const char* why)
+static l_noret error(LoadState *S, const char *why)
 {
- luaO_pushfstring(S->L,"%s: %s precompiled chunk",S->name,why);
- luaD_throw(S->L,LUA_ERRSYNTAX);
+    luaO_pushfstring(S->L, "%s: %s precompiled chunk", S->name, why);
+    luaD_throw(S->L, LUA_ERRSYNTAX);
 }
 
 #define LoadMem(S,b,n,size)    LoadBlock(S,b,(n)*(size))
@@ -42,143 +42,138 @@ static l_noret error(LoadState* S, const char* why)
 #define luai_verifycode(L,b,f) /* empty */
 #endif
 
-static void LoadBlock(LoadState* S, void* b, size_t size)
+static void LoadBlock(LoadState *S, void *b, size_t size)
 {
- if (luaZ_read(S->Z,b,size)!=0) error(S,"truncated");
+    if (luaZ_read(S->Z, b, size) != 0) error(S, "truncated");
 }
 
-static int LoadChar(LoadState* S)
+static int LoadChar(LoadState *S)
 {
- char x;
- LoadVar(S,x);
- return x;
+    char x;
+    LoadVar(S, x);
+    return x;
 }
 
-static int LoadInt(LoadState* S)
+static int LoadInt(LoadState *S)
 {
- int x;
- LoadVar(S,x);
- if (x<0) error(S,"corrupted");
- return x;
+    int x;
+    LoadVar(S, x);
+    if (x < 0) error(S, "corrupted");
+    return x;
 }
 
-static lua_Number LoadNumber(LoadState* S)
+static lua_Number LoadNumber(LoadState *S)
 {
- lua_Number x;
- LoadVar(S,x);
- return x;
+    lua_Number x;
+    LoadVar(S, x);
+    return x;
 }
 
-static TString* LoadString(LoadState* S)
+static TString *LoadString(LoadState *S)
 {
- size_t size;
- LoadVar(S,size);
- if (size==0)
-  return NULL;
- else
- {
-  char* s=luaZ_openspace(S->L,S->b,size);
-  LoadBlock(S,s,size*sizeof(char));
-  return luaS_newlstr(S->L,s,size-1); /* remove trailing '\0' */
- }
+    size_t size;
+    LoadVar(S, size);
+    if (size == 0)
+        return NULL;
+    else {
+        char *s = luaZ_openspace(S->L, S->b, size);
+        LoadBlock(S, s, size * sizeof(char));
+        return luaS_newlstr(S->L, s, size - 1); /* remove trailing '\0' */
+    }
 }
 
-static void LoadCode(LoadState* S, Proto* f)
+static void LoadCode(LoadState *S, Proto *f)
 {
- int n=LoadInt(S);
- f->code=luaM_newvector(S->L,n,Instruction);
- f->sizecode=n;
- LoadVector(S,f->code,n,sizeof(Instruction));
+    int n = LoadInt(S);
+    f->code = luaM_newvector(S->L, n, Instruction);
+    f->sizecode = n;
+    LoadVector(S, f->code, n, sizeof(Instruction));
 }
 
-static void LoadFunction(LoadState* S, Proto* f);
+static void LoadFunction(LoadState *S, Proto *f);
 
-static void LoadConstants(LoadState* S, Proto* f)
+static void LoadConstants(LoadState *S, Proto *f)
 {
- int i,n;
- n=LoadInt(S);
- f->k=luaM_newvector(S->L,n,TValue);
- f->sizek=n;
- for (i=0; i<n; i++) setnilvalue(&f->k[i]);
- for (i=0; i<n; i++)
- {
-  TValue* o=&f->k[i];
-  int t=LoadChar(S);
-  switch (t)
-  {
-   case LUA_TNIL:
-    setnilvalue(o);
-    break;
-   case LUA_TBOOLEAN:
-    setbvalue(o,LoadChar(S));
-    break;
-   case LUA_TNUMBER:
-    setnvalue(o,LoadNumber(S));
-    break;
-   case LUA_TSTRING:
-    setsvalue2n(S->L,o,LoadString(S));
-    break;
-    default: lua_assert(0);
-  }
- }
- n=LoadInt(S);
- f->p=luaM_newvector(S->L,n,Proto*);
- f->sizep=n;
- for (i=0; i<n; i++) f->p[i]=NULL;
- for (i=0; i<n; i++)
- {
-  f->p[i]=luaF_newproto(S->L);
-  LoadFunction(S,f->p[i]);
- }
+    int i, n;
+    n = LoadInt(S);
+    f->k = luaM_newvector(S->L, n, TValue);
+    f->sizek = n;
+    for (i = 0; i < n; i++) setnilvalue(&f->k[i]);
+    for (i = 0; i < n; i++) {
+        TValue *o = &f->k[i];
+        int t = LoadChar(S);
+        switch (t) {
+            case LUA_TNIL:
+                setnilvalue(o);
+                break;
+            case LUA_TBOOLEAN:
+                setbvalue(o, LoadChar(S));
+                break;
+            case LUA_TNUMBER:
+                setnvalue(o, LoadNumber(S));
+                break;
+            case LUA_TSTRING:
+                setsvalue2n(S->L, o, LoadString(S));
+                break;
+            default:
+                lua_assert(0);
+        }
+    }
+    n = LoadInt(S);
+    f->p = luaM_newvector(S->L, n, Proto *);
+    f->sizep = n;
+    for (i = 0; i < n; i++) f->p[i] = NULL;
+    for (i = 0; i < n; i++) {
+        f->p[i] = luaF_newproto(S->L);
+        LoadFunction(S, f->p[i]);
+    }
 }
 
-static void LoadUpvalues(LoadState* S, Proto* f)
+static void LoadUpvalues(LoadState *S, Proto *f)
 {
- int i,n;
- n=LoadInt(S);
- f->upvalues=luaM_newvector(S->L,n,Upvaldesc);
- f->sizeupvalues=n;
- for (i=0; i<n; i++) f->upvalues[i].name=NULL;
- for (i=0; i<n; i++)
- {
-  f->upvalues[i].instack=LoadByte(S);
-  f->upvalues[i].idx=LoadByte(S);
- }
+    int i, n;
+    n = LoadInt(S);
+    f->upvalues = luaM_newvector(S->L, n, Upvaldesc);
+    f->sizeupvalues = n;
+    for (i = 0; i < n; i++) f->upvalues[i].name = NULL;
+    for (i = 0; i < n; i++) {
+        f->upvalues[i].instack = LoadByte(S);
+        f->upvalues[i].idx = LoadByte(S);
+    }
 }
 
-static void LoadDebug(LoadState* S, Proto* f)
+static void LoadDebug(LoadState *S, Proto *f)
 {
- int i,n;
- f->source=LoadString(S);
- n=LoadInt(S);
- f->lineinfo=luaM_newvector(S->L,n,int);
- f->sizelineinfo=n;
- LoadVector(S,f->lineinfo,n,sizeof(int));
- n=LoadInt(S);
- f->locvars=luaM_newvector(S->L,n,LocVar);
- f->sizelocvars=n;
- for (i=0; i<n; i++) f->locvars[i].varname=NULL;
- for (i=0; i<n; i++)
- {
-  f->locvars[i].varname=LoadString(S);
-  f->locvars[i].startpc=LoadInt(S);
-  f->locvars[i].endpc=LoadInt(S);
- }
- n=LoadInt(S);
- for (i=0; i<n; i++) f->upvalues[i].name=LoadString(S);
+    int i, n;
+    f->source = LoadString(S);
+    n = LoadInt(S);
+    f->lineinfo = luaM_newvector(S->L, n, int);
+    f->sizelineinfo = n;
+    LoadVector(S, f->lineinfo, n, sizeof(int));
+    n = LoadInt(S);
+    f->locvars = luaM_newvector(S->L, n, LocVar);
+    f->sizelocvars = n;
+    for (i = 0; i < n; i++) f->locvars[i].varname = NULL;
+    for (i = 0; i < n; i++) {
+        f->locvars[i].varname = LoadString(S);
+        f->locvars[i].startpc = LoadInt(S);
+        f->locvars[i].endpc = LoadInt(S);
+    }
+    n = LoadInt(S);
+    for (i = 0; i < n; i++) f->upvalues[i].name = LoadString(S);
 }
 
-static void LoadFunction(LoadState* S, Proto* f)
+static void LoadFunction(LoadState *S, Proto *f)
 {
- f->linedefined=LoadInt(S);
- f->lastlinedefined=LoadInt(S);
- f->numparams=LoadByte(S);
- f->is_vararg=LoadByte(S);
- f->maxstacksize=LoadByte(S);
- LoadCode(S,f);
- LoadConstants(S,f);
- LoadUpvalues(S,f);
- LoadDebug(S,f);
+    f->linedefined = LoadInt(S);
+    f->lastlinedefined = LoadInt(S);
+    f->numparams = LoadByte(S);
+    f->is_vararg = LoadByte(S);
+    f->maxstacksize = LoadByte(S);
+    LoadCode(S, f);
+    LoadConstants(S, f);
+    LoadUpvalues(S, f);
+    LoadDebug(S, f);
 }
 
 /* the code below must be consistent with the code in luaU_header */
@@ -187,49 +182,50 @@ static void LoadFunction(LoadState* S, Proto* f)
 #define N2 N1+2
 #define N3 N2+6
 
-static void LoadHeader(LoadState* S)
+static void LoadHeader(LoadState *S)
 {
- lu_byte h[LUAC_HEADERSIZE];
- lu_byte s[LUAC_HEADERSIZE];
- luaU_header(h);
- memcpy(s,h,sizeof(char)); /* first char already read */
- LoadBlock(S,s+sizeof(char),LUAC_HEADERSIZE-sizeof(char));
- if (memcmp(h,s,N0)==0) return;
- if (memcmp(h,s,N1)!=0) error(S,"not a");
- if (memcmp(h,s,N2)!=0) error(S,"version mismatch in");
- if (memcmp(h,s,N3)!=0) error(S,"incompatible"); else error(S,"corrupted");
+    lu_byte h[LUAC_HEADERSIZE];
+    lu_byte s[LUAC_HEADERSIZE];
+    luaU_header(h);
+    memcpy(s, h, sizeof(char)); /* first char already read */
+    LoadBlock(S, s + sizeof(char), LUAC_HEADERSIZE - sizeof(char));
+    if (memcmp(h, s, N0) == 0) return;
+    if (memcmp(h, s, N1) != 0) error(S, "not a");
+    if (memcmp(h, s, N2) != 0) error(S, "version mismatch in");
+    if (memcmp(h, s, N3) != 0) error(S, "incompatible");
+    else error(S, "corrupted");
 }
 
 /*
 ** load precompiled chunk
 */
-Closure* luaU_undump (lua_State* L, ZIO* Z, Mbuffer* buff, const char* name)
+Closure *luaU_undump(lua_State *L, ZIO *Z, Mbuffer *buff, const char *name)
 {
- LoadState S;
- Closure* cl;
- if (*name=='@' || *name=='=')
-  S.name=name+1;
- else if (*name==LUA_SIGNATURE[0])
-  S.name="binary string";
- else
-  S.name=name;
- S.L=L;
- S.Z=Z;
- S.b=buff;
- LoadHeader(&S);
- cl=luaF_newLclosure(L,1);
- setclLvalue(L,L->top,cl); incr_top(L);
- cl->l.p=luaF_newproto(L);
- LoadFunction(&S,cl->l.p);
- if (cl->l.p->sizeupvalues != 1)
- {
-  Proto* p=cl->l.p;
-  cl=luaF_newLclosure(L,cl->l.p->sizeupvalues);
-  cl->l.p=p;
-  setclLvalue(L,L->top-1,cl);
- }
- luai_verifycode(L,buff,cl->l.p);
- return cl;
+    LoadState S;
+    Closure *cl;
+    if (*name == '@' || *name == '=')
+        S.name = name + 1;
+    else if (*name == LUA_SIGNATURE[0])
+        S.name = "binary string";
+    else
+        S.name = name;
+    S.L = L;
+    S.Z = Z;
+    S.b = buff;
+    LoadHeader(&S);
+    cl = luaF_newLclosure(L, 1);
+    setclLvalue(L, L->top, cl);
+    incr_top(L);
+    cl->l.p = luaF_newproto(L);
+    LoadFunction(&S, cl->l.p);
+    if (cl->l.p->sizeupvalues != 1) {
+        Proto *p = cl->l.p;
+        cl = luaF_newLclosure(L, cl->l.p->sizeupvalues);
+        cl->l.p = p;
+        setclLvalue(L, L->top - 1, cl);
+    }
+    luai_verifycode(L, buff, cl->l.p);
+    return cl;
 }
 
 #define MYINT(s) (s[0]-'0')
@@ -241,18 +237,18 @@ Closure* luaU_undump (lua_State* L, ZIO* Z, Mbuffer* buff, const char* name)
 * if you change the code below be sure to update LoadHeader and FORMAT above
 * and LUAC_HEADERSIZE in lundump.h
 */
-void luaU_header (lu_byte* h)
+void luaU_header(lu_byte *h)
 {
- int x=1;
- memcpy(h,LUA_SIGNATURE,sizeof(LUA_SIGNATURE)-sizeof(char));
- h+=sizeof(LUA_SIGNATURE)-sizeof(char);
- *h++=cast_byte(VERSION);
- *h++=cast_byte(FORMAT);
- *h++=cast_byte(*(char*)&x); /* endianness */
- *h++=cast_byte(sizeof(int));
- *h++=cast_byte(sizeof(size_t));
- *h++=cast_byte(sizeof(Instruction));
- *h++=cast_byte(sizeof(lua_Number));
- *h++=cast_byte(((lua_Number)0.5)==0); /* is lua_Number integral? */
- memcpy(h,LUAC_TAIL,sizeof(LUAC_TAIL)-sizeof(char));
+    int x = 1;
+    memcpy(h, LUA_SIGNATURE, sizeof(LUA_SIGNATURE) - sizeof(char));
+    h += sizeof(LUA_SIGNATURE) - sizeof(char);
+    *h++ = cast_byte(VERSION);
+    *h++ = cast_byte(FORMAT);
+    *h++ = cast_byte(*(char *)&x); /* endianness */
+    *h++ = cast_byte(sizeof(int));
+    *h++ = cast_byte(sizeof(size_t));
+    *h++ = cast_byte(sizeof(Instruction));
+    *h++ = cast_byte(sizeof(lua_Number));
+    *h++ = cast_byte(((lua_Number)0.5) == 0); /* is lua_Number integral? */
+    memcpy(h, LUAC_TAIL, sizeof(LUAC_TAIL) - sizeof(char));
 }
diff --git a/liblua/lundump.h b/liblua/lundump.h
index 9a0643d57..9bbeb484e 100644
--- a/liblua/lundump.h
+++ b/liblua/lundump.h
@@ -11,13 +11,13 @@
 #include "lzio.h"
 
 /* load one chunk; from lundump.c */
-LUAI_FUNC Closure* luaU_undump (lua_State* L, ZIO* Z, Mbuffer* buff, const char* name);
+LUAI_FUNC Closure *luaU_undump(lua_State *L, ZIO *Z, Mbuffer *buff, const char *name);
 
 /* make header; from lundump.c */
-LUAI_FUNC void luaU_header (lu_byte* h);
+LUAI_FUNC void luaU_header(lu_byte *h);
 
 /* dump one chunk; from ldump.c */
-LUAI_FUNC int luaU_dump (lua_State* L, const Proto* f, lua_Writer w, void* data, int strip);
+LUAI_FUNC int luaU_dump(lua_State *L, const Proto *f, lua_Writer w, void *data, int strip);
 
 /* data to catch conversion errors */
 #define LUAC_TAIL "\x19\x93\r\n\x1a\n"
diff --git a/liblua/lvm.c b/liblua/lvm.c
index 8e8f26636..1d0fc18c1 100644
--- a/liblua/lvm.c
+++ b/liblua/lvm.c
@@ -32,342 +32,362 @@
 #define MAXTAGLOOP 100
 
 
-const TValue *luaV_tonumber (const TValue *obj, TValue *n) {
-  lua_Number num;
-  if (ttisnumber(obj)) return obj;
-  if (ttisstring(obj) && luaO_str2d(svalue(obj), tsvalue(obj)->len, &num)) {
-    setnvalue(n, num);
-    return n;
-  }
-  else
+const TValue *luaV_tonumber(const TValue *obj, TValue *n)
+{
+    lua_Number num;
+    if (ttisnumber(obj)) return obj;
+    if (ttisstring(obj) && luaO_str2d(svalue(obj), tsvalue(obj)->len, &num)) {
+        setnvalue(n, num);
+        return n;
+    } else
+        return NULL;
+}
+
+
+int luaV_tostring(lua_State *L, StkId obj)
+{
+    if (!ttisnumber(obj))
+        return 0;
+    else {
+        char s[LUAI_MAXNUMBER2STR];
+        lua_Number n = nvalue(obj);
+        int l = lua_number2str(s, n);
+        setsvalue2s(L, obj, luaS_newlstr(L, s, l));
+        return 1;
+    }
+}
+
+
+static void traceexec(lua_State *L)
+{
+    CallInfo *ci = L->ci;
+    lu_byte mask = L->hookmask;
+    int counthook = ((mask & LUA_MASKCOUNT) && L->hookcount == 0);
+    if (counthook)
+        resethookcount(L);  /* reset count */
+    if (ci->callstatus & CIST_HOOKYIELD) {  /* called hook last time? */
+        ci->callstatus &= ~CIST_HOOKYIELD;  /* erase mark */
+        return;  /* do not call hook again (VM yielded, so it did not move) */
+    }
+    if (counthook)
+        luaD_hook(L, LUA_HOOKCOUNT, -1);  /* call count hook */
+    if (mask & LUA_MASKLINE) {
+        Proto *p = ci_func(ci)->p;
+        int npc = pcRel(ci->u.l.savedpc, p);
+        int newline = getfuncline(p, npc);
+        if (npc == 0 ||  /* call linehook when enter a new function, */
+            ci->u.l.savedpc <= L->oldpc ||  /* when jump back (loop), or when */
+            newline != getfuncline(p, pcRel(L->oldpc, p)))  /* enter a new line */
+            luaD_hook(L, LUA_HOOKLINE, newline);  /* call line hook */
+    }
+    L->oldpc = ci->u.l.savedpc;
+    if (L->status == LUA_YIELD) {  /* did hook yield? */
+        if (counthook)
+            L->hookcount = 1;  /* undo decrement to zero */
+        ci->u.l.savedpc--;  /* undo increment (resume will increment it again) */
+        ci->callstatus |= CIST_HOOKYIELD;  /* mark that it yielded */
+        ci->func = L->top - 1;  /* protect stack below results */
+        luaD_throw(L, LUA_YIELD);
+    }
+}
+
+
+static void callTM(lua_State *L, const TValue *f, const TValue *p1,
+                   const TValue *p2, TValue *p3, int hasres)
+{
+    ptrdiff_t result = savestack(L, p3);
+    setobj2s(L, L->top++, f);  /* push function */
+    setobj2s(L, L->top++, p1);  /* 1st argument */
+    setobj2s(L, L->top++, p2);  /* 2nd argument */
+    if (!hasres)  /* no result? 'p3' is third argument */
+        setobj2s(L, L->top++, p3);  /* 3rd argument */
+    /* metamethod may yield only when called from Lua code */
+    luaD_call(L, L->top - (4 - hasres), hasres, isLua(L->ci));
+    if (hasres) {  /* if has result, move it to its place */
+        p3 = restorestack(L, result);
+        setobjs2s(L, p3, --L->top);
+    }
+}
+
+
+void luaV_gettable(lua_State *L, const TValue *t, TValue *key, StkId val)
+{
+    int loop;
+    for (loop = 0; loop < MAXTAGLOOP; loop++) {
+        const TValue *tm;
+        if (ttistable(t)) {  /* `t' is a table? */
+            Table *h = hvalue(t);
+            const TValue *res = luaH_get(h, key); /* do a primitive get */
+            if (!ttisnil(res) ||  /* result is not nil? */
+                (tm = fasttm(L, h->metatable, TM_INDEX)) == NULL) { /* or no TM? */
+                setobj2s(L, val, res);
+                return;
+            }
+            /* else will try the tag method */
+        } else if (ttisnil(tm = luaT_gettmbyobj(L, t, TM_INDEX)))
+            luaG_typeerror(L, t, "index");
+        if (ttisfunction(tm)) {
+            callTM(L, tm, t, key, val, 1);
+            return;
+        }
+        t = tm;  /* else repeat with 'tm' */
+    }
+    luaG_runerror(L, "loop in gettable");
+}
+
+
+void luaV_settable(lua_State *L, const TValue *t, TValue *key, StkId val)
+{
+    int loop;
+    for (loop = 0; loop < MAXTAGLOOP; loop++) {
+        const TValue *tm;
+        if (ttistable(t)) {  /* `t' is a table? */
+            Table *h = hvalue(t);
+            TValue *oldval = cast(TValue *, luaH_get(h, key));
+            /* if previous value is not nil, there must be a previous entry
+               in the table; moreover, a metamethod has no relevance */
+            if (!ttisnil(oldval) ||
+                /* previous value is nil; must check the metamethod */
+                ((tm = fasttm(L, h->metatable, TM_NEWINDEX)) == NULL &&
+                 /* no metamethod; is there a previous entry in the table? */
+                 (oldval != luaO_nilobject ||
+                  /* no previous entry; must create one. (The next test is
+                     always true; we only need the assignment.) */
+                  (oldval = luaH_newkey(L, h, key), 1)))) {
+                /* no metamethod and (now) there is an entry with given key */
+                setobj2t(L, oldval, val);  /* assign new value to that entry */
+                invalidateTMcache(h);
+                luaC_barrierback(L, obj2gco(h), val);
+                return;
+            }
+            /* else will try the metamethod */
+        } else /* not a table; check metamethod */
+            if (ttisnil(tm = luaT_gettmbyobj(L, t, TM_NEWINDEX)))
+                luaG_typeerror(L, t, "index");
+        /* there is a metamethod */
+        if (ttisfunction(tm)) {
+            callTM(L, tm, t, key, val, 0);
+            return;
+        }
+        t = tm;  /* else repeat with 'tm' */
+    }
+    luaG_runerror(L, "loop in settable");
+}
+
+
+static int call_binTM(lua_State *L, const TValue *p1, const TValue *p2,
+                      StkId res, TMS event)
+{
+    const TValue *tm = luaT_gettmbyobj(L, p1, event);  /* try first operand */
+    if (ttisnil(tm))
+        tm = luaT_gettmbyobj(L, p2, event);  /* try second operand */
+    if (ttisnil(tm)) return 0;
+    callTM(L, tm, p1, p2, res, 1);
+    return 1;
+}
+
+
+static const TValue *get_equalTM(lua_State *L, Table *mt1, Table *mt2,
+                                 TMS event)
+{
+    const TValue *tm1 = fasttm(L, mt1, event);
+    const TValue *tm2;
+    if (tm1 == NULL) return NULL;  /* no metamethod */
+    if (mt1 == mt2) return tm1;  /* same metatables => same metamethods */
+    tm2 = fasttm(L, mt2, event);
+    if (tm2 == NULL) return NULL;  /* no metamethod */
+    if (luaV_rawequalobj(tm1, tm2))  /* same metamethods? */
+        return tm1;
     return NULL;
 }
 
 
-int luaV_tostring (lua_State *L, StkId obj) {
-  if (!ttisnumber(obj))
-    return 0;
-  else {
-    char s[LUAI_MAXNUMBER2STR];
-    lua_Number n = nvalue(obj);
-    int l = lua_number2str(s, n);
-    setsvalue2s(L, obj, luaS_newlstr(L, s, l));
-    return 1;
-  }
+static int call_orderTM(lua_State *L, const TValue *p1, const TValue *p2,
+                        TMS event)
+{
+    if (!call_binTM(L, p1, p2, L->top, event))
+        return -1;  /* no metamethod */
+    else
+        return !l_isfalse(L->top);
 }
 
 
-static void traceexec (lua_State *L) {
-  CallInfo *ci = L->ci;
-  lu_byte mask = L->hookmask;
-  int counthook = ((mask & LUA_MASKCOUNT) && L->hookcount == 0);
-  if (counthook)
-    resethookcount(L);  /* reset count */
-  if (ci->callstatus & CIST_HOOKYIELD) {  /* called hook last time? */
-    ci->callstatus &= ~CIST_HOOKYIELD;  /* erase mark */
-    return;  /* do not call hook again (VM yielded, so it did not move) */
-  }
-  if (counthook)
-    luaD_hook(L, LUA_HOOKCOUNT, -1);  /* call count hook */
-  if (mask & LUA_MASKLINE) {
-    Proto *p = ci_func(ci)->p;
-    int npc = pcRel(ci->u.l.savedpc, p);
-    int newline = getfuncline(p, npc);
-    if (npc == 0 ||  /* call linehook when enter a new function, */
-        ci->u.l.savedpc <= L->oldpc ||  /* when jump back (loop), or when */
-        newline != getfuncline(p, pcRel(L->oldpc, p)))  /* enter a new line */
-      luaD_hook(L, LUA_HOOKLINE, newline);  /* call line hook */
-  }
-  L->oldpc = ci->u.l.savedpc;
-  if (L->status == LUA_YIELD) {  /* did hook yield? */
-    if (counthook)
-      L->hookcount = 1;  /* undo decrement to zero */
-    ci->u.l.savedpc--;  /* undo increment (resume will increment it again) */
-    ci->callstatus |= CIST_HOOKYIELD;  /* mark that it yielded */
-    ci->func = L->top - 1;  /* protect stack below results */
-    luaD_throw(L, LUA_YIELD);
-  }
-}
-
-
-static void callTM (lua_State *L, const TValue *f, const TValue *p1,
-                    const TValue *p2, TValue *p3, int hasres) {
-  ptrdiff_t result = savestack(L, p3);
-  setobj2s(L, L->top++, f);  /* push function */
-  setobj2s(L, L->top++, p1);  /* 1st argument */
-  setobj2s(L, L->top++, p2);  /* 2nd argument */
-  if (!hasres)  /* no result? 'p3' is third argument */
-    setobj2s(L, L->top++, p3);  /* 3rd argument */
-  /* metamethod may yield only when called from Lua code */
-  luaD_call(L, L->top - (4 - hasres), hasres, isLua(L->ci));
-  if (hasres) {  /* if has result, move it to its place */
-    p3 = restorestack(L, result);
-    setobjs2s(L, p3, --L->top);
-  }
-}
-
-
-void luaV_gettable (lua_State *L, const TValue *t, TValue *key, StkId val) {
-  int loop;
-  for (loop = 0; loop < MAXTAGLOOP; loop++) {
-    const TValue *tm;
-    if (ttistable(t)) {  /* `t' is a table? */
-      Table *h = hvalue(t);
-      const TValue *res = luaH_get(h, key); /* do a primitive get */
-      if (!ttisnil(res) ||  /* result is not nil? */
-          (tm = fasttm(L, h->metatable, TM_INDEX)) == NULL) { /* or no TM? */
-        setobj2s(L, val, res);
-        return;
-      }
-      /* else will try the tag method */
+static int l_strcmp(const TString *ls, const TString *rs)
+{
+    const char *l = getstr(ls);
+    size_t ll = ls->tsv.len;
+    const char *r = getstr(rs);
+    size_t lr = rs->tsv.len;
+    for (;;) {
+        int temp = strcoll(l, r);
+        if (temp != 0) return temp;
+        else {  /* strings are equal up to a `\0' */
+            size_t len = strlen(l);  /* index of first `\0' in both strings */
+            if (len == lr)  /* r is finished? */
+                return (len == ll) ? 0 : 1;
+            else if (len == ll)  /* l is finished? */
+                return -1;  /* l is smaller than r (because r is not finished) */
+            /* both strings longer than `len'; go on comparing (after the `\0') */
+            len++;
+            l += len;
+            ll -= len;
+            r += len;
+            lr -= len;
+        }
     }
-    else if (ttisnil(tm = luaT_gettmbyobj(L, t, TM_INDEX)))
-      luaG_typeerror(L, t, "index");
-    if (ttisfunction(tm)) {
-      callTM(L, tm, t, key, val, 1);
-      return;
-    }
-    t = tm;  /* else repeat with 'tm' */
-  }
-  luaG_runerror(L, "loop in gettable");
 }
 
 
-void luaV_settable (lua_State *L, const TValue *t, TValue *key, StkId val) {
-  int loop;
-  for (loop = 0; loop < MAXTAGLOOP; loop++) {
-    const TValue *tm;
-    if (ttistable(t)) {  /* `t' is a table? */
-      Table *h = hvalue(t);
-      TValue *oldval = cast(TValue *, luaH_get(h, key));
-      /* if previous value is not nil, there must be a previous entry
-         in the table; moreover, a metamethod has no relevance */
-      if (!ttisnil(oldval) ||
-         /* previous value is nil; must check the metamethod */
-         ((tm = fasttm(L, h->metatable, TM_NEWINDEX)) == NULL &&
-         /* no metamethod; is there a previous entry in the table? */
-         (oldval != luaO_nilobject ||
-         /* no previous entry; must create one. (The next test is
-            always true; we only need the assignment.) */
-         (oldval = luaH_newkey(L, h, key), 1)))) {
-        /* no metamethod and (now) there is an entry with given key */
-        setobj2t(L, oldval, val);  /* assign new value to that entry */
-        invalidateTMcache(h);
-        luaC_barrierback(L, obj2gco(h), val);
-        return;
-      }
-      /* else will try the metamethod */
-    }
-    else  /* not a table; check metamethod */
-      if (ttisnil(tm = luaT_gettmbyobj(L, t, TM_NEWINDEX)))
-        luaG_typeerror(L, t, "index");
-    /* there is a metamethod */
-    if (ttisfunction(tm)) {
-      callTM(L, tm, t, key, val, 0);
-      return;
-    }
-    t = tm;  /* else repeat with 'tm' */
-  }
-  luaG_runerror(L, "loop in settable");
-}
-
-
-static int call_binTM (lua_State *L, const TValue *p1, const TValue *p2,
-                       StkId res, TMS event) {
-  const TValue *tm = luaT_gettmbyobj(L, p1, event);  /* try first operand */
-  if (ttisnil(tm))
-    tm = luaT_gettmbyobj(L, p2, event);  /* try second operand */
-  if (ttisnil(tm)) return 0;
-  callTM(L, tm, p1, p2, res, 1);
-  return 1;
-}
-
-
-static const TValue *get_equalTM (lua_State *L, Table *mt1, Table *mt2,
-                                  TMS event) {
-  const TValue *tm1 = fasttm(L, mt1, event);
-  const TValue *tm2;
-  if (tm1 == NULL) return NULL;  /* no metamethod */
-  if (mt1 == mt2) return tm1;  /* same metatables => same metamethods */
-  tm2 = fasttm(L, mt2, event);
-  if (tm2 == NULL) return NULL;  /* no metamethod */
-  if (luaV_rawequalobj(tm1, tm2))  /* same metamethods? */
-    return tm1;
-  return NULL;
-}
-
-
-static int call_orderTM (lua_State *L, const TValue *p1, const TValue *p2,
-                         TMS event) {
-  if (!call_binTM(L, p1, p2, L->top, event))
-    return -1;  /* no metamethod */
-  else
-    return !l_isfalse(L->top);
-}
-
-
-static int l_strcmp (const TString *ls, const TString *rs) {
-  const char *l = getstr(ls);
-  size_t ll = ls->tsv.len;
-  const char *r = getstr(rs);
-  size_t lr = rs->tsv.len;
-  for (;;) {
-    int temp = strcoll(l, r);
-    if (temp != 0) return temp;
-    else {  /* strings are equal up to a `\0' */
-      size_t len = strlen(l);  /* index of first `\0' in both strings */
-      if (len == lr)  /* r is finished? */
-        return (len == ll) ? 0 : 1;
-      else if (len == ll)  /* l is finished? */
-        return -1;  /* l is smaller than r (because r is not finished) */
-      /* both strings longer than `len'; go on comparing (after the `\0') */
-      len++;
-      l += len; ll -= len; r += len; lr -= len;
-    }
-  }
-}
-
-
-int luaV_lessthan (lua_State *L, const TValue *l, const TValue *r) {
-  int res;
-  if (ttisnumber(l) && ttisnumber(r))
-    return luai_numlt(L, nvalue(l), nvalue(r));
-  else if (ttisstring(l) && ttisstring(r))
-    return l_strcmp(rawtsvalue(l), rawtsvalue(r)) < 0;
-  else if ((res = call_orderTM(L, l, r, TM_LT)) < 0)
-    luaG_ordererror(L, l, r);
-  return res;
-}
-
-
-int luaV_lessequal (lua_State *L, const TValue *l, const TValue *r) {
-  int res;
-  if (ttisnumber(l) && ttisnumber(r))
-    return luai_numle(L, nvalue(l), nvalue(r));
-  else if (ttisstring(l) && ttisstring(r))
-    return l_strcmp(rawtsvalue(l), rawtsvalue(r)) <= 0;
-  else if ((res = call_orderTM(L, l, r, TM_LE)) >= 0)  /* first try `le' */
+int luaV_lessthan(lua_State *L, const TValue *l, const TValue *r)
+{
+    int res;
+    if (ttisnumber(l) && ttisnumber(r))
+        return luai_numlt(L, nvalue(l), nvalue(r));
+    else if (ttisstring(l) && ttisstring(r))
+        return l_strcmp(rawtsvalue(l), rawtsvalue(r)) < 0;
+    else if ((res = call_orderTM(L, l, r, TM_LT)) < 0)
+        luaG_ordererror(L, l, r);
     return res;
-  else if ((res = call_orderTM(L, r, l, TM_LT)) < 0)  /* else try `lt' */
-    luaG_ordererror(L, l, r);
-  return !res;
+}
+
+
+int luaV_lessequal(lua_State *L, const TValue *l, const TValue *r)
+{
+    int res;
+    if (ttisnumber(l) && ttisnumber(r))
+        return luai_numle(L, nvalue(l), nvalue(r));
+    else if (ttisstring(l) && ttisstring(r))
+        return l_strcmp(rawtsvalue(l), rawtsvalue(r)) <= 0;
+    else if ((res = call_orderTM(L, l, r, TM_LE)) >= 0)  /* first try `le' */
+        return res;
+    else if ((res = call_orderTM(L, r, l, TM_LT)) < 0)  /* else try `lt' */
+        luaG_ordererror(L, l, r);
+    return !res;
 }
 
 
 /*
 ** equality of Lua values. L == NULL means raw equality (no metamethods)
 */
-int luaV_equalobj_ (lua_State *L, const TValue *t1, const TValue *t2) {
-  const TValue *tm;
-  lua_assert(ttisequal(t1, t2));
-  switch (ttype(t1)) {
-    case LUA_TNIL: return 1;
-    case LUA_TNUMBER: return luai_numeq(nvalue(t1), nvalue(t2));
-    case LUA_TBOOLEAN: return bvalue(t1) == bvalue(t2);  /* true must be 1 !! */
-    case LUA_TLIGHTUSERDATA: return pvalue(t1) == pvalue(t2);
-    case LUA_TLCF: return fvalue(t1) == fvalue(t2);
-    case LUA_TSHRSTR: return eqshrstr(rawtsvalue(t1), rawtsvalue(t2));
-    case LUA_TLNGSTR: return luaS_eqlngstr(rawtsvalue(t1), rawtsvalue(t2));
-    case LUA_TUSERDATA: {
-      if (uvalue(t1) == uvalue(t2)) return 1;
-      else if (L == NULL) return 0;
-      tm = get_equalTM(L, uvalue(t1)->metatable, uvalue(t2)->metatable, TM_EQ);
-      break;  /* will try TM */
+int luaV_equalobj_(lua_State *L, const TValue *t1, const TValue *t2)
+{
+    const TValue *tm;
+    lua_assert(ttisequal(t1, t2));
+    switch (ttype(t1)) {
+        case LUA_TNIL:
+            return 1;
+        case LUA_TNUMBER:
+            return luai_numeq(nvalue(t1), nvalue(t2));
+        case LUA_TBOOLEAN:
+            return bvalue(t1) == bvalue(t2);  /* true must be 1 !! */
+        case LUA_TLIGHTUSERDATA:
+            return pvalue(t1) == pvalue(t2);
+        case LUA_TLCF:
+            return fvalue(t1) == fvalue(t2);
+        case LUA_TSHRSTR:
+            return eqshrstr(rawtsvalue(t1), rawtsvalue(t2));
+        case LUA_TLNGSTR:
+            return luaS_eqlngstr(rawtsvalue(t1), rawtsvalue(t2));
+        case LUA_TUSERDATA: {
+            if (uvalue(t1) == uvalue(t2)) return 1;
+            else if (L == NULL) return 0;
+            tm = get_equalTM(L, uvalue(t1)->metatable, uvalue(t2)->metatable, TM_EQ);
+            break;  /* will try TM */
+        }
+        case LUA_TTABLE: {
+            if (hvalue(t1) == hvalue(t2)) return 1;
+            else if (L == NULL) return 0;
+            tm = get_equalTM(L, hvalue(t1)->metatable, hvalue(t2)->metatable, TM_EQ);
+            break;  /* will try TM */
+        }
+        default:
+            lua_assert(iscollectable(t1));
+            return gcvalue(t1) == gcvalue(t2);
     }
-    case LUA_TTABLE: {
-      if (hvalue(t1) == hvalue(t2)) return 1;
-      else if (L == NULL) return 0;
-      tm = get_equalTM(L, hvalue(t1)->metatable, hvalue(t2)->metatable, TM_EQ);
-      break;  /* will try TM */
-    }
-    default:
-      lua_assert(iscollectable(t1));
-      return gcvalue(t1) == gcvalue(t2);
-  }
-  if (tm == NULL) return 0;  /* no TM? */
-  callTM(L, tm, t1, t2, L->top, 1);  /* call TM */
-  return !l_isfalse(L->top);
+    if (tm == NULL) return 0;  /* no TM? */
+    callTM(L, tm, t1, t2, L->top, 1);  /* call TM */
+    return !l_isfalse(L->top);
 }
 
 
-void luaV_concat (lua_State *L, int total) {
-  lua_assert(total >= 2);
-  do {
-    StkId top = L->top;
-    int n = 2;  /* number of elements handled in this pass (at least 2) */
-    if (!(ttisstring(top-2) || ttisnumber(top-2)) || !tostring(L, top-1)) {
-      if (!call_binTM(L, top-2, top-1, top-2, TM_CONCAT))
-        luaG_concaterror(L, top-2, top-1);
-    }
-    else if (tsvalue(top-1)->len == 0)  /* second operand is empty? */
-      (void)tostring(L, top - 2);  /* result is first operand */
-    else if (ttisstring(top-2) && tsvalue(top-2)->len == 0) {
-      setobjs2s(L, top - 2, top - 1);  /* result is second op. */
-    }
-    else {
-      /* at least two non-empty string values; get as many as possible */
-      size_t tl = tsvalue(top-1)->len;
-      char *buffer;
-      int i;
-      /* collect total length */
-      for (i = 1; i < total && tostring(L, top-i-1); i++) {
-        size_t l = tsvalue(top-i-1)->len;
-        if (l >= (MAX_SIZET/sizeof(char)) - tl)
-          luaG_runerror(L, "string length overflow");
-        tl += l;
-      }
-      buffer = luaZ_openspace(L, &G(L)->buff, tl);
-      tl = 0;
-      n = i;
-      do {  /* concat all strings */
-        size_t l = tsvalue(top-i)->len;
-        memcpy(buffer+tl, svalue(top-i), l * sizeof(char));
-        tl += l;
-      } while (--i > 0);
-      setsvalue2s(L, top-n, luaS_newlstr(L, buffer, tl));
-    }
-    total -= n-1;  /* got 'n' strings to create 1 new */
-    L->top -= n-1;  /* popped 'n' strings and pushed one */
-  } while (total > 1);  /* repeat until only 1 result left */
+void luaV_concat(lua_State *L, int total)
+{
+    lua_assert(total >= 2);
+    do {
+        StkId top = L->top;
+        int n = 2;  /* number of elements handled in this pass (at least 2) */
+        if (!(ttisstring(top - 2) || ttisnumber(top - 2)) || !tostring(L, top - 1)) {
+            if (!call_binTM(L, top - 2, top - 1, top - 2, TM_CONCAT))
+                luaG_concaterror(L, top - 2, top - 1);
+        } else if (tsvalue(top - 1)->len == 0) /* second operand is empty? */
+            (void)tostring(L, top - 2);  /* result is first operand */
+        else if (ttisstring(top - 2) && tsvalue(top - 2)->len == 0) {
+            setobjs2s(L, top - 2, top - 1);  /* result is second op. */
+        } else {
+            /* at least two non-empty string values; get as many as possible */
+            size_t tl = tsvalue(top - 1)->len;
+            char *buffer;
+            int i;
+            /* collect total length */
+            for (i = 1; i < total && tostring(L, top - i - 1); i++) {
+                size_t l = tsvalue(top - i - 1)->len;
+                if (l >= (MAX_SIZET / sizeof(char)) - tl)
+                    luaG_runerror(L, "string length overflow");
+                tl += l;
+            }
+            buffer = luaZ_openspace(L, &G(L)->buff, tl);
+            tl = 0;
+            n = i;
+            do {  /* concat all strings */
+                size_t l = tsvalue(top - i)->len;
+                memcpy(buffer + tl, svalue(top - i), l * sizeof(char));
+                tl += l;
+            } while (--i > 0);
+            setsvalue2s(L, top - n, luaS_newlstr(L, buffer, tl));
+        }
+        total -= n - 1; /* got 'n' strings to create 1 new */
+        L->top -= n - 1; /* popped 'n' strings and pushed one */
+    } while (total > 1);  /* repeat until only 1 result left */
 }
 
 
-void luaV_objlen (lua_State *L, StkId ra, const TValue *rb) {
-  const TValue *tm;
-  switch (ttypenv(rb)) {
-    case LUA_TTABLE: {
-      Table *h = hvalue(rb);
-      tm = fasttm(L, h->metatable, TM_LEN);
-      if (tm) break;  /* metamethod? break switch to call it */
-      setnvalue(ra, cast_num(luaH_getn(h)));  /* else primitive len */
-      return;
+void luaV_objlen(lua_State *L, StkId ra, const TValue *rb)
+{
+    const TValue *tm;
+    switch (ttypenv(rb)) {
+        case LUA_TTABLE: {
+            Table *h = hvalue(rb);
+            tm = fasttm(L, h->metatable, TM_LEN);
+            if (tm) break;  /* metamethod? break switch to call it */
+            setnvalue(ra, cast_num(luaH_getn(h)));  /* else primitive len */
+            return;
+        }
+        case LUA_TSTRING: {
+            setnvalue(ra, cast_num(tsvalue(rb)->len));
+            return;
+        }
+        default: {  /* try metamethod */
+            tm = luaT_gettmbyobj(L, rb, TM_LEN);
+            if (ttisnil(tm))  /* no metamethod? */
+                luaG_typeerror(L, rb, "get length of");
+            break;
+        }
     }
-    case LUA_TSTRING: {
-      setnvalue(ra, cast_num(tsvalue(rb)->len));
-      return;
-    }
-    default: {  /* try metamethod */
-      tm = luaT_gettmbyobj(L, rb, TM_LEN);
-      if (ttisnil(tm))  /* no metamethod? */
-        luaG_typeerror(L, rb, "get length of");
-      break;
-    }
-  }
-  callTM(L, tm, rb, rb, ra, 1);
+    callTM(L, tm, rb, rb, ra, 1);
 }
 
 
-void luaV_arith (lua_State *L, StkId ra, const TValue *rb,
-                 const TValue *rc, TMS op) {
-  TValue tempb, tempc;
-  const TValue *b, *c;
-  if ((b = luaV_tonumber(rb, &tempb)) != NULL &&
-      (c = luaV_tonumber(rc, &tempc)) != NULL) {
-    lua_Number res = luaO_arith(op - TM_ADD + LUA_OPADD, nvalue(b), nvalue(c));
-    setnvalue(ra, res);
-  }
-  else if (!call_binTM(L, rb, rc, ra, op))
-    luaG_aritherror(L, rb, rc);
+void luaV_arith(lua_State *L, StkId ra, const TValue *rb,
+                const TValue *rc, TMS op)
+{
+    TValue tempb, tempc;
+    const TValue *b, *c;
+    if ((b = luaV_tonumber(rb, &tempb)) != NULL &&
+        (c = luaV_tonumber(rc, &tempc)) != NULL) {
+        lua_Number res = luaO_arith(op - TM_ADD + LUA_OPADD, nvalue(b), nvalue(c));
+        setnvalue(ra, res);
+    } else if (!call_binTM(L, rb, rc, ra, op))
+        luaG_aritherror(L, rb, rc);
 }
 
 
@@ -376,19 +396,20 @@ void luaV_arith (lua_State *L, StkId ra, const TValue *rb,
 ** whether there is a cached closure with the same upvalues needed by
 ** new closure to be created.
 */
-static Closure *getcached (Proto *p, UpVal **encup, StkId base) {
-  Closure *c = p->cache;
-  if (c != NULL) {  /* is there a cached closure? */
-    int nup = p->sizeupvalues;
-    Upvaldesc *uv = p->upvalues;
-    int i;
-    for (i = 0; i < nup; i++) {  /* check whether it has right upvalues */
-      TValue *v = uv[i].instack ? base + uv[i].idx : encup[uv[i].idx]->v;
-      if (c->l.upvals[i]->v != v)
-        return NULL;  /* wrong upvalue; cannot reuse closure */
+static Closure *getcached(Proto *p, UpVal **encup, StkId base)
+{
+    Closure *c = p->cache;
+    if (c != NULL) {  /* is there a cached closure? */
+        int nup = p->sizeupvalues;
+        Upvaldesc *uv = p->upvalues;
+        int i;
+        for (i = 0; i < nup; i++) {  /* check whether it has right upvalues */
+            TValue *v = uv[i].instack ? base + uv[i].idx : encup[uv[i].idx]->v;
+            if (c->l.upvals[i]->v != v)
+                return NULL;  /* wrong upvalue; cannot reuse closure */
+        }
     }
-  }
-  return c;  /* return cached closure (or NULL if no cached closure) */
+    return c;  /* return cached closure (or NULL if no cached closure) */
 }
 
 
@@ -398,81 +419,96 @@ static Closure *getcached (Proto *p, UpVal **encup, StkId base) {
 ** before the assignment to 'p->cache', as the function needs the
 ** original value of that field.
 */
-static void pushclosure (lua_State *L, Proto *p, UpVal **encup, StkId base,
-                         StkId ra) {
-  int nup = p->sizeupvalues;
-  Upvaldesc *uv = p->upvalues;
-  int i;
-  Closure *ncl = luaF_newLclosure(L, nup);
-  ncl->l.p = p;
-  setclLvalue(L, ra, ncl);  /* anchor new closure in stack */
-  for (i = 0; i < nup; i++) {  /* fill in its upvalues */
-    if (uv[i].instack)  /* upvalue refers to local variable? */
-      ncl->l.upvals[i] = luaF_findupval(L, base + uv[i].idx);
-    else  /* get upvalue from enclosing function */
-      ncl->l.upvals[i] = encup[uv[i].idx];
-  }
-  luaC_barrierproto(L, p, ncl);
-  p->cache = ncl;  /* save it on cache for reuse */
+static void pushclosure(lua_State *L, Proto *p, UpVal **encup, StkId base,
+                        StkId ra)
+{
+    int nup = p->sizeupvalues;
+    Upvaldesc *uv = p->upvalues;
+    int i;
+    Closure *ncl = luaF_newLclosure(L, nup);
+    ncl->l.p = p;
+    setclLvalue(L, ra, ncl);  /* anchor new closure in stack */
+    for (i = 0; i < nup; i++) {  /* fill in its upvalues */
+        if (uv[i].instack)  /* upvalue refers to local variable? */
+            ncl->l.upvals[i] = luaF_findupval(L, base + uv[i].idx);
+        else  /* get upvalue from enclosing function */
+            ncl->l.upvals[i] = encup[uv[i].idx];
+    }
+    luaC_barrierproto(L, p, ncl);
+    p->cache = ncl;  /* save it on cache for reuse */
 }
 
 
 /*
 ** finish execution of an opcode interrupted by an yield
 */
-void luaV_finishOp (lua_State *L) {
-  CallInfo *ci = L->ci;
-  StkId base = ci->u.l.base;
-  Instruction inst = *(ci->u.l.savedpc - 1);  /* interrupted instruction */
-  OpCode op = GET_OPCODE(inst);
-  switch (op) {  /* finish its execution */
-    case OP_ADD: case OP_SUB: case OP_MUL: case OP_DIV:
-    case OP_MOD: case OP_POW: case OP_UNM: case OP_LEN:
-    case OP_GETTABUP: case OP_GETTABLE: case OP_SELF: {
-      setobjs2s(L, base + GETARG_A(inst), --L->top);
-      break;
+void luaV_finishOp(lua_State *L)
+{
+    CallInfo *ci = L->ci;
+    StkId base = ci->u.l.base;
+    Instruction inst = *(ci->u.l.savedpc - 1);  /* interrupted instruction */
+    OpCode op = GET_OPCODE(inst);
+    switch (op) {  /* finish its execution */
+        case OP_ADD:
+        case OP_SUB:
+        case OP_MUL:
+        case OP_DIV:
+        case OP_MOD:
+        case OP_POW:
+        case OP_UNM:
+        case OP_LEN:
+        case OP_GETTABUP:
+        case OP_GETTABLE:
+        case OP_SELF: {
+            setobjs2s(L, base + GETARG_A(inst), --L->top);
+            break;
+        }
+        case OP_LE:
+        case OP_LT:
+        case OP_EQ: {
+            int res = !l_isfalse(L->top - 1);
+            L->top--;
+            /* metamethod should not be called when operand is K */
+            lua_assert(!ISK(GETARG_B(inst)));
+            if (op == OP_LE &&  /* "<=" using "<" instead? */
+                ttisnil(luaT_gettmbyobj(L, base + GETARG_B(inst), TM_LE)))
+                res = !res;  /* invert result */
+            lua_assert(GET_OPCODE(*ci->u.l.savedpc) == OP_JMP);
+            if (res != GETARG_A(inst))  /* condition failed? */
+                ci->u.l.savedpc++;  /* skip jump instruction */
+            break;
+        }
+        case OP_CONCAT: {
+            StkId top = L->top - 1;  /* top when 'call_binTM' was called */
+            int b = GETARG_B(inst);      /* first element to concatenate */
+            int total = cast_int(top - 1 - (base + b));  /* yet to concatenate */
+            setobj2s(L, top - 2, top);  /* put TM result in proper position */
+            if (total > 1) {  /* are there elements to concat? */
+                L->top = top - 1;  /* top is one after last element (at top-2) */
+                luaV_concat(L, total);  /* concat them (may yield again) */
+            }
+            /* move final result to final position */
+            setobj2s(L, ci->u.l.base + GETARG_A(inst), L->top - 1);
+            L->top = ci->top;  /* restore top */
+            break;
+        }
+        case OP_TFORCALL: {
+            lua_assert(GET_OPCODE(*ci->u.l.savedpc) == OP_TFORLOOP);
+            L->top = ci->top;  /* correct top */
+            break;
+        }
+        case OP_CALL: {
+            if (GETARG_C(inst) - 1 >= 0)  /* nresults >= 0? */
+                L->top = ci->top;  /* adjust results */
+            break;
+        }
+        case OP_TAILCALL:
+        case OP_SETTABUP:
+        case OP_SETTABLE:
+            break;
+        default:
+            lua_assert(0);
     }
-    case OP_LE: case OP_LT: case OP_EQ: {
-      int res = !l_isfalse(L->top - 1);
-      L->top--;
-      /* metamethod should not be called when operand is K */
-      lua_assert(!ISK(GETARG_B(inst)));
-      if (op == OP_LE &&  /* "<=" using "<" instead? */
-          ttisnil(luaT_gettmbyobj(L, base + GETARG_B(inst), TM_LE)))
-        res = !res;  /* invert result */
-      lua_assert(GET_OPCODE(*ci->u.l.savedpc) == OP_JMP);
-      if (res != GETARG_A(inst))  /* condition failed? */
-        ci->u.l.savedpc++;  /* skip jump instruction */
-      break;
-    }
-    case OP_CONCAT: {
-      StkId top = L->top - 1;  /* top when 'call_binTM' was called */
-      int b = GETARG_B(inst);      /* first element to concatenate */
-      int total = cast_int(top - 1 - (base + b));  /* yet to concatenate */
-      setobj2s(L, top - 2, top);  /* put TM result in proper position */
-      if (total > 1) {  /* are there elements to concat? */
-        L->top = top - 1;  /* top is one after last element (at top-2) */
-        luaV_concat(L, total);  /* concat them (may yield again) */
-      }
-      /* move final result to final position */
-      setobj2s(L, ci->u.l.base + GETARG_A(inst), L->top - 1);
-      L->top = ci->top;  /* restore top */
-      break;
-    }
-    case OP_TFORCALL: {
-      lua_assert(GET_OPCODE(*ci->u.l.savedpc) == OP_TFORLOOP);
-      L->top = ci->top;  /* correct top */
-      break;
-    }
-    case OP_CALL: {
-      if (GETARG_C(inst) - 1 >= 0)  /* nresults >= 0? */
-        L->top = ci->top;  /* adjust results */
-      break;
-    }
-    case OP_TAILCALL: case OP_SETTABUP: case OP_SETTABLE:
-      break;
-    default: lua_assert(0);
-  }
 }
 
 
@@ -491,18 +527,18 @@ void luaV_finishOp (lua_State *L) {
 #define RB(i)  check_exp(getBMode(GET_OPCODE(i)) == OpArgR, base+GETARG_B(i))
 #define RC(i)  check_exp(getCMode(GET_OPCODE(i)) == OpArgR, base+GETARG_C(i))
 #define RKB(i) check_exp(getBMode(GET_OPCODE(i)) == OpArgK, \
-    ISK(GETARG_B(i)) ? k+INDEXK(GETARG_B(i)) : base+GETARG_B(i))
+                         ISK(GETARG_B(i)) ? k+INDEXK(GETARG_B(i)) : base+GETARG_B(i))
 #define RKC(i) check_exp(getCMode(GET_OPCODE(i)) == OpArgK, \
-    ISK(GETARG_C(i)) ? k+INDEXK(GETARG_C(i)) : base+GETARG_C(i))
+                         ISK(GETARG_C(i)) ? k+INDEXK(GETARG_C(i)) : base+GETARG_C(i))
 #define KBx(i)  \
-  (k + (GETARG_Bx(i) != 0 ? GETARG_Bx(i) - 1 : GETARG_Ax(*ci->u.l.savedpc++)))
+    (k + (GETARG_Bx(i) != 0 ? GETARG_Bx(i) - 1 : GETARG_Ax(*ci->u.l.savedpc++)))
 
 
 /* execute a jump instruction */
 #define dojump(ci,i,e) \
-  { int a = GETARG_A(i); \
-    if (a > 0) luaF_close(L, ci->u.l.base + a - 1); \
-    ci->u.l.savedpc += GETARG_sBx(i) + e; }
+    { int a = GETARG_A(i); \
+        if (a > 0) luaF_close(L, ci->u.l.base + a - 1); \
+        ci->u.l.savedpc += GETARG_sBx(i) + e; }
 
 /* for test instructions, execute the jump instruction that follows it */
 #define donextjump(ci) { i = *ci->u.l.savedpc; dojump(ci, i, 1); }
@@ -511,18 +547,18 @@ void luaV_finishOp (lua_State *L) {
 #define Protect(x) { {x;}; base = ci->u.l.base; }
 
 #define checkGC(L,c)  \
-  Protect( luaC_condGC(L,{L->top = (c);  /* limit of live values */ \
-                          luaC_step(L); \
-                          L->top = ci->top;})  /* restore top */ \
-           luai_threadyield(L); )
+    Protect( luaC_condGC(L,{L->top = (c);  /* limit of live values */ \
+                            luaC_step(L); \
+                            L->top = ci->top;})  /* restore top */ \
+             luai_threadyield(L); )
 
 
 #define arith_op(op,tm) { \
         TValue *rb = RKB(i); \
         TValue *rc = RKC(i); \
         if (ttisnumber(rb) && ttisnumber(rc)) { \
-          lua_Number nb = nvalue(rb), nc = nvalue(rc); \
-          setnvalue(ra, op(L, nb, nc)); \
+            lua_Number nb = nvalue(rb), nc = nvalue(rc); \
+            setnvalue(ra, op(L, nb, nc)); \
         } \
         else { Protect(luaV_arith(L, ra, rb, rc, tm)); } }
 
@@ -531,337 +567,335 @@ void luaV_finishOp (lua_State *L) {
 #define vmcase(l,b)   case l: {b}  break;
 #define vmcasenb(l,b) case l: {b} /* nb = no break */
 
-void luaV_execute (lua_State *L) {
-  CallInfo *ci = L->ci;
-  LClosure *cl;
-  TValue *k;
-  StkId base;
- newframe:  /* reentry point when frame changes (call/return) */
-  lua_assert(ci == L->ci);
-  cl = clLvalue(ci->func);
-  k = cl->p->k;
-  base = ci->u.l.base;
-  /* main loop of interpreter */
-  for (;;) {
-    Instruction i = *(ci->u.l.savedpc++);
-    StkId ra;
-    if ((L->hookmask & (LUA_MASKLINE | LUA_MASKCOUNT)) &&
-        (--L->hookcount == 0 || L->hookmask & LUA_MASKLINE)) {
-      Protect(traceexec(L));
-    }
-    /* WARNING: several calls may realloc the stack and invalidate `ra' */
-    ra = RA(i);
-    lua_assert(base == ci->u.l.base);
-    lua_assert(base <= L->top && L->top < L->stack + L->stacksize);
-    vmdispatch (GET_OPCODE(i)) {
-      vmcase(OP_MOVE,
-        setobjs2s(L, ra, RB(i));
-      )
-      vmcase(OP_LOADK,
-        TValue *rb = k + GETARG_Bx(i);
-        setobj2s(L, ra, rb);
-      )
-      vmcase(OP_LOADKX,
-        TValue *rb;
-        lua_assert(GET_OPCODE(*ci->u.l.savedpc) == OP_EXTRAARG);
-        rb = k + GETARG_Ax(*ci->u.l.savedpc++);
-        setobj2s(L, ra, rb);
-      )
-      vmcase(OP_LOADBOOL,
-        setbvalue(ra, GETARG_B(i));
-        if (GETARG_C(i)) ci->u.l.savedpc++;  /* skip next instruction (if C) */
-      )
-      vmcase(OP_LOADNIL,
-        int b = GETARG_B(i);
-        do {
-          setnilvalue(ra++);
-        } while (b--);
-      )
-      vmcase(OP_GETUPVAL,
-        int b = GETARG_B(i);
-        setobj2s(L, ra, cl->upvals[b]->v);
-      )
-      vmcase(OP_GETTABUP,
-        int b = GETARG_B(i);
-        Protect(luaV_gettable(L, cl->upvals[b]->v, RKC(i), ra));
-      )
-      vmcase(OP_GETTABLE,
-        Protect(luaV_gettable(L, RB(i), RKC(i), ra));
-      )
-      vmcase(OP_SETTABUP,
-        int a = GETARG_A(i);
-        Protect(luaV_settable(L, cl->upvals[a]->v, RKB(i), RKC(i)));
-      )
-      vmcase(OP_SETUPVAL,
-        UpVal *uv = cl->upvals[GETARG_B(i)];
-        setobj(L, uv->v, ra);
-        luaC_barrier(L, uv, ra);
-      )
-      vmcase(OP_SETTABLE,
-        Protect(luaV_settable(L, ra, RKB(i), RKC(i)));
-      )
-      vmcase(OP_NEWTABLE,
-        int b = GETARG_B(i);
-        int c = GETARG_C(i);
-        Table *t = luaH_new(L);
-        sethvalue(L, ra, t);
-        if (b != 0 || c != 0)
-          luaH_resize(L, t, luaO_fb2int(b), luaO_fb2int(c));
-        checkGC(L, ra + 1);
-      )
-      vmcase(OP_SELF,
-        StkId rb = RB(i);
-        setobjs2s(L, ra+1, rb);
-        Protect(luaV_gettable(L, rb, RKC(i), ra));
-      )
-      vmcase(OP_ADD,
-        arith_op(luai_numadd, TM_ADD);
-      )
-      vmcase(OP_SUB,
-        arith_op(luai_numsub, TM_SUB);
-      )
-      vmcase(OP_MUL,
-        arith_op(luai_nummul, TM_MUL);
-      )
-      vmcase(OP_DIV,
-        arith_op(luai_numdiv, TM_DIV);
-      )
-      vmcase(OP_MOD,
-        arith_op(luai_nummod, TM_MOD);
-      )
-      vmcase(OP_POW,
-        arith_op(luai_numpow, TM_POW);
-      )
-      vmcase(OP_UNM,
-        TValue *rb = RB(i);
-        if (ttisnumber(rb)) {
-          lua_Number nb = nvalue(rb);
-          setnvalue(ra, luai_numunm(L, nb));
+void luaV_execute(lua_State *L)
+{
+    CallInfo *ci = L->ci;
+    LClosure *cl;
+    TValue *k;
+    StkId base;
+newframe:  /* reentry point when frame changes (call/return) */
+    lua_assert(ci == L->ci);
+    cl = clLvalue(ci->func);
+    k = cl->p->k;
+    base = ci->u.l.base;
+    /* main loop of interpreter */
+    for (;;) {
+        Instruction i = *(ci->u.l.savedpc++);
+        StkId ra;
+        if ((L->hookmask & (LUA_MASKLINE | LUA_MASKCOUNT)) &&
+            (--L->hookcount == 0 || L->hookmask & LUA_MASKLINE)) {
+            Protect(traceexec(L));
         }
-        else {
-          Protect(luaV_arith(L, ra, rb, rb, TM_UNM));
-        }
-      )
-      vmcase(OP_NOT,
-        TValue *rb = RB(i);
-        int res = l_isfalse(rb);  /* next assignment may change this value */
-        setbvalue(ra, res);
-      )
-      vmcase(OP_LEN,
-        Protect(luaV_objlen(L, ra, RB(i)));
-      )
-      vmcase(OP_CONCAT,
-        int b = GETARG_B(i);
-        int c = GETARG_C(i);
-        StkId rb;
-        L->top = base + c + 1;  /* mark the end of concat operands */
-        Protect(luaV_concat(L, c - b + 1));
-        ra = RA(i);  /* 'luav_concat' may invoke TMs and move the stack */
-        rb = b + base;
-        setobjs2s(L, ra, rb);
-        checkGC(L, (ra >= rb ? ra + 1 : rb));
-        L->top = ci->top;  /* restore top */
-      )
-      vmcase(OP_JMP,
-        dojump(ci, i, 0);
-      )
-      vmcase(OP_EQ,
-        TValue *rb = RKB(i);
-        TValue *rc = RKC(i);
-        Protect(
-          if (cast_int(equalobj(L, rb, rc)) != GETARG_A(i))
-            ci->u.l.savedpc++;
-          else
-            donextjump(ci);
-        )
-      )
-      vmcase(OP_LT,
-        Protect(
-          if (luaV_lessthan(L, RKB(i), RKC(i)) != GETARG_A(i))
-            ci->u.l.savedpc++;
-          else
-            donextjump(ci);
-        )
-      )
-      vmcase(OP_LE,
-        Protect(
-          if (luaV_lessequal(L, RKB(i), RKC(i)) != GETARG_A(i))
-            ci->u.l.savedpc++;
-          else
-            donextjump(ci);
-        )
-      )
-      vmcase(OP_TEST,
-        if (GETARG_C(i) ? l_isfalse(ra) : !l_isfalse(ra))
-            ci->u.l.savedpc++;
-          else
-          donextjump(ci);
-      )
-      vmcase(OP_TESTSET,
-        TValue *rb = RB(i);
-        if (GETARG_C(i) ? l_isfalse(rb) : !l_isfalse(rb))
-          ci->u.l.savedpc++;
-        else {
-          setobjs2s(L, ra, rb);
-          donextjump(ci);
-        }
-      )
-      vmcase(OP_CALL,
-        int b = GETARG_B(i);
-        int nresults = GETARG_C(i) - 1;
-        if (b != 0) L->top = ra+b;  /* else previous instruction set top */
-        if (luaD_precall(L, ra, nresults)) {  /* C function? */
-          if (nresults >= 0) L->top = ci->top;  /* adjust results */
-          base = ci->u.l.base;
-        }
-        else {  /* Lua function */
-          ci = L->ci;
-          ci->callstatus |= CIST_REENTRY;
-          goto newframe;  /* restart luaV_execute over new Lua function */
-        }
-      )
-      vmcase(OP_TAILCALL,
-        int b = GETARG_B(i);
-        if (b != 0) L->top = ra+b;  /* else previous instruction set top */
-        lua_assert(GETARG_C(i) - 1 == LUA_MULTRET);
-        if (luaD_precall(L, ra, LUA_MULTRET))  /* C function? */
-          base = ci->u.l.base;
-        else {
-          /* tail call: put called frame (n) in place of caller one (o) */
-          CallInfo *nci = L->ci;  /* called frame */
-          CallInfo *oci = nci->previous;  /* caller frame */
-          StkId nfunc = nci->func;  /* called function */
-          StkId ofunc = oci->func;  /* caller function */
-          /* last stack slot filled by 'precall' */
-          StkId lim = nci->u.l.base + getproto(nfunc)->numparams;
-          int aux;
-          /* close all upvalues from previous call */
-          if (cl->p->sizep > 0) luaF_close(L, oci->u.l.base);
-          /* move new frame into old one */
-          for (aux = 0; nfunc + aux < lim; aux++)
-            setobjs2s(L, ofunc + aux, nfunc + aux);
-          oci->u.l.base = ofunc + (nci->u.l.base - nfunc);  /* correct base */
-          oci->top = L->top = ofunc + (L->top - nfunc);  /* correct top */
-          oci->u.l.savedpc = nci->u.l.savedpc;
-          oci->callstatus |= CIST_TAIL;  /* function was tail called */
-          ci = L->ci = oci;  /* remove new frame */
-          lua_assert(L->top == oci->u.l.base + getproto(ofunc)->maxstacksize);
-          goto newframe;  /* restart luaV_execute over new Lua function */
-        }
-      )
-      vmcasenb(OP_RETURN,
-        int b = GETARG_B(i);
-        if (b != 0) L->top = ra+b-1;
-        if (cl->p->sizep > 0) luaF_close(L, base);
-        b = luaD_poscall(L, ra);
-        if (!(ci->callstatus & CIST_REENTRY))  /* 'ci' still the called one */
-          return;  /* external invocation: return */
-        else {  /* invocation via reentry: continue execution */
-          ci = L->ci;
-          if (b) L->top = ci->top;
-          lua_assert(isLua(ci));
-          lua_assert(GET_OPCODE(*((ci)->u.l.savedpc - 1)) == OP_CALL);
-          goto newframe;  /* restart luaV_execute over new Lua function */
-        }
-      )
-      vmcase(OP_FORLOOP,
-        lua_Number step = nvalue(ra+2);
-        lua_Number idx = luai_numadd(L, nvalue(ra), step); /* increment index */
-        lua_Number limit = nvalue(ra+1);
-        if (luai_numlt(L, 0, step) ? luai_numle(L, idx, limit)
-                                   : luai_numle(L, limit, idx)) {
-          ci->u.l.savedpc += GETARG_sBx(i);  /* jump back */
-          setnvalue(ra, idx);  /* update internal index... */
-          setnvalue(ra+3, idx);  /* ...and external index */
-        }
-      )
-      vmcase(OP_FORPREP,
-        const TValue *init = ra;
-        const TValue *plimit = ra+1;
-        const TValue *pstep = ra+2;
-        if (!tonumber(init, ra))
-          luaG_runerror(L, LUA_QL("for") " initial value must be a number");
-        else if (!tonumber(plimit, ra+1))
-          luaG_runerror(L, LUA_QL("for") " limit must be a number");
-        else if (!tonumber(pstep, ra+2))
-          luaG_runerror(L, LUA_QL("for") " step must be a number");
-        setnvalue(ra, luai_numsub(L, nvalue(ra), nvalue(pstep)));
-        ci->u.l.savedpc += GETARG_sBx(i);
-      )
-      vmcasenb(OP_TFORCALL,
-        StkId cb = ra + 3;  /* call base */
-        setobjs2s(L, cb+2, ra+2);
-        setobjs2s(L, cb+1, ra+1);
-        setobjs2s(L, cb, ra);
-        L->top = cb + 3;  /* func. + 2 args (state and index) */
-        Protect(luaD_call(L, cb, GETARG_C(i), 1));
-        L->top = ci->top;
-        i = *(ci->u.l.savedpc++);  /* go to next instruction */
+        /* WARNING: several calls may realloc the stack and invalidate `ra' */
         ra = RA(i);
-        lua_assert(GET_OPCODE(i) == OP_TFORLOOP);
-        goto l_tforloop;
-      )
-      vmcase(OP_TFORLOOP,
-        l_tforloop:
-        if (!ttisnil(ra + 1)) {  /* continue loop? */
-          setobjs2s(L, ra, ra + 1);  /* save control variable */
-           ci->u.l.savedpc += GETARG_sBx(i);  /* jump back */
+        lua_assert(base == ci->u.l.base);
+        lua_assert(base <= L->top && L->top < L->stack + L->stacksize);
+        vmdispatch(GET_OPCODE(i)) {
+            vmcase(OP_MOVE,
+                   setobjs2s(L, ra, RB(i));
+                  )
+            vmcase(OP_LOADK,
+                   TValue *rb = k + GETARG_Bx(i);
+                   setobj2s(L, ra, rb);
+                  )
+            vmcase(OP_LOADKX,
+                   TValue * rb;
+                   lua_assert(GET_OPCODE(*ci->u.l.savedpc) == OP_EXTRAARG);
+                   rb = k + GETARG_Ax(*ci->u.l.savedpc++);
+                   setobj2s(L, ra, rb);
+                  )
+            vmcase(OP_LOADBOOL,
+                   setbvalue(ra, GETARG_B(i));
+                   if (GETARG_C(i)) ci->u.l.savedpc++;  /* skip next instruction (if C) */
+                  )
+                vmcase(OP_LOADNIL,
+                       int b = GETARG_B(i);
+                do {
+                    setnilvalue(ra++);
+                } while (b--);
+                      )
+                    vmcase(OP_GETUPVAL,
+                           int b = GETARG_B(i);
+                           setobj2s(L, ra, cl->upvals[b]->v);
+                          )
+                    vmcase(OP_GETTABUP,
+                           int b = GETARG_B(i);
+                           Protect(luaV_gettable(L, cl->upvals[b]->v, RKC(i), ra));
+                          )
+                    vmcase(OP_GETTABLE,
+                           Protect(luaV_gettable(L, RB(i), RKC(i), ra));
+                          )
+                    vmcase(OP_SETTABUP,
+                           int a = GETARG_A(i);
+                           Protect(luaV_settable(L, cl->upvals[a]->v, RKB(i), RKC(i)));
+                          )
+                    vmcase(OP_SETUPVAL,
+                           UpVal *uv = cl->upvals[GETARG_B(i)];
+                           setobj(L, uv->v, ra);
+                           luaC_barrier(L, uv, ra);
+                          )
+                    vmcase(OP_SETTABLE,
+                           Protect(luaV_settable(L, ra, RKB(i), RKC(i)));
+                          )
+                    vmcase(OP_NEWTABLE,
+                           int b = GETARG_B(i);
+                           int c = GETARG_C(i);
+                           Table *t = luaH_new(L);
+                           sethvalue(L, ra, t);
+                           if (b != 0 || c != 0)
+                           luaH_resize(L, t, luaO_fb2int(b), luaO_fb2int(c));
+                           checkGC(L, ra + 1);
+                          )
+                        vmcase(OP_SELF,
+                               StkId rb = RB(i);
+                               setobjs2s(L, ra + 1, rb);
+                               Protect(luaV_gettable(L, rb, RKC(i), ra));
+                              )
+                        vmcase(OP_ADD,
+                               arith_op(luai_numadd, TM_ADD);
+                              )
+                        vmcase(OP_SUB,
+                               arith_op(luai_numsub, TM_SUB);
+                              )
+                        vmcase(OP_MUL,
+                               arith_op(luai_nummul, TM_MUL);
+                              )
+                        vmcase(OP_DIV,
+                               arith_op(luai_numdiv, TM_DIV);
+                              )
+                        vmcase(OP_MOD,
+                               arith_op(luai_nummod, TM_MOD);
+                              )
+                        vmcase(OP_POW,
+                               arith_op(luai_numpow, TM_POW);
+                              )
+                        vmcase(OP_UNM,
+                               TValue *rb = RB(i);
+                        if (ttisnumber(rb)) {
+                        lua_Number nb = nvalue(rb);
+                            setnvalue(ra, luai_numunm(L, nb));
+                        } else {
+                            Protect(luaV_arith(L, ra, rb, rb, TM_UNM));
+                        }
+                  )
+            vmcase(OP_NOT,
+                   TValue *rb = RB(i);
+                   int res = l_isfalse(rb);  /* next assignment may change this value */
+                   setbvalue(ra, res);
+                  )
+            vmcase(OP_LEN,
+                   Protect(luaV_objlen(L, ra, RB(i)));
+                  )
+            vmcase(OP_CONCAT,
+                   int b = GETARG_B(i);
+                   int c = GETARG_C(i);
+                   StkId rb;
+                   L->top = base + c + 1;  /* mark the end of concat operands */
+                   Protect(luaV_concat(L, c - b + 1));
+                   ra = RA(i);  /* 'luav_concat' may invoke TMs and move the stack */
+                   rb = b + base;
+                   setobjs2s(L, ra, rb);
+                   checkGC(L, (ra >= rb ? ra + 1 : rb));
+                   L->top = ci->top;  /* restore top */
+                  )
+            vmcase(OP_JMP,
+                   dojump(ci, i, 0);
+                  )
+            vmcase(OP_EQ,
+                   TValue *rb = RKB(i);
+                   TValue *rc = RKC(i);
+                   Protect(
+                       if (cast_int(equalobj(L, rb, rc)) != GETARG_A(i))
+                       ci->u.l.savedpc++;
+                               else
+                                   donextjump(ci);
+                               )
+                              )
+                            vmcase(OP_LT,
+                                   Protect(
+                                       if (luaV_lessthan(L, RKB(i), RKC(i)) != GETARG_A(i))
+                                       ci->u.l.savedpc++;
+                                       else
+                                           donextjump(ci);
+                                       )
+                                      )
+                                    vmcase(OP_LE,
+                                           Protect(
+                                               if (luaV_lessequal(L, RKB(i), RKC(i)) != GETARG_A(i))
+                                               ci->u.l.savedpc++;
+                                               else
+                                                   donextjump(ci);
+                                               )
+                                              )
+                                            vmcase(OP_TEST,
+                                                   if (GETARG_C(i) ? l_isfalse(ra) : !l_isfalse(ra))
+                                                   ci->u.l.savedpc++;
+                                                   else
+                                                       donextjump(ci);
+                                                      )
+                                                    vmcase(OP_TESTSET,
+                                                           TValue *rb = RB(i);
+                                                           if (GETARG_C(i) ? l_isfalse(rb) : !l_isfalse(rb))
+                                                           ci->u.l.savedpc++;
+                                                    else {
+                                                        setobjs2s(L, ra, rb);
+                                                            donextjump(ci);
+                                                        }
+                  )
+            vmcase(OP_CALL,
+                   int b = GETARG_B(i);
+                   int nresults = GETARG_C(i) - 1;
+                   if (b != 0) L->top = ra + b; /* else previous instruction set top */
+            if (luaD_precall(L, ra, nresults)) {  /* C function? */
+                if (nresults >= 0) L->top = ci->top;  /* adjust results */
+                    base = ci->u.l.base;
+                } else { /* Lua function */
+                    ci = L->ci;
+                    ci->callstatus |= CIST_REENTRY;
+                    goto newframe;  /* restart luaV_execute over new Lua function */
+                }
+                  )
+            vmcase(OP_TAILCALL,
+                   int b = GETARG_B(i);
+                   if (b != 0) L->top = ra + b; /* else previous instruction set top */
+                   lua_assert(GETARG_C(i) - 1 == LUA_MULTRET);
+                   if (luaD_precall(L, ra, LUA_MULTRET))  /* C function? */
+                       base = ci->u.l.base;
+                else {
+                    /* tail call: put called frame (n) in place of caller one (o) */
+                    CallInfo *nci = L->ci;  /* called frame */
+                    CallInfo *oci = nci->previous;  /* caller frame */
+                    StkId nfunc = nci->func;  /* called function */
+                    StkId ofunc = oci->func;  /* caller function */
+                    /* last stack slot filled by 'precall' */
+                    StkId lim = nci->u.l.base + getproto(nfunc)->numparams;
+                        int aux;
+                        /* close all upvalues from previous call */
+                        if (cl->p->sizep > 0) luaF_close(L, oci->u.l.base);
+                        /* move new frame into old one */
+                        for (aux = 0; nfunc + aux < lim; aux++)
+                            setobjs2s(L, ofunc + aux, nfunc + aux);
+                        oci->u.l.base = ofunc + (nci->u.l.base - nfunc);  /* correct base */
+                        oci->top = L->top = ofunc + (L->top - nfunc);  /* correct top */
+                        oci->u.l.savedpc = nci->u.l.savedpc;
+                        oci->callstatus |= CIST_TAIL;  /* function was tail called */
+                        ci = L->ci = oci;  /* remove new frame */
+                        lua_assert(L->top == oci->u.l.base + getproto(ofunc)->maxstacksize);
+                        goto newframe;  /* restart luaV_execute over new Lua function */
+                    }
+                  )
+            vmcasenb(OP_RETURN,
+                     int b = GETARG_B(i);
+                     if (b != 0) L->top = ra + b - 1;
+                     if (cl->p->sizep > 0) luaF_close(L, base);
+                         b = luaD_poscall(L, ra);
+                         if (!(ci->callstatus & CIST_REENTRY))  /* 'ci' still the called one */
+                             return;  /* external invocation: return */
+                        else {  /* invocation via reentry: continue execution */
+                            ci = L->ci;
+                            if (b) L->top = ci->top;
+                                lua_assert(isLua(ci));
+                                lua_assert(GET_OPCODE(*((ci)->u.l.savedpc - 1)) == OP_CALL);
+                                goto newframe;  /* restart luaV_execute over new Lua function */
+                            }
+                    )
+            vmcase(OP_FORLOOP,
+                   lua_Number step = nvalue(ra + 2);
+                   lua_Number idx = luai_numadd(L, nvalue(ra), step); /* increment index */
+                   lua_Number limit = nvalue(ra + 1);
+                   if (luai_numlt(L, 0, step) ? luai_numle(L, idx, limit)
+            : luai_numle(L, limit, idx)) {
+            ci->u.l.savedpc += GETARG_sBx(i);  /* jump back */
+                setnvalue(ra, idx);  /* update internal index... */
+                setnvalue(ra + 3, idx); /* ...and external index */
+            }
+                  )
+            vmcase(OP_FORPREP,
+                   const TValue *init = ra;
+                   const TValue *plimit = ra + 1;
+                   const TValue *pstep = ra + 2;
+                   if (!tonumber(init, ra))
+                   luaG_runerror(L, LUA_QL("for") " initial value must be a number");
+                   else if (!tonumber(plimit, ra + 1))
+                       luaG_runerror(L, LUA_QL("for") " limit must be a number");
+                       else if (!tonumber(pstep, ra + 2))
+                           luaG_runerror(L, LUA_QL("for") " step must be a number");
+                           setnvalue(ra, luai_numsub(L, nvalue(ra), nvalue(pstep)));
+                           ci->u.l.savedpc += GETARG_sBx(i);
+                          )
+                        vmcasenb(OP_TFORCALL,
+                                 StkId cb = ra + 3;  /* call base */
+                                 setobjs2s(L, cb + 2, ra + 2);
+                                 setobjs2s(L, cb + 1, ra + 1);
+                                 setobjs2s(L, cb, ra);
+                                 L->top = cb + 3;  /* func. + 2 args (state and index) */
+                                 Protect(luaD_call(L, cb, GETARG_C(i), 1));
+                                 L->top = ci->top;
+                                 i = *(ci->u.l.savedpc++);  /* go to next instruction */
+                                 ra = RA(i);
+                                 lua_assert(GET_OPCODE(i) == OP_TFORLOOP);
+                                 goto l_tforloop;
+                                )
+                        vmcase(OP_TFORLOOP,
+                               l_tforloop:
+                        if (!ttisnil(ra + 1)) {  /* continue loop? */
+                        setobjs2s(L, ra, ra + 1);  /* save control variable */
+                            ci->u.l.savedpc += GETARG_sBx(i);  /* jump back */
+                        }
+                  )
+            vmcase(OP_SETLIST,
+                   int n = GETARG_B(i);
+                   int c = GETARG_C(i);
+                   int last;
+                   Table * h;
+                   if (n == 0) n = cast_int(L->top - ra) - 1;
+            if (c == 0) {
+                lua_assert(GET_OPCODE(*ci->u.l.savedpc) == OP_EXTRAARG);
+                    c = GETARG_Ax(*ci->u.l.savedpc++);
+                }
+            luai_runtimecheck(L, ttistable(ra));
+            h = hvalue(ra);
+                last = ((c - 1) * LFIELDS_PER_FLUSH) + n;
+                if (last > h->sizearray)  /* needs more space? */
+                luaH_resizearray(L, h, last);  /* pre-allocate it at once */
+            for (; n > 0; n--) {
+                TValue *val = ra + n;
+                luaH_setint(L, h, last--, val);
+                    luaC_barrierback(L, obj2gco(h), val);
+                }
+            L->top = ci->top;  /* correct top (in case of previous open call) */
+                  )
+            vmcase(OP_CLOSURE,
+                   Proto *p = cl->p->p[GETARG_Bx(i)];
+                   Closure *ncl = getcached(p, cl->upvals, base);  /* cached closure */
+                   if (ncl == NULL)  /* no match? */
+                   pushclosure(L, p, cl->upvals, base, ra);  /* create a new one */
+                   else
+                       setclLvalue(L, ra, ncl);  /* push cashed closure */
+                       checkGC(L, ra + 1);
+                      )
+                    vmcase(OP_VARARG,
+                           int b = GETARG_B(i) - 1;
+                           int j;
+                           int n = cast_int(base - ci->func) - cl->p->numparams - 1;
+                    if (b < 0) {  /* B == 0? */
+                    b = n;  /* get all var. arguments */
+                    Protect(luaD_checkstack(L, n));
+                        ra = RA(i);  /* previous call may change the stack */
+                        L->top = ra + n;
+                    }
+            for (j = 0; j < b; j++) {
+            if (j < n) {
+                    setobjs2s(L, ra + j, base - n + j);
+                } else {
+                    setnilvalue(ra + j);
+                }
+            }
+                  )
+            vmcase(OP_EXTRAARG,
+                   lua_assert(0);
+                  )
         }
-      )
-      vmcase(OP_SETLIST,
-        int n = GETARG_B(i);
-        int c = GETARG_C(i);
-        int last;
-        Table *h;
-        if (n == 0) n = cast_int(L->top - ra) - 1;
-        if (c == 0) {
-          lua_assert(GET_OPCODE(*ci->u.l.savedpc) == OP_EXTRAARG);
-          c = GETARG_Ax(*ci->u.l.savedpc++);
-        }
-        luai_runtimecheck(L, ttistable(ra));
-        h = hvalue(ra);
-        last = ((c-1)*LFIELDS_PER_FLUSH) + n;
-        if (last > h->sizearray)  /* needs more space? */
-          luaH_resizearray(L, h, last);  /* pre-allocate it at once */
-        for (; n > 0; n--) {
-          TValue *val = ra+n;
-          luaH_setint(L, h, last--, val);
-          luaC_barrierback(L, obj2gco(h), val);
-        }
-        L->top = ci->top;  /* correct top (in case of previous open call) */
-      )
-      vmcase(OP_CLOSURE,
-        Proto *p = cl->p->p[GETARG_Bx(i)];
-        Closure *ncl = getcached(p, cl->upvals, base);  /* cached closure */
-        if (ncl == NULL)  /* no match? */
-          pushclosure(L, p, cl->upvals, base, ra);  /* create a new one */
-        else
-          setclLvalue(L, ra, ncl);  /* push cashed closure */
-        checkGC(L, ra + 1);
-      )
-      vmcase(OP_VARARG,
-        int b = GETARG_B(i) - 1;
-        int j;
-        int n = cast_int(base - ci->func) - cl->p->numparams - 1;
-        if (b < 0) {  /* B == 0? */
-          b = n;  /* get all var. arguments */
-          Protect(luaD_checkstack(L, n));
-          ra = RA(i);  /* previous call may change the stack */
-          L->top = ra + n;
-        }
-        for (j = 0; j < b; j++) {
-          if (j < n) {
-            setobjs2s(L, ra + j, base - n + j);
-          }
-          else {
-            setnilvalue(ra + j);
-          }
-        }
-      )
-      vmcase(OP_EXTRAARG,
-        lua_assert(0);
-      )
     }
-  }
 }
 
diff --git a/liblua/lvm.h b/liblua/lvm.h
index caff32d21..5a6ec9913 100644
--- a/liblua/lvm.h
+++ b/liblua/lvm.h
@@ -23,22 +23,22 @@
 
 
 /* not to called directly */
-LUAI_FUNC int luaV_equalobj_ (lua_State *L, const TValue *t1, const TValue *t2);
+LUAI_FUNC int luaV_equalobj_(lua_State *L, const TValue *t1, const TValue *t2);
 
 
-LUAI_FUNC int luaV_lessthan (lua_State *L, const TValue *l, const TValue *r);
-LUAI_FUNC int luaV_lessequal (lua_State *L, const TValue *l, const TValue *r);
-LUAI_FUNC const TValue *luaV_tonumber (const TValue *obj, TValue *n);
-LUAI_FUNC int luaV_tostring (lua_State *L, StkId obj);
-LUAI_FUNC void luaV_gettable (lua_State *L, const TValue *t, TValue *key,
-                                            StkId val);
-LUAI_FUNC void luaV_settable (lua_State *L, const TValue *t, TValue *key,
-                                            StkId val);
-LUAI_FUNC void luaV_finishOp (lua_State *L);
-LUAI_FUNC void luaV_execute (lua_State *L);
-LUAI_FUNC void luaV_concat (lua_State *L, int total);
-LUAI_FUNC void luaV_arith (lua_State *L, StkId ra, const TValue *rb,
-                           const TValue *rc, TMS op);
-LUAI_FUNC void luaV_objlen (lua_State *L, StkId ra, const TValue *rb);
+LUAI_FUNC int luaV_lessthan(lua_State *L, const TValue *l, const TValue *r);
+LUAI_FUNC int luaV_lessequal(lua_State *L, const TValue *l, const TValue *r);
+LUAI_FUNC const TValue *luaV_tonumber(const TValue *obj, TValue *n);
+LUAI_FUNC int luaV_tostring(lua_State *L, StkId obj);
+LUAI_FUNC void luaV_gettable(lua_State *L, const TValue *t, TValue *key,
+                             StkId val);
+LUAI_FUNC void luaV_settable(lua_State *L, const TValue *t, TValue *key,
+                             StkId val);
+LUAI_FUNC void luaV_finishOp(lua_State *L);
+LUAI_FUNC void luaV_execute(lua_State *L);
+LUAI_FUNC void luaV_concat(lua_State *L, int total);
+LUAI_FUNC void luaV_arith(lua_State *L, StkId ra, const TValue *rb,
+                          const TValue *rc, TMS op);
+LUAI_FUNC void luaV_objlen(lua_State *L, StkId ra, const TValue *rb);
 
 #endif
diff --git a/liblua/lzio.c b/liblua/lzio.c
index 8b77054e0..e607a2166 100644
--- a/liblua/lzio.c
+++ b/liblua/lzio.c
@@ -18,59 +18,63 @@
 #include "lzio.h"
 
 
-int luaZ_fill (ZIO *z) {
-  size_t size;
-  lua_State *L = z->L;
-  const char *buff;
-  lua_unlock(L);
-  buff = z->reader(L, z->data, &size);
-  lua_lock(L);
-  if (buff == NULL || size == 0)
-    return EOZ;
-  z->n = size - 1;  /* discount char being returned */
-  z->p = buff;
-  return cast_uchar(*(z->p++));
+int luaZ_fill(ZIO *z)
+{
+    size_t size;
+    lua_State *L = z->L;
+    const char *buff;
+    lua_unlock(L);
+    buff = z->reader(L, z->data, &size);
+    lua_lock(L);
+    if (buff == NULL || size == 0)
+        return EOZ;
+    z->n = size - 1;  /* discount char being returned */
+    z->p = buff;
+    return cast_uchar(*(z->p++));
 }
 
 
-void luaZ_init (lua_State *L, ZIO *z, lua_Reader reader, void *data) {
-  z->L = L;
-  z->reader = reader;
-  z->data = data;
-  z->n = 0;
-  z->p = NULL;
+void luaZ_init(lua_State *L, ZIO *z, lua_Reader reader, void *data)
+{
+    z->L = L;
+    z->reader = reader;
+    z->data = data;
+    z->n = 0;
+    z->p = NULL;
 }
 
 
 /* --------------------------------------------------------------- read --- */
-size_t luaZ_read (ZIO *z, void *b, size_t n) {
-  while (n) {
-    size_t m;
-    if (z->n == 0) {  /* no bytes in buffer? */
-      if (luaZ_fill(z) == EOZ)  /* try to read more */
-        return n;  /* no more input; return number of missing bytes */
-      else {
-        z->n++;  /* luaZ_fill consumed first byte; put it back */
-        z->p--;
-      }
+size_t luaZ_read(ZIO *z, void *b, size_t n)
+{
+    while (n) {
+        size_t m;
+        if (z->n == 0) {  /* no bytes in buffer? */
+            if (luaZ_fill(z) == EOZ)  /* try to read more */
+                return n;  /* no more input; return number of missing bytes */
+            else {
+                z->n++;  /* luaZ_fill consumed first byte; put it back */
+                z->p--;
+            }
+        }
+        m = (n <= z->n) ? n : z->n;  /* min. between n and z->n */
+        memcpy(b, z->p, m);
+        z->n -= m;
+        z->p += m;
+        b = (char *)b + m;
+        n -= m;
     }
-    m = (n <= z->n) ? n : z->n;  /* min. between n and z->n */
-    memcpy(b, z->p, m);
-    z->n -= m;
-    z->p += m;
-    b = (char *)b + m;
-    n -= m;
-  }
-  return 0;
+    return 0;
 }
 
 /* ------------------------------------------------------------------------ */
-char *luaZ_openspace (lua_State *L, Mbuffer *buff, size_t n) {
-  if (n > buff->buffsize) {
-    if (n < LUA_MINBUFFER) n = LUA_MINBUFFER;
-    luaZ_resizebuffer(L, buff, n);
-  }
-  return buff->buffer;
+char *luaZ_openspace(lua_State *L, Mbuffer *buff, size_t n)
+{
+    if (n > buff->buffsize) {
+        if (n < LUA_MINBUFFER) n = LUA_MINBUFFER;
+        luaZ_resizebuffer(L, buff, n);
+    }
+    return buff->buffer;
 }
 
 
diff --git a/liblua/lzio.h b/liblua/lzio.h
index f0cbe7e96..3a6477928 100644
--- a/liblua/lzio.h
+++ b/liblua/lzio.h
@@ -21,9 +21,9 @@ typedef struct Zio ZIO;
 
 
 typedef struct Mbuffer {
-  char *buffer;
-  size_t n;
-  size_t buffsize;
+    char *buffer;
+    size_t n;
+    size_t buffsize;
 } Mbuffer;
 
 #define luaZ_initbuffer(L, buff) ((buff)->buffer = NULL, (buff)->buffsize = 0)
@@ -37,29 +37,29 @@ typedef struct Mbuffer {
 
 #define luaZ_resizebuffer(L, buff, size) \
     (luaM_reallocvector(L, (buff)->buffer, (buff)->buffsize, size, char), \
-    (buff)->buffsize = size)
+     (buff)->buffsize = size)
 
 #define luaZ_freebuffer(L, buff) luaZ_resizebuffer(L, buff, 0)
 
 
-LUAI_FUNC char *luaZ_openspace (lua_State *L, Mbuffer *buff, size_t n);
-LUAI_FUNC void luaZ_init (lua_State *L, ZIO *z, lua_Reader reader,
-                                        void *data);
-LUAI_FUNC size_t luaZ_read (ZIO* z, void* b, size_t n); /* read next n bytes */
+LUAI_FUNC char *luaZ_openspace(lua_State *L, Mbuffer *buff, size_t n);
+LUAI_FUNC void luaZ_init(lua_State *L, ZIO *z, lua_Reader reader,
+                         void *data);
+LUAI_FUNC size_t luaZ_read(ZIO *z, void *b, size_t n);  /* read next n bytes */
 
 
 
 /* --------- Private Part ------------------ */
 
 struct Zio {
-  size_t n;             /* bytes still unread */
-  const char *p;        /* current position in buffer */
-  lua_Reader reader;    /* reader function */
-  void* data;           /* additional data */
-  lua_State *L;         /* Lua state (for reader) */
+    size_t n;             /* bytes still unread */
+    const char *p;        /* current position in buffer */
+    lua_Reader reader;    /* reader function */
+    void *data;           /* additional data */
+    lua_State *L;         /* Lua state (for reader) */
 };
 
 
-LUAI_FUNC int luaZ_fill (ZIO *z);
+LUAI_FUNC int luaZ_fill(ZIO *z);
 
 #endif
diff --git a/tools/mfkey/crapto1.c b/tools/mfkey/crapto1.c
index cfb07cea4..690e3a4d6 100755
--- a/tools/mfkey/crapto1.c
+++ b/tools/mfkey/crapto1.c
@@ -24,9 +24,9 @@
 static uint8_t filterlut[1 << 20];
 static void __attribute__((constructor)) fill_lut()
 {
-        uint32_t i;
-        for(i = 0; i < 1 << 20; ++i)
-                filterlut[i] = filter(i);
+    uint32_t i;
+    for (i = 0; i < 1 << 20; ++i)
+        filterlut[i] = filter(i);
 }
 #define filter(x) (filterlut[(x) & 0xfffff])
 #endif
@@ -43,13 +43,13 @@ typedef bucket_t bucket_array_t[2][0x100];
 typedef struct bucket_info {
     struct {
         uint32_t *head, *tail;
-        } bucket_info[2][0x100];
-        uint32_t numbuckets;
-    } bucket_info_t;
+    } bucket_info[2][0x100];
+    uint32_t numbuckets;
+} bucket_info_t;
 
 
-static void bucket_sort_intersect(uint32_t* const estart, uint32_t* const estop,
-                                  uint32_t* const ostart, uint32_t* const ostop,
+static void bucket_sort_intersect(uint32_t *const estart, uint32_t *const estop,
+                                  uint32_t *const ostart, uint32_t *const ostop,
                                   bucket_info_t *bucket_info, bucket_array_t bucket)
 {
     uint32_t *p1, *p2;
@@ -92,7 +92,7 @@ static void bucket_sort_intersect(uint32_t* const estart, uint32_t* const estop,
             }
         }
         bucket_info->numbuckets = nonempty_bucket;
-        }
+    }
 }
 
 
@@ -114,12 +114,12 @@ static inline void update_contribution(uint32_t *item, const uint32_t mask1, con
 static inline void extend_table(uint32_t *tbl, uint32_t **end, int bit, int m1, int m2, uint32_t in)
 {
     in <<= 24;
-    for(*tbl <<= 1; tbl <= *end; *++tbl <<= 1)
-        if(filter(*tbl) ^ filter(*tbl | 1)) {
+    for (*tbl <<= 1; tbl <= *end; *++tbl <<= 1)
+        if (filter(*tbl) ^ filter(*tbl | 1)) {
             *tbl |= filter(*tbl) ^ bit;
             update_contribution(tbl, m1, m2);
             *tbl ^= in;
-        } else if(filter(*tbl) == bit) {
+        } else if (filter(*tbl) == bit) {
             *++*end = tbl[1];
             tbl[1] = tbl[0] | 1;
             update_contribution(tbl, m1, m2);
@@ -134,10 +134,10 @@ static inline void extend_table(uint32_t *tbl, uint32_t **end, int bit, int m1,
  */
 static inline void extend_table_simple(uint32_t *tbl, uint32_t **end, int bit)
 {
-    for(*tbl <<= 1; tbl <= *end; *++tbl <<= 1) {
-        if(filter(*tbl) ^ filter(*tbl | 1)) {   // replace
+    for (*tbl <<= 1; tbl <= *end; *++tbl <<= 1) {
+        if (filter(*tbl) ^ filter(*tbl | 1)) {  // replace
             *tbl |= filter(*tbl) ^ bit;
-        } else if(filter(*tbl) == bit) {        // insert
+        } else if (filter(*tbl) == bit) {       // insert
             *++*end = *++tbl;
             *tbl = tbl[-1] | 1;
         } else {                                // drop
@@ -148,18 +148,18 @@ static inline void extend_table_simple(uint32_t *tbl, uint32_t **end, int bit)
 /** recover
  * recursively narrow down the search space, 4 bits of keystream at a time
  */
-static struct Crypto1State*
+static struct Crypto1State *
 recover(uint32_t *o_head, uint32_t *o_tail, uint32_t oks,
-    uint32_t *e_head, uint32_t *e_tail, uint32_t eks, int rem,
-    struct Crypto1State *sl, uint32_t in, bucket_array_t bucket)
+        uint32_t *e_head, uint32_t *e_tail, uint32_t eks, int rem,
+        struct Crypto1State *sl, uint32_t in, bucket_array_t bucket)
 {
     uint32_t *o, *e;
     bucket_info_t bucket_info;
 
-    if(rem == -1) {
-        for(e = e_head; e <= e_tail; ++e) {
+    if (rem == -1) {
+        for (e = e_head; e <= e_tail; ++e) {
             *e = *e << 1 ^ parity(*e & LF_POLY_EVEN) ^ !!(in & 4);
-            for(o = o_head; o <= o_tail; ++o, ++sl) {
+            for (o = o_head; o <= o_tail; ++o, ++sl) {
                 sl->even = *o;
                 sl->odd = *e ^ parity(*o & LF_POLY_ODD);
                 sl[1].odd = sl[1].even = 0;
@@ -168,16 +168,16 @@ recover(uint32_t *o_head, uint32_t *o_tail, uint32_t oks,
         return sl;
     }
 
-    for(uint32_t i = 0; i < 4 && rem--; i++) {
+    for (uint32_t i = 0; i < 4 && rem--; i++) {
         oks >>= 1;
         eks >>= 1;
         in >>= 2;
         extend_table(o_head, &o_tail, oks & 1, LF_POLY_EVEN << 1 | 1, LF_POLY_ODD << 1, 0);
-        if(o_head > o_tail)
+        if (o_head > o_tail)
             return sl;
 
         extend_table(e_head, &e_tail, eks & 1, LF_POLY_ODD, LF_POLY_EVEN << 1 | 1, in & 3);
-        if(e_head > e_tail)
+        if (e_head > e_tail)
             return sl;
     }
 
@@ -187,7 +187,7 @@ recover(uint32_t *o_head, uint32_t *o_tail, uint32_t oks,
         sl = recover(bucket_info.bucket_info[1][i].head, bucket_info.bucket_info[1][i].tail, oks,
                      bucket_info.bucket_info[0][i].head, bucket_info.bucket_info[0][i].tail, eks,
                      rem, sl, in, bucket);
-        }
+    }
 
     return sl;
 }
@@ -196,7 +196,7 @@ recover(uint32_t *o_head, uint32_t *o_tail, uint32_t oks,
  * additionally you can use the in parameter to specify the value
  * that was fed into the lfsr at the time the keystream was generated
  */
-struct Crypto1State* lfsr_recovery32(uint32_t ks2, uint32_t in)
+struct Crypto1State *lfsr_recovery32(uint32_t ks2, uint32_t in)
 {
     struct Crypto1State *statelist;
     uint32_t *odd_head = 0, *odd_tail = 0, oks = 0;
@@ -204,15 +204,15 @@ struct Crypto1State* lfsr_recovery32(uint32_t ks2, uint32_t in)
     int i;
 
     // split the keystream into an odd and even part
-    for(i = 31; i >= 0; i -= 2)
+    for (i = 31; i >= 0; i -= 2)
         oks = oks << 1 | BEBIT(ks2, i);
-    for(i = 30; i >= 0; i -= 2)
+    for (i = 30; i >= 0; i -= 2)
         eks = eks << 1 | BEBIT(ks2, i);
 
     odd_head = odd_tail = malloc(sizeof(uint32_t) << 21);
     even_head = even_tail = malloc(sizeof(uint32_t) << 21);
     statelist =  malloc(sizeof(struct Crypto1State) << 18);
-    if(!odd_tail-- || !even_tail-- || !statelist) {
+    if (!odd_tail-- || !even_tail-- || !statelist) {
         free(statelist);
         statelist = 0;
         goto out;
@@ -225,7 +225,7 @@ struct Crypto1State* lfsr_recovery32(uint32_t ks2, uint32_t in)
 
     for (uint32_t i = 0; i < 2; i++) {
         for (uint32_t j = 0; j <= 0xff; j++) {
-            bucket[i][j].head = malloc(sizeof(uint32_t)<<14);
+            bucket[i][j].head = malloc(sizeof(uint32_t) << 14);
             if (!bucket[i][j].head) {
                 goto out;
             }
@@ -233,15 +233,15 @@ struct Crypto1State* lfsr_recovery32(uint32_t ks2, uint32_t in)
     }
 
     // initialize statelists: add all possible states which would result into the rightmost 2 bits of the keystream
-    for(i = 1 << 20; i >= 0; --i) {
-        if(filter(i) == (oks & 1))
+    for (i = 1 << 20; i >= 0; --i) {
+        if (filter(i) == (oks & 1))
             *++odd_tail = i;
-        if(filter(i) == (eks & 1))
+        if (filter(i) == (eks & 1))
             *++even_tail = i;
     }
 
     // extend the statelists. Look at the next 8 Bits of the keystream (4 Bit each odd and even):
-    for(i = 0; i < 4; i++) {
+    for (i = 0; i < 4; i++) {
         extend_table_simple(odd_head,  &odd_tail, (oks >>= 1) & 1);
         extend_table_simple(even_head, &even_tail, (eks >>= 1) & 1);
     }
@@ -262,29 +262,33 @@ out:
 }
 
 static const uint32_t S1[] = {     0x62141, 0x310A0, 0x18850, 0x0C428, 0x06214,
-    0x0310A, 0x85E30, 0xC69AD, 0x634D6, 0xB5CDE, 0xDE8DA, 0x6F46D, 0xB3C83,
-    0x59E41, 0xA8995, 0xD027F, 0x6813F, 0x3409F, 0x9E6FA};
+                                   0x0310A, 0x85E30, 0xC69AD, 0x634D6, 0xB5CDE, 0xDE8DA, 0x6F46D, 0xB3C83,
+                                   0x59E41, 0xA8995, 0xD027F, 0x6813F, 0x3409F, 0x9E6FA
+                             };
 static const uint32_t S2[] = {  0x3A557B00, 0x5D2ABD80, 0x2E955EC0, 0x174AAF60,
-    0x0BA557B0, 0x05D2ABD8, 0x0449DE68, 0x048464B0, 0x42423258, 0x278192A8,
-    0x156042D0, 0x0AB02168, 0x43F89B30, 0x61FC4D98, 0x765EAD48, 0x7D8FDD20,
-    0x7EC7EE90, 0x7F63F748, 0x79117020};
+                                0x0BA557B0, 0x05D2ABD8, 0x0449DE68, 0x048464B0, 0x42423258, 0x278192A8,
+                                0x156042D0, 0x0AB02168, 0x43F89B30, 0x61FC4D98, 0x765EAD48, 0x7D8FDD20,
+                                0x7EC7EE90, 0x7F63F748, 0x79117020
+                             };
 static const uint32_t T1[] = {
     0x4F37D, 0x279BE, 0x97A6A, 0x4BD35, 0x25E9A, 0x12F4D, 0x097A6, 0x80D66,
     0xC4006, 0x62003, 0xB56B4, 0x5AB5A, 0xA9318, 0xD0F39, 0x6879C, 0xB057B,
     0x582BD, 0x2C15E, 0x160AF, 0x8F6E2, 0xC3DC4, 0xE5857, 0x72C2B, 0x39615,
-    0x98DBF, 0xC806A, 0xE0680, 0x70340, 0x381A0, 0x98665, 0x4C332, 0xA272C};
+    0x98DBF, 0xC806A, 0xE0680, 0x70340, 0x381A0, 0x98665, 0x4C332, 0xA272C
+};
 static const uint32_t T2[] = {  0x3C88B810, 0x5E445C08, 0x2982A580, 0x14C152C0,
-    0x4A60A960, 0x253054B0, 0x52982A58, 0x2FEC9EA8, 0x1156C4D0, 0x08AB6268,
-    0x42F53AB0, 0x217A9D58, 0x161DC528, 0x0DAE6910, 0x46D73488, 0x25CB11C0,
-    0x52E588E0, 0x6972C470, 0x34B96238, 0x5CFC3A98, 0x28DE96C8, 0x12CFC0E0,
-    0x4967E070, 0x64B3F038, 0x74F97398, 0x7CDC3248, 0x38CE92A0, 0x1C674950,
-    0x0E33A4A8, 0x01B959D0, 0x40DCACE8, 0x26CEDDF0};
+                                0x4A60A960, 0x253054B0, 0x52982A58, 0x2FEC9EA8, 0x1156C4D0, 0x08AB6268,
+                                0x42F53AB0, 0x217A9D58, 0x161DC528, 0x0DAE6910, 0x46D73488, 0x25CB11C0,
+                                0x52E588E0, 0x6972C470, 0x34B96238, 0x5CFC3A98, 0x28DE96C8, 0x12CFC0E0,
+                                0x4967E070, 0x64B3F038, 0x74F97398, 0x7CDC3248, 0x38CE92A0, 0x1C674950,
+                                0x0E33A4A8, 0x01B959D0, 0x40DCACE8, 0x26CEDDF0
+                             };
 static const uint32_t C1[] = { 0x846B5, 0x4235A, 0x211AD};
 static const uint32_t C2[] = { 0x1A822E0, 0x21A822E0, 0x21A822E0};
 /** Reverse 64 bits of keystream into possible cipher states
  * Variation mentioned in the paper. Somewhat optimized version
  */
-struct Crypto1State* lfsr_recovery64(uint32_t ks2, uint32_t ks3)
+struct Crypto1State *lfsr_recovery64(uint32_t ks2, uint32_t ks3)
 {
     struct Crypto1State *statelist, *sl;
     uint8_t oks[32], eks[32], hi[32];
@@ -293,50 +297,50 @@ struct Crypto1State* lfsr_recovery64(uint32_t ks2, uint32_t ks3)
     int i, j;
 
     sl = statelist = malloc(sizeof(struct Crypto1State) << 4);
-    if(!sl)
+    if (!sl)
         return 0;
     sl->odd = sl->even = 0;
 
-    for(i = 30; i >= 0; i -= 2) {
+    for (i = 30; i >= 0; i -= 2) {
         oks[i >> 1] = BEBIT(ks2, i);
         oks[16 + (i >> 1)] = BEBIT(ks3, i);
     }
-    for(i = 31; i >= 0; i -= 2) {
+    for (i = 31; i >= 0; i -= 2) {
         eks[i >> 1] = BEBIT(ks2, i);
         eks[16 + (i >> 1)] = BEBIT(ks3, i);
     }
 
-    for(i = 0xfffff; i >= 0; --i) {
+    for (i = 0xfffff; i >= 0; --i) {
         if (filter(i) != oks[0])
             continue;
 
         *(tail = table) = i;
-        for(j = 1; tail >= table && j < 29; ++j)
+        for (j = 1; tail >= table && j < 29; ++j)
             extend_table_simple(table, &tail, oks[j]);
 
-        if(tail < table)
+        if (tail < table)
             continue;
 
-        for(j = 0; j < 19; ++j)
+        for (j = 0; j < 19; ++j)
             low = low << 1 | parity(i & S1[j]);
-        for(j = 0; j < 32; ++j)
+        for (j = 0; j < 32; ++j)
             hi[j] = parity(i & T1[j]);
 
-        for(; tail >= table; --tail) {
-            for(j = 0; j < 3; ++j) {
+        for (; tail >= table; --tail) {
+            for (j = 0; j < 3; ++j) {
                 *tail = *tail << 1;
                 *tail |= parity((i & C1[j]) ^ (*tail & C2[j]));
-                if(filter(*tail) != oks[29 + j])
+                if (filter(*tail) != oks[29 + j])
                     goto continue2;
             }
 
-            for(j = 0; j < 19; ++j)
+            for (j = 0; j < 19; ++j)
                 win = win << 1 | parity(*tail & S2[j]);
 
             win ^= low;
-            for(j = 0; j < 32; ++j) {
+            for (j = 0; j < 32; ++j) {
                 win = win << 1 ^ hi[j] ^ parity(*tail & T2[j]);
-                if(filter(win) != eks[j])
+                if (filter(win) != eks[j])
                     goto continue2;
             }
 
@@ -345,7 +349,8 @@ struct Crypto1State* lfsr_recovery64(uint32_t ks2, uint32_t ks3)
             sl->even = win;
             ++sl;
             sl->odd = sl->even = 0;
-            continue2:;
+continue2:
+            ;
         }
     }
     return statelist;
@@ -381,7 +386,7 @@ uint8_t lfsr_rollback_byte(struct Crypto1State *s, uint32_t in, int fb)
     int i, ret = 0;
     for (i = 7; i >= 0; --i)
         ret |= lfsr_rollback_bit(s, BIT(in, i), fb) << i;
-*/
+    */
 // unfold loop 20160112
     uint8_t ret = 0;
     ret |= lfsr_rollback_bit(s, BIT(in, 7), fb) << 7;
@@ -404,7 +409,7 @@ uint32_t lfsr_rollback_word(struct Crypto1State *s, uint32_t in, int fb)
     uint32_t ret = 0;
     for (i = 31; i >= 0; --i)
         ret |= lfsr_rollback_bit(s, BEBIT(in, i), fb) << (i ^ 24);
-*/
+    */
 // unfold loop 20160112
     uint32_t ret = 0;
     ret |= lfsr_rollback_bit(s, BEBIT(in, 31), fb) << (31 ^ 24);
@@ -452,9 +457,9 @@ static uint16_t *dist = 0;
 int nonce_distance(uint32_t from, uint32_t to)
 {
     uint16_t x, i;
-    if(!dist) {
+    if (!dist) {
         dist = malloc(2 << 16);
-        if(!dist)
+        if (!dist)
             return -1;
         for (x = i = 1; i; ++i) {
             dist[(x & 0xff) << 8 | x >> 8] = i;
@@ -467,7 +472,8 @@ int nonce_distance(uint32_t from, uint32_t to)
 
 static uint32_t fastfwd[2][8] = {
     { 0, 0x4BC53, 0xECB1, 0x450E2, 0x25E29, 0x6E27A, 0x2B298, 0x60ECB},
-    { 0, 0x1D962, 0x4BC53, 0x56531, 0xECB1, 0x135D3, 0x450E2, 0x58980}};
+    { 0, 0x1D962, 0x4BC53, 0x56531, 0xECB1, 0x135D3, 0x450E2, 0x58980}
+};
 
 
 /** lfsr_prefix_ks
@@ -482,18 +488,18 @@ static uint32_t fastfwd[2][8] = {
 uint32_t *lfsr_prefix_ks(uint8_t ks[8], int isodd)
 {
     uint32_t *candidates = malloc(4 << 10);
-    if(!candidates) return 0;
+    if (!candidates) return 0;
 
     uint32_t c,  entry;
     int size = 0, i, good;
 
-    for(i = 0; i < 1 << 21; ++i) {
-        for(c = 0, good = 1; good && c < 8; ++c) {
+    for (i = 0; i < 1 << 21; ++i) {
+        for (c = 0, good = 1; good && c < 8; ++c) {
             entry = i ^ fastfwd[isodd][c];
             good &= (BIT(ks[c], isodd) == filter(entry >> 1));
             good &= (BIT(ks[c], isodd + 2) == filter(entry));
         }
-        if(good)
+        if (good)
             candidates[size++] = i;
     }
 
@@ -505,11 +511,11 @@ uint32_t *lfsr_prefix_ks(uint8_t ks[8], int isodd)
 /** check_pfx_parity
  * helper function which eliminates possible secret states using parity bits
  */
-static struct Crypto1State* check_pfx_parity(uint32_t prefix, uint32_t rresp, uint8_t parities[8][8], uint32_t odd, uint32_t even, struct Crypto1State* sl)
+static struct Crypto1State *check_pfx_parity(uint32_t prefix, uint32_t rresp, uint8_t parities[8][8], uint32_t odd, uint32_t even, struct Crypto1State *sl)
 {
     uint32_t ks1, nr, ks2, rr, ks3, c, good = 1;
 
-    for(c = 0; good && c < 8; ++c) {
+    for (c = 0; good && c < 8; ++c) {
         sl->odd = odd ^ fastfwd[1][c];
         sl->even = even ^ fastfwd[0][c];
 
@@ -543,7 +549,7 @@ static struct Crypto1State* check_pfx_parity(uint32_t prefix, uint32_t rresp, ui
  * tag nonce was fed in
  */
 
-struct Crypto1State* lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8])
+struct Crypto1State *lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8])
 {
     struct Crypto1State *statelist, *s;
     uint32_t *odd, *even, *o, *e, top;
@@ -551,16 +557,16 @@ struct Crypto1State* lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8]
     odd = lfsr_prefix_ks(ks, 1);
     even = lfsr_prefix_ks(ks, 0);
 
-    s = statelist = malloc((sizeof *statelist) << 24);
-    if(!s || !odd || !even) {
+    s = statelist = malloc((sizeof * statelist) << 24);
+    if (!s || !odd || !even) {
         free(statelist);
         statelist = 0;
-                goto out;
+        goto out;
     }
 
-    for(o = odd; *o + 1; ++o)
-        for(e = even; *e + 1; ++e)
-            for(top = 0; top < 64; ++top) {
+    for (o = odd; *o + 1; ++o)
+        for (e = even; *e + 1; ++e)
+            for (top = 0; top < 64; ++top) {
                 *o += 1 << 21;
                 *e += (!(top & 7) + 1) << 21;
                 s = check_pfx_parity(pfx, rr, par, *o, *e, s);
diff --git a/tools/mfkey/crapto1.h b/tools/mfkey/crapto1.h
index 75391c4f2..acede65a1 100755
--- a/tools/mfkey/crapto1.h
+++ b/tools/mfkey/crapto1.h
@@ -25,22 +25,22 @@ extern "C" {
 #endif
 
 struct Crypto1State {uint32_t odd, even;};
-struct Crypto1State* crypto1_create(uint64_t);
-void crypto1_destroy(struct Crypto1State*);
-void crypto1_get_lfsr(struct Crypto1State*, uint64_t*);
-uint8_t crypto1_bit(struct Crypto1State*, uint8_t, int);
-uint8_t crypto1_byte(struct Crypto1State*, uint8_t, int);
-uint32_t crypto1_word(struct Crypto1State*, uint32_t, int);
+struct Crypto1State *crypto1_create(uint64_t);
+void crypto1_destroy(struct Crypto1State *);
+void crypto1_get_lfsr(struct Crypto1State *, uint64_t *);
+uint8_t crypto1_bit(struct Crypto1State *, uint8_t, int);
+uint8_t crypto1_byte(struct Crypto1State *, uint8_t, int);
+uint32_t crypto1_word(struct Crypto1State *, uint32_t, int);
 uint32_t prng_successor(uint32_t x, uint32_t n);
 
-struct Crypto1State* lfsr_recovery32(uint32_t ks2, uint32_t in);
-struct Crypto1State* lfsr_recovery64(uint32_t ks2, uint32_t ks3);
+struct Crypto1State *lfsr_recovery32(uint32_t ks2, uint32_t in);
+struct Crypto1State *lfsr_recovery64(uint32_t ks2, uint32_t ks3);
 uint32_t *lfsr_prefix_ks(uint8_t ks[8], int isodd);
-struct Crypto1State* lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8]);
+struct Crypto1State *lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8]);
 
-uint8_t lfsr_rollback_bit(struct Crypto1State* s, uint32_t in, int fb);
-uint8_t lfsr_rollback_byte(struct Crypto1State* s, uint32_t in, int fb);
-uint32_t lfsr_rollback_word(struct Crypto1State* s, uint32_t in, int fb);
+uint8_t lfsr_rollback_bit(struct Crypto1State *s, uint32_t in, int fb);
+uint8_t lfsr_rollback_byte(struct Crypto1State *s, uint32_t in, int fb);
+uint32_t lfsr_rollback_word(struct Crypto1State *s, uint32_t in, int fb);
 int nonce_distance(uint32_t from, uint32_t to);
 #define SWAPENDIAN(x)\
     (x = (x >> 8 & 0xff00ff) | (x & 0xff00ff) << 8, x = x >> 16 | x << 16)
@@ -68,13 +68,13 @@ static inline int parity(uint32_t x)
     x ^= x >> 4;
     return BIT(0x6996, x & 0xf);
 #else
-    __asm__( "movl %1, %%eax\n"
-             "mov %%ax, %%cx\n"
-             "shrl $0x10, %%eax\n"
-             "xor %%ax, %%cx\n"
-             "xor %%ch, %%cl\n"
-             "setpo %%al\n"
-             "movzx %%al, %0\n": "=r"(x) : "r"(x): "eax","ecx");
+    __asm__("movl %1, %%eax\n"
+            "mov %%ax, %%cx\n"
+            "shrl $0x10, %%eax\n"
+            "xor %%ax, %%cx\n"
+            "xor %%ch, %%cl\n"
+            "setpo %%al\n"
+            "movzx %%al, %0\n": "=r"(x) : "r"(x): "eax", "ecx");
     return x;
 #endif
 }
diff --git a/tools/mfkey/crypto1.c b/tools/mfkey/crypto1.c
index e8384c16a..248529433 100755
--- a/tools/mfkey/crypto1.c
+++ b/tools/mfkey/crypto1.c
@@ -20,16 +20,16 @@
 #include "crapto1.h"
 #include <stdlib.h>
 
-struct Crypto1State * crypto1_create(uint64_t key)
+struct Crypto1State *crypto1_create(uint64_t key)
 {
     struct Crypto1State *s = malloc(sizeof(*s));
-    if ( !s ) return NULL;
+    if (!s) return NULL;
 
     s->odd = s->even = 0;
 
     int i;
     //for(i = 47;s && i > 0; i -= 2) {
-    for(i = 47; i > 0; i -= 2) {
+    for (i = 47; i > 0; i -= 2) {
         s->odd  = s->odd  << 1 | BIT(key, (i - 1) ^ 7);
         s->even = s->even << 1 | BIT(key, i ^ 7);
     }
@@ -42,7 +42,7 @@ void crypto1_destroy(struct Crypto1State *state)
 void crypto1_get_lfsr(struct Crypto1State *state, uint64_t *lfsr)
 {
     int i;
-    for(*lfsr = 0, i = 23; i >= 0; --i) {
+    for (*lfsr = 0, i = 23; i >= 0; --i) {
         *lfsr = *lfsr << 1 | BIT(state->odd, i ^ 3);
         *lfsr = *lfsr << 1 | BIT(state->even, i ^ 3);
     }
@@ -92,7 +92,7 @@ uint32_t crypto1_word(struct Crypto1State *s, uint32_t in, int is_encrypted)
 
     for (i = 0; i < 32; ++i)
         ret |= crypto1_bit(s, BEBIT(in, i), is_encrypted) << (i ^ 24);
-*/
+    */
 //unfold loop 2016012
     uint32_t ret = 0;
     ret |= crypto1_bit(s, BEBIT(in, 0), is_encrypted) << (0 ^ 24);
@@ -139,7 +139,7 @@ uint32_t crypto1_word(struct Crypto1State *s, uint32_t in, int is_encrypted)
 uint32_t prng_successor(uint32_t x, uint32_t n)
 {
     SWAPENDIAN(x);
-    while(n--)
+    while (n--)
         x = x >> 1 | (x >> 16 ^ x >> 18 ^ x >> 19 ^ x >> 21) << 31;
 
     return SWAPENDIAN(x);
diff --git a/tools/mfkey/mfkey32.c b/tools/mfkey/mfkey32.c
index df4dc65cd..5afc7ed80 100755
--- a/tools/mfkey/mfkey32.c
+++ b/tools/mfkey/mfkey32.c
@@ -4,8 +4,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-int main (int argc, char *argv[]) {
-    struct Crypto1State *s,*t;
+int main(int argc, char *argv[])
+{
+    struct Crypto1State *s, *t;
     uint64_t key;     // recovered key
     uint32_t uid;     // serial number
     uint32_t nt;      // tag challenge
@@ -19,24 +20,24 @@ int main (int argc, char *argv[]) {
     printf("Recover key from two 32-bit reader authentication answers only!\n\n");
 
     if (argc < 7) {
-        printf(" syntax: %s <uid> <nt> <nr_0> <ar_0> <nr_1> <ar_1>\n\n",argv[0]);
+        printf(" syntax: %s <uid> <nt> <nr_0> <ar_0> <nr_1> <ar_1>\n\n", argv[0]);
         return 1;
     }
 
-    sscanf(argv[1],"%x",&uid);
-    sscanf(argv[2],"%x",&nt);
-    sscanf(argv[3],"%x",&nr0_enc);
-    sscanf(argv[4],"%x",&ar0_enc);
-    sscanf(argv[5],"%x",&nr1_enc);
-    sscanf(argv[6],"%x",&ar1_enc);
+    sscanf(argv[1], "%x", &uid);
+    sscanf(argv[2], "%x", &nt);
+    sscanf(argv[3], "%x", &nr0_enc);
+    sscanf(argv[4], "%x", &ar0_enc);
+    sscanf(argv[5], "%x", &nr1_enc);
+    sscanf(argv[6], "%x", &ar1_enc);
 
     printf("Recovering key for:\n");
-    printf("    uid: %08x\n",uid);
-    printf("     nt: %08x\n",nt);
-    printf(" {nr_0}: %08x\n",nr0_enc);
-    printf(" {ar_0}: %08x\n",ar0_enc);
-    printf(" {nr_1}: %08x\n",nr1_enc);
-    printf(" {ar_1}: %08x\n",ar1_enc);
+    printf("    uid: %08x\n", uid);
+    printf("     nt: %08x\n", nt);
+    printf(" {nr_0}: %08x\n", nr0_enc);
+    printf(" {ar_0}: %08x\n", ar0_enc);
+    printf(" {nr_1}: %08x\n", nr1_enc);
+    printf(" {ar_1}: %08x\n", ar1_enc);
 
     // Generate lfsr succesors of the tag challenge
     printf("\nLFSR succesors of the tag challenge:\n");
@@ -51,7 +52,7 @@ int main (int argc, char *argv[]) {
 
     s = lfsr_recovery32(ar0_enc ^ p64, 0);
 
-    for(t = s; t->odd | t->even; ++t) {
+    for (t = s; t->odd | t->even; ++t) {
         lfsr_rollback_word(t, 0, 0);
         lfsr_rollback_word(t, nr0_enc, 1);
         lfsr_rollback_word(t, uid ^ nt, 0);
@@ -59,8 +60,9 @@ int main (int argc, char *argv[]) {
         crypto1_word(t, uid ^ nt, 0);
         crypto1_word(t, nr1_enc, 1);
         if (ar1_enc == (crypto1_word(t, 0, 0) ^ p64)) {
-            printf("\nFound Key: [%012" PRIx64 "]\n\n",key);
-            break;}
+            printf("\nFound Key: [%012" PRIx64 "]\n\n", key);
+            break;
+        }
     }
     free(s);
     return 0;
diff --git a/tools/mfkey/mfkey32v2.c b/tools/mfkey/mfkey32v2.c
index d799dc8e6..f934ee8a5 100644
--- a/tools/mfkey/mfkey32v2.c
+++ b/tools/mfkey/mfkey32v2.c
@@ -4,8 +4,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-int main (int argc, char *argv[]) {
-    struct Crypto1State *s,*t;
+int main(int argc, char *argv[])
+{
+    struct Crypto1State *s, *t;
     uint64_t key;     // recovered key
     uint32_t uid;     // serial number
     uint32_t nt0;      // tag challenge first
@@ -25,22 +26,22 @@ int main (int argc, char *argv[]) {
         return 1;
     }
 
-    sscanf(argv[1],"%x",&uid);
-    sscanf(argv[2],"%x",&nt0);
-    sscanf(argv[3],"%x",&nr0_enc);
-    sscanf(argv[4],"%x",&ar0_enc);
-    sscanf(argv[5],"%x",&nt1);
-    sscanf(argv[6],"%x",&nr1_enc);
-    sscanf(argv[7],"%x",&ar1_enc);
+    sscanf(argv[1], "%x", &uid);
+    sscanf(argv[2], "%x", &nt0);
+    sscanf(argv[3], "%x", &nr0_enc);
+    sscanf(argv[4], "%x", &ar0_enc);
+    sscanf(argv[5], "%x", &nt1);
+    sscanf(argv[6], "%x", &nr1_enc);
+    sscanf(argv[7], "%x", &ar1_enc);
 
     printf("Recovering key for:\n");
-    printf("    uid: %08x\n",uid);
-    printf("   nt_0: %08x\n",nt0);
-    printf(" {nr_0}: %08x\n",nr0_enc);
-    printf(" {ar_0}: %08x\n",ar0_enc);
-    printf("   nt_1: %08x\n",nt1);
-    printf(" {nr_1}: %08x\n",nr1_enc);
-    printf(" {ar_1}: %08x\n",ar1_enc);
+    printf("    uid: %08x\n", uid);
+    printf("   nt_0: %08x\n", nt0);
+    printf(" {nr_0}: %08x\n", nr0_enc);
+    printf(" {ar_0}: %08x\n", ar0_enc);
+    printf("   nt_1: %08x\n", nt1);
+    printf(" {nr_1}: %08x\n", nr1_enc);
+    printf(" {ar_1}: %08x\n", ar1_enc);
 
     // Generate lfsr succesors of the tag challenge
     printf("\nLFSR succesors of the tag challenge:\n");
@@ -53,11 +54,11 @@ int main (int argc, char *argv[]) {
     // Extract the keystream from the messages
     printf("\nKeystream used to generate {ar} and {at}:\n");
     ks2 = ar0_enc ^ p64;
-    printf("  ks2: %08x\n",ks2);
+    printf("  ks2: %08x\n", ks2);
 
     s = lfsr_recovery32(ar0_enc ^ p64, 0);
 
-    for(t = s; t->odd | t->even; ++t) {
+    for (t = s; t->odd | t->even; ++t) {
         lfsr_rollback_word(t, 0, 0);
         lfsr_rollback_word(t, nr0_enc, 1);
         lfsr_rollback_word(t, uid ^ nt0, 0);
@@ -66,8 +67,9 @@ int main (int argc, char *argv[]) {
         crypto1_word(t, uid ^ nt1, 0);
         crypto1_word(t, nr1_enc, 1);
         if (ar1_enc == (crypto1_word(t, 0, 0) ^ p64b)) {
-            printf("\nFound Key: [%012" PRIx64 "]\n\n",key);
-            break;}
+            printf("\nFound Key: [%012" PRIx64 "]\n\n", key);
+            break;
+        }
     }
     free(s);
     return 0;
diff --git a/tools/mfkey/mfkey64.c b/tools/mfkey/mfkey64.c
index f7cf790eb..6dba2c782 100755
--- a/tools/mfkey/mfkey64.c
+++ b/tools/mfkey/mfkey64.c
@@ -5,7 +5,8 @@
 #include <inttypes.h>
 #include "crapto1.h"
 
-int main (int argc, char *argv[]) {
+int main(int argc, char *argv[])
+{
     struct Crypto1State *revstate;
     uint64_t key;     // recovered key
     uint32_t uid;     // serial number
@@ -28,25 +29,25 @@ int main (int argc, char *argv[]) {
     int enclen[encc];
     uint8_t enc[encc][120];
 
-    sscanf(argv[1],"%x",&uid);
-    sscanf(argv[2],"%x",&nt);
-    sscanf(argv[3],"%x",&nr_enc);
-    sscanf(argv[4],"%x",&ar_enc);
-    sscanf(argv[5],"%x",&at_enc);
+    sscanf(argv[1], "%x", &uid);
+    sscanf(argv[2], "%x", &nt);
+    sscanf(argv[3], "%x", &nr_enc);
+    sscanf(argv[4], "%x", &ar_enc);
+    sscanf(argv[5], "%x", &at_enc);
     for (int i = 0; i < encc; i++) {
         enclen[i] = strlen(argv[i + 6]) / 2;
         for (int i2 = 0; i2 < enclen[i]; i2++) {
-            sscanf(argv[i+6] + i2*2, "%2x", (unsigned int *)&enc[i][i2]);
+            sscanf(argv[i + 6] + i2 * 2, "%2x", (unsigned int *)&enc[i][i2]);
         }
     }
 
     printf("Recovering key for:\n");
 
-    printf("  uid: %08x\n",uid);
-    printf("   nt: %08x\n",nt);
-    printf(" {nr}: %08x\n",nr_enc);
-    printf(" {ar}: %08x\n",ar_enc);
-    printf(" {at}: %08x\n",at_enc);
+    printf("  uid: %08x\n", uid);
+    printf("   nt: %08x\n", nt);
+    printf(" {nr}: %08x\n", nr_enc);
+    printf(" {ar}: %08x\n", ar_enc);
+    printf(" {at}: %08x\n", at_enc);
 
     for (int i = 0; i < encc; i++) {
         printf("{enc%d}: ", i);
@@ -58,20 +59,20 @@ int main (int argc, char *argv[]) {
 
     // Generate lfsr succesors of the tag challenge
     printf("\nLFSR succesors of the tag challenge:\n");
-    printf("  nt': %08x\n",prng_successor(nt, 64));
-    printf(" nt'': %08x\n",prng_successor(nt, 96));
+    printf("  nt': %08x\n", prng_successor(nt, 64));
+    printf(" nt'': %08x\n", prng_successor(nt, 96));
 
     // Extract the keystream from the messages
     printf("\nKeystream used to generate {ar} and {at}:\n");
     ks2 = ar_enc ^ prng_successor(nt, 64);
     ks3 = at_enc ^ prng_successor(nt, 96);
-    printf("  ks2: %08x\n",ks2);
-    printf("  ks3: %08x\n",ks3);
+    printf("  ks2: %08x\n", ks2);
+    printf("  ks3: %08x\n", ks3);
 
     revstate = lfsr_recovery64(ks2, ks3);
 
     // Decrypting communication using keystream if presented
-    if (argc > 6 ) {
+    if (argc > 6) {
         printf("\nDecrypted communication:\n");
         uint8_t ks4;
         int rollb = 0;
diff --git a/tools/nonce2key/crapto1.c b/tools/nonce2key/crapto1.c
index c4701b7e9..322e9f262 100644
--- a/tools/nonce2key/crapto1.c
+++ b/tools/nonce2key/crapto1.c
@@ -24,9 +24,9 @@
 static uint8_t filterlut[1 << 20];
 static void __attribute__((constructor)) fill_lut()
 {
-        uint32_t i;
-        for(i = 0; i < 1 << 20; ++i)
-                filterlut[i] = filter(i);
+    uint32_t i;
+    for (i = 0; i < 1 << 20; ++i)
+        filterlut[i] = filter(i);
 }
 #define filter(x) (filterlut[(x) & 0xfffff])
 #endif
@@ -43,13 +43,13 @@ typedef bucket_t bucket_array_t[2][0x100];
 typedef struct bucket_info {
     struct {
         uint32_t *head, *tail;
-        } bucket_info[2][0x100];
-        uint32_t numbuckets;
-    } bucket_info_t;
+    } bucket_info[2][0x100];
+    uint32_t numbuckets;
+} bucket_info_t;
 
 
-static void bucket_sort_intersect(uint32_t* const estart, uint32_t* const estop,
-                                  uint32_t* const ostart, uint32_t* const ostop,
+static void bucket_sort_intersect(uint32_t *const estart, uint32_t *const estop,
+                                  uint32_t *const ostart, uint32_t *const ostop,
                                   bucket_info_t *bucket_info, bucket_array_t bucket)
 {
     uint32_t *p1, *p2;
@@ -92,7 +92,7 @@ static void bucket_sort_intersect(uint32_t* const estart, uint32_t* const estop,
             }
         }
         bucket_info->numbuckets = nonempty_bucket;
-        }
+    }
 }
 
 /** update_contribution
@@ -113,12 +113,12 @@ static inline void update_contribution(uint32_t *item, const uint32_t mask1, con
 static inline void extend_table(uint32_t *tbl, uint32_t **end, int bit, int m1, int m2, uint32_t in)
 {
     in <<= 24;
-    for(*tbl <<= 1; tbl <= *end; *++tbl <<= 1)
-        if(filter(*tbl) ^ filter(*tbl | 1)) {
+    for (*tbl <<= 1; tbl <= *end; *++tbl <<= 1)
+        if (filter(*tbl) ^ filter(*tbl | 1)) {
             *tbl |= filter(*tbl) ^ bit;
             update_contribution(tbl, m1, m2);
             *tbl ^= in;
-        } else if(filter(*tbl) == bit) {
+        } else if (filter(*tbl) == bit) {
             *++*end = tbl[1];
             tbl[1] = tbl[0] | 1;
             update_contribution(tbl, m1, m2);
@@ -133,10 +133,10 @@ static inline void extend_table(uint32_t *tbl, uint32_t **end, int bit, int m1,
  */
 static inline void extend_table_simple(uint32_t *tbl, uint32_t **end, int bit)
 {
-    for(*tbl <<= 1; tbl <= *end; *++tbl <<= 1) {
-        if(filter(*tbl) ^ filter(*tbl | 1)) {   // replace
+    for (*tbl <<= 1; tbl <= *end; *++tbl <<= 1) {
+        if (filter(*tbl) ^ filter(*tbl | 1)) {  // replace
             *tbl |= filter(*tbl) ^ bit;
-        } else if(filter(*tbl) == bit) {        // insert
+        } else if (filter(*tbl) == bit) {       // insert
             *++*end = *++tbl;
             *tbl = tbl[-1] | 1;
         } else {                                // drop
@@ -147,18 +147,18 @@ static inline void extend_table_simple(uint32_t *tbl, uint32_t **end, int bit)
 /** recover
  * recursively narrow down the search space, 4 bits of keystream at a time
  */
-static struct Crypto1State*
+static struct Crypto1State *
 recover(uint32_t *o_head, uint32_t *o_tail, uint32_t oks,
-    uint32_t *e_head, uint32_t *e_tail, uint32_t eks, int rem,
-    struct Crypto1State *sl, uint32_t in, bucket_array_t bucket)
+        uint32_t *e_head, uint32_t *e_tail, uint32_t eks, int rem,
+        struct Crypto1State *sl, uint32_t in, bucket_array_t bucket)
 {
     uint32_t *o, *e;
     bucket_info_t bucket_info;
 
-    if(rem == -1) {
-        for(e = e_head; e <= e_tail; ++e) {
+    if (rem == -1) {
+        for (e = e_head; e <= e_tail; ++e) {
             *e = *e << 1 ^ parity(*e & LF_POLY_EVEN) ^ !!(in & 4);
-            for(o = o_head; o <= o_tail; ++o, ++sl) {
+            for (o = o_head; o <= o_tail; ++o, ++sl) {
                 sl->even = *o;
                 sl->odd = *e ^ parity(*o & LF_POLY_ODD);
                 sl[1].odd = sl[1].even = 0;
@@ -167,16 +167,16 @@ recover(uint32_t *o_head, uint32_t *o_tail, uint32_t oks,
         return sl;
     }
 
-    for(uint32_t i = 0; i < 4 && rem--; i++) {
+    for (uint32_t i = 0; i < 4 && rem--; i++) {
         oks >>= 1;
         eks >>= 1;
         in >>= 2;
         extend_table(o_head, &o_tail, oks & 1, LF_POLY_EVEN << 1 | 1, LF_POLY_ODD << 1, 0);
-        if(o_head > o_tail)
+        if (o_head > o_tail)
             return sl;
 
         extend_table(e_head, &e_tail, eks & 1, LF_POLY_ODD, LF_POLY_EVEN << 1 | 1, in & 3);
-        if(e_head > e_tail)
+        if (e_head > e_tail)
             return sl;
     }
 
@@ -186,7 +186,7 @@ recover(uint32_t *o_head, uint32_t *o_tail, uint32_t oks,
         sl = recover(bucket_info.bucket_info[1][i].head, bucket_info.bucket_info[1][i].tail, oks,
                      bucket_info.bucket_info[0][i].head, bucket_info.bucket_info[0][i].tail, eks,
                      rem, sl, in, bucket);
-        }
+    }
 
     return sl;
 }
@@ -195,7 +195,7 @@ recover(uint32_t *o_head, uint32_t *o_tail, uint32_t oks,
  * additionally you can use the in parameter to specify the value
  * that was fed into the lfsr at the time the keystream was generated
  */
-struct Crypto1State* lfsr_recovery32(uint32_t ks2, uint32_t in)
+struct Crypto1State *lfsr_recovery32(uint32_t ks2, uint32_t in)
 {
     struct Crypto1State *statelist;
     uint32_t *odd_head = 0, *odd_tail = 0, oks = 0;
@@ -203,15 +203,15 @@ struct Crypto1State* lfsr_recovery32(uint32_t ks2, uint32_t in)
     int i;
 
     // split the keystream into an odd and even part
-    for(i = 31; i >= 0; i -= 2)
+    for (i = 31; i >= 0; i -= 2)
         oks = oks << 1 | BEBIT(ks2, i);
-    for(i = 30; i >= 0; i -= 2)
+    for (i = 30; i >= 0; i -= 2)
         eks = eks << 1 | BEBIT(ks2, i);
 
     odd_head = odd_tail = malloc(sizeof(uint32_t) << 21);
     even_head = even_tail = malloc(sizeof(uint32_t) << 21);
     statelist =  malloc(sizeof(struct Crypto1State) << 18);
-    if(!odd_tail-- || !even_tail-- || !statelist) {
+    if (!odd_tail-- || !even_tail-- || !statelist) {
         free(statelist);
         statelist = 0;
         goto out;
@@ -224,7 +224,7 @@ struct Crypto1State* lfsr_recovery32(uint32_t ks2, uint32_t in)
 
     for (uint32_t i = 0; i < 2; i++) {
         for (uint32_t j = 0; j <= 0xff; j++) {
-            bucket[i][j].head = malloc(sizeof(uint32_t)<<14);
+            bucket[i][j].head = malloc(sizeof(uint32_t) << 14);
             if (!bucket[i][j].head) {
                 goto out;
             }
@@ -232,15 +232,15 @@ struct Crypto1State* lfsr_recovery32(uint32_t ks2, uint32_t in)
     }
 
     // initialize statelists: add all possible states which would result into the rightmost 2 bits of the keystream
-    for(i = 1 << 20; i >= 0; --i) {
-        if(filter(i) == (oks & 1))
+    for (i = 1 << 20; i >= 0; --i) {
+        if (filter(i) == (oks & 1))
             *++odd_tail = i;
-        if(filter(i) == (eks & 1))
+        if (filter(i) == (eks & 1))
             *++even_tail = i;
     }
 
     // extend the statelists. Look at the next 8 Bits of the keystream (4 Bit each odd and even):
-    for(i = 0; i < 4; i++) {
+    for (i = 0; i < 4; i++) {
         extend_table_simple(odd_head,  &odd_tail, (oks >>= 1) & 1);
         extend_table_simple(even_head, &even_tail, (eks >>= 1) & 1);
     }
@@ -261,29 +261,33 @@ out:
 }
 
 static const uint32_t S1[] = {     0x62141, 0x310A0, 0x18850, 0x0C428, 0x06214,
-    0x0310A, 0x85E30, 0xC69AD, 0x634D6, 0xB5CDE, 0xDE8DA, 0x6F46D, 0xB3C83,
-    0x59E41, 0xA8995, 0xD027F, 0x6813F, 0x3409F, 0x9E6FA};
+                                   0x0310A, 0x85E30, 0xC69AD, 0x634D6, 0xB5CDE, 0xDE8DA, 0x6F46D, 0xB3C83,
+                                   0x59E41, 0xA8995, 0xD027F, 0x6813F, 0x3409F, 0x9E6FA
+                             };
 static const uint32_t S2[] = {  0x3A557B00, 0x5D2ABD80, 0x2E955EC0, 0x174AAF60,
-    0x0BA557B0, 0x05D2ABD8, 0x0449DE68, 0x048464B0, 0x42423258, 0x278192A8,
-    0x156042D0, 0x0AB02168, 0x43F89B30, 0x61FC4D98, 0x765EAD48, 0x7D8FDD20,
-    0x7EC7EE90, 0x7F63F748, 0x79117020};
+                                0x0BA557B0, 0x05D2ABD8, 0x0449DE68, 0x048464B0, 0x42423258, 0x278192A8,
+                                0x156042D0, 0x0AB02168, 0x43F89B30, 0x61FC4D98, 0x765EAD48, 0x7D8FDD20,
+                                0x7EC7EE90, 0x7F63F748, 0x79117020
+                             };
 static const uint32_t T1[] = {
     0x4F37D, 0x279BE, 0x97A6A, 0x4BD35, 0x25E9A, 0x12F4D, 0x097A6, 0x80D66,
     0xC4006, 0x62003, 0xB56B4, 0x5AB5A, 0xA9318, 0xD0F39, 0x6879C, 0xB057B,
     0x582BD, 0x2C15E, 0x160AF, 0x8F6E2, 0xC3DC4, 0xE5857, 0x72C2B, 0x39615,
-    0x98DBF, 0xC806A, 0xE0680, 0x70340, 0x381A0, 0x98665, 0x4C332, 0xA272C};
+    0x98DBF, 0xC806A, 0xE0680, 0x70340, 0x381A0, 0x98665, 0x4C332, 0xA272C
+};
 static const uint32_t T2[] = {  0x3C88B810, 0x5E445C08, 0x2982A580, 0x14C152C0,
-    0x4A60A960, 0x253054B0, 0x52982A58, 0x2FEC9EA8, 0x1156C4D0, 0x08AB6268,
-    0x42F53AB0, 0x217A9D58, 0x161DC528, 0x0DAE6910, 0x46D73488, 0x25CB11C0,
-    0x52E588E0, 0x6972C470, 0x34B96238, 0x5CFC3A98, 0x28DE96C8, 0x12CFC0E0,
-    0x4967E070, 0x64B3F038, 0x74F97398, 0x7CDC3248, 0x38CE92A0, 0x1C674950,
-    0x0E33A4A8, 0x01B959D0, 0x40DCACE8, 0x26CEDDF0};
+                                0x4A60A960, 0x253054B0, 0x52982A58, 0x2FEC9EA8, 0x1156C4D0, 0x08AB6268,
+                                0x42F53AB0, 0x217A9D58, 0x161DC528, 0x0DAE6910, 0x46D73488, 0x25CB11C0,
+                                0x52E588E0, 0x6972C470, 0x34B96238, 0x5CFC3A98, 0x28DE96C8, 0x12CFC0E0,
+                                0x4967E070, 0x64B3F038, 0x74F97398, 0x7CDC3248, 0x38CE92A0, 0x1C674950,
+                                0x0E33A4A8, 0x01B959D0, 0x40DCACE8, 0x26CEDDF0
+                             };
 static const uint32_t C1[] = { 0x846B5, 0x4235A, 0x211AD};
 static const uint32_t C2[] = { 0x1A822E0, 0x21A822E0, 0x21A822E0};
 /** Reverse 64 bits of keystream into possible cipher states
  * Variation mentioned in the paper. Somewhat optimized version
  */
-struct Crypto1State* lfsr_recovery64(uint32_t ks2, uint32_t ks3)
+struct Crypto1State *lfsr_recovery64(uint32_t ks2, uint32_t ks3)
 {
     struct Crypto1State *statelist, *sl;
     uint8_t oks[32], eks[32], hi[32];
@@ -292,50 +296,50 @@ struct Crypto1State* lfsr_recovery64(uint32_t ks2, uint32_t ks3)
     int i, j;
 
     sl = statelist = malloc(sizeof(struct Crypto1State) << 4);
-    if(!sl)
+    if (!sl)
         return 0;
     sl->odd = sl->even = 0;
 
-    for(i = 30; i >= 0; i -= 2) {
+    for (i = 30; i >= 0; i -= 2) {
         oks[i >> 1] = BEBIT(ks2, i);
         oks[16 + (i >> 1)] = BEBIT(ks3, i);
     }
-    for(i = 31; i >= 0; i -= 2) {
+    for (i = 31; i >= 0; i -= 2) {
         eks[i >> 1] = BEBIT(ks2, i);
         eks[16 + (i >> 1)] = BEBIT(ks3, i);
     }
 
-    for(i = 0xfffff; i >= 0; --i) {
+    for (i = 0xfffff; i >= 0; --i) {
         if (filter(i) != oks[0])
             continue;
 
         *(tail = table) = i;
-        for(j = 1; tail >= table && j < 29; ++j)
+        for (j = 1; tail >= table && j < 29; ++j)
             extend_table_simple(table, &tail, oks[j]);
 
-        if(tail < table)
+        if (tail < table)
             continue;
 
-        for(j = 0; j < 19; ++j)
+        for (j = 0; j < 19; ++j)
             low = low << 1 | parity(i & S1[j]);
-        for(j = 0; j < 32; ++j)
+        for (j = 0; j < 32; ++j)
             hi[j] = parity(i & T1[j]);
 
-        for(; tail >= table; --tail) {
-            for(j = 0; j < 3; ++j) {
+        for (; tail >= table; --tail) {
+            for (j = 0; j < 3; ++j) {
                 *tail = *tail << 1;
                 *tail |= parity((i & C1[j]) ^ (*tail & C2[j]));
-                if(filter(*tail) != oks[29 + j])
+                if (filter(*tail) != oks[29 + j])
                     goto continue2;
             }
 
-            for(j = 0; j < 19; ++j)
+            for (j = 0; j < 19; ++j)
                 win = win << 1 | parity(*tail & S2[j]);
 
             win ^= low;
-            for(j = 0; j < 32; ++j) {
+            for (j = 0; j < 32; ++j) {
                 win = win << 1 ^ hi[j] ^ parity(*tail & T2[j]);
-                if(filter(win) != eks[j])
+                if (filter(win) != eks[j])
                     goto continue2;
             }
 
@@ -344,7 +348,8 @@ struct Crypto1State* lfsr_recovery64(uint32_t ks2, uint32_t ks3)
             sl->even = win;
             ++sl;
             sl->odd = sl->even = 0;
-            continue2:;
+continue2:
+            ;
         }
     }
     return statelist;
@@ -380,7 +385,7 @@ uint8_t lfsr_rollback_byte(struct Crypto1State *s, uint32_t in, int fb)
     int i, ret = 0;
     for (i = 7; i >= 0; --i)
         ret |= lfsr_rollback_bit(s, BIT(in, i), fb) << i;
-*/
+    */
 // unfold loop 20160112
     uint8_t ret = 0;
     ret |= lfsr_rollback_bit(s, BIT(in, 7), fb) << 7;
@@ -403,7 +408,7 @@ uint32_t lfsr_rollback_word(struct Crypto1State *s, uint32_t in, int fb)
     uint32_t ret = 0;
     for (i = 31; i >= 0; --i)
         ret |= lfsr_rollback_bit(s, BEBIT(in, i), fb) << (i ^ 24);
-*/
+    */
 // unfold loop 20160112
     uint32_t ret = 0;
     ret |= lfsr_rollback_bit(s, BEBIT(in, 31), fb) << (31 ^ 24);
@@ -451,9 +456,9 @@ static uint16_t *dist = 0;
 int nonce_distance(uint32_t from, uint32_t to)
 {
     uint16_t x, i;
-    if(!dist) {
+    if (!dist) {
         dist = malloc(2 << 16);
-        if(!dist)
+        if (!dist)
             return -1;
         for (x = i = 1; i; ++i) {
             dist[(x & 0xff) << 8 | x >> 8] = i;
@@ -466,7 +471,8 @@ int nonce_distance(uint32_t from, uint32_t to)
 
 static uint32_t fastfwd[2][8] = {
     { 0, 0x4BC53, 0xECB1, 0x450E2, 0x25E29, 0x6E27A, 0x2B298, 0x60ECB},
-    { 0, 0x1D962, 0x4BC53, 0x56531, 0xECB1, 0x135D3, 0x450E2, 0x58980}};
+    { 0, 0x1D962, 0x4BC53, 0x56531, 0xECB1, 0x135D3, 0x450E2, 0x58980}
+};
 
 
 /** lfsr_prefix_ks
@@ -481,18 +487,18 @@ static uint32_t fastfwd[2][8] = {
 uint32_t *lfsr_prefix_ks(uint8_t ks[8], int isodd)
 {
     uint32_t *candidates = malloc(4 << 10);
-    if(!candidates) return 0;
+    if (!candidates) return 0;
 
     uint32_t c,  entry;
     int size = 0, i, good;
 
-    for(i = 0; i < 1 << 21; ++i) {
-        for(c = 0, good = 1; good && c < 8; ++c) {
+    for (i = 0; i < 1 << 21; ++i) {
+        for (c = 0, good = 1; good && c < 8; ++c) {
             entry = i ^ fastfwd[isodd][c];
             good &= (BIT(ks[c], isodd) == filter(entry >> 1));
             good &= (BIT(ks[c], isodd + 2) == filter(entry));
         }
-        if(good)
+        if (good)
             candidates[size++] = i;
     }
 
@@ -504,11 +510,11 @@ uint32_t *lfsr_prefix_ks(uint8_t ks[8], int isodd)
 /** check_pfx_parity
  * helper function which eliminates possible secret states using parity bits
  */
-static struct Crypto1State* check_pfx_parity(uint32_t prefix, uint32_t rresp, uint8_t parities[8][8], uint32_t odd, uint32_t even, struct Crypto1State* sl)
+static struct Crypto1State *check_pfx_parity(uint32_t prefix, uint32_t rresp, uint8_t parities[8][8], uint32_t odd, uint32_t even, struct Crypto1State *sl)
 {
     uint32_t ks1, nr, ks2, rr, ks3, c, good = 1;
 
-    for(c = 0; good && c < 8; ++c) {
+    for (c = 0; good && c < 8; ++c) {
         sl->odd = odd ^ fastfwd[1][c];
         sl->even = even ^ fastfwd[0][c];
 
@@ -542,7 +548,7 @@ static struct Crypto1State* check_pfx_parity(uint32_t prefix, uint32_t rresp, ui
  * tag nonce was fed in
  */
 
-struct Crypto1State* lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8])
+struct Crypto1State *lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8])
 {
     struct Crypto1State *statelist, *s;
     uint32_t *odd, *even, *o, *e, top;
@@ -550,16 +556,16 @@ struct Crypto1State* lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8]
     odd = lfsr_prefix_ks(ks, 1);
     even = lfsr_prefix_ks(ks, 0);
 
-    s = statelist = malloc((sizeof *statelist) << 20);
-    if(!s || !odd || !even) {
+    s = statelist = malloc((sizeof * statelist) << 20);
+    if (!s || !odd || !even) {
         free(statelist);
         statelist = 0;
-                goto out;
+        goto out;
     }
 
-    for(o = odd; *o + 1; ++o)
-        for(e = even; *e + 1; ++e)
-            for(top = 0; top < 64; ++top) {
+    for (o = odd; *o + 1; ++o)
+        for (e = even; *e + 1; ++e)
+            for (top = 0; top < 64; ++top) {
                 *o += 1 << 21;
                 *e += (!(top & 7) + 1) << 21;
                 s = check_pfx_parity(pfx, rr, par, *o, *e, s);
diff --git a/tools/nonce2key/crapto1.h b/tools/nonce2key/crapto1.h
index 4117dd6a1..acede65a1 100644
--- a/tools/nonce2key/crapto1.h
+++ b/tools/nonce2key/crapto1.h
@@ -25,22 +25,22 @@ extern "C" {
 #endif
 
 struct Crypto1State {uint32_t odd, even;};
-struct Crypto1State* crypto1_create(uint64_t);
-void crypto1_destroy(struct Crypto1State*);
-void crypto1_get_lfsr(struct Crypto1State*, uint64_t*);
-uint8_t crypto1_bit(struct Crypto1State*, uint8_t, int);
-uint8_t crypto1_byte(struct Crypto1State*, uint8_t, int);
-uint32_t crypto1_word(struct Crypto1State*, uint32_t, int);
+struct Crypto1State *crypto1_create(uint64_t);
+void crypto1_destroy(struct Crypto1State *);
+void crypto1_get_lfsr(struct Crypto1State *, uint64_t *);
+uint8_t crypto1_bit(struct Crypto1State *, uint8_t, int);
+uint8_t crypto1_byte(struct Crypto1State *, uint8_t, int);
+uint32_t crypto1_word(struct Crypto1State *, uint32_t, int);
 uint32_t prng_successor(uint32_t x, uint32_t n);
 
-struct Crypto1State* lfsr_recovery32(uint32_t ks2, uint32_t in);
-struct Crypto1State* lfsr_recovery64(uint32_t ks2, uint32_t ks3);
+struct Crypto1State *lfsr_recovery32(uint32_t ks2, uint32_t in);
+struct Crypto1State *lfsr_recovery64(uint32_t ks2, uint32_t ks3);
 uint32_t *lfsr_prefix_ks(uint8_t ks[8], int isodd);
-struct Crypto1State* lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8]);
+struct Crypto1State *lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8]);
 
-uint8_t lfsr_rollback_bit(struct Crypto1State* s, uint32_t in, int fb);
-uint8_t lfsr_rollback_byte(struct Crypto1State* s, uint32_t in, int fb);
-uint32_t lfsr_rollback_word(struct Crypto1State* s, uint32_t in, int fb);
+uint8_t lfsr_rollback_bit(struct Crypto1State *s, uint32_t in, int fb);
+uint8_t lfsr_rollback_byte(struct Crypto1State *s, uint32_t in, int fb);
+uint32_t lfsr_rollback_word(struct Crypto1State *s, uint32_t in, int fb);
 int nonce_distance(uint32_t from, uint32_t to);
 #define SWAPENDIAN(x)\
     (x = (x >> 8 & 0xff00ff) | (x & 0xff00ff) << 8, x = x >> 16 | x << 16)
@@ -68,13 +68,13 @@ static inline int parity(uint32_t x)
     x ^= x >> 4;
     return BIT(0x6996, x & 0xf);
 #else
-        __asm__(    "movl %1, %%eax\n"
-        "mov %%ax, %%cx\n"
-        "shrl $0x10, %%eax\n"
-        "xor %%ax, %%cx\n"
-                "xor %%ch, %%cl\n"
-                "setpo %%al\n"
-                "movzx %%al, %0\n": "=r"(x) : "r"(x): "eax","ecx");
+    __asm__("movl %1, %%eax\n"
+            "mov %%ax, %%cx\n"
+            "shrl $0x10, %%eax\n"
+            "xor %%ax, %%cx\n"
+            "xor %%ch, %%cl\n"
+            "setpo %%al\n"
+            "movzx %%al, %0\n": "=r"(x) : "r"(x): "eax", "ecx");
     return x;
 #endif
 }
diff --git a/tools/nonce2key/crypto1.c b/tools/nonce2key/crypto1.c
index e8384c16a..248529433 100644
--- a/tools/nonce2key/crypto1.c
+++ b/tools/nonce2key/crypto1.c
@@ -20,16 +20,16 @@
 #include "crapto1.h"
 #include <stdlib.h>
 
-struct Crypto1State * crypto1_create(uint64_t key)
+struct Crypto1State *crypto1_create(uint64_t key)
 {
     struct Crypto1State *s = malloc(sizeof(*s));
-    if ( !s ) return NULL;
+    if (!s) return NULL;
 
     s->odd = s->even = 0;
 
     int i;
     //for(i = 47;s && i > 0; i -= 2) {
-    for(i = 47; i > 0; i -= 2) {
+    for (i = 47; i > 0; i -= 2) {
         s->odd  = s->odd  << 1 | BIT(key, (i - 1) ^ 7);
         s->even = s->even << 1 | BIT(key, i ^ 7);
     }
@@ -42,7 +42,7 @@ void crypto1_destroy(struct Crypto1State *state)
 void crypto1_get_lfsr(struct Crypto1State *state, uint64_t *lfsr)
 {
     int i;
-    for(*lfsr = 0, i = 23; i >= 0; --i) {
+    for (*lfsr = 0, i = 23; i >= 0; --i) {
         *lfsr = *lfsr << 1 | BIT(state->odd, i ^ 3);
         *lfsr = *lfsr << 1 | BIT(state->even, i ^ 3);
     }
@@ -92,7 +92,7 @@ uint32_t crypto1_word(struct Crypto1State *s, uint32_t in, int is_encrypted)
 
     for (i = 0; i < 32; ++i)
         ret |= crypto1_bit(s, BEBIT(in, i), is_encrypted) << (i ^ 24);
-*/
+    */
 //unfold loop 2016012
     uint32_t ret = 0;
     ret |= crypto1_bit(s, BEBIT(in, 0), is_encrypted) << (0 ^ 24);
@@ -139,7 +139,7 @@ uint32_t crypto1_word(struct Crypto1State *s, uint32_t in, int is_encrypted)
 uint32_t prng_successor(uint32_t x, uint32_t n)
 {
     SWAPENDIAN(x);
-    while(n--)
+    while (n--)
         x = x >> 1 | (x >> 16 ^ x >> 18 ^ x >> 19 ^ x >> 21) << 31;
 
     return SWAPENDIAN(x);
diff --git a/tools/nonce2key/nonce2key.c b/tools/nonce2key/nonce2key.c
index 52b7998ae..1b5ee8e47 100644
--- a/tools/nonce2key/nonce2key.c
+++ b/tools/nonce2key/nonce2key.c
@@ -3,7 +3,8 @@
 #include <inttypes.h>
 #include <stdio.h>
 
-int main(const int argc, const char* argv[]) {
+int main(const int argc, const char *argv[])
+{
     struct Crypto1State *state;
     uint32_t pos, uid, nt, nr, rr, nr_diff;
     uint8_t bt, i, ks3x[8], par[8][8];
@@ -13,44 +14,44 @@ int main(const int argc, const char* argv[]) {
     nr = rr = 0;
 
     if (argc < 5) {
-        printf("\nsyntax: %s <uid> <nt> <par> <ks>\n\n",argv[0]);
+        printf("\nsyntax: %s <uid> <nt> <par> <ks>\n\n", argv[0]);
         return 1;
     }
-    sscanf(argv[1],"%08x", &uid);
-    sscanf(argv[2],"%08x", &nt);
-    sscanf(argv[3],"%016" SCNx64 ,&par_info);
-    sscanf(argv[4],"%016" SCNx64 ,&ks_info);
+    sscanf(argv[1], "%08x", &uid);
+    sscanf(argv[2], "%08x", &nt);
+    sscanf(argv[3], "%016" SCNx64, &par_info);
+    sscanf(argv[4], "%016" SCNx64, &ks_info);
 
     // Reset the last three significant bits of the reader nonce
     nr &= 0xffffff1f;
 
     printf("\nuid(%08x) nt(%08x) par(%016" PRIx64 ") ks(%016" PRIx64 ")\n\n", uid, nt, par_info, ks_info);
 
-    for ( pos = 0; pos < 8; pos++ ) {
-        ks3x[7-pos] = (ks_info >> (pos*8)) & 0x0f;
-        bt = (par_info >> (pos*8)) & 0xff;
+    for (pos = 0; pos < 8; pos++) {
+        ks3x[7 - pos] = (ks_info >> (pos * 8)) & 0x0f;
+        bt = (par_info >> (pos * 8)) & 0xff;
 
-        for ( i = 0; i < 8; i++) {
-            par[7-pos][i] = (bt >> i) & 0x01;
+        for (i = 0; i < 8; i++) {
+            par[7 - pos][i] = (bt >> i) & 0x01;
         }
     }
 
     printf("|diff|{nr}    |ks3|ks3^5|parity         |\n");
     printf("+----+--------+---+-----+---------------+\n");
 
-    for ( i = 0; i < 8; i++) {
+    for (i = 0; i < 8; i++) {
         nr_diff = nr | i << 5;
-        printf("| %02x |%08x| %01x |  %01x  |", i << 5, nr_diff, ks3x[i], ks3x[i]^5);
+        printf("| %02x |%08x| %01x |  %01x  |", i << 5, nr_diff, ks3x[i], ks3x[i] ^ 5);
 
-        for ( pos = 0; pos < 7; pos++)
+        for (pos = 0; pos < 7; pos++)
             printf("%01x,", par[i][pos]);
         printf("%01x|\n", par[i][7]);
     }
     printf("+----+--------+---+-----+---------------+\n");
 
-    state = lfsr_common_prefix(nr,rr,ks3x,par);
-    lfsr_rollback_word(state,uid^nt,0);
-    crypto1_get_lfsr(state,&key_recovered);
+    state = lfsr_common_prefix(nr, rr, ks3x, par);
+    lfsr_rollback_word(state, uid ^ nt, 0);
+    crypto1_get_lfsr(state, &key_recovered);
     printf("\nkey recovered: %012" PRIx64 "\n\n", key_recovered);
     crypto1_destroy(state);
     return 0;
diff --git a/uart/uart.h b/uart/uart.h
index f7bd2117f..582f394e7 100644
--- a/uart/uart.h
+++ b/uart/uart.h
@@ -55,7 +55,7 @@
  * makes sense to your connection method. Both the posix and win32
  * implementations define their own structs in place.
  */
-typedef void* serial_port;
+typedef void *serial_port;
 
 /* Returned by uart_open if the serial port specified was invalid.
  */
@@ -71,7 +71,7 @@ typedef void* serial_port;
  *
  * On errors, this method returns INVALID_SERIAL_PORT or CLAIMED_SERIAL_PORT.
  */
-serial_port uart_open(const char* pcPortName);
+serial_port uart_open(const char *pcPortName);
 
 /* Closes the given port.
  */
@@ -88,13 +88,13 @@ void uart_close(const serial_port sp);
  * partial read may have completed into the buffer by the corresponding
  * implementation, so pszRxLen should be checked to see if any data was written.
  */
-bool uart_receive(const serial_port sp, uint8_t* pbtRx, size_t pszMaxRxLen, size_t* pszRxLen);
+bool uart_receive(const serial_port sp, uint8_t *pbtRx, size_t pszMaxRxLen, size_t *pszRxLen);
 
 /* Sends a buffer to a given serial port.
  *   pbtTx: A pointer to a buffer containing the data to send.
  *   len: The amount of data to be sent.
  */
-bool uart_send(const serial_port sp, const uint8_t* pbtTx, const size_t len);
+bool uart_send(const serial_port sp, const uint8_t *pbtTx, const size_t len);
 
 /* Sets the current speed of the serial port, in baud.
  */
diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index b2639f2f0..37d2cea44 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -73,8 +73,9 @@ struct timeval timeout = {
     .tv_usec = 30000  // 30 000 micro seconds
 };
 
-serial_port uart_open(const char* pcPortName) {
-    serial_port_unix* sp = calloc(sizeof(serial_port_unix), sizeof(uint8_t));
+serial_port uart_open(const char *pcPortName)
+{
+    serial_port_unix *sp = calloc(sizeof(serial_port_unix), sizeof(uint8_t));
     if (sp == 0) return INVALID_SERIAL_PORT;
 
     if (memcmp(pcPortName, "tcp:", 4) == 0) {
@@ -135,7 +136,7 @@ serial_port uart_open(const char* pcPortName) {
 
         int one = 1;
         int res = setsockopt(sp->fd, SOL_TCP, TCP_NODELAY, &one, sizeof(one));
-        if ( res != 0) {
+        if (res != 0) {
             free(sp);
             return INVALID_SERIAL_PORT;
         }
@@ -166,7 +167,7 @@ serial_port uart_open(const char* pcPortName) {
     }
 
     // Try to retrieve the old (current) terminal info struct
-    if (tcgetattr(sp->fd,&sp->tiOld) == -1) {
+    if (tcgetattr(sp->fd, &sp->tiOld) == -1) {
         uart_close(sp);
         return INVALID_SERIAL_PORT;
     }
@@ -191,11 +192,11 @@ serial_port uart_open(const char* pcPortName) {
         return INVALID_SERIAL_PORT;
     }
 
-  // Flush all lingering data that may exist
-  tcflush(sp->fd, TCIOFLUSH);
+    // Flush all lingering data that may exist
+    tcflush(sp->fd, TCIOFLUSH);
 
 #ifdef WITH_FPC
-    if ( uart_set_speed(sp, 115200) ) {
+    if (uart_set_speed(sp, 115200)) {
         printf("[=] UART Setting serial baudrate 115200 [FPC enabled]\n");
     } else {
         uart_set_speed(sp, 9600);
@@ -214,8 +215,9 @@ serial_port uart_open(const char* pcPortName) {
     return sp;
 }
 
-void uart_close(const serial_port sp) {
-    serial_port_unix* spu = (serial_port_unix*)sp;
+void uart_close(const serial_port sp)
+{
+    serial_port_unix *spu = (serial_port_unix *)sp;
     tcflush(spu->fd, TCIOFLUSH);
     tcsetattr(spu->fd, TCSANOW, &(spu->tiOld));
     struct flock fl;
@@ -227,14 +229,15 @@ void uart_close(const serial_port sp) {
 
     // Does the system allows us to place a lock on this file descriptor
     int err = fcntl(spu->fd, F_SETLK, &fl);
-    if ( err == -1) {
+    if (err == -1) {
         //perror("fcntl");
     }
     close(spu->fd);
     free(sp);
 }
 
-bool uart_receive(const serial_port sp, uint8_t* pbtRx, size_t pszMaxRxLen, size_t* pszRxLen) {
+bool uart_receive(const serial_port sp, uint8_t *pbtRx, size_t pszMaxRxLen, size_t *pszRxLen)
+{
     int res;
     int byteCount;
     fd_set rfds;
@@ -246,9 +249,9 @@ bool uart_receive(const serial_port sp, uint8_t* pbtRx, size_t pszMaxRxLen, size
     do {
         // Reset file descriptor
         FD_ZERO(&rfds);
-        FD_SET(((serial_port_unix*)sp)->fd, &rfds);
+        FD_SET(((serial_port_unix *)sp)->fd, &rfds);
         tv = timeout;
-        res = select(((serial_port_unix*)sp)->fd + 1, &rfds, NULL, NULL, &tv);
+        res = select(((serial_port_unix *)sp)->fd + 1, &rfds, NULL, NULL, &tv);
 
         // Read error
         if (res < 0) {
@@ -267,7 +270,7 @@ bool uart_receive(const serial_port sp, uint8_t* pbtRx, size_t pszMaxRxLen, size
         }
 
         // Retrieve the count of the incoming bytes
-        res = ioctl(((serial_port_unix*)sp)->fd, FIONREAD, &byteCount);
+        res = ioctl(((serial_port_unix *)sp)->fd, FIONREAD, &byteCount);
         if (res < 0) return false;
 
         // Cap the number of bytes, so we don't overrun the buffer
@@ -276,7 +279,7 @@ bool uart_receive(const serial_port sp, uint8_t* pbtRx, size_t pszMaxRxLen, size
         }
 
         // There is something available, read the data
-        res = read(((serial_port_unix*)sp)->fd, pbtRx + (*pszRxLen), byteCount);
+        res = read(((serial_port_unix *)sp)->fd, pbtRx + (*pszRxLen), byteCount);
 
         // Stop if the OS has some troubles reading the data
         if (res <= 0) return false;
@@ -293,7 +296,8 @@ bool uart_receive(const serial_port sp, uint8_t* pbtRx, size_t pszMaxRxLen, size
     return true;
 }
 
-bool uart_send(const serial_port sp, const uint8_t* pbtTx, const size_t len) {
+bool uart_send(const serial_port sp, const uint8_t *pbtTx, const size_t len)
+{
     int32_t res;
     size_t pos = 0;
     fd_set rfds;
@@ -302,9 +306,9 @@ bool uart_send(const serial_port sp, const uint8_t* pbtTx, const size_t len) {
     while (pos < len) {
         // Reset file descriptor
         FD_ZERO(&rfds);
-        FD_SET(((serial_port_unix*)sp)->fd, &rfds);
+        FD_SET(((serial_port_unix *)sp)->fd, &rfds);
         tv = timeout;
-        res = select(((serial_port_unix*)sp)->fd+1, NULL, &rfds, NULL, &tv);
+        res = select(((serial_port_unix *)sp)->fd + 1, NULL, &rfds, NULL, &tv);
 
         // Write error
         if (res < 0) {
@@ -319,7 +323,7 @@ bool uart_send(const serial_port sp, const uint8_t* pbtTx, const size_t len) {
         }
 
         // Send away the bytes
-        res = write(((serial_port_unix*)sp)->fd, pbtTx + pos, len - pos);
+        res = write(((serial_port_unix *)sp)->fd, pbtTx + pos, len - pos);
 
         // Stop if the OS has some troubles sending the data
         if (res <= 0) return false;
@@ -329,45 +333,87 @@ bool uart_send(const serial_port sp, const uint8_t* pbtTx, const size_t len) {
     return true;
 }
 
-bool uart_set_speed(serial_port sp, const uint32_t uiPortSpeed) {
-    const serial_port_unix* spu = (serial_port_unix*)sp;
+bool uart_set_speed(serial_port sp, const uint32_t uiPortSpeed)
+{
+    const serial_port_unix *spu = (serial_port_unix *)sp;
     speed_t stPortSpeed;
     switch (uiPortSpeed) {
-        case 0: stPortSpeed = B0; break;
-        case 50: stPortSpeed = B50; break;
-        case 75: stPortSpeed = B75; break;
-        case 110: stPortSpeed = B110; break;
-        case 134: stPortSpeed = B134; break;
-        case 150: stPortSpeed = B150; break;
-        case 300: stPortSpeed = B300; break;
-        case 600: stPortSpeed = B600; break;
-        case 1200: stPortSpeed = B1200; break;
-        case 1800: stPortSpeed = B1800; break;
-        case 2400: stPortSpeed = B2400; break;
-        case 4800: stPortSpeed = B4800; break;
-        case 9600: stPortSpeed = B9600; break;
-        case 19200: stPortSpeed = B19200; break;
-        case 38400: stPortSpeed = B38400; break;
+        case 0:
+            stPortSpeed = B0;
+            break;
+        case 50:
+            stPortSpeed = B50;
+            break;
+        case 75:
+            stPortSpeed = B75;
+            break;
+        case 110:
+            stPortSpeed = B110;
+            break;
+        case 134:
+            stPortSpeed = B134;
+            break;
+        case 150:
+            stPortSpeed = B150;
+            break;
+        case 300:
+            stPortSpeed = B300;
+            break;
+        case 600:
+            stPortSpeed = B600;
+            break;
+        case 1200:
+            stPortSpeed = B1200;
+            break;
+        case 1800:
+            stPortSpeed = B1800;
+            break;
+        case 2400:
+            stPortSpeed = B2400;
+            break;
+        case 4800:
+            stPortSpeed = B4800;
+            break;
+        case 9600:
+            stPortSpeed = B9600;
+            break;
+        case 19200:
+            stPortSpeed = B19200;
+            break;
+        case 38400:
+            stPortSpeed = B38400;
+            break;
 #  ifdef B57600
-        case 57600: stPortSpeed = B57600; break;
+        case 57600:
+            stPortSpeed = B57600;
+            break;
 #  endif
 #  ifdef B115200
-        case 115200: stPortSpeed = B115200; break;
+        case 115200:
+            stPortSpeed = B115200;
+            break;
 #  endif
 #  ifdef B230400
-        case 230400: stPortSpeed = B230400; break;
+        case 230400:
+            stPortSpeed = B230400;
+            break;
 #  endif
 #  ifdef B460800
-        case 460800: stPortSpeed = B460800; break;
+        case 460800:
+            stPortSpeed = B460800;
+            break;
 #  endif
 #  ifdef B921600
-        case 921600: stPortSpeed = B921600; break;
+        case 921600:
+            stPortSpeed = B921600;
+            break;
 #  endif
-        default: return false;
+        default:
+            return false;
     };
 
     struct termios ti;
-    if (tcgetattr(spu->fd,&ti) == -1)
+    if (tcgetattr(spu->fd, &ti) == -1)
         return false;
 
     // Set port speed (Input and Output)
@@ -376,10 +422,11 @@ bool uart_set_speed(serial_port sp, const uint32_t uiPortSpeed) {
     return (tcsetattr(spu->fd, TCSANOW, &ti) != -1);
 }
 
-uint32_t uart_get_speed(const serial_port sp) {
+uint32_t uart_get_speed(const serial_port sp)
+{
     struct termios ti;
     uint32_t uiPortSpeed;
-    const serial_port_unix* spu = (serial_port_unix*)sp;
+    const serial_port_unix *spu = (serial_port_unix *)sp;
 
     if (tcgetattr(spu->fd, &ti) == -1)
         return 0;
@@ -387,37 +434,78 @@ uint32_t uart_get_speed(const serial_port sp) {
     // Set port speed (Input)
     speed_t stPortSpeed = cfgetispeed(&ti);
     switch (stPortSpeed) {
-        case B0: uiPortSpeed = 0; break;
-        case B50: uiPortSpeed = 50; break;
-        case B75: uiPortSpeed = 75; break;
-        case B110: uiPortSpeed = 110; break;
-        case B134: uiPortSpeed = 134; break;
-        case B150: uiPortSpeed = 150; break;
-        case B300: uiPortSpeed = 300; break;
-        case B600: uiPortSpeed = 600; break;
-        case B1200: uiPortSpeed = 1200; break;
-        case B1800: uiPortSpeed = 1800; break;
-        case B2400: uiPortSpeed = 2400; break;
-        case B4800: uiPortSpeed = 4800; break;
-        case B9600: uiPortSpeed = 9600; break;
-        case B19200: uiPortSpeed = 19200; break;
-        case B38400: uiPortSpeed = 38400; break;
+        case B0:
+            uiPortSpeed = 0;
+            break;
+        case B50:
+            uiPortSpeed = 50;
+            break;
+        case B75:
+            uiPortSpeed = 75;
+            break;
+        case B110:
+            uiPortSpeed = 110;
+            break;
+        case B134:
+            uiPortSpeed = 134;
+            break;
+        case B150:
+            uiPortSpeed = 150;
+            break;
+        case B300:
+            uiPortSpeed = 300;
+            break;
+        case B600:
+            uiPortSpeed = 600;
+            break;
+        case B1200:
+            uiPortSpeed = 1200;
+            break;
+        case B1800:
+            uiPortSpeed = 1800;
+            break;
+        case B2400:
+            uiPortSpeed = 2400;
+            break;
+        case B4800:
+            uiPortSpeed = 4800;
+            break;
+        case B9600:
+            uiPortSpeed = 9600;
+            break;
+        case B19200:
+            uiPortSpeed = 19200;
+            break;
+        case B38400:
+            uiPortSpeed = 38400;
+            break;
 #  ifdef B57600
-        case B57600: uiPortSpeed = 57600; break;
+        case B57600:
+            uiPortSpeed = 57600;
+            break;
 #  endif
 #  ifdef B115200
-        case B115200: uiPortSpeed = 115200; break;
+        case B115200:
+            uiPortSpeed = 115200;
+            break;
 #  endif
 #  ifdef B230400
-        case B230400: uiPortSpeed = 230400; break;
+        case B230400:
+            uiPortSpeed = 230400;
+            break;
 #  endif
 #  ifdef B460800
-        case B460800: uiPortSpeed = 460800; break;
+        case B460800:
+            uiPortSpeed = 460800;
+            break;
 #  endif
 #  ifdef B921600
-        case B921600: uiPortSpeed = 921600; break;
+        case B921600:
+            uiPortSpeed = 921600;
+            break;
 #  endif
-        default: return 0;
+        default:
+            return 0;
     };
     return uiPortSpeed;
 }
diff --git a/uart/uart_win32.c b/uart/uart_win32.c
index f3f129d85..422375ae6 100644
--- a/uart/uart_win32.c
+++ b/uart/uart_win32.c
@@ -43,26 +43,27 @@
 #include <windows.h>
 
 typedef struct {
-  HANDLE hPort;     // Serial port handle
-  DCB dcb;          // Device control settings
-  COMMTIMEOUTS ct;  // Serial port time-out configuration
+    HANDLE hPort;     // Serial port handle
+    DCB dcb;          // Device control settings
+    COMMTIMEOUTS ct;  // Serial port time-out configuration
 } serial_port_windows;
 
-serial_port uart_open(const char* pcPortName) {
+serial_port uart_open(const char *pcPortName)
+{
     char acPortName[255];
-    serial_port_windows* sp = calloc(sizeof(serial_port_windows), sizeof(uint8_t));
+    serial_port_windows *sp = calloc(sizeof(serial_port_windows), sizeof(uint8_t));
 
     if (sp == 0) {
         printf("[!] UART failed to allocate memory\n");
         return INVALID_SERIAL_PORT;
     }
     // Copy the input "com?" to "\\.\COM?" format
-    sprintf(acPortName,"\\\\.\\%s", pcPortName);
+    sprintf(acPortName, "\\\\.\\%s", pcPortName);
     _strupr(acPortName);
 
     // Try to open the serial port
     // r/w,  none-share comport, no security, existing, no overlapping, no templates
-    sp->hPort = CreateFileA(acPortName, GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL);
+    sp->hPort = CreateFileA(acPortName, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL);
     if (sp->hPort == INVALID_HANDLE_VALUE) {
         uart_close(sp);
         return INVALID_SERIAL_PORT;
@@ -109,7 +110,7 @@ serial_port uart_open(const char* pcPortName) {
     PurgeComm(sp->hPort, PURGE_RXABORT | PURGE_RXCLEAR);
 
 #ifdef WITH_FPC
-    if ( uart_set_speed(sp, 115200) ) {
+    if (uart_set_speed(sp, 115200)) {
         printf("[=] UART Setting serial baudrate 115200 [FPC enabled]\n");
     } else {
         uart_set_speed(sp, 9600);
@@ -127,14 +128,16 @@ serial_port uart_open(const char* pcPortName) {
     return sp;
 }
 
-void uart_close(const serial_port sp) {
-    if (((serial_port_windows*)sp)->hPort != INVALID_HANDLE_VALUE )
-        CloseHandle(((serial_port_windows*)sp)->hPort);
+void uart_close(const serial_port sp)
+{
+    if (((serial_port_windows *)sp)->hPort != INVALID_HANDLE_VALUE)
+        CloseHandle(((serial_port_windows *)sp)->hPort);
     free(sp);
 }
 
-bool uart_set_speed(serial_port sp, const uint32_t uiPortSpeed) {
-    serial_port_windows* spw;
+bool uart_set_speed(serial_port sp, const uint32_t uiPortSpeed)
+{
+    serial_port_windows *spw;
 
     // Set port speed (Input and Output)
     switch (uiPortSpeed) {
@@ -145,33 +148,36 @@ bool uart_set_speed(serial_port sp, const uint32_t uiPortSpeed) {
         case 115200:
         case 230400:
         case 460800:
-        break;
+            break;
         default:
             return false;
     };
 
-    spw = (serial_port_windows*)sp;
+    spw = (serial_port_windows *)sp;
     spw->dcb.BaudRate = uiPortSpeed;
     bool result = SetCommState(spw->hPort, &spw->dcb);
     PurgeComm(spw->hPort, PURGE_RXABORT | PURGE_RXCLEAR);
     return result;
 }
 
-uint32_t uart_get_speed(const serial_port sp) {
-    const serial_port_windows* spw = (serial_port_windows*)sp;
+uint32_t uart_get_speed(const serial_port sp)
+{
+    const serial_port_windows *spw = (serial_port_windows *)sp;
     if (!GetCommState(spw->hPort, (serial_port) & spw->dcb))
         return spw->dcb.BaudRate;
 
     return 0;
 }
 
-bool uart_receive(const serial_port sp, uint8_t* p_rx, size_t pszMaxRxLen, size_t* len) {
-    return ReadFile(((serial_port_windows*)sp)->hPort, p_rx, pszMaxRxLen, (LPDWORD)len, NULL);
+bool uart_receive(const serial_port sp, uint8_t *p_rx, size_t pszMaxRxLen, size_t *len)
+{
+    return ReadFile(((serial_port_windows *)sp)->hPort, p_rx, pszMaxRxLen, (LPDWORD)len, NULL);
 }
 
-bool uart_send(const serial_port sp, const uint8_t* p_tx, const size_t len) {
+bool uart_send(const serial_port sp, const uint8_t *p_tx, const size_t len)
+{
     DWORD txlen = 0;
-    return WriteFile(((serial_port_windows*)sp)->hPort, p_tx, len, &txlen, NULL);
+    return WriteFile(((serial_port_windows *)sp)->hPort, p_tx, len, &txlen, NULL);
 }
 
 #endif
\ No newline at end of file
diff --git a/zlib/adler32.c b/zlib/adler32.c
index a868f073d..f18f4566c 100644
--- a/zlib/adler32.c
+++ b/zlib/adler32.c
@@ -63,9 +63,9 @@ local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2));
 
 /* ========================================================================= */
 uLong ZEXPORT adler32(adler, buf, len)
-    uLong adler;
-    const Bytef *buf;
-    uInt len;
+uLong adler;
+const Bytef *buf;
+uInt len;
 {
     unsigned long sum2;
     unsigned n;
@@ -134,9 +134,9 @@ uLong ZEXPORT adler32(adler, buf, len)
 
 /* ========================================================================= */
 local uLong adler32_combine_(adler1, adler2, len2)
-    uLong adler1;
-    uLong adler2;
-    z_off64_t len2;
+uLong adler1;
+uLong adler2;
+z_off64_t len2;
 {
     unsigned long sum1;
     unsigned long sum2;
@@ -163,17 +163,17 @@ local uLong adler32_combine_(adler1, adler2, len2)
 
 /* ========================================================================= */
 uLong ZEXPORT adler32_combine(adler1, adler2, len2)
-    uLong adler1;
-    uLong adler2;
-    z_off_t len2;
+uLong adler1;
+uLong adler2;
+z_off_t len2;
 {
     return adler32_combine_(adler1, adler2, len2);
 }
 
 uLong ZEXPORT adler32_combine64(adler1, adler2, len2)
-    uLong adler1;
-    uLong adler2;
-    z_off64_t len2;
+uLong adler1;
+uLong adler2;
+z_off64_t len2;
 {
     return adler32_combine_(adler1, adler2, len2);
 }
diff --git a/zlib/deflate.c b/zlib/deflate.c
index 91f1f1dc7..7575526cd 100644
--- a/zlib/deflate.c
+++ b/zlib/deflate.c
@@ -52,7 +52,7 @@
 #include "deflate.h"
 
 const char deflate_copyright[] =
-   " deflate 1.2.8.f-Proxmark3 Copyright 1995-2013 Jean-loup Gailly and Mark Adler ";
+    " deflate 1.2.8.f-Proxmark3 Copyright 1995-2013 Jean-loup Gailly and Mark Adler ";
 /*
   If you use the zlib library in a product, an acknowledgment is welcome
   in the documentation of your product. If for some reason you cannot
@@ -79,7 +79,7 @@ typedef enum {
     finish_done     /* finish done, accept no more input or output */
 } block_state;
 
-typedef block_state (*compress_func) OF((deflate_state *s, int flush));
+typedef block_state(*compress_func) OF((deflate_state *s, int flush));
 /* Compression function. Returns the block state after the call. */
 
 local void fill_window    OF((deflate_state *s));
@@ -95,8 +95,8 @@ local void putShortMSB    OF((deflate_state *s, uInt b));
 local void flush_pending  OF((z_streamp strm));
 local int read_buf        OF((z_streamp strm, Bytef *buf, unsigned size));
 #ifdef ASMV
-      void match_init OF((void)); /* asm code initialization */
-      uInt longest_match  OF((deflate_state *s, IPos cur_match));
+void match_init OF((void)); /* asm code initialization */
+uInt longest_match  OF((deflate_state *s, IPos cur_match));
 #else
 local uInt longest_match  OF((deflate_state *s, IPos cur_match));
 #endif
@@ -124,32 +124,34 @@ local  void check_match OF((deflate_state *s, IPos start, IPos match,
  * found for specific files.
  */
 typedef struct config_s {
-   ush good_length; /* reduce lazy search above this match length */
-   ush max_lazy;    /* do not perform lazy search above this match length */
-   ush nice_length; /* quit search above this match length */
-   ush max_chain;
-   compress_func func;
+    ush good_length; /* reduce lazy search above this match length */
+    ush max_lazy;    /* do not perform lazy search above this match length */
+    ush nice_length; /* quit search above this match length */
+    ush max_chain;
+    compress_func func;
 } config;
 
 #ifdef FASTEST
 local const config configuration_table[2] = {
-/*      good lazy nice chain */
-/* 0 */ {0,    0,  0,    0, deflate_stored},  /* store only */
-/* 1 */ {4,    4,  8,    4, deflate_fast}}; /* max speed, no lazy matches */
+    /*      good lazy nice chain */
+    /* 0 */ {0,    0,  0,    0, deflate_stored},  /* store only */
+    /* 1 */ {4,    4,  8,    4, deflate_fast}
+}; /* max speed, no lazy matches */
 #else
 local const config configuration_table[10] = {
-/*      good lazy nice chain */
-/* 0 */ {0,    0,  0,    0, deflate_stored},  /* store only */
-/* 1 */ {4,    4,  8,    4, deflate_fast}, /* max speed, no lazy matches */
-/* 2 */ {4,    5, 16,    8, deflate_fast},
-/* 3 */ {4,    6, 32,   32, deflate_fast},
+    /*      good lazy nice chain */
+    /* 0 */ {0,    0,  0,    0, deflate_stored},  /* store only */
+    /* 1 */ {4,    4,  8,    4, deflate_fast}, /* max speed, no lazy matches */
+    /* 2 */ {4,    5, 16,    8, deflate_fast},
+    /* 3 */ {4,    6, 32,   32, deflate_fast},
 
-/* 4 */ {4,    4, 16,   16, deflate_slow},  /* lazy matches */
-/* 5 */ {8,   16, 32,   32, deflate_slow},
-/* 6 */ {8,   16, 128, 128, deflate_slow},
-/* 7 */ {8,   32, 128, 256, deflate_slow},
-/* 8 */ {32, 128, 258, 1024, deflate_slow},
-/* 9 */ {32, 258, 258, 4096, deflate_slow}}; /* max compression */
+    /* 4 */ {4,    4, 16,   16, deflate_slow},  /* lazy matches */
+    /* 5 */ {8,   16, 32,   32, deflate_slow},
+    /* 6 */ {8,   16, 128, 128, deflate_slow},
+    /* 7 */ {8,   32, 128, 256, deflate_slow},
+    /* 8 */ {32, 128, 258, 1024, deflate_slow},
+    /* 9 */ {32, 258, 258, 4096, deflate_slow}
+}; /* max compression */
 #endif
 
 /* Note: the deflate() code requires max_lazy >= MIN_MATCH and max_chain >= 4
@@ -188,14 +190,14 @@ struct static_tree_desc_s {int dummy;}; /* for buggy compilers */
  */
 #ifdef FASTEST
 #define INSERT_STRING(s, str, match_head) \
-   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
-    match_head = s->head[s->ins_h], \
-    s->head[s->ins_h] = (Pos)(str))
+    (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
+     match_head = s->head[s->ins_h], \
+     s->head[s->ins_h] = (Pos)(str))
 #else
 #define INSERT_STRING(s, str, match_head) \
-   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
-    match_head = s->prev[(str) & s->w_mask] = s->head[s->ins_h], \
-    s->head[s->ins_h] = (Pos)(str))
+    (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
+     match_head = s->prev[(str) & s->w_mask] = s->head[s->ins_h], \
+     s->head[s->ins_h] = (Pos)(str))
 #endif
 
 /* ===========================================================================
@@ -208,10 +210,10 @@ struct static_tree_desc_s {int dummy;}; /* for buggy compilers */
 
 /* ========================================================================= */
 int ZEXPORT deflateInit_(strm, level, version, stream_size)
-    z_streamp strm;
-    int level;
-    const char *version;
-    int stream_size;
+z_streamp strm;
+int level;
+const char *version;
+int stream_size;
 {
     return deflateInit2_(strm, level, Z_DEFLATED, MAX_WBITS, DEF_MEM_LEVEL,
                          Z_DEFAULT_STRATEGY, version, stream_size);
@@ -220,15 +222,15 @@ int ZEXPORT deflateInit_(strm, level, version, stream_size)
 
 /* ========================================================================= */
 int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
-                  version, stream_size)
-    z_streamp strm;
-    int  level;
-    int  method;
-    int  windowBits;
-    int  memLevel;
-    int  strategy;
-    const char *version;
-    int stream_size;
+                          version, stream_size)
+z_streamp strm;
+int  level;
+int  method;
+int  windowBits;
+int  memLevel;
+int  strategy;
+const char *version;
+int stream_size;
 {
     deflate_state *s;
     int wrap = 1;
@@ -297,9 +299,9 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
     s->hash_bits = memLevel + 7;
     s->hash_size = 1 << s->hash_bits;
     s->hash_mask = s->hash_size - 1;
-    s->hash_shift =  ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH);
+    s->hash_shift = ((s->hash_bits + MIN_MATCH - 1) / MIN_MATCH);
 
-    s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte));
+    s->window = (Bytef *) ZALLOC(strm, s->w_size, 2 * sizeof(Byte));
     s->prev   = (Posf *)  ZALLOC(strm, s->w_size, sizeof(Pos));
     s->head   = (Posf *)  ZALLOC(strm, s->hash_size, sizeof(Pos));
 
@@ -307,19 +309,19 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
 
     s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */
 
-    overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2);
+    overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush) + 2);
     s->pending_buf = (uchf *) overlay;
-    s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L);
+    s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush) + 2L);
 
     if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||
         s->pending_buf == Z_NULL) {
         s->status = FINISH_STATE;
         strm->msg = ERR_MSG(Z_MEM_ERROR);
-        deflateEnd (strm);
+        deflateEnd(strm);
         return Z_MEM_ERROR;
     }
-    s->d_buf = overlay + s->lit_bufsize/sizeof(ush);
-    s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize;
+    s->d_buf = overlay + s->lit_bufsize / sizeof(ush);
+    s->l_buf = s->pending_buf + (1 + sizeof(ush)) * s->lit_bufsize;
 
     s->level = level;
     s->strategy = strategy;
@@ -329,10 +331,10 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
 }
 
 /* ========================================================================= */
-int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
-    z_streamp strm;
-    const Bytef *dictionary;
-    uInt  dictLength;
+int ZEXPORT deflateSetDictionary(strm, dictionary, dictLength)
+z_streamp strm;
+const Bytef *dictionary;
+uInt  dictLength;
 {
     deflate_state *s;
     uInt str, n;
@@ -372,9 +374,9 @@ int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
     fill_window(s);
     while (s->lookahead >= MIN_MATCH) {
         str = s->strstart;
-        n = s->lookahead - (MIN_MATCH-1);
+        n = s->lookahead - (MIN_MATCH - 1);
         do {
-            UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]);
+            UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH - 1]);
 #ifndef FASTEST
             s->prev[str & s->w_mask] = s->head[s->ins_h];
 #endif
@@ -382,14 +384,14 @@ int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
             str++;
         } while (--n);
         s->strstart = str;
-        s->lookahead = MIN_MATCH-1;
+        s->lookahead = MIN_MATCH - 1;
         fill_window(s);
     }
     s->strstart += s->lookahead;
     s->block_start = (long)s->strstart;
     s->insert = s->lookahead;
     s->lookahead = 0;
-    s->match_length = s->prev_length = MIN_MATCH-1;
+    s->match_length = s->prev_length = MIN_MATCH - 1;
     s->match_available = 0;
     strm->next_in = next;
     strm->avail_in = avail;
@@ -398,8 +400,8 @@ int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
 }
 
 /* ========================================================================= */
-int ZEXPORT deflateResetKeep (strm)
-    z_streamp strm;
+int ZEXPORT deflateResetKeep(strm)
+z_streamp strm;
 {
     deflate_state *s;
 
@@ -433,8 +435,8 @@ int ZEXPORT deflateResetKeep (strm)
 }
 
 /* ========================================================================= */
-int ZEXPORT deflateReset (strm)
-    z_streamp strm;
+int ZEXPORT deflateReset(strm)
+z_streamp strm;
 {
     int ret;
 
@@ -445,9 +447,9 @@ int ZEXPORT deflateReset (strm)
 }
 
 /* ========================================================================= */
-int ZEXPORT deflateSetHeader (strm, head)
-    z_streamp strm;
-    gz_headerp head;
+int ZEXPORT deflateSetHeader(strm, head)
+z_streamp strm;
+gz_headerp head;
 {
     if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
     if (strm->state->wrap != 2) return Z_STREAM_ERROR;
@@ -456,10 +458,10 @@ int ZEXPORT deflateSetHeader (strm, head)
 }
 
 /* ========================================================================= */
-int ZEXPORT deflatePending (strm, pending, bits)
-    unsigned *pending;
-    int *bits;
-    z_streamp strm;
+int ZEXPORT deflatePending(strm, pending, bits)
+unsigned *pending;
+int *bits;
+z_streamp strm;
 {
     if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
     if (pending != Z_NULL)
@@ -470,10 +472,10 @@ int ZEXPORT deflatePending (strm, pending, bits)
 }
 
 /* ========================================================================= */
-int ZEXPORT deflatePrime (strm, bits, value)
-    z_streamp strm;
-    int bits;
-    int value;
+int ZEXPORT deflatePrime(strm, bits, value)
+z_streamp strm;
+int bits;
+int value;
 {
     deflate_state *s;
     int put;
@@ -497,9 +499,9 @@ int ZEXPORT deflatePrime (strm, bits, value)
 
 /* ========================================================================= */
 int ZEXPORT deflateParams(strm, level, strategy)
-    z_streamp strm;
-    int level;
-    int strategy;
+z_streamp strm;
+int level;
+int strategy;
 {
     deflate_state *s;
     compress_func func;
@@ -538,11 +540,11 @@ int ZEXPORT deflateParams(strm, level, strategy)
 
 /* ========================================================================= */
 int ZEXPORT deflateTune(strm, good_length, max_lazy, nice_length, max_chain)
-    z_streamp strm;
-    int good_length;
-    int max_lazy;
-    int nice_length;
-    int max_chain;
+z_streamp strm;
+int good_length;
+int max_lazy;
+int nice_length;
+int max_chain;
 {
     deflate_state *s;
 
@@ -573,8 +575,8 @@ int ZEXPORT deflateTune(strm, good_length, max_lazy, nice_length, max_chain)
  * allocation.
  */
 uLong ZEXPORT deflateBound(strm, sourceLen)
-    z_streamp strm;
-    uLong sourceLen;
+z_streamp strm;
+uLong sourceLen;
 {
     deflate_state *s;
     uLong complen, wraplen;
@@ -591,33 +593,33 @@ uLong ZEXPORT deflateBound(strm, sourceLen)
     /* compute wrapper length */
     s = strm->state;
     switch (s->wrap) {
-    case 0:                                 /* raw deflate */
-        wraplen = 0;
-        break;
-    case 1:                                 /* zlib wrapper */
-        wraplen = 6 + (s->strstart ? 4 : 0);
-        break;
-    case 2:                                 /* gzip wrapper */
-        wraplen = 18;
-        if (s->gzhead != Z_NULL) {          /* user-supplied gzip header */
-            if (s->gzhead->extra != Z_NULL)
-                wraplen += 2 + s->gzhead->extra_len;
-            str = s->gzhead->name;
-            if (str != Z_NULL)
-                do {
-                    wraplen++;
-                } while (*str++);
-            str = s->gzhead->comment;
-            if (str != Z_NULL)
-                do {
-                    wraplen++;
-                } while (*str++);
-            if (s->gzhead->hcrc)
-                wraplen += 2;
-        }
-        break;
-    default:                                /* for compiler happiness */
-        wraplen = 6;
+        case 0:                                 /* raw deflate */
+            wraplen = 0;
+            break;
+        case 1:                                 /* zlib wrapper */
+            wraplen = 6 + (s->strstart ? 4 : 0);
+            break;
+        case 2:                                 /* gzip wrapper */
+            wraplen = 18;
+            if (s->gzhead != Z_NULL) {          /* user-supplied gzip header */
+                if (s->gzhead->extra != Z_NULL)
+                    wraplen += 2 + s->gzhead->extra_len;
+                str = s->gzhead->name;
+                if (str != Z_NULL)
+                    do {
+                        wraplen++;
+                    } while (*str++);
+                str = s->gzhead->comment;
+                if (str != Z_NULL)
+                    do {
+                        wraplen++;
+                    } while (*str++);
+                if (s->gzhead->hcrc)
+                    wraplen += 2;
+            }
+            break;
+        default:                                /* for compiler happiness */
+            wraplen = 6;
     }
 
     /* if not default parameters, return conservative bound */
@@ -634,9 +636,9 @@ uLong ZEXPORT deflateBound(strm, sourceLen)
  * IN assertion: the stream state is correct and there is enough room in
  * pending_buf.
  */
-local void putShortMSB (s, b)
-    deflate_state *s;
-    uInt b;
+local void putShortMSB(s, b)
+deflate_state *s;
+uInt b;
 {
     put_byte(s, (Byte)(b >> 8));
     put_byte(s, (Byte)(b & 0xff));
@@ -649,7 +651,7 @@ local void putShortMSB (s, b)
  * (See also read_buf()).
  */
 local void flush_pending(strm)
-    z_streamp strm;
+z_streamp strm;
 {
     unsigned len;
     deflate_state *s = strm->state;
@@ -671,9 +673,9 @@ local void flush_pending(strm)
 }
 
 /* ========================================================================= */
-int ZEXPORT deflate (strm, flush)
-    z_streamp strm;
-    int flush;
+int ZEXPORT deflate(strm, flush)
+z_streamp strm;
+int flush;
 {
     int old_flush; /* value of flush param for previous deflate call */
     deflate_state *s;
@@ -710,25 +712,24 @@ int ZEXPORT deflate (strm, flush)
                 put_byte(s, 0);
                 put_byte(s, 0);
                 put_byte(s, s->level == 9 ? 2 :
-                            (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
-                             4 : 0));
+                         (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
+                          4 : 0));
                 put_byte(s, OS_CODE);
                 s->status = BUSY_STATE;
-            }
-            else {
+            } else {
                 put_byte(s, (s->gzhead->text ? 1 : 0) +
-                            (s->gzhead->hcrc ? 2 : 0) +
-                            (s->gzhead->extra == Z_NULL ? 0 : 4) +
-                            (s->gzhead->name == Z_NULL ? 0 : 8) +
-                            (s->gzhead->comment == Z_NULL ? 0 : 16)
+                         (s->gzhead->hcrc ? 2 : 0) +
+                         (s->gzhead->extra == Z_NULL ? 0 : 4) +
+                         (s->gzhead->name == Z_NULL ? 0 : 8) +
+                         (s->gzhead->comment == Z_NULL ? 0 : 16)
                         );
                 put_byte(s, (Byte)(s->gzhead->time & 0xff));
                 put_byte(s, (Byte)((s->gzhead->time >> 8) & 0xff));
                 put_byte(s, (Byte)((s->gzhead->time >> 16) & 0xff));
                 put_byte(s, (Byte)((s->gzhead->time >> 24) & 0xff));
                 put_byte(s, s->level == 9 ? 2 :
-                            (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
-                             4 : 0));
+                         (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
+                          4 : 0));
                 put_byte(s, s->gzhead->os & 0xff);
                 if (s->gzhead->extra != Z_NULL) {
                     put_byte(s, s->gzhead->extra_len & 0xff);
@@ -740,11 +741,10 @@ int ZEXPORT deflate (strm, flush)
                 s->gzindex = 0;
                 s->status = EXTRA_STATE;
             }
-        }
-        else
+        } else
 #endif
         {
-            uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8;
+            uInt header = (Z_DEFLATED + ((s->w_bits - 8) << 4)) << 8;
             uInt level_flags;
 
             if (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2)
@@ -795,8 +795,7 @@ int ZEXPORT deflate (strm, flush)
                 s->gzindex = 0;
                 s->status = NAME_STATE;
             }
-        }
-        else
+        } else
             s->status = NAME_STATE;
     }
     if (s->status == NAME_STATE) {
@@ -826,8 +825,7 @@ int ZEXPORT deflate (strm, flush)
                 s->gzindex = 0;
                 s->status = COMMENT_STATE;
             }
-        }
-        else
+        } else
             s->status = COMMENT_STATE;
     }
     if (s->status == COMMENT_STATE) {
@@ -855,8 +853,7 @@ int ZEXPORT deflate (strm, flush)
                                     s->pending - beg);
             if (val == 0)
                 s->status = HCRC_STATE;
-        }
-        else
+        } else
             s->status = HCRC_STATE;
     }
     if (s->status == HCRC_STATE) {
@@ -869,8 +866,7 @@ int ZEXPORT deflate (strm, flush)
                 strm->adler = crc32(0L, Z_NULL, 0);
                 s->status = BUSY_STATE;
             }
-        }
-        else
+        } else
             s->status = BUSY_STATE;
     }
 #endif
@@ -889,10 +885,10 @@ int ZEXPORT deflate (strm, flush)
             return Z_OK;
         }
 
-    /* Make sure there is something to do and avoid duplicate consecutive
-     * flushes. For repeated and useless calls with Z_FINISH, we keep
-     * returning Z_STREAM_END instead of Z_BUF_ERROR.
-     */
+        /* Make sure there is something to do and avoid duplicate consecutive
+         * flushes. For repeated and useless calls with Z_FINISH, we keep
+         * returning Z_STREAM_END instead of Z_BUF_ERROR.
+         */
     } else if (strm->avail_in == 0 && RANK(flush) <= RANK(old_flush) &&
                flush != Z_FINISH) {
         ERR_RETURN(strm, Z_BUF_ERROR);
@@ -910,8 +906,8 @@ int ZEXPORT deflate (strm, flush)
         block_state bstate;
 
         bstate = s->strategy == Z_HUFFMAN_ONLY ? deflate_huff(s, flush) :
-                    (s->strategy == Z_RLE ? deflate_rle(s, flush) :
-                        (*(configuration_table[s->level].func))(s, flush));
+                 (s->strategy == Z_RLE ? deflate_rle(s, flush) :
+                  (*(configuration_table[s->level].func))(s, flush));
 
         if (bstate == finish_started || bstate == finish_done) {
             s->status = FINISH_STATE;
@@ -933,7 +929,7 @@ int ZEXPORT deflate (strm, flush)
             if (flush == Z_PARTIAL_FLUSH) {
                 _tr_align(s);
             } else if (flush != Z_BLOCK) { /* FULL_FLUSH or SYNC_FLUSH */
-                _tr_stored_block(s, (char*)0, 0L, 0);
+                _tr_stored_block(s, (char *)0, 0L, 0);
                 /* For a full flush, this empty block will be recognized
                  * as a special marker by inflate_sync().
                  */
@@ -948,8 +944,8 @@ int ZEXPORT deflate (strm, flush)
             }
             flush_pending(strm);
             if (strm->avail_out == 0) {
-              s->last_flush = -1; /* avoid BUF_ERROR at next call, see above */
-              return Z_OK;
+                s->last_flush = -1; /* avoid BUF_ERROR at next call, see above */
+                return Z_OK;
             }
         }
     }
@@ -969,8 +965,7 @@ int ZEXPORT deflate (strm, flush)
         put_byte(s, (Byte)((strm->total_in >> 8) & 0xff));
         put_byte(s, (Byte)((strm->total_in >> 16) & 0xff));
         put_byte(s, (Byte)((strm->total_in >> 24) & 0xff));
-    }
-    else
+    } else
 #endif
     {
         putShortMSB(s, (uInt)(strm->adler >> 16));
@@ -985,8 +980,8 @@ int ZEXPORT deflate (strm, flush)
 }
 
 /* ========================================================================= */
-int ZEXPORT deflateEnd (strm)
-    z_streamp strm;
+int ZEXPORT deflateEnd(strm)
+z_streamp strm;
 {
     int status;
 
@@ -1000,7 +995,7 @@ int ZEXPORT deflateEnd (strm)
         status != HCRC_STATE &&
         status != BUSY_STATE &&
         status != FINISH_STATE) {
-      return Z_STREAM_ERROR;
+        return Z_STREAM_ERROR;
     }
 
     /* Deallocate in reverse order of allocations: */
@@ -1020,9 +1015,9 @@ int ZEXPORT deflateEnd (strm)
  * To simplify the source, this is not supported for 16-bit MSDOS (which
  * doesn't have enough memory anyway to duplicate compression states).
  */
-int ZEXPORT deflateCopy (dest, source)
-    z_streamp dest;
-    z_streamp source;
+int ZEXPORT deflateCopy(dest, source)
+z_streamp dest;
+z_streamp source;
 {
 #ifdef MAXSEG_64K
     return Z_STREAM_ERROR;
@@ -1046,15 +1041,15 @@ int ZEXPORT deflateCopy (dest, source)
     zmemcpy((voidpf)ds, (voidpf)ss, sizeof(deflate_state));
     ds->strm = dest;
 
-    ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte));
+    ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2 * sizeof(Byte));
     ds->prev   = (Posf *)  ZALLOC(dest, ds->w_size, sizeof(Pos));
     ds->head   = (Posf *)  ZALLOC(dest, ds->hash_size, sizeof(Pos));
-    overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2);
+    overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush) + 2);
     ds->pending_buf = (uchf *) overlay;
 
     if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL ||
         ds->pending_buf == Z_NULL) {
-        deflateEnd (dest);
+        deflateEnd(dest);
         return Z_MEM_ERROR;
     }
     /* following zmemcpy do not work for 16-bit MSDOS */
@@ -1064,8 +1059,8 @@ int ZEXPORT deflateCopy (dest, source)
     zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size);
 
     ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);
-    ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush);
-    ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize;
+    ds->d_buf = overlay + ds->lit_bufsize / sizeof(ush);
+    ds->l_buf = ds->pending_buf + (1 + sizeof(ush)) * ds->lit_bufsize;
 
     ds->l_desc.dyn_tree = ds->dyn_ltree;
     ds->d_desc.dyn_tree = ds->dyn_dtree;
@@ -1083,9 +1078,9 @@ int ZEXPORT deflateCopy (dest, source)
  * (See also flush_pending()).
  */
 local int read_buf(strm, buf, size)
-    z_streamp strm;
-    Bytef *buf;
-    unsigned size;
+z_streamp strm;
+Bytef *buf;
+unsigned size;
 {
     unsigned len = strm->avail_in;
 
@@ -1112,10 +1107,10 @@ local int read_buf(strm, buf, size)
 /* ===========================================================================
  * Initialize the "longest match" routines for a new zlib stream
  */
-local void lm_init (s)
-    deflate_state *s;
+local void lm_init(s)
+deflate_state *s;
 {
-    s->window_size = (ulg)2L*s->w_size;
+    s->window_size = (ulg)2L * s->w_size;
 
     CLEAR_HASH(s);
 
@@ -1130,7 +1125,7 @@ local void lm_init (s)
     s->block_start = 0L;
     s->lookahead = 0;
     s->insert = 0;
-    s->match_length = s->prev_length = MIN_MATCH-1;
+    s->match_length = s->prev_length = MIN_MATCH - 1;
     s->match_available = 0;
     s->ins_h = 0;
 #ifndef FASTEST
@@ -1155,21 +1150,21 @@ local void lm_init (s)
  * match.S. The code will be functionally equivalent.
  */
 local uInt longest_match(s, cur_match)
-    deflate_state *s;
-    IPos cur_match;                             /* current match */
+deflate_state *s;
+IPos cur_match;                             /* current match */
 {
     unsigned chain_length = s->max_chain_length;/* max hash chain length */
     register Bytef *scan = s->window + s->strstart; /* current string */
     register Bytef *match;                      /* matched string */
     register int len;                           /* length of current match */
 #ifdef ZLIB_PM3_TUNED
-    int best_len = MIN_MATCH-1;                 /* lift the restriction on prev-length */
+    int best_len = MIN_MATCH - 1;               /* lift the restriction on prev-length */
 #else
     int best_len = s->prev_length;              /* best match length so far */
 #endif
     int nice_match = s->nice_match;             /* stop if match long enough */
     IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
-        s->strstart - (IPos)MAX_DIST(s) : NIL;
+                 s->strstart - (IPos)MAX_DIST(s) : NIL;
     /* Stop when cur_match becomes <= limit. To simplify the code,
      * we prevent matches with the string of window index 0.
      */
@@ -1181,11 +1176,11 @@ local uInt longest_match(s, cur_match)
      * Try with and without -DUNALIGNED_OK to check.
      */
     register Bytef *strend = s->window + s->strstart + MAX_MATCH - 1;
-    register ush scan_start = *(ushf*)scan;
-    register ush scan_end   = *(ushf*)(scan+best_len-1);
+    register ush scan_start = *(ushf *)scan;
+    register ush scan_end   = *(ushf *)(scan + best_len - 1);
 #else
     register Bytef *strend = s->window + s->strstart + MAX_MATCH;
-    register Byte scan_end1  = scan[best_len-1];
+    register Byte scan_end1  = scan[best_len - 1];
     register Byte scan_end   = scan[best_len];
 #endif
 
@@ -1203,7 +1198,7 @@ local uInt longest_match(s, cur_match)
      */
     if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;
 
-    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
+    Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD, "need lookahead");
 
     do {
         Assert(cur_match < s->strstart, "no future");
@@ -1221,8 +1216,8 @@ local uInt longest_match(s, cur_match)
         /* This code assumes sizeof(unsigned short) == 2. Do not use
          * UNALIGNED_OK if your compiler uses a different size.
          */
-        if (*(ushf*)(match+best_len-1) != scan_end ||
-            *(ushf*)match != scan_start) continue;
+        if (*(ushf *)(match + best_len - 1) != scan_end ||
+            *(ushf *)match != scan_start) continue;
 
         /* It is not necessary to compare scan[2] and match[2] since they are
          * always equal when the other bytes match, given that the hash keys
@@ -1236,24 +1231,24 @@ local uInt longest_match(s, cur_match)
         Assert(scan[2] == match[2], "scan[2]?");
         scan++, match++;
         do {
-        } while (*(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
+        } while (*(ushf *)(scan += 2) == *(ushf *)(match += 2) &&
+                 *(ushf *)(scan += 2) == *(ushf *)(match += 2) &&
+                 *(ushf *)(scan += 2) == *(ushf *)(match += 2) &&
+                 *(ushf *)(scan += 2) == *(ushf *)(match += 2) &&
                  scan < strend);
         /* The funny "do {}" generates better code on most compilers */
 
         /* Here, scan <= window+strstart+257 */
-        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
+        Assert(scan <= s->window + (unsigned)(s->window_size - 1), "wild scan");
         if (*scan == *match) scan++;
 
-        len = (MAX_MATCH - 1) - (int)(strend-scan);
-        scan = strend - (MAX_MATCH-1);
+        len = (MAX_MATCH - 1) - (int)(strend - scan);
+        scan = strend - (MAX_MATCH - 1);
 
 #else /* UNALIGNED_OK */
 
         if (match[best_len]   != scan_end  ||
-            match[best_len-1] != scan_end1 ||
+            match[best_len - 1] != scan_end1 ||
             *match            != *scan     ||
             *++match          != scan[1])      continue;
 
@@ -1276,7 +1271,7 @@ local uInt longest_match(s, cur_match)
                  *++scan == *++match && *++scan == *++match &&
                  scan < strend);
 
-        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
+        Assert(scan <= s->window + (unsigned)(s->window_size - 1), "wild scan");
 
         len = MAX_MATCH - (int)(strend - scan);
         scan = strend - MAX_MATCH;
@@ -1288,9 +1283,9 @@ local uInt longest_match(s, cur_match)
             best_len = len;
             if (len >= nice_match) break;
 #ifdef UNALIGNED_OK
-            scan_end = *(ushf*)(scan+best_len-1);
+            scan_end = *(ushf *)(scan + best_len - 1);
 #else
-            scan_end1  = scan[best_len-1];
+            scan_end1  = scan[best_len - 1];
             scan_end   = scan[best_len];
 #endif
         }
@@ -1308,8 +1303,8 @@ local uInt longest_match(s, cur_match)
  * Optimized version for FASTEST only
  */
 local uInt longest_match(s, cur_match)
-    deflate_state *s;
-    IPos cur_match;                             /* current match */
+deflate_state *s;
+IPos cur_match;                             /* current match */
 {
     register Bytef *scan = s->window + s->strstart; /* current string */
     register Bytef *match;                       /* matched string */
@@ -1321,7 +1316,7 @@ local uInt longest_match(s, cur_match)
      */
     Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
 
-    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
+    Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD, "need lookahead");
 
     Assert(cur_match < s->strstart, "no future");
 
@@ -1329,7 +1324,7 @@ local uInt longest_match(s, cur_match)
 
     /* Return failure if the match length is less than 2:
      */
-    if (match[0] != scan[0] || match[1] != scan[1]) return MIN_MATCH-1;
+    if (match[0] != scan[0] || match[1] != scan[1]) return MIN_MATCH - 1;
 
     /* The check at best_len-1 can be removed because it will be made
      * again later. (This heuristic is not always a win.)
@@ -1350,7 +1345,7 @@ local uInt longest_match(s, cur_match)
              *++scan == *++match && *++scan == *++match &&
              scan < strend);
 
-    Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
+    Assert(scan <= s->window + (unsigned)(s->window_size - 1), "wild scan");
 
     len = MAX_MATCH - (int)(strend - scan);
 
@@ -1367,9 +1362,9 @@ local uInt longest_match(s, cur_match)
  * Check that the match at match_start is indeed a match.
  */
 local void check_match(s, start, match, length)
-    deflate_state *s;
-    IPos start, match;
-    int length;
+deflate_state *s;
+IPos start, match;
+int length;
 {
     /* check that the match is indeed a match */
     if (zmemcmp(s->window + match,
@@ -1382,8 +1377,9 @@ local void check_match(s, start, match, length)
         z_error("invalid match");
     }
     if (z_verbose > 1) {
-        fprintf(stderr,"\\[%d,%d]", start-match, length);
-        do { putc(s->window[start++], stderr); } while (--length != 0);
+        fprintf(stderr, "\\[%d,%d]", start - match, length);
+        do { putc(s->window[start++], stderr); }
+        while (--length != 0);
     }
 }
 #else
@@ -1401,7 +1397,7 @@ local void check_match(s, start, match, length)
  *    option -- not supported here).
  */
 local void fill_window(s)
-    deflate_state *s;
+deflate_state *s;
 {
     register unsigned n, m;
     register Posf *p;
@@ -1411,7 +1407,7 @@ local void fill_window(s)
     Assert(s->lookahead < MIN_LOOKAHEAD, "already enough lookahead");
 
     do {
-        more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart);
+        more = (unsigned)(s->window_size - (ulg)s->lookahead - (ulg)s->strstart);
 
         /* Deal with !@#$% 64K limit: */
         if (sizeof(int) <= 2) {
@@ -1429,9 +1425,9 @@ local void fill_window(s)
         /* If the window is almost full and there is insufficient lookahead,
          * move the upper half to the lower one to make room in the upper half.
          */
-        if (s->strstart >= wsize+MAX_DIST(s)) {
+        if (s->strstart >= wsize + MAX_DIST(s)) {
 
-            zmemcpy(s->window, s->window+wsize, (unsigned)wsize);
+            zmemcpy(s->window, s->window + wsize, (unsigned)wsize);
             s->match_start -= wsize;
             s->strstart    -= wsize; /* we now have strstart >= MAX_DIST */
             s->block_start -= (long) wsize;
@@ -1446,7 +1442,7 @@ local void fill_window(s)
             p = &s->head[n];
             do {
                 m = *--p;
-                *p = (Pos)(m >= wsize ? m-wsize : NIL);
+                *p = (Pos)(m >= wsize ? m - wsize : NIL);
             } while (--n);
 
             n = wsize;
@@ -1454,7 +1450,7 @@ local void fill_window(s)
             p = &s->prev[n];
             do {
                 m = *--p;
-                *p = (Pos)(m >= wsize ? m-wsize : NIL);
+                *p = (Pos)(m >= wsize ? m - wsize : NIL);
                 /* If n is not on any hash chain, prev[n] is garbage but
                  * its value will never be used.
                  */
@@ -1486,10 +1482,10 @@ local void fill_window(s)
             s->ins_h = s->window[str];
             UPDATE_HASH(s, s->ins_h, s->window[str + 1]);
 #if MIN_MATCH != 3
-            Call UPDATE_HASH() MIN_MATCH-3 more times
+            Call UPDATE_HASH() MIN_MATCH - 3 more times
 #endif
             while (s->insert) {
-                UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]);
+                UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH - 1]);
 #ifndef FASTEST
                 s->prev[str & s->w_mask] = s->head[s->ins_h];
 #endif
@@ -1526,8 +1522,7 @@ local void fill_window(s)
                 init = WIN_INIT;
             zmemzero(s->window + curr, (unsigned)init);
             s->high_water = curr + init;
-        }
-        else if (s->high_water < (ulg)curr + WIN_INIT) {
+        } else if (s->high_water < (ulg)curr + WIN_INIT) {
             /* High water mark at or above current data, but below current data
              * plus WIN_INIT -- zero out to current data plus WIN_INIT, or up
              * to end of window, whichever is less.
@@ -1549,21 +1544,21 @@ local void fill_window(s)
  * IN assertion: strstart is set to the end of the current match.
  */
 #define FLUSH_BLOCK_ONLY(s, last) { \
-   _tr_flush_block(s, (s->block_start >= 0L ? \
-                   (charf *)&s->window[(unsigned)s->block_start] : \
-                   (charf *)Z_NULL), \
-                (ulg)((long)s->strstart - s->block_start), \
-                (last)); \
-   s->block_start = s->strstart; \
-   flush_pending(s->strm); \
-   Tracev((stderr,"[FLUSH]")); \
-}
+        _tr_flush_block(s, (s->block_start >= 0L ? \
+                            (charf *)&s->window[(unsigned)s->block_start] : \
+                            (charf *)Z_NULL), \
+                        (ulg)((long)s->strstart - s->block_start), \
+                        (last)); \
+        s->block_start = s->strstart; \
+        flush_pending(s->strm); \
+        Tracev((stderr,"[FLUSH]")); \
+    }
 
 /* Same but force premature exit if necessary. */
 #define FLUSH_BLOCK(s, last) { \
-   FLUSH_BLOCK_ONLY(s, last); \
-   if (s->strm->avail_out == 0) return (last) ? finish_started : need_more; \
-}
+        FLUSH_BLOCK_ONLY(s, last); \
+        if (s->strm->avail_out == 0) return (last) ? finish_started : need_more; \
+    }
 
 /* ===========================================================================
  * Copy without compression as much as possible from the input stream, return
@@ -1575,8 +1570,8 @@ local void fill_window(s)
  * window to pending_buf.
  */
 local block_state deflate_stored(s, flush)
-    deflate_state *s;
-    int flush;
+deflate_state *s;
+int flush;
 {
     /* Stored blocks are limited to 0xffff bytes, pending_buf is limited
      * to pending_buf_size, and each stored block has a 5 byte header:
@@ -1593,7 +1588,7 @@ local block_state deflate_stored(s, flush)
         /* Fill the window as much as possible: */
         if (s->lookahead <= 1) {
 
-            Assert(s->strstart < s->w_size+MAX_DIST(s) ||
+            Assert(s->strstart < s->w_size + MAX_DIST(s) ||
                    s->block_start >= (long)s->w_size, "slide too late");
 
             fill_window(s);
@@ -1639,8 +1634,8 @@ local block_state deflate_stored(s, flush)
  * matches. It is used only for the fast compression options.
  */
 local block_state deflate_fast(s, flush)
-    deflate_state *s;
-    int flush;
+deflate_state *s;
+int flush;
 {
     IPos hash_head;       /* head of the hash chain */
     int bflush;           /* set if current block must be flushed */
@@ -1675,7 +1670,7 @@ local block_state deflate_fast(s, flush)
              * of window index 0 (in particular we have to avoid a match
              * of the string with itself at the start of the input file).
              */
-            s->match_length = longest_match (s, hash_head);
+            s->match_length = longest_match(s, hash_head);
             /* longest_match() sets match_start */
         }
         if (s->match_length >= MIN_MATCH) {
@@ -1707,9 +1702,9 @@ local block_state deflate_fast(s, flush)
                 s->strstart += s->match_length;
                 s->match_length = 0;
                 s->ins_h = s->window[s->strstart];
-                UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]);
+                UPDATE_HASH(s, s->ins_h, s->window[s->strstart + 1]);
 #if MIN_MATCH != 3
-                Call UPDATE_HASH() MIN_MATCH-3 more times
+                Call UPDATE_HASH() MIN_MATCH - 3 more times
 #endif
                 /* If lookahead < MIN_MATCH, ins_h is garbage, but it does not
                  * matter since it will be recomputed at next deflate call.
@@ -1717,14 +1712,14 @@ local block_state deflate_fast(s, flush)
             }
         } else {
             /* No match, output a literal byte */
-            Tracevv((stderr,"%c", s->window[s->strstart]));
-            _tr_tally_lit (s, s->window[s->strstart], bflush);
+            Tracevv((stderr, "%c", s->window[s->strstart]));
+            _tr_tally_lit(s, s->window[s->strstart], bflush);
             s->lookahead--;
             s->strstart++;
         }
         if (bflush) FLUSH_BLOCK(s, 0);
     }
-    s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1;
+    s->insert = s->strstart < MIN_MATCH - 1 ? s->strstart : MIN_MATCH - 1;
     if (flush == Z_FINISH) {
         FLUSH_BLOCK(s, 1);
         return finish_done;
@@ -1737,10 +1732,10 @@ local block_state deflate_fast(s, flush)
 
 #ifdef ZLIB_PM3_TUNED
 local uInt try_harder(s, strstart, lookahead, hash_head)
-    deflate_state *s;
-    uInt strstart;
-    uInt lookahead;
-    IPos hash_head;
+deflate_state *s;
+uInt strstart;
+uInt lookahead;
+IPos hash_head;
 {
     uInt strstart_save = s->strstart;
     s->strstart = strstart;
@@ -1757,14 +1752,14 @@ local uInt try_harder(s, strstart, lookahead, hash_head)
 
     do {
         if (hash_head != NIL && s->strstart - hash_head <= MAX_DIST(s)) {
-            match_length = longest_match (s, hash_head);
+            match_length = longest_match(s, hash_head);
             /* longest_match() sets match_start */
         } else {
             match_length = MIN_MATCH - 1;
         }
 #if TOO_FAR <= 32767
         if (match_length == MIN_MATCH && s->strstart - s->match_start > TOO_FAR) {
-            match_length = MIN_MATCH-1;
+            match_length = MIN_MATCH - 1;
         }
 #endif
         if (s->strstart == strstart) {                      // store match at current position
@@ -1787,10 +1782,10 @@ local uInt try_harder(s, strstart, lookahead, hash_head)
         }
         s->strstart++;
         s->lookahead--;
-        UPDATE_HASH(s, s->ins_h, s->window[(s->strstart) + (MIN_MATCH-1)]);
+        UPDATE_HASH(s, s->ins_h, s->window[(s->strstart) + (MIN_MATCH - 1)]);
         hash_head = s->head[s->ins_h];
-    } while (s->strstart <= strstart-1 + prev_length        // try to truncate the previous match to 1, 3, ... prev_length
-            && s->strstart <= s->window_size - MIN_LOOKAHEAD); // watch out for the end of the input
+    } while (s->strstart <= strstart - 1 + prev_length      // try to truncate the previous match to 1, 3, ... prev_length
+             && s->strstart <= s->window_size - MIN_LOOKAHEAD); // watch out for the end of the input
 
     s->strstart = strstart_save;
     s->lookahead = lookahead_save;
@@ -1816,8 +1811,8 @@ local uInt try_harder(s, strstart, lookahead, hash_head)
  * no better match at the next window position.
  */
 local block_state deflate_slow(s, flush)
-    deflate_state *s;
-    int flush;
+deflate_state *s;
+int flush;
 {
     IPos hash_head;          /* head of hash chain */
     int bflush;              /* set if current block must be flushed */
@@ -1847,7 +1842,7 @@ local block_state deflate_slow(s, flush)
 
         /* Find the longest match, discarding those <= prev_length. */
         s->prev_length = s->match_length, s->prev_match = s->match_start;
-        s->match_length = MIN_MATCH-1;
+        s->match_length = MIN_MATCH - 1;
 
 #ifdef ZLIB_PM3_TUNED
         if (s->prev_length < s->max_lazy_match) {
@@ -1861,20 +1856,20 @@ local block_state deflate_slow(s, flush)
              * of window index 0 (in particular we have to avoid a match
              * of the string with itself at the start of the input file).
              */
-            s->match_length = longest_match (s, hash_head);
+            s->match_length = longest_match(s, hash_head);
             /* longest_match() sets match_start */
 
             if (s->match_length <= 5 && (s->strategy == Z_FILTERED
 #if TOO_FAR <= 32767
-                || (s->match_length == MIN_MATCH &&
-                    s->strstart - s->match_start > TOO_FAR)
+                                         || (s->match_length == MIN_MATCH &&
+                                             s->strstart - s->match_start > TOO_FAR)
 #endif
-                )) {
+                                        )) {
 
                 /* If prev_match is also MIN_MATCH, match_start is garbage
                  * but we will ignore the current match anyway.
                  */
-                s->match_length = MIN_MATCH-1;
+                s->match_length = MIN_MATCH - 1;
             }
         }
 #endif /* ZLIB_PM3_TUNED */
@@ -1885,9 +1880,9 @@ local block_state deflate_slow(s, flush)
             uInt max_insert = s->strstart + s->lookahead - MIN_MATCH;
             /* Do not insert strings in hash table beyond this. */
 
-            check_match(s, s->strstart-1, s->prev_match, s->prev_length);
+            check_match(s, s->strstart - 1, s->prev_match, s->prev_length);
 
-            _tr_tally_dist(s, s->strstart -1 - s->prev_match,
+            _tr_tally_dist(s, s->strstart - 1 - s->prev_match,
                            s->prev_length - MIN_MATCH, bflush);
 
             /* Insert in hash table all strings up to the end of the match.
@@ -1895,7 +1890,7 @@ local block_state deflate_slow(s, flush)
              * enough lookahead, the last two strings are not inserted in
              * the hash table.
              */
-            s->lookahead -= s->prev_length-1;
+            s->lookahead -= s->prev_length - 1;
             s->prev_length -= 2;
             do {
                 if (++s->strstart <= max_insert) {
@@ -1903,7 +1898,7 @@ local block_state deflate_slow(s, flush)
                 }
             } while (--s->prev_length != 0);
             s->match_available = 0;
-            s->match_length = MIN_MATCH-1;
+            s->match_length = MIN_MATCH - 1;
             s->strstart++;
 
             if (bflush) FLUSH_BLOCK(s, 0);
@@ -1913,8 +1908,8 @@ local block_state deflate_slow(s, flush)
              * single literal. If there was a match but the current match
              * is longer, truncate the previous match to a single literal.
              */
-            Tracevv((stderr,"%c", s->window[s->strstart-1]));
-            _tr_tally_lit(s, s->window[s->strstart-1], bflush);
+            Tracevv((stderr, "%c", s->window[s->strstart - 1]));
+            _tr_tally_lit(s, s->window[s->strstart - 1], bflush);
             if (bflush) {
                 FLUSH_BLOCK_ONLY(s, 0);
             }
@@ -1930,13 +1925,13 @@ local block_state deflate_slow(s, flush)
             s->lookahead--;
         }
     }
-    Assert (flush != Z_NO_FLUSH, "no flush?");
+    Assert(flush != Z_NO_FLUSH, "no flush?");
     if (s->match_available) {
-        Tracevv((stderr,"%c", s->window[s->strstart-1]));
-        _tr_tally_lit(s, s->window[s->strstart-1], bflush);
+        Tracevv((stderr, "%c", s->window[s->strstart - 1]));
+        _tr_tally_lit(s, s->window[s->strstart - 1], bflush);
         s->match_available = 0;
     }
-    s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1;
+    s->insert = s->strstart < MIN_MATCH - 1 ? s->strstart : MIN_MATCH - 1;
     if (flush == Z_FINISH) {
         FLUSH_BLOCK(s, 1);
         return finish_done;
@@ -1953,8 +1948,8 @@ local block_state deflate_slow(s, flush)
  * deflate switches away from Z_RLE.)
  */
 local block_state deflate_rle(s, flush)
-    deflate_state *s;
-    int flush;
+deflate_state *s;
+int flush;
 {
     int bflush;             /* set if current block must be flushed */
     uInt prev;              /* byte at distance one to match */
@@ -1990,7 +1985,7 @@ local block_state deflate_rle(s, flush)
                 if (s->match_length > s->lookahead)
                     s->match_length = s->lookahead;
             }
-            Assert(scan <= s->window+(uInt)(s->window_size-1), "wild scan");
+            Assert(scan <= s->window + (uInt)(s->window_size - 1), "wild scan");
         }
 
         /* Emit match if have run of MIN_MATCH or longer, else emit literal */
@@ -2004,8 +1999,8 @@ local block_state deflate_rle(s, flush)
             s->match_length = 0;
         } else {
             /* No match, output a literal byte */
-            Tracevv((stderr,"%c", s->window[s->strstart]));
-            _tr_tally_lit (s, s->window[s->strstart], bflush);
+            Tracevv((stderr, "%c", s->window[s->strstart]));
+            _tr_tally_lit(s, s->window[s->strstart], bflush);
             s->lookahead--;
             s->strstart++;
         }
@@ -2026,8 +2021,8 @@ local block_state deflate_rle(s, flush)
  * (It will be regenerated if this run of deflate switches away from Huffman.)
  */
 local block_state deflate_huff(s, flush)
-    deflate_state *s;
-    int flush;
+deflate_state *s;
+int flush;
 {
     int bflush;             /* set if current block must be flushed */
 
@@ -2044,8 +2039,8 @@ local block_state deflate_huff(s, flush)
 
         /* Output a literal byte */
         s->match_length = 0;
-        Tracevv((stderr,"%c", s->window[s->strstart]));
-        _tr_tally_lit (s, s->window[s->strstart], bflush);
+        Tracevv((stderr, "%c", s->window[s->strstart]));
+        _tr_tally_lit(s, s->window[s->strstart], bflush);
         s->lookahead--;
         s->strstart++;
         if (bflush) FLUSH_BLOCK(s, 0);
diff --git a/zlib/deflate.h b/zlib/deflate.h
index ce0299edd..50760d226 100644
--- a/zlib/deflate.h
+++ b/zlib/deflate.h
@@ -107,7 +107,7 @@ typedef struct internal_state {
     Byte  method;        /* can only be DEFLATED */
     int   last_flush;    /* value of flush param for previous deflate call */
 
-                /* used by deflate.c: */
+    /* used by deflate.c: */
 
     uInt  w_size;        /* LZ77 window size (32K by default) */
     uInt  w_bits;        /* log2(w_size)  (8..16) */
@@ -190,27 +190,27 @@ typedef struct internal_state {
 
     int nice_match; /* Stop searching when current match exceeds this */
 
-                /* used by trees.c: */
+    /* used by trees.c: */
     /* Didn't use ct_data typedef below to suppress compiler warning */
     struct ct_data_s dyn_ltree[HEAP_SIZE];   /* literal and length tree */
-    struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */
-    struct ct_data_s bl_tree[2*BL_CODES+1];  /* Huffman tree for bit lengths */
+    struct ct_data_s dyn_dtree[2 * D_CODES + 1]; /* distance tree */
+    struct ct_data_s bl_tree[2 * BL_CODES + 1]; /* Huffman tree for bit lengths */
 
     struct tree_desc_s l_desc;               /* desc. for literal tree */
     struct tree_desc_s d_desc;               /* desc. for distance tree */
     struct tree_desc_s bl_desc;              /* desc. for bit length tree */
 
-    ush bl_count[MAX_BITS+1];
+    ush bl_count[MAX_BITS + 1];
     /* number of codes at each bit length for an optimal tree */
 
-    int heap[2*L_CODES+1];      /* heap used to build the Huffman trees */
+    int heap[2 * L_CODES + 1];  /* heap used to build the Huffman trees */
     int heap_len;               /* number of elements in the heap */
     int heap_max;               /* element of largest frequency */
     /* The sons of heap[n] are heap[2*n] and heap[2*n+1]. heap[0] is not used.
      * The same heap array is used to build all trees.
      */
 
-    uch depth[2*L_CODES+1];
+    uch depth[2 * L_CODES + 1];
     /* Depth of each subtree used as tie breaker for trees of equal frequency
      */
 
@@ -292,18 +292,18 @@ typedef struct internal_state {
 /* Number of bytes after end of data in window to initialize in order to avoid
    memory checker errors from longest match routines */
 
-        /* in trees.c */
+/* in trees.c */
 void ZLIB_INTERNAL _tr_init OF((deflate_state *s));
 int ZLIB_INTERNAL _tr_tally OF((deflate_state *s, unsigned dist, unsigned lc));
 void ZLIB_INTERNAL _tr_flush_block OF((deflate_state *s, charf *buf,
-                        ulg stored_len, int last));
+                                       ulg stored_len, int last));
 void ZLIB_INTERNAL _tr_flush_bits OF((deflate_state *s));
 void ZLIB_INTERNAL _tr_align OF((deflate_state *s));
 void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf,
-                        ulg stored_len, int last));
+                                        ulg stored_len, int last));
 
 #define d_code(dist) \
-   ((dist) < 256 ? _dist_code[dist] : _dist_code[256+((dist)>>7)])
+    ((dist) < 256 ? _dist_code[dist] : _dist_code[256+((dist)>>7)])
 /* Mapping from a distance to a distance code. dist is the distance - 1 and
  * must not have side effects. _dist_code[256] and _dist_code[257] are never
  * used.
@@ -313,34 +313,34 @@ void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf,
 /* Inline versions of _tr_tally for speed: */
 
 #if defined(GEN_TREES_H) || !defined(STDC)
-  extern uch ZLIB_INTERNAL _length_code[];
-  extern uch ZLIB_INTERNAL _dist_code[];
+extern uch ZLIB_INTERNAL _length_code[];
+extern uch ZLIB_INTERNAL _dist_code[];
 #else
-  extern const uch ZLIB_INTERNAL _length_code[];
-  extern const uch ZLIB_INTERNAL _dist_code[];
+extern const uch ZLIB_INTERNAL _length_code[];
+extern const uch ZLIB_INTERNAL _dist_code[];
 #endif
 
 # define _tr_tally_lit(s, c, flush) \
-  { uch cc = (c); \
-    s->d_buf[s->last_lit] = 0; \
-    s->l_buf[s->last_lit++] = cc; \
-    s->dyn_ltree[cc].Freq++; \
-    flush = (s->last_lit == s->lit_bufsize-1); \
-   }
+    { uch cc = (c); \
+        s->d_buf[s->last_lit] = 0; \
+        s->l_buf[s->last_lit++] = cc; \
+        s->dyn_ltree[cc].Freq++; \
+        flush = (s->last_lit == s->lit_bufsize-1); \
+    }
 # define _tr_tally_dist(s, distance, length, flush) \
-  { uch len = (length); \
-    ush dist = (distance); \
-    s->d_buf[s->last_lit] = dist; \
-    s->l_buf[s->last_lit++] = len; \
-    dist--; \
-    s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \
-    s->dyn_dtree[d_code(dist)].Freq++; \
-    flush = (s->last_lit == s->lit_bufsize-1); \
-  }
+    { uch len = (length); \
+        ush dist = (distance); \
+        s->d_buf[s->last_lit] = dist; \
+        s->l_buf[s->last_lit++] = len; \
+        dist--; \
+        s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \
+        s->dyn_dtree[d_code(dist)].Freq++; \
+        flush = (s->last_lit == s->lit_bufsize-1); \
+    }
 #else
 # define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c)
 # define _tr_tally_dist(s, distance, length, flush) \
-              flush = _tr_tally(s, distance, length)
+    flush = _tr_tally(s, distance, length)
 #endif
 
 #endif /* DEFLATE_H */
diff --git a/zlib/inffast.c b/zlib/inffast.c
index bda59ceb6..0cd59d49b 100644
--- a/zlib/inffast.c
+++ b/zlib/inffast.c
@@ -89,7 +89,7 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
     unsigned dmask;             /* mask for first level of distance codes */
     code here;                  /* retrieved table entry */
     unsigned op;                /* code bits, operation, extra bits, or */
-                                /*  window position, window bytes to copy */
+    /*  window position, window bytes to copy */
     unsigned len;               /* match length, unused bytes */
     unsigned dist;              /* match distance */
     unsigned char FAR *from;    /* where to copy match from */
@@ -125,18 +125,17 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
             bits += 8;
         }
         here = lcode[hold & lmask];
-      dolen:
+dolen:
         op = (unsigned)(here.bits);
         hold >>= op;
         bits -= op;
         op = (unsigned)(here.op);
         if (op == 0) {                          /* literal */
             Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
-                    "inflate:         literal '%c'\n" :
-                    "inflate:         literal 0x%02x\n", here.val));
+                     "inflate:         literal '%c'\n" :
+                     "inflate:         literal 0x%02x\n", here.val));
             PUP(out) = (unsigned char)(here.val);
-        }
-        else if (op & 16) {                     /* length base */
+        } else if (op & 16) {                   /* length base */
             len = (unsigned)(here.val);
             op &= 15;                           /* number of extra bits */
             if (op) {
@@ -156,7 +155,7 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
                 bits += 8;
             }
             here = dcode[hold & dmask];
-          dodist:
+dodist:
             op = (unsigned)(here.bits);
             hold >>= op;
             bits -= op;
@@ -223,8 +222,7 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
                             } while (--op);
                             from = out - dist;  /* rest from output */
                         }
-                    }
-                    else if (wnext < op) {      /* wrap around window */
+                    } else if (wnext < op) {    /* wrap around window */
                         from += wsize + wnext - op;
                         op -= wnext;
                         if (op < len) {         /* some from end of window */
@@ -242,8 +240,7 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
                                 from = out - dist;      /* rest from output */
                             }
                         }
-                    }
-                    else {                      /* contiguous in window */
+                    } else {                    /* contiguous in window */
                         from += wnext - op;
                         if (op < len) {         /* some from window */
                             len -= op;
@@ -264,8 +261,7 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
                         if (len > 1)
                             PUP(out) = PUP(from);
                     }
-                }
-                else {
+                } else {
                     from = out - dist;          /* copy direct from output */
                     do {                        /* minimum length is three */
                         PUP(out) = PUP(from);
@@ -279,27 +275,22 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
                             PUP(out) = PUP(from);
                     }
                 }
-            }
-            else if ((op & 64) == 0) {          /* 2nd level distance code */
+            } else if ((op & 64) == 0) {        /* 2nd level distance code */
                 here = dcode[here.val + (hold & ((1U << op) - 1))];
                 goto dodist;
-            }
-            else {
+            } else {
                 strm->msg = (char *)"invalid distance code";
                 state->mode = BAD;
                 break;
             }
-        }
-        else if ((op & 64) == 0) {              /* 2nd level length code */
+        } else if ((op & 64) == 0) {            /* 2nd level length code */
             here = lcode[here.val + (hold & ((1U << op) - 1))];
             goto dolen;
-        }
-        else if (op & 32) {                     /* end-of-block */
+        } else if (op & 32) {                   /* end-of-block */
             Tracevv((stderr, "inflate:         end of block\n"));
             state->mode = TYPE;
             break;
-        }
-        else {
+        } else {
             strm->msg = (char *)"invalid literal/length code";
             state->mode = BAD;
             break;
diff --git a/zlib/inffixed.h b/zlib/inffixed.h
index d62832776..35d010097 100644
--- a/zlib/inffixed.h
+++ b/zlib/inffixed.h
@@ -1,94 +1,94 @@
-    /* inffixed.h -- table for decoding fixed codes
-     * Generated automatically by makefixed().
-     */
+/* inffixed.h -- table for decoding fixed codes
+ * Generated automatically by makefixed().
+ */
 
-    /* WARNING: this file should *not* be used by applications.
-       It is part of the implementation of this library and is
-       subject to change. Applications should only use zlib.h.
-     */
+/* WARNING: this file should *not* be used by applications.
+   It is part of the implementation of this library and is
+   subject to change. Applications should only use zlib.h.
+ */
 
-    static const code lenfix[512] = {
-        {96,7,0},{0,8,80},{0,8,16},{20,8,115},{18,7,31},{0,8,112},{0,8,48},
-        {0,9,192},{16,7,10},{0,8,96},{0,8,32},{0,9,160},{0,8,0},{0,8,128},
-        {0,8,64},{0,9,224},{16,7,6},{0,8,88},{0,8,24},{0,9,144},{19,7,59},
-        {0,8,120},{0,8,56},{0,9,208},{17,7,17},{0,8,104},{0,8,40},{0,9,176},
-        {0,8,8},{0,8,136},{0,8,72},{0,9,240},{16,7,4},{0,8,84},{0,8,20},
-        {21,8,227},{19,7,43},{0,8,116},{0,8,52},{0,9,200},{17,7,13},{0,8,100},
-        {0,8,36},{0,9,168},{0,8,4},{0,8,132},{0,8,68},{0,9,232},{16,7,8},
-        {0,8,92},{0,8,28},{0,9,152},{20,7,83},{0,8,124},{0,8,60},{0,9,216},
-        {18,7,23},{0,8,108},{0,8,44},{0,9,184},{0,8,12},{0,8,140},{0,8,76},
-        {0,9,248},{16,7,3},{0,8,82},{0,8,18},{21,8,163},{19,7,35},{0,8,114},
-        {0,8,50},{0,9,196},{17,7,11},{0,8,98},{0,8,34},{0,9,164},{0,8,2},
-        {0,8,130},{0,8,66},{0,9,228},{16,7,7},{0,8,90},{0,8,26},{0,9,148},
-        {20,7,67},{0,8,122},{0,8,58},{0,9,212},{18,7,19},{0,8,106},{0,8,42},
-        {0,9,180},{0,8,10},{0,8,138},{0,8,74},{0,9,244},{16,7,5},{0,8,86},
-        {0,8,22},{64,8,0},{19,7,51},{0,8,118},{0,8,54},{0,9,204},{17,7,15},
-        {0,8,102},{0,8,38},{0,9,172},{0,8,6},{0,8,134},{0,8,70},{0,9,236},
-        {16,7,9},{0,8,94},{0,8,30},{0,9,156},{20,7,99},{0,8,126},{0,8,62},
-        {0,9,220},{18,7,27},{0,8,110},{0,8,46},{0,9,188},{0,8,14},{0,8,142},
-        {0,8,78},{0,9,252},{96,7,0},{0,8,81},{0,8,17},{21,8,131},{18,7,31},
-        {0,8,113},{0,8,49},{0,9,194},{16,7,10},{0,8,97},{0,8,33},{0,9,162},
-        {0,8,1},{0,8,129},{0,8,65},{0,9,226},{16,7,6},{0,8,89},{0,8,25},
-        {0,9,146},{19,7,59},{0,8,121},{0,8,57},{0,9,210},{17,7,17},{0,8,105},
-        {0,8,41},{0,9,178},{0,8,9},{0,8,137},{0,8,73},{0,9,242},{16,7,4},
-        {0,8,85},{0,8,21},{16,8,258},{19,7,43},{0,8,117},{0,8,53},{0,9,202},
-        {17,7,13},{0,8,101},{0,8,37},{0,9,170},{0,8,5},{0,8,133},{0,8,69},
-        {0,9,234},{16,7,8},{0,8,93},{0,8,29},{0,9,154},{20,7,83},{0,8,125},
-        {0,8,61},{0,9,218},{18,7,23},{0,8,109},{0,8,45},{0,9,186},{0,8,13},
-        {0,8,141},{0,8,77},{0,9,250},{16,7,3},{0,8,83},{0,8,19},{21,8,195},
-        {19,7,35},{0,8,115},{0,8,51},{0,9,198},{17,7,11},{0,8,99},{0,8,35},
-        {0,9,166},{0,8,3},{0,8,131},{0,8,67},{0,9,230},{16,7,7},{0,8,91},
-        {0,8,27},{0,9,150},{20,7,67},{0,8,123},{0,8,59},{0,9,214},{18,7,19},
-        {0,8,107},{0,8,43},{0,9,182},{0,8,11},{0,8,139},{0,8,75},{0,9,246},
-        {16,7,5},{0,8,87},{0,8,23},{64,8,0},{19,7,51},{0,8,119},{0,8,55},
-        {0,9,206},{17,7,15},{0,8,103},{0,8,39},{0,9,174},{0,8,7},{0,8,135},
-        {0,8,71},{0,9,238},{16,7,9},{0,8,95},{0,8,31},{0,9,158},{20,7,99},
-        {0,8,127},{0,8,63},{0,9,222},{18,7,27},{0,8,111},{0,8,47},{0,9,190},
-        {0,8,15},{0,8,143},{0,8,79},{0,9,254},{96,7,0},{0,8,80},{0,8,16},
-        {20,8,115},{18,7,31},{0,8,112},{0,8,48},{0,9,193},{16,7,10},{0,8,96},
-        {0,8,32},{0,9,161},{0,8,0},{0,8,128},{0,8,64},{0,9,225},{16,7,6},
-        {0,8,88},{0,8,24},{0,9,145},{19,7,59},{0,8,120},{0,8,56},{0,9,209},
-        {17,7,17},{0,8,104},{0,8,40},{0,9,177},{0,8,8},{0,8,136},{0,8,72},
-        {0,9,241},{16,7,4},{0,8,84},{0,8,20},{21,8,227},{19,7,43},{0,8,116},
-        {0,8,52},{0,9,201},{17,7,13},{0,8,100},{0,8,36},{0,9,169},{0,8,4},
-        {0,8,132},{0,8,68},{0,9,233},{16,7,8},{0,8,92},{0,8,28},{0,9,153},
-        {20,7,83},{0,8,124},{0,8,60},{0,9,217},{18,7,23},{0,8,108},{0,8,44},
-        {0,9,185},{0,8,12},{0,8,140},{0,8,76},{0,9,249},{16,7,3},{0,8,82},
-        {0,8,18},{21,8,163},{19,7,35},{0,8,114},{0,8,50},{0,9,197},{17,7,11},
-        {0,8,98},{0,8,34},{0,9,165},{0,8,2},{0,8,130},{0,8,66},{0,9,229},
-        {16,7,7},{0,8,90},{0,8,26},{0,9,149},{20,7,67},{0,8,122},{0,8,58},
-        {0,9,213},{18,7,19},{0,8,106},{0,8,42},{0,9,181},{0,8,10},{0,8,138},
-        {0,8,74},{0,9,245},{16,7,5},{0,8,86},{0,8,22},{64,8,0},{19,7,51},
-        {0,8,118},{0,8,54},{0,9,205},{17,7,15},{0,8,102},{0,8,38},{0,9,173},
-        {0,8,6},{0,8,134},{0,8,70},{0,9,237},{16,7,9},{0,8,94},{0,8,30},
-        {0,9,157},{20,7,99},{0,8,126},{0,8,62},{0,9,221},{18,7,27},{0,8,110},
-        {0,8,46},{0,9,189},{0,8,14},{0,8,142},{0,8,78},{0,9,253},{96,7,0},
-        {0,8,81},{0,8,17},{21,8,131},{18,7,31},{0,8,113},{0,8,49},{0,9,195},
-        {16,7,10},{0,8,97},{0,8,33},{0,9,163},{0,8,1},{0,8,129},{0,8,65},
-        {0,9,227},{16,7,6},{0,8,89},{0,8,25},{0,9,147},{19,7,59},{0,8,121},
-        {0,8,57},{0,9,211},{17,7,17},{0,8,105},{0,8,41},{0,9,179},{0,8,9},
-        {0,8,137},{0,8,73},{0,9,243},{16,7,4},{0,8,85},{0,8,21},{16,8,258},
-        {19,7,43},{0,8,117},{0,8,53},{0,9,203},{17,7,13},{0,8,101},{0,8,37},
-        {0,9,171},{0,8,5},{0,8,133},{0,8,69},{0,9,235},{16,7,8},{0,8,93},
-        {0,8,29},{0,9,155},{20,7,83},{0,8,125},{0,8,61},{0,9,219},{18,7,23},
-        {0,8,109},{0,8,45},{0,9,187},{0,8,13},{0,8,141},{0,8,77},{0,9,251},
-        {16,7,3},{0,8,83},{0,8,19},{21,8,195},{19,7,35},{0,8,115},{0,8,51},
-        {0,9,199},{17,7,11},{0,8,99},{0,8,35},{0,9,167},{0,8,3},{0,8,131},
-        {0,8,67},{0,9,231},{16,7,7},{0,8,91},{0,8,27},{0,9,151},{20,7,67},
-        {0,8,123},{0,8,59},{0,9,215},{18,7,19},{0,8,107},{0,8,43},{0,9,183},
-        {0,8,11},{0,8,139},{0,8,75},{0,9,247},{16,7,5},{0,8,87},{0,8,23},
-        {64,8,0},{19,7,51},{0,8,119},{0,8,55},{0,9,207},{17,7,15},{0,8,103},
-        {0,8,39},{0,9,175},{0,8,7},{0,8,135},{0,8,71},{0,9,239},{16,7,9},
-        {0,8,95},{0,8,31},{0,9,159},{20,7,99},{0,8,127},{0,8,63},{0,9,223},
-        {18,7,27},{0,8,111},{0,8,47},{0,9,191},{0,8,15},{0,8,143},{0,8,79},
-        {0,9,255}
-    };
+static const code lenfix[512] = {
+    {96, 7, 0}, {0, 8, 80}, {0, 8, 16}, {20, 8, 115}, {18, 7, 31}, {0, 8, 112}, {0, 8, 48},
+    {0, 9, 192}, {16, 7, 10}, {0, 8, 96}, {0, 8, 32}, {0, 9, 160}, {0, 8, 0}, {0, 8, 128},
+    {0, 8, 64}, {0, 9, 224}, {16, 7, 6}, {0, 8, 88}, {0, 8, 24}, {0, 9, 144}, {19, 7, 59},
+    {0, 8, 120}, {0, 8, 56}, {0, 9, 208}, {17, 7, 17}, {0, 8, 104}, {0, 8, 40}, {0, 9, 176},
+    {0, 8, 8}, {0, 8, 136}, {0, 8, 72}, {0, 9, 240}, {16, 7, 4}, {0, 8, 84}, {0, 8, 20},
+    {21, 8, 227}, {19, 7, 43}, {0, 8, 116}, {0, 8, 52}, {0, 9, 200}, {17, 7, 13}, {0, 8, 100},
+    {0, 8, 36}, {0, 9, 168}, {0, 8, 4}, {0, 8, 132}, {0, 8, 68}, {0, 9, 232}, {16, 7, 8},
+    {0, 8, 92}, {0, 8, 28}, {0, 9, 152}, {20, 7, 83}, {0, 8, 124}, {0, 8, 60}, {0, 9, 216},
+    {18, 7, 23}, {0, 8, 108}, {0, 8, 44}, {0, 9, 184}, {0, 8, 12}, {0, 8, 140}, {0, 8, 76},
+    {0, 9, 248}, {16, 7, 3}, {0, 8, 82}, {0, 8, 18}, {21, 8, 163}, {19, 7, 35}, {0, 8, 114},
+    {0, 8, 50}, {0, 9, 196}, {17, 7, 11}, {0, 8, 98}, {0, 8, 34}, {0, 9, 164}, {0, 8, 2},
+    {0, 8, 130}, {0, 8, 66}, {0, 9, 228}, {16, 7, 7}, {0, 8, 90}, {0, 8, 26}, {0, 9, 148},
+    {20, 7, 67}, {0, 8, 122}, {0, 8, 58}, {0, 9, 212}, {18, 7, 19}, {0, 8, 106}, {0, 8, 42},
+    {0, 9, 180}, {0, 8, 10}, {0, 8, 138}, {0, 8, 74}, {0, 9, 244}, {16, 7, 5}, {0, 8, 86},
+    {0, 8, 22}, {64, 8, 0}, {19, 7, 51}, {0, 8, 118}, {0, 8, 54}, {0, 9, 204}, {17, 7, 15},
+    {0, 8, 102}, {0, 8, 38}, {0, 9, 172}, {0, 8, 6}, {0, 8, 134}, {0, 8, 70}, {0, 9, 236},
+    {16, 7, 9}, {0, 8, 94}, {0, 8, 30}, {0, 9, 156}, {20, 7, 99}, {0, 8, 126}, {0, 8, 62},
+    {0, 9, 220}, {18, 7, 27}, {0, 8, 110}, {0, 8, 46}, {0, 9, 188}, {0, 8, 14}, {0, 8, 142},
+    {0, 8, 78}, {0, 9, 252}, {96, 7, 0}, {0, 8, 81}, {0, 8, 17}, {21, 8, 131}, {18, 7, 31},
+    {0, 8, 113}, {0, 8, 49}, {0, 9, 194}, {16, 7, 10}, {0, 8, 97}, {0, 8, 33}, {0, 9, 162},
+    {0, 8, 1}, {0, 8, 129}, {0, 8, 65}, {0, 9, 226}, {16, 7, 6}, {0, 8, 89}, {0, 8, 25},
+    {0, 9, 146}, {19, 7, 59}, {0, 8, 121}, {0, 8, 57}, {0, 9, 210}, {17, 7, 17}, {0, 8, 105},
+    {0, 8, 41}, {0, 9, 178}, {0, 8, 9}, {0, 8, 137}, {0, 8, 73}, {0, 9, 242}, {16, 7, 4},
+    {0, 8, 85}, {0, 8, 21}, {16, 8, 258}, {19, 7, 43}, {0, 8, 117}, {0, 8, 53}, {0, 9, 202},
+    {17, 7, 13}, {0, 8, 101}, {0, 8, 37}, {0, 9, 170}, {0, 8, 5}, {0, 8, 133}, {0, 8, 69},
+    {0, 9, 234}, {16, 7, 8}, {0, 8, 93}, {0, 8, 29}, {0, 9, 154}, {20, 7, 83}, {0, 8, 125},
+    {0, 8, 61}, {0, 9, 218}, {18, 7, 23}, {0, 8, 109}, {0, 8, 45}, {0, 9, 186}, {0, 8, 13},
+    {0, 8, 141}, {0, 8, 77}, {0, 9, 250}, {16, 7, 3}, {0, 8, 83}, {0, 8, 19}, {21, 8, 195},
+    {19, 7, 35}, {0, 8, 115}, {0, 8, 51}, {0, 9, 198}, {17, 7, 11}, {0, 8, 99}, {0, 8, 35},
+    {0, 9, 166}, {0, 8, 3}, {0, 8, 131}, {0, 8, 67}, {0, 9, 230}, {16, 7, 7}, {0, 8, 91},
+    {0, 8, 27}, {0, 9, 150}, {20, 7, 67}, {0, 8, 123}, {0, 8, 59}, {0, 9, 214}, {18, 7, 19},
+    {0, 8, 107}, {0, 8, 43}, {0, 9, 182}, {0, 8, 11}, {0, 8, 139}, {0, 8, 75}, {0, 9, 246},
+    {16, 7, 5}, {0, 8, 87}, {0, 8, 23}, {64, 8, 0}, {19, 7, 51}, {0, 8, 119}, {0, 8, 55},
+    {0, 9, 206}, {17, 7, 15}, {0, 8, 103}, {0, 8, 39}, {0, 9, 174}, {0, 8, 7}, {0, 8, 135},
+    {0, 8, 71}, {0, 9, 238}, {16, 7, 9}, {0, 8, 95}, {0, 8, 31}, {0, 9, 158}, {20, 7, 99},
+    {0, 8, 127}, {0, 8, 63}, {0, 9, 222}, {18, 7, 27}, {0, 8, 111}, {0, 8, 47}, {0, 9, 190},
+    {0, 8, 15}, {0, 8, 143}, {0, 8, 79}, {0, 9, 254}, {96, 7, 0}, {0, 8, 80}, {0, 8, 16},
+    {20, 8, 115}, {18, 7, 31}, {0, 8, 112}, {0, 8, 48}, {0, 9, 193}, {16, 7, 10}, {0, 8, 96},
+    {0, 8, 32}, {0, 9, 161}, {0, 8, 0}, {0, 8, 128}, {0, 8, 64}, {0, 9, 225}, {16, 7, 6},
+    {0, 8, 88}, {0, 8, 24}, {0, 9, 145}, {19, 7, 59}, {0, 8, 120}, {0, 8, 56}, {0, 9, 209},
+    {17, 7, 17}, {0, 8, 104}, {0, 8, 40}, {0, 9, 177}, {0, 8, 8}, {0, 8, 136}, {0, 8, 72},
+    {0, 9, 241}, {16, 7, 4}, {0, 8, 84}, {0, 8, 20}, {21, 8, 227}, {19, 7, 43}, {0, 8, 116},
+    {0, 8, 52}, {0, 9, 201}, {17, 7, 13}, {0, 8, 100}, {0, 8, 36}, {0, 9, 169}, {0, 8, 4},
+    {0, 8, 132}, {0, 8, 68}, {0, 9, 233}, {16, 7, 8}, {0, 8, 92}, {0, 8, 28}, {0, 9, 153},
+    {20, 7, 83}, {0, 8, 124}, {0, 8, 60}, {0, 9, 217}, {18, 7, 23}, {0, 8, 108}, {0, 8, 44},
+    {0, 9, 185}, {0, 8, 12}, {0, 8, 140}, {0, 8, 76}, {0, 9, 249}, {16, 7, 3}, {0, 8, 82},
+    {0, 8, 18}, {21, 8, 163}, {19, 7, 35}, {0, 8, 114}, {0, 8, 50}, {0, 9, 197}, {17, 7, 11},
+    {0, 8, 98}, {0, 8, 34}, {0, 9, 165}, {0, 8, 2}, {0, 8, 130}, {0, 8, 66}, {0, 9, 229},
+    {16, 7, 7}, {0, 8, 90}, {0, 8, 26}, {0, 9, 149}, {20, 7, 67}, {0, 8, 122}, {0, 8, 58},
+    {0, 9, 213}, {18, 7, 19}, {0, 8, 106}, {0, 8, 42}, {0, 9, 181}, {0, 8, 10}, {0, 8, 138},
+    {0, 8, 74}, {0, 9, 245}, {16, 7, 5}, {0, 8, 86}, {0, 8, 22}, {64, 8, 0}, {19, 7, 51},
+    {0, 8, 118}, {0, 8, 54}, {0, 9, 205}, {17, 7, 15}, {0, 8, 102}, {0, 8, 38}, {0, 9, 173},
+    {0, 8, 6}, {0, 8, 134}, {0, 8, 70}, {0, 9, 237}, {16, 7, 9}, {0, 8, 94}, {0, 8, 30},
+    {0, 9, 157}, {20, 7, 99}, {0, 8, 126}, {0, 8, 62}, {0, 9, 221}, {18, 7, 27}, {0, 8, 110},
+    {0, 8, 46}, {0, 9, 189}, {0, 8, 14}, {0, 8, 142}, {0, 8, 78}, {0, 9, 253}, {96, 7, 0},
+    {0, 8, 81}, {0, 8, 17}, {21, 8, 131}, {18, 7, 31}, {0, 8, 113}, {0, 8, 49}, {0, 9, 195},
+    {16, 7, 10}, {0, 8, 97}, {0, 8, 33}, {0, 9, 163}, {0, 8, 1}, {0, 8, 129}, {0, 8, 65},
+    {0, 9, 227}, {16, 7, 6}, {0, 8, 89}, {0, 8, 25}, {0, 9, 147}, {19, 7, 59}, {0, 8, 121},
+    {0, 8, 57}, {0, 9, 211}, {17, 7, 17}, {0, 8, 105}, {0, 8, 41}, {0, 9, 179}, {0, 8, 9},
+    {0, 8, 137}, {0, 8, 73}, {0, 9, 243}, {16, 7, 4}, {0, 8, 85}, {0, 8, 21}, {16, 8, 258},
+    {19, 7, 43}, {0, 8, 117}, {0, 8, 53}, {0, 9, 203}, {17, 7, 13}, {0, 8, 101}, {0, 8, 37},
+    {0, 9, 171}, {0, 8, 5}, {0, 8, 133}, {0, 8, 69}, {0, 9, 235}, {16, 7, 8}, {0, 8, 93},
+    {0, 8, 29}, {0, 9, 155}, {20, 7, 83}, {0, 8, 125}, {0, 8, 61}, {0, 9, 219}, {18, 7, 23},
+    {0, 8, 109}, {0, 8, 45}, {0, 9, 187}, {0, 8, 13}, {0, 8, 141}, {0, 8, 77}, {0, 9, 251},
+    {16, 7, 3}, {0, 8, 83}, {0, 8, 19}, {21, 8, 195}, {19, 7, 35}, {0, 8, 115}, {0, 8, 51},
+    {0, 9, 199}, {17, 7, 11}, {0, 8, 99}, {0, 8, 35}, {0, 9, 167}, {0, 8, 3}, {0, 8, 131},
+    {0, 8, 67}, {0, 9, 231}, {16, 7, 7}, {0, 8, 91}, {0, 8, 27}, {0, 9, 151}, {20, 7, 67},
+    {0, 8, 123}, {0, 8, 59}, {0, 9, 215}, {18, 7, 19}, {0, 8, 107}, {0, 8, 43}, {0, 9, 183},
+    {0, 8, 11}, {0, 8, 139}, {0, 8, 75}, {0, 9, 247}, {16, 7, 5}, {0, 8, 87}, {0, 8, 23},
+    {64, 8, 0}, {19, 7, 51}, {0, 8, 119}, {0, 8, 55}, {0, 9, 207}, {17, 7, 15}, {0, 8, 103},
+    {0, 8, 39}, {0, 9, 175}, {0, 8, 7}, {0, 8, 135}, {0, 8, 71}, {0, 9, 239}, {16, 7, 9},
+    {0, 8, 95}, {0, 8, 31}, {0, 9, 159}, {20, 7, 99}, {0, 8, 127}, {0, 8, 63}, {0, 9, 223},
+    {18, 7, 27}, {0, 8, 111}, {0, 8, 47}, {0, 9, 191}, {0, 8, 15}, {0, 8, 143}, {0, 8, 79},
+    {0, 9, 255}
+};
 
-    static const code distfix[32] = {
-        {16,5,1},{23,5,257},{19,5,17},{27,5,4097},{17,5,5},{25,5,1025},
-        {21,5,65},{29,5,16385},{16,5,3},{24,5,513},{20,5,33},{28,5,8193},
-        {18,5,9},{26,5,2049},{22,5,129},{64,5,0},{16,5,2},{23,5,385},
-        {19,5,25},{27,5,6145},{17,5,7},{25,5,1537},{21,5,97},{29,5,24577},
-        {16,5,4},{24,5,769},{20,5,49},{28,5,12289},{18,5,13},{26,5,3073},
-        {22,5,193},{64,5,0}
-    };
+static const code distfix[32] = {
+    {16, 5, 1}, {23, 5, 257}, {19, 5, 17}, {27, 5, 4097}, {17, 5, 5}, {25, 5, 1025},
+    {21, 5, 65}, {29, 5, 16385}, {16, 5, 3}, {24, 5, 513}, {20, 5, 33}, {28, 5, 8193},
+    {18, 5, 9}, {26, 5, 2049}, {22, 5, 129}, {64, 5, 0}, {16, 5, 2}, {23, 5, 385},
+    {19, 5, 25}, {27, 5, 6145}, {17, 5, 7}, {25, 5, 1537}, {21, 5, 97}, {29, 5, 24577},
+    {16, 5, 4}, {24, 5, 769}, {20, 5, 49}, {28, 5, 12289}, {18, 5, 13}, {26, 5, 3073},
+    {22, 5, 193}, {64, 5, 0}
+};
diff --git a/zlib/inflate.c b/zlib/inflate.c
index 40d9f568f..f8d7b0cb4 100644
--- a/zlib/inflate.c
+++ b/zlib/inflate.c
@@ -109,7 +109,7 @@ local void fixedtables OF((struct inflate_state FAR *state));
 local int updatewindow OF((z_streamp strm, const unsigned char FAR *end,
                            unsigned copy));
 #ifdef BUILDFIXED
-   void makefixed OF((void));
+void makefixed OF((void));
 #endif
 local unsigned syncsearch OF((unsigned FAR *have, const unsigned char FAR *buf,
                               unsigned len));
@@ -167,8 +167,7 @@ int windowBits;
     if (windowBits < 0) {
         wrap = 0;
         windowBits = -windowBits;
-    }
-    else {
+    } else {
         wrap = (windowBits >> 4) + 1;
 #ifdef GUNZIP
         if (windowBits < 48)
@@ -420,8 +419,7 @@ unsigned copy;
         zmemcpy(state->window, end - state->wsize, state->wsize);
         state->wnext = 0;
         state->whave = state->wsize;
-    }
-    else {
+    } else {
         dist = state->wsize - state->wnext;
         if (dist > copy) dist = copy;
         zmemcpy(state->window + state->wnext, end - copy, dist);
@@ -430,8 +428,7 @@ unsigned copy;
             zmemcpy(state->window, end - copy, copy);
             state->wnext = copy;
             state->whave = state->wsize;
-        }
-        else {
+        } else {
             state->wnext += dist;
             if (state->wnext == state->wsize) state->wnext = 0;
             if (state->whave < state->wsize) state->whave += dist;
@@ -637,7 +634,7 @@ int flush;
     unsigned char hbuf[4];      /* buffer for gzip header crc calculation */
 #endif
     static const unsigned short order[19] = /* permutation of code lengths */
-        {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
+    {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
 
     if (strm == Z_NULL || strm->state == Z_NULL || strm->next_out == Z_NULL ||
         (strm->next_in == Z_NULL && strm->avail_in != 0))
@@ -651,593 +648,585 @@ int flush;
     ret = Z_OK;
     for (;;)
         switch (state->mode) {
-        case HEAD:
-            if (state->wrap == 0) {
-                state->mode = TYPEDO;
-                break;
-            }
-            NEEDBITS(16);
-#ifdef GUNZIP
-            if ((state->wrap & 2) && hold == 0x8b1f) {  /* gzip header */
-                state->check = crc32(0L, Z_NULL, 0);
-                CRC2(state->check, hold);
-                INITBITS();
-                state->mode = FLAGS;
-                break;
-            }
-            state->flags = 0;           /* expect zlib header */
-            if (state->head != Z_NULL)
-                state->head->done = -1;
-            if (!(state->wrap & 1) ||   /* check if zlib header allowed */
-#else
-            if (
-#endif
-                ((BITS(8) << 8) + (hold >> 8)) % 31) {
-                strm->msg = (char *)"incorrect header check";
-                state->mode = BAD;
-                break;
-            }
-            if (BITS(4) != Z_DEFLATED) {
-                strm->msg = (char *)"unknown compression method";
-                state->mode = BAD;
-                break;
-            }
-            DROPBITS(4);
-            len = BITS(4) + 8;
-            if (state->wbits == 0)
-                state->wbits = len;
-            else if (len > state->wbits) {
-                strm->msg = (char *)"invalid window size";
-                state->mode = BAD;
-                break;
-            }
-            state->dmax = 1U << len;
-            Tracev((stderr, "inflate:   zlib header ok\n"));
-            strm->adler = state->check = adler32(0L, Z_NULL, 0);
-            state->mode = hold & 0x200 ? DICTID : TYPE;
-            INITBITS();
-            break;
-#ifdef GUNZIP
-        case FLAGS:
-            NEEDBITS(16);
-            state->flags = (int)(hold);
-            if ((state->flags & 0xff) != Z_DEFLATED) {
-                strm->msg = (char *)"unknown compression method";
-                state->mode = BAD;
-                break;
-            }
-            if (state->flags & 0xe000) {
-                strm->msg = (char *)"unknown header flags set";
-                state->mode = BAD;
-                break;
-            }
-            if (state->head != Z_NULL)
-                state->head->text = (int)((hold >> 8) & 1);
-            if (state->flags & 0x0200) CRC2(state->check, hold);
-            INITBITS();
-            state->mode = TIME;
-        case TIME:
-            NEEDBITS(32);
-            if (state->head != Z_NULL)
-                state->head->time = hold;
-            if (state->flags & 0x0200) CRC4(state->check, hold);
-            INITBITS();
-            state->mode = OS;
-        case OS:
-            NEEDBITS(16);
-            if (state->head != Z_NULL) {
-                state->head->xflags = (int)(hold & 0xff);
-                state->head->os = (int)(hold >> 8);
-            }
-            if (state->flags & 0x0200) CRC2(state->check, hold);
-            INITBITS();
-            state->mode = EXLEN;
-        case EXLEN:
-            if (state->flags & 0x0400) {
+            case HEAD:
+                if (state->wrap == 0) {
+                    state->mode = TYPEDO;
+                    break;
+                }
                 NEEDBITS(16);
-                state->length = (unsigned)(hold);
+#ifdef GUNZIP
+                if ((state->wrap & 2) && hold == 0x8b1f) {  /* gzip header */
+                    state->check = crc32(0L, Z_NULL, 0);
+                    CRC2(state->check, hold);
+                    INITBITS();
+                    state->mode = FLAGS;
+                    break;
+                }
+                state->flags = 0;           /* expect zlib header */
                 if (state->head != Z_NULL)
-                    state->head->extra_len = (unsigned)hold;
+                    state->head->done = -1;
+                if (!(state->wrap & 1) ||   /* check if zlib header allowed */
+#else
+                if (
+#endif
+                    ((BITS(8) << 8) + (hold >> 8)) % 31) {
+                    strm->msg = (char *)"incorrect header check";
+                    state->mode = BAD;
+                    break;
+                }
+                if (BITS(4) != Z_DEFLATED) {
+                    strm->msg = (char *)"unknown compression method";
+                    state->mode = BAD;
+                    break;
+                }
+                DROPBITS(4);
+                len = BITS(4) + 8;
+                if (state->wbits == 0)
+                    state->wbits = len;
+                else if (len > state->wbits) {
+                    strm->msg = (char *)"invalid window size";
+                    state->mode = BAD;
+                    break;
+                }
+                state->dmax = 1U << len;
+                Tracev((stderr, "inflate:   zlib header ok\n"));
+                strm->adler = state->check = adler32(0L, Z_NULL, 0);
+                state->mode = hold & 0x200 ? DICTID : TYPE;
+                INITBITS();
+                break;
+#ifdef GUNZIP
+            case FLAGS:
+                NEEDBITS(16);
+                state->flags = (int)(hold);
+                if ((state->flags & 0xff) != Z_DEFLATED) {
+                    strm->msg = (char *)"unknown compression method";
+                    state->mode = BAD;
+                    break;
+                }
+                if (state->flags & 0xe000) {
+                    strm->msg = (char *)"unknown header flags set";
+                    state->mode = BAD;
+                    break;
+                }
+                if (state->head != Z_NULL)
+                    state->head->text = (int)((hold >> 8) & 1);
                 if (state->flags & 0x0200) CRC2(state->check, hold);
                 INITBITS();
-            }
-            else if (state->head != Z_NULL)
-                state->head->extra = Z_NULL;
-            state->mode = EXTRA;
-        case EXTRA:
-            if (state->flags & 0x0400) {
-                copy = state->length;
-                if (copy > have) copy = have;
-                if (copy) {
-                    if (state->head != Z_NULL &&
-                        state->head->extra != Z_NULL) {
-                        len = state->head->extra_len - state->length;
-                        zmemcpy(state->head->extra + len, next,
-                                len + copy > state->head->extra_max ?
-                                state->head->extra_max - len : copy);
+                state->mode = TIME;
+            case TIME:
+                NEEDBITS(32);
+                if (state->head != Z_NULL)
+                    state->head->time = hold;
+                if (state->flags & 0x0200) CRC4(state->check, hold);
+                INITBITS();
+                state->mode = OS;
+            case OS:
+                NEEDBITS(16);
+                if (state->head != Z_NULL) {
+                    state->head->xflags = (int)(hold & 0xff);
+                    state->head->os = (int)(hold >> 8);
+                }
+                if (state->flags & 0x0200) CRC2(state->check, hold);
+                INITBITS();
+                state->mode = EXLEN;
+            case EXLEN:
+                if (state->flags & 0x0400) {
+                    NEEDBITS(16);
+                    state->length = (unsigned)(hold);
+                    if (state->head != Z_NULL)
+                        state->head->extra_len = (unsigned)hold;
+                    if (state->flags & 0x0200) CRC2(state->check, hold);
+                    INITBITS();
+                } else if (state->head != Z_NULL)
+                    state->head->extra = Z_NULL;
+                state->mode = EXTRA;
+            case EXTRA:
+                if (state->flags & 0x0400) {
+                    copy = state->length;
+                    if (copy > have) copy = have;
+                    if (copy) {
+                        if (state->head != Z_NULL &&
+                            state->head->extra != Z_NULL) {
+                            len = state->head->extra_len - state->length;
+                            zmemcpy(state->head->extra + len, next,
+                                    len + copy > state->head->extra_max ?
+                                    state->head->extra_max - len : copy);
+                        }
+                        if (state->flags & 0x0200)
+                            state->check = crc32(state->check, next, copy);
+                        have -= copy;
+                        next += copy;
+                        state->length -= copy;
                     }
+                    if (state->length) goto inf_leave;
+                }
+                state->length = 0;
+                state->mode = NAME;
+            case NAME:
+                if (state->flags & 0x0800) {
+                    if (have == 0) goto inf_leave;
+                    copy = 0;
+                    do {
+                        len = (unsigned)(next[copy++]);
+                        if (state->head != Z_NULL &&
+                            state->head->name != Z_NULL &&
+                            state->length < state->head->name_max)
+                            state->head->name[state->length++] = len;
+                    } while (len && copy < have);
                     if (state->flags & 0x0200)
                         state->check = crc32(state->check, next, copy);
                     have -= copy;
                     next += copy;
-                    state->length -= copy;
-                }
-                if (state->length) goto inf_leave;
-            }
-            state->length = 0;
-            state->mode = NAME;
-        case NAME:
-            if (state->flags & 0x0800) {
-                if (have == 0) goto inf_leave;
-                copy = 0;
-                do {
-                    len = (unsigned)(next[copy++]);
-                    if (state->head != Z_NULL &&
-                            state->head->name != Z_NULL &&
-                            state->length < state->head->name_max)
-                        state->head->name[state->length++] = len;
-                } while (len && copy < have);
-                if (state->flags & 0x0200)
-                    state->check = crc32(state->check, next, copy);
-                have -= copy;
-                next += copy;
-                if (len) goto inf_leave;
-            }
-            else if (state->head != Z_NULL)
-                state->head->name = Z_NULL;
-            state->length = 0;
-            state->mode = COMMENT;
-        case COMMENT:
-            if (state->flags & 0x1000) {
-                if (have == 0) goto inf_leave;
-                copy = 0;
-                do {
-                    len = (unsigned)(next[copy++]);
-                    if (state->head != Z_NULL &&
+                    if (len) goto inf_leave;
+                } else if (state->head != Z_NULL)
+                    state->head->name = Z_NULL;
+                state->length = 0;
+                state->mode = COMMENT;
+            case COMMENT:
+                if (state->flags & 0x1000) {
+                    if (have == 0) goto inf_leave;
+                    copy = 0;
+                    do {
+                        len = (unsigned)(next[copy++]);
+                        if (state->head != Z_NULL &&
                             state->head->comment != Z_NULL &&
                             state->length < state->head->comm_max)
-                        state->head->comment[state->length++] = len;
-                } while (len && copy < have);
-                if (state->flags & 0x0200)
-                    state->check = crc32(state->check, next, copy);
-                have -= copy;
-                next += copy;
-                if (len) goto inf_leave;
-            }
-            else if (state->head != Z_NULL)
-                state->head->comment = Z_NULL;
-            state->mode = HCRC;
-        case HCRC:
-            if (state->flags & 0x0200) {
-                NEEDBITS(16);
-                if (hold != (state->check & 0xffff)) {
-                    strm->msg = (char *)"header crc mismatch";
+                            state->head->comment[state->length++] = len;
+                    } while (len && copy < have);
+                    if (state->flags & 0x0200)
+                        state->check = crc32(state->check, next, copy);
+                    have -= copy;
+                    next += copy;
+                    if (len) goto inf_leave;
+                } else if (state->head != Z_NULL)
+                    state->head->comment = Z_NULL;
+                state->mode = HCRC;
+            case HCRC:
+                if (state->flags & 0x0200) {
+                    NEEDBITS(16);
+                    if (hold != (state->check & 0xffff)) {
+                        strm->msg = (char *)"header crc mismatch";
+                        state->mode = BAD;
+                        break;
+                    }
+                    INITBITS();
+                }
+                if (state->head != Z_NULL) {
+                    state->head->hcrc = (int)((state->flags >> 9) & 1);
+                    state->head->done = 1;
+                }
+                strm->adler = state->check = crc32(0L, Z_NULL, 0);
+                state->mode = TYPE;
+                break;
+#endif
+            case DICTID:
+                NEEDBITS(32);
+                strm->adler = state->check = ZSWAP32(hold);
+                INITBITS();
+                state->mode = DICT;
+            case DICT:
+                if (state->havedict == 0) {
+                    RESTORE();
+                    return Z_NEED_DICT;
+                }
+                strm->adler = state->check = adler32(0L, Z_NULL, 0);
+                state->mode = TYPE;
+            case TYPE:
+                if (flush == Z_BLOCK || flush == Z_TREES) goto inf_leave;
+            case TYPEDO:
+                if (state->last) {
+                    BYTEBITS();
+                    state->mode = CHECK;
+                    break;
+                }
+                NEEDBITS(3);
+                state->last = BITS(1);
+                DROPBITS(1);
+                switch (BITS(2)) {
+                    case 0:                             /* stored block */
+                        Tracev((stderr, "inflate:     stored block%s\n",
+                                state->last ? " (last)" : ""));
+                        state->mode = STORED;
+                        break;
+                    case 1:                             /* fixed block */
+#ifdef ZLIB_PM3_TUNED
+                        strm->msg = (char *)"fixed block coding not supported";
+                        state->mode = BAD;
+#else
+                        fixedtables(state);
+                        Tracev((stderr, "inflate:     fixed codes block%s\n",
+                                state->last ? " (last)" : ""));
+                        state->mode = LEN_;             /* decode codes */
+                        if (flush == Z_TREES) {
+                            DROPBITS(2);
+                            goto inf_leave;
+                        }
+#endif
+                        break;
+                    case 2:                             /* dynamic block */
+                        Tracev((stderr, "inflate:     dynamic codes block%s\n",
+                                state->last ? " (last)" : ""));
+                        state->mode = TABLE;
+                        break;
+                    case 3:
+                        strm->msg = (char *)"invalid block type";
+                        state->mode = BAD;
+                }
+                DROPBITS(2);
+                break;
+            case STORED:
+                BYTEBITS();                         /* go to byte boundary */
+                NEEDBITS(32);
+                if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
+                    strm->msg = (char *)"invalid stored block lengths";
                     state->mode = BAD;
                     break;
                 }
+                state->length = (unsigned)hold & 0xffff;
+                Tracev((stderr, "inflate:       stored length %u\n",
+                        state->length));
                 INITBITS();
-            }
-            if (state->head != Z_NULL) {
-                state->head->hcrc = (int)((state->flags >> 9) & 1);
-                state->head->done = 1;
-            }
-            strm->adler = state->check = crc32(0L, Z_NULL, 0);
-            state->mode = TYPE;
-            break;
-#endif
-        case DICTID:
-            NEEDBITS(32);
-            strm->adler = state->check = ZSWAP32(hold);
-            INITBITS();
-            state->mode = DICT;
-        case DICT:
-            if (state->havedict == 0) {
-                RESTORE();
-                return Z_NEED_DICT;
-            }
-            strm->adler = state->check = adler32(0L, Z_NULL, 0);
-            state->mode = TYPE;
-        case TYPE:
-            if (flush == Z_BLOCK || flush == Z_TREES) goto inf_leave;
-        case TYPEDO:
-            if (state->last) {
-                BYTEBITS();
-                state->mode = CHECK;
+                state->mode = COPY_;
+                if (flush == Z_TREES) goto inf_leave;
+            case COPY_:
+                state->mode = COPY;
+            case COPY:
+                copy = state->length;
+                if (copy) {
+                    if (copy > have) copy = have;
+                    if (copy > left) copy = left;
+                    if (copy == 0) goto inf_leave;
+                    zmemcpy(put, next, copy);
+                    have -= copy;
+                    next += copy;
+                    left -= copy;
+                    put += copy;
+                    state->length -= copy;
+                    break;
+                }
+                Tracev((stderr, "inflate:       stored end\n"));
+                state->mode = TYPE;
                 break;
-            }
-            NEEDBITS(3);
-            state->last = BITS(1);
-            DROPBITS(1);
-            switch (BITS(2)) {
-            case 0:                             /* stored block */
-                Tracev((stderr, "inflate:     stored block%s\n",
-                        state->last ? " (last)" : ""));
-                state->mode = STORED;
-                break;
-            case 1:                             /* fixed block */
-#ifdef ZLIB_PM3_TUNED
-                strm->msg = (char *)"fixed block coding not supported";
-                state->mode = BAD;
-#else
-                fixedtables(state);
-                Tracev((stderr, "inflate:     fixed codes block%s\n",
-                        state->last ? " (last)" : ""));
-                state->mode = LEN_;             /* decode codes */
-                if (flush == Z_TREES) {
-                    DROPBITS(2);
-                    goto inf_leave;
+            case TABLE:
+                NEEDBITS(14);
+                state->nlen = BITS(5) + 257;
+                DROPBITS(5);
+                state->ndist = BITS(5) + 1;
+                DROPBITS(5);
+                state->ncode = BITS(4) + 4;
+                DROPBITS(4);
+#ifndef PKZIP_BUG_WORKAROUND
+                if (state->nlen > 286 || state->ndist > 30) {
+                    strm->msg = (char *)"too many length or distance symbols";
+                    state->mode = BAD;
+                    break;
                 }
 #endif
-                break;
-            case 2:                             /* dynamic block */
-                Tracev((stderr, "inflate:     dynamic codes block%s\n",
-                        state->last ? " (last)" : ""));
-                state->mode = TABLE;
-                break;
-            case 3:
-                strm->msg = (char *)"invalid block type";
-                state->mode = BAD;
-            }
-            DROPBITS(2);
-            break;
-        case STORED:
-            BYTEBITS();                         /* go to byte boundary */
-            NEEDBITS(32);
-            if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
-                strm->msg = (char *)"invalid stored block lengths";
-                state->mode = BAD;
-                break;
-            }
-            state->length = (unsigned)hold & 0xffff;
-            Tracev((stderr, "inflate:       stored length %u\n",
-                    state->length));
-            INITBITS();
-            state->mode = COPY_;
-            if (flush == Z_TREES) goto inf_leave;
-        case COPY_:
-            state->mode = COPY;
-        case COPY:
-            copy = state->length;
-            if (copy) {
-                if (copy > have) copy = have;
-                if (copy > left) copy = left;
-                if (copy == 0) goto inf_leave;
-                zmemcpy(put, next, copy);
-                have -= copy;
-                next += copy;
-                left -= copy;
-                put += copy;
-                state->length -= copy;
-                break;
-            }
-            Tracev((stderr, "inflate:       stored end\n"));
-            state->mode = TYPE;
-            break;
-        case TABLE:
-            NEEDBITS(14);
-            state->nlen = BITS(5) + 257;
-            DROPBITS(5);
-            state->ndist = BITS(5) + 1;
-            DROPBITS(5);
-            state->ncode = BITS(4) + 4;
-            DROPBITS(4);
-#ifndef PKZIP_BUG_WORKAROUND
-            if (state->nlen > 286 || state->ndist > 30) {
-                strm->msg = (char *)"too many length or distance symbols";
-                state->mode = BAD;
-                break;
-            }
-#endif
-            Tracev((stderr, "inflate:       table sizes ok\n"));
-            state->have = 0;
-            state->mode = LENLENS;
-        case LENLENS:
-            while (state->have < state->ncode) {
-                NEEDBITS(3);
-                state->lens[order[state->have++]] = (unsigned short)BITS(3);
-                DROPBITS(3);
-            }
-            while (state->have < 19)
-                state->lens[order[state->have++]] = 0;
-            state->next = state->codes;
-            state->lencode = (const code FAR *)(state->next);
-            state->lenbits = 7;
-            ret = inflate_table(CODES, state->lens, 19, &(state->next),
-                                &(state->lenbits), state->work);
-            if (ret) {
-                strm->msg = (char *)"invalid code lengths set";
-                state->mode = BAD;
-                break;
-            }
-            Tracev((stderr, "inflate:       code lengths ok\n"));
-            state->have = 0;
-            state->mode = CODELENS;
-        case CODELENS:
-            while (state->have < state->nlen + state->ndist) {
+                Tracev((stderr, "inflate:       table sizes ok\n"));
+                state->have = 0;
+                state->mode = LENLENS;
+            case LENLENS:
+                while (state->have < state->ncode) {
+                    NEEDBITS(3);
+                    state->lens[order[state->have++]] = (unsigned short)BITS(3);
+                    DROPBITS(3);
+                }
+                while (state->have < 19)
+                    state->lens[order[state->have++]] = 0;
+                state->next = state->codes;
+                state->lencode = (const code FAR *)(state->next);
+                state->lenbits = 7;
+                ret = inflate_table(CODES, state->lens, 19, &(state->next),
+                                    &(state->lenbits), state->work);
+                if (ret) {
+                    strm->msg = (char *)"invalid code lengths set";
+                    state->mode = BAD;
+                    break;
+                }
+                Tracev((stderr, "inflate:       code lengths ok\n"));
+                state->have = 0;
+                state->mode = CODELENS;
+            case CODELENS:
+                while (state->have < state->nlen + state->ndist) {
+                    for (;;) {
+                        here = state->lencode[BITS(state->lenbits)];
+                        if ((unsigned)(here.bits) <= bits) break;
+                        PULLBYTE();
+                    }
+                    if (here.val < 16) {
+                        DROPBITS(here.bits);
+                        state->lens[state->have++] = here.val;
+                    } else {
+                        if (here.val == 16) {
+                            NEEDBITS(here.bits + 2);
+                            DROPBITS(here.bits);
+                            if (state->have == 0) {
+                                strm->msg = (char *)"invalid bit length repeat";
+                                state->mode = BAD;
+                                break;
+                            }
+                            len = state->lens[state->have - 1];
+                            copy = 3 + BITS(2);
+                            DROPBITS(2);
+                        } else if (here.val == 17) {
+                            NEEDBITS(here.bits + 3);
+                            DROPBITS(here.bits);
+                            len = 0;
+                            copy = 3 + BITS(3);
+                            DROPBITS(3);
+                        } else {
+                            NEEDBITS(here.bits + 7);
+                            DROPBITS(here.bits);
+                            len = 0;
+                            copy = 11 + BITS(7);
+                            DROPBITS(7);
+                        }
+                        if (state->have + copy > state->nlen + state->ndist) {
+                            strm->msg = (char *)"invalid bit length repeat";
+                            state->mode = BAD;
+                            break;
+                        }
+                        while (copy--)
+                            state->lens[state->have++] = (unsigned short)len;
+                    }
+                }
+
+                /* handle error breaks in while */
+                if (state->mode == BAD) break;
+
+                /* check for end-of-block code (better have one) */
+                if (state->lens[256] == 0) {
+                    strm->msg = (char *)"invalid code -- missing end-of-block";
+                    state->mode = BAD;
+                    break;
+                }
+
+                /* build code tables -- note: do not change the lenbits or distbits
+                   values here (9 and 6) without reading the comments in inftrees.h
+                   concerning the ENOUGH constants, which depend on those values */
+                state->next = state->codes;
+                state->lencode = (const code FAR *)(state->next);
+                state->lenbits = 9;
+                ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
+                                    &(state->lenbits), state->work);
+                if (ret) {
+                    strm->msg = (char *)"invalid literal/lengths set";
+                    state->mode = BAD;
+                    break;
+                }
+                state->distcode = (const code FAR *)(state->next);
+                state->distbits = 6;
+                ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
+                                    &(state->next), &(state->distbits), state->work);
+                if (ret) {
+                    strm->msg = (char *)"invalid distances set";
+                    state->mode = BAD;
+                    break;
+                }
+                Tracev((stderr, "inflate:       codes ok\n"));
+                state->mode = LEN_;
+                if (flush == Z_TREES) goto inf_leave;
+            case LEN_:
+                state->mode = LEN;
+            case LEN:
+                if (have >= 6 && left >= 258) {
+                    RESTORE();
+                    inflate_fast(strm, out);
+                    LOAD();
+                    if (state->mode == TYPE)
+                        state->back = -1;
+                    break;
+                }
+                state->back = 0;
                 for (;;) {
                     here = state->lencode[BITS(state->lenbits)];
                     if ((unsigned)(here.bits) <= bits) break;
                     PULLBYTE();
                 }
-                if (here.val < 16) {
-                    DROPBITS(here.bits);
-                    state->lens[state->have++] = here.val;
+                if (here.op && (here.op & 0xf0) == 0) {
+                    last = here;
+                    for (;;) {
+                        here = state->lencode[last.val +
+                                                       (BITS(last.bits + last.op) >> last.bits)];
+                        if ((unsigned)(last.bits + here.bits) <= bits) break;
+                        PULLBYTE();
+                    }
+                    DROPBITS(last.bits);
+                    state->back += last.bits;
                 }
-                else {
-                    if (here.val == 16) {
-                        NEEDBITS(here.bits + 2);
-                        DROPBITS(here.bits);
-                        if (state->have == 0) {
-                            strm->msg = (char *)"invalid bit length repeat";
+                DROPBITS(here.bits);
+                state->back += here.bits;
+                state->length = (unsigned)here.val;
+                if ((int)(here.op) == 0) {
+                    Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
+                             "inflate:         literal '%c'\n" :
+                             "inflate:         literal 0x%02x\n", here.val));
+                    state->mode = LIT;
+                    break;
+                }
+                if (here.op & 32) {
+                    Tracevv((stderr, "inflate:         end of block\n"));
+                    state->back = -1;
+                    state->mode = TYPE;
+                    break;
+                }
+                if (here.op & 64) {
+                    strm->msg = (char *)"invalid literal/length code";
+                    state->mode = BAD;
+                    break;
+                }
+                state->extra = (unsigned)(here.op) & 15;
+                state->mode = LENEXT;
+            case LENEXT:
+                if (state->extra) {
+                    NEEDBITS(state->extra);
+                    state->length += BITS(state->extra);
+                    DROPBITS(state->extra);
+                    state->back += state->extra;
+                }
+                Tracevv((stderr, "inflate:         length %u\n", state->length));
+                state->was = state->length;
+                state->mode = DIST;
+            case DIST:
+                for (;;) {
+                    here = state->distcode[BITS(state->distbits)];
+                    if ((unsigned)(here.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                if ((here.op & 0xf0) == 0) {
+                    last = here;
+                    for (;;) {
+                        here = state->distcode[last.val +
+                                                        (BITS(last.bits + last.op) >> last.bits)];
+                        if ((unsigned)(last.bits + here.bits) <= bits) break;
+                        PULLBYTE();
+                    }
+                    DROPBITS(last.bits);
+                    state->back += last.bits;
+                }
+                DROPBITS(here.bits);
+                state->back += here.bits;
+                if (here.op & 64) {
+                    strm->msg = (char *)"invalid distance code";
+                    state->mode = BAD;
+                    break;
+                }
+                state->offset = (unsigned)here.val;
+                state->extra = (unsigned)(here.op) & 15;
+                state->mode = DISTEXT;
+            case DISTEXT:
+                if (state->extra) {
+                    NEEDBITS(state->extra);
+                    state->offset += BITS(state->extra);
+                    DROPBITS(state->extra);
+                    state->back += state->extra;
+                }
+#ifdef INFLATE_STRICT
+                if (state->offset > state->dmax) {
+                    strm->msg = (char *)"invalid distance too far back";
+                    state->mode = BAD;
+                    break;
+                }
+#endif
+                Tracevv((stderr, "inflate:         distance %u\n", state->offset));
+                state->mode = MATCH;
+            case MATCH:
+                if (left == 0) goto inf_leave;
+                copy = out - left;
+                if (state->offset > copy) {         /* copy from window */
+                    copy = state->offset - copy;
+                    if (copy > state->whave) {
+                        if (state->sane) {
+                            strm->msg = (char *)"invalid distance too far back";
                             state->mode = BAD;
                             break;
                         }
-                        len = state->lens[state->have - 1];
-                        copy = 3 + BITS(2);
-                        DROPBITS(2);
-                    }
-                    else if (here.val == 17) {
-                        NEEDBITS(here.bits + 3);
-                        DROPBITS(here.bits);
-                        len = 0;
-                        copy = 3 + BITS(3);
-                        DROPBITS(3);
-                    }
-                    else {
-                        NEEDBITS(here.bits + 7);
-                        DROPBITS(here.bits);
-                        len = 0;
-                        copy = 11 + BITS(7);
-                        DROPBITS(7);
-                    }
-                    if (state->have + copy > state->nlen + state->ndist) {
-                        strm->msg = (char *)"invalid bit length repeat";
-                        state->mode = BAD;
-                        break;
-                    }
-                    while (copy--)
-                        state->lens[state->have++] = (unsigned short)len;
-                }
-            }
-
-            /* handle error breaks in while */
-            if (state->mode == BAD) break;
-
-            /* check for end-of-block code (better have one) */
-            if (state->lens[256] == 0) {
-                strm->msg = (char *)"invalid code -- missing end-of-block";
-                state->mode = BAD;
-                break;
-            }
-
-            /* build code tables -- note: do not change the lenbits or distbits
-               values here (9 and 6) without reading the comments in inftrees.h
-               concerning the ENOUGH constants, which depend on those values */
-            state->next = state->codes;
-            state->lencode = (const code FAR *)(state->next);
-            state->lenbits = 9;
-            ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
-                                &(state->lenbits), state->work);
-            if (ret) {
-                strm->msg = (char *)"invalid literal/lengths set";
-                state->mode = BAD;
-                break;
-            }
-            state->distcode = (const code FAR *)(state->next);
-            state->distbits = 6;
-            ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
-                            &(state->next), &(state->distbits), state->work);
-            if (ret) {
-                strm->msg = (char *)"invalid distances set";
-                state->mode = BAD;
-                break;
-            }
-            Tracev((stderr, "inflate:       codes ok\n"));
-            state->mode = LEN_;
-            if (flush == Z_TREES) goto inf_leave;
-        case LEN_:
-            state->mode = LEN;
-        case LEN:
-            if (have >= 6 && left >= 258) {
-                RESTORE();
-                inflate_fast(strm, out);
-                LOAD();
-                if (state->mode == TYPE)
-                    state->back = -1;
-                break;
-            }
-            state->back = 0;
-            for (;;) {
-                here = state->lencode[BITS(state->lenbits)];
-                if ((unsigned)(here.bits) <= bits) break;
-                PULLBYTE();
-            }
-            if (here.op && (here.op & 0xf0) == 0) {
-                last = here;
-                for (;;) {
-                    here = state->lencode[last.val +
-                            (BITS(last.bits + last.op) >> last.bits)];
-                    if ((unsigned)(last.bits + here.bits) <= bits) break;
-                    PULLBYTE();
-                }
-                DROPBITS(last.bits);
-                state->back += last.bits;
-            }
-            DROPBITS(here.bits);
-            state->back += here.bits;
-            state->length = (unsigned)here.val;
-            if ((int)(here.op) == 0) {
-                Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
-                        "inflate:         literal '%c'\n" :
-                        "inflate:         literal 0x%02x\n", here.val));
-                state->mode = LIT;
-                break;
-            }
-            if (here.op & 32) {
-                Tracevv((stderr, "inflate:         end of block\n"));
-                state->back = -1;
-                state->mode = TYPE;
-                break;
-            }
-            if (here.op & 64) {
-                strm->msg = (char *)"invalid literal/length code";
-                state->mode = BAD;
-                break;
-            }
-            state->extra = (unsigned)(here.op) & 15;
-            state->mode = LENEXT;
-        case LENEXT:
-            if (state->extra) {
-                NEEDBITS(state->extra);
-                state->length += BITS(state->extra);
-                DROPBITS(state->extra);
-                state->back += state->extra;
-            }
-            Tracevv((stderr, "inflate:         length %u\n", state->length));
-            state->was = state->length;
-            state->mode = DIST;
-        case DIST:
-            for (;;) {
-                here = state->distcode[BITS(state->distbits)];
-                if ((unsigned)(here.bits) <= bits) break;
-                PULLBYTE();
-            }
-            if ((here.op & 0xf0) == 0) {
-                last = here;
-                for (;;) {
-                    here = state->distcode[last.val +
-                            (BITS(last.bits + last.op) >> last.bits)];
-                    if ((unsigned)(last.bits + here.bits) <= bits) break;
-                    PULLBYTE();
-                }
-                DROPBITS(last.bits);
-                state->back += last.bits;
-            }
-            DROPBITS(here.bits);
-            state->back += here.bits;
-            if (here.op & 64) {
-                strm->msg = (char *)"invalid distance code";
-                state->mode = BAD;
-                break;
-            }
-            state->offset = (unsigned)here.val;
-            state->extra = (unsigned)(here.op) & 15;
-            state->mode = DISTEXT;
-        case DISTEXT:
-            if (state->extra) {
-                NEEDBITS(state->extra);
-                state->offset += BITS(state->extra);
-                DROPBITS(state->extra);
-                state->back += state->extra;
-            }
-#ifdef INFLATE_STRICT
-            if (state->offset > state->dmax) {
-                strm->msg = (char *)"invalid distance too far back";
-                state->mode = BAD;
-                break;
-            }
-#endif
-            Tracevv((stderr, "inflate:         distance %u\n", state->offset));
-            state->mode = MATCH;
-        case MATCH:
-            if (left == 0) goto inf_leave;
-            copy = out - left;
-            if (state->offset > copy) {         /* copy from window */
-                copy = state->offset - copy;
-                if (copy > state->whave) {
-                    if (state->sane) {
-                        strm->msg = (char *)"invalid distance too far back";
-                        state->mode = BAD;
-                        break;
-                    }
 #ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
-                    Trace((stderr, "inflate.c too far\n"));
-                    copy -= state->whave;
+                        Trace((stderr, "inflate.c too far\n"));
+                        copy -= state->whave;
+                        if (copy > state->length) copy = state->length;
+                        if (copy > left) copy = left;
+                        left -= copy;
+                        state->length -= copy;
+                        do {
+                            *put++ = 0;
+                        } while (--copy);
+                        if (state->length == 0) state->mode = LEN;
+                        break;
+#endif
+                    }
+                    if (copy > state->wnext) {
+                        copy -= state->wnext;
+                        from = state->window + (state->wsize - copy);
+                    } else
+                        from = state->window + (state->wnext - copy);
                     if (copy > state->length) copy = state->length;
-                    if (copy > left) copy = left;
-                    left -= copy;
-                    state->length -= copy;
-                    do {
-                        *put++ = 0;
-                    } while (--copy);
-                    if (state->length == 0) state->mode = LEN;
-                    break;
-#endif
+                } else {                            /* copy from output */
+                    from = put - state->offset;
+                    copy = state->length;
                 }
-                if (copy > state->wnext) {
-                    copy -= state->wnext;
-                    from = state->window + (state->wsize - copy);
-                }
-                else
-                    from = state->window + (state->wnext - copy);
-                if (copy > state->length) copy = state->length;
-            }
-            else {                              /* copy from output */
-                from = put - state->offset;
-                copy = state->length;
-            }
-            if (copy > left) copy = left;
-            left -= copy;
-            state->length -= copy;
-            do {
-                *put++ = *from++;
-            } while (--copy);
-            if (state->length == 0) state->mode = LEN;
-            break;
-        case LIT:
-            if (left == 0) goto inf_leave;
-            *put++ = (unsigned char)(state->length);
-            left--;
-            state->mode = LEN;
-            break;
-        case CHECK:
-            if (state->wrap) {
-                NEEDBITS(32);
-                out -= left;
-                strm->total_out += out;
-                state->total += out;
-                if (out)
-                    strm->adler = state->check =
-                        UPDATE(state->check, put - out, out);
-                out = left;
-                if ((
+                if (copy > left) copy = left;
+                left -= copy;
+                state->length -= copy;
+                do {
+                    *put++ = *from++;
+                } while (--copy);
+                if (state->length == 0) state->mode = LEN;
+                break;
+            case LIT:
+                if (left == 0) goto inf_leave;
+                *put++ = (unsigned char)(state->length);
+                left--;
+                state->mode = LEN;
+                break;
+            case CHECK:
+                if (state->wrap) {
+                    NEEDBITS(32);
+                    out -= left;
+                    strm->total_out += out;
+                    state->total += out;
+                    if (out)
+                        strm->adler = state->check =
+                                          UPDATE(state->check, put - out, out);
+                    out = left;
+                    if ((
 #ifdef GUNZIP
-                     state->flags ? hold :
+                            state->flags ? hold :
 #endif
-                     ZSWAP32(hold)) != state->check) {
-                    strm->msg = (char *)"incorrect data check";
-                    state->mode = BAD;
-                    break;
+                            ZSWAP32(hold)) != state->check) {
+                        strm->msg = (char *)"incorrect data check";
+                        state->mode = BAD;
+                        break;
+                    }
+                    INITBITS();
+                    Tracev((stderr, "inflate:   check matches trailer\n"));
                 }
-                INITBITS();
-                Tracev((stderr, "inflate:   check matches trailer\n"));
-            }
 #ifdef GUNZIP
-            state->mode = LENGTH;
-        case LENGTH:
-            if (state->wrap && state->flags) {
-                NEEDBITS(32);
-                if (hold != (state->total & 0xffffffffUL)) {
-                    strm->msg = (char *)"incorrect length check";
-                    state->mode = BAD;
-                    break;
+                state->mode = LENGTH;
+            case LENGTH:
+                if (state->wrap && state->flags) {
+                    NEEDBITS(32);
+                    if (hold != (state->total & 0xffffffffUL)) {
+                        strm->msg = (char *)"incorrect length check";
+                        state->mode = BAD;
+                        break;
+                    }
+                    INITBITS();
+                    Tracev((stderr, "inflate:   length matches trailer\n"));
                 }
-                INITBITS();
-                Tracev((stderr, "inflate:   length matches trailer\n"));
-            }
 #endif
-            state->mode = DONE;
-        case DONE:
-            ret = Z_STREAM_END;
-            goto inf_leave;
-        case BAD:
-            ret = Z_DATA_ERROR;
-            goto inf_leave;
-        case MEM:
-            return Z_MEM_ERROR;
-        case SYNC:
-        default:
-            return Z_STREAM_ERROR;
+                state->mode = DONE;
+            case DONE:
+                ret = Z_STREAM_END;
+                goto inf_leave;
+            case BAD:
+                ret = Z_DATA_ERROR;
+                goto inf_leave;
+            case MEM:
+                return Z_MEM_ERROR;
+            case SYNC:
+            default:
+                return Z_STREAM_ERROR;
         }
 
     /*
@@ -1246,10 +1235,10 @@ int flush;
        error.  Call updatewindow() to create and/or update the window state.
        Note: a memory error from inflate() is non-recoverable.
      */
-  inf_leave:
+inf_leave:
     RESTORE();
     if (state->wsize || (out != strm->avail_out && state->mode < BAD &&
-            (state->mode < CHECK || flush != Z_FINISH)))
+                         (state->mode < CHECK || flush != Z_FINISH)))
         if (updatewindow(strm, strm->next_out, out - strm->avail_out)) {
             state->mode = MEM;
             return Z_MEM_ERROR;
@@ -1261,7 +1250,7 @@ int flush;
     state->total += out;
     if (state->wrap && out)
         strm->adler = state->check =
-            UPDATE(state->check, strm->next_out - out, out);
+                          UPDATE(state->check, strm->next_out - out, out);
     strm->data_type = state->bits + (state->last ? 64 : 0) +
                       (state->mode == TYPE ? 128 : 0) +
                       (state->mode == LEN_ || state->mode == COPY_ ? 256 : 0);
@@ -1429,9 +1418,11 @@ z_streamp strm;
 
     /* return no joy or set up to restart inflate() on a new block */
     if (state->have != 4) return Z_DATA_ERROR;
-    in = strm->total_in;  out = strm->total_out;
+    in = strm->total_in;
+    out = strm->total_out;
     inflateReset(strm);
-    strm->total_in = in;  strm->total_out = out;
+    strm->total_in = in;
+    strm->total_out = out;
     state->mode = TYPE;
     return Z_OK;
 }
@@ -1527,6 +1518,6 @@ z_streamp strm;
         return ~0UL << 16;
     state = (struct inflate_state FAR *)strm->state;
     return ((long)(state->back) << 16) +
-        (state->mode == COPY ? state->length :
+           (state->mode == COPY ? state->length :
             (state->mode == MATCH ? state->was - state->length : 0));
 }
diff --git a/zlib/inflate.h b/zlib/inflate.h
index 95f4986d4..81e7aadd6 100644
--- a/zlib/inflate.h
+++ b/zlib/inflate.h
@@ -29,21 +29,21 @@ typedef enum {
     HCRC,       /* i: waiting for header crc (gzip) */
     DICTID,     /* i: waiting for dictionary check value */
     DICT,       /* waiting for inflateSetDictionary() call */
-        TYPE,       /* i: waiting for type bits, including last-flag bit */
-        TYPEDO,     /* i: same, but skip check to exit inflate on new block */
-        STORED,     /* i: waiting for stored size (length and complement) */
-        COPY_,      /* i/o: same as COPY below, but only first time in */
-        COPY,       /* i/o: waiting for input or output to copy stored block */
-        TABLE,      /* i: waiting for dynamic block table lengths */
-        LENLENS,    /* i: waiting for code length code lengths */
-        CODELENS,   /* i: waiting for length/lit and distance code lengths */
-            LEN_,       /* i: same as LEN below, but only first time in */
-            LEN,        /* i: waiting for length/lit/eob code */
-            LENEXT,     /* i: waiting for length extra bits */
-            DIST,       /* i: waiting for distance code */
-            DISTEXT,    /* i: waiting for distance extra bits */
-            MATCH,      /* o: waiting for output space to copy string */
-            LIT,        /* o: waiting for output space to write literal */
+    TYPE,       /* i: waiting for type bits, including last-flag bit */
+    TYPEDO,     /* i: same, but skip check to exit inflate on new block */
+    STORED,     /* i: waiting for stored size (length and complement) */
+    COPY_,      /* i/o: same as COPY below, but only first time in */
+    COPY,       /* i/o: waiting for input or output to copy stored block */
+    TABLE,      /* i: waiting for dynamic block table lengths */
+    LENLENS,    /* i: waiting for code length code lengths */
+    CODELENS,   /* i: waiting for length/lit and distance code lengths */
+    LEN_,       /* i: same as LEN below, but only first time in */
+    LEN,        /* i: waiting for length/lit/eob code */
+    LENEXT,     /* i: waiting for length extra bits */
+    DIST,       /* i: waiting for distance code */
+    DISTEXT,    /* i: waiting for distance extra bits */
+    MATCH,      /* o: waiting for output space to copy string */
+    LIT,        /* o: waiting for output space to write literal */
     CHECK,      /* i: waiting for 32-bit check value */
     LENGTH,     /* i: waiting for 32-bit length (gzip) */
     DONE,       /* finished check, done -- remain here until reset */
@@ -88,26 +88,26 @@ struct inflate_state {
     unsigned long check;        /* protected copy of check value */
     unsigned long total;        /* protected copy of output count */
     gz_headerp head;            /* where to save gzip header information */
-        /* sliding window */
+    /* sliding window */
     unsigned wbits;             /* log base 2 of requested window size */
     unsigned wsize;             /* window size or zero if not using window */
     unsigned whave;             /* valid bytes in the window */
     unsigned wnext;             /* window write index */
     unsigned char FAR *window;  /* allocated sliding window, if needed */
-        /* bit accumulator */
+    /* bit accumulator */
     unsigned long hold;         /* input bit accumulator */
     unsigned bits;              /* number of bits in "in" */
-        /* for string and stored block copying */
+    /* for string and stored block copying */
     unsigned length;            /* literal or length of data to copy */
     unsigned offset;            /* distance back to copy string from */
-        /* for table and code decoding */
+    /* for table and code decoding */
     unsigned extra;             /* extra bits needed */
-        /* fixed and dynamic code tables */
+    /* fixed and dynamic code tables */
     code const FAR *lencode;    /* starting table for length/literal codes */
     code const FAR *distcode;   /* starting table for distance codes */
     unsigned lenbits;           /* index bits for lencode */
     unsigned distbits;          /* index bits for distcode */
-        /* dynamic table building */
+    /* dynamic table building */
     unsigned ncode;             /* number of code length code lengths */
     unsigned nlen;              /* number of length code lengths */
     unsigned ndist;             /* number of distance code lengths */
diff --git a/zlib/inftrees.c b/zlib/inftrees.c
index 7fd506ddb..4eb3b722a 100644
--- a/zlib/inftrees.c
+++ b/zlib/inftrees.c
@@ -9,7 +9,7 @@
 #define MAXBITS 15
 
 const char inflate_copyright[] =
-   " inflate 1.2.8.f-Proxmark3 Copyright 1995-2013 Mark Adler ";
+    " inflate 1.2.8.f-Proxmark3 Copyright 1995-2013 Mark Adler ";
 /*
   If you use the zlib library in a product, an acknowledgment is welcome
   in the documentation of your product. If for some reason you cannot
@@ -30,8 +30,8 @@ const char inflate_copyright[] =
    longest code or if it is less than the shortest code.
  */
 int ZLIB_INTERNAL inflate_table(codetype type, unsigned short FAR *lens,
-                             unsigned codes, code FAR * FAR *table,
-                             unsigned FAR *bits, unsigned short FAR *work)
+                                unsigned codes, code FAR *FAR *table,
+                                unsigned FAR *bits, unsigned short FAR *work)
 {
     unsigned len;               /* a code's length in bits */
     unsigned sym;               /* index of code symbols */
@@ -51,22 +51,26 @@ int ZLIB_INTERNAL inflate_table(codetype type, unsigned short FAR *lens,
     const unsigned short FAR *base;     /* base value table to use */
     const unsigned short FAR *extra;    /* extra bits table to use */
     int end;                    /* use base and extra for symbol > end */
-    unsigned short count[MAXBITS+1];    /* number of codes of each length */
-    unsigned short offs[MAXBITS+1];     /* offsets in table for each length */
+    unsigned short count[MAXBITS + 1];  /* number of codes of each length */
+    unsigned short offs[MAXBITS + 1];   /* offsets in table for each length */
     static const unsigned short lbase[31] = { /* Length codes 257..285 base */
         3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
-        35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
+        35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0
+    };
     static const unsigned short lext[31] = { /* Length codes 257..285 extra */
         16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
-        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 72, 78};
+        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 72, 78
+    };
     static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
         1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
         257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
-        8193, 12289, 16385, 24577, 0, 0};
+        8193, 12289, 16385, 24577, 0, 0
+    };
     static const unsigned short dext[32] = { /* Distance codes 0..29 extra */
         16, 16, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22,
         23, 23, 24, 24, 25, 25, 26, 26, 27, 27,
-        28, 28, 29, 29, 64, 64};
+        28, 28, 29, 29, 64, 64
+    };
 
     /*
        Process a set of code lengths to create a canonical Huffman code.  The
@@ -175,21 +179,21 @@ int ZLIB_INTERNAL inflate_table(codetype type, unsigned short FAR *lens,
 
     /* set up for code type */
     switch (type) {
-    case CODES:
-        base = extra = work;    /* dummy value--not used */
-        end = 19;
-        break;
-    case LENS:
-        base = lbase;
-        base -= 257;
-        extra = lext;
-        extra -= 257;
-        end = 256;
-        break;
-    default:            /* DISTS */
-        base = dbase;
-        extra = dext;
-        end = -1;
+        case CODES:
+            base = extra = work;    /* dummy value--not used */
+            end = 19;
+            break;
+        case LENS:
+            base = lbase;
+            base -= 257;
+            extra = lext;
+            extra -= 257;
+            end = 256;
+            break;
+        default:            /* DISTS */
+            base = dbase;
+            extra = dext;
+            end = -1;
     }
 
     /* initialize state for loop */
@@ -215,12 +219,10 @@ int ZLIB_INTERNAL inflate_table(codetype type, unsigned short FAR *lens,
         if ((int)(work[sym]) < end) {
             here.op = (unsigned char)0;
             here.val = work[sym];
-        }
-        else if ((int)(work[sym]) > end) {
+        } else if ((int)(work[sym]) > end) {
             here.op = (unsigned char)(extra[work[sym]]);
             here.val = base[work[sym]];
-        }
-        else {
+        } else {
             here.op = (unsigned char)(32 + 64);         /* end of block */
             here.val = 0;
         }
@@ -241,8 +243,7 @@ int ZLIB_INTERNAL inflate_table(codetype type, unsigned short FAR *lens,
         if (incr != 0) {
             huff &= incr - 1;
             huff += incr;
-        }
-        else
+        } else
             huff = 0;
 
         /* go to next symbol, update count, len */
diff --git a/zlib/inftrees.h b/zlib/inftrees.h
index baa53a0b1..01b1a5d75 100644
--- a/zlib/inftrees.h
+++ b/zlib/inftrees.h
@@ -58,5 +58,5 @@ typedef enum {
 } codetype;
 
 int ZLIB_INTERNAL inflate_table OF((codetype type, unsigned short FAR *lens,
-                             unsigned codes, code FAR * FAR *table,
-                             unsigned FAR *bits, unsigned short FAR *work));
+                                    unsigned codes, code FAR *FAR *table,
+                                    unsigned FAR *bits, unsigned short FAR *work));
diff --git a/zlib/trees.c b/zlib/trees.c
index eff4d8545..5f721f8d7 100644
--- a/zlib/trees.c
+++ b/zlib/trees.c
@@ -68,16 +68,16 @@
 /* repeat a zero length 11-138 times  (7 bits of repeat count) */
 
 local const int extra_lbits[LENGTH_CODES] /* extra bits for each length code */
-   = {0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0};
+    = {0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0};
 
 local const int extra_dbits[D_CODES] /* extra bits for each distance code */
-   = {0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13};
+    = {0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13};
 
 local const int extra_blbits[BL_CODES]/* extra bits for each bit length code */
-   = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7};
+    = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 7};
 
 local const uch bl_order[BL_CODES]
-   = {16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15};
+    = {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
 /* The lengths of the bit length codes are sent in order of decreasing
  * probability, to avoid transmitting the lengths for unused bit length codes.
  */
@@ -91,7 +91,7 @@ local const uch bl_order[BL_CODES]
 #if defined(GEN_TREES_H) || !defined(STDC)
 /* non ANSI compilers may not accept trees.h */
 
-local ct_data static_ltree[L_CODES+2];
+local ct_data static_ltree[L_CODES + 2];
 /* The static literal tree. Since the bit lengths are imposed, there is no
  * need for the L_CODES extra codes used during heap construction. However
  * The codes 286 and 287 are needed to build a canonical tree (see _tr_init
@@ -109,7 +109,7 @@ uch _dist_code[DIST_CODE_LEN];
  * the 15 bit distances.
  */
 
-uch _length_code[MAX_MATCH-MIN_MATCH+1];
+uch _length_code[MAX_MATCH - MIN_MATCH + 1];
 /* length code for each normalized match length (0 == MIN_MATCH) */
 
 local int base_length[LENGTH_CODES];
@@ -131,7 +131,7 @@ struct static_tree_desc_s {
 };
 
 local static_tree_desc  static_l_desc =
-{static_ltree, extra_lbits, LITERALS+1, L_CODES, MAX_BITS};
+{static_ltree, extra_lbits, LITERALS + 1, L_CODES, MAX_BITS};
 
 local static_tree_desc  static_d_desc =
 {static_dtree, extra_dbits, 0,          D_CODES, MAX_BITS};
@@ -169,12 +169,12 @@ local void gen_trees_header OF((void));
 
 #ifndef DEBUG
 #  define send_code(s, c, tree) send_bits(s, tree[c].Code, tree[c].Len)
-   /* Send a code of the given tree. c and tree must not have side effects */
+/* Send a code of the given tree. c and tree must not have side effects */
 
 #else /* DEBUG */
 #  define send_code(s, c, tree) \
-     { if (z_verbose>2) fprintf(stderr,"\ncd %3d ",(c)); \
-       send_bits(s, tree[c].Code, tree[c].Len); }
+    { if (z_verbose>2) fprintf(stderr,"\ncd %3d ",(c)); \
+        send_bits(s, tree[c].Code, tree[c].Len); }
 #endif
 
 /* ===========================================================================
@@ -182,9 +182,9 @@ local void gen_trees_header OF((void));
  * IN assertion: there is enough room in pendingBuf.
  */
 #define put_short(s, w) { \
-    put_byte(s, (uch)((w) & 0xff)); \
-    put_byte(s, (uch)((ush)(w) >> 8)); \
-}
+        put_byte(s, (uch)((w) & 0xff)); \
+        put_byte(s, (uch)((ush)(w) >> 8)); \
+    }
 
 /* ===========================================================================
  * Send a value on a given number of bits.
@@ -194,11 +194,11 @@ local void gen_trees_header OF((void));
 local void send_bits      OF((deflate_state *s, int value, int length));
 
 local void send_bits(s, value, length)
-    deflate_state *s;
-    int value;  /* value to send */
-    int length; /* number of bits */
+deflate_state *s;
+int value;  /* value to send */
+int length; /* number of bits */
 {
-    Tracevv((stderr," l %2d v %4x ", length, value));
+    Tracevv((stderr, " l %2d v %4x ", length, value));
     Assert(length > 0 && length <= 15, "invalid length");
     s->bits_sent += (ulg)length;
 
@@ -219,18 +219,18 @@ local void send_bits(s, value, length)
 #else /* !DEBUG */
 
 #define send_bits(s, value, length) \
-{ int len = length;\
-  if (s->bi_valid > (int)Buf_size - len) {\
-    int val = value;\
-    s->bi_buf |= (ush)val << s->bi_valid;\
-    put_short(s, s->bi_buf);\
-    s->bi_buf = (ush)val >> (Buf_size - s->bi_valid);\
-    s->bi_valid += len - Buf_size;\
-  } else {\
-    s->bi_buf |= (ush)(value) << s->bi_valid;\
-    s->bi_valid += len;\
-  }\
-}
+    { int len = length;\
+        if (s->bi_valid > (int)Buf_size - len) {\
+            int val = value;\
+            s->bi_buf |= (ush)val << s->bi_valid;\
+            put_short(s, s->bi_buf);\
+            s->bi_buf = (ush)val >> (Buf_size - s->bi_valid);\
+            s->bi_valid += len - Buf_size;\
+        } else {\
+            s->bi_buf |= (ush)(value) << s->bi_valid;\
+            s->bi_valid += len;\
+        }\
+    }
 #endif /* DEBUG */
 
 
@@ -248,7 +248,7 @@ local void tr_static_init()
     int length;   /* length value */
     int code;     /* code value */
     int dist;     /* distance index */
-    ush bl_count[MAX_BITS+1];
+    ush bl_count[MAX_BITS + 1];
     /* number of codes at each bit length for an optimal tree */
 
     if (static_init_done) return;
@@ -264,36 +264,36 @@ local void tr_static_init()
 
     /* Initialize the mapping length (0..255) -> length code (0..28) */
     length = 0;
-    for (code = 0; code < LENGTH_CODES-1; code++) {
+    for (code = 0; code < LENGTH_CODES - 1; code++) {
         base_length[code] = length;
-        for (n = 0; n < (1<<extra_lbits[code]); n++) {
+        for (n = 0; n < (1 << extra_lbits[code]); n++) {
             _length_code[length++] = (uch)code;
         }
     }
-    Assert (length == 256, "tr_static_init: length != 256");
+    Assert(length == 256, "tr_static_init: length != 256");
     /* Note that the length 255 (match length 258) can be represented
      * in two different ways: code 284 + 5 bits or code 285, so we
      * overwrite length_code[255] to use the best encoding:
      */
-    _length_code[length-1] = (uch)code;
+    _length_code[length - 1] = (uch)code;
 
     /* Initialize the mapping dist (0..32K) -> dist code (0..29) */
     dist = 0;
     for (code = 0 ; code < 16; code++) {
         base_dist[code] = dist;
-        for (n = 0; n < (1<<extra_dbits[code]); n++) {
+        for (n = 0; n < (1 << extra_dbits[code]); n++) {
             _dist_code[dist++] = (uch)code;
         }
     }
-    Assert (dist == 256, "tr_static_init: dist != 256");
+    Assert(dist == 256, "tr_static_init: dist != 256");
     dist >>= 7; /* from now on, all distances are divided by 128 */
-    for ( ; code < D_CODES; code++) {
+    for (; code < D_CODES; code++) {
         base_dist[code] = dist << 7;
-        for (n = 0; n < (1<<(extra_dbits[code]-7)); n++) {
+        for (n = 0; n < (1 << (extra_dbits[code] - 7)); n++) {
             _dist_code[256 + dist++] = (uch)code;
         }
     }
-    Assert (dist == 256, "tr_static_init: 256+dist != 512");
+    Assert(dist == 256, "tr_static_init: 256+dist != 512");
 
     /* Construct the codes of the static literal tree */
     for (bits = 0; bits <= MAX_BITS; bits++) bl_count[bits] = 0;
@@ -306,7 +306,7 @@ local void tr_static_init()
      * tree construction to get a canonical Huffman tree (longest code
      * all ones)
      */
-    gen_codes((ct_data *)static_ltree, L_CODES+1, bl_count);
+    gen_codes((ct_data *)static_ltree, L_CODES + 1, bl_count);
 
     /* The static distance tree is trivial: */
     for (n = 0; n < D_CODES; n++) {
@@ -330,53 +330,53 @@ local void tr_static_init()
 #  endif
 
 #  define SEPARATOR(i, last, width) \
-      ((i) == (last)? "\n};\n\n" :    \
-       ((i) % (width) == (width)-1 ? ",\n" : ", "))
+    ((i) == (last)? "\n};\n\n" :    \
+     ((i) % (width) == (width)-1 ? ",\n" : ", "))
 
 void gen_trees_header()
 {
     FILE *header = fopen("trees.h", "w");
     int i;
 
-    Assert (header != NULL, "Can't open trees.h");
+    Assert(header != NULL, "Can't open trees.h");
     fprintf(header,
             "/* header created automatically with -DGEN_TREES_H */\n\n");
 
     fprintf(header, "local const ct_data static_ltree[L_CODES+2] = {\n");
-    for (i = 0; i < L_CODES+2; i++) {
+    for (i = 0; i < L_CODES + 2; i++) {
         fprintf(header, "{{%3u},{%3u}}%s", static_ltree[i].Code,
-                static_ltree[i].Len, SEPARATOR(i, L_CODES+1, 5));
+                static_ltree[i].Len, SEPARATOR(i, L_CODES + 1, 5));
     }
 
     fprintf(header, "local const ct_data static_dtree[D_CODES] = {\n");
     for (i = 0; i < D_CODES; i++) {
         fprintf(header, "{{%2u},{%2u}}%s", static_dtree[i].Code,
-                static_dtree[i].Len, SEPARATOR(i, D_CODES-1, 5));
+                static_dtree[i].Len, SEPARATOR(i, D_CODES - 1, 5));
     }
 
     fprintf(header, "const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = {\n");
     for (i = 0; i < DIST_CODE_LEN; i++) {
         fprintf(header, "%2u%s", _dist_code[i],
-                SEPARATOR(i, DIST_CODE_LEN-1, 20));
+                SEPARATOR(i, DIST_CODE_LEN - 1, 20));
     }
 
     fprintf(header,
-        "const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= {\n");
-    for (i = 0; i < MAX_MATCH-MIN_MATCH+1; i++) {
+            "const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= {\n");
+    for (i = 0; i < MAX_MATCH - MIN_MATCH + 1; i++) {
         fprintf(header, "%2u%s", _length_code[i],
-                SEPARATOR(i, MAX_MATCH-MIN_MATCH, 20));
+                SEPARATOR(i, MAX_MATCH - MIN_MATCH, 20));
     }
 
     fprintf(header, "local const int base_length[LENGTH_CODES] = {\n");
     for (i = 0; i < LENGTH_CODES; i++) {
         fprintf(header, "%1u%s", base_length[i],
-                SEPARATOR(i, LENGTH_CODES-1, 20));
+                SEPARATOR(i, LENGTH_CODES - 1, 20));
     }
 
     fprintf(header, "local const int base_dist[D_CODES] = {\n");
     for (i = 0; i < D_CODES; i++) {
         fprintf(header, "%5u%s", base_dist[i],
-                SEPARATOR(i, D_CODES-1, 10));
+                SEPARATOR(i, D_CODES - 1, 10));
     }
 
     fclose(header);
@@ -387,7 +387,7 @@ void gen_trees_header()
  * Initialize the tree data structures for a new zlib stream.
  */
 void ZLIB_INTERNAL _tr_init(s)
-    deflate_state *s;
+deflate_state *s;
 {
     tr_static_init();
 
@@ -415,7 +415,7 @@ void ZLIB_INTERNAL _tr_init(s)
  * Initialize a new block.
  */
 local void init_block(s)
-    deflate_state *s;
+deflate_state *s;
 {
     int n; /* iterates over tree elements */
 
@@ -438,19 +438,19 @@ local void init_block(s)
  * one less element. Updates heap and heap_len.
  */
 #define pqremove(s, tree, top) \
-{\
-    top = s->heap[SMALLEST]; \
-    s->heap[SMALLEST] = s->heap[s->heap_len--]; \
-    pqdownheap(s, tree, SMALLEST); \
-}
+    {\
+        top = s->heap[SMALLEST]; \
+        s->heap[SMALLEST] = s->heap[s->heap_len--]; \
+        pqdownheap(s, tree, SMALLEST); \
+    }
 
 /* ===========================================================================
  * Compares to subtrees, using the tree depth as tie breaker when
  * the subtrees have equal frequency. This minimizes the worst case length.
  */
 #define smaller(tree, n, m, depth) \
-   (tree[n].Freq < tree[m].Freq || \
-   (tree[n].Freq == tree[m].Freq && depth[n] <= depth[m]))
+    (tree[n].Freq < tree[m].Freq || \
+     (tree[n].Freq == tree[m].Freq && depth[n] <= depth[m]))
 
 /* ===========================================================================
  * Restore the heap property by moving down the tree starting at node k,
@@ -459,23 +459,24 @@ local void init_block(s)
  * two sons).
  */
 local void pqdownheap(s, tree, k)
-    deflate_state *s;
-    ct_data *tree;  /* the tree to restore */
-    int k;               /* node to move down */
+deflate_state *s;
+ct_data *tree;  /* the tree to restore */
+int k;               /* node to move down */
 {
     int v = s->heap[k];
     int j = k << 1;  /* left son of k */
     while (j <= s->heap_len) {
         /* Set j to the smallest of the two sons: */
         if (j < s->heap_len &&
-            smaller(tree, s->heap[j+1], s->heap[j], s->depth)) {
+            smaller(tree, s->heap[j + 1], s->heap[j], s->depth)) {
             j++;
         }
         /* Exit if v is smaller than both sons */
         if (smaller(tree, v, s->heap[j], s->depth)) break;
 
         /* Exchange v with the smallest son */
-        s->heap[k] = s->heap[j];  k = j;
+        s->heap[k] = s->heap[j];
+        k = j;
 
         /* And continue down the tree, setting j to the left son of k */
         j <<= 1;
@@ -494,8 +495,8 @@ local void pqdownheap(s, tree, k)
  *     not null.
  */
 local void gen_bitlen(s, desc)
-    deflate_state *s;
-    tree_desc *desc;    /* the tree descriptor */
+deflate_state *s;
+tree_desc *desc;    /* the tree descriptor */
 {
     ct_data *tree        = desc->dyn_tree;
     int max_code         = desc->max_code;
@@ -517,7 +518,7 @@ local void gen_bitlen(s, desc)
      */
     tree[s->heap[s->heap_max]].Len = 0; /* root of the heap */
 
-    for (h = s->heap_max+1; h < HEAP_SIZE; h++) {
+    for (h = s->heap_max + 1; h < HEAP_SIZE; h++) {
         n = s->heap[h];
         bits = tree[tree[n].Dad].Len + 1;
         if (bits > max_length) bits = max_length, overflow++;
@@ -528,22 +529,22 @@ local void gen_bitlen(s, desc)
 
         s->bl_count[bits]++;
         xbits = 0;
-        if (n >= base) xbits = extra[n-base];
+        if (n >= base) xbits = extra[n - base];
         f = tree[n].Freq;
         s->opt_len += (ulg)f * (bits + xbits);
         if (stree) s->static_len += (ulg)f * (stree[n].Len + xbits);
     }
     if (overflow == 0) return;
 
-    Trace((stderr,"\nbit length overflow\n"));
+    Trace((stderr, "\nbit length overflow\n"));
     /* This happens for example on obj2 and pic of the Calgary corpus */
 
     /* Find the first bit length which could increase: */
     do {
-        bits = max_length-1;
+        bits = max_length - 1;
         while (s->bl_count[bits] == 0) bits--;
         s->bl_count[bits]--;      /* move one leaf down the tree */
-        s->bl_count[bits+1] += 2; /* move one overflow item as its brother */
+        s->bl_count[bits + 1] += 2; /* move one overflow item as its brother */
         s->bl_count[max_length]--;
         /* The brother of the overflow item also moves one step up,
          * but this does not affect bl_count[max_length]
@@ -562,9 +563,9 @@ local void gen_bitlen(s, desc)
             m = s->heap[--h];
             if (m > max_code) continue;
             if ((unsigned) tree[m].Len != (unsigned) bits) {
-                Trace((stderr,"code %d bits %d->%d\n", m, tree[m].Len, bits));
+                Trace((stderr, "code %d bits %d->%d\n", m, tree[m].Len, bits));
                 s->opt_len += ((long)bits - (long)tree[m].Len)
-                              *(long)tree[m].Freq;
+                              * (long)tree[m].Freq;
                 tree[m].Len = (ush)bits;
             }
             n--;
@@ -580,12 +581,12 @@ local void gen_bitlen(s, desc)
  * OUT assertion: the field code is set for all tree elements of non
  *     zero code length.
  */
-local void gen_codes (tree, max_code, bl_count)
-    ct_data *tree;             /* the tree to decorate */
-    int max_code;              /* largest code with non zero frequency */
-    ushf *bl_count;            /* number of codes at each bit length */
+local void gen_codes(tree, max_code, bl_count)
+ct_data *tree;             /* the tree to decorate */
+int max_code;              /* largest code with non zero frequency */
+ushf *bl_count;            /* number of codes at each bit length */
 {
-    ush next_code[MAX_BITS+1]; /* next code value for each bit length */
+    ush next_code[MAX_BITS + 1]; /* next code value for each bit length */
     ush code = 0;              /* running code value */
     int bits;                  /* bit index */
     int n;                     /* code index */
@@ -594,14 +595,14 @@ local void gen_codes (tree, max_code, bl_count)
      * without bit reversal.
      */
     for (bits = 1; bits <= MAX_BITS; bits++) {
-        next_code[bits] = code = (code + bl_count[bits-1]) << 1;
+        next_code[bits] = code = (code + bl_count[bits - 1]) << 1;
     }
     /* Check that the bit counts in bl_count are consistent. The last code
      * must be all ones.
      */
-    Assert (code + bl_count[MAX_BITS]-1 == (1<<MAX_BITS)-1,
-            "inconsistent bit counts");
-    Tracev((stderr,"\ngen_codes: max_code %d ", max_code));
+    Assert(code + bl_count[MAX_BITS] - 1 == (1 << MAX_BITS) - 1,
+           "inconsistent bit counts");
+    Tracev((stderr, "\ngen_codes: max_code %d ", max_code));
 
     for (n = 0;  n <= max_code; n++) {
         int len = tree[n].Len;
@@ -609,8 +610,8 @@ local void gen_codes (tree, max_code, bl_count)
         /* Now reverse the bits */
         tree[n].Code = bi_reverse(next_code[len]++, len);
 
-        Tracecv(tree != static_ltree, (stderr,"\nn %3d %c l %2d c %4x (%x) ",
-             n, (isgraph(n) ? n : ' '), len, tree[n].Code, next_code[len]-1));
+        Tracecv(tree != static_ltree, (stderr, "\nn %3d %c l %2d c %4x (%x) ",
+                                       n, (isgraph(n) ? n : ' '), len, tree[n].Code, next_code[len] - 1));
     }
 }
 
@@ -623,8 +624,8 @@ local void gen_codes (tree, max_code, bl_count)
  *     also updated if stree is not null. The field max_code is set.
  */
 local void build_tree(s, desc)
-    deflate_state *s;
-    tree_desc *desc; /* the tree descriptor */
+deflate_state *s;
+tree_desc *desc; /* the tree descriptor */
 {
     ct_data *tree         = desc->dyn_tree;
     const ct_data *stree  = desc->stat_desc->static_tree;
@@ -657,7 +658,8 @@ local void build_tree(s, desc)
         node = s->heap[++(s->heap_len)] = (max_code < 2 ? ++max_code : 0);
         tree[node].Freq = 1;
         s->depth[node] = 0;
-        s->opt_len--; if (stree) s->static_len -= stree[node].Len;
+        s->opt_len--;
+        if (stree) s->static_len -= stree[node].Len;
         /* node is 0 or 1 so it does not have extra bits */
     }
     desc->max_code = max_code;
@@ -665,7 +667,7 @@ local void build_tree(s, desc)
     /* The elements heap[heap_len/2+1 .. heap_len] are leaves of the tree,
      * establish sub-heaps of increasing lengths:
      */
-    for (n = s->heap_len/2; n >= 1; n--) pqdownheap(s, tree, n);
+    for (n = s->heap_len / 2; n >= 1; n--) pqdownheap(s, tree, n);
 
     /* Construct the Huffman tree by repeatedly combining the least two
      * frequent nodes.
@@ -685,7 +687,7 @@ local void build_tree(s, desc)
         tree[n].Dad = tree[m].Dad = (ush)node;
 #ifdef DUMP_BL_TREE
         if (tree == s->bl_tree) {
-            fprintf(stderr,"\nnode %d(%d), sons %d(%d) %d(%d)",
+            fprintf(stderr, "\nnode %d(%d), sons %d(%d) %d(%d)",
                     node, tree[node].Freq, n, tree[n].Freq, m, tree[m].Freq);
         }
 #endif
@@ -703,17 +705,17 @@ local void build_tree(s, desc)
     gen_bitlen(s, (tree_desc *)desc);
 
     /* The field len is now set, we can generate the bit codes */
-    gen_codes ((ct_data *)tree, max_code, s->bl_count);
+    gen_codes((ct_data *)tree, max_code, s->bl_count);
 }
 
 /* ===========================================================================
  * Scan a literal or distance tree to determine the frequencies of the codes
  * in the bit length tree.
  */
-local void scan_tree (s, tree, max_code)
-    deflate_state *s;
-    ct_data *tree;   /* the tree to be scanned */
-    int max_code;    /* and its largest code of non zero frequency */
+local void scan_tree(s, tree, max_code)
+deflate_state *s;
+ct_data *tree;   /* the tree to be scanned */
+int max_code;    /* and its largest code of non zero frequency */
 {
     int n;                     /* iterates over all tree elements */
     int prevlen = -1;          /* last emitted length */
@@ -724,10 +726,11 @@ local void scan_tree (s, tree, max_code)
     int min_count = 4;         /* min repeat count */
 
     if (nextlen == 0) max_count = 138, min_count = 3;
-    tree[max_code+1].Len = (ush)0xffff; /* guard */
+    tree[max_code + 1].Len = (ush)0xffff; /* guard */
 
     for (n = 0; n <= max_code; n++) {
-        curlen = nextlen; nextlen = tree[n+1].Len;
+        curlen = nextlen;
+        nextlen = tree[n + 1].Len;
         if (++count < max_count && curlen == nextlen) {
             continue;
         } else if (count < min_count) {
@@ -740,7 +743,8 @@ local void scan_tree (s, tree, max_code)
         } else {
             s->bl_tree[REPZ_11_138].Freq++;
         }
-        count = 0; prevlen = curlen;
+        count = 0;
+        prevlen = curlen;
         if (nextlen == 0) {
             max_count = 138, min_count = 3;
         } else if (curlen == nextlen) {
@@ -755,10 +759,10 @@ local void scan_tree (s, tree, max_code)
  * Send a literal or distance tree in compressed form, using the codes in
  * bl_tree.
  */
-local void send_tree (s, tree, max_code)
-    deflate_state *s;
-    ct_data *tree; /* the tree to be scanned */
-    int max_code;       /* and its largest code of non zero frequency */
+local void send_tree(s, tree, max_code)
+deflate_state *s;
+ct_data *tree; /* the tree to be scanned */
+int max_code;       /* and its largest code of non zero frequency */
 {
     int n;                     /* iterates over all tree elements */
     int prevlen = -1;          /* last emitted length */
@@ -772,26 +776,33 @@ local void send_tree (s, tree, max_code)
     if (nextlen == 0) max_count = 138, min_count = 3;
 
     for (n = 0; n <= max_code; n++) {
-        curlen = nextlen; nextlen = tree[n+1].Len;
+        curlen = nextlen;
+        nextlen = tree[n + 1].Len;
         if (++count < max_count && curlen == nextlen) {
             continue;
         } else if (count < min_count) {
-            do { send_code(s, curlen, s->bl_tree); } while (--count != 0);
+            do { send_code(s, curlen, s->bl_tree); }
+            while (--count != 0);
 
         } else if (curlen != 0) {
             if (curlen != prevlen) {
-                send_code(s, curlen, s->bl_tree); count--;
+                send_code(s, curlen, s->bl_tree);
+                count--;
             }
             Assert(count >= 3 && count <= 6, " 3_6?");
-            send_code(s, REP_3_6, s->bl_tree); send_bits(s, count-3, 2);
+            send_code(s, REP_3_6, s->bl_tree);
+            send_bits(s, count - 3, 2);
 
         } else if (count <= 10) {
-            send_code(s, REPZ_3_10, s->bl_tree); send_bits(s, count-3, 3);
+            send_code(s, REPZ_3_10, s->bl_tree);
+            send_bits(s, count - 3, 3);
 
         } else {
-            send_code(s, REPZ_11_138, s->bl_tree); send_bits(s, count-11, 7);
+            send_code(s, REPZ_11_138, s->bl_tree);
+            send_bits(s, count - 11, 7);
         }
-        count = 0; prevlen = curlen;
+        count = 0;
+        prevlen = curlen;
         if (nextlen == 0) {
             max_count = 138, min_count = 3;
         } else if (curlen == nextlen) {
@@ -807,7 +818,7 @@ local void send_tree (s, tree, max_code)
  * bl_order of the last bit length code to send.
  */
 local int build_bl_tree(s)
-    deflate_state *s;
+deflate_state *s;
 {
     int max_blindex;  /* index of last bit length code of non zero freq */
 
@@ -825,11 +836,11 @@ local int build_bl_tree(s)
      * requires that at least 4 bit length codes be sent. (appnote.txt says
      * 3 but the actual value used is 4.)
      */
-    for (max_blindex = BL_CODES-1; max_blindex >= 3; max_blindex--) {
+    for (max_blindex = BL_CODES - 1; max_blindex >= 3; max_blindex--) {
         if (s->bl_tree[bl_order[max_blindex]].Len != 0) break;
     }
     /* Update opt_len to include the bit length tree and counts */
-    s->opt_len += 3*(max_blindex+1) + 5+5+4;
+    s->opt_len += 3 * (max_blindex + 1) + 5 + 5 + 4;
     Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld",
             s->opt_len, s->static_len));
 
@@ -842,28 +853,28 @@ local int build_bl_tree(s)
  * IN assertion: lcodes >= 257, dcodes >= 1, blcodes >= 4.
  */
 local void send_all_trees(s, lcodes, dcodes, blcodes)
-    deflate_state *s;
-    int lcodes, dcodes, blcodes; /* number of codes for each tree */
+deflate_state *s;
+int lcodes, dcodes, blcodes; /* number of codes for each tree */
 {
     int rank;                    /* index in bl_order */
 
-    Assert (lcodes >= 257 && dcodes >= 1 && blcodes >= 4, "not enough codes");
-    Assert (lcodes <= L_CODES && dcodes <= D_CODES && blcodes <= BL_CODES,
-            "too many codes");
+    Assert(lcodes >= 257 && dcodes >= 1 && blcodes >= 4, "not enough codes");
+    Assert(lcodes <= L_CODES && dcodes <= D_CODES && blcodes <= BL_CODES,
+           "too many codes");
     Tracev((stderr, "\nbl counts: "));
-    send_bits(s, lcodes-257, 5); /* not +255 as stated in appnote.txt */
-    send_bits(s, dcodes-1,   5);
-    send_bits(s, blcodes-4,  4); /* not -3 as stated in appnote.txt */
+    send_bits(s, lcodes - 257, 5); /* not +255 as stated in appnote.txt */
+    send_bits(s, dcodes - 1,   5);
+    send_bits(s, blcodes - 4,  4); /* not -3 as stated in appnote.txt */
     for (rank = 0; rank < blcodes; rank++) {
         Tracev((stderr, "\nbl code %2d ", bl_order[rank]));
         send_bits(s, s->bl_tree[bl_order[rank]].Len, 3);
     }
     Tracev((stderr, "\nbl tree: sent %ld", s->bits_sent));
 
-    send_tree(s, (ct_data *)s->dyn_ltree, lcodes-1); /* literal tree */
+    send_tree(s, (ct_data *)s->dyn_ltree, lcodes - 1); /* literal tree */
     Tracev((stderr, "\nlit tree: sent %ld", s->bits_sent));
 
-    send_tree(s, (ct_data *)s->dyn_dtree, dcodes-1); /* distance tree */
+    send_tree(s, (ct_data *)s->dyn_dtree, dcodes - 1); /* distance tree */
     Tracev((stderr, "\ndist tree: sent %ld", s->bits_sent));
 }
 
@@ -871,12 +882,12 @@ local void send_all_trees(s, lcodes, dcodes, blcodes)
  * Send a stored block
  */
 void ZLIB_INTERNAL _tr_stored_block(s, buf, stored_len, last)
-    deflate_state *s;
-    charf *buf;       /* input block */
-    ulg stored_len;   /* length of input block */
-    int last;         /* one if this is the last block for a file */
+deflate_state *s;
+charf *buf;       /* input block */
+ulg stored_len;   /* length of input block */
+int last;         /* one if this is the last block for a file */
 {
-    send_bits(s, (STORED_BLOCK<<1)+last, 3);    /* send block type */
+    send_bits(s, (STORED_BLOCK << 1) + last, 3); /* send block type */
 #ifdef DEBUG
     s->compressed_len = (s->compressed_len + 3 + 7) & (ulg)~7L;
     s->compressed_len += (stored_len + 4) << 3;
@@ -888,7 +899,7 @@ void ZLIB_INTERNAL _tr_stored_block(s, buf, stored_len, last)
  * Flush the bits in the bit buffer to pending output (leaves at most 7 bits)
  */
 void ZLIB_INTERNAL _tr_flush_bits(s)
-    deflate_state *s;
+deflate_state *s;
 {
     bi_flush(s);
 }
@@ -898,9 +909,9 @@ void ZLIB_INTERNAL _tr_flush_bits(s)
  * This takes 10 bits, of which 7 may remain in the bit buffer.
  */
 void ZLIB_INTERNAL _tr_align(s)
-    deflate_state *s;
+deflate_state *s;
 {
-    send_bits(s, STATIC_TREES<<1, 3);
+    send_bits(s, STATIC_TREES << 1, 3);
     send_code(s, END_BLOCK, static_ltree);
 #ifdef DEBUG
     s->compressed_len += 10L; /* 3 for block type, 7 for EOB */
@@ -913,10 +924,10 @@ void ZLIB_INTERNAL _tr_align(s)
  * trees or store, and output the encoded block to the zip file.
  */
 void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
-    deflate_state *s;
-    charf *buf;       /* input block, or NULL if too old */
-    ulg stored_len;   /* length of input block */
-    int last;         /* one if this is the last block for a file */
+deflate_state *s;
+charf *buf;       /* input block, or NULL if too old */
+ulg stored_len;   /* length of input block */
+int last;         /* one if this is the last block for a file */
 {
     int max_blindex = 0;  /* index of last bit length code of non zero freq */
 #ifndef ZLIB_PM3_TUNED
@@ -948,8 +959,8 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
 
 #ifndef ZLIB_PM3_TUNED
         /* Determine the best encoding. Compute the block lengths in bytes. */
-        opt_lenb = (s->opt_len+3+7)>>3;
-        static_lenb = (s->static_len+3+7)>>3;
+        opt_lenb = (s->opt_len + 3 + 7) >> 3;
+        static_lenb = (s->static_len + 3 + 7) >> 3;
 
         Tracev((stderr, "\nopt %" PRIu32 "(%" PRIu32 ") stat %" PRIu32 "(%" PRIu32 ") stored %" PRIu32 " lit %u ",
                 opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len,
@@ -958,15 +969,15 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
         if (static_lenb <= opt_lenb) opt_lenb = static_lenb;
 
     } else {
-        Assert(buf != (char*)0, "lost buf");
+        Assert(buf != (char *)0, "lost buf");
         opt_lenb = static_lenb = stored_len + 5; /* force a stored block */
     }
 
 #ifdef FORCE_STORED
-    if (buf != (char*)0) { /* force stored block */
+    if (buf != (char *)0) { /* force stored block */
 #else
-    if (stored_len+4 <= opt_lenb && buf != (char*)0) {
-                       /* 4: two words for the lengths */
+    if (stored_len + 4 <= opt_lenb && buf != (char *)0) {
+        /* 4: two words for the lengths */
 #endif
         /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE.
          * Otherwise we can't have processed more than WSIZE input bytes since
@@ -981,7 +992,7 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
 #else
     } else if (s->strategy == Z_FIXED || static_lenb == opt_lenb) {
 #endif
-        send_bits(s, (STATIC_TREES<<1)+last, 3);
+        send_bits(s, (STATIC_TREES << 1) + last, 3);
         compress_block(s, (const ct_data *)static_ltree,
                        (const ct_data *)static_dtree);
 #ifdef DEBUG
@@ -989,9 +1000,9 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
 #endif
     } else {
 #endif /* !ZLIB_PM3_TUNED */
-        send_bits(s, (DYN_TREES<<1)+last, 3);
-        send_all_trees(s, s->l_desc.max_code+1, s->d_desc.max_code+1,
-                       max_blindex+1);
+        send_bits(s, (DYN_TREES << 1) + last, 3);
+        send_all_trees(s, s->l_desc.max_code + 1, s->d_desc.max_code + 1,
+                       max_blindex + 1);
         compress_block(s, (const ct_data *)s->dyn_ltree,
                        (const ct_data *)s->dyn_dtree);
 #ifdef DEBUG
@@ -1000,7 +1011,7 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
 #ifndef ZLIB_PM3_TUNED
     }
 #endif
-    Assert (s->compressed_len == s->bits_sent, "bad compressed size");
+    Assert(s->compressed_len == s->bits_sent, "bad compressed size");
     /* The above check is made mod 2^32, for files larger than 512 MB
      * and uLong implemented on 32 bits.
      */
@@ -1012,17 +1023,17 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
         s->compressed_len += 7;  /* align on byte boundary */
 #endif
     }
-    Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len >> 3, s->compressed_len - 7 * last));
+    Tracev((stderr, "\ncomprlen %lu(%lu) ", s->compressed_len >> 3, s->compressed_len - 7 * last));
 }
 
 /* ===========================================================================
  * Save the match info and tally the frequency counts. Return true if
  * the current block must be flushed.
  */
-int ZLIB_INTERNAL _tr_tally (s, dist, lc)
-    deflate_state *s;
-    unsigned dist;  /* distance of matched string */
-    unsigned lc;    /* match length-MIN_MATCH or unmatched char (if dist==0) */
+int ZLIB_INTERNAL _tr_tally(s, dist, lc)
+deflate_state *s;
+unsigned dist;  /* distance of matched string */
+unsigned lc;    /* match length-MIN_MATCH or unmatched char (if dist==0) */
 {
     s->d_buf[s->last_lit] = (ush)dist;
     s->l_buf[s->last_lit++] = (uch)lc;
@@ -1034,10 +1045,10 @@ int ZLIB_INTERNAL _tr_tally (s, dist, lc)
         /* Here, lc is the match length - MIN_MATCH */
         dist--;             /* dist = match distance - 1 */
         Assert((ush)dist < (ush)MAX_DIST(s) &&
-               (ush)lc <= (ush)(MAX_MATCH-MIN_MATCH) &&
+               (ush)lc <= (ush)(MAX_MATCH - MIN_MATCH) &&
                (ush)d_code(dist) < (ush)D_CODES,  "_tr_tally: bad match");
 
-        s->dyn_ltree[_length_code[lc]+LITERALS+1].Freq++;
+        s->dyn_ltree[_length_code[lc] + LITERALS + 1].Freq++;
         s->dyn_dtree[d_code(dist)].Freq++;
     }
 
@@ -1045,21 +1056,21 @@ int ZLIB_INTERNAL _tr_tally (s, dist, lc)
     /* Try to guess if it is profitable to stop the current block here */
     if ((s->last_lit & 0x1fff) == 0 && s->level > 2) {
         /* Compute an upper bound for the compressed length */
-        ulg out_length = (ulg)s->last_lit*8L;
+        ulg out_length = (ulg)s->last_lit * 8L;
         ulg in_length = (ulg)((long)s->strstart - s->block_start);
         int dcode;
         for (dcode = 0; dcode < D_CODES; dcode++) {
             out_length += (ulg)s->dyn_dtree[dcode].Freq *
-                (5L+extra_dbits[dcode]);
+                          (5L + extra_dbits[dcode]);
         }
         out_length >>= 3;
-        Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ",
-               s->last_lit, in_length, out_length,
-               100L - out_length*100L/in_length));
-        if (s->matches < s->last_lit/2 && out_length < in_length/2) return 1;
+        Tracev((stderr, "\nlast_lit %u, in %ld, out ~%ld(%ld%%) ",
+                s->last_lit, in_length, out_length,
+                100L - out_length * 100L / in_length));
+        if (s->matches < s->last_lit / 2 && out_length < in_length / 2) return 1;
     }
 #endif
-    return (s->last_lit == s->lit_bufsize-1);
+    return (s->last_lit == s->lit_bufsize - 1);
     /* We avoid equality with lit_bufsize because of wraparound at 64K
      * on 16 bit machines and because stored blocks are restricted to
      * 64K-1 bytes.
@@ -1070,9 +1081,9 @@ int ZLIB_INTERNAL _tr_tally (s, dist, lc)
  * Send the block data compressed using the given Huffman trees
  */
 local void compress_block(s, ltree, dtree)
-    deflate_state *s;
-    const ct_data *ltree; /* literal tree */
-    const ct_data *dtree; /* distance tree */
+deflate_state *s;
+const ct_data *ltree; /* literal tree */
+const ct_data *dtree; /* distance tree */
 {
     unsigned dist;      /* distance of matched string */
     int lc;             /* match length or unmatched char (if dist == 0) */
@@ -1081,37 +1092,37 @@ local void compress_block(s, ltree, dtree)
     int extra;          /* number of extra bits to send */
 
     if (s->last_lit != 0) do {
-        dist = s->d_buf[lx];
-        lc = s->l_buf[lx++];
-        if (dist == 0) {
-            send_code(s, lc, ltree); /* send a literal byte */
-            Tracecv(isgraph(lc), (stderr," '%c' ", lc));
-        } else {
-            /* Here, lc is the match length - MIN_MATCH */
-            code = _length_code[lc];
-            send_code(s, code+LITERALS+1, ltree); /* send the length code */
-            extra = extra_lbits[code];
-            if (extra != 0) {
-                lc -= base_length[code];
-                send_bits(s, lc, extra);       /* send the extra length bits */
-            }
-            dist--; /* dist is now the match distance - 1 */
-            code = d_code(dist);
-            Assert (code < D_CODES, "bad d_code");
+            dist = s->d_buf[lx];
+            lc = s->l_buf[lx++];
+            if (dist == 0) {
+                send_code(s, lc, ltree); /* send a literal byte */
+                Tracecv(isgraph(lc), (stderr, " '%c' ", lc));
+            } else {
+                /* Here, lc is the match length - MIN_MATCH */
+                code = _length_code[lc];
+                send_code(s, code + LITERALS + 1, ltree); /* send the length code */
+                extra = extra_lbits[code];
+                if (extra != 0) {
+                    lc -= base_length[code];
+                    send_bits(s, lc, extra);       /* send the extra length bits */
+                }
+                dist--; /* dist is now the match distance - 1 */
+                code = d_code(dist);
+                Assert(code < D_CODES, "bad d_code");
 
-            send_code(s, code, dtree);       /* send the distance code */
-            extra = extra_dbits[code];
-            if (extra != 0) {
-                dist -= base_dist[code];
-                send_bits(s, dist, extra);   /* send the extra distance bits */
-            }
-        } /* literal or match pair ? */
+                send_code(s, code, dtree);       /* send the distance code */
+                extra = extra_dbits[code];
+                if (extra != 0) {
+                    dist -= base_dist[code];
+                    send_bits(s, dist, extra);   /* send the extra distance bits */
+                }
+            } /* literal or match pair ? */
 
-        /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */
-        Assert((uInt)(s->pending) < s->lit_bufsize + 2*lx,
-               "pendingBuf overflow");
+            /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */
+            Assert((uInt)(s->pending) < s->lit_bufsize + 2 * lx,
+                   "pendingBuf overflow");
 
-    } while (lx < s->last_lit);
+        } while (lx < s->last_lit);
 
     send_code(s, END_BLOCK, ltree);
 }
@@ -1130,7 +1141,7 @@ local void compress_block(s, ltree, dtree)
  * IN assertion: the fields Freq of dyn_ltree are set.
  */
 local int detect_data_type(s)
-    deflate_state *s;
+deflate_state *s;
 {
     /* black_mask is the bit mask of black-listed bytes
      * set bits 0..6, 14..25, and 28..31
@@ -1146,7 +1157,7 @@ local int detect_data_type(s)
 
     /* Check for textual ("white-listed") bytes. */
     if (s->dyn_ltree[9].Freq != 0 || s->dyn_ltree[10].Freq != 0
-            || s->dyn_ltree[13].Freq != 0)
+        || s->dyn_ltree[13].Freq != 0)
         return Z_TEXT;
     for (n = 32; n < LITERALS; n++)
         if (s->dyn_ltree[n].Freq != 0)
@@ -1164,8 +1175,8 @@ local int detect_data_type(s)
  * IN assertion: 1 <= len <= 15
  */
 local unsigned bi_reverse(code, len)
-    unsigned code; /* the value to invert */
-    int len;       /* its bit length */
+unsigned code; /* the value to invert */
+int len;       /* its bit length */
 {
     register unsigned res = 0;
     do {
@@ -1179,7 +1190,7 @@ local unsigned bi_reverse(code, len)
  * Flush the bit buffer, keeping at most 7 bits in it.
  */
 local void bi_flush(s)
-    deflate_state *s;
+deflate_state *s;
 {
     if (s->bi_valid == 16) {
         put_short(s, s->bi_buf);
@@ -1196,7 +1207,7 @@ local void bi_flush(s)
  * Flush the bit buffer and align the output on a byte boundary
  */
 local void bi_windup(s)
-    deflate_state *s;
+deflate_state *s;
 {
     if (s->bi_valid > 8) {
         put_short(s, s->bi_buf);
@@ -1206,7 +1217,7 @@ local void bi_windup(s)
     s->bi_buf = 0;
     s->bi_valid = 0;
 #ifdef DEBUG
-    s->bits_sent = (s->bits_sent+7) & ~7;
+    s->bits_sent = (s->bits_sent + 7) & ~7;
 #endif
 }
 
@@ -1215,10 +1226,10 @@ local void bi_windup(s)
  * one's complement if requested.
  */
 local void copy_block(s, buf, len, header)
-    deflate_state *s;
-    charf    *buf;    /* the input data */
-    unsigned len;     /* its length */
-    int      header;  /* true if block header must be written */
+deflate_state *s;
+charf    *buf;    /* the input data */
+unsigned len;     /* its length */
+int      header;  /* true if block header must be written */
 {
     bi_windup(s);        /* align on byte boundary */
 
@@ -1226,11 +1237,11 @@ local void copy_block(s, buf, len, header)
         put_short(s, (ush)len);
         put_short(s, (ush)~len);
 #ifdef DEBUG
-        s->bits_sent += 2*16;
+        s->bits_sent += 2 * 16;
 #endif
     }
 #ifdef DEBUG
-    s->bits_sent += (ulg)len<<3;
+    s->bits_sent += (ulg)len << 3;
 #endif
     while (len--) {
         put_byte(s, *buf++);
diff --git a/zlib/trees.h b/zlib/trees.h
index d35639d82..a02c374a7 100644
--- a/zlib/trees.h
+++ b/zlib/trees.h
@@ -1,128 +1,128 @@
 /* header created automatically with -DGEN_TREES_H */
 
-local const ct_data static_ltree[L_CODES+2] = {
-{{ 12},{  8}}, {{140},{  8}}, {{ 76},{  8}}, {{204},{  8}}, {{ 44},{  8}},
-{{172},{  8}}, {{108},{  8}}, {{236},{  8}}, {{ 28},{  8}}, {{156},{  8}},
-{{ 92},{  8}}, {{220},{  8}}, {{ 60},{  8}}, {{188},{  8}}, {{124},{  8}},
-{{252},{  8}}, {{  2},{  8}}, {{130},{  8}}, {{ 66},{  8}}, {{194},{  8}},
-{{ 34},{  8}}, {{162},{  8}}, {{ 98},{  8}}, {{226},{  8}}, {{ 18},{  8}},
-{{146},{  8}}, {{ 82},{  8}}, {{210},{  8}}, {{ 50},{  8}}, {{178},{  8}},
-{{114},{  8}}, {{242},{  8}}, {{ 10},{  8}}, {{138},{  8}}, {{ 74},{  8}},
-{{202},{  8}}, {{ 42},{  8}}, {{170},{  8}}, {{106},{  8}}, {{234},{  8}},
-{{ 26},{  8}}, {{154},{  8}}, {{ 90},{  8}}, {{218},{  8}}, {{ 58},{  8}},
-{{186},{  8}}, {{122},{  8}}, {{250},{  8}}, {{  6},{  8}}, {{134},{  8}},
-{{ 70},{  8}}, {{198},{  8}}, {{ 38},{  8}}, {{166},{  8}}, {{102},{  8}},
-{{230},{  8}}, {{ 22},{  8}}, {{150},{  8}}, {{ 86},{  8}}, {{214},{  8}},
-{{ 54},{  8}}, {{182},{  8}}, {{118},{  8}}, {{246},{  8}}, {{ 14},{  8}},
-{{142},{  8}}, {{ 78},{  8}}, {{206},{  8}}, {{ 46},{  8}}, {{174},{  8}},
-{{110},{  8}}, {{238},{  8}}, {{ 30},{  8}}, {{158},{  8}}, {{ 94},{  8}},
-{{222},{  8}}, {{ 62},{  8}}, {{190},{  8}}, {{126},{  8}}, {{254},{  8}},
-{{  1},{  8}}, {{129},{  8}}, {{ 65},{  8}}, {{193},{  8}}, {{ 33},{  8}},
-{{161},{  8}}, {{ 97},{  8}}, {{225},{  8}}, {{ 17},{  8}}, {{145},{  8}},
-{{ 81},{  8}}, {{209},{  8}}, {{ 49},{  8}}, {{177},{  8}}, {{113},{  8}},
-{{241},{  8}}, {{  9},{  8}}, {{137},{  8}}, {{ 73},{  8}}, {{201},{  8}},
-{{ 41},{  8}}, {{169},{  8}}, {{105},{  8}}, {{233},{  8}}, {{ 25},{  8}},
-{{153},{  8}}, {{ 89},{  8}}, {{217},{  8}}, {{ 57},{  8}}, {{185},{  8}},
-{{121},{  8}}, {{249},{  8}}, {{  5},{  8}}, {{133},{  8}}, {{ 69},{  8}},
-{{197},{  8}}, {{ 37},{  8}}, {{165},{  8}}, {{101},{  8}}, {{229},{  8}},
-{{ 21},{  8}}, {{149},{  8}}, {{ 85},{  8}}, {{213},{  8}}, {{ 53},{  8}},
-{{181},{  8}}, {{117},{  8}}, {{245},{  8}}, {{ 13},{  8}}, {{141},{  8}},
-{{ 77},{  8}}, {{205},{  8}}, {{ 45},{  8}}, {{173},{  8}}, {{109},{  8}},
-{{237},{  8}}, {{ 29},{  8}}, {{157},{  8}}, {{ 93},{  8}}, {{221},{  8}},
-{{ 61},{  8}}, {{189},{  8}}, {{125},{  8}}, {{253},{  8}}, {{ 19},{  9}},
-{{275},{  9}}, {{147},{  9}}, {{403},{  9}}, {{ 83},{  9}}, {{339},{  9}},
-{{211},{  9}}, {{467},{  9}}, {{ 51},{  9}}, {{307},{  9}}, {{179},{  9}},
-{{435},{  9}}, {{115},{  9}}, {{371},{  9}}, {{243},{  9}}, {{499},{  9}},
-{{ 11},{  9}}, {{267},{  9}}, {{139},{  9}}, {{395},{  9}}, {{ 75},{  9}},
-{{331},{  9}}, {{203},{  9}}, {{459},{  9}}, {{ 43},{  9}}, {{299},{  9}},
-{{171},{  9}}, {{427},{  9}}, {{107},{  9}}, {{363},{  9}}, {{235},{  9}},
-{{491},{  9}}, {{ 27},{  9}}, {{283},{  9}}, {{155},{  9}}, {{411},{  9}},
-{{ 91},{  9}}, {{347},{  9}}, {{219},{  9}}, {{475},{  9}}, {{ 59},{  9}},
-{{315},{  9}}, {{187},{  9}}, {{443},{  9}}, {{123},{  9}}, {{379},{  9}},
-{{251},{  9}}, {{507},{  9}}, {{  7},{  9}}, {{263},{  9}}, {{135},{  9}},
-{{391},{  9}}, {{ 71},{  9}}, {{327},{  9}}, {{199},{  9}}, {{455},{  9}},
-{{ 39},{  9}}, {{295},{  9}}, {{167},{  9}}, {{423},{  9}}, {{103},{  9}},
-{{359},{  9}}, {{231},{  9}}, {{487},{  9}}, {{ 23},{  9}}, {{279},{  9}},
-{{151},{  9}}, {{407},{  9}}, {{ 87},{  9}}, {{343},{  9}}, {{215},{  9}},
-{{471},{  9}}, {{ 55},{  9}}, {{311},{  9}}, {{183},{  9}}, {{439},{  9}},
-{{119},{  9}}, {{375},{  9}}, {{247},{  9}}, {{503},{  9}}, {{ 15},{  9}},
-{{271},{  9}}, {{143},{  9}}, {{399},{  9}}, {{ 79},{  9}}, {{335},{  9}},
-{{207},{  9}}, {{463},{  9}}, {{ 47},{  9}}, {{303},{  9}}, {{175},{  9}},
-{{431},{  9}}, {{111},{  9}}, {{367},{  9}}, {{239},{  9}}, {{495},{  9}},
-{{ 31},{  9}}, {{287},{  9}}, {{159},{  9}}, {{415},{  9}}, {{ 95},{  9}},
-{{351},{  9}}, {{223},{  9}}, {{479},{  9}}, {{ 63},{  9}}, {{319},{  9}},
-{{191},{  9}}, {{447},{  9}}, {{127},{  9}}, {{383},{  9}}, {{255},{  9}},
-{{511},{  9}}, {{  0},{  7}}, {{ 64},{  7}}, {{ 32},{  7}}, {{ 96},{  7}},
-{{ 16},{  7}}, {{ 80},{  7}}, {{ 48},{  7}}, {{112},{  7}}, {{  8},{  7}},
-{{ 72},{  7}}, {{ 40},{  7}}, {{104},{  7}}, {{ 24},{  7}}, {{ 88},{  7}},
-{{ 56},{  7}}, {{120},{  7}}, {{  4},{  7}}, {{ 68},{  7}}, {{ 36},{  7}},
-{{100},{  7}}, {{ 20},{  7}}, {{ 84},{  7}}, {{ 52},{  7}}, {{116},{  7}},
-{{  3},{  8}}, {{131},{  8}}, {{ 67},{  8}}, {{195},{  8}}, {{ 35},{  8}},
-{{163},{  8}}, {{ 99},{  8}}, {{227},{  8}}
+local const ct_data static_ltree[L_CODES + 2] = {
+    {{ 12}, {  8}}, {{140}, {  8}}, {{ 76}, {  8}}, {{204}, {  8}}, {{ 44}, {  8}},
+    {{172}, {  8}}, {{108}, {  8}}, {{236}, {  8}}, {{ 28}, {  8}}, {{156}, {  8}},
+    {{ 92}, {  8}}, {{220}, {  8}}, {{ 60}, {  8}}, {{188}, {  8}}, {{124}, {  8}},
+    {{252}, {  8}}, {{  2}, {  8}}, {{130}, {  8}}, {{ 66}, {  8}}, {{194}, {  8}},
+    {{ 34}, {  8}}, {{162}, {  8}}, {{ 98}, {  8}}, {{226}, {  8}}, {{ 18}, {  8}},
+    {{146}, {  8}}, {{ 82}, {  8}}, {{210}, {  8}}, {{ 50}, {  8}}, {{178}, {  8}},
+    {{114}, {  8}}, {{242}, {  8}}, {{ 10}, {  8}}, {{138}, {  8}}, {{ 74}, {  8}},
+    {{202}, {  8}}, {{ 42}, {  8}}, {{170}, {  8}}, {{106}, {  8}}, {{234}, {  8}},
+    {{ 26}, {  8}}, {{154}, {  8}}, {{ 90}, {  8}}, {{218}, {  8}}, {{ 58}, {  8}},
+    {{186}, {  8}}, {{122}, {  8}}, {{250}, {  8}}, {{  6}, {  8}}, {{134}, {  8}},
+    {{ 70}, {  8}}, {{198}, {  8}}, {{ 38}, {  8}}, {{166}, {  8}}, {{102}, {  8}},
+    {{230}, {  8}}, {{ 22}, {  8}}, {{150}, {  8}}, {{ 86}, {  8}}, {{214}, {  8}},
+    {{ 54}, {  8}}, {{182}, {  8}}, {{118}, {  8}}, {{246}, {  8}}, {{ 14}, {  8}},
+    {{142}, {  8}}, {{ 78}, {  8}}, {{206}, {  8}}, {{ 46}, {  8}}, {{174}, {  8}},
+    {{110}, {  8}}, {{238}, {  8}}, {{ 30}, {  8}}, {{158}, {  8}}, {{ 94}, {  8}},
+    {{222}, {  8}}, {{ 62}, {  8}}, {{190}, {  8}}, {{126}, {  8}}, {{254}, {  8}},
+    {{  1}, {  8}}, {{129}, {  8}}, {{ 65}, {  8}}, {{193}, {  8}}, {{ 33}, {  8}},
+    {{161}, {  8}}, {{ 97}, {  8}}, {{225}, {  8}}, {{ 17}, {  8}}, {{145}, {  8}},
+    {{ 81}, {  8}}, {{209}, {  8}}, {{ 49}, {  8}}, {{177}, {  8}}, {{113}, {  8}},
+    {{241}, {  8}}, {{  9}, {  8}}, {{137}, {  8}}, {{ 73}, {  8}}, {{201}, {  8}},
+    {{ 41}, {  8}}, {{169}, {  8}}, {{105}, {  8}}, {{233}, {  8}}, {{ 25}, {  8}},
+    {{153}, {  8}}, {{ 89}, {  8}}, {{217}, {  8}}, {{ 57}, {  8}}, {{185}, {  8}},
+    {{121}, {  8}}, {{249}, {  8}}, {{  5}, {  8}}, {{133}, {  8}}, {{ 69}, {  8}},
+    {{197}, {  8}}, {{ 37}, {  8}}, {{165}, {  8}}, {{101}, {  8}}, {{229}, {  8}},
+    {{ 21}, {  8}}, {{149}, {  8}}, {{ 85}, {  8}}, {{213}, {  8}}, {{ 53}, {  8}},
+    {{181}, {  8}}, {{117}, {  8}}, {{245}, {  8}}, {{ 13}, {  8}}, {{141}, {  8}},
+    {{ 77}, {  8}}, {{205}, {  8}}, {{ 45}, {  8}}, {{173}, {  8}}, {{109}, {  8}},
+    {{237}, {  8}}, {{ 29}, {  8}}, {{157}, {  8}}, {{ 93}, {  8}}, {{221}, {  8}},
+    {{ 61}, {  8}}, {{189}, {  8}}, {{125}, {  8}}, {{253}, {  8}}, {{ 19}, {  9}},
+    {{275}, {  9}}, {{147}, {  9}}, {{403}, {  9}}, {{ 83}, {  9}}, {{339}, {  9}},
+    {{211}, {  9}}, {{467}, {  9}}, {{ 51}, {  9}}, {{307}, {  9}}, {{179}, {  9}},
+    {{435}, {  9}}, {{115}, {  9}}, {{371}, {  9}}, {{243}, {  9}}, {{499}, {  9}},
+    {{ 11}, {  9}}, {{267}, {  9}}, {{139}, {  9}}, {{395}, {  9}}, {{ 75}, {  9}},
+    {{331}, {  9}}, {{203}, {  9}}, {{459}, {  9}}, {{ 43}, {  9}}, {{299}, {  9}},
+    {{171}, {  9}}, {{427}, {  9}}, {{107}, {  9}}, {{363}, {  9}}, {{235}, {  9}},
+    {{491}, {  9}}, {{ 27}, {  9}}, {{283}, {  9}}, {{155}, {  9}}, {{411}, {  9}},
+    {{ 91}, {  9}}, {{347}, {  9}}, {{219}, {  9}}, {{475}, {  9}}, {{ 59}, {  9}},
+    {{315}, {  9}}, {{187}, {  9}}, {{443}, {  9}}, {{123}, {  9}}, {{379}, {  9}},
+    {{251}, {  9}}, {{507}, {  9}}, {{  7}, {  9}}, {{263}, {  9}}, {{135}, {  9}},
+    {{391}, {  9}}, {{ 71}, {  9}}, {{327}, {  9}}, {{199}, {  9}}, {{455}, {  9}},
+    {{ 39}, {  9}}, {{295}, {  9}}, {{167}, {  9}}, {{423}, {  9}}, {{103}, {  9}},
+    {{359}, {  9}}, {{231}, {  9}}, {{487}, {  9}}, {{ 23}, {  9}}, {{279}, {  9}},
+    {{151}, {  9}}, {{407}, {  9}}, {{ 87}, {  9}}, {{343}, {  9}}, {{215}, {  9}},
+    {{471}, {  9}}, {{ 55}, {  9}}, {{311}, {  9}}, {{183}, {  9}}, {{439}, {  9}},
+    {{119}, {  9}}, {{375}, {  9}}, {{247}, {  9}}, {{503}, {  9}}, {{ 15}, {  9}},
+    {{271}, {  9}}, {{143}, {  9}}, {{399}, {  9}}, {{ 79}, {  9}}, {{335}, {  9}},
+    {{207}, {  9}}, {{463}, {  9}}, {{ 47}, {  9}}, {{303}, {  9}}, {{175}, {  9}},
+    {{431}, {  9}}, {{111}, {  9}}, {{367}, {  9}}, {{239}, {  9}}, {{495}, {  9}},
+    {{ 31}, {  9}}, {{287}, {  9}}, {{159}, {  9}}, {{415}, {  9}}, {{ 95}, {  9}},
+    {{351}, {  9}}, {{223}, {  9}}, {{479}, {  9}}, {{ 63}, {  9}}, {{319}, {  9}},
+    {{191}, {  9}}, {{447}, {  9}}, {{127}, {  9}}, {{383}, {  9}}, {{255}, {  9}},
+    {{511}, {  9}}, {{  0}, {  7}}, {{ 64}, {  7}}, {{ 32}, {  7}}, {{ 96}, {  7}},
+    {{ 16}, {  7}}, {{ 80}, {  7}}, {{ 48}, {  7}}, {{112}, {  7}}, {{  8}, {  7}},
+    {{ 72}, {  7}}, {{ 40}, {  7}}, {{104}, {  7}}, {{ 24}, {  7}}, {{ 88}, {  7}},
+    {{ 56}, {  7}}, {{120}, {  7}}, {{  4}, {  7}}, {{ 68}, {  7}}, {{ 36}, {  7}},
+    {{100}, {  7}}, {{ 20}, {  7}}, {{ 84}, {  7}}, {{ 52}, {  7}}, {{116}, {  7}},
+    {{  3}, {  8}}, {{131}, {  8}}, {{ 67}, {  8}}, {{195}, {  8}}, {{ 35}, {  8}},
+    {{163}, {  8}}, {{ 99}, {  8}}, {{227}, {  8}}
 };
 
 local const ct_data static_dtree[D_CODES] = {
-{{ 0},{ 5}}, {{16},{ 5}}, {{ 8},{ 5}}, {{24},{ 5}}, {{ 4},{ 5}},
-{{20},{ 5}}, {{12},{ 5}}, {{28},{ 5}}, {{ 2},{ 5}}, {{18},{ 5}},
-{{10},{ 5}}, {{26},{ 5}}, {{ 6},{ 5}}, {{22},{ 5}}, {{14},{ 5}},
-{{30},{ 5}}, {{ 1},{ 5}}, {{17},{ 5}}, {{ 9},{ 5}}, {{25},{ 5}},
-{{ 5},{ 5}}, {{21},{ 5}}, {{13},{ 5}}, {{29},{ 5}}, {{ 3},{ 5}},
-{{19},{ 5}}, {{11},{ 5}}, {{27},{ 5}}, {{ 7},{ 5}}, {{23},{ 5}}
+    {{ 0}, { 5}}, {{16}, { 5}}, {{ 8}, { 5}}, {{24}, { 5}}, {{ 4}, { 5}},
+    {{20}, { 5}}, {{12}, { 5}}, {{28}, { 5}}, {{ 2}, { 5}}, {{18}, { 5}},
+    {{10}, { 5}}, {{26}, { 5}}, {{ 6}, { 5}}, {{22}, { 5}}, {{14}, { 5}},
+    {{30}, { 5}}, {{ 1}, { 5}}, {{17}, { 5}}, {{ 9}, { 5}}, {{25}, { 5}},
+    {{ 5}, { 5}}, {{21}, { 5}}, {{13}, { 5}}, {{29}, { 5}}, {{ 3}, { 5}},
+    {{19}, { 5}}, {{11}, { 5}}, {{27}, { 5}}, {{ 7}, { 5}}, {{23}, { 5}}
 };
 
 const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = {
- 0,  1,  2,  3,  4,  4,  5,  5,  6,  6,  6,  6,  7,  7,  7,  7,  8,  8,  8,  8,
- 8,  8,  8,  8,  9,  9,  9,  9,  9,  9,  9,  9, 10, 10, 10, 10, 10, 10, 10, 10,
-10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13, 13, 13, 13,
-13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-13, 13, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15,
-15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,  0,  0, 16, 17,
-18, 18, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22,
-23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27,
-27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
-27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
-28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
-28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
-28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29
+    0,  1,  2,  3,  4,  4,  5,  5,  6,  6,  6,  6,  7,  7,  7,  7,  8,  8,  8,  8,
+    8,  8,  8,  8,  9,  9,  9,  9,  9,  9,  9,  9, 10, 10, 10, 10, 10, 10, 10, 10,
+    10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
+    11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
+    12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13, 13, 13, 13,
+    13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+    13, 13, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15,
+    15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+    15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+    15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,  0,  0, 16, 17,
+    18, 18, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22,
+    23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+    24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
+    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27,
+    27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
+    27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+    28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+    28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+    28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+    29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+    29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+    29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29
 };
 
-const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= {
- 0,  1,  2,  3,  4,  5,  6,  7,  8,  8,  9,  9, 10, 10, 11, 11, 12, 12, 12, 12,
-13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16,
-17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19,
-19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 22,
-22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23,
-23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26,
-26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
-27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28
+const uch ZLIB_INTERNAL _length_code[MAX_MATCH - MIN_MATCH + 1] = {
+    0,  1,  2,  3,  4,  5,  6,  7,  8,  8,  9,  9, 10, 10, 11, 11, 12, 12, 12, 12,
+    13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16,
+    17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19,
+    19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+    21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 22,
+    22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23,
+    23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+    24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+    25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
+    25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26,
+    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+    26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
+    27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28
 };
 
 local const int base_length[LENGTH_CODES] = {
-0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28, 32, 40, 48, 56,
-64, 80, 96, 112, 128, 160, 192, 224, 0
+    0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28, 32, 40, 48, 56,
+    64, 80, 96, 112, 128, 160, 192, 224, 0
 };
 
 local const int base_dist[D_CODES] = {
     0,     1,     2,     3,     4,     6,     8,    12,    16,    24,
-   32,    48,    64,    96,   128,   192,   256,   384,   512,   768,
- 1024,  1536,  2048,  3072,  4096,  6144,  8192, 12288, 16384, 24576
+    32,    48,    64,    96,   128,   192,   256,   384,   512,   768,
+    1024,  1536,  2048,  3072,  4096,  6144,  8192, 12288, 16384, 24576
 };
 
diff --git a/zlib/zconf.h b/zlib/zconf.h
index 9987a7755..d9bf35455 100644
--- a/zlib/zconf.h
+++ b/zlib/zconf.h
@@ -260,7 +260,7 @@
  for small objects.
 */
 
-                        /* Type declarations */
+/* Type declarations */
 
 #ifndef OF /* function prototypes */
 #  ifdef STDC
@@ -286,7 +286,7 @@
  */
 #ifdef SYS16BIT
 #  if defined(M_I86SM) || defined(M_I86MM)
-     /* MSC small or medium model */
+/* MSC small or medium model */
 #    define SMALL_MEDIUM
 #    ifdef _MSC_VER
 #      define FAR _far
@@ -295,7 +295,7 @@
 #    endif
 #  endif
 #  if (defined(__SMALL__) || defined(__MEDIUM__))
-     /* Turbo C small or medium model */
+/* Turbo C small or medium model */
 #    define SMALL_MEDIUM
 #    ifdef __BORLANDC__
 #      define FAR _far
@@ -306,9 +306,9 @@
 #endif
 
 #if defined(WINDOWS) || defined(WIN32)
-   /* If building or using zlib as a DLL, define ZLIB_DLL.
-    * This is not mandatory, but it offers a little performance increase.
-    */
+/* If building or using zlib as a DLL, define ZLIB_DLL.
+ * This is not mandatory, but it offers a little performance increase.
+ */
 #  ifdef ZLIB_DLL
 #    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
 #      ifdef ZLIB_INTERNAL
@@ -318,17 +318,17 @@
 #      endif
 #    endif
 #  endif  /* ZLIB_DLL */
-   /* If building or using zlib with the WINAPI/WINAPIV calling convention,
-    * define ZLIB_WINAPI.
-    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
-    */
+/* If building or using zlib with the WINAPI/WINAPIV calling convention,
+ * define ZLIB_WINAPI.
+ * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
+ */
 #  ifdef ZLIB_WINAPI
 #    ifdef FAR
 #      undef FAR
 #    endif
 #    include <windows.h>
-     /* No need for _export, use ZLIB.DEF instead. */
-     /* For complete Windows compatibility, use WINAPI, not __stdcall. */
+/* No need for _export, use ZLIB.DEF instead. */
+/* For complete Windows compatibility, use WINAPI, not __stdcall. */
 #    define ZEXPORT WINAPI
 #    ifdef WIN32
 #      define ZEXPORTVA WINAPIV
@@ -371,10 +371,10 @@ typedef unsigned int   uInt;  /* 16 bits or more */
 typedef unsigned long  uLong; /* 32 bits or more */
 
 #ifdef SMALL_MEDIUM
-   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
+/* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
 #  define Bytef Byte FAR
 #else
-   typedef Byte  FAR Bytef;
+typedef Byte  FAR Bytef;
 #endif
 typedef char  FAR charf;
 typedef int   FAR intf;
@@ -382,13 +382,13 @@ typedef uInt  FAR uIntf;
 typedef uLong FAR uLongf;
 
 #ifdef STDC
-   typedef void const *voidpc;
-   typedef void FAR   *voidpf;
-   typedef void       *voidp;
+typedef void const *voidpc;
+typedef void FAR   *voidpf;
+typedef void       *voidp;
 #else
-   typedef Byte const *voidpc;
-   typedef Byte FAR   *voidpf;
-   typedef Byte       *voidp;
+typedef Byte const *voidpc;
+typedef Byte FAR   *voidpf;
+typedef Byte       *voidp;
 #endif
 
 #if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
@@ -403,9 +403,9 @@ typedef uLong FAR uLongf;
 #endif
 
 #ifdef Z_U4
-   typedef Z_U4 z_crc_t;
+typedef Z_U4 z_crc_t;
 #else
-   typedef unsigned long z_crc_t;
+typedef unsigned long z_crc_t;
 #endif
 
 #ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */
@@ -493,19 +493,19 @@ typedef uLong FAR uLongf;
 
 /* MVS linker does not support external names larger than 8 bytes */
 #if defined(__MVS__)
-  #pragma map(deflateInit_,"DEIN")
-  #pragma map(deflateInit2_,"DEIN2")
-  #pragma map(deflateEnd,"DEEND")
-  #pragma map(deflateBound,"DEBND")
-  #pragma map(inflateInit_,"ININ")
-  #pragma map(inflateInit2_,"ININ2")
-  #pragma map(inflateEnd,"INEND")
-  #pragma map(inflateSync,"INSY")
-  #pragma map(inflateSetDictionary,"INSEDI")
-  #pragma map(compressBound,"CMBND")
-  #pragma map(inflate_table,"INTABL")
-  #pragma map(inflate_fast,"INFA")
-  #pragma map(inflate_copyright,"INCOPY")
+#pragma map(deflateInit_,"DEIN")
+#pragma map(deflateInit2_,"DEIN2")
+#pragma map(deflateEnd,"DEEND")
+#pragma map(deflateBound,"DEBND")
+#pragma map(inflateInit_,"ININ")
+#pragma map(inflateInit2_,"ININ2")
+#pragma map(inflateEnd,"INEND")
+#pragma map(inflateSync,"INSY")
+#pragma map(inflateSetDictionary,"INSEDI")
+#pragma map(compressBound,"CMBND")
+#pragma map(inflate_table,"INTABL")
+#pragma map(inflate_fast,"INFA")
+#pragma map(inflate_copyright,"INCOPY")
 #endif
 
 #endif /* ZCONF_H */
diff --git a/zlib/zlib.h b/zlib/zlib.h
index d62758aaf..9a8bcce1d 100644
--- a/zlib/zlib.h
+++ b/zlib/zlib.h
@@ -95,8 +95,8 @@ extern "C" {
   even in case of corrupted input.
 */
 
-typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
-typedef void   (*free_func)  OF((voidpf opaque, voidpf address));
+typedef voidpf(*alloc_func) OF((voidpf opaque, uInt items, uInt size));
+typedef void (*free_func)  OF((voidpf opaque, voidpf address));
 
 struct internal_state;
 
@@ -177,7 +177,7 @@ typedef gz_header FAR *gz_headerp;
    if the decompressor wants to decompress everything in a single step).
 */
 
-                        /* constants */
+/* constants */
 
 #define Z_NO_FLUSH      0
 #define Z_PARTIAL_FLUSH 1
@@ -229,9 +229,9 @@ typedef gz_header FAR *gz_headerp;
 /* for compatibility with versions < 1.0.2 */
 
 
-                        /* basic functions */
+/* basic functions */
 
-ZEXTERN const char * ZEXPORT zlibVersion OF((void));
+ZEXTERN const char *ZEXPORT zlibVersion OF((void));
 /* The application can compare zlibVersion and ZLIB_VERSION for consistency.
    If the first character differs, the library code actually used is not
    compatible with the zlib.h header file used by the application.  This check
@@ -535,7 +535,7 @@ ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
 */
 
 
-                        /* Advanced functions */
+/* Advanced functions */
 
 /*
     The following functions are needed only in some special applications.
@@ -1040,8 +1040,8 @@ ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
    the version of the header file.
 */
 
-typedef unsigned (*in_func) OF((void FAR *,
-                                z_const unsigned char FAR * FAR *));
+typedef unsigned(*in_func) OF((void FAR *,
+                               z_const unsigned char FAR *FAR *));
 typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned));
 
 ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
@@ -1165,7 +1165,7 @@ ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
 
 #ifndef Z_SOLO
 
-                        /* utility functions */
+/* utility functions */
 
 /*
      The following utility functions are implemented on top of the basic
@@ -1230,7 +1230,7 @@ ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
    buffer with the uncompressed data up to that point.
 */
 
-                        /* gzip file access functions */
+/* gzip file access functions */
 
 /*
      This library supports reading and writing files in gzip (.gz) format with
@@ -1387,7 +1387,7 @@ ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
      gzputs returns the number of characters written, or -1 in case of error.
 */
 
-ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));
+ZEXTERN char *ZEXPORT gzgets OF((gzFile file, char *buf, int len));
 /*
      Reads bytes from the compressed file until len-1 characters are read, or a
    newline character is read and transferred to buf, or an end-of-file
@@ -1551,7 +1551,7 @@ ZEXTERN int ZEXPORT gzclose_w OF((gzFile file));
    zlib library.
 */
 
-ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
+ZEXTERN const char *ZEXPORT gzerror OF((gzFile file, int *errnum));
 /*
      Returns the error message for the last error which occurred on the given
    compressed file.  errnum is set to zlib error number.  If an error occurred
@@ -1576,7 +1576,7 @@ ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));
 
 #endif /* !Z_SOLO */
 
-                        /* checksum functions */
+/* checksum functions */
 
 /*
      These functions are not related to compression but are exported
@@ -1643,7 +1643,7 @@ ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
 */
 
 
-                        /* various hacks, don't look :) */
+/* various hacks, don't look :) */
 
 /* deflateInit and inflateInit are macros to allow checking the zlib version
  * and the compiler's view of z_stream:
@@ -1663,18 +1663,18 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
                                          const char *version,
                                          int stream_size));
 #define deflateInit(strm, level) \
-        deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
+    deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
 #define inflateInit(strm) \
-        inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
+    inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
 #define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
-        deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
-                      (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
+    deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
+                  (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
 #define inflateInit2(strm, windowBits) \
-        inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
-                      (int)sizeof(z_stream))
+    inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
+                  (int)sizeof(z_stream))
 #define inflateBackInit(strm, windowBits, window) \
-        inflateBackInit_((strm), (windowBits), (window), \
-                      ZLIB_VERSION, (int)sizeof(z_stream))
+    inflateBackInit_((strm), (windowBits), (window), \
+                     ZLIB_VERSION, (int)sizeof(z_stream))
 
 #ifndef Z_SOLO
 
@@ -1694,10 +1694,10 @@ ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */
 #ifdef Z_PREFIX_SET
 #  undef z_gzgetc
 #  define z_gzgetc(g) \
-          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
+    ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
 #else
 #  define gzgetc(g) \
-          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
+    ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
 #endif
 
 /* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or
@@ -1707,12 +1707,12 @@ ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */
  * without large file support, _LFS64_LARGEFILE must also be true
  */
 #ifdef Z_LARGE64
-   ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
-   ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));
-   ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));
-   ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));
-   ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off64_t));
-   ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t));
+ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
+ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));
+ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));
+ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));
+ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off64_t));
+ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t));
 #endif
 
 #if !defined(ZLIB_INTERNAL) && defined(Z_WANT64)
@@ -1732,38 +1732,38 @@ ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */
 #    define crc32_combine crc32_combine64
 #  endif
 #  ifndef Z_LARGE64
-     ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
-     ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
-     ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
-     ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile));
-     ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
-     ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
+ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
+ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
+ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
+ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile));
+ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
+ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
 #  endif
 #else
-   ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *));
-   ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int));
-   ZEXTERN z_off_t ZEXPORT gztell OF((gzFile));
-   ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile));
-   ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
-   ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
+ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *));
+ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int));
+ZEXTERN z_off_t ZEXPORT gztell OF((gzFile));
+ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile));
+ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
+ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
 #endif
 
 #else /* Z_SOLO */
 
-   ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
-   ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
+ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
+ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
 
 #endif /* !Z_SOLO */
 
 /* hack for buggy compilers */
 #if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL)
-    struct internal_state {int dummy;};
+struct internal_state {int dummy;};
 #endif
 
 /* undocumented functions */
-ZEXTERN const char   * ZEXPORT zError           OF((int));
+ZEXTERN const char    *ZEXPORT zError           OF((int));
 ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp));
-ZEXTERN const z_crc_t FAR * ZEXPORT get_crc_table    OF((void));
+ZEXTERN const z_crc_t FAR *ZEXPORT get_crc_table    OF((void));
 ZEXTERN int            ZEXPORT inflateUndermine OF((z_streamp, int));
 ZEXTERN int            ZEXPORT inflateResetKeep OF((z_streamp));
 ZEXTERN int            ZEXPORT deflateResetKeep OF((z_streamp));
diff --git a/zlib/zutil.c b/zlib/zutil.c
index 23d2ebef0..821949c77 100644
--- a/zlib/zutil.c
+++ b/zlib/zutil.c
@@ -14,20 +14,21 @@
 struct internal_state      {int dummy;}; /* for buggy compilers */
 #endif
 
-z_const char * const z_errmsg[10] = {
-"need dictionary",     /* Z_NEED_DICT       2  */
-"stream end",          /* Z_STREAM_END      1  */
-"",                    /* Z_OK              0  */
-"file error",          /* Z_ERRNO         (-1) */
-"stream error",        /* Z_STREAM_ERROR  (-2) */
-"data error",          /* Z_DATA_ERROR    (-3) */
-"insufficient memory", /* Z_MEM_ERROR     (-4) */
-"buffer error",        /* Z_BUF_ERROR     (-5) */
-"incompatible version",/* Z_VERSION_ERROR (-6) */
-""};
+z_const char *const z_errmsg[10] = {
+    "need dictionary",     /* Z_NEED_DICT       2  */
+    "stream end",          /* Z_STREAM_END      1  */
+    "",                    /* Z_OK              0  */
+    "file error",          /* Z_ERRNO         (-1) */
+    "stream error",        /* Z_STREAM_ERROR  (-2) */
+    "data error",          /* Z_DATA_ERROR    (-3) */
+    "insufficient memory", /* Z_MEM_ERROR     (-4) */
+    "buffer error",        /* Z_BUF_ERROR     (-5) */
+    "incompatible version",/* Z_VERSION_ERROR (-6) */
+    ""
+};
 
 
-const char * ZEXPORT zlibVersion()
+const char *ZEXPORT zlibVersion()
 {
     return ZLIB_VERSION;
 }
@@ -38,28 +39,52 @@ uLong ZEXPORT zlibCompileFlags()
 
     flags = 0;
     switch ((int)(sizeof(uInt))) {
-    case 2:     break;
-    case 4:     flags += 1;     break;
-    case 8:     flags += 2;     break;
-    default:    flags += 3;
+        case 2:
+            break;
+        case 4:
+            flags += 1;
+            break;
+        case 8:
+            flags += 2;
+            break;
+        default:
+            flags += 3;
     }
     switch ((int)(sizeof(uLong))) {
-    case 2:     break;
-    case 4:     flags += 1 << 2;        break;
-    case 8:     flags += 2 << 2;        break;
-    default:    flags += 3 << 2;
+        case 2:
+            break;
+        case 4:
+            flags += 1 << 2;
+            break;
+        case 8:
+            flags += 2 << 2;
+            break;
+        default:
+            flags += 3 << 2;
     }
     switch ((int)(sizeof(voidpf))) {
-    case 2:     break;
-    case 4:     flags += 1 << 4;        break;
-    case 8:     flags += 2 << 4;        break;
-    default:    flags += 3 << 4;
+        case 2:
+            break;
+        case 4:
+            flags += 1 << 4;
+            break;
+        case 8:
+            flags += 2 << 4;
+            break;
+        default:
+            flags += 3 << 4;
     }
     switch ((int)(sizeof(z_off_t))) {
-    case 2:     break;
-    case 4:     flags += 1 << 6;        break;
-    case 8:     flags += 2 << 6;        break;
-    default:    flags += 3 << 6;
+        case 2:
+            break;
+        case 4:
+            flags += 1 << 6;
+            break;
+        case 8:
+            flags += 2 << 6;
+            break;
+        default:
+            flags += 3 << 6;
     }
 #ifdef DEBUG
     flags += 1 << 8;
@@ -122,8 +147,8 @@ uLong ZEXPORT zlibCompileFlags()
 #  endif
 int ZLIB_INTERNAL z_verbose = verbose;
 
-void ZLIB_INTERNAL z_error (m)
-    char *m;
+void ZLIB_INTERNAL z_error(m)
+char *m;
 {
     fprintf(stderr, "%s\n", m);
     exit(1);
@@ -133,26 +158,26 @@ void ZLIB_INTERNAL z_error (m)
 /* exported to allow conversion of error code to string for compress() and
  * uncompress()
  */
-const char * ZEXPORT zError(err)
-    int err;
+const char *ZEXPORT zError(err)
+int err;
 {
     return ERR_MSG(err);
 }
 
 #if defined(_WIN32_WCE)
-    /* The Microsoft C Run-Time Library for Windows CE doesn't have
-     * errno.  We define it as a global variable to simplify porting.
-     * Its value is always 0 and should not be used.
-     */
-    int errno = 0;
+/* The Microsoft C Run-Time Library for Windows CE doesn't have
+ * errno.  We define it as a global variable to simplify porting.
+ * Its value is always 0 and should not be used.
+ */
+int errno = 0;
 #endif
 
 #ifndef HAVE_MEMCPY
 
 void ZLIB_INTERNAL zmemcpy(dest, source, len)
-    Bytef* dest;
-    const Bytef* source;
-    uInt  len;
+Bytef *dest;
+const Bytef *source;
+uInt  len;
 {
     if (len == 0) return;
     do {
@@ -161,21 +186,21 @@ void ZLIB_INTERNAL zmemcpy(dest, source, len)
 }
 
 int ZLIB_INTERNAL zmemcmp(s1, s2, len)
-    const Bytef* s1;
-    const Bytef* s2;
-    uInt  len;
+const Bytef *s1;
+const Bytef *s2;
+uInt  len;
 {
     uInt j;
 
     for (j = 0; j < len; j++) {
-        if (s1[j] != s2[j]) return 2*(s1[j] > s2[j])-1;
+        if (s1[j] != s2[j]) return 2 * (s1[j] > s2[j]) - 1;
     }
     return 0;
 }
 
 void ZLIB_INTERNAL zmemzero(dest, len)
-    Bytef* dest;
-    uInt  len;
+Bytef *dest;
+uInt  len;
 {
     if (len == 0) return;
     do {
@@ -217,17 +242,17 @@ local ptr_table table[MAX_PTR];
  * a protected system like OS/2. Use Microsoft C instead.
  */
 
-voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size)
+voidpf ZLIB_INTERNAL zcalloc(voidpf opaque, unsigned items, unsigned size)
 {
     voidpf buf = opaque; /* just to make some compilers happy */
-    ulg bsize = (ulg)items*size;
+    ulg bsize = (ulg)items * size;
 
     /* If we allocate less than 65520 bytes, we assume that farmalloc
      * will return a usable pointer which doesn't have to be normalized.
      */
     if (bsize < 65520L) {
         buf = farmalloc(bsize);
-        if (*(ush*)&buf != 0) return buf;
+        if (*(ush *)&buf != 0) return buf;
     } else {
         buf = farmalloc(bsize + 16L);
     }
@@ -235,16 +260,16 @@ voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size)
     table[next_ptr].org_ptr = buf;
 
     /* Normalize the pointer to seg:0 */
-    *((ush*)&buf+1) += ((ush)((uch*)buf-0) + 15) >> 4;
-    *(ush*)&buf = 0;
+    *((ush *)&buf + 1) += ((ush)((uch *)buf - 0) + 15) >> 4;
+    *(ush *)&buf = 0;
     table[next_ptr++].new_ptr = buf;
     return buf;
 }
 
-void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
+void ZLIB_INTERNAL zcfree(voidpf opaque, voidpf ptr)
 {
     int n;
-    if (*(ush*)&ptr != 0) { /* object < 64K */
+    if (*(ush *)&ptr != 0) { /* object < 64K */
         farfree(ptr);
         return;
     }
@@ -254,7 +279,7 @@ void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
 
         farfree(table[n].org_ptr);
         while (++n < next_ptr) {
-            table[n-1] = table[n];
+            table[n - 1] = table[n];
         }
         next_ptr--;
         return;
@@ -276,13 +301,13 @@ void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
 #  define _hfree   hfree
 #endif
 
-voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, uInt items, uInt size)
+voidpf ZLIB_INTERNAL zcalloc(voidpf opaque, uInt items, uInt size)
 {
     if (opaque) opaque = 0; /* to make compiler happy */
     return _halloc((long)items, size);
 }
 
-void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
+void ZLIB_INTERNAL zcfree(voidpf opaque, voidpf ptr)
 {
     if (opaque) opaque = 0; /* to make compiler happy */
     _hfree(ptr);
@@ -301,19 +326,19 @@ extern voidp  calloc OF((uInt items, uInt size));
 extern void   free   OF((voidpf ptr));
 #endif
 
-voidpf ZLIB_INTERNAL zcalloc (opaque, items, size)
-    voidpf opaque;
-    unsigned items;
-    unsigned size;
+voidpf ZLIB_INTERNAL zcalloc(opaque, items, size)
+voidpf opaque;
+unsigned items;
+unsigned size;
 {
     if (opaque) items += size - size; /* make compiler happy */
     return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) :
-                              (voidpf)calloc(items, size);
+           (voidpf)calloc(items, size);
 }
 
-void ZLIB_INTERNAL zcfree (opaque, ptr)
-    voidpf opaque;
-    voidpf ptr;
+void ZLIB_INTERNAL zcfree(opaque, ptr)
+voidpf opaque;
+voidpf ptr;
 {
     free(ptr);
     if (opaque) return; /* make compiler happy */
diff --git a/zlib/zutil.h b/zlib/zutil.h
index 24ab06b1c..1f6bee84e 100644
--- a/zlib/zutil.h
+++ b/zlib/zutil.h
@@ -30,7 +30,7 @@
 #endif
 
 #ifdef Z_SOLO
-   typedef long ptrdiff_t;  /* guess -- will be caught if guess is wrong */
+typedef long ptrdiff_t;  /* guess -- will be caught if guess is wrong */
 #endif
 
 #ifndef local
@@ -44,16 +44,16 @@ typedef unsigned short ush;
 typedef ush FAR ushf;
 typedef unsigned long  ulg;
 
-extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
+extern z_const char *const z_errmsg[10];  /* indexed by 2-zlib_error */
 /* (size given to avoid silly warnings with Visual C++) */
 
 #define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
 
 #define ERR_RETURN(strm,err) \
-  return (strm->msg = ERR_MSG(err), (err))
+    return (strm->msg = ERR_MSG(err), (err))
 /* To be used only when the state is known to be valid */
 
-        /* common constants */
+/* common constants */
 
 #ifndef DEF_WBITS
 #  define DEF_WBITS MAX_WBITS
@@ -78,16 +78,16 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 
 #define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */
 
-        /* target dependencies */
+/* target dependencies */
 
 #if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32))
 #  define OS_CODE  0x00
 #  ifndef Z_SOLO
 #    if defined(__TURBOC__) || defined(__BORLANDC__)
 #      if (__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))
-         /* Allow compilation with ANSI keywords only enabled */
-         void _Cdecl farfree( void *block );
-         void *_Cdecl farmalloc( unsigned long nbytes );
+/* Allow compilation with ANSI keywords only enabled */
+void _Cdecl farfree(void *block);
+void *_Cdecl farmalloc(unsigned long nbytes);
 #      else
 #        include <alloc.h>
 #      endif
@@ -104,7 +104,7 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #if defined(VAXC) || defined(VMS)
 #  define OS_CODE  0x02
 #  define F_OPEN(name, mode) \
-     fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512")
+    fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512")
 #endif
 
 #if defined(ATARI) || defined(atarist)
@@ -153,7 +153,7 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #  if defined(_WIN32_WCE)
 #    define fdopen(fd,mode) NULL /* No fdopen() */
 #    ifndef _PTRDIFF_T_DEFINED
-       typedef int ptrdiff_t;
+typedef int ptrdiff_t;
 #      define _PTRDIFF_T_DEFINED
 #    endif
 #  else
@@ -162,19 +162,19 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #endif
 
 #if defined(__BORLANDC__) && !defined(MSDOS)
-  #pragma warn -8004
-  #pragma warn -8008
-  #pragma warn -8066
+#pragma warn -8004
+#pragma warn -8008
+#pragma warn -8066
 #endif
 
 /* provide prototypes for these when building zlib without LFS */
 #if !defined(_WIN32) && \
     (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0)
-    ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
-    ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
+ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
+ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
 #endif
 
-        /* common defaults */
+/* common defaults */
 
 #ifndef OS_CODE
 #  define OS_CODE  0x03  /* assume Unix */
@@ -184,16 +184,16 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #  define F_OPEN(name, mode) fopen((name), (mode))
 #endif
 
-         /* functions */
+/* functions */
 
 #if defined(pyr) || defined(Z_SOLO)
 #  define NO_MEMCPY
 #endif
 #if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__)
- /* Use our own functions for small and medium model with MSC <= 5.0.
-  * You may have to use the same strategy for Borland C (untested).
-  * The __SC__ check is for Symantec.
-  */
+/* Use our own functions for small and medium model with MSC <= 5.0.
+ * You may have to use the same strategy for Borland C (untested).
+ * The __SC__ check is for Symantec.
+ */
 #  define NO_MEMCPY
 #endif
 #if defined(STDC) && !defined(HAVE_MEMCPY) && !defined(NO_MEMCPY)
@@ -210,16 +210,16 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #    define zmemzero(dest, len) memset(dest, 0, len)
 #  endif
 #else
-   void ZLIB_INTERNAL zmemcpy OF((Bytef* dest, const Bytef* source, uInt len));
-   int ZLIB_INTERNAL zmemcmp OF((const Bytef* s1, const Bytef* s2, uInt len));
-   void ZLIB_INTERNAL zmemzero OF((Bytef* dest, uInt len));
+void ZLIB_INTERNAL zmemcpy OF((Bytef *dest, const Bytef *source, uInt len));
+int ZLIB_INTERNAL zmemcmp OF((const Bytef *s1, const Bytef *s2, uInt len));
+void ZLIB_INTERNAL zmemzero OF((Bytef *dest, uInt len));
 #endif
 
 /* Diagnostic functions */
 #ifdef DEBUG
 #  include <stdio.h>
-   extern int ZLIB_INTERNAL z_verbose;
-   extern void ZLIB_INTERNAL z_error OF((char *m));
+extern int ZLIB_INTERNAL z_verbose;
+extern void ZLIB_INTERNAL z_error OF((char *m));
 #  define Assert(cond,msg) {if(!(cond)) z_error(msg);}
 #  define Trace(x) {if (z_verbose>=0) fprintf x ;}
 #  define Tracev(x) {if (z_verbose>0) fprintf x ;}
@@ -236,13 +236,13 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #endif
 
 #ifndef Z_SOLO
-   voidpf ZLIB_INTERNAL zcalloc OF((voidpf opaque, unsigned items,
-                                    unsigned size));
-   void ZLIB_INTERNAL zcfree  OF((voidpf opaque, voidpf ptr));
+voidpf ZLIB_INTERNAL zcalloc OF((voidpf opaque, unsigned items,
+                                 unsigned size));
+void ZLIB_INTERNAL zcfree  OF((voidpf opaque, voidpf ptr));
 #endif
 
 #define ZALLOC(strm, items, size) \
-           (*((strm)->zalloc))((strm)->opaque, (items), (size))
+    (*((strm)->zalloc))((strm)->opaque, (items), (size))
 #define ZFREE(strm, addr)  (*((strm)->zfree))((strm)->opaque, (voidpf)(addr))
 #define TRY_FREE(s, p) {if (p) ZFREE(s, p);}
 

From 554011f82888e8c1ae14984d20e0d5f34d93f23b Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 10 Mar 2019 00:09:38 +0100
Subject: [PATCH 0716/1938] =?UTF-8?q?Fix=20warning:=20=E2=80=98strncpy?=
 =?UTF-8?q?=E2=80=99=20output=20truncated=20before=20terminating=20nul=20c?=
 =?UTF-8?q?opying=20as=20many=20bytes=20from=20a=20string=20as=20its=20len?=
 =?UTF-8?q?gth?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/jansson/error.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/jansson/error.c b/client/jansson/error.c
index 8532e04ff..dd4d1605f 100644
--- a/client/jansson/error.c
+++ b/client/jansson/error.c
@@ -24,7 +24,7 @@ void jsonp_error_set_source(json_error_t *error, const char *source)
 
     length = strlen(source);
     if (length < JSON_ERROR_SOURCE_LENGTH) {
-        strncpy(error->source, source, length);
+        strncpy(error->source, source, JSON_ERROR_SOURCE_LENGTH);
     } else {
         size_t extra = length - JSON_ERROR_SOURCE_LENGTH + 4;
         memcpy(error->source, "...", 3);

From 22b43c65ec1d8d99f393a429fb83773e6f0680ce Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 10 Mar 2019 00:11:29 +0100
Subject: [PATCH 0717/1938] =?UTF-8?q?fix=20warning:=20format=20=E2=80=98%d?=
 =?UTF-8?q?=E2=80=99=20expects=20argument=20of=20type=20=E2=80=98int?=
 =?UTF-8?q?=E2=80=99,=20but=20argument=203=20has=20type=20=E2=80=98size=5F?=
 =?UTF-8?q?t=E2=80=99=20{aka=20=E2=80=98long=20unsigned=20int=E2=80=99}?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/emv/emv_roca.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/emv/emv_roca.c b/client/emv/emv_roca.c
index c28240eac..9dcc55b11 100644
--- a/client/emv/emv_roca.c
+++ b/client/emv/emv_roca.c
@@ -89,7 +89,7 @@ void print_mpi(const char *msg, int radix, const mbedtls_mpi *X)
     size_t len = 0;
 
     mbedtls_mpi_write_string(X, radix, Xchar, sizeof(Xchar), &len);
-    printf("%s[%d] %s\n", msg, len, Xchar);
+    printf("%s[%ld] %s\n", msg, len, Xchar);
 }
 
 bool emv_rocacheck(const unsigned char *buf, size_t buflen, bool verbose)

From 48124f89b4e9b5f6b95ddc294f820affdb73ccce Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 10 Mar 2019 00:24:26 +0100
Subject: [PATCH 0718/1938] =?UTF-8?q?fix=20=E2=80=98sprintf=E2=80=99=20out?=
 =?UTF-8?q?put=20between=2015=20and=2019=20bytes=20into=20a=20destination?=
 =?UTF-8?q?=20of=20size=2018?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/hardnested/hardnested_bruteforce.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/hardnested/hardnested_bruteforce.c b/client/hardnested/hardnested_bruteforce.c
index 680f032a6..320c20f70 100644
--- a/client/hardnested/hardnested_bruteforce.c
+++ b/client/hardnested/hardnested_bruteforce.c
@@ -171,7 +171,7 @@ crack_states_thread(void *x)
                 __atomic_fetch_add(&found_bs_key, key, __ATOMIC_SEQ_CST);
 
                 char progress_text[80];
-                char keystr[18];
+                char keystr[19];
                 sprintf(keystr, "%012" PRIx64 "  ", key);
                 sprintf(progress_text, "Brute force phase completed. Key found: " _YELLOW_( % s), keystr);
                 hardnested_print_progress(thread_arg->num_acquired_nonces, progress_text, 0.0, 0);

From da6cdf014bb34c42f25d5eec50f956950cd1d4ab Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 10 Mar 2019 00:56:00 +0100
Subject: [PATCH 0719/1938] Keep string syntax in color macros

---
 client/cmdanalyse.c                       | 12 +++---
 client/cmddata.c                          | 16 ++++----
 client/cmdhf14a.c                         |  6 +--
 client/cmdhf15.c                          |  2 +-
 client/cmdhficlass.c                      |  6 +--
 client/cmdhflist.c                        |  2 +-
 client/cmdhfmf.c                          | 46 +++++++++++------------
 client/cmdhfmfu.c                         |  4 +-
 client/cmdlf.c                            |  6 +--
 client/cmdlfem4x.c                        | 16 ++++----
 client/cmdlffdx.c                         | 12 +++---
 client/cmdlfjablotron.c                   |  2 +-
 client/cmdlft55xx.c                       | 24 ++++++------
 client/cmdsmartcard.c                     |  2 +-
 client/comms.c                            |  6 +--
 client/emv/emv_roca.c                     |  8 ++--
 client/emv/test/cryptotest.c              |  4 +-
 client/flash.c                            | 22 +++++------
 client/flasher.c                          | 10 ++---
 client/hardnested/hardnested_bruteforce.c |  2 +-
 client/loclass/fileutils.c                | 32 ++++++++--------
 client/mifare/mifarehost.c                | 14 +++----
 client/ui.c                               | 10 ++---
 client/util.h                             | 24 ++++++------
 24 files changed, 144 insertions(+), 144 deletions(-)

diff --git a/client/cmdanalyse.c b/client/cmdanalyse.c
index 9b326f961..892312cfa 100644
--- a/client/cmdanalyse.c
+++ b/client/cmdanalyse.c
@@ -555,10 +555,10 @@ int CmdAnalyseA(const char *Cmd)
     PrintAndLogEx(NORMAL, "got ack.  Status %d", resp.arg[0]);
     return 0;
 
-    PrintAndLogEx(NORMAL, "-- " _BLUE_(its my message) "\n");
-    PrintAndLogEx(NORMAL, "-- " _RED_(its my message) "\n");
-    PrintAndLogEx(NORMAL, "-- " _YELLOW_(its my message) "\n");
-    PrintAndLogEx(NORMAL, "-- " _GREEN_(its my message) "\n");
+    PrintAndLogEx(NORMAL, "-- " _BLUE_("its my message") "\n");
+    PrintAndLogEx(NORMAL, "-- " _RED_("its my message") "\n");
+    PrintAndLogEx(NORMAL, "-- " _YELLOW_("its my message") "\n");
+    PrintAndLogEx(NORMAL, "-- " _GREEN_("its my message") "\n");
 
     //uint8_t syncBit = 99;
     // The start bit is one ore more Sequence Y followed by a Sequence Z (... 11111111 00x11111). We need to distinguish from
@@ -911,12 +911,12 @@ int CmdAnalyseNuid(const char *Cmd)
         generate4bNUID(uid, nuid);
 
         bool test1 = (0 == memcmp(nuid, "\x8f\x43\x0f\xef", 4));
-        PrintAndLogEx(SUCCESS, "Selftest1 %s\n",  test1 ? _GREEN_(OK) : _RED_(Fail));
+        PrintAndLogEx(SUCCESS, "Selftest1 %s\n",  test1 ? _GREEN_("OK") : _RED_("Fail"));
 
         memcpy(uid, "\x04\x18\x3f\x09\x32\x1b\x85", 7);
         generate4bNUID(uid, nuid);
         bool test2 = (0 == memcmp(nuid, "\x4f\x50\x5d\x7d", 4));
-        PrintAndLogEx(SUCCESS, "Selftest2 %s\n", test2 ? _GREEN_(OK) : _RED_(Fail));
+        PrintAndLogEx(SUCCESS, "Selftest2 %s\n", test2 ? _GREEN_("OK") : _RED_("Fail"));
         return 0;
     }
 
diff --git a/client/cmddata.c b/client/cmddata.c
index 1fd01a3ae..2877ca0c8 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -1605,14 +1605,14 @@ int CmdTuneSamples(const char *Cmd)
     memset(judgement, 0, sizeof(judgement));
     // LF evaluation
     if (peakv < LF_UNUSABLE_V)
-        sprintf(judgement, _RED_(UNUSABLE));
+        sprintf(judgement, _RED_("UNUSABLE"));
     else if (peakv < LF_MARGINAL_V)
-        sprintf(judgement, _YELLOW_(MARGINAL));
+        sprintf(judgement, _YELLOW_("MARGINAL"));
     else
-        sprintf(judgement, _GREEN_(OK));
+        sprintf(judgement, _GREEN_("OK"));
 
     PrintAndLogEx(NORMAL, "%sLF antenna is %s \n"
-                  , (peakv < LF_UNUSABLE_V) ? _CYAN_([!]) : _GREEN_([+])
+                  , (peakv < LF_UNUSABLE_V) ? _CYAN_("[!]") : _GREEN_("[+]")
                   , judgement
                  );
 
@@ -1623,14 +1623,14 @@ int CmdTuneSamples(const char *Cmd)
     memset(judgement, 0, sizeof(judgement));
 
     if (v_hf < HF_UNUSABLE_V)
-        sprintf(judgement, _RED_(UNUSABLE));
+        sprintf(judgement, _RED_("UNUSABLE"));
     else if (v_hf < HF_MARGINAL_V)
-        sprintf(judgement, _YELLOW_(MARGINAL));
+        sprintf(judgement, _YELLOW_("MARGINAL"));
     else
-        sprintf(judgement, _GREEN_(OK));
+        sprintf(judgement, _GREEN_("OK"));
 
     PrintAndLogEx(NORMAL, "%sHF antenna is %s"
-                  , (v_hf < HF_UNUSABLE_V) ? _CYAN_([!]) : _GREEN_([+])
+                  , (v_hf < HF_UNUSABLE_V) ? _CYAN_("[!]") : _GREEN_("[+]")
                   , judgement
                  );
 
diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 009ca4f8c..89e88232b 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -651,11 +651,11 @@ int CmdHF14AInfo(const char *Cmd)
     if (isMifareClassic) {
         int res = detect_classic_prng();
         if (res == 1)
-            PrintAndLogEx(SUCCESS, "Prng detection: " _GREEN_(WEAK));
+            PrintAndLogEx(SUCCESS, "Prng detection: " _GREEN_("WEAK"));
         else if (res == 0)
-            PrintAndLogEx(SUCCESS, "Prng detection: " _YELLOW_(HARD));
+            PrintAndLogEx(SUCCESS, "Prng detection: " _YELLOW_("HARD"));
         else
-            PrintAndLogEx(FAILED, "prng detection:  " _RED_(failed));
+            PrintAndLogEx(FAILED, "prng detection:  " _RED_("failed"));
 
         if (do_nack_test)
             detect_classic_nackbug(silent);
diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index 3a2fe28f0..193290297 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -723,7 +723,7 @@ int CmdHF15Dump(const char *Cmd)
     }
     // detect blocksize from card :)
 
-    PrintAndLogEx(NORMAL, "Reading memory from tag UID " _YELLOW_( % s), sprintUID(NULL, uid));
+    PrintAndLogEx(NORMAL, "Reading memory from tag UID " _YELLOW_("%s"), sprintUID(NULL, uid));
 
     int blocknum = 0;
     uint8_t *recv = NULL;
diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index 0fc95a586..fa3fe9515 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -654,7 +654,7 @@ int CmdHFiClassELoad(const char *Cmd)
 
     FILE *f = fopen(filename, "rb");
     if (!f) {
-        PrintAndLogEx(FAILED, "File: " _YELLOW_( % s) ": not found or locked.", filename);
+        PrintAndLogEx(FAILED, "File: " _YELLOW_("%s") ": not found or locked.", filename);
         return 1;
     }
 
@@ -2325,7 +2325,7 @@ int LoadDictionaryKeyFile(char *filename, uint8_t **keys, int *keycnt)
     int keyitems = 0;
 
     if (!(f = fopen(filename, "r"))) {
-        PrintAndLogEx(FAILED, "File: " _YELLOW_( % s) ": not found or locked.", filename);
+        PrintAndLogEx(FAILED, "File: " _YELLOW_("%s") ": not found or locked.", filename);
         return 1;
     }
 
@@ -2363,7 +2363,7 @@ int LoadDictionaryKeyFile(char *filename, uint8_t **keys, int *keycnt)
         memset(buf, 0, sizeof(buf));
     }
     fclose(f);
-    PrintAndLogEx(SUCCESS, "Loaded " _GREEN_( % 2d) " keys from %s", *keycnt, filename);
+    PrintAndLogEx(SUCCESS, "Loaded " _GREEN_("%2d") " keys from %s", *keycnt, filename);
     return 0;
 }
 
diff --git a/client/cmdhflist.c b/client/cmdhflist.c
index 09de4d1ec..bd78c543b 100644
--- a/client/cmdhflist.c
+++ b/client/cmdhflist.c
@@ -1079,7 +1079,7 @@ bool DecodeMifareData(uint8_t *cmd, uint8_t cmdsize, uint8_t *parity, bool isRes
             PrintAndLogEx(NORMAL, "            |            |  *  |%49s %012"PRIx64" prng %s |     |",
                           "key",
                           mfLastKey,
-                          validate_prng_nonce(AuthData.nt) ? _GREEN_(WEAK) : _YELLOW_(HARD));
+                          validate_prng_nonce(AuthData.nt) ? _GREEN_("WEAK") : _YELLOW_("HARD"));
 
             AuthData.first_auth = false;
 
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 387f11538..648bd0988 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -803,7 +803,7 @@ int CmdHF14AMfDump(const char *Cmd)
     }
 
     if ((f = fopen(keyFilename, "rb")) == NULL) {
-        PrintAndLogEx(WARNING, "Could not find file " _YELLOW_( % s), keyFilename);
+        PrintAndLogEx(WARNING, "Could not find file " _YELLOW_("%s"), keyFilename);
         return 1;
     }
 
@@ -1013,7 +1013,7 @@ int CmdHF14AMfRestore(const char *Cmd)
     }
 
     if ((fkeys = fopen(keyFilename, "rb")) == NULL) {
-        PrintAndLogEx(WARNING, "Could not find file " _YELLOW_( % s), keyFilename);
+        PrintAndLogEx(WARNING, "Could not find file " _YELLOW_("%s"), keyFilename);
         return 1;
     }
 
@@ -1021,7 +1021,7 @@ int CmdHF14AMfRestore(const char *Cmd)
     for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
         bytes_read = fread(keyA[sectorNo], 1, 6, fkeys);
         if (bytes_read != 6) {
-            PrintAndLogEx(WARNING, "File reading error  " _YELLOW_( % s), keyFilename);
+            PrintAndLogEx(WARNING, "File reading error  " _YELLOW_("%s"), keyFilename);
             fclose(fkeys);
             return 2;
         }
@@ -1030,7 +1030,7 @@ int CmdHF14AMfRestore(const char *Cmd)
     for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
         bytes_read = fread(keyB[sectorNo], 1, 6, fkeys);
         if (bytes_read != 6) {
-            PrintAndLogEx(WARNING, "File reading error " _YELLOW_( % s), keyFilename);
+            PrintAndLogEx(WARNING, "File reading error " _YELLOW_("%s"), keyFilename);
             fclose(fkeys);
             return 2;
         }
@@ -1047,10 +1047,10 @@ int CmdHF14AMfRestore(const char *Cmd)
     }
 
     if ((fdump = fopen(dataFilename, "rb")) == NULL) {
-        PrintAndLogEx(WARNING, "Could not find file " _YELLOW_( % s), dataFilename);
+        PrintAndLogEx(WARNING, "Could not find file " _YELLOW_("%s"), dataFilename);
         return 1;
     }
-    PrintAndLogEx(INFO, "Restoring " _YELLOW_( % s)" to card", dataFilename);
+    PrintAndLogEx(INFO, "Restoring " _YELLOW_("%s")" to card", dataFilename);
 
     for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
         for (blockNo = 0; blockNo < NumBlocksPerSector(sectorNo); blockNo++) {
@@ -1058,7 +1058,7 @@ int CmdHF14AMfRestore(const char *Cmd)
             memcpy(c.d.asBytes, key, 6);
             bytes_read = fread(bldata, 1, 16, fdump);
             if (bytes_read != 16) {
-                PrintAndLogEx(WARNING, "File reading error " _YELLOW_( % s), dataFilename);
+                PrintAndLogEx(WARNING, "File reading error " _YELLOW_("%s"), dataFilename);
                 fclose(fdump);
                 fdump = NULL;
                 return 2;
@@ -1334,12 +1334,12 @@ int CmdHF14AMfNested(const char *Cmd)
             }
 
             if ((fkeys = fopen(fptr, "wb")) == NULL) {
-                PrintAndLogEx(WARNING, "could not create file " _YELLOW_( % s), fptr);
+                PrintAndLogEx(WARNING, "could not create file " _YELLOW_("%s"), fptr);
                 free(e_sector);
                 return 1;
             }
 
-            PrintAndLogEx(SUCCESS, "saving keys to binary file " _YELLOW_( % s), fptr);
+            PrintAndLogEx(SUCCESS, "saving keys to binary file " _YELLOW_("%s"), fptr);
             for (i = 0; i < SectorsCnt; i++) {
                 if (e_sector[i].foundKey[0]) {
                     num_to_bytes(e_sector[i].Key[0], 6, tempkey);
@@ -1654,7 +1654,7 @@ int CmdHF14AMfChk_fast(const char *Cmd)
 
             f = fopen(filename, "r");
             if (!f) {
-                PrintAndLogEx(FAILED, "File: " _YELLOW_( % s) ": not found or locked.", filename);
+                PrintAndLogEx(FAILED, "File: " _YELLOW_("%s") ": not found or locked.", filename);
                 continue;
             }
 
@@ -1668,7 +1668,7 @@ int CmdHF14AMfChk_fast(const char *Cmd)
                 if (buf[0] == '#') continue; //The line start with # is comment, skip
 
                 if (!isxdigit(buf[0])) {
-                    PrintAndLogEx(FAILED, "File content error. '" _YELLOW_( % s)"' must include 12 HEX symbols", buf);
+                    PrintAndLogEx(FAILED, "File content error. '" _YELLOW_("%s")"' must include 12 HEX symbols", buf);
                     continue;
                 }
 
@@ -1690,7 +1690,7 @@ int CmdHF14AMfChk_fast(const char *Cmd)
                 memset(buf, 0, sizeof(buf));
             }
             fclose(f);
-            PrintAndLogEx(SUCCESS, "Loaded %2d keys from " _YELLOW_( % s), keycnt, filename);
+            PrintAndLogEx(SUCCESS, "Loaded %2d keys from " _YELLOW_("%s"), keycnt, filename);
         }
     }
 
@@ -1794,12 +1794,12 @@ out:
 
             FILE *fkeys = fopen(fptr, "wb");
             if (fkeys == NULL) {
-                PrintAndLogEx(WARNING, "Could not create file " _YELLOW_( % s), fptr);
+                PrintAndLogEx(WARNING, "Could not create file " _YELLOW_("%s"), fptr);
                 free(keyBlock);
                 free(e_sector);
                 return 1;
             }
-            PrintAndLogEx(SUCCESS, "Printing keys to binary file " _YELLOW_( % s)"...", fptr);
+            PrintAndLogEx(SUCCESS, "Printing keys to binary file " _YELLOW_("%s")"...", fptr);
 
             for (i = 0; i < sectorsCnt; i++) {
                 num_to_bytes(e_sector[i].Key[0], 6, tempkey);
@@ -1812,7 +1812,7 @@ out:
             }
 
             fclose(fkeys);
-            PrintAndLogEx(SUCCESS, "Found keys have been dumped to " _YELLOW_( % s)" --> 0xffffffffffff has been inserted for unknown keys.", fptr);
+            PrintAndLogEx(SUCCESS, "Found keys have been dumped to " _YELLOW_("%s")" --> 0xffffffffffff has been inserted for unknown keys.", fptr);
         }
     }
 
@@ -1914,7 +1914,7 @@ int CmdHF14AMfChk(const char *Cmd)
 
             f = fopen(filename, "r");
             if (!f) {
-                PrintAndLogEx(FAILED, "File: " _YELLOW_( % s) ": not found or locked.", filename);
+                PrintAndLogEx(FAILED, "File: " _YELLOW_("%s") ": not found or locked.", filename);
                 continue;
             }
 
@@ -1929,7 +1929,7 @@ int CmdHF14AMfChk(const char *Cmd)
 
                 // codesmell, only checks first char?
                 if (!isxdigit(buf[0])) {
-                    PrintAndLogEx(FAILED, "File content error. '" _YELLOW_( % s)"' must include 12 HEX symbols", buf);
+                    PrintAndLogEx(FAILED, "File content error. '" _YELLOW_("%s")"' must include 12 HEX symbols", buf);
                     continue;
                 }
 
@@ -1952,7 +1952,7 @@ int CmdHF14AMfChk(const char *Cmd)
                 memset(buf, 0, sizeof(buf));
             }
             fclose(f);
-            PrintAndLogEx(SUCCESS, "Loaded %2d keys from " _YELLOW_( % s), keycnt, filename);
+            PrintAndLogEx(SUCCESS, "Loaded %2d keys from " _YELLOW_("%s"), keycnt, filename);
         }
     }
 
@@ -2086,12 +2086,12 @@ out:
 
         FILE *fkeys = fopen(fptr, "wb");
         if (fkeys == NULL) {
-            PrintAndLogEx(WARNING, "Could not create file " _YELLOW_( % s), fptr);
+            PrintAndLogEx(WARNING, "Could not create file " _YELLOW_("%s"), fptr);
             free(keyBlock);
             free(e_sector);
             return 1;
         }
-        PrintAndLogEx(INFO, "Printing keys to binary file " _YELLOW_( % s)"...", fptr);
+        PrintAndLogEx(INFO, "Printing keys to binary file " _YELLOW_("%s")"...", fptr);
 
         for (i = 0; i < SectorsCnt; i++) {
             num_to_bytes(e_sector[i].Key[0], 6, tempkey);
@@ -2102,7 +2102,7 @@ out:
             fwrite(tempkey, 1, 6, fkeys);
         }
         fclose(fkeys);
-        PrintAndLogEx(SUCCESS, "Found keys have been dumped to file " _YELLOW_( % s)". 0xffffffffffff has been inserted for unknown keys.", fptr);
+        PrintAndLogEx(SUCCESS, "Found keys have been dumped to file " _YELLOW_("%s")". 0xffffffffffff has been inserted for unknown keys.", fptr);
     }
 
     free(keyBlock);
@@ -2645,7 +2645,7 @@ int CmdHF14AMfELoad(const char *Cmd)
             return 4;
         }
     }
-    PrintAndLogEx(SUCCESS, "Loaded %d blocks from file: " _YELLOW_( % s), blockNum, filename);
+    PrintAndLogEx(SUCCESS, "Loaded %d blocks from file: " _YELLOW_("%s"), blockNum, filename);
     free(data);
     return 0;
 }
@@ -3272,7 +3272,7 @@ int CmdHF14AMfice(const char *Cmd)
     PrintAndLogEx(NORMAL, "Collecting %u nonces \n", limit);
 
     if ((fnonces = fopen(filename, "wb")) == NULL) {
-        PrintAndLogEx(WARNING, "Could not create file " _YELLOW_( % s), filename);
+        PrintAndLogEx(WARNING, "Could not create file " _YELLOW_("%s"), filename);
         return 3;
     }
 
diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index efc1f4f2a..e925efe6b 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -2119,7 +2119,7 @@ int CmdHF14AMfURestore(const char *Cmd)
     if (errors || cmdp == 0) return usage_hf_mfu_restore();
 
     if ((f = fopen(filename, "rb")) == NULL) {
-        PrintAndLogEx(WARNING, "Could not find file " _YELLOW_( % s), filename);
+        PrintAndLogEx(WARNING, "Could not find file " _YELLOW_("%s"), filename);
         return 1;
     }
 
@@ -2149,7 +2149,7 @@ int CmdHF14AMfURestore(const char *Cmd)
         return 1;
     }
 
-    PrintAndLogEx(INFO, "Restoring " _YELLOW_( % s)" to card", filename);
+    PrintAndLogEx(INFO, "Restoring " _YELLOW_("%s")" to card", filename);
 
     mfu_dump_t *mem = (mfu_dump_t *)dump;
     uint8_t pages = (bytes_read - 48) / 4;
diff --git a/client/cmdlf.c b/client/cmdlf.c
index 30ad0cdc2..02d020b53 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -853,7 +853,7 @@ bool CheckChipType(bool getDeviceData)
     uint32_t word = 0;
     if (EM4x05IsBlock0(&word)) {
         PrintAndLogEx(SUCCESS, "\nValid EM4x05/EM4x69 Chip Found");
-        PrintAndLogEx(SUCCESS, "Try " _YELLOW_(`lf em 4x05`) " commands");
+        PrintAndLogEx(SUCCESS, "Try " _YELLOW_("`lf em 4x05`") " commands");
         retval = true;
         goto out;
     }
@@ -861,7 +861,7 @@ bool CheckChipType(bool getDeviceData)
     //check for t55xx chip...
     if (tryDetectP1(true)) {
         PrintAndLogEx(SUCCESS, "\nValid T55xx Chip Found");
-        PrintAndLogEx(SUCCESS, "Try " _YELLOW_(`lf t55xx`)" commands");
+        PrintAndLogEx(SUCCESS, "Try " _YELLOW_("`lf t55xx`")" commands");
         retval = true;
         goto out;
     }
@@ -896,7 +896,7 @@ int CmdLFfind(const char *Cmd)
 
     PrintAndLogEx(INFO, "NOTE: some demods output possible binary");
     PrintAndLogEx(INFO, "if it finds something that looks like a tag");
-    PrintAndLogEx(INFO, "False Positives " _YELLOW_(ARE) "possible\n");
+    PrintAndLogEx(INFO, "False Positives " _YELLOW_("ARE") "possible\n");
     PrintAndLogEx(INFO, "\nChecking for known tags:\n");
 
     // only run these tests if device is online
diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 011299b68..343b669ec 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -788,7 +788,7 @@ uint32_t OutputEM4x50_Block(uint8_t *BitStream, size_t size, bool verbose, bool
                          );
         }
 
-        PrintAndLogEx(SUCCESS, "Parity checks | %s", (pTest) ? _GREEN_(Passed) : _RED_(Failed));
+        PrintAndLogEx(SUCCESS, "Parity checks | %s", (pTest) ? _GREEN_("Passed") : _RED_("Failed"));
     }
     return code;
 }
@@ -978,7 +978,7 @@ int EM4x50Read(const char *Cmd, bool verbose)
     //print full code:
     if (verbose || g_debugMode || AllPTest) {
         if (!complete) {
-            PrintAndLogEx(NORMAL, _RED_(* **Warning!));
+            PrintAndLogEx(NORMAL, _RED_("* **Warning!"));
             PrintAndLogEx(NORMAL, "Partial data - no end found!");
             PrintAndLogEx(NORMAL, "Try again with more samples.");
         }
@@ -988,10 +988,10 @@ int EM4x50Read(const char *Cmd, bool verbose)
             PrintAndLogEx(NORMAL, "Block %d: %08x", block, Code[block]);
         }
 
-        PrintAndLogEx(NORMAL, "Parities checks | %s", (AllPTest) ? _GREEN_(Passed) : _RED_(Failed));
+        PrintAndLogEx(NORMAL, "Parities checks | %s", (AllPTest) ? _GREEN_("Passed") : _RED_("Failed"));
 
         if (AllPTest == 0) {
-            PrintAndLogEx(NORMAL, "Try cleaning the read samples with " _YELLOW_('data askedge'));
+            PrintAndLogEx(NORMAL, "Try cleaning the read samples with " _YELLOW_("'data askedge'"));
         }
     }
 
@@ -1223,7 +1223,7 @@ int CmdEM4x05Dump(const char *Cmd)
             if (usePwd) {
                 PrintAndLogEx(NORMAL, " %02u | %08X", addr, pwd, word);
             } else {
-                PrintAndLogEx(NORMAL, " 02 | " _RED_(cannot read));
+                PrintAndLogEx(NORMAL, " 02 | " _RED_("cannot read"));
             }
         } else {
             success &= EM4x05ReadWord_ext(addr, pwd, usePwd, &word);
@@ -1260,7 +1260,7 @@ int CmdEM4x05Read(const char *Cmd)
     if (isOk)
         PrintAndLogEx(NORMAL, "Address %02d | %08X - %s", addr, word, (addr > 13) ? "Lock" : "");
     else
-        PrintAndLogEx(NORMAL, "Read Address %02d | " _RED_(failed), addr);
+        PrintAndLogEx(NORMAL, "Read Address %02d | " _RED_("failed"), addr);
     return isOk;
 }
 
@@ -1307,9 +1307,9 @@ int CmdEM4x05Write(const char *Cmd)
     uint32_t dummy = 0;
     int isOk = demodEM4x05resp(&dummy);
     if (isOk)
-        PrintAndLogEx(NORMAL, "Write " _GREEN_(Verified));
+        PrintAndLogEx(NORMAL, "Write " _GREEN_("Verified"));
     else
-        PrintAndLogEx(NORMAL, "Write could " _RED_(not) "be verified");
+        PrintAndLogEx(NORMAL, "Write could " _RED_("not") "be verified");
     return isOk;
 }
 
diff --git a/client/cmdlffdx.c b/client/cmdlffdx.c
index c697a59eb..83998bcc0 100644
--- a/client/cmdlffdx.c
+++ b/client/cmdlffdx.c
@@ -223,9 +223,9 @@ int CmdFDXBdemodBI(const char *Cmd)
     PrintAndLogEx(SUCCESS, "CountryCode:   %04u", countryCode);
 
     PrintAndLogEx(SUCCESS, "Reserved/RFU:      %u", reservedCode);
-    PrintAndLogEx(SUCCESS, "Animal Tag:        %s", animalBit ? _YELLOW_(True) : "False");
-    PrintAndLogEx(SUCCESS, "Has extended data: %s [0x%X]", dataBlockBit ? _YELLOW_(True) : "False", extended);
-    PrintAndLogEx(SUCCESS, "CRC:           0x%04X - [%04X] - %s", crc16, calcCrc, (calcCrc == crc16) ? _GREEN_(Passed) : "Failed");
+    PrintAndLogEx(SUCCESS, "Animal Tag:        %s", animalBit ? _YELLOW_("True") : "False");
+    PrintAndLogEx(SUCCESS, "Has extended data: %s [0x%X]", dataBlockBit ? _YELLOW_("True") : "False", extended);
+    PrintAndLogEx(SUCCESS, "CRC:           0x%04X - [%04X] - %s", crc16, calcCrc, (calcCrc == crc16) ? _GREEN_("Passed") : "Failed");
 
     if (g_debugMode) {
         PrintAndLogEx(DEBUG, "Start marker %d;   Size %d", preambleIndex, size);
@@ -292,9 +292,9 @@ int CmdFdxDemod(const char *Cmd)
     PrintAndLogEx(SUCCESS, "National Code      %012" PRIu64 " (0x%" PRIx64 ")", NationalCode, NationalCode);
     PrintAndLogEx(SUCCESS, "Country Code       %04u", countryCode);
     PrintAndLogEx(SUCCESS, "Reserved/RFU       %u (0x04%X)", reservedCode,  reservedCode);
-    PrintAndLogEx(SUCCESS, "Animal Tag         %s", animalBit ? _YELLOW_(True) : "False");
-    PrintAndLogEx(SUCCESS, "Has extended data  %s [0x%X]", dataBlockBit ? _YELLOW_(True) : "False", extended);
-    PrintAndLogEx(SUCCESS, "CRC-16             0x%04X - 0x%04X [%s]", crc16, calcCrc, (calcCrc == crc16) ? _GREEN_(Ok) : "Failed");
+    PrintAndLogEx(SUCCESS, "Animal Tag         %s", animalBit ? _YELLOW_("True") : "False");
+    PrintAndLogEx(SUCCESS, "Has extended data  %s [0x%X]", dataBlockBit ? _YELLOW_("True") : "False", extended);
+    PrintAndLogEx(SUCCESS, "CRC-16             0x%04X - 0x%04X [%s]", crc16, calcCrc, (calcCrc == crc16) ? _GREEN_("Ok") : "Failed");
 
     if (g_debugMode) {
         PrintAndLogEx(DEBUG, "Start marker %d;   Size %d", preambleIndex, size);
diff --git a/client/cmdlfjablotron.c b/client/cmdlfjablotron.c
index 77e625ff8..16fd3db9b 100644
--- a/client/cmdlfjablotron.c
+++ b/client/cmdlfjablotron.c
@@ -139,7 +139,7 @@ int CmdJablotronDemod(const char *Cmd)
     uint8_t chksum = raw2 & 0xFF;
     PrintAndLogEx(INFO, "Checksum: %02X [%s]",
                   chksum,
-                  (chksum == jablontron_chksum(DemodBuffer)) ? _GREEN_(OK) : _RED_(FAIL)
+                  (chksum == jablontron_chksum(DemodBuffer)) ? _GREEN_("OK") : _RED_("FAIL")
                  );
 
     id = DEC2BCD(id);
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 039d69c07..cfa1a5a5c 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -988,9 +988,9 @@ int printConfiguration(t55xx_conf_block_t b)
     PrintAndLogEx(NORMAL, "Chip Type  : %s", (b.Q5) ? "T5555(Q5)" : "T55x7");
     PrintAndLogEx(NORMAL, "Modulation : %s", GetSelectedModulationStr(b.modulation));
     PrintAndLogEx(NORMAL, "Bit Rate   : %s", GetBitRateStr(b.bitrate, (b.block0 & T55x7_X_MODE && (b.block0 >> 28 == 6 || b.block0 >> 28 == 9))));
-    PrintAndLogEx(NORMAL, "Inverted   : %s", (b.inverted) ? _GREEN_(Yes) : "No");
+    PrintAndLogEx(NORMAL, "Inverted   : %s", (b.inverted) ? _GREEN_("Yes") : "No");
     PrintAndLogEx(NORMAL, "Offset     : %d", b.offset);
-    PrintAndLogEx(NORMAL, "Seq. Term. : %s", (b.ST) ? _GREEN_(Yes) : "No");
+    PrintAndLogEx(NORMAL, "Seq. Term. : %s", (b.ST) ? _GREEN_("Yes") : "No");
     PrintAndLogEx(NORMAL, "Block0     : 0x%08X", b.block0);
     PrintAndLogEx(NORMAL, "");
     return 0;
@@ -1347,7 +1347,7 @@ int CmdT55xxInfo(const char *Cmd)
     si += 1;
 
     if (config.Q5)
-        PrintAndLogEx(NORMAL, _RED_(* **Warning ***) " Config Info read off a Q5 will not display as expected");
+        PrintAndLogEx(NORMAL, _RED_("* **Warning ***") " Config Info read off a Q5 will not display as expected");
 
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "-- T55x7 Configuration & Tag Information --------------------");
@@ -1355,17 +1355,17 @@ int CmdT55xxInfo(const char *Cmd)
     PrintAndLogEx(NORMAL, " Safer key                 : %s", GetSaferStr(safer));
     PrintAndLogEx(NORMAL, " reserved                  : %d", resv);
     PrintAndLogEx(NORMAL, " Data bit rate             : %s", GetBitRateStr(dbr, extend));
-    PrintAndLogEx(NORMAL, " eXtended mode             : %s", (extend) ? _YELLOW_(Yes - Warning) : "No");
+    PrintAndLogEx(NORMAL, " eXtended mode             : %s", (extend) ? _YELLOW_("Yes - Warning") : "No");
     PrintAndLogEx(NORMAL, " Modulation                : %s", GetModulationStr(datamod));
     PrintAndLogEx(NORMAL, " PSK clock frequency       : %d", pskcf);
-    PrintAndLogEx(NORMAL, " AOR - Answer on Request   : %s", (aor) ? _GREEN_(Yes) : "No");
-    PrintAndLogEx(NORMAL, " OTP - One Time Pad        : %s", (otp) ? _YELLOW_(Yes - Warning) : "No");
+    PrintAndLogEx(NORMAL, " AOR - Answer on Request   : %s", (aor) ? _GREEN_("Yes") : "No");
+    PrintAndLogEx(NORMAL, " OTP - One Time Pad        : %s", (otp) ? _YELLOW_("Yes - Warning") : "No");
     PrintAndLogEx(NORMAL, " Max block                 : %d", maxblk);
-    PrintAndLogEx(NORMAL, " Password mode             : %s", (pwd) ? _GREEN_(Yes) : "No");
-    PrintAndLogEx(NORMAL, " Sequence Start Terminator : %s", (sst) ? _GREEN_(Yes) : "No");
-    PrintAndLogEx(NORMAL, " Fast Write                : %s", (fw)  ? _GREEN_(Yes) : "No");
-    PrintAndLogEx(NORMAL, " Inverse data              : %s", (inv) ? _GREEN_(Yes) : "No");
-    PrintAndLogEx(NORMAL, " POR-Delay                 : %s", (por) ? _GREEN_(Yes) : "No");
+    PrintAndLogEx(NORMAL, " Password mode             : %s", (pwd) ? _GREEN_("Yes") : "No");
+    PrintAndLogEx(NORMAL, " Sequence Start Terminator : %s", (sst) ? _GREEN_("Yes") : "No");
+    PrintAndLogEx(NORMAL, " Fast Write                : %s", (fw)  ? _GREEN_("Yes") : "No");
+    PrintAndLogEx(NORMAL, " Inverse data              : %s", (inv) ? _GREEN_("Yes") : "No");
+    PrintAndLogEx(NORMAL, " POR-Delay                 : %s", (por) ? _GREEN_("Yes") : "No");
     PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
     PrintAndLogEx(NORMAL, " Raw Data - Page 0");
     PrintAndLogEx(NORMAL, "     Block 0  : 0x%08X  %s", block0, sprint_bin(DemodBuffer + config.offset, 32));
@@ -1751,7 +1751,7 @@ int CmdT55xxChkPwds(const char *Cmd)
 
         FILE *f = fopen(filename, "r");
         if (!f) {
-            PrintAndLogEx(FAILED, "File: " _YELLOW_( % s) ": not found or locked.", filename);
+            PrintAndLogEx(FAILED, "File: " _YELLOW_("%s") ": not found or locked.", filename);
             free(keyBlock);
             return 1;
         }
diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index a373fee39..2908ab9c6 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -614,7 +614,7 @@ int CmdSmartUpgrade(const char *Cmd)
     // load file
     f = fopen(filename, "rb");
     if (!f) {
-        PrintAndLogEx(FAILED, "File: " _YELLOW_( % s) ": not found or locked.", filename);
+        PrintAndLogEx(FAILED, "File: " _YELLOW_("%s") ": not found or locked.", filename);
         return 1;
     }
 
diff --git a/client/comms.c b/client/comms.c
index 53f52d7a5..e854362d8 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -313,7 +313,7 @@ bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode)
     if (!wait_for_port) {
         sp = uart_open(portname);
     } else {
-        PrintAndLogEx(SUCCESS, "Waiting for Proxmark to appear on " _YELLOW_( % s), portname);
+        PrintAndLogEx(SUCCESS, "Waiting for Proxmark to appear on " _YELLOW_("%s"), portname);
         fflush(stdout);
         int openCount = 0;
         do {
@@ -327,12 +327,12 @@ bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode)
 
     // check result of uart opening
     if (sp == INVALID_SERIAL_PORT) {
-        PrintAndLogEx(WARNING, _RED_(ERROR:) "invalid serial port");
+        PrintAndLogEx(WARNING, _RED_("ERROR:") "invalid serial port");
         sp = NULL;
         serial_port_name = NULL;
         return false;
     } else if (sp == CLAIMED_SERIAL_PORT) {
-        PrintAndLogEx(WARNING, _RED_(ERROR:) "serial port is claimed by another process");
+        PrintAndLogEx(WARNING, _RED_("ERROR:") "serial port is claimed by another process");
         sp = NULL;
         serial_port_name = NULL;
         return false;
diff --git a/client/emv/emv_roca.c b/client/emv/emv_roca.c
index 9dcc55b11..f7a16bb3e 100644
--- a/client/emv/emv_roca.c
+++ b/client/emv/emv_roca.c
@@ -158,10 +158,10 @@ int roca_self_test(void)
 
 
     if (emv_rocacheck(keyp, 64, false)) {
-        PrintAndLogEx(SUCCESS, "Weak modulus [ %s]", _GREEN_(PASS));
+        PrintAndLogEx(SUCCESS, "Weak modulus [ %s]", _GREEN_("PASS"));
     } else {
         ret++;
-        PrintAndLogEx(FAILED, "Weak modulus [ %s]", _RED_(FAIL));
+        PrintAndLogEx(FAILED, "Weak modulus [ %s]", _RED_("FAIL"));
     }
 
     // negative
@@ -172,9 +172,9 @@ int roca_self_test(void)
 
     if (emv_rocacheck(keyn, 64, false)) {
         ret++;
-        PrintAndLogEx(FAILED, "Strong modulus [ %s]", _RED_(FAIL));
+        PrintAndLogEx(FAILED, "Strong modulus [ %s]", _RED_("FAIL"));
     } else {
-        PrintAndLogEx(SUCCESS, "Strong modulus [ %s]", _GREEN_(PASS));
+        PrintAndLogEx(SUCCESS, "Strong modulus [ %s]", _GREEN_("PASS"));
     }
 
     return ret;
diff --git a/client/emv/test/cryptotest.c b/client/emv/test/cryptotest.c
index e5259f417..d4c8a96da 100644
--- a/client/emv/test/cryptotest.c
+++ b/client/emv/test/cryptotest.c
@@ -98,9 +98,9 @@ int ExecuteCryptoTests(bool verbose)
     PrintAndLog("\n--------------------------");
 
     if (TestFail)
-        PrintAndLogEx(FAILED, "\tTest(s) [ %s ]", _RED_(FAIL));
+        PrintAndLogEx(FAILED, "\tTest(s) [ %s ]", _RED_("FAIL"));
     else
-        PrintAndLogEx(SUCCESS, "\tTest(s) [ %s ]", _GREEN_(OK));
+        PrintAndLogEx(SUCCESS, "\tTest(s) [ %s ]", _GREEN_("OK"));
 
     return TestFail;
 }
diff --git a/client/flash.c b/client/flash.c
index 21eabe8e3..2e655ff5d 100644
--- a/client/flash.c
+++ b/client/flash.c
@@ -190,12 +190,12 @@ int flash_load(flash_file_t *ctx, const char *name, int can_write_bl)
 
     fd = fopen(name, "rb");
     if (!fd) {
-        fprintf(stderr, _RED_(Could not open file) "%s  >>> ", name);
+        fprintf(stderr, _RED_("Could not open file") "%s  >>> ", name);
         perror(NULL);
         goto fail;
     }
 
-    fprintf(stdout, _BLUE_(Loading ELF file) "%s\n", name);
+    fprintf(stdout, _BLUE_("Loading ELF file") "%s\n", name);
 
     if (fread(&ehdr, sizeof(ehdr), 1, fd) != 1) {
         fprintf(stderr, "Error while reading ELF file header\n");
@@ -284,7 +284,7 @@ static int get_proxmark_state(uint32_t *state)
             *state = resp.arg[0];
             break;
         default:
-            fprintf(stderr, _RED_(Error:) "Couldn't get proxmark state, bad response type: 0x%04" PRIx64 "\n", resp.cmd);
+            fprintf(stderr, _RED_("Error:") "Couldn't get proxmark state, bad response type: 0x%04" PRIx64 "\n", resp.cmd);
             return -1;
             break;
     }
@@ -304,7 +304,7 @@ static int enter_bootloader(char *serial_port_name)
         return 0;
 
     if (state & DEVICE_INFO_FLAG_CURRENT_MODE_OS) {
-        fprintf(stdout, _BLUE_(Entering bootloader...) "\n");
+        fprintf(stdout, _BLUE_("Entering bootloader...") "\n");
         UsbCommand c;
         memset(&c, 0, sizeof(c));
 
@@ -326,15 +326,15 @@ static int enter_bootloader(char *serial_port_name)
 
         bool opened = OpenProxmark(serial_port_name, true, 60, true);
         if (opened) {
-            fprintf(stdout, " " _GREEN_(Found) "\n");
+            fprintf(stdout, " " _GREEN_("Found") "\n");
             return 0;
         } else {
-            fprintf(stdout, _RED_(Error:) "Proxmark not found.\n");
+            fprintf(stdout, _RED_("Error:") "Proxmark not found.\n");
             return -1;
         }
     }
 
-    fprintf(stderr, _RED_(Error:) "Unknown Proxmark mode\n");
+    fprintf(stderr, _RED_("Error:") "Unknown Proxmark mode\n");
     return -1;
 }
 
@@ -380,8 +380,8 @@ int flash_start_flashing(int enable_bl_writes, char *serial_port_name)
         SendCommand(&c);
         return wait_for_ack(&c);
     } else {
-        fprintf(stderr, _RED_(Note: Your bootloader does not understand the new START_FLASH command) "\n");
-        fprintf(stderr, _RED_(It is recommended that you update your bootloader) "\n\n");
+        fprintf(stderr, _RED_("Note: Your bootloader does not understand the new START_FLASH command") "\n");
+        fprintf(stderr, _RED_("It is recommended that you update your bootloader") "\n\n");
     }
     return 0;
 }
@@ -443,7 +443,7 @@ int flash_write(flash_file_t *ctx)
             fprintf(stdout, ".");
             fflush(stdout);
         }
-        fprintf(stdout, _GREEN_(OK) "\n");
+        fprintf(stdout, _GREEN_("OK") "\n");
         fflush(stdout);
     }
     return 0;
@@ -470,4 +470,4 @@ int flash_stop_flashing(void)
     SendCommand(&c);
     msleep(100);
     return 0;
-}
\ No newline at end of file
+}
diff --git a/client/flasher.c b/client/flasher.c
index 90965322d..3a784bc08 100644
--- a/client/flasher.c
+++ b/client/flasher.c
@@ -85,17 +85,17 @@ int main(int argc, char **argv)
     char *serial_port_name = argv[1];
 
     if (!OpenProxmark(serial_port_name, true, 60, true)) {
-        fprintf(stderr, "Could not find Proxmark on " _RED_( % s) ".\n\n", serial_port_name);
+        fprintf(stderr, "Could not find Proxmark on " _RED_("%s") ".\n\n", serial_port_name);
         return -1;
     } else {
-        fprintf(stderr, _GREEN_(Found) "\n");
+        fprintf(stderr, _GREEN_("Found") "\n");
     }
 
     res = flash_start_flashing(can_write_bl, serial_port_name);
     if (res < 0)
         return -1;
 
-    fprintf(stdout, "\n" _BLUE_(Flashing...)"\n");
+    fprintf(stdout, "\n" _BLUE_("Flashing...")"\n");
 
     for (int i = 0; i < num_files; i++) {
         res = flash_write(&files[i]);
@@ -105,7 +105,7 @@ int main(int argc, char **argv)
         fprintf(stdout, "\n");
     }
 
-    fprintf(stdout, _BLUE_(Resetting hardware...) "\n");
+    fprintf(stdout, _BLUE_("Resetting hardware...") "\n");
 
     res = flash_stop_flashing();
     if (res < 0)
@@ -113,6 +113,6 @@ int main(int argc, char **argv)
 
     CloseProxmark();
 
-    fprintf(stdout, _BLUE_(All done.) "\n\nHave a nice day!\n");
+    fprintf(stdout, _BLUE_("All done.") "\n\nHave a nice day!\n");
     return 0;
 }
diff --git a/client/hardnested/hardnested_bruteforce.c b/client/hardnested/hardnested_bruteforce.c
index 320c20f70..43494bc11 100644
--- a/client/hardnested/hardnested_bruteforce.c
+++ b/client/hardnested/hardnested_bruteforce.c
@@ -173,7 +173,7 @@ crack_states_thread(void *x)
                 char progress_text[80];
                 char keystr[19];
                 sprintf(keystr, "%012" PRIx64 "  ", key);
-                sprintf(progress_text, "Brute force phase completed. Key found: " _YELLOW_( % s), keystr);
+                sprintf(progress_text, "Brute force phase completed. Key found: " _YELLOW_("%s"), keystr);
                 hardnested_print_progress(thread_arg->num_acquired_nonces, progress_text, 0.0, 0);
                 break;
             } else if (keys_found) {
diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index 0ce761548..6136d2836 100644
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -73,14 +73,14 @@ int saveFile(const char *preferredName, const char *suffix, const void *data, si
     /*Opening file for writing in binary mode*/
     FILE *f = fopen(fileName, "wb");
     if (!f) {
-        PrintAndLogDevice(WARNING, "file not found or locked. '" _YELLOW_( % s)"'", fileName);
+        PrintAndLogDevice(WARNING, "file not found or locked. '" _YELLOW_("%s")"'", fileName);
         free(fileName);
         return 1;
     }
     fwrite(data, 1, datalen, f);
     fflush(f);
     fclose(f);
-    PrintAndLogDevice(SUCCESS, "saved %u bytes to binary file " _YELLOW_( % s), datalen, fileName);
+    PrintAndLogDevice(SUCCESS, "saved %u bytes to binary file " _YELLOW_("%s"), datalen, fileName);
     free(fileName);
     return 0;
 }
@@ -110,7 +110,7 @@ int saveFileEML(const char *preferredName, const char *suffix, uint8_t *data, si
     /*Opening file for writing in text mode*/
     FILE *f = fopen(fileName, "w+");
     if (!f) {
-        PrintAndLogDevice(WARNING, "file not found or locked. '" _YELLOW_( % s)"'", fileName);
+        PrintAndLogDevice(WARNING, "file not found or locked. '" _YELLOW_("%s")"'", fileName);
         retval =  1;
         goto out;
     }
@@ -133,7 +133,7 @@ int saveFileEML(const char *preferredName, const char *suffix, uint8_t *data, si
     }
     fflush(f);
     fclose(f);
-    PrintAndLogDevice(SUCCESS, "saved %d blocks to text file " _YELLOW_( % s), blocks, fileName);
+    PrintAndLogDevice(SUCCESS, "saved %d blocks to text file " _YELLOW_("%s"), blocks, fileName);
 
 out:
     free(fileName);
@@ -244,12 +244,12 @@ int saveFileJSON(const char *preferredName, const char *suffix, JSONFileType fty
 
     int res = json_dump_file(root, fileName, JSON_INDENT(2));
     if (res) {
-        PrintAndLogDevice(FAILED, "error: can't save the file: " _YELLOW_( % s), fileName);
+        PrintAndLogDevice(FAILED, "error: can't save the file: " _YELLOW_("%s"), fileName);
         json_decref(root);
         retval = 200;
         goto out;
     }
-    PrintAndLogDevice(SUCCESS, "saved to json file " _YELLOW_( % s), fileName);
+    PrintAndLogDevice(SUCCESS, "saved to json file " _YELLOW_("%s"), fileName);
     json_decref(root);
 
 out:
@@ -271,7 +271,7 @@ int loadFile(const char *preferredName, const char *suffix, void *data, size_t *
 
     FILE *f = fopen(fileName, "rb");
     if (!f) {
-        PrintAndLogDevice(WARNING, "file not found or locked. '" _YELLOW_( % s)"'", fileName);
+        PrintAndLogDevice(WARNING, "file not found or locked. '" _YELLOW_("%s")"'", fileName);
         free(fileName);
         return 1;
     }
@@ -306,7 +306,7 @@ int loadFile(const char *preferredName, const char *suffix, void *data, size_t *
     memcpy((data), dump, bytes_read);
     free(dump);
 
-    PrintAndLogDevice(SUCCESS, "loaded %d bytes from binary file " _YELLOW_( % s), bytes_read, fileName);
+    PrintAndLogDevice(SUCCESS, "loaded %d bytes from binary file " _YELLOW_("%s"), bytes_read, fileName);
 
     *datalen = bytes_read;
 
@@ -332,7 +332,7 @@ int loadFileEML(const char *preferredName, const char *suffix, void *data, size_
 
     FILE *f = fopen(fileName, "r");
     if (!f) {
-        PrintAndLogDevice(WARNING, "file not found or locked. '" _YELLOW_( % s)"'", fileName);
+        PrintAndLogDevice(WARNING, "file not found or locked. '" _YELLOW_("%s")"'", fileName);
         retval = 1;
         goto out;
     }
@@ -363,7 +363,7 @@ int loadFileEML(const char *preferredName, const char *suffix, void *data, size_
         }
     }
     fclose(f);
-    PrintAndLogDevice(SUCCESS, "loaded %d bytes from text file " _YELLOW_( % s), counter, fileName);
+    PrintAndLogDevice(SUCCESS, "loaded %d bytes from text file " _YELLOW_("%s"), counter, fileName);
 
     if (datalen)
         *datalen = counter;
@@ -391,13 +391,13 @@ int loadFileJSON(const char *preferredName, const char *suffix, void *data, size
 
     root = json_load_file(fileName, 0, &error);
     if (!root) {
-        PrintAndLog("ERROR: json " _YELLOW_( % s) " error on line %d: %s", fileName, error.line, error.text);
+        PrintAndLog("ERROR: json " _YELLOW_("%s") " error on line %d: %s", fileName, error.line, error.text);
         retval = 2;
         goto out;
     }
 
     if (!json_is_object(root)) {
-        PrintAndLog("ERROR: Invalid json " _YELLOW_( % s) " format. root must be an object.", fileName);
+        PrintAndLog("ERROR: Invalid json " _YELLOW_("%s") " format. root must be an object.", fileName);
         retval = 3;
         goto out;
     }
@@ -455,7 +455,7 @@ int loadFileJSON(const char *preferredName, const char *suffix, void *data, size
     }
 
 
-    PrintAndLog("loaded from JSON file " _YELLOW_( % s), fileName);
+    PrintAndLog("loaded from JSON file " _YELLOW_("%s"), fileName);
 out:
     json_decref(root);
     free(fileName);
@@ -490,7 +490,7 @@ int loadFileDICTIONARY(const char *preferredName, const char *suffix, void *data
 
     FILE *f = fopen(fileName, "r");
     if (!f) {
-        PrintAndLogDevice(WARNING, "file not found or locked. '" _YELLOW_( % s)"'", fileName);
+        PrintAndLogDevice(WARNING, "file not found or locked. '" _YELLOW_("%s")"'", fileName);
         retval = 1;
         goto out;
     }
@@ -511,7 +511,7 @@ int loadFileDICTIONARY(const char *preferredName, const char *suffix, void *data
             continue;
 
         if (!isxdigit(line[0])) {
-            PrintAndLogEx(FAILED, "file content error. '%s' must include " _BLUE_( % 2d) "HEX symbols", line, keylen);
+            PrintAndLogEx(FAILED, "file content error. '%s' must include " _BLUE_("%2d") "HEX symbols", line, keylen);
             continue;
         }
 
@@ -523,7 +523,7 @@ int loadFileDICTIONARY(const char *preferredName, const char *suffix, void *data
         counter += (keylen >> 1);
     }
     fclose(f);
-    PrintAndLogDevice(SUCCESS, "loaded " _GREEN_( % 2d) "keys from dictionary file " _YELLOW_( % s), *keycnt, fileName);
+    PrintAndLogDevice(SUCCESS, "loaded " _GREEN_("%2d") "keys from dictionary file " _YELLOW_("%s"), *keycnt, fileName);
 
     if (datalen)
         *datalen = counter;
diff --git a/client/mifare/mifarehost.c b/client/mifare/mifarehost.c
index 080ecbe77..3cdad9ca5 100644
--- a/client/mifare/mifarehost.c
+++ b/client/mifare/mifarehost.c
@@ -1017,10 +1017,10 @@ int detect_classic_nackbug(bool verbose)
                     return 2;
                 }
                 case  2 :
-                    PrintAndLogEx(SUCCESS, _GREEN_(always leak NACK detected));
+                    PrintAndLogEx(SUCCESS, _GREEN_("always leak NACK detected"));
                     return 3;
                 case  1 :
-                    PrintAndLogEx(SUCCESS, _GREEN_(NACK bug detected));
+                    PrintAndLogEx(SUCCESS, _GREEN_("NACK bug detected"));
                     return 1;
                 case  0 :
                     PrintAndLogEx(SUCCESS, "No NACK bug detected");
@@ -1048,14 +1048,14 @@ void detect_classic_magic(void)
 
     switch (isGeneration) {
         case 1:
-            PrintAndLogEx(SUCCESS, "Answers to magic commands (GEN 1a): " _GREEN_(YES));
+            PrintAndLogEx(SUCCESS, "Answers to magic commands (GEN 1a): " _GREEN_("YES"));
             break;
         case 2:
-            PrintAndLogEx(SUCCESS, "Answers to magic commands (GEN 1b): " _GREEN_(YES));
+            PrintAndLogEx(SUCCESS, "Answers to magic commands (GEN 1b): " _GREEN_("YES"));
             break;
-        //case 4: PrintAndLogEx(SUCCESS, "Answers to magic commands (GEN 2): "  _GREEN_(YES)); break;
+        //case 4: PrintAndLogEx(SUCCESS, "Answers to magic commands (GEN 2): "  _GREEN_("YES")); break;
         default:
-            PrintAndLogEx(INFO, "Answers to magic commands: " _YELLOW_(NO));
+            PrintAndLogEx(INFO, "Answers to magic commands: " _YELLOW_("NO"));
             break;
     }
-}
\ No newline at end of file
+}
diff --git a/client/ui.c b/client/ui.c
index 022c03a4a..79e4140db 100644
--- a/client/ui.c
+++ b/client/ui.c
@@ -61,19 +61,19 @@ void PrintAndLogEx(logLevel_t level, char *fmt, ...)
 
     switch (level) {
         case ERR:
-            strncpy(prefix, _RED_([!!]), sizeof(prefix) - 1);
+            strncpy(prefix, _RED_("[!!]"), sizeof(prefix) - 1);
             break;
         case FAILED:
-            strncpy(prefix, _RED_([-]), sizeof(prefix) - 1);
+            strncpy(prefix, _RED_("[-]"), sizeof(prefix) - 1);
             break;
         case DEBUG:
-            strncpy(prefix, _BLUE_([#]), sizeof(prefix) - 1);
+            strncpy(prefix, _BLUE_("[#]"), sizeof(prefix) - 1);
             break;
         case SUCCESS:
-            strncpy(prefix, _GREEN_([+]), sizeof(prefix) - 1);
+            strncpy(prefix, _GREEN_("[+]"), sizeof(prefix) - 1);
             break;
         case WARNING:
-            strncpy(prefix, _CYAN_([!]), sizeof(prefix) - 1);
+            strncpy(prefix, _CYAN_("[!]"), sizeof(prefix) - 1);
             break;
         default:
             strncpy(prefix, prefixes[level], sizeof(prefix) - 1);
diff --git a/client/util.h b/client/util.h
index 0edeae5f0..9c68900e7 100644
--- a/client/util.h
+++ b/client/util.h
@@ -137,39 +137,39 @@
 #endif
 
 #if defined(__linux__) || (__APPLE__)
-# define _BLUE_(s) "\x1b[34m" #s "\x1b[0m "
+# define _BLUE_(s) "\x1b[34m" s "\x1b[0m "
 #else
-# define _BLUE_(s) #s " "
+# define _BLUE_(s) s " "
 #endif
 
 #if defined(__linux__) || (__APPLE__)
-# define _RED_(s) "\x1b[31m" #s "\x1b[0m "
+# define _RED_(s) "\x1b[31m" s "\x1b[0m "
 #else
-# define _RED_(s) #s " "
+# define _RED_(s) s " "
 #endif
 
 #if defined(__linux__) || (__APPLE__)
-# define _GREEN_(s) "\x1b[32m" #s "\x1b[0m "
+# define _GREEN_(s) "\x1b[32m" s "\x1b[0m "
 #else
-# define _GREEN_(s) #s " "
+# define _GREEN_(s) s " "
 #endif
 
 #if defined(__linux__) || (__APPLE__)
-# define _YELLOW_(s) "\x1b[33m" #s "\x1b[0m "
+# define _YELLOW_(s) "\x1b[33m" s "\x1b[0m "
 #else
-# define _YELLOW_(s) #s " "
+# define _YELLOW_(s) s " "
 #endif
 
 #if defined(__linux__) || (__APPLE__)
-# define _MAGENTA_(s) "\x1b[35m" #s "\x1b[0m "
+# define _MAGENTA_(s) "\x1b[35m" s "\x1b[0m "
 #else
-# define _MAGENTA_(s) #s " "
+# define _MAGENTA_(s) s " "
 #endif
 
 #if defined(__linux__) || (__APPLE__)
-# define _CYAN_(s) "\x1b[36m" #s "\x1b[0m "
+# define _CYAN_(s) "\x1b[36m" s "\x1b[0m "
 #else
-# define _CYAN_(s) #s " "
+# define _CYAN_(s) s " "
 #endif
 
 #ifndef DropField

From 961d929f4d114b8eabbf49f308a777be5b146179 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 10 Mar 2019 11:20:22 +0100
Subject: [PATCH 0720/1938] changing {} style to match majority of previous
 style

---
 Makefile                                      |   2 +-
 armsrc/BigBuf.c                               |  57 +--
 armsrc/LCD.c                                  |  21 +-
 armsrc/Standalone/hf_bog.c                    |  12 +-
 armsrc/Standalone/hf_colin.c                  |  33 +-
 armsrc/Standalone/hf_mattyrun.c               |   9 +-
 armsrc/Standalone/hf_young.c                  |   3 +-
 armsrc/Standalone/lf_hidbrute.c               |   6 +-
 armsrc/Standalone/lf_proxbrute.c              |   3 +-
 armsrc/Standalone/lf_samyrun.c                |   3 +-
 armsrc/aes.c                                  |  24 +-
 armsrc/appmain.c                              |  69 +--
 armsrc/buzzer.c                               |  15 +-
 armsrc/des.c                                  |  39 +-
 armsrc/desfire_crypto.c                       |  36 +-
 armsrc/desfire_key.c                          |  36 +-
 armsrc/epa.c                                  |  60 ++-
 armsrc/felica.c                               |  45 +-
 armsrc/flashmem.c                             |  69 +--
 armsrc/fpgaloader.c                           |  57 +--
 armsrc/hfsnoop.c                              |   6 +-
 armsrc/hitag2.c                               |  76 ++--
 armsrc/hitagS.c                               |  54 +--
 armsrc/iclass.c                               | 117 ++----
 armsrc/iso14443a.c                            | 196 ++++-----
 armsrc/iso14443b.c                            |  86 ++--
 armsrc/iso15693.c                             |  54 +--
 armsrc/legicrf.c                              |  48 +--
 armsrc/legicrfsim.c                           |  36 +-
 armsrc/lfops.c                                | 156 +++----
 armsrc/lfsampling.c                           |  45 +-
 armsrc/mifarecmd.c                            |  96 ++---
 armsrc/mifaredesfire.c                        |  24 +-
 armsrc/mifaresniff.c                          |  12 +-
 armsrc/mifareutil.c                           | 109 ++---
 armsrc/optimized_cipher.c                     |  30 +-
 armsrc/pcf7931.c                              |  30 +-
 armsrc/printf.c                               |  14 +-
 armsrc/start.c                                |  12 +-
 armsrc/string.c                               |  27 +-
 armsrc/ticks.c                                |  45 +-
 armsrc/util.c                                 |  57 +--
 armsrc/vtsend.c                               |  54 +--
 bootrom/bootrom.c                             |  22 +-
 client/amiitool/amiibo.c                      |  27 +-
 client/amiitool/amiitool.c                    |   9 +-
 client/amiitool/drbg.c                        |  12 +-
 client/amiitool/keygen.c                      |   6 +-
 client/cli.c                                  |   3 +-
 client/cliparser/argtable3.c                  | 393 +++++++-----------
 client/cliparser/cliparser.c                  |  21 +-
 client/cmdanalyse.c                           |  99 ++---
 client/cmdcrc.c                               |  21 +-
 client/cmddata.c                              | 270 ++++--------
 client/cmdflashmem.c                          |  42 +-
 client/cmdhf.c                                |  21 +-
 client/cmdhf14a.c                             |  78 ++--
 client/cmdhf14b.c                             | 118 ++----
 client/cmdhf15.c                              | 106 ++---
 client/cmdhfepa.c                             |  12 +-
 client/cmdhffelica.c                          |  55 +--
 client/cmdhffido.c                            |  32 +-
 client/cmdhficlass.c                          | 201 +++------
 client/cmdhflegic.c                           |  93 ++---
 client/cmdhflist.c                            |  66 +--
 client/cmdhfmf.c                              | 228 ++++------
 client/cmdhfmfdes.c                           |  33 +-
 client/cmdhfmfdesfire.c                       |  12 +-
 client/cmdhfmfhard.c                          | 233 ++++-------
 client/cmdhfmfp.c                             |  36 +-
 client/cmdhfmfu.c                             | 198 +++------
 client/cmdhftopaz.c                           |  72 ++--
 client/cmdhw.c                                |  45 +-
 client/cmdlf.c                                |  75 ++--
 client/cmdlfawid.c                            |  48 +--
 client/cmdlfcotag.c                           |  15 +-
 client/cmdlfem4x.c                            | 156 +++----
 client/cmdlffdx.c                             |  36 +-
 client/cmdlfguard.c                           |  30 +-
 client/cmdlfhid.c                             |  66 +--
 client/cmdlfhitag.c                           |  30 +-
 client/cmdlfindala.c                          |  36 +-
 client/cmdlfio.c                              |  33 +-
 client/cmdlfjablotron.c                       |  36 +-
 client/cmdlfkeri.c                            |  27 +-
 client/cmdlfnedap.c                           |  30 +-
 client/cmdlfnexwatch.c                        |  15 +-
 client/cmdlfnoralsy.c                         |  33 +-
 client/cmdlfpac.c                             |  15 +-
 client/cmdlfparadox.c                         |  21 +-
 client/cmdlfpcf7931.c                         |  30 +-
 client/cmdlfpresco.c                          |  33 +-
 client/cmdlfpyramid.c                         |  30 +-
 client/cmdlfsecurakey.c                       |  15 +-
 client/cmdlft55xx.c                           | 225 ++++------
 client/cmdlfti.c                              |  15 +-
 client/cmdlfviking.c                          |  30 +-
 client/cmdlfvisa2000.c                        |  33 +-
 client/cmdmain.c                              |  18 +-
 client/cmdparser.c                            |   9 +-
 client/cmdscript.c                            |  18 +-
 client/cmdsmartcard.c                         |  87 ++--
 client/cmdtrace.c                             |  47 +--
 client/comms.c                                |  45 +-
 client/crypto/asn1dump.c                      |  36 +-
 client/crypto/asn1utils.c                     |   9 +-
 client/crypto/libpcrypto.c                    |  48 +--
 client/emv/apduinfo.c                         |   9 +-
 client/emv/cmdemv.c                           |  60 +--
 client/emv/crypto.c                           |  45 +-
 client/emv/crypto_polarssl.c                  |  54 +--
 client/emv/dol.c                              |   9 +-
 client/emv/dump.c                             |   6 +-
 client/emv/emv_pk.c                           |  42 +-
 client/emv/emv_pki.c                          |  56 +--
 client/emv/emv_pki_priv.c                     |  24 +-
 client/emv/emv_roca.c                         |  21 +-
 client/emv/emv_tags.c                         |  48 +--
 client/emv/emvcore.c                          |  87 ++--
 client/emv/emvjson.c                          |  45 +-
 client/emv/test/cda_test.c                    |  12 +-
 client/emv/test/crypto_test.c                 |   9 +-
 client/emv/test/cryptotest.c                  |   3 +-
 client/emv/test/dda_test.c                    |  12 +-
 client/emv/test/sda_test.c                    |  12 +-
 client/emv/tlv.c                              |  93 ++---
 client/fido/cbortools.c                       |  48 +--
 client/fido/cose.c                            |  24 +-
 client/fido/fidocore.c                        |  52 +--
 client/flash.c                                |  37 +-
 client/flasher.c                              |   9 +-
 client/fpga_compress.c                        |  33 +-
 client/graph.c                                |  36 +-
 client/guidummy.cpp                           |   3 +-
 client/hardnested/hardnested_bf_core.c        |  36 +-
 client/hardnested/hardnested_bitarray_core.c  | 117 ++----
 client/hardnested/hardnested_bruteforce.c     |  32 +-
 client/hardnested/hardnested_tables.c         |  45 +-
 client/hid-flasher/flash.c                    |  37 +-
 client/hid-flasher/flasher.c                  |   6 +-
 client/hid-flasher/proxendian.h               |   6 +-
 client/hid-flasher/proxusb.c                  |  18 +-
 client/jansson/dump.c                         |  57 +--
 client/jansson/error.c                        |  12 +-
 client/jansson/hashtable.c                    |  63 +--
 client/jansson/hashtable_seed.c               |  27 +-
 client/jansson/jansson.h                      |  49 +--
 client/jansson/load.c                         |  98 ++---
 client/jansson/lookup3.h                      |   3 +-
 client/jansson/memory.c                       |  18 +-
 client/jansson/pack_unpack.c                  |  63 +--
 client/jansson/path.c                         |   6 +-
 client/jansson/strbuffer.c                    |  28 +-
 client/jansson/strconv.c                      |  14 +-
 client/jansson/utf.c                          |  15 +-
 client/jansson/value.c                        | 225 ++++------
 client/loclass/cipher.c                       |  33 +-
 client/loclass/cipherutils.c                  |  51 +--
 client/loclass/elite_crack.c                  |  60 +--
 client/loclass/fileutils.c                    |  24 +-
 client/loclass/hash1_brute.c                  |   6 +-
 client/loclass/ikeys.c                        |  63 +--
 client/loclass/main.c                         |   9 +-
 client/mifare/mad.c                           |  21 +-
 client/mifare/mfkey.c                         |  18 +-
 client/mifare/mifare4.c                       |  54 +--
 client/mifare/mifarehost.c                    |  78 ++--
 client/mifare/ndef.c                          |  24 +-
 client/pm3_binlib.c                           |  21 +-
 client/pm3_bitlib.c                           |   6 +-
 client/proxendian.h                           |   6 +-
 client/proxgui.cpp                            |  27 +-
 client/proxguiqt.cpp                          | 108 ++---
 client/proxguiqt.h                            |  38 +-
 client/proxmark3.c                            |  24 +-
 client/reveng/bmpbit.c                        |   6 +-
 client/reveng/cli.c                           |  21 +-
 client/reveng/getopt.c                        |   3 +-
 client/reveng/model.c                         |  24 +-
 client/reveng/poly.c                          | 116 ++----
 client/reveng/preset.c                        |  22 +-
 client/reveng/reveng.c                        |  18 +-
 client/scandir.c                              |   6 +-
 client/scripting.c                            |  84 ++--
 client/snooper.c                              |   3 +-
 client/tinycbor/cbor.h                        |  63 +--
 client/tinycbor/cborencoder.c                 |  75 ++--
 .../cborencoder_close_container_checked.c     |   3 +-
 client/tinycbor/cborerrorstrings.c            |   3 +-
 client/tinycbor/cborinternal_p.h              |  12 +-
 client/tinycbor/cborjson.h                    |   3 +-
 client/tinycbor/cborparser.c                  | 102 ++---
 client/tinycbor/cborparser_dup_string.c       |   3 +-
 client/tinycbor/cborpretty.c                  |  29 +-
 client/tinycbor/cborpretty_stdio.c            |   9 +-
 client/tinycbor/cbortojson.c                  |  46 +-
 client/tinycbor/cborvalidation.c              |  24 +-
 client/tinycbor/compilersupport_p.h           |   3 +-
 client/tinycbor/open_memstream.c              |   9 +-
 client/tinycbor/utf8_p.h                      |   3 +-
 client/ui.c                                   |  24 +-
 client/util.c                                 | 189 +++------
 client/util_posix.c                           |  15 +-
 client/whereami.c                             |  38 +-
 common/bucketsort.c                           |   3 +-
 common/cmd.c                                  |   3 +-
 common/crapto1/crapto1.c                      |  45 +-
 common/crapto1/crapto1.h                      |   3 +-
 common/crapto1/crypto1.c                      |  27 +-
 common/crc.c                                  |  30 +-
 common/crc16.c                                |  51 +--
 common/crc32.c                                |   9 +-
 common/crc64.c                                |   3 +-
 common/i2c.c                                  |  99 ++---
 common/iso14443crc.c                          |   9 +-
 common/iso15693tools.c                        |   3 +-
 common/legic_prng.c                           |  15 +-
 common/lfdemod.c                              | 166 +++-----
 common/mbedtls/aes.c                          |  69 +--
 common/mbedtls/arc4.c                         |  15 +-
 common/mbedtls/asn1parse.c                    |  41 +-
 common/mbedtls/asn1write.c                    |  42 +-
 common/mbedtls/base64.c                       |  15 +-
 common/mbedtls/bignum.c                       | 184 +++-----
 common/mbedtls/blowfish.c                     |  32 +-
 common/mbedtls/camellia.c                     |  30 +-
 common/mbedtls/cipher.c                       | 135 +++---
 common/mbedtls/cipher.h                       |  21 +-
 common/mbedtls/cipher_wrap.c                  | 228 ++++------
 common/mbedtls/cmac.c                         |  52 +--
 common/mbedtls/ctr_drbg.c                     |  55 +--
 common/mbedtls/des.c                          |  75 ++--
 common/mbedtls/ecdsa.c                        |  44 +-
 common/mbedtls/ecp.c                          | 214 ++++------
 common/mbedtls/ecp_curves.c                   |  66 +--
 common/mbedtls/entropy.c                      |  52 +--
 common/mbedtls/entropy_poll.c                 |  24 +-
 common/mbedtls/error.c                        |   6 +-
 common/mbedtls/md.c                           |  70 ++--
 common/mbedtls/md5.c                          |  42 +-
 common/mbedtls/md_wrap.c                      | 165 +++-----
 common/mbedtls/oid.c                          |   5 +-
 common/mbedtls/pem.c                          |  29 +-
 common/mbedtls/pk.c                           |  59 +--
 common/mbedtls/pk.h                           |   9 +-
 common/mbedtls/pk_wrap.c                      |  93 ++---
 common/mbedtls/pkcs12.c                       |  18 +-
 common/mbedtls/pkcs5.c                        |  22 +-
 common/mbedtls/pkparse.c                      | 144 +++----
 common/mbedtls/pkwrite.c                      |  44 +-
 common/mbedtls/platform.c                     |  69 +--
 common/mbedtls/platform_util.c                |   3 +-
 common/mbedtls/rsa.c                          | 179 ++++----
 common/mbedtls/rsa_internal.c                 |  47 +--
 common/mbedtls/sha1.c                         |  42 +-
 common/mbedtls/sha256.c                       |  42 +-
 common/mbedtls/sha512.c                       |  42 +-
 common/mbedtls/threading.c                    |  24 +-
 common/mbedtls/timing.c                       |  62 +--
 common/mbedtls/x509.c                         | 117 ++----
 common/mbedtls/x509_crl.c                     |  46 +-
 common/mbedtls/x509_crt.c                     | 204 ++++-----
 common/parity.h                               |  12 +-
 common/prng.c                                 |  12 +-
 common/protocols.c                            |  24 +-
 common/radixsort.c                            |   3 +-
 common/random.c                               |   9 +-
 common/tea.c                                  |   6 +-
 common/usart.c                                |   9 +-
 common/usb_cdc.c                              |  51 +--
 common/wiegand.c                              |  18 +-
 liblua/lapi.c                                 | 252 ++++-------
 liblua/lauxlib.c                              | 188 +++------
 liblua/lbaselib.c                             |  90 ++--
 liblua/lbitlib.c                              |  51 +--
 liblua/lcode.c                                | 182 +++-----
 liblua/lcorolib.c                             |  27 +-
 liblua/ldblib.c                               |  85 ++--
 liblua/ldebug.c                               |  87 ++--
 liblua/ldo.c                                  |  85 ++--
 liblua/ldump.c                                |  36 +-
 liblua/lfunc.c                                |  30 +-
 liblua/lgc.c                                  | 160 +++----
 liblua/linit.c                                |   3 +-
 liblua/liolib.c                               | 123 ++----
 liblua/llex.c                                 |  66 +--
 liblua/lmathlib.c                             |  87 ++--
 liblua/lmem.c                                 |   9 +-
 liblua/loadlib.c                              | 118 ++----
 liblua/lobject.c                              |  39 +-
 liblua/loslib.c                               |  51 +--
 liblua/lparser.c                              | 265 ++++--------
 liblua/lstate.c                               |  42 +-
 liblua/lstring.c                              |  38 +-
 liblua/lstrlib.c                              | 134 ++----
 liblua/ltable.c                               |  82 ++--
 liblua/ltablib.c                              |  36 +-
 liblua/ltm.c                                  |   9 +-
 liblua/lua.c                                  |  72 ++--
 liblua/luac.c                                 |  45 +-
 liblua/lundump.c                              |  42 +-
 liblua/lvm.c                                  |  86 ++--
 liblua/lzio.c                                 |  12 +-
 tools/mfkey/crapto1.c                         |  45 +-
 tools/mfkey/crapto1.h                         |   6 +-
 tools/mfkey/crypto1.c                         |  21 +-
 tools/mfkey/mfkey32.c                         |   3 +-
 tools/mfkey/mfkey32v2.c                       |   3 +-
 tools/mfkey/mfkey64.c                         |   3 +-
 tools/nonce2key/crapto1.c                     |  45 +-
 tools/nonce2key/crapto1.h                     |   6 +-
 tools/nonce2key/crypto1.c                     |  21 +-
 tools/nonce2key/nonce2key.c                   |   3 +-
 uart/uart_posix.c                             |  18 +-
 uart/uart_win32.c                             |  18 +-
 zlib/deflate.c                                |  46 +-
 zlib/inflate.c                                |  27 +-
 zlib/inftrees.c                               |   7 +-
 zlib/trees.c                                  |  10 +-
 zlib/zutil.c                                  |  18 +-
 320 files changed, 5502 insertions(+), 10485 deletions(-)

diff --git a/Makefile b/Makefile
index fa3bcf3bc..ba73cff56 100644
--- a/Makefile
+++ b/Makefile
@@ -93,7 +93,7 @@ style:
 	find . \( -name "*.[ch]" -or -name "*.cpp" \) -exec astyle --formatted --mode=c --suffix=none \
 	    --indent=spaces=4 --indent-switches --indent-preprocessor \
 	    --keep-one-line-blocks --max-instatement-indent=60 \
-	    --style=linux --pad-oper --unpad-paren --pad-header \
+	    --style=google --pad-oper --unpad-paren --pad-header \
 	    --align-pointer=name {} \;
 
 # Dummy target to test for GNU make availability
diff --git a/armsrc/BigBuf.c b/armsrc/BigBuf.c
index fcbf898ab..ab45a2681 100644
--- a/armsrc/BigBuf.c
+++ b/armsrc/BigBuf.c
@@ -34,14 +34,12 @@ static uint32_t traceLen = 0;
 static bool tracing = true; //todo static?
 
 // get the address of BigBuf
-uint8_t *BigBuf_get_addr(void)
-{
+uint8_t *BigBuf_get_addr(void) {
     return (uint8_t *)BigBuf;
 }
 
 // get the address of the emulator memory. Allocate part of Bigbuf for it, if not yet done
-uint8_t *BigBuf_get_EM_addr(void)
-{
+uint8_t *BigBuf_get_EM_addr(void) {
     // not yet allocated
     if (emulator_memory == NULL)
         emulator_memory = BigBuf_malloc(CARD_MEMORY_SIZE);
@@ -50,33 +48,28 @@ uint8_t *BigBuf_get_EM_addr(void)
 }
 
 // clear ALL of BigBuf
-void BigBuf_Clear(void)
-{
+void BigBuf_Clear(void) {
     BigBuf_Clear_ext(true);
 }
 
 // clear ALL of BigBuf
-void BigBuf_Clear_ext(bool verbose)
-{
+void BigBuf_Clear_ext(bool verbose) {
     memset(BigBuf, 0, BIGBUF_SIZE);
     if (verbose)
         Dbprintf("Buffer cleared (%i bytes)", BIGBUF_SIZE);
 }
 
-void BigBuf_Clear_EM(void)
-{
+void BigBuf_Clear_EM(void) {
     memset(BigBuf_get_EM_addr(), 0, CARD_MEMORY_SIZE);
 }
 
-void BigBuf_Clear_keep_EM(void)
-{
+void BigBuf_Clear_keep_EM(void) {
     memset(BigBuf, 0, BigBuf_hi);
 }
 
 // allocate a chunk of memory from BigBuf. We allocate high memory first. The unallocated memory
 // at the beginning of BigBuf is always for traces/samples
-uint8_t *BigBuf_malloc(uint16_t chunksize)
-{
+uint8_t *BigBuf_malloc(uint16_t chunksize) {
     if (BigBuf_hi - chunksize < 0)
         return NULL; // no memory left
 
@@ -86,16 +79,14 @@ uint8_t *BigBuf_malloc(uint16_t chunksize)
 }
 
 // free ALL allocated chunks. The whole BigBuf is available for traces or samples again.
-void BigBuf_free(void)
-{
+void BigBuf_free(void) {
     BigBuf_hi = BIGBUF_SIZE;
     emulator_memory = NULL;
     // shouldn't this empty BigBuf also?
 }
 
 // free allocated chunks EXCEPT the emulator memory
-void BigBuf_free_keep_EM(void)
-{
+void BigBuf_free_keep_EM(void) {
     if (emulator_memory != NULL)
         BigBuf_hi = emulator_memory - (uint8_t *)BigBuf;
     else
@@ -104,8 +95,7 @@ void BigBuf_free_keep_EM(void)
     // shouldn't this empty BigBuf also?
 }
 
-void BigBuf_print_status(void)
-{
+void BigBuf_print_status(void) {
     Dbprintf("Memory");
     Dbprintf("  BIGBUF_SIZE.............%d", BIGBUF_SIZE);
     Dbprintf("  Available memory........%d", BigBuf_hi);
@@ -115,26 +105,21 @@ void BigBuf_print_status(void)
 }
 
 // return the maximum trace length (i.e. the unallocated size of BigBuf)
-uint16_t BigBuf_max_traceLen(void)
-{
+uint16_t BigBuf_max_traceLen(void) {
     return BigBuf_hi;
 }
 
-void clear_trace(void)
-{
+void clear_trace(void) {
     traceLen = 0;
 }
-void set_tracelen(uint32_t value)
-{
+void set_tracelen(uint32_t value) {
     traceLen = value;
 }
-void set_tracing(bool enable)
-{
+void set_tracing(bool enable) {
     tracing = enable;
 }
 
-bool get_tracing(void)
-{
+bool get_tracing(void) {
     return tracing;
 }
 
@@ -142,8 +127,7 @@ bool get_tracing(void)
  * Get the number of bytes traced
  * @return
  */
-uint32_t BigBuf_get_traceLen(void)
-{
+uint32_t BigBuf_get_traceLen(void) {
     return traceLen;
 }
 
@@ -153,8 +137,7 @@ uint32_t BigBuf_get_traceLen(void)
   by 'hf list raw', alternatively 'hf list <proto>' for protocol-specific
   annotation of commands/responses.
 **/
-bool RAMFUNC LogTrace(const uint8_t *btBytes, uint16_t iLen, uint32_t timestamp_start, uint32_t timestamp_end, uint8_t *parity, bool readerToTag)
-{
+bool RAMFUNC LogTrace(const uint8_t *btBytes, uint16_t iLen, uint32_t timestamp_start, uint32_t timestamp_end, uint8_t *parity, bool readerToTag) {
     if (!tracing) return false;
 
     uint8_t *trace = BigBuf_get_addr();
@@ -212,8 +195,7 @@ bool RAMFUNC LogTrace(const uint8_t *btBytes, uint16_t iLen, uint32_t timestamp_
     return true;
 }
 
-int LogTraceHitag(const uint8_t *btBytes, int iBits, int iSamples, uint32_t dwParity, int readerToTag)
-{
+int LogTraceHitag(const uint8_t *btBytes, int iBits, int iSamples, uint32_t dwParity, int readerToTag) {
     /**
       Todo, rewrite the logger to use the generic functionality instead. It should be noted, however,
       that this logger takes number of bits as argument, not number of bytes.
@@ -255,8 +237,7 @@ int LogTraceHitag(const uint8_t *btBytes, int iBits, int iSamples, uint32_t dwPa
 }
 
 // Emulator memory
-uint8_t emlSet(uint8_t *data, uint32_t offset, uint32_t length)
-{
+uint8_t emlSet(uint8_t *data, uint32_t offset, uint32_t length) {
     uint8_t *mem = BigBuf_get_EM_addr();
     if (offset + length < CARD_MEMORY_SIZE) {
         memcpy(mem + offset, data, length);
diff --git a/armsrc/LCD.c b/armsrc/LCD.c
index 05c09964b..32a917928 100644
--- a/armsrc/LCD.c
+++ b/armsrc/LCD.c
@@ -7,8 +7,7 @@
 //-----------------------------------------------------------------------------
 #include "LCD.h"
 
-void LCDSend(unsigned int data)
-{
+void LCDSend(unsigned int data) {
     // 9th bit set for data, clear for command
     while ((AT91C_BASE_SPI->SPI_SR & AT91C_SPI_TXEMPTY) == 0);    // wait for the transfer to complete
     // For clarity's sake we pass data with 9th bit clear and commands with 9th
@@ -16,8 +15,7 @@ void LCDSend(unsigned int data)
     AT91C_BASE_SPI->SPI_TDR = data ^ 0x100;                       // Send the data/command
 }
 
-void LCDSetXY(unsigned char x, unsigned char y)
-{
+void LCDSetXY(unsigned char x, unsigned char y) {
     LCDSend(PPASET);            // page start/end ram
     LCDSend(y);                 // Start Page to display to
     LCDSend(131);               // End Page to display to
@@ -27,15 +25,13 @@ void LCDSetXY(unsigned char x, unsigned char y)
     LCDSend(131);               // End Column to display to
 }
 
-void LCDSetPixel(unsigned char x, unsigned char y, unsigned char color)
-{
+void LCDSetPixel(unsigned char x, unsigned char y, unsigned char color) {
     LCDSetXY(x, y);             // Set position
     LCDSend(PRAMWR);            // Now write the pixel to the display
     LCDSend(color);             // Write the data in the specified Color
 }
 
-void LCDFill(unsigned char xs, unsigned char ys, unsigned char width, unsigned char height, unsigned char color)
-{
+void LCDFill(unsigned char xs, unsigned char ys, unsigned char width, unsigned char height, unsigned char color) {
     unsigned char i, j;
 
     for (i = 0; i < height; i++) { // Number of horizontal lines
@@ -47,8 +43,7 @@ void LCDFill(unsigned char xs, unsigned char ys, unsigned char width, unsigned c
     }
 }
 
-void LCDString(char *lcd_string, const char *font_style, unsigned char x, unsigned char y, unsigned char fcolor, unsigned char bcolor)
-{
+void LCDString(char *lcd_string, const char *font_style, unsigned char x, unsigned char y, unsigned char fcolor, unsigned char bcolor) {
     unsigned int  i;
     unsigned char mask = 0, px, py, xme, yme, offset;
     const char *data;
@@ -85,8 +80,7 @@ void LCDString(char *lcd_string, const char *font_style, unsigned char x, unsign
     } while (*lcd_string != '\0');          // keep spitting chars out until end of string
 }
 
-void LCDReset(void)
-{
+void LCDReset(void) {
     LED_A_ON();
     SetupSpi(SPI_LCD_MODE);
     LOW(GPIO_LRST);
@@ -97,8 +91,7 @@ void LCDReset(void)
     LED_A_OFF();
 }
 
-void LCDInit(void)
-{
+void LCDInit(void) {
     int i;
 
     LCDReset();
diff --git a/armsrc/Standalone/hf_bog.c b/armsrc/Standalone/hf_bog.c
index a1197bdbe..40f3abba9 100644
--- a/armsrc/Standalone/hf_bog.c
+++ b/armsrc/Standalone/hf_bog.c
@@ -27,8 +27,7 @@ from the client to view the stored quadlets.
 // Maximum number of auth attempts per standalone session
 #define MAX_PWDS_PER_SESSION 64
 
-uint8_t FindOffsetInFlash()
-{
+uint8_t FindOffsetInFlash() {
     uint8_t mem[4] = { 0x00, 0x00, 0x00, 0x00 };
     uint8_t eom[4] = { 0xFF, 0xFF, 0xFF, 0xFF };
     uint8_t memcnt = 0;
@@ -44,8 +43,7 @@ uint8_t FindOffsetInFlash()
     return 0; // wrap-around
 }
 
-void EraseMemory()
-{
+void EraseMemory() {
     if (!FlashInit()) {
         return;
     }
@@ -60,8 +58,7 @@ void EraseMemory()
 }
 
 // This is actually copied from SniffIso14443a
-void RAMFUNC SniffAndStore(uint8_t param)
-{
+void RAMFUNC SniffAndStore(uint8_t param) {
 
     iso14443a_setup(FPGA_HF_ISO14443A_SNIFFER);
 
@@ -284,8 +281,7 @@ void RAMFUNC SniffAndStore(uint8_t param)
     }
 }
 
-void RunMod()
-{
+void RunMod() {
 
     StandAloneMode();
 
diff --git a/armsrc/Standalone/hf_colin.c b/armsrc/Standalone/hf_colin.c
index 335269c71..97ee329de 100644
--- a/armsrc/Standalone/hf_colin.c
+++ b/armsrc/Standalone/hf_colin.c
@@ -59,36 +59,31 @@ void cjPrintBigArray(const char *bigar, int len, uint8_t newlines, uint8_t debug
 }
 */
 
-void cjSetCursFRight()
-{
+void cjSetCursFRight() {
     vtsend_cursor_position(NULL, 98, (currfline));
     currfline++;
 }
 
-void cjSetCursRight()
-{
+void cjSetCursRight() {
     vtsend_cursor_position(NULL, 59, (currline));
     currline++;
 }
 
-void cjSetCursLeft()
-{
+void cjSetCursLeft() {
     vtsend_cursor_position(NULL, 0, (curlline));
     curlline++;
 }
 
 void cjTabulize() { DbprintfEx(FLAG_RAWPRINT, "\t\t\t"); }
 
-void cjPrintKey(uint64_t key, uint8_t *foundKey, uint16_t sectorNo, uint8_t type)
-{
+void cjPrintKey(uint64_t key, uint8_t *foundKey, uint16_t sectorNo, uint8_t type) {
     char tosendkey[13];
     sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[0], foundKey[1], foundKey[2], foundKey[3], foundKey[4], foundKey[5]);
     cjSetCursRight();
     DbprintfEx(FLAG_NOLOG, "SEC: %02x | KEY : %s | TYP: %d", sectorNo, tosendkey, type);
 }
 
-void ReadLastTagFromFlash()
-{
+void ReadLastTagFromFlash() {
     SpinOff(0);
     LED_A_ON();
     LED_B_ON();
@@ -135,8 +130,7 @@ void ReadLastTagFromFlash()
     return;
 }
 
-void WriteTagToFlash(uint8_t index, size_t size)
-{
+void WriteTagToFlash(uint8_t index, size_t size) {
     SpinOff(0);
     LED_A_ON();
     LED_B_ON();
@@ -202,8 +196,7 @@ void WriteTagToFlash(uint8_t index, size_t size)
     return;
 }
 
-void RunMod()
-{
+void RunMod() {
     StandAloneMode();
     FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
 
@@ -803,8 +796,7 @@ readysim:
  * - *datain used as error return
  * - tracing is falsed
  */
-void e_MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)
-{
+void e_MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain) {
     MF_DBGLEVEL = MF_DBG_NONE;
 
     uint8_t numSectors = arg0;
@@ -888,8 +880,7 @@ void e_MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *dat
 
 /* the chk function is a piwi’ed(tm) check that will try all keys for
 a particular sector. also no tracing no dbg */
-int cjat91_saMifareChkKeys(uint8_t blockNo, uint8_t keyType, bool clearTrace, uint8_t keyCount, uint8_t *datain, uint64_t *key)
-{
+int cjat91_saMifareChkKeys(uint8_t blockNo, uint8_t keyType, bool clearTrace, uint8_t keyCount, uint8_t *datain, uint64_t *key) {
     MF_DBGLEVEL = MF_DBG_NONE;
     iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
     set_tracing(false);
@@ -927,8 +918,7 @@ int cjat91_saMifareChkKeys(uint8_t blockNo, uint8_t keyType, bool clearTrace, ui
     return -1;
 }
 
-void saMifareMakeTag(void)
-{
+void saMifareMakeTag(void) {
     uint8_t cfail = 0;
     cjSetCursLeft();
     cjTabulize();
@@ -999,8 +989,7 @@ void saMifareMakeTag(void)
 // Matt's StandAlone mod.
 // Work with "magic Chinese" card (email him: ouyangweidaxian@live.cn)
 //-----------------------------------------------------------------------------
-int saMifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)
-{
+int saMifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain) {
     // params
     uint8_t needWipe = arg0;
     // bit 0 - need get UID
diff --git a/armsrc/Standalone/hf_mattyrun.c b/armsrc/Standalone/hf_mattyrun.c
index a6caecef5..bf4b71d61 100644
--- a/armsrc/Standalone/hf_mattyrun.c
+++ b/armsrc/Standalone/hf_mattyrun.c
@@ -42,8 +42,7 @@ uint32_t cuid;
 // Matt's StandAlone mod.
 // Work with "magic Chinese" card (email him: ouyangweidaxian@live.cn)
 //-----------------------------------------------------------------------------
-static int saMifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)
-{
+static int saMifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain) {
     // params
     uint8_t needWipe = arg0;
     // bit 0 - need get UID
@@ -155,8 +154,7 @@ static int saMifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_
 
 /* the chk function is a piwi’ed(tm) check that will try all keys for
 a particular sector. also no tracing no dbg */
-static int saMifareChkKeys(uint8_t blockNo, uint8_t keyType, bool clearTrace, uint8_t keyCount, uint8_t *datain, uint64_t *key)
-{
+static int saMifareChkKeys(uint8_t blockNo, uint8_t keyType, bool clearTrace, uint8_t keyCount, uint8_t *datain, uint64_t *key) {
     MF_DBGLEVEL = MF_DBG_NONE;
     iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
     set_tracing(false);
@@ -194,8 +192,7 @@ static int saMifareChkKeys(uint8_t blockNo, uint8_t keyType, bool clearTrace, ui
 }
 
 
-void RunMod()
-{
+void RunMod() {
     StandAloneMode();
     Dbprintf(">>  Matty mifare chk/dump/sim  a.k.a MattyRun Started  <<");
     FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
diff --git a/armsrc/Standalone/hf_young.c b/armsrc/Standalone/hf_young.c
index d5dfd69bd..99af4ef1e 100644
--- a/armsrc/Standalone/hf_young.c
+++ b/armsrc/Standalone/hf_young.c
@@ -18,8 +18,7 @@ typedef struct {
 } __attribute__((__packed__)) card_clone_t;
 
 
-void RunMod()
-{
+void RunMod() {
     StandAloneMode();
     Dbprintf(">>  Craig Young Mifare sniff UID/clone uid 2 magic/sim  a.k.a YoungRun Started  <<");
     FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
diff --git a/armsrc/Standalone/lf_hidbrute.c b/armsrc/Standalone/lf_hidbrute.c
index ce5b7d337..aaeae9a9a 100644
--- a/armsrc/Standalone/lf_hidbrute.c
+++ b/armsrc/Standalone/lf_hidbrute.c
@@ -27,8 +27,7 @@
 #include "lf_hidbrute.h"
 
 // samy's sniff and repeat routine for LF
-void RunMod()
-{
+void RunMod() {
     StandAloneMode();
     Dbprintf(">>  LF HID corporate bruteforce a.k.a CorporateBrute Started  <<");
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
@@ -245,8 +244,7 @@ out:
 }
 
 // Function that calculate next value for the brutforce of HID corporate 1000
-void hid_corporate_1000_calculate_checksum_and_set(uint32_t *high, uint32_t *low, uint32_t cardnum, uint32_t fc)
-{
+void hid_corporate_1000_calculate_checksum_and_set(uint32_t *high, uint32_t *low, uint32_t cardnum, uint32_t fc) {
 
     uint32_t new_high = 0;
     uint32_t new_low = 0;
diff --git a/armsrc/Standalone/lf_proxbrute.c b/armsrc/Standalone/lf_proxbrute.c
index baa7fe72a..ea1bd1f6f 100644
--- a/armsrc/Standalone/lf_proxbrute.c
+++ b/armsrc/Standalone/lf_proxbrute.c
@@ -12,8 +12,7 @@
 #include "lf_proxbrute.h"
 
 // samy's sniff and repeat routine for LF
-void RunMod()
-{
+void RunMod() {
     StandAloneMode();
     Dbprintf(">>  LF HID proxII bruteforce a.k.a ProxBrute Started (Brad Antoniewicz) <<");
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
diff --git a/armsrc/Standalone/lf_samyrun.c b/armsrc/Standalone/lf_samyrun.c
index 4f4545374..ec0e4d19e 100644
--- a/armsrc/Standalone/lf_samyrun.c
+++ b/armsrc/Standalone/lf_samyrun.c
@@ -11,8 +11,7 @@
 #include "lf_samyrun.h"
 
 // samy's sniff and repeat routine for LF
-void RunMod()
-{
+void RunMod() {
     StandAloneMode();
     Dbprintf(">>  LF HID Read/Clone/Sim a.k.a SamyRun Started  <<");
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
diff --git a/armsrc/aes.c b/armsrc/aes.c
index fd6543745..61a8da76b 100644
--- a/armsrc/aes.c
+++ b/armsrc/aes.c
@@ -680,8 +680,7 @@ static const unsigned int rcon[] = {
 * Expand the cipher key into the encryption key schedule and return the
 * number of rounds for the given cipher key size.
 */
-int aes_setkey_enc(unsigned int rk[], const unsigned char cipherKey[], int keyBytes)
-{
+int aes_setkey_enc(unsigned int rk[], const unsigned char cipherKey[], int keyBytes) {
     int i = 0;
     unsigned int temp;
 
@@ -766,8 +765,7 @@ int aes_setkey_enc(unsigned int rk[], const unsigned char cipherKey[], int keyBy
 * Expand the cipher key into encryption and decryption key schedule and
 * return the number of rounds for the given cipher key size.
 */
-int AesGenKeySched(unsigned int rk[], unsigned int rrk[], const unsigned char cipherKey[], int keyBytes)
-{
+int AesGenKeySched(unsigned int rk[], unsigned int rrk[], const unsigned char cipherKey[], int keyBytes) {
     int Nr, i;
 
     // expand the cipher key
@@ -821,8 +819,7 @@ int AesGenKeySched(unsigned int rk[], unsigned int rrk[], const unsigned char ci
 /*
 * Encrypt the plain text into cipher
 */
-void AesEncBlk(AesCtx *pCtx, const unsigned char pt[], unsigned char ct[])
-{
+void AesEncBlk(AesCtx *pCtx, const unsigned char pt[], unsigned char ct[]) {
     unsigned int s0, s1, s2, s3, t0, t1, t2, t3, *iv;
     const unsigned int *rk;
     int r;
@@ -947,8 +944,7 @@ void AesEncBlk(AesCtx *pCtx, const unsigned char pt[], unsigned char ct[])
 /*
 * Decrypt the cipher into plain text
 */
-void AesDecBlk(AesCtx *pCtx, const unsigned char ct[], unsigned char pt[])
-{
+void AesDecBlk(AesCtx *pCtx, const unsigned char ct[], unsigned char pt[]) {
     unsigned int s0, s1, s2, s3, t0, t1, t2, t3, v0, v1, v2, v3, *iv;
     const unsigned int *rk;
     int r;
@@ -1080,8 +1076,7 @@ void AesDecBlk(AesCtx *pCtx, const unsigned char ct[], unsigned char pt[])
 /*
 * initialize AES context
 */
-int AesCtxIni(AesCtx *pCtx, unsigned char *pIV, unsigned char *pKey, unsigned int KeyLen, unsigned char Mode)
-{
+int AesCtxIni(AesCtx *pCtx, unsigned char *pIV, unsigned char *pKey, unsigned int KeyLen, unsigned char Mode) {
     if (pKey == 0 || pCtx == 0 || (KeyLen != KEY128 && KeyLen != KEY192 && KeyLen != KEY256))
         return -1;
 
@@ -1105,8 +1100,7 @@ int AesCtxIni(AesCtx *pCtx, unsigned char *pIV, unsigned char *pKey, unsigned in
 /*
 * Encrypt plain text
 */
-int AesEncrypt(AesCtx *pCtx, unsigned char *pData, unsigned char *pCipher, unsigned int DataLen)
-{
+int AesEncrypt(AesCtx *pCtx, unsigned char *pData, unsigned char *pCipher, unsigned int DataLen) {
     int i;
 
     if (pData == 0 || pCipher == 0 || pCtx == 0 || (DataLen & 0xf) != 0)
@@ -1124,8 +1118,7 @@ int AesEncrypt(AesCtx *pCtx, unsigned char *pData, unsigned char *pCipher, unsig
 /*
 * Decrypt cipher
 */
-int AesDecrypt(AesCtx *pCtx, unsigned char *pCipher, unsigned char *pData, unsigned int CipherLen)
-{
+int AesDecrypt(AesCtx *pCtx, unsigned char *pCipher, unsigned char *pData, unsigned int CipherLen) {
     int i;
 
     if (pData == 0 || pCipher == 0 || pCtx == 0 || (CipherLen & 0xf) != 0)
@@ -1148,8 +1141,7 @@ int AesDecrypt(AesCtx *pCtx, unsigned char *pCipher, unsigned char *pData, unsig
 
 #include <stdio.h>
 
-int main()
-{
+int main() {
     AesCtx ctx;
     unsigned char iv[] = "INI VECTINI VECT";
     unsigned char key[] = "This is a sample AESKey";
diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 1982c57a7..dbe20b2b7 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -54,14 +54,12 @@ int ToSendMax = -1;
 static int ToSendBit;
 struct common_area common_area __attribute__((section(".commonarea")));
 
-void ToSendReset(void)
-{
+void ToSendReset(void) {
     ToSendMax = -1;
     ToSendBit = 8;
 }
 
-void ToSendStuffBit(int b)
-{
+void ToSendStuffBit(int b) {
     if (ToSendBit >= 8) {
         ToSendMax++;
         ToSend[ToSendMax] = 0;
@@ -79,14 +77,12 @@ void ToSendStuffBit(int b)
     }
 }
 
-void PrintToSendBuffer(void)
-{
+void PrintToSendBuffer(void) {
     DbpString("Printing ToSendBuffer:");
     Dbhexdump(ToSendMax, ToSend, 0);
 }
 
-void print_result(char *name, uint8_t *buf, size_t len)
-{
+void print_result(char *name, uint8_t *buf, size_t len) {
 
     uint8_t *p = buf;
     uint16_t tmp = len & 0xFFF0;
@@ -114,29 +110,25 @@ void print_result(char *name, uint8_t *buf, size_t len)
 // Debug print functions, to go out over USB, to the usual PC-side client.
 //=============================================================================
 
-void DbpStringEx(char *str, uint32_t cmd)
-{
+void DbpStringEx(char *str, uint32_t cmd) {
 #if DEBUG
     uint8_t len = strlen(str);
     cmd_send(CMD_DEBUG_PRINT_STRING, len, cmd, 0, (uint8_t *)str, len);
 #endif
 }
 
-void DbpString(char *str)
-{
+void DbpString(char *str) {
 #if DEBUG
     DbpStringEx(str, 0);
 #endif
 }
 
 #if 0
-void DbpIntegers(int x1, int x2, int x3)
-{
+void DbpIntegers(int x1, int x2, int x3) {
     cmd_send(CMD_DEBUG_PRINT_INTEGERS, x1, x2, x3, 0, 0);
 }
 #endif
-void DbprintfEx(uint32_t cmd, const char *fmt, ...)
-{
+void DbprintfEx(uint32_t cmd, const char *fmt, ...) {
 #if DEBUG
     // should probably limit size here; oh well, let's just use a big buffer
     char output_string[128] = {0x00};
@@ -149,8 +141,7 @@ void DbprintfEx(uint32_t cmd, const char *fmt, ...)
 #endif
 }
 
-void Dbprintf(const char *fmt, ...)
-{
+void Dbprintf(const char *fmt, ...) {
 #if DEBUG
     // should probably limit size here; oh well, let's just use a big buffer
     char output_string[128] = {0x00};
@@ -165,8 +156,7 @@ void Dbprintf(const char *fmt, ...)
 }
 
 // prints HEX & ASCII
-void Dbhexdump(int len, uint8_t *d, bool bAsci)
-{
+void Dbhexdump(int len, uint8_t *d, bool bAsci) {
 #if DEBUG
     int l = 0, i;
     char ascii[9];
@@ -201,8 +191,7 @@ void Dbhexdump(int len, uint8_t *d, bool bAsci)
 // in ADC units (0 to 1023). Also a routine to average 32 samples and
 // return that.
 //-----------------------------------------------------------------------------
-static uint16_t ReadAdc(int ch)
-{
+static uint16_t ReadAdc(int ch) {
 
     // Note: ADC_MODE_PRESCALE and ADC_MODE_SAMPLE_HOLD_TIME are set to the maximum allowed value.
     // AMPL_HI is are high impedance (10MOhm || 1MOhm) output, the input capacitance of the ADC is 12pF (typical). This results in a time constant
@@ -228,8 +217,7 @@ static uint16_t ReadAdc(int ch)
 }
 
 // was static - merlok
-uint16_t AvgAdc(int ch)
-{
+uint16_t AvgAdc(int ch) {
     uint16_t a = 0;
     for (uint8_t i = 0; i < 32; i++)
         a += ReadAdc(ch);
@@ -238,8 +226,7 @@ uint16_t AvgAdc(int ch)
     return (a + 15) >> 5;
 }
 
-void MeasureAntennaTuning(void)
-{
+void MeasureAntennaTuning(void) {
 
     uint8_t LF_Results[256];
     uint32_t i, adcval = 0, peak = 0, peakv = 0, peakf = 0;
@@ -304,8 +291,7 @@ void MeasureAntennaTuning(void)
     LEDsoff();
 }
 
-void MeasureAntennaTuningHf(void)
-{
+void MeasureAntennaTuningHf(void) {
     uint16_t volt = 0; // in mV
     // Let the FPGA drive the high-frequency antenna around 13.56 MHz.
     FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
@@ -327,8 +313,7 @@ void MeasureAntennaTuningHf(void)
     DbprintfEx(FLAG_NOOPT, "\n[+] cancelled", 1);
 }
 
-void ReadMem(int addr)
-{
+void ReadMem(int addr) {
     const uint8_t *data = ((uint8_t *)addr);
 
     Dbprintf("%x: %02x %02x %02x %02x %02x %02x %02x %02x", addr, data[0], data[1], data[2], data[3], data[4], data[5], data[6], data[7]);
@@ -338,8 +323,7 @@ void ReadMem(int addr)
 extern struct version_information version_information;
 /* bootrom version information is pointed to from _bootphase1_version_pointer */
 extern char *_bootphase1_version_pointer, _flash_start, _flash_end, _bootrom_start, _bootrom_end, __data_src_start__;
-void SendVersion(void)
-{
+void SendVersion(void) {
     char temp[USB_CMD_DATA_SIZE]; /* Limited data payload in USB packets */
     char VersionString[USB_CMD_DATA_SIZE] = { '\0' };
 
@@ -377,8 +361,7 @@ void SendVersion(void)
 
 // measure the USB Speed by sending SpeedTestBufferSize bytes to client and measuring the elapsed time.
 // Note: this mimics GetFromBigbuf(), i.e. we have the overhead of the UsbCommand structure included.
-void printUSBSpeed(void)
-{
+void printUSBSpeed(void) {
     Dbprintf("USB Speed");
     Dbprintf("  Sending USB packets to client...");
 
@@ -405,8 +388,7 @@ void printUSBSpeed(void)
 /**
   * Prints runtime information about the PM3.
 **/
-void SendStatus(void)
-{
+void SendStatus(void) {
     BigBuf_print_status();
     Fpga_print_status();
 #ifdef WITH_FLASH
@@ -430,8 +412,7 @@ void SendStatus(void)
 }
 
 // Show some leds in a pattern to identify StandAlone mod is running
-void StandAloneMode(void)
-{
+void StandAloneMode(void) {
 
     DbpString("Stand-alone mode! No PC necessary.");
 
@@ -444,8 +425,7 @@ void StandAloneMode(void)
 }
 // detection of which Standalone Modes is installed
 // (iceman)
-void printStandAloneModes(void)
-{
+void printStandAloneModes(void) {
 
     DbpString("Installed StandAlone Mode");
 
@@ -523,8 +503,7 @@ static const char LIGHT_SCHEME[] = {
 };
 static const int LIGHT_LEN = sizeof(LIGHT_SCHEME) / sizeof(LIGHT_SCHEME[0]);
 
-void ListenReaderField(int limit)
-{
+void ListenReaderField(int limit) {
 #define LF_ONLY 1
 #define HF_ONLY 2
 #define REPORT_CHANGE 10    // report new values only if they have changed at least by REPORT_CHANGE
@@ -650,8 +629,7 @@ void ListenReaderField(int limit)
     }
 }
 
-void UsbPacketReceived(uint8_t *packet, int len)
-{
+void UsbPacketReceived(uint8_t *packet, int len) {
     UsbCommand *c = (UsbCommand *)packet;
 
     //Dbprintf("received %d bytes, with command: 0x%04x and args: %d %d %d", len, c->cmd, c->arg[0], c->arg[1], c->arg[2]);
@@ -1509,8 +1487,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
     }
 }
 
-void  __attribute__((noreturn)) AppMain(void)
-{
+void  __attribute__((noreturn)) AppMain(void) {
 
     SpinDelay(100);
     clear_trace();
diff --git a/armsrc/buzzer.c b/armsrc/buzzer.c
index a06b1adbb..27d0cd12a 100644
--- a/armsrc/buzzer.c
+++ b/armsrc/buzzer.c
@@ -1,27 +1,23 @@
 #include "buzzer.h"
 
-void Ring_BEE_ONCE(uint16_t music_note)
-{
+void Ring_BEE_ONCE(uint16_t music_note) {
     BEE_ON();
     SpinDelayUs(music_note);
     BEE_OFF();
     SpinDelayUs(music_note);
 }
 
-void ring_2_7khz(uint16_t count)
-{
+void ring_2_7khz(uint16_t count) {
     Ring_BEE_TIME(n_2_7khz, count);
 }
 
-void Ring_BEE_TIME(uint16_t music_note, uint16_t count)
-{
+void Ring_BEE_TIME(uint16_t music_note, uint16_t count) {
     for (uint16_t i = 0 ; i < count; i++)
         Ring_BEE_ONCE(music_note);
     SpinDelay(9);
 }
 
-void Ring_ALL(uint16_t count)
-{
+void Ring_ALL(uint16_t count) {
     Ring_BEE_TIME(note_1, count);
     Ring_BEE_TIME(note_2, count);
     Ring_BEE_TIME(note_3, count);
@@ -32,8 +28,7 @@ void Ring_ALL(uint16_t count)
     SpinDelay(10);
 }
 
-void Ring_Little_Star(uint16_t count)
-{
+void Ring_Little_Star(uint16_t count) {
     Ring_BEE_TIME(note_1, count);
     Ring_BEE_TIME(note_1, count);
     Ring_BEE_TIME(note_5, count);
diff --git a/armsrc/des.c b/armsrc/des.c
index 2e9cfaef1..6229ac8f6 100644
--- a/armsrc/des.c
+++ b/armsrc/des.c
@@ -202,8 +202,7 @@ const uint8_t shiftkeyinv_permtab[] = {
 #define ROTTABLE_INV  0x3F7E
 /******************************************************************************/
 
-void permute(const uint8_t *ptable, const uint8_t *in, uint8_t *out)
-{
+void permute(const uint8_t *ptable, const uint8_t *in, uint8_t *out) {
     uint8_t ob; /* in-bytes and out-bytes */
     uint8_t byte, bit; /* counter for bit and byte */
     ob = ptable[1];
@@ -223,8 +222,7 @@ void permute(const uint8_t *ptable, const uint8_t *in, uint8_t *out)
 
 /******************************************************************************/
 
-void changeendian32(uint32_t *a)
-{
+void changeendian32(uint32_t *a) {
     *a = (*a & 0x000000FF) << 24 |
          (*a & 0x0000FF00) <<  8 |
          (*a & 0x00FF0000) >>  8 |
@@ -233,8 +231,7 @@ void changeendian32(uint32_t *a)
 
 /******************************************************************************/
 static inline
-void shiftkey(uint8_t *key)
-{
+void shiftkey(uint8_t *key) {
     uint8_t k[7];
     memcpy(k, key, 7);
     permute((uint8_t *)shiftkey_permtab, k, key);
@@ -242,8 +239,7 @@ void shiftkey(uint8_t *key)
 
 /******************************************************************************/
 static inline
-void shiftkey_inv(uint8_t *key)
-{
+void shiftkey_inv(uint8_t *key) {
     uint8_t k[7];
     memcpy(k, key, 7);
     permute((uint8_t *)shiftkeyinv_permtab, k, key);
@@ -252,8 +248,7 @@ void shiftkey_inv(uint8_t *key)
 
 /******************************************************************************/
 static inline
-uint64_t splitin6bitwords(uint64_t a)
-{
+uint64_t splitin6bitwords(uint64_t a) {
     uint64_t ret = 0;
     a &= 0x0000ffffffffffffLL;
     permute((uint8_t *)splitin6bitword_permtab, (uint8_t *)&a, (uint8_t *)&ret);
@@ -263,8 +258,7 @@ uint64_t splitin6bitwords(uint64_t a)
 /******************************************************************************/
 
 static inline
-uint8_t substitute(uint8_t a, uint8_t *sbp)
-{
+uint8_t substitute(uint8_t a, uint8_t *sbp) {
     uint8_t x;
     x = sbp[a >> 1];
     x = (a & 1) ? x & 0x0F : x >> 4;
@@ -274,8 +268,7 @@ uint8_t substitute(uint8_t a, uint8_t *sbp)
 
 /******************************************************************************/
 
-uint32_t des_f(uint32_t r, uint8_t *kr)
-{
+uint32_t des_f(uint32_t r, uint8_t *kr) {
     uint8_t i;
     uint32_t t = 0, ret;
     uint64_t data;
@@ -312,8 +305,7 @@ typedef struct {
 #define R (data.d.v32[1])
 #define L (data.d.v32[0])
 
-void des_enc(void *out, const void *in, const void *key)
-{
+void des_enc(void *out, const void *in, const void *key) {
 
     uint8_t kr[6], k[7];
     uint8_t i;
@@ -346,8 +338,7 @@ void des_enc(void *out, const void *in, const void *key)
 
 /******************************************************************************/
 
-void des_dec(void *out, const void *in, const uint8_t *key)
-{
+void des_dec(void *out, const void *in, const uint8_t *key) {
 
     uint8_t kr[6], k[7];
     int8_t i;
@@ -382,8 +373,7 @@ void des_dec(void *out, const void *in, const uint8_t *key)
 
 /******************************************************************************/
 
-void tdes_enc(void *out, void *in, const void *key)
-{
+void tdes_enc(void *out, void *in, const void *key) {
     des_enc(out,  in, (uint8_t *)key + 0);
     des_dec(out, out, (uint8_t *)key + 8);
     des_enc(out, out, (uint8_t *)key + 16);
@@ -391,15 +381,13 @@ void tdes_enc(void *out, void *in, const void *key)
 
 /******************************************************************************/
 
-void tdes_dec(void *out, void *in, const uint8_t *key)
-{
+void tdes_dec(void *out, void *in, const uint8_t *key) {
     des_dec(out,  in, (uint8_t *)key + 16);
     des_enc(out, out, (uint8_t *)key + 8);
     des_dec(out, out, (uint8_t *)key + 0);
 }
 
-void tdes_2key_enc(void *out, const void *in, size_t length, const void *key, unsigned char iv[8])
-{
+void tdes_2key_enc(void *out, const void *in, size_t length, const void *key, unsigned char iv[8]) {
 
     if (length % 8) return;
 
@@ -423,8 +411,7 @@ void tdes_2key_enc(void *out, const void *in, size_t length, const void *key, un
     }
 }
 
-void tdes_2key_dec(void *out, const void *in, size_t length, const void *key, unsigned char iv[8])
-{
+void tdes_2key_dec(void *out, const void *in, size_t length, const void *key, unsigned char iv[8]) {
 
     if (length % 8) return;
 
diff --git a/armsrc/desfire_crypto.c b/armsrc/desfire_crypto.c
index 55dde9c4c..0a23305fd 100644
--- a/armsrc/desfire_crypto.c
+++ b/armsrc/desfire_crypto.c
@@ -31,15 +31,13 @@ static void xor(const uint8_t *ivect, uint8_t *data, const size_t len);
 static size_t key_macing_length(desfirekey_t key);
 
 // iceman,  see memxor inside string.c, dest/src swapped..
-static void xor(const uint8_t *ivect, uint8_t *data, const size_t len)
-{
+static void xor(const uint8_t *ivect, uint8_t *data, const size_t len) {
     for (size_t i = 0; i < len; i++) {
         data[i] ^= ivect[i];
     }
 }
 
-void cmac_generate_subkeys(desfirekey_t key)
-{
+void cmac_generate_subkeys(desfirekey_t key) {
     int kbs = key_block_size(key);
     const uint8_t R = (kbs == 8) ? 0x1B : 0x87;
 
@@ -68,8 +66,7 @@ void cmac_generate_subkeys(desfirekey_t key)
         key->cmac_sk2[kbs - 1] ^= R;
 }
 
-void cmac(const desfirekey_t key, uint8_t *ivect, const uint8_t *data, size_t len, uint8_t *cmac)
-{
+void cmac(const desfirekey_t key, uint8_t *ivect, const uint8_t *data, size_t len, uint8_t *cmac) {
     int kbs = key_block_size(key);
     uint8_t *buffer = malloc(padded_data_length(len, kbs));
 
@@ -91,8 +88,7 @@ void cmac(const desfirekey_t key, uint8_t *ivect, const uint8_t *data, size_t le
     free(buffer);
 }
 
-size_t key_block_size(const desfirekey_t key)
-{
+size_t key_block_size(const desfirekey_t key) {
     size_t block_size = 8;
     switch (key->type) {
         case T_DES:
@@ -110,8 +106,7 @@ size_t key_block_size(const desfirekey_t key)
 /*
  * Size of MACing produced with the key.
  */
-static size_t key_macing_length(const desfirekey_t key)
-{
+static size_t key_macing_length(const desfirekey_t key) {
     size_t mac_length = MAC_LENGTH;
     switch (key->type) {
         case T_DES:
@@ -129,8 +124,7 @@ static size_t key_macing_length(const desfirekey_t key)
 /*
  * Size required to store nbytes of data in a buffer of size n*block_size.
  */
-size_t padded_data_length(const size_t nbytes, const size_t block_size)
-{
+size_t padded_data_length(const size_t nbytes, const size_t block_size) {
     if ((!nbytes) || (nbytes % block_size))
         return ((nbytes / block_size) + 1) * block_size;
     else
@@ -140,15 +134,13 @@ size_t padded_data_length(const size_t nbytes, const size_t block_size)
 /*
  * Buffer size required to MAC nbytes of data
  */
-size_t maced_data_length(const desfirekey_t key, const size_t nbytes)
-{
+size_t maced_data_length(const desfirekey_t key, const size_t nbytes) {
     return nbytes + key_macing_length(key);
 }
 /*
  * Buffer size required to encipher nbytes of data and a two bytes CRC.
  */
-size_t enciphered_data_length(const desfiretag_t tag, const size_t nbytes, int communication_settings)
-{
+size_t enciphered_data_length(const desfiretag_t tag, const size_t nbytes, int communication_settings) {
     size_t crc_length = 0;
     if (!(communication_settings & NO_CRC)) {
         switch (DESFIRE(tag)->authentication_scheme) {
@@ -166,8 +158,7 @@ size_t enciphered_data_length(const desfiretag_t tag, const size_t nbytes, int c
     return padded_data_length(nbytes + crc_length, block_size);
 }
 
-void *mifare_cryto_preprocess_data(desfiretag_t tag, void *data, size_t *nbytes, size_t offset, int communication_settings)
-{
+void *mifare_cryto_preprocess_data(desfiretag_t tag, void *data, size_t *nbytes, size_t offset, int communication_settings) {
     uint8_t *res = data;
     uint8_t mac[4];
     size_t edl;
@@ -295,8 +286,7 @@ void *mifare_cryto_preprocess_data(desfiretag_t tag, void *data, size_t *nbytes,
 
 }
 
-void *mifare_cryto_postprocess_data(desfiretag_t tag, void *data, size_t *nbytes, int communication_settings)
-{
+void *mifare_cryto_postprocess_data(desfiretag_t tag, void *data, size_t *nbytes, int communication_settings) {
     void *res = data;
     size_t edl;
     void *edata = NULL;
@@ -521,8 +511,7 @@ void *mifare_cryto_postprocess_data(desfiretag_t tag, void *data, size_t *nbytes
 }
 
 
-void mifare_cypher_single_block(desfirekey_t key, uint8_t *data, uint8_t *ivect, MifareCryptoDirection direction, MifareCryptoOperation operation, size_t block_size)
-{
+void mifare_cypher_single_block(desfirekey_t key, uint8_t *data, uint8_t *ivect, MifareCryptoDirection direction, MifareCryptoOperation operation, size_t block_size) {
     uint8_t ovect[MAX_CRYPTO_BLOCK_SIZE];
 
     if (direction == MCD_SEND) {
@@ -616,8 +605,7 @@ void mifare_cypher_single_block(desfirekey_t key, uint8_t *data, uint8_t *ivect,
  * Because the tag may contain additional data, one may need to call this
  * function with tag, key and ivect defined.
  */
-void mifare_cypher_blocks_chained(desfiretag_t tag, desfirekey_t key, uint8_t *ivect, uint8_t *data, size_t data_size, MifareCryptoDirection direction, MifareCryptoOperation operation)
-{
+void mifare_cypher_blocks_chained(desfiretag_t tag, desfirekey_t key, uint8_t *ivect, uint8_t *data, size_t data_size, MifareCryptoDirection direction, MifareCryptoOperation operation) {
     size_t block_size;
 
     if (tag) {
diff --git a/armsrc/desfire_key.c b/armsrc/desfire_key.c
index 1123225bb..a723a203e 100644
--- a/armsrc/desfire_key.c
+++ b/armsrc/desfire_key.c
@@ -21,8 +21,7 @@
 
 static inline void update_key_schedules(desfirekey_t key);
 
-static inline void update_key_schedules(desfirekey_t key)
-{
+static inline void update_key_schedules(desfirekey_t key) {
     // DES_set_key ((DES_cblock *)key->data, &(key->ks1));
     // DES_set_key ((DES_cblock *)(key->data + 8), &(key->ks2));
     // if (T_3K3DES == key->type) {
@@ -30,8 +29,7 @@ static inline void update_key_schedules(desfirekey_t key)
     // }
 }
 
-void Desfire_des_key_new(const uint8_t value[8], desfirekey_t key)
-{
+void Desfire_des_key_new(const uint8_t value[8], desfirekey_t key) {
     uint8_t data[8];
     memcpy(data, value, 8);
     for (int n = 0; n < 8; n++)
@@ -39,8 +37,7 @@ void Desfire_des_key_new(const uint8_t value[8], desfirekey_t key)
     Desfire_des_key_new_with_version(data, key);
 }
 
-void Desfire_des_key_new_with_version(const uint8_t value[8], desfirekey_t key)
-{
+void Desfire_des_key_new_with_version(const uint8_t value[8], desfirekey_t key) {
     if (key != NULL) {
         key->type = T_DES;
         memcpy(key->data, value, 8);
@@ -49,8 +46,7 @@ void Desfire_des_key_new_with_version(const uint8_t value[8], desfirekey_t key)
     }
 }
 
-void Desfire_3des_key_new(const uint8_t value[16], desfirekey_t key)
-{
+void Desfire_3des_key_new(const uint8_t value[16], desfirekey_t key) {
     uint8_t data[16];
     memcpy(data, value, 16);
     for (int n = 0; n < 8; n++)
@@ -60,8 +56,7 @@ void Desfire_3des_key_new(const uint8_t value[16], desfirekey_t key)
     Desfire_3des_key_new_with_version(data, key);
 }
 
-void Desfire_3des_key_new_with_version(const uint8_t value[16], desfirekey_t key)
-{
+void Desfire_3des_key_new_with_version(const uint8_t value[16], desfirekey_t key) {
     if (key != NULL) {
         key->type = T_3DES;
         memcpy(key->data, value, 16);
@@ -70,8 +65,7 @@ void Desfire_3des_key_new_with_version(const uint8_t value[16], desfirekey_t key
     }
 }
 
-void Desfire_3k3des_key_new(const uint8_t value[24], desfirekey_t key)
-{
+void Desfire_3k3des_key_new(const uint8_t value[24], desfirekey_t key) {
     uint8_t data[24];
     memcpy(data, value, 24);
     for (int n = 0; n < 8; n++)
@@ -79,8 +73,7 @@ void Desfire_3k3des_key_new(const uint8_t value[24], desfirekey_t key)
     Desfire_3k3des_key_new_with_version(data, key);
 }
 
-void Desfire_3k3des_key_new_with_version(const uint8_t value[24], desfirekey_t key)
-{
+void Desfire_3k3des_key_new_with_version(const uint8_t value[24], desfirekey_t key) {
     if (key != NULL) {
         key->type = T_3K3DES;
         memcpy(key->data, value, 24);
@@ -88,13 +81,11 @@ void Desfire_3k3des_key_new_with_version(const uint8_t value[24], desfirekey_t k
     }
 }
 
-void Desfire_aes_key_new(const uint8_t value[16], desfirekey_t key)
-{
+void Desfire_aes_key_new(const uint8_t value[16], desfirekey_t key) {
     Desfire_aes_key_new_with_version(value, 0, key);
 }
 
-void Desfire_aes_key_new_with_version(const uint8_t value[16], uint8_t version, desfirekey_t key)
-{
+void Desfire_aes_key_new_with_version(const uint8_t value[16], uint8_t version, desfirekey_t key) {
 
     if (key != NULL) {
         memcpy(key->data, value, 16);
@@ -103,8 +94,7 @@ void Desfire_aes_key_new_with_version(const uint8_t value[16], uint8_t version,
     }
 }
 
-uint8_t Desfire_key_get_version(desfirekey_t key)
-{
+uint8_t Desfire_key_get_version(desfirekey_t key) {
     uint8_t version = 0;
 
     for (int n = 0; n < 8; n++) {
@@ -113,8 +103,7 @@ uint8_t Desfire_key_get_version(desfirekey_t key)
     return version;
 }
 
-void Desfire_key_set_version(desfirekey_t key, uint8_t version)
-{
+void Desfire_key_set_version(desfirekey_t key, uint8_t version) {
     for (int n = 0; n < 8; n++) {
         uint8_t version_bit = ((version & (1 << (7 - n))) >> (7 - n));
         key->data[n] &= 0xfe;
@@ -129,8 +118,7 @@ void Desfire_key_set_version(desfirekey_t key, uint8_t version)
     }
 }
 
-void Desfire_session_key_new(const uint8_t rnda[], const uint8_t rndb[], desfirekey_t authkey, desfirekey_t key)
-{
+void Desfire_session_key_new(const uint8_t rnda[], const uint8_t rndb[], desfirekey_t authkey, desfirekey_t key) {
 
     uint8_t buffer[24];
 
diff --git a/armsrc/epa.c b/armsrc/epa.c
index 0f09980ee..95de11550 100644
--- a/armsrc/epa.c
+++ b/armsrc/epa.c
@@ -103,8 +103,7 @@ static char iso_type = 0;
 //-----------------------------------------------------------------------------
 // Wrapper for sending APDUs to type A and B cards
 //-----------------------------------------------------------------------------
-int EPA_APDU(uint8_t *apdu, size_t length, uint8_t *response)
-{
+int EPA_APDU(uint8_t *apdu, size_t length, uint8_t *response) {
     switch (iso_type) {
         case 'a':
             return iso14_apdu(apdu, (uint16_t) length, false, response, NULL);
@@ -121,8 +120,7 @@ int EPA_APDU(uint8_t *apdu, size_t length, uint8_t *response)
 //-----------------------------------------------------------------------------
 // Closes the communication channel and turns off the field
 //-----------------------------------------------------------------------------
-void EPA_Finish()
-{
+void EPA_Finish() {
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     LEDsoff();
     iso_type = 0;
@@ -143,8 +141,7 @@ void EPA_Finish()
 //-----------------------------------------------------------------------------
 size_t EPA_Parse_CardAccess(uint8_t *data,
                             size_t length,
-                            pace_version_info_t *pace_info)
-{
+                            pace_version_info_t *pace_info) {
     size_t index = 0;
 
     while (index <= length - 2) {
@@ -162,10 +159,10 @@ size_t EPA_Parse_CardAccess(uint8_t *data,
         else if (data[index] == 0x06) {
             // is this a PACE OID?
             if (data[index + 1] == 0x0A // length matches
-                && memcmp(data + index + 2,
-                          oid_pace_start,
-                          sizeof(oid_pace_start)) == 0 // content matches
-                && pace_info != NULL) {
+                    && memcmp(data + index + 2,
+                              oid_pace_start,
+                              sizeof(oid_pace_start)) == 0 // content matches
+                    && pace_info != NULL) {
                 // first, clear the pace_info struct
                 memset(pace_info, 0, sizeof(pace_version_info_t));
                 memcpy(pace_info->oid, data + index + 2, sizeof(pace_info->oid));
@@ -210,8 +207,7 @@ size_t EPA_Parse_CardAccess(uint8_t *data,
 // Returns -1 on failure or the length of the data on success
 // TODO: for the moment this sends only 1 APDU regardless of the requested length
 //-----------------------------------------------------------------------------
-int EPA_Read_CardAccess(uint8_t *buffer, size_t max_length)
-{
+int EPA_Read_CardAccess(uint8_t *buffer, size_t max_length) {
     // the response APDU of the card
     // since the card doesn't always care for the expected length we send it,
     // we reserve 262 bytes here just to be safe (256-byte APDU + SW + ISO frame)
@@ -223,8 +219,8 @@ int EPA_Read_CardAccess(uint8_t *buffer, size_t max_length)
                             sizeof(apdu_select_binary_cardaccess),
                             response_apdu);
     if (rapdu_length < 6
-        || response_apdu[rapdu_length - 4] != 0x90
-        || response_apdu[rapdu_length - 3] != 0x00) {
+            || response_apdu[rapdu_length - 4] != 0x90
+            || response_apdu[rapdu_length - 3] != 0x00) {
         DbpString("Failed to select EF.CardAccess!");
         return -1;
     }
@@ -234,8 +230,8 @@ int EPA_Read_CardAccess(uint8_t *buffer, size_t max_length)
                             sizeof(apdu_read_binary),
                             response_apdu);
     if (rapdu_length <= 6
-        || response_apdu[rapdu_length - 4] != 0x90
-        || response_apdu[rapdu_length - 3] != 0x00) {
+            || response_apdu[rapdu_length - 4] != 0x90
+            || response_apdu[rapdu_length - 3] != 0x00) {
         Dbprintf("Failed to read EF.CardAccess!");
         return -1;
     }
@@ -252,8 +248,7 @@ int EPA_Read_CardAccess(uint8_t *buffer, size_t max_length)
 // Abort helper function for EPA_PACE_Collect_Nonce
 // sets relevant data in ack, sends the response
 //-----------------------------------------------------------------------------
-static void EPA_PACE_Collect_Nonce_Abort(uint8_t step, int func_return)
-{
+static void EPA_PACE_Collect_Nonce_Abort(uint8_t step, int func_return) {
     // power down the field
     EPA_Finish();
 
@@ -264,8 +259,7 @@ static void EPA_PACE_Collect_Nonce_Abort(uint8_t step, int func_return)
 //-----------------------------------------------------------------------------
 // Acquire one encrypted PACE nonce
 //-----------------------------------------------------------------------------
-void EPA_PACE_Collect_Nonce(UsbCommand *c)
-{
+void EPA_PACE_Collect_Nonce(UsbCommand *c) {
     /*
      * ack layout:
      *   arg:
@@ -337,8 +331,7 @@ void EPA_PACE_Collect_Nonce(UsbCommand *c)
 // Returns the actual size of the nonce on success or a less-than-zero error
 // code on failure.
 //-----------------------------------------------------------------------------
-int EPA_PACE_Get_Nonce(uint8_t requested_length, uint8_t *nonce)
-{
+int EPA_PACE_Get_Nonce(uint8_t requested_length, uint8_t *nonce) {
     // build the APDU
     uint8_t apdu[sizeof(apdu_general_authenticate_pace_get_nonce) + 1];
     // copy the constant part
@@ -355,8 +348,8 @@ int EPA_PACE_Get_Nonce(uint8_t requested_length, uint8_t *nonce)
                                response_apdu);
     // check if the command succeeded
     if (send_return < 6
-        || response_apdu[send_return - 4] != 0x90
-        || response_apdu[send_return - 3] != 0x00) {
+            || response_apdu[send_return - 4] != 0x90
+            || response_apdu[send_return - 3] != 0x00) {
         return -1;
     }
 
@@ -380,8 +373,7 @@ int EPA_PACE_Get_Nonce(uint8_t requested_length, uint8_t *nonce)
 // Initializes the PACE protocol by performing the "MSE: Set AT" step
 // Returns 0 on success or a non-zero error code on failure
 //-----------------------------------------------------------------------------
-int EPA_PACE_MSE_Set_AT(pace_version_info_t pace_version_info, uint8_t password)
-{
+int EPA_PACE_MSE_Set_AT(pace_version_info_t pace_version_info, uint8_t password) {
     // create the MSE: Set AT APDU
     uint8_t apdu[23];
     // the minimum length (will be increased as more data is added)
@@ -423,8 +415,8 @@ int EPA_PACE_MSE_Set_AT(pace_version_info_t pace_version_info, uint8_t password)
                                response_apdu);
     // check if the command succeeded
     if (send_return != 6
-        || response_apdu[send_return - 4] != 0x90
-        || response_apdu[send_return - 3] != 0x00) {
+            || response_apdu[send_return - 4] != 0x90
+            || response_apdu[send_return - 3] != 0x00) {
         return 1;
     }
     return 0;
@@ -433,8 +425,7 @@ int EPA_PACE_MSE_Set_AT(pace_version_info_t pace_version_info, uint8_t password)
 //-----------------------------------------------------------------------------
 // Perform the PACE protocol by replaying given APDUs
 //-----------------------------------------------------------------------------
-void EPA_PACE_Replay(UsbCommand *c)
-{
+void EPA_PACE_Replay(UsbCommand *c) {
     uint32_t timings[sizeof(apdu_lengths_replay) / sizeof(apdu_lengths_replay[0])] = {0};
 
     // if an APDU has been passed, save it
@@ -482,9 +473,9 @@ void EPA_PACE_Replay(UsbCommand *c)
         timings[i] = GetCountUS();
         // every step but the last one should succeed
         if (i < sizeof(apdu_lengths_replay) - 1
-            && (func_return < 6
-                || response_apdu[func_return - 4] != 0x90
-                || response_apdu[func_return - 3] != 0x00)) {
+                && (func_return < 6
+                    || response_apdu[func_return - 4] != 0x90
+                    || response_apdu[func_return - 3] != 0x00)) {
             EPA_Finish();
             cmd_send(CMD_ACK, 3 + i, func_return, 0, timings, 20);
             return;
@@ -499,8 +490,7 @@ void EPA_PACE_Replay(UsbCommand *c)
 // Set up a communication channel (Card Select, PPS)
 // Returns 0 on success or a non-zero error code on failure
 //-----------------------------------------------------------------------------
-int EPA_Setup()
-{
+int EPA_Setup() {
     int return_code = 0;
     uint8_t uid[10];
     uint8_t pps_response[3];
diff --git a/armsrc/felica.c b/armsrc/felica.c
index 1d3ef781e..3aa3c282d 100644
--- a/armsrc/felica.c
+++ b/armsrc/felica.c
@@ -34,13 +34,11 @@ static uint8_t felica_select_card(felica_card_select_t *card);
 static void TransmitFor18092_AsReader(uint8_t *frame, int len, uint32_t *timing, uint8_t power, uint8_t highspeed);
 bool WaitForFelicaReply(uint16_t maxbytes);
 
-void iso18092_set_timeout(uint32_t timeout)
-{
+void iso18092_set_timeout(uint32_t timeout) {
     felica_timeout = timeout + (DELAY_AIR2ARM_AS_READER + DELAY_ARM2AIR_AS_READER) / (16 * 8) + 2;
 }
 
-uint32_t iso18092_get_timeout(void)
-{
+uint32_t iso18092_get_timeout(void) {
     return felica_timeout - (DELAY_AIR2ARM_AS_READER + DELAY_ARM2AIR_AS_READER) / (16 * 8) - 2;
 }
 
@@ -79,22 +77,19 @@ static struct {
 # define SYNC_16BIT 0xB24D
 #endif
 
-static void FelicaFrameReset()
-{
+static void FelicaFrameReset() {
     FelicaFrame.state = STATE_UNSYNCD;
     FelicaFrame.posCnt = 0;
     FelicaFrame.crc_ok = false;
     FelicaFrame.byte_offset = 0;
 }
-static void FelicaFrameinit(uint8_t *data)
-{
+static void FelicaFrameinit(uint8_t *data) {
     FelicaFrame.framebytes = data;
     FelicaFrameReset();
 }
 
 //shift byte into frame, reversing it at the same time
-static void shiftInByte(uint8_t bt)
-{
+static void shiftInByte(uint8_t bt) {
     uint8_t j;
     for (j = 0; j < FelicaFrame.byte_offset; j++) {
         FelicaFrame.framebytes[FelicaFrame.posCnt] = (FelicaFrame.framebytes[FelicaFrame.posCnt] << 1) + (bt & 1);
@@ -108,8 +103,7 @@ static void shiftInByte(uint8_t bt)
     }
 }
 
-static void Process18092Byte(uint8_t bt)
-{
+static void Process18092Byte(uint8_t bt) {
     switch (FelicaFrame.state) {
         case STATE_UNSYNCD: {
             //almost any nonzero byte can be start of SYNC. SYNC should be preceded by zeros, but that is not alsways the case
@@ -196,8 +190,7 @@ static void Process18092Byte(uint8_t bt)
  * Currently does NOT do any collision handling.
  * It expects 0-1 cards in the device's range.
  */
-static uint8_t felica_select_card(felica_card_select_t *card)
-{
+static uint8_t felica_select_card(felica_card_select_t *card) {
 
     // POLL command
     // 0xB2 0x4B = sync code
@@ -271,8 +264,7 @@ static uint8_t felica_select_card(felica_card_select_t *card)
 // Felica standard has a different file system, AFAIK,
 // 8-byte IDm, number of blocks, blocks numbers
 // number of blocks limited to 4 for FelicaLite(S)
-static void BuildFliteRdblk(uint8_t *idm, int blocknum, uint16_t *blocks)
-{
+static void BuildFliteRdblk(uint8_t *idm, int blocknum, uint16_t *blocks) {
 
     if (blocknum > 4 || blocknum <= 0)
         Dbprintf("Invalid number of blocks, %d != 4", blocknum);
@@ -324,8 +316,7 @@ static void BuildFliteRdblk(uint8_t *idm, int blocknum, uint16_t *blocks)
     AddCrc(frameSpace, c - 2);
 }
 
-static void TransmitFor18092_AsReader(uint8_t *frame, int len, uint32_t *timing, uint8_t power, uint8_t highspeed)
-{
+static void TransmitFor18092_AsReader(uint8_t *frame, int len, uint32_t *timing, uint8_t power, uint8_t highspeed) {
 
     uint8_t flags = FPGA_MAJOR_MODE_ISO18092;
 
@@ -389,8 +380,7 @@ static void TransmitFor18092_AsReader(uint8_t *frame, int len, uint32_t *timing,
 // Wait for tag reply
 // stop when button is pressed
 // or return TRUE when command is captured
-bool WaitForFelicaReply(uint16_t maxbytes)
-{
+bool WaitForFelicaReply(uint16_t maxbytes) {
 
     uint32_t c = 0;
 
@@ -440,8 +430,7 @@ bool WaitForFelicaReply(uint16_t maxbytes)
 
 // Set up FeliCa communication (similar to iso14443a_setup)
 // field is setup for "Sending as Reader"
-static void iso18092_setup(uint8_t fpga_minor_mode)
-{
+static void iso18092_setup(uint8_t fpga_minor_mode) {
 
     LEDsoff();
     FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
@@ -485,8 +474,7 @@ static void iso18092_setup(uint8_t fpga_minor_mode)
 // arg0 FeliCa flags
 // arg1 len of commandbytes
 // d.asBytes command bytes to send
-void felica_sendraw(UsbCommand *c)
-{
+void felica_sendraw(UsbCommand *c) {
 
     if (MF_DBGLEVEL > 3) Dbprintf("FeliCa_sendraw Enter");
 
@@ -552,8 +540,7 @@ OUT:
     if (MF_DBGLEVEL > 3) Dbprintf("FeliCa_sendraw Exit");
 }
 
-void felica_sniff(uint32_t samplesToSkip, uint32_t triggersToSkip)
-{
+void felica_sniff(uint32_t samplesToSkip, uint32_t triggersToSkip) {
 
     int remFrames = (samplesToSkip) ? samplesToSkip : 0;
 
@@ -624,8 +611,7 @@ void felica_sniff(uint32_t samplesToSkip, uint32_t triggersToSkip)
 #define R_READBLK_LEN  0x21
 //simulate NFC Tag3 card - for now only poll response works
 // second half (4 bytes)  of NDEF2 goes into nfcid2_0, first into nfcid2_1
-void felica_sim_lite(uint64_t nfcid)
-{
+void felica_sim_lite(uint64_t nfcid) {
 
     int i, curlen = 0;
     uint8_t *curresp = 0;
@@ -731,8 +717,7 @@ void felica_sim_lite(uint64_t nfcid)
     DbpString("Felica Lite-S sim end");
 }
 
-void felica_dump_lite_s()
-{
+void felica_dump_lite_s() {
 
     uint8_t ndef[8];
     uint8_t poll[10] = { 0xb2, 0x4d, 0x06, FELICA_POLL_REQ, 0xff, 0xff, 0x00, 0x00, 0x09, 0x21};
diff --git a/armsrc/flashmem.c b/armsrc/flashmem.c
index 6773af444..56b564b1d 100644
--- a/armsrc/flashmem.c
+++ b/armsrc/flashmem.c
@@ -13,15 +13,13 @@
 
 uint32_t FLASHMEM_SPIBAUDRATE = FLASH_BAUD;
 
-void FlashmemSetSpiBaudrate(uint32_t baudrate)
-{
+void FlashmemSetSpiBaudrate(uint32_t baudrate) {
     FLASHMEM_SPIBAUDRATE = baudrate;
     Dbprintf("Spi Baudrate : %dMhz", FLASHMEM_SPIBAUDRATE / 1000000);
 }
 
 // initialize
-bool FlashInit()
-{
+bool FlashInit() {
     FlashSetup(FLASHMEM_SPIBAUDRATE);
 
     StartTicks();
@@ -34,8 +32,7 @@ bool FlashInit()
     return true;
 }
 
-void FlashSetup(uint32_t baudrate)
-{
+void FlashSetup(uint32_t baudrate) {
     //WDT_DISABLE
     AT91C_BASE_WDTC->WDTC_WDMR = AT91C_WDTC_WDDIS;
 
@@ -130,8 +127,7 @@ void FlashSetup(uint32_t baudrate)
     if (AT91C_BASE_SPI->SPI_RDR == 0) {};
 }
 
-void FlashStop(void)
-{
+void FlashStop(void) {
     //Bof
     //* Reset all the Chip Select register
     AT91C_BASE_SPI->SPI_CSR[0] = 0;
@@ -154,8 +150,7 @@ void FlashStop(void)
 }
 
 // send one byte over SPI
-uint16_t FlashSendByte(uint32_t data)
-{
+uint16_t FlashSendByte(uint32_t data) {
 
     // wait until SPI is ready for transfer
     //if you are checking for incoming data returned then the TXEMPTY flag is redundant
@@ -174,20 +169,17 @@ uint16_t FlashSendByte(uint32_t data)
 }
 
 // send last byte over SPI
-uint16_t FlashSendLastByte(uint32_t data)
-{
+uint16_t FlashSendLastByte(uint32_t data) {
     return FlashSendByte(data | AT91C_SPI_LASTXFER);
 }
 
 // read state register 1
-uint8_t Flash_ReadStat1(void)
-{
+uint8_t Flash_ReadStat1(void) {
     FlashSendByte(READSTAT1);
     return FlashSendLastByte(0xFF);
 }
 
-bool Flash_CheckBusy(uint32_t timeout)
-{
+bool Flash_CheckBusy(uint32_t timeout) {
     WaitUS(WINBOND_WRITE_DELAY);
     StartCountUS();
     uint32_t _time = GetCountUS();
@@ -208,8 +200,7 @@ bool Flash_CheckBusy(uint32_t timeout)
 }
 
 // read ID out
-uint8_t Flash_ReadID(void)
-{
+uint8_t Flash_ReadID(void) {
 
     if (Flash_CheckBusy(BUSY_TIMEOUT)) return 0;
 
@@ -231,8 +222,7 @@ uint8_t Flash_ReadID(void)
 }
 
 // read unique id for chip.
-void Flash_UniqueID(uint8_t *uid)
-{
+void Flash_UniqueID(uint8_t *uid) {
 
     if (Flash_CheckBusy(BUSY_TIMEOUT)) return;
 
@@ -253,8 +243,7 @@ void Flash_UniqueID(uint8_t *uid)
     uid[0] = FlashSendLastByte(0xFF);
 }
 
-uint16_t Flash_ReadData(uint32_t address, uint8_t *out, uint16_t len)
-{
+uint16_t Flash_ReadData(uint32_t address, uint8_t *out, uint16_t len) {
 
     if (!FlashInit()) return 0;
 
@@ -279,16 +268,14 @@ uint16_t Flash_ReadData(uint32_t address, uint8_t *out, uint16_t len)
     return len;
 }
 
-void Flash_TransferAdresse(uint32_t address)
-{
+void Flash_TransferAdresse(uint32_t address) {
     FlashSendByte((address >> 16) & 0xFF);
     FlashSendByte((address >> 8) & 0xFF);
     FlashSendByte((address >> 0) & 0xFF);
 }
 
 /* This ensure we can ReadData without having to cycle through initialization everytime */
-uint16_t Flash_ReadDataCont(uint32_t address, uint8_t *out, uint16_t len)
-{
+uint16_t Flash_ReadDataCont(uint32_t address, uint8_t *out, uint16_t len) {
 
     // length should never be zero
     if (!len) return 0;
@@ -314,8 +301,7 @@ uint16_t Flash_ReadDataCont(uint32_t address, uint8_t *out, uint16_t len)
 ////////////////////////////////////////
 // Write data can only program one page. A page has 256 bytes.
 // if len > 256, it might wrap around and overwrite pos 0.
-uint16_t Flash_WriteData(uint32_t address, uint8_t *in, uint16_t len)
-{
+uint16_t Flash_WriteData(uint32_t address, uint8_t *in, uint16_t len) {
 
     // length should never be zero
     if (!len)
@@ -361,8 +347,7 @@ uint16_t Flash_WriteData(uint32_t address, uint8_t *in, uint16_t len)
 // length should never be zero
 // Max 256 bytes write
 // out-of-range
-uint16_t Flash_WriteDataCont(uint32_t address, uint8_t *in, uint16_t len)
-{
+uint16_t Flash_WriteDataCont(uint32_t address, uint8_t *in, uint16_t len) {
 
     if (!len)
         return 0;
@@ -392,8 +377,7 @@ uint16_t Flash_WriteDataCont(uint32_t address, uint8_t *in, uint16_t len)
 
 // assumes valid start 256 based 00 address
 //
-uint16_t Flash_Write(uint32_t address, uint8_t *in, uint16_t len)
-{
+uint16_t Flash_Write(uint32_t address, uint8_t *in, uint16_t len) {
 
     bool isok;
     uint16_t res, bytes_sent = 0, bytes_remaining = len;
@@ -424,8 +408,7 @@ out:
 }
 
 
-bool Flash_WipeMemoryPage(uint8_t page)
-{
+bool Flash_WipeMemoryPage(uint8_t page) {
     if (!FlashInit()) {
         if (MF_DBGLEVEL > 3) Dbprintf("Flash_WriteData init fail");
         return false;
@@ -441,8 +424,7 @@ bool Flash_WipeMemoryPage(uint8_t page)
     return true;
 }
 // Wipes flash memory completely, fills with 0xFF
-bool Flash_WipeMemory()
-{
+bool Flash_WipeMemory() {
     if (!FlashInit()) {
         if (MF_DBGLEVEL > 3) Dbprintf("Flash_WriteData init fail");
         return false;
@@ -469,16 +451,14 @@ bool Flash_WipeMemory()
 }
 
 // enable the flash write
-void Flash_WriteEnable()
-{
+void Flash_WriteEnable() {
     FlashSendLastByte(WRITEENABLE);
     if (MF_DBGLEVEL > 3) Dbprintf("Flash Write enabled");
 }
 
 // erase 4K at one time
 // execution time: 0.8ms / 800us
-bool Flash_Erase4k(uint8_t block, uint8_t sector)
-{
+bool Flash_Erase4k(uint8_t block, uint8_t sector) {
 
     if (block > MAX_BLOCKS  || sector > MAX_SECTORS) return false;
 
@@ -513,8 +493,7 @@ bool Flash_Erase32k(uint32_t address) {
 // 0x01 00 00  -- 0x 01 FF FF  == block 1
 // 0x02 00 00  -- 0x 02 FF FF  == block 2
 // 0x03 00 00  -- 0x 03 FF FF  == block 3
-bool Flash_Erase64k(uint8_t block)
-{
+bool Flash_Erase64k(uint8_t block) {
 
     if (block > MAX_BLOCKS) return false;
 
@@ -526,13 +505,11 @@ bool Flash_Erase64k(uint8_t block)
 }
 
 // Erase chip
-void Flash_EraseChip(void)
-{
+void Flash_EraseChip(void) {
     FlashSendLastByte(CHIPERASE);
 }
 
-void Flashmem_print_status(void)
-{
+void Flashmem_print_status(void) {
     DbpString("Flash memory");
     Dbprintf("  Baudrate................%dMHz", FLASHMEM_SPIBAUDRATE / 1000000);
 
diff --git a/armsrc/fpgaloader.c b/armsrc/fpgaloader.c
index 76a33bd9e..0b94bba45 100644
--- a/armsrc/fpgaloader.c
+++ b/armsrc/fpgaloader.c
@@ -28,8 +28,7 @@ static uint32_t uncompressed_bytes_cnt;
 // Used to write the FPGA config word
 // May also be used to write to other SPI attached devices like an LCD
 //-----------------------------------------------------------------------------
-static void DisableSpi(void)
-{
+static void DisableSpi(void) {
     //* Reset all the Chip Select register
     AT91C_BASE_SPI->SPI_CSR[0] = 0;
     AT91C_BASE_SPI->SPI_CSR[1] = 0;
@@ -46,8 +45,7 @@ static void DisableSpi(void)
     AT91C_BASE_SPI->SPI_CR = AT91C_SPI_SPIDIS;
 }
 
-void SetupSpi(int mode)
-{
+void SetupSpi(int mode) {
     // PA1  -> SPI_NCS3 chip select (MEM)
     // PA10 -> SPI_NCS2 chip select (LCD)
     // PA11 -> SPI_NCS0 chip select (FPGA)
@@ -120,8 +118,7 @@ void SetupSpi(int mode)
 // Set up the synchronous serial port, with the one set of options that we
 // always use when we are talking to the FPGA. Both RX and TX are enabled.
 //-----------------------------------------------------------------------------
-void FpgaSetupSsc(void)
-{
+void FpgaSetupSsc(void) {
     // First configure the GPIOs, and get ourselves a clock.
     AT91C_BASE_PIOA->PIO_ASR =
         GPIO_SSC_FRAME  |
@@ -159,8 +156,7 @@ void FpgaSetupSsc(void)
 // ourselves, not to another buffer). The stuff to manipulate those buffers
 // is in apps.h, because it should be inlined, for speed.
 //-----------------------------------------------------------------------------
-bool FpgaSetupSscDma(uint8_t *buf, int len)
-{
+bool FpgaSetupSscDma(uint8_t *buf, int len) {
     if (buf == NULL) return false;
 
     FpgaDisableSscDma();
@@ -176,8 +172,7 @@ bool FpgaSetupSscDma(uint8_t *buf, int len)
 // Uncompress (inflate) the FPGA data. Returns one decompressed byte with
 // each call.
 //----------------------------------------------------------------------------
-static int get_from_fpga_combined_stream(z_streamp compressed_fpga_stream, uint8_t *output_buffer)
-{
+static int get_from_fpga_combined_stream(z_streamp compressed_fpga_stream, uint8_t *output_buffer) {
     if (fpga_image_ptr == compressed_fpga_stream->next_out) { // need more data
         compressed_fpga_stream->next_out = output_buffer;
         compressed_fpga_stream->avail_out = OUTPUT_BUFFER_LEN;
@@ -199,8 +194,7 @@ static int get_from_fpga_combined_stream(z_streamp compressed_fpga_stream, uint8
 // are combined into one big file:
 // 288 bytes from FPGA file 1, followed by 288 bytes from FGPA file 2, etc.
 //----------------------------------------------------------------------------
-static int get_from_fpga_stream(int bitstream_version, z_streamp compressed_fpga_stream, uint8_t *output_buffer)
-{
+static int get_from_fpga_stream(int bitstream_version, z_streamp compressed_fpga_stream, uint8_t *output_buffer) {
     while ((uncompressed_bytes_cnt / FPGA_INTERLEAVE_SIZE) % fpga_bitstream_num != (bitstream_version - 1)) {
         // skip undesired data belonging to other bitstream_versions
         get_from_fpga_combined_stream(compressed_fpga_stream, output_buffer);
@@ -209,14 +203,12 @@ static int get_from_fpga_stream(int bitstream_version, z_streamp compressed_fpga
     return get_from_fpga_combined_stream(compressed_fpga_stream, output_buffer);
 }
 
-static voidpf fpga_inflate_malloc(voidpf opaque, uInt items, uInt size)
-{
+static voidpf fpga_inflate_malloc(voidpf opaque, uInt items, uInt size) {
     return BigBuf_malloc(items * size);
 }
 
 // free eventually allocated BigBuf memory
-static void fpga_inflate_free(voidpf opaque, voidpf address)
-{
+static void fpga_inflate_free(voidpf opaque, voidpf address) {
     BigBuf_free();
     BigBuf_Clear_ext(false);
 }
@@ -224,8 +216,7 @@ static void fpga_inflate_free(voidpf opaque, voidpf address)
 //----------------------------------------------------------------------------
 // Initialize decompression of the respective (HF or LF) FPGA stream
 //----------------------------------------------------------------------------
-static bool reset_fpga_stream(int bitstream_version, z_streamp compressed_fpga_stream, uint8_t *output_buffer)
-{
+static bool reset_fpga_stream(int bitstream_version, z_streamp compressed_fpga_stream, uint8_t *output_buffer) {
     uint8_t header[FPGA_BITSTREAM_FIXED_HEADER_SIZE];
 
     uncompressed_bytes_cnt = 0;
@@ -252,8 +243,7 @@ static bool reset_fpga_stream(int bitstream_version, z_streamp compressed_fpga_s
     return false;
 }
 
-static void DownloadFPGA_byte(uint8_t w)
-{
+static void DownloadFPGA_byte(uint8_t w) {
 #define SEND_BIT(x) { if(w & (1<<x) ) HIGH(GPIO_FPGA_DIN); else LOW(GPIO_FPGA_DIN); HIGH(GPIO_FPGA_CCLK); LOW(GPIO_FPGA_CCLK); }
     SEND_BIT(7);
     SEND_BIT(6);
@@ -266,8 +256,7 @@ static void DownloadFPGA_byte(uint8_t w)
 }
 
 // Download the fpga image starting at current stream position with length FpgaImageLen bytes
-static void DownloadFPGA(int bitstream_version, int FpgaImageLen, z_streamp compressed_fpga_stream, uint8_t *output_buffer)
-{
+static void DownloadFPGA(int bitstream_version, int FpgaImageLen, z_streamp compressed_fpga_stream, uint8_t *output_buffer) {
     int i = 0;
 
     AT91C_BASE_PIOA->PIO_OER = GPIO_FPGA_ON;
@@ -349,8 +338,7 @@ static void DownloadFPGA(int bitstream_version, int FpgaImageLen, z_streamp comp
  * (big endian), <length> bytes content. Except for section 'e' which has 4 bytes
  * length.
  */
-static int bitparse_find_section(int bitstream_version, char section_name, uint32_t *section_length, z_streamp compressed_fpga_stream, uint8_t *output_buffer)
-{
+static int bitparse_find_section(int bitstream_version, char section_name, uint32_t *section_length, z_streamp compressed_fpga_stream, uint8_t *output_buffer) {
     int result = 0;
 #define MAX_FPGA_BIT_STREAM_HEADER_SEARCH 100  // maximum number of bytes to search for the requested section
     uint16_t numbytes = 0;
@@ -399,8 +387,7 @@ static int bitparse_find_section(int bitstream_version, char section_name, uint3
 // Check which FPGA image is currently loaded (if any). If necessary
 // decompress and load the correct (HF or LF) image to the FPGA
 //----------------------------------------------------------------------------
-void FpgaDownloadAndGo(int bitstream_version)
-{
+void FpgaDownloadAndGo(int bitstream_version) {
 
     // check whether or not the bitstream is already loaded
     if (downloaded_bitstream == bitstream_version)
@@ -439,8 +426,7 @@ void FpgaDownloadAndGo(int bitstream_version)
 // The bit format is:  C3 C2 C1 C0 D11 D10 D9 D8 D7 D6 D5 D4 D3 D2 D1 D0
 // where C is the 4 bit command and D is the 12 bit data
 //-----------------------------------------------------------------------------
-void FpgaSendCommand(uint16_t cmd, uint16_t v)
-{
+void FpgaSendCommand(uint16_t cmd, uint16_t v) {
     SetupSpi(SPI_FPGA_MODE);
     while ((AT91C_BASE_SPI->SPI_SR & AT91C_SPI_TXEMPTY) == 0); // wait for the transfer to complete
     AT91C_BASE_SPI->SPI_TDR = AT91C_SPI_LASTXFER | cmd | v;    // send the data
@@ -451,8 +437,7 @@ void FpgaSendCommand(uint16_t cmd, uint16_t v)
 // vs. clone vs. etc.). This is now a special case of FpgaSendCommand() to
 // avoid changing this function's occurence everywhere in the source code.
 //-----------------------------------------------------------------------------
-void FpgaWriteConfWord(uint8_t v)
-{
+void FpgaWriteConfWord(uint8_t v) {
     FpgaSendCommand(FPGA_CMD_SET_CONFREG, v);
 }
 
@@ -461,8 +446,7 @@ void FpgaWriteConfWord(uint8_t v)
 // closable, but should only close one at a time. Not an FPGA thing, but
 // the samples from the ADC always flow through the FPGA.
 //-----------------------------------------------------------------------------
-void SetAdcMuxFor(uint32_t whichGpio)
-{
+void SetAdcMuxFor(uint32_t whichGpio) {
     AT91C_BASE_PIOA->PIO_OER =
         GPIO_MUXSEL_HIPKD |
         GPIO_MUXSEL_LOPKD |
@@ -485,14 +469,12 @@ void SetAdcMuxFor(uint32_t whichGpio)
     HIGH(whichGpio);
 }
 
-void Fpga_print_status(void)
-{
+void Fpga_print_status(void) {
     Dbprintf("Currently loaded FPGA image");
     Dbprintf("  mode....................%s", fpga_version_information[downloaded_bitstream - 1]);
 }
 
-int FpgaGetCurrent(void)
-{
+int FpgaGetCurrent(void) {
     return downloaded_bitstream;
 }
 
@@ -500,8 +482,7 @@ int FpgaGetCurrent(void)
 // log message
 // if HF,  Disable SSC DMA
 // turn off trace and leds off.
-void switch_off(void)
-{
+void switch_off(void) {
     if (MF_DBGLEVEL > 3) Dbprintf("switch_off");
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     if (downloaded_bitstream == FPGA_BITSTREAM_HF)
diff --git a/armsrc/hfsnoop.c b/armsrc/hfsnoop.c
index 9400b6b3d..4ec60d175 100644
--- a/armsrc/hfsnoop.c
+++ b/armsrc/hfsnoop.c
@@ -6,8 +6,7 @@
 
 static void RAMFUNC optimizedSnoop(void);
 
-static void RAMFUNC optimizedSnoop(void)
-{
+static void RAMFUNC optimizedSnoop(void) {
     int n = BigBuf_max_traceLen() / sizeof(uint16_t); // take all memory
 
     uint16_t *dest = (uint16_t *)BigBuf_get_addr();
@@ -24,8 +23,7 @@ static void RAMFUNC optimizedSnoop(void)
     set_tracelen(BigBuf_max_traceLen());
 }
 
-void HfSnoop(int samplesToSkip, int triggersToSkip)
-{
+void HfSnoop(int samplesToSkip, int triggersToSkip) {
     BigBuf_free();
     BigBuf_Clear();
 
diff --git a/armsrc/hitag2.c b/armsrc/hitag2.c
index 4bbc8fc6b..d408c0ab3 100644
--- a/armsrc/hitag2.c
+++ b/armsrc/hitag2.c
@@ -108,8 +108,7 @@ static const u32 ht2_f4a = 0x2C79;     // 0010 1100 0111 1001
 static const u32 ht2_f4b = 0x6671;     // 0110 0110 0111 0001
 static const u32 ht2_f5c = 0x7907287B; // 0111 1001 0000 0111 0010 1000 0111 1011
 
-static u32 _f20(const u64 x)
-{
+static u32 _f20(const u64 x) {
     u32 i5;
 
     i5 = ((ht2_f4a >> i4(x, 1, 2, 4, 5)) & 1) * 1
@@ -121,8 +120,7 @@ static u32 _f20(const u64 x)
     return (ht2_f5c >> i5) & 1;
 }
 
-static u64 _hitag2_init(const u64 key, const u32 serial, const u32 IV)
-{
+static u64 _hitag2_init(const u64 key, const u32 serial, const u32 IV) {
     u32 i;
     u64 x = ((key & 0xFFFF) << 32) + serial;
 
@@ -133,8 +131,7 @@ static u64 _hitag2_init(const u64 key, const u32 serial, const u32 IV)
     return x;
 }
 
-static u64 _hitag2_round(u64 *state)
-{
+static u64 _hitag2_round(u64 *state) {
     u64 x = *state;
 
     x = (x >>  1) +
@@ -157,29 +154,25 @@ static u64 _hitag2_round(u64 *state)
 // The inverse of the first 4 bytes is sent to the tag to authenticate.
 // The rest is encrypted by XORing it with the subsequent keystream.
 
-static u32 _hitag2_byte(u64 *x)
-{
+static u32 _hitag2_byte(u64 *x) {
     u32 i, c;
 
     for (i = 0, c = 0; i < 8; i++) c += (u32) _hitag2_round(x) << (i ^ 7);
     return c;
 }
 
-static int hitag2_reset(void)
-{
+static int hitag2_reset(void) {
     tag.state = TAG_STATE_RESET;
     tag.crypto_active = 0;
     return 0;
 }
 
-static int hitag2_init(void)
-{
+static int hitag2_init(void) {
     hitag2_reset();
     return 0;
 }
 
-static void hitag2_cipher_reset(struct hitag2_tag *tag, const uint8_t *iv)
-{
+static void hitag2_cipher_reset(struct hitag2_tag *tag, const uint8_t *iv) {
     uint64_t key = ((uint64_t)tag->sectors[2][2]) |
                    ((uint64_t)tag->sectors[2][3] << 8) |
                    ((uint64_t)tag->sectors[1][0] << 16) |
@@ -197,8 +190,7 @@ static void hitag2_cipher_reset(struct hitag2_tag *tag, const uint8_t *iv)
     tag->cs = _hitag2_init(rev64(key), rev32(uid), rev32(iv_));
 }
 
-static int hitag2_cipher_authenticate(uint64_t *cs, const uint8_t *authenticator_is)
-{
+static int hitag2_cipher_authenticate(uint64_t *cs, const uint8_t *authenticator_is) {
     uint8_t authenticator_should[4];
     authenticator_should[0] = ~_hitag2_byte(cs);
     authenticator_should[1] = ~_hitag2_byte(cs);
@@ -207,8 +199,7 @@ static int hitag2_cipher_authenticate(uint64_t *cs, const uint8_t *authenticator
     return (memcmp(authenticator_should, authenticator_is, 4) == 0);
 }
 
-static int hitag2_cipher_transcrypt(uint64_t *cs, uint8_t *data, unsigned int bytes, unsigned int bits)
-{
+static int hitag2_cipher_transcrypt(uint64_t *cs, uint8_t *data, unsigned int bytes, unsigned int bits) {
     int i;
     for (i = 0; i < bytes; i++) data[i] ^= _hitag2_byte(cs);
     for (i = 0; i < bits; i++) data[bytes] ^= _hitag2_round(cs) << (7 - i);
@@ -250,8 +241,7 @@ static int hitag2_cipher_transcrypt(uint64_t *cs, uint8_t *data, unsigned int by
 #define HITAG_T_TAG_CAPTURE_FOUR_HALF   57
 
 
-static void hitag_send_bit(int bit)
-{
+static void hitag_send_bit(int bit) {
     LED_A_ON();
     // Reset clock for the next bit
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;
@@ -273,8 +263,7 @@ static void hitag_send_bit(int bit)
     LED_A_OFF();
 }
 
-static void hitag_send_frame(const uint8_t *frame, size_t frame_len)
-{
+static void hitag_send_frame(const uint8_t *frame, size_t frame_len) {
     // Send start of frame
     for (size_t i = 0; i < 5; i++) {
         hitag_send_bit(1);
@@ -290,8 +279,7 @@ static void hitag_send_frame(const uint8_t *frame, size_t frame_len)
 }
 
 
-static void hitag2_handle_reader_command(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t *txlen)
-{
+static void hitag2_handle_reader_command(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t *txlen) {
     uint8_t rx_air[HITAG_FRAME_LEN];
 
     // Copy the (original) received frame how it is send over the air
@@ -417,8 +405,7 @@ static void hitag2_handle_reader_command(uint8_t *rx, const size_t rxlen, uint8_
     }
 }
 
-static void hitag_reader_send_bit(int bit)
-{
+static void hitag_reader_send_bit(int bit) {
     LED_A_ON();
     // Reset clock for the next bit
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;
@@ -448,8 +435,7 @@ static void hitag_reader_send_bit(int bit)
 }
 
 
-static void hitag_reader_send_frame(const uint8_t *frame, size_t frame_len)
-{
+static void hitag_reader_send_frame(const uint8_t *frame, size_t frame_len) {
     // Send the content of the frame
     for (size_t i = 0; i < frame_len; i++) {
         hitag_reader_send_bit((frame[i / 8] >> (7 - (i % 8))) & 1);
@@ -466,8 +452,7 @@ static void hitag_reader_send_frame(const uint8_t *frame, size_t frame_len)
 
 size_t blocknr;
 
-static bool hitag2_password(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t *txlen)
-{
+static bool hitag2_password(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t *txlen) {
     // Reset the transmission frame length
     *txlen = 0;
 
@@ -525,8 +510,7 @@ static bool hitag2_password(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t
     return true;
 }
 
-static bool hitag2_write_page(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t *txlen)
-{
+static bool hitag2_write_page(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t *txlen) {
     switch (writestate) {
         case WRITE_STATE_START:
             *txlen = 10;
@@ -537,8 +521,8 @@ static bool hitag2_write_page(uint8_t *rx, const size_t rxlen, uint8_t *tx, size
         case WRITE_STATE_PAGENUM_WRITTEN:
             // Check if page number was received correctly
             if ((rxlen == 10) &&
-                (rx[0] == (0x82 | (blocknr << 3) | ((blocknr ^ 7) >> 2))) &&
-                (rx[1] == (((blocknr & 0x3) ^ 0x3) << 6))) {
+                    (rx[0] == (0x82 | (blocknr << 3) | ((blocknr ^ 7) >> 2))) &&
+                    (rx[1] == (((blocknr & 0x3) ^ 0x3) << 6))) {
                 *txlen = 32;
                 memset(tx, 0, HITAG_FRAME_LEN);
                 memcpy(tx, writedata, 4);
@@ -567,8 +551,7 @@ static bool hitag2_write_page(uint8_t *rx, const size_t rxlen, uint8_t *tx, size
     return true;
 }
 
-static bool hitag2_crypto(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t *txlen, bool write)
-{
+static bool hitag2_crypto(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t *txlen, bool write) {
     // Reset the transmission frame length
     *txlen = 0;
 
@@ -677,8 +660,7 @@ static bool hitag2_crypto(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t *
 }
 
 
-static bool hitag2_authenticate(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t *txlen)
-{
+static bool hitag2_authenticate(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t *txlen) {
     // Reset the transmission frame length
     *txlen = 0;
 
@@ -721,8 +703,7 @@ static bool hitag2_authenticate(uint8_t *rx, const size_t rxlen, uint8_t *tx, si
 }
 
 
-static bool hitag2_test_auth_attempts(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t *txlen)
-{
+static bool hitag2_test_auth_attempts(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t *txlen) {
 
     // Reset the transmission frame length
     *txlen = 0;
@@ -781,8 +762,7 @@ static bool hitag2_test_auth_attempts(uint8_t *rx, const size_t rxlen, uint8_t *
     return true;
 }
 
-static bool hitag2_read_uid(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t *txlen)
-{
+static bool hitag2_read_uid(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t *txlen) {
     // Reset the transmission frame length
     *txlen = 0;
 
@@ -822,8 +802,7 @@ static bool hitag2_read_uid(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t
     return true;
 }
 
-void SnoopHitag(uint32_t type)
-{
+void SnoopHitag(uint32_t type) {
     int frame_count;
     int response;
     int overflow;
@@ -1041,8 +1020,7 @@ void SnoopHitag(uint32_t type)
 // DbpString("All done");
 }
 
-void SimulateHitagTag(bool tag_mem_supplied, uint8_t *data)
-{
+void SimulateHitagTag(bool tag_mem_supplied, uint8_t *data) {
     int frame_count;
     int response;
     int overflow;
@@ -1233,8 +1211,7 @@ void SimulateHitagTag(bool tag_mem_supplied, uint8_t *data)
     set_tracing(false);
 }
 
-void ReaderHitag(hitag_function htf, hitag_data *htd)
-{
+void ReaderHitag(hitag_function htf, hitag_data *htd) {
     int frame_count = 0;
     int response = 0;
     uint8_t rx[HITAG_FRAME_LEN];
@@ -1548,8 +1525,7 @@ void ReaderHitag(hitag_function htf, hitag_data *htd)
         cmd_send(CMD_ACK, bSuccessful, 0, 0, 0, 0);
 }
 
-void WriterHitag(hitag_function htf, hitag_data *htd, int page)
-{
+void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
     int frame_count;
     int response;
     uint8_t rx[HITAG_FRAME_LEN];
diff --git a/armsrc/hitagS.c b/armsrc/hitagS.c
index 33028b777..b53112081 100644
--- a/armsrc/hitagS.c
+++ b/armsrc/hitagS.c
@@ -65,8 +65,7 @@ static const u32 ht2_f5c = 0x7907287B;        // 0111 1001 0000 0111 0010 1000 0
 #define ht2bs_5c(a,b,c,d,e) (~((((((c^e)|d)&a)^b)&(c^b))^(((d^e)|a)&((d^b)|c))))
 #define uf20bs              u32
 
-static u32 f20(const u64 x)
-{
+static u32 f20(const u64 x) {
     u32 i5;
 
     i5 = ((ht2_f4a >> i4(x, 1, 2, 4, 5)) & 1) * 1
@@ -77,8 +76,7 @@ static u32 f20(const u64 x)
 
     return (ht2_f5c >> i5) & 1;
 }
-static u64 hitag2_round(u64 *state)
-{
+static u64 hitag2_round(u64 *state) {
     u64 x = *state;
 
     x = (x >> 1)
@@ -90,8 +88,7 @@ static u64 hitag2_round(u64 *state)
     *state = x;
     return f20(x);
 }
-static u64 hitag2_init(const u64 key, const u32 serial, const u32 IV)
-{
+static u64 hitag2_init(const u64 key, const u32 serial, const u32 IV) {
     u32 i;
     u64 x = ((key & 0xFFFF) << 32) + serial;
     for (i = 0; i < 32; i++) {
@@ -100,8 +97,7 @@ static u64 hitag2_init(const u64 key, const u32 serial, const u32 IV)
     }
     return x;
 }
-static u32 hitag2_byte(u64 *x)
-{
+static u32 hitag2_byte(u64 *x) {
     u32 i, c;
 
     for (i = 0, c = 0; i < 8; i++)
@@ -148,8 +144,7 @@ static u32 hitag2_byte(u64 *x)
  * Implementation of the crc8 calculation from Hitag S
  * from http://www.proxmark.org/files/Documents/125%20kHz%20-%20Hitag/HitagS.V11.pdf
  */
-void calc_crc(unsigned char *crc, unsigned char data, unsigned char Bitcount)
-{
+void calc_crc(unsigned char *crc, unsigned char data, unsigned char Bitcount) {
     *crc ^= data; // crc = crc (exor) data
     do {
         if (*crc & 0x80) { // if (MSB-CRC == 1)
@@ -161,8 +156,7 @@ void calc_crc(unsigned char *crc, unsigned char data, unsigned char Bitcount)
     } while (--Bitcount);
 }
 
-static void hitag_send_bit(int bit)
-{
+static void hitag_send_bit(int bit) {
     LED_A_ON();
     // Reset clock for the next bit
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;
@@ -264,8 +258,7 @@ static void hitag_send_bit(int bit)
     }
 }
 
-static void hitag_send_frame(const byte_t *frame, size_t frame_len)
-{
+static void hitag_send_frame(const byte_t *frame, size_t frame_len) {
 // Send start of frame
 
     for (size_t i = 0; i < sof_bits; i++) {
@@ -280,8 +273,7 @@ static void hitag_send_frame(const byte_t *frame, size_t frame_len)
     LOW(GPIO_SSC_DOUT);
 }
 
-static void hitag_reader_send_bit(int bit)
-{
+static void hitag_reader_send_bit(int bit) {
 //Dbprintf("BIT: %d",bit);
     LED_A_ON();
 // Reset clock for the next bit
@@ -337,8 +329,7 @@ static void hitag_reader_send_bit(int bit)
     LED_A_OFF();
 }
 
-static void hitag_reader_send_frame(const byte_t *frame, size_t frame_len)
-{
+static void hitag_reader_send_frame(const byte_t *frame, size_t frame_len) {
 // Send the content of the frame
     for (size_t i = 0; i < frame_len; i++) {
         if (frame[0] == 0xf8) {
@@ -360,8 +351,7 @@ static void hitag_reader_send_frame(const byte_t *frame, size_t frame_len)
 /*
  * to check if the right uid was selected
  */
-static int check_select(byte_t *rx, uint32_t uid)
-{
+static int check_select(byte_t *rx, uint32_t uid) {
     unsigned char resp[48];
     int i;
     uint32_t ans = 0x0;
@@ -382,8 +372,7 @@ static int check_select(byte_t *rx, uint32_t uid)
  * handles all commands from a reader
  */
 static void hitagS_handle_reader_command(byte_t *rx, const size_t rxlen,
-                                         byte_t *tx, size_t *txlen)
-{
+                                         byte_t *tx, size_t *txlen) {
     byte_t rx_air[HITAG_FRAME_LEN];
     byte_t page;
     int i;
@@ -679,7 +668,7 @@ static void hitagS_handle_reader_command(byte_t *rx, const size_t rxlen,
                         break;
                 }
                 if ((tag.LCON && page == 1)
-                    || (tag.LKP && (page == 2 || page == 3))) {
+                        || (tag.LKP && (page == 2 || page == 3))) {
                     //deny
                     *txlen = 0;
                 } else {
@@ -732,8 +721,7 @@ static void hitagS_handle_reader_command(byte_t *rx, const size_t rxlen,
  * to autenticate to a tag with the given key or challenge
  */
 static int hitagS_handle_tag_auth(hitag_function htf, uint64_t key, uint64_t NrAr, byte_t *rx, const size_t rxlen, byte_t *tx,
-                                  size_t *txlen)
-{
+                                  size_t *txlen) {
     byte_t rx_air[HITAG_FRAME_LEN];
     int response_bit[200];
     int i, j, z, k;
@@ -945,8 +933,7 @@ static int hitagS_handle_tag_auth(hitag_function htf, uint64_t key, uint64_t NrA
 /*
  * Emulates a Hitag S Tag with the given data from the .hts file
  */
-void SimulateHitagSTag(bool tag_mem_supplied, byte_t *data)
-{
+void SimulateHitagSTag(bool tag_mem_supplied, byte_t *data) {
     int frame_count;
     int response;
     int overflow;
@@ -1172,8 +1159,7 @@ void SimulateHitagSTag(bool tag_mem_supplied, byte_t *data)
  * If the key was given the password will be decrypted.
  * Reads every page of a hitag S transpoder.
  */
-void ReadHitagS(hitag_function htf, hitag_data *htd)
-{
+void ReadHitagS(hitag_function htf, hitag_data *htd) {
     int i, j, z, k;
     int frame_count;
     int response_bit[200];
@@ -1518,8 +1504,7 @@ void ReadHitagS(hitag_function htf, hitag_data *htd)
  * Authenticates to the Tag with the given Key or Challenge.
  * Writes the given 32Bit data into page_
  */
-void WritePageHitagS(hitag_function htf, hitag_data *htd, int page_)
-{
+void WritePageHitagS(hitag_function htf, hitag_data *htd, int page_) {
     int frame_count;
     int response;
     byte_t rx[HITAG_FRAME_LEN];
@@ -1727,7 +1712,7 @@ void WritePageHitagS(hitag_function htf, hitag_data *htd, int page_)
         // All timer values are in terms of T0 units
 
         while (AT91C_BASE_TC0->TC_CV
-               < T0 * (t_wait + (HITAG_T_TAG_HALF_PERIOD * lastbit)))
+                < T0 * (t_wait + (HITAG_T_TAG_HALF_PERIOD * lastbit)))
             ;
 
         // Transmit the reader frame
@@ -1835,8 +1820,7 @@ void WritePageHitagS(hitag_function htf, hitag_data *htd, int page_)
  * is not received correctly due to Antenna problems. This function
  * detects these challenges.
  */
-void check_challenges(bool file_given, byte_t *data)
-{
+void check_challenges(bool file_given, byte_t *data) {
     int i, j, z, k;
     byte_t uid_byte[4];
     int frame_count;
@@ -2060,7 +2044,7 @@ void check_challenges(bool file_given, byte_t *data)
         // All timer values are in terms of T0 units
 
         while (AT91C_BASE_TC0->TC_CV
-               < T0 * (t_wait + (HITAG_T_TAG_HALF_PERIOD * lastbit)))
+                < T0 * (t_wait + (HITAG_T_TAG_HALF_PERIOD * lastbit)))
             ;
 
         // Transmit the reader frame
diff --git a/armsrc/iclass.c b/armsrc/iclass.c
index d5f908a12..7bd725eab 100644
--- a/armsrc/iclass.c
+++ b/armsrc/iclass.c
@@ -141,19 +141,16 @@ typedef struct {
 } tUart;
 static tUart Uart;
 
-static void uart_reset(void)
-{
+static void uart_reset(void) {
     Uart.frame_done = false;
     Uart.synced = false;
     Uart.frame = false;
 }
-static void uart_init(uint8_t *data)
-{
+static void uart_init(uint8_t *data) {
     Uart.buf = data;
     uart_reset();
 }
-static void uart_bit(uint8_t bit)
-{
+static void uart_bit(uint8_t bit) {
     static uint8_t buf = 0xff;
     static uint8_t n_buf;
     static uint8_t msg_byte;
@@ -208,8 +205,7 @@ static void uart_bit(uint8_t bit)
     }
 }
 
-static void uart_samples(uint8_t byte)
-{
+static void uart_samples(uint8_t byte) {
     static uint32_t buf;
     static int window;
     static int drop_next = 0;
@@ -504,8 +500,7 @@ static RAMFUNC int OutOfNDecoding(int bit) {
 // Manchester
 //=============================================================================
 static tDemod Demod;
-static void DemodReset()
-{
+static void DemodReset() {
     Demod.bitCount = 0;
     Demod.posCount = 0;
     Demod.syncBit = 0;
@@ -519,8 +514,7 @@ static void DemodReset()
     Demod.sub = SUB_NONE;
     Demod.state = DEMOD_UNSYNCD;
 }
-static void DemodInit(uint8_t *data)
-{
+static void DemodInit(uint8_t *data) {
     Demod.output = data;
     DemodReset();
 }
@@ -546,8 +540,7 @@ Recorded Activity (TraceLen = 162 bytes)
        2720 |       2720 | Rdr |0c                                                               |     | IDENTIFY
        3232 |       3232 | Tag |bb! d4! bb! 02  02  08  04  bb!                                  |  ok |
 */
-static void uart_debug(int error, int bit)
-{
+static void uart_debug(int error, int bit) {
     Demod.output[Demod.len] = 0xBB;
     Demod.len++;
     Demod.output[Demod.len] = error & 0xFF;
@@ -583,8 +576,7 @@ static void uart_debug(int error, int bit)
 *
 *  So for current implementation in ISO15693, its 330 µs from end of reader, to start of card.
 */
-static RAMFUNC int ManchesterDecoding_iclass(uint32_t v)
-{
+static RAMFUNC int ManchesterDecoding_iclass(uint32_t v) {
     int bit;
     int modulation;
     int error = 0;
@@ -806,8 +798,7 @@ static RAMFUNC int ManchesterDecoding_iclass(uint32_t v)
 // Finally, a `sniffer' for iClass communication
 // Both sides of communication!
 //=============================================================================
-static void iclass_setup_sniff(void)
-{
+static void iclass_setup_sniff(void) {
     if (MF_DBGLEVEL > 3) Dbprintf("iclass_setup_sniff Enter");
 
     LEDsoff();
@@ -860,8 +851,7 @@ static void iclass_setup_sniff(void)
 // near the reader.
 //-----------------------------------------------------------------------------
 // turn off afterwards
-void RAMFUNC SniffIClass(void)
-{
+void RAMFUNC SniffIClass(void) {
 
     //int datalen = 0;
     uint32_t previous_data = 0;
@@ -983,8 +973,7 @@ void RAMFUNC SniffIClass(void)
     switch_off();
 }
 
-void rotateCSN(uint8_t *originalCSN, uint8_t *rotatedCSN)
-{
+void rotateCSN(uint8_t *originalCSN, uint8_t *rotatedCSN) {
     int i;
     for (i = 0; i < 8; i++)
         rotatedCSN[i] = (originalCSN[i] >> 3) | (originalCSN[(i + 1) % 8] << 5);
@@ -996,8 +985,7 @@ void rotateCSN(uint8_t *originalCSN, uint8_t *rotatedCSN)
 // Stop when button is pressed
 // Or return TRUE when command is captured
 //-----------------------------------------------------------------------------
-static bool GetIClassCommandFromReader(uint8_t *received, int *len, int maxLen)
-{
+static bool GetIClassCommandFromReader(uint8_t *received, int *len, int maxLen) {
     // Set FPGA mode to "simulated ISO 14443 tag", no modulation (listen
     // only, since we are receiving, not transmitting).
     // Signal field is off with the appropriate LED
@@ -1029,8 +1017,7 @@ static bool GetIClassCommandFromReader(uint8_t *received, int *len, int maxLen)
     return false;
 }
 
-static uint8_t encode4Bits(const uint8_t b)
-{
+static uint8_t encode4Bits(const uint8_t b) {
     // OTA, the least significant bits first
     // Manchester encoding added
     //         The columns are
@@ -1080,8 +1067,7 @@ static uint8_t encode4Bits(const uint8_t b)
 //-----------------------------------------------------------------------------
 // Prepare tag messages
 //-----------------------------------------------------------------------------
-static void CodeIClassTagAnswer(const uint8_t *cmd, int len)
-{
+static void CodeIClassTagAnswer(const uint8_t *cmd, int len) {
     /*
      * SOF comprises 3 parts;
      * * An unmodulated time of 56.64 us
@@ -1135,8 +1121,7 @@ static void CodeIClassTagAnswer(const uint8_t *cmd, int len)
 }
 
 // Only SOF
-static void CodeIClassTagSOF()
-{
+static void CodeIClassTagSOF() {
     //So far a dummy implementation, not used
     //int lastProxToAirDuration =0;
 
@@ -1162,8 +1147,7 @@ static void CodeIClassTagSOF()
  * @param datain
  */
 // turn off afterwards
-void SimulateIClass(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)
-{
+void SimulateIClass(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain) {
 
     if (MF_DBGLEVEL > 3) Dbprintf("[+] iClass_simulate Enter");
 
@@ -1273,8 +1257,7 @@ out:
  * @param csn - csn to use
  * @param breakAfterMacReceived if true, returns after reader MAC has been received.
  */
-int doIClassSimulation(int simulationMode, uint8_t *reader_mac_buf)
-{
+int doIClassSimulation(int simulationMode, uint8_t *reader_mac_buf) {
 
     // free eventually allocated BigBuf memory
     BigBuf_free_keep_EM();
@@ -1641,8 +1624,7 @@ send:
  * @param respLen
  * @param delay
  */
-static int SendIClassAnswer(uint8_t *resp, int respLen, uint16_t delay)
-{
+static int SendIClassAnswer(uint8_t *resp, int respLen, uint16_t delay) {
     int i = 0;
     volatile uint8_t b = 0;
 
@@ -1680,8 +1662,7 @@ static int SendIClassAnswer(uint8_t *resp, int respLen, uint16_t delay)
 //-----------------------------------------------------------------------------
 // Transmit the command (to the tag) that was placed in ToSend[].
 //-----------------------------------------------------------------------------
-static void TransmitIClassCommand(const uint8_t *cmd, int len, int *samples, int *wait)
-{
+static void TransmitIClassCommand(const uint8_t *cmd, int len, int *samples, int *wait) {
 
     int c = 0;
     volatile uint32_t b;
@@ -1737,8 +1718,7 @@ static void TransmitIClassCommand(const uint8_t *cmd, int len, int *samples, int
 //-----------------------------------------------------------------------------
 // Prepare iClass reader command to send to FPGA
 //-----------------------------------------------------------------------------
-void CodeIClassCommand(const uint8_t *cmd, int len)
-{
+void CodeIClassCommand(const uint8_t *cmd, int len) {
     int i, j, k;
     uint8_t b;
 
@@ -1775,8 +1755,7 @@ void CodeIClassCommand(const uint8_t *cmd, int len)
     ToSendMax++;
 }
 
-void ReaderTransmitIClass_ext(uint8_t *frame, int len, int wait)
-{
+void ReaderTransmitIClass_ext(uint8_t *frame, int len, int wait) {
 
     int samples = 0;
 
@@ -1792,8 +1771,7 @@ void ReaderTransmitIClass_ext(uint8_t *frame, int len, int wait)
 
     LogTrace(frame, len, rsamples, rsamples, NULL, true);
 }
-void ReaderTransmitIClass(uint8_t *frame, int len)
-{
+void ReaderTransmitIClass(uint8_t *frame, int len) {
     ReaderTransmitIClass_ext(frame, len, 330);
 }
 
@@ -1802,8 +1780,7 @@ void ReaderTransmitIClass(uint8_t *frame, int len)
 //  If a response is captured return TRUE
 //  If it takes too long return FALSE
 //-----------------------------------------------------------------------------
-static int GetIClassAnswer(uint8_t *receivedResponse, int maxLen, int *samples, int *elapsed)
-{
+static int GetIClassAnswer(uint8_t *receivedResponse, int maxLen, int *samples, int *elapsed) {
     // buffer needs to be 512 bytes
     // maxLen is not used...
 
@@ -1854,8 +1831,7 @@ static int GetIClassAnswer(uint8_t *receivedResponse, int maxLen, int *samples,
     return false;
 }
 
-int ReaderReceiveIClass(uint8_t *receivedAnswer)
-{
+int ReaderReceiveIClass(uint8_t *receivedAnswer) {
     int samples = 0;
 
     if (!GetIClassAnswer(receivedAnswer, 0, &samples, NULL))
@@ -1871,8 +1847,7 @@ int ReaderReceiveIClass(uint8_t *receivedAnswer)
     return Demod.len;
 }
 
-void setupIclassReader()
-{
+void setupIclassReader() {
 
     LEDsoff();
 
@@ -1899,8 +1874,7 @@ void setupIclassReader()
     LED_A_ON();
 }
 
-bool sendCmdGetResponseWithRetries(uint8_t *command, size_t cmdsize, uint8_t *resp, uint8_t expected_size, uint8_t retries)
-{
+bool sendCmdGetResponseWithRetries(uint8_t *command, size_t cmdsize, uint8_t *resp, uint8_t expected_size, uint8_t retries) {
     uint8_t got_n = 0;
     while (retries-- > 0) {
 
@@ -1929,8 +1903,7 @@ bool sendCmdGetResponseWithRetries(uint8_t *command, size_t cmdsize, uint8_t *re
  *         1 = Got CSN
  *         2 = Got CSN and CC
  */
-uint8_t handshakeIclassTag_ext(uint8_t *card_data, bool use_credit_key)
-{
+uint8_t handshakeIclassTag_ext(uint8_t *card_data, bool use_credit_key) {
 
     // act_all...
     static uint8_t act_all[]      = { ICLASS_CMD_ACTALL };
@@ -1989,15 +1962,13 @@ uint8_t handshakeIclassTag_ext(uint8_t *card_data, bool use_credit_key)
     read_status++;
     return read_status;
 }
-uint8_t handshakeIclassTag(uint8_t *card_data)
-{
+uint8_t handshakeIclassTag(uint8_t *card_data) {
     return handshakeIclassTag_ext(card_data, false);
 }
 
 // Reader iClass Anticollission
 // turn off afterwards
-void ReaderIClass(uint8_t arg0)
-{
+void ReaderIClass(uint8_t arg0) {
 
     uint8_t card_data[6 * 8] = {0};
     uint8_t last_csn[8] = {0, 0, 0, 0, 0, 0, 0, 0};
@@ -2136,8 +2107,7 @@ void ReaderIClass(uint8_t arg0)
 }
 
 // turn off afterwards
-void ReaderIClass_Replay(uint8_t arg0, uint8_t *MAC)
-{
+void ReaderIClass_Replay(uint8_t arg0, uint8_t *MAC) {
 
     uint8_t cardsize = 0;
     uint8_t mem = 0;
@@ -2257,8 +2227,7 @@ void ReaderIClass_Replay(uint8_t arg0, uint8_t *MAC)
 
 // not used. ?!? ( CMD_ICLASS_READCHECK)
 // turn off afterwards
-void iClass_ReadCheck(uint8_t blockNo, uint8_t keyType)
-{
+void iClass_ReadCheck(uint8_t blockNo, uint8_t keyType) {
     uint8_t readcheck[] = { keyType, blockNo };
     uint8_t resp[] = {0, 0, 0, 0, 0, 0, 0, 0};
     size_t isOK = 0;
@@ -2269,8 +2238,7 @@ void iClass_ReadCheck(uint8_t blockNo, uint8_t keyType)
 
 // used with function select_and_auth (cmdhficlass.c)
 // which needs to authenticate before doing more things like read/write
-void iClass_Authentication(uint8_t *mac)
-{
+void iClass_Authentication(uint8_t *mac) {
     uint8_t check[] = { ICLASS_CMD_CHECK, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
     uint8_t resp[ICLASS_BUFFER_SIZE];
 
@@ -2297,8 +2265,7 @@ typedef struct iclass_premac {
 * - key loop only test one type of authtication key. Ie two calls needed
 *   to cover debit and credit key. (AA1/AA2)
 */
-void iClass_Authentication_fast(uint64_t arg0, uint64_t arg1, uint8_t *datain)
-{
+void iClass_Authentication_fast(uint64_t arg0, uint64_t arg1, uint8_t *datain) {
     uint8_t i = 0, isOK = 0;
     uint8_t lastChunk = ((arg0 >> 8) & 0xFF);
     bool use_credit_key = ((arg0 >> 16) & 0xFF);
@@ -2381,8 +2348,7 @@ out:
 
 // Tries to read block.
 // retries 10times.
-bool iClass_ReadBlock(uint8_t blockNo, uint8_t *data, uint8_t len)
-{
+bool iClass_ReadBlock(uint8_t blockNo, uint8_t *data, uint8_t len) {
     uint8_t resp[10];
     uint8_t cmd[] = {ICLASS_CMD_READ_OR_IDENTIFY, blockNo, 0x00, 0x00};
     AddCrc(cmd + 1, 1);
@@ -2394,8 +2360,7 @@ bool iClass_ReadBlock(uint8_t blockNo, uint8_t *data, uint8_t len)
 
 // turn off afterwards
 // readblock 8 + 2.  only want 8.
-void iClass_ReadBlk(uint8_t blockno)
-{
+void iClass_ReadBlk(uint8_t blockno) {
     uint8_t data[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
     bool isOK = iClass_ReadBlock(blockno, data, sizeof(data));
     cmd_send(CMD_ACK, isOK, 0, 0, data, sizeof(data));
@@ -2403,8 +2368,7 @@ void iClass_ReadBlk(uint8_t blockno)
 }
 
 // turn off afterwards
-void iClass_Dump(uint8_t blockno, uint8_t numblks)
-{
+void iClass_Dump(uint8_t blockno, uint8_t numblks) {
     uint8_t blockdata[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
     bool isOK = false;
     uint8_t blkCnt = 0;
@@ -2438,8 +2402,7 @@ void iClass_Dump(uint8_t blockno, uint8_t numblks)
     BigBuf_free();
 }
 
-bool iClass_WriteBlock_ext(uint8_t blockNo, uint8_t *data)
-{
+bool iClass_WriteBlock_ext(uint8_t blockNo, uint8_t *data) {
 
     uint8_t resp[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
     uint8_t write[] = { ICLASS_CMD_UPDATE, blockNo, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
@@ -2462,16 +2425,14 @@ bool iClass_WriteBlock_ext(uint8_t blockNo, uint8_t *data)
 }
 
 // turn off afterwards
-void iClass_WriteBlock(uint8_t blockNo, uint8_t *data)
-{
+void iClass_WriteBlock(uint8_t blockNo, uint8_t *data) {
     bool isOK = iClass_WriteBlock_ext(blockNo, data);
     cmd_send(CMD_ACK, isOK, 0, 0, 0, 0);
     switch_off();
 }
 
 // turn off afterwards
-void iClass_Clone(uint8_t startblock, uint8_t endblock, uint8_t *data)
-{
+void iClass_Clone(uint8_t startblock, uint8_t endblock, uint8_t *data) {
     int i, written = 0;
     int total_block = (endblock - startblock) + 1;
     for (i = 0; i < total_block; i++) {
diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 4469ca402..a22a79390 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -120,26 +120,22 @@ static uint32_t LastProxToAirDuration;
 #define SEC_Y 0x00
 #define SEC_Z 0xc0
 
-void iso14a_set_trigger(bool enable)
-{
+void iso14a_set_trigger(bool enable) {
     trigger = enable;
 }
 
-void iso14a_set_timeout(uint32_t timeout)
-{
+void iso14a_set_timeout(uint32_t timeout) {
     iso14a_timeout = timeout + (DELAY_AIR2ARM_AS_READER + DELAY_ARM2AIR_AS_READER) / (16 * 8) + 2;
 }
 
-uint32_t iso14a_get_timeout(void)
-{
+uint32_t iso14a_get_timeout(void) {
     return iso14a_timeout - (DELAY_AIR2ARM_AS_READER + DELAY_ARM2AIR_AS_READER) / (16 * 8) - 2;
 }
 
 //-----------------------------------------------------------------------------
 // Generate the parity value for a byte sequence
 //-----------------------------------------------------------------------------
-void GetParity(const uint8_t *pbtCmd, uint16_t iLen, uint8_t *par)
-{
+void GetParity(const uint8_t *pbtCmd, uint16_t iLen, uint8_t *par) {
     uint16_t paritybit_cnt = 0;
     uint16_t paritybyte_cnt = 0;
     uint8_t parityBits = 0;
@@ -193,13 +189,11 @@ const bool Mod_Miller_LUT[] = {
 #define IsMillerModulationNibble1(b) (Mod_Miller_LUT[(b & 0x000000F0) >> 4])
 #define IsMillerModulationNibble2(b) (Mod_Miller_LUT[(b & 0x0000000F)])
 
-tUart *GetUart()
-{
+tUart *GetUart() {
     return &Uart;
 }
 
-void UartReset(void)
-{
+void UartReset(void) {
     Uart.state = STATE_UNSYNCD;
     Uart.bitCount = 0;
     Uart.len = 0;                       // number of decoded data bytes
@@ -213,16 +207,14 @@ void UartReset(void)
     Uart.syncBit = 9999;
 }
 
-void UartInit(uint8_t *data, uint8_t *parity)
-{
+void UartInit(uint8_t *data, uint8_t *parity) {
     Uart.output = data;
     Uart.parity = parity;
     UartReset();
 }
 
 // use parameter non_real_time to provide a timestamp. Set to 0 if the decoder should measure real time
-RAMFUNC bool MillerDecoding(uint8_t bit, uint32_t non_real_time)
-{
+RAMFUNC bool MillerDecoding(uint8_t bit, uint32_t non_real_time) {
     Uart.fourBits = (Uart.fourBits << 8) | bit;
 
     if (Uart.state == STATE_UNSYNCD) {                                           // not yet synced
@@ -369,12 +361,10 @@ const bool Mod_Manchester_LUT[] = {
 #define IsManchesterModulationNibble1(b) (Mod_Manchester_LUT[(b & 0x00F0) >> 4])
 #define IsManchesterModulationNibble2(b) (Mod_Manchester_LUT[(b & 0x000F)])
 
-tDemod *GetDemod()
-{
+tDemod *GetDemod() {
     return &Demod;
 }
-void DemodReset(void)
-{
+void DemodReset(void) {
     Demod.state = DEMOD_UNSYNCD;
     Demod.len = 0;                       // number of decoded data bytes
     Demod.parityLen = 0;
@@ -390,16 +380,14 @@ void DemodReset(void)
     Demod.samples = 0;
 }
 
-void DemodInit(uint8_t *data, uint8_t *parity)
-{
+void DemodInit(uint8_t *data, uint8_t *parity) {
     Demod.output = data;
     Demod.parity = parity;
     DemodReset();
 }
 
 // use parameter non_real_time to provide a timestamp. Set to 0 if the decoder should measure real time
-RAMFUNC int ManchesterDecoding(uint8_t bit, uint16_t offset, uint32_t non_real_time)
-{
+RAMFUNC int ManchesterDecoding(uint8_t bit, uint16_t offset, uint32_t non_real_time) {
     Demod.twoBits = (Demod.twoBits << 8) | bit;
 
     if (Demod.state == DEMOD_UNSYNCD) {
@@ -499,8 +487,7 @@ RAMFUNC int ManchesterDecoding(uint8_t bit, uint16_t offset, uint32_t non_real_t
 // near the reader.
 // "hf 14a sniff"
 //-----------------------------------------------------------------------------
-void RAMFUNC SniffIso14443a(uint8_t param)
-{
+void RAMFUNC SniffIso14443a(uint8_t param) {
     LEDsoff();
     // param:
     // bit 0 - trigger from first card answer
@@ -663,8 +650,7 @@ void RAMFUNC SniffIso14443a(uint8_t param)
 //-----------------------------------------------------------------------------
 // Prepare tag messages
 //-----------------------------------------------------------------------------
-static void CodeIso14443aAsTagPar(const uint8_t *cmd, uint16_t len, uint8_t *parity, bool collision)
-{
+static void CodeIso14443aAsTagPar(const uint8_t *cmd, uint16_t len, uint8_t *parity, bool collision) {
 
     //uint8_t localCol = 0;
     ToSendReset();
@@ -724,19 +710,16 @@ static void CodeIso14443aAsTagPar(const uint8_t *cmd, uint16_t len, uint8_t *par
     ToSendMax++;
 }
 
-static void CodeIso14443aAsTagEx(const uint8_t *cmd, uint16_t len, bool collision)
-{
+static void CodeIso14443aAsTagEx(const uint8_t *cmd, uint16_t len, bool collision) {
     uint8_t par[MAX_PARITY_SIZE] = {0};
     GetParity(cmd, len, par);
     CodeIso14443aAsTagPar(cmd, len, par, collision);
 }
-static void CodeIso14443aAsTag(const uint8_t *cmd, uint16_t len)
-{
+static void CodeIso14443aAsTag(const uint8_t *cmd, uint16_t len) {
     CodeIso14443aAsTagEx(cmd, len, false);
 }
 
-static void Code4bitAnswerAsTag(uint8_t cmd)
-{
+static void Code4bitAnswerAsTag(uint8_t cmd) {
     uint8_t b = cmd;
 
     ToSendReset();
@@ -777,8 +760,7 @@ static void Code4bitAnswerAsTag(uint8_t cmd)
 // stop when button is pressed
 // or return TRUE when command is captured
 //-----------------------------------------------------------------------------
-int GetIso14443aCommandFromReader(uint8_t *received, uint8_t *parity, int *len)
-{
+int GetIso14443aCommandFromReader(uint8_t *received, uint8_t *parity, int *len) {
     // Set FPGA mode to "simulated ISO 14443 tag", no modulation (listen
     // only, since we are receiving, not transmitting).
     // Signal field is off with the appropriate LED
@@ -805,8 +787,7 @@ int GetIso14443aCommandFromReader(uint8_t *received, uint8_t *parity, int *len)
     return false;
 }
 
-bool prepare_tag_modulation(tag_response_info_t *response_info, size_t max_buffer_size)
-{
+bool prepare_tag_modulation(tag_response_info_t *response_info, size_t max_buffer_size) {
     // Example response, answer to MIFARE Classic read block will be 16 bytes + 2 CRC = 18 bytes
     // This will need the following byte array for a modulation sequence
     //    144        data bits (18 * 8)
@@ -844,8 +825,7 @@ bool prepare_tag_modulation(tag_response_info_t *response_info, size_t max_buffe
 // 47 * 8 data bits, 47 * 1 parity bits, 10 start bits, 10 stop bits, 10 correction bits
 #define ALLOCATED_TAG_MODULATION_BUFFER_SIZE 453
 
-bool prepare_allocated_tag_modulation(tag_response_info_t *response_info)
-{
+bool prepare_allocated_tag_modulation(tag_response_info_t *response_info) {
     // Retrieve and store the current buffer index
     response_info->modulation = free_buffer_pointer;
 
@@ -867,8 +847,7 @@ bool prepare_allocated_tag_modulation(tag_response_info_t *response_info)
 // response to send, and send it.
 // 'hf 14a sim'
 //-----------------------------------------------------------------------------
-void SimulateIso14443aTag(int tagType, int flags, uint8_t *data)
-{
+void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
 
 #define ATTACK_KEY_COUNT 8 // keep same as define in cmdhfmf.c -> readerAttack()
 
@@ -1437,8 +1416,7 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data)
 
 // prepare a delayed transfer. This simply shifts ToSend[] by a number
 // of bits specified in the delay parameter.
-void PrepareDelayedTransfer(uint16_t delay)
-{
+void PrepareDelayedTransfer(uint16_t delay) {
     delay &= 0x07;
     if (!delay) return;
 
@@ -1469,8 +1447,7 @@ void PrepareDelayedTransfer(uint16_t delay)
 // if == 0:    transfer immediately and return time of transfer
 // if != 0: delay transfer until time specified
 //-------------------------------------------------------------------------------------
-static void TransmitFor14443a(const uint8_t *cmd, uint16_t len, uint32_t *timing)
-{
+static void TransmitFor14443a(const uint8_t *cmd, uint16_t len, uint32_t *timing) {
 
     FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD);
 
@@ -1516,8 +1493,7 @@ static void TransmitFor14443a(const uint8_t *cmd, uint16_t len, uint32_t *timing
 //-----------------------------------------------------------------------------
 // Prepare reader command (in bits, support short frames) to send to FPGA
 //-----------------------------------------------------------------------------
-void CodeIso14443aBitsAsReaderPar(const uint8_t *cmd, uint16_t bits, const uint8_t *parity)
-{
+void CodeIso14443aBitsAsReaderPar(const uint8_t *cmd, uint16_t bits, const uint8_t *parity) {
     int i, j;
     int last = 0;
     uint8_t b;
@@ -1596,8 +1572,7 @@ void CodeIso14443aBitsAsReaderPar(const uint8_t *cmd, uint16_t bits, const uint8
 //-----------------------------------------------------------------------------
 // Prepare reader command to send to FPGA
 //-----------------------------------------------------------------------------
-void CodeIso14443aAsReaderPar(const uint8_t *cmd, uint16_t len, const uint8_t *parity)
-{
+void CodeIso14443aAsReaderPar(const uint8_t *cmd, uint16_t len, const uint8_t *parity) {
     CodeIso14443aBitsAsReaderPar(cmd, len * 8, parity);
 }
 
@@ -1606,8 +1581,7 @@ void CodeIso14443aAsReaderPar(const uint8_t *cmd, uint16_t len, const uint8_t *p
 // Stop when button is pressed (return 1) or field was gone (return 2)
 // Or return 0 when command is captured
 //-----------------------------------------------------------------------------
-int EmGetCmd(uint8_t *received, uint16_t *len, uint8_t *parity)
-{
+int EmGetCmd(uint8_t *received, uint16_t *len, uint8_t *parity) {
     *len = 0;
 
     uint32_t timer = 0, vtime = 0;
@@ -1669,8 +1643,7 @@ int EmGetCmd(uint8_t *received, uint16_t *len, uint8_t *parity)
     }
 }
 
-int EmSendCmd14443aRaw(uint8_t *resp, uint16_t respLen)
-{
+int EmSendCmd14443aRaw(uint8_t *resp, uint16_t respLen) {
     volatile uint8_t b;
     uint16_t i = 0;
     uint32_t ThisTransferTime;
@@ -1736,8 +1709,7 @@ int EmSendCmd14443aRaw(uint8_t *resp, uint16_t respLen)
     return 0;
 }
 
-int EmSend4bit(uint8_t resp)
-{
+int EmSend4bit(uint8_t resp) {
     Code4bitAnswerAsTag(resp);
     int res = EmSendCmd14443aRaw(ToSend, ToSendMax);
     // do the tracing for the previous reader request and this tag answer:
@@ -1755,12 +1727,10 @@ int EmSend4bit(uint8_t resp)
                par);
     return res;
 }
-int EmSendCmdPar(uint8_t *resp, uint16_t respLen, uint8_t *par)
-{
+int EmSendCmdPar(uint8_t *resp, uint16_t respLen, uint8_t *par) {
     return EmSendCmdParEx(resp, respLen, par, false);
 }
-int EmSendCmdParEx(uint8_t *resp, uint16_t respLen, uint8_t *par, bool collision)
-{
+int EmSendCmdParEx(uint8_t *resp, uint16_t respLen, uint8_t *par, bool collision) {
     CodeIso14443aAsTagPar(resp, respLen, par, collision);
     int res = EmSendCmd14443aRaw(ToSend, ToSendMax);
     // do the tracing for the previous reader request and this tag answer:
@@ -1776,20 +1746,17 @@ int EmSendCmdParEx(uint8_t *resp, uint16_t respLen, uint8_t *par, bool collision
                par);
     return res;
 }
-int EmSendCmd(uint8_t *resp, uint16_t respLen)
-{
+int EmSendCmd(uint8_t *resp, uint16_t respLen) {
     return EmSendCmdEx(resp, respLen, false);
 }
-int EmSendCmdEx(uint8_t *resp, uint16_t respLen, bool collision)
-{
+int EmSendCmdEx(uint8_t *resp, uint16_t respLen, bool collision) {
     uint8_t par[MAX_PARITY_SIZE] = {0x00};
     GetParity(resp, respLen, par);
     return EmSendCmdParEx(resp, respLen, par, collision);
 }
 
 bool EmLogTrace(uint8_t *reader_data, uint16_t reader_len, uint32_t reader_StartTime, uint32_t reader_EndTime, uint8_t *reader_Parity,
-                uint8_t *tag_data, uint16_t tag_len, uint32_t tag_StartTime, uint32_t tag_EndTime, uint8_t *tag_Parity)
-{
+                uint8_t *tag_data, uint16_t tag_len, uint32_t tag_StartTime, uint32_t tag_EndTime, uint8_t *tag_Parity) {
     // we cannot exactly measure the end and start of a received command from reader. However we know that the delay from
     // end of the received command to start of the tag's (simulated by us) answer is n*128+20 or n*128+84 resp.
     // with n >= 9. The start of the tags answer can be measured and therefore the end of the received command be calculated:
@@ -1811,8 +1778,7 @@ bool EmLogTrace(uint8_t *reader_data, uint16_t reader_len, uint32_t reader_Start
 //  If a response is captured return TRUE
 //  If it takes too long return FALSE
 //-----------------------------------------------------------------------------
-static int GetIso14443aAnswerFromTag(uint8_t *receivedResponse, uint8_t *receivedResponsePar, uint16_t offset)
-{
+static int GetIso14443aAnswerFromTag(uint8_t *receivedResponse, uint8_t *receivedResponsePar, uint16_t offset) {
     uint32_t c = 0;
 
     // Set FPGA mode to "reader listen mode", no modulation (listen
@@ -1843,8 +1809,7 @@ static int GetIso14443aAnswerFromTag(uint8_t *receivedResponse, uint8_t *receive
     }
 }
 
-void ReaderTransmitBitsPar(uint8_t *frame, uint16_t bits, uint8_t *par, uint32_t *timing)
-{
+void ReaderTransmitBitsPar(uint8_t *frame, uint16_t bits, uint8_t *par, uint32_t *timing) {
 
     CodeIso14443aBitsAsReaderPar(frame, bits, par);
     // Send command to tag
@@ -1854,37 +1819,32 @@ void ReaderTransmitBitsPar(uint8_t *frame, uint16_t bits, uint8_t *par, uint32_t
     LogTrace(frame, nbytes(bits), (LastTimeProxToAirStart << 4) + DELAY_ARM2AIR_AS_READER, ((LastTimeProxToAirStart + LastProxToAirDuration) << 4) + DELAY_ARM2AIR_AS_READER, par, true);
 }
 
-void ReaderTransmitPar(uint8_t *frame, uint16_t len, uint8_t *par, uint32_t *timing)
-{
+void ReaderTransmitPar(uint8_t *frame, uint16_t len, uint8_t *par, uint32_t *timing) {
     ReaderTransmitBitsPar(frame, len * 8, par, timing);
 }
 
-void ReaderTransmitBits(uint8_t *frame, uint16_t len, uint32_t *timing)
-{
+void ReaderTransmitBits(uint8_t *frame, uint16_t len, uint32_t *timing) {
     // Generate parity and redirect
     uint8_t par[MAX_PARITY_SIZE] = {0x00};
     GetParity(frame, len / 8, par);
     ReaderTransmitBitsPar(frame, len, par, timing);
 }
 
-void ReaderTransmit(uint8_t *frame, uint16_t len, uint32_t *timing)
-{
+void ReaderTransmit(uint8_t *frame, uint16_t len, uint32_t *timing) {
     // Generate parity and redirect
     uint8_t par[MAX_PARITY_SIZE] = {0x00};
     GetParity(frame, len, par);
     ReaderTransmitBitsPar(frame, len * 8, par, timing);
 }
 
-int ReaderReceiveOffset(uint8_t *receivedAnswer, uint16_t offset, uint8_t *parity)
-{
+int ReaderReceiveOffset(uint8_t *receivedAnswer, uint16_t offset, uint8_t *parity) {
     if (!GetIso14443aAnswerFromTag(receivedAnswer, parity, offset))
         return false;
     LogTrace(receivedAnswer, Demod.len, Demod.startTime * 16 - DELAY_AIR2ARM_AS_READER, Demod.endTime * 16 - DELAY_AIR2ARM_AS_READER, parity, false);
     return Demod.len;
 }
 
-int ReaderReceive(uint8_t *receivedAnswer, uint8_t *parity)
-{
+int ReaderReceive(uint8_t *receivedAnswer, uint8_t *parity) {
     if (!GetIso14443aAnswerFromTag(receivedAnswer, parity, 0))
         return false;
     LogTrace(receivedAnswer, Demod.len, Demod.startTime * 16 - DELAY_AIR2ARM_AS_READER, Demod.endTime * 16 - DELAY_AIR2ARM_AS_READER, parity, false);
@@ -1894,8 +1854,7 @@ int ReaderReceive(uint8_t *receivedAnswer, uint8_t *parity)
 // This function misstreats the ISO 14443a anticollision procedure.
 // by fooling the reader there is a collision and forceing the reader to
 // increase the uid bytes.   The might be an overflow, DoS will occure.
-void iso14443a_antifuzz(uint32_t flags)
-{
+void iso14443a_antifuzz(uint32_t flags) {
 
     // We need to listen to the high-frequency, peak-detected path.
     iso14443a_setup(FPGA_HF_ISO14443A_TAGSIM_LISTEN);
@@ -1968,8 +1927,7 @@ void iso14443a_antifuzz(uint32_t flags)
     BigBuf_free_keep_EM();
 }
 
-static void iso14a_set_ATS_times(uint8_t *ats)
-{
+static void iso14a_set_ATS_times(uint8_t *ats) {
 
     uint8_t tb1;
     uint8_t fwi, sfgi;
@@ -1996,8 +1954,7 @@ static void iso14a_set_ATS_times(uint8_t *ats)
     }
 }
 
-static int GetATQA(uint8_t *resp, uint8_t *resp_par)
-{
+static int GetATQA(uint8_t *resp, uint8_t *resp_par) {
 
 #define WUPA_RETRY_TIMEOUT 10    // 10ms
     uint8_t wupa[] = { ISO14443A_CMD_WUPA };  // 0x26 - REQA  0x52 - WAKE-UP
@@ -2026,8 +1983,7 @@ static int GetATQA(uint8_t *resp, uint8_t *resp_par)
 // if anticollision is false, then the UID must be provided in uid_ptr[]
 // and num_cascades must be set (1: 4 Byte UID, 2: 7 Byte UID, 3: 10 Byte UID)
 // requests ATS unless no_rats is true
-int iso14443a_select_card(byte_t *uid_ptr, iso14a_card_select_t *p_card, uint32_t *cuid_ptr, bool anticollision, uint8_t num_cascades, bool no_rats)
-{
+int iso14443a_select_card(byte_t *uid_ptr, iso14a_card_select_t *p_card, uint32_t *cuid_ptr, bool anticollision, uint8_t num_cascades, bool no_rats) {
 
     uint8_t sel_all[]    = { ISO14443A_CMD_ANTICOLL_OR_SELECT, 0x20 };
     uint8_t sel_uid[]    = { ISO14443A_CMD_ANTICOLL_OR_SELECT, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
@@ -2184,8 +2140,7 @@ int iso14443a_select_card(byte_t *uid_ptr, iso14a_card_select_t *p_card, uint32_
     return 1;
 }
 
-int iso14443a_fast_select_card(uint8_t *uid_ptr, uint8_t num_cascades)
-{
+int iso14443a_fast_select_card(uint8_t *uid_ptr, uint8_t num_cascades) {
     uint8_t sel_all[]    = { ISO14443A_CMD_ANTICOLL_OR_SELECT, 0x20 };
     uint8_t sel_uid[]    = { ISO14443A_CMD_ANTICOLL_OR_SELECT, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
     uint8_t resp[5] = {0}; // theoretically. A usual RATS will be much smaller
@@ -2237,8 +2192,7 @@ int iso14443a_fast_select_card(uint8_t *uid_ptr, uint8_t num_cascades)
     return 1;
 }
 
-void iso14443a_setup(uint8_t fpga_minor_mode)
-{
+void iso14443a_setup(uint8_t fpga_minor_mode) {
 
     FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
     // Set up the synchronous serial port
@@ -2249,7 +2203,7 @@ void iso14443a_setup(uint8_t fpga_minor_mode)
     LED_D_OFF();
     // Signal field is on with the appropriate LED
     if (fpga_minor_mode == FPGA_HF_ISO14443A_READER_MOD ||
-        fpga_minor_mode == FPGA_HF_ISO14443A_READER_LISTEN)
+            fpga_minor_mode == FPGA_HF_ISO14443A_READER_LISTEN)
         LED_D_ON();
 
     FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | fpga_minor_mode);
@@ -2289,8 +2243,7 @@ b8 b7 b6 b5 b4 b3 b2 b1
 b5,b6 = 00 - DESELECT
         11 - WTX
 */
-int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, bool send_chaining, void *data, uint8_t *res)
-{
+int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, bool send_chaining, void *data, uint8_t *res) {
     uint8_t parity[MAX_PARITY_SIZE] = {0x00};
     uint8_t real_cmd[cmd_len + 4];
 
@@ -2340,9 +2293,9 @@ int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, bool send_chaining, void *data, u
         // if we received an I- or R(ACK)-Block with a block number equal to the
         // current block number, toggle the current block number
         if (len >= 3 // PCB+CRC = 3 bytes
-            && ((data_bytes[0] & 0xC0) == 0 // I-Block
-                || (data_bytes[0] & 0xD0) == 0x80) // R-Block with ACK bit set to 0
-            && (data_bytes[0] & 0x01) == iso14_pcb_blocknum) { // equal block numbers
+                && ((data_bytes[0] & 0xC0) == 0 // I-Block
+                    || (data_bytes[0] & 0xD0) == 0x80) // R-Block with ACK bit set to 0
+                && (data_bytes[0] & 0x01) == iso14_pcb_blocknum) { // equal block numbers
             iso14_pcb_blocknum ^= 1;
         }
 
@@ -2376,8 +2329,7 @@ int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, bool send_chaining, void *data, u
 //             low  ::  len of commandbytes
 // arg2         timeout
 // d.asBytes command bytes to send
-void ReaderIso14443a(UsbCommand *c)
-{
+void ReaderIso14443a(UsbCommand *c) {
     iso14a_command_t param = c->arg[0];
     size_t len = c->arg[1] & 0xffff;
     size_t lenbits = c->arg[1] >> 16;
@@ -2477,8 +2429,7 @@ OUT:
 // Determine the distance between two nonces.
 // Assume that the difference is small, but we don't know which is first.
 // Therefore try in alternating directions.
-int32_t dist_nt(uint32_t nt1, uint32_t nt2)
-{
+int32_t dist_nt(uint32_t nt1, uint32_t nt2) {
 
     if (nt1 == nt2) return 0;
 
@@ -2507,8 +2458,7 @@ int32_t dist_nt(uint32_t nt1, uint32_t nt2)
 // Cloning MiFare Classic Rail and Building Passes, Anywhere, Anytime"
 // (article by Nicolas T. Courtois, 2009)
 //-----------------------------------------------------------------------------
-void ReaderMifare(bool first_try, uint8_t block, uint8_t keytype)
-{
+void ReaderMifare(bool first_try, uint8_t block, uint8_t keytype) {
 
     iso14443a_setup(FPGA_HF_ISO14443A_READER_MOD);
 
@@ -2777,8 +2727,7 @@ void ReaderMifare(bool first_try, uint8_t block, uint8_t keytype)
 *  Mifare Classic NACK-bug detection
 *  Thanks to @doegox for the feedback and new approaches.
 */
-void DetectNACKbug()
-{
+void DetectNACKbug() {
     uint8_t mf_auth[]     = {0x60, 0x00, 0xF5, 0x7B};
     uint8_t mf_nr_ar[]    = {0, 0, 0, 0, 0, 0, 0, 0};
     uint8_t uid[10]       = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
@@ -3013,8 +2962,7 @@ void DetectNACKbug()
   *@param exitAfterNReads, exit simulation after n blocks have been read, 0 is inifite
 * (unless reader attack mode enabled then it runs util it gets enough nonces to recover all keys attmpted)
   */
-void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *datain)
-{
+void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *datain) {
 
     int cardSTATE = MFEMUL_NOFIELD;
     int _UID_LEN = 0;  // 4, 7, 10
@@ -3217,9 +3165,9 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
                 }
                 // select card
                 if (len == 9 &&
-                    (receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT &&
-                     receivedCmd[1] == 0x70 &&
-                     memcmp(&receivedCmd[2], rUIDBCC1, 4) == 0)) {
+                        (receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT &&
+                         receivedCmd[1] == 0x70 &&
+                         memcmp(&receivedCmd[2], rUIDBCC1, 4) == 0)) {
 
                     // SAK 4b
                     EmSendCmd(sak_4, sizeof(sak_4));
@@ -3251,9 +3199,9 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
                     break;
                 }
                 if (len == 9 &&
-                    (receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2 &&
-                     receivedCmd[1] == 0x70 &&
-                     memcmp(&receivedCmd[2], rUIDBCC2, 4) == 0)) {
+                        (receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2 &&
+                         receivedCmd[1] == 0x70 &&
+                         memcmp(&receivedCmd[2], rUIDBCC2, 4) == 0)) {
 
                     EmSendCmd(sak_7, sizeof(sak_7));
                     switch (_UID_LEN) {
@@ -3282,9 +3230,9 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
                     break;
                 }
                 if (len == 9 &&
-                    (receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_3 &&
-                     receivedCmd[1] == 0x70 &&
-                     memcmp(&receivedCmd[2], rUIDBCC3, 4) == 0)) {
+                        (receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_3 &&
+                         receivedCmd[1] == 0x70 &&
+                         memcmp(&receivedCmd[2], rUIDBCC3, 4) == 0)) {
 
                     EmSendCmd(sak_10, sizeof(sak_10));
                     cardSTATE = MFEMUL_WORK;
@@ -3459,11 +3407,11 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
                 }
 
                 if (receivedCmd[0] == ISO14443A_CMD_READBLOCK ||
-                    receivedCmd[0] == ISO14443A_CMD_WRITEBLOCK ||
-                    receivedCmd[0] == MIFARE_CMD_INC ||
-                    receivedCmd[0] == MIFARE_CMD_DEC ||
-                    receivedCmd[0] == MIFARE_CMD_RESTORE ||
-                    receivedCmd[0] == MIFARE_CMD_TRANSFER) {
+                        receivedCmd[0] == ISO14443A_CMD_WRITEBLOCK ||
+                        receivedCmd[0] == MIFARE_CMD_INC ||
+                        receivedCmd[0] == MIFARE_CMD_DEC ||
+                        receivedCmd[0] == MIFARE_CMD_RESTORE ||
+                        receivedCmd[0] == MIFARE_CMD_TRANSFER) {
 
                     if (receivedCmd[1] >= 16 * 4) {
                         EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
@@ -3502,8 +3450,8 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
                 }
                 // increment, decrement, restore
                 if (receivedCmd[0] == MIFARE_CMD_INC ||
-                    receivedCmd[0] == MIFARE_CMD_DEC ||
-                    receivedCmd[0] == MIFARE_CMD_RESTORE) {
+                        receivedCmd[0] == MIFARE_CMD_DEC ||
+                        receivedCmd[0] == MIFARE_CMD_RESTORE) {
 
                     if (MF_DBGLEVEL >= 4) Dbprintf("RECV 0x%02x inc(0xC1)/dec(0xC0)/restore(0xC2) block %d (%02x)", receivedCmd[0], receivedCmd[1], receivedCmd[1]);
 
diff --git a/armsrc/iso14443b.c b/armsrc/iso14443b.c
index 5041d9b3f..5b6a85477 100644
--- a/armsrc/iso14443b.c
+++ b/armsrc/iso14443b.c
@@ -77,8 +77,7 @@ static struct {
     uint8_t  *output;
 } Uart;
 
-static void UartReset()
-{
+static void UartReset() {
     Uart.state = STATE_UNSYNCD;
     Uart.shiftReg = 0;
     Uart.bitCnt = 0;
@@ -87,8 +86,7 @@ static void UartReset()
     Uart.posCnt = 0;
 }
 
-static void UartInit(uint8_t *data)
-{
+static void UartInit(uint8_t *data) {
     Uart.output = data;
     UartReset();
 // memset(Uart.output, 0x00, MAX_FRAME_SIZE);
@@ -122,8 +120,7 @@ static struct {
 } Demod;
 
 // Clear out the state of the "UART" that receives from the tag.
-static void DemodReset()
-{
+static void DemodReset() {
     Demod.state = DEMOD_UNSYNCD;
     Demod.bitCount = 0;
     Demod.posCount = 0;
@@ -136,8 +133,7 @@ static void DemodReset()
     Demod.endTime = 0;
 }
 
-static void DemodInit(uint8_t *data)
-{
+static void DemodInit(uint8_t *data) {
     Demod.output = data;
     DemodReset();
     // memset(Demod.output, 0x00, MAX_FRAME_SIZE);
@@ -157,8 +153,7 @@ static void DemodInit(uint8_t *data)
 *    13560000000 / 384000 = 35312 FWT
 * @param timeout is in frame wait time, fwt, measured in ETUs
 */
-static void iso14b_set_timeout(uint32_t timeout)
-{
+static void iso14b_set_timeout(uint32_t timeout) {
 #define MAX_TIMEOUT 40542464  // 13560000Hz * 1000ms / (2^32-1) * (8*16)
     if (timeout > MAX_TIMEOUT)
         timeout = MAX_TIMEOUT;
@@ -166,8 +161,7 @@ static void iso14b_set_timeout(uint32_t timeout)
     iso14b_timeout = timeout;
     if (MF_DBGLEVEL >= 3) Dbprintf("ISO14443B Timeout set to %ld fwt", iso14b_timeout);
 }
-static void iso14b_set_maxframesize(uint16_t size)
-{
+static void iso14b_set_maxframesize(uint16_t size) {
     if (size > 256)
         size = MAX_FRAME_SIZE;
 
@@ -180,8 +174,7 @@ static void iso14b_set_maxframesize(uint16_t size)
 // that here) so that they can be transmitted to the reader. Doesn't transmit
 // them yet, just leaves them ready to send in ToSend[].
 //-----------------------------------------------------------------------------
-static void CodeIso14443bAsTag(const uint8_t *cmd, int len)
-{
+static void CodeIso14443bAsTag(const uint8_t *cmd, int len) {
     /* ISO 14443 B
     *
     * Reader to card | ASK  - Amplitude Shift Keying Modulation (PCD to PICC for Type B) (NRZ-L encodig)
@@ -323,8 +316,7 @@ static void CodeIso14443bAsTag(const uint8_t *cmd, int len)
  * Returns: true if we received a EOF
  *          false if we are still waiting for some more
  */
-static RAMFUNC int Handle14443bReaderUartBit(uint8_t bit)
-{
+static RAMFUNC int Handle14443bReaderUartBit(uint8_t bit) {
     switch (Uart.state) {
         case STATE_UNSYNCD:
             if (!bit) {
@@ -440,8 +432,7 @@ static RAMFUNC int Handle14443bReaderUartBit(uint8_t bit)
 // Assume that we're called with the SSC (to the FPGA) and ADC path set
 // correctly.
 //-----------------------------------------------------------------------------
-static int GetIso14443bCommandFromReader(uint8_t *received, uint16_t *len)
-{
+static int GetIso14443bCommandFromReader(uint8_t *received, uint16_t *len) {
     // Set FPGA mode to "simulated ISO 14443B tag", no modulation (listen
     // only, since we are receiving, not transmitting).
     // Signal field is off with the appropriate LED
@@ -493,8 +484,7 @@ static int GetIso14443bCommandFromReader(uint8_t *received, uint16_t *len)
     return false;
 }
 
-void ClearFpgaShiftingRegisters(void)
-{
+void ClearFpgaShiftingRegisters(void) {
 
     volatile uint8_t b;
 
@@ -519,8 +509,7 @@ void ClearFpgaShiftingRegisters(void)
     //AT91C_BASE_SSC->SSC_THR = 0xFF;
 }
 
-void WaitForFpgaDelayQueueIsEmpty(uint16_t delay)
-{
+void WaitForFpgaDelayQueueIsEmpty(uint16_t delay) {
     // Ensure that the FPGA Delay Queue is empty before we switch to TAGSIM_LISTEN again:
     uint8_t fpga_queued_bits = delay >> 3;  // twich /8 ??   >>3,
     for (uint8_t i = 0; i <= fpga_queued_bits / 8 + 1;) {
@@ -531,8 +520,7 @@ void WaitForFpgaDelayQueueIsEmpty(uint16_t delay)
     }
 }
 
-static void TransmitFor14443b_AsTag(uint8_t *response, uint16_t len)
-{
+static void TransmitFor14443b_AsTag(uint8_t *response, uint16_t len) {
 
     volatile uint32_t b;
 
@@ -570,8 +558,7 @@ static void TransmitFor14443b_AsTag(uint8_t *response, uint16_t len)
 // Main loop of simulated tag: receive commands from reader, decide what
 // response to send, and send it.
 //-----------------------------------------------------------------------------
-void SimulateIso14443bTag(uint32_t pupi)
-{
+void SimulateIso14443bTag(uint32_t pupi) {
 
     // setup device.
     FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
@@ -656,7 +643,7 @@ void SimulateIso14443bTag(uint32_t pupi)
         // WUP in HALTED state
         if (len == 5) {
             if ((receivedCmd[0] == ISO14443B_REQB && (receivedCmd[2] & 0x8) == 0x8 && cardSTATE == SIM_HALTED) ||
-                receivedCmd[0] == ISO14443B_REQB) {
+                    receivedCmd[0] == ISO14443B_REQB) {
                 LogTrace(receivedCmd, len, 0, 0, NULL, true);
                 cardSTATE = SIM_SELECTING;
             }
@@ -753,8 +740,7 @@ void SimulateIso14443bTag(uint32_t pupi)
  *          false if we are still waiting for some more
  *
  */
-static RAMFUNC int Handle14443bTagSamplesDemod(int ci, int cq)
-{
+static RAMFUNC int Handle14443bTagSamplesDemod(int ci, int cq) {
     int v = 0, myI = ABS(ci), myQ = ABS(cq);
 
 // The soft decision on the bit uses an estimate of just the
@@ -958,8 +944,7 @@ static RAMFUNC int Handle14443bTagSamplesDemod(int ci, int cq)
  *  Demodulate the samples we received from the tag, also log to tracebuffer
  *  quiet: set to 'TRUE' to disable debug output
  */
-static void GetTagSamplesFor14443bDemod()
-{
+static void GetTagSamplesFor14443bDemod() {
     bool gotFrame = false, finished = false;
     int lastRxCounter = ISO14443B_DMA_BUFFER_SIZE;
     int ci = 0, cq = 0;
@@ -1025,8 +1010,7 @@ static void GetTagSamplesFor14443bDemod()
 //-----------------------------------------------------------------------------
 // Transmit the command (to the tag) that was placed in ToSend[].
 //-----------------------------------------------------------------------------
-static void TransmitFor14443b_AsReader(void)
-{
+static void TransmitFor14443b_AsReader(void) {
     int c;
 
     FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_TX | FPGA_HF_READER_TX_SHALLOW_MOD);
@@ -1060,8 +1044,7 @@ static void TransmitFor14443b_AsReader(void)
 // Code a layer 2 command (string of octets, including CRC) into ToSend[],
 // so that it is ready to transmit to the tag using TransmitFor14443b().
 //-----------------------------------------------------------------------------
-static void CodeIso14443bAsReader(const uint8_t *cmd, int len)
-{
+static void CodeIso14443bAsReader(const uint8_t *cmd, int len) {
     /*
     *  Reader data transmission:
     *   - no modulation ONES
@@ -1142,8 +1125,7 @@ static void CodeIso14443bAsReader(const uint8_t *cmd, int len)
 /*
 *  Convenience function to encode, transmit and trace iso 14443b comms
 */
-static void CodeAndTransmit14443bAsReader(const uint8_t *cmd, int len)
-{
+static void CodeAndTransmit14443bAsReader(const uint8_t *cmd, int len) {
 
     uint32_t time_start = GetCountSspClk();
 
@@ -1159,8 +1141,7 @@ static void CodeAndTransmit14443bAsReader(const uint8_t *cmd, int len)
 /* Sends an APDU to the tag
  * TODO: check CRC and preamble
  */
-uint8_t iso14443b_apdu(uint8_t const *message, size_t message_length, uint8_t *response)
-{
+uint8_t iso14443b_apdu(uint8_t const *message, size_t message_length, uint8_t *response) {
 
     uint8_t message_frame[message_length + 4];
     // PCB
@@ -1194,8 +1175,7 @@ uint8_t iso14443b_apdu(uint8_t const *message, size_t message_length, uint8_t *r
 /**
 * SRx Initialise.
 */
-uint8_t iso14443b_select_srx_card(iso14b_card_select_t *card)
-{
+uint8_t iso14443b_select_srx_card(iso14b_card_select_t *card) {
     // INITIATE command: wake up the tag using the INITIATE
     static const uint8_t init_srx[] = { ISO14443B_INITIATE, 0x00, 0x97, 0x5b };
     // SELECT command (with space for CRC)
@@ -1255,8 +1235,7 @@ uint8_t iso14443b_select_srx_card(iso14b_card_select_t *card)
  * TODO: Support multiple cards (perform anticollision)
  * TODO: Verify CRC checksums
  */
-uint8_t iso14443b_select_card(iso14b_card_select_t *card)
-{
+uint8_t iso14443b_select_card(iso14b_card_select_t *card) {
     // WUPB command (including CRC)
     // Note: WUPB wakes up all tags, REQB doesn't wake up tags in HALT state
     static const uint8_t wupb[] = { ISO14443B_REQB, 0x00, 0x08, 0x39, 0x73 };
@@ -1328,8 +1307,7 @@ uint8_t iso14443b_select_card(iso14b_card_select_t *card)
 
 // Set up ISO 14443 Type B communication (similar to iso14443a_setup)
 // field is setup for "Sending as Reader"
-void iso14443b_setup()
-{
+void iso14443b_setup() {
     LEDsoff();
     FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
 
@@ -1362,8 +1340,7 @@ void iso14443b_setup()
 //
 // I tried to be systematic and check every answer of the tag, every CRC, etc...
 //-----------------------------------------------------------------------------
-static bool ReadSTBlock(uint8_t block)
-{
+static bool ReadSTBlock(uint8_t block) {
     uint8_t cmd[] = {ISO14443B_READ_BLK, block, 0x00, 0x00};
     AddCrc14B(cmd, 2);
     CodeAndTransmit14443bAsReader(cmd, sizeof(cmd));
@@ -1381,8 +1358,7 @@ static bool ReadSTBlock(uint8_t block)
     }
     return true;
 }
-void ReadSTMemoryIso14443b(uint8_t numofblocks)
-{
+void ReadSTMemoryIso14443b(uint8_t numofblocks) {
     // Make sure that we start from off, since the tags are stateful;
     // confusing things will happen if we don't reset them between reads.
     //switch_off();
@@ -1431,8 +1407,7 @@ out:
     SpinDelay(20);
 }
 
-static void iso1444b_setup_sniff(void)
-{
+static void iso1444b_setup_sniff(void) {
 
     LEDsoff();
     FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
@@ -1485,8 +1460,7 @@ static void iso1444b_setup_sniff(void)
  * DMA Buffer - ISO14443B_DMA_BUFFER_SIZE
  * Demodulated samples received - all the rest
  */
-void RAMFUNC SniffIso14443b(void)
-{
+void RAMFUNC SniffIso14443b(void) {
 
     uint32_t time_0 = 0, time_start = 0, time_stop = 0;
     int ci = 0, cq = 0;
@@ -1578,8 +1552,7 @@ void RAMFUNC SniffIso14443b(void)
     switch_off();
 }
 
-void iso14b_set_trigger(bool enable)
-{
+void iso14b_set_trigger(bool enable) {
     trigger = enable;
 }
 
@@ -1594,8 +1567,7 @@ void iso14b_set_trigger(bool enable)
  * none
  *
  */
-void SendRawCommand14443B_Ex(UsbCommand *c)
-{
+void SendRawCommand14443B_Ex(UsbCommand *c) {
     iso14b_command_t param = c->arg[0];
     size_t len = c->arg[1] & 0xffff;
     uint8_t *cmd = c->d.asBytes;
diff --git a/armsrc/iso15693.c b/armsrc/iso15693.c
index 5702ddcac..b6d53ccea 100644
--- a/armsrc/iso15693.c
+++ b/armsrc/iso15693.c
@@ -99,8 +99,7 @@ static void BuildInventoryResponse(uint8_t *cmdout, uint8_t *uid);
 // resulting data rate is 26,48 kbit/s (fc/512)
 // cmd ... data
 // n ... length of data
-static void CodeIso15693AsReader(uint8_t *cmd, int n)
-{
+static void CodeIso15693AsReader(uint8_t *cmd, int n) {
     int i, j;
 
     ToSendReset();
@@ -179,8 +178,7 @@ static void CodeIso15693AsReader(uint8_t *cmd, int n)
 // encode data using "1 out of 256" sheme
 // data rate is 1,66 kbit/s (fc/8192)
 // is designed for more robust communication over longer distances
-static void CodeIso15693AsReader256(uint8_t *cmd, int n)
-{
+static void CodeIso15693AsReader256(uint8_t *cmd, int n) {
     int i, j;
 
     ToSendReset();
@@ -222,8 +220,7 @@ static void CodeIso15693AsReader256(uint8_t *cmd, int n)
 }
 
 // Transmit the command (to the tag) that was placed in ToSend[].
-static void TransmitTo15693Tag(const uint8_t *cmd, int len, int *samples, int *wait)
-{
+static void TransmitTo15693Tag(const uint8_t *cmd, int len, int *samples, int *wait) {
 
     int c;
     FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_TX);
@@ -258,8 +255,7 @@ static void TransmitTo15693Tag(const uint8_t *cmd, int len, int *samples, int *w
 //-----------------------------------------------------------------------------
 // Transmit the command (to the reader) that was placed in ToSend[].
 //-----------------------------------------------------------------------------
-static void TransmitTo15693Reader(const uint8_t *cmd, int len, int *samples, int *wait)
-{
+static void TransmitTo15693Reader(const uint8_t *cmd, int len, int *samples, int *wait) {
     int c = 0;
     FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_SIMULATOR | FPGA_HF_SIMULATOR_MODULATE_424K);
 
@@ -292,8 +288,7 @@ static void TransmitTo15693Reader(const uint8_t *cmd, int len, int *samples, int
 //-----------------------------------------------------------------------------
 // DEMODULATE tag answer
 //-----------------------------------------------------------------------------
-static int DemodAnswer(uint8_t *received, uint8_t *dest, uint16_t samplecount)
-{
+static int DemodAnswer(uint8_t *received, uint8_t *dest, uint16_t samplecount) {
 
     int i, j;
     int max = 0, maxPos = 0, skip = 4;
@@ -386,8 +381,7 @@ static int DemodAnswer(uint8_t *received, uint8_t *dest, uint16_t samplecount)
 // returns:
 //  number of decoded bytes
 // logging enabled
-static int GetIso15693AnswerFromTag(uint8_t *received, int *elapsed)
-{
+static int GetIso15693AnswerFromTag(uint8_t *received, int *elapsed) {
 
 #define SIGNAL_BUFF_SIZE 15000
     // get current clock
@@ -441,8 +435,7 @@ static int GetIso15693AnswerFromTag(uint8_t *received, int *elapsed)
 
 // Now the GetISO15693 message from sniffing command
 // logging enable,
-static int GetIso15693AnswerFromSniff(uint8_t *received, int *samples, int *elapsed)
-{
+static int GetIso15693AnswerFromSniff(uint8_t *received, int *samples, int *elapsed) {
 
     bool getNext = false;
     int counter = 0, ci = 0, cq = 0;
@@ -490,8 +483,7 @@ static int GetIso15693AnswerFromSniff(uint8_t *received, int *samples, int *elap
 // for the response. The response is not demodulated, just left in the buffer
 // so that it can be downloaded to a PC and processed there.
 //-----------------------------------------------------------------------------
-void AcquireRawAdcSamplesIso15693(void)
-{
+void AcquireRawAdcSamplesIso15693(void) {
     int c = 0, getNext = false;
     int ci = 0, cq = 0;
 
@@ -557,8 +549,7 @@ void AcquireRawAdcSamplesIso15693(void)
 }
 
 // switch_off,  initreader, no logging
-void RecordRawAdcSamplesIso15693(void)
-{
+void RecordRawAdcSamplesIso15693(void) {
 
     int c = 0, getNext = false;
     int ci = 0, cq = 0;
@@ -598,8 +589,7 @@ void RecordRawAdcSamplesIso15693(void)
 
 // Initialize the proxmark as iso15k reader
 // (this might produces glitches that confuse some tags
-void Iso15693InitReader(void)
-{
+void Iso15693InitReader(void) {
     LEDsoff();
     clear_trace();
     set_tracing(true);
@@ -631,8 +621,7 @@ void Iso15693InitReader(void)
 
 // Encode (into the ToSend buffers) an identify request, which is the first
 // thing that you must send to a tag to get a response.
-static void BuildIdentifyRequest(uint8_t *out)
-{
+static void BuildIdentifyRequest(uint8_t *out) {
 
     uint8_t cmd[CMD_ID_RESP] = {0, ISO15_CMD_INVENTORY, 0, 0, 0};
     // flags
@@ -676,8 +665,7 @@ static void BuildReadBlockRequest(uint8_t **out, uint8_t *uid, uint8_t blockNumb
 */
 
 // Now the VICC>VCD responses when we are simulating a tag
-static void BuildInventoryResponse(uint8_t *out, uint8_t *uid)
-{
+static void BuildInventoryResponse(uint8_t *out, uint8_t *uid) {
 
     uint8_t cmd[CMD_INV_RESP] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 
@@ -708,8 +696,7 @@ static void BuildInventoryResponse(uint8_t *out, uint8_t *uid)
 //  If you do not need the answer use NULL for *recv[]
 //  return: lenght of received data
 // logging enabled
-int SendDataTag(uint8_t *send, int sendlen, bool init, int speed, uint8_t *outdata)
-{
+int SendDataTag(uint8_t *send, int sendlen, bool init, int speed, uint8_t *outdata) {
 
     int t_samples = 0, wait = 0, elapsed = 0, answer_len = 0;
 
@@ -747,8 +734,7 @@ int SendDataTag(uint8_t *send, int sendlen, bool init, int speed, uint8_t *outda
 
 // Decodes a message from a tag and displays its metadata and content
 #define DBD15STATLEN 48
-void DbdecodeIso15693Answer(int len, uint8_t *d)
-{
+void DbdecodeIso15693Answer(int len, uint8_t *d) {
     char status[DBD15STATLEN + 1] = {0};
 
     if (len > 3) {
@@ -812,8 +798,7 @@ void DbdecodeIso15693Answer(int len, uint8_t *d)
 //-----------------------------------------------------------------------------
 // ok
 // parameter is unused !?!
-void ReaderIso15693(uint32_t parameter)
-{
+void ReaderIso15693(uint32_t parameter) {
     int answerLen1 = 0;
     int tsamples = 0, wait = 0, elapsed = 0;
 
@@ -877,8 +862,7 @@ void ReaderIso15693(uint32_t parameter)
 
 // Simulate an ISO15693 TAG, perform anti-collision and then print any reader commands
 // all demodulation performed in arm rather than host. - greg
-void SimTagIso15693(uint32_t parameter, uint8_t *uid)
-{
+void SimTagIso15693(uint32_t parameter, uint8_t *uid) {
 
     LEDsoff();
     FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
@@ -932,8 +916,7 @@ void SimTagIso15693(uint32_t parameter, uint8_t *uid)
 
 // Since there is no standardized way of reading the AFI out of a tag, we will brute force it
 // (some manufactures offer a way to read the AFI, though)
-void BruteforceIso15693Afi(uint32_t speed)
-{
+void BruteforceIso15693Afi(uint32_t speed) {
 
     uint8_t data[7] = {0, 0, 0, 0, 0, 0, 0};
     uint8_t buf[ISO15_MAX_FRAME];
@@ -987,8 +970,7 @@ void BruteforceIso15693Afi(uint32_t speed)
 
 // Allows to directly send commands to the tag via the client
 // Has to increase dialog between device and client.
-void DirectTag15693Command(uint32_t datalen, uint32_t speed, uint32_t recv, uint8_t *data)
-{
+void DirectTag15693Command(uint32_t datalen, uint32_t speed, uint32_t recv, uint8_t *data) {
 
     bool init = true;
     int buflen = 0;
diff --git a/armsrc/legicrf.c b/armsrc/legicrf.c
index eef626ff7..6a2cccd7c 100644
--- a/armsrc/legicrf.c
+++ b/armsrc/legicrf.c
@@ -56,8 +56,7 @@ static uint32_t last_frame_end; /* ts of last bit of previews rx or tx frame */
 // I/O interface abstraction (FPGA -> ARM)
 //-----------------------------------------------------------------------------
 
-static inline uint8_t rx_byte_from_fpga()
-{
+static inline uint8_t rx_byte_from_fpga() {
     for (;;) {
         WDT_HIT();
 
@@ -84,8 +83,7 @@ static inline uint8_t rx_byte_from_fpga()
 //
 // Note: The SSC receiver is never synchronized the calculation may be performed
 // on a i/q pair from two subsequent correlations, but does not matter.
-static inline int32_t sample_power()
-{
+static inline int32_t sample_power() {
     int32_t q = (int8_t)rx_byte_from_fpga();
     q = ABS(q);
     int32_t i = (int8_t)rx_byte_from_fpga();
@@ -101,8 +99,7 @@ static inline int32_t sample_power()
 //
 // Note: The demodulator would be drifting (18.9us * 5 != 100us), rx_frame
 // has a delay loop that aligns rx_bit calls to the TAG tx timeslots.
-static inline bool rx_bit()
-{
+static inline bool rx_bit() {
     int32_t power;
 
     for (size_t i = 0; i < 5; ++i) {
@@ -121,8 +118,7 @@ static inline bool rx_bit()
 // be circumvented, but the adventage over bitbang would be little.
 //-----------------------------------------------------------------------------
 
-static inline void tx_bit(bool bit)
-{
+static inline void tx_bit(bool bit) {
     // insert pause
     LOW(GPIO_SSC_DOUT);
     last_frame_end += RWD_TIME_PAUSE;
@@ -144,8 +140,7 @@ static inline void tx_bit(bool bit)
 // present.
 //-----------------------------------------------------------------------------
 
-static void tx_frame(uint32_t frame, uint8_t len)
-{
+static void tx_frame(uint32_t frame, uint8_t len) {
     FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_TX);
 
     // wait for next tx timeslot
@@ -173,8 +168,7 @@ static void tx_frame(uint32_t frame, uint8_t len)
     LogTrace(cmdbytes, sizeof(cmdbytes), last_frame_start, last_frame_end, NULL, true);
 }
 
-static uint32_t rx_frame(uint8_t len)
-{
+static uint32_t rx_frame(uint8_t len) {
     FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR
                       | FPGA_HF_READER_RX_XCORR_848_KHZ
                       | FPGA_HF_READER_RX_XCORR_QUARTER);
@@ -203,8 +197,7 @@ static uint32_t rx_frame(uint8_t len)
     return frame;
 }
 
-static bool rx_ack()
-{
+static bool rx_ack() {
     // change fpga into rx mode
     FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR
                       | FPGA_HF_READER_RX_XCORR_848_KHZ
@@ -244,8 +237,7 @@ static bool rx_ack()
 // Legic Reader
 //-----------------------------------------------------------------------------
 
-static int init_card(uint8_t cardtype, legic_card_select_t *p_card)
-{
+static int init_card(uint8_t cardtype, legic_card_select_t *p_card) {
     p_card->tagtype = cardtype;
 
     switch (p_card->tagtype) {
@@ -273,8 +265,7 @@ static int init_card(uint8_t cardtype, legic_card_select_t *p_card)
     return 0;
 }
 
-static void init_reader(bool clear_mem)
-{
+static void init_reader(bool clear_mem) {
     // configure FPGA
     FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
     FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR
@@ -314,8 +305,7 @@ static void init_reader(bool clear_mem)
 //  - Transmit initialisation vector 7 bits
 //  - Receive card type 6 bits
 //  - Transmit Acknowledge 6 bits
-static uint32_t setup_phase(uint8_t iv)
-{
+static uint32_t setup_phase(uint8_t iv) {
     // init coordination timestamp
     last_frame_end = GET_TICKS;
 
@@ -348,15 +338,13 @@ static uint32_t setup_phase(uint8_t iv)
     return card_type;
 }
 
-static uint8_t calc_crc4(uint16_t cmd, uint8_t cmd_sz, uint8_t value)
-{
+static uint8_t calc_crc4(uint16_t cmd, uint8_t cmd_sz, uint8_t value) {
     crc_clear(&legic_crc);
     crc_update(&legic_crc, (value << cmd_sz) | cmd, 8 + cmd_sz);
     return crc_finish(&legic_crc);
 }
 
-static int16_t read_byte(uint16_t index, uint8_t cmd_sz)
-{
+static int16_t read_byte(uint16_t index, uint8_t cmd_sz) {
     uint16_t cmd = (index << 1) | LEGIC_READ;
 
     // read one byte
@@ -385,8 +373,7 @@ static int16_t read_byte(uint16_t index, uint8_t cmd_sz)
 
 // Transmit write command, wait until (3.6ms) the tag sends back an unencrypted
 // ACK ('1' bit) and forward the prng time based.
-bool write_byte(uint16_t index, uint8_t byte, uint8_t addr_sz)
-{
+bool write_byte(uint16_t index, uint8_t byte, uint8_t addr_sz) {
     uint32_t cmd = index << 1 | LEGIC_WRITE;          // prepare command
     uint8_t  crc = calc_crc4(cmd, addr_sz + 1, byte); // calculate crc
     cmd |= byte << (addr_sz + 1);                     // append value
@@ -408,8 +395,7 @@ bool write_byte(uint16_t index, uint8_t byte, uint8_t addr_sz)
 //
 // Only this functions are public / called from appmain.c
 //-----------------------------------------------------------------------------
-void LegicRfInfo(void)
-{
+void LegicRfInfo(void) {
     // configure ARM and FPGA
     init_reader(false);
 
@@ -446,8 +432,7 @@ OUT:
     StopTicks();
 }
 
-void LegicRfReader(uint16_t offset, uint16_t len, uint8_t iv)
-{
+void LegicRfReader(uint16_t offset, uint16_t len, uint8_t iv) {
     // configure ARM and FPGA
     init_reader(false);
 
@@ -480,8 +465,7 @@ OUT:
     StopTicks();
 }
 
-void LegicRfWriter(uint16_t offset, uint16_t len, uint8_t iv, uint8_t *data)
-{
+void LegicRfWriter(uint16_t offset, uint16_t len, uint8_t iv, uint8_t *data) {
     // configure ARM and FPGA
     init_reader(false);
 
diff --git a/armsrc/legicrfsim.c b/armsrc/legicrfsim.c
index a855401a4..c32558921 100644
--- a/armsrc/legicrfsim.c
+++ b/armsrc/legicrfsim.c
@@ -58,8 +58,7 @@ static uint32_t last_frame_end; /* ts of last bit of previews rx or tx frame */
 //-----------------------------------------------------------------------------
 
 // Returns true if a pulse/pause is received within timeout
-static inline bool wait_for(bool value, const uint32_t timeout)
-{
+static inline bool wait_for(bool value, const uint32_t timeout) {
     while ((bool)(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_DIN) != value) {
         if (GetCountSspClk() > timeout) {
             return false;
@@ -77,8 +76,7 @@ static inline bool wait_for(bool value, const uint32_t timeout)
 //  - A bit length >80.2us is a 1
 //  - A bit length <80.2us is a 0
 //  - A bit length >148.6us is a code violation
-static inline int8_t rx_bit()
-{
+static inline int8_t rx_bit() {
     // backup ts for threshold calculation
     uint32_t bit_start = last_frame_end;
 
@@ -121,8 +119,7 @@ static inline int8_t rx_bit()
 // Note: The Subcarrier is not disabled during bits to prevent glitches. This is
 //       not mandatory but results in a cleaner signal. tx_frame will disable
 //       the subcarrier when the frame is done.
-static inline void tx_bit(bool bit)
-{
+static inline void tx_bit(bool bit) {
     LED_C_ON();
 
     if (bit) {
@@ -149,8 +146,7 @@ static inline void tx_bit(bool bit)
 // and depends only the command received (IV, ACK, READ or WRITE).
 //-----------------------------------------------------------------------------
 
-static void tx_frame(uint32_t frame, uint8_t len)
-{
+static void tx_frame(uint32_t frame, uint8_t len) {
     // wait for next tx timeslot
     last_frame_end += TAG_FRAME_WAIT;
     legic_prng_forward(TAG_FRAME_WAIT / TAG_BIT_PERIOD - 1);
@@ -174,8 +170,7 @@ static void tx_frame(uint32_t frame, uint8_t len)
     LogTrace(cmdbytes, sizeof(cmdbytes), last_frame_start, last_frame_end, NULL, false);
 }
 
-static void tx_ack()
-{
+static void tx_ack() {
     // wait for ack timeslot
     last_frame_end += TAG_ACK_WAIT;
     legic_prng_forward(TAG_ACK_WAIT / TAG_BIT_PERIOD - 1);
@@ -203,8 +198,7 @@ static void tx_ack()
 //  - forward prng based on ts/TAG_BIT_PERIOD
 //  - receive the frame
 //  - detect end of frame (last pause)
-static int32_t rx_frame(uint8_t *len)
-{
+static int32_t rx_frame(uint8_t *len) {
     int32_t frame = 0;
 
     // add 2 SSP clock cycles (1 for tx and 1 for rx pipeline delay)
@@ -269,8 +263,7 @@ static int32_t rx_frame(uint8_t *len)
 // Legic Simulator
 //-----------------------------------------------------------------------------
 
-static int32_t init_card(uint8_t cardtype, legic_card_select_t *p_card)
-{
+static int32_t init_card(uint8_t cardtype, legic_card_select_t *p_card) {
     p_card->tagtype = cardtype;
 
     switch (p_card->tagtype) {
@@ -298,8 +291,7 @@ static int32_t init_card(uint8_t cardtype, legic_card_select_t *p_card)
     return 0;
 }
 
-static void init_tag()
-{
+static void init_tag() {
     // configure FPGA
     FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
     FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_SIMULATOR
@@ -334,8 +326,7 @@ static void init_tag()
 //  - Receive initialisation vector 7 bits
 //  - Transmit card type 6 bits
 //  - Receive Acknowledge 6 bits
-static int32_t setup_phase(legic_card_select_t *p_card)
-{
+static int32_t setup_phase(legic_card_select_t *p_card) {
     uint8_t len = 0;
 
     // init coordination timestamp
@@ -396,15 +387,13 @@ static int32_t setup_phase(legic_card_select_t *p_card)
     return 0;
 }
 
-static uint8_t calc_crc4(uint16_t cmd, uint8_t cmd_sz, uint8_t value)
-{
+static uint8_t calc_crc4(uint16_t cmd, uint8_t cmd_sz, uint8_t value) {
     crc_clear(&legic_crc);
     crc_update(&legic_crc, (value << cmd_sz) | cmd, 8 + cmd_sz);
     return crc_finish(&legic_crc);
 }
 
-static int32_t connected_phase(legic_card_select_t *p_card)
-{
+static int32_t connected_phase(legic_card_select_t *p_card) {
     uint8_t len = 0;
 
     // wait for command
@@ -458,8 +447,7 @@ static int32_t connected_phase(legic_card_select_t *p_card)
 // Only this function is public / called from appmain.c
 //-----------------------------------------------------------------------------
 
-void LegicRfSimulate(uint8_t cardtype)
-{
+void LegicRfSimulate(uint8_t cardtype) {
     // configure ARM and FPGA
     init_tag();
 
diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index 87a0bcfb9..ac9f08ed3 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -61,8 +61,7 @@ Default LF T55xx config is set to:
 */
 t55xx_config t_config = { 29 * 8, 17 * 8, 15 * 8, 47 * 8, 15 * 8 } ;
 
-void printT55xxConfig(void)
-{
+void printT55xxConfig(void) {
     Dbprintf("LF T55XX config");
     Dbprintf("  [a] startgap............%d*8 (%d)", t_config.start_gap / 8, t_config.start_gap);
     Dbprintf("  [b] writegap............%d*8 (%d)", t_config.write_gap / 8, t_config.write_gap);
@@ -71,8 +70,7 @@ void printT55xxConfig(void)
     Dbprintf("  [e] readgap.............%d*8 (%d)", t_config.read_gap / 8,  t_config.read_gap);
 }
 
-void setT55xxConfig(uint8_t arg0, t55xx_config *c)
-{
+void setT55xxConfig(uint8_t arg0, t55xx_config *c) {
 
     if (c->start_gap != 0) t_config.start_gap = c->start_gap;
     if (c->write_gap != 0) t_config.write_gap = c->write_gap;
@@ -116,13 +114,11 @@ void setT55xxConfig(uint8_t arg0, t55xx_config *c)
 #endif
 }
 
-t55xx_config *getT55xxConfig(void)
-{
+t55xx_config *getT55xxConfig(void) {
     return &t_config;
 }
 
-void loadT55xxConfig(void)
-{
+void loadT55xxConfig(void) {
 #ifdef WITH_FLASH
     if (!FlashInit()) {
         return;
@@ -160,8 +156,7 @@ void loadT55xxConfig(void)
  * @param period_1
  * @param command (in binary char array)
  */
-void ModThenAcquireRawAdcSamples125k(uint32_t delay_off, uint32_t period_0, uint32_t period_1, uint8_t *command)
-{
+void ModThenAcquireRawAdcSamples125k(uint32_t delay_off, uint32_t period_0, uint32_t period_1, uint8_t *command) {
 
     // start timer
     StartTicks();
@@ -266,8 +261,7 @@ void ModThenAcquireRawAdcSamples125k(uint32_t delay_off, uint32_t period_0, uint
 
 [5555fe852c5555555555555555fe0000]
 */
-void ReadTItag(void)
-{
+void ReadTItag(void) {
     StartTicks();
     // some hardcoded initial params
     // when we read a TI tag we sample the zerocross line at 2Mhz
@@ -397,8 +391,7 @@ void ReadTItag(void)
     StopTicks();
 }
 
-void WriteTIbyte(uint8_t b)
-{
+void WriteTIbyte(uint8_t b) {
     int i = 0;
 
     // modulate 8 bits out to the antenna
@@ -421,8 +414,7 @@ void WriteTIbyte(uint8_t b)
     }
 }
 
-void AcquireTiType(void)
-{
+void AcquireTiType(void) {
     int i, j, n;
     // tag transmission is <20ms, sampling at 2M gives us 40K samples max
     // each sample is 1 bit stuffed into a uint32_t so we need 1250 uint32_t
@@ -504,8 +496,7 @@ void AcquireTiType(void)
 // arguments: 64bit data split into 32bit idhi:idlo and optional 16bit crc
 // if crc provided, it will be written with the data verbatim (even if bogus)
 // if not provided a valid crc will be computed from the data and written.
-void WriteTItag(uint32_t idhi, uint32_t idlo, uint16_t crc)
-{
+void WriteTItag(uint32_t idhi, uint32_t idlo, uint16_t crc) {
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
     if (crc == 0) {
         crc = update_crc16(crc, (idlo) & 0xff);
@@ -577,8 +568,7 @@ void WriteTItag(uint32_t idhi, uint32_t idlo, uint16_t crc)
 
 // note:   a call to FpgaDownloadAndGo(FPGA_BITSTREAM_LF) must be done before, but
 //  this may destroy the bigbuf so be sure this is called before calling SimulateTagLowFrequencyEx
-void SimulateTagLowFrequencyEx(int period, int gap, int ledcontrol, int numcycles)
-{
+void SimulateTagLowFrequencyEx(int period, int gap, int ledcontrol, int numcycles) {
 
     // start us timer
     StartTicks();
@@ -662,22 +652,19 @@ OUT:
     LED_D_OFF();
 }
 
-void SimulateTagLowFrequency(int period, int gap, int ledcontrol)
-{
+void SimulateTagLowFrequency(int period, int gap, int ledcontrol) {
     SimulateTagLowFrequencyEx(period, gap, ledcontrol, -1);
 }
 
 
 #define DEBUG_FRAME_CONTENTS 1
-void SimulateTagLowFrequencyBidir(int divisor, int t0)
-{
+void SimulateTagLowFrequencyBidir(int divisor, int t0) {
 }
 // compose fc/5 fc/8  waveform (FSK1)
 
 // compose fc/8 fc/10 waveform (FSK2)
 // also manchester,
-static void fc(int c, int *n)
-{
+static void fc(int c, int *n) {
     uint8_t *dest = BigBuf_get_addr();
     int idx;
 
@@ -726,8 +713,7 @@ static void fc(int c, int *n)
 
 // special start of frame marker containing invalid bit sequences
 // this one is focused on HID,  with manchester encoding.
-static void fcSTT(int *n)
-{
+static void fcSTT(int *n) {
     fc(8,  n);
     fc(8,  n); // invalid
     fc(8,  n);
@@ -739,8 +725,7 @@ static void fcSTT(int *n)
 }
 
 // compose fc/X fc/Y waveform (FSKx)
-static void fcAll(uint8_t fc, int *n, uint8_t clock, uint16_t *modCnt)
-{
+static void fcAll(uint8_t fc, int *n, uint8_t clock, uint16_t *modCnt) {
     uint8_t *dest = BigBuf_get_addr();
     uint8_t halfFC = fc >> 1;
     uint8_t wavesPerClock = clock / fc;
@@ -773,8 +758,7 @@ static void fcAll(uint8_t fc, int *n, uint8_t clock, uint16_t *modCnt)
 
 // prepare a waveform pattern in the buffer based on the ID given then
 // simulate a HID tag until the button is pressed
-void CmdHIDsimTAGEx(uint32_t hi, uint32_t lo, int ledcontrol, int numcycles)
-{
+void CmdHIDsimTAGEx(uint32_t hi, uint32_t lo, int ledcontrol, int numcycles) {
 
     if (hi > 0xFFF) {
         DbpString("[!] tags can only have 44 bits. - USE lf simfsk for larger tags");
@@ -837,8 +821,7 @@ void CmdHIDsimTAGEx(uint32_t hi, uint32_t lo, int ledcontrol, int numcycles)
     if (ledcontrol) LED_A_OFF();
 }
 
-void CmdHIDsimTAG(uint32_t hi, uint32_t lo, int ledcontrol)
-{
+void CmdHIDsimTAG(uint32_t hi, uint32_t lo, int ledcontrol) {
     CmdHIDsimTAGEx(hi, lo, ledcontrol, -1);
     DbpString("[!] simulation finished");
 }
@@ -846,8 +829,7 @@ void CmdHIDsimTAG(uint32_t hi, uint32_t lo, int ledcontrol)
 // prepare a waveform pattern in the buffer based on the ID given then
 // simulate a FSK tag until the button is pressed
 // arg1 contains fcHigh and fcLow, arg2 contains STT marker and clock
-void CmdFSKsimTAG(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *bits)
-{
+void CmdFSKsimTAG(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *bits) {
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
 
     // free eventually allocated BigBuf memory
@@ -885,8 +867,7 @@ void CmdFSKsimTAG(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *bits)
 }
 
 // compose ask waveform for one bit(ASK)
-static void askSimBit(uint8_t c, int *n, uint8_t clock, uint8_t manchester)
-{
+static void askSimBit(uint8_t c, int *n, uint8_t clock, uint8_t manchester) {
     uint8_t *dest = BigBuf_get_addr();
     uint8_t halfClk = clock / 2;
     // c = current bit 1 or 0
@@ -899,8 +880,7 @@ static void askSimBit(uint8_t c, int *n, uint8_t clock, uint8_t manchester)
     *n += clock;
 }
 
-static void biphaseSimBit(uint8_t c, int *n, uint8_t clock, uint8_t *phase)
-{
+static void biphaseSimBit(uint8_t c, int *n, uint8_t clock, uint8_t *phase) {
     uint8_t *dest = BigBuf_get_addr();
     uint8_t halfClk = clock / 2;
     if (c) {
@@ -913,8 +893,7 @@ static void biphaseSimBit(uint8_t c, int *n, uint8_t clock, uint8_t *phase)
     *n += clock;
 }
 
-static void stAskSimBit(int *n, uint8_t clock)
-{
+static void stAskSimBit(int *n, uint8_t clock) {
     uint8_t *dest = BigBuf_get_addr();
     uint8_t halfClk = clock / 2;
     //ST = .5 high .5 low 1.5 high .5 low 1 high
@@ -927,8 +906,7 @@ static void stAskSimBit(int *n, uint8_t clock)
 }
 
 // args clock, ask/man or askraw, invert, transmission separator
-void CmdASKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream)
-{
+void CmdASKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream) {
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
     set_tracing(false);
 
@@ -973,8 +951,7 @@ void CmdASKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream)
 }
 
 //carrier can be 2,4 or 8
-static void pskSimBit(uint8_t waveLen, int *n, uint8_t clk, uint8_t *curPhase, bool phaseChg)
-{
+static void pskSimBit(uint8_t waveLen, int *n, uint8_t clk, uint8_t *curPhase, bool phaseChg) {
     uint8_t *dest = BigBuf_get_addr();
     uint8_t halfWave = waveLen / 2;
     //uint8_t idx;
@@ -996,8 +973,7 @@ static void pskSimBit(uint8_t waveLen, int *n, uint8_t clk, uint8_t *curPhase, b
 }
 
 // args clock, carrier, invert,
-void CmdPSKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream)
-{
+void CmdPSKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream) {
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
     set_tracing(false);
 
@@ -1024,8 +1000,7 @@ void CmdPSKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream)
 }
 
 // loop to get raw HID waveform then FSK demodulate the TAG ID from it
-void CmdHIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol)
-{
+void CmdHIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol) {
     uint8_t *dest = BigBuf_get_addr();
     size_t size = 0;
     uint32_t hi2 = 0, hi = 0, lo = 0;
@@ -1122,8 +1097,7 @@ void CmdHIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol)
 }
 
 // loop to get raw HID waveform then FSK demodulate the TAG ID from it
-void CmdAWIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol)
-{
+void CmdAWIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol) {
 
     uint8_t *dest = BigBuf_get_addr();
 
@@ -1218,8 +1192,7 @@ void CmdAWIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol)
     if (ledcontrol) LED_A_OFF();
 }
 
-void CmdEM410xdemod(int findone, uint32_t *high, uint64_t *low, int ledcontrol)
-{
+void CmdEM410xdemod(int findone, uint32_t *high, uint64_t *low, int ledcontrol) {
     uint8_t *dest = BigBuf_get_addr();
 
     size_t size = 0, idx = 0;
@@ -1281,8 +1254,7 @@ void CmdEM410xdemod(int findone, uint32_t *high, uint64_t *low, int ledcontrol)
     if (ledcontrol) LED_A_OFF();
 }
 
-void CmdIOdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol)
-{
+void CmdIOdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol) {
 
     uint8_t *dest = BigBuf_get_addr();
 
@@ -1382,23 +1354,20 @@ void CmdIOdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol)
  * Q5 tags seems to have issues when these values changes.
  */
 
-void TurnReadLFOn(uint32_t delay)
-{
+void TurnReadLFOn(uint32_t delay) {
     FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | FPGA_LF_ADC_READER_FIELD);
 
     // measure antenna strength.
     //int adcval = ((MAX_ADC_LF_VOLTAGE * AvgAdc(ADC_CHAN_LF)) >> 10);
     WaitUS(delay);
 }
-void TurnReadLF_off(uint32_t delay)
-{
+void TurnReadLF_off(uint32_t delay) {
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     WaitUS(delay);
 }
 
 // Write one bit to card
-void T55xxWriteBit(int bit)
-{
+void T55xxWriteBit(int bit) {
     if (!bit)
         TurnReadLFOn(t_config.write_0);
     else
@@ -1408,8 +1377,7 @@ void T55xxWriteBit(int bit)
 }
 
 // Send T5577 reset command then read stream (see if we can identify the start of the stream)
-void T55xxResetRead(void)
-{
+void T55xxResetRead(void) {
     LED_A_ON();
     //clear buffer now so it does not interfere with timing later
     BigBuf_Clear_keep_EM();
@@ -1441,8 +1409,7 @@ void T55xxResetRead(void)
 }
 
 // Write one card block in page 0, no lock
-void T55xxWriteBlockExt(uint32_t Data, uint8_t Block, uint32_t Pwd, uint8_t arg)
-{
+void T55xxWriteBlockExt(uint32_t Data, uint8_t Block, uint32_t Pwd, uint8_t arg) {
     LED_A_ON();
     bool PwdMode = arg & 0x1;
     uint8_t Page = (arg & 0x2) >> 1;
@@ -1516,15 +1483,13 @@ void T55xxWriteBlockExt(uint32_t Data, uint8_t Block, uint32_t Pwd, uint8_t arg)
 }
 
 // Write one card block in page 0, no lock
-void T55xxWriteBlock(uint32_t Data, uint8_t Block, uint32_t Pwd, uint8_t arg)
-{
+void T55xxWriteBlock(uint32_t Data, uint8_t Block, uint32_t Pwd, uint8_t arg) {
     T55xxWriteBlockExt(Data, Block, Pwd, arg);
     cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
 }
 
 // Read one card block in page [page]
-void T55xxReadBlock(uint16_t arg0, uint8_t Block, uint32_t Pwd)
-{
+void T55xxReadBlock(uint16_t arg0, uint8_t Block, uint32_t Pwd) {
     LED_A_ON();
     bool PwdMode =    arg0 & 0x1;
     uint8_t Page = (arg0 & 0x2) >> 1;
@@ -1593,8 +1558,7 @@ void T55xxReadBlock(uint16_t arg0, uint8_t Block, uint32_t Pwd)
     }
 }
 
-void T55xx_ChkPwds()
-{
+void T55xx_ChkPwds() {
 
     DbpString("[+] T55XX Check pwds using flashmemory starting");
 
@@ -1693,8 +1657,7 @@ OUT:
     LEDsoff();
 }
 
-void T55xxWakeUp(uint32_t Pwd)
-{
+void T55xxWakeUp(uint32_t Pwd) {
     LED_B_ON();
     uint32_t i = 0;
 
@@ -1722,16 +1685,14 @@ void T55xxWakeUp(uint32_t Pwd)
 }
 
 /*-------------- Cloning routines -----------*/
-void WriteT55xx(uint32_t *blockdata, uint8_t startblock, uint8_t numblocks)
-{
+void WriteT55xx(uint32_t *blockdata, uint8_t startblock, uint8_t numblocks) {
     // write last block first and config block last (if included)
     for (uint8_t i = numblocks + startblock; i > startblock; i--)
         T55xxWriteBlockExt(blockdata[i - 1], i - 1, 0, 0);
 }
 
 // Copy HID id to card and setup block 0 config
-void CopyHIDtoT55x7(uint32_t hi2, uint32_t hi, uint32_t lo, uint8_t longFMT)
-{
+void CopyHIDtoT55x7(uint32_t hi2, uint32_t hi, uint32_t lo, uint8_t longFMT) {
     uint32_t data[] = {0, 0, 0, 0, 0, 0, 0};
     uint8_t last_block = 0;
 
@@ -1775,8 +1736,7 @@ void CopyHIDtoT55x7(uint32_t hi2, uint32_t hi, uint32_t lo, uint8_t longFMT)
     LED_D_OFF();
 }
 
-void CopyIOtoT55x7(uint32_t hi, uint32_t lo)
-{
+void CopyIOtoT55x7(uint32_t hi, uint32_t lo) {
     uint32_t data[] = {T55x7_BITRATE_RF_64 | T55x7_MODULATION_FSK2a | (2 << T55x7_MAXBLOCK_SHIFT), hi, lo};
     //TODO add selection of chip for Q5 or T55x7
     // data[0] = T5555_SET_BITRATE(64) | T5555_MODULATION_FSK2 | T5555_INVERT_OUTPUT | 2 << T5555_MAXBLOCK_SHIFT;
@@ -1789,8 +1749,7 @@ void CopyIOtoT55x7(uint32_t hi, uint32_t lo)
 }
 
 // Clone Indala 64-bit tag by UID to T55x7
-void CopyIndala64toT55x7(uint32_t hi, uint32_t lo)
-{
+void CopyIndala64toT55x7(uint32_t hi, uint32_t lo) {
     //Program the 2 data blocks for supplied 64bit UID
     // and the Config for Indala 64 format (RF/32;PSK2 with RF/2;Maxblock=2)
     uint32_t data[] = { T55x7_BITRATE_RF_32 | T55x7_MODULATION_PSK2 | (2 << T55x7_MAXBLOCK_SHIFT), hi, lo};
@@ -1802,8 +1761,7 @@ void CopyIndala64toT55x7(uint32_t hi, uint32_t lo)
     // T5567WriteBlock(0x603E1042,0);
 }
 // Clone Indala 224-bit tag by UID to T55x7
-void CopyIndala224toT55x7(uint32_t uid1, uint32_t uid2, uint32_t uid3, uint32_t uid4, uint32_t uid5, uint32_t uid6, uint32_t uid7)
-{
+void CopyIndala224toT55x7(uint32_t uid1, uint32_t uid2, uint32_t uid3, uint32_t uid4, uint32_t uid5, uint32_t uid6, uint32_t uid7) {
     //Program the 7 data blocks for supplied 224bit UID
     uint32_t data[] = {0, uid1, uid2, uid3, uid4, uid5, uid6, uid7};
     // and the block 0 for Indala224 format
@@ -1816,8 +1774,7 @@ void CopyIndala224toT55x7(uint32_t uid1, uint32_t uid2, uint32_t uid3, uint32_t
     // T5567WriteBlock(0x603E10E2,0);
 }
 // clone viking tag to T55xx
-void CopyVikingtoT55xx(uint32_t block1, uint32_t block2, uint8_t Q5)
-{
+void CopyVikingtoT55xx(uint32_t block1, uint32_t block2, uint8_t Q5) {
     uint32_t data[] = {T55x7_BITRATE_RF_32 | T55x7_MODULATION_MANCHESTER | (2 << T55x7_MAXBLOCK_SHIFT), block1, block2};
     if (Q5) data[0] = T5555_SET_BITRATE(32) | T5555_MODULATION_MANCHESTER | 2 << T5555_MAXBLOCK_SHIFT;
     // Program the data blocks for supplied ID and the block 0 config
@@ -1830,8 +1787,7 @@ void CopyVikingtoT55xx(uint32_t block1, uint32_t block2, uint8_t Q5)
 #define EM410X_HEADER    0x1FF
 #define EM410X_ID_LENGTH 40
 
-void WriteEM410x(uint32_t card, uint32_t id_hi, uint32_t id_lo)
-{
+void WriteEM410x(uint32_t card, uint32_t id_hi, uint32_t id_lo) {
     int i, id_bit;
     uint64_t id = EM410X_HEADER;
     uint64_t rev_id = 0; // reversed ID
@@ -1944,8 +1900,7 @@ uint8_t *fwd_write_ptr;  //forwardlink bit pointer
 //  These timings work for 4469/4269/4305 (with the 55*8 above)
 //  WRITE_0 = 23*8 , 9*8
 
-uint8_t Prepare_Cmd(uint8_t cmd)
-{
+uint8_t Prepare_Cmd(uint8_t cmd) {
 
     *forward_ptr++ = 0; //start bit
     *forward_ptr++ = 0; //second pause for 4050 code
@@ -1965,8 +1920,7 @@ uint8_t Prepare_Cmd(uint8_t cmd)
 // prepares address bits
 // see EM4469 spec
 //====================================================================
-uint8_t Prepare_Addr(uint8_t addr)
-{
+uint8_t Prepare_Addr(uint8_t addr) {
 
     register uint8_t line_parity;
 
@@ -1987,8 +1941,7 @@ uint8_t Prepare_Addr(uint8_t addr)
 // prepares data bits intreleaved with parity bits
 // see EM4469 spec
 //====================================================================
-uint8_t Prepare_Data(uint16_t data_low, uint16_t data_hi)
-{
+uint8_t Prepare_Data(uint16_t data_low, uint16_t data_hi) {
 
     register uint8_t line_parity;
     register uint8_t column_parity;
@@ -2025,8 +1978,7 @@ uint8_t Prepare_Data(uint16_t data_low, uint16_t data_hi)
 // Requires: forwarLink_data filled with valid bits (1 bit per byte)
 // fwd_bit_count set with number of bits to be sent
 //====================================================================
-void SendForward(uint8_t fwd_bit_count)
-{
+void SendForward(uint8_t fwd_bit_count) {
 
 // iceman,   21.3us increments for the USclock verification.
 // 55FC * 8us == 440us / 21.3 === 20.65 steps.  could be too short. Go for 56FC instead
@@ -2060,8 +2012,7 @@ void SendForward(uint8_t fwd_bit_count)
     }
 }
 
-void EM4xLogin(uint32_t pwd)
-{
+void EM4xLogin(uint32_t pwd) {
     uint8_t len;
     forward_ptr = forwardLink_data;
     len = Prepare_Cmd(FWD_CMD_LOGIN);
@@ -2073,8 +2024,7 @@ void EM4xLogin(uint32_t pwd)
     // 0000 0001 fail
 }
 
-void EM4xReadWord(uint8_t addr, uint32_t pwd, uint8_t usepwd)
-{
+void EM4xReadWord(uint8_t addr, uint32_t pwd, uint8_t usepwd) {
 
     LED_A_ON();
     uint8_t len;
@@ -2106,8 +2056,7 @@ void EM4xReadWord(uint8_t addr, uint32_t pwd, uint8_t usepwd)
     LED_A_OFF();
 }
 
-void EM4xWriteWord(uint32_t flag, uint32_t data, uint32_t pwd)
-{
+void EM4xWriteWord(uint32_t flag, uint32_t data, uint32_t pwd) {
 
     LED_A_ON();
 
@@ -2157,8 +2106,7 @@ pulse 3.6 msecs
 
 This triggers a COTAG tag to response
 */
-void Cotag(uint32_t arg0)
-{
+void Cotag(uint32_t arg0) {
 #ifndef OFF
 # define OFF(x)  { FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); WaitUS((x)); }
 #endif
diff --git a/armsrc/lfsampling.c b/armsrc/lfsampling.c
index 086b60d2f..12517132e 100644
--- a/armsrc/lfsampling.c
+++ b/armsrc/lfsampling.c
@@ -18,8 +18,7 @@ Default LF config is set to:
     */
 sample_config config = { 1, 8, 1, 95, 0 } ;
 
-void printConfig()
-{
+void printConfig() {
     Dbprintf("LF Sampling config");
     Dbprintf("  [q] divisor.............%d (%d KHz)", config.divisor, 12000 / (config.divisor + 1));
     Dbprintf("  [b] bps.................%d", config.bits_per_sample);
@@ -39,8 +38,7 @@ void printConfig()
  * @brief setSamplingConfig
  * @param sc
  */
-void setSamplingConfig(sample_config *sc)
-{
+void setSamplingConfig(sample_config *sc) {
     if (sc->divisor != 0) config.divisor = sc->divisor;
     if (sc->bits_per_sample != 0) config.bits_per_sample = sc->bits_per_sample;
     if (sc->trigger_threshold != -1) config.trigger_threshold = sc->trigger_threshold;
@@ -52,8 +50,7 @@ void setSamplingConfig(sample_config *sc)
     printConfig();
 }
 
-sample_config *getSamplingConfig()
-{
+sample_config *getSamplingConfig() {
     return &config;
 }
 
@@ -68,8 +65,7 @@ struct BitstreamOut {
  * @param stream
  * @param bit
  */
-void pushBit(BitstreamOut *stream, uint8_t bit)
-{
+void pushBit(BitstreamOut *stream, uint8_t bit) {
     int bytepos = stream->position >> 3; // divide by 8
     int bitpos = stream->position & 7;
     *(stream->buffer + bytepos) |= (bit > 0) << (7 - bitpos);
@@ -84,8 +80,7 @@ void pushBit(BitstreamOut *stream, uint8_t bit)
 *                  0 or 95 ==> 125 KHz
 *
 **/
-void LFSetupFPGAForADC(int divisor, bool lf_field)
-{
+void LFSetupFPGAForADC(int divisor, bool lf_field) {
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
     if ((divisor == 1) || (divisor < 0) || (divisor > 255))
         FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 88); //134.8Khz
@@ -121,8 +116,7 @@ void LFSetupFPGAForADC(int divisor, bool lf_field)
  * @param silent - is true, now outputs are made. If false, dbprints the status
  * @return the number of bits occupied by the samples.
  */
-uint32_t DoAcquisition(uint8_t decimation, uint32_t bits_per_sample, bool averaging, int trigger_threshold, bool silent, int bufsize, uint32_t cancel_after)
-{
+uint32_t DoAcquisition(uint8_t decimation, uint32_t bits_per_sample, bool averaging, int trigger_threshold, bool silent, int bufsize, uint32_t cancel_after) {
 
     uint8_t *dest = BigBuf_get_addr();
     bufsize = (bufsize > 0 && bufsize < BigBuf_max_traceLen()) ? bufsize : BigBuf_max_traceLen();
@@ -224,12 +218,10 @@ uint32_t DoAcquisition(uint8_t decimation, uint32_t bits_per_sample, bool averag
  * @param silent
  * @return number of bits sampled
  */
-uint32_t DoAcquisition_default(int trigger_threshold, bool silent)
-{
+uint32_t DoAcquisition_default(int trigger_threshold, bool silent) {
     return DoAcquisition(1, 8, 0, trigger_threshold, silent, 0, 0);
 }
-uint32_t DoAcquisition_config(bool silent, int sample_size)
-{
+uint32_t DoAcquisition_config(bool silent, int sample_size) {
     return DoAcquisition(config.decimation
                          , config.bits_per_sample
                          , config.averaging
@@ -239,13 +231,11 @@ uint32_t DoAcquisition_config(bool silent, int sample_size)
                          , 0);
 }
 
-uint32_t DoPartialAcquisition(int trigger_threshold, bool silent, int sample_size, uint32_t cancel_after)
-{
+uint32_t DoPartialAcquisition(int trigger_threshold, bool silent, int sample_size, uint32_t cancel_after) {
     return DoAcquisition(1, 8, 0, trigger_threshold, silent, sample_size, cancel_after);
 }
 
-uint32_t ReadLF(bool activeField, bool silent, int sample_size)
-{
+uint32_t ReadLF(bool activeField, bool silent, int sample_size) {
     if (!silent)
         printConfig();
     LFSetupFPGAForADC(config.divisor, activeField);
@@ -256,8 +246,7 @@ uint32_t ReadLF(bool activeField, bool silent, int sample_size)
 * Initializes the FPGA for reader-mode (field on), and acquires the samples.
 * @return number of bits sampled
 **/
-uint32_t SampleLF(bool printCfg, int sample_size)
-{
+uint32_t SampleLF(bool printCfg, int sample_size) {
     BigBuf_Clear_ext(false);
     uint32_t ret = ReadLF(true, printCfg, sample_size);
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
@@ -267,8 +256,7 @@ uint32_t SampleLF(bool printCfg, int sample_size)
 * Initializes the FPGA for snoop-mode (field off), and acquires the samples.
 * @return number of bits sampled
 **/
-uint32_t SnoopLF()
-{
+uint32_t SnoopLF() {
     BigBuf_Clear_ext(false);
     uint32_t ret = ReadLF(false, true, 0);
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
@@ -279,8 +267,7 @@ uint32_t SnoopLF()
 * acquisition of T55x7 LF signal. Similar to other LF, but adjusted with @marshmellows thresholds
 * the data is collected in BigBuf.
 **/
-void doT55x7Acquisition(size_t sample_size)
-{
+void doT55x7Acquisition(size_t sample_size) {
 
 #define T55xx_READ_UPPER_THRESHOLD 128+60  // 60 grph
 #define T55xx_READ_LOWER_THRESHOLD 128-60  // -60 grph
@@ -350,8 +337,7 @@ void doT55x7Acquisition(size_t sample_size)
 #ifndef COTAG_BITS
 #define COTAG_BITS 264
 #endif
-void doCotagAcquisition(size_t sample_size)
-{
+void doCotagAcquisition(size_t sample_size) {
 
     uint8_t *dest = BigBuf_get_addr();
     uint16_t bufsize = BigBuf_max_traceLen();
@@ -401,8 +387,7 @@ void doCotagAcquisition(size_t sample_size)
     }
 }
 
-uint32_t doCotagAcquisitionManchester()
-{
+uint32_t doCotagAcquisitionManchester() {
 
     uint8_t *dest = BigBuf_get_addr();
     uint16_t bufsize = BigBuf_max_traceLen();
diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index c4710d936..1f1932e27 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -38,8 +38,7 @@ static uint8_t dummy_answer = 0;
 // Select, Authenticate, Read a MIFARE tag.
 // read block
 //-----------------------------------------------------------------------------
-void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
-{
+void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) {
     // params
     uint8_t blockNo = arg0;
     uint8_t keyType = arg1;
@@ -101,8 +100,7 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
     LEDsoff();
 }
 
-void MifareUC_Auth(uint8_t arg0, uint8_t *keybytes)
-{
+void MifareUC_Auth(uint8_t arg0, uint8_t *keybytes) {
 
     bool turnOffField = (arg0 == 1);
 
@@ -137,8 +135,7 @@ void MifareUC_Auth(uint8_t arg0, uint8_t *keybytes)
 // Arg0 = BlockNo,
 // Arg1 = UsePwd bool
 // datain = PWD bytes,
-void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)
-{
+void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain) {
     uint8_t blockNo = arg0;
     byte_t dataout[16] = {0x00};
     bool useKey = (arg1 == 1); //UL_C
@@ -201,8 +198,7 @@ void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)
 // Select, Authenticate, Read a MIFARE tag.
 // read sector (data = 4 x 16 bytes = 64 bytes, or 16 x 16 bytes = 256 bytes)
 //-----------------------------------------------------------------------------
-void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
-{
+void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) {
     // params
     uint8_t sectorNo = arg0;
     uint8_t keyType = arg1;
@@ -268,8 +264,7 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
 // arg1 = Pages (number of blocks)
 // arg2 = useKey
 // datain = KEY bytes
-void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
-{
+void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain) {
     LEDsoff();
     LED_A_ON();
     iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
@@ -368,8 +363,7 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
 // Select, Authenticate, Write a MIFARE tag.
 // read block
 //-----------------------------------------------------------------------------
-void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
-{
+void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) {
     // params
     uint8_t blockNo = arg0;
     uint8_t keyType = arg1;
@@ -479,8 +473,7 @@ void MifareUWriteBlockCompat(uint8_t arg0, uint8_t *datain)
 //          2 = use 0x1B authentication.
 // datain : 4 first bytes is data to be written.
 //        : 4/16 next bytes is authentication key.
-void MifareUWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)
-{
+void MifareUWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain) {
     uint8_t blockNo = arg0;
     bool useKey = (arg1 == 1); //UL_C
     bool usePwd = (arg1 == 2); //UL_EV1/NTAG
@@ -543,8 +536,7 @@ void MifareUWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)
     set_tracing(false);
 }
 
-void MifareUSetPwd(uint8_t arg0, uint8_t *datain)
-{
+void MifareUSetPwd(uint8_t arg0, uint8_t *datain) {
 
     uint8_t pwd[16] = {0x00};
     byte_t blockdata[4] = {0x00};
@@ -618,15 +610,13 @@ void MifareUSetPwd(uint8_t arg0, uint8_t *datain)
 }
 
 // Return 1 if the nonce is invalid else return 0
-int valid_nonce(uint32_t Nt, uint32_t NtEnc, uint32_t Ks1, uint8_t *parity)
-{
+int valid_nonce(uint32_t Nt, uint32_t NtEnc, uint32_t Ks1, uint8_t *parity) {
     return ((oddparity8((Nt >> 24) & 0xFF) == ((parity[0]) ^ oddparity8((NtEnc >> 24) & 0xFF) ^ BIT(Ks1, 16))) & \
             (oddparity8((Nt >> 16) & 0xFF) == ((parity[1]) ^ oddparity8((NtEnc >> 16) & 0xFF) ^ BIT(Ks1, 8))) & \
             (oddparity8((Nt >> 8) & 0xFF) == ((parity[2]) ^ oddparity8((NtEnc >> 8) & 0xFF) ^ BIT(Ks1, 0)))) ? 1 : 0;
 }
 
-void MifareAcquireNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *datain)
-{
+void MifareAcquireNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *datain) {
 
     uint8_t uid[10] = {0x00};
     uint8_t answer[MAX_MIFARE_FRAME_SIZE] = {0x00};
@@ -734,8 +724,7 @@ void MifareAcquireNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *
 // Mifare Classic Cards" in Proceedings of the 22nd ACM SIGSAC Conference on
 // Computer and Communications Security, 2015
 //-----------------------------------------------------------------------------
-void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *datain)
-{
+void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *datain) {
 
     struct Crypto1State mpcs = {0, 0};
     struct Crypto1State *pcs;
@@ -862,8 +851,7 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
 // MIFARE nested authentication.
 //
 //-----------------------------------------------------------------------------
-void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *datain)
-{
+void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *datain) {
     // params
     uint8_t blockNo = arg0 & 0xff;
     uint8_t keyType = (arg0 >> 8) & 0xff;
@@ -1101,8 +1089,7 @@ typedef struct chk_t {
 //  2 = failed to select.
 //  1 = wrong key
 //  0 = correct key
-uint8_t chkKey(struct chk_t *c)
-{
+uint8_t chkKey(struct chk_t *c) {
     uint8_t i = 0, res = 2;
     while (i < 5) {
         // this part is from Piwi's faster nonce collecting part in Hardnested.
@@ -1123,8 +1110,7 @@ uint8_t chkKey(struct chk_t *c)
     return res;
 }
 
-uint8_t chkKey_readb(struct chk_t *c, uint8_t *keyb)
-{
+uint8_t chkKey_readb(struct chk_t *c, uint8_t *keyb) {
 
     if (!iso14443a_fast_select_card(c->uid, c->cl))
         return 2;
@@ -1149,8 +1135,7 @@ uint8_t chkKey_readb(struct chk_t *c, uint8_t *keyb)
     return res;
 }
 
-void chkKey_scanA(struct chk_t *c, struct sector_t *k_sector, uint8_t *found, uint8_t *sectorcnt, uint8_t *foundkeys)
-{
+void chkKey_scanA(struct chk_t *c, struct sector_t *k_sector, uint8_t *found, uint8_t *sectorcnt, uint8_t *foundkeys) {
     for (uint8_t s = 0; s < *sectorcnt; s++) {
 
         // skip already found A keys
@@ -1168,8 +1153,7 @@ void chkKey_scanA(struct chk_t *c, struct sector_t *k_sector, uint8_t *found, ui
     }
 }
 
-void chkKey_scanB(struct chk_t *c, struct sector_t *k_sector, uint8_t *found, uint8_t *sectorcnt, uint8_t *foundkeys)
-{
+void chkKey_scanB(struct chk_t *c, struct sector_t *k_sector, uint8_t *found, uint8_t *sectorcnt, uint8_t *foundkeys) {
     for (uint8_t s = 0; s < *sectorcnt; s++) {
 
         // skip already found B keys
@@ -1189,8 +1173,7 @@ void chkKey_scanB(struct chk_t *c, struct sector_t *k_sector, uint8_t *found, ui
 
 // loop all A keys,
 // when A is found but not B,  try to read B.
-void chkKey_loopBonly(struct chk_t *c, struct sector_t *k_sector, uint8_t *found, uint8_t *sectorcnt, uint8_t *foundkeys)
-{
+void chkKey_loopBonly(struct chk_t *c, struct sector_t *k_sector, uint8_t *found, uint8_t *sectorcnt, uint8_t *foundkeys) {
 
     // read Block B, if A is found.
     for (uint8_t s = 0; s < *sectorcnt; ++s) {
@@ -1228,8 +1211,7 @@ void chkKey_loopBonly(struct chk_t *c, struct sector_t *k_sector, uint8_t *found
 // arg1 = clear trace
 // arg2 = antal nycklar i keychunk
 // datain = keys as array
-void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)
-{
+void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain) {
 
     // first call or
     uint8_t sectorcnt = arg0 & 0xFF; // 16;
@@ -1533,8 +1515,7 @@ OUT:
     }
 }
 
-void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
-{
+void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) {
 
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 
@@ -1623,8 +1604,7 @@ void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
 // MIFARE commands set debug level
 //
 //-----------------------------------------------------------------------------
-void MifareSetDbgLvl(uint16_t arg0)
-{
+void MifareSetDbgLvl(uint16_t arg0) {
     MF_DBGLEVEL = arg0;
     Dbprintf("Debug level: %d", MF_DBGLEVEL);
 }
@@ -1637,21 +1617,18 @@ void MifareSetDbgLvl(uint16_t arg0)
 // destroy the Emulator Memory.
 //-----------------------------------------------------------------------------
 
-void MifareEMemClr(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)
-{
+void MifareEMemClr(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain) {
     FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
     emlClearMem();
 }
 
-void MifareEMemSet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)
-{
+void MifareEMemSet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain) {
     FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
     if (arg2 == 0) arg2 = 16; // backwards compat... default bytewidth
     emlSetMem_xt(datain, arg0, arg1, arg2); // data, block num, blocks count, block byte width
 }
 
-void MifareEMemGet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)
-{
+void MifareEMemGet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain) {
     FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
     byte_t buf[USB_CMD_DATA_SIZE] = {0x00};
     emlGetMem(buf, arg0, arg1); // data, block num, blocks count (max 4)
@@ -1665,8 +1642,7 @@ void MifareEMemGet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)
 // Load a card into the emulator memory
 //
 //-----------------------------------------------------------------------------
-void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)
-{
+void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain) {
     uint8_t numSectors = arg0;
     uint8_t keyType = arg1;
     uint64_t ui64Key = 0;
@@ -1763,8 +1739,7 @@ uint8_t wupC1[] = { MIFARE_MAGICWUPC1 };
 uint8_t wupC2[] = { MIFARE_MAGICWUPC2 };
 uint8_t wipeC[] = { MIFARE_MAGICWIPEC };
 
-void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain)
-{
+void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain) {
 
     // params
     uint8_t workFlags = arg0;
@@ -1874,8 +1849,7 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain)
         OnSuccessMagic();
 }
 
-void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain)
-{
+void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain) {
 
     uint8_t workFlags = arg0;
     uint8_t blockNo = arg1;
@@ -1951,8 +1925,7 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain)
         OnSuccessMagic();
 }
 
-void MifareCIdent()
-{
+void MifareCIdent() {
 #define GEN_1A 1
 #define GEN_1B 2
 #define GEN_2  4
@@ -2006,21 +1979,18 @@ OUT:
     OnSuccessMagic();
 }
 
-void OnSuccessMagic()
-{
+void OnSuccessMagic() {
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     LEDsoff();
     set_tracing(false);
 }
-void OnErrorMagic(uint8_t reason)
-{
+void OnErrorMagic(uint8_t reason) {
     //          ACK, ISOK, reason,0,0,0
     cmd_send(CMD_ACK, 0, reason, 0, 0, 0);
     OnSuccessMagic();
 }
 
-void MifareSetMod(uint8_t mod, uint8_t *key)
-{
+void MifareSetMod(uint8_t mod, uint8_t *key) {
     uint64_t ui64Key = bytes_to_num(key, 6);
 
     // variables
@@ -2080,8 +2050,7 @@ void MifareSetMod(uint8_t mod, uint8_t *key)
 //
 // DESFIRE
 //
-void Mifare_DES_Auth1(uint8_t arg0, uint8_t *datain)
-{
+void Mifare_DES_Auth1(uint8_t arg0, uint8_t *datain) {
     byte_t dataout[12] = {0x00};
     uint8_t uid[10] = {0x00};
     uint32_t cuid = 0;
@@ -2107,8 +2076,7 @@ void Mifare_DES_Auth1(uint8_t arg0, uint8_t *datain)
     cmd_send(CMD_ACK, 1, cuid, 0, dataout, sizeof(dataout));
 }
 
-void Mifare_DES_Auth2(uint32_t arg0, uint8_t *datain)
-{
+void Mifare_DES_Auth2(uint32_t arg0, uint8_t *datain) {
     uint32_t cuid = arg0;
     uint8_t key[16] = {0x00};
     byte_t dataout[12] = {0x00};
diff --git a/armsrc/mifaredesfire.c b/armsrc/mifaredesfire.c
index 55dbb4646..3bbf667b5 100644
--- a/armsrc/mifaredesfire.c
+++ b/armsrc/mifaredesfire.c
@@ -16,8 +16,7 @@ static  uint8_t deselect_cmd[] = {0xc2, 0xe0, 0xb4};
 /*                                       PCB   CID   CMD    PAYLOAD    */
 //static uint8_t __res[MAX_FRAME_SIZE];
 
-bool InitDesfireCard()
-{
+bool InitDesfireCard() {
 
     iso14a_card_select_t card;
 
@@ -41,8 +40,7 @@ enum  {
     BAR        = 0x08,
 } CmdOptions ;
 
-void MifareSendCommand(uint8_t arg0, uint8_t arg1, uint8_t *datain)
-{
+void MifareSendCommand(uint8_t arg0, uint8_t arg1, uint8_t *datain) {
 
     /* ARG0 contains flags.
         0x01 = init card.
@@ -86,8 +84,7 @@ void MifareSendCommand(uint8_t arg0, uint8_t arg1, uint8_t *datain)
     cmd_send(CMD_ACK, 1, len, 0, resp, len);
 }
 
-void MifareDesfireGetInformation()
-{
+void MifareDesfireGetInformation() {
 
     int len = 0;
     iso14a_card_select_t card;
@@ -170,8 +167,7 @@ void MifareDesfireGetInformation()
     OnSuccess();
 }
 
-void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain)
-{
+void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain) {
 
     int len = 0;
     //uint8_t PICC_MASTER_KEY8[8] = { 0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47};
@@ -503,8 +499,7 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
 // cmd  =  cmd bytes to send
 // cmd_len = length of cmd
 // dataout = pointer to response data array
-int DesfireAPDU(uint8_t *cmd, size_t cmd_len, uint8_t *dataout)
-{
+int DesfireAPDU(uint8_t *cmd, size_t cmd_len, uint8_t *dataout) {
 
     size_t len = 0;
     size_t wrappedLen = 0;
@@ -538,8 +533,7 @@ int DesfireAPDU(uint8_t *cmd, size_t cmd_len, uint8_t *dataout)
 }
 
 // CreateAPDU
-size_t CreateAPDU(uint8_t *datain, size_t len, uint8_t *dataout)
-{
+size_t CreateAPDU(uint8_t *datain, size_t len, uint8_t *dataout) {
 
     size_t cmdlen = MIN(len + 4, USB_CMD_DATA_SIZE - 1);
 
@@ -563,16 +557,14 @@ size_t CreateAPDU(uint8_t *datain, size_t len, uint8_t *dataout)
 // crc_update(&desfire_crc32, byte, 8);
 // uint32_t crc = crc_finish(&desfire_crc32);
 
-void OnSuccess()
-{
+void OnSuccess() {
     pcb_blocknum = 0;
     ReaderTransmit(deselect_cmd, 3, NULL);
     mifare_ultra_halt();
     switch_off();
 }
 
-void OnError(uint8_t reason)
-{
+void OnError(uint8_t reason) {
     cmd_send(CMD_ACK, 0, reason, 0, 0, 0);
     OnSuccess();
 }
diff --git a/armsrc/mifaresniff.c b/armsrc/mifaresniff.c
index 2a32e268e..8f391207e 100644
--- a/armsrc/mifaresniff.c
+++ b/armsrc/mifaresniff.c
@@ -24,8 +24,7 @@ static uint32_t timerData = 0;
 // if no activity for 2sec, it sends the collected data to the client.
 //-----------------------------------------------------------------------------
 // "hf mf sniff"
-void RAMFUNC SniffMifare(uint8_t param)
-{
+void RAMFUNC SniffMifare(uint8_t param) {
     // param:
     // bit 0 - trigger from first card answer
     // bit 1 - trigger from first reader 7-bit request
@@ -177,8 +176,7 @@ void RAMFUNC SniffMifare(uint8_t param)
     switch_off();
 }
 
-void MfSniffInit(void)
-{
+void MfSniffInit(void) {
     memset(sniffUID, 0x00, sizeof(sniffUID));
     memset(sniffATQA, 0x00, sizeof(sniffATQA));
     memset(sniffBuf, 0x00, sizeof(sniffBuf));
@@ -187,8 +185,7 @@ void MfSniffInit(void)
     timerData = 0;
 }
 
-void MfSniffEnd(void)
-{
+void MfSniffEnd(void) {
     LED_B_ON();
     cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
     LED_B_OFF();
@@ -308,8 +305,7 @@ bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint8_t *parity, ui
 }
 */
 
-void RAMFUNC MfSniffSend()
-{
+void RAMFUNC MfSniffSend() {
     uint16_t tracelen = BigBuf_get_traceLen();
     uint16_t chunksize = 0;
     int packlen = tracelen; // total number of bytes to send
diff --git a/armsrc/mifareutil.c b/armsrc/mifareutil.c
index 42e69113d..f61987f09 100644
--- a/armsrc/mifareutil.c
+++ b/armsrc/mifareutil.c
@@ -13,8 +13,7 @@
 int MF_DBGLEVEL = MF_DBG_ERROR;
 
 // crypto1 helpers
-void mf_crypto1_decryptEx(struct Crypto1State *pcs, uint8_t *data_in, int len, uint8_t *data_out)
-{
+void mf_crypto1_decryptEx(struct Crypto1State *pcs, uint8_t *data_in, int len, uint8_t *data_out) {
     uint8_t bt = 0;
     int i;
 
@@ -31,13 +30,11 @@ void mf_crypto1_decryptEx(struct Crypto1State *pcs, uint8_t *data_in, int len, u
     return;
 }
 
-void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len)
-{
+void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len) {
     mf_crypto1_decryptEx(pcs, data, len, data);
 }
 
-void mf_crypto1_encrypt(struct Crypto1State *pcs, uint8_t *data, uint16_t len, uint8_t *par)
-{
+void mf_crypto1_encrypt(struct Crypto1State *pcs, uint8_t *data, uint16_t len, uint8_t *par) {
     uint8_t bt = 0;
     int i;
     par[0] = 0;
@@ -51,8 +48,7 @@ void mf_crypto1_encrypt(struct Crypto1State *pcs, uint8_t *data, uint16_t len, u
     }
 }
 
-uint8_t mf_crypto1_encrypt4bit(struct Crypto1State *pcs, uint8_t data)
-{
+uint8_t mf_crypto1_encrypt4bit(struct Crypto1State *pcs, uint8_t data) {
     uint8_t bt = 0;
     bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data, 0)) << 0;
     bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data, 1)) << 1;
@@ -62,8 +58,7 @@ uint8_t mf_crypto1_encrypt4bit(struct Crypto1State *pcs, uint8_t data)
 }
 
 // send X byte basic commands
-int mifare_sendcmd(uint8_t cmd, uint8_t *data, uint8_t data_size, uint8_t *answer, uint8_t *answer_parity, uint32_t *timing)
-{
+int mifare_sendcmd(uint8_t cmd, uint8_t *data, uint8_t data_size, uint8_t *answer, uint8_t *answer_parity, uint32_t *timing) {
     uint8_t dcmd[data_size + 3];
     dcmd[0] = cmd;
     memcpy(dcmd + 1, data, data_size);
@@ -78,8 +73,7 @@ int mifare_sendcmd(uint8_t cmd, uint8_t *data, uint8_t data_size, uint8_t *answe
 }
 
 // send 2 byte commands
-int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t data, uint8_t *answer, uint8_t *answer_parity, uint32_t *timing)
-{
+int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t data, uint8_t *answer, uint8_t *answer_parity, uint32_t *timing) {
     uint16_t pos, res;
     uint8_t dcmd[4] = {cmd, data, 0x00, 0x00};
     uint8_t ecmd[4] = {0x00, 0x00, 0x00, 0x00};
@@ -119,13 +113,11 @@ int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd,
 }
 
 // mifare classic commands
-int mifare_classic_auth(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint8_t isNested)
-{
+int mifare_classic_auth(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint8_t isNested) {
     return mifare_classic_authex(pcs, uid, blockNo, keyType, ui64Key, isNested, NULL, NULL);
 }
 
-int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint8_t isNested, uint32_t *ntptr, uint32_t *timing)
-{
+int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint8_t isNested, uint32_t *ntptr, uint32_t *timing) {
     int len;
     uint32_t pos, nt, ntpp; // Supplied tag nonce
     uint8_t par[1] = {0x00};
@@ -203,8 +195,7 @@ int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockN
     return 0;
 }
 
-int mifare_classic_readblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData)
-{
+int mifare_classic_readblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData) {
 
     int len;
     uint8_t bt[2] = {0x00, 0x00};
@@ -233,8 +224,7 @@ int mifare_classic_readblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blo
 }
 
 // mifare ultralight commands
-int mifare_ul_ev1_auth(uint8_t *keybytes, uint8_t *pack)
-{
+int mifare_ul_ev1_auth(uint8_t *keybytes, uint8_t *pack) {
 
     uint16_t len = 0;
     uint8_t resp[4] = {0x00, 0x00, 0x00, 0x00};
@@ -259,8 +249,7 @@ int mifare_ul_ev1_auth(uint8_t *keybytes, uint8_t *pack)
     return 1;
 }
 
-int mifare_ultra_auth(uint8_t *keybytes)
-{
+int mifare_ultra_auth(uint8_t *keybytes) {
 
     /// 3des2k
     uint8_t random_a[8] = {1, 1, 1, 1, 1, 1, 1, 1};
@@ -345,8 +334,7 @@ int mifare_ultra_auth(uint8_t *keybytes)
     return 1;
 }
 
-int mifare_ultra_readblockEx(uint8_t blockNo, uint8_t *blockData)
-{
+int mifare_ultra_readblockEx(uint8_t blockNo, uint8_t *blockData) {
     uint16_t len = 0;
     uint8_t bt[2] = {0x00, 0x00};
     uint8_t receivedAnswer[MAX_FRAME_SIZE] = {0x00};
@@ -372,8 +360,7 @@ int mifare_ultra_readblockEx(uint8_t blockNo, uint8_t *blockData)
     memcpy(blockData, receivedAnswer, 14);
     return 0;
 }
-int mifare_ultra_readblock(uint8_t blockNo, uint8_t *blockData)
-{
+int mifare_ultra_readblock(uint8_t blockNo, uint8_t *blockData) {
 #define MFU_MAX_RETRIES 5
     uint8_t res;
 
@@ -392,8 +379,7 @@ int mifare_ultra_readblock(uint8_t blockNo, uint8_t *blockData)
     return res;
 }
 
-int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData)
-{
+int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData) {
     // variables
     uint16_t len = 0;
     uint32_t pos = 0;
@@ -471,8 +457,7 @@ int mifare_ultra_writeblock_compat(uint8_t blockNo, uint8_t *blockData) {
 }
 */
 
-int mifare_ultra_writeblock(uint8_t blockNo, uint8_t *blockData)
-{
+int mifare_ultra_writeblock(uint8_t blockNo, uint8_t *blockData) {
     uint16_t len = 0;
     uint8_t block[5] = {blockNo, 0x00, 0x00, 0x00, 0x00 };
     uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};
@@ -490,8 +475,7 @@ int mifare_ultra_writeblock(uint8_t blockNo, uint8_t *blockData)
     }
     return 0;
 }
-int mifare_classic_halt_ex(struct Crypto1State *pcs)
-{
+int mifare_classic_halt_ex(struct Crypto1State *pcs) {
     uint8_t receivedAnswer[4] = {0x00, 0x00, 0x00, 0x00};
     uint16_t len = mifare_sendcmd_short(pcs, (pcs == NULL) ? CRYPT_NONE : CRYPT_ALL, ISO14443A_CMD_HALT, 0x00, receivedAnswer, NULL, NULL);
     if (len != 0) {
@@ -500,13 +484,11 @@ int mifare_classic_halt_ex(struct Crypto1State *pcs)
     }
     return 0;
 }
-int mifare_classic_halt(struct Crypto1State *pcs, uint32_t uid)
-{
+int mifare_classic_halt(struct Crypto1State *pcs, uint32_t uid) {
     return mifare_classic_halt_ex(pcs);
 }
 
-int mifare_ultra_halt()
-{
+int mifare_ultra_halt() {
     uint16_t len = 0;
     uint8_t receivedAnswer[4] = {0x00, 0x00, 0x00, 0x00};
     len = mifare_sendcmd_short(NULL, CRYPT_NONE, ISO14443A_CMD_HALT, 0x00, receivedAnswer, NULL, NULL);
@@ -520,13 +502,11 @@ int mifare_ultra_halt()
 
 // Mifare Memory Structure: up to 32 Sectors with 4 blocks each (1k and 2k cards),
 // plus evtl. 8 sectors with 16 blocks each (4k cards)
-uint8_t NumBlocksPerSector(uint8_t sectorNo)
-{
+uint8_t NumBlocksPerSector(uint8_t sectorNo) {
     return (sectorNo < 32) ? 4 : 16;
 }
 
-uint8_t FirstBlockOfSector(uint8_t sectorNo)
-{
+uint8_t FirstBlockOfSector(uint8_t sectorNo) {
     if (sectorNo < 32)
         return sectorNo * 4;
     else
@@ -535,47 +515,41 @@ uint8_t FirstBlockOfSector(uint8_t sectorNo)
 }
 
 // work with emulator memory
-void emlSetMem(uint8_t *data, int blockNum, int blocksCount)
-{
+void emlSetMem(uint8_t *data, int blockNum, int blocksCount) {
     emlSetMem_xt(data, blockNum, blocksCount, 16);
 }
 
-void emlSetMem_xt(uint8_t *data, int blockNum, int blocksCount, int blockBtWidth)
-{
+void emlSetMem_xt(uint8_t *data, int blockNum, int blocksCount, int blockBtWidth) {
     uint8_t *emCARD = BigBuf_get_EM_addr();
     memcpy(emCARD + blockNum * blockBtWidth, data, blocksCount * blockBtWidth);
 }
 
-void emlGetMem(uint8_t *data, int blockNum, int blocksCount)
-{
+void emlGetMem(uint8_t *data, int blockNum, int blocksCount) {
     uint8_t *emCARD = BigBuf_get_EM_addr();
     memcpy(data, emCARD + blockNum * 16, blocksCount * 16);
 }
 
-void emlGetMemBt(uint8_t *data, int bytePtr, int byteCount)
-{
+void emlGetMemBt(uint8_t *data, int bytePtr, int byteCount) {
     uint8_t *emCARD = BigBuf_get_EM_addr();
     memcpy(data, emCARD + bytePtr, byteCount);
 }
 
-int emlCheckValBl(int blockNum)
-{
+int emlCheckValBl(int blockNum) {
     uint8_t *emCARD = BigBuf_get_EM_addr();
     uint8_t *data = emCARD + blockNum * 16;
 
     if ((data[0] != (data[4] ^ 0xff)) || (data[0] != data[8]) ||
-        (data[1] != (data[5] ^ 0xff)) || (data[1] != data[9]) ||
-        (data[2] != (data[6] ^ 0xff)) || (data[2] != data[10]) ||
-        (data[3] != (data[7] ^ 0xff)) || (data[3] != data[11]) ||
-        (data[12] != (data[13] ^ 0xff)) || (data[12] != data[14]) ||
-        (data[12] != (data[15] ^ 0xff))
+            (data[1] != (data[5] ^ 0xff)) || (data[1] != data[9]) ||
+            (data[2] != (data[6] ^ 0xff)) || (data[2] != data[10]) ||
+            (data[3] != (data[7] ^ 0xff)) || (data[3] != data[11]) ||
+            (data[12] != (data[13] ^ 0xff)) || (data[12] != data[14]) ||
+            (data[12] != (data[15] ^ 0xff))
        )
         return 1;
     return 0;
 }
 
-int emlGetValBl(uint32_t *blReg, uint8_t *blBlock, int blockNum)
-{
+int emlGetValBl(uint32_t *blReg, uint8_t *blBlock, int blockNum) {
     uint8_t *emCARD = BigBuf_get_EM_addr();
     uint8_t *data = emCARD + blockNum * 16;
 
@@ -587,8 +561,7 @@ int emlGetValBl(uint32_t *blReg, uint8_t *blBlock, int blockNum)
     return 0;
 }
 
-int emlSetValBl(uint32_t blReg, uint8_t blBlock, int blockNum)
-{
+int emlSetValBl(uint32_t blReg, uint8_t blBlock, int blockNum) {
     uint8_t *emCARD = BigBuf_get_EM_addr();
     uint8_t *data = emCARD + blockNum * 16;
 
@@ -605,16 +578,14 @@ int emlSetValBl(uint32_t blReg, uint8_t blBlock, int blockNum)
     return 0;
 }
 
-uint64_t emlGetKey(int sectorNum, int keyType)
-{
+uint64_t emlGetKey(int sectorNum, int keyType) {
     uint8_t key[6] = {0x00};
     uint8_t *emCARD = BigBuf_get_EM_addr();
     memcpy(key, emCARD + 16 * (FirstBlockOfSector(sectorNum) + NumBlocksPerSector(sectorNum) - 1) + keyType * 10, 6);
     return bytes_to_num(key, 6);
 }
 
-void emlClearMem(void)
-{
+void emlClearMem(void) {
     const uint8_t trailer[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0x80, 0x69, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
     const uint8_t uid[]   =   {0xe6, 0x84, 0x87, 0xf3, 0x16, 0x88, 0x04, 0x00, 0x46, 0x8e, 0x45, 0x55, 0x4d, 0x70, 0x41, 0x04};
     uint8_t *emCARD = BigBuf_get_EM_addr();
@@ -631,8 +602,7 @@ void emlClearMem(void)
 
 
 // Mifare desfire commands
-int mifare_sendcmd_special(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t *data, uint8_t *answer, uint8_t *answer_parity, uint32_t *timing)
-{
+int mifare_sendcmd_special(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t *data, uint8_t *answer, uint8_t *answer_parity, uint32_t *timing) {
     uint8_t dcmd[5] = {cmd, data[0], data[1], 0x00, 0x00};
     AddCrc14A(dcmd, 3);
 
@@ -645,8 +615,7 @@ int mifare_sendcmd_special(struct Crypto1State *pcs, uint8_t crypted, uint8_t cm
     return len;
 }
 
-int mifare_sendcmd_special2(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t *data, uint8_t *answer, uint8_t *answer_parity, uint32_t *timing)
-{
+int mifare_sendcmd_special2(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t *data, uint8_t *answer, uint8_t *answer_parity, uint32_t *timing) {
     uint8_t dcmd[20] = {0x00};
     dcmd[0] = cmd;
     memcpy(dcmd + 1, data, 17);
@@ -661,8 +630,7 @@ int mifare_sendcmd_special2(struct Crypto1State *pcs, uint8_t crypted, uint8_t c
     return len;
 }
 
-int mifare_desfire_des_auth1(uint32_t uid, uint8_t *blockData)
-{
+int mifare_desfire_des_auth1(uint32_t uid, uint8_t *blockData) {
 
     int len;
     // load key, keynumber
@@ -690,8 +658,7 @@ int mifare_desfire_des_auth1(uint32_t uid, uint8_t *blockData)
     return 1;
 }
 
-int mifare_desfire_des_auth2(uint32_t uid, uint8_t *key, uint8_t *blockData)
-{
+int mifare_desfire_des_auth2(uint32_t uid, uint8_t *key, uint8_t *blockData) {
 
     int len;
     uint8_t data[17] = {MFDES_AUTHENTICATION_FRAME};
diff --git a/armsrc/optimized_cipher.c b/armsrc/optimized_cipher.c
index 377e6f439..faf739beb 100644
--- a/armsrc/optimized_cipher.c
+++ b/armsrc/optimized_cipher.c
@@ -96,8 +96,7 @@ uint8_t xopt__select(bool x, bool y, uint8_t r)
 }
 */
 
-void opt_successor(const uint8_t *k, State *s, bool y, State *successor)
-{
+void opt_successor(const uint8_t *k, State *s, bool y, State *successor) {
     uint8_t Tt = 1 & opt_T(s);
 
     successor->t = (s->t >> 1);
@@ -110,8 +109,7 @@ void opt_successor(const uint8_t *k, State *s, bool y, State *successor)
     successor->l = successor->r + s->r;
 }
 
-void opt_suc(const uint8_t *k, State *s, uint8_t *in, uint8_t length, bool add32Zeroes)
-{
+void opt_suc(const uint8_t *k, State *s, uint8_t *in, uint8_t length, bool add32Zeroes) {
     State x2;
     int i;
     uint8_t head = 0;
@@ -150,8 +148,7 @@ void opt_suc(const uint8_t *k, State *s, uint8_t *in, uint8_t length, bool add32
     }
 }
 
-void opt_output(const uint8_t *k, State *s,  uint8_t *buffer)
-{
+void opt_output(const uint8_t *k, State *s,  uint8_t *buffer) {
     uint8_t times = 0;
     uint8_t bout = 0;
     State temp = {0, 0, 0, 0};
@@ -177,8 +174,7 @@ void opt_output(const uint8_t *k, State *s,  uint8_t *buffer)
     }
 }
 
-void opt_MAC(uint8_t *k, uint8_t *input, uint8_t *out)
-{
+void opt_MAC(uint8_t *k, uint8_t *input, uint8_t *out) {
     State _init  =  {
         ((k[0] ^ 0x4c) + 0xEC) & 0xFF,// l
         ((k[0] ^ 0x4c) + 0x21) & 0xFF,// r
@@ -190,23 +186,20 @@ void opt_MAC(uint8_t *k, uint8_t *input, uint8_t *out)
     opt_output(k, &_init, out);
 }
 
-uint8_t rev_byte(uint8_t b)
-{
+uint8_t rev_byte(uint8_t b) {
     b = (b & 0xF0) >> 4 | (b & 0x0F) << 4;
     b = (b & 0xCC) >> 2 | (b & 0x33) << 2;
     b = (b & 0xAA) >> 1 | (b & 0x55) << 1;
     return b;
 }
 
-void opt_reverse_arraybytecpy(uint8_t *dest, uint8_t *src, size_t len)
-{
+void opt_reverse_arraybytecpy(uint8_t *dest, uint8_t *src, size_t len) {
     uint8_t i;
     for (i = 0; i < len ; i++)
         dest[i] = rev_byte(src[i]);
 }
 
-void opt_doReaderMAC(uint8_t *cc_nr_p, uint8_t *div_key_p, uint8_t mac[4])
-{
+void opt_doReaderMAC(uint8_t *cc_nr_p, uint8_t *div_key_p, uint8_t mac[4]) {
     static uint8_t cc_nr[12];
     opt_reverse_arraybytecpy(cc_nr, cc_nr_p, 12);
     uint8_t dest [] = {0, 0, 0, 0, 0, 0, 0, 0};
@@ -215,8 +208,7 @@ void opt_doReaderMAC(uint8_t *cc_nr_p, uint8_t *div_key_p, uint8_t mac[4])
     opt_reverse_arraybytecpy(mac, dest, 4);
     return;
 }
-void opt_doTagMAC(uint8_t *cc_p, const uint8_t *div_key_p, uint8_t mac[4])
-{
+void opt_doTagMAC(uint8_t *cc_p, const uint8_t *div_key_p, uint8_t mac[4]) {
     static uint8_t cc_nr[8 + 4 + 4];
     opt_reverse_arraybytecpy(cc_nr, cc_p, 12);
     State _init  =  {
@@ -241,8 +233,7 @@ void opt_doTagMAC(uint8_t *cc_p, const uint8_t *div_key_p, uint8_t mac[4])
  * @param div_key_p
  * @return the cipher state
  */
-State opt_doTagMAC_1(uint8_t *cc_p, const uint8_t *div_key_p)
-{
+State opt_doTagMAC_1(uint8_t *cc_p, const uint8_t *div_key_p) {
     static uint8_t cc_nr[8];
     opt_reverse_arraybytecpy(cc_nr, cc_p, 8);
     State _init  =  {
@@ -263,8 +254,7 @@ State opt_doTagMAC_1(uint8_t *cc_p, const uint8_t *div_key_p)
  * @param mac - where to store the MAC
  * @param div_key_p - the key to use
  */
-void opt_doTagMAC_2(State _init,  uint8_t *nr, uint8_t mac[4], const uint8_t *div_key_p)
-{
+void opt_doTagMAC_2(State _init,  uint8_t *nr, uint8_t mac[4], const uint8_t *div_key_p) {
     static uint8_t _nr[4];
     opt_reverse_arraybytecpy(_nr, nr, 4);
     opt_suc(div_key_p, &_init, _nr, 4, true);
diff --git a/armsrc/pcf7931.c b/armsrc/pcf7931.c
index 568083d7d..ef371b233 100644
--- a/armsrc/pcf7931.c
+++ b/armsrc/pcf7931.c
@@ -3,8 +3,7 @@
 #define T0_PCF 8 //period for the pcf7931 in us
 #define ALLOC 16
 
-size_t DemodPCF7931(uint8_t **outBlocks)
-{
+size_t DemodPCF7931(uint8_t **outBlocks) {
     uint8_t bits[256] = {0x00};
     uint8_t blocks[8][16];
     uint8_t *dest = BigBuf_get_addr();
@@ -128,8 +127,7 @@ size_t DemodPCF7931(uint8_t **outBlocks)
     return num_blocks;
 }
 
-bool IsBlock0PCF7931(uint8_t *block)
-{
+bool IsBlock0PCF7931(uint8_t *block) {
     // assuming all RFU bits are set to 0
     // if PAC is enabled password is set to 0
     if (block[7] == 0x01) {
@@ -142,8 +140,7 @@ bool IsBlock0PCF7931(uint8_t *block)
     return false;
 }
 
-bool IsBlock1PCF7931(uint8_t *block)
-{
+bool IsBlock1PCF7931(uint8_t *block) {
     // assuming all RFU bits are set to 0
     if (block[10] == 0 && block[11] == 0 && block[12] == 0 && block[13] == 0)
         if ((block[14] & 0x7f) <= 9 && block[15] <= 9)
@@ -152,8 +149,7 @@ bool IsBlock1PCF7931(uint8_t *block)
     return false;
 }
 
-void ReadPCF7931()
-{
+void ReadPCF7931() {
     int found_blocks = 0; // successfully read blocks
     int max_blocks = 8;   // readable blocks
     uint8_t memory_blocks[8][17]; // PCF content
@@ -303,8 +299,7 @@ end:
     cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
 }
 
-static void RealWritePCF7931(uint8_t *pass, uint16_t init_delay, int32_t l, int32_t p, uint8_t address, uint8_t byte, uint8_t data)
-{
+static void RealWritePCF7931(uint8_t *pass, uint16_t init_delay, int32_t l, int32_t p, uint8_t address, uint8_t byte, uint8_t data) {
     uint32_t tab[1024] = {0}; // data times frame
     uint32_t u = 0;
     uint8_t parity = 0;
@@ -386,8 +381,7 @@ static void RealWritePCF7931(uint8_t *pass, uint16_t init_delay, int32_t l, int3
    @param byte : address of the byte to write
     @param data : data to write
  */
-void WritePCF7931(uint8_t pass1, uint8_t pass2, uint8_t pass3, uint8_t pass4, uint8_t pass5, uint8_t pass6, uint8_t pass7, uint16_t init_delay, int32_t l, int32_t p, uint8_t address, uint8_t byte, uint8_t data)
-{
+void WritePCF7931(uint8_t pass1, uint8_t pass2, uint8_t pass3, uint8_t pass4, uint8_t pass5, uint8_t pass6, uint8_t pass7, uint16_t init_delay, int32_t l, int32_t p, uint8_t address, uint8_t byte, uint8_t data) {
     Dbprintf("Initialization delay : %d us", init_delay);
     Dbprintf("Offsets : %d us on the low pulses width, %d us on the low pulses positions", l, p);
     Dbprintf("Password (LSB first on each byte): %02x %02x %02x %02x %02x %02x %02x", pass1, pass2, pass3, pass4, pass5, pass6, pass7);
@@ -405,8 +399,7 @@ void WritePCF7931(uint8_t pass1, uint8_t pass2, uint8_t pass3, uint8_t pass4, ui
  * @param tab : array of the data frame
  */
 
-void SendCmdPCF7931(uint32_t *tab)
-{
+void SendCmdPCF7931(uint32_t *tab) {
     uint16_t u = 0, tempo = 0;
 
     Dbprintf("Sending data frame...");
@@ -462,8 +455,7 @@ void SendCmdPCF7931(uint32_t *tab)
  * @param l : offset on low pulse width
  * @param p : offset on low pulse positioning
  */
-bool AddBytePCF7931(uint8_t byte, uint32_t *tab, int32_t l, int32_t p)
-{
+bool AddBytePCF7931(uint8_t byte, uint32_t *tab, int32_t l, int32_t p) {
     uint32_t u;
     for (u = 0; u < 8; ++u) {
         if (byte & (1 << u)) { //bit is 1
@@ -482,8 +474,7 @@ bool AddBytePCF7931(uint8_t byte, uint32_t *tab, int32_t l, int32_t p)
  * @param l : offset on low pulse width
  * @param p : offset on low pulse positioning
  */
-bool AddBitPCF7931(bool b, uint32_t *tab, int32_t l, int32_t p)
-{
+bool AddBitPCF7931(bool b, uint32_t *tab, int32_t l, int32_t p) {
     uint8_t u = 0;
 
     //we put the cursor at the last value of the array
@@ -518,8 +509,7 @@ bool AddBitPCF7931(bool b, uint32_t *tab, int32_t l, int32_t p)
  * @param c : delay of the last high pulse
  * @param tab : array of the data frame
  */
-bool AddPatternPCF7931(uint32_t a, uint32_t b, uint32_t c, uint32_t *tab)
-{
+bool AddPatternPCF7931(uint32_t a, uint32_t b, uint32_t c, uint32_t *tab) {
     uint32_t u = 0;
     for (u = 0; tab[u] != 0; u += 3) {} //we put the cursor at the last value of the array
 
diff --git a/armsrc/printf.c b/armsrc/printf.c
index a355fe2ff..e2862f79e 100644
--- a/armsrc/printf.c
+++ b/armsrc/printf.c
@@ -59,8 +59,7 @@ char const hex2ascii_data[] = "0123456789abcdefghijklmnopqrstuvwxyz";
  * The buffer pointed to by `nbuf' must have length >= MAXNBUF.
  */
 static char *
-ksprintn(char *nbuf, uintmax_t num, int base, int *lenp, int upper)
-{
+ksprintn(char *nbuf, uintmax_t num, int base, int *lenp, int upper) {
     char *p, c;
 
     p = nbuf;
@@ -101,8 +100,7 @@ ksprintn(char *nbuf, uintmax_t num, int base, int *lenp, int upper)
  *  ("%*D", len, ptr, " " -> XX XX XX XX ...
  */
 int
-kvsprintf(char const *fmt, void *arg, int radix, va_list ap)
-{
+kvsprintf(char const *fmt, void *arg, int radix, va_list ap) {
 #define PCHAR(c) {int cc=(c); *d++ = cc; retval++; }
     char nbuf[MAXNBUF];
     char *d;
@@ -387,7 +385,7 @@ number:
                     tmp++;
 
                 if (!ladjust && padc != '0' && width
-                    && (width -= tmp) > 0)
+                        && (width -= tmp) > 0)
                     while (width--)
                         PCHAR(padc);
                 if (neg)
@@ -430,14 +428,12 @@ number:
 #undef PCHAR
 }
 
-int vsprintf(char *dest, const char *fmt, va_list ap)
-{
+int vsprintf(char *dest, const char *fmt, va_list ap) {
     return kvsprintf(fmt, dest, 10, ap);
 }
 
 int
-sprintf(char *dest, const char *fmt, ...)
-{
+sprintf(char *dest, const char *fmt, ...) {
     /* http://www.pagetable.com/?p=298 */
     int retval;
     va_list ap;
diff --git a/armsrc/start.c b/armsrc/start.c
index df5e30506..a6503f1ea 100644
--- a/armsrc/start.c
+++ b/armsrc/start.c
@@ -21,8 +21,7 @@ static uint8_t *next_free_memory;
 extern struct common_area common_area;
 extern char __data_src_start__, __data_start__, __data_end__, __bss_start__, __bss_end__;
 
-static voidpf inflate_malloc(voidpf opaque, uInt items, uInt size)
-{
+static voidpf inflate_malloc(voidpf opaque, uInt items, uInt size) {
     uint8_t *allocated_memory;
 
     allocated_memory = next_free_memory;
@@ -30,13 +29,11 @@ static voidpf inflate_malloc(voidpf opaque, uInt items, uInt size)
     return allocated_memory;
 }
 
-static void inflate_free(voidpf opaque, voidpf address)
-{
+static void inflate_free(voidpf opaque, voidpf address) {
     // nothing to do
 }
 
-static void uncompress_data_section(void)
-{
+static void uncompress_data_section(void) {
     z_stream data_section;
 
     next_free_memory = BigBuf_get_addr();
@@ -60,8 +57,7 @@ static void uncompress_data_section(void)
     common_area.arg1 = data_section.total_in;
 }
 
-void __attribute__((section(".startos"))) Vector(void)
-{
+void __attribute__((section(".startos"))) Vector(void) {
     /* Stack should have been set up by the bootloader */
     // char *src;
     char *dst, *end;
diff --git a/armsrc/string.c b/armsrc/string.c
index 5f188fbc4..fe53bf5f4 100644
--- a/armsrc/string.c
+++ b/armsrc/string.c
@@ -9,8 +9,7 @@
 //-----------------------------------------------------------------------------
 #include "string.h"
 
-void *memcpy(void *dest, const void *src, int len)
-{
+void *memcpy(void *dest, const void *src, int len) {
     uint8_t *d = dest;
     const uint8_t *s = src;
     while ((len--) > 0) {
@@ -21,8 +20,7 @@ void *memcpy(void *dest, const void *src, int len)
     return dest;
 }
 
-void *memset(void *dest, int c, int len)
-{
+void *memset(void *dest, int c, int len) {
     uint8_t *d = dest;
     while ((len--) > 0) {
         *d = c;
@@ -31,8 +29,7 @@ void *memset(void *dest, int c, int len)
     return dest;
 }
 
-int memcmp(const void *av, const void *bv, int len)
-{
+int memcmp(const void *av, const void *bv, int len) {
     const uint8_t *a = av;
     const uint8_t *b = bv;
 
@@ -46,14 +43,12 @@ int memcmp(const void *av, const void *bv, int len)
     return 0;
 }
 
-void memxor(uint8_t *dest, uint8_t *src, size_t len)
-{
+void memxor(uint8_t *dest, uint8_t *src, size_t len) {
     for (; len > 0; len--, dest++, src++)
         *dest ^= *src;
 }
 
-int strlen(const char *str)
-{
+int strlen(const char *str) {
     int l = 0;
     while (*str) {
         l++;
@@ -62,8 +57,7 @@ int strlen(const char *str)
     return l;
 }
 
-char *strncat(char *dest, const char *src, unsigned int n)
-{
+char *strncat(char *dest, const char *src, unsigned int n) {
     unsigned int dest_len = strlen(dest);
     unsigned int i;
 
@@ -74,8 +68,7 @@ char *strncat(char *dest, const char *src, unsigned int n)
     return dest;
 }
 
-char *strcat(char *dest, const char *src)
-{
+char *strcat(char *dest, const char *src) {
     unsigned int dest_len = strlen(dest);
     unsigned int i;
 
@@ -88,8 +81,7 @@ char *strcat(char *dest, const char *src)
 ////////////////////////////////////////// code to do 'itoa'
 
 /* reverse:  reverse string s in place */
-void strreverse(char s[])
-{
+void strreverse(char s[]) {
     int c, i, j;
 
     for (i = 0, j = strlen(s) - 1; i < j; i++, j--) {
@@ -100,8 +92,7 @@ void strreverse(char s[])
 }
 
 /* itoa:  convert n to characters in s */
-void itoa(int n, char s[])
-{
+void itoa(int n, char s[]) {
     int i, sign;
 
     if ((sign = n) < 0)  /* record sign */
diff --git a/armsrc/ticks.c b/armsrc/ticks.c
index f30916003..73f68147f 100644
--- a/armsrc/ticks.c
+++ b/armsrc/ticks.c
@@ -11,8 +11,7 @@
 #include "ticks.h"
 // attempt at high resolution microsecond timer
 // beware: timer counts in 21.3uS increments (1024/48Mhz)
-void SpinDelayUs(int us)
-{
+void SpinDelayUs(int us) {
     int ticks = (48 * us) >> 10;
 
     // Borrow a PWM unit for my real-time clock
@@ -34,8 +33,7 @@ void SpinDelayUs(int us)
     }
 }
 
-void SpinDelay(int ms)
-{
+void SpinDelay(int ms) {
     // convert to uS and call microsecond delay function
     SpinDelayUs(ms * 1000);
 }
@@ -48,8 +46,7 @@ void SpinDelay(int ms)
 //    SpinDelay(1000);
 //    ti = GetTickCount() - ti;
 //    Dbprintf("timer(1s): %d t=%d", ti, GetTickCount());
-void StartTickCount(void)
-{
+void StartTickCount(void) {
     // This timer is based on the slow clock. The slow clock frequency is between 22kHz and 40kHz.
     // We can determine the actual slow clock frequency by looking at the Main Clock Frequency Register.
     uint16_t mainf = AT91C_BASE_PMC->PMC_MCFR & 0xffff;        // = 16 * main clock frequency (16MHz) / slow clock frequency
@@ -61,16 +58,14 @@ void StartTickCount(void)
 /*
 * Get the current count.
 */
-uint32_t RAMFUNC GetTickCount(void)
-{
+uint32_t RAMFUNC GetTickCount(void) {
     return AT91C_BASE_RTTC->RTTC_RTVR;// was * 2;
 }
 
 //  -------------------------------------------------------------------------
 //  microseconds timer
 //  -------------------------------------------------------------------------
-void StartCountUS(void)
-{
+void StartCountUS(void) {
     AT91C_BASE_PMC->PMC_PCER |= (1 << AT91C_ID_TC0) | (1 << AT91C_ID_TC1);
     AT91C_BASE_TCB->TCB_BMR = AT91C_TCB_TC0XC0S_NONE | AT91C_TCB_TC1XC1S_TIOA0 | AT91C_TCB_TC2XC2S_NONE;
 
@@ -93,8 +88,7 @@ void StartCountUS(void)
     while (AT91C_BASE_TC1->TC_CV > 0);
 }
 
-uint32_t RAMFUNC GetCountUS(void)
-{
+uint32_t RAMFUNC GetCountUS(void) {
     //return (AT91C_BASE_TC1->TC_CV * 0x8000) + ((AT91C_BASE_TC0->TC_CV / 15) * 10);
     //  By suggestion from PwPiwi, http://www.proxmark.org/forum/viewtopic.php?pid=17548#p17548
     return ((uint32_t)AT91C_BASE_TC1->TC_CV) * 0x8000 + (((uint32_t)AT91C_BASE_TC0->TC_CV) * 2) / 3;
@@ -103,8 +97,7 @@ uint32_t RAMFUNC GetCountUS(void)
 //  -------------------------------------------------------------------------
 //  Timer for iso14443 commands. Uses ssp_clk from FPGA
 //  -------------------------------------------------------------------------
-void StartCountSspClk(void)
-{
+void StartCountSspClk(void) {
     AT91C_BASE_PMC->PMC_PCER |= (1 << AT91C_ID_TC0) | (1 << AT91C_ID_TC1) | (1 << AT91C_ID_TC2);  // Enable Clock to all timers
     AT91C_BASE_TCB->TCB_BMR = AT91C_TCB_TC0XC0S_TIOA1       // XC0 Clock = TIOA1
                               | AT91C_TCB_TC1XC1S_NONE        // XC1 Clock = none
@@ -161,16 +154,14 @@ void StartCountSspClk(void)
     // Therefore need to wait quite some time before we can use the counter.
     while (AT91C_BASE_TC2->TC_CV > 0);
 }
-void ResetSspClk(void)
-{
+void ResetSspClk(void) {
     //enable clock of timer and software trigger
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
     AT91C_BASE_TC2->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
     while (AT91C_BASE_TC2->TC_CV > 0);
 }
-uint32_t RAMFUNC GetCountSspClk(void)
-{
+uint32_t RAMFUNC GetCountSspClk(void) {
     uint32_t tmp_count = (AT91C_BASE_TC2->TC_CV << 16) | AT91C_BASE_TC0->TC_CV;
     if ((tmp_count & 0x0000ffff) == 0)  //small chance that we may have missed an increment in TC2
         return (AT91C_BASE_TC2->TC_CV << 16);
@@ -181,8 +172,7 @@ uint32_t RAMFUNC GetCountSspClk(void)
 //  Timer for bitbanging, or LF stuff when you need a very precis timer
 //  1us = 1.5ticks
 //  -------------------------------------------------------------------------
-void StartTicks(void)
-{
+void StartTicks(void) {
     // initialization of the timer
     AT91C_BASE_PMC->PMC_PCER |= (1 << AT91C_ID_TC0) | (1 << AT91C_ID_TC1);
     AT91C_BASE_TCB->TCB_BMR   = AT91C_TCB_TC0XC0S_NONE | AT91C_TCB_TC1XC1S_TIOA0 | AT91C_TCB_TC2XC2S_NONE;
@@ -215,8 +205,7 @@ void StartTicks(void)
     while (AT91C_BASE_TC0->TC_CV > 0);
 }
 
-uint32_t GetTicks(void)
-{
+uint32_t GetTicks(void) {
     uint32_t hi, lo;
 
     do {
@@ -229,8 +218,7 @@ uint32_t GetTicks(void)
 
 // Wait - Spindelay in ticks.
 // if called with a high number, this will trigger the WDT...
-void WaitTicks(uint32_t ticks)
-{
+void WaitTicks(uint32_t ticks) {
     if (ticks == 0) return;
     ticks += GetTicks();
     while (GetTicks() < ticks);
@@ -238,18 +226,15 @@ void WaitTicks(uint32_t ticks)
 
 // Wait / Spindelay in us (microseconds)
 // 1us = 1.5ticks.
-void WaitUS(uint16_t us)
-{
+void WaitUS(uint16_t us) {
     WaitTicks((uint32_t)us * 3 / 2);
 }
-void WaitMS(uint16_t ms)
-{
+void WaitMS(uint16_t ms) {
     WaitTicks((uint32_t)ms * 1500);
 }
 
 // stop clock
-void StopTicks(void)
-{
+void StopTicks(void) {
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 }
diff --git a/armsrc/util.c b/armsrc/util.c
index 76b5d96cb..8ee91b464 100644
--- a/armsrc/util.c
+++ b/armsrc/util.c
@@ -9,8 +9,7 @@
 //-----------------------------------------------------------------------------
 #include "util.h"
 
-size_t nbytes(size_t nbits)
-{
+size_t nbytes(size_t nbits) {
     return (nbits >> 3) + ((nbits % 8) > 0);
 }
 
@@ -19,8 +18,7 @@ size_t nbytes(size_t nbits)
  Returns the value v with the bottom b [0,32] bits reflected.
  Example: reflect(0x3e23L,3) == 0x3e26
 */
-uint32_t reflect(uint32_t v, int b)
-{
+uint32_t reflect(uint32_t v, int b) {
     uint32_t t = v;
     for (int i = 0; i < b; ++i) {
         if (t & 1)
@@ -32,12 +30,10 @@ uint32_t reflect(uint32_t v, int b)
     return v;
 }
 
-uint8_t reflect8(uint8_t b)
-{
+uint8_t reflect8(uint8_t b) {
     return ((b * 0x80200802ULL) & 0x0884422110ULL) * 0x0101010101ULL >> 32;
 }
-uint16_t reflect16(uint16_t b)
-{
+uint16_t reflect16(uint16_t b) {
     uint16_t v = 0;
     v |= (b & 0x8000) >> 15;
     v |= (b & 0x4000) >> 13;
@@ -59,16 +55,14 @@ uint16_t reflect16(uint16_t b)
     return v;
 }
 
-void num_to_bytes(uint64_t n, size_t len, uint8_t *dest)
-{
+void num_to_bytes(uint64_t n, size_t len, uint8_t *dest) {
     while (len--) {
         dest[len] = (uint8_t) n;
         n >>= 8;
     }
 }
 
-uint64_t bytes_to_num(uint8_t *src, size_t len)
-{
+uint64_t bytes_to_num(uint8_t *src, size_t len) {
     uint64_t num = 0;
     while (len--) {
         num = (num << 8) | (*src);
@@ -78,8 +72,7 @@ uint64_t bytes_to_num(uint8_t *src, size_t len)
 }
 
 // RotateLeft - Ultralight, Desfire
-void rol(uint8_t *data, const size_t len)
-{
+void rol(uint8_t *data, const size_t len) {
     uint8_t first = data[0];
     for (size_t i = 0; i < len - 1; i++) {
         data[i] = data[i + 1];
@@ -87,22 +80,19 @@ void rol(uint8_t *data, const size_t len)
     data[len - 1] = first;
 }
 
-void lsl(uint8_t *data, size_t len)
-{
+void lsl(uint8_t *data, size_t len) {
     for (size_t n = 0; n < len - 1; n++) {
         data[n] = (data[n] << 1) | (data[n + 1] >> 7);
     }
     data[len - 1] <<= 1;
 }
 
-int32_t le24toh(uint8_t data[3])
-{
+int32_t le24toh(uint8_t data[3]) {
     return (data[2] << 16) | (data[1] << 8) | data[0];
 }
 
 //convert hex digit to integer
-uint8_t hex2int(char hexchar)
-{
+uint8_t hex2int(char hexchar) {
     switch (hexchar) {
         case '0':
             return 0;
@@ -163,8 +153,7 @@ uint8_t hex2int(char hexchar)
     }
 }
 
-void LEDsoff()
-{
+void LEDsoff() {
     LED_A_OFF();
     LED_B_OFF();
     LED_C_OFF();
@@ -172,8 +161,7 @@ void LEDsoff()
 }
 
 // LEDs: R(C) O(A) G(B) -- R(D) [1, 2, 4 and 8]
-void LED(int led, int ms)
-{
+void LED(int led, int ms) {
     if (led & LED_RED)
         LED_C_ON();
     if (led & LED_ORANGE)
@@ -198,8 +186,7 @@ void LED(int led, int ms)
         LED_D_OFF();
 }
 
-void SpinOff(uint32_t pause)
-{
+void SpinOff(uint32_t pause) {
     LED_A_OFF();
     LED_B_OFF();
     LED_C_OFF();
@@ -208,8 +195,7 @@ void SpinOff(uint32_t pause)
 }
 
 // 0=A, 1=B, 2=C, 3=D
-void SpinErr(uint8_t led, uint32_t speed, uint8_t times)
-{
+void SpinErr(uint8_t led, uint32_t speed, uint8_t times) {
     SpinOff(speed);
     NTIME(times) {
         switch (led) {
@@ -230,8 +216,7 @@ void SpinErr(uint8_t led, uint32_t speed, uint8_t times)
     }
 }
 
-void SpinDown(uint32_t speed)
-{
+void SpinDown(uint32_t speed) {
     SpinOff(speed);
     LED_D_ON();
     SpinDelay(speed);
@@ -247,8 +232,7 @@ void SpinDown(uint32_t speed)
     LED_A_OFF();
 }
 
-void SpinUp(uint32_t speed)
-{
+void SpinUp(uint32_t speed) {
     SpinOff(speed);
     LED_A_ON();
     SpinDelay(speed);
@@ -269,8 +253,7 @@ void SpinUp(uint32_t speed)
 // not clicked, or held down (for ms || 1sec)
 // In general, don't use this function unless you expect a
 // double click, otherwise it will waste 500ms -- use BUTTON_HELD instead
-int BUTTON_CLICKED(int ms)
-{
+int BUTTON_CLICKED(int ms) {
     // Up to 500ms in between clicks to mean a double click
     int ticks = (48000 * (ms ? ms : 1000)) >> 10;
 
@@ -328,8 +311,7 @@ int BUTTON_CLICKED(int ms)
 }
 
 // Determine if a button is held down
-int BUTTON_HELD(int ms)
-{
+int BUTTON_HELD(int ms) {
     // If button is held for one second
     int ticks = (48000 * (ms ? ms : 1000)) >> 10;
 
@@ -369,8 +351,7 @@ int BUTTON_HELD(int ms)
  * verifies the magic properties, then stores a formatted string, prefixed by
  * prefix in dst.
  */
-void FormatVersionInformation(char *dst, int len, const char *prefix, void *version_information)
-{
+void FormatVersionInformation(char *dst, int len, const char *prefix, void *version_information) {
     struct version_information *v = (struct version_information *)version_information;
     dst[0] = 0;
     strncat(dst, prefix, len - 1);
diff --git a/armsrc/vtsend.c b/armsrc/vtsend.c
index 666e1aef7..e851d4334 100644
--- a/armsrc/vtsend.c
+++ b/armsrc/vtsend.c
@@ -37,15 +37,13 @@
 //#define UART_WRITE(P, BUF, SIZ)   (P)->uart_write(BUF, SIZ, (P)->extobj)
 #define UART_WRITE(BUF) DbprintfEx(FLAG_RAWPRINT, "%s", BUF)
 
-int vtsend_init(vtsend_t *p, VTSEND_SERIAL_WRITE uart_write, void *extobj)
-{
+int vtsend_init(vtsend_t *p, VTSEND_SERIAL_WRITE uart_write, void *extobj) {
     p->uart_write = uart_write;
     p->extobj = extobj;
     return 0;
 }
 
-int vtsend_cursor_position(vtsend_t *p, const int column, const int line)
-{
+int vtsend_cursor_position(vtsend_t *p, const int column, const int line) {
     char buf[1 + 8];
     buf[0] = ESC;
     buf[1] = '[';
@@ -60,8 +58,7 @@ int vtsend_cursor_position(vtsend_t *p, const int column, const int line)
     return 0;
 }
 
-int vtsend_cursor_up(vtsend_t *p, const int n)
-{
+int vtsend_cursor_up(vtsend_t *p, const int n) {
     char buf[1 + 5];
     buf[0] = ESC;
     buf[1] = '[';
@@ -74,8 +71,7 @@ int vtsend_cursor_up(vtsend_t *p, const int n)
     return 0;
 }
 
-int vtsend_cursor_down(vtsend_t *p, const int n)
-{
+int vtsend_cursor_down(vtsend_t *p, const int n) {
     char buf[1 + 5];
     buf[0] = ESC;
     buf[1] = '[';
@@ -88,8 +84,7 @@ int vtsend_cursor_down(vtsend_t *p, const int n)
     return 0;
 }
 
-int vtsend_cursor_forward(vtsend_t *p, const int n)
-{
+int vtsend_cursor_forward(vtsend_t *p, const int n) {
     char buf[1 + 5];
     buf[0] = ESC;
     buf[1] = '[';
@@ -102,8 +97,7 @@ int vtsend_cursor_forward(vtsend_t *p, const int n)
     return 0;
 }
 
-int vtsend_cursor_backward(vtsend_t *p, const int n)
-{
+int vtsend_cursor_backward(vtsend_t *p, const int n) {
     char buf[1 + 5];
     buf[0] = ESC;
     buf[1] = '[';
@@ -116,8 +110,7 @@ int vtsend_cursor_backward(vtsend_t *p, const int n)
     return 0;
 }
 
-int vtsend_cursor_position_save(vtsend_t *p)
-{
+int vtsend_cursor_position_save(vtsend_t *p) {
     char buf[1 + 3];
     buf[0] = ESC;
     buf[1] = '[';
@@ -128,8 +121,7 @@ int vtsend_cursor_position_save(vtsend_t *p)
     return 0;
 }
 
-int vtsend_cursor_position_restore(vtsend_t *p)
-{
+int vtsend_cursor_position_restore(vtsend_t *p) {
     char buf[1 + 3];
     buf[0] = ESC;
     buf[1] = '[';
@@ -140,8 +132,7 @@ int vtsend_cursor_position_restore(vtsend_t *p)
     return 0;
 }
 
-int vtsend_erase_display(vtsend_t *p)
-{
+int vtsend_erase_display(vtsend_t *p) {
     char buf[1 + 4];
     buf[0] = ESC;
     buf[1] = '[';
@@ -153,8 +144,7 @@ int vtsend_erase_display(vtsend_t *p)
     return 0;
 }
 
-int vtsend_erase_line(vtsend_t *p)
-{
+int vtsend_erase_line(vtsend_t *p) {
     char buf[1 + 4];
     buf[0] = ESC;
     buf[1] = '[';
@@ -166,8 +156,7 @@ int vtsend_erase_line(vtsend_t *p)
     return 0;
 }
 
-int vtsend_set_color_foreground(vtsend_t *p, const int color)
-{
+int vtsend_set_color_foreground(vtsend_t *p, const int color) {
     char buf[1 + 5];
     buf[0] = ESC;
     buf[1] = '[';
@@ -180,8 +169,7 @@ int vtsend_set_color_foreground(vtsend_t *p, const int color)
     return 0;
 }
 
-int vtsend_set_color_background(vtsend_t *p, const int color)
-{
+int vtsend_set_color_background(vtsend_t *p, const int color) {
     char buf[1 + 5];
     buf[0] = ESC;
     buf[1] = '[';
@@ -194,8 +182,7 @@ int vtsend_set_color_background(vtsend_t *p, const int color)
     return 0;
 }
 
-int vtsend_set_attribute(vtsend_t *p, const int attr)
-{
+int vtsend_set_attribute(vtsend_t *p, const int attr) {
     char buf[1 + 5];
     buf[0] = ESC;
     buf[1] = '[';
@@ -208,8 +195,7 @@ int vtsend_set_attribute(vtsend_t *p, const int attr)
     return 0;
 }
 
-int vtsend_set_scroll_region(vtsend_t *p, const int top, const int bottom)
-{
+int vtsend_set_scroll_region(vtsend_t *p, const int top, const int bottom) {
     char buf[1 + 8];
     buf[0] = ESC;
     buf[1] = '[';
@@ -225,8 +211,7 @@ int vtsend_set_scroll_region(vtsend_t *p, const int top, const int bottom)
     return 0;
 }
 
-int vtsend_set_cursor(vtsend_t *p, const int visible)
-{
+int vtsend_set_cursor(vtsend_t *p, const int visible) {
     if (visible) {
         char buf[1 + 6];
         buf[0] = ESC;
@@ -253,8 +238,7 @@ int vtsend_set_cursor(vtsend_t *p, const int visible)
     return 0;
 }
 
-int vtsend_reset(vtsend_t *p)
-{
+int vtsend_reset(vtsend_t *p) {
     char buf[1 + 2];
     buf[0] = ESC;
     buf[1] = 'c';
@@ -264,8 +248,7 @@ int vtsend_reset(vtsend_t *p)
     return 0;
 }
 
-int vtsend_draw_box(vtsend_t *p, const int x1, const int y1, const int x2, const int y2)
-{
+int vtsend_draw_box(vtsend_t *p, const int x1, const int y1, const int x2, const int y2) {
     int i;
 
     vtsend_cursor_position(p, x1, y1);
@@ -285,8 +268,7 @@ int vtsend_draw_box(vtsend_t *p, const int x1, const int y1, const int x2, const
     return 0;
 }
 
-int vtsend_fill_box(vtsend_t *p, const int x1, const int y1, const int x2, const int y2)
-{
+int vtsend_fill_box(vtsend_t *p, const int x1, const int y1, const int x2, const int y2) {
     int i, j;
     for (i = y1; i <= y2; i++) {
         vtsend_cursor_position(p, x1, i);
diff --git a/bootrom/bootrom.c b/bootrom/bootrom.c
index ec1922cb5..2b5c49e78 100644
--- a/bootrom/bootrom.c
+++ b/bootrom/bootrom.c
@@ -15,8 +15,7 @@ unsigned int start_addr, end_addr, bootrom_unlocked;
 extern char _bootrom_start, _bootrom_end, _flash_start, _flash_end;
 extern uint32_t _osimage_entry;
 
-void DbpString(char *str)
-{
+void DbpString(char *str) {
     byte_t len = 0;
     while (str[len] != 0x00)
         len++;
@@ -24,8 +23,7 @@ void DbpString(char *str)
     cmd_send(CMD_DEBUG_PRINT_STRING, len, 0, 0, (byte_t *)str, len);
 }
 
-static void ConfigClocks(void)
-{
+static void ConfigClocks(void) {
     // we are using a 16 MHz crystal as the basis for everything
     // slow clock runs at 32Khz typical regardless of crystal
 
@@ -82,13 +80,11 @@ static void ConfigClocks(void)
     while (!(AT91C_BASE_PMC->PMC_SR & AT91C_PMC_MCKRDY)) {};
 }
 
-static void Fatal(void)
-{
+static void Fatal(void) {
     for (;;) {};
 }
 
-void UsbPacketReceived(uint8_t *packet, int len)
-{
+void UsbPacketReceived(uint8_t *packet, int len) {
     int i, dont_ack = 0;
     UsbCommand *c = (UsbCommand *)packet;
     volatile uint32_t *p;
@@ -175,8 +171,8 @@ void UsbPacketReceived(uint8_t *packet, int len)
             * bootrom area. In any case they must be within the flash area.
             */
             if ((bootrom_unlocked || ((cmd_start >= prot_end) || (cmd_end < prot_start))) &&
-                (cmd_start >= allow_start) &&
-                (cmd_end <= allow_end)) {
+                    (cmd_start >= allow_start) &&
+                    (cmd_end <= allow_end)) {
                 start_addr = cmd_start;
                 end_addr = cmd_end;
             } else {
@@ -197,8 +193,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
         cmd_send(CMD_ACK, arg0, 0, 0, 0, 0);
 }
 
-static void flash_mode(int externally_entered)
-{
+static void flash_mode(int externally_entered) {
     start_addr = 0;
     end_addr = 0;
     bootrom_unlocked = 0;
@@ -232,8 +227,7 @@ static void flash_mode(int externally_entered)
     }
 }
 
-void BootROM(void)
-{
+void BootROM(void) {
     //------------
     // First set up all the I/O pins; GPIOs configured directly, other ones
     // just need to be assigned to the appropriate peripheral.
diff --git a/client/amiitool/amiibo.c b/client/amiitool/amiibo.c
index 34038fba3..a8596e30a 100644
--- a/client/amiitool/amiibo.c
+++ b/client/amiitool/amiibo.c
@@ -12,8 +12,7 @@
 #define HMAC_POS_DATA 0x008
 #define HMAC_POS_TAG 0x1B4
 
-void nfc3d_amiibo_calc_seed(const uint8_t *dump, uint8_t *key)
-{
+void nfc3d_amiibo_calc_seed(const uint8_t *dump, uint8_t *key) {
     memcpy(key + 0x00, dump + 0x029, 0x02);
     memset(key + 0x02, 0x00, 0x0E);
     memcpy(key + 0x10, dump + 0x1D4, 0x08);
@@ -21,16 +20,14 @@ void nfc3d_amiibo_calc_seed(const uint8_t *dump, uint8_t *key)
     memcpy(key + 0x20, dump + 0x1E8, 0x20);
 }
 
-void nfc3d_amiibo_keygen(const nfc3d_keygen_masterkeys *masterKeys, const uint8_t *dump, nfc3d_keygen_derivedkeys *derivedKeys)
-{
+void nfc3d_amiibo_keygen(const nfc3d_keygen_masterkeys *masterKeys, const uint8_t *dump, nfc3d_keygen_derivedkeys *derivedKeys) {
     uint8_t seed[NFC3D_KEYGEN_SEED_SIZE];
 
     nfc3d_amiibo_calc_seed(dump, seed);
     nfc3d_keygen(masterKeys, seed, derivedKeys);
 }
 
-void nfc3d_amiibo_cipher(const nfc3d_keygen_derivedkeys *keys, const uint8_t *in, uint8_t *out)
-{
+void nfc3d_amiibo_cipher(const nfc3d_keygen_derivedkeys *keys, const uint8_t *in, uint8_t *out) {
     mbedtls_aes_context aes;
     size_t nc_off = 0;
     unsigned char nonce_counter[16];
@@ -49,8 +46,7 @@ void nfc3d_amiibo_cipher(const nfc3d_keygen_derivedkeys *keys, const uint8_t *in
     memcpy(out + 0x1D4, in + 0x1D4, 0x034);
 }
 
-void nfc3d_amiibo_tag_to_internal(const uint8_t *tag, uint8_t *intl)
-{
+void nfc3d_amiibo_tag_to_internal(const uint8_t *tag, uint8_t *intl) {
     memcpy(intl + 0x000, tag + 0x008, 0x008);
     memcpy(intl + 0x008, tag + 0x080, 0x020);
     memcpy(intl + 0x028, tag + 0x010, 0x024);
@@ -60,8 +56,7 @@ void nfc3d_amiibo_tag_to_internal(const uint8_t *tag, uint8_t *intl)
     memcpy(intl + 0x1DC, tag + 0x054, 0x02C);
 }
 
-void nfc3d_amiibo_internal_to_tag(const uint8_t *intl, uint8_t *tag)
-{
+void nfc3d_amiibo_internal_to_tag(const uint8_t *intl, uint8_t *tag) {
     memcpy(tag + 0x008, intl + 0x000, 0x008);
     memcpy(tag + 0x080, intl + 0x008, 0x020);
     memcpy(tag + 0x010, intl + 0x028, 0x024);
@@ -71,8 +66,7 @@ void nfc3d_amiibo_internal_to_tag(const uint8_t *intl, uint8_t *tag)
     memcpy(tag + 0x054, intl + 0x1DC, 0x02C);
 }
 
-bool nfc3d_amiibo_unpack(const nfc3d_amiibo_keys *amiiboKeys, const uint8_t *tag, uint8_t *plain)
-{
+bool nfc3d_amiibo_unpack(const nfc3d_amiibo_keys *amiiboKeys, const uint8_t *tag, uint8_t *plain) {
     uint8_t internal[NFC3D_AMIIBO_SIZE];
     nfc3d_keygen_derivedkeys dataKeys;
     nfc3d_keygen_derivedkeys tagKeys;
@@ -100,8 +94,7 @@ bool nfc3d_amiibo_unpack(const nfc3d_amiibo_keys *amiiboKeys, const uint8_t *tag
         memcmp(plain + HMAC_POS_TAG, internal + HMAC_POS_TAG, 32) == 0;
 }
 
-void nfc3d_amiibo_pack(const nfc3d_amiibo_keys *amiiboKeys, const uint8_t *plain, uint8_t *tag)
-{
+void nfc3d_amiibo_pack(const nfc3d_amiibo_keys *amiiboKeys, const uint8_t *plain, uint8_t *tag) {
     uint8_t cipher[NFC3D_AMIIBO_SIZE];
     nfc3d_keygen_derivedkeys tagKeys;
     nfc3d_keygen_derivedkeys dataKeys;
@@ -137,8 +130,7 @@ void nfc3d_amiibo_pack(const nfc3d_amiibo_keys *amiiboKeys, const uint8_t *plain
     nfc3d_amiibo_internal_to_tag(cipher, tag);
 }
 
-bool nfc3d_amiibo_load_keys(nfc3d_amiibo_keys *amiiboKeys, const char *path)
-{
+bool nfc3d_amiibo_load_keys(nfc3d_amiibo_keys *amiiboKeys, const char *path) {
     FILE *f = fopen(path, "rb");
     if (!f) {
         return false;
@@ -160,8 +152,7 @@ bool nfc3d_amiibo_load_keys(nfc3d_amiibo_keys *amiiboKeys, const char *path)
     return true;
 }
 
-void nfc3d_amiibo_copy_app_data(const uint8_t *src, uint8_t *dst)
-{
+void nfc3d_amiibo_copy_app_data(const uint8_t *src, uint8_t *dst) {
 
 
     //uint16_t *ami_nb_wr = (uint16_t*)(dst + 0x29);
diff --git a/client/amiitool/amiitool.c b/client/amiitool/amiitool.c
index 9d30e4cb7..a687cb0b1 100644
--- a/client/amiitool/amiitool.c
+++ b/client/amiitool/amiitool.c
@@ -14,8 +14,7 @@
 
 static char *self;
 
-void amiitool_usage()
-{
+void amiitool_usage() {
     fprintf(stderr,
             "amiitool build %i (commit %s-%08x)\n"
             "by Marcos Del Sol Vives <marcos@dracon.es>\n"
@@ -33,8 +32,7 @@ void amiitool_usage()
            );
 }
 
-static bool LoadAmiikey(nfc3d_amiibo_keys keys, char *keyfile)
-{
+static bool LoadAmiikey(nfc3d_amiibo_keys keys, char *keyfile) {
 
     if (!nfc3d_amiibo_load_keys(&keys, keyfile)) {
         PrintAndLogEx(ERR, "Could not load keys from '%s'", keyfile);
@@ -43,8 +41,7 @@ static bool LoadAmiikey(nfc3d_amiibo_keys keys, char *keyfile)
     return true;
 }
 
-int main(int argc, char **argv)
-{
+int main(int argc, char **argv) {
     self = argv[0];
 
     char *infile = NULL;
diff --git a/client/amiitool/drbg.c b/client/amiitool/drbg.c
index e350ffdf3..623a29776 100644
--- a/client/amiitool/drbg.c
+++ b/client/amiitool/drbg.c
@@ -10,8 +10,7 @@
 #include <string.h>
 #include <mbedtls/md.h>
 
-void nfc3d_drbg_init(nfc3d_drbg_ctx *ctx, const uint8_t *hmacKey, size_t hmacKeySize, const uint8_t *seed, size_t seedSize)
-{
+void nfc3d_drbg_init(nfc3d_drbg_ctx *ctx, const uint8_t *hmacKey, size_t hmacKeySize, const uint8_t *seed, size_t seedSize) {
     assert(ctx != NULL);
     assert(hmacKey != NULL);
     assert(seed != NULL);
@@ -31,8 +30,7 @@ void nfc3d_drbg_init(nfc3d_drbg_ctx *ctx, const uint8_t *hmacKey, size_t hmacKey
     mbedtls_md_hmac_starts(&ctx->hmacCtx, hmacKey, hmacKeySize);
 }
 
-void nfc3d_drbg_step(nfc3d_drbg_ctx *ctx, uint8_t *output)
-{
+void nfc3d_drbg_step(nfc3d_drbg_ctx *ctx, uint8_t *output) {
     assert(ctx != NULL);
     assert(output != NULL);
 
@@ -53,14 +51,12 @@ void nfc3d_drbg_step(nfc3d_drbg_ctx *ctx, uint8_t *output)
     mbedtls_md_hmac_finish(&ctx->hmacCtx, output);
 }
 
-void nfc3d_drbg_cleanup(nfc3d_drbg_ctx *ctx)
-{
+void nfc3d_drbg_cleanup(nfc3d_drbg_ctx *ctx) {
     assert(ctx != NULL);
     mbedtls_md_free(&ctx->hmacCtx);
 }
 
-void nfc3d_drbg_generate_bytes(const uint8_t *hmacKey, size_t hmacKeySize, const uint8_t *seed, size_t seedSize, uint8_t *output, size_t outputSize)
-{
+void nfc3d_drbg_generate_bytes(const uint8_t *hmacKey, size_t hmacKeySize, const uint8_t *seed, size_t seedSize, uint8_t *output, size_t outputSize) {
     uint8_t temp[NFC3D_DRBG_OUTPUT_SIZE];
 
     nfc3d_drbg_ctx rngCtx;
diff --git a/client/amiitool/keygen.c b/client/amiitool/keygen.c
index 52f9c0069..4b74a0232 100644
--- a/client/amiitool/keygen.c
+++ b/client/amiitool/keygen.c
@@ -10,8 +10,7 @@
 #include <stdio.h>
 #include <string.h>
 
-void nfc3d_keygen_prepare_seed(const nfc3d_keygen_masterkeys *baseKeys, const uint8_t *baseSeed, uint8_t *output, size_t *outputSize)
-{
+void nfc3d_keygen_prepare_seed(const nfc3d_keygen_masterkeys *baseKeys, const uint8_t *baseSeed, uint8_t *output, size_t *outputSize) {
     assert(baseKeys != NULL);
     assert(baseSeed != NULL);
     assert(output != NULL);
@@ -45,8 +44,7 @@ void nfc3d_keygen_prepare_seed(const nfc3d_keygen_masterkeys *baseKeys, const ui
     *outputSize = output - start;
 }
 
-void nfc3d_keygen(const nfc3d_keygen_masterkeys *baseKeys, const uint8_t *baseSeed, nfc3d_keygen_derivedkeys *derivedKeys)
-{
+void nfc3d_keygen(const nfc3d_keygen_masterkeys *baseKeys, const uint8_t *baseSeed, nfc3d_keygen_derivedkeys *derivedKeys) {
     uint8_t preparedSeed[NFC3D_DRBG_MAX_SEED_SIZE];
     size_t preparedSeedSize;
 
diff --git a/client/cli.c b/client/cli.c
index 66c24b6db..19e472586 100644
--- a/client/cli.c
+++ b/client/cli.c
@@ -17,8 +17,7 @@
         break;\
     }
 
-int main(int argc, char **argv)
-{
+int main(int argc, char **argv) {
     if (argc != 3 && argc != 4) {
         printf("\n\tusage: cli <command 1> <command 2> [logfile (default cli.log)]\n");
         printf("\n");
diff --git a/client/cliparser/argtable3.c b/client/cliparser/argtable3.c
index a982c4084..0750ed601 100644
--- a/client/cliparser/argtable3.c
+++ b/client/cliparser/argtable3.c
@@ -157,8 +157,7 @@ extern void dbg_printf(const char *fmt, ...);
 #include <stdio.h>
 
 
-void dbg_printf(const char *fmt, ...)
-{
+void dbg_printf(const char *fmt, ...) {
     va_list args;
     va_start(args, fmt);
     vfprintf(stderr, fmt, args);
@@ -293,8 +292,7 @@ static const char illoptstring[] = "unknown option -- %s";
 extern char opterrmsg[MAX_OPTER_MSG_SIZE];
 char opterrmsg[MAX_OPTER_MSG_SIZE]; /* buffer for the last error message */
 
-static void warnx(const char *fmt, ...)
-{
+static void warnx(const char *fmt, ...) {
     va_list ap;
     va_start(ap, fmt);
     /*
@@ -322,8 +320,7 @@ static void warnx(const char *fmt, ...)
  * Compute the greatest common divisor of a and b.
  */
 static int
-gcd(int a, int b)
-{
+gcd(int a, int b) {
     int c;
 
     c = a % b;
@@ -343,8 +340,7 @@ gcd(int a, int b)
  */
 static void
 permute_args(int panonopt_start, int panonopt_end, int opt_end,
-             char *const *nargv)
-{
+             char *const *nargv) {
     int cstart, cyclelen, i, j, ncycle, nnonopts, nopts, pos;
     char *swap;
 
@@ -380,8 +376,7 @@ permute_args(int panonopt_start, int panonopt_end, int opt_end,
  */
 static int
 parse_long_options(char *const *nargv, const char *options,
-                   const struct option *long_options, int *idx, int short_too)
-{
+                   const struct option *long_options, int *idx, int short_too) {
     char *current_argv, *has_equal;
     size_t current_argv_len;
     int i, match;
@@ -429,7 +424,7 @@ parse_long_options(char *const *nargv, const char *options,
     }
     if (match != -1) { /* option found */
         if (long_options[match].has_arg == no_argument
-            && has_equal) {
+                && has_equal) {
             if (PRINT_ERROR)
                 warnx(noarg, (int)current_argv_len,
                       current_argv);
@@ -443,7 +438,7 @@ parse_long_options(char *const *nargv, const char *options,
             return (BADARG);
         }
         if (long_options[match].has_arg == required_argument ||
-            long_options[match].has_arg == optional_argument) {
+                long_options[match].has_arg == optional_argument) {
             if (has_equal)
                 optarg = has_equal;
             else if (long_options[match].has_arg ==
@@ -455,7 +450,7 @@ parse_long_options(char *const *nargv, const char *options,
             }
         }
         if ((long_options[match].has_arg == required_argument)
-            && (optarg == NULL)) {
+                && (optarg == NULL)) {
             /*
              * Missing argument; leading ':' indicates no error
              * should be generated.
@@ -498,8 +493,7 @@ parse_long_options(char *const *nargv, const char *options,
  */
 static int
 getopt_internal(int nargc, char *const *nargv, const char *options,
-                const struct option *long_options, int *idx, int flags)
-{
+                const struct option *long_options, int *idx, int flags) {
     char *oli; /* option letter list index */
     int optchar, short_too;
     static int posixly_correct = -1;
@@ -567,7 +561,7 @@ start:
             return (-1);
         }
         if (*(place = nargv[optind]) != '-' ||
-            (place[1] == '\0' && strchr(options, '-') == NULL)) {
+                (place[1] == '\0' && strchr(options, '-') == NULL)) {
             place = EMSG; /* found non-option */
             if (flags & FLAG_ALLARGS) {
                 /*
@@ -628,7 +622,7 @@ start:
      *  3) either the arg starts with -- we are getopt_long_only()
      */
     if (long_options != NULL && place != nargv[optind] &&
-        (*place == '-' || (flags & FLAG_LONGONLY))) {
+            (*place == '-' || (flags & FLAG_LONGONLY))) {
         short_too = 0;
         if (*place == '-')
             place++; /* --foo long option */
@@ -644,8 +638,8 @@ start:
     }
 
     if ((optchar = (int) * place++) == (int)':' ||
-        (optchar == (int)'-' && *place != '\0') ||
-        (oli = strchr(options, optchar)) == NULL) {
+            (optchar == (int)'-' && *place != '\0') ||
+            (oli = strchr(options, optchar)) == NULL) {
         /*
          * If the user specified "-" and  '-' isn't listed in
          * options, return -1 (non-option) as per POSIX.
@@ -709,8 +703,7 @@ start:
  * [eventually this will replace the BSD getopt]
  */
 int
-getopt(int nargc, char *const *nargv, const char *options)
-{
+getopt(int nargc, char *const *nargv, const char *options) {
 
     /*
      * We don't pass FLAG_PERMUTE to getopt_internal() since
@@ -730,8 +723,7 @@ getopt(int nargc, char *const *nargv, const char *options)
  */
 int
 getopt_long(int nargc, char *const *nargv, const char *options,
-            const struct option *long_options, int *idx)
-{
+            const struct option *long_options, int *idx) {
 
     return (getopt_internal(nargc, nargv, options, long_options, idx,
                             FLAG_PERMUTE));
@@ -743,8 +735,7 @@ getopt_long(int nargc, char *const *nargv, const char *options,
  */
 int
 getopt_long_only(int nargc, char *const *nargv, const char *options,
-                 const struct option *long_options, int *idx)
-{
+                 const struct option *long_options, int *idx) {
 
     return (getopt_internal(nargc, nargv, options, long_options, idx,
                             FLAG_PERMUTE | FLAG_LONGONLY));
@@ -788,15 +779,13 @@ getopt_long_only(int nargc, char *const *nargv, const char *options,
 char *arg_strptime(const char *buf, const char *fmt, struct tm *tm);
 
 
-static void arg_date_resetfn(struct arg_date *parent)
-{
+static void arg_date_resetfn(struct arg_date *parent) {
     ARG_TRACE(("%s:resetfn(%p)\n", __FILE__, parent));
     parent->count = 0;
 }
 
 
-static int arg_date_scanfn(struct arg_date *parent, const char *argval)
-{
+static int arg_date_scanfn(struct arg_date *parent, const char *argval) {
     int errorcode = 0;
 
     if (parent->count == parent->hdr.maxcount) {
@@ -821,8 +810,7 @@ static int arg_date_scanfn(struct arg_date *parent, const char *argval)
 }
 
 
-static int arg_date_checkfn(struct arg_date *parent)
-{
+static int arg_date_checkfn(struct arg_date *parent) {
     int errorcode = (parent->count < parent->hdr.mincount) ? EMINCOUNT : 0;
 
     ARG_TRACE(("%s:checkfn(%p) returns %d\n", __FILE__, parent, errorcode));
@@ -835,8 +823,7 @@ static void arg_date_errorfn(
     FILE *fp,
     int errorcode,
     const char *argval,
-    const char *progname)
-{
+    const char *progname) {
     const char *shortopts = parent->hdr.shortopts;
     const char *longopts  = parent->hdr.longopts;
     const char *datatype  = parent->hdr.datatype;
@@ -876,8 +863,7 @@ struct arg_date *arg_date0(
     const char *longopts,
     const char *format,
     const char *datatype,
-    const char *glossary)
-{
+    const char *glossary) {
     return arg_daten(shortopts, longopts, format, datatype, 0, 1, glossary);
 }
 
@@ -887,8 +873,7 @@ struct arg_date *arg_date1(
     const char *longopts,
     const char *format,
     const char *datatype,
-    const char *glossary)
-{
+    const char *glossary) {
     return arg_daten(shortopts, longopts, format, datatype, 1, 1, glossary);
 }
 
@@ -900,8 +885,7 @@ struct arg_date *arg_daten(
     const char *datatype,
     int mincount,
     int maxcount,
-    const char *glossary)
-{
+    const char *glossary) {
     size_t nbytes;
     struct arg_date *result;
 
@@ -1014,8 +998,7 @@ static const char *am_pm[2] = {
 };
 
 
-static int arg_strcasecmp(const char *s1, const char *s2)
-{
+static int arg_strcasecmp(const char *s1, const char *s2) {
     const unsigned char *us1 = (const unsigned char *)s1;
     const unsigned char *us2 = (const unsigned char *)s2;
     while (tolower(*us1) == tolower(*us2++))
@@ -1026,8 +1009,7 @@ static int arg_strcasecmp(const char *s1, const char *s2)
 }
 
 
-static int arg_strncasecmp(const char *s1, const char *s2, size_t n)
-{
+static int arg_strncasecmp(const char *s1, const char *s2, size_t n) {
     if (n != 0) {
         const unsigned char *us1 = (const unsigned char *)s1;
         const unsigned char *us2 = (const unsigned char *)s2;
@@ -1044,8 +1026,7 @@ static int arg_strncasecmp(const char *s1, const char *s2, size_t n)
 }
 
 
-char *arg_strptime(const char *buf, const char *fmt, struct tm *tm)
-{
+char *arg_strptime(const char *buf, const char *fmt, struct tm *tm) {
     char c;
     const char *bp;
     size_t len = 0;
@@ -1349,8 +1330,7 @@ literal:
 }
 
 
-static int conv_num(const char * *buf, int *dest, int llim, int ulim)
-{
+static int conv_num(const char * *buf, int *dest, int llim, int ulim) {
     int result = 0;
 
     /* The limit also determines the number of valid digits. */
@@ -1406,15 +1386,13 @@ static int conv_num(const char * *buf, int *dest, int llim, int ulim)
 #include "argtable3.h"
 
 
-static void arg_dbl_resetfn(struct arg_dbl *parent)
-{
+static void arg_dbl_resetfn(struct arg_dbl *parent) {
     ARG_TRACE(("%s:resetfn(%p)\n", __FILE__, parent));
     parent->count = 0;
 }
 
 
-static int arg_dbl_scanfn(struct arg_dbl *parent, const char *argval)
-{
+static int arg_dbl_scanfn(struct arg_dbl *parent, const char *argval) {
     int errorcode = 0;
 
     if (parent->count == parent->hdr.maxcount) {
@@ -1444,8 +1422,7 @@ static int arg_dbl_scanfn(struct arg_dbl *parent, const char *argval)
 }
 
 
-static int arg_dbl_checkfn(struct arg_dbl *parent)
-{
+static int arg_dbl_checkfn(struct arg_dbl *parent) {
     int errorcode = (parent->count < parent->hdr.mincount) ? EMINCOUNT : 0;
 
     ARG_TRACE(("%s:checkfn(%p) returns %d\n", __FILE__, parent, errorcode));
@@ -1458,8 +1435,7 @@ static void arg_dbl_errorfn(
     FILE *fp,
     int errorcode,
     const char *argval,
-    const char *progname)
-{
+    const char *progname) {
     const char *shortopts = parent->hdr.shortopts;
     const char *longopts  = parent->hdr.longopts;
     const char *datatype  = parent->hdr.datatype;
@@ -1491,8 +1467,7 @@ struct arg_dbl *arg_dbl0(
     const char *shortopts,
     const char *longopts,
     const char *datatype,
-    const char *glossary)
-{
+    const char *glossary) {
     return arg_dbln(shortopts, longopts, datatype, 0, 1, glossary);
 }
 
@@ -1501,8 +1476,7 @@ struct arg_dbl *arg_dbl1(
     const char *shortopts,
     const char *longopts,
     const char *datatype,
-    const char *glossary)
-{
+    const char *glossary) {
     return arg_dbln(shortopts, longopts, datatype, 1, 1, glossary);
 }
 
@@ -1513,8 +1487,7 @@ struct arg_dbl *arg_dbln(
     const char *datatype,
     int mincount,
     int maxcount,
-    const char *glossary)
-{
+    const char *glossary) {
     size_t nbytes;
     struct arg_dbl *result;
 
@@ -1594,8 +1567,7 @@ struct arg_dbl *arg_dbln(
 #include "argtable3.h"
 
 
-static void arg_end_resetfn(struct arg_end *parent)
-{
+static void arg_end_resetfn(struct arg_end *parent) {
     ARG_TRACE(("%s:resetfn(%p)\n", __FILE__, parent));
     parent->count = 0;
 }
@@ -1605,8 +1577,7 @@ static void arg_end_errorfn(
     FILE *fp,
     int error,
     const char *argval,
-    const char *progname)
-{
+    const char *progname) {
     /* suppress unreferenced formal parameter warning */
     (void)parent;
 
@@ -1639,8 +1610,7 @@ static void arg_end_errorfn(
 }
 
 
-struct arg_end *arg_end(int maxcount)
-{
+struct arg_end *arg_end(int maxcount) {
     size_t nbytes;
     struct arg_end *result;
 
@@ -1680,8 +1650,7 @@ struct arg_end *arg_end(int maxcount)
 }
 
 
-void arg_print_errors(FILE *fp, struct arg_end *end, const char *progname)
-{
+void arg_print_errors(FILE *fp, struct arg_end *end, const char *progname) {
     int i;
     ARG_TRACE(("arg_errors()\n"));
     for (i = 0; i < end->count; i++) {
@@ -1738,16 +1707,14 @@ void arg_print_errors(FILE *fp, struct arg_end *end, const char *progname)
 #endif
 
 
-static void arg_file_resetfn(struct arg_file *parent)
-{
+static void arg_file_resetfn(struct arg_file *parent) {
     ARG_TRACE(("%s:resetfn(%p)\n", __FILE__, parent));
     parent->count = 0;
 }
 
 
 /* Returns ptr to the base filename within *filename */
-static const char *arg_basename(const char *filename)
-{
+static const char *arg_basename(const char *filename) {
     const char *result = NULL, *result1, *result2;
 
     /* Find the last occurrence of eother file separator character. */
@@ -1774,8 +1741,7 @@ static const char *arg_basename(const char *filename)
 
 
 /* Returns ptr to the file extension within *basename */
-static const char *arg_extension(const char *basename)
-{
+static const char *arg_extension(const char *basename) {
     /* find the last occurrence of '.' in basename */
     const char *result = (basename ? strrchr(basename, '.') : NULL);
 
@@ -1795,8 +1761,7 @@ static const char *arg_extension(const char *basename)
 }
 
 
-static int arg_file_scanfn(struct arg_file *parent, const char *argval)
-{
+static int arg_file_scanfn(struct arg_file *parent, const char *argval) {
     int errorcode = 0;
 
     if (parent->count == parent->hdr.maxcount) {
@@ -1820,8 +1785,7 @@ static int arg_file_scanfn(struct arg_file *parent, const char *argval)
 }
 
 
-static int arg_file_checkfn(struct arg_file *parent)
-{
+static int arg_file_checkfn(struct arg_file *parent) {
     int errorcode = (parent->count < parent->hdr.mincount) ? EMINCOUNT : 0;
 
     ARG_TRACE(("%s:checkfn(%p) returns %d\n", __FILE__, parent, errorcode));
@@ -1834,8 +1798,7 @@ static void arg_file_errorfn(
     FILE *fp,
     int errorcode,
     const char *argval,
-    const char *progname)
-{
+    const char *progname) {
     const char *shortopts = parent->hdr.shortopts;
     const char *longopts  = parent->hdr.longopts;
     const char *datatype  = parent->hdr.datatype;
@@ -1865,8 +1828,7 @@ struct arg_file *arg_file0(
     const char *shortopts,
     const char *longopts,
     const char *datatype,
-    const char *glossary)
-{
+    const char *glossary) {
     return arg_filen(shortopts, longopts, datatype, 0, 1, glossary);
 }
 
@@ -1875,8 +1837,7 @@ struct arg_file *arg_file1(
     const char *shortopts,
     const char *longopts,
     const char *datatype,
-    const char *glossary)
-{
+    const char *glossary) {
     return arg_filen(shortopts, longopts, datatype, 1, 1, glossary);
 }
 
@@ -1887,8 +1848,7 @@ struct arg_file *arg_filen(
     const char *datatype,
     int mincount,
     int maxcount,
-    const char *glossary)
-{
+    const char *glossary) {
     size_t nbytes;
     struct arg_file *result;
 
@@ -1972,8 +1932,7 @@ struct arg_file *arg_filen(
 #include "argtable3.h"
 
 
-static void arg_int_resetfn(struct arg_int *parent)
-{
+static void arg_int_resetfn(struct arg_int *parent) {
     ARG_TRACE(("%s:resetfn(%p)\n", __FILE__, parent));
     parent->count = 0;
 }
@@ -1992,8 +1951,7 @@ static void arg_int_resetfn(struct arg_int *parent)
 static long int strtol0X(const char *str,
                          const char * *endptr,
                          char X,
-                         int base)
-{
+                         int base) {
     long int val;               /* stores result */
     int s = 1;                    /* sign is +1 or -1 */
     const char *ptr = str;        /* ptr to current position in str */
@@ -2048,8 +2006,7 @@ static long int strtol0X(const char *str,
 
 /* Returns 1 if str matches suffix (case insensitive).    */
 /* Str may contain trailing whitespace, but nothing else. */
-static int detectsuffix(const char *str, const char *suffix)
-{
+static int detectsuffix(const char *str, const char *suffix) {
     /* scan pairwise through strings until mismatch detected */
     while (toupper(*str) == toupper(*suffix)) {
         /* printf("'%c' '%c'\n", *str, *suffix); */
@@ -2077,8 +2034,7 @@ static int detectsuffix(const char *str, const char *suffix)
 }
 
 
-static int arg_int_scanfn(struct arg_int *parent, const char *argval)
-{
+static int arg_int_scanfn(struct arg_int *parent, const char *argval) {
     int errorcode = 0;
 
     if (parent->count == parent->hdr.maxcount) {
@@ -2163,8 +2119,7 @@ static int arg_int_scanfn(struct arg_int *parent, const char *argval)
 }
 
 
-static int arg_int_checkfn(struct arg_int *parent)
-{
+static int arg_int_checkfn(struct arg_int *parent) {
     int errorcode = (parent->count < parent->hdr.mincount) ? EMINCOUNT : 0;
     /*printf("%s:checkfn(%p) returns %d\n",__FILE__,parent,errorcode);*/
     return errorcode;
@@ -2176,8 +2131,7 @@ static void arg_int_errorfn(
     FILE *fp,
     int errorcode,
     const char *argval,
-    const char *progname)
-{
+    const char *progname) {
     const char *shortopts = parent->hdr.shortopts;
     const char *longopts  = parent->hdr.longopts;
     const char *datatype  = parent->hdr.datatype;
@@ -2219,8 +2173,7 @@ struct arg_int *arg_int0(
     const char *shortopts,
     const char *longopts,
     const char *datatype,
-    const char *glossary)
-{
+    const char *glossary) {
     return arg_intn(shortopts, longopts, datatype, 0, 1, glossary);
 }
 
@@ -2229,8 +2182,7 @@ struct arg_int *arg_int1(
     const char *shortopts,
     const char *longopts,
     const char *datatype,
-    const char *glossary)
-{
+    const char *glossary) {
     return arg_intn(shortopts, longopts, datatype, 1, 1, glossary);
 }
 
@@ -2241,8 +2193,7 @@ struct arg_int *arg_intn(
     const char *datatype,
     int mincount,
     int maxcount,
-    const char *glossary)
-{
+    const char *glossary) {
     size_t nbytes;
     struct arg_int *result;
 
@@ -2311,15 +2262,13 @@ struct arg_int *arg_intn(
 #include "argtable3.h"
 
 
-static void arg_lit_resetfn(struct arg_lit *parent)
-{
+static void arg_lit_resetfn(struct arg_lit *parent) {
     ARG_TRACE(("%s:resetfn(%p)\n", __FILE__, parent));
     parent->count = 0;
 }
 
 
-static int arg_lit_scanfn(struct arg_lit *parent, const char *argval)
-{
+static int arg_lit_scanfn(struct arg_lit *parent, const char *argval) {
     int errorcode = 0;
     if (parent->count < parent->hdr.maxcount)
         parent->count++;
@@ -2332,8 +2281,7 @@ static int arg_lit_scanfn(struct arg_lit *parent, const char *argval)
 }
 
 
-static int arg_lit_checkfn(struct arg_lit *parent)
-{
+static int arg_lit_checkfn(struct arg_lit *parent) {
     int errorcode = (parent->count < parent->hdr.mincount) ? EMINCOUNT : 0;
     ARG_TRACE(("%s:checkfn(%p) returns %d\n", __FILE__, parent, errorcode));
     return errorcode;
@@ -2345,8 +2293,7 @@ static void arg_lit_errorfn(
     FILE *fp,
     int errorcode,
     const char *argval,
-    const char *progname)
-{
+    const char *progname) {
     const char *shortopts = parent->hdr.shortopts;
     const char *longopts  = parent->hdr.longopts;
     const char *datatype  = parent->hdr.datatype;
@@ -2372,8 +2319,7 @@ static void arg_lit_errorfn(
 struct arg_lit *arg_lit0(
     const char *shortopts,
     const char *longopts,
-    const char *glossary)
-{
+    const char *glossary) {
     return arg_litn(shortopts, longopts, 0, 1, glossary);
 }
 
@@ -2381,8 +2327,7 @@ struct arg_lit *arg_lit0(
 struct arg_lit *arg_lit1(
     const char *shortopts,
     const char *longopts,
-    const char *glossary)
-{
+    const char *glossary) {
     return arg_litn(shortopts, longopts, 1, 1, glossary);
 }
 
@@ -2392,8 +2337,7 @@ struct arg_lit *arg_litn(
     const char *longopts,
     int mincount,
     int maxcount,
-    const char *glossary)
-{
+    const char *glossary) {
     struct arg_lit *result;
 
     /* foolproof things by ensuring maxcount is not less than mincount */
@@ -2456,8 +2400,7 @@ struct arg_lit *arg_litn(
 
 #include "argtable3.h"
 
-struct arg_rem *arg_rem(const char *datatype, const char *glossary)
-{
+struct arg_rem *arg_rem(const char *datatype, const char *glossary) {
     struct arg_rem *result = (struct arg_rem *)malloc(sizeof(struct arg_rem));
     if (result) {
         result->hdr.flag = 0;
@@ -2600,14 +2543,12 @@ struct privhdr {
 };
 
 
-static void arg_rex_resetfn(struct arg_rex *parent)
-{
+static void arg_rex_resetfn(struct arg_rex *parent) {
     ARG_TRACE(("%s:resetfn(%p)\n", __FILE__, parent));
     parent->count = 0;
 }
 
-static int arg_rex_scanfn(struct arg_rex *parent, const char *argval)
-{
+static int arg_rex_scanfn(struct arg_rex *parent, const char *argval) {
     int errorcode = 0;
     const TRexChar *error = NULL;
     TRex *rex = NULL;
@@ -2641,8 +2582,7 @@ static int arg_rex_scanfn(struct arg_rex *parent, const char *argval)
     return errorcode;
 }
 
-static int arg_rex_checkfn(struct arg_rex *parent)
-{
+static int arg_rex_checkfn(struct arg_rex *parent) {
     int errorcode = (parent->count < parent->hdr.mincount) ? EMINCOUNT : 0;
     //struct privhdr *priv = (struct privhdr*)parent->hdr.priv;
 
@@ -2657,8 +2597,7 @@ static void arg_rex_errorfn(struct arg_rex *parent,
                             FILE *fp,
                             int errorcode,
                             const char *argval,
-                            const char *progname)
-{
+                            const char *progname) {
     const char *shortopts = parent->hdr.shortopts;
     const char *longopts  = parent->hdr.longopts;
     const char *datatype  = parent->hdr.datatype;
@@ -2698,8 +2637,7 @@ struct arg_rex *arg_rex0(const char *shortopts,
                          const char *pattern,
                          const char *datatype,
                          int flags,
-                         const char *glossary)
-{
+                         const char *glossary) {
     return arg_rexn(shortopts,
                     longopts,
                     pattern,
@@ -2715,8 +2653,7 @@ struct arg_rex *arg_rex1(const char *shortopts,
                          const char *pattern,
                          const char *datatype,
                          int flags,
-                         const char *glossary)
-{
+                         const char *glossary) {
     return arg_rexn(shortopts,
                     longopts,
                     pattern,
@@ -2735,8 +2672,7 @@ struct arg_rex *arg_rexn(const char *shortopts,
                          int mincount,
                          int maxcount,
                          int flags,
-                         const char *glossary)
-{
+                         const char *glossary) {
     size_t nbytes;
     struct arg_rex *result;
     struct privhdr *priv;
@@ -2891,8 +2827,7 @@ struct TRex {
 
 static int trex_list(TRex *exp);
 
-static int trex_newnode(TRex *exp, TRexNodeType type)
-{
+static int trex_newnode(TRex *exp, TRexNodeType type) {
     TRexNode n;
     int newid;
     n.type = type;
@@ -2908,21 +2843,18 @@ static int trex_newnode(TRex *exp, TRexNodeType type)
     return (int)newid;
 }
 
-static void trex_error(TRex *exp, const TRexChar *error)
-{
+static void trex_error(TRex *exp, const TRexChar *error) {
     if (exp->_error) *exp->_error = error;
     longjmp(*((jmp_buf *)exp->_jmpbuf), -1);
 }
 
-static void trex_expect(TRex *exp, int n)
-{
+static void trex_expect(TRex *exp, int n) {
     if ((*exp->_p) != n)
         trex_error(exp, _SC("expected paren"));
     exp->_p++;
 }
 
-static TRexChar trex_escapechar(TRex *exp)
-{
+static TRexChar trex_escapechar(TRex *exp) {
     if (*exp->_p == TREX_SYMBOL_ESCAPE_CHAR) {
         exp->_p++;
         switch (*exp->_p) {
@@ -2948,15 +2880,13 @@ static TRexChar trex_escapechar(TRex *exp)
     return (*exp->_p++);
 }
 
-static int trex_charclass(TRex *exp, int classid)
-{
+static int trex_charclass(TRex *exp, int classid) {
     int n = trex_newnode(exp, OP_CCLASS);
     exp->_nodes[n].left = classid;
     return n;
 }
 
-static int trex_charnode(TRex *exp, TRexBool isclass)
-{
+static int trex_charnode(TRex *exp, TRexBool isclass) {
     TRexChar t;
     if (*exp->_p == TREX_SYMBOL_ESCAPE_CHAR) {
         exp->_p++;
@@ -3017,8 +2947,7 @@ static int trex_charnode(TRex *exp, TRexBool isclass)
     exp->_p++;
     return trex_newnode(exp, t);
 }
-static int trex_class(TRex *exp)
-{
+static int trex_class(TRex *exp) {
     int ret = -1;
     int first = -1, chain;
     if (*exp->_p == TREX_SYMBOL_BEGINNING_OF_STRING) {
@@ -3064,8 +2993,7 @@ static int trex_class(TRex *exp)
     return ret;
 }
 
-static int trex_parsenumber(TRex *exp)
-{
+static int trex_parsenumber(TRex *exp) {
     int ret = *exp->_p - '0';
     int positions = 10;
     exp->_p++;
@@ -3077,8 +3005,7 @@ static int trex_parsenumber(TRex *exp)
     return ret;
 }
 
-static int trex_element(TRex *exp)
-{
+static int trex_element(TRex *exp) {
     int ret = -1;
     switch (*exp->_p) {
         case '(': {
@@ -3179,8 +3106,7 @@ static int trex_element(TRex *exp)
     return ret;
 }
 
-static int trex_list(TRex *exp)
-{
+static int trex_list(TRex *exp) {
     int ret = -1, e;
     if (*exp->_p == TREX_SYMBOL_BEGINNING_OF_STRING) {
         exp->_p++;
@@ -3203,8 +3129,7 @@ static int trex_list(TRex *exp)
     return ret;
 }
 
-static TRexBool trex_matchcclass(int cclass, TRexChar c)
-{
+static TRexBool trex_matchcclass(int cclass, TRexChar c) {
     switch (cclass) {
         case 'a':
             return isalpha(c) ? TRex_True : TRex_False;
@@ -3242,8 +3167,7 @@ static TRexBool trex_matchcclass(int cclass, TRexChar c)
     return TRex_False; /*cannot happen*/
 }
 
-static TRexBool trex_matchclass(TRex *exp, TRexNode *node, TRexChar c)
-{
+static TRexBool trex_matchclass(TRex *exp, TRexNode *node, TRexChar c) {
     do {
         switch (node->type) {
             case OP_RANGE:
@@ -3269,8 +3193,7 @@ static TRexBool trex_matchclass(TRex *exp, TRexNode *node, TRexChar c)
     return TRex_False;
 }
 
-static const TRexChar *trex_matchnode(TRex *exp, TRexNode *node, const TRexChar *str, TRexNode *next)
-{
+static const TRexChar *trex_matchnode(TRex *exp, TRexNode *node, const TRexChar *str, TRexNode *next) {
 
     TRexNodeType type = node->type;
     switch (type) {
@@ -3297,7 +3220,7 @@ static const TRexChar *trex_matchnode(TRex *exp, TRexNode *node, const TRexChar
                     //checks that 0 matches satisfy the expression(if so skips)
                     //if not would always stop(for instance if is a '?')
                     if (greedystop->type != OP_GREEDY ||
-                        (greedystop->type == OP_GREEDY && ((greedystop->right >> 16) & 0x0000FFFF) != 0)) {
+                            (greedystop->type == OP_GREEDY && ((greedystop->right >> 16) & 0x0000FFFF) != 0)) {
                         TRexNode *gnext = NULL;
                         if (greedystop->next != -1) {
                             gnext = &exp->_nodes[greedystop->next];
@@ -3375,9 +3298,9 @@ static const TRexChar *trex_matchnode(TRex *exp, TRexNode *node, const TRexChar
         }
         case OP_WB:
             if ((str == exp->_bol && !ISSPACE(*str))
-                || ((str == exp->_eol && !ISSPACE(*(str - 1))))
-                || ((!ISSPACE(*str) && ISSPACE(*(str + 1))))
-                || ((ISSPACE(*str) && !ISSPACE(*(str + 1))))) {
+                    || ((str == exp->_eol && !ISSPACE(*(str - 1))))
+                    || ((!ISSPACE(*str) && ISSPACE(*(str + 1))))
+                    || ((ISSPACE(*str) && !ISSPACE(*(str + 1))))) {
                 return (node->left == 'b') ? str : NULL;
             }
             return (node->left == 'b') ? NULL : str;
@@ -3416,8 +3339,7 @@ static const TRexChar *trex_matchnode(TRex *exp, TRexNode *node, const TRexChar
 }
 
 /* public api */
-TRex *trex_compile(const TRexChar *pattern, const TRexChar **error, int flags)
-{
+TRex *trex_compile(const TRexChar *pattern, const TRexChar **error, int flags) {
     TRex *exp = (TRex *)malloc(sizeof(TRex));
     exp->_eol = exp->_bol = NULL;
     exp->_p = pattern;
@@ -3461,8 +3383,7 @@ TRex *trex_compile(const TRexChar *pattern, const TRexChar **error, int flags)
     return exp;
 }
 
-void trex_free(TRex *exp)
-{
+void trex_free(TRex *exp) {
     if (exp) {
         if (exp->_nodes) free(exp->_nodes);
         if (exp->_jmpbuf) free(exp->_jmpbuf);
@@ -3471,8 +3392,7 @@ void trex_free(TRex *exp)
     }
 }
 
-TRexBool trex_match(TRex *exp, const TRexChar *text)
-{
+TRexBool trex_match(TRex *exp, const TRexChar *text) {
     const TRexChar *res = NULL;
     exp->_bol = text;
     exp->_eol = text + scstrlen(text);
@@ -3483,8 +3403,7 @@ TRexBool trex_match(TRex *exp, const TRexChar *text)
     return TRex_True;
 }
 
-TRexBool trex_searchrange(TRex *exp, const TRexChar *text_begin, const TRexChar *text_end, const TRexChar **out_begin, const TRexChar **out_end)
-{
+TRexBool trex_searchrange(TRex *exp, const TRexChar *text_begin, const TRexChar *text_end, const TRexChar **out_begin, const TRexChar **out_end) {
     const TRexChar *cur = NULL;
     int node = exp->_first;
     if (text_begin >= text_end) return TRex_False;
@@ -3512,18 +3431,15 @@ TRexBool trex_searchrange(TRex *exp, const TRexChar *text_begin, const TRexChar
     return TRex_True;
 }
 
-TRexBool trex_search(TRex *exp, const TRexChar *text, const TRexChar **out_begin, const TRexChar **out_end)
-{
+TRexBool trex_search(TRex *exp, const TRexChar *text, const TRexChar **out_begin, const TRexChar **out_end) {
     return trex_searchrange(exp, text, text + scstrlen(text), out_begin, out_end);
 }
 
-int trex_getsubexpcount(TRex *exp)
-{
+int trex_getsubexpcount(TRex *exp) {
     return exp->_nsubexpr;
 }
 
-TRexBool trex_getsubexp(TRex *exp, int n, TRexMatch *subexp)
-{
+TRexBool trex_getsubexp(TRex *exp, int n, TRexMatch *subexp) {
     if (n < 0 || n >= exp->_nsubexpr) return TRex_False;
     *subexp = exp->_matches[n];
     return TRex_True;
@@ -3563,15 +3479,13 @@ TRexBool trex_getsubexp(TRex *exp, int n, TRexMatch *subexp)
 #include "argtable3.h"
 
 
-static void arg_str_resetfn(struct arg_str *parent)
-{
+static void arg_str_resetfn(struct arg_str *parent) {
     ARG_TRACE(("%s:resetfn(%p)\n", __FILE__, parent));
     parent->count = 0;
 }
 
 
-static int arg_str_scanfn(struct arg_str *parent, const char *argval)
-{
+static int arg_str_scanfn(struct arg_str *parent, const char *argval) {
     int errorcode = 0;
 
     if (parent->count == parent->hdr.maxcount) {
@@ -3591,8 +3505,7 @@ static int arg_str_scanfn(struct arg_str *parent, const char *argval)
 }
 
 
-static int arg_str_checkfn(struct arg_str *parent)
-{
+static int arg_str_checkfn(struct arg_str *parent) {
     int errorcode = (parent->count < parent->hdr.mincount) ? EMINCOUNT : 0;
 
     ARG_TRACE(("%s:checkfn(%p) returns %d\n", __FILE__, parent, errorcode));
@@ -3605,8 +3518,7 @@ static void arg_str_errorfn(
     FILE *fp,
     int errorcode,
     const char *argval,
-    const char *progname)
-{
+    const char *progname) {
     const char *shortopts = parent->hdr.shortopts;
     const char *longopts  = parent->hdr.longopts;
     const char *datatype  = parent->hdr.datatype;
@@ -3633,8 +3545,7 @@ struct arg_str *arg_str0(
     const char *shortopts,
     const char *longopts,
     const char *datatype,
-    const char *glossary)
-{
+    const char *glossary) {
     return arg_strn(shortopts, longopts, datatype, 0, 1, glossary);
 }
 
@@ -3643,8 +3554,7 @@ struct arg_str *arg_str1(
     const char *shortopts,
     const char *longopts,
     const char *datatype,
-    const char *glossary)
-{
+    const char *glossary) {
     return arg_strn(shortopts, longopts, datatype, 1, 1, glossary);
 }
 
@@ -3655,8 +3565,7 @@ struct arg_str *arg_strn(
     const char *datatype,
     int mincount,
     int maxcount,
-    const char *glossary)
-{
+    const char *glossary) {
     size_t nbytes;
     struct arg_str *result;
 
@@ -3739,8 +3648,7 @@ static
 void arg_register_error(struct arg_end *end,
                         void *parent,
                         int error,
-                        const char *argval)
-{
+                        const char *argval) {
     /* printf("arg_register_error(%p,%p,%d,%s)\n",end,parent,error,argval); */
     if (end->count < end->hdr.maxcount) {
         end->error[end->count] = error;
@@ -3760,12 +3668,11 @@ void arg_register_error(struct arg_end *end,
  * or -1 if no match was found.
  */
 static
-int find_shortoption(struct arg_hdr * *table, char shortopt)
-{
+int find_shortoption(struct arg_hdr * *table, char shortopt) {
     int tabindex;
     for (tabindex = 0; !(table[tabindex]->flag & ARG_TERMINATOR); tabindex++) {
         if (table[tabindex]->shortopts &&
-            strchr(table[tabindex]->shortopts, shortopt))
+                strchr(table[tabindex]->shortopts, shortopt))
             return tabindex;
     }
     return -1;
@@ -3780,8 +3687,7 @@ struct longoptions {
 
 #if 0
 static
-void dump_longoptions(struct longoptions *longoptions)
-{
+void dump_longoptions(struct longoptions *longoptions) {
     int i;
     printf("getoptval = %d\n", longoptions->getoptval);
     printf("noptions  = %d\n", longoptions->noptions);
@@ -3797,8 +3703,7 @@ void dump_longoptions(struct longoptions *longoptions)
 #endif
 
 static
-struct longoptions *alloc_longoptions(struct arg_hdr * *table)
-{
+struct longoptions *alloc_longoptions(struct arg_hdr * *table) {
     struct longoptions *result;
     size_t nbytes;
     int noptions = 1;
@@ -3881,8 +3786,7 @@ struct longoptions *alloc_longoptions(struct arg_hdr * *table)
 }
 
 static
-char *alloc_shortoptions(struct arg_hdr * *table)
-{
+char *alloc_shortoptions(struct arg_hdr * *table) {
     char *result;
     size_t len = 2;
     int tabindex;
@@ -3923,8 +3827,7 @@ char *alloc_shortoptions(struct arg_hdr * *table)
 
 /* return index of the table terminator entry */
 static
-int arg_endindex(struct arg_hdr * *table)
-{
+int arg_endindex(struct arg_hdr * *table) {
     int tabindex = 0;
     while (!(table[tabindex]->flag & ARG_TERMINATOR))
         tabindex++;
@@ -3936,8 +3839,7 @@ static
 void arg_parse_tagged(int argc,
                       char * *argv,
                       struct arg_hdr * *table,
-                      struct arg_end *endtable)
-{
+                      struct arg_end *endtable) {
     struct longoptions *longoptions;
     char *shortoptions;
     int copt;
@@ -3979,7 +3881,7 @@ void arg_parse_tagged(int argc,
                 void *parent  = table[tabindex]->parent;
                 /*printf("long option detected from argtable[%d]\n", tabindex);*/
                 if (optarg && optarg[0] == 0 &&
-                    (table[tabindex]->flag & ARG_HASVALUE)) {
+                        (table[tabindex]->flag & ARG_HASVALUE)) {
                     /* printf(": long option %s requires an argument\n",argv[optind-1]); */
                     arg_register_error(endtable, endtable, ARG_EMISSARG,
                                        argv[optind - 1]);
@@ -4051,8 +3953,7 @@ static
 void arg_parse_untagged(int argc,
                         char * *argv,
                         struct arg_hdr * *table,
-                        struct arg_end *endtable)
-{
+                        struct arg_end *endtable) {
     int tabindex = 0;
     int errorlast = 0;
     const char *optarglast = NULL;
@@ -4126,8 +4027,7 @@ void arg_parse_untagged(int argc,
 
 
 static
-void arg_parse_check(struct arg_hdr * *table, struct arg_end *endtable)
-{
+void arg_parse_check(struct arg_hdr * *table, struct arg_end *endtable) {
     int tabindex = 0;
     /* printf("arg_parse_check()\n"); */
     do {
@@ -4142,8 +4042,7 @@ void arg_parse_check(struct arg_hdr * *table, struct arg_end *endtable)
 
 
 static
-void arg_reset(void * *argtable)
-{
+void arg_reset(void * *argtable) {
     struct arg_hdr * *table = (struct arg_hdr * *)argtable;
     int tabindex = 0;
     /*printf("arg_reset(%p)\n",argtable);*/
@@ -4154,8 +4053,7 @@ void arg_reset(void * *argtable)
 }
 
 
-int arg_parse(int argc, char * *argv, void * *argtable)
-{
+int arg_parse(int argc, char * *argv, void * *argtable) {
     struct arg_hdr * *table = (struct arg_hdr * *)argtable;
     struct arg_end *endtable;
     int endindex;
@@ -4237,8 +4135,7 @@ int arg_parse(int argc, char * *argv, void * *argtable)
  *   ndest  == 10
  */
 static
-void arg_cat(char * *pdest, const char *src, size_t *pndest)
-{
+void arg_cat(char * *pdest, const char *src, size_t *pndest) {
     char *dest = *pdest;
     char *end  = dest + *pndest;
 
@@ -4265,8 +4162,7 @@ void arg_cat_option(char *dest,
                     const char *shortopts,
                     const char *longopts,
                     const char *datatype,
-                    int optvalue)
-{
+                    int optvalue) {
     if (shortopts) {
         char option[3];
 
@@ -4326,8 +4222,7 @@ void arg_cat_optionv(char *dest,
                      const char *longopts,
                      const char *datatype,
                      int optvalue,
-                     const char *separator)
-{
+                     const char *separator) {
     separator = separator ? separator : "";
 
     if (shortopts) {
@@ -4398,8 +4293,7 @@ void arg_print_option(FILE *fp,
                       const char *shortopts,
                       const char *longopts,
                       const char *datatype,
-                      const char *suffix)
-{
+                      const char *suffix) {
     char syntax[200] = "";
     suffix = suffix ? suffix : "";
 
@@ -4423,8 +4317,7 @@ void arg_print_option(FILE *fp,
  * in: -xvfsd, or -xvf[sd], or [-xvsfd]
  */
 static
-void arg_print_gnuswitch(FILE *fp, struct arg_hdr * *table)
-{
+void arg_print_gnuswitch(FILE *fp, struct arg_hdr * *table) {
     int tabindex;
     char *format1 = " -%c";
     char *format2 = " [-%c";
@@ -4432,8 +4325,8 @@ void arg_print_gnuswitch(FILE *fp, struct arg_hdr * *table)
 
     /* print all mandatory switches that are without argument values */
     for (tabindex = 0;
-         table[tabindex] && !(table[tabindex]->flag & ARG_TERMINATOR);
-         tabindex++) {
+            table[tabindex] && !(table[tabindex]->flag & ARG_TERMINATOR);
+            tabindex++) {
         /* skip optional options */
         if (table[tabindex]->mincount < 1)
             continue;
@@ -4454,8 +4347,8 @@ void arg_print_gnuswitch(FILE *fp, struct arg_hdr * *table)
 
     /* print all optional switches that are without argument values */
     for (tabindex = 0;
-         table[tabindex] && !(table[tabindex]->flag & ARG_TERMINATOR);
-         tabindex++) {
+            table[tabindex] && !(table[tabindex]->flag & ARG_TERMINATOR);
+            tabindex++) {
         /* skip mandatory args */
         if (table[tabindex]->mincount > 0)
             continue;
@@ -4478,8 +4371,7 @@ void arg_print_gnuswitch(FILE *fp, struct arg_hdr * *table)
 }
 
 
-void arg_print_syntax(FILE *fp, void * *argtable, const char *suffix)
-{
+void arg_print_syntax(FILE *fp, void * *argtable, const char *suffix) {
     struct arg_hdr * *table = (struct arg_hdr * *)argtable;
     int i, tabindex;
 
@@ -4488,14 +4380,14 @@ void arg_print_syntax(FILE *fp, void * *argtable, const char *suffix)
 
     /* print remaining options in abbreviated style */
     for (tabindex = 0;
-         table[tabindex] && !(table[tabindex]->flag & ARG_TERMINATOR);
-         tabindex++) {
+            table[tabindex] && !(table[tabindex]->flag & ARG_TERMINATOR);
+            tabindex++) {
         char syntax[200] = "";
         const char *shortopts, *longopts, *datatype;
 
         /* skip short options without arg values (they were printed by arg_print_gnu_switch) */
         if (table[tabindex]->shortopts &&
-            !(table[tabindex]->flag & ARG_HASVALUE))
+                !(table[tabindex]->flag & ARG_HASVALUE))
             continue;
 
         shortopts = table[tabindex]->shortopts;
@@ -4535,15 +4427,14 @@ void arg_print_syntax(FILE *fp, void * *argtable, const char *suffix)
 }
 
 
-void arg_print_syntaxv(FILE *fp, void * *argtable, const char *suffix)
-{
+void arg_print_syntaxv(FILE *fp, void * *argtable, const char *suffix) {
     struct arg_hdr * *table = (struct arg_hdr * *)argtable;
     int i, tabindex;
 
     /* print remaining options in abbreviated style */
     for (tabindex = 0;
-         table[tabindex] && !(table[tabindex]->flag & ARG_TERMINATOR);
-         tabindex++) {
+            table[tabindex] && !(table[tabindex]->flag & ARG_TERMINATOR);
+            tabindex++) {
         char syntax[200] = "";
         const char *shortopts, *longopts, *datatype;
 
@@ -4583,8 +4474,7 @@ void arg_print_syntaxv(FILE *fp, void * *argtable, const char *suffix)
 }
 
 
-void arg_print_glossary(FILE *fp, void * *argtable, const char *format)
-{
+void arg_print_glossary(FILE *fp, void * *argtable, const char *format) {
     struct arg_hdr * *table = (struct arg_hdr * *)argtable;
     int tabindex;
 
@@ -4645,8 +4535,7 @@ static
 void arg_print_formatted(FILE *fp,
                          const unsigned lmargin,
                          const unsigned rmargin,
-                         const char *text)
-{
+                         const char *text) {
     const unsigned textlen = (unsigned)strlen(text);
     unsigned line_start = 0;
     unsigned line_end = textlen + 1;
@@ -4668,8 +4557,8 @@ void arg_print_formatted(FILE *fp,
 
         /* Find last whitespace, that fits into line */
         while ((line_end > line_start)
-               && (line_end - line_start > colwidth)
-               && !ISSPACE(*(text + line_end)))
+                && (line_end - line_start > colwidth)
+                && !ISSPACE(*(text + line_end)))
         { line_end--; }
 
         /* Do not print trailing whitespace. If this text
@@ -4709,8 +4598,7 @@ void arg_print_formatted(FILE *fp,
  *
  * Contributed by Uli Fouquet
  */
-void arg_print_glossary_gnu(FILE *fp, void * *argtable)
-{
+void arg_print_glossary_gnu(FILE *fp, void * *argtable) {
     struct arg_hdr * *table = (struct arg_hdr * *)argtable;
     int tabindex;
 
@@ -4755,8 +4643,7 @@ void arg_print_glossary_gnu(FILE *fp, void * *argtable)
  * Checks the argtable[] array for NULL entries and returns 1
  * if any are found, zero otherwise.
  */
-int arg_nullcheck(void * *argtable)
-{
+int arg_nullcheck(void * *argtable) {
     struct arg_hdr * *table = (struct arg_hdr * *)argtable;
     int tabindex;
     /*printf("arg_nullcheck(%p)\n",argtable);*/
@@ -4786,8 +4673,7 @@ int arg_nullcheck(void * *argtable)
  * with the newer arg_freetable() function.
  * We still keep arg_free() for backwards compatibility.
  */
-void arg_free(void * *argtable)
-{
+void arg_free(void * *argtable) {
     struct arg_hdr * *table = (struct arg_hdr * *)argtable;
     int tabindex = 0;
     int flag;
@@ -4810,8 +4696,7 @@ void arg_free(void * *argtable)
 }
 
 /* frees each non-NULL element of argtable[], where n is the size of the number of entries in the array */
-void arg_freetable(void * *argtable, size_t n)
-{
+void arg_freetable(void * *argtable, size_t n) {
     struct arg_hdr * *table = (struct arg_hdr * *)argtable;
     size_t tabindex = 0;
     /*printf("arg_freetable(%p)\n",argtable);*/
diff --git a/client/cliparser/cliparser.c b/client/cliparser/cliparser.c
index 5383712b0..766cf9ba4 100644
--- a/client/cliparser/cliparser.c
+++ b/client/cliparser/cliparser.c
@@ -19,8 +19,7 @@ char *programHint = NULL;
 char *programHelp = NULL;
 char buf[500] = {0};
 
-int CLIParserInit(char *vprogramName, char *vprogramHint, char *vprogramHelp)
-{
+int CLIParserInit(char *vprogramName, char *vprogramHint, char *vprogramHelp) {
     argtable = NULL;
     argtableLen = 0;
     programName = vprogramName;
@@ -31,8 +30,7 @@ int CLIParserInit(char *vprogramName, char *vprogramHint, char *vprogramHelp)
     return 0;
 }
 
-int CLIParserParseArg(int argc, char **argv, void *vargtable[], size_t vargtableLen, bool allowEmptyExec)
-{
+int CLIParserParseArg(int argc, char **argv, void *vargtable[], size_t vargtableLen, bool allowEmptyExec) {
     int nerrors;
 
     argtable = vargtable;
@@ -81,13 +79,11 @@ enum ParserState {
 
 #define isSpace(c)(c == ' ' || c == '\t')
 
-int CLIParserParseString(const char *str, void *vargtable[], size_t vargtableLen, bool allowEmptyExec)
-{
+int CLIParserParseString(const char *str, void *vargtable[], size_t vargtableLen, bool allowEmptyExec) {
     return CLIParserParseStringEx(str, vargtable, vargtableLen, allowEmptyExec, false);
 }
 
-int CLIParserParseStringEx(const char *str, void *vargtable[], size_t vargtableLen, bool allowEmptyExec, bool clueData)
-{
+int CLIParserParseStringEx(const char *str, void *vargtable[], size_t vargtableLen, bool allowEmptyExec, bool clueData) {
     int argc = 0;
     char *argv[200] = {NULL};
 
@@ -147,8 +143,7 @@ int CLIParserParseStringEx(const char *str, void *vargtable[], size_t vargtableL
     return CLIParserParseArg(argc, argv, vargtable, vargtableLen, allowEmptyExec);
 }
 
-void CLIParserFree()
-{
+void CLIParserFree() {
     arg_freetable(argtable, argtableLen);
     argtable = NULL;
 
@@ -156,8 +151,7 @@ void CLIParserFree()
 }
 
 // convertors
-int CLIParamHexToBuf(struct arg_str *argstr, uint8_t *data, int maxdatalen, int *datalen)
-{
+int CLIParamHexToBuf(struct arg_str *argstr, uint8_t *data, int maxdatalen, int *datalen) {
     *datalen = 0;
 
     int ibuf = 0;
@@ -181,8 +175,7 @@ int CLIParamHexToBuf(struct arg_str *argstr, uint8_t *data, int maxdatalen, int
     return 0;
 }
 
-int CLIParamStrToBuf(struct arg_str *argstr, uint8_t *data, int maxdatalen, int *datalen)
-{
+int CLIParamStrToBuf(struct arg_str *argstr, uint8_t *data, int maxdatalen, int *datalen) {
     *datalen = 0;
     if (!argstr->count)
         return 0;
diff --git a/client/cmdanalyse.c b/client/cmdanalyse.c
index 892312cfa..991d082f5 100644
--- a/client/cmdanalyse.c
+++ b/client/cmdanalyse.c
@@ -11,8 +11,7 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_analyse_lcr(void)
-{
+int usage_analyse_lcr(void) {
     PrintAndLogEx(NORMAL, "Specifying the bytes of a UID with a known LRC will find the last byte value");
     PrintAndLogEx(NORMAL, "needed to generate that LRC with a rolling XOR. All bytes should be specified in HEX.");
     PrintAndLogEx(NORMAL, "");
@@ -26,8 +25,7 @@ int usage_analyse_lcr(void)
     PrintAndLogEx(NORMAL, "expected output: Target (BA) requires final LRC XOR byte value: 5A");
     return 0;
 }
-int usage_analyse_checksum(void)
-{
+int usage_analyse_checksum(void) {
     PrintAndLogEx(NORMAL, "The bytes will be added with eachother and than limited with the applied mask");
     PrintAndLogEx(NORMAL, "Finally compute ones' complement of the least significant bytes");
     PrintAndLogEx(NORMAL, "");
@@ -43,8 +41,7 @@ int usage_analyse_checksum(void)
     PrintAndLogEx(NORMAL, "expected output: 0x61");
     return 0;
 }
-int usage_analyse_crc(void)
-{
+int usage_analyse_crc(void) {
     PrintAndLogEx(NORMAL, "A stub method to test different crc implementations inside the PM3 sourcecode. Just because you figured out the poly, doesn't mean you get the desired output");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  analyse crc [h] <bytes>");
@@ -56,8 +53,7 @@ int usage_analyse_crc(void)
     PrintAndLogEx(NORMAL, "      analyse crc 137AF00A0A0D");
     return 0;
 }
-int usage_analyse_nuid(void)
-{
+int usage_analyse_nuid(void) {
     PrintAndLogEx(NORMAL, "Generate 4byte NUID from 7byte UID");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  analyse hid [h] <bytes>");
@@ -69,8 +65,7 @@ int usage_analyse_nuid(void)
     PrintAndLogEx(NORMAL, "      analyse nuid 11223344556677");
     return 0;
 }
-int usage_analyse_a(void)
-{
+int usage_analyse_a(void) {
     PrintAndLogEx(NORMAL, "Iceman's personal garbage test command");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  analyse a [h] d <bytes>");
@@ -83,8 +78,7 @@ int usage_analyse_a(void)
     return 0;
 }
 
-static uint8_t calculateLRC(uint8_t *bytes, uint8_t len)
-{
+static uint8_t calculateLRC(uint8_t *bytes, uint8_t len) {
     uint8_t LRC = 0;
     for (uint8_t i = 0; i < len; i++)
         LRC ^= bytes[i];
@@ -108,8 +102,7 @@ static uint16_t shiftadd ( uint8_t* bytes, uint8_t len){
     return 0;
 }
 */
-static uint16_t calcSumCrumbAdd(uint8_t *bytes, uint8_t len, uint32_t mask)
-{
+static uint16_t calcSumCrumbAdd(uint8_t *bytes, uint8_t len, uint32_t mask) {
     uint16_t sum = 0;
     for (uint8_t i = 0; i < len; i++) {
         sum += CRUMB(bytes[i], 0);
@@ -120,12 +113,10 @@ static uint16_t calcSumCrumbAdd(uint8_t *bytes, uint8_t len, uint32_t mask)
     sum &= mask;
     return sum;
 }
-static uint16_t calcSumCrumbAddOnes(uint8_t *bytes, uint8_t len, uint32_t mask)
-{
+static uint16_t calcSumCrumbAddOnes(uint8_t *bytes, uint8_t len, uint32_t mask) {
     return (~calcSumCrumbAdd(bytes, len, mask) & mask);
 }
-static uint16_t calcSumNibbleAdd(uint8_t *bytes, uint8_t len, uint32_t mask)
-{
+static uint16_t calcSumNibbleAdd(uint8_t *bytes, uint8_t len, uint32_t mask) {
     uint16_t sum = 0;
     for (uint8_t i = 0; i < len; i++) {
         sum += NIBBLE_LOW(bytes[i]);
@@ -134,12 +125,10 @@ static uint16_t calcSumNibbleAdd(uint8_t *bytes, uint8_t len, uint32_t mask)
     sum &= mask;
     return sum;
 }
-static uint16_t calcSumNibbleAddOnes(uint8_t *bytes, uint8_t len, uint32_t mask)
-{
+static uint16_t calcSumNibbleAddOnes(uint8_t *bytes, uint8_t len, uint32_t mask) {
     return (~calcSumNibbleAdd(bytes, len, mask) & mask);
 }
-static uint16_t calcSumCrumbXor(uint8_t *bytes, uint8_t len, uint32_t mask)
-{
+static uint16_t calcSumCrumbXor(uint8_t *bytes, uint8_t len, uint32_t mask) {
     uint16_t sum = 0;
     for (uint8_t i = 0; i < len; i++) {
         sum ^= CRUMB(bytes[i], 0);
@@ -150,8 +139,7 @@ static uint16_t calcSumCrumbXor(uint8_t *bytes, uint8_t len, uint32_t mask)
     sum &= mask;
     return sum;
 }
-static uint16_t calcSumNibbleXor(uint8_t *bytes, uint8_t len, uint32_t mask)
-{
+static uint16_t calcSumNibbleXor(uint8_t *bytes, uint8_t len, uint32_t mask) {
     uint16_t sum = 0;
     for (uint8_t i = 0; i < len; i++) {
         sum ^= NIBBLE_LOW(bytes[i]);
@@ -160,8 +148,7 @@ static uint16_t calcSumNibbleXor(uint8_t *bytes, uint8_t len, uint32_t mask)
     sum &= mask;
     return sum;
 }
-static uint16_t calcSumByteXor(uint8_t *bytes, uint8_t len, uint32_t mask)
-{
+static uint16_t calcSumByteXor(uint8_t *bytes, uint8_t len, uint32_t mask) {
     uint16_t sum = 0;
     for (uint8_t i = 0; i < len; i++) {
         sum ^= bytes[i];
@@ -169,8 +156,7 @@ static uint16_t calcSumByteXor(uint8_t *bytes, uint8_t len, uint32_t mask)
     sum &= mask;
     return sum;
 }
-static uint16_t calcSumByteAdd(uint8_t *bytes, uint8_t len, uint32_t mask)
-{
+static uint16_t calcSumByteAdd(uint8_t *bytes, uint8_t len, uint32_t mask) {
     uint16_t sum = 0;
     for (uint8_t i = 0; i < len; i++) {
         sum += bytes[i];
@@ -179,13 +165,11 @@ static uint16_t calcSumByteAdd(uint8_t *bytes, uint8_t len, uint32_t mask)
     return sum;
 }
 // Ones complement
-static uint16_t calcSumByteAddOnes(uint8_t *bytes, uint8_t len, uint32_t mask)
-{
+static uint16_t calcSumByteAddOnes(uint8_t *bytes, uint8_t len, uint32_t mask) {
     return (~calcSumByteAdd(bytes, len, mask) & mask);
 }
 
-static uint16_t calcSumByteSub(uint8_t *bytes, uint8_t len, uint32_t mask)
-{
+static uint16_t calcSumByteSub(uint8_t *bytes, uint8_t len, uint32_t mask) {
     uint8_t sum = 0;
     for (uint8_t i = 0; i < len; i++) {
         sum -= bytes[i];
@@ -193,12 +177,10 @@ static uint16_t calcSumByteSub(uint8_t *bytes, uint8_t len, uint32_t mask)
     sum &= mask;
     return sum;
 }
-static uint16_t calcSumByteSubOnes(uint8_t *bytes, uint8_t len, uint32_t mask)
-{
+static uint16_t calcSumByteSubOnes(uint8_t *bytes, uint8_t len, uint32_t mask) {
     return (~calcSumByteSub(bytes, len, mask) & mask);
 }
-static uint16_t calcSumNibbleSub(uint8_t *bytes, uint8_t len, uint32_t mask)
-{
+static uint16_t calcSumNibbleSub(uint8_t *bytes, uint8_t len, uint32_t mask) {
     uint8_t sum = 0;
     for (uint8_t i = 0; i < len; i++) {
         sum -= NIBBLE_LOW(bytes[i]);
@@ -207,14 +189,12 @@ static uint16_t calcSumNibbleSub(uint8_t *bytes, uint8_t len, uint32_t mask)
     sum &= mask;
     return sum;
 }
-static uint16_t calcSumNibbleSubOnes(uint8_t *bytes, uint8_t len, uint32_t mask)
-{
+static uint16_t calcSumNibbleSubOnes(uint8_t *bytes, uint8_t len, uint32_t mask) {
     return (~calcSumNibbleSub(bytes, len, mask) & mask);
 }
 
 // BSD shift checksum 8bit version
-static uint16_t calcBSDchecksum8(uint8_t *bytes, uint8_t len, uint32_t mask)
-{
+static uint16_t calcBSDchecksum8(uint8_t *bytes, uint8_t len, uint32_t mask) {
     uint16_t sum = 0;
     for (uint8_t i = 0; i < len; i++) {
         sum = ((sum & 0xFF) >> 1) | ((sum & 0x1) << 7);   // rotate accumulator
@@ -225,8 +205,7 @@ static uint16_t calcBSDchecksum8(uint8_t *bytes, uint8_t len, uint32_t mask)
     return sum;
 }
 // BSD shift checksum 4bit version
-static uint16_t calcBSDchecksum4(uint8_t *bytes, uint8_t len, uint32_t mask)
-{
+static uint16_t calcBSDchecksum4(uint8_t *bytes, uint8_t len, uint32_t mask) {
     uint16_t sum = 0;
     for (uint8_t i = 0; i < len; i++) {
         sum = ((sum & 0xF) >> 1) | ((sum & 0x1) << 3);   // rotate accumulator
@@ -241,8 +220,7 @@ static uint16_t calcBSDchecksum4(uint8_t *bytes, uint8_t len, uint32_t mask)
 }
 
 // measuring LFSR maximum length
-int CmdAnalyseLfsr(const char *Cmd)
-{
+int CmdAnalyseLfsr(const char *Cmd) {
 
     uint16_t start_state = 0;  /* Any nonzero start state will work. */
     uint16_t lfsr = start_state;
@@ -264,8 +242,7 @@ int CmdAnalyseLfsr(const char *Cmd)
     }
     return 0;
 }
-int CmdAnalyseLCR(const char *Cmd)
-{
+int CmdAnalyseLCR(const char *Cmd) {
     uint8_t data[50];
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) == 0 || cmdp == 'h') return usage_analyse_lcr();
@@ -286,8 +263,7 @@ int CmdAnalyseLCR(const char *Cmd)
     PrintAndLogEx(NORMAL, "Target [%02X] requires final LRC XOR byte value: 0x%02X", data[len - 1], finalXor);
     return 0;
 }
-int CmdAnalyseCRC(const char *Cmd)
-{
+int CmdAnalyseCRC(const char *Cmd) {
 
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) == 0 || cmdp == 'h') return usage_analyse_crc();
@@ -383,8 +359,7 @@ int CmdAnalyseCRC(const char *Cmd)
     free(data);
     return 0;
 }
-int CmdAnalyseCHKSUM(const char *Cmd)
-{
+int CmdAnalyseCHKSUM(const char *Cmd) {
 
     uint8_t data[50];
     uint8_t cmdp = 0;
@@ -450,14 +425,12 @@ int CmdAnalyseCHKSUM(const char *Cmd)
     return 0;
 }
 
-int CmdAnalyseDates(const char *Cmd)
-{
+int CmdAnalyseDates(const char *Cmd) {
     // look for datestamps in a given array of bytes
     PrintAndLogEx(NORMAL, "To be implemented. Feel free to contribute!");
     return 0;
 }
-int CmdAnalyseTEASelfTest(const char *Cmd)
-{
+int CmdAnalyseTEASelfTest(const char *Cmd) {
 
     uint8_t v[8], v_le[8];
     memset(v, 0x00, sizeof(v));
@@ -492,8 +465,7 @@ int CmdAnalyseTEASelfTest(const char *Cmd)
     return 0;
 }
 
-char *pb(uint32_t b)
-{
+char *pb(uint32_t b) {
     static char buf1[33] = {0};
     static char buf2[33] = {0};
     static char *s;
@@ -513,8 +485,7 @@ char *pb(uint32_t b)
     return s;
 }
 
-int CmdAnalyseA(const char *Cmd)
-{
+int CmdAnalyseA(const char *Cmd) {
 
     int hexlen = 0;
     uint8_t cmdp = 0;
@@ -880,8 +851,7 @@ int CmdAnalyseA(const char *Cmd)
     return 0;
 }
 
-void generate4bNUID(uint8_t *uid, uint8_t *nuid)
-{
+void generate4bNUID(uint8_t *uid, uint8_t *nuid) {
     uint16_t crc;
     uint8_t b1, b2;
 
@@ -895,8 +865,7 @@ void generate4bNUID(uint8_t *uid, uint8_t *nuid)
     nuid[3] = crc & 0xFF;
 }
 
-int CmdAnalyseNuid(const char *Cmd)
-{
+int CmdAnalyseNuid(const char *Cmd) {
     uint8_t nuid[4] = {0};
     uint8_t uid[7] = {0};
     int len = 0;
@@ -942,15 +911,13 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdAnalyse(const char *Cmd)
-{
+int CmdAnalyse(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdcrc.c b/client/cmdcrc.c
index eb46a524d..1a17d1428 100644
--- a/client/cmdcrc.c
+++ b/client/cmdcrc.c
@@ -11,8 +11,7 @@
 
 #define MAX_ARGS 20
 
-int split(char *str, char *arr[MAX_ARGS])
-{
+int split(char *str, char *arr[MAX_ARGS]) {
     int beginIndex = 0;
     int endIndex;
     int maxWords = MAX_ARGS;
@@ -40,8 +39,7 @@ int split(char *str, char *arr[MAX_ARGS])
     return wordCnt;
 }
 
-int CmdCrc(const char *Cmd)
-{
+int CmdCrc(const char *Cmd) {
     char name[] = {"reveng "};
     char Cmd2[100 + 7];
     memcpy(Cmd2, name, 7);
@@ -62,8 +60,7 @@ int CmdCrc(const char *Cmd)
 
 //returns array of model names and the count of models returning
 //  as well as a width array for the width of each model
-int GetModels(char *Models[], int *count, uint8_t *width)
-{
+int GetModels(char *Models[], int *count, uint8_t *width) {
     /* default values */
     static model_t model = MZERO;
 
@@ -248,8 +245,7 @@ int GetModels(char *Models[], int *count, uint8_t *width)
 //endian = {0 = calc default endian input and output, b = big endian input and output, B = big endian output, r = right justified
 //          l = little endian input and output, L = little endian output only, t = left justified}
 //result = calculated crc hex string
-int RunModel(char *inModel, char *inHexStr, bool reverse, char endian, char *result)
-{
+int RunModel(char *inModel, char *inHexStr, bool reverse, char endian, char *result) {
     /* default values */
     static model_t model = MZERO;
 
@@ -368,8 +364,7 @@ int RunModel(char *inModel, char *inHexStr, bool reverse, char endian, char *res
 }
 
 //test call to RunModel
-int CmdrevengTestC(const char *Cmd)
-{
+int CmdrevengTestC(const char *Cmd) {
     int cmdp = 0;
     char inModel[30] = {0x00};
     char inHexStr[30] = {0x00};
@@ -392,8 +387,7 @@ int CmdrevengTestC(const char *Cmd)
 }
 
 //returns a calloced string (needs to be freed)
-char *SwapEndianStr(const char *inStr, const size_t len, const uint8_t blockSize)
-{
+char *SwapEndianStr(const char *inStr, const size_t len, const uint8_t blockSize) {
     char *tmp = calloc(len + 1, sizeof(char));
     for (uint8_t block = 0; block < (uint8_t)(len / blockSize); block++) {
         for (size_t i = 0; i < blockSize; i += 2) {
@@ -405,8 +399,7 @@ char *SwapEndianStr(const char *inStr, const size_t len, const uint8_t blockSize
 }
 
 // takes hex string in and searches for a matching result (hex string must include checksum)
-int CmdrevengSearch(const char *Cmd)
-{
+int CmdrevengSearch(const char *Cmd) {
 
 #define NMODELS 105
 
diff --git a/client/cmddata.c b/client/cmddata.c
index 2877ca0c8..5aeaca388 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -17,8 +17,7 @@ int g_DemodClock = 0;
 
 static int CmdHelp(const char *Cmd);
 
-int usage_data_printdemodbuf(void)
-{
+int usage_data_printdemodbuf(void) {
     PrintAndLogEx(NORMAL, "Usage: data printdemodbuffer x o <offset> l <length>");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       h          This help");
@@ -27,8 +26,7 @@ int usage_data_printdemodbuf(void)
     PrintAndLogEx(NORMAL, "       l <length> enter length to print in # of bits or hex characters respectively");
     return 0;
 }
-int usage_data_manrawdecode(void)
-{
+int usage_data_manrawdecode(void) {
     PrintAndLogEx(NORMAL, "Usage:  data manrawdecode [invert] [maxErr]");
     PrintAndLogEx(NORMAL, "     Takes 10 and 01 and converts to 0 and 1 respectively");
     PrintAndLogEx(NORMAL, "     --must have binary sequence in demodbuffer (run data askrawdemod first)");
@@ -38,8 +36,7 @@ int usage_data_manrawdecode(void)
     PrintAndLogEx(NORMAL, "   Example: data manrawdecode   = decode manchester bitstream from the demodbuffer");
     return 0;
 }
-int usage_data_biphaserawdecode(void)
-{
+int usage_data_biphaserawdecode(void) {
     PrintAndLogEx(NORMAL, "Usage:  data biphaserawdecode [offset] [invert] [maxErr]");
     PrintAndLogEx(NORMAL, "     Converts 10 or 01 to 1 and 11 or 00 to 0");
     PrintAndLogEx(NORMAL, "     --must have binary sequence in demodbuffer (run data askrawdemod first)");
@@ -53,8 +50,7 @@ int usage_data_biphaserawdecode(void)
     PrintAndLogEx(NORMAL, "   Example: data biphaserawdecode 1 1 = decode biphase bitstream from the demodbuffer, set offset, and invert output");
     return 0;
 }
-int usage_data_rawdemod(void)
-{
+int usage_data_rawdemod(void) {
     PrintAndLogEx(NORMAL, "Usage:  data rawdemod [modulation] <help>|<options>");
     PrintAndLogEx(NORMAL, "   [modulation] as 2 char, 'ab' for ask/biphase, 'am' for ask/manchester, 'ar' for ask/raw, 'fs' for fsk, ...");
     PrintAndLogEx(NORMAL, "         'nr' for nrz/direct, 'p1' for psk1, 'p2' for psk2");
@@ -71,8 +67,7 @@ int usage_data_rawdemod(void)
     PrintAndLogEx(NORMAL, "          : data rawdemod p2           = demod GraphBuffer using: psk2 - autodetect");
     return 0;
 }
-int usage_data_rawdemod_am(void)
-{
+int usage_data_rawdemod_am(void) {
     PrintAndLogEx(NORMAL, "Usage:  data rawdemod am <s> [clock] <invert> [maxError] [maxLen] [amplify]");
     PrintAndLogEx(NORMAL, "     ['s'] optional, check for Sequence Terminator");
     PrintAndLogEx(NORMAL, "     [set clock as integer] optional, if not set, autodetect");
@@ -88,8 +83,7 @@ int usage_data_rawdemod_am(void)
     PrintAndLogEx(NORMAL, "          : data rawdemod am 64 1 0 = demod an ask/manchester tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors");
     return 0;
 }
-int usage_data_rawdemod_ab(void)
-{
+int usage_data_rawdemod_ab(void) {
     PrintAndLogEx(NORMAL, "Usage:  data rawdemod ab [offset] [clock] <invert> [maxError] [maxLen] <amplify>");
     PrintAndLogEx(NORMAL, "     [offset], offset to begin biphase, default=0");
     PrintAndLogEx(NORMAL, "     [set clock as integer] optional, if not set, autodetect");
@@ -112,8 +106,7 @@ int usage_data_rawdemod_ab(void)
     PrintAndLogEx(NORMAL, "          : data rawdemod ab 0 64 1 0 0 a = demod an ask/biph tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors, and amp");
     return 0;
 }
-int usage_data_rawdemod_ar(void)
-{
+int usage_data_rawdemod_ar(void) {
     PrintAndLogEx(NORMAL, "Usage:  data rawdemod ar [clock] <invert> [maxError] [maxLen] [amplify]");
     PrintAndLogEx(NORMAL, "     [set clock as integer] optional, if not set, autodetect");
     PrintAndLogEx(NORMAL, "     <invert>, 1 to invert output");
@@ -130,8 +123,7 @@ int usage_data_rawdemod_ar(void)
     PrintAndLogEx(NORMAL, "          : data rawdemod ar 64 1 0 0 a = demod an ask tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors, and amp");
     return 0;
 }
-int usage_data_rawdemod_fs(void)
-{
+int usage_data_rawdemod_fs(void) {
     PrintAndLogEx(NORMAL, "Usage:  data rawdemod fs [clock] <invert> [fchigh] [fclow]");
     PrintAndLogEx(NORMAL, "     [set clock as integer] optional, omit for autodetect.");
     PrintAndLogEx(NORMAL, "     <invert>, 1 for invert output, can be used even if the clock is omitted");
@@ -147,8 +139,7 @@ int usage_data_rawdemod_fs(void)
     PrintAndLogEx(NORMAL, "          : data rawdemod fs 50 1 10 8 = demod an fsk2a RF/50 tag from GraphBuffer");
     return 0;
 }
-int usage_data_rawdemod_nr(void)
-{
+int usage_data_rawdemod_nr(void) {
     PrintAndLogEx(NORMAL, "Usage:  data rawdemod nr [clock] <0|1> [maxError]");
     PrintAndLogEx(NORMAL, "     [set clock as integer] optional, if not set, autodetect.");
     PrintAndLogEx(NORMAL, "     <invert>, 1 for invert output");
@@ -161,8 +152,7 @@ int usage_data_rawdemod_nr(void)
     PrintAndLogEx(NORMAL, "          : data rawdemod nr 64 1 0 = demod a nrz/direct tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors");
     return 0;
 }
-int usage_data_rawdemod_p1(void)
-{
+int usage_data_rawdemod_p1(void) {
     PrintAndLogEx(NORMAL, "Usage:  data rawdemod p1 [clock] <0|1> [maxError]");
     PrintAndLogEx(NORMAL, "     [set clock as integer] optional, if not set, autodetect.");
     PrintAndLogEx(NORMAL, "     <invert>, 1 for invert output");
@@ -175,8 +165,7 @@ int usage_data_rawdemod_p1(void)
     PrintAndLogEx(NORMAL, "          : data rawdemod p1 64 1 0 = demod a psk1 tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors");
     return 0;
 }
-int usage_data_rawdemod_p2(void)
-{
+int usage_data_rawdemod_p2(void) {
     PrintAndLogEx(NORMAL, "Usage:  data rawdemod p2 [clock] <0|1> [maxError]");
     PrintAndLogEx(NORMAL, "     [set clock as integer] optional, if not set, autodetect.");
     PrintAndLogEx(NORMAL, "     <invert>, 1 for invert output");
@@ -189,8 +178,7 @@ int usage_data_rawdemod_p2(void)
     PrintAndLogEx(NORMAL, "          : data rawdemod p2 64 1 0  = demod a psk2 tag from GraphBuffer using a clock of RF/64, inverting output and allowing 0 demod errors");
     return 0;
 }
-int usage_data_autocorr(void)
-{
+int usage_data_autocorr(void) {
     PrintAndLogEx(NORMAL, "Autocorrelate is used to detect repeating sequences. We use it as detection of length in bits a message inside the signal is");
     PrintAndLogEx(NORMAL, "Usage: data autocorr w <window> [g]");
     PrintAndLogEx(NORMAL, "Options:");
@@ -199,8 +187,7 @@ int usage_data_autocorr(void)
     PrintAndLogEx(NORMAL, "       g              save back to GraphBuffer (overwrite)");
     return 0;
 }
-int usage_data_undecimate(void)
-{
+int usage_data_undecimate(void) {
     PrintAndLogEx(NORMAL, "Usage: data undec [factor]");
     PrintAndLogEx(NORMAL, "This function performs un-decimation, by repeating each sample N times");
     PrintAndLogEx(NORMAL, "Options:");
@@ -209,8 +196,7 @@ int usage_data_undecimate(void)
     PrintAndLogEx(NORMAL, "Example: 'data undec 3'");
     return 0;
 }
-int usage_data_detectclock(void)
-{
+int usage_data_detectclock(void) {
     PrintAndLogEx(NORMAL, "Usage:  data detectclock [modulation] <clock>");
     PrintAndLogEx(NORMAL, "     [modulation as char], specify the modulation type you want to detect the clock of");
     PrintAndLogEx(NORMAL, "     <clock>             , specify the clock (optional - to get best start position only)");
@@ -222,28 +208,24 @@ int usage_data_detectclock(void)
     PrintAndLogEx(NORMAL, "            data detectclock n    = detect the clock of an nrz/direct modulated wave in the GraphBuffer");
     return 0;
 }
-int usage_data_hex2bin(void)
-{
+int usage_data_hex2bin(void) {
     PrintAndLogEx(NORMAL, "Usage: data hex2bin <hex_digits>");
     PrintAndLogEx(NORMAL, "       This function will ignore all non-hexadecimal characters (but stop reading on whitespace)");
     return 0;
 }
-int usage_data_bin2hex(void)
-{
+int usage_data_bin2hex(void) {
     PrintAndLogEx(NORMAL, "Usage: data bin2hex <binary_digits>");
     PrintAndLogEx(NORMAL, "       This function will ignore all characters not 1 or 0 (but stop reading on whitespace)");
     return 0;
 }
-int usage_data_buffclear(void)
-{
+int usage_data_buffclear(void) {
     PrintAndLogEx(NORMAL, "This function clears the bigbuff on deviceside");
     PrintAndLogEx(NORMAL, "Usage: data buffclear [h]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       h              This help");
     return 0;
 }
-int usage_data_fsktonrz()
-{
+int usage_data_fsktonrz() {
     PrintAndLogEx(NORMAL, "Usage: data fsktonrz c <clock> l <fc_low> f <fc_high>");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       h            This help");
@@ -255,8 +237,7 @@ int usage_data_fsktonrz()
 
 //set the demod buffer with given array of binary (one bit per byte)
 //by marshmellow
-void setDemodBuf(uint8_t *buf, size_t size, size_t start_idx)
-{
+void setDemodBuf(uint8_t *buf, size_t size, size_t start_idx) {
     if (buf == NULL) return;
 
     if (size > MAX_DEMOD_BUF_LEN - start_idx)
@@ -268,8 +249,7 @@ void setDemodBuf(uint8_t *buf, size_t size, size_t start_idx)
     DemodBufferLen = size;
 }
 
-bool getDemodBuf(uint8_t *buf, size_t *size)
-{
+bool getDemodBuf(uint8_t *buf, size_t *size) {
     if (buf == NULL) return false;
     if (size == NULL) return false;
     if (*size == 0) return false;
@@ -282,41 +262,35 @@ bool getDemodBuf(uint8_t *buf, size_t *size)
 
 // include <math.h>
 // Root mean square
-double rms(double *v, size_t n)
-{
+double rms(double *v, size_t n) {
     double sum = 0.0;
     for (size_t i = 0; i < n; i++)
         sum += v[i] * v[i];
     return sqrt(sum / n);
 }
-int cmp_int(const void *a, const void *b)
-{
+int cmp_int(const void *a, const void *b) {
     if (*(const int *)a < * (const int *)b)
         return -1;
     else
         return *(const int *)a > *(const int *)b;
 }
-int cmp_uint8(const void *a, const void *b)
-{
+int cmp_uint8(const void *a, const void *b) {
     if (*(const uint8_t *)a < * (const uint8_t *)b)
         return -1;
     else
         return *(const uint8_t *)a > *(const uint8_t *)b;
 }
 // Median of a array of values
-double median_int(int *src, size_t size)
-{
+double median_int(int *src, size_t size) {
     qsort(src, size, sizeof(int), cmp_int);
     return 0.5 * (src[size / 2] + src[(size - 1) / 2]);
 }
-double median_uint8(uint8_t *src, size_t size)
-{
+double median_uint8(uint8_t *src, size_t size) {
     qsort(src, size, sizeof(uint8_t), cmp_uint8);
     return 0.5 * (src[size / 2] + src[(size - 1) / 2]);
 }
 // function to compute mean for a series
-static double compute_mean(const int *data, size_t n)
-{
+static double compute_mean(const int *data, size_t n) {
     double mean = 0.0;
     for (size_t i = 0; i < n; i++)
         mean += data[i];
@@ -325,8 +299,7 @@ static double compute_mean(const int *data, size_t n)
 }
 
 //  function to compute variance for a series
-static double compute_variance(const int *data, size_t n)
-{
+static double compute_variance(const int *data, size_t n) {
     double variance = 0.0;
     double mean = compute_mean(data, n);
 
@@ -362,8 +335,7 @@ static double compute_autoc(const int *data, size_t n, int lag) {
 */
 
 // option '1' to save DemodBuffer any other to restore
-void save_restoreDB(uint8_t saveOpt)
-{
+void save_restoreDB(uint8_t saveOpt) {
     static uint8_t SavedDB[MAX_DEMOD_BUF_LEN];
     static size_t SavedDBlen;
     static bool DB_Saved = false;
@@ -386,8 +358,7 @@ void save_restoreDB(uint8_t saveOpt)
     }
 }
 
-int CmdSetDebugMode(const char *Cmd)
-{
+int CmdSetDebugMode(const char *Cmd) {
     int demod = 0;
     sscanf(Cmd, "%i", &demod);
     g_debugMode = (uint8_t)demod;
@@ -396,8 +367,7 @@ int CmdSetDebugMode(const char *Cmd)
 
 //by marshmellow
 // max output to 512 bits if we have more - should be plenty
-void printDemodBuff(void)
-{
+void printDemodBuff(void) {
     int len = DemodBufferLen;
     if (len < 1) {
         PrintAndLogEx(NORMAL, "(printDemodBuff) no bits found in demod buffer");
@@ -408,8 +378,7 @@ void printDemodBuff(void)
     PrintAndLogEx(NORMAL, "%s", sprint_bin_break(DemodBuffer, len, 16));
 }
 
-int CmdPrintDemodBuff(const char *Cmd)
-{
+int CmdPrintDemodBuff(const char *Cmd) {
     char hex[512] = {0x00};
     bool hexMode = false;
     bool errors = false;
@@ -466,8 +435,7 @@ int CmdPrintDemodBuff(const char *Cmd)
 
 //by marshmellow
 //this function strictly converts >1 to 1 and <1 to 0 for each sample in the graphbuffer
-int CmdGetBitStream(const char *Cmd)
-{
+int CmdGetBitStream(const char *Cmd) {
     CmdHpf(Cmd);
     for (uint32_t i = 0; i < GraphTraceLen; i++)
         GraphBuffer[i] = (GraphBuffer[i] >= 1) ? 1 : 0;
@@ -482,8 +450,7 @@ int CmdGetBitStream(const char *Cmd)
 //verbose will print results and demoding messages
 //emSearch will auto search for EM410x format in bitstream
 //askType switches decode: ask/raw = 0, ask/manchester = 1
-int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType, bool *stCheck)
-{
+int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType, bool *stCheck) {
     int invert = 0;
     int clk = 0;
     int maxErr = 100;
@@ -569,8 +536,7 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
 
     return 1;
 }
-int ASKDemod(const char *Cmd, bool verbose, bool emSearch, uint8_t askType)
-{
+int ASKDemod(const char *Cmd, bool verbose, bool emSearch, uint8_t askType) {
     bool st = false;
     return ASKDemod_ext(Cmd, verbose, emSearch, askType, &st);
 }
@@ -579,8 +545,7 @@ int ASKDemod(const char *Cmd, bool verbose, bool emSearch, uint8_t askType)
 //takes 5 arguments - clock, invert, maxErr, maxLen as integers and amplify as char == 'a'
 //attempts to demodulate ask while decoding manchester
 //prints binary found and saves in graphbuffer for further commands
-int Cmdaskmandemod(const char *Cmd)
-{
+int Cmdaskmandemod(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) > 45 || cmdp == 'h') return usage_data_rawdemod_am();
 
@@ -596,8 +561,7 @@ int Cmdaskmandemod(const char *Cmd)
 //by marshmellow
 //manchester decode
 //stricktly take 10 and 01 and convert to 0 and 1
-int Cmdmandecoderaw(const char *Cmd)
-{
+int Cmdmandecoderaw(const char *Cmd) {
     size_t size = 0;
     int high = 0, low = 0;
     int i = 0, errCnt = 0, invert = 0, maxErr = 20;
@@ -652,8 +616,7 @@ int Cmdmandecoderaw(const char *Cmd)
 //takes 2 arguments "offset" default = 0 if 1 it will shift the decode by one bit
 // and "invert" default = 0 if 1 it will invert output
 //  the argument offset allows us to manually shift if the output is incorrect - [EDIT: now auto detects]
-int CmdBiphaseDecodeRaw(const char *Cmd)
-{
+int CmdBiphaseDecodeRaw(const char *Cmd) {
     size_t size = 0;
     int offset = 0, invert = 0, maxErr = 20, errCnt = 0;
     char cmdp = tolower(param_getchar(Cmd, 0));
@@ -695,8 +658,7 @@ int CmdBiphaseDecodeRaw(const char *Cmd)
 
 //by marshmellow
 // - ASK Demod then Biphase decode GraphBuffer samples
-int ASKbiphaseDemod(const char *Cmd, bool verbose)
-{
+int ASKbiphaseDemod(const char *Cmd, bool verbose) {
     //ask raw demod GraphBuffer first
     int offset = 0, clk = 0, invert = 0, maxErr = 0;
     sscanf(Cmd, "%i %i %i %i", &offset, &clk, &invert, &maxErr);
@@ -735,8 +697,7 @@ int ASKbiphaseDemod(const char *Cmd, bool verbose)
     return 1;
 }
 //by marshmellow - see ASKbiphaseDemod
-int Cmdaskbiphdemod(const char *Cmd)
-{
+int Cmdaskbiphdemod(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) > 25 || cmdp == 'h') return usage_data_rawdemod_ab();
 
@@ -744,16 +705,14 @@ int Cmdaskbiphdemod(const char *Cmd)
 }
 
 //by marshmellow - see ASKDemod
-int Cmdaskrawdemod(const char *Cmd)
-{
+int Cmdaskrawdemod(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) > 25 || cmdp == 'h') return usage_data_rawdemod_ar();
 
     return ASKDemod(Cmd, true, false, 0);
 }
 
-int AutoCorrelate(const int *in, int *out, size_t len, int window, bool SaveGrph, bool verbose)
-{
+int AutoCorrelate(const int *in, int *out, size_t len, int window, bool SaveGrph, bool verbose) {
     // sanity check
     if (window > len) window = len;
 
@@ -839,8 +798,7 @@ int AutoCorrelate(const int *in, int *out, size_t len, int window, bool SaveGrph
     return retval;
 }
 
-int CmdAutoCorr(const char *Cmd)
-{
+int CmdAutoCorr(const char *Cmd) {
 
     uint32_t window = 4000;
     uint8_t cmdp = 0;
@@ -875,8 +833,7 @@ int CmdAutoCorr(const char *Cmd)
     return AutoCorrelate(GraphBuffer, GraphBuffer, GraphTraceLen, window, updateGrph, true);
 }
 
-int CmdBitsamples(const char *Cmd)
-{
+int CmdBitsamples(const char *Cmd) {
     int cnt = 0;
     uint8_t got[12288];
 
@@ -898,8 +855,7 @@ int CmdBitsamples(const char *Cmd)
     return 0;
 }
 
-int CmdBuffClear(const char *Cmd)
-{
+int CmdBuffClear(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_data_buffclear();
 
@@ -910,8 +866,7 @@ int CmdBuffClear(const char *Cmd)
     return 0;
 }
 
-int CmdDec(const char *Cmd)
-{
+int CmdDec(const char *Cmd) {
     for (int i = 0; i < (GraphTraceLen / 2); ++i)
         GraphBuffer[i] = GraphBuffer[i * 2];
     GraphTraceLen /= 2;
@@ -926,8 +881,7 @@ int CmdDec(const char *Cmd)
  * @param Cmd
  * @return
  */
-int CmdUndec(const char *Cmd)
-{
+int CmdUndec(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_data_undecimate();
 
@@ -952,8 +906,7 @@ int CmdUndec(const char *Cmd)
 
 //by marshmellow
 //shift graph zero up or down based on input + or -
-int CmdGraphShiftZero(const char *Cmd)
-{
+int CmdGraphShiftZero(const char *Cmd) {
     int shift = 0, shiftedVal = 0;
     //set options from parameters entered with the command
     sscanf(Cmd, "%i", &shift);
@@ -974,8 +927,7 @@ int CmdGraphShiftZero(const char *Cmd)
     return 0;
 }
 
-int AskEdgeDetect(const int *in, int *out, int len, int threshold)
-{
+int AskEdgeDetect(const int *in, int *out, int len, int threshold) {
     int last = 0;
     for (int i = 1; i < len; i++) {
         if (in[i] - in[i - 1] >= threshold) //large jump up
@@ -991,8 +943,7 @@ int AskEdgeDetect(const int *in, int *out, int len, int threshold)
 //use large jumps in read samples to identify edges of waves and then amplify that wave to max
 //similar to dirtheshold, threshold commands
 //takes a threshold length which is the measured length between two samples then determines an edge
-int CmdAskEdgeDetect(const char *Cmd)
-{
+int CmdAskEdgeDetect(const char *Cmd) {
     int thresLen = 25;
     int ans = 0;
     sscanf(Cmd, "%i", &thresLen);
@@ -1005,8 +956,7 @@ int CmdAskEdgeDetect(const char *Cmd)
 /* Print our clock rate */
 // uses data from graphbuffer
 // adjusted to take char parameter for type of modulation to find the clock - by marshmellow.
-int CmdDetectClockRate(const char *Cmd)
-{
+int CmdDetectClockRate(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) > 6 || strlen(Cmd) == 0 || cmdp == 'h')
         return usage_data_detectclock();
@@ -1033,8 +983,7 @@ int CmdDetectClockRate(const char *Cmd)
     return clock;
 }
 
-char *GetFSKType(uint8_t fchigh, uint8_t fclow, uint8_t invert)
-{
+char *GetFSKType(uint8_t fchigh, uint8_t fclow, uint8_t invert) {
     static char fType[8];
     memset(fType, 0x00, 8);
     char *fskType = fType;
@@ -1063,8 +1012,7 @@ char *GetFSKType(uint8_t fchigh, uint8_t fclow, uint8_t invert)
 //fsk raw demod and print binary
 //takes 4 arguments - Clock, invert, fchigh, fclow
 //defaults: clock = 50, invert=1, fchigh=10, fclow=8 (RF/10 RF/8 (fsk2a))
-int FSKrawDemod(const char *Cmd, bool verbose)
-{
+int FSKrawDemod(const char *Cmd, bool verbose) {
     //raw fsk demod  no manchester decoding no start bit finding just get binary from wave
     uint8_t rfLen, invert, fchigh, fclow;
 
@@ -1130,8 +1078,7 @@ int FSKrawDemod(const char *Cmd, bool verbose)
 //fsk raw demod and print binary
 //takes 4 arguments - Clock, invert, fchigh, fclow
 //defaults: clock = 50, invert=1, fchigh=10, fclow=8 (RF/10 RF/8 (fsk2a))
-int CmdFSKrawdemod(const char *Cmd)
-{
+int CmdFSKrawdemod(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) > 20 || cmdp == 'h') return usage_data_rawdemod_fs();
 
@@ -1140,8 +1087,7 @@ int CmdFSKrawdemod(const char *Cmd)
 
 //by marshmellow
 //attempt to psk1 demod graph buffer
-int PSKDemod(const char *Cmd, bool verbose)
-{
+int PSKDemod(const char *Cmd, bool verbose) {
     int invert = 0, clk = 0, maxErr = 100;
     sscanf(Cmd, "%i %i %i", &clk, &invert, &maxErr);
     if (clk == 1) {
@@ -1182,8 +1128,7 @@ int PSKDemod(const char *Cmd, bool verbose)
     return 1;
 }
 
-int CmdPSKIdteck(const char *Cmd)
-{
+int CmdPSKIdteck(const char *Cmd) {
 
     if (!PSKDemod("", false)) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - Idteck PSKDemod failed");
@@ -1247,8 +1192,7 @@ int CmdPSKIdteck(const char *Cmd)
 // takes 3 arguments - clock, invert, maxErr as integers
 // attempts to demodulate nrz only
 // prints binary found and saves in demodbuffer for further commands
-int NRZrawDemod(const char *Cmd, bool verbose)
-{
+int NRZrawDemod(const char *Cmd, bool verbose) {
 
     int errCnt = 0, clkStartIdx = 0;
     int invert = 0, clk = 0, maxErr = 100;
@@ -1295,8 +1239,7 @@ int NRZrawDemod(const char *Cmd, bool verbose)
     return 1;
 }
 
-int CmdNRZrawDemod(const char *Cmd)
-{
+int CmdNRZrawDemod(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) > 16 || cmdp == 'h') return usage_data_rawdemod_nr();
 
@@ -1307,8 +1250,7 @@ int CmdNRZrawDemod(const char *Cmd)
 // takes 3 arguments - clock, invert, maxErr as integers
 // attempts to demodulate psk only
 // prints binary found and saves in demodbuffer for further commands
-int CmdPSK1rawDemod(const char *Cmd)
-{
+int CmdPSK1rawDemod(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) > 16 || cmdp == 'h') return usage_data_rawdemod_p1();
 
@@ -1326,8 +1268,7 @@ int CmdPSK1rawDemod(const char *Cmd)
 
 // by marshmellow
 // takes same args as cmdpsk1rawdemod
-int CmdPSK2rawDemod(const char *Cmd)
-{
+int CmdPSK2rawDemod(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) > 16 || cmdp == 'h') return usage_data_rawdemod_p2();
 
@@ -1344,8 +1285,7 @@ int CmdPSK2rawDemod(const char *Cmd)
 }
 
 // by marshmellow - combines all raw demod functions into one menu command
-int CmdRawDemod(const char *Cmd)
-{
+int CmdRawDemod(const char *Cmd) {
     int ans = 0;
 
     if (strlen(Cmd) > 35 || strlen(Cmd) < 2)
@@ -1365,8 +1305,7 @@ int CmdRawDemod(const char *Cmd)
     return ans;
 }
 
-void setClockGrid(int clk, int offset)
-{
+void setClockGrid(int clk, int offset) {
     g_DemodStartIdx = offset;
     g_DemodClock = clk;
     PrintAndLogEx(DEBUG, "DEBUG: (setClockGrid) demodoffset %d, clk %d", offset, clk);
@@ -1390,8 +1329,7 @@ void setClockGrid(int clk, int offset)
     }
 }
 
-int CmdGrid(const char *Cmd)
-{
+int CmdGrid(const char *Cmd) {
     sscanf(Cmd, "%i %i", &PlotGridX, &PlotGridY);
     PlotGridXdefault = PlotGridX;
     PlotGridYdefault = PlotGridY;
@@ -1399,15 +1337,13 @@ int CmdGrid(const char *Cmd)
     return 0;
 }
 
-int CmdSetGraphMarkers(const char *Cmd)
-{
+int CmdSetGraphMarkers(const char *Cmd) {
     sscanf(Cmd, "%i %i", &CursorCPos, &CursorDPos);
     RepaintGraphWindow();
     return 0;
 }
 
-int CmdHexsamples(const char *Cmd)
-{
+int CmdHexsamples(const char *Cmd) {
     int i, j, requested = 0, offset = 0;
     char string_buf[25];
     char *string_ptr = string_buf;
@@ -1449,15 +1385,13 @@ int CmdHexsamples(const char *Cmd)
     return 0;
 }
 
-int CmdHide(const char *Cmd)
-{
+int CmdHide(const char *Cmd) {
     HideGraphWindow();
     return 0;
 }
 
 //zero mean GraphBuffer
-int CmdHpf(const char *Cmd)
-{
+int CmdHpf(const char *Cmd) {
     uint8_t bits[GraphTraceLen];
     size_t size = getFromGraphBuf(bits);
     removeSignalOffset(bits, size);
@@ -1470,15 +1404,13 @@ int CmdHpf(const char *Cmd)
     return 0;
 }
 
-bool _headBit(BitstreamOut *stream)
-{
+bool _headBit(BitstreamOut *stream) {
     int bytepos = stream->position >> 3; // divide by 8
     int bitpos = (stream->position++) & 7; // mask out 00000111
     return (*(stream->buffer + bytepos) >> (7 - bitpos)) & 1;
 }
 
-uint8_t getByte(uint8_t bits_per_sample, BitstreamOut *b)
-{
+uint8_t getByte(uint8_t bits_per_sample, BitstreamOut *b) {
     uint8_t val = 0;
     for (int i = 0 ; i < bits_per_sample; i++)
         val |= (_headBit(b) << (7 - i));
@@ -1486,8 +1418,7 @@ uint8_t getByte(uint8_t bits_per_sample, BitstreamOut *b)
     return val;
 }
 
-int getSamples(int n, bool silent)
-{
+int getSamples(int n, bool silent) {
     //If we get all but the last byte in bigbuf,
     // we don't have to worry about remaining trash
     // in the last byte in case the bits-per-sample
@@ -1548,14 +1479,12 @@ int getSamples(int n, bool silent)
     return 0;
 }
 
-int CmdSamples(const char *Cmd)
-{
+int CmdSamples(const char *Cmd) {
     int n = strtol(Cmd, NULL, 0);
     return getSamples(n, false);
 }
 
-int CmdTuneSamples(const char *Cmd)
-{
+int CmdTuneSamples(const char *Cmd) {
 #define NON_VOLTAGE     1000
 #define LF_UNUSABLE_V   2000
 #define LF_MARGINAL_V   10000
@@ -1654,8 +1583,7 @@ int CmdTuneSamples(const char *Cmd)
     return 0;
 }
 
-int CmdLoad(const char *Cmd)
-{
+int CmdLoad(const char *Cmd) {
     char filename[FILE_PATH_SIZE] = {0x00};
     int len = 0;
 
@@ -1698,8 +1626,7 @@ int CmdLoad(const char *Cmd)
 }
 
 // trim graph from the end
-int CmdLtrim(const char *Cmd)
-{
+int CmdLtrim(const char *Cmd) {
     // sanitycheck
     if (GraphTraceLen <= 0) return 1;
 
@@ -1713,8 +1640,7 @@ int CmdLtrim(const char *Cmd)
 }
 
 // trim graph from the beginning
-int CmdRtrim(const char *Cmd)
-{
+int CmdRtrim(const char *Cmd) {
 
     int ds = atoi(Cmd);
 
@@ -1727,8 +1653,7 @@ int CmdRtrim(const char *Cmd)
 }
 
 // trim graph (middle) piece
-int CmdMtrim(const char *Cmd)
-{
+int CmdMtrim(const char *Cmd) {
     int start = 0, stop = 0;
     sscanf(Cmd, "%i %i", &start, &stop);
 
@@ -1744,8 +1669,7 @@ int CmdMtrim(const char *Cmd)
     return 0;
 }
 
-int CmdNorm(const char *Cmd)
-{
+int CmdNorm(const char *Cmd) {
     int i;
     int max = INT_MIN, min = INT_MAX;
 
@@ -1771,14 +1695,12 @@ int CmdNorm(const char *Cmd)
     return 0;
 }
 
-int CmdPlot(const char *Cmd)
-{
+int CmdPlot(const char *Cmd) {
     ShowGraphWindow();
     return 0;
 }
 
-int CmdSave(const char *Cmd)
-{
+int CmdSave(const char *Cmd) {
 
     int len = 0;
     char filename[FILE_PATH_SIZE] = {0x00};
@@ -1803,8 +1725,7 @@ int CmdSave(const char *Cmd)
     return 0;
 }
 
-int CmdScale(const char *Cmd)
-{
+int CmdScale(const char *Cmd) {
     CursorScaleFactor = atoi(Cmd);
     if (CursorScaleFactor == 0) {
         PrintAndLogEx(FAILED, "bad, can't have zero scale");
@@ -1814,8 +1735,7 @@ int CmdScale(const char *Cmd)
     return 0;
 }
 
-int directionalThreshold(const int *in, int *out, size_t len, int8_t up, int8_t down)
-{
+int directionalThreshold(const int *in, int *out, size_t len, int8_t up, int8_t down) {
 
     int lastValue = in[0];
 
@@ -1844,8 +1764,7 @@ int directionalThreshold(const int *in, int *out, size_t len, int8_t up, int8_t
     return 0;
 }
 
-int CmdDirectionalThreshold(const char *Cmd)
-{
+int CmdDirectionalThreshold(const char *Cmd) {
     int8_t up = param_get8(Cmd, 0);
     int8_t down = param_get8(Cmd, 1);
 
@@ -1863,8 +1782,7 @@ int CmdDirectionalThreshold(const char *Cmd)
     return 0;
 }
 
-int CmdZerocrossings(const char *Cmd)
-{
+int CmdZerocrossings(const char *Cmd) {
     // Zero-crossings aren't meaningful unless the signal is zero-mean.
     CmdHpf("");
 
@@ -1900,8 +1818,7 @@ int CmdZerocrossings(const char *Cmd)
  * @param Cmd
  * @return
  */
-int Cmdbin2hex(const char *Cmd)
-{
+int Cmdbin2hex(const char *Cmd) {
     int bg = 0, en = 0;
     if (param_getptr(Cmd, &bg, &en, 0))
         return usage_data_bin2hex();
@@ -1931,8 +1848,7 @@ int Cmdbin2hex(const char *Cmd)
     return 0;
 }
 
-int Cmdhex2bin(const char *Cmd)
-{
+int Cmdhex2bin(const char *Cmd) {
     int bg = 0, en = 0;
     if (param_getptr(Cmd, &bg, &en, 0)) return usage_data_hex2bin();
 
@@ -1976,8 +1892,7 @@ static const int HighTone[] = {
 1,  1,  1,  1,     -1, -1, -1, -1, -1, // note one extra -1 to padd due to 50/8 remainder
 };
 */
-void GetHiLoTone(int *LowTone, int *HighTone, int clk, int LowToneFC, int HighToneFC)
-{
+void GetHiLoTone(int *LowTone, int *HighTone, int clk, int LowToneFC, int HighToneFC) {
     int i, j = 0;
     int Left_Modifier = ((clk % LowToneFC) % 2) + ((clk % LowToneFC) / 2);
     int Right_Modifier = (clk % LowToneFC) / 2;
@@ -2040,8 +1955,7 @@ void GetHiLoTone(int *LowTone, int *HighTone, int clk, int LowToneFC, int HighTo
 
 //old CmdFSKdemod adapted by marshmellow
 //converts FSK to clear NRZ style wave.  (or demodulates)
-int FSKToNRZ(int *data, int *dataLen, int clk, int LowToneFC, int HighToneFC)
-{
+int FSKToNRZ(int *data, int *dataLen, int clk, int LowToneFC, int HighToneFC) {
     uint8_t ans = 0;
     if (clk == 0 || LowToneFC == 0 || HighToneFC == 0) {
         int firstClockEdge = 0;
@@ -2102,8 +2016,7 @@ int FSKToNRZ(int *data, int *dataLen, int clk, int LowToneFC, int HighToneFC)
     return 0;
 }
 
-int CmdFSKToNRZ(const char *Cmd)
-{
+int CmdFSKToNRZ(const char *Cmd) {
     // take clk, fc_low, fc_high
     //   blank = auto;
     bool errors = false;
@@ -2143,8 +2056,7 @@ int CmdFSKToNRZ(const char *Cmd)
     return ans;
 }
 
-int CmdDataIIR(const char *Cmd)
-{
+int CmdDataIIR(const char *Cmd) {
     uint8_t k = param_get8(Cmd, 0);
     //iceIIR_Butterworth(GraphBuffer, GraphTraceLen);
     iceSimple_Filter(GraphBuffer, GraphTraceLen, k);
@@ -2198,15 +2110,13 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdData(const char *Cmd)
-{
+int CmdData(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdflashmem.c b/client/cmdflashmem.c
index 68faf826e..0701f1d2d 100644
--- a/client/cmdflashmem.c
+++ b/client/cmdflashmem.c
@@ -26,8 +26,7 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_flashmem_spibaud(void)
-{
+int usage_flashmem_spibaud(void) {
     PrintAndLogEx(NORMAL, "Usage:  mem spibaud [h] <baudrate>");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "           h    this help");
@@ -41,8 +40,7 @@ int usage_flashmem_spibaud(void)
     return 0;
 }
 
-int usage_flashmem_read(void)
-{
+int usage_flashmem_read(void) {
     PrintAndLogEx(NORMAL, "Read flash memory on device");
     PrintAndLogEx(NORMAL, "Usage:  mem read o <offset> l <len>");
     PrintAndLogEx(NORMAL, "  o <offset>    :      offset in memory");
@@ -53,8 +51,7 @@ int usage_flashmem_read(void)
     PrintAndLogEx(NORMAL, "        mem read o 1024 l 10"); // read 10 bytes starting at offset 1024
     return 0;
 }
-int usage_flashmem_load(void)
-{
+int usage_flashmem_load(void) {
     PrintAndLogEx(NORMAL, "Loads binary file into flash memory on device");
     PrintAndLogEx(NORMAL, "Usage:  mem load o <offset> f <file name> m t i");
     PrintAndLogEx(NORMAL, "  o <offset>    :      offset in memory");
@@ -71,8 +68,7 @@ int usage_flashmem_load(void)
     PrintAndLogEx(NORMAL, "        mem load f default_iclass_keys i");
     return 0;
 }
-int usage_flashmem_save(void)
-{
+int usage_flashmem_save(void) {
     PrintAndLogEx(NORMAL, "Saves flash memory on device into the file");
     PrintAndLogEx(NORMAL, " Usage:  mem save o <offset> l <length> f <file name>");
     PrintAndLogEx(NORMAL, "  o <offset>    :      offset in memory");
@@ -85,8 +81,7 @@ int usage_flashmem_save(void)
     PrintAndLogEx(NORMAL, "        mem save f myfile o 1024 l 4096");   // downlowd 4096 bytes from offset 1024 to file myfile
     return 0;
 }
-int usage_flashmem_wipe(void)
-{
+int usage_flashmem_wipe(void) {
 
     PrintAndLogEx(WARNING, "[OBS] use with caution.");
     PrintAndLogEx(NORMAL, "Wipe flash memory on device, which fills memory with 0xFF\n");
@@ -100,8 +95,7 @@ int usage_flashmem_wipe(void)
     PrintAndLogEx(NORMAL, "        mem wipe p 0");  // wipes first page.
     return 0;
 }
-int usage_flashmem_info(void)
-{
+int usage_flashmem_info(void) {
     PrintAndLogEx(NORMAL, "Collect signature and verify it from flash memory\n");
     PrintAndLogEx(NORMAL, " Usage:  mem info [h|s|w]");
     PrintAndLogEx(NORMAL, "  s    :      create a signature");
@@ -113,8 +107,7 @@ int usage_flashmem_info(void)
     return 0;
 }
 
-int CmdFlashMemRead(const char *Cmd)
-{
+int CmdFlashMemRead(const char *Cmd) {
 
     uint8_t cmdp = 0;
     bool errors = false;
@@ -153,8 +146,7 @@ int CmdFlashMemRead(const char *Cmd)
     return 0;
 }
 
-int CmdFlashmemSpiBaudrate(const char *Cmd)
-{
+int CmdFlashmemSpiBaudrate(const char *Cmd) {
 
     char ctmp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) < 1 || ctmp == 'h') return usage_flashmem_spibaud();
@@ -166,8 +158,7 @@ int CmdFlashmemSpiBaudrate(const char *Cmd)
     return 0;
 }
 
-int CmdFlashMemLoad(const char *Cmd)
-{
+int CmdFlashMemLoad(const char *Cmd) {
 
     uint32_t start_index = 0;
     char filename[FILE_PATH_SIZE] = {0};
@@ -304,8 +295,7 @@ int CmdFlashMemLoad(const char *Cmd)
     PrintAndLogEx(SUCCESS, "Wrote %u bytes to offset %u", datalen, start_index);
     return 0;
 }
-int CmdFlashMemSave(const char *Cmd)
-{
+int CmdFlashMemSave(const char *Cmd) {
 
     char filename[FILE_PATH_SIZE] = {0};
     uint8_t cmdp = 0;
@@ -361,8 +351,7 @@ int CmdFlashMemSave(const char *Cmd)
     free(dump);
     return 0;
 }
-int CmdFlashMemWipe(const char *Cmd)
-{
+int CmdFlashMemWipe(const char *Cmd) {
 
     uint8_t cmdp = 0;
     bool errors = false;
@@ -411,8 +400,7 @@ int CmdFlashMemWipe(const char *Cmd)
 
     return 0;
 }
-int CmdFlashMemInfo(const char *Cmd)
-{
+int CmdFlashMemInfo(const char *Cmd) {
 
     uint8_t sha_hash[20] = {0};
     mbedtls_rsa_context rsa;
@@ -612,15 +600,13 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdFlashMem(const char *Cmd)
-{
+int CmdFlashMem(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdhf.c b/client/cmdhf.c
index a076d4e6d..294dc4be9 100644
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -12,8 +12,7 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_hf_search()
-{
+int usage_hf_search() {
     PrintAndLogEx(NORMAL, "Usage: hf search");
     PrintAndLogEx(NORMAL, "Will try to find a HF read out of the unknown tag. Stops when found.");
     PrintAndLogEx(NORMAL, "Options:");
@@ -21,8 +20,7 @@ int usage_hf_search()
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
-int usage_hf_snoop()
-{
+int usage_hf_snoop() {
     PrintAndLogEx(NORMAL, "Usage: hf snoop <skip pairs> <skip triggers>");
     PrintAndLogEx(NORMAL, "The high frequence snoop will assign all available memory on device for snooped data");
     PrintAndLogEx(NORMAL, "User the 'data samples' command to download from device,  and 'data plot' to look at it");
@@ -38,8 +36,7 @@ int usage_hf_snoop()
     return 0;
 }
 
-int CmdHFSearch(const char *Cmd)
-{
+int CmdHFSearch(const char *Cmd) {
 
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_hf_search();
@@ -88,8 +85,7 @@ int CmdHFSearch(const char *Cmd)
     return 0;
 }
 
-int CmdHFTune(const char *Cmd)
-{
+int CmdHFTune(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "Measuring HF antenna, press button to exit");
     UsbCommand c = {CMD_MEASURE_ANTENNA_TUNING_HF};
     clearCommandBuffer();
@@ -97,8 +93,7 @@ int CmdHFTune(const char *Cmd)
     return 0;
 }
 
-int CmdHFSnoop(const char *Cmd)
-{
+int CmdHFSnoop(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_hf_snoop();
 
@@ -133,15 +128,13 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdHF(const char *Cmd)
-{
+int CmdHF(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 89e88232b..6d4b39e4e 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -136,8 +136,7 @@ static const manufactureName manufactureMapping[] = {
 // get a product description based on the UID
 //  uid[8] tag uid
 // returns description of the best match
-char *getTagInfo(uint8_t uid)
-{
+char *getTagInfo(uint8_t uid) {
 
     int i;
     int len = sizeof(manufactureMapping) / sizeof(manufactureName);
@@ -154,8 +153,7 @@ char *getTagInfo(uint8_t uid)
 static uint16_t frameLength = 0;
 uint16_t atsFSC[] = {16, 24, 32, 40, 48, 64, 96, 128, 256};
 
-int usage_hf_14a_sim(void)
-{
+int usage_hf_14a_sim(void) {
 //  PrintAndLogEx(NORMAL, "\n Emulating ISO/IEC 14443 type A tag with 4,7 or 10 byte UID\n");
     PrintAndLogEx(NORMAL, "\n Emulating ISO/IEC 14443 type A tag with 4,7 byte UID\n");
     PrintAndLogEx(NORMAL, "Usage: hf 14a sim [h] t <type> u <uid> [x] [e] [v]");
@@ -182,8 +180,7 @@ int usage_hf_14a_sim(void)
 //  PrintAndLogEx(NORMAL, "          hf 14a sim t 1 u 11223445566778899AA\n");
     return 0;
 }
-int usage_hf_14a_sniff(void)
-{
+int usage_hf_14a_sniff(void) {
     PrintAndLogEx(NORMAL, "It get data from the field and saves it into command buffer.");
     PrintAndLogEx(NORMAL, "Buffer accessible from command 'hf list 14a'");
     PrintAndLogEx(NORMAL, "Usage:  hf 14a sniff [c][r]");
@@ -193,8 +190,7 @@ int usage_hf_14a_sniff(void)
     PrintAndLogEx(NORMAL, "        hf 14a sniff c r");
     return 0;
 }
-int usage_hf_14a_raw(void)
-{
+int usage_hf_14a_raw(void) {
     PrintAndLogEx(NORMAL, "Usage: hf 14a raw [-h] [-r] [-c] [-p] [-a] [-T] [-t] <milliseconds> [-b] <number of bits>  <0A 0B 0C ... hex>");
     PrintAndLogEx(NORMAL, "       -h    this help");
     PrintAndLogEx(NORMAL, "       -r    do not read response");
@@ -208,8 +204,7 @@ int usage_hf_14a_raw(void)
     PrintAndLogEx(NORMAL, "       -3    ISO14443-3 select only (skip RATS)");
     return 0;
 }
-int usage_hf_14a_reader(void)
-{
+int usage_hf_14a_reader(void) {
     PrintAndLogEx(NORMAL, "Usage: hf 14a reader [k|s|x] [3]");
     PrintAndLogEx(NORMAL, "       k    keep the field active after command executed");
     PrintAndLogEx(NORMAL, "       s    silent (no messages)");
@@ -217,8 +212,7 @@ int usage_hf_14a_reader(void)
     PrintAndLogEx(NORMAL, "       3    ISO14443-3 select only (skip RATS)");
     return 0;
 }
-int usage_hf_14a_info(void)
-{
+int usage_hf_14a_info(void) {
     PrintAndLogEx(NORMAL, "This command makes more extensive tests against a ISO14443a tag in order to collect information");
     PrintAndLogEx(NORMAL, "Usage: hf 14a info [h|s]");
     PrintAndLogEx(NORMAL, "       s    silent (no messages)");
@@ -226,15 +220,13 @@ int usage_hf_14a_info(void)
     return 0;
 }
 
-int CmdHF14AList(const char *Cmd)
-{
+int CmdHF14AList(const char *Cmd) {
     //PrintAndLogEx(NORMAL, "Deprecated command, use 'hf list 14a' instead");
     CmdTraceList("14a");
     return 0;
 }
 
-int Hf14443_4aGetCardData(iso14a_card_select_t *card)
-{
+int Hf14443_4aGetCardData(iso14a_card_select_t *card) {
     UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT, 0, 0}};
     SendCommand(&c);
 
@@ -273,8 +265,7 @@ int Hf14443_4aGetCardData(iso14a_card_select_t *card)
     return 0;
 }
 
-int CmdHF14AReader(const char *Cmd)
-{
+int CmdHF14AReader(const char *Cmd) {
 
     uint32_t cm = ISO14A_CONNECT;
     bool disconnectAfter = true, silent = false;
@@ -362,8 +353,7 @@ int CmdHF14AReader(const char *Cmd)
     return 0;
 }
 
-int CmdHF14AInfo(const char *Cmd)
-{
+int CmdHF14AInfo(const char *Cmd) {
 
     if (Cmd[0] == 'h' || Cmd[0] ==  'H') return usage_hf_14a_info();
 
@@ -665,8 +655,7 @@ int CmdHF14AInfo(const char *Cmd)
 }
 
 // Collect ISO14443 Type A UIDs
-int CmdHF14ACUIDs(const char *Cmd)
-{
+int CmdHF14ACUIDs(const char *Cmd) {
     // requested number of UIDs
     int n = atoi(Cmd);
     // collect at least 1 (e.g. if no parameter was given)
@@ -710,8 +699,7 @@ int CmdHF14ACUIDs(const char *Cmd)
 }
 
 // ## simulate iso14443a tag
-int CmdHF14ASim(const char *Cmd)
-{
+int CmdHF14ASim(const char *Cmd) {
     bool errors = false;
     uint8_t flags = 0;
     uint8_t tagtype = 1;
@@ -806,8 +794,7 @@ int CmdHF14ASim(const char *Cmd)
     return 0;
 }
 
-int CmdHF14ASniff(const char *Cmd)
-{
+int CmdHF14ASniff(const char *Cmd) {
     int param = 0;
     uint8_t ctmp;
     for (int i = 0; i < 2; i++) {
@@ -822,8 +809,7 @@ int CmdHF14ASniff(const char *Cmd)
     return 0;
 }
 
-int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen)
-{
+int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
     static bool responseNum = false;
     uint16_t cmdc = 0;
     *dataoutlen = 0;
@@ -922,8 +908,7 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
     return 0;
 }
 
-int SelectCard14443_4(bool disconnect, iso14a_card_select_t *card)
-{
+int SelectCard14443_4(bool disconnect, iso14a_card_select_t *card) {
     UsbCommand resp;
 
     frameLength = 0;
@@ -993,8 +978,7 @@ int SelectCard14443_4(bool disconnect, iso14a_card_select_t *card)
     return 0;
 }
 
-int CmdExchangeAPDU(bool chainingin, uint8_t *datain, int datainlen, bool activateField, uint8_t *dataout, int maxdataoutlen, int *dataoutlen, bool *chainingout)
-{
+int CmdExchangeAPDU(bool chainingin, uint8_t *datain, int datainlen, bool activateField, uint8_t *dataout, int maxdataoutlen, int *dataoutlen, bool *chainingout) {
     *chainingout = false;
 
     if (activateField) {
@@ -1078,15 +1062,14 @@ int CmdExchangeAPDU(bool chainingin, uint8_t *datain, int datainlen, bool activa
     return 0;
 }
 
-int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen)
-{
+int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
     *dataoutlen = 0;
     bool chaining = false;
     int res;
 
     // 3 byte here - 1b framing header, 2b crc16
     if (APDUInFramingEnable &&
-        ((frameLength && (datainlen > frameLength - 3)) || (datainlen > USB_CMD_DATA_SIZE - 3))) {
+            ((frameLength && (datainlen > frameLength - 3)) || (datainlen > USB_CMD_DATA_SIZE - 3))) {
         int clen = 0;
 
         bool vActivateField = activateField;
@@ -1149,8 +1132,7 @@ int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool lea
 }
 
 // ISO14443-4. 7. Half-duplex block transmission protocol
-int CmdHF14AAPDU(const char *cmd)
-{
+int CmdHF14AAPDU(const char *cmd) {
     uint8_t data[USB_CMD_DATA_SIZE];
     int datalen = 0;
     bool activateField = false;
@@ -1197,8 +1179,7 @@ int CmdHF14AAPDU(const char *cmd)
     return 0;
 }
 
-int CmdHF14ACmdRaw(const char *cmd)
-{
+int CmdHF14ACmdRaw(const char *cmd) {
     UsbCommand c = {CMD_READER_ISO_14443a, {0, 0, 0}};
     bool reply = 1;
     bool crc = false;
@@ -1271,8 +1252,8 @@ int CmdHF14ACmdRaw(const char *cmd)
             continue;
         }
         if ((cmd[i] >= '0' && cmd[i] <= '9') ||
-            (cmd[i] >= 'a' && cmd[i] <= 'f') ||
-            (cmd[i] >= 'A' && cmd[i] <= 'F')) {
+                (cmd[i] >= 'a' && cmd[i] <= 'f') ||
+                (cmd[i] >= 'A' && cmd[i] <= 'F')) {
             buf[strlen(buf) + 1] = 0;
             buf[strlen(buf)] = cmd[i];
             i++;
@@ -1354,8 +1335,7 @@ int CmdHF14ACmdRaw(const char *cmd)
     return 0;
 }
 
-static int waitCmd(uint8_t iSelect)
-{
+static int waitCmd(uint8_t iSelect) {
     UsbCommand resp;
     uint16_t len = 0;
 
@@ -1383,8 +1363,7 @@ static int waitCmd(uint8_t iSelect)
     return 0;
 }
 
-int CmdHF14AAntiFuzz(const char *cmd)
-{
+int CmdHF14AAntiFuzz(const char *cmd) {
 
     CLIParserInit("hf 14a antifuzz",
                   "Tries to fuzz the ISO14443a anticollision phase",
@@ -1413,8 +1392,7 @@ int CmdHF14AAntiFuzz(const char *cmd)
     return 0;
 }
 
-int CmdHF14AChaining(const char *cmd)
-{
+int CmdHF14AChaining(const char *cmd) {
 
     CLIParserInit("hf 14a chaining",
                   "Enable/Disable ISO14443a input chaining. Maximum input length goes from ATS.",
@@ -1460,15 +1438,13 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdHF14A(const char *Cmd)
-{
+int CmdHF14A(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c
index 0bff7a32d..564b18012 100644
--- a/client/cmdhf14b.c
+++ b/client/cmdhf14b.c
@@ -14,8 +14,7 @@
 #define TIMEOUT 2000
 static int CmdHelp(const char *Cmd);
 
-int usage_hf_14b_info(void)
-{
+int usage_hf_14b_info(void) {
     PrintAndLogEx(NORMAL, "Usage: hf 14b info [h] [s]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       h    this help");
@@ -24,8 +23,7 @@ int usage_hf_14b_info(void)
     PrintAndLogEx(NORMAL, "       hf 14b info");
     return 0;
 }
-int usage_hf_14b_reader(void)
-{
+int usage_hf_14b_reader(void) {
     PrintAndLogEx(NORMAL, "Usage: hf 14b reader [h] [s]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       h    this help");
@@ -34,8 +32,7 @@ int usage_hf_14b_reader(void)
     PrintAndLogEx(NORMAL, "       hf 14b reader");
     return 0;
 }
-int usage_hf_14b_raw(void)
-{
+int usage_hf_14b_raw(void) {
     PrintAndLogEx(NORMAL, "Usage: hf 14b raw [-h] [-r] [-c] [-p] [-s || -ss] <0A 0B 0C ... hex>");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       -h    this help");
@@ -48,8 +45,7 @@ int usage_hf_14b_raw(void)
     PrintAndLogEx(NORMAL, "       hf 14b raw -s -c -p 0200a40400");
     return 0;
 }
-int usage_hf_14b_sniff(void)
-{
+int usage_hf_14b_sniff(void) {
     PrintAndLogEx(NORMAL, "It get data from the field and saves it into command buffer.");
     PrintAndLogEx(NORMAL, "Buffer accessible from command 'hf list 14b'");
     PrintAndLogEx(NORMAL, "Usage: hf 14b sniff [h]");
@@ -59,8 +55,7 @@ int usage_hf_14b_sniff(void)
     PrintAndLogEx(NORMAL, "       hf 14b sniff");
     return 0;
 }
-int usage_hf_14b_sim(void)
-{
+int usage_hf_14b_sim(void) {
     PrintAndLogEx(NORMAL, "Emulating ISO/IEC 14443 type B tag with 4 UID / PUPI");
     PrintAndLogEx(NORMAL, "Usage: hf 14b sim [h] u <uid>");
     PrintAndLogEx(NORMAL, "Options:");
@@ -71,8 +66,7 @@ int usage_hf_14b_sim(void)
     PrintAndLogEx(NORMAL, "       hf 14b sim u 11223344");
     return 0;
 }
-int usage_hf_14b_read_srx(void)
-{
+int usage_hf_14b_read_srx(void) {
     PrintAndLogEx(NORMAL, "Usage:  hf 14b sriread [h] <1|2>");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       h        this help");
@@ -82,8 +76,7 @@ int usage_hf_14b_read_srx(void)
     PrintAndLogEx(NORMAL, "       hf 14b sriread 2");
     return 0;
 }
-int usage_hf_14b_write_srx(void)
-{
+int usage_hf_14b_write_srx(void) {
     PrintAndLogEx(NORMAL, "Usage:  hf 14b [h] sriwrite <1|2> <BLOCK> <DATA>");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       h        this help");
@@ -97,8 +90,7 @@ int usage_hf_14b_write_srx(void)
     PrintAndLogEx(NORMAL, "       hf 14b sriwrite 2 FF 11223344");
     return 0;
 }
-int usage_hf_14b_dump(void)
-{
+int usage_hf_14b_dump(void) {
     PrintAndLogEx(NORMAL, "This command dumps the contents of a ISO-14443-B tag and save it to file\n"
                   "\n"
                   "Usage: hf 14b dump [h] [card memory] <f filname> \n"
@@ -121,22 +113,19 @@ static void switch_on_field_14b(void) {
 }
 */
 
-static int switch_off_field_14b(void)
-{
+static int switch_off_field_14b(void) {
     UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_DISCONNECT, 0, 0}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
 }
 
-int CmdHF14BList(const char *Cmd)
-{
+int CmdHF14BList(const char *Cmd) {
     CmdTraceList("14b");
     return 0;
 }
 
-int CmdHF14BSim(const char *Cmd)
-{
+int CmdHF14BSim(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_hf_14b_sim();
 
@@ -151,8 +140,7 @@ int CmdHF14BSim(const char *Cmd)
     return 0;
 }
 
-int CmdHF14BSniff(const char *Cmd)
-{
+int CmdHF14BSniff(const char *Cmd) {
 
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_hf_14b_sniff();
@@ -163,8 +151,7 @@ int CmdHF14BSniff(const char *Cmd)
     return 0;
 }
 
-int CmdHF14BCmdRaw(const char *Cmd)
-{
+int CmdHF14BCmdRaw(const char *Cmd) {
     bool reply = true, power = false, select = false;
     char buf[5] = "";
     int i = 0;
@@ -209,8 +196,8 @@ int CmdHF14BCmdRaw(const char *Cmd)
             continue;
         }
         if ((Cmd[i] >= '0' && Cmd[i] <= '9') ||
-            (Cmd[i] >= 'a' && Cmd[i] <= 'f') ||
-            (Cmd[i] >= 'A' && Cmd[i] <= 'F')) {
+                (Cmd[i] >= 'a' && Cmd[i] <= 'f') ||
+                (Cmd[i] >= 'A' && Cmd[i] <= 'F')) {
             buf[strlen(buf) + 1] = 0;
             buf[strlen(buf)] = Cmd[i];
             i++;
@@ -254,8 +241,7 @@ int CmdHF14BCmdRaw(const char *Cmd)
     return 1;
 }
 
-static bool get_14b_UID(iso14b_card_select_t *card)
-{
+static bool get_14b_UID(iso14b_card_select_t *card) {
 
     if (!card)
         return false;
@@ -309,8 +295,7 @@ static bool get_14b_UID(iso14b_card_select_t *card)
 // 4       = bit rate capacity
 // 5       = max frame size / -4 info
 // 6       = FWI / Coding options
-static void print_atqb_resp(uint8_t *data, uint8_t cid)
-{
+static void print_atqb_resp(uint8_t *data, uint8_t cid) {
     //PrintAndLogEx(NORMAL, "           UID: %s", sprint_hex(data+1,4));
     PrintAndLogEx(NORMAL, "      App Data: %s", sprint_hex(data, 4));
     PrintAndLogEx(NORMAL, "      Protocol: %s", sprint_hex(data + 4, 3));
@@ -356,8 +341,7 @@ static void print_atqb_resp(uint8_t *data, uint8_t cid)
 }
 
 // get SRx chip model (from UID) // from ST Microelectronics
-char *get_ST_Chip_Model(uint8_t data)
-{
+char *get_ST_Chip_Model(uint8_t data) {
     static char model[20];
     char *retStr = model;
     memset(model, 0, sizeof(model));
@@ -392,8 +376,7 @@ char *get_ST_Chip_Model(uint8_t data)
 }
 
 // REMAKE:
-int print_ST_Lock_info(uint8_t model)
-{
+int print_ST_Lock_info(uint8_t model) {
 
     // PrintAndLogEx(NORMAL, "Chip Write Protection Bits:");
     // // now interpret the data
@@ -439,8 +422,7 @@ int print_ST_Lock_info(uint8_t model)
 }
 
 // print UID info from SRx chips (ST Microelectronics)
-static void print_st_general_info(uint8_t *data, uint8_t len)
-{
+static void print_st_general_info(uint8_t *data, uint8_t len) {
     //uid = first 8 bytes in data
     PrintAndLogEx(NORMAL, " UID: %s", sprint_hex(SwapEndian64(data, 8, 8), len));
     PrintAndLogEx(NORMAL, " MFG: %02X, %s", data[6], getTagInfo(data[6]));
@@ -467,8 +449,7 @@ static void print_st_general_info(uint8_t *data, uint8_t len)
 //a2 = ?  (resp 02 [6a d3])
 
 // 14b get and print Full Info (as much as we know)
-bool HF14B_Std_Info(bool verbose)
-{
+bool HF14B_Std_Info(bool verbose) {
 
     bool isSuccess = false;
 
@@ -512,8 +493,7 @@ bool HF14B_Std_Info(bool verbose)
 }
 
 // SRx get and print full info (needs more info...)
-bool HF14B_ST_Info(bool verbose)
-{
+bool HF14B_ST_Info(bool verbose) {
 
     UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_SR | ISO14B_DISCONNECT, 0, 0}};
     clearCommandBuffer();
@@ -559,8 +539,7 @@ bool HF14B_ST_Info(bool verbose)
 }
 
 // get and print all info known about any known 14b tag
-bool HF14BInfo(bool verbose)
-{
+bool HF14BInfo(bool verbose) {
 
     // try std 14b (atqb)
     if (HF14B_Std_Info(verbose)) return true;
@@ -575,8 +554,7 @@ bool HF14BInfo(bool verbose)
 }
 
 // menu command to get and print all info known about any known 14b tag
-int CmdHF14Binfo(const char *Cmd)
-{
+int CmdHF14Binfo(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_hf_14b_info();
 
@@ -584,8 +562,7 @@ int CmdHF14Binfo(const char *Cmd)
     return HF14BInfo(verbose);
 }
 
-bool HF14B_ST_Reader(bool verbose)
-{
+bool HF14B_ST_Reader(bool verbose) {
 
     bool isSuccess = false;
 
@@ -625,8 +602,7 @@ bool HF14B_ST_Reader(bool verbose)
     return isSuccess;
 }
 
-bool HF14B_Std_Reader(bool verbose)
-{
+bool HF14B_Std_Reader(bool verbose) {
 
     bool isSuccess = false;
 
@@ -668,8 +644,7 @@ bool HF14B_Std_Reader(bool verbose)
 }
 
 // test for other 14b type tags (mimic another reader - don't have tags to identify)
-bool HF14B_Other_Reader()
-{
+bool HF14B_Other_Reader() {
 
     // uint8_t data[] = {0x00, 0x0b, 0x3f, 0x80};
     // uint8_t datalen = 4;
@@ -728,8 +703,7 @@ bool HF14B_Other_Reader()
 }
 
 // get and print general info about all known 14b chips
-bool HF14BReader(bool verbose)
-{
+bool HF14BReader(bool verbose) {
 
     // try std 14b (atqb)
     if (HF14B_Std_Reader(verbose)) return true;
@@ -746,8 +720,7 @@ bool HF14BReader(bool verbose)
 }
 
 // menu command to get and print general info about all known 14b chips
-int CmdHF14BReader(const char *Cmd)
-{
+int CmdHF14BReader(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_hf_14b_reader();
 
@@ -759,8 +732,7 @@ int CmdHF14BReader(const char *Cmd)
  * SRI* tags are ISO14443-B modulated memory tags,
  * this command just dumps the contents of the memory/
  */
-int CmdHF14BReadSri(const char *Cmd)
-{
+int CmdHF14BReadSri(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) < 1 || cmdp == 'h') return usage_hf_14b_read_srx();
 
@@ -773,8 +745,7 @@ int CmdHF14BReadSri(const char *Cmd)
     return 0;
 }
 // New command to write a SRI512/SRIX4K tag.
-int CmdHF14BWriteSri(const char *Cmd)
-{
+int CmdHF14BWriteSri(const char *Cmd) {
     /*
      * For SRIX4K  blocks 00 - 7F
      * hf 14b raw -c -p 09 $srix4kwblock $srix4kwdata
@@ -841,8 +812,7 @@ int CmdHF14BWriteSri(const char *Cmd)
 }
 
 // need to write to file
-int CmdHF14BDump(const char *Cmd)
-{
+int CmdHF14BDump(const char *Cmd) {
 
     uint8_t fileNameLen = 0;
     char filename[FILE_PATH_SIZE] = {0};
@@ -998,8 +968,7 @@ out:
     return switch_off_field_14b();
 }
 
-uint32_t srix4kEncode(uint32_t value)
-{
+uint32_t srix4kEncode(uint32_t value) {
     /*
     // vv = value
     // pp = position
@@ -1055,8 +1024,7 @@ uint32_t srix4kEncode(uint32_t value)
     PrintAndLogEx(NORMAL, "ICE encoded | %08X -> %08X", value, encvalue);
     return encvalue;
 }
-uint32_t srix4kDecode(uint32_t value)
-{
+uint32_t srix4kDecode(uint32_t value) {
     switch (value) {
         case 0xC04F42C5:
             return 0x003139;
@@ -1067,15 +1035,13 @@ uint32_t srix4kDecode(uint32_t value)
     }
     return 0;
 }
-uint32_t srix4kDecodeCounter(uint32_t num)
-{
+uint32_t srix4kDecodeCounter(uint32_t num) {
     uint32_t value = ~num;
     ++value;
     return value;
 }
 
-uint32_t srix4kGetMagicbytes(uint64_t uid, uint32_t block6, uint32_t block18, uint32_t block19)
-{
+uint32_t srix4kGetMagicbytes(uint64_t uid, uint32_t block6, uint32_t block18, uint32_t block19) {
 #define MASK 0xFFFFFFFF;
     uint32_t uid32 = uid & MASK;
     uint32_t counter = srix4kDecodeCounter(block6);
@@ -1087,8 +1053,7 @@ uint32_t srix4kGetMagicbytes(uint64_t uid, uint32_t block6, uint32_t block18, ui
     PrintAndLogEx(SUCCESS, "Magic bytes | %08X", result);
     return result;
 }
-int srix4kValid(const char *Cmd)
-{
+int srix4kValid(const char *Cmd) {
 
     uint64_t uid = 0xD00202501A4532F9;
     uint32_t block6 = 0xFFFFFFFF;
@@ -1106,8 +1071,7 @@ int srix4kValid(const char *Cmd)
     return 0;
 }
 
-bool waitCmd14b(bool verbose)
-{
+bool waitCmd14b(bool verbose) {
 
     bool crc = false;
     uint8_t data[USB_CMD_DATA_SIZE] = {0x00};
@@ -1161,15 +1125,13 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdHF14B(const char *Cmd)
-{
+int CmdHF14B(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index 193290297..2e784962c 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -189,8 +189,7 @@ const productName uidmapping[] = {
 // fast method to just read the UID of a tag (collission detection not supported)
 //  *buf should be large enough to fit the 64bit uid
 // returns 1 if suceeded
-int getUID(uint8_t *buf)
-{
+int getUID(uint8_t *buf) {
 
     UsbCommand resp;
     UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}}; // len,speed,recv?
@@ -229,8 +228,7 @@ int getUID(uint8_t *buf)
 // get a product description based on the UID
 // uid[8] tag uid
 // returns description of the best match
-static char *getTagInfo_15(uint8_t *uid)
-{
+static char *getTagInfo_15(uint8_t *uid) {
     uint64_t myuid, mask;
     int i = 0, best = -1;
     memcpy(&myuid, uid, sizeof(uint64_t));
@@ -254,8 +252,7 @@ static char *getTagInfo_15(uint8_t *uid)
 }
 
 // return a clear-text message to an errorcode
-static char *TagErrorStr(uint8_t error)
-{
+static char *TagErrorStr(uint8_t error) {
     switch (error) {
         case 0x01:
             return "The command is not supported";
@@ -280,20 +277,17 @@ static char *TagErrorStr(uint8_t error)
     }
 }
 
-int usage_15_demod(void)
-{
+int usage_15_demod(void) {
     PrintAndLogEx(NORMAL, "Tries to demodulate / decode ISO15693, from downloaded samples.\n"
                   "Gather samples with 'hf 15 read' / 'hf 15 record'");
     return 0;
 }
-int usage_15_samples(void)
-{
+int usage_15_samples(void) {
     PrintAndLogEx(NORMAL, "Acquire samples as Reader (enables carrier, send inquiry\n"
                   "and download it to graphbuffer.  Try 'hf 15 demod'  to try to demodulate/decode signal");
     return 0;
 }
-int usage_15_info(void)
-{
+int usage_15_info(void) {
     PrintAndLogEx(NORMAL, "Uses the optional command 'get_systeminfo' 0x2B to try and extract information\n"
                   "command may fail, depending on tag.\n"
                   "defaults to '1 out of 4' mode\n"
@@ -309,13 +303,11 @@ int usage_15_info(void)
                   "\thf 15 info u");
     return 0;
 }
-int usage_15_record(void)
-{
+int usage_15_record(void) {
     PrintAndLogEx(NORMAL, "Record activity without enableing carrier");
     return 0;
 }
-int usage_15_reader(void)
-{
+int usage_15_reader(void) {
     PrintAndLogEx(NORMAL, "This command identifies a ISO 15693 tag\n"
                   "\n"
                   "Usage: hf 15 reader [h]\n"
@@ -326,21 +318,18 @@ int usage_15_reader(void)
                   "\thf 15 reader");
     return 0;
 }
-int usage_15_sim(void)
-{
+int usage_15_sim(void) {
     PrintAndLogEx(NORMAL, "Usage:  hf 15 sim <UID>\n"
                   "\n"
                   "Example:\n"
                   "\thf 15 sim E016240000000000");
     return 0;
 }
-int usage_15_findafi(void)
-{
+int usage_15_findafi(void) {
     PrintAndLogEx(NORMAL, "'hf 15 finafi' This command needs a helptext. Feel free to add one!");
     return 0;
 }
-int usage_15_dump(void)
-{
+int usage_15_dump(void) {
     PrintAndLogEx(NORMAL, "This command dumps the contents of a ISO-15693 tag and save it to file\n"
                   "\n"
                   "Usage: hf 15 dump [h] <f filname> \n"
@@ -353,8 +342,7 @@ int usage_15_dump(void)
                   "\thf 15 dump f mydump");
     return 0;
 }
-int usage_15_restore(void)
-{
+int usage_15_restore(void) {
     char *options[][2] = {
         {"h", "this help"},
         {"-2", "use slower '1 out of 256' mode"},
@@ -368,8 +356,7 @@ int usage_15_restore(void)
     PrintAndLogOptions(options, 7, 3);
     return 0;
 }
-int usage_15_raw(void)
-{
+int usage_15_raw(void) {
     char *options[][2] = {
         {"-r", "do not read response" },
         {"-2", "use slower '1 out of 256' mode" },
@@ -380,8 +367,7 @@ int usage_15_raw(void)
     PrintAndLogOptions(options, 4, 3);
     return 0;
 }
-int usage_15_read(void)
-{
+int usage_15_read(void) {
     PrintAndLogEx(NORMAL, "Usage:  hf 15 read    [options] <uid|s|u|*> <page#>\n"
                   "Options:\n"
                   "\t-2        use slower '1 out of 256' mode\n"
@@ -392,8 +378,7 @@ int usage_15_read(void)
                   "\tpage#:        page number 0-255");
     return 0;
 }
-int usage_15_write(void)
-{
+int usage_15_write(void) {
     PrintAndLogEx(NORMAL, "Usage:  hf 15 write    [options] <uid|s|u|*> <page#> <hexdata>\n"
                   "Options:\n"
                   "\t-2        use slower '1 out of 256' mode\n"
@@ -406,8 +391,7 @@ int usage_15_write(void)
                   "\thexdata:      data to be written eg AA BB CC DD");
     return 0;
 }
-int usage_15_readmulti(void)
-{
+int usage_15_readmulti(void) {
     PrintAndLogEx(NORMAL, "Usage:  hf 15 readmulti  [options] <uid|s|u|*> <start#> <count#>\n"
                   "Options:\n"
                   "\t-2        use slower '1 out of 256' mode\n"
@@ -421,8 +405,7 @@ int usage_15_readmulti(void)
 }
 // Mode 3
 //helptext
-int CmdHF15Demod(const char *Cmd)
-{
+int CmdHF15Demod(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_15_demod();
 
@@ -502,8 +485,7 @@ int CmdHF15Demod(const char *Cmd)
 
 // * Acquire Samples as Reader (enables carrier, sends inquiry)
 //helptext
-int CmdHF15Samples(const char *Cmd)
-{
+int CmdHF15Samples(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_15_samples();
 
@@ -519,8 +501,7 @@ int CmdHF15Samples(const char *Cmd)
  * Commandline handling: HF15 CMD SYSINFO
  * get system information from tag/VICC
  */
-int CmdHF15Info(const char *Cmd)
-{
+int CmdHF15Info(const char *Cmd) {
 
     char cmdp = param_getchar(Cmd, 0);
     if (strlen(Cmd) < 1 || cmdp == 'h' || cmdp == 'H') return usage_15_info();
@@ -602,8 +583,7 @@ int CmdHF15Info(const char *Cmd)
 
 // Record Activity without enabeling carrier
 //helptext
-int CmdHF15Record(const char *Cmd)
-{
+int CmdHF15Record(const char *Cmd) {
     char cmdp =  tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_15_record();
 
@@ -614,8 +594,7 @@ int CmdHF15Record(const char *Cmd)
 }
 
 // used with 'hf search'
-int HF15Reader(const char *Cmd, bool verbose)
-{
+int HF15Reader(const char *Cmd, bool verbose) {
     uint8_t uid[8] = {0, 0, 0, 0, 0, 0, 0, 0};
     if (!getUID(uid)) {
         if (verbose) PrintAndLogEx(WARNING, "No tag found.");
@@ -627,8 +606,7 @@ int HF15Reader(const char *Cmd, bool verbose)
     return 1;
 }
 
-int CmdHF15Reader(const char *Cmd)
-{
+int CmdHF15Reader(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_15_reader();
 
@@ -638,8 +616,7 @@ int CmdHF15Reader(const char *Cmd)
 
 // Simulation is still not working very good
 // helptext
-int CmdHF15Sim(const char *Cmd)
-{
+int CmdHF15Sim(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) < 1 || cmdp == 'h') return usage_15_sim();
 
@@ -661,8 +638,7 @@ int CmdHF15Sim(const char *Cmd)
 // finds the AFI (Application Family Idendifier) of a card, by trying all values
 // (There is no standard way of reading the AFI, allthough some tags support this)
 // helptext
-int CmdHF15Afi(const char *Cmd)
-{
+int CmdHF15Afi(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_15_findafi();
 
@@ -681,8 +657,7 @@ typedef struct {
 
 // Reads all memory pages
 // need to write to file
-int CmdHF15Dump(const char *Cmd)
-{
+int CmdHF15Dump(const char *Cmd) {
 
     uint8_t fileNameLen = 0;
     char filename[FILE_PATH_SIZE] = {0};
@@ -798,8 +773,7 @@ int CmdHF15Dump(const char *Cmd)
     return 0;
 }
 
-int CmdHF15Restore(const char *Cmd)
-{
+int CmdHF15Restore(const char *Cmd) {
     FILE *f;
 
     uint8_t uid[8] = {0x00};
@@ -911,15 +885,13 @@ int CmdHF15Restore(const char *Cmd)
     fclose(f);
 }
 
-int CmdHF15List(const char *Cmd)
-{
+int CmdHF15List(const char *Cmd) {
     //PrintAndLogEx(WARNING, "Deprecated command, use 'hf list 15' instead");
     CmdTraceList("15");
     return 0;
 }
 
-int CmdHF15Raw(const char *Cmd)
-{
+int CmdHF15Raw(const char *Cmd) {
 
     char cmdp = param_getchar(Cmd, 0);
     if (strlen(Cmd) < 3 || cmdp == 'h' || cmdp == 'H') return usage_15_raw();
@@ -958,8 +930,8 @@ int CmdHF15Raw(const char *Cmd)
             continue;
         }
         if ((Cmd[i] >= '0' && Cmd[i] <= '9') ||
-            (Cmd[i] >= 'a' && Cmd[i] <= 'f') ||
-            (Cmd[i] >= 'A' && Cmd[i] <= 'F')) {
+                (Cmd[i] >= 'a' && Cmd[i] <= 'f') ||
+                (Cmd[i] >= 'A' && Cmd[i] <= 'F')) {
             buf[strlen(buf) + 1] = 0;
             buf[strlen(buf)] = Cmd[i];
             i++;
@@ -1006,8 +978,7 @@ int CmdHF15Raw(const char *Cmd)
  * Parameters:
  *  **cmd   command line
  */
-int prepareHF15Cmd(char **cmd, UsbCommand *c, uint8_t iso15cmd)
-{
+int prepareHF15Cmd(char **cmd, UsbCommand *c, uint8_t iso15cmd) {
     int temp;
     uint8_t *req = c->d.asBytes;
     uint8_t uid[8] = {0x00};
@@ -1084,8 +1055,7 @@ int prepareHF15Cmd(char **cmd, UsbCommand *c, uint8_t iso15cmd)
  * Commandline handling: HF15 CMD READMULTI
  * Read multiple blocks at once (not all tags support this)
  */
-int CmdHF15Readmulti(const char *Cmd)
-{
+int CmdHF15Readmulti(const char *Cmd) {
 
     char cmdp = param_getchar(Cmd, 0);
     if (strlen(Cmd) < 3 || cmdp == 'h' || cmdp == 'H') return usage_15_readmulti();
@@ -1168,8 +1138,7 @@ int CmdHF15Readmulti(const char *Cmd)
  * Commandline handling: HF15 CMD READ
  * Reads a single Block
  */
-int CmdHF15Read(const char *Cmd)
-{
+int CmdHF15Read(const char *Cmd) {
 
     char cmdp = param_getchar(Cmd, 0);
     if (strlen(Cmd) < 3 || cmdp == 'h' || cmdp == 'H')  return usage_15_read();
@@ -1243,8 +1212,7 @@ int CmdHF15Read(const char *Cmd)
  * Commandline handling: HF15 CMD WRITE
  * Writes a single Block - might run into timeout, even when successful
  */
-int CmdHF15Write(const char *Cmd)
-{
+int CmdHF15Write(const char *Cmd) {
 
     char cmdp = param_getchar(Cmd, 0);
     if (strlen(Cmd) < 3 || cmdp == 'h' || cmdp == 'H') return usage_15_write();
@@ -1338,15 +1306,13 @@ static command_t CommandTable15[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdHF15(const char *Cmd)
-{
+int CmdHF15(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable15, Cmd);
     return 0;
 }
 
-int CmdHF15Help(const char *Cmd)
-{
+int CmdHF15Help(const char *Cmd) {
     CmdsHelp(CommandTable15);
     return 0;
 }
\ No newline at end of file
diff --git a/client/cmdhfepa.c b/client/cmdhfepa.c
index 3c2299d7f..fce18f11b 100644
--- a/client/cmdhfepa.c
+++ b/client/cmdhfepa.c
@@ -12,8 +12,7 @@
 static int CmdHelp(const char *Cmd);
 
 // Perform (part of) the PACE protocol
-int CmdHFEPACollectPACENonces(const char *Cmd)
-{
+int CmdHFEPACollectPACENonces(const char *Cmd) {
     // requested nonce size
     uint32_t m = 0;
     // requested number of Nonces
@@ -60,8 +59,7 @@ int CmdHFEPACollectPACENonces(const char *Cmd)
 }
 
 // perform the PACE protocol by replaying APDUs
-int CmdHFEPAPACEReplay(const char *Cmd)
-{
+int CmdHFEPAPACEReplay(const char *Cmd) {
     // the 4 APDUs which are replayed + their lengths
     uint8_t msesa_apdu[41], gn_apdu[8], map_apdu[75];
     uint8_t pka_apdu[75], ma_apdu[18], apdu_lengths[5] = {0};
@@ -169,14 +167,12 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
 
-int CmdHFEPA(const char *Cmd)
-{
+int CmdHFEPA(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
diff --git a/client/cmdhffelica.c b/client/cmdhffelica.c
index 06da1b8b4..59ddc5d65 100644
--- a/client/cmdhffelica.c
+++ b/client/cmdhffelica.c
@@ -11,8 +11,7 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_hf_felica_sim(void)
-{
+int usage_hf_felica_sim(void) {
     PrintAndLogEx(NORMAL, "\n Emulating ISO/18092 FeliCa tag \n");
     PrintAndLogEx(NORMAL, "Usage: hf felica sim [h] t <type> [v]");
     PrintAndLogEx(NORMAL, "Options:");
@@ -24,8 +23,7 @@ int usage_hf_felica_sim(void)
     PrintAndLogEx(NORMAL, "          hf felica sim t 1 ");
     return 0;
 }
-int usage_hf_felica_sniff(void)
-{
+int usage_hf_felica_sniff(void) {
     PrintAndLogEx(NORMAL, "It get data from the field and saves it into command buffer.");
     PrintAndLogEx(NORMAL, "Buffer accessible from command 'hf list felica'");
     PrintAndLogEx(NORMAL, "Usage:  hf felica sniff <s > <t>");
@@ -35,8 +33,7 @@ int usage_hf_felica_sniff(void)
     PrintAndLogEx(NORMAL, "          hf felica sniff s 1000");
     return 0;
 }
-int usage_hf_felica_simlite(void)
-{
+int usage_hf_felica_simlite(void) {
     PrintAndLogEx(NORMAL, "\n Emulating ISO/18092 FeliCa Lite tag \n");
     PrintAndLogEx(NORMAL, "Usage: hf felica litesim [h] u <uid>");
     PrintAndLogEx(NORMAL, "Options:");
@@ -46,8 +43,7 @@ int usage_hf_felica_simlite(void)
     PrintAndLogEx(NORMAL, "          hf felica litesim 11223344556677");
     return 0;
 }
-int usage_hf_felica_dumplite(void)
-{
+int usage_hf_felica_dumplite(void) {
     PrintAndLogEx(NORMAL, "\n Dump ISO/18092 FeliCa Lite tag \n");
     PrintAndLogEx(NORMAL, "press button to abort run, otherwise it will loop for 200sec.");
     PrintAndLogEx(NORMAL, "Usage: hf felica litedump [h]");
@@ -57,8 +53,7 @@ int usage_hf_felica_dumplite(void)
     PrintAndLogEx(NORMAL, "          hf felica litedump");
     return 0;
 }
-int usage_hf_felica_raw(void)
-{
+int usage_hf_felica_raw(void) {
     PrintAndLogEx(NORMAL, "Usage: hf felica raw [-h] [-r] [-c] [-p] [-a] <0A 0B 0C ... hex>");
     PrintAndLogEx(NORMAL, "       -h    this help");
     PrintAndLogEx(NORMAL, "       -r    do not read response");
@@ -69,15 +64,13 @@ int usage_hf_felica_raw(void)
     return 0;
 }
 
-int CmdHFFelicaList(const char *Cmd)
-{
+int CmdHFFelicaList(const char *Cmd) {
     //PrintAndLogEx(NORMAL, "Deprecated command, use 'hf list felica' instead");
     CmdTraceList("felica");
     return 0;
 }
 
-int CmdHFFelicaReader(const char *Cmd)
-{
+int CmdHFFelicaReader(const char *Cmd) {
     bool silent = (Cmd[0] == 's' || Cmd[0] ==  'S');
     //UsbCommand cDisconnect = {CMD_FELICA_COMMAND, {0,0,0}};
     UsbCommand c = {CMD_FELICA_COMMAND, {FELICA_CONNECT, 0, 0}};
@@ -129,8 +122,7 @@ int CmdHFFelicaReader(const char *Cmd)
 }
 
 // simulate iso18092 / FeliCa tag
-int CmdHFFelicaSim(const char *Cmd)
-{
+int CmdHFFelicaSim(const char *Cmd) {
     bool errors = false;
     uint8_t flags = 0;
     uint8_t tagtype = 1;
@@ -195,8 +187,7 @@ int CmdHFFelicaSim(const char *Cmd)
     return 0;
 }
 
-int CmdHFFelicaSniff(const char *Cmd)
-{
+int CmdHFFelicaSniff(const char *Cmd) {
 
     uint8_t cmdp = 0;
     uint64_t samples2skip = 0;
@@ -234,8 +225,7 @@ int CmdHFFelicaSniff(const char *Cmd)
 }
 
 // uid  hex
-int CmdHFFelicaSimLite(const char *Cmd)
-{
+int CmdHFFelicaSimLite(const char *Cmd) {
 
     uint64_t uid = param_get64ex(Cmd, 0, 0, 16);
 
@@ -248,13 +238,11 @@ int CmdHFFelicaSimLite(const char *Cmd)
     return 0;
 }
 
-static void printSep()
-{
+static void printSep() {
     PrintAndLogEx(NORMAL, "------------------------------------------------------------------------------------");
 }
 
-uint16_t PrintFliteBlock(uint16_t tracepos, uint8_t *trace, uint16_t tracelen)
-{
+uint16_t PrintFliteBlock(uint16_t tracepos, uint8_t *trace, uint16_t tracelen) {
     if (tracepos + 19 >= tracelen)
         return tracelen;
 
@@ -401,8 +389,7 @@ uint16_t PrintFliteBlock(uint16_t tracepos, uint8_t *trace, uint16_t tracelen)
     return tracepos + 19;
 }
 
-int CmdHFFelicaDumpLite(const char *Cmd)
-{
+int CmdHFFelicaDumpLite(const char *Cmd) {
 
     char ctmp = tolower(param_getchar(Cmd, 0));
     if (ctmp == 'h') return usage_hf_felica_dumplite();
@@ -469,8 +456,7 @@ int CmdHFFelicaDumpLite(const char *Cmd)
     return 0;
 }
 
-int CmdHFFelicaCmdRaw(const char *cmd)
-{
+int CmdHFFelicaCmdRaw(const char *cmd) {
     UsbCommand c = {CMD_FELICA_COMMAND, {0, 0, 0}};
     bool reply = 1;
     bool crc = false;
@@ -525,8 +511,8 @@ int CmdHFFelicaCmdRaw(const char *cmd)
             continue;
         }
         if ((cmd[i] >= '0' && cmd[i] <= '9') ||
-            (cmd[i] >= 'a' && cmd[i] <= 'f') ||
-            (cmd[i] >= 'A' && cmd[i] <= 'F')) {
+                (cmd[i] >= 'a' && cmd[i] <= 'f') ||
+                (cmd[i] >= 'A' && cmd[i] <= 'F')) {
             buf[strlen(buf) + 1] = 0;
             buf[strlen(buf)] = cmd[i];
             i++;
@@ -586,8 +572,7 @@ int CmdHFFelicaCmdRaw(const char *cmd)
     return 0;
 }
 
-void waitCmdFelica(uint8_t iSelect)
-{
+void waitCmdFelica(uint8_t iSelect) {
     UsbCommand resp;
     uint16_t len = 0;
 
@@ -615,15 +600,13 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdHFFelica(const char *Cmd)
-{
+int CmdHFFelica(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
\ No newline at end of file
diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index 80d2416d7..e099c35d0 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -49,8 +49,7 @@
 
 static int CmdHelp(const char *Cmd);
 
-int CmdHFFidoInfo(const char *cmd)
-{
+int CmdHFFidoInfo(const char *cmd) {
 
     if (cmd && strlen(cmd) > 0)
         PrintAndLog("WARNING: command don't have any parameters.\n");
@@ -125,8 +124,7 @@ int CmdHFFidoInfo(const char *cmd)
     return 0;
 }
 
-json_t *OpenJson(int paramnum, char *fname, void *argtable[], bool *err)
-{
+json_t *OpenJson(int paramnum, char *fname, void *argtable[], bool *err) {
     json_t *root = NULL;
     json_error_t error;
     *err = false;
@@ -170,8 +168,7 @@ json_t *OpenJson(int paramnum, char *fname, void *argtable[], bool *err)
     return root;
 }
 
-int CmdHFFidoRegister(const char *cmd)
-{
+int CmdHFFidoRegister(const char *cmd) {
     uint8_t data[64] = {0};
     int chlen = 0;
     uint8_t cdata[250] = {0};
@@ -400,8 +397,7 @@ int CmdHFFidoRegister(const char *cmd)
     return 0;
 };
 
-int CmdHFFidoAuthenticate(const char *cmd)
-{
+int CmdHFFidoAuthenticate(const char *cmd) {
     uint8_t data[512] = {0};
     uint8_t hdata[250] = {0};
     bool public_key_loaded = false;
@@ -619,15 +615,13 @@ int CmdHFFidoAuthenticate(const char *cmd)
     return 0;
 };
 
-void CheckSlash(char *fileName)
-{
+void CheckSlash(char *fileName) {
     if ((fileName[strlen(fileName) - 1] != '/') &&
-        (fileName[strlen(fileName) - 1] != '\\'))
+            (fileName[strlen(fileName) - 1] != '\\'))
         strcat(fileName, "/");
 }
 
-int GetExistsFileNameJson(char *prefixDir, char *reqestedFileName, char *fileName)
-{
+int GetExistsFileNameJson(char *prefixDir, char *reqestedFileName, char *fileName) {
     fileName[0] = 0x00;
     strcpy(fileName, get_my_executable_directory());
     CheckSlash(fileName);
@@ -654,8 +648,7 @@ int GetExistsFileNameJson(char *prefixDir, char *reqestedFileName, char *fileNam
     return 0;
 }
 
-int CmdHFFido2MakeCredential(const char *cmd)
-{
+int CmdHFFido2MakeCredential(const char *cmd) {
     json_error_t error;
     json_t *root = NULL;
     char fname[300] = {0};
@@ -782,8 +775,7 @@ int CmdHFFido2MakeCredential(const char *cmd)
     return 0;
 };
 
-int CmdHFFido2GetAssertion(const char *cmd)
-{
+int CmdHFFido2GetAssertion(const char *cmd) {
     json_error_t error;
     json_t *root = NULL;
     char fname[300] = {0};
@@ -920,15 +912,13 @@ static command_t CommandTable[] = {
     {NULL,               NULL,                       0, NULL}
 };
 
-int CmdHFFido(const char *Cmd)
-{
+int CmdHFFido(const char *Cmd) {
     (void)WaitForResponseTimeout(CMD_ACK, NULL, 100);
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index fa3fe9515..b71f2fd03 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -29,8 +29,7 @@ static uint8_t iClass_Key_Table[ICLASS_KEYS_MAX][8] = {
     { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }
 };
 
-int usage_hf_iclass_sim(void)
-{
+int usage_hf_iclass_sim(void) {
     PrintAndLogEx(NORMAL, "Usage:  hf iclass sim <option> [CSN]");
     PrintAndLogEx(NORMAL, "        options");
     PrintAndLogEx(NORMAL, "                0 <CSN> simulate the given CSN");
@@ -46,16 +45,14 @@ int usage_hf_iclass_sim(void)
     PrintAndLogEx(NORMAL, "        hf iclass sim 4");
     return 0;
 }
-int usage_hf_iclass_eload(void)
-{
+int usage_hf_iclass_eload(void) {
     PrintAndLogEx(NORMAL, "Loads iclass tag-dump into emulator memory on device");
     PrintAndLogEx(NORMAL, "Usage:  hf iclass eload f <filename>");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "        hf iclass eload f iclass_tagdump-aa162d30f8ff12f1.bin");
     return 0;
 }
-int usage_hf_iclass_decrypt(void)
-{
+int usage_hf_iclass_decrypt(void) {
     PrintAndLogEx(NORMAL, "This is simple implementation, it tries to decrypt every block after block 6.");
     PrintAndLogEx(NORMAL, "Correct behaviour would be to decrypt only the application areas where the key is valid,");
     PrintAndLogEx(NORMAL, "which is defined by the configuration block.");
@@ -68,8 +65,7 @@ int usage_hf_iclass_decrypt(void)
     PrintAndLogEx(NORMAL, "S       hf iclass decrypt f tagdump_12312342343.bin");
     return 0;
 }
-int usage_hf_iclass_encrypt(void)
-{
+int usage_hf_iclass_encrypt(void) {
     PrintAndLogEx(NORMAL, "OBS! In order to use this function, the file 'iclass_decryptionkey.bin' must reside");
     PrintAndLogEx(NORMAL, "in the working directory. The file should be 16 bytes binary data");
     PrintAndLogEx(NORMAL, "");
@@ -80,8 +76,7 @@ int usage_hf_iclass_encrypt(void)
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
-int usage_hf_iclass_dump(void)
-{
+int usage_hf_iclass_dump(void) {
     PrintAndLogEx(NORMAL, "Usage:  hf iclass dump f <fileName> k <key> c <creditkey> [e|r|v]\n");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "  f <filename> : specify a filename to save dump to");
@@ -97,8 +92,7 @@ int usage_hf_iclass_dump(void)
     PrintAndLogEx(NORMAL, "        hf iclass dump k AAAAAAAAAAAAAAAA e");
     return 0;
 }
-int usage_hf_iclass_clone(void)
-{
+int usage_hf_iclass_clone(void) {
     PrintAndLogEx(NORMAL, "Usage:  hf iclass clone f <tagfile.bin> b <first block> l <last block> k <KEY> c e|r");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "  f <filename>: specify a filename to clone from");
@@ -114,8 +108,7 @@ int usage_hf_iclass_clone(void)
     PrintAndLogEx(NORMAL, "       hf iclass clone f iclass_tagdump-121345.bin b 06 l 19 k 0 e");
     return 0;
 }
-int usage_hf_iclass_writeblock(void)
-{
+int usage_hf_iclass_writeblock(void) {
     PrintAndLogEx(NORMAL, "Usage:  hf iclass writeblk b <block> d <data> k <key> [c|e|r|v]\n");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "  b <Block> : The block number as 2 hex symbols");
@@ -130,8 +123,7 @@ int usage_hf_iclass_writeblock(void)
     PrintAndLogEx(NORMAL, "        hf iclass writeblk b 1B d AAAAAAAAAAAAAAAA k 001122334455667B c");
     return 0;
 }
-int usage_hf_iclass_readblock(void)
-{
+int usage_hf_iclass_readblock(void) {
     PrintAndLogEx(NORMAL, "Usage:  hf iclass readblk b <block> k <key> [c|e|r|v]\n");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "  b <block> : The block number as 2 hex symbols");
@@ -146,13 +138,11 @@ int usage_hf_iclass_readblock(void)
     PrintAndLogEx(NORMAL, "        hf iclass readblk b 0A k 0");
     return 0;
 }
-int usage_hf_iclass_readtagfile()
-{
+int usage_hf_iclass_readtagfile() {
     PrintAndLogEx(NORMAL, "Usage: hf iclass readtagfile <filename> [startblock] [endblock]");
     return 0;
 }
-int usage_hf_iclass_calc_newkey(void)
-{
+int usage_hf_iclass_calc_newkey(void) {
     PrintAndLogEx(NORMAL, "Calculate new key for updating\n");
     PrintAndLogEx(NORMAL, "Usage:  hf iclass calc_newkey o <Old key> n <New key> s [csn] e");
     PrintAndLogEx(NORMAL, "Options:");
@@ -168,8 +158,7 @@ int usage_hf_iclass_calc_newkey(void)
     PrintAndLogEx(NORMAL, "\nNOTE: * = required\n");
     return 0;
 }
-int usage_hf_iclass_managekeys(void)
-{
+int usage_hf_iclass_managekeys(void) {
     PrintAndLogEx(NORMAL, "HELP :  Manage iClass Keys in client memory:\n");
     PrintAndLogEx(NORMAL, "Usage:  hf iclass managekeys n [keynbr] k [key] f [filename] s l p\n");
     PrintAndLogEx(NORMAL, "Options:");
@@ -186,8 +175,7 @@ int usage_hf_iclass_managekeys(void)
     PrintAndLogEx(NORMAL, " print keys   : hf iclass managekeys p\n");
     return 0;
 }
-int usage_hf_iclass_reader(void)
-{
+int usage_hf_iclass_reader(void) {
     PrintAndLogEx(NORMAL, "Act as a Iclass reader.  Look for iClass tags until a key or the pm3 button is pressed\n");
     PrintAndLogEx(NORMAL, "Usage:  hf iclass reader [h] [1]\n");
     PrintAndLogEx(NORMAL, "Options:");
@@ -197,8 +185,7 @@ int usage_hf_iclass_reader(void)
     PrintAndLogEx(NORMAL, "        hf iclass reader 1");
     return 0;
 }
-int usage_hf_iclass_replay(void)
-{
+int usage_hf_iclass_replay(void) {
     PrintAndLogEx(NORMAL, "Replay a collected mac message");
     PrintAndLogEx(NORMAL, "Usage:  hf iclass replay [h] <mac>");
     PrintAndLogEx(NORMAL, "Options:");
@@ -208,16 +195,14 @@ int usage_hf_iclass_replay(void)
     PrintAndLogEx(NORMAL, "        hf iclass replay 00112233");
     return 0;
 }
-int usage_hf_iclass_sniff(void)
-{
+int usage_hf_iclass_sniff(void) {
     PrintAndLogEx(NORMAL, "Sniff the communication between reader and tag");
     PrintAndLogEx(NORMAL, "Usage:  hf iclass sniff [h]");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "         hf iclass sniff");
     return 0;
 }
-int usage_hf_iclass_loclass(void)
-{
+int usage_hf_iclass_loclass(void) {
     PrintAndLogEx(NORMAL, "Usage: hf iclass loclass [options]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "h             Show this help");
@@ -232,8 +217,7 @@ int usage_hf_iclass_loclass(void)
     PrintAndLogEx(NORMAL, "                  ... totalling N*24 bytes");
     return 0;
 }
-int usage_hf_iclass_chk(void)
-{
+int usage_hf_iclass_chk(void) {
     PrintAndLogEx(NORMAL, "Checkkeys loads a dictionary text file with 8byte hex keys to test authenticating against a iClass tag");
     PrintAndLogEx(NORMAL, "Usage: hf iclass chk [h|e|r] [f  (*.dic)]");
     PrintAndLogEx(NORMAL, "Options:");
@@ -247,8 +231,7 @@ int usage_hf_iclass_chk(void)
     PrintAndLogEx(NORMAL, "         hf iclass chk f default_iclass_keys.dic e");
     return 0;
 }
-int usage_hf_iclass_lookup(void)
-{
+int usage_hf_iclass_lookup(void) {
     PrintAndLogEx(NORMAL, "Lookup keys takes some sniffed trace data and tries to verify what key was used against a dictionary file");
     PrintAndLogEx(NORMAL, "Usage: hf iclass lookup [h|e|r] [f  (*.dic)] [u <csn>] [p <epurse>] [m <macs>]");
     PrintAndLogEx(NORMAL, "Options:");
@@ -264,8 +247,7 @@ int usage_hf_iclass_lookup(void)
     PrintAndLogEx(NORMAL, "        hf iclass lookup u 9655a400f8ff12e0 p f0ffffffffffffff m 0000000089cb984b f default_iclass_keys.dic e");
     return 0;
 }
-int usage_hf_iclass_permutekey(void)
-{
+int usage_hf_iclass_permutekey(void) {
     PrintAndLogEx(NORMAL, "Permute function from 'heart of darkness' paper.");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  hf iclass permute [h] <r|f> <bytes>");
@@ -280,8 +262,7 @@ int usage_hf_iclass_permutekey(void)
     return 0;
 }
 
-int xorbits_8(uint8_t val)
-{
+int xorbits_8(uint8_t val) {
     uint8_t res = val ^ (val >> 1); //1st pass
     res = res ^ (res >> 1);         // 2nd pass
     res = res ^ (res >> 2);         // 3rd pass
@@ -289,15 +270,13 @@ int xorbits_8(uint8_t val)
     return res & 1;
 }
 
-int CmdHFiClassList(const char *Cmd)
-{
+int CmdHFiClassList(const char *Cmd) {
     //PrintAndLogEx(NORMAL, "Deprecated command, use 'hf list iclass' instead");
     CmdTraceList("iclass");
     return 0;
 }
 
-int CmdHFiClassSniff(const char *Cmd)
-{
+int CmdHFiClassSniff(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_hf_iclass_sniff();
     UsbCommand c = {CMD_SNOOP_ICLASS};
@@ -305,8 +284,7 @@ int CmdHFiClassSniff(const char *Cmd)
     return 0;
 }
 
-int CmdHFiClassSim(const char *Cmd)
-{
+int CmdHFiClassSim(const char *Cmd) {
 
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) < 1 || cmdp == 'h') return usage_hf_iclass_sim();
@@ -531,8 +509,7 @@ int CmdHFiClassSim(const char *Cmd)
     return 0;
 }
 
-int HFiClassReader(const char *Cmd, bool loop, bool verbose)
-{
+int HFiClassReader(const char *Cmd, bool loop, bool verbose) {
     bool tagFound = false;
 
     uint32_t flags = FLAG_ICLASS_READER_CSN | FLAG_ICLASS_READER_CC |  FLAG_ICLASS_READER_AIA |
@@ -598,16 +575,14 @@ int HFiClassReader(const char *Cmd, bool loop, bool verbose)
     return 0;
 }
 
-int CmdHFiClassReader(const char *Cmd)
-{
+int CmdHFiClassReader(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_hf_iclass_reader();
     bool findone = (cmdp == '1') ? false : true;
     return HFiClassReader(Cmd, findone, true);
 }
 
-int CmdHFiClassReader_Replay(const char *Cmd)
-{
+int CmdHFiClassReader_Replay(const char *Cmd) {
 
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) < 1 || cmdp == 'h') return usage_hf_iclass_replay();
@@ -627,8 +602,7 @@ int CmdHFiClassReader_Replay(const char *Cmd)
     return 0;
 }
 
-int iclassEmlSetMem(uint8_t *data, int blockNum, int blocksCount)
-{
+int iclassEmlSetMem(uint8_t *data, int blockNum, int blocksCount) {
     UsbCommand c = {CMD_MIFARE_EML_MEMSET, {blockNum, blocksCount, 0}};
     memcpy(c.d.asBytes, data, blocksCount * 16);
     clearCommandBuffer();
@@ -636,8 +610,7 @@ int iclassEmlSetMem(uint8_t *data, int blockNum, int blocksCount)
     return 0;
 }
 
-int CmdHFiClassELoad(const char *Cmd)
-{
+int CmdHFiClassELoad(const char *Cmd) {
 
     char ctmp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) < 1 || ctmp == 'h') return usage_hf_iclass_eload();
@@ -705,8 +678,7 @@ int CmdHFiClassELoad(const char *Cmd)
     return 0;
 }
 
-static int readKeyfile(const char *filename, size_t len, uint8_t *buffer)
-{
+static int readKeyfile(const char *filename, size_t len, uint8_t *buffer) {
     FILE *f = fopen(filename, "rb");
     if (!f) {
         PrintAndLogEx(WARNING, "Failed to read from file '%s'", filename);
@@ -730,8 +702,7 @@ static int readKeyfile(const char *filename, size_t len, uint8_t *buffer)
     return 0;
 }
 
-int CmdHFiClassDecrypt(const char *Cmd)
-{
+int CmdHFiClassDecrypt(const char *Cmd) {
 
     char opt = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) < 1 || opt == 'h') return usage_hf_iclass_decrypt();
@@ -818,8 +789,7 @@ int CmdHFiClassDecrypt(const char *Cmd)
     return 0;
 }
 
-static int iClassEncryptBlkData(uint8_t *blkData)
-{
+static int iClassEncryptBlkData(uint8_t *blkData) {
     uint8_t key[16] = { 0 };
     if (readKeyfile("iclass_decryptionkey.bin", 16, key)) {
         usage_hf_iclass_encrypt();
@@ -836,8 +806,7 @@ static int iClassEncryptBlkData(uint8_t *blkData)
     return 1;
 }
 
-int CmdHFiClassEncryptBlk(const char *Cmd)
-{
+int CmdHFiClassEncryptBlk(const char *Cmd) {
     uint8_t blkData[8] = {0};
     char opt = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) < 1 || opt == 'h') return usage_hf_iclass_encrypt();
@@ -853,16 +822,14 @@ int CmdHFiClassEncryptBlk(const char *Cmd)
     return 1;
 }
 
-void Calc_wb_mac(uint8_t blockno, uint8_t *data, uint8_t *div_key, uint8_t MAC[4])
-{
+void Calc_wb_mac(uint8_t blockno, uint8_t *data, uint8_t *div_key, uint8_t MAC[4]) {
     uint8_t wb[9];
     wb[0] = blockno;
     memcpy(wb + 1, data, 8);
     doMAC_N(wb, sizeof(wb), div_key, MAC);
 }
 
-static bool select_only(uint8_t *CSN, uint8_t *CCNR, bool use_credit_key, bool verbose)
-{
+static bool select_only(uint8_t *CSN, uint8_t *CCNR, bool use_credit_key, bool verbose) {
     UsbCommand resp;
     UsbCommand c = {CMD_READER_ICLASS, {0}};
     c.arg[0] = FLAG_ICLASS_READER_ONLY_ONCE | FLAG_ICLASS_READER_CC | FLAG_ICLASS_READER_ONE_TRY;
@@ -897,8 +864,7 @@ static bool select_only(uint8_t *CSN, uint8_t *CCNR, bool use_credit_key, bool v
     return true;
 }
 
-static bool select_and_auth(uint8_t *KEY, uint8_t *MAC, uint8_t *div_key, bool use_credit_key, bool elite, bool rawkey, bool verbose)
-{
+static bool select_and_auth(uint8_t *KEY, uint8_t *MAC, uint8_t *div_key, bool use_credit_key, bool elite, bool rawkey, bool verbose) {
     uint8_t CSN[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
     uint8_t CCNR[12] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
@@ -932,8 +898,7 @@ static bool select_and_auth(uint8_t *KEY, uint8_t *MAC, uint8_t *div_key, bool u
     return true;
 }
 
-int CmdHFiClassReader_Dump(const char *Cmd)
-{
+int CmdHFiClassReader_Dump(const char *Cmd) {
 
     uint8_t MAC[4] = {0x00, 0x00, 0x00, 0x00};
     uint8_t div_key[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
@@ -1189,8 +1154,7 @@ int CmdHFiClassReader_Dump(const char *Cmd)
     return 1;
 }
 
-static int WriteBlock(uint8_t blockno, uint8_t *bldata, uint8_t *KEY, bool use_credit_key, bool elite, bool rawkey, bool verbose)
-{
+static int WriteBlock(uint8_t blockno, uint8_t *bldata, uint8_t *KEY, bool use_credit_key, bool elite, bool rawkey, bool verbose) {
     uint8_t MAC[4] = {0x00, 0x00, 0x00, 0x00};
     uint8_t div_key[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
     if (!select_and_auth(KEY, MAC, div_key, use_credit_key, elite, rawkey, verbose))
@@ -1217,8 +1181,7 @@ static int WriteBlock(uint8_t blockno, uint8_t *bldata, uint8_t *KEY, bool use_c
     return isOK;
 }
 
-int CmdHFiClass_WriteBlock(const char *Cmd)
-{
+int CmdHFiClass_WriteBlock(const char *Cmd) {
     uint8_t blockno = 0;
     uint8_t bldata[8] = {0, 0, 0, 0, 0, 0, 0, 0};
     uint8_t KEY[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
@@ -1296,8 +1259,7 @@ int CmdHFiClass_WriteBlock(const char *Cmd)
     return ans;
 }
 
-int CmdHFiClassCloneTag(const char *Cmd)
-{
+int CmdHFiClassCloneTag(const char *Cmd) {
     char filename[FILE_PATH_SIZE] = { 0x00 };
     char tempStr[50] = {0};
     uint8_t KEY[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
@@ -1449,8 +1411,7 @@ int CmdHFiClassCloneTag(const char *Cmd)
     return 1;
 }
 
-static int ReadBlock(uint8_t *KEY, uint8_t blockno, uint8_t keyType, bool elite, bool rawkey, bool verbose, bool auth)
-{
+static int ReadBlock(uint8_t *KEY, uint8_t blockno, uint8_t keyType, bool elite, bool rawkey, bool verbose, bool auth) {
     uint8_t MAC[4] = {0x00, 0x00, 0x00, 0x00};
     uint8_t div_key[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
@@ -1484,8 +1445,7 @@ static int ReadBlock(uint8_t *KEY, uint8_t blockno, uint8_t keyType, bool elite,
     return 1;
 }
 
-int CmdHFiClass_ReadBlock(const char *Cmd)
-{
+int CmdHFiClass_ReadBlock(const char *Cmd) {
     uint8_t blockno = 0;
     uint8_t keyType = 0x88; //debit key
     uint8_t KEY[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
@@ -1557,8 +1517,7 @@ int CmdHFiClass_ReadBlock(const char *Cmd)
     return ReadBlock(KEY, blockno, keyType, elite, rawkey, verbose, auth);
 }
 
-int CmdHFiClass_loclass(const char *Cmd)
-{
+int CmdHFiClass_loclass(const char *Cmd) {
     char opt = tolower(param_getchar(Cmd, 0));
 
     if (strlen(Cmd) < 1 || opt == 'h')
@@ -1583,8 +1542,7 @@ int CmdHFiClass_loclass(const char *Cmd)
     return 0;
 }
 
-void printIclassDumpContents(uint8_t *iclass_dump, uint8_t startblock, uint8_t endblock, size_t filesize)
-{
+void printIclassDumpContents(uint8_t *iclass_dump, uint8_t startblock, uint8_t endblock, size_t filesize) {
     uint8_t mem_config;
     memcpy(&mem_config, iclass_dump + 13, 1);
     uint8_t maxmemcount;
@@ -1618,8 +1576,7 @@ void printIclassDumpContents(uint8_t *iclass_dump, uint8_t startblock, uint8_t e
     PrintAndLogEx(NORMAL, "------+--+-------------------------+\n");
 }
 
-int CmdHFiClassReadTagFile(const char *Cmd)
-{
+int CmdHFiClassReadTagFile(const char *Cmd) {
     int startblock = 0;
     int endblock = 0;
     char tempnum[5];
@@ -1671,8 +1628,7 @@ int CmdHFiClassReadTagFile(const char *Cmd)
     return 0;
 }
 
-void HFiClassCalcDivKey(uint8_t *CSN, uint8_t *KEY, uint8_t *div_key, bool elite)
-{
+void HFiClassCalcDivKey(uint8_t *CSN, uint8_t *KEY, uint8_t *div_key, bool elite) {
     uint8_t keytable[128] = {0};
     uint8_t key_index[8] = {0};
     if (elite) {
@@ -1694,8 +1650,7 @@ void HFiClassCalcDivKey(uint8_t *CSN, uint8_t *KEY, uint8_t *div_key, bool elite
 //when told CSN, oldkey, newkey, if new key is elite (elite), and if old key was elite (oldElite)
 //calculate and return xor_div_key (ready for a key write command)
 //print all div_keys if verbose
-static void HFiClassCalcNewKey(uint8_t *CSN, uint8_t *OLDKEY, uint8_t *NEWKEY, uint8_t *xor_div_key, bool elite, bool oldElite, bool verbose)
-{
+static void HFiClassCalcNewKey(uint8_t *CSN, uint8_t *OLDKEY, uint8_t *NEWKEY, uint8_t *xor_div_key, bool elite, bool oldElite, bool verbose) {
     uint8_t old_div_key[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
     uint8_t new_div_key[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
     //get old div key
@@ -1713,8 +1668,7 @@ static void HFiClassCalcNewKey(uint8_t *CSN, uint8_t *OLDKEY, uint8_t *NEWKEY, u
     }
 }
 
-int CmdHFiClassCalcNewKey(const char *Cmd)
-{
+int CmdHFiClassCalcNewKey(const char *Cmd) {
     uint8_t OLDKEY[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
     uint8_t NEWKEY[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
     uint8_t xor_div_key[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
@@ -1797,8 +1751,7 @@ int CmdHFiClassCalcNewKey(const char *Cmd)
     return 0;
 }
 
-static int loadKeys(char *filename)
-{
+static int loadKeys(char *filename) {
     FILE *f;
     f = fopen(filename, "rb");
     if (!f) {
@@ -1837,8 +1790,7 @@ static int loadKeys(char *filename)
     return 1;
 }
 
-static int saveKeys(char *filename)
-{
+static int saveKeys(char *filename) {
     FILE *f;
     f = fopen(filename, "wb");
     if (!f) {
@@ -1855,8 +1807,7 @@ static int saveKeys(char *filename)
     return 0;
 }
 
-static int printKeys(void)
-{
+static int printKeys(void) {
     PrintAndLogEx(NORMAL, "");
     for (uint8_t i = 0; i < ICLASS_KEYS_MAX; i++)
         PrintAndLogEx(NORMAL, "%u: %s", i, sprint_hex(iClass_Key_Table[i], 8));
@@ -1864,8 +1815,7 @@ static int printKeys(void)
     return 0;
 }
 
-int CmdHFiClassManageKeys(const char *Cmd)
-{
+int CmdHFiClassManageKeys(const char *Cmd) {
     uint8_t keyNbr = 0;
     uint8_t dataLen = 0;
     uint8_t KEY[8] = {0};
@@ -1955,8 +1905,7 @@ int CmdHFiClassManageKeys(const char *Cmd)
     return 0;
 }
 
-int CmdHFiClassCheckKeys(const char *Cmd)
-{
+int CmdHFiClassCheckKeys(const char *Cmd) {
 
     // empty string
     if (strlen(Cmd) == 0) return usage_hf_iclass_chk();
@@ -2161,8 +2110,7 @@ out:
     return 0;
 }
 
-static int cmp_uint32(const void *a, const void *b)
-{
+static int cmp_uint32(const void *a, const void *b) {
 
     const iclass_prekey_t *x = (const iclass_prekey_t *)a;
     const iclass_prekey_t *y = (const iclass_prekey_t *)b;
@@ -2178,8 +2126,7 @@ static int cmp_uint32(const void *a, const void *b)
 
 // this method tries to identify in which configuration mode a iClass / iClass SE reader is in.
 // Standard or Elite / HighSecurity mode.  It uses a default key dictionary list in order to work.
-int CmdHFiClassLookUp(const char *Cmd)
-{
+int CmdHFiClassLookUp(const char *Cmd) {
 
     uint8_t CSN[8];
     uint8_t EPURSE[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
@@ -2316,8 +2263,7 @@ int CmdHFiClassLookUp(const char *Cmd)
     return 0;
 }
 
-int LoadDictionaryKeyFile(char *filename, uint8_t **keys, int *keycnt)
-{
+int LoadDictionaryKeyFile(char *filename, uint8_t **keys, int *keycnt) {
 
     char buf[17];
     FILE *f;
@@ -2368,8 +2314,7 @@ int LoadDictionaryKeyFile(char *filename, uint8_t **keys, int *keycnt)
 }
 
 // precalc diversified keys and their MAC
-int GenerateMacFromKeyFile(uint8_t *CSN, uint8_t *CCNR, bool use_raw, bool use_elite, uint8_t *keys, int keycnt, iclass_premac_t *list)
-{
+int GenerateMacFromKeyFile(uint8_t *CSN, uint8_t *CCNR, bool use_raw, bool use_elite, uint8_t *keys, int keycnt, iclass_premac_t *list) {
     uint8_t key[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
     uint8_t div_key[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
@@ -2387,8 +2332,7 @@ int GenerateMacFromKeyFile(uint8_t *CSN, uint8_t *CCNR, bool use_raw, bool use_e
     return 0;
 }
 
-int GenerateFromKeyFile(uint8_t *CSN, uint8_t *CCNR, bool use_raw, bool use_elite, uint8_t *keys, int keycnt, iclass_prekey_t *list)
-{
+int GenerateFromKeyFile(uint8_t *CSN, uint8_t *CCNR, bool use_raw, bool use_elite, uint8_t *keys, int keycnt, iclass_prekey_t *list) {
 
     uint8_t div_key[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
@@ -2409,8 +2353,7 @@ int GenerateFromKeyFile(uint8_t *CSN, uint8_t *CCNR, bool use_raw, bool use_elit
 }
 
 // print diversified keys
-void PrintPreCalcMac(uint8_t *keys, int keycnt, iclass_premac_t *pre_list)
-{
+void PrintPreCalcMac(uint8_t *keys, int keycnt, iclass_premac_t *pre_list) {
 
     iclass_prekey_t *b =  calloc(keycnt, sizeof(iclass_prekey_t));
     if (!b)
@@ -2424,8 +2367,7 @@ void PrintPreCalcMac(uint8_t *keys, int keycnt, iclass_premac_t *pre_list)
     free(b);
 }
 
-void PrintPreCalc(iclass_prekey_t *list, int itemcnt)
-{
+void PrintPreCalc(iclass_prekey_t *list, int itemcnt) {
     PrintAndLogEx(NORMAL, "-----+------------------+---------");
     PrintAndLogEx(NORMAL, "#key | key              | mac");
     PrintAndLogEx(NORMAL, "-----+------------------+---------");
@@ -2439,8 +2381,7 @@ void PrintPreCalc(iclass_prekey_t *list, int itemcnt)
     }
 }
 
-static void permute(uint8_t *data, uint8_t len, uint8_t *output)
-{
+static void permute(uint8_t *data, uint8_t len, uint8_t *output) {
 #define KEY_SIZE 8
 
     if (len > KEY_SIZE) {
@@ -2465,14 +2406,12 @@ static void permute(uint8_t *data, uint8_t len, uint8_t *output)
         output[i] = p;
     }
 }
-static void permute_rev(uint8_t *data, uint8_t len, uint8_t *output)
-{
+static void permute_rev(uint8_t *data, uint8_t len, uint8_t *output) {
     permute(data, len, output);
     permute(output, len, data);
     permute(data, len, output);
 }
-static void simple_crc(uint8_t *data, uint8_t len, uint8_t *output)
-{
+static void simple_crc(uint8_t *data, uint8_t len, uint8_t *output) {
     uint8_t crc = 0;
     for (uint8_t i = 0; i < len; ++i) {
         // seventh byte contains the crc.
@@ -2486,13 +2425,11 @@ static void simple_crc(uint8_t *data, uint8_t len, uint8_t *output)
     }
 }
 // DES doesn't use the MSB.
-static void shave(uint8_t *data, uint8_t len)
-{
+static void shave(uint8_t *data, uint8_t len) {
     for (uint8_t i = 0; i < len; ++i)
         data[i] &= 0xFE;
 }
-static void generate_rev(uint8_t *data, uint8_t len)
-{
+static void generate_rev(uint8_t *data, uint8_t len) {
     uint8_t *key = calloc(len, sizeof(uint8_t));
     PrintAndLogEx(SUCCESS, "input permuted key | %s \n", sprint_hex(data, len));
     permute_rev(data, len, key);
@@ -2501,8 +2438,7 @@ static void generate_rev(uint8_t *data, uint8_t len)
     PrintAndLogEx(SUCCESS, "               key | %s \n", sprint_hex(key, len));
     free(key);
 }
-static void generate(uint8_t *data, uint8_t len)
-{
+static void generate(uint8_t *data, uint8_t len) {
     uint8_t *key = calloc(len, sizeof(uint8_t));
     uint8_t *pkey = calloc(len, sizeof(uint8_t));
     PrintAndLogEx(SUCCESS, "   input key | %s \n", sprint_hex(data, len));
@@ -2514,8 +2450,7 @@ static void generate(uint8_t *data, uint8_t len)
     free(pkey);
 }
 
-int CmdHFiClassPermuteKey(const char *Cmd)
-{
+int CmdHFiClassPermuteKey(const char *Cmd) {
 
     uint8_t key[8] = {0};
     uint8_t key_std_format[8] = {0};
@@ -2571,15 +2506,13 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdHFiClass(const char *Cmd)
-{
+int CmdHFiClass(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index a023f14a1..a509873da 100644
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -13,8 +13,7 @@ static int CmdHelp(const char *Cmd);
 
 #define MAX_LENGTH 1024
 
-int usage_legic_calccrc(void)
-{
+int usage_legic_calccrc(void) {
     PrintAndLogEx(NORMAL, "Calculates the legic crc8/crc16 on the given data.");
     PrintAndLogEx(NORMAL, "There must be an even number of hexsymbols as input.");
     PrintAndLogEx(NORMAL, "Usage:  hf legic crc [h] d <data> u <uidcrc> c <8|16>");
@@ -29,8 +28,7 @@ int usage_legic_calccrc(void)
     PrintAndLogEx(NORMAL, "      hf legic crc d deadbeef1122 u 9A c 16");
     return 0;
 }
-int usage_legic_rdmem(void)
-{
+int usage_legic_rdmem(void) {
     PrintAndLogEx(NORMAL, "Read data from a legic tag.");
     PrintAndLogEx(NORMAL, "Usage:  hf legic rdmem [h] <offset> <length> <IV>");
     PrintAndLogEx(NORMAL, "Options:");
@@ -45,8 +43,7 @@ int usage_legic_rdmem(void)
     PrintAndLogEx(NORMAL, "      hf legic rdmem 0 100 55    - reads 0x100 bytes with IV 0x55");
     return 0;
 }
-int usage_legic_sim(void)
-{
+int usage_legic_sim(void) {
     PrintAndLogEx(NORMAL, "Simulates a LEGIC Prime tag. MIM22, MIM256, MIM1024 types can be emulated");
     PrintAndLogEx(NORMAL, "Use ELOAD/ESAVE to upload a dump into emulator memory");
     PrintAndLogEx(NORMAL, "Usage:  hf legic sim [h] <tagtype>");
@@ -60,8 +57,7 @@ int usage_legic_sim(void)
     PrintAndLogEx(NORMAL, "      hf legic sim 2");
     return 0;
 }
-int usage_legic_write(void)
-{
+int usage_legic_write(void) {
     PrintAndLogEx(NORMAL, "Write data to a LEGIC Prime tag. It autodetects tagsize to make sure size");
     PrintAndLogEx(NORMAL, "Usage:  hf legic write [h] o <offset> d <data (hex symbols)>");
     PrintAndLogEx(NORMAL, "Options:");
@@ -74,8 +70,7 @@ int usage_legic_write(void)
     PrintAndLogEx(NORMAL, "      hf legic write o 10 d 11223344    - Write 0x11223344 starting from offset 0x10");
     return 0;
 }
-int usage_legic_reader(void)
-{
+int usage_legic_reader(void) {
     PrintAndLogEx(NORMAL, "Read UID and type information from a legic tag.");
     PrintAndLogEx(NORMAL, "Usage:  hf legic reader [h]");
     PrintAndLogEx(NORMAL, "Options:");
@@ -85,8 +80,7 @@ int usage_legic_reader(void)
     PrintAndLogEx(NORMAL, "      hf legic reader");
     return 0;
 }
-int usage_legic_info(void)
-{
+int usage_legic_info(void) {
     PrintAndLogEx(NORMAL, "Reads information from a legic prime tag.");
     PrintAndLogEx(NORMAL, "Shows systemarea, user areas etc");
     PrintAndLogEx(NORMAL, "Usage:  hf legic info [h]");
@@ -97,8 +91,7 @@ int usage_legic_info(void)
     PrintAndLogEx(NORMAL, "      hf legic info");
     return 0;
 }
-int usage_legic_dump(void)
-{
+int usage_legic_dump(void) {
     PrintAndLogEx(NORMAL, "Reads all pages from LEGIC Prime MIM22, MIM256, MIM1024");
     PrintAndLogEx(NORMAL, "and saves binary dump into the file `filename.bin` or `cardUID.bin`");
     PrintAndLogEx(NORMAL, "It autodetects card type.\n");
@@ -112,8 +105,7 @@ int usage_legic_dump(void)
     PrintAndLogEx(NORMAL, "      hf legic dump o myfile");
     return 0;
 }
-int usage_legic_restore(void)
-{
+int usage_legic_restore(void) {
     PrintAndLogEx(NORMAL, "Reads binary file and it autodetects card type and verifies that the file has the same size");
     PrintAndLogEx(NORMAL, "Then write the data back to card. All bytes except the first 7bytes [UID(4) MCC(1) DCF(2)]\n");
     PrintAndLogEx(NORMAL, "Usage:   hf legic restore [h] i <filename w/o .bin>");
@@ -125,8 +117,7 @@ int usage_legic_restore(void)
     PrintAndLogEx(NORMAL, "      hf legic restore i myfile");
     return 0;
 }
-int usage_legic_eload(void)
-{
+int usage_legic_eload(void) {
     PrintAndLogEx(NORMAL, "It loads binary dump from the file `filename.bin`");
     PrintAndLogEx(NORMAL, "Usage:  hf legic eload [h] [card memory] <file name w/o `.bin`>");
     PrintAndLogEx(NORMAL, "Options:");
@@ -140,8 +131,7 @@ int usage_legic_eload(void)
     PrintAndLogEx(NORMAL, "      hf legic eload 2 myfile");
     return 0;
 }
-int usage_legic_esave(void)
-{
+int usage_legic_esave(void) {
     PrintAndLogEx(NORMAL, "It saves binary dump into the file `filename.bin` or `cardID.bin`");
     PrintAndLogEx(NORMAL, " Usage:  hf legic esave [h] [card memory] [file name w/o `.bin`]");
     PrintAndLogEx(NORMAL, "Options:");
@@ -155,8 +145,7 @@ int usage_legic_esave(void)
     PrintAndLogEx(NORMAL, "      hf legic esave 2 myfile");
     return 0;
 }
-int usage_legic_wipe(void)
-{
+int usage_legic_wipe(void) {
     PrintAndLogEx(NORMAL, "Fills a legic tag memory with zeros. From byte7 and to the end.");
     PrintAndLogEx(NORMAL, " Usage:  hf legic wipe [h]");
     PrintAndLogEx(NORMAL, "Options:");
@@ -171,8 +160,7 @@ int usage_legic_wipe(void)
  *  This is based on information given in the talk held
  *  by Henryk Ploetz and Karsten Nohl at 26c3
  */
-int CmdLegicInfo(const char *Cmd)
-{
+int CmdLegicInfo(const char *Cmd) {
 
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_legic_info();
@@ -481,8 +469,7 @@ out:
 // params:
 // offset in data memory
 // number of bytes to read
-int CmdLegicRdmem(const char *Cmd)
-{
+int CmdLegicRdmem(const char *Cmd) {
 
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_legic_rdmem();
@@ -516,8 +503,7 @@ int CmdLegicRdmem(const char *Cmd)
     return status;
 }
 
-int CmdLegicRfSim(const char *Cmd)
-{
+int CmdLegicRfSim(const char *Cmd) {
 
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) == 0 || cmdp == 'h') return usage_legic_sim();
@@ -529,8 +515,7 @@ int CmdLegicRfSim(const char *Cmd)
     return 0;
 }
 
-int CmdLegicRfWrite(const char *Cmd)
-{
+int CmdLegicRfWrite(const char *Cmd) {
 
     uint8_t *data = NULL;
     uint8_t cmdp = 0;
@@ -670,8 +655,7 @@ int CmdLegicRfWrite(const char *Cmd)
     return 0;
 }
 
-int CmdLegicCalcCrc(const char *Cmd)
-{
+int CmdLegicCalcCrc(const char *Cmd) {
 
     uint8_t *data = NULL;
     uint8_t cmdp = 0, uidcrc = 0, type = 0;
@@ -753,8 +737,7 @@ int CmdLegicCalcCrc(const char *Cmd)
     return 0;
 }
 
-int legic_read_mem(uint32_t offset, uint32_t len, uint32_t iv, uint8_t *out, uint16_t *outlen)
-{
+int legic_read_mem(uint32_t offset, uint32_t len, uint32_t iv, uint8_t *out, uint16_t *outlen) {
 
     legic_chk_iv(&iv);
 
@@ -793,8 +776,7 @@ int legic_read_mem(uint32_t offset, uint32_t len, uint32_t iv, uint8_t *out, uin
     return 0;
 }
 
-int legic_print_type(uint32_t tagtype, uint8_t spaces)
-{
+int legic_print_type(uint32_t tagtype, uint8_t spaces) {
     char spc[11] = "          ";
     spc[10] = 0x00;
     char *spacer = spc + (10 - spaces);
@@ -809,8 +791,7 @@ int legic_print_type(uint32_t tagtype, uint8_t spaces)
         PrintAndLogEx(INFO, "%sTYPE : Unknown %06x", spacer, tagtype);
     return 0;
 }
-int legic_get_type(legic_card_select_t *card)
-{
+int legic_get_type(legic_card_select_t *card) {
 
     if (card == NULL) return 1;
 
@@ -828,8 +809,7 @@ int legic_get_type(legic_card_select_t *card)
     memcpy(card, (legic_card_select_t *)resp.d.asBytes, sizeof(legic_card_select_t));
     return 0;
 }
-void legic_chk_iv(uint32_t *iv)
-{
+void legic_chk_iv(uint32_t *iv) {
     if ((*iv & 0x7F) != *iv) {
         *iv &= 0x7F;
         PrintAndLogEx(INFO, "Truncating IV to 7bits, %u", *iv);
@@ -840,8 +820,7 @@ void legic_chk_iv(uint32_t *iv)
         PrintAndLogEx(INFO, "LSB of IV must be SET %u", *iv);
     }
 }
-void legic_seteml(uint8_t *src, uint32_t offset, uint32_t numofbytes)
-{
+void legic_seteml(uint8_t *src, uint32_t offset, uint32_t numofbytes) {
     size_t len = 0;
 
     UsbCommand c = {CMD_LEGIC_ESET, {0, 0, 0}};
@@ -856,8 +835,7 @@ void legic_seteml(uint8_t *src, uint32_t offset, uint32_t numofbytes)
     }
 }
 
-int HFLegicReader(const char *Cmd, bool verbose)
-{
+int HFLegicReader(const char *Cmd, bool verbose) {
 
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_legic_reader();
@@ -879,13 +857,11 @@ int HFLegicReader(const char *Cmd, bool verbose)
     legic_print_type(card.cardsize, 0);
     return 0;
 }
-int CmdLegicReader(const char *Cmd)
-{
+int CmdLegicReader(const char *Cmd) {
     return HFLegicReader(Cmd, true);
 }
 
-int CmdLegicDump(const char *Cmd)
-{
+int CmdLegicDump(const char *Cmd) {
 
     FILE *f;
     char filename[FILE_PATH_SIZE] = {0x00};
@@ -990,8 +966,7 @@ int CmdLegicDump(const char *Cmd)
     return 0;
 }
 
-int CmdLegicRestore(const char *Cmd)
-{
+int CmdLegicRestore(const char *Cmd) {
 
     FILE *f;
     char filename[FILE_PATH_SIZE] = {0x00};
@@ -1118,8 +1093,7 @@ int CmdLegicRestore(const char *Cmd)
     return 0;
 }
 
-int CmdLegicELoad(const char *Cmd)
-{
+int CmdLegicELoad(const char *Cmd) {
     FILE *f;
     char filename[FILE_PATH_SIZE];
     char *fnameptr = filename;
@@ -1189,8 +1163,7 @@ int CmdLegicELoad(const char *Cmd)
     return 0;
 }
 
-int CmdLegicESave(const char *Cmd)
-{
+int CmdLegicESave(const char *Cmd) {
 
     char filename[FILE_PATH_SIZE];
     char *fnameptr = filename;
@@ -1250,8 +1223,7 @@ int CmdLegicESave(const char *Cmd)
     return 0;
 }
 
-int CmdLegicWipe(const char *Cmd)
-{
+int CmdLegicWipe(const char *Cmd) {
 
     char cmdp = tolower(param_getchar(Cmd, 0));
 
@@ -1314,8 +1286,7 @@ int CmdLegicWipe(const char *Cmd)
     return 0;
 }
 
-int CmdLegicList(const char *Cmd)
-{
+int CmdLegicList(const char *Cmd) {
     CmdTraceList("legic");
     return 0;
 }
@@ -1337,15 +1308,13 @@ static command_t CommandTable[] =  {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdHFLegic(const char *Cmd)
-{
+int CmdHFLegic(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
\ No newline at end of file
diff --git a/client/cmdhflist.c b/client/cmdhflist.c
index bd78c543b..6bcfe0b20 100644
--- a/client/cmdhflist.c
+++ b/client/cmdhflist.c
@@ -24,8 +24,7 @@ enum MifareAuthSeq {
 static enum MifareAuthSeq MifareAuthState;
 static TAuthData AuthData;
 
-void ClearAuthData()
-{
+void ClearAuthData() {
     AuthData.uid = 0;
     AuthData.nt = 0;
     AuthData.first_auth = true;
@@ -43,15 +42,13 @@ void ClearAuthData()
  *          2 : Not crc-command
  */
 
-uint8_t iso14443A_CRC_check(bool isResponse, uint8_t *d, uint8_t n)
-{
+uint8_t iso14443A_CRC_check(bool isResponse, uint8_t *d, uint8_t n) {
     if (n < 3) return 2;
     if (isResponse & (n < 6)) return 2;
     return check_crc(CRC_14443_A, d, n);
 }
 
-uint8_t mifare_CRC_check(bool isResponse, uint8_t *data, uint8_t len)
-{
+uint8_t mifare_CRC_check(bool isResponse, uint8_t *data, uint8_t len) {
     switch (MifareAuthState) {
         case masNone:
         case masError:
@@ -69,13 +66,11 @@ uint8_t mifare_CRC_check(bool isResponse, uint8_t *data, uint8_t len)
  *          1 : CRC-command, CRC ok
  *          2 : Not crc-command
  */
-uint8_t iso14443B_CRC_check(uint8_t *d, uint8_t n)
-{
+uint8_t iso14443B_CRC_check(uint8_t *d, uint8_t n) {
     return check_crc(CRC_14443_B, d, n);
 }
 
-uint8_t iso15693_CRC_check(uint8_t *d, uint8_t n)
-{
+uint8_t iso15693_CRC_check(uint8_t *d, uint8_t n) {
     return check_crc(CRC_15693, d, n);
 }
 
@@ -88,8 +83,7 @@ uint8_t iso15693_CRC_check(uint8_t *d, uint8_t n)
  *          1 : CRC-command, CRC ok
  *          2 : Not crc-command
  */
-uint8_t iclass_CRC_check(bool isResponse, uint8_t *d, uint8_t n)
-{
+uint8_t iclass_CRC_check(bool isResponse, uint8_t *d, uint8_t n) {
     //CRC commands (and responses) are all at least 4 bytes
     if (n < 4) return 2;
 
@@ -136,8 +130,7 @@ uint8_t iclass_CRC_check(bool isResponse, uint8_t *d, uint8_t n)
     return check_crc(CRC_ICLASS, d, n);
 }
 
-int applyIso14443a(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize)
-{
+int applyIso14443a(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize) {
     switch (cmd[0]) {
         case ISO14443A_CMD_WUPA:
             snprintf(exp, size, "WUPA");
@@ -272,13 +265,11 @@ int applyIso14443a(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize)
     return 1;
 }
 
-void annotateIso14443a(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize)
-{
+void annotateIso14443a(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize) {
     applyIso14443a(exp, size, cmd, cmdsize);
 }
 
-void annotateIclass(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize)
-{
+void annotateIclass(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize) {
     switch (cmd[0]) {
         case ICLASS_CMD_ACTALL:
             snprintf(exp, size, "ACTALL");
@@ -328,8 +319,7 @@ void annotateIclass(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize)
     return;
 }
 
-void annotateIso15693(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize)
-{
+void annotateIso15693(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize) {
 
     switch (cmd[1]) {
         case ISO15693_INVENTORY:
@@ -385,8 +375,7 @@ void annotateIso15693(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize)
         snprintf(exp, size, "?");
 }
 
-void annotateTopaz(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize)
-{
+void annotateTopaz(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize) {
     switch (cmd[0]) {
         case TOPAZ_REQA:
             snprintf(exp, size, "REQA");
@@ -428,8 +417,7 @@ void annotateTopaz(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize)
 }
 
 // iso 7816-3
-void annotateIso7816(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize)
-{
+void annotateIso7816(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize) {
     // S-block
     if ((cmd[0] & 0xC0) && (cmdsize == 3)) {
         switch ((cmd[0] & 0x3f)) {
@@ -544,8 +532,7 @@ void annotateIso7816(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize)
 }
 
 // MIFARE DESFire
-void annotateMfDesfire(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize)
-{
+void annotateMfDesfire(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize) {
 
     // it's basically a ISO14443a tag, so try annotation from there
     if (!applyIso14443a(exp, size, cmd, cmdsize)) {
@@ -707,8 +694,7 @@ void annotateMfDesfire(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize)
 0F = Completion
 0A 11 22 33 44 55 66 = Authenticate (11 22 33 44 55 66 = data to authenticate)
 **/
-void annotateIso14443b(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize)
-{
+void annotateIso14443b(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize) {
     switch (cmd[0]) {
         case ISO14443B_REQB           : {
 
@@ -781,8 +767,7 @@ void annotateIso14443b(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize)
 // 1 = read
 // 0 = write
 // Quite simpel tag
-void annotateLegic(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize)
-{
+void annotateLegic(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize) {
     uint8_t bitsend = cmd[0];
     uint8_t cmdBit = (cmd[1] & 1);
     switch (bitsend) {
@@ -843,8 +828,7 @@ void annotateLegic(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize)
     }
 }
 
-void annotateFelica(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize)
-{
+void annotateFelica(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize) {
 
     switch (cmd[0]) {
         case FELICA_POLL_REQ:
@@ -973,8 +957,7 @@ void annotateFelica(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize)
     }
 }
 
-void annotateMifare(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize, uint8_t *parity, uint8_t paritysize, bool isResponse)
-{
+void annotateMifare(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize, uint8_t *parity, uint8_t paritysize, bool isResponse) {
     if (!isResponse && cmdsize == 1) {
         switch (cmd[0]) {
             case ISO14443A_CMD_WUPA:
@@ -1050,8 +1033,7 @@ void annotateMifare(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize, uint8
 
 }
 
-bool DecodeMifareData(uint8_t *cmd, uint8_t cmdsize, uint8_t *parity, bool isResponse, uint8_t *mfData, size_t *mfDataLen)
-{
+bool DecodeMifareData(uint8_t *cmd, uint8_t cmdsize, uint8_t *parity, bool isResponse, uint8_t *mfData, size_t *mfDataLen) {
     static struct Crypto1State *traceCrypto1;
     static uint64_t mfLastKey;
 
@@ -1183,8 +1165,7 @@ bool DecodeMifareData(uint8_t *cmd, uint8_t cmdsize, uint8_t *parity, bool isRes
     return *mfDataLen > 0;
 }
 
-bool NTParityChk(TAuthData *ad, uint32_t ntx)
-{
+bool NTParityChk(TAuthData *ad, uint32_t ntx) {
     if (
         (oddparity8(ntx >> 8 & 0xff) ^ (ntx & 0x01) ^ ((ad->nt_enc_par >> 5) & 0x01) ^ (ad->nt_enc & 0x01)) ||
         (oddparity8(ntx >> 16 & 0xff) ^ (ntx >> 8 & 0x01) ^ ((ad->nt_enc_par >> 6) & 0x01) ^ (ad->nt_enc >> 8 & 0x01)) ||
@@ -1212,8 +1193,7 @@ bool NTParityChk(TAuthData *ad, uint32_t ntx)
     return true;
 }
 
-bool NestedCheckKey(uint64_t key, TAuthData *ad, uint8_t *cmd, uint8_t cmdsize, uint8_t *parity)
-{
+bool NestedCheckKey(uint64_t key, TAuthData *ad, uint8_t *cmd, uint8_t cmdsize, uint8_t *parity) {
     uint8_t buf[32] = {0};
     struct Crypto1State *pcs;
 
@@ -1251,8 +1231,7 @@ bool NestedCheckKey(uint64_t key, TAuthData *ad, uint8_t *cmd, uint8_t cmdsize,
     return true;
 }
 
-bool CheckCrypto1Parity(uint8_t *cmd_enc, uint8_t cmdsize, uint8_t *cmd, uint8_t *parity_enc)
-{
+bool CheckCrypto1Parity(uint8_t *cmd_enc, uint8_t cmdsize, uint8_t *cmd, uint8_t *parity_enc) {
     for (int i = 0; i < cmdsize - 1; i++) {
         if (oddparity8(cmd[i]) ^ (cmd[i + 1] & 0x01) ^ ((parity_enc[i / 8] >> (7 - i % 8)) & 0x01) ^ (cmd_enc[i + 1] & 0x01))
             return false;
@@ -1262,8 +1241,7 @@ bool CheckCrypto1Parity(uint8_t *cmd_enc, uint8_t cmdsize, uint8_t *cmd, uint8_t
 
 // Another implementation of mfkey64 attack,  more "valid" than "probable"
 //
-uint64_t GetCrypto1ProbableKey(TAuthData *ad)
-{
+uint64_t GetCrypto1ProbableKey(TAuthData *ad) {
     struct Crypto1State *revstate = lfsr_recovery64(ad->ks2, ad->ks3);
     lfsr_rollback_word(revstate, 0, 0);
     lfsr_rollback_word(revstate, 0, 0);
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 648bd0988..e3b8cb957 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -28,8 +28,7 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_hf14_ice(void)
-{
+int usage_hf14_ice(void) {
     PrintAndLogEx(NORMAL, "Usage:   hf mf ice [l] <limit> [f] <name>");
     PrintAndLogEx(NORMAL, "  h            this help");
     PrintAndLogEx(NORMAL, "  l <limit>    nonces to be collected");
@@ -41,8 +40,7 @@ int usage_hf14_ice(void)
     return 0;
 }
 
-int usage_hf14_dump(void)
-{
+int usage_hf14_dump(void) {
     PrintAndLogEx(NORMAL, "Usage:   hf mf dump [card memory] k <name> f <name>");
     PrintAndLogEx(NORMAL, "  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");
     PrintAndLogEx(NORMAL, "  k <name>     : key filename, if no <name> given, UID will be used as filename");
@@ -54,8 +52,7 @@ int usage_hf14_dump(void)
     return 0;
 }
 
-int usage_hf14_mifare(void)
-{
+int usage_hf14_mifare(void) {
     PrintAndLogEx(NORMAL, "Usage:  hf mf darkside [h] <block number> <A|B>");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "      h               this help");
@@ -67,8 +64,7 @@ int usage_hf14_mifare(void)
     PrintAndLogEx(NORMAL, "           hf mf darkside 16 B");
     return 0;
 }
-int usage_hf14_mf1ksim(void)
-{
+int usage_hf14_mf1ksim(void) {
     PrintAndLogEx(NORMAL, "Usage:  hf mf sim [h] u <uid> n <numreads> [i] [x] [e] [v]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "      h    this help");
@@ -85,8 +81,7 @@ int usage_hf14_mf1ksim(void)
     PrintAndLogEx(NORMAL, "           hf mf sim u 11223344 i x");
     return 0;
 }
-int usage_hf14_dbg(void)
-{
+int usage_hf14_dbg(void) {
     PrintAndLogEx(NORMAL, "Usage:  hf mf dbg [h] <debug level>");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "           h    this help");
@@ -101,8 +96,7 @@ int usage_hf14_dbg(void)
     PrintAndLogEx(NORMAL, "           hf mf dbg 3");
     return 0;
 }
-int usage_hf14_sniff(void)
-{
+int usage_hf14_sniff(void) {
     PrintAndLogEx(NORMAL, "It continuously gets data from the field and saves it to: log, emulator, emulator file.");
     PrintAndLogEx(NORMAL, "Usage:  hf mf sniff [h] [l] [d] [f]");
     PrintAndLogEx(NORMAL, "Options:");
@@ -115,8 +109,7 @@ int usage_hf14_sniff(void)
     PrintAndLogEx(NORMAL, "           hf mf sniff l d f");
     return 0;
 }
-int usage_hf14_nested(void)
-{
+int usage_hf14_nested(void) {
     PrintAndLogEx(NORMAL, "Usage:");
     PrintAndLogEx(NORMAL, " all sectors:  hf mf nested  <card memory> <block number> <key A/B> <key (12 hex symbols)> [t,d]");
     PrintAndLogEx(NORMAL, " one sector:   hf mf nested  o <block number> <key A/B> <key (12 hex symbols)>");
@@ -134,8 +127,7 @@ int usage_hf14_nested(void)
     PrintAndLogEx(NORMAL, "      hf mf nested o 0 A FFFFFFFFFFFF 4 A");
     return 0;
 }
-int usage_hf14_hardnested(void)
-{
+int usage_hf14_hardnested(void) {
     PrintAndLogEx(NORMAL, "Usage:");
     PrintAndLogEx(NORMAL, "      hf mf hardnested <block number> <key A|B> <key (12 hex symbols)>");
     PrintAndLogEx(NORMAL, "                       <target block number> <target key A|B> [known target key (12 hex symbols)] [w] [s]");
@@ -168,8 +160,7 @@ int usage_hf14_hardnested(void)
     PrintAndLogEx(NORMAL, "      hf mf hardnested 0 A A0A1A2A3A4A5 4 A FFFFFFFFFFFF");
     return 0;
 }
-int usage_hf14_chk(void)
-{
+int usage_hf14_chk(void) {
     PrintAndLogEx(NORMAL, "Usage:  hf mf chk [h] <block number>|<*card memory> <key type (A/B/?)> [t|d] [<key (12 hex symbols)>] [<dic (*.dic)>]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "      h    this help");
@@ -187,8 +178,7 @@ int usage_hf14_chk(void)
     PrintAndLogEx(NORMAL, "      hf mf chk *1 ? d                        -- target all blocks, all keys, 1K, write to file");
     return 0;
 }
-int usage_hf14_chk_fast(void)
-{
+int usage_hf14_chk_fast(void) {
     PrintAndLogEx(NORMAL, "This is a improved checkkeys method speedwise. It checks Mifare Classic tags sector keys against a dictionary file with keys");
     PrintAndLogEx(NORMAL, "Usage:  hf mf fchk [h] <card memory> [t|d|f] [<key (12 hex symbols)>] [<dic (*.dic)>]");
     PrintAndLogEx(NORMAL, "Options:");
@@ -211,8 +201,7 @@ int usage_hf14_chk_fast(void)
 #endif
     return 0;
 }
-int usage_hf14_keybrute(void)
-{
+int usage_hf14_keybrute(void) {
     PrintAndLogEx(NORMAL, "J_Run's 2nd phase of multiple sector nested authentication key recovery");
     PrintAndLogEx(NORMAL, "You have a known 4 last bytes of a key recovered with mf_nonce_brute tool.");
     PrintAndLogEx(NORMAL, "First 2 bytes of key will be bruteforced");
@@ -229,8 +218,7 @@ int usage_hf14_keybrute(void)
     PrintAndLogEx(NORMAL, "           hf mf keybrute 1 A 000011223344");
     return 0;
 }
-int usage_hf14_restore(void)
-{
+int usage_hf14_restore(void) {
     PrintAndLogEx(NORMAL, "Usage:   hf mf restore [card memory] u <UID> k <name> f <name>");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");
@@ -245,8 +233,7 @@ int usage_hf14_restore(void)
     PrintAndLogEx(NORMAL, "         hf mf restore 4                          -- read the UID from tag with 4K memory first, then restore from hf-mf-<UID>-key.bin and and hf-mf-<UID>-data.bin");
     return 0;
 }
-int usage_hf14_decryptbytes(void)
-{
+int usage_hf14_decryptbytes(void) {
     PrintAndLogEx(NORMAL, "Decrypt Crypto-1 encrypted bytes given some known state of crypto. See tracelog to gather needed values\n");
     PrintAndLogEx(NORMAL, "Usage:   hf mf decrypt [h] <nt> <ar_enc> <at_enc> <data>");
     PrintAndLogEx(NORMAL, "Options:");
@@ -261,28 +248,24 @@ int usage_hf14_decryptbytes(void)
     return 0;
 }
 
-int usage_hf14_eget(void)
-{
+int usage_hf14_eget(void) {
     PrintAndLogEx(NORMAL, "Usage:  hf mf eget <block number>");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "        hf mf eget 0 ");
     return 0;
 }
-int usage_hf14_eclr(void)
-{
+int usage_hf14_eclr(void) {
     PrintAndLogEx(NORMAL, "It set card emulator memory to empty data blocks and key A/B FFFFFFFFFFFF \n");
     PrintAndLogEx(NORMAL, "Usage:  hf mf eclr");
     return 0;
 }
-int usage_hf14_eset(void)
-{
+int usage_hf14_eset(void) {
     PrintAndLogEx(NORMAL, "Usage:  hf mf eset <block number> <block data (32 hex symbols)>");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "        hf mf eset 1 000102030405060708090a0b0c0d0e0f ");
     return 0;
 }
-int usage_hf14_eload(void)
-{
+int usage_hf14_eload(void) {
     PrintAndLogEx(NORMAL, "It loads emul dump from the file `filename.eml`");
     PrintAndLogEx(NORMAL, "Usage:  hf mf eload [card memory] <file name w/o `.eml`> [numblocks]");
     PrintAndLogEx(NORMAL, "  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K, u = UL");
@@ -292,8 +275,7 @@ int usage_hf14_eload(void)
     PrintAndLogEx(NORMAL, "        hf mf eload 4 filename");
     return 0;
 }
-int usage_hf14_esave(void)
-{
+int usage_hf14_esave(void) {
     PrintAndLogEx(NORMAL, "It saves emul dump into the file `filename.eml` or `cardID.eml`");
     PrintAndLogEx(NORMAL, " Usage:  hf mf esave [card memory] [file name w/o `.eml`]");
     PrintAndLogEx(NORMAL, "  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");
@@ -304,8 +286,7 @@ int usage_hf14_esave(void)
     PrintAndLogEx(NORMAL, "        hf mf esave 4 filename");
     return 0;
 }
-int usage_hf14_ecfill(void)
-{
+int usage_hf14_ecfill(void) {
     PrintAndLogEx(NORMAL, "Read card and transfer its data to emulator memory.");
     PrintAndLogEx(NORMAL, "Keys must be laid in the emulator memory. \n");
     PrintAndLogEx(NORMAL, "Usage:  hf mf ecfill <key A/B> [card memory]");
@@ -316,8 +297,7 @@ int usage_hf14_ecfill(void)
     PrintAndLogEx(NORMAL, "        hf mf ecfill A 4");
     return 0;
 }
-int usage_hf14_ekeyprn(void)
-{
+int usage_hf14_ekeyprn(void) {
     PrintAndLogEx(NORMAL, "It prints the keys loaded in the emulator memory");
     PrintAndLogEx(NORMAL, "Usage:  hf mf ekeyprn [card memory]");
     PrintAndLogEx(NORMAL, "  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");
@@ -327,8 +307,7 @@ int usage_hf14_ekeyprn(void)
     return 0;
 }
 
-int usage_hf14_csetuid(void)
-{
+int usage_hf14_csetuid(void) {
     PrintAndLogEx(NORMAL, "Set UID, ATQA, and SAK for magic Chinese card. Only works with magic cards");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  hf mf csetuid [h] <UID 8 hex symbols> [ATQA 4 hex symbols] [SAK 2 hex symbols] [w]");
@@ -343,8 +322,7 @@ int usage_hf14_csetuid(void)
     PrintAndLogEx(NORMAL, "      hf mf csetuid 01020304 0004 08 w");
     return 0;
 }
-int usage_hf14_csetblk(void)
-{
+int usage_hf14_csetblk(void) {
     PrintAndLogEx(NORMAL, "Set block data for magic Chinese card. Only works with magic cards");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  hf mf csetblk [h] <block number> <block data (32 hex symbols)> [w]");
@@ -358,8 +336,7 @@ int usage_hf14_csetblk(void)
     PrintAndLogEx(NORMAL, "       hf mf csetblk 1 01020304050607080910111213141516 w");
     return 0;
 }
-int usage_hf14_cload(void)
-{
+int usage_hf14_cload(void) {
     PrintAndLogEx(NORMAL, "It loads magic Chinese card from the file `filename.eml`");
     PrintAndLogEx(NORMAL, "or from emulator memory");
     PrintAndLogEx(NORMAL, "");
@@ -375,8 +352,7 @@ int usage_hf14_cload(void)
     PrintAndLogEx(NORMAL, "       hf mf cload e");
     return 0;
 }
-int usage_hf14_cgetblk(void)
-{
+int usage_hf14_cgetblk(void) {
     PrintAndLogEx(NORMAL, "Get block data from magic Chinese card. Only works with magic cards\n");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  hf mf cgetblk [h] <block number>");
@@ -387,8 +363,7 @@ int usage_hf14_cgetblk(void)
     PrintAndLogEx(NORMAL, "      hf mf cgetblk 1");
     return 0;
 }
-int usage_hf14_cgetsc(void)
-{
+int usage_hf14_cgetsc(void) {
     PrintAndLogEx(NORMAL, "Get sector data from magic Chinese card. Only works with magic cards\n");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  hf mf cgetsc [h] <sector number>");
@@ -399,8 +374,7 @@ int usage_hf14_cgetsc(void)
     PrintAndLogEx(NORMAL, "      hf mf cgetsc 0");
     return 0;
 }
-int usage_hf14_csave(void)
-{
+int usage_hf14_csave(void) {
     PrintAndLogEx(NORMAL, "It saves `magic Chinese` card dump into the file `filename.eml` or `cardID.eml`");
     PrintAndLogEx(NORMAL, "or into emulator memory");
     PrintAndLogEx(NORMAL, "");
@@ -418,8 +392,7 @@ int usage_hf14_csave(void)
     PrintAndLogEx(NORMAL, "       hf mf csave 4 o filename");
     return 0;
 }
-int usage_hf14_nack(void)
-{
+int usage_hf14_nack(void) {
     PrintAndLogEx(NORMAL, "Test a mifare classic based card for the NACK bug.");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  hf mf nack [h] [v]");
@@ -431,8 +404,7 @@ int usage_hf14_nack(void)
     return 0;
 }
 
-int GetHFMF14AUID(uint8_t *uid, int *uidlen)
-{
+int GetHFMF14AUID(uint8_t *uid, int *uidlen) {
     UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT, 0, 0}};
     clearCommandBuffer();
     SendCommand(&c);
@@ -450,8 +422,7 @@ int GetHFMF14AUID(uint8_t *uid, int *uidlen)
     return 1;
 }
 
-char *GenerateFilename(const char *prefix, const char *suffix)
-{
+char *GenerateFilename(const char *prefix, const char *suffix) {
     uint8_t uid[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
     int uidlen = 0;
     char *fptr = calloc(sizeof(char) * (strlen(prefix) + strlen(suffix)) + sizeof(uid) * 2 + 1,  sizeof(uint8_t));
@@ -468,8 +439,7 @@ char *GenerateFilename(const char *prefix, const char *suffix)
     return fptr;
 }
 
-int CmdHF14AMfDarkside(const char *Cmd)
-{
+int CmdHF14AMfDarkside(const char *Cmd) {
     uint8_t blockno = 0, key_type = MIFARE_AUTH_KEYA;
     uint64_t key = 0;
 
@@ -509,8 +479,7 @@ int CmdHF14AMfDarkside(const char *Cmd)
     return 0;
 }
 
-int CmdHF14AMfWrBl(const char *Cmd)
-{
+int CmdHF14AMfWrBl(const char *Cmd) {
     uint8_t blockNo = 0;
     uint8_t keyType = 0;
     uint8_t key[6] = {0, 0, 0, 0, 0, 0};
@@ -564,8 +533,7 @@ int CmdHF14AMfWrBl(const char *Cmd)
     return 0;
 }
 
-int CmdHF14AMfRdBl(const char *Cmd)
-{
+int CmdHF14AMfRdBl(const char *Cmd) {
     uint8_t blockNo = 0;
     uint8_t keyType = 0;
     uint8_t key[6] = {0, 0, 0, 0, 0, 0};
@@ -629,8 +597,7 @@ int CmdHF14AMfRdBl(const char *Cmd)
     return 0;
 }
 
-int CmdHF14AMfRdSc(const char *Cmd)
-{
+int CmdHF14AMfRdSc(const char *Cmd) {
     int i;
     uint8_t sectorNo = 0;
     uint8_t keyType = 0;
@@ -701,8 +668,7 @@ int CmdHF14AMfRdSc(const char *Cmd)
     return 0;
 }
 
-uint16_t NumOfBlocks(char card)
-{
+uint16_t NumOfBlocks(char card) {
     switch (card) {
         case '0' :
             return MIFARE_MINI_MAXBLOCK;
@@ -716,8 +682,7 @@ uint16_t NumOfBlocks(char card)
             return MIFARE_1K_MAXBLOCK;
     }
 }
-uint8_t NumOfSectors(char card)
-{
+uint8_t NumOfSectors(char card) {
     switch (card) {
         case '0' :
             return MIFARE_MINI_MAXSECTOR;
@@ -732,8 +697,7 @@ uint8_t NumOfSectors(char card)
     }
 }
 
-uint8_t FirstBlockOfSector(uint8_t sectorNo)
-{
+uint8_t FirstBlockOfSector(uint8_t sectorNo) {
     if (sectorNo < 32) {
         return sectorNo * 4;
     } else {
@@ -741,8 +705,7 @@ uint8_t FirstBlockOfSector(uint8_t sectorNo)
     }
 }
 
-uint8_t NumBlocksPerSector(uint8_t sectorNo)
-{
+uint8_t NumBlocksPerSector(uint8_t sectorNo) {
     if (sectorNo < 32) {
         return 4;
     } else {
@@ -750,8 +713,7 @@ uint8_t NumBlocksPerSector(uint8_t sectorNo)
     }
 }
 
-int CmdHF14AMfDump(const char *Cmd)
-{
+int CmdHF14AMfDump(const char *Cmd) {
 
     uint8_t sectorNo, blockNo;
     uint8_t keyA[40][6];
@@ -957,8 +919,7 @@ int CmdHF14AMfDump(const char *Cmd)
     return 0;
 }
 
-int CmdHF14AMfRestore(const char *Cmd)
-{
+int CmdHF14AMfRestore(const char *Cmd) {
     uint8_t sectorNo, blockNo;
     uint8_t keyType = 0;
     uint8_t key[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
@@ -1099,8 +1060,7 @@ int CmdHF14AMfRestore(const char *Cmd)
     return 0;
 }
 
-int CmdHF14AMfNested(const char *Cmd)
-{
+int CmdHF14AMfNested(const char *Cmd) {
     int i, res, iterations;
     sector_t *e_sector = NULL;
     uint8_t blockNo = 0;
@@ -1366,8 +1326,7 @@ int CmdHF14AMfNested(const char *Cmd)
     return 0;
 }
 
-int CmdHF14AMfNestedHard(const char *Cmd)
-{
+int CmdHF14AMfNestedHard(const char *Cmd) {
     uint8_t blockNo = 0;
     uint8_t keyType = 0;
     uint8_t trgBlockNo = 0;
@@ -1549,14 +1508,12 @@ int CmdHF14AMfNestedHard(const char *Cmd)
     return 0;
 }
 
-int randInRange(int min, int max)
-{
+int randInRange(int min, int max) {
     return min + (int)(rand() / (double)(RAND_MAX) * (max - min + 1));
 }
 
 //Fisher–Yates shuffle
-void shuffle(uint8_t *array, uint16_t len)
-{
+void shuffle(uint8_t *array, uint16_t len) {
     uint8_t tmp[6];
     uint16_t x;
     time_t t;
@@ -1570,8 +1527,7 @@ void shuffle(uint8_t *array, uint16_t len)
     }
 }
 
-int CmdHF14AMfChk_fast(const char *Cmd)
-{
+int CmdHF14AMfChk_fast(const char *Cmd) {
 
     char ctmp = 0x00;
     ctmp = tolower(param_getchar(Cmd, 0));
@@ -1822,8 +1778,7 @@ out:
     return 0;
 }
 
-int CmdHF14AMfChk(const char *Cmd)
-{
+int CmdHF14AMfChk(const char *Cmd) {
 
     char ctmp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) < 3 || ctmp == 'h') return usage_hf14_chk();
@@ -2113,8 +2068,7 @@ out:
 
 sector_t *k_sector = NULL;
 uint8_t k_sectorsCount = 16;
-static void emptySectorTable()
-{
+static void emptySectorTable() {
 
     // initialize storage for found keys
     if (k_sector == NULL)
@@ -2131,8 +2085,7 @@ static void emptySectorTable()
     }
 }
 
-void showSectorTable()
-{
+void showSectorTable() {
     if (k_sector != NULL) {
         printKeyTable(k_sectorsCount, k_sector);
         free(k_sector);
@@ -2140,8 +2093,7 @@ void showSectorTable()
     }
 }
 
-void readerAttack(nonces_t data, bool setEmulatorMem, bool verbose)
-{
+void readerAttack(nonces_t data, bool setEmulatorMem, bool verbose) {
 
     uint64_t key = 0;
     bool success = false;
@@ -2178,8 +2130,7 @@ void readerAttack(nonces_t data, bool setEmulatorMem, bool verbose)
     }
 }
 
-int CmdHF14AMf1kSim(const char *Cmd)
-{
+int CmdHF14AMf1kSim(const char *Cmd) {
 
     uint8_t uid[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
     uint8_t exitAfterNReads = 0;
@@ -2267,8 +2218,7 @@ int CmdHF14AMf1kSim(const char *Cmd)
     return 0;
 }
 
-int CmdHF14AMfSniff(const char *Cmd)
-{
+int CmdHF14AMfSniff(const char *Cmd) {
     bool wantLogToFile = false;
     bool wantDecrypt = false;
     //bool wantSaveToEml = false; TODO
@@ -2429,8 +2379,7 @@ int CmdHF14AMfSniff(const char *Cmd)
     return 0;
 }
 
-int CmdHF14AMfDbg(const char *Cmd)
-{
+int CmdHF14AMfDbg(const char *Cmd) {
 
     char ctmp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) < 1 || ctmp == 'h') return usage_hf14_dbg();
@@ -2443,8 +2392,7 @@ int CmdHF14AMfDbg(const char *Cmd)
     return 0;
 }
 
-int CmdHF14AMfKeyBrute(const char *Cmd)
-{
+int CmdHF14AMfKeyBrute(const char *Cmd) {
 
     uint8_t blockNo = 0, keytype = 0;
     uint8_t key[6] = {0, 0, 0, 0, 0, 0};
@@ -2475,8 +2423,7 @@ int CmdHF14AMfKeyBrute(const char *Cmd)
     return 0;
 }
 
-void printKeyTable(uint8_t sectorscnt, sector_t *e_sector)
-{
+void printKeyTable(uint8_t sectorscnt, sector_t *e_sector) {
     char strA[12 + 1] = {0};
     char strB[12 + 1] = {0};
     PrintAndLogEx(NORMAL, "|---|----------------|---|----------------|---|");
@@ -2504,8 +2451,7 @@ void printKeyTable(uint8_t sectorscnt, sector_t *e_sector)
 }
 
 // EMULATOR COMMANDS
-int CmdHF14AMfEGet(const char *Cmd)
-{
+int CmdHF14AMfEGet(const char *Cmd) {
     uint8_t blockNo = 0;
     uint8_t data[16] = {0x00};
     char c = tolower(param_getchar(Cmd, 0));
@@ -2523,8 +2469,7 @@ int CmdHF14AMfEGet(const char *Cmd)
     return 0;
 }
 
-int CmdHF14AMfEClear(const char *Cmd)
-{
+int CmdHF14AMfEClear(const char *Cmd) {
     char c = tolower(param_getchar(Cmd, 0));
     if (c == 'h') return usage_hf14_eclr();
 
@@ -2534,8 +2479,7 @@ int CmdHF14AMfEClear(const char *Cmd)
     return 0;
 }
 
-int CmdHF14AMfESet(const char *Cmd)
-{
+int CmdHF14AMfESet(const char *Cmd) {
     char c = tolower(param_getchar(Cmd, 0));
     uint8_t memBlock[16];
     uint8_t blockNo = 0;
@@ -2555,8 +2499,7 @@ int CmdHF14AMfESet(const char *Cmd)
     return mfEmlSetMem(memBlock, blockNo, 1);
 }
 
-int CmdHF14AMfELoad(const char *Cmd)
-{
+int CmdHF14AMfELoad(const char *Cmd) {
 
     size_t counter = 0;
     char filename[FILE_PATH_SIZE];
@@ -2650,8 +2593,7 @@ int CmdHF14AMfELoad(const char *Cmd)
     return 0;
 }
 
-int CmdHF14AMfESave(const char *Cmd)
-{
+int CmdHF14AMfESave(const char *Cmd) {
 
     char filename[FILE_PATH_SIZE];
     char *fnameptr = filename;
@@ -2697,8 +2639,7 @@ int CmdHF14AMfESave(const char *Cmd)
     return 0;
 }
 
-int CmdHF14AMfECFill(const char *Cmd)
-{
+int CmdHF14AMfECFill(const char *Cmd) {
     uint8_t keyType = 0;
     uint8_t numSectors = 16;
     char c = tolower(param_getchar(Cmd, 0));
@@ -2723,8 +2664,7 @@ int CmdHF14AMfECFill(const char *Cmd)
     return 0;
 }
 
-int CmdHF14AMfEKeyPrn(const char *Cmd)
-{
+int CmdHF14AMfEKeyPrn(const char *Cmd) {
     int i;
     uint8_t numSectors;
     uint8_t data[16];
@@ -2753,8 +2693,7 @@ int CmdHF14AMfEKeyPrn(const char *Cmd)
 }
 
 // CHINESE MAGIC COMMANDS
-int CmdHF14AMfCSetUID(const char *Cmd)
-{
+int CmdHF14AMfCSetUID(const char *Cmd) {
     uint8_t wipeCard = 0;
     uint8_t uid[8] = {0x00};
     uint8_t oldUid[8] = {0x00};
@@ -2814,8 +2753,7 @@ int CmdHF14AMfCSetUID(const char *Cmd)
     return 0;
 }
 
-int CmdHF14AMfCSetBlk(const char *Cmd)
-{
+int CmdHF14AMfCSetBlk(const char *Cmd) {
     uint8_t block[16] = {0x00};
     uint8_t blockNo = 0;
     uint8_t params = MAGIC_SINGLE;
@@ -2842,8 +2780,7 @@ int CmdHF14AMfCSetBlk(const char *Cmd)
     return 0;
 }
 
-int CmdHF14AMfCLoad(const char *Cmd)
-{
+int CmdHF14AMfCLoad(const char *Cmd) {
 
     uint8_t buf8[16] = {0x00};
     uint8_t fillFromEmulator = 0;
@@ -2958,8 +2895,7 @@ int CmdHF14AMfCLoad(const char *Cmd)
     return 0;
 }
 
-int CmdHF14AMfCGetBlk(const char *Cmd)
-{
+int CmdHF14AMfCGetBlk(const char *Cmd) {
     uint8_t data[16] = {0};
     uint8_t blockNo = 0;
     int res;
@@ -2996,8 +2932,7 @@ int CmdHF14AMfCGetBlk(const char *Cmd)
     return 0;
 }
 
-int CmdHF14AMfCGetSc(const char *Cmd)
-{
+int CmdHF14AMfCGetSc(const char *Cmd) {
     uint8_t data[16] = {0};
     uint8_t sector = 0;
     int i, res, flags;
@@ -3036,8 +2971,7 @@ int CmdHF14AMfCGetSc(const char *Cmd)
     return 0;
 }
 
-int CmdHF14AMfCSave(const char *Cmd)
-{
+int CmdHF14AMfCSave(const char *Cmd) {
 
     char filename[FILE_PATH_SIZE];
     char *fnameptr = filename;
@@ -3140,8 +3074,7 @@ int CmdHF14AMfCSave(const char *Cmd)
 }
 
 //needs nt, ar, at, Data to decrypt
-int CmdHf14AMfDecryptBytes(const char *Cmd)
-{
+int CmdHf14AMfDecryptBytes(const char *Cmd) {
 
     char ctmp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) < 1 || ctmp == 'h') return usage_hf14_decryptbytes();
@@ -3168,8 +3101,7 @@ int CmdHf14AMfDecryptBytes(const char *Cmd)
     return 0;
 }
 
-int CmdHf14AMfSetMod(const char *Cmd)
-{
+int CmdHf14AMfSetMod(const char *Cmd) {
     uint8_t key[6] = {0, 0, 0, 0, 0, 0};
     uint8_t mod = 2;
 
@@ -3206,8 +3138,7 @@ int CmdHf14AMfSetMod(const char *Cmd)
 }
 
 // Mifare NACK bug detection
-int CmdHf14AMfNack(const char *Cmd)
-{
+int CmdHf14AMfNack(const char *Cmd) {
 
     bool verbose = false;
     char ctmp = tolower(param_getchar(Cmd, 0));
@@ -3221,8 +3152,7 @@ int CmdHf14AMfNack(const char *Cmd)
     return 0;
 }
 
-int CmdHF14AMfice(const char *Cmd)
-{
+int CmdHF14AMfice(const char *Cmd) {
 
     uint8_t blockNo = 0;
     uint8_t keyType = 0;
@@ -3330,8 +3260,7 @@ out:
     return 0;
 }
 
-int CmdHF14AMfAuth4(const char *Cmd)
-{
+int CmdHF14AMfAuth4(const char *Cmd) {
     uint8_t keyn[20] = {0};
     int keynlen = 0;
     uint8_t key[16] = {0};
@@ -3368,8 +3297,7 @@ int CmdHF14AMfAuth4(const char *Cmd)
 }
 
 // https://www.nxp.com/docs/en/application-note/AN10787.pdf
-int CmdHF14AMfMAD(const char *cmd)
-{
+int CmdHF14AMfMAD(const char *cmd) {
 
     CLIParserInit("hf mf mad",
                   "Checks and prints Mifare Application Directory (MAD)",
@@ -3459,8 +3387,7 @@ int CmdHF14AMfMAD(const char *cmd)
     return 0;
 }
 
-int CmdHFMFNDEF(const char *cmd)
-{
+int CmdHFMFNDEF(const char *cmd) {
 
     CLIParserInit("hf mf ndef",
                   "Prints NFC Data Exchange Format (NDEF)",
@@ -3564,8 +3491,7 @@ int CmdHFMFNDEF(const char *cmd)
     return 0;
 }
 
-int CmdHF14AMfList(const char *Cmd)
-{
+int CmdHF14AMfList(const char *Cmd) {
     CmdTraceList("mf");
     return 0;
 }
@@ -3615,15 +3541,13 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdHFMF(const char *Cmd)
-{
+int CmdHFMF(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdhfmfdes.c b/client/cmdhfmfdes.c
index 29bc90723..3de3c6a4a 100644
--- a/client/cmdhfmfdes.c
+++ b/client/cmdhfmfdes.c
@@ -35,8 +35,7 @@ uint8_t key_picc_data[16] = { 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x
 
 static int CmdHelp(const char *Cmd);
 
-int CmdHF14ADesWb(const char *Cmd)
-{
+int CmdHF14ADesWb(const char *Cmd) {
     /*  uint8_t blockNo = 0;
         uint8_t keyType = 0;
         uint8_t key[6] = {0, 0, 0, 0, 0, 0};
@@ -84,8 +83,7 @@ int CmdHF14ADesWb(const char *Cmd)
     return 0;
 }
 
-int CmdHF14ADesRb(const char *Cmd)
-{
+int CmdHF14ADesRb(const char *Cmd) {
     // uint8_t blockNo = 0;
     // uint8_t keyType = 0;
     // uint8_t key[6] = {0, 0, 0, 0, 0, 0};
@@ -132,8 +130,7 @@ int CmdHF14ADesRb(const char *Cmd)
     return 0;
 }
 
-int CmdHF14ADesInfo(const char *Cmd)
-{
+int CmdHF14ADesInfo(const char *Cmd) {
 
     UsbCommand c = {CMD_MIFARE_DESFIRE_INFO};
     SendCommand(&c);
@@ -225,8 +222,7 @@ int CmdHF14ADesInfo(const char *Cmd)
     and set to '1' if the storage size is between 2^n and 2^(n+1).
     For this version of DESFire the 7 MSBits are set to 0x0C (2^12 = 4096) and the LSBit is '0'.
 */
-char *GetCardSizeStr(uint8_t fsize)
-{
+char *GetCardSizeStr(uint8_t fsize) {
 
     static char buf[30] = {0x00};
     char *retStr = buf;
@@ -242,8 +238,7 @@ char *GetCardSizeStr(uint8_t fsize)
     return buf;
 }
 
-char *GetProtocolStr(uint8_t id)
-{
+char *GetProtocolStr(uint8_t id) {
 
     static char buf[30] = {0x00};
     char *retStr = buf;
@@ -255,8 +250,7 @@ char *GetProtocolStr(uint8_t id)
     return buf;
 }
 
-char *GetVersionStr(uint8_t major, uint8_t minor)
-{
+char *GetVersionStr(uint8_t major, uint8_t minor) {
 
     static char buf[30] = {0x00};
     char *retStr = buf;
@@ -272,8 +266,7 @@ char *GetVersionStr(uint8_t major, uint8_t minor)
     return buf;
 }
 
-void GetKeySettings(uint8_t *aid)
-{
+void GetKeySettings(uint8_t *aid) {
 
     char messStr[512] = {0x00};
     char *str = messStr;
@@ -442,8 +435,7 @@ void GetKeySettings(uint8_t *aid)
     }
 }
 
-int CmdHF14ADesEnumApplications(const char *Cmd)
-{
+int CmdHF14ADesEnumApplications(const char *Cmd) {
 
     uint8_t isOK = 0x00;
     uint8_t aid[3];
@@ -554,8 +546,7 @@ int CmdHF14ADesEnumApplications(const char *Cmd)
 // MIAFRE DesFire Authentication
 //
 #define BUFSIZE 256
-int CmdHF14ADesAuth(const char *Cmd)
-{
+int CmdHF14ADesAuth(const char *Cmd) {
 
     // NR  DESC     KEYLENGHT
     // ------------------------
@@ -673,16 +664,14 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdHFMFDes(const char *Cmd)
-{
+int CmdHFMFDes(const char *Cmd) {
     // flush
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdhfmfdesfire.c b/client/cmdhfmfdesfire.c
index 1384e39c0..78c0bf3b3 100644
--- a/client/cmdhfmfdesfire.c
+++ b/client/cmdhfmfdesfire.c
@@ -29,8 +29,7 @@ static int CmdHelp(const char *Cmd);
 //n'r=rol(r5)
 //verify n'r=nr
 
-int CmdHF14AMfDESAuth(const char *Cmd)
-{
+int CmdHF14AMfDESAuth(const char *Cmd) {
 
     uint8_t blockNo = 0;
     //keyNo=0;
@@ -123,8 +122,7 @@ int CmdHF14AMfDESAuth(const char *Cmd)
 // Card 2 Reader : 02AF, 16 Bytes(b0), CRC1 CRC2
 // Reader 2 Card : 03AF, 16 Bytes(b1),16Bytes(b2) CRC1 CRC2
 // Card 2 Reader : 0300, 16 bytes(b3), CRC1 CRC2 ; success
-int CmdHF14AMfAESAuth(const char *Cmd)
-{
+int CmdHF14AMfAESAuth(const char *Cmd) {
 
     uint8_t blockNo = 0;
     //keyNo=0;
@@ -238,16 +236,14 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdHFMFDesfire(const char *Cmd)
-{
+int CmdHFMFDesfire(const char *Cmd) {
     // flush
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdhfmfhard.c b/client/cmdhfmfhard.c
index b312d9181..eac9c04d6 100644
--- a/client/cmdhfmfhard.c
+++ b/client/cmdhfmfhard.c
@@ -72,8 +72,7 @@ static uint32_t test_state[2] = {0, 0};
 static float brute_force_per_second;
 
 
-static void get_SIMD_instruction_set(char *instruction_set)
-{
+static void get_SIMD_instruction_set(char *instruction_set) {
     switch (GetSIMDInstrAuto()) {
         case SIMD_AVX512:
             strcpy(instruction_set, "AVX512F");
@@ -97,8 +96,7 @@ static void get_SIMD_instruction_set(char *instruction_set)
 }
 
 
-static void print_progress_header(void)
-{
+static void print_progress_header(void) {
     char progress_text[80];
     char instr_set[12] = "";
     get_SIMD_instruction_set(instr_set);
@@ -111,8 +109,7 @@ static void print_progress_header(void)
 }
 
 
-void hardnested_print_progress(uint32_t nonces, char *activity, float brute_force, uint64_t min_diff_print_time)
-{
+void hardnested_print_progress(uint32_t nonces, char *activity, float brute_force, uint64_t min_diff_print_time) {
     static uint64_t last_print_time = 0;
     if (msclock() - last_print_time > min_diff_print_time) {
         last_print_time = msclock();
@@ -136,31 +133,26 @@ void hardnested_print_progress(uint32_t nonces, char *activity, float brute_forc
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // bitarray functions
 
-static inline void clear_bitarray24(uint32_t *bitarray)
-{
+static inline void clear_bitarray24(uint32_t *bitarray) {
     memset(bitarray, 0x00, sizeof(uint32_t) * (1 << 19));
 }
 
 
-static inline void set_bitarray24(uint32_t *bitarray)
-{
+static inline void set_bitarray24(uint32_t *bitarray) {
     memset(bitarray, 0xff, sizeof(uint32_t) * (1 << 19));
 }
 
 
-static inline void set_bit24(uint32_t *bitarray, uint32_t index)
-{
+static inline void set_bit24(uint32_t *bitarray, uint32_t index) {
     bitarray[index >> 5] |= 0x80000000 >> (index & 0x0000001f);
 }
 
-static inline uint32_t test_bit24(uint32_t *bitarray, uint32_t index)
-{
+static inline uint32_t test_bit24(uint32_t *bitarray, uint32_t index) {
     return bitarray[index >> 5] & (0x80000000 >> (index & 0x0000001f));
 }
 
 
-static inline uint32_t next_state(uint32_t *bitarray, uint32_t state)
-{
+static inline uint32_t next_state(uint32_t *bitarray, uint32_t state) {
     if (++state == 1 << 24) return 1 << 24;
     uint32_t index = state >> 5;
     uint_fast8_t bit = state & 0x1f;
@@ -202,22 +194,19 @@ static inline uint32_t next_state(uint32_t *bitarray, uint32_t state)
 static uint32_t *bitflip_bitarrays[2][0x400];
 static uint32_t count_bitflip_bitarrays[2][0x400];
 
-static int compare_count_bitflip_bitarrays(const void *b1, const void *b2)
-{
+static int compare_count_bitflip_bitarrays(const void *b1, const void *b2) {
     uint64_t count1 = (uint64_t)count_bitflip_bitarrays[ODD_STATE][*(uint16_t *)b1] * count_bitflip_bitarrays[EVEN_STATE][*(uint16_t *)b1];
     uint64_t count2 = (uint64_t)count_bitflip_bitarrays[ODD_STATE][*(uint16_t *)b2] * count_bitflip_bitarrays[EVEN_STATE][*(uint16_t *)b2];
     return (count1 > count2) - (count2 > count1);
 }
 
 
-static voidpf inflate_malloc(voidpf opaque, uInt items, uInt size)
-{
+static voidpf inflate_malloc(voidpf opaque, uInt items, uInt size) {
     return calloc(items * size, sizeof(uint8_t));
 }
 
 
-static void inflate_free(voidpf opaque, voidpf address)
-{
+static void inflate_free(voidpf opaque, voidpf address) {
     free(address);
 }
 
@@ -227,8 +216,7 @@ static void inflate_free(voidpf opaque, voidpf address)
 //----------------------------------------------------------------------------
 // Initialize decompression of the respective (HF or LF) FPGA stream
 //----------------------------------------------------------------------------
-static void init_inflate(z_streamp compressed_stream, uint8_t *input_buffer, uint32_t insize, uint8_t *output_buffer, uint32_t outsize)
-{
+static void init_inflate(z_streamp compressed_stream, uint8_t *input_buffer, uint32_t insize, uint8_t *output_buffer, uint32_t outsize) {
 
     // initialize z_stream structure for inflate:
     compressed_stream->next_in = input_buffer;
@@ -243,8 +231,7 @@ static void init_inflate(z_streamp compressed_stream, uint8_t *input_buffer, uin
 }
 
 
-static void init_bitflip_bitarrays(void)
-{
+static void init_bitflip_bitarrays(void) {
 #if defined (DEBUG_REDUCTION)
     uint8_t line = 0;
 #endif
@@ -357,8 +344,7 @@ static void init_bitflip_bitarrays(void)
 }
 
 
-static void free_bitflip_bitarrays(void)
-{
+static void free_bitflip_bitarrays(void) {
     for (int16_t bitflip = 0x3ff; bitflip > 0x000; bitflip--) {
         free_bitarray(bitflip_bitarrays[ODD_STATE][bitflip]);
     }
@@ -375,8 +361,7 @@ static uint32_t *part_sum_a0_bitarrays[2][NUM_PART_SUMS];
 static uint32_t *part_sum_a8_bitarrays[2][NUM_PART_SUMS];
 static uint32_t *sum_a0_bitarrays[2][NUM_SUMS];
 
-static uint16_t PartialSumProperty(uint32_t state, odd_even_t odd_even)
-{
+static uint16_t PartialSumProperty(uint32_t state, odd_even_t odd_even) {
     uint16_t sum = 0;
     for (uint16_t j = 0; j < 16; j++) {
         uint32_t st = state;
@@ -399,8 +384,7 @@ static uint16_t PartialSumProperty(uint32_t state, odd_even_t odd_even)
 }
 
 
-static void init_part_sum_bitarrays(void)
-{
+static void init_part_sum_bitarrays(void) {
     for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
         for (uint16_t part_sum_a0 = 0; part_sum_a0 < NUM_PART_SUMS; part_sum_a0++) {
             part_sum_a0_bitarrays[odd_even][part_sum_a0] = (uint32_t *)malloc_bitarray(sizeof(uint32_t) * (1 << 19));
@@ -443,8 +427,7 @@ static void init_part_sum_bitarrays(void)
 }
 
 
-static void free_part_sum_bitarrays(void)
-{
+static void free_part_sum_bitarrays(void) {
     for (int16_t part_sum_a8 = (NUM_PART_SUMS - 1); part_sum_a8 >= 0; part_sum_a8--) {
         free_bitarray(part_sum_a8_bitarrays[ODD_STATE][part_sum_a8]);
     }
@@ -460,8 +443,7 @@ static void free_part_sum_bitarrays(void)
 }
 
 
-static void init_sum_bitarrays(void)
-{
+static void init_sum_bitarrays(void) {
     for (uint16_t sum_a0 = 0; sum_a0 < NUM_SUMS; sum_a0++) {
         for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
             sum_a0_bitarrays[odd_even][sum_a0] = (uint32_t *)malloc_bitarray(sizeof(uint32_t) * (1 << 19));
@@ -485,8 +467,7 @@ static void init_sum_bitarrays(void)
 }
 
 
-static void free_sum_bitarrays(void)
-{
+static void free_sum_bitarrays(void) {
     for (int8_t sum_a0 = NUM_SUMS - 1; sum_a0 >= 0; sum_a0--) {
         free_bitarray(sum_a0_bitarrays[ODD_STATE][sum_a0]);
         free_bitarray(sum_a0_bitarrays[EVEN_STATE][sum_a0]);
@@ -524,8 +505,7 @@ static uint64_t num_keys_tested = 0;
 static statelist_t *candidates = NULL;
 
 
-static int add_nonce(uint32_t nonce_enc, uint8_t par_enc)
-{
+static int add_nonce(uint32_t nonce_enc, uint8_t par_enc) {
     uint8_t first_byte = nonce_enc >> 24;
     noncelistentry_t *p1 = nonces[first_byte].first;
     noncelistentry_t *p2 = NULL;
@@ -568,8 +548,7 @@ static int add_nonce(uint32_t nonce_enc, uint8_t par_enc)
 }
 
 
-static void init_nonce_memory(void)
-{
+static void init_nonce_memory(void) {
     for (uint16_t i = 0; i < 256; i++) {
         nonces[i].num = 0;
         nonces[i].Sum = 0;
@@ -604,8 +583,7 @@ static void init_nonce_memory(void)
 }
 
 
-static void free_nonce_list(noncelistentry_t *p)
-{
+static void free_nonce_list(noncelistentry_t *p) {
     if (p == NULL) {
         return;
     } else {
@@ -615,8 +593,7 @@ static void free_nonce_list(noncelistentry_t *p)
 }
 
 
-static void free_nonces_memory(void)
-{
+static void free_nonces_memory(void) {
     for (uint16_t i = 0; i < 256; i++) {
         free_nonce_list(nonces[i].first);
     }
@@ -630,8 +607,7 @@ static void free_nonces_memory(void)
 
 
 
-static double p_hypergeometric(uint16_t i_K, uint16_t n, uint16_t k)
-{
+static double p_hypergeometric(uint16_t i_K, uint16_t n, uint16_t k) {
     // for efficient computation we are using the recursive definition
     //                      (K-k+1) * (n-k+1)
     // P(X=k) = P(X=k-1) * --------------------
@@ -675,8 +651,7 @@ static double p_hypergeometric(uint16_t i_K, uint16_t n, uint16_t k)
 }
 
 
-static float sum_probability(uint16_t i_K, uint16_t n, uint16_t k)
-{
+static float sum_probability(uint16_t i_K, uint16_t n, uint16_t k) {
     if (k > sums[i_K]) return 0.0;
 
     double p_T_is_k_when_S_is_K = p_hypergeometric(i_K, n, k);
@@ -691,8 +666,7 @@ static float sum_probability(uint16_t i_K, uint16_t n, uint16_t k)
 
 static uint32_t part_sum_count[2][NUM_PART_SUMS][NUM_PART_SUMS];
 
-static void init_allbitflips_array(void)
-{
+static void init_allbitflips_array(void) {
     for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
         uint32_t *bitset = all_bitflips_bitarray[odd_even] = (uint32_t *)malloc_bitarray(sizeof(uint32_t) * (1 << 19));
         if (bitset == NULL) {
@@ -706,8 +680,7 @@ static void init_allbitflips_array(void)
 }
 
 
-static void update_allbitflips_array(void)
-{
+static void update_allbitflips_array(void) {
     if (hardnested_stage & CHECK_2ND_BYTES) {
         for (uint16_t i = 0; i < 256; i++) {
             for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
@@ -725,14 +698,12 @@ static void update_allbitflips_array(void)
 }
 
 
-static uint32_t estimated_num_states_part_sum_coarse(uint16_t part_sum_a0_idx, uint16_t part_sum_a8_idx, odd_even_t odd_even)
-{
+static uint32_t estimated_num_states_part_sum_coarse(uint16_t part_sum_a0_idx, uint16_t part_sum_a8_idx, odd_even_t odd_even) {
     return part_sum_count[odd_even][part_sum_a0_idx][part_sum_a8_idx];
 }
 
 
-static uint32_t estimated_num_states_part_sum(uint8_t first_byte, uint16_t part_sum_a0_idx, uint16_t part_sum_a8_idx, odd_even_t odd_even)
-{
+static uint32_t estimated_num_states_part_sum(uint8_t first_byte, uint16_t part_sum_a0_idx, uint16_t part_sum_a8_idx, odd_even_t odd_even) {
     if (odd_even == ODD_STATE) {
         return count_bitarray_AND3(part_sum_a0_bitarrays[odd_even][part_sum_a0_idx],
                                    part_sum_a8_bitarrays[odd_even][part_sum_a8_idx],
@@ -754,8 +725,7 @@ static uint32_t estimated_num_states_part_sum(uint8_t first_byte, uint16_t part_
 }
 
 
-static uint64_t estimated_num_states(uint8_t first_byte, uint16_t sum_a0, uint16_t sum_a8)
-{
+static uint64_t estimated_num_states(uint8_t first_byte, uint16_t sum_a0, uint16_t sum_a8) {
     uint64_t num_states = 0;
     for (uint8_t p = 0; p < NUM_PART_SUMS; p++) {
         for (uint8_t q = 0; q < NUM_PART_SUMS; q++) {
@@ -775,8 +745,7 @@ static uint64_t estimated_num_states(uint8_t first_byte, uint16_t sum_a0, uint16
 }
 
 
-static uint64_t estimated_num_states_coarse(uint16_t sum_a0, uint16_t sum_a8)
-{
+static uint64_t estimated_num_states_coarse(uint16_t sum_a0, uint16_t sum_a8) {
     uint64_t num_states = 0;
     for (uint8_t p = 0; p < NUM_PART_SUMS; p++) {
         for (uint8_t q = 0; q < NUM_PART_SUMS; q++) {
@@ -796,8 +765,7 @@ static uint64_t estimated_num_states_coarse(uint16_t sum_a0, uint16_t sum_a8)
 }
 
 
-static void update_p_K(void)
-{
+static void update_p_K(void) {
     if (hardnested_stage & CHECK_2ND_BYTES) {
         uint64_t total_count = 0;
         uint16_t sum_a0 = sums[first_byte_Sum];
@@ -818,8 +786,7 @@ static void update_p_K(void)
 }
 
 
-static void update_sum_bitarrays(odd_even_t odd_even)
-{
+static void update_sum_bitarrays(odd_even_t odd_even) {
     if (all_bitflips_bitarray_dirty[odd_even]) {
         for (uint8_t part_sum = 0; part_sum < NUM_PART_SUMS; part_sum++) {
             bitarray_AND(part_sum_a0_bitarrays[odd_even][part_sum], all_bitflips_bitarray[odd_even]);
@@ -839,8 +806,7 @@ static void update_sum_bitarrays(odd_even_t odd_even)
 }
 
 
-static int compare_expected_num_brute_force(const void *b1, const void *b2)
-{
+static int compare_expected_num_brute_force(const void *b1, const void *b2) {
     uint8_t index1 = *(uint8_t *)b1;
     uint8_t index2 = *(uint8_t *)b2;
     float score1 = nonces[index1].expected_num_brute_force;
@@ -849,8 +815,7 @@ static int compare_expected_num_brute_force(const void *b1, const void *b2)
 }
 
 
-static int compare_sum_a8_guess(const void *b1, const void *b2)
-{
+static int compare_sum_a8_guess(const void *b1, const void *b2) {
     float prob1 = ((guess_sum_a8_t *)b1)->prob;
     float prob2 = ((guess_sum_a8_t *)b2)->prob;
     return (prob1 < prob2) - (prob1 > prob2);
@@ -858,8 +823,7 @@ static int compare_sum_a8_guess(const void *b1, const void *b2)
 }
 
 
-static float check_smallest_bitflip_bitarrays(void)
-{
+static float check_smallest_bitflip_bitarrays(void) {
     uint32_t num_odd, num_even;
     uint64_t smallest = 1LL << 48;
     // initialize best_first_bytes, do a rough estimation on remaining states
@@ -881,8 +845,7 @@ static float check_smallest_bitflip_bitarrays(void)
 }
 
 
-static void update_expected_brute_force(uint8_t best_byte)
-{
+static void update_expected_brute_force(uint8_t best_byte) {
 
     float total_prob = 0.0;
     for (uint8_t i = 0; i < NUM_SUMS; i++) {
@@ -903,8 +866,7 @@ static void update_expected_brute_force(uint8_t best_byte)
 }
 
 
-static float sort_best_first_bytes(void)
-{
+static float sort_best_first_bytes(void) {
 
     // initialize best_first_bytes, do a rough estimation on remaining states for each Sum_a8 property
     // and the expected number of states to brute force
@@ -993,8 +955,7 @@ static float sort_best_first_bytes(void)
 }
 
 
-static float update_reduction_rate(float last, bool init)
-{
+static float update_reduction_rate(float last, bool init) {
 #define QUEUE_LEN 4
     static float queue[QUEUE_LEN];
 
@@ -1037,8 +998,7 @@ static float update_reduction_rate(float last, bool init)
 }
 
 
-static bool shrink_key_space(float *brute_forces)
-{
+static bool shrink_key_space(float *brute_forces) {
 #if defined(DEBUG_REDUCTION)
     PrintAndLogEx(NORMAL, "shrink_key_space() with stage = 0x%02x\n", hardnested_stage);
 #endif
@@ -1057,8 +1017,7 @@ static bool shrink_key_space(float *brute_forces)
 }
 
 
-static void estimate_sum_a8(void)
-{
+static void estimate_sum_a8(void) {
     if (first_byte_num == 256) {
         for (uint16_t i = 0; i < 256; i++) {
             if (nonces[i].sum_a8_guess_dirty) {
@@ -1074,8 +1033,7 @@ static void estimate_sum_a8(void)
 }
 
 
-static int read_nonce_file(char *filename)
-{
+static int read_nonce_file(char *filename) {
     FILE *fnonces = NULL;
     char progress_text[80] = "";
     size_t bytes_read;
@@ -1131,8 +1089,7 @@ static int read_nonce_file(char *filename)
 }
 
 
-noncelistentry_t *SearchFor2ndByte(uint8_t b1, uint8_t b2)
-{
+noncelistentry_t *SearchFor2ndByte(uint8_t b1, uint8_t b2) {
     noncelistentry_t *p = nonces[b1].first;
     while (p != NULL) {
         if ((p->nonce_enc >> 16 & 0xff) == b2) {
@@ -1144,8 +1101,7 @@ noncelistentry_t *SearchFor2ndByte(uint8_t b1, uint8_t b2)
 }
 
 
-static bool timeout(void)
-{
+static bool timeout(void) {
     return (msclock() > last_sample_clock + sample_period);
 }
 
@@ -1156,8 +1112,7 @@ static void
 __attribute__((force_align_arg_pointer))
 #endif
 #endif
-*check_for_BitFlipProperties_thread(void *args)
-{
+*check_for_BitFlipProperties_thread(void *args) {
     uint8_t first_byte = ((uint8_t *)args)[0];
     uint8_t last_byte = ((uint8_t *)args)[1];
     uint8_t time_budget = ((uint8_t *)args)[2];
@@ -1174,11 +1129,11 @@ __attribute__((force_align_arg_pointer))
             }
             for (uint16_t i = first_byte; i <= last_byte; i++) {
                 if (nonces[i].BitFlips[bitflip] == 0 && nonces[i].BitFlips[bitflip ^ 0x100] == 0
-                    && nonces[i].first != NULL && nonces[i ^ (bitflip & 0xff)].first != NULL) {
+                        && nonces[i].first != NULL && nonces[i ^ (bitflip & 0xff)].first != NULL) {
                     uint8_t parity1 = (nonces[i].first->par_enc) >> 3;                  // parity of first byte
                     uint8_t parity2 = (nonces[i ^ (bitflip & 0xff)].first->par_enc) >> 3; // parity of nonce with bits flipped
                     if ((parity1 == parity2 && !(bitflip & 0x100))          // bitflip
-                        || (parity1 != parity2 && (bitflip & 0x100))) {     // not bitflip
+                            || (parity1 != parity2 && (bitflip & 0x100))) {     // not bitflip
                         nonces[i].BitFlips[bitflip] = 1;
                         for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
                             if (bitflip_bitarrays[odd_even][bitflip] != NULL) {
@@ -1218,7 +1173,7 @@ __attribute__((force_align_arg_pointer))
                             uint8_t parity1 = byte1->par_enc >> 2 & 0x01; // parity of 2nd byte
                             uint8_t parity2 = byte2->par_enc >> 2 & 0x01; // parity of 2nd byte with bits flipped
                             if ((parity1 == parity2 && !(bitflip & 0x100)) // bitflip
-                                || (parity1 != parity2 && (bitflip & 0x100))) { // not bitflip
+                                    || (parity1 != parity2 && (bitflip & 0x100))) { // not bitflip
                                 nonces[i].BitFlips[bitflip] = 1;
                                 for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
                                     if (bitflip_bitarrays[odd_even][bitflip] != NULL) {
@@ -1244,8 +1199,7 @@ __attribute__((force_align_arg_pointer))
 }
 
 
-static void check_for_BitFlipProperties(bool time_budget)
-{
+static void check_for_BitFlipProperties(bool time_budget) {
     // create and run worker threads
     pthread_t thread_id[NUM_CHECK_BITFLIPS_THREADS];
 
@@ -1283,8 +1237,7 @@ static void check_for_BitFlipProperties(bool time_budget)
 }
 
 
-static void update_nonce_data(bool time_budget)
-{
+static void update_nonce_data(bool time_budget) {
     check_for_BitFlipProperties(time_budget);
     update_allbitflips_array();
     update_sum_bitarrays(EVEN_STATE);
@@ -1294,8 +1247,7 @@ static void update_nonce_data(bool time_budget)
 }
 
 
-static void apply_sum_a0(void)
-{
+static void apply_sum_a0(void) {
     uint32_t old_count = num_all_bitflips_bitarray[EVEN_STATE];
     num_all_bitflips_bitarray[EVEN_STATE] = count_bitarray_AND(all_bitflips_bitarray[EVEN_STATE], sum_a0_bitarrays[EVEN_STATE][first_byte_Sum]);
     if (num_all_bitflips_bitarray[EVEN_STATE] != old_count) {
@@ -1309,8 +1261,7 @@ static void apply_sum_a0(void)
 }
 
 
-static void simulate_MFplus_RNG(uint32_t test_cuid, uint64_t test_key, uint32_t *nt_enc, uint8_t *par_enc)
-{
+static void simulate_MFplus_RNG(uint32_t test_cuid, uint64_t test_key, uint32_t *nt_enc, uint8_t *par_enc) {
     struct Crypto1State sim_cs = {0, 0};
 
     // init cryptostate with key:
@@ -1333,8 +1284,7 @@ static void simulate_MFplus_RNG(uint32_t test_cuid, uint64_t test_key, uint32_t
 }
 
 
-static void simulate_acquire_nonces()
-{
+static void simulate_acquire_nonces() {
     time_t time1 = time(NULL);
     last_sample_clock = 0;
     sample_period = 1000; // for simulation
@@ -1408,8 +1358,7 @@ static void simulate_acquire_nonces()
 }
 
 
-static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo, uint8_t trgKeyType, bool nonce_file_write, bool slow, char *filename)
-{
+static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo, uint8_t trgKeyType, bool nonce_file_write, bool slow, char *filename) {
     last_sample_clock = msclock();
     sample_period = 2000; // initial rough estimate. Will be refined.
     bool initialize = true;
@@ -1560,8 +1509,7 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
 }
 
 
-static inline bool invariant_holds(uint_fast8_t byte_diff, uint_fast32_t state1, uint_fast32_t state2, uint_fast8_t bit, uint_fast8_t state_bit)
-{
+static inline bool invariant_holds(uint_fast8_t byte_diff, uint_fast32_t state1, uint_fast32_t state2, uint_fast8_t bit, uint_fast8_t state_bit) {
     uint_fast8_t j_1_bit_mask = 0x01 << (bit - 1);
     uint_fast8_t bit_diff = byte_diff & j_1_bit_mask;                                               // difference of (j-1)th bit
     uint_fast8_t filter_diff = filter(state1 >> (4 - state_bit)) ^ filter(state2 >> (4 - state_bit)); // difference in filter function
@@ -1572,8 +1520,7 @@ static inline bool invariant_holds(uint_fast8_t byte_diff, uint_fast32_t state1,
 }
 
 
-static inline bool invalid_state(uint_fast8_t byte_diff, uint_fast32_t state1, uint_fast32_t state2, uint_fast8_t bit, uint_fast8_t state_bit)
-{
+static inline bool invalid_state(uint_fast8_t byte_diff, uint_fast32_t state1, uint_fast32_t state2, uint_fast8_t bit, uint_fast8_t state_bit) {
     uint_fast8_t j_bit_mask = 0x01 << bit;
     uint_fast8_t bit_diff = byte_diff & j_bit_mask;                                                 // difference of jth bit
     uint_fast8_t mask_y13_y16 = 0x48 >> state_bit;
@@ -1583,8 +1530,7 @@ static inline bool invalid_state(uint_fast8_t byte_diff, uint_fast32_t state1, u
 }
 
 
-static inline bool remaining_bits_match(uint_fast8_t num_common_bits, uint_fast8_t byte_diff, uint_fast32_t state1, uint_fast32_t state2, odd_even_t odd_even)
-{
+static inline bool remaining_bits_match(uint_fast8_t num_common_bits, uint_fast8_t byte_diff, uint_fast32_t state1, uint_fast32_t state2, odd_even_t odd_even) {
     if (odd_even) {
         // odd bits
         switch (num_common_bits) {
@@ -1646,8 +1592,7 @@ static struct sl_cache_entry {
 } sl_cache[NUM_PART_SUMS][NUM_PART_SUMS][2];
 
 
-static void init_statelist_cache(void)
-{
+static void init_statelist_cache(void) {
     pthread_mutex_lock(&statelist_cache_mutex);
     for (uint16_t i = 0; i < NUM_PART_SUMS; i++) {
         for (uint16_t j = 0; j < NUM_PART_SUMS; j++) {
@@ -1662,8 +1607,7 @@ static void init_statelist_cache(void)
 }
 
 
-static void free_statelist_cache(void)
-{
+static void free_statelist_cache(void) {
     pthread_mutex_lock(&statelist_cache_mutex);
     for (uint16_t i = 0; i < NUM_PART_SUMS; i++) {
         for (uint16_t j = 0; j < NUM_PART_SUMS; j++) {
@@ -1698,8 +1642,7 @@ static inline bool bitflips_match(uint8_t byte, uint32_t state, odd_even_t odd_e
 }
 
 
-static uint_fast8_t reverse(uint_fast8_t b)
-{
+static uint_fast8_t reverse(uint_fast8_t b) {
     b = (b & 0xF0) >> 4 | (b & 0x0F) << 4;
     b = (b & 0xCC) >> 2 | (b & 0x33) << 2;
     b = (b & 0xAA) >> 1 | (b & 0x55) << 1;
@@ -1707,8 +1650,7 @@ static uint_fast8_t reverse(uint_fast8_t b)
 }
 
 
-static bool all_bitflips_match(uint8_t byte, uint32_t state, odd_even_t odd_even)
-{
+static bool all_bitflips_match(uint8_t byte, uint32_t state, odd_even_t odd_even) {
     uint32_t masks[2][8] = {{0x00fffff0, 0x00fffff8, 0x00fffff8, 0x00fffffc, 0x00fffffc, 0x00fffffe, 0x00fffffe, 0x00ffffff},
         {0x00fffff0, 0x00fffff0, 0x00fffff8, 0x00fffff8, 0x00fffffc, 0x00fffffc, 0x00fffffe, 0x00fffffe}
     };
@@ -1752,8 +1694,7 @@ static bool all_bitflips_match(uint8_t byte, uint32_t state, odd_even_t odd_even
 }
 
 
-static void bitarray_to_list(uint8_t byte, uint32_t *bitarray, uint32_t *state_list, uint32_t *len, odd_even_t odd_even)
-{
+static void bitarray_to_list(uint8_t byte, uint32_t *bitarray, uint32_t *state_list, uint32_t *len, odd_even_t odd_even) {
     uint32_t *p = state_list;
     for (uint32_t state = next_state(bitarray, -1L); state < (1 << 24); state = next_state(bitarray, state)) {
         if (all_bitflips_match(byte, state, odd_even)) {
@@ -1766,16 +1707,14 @@ static void bitarray_to_list(uint8_t byte, uint32_t *bitarray, uint32_t *state_l
 }
 
 
-static void add_cached_states(statelist_t *candidates, uint16_t part_sum_a0, uint16_t part_sum_a8, odd_even_t odd_even)
-{
+static void add_cached_states(statelist_t *candidates, uint16_t part_sum_a0, uint16_t part_sum_a8, odd_even_t odd_even) {
     candidates->states[odd_even] = sl_cache[part_sum_a0 / 2][part_sum_a8 / 2][odd_even].sl;
     candidates->len[odd_even] = sl_cache[part_sum_a0 / 2][part_sum_a8 / 2][odd_even].len;
     return;
 }
 
 
-static void add_matching_states(statelist_t *candidates, uint8_t part_sum_a0, uint8_t part_sum_a8, odd_even_t odd_even)
-{
+static void add_matching_states(statelist_t *candidates, uint8_t part_sum_a0, uint8_t part_sum_a8, odd_even_t odd_even) {
     uint32_t worstcase_size = 1 << 20;
     candidates->states[odd_even] = (uint32_t *)malloc(sizeof(uint32_t) * worstcase_size);
     if (candidates->states[odd_even] == NULL) {
@@ -1813,8 +1752,7 @@ static void add_matching_states(statelist_t *candidates, uint8_t part_sum_a0, ui
     return;
 }
 
-static statelist_t *add_more_candidates(void)
-{
+static statelist_t *add_more_candidates(void) {
     statelist_t *new_candidates = candidates;
     if (candidates == NULL) {
         candidates = (statelist_t *)malloc(sizeof(statelist_t));
@@ -1835,8 +1773,7 @@ static statelist_t *add_more_candidates(void)
 }
 
 
-static void add_bitflip_candidates(uint8_t byte)
-{
+static void add_bitflip_candidates(uint8_t byte) {
     statelist_t *candidates = add_more_candidates();
 
     for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
@@ -1857,8 +1794,7 @@ static void add_bitflip_candidates(uint8_t byte)
 }
 
 
-static bool TestIfKeyExists(uint64_t key)
-{
+static bool TestIfKeyExists(uint64_t key) {
     struct Crypto1State *pcs;
     pcs = crypto1_create(key);
     crypto1_byte(pcs, (cuid >> 24) ^ best_first_bytes[0], true);
@@ -1906,8 +1842,7 @@ static bool TestIfKeyExists(uint64_t key)
 
 static work_status_t book_of_work[NUM_PART_SUMS][NUM_PART_SUMS][NUM_PART_SUMS][NUM_PART_SUMS];
 
-static void init_book_of_work(void)
-{
+static void init_book_of_work(void) {
     for (uint8_t p = 0; p < NUM_PART_SUMS; p++) {
         for (uint8_t q = 0; q < NUM_PART_SUMS; q++) {
             for (uint8_t r = 0; r < NUM_PART_SUMS; r++) {
@@ -1925,8 +1860,7 @@ static void
 __attribute__((force_align_arg_pointer))
 #endif
 #endif
-*generate_candidates_worker_thread(void *args)
-{
+*generate_candidates_worker_thread(void *args) {
     uint16_t *sum_args = (uint16_t *)args;
     uint16_t sum_a0 = sums[sum_args[0]];
     uint16_t sum_a8 = sums[sum_args[1]];
@@ -1951,7 +1885,7 @@ __attribute__((force_align_arg_pointer))
 
                                 pthread_mutex_lock(&statelist_cache_mutex);
                                 if (sl_cache[p][r][ODD_STATE].cache_status == WORK_IN_PROGRESS
-                                    || sl_cache[q][s][EVEN_STATE].cache_status == WORK_IN_PROGRESS) { // defer until not blocked by another thread.
+                                        || sl_cache[q][s][EVEN_STATE].cache_status == WORK_IN_PROGRESS) { // defer until not blocked by another thread.
                                     pthread_mutex_unlock(&statelist_cache_mutex);
                                     pthread_mutex_unlock(&book_of_work_mutex);
                                     there_might_be_more_work = true;
@@ -2067,8 +2001,7 @@ __attribute__((force_align_arg_pointer))
 }
 
 
-static void generate_candidates(uint8_t sum_a0_idx, uint8_t sum_a8_idx)
-{
+static void generate_candidates(uint8_t sum_a0_idx, uint8_t sum_a8_idx) {
 
     init_statelist_cache();
     init_book_of_work();
@@ -2113,8 +2046,7 @@ static void generate_candidates(uint8_t sum_a0_idx, uint8_t sum_a8_idx)
 }
 
 
-static void free_candidates_memory(statelist_t *sl)
-{
+static void free_candidates_memory(statelist_t *sl) {
     if (sl == NULL)
         return;
 
@@ -2123,8 +2055,7 @@ static void free_candidates_memory(statelist_t *sl)
 }
 
 
-static void pre_XOR_nonces(void)
-{
+static void pre_XOR_nonces(void) {
     // prepare acquired nonces for faster brute forcing.
 
     // XOR the cryptoUID and its parity
@@ -2141,24 +2072,21 @@ static void pre_XOR_nonces(void)
     }
 }
 
-static bool brute_force(uint64_t *found_key)
-{
+static bool brute_force(uint64_t *found_key) {
     if (known_target_key != -1) {
         TestIfKeyExists(known_target_key);
     }
     return brute_force_bs(NULL, candidates, cuid, num_acquired_nonces, maximum_states, nonces, best_first_bytes, found_key);
 }
 
-static uint16_t SumProperty(struct Crypto1State *s)
-{
+static uint16_t SumProperty(struct Crypto1State *s) {
     uint16_t sum_odd = PartialSumProperty(s->odd, ODD_STATE);
     uint16_t sum_even = PartialSumProperty(s->even, EVEN_STATE);
     return (sum_odd * (16 - sum_even) + (16 - sum_odd) * sum_even);
 }
 
 
-static void Tests()
-{
+static void Tests() {
     if (known_target_key != -1) {
         for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
             uint32_t *bitset = nonces[best_first_bytes[0]].states_bitarray[odd_even];
@@ -2182,8 +2110,7 @@ static void Tests()
 }
 
 
-static void Tests2(void)
-{
+static void Tests2(void) {
     if (known_target_key != -1) {
         for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
             uint32_t *bitset = nonces[best_first_byte_smallest_bitarray].states_bitarray[odd_even];
@@ -2210,8 +2137,7 @@ static void Tests2(void)
 
 static uint16_t real_sum_a8 = 0;
 
-static void set_test_state(uint8_t byte)
-{
+static void set_test_state(uint8_t byte) {
     struct Crypto1State *pcs;
     pcs = crypto1_create(known_target_key);
     crypto1_byte(pcs, (cuid >> 24) ^ byte, true);
@@ -2222,8 +2148,7 @@ static void set_test_state(uint8_t byte)
 }
 
 
-int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t *trgkey, bool nonce_file_read, bool nonce_file_write, bool slow, int tests, uint64_t *foundkey, char *filename)
-{
+int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t *trgkey, bool nonce_file_read, bool nonce_file_write, bool slow, int tests, uint64_t *foundkey, char *filename) {
     char progress_text[80];
     char instr_set[12] = {0};
 
diff --git a/client/cmdhfmfp.c b/client/cmdhfmfp.c
index d52240e3d..aac6f3687 100644
--- a/client/cmdhfmfp.c
+++ b/client/cmdhfmfp.c
@@ -33,8 +33,7 @@ static const uint8_t DefaultKey[16] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
 
 static int CmdHelp(const char *Cmd);
 
-int CmdHFMFPInfo(const char *cmd)
-{
+int CmdHFMFPInfo(const char *cmd) {
 
     if (cmd && strlen(cmd) > 0)
         PrintAndLogEx(WARNING, "command don't have any parameters.\n");
@@ -113,8 +112,7 @@ int CmdHFMFPInfo(const char *cmd)
     return 0;
 }
 
-int CmdHFMFPWritePerso(const char *cmd)
-{
+int CmdHFMFPWritePerso(const char *cmd) {
     uint8_t keyNum[64] = {0};
     int keyNumLen = 0;
     uint8_t key[64] = {0};
@@ -180,8 +178,7 @@ int CmdHFMFPWritePerso(const char *cmd)
 
 uint16_t CardAddresses[] = {0x9000, 0x9001, 0x9002, 0x9003, 0x9004, 0xA000, 0xA001, 0xA080, 0xA081, 0xC000, 0xC001};
 
-int CmdHFMFPInitPerso(const char *cmd)
-{
+int CmdHFMFPInitPerso(const char *cmd) {
     int res;
     uint8_t key[256] = {0};
     int keyLen = 0;
@@ -255,8 +252,7 @@ int CmdHFMFPInitPerso(const char *cmd)
     return 0;
 }
 
-int CmdHFMFPCommitPerso(const char *cmd)
-{
+int CmdHFMFPCommitPerso(const char *cmd) {
     CLIParserInit("hf mfp commitp",
                   "Executes Commit Perso command. Can be used in SL0 mode only.",
                   "Usage:\n\thf mfp commitp ->  \n");
@@ -297,8 +293,7 @@ int CmdHFMFPCommitPerso(const char *cmd)
     return 0;
 }
 
-int CmdHFMFPAuth(const char *cmd)
-{
+int CmdHFMFPAuth(const char *cmd) {
     uint8_t keyn[250] = {0};
     int keynlen = 0;
     uint8_t key[250] = {0};
@@ -336,8 +331,7 @@ int CmdHFMFPAuth(const char *cmd)
     return MifareAuth4(NULL, keyn, key, true, false, verbose);
 }
 
-int CmdHFMFPRdbl(const char *cmd)
-{
+int CmdHFMFPRdbl(const char *cmd) {
     uint8_t keyn[2] = {0};
     uint8_t key[250] = {0};
     int keylen = 0;
@@ -449,8 +443,7 @@ int CmdHFMFPRdbl(const char *cmd)
     return 0;
 }
 
-int CmdHFMFPRdsc(const char *cmd)
-{
+int CmdHFMFPRdsc(const char *cmd) {
     uint8_t keyn[2] = {0};
     uint8_t key[250] = {0};
     int keylen = 0;
@@ -546,8 +539,7 @@ int CmdHFMFPRdsc(const char *cmd)
     return 0;
 }
 
-int CmdHFMFPWrbl(const char *cmd)
-{
+int CmdHFMFPWrbl(const char *cmd) {
     uint8_t keyn[2] = {0};
     uint8_t key[250] = {0};
     int keylen = 0;
@@ -649,8 +641,7 @@ int CmdHFMFPWrbl(const char *cmd)
     return 0;
 }
 
-int CmdHFMFPMAD(const char *cmd)
-{
+int CmdHFMFPMAD(const char *cmd) {
 
     CLIParserInit("hf mfp mad",
                   "Checks and prints Mifare Application Directory (MAD)",
@@ -744,8 +735,7 @@ int CmdHFMFPMAD(const char *cmd)
     return 0;
 }
 
-int CmdHFMFPNDEF(const char *cmd)
-{
+int CmdHFMFPNDEF(const char *cmd) {
 
     CLIParserInit("hf mfp ndef",
                   "Prints NFC Data Exchange Format (NDEF)",
@@ -864,15 +854,13 @@ static command_t CommandTable[] = {
     {NULL,               NULL,                    0, NULL}
 };
 
-int CmdHFMFP(const char *Cmd)
-{
+int CmdHFMFP(const char *Cmd) {
     (void)WaitForResponseTimeout(CMD_ACK, NULL, 100);
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index e925efe6b..e1fb615c5 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -77,8 +77,7 @@ const uint32_t c_D[] = {
     0x5728B869, 0x30726D5A
 };
 
-void transform_D(uint8_t *ru)
-{
+void transform_D(uint8_t *ru) {
     //Transform
     uint8_t i;
     uint8_t p = 0;
@@ -103,8 +102,7 @@ void transform_D(uint8_t *ru)
 }
 
 // Certain pwd generation algo nickname A.
-uint32_t ul_ev1_pwdgenA(uint8_t *uid)
-{
+uint32_t ul_ev1_pwdgenA(uint8_t *uid) {
 
     uint8_t pos = (uid[3] ^ uid[4] ^ uid[5] ^ uid[6]) % 32;
 
@@ -129,8 +127,7 @@ uint32_t ul_ev1_pwdgenA(uint8_t *uid)
 }
 
 // Certain pwd generation algo nickname B. (very simple)
-uint32_t ul_ev1_pwdgenB(uint8_t *uid)
-{
+uint32_t ul_ev1_pwdgenB(uint8_t *uid) {
 
     uint8_t pwd[] = {0x00, 0x00, 0x00, 0x00};
 
@@ -142,8 +139,7 @@ uint32_t ul_ev1_pwdgenB(uint8_t *uid)
 }
 
 // Certain pwd generation algo nickname C.
-uint32_t ul_ev1_pwdgenC(uint8_t *uid)
-{
+uint32_t ul_ev1_pwdgenC(uint8_t *uid) {
     uint32_t pwd = 0;
     uint8_t base[] = {
         0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x28,
@@ -162,8 +158,7 @@ uint32_t ul_ev1_pwdgenC(uint8_t *uid)
 }
 // Certain pwd generation algo nickname D.
 // a.k.a xzy
-uint32_t ul_ev1_pwdgenD(uint8_t *uid)
-{
+uint32_t ul_ev1_pwdgenD(uint8_t *uid) {
     uint8_t i;
     //Rotate
     uint8_t r = (uid[1] + uid[3] + uid[5]) & 7; //Rotation offset
@@ -182,21 +177,17 @@ uint32_t ul_ev1_pwdgenD(uint8_t *uid)
     return BSWAP_32(pwd);
 }
 // pack generation for algo 1-3
-uint16_t ul_ev1_packgenA(uint8_t *uid)
-{
+uint16_t ul_ev1_packgenA(uint8_t *uid) {
     uint16_t pack = (uid[0] ^ uid[1] ^ uid[2]) << 8 | (uid[2] ^ 8);
     return pack;
 }
-uint16_t ul_ev1_packgenB(uint8_t *uid)
-{
+uint16_t ul_ev1_packgenB(uint8_t *uid) {
     return 0x8080;
 }
-uint16_t ul_ev1_packgenC(uint8_t *uid)
-{
+uint16_t ul_ev1_packgenC(uint8_t *uid) {
     return 0xaa55;
 }
-uint16_t ul_ev1_packgenD(uint8_t *uid)
-{
+uint16_t ul_ev1_packgenD(uint8_t *uid) {
     uint8_t i;
     //Rotate
     uint8_t r = (uid[2] + uid[5]) & 7; //Rotation offset
@@ -215,8 +206,7 @@ uint16_t ul_ev1_packgenD(uint8_t *uid)
     return BSWAP_16(p & 0xFFFF);
 }
 
-int ul_ev1_pwdgen_selftest()
-{
+int ul_ev1_pwdgen_selftest() {
 
     uint8_t uid1[] = {0x04, 0x11, 0x12, 0x11, 0x12, 0x11, 0x10};
     uint32_t pwd1 = ul_ev1_pwdgenA(uid1);
@@ -238,8 +228,7 @@ int ul_ev1_pwdgen_selftest()
 
 //------------------------------------
 // get version nxp product type
-char *getProductTypeStr(uint8_t id)
-{
+char *getProductTypeStr(uint8_t id) {
 
     static char buf[20];
     char *retStr = buf;
@@ -263,8 +252,7 @@ char *getProductTypeStr(uint8_t id)
   the LSBit is set to '0' if the size is exactly 2^n
   and set to '1' if the storage size is between 2^n and 2^(n+1).
 */
-char *getUlev1CardSizeStr(uint8_t fsize)
-{
+char *getUlev1CardSizeStr(uint8_t fsize) {
 
     static char buf[40];
     char *retStr = buf;
@@ -281,15 +269,13 @@ char *getUlev1CardSizeStr(uint8_t fsize)
     return buf;
 }
 
-static void ul_switch_on_field(void)
-{
+static void ul_switch_on_field(void) {
     UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT | ISO14A_NO_RATS, 0, 0}};
     clearCommandBuffer();
     SendCommand(&c);
 }
 
-static int ul_send_cmd_raw(uint8_t *cmd, uint8_t cmdlen, uint8_t *response, uint16_t responseLength)
-{
+static int ul_send_cmd_raw(uint8_t *cmd, uint8_t cmdlen, uint8_t *response, uint16_t responseLength) {
     UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_NO_DISCONNECT | ISO14A_APPEND_CRC | ISO14A_NO_RATS, cmdlen, 0}};
     memcpy(c.d.asBytes, cmd, cmdlen);
     clearCommandBuffer();
@@ -303,8 +289,7 @@ static int ul_send_cmd_raw(uint8_t *cmd, uint8_t cmdlen, uint8_t *response, uint
     return resplen;
 }
 
-static int ul_select(iso14a_card_select_t *card)
-{
+static int ul_select(iso14a_card_select_t *card) {
 
     ul_switch_on_field();
 
@@ -323,16 +308,14 @@ static int ul_select(iso14a_card_select_t *card)
 }
 
 // This read command will at least return 16bytes.
-static int ul_read(uint8_t page, uint8_t *response, uint16_t responseLength)
-{
+static int ul_read(uint8_t page, uint8_t *response, uint16_t responseLength) {
 
     uint8_t cmd[] = {ISO14443A_CMD_READBLOCK, page};
     int len = ul_send_cmd_raw(cmd, sizeof(cmd), response, responseLength);
     return len;
 }
 
-static int ul_comp_write(uint8_t page, uint8_t *data, uint8_t datalen)
-{
+static int ul_comp_write(uint8_t page, uint8_t *data, uint8_t datalen) {
 
     uint8_t cmd[18];
     memset(cmd, 0x00, sizeof(cmd));
@@ -350,16 +333,14 @@ static int ul_comp_write(uint8_t page, uint8_t *data, uint8_t datalen)
     return -1;
 }
 
-static int ulc_requestAuthentication(uint8_t *nonce, uint16_t nonceLength)
-{
+static int ulc_requestAuthentication(uint8_t *nonce, uint16_t nonceLength) {
 
     uint8_t cmd[] = {MIFARE_ULC_AUTH_1, 0x00};
     int len = ul_send_cmd_raw(cmd, sizeof(cmd), nonce, nonceLength);
     return len;
 }
 
-static int ulc_authentication(uint8_t *key, bool switch_off_field)
-{
+static int ulc_authentication(uint8_t *key, bool switch_off_field) {
 
     UsbCommand c = {CMD_MIFAREUC_AUTH, {switch_off_field}};
     memcpy(c.d.asBytes, key, 16);
@@ -372,8 +353,7 @@ static int ulc_authentication(uint8_t *key, bool switch_off_field)
     return 0;
 }
 
-static int ulev1_requestAuthentication(uint8_t *pwd, uint8_t *pack, uint16_t packLength)
-{
+static int ulev1_requestAuthentication(uint8_t *pwd, uint8_t *pack, uint16_t packLength) {
 
     uint8_t cmd[] = {MIFARE_ULEV1_AUTH, pwd[0], pwd[1], pwd[2], pwd[3]};
     int len = ul_send_cmd_raw(cmd, sizeof(cmd), pack, packLength);
@@ -384,8 +364,7 @@ static int ulev1_requestAuthentication(uint8_t *pwd, uint8_t *pack, uint16_t pac
     return len;
 }
 
-static int ul_auth_select(iso14a_card_select_t *card, TagTypeUL_t tagtype, bool hasAuthKey, uint8_t *authkey, uint8_t *pack, uint8_t packSize)
-{
+static int ul_auth_select(iso14a_card_select_t *card, TagTypeUL_t tagtype, bool hasAuthKey, uint8_t *authkey, uint8_t *pack, uint8_t packSize) {
     if (hasAuthKey && (tagtype & UL_C)) {
         //will select card automatically and close connection on error
         if (!ulc_authentication(authkey, false)) {
@@ -406,31 +385,27 @@ static int ul_auth_select(iso14a_card_select_t *card, TagTypeUL_t tagtype, bool
     return 1;
 }
 
-static int ulev1_getVersion(uint8_t *response, uint16_t responseLength)
-{
+static int ulev1_getVersion(uint8_t *response, uint16_t responseLength) {
     uint8_t cmd[] = {MIFARE_ULEV1_VERSION};
     int len = ul_send_cmd_raw(cmd, sizeof(cmd), response, responseLength);
     return len;
 }
 
-static int ulev1_readCounter(uint8_t counter, uint8_t *response, uint16_t responseLength)
-{
+static int ulev1_readCounter(uint8_t counter, uint8_t *response, uint16_t responseLength) {
 
     uint8_t cmd[] = {MIFARE_ULEV1_READ_CNT, counter};
     int len = ul_send_cmd_raw(cmd, sizeof(cmd), response, responseLength);
     return len;
 }
 
-static int ulev1_readTearing(uint8_t counter, uint8_t *response, uint16_t responseLength)
-{
+static int ulev1_readTearing(uint8_t counter, uint8_t *response, uint16_t responseLength) {
 
     uint8_t cmd[] = {MIFARE_ULEV1_CHECKTEAR, counter};
     int len = ul_send_cmd_raw(cmd, sizeof(cmd), response, responseLength);
     return len;
 }
 
-static int ulev1_readSignature(uint8_t *response, uint16_t responseLength)
-{
+static int ulev1_readSignature(uint8_t *response, uint16_t responseLength) {
 
     uint8_t cmd[] = {MIFARE_ULEV1_READSIG, 0x00};
     int len = ul_send_cmd_raw(cmd, sizeof(cmd), response, responseLength);
@@ -450,8 +425,7 @@ static int ulev1_readSignature(uint8_t *response, uint16_t responseLength)
 //  UL responds with read of page 0, fudan doesn't respond.
 //
 // make sure field is off before calling this function
-static int ul_fudan_check(void)
-{
+static int ul_fudan_check(void) {
     iso14a_card_select_t card;
     if (!ul_select(&card))
         return UL_ERROR;
@@ -469,8 +443,7 @@ static int ul_fudan_check(void)
     return (!resp.d.asBytes[0]) ? FUDAN_UL : UL; //if response == 0x00 then Fudan, else Genuine NXP
 }
 
-static int ul_print_default(uint8_t *data)
-{
+static int ul_print_default(uint8_t *data) {
 
     uint8_t uid[7];
     uid[0] = data[0];
@@ -525,8 +498,7 @@ static int ul_print_default(uint8_t *data)
     return 0;
 }
 
-static int ndef_print_CC(uint8_t *data)
-{
+static int ndef_print_CC(uint8_t *data) {
     // no NDEF message
     if (data[0] != 0xE1)
         return -1;
@@ -551,8 +523,7 @@ static int ndef_print_CC(uint8_t *data)
     return 0;
 }
 
-int ul_print_type(uint32_t tagtype, uint8_t spaces)
-{
+int ul_print_type(uint32_t tagtype, uint8_t spaces) {
     char spc[11] = "          ";
     spc[10] = 0x00;
     char *spacer = spc + (10 - spaces);
@@ -612,8 +583,7 @@ int ul_print_type(uint32_t tagtype, uint8_t spaces)
     return 0;
 }
 
-static int ulc_print_3deskey(uint8_t *data)
-{
+static int ulc_print_3deskey(uint8_t *data) {
     PrintAndLogEx(NORMAL, "         deskey1 [44/0x2C] : %s [s]", sprint_hex(data, 4), sprint_ascii(data, 4));
     PrintAndLogEx(NORMAL, "         deskey1 [45/0x2D] : %s [s]", sprint_hex(data + 4, 4), sprint_ascii(data + 4, 4));
     PrintAndLogEx(NORMAL, "         deskey2 [46/0x2E] : %s [s]", sprint_hex(data + 8, 4), sprint_ascii(data + 8, 4));
@@ -622,8 +592,7 @@ static int ulc_print_3deskey(uint8_t *data)
     return 0;
 }
 
-static int ulc_print_configuration(uint8_t *data)
-{
+static int ulc_print_configuration(uint8_t *data) {
 
     PrintAndLogEx(NORMAL, "--- UL-C Configuration");
     PrintAndLogEx(NORMAL, " Higher Lockbits [40/0x28] : %s - %s", sprint_hex(data, 4), sprint_bin(data, 2));
@@ -646,8 +615,7 @@ static int ulc_print_configuration(uint8_t *data)
     return 0;
 }
 
-static int ulev1_print_configuration(uint32_t tagtype, uint8_t *data, uint8_t startPage)
-{
+static int ulev1_print_configuration(uint32_t tagtype, uint8_t *data, uint8_t startPage) {
 
     PrintAndLogEx(NORMAL, "\n--- Tag Configuration");
 
@@ -753,8 +721,7 @@ static int ulev1_print_configuration(uint32_t tagtype, uint8_t *data, uint8_t st
     return 0;
 }
 
-static int ulev1_print_counters()
-{
+static int ulev1_print_counters() {
     PrintAndLogEx(NORMAL, "--- Tag Counters");
     uint8_t tear[1] = {0};
     uint8_t counter[3] = {0, 0, 0};
@@ -770,8 +737,7 @@ static int ulev1_print_counters()
     return len;
 }
 
-static int ulev1_print_signature(uint8_t *data, uint8_t len)
-{
+static int ulev1_print_signature(uint8_t *data, uint8_t len) {
     PrintAndLogEx(NORMAL, "\n--- Tag Signature");
     PrintAndLogEx(NORMAL, "IC signature public key name  : NXP NTAG21x (2013)");
     PrintAndLogEx(NORMAL, "IC signature public key value : %s", sprint_hex(public_ecda_key, PUBLIC_ECDA_KEYLEN));
@@ -783,8 +749,7 @@ static int ulev1_print_signature(uint8_t *data, uint8_t len)
     return 0;
 }
 
-static int ulev1_print_version(uint8_t *data)
-{
+static int ulev1_print_version(uint8_t *data) {
     PrintAndLogEx(NORMAL, "\n--- Tag Version");
     PrintAndLogEx(NORMAL, "       Raw bytes : %s", sprint_hex(data, 8));
     PrintAndLogEx(NORMAL, "       Vendor ID : %02X, %s", data[1], getTagInfo(data[1]));
@@ -824,8 +789,7 @@ static int ulc_magic_test(){
     return returnValue;
 }
 */
-static int ul_magic_test()
-{
+static int ul_magic_test() {
     // Magic Ultralight tests
     // 1) take present UID, and try to write it back. OBSOLETE
     // 2) make a wrong length write to page0, and see if tag answers with ACK/NACK:
@@ -840,8 +804,7 @@ static int ul_magic_test()
     return 0;
 }
 
-uint32_t GetHF14AMfU_Type(void)
-{
+uint32_t GetHF14AMfU_Type(void) {
 
     TagTypeUL_t tagtype = UNKNOWN;
     iso14a_card_select_t card;
@@ -963,8 +926,7 @@ uint32_t GetHF14AMfU_Type(void)
 //
 //  extended tag information
 //
-int CmdHF14AMfUInfo(const char *Cmd)
-{
+int CmdHF14AMfUInfo(const char *Cmd) {
 
     uint8_t authlim = 0xff;
     uint8_t data[16] = {0x00};
@@ -1229,8 +1191,7 @@ out:
 //
 //  Write Single Block
 //
-int CmdHF14AMfUWrBl(const char *Cmd)
-{
+int CmdHF14AMfUWrBl(const char *Cmd) {
 
     int blockNo = -1;
     bool errors = false;
@@ -1351,8 +1312,7 @@ int CmdHF14AMfUWrBl(const char *Cmd)
 //
 //  Read Single Block
 //
-int CmdHF14AMfURdBl(const char *Cmd)
-{
+int CmdHF14AMfURdBl(const char *Cmd) {
 
     int blockNo = -1;
     bool errors = false;
@@ -1460,8 +1420,7 @@ int CmdHF14AMfURdBl(const char *Cmd)
     return 0;
 }
 
-int usage_hf_mfu_info(void)
-{
+int usage_hf_mfu_info(void) {
     PrintAndLogEx(NORMAL, "It gathers information about the tag and tries to detect what kind it is.");
     PrintAndLogEx(NORMAL, "Sometimes the tags are locked down, and you may need a key to be able to read the information");
     PrintAndLogEx(NORMAL, "The following tags can be identified:\n");
@@ -1480,8 +1439,7 @@ int usage_hf_mfu_info(void)
     return 0;
 }
 
-int usage_hf_mfu_dump(void)
-{
+int usage_hf_mfu_dump(void) {
     PrintAndLogEx(NORMAL, "Reads all pages from Ultralight, Ultralight-C, Ultralight EV1");
     PrintAndLogEx(NORMAL, "NTAG 203, NTAG 210, NTAG 212, NTAG 213, NTAG 215, NTAG 216");
     PrintAndLogEx(NORMAL, "and saves binary dump into the file `filename.bin` or `cardUID.bin`");
@@ -1502,8 +1460,7 @@ int usage_hf_mfu_dump(void)
     return 0;
 }
 
-int usage_hf_mfu_restore(void)
-{
+int usage_hf_mfu_restore(void) {
     PrintAndLogEx(NORMAL, "Restore dumpfile onto card.");
     PrintAndLogEx(NORMAL, "Usage:  hf mfu restore [h] [l] [s] k <key> n <filename w/o .bin> ");
     PrintAndLogEx(NORMAL, "  Options :");
@@ -1521,8 +1478,7 @@ int usage_hf_mfu_restore(void)
     return 0;
 }
 
-int usage_hf_mfu_rdbl(void)
-{
+int usage_hf_mfu_rdbl(void) {
     PrintAndLogEx(NORMAL, "Read a block and print. It autodetects card type.\n");
     PrintAndLogEx(NORMAL, "Usage:  hf mfu rdbl b <block number> k <key> l\n");
     PrintAndLogEx(NORMAL, "Options:");
@@ -1537,8 +1493,7 @@ int usage_hf_mfu_rdbl(void)
     return 0;
 }
 
-int usage_hf_mfu_wrbl(void)
-{
+int usage_hf_mfu_wrbl(void) {
     PrintAndLogEx(NORMAL, "Write a block. It autodetects card type.\n");
     PrintAndLogEx(NORMAL, "Usage:  hf mfu wrbl b <block number> d <data> k <key> l\n");
     PrintAndLogEx(NORMAL, "Options:");
@@ -1553,8 +1508,7 @@ int usage_hf_mfu_wrbl(void)
     return 0;
 }
 
-int usage_hf_mfu_eload(void)
-{
+int usage_hf_mfu_eload(void) {
     PrintAndLogEx(NORMAL, "It loads emul dump from the file `filename.eml`");
     PrintAndLogEx(NORMAL, "Hint: See script dumptoemul-mfu.lua to convert the .bin to the eml");
     PrintAndLogEx(NORMAL, "Usage:  hf mfu eload u <file name w/o `.eml`> [numblocks]");
@@ -1569,8 +1523,7 @@ int usage_hf_mfu_eload(void)
     return 0;
 }
 
-int usage_hf_mfu_sim(void)
-{
+int usage_hf_mfu_sim(void) {
     PrintAndLogEx(NORMAL, "\nEmulating Ultralight tag from emulator memory\n");
     PrintAndLogEx(NORMAL, "\nBe sure to load the emulator memory first!\n");
     PrintAndLogEx(NORMAL, "Usage: hf mfu sim t 7 u <uid>");
@@ -1586,8 +1539,7 @@ int usage_hf_mfu_sim(void)
     return 0;
 }
 
-int usage_hf_mfu_ucauth(void)
-{
+int usage_hf_mfu_ucauth(void) {
     PrintAndLogEx(NORMAL, "Usage:  hf mfu cauth k <key number>");
     PrintAndLogEx(NORMAL, "      0 (default): 3DES standard key");
     PrintAndLogEx(NORMAL, "      1 : all 0x00 key");
@@ -1602,8 +1554,7 @@ int usage_hf_mfu_ucauth(void)
     return 0;
 }
 
-int usage_hf_mfu_ucsetpwd(void)
-{
+int usage_hf_mfu_ucsetpwd(void) {
     PrintAndLogEx(NORMAL, "Usage:  hf mfu setpwd <password (32 hex symbols)>");
     PrintAndLogEx(NORMAL, "       [password] - (32 hex symbols)");
     PrintAndLogEx(NORMAL, "");
@@ -1613,8 +1564,7 @@ int usage_hf_mfu_ucsetpwd(void)
     return 0;
 }
 
-int usage_hf_mfu_ucsetuid(void)
-{
+int usage_hf_mfu_ucsetuid(void) {
     PrintAndLogEx(NORMAL, "Usage:  hf mfu setuid <uid (14 hex symbols)>");
     PrintAndLogEx(NORMAL, "       [uid] - (14 hex symbols)");
     PrintAndLogEx(NORMAL, "\nThis only works for Magic Ultralight tags.");
@@ -1625,8 +1575,7 @@ int usage_hf_mfu_ucsetuid(void)
     return 0;
 }
 
-int usage_hf_mfu_gendiverse(void)
-{
+int usage_hf_mfu_gendiverse(void) {
     PrintAndLogEx(NORMAL, "Usage:  hf mfu gen [h] [r] <uid (8 hex symbols)>");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "    h       : this help");
@@ -1639,8 +1588,7 @@ int usage_hf_mfu_gendiverse(void)
     return 0;
 }
 
-int usage_hf_mfu_pwdgen(void)
-{
+int usage_hf_mfu_pwdgen(void) {
     PrintAndLogEx(NORMAL, "Usage:  hf mfu pwdgen [h|t] [r] <uid (14 hex symbols)>");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "    h       : this help");
@@ -1655,13 +1603,11 @@ int usage_hf_mfu_pwdgen(void)
     return 0;
 }
 
-void printMFUdump(mfu_dump_t *card)
-{
+void printMFUdump(mfu_dump_t *card) {
     printMFUdumpEx(card, 255, 0);
 }
 
-void printMFUdumpEx(mfu_dump_t *card, uint16_t pages, uint8_t startpage)
-{
+void printMFUdumpEx(mfu_dump_t *card, uint16_t pages, uint8_t startpage) {
     PrintAndLogEx(NORMAL, "\n*special* data\n");
     PrintAndLogEx(NORMAL, "\nDataType  | Data                    | Ascii");
     PrintAndLogEx(NORMAL, "----------+-------------------------+---------");
@@ -1807,8 +1753,7 @@ void printMFUdumpEx(mfu_dump_t *card, uint16_t pages, uint8_t startpage)
 //
 //  Mifare Ultralight / Ultralight-C / Ultralight-EV1
 //  Read and Dump Card Contents,  using auto detection of tag size.
-int CmdHF14AMfUDump(const char *Cmd)
-{
+int CmdHF14AMfUDump(const char *Cmd) {
 
     uint8_t fileNameLen = 0;
     char filename[FILE_PATH_SIZE] = {0x00};
@@ -2030,8 +1975,7 @@ int CmdHF14AMfUDump(const char *Cmd)
     return 0;
 }
 
-static void wait4response(uint8_t b)
-{
+static void wait4response(uint8_t b) {
     UsbCommand resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         uint8_t isOK  = resp.arg[0] & 0xff;
@@ -2045,8 +1989,7 @@ static void wait4response(uint8_t b)
 //
 //  Restore dump file onto tag
 //
-int CmdHF14AMfURestore(const char *Cmd)
-{
+int CmdHF14AMfURestore(const char *Cmd) {
 
     char tempStr[50] = {0};
     char filename[FILE_PATH_SIZE] = {0};
@@ -2277,8 +2220,7 @@ int CmdHF14AMfURestore(const char *Cmd)
 //
 //  Load emulator with dump file
 //
-int CmdHF14AMfUeLoad(const char *Cmd)
-{
+int CmdHF14AMfUeLoad(const char *Cmd) {
     char c = tolower(param_getchar(Cmd, 0));
     if (c == 'h' || c == 0x00) return usage_hf_mfu_eload();
     return CmdHF14AMfELoad(Cmd);
@@ -2286,8 +2228,7 @@ int CmdHF14AMfUeLoad(const char *Cmd)
 //
 //  Simulate tag
 //
-int CmdHF14AMfUSim(const char *Cmd)
-{
+int CmdHF14AMfUSim(const char *Cmd) {
     char c = tolower(param_getchar(Cmd, 0));
     if (c == 'h' || c == 0x00) return usage_hf_mfu_sim();
     return CmdHF14ASim(Cmd);
@@ -2300,8 +2241,7 @@ int CmdHF14AMfUSim(const char *Cmd)
 //
 // Ultralight C Authentication Demo {currently uses hard-coded key}
 //
-int CmdHF14AMfucAuth(const char *Cmd)
-{
+int CmdHF14AMfucAuth(const char *Cmd) {
 
     uint8_t keyNo = 3;
     bool errors = false;
@@ -2428,8 +2368,7 @@ int CmdTestDES(const char * cmd)
 //
 // Mifare Ultralight C - Set password
 //
-int CmdHF14AMfucSetPwd(const char *Cmd)
-{
+int CmdHF14AMfucSetPwd(const char *Cmd) {
 
     uint8_t pwd[16] = {0x00};
     char cmdp = tolower(param_getchar(Cmd, 0));
@@ -2464,8 +2403,7 @@ int CmdHF14AMfucSetPwd(const char *Cmd)
 //
 // Magic UL / UL-C tags  - Set UID
 //
-int CmdHF14AMfucSetUid(const char *Cmd)
-{
+int CmdHF14AMfucSetUid(const char *Cmd) {
 
     UsbCommand c = {CMD_MIFAREU_READBL};
     UsbCommand resp;
@@ -2534,8 +2472,7 @@ int CmdHF14AMfucSetUid(const char *Cmd)
     return 0;
 }
 
-int CmdHF14AMfuGenDiverseKeys(const char *Cmd)
-{
+int CmdHF14AMfuGenDiverseKeys(const char *Cmd) {
 
     uint8_t uid[4];
     char cmdp = tolower(param_getchar(Cmd, 0));
@@ -2648,8 +2585,7 @@ int CmdHF14AMfuGenDiverseKeys(const char *Cmd)
     return 0;
 }
 
-int CmdHF14AMfuPwdGen(const char *Cmd)
-{
+int CmdHF14AMfuPwdGen(const char *Cmd) {
 
     uint8_t uid[7] = {0x00};
     char cmdp = tolower(param_getchar(Cmd, 0));
@@ -2720,15 +2656,13 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdHFMFUltra(const char *Cmd)
-{
+int CmdHFMFUltra(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdhftopaz.c b/client/cmdhftopaz.c
index 28e1d05a4..398feec6c 100644
--- a/client/cmdhftopaz.c
+++ b/client/cmdhftopaz.c
@@ -30,21 +30,18 @@ static struct {
     dynamic_lock_area_t *dynamic_lock_areas;       // lock area descriptors
 } topaz_tag;
 
-static void topaz_switch_on_field(void)
-{
+static void topaz_switch_on_field(void) {
     UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_SELECT | ISO14A_NO_DISCONNECT | ISO14A_TOPAZMODE | ISO14A_NO_RATS, 0, 0}};
     SendCommand(&c);
 }
 
-static void topaz_switch_off_field(void)
-{
+static void topaz_switch_off_field(void) {
     UsbCommand c = {CMD_READER_ISO_14443a, {0, 0, 0}};
     SendCommand(&c);
 }
 
 // send a raw topaz command, returns the length of the response (0 in case of error)
-static int topaz_send_cmd_raw(uint8_t *cmd, uint8_t len, uint8_t *response)
-{
+static int topaz_send_cmd_raw(uint8_t *cmd, uint8_t len, uint8_t *response) {
     UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_NO_DISCONNECT | ISO14A_TOPAZMODE | ISO14A_NO_RATS, len, 0}};
     memcpy(c.d.asBytes, cmd, len);
     SendCommand(&c);
@@ -61,8 +58,7 @@ static int topaz_send_cmd_raw(uint8_t *cmd, uint8_t len, uint8_t *response)
 
 
 // calculate CRC bytes and send topaz command, returns the length of the response (0 in case of error)
-static int topaz_send_cmd(uint8_t *cmd, uint8_t len, uint8_t *response)
-{
+static int topaz_send_cmd(uint8_t *cmd, uint8_t len, uint8_t *response) {
     if (len > 1) {
         uint8_t b1, b2;
         compute_crc(CRC_14443_B, cmd, len - 2, &b1, &b2);
@@ -75,8 +71,7 @@ static int topaz_send_cmd(uint8_t *cmd, uint8_t len, uint8_t *response)
 
 
 // select a topaz tag. Send WUPA and RID.
-static int topaz_select(uint8_t *atqa, uint8_t *rid_response)
-{
+static int topaz_select(uint8_t *atqa, uint8_t *rid_response) {
     // ToDo: implement anticollision
 
     uint8_t wupa_cmd[] = {TOPAZ_WUPA};
@@ -99,8 +94,7 @@ static int topaz_select(uint8_t *atqa, uint8_t *rid_response)
 
 
 // read all of the static memory of a selected Topaz tag.
-static int topaz_rall(uint8_t *uid, uint8_t *response)
-{
+static int topaz_rall(uint8_t *uid, uint8_t *response) {
     uint8_t rall_cmd[] = {TOPAZ_RALL, 0, 0, 0, 0, 0, 0, 0, 0};
 
     memcpy(&rall_cmd[3], uid, 4);
@@ -114,8 +108,7 @@ static int topaz_rall(uint8_t *uid, uint8_t *response)
 
 
 // read a block (8 Bytes) of a selected Topaz tag.
-static int topaz_read_block(uint8_t *uid, uint8_t blockno, uint8_t *block_data)
-{
+static int topaz_read_block(uint8_t *uid, uint8_t blockno, uint8_t *block_data) {
     uint8_t read8_cmd[] = {TOPAZ_READ8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
     uint8_t read8_response[11];
 
@@ -130,8 +123,7 @@ static int topaz_read_block(uint8_t *uid, uint8_t blockno, uint8_t *block_data)
 }
 
 // read a segment (16 blocks = 128 Bytes) of a selected Topaz tag. Works only for tags with dynamic memory.
-static int topaz_read_segment(uint8_t *uid, uint8_t segno, uint8_t *segment_data)
-{
+static int topaz_read_segment(uint8_t *uid, uint8_t segno, uint8_t *segment_data) {
     uint8_t rseg_cmd[] = {TOPAZ_RSEG, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
     uint8_t rseg_response[131];
 
@@ -146,8 +138,7 @@ static int topaz_read_segment(uint8_t *uid, uint8_t segno, uint8_t *segment_data
 }
 
 // search for the lock area descriptor for the lockable area including byteno
-static dynamic_lock_area_t *get_dynamic_lock_area(uint16_t byteno)
-{
+static dynamic_lock_area_t *get_dynamic_lock_area(uint16_t byteno) {
     dynamic_lock_area_t *lock_area;
     lock_area = topaz_tag.dynamic_lock_areas;
 
@@ -162,8 +153,7 @@ static dynamic_lock_area_t *get_dynamic_lock_area(uint16_t byteno)
 }
 
 // check if a memory byte is locked.
-static bool topaz_byte_is_locked(uint16_t byteno)
-{
+static bool topaz_byte_is_locked(uint16_t byteno) {
     uint8_t *lockbits;
     uint16_t locked_bytes_per_bit;
     dynamic_lock_area_t *lock_area;
@@ -192,8 +182,7 @@ static bool topaz_byte_is_locked(uint16_t byteno)
 
 
 // read and print the Capability Container
-static int topaz_print_CC(uint8_t *data)
-{
+static int topaz_print_CC(uint8_t *data) {
     if (data[0] != 0xe1) {
         topaz_tag.size = TOPAZ_STATIC_MEMORY;
         return -1; // no NDEF message
@@ -214,8 +203,7 @@ static int topaz_print_CC(uint8_t *data)
 
 
 // return type, length and value of a TLV, starting at memory position *TLV_ptr
-static void get_TLV(uint8_t **TLV_ptr, uint8_t *TLV_type, uint16_t *TLV_length, uint8_t **TLV_value)
-{
+static void get_TLV(uint8_t **TLV_ptr, uint8_t *TLV_type, uint16_t *TLV_length, uint8_t **TLV_value) {
     *TLV_length = 0;
     *TLV_value = NULL;
 
@@ -249,8 +237,7 @@ static void get_TLV(uint8_t **TLV_ptr, uint8_t *TLV_type, uint16_t *TLV_length,
 // lock area TLVs contain no information on the start of the respective lockable area. Lockable areas
 // do not include the lock bits and reserved memory. We therefore need to adjust the start of the
 // respective lockable areas accordingly
-static void adjust_lock_areas(uint16_t block_start, uint16_t block_size)
-{
+static void adjust_lock_areas(uint16_t block_start, uint16_t block_size) {
     dynamic_lock_area_t *lock_area = topaz_tag.dynamic_lock_areas;
     while (lock_area != NULL) {
         if (lock_area->first_locked_byte <= block_start) {
@@ -262,8 +249,7 @@ static void adjust_lock_areas(uint16_t block_start, uint16_t block_size)
 
 
 // read and print the lock area and reserved memory TLVs
-static void topaz_print_control_TLVs(uint8_t *memory)
-{
+static void topaz_print_control_TLVs(uint8_t *memory) {
     uint8_t *TLV_ptr = memory;
     uint8_t TLV_type = 0;
     uint16_t TLV_length;
@@ -336,8 +322,7 @@ static void topaz_print_control_TLVs(uint8_t *memory)
 }
 
 // read all of the dynamic memory
-static int topaz_read_dynamic_data(void)
-{
+static int topaz_read_dynamic_data(void) {
     // first read the remaining block of segment 0
     if (topaz_read_block(topaz_tag.uid, 0x0f, &topaz_tag.dynamic_memory[0]) == -1) {
         PrintAndLogEx(WARNING, "Error while reading dynamic memory block %02x. Aborting...", 0x0f);
@@ -357,8 +342,7 @@ static int topaz_read_dynamic_data(void)
 
 
 // read and print the dynamic memory
-static void topaz_print_dynamic_data(void)
-{
+static void topaz_print_dynamic_data(void) {
     if (topaz_tag.size > TOPAZ_STATIC_MEMORY) {
         PrintAndLogEx(NORMAL, "Dynamic Data blocks:");
         if (topaz_read_dynamic_data() == 0) {
@@ -378,19 +362,16 @@ static void topaz_print_dynamic_data(void)
     }
 }
 
-static void topaz_print_lifecycle_state(uint8_t *data)
-{
+static void topaz_print_lifecycle_state(uint8_t *data) {
     // to be done
 }
 
-static void topaz_print_NDEF(uint8_t *data)
-{
+static void topaz_print_NDEF(uint8_t *data) {
     // to be done.
 }
 
 // read a Topaz tag and print some useful information
-int CmdHFTopazReader(const char *Cmd)
-{
+int CmdHFTopazReader(const char *Cmd) {
     int status;
     uint8_t atqa[2];
     uint8_t rid_response[8];
@@ -506,20 +487,17 @@ int CmdHFTopazReader(const char *Cmd)
     return 0;
 }
 
-int CmdHFTopazSim(const char *Cmd)
-{
+int CmdHFTopazSim(const char *Cmd) {
     PrintAndLogEx(NORMAL, "not yet implemented");
     return 0;
 }
 
-int CmdHFTopazCmdRaw(const char *Cmd)
-{
+int CmdHFTopazCmdRaw(const char *Cmd) {
     PrintAndLogEx(NORMAL, "not yet implemented. Use hf 14 raw with option -T.");
     return 0;
 }
 
-int CmdHFTopazList(const char *Cmd)
-{
+int CmdHFTopazList(const char *Cmd) {
     CmdTraceList("topaz");
     return 0;
 }
@@ -536,15 +514,13 @@ static command_t CommandTable[] = {
     {NULL,      NULL,               0, NULL}
 };
 
-int CmdHFTopaz(const char *Cmd)
-{
+int CmdHFTopaz(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-static int CmdHelp(const char *Cmd)
-{
+static int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdhw.c b/client/cmdhw.c
index b95203b56..d40e5db4c 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -23,8 +23,7 @@
 
 static int CmdHelp(const char *Cmd);
 
-static void lookupChipID(uint32_t iChipID, uint32_t mem_used)
-{
+static void lookupChipID(uint32_t iChipID, uint32_t mem_used) {
     char asBuff[120];
     memset(asBuff, 0, sizeof(asBuff));
     uint32_t mem_avail = 0;
@@ -308,8 +307,7 @@ static void lookupChipID(uint32_t iChipID, uint32_t mem_used)
     PrintAndLogEx(NORMAL, "  --= Nonvolatile Program Memory Type: %s", asBuff);
 }
 
-int CmdDetectReader(const char *Cmd)
-{
+int CmdDetectReader(const char *Cmd) {
     UsbCommand c = {CMD_LISTEN_READER_FIELD};
     // 'l' means LF - 125/134 kHz
     if (*Cmd == 'l') {
@@ -326,8 +324,7 @@ int CmdDetectReader(const char *Cmd)
 }
 
 // ## FPGA Control
-int CmdFPGAOff(const char *Cmd)
-{
+int CmdFPGAOff(const char *Cmd) {
     UsbCommand c = {CMD_FPGA_MAJOR_MODE_OFF};
     clearCommandBuffer();
     SendCommand(&c);
@@ -335,8 +332,7 @@ int CmdFPGAOff(const char *Cmd)
 }
 
 #ifdef WITH_LCD
-int CmdLCD(const char *Cmd)
-{
+int CmdLCD(const char *Cmd) {
     int i, j;
 
     UsbCommand c = {CMD_LCD};
@@ -349,8 +345,7 @@ int CmdLCD(const char *Cmd)
     return 0;
 }
 
-int CmdLCDReset(const char *Cmd)
-{
+int CmdLCDReset(const char *Cmd) {
     UsbCommand c = {CMD_LCD_RESET, {strtol(Cmd, NULL, 0), 0, 0}};
     clearCommandBuffer();
     SendCommand(&c);
@@ -358,16 +353,14 @@ int CmdLCDReset(const char *Cmd)
 }
 #endif
 
-int CmdReadmem(const char *Cmd)
-{
+int CmdReadmem(const char *Cmd) {
     UsbCommand c = {CMD_READ_MEM, {strtol(Cmd, NULL, 0), 0, 0}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
 }
 
-int CmdReset(const char *Cmd)
-{
+int CmdReset(const char *Cmd) {
     UsbCommand c = {CMD_HARDWARE_RESET};
     clearCommandBuffer();
     SendCommand(&c);
@@ -378,8 +371,7 @@ int CmdReset(const char *Cmd)
  * Sets the divisor for LF frequency clock: lets the user choose any LF frequency below
  * 600kHz.
  */
-int CmdSetDivisor(const char *Cmd)
-{
+int CmdSetDivisor(const char *Cmd) {
     UsbCommand c = {CMD_SET_LF_DIVISOR, {strtol(Cmd, NULL, 0), 0, 0}};
 
     if (c.arg[0] < 19 || c.arg[0] > 255) {
@@ -393,8 +385,7 @@ int CmdSetDivisor(const char *Cmd)
     return 0;
 }
 
-int CmdSetMux(const char *Cmd)
-{
+int CmdSetMux(const char *Cmd) {
 
     if (strlen(Cmd) < 5) {
         PrintAndLogEx(NORMAL, "expected:  lopkd | loraw | hipkd | hiraw");
@@ -412,13 +403,11 @@ int CmdSetMux(const char *Cmd)
     return 0;
 }
 
-int CmdTune(const char *Cmd)
-{
+int CmdTune(const char *Cmd) {
     return CmdTuneSamples(Cmd);
 }
 
-int CmdVersion(const char *Cmd)
-{
+int CmdVersion(const char *Cmd) {
 
     bool silent = (Cmd[0] == 's' || Cmd[0] ==  'S');
     if (silent)
@@ -457,8 +446,7 @@ int CmdVersion(const char *Cmd)
     return 0;
 }
 
-int CmdStatus(const char *Cmd)
-{
+int CmdStatus(const char *Cmd) {
     clearCommandBuffer();
     UsbCommand c = {CMD_STATUS};
     SendCommand(&c);
@@ -467,8 +455,7 @@ int CmdStatus(const char *Cmd)
     return 0;
 }
 
-int CmdPing(const char *Cmd)
-{
+int CmdPing(const char *Cmd) {
     clearCommandBuffer();
     UsbCommand resp;
     UsbCommand c = {CMD_PING};
@@ -499,15 +486,13 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdHW(const char *Cmd)
-{
+int CmdHW(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlf.c b/client/cmdlf.c
index 02d020b53..f93fe27c5 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -13,8 +13,7 @@ bool g_lf_threshold_set = false;
 
 static int CmdHelp(const char *Cmd);
 
-int usage_lf_cmdread(void)
-{
+int usage_lf_cmdread(void) {
     PrintAndLogEx(NORMAL, "Usage: lf cmdread d <delay period> z <zero period> o <one period> c <cmdbytes>");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       h             This help");
@@ -29,8 +28,7 @@ int usage_lf_cmdread(void)
     PrintAndLogEx(NORMAL, "      lf cmdread d 80 z 100 o 200 c 11000");
     return 0;
 }
-int usage_lf_read(void)
-{
+int usage_lf_read(void) {
     PrintAndLogEx(NORMAL, "Usage: lf read [h] [s] [d numofsamples]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       h            This help");
@@ -43,8 +41,7 @@ int usage_lf_read(void)
     PrintAndLogEx(NORMAL, "         lf read s");
     return 0;
 }
-int usage_lf_snoop(void)
-{
+int usage_lf_snoop(void) {
     PrintAndLogEx(NORMAL, "Snoop low frequence signal. Use 'lf config' to set parameters.");
     PrintAndLogEx(NORMAL, "Usage: lf snoop [h]");
     PrintAndLogEx(NORMAL, "Options:");
@@ -53,8 +50,7 @@ int usage_lf_snoop(void)
     PrintAndLogEx(NORMAL, "Use 'lf config' to set parameters.");
     return 0;
 }
-int usage_lf_config(void)
-{
+int usage_lf_config(void) {
     PrintAndLogEx(NORMAL, "Usage: lf config [h] [H|<divisor>] [b <bps>] [d <decim>] [a 0|1]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       h             This help");
@@ -77,8 +73,7 @@ int usage_lf_config(void)
     PrintAndLogEx(NORMAL, "                    Performs a snoop (no active field)");
     return 0;
 }
-int usage_lf_simfsk(void)
-{
+int usage_lf_simfsk(void) {
     PrintAndLogEx(NORMAL, "Usage: lf simfsk [h] [c <clock>] [H <fcHigh>] [L <fcLow>] [d <hexdata>]");
     PrintAndLogEx(NORMAL, "there are about four FSK modulations to know of.");
     PrintAndLogEx(NORMAL, "FSK1  -  where fc/8 = high  and fc/5 = low");
@@ -103,8 +98,7 @@ int usage_lf_simfsk(void)
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
-int usage_lf_simask(void)
-{
+int usage_lf_simask(void) {
     PrintAndLogEx(NORMAL, "Usage: lf simask [c <clock>] [i] [b|m|r] [s] [d <raw hex to sim>]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       h              This help");
@@ -117,8 +111,7 @@ int usage_lf_simask(void)
     PrintAndLogEx(NORMAL, "       d <hexdata>    Data to sim as hex - omit to sim from DemodBuffer");
     return 0;
 }
-int usage_lf_simpsk(void)
-{
+int usage_lf_simpsk(void) {
     PrintAndLogEx(NORMAL, "Usage: lf simpsk [1|2|3] [c <clock>] [i] [r <carrier>] [d <raw hex to sim>]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       h              This help");
@@ -131,8 +124,7 @@ int usage_lf_simpsk(void)
     PrintAndLogEx(NORMAL, "       d <hexdata>    Data to sim as hex - omit to sim from DemodBuffer");
     return 0;
 }
-int usage_lf_find(void)
-{
+int usage_lf_find(void) {
     PrintAndLogEx(NORMAL, "Usage:  lf search [h] <0|1> [u]");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Options:");
@@ -149,8 +141,7 @@ int usage_lf_find(void)
 
 
 /* send a LF command before reading */
-int CmdLFCommandRead(const char *Cmd)
-{
+int CmdLFCommandRead(const char *Cmd) {
 
     UsbCommand c = {CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K, {0, 0, 0}};
     bool errors = false;
@@ -194,8 +185,7 @@ int CmdLFCommandRead(const char *Cmd)
     return 0;
 }
 
-int CmdFlexdemod(const char *Cmd)
-{
+int CmdFlexdemod(const char *Cmd) {
 
     if (GraphTraceLen < 0)
         return 0;
@@ -272,8 +262,7 @@ int CmdFlexdemod(const char *Cmd)
     return 0;
 }
 
-int CmdLFSetConfig(const char *Cmd)
-{
+int CmdLFSetConfig(const char *Cmd) {
     uint8_t divisor =  0;//Frequency divisor
     uint8_t bps = 0; // Bits per sample
     uint8_t decimation = 0; //How many to keep
@@ -341,8 +330,7 @@ int CmdLFSetConfig(const char *Cmd)
     return 0;
 }
 
-bool lf_read(bool silent, uint32_t samples)
-{
+bool lf_read(bool silent, uint32_t samples) {
     if (IsOffline()) return false;
     UsbCommand c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_125K, {silent, samples, 0}};
     clearCommandBuffer();
@@ -363,8 +351,7 @@ bool lf_read(bool silent, uint32_t samples)
     return true;
 }
 
-int CmdLFRead(const char *Cmd)
-{
+int CmdLFRead(const char *Cmd) {
 
     if (IsOffline()) return 0;
 
@@ -397,8 +384,7 @@ int CmdLFRead(const char *Cmd)
     return lf_read(silent, samples);
 }
 
-int CmdLFSnoop(const char *Cmd)
-{
+int CmdLFSnoop(const char *Cmd) {
     uint8_t cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_lf_snoop();
 
@@ -410,8 +396,7 @@ int CmdLFSnoop(const char *Cmd)
     return 0;
 }
 
-static void ChkBitstream(const char *str)
-{
+static void ChkBitstream(const char *str) {
     // convert to bitstream if necessary
     for (int i = 0; i < (int)(GraphTraceLen / 2); i++) {
         if (GraphBuffer[i] > 1 || GraphBuffer[i] < 0) {
@@ -422,8 +407,7 @@ static void ChkBitstream(const char *str)
 }
 //Attempt to simulate any wave in buffer (one bit per output sample)
 // converts GraphBuffer to bitstream (based on zero crossings) if needed.
-int CmdLFSim(const char *Cmd)
-{
+int CmdLFSim(const char *Cmd) {
 #define FPGA_LF 1
 #define FPGA_HF 2
 
@@ -459,8 +443,7 @@ int CmdLFSim(const char *Cmd)
 
 // by marshmellow - sim fsk data given clock, fcHigh, fcLow, invert
 // - allow pull data from DemodBuffer
-int CmdLFfskSim(const char *Cmd)
-{
+int CmdLFfskSim(const char *Cmd) {
     //might be able to autodetect FCs and clock from Graphbuffer if using demod buffer
     // otherwise will need FChigh, FClow, Clock, and bitstream
     uint8_t fcHigh = 0, fcLow = 0, clk = 0;
@@ -553,8 +536,7 @@ int CmdLFfskSim(const char *Cmd)
 
 // by marshmellow - sim ask data given clock, invert, manchester or raw, separator
 // - allow pull data from DemodBuffer
-int CmdLFaskSim(const char *Cmd)
-{
+int CmdLFaskSim(const char *Cmd) {
     // autodetect clock from Graphbuffer if using demod buffer
     // needs clock, invert, manchester/raw as m or r, separator as s, and bitstream
     uint8_t encoding = 1, separator = 0, clk = 0, invert = 0;
@@ -647,8 +629,7 @@ int CmdLFaskSim(const char *Cmd)
 
 // by marshmellow - sim psk data given carrier, clock, invert
 // - allow pull data from DemodBuffer or parameters
-int CmdLFpskSim(const char *Cmd)
-{
+int CmdLFpskSim(const char *Cmd) {
     //might be able to autodetect FC and clock from Graphbuffer if using demod buffer
     //will need carrier, Clock, and bitstream
     uint8_t carrier = 0, clk = 0;
@@ -754,8 +735,7 @@ int CmdLFpskSim(const char *Cmd)
     return 0;
 }
 
-int CmdLFSimBidir(const char *Cmd)
-{
+int CmdLFSimBidir(const char *Cmd) {
     // Set ADC to twice the carrier for a slight supersampling
     // HACK: not implemented in ARMSRC.
     PrintAndLogEx(INFO, "Not implemented yet.");
@@ -765,8 +745,7 @@ int CmdLFSimBidir(const char *Cmd)
 }
 
 // ICEMAN,  todo,   swap from Graphbuffer.
-int CmdVchDemod(const char *Cmd)
-{
+int CmdVchDemod(const char *Cmd) {
     // Is this the entire sync pattern, or does this also include some
     // data bits that happen to be the same everywhere? That would be
     // lovely to know.
@@ -839,8 +818,7 @@ int CmdVchDemod(const char *Cmd)
 }
 
 //by marshmellow
-bool CheckChipType(bool getDeviceData)
-{
+bool CheckChipType(bool getDeviceData) {
 
     bool retval = false;
 
@@ -873,8 +851,7 @@ out:
 }
 
 //by marshmellow
-int CmdLFfind(const char *Cmd)
-{
+int CmdLFfind(const char *Cmd) {
     int ans = 0;
     size_t minLength = 2000;
     char cmdp = tolower(param_getchar(Cmd, 0));
@@ -1026,15 +1003,13 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLF(const char *Cmd)
-{
+int CmdLF(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c
index 26c65987a..72fc913da 100644
--- a/client/cmdlfawid.c
+++ b/client/cmdlfawid.c
@@ -14,8 +14,7 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_lf_awid_read(void)
-{
+int usage_lf_awid_read(void) {
     PrintAndLogEx(NORMAL, "Enables AWID compatible reader mode printing details of scanned AWID26 or AWID50 tags.");
     PrintAndLogEx(NORMAL, "By default, values are printed and logged until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "If the [1] option is provided, reader mode is exited after reading a single AWID card.");
@@ -31,8 +30,7 @@ int usage_lf_awid_read(void)
     return 0;
 }
 
-int usage_lf_awid_sim(void)
-{
+int usage_lf_awid_sim(void) {
     PrintAndLogEx(NORMAL, "Enables simulation of AWID card with specified facility-code and card number.");
     PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "");
@@ -49,8 +47,7 @@ int usage_lf_awid_sim(void)
     return 0;
 }
 
-int usage_lf_awid_clone(void)
-{
+int usage_lf_awid_clone(void) {
     PrintAndLogEx(NORMAL, "Enables cloning of AWID card with specified facility-code and card number onto T55x7.");
     PrintAndLogEx(NORMAL, "The T55x7 must be on the antenna when issuing this command.  T55x7 blocks are calculated and printed in the process.");
     PrintAndLogEx(NORMAL, "");
@@ -68,8 +65,7 @@ int usage_lf_awid_clone(void)
     return 0;
 }
 
-int usage_lf_awid_brute(void)
-{
+int usage_lf_awid_brute(void) {
     PrintAndLogEx(NORMAL, "Enables bruteforce of AWID reader with specified facility-code.");
     PrintAndLogEx(NORMAL, "This is a attack against reader. if cardnumber is given, it starts with it and goes up / down one step");
     PrintAndLogEx(NORMAL, "if cardnumber is not given, it starts with 1 and goes up to 65535");
@@ -90,8 +86,7 @@ int usage_lf_awid_brute(void)
     return 0;
 }
 
-static bool sendPing(void)
-{
+static bool sendPing(void) {
     UsbCommand ping = {CMD_PING, {1, 2, 3}};
     SendCommand(&ping);
     SendCommand(&ping);
@@ -103,8 +98,7 @@ static bool sendPing(void)
     return true;
 }
 
-static bool sendTry(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint32_t delay, uint8_t *bits, size_t bs_len, bool verbose)
-{
+static bool sendTry(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint32_t delay, uint8_t *bits, size_t bs_len, bool verbose) {
 
     if (verbose)
         PrintAndLogEx(INFO, "Trying FC: %u; CN: %u", fc, cn);
@@ -129,8 +123,7 @@ static bool sendTry(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint32_t delay, ui
 }
 
 //refactored by marshmellow
-int getAWIDBits(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint8_t *bits)
-{
+int getAWIDBits(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint8_t *bits) {
 
     // the return bits, preamble 0000 0001
     bits[7] = 1;
@@ -183,8 +176,7 @@ int getAWIDBits(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint8_t *bits)
     return 1;
 }
 
-static void verify_values(uint8_t *fmtlen, uint32_t *fc, uint32_t *cn)
-{
+static void verify_values(uint8_t *fmtlen, uint32_t *fc, uint32_t *cn) {
     switch (*fmtlen) {
         case 50:
             if ((*fc & 0xFFFF) != *fc) {
@@ -228,15 +220,13 @@ static void verify_values(uint8_t *fmtlen, uint32_t *fc, uint32_t *cn)
 }
 
 // this read is the "normal" read,  which download lf signal and tries to demod here.
-int CmdAWIDRead(const char *Cmd)
-{
+int CmdAWIDRead(const char *Cmd) {
     lf_read(true, 12000);
     return CmdAWIDDemod(Cmd);
 }
 // this read loops on device side.
 // uses the demod in lfops.c
-int CmdAWIDRead_device(const char *Cmd)
-{
+int CmdAWIDRead_device(const char *Cmd) {
 
     if (Cmd[0] == 'h' || Cmd[0] == 'H') return usage_lf_awid_read();
     uint8_t findone = (Cmd[0] == '1') ? 1 : 0;
@@ -249,8 +239,7 @@ int CmdAWIDRead_device(const char *Cmd)
 //by marshmellow
 //AWID Prox demod - FSK2a RF/50 with preamble of 00000001  (always a 96 bit data stream)
 //print full AWID Prox ID and some bit format details if found
-int CmdAWIDDemod(const char *Cmd)
-{
+int CmdAWIDDemod(const char *Cmd) {
     uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
     size_t size = getFromGraphBuf(bits);
     if (size == 0) {
@@ -380,8 +369,7 @@ int CmdAWIDDemod(const char *Cmd)
     return 1;
 }
 
-int CmdAWIDSim(const char *Cmd)
-{
+int CmdAWIDSim(const char *Cmd) {
     uint32_t fc = 0, cn = 0;
     uint8_t fmtlen = 0;
     uint8_t bits[96];
@@ -421,8 +409,7 @@ int CmdAWIDSim(const char *Cmd)
     return 0;
 }
 
-int CmdAWIDClone(const char *Cmd)
-{
+int CmdAWIDClone(const char *Cmd) {
     uint32_t blocks[4] = {T55x7_MODULATION_FSK2a | T55x7_BITRATE_RF_50 | 3 << T55x7_MAXBLOCK_SHIFT, 0, 0, 0};
     uint32_t fc = 0, cn = 0;
     uint8_t fmtlen = 0;
@@ -473,8 +460,7 @@ int CmdAWIDClone(const char *Cmd)
     return 0;
 }
 
-int CmdAWIDBrute(const char *Cmd)
-{
+int CmdAWIDBrute(const char *Cmd) {
 
     bool errors = false, verbose = false;
     uint32_t fc = 0, cn = 0, delay = 1000;
@@ -580,15 +566,13 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFAWID(const char *Cmd)
-{
+int CmdLFAWID(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfcotag.c b/client/cmdlfcotag.c
index 7894784af..ec26c89ff 100644
--- a/client/cmdlfcotag.c
+++ b/client/cmdlfcotag.c
@@ -11,8 +11,7 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_lf_cotag_read(void)
-{
+int usage_lf_cotag_read(void) {
     PrintAndLogEx(NORMAL, "Usage: lf COTAG read [h] <signaldata>");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "      h          : This help");
@@ -28,8 +27,7 @@ int usage_lf_cotag_read(void)
 
 // COTAG demod should be able to use GraphBuffer,
 // when data load samples
-int CmdCOTAGDemod(const char *Cmd)
-{
+int CmdCOTAGDemod(const char *Cmd) {
 
     uint8_t bits[COTAG_BITS] = {0};
     size_t bitlen = COTAG_BITS;
@@ -68,8 +66,7 @@ int CmdCOTAGDemod(const char *Cmd)
 // 0 = HIGH/LOW signal - maxlength bigbuff
 // 1 = translation for HI/LO into bytes with manchester 0,1 - length 300
 // 2 = raw signal -  maxlength bigbuff
-int CmdCOTAGRead(const char *Cmd)
-{
+int CmdCOTAGRead(const char *Cmd) {
 
     if (Cmd[0] == 'h' || Cmd[0] == 'H') return usage_lf_cotag_read();
 
@@ -112,15 +109,13 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFCOTAG(const char *Cmd)
-{
+int CmdLFCOTAG(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 343b669ec..915acfc1c 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -15,8 +15,7 @@ uint64_t g_em410xid = 0;
 static int CmdHelp(const char *Cmd);
 
 //////////////// 410x commands
-int usage_lf_em410x_demod(void)
-{
+int usage_lf_em410x_demod(void) {
     PrintAndLogEx(NORMAL, "Usage:  lf em 410x_demod [h] [clock] <0|1> [maxError]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "     h                   - this help");
@@ -32,8 +31,7 @@ int usage_lf_em410x_demod(void)
     PrintAndLogEx(NORMAL, "           lf em 410x_demod 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;
 }
-int usage_lf_em410x_write(void)
-{
+int usage_lf_em410x_write(void) {
     PrintAndLogEx(NORMAL, "Writes EM410x ID to a T55x7 / T5555 (Q5) tag");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  lf em 410x_write [h] <id> <card> [clock]");
@@ -46,8 +44,7 @@ int usage_lf_em410x_write(void)
     PrintAndLogEx(NORMAL, "      lf em 410x_write 0F0368568B 1       = write ID to t55x7 card");
     return 0;
 }
-int usage_lf_em410x_ws(void)
-{
+int usage_lf_em410x_ws(void) {
     PrintAndLogEx(NORMAL, "Watch 'nd Spoof, activates reader, waits until a EM410x tag gets presented then it starts simulating the found UID");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  lf em 410x_spoof [h]");
@@ -57,8 +54,7 @@ int usage_lf_em410x_ws(void)
     PrintAndLogEx(NORMAL, "      lf em 410x_spoof");
     return 0;
 }
-int usage_lf_em410x_clone(void)
-{
+int usage_lf_em410x_clone(void) {
     PrintAndLogEx(NORMAL, "Simulating EM410x tag");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  lf em 410x_clone [h] <uid> <clock>");
@@ -71,8 +67,7 @@ int usage_lf_em410x_clone(void)
     PrintAndLogEx(NORMAL, "      lf em 410x_clone 0F0368568B 32");
     return 0;
 }
-int usage_lf_em410x_sim(void)
-{
+int usage_lf_em410x_sim(void) {
     PrintAndLogEx(NORMAL, "Simulating EM410x tag");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  lf em 410x_sim [h] <uid> <clock>");
@@ -85,8 +80,7 @@ int usage_lf_em410x_sim(void)
     PrintAndLogEx(NORMAL, "      lf em 410x_sim 0F0368568B 32");
     return 0;
 }
-int usage_lf_em410x_brute(void)
-{
+int usage_lf_em410x_brute(void) {
     PrintAndLogEx(NORMAL, "Bruteforcing by emulating EM410x tag");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  lf em 410x_brute [h] ids.txt [d 2000] [c clock]");
@@ -104,8 +98,7 @@ int usage_lf_em410x_brute(void)
 }
 
 //////////////// 4050 / 4450 commands
-int usage_lf_em4x50_dump(void)
-{
+int usage_lf_em4x50_dump(void) {
     PrintAndLogEx(NORMAL, "Dump EM4x50/EM4x69.  Tag must be on antenna. ");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  lf em 4x50_dump [h] <pwd>");
@@ -117,8 +110,7 @@ int usage_lf_em4x50_dump(void)
     PrintAndLogEx(NORMAL, "      lf em 4x50_dump 11223344");
     return 0;
 }
-int usage_lf_em4x50_read(void)
-{
+int usage_lf_em4x50_read(void) {
     PrintAndLogEx(NORMAL, "Read EM 4x50/EM4x69.  Tag must be on antenna. ");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  lf em 4x50_read [h] <address> <pwd>");
@@ -131,8 +123,7 @@ int usage_lf_em4x50_read(void)
     PrintAndLogEx(NORMAL, "      lf em 4x50_read 1 11223344");
     return 0;
 }
-int usage_lf_em4x50_write(void)
-{
+int usage_lf_em4x50_write(void) {
     PrintAndLogEx(NORMAL, "Write EM 4x50/4x69.  Tag must be on antenna. ");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  lf em 4x50_write [h] <address> <data> <pwd>");
@@ -148,8 +139,7 @@ int usage_lf_em4x50_write(void)
 }
 
 //////////////// 4205 / 4305 commands
-int usage_lf_em4x05_dump(void)
-{
+int usage_lf_em4x05_dump(void) {
     PrintAndLogEx(NORMAL, "Dump EM4x05/EM4x69.  Tag must be on antenna. ");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  lf em 4x05_dump [h] <pwd>");
@@ -161,8 +151,7 @@ int usage_lf_em4x05_dump(void)
     PrintAndLogEx(NORMAL, "      lf em 4x05_dump 11223344");
     return 0;
 }
-int usage_lf_em4x05_read(void)
-{
+int usage_lf_em4x05_read(void) {
     PrintAndLogEx(NORMAL, "Read EM4x05/EM4x69.  Tag must be on antenna. ");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  lf em 4x05_read [h] <address> <pwd>");
@@ -175,8 +164,7 @@ int usage_lf_em4x05_read(void)
     PrintAndLogEx(NORMAL, "      lf em 4x05_read 1 11223344");
     return 0;
 }
-int usage_lf_em4x05_write(void)
-{
+int usage_lf_em4x05_write(void) {
     PrintAndLogEx(NORMAL, "Write EM4x05/4x69.  Tag must be on antenna. ");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  lf em 4x05_write [h] <address> <data> <pwd>");
@@ -190,8 +178,7 @@ int usage_lf_em4x05_write(void)
     PrintAndLogEx(NORMAL, "      lf em 4x05_write 1 deadc0de 11223344");
     return 0;
 }
-int usage_lf_em4x05_info(void)
-{
+int usage_lf_em4x05_info(void) {
     PrintAndLogEx(NORMAL, "Tag information EM4205/4305/4469//4569 tags.  Tag must be on antenna.");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  lf em 4x05_info [h] <pwd>");
@@ -214,8 +201,7 @@ int usage_lf_em4x05_info(void)
  */
 
 // Construct the graph for emulating an EM410X tag
-void ConstructEM410xEmulGraph(const char *uid, const  uint8_t clock)
-{
+void ConstructEM410xEmulGraph(const char *uid, const  uint8_t clock) {
 
     int i, j, binary[4], parity[4];
     uint32_t n;
@@ -262,8 +248,7 @@ void ConstructEM410xEmulGraph(const char *uid, const  uint8_t clock)
 
 //by marshmellow
 //print 64 bit EM410x ID in multiple formats
-void printEM410x(uint32_t hi, uint64_t id)
-{
+void printEM410x(uint32_t hi, uint64_t id) {
 
     if (!id && !hi) return;
 
@@ -367,8 +352,7 @@ void printEM410x(uint32_t hi, uint64_t id)
  *   CCCC                  <-- each bit here is parity for the 10 bits above in corresponding column
  *   0                     <-- stop bit, end of tag
  */
-int AskEm410xDecode(bool verbose, uint32_t *hi, uint64_t *lo)
-{
+int AskEm410xDecode(bool verbose, uint32_t *hi, uint64_t *lo) {
     size_t idx = 0;
     uint8_t bits[512] = {0};
     size_t size = sizeof(bits);
@@ -409,24 +393,21 @@ int AskEm410xDecode(bool verbose, uint32_t *hi, uint64_t *lo)
 
     return 1;
 }
-int AskEm410xDemod(const char *Cmd, uint32_t *hi, uint64_t *lo, bool verbose)
-{
+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);
 }
 
 // this read is the "normal" read,  which download lf signal and tries to demod here.
-int CmdEM410xRead(const char *Cmd)
-{
+int CmdEM410xRead(const char *Cmd) {
     lf_read(true, 8192);
     return CmdEM410xDemod(Cmd);
 }
 
 // this read loops on device side.
 // uses the demod in lfops.c
-int CmdEM410xRead_device(const char *Cmd)
-{
+int CmdEM410xRead_device(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     uint8_t findone = (cmdp == '1') ? 1 : 0;
     UsbCommand c = {CMD_EM410X_DEMOD, {findone, 0, 0}};
@@ -438,8 +419,7 @@ int CmdEM410xRead_device(const char *Cmd)
 //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 CmdEM410xDemod(const char *Cmd)
-{
+int CmdEM410xDemod(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) > 10 || cmdp == 'h') return usage_lf_em410x_demod();
 
@@ -453,8 +433,7 @@ int CmdEM410xDemod(const char *Cmd)
 }
 
 // emulate an EM410X tag
-int CmdEM410xSim(const char *Cmd)
-{
+int CmdEM410xSim(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_lf_em410x_sim();
 
@@ -479,8 +458,7 @@ int CmdEM410xSim(const char *Cmd)
     return 0;
 }
 
-int CmdEM410xBrute(const char *Cmd)
-{
+int CmdEM410xBrute(const char *Cmd) {
     char filename[FILE_PATH_SIZE] = {0};
     FILE *f = NULL;
     char buf[11];
@@ -602,8 +580,7 @@ int CmdEM410xBrute(const char *Cmd)
  *
  *  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)
-{
+int CmdEM410xWatch(const char *Cmd) {
     do {
         if (ukbhit()) {
             int gc = getchar();
@@ -618,8 +595,7 @@ int CmdEM410xWatch(const char *Cmd)
 }
 
 //currently only supports manchester modulations
-int CmdEM410xWatchnSpoof(const char *Cmd)
-{
+int CmdEM410xWatchnSpoof(const char *Cmd) {
 
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_lf_em410x_ws();
@@ -631,8 +607,7 @@ int CmdEM410xWatchnSpoof(const char *Cmd)
     return 0;
 }
 
-int CmdEM410xWrite(const char *Cmd)
-{
+int CmdEM410xWrite(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 0x00 || cmdp == 'h') return usage_lf_em410x_write();
 
@@ -693,8 +668,7 @@ int CmdEM410xWrite(const char *Cmd)
 }
 
 //**************** Start of EM4x50 Code ************************
-bool EM_EndParityTest(uint8_t *bs, size_t size, uint8_t rows, uint8_t cols, uint8_t pType)
-{
+bool EM_EndParityTest(uint8_t *bs, size_t size, uint8_t rows, uint8_t cols, uint8_t pType) {
     if (rows * cols > size) return false;
     uint8_t colP = 0;
     //assume last col is a parity and do not test
@@ -707,8 +681,7 @@ bool EM_EndParityTest(uint8_t *bs, size_t size, uint8_t rows, uint8_t cols, uint
     return true;
 }
 
-bool EM_ByteParityTest(uint8_t *bs, size_t size, uint8_t rows, uint8_t cols, uint8_t pType)
-{
+bool EM_ByteParityTest(uint8_t *bs, size_t size, uint8_t rows, uint8_t cols, uint8_t pType) {
     if (rows * cols > size) return false;
 
     uint8_t rowP = 0;
@@ -732,8 +705,7 @@ bool EM_ByteParityTest(uint8_t *bs, size_t size, uint8_t rows, uint8_t cols, uin
 //c012345678| 0
 //            |- must be zero
 
-bool EMwordparitytest(uint8_t *bits)
-{
+bool EMwordparitytest(uint8_t *bits) {
 
     // last row/col parity must be 0
     if (bits[44] != 0) return false;
@@ -762,8 +734,7 @@ bool EMwordparitytest(uint8_t *bits)
 
 //////////////// 4050 / 4450 commands
 
-uint32_t OutputEM4x50_Block(uint8_t *BitStream, size_t size, bool verbose, bool pTest)
-{
+uint32_t OutputEM4x50_Block(uint8_t *BitStream, size_t size, bool verbose, bool pTest) {
     if (size < 45) return 0;
 
     uint32_t code = bytebits_to_byte(BitStream, 8);
@@ -813,8 +784,7 @@ uint32_t OutputEM4x50_Block(uint8_t *BitStream, size_t size, bool verbose, bool
  * Word Read values. UID is stored in block 32.
  */
 //completed by Marshmellow
-int EM4x50Read(const char *Cmd, bool verbose)
-{
+int EM4x50Read(const char *Cmd, bool verbose) {
     uint8_t fndClk[] = {8, 16, 32, 40, 50, 64, 128};
     int clk = 0, invert = 0, tol = 0, phaseoff;
     int i = 0, j = 0, startblock, skip, block, start, end, low = 0, high = 0, minClk = 255;
@@ -1000,21 +970,18 @@ int EM4x50Read(const char *Cmd, bool verbose)
     return (int)AllPTest;
 }
 
-int CmdEM4x50Read(const char *Cmd)
-{
+int CmdEM4x50Read(const char *Cmd) {
     uint8_t ctmp = tolower(param_getchar(Cmd, 0));
     if (ctmp == 'h') return usage_lf_em4x50_read();
     return EM4x50Read(Cmd, true);
 }
-int CmdEM4x50Write(const char *Cmd)
-{
+int CmdEM4x50Write(const char *Cmd) {
     uint8_t ctmp = tolower(param_getchar(Cmd, 0));
     if (ctmp == 'h') return usage_lf_em4x50_write();
     PrintAndLogEx(NORMAL, "no implemented yet");
     return 0;
 }
-int CmdEM4x50Dump(const char *Cmd)
-{
+int CmdEM4x50Dump(const char *Cmd) {
     uint8_t ctmp = tolower(param_getchar(Cmd, 0));
     if (ctmp == 'h') return usage_lf_em4x50_dump();
     PrintAndLogEx(NORMAL, "no implemented yet");
@@ -1023,8 +990,7 @@ int CmdEM4x50Dump(const char *Cmd)
 
 #define EM_PREAMBLE_LEN 6
 // download samples from device and copy to Graphbuffer
-bool downloadSamplesEM()
-{
+bool downloadSamplesEM() {
 
     // 8 bit preamble + 32 bit word response (max clock (128) * 40bits = 5120 samples)
     uint8_t got[6000];
@@ -1045,8 +1011,7 @@ bool downloadSamplesEM()
 }
 
 // em_demod
-bool doPreambleSearch(size_t *startIdx)
-{
+bool doPreambleSearch(size_t *startIdx) {
 
     // sanity check
     if (DemodBufferLen < EM_PREAMBLE_LEN) {
@@ -1067,8 +1032,7 @@ bool doPreambleSearch(size_t *startIdx)
     return true;
 }
 
-bool detectFSK()
-{
+bool detectFSK() {
     // detect fsk clock
     if (!GetFskClock("", false)) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - EM: FSK clock failed");
@@ -1083,8 +1047,7 @@ bool detectFSK()
     return true;
 }
 // PSK clocks should be easy to detect ( but difficult to demod a non-repeating pattern... )
-bool detectPSK()
-{
+bool detectPSK() {
     int ans = GetPskClock("", false);
     if (ans <= 0) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - EM: PSK clock failed");
@@ -1108,8 +1071,7 @@ bool detectPSK()
     return true;
 }
 // try manchester - NOTE: ST only applies to T55x7 tags.
-bool detectASK_MAN()
-{
+bool detectASK_MAN() {
     bool stcheck = false;
     if (!ASKDemod_ext("0 0 0", false, false, 1, &stcheck)) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - EM: ASK/Manchester Demod failed");
@@ -1117,8 +1079,7 @@ bool detectASK_MAN()
     }
     return true;
 }
-bool detectASK_BI()
-{
+bool detectASK_BI() {
     int ans = ASKbiphaseDemod("0 0 1", false);
     if (!ans) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - EM: ASK/biphase normal demod failed");
@@ -1133,8 +1094,7 @@ bool detectASK_BI()
 }
 
 // param: idx - start index in demoded data.
-bool setDemodBufferEM(uint32_t *word, size_t idx)
-{
+bool setDemodBufferEM(uint32_t *word, size_t idx) {
 
     //test for even parity bits.
     uint8_t parity[45] = {0};
@@ -1157,8 +1117,7 @@ bool setDemodBufferEM(uint32_t *word, size_t idx)
 // 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...
-bool demodEM4x05resp(uint32_t *word)
-{
+bool demodEM4x05resp(uint32_t *word) {
     size_t idx = 0;
     *word = 0;
     if (detectASK_MAN() && doPreambleSearch(&idx))
@@ -1182,8 +1141,7 @@ bool demodEM4x05resp(uint32_t *word)
 }
 
 //////////////// 4205 / 4305 commands
-int EM4x05ReadWord_ext(uint8_t addr, uint32_t pwd, bool usePwd, uint32_t *word)
-{
+int EM4x05ReadWord_ext(uint8_t addr, uint32_t pwd, bool usePwd, uint32_t *word) {
     UsbCommand c = {CMD_EM4X_READ_WORD, {addr, pwd, usePwd}};
     clearCommandBuffer();
     SendCommand(&c);
@@ -1199,8 +1157,7 @@ int EM4x05ReadWord_ext(uint8_t addr, uint32_t pwd, bool usePwd, uint32_t *word)
     return demodEM4x05resp(word);
 }
 
-int CmdEM4x05Dump(const char *Cmd)
-{
+int CmdEM4x05Dump(const char *Cmd) {
     uint8_t addr = 0;
     uint32_t pwd = 0;
     bool usePwd = false;
@@ -1233,8 +1190,7 @@ int CmdEM4x05Dump(const char *Cmd)
     return success;
 }
 
-int CmdEM4x05Read(const char *Cmd)
-{
+int CmdEM4x05Read(const char *Cmd) {
     uint8_t addr;
     uint32_t pwd;
     bool usePwd = false;
@@ -1264,8 +1220,7 @@ int CmdEM4x05Read(const char *Cmd)
     return isOk;
 }
 
-int CmdEM4x05Write(const char *Cmd)
-{
+int CmdEM4x05Write(const char *Cmd) {
     uint8_t ctmp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) == 0 || ctmp == 'h') return usage_lf_em4x05_write();
 
@@ -1313,8 +1268,7 @@ int CmdEM4x05Write(const char *Cmd)
     return isOk;
 }
 
-void printEM4x05config(uint32_t wordData)
-{
+void printEM4x05config(uint32_t wordData) {
     uint16_t datarate = (((wordData & 0x3F) + 1) * 2);
     uint8_t encoder = ((wordData >> 6) & 0xF);
     char enc[14];
@@ -1418,8 +1372,7 @@ void printEM4x05config(uint32_t wordData)
     PrintAndLogEx(NORMAL, "    Pigeon:   %u | Pigeon Mode is %s\n", pigeon, pigeon ? "Enabled" : "Disabled");
 }
 
-void printEM4x05info(uint32_t block0, uint32_t serial)
-{
+void printEM4x05info(uint32_t block0, uint32_t serial) {
 
     uint8_t chipType = (block0 >> 1) & 0xF;
     uint8_t cap = (block0 >> 5) & 3;
@@ -1467,8 +1420,7 @@ void printEM4x05info(uint32_t block0, uint32_t serial)
         PrintAndLogEx(NORMAL, "\n  Serial #: %08X\n", serial);
 }
 
-void printEM4x05ProtectionBits(uint32_t word)
-{
+void printEM4x05ProtectionBits(uint32_t word) {
     for (uint8_t i = 0; i < 15; i++) {
         PrintAndLogEx(NORMAL, "      Word:  %02u | %s", i, (((1 << i) & word) || i < 2) ? "Is Write Locked" : "Is Not Write Locked");
         if (i == 14)
@@ -1477,14 +1429,12 @@ void printEM4x05ProtectionBits(uint32_t word)
 }
 
 //quick test for EM4x05/EM4x69 tag
-bool EM4x05IsBlock0(uint32_t *word)
-{
+bool EM4x05IsBlock0(uint32_t *word) {
     int res = EM4x05ReadWord_ext(0, 0, false, word);
     return (res > 0) ? true : false;
 }
 
-int CmdEM4x05Info(const char *Cmd)
-{
+int CmdEM4x05Info(const char *Cmd) {
 #define EM_SERIAL_BLOCK 1
 #define EM_CONFIG_BLOCK 4
 #define EM_PROT1_BLOCK 14
@@ -1553,15 +1503,13 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFEM4X(const char *Cmd)
-{
+int CmdLFEM4X(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlffdx.c b/client/cmdlffdx.c
index 83998bcc0..bc1f1e9dc 100644
--- a/client/cmdlffdx.c
+++ b/client/cmdlffdx.c
@@ -31,8 +31,7 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_lf_fdx_clone(void)
-{
+int usage_lf_fdx_clone(void) {
     PrintAndLogEx(NORMAL, "Clone a FDX-B animal tag to a T55x7 tag.");
     PrintAndLogEx(NORMAL, "Usage: lf fdx clone [h] <country id> <animal id> <Q5>");
     PrintAndLogEx(NORMAL, "Options:");
@@ -50,8 +49,7 @@ int usage_lf_fdx_clone(void)
     return 0;
 }
 
-int usage_lf_fdx_sim(void)
-{
+int usage_lf_fdx_sim(void) {
     PrintAndLogEx(NORMAL, "Enables simulation of FDX-B animal tag");
     PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "");
@@ -68,8 +66,7 @@ int usage_lf_fdx_sim(void)
 
 // Ask/Biphase Demod then try to locate an ISO 11784/85 ID
 // BitStream must contain previously askrawdemod and biphasedemoded data
-int detectFDXB(uint8_t *dest, size_t *size)
-{
+int detectFDXB(uint8_t *dest, size_t *size) {
     //make sure buffer has enough data
     if (*size < 128 * 2) return -1;
     size_t startIdx = 0;
@@ -82,8 +79,7 @@ int detectFDXB(uint8_t *dest, size_t *size)
 }
 
 // clearing the topbit needed for the preambl detection.
-static void verify_values(uint32_t countryid, uint64_t animalid)
-{
+static void verify_values(uint32_t countryid, uint64_t animalid) {
     if ((animalid & 0x3FFFFFFFFF) != animalid) {
         animalid &= 0x3FFFFFFFFF;
         PrintAndLogEx(INFO, "Animal ID Truncated to 38bits: %"PRIx64, animalid);
@@ -94,8 +90,7 @@ static void verify_values(uint32_t countryid, uint64_t animalid)
     }
 }
 
-int getFDXBits(uint64_t national_id, uint16_t country, uint8_t isanimal, uint8_t isextended, uint32_t extended, uint8_t *bits)
-{
+int getFDXBits(uint64_t national_id, uint16_t country, uint8_t isanimal, uint8_t isextended, uint32_t extended, uint8_t *bits) {
 
     // add preamble ten 0x00 and one 0x01
     memset(bits, 0x00, 10);
@@ -162,8 +157,7 @@ int getFDXBits(uint64_t national_id, uint16_t country, uint8_t isanimal, uint8_t
 
 -- sample: 985121004515220  [ 37FF65B88EF94 ]
 */
-int CmdFDXBdemodBI(const char *Cmd)
-{
+int CmdFDXBdemodBI(const char *Cmd) {
 
     int clk = 32;
     int invert = 1, errCnt = 0, offset = 0, maxErr = 0;
@@ -238,8 +232,7 @@ int CmdFDXBdemodBI(const char *Cmd)
 
 //see ASKDemod for what args are accepted
 //almost the same demod as cmddata.c/CmdFDXBdemodBI
-int CmdFdxDemod(const char *Cmd)
-{
+int CmdFdxDemod(const char *Cmd) {
 
     //Differential Biphase / di-phase (inverted biphase)
     //get binary from ask wave
@@ -308,14 +301,12 @@ int CmdFdxDemod(const char *Cmd)
     return 1;
 }
 
-int CmdFdxRead(const char *Cmd)
-{
+int CmdFdxRead(const char *Cmd) {
     lf_read(true, 10000);
     return CmdFdxDemod(Cmd);
 }
 
-int CmdFdxClone(const char *Cmd)
-{
+int CmdFdxClone(const char *Cmd) {
 
     uint32_t countryid = 0;
     uint64_t animalid = 0;
@@ -367,8 +358,7 @@ int CmdFdxClone(const char *Cmd)
     return 0;
 }
 
-int CmdFdxSim(const char *Cmd)
-{
+int CmdFdxSim(const char *Cmd) {
     uint32_t countryid = 0;
     uint64_t animalid = 0;
 
@@ -407,15 +397,13 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFFdx(const char *Cmd)
-{
+int CmdLFFdx(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfguard.c b/client/cmdlfguard.c
index aee413d42..a3f8bbec9 100644
--- a/client/cmdlfguard.c
+++ b/client/cmdlfguard.c
@@ -11,8 +11,7 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_lf_guard_clone(void)
-{
+int usage_lf_guard_clone(void) {
     PrintAndLogEx(NORMAL, "clone a Guardall tag to a T55x7 tag.");
     PrintAndLogEx(NORMAL, "The facility-code is 8-bit and the card number is 16-bit.  Larger values are truncated. ");
     PrintAndLogEx(NORMAL, "Currently work only on 26bit");
@@ -28,8 +27,7 @@ int usage_lf_guard_clone(void)
     return 0;
 }
 
-int usage_lf_guard_sim(void)
-{
+int usage_lf_guard_sim(void) {
     PrintAndLogEx(NORMAL, "Enables simulation of Guardall card with specified card number.");
     PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "The facility-code is 8-bit and the card number is 16-bit.  Larger values are truncated.");
@@ -47,8 +45,7 @@ int usage_lf_guard_sim(void)
 }
 
 // Works for 26bits.
-int GetGuardBits(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint8_t *guardBits)
-{
+int GetGuardBits(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint8_t *guardBits) {
 
     uint8_t xorKey = 0x66;
     uint8_t i;
@@ -147,8 +144,7 @@ int GetGuardBits(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint8_t *guardBits)
 // error returns as -x
 // success returns start position in bitstream
 // Bitstream must contain previously askrawdemod and biphasedemoded data
-int detectGProxII(uint8_t *bits, size_t *size)
-{
+int detectGProxII(uint8_t *bits, size_t *size) {
 
     size_t startIdx = 0;
     uint8_t preamble[] = {1, 1, 1, 1, 1, 0};
@@ -176,8 +172,7 @@ int detectGProxII(uint8_t *bits, size_t *size)
 //WARNING: if it fails during some points it will destroy the DemodBuffer data
 // but will leave the GraphBuffer intact.
 //if successful it will push askraw data back to demod buffer ready for emulation
-int CmdGuardDemod(const char *Cmd)
-{
+int CmdGuardDemod(const char *Cmd) {
 
     //Differential Biphase
     //get binary from ask wave
@@ -258,14 +253,12 @@ int CmdGuardDemod(const char *Cmd)
     return 1;
 }
 
-int CmdGuardRead(const char *Cmd)
-{
+int CmdGuardRead(const char *Cmd) {
     lf_read(true, 10000);
     return CmdGuardDemod(Cmd);
 }
 
-int CmdGuardClone(const char *Cmd)
-{
+int CmdGuardClone(const char *Cmd) {
 
     char cmdp = param_getchar(Cmd, 0);
     if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_guard_clone();
@@ -316,8 +309,7 @@ int CmdGuardClone(const char *Cmd)
     return 0;
 }
 
-int CmdGuardSim(const char *Cmd)
-{
+int CmdGuardSim(const char *Cmd) {
 
     // Guard uses:  clk: 64, invert: 0, encoding: 2 (ASK Biphase)
     uint8_t clock = 64, encoding = 2, separator = 0, invert = 0;
@@ -363,15 +355,13 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFGuard(const char *Cmd)
-{
+int CmdLFGuard(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c
index e8eb9eb30..7e9448f67 100644
--- a/client/cmdlfhid.c
+++ b/client/cmdlfhid.c
@@ -16,8 +16,7 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_lf_hid_read(void)
-{
+int usage_lf_hid_read(void) {
     PrintAndLogEx(NORMAL, "Enables HID compatible reader mode printing details.");
     PrintAndLogEx(NORMAL, "By default, values are printed and logged until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "If the [1] option is provided, reader mode is exited after reading a single HID card.");
@@ -32,8 +31,7 @@ int usage_lf_hid_read(void)
     PrintAndLogEx(NORMAL, "       lf hid read 1");
     return 0;
 }
-int usage_lf_hid_wiegand(void)
-{
+int usage_lf_hid_wiegand(void) {
     PrintAndLogEx(NORMAL, "This command converts facility code/card number to Wiegand code");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage: lf hid wiegand [h] [OEM] [FC] [CN]");
@@ -46,8 +44,7 @@ int usage_lf_hid_wiegand(void)
     PrintAndLogEx(NORMAL, "      lf hid wiegand 0 101 2001");
     return 0;
 }
-int usage_lf_hid_sim(void)
-{
+int usage_lf_hid_sim(void) {
     PrintAndLogEx(NORMAL, "Enables simulation of HID card with card number.");
     PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "");
@@ -59,8 +56,7 @@ int usage_lf_hid_sim(void)
     PrintAndLogEx(NORMAL, "      lf hid sim 2006ec0c86");
     return 0;
 }
-int usage_lf_hid_clone(void)
-{
+int usage_lf_hid_clone(void) {
     PrintAndLogEx(NORMAL, "Clone HID to T55x7.  Tag must be on antenna. ");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  lf hid clone [h] [ID] <L>");
@@ -73,8 +69,7 @@ int usage_lf_hid_clone(void)
     PrintAndLogEx(NORMAL, "      lf hid clone 2006ec0c86 L");
     return 0;
 }
-int usage_lf_hid_brute(void)
-{
+int usage_lf_hid_brute(void) {
     PrintAndLogEx(NORMAL, "Enables bruteforce of HID readers with specified facility code.");
     PrintAndLogEx(NORMAL, "This is a attack against reader. if cardnumber is given, it starts with it and goes up / down one step");
     PrintAndLogEx(NORMAL, "if cardnumber is not given, it starts with 1 and goes up to 65535");
@@ -96,8 +91,7 @@ int usage_lf_hid_brute(void)
 }
 
 // sending three times.  Didn't seem to break the previous sim?
-static bool sendPing(void)
-{
+static bool sendPing(void) {
     UsbCommand ping = {CMD_PING, {1, 2, 3}};
     SendCommand(&ping);
     SendCommand(&ping);
@@ -108,8 +102,7 @@ static bool sendPing(void)
         return false;
     return true;
 }
-static bool sendTry(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint32_t delay, uint8_t *bits, bool verbose)
-{
+static bool sendTry(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint32_t delay, uint8_t *bits, bool verbose) {
 
     // this should be optional.
     if (verbose)
@@ -131,8 +124,7 @@ static bool sendTry(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint32_t delay, ui
 //by marshmellow (based on existing demod + holiman's refactor)
 //HID Prox demod - FSK RF/50 with preamble of 00011101 (then manchester encoded)
 //print full HID Prox ID and some bit format details if found
-int CmdHIDDemod(const char *Cmd)
-{
+int CmdHIDDemod(const char *Cmd) {
     //raw fsk demod no manchester decoding no start bit finding just get binary from wave
     uint32_t hi2 = 0, hi = 0, lo = 0;
 
@@ -230,16 +222,14 @@ int CmdHIDDemod(const char *Cmd)
 }
 
 // this read is the "normal" read,  which download lf signal and tries to demod here.
-int CmdHIDRead(const char *Cmd)
-{
+int CmdHIDRead(const char *Cmd) {
     lf_read(true, 12000);
     return CmdHIDDemod(Cmd);
 }
 
 // this read loops on device side.
 // uses the demod in lfops.c
-int CmdHIDRead_device(const char *Cmd)
-{
+int CmdHIDRead_device(const char *Cmd) {
 
     if (Cmd[0] == 'h' || Cmd[0] == 'H') return usage_lf_hid_read();
     uint8_t findone = (Cmd[0] == '1') ? 1 : 0;
@@ -249,8 +239,7 @@ int CmdHIDRead_device(const char *Cmd)
     return 0;
 }
 
-int CmdHIDSim(const char *Cmd)
-{
+int CmdHIDSim(const char *Cmd) {
     uint32_t hi = 0, lo = 0;
     uint32_t n = 0, i = 0;
 
@@ -271,8 +260,7 @@ int CmdHIDSim(const char *Cmd)
     return 0;
 }
 
-int CmdHIDClone(const char *Cmd)
-{
+int CmdHIDClone(const char *Cmd) {
 
     uint32_t hi2 = 0, hi = 0, lo = 0;
     uint32_t n = 0, i = 0;
@@ -319,8 +307,7 @@ typedef struct {
     size_t   Wiegand_n;
 } wiegand_t;
 
-static void addHIDMarker(uint8_t fmtlen, uint8_t *out)
-{
+static void addHIDMarker(uint8_t fmtlen, uint8_t *out) {
     // temp array
     uint8_t arr[BITS];
     memset(arr, 0, BITS);
@@ -389,8 +376,7 @@ static void addHIDMarker(uint8_t fmtlen, uint8_t *out)
 // }
 
 //static void calc26(uint16_t fc, uint32_t cardno,  uint8_t *out){
-static void calc26(uint16_t fc, uint32_t cardno, uint8_t *out)
-{
+static void calc26(uint16_t fc, uint32_t cardno, uint8_t *out) {
     uint8_t wiegand[24];
     num_to_bytebits(fc, 8, wiegand);
     num_to_bytebits(cardno, 16, wiegand + 8);
@@ -398,8 +384,7 @@ static void calc26(uint16_t fc, uint32_t cardno, uint8_t *out)
 }
 // static void calc33(uint16_t fc, uint32_t cardno,  uint8_t *out){
 // }
-static void calc34(uint16_t fc, uint32_t cardno, uint8_t *out)
-{
+static void calc34(uint16_t fc, uint32_t cardno, uint8_t *out) {
     uint8_t wiegand[32];
     num_to_bytebits(fc, 16, wiegand);
     num_to_bytebits(cardno, 16, wiegand + 16);
@@ -409,8 +394,7 @@ static void calc34(uint16_t fc, uint32_t cardno, uint8_t *out)
 // *lo = ((cardno & 0xFFFFF) << 1) | fc << 21;
 // *hi = (1 << 5) | ((fc >> 11) & 1);
 // }
-static void calc37S(uint16_t fc, uint32_t cardno, uint8_t *out)
-{
+static void calc37S(uint16_t fc, uint32_t cardno, uint8_t *out) {
     // FC 2 - 17   - 16 bit
     // cardno 18 - 36  - 19 bit
     // Even P1   1 - 19
@@ -420,8 +404,7 @@ static void calc37S(uint16_t fc, uint32_t cardno, uint8_t *out)
     num_to_bytebits(cardno, 19, wiegand + 16);
     wiegand_add_parity(out,  wiegand, sizeof(wiegand));
 }
-static void calc37H(uint64_t cardno, uint8_t *out)
-{
+static void calc37H(uint64_t cardno, uint8_t *out) {
     // SC NONE
     // cardno 1-35 34 bits
     // Even Parity  0th bit  1-18
@@ -439,8 +422,7 @@ static void calc37H(uint64_t cardno, uint8_t *out)
 // *hi = (cardno >> 31);
 // }
 
-void calcWiegand(uint8_t fmtlen, uint16_t fc, uint64_t cardno, uint8_t *bits)
-{
+void calcWiegand(uint8_t fmtlen, uint16_t fc, uint64_t cardno, uint8_t *bits) {
     uint32_t cn32 = (cardno & 0xFFFFFFFF);
     switch (fmtlen) {
         case 26:
@@ -465,8 +447,7 @@ void calcWiegand(uint8_t fmtlen, uint16_t fc, uint64_t cardno, uint8_t *bits)
     }
 }
 
-int CmdHIDWiegand(const char *Cmd)
-{
+int CmdHIDWiegand(const char *Cmd) {
     uint32_t oem = 0, fc = 0;
     uint64_t cardnum = 0;
     uint64_t blocks = 0, wiegand = 0;
@@ -511,8 +492,7 @@ int CmdHIDWiegand(const char *Cmd)
     return 0;
 }
 
-int CmdHIDBrute(const char *Cmd)
-{
+int CmdHIDBrute(const char *Cmd) {
 
     bool errors = false, verbose = false;
     uint32_t fc = 0, cn = 0, delay = 1000;
@@ -612,15 +592,13 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFHID(const char *Cmd)
-{
+int CmdLFHID(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index f844c4f95..f03182f34 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -25,13 +25,11 @@
 
 static int CmdHelp(const char *Cmd);
 
-size_t nbytes(size_t nbits)
-{
+size_t nbytes(size_t nbits) {
     return (nbits / 8) + ((nbits % 8) > 0);
 }
 
-int CmdLFHitagList(const char *Cmd)
-{
+int CmdLFHitagList(const char *Cmd) {
     uint8_t *got = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
     if (!got) {
         PrintAndLogEx(WARNING, "Cannot allocate memory for trace");
@@ -158,16 +156,14 @@ int CmdLFHitagList(const char *Cmd)
     return 0;
 }
 
-int CmdLFHitagSnoop(const char *Cmd)
-{
+int CmdLFHitagSnoop(const char *Cmd) {
     UsbCommand c = {CMD_SNOOP_HITAG};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
 }
 
-int CmdLFHitagSim(const char *Cmd)
-{
+int CmdLFHitagSim(const char *Cmd) {
 
     UsbCommand c = {CMD_SIMULATE_HITAG};
     char filename[FILE_PATH_SIZE] = { 0x00 };
@@ -203,8 +199,7 @@ int CmdLFHitagSim(const char *Cmd)
     return 0;
 }
 
-int CmdLFHitagReader(const char *Cmd)
-{
+int CmdLFHitagReader(const char *Cmd) {
 
     UsbCommand c = {CMD_READER_HITAG, {0, 0, 0} }; //, {param_get32ex(Cmd,0,0,10),param_get32ex(Cmd,1,0,16),param_get32ex(Cmd,2,0,16),param_get32ex(Cmd,3,0,16)}};
     hitag_data *htd = (hitag_data *)c.d.asBytes;
@@ -299,8 +294,7 @@ int CmdLFHitagReader(const char *Cmd)
     return 0;
 }
 
-int CmdLFHitagSimS(const char *Cmd)
-{
+int CmdLFHitagSimS(const char *Cmd) {
     UsbCommand c = { CMD_SIMULATE_HITAG_S };
     char filename[FILE_PATH_SIZE] = { 0x00 };
     FILE *f;
@@ -335,8 +329,7 @@ int CmdLFHitagSimS(const char *Cmd)
     return 0;
 }
 
-int CmdLFHitagCheckChallenges(const char *Cmd)
-{
+int CmdLFHitagCheckChallenges(const char *Cmd) {
     UsbCommand c = { CMD_TEST_HITAGS_TRACES };
     char filename[FILE_PATH_SIZE] = { 0x00 };
     FILE *f;
@@ -371,8 +364,7 @@ int CmdLFHitagCheckChallenges(const char *Cmd)
     return 0;
 }
 
-int CmdLFHitagWP(const char *Cmd)
-{
+int CmdLFHitagWP(const char *Cmd) {
     UsbCommand c = { CMD_WR_HITAG_S };
     hitag_data *htd = (hitag_data *)c.d.asBytes;
     hitag_function htf = param_get32ex(Cmd, 0, 0, 10);
@@ -429,15 +421,13 @@ static command_t CommandTable[] = {
     { NULL, NULL, 0, NULL }
 };
 
-int CmdLFHitag(const char *Cmd)
-{
+int CmdLFHitag(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfindala.c b/client/cmdlfindala.c
index ff98938e3..7dc2e8ecf 100644
--- a/client/cmdlfindala.c
+++ b/client/cmdlfindala.c
@@ -12,8 +12,7 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_lf_indala_demod(void)
-{
+int usage_lf_indala_demod(void) {
     PrintAndLogEx(NORMAL, "Enables Indala compatible reader mode printing details of scanned tags.");
     PrintAndLogEx(NORMAL, "By default, values are printed and logged until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "");
@@ -26,8 +25,7 @@ int usage_lf_indala_demod(void)
     return 0;
 }
 
-int usage_lf_indala_sim(void)
-{
+int usage_lf_indala_sim(void) {
     PrintAndLogEx(NORMAL, "Enables simulation of Indala card with specified uid.");
     PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "");
@@ -41,8 +39,7 @@ int usage_lf_indala_sim(void)
     return 0;
 }
 
-int usage_lf_indala_clone(void)
-{
+int usage_lf_indala_clone(void) {
     PrintAndLogEx(NORMAL, "Enables cloning of Indala card with specified uid onto T55x7.");
     PrintAndLogEx(NORMAL, "The T55x7 must be on the antenna when issuing this command.  T55x7 blocks are calculated and printed in the process.");
     PrintAndLogEx(NORMAL, "");
@@ -59,8 +56,7 @@ int usage_lf_indala_clone(void)
 
 // redesigned by marshmellow adjusted from existing decode functions
 // indala id decoding
-int indala64decode(uint8_t *dest, size_t *size, uint8_t *invert)
-{
+int indala64decode(uint8_t *dest, size_t *size, uint8_t *invert) {
     //standard 64 bit indala formats including 26 bit 40134 format
     uint8_t   preamble64[] = {1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1};
     uint8_t preamble64_i[] = {0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0};
@@ -82,8 +78,7 @@ int indala64decode(uint8_t *dest, size_t *size, uint8_t *invert)
     return (int) idx;
 }
 
-int indala224decode(uint8_t *dest, size_t *size, uint8_t *invert)
-{
+int indala224decode(uint8_t *dest, size_t *size, uint8_t *invert) {
     //large 224 bit indala formats (different preamble too...)
     uint8_t   preamble224[] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1};
     uint8_t preamble224_i[] = {0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0};
@@ -111,8 +106,7 @@ int indala224decode(uint8_t *dest, size_t *size, uint8_t *invert)
 }
 
 // this read is the "normal" read,  which download lf signal and tries to demod here.
-int CmdIndalaRead(const char *Cmd)
-{
+int CmdIndalaRead(const char *Cmd) {
     lf_read(true, 30000);
     return CmdIndalaDemod(Cmd);
 }
@@ -120,8 +114,7 @@ int CmdIndalaRead(const char *Cmd)
 // Indala 26 bit decode
 // by marshmellow
 // optional arguments - same as PSKDemod (clock & invert & maxerr)
-int CmdIndalaDemod(const char *Cmd)
-{
+int CmdIndalaDemod(const char *Cmd) {
     int ans;
     if (strlen(Cmd) > 0)
         ans = PSKDemod(Cmd, 0);
@@ -185,8 +178,7 @@ int CmdIndalaDemod(const char *Cmd)
 // returns false positives more often - but runs against more sets of samples
 // poor psk signal can be difficult to demod this approach might succeed when the other fails
 // but the other appears to currently be more accurate than this approach most of the time.
-int CmdIndalaDemodAlt(const char *Cmd)
-{
+int CmdIndalaDemodAlt(const char *Cmd) {
     // Usage: recover 64bit UID by default, specify "224" as arg to recover a 224bit UID
     int state = -1;
     int count = 0;
@@ -382,8 +374,7 @@ int CmdIndalaDemodAlt(const char *Cmd)
     return 1;
 }
 
-int CmdIndalaSim(const char *Cmd)
-{
+int CmdIndalaSim(const char *Cmd) {
 
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_indala_sim();
@@ -428,8 +419,7 @@ int CmdIndalaSim(const char *Cmd)
 }
 
 // iceman - needs refactoring
-int CmdIndalaClone(const char *Cmd)
-{
+int CmdIndalaClone(const char *Cmd) {
     UsbCommand c = {0};
     uint32_t uid1, uid2, uid3, uid4, uid5, uid6, uid7;
     uid1 =  uid2 = uid3 = uid4 = uid5 = uid6 = uid7 = 0;
@@ -482,15 +472,13 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFINDALA(const char *Cmd)
-{
+int CmdLFINDALA(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfio.c b/client/cmdlfio.c
index 5890cb912..d367515ee 100644
--- a/client/cmdlfio.c
+++ b/client/cmdlfio.c
@@ -12,8 +12,7 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_lf_io_read(void)
-{
+int usage_lf_io_read(void) {
     PrintAndLogEx(NORMAL, "Enables IOProx compatible reader mode printing details of scanned tags.");
     PrintAndLogEx(NORMAL, "By default, values are printed and logged until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "If the [1] option is provided, reader mode is exited after reading a single card.");
@@ -29,8 +28,7 @@ int usage_lf_io_read(void)
     return 0;
 }
 
-int usage_lf_io_sim(void)
-{
+int usage_lf_io_sim(void) {
     PrintAndLogEx(NORMAL, "Enables simulation of IOProx card with specified facility-code and card number.");
     PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "");
@@ -46,8 +44,7 @@ int usage_lf_io_sim(void)
     return 0;
 }
 
-int usage_lf_io_clone(void)
-{
+int usage_lf_io_clone(void) {
     PrintAndLogEx(NORMAL, "Enables cloning of IOProx card with specified facility-code and card number onto T55x7.");
     PrintAndLogEx(NORMAL, "The T55x7 must be on the antenna when issuing this command.  T55x7 blocks are calculated and printed in the process.");
     PrintAndLogEx(NORMAL, "");
@@ -65,15 +62,13 @@ int usage_lf_io_clone(void)
 }
 
 // this read is the "normal" read,  which download lf signal and tries to demod here.
-int CmdIOProxRead(const char *Cmd)
-{
+int CmdIOProxRead(const char *Cmd) {
     lf_read(true, 12000);
     return CmdIOProxDemod(Cmd);
 }
 // this read loops on device side.
 // uses the demod in lfops.c
-int CmdIOProxRead_device(const char *Cmd)
-{
+int CmdIOProxRead_device(const char *Cmd) {
     if (Cmd[0] == 'h' || Cmd[0] == 'H') return usage_lf_io_read();
     int findone = (Cmd[0] == '1') ? 1 : 0;
     UsbCommand c = {CMD_IO_DEMOD_FSK, {findone, 0, 0}};
@@ -85,8 +80,7 @@ int CmdIOProxRead_device(const char *Cmd)
 //by marshmellow
 //IO-Prox demod - FSK RF/64 with preamble of 000000001
 //print ioprox ID and some format details
-int CmdIOProxDemod(const char *Cmd)
-{
+int CmdIOProxDemod(const char *Cmd) {
     int retval = 0;
     int idx = 0;
     uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
@@ -189,8 +183,7 @@ int CmdIOProxDemod(const char *Cmd)
 //-----------------------------------------------------------------------------
 //00000000 0 11110000 1 facility 1 version* 1 code*one 1 code*two 1 ???????? 11
 //XSF(version)facility:codeone+codetwo (raw)
-int getIOProxBits(uint8_t version, uint8_t fc, uint16_t cn, uint8_t *bits)
-{
+int getIOProxBits(uint8_t version, uint8_t fc, uint16_t cn, uint8_t *bits) {
 #define SEPARATOR 1
     uint8_t pos = 0;
     // the return bits, preamble 0000 0000 0
@@ -250,8 +243,7 @@ int getIOProxBits(uint8_t version, uint8_t fc, uint16_t cn, uint8_t *bits)
     return 1;
 }
 
-int CmdIOProxSim(const char *Cmd)
-{
+int CmdIOProxSim(const char *Cmd) {
     uint16_t cn = 0;
     uint8_t version = 0, fc = 0;
     uint8_t bits[64];
@@ -296,8 +288,7 @@ int CmdIOProxSim(const char *Cmd)
     return 0;
 }
 
-int CmdIOProxClone(const char *Cmd)
-{
+int CmdIOProxClone(const char *Cmd) {
 
     uint32_t blocks[3] = {T55x7_MODULATION_FSK2a | T55x7_BITRATE_RF_64 | 2 << T55x7_MAXBLOCK_SHIFT, 0, 0};
     uint16_t cn = 0;
@@ -349,15 +340,13 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFIO(const char *Cmd)
-{
+int CmdLFIO(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfjablotron.c b/client/cmdlfjablotron.c
index 16fd3db9b..e445b20b6 100644
--- a/client/cmdlfjablotron.c
+++ b/client/cmdlfjablotron.c
@@ -12,8 +12,7 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_lf_jablotron_clone(void)
-{
+int usage_lf_jablotron_clone(void) {
     PrintAndLogEx(NORMAL, "clone a Jablotron tag to a T55x7 tag.");
     PrintAndLogEx(NORMAL, "Usage: lf jablotron clone [h] <card ID> <Q5>");
     PrintAndLogEx(NORMAL, "Options:");
@@ -26,8 +25,7 @@ int usage_lf_jablotron_clone(void)
     return 0;
 }
 
-int usage_lf_jablotron_sim(void)
-{
+int usage_lf_jablotron_sim(void) {
     PrintAndLogEx(NORMAL, "Enables simulation of jablotron card with specified card number.");
     PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "");
@@ -41,8 +39,7 @@ int usage_lf_jablotron_sim(void)
     return 0;
 }
 
-static uint8_t jablontron_chksum(uint8_t *bits)
-{
+static uint8_t jablontron_chksum(uint8_t *bits) {
     uint8_t chksum = 0;
     for (int i = 16; i < 56; i += 8) {
         chksum += bytebits_to_byte(bits + i, 8);
@@ -51,8 +48,7 @@ static uint8_t jablontron_chksum(uint8_t *bits)
     return chksum;
 }
 
-int getJablotronBits(uint64_t fullcode, uint8_t *bits)
-{
+int getJablotronBits(uint64_t fullcode, uint8_t *bits) {
     //preamp
     num_to_bytebits(0xFFFF, 16, bits);
 
@@ -69,8 +65,7 @@ int getJablotronBits(uint64_t fullcode, uint8_t *bits)
 // Note: this is not a demod, this is only a detection
 // the parameter *bits needs to be demoded before call
 // 0xFFFF preamble, 64bits
-int detectJablotron(uint8_t *bits, size_t *size)
-{
+int detectJablotron(uint8_t *bits, size_t *size) {
     if (*size < 64 * 2) return -1; //make sure buffer has enough data
     size_t startIdx = 0;
     uint8_t preamble[] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0};
@@ -84,8 +79,7 @@ int detectJablotron(uint8_t *bits, size_t *size)
     return (int)startIdx;
 }
 
-static uint64_t getJablontronCardId(uint64_t rawcode)
-{
+static uint64_t getJablontronCardId(uint64_t rawcode) {
     uint64_t id = 0;
     uint8_t bytes[] = {0, 0, 0, 0, 0};
     num_to_bytes(rawcode, 5, bytes);
@@ -97,8 +91,7 @@ static uint64_t getJablontronCardId(uint64_t rawcode)
 }
 
 //see ASKDemod for what args are accepted
-int CmdJablotronDemod(const char *Cmd)
-{
+int CmdJablotronDemod(const char *Cmd) {
 
     //Differential Biphase / di-phase (inverted biphase)
     //get binary from ask wave
@@ -152,14 +145,12 @@ int CmdJablotronDemod(const char *Cmd)
     return 1;
 }
 
-int CmdJablotronRead(const char *Cmd)
-{
+int CmdJablotronRead(const char *Cmd) {
     lf_read(true, 10000);
     return CmdJablotronDemod(Cmd);
 }
 
-int CmdJablotronClone(const char *Cmd)
-{
+int CmdJablotronClone(const char *Cmd) {
 
     uint64_t fullcode = 0;
     uint32_t blocks[3] = {T55x7_MODULATION_DIPHASE | T55x7_BITRATE_RF_64 | 2 << T55x7_MAXBLOCK_SHIFT, 0, 0};
@@ -209,8 +200,7 @@ int CmdJablotronClone(const char *Cmd)
     return 0;
 }
 
-int CmdJablotronSim(const char *Cmd)
-{
+int CmdJablotronSim(const char *Cmd) {
     uint64_t fullcode = 0;
 
     char cmdp = tolower(param_getchar(Cmd, 0));
@@ -248,15 +238,13 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFJablotron(const char *Cmd)
-{
+int CmdLFJablotron(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfkeri.c b/client/cmdlfkeri.c
index bce98b5cc..3228e31f4 100644
--- a/client/cmdlfkeri.c
+++ b/client/cmdlfkeri.c
@@ -11,8 +11,7 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_lf_keri_clone(void)
-{
+int usage_lf_keri_clone(void) {
     PrintAndLogEx(NORMAL, "clone a KERI tag to a T55x7 tag.");
     PrintAndLogEx(NORMAL, "Usage: lf keri clone [h] <id> <Q5>");
     PrintAndLogEx(NORMAL, "Options:");
@@ -25,8 +24,7 @@ int usage_lf_keri_clone(void)
     return 0;
 }
 
-int usage_lf_keri_sim(void)
-{
+int usage_lf_keri_sim(void) {
     PrintAndLogEx(NORMAL, "Enables simulation of KERI card with specified card number.");
     PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "");
@@ -41,8 +39,7 @@ int usage_lf_keri_sim(void)
 }
 
 // find KERI preamble in already demoded data
-int detectKeri(uint8_t *dest, size_t *size, bool *invert)
-{
+int detectKeri(uint8_t *dest, size_t *size, bool *invert) {
 
     uint8_t preamble[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1};
     uint8_t preamble_i[] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0};
@@ -66,8 +63,7 @@ int detectKeri(uint8_t *dest, size_t *size, bool *invert)
     return (int)startIdx;
 }
 
-int CmdKeriDemod(const char *Cmd)
-{
+int CmdKeriDemod(const char *Cmd) {
 
     if (!PSKDemod("", false)) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - KERI: PSK1 Demod failed");
@@ -126,14 +122,12 @@ int CmdKeriDemod(const char *Cmd)
     return 1;
 }
 
-int CmdKeriRead(const char *Cmd)
-{
+int CmdKeriRead(const char *Cmd) {
     lf_read(true, 10000);
     return CmdKeriDemod(Cmd);
 }
 
-int CmdKeriClone(const char *Cmd)
-{
+int CmdKeriClone(const char *Cmd) {
 
     uint32_t internalid = 0;
     uint32_t blocks[3] = {
@@ -196,8 +190,7 @@ int CmdKeriClone(const char *Cmd)
     return 0;
 }
 
-int CmdKeriSim(const char *Cmd)
-{
+int CmdKeriSim(const char *Cmd) {
 
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_keri_sim();
@@ -239,15 +232,13 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFKeri(const char *Cmd)
-{
+int CmdLFKeri(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfnedap.c b/client/cmdlfnedap.c
index fdff78424..320f07d6a 100644
--- a/client/cmdlfnedap.c
+++ b/client/cmdlfnedap.c
@@ -10,8 +10,7 @@
 #include "cmdlfnedap.h"
 static int CmdHelp(const char *Cmd);
 
-int usage_lf_nedap_clone(void)
-{
+int usage_lf_nedap_clone(void) {
     PrintAndLogEx(NORMAL, "clone a NEDAP tag to a T55x7 tag.");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage: lf nedap clone [h] <Card-Number>");
@@ -25,8 +24,7 @@ int usage_lf_nedap_clone(void)
     return 0;
 }
 
-int usage_lf_nedap_sim(void)
-{
+int usage_lf_nedap_sim(void) {
     PrintAndLogEx(NORMAL, "Enables simulation of NEDAP card with specified card number.");
     PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "");
@@ -41,8 +39,7 @@ int usage_lf_nedap_sim(void)
 }
 
 // find nedap preamble in already demoded data
-int detectNedap(uint8_t *dest, size_t *size)
-{
+int detectNedap(uint8_t *dest, size_t *size) {
     //make sure buffer has data
     if (*size < 128) return -3;
 
@@ -54,8 +51,7 @@ int detectNedap(uint8_t *dest, size_t *size)
     return (int) startIdx;
 }
 
-int GetNedapBits(uint32_t cn, uint8_t *nedapBits)
-{
+int GetNedapBits(uint32_t cn, uint8_t *nedapBits) {
 
     uint8_t pre[128];
     memset(pre, 0x00, sizeof(pre));
@@ -116,8 +112,7 @@ int GetNedapBits(uint32_t cn, uint8_t *nedapBits)
 //NEDAP demod - ASK/Biphase (or Diphase),  RF/64 with preamble of 1111111110  (always a 128 bit data stream)
 //print NEDAP Prox ID, encoding, encrypted ID,
 
-int CmdLFNedapDemod(const char *Cmd)
-{
+int CmdLFNedapDemod(const char *Cmd) {
     //raw ask demod no start bit finding just get binary from wave
     if (!ASKbiphaseDemod("0 64 1 0", false)) {
         if (g_debugMode) PrintAndLogEx(DEBUG, "DEBUG: Error - Nedap ASKbiphaseDemod failed");
@@ -236,8 +231,7 @@ lf t55xx wr b 4 d 4c0003ff
 
 */
 
-int CmdLFNedapRead(const char *Cmd)
-{
+int CmdLFNedapRead(const char *Cmd) {
     lf_read(true, 12000);
     return CmdLFNedapDemod(Cmd);
 }
@@ -294,8 +288,7 @@ int CmdLFNedapClone(const char *Cmd) {
 }
 */
 
-int CmdLFNedapSim(const char *Cmd)
-{
+int CmdLFNedapSim(const char *Cmd) {
 
     uint32_t cardnumber = 0, cn = 0;
 
@@ -331,8 +324,7 @@ int CmdLFNedapSim(const char *Cmd)
     return 0;
 }
 
-int CmdLFNedapChk(const char *Cmd)
-{
+int CmdLFNedapChk(const char *Cmd) {
     //301600714021BE
     uint8_t data[256] = { 0x30, 0x16, 0x00, 0x71, 0x40, 0x21, 0xBE};
     int len = 0;
@@ -389,15 +381,13 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFNedap(const char *Cmd)
-{
+int CmdLFNedap(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfnexwatch.c b/client/cmdlfnexwatch.c
index 61781dbba..3d5c1083b 100644
--- a/client/cmdlfnexwatch.c
+++ b/client/cmdlfnexwatch.c
@@ -12,8 +12,7 @@
 
 static int CmdHelp(const char *Cmd);
 
-int detectNexWatch(uint8_t *dest, size_t *size, bool *invert)
-{
+int detectNexWatch(uint8_t *dest, size_t *size, bool *invert) {
 
     uint8_t preamble[28]   = {0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
     uint8_t preamble_i[28] = {1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
@@ -32,8 +31,7 @@ int detectNexWatch(uint8_t *dest, size_t *size, bool *invert)
     return (int) startIdx;
 }
 
-int CmdNexWatchDemod(const char *Cmd)
-{
+int CmdNexWatchDemod(const char *Cmd) {
 
     if (!PSKDemod("", false)) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - NexWatch can't demod signal");
@@ -89,8 +87,7 @@ int CmdNexWatchDemod(const char *Cmd)
 
 //by marshmellow
 //see ASKDemod for what args are accepted
-int CmdNexWatchRead(const char *Cmd)
-{
+int CmdNexWatchRead(const char *Cmd) {
     lf_read(true, 10000);
     return CmdNexWatchDemod(Cmd);
 }
@@ -102,15 +99,13 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFNEXWATCH(const char *Cmd)
-{
+int CmdLFNEXWATCH(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfnoralsy.c b/client/cmdlfnoralsy.c
index f7e1455bf..0f515ba43 100644
--- a/client/cmdlfnoralsy.c
+++ b/client/cmdlfnoralsy.c
@@ -11,8 +11,7 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_lf_noralsy_clone(void)
-{
+int usage_lf_noralsy_clone(void) {
     PrintAndLogEx(NORMAL, "clone a Noralsy tag to a T55x7 tag.");
     PrintAndLogEx(NORMAL, "Usage: lf noralsy clone [h] <card id> <year> <Q5>");
     PrintAndLogEx(NORMAL, "Options:");
@@ -26,8 +25,7 @@ int usage_lf_noralsy_clone(void)
     return 0;
 }
 
-int usage_lf_noralsy_sim(void)
-{
+int usage_lf_noralsy_sim(void) {
     PrintAndLogEx(NORMAL, "Enables simulation of Noralsy card with specified card number.");
     PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "");
@@ -42,15 +40,13 @@ int usage_lf_noralsy_sim(void)
     return 0;
 }
 
-static uint8_t noralsy_chksum(uint8_t *bits, uint8_t len)
-{
+static uint8_t noralsy_chksum(uint8_t *bits, uint8_t len) {
     uint8_t sum = 0;
     for (uint8_t i = 0; i < len; i += 4)
         sum ^= bytebits_to_byte(bits + i, 4);
     return sum & 0x0F ;
 }
-int getnoralsyBits(uint32_t id, uint16_t year, uint8_t *bits)
-{
+int getnoralsyBits(uint32_t id, uint16_t year, uint8_t *bits) {
     //preamp
     num_to_bytebits(0xBB0214FF, 32, bits);  // --> Have seen 0xBB0214FF / 0xBB0314FF  UNKNOWN
 
@@ -80,8 +76,7 @@ int getnoralsyBits(uint32_t id, uint16_t year, uint8_t *bits)
 
 // by iceman
 // find Noralsy preamble in already demoded data
-int detectNoralsy(uint8_t *dest, size_t *size)
-{
+int detectNoralsy(uint8_t *dest, size_t *size) {
     if (*size < 96) return -1; //make sure buffer has data
     size_t startIdx = 0;
     uint8_t preamble[] = {1, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0};
@@ -105,8 +100,7 @@ int detectNoralsy(uint8_t *dest, size_t *size)
 **/
 
 //see ASKDemod for what args are accepted
-int CmdNoralsyDemod(const char *Cmd)
-{
+int CmdNoralsyDemod(const char *Cmd) {
 
     //ASK / Manchester
     bool st = true;
@@ -175,14 +169,12 @@ int CmdNoralsyDemod(const char *Cmd)
     return 1;
 }
 
-int CmdNoralsyRead(const char *Cmd)
-{
+int CmdNoralsyRead(const char *Cmd) {
     lf_read(true, 8000);
     return CmdNoralsyDemod(Cmd);
 }
 
-int CmdNoralsyClone(const char *Cmd)
-{
+int CmdNoralsyClone(const char *Cmd) {
 
     uint16_t year = 0;
     uint32_t id = 0;
@@ -229,8 +221,7 @@ int CmdNoralsyClone(const char *Cmd)
     return 0;
 }
 
-int CmdNoralsySim(const char *Cmd)
-{
+int CmdNoralsySim(const char *Cmd) {
 
     uint8_t bits[96];
     uint8_t *bs = bits;
@@ -274,15 +265,13 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFNoralsy(const char *Cmd)
-{
+int CmdLFNoralsy(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfpac.c b/client/cmdlfpac.c
index c9466d215..643e5295f 100644
--- a/client/cmdlfpac.c
+++ b/client/cmdlfpac.c
@@ -13,8 +13,7 @@ static int CmdHelp(const char *Cmd);
 
 // by marshmellow
 // find PAC preamble in already demoded data
-int detectPac(uint8_t *dest, size_t *size)
-{
+int detectPac(uint8_t *dest, size_t *size) {
     if (*size < 128) return -1; //make sure buffer has data
     size_t startIdx = 0;
     uint8_t preamble[] = {1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0};
@@ -26,8 +25,7 @@ int detectPac(uint8_t *dest, size_t *size)
 }
 
 //see NRZDemod for what args are accepted
-int CmdPacDemod(const char *Cmd)
-{
+int CmdPacDemod(const char *Cmd) {
 
     //NRZ
     if (!NRZrawDemod(Cmd, false)) {
@@ -66,8 +64,7 @@ int CmdPacDemod(const char *Cmd)
     return 1;
 }
 
-int CmdPacRead(const char *Cmd)
-{
+int CmdPacRead(const char *Cmd) {
     lf_read(true, 4096 * 2 + 20);
     return CmdPacDemod(Cmd);
 }
@@ -79,15 +76,13 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFPac(const char *Cmd)
-{
+int CmdLFPac(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfparadox.c b/client/cmdlfparadox.c
index a7d287f9c..02ff02005 100644
--- a/client/cmdlfparadox.c
+++ b/client/cmdlfparadox.c
@@ -21,8 +21,7 @@
 #include "lfdemod.h"
 static int CmdHelp(const char *Cmd);
 
-int usage_lf_paradox_sim(void)
-{
+int usage_lf_paradox_sim(void) {
     PrintAndLogEx(NORMAL, "Enables simulation of Paradox card with specified card number.");
     PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "The facility-code is 8-bit and the card number is 16-bit.  Larger values are truncated.");
@@ -39,8 +38,7 @@ int usage_lf_paradox_sim(void)
 }
 
 // loop to get raw paradox waveform then FSK demodulate the TAG ID from it
-int detectParadox(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32_t *lo, int *waveStartIdx)
-{
+int detectParadox(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32_t *lo, int *waveStartIdx) {
     //make sure buffer has data
     if (*size < 96 * 50) return -1;
 
@@ -79,8 +77,7 @@ int detectParadox(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint
 //by marshmellow
 //Paradox Prox demod - FSK2a RF/50 with preamble of 00001111 (then manchester encoded)
 //print full Paradox Prox ID and some bit format details if found
-int CmdParadoxDemod(const char *Cmd)
-{
+int CmdParadoxDemod(const char *Cmd) {
     //raw fsk demod no manchester decoding no start bit finding just get binary from wave
     uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
     size_t size = getFromGraphBuf(bits);
@@ -143,14 +140,12 @@ int CmdParadoxDemod(const char *Cmd)
 }
 //by marshmellow
 //see ASKDemod for what args are accepted
-int CmdParadoxRead(const char *Cmd)
-{
+int CmdParadoxRead(const char *Cmd) {
     lf_read(true, 10000);
     return CmdParadoxDemod(Cmd);
 }
 
-int CmdParadoxSim(const char *Cmd)
-{
+int CmdParadoxSim(const char *Cmd) {
 
     char cmdp = param_getchar(Cmd, 0);
     if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_paradox_sim();
@@ -197,15 +192,13 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFParadox(const char *Cmd)
-{
+int CmdLFParadox(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfpcf7931.c b/client/cmdlfpcf7931.c
index ab862719f..06d239372 100644
--- a/client/cmdlfpcf7931.c
+++ b/client/cmdlfpcf7931.c
@@ -35,8 +35,7 @@ struct pcf7931_config configPcf = {
 };
 
 // Resets the configuration settings to default values.
-int pcf7931_resetConfig()
-{
+int pcf7931_resetConfig() {
     memset(configPcf.Pwd, 0xFF, sizeof(configPcf.Pwd));
     configPcf.InitDelay = PCF7931_DEFAULT_INITDELAY;
     configPcf.OffsetWidth = PCF7931_DEFAULT_OFFSET_WIDTH;
@@ -44,8 +43,7 @@ int pcf7931_resetConfig()
     return 0;
 }
 
-int pcf7931_printConfig()
-{
+int pcf7931_printConfig() {
     PrintAndLogEx(NORMAL, "Password (LSB first on bytes) : %s", sprint_hex(configPcf.Pwd, sizeof(configPcf.Pwd)));
     PrintAndLogEx(NORMAL, "Tag initialization delay      : %d us", configPcf.InitDelay);
     PrintAndLogEx(NORMAL, "Offset low pulses width       : %d us", configPcf.OffsetWidth);
@@ -53,8 +51,7 @@ int pcf7931_printConfig()
     return 0;
 }
 
-int usage_pcf7931_read()
-{
+int usage_pcf7931_read() {
     PrintAndLogEx(NORMAL, "Usage: lf pcf7931 read [h] ");
     PrintAndLogEx(NORMAL, "This command tries to read a PCF7931 tag.");
     PrintAndLogEx(NORMAL, "Options:");
@@ -64,8 +61,7 @@ int usage_pcf7931_read()
     return 0;
 }
 
-int usage_pcf7931_write()
-{
+int usage_pcf7931_write() {
     PrintAndLogEx(NORMAL, "Usage: lf pcf7931 write [h] <block address> <byte address> <data>");
     PrintAndLogEx(NORMAL, "This command tries to write a PCF7931 tag.");
     PrintAndLogEx(NORMAL, "Options:");
@@ -78,8 +74,7 @@ int usage_pcf7931_write()
     return 0;
 }
 
-int usage_pcf7931_config()
-{
+int usage_pcf7931_config() {
     PrintAndLogEx(NORMAL, "Usage: lf pcf7931 config [h] [r] <pwd> <delay> <offset width> <offset position>");
     PrintAndLogEx(NORMAL, "This command tries to set the configuration used with PCF7931 commands");
     PrintAndLogEx(NORMAL, "The time offsets could be useful to correct slew rate generated by the antenna");
@@ -99,8 +94,7 @@ int usage_pcf7931_config()
     return 0;
 }
 
-int CmdLFPCF7931Read(const char *Cmd)
-{
+int CmdLFPCF7931Read(const char *Cmd) {
 
     uint8_t ctmp = param_getchar(Cmd, 0);
     if (ctmp == 'H' || ctmp == 'h') return usage_pcf7931_read();
@@ -116,8 +110,7 @@ int CmdLFPCF7931Read(const char *Cmd)
     return 0;
 }
 
-int CmdLFPCF7931Config(const char *Cmd)
-{
+int CmdLFPCF7931Config(const char *Cmd) {
 
     uint8_t ctmp = param_getchar(Cmd, 0);
     if (ctmp == 0) return pcf7931_printConfig();
@@ -134,8 +127,7 @@ int CmdLFPCF7931Config(const char *Cmd)
     return 0;
 }
 
-int CmdLFPCF7931Write(const char *Cmd)
-{
+int CmdLFPCF7931Write(const char *Cmd) {
 
     uint8_t ctmp = param_getchar(Cmd, 0);
     if (strlen(Cmd) < 1 || ctmp == 'h' || ctmp == 'H') return usage_pcf7931_write();
@@ -173,15 +165,13 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFPCF7931(const char *Cmd)
-{
+int CmdLFPCF7931(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfpresco.c b/client/cmdlfpresco.c
index cb859ef4b..b76cdf5e3 100644
--- a/client/cmdlfpresco.c
+++ b/client/cmdlfpresco.c
@@ -10,8 +10,7 @@
 #include "cmdlfpresco.h"
 static int CmdHelp(const char *Cmd);
 
-int usage_lf_presco_clone(void)
-{
+int usage_lf_presco_clone(void) {
     PrintAndLogEx(NORMAL, "clone a Presco tag to a T55x7 tag.");
     PrintAndLogEx(NORMAL, "Usage: lf presco clone [h] d <Card-ID> c <hex-ID> <Q5>");
     PrintAndLogEx(NORMAL, "Options:");
@@ -25,8 +24,7 @@ int usage_lf_presco_clone(void)
     return 0;
 }
 
-int usage_lf_presco_sim(void)
-{
+int usage_lf_presco_sim(void) {
     PrintAndLogEx(NORMAL, "Enables simulation of presco card with specified card number.");
     PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "Per presco format, the card number is 9 digit number and can contain *# chars. Larger values are truncated.");
@@ -43,8 +41,7 @@ int usage_lf_presco_sim(void)
 }
 
 // find presco preamble 0x10D in already demoded data
-int detectPresco(uint8_t *dest, size_t *size)
-{
+int detectPresco(uint8_t *dest, size_t *size) {
     if (*size < 128 * 2) return -1; //make sure buffer has data
     size_t startIdx = 0;
     uint8_t preamble[] = {0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
@@ -56,8 +53,7 @@ int detectPresco(uint8_t *dest, size_t *size)
 }
 
 // convert base 12 ID to sitecode & usercode & 8 bit other unknown code
-int GetWiegandFromPresco(const char *Cmd, uint32_t *sitecode, uint32_t *usercode, uint32_t *fullcode, bool *Q5)
-{
+int GetWiegandFromPresco(const char *Cmd, uint32_t *sitecode, uint32_t *usercode, uint32_t *fullcode, bool *Q5) {
 
     uint8_t val = 0;
     bool hex = false, errors = false;
@@ -120,8 +116,7 @@ int GetWiegandFromPresco(const char *Cmd, uint32_t *sitecode, uint32_t *usercode
 }
 
 // calc not certain - intended to get bitstream for programming / sim
-int GetPrescoBits(uint32_t fullcode, uint8_t *prescoBits)
-{
+int GetPrescoBits(uint32_t fullcode, uint8_t *prescoBits) {
     num_to_bytebits(0x10D00000, 32, prescoBits);
     num_to_bytebits(0x00000000, 32, prescoBits + 32);
     num_to_bytebits(0x00000000, 32, prescoBits + 64);
@@ -130,8 +125,7 @@ int GetPrescoBits(uint32_t fullcode, uint8_t *prescoBits)
 }
 
 //see ASKDemod for what args are accepted
-int CmdPrescoDemod(const char *Cmd)
-{
+int CmdPrescoDemod(const char *Cmd) {
     bool st = true;
     if (!ASKDemod_ext("32 0 0 0 0 a", false, false, 1, &st)) {
         PrintAndLogEx(DEBUG, "DEBUG: Error Presco ASKDemod failed");
@@ -171,8 +165,7 @@ int CmdPrescoDemod(const char *Cmd)
 }
 
 //see ASKDemod for what args are accepted
-int CmdPrescoRead(const char *Cmd)
-{
+int CmdPrescoRead(const char *Cmd) {
     // Presco Number: 123456789 --> Sitecode 30 | usercode 8665
     lf_read(true, 12000);
     return CmdPrescoDemod(Cmd);
@@ -180,8 +173,7 @@ int CmdPrescoRead(const char *Cmd)
 
 // takes base 12 ID converts to hex
 // Or takes 8 digit hex ID
-int CmdPrescoClone(const char *Cmd)
-{
+int CmdPrescoClone(const char *Cmd) {
 
     bool Q5 = false;
     uint32_t sitecode = 0, usercode = 0, fullcode = 0;
@@ -229,8 +221,7 @@ int CmdPrescoClone(const char *Cmd)
 
 // takes base 12 ID converts to hex
 // Or takes 8 digit hex ID
-int CmdPrescoSim(const char *Cmd)
-{
+int CmdPrescoSim(const char *Cmd) {
     uint32_t sitecode = 0, usercode = 0, fullcode = 0;
     bool Q5 = false;
     // get wiegand from printed number.
@@ -259,15 +250,13 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFPresco(const char *Cmd)
-{
+int CmdLFPresco(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c
index aa213ef6a..bcf5ab672 100644
--- a/client/cmdlfpyramid.c
+++ b/client/cmdlfpyramid.c
@@ -11,8 +11,7 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_lf_pyramid_clone(void)
-{
+int usage_lf_pyramid_clone(void) {
     PrintAndLogEx(NORMAL, "clone a Farpointe/Pyramid tag to a T55x7 tag.");
     PrintAndLogEx(NORMAL, "The facility-code is 8-bit and the card number is 16-bit.  Larger values are truncated. ");
     PrintAndLogEx(NORMAL, "Currently only works on 26bit");
@@ -29,8 +28,7 @@ int usage_lf_pyramid_clone(void)
     return 0;
 }
 
-int usage_lf_pyramid_sim(void)
-{
+int usage_lf_pyramid_sim(void) {
     PrintAndLogEx(NORMAL, "Enables simulation of Farpointe/Pyramid card with specified card number.");
     PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "The facility-code is 8-bit and the card number is 16-bit.  Larger values are truncated.");
@@ -49,8 +47,7 @@ int usage_lf_pyramid_sim(void)
 
 // by marshmellow
 // FSK Demod then try to locate a Farpointe Data (pyramid) ID
-int detectPyramid(uint8_t *dest, size_t *size, int *waveStartIdx)
-{
+int detectPyramid(uint8_t *dest, size_t *size, int *waveStartIdx) {
     //make sure buffer has data
     if (*size < 128 * 50) return -1;
 
@@ -75,8 +72,7 @@ int detectPyramid(uint8_t *dest, size_t *size, int *waveStartIdx)
 }
 
 // Works for 26bits.
-int GetPyramidBits(uint32_t fc, uint32_t cn, uint8_t *pyramidBits)
-{
+int GetPyramidBits(uint32_t fc, uint32_t cn, uint8_t *pyramidBits) {
 
     uint8_t pre[128];
     memset(pre, 0x00, sizeof(pre));
@@ -109,8 +105,7 @@ int GetPyramidBits(uint32_t fc, uint32_t cn, uint8_t *pyramidBits)
 //by marshmellow
 //Pyramid Prox demod - FSK RF/50 with preamble of 0000000000000001  (always a 128 bit data stream)
 //print full Farpointe Data/Pyramid Prox ID and some bit format details if found
-int CmdPyramidDemod(const char *Cmd)
-{
+int CmdPyramidDemod(const char *Cmd) {
     //raw fsk demod no manchester decoding no start bit finding just get binary from wave
     uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
     size_t size = getFromGraphBuf(bits);
@@ -252,14 +247,12 @@ int CmdPyramidDemod(const char *Cmd)
     return 1;
 }
 
-int CmdPyramidRead(const char *Cmd)
-{
+int CmdPyramidRead(const char *Cmd) {
     lf_read(true, 15000);
     return CmdPyramidDemod(Cmd);
 }
 
-int CmdPyramidClone(const char *Cmd)
-{
+int CmdPyramidClone(const char *Cmd) {
 
     char cmdp = param_getchar(Cmd, 0);
     if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_pyramid_clone();
@@ -310,8 +303,7 @@ int CmdPyramidClone(const char *Cmd)
     return 0;
 }
 
-int CmdPyramidSim(const char *Cmd)
-{
+int CmdPyramidSim(const char *Cmd) {
 
     char cmdp = param_getchar(Cmd, 0);
     if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_pyramid_sim();
@@ -356,15 +348,13 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFPyramid(const char *Cmd)
-{
+int CmdLFPyramid(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfsecurakey.c b/client/cmdlfsecurakey.c
index bb021eeb3..527aba839 100644
--- a/client/cmdlfsecurakey.c
+++ b/client/cmdlfsecurakey.c
@@ -13,8 +13,7 @@ static int CmdHelp(const char *Cmd);
 
 // by marshmellow
 // find Securakey preamble in already demoded data
-int detectSecurakey(uint8_t *dest, size_t *size)
-{
+int detectSecurakey(uint8_t *dest, size_t *size) {
     if (*size < 96) return -1; //make sure buffer has data
     size_t startIdx = 0;
     uint8_t preamble[] = {0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1};
@@ -26,8 +25,7 @@ int detectSecurakey(uint8_t *dest, size_t *size)
 }
 
 //see ASKDemod for what args are accepted
-int CmdSecurakeyDemod(const char *Cmd)
-{
+int CmdSecurakeyDemod(const char *Cmd) {
 
     //ASK / Manchester
     bool st = false;
@@ -108,8 +106,7 @@ int CmdSecurakeyDemod(const char *Cmd)
     return 1;
 }
 
-int CmdSecurakeyRead(const char *Cmd)
-{
+int CmdSecurakeyRead(const char *Cmd) {
     lf_read(true, 8000);
     return CmdSecurakeyDemod(Cmd);
 }
@@ -123,15 +120,13 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFSecurakey(const char *Cmd)
-{
+int CmdLFSecurakey(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index cfa1a5a5c..91f4a456f 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -11,17 +11,14 @@
 // Default configuration
 t55xx_conf_block_t config = { .modulation = DEMOD_ASK, .inverted = false, .offset = 0x00, .block0 = 0x00, .Q5 = false };
 
-t55xx_conf_block_t Get_t55xx_Config()
-{
+t55xx_conf_block_t Get_t55xx_Config() {
     return config;
 }
-void Set_t55xx_Config(t55xx_conf_block_t conf)
-{
+void Set_t55xx_Config(t55xx_conf_block_t conf) {
     config = conf;
 }
 
-int usage_t55xx_config()
-{
+int usage_t55xx_config() {
     PrintAndLogEx(NORMAL, "Usage: lf t55xx config [d <demodulation>] [i 1] [o <offset>] [Q5]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       h                                - This help");
@@ -39,8 +36,7 @@ int usage_t55xx_config()
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
-int usage_t55xx_read()
-{
+int usage_t55xx_read() {
     PrintAndLogEx(NORMAL, "Usage:  lf t55xx read [b <block>] [p <password>] <override_safety> <page1>");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "     b <block>    - block number to read. Between 0-7");
@@ -58,8 +54,7 @@ int usage_t55xx_read()
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
-int usage_t55xx_write()
-{
+int usage_t55xx_write() {
     PrintAndLogEx(NORMAL, "Usage:  lf t55xx write [b <block>] [d <data>] [p <password>] [1] [t]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "     b <block>    - block number to write. Between 0-7");
@@ -74,8 +69,7 @@ int usage_t55xx_write()
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
-int usage_t55xx_trace()
-{
+int usage_t55xx_trace() {
     PrintAndLogEx(NORMAL, "Usage:  lf t55xx trace [1]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "     1            - if set, use Graphbuffer otherwise read data from tag.");
@@ -86,8 +80,7 @@ int usage_t55xx_trace()
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
-int usage_t55xx_info()
-{
+int usage_t55xx_info() {
     PrintAndLogEx(NORMAL, "Usage:  lf t55xx info [1]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "     1            - if set, use Graphbuffer otherwise read data from tag.");
@@ -98,8 +91,7 @@ int usage_t55xx_info()
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
-int usage_t55xx_dump()
-{
+int usage_t55xx_dump() {
     PrintAndLogEx(NORMAL, "Usage:  lf t55xx dump <password> [o]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "     <password>   - OPTIONAL password 4bytes (8 hex symbols)");
@@ -111,8 +103,7 @@ int usage_t55xx_dump()
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
-int usage_t55xx_detect()
-{
+int usage_t55xx_detect() {
     PrintAndLogEx(NORMAL, "Usage:  lf t55xx detect [1] [p <password>]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "     1            - if set, use Graphbuffer otherwise read data from tag.");
@@ -125,8 +116,7 @@ int usage_t55xx_detect()
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
-int usage_t55xx_detectP1()
-{
+int usage_t55xx_detectP1() {
     PrintAndLogEx(NORMAL, "Command: Detect Page 1 of a t55xx chip");
     PrintAndLogEx(NORMAL, "Usage:  lf t55xx p1detect [1] [p <password>]");
     PrintAndLogEx(NORMAL, "Options:");
@@ -140,8 +130,7 @@ int usage_t55xx_detectP1()
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
-int usage_t55xx_wakup()
-{
+int usage_t55xx_wakup() {
     PrintAndLogEx(NORMAL, "Usage:  lf t55xx wakeup [h] p <password>");
     PrintAndLogEx(NORMAL, "This commands send the Answer-On-Request command and leaves the readerfield ON afterwards.");
     PrintAndLogEx(NORMAL, "Options:");
@@ -152,8 +141,7 @@ int usage_t55xx_wakup()
     PrintAndLogEx(NORMAL, "      lf t55xx wakeup p 11223344  - send wakeup password");
     return 0;
 }
-int usage_t55xx_chk()
-{
+int usage_t55xx_chk() {
     PrintAndLogEx(NORMAL, "This command uses a dictionary attack");
     PrintAndLogEx(NORMAL, "press 'enter' to cancel the command");
     PrintAndLogEx(NORMAL, "Usage: lf t55xx bruteforce [h] <m> [i <*.dic>]");
@@ -168,8 +156,7 @@ int usage_t55xx_chk()
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
-int usage_t55xx_bruteforce()
-{
+int usage_t55xx_bruteforce() {
     PrintAndLogEx(NORMAL, "This command uses bruteforce to scan a number range");
     PrintAndLogEx(NORMAL, "press 'enter' to cancel the command");
     PrintAndLogEx(NORMAL, "Usage: lf t55xx bruteforce [h] <start password> <end password>");
@@ -184,8 +171,7 @@ int usage_t55xx_bruteforce()
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
-int usage_t55xx_recoverpw()
-{
+int usage_t55xx_recoverpw() {
     PrintAndLogEx(NORMAL, "This command uses a few tricks to try to recover mangled password");
     PrintAndLogEx(NORMAL, "press 'enter' to cancel the command");
     PrintAndLogEx(NORMAL, "WARNING: this may brick non-password protected chips!");
@@ -202,8 +188,7 @@ int usage_t55xx_recoverpw()
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
-int usage_t55xx_wipe()
-{
+int usage_t55xx_wipe() {
     PrintAndLogEx(NORMAL, "Usage:  lf t55xx wipe [h] [Q5]");
     PrintAndLogEx(NORMAL, "This commands wipes a tag, fills blocks 1-7 with zeros and a default configuration block");
     PrintAndLogEx(NORMAL, "Options:");
@@ -215,8 +200,7 @@ int usage_t55xx_wipe()
     PrintAndLogEx(NORMAL, "      lf t55xx wipe Q5 -  wipes a t5555 Q5 tag, config block 0x6001F004");
     return 0;
 }
-int usage_lf_deviceconfig()
-{
+int usage_lf_deviceconfig() {
     PrintAndLogEx(NORMAL, "Sets t55x7 timings for direkt commands. The timings are set here in Field Clocks (FC), \nwhich is converted to (US) on device");
     PrintAndLogEx(NORMAL, "Usage: lf t55xx deviceconfig a <gap> b <gap> c <gap> d <gap> e <gap> p");
     PrintAndLogEx(NORMAL, "Options:");
@@ -237,15 +221,13 @@ int usage_lf_deviceconfig()
 
 int CmdHelp(const char *Cmd);
 
-void printT5xxHeader(uint8_t page)
-{
+void printT5xxHeader(uint8_t page) {
     PrintAndLogEx(NORMAL, "Reading Page %d:", page);
     PrintAndLogEx(NORMAL, "blk | hex data | binary                           | ascii");
     PrintAndLogEx(NORMAL, "----+----------+----------------------------------+-------");
 }
 
-int CmdT55xxSetConfig(const char *Cmd)
-{
+int CmdT55xxSetConfig(const char *Cmd) {
 
     uint8_t offset = 0;
     char modulation[6] = {0x00};
@@ -347,8 +329,7 @@ int CmdT55xxSetConfig(const char *Cmd)
     return printConfiguration(config);
 }
 
-int T55xxReadBlock(uint8_t block, bool page1, bool usepwd, bool override, uint32_t password)
-{
+int T55xxReadBlock(uint8_t block, bool page1, bool usepwd, bool override, uint32_t password) {
     //Password mode
     if (usepwd) {
         // try reading the config block and verify that PWD bit is set before doing this!
@@ -378,8 +359,7 @@ int T55xxReadBlock(uint8_t block, bool page1, bool usepwd, bool override, uint32
     return 1;
 }
 
-int CmdT55xxReadBlock(const char *Cmd)
-{
+int CmdT55xxReadBlock(const char *Cmd) {
     uint8_t block = REGULAR_READ_MODE_BLOCK;
     uint32_t password = 0; //default to blank Block 7
     bool usepwd = false;
@@ -425,8 +405,7 @@ int CmdT55xxReadBlock(const char *Cmd)
     return T55xxReadBlock(block, page1, usepwd, override, password);
 }
 
-bool DecodeT55xxBlock()
-{
+bool DecodeT55xxBlock() {
 
     char buf[30] = {0x00};
     char *cmdStr = buf;
@@ -489,8 +468,7 @@ bool DecodeT55xxBlock()
     return (bool) ans;
 }
 
-bool DecodeT5555TraceBlock()
-{
+bool DecodeT5555TraceBlock() {
     DemodBufferLen = 0x00;
 
     // According to datasheet. Always: RF/64, not inverted, Manchester
@@ -498,8 +476,7 @@ bool DecodeT5555TraceBlock()
 }
 
 // sanity check. Don't use proxmark if it is offline and you didn't specify useGraphbuf
-static int SanityOfflineCheck(bool useGraphBuffer)
-{
+static int SanityOfflineCheck(bool useGraphBuffer) {
     if (!useGraphBuffer && IsOffline()) {
         PrintAndLogEx(NORMAL, "Your proxmark3 device is offline. Specify [1] to use graphbuffer data instead");
         return 0;
@@ -507,8 +484,7 @@ static int SanityOfflineCheck(bool useGraphBuffer)
     return 1;
 }
 
-int CmdT55xxDetect(const char *Cmd)
-{
+int CmdT55xxDetect(const char *Cmd) {
     bool errors = false;
     bool useGB = false, usepwd = false;
     uint32_t password = 0;
@@ -551,8 +527,7 @@ int CmdT55xxDetect(const char *Cmd)
 }
 
 // detect configuration?
-bool tryDetectModulation()
-{
+bool tryDetectModulation() {
 
     t55xx_conf_block_t tests[15];
     int bitRate = 0, clk = 0, firstClockEdge = 0;
@@ -738,8 +713,7 @@ bool tryDetectModulation()
     return retval;
 }
 
-bool testKnownConfigBlock(uint32_t block0)
-{
+bool testKnownConfigBlock(uint32_t block0) {
     switch (block0) {
         case T55X7_DEFAULT_CONFIG_BLOCK:
         case T55X7_RAW_CONFIG_BLOCK:
@@ -759,8 +733,7 @@ bool testKnownConfigBlock(uint32_t block0)
     return false;
 }
 
-bool testModulation(uint8_t mode, uint8_t modread)
-{
+bool testModulation(uint8_t mode, uint8_t modread) {
     switch (mode) {
         case DEMOD_FSK:
             if (modread >= DEMOD_FSK1 && modread <= DEMOD_FSK2a) return true;
@@ -792,8 +765,7 @@ bool testModulation(uint8_t mode, uint8_t modread)
     return false;
 }
 
-bool testQ5Modulation(uint8_t mode, uint8_t modread)
-{
+bool testQ5Modulation(uint8_t mode, uint8_t modread) {
     switch (mode) {
         case DEMOD_FSK:
             if (modread >= 4 && modread <= 5) return true;
@@ -822,8 +794,7 @@ bool testQ5Modulation(uint8_t mode, uint8_t modread)
     return false;
 }
 
-int convertQ5bitRate(uint8_t bitRateRead)
-{
+int convertQ5bitRate(uint8_t bitRateRead) {
     uint8_t expected[] = {8, 16, 32, 40, 50, 64, 100, 128};
     for (int i = 0; i < 8; i++)
         if (expected[i] == bitRateRead)
@@ -832,8 +803,7 @@ int convertQ5bitRate(uint8_t bitRateRead)
     return -1;
 }
 
-bool testQ5(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk)
-{
+bool testQ5(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk) {
 
     if (DemodBufferLen < 64) return false;
     uint8_t si = 0;
@@ -878,8 +848,7 @@ bool testQ5(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk)
     return false;
 }
 
-bool testBitRate(uint8_t readRate, uint8_t clk)
-{
+bool testBitRate(uint8_t readRate, uint8_t clk) {
     uint8_t expected[] = {8, 16, 32, 40, 50, 64, 100, 128};
     if (expected[readRate] == clk)
         return true;
@@ -887,8 +856,7 @@ bool testBitRate(uint8_t readRate, uint8_t clk)
     return false;
 }
 
-bool test(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk, bool *Q5)
-{
+bool test(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk, bool *Q5) {
 
     if (DemodBufferLen < 64) return false;
     uint8_t si = 0;
@@ -938,8 +906,7 @@ bool test(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk, bool *Q5)
     return false;
 }
 
-void printT55xxBlock(const char *blockNum)
-{
+void printT55xxBlock(const char *blockNum) {
 
     uint8_t i = config.offset;
     uint8_t endpos = 32 + i;
@@ -963,8 +930,7 @@ void printT55xxBlock(const char *blockNum)
     PrintAndLogEx(NORMAL, " %s | %08X | %s | %s", blockNum, blockData, sprint_bin(bits, 32), sprint_ascii(bytes, 4));
 }
 
-int special(const char *Cmd)
-{
+int special(const char *Cmd) {
     uint32_t blockData = 0;
     uint8_t bits[32] = {0x00};
 
@@ -983,8 +949,7 @@ int special(const char *Cmd)
     return 0;
 }
 
-int printConfiguration(t55xx_conf_block_t b)
-{
+int printConfiguration(t55xx_conf_block_t b) {
     PrintAndLogEx(NORMAL, "Chip Type  : %s", (b.Q5) ? "T5555(Q5)" : "T55x7");
     PrintAndLogEx(NORMAL, "Modulation : %s", GetSelectedModulationStr(b.modulation));
     PrintAndLogEx(NORMAL, "Bit Rate   : %s", GetBitRateStr(b.bitrate, (b.block0 & T55x7_X_MODE && (b.block0 >> 28 == 6 || b.block0 >> 28 == 9))));
@@ -996,8 +961,7 @@ int printConfiguration(t55xx_conf_block_t b)
     return 0;
 }
 
-int CmdT55xxWakeUp(const char *Cmd)
-{
+int CmdT55xxWakeUp(const char *Cmd) {
     uint32_t password = 0;
     uint8_t cmdp = 0;
     bool errors = false;
@@ -1025,8 +989,7 @@ int CmdT55xxWakeUp(const char *Cmd)
     return 0;
 }
 
-int CmdT55xxWriteBlock(const char *Cmd)
-{
+int CmdT55xxWriteBlock(const char *Cmd) {
     uint8_t block = 0xFF; //default to invalid block
     uint32_t data = 0; //default to blank Block
     uint32_t password = 0; //default to blank Block 7
@@ -1099,8 +1062,7 @@ int CmdT55xxWriteBlock(const char *Cmd)
     return 1;
 }
 
-int CmdT55xxReadTrace(const char *Cmd)
-{
+int CmdT55xxReadTrace(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) > 1 || cmdp == 'h') return usage_t55xx_trace();
 
@@ -1220,8 +1182,7 @@ int CmdT55xxReadTrace(const char *Cmd)
     return 0;
 }
 
-void printT55x7Trace(t55x7_tracedata_t data, uint8_t repeat)
-{
+void printT55x7Trace(t55x7_tracedata_t data, uint8_t repeat) {
     PrintAndLogEx(NORMAL, "-- T55x7 Trace Information ----------------------------------");
     PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
     PrintAndLogEx(NORMAL, " ACL Allocation class (ISO/IEC 15963-1)  : 0x%02X (%d)", data.acl, data.acl);
@@ -1257,8 +1218,7 @@ void printT55x7Trace(t55x7_tracedata_t data, uint8_t repeat)
     */
 }
 
-void printT5555Trace(t5555_tracedata_t data, uint8_t repeat)
-{
+void printT5555Trace(t5555_tracedata_t data, uint8_t repeat) {
     PrintAndLogEx(NORMAL, "-- T5555 (Q5) Trace Information -----------------------------");
     PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
     PrintAndLogEx(NORMAL, " ICR IC Revision  : %d", data.icr);
@@ -1286,8 +1246,7 @@ void printT5555Trace(t5555_tracedata_t data, uint8_t repeat)
 }
 
 //need to add Q5 info...
-int CmdT55xxInfo(const char *Cmd)
-{
+int CmdT55xxInfo(const char *Cmd) {
     /*
         Page 0 Block 0 Configuration data.
         Normal mode
@@ -1373,8 +1332,7 @@ int CmdT55xxInfo(const char *Cmd)
     return 0;
 }
 
-int CmdT55xxDump(const char *Cmd)
-{
+int CmdT55xxDump(const char *Cmd) {
 
     uint32_t password = 0;
     bool override = false;
@@ -1399,8 +1357,7 @@ int CmdT55xxDump(const char *Cmd)
     return 1;
 }
 
-bool AquireData(uint8_t page, uint8_t block, bool pwdmode, uint32_t password)
-{
+bool AquireData(uint8_t page, uint8_t block, bool pwdmode, uint32_t password) {
     // arg0 bitmodes:
     //  bit0 = pwdmode
     //  bit1 = page to read from
@@ -1420,8 +1377,7 @@ bool AquireData(uint8_t page, uint8_t block, bool pwdmode, uint32_t password)
     return !getSignalProperties()->isnoise;
 }
 
-char *GetBitRateStr(uint32_t id, bool xmode)
-{
+char *GetBitRateStr(uint32_t id, bool xmode) {
     static char buf[25];
 
     char *retStr = buf;
@@ -1461,8 +1417,7 @@ char *GetBitRateStr(uint32_t id, bool xmode)
     return buf;
 }
 
-char *GetSaferStr(uint32_t id)
-{
+char *GetSaferStr(uint32_t id) {
     static char buf[40];
     char *retStr = buf;
 
@@ -1477,8 +1432,7 @@ char *GetSaferStr(uint32_t id)
     return buf;
 }
 
-char *GetModulationStr(uint32_t id)
-{
+char *GetModulationStr(uint32_t id) {
     static char buf[60];
     char *retStr = buf;
 
@@ -1526,8 +1480,7 @@ char *GetModulationStr(uint32_t id)
     return buf;
 }
 
-char *GetModelStrFromCID(uint32_t cid)
-{
+char *GetModelStrFromCID(uint32_t cid) {
 
     static char buf[10];
     char *retStr = buf;
@@ -1537,8 +1490,7 @@ char *GetModelStrFromCID(uint32_t cid)
     return buf;
 }
 
-char *GetSelectedModulationStr(uint8_t id)
-{
+char *GetSelectedModulationStr(uint8_t id) {
 
     static char buf[20];
     char *retStr = buf;
@@ -1587,8 +1539,7 @@ char *GetSelectedModulationStr(uint8_t id)
     return buf;
 }
 
-void t55x7_create_config_block(int tagtype)
-{
+void t55x7_create_config_block(int tagtype) {
 
     /*
      T55X7_DEFAULT_CONFIG_BLOCK, T55X7_RAW_CONFIG_BLOCK
@@ -1615,8 +1566,7 @@ void t55x7_create_config_block(int tagtype)
     PrintAndLogEx(NORMAL, buf);
 }
 
-int CmdResetRead(const char *Cmd)
-{
+int CmdResetRead(const char *Cmd) {
     UsbCommand c = {CMD_T55XX_RESET_READ, {0, 0, 0}};
     clearCommandBuffer();
     SendCommand(&c);
@@ -1634,8 +1584,7 @@ int CmdResetRead(const char *Cmd)
     return 1;
 }
 
-int CmdT55xxWipe(const char *Cmd)
-{
+int CmdT55xxWipe(const char *Cmd) {
     char writeData[20] = {0};
     char *ptrData = writeData;
     char cmdp = tolower(param_getchar(Cmd, 0));
@@ -1665,8 +1614,7 @@ int CmdT55xxWipe(const char *Cmd)
     return 0;
 }
 
-bool IsCancelled(void)
-{
+bool IsCancelled(void) {
     if (ukbhit()) {
         int gc = getchar();
         (void)gc;
@@ -1676,8 +1624,7 @@ bool IsCancelled(void)
     return false;
 }
 
-int CmdT55xxChkPwds(const char *Cmd)
-{
+int CmdT55xxChkPwds(const char *Cmd) {
     // load a default pwd file.
     char line[9];
     char filename[FILE_PATH_SIZE] = {0};
@@ -1848,8 +1795,7 @@ out:
     return 0;
 }
 
-int CmdT55xxBruteForce(const char *Cmd)
-{
+int CmdT55xxBruteForce(const char *Cmd) {
 
     uint32_t start_password = 0x00000000; //start password
     uint32_t end_password   = 0xFFFFFFFF; //end   password
@@ -1909,8 +1855,7 @@ int CmdT55xxBruteForce(const char *Cmd)
     return 0;
 }
 
-int tryOnePassword(uint32_t password)
-{
+int tryOnePassword(uint32_t password) {
     PrintAndLogEx(INFO, "Trying password %08x", password);
     if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, password)) {
         PrintAndLogEx(NORMAL, "Acquire data from device failed. Quitting");
@@ -1923,8 +1868,7 @@ int tryOnePassword(uint32_t password)
         return 0;
 }
 
-int CmdT55xxRecoverPW(const char *Cmd)
-{
+int CmdT55xxRecoverPW(const char *Cmd) {
     int bit = 0;
     uint32_t orig_password = 0x0;
     uint32_t curr_password = 0x0;
@@ -2001,8 +1945,7 @@ int CmdT55xxRecoverPW(const char *Cmd)
 // note length of data returned is different for different chips.
 // some return all page 1 (64 bits) and others return just that block (32 bits)
 // unfortunately the 64 bits makes this more likely to get a false positive...
-bool tryDetectP1(bool getData)
-{
+bool tryDetectP1(bool getData) {
     uint8_t preamble[] = {1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1};
     size_t startIdx = 0;
     uint8_t fc1 = 0, fc2 = 0, ans = 0;
@@ -2018,13 +1961,13 @@ bool tryDetectP1(bool getData)
     ans = fskClocks(&fc1, &fc2, (uint8_t *)&clk, &firstClockEdge);
     if (ans && ((fc1 == 10 && fc2 == 8) || (fc1 == 8 && fc2 == 5))) {
         if (FSKrawDemod("0 0", false) &&
-            preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
-            (DemodBufferLen == 32 || DemodBufferLen == 64)) {
+                preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
+                (DemodBufferLen == 32 || DemodBufferLen == 64)) {
             return true;
         }
         if (FSKrawDemod("0 1", false) &&
-            preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
-            (DemodBufferLen == 32 || DemodBufferLen == 64)) {
+                preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
+                (DemodBufferLen == 32 || DemodBufferLen == 64)) {
             return true;
         }
         return false;
@@ -2034,24 +1977,24 @@ bool tryDetectP1(bool getData)
     clk = GetAskClock("", false);
     if (clk > 0) {
         if (ASKDemod_ext("0 0 1", false, false, 1, &st) &&
-            preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
-            (DemodBufferLen == 32 || DemodBufferLen == 64)) {
+                preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
+                (DemodBufferLen == 32 || DemodBufferLen == 64)) {
             return true;
         }
         st = true;
         if (ASKDemod_ext("0 1 1", false, false, 1, &st)  &&
-            preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
-            (DemodBufferLen == 32 || DemodBufferLen == 64)) {
+                preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
+                (DemodBufferLen == 32 || DemodBufferLen == 64)) {
             return true;
         }
         if (ASKbiphaseDemod("0 0 0 2", false) &&
-            preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
-            (DemodBufferLen == 32 || DemodBufferLen == 64)) {
+                preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
+                (DemodBufferLen == 32 || DemodBufferLen == 64)) {
             return true;
         }
         if (ASKbiphaseDemod("0 0 1 2", false) &&
-            preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
-            (DemodBufferLen == 32 || DemodBufferLen == 64)) {
+                preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
+                (DemodBufferLen == 32 || DemodBufferLen == 64)) {
             return true;
         }
     }
@@ -2060,13 +2003,13 @@ bool tryDetectP1(bool getData)
     clk = GetNrzClock("", false); //has the most false positives :(
     if (clk > 0) {
         if (NRZrawDemod("0 0 1", false)  &&
-            preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
-            (DemodBufferLen == 32 || DemodBufferLen == 64)) {
+                preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
+                (DemodBufferLen == 32 || DemodBufferLen == 64)) {
             return true;
         }
         if (NRZrawDemod("0 1 1", false)  &&
-            preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
-            (DemodBufferLen == 32 || DemodBufferLen == 64)) {
+                preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
+                (DemodBufferLen == 32 || DemodBufferLen == 64)) {
             return true;
         }
     }
@@ -2080,14 +2023,14 @@ bool tryDetectP1(bool getData)
         // skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)
         //CmdLtrim("160");
         if (PSKDemod("0 0 6", false) &&
-            preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
-            (DemodBufferLen == 32 || DemodBufferLen == 64)) {
+                preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
+                (DemodBufferLen == 32 || DemodBufferLen == 64)) {
             //save_restoreGB(GRAPH_RESTORE);
             return true;
         }
         if (PSKDemod("0 1 6", false) &&
-            preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
-            (DemodBufferLen == 32 || DemodBufferLen == 64)) {
+                preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
+                (DemodBufferLen == 32 || DemodBufferLen == 64)) {
             //save_restoreGB(GRAPH_RESTORE);
             return true;
         }
@@ -2095,7 +2038,7 @@ bool tryDetectP1(bool getData)
         if (PSKDemod("0 0 6", false)) {
             psk1TOpsk2(DemodBuffer, DemodBufferLen);
             if (preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
-                (DemodBufferLen == 32 || DemodBufferLen == 64)) {
+                    (DemodBufferLen == 32 || DemodBufferLen == 64)) {
                 //save_restoreGB(GRAPH_RESTORE);
                 return true;
             }
@@ -2109,8 +2052,7 @@ bool tryDetectP1(bool getData)
     return false;
 }
 //  does this need to be a callable command?
-int CmdT55xxDetectPage1(const char *Cmd)
-{
+int CmdT55xxDetectPage1(const char *Cmd) {
     bool errors = false;
     bool useGB = false;
     bool usepwd = false;
@@ -2148,8 +2090,7 @@ int CmdT55xxDetectPage1(const char *Cmd)
     return success;
 }
 
-int CmdT55xxSetDeviceConfig(const char *Cmd)
-{
+int CmdT55xxSetDeviceConfig(const char *Cmd) {
     uint8_t startgap = 0, writegap = 0;
     uint8_t write0 = 0, write1 = 0, readgap = 0;
     bool errors = false, shall_persist = false;
@@ -2222,15 +2163,13 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFT55XX(const char *Cmd)
-{
+int CmdLFT55XX(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfti.c b/client/cmdlfti.c
index 6c675c2de..8c609bddf 100644
--- a/client/cmdlfti.c
+++ b/client/cmdlfti.c
@@ -21,8 +21,7 @@
 
 static int CmdHelp(const char *Cmd);
 
-int CmdTIDemod(const char *Cmd)
-{
+int CmdTIDemod(const char *Cmd) {
     /* MATLAB as follows:
       f_s = 2000000;  % sampling frequency
       f_l = 123200;   % low FSK tone
@@ -276,8 +275,7 @@ out:
 }
 
 // read a TI tag and return its ID
-int CmdTIRead(const char *Cmd)
-{
+int CmdTIRead(const char *Cmd) {
     UsbCommand c = {CMD_READ_TI_TYPE};
     clearCommandBuffer();
     SendCommand(&c);
@@ -285,8 +283,7 @@ int CmdTIRead(const char *Cmd)
 }
 
 // write new data to a r/w TI tag
-int CmdTIWrite(const char *Cmd)
-{
+int CmdTIWrite(const char *Cmd) {
     int res = 0;
     UsbCommand c = {CMD_WRITE_TI_TYPE};
     res = sscanf(Cmd, "%012" SCNx64 " %012" SCNx64 " %012" SCNx64 "", &c.arg[0], &c.arg[1], &c.arg[2]);
@@ -311,15 +308,13 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFTI(const char *Cmd)
-{
+int CmdLFTI(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfviking.c b/client/cmdlfviking.c
index 33df5c971..6c4a408b1 100644
--- a/client/cmdlfviking.c
+++ b/client/cmdlfviking.c
@@ -11,8 +11,7 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_lf_viking_clone(void)
-{
+int usage_lf_viking_clone(void) {
     PrintAndLogEx(NORMAL, "clone a Viking AM tag to a T55x7 tag.");
     PrintAndLogEx(NORMAL, "Usage: lf viking clone <Card ID - 8 hex digits> <Q5>");
     PrintAndLogEx(NORMAL, "Options:");
@@ -24,8 +23,7 @@ int usage_lf_viking_clone(void)
     return 0;
 }
 
-int usage_lf_viking_sim(void)
-{
+int usage_lf_viking_sim(void) {
     PrintAndLogEx(NORMAL, "Enables simulation of viking card with specified card number.");
     PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "Per viking format, the card number is 8 digit hex number.  Larger values are truncated.");
@@ -40,8 +38,7 @@ int usage_lf_viking_sim(void)
 }
 
 // calc checksum
-uint64_t getVikingBits(uint32_t id)
-{
+uint64_t getVikingBits(uint32_t id) {
     uint8_t checksum = ((id >> 24) & 0xFF) ^ ((id >> 16) & 0xFF) ^ ((id >> 8) & 0xFF) ^ (id & 0xFF) ^ 0xF2 ^ 0xA8;
     uint64_t ret = (uint64_t)0xF2 << 56;
     ret |= (uint64_t)id << 8;
@@ -50,8 +47,7 @@ uint64_t getVikingBits(uint32_t id)
 }
 // by marshmellow
 // find viking preamble 0xF200 in already demoded data
-int detectViking(uint8_t *dest, size_t *size)
-{
+int detectViking(uint8_t *dest, size_t *size) {
     //make sure buffer has data
     if (*size < 64 * 2) return -2;
     size_t startIdx = 0;
@@ -75,8 +71,7 @@ int detectViking(uint8_t *dest, size_t *size)
 
 //by marshmellow
 //see ASKDemod for what args are accepted
-int CmdVikingDemod(const char *Cmd)
-{
+int CmdVikingDemod(const char *Cmd) {
     if (!ASKDemod(Cmd, false, false, 1)) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - Viking ASKDemod failed");
         return 0;
@@ -102,14 +97,12 @@ int CmdVikingDemod(const char *Cmd)
 
 //by marshmellow
 //see ASKDemod for what args are accepted
-int CmdVikingRead(const char *Cmd)
-{
+int CmdVikingRead(const char *Cmd) {
     lf_read(true, 10000);
     return CmdVikingDemod(Cmd);
 }
 
-int CmdVikingClone(const char *Cmd)
-{
+int CmdVikingClone(const char *Cmd) {
     uint32_t id = 0;
     uint64_t rawID = 0;
     bool Q5 = false;
@@ -138,8 +131,7 @@ int CmdVikingClone(const char *Cmd)
     return 0;
 }
 
-int CmdVikingSim(const char *Cmd)
-{
+int CmdVikingSim(const char *Cmd) {
     uint32_t id = 0;
     uint64_t rawID = 0;
     uint8_t clk = 32, encoding = 1, separator = 0, invert = 0;
@@ -175,15 +167,13 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFViking(const char *Cmd)
-{
+int CmdLFViking(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfvisa2000.c b/client/cmdlfvisa2000.c
index a2b229592..82bf491c2 100644
--- a/client/cmdlfvisa2000.c
+++ b/client/cmdlfvisa2000.c
@@ -15,8 +15,7 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_lf_visa2k_clone(void)
-{
+int usage_lf_visa2k_clone(void) {
     PrintAndLogEx(NORMAL, "clone a Visa2000 tag to a T55x7 tag.");
     PrintAndLogEx(NORMAL, "Usage: lf visa2000 clone [h] <card ID> <Q5>");
     PrintAndLogEx(NORMAL, "Options:");
@@ -29,8 +28,7 @@ int usage_lf_visa2k_clone(void)
     return 0;
 }
 
-int usage_lf_visa2k_sim(void)
-{
+int usage_lf_visa2k_sim(void) {
     PrintAndLogEx(NORMAL, "Enables simulation of visa2k card with specified card number.");
     PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "");
@@ -44,16 +42,14 @@ int usage_lf_visa2k_sim(void)
     return 0;
 }
 
-static uint8_t visa_chksum(uint32_t id)
-{
+static uint8_t visa_chksum(uint32_t id) {
     uint8_t sum = 0;
     for (uint8_t i = 0; i < 32; i += 4)
         sum ^= (id >> i) & 0xF;
     return sum & 0xF;
 }
 
-static uint8_t visa_parity(uint32_t id)
-{
+static uint8_t visa_parity(uint32_t id) {
     // 4bit parity LUT
     uint8_t par_lut[] = {
         0, 1, 1, 0
@@ -75,8 +71,7 @@ static uint8_t visa_parity(uint32_t id)
 
 // by iceman
 // find Visa2000 preamble in already demoded data
-int detectVisa2k(uint8_t *dest, size_t *size)
-{
+int detectVisa2k(uint8_t *dest, size_t *size) {
     if (*size < 96) return -1; //make sure buffer has data
     size_t startIdx = 0;
     uint8_t preamble[] = {0, 1, 0, 1, 0, 1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 0};
@@ -99,8 +94,7 @@ int detectVisa2k(uint8_t *dest, size_t *size)
 *
 **/
 //see ASKDemod for what args are accepted
-int CmdVisa2kDemod(const char *Cmd)
-{
+int CmdVisa2kDemod(const char *Cmd) {
 
     save_restoreGB(GRAPH_SAVE);
 
@@ -159,14 +153,12 @@ int CmdVisa2kDemod(const char *Cmd)
 }
 
 // 64*96*2=12288 samples just in case we just missed the first preamble we can still catch 2 of them
-int CmdVisa2kRead(const char *Cmd)
-{
+int CmdVisa2kRead(const char *Cmd) {
     lf_read(true, 20000);
     return CmdVisa2kDemod(Cmd);
 }
 
-int CmdVisa2kClone(const char *Cmd)
-{
+int CmdVisa2kClone(const char *Cmd) {
 
     uint64_t id = 0;
     uint32_t blocks[4] = {T55x7_MODULATION_MANCHESTER | T55x7_BITRATE_RF_64 | T55x7_ST_TERMINATOR | 3 << T55x7_MAXBLOCK_SHIFT, BL0CK1, 0};
@@ -202,8 +194,7 @@ int CmdVisa2kClone(const char *Cmd)
     return 0;
 }
 
-int CmdVisa2kSim(const char *Cmd)
-{
+int CmdVisa2kSim(const char *Cmd) {
 
     uint32_t id = 0;
     char cmdp = param_getchar(Cmd, 0);
@@ -240,15 +231,13 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFVisa2k(const char *Cmd)
-{
+int CmdLFVisa2k(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdmain.c b/client/cmdmain.c
index 911280955..608a0e668 100644
--- a/client/cmdmain.c
+++ b/client/cmdmain.c
@@ -38,13 +38,11 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-command_t *getTopLevelCommandTable()
-{
+command_t *getTopLevelCommandTable() {
     return CommandTable;
 }
 
-int CmdRem(const char *Cmd)
-{
+int CmdRem(const char *Cmd) {
     char buf[22];
 
     memset(buf, 0x00, sizeof(buf));
@@ -56,19 +54,16 @@ int CmdRem(const char *Cmd)
     return 0;
 }
 
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
 
-int CmdQuit(const char *Cmd)
-{
+int CmdQuit(const char *Cmd) {
     return 99;
 }
 
-int CmdRev(const char *Cmd)
-{
+int CmdRev(const char *Cmd) {
     CmdCrc(Cmd);
     return 0;
 }
@@ -77,7 +72,6 @@ int CmdRev(const char *Cmd)
 // Entry point into our code: called whenever the user types a command and
 // then presses Enter, which the full command line that they typed.
 //-----------------------------------------------------------------------------
-int CommandReceived(char *Cmd)
-{
+int CommandReceived(char *Cmd) {
     return CmdsParse(CommandTable, Cmd);
 }
\ No newline at end of file
diff --git a/client/cmdparser.c b/client/cmdparser.c
index af26c794b..a819cedcf 100644
--- a/client/cmdparser.c
+++ b/client/cmdparser.c
@@ -17,8 +17,7 @@
 #include "proxmark3.h"
 #include "comms.h"
 
-void CmdsHelp(const command_t Commands[])
-{
+void CmdsHelp(const command_t Commands[]) {
     if (Commands[0].Name == NULL) return;
     int i = 0;
     while (Commands[i].Name) {
@@ -28,8 +27,7 @@ void CmdsHelp(const command_t Commands[])
     }
 }
 
-int CmdsParse(const command_t Commands[], const char *Cmd)
-{
+int CmdsParse(const command_t Commands[], const char *Cmd) {
     // Help dump children
     if (strcmp(Cmd, "XX_internal_command_dump_XX") == 0) {
         dumpCommandsRecursive(Commands, 0);
@@ -78,8 +76,7 @@ int CmdsParse(const command_t Commands[], const char *Cmd)
 char pparent[512] = {0};
 char *parent = pparent;
 
-void dumpCommandsRecursive(const command_t cmds[], int markdown)
-{
+void dumpCommandsRecursive(const command_t cmds[], int markdown) {
     if (cmds[0].Name == NULL) return;
 
     int i = 0;
diff --git a/client/cmdscript.c b/client/cmdscript.c
index 33cf92506..2e2ec5f53 100644
--- a/client/cmdscript.c
+++ b/client/cmdscript.c
@@ -39,8 +39,7 @@
 
 static int CmdHelp(const char *Cmd);
 
-int str_ends_with(const char *str, const char *suffix)
-{
+int str_ends_with(const char *str, const char *suffix) {
 
     if (str == NULL || suffix == NULL)
         return 0;
@@ -57,8 +56,7 @@ int str_ends_with(const char *str, const char *suffix)
 /**
  * Utility to check the ending of a string (used to check file suffix)
  */
-bool endsWith(char *base, char *str)
-{
+bool endsWith(char *base, char *str) {
     int blen = strlen(base);
     int slen = strlen(str);
     return (blen >= slen) && (0 == strcmp(base + blen - slen, str));
@@ -69,8 +67,7 @@ bool endsWith(char *base, char *str)
 * generate a file listing of the script-directory for files
 * ending with .lua
 */
-int CmdScriptList(const char *Cmd)
-{
+int CmdScriptList(const char *Cmd) {
 
     char const *exedir = get_my_executable_directory();
     if (exedir == NULL)
@@ -104,8 +101,7 @@ int CmdScriptList(const char *Cmd)
  * @param argv
  * @return
  */
-int CmdScriptRun(const char *Cmd)
-{
+int CmdScriptRun(const char *Cmd) {
     // create new Lua state
     lua_State *lua_state;
     lua_state = luaL_newstate();
@@ -182,8 +178,7 @@ static command_t CommandTable[] = {
  * @param Cmd
  * @return
  */
-int CmdScript(const char *Cmd)
-{
+int CmdScript(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
@@ -195,8 +190,7 @@ int CmdScript(const char *Cmd)
  * @param Cmd
  * @return
  */
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
     PrintAndLogEx(NORMAL, "This is a feature to run Lua-scripts. You can place lua-scripts within the scripts/-folder. ");
     return 0;
 }
\ No newline at end of file
diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index 2908ab9c6..27b2afc39 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -12,8 +12,7 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_sm_raw(void)
-{
+int usage_sm_raw(void) {
     PrintAndLogEx(NORMAL, "Usage: sc raw [h|r|c] d <0A 0B 0C ... hex>");
     PrintAndLogEx(NORMAL, "       h          :  this help");
     PrintAndLogEx(NORMAL, "       r          :  do not read response");
@@ -31,8 +30,7 @@ int usage_sm_raw(void)
 
     return 0;
 }
-int usage_sm_reader(void)
-{
+int usage_sm_reader(void) {
     PrintAndLogEx(NORMAL, "Usage: sc reader [h|s]");
     PrintAndLogEx(NORMAL, "       h          :  this help");
     PrintAndLogEx(NORMAL, "       s          :  silent (no messages)");
@@ -41,8 +39,7 @@ int usage_sm_reader(void)
     PrintAndLogEx(NORMAL, "        sc reader");
     return 0;
 }
-int usage_sm_info(void)
-{
+int usage_sm_info(void) {
     PrintAndLogEx(NORMAL, "Usage: s info [h|s]");
     PrintAndLogEx(NORMAL, "       h          :  this help");
     PrintAndLogEx(NORMAL, "       s          :  silent (no messages)");
@@ -51,8 +48,7 @@ int usage_sm_info(void)
     PrintAndLogEx(NORMAL, "        sc info");
     return 0;
 }
-int usage_sm_upgrade(void)
-{
+int usage_sm_upgrade(void) {
     PrintAndLogEx(NORMAL, "Upgrade firmware");
     PrintAndLogEx(NORMAL, "Usage:  sc upgrade f <file name>");
     PrintAndLogEx(NORMAL, "       h               :  this help");
@@ -62,8 +58,7 @@ int usage_sm_upgrade(void)
     PrintAndLogEx(NORMAL, "        sc upgrade f myfile");
     return 0;
 }
-int usage_sm_setclock(void)
-{
+int usage_sm_setclock(void) {
     PrintAndLogEx(NORMAL, "Usage: sc setclock [h] c <clockspeed>");
     PrintAndLogEx(NORMAL, "       h          :  this help");
     PrintAndLogEx(NORMAL, "       c <>       :  clockspeed (0 = 16mhz, 1=8mhz, 2=4mhz) ");
@@ -72,8 +67,7 @@ int usage_sm_setclock(void)
     PrintAndLogEx(NORMAL, "        sc setclock c 2");
     return 0;
 }
-int usage_sm_brute(void)
-{
+int usage_sm_brute(void) {
     PrintAndLogEx(NORMAL, "Tries to bruteforce SFI, using a known list of AID's ");
     PrintAndLogEx(NORMAL, "Usage: sc brute [h]");
     PrintAndLogEx(NORMAL, "       h          :  this help");
@@ -85,8 +79,7 @@ int usage_sm_brute(void)
     return 0;
 }
 
-static int smart_loadjson(const char *preferredName, const char *suffix, json_t **root)
-{
+static int smart_loadjson(const char *preferredName, const char *suffix, json_t **root) {
 
     json_error_t error;
 
@@ -116,8 +109,7 @@ out:
     return retval;
 }
 
-uint8_t GetATRTA1(uint8_t *atr, size_t atrlen)
-{
+uint8_t GetATRTA1(uint8_t *atr, size_t atrlen) {
     if (atrlen > 2) {
         uint8_t T0 = atr[1];
         if (T0 & 0x10)
@@ -184,26 +176,22 @@ float FArray[] = {
     0     // b1111 RFU
 };
 
-int GetATRDi(uint8_t *atr, size_t atrlen)
-{
+int GetATRDi(uint8_t *atr, size_t atrlen) {
     uint8_t TA1 = GetATRTA1(atr, atrlen);
     return DiArray[TA1 & 0x0F];  // The 4 low-order bits of TA1 (4th MSbit to 1st LSbit) encode Di
 }
 
-int GetATRFi(uint8_t *atr, size_t atrlen)
-{
+int GetATRFi(uint8_t *atr, size_t atrlen) {
     uint8_t TA1 = GetATRTA1(atr, atrlen);
     return FiArray[TA1 >> 4];  // The 4 high-order bits of TA1 (8th MSbit to 5th LSbit) encode fmax and Fi
 }
 
-float GetATRF(uint8_t *atr, size_t atrlen)
-{
+float GetATRF(uint8_t *atr, size_t atrlen) {
     uint8_t TA1 = GetATRTA1(atr, atrlen);
     return FArray[TA1 >> 4];  // The 4 high-order bits of TA1 (8th MSbit to 5th LSbit) encode fmax and Fi
 }
 
-static int PrintATR(uint8_t *atr, size_t atrlen)
-{
+static int PrintATR(uint8_t *atr, size_t atrlen) {
 
     uint8_t T0 = atr[1];
     uint8_t K = T0 & 0x0F;
@@ -303,8 +291,7 @@ static int PrintATR(uint8_t *atr, size_t atrlen)
     return 0;
 }
 
-bool smart_select(bool silent, smart_card_atr_t *atr)
-{
+bool smart_select(bool silent, smart_card_atr_t *atr) {
     if (atr)
         memset(atr, 0, sizeof(smart_card_atr_t));
 
@@ -335,8 +322,7 @@ bool smart_select(bool silent, smart_card_atr_t *atr)
     return true;
 }
 
-static int smart_wait(uint8_t *data, bool silent)
-{
+static int smart_wait(uint8_t *data, bool silent) {
     UsbCommand resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         if (!silent) PrintAndLogEx(WARNING, "smart card response timeout");
@@ -358,8 +344,7 @@ static int smart_wait(uint8_t *data, bool silent)
     return len;
 }
 
-static int smart_responseEx(uint8_t *data, bool silent)
-{
+static int smart_responseEx(uint8_t *data, bool silent) {
 
     int datalen = smart_wait(data, silent);
     bool needGetData = false;
@@ -414,13 +399,11 @@ out:
     return datalen;
 }
 
-static int smart_response(uint8_t *data)
-{
+static int smart_response(uint8_t *data) {
     return smart_responseEx(data, false);
 }
 
-int CmdSmartRaw(const char *Cmd)
-{
+int CmdSmartRaw(const char *Cmd) {
 
     int hexlen = 0;
     bool active = false;
@@ -536,8 +519,7 @@ int CmdSmartRaw(const char *Cmd)
     return 0;
 }
 
-int ExchangeAPDUSC(uint8_t *datain, int datainlen, bool activateCard, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen)
-{
+int ExchangeAPDUSC(uint8_t *datain, int datainlen, bool activateCard, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
     *dataoutlen = 0;
 
     if (activateCard)
@@ -577,8 +559,7 @@ int ExchangeAPDUSC(uint8_t *datain, int datainlen, bool activateCard, bool leave
     return 0;
 }
 
-int CmdSmartUpgrade(const char *Cmd)
-{
+int CmdSmartUpgrade(const char *Cmd) {
 
     PrintAndLogEx(WARNING, "WARNING - Smartcard socket firmware upgrade.");
     PrintAndLogEx(WARNING, "A dangerous command, do wrong and you will brick the smart card socket");
@@ -686,8 +667,7 @@ int CmdSmartUpgrade(const char *Cmd)
     return 0;
 }
 
-int CmdSmartInfo(const char *Cmd)
-{
+int CmdSmartInfo(const char *Cmd) {
     uint8_t cmdp = 0;
     bool errors = false, silent = false;
 
@@ -762,8 +742,7 @@ int CmdSmartInfo(const char *Cmd)
     return 0;
 }
 
-int CmdSmartReader(const char *Cmd)
-{
+int CmdSmartReader(const char *Cmd) {
     uint8_t cmdp = 0;
     bool errors = false, silent = false;
 
@@ -806,8 +785,7 @@ int CmdSmartReader(const char *Cmd)
     return 0;
 }
 
-int CmdSmartSetClock(const char *Cmd)
-{
+int CmdSmartSetClock(const char *Cmd) {
     uint8_t cmdp = 0;
     bool errors = false;
     uint8_t clock = 0;
@@ -863,14 +841,12 @@ int CmdSmartSetClock(const char *Cmd)
     return 0;
 }
 
-int CmdSmartList(const char *Cmd)
-{
+int CmdSmartList(const char *Cmd) {
     CmdTraceList("7816");
     return 0;
 }
 
-static void smart_brute_prim()
-{
+static void smart_brute_prim() {
 
     uint8_t *buf = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
     if (!buf)
@@ -909,8 +885,7 @@ static void smart_brute_prim()
     free(buf);
 }
 
-static int smart_brute_sfi(bool decodeTLV)
-{
+static int smart_brute_sfi(bool decodeTLV) {
 
     uint8_t *buf = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
     if (!buf)
@@ -977,8 +952,7 @@ static int smart_brute_sfi(bool decodeTLV)
     return 0;
 }
 
-static void smart_brute_options(bool decodeTLV)
-{
+static void smart_brute_options(bool decodeTLV) {
 
     uint8_t *buf = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
     if (!buf)
@@ -1005,8 +979,7 @@ static void smart_brute_options(bool decodeTLV)
     free(buf);
 }
 
-int CmdSmartBruteforceSFI(const char *Cmd)
-{
+int CmdSmartBruteforceSFI(const char *Cmd) {
 
     uint8_t cmdp = 0;
     bool errors = false, decodeTLV = false; //, useT0 = false;
@@ -1162,15 +1135,13 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdSmartcard(const char *Cmd)
-{
+int CmdSmartcard(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdtrace.c b/client/cmdtrace.c
index 26836262c..77f85ce5c 100644
--- a/client/cmdtrace.c
+++ b/client/cmdtrace.c
@@ -15,8 +15,7 @@ static int CmdHelp(const char *Cmd);
 static uint8_t *trace;
 long traceLen = 0;
 
-int usage_trace_list()
-{
+int usage_trace_list() {
     PrintAndLogEx(NORMAL, "List protocol data in trace buffer.");
     PrintAndLogEx(NORMAL, "Usage:  trace list <protocol> [f][c| <0|1>");
     PrintAndLogEx(NORMAL, "    f      - show frame delay times as well");
@@ -43,16 +42,14 @@ int usage_trace_list()
     PrintAndLogEx(NORMAL, "        trace list iclass");
     return 0;
 }
-int usage_trace_load()
-{
+int usage_trace_load() {
     PrintAndLogEx(NORMAL, "Load protocol data from file to trace buffer.");
     PrintAndLogEx(NORMAL, "Usage:  trace load <filename>");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "        trace load mytracefile.bin");
     return 0;
 }
-int usage_trace_save()
-{
+int usage_trace_save() {
     PrintAndLogEx(NORMAL, "Save protocol data from trace buffer to file.");
     PrintAndLogEx(NORMAL, "Usage:  trace save <filename>");
     PrintAndLogEx(NORMAL, "Examples:");
@@ -60,20 +57,17 @@ int usage_trace_save()
     return 0;
 }
 
-bool is_last_record(uint16_t tracepos, uint8_t *trace, uint16_t traceLen)
-{
+bool is_last_record(uint16_t tracepos, uint8_t *trace, uint16_t traceLen) {
     return (tracepos + sizeof(uint32_t) + sizeof(uint16_t) + sizeof(uint16_t) >= traceLen);
 }
 
-bool next_record_is_response(uint16_t tracepos, uint8_t *trace)
-{
+bool next_record_is_response(uint16_t tracepos, uint8_t *trace) {
     uint16_t next_records_datalen = *((uint16_t *)(trace + tracepos + sizeof(uint32_t) + sizeof(uint16_t)));
     return (next_records_datalen & 0x8000);
 }
 
 bool merge_topaz_reader_frames(uint32_t timestamp, uint32_t *duration, uint16_t *tracepos, uint16_t traceLen,
-                               uint8_t *trace, uint8_t *frame, uint8_t *topaz_reader_command, uint16_t *data_len)
-{
+                               uint8_t *trace, uint8_t *frame, uint8_t *topaz_reader_command, uint16_t *data_len) {
 
 #define MAX_TOPAZ_READER_CMD_LEN 16
 
@@ -110,8 +104,7 @@ bool merge_topaz_reader_frames(uint32_t timestamp, uint32_t *duration, uint16_t
     return true;
 }
 
-uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, uint8_t protocol, bool showWaitCycles, bool markCRCBytes)
-{
+uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, uint8_t protocol, bool showWaitCycles, bool markCRCBytes) {
     // sanity check
     if (tracepos + sizeof(uint32_t) + sizeof(uint16_t) + sizeof(uint16_t) > traceLen) return traceLen;
 
@@ -197,10 +190,10 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
 
         uint8_t parityBits = parityBytes[j >> 3];
         if (protocol != LEGIC &&
-            protocol != ISO_14443B &&
-            protocol != ISO_7816_4 &&
-            (isResponse || protocol == ISO_14443A) &&
-            (oddparity8(frame[j]) != ((parityBits >> (7 - (j & 0x0007))) & 0x01))) {
+                protocol != ISO_14443B &&
+                protocol != ISO_7816_4 &&
+                (isResponse || protocol == ISO_14443A) &&
+                (oddparity8(frame[j]) != ((parityBits >> (7 - (j & 0x0007))) & 0x01))) {
 
             snprintf(line[j / 18] + ((j % 18) * 4), 110, "%02x! ", frame[j]);
         } else {
@@ -311,8 +304,7 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
     return tracepos;
 }
 
-void printFelica(uint16_t traceLen, uint8_t *trace)
-{
+void printFelica(uint16_t traceLen, uint8_t *trace) {
 
     PrintAndLogEx(NORMAL, "ISO18092 / FeliCa - Timings are not as accurate");
     PrintAndLogEx(NORMAL, "    Gap | Src | Data                            | CRC      | Annotation        |");
@@ -512,8 +504,7 @@ static int SanityOfflineCheck( bool useTraceBuffer ){
 }
 */
 
-int CmdTraceList(const char *Cmd)
-{
+int CmdTraceList(const char *Cmd) {
 
     clearCommandBuffer();
 
@@ -647,8 +638,7 @@ int CmdTraceList(const char *Cmd)
     return 0;
 }
 
-int CmdTraceLoad(const char *Cmd)
-{
+int CmdTraceLoad(const char *Cmd) {
 
     FILE *f = NULL;
     char filename[FILE_PATH_SIZE];
@@ -695,8 +685,7 @@ int CmdTraceLoad(const char *Cmd)
     return 0;
 }
 
-int CmdTraceSave(const char *Cmd)
-{
+int CmdTraceSave(const char *Cmd) {
 
     if (traceLen == 0) {
         PrintAndLogEx(WARNING, "trace is empty, exiting...");
@@ -720,15 +709,13 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdTrace(const char *Cmd)
-{
+int CmdTrace(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/comms.c b/client/comms.c
index e854362d8..de6394915 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -44,18 +44,15 @@ static pthread_mutex_t rxBufferMutex = PTHREAD_MUTEX_INITIALIZER;
 
 // These wrappers are required because it is not possible to access a static
 // global variable outside of the context of a single file.
-void SetOffline(bool value)
-{
+void SetOffline(bool value) {
     offline = value;
 }
 
-bool IsOffline()
-{
+bool IsOffline() {
     return offline;
 }
 
-void SendCommand(UsbCommand *c)
-{
+void SendCommand(UsbCommand *c) {
 
 #ifdef COMMS_DEBUG
     PrintAndLogEx(NORMAL, "Sending %d bytes | cmd %04x\n", sizeof(UsbCommand), c->cmd);
@@ -93,8 +90,7 @@ void SendCommand(UsbCommand *c)
  *  A better method could have been to have explicit command-ACKS, so we can know which ACK goes to which
  *  operation. Right now we'll just have to live with this.
  */
-void clearCommandBuffer()
-{
+void clearCommandBuffer() {
     //This is a very simple operation
     pthread_mutex_lock(&rxBufferMutex);
     cmd_tail = cmd_head;
@@ -104,8 +100,7 @@ void clearCommandBuffer()
  * @brief storeCommand stores a USB command in a circular buffer
  * @param UC
  */
-static void storeCommand(UsbCommand *command)
-{
+static void storeCommand(UsbCommand *command) {
 
     pthread_mutex_lock(&rxBufferMutex);
     if ((cmd_head + 1) % CMD_BUFFER_SIZE == cmd_tail) {
@@ -127,8 +122,7 @@ static void storeCommand(UsbCommand *command)
  * @param response location to write command
  * @return 1 if response was returned, 0 if nothing has been received
  */
-static int getCommand(UsbCommand *response)
-{
+static int getCommand(UsbCommand *response) {
     pthread_mutex_lock(&rxBufferMutex);
     //If head == tail, there's nothing to read, or if we just got initialized
     if (cmd_head == cmd_tail)  {
@@ -151,8 +145,7 @@ static int getCommand(UsbCommand *response)
 // Entry point into our code: called whenever we received a packet over USB
 // that we weren't necessarily expecting, for example a debug print.
 //-----------------------------------------------------------------------------
-static void UsbCommandReceived(UsbCommand *c)
-{
+static void UsbCommandReceived(UsbCommand *c) {
 
     switch (c->cmd) {
         // First check if we are handling a debug message
@@ -231,8 +224,7 @@ void
 __attribute__((force_align_arg_pointer))
 #endif
 #endif
-*uart_communication(void *targ)
-{
+*uart_communication(void *targ) {
     communication_arg_t *conn = (communication_arg_t *)targ;
     size_t rxlen, totallen = 0;
     UsbCommand rx;
@@ -306,8 +298,7 @@ __attribute__((force_align_arg_pointer))
     return NULL;
 }
 
-bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode)
-{
+bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode) {
 
     char *portname = (char *)port;
     if (!wait_for_port) {
@@ -351,8 +342,7 @@ bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode)
     }
 }
 
-void CloseProxmark(void)
-{
+void CloseProxmark(void) {
     conn.run = false;
 
 
@@ -394,8 +384,7 @@ void CloseProxmark(void)
  * @param show_warning display message after 3 seconds
  * @return true if command was returned, otherwise false
  */
-bool WaitForResponseTimeoutW(uint32_t cmd, UsbCommand *response, size_t ms_timeout, bool show_warning)
-{
+bool WaitForResponseTimeoutW(uint32_t cmd, UsbCommand *response, size_t ms_timeout, bool show_warning) {
 
     UsbCommand resp;
 
@@ -425,13 +414,11 @@ bool WaitForResponseTimeoutW(uint32_t cmd, UsbCommand *response, size_t ms_timeo
     return false;
 }
 
-bool WaitForResponseTimeout(uint32_t cmd, UsbCommand *response, size_t ms_timeout)
-{
+bool WaitForResponseTimeout(uint32_t cmd, UsbCommand *response, size_t ms_timeout) {
     return WaitForResponseTimeoutW(cmd, response, ms_timeout, true);
 }
 
-bool WaitForResponse(uint32_t cmd, UsbCommand *response)
-{
+bool WaitForResponse(uint32_t cmd, UsbCommand *response) {
     return WaitForResponseTimeoutW(cmd, response, -1, true);
 }
 
@@ -448,8 +435,7 @@ bool WaitForResponse(uint32_t cmd, UsbCommand *response)
 * @param show_warning display message after 2 seconds
 * @return true if command was returned, otherwise false
 */
-bool GetFromDevice(DeviceMemType_t memtype, uint8_t *dest, uint32_t bytes, uint32_t start_index, UsbCommand *response, size_t ms_timeout, bool show_warning)
-{
+bool GetFromDevice(DeviceMemType_t memtype, uint8_t *dest, uint32_t bytes, uint32_t start_index, UsbCommand *response, size_t ms_timeout, bool show_warning) {
 
     if (dest == NULL) return false;
     if (bytes == 0) return true;
@@ -487,8 +473,7 @@ bool GetFromDevice(DeviceMemType_t memtype, uint8_t *dest, uint32_t bytes, uint3
     return false;
 }
 
-bool dl_it(uint8_t *dest, uint32_t bytes, uint32_t start_index, UsbCommand *response, size_t ms_timeout, bool show_warning, uint32_t rec_cmd)
-{
+bool dl_it(uint8_t *dest, uint32_t bytes, uint32_t start_index, UsbCommand *response, size_t ms_timeout, bool show_warning, uint32_t rec_cmd) {
 
     uint32_t bytes_completed = 0;
     uint64_t start_time = msclock();
diff --git a/client/crypto/asn1dump.c b/client/crypto/asn1dump.c
index 5c2cd5d08..b62d83cbc 100644
--- a/client/crypto/asn1dump.c
+++ b/client/crypto/asn1dump.c
@@ -87,29 +87,25 @@ static const struct asn1_tag asn1_tags[] = {
     { 0xa5, "[5]" },
 };
 
-static int asn1_sort_tag(tlv_tag_t tag)
-{
+static int asn1_sort_tag(tlv_tag_t tag) {
     return (int)(tag >= 0x100 ? tag : tag << 8);
 }
 
-static int asn1_tlv_compare(const void *a, const void *b)
-{
+static int asn1_tlv_compare(const void *a, const void *b) {
     const struct tlv *tlv = a;
     const struct asn1_tag *tag = b;
 
     return asn1_sort_tag(tlv->tag) - (asn1_sort_tag(tag->tag));
 }
 
-static const struct asn1_tag *asn1_get_tag(const struct tlv *tlv)
-{
+static const struct asn1_tag *asn1_get_tag(const struct tlv *tlv) {
     struct asn1_tag *tag = bsearch(tlv, asn1_tags, sizeof(asn1_tags) / sizeof(asn1_tags[0]),
                                    sizeof(asn1_tags[0]), asn1_tlv_compare);
 
     return tag ? tag : &asn1_tags[0];
 }
 
-static void asn1_tag_dump_str_time(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level, bool longyear, bool *needdump)
-{
+static void asn1_tag_dump_str_time(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level, bool longyear, bool *needdump) {
     int len = tlv->len;
     *needdump = false;
 
@@ -161,15 +157,13 @@ static void asn1_tag_dump_str_time(const struct tlv *tlv, const struct asn1_tag
     }
 }
 
-static void asn1_tag_dump_string(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level)
-{
+static void asn1_tag_dump_string(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level) {
     fprintf(f, "\tvalue: '");
     fwrite(tlv->value, 1, tlv->len, f);
     fprintf(f, "'\n");
 }
 
-static void asn1_tag_dump_octet_string(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level, bool *needdump)
-{
+static void asn1_tag_dump_octet_string(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level, bool *needdump) {
     *needdump = false;
     for (int i = 0; i < tlv->len; i++)
         if (!isspace(tlv->value[i]) && !isprint(tlv->value[i])) {
@@ -185,8 +179,7 @@ static void asn1_tag_dump_octet_string(const struct tlv *tlv, const struct asn1_
     }
 }
 
-static unsigned long asn1_value_integer(const struct tlv *tlv, unsigned start, unsigned end)
-{
+static unsigned long asn1_value_integer(const struct tlv *tlv, unsigned start, unsigned end) {
     unsigned long ret = 0;
     int i;
 
@@ -216,8 +209,7 @@ static unsigned long asn1_value_integer(const struct tlv *tlv, unsigned start, u
     return ret;
 }
 
-static void asn1_tag_dump_boolean(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level)
-{
+static void asn1_tag_dump_boolean(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level) {
     PRINT_INDENT(level);
     if (tlv->len > 0) {
         fprintf(f, "\tvalue: %s\n", tlv->value[0] ? "true" : "false");
@@ -226,8 +218,7 @@ static void asn1_tag_dump_boolean(const struct tlv *tlv, const struct asn1_tag *
     }
 }
 
-static void asn1_tag_dump_integer(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level)
-{
+static void asn1_tag_dump_integer(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level) {
     PRINT_INDENT(level);
     if (tlv->len == 4) {
         int32_t val = 0;
@@ -239,8 +230,7 @@ static void asn1_tag_dump_integer(const struct tlv *tlv, const struct asn1_tag *
     fprintf(f, "\tvalue: %lu\n", asn1_value_integer(tlv, 0, tlv->len * 2));
 }
 
-static char *asn1_oid_description(const char *oid, bool with_group_desc)
-{
+static char *asn1_oid_description(const char *oid, bool with_group_desc) {
     json_error_t error;
     json_t *root = NULL;
     char fname[300] = {0};
@@ -291,8 +281,7 @@ error:
     return NULL;
 }
 
-static void asn1_tag_dump_object_id(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level)
-{
+static void asn1_tag_dump_object_id(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level) {
     PRINT_INDENT(level);
     mbedtls_asn1_buf asn1_buf;
     asn1_buf.len = tlv->len;
@@ -325,8 +314,7 @@ static void asn1_tag_dump_object_id(const struct tlv *tlv, const struct asn1_tag
     fprintf(f, "\n");
 }
 
-bool asn1_tag_dump(const struct tlv *tlv, FILE *f, int level, bool *candump)
-{
+bool asn1_tag_dump(const struct tlv *tlv, FILE *f, int level, bool *candump) {
     if (!tlv) {
         fprintf(f, "NULL\n");
         return false;
diff --git a/client/crypto/asn1utils.c b/client/crypto/asn1utils.c
index aa10f707a..50d257d7e 100644
--- a/client/crypto/asn1utils.c
+++ b/client/crypto/asn1utils.c
@@ -17,8 +17,7 @@
 #include "asn1dump.h"
 #include "util.h"
 
-int ecdsa_asn1_get_signature(uint8_t *signature, size_t signaturelen, uint8_t *rval, uint8_t *sval)
-{
+int ecdsa_asn1_get_signature(uint8_t *signature, size_t signaturelen, uint8_t *rval, uint8_t *sval) {
     if (!signature || !signaturelen || !rval || !sval)
         return 1;
 
@@ -62,8 +61,7 @@ exit:
     return res;
 }
 
-static bool print_cb(void *data, const struct tlv *tlv, int level, bool is_leaf)
-{
+static bool print_cb(void *data, const struct tlv *tlv, int level, bool is_leaf) {
     bool candump = true;
     asn1_tag_dump(tlv, stdout, level, &candump);
     if (is_leaf && candump) {
@@ -73,8 +71,7 @@ static bool print_cb(void *data, const struct tlv *tlv, int level, bool is_leaf)
     return true;
 }
 
-int asn1_print(uint8_t *asn1buf, size_t asn1buflen, char *indent)
-{
+int asn1_print(uint8_t *asn1buf, size_t asn1buflen, char *indent) {
 
     struct tlvdb *t = NULL;
     t = tlvdb_parse_multi(asn1buf, asn1buflen);
diff --git a/client/crypto/libpcrypto.c b/client/crypto/libpcrypto.c
index 27b998303..883de0dbb 100644
--- a/client/crypto/libpcrypto.c
+++ b/client/crypto/libpcrypto.c
@@ -26,8 +26,7 @@
 #include <util.h>
 
 // NIST Special Publication 800-38A — Recommendation for block cipher modes of operation: methods and techniques, 2001.
-int aes_encode(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *output, int length)
-{
+int aes_encode(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *output, int length) {
     uint8_t iiv[16] = {0};
     if (iv)
         memcpy(iiv, iv, 16);
@@ -43,8 +42,7 @@ int aes_encode(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *output, int l
     return 0;
 }
 
-int aes_decode(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *output, int length)
-{
+int aes_decode(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *output, int length) {
     uint8_t iiv[16] = {0};
     if (iv)
         memcpy(iiv, iv, 16);
@@ -62,16 +60,14 @@ int aes_decode(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *output, int l
 
 // NIST Special Publication 800-38B — Recommendation for block cipher modes of operation: The CMAC mode for authentication.
 // https://csrc.nist.gov/CSRC/media/Projects/Cryptographic-Standards-and-Guidelines/documents/examples/AES_CMAC.pdf
-int aes_cmac(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *mac, int length)
-{
+int aes_cmac(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *mac, int length) {
     memset(mac, 0x00, 16);
 
     //  NIST 800-38B
     return mbedtls_aes_cmac_prf_128(key, MBEDTLS_AES_BLOCK_SIZE, input, length, mac);
 }
 
-int aes_cmac8(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *mac, int length)
-{
+int aes_cmac8(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *mac, int length) {
     uint8_t cmac[16] = {0};
     memset(mac, 0x00, 8);
 
@@ -86,8 +82,7 @@ int aes_cmac8(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *mac, int lengt
 }
 
 static uint8_t fixed_rand_value[250] = {0};
-static int fixed_rand(void *rng_state, unsigned char *output, size_t len)
-{
+static int fixed_rand(void *rng_state, unsigned char *output, size_t len) {
     if (len <= 250) {
         memcpy(output, fixed_rand_value, len);
     } else {
@@ -97,8 +92,7 @@ static int fixed_rand(void *rng_state, unsigned char *output, size_t len)
     return 0;
 }
 
-int sha256hash(uint8_t *input, int length, uint8_t *hash)
-{
+int sha256hash(uint8_t *input, int length, uint8_t *hash) {
     if (!hash || !input)
         return 1;
 
@@ -112,8 +106,7 @@ int sha256hash(uint8_t *input, int length, uint8_t *hash)
     return 0;
 }
 
-int ecdsa_init_str(mbedtls_ecdsa_context *ctx, char *key_d, char *key_x, char *key_y)
-{
+int ecdsa_init_str(mbedtls_ecdsa_context *ctx, char *key_d, char *key_x, char *key_y) {
     if (!ctx)
         return 1;
 
@@ -139,8 +132,7 @@ int ecdsa_init_str(mbedtls_ecdsa_context *ctx, char *key_d, char *key_x, char *k
     return 0;
 }
 
-int ecdsa_init(mbedtls_ecdsa_context *ctx, uint8_t *key_d, uint8_t *key_xy)
-{
+int ecdsa_init(mbedtls_ecdsa_context *ctx, uint8_t *key_d, uint8_t *key_xy) {
     if (!ctx)
         return 1;
 
@@ -166,8 +158,7 @@ int ecdsa_init(mbedtls_ecdsa_context *ctx, uint8_t *key_d, uint8_t *key_xy)
     return 0;
 }
 
-int ecdsa_key_create(uint8_t *key_d, uint8_t *key_xy)
-{
+int ecdsa_key_create(uint8_t *key_d, uint8_t *key_xy) {
     int res;
     mbedtls_ecdsa_context ctx;
     ecdsa_init(&ctx, NULL, NULL);
@@ -211,16 +202,14 @@ exit:
     return res;
 }
 
-char *ecdsa_get_error(int ret)
-{
+char *ecdsa_get_error(int ret) {
     static char retstr[300];
     memset(retstr, 0x00, sizeof(retstr));
     mbedtls_strerror(ret, retstr, sizeof(retstr));
     return retstr;
 }
 
-int ecdsa_public_key_from_pk(mbedtls_pk_context *pk, uint8_t *key, size_t keylen)
-{
+int ecdsa_public_key_from_pk(mbedtls_pk_context *pk, uint8_t *key, size_t keylen) {
     int res = 0;
     size_t realkeylen = 0;
     if (keylen < 65)
@@ -245,8 +234,7 @@ exit:
     return res;
 }
 
-int ecdsa_signature_create(uint8_t *key_d, uint8_t *key_xy, uint8_t *input, int length, uint8_t *signature, size_t *signaturelen)
-{
+int ecdsa_signature_create(uint8_t *key_d, uint8_t *key_xy, uint8_t *input, int length, uint8_t *signature, size_t *signaturelen) {
     int res;
     *signaturelen = 0;
 
@@ -276,8 +264,7 @@ exit:
     return res;
 }
 
-int ecdsa_signature_create_test(char *key_d, char *key_x, char *key_y, char *random, uint8_t *input, int length, uint8_t *signature, size_t *signaturelen)
-{
+int ecdsa_signature_create_test(char *key_d, char *key_x, char *key_y, char *random, uint8_t *input, int length, uint8_t *signature, size_t *signaturelen) {
     int res;
     *signaturelen = 0;
 
@@ -297,8 +284,7 @@ int ecdsa_signature_create_test(char *key_d, char *key_x, char *key_y, char *ran
     return res;
 }
 
-int ecdsa_signature_verify_keystr(char *key_x, char *key_y, uint8_t *input, int length, uint8_t *signature, size_t signaturelen)
-{
+int ecdsa_signature_verify_keystr(char *key_x, char *key_y, uint8_t *input, int length, uint8_t *signature, size_t signaturelen) {
     int res;
     uint8_t shahash[32] = {0};
     res = sha256hash(input, length, shahash);
@@ -313,8 +299,7 @@ int ecdsa_signature_verify_keystr(char *key_x, char *key_y, uint8_t *input, int
     return res;
 }
 
-int ecdsa_signature_verify(uint8_t *key_xy, uint8_t *input, int length, uint8_t *signature, size_t signaturelen)
-{
+int ecdsa_signature_verify(uint8_t *key_xy, uint8_t *input, int length, uint8_t *signature, size_t signaturelen) {
     int res;
     uint8_t shahash[32] = {0};
     res = sha256hash(input, length, shahash);
@@ -336,8 +321,7 @@ int ecdsa_signature_verify(uint8_t *key_xy, uint8_t *input, int length, uint8_t
 #define T_R           "2B42F576D07F4165FF65D1F3B1500F81E44C316F1F0B3EF57325B69ACA46104F"
 #define T_S           "DC42C2122D6392CD3E3A993A89502A8198C1886FE69D262C4B329BDB6B63FAF1"
 
-int ecdsa_nist_test(bool verbose)
-{
+int ecdsa_nist_test(bool verbose) {
     int res;
     uint8_t input[] = "Example of ECDSA with P-256";
     int length = strlen((char *)input);
diff --git a/client/emv/apduinfo.c b/client/emv/apduinfo.c
index 461d5551c..23da3e1a2 100644
--- a/client/emv/apduinfo.c
+++ b/client/emv/apduinfo.c
@@ -259,8 +259,7 @@ const APDUCode APDUCodeTable[] = {
 };
 const size_t APDUCodeTableLen = sizeof(APDUCodeTable) / sizeof(APDUCode);
 
-int CodeCmp(const char *code1, const char *code2)
-{
+int CodeCmp(const char *code1, const char *code2) {
     int xsymb = 0;
     int cmp = 0;
     for (int i = 0; i < 4; i++) {
@@ -278,8 +277,7 @@ int CodeCmp(const char *code1, const char *code2)
     return -1;
 }
 
-const APDUCode *const GetAPDUCode(uint8_t sw1, uint8_t sw2)
-{
+const APDUCode *const GetAPDUCode(uint8_t sw1, uint8_t sw2) {
     char buf[6] = {0};
     int res;
     int mineq = APDUCodeTableLen;
@@ -310,8 +308,7 @@ const APDUCode *const GetAPDUCode(uint8_t sw1, uint8_t sw2)
     return NULL;
 }
 
-const char *GetAPDUCodeDescription(uint8_t sw1, uint8_t sw2)
-{
+const char *GetAPDUCodeDescription(uint8_t sw1, uint8_t sw2) {
     const APDUCode *cd = GetAPDUCode(sw1, sw2);
     if (cd)
         return cd->Description;
diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index 760aae577..31886cf75 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -20,8 +20,7 @@
 static int CmdHelp(const char *Cmd);
 
 #define TLV_ADD(tag, value)( tlvdb_change_or_add_node(tlvRoot, tag, sizeof(value) - 1, (const unsigned char *)value) )
-void ParamLoadDefaults(struct tlvdb *tlvRoot)
-{
+void ParamLoadDefaults(struct tlvdb *tlvRoot) {
     //9F02:(Amount, authorized (Numeric)) len:6
     TLV_ADD(0x9F02, "\x00\x00\x00\x00\x01\x00");
     //9F1A:(Terminal Country Code) len:2
@@ -44,8 +43,7 @@ void ParamLoadDefaults(struct tlvdb *tlvRoot)
     TLV_ADD(0x95,   "\x00\x00\x00\x00\x00");
 }
 
-void PrintChannel(EMVCommandChannel channel)
-{
+void PrintChannel(EMVCommandChannel channel) {
     switch (channel) {
         case ECC_CONTACTLESS:
             PrintAndLogEx(INFO, "Channel: CONTACTLESS");
@@ -56,8 +54,7 @@ void PrintChannel(EMVCommandChannel channel)
     }
 }
 
-int CmdEMVSelect(const char *cmd)
-{
+int CmdEMVSelect(const char *cmd) {
     uint8_t data[APDU_AID_LEN] = {0};
     int datalen = 0;
 
@@ -108,8 +105,7 @@ int CmdEMVSelect(const char *cmd)
     return 0;
 }
 
-int CmdEMVSearch(const char *cmd)
-{
+int CmdEMVSearch(const char *cmd) {
 
     CLIParserInit("emv search",
                   "Tries to select all applets from applet list:\n",
@@ -159,8 +155,7 @@ int CmdEMVSearch(const char *cmd)
     return 0;
 }
 
-int CmdEMVPPSE(const char *cmd)
-{
+int CmdEMVPPSE(const char *cmd) {
 
     CLIParserInit("emv pse",
                   "Executes PSE/PPSE select command. It returns list of applet on the card:\n",
@@ -215,8 +210,7 @@ int CmdEMVPPSE(const char *cmd)
     return 0;
 }
 
-int CmdEMVGPO(const char *cmd)
-{
+int CmdEMVGPO(const char *cmd) {
     uint8_t data[APDU_RES_LEN] = {0};
     int datalen = 0;
 
@@ -322,8 +316,7 @@ int CmdEMVGPO(const char *cmd)
     return 0;
 }
 
-int CmdEMVReadRecord(const char *cmd)
-{
+int CmdEMVReadRecord(const char *cmd) {
     uint8_t data[APDU_RES_LEN] = {0};
     int datalen = 0;
 
@@ -378,8 +371,7 @@ int CmdEMVReadRecord(const char *cmd)
     return 0;
 }
 
-int CmdEMVAC(const char *cmd)
-{
+int CmdEMVAC(const char *cmd) {
     uint8_t data[APDU_RES_LEN] = {0};
     int datalen = 0;
 
@@ -500,8 +492,7 @@ int CmdEMVAC(const char *cmd)
     return 0;
 }
 
-int CmdEMVGenerateChallenge(const char *cmd)
-{
+int CmdEMVGenerateChallenge(const char *cmd) {
 
     CLIParserInit("emv challenge",
                   "Executes Generate Challenge command. It returns 4 or 8-byte random number from card.\nNeeds a EMV applet to be selected and GPO to be executed.",
@@ -546,8 +537,7 @@ int CmdEMVGenerateChallenge(const char *cmd)
     return 0;
 }
 
-int CmdEMVInternalAuthenticate(const char *cmd)
-{
+int CmdEMVInternalAuthenticate(const char *cmd) {
     uint8_t data[APDU_RES_LEN] = {0};
     int datalen = 0;
 
@@ -651,8 +641,7 @@ int CmdEMVInternalAuthenticate(const char *cmd)
 
 #define dreturn(n) {free(pdol_data_tlv); tlvdb_free(tlvSelect); tlvdb_free(tlvRoot); DropFieldEx( channel ); return n;}
 
-void InitTransactionParameters(struct tlvdb *tlvRoot, bool paramLoadJSON, enum TransactionType TrType, bool GenACGPO)
-{
+void InitTransactionParameters(struct tlvdb *tlvRoot, bool paramLoadJSON, enum TransactionType TrType, bool GenACGPO) {
 
     ParamLoadDefaults(tlvRoot);
 
@@ -685,8 +674,7 @@ void InitTransactionParameters(struct tlvdb *tlvRoot, bool paramLoadJSON, enum T
     }
 }
 
-void ProcessGPOResponseFormat1(struct tlvdb *tlvRoot, uint8_t *buf, size_t len, bool decodeTLV)
-{
+void ProcessGPOResponseFormat1(struct tlvdb *tlvRoot, uint8_t *buf, size_t len, bool decodeTLV) {
     if (buf[0] == 0x80) {
         if (decodeTLV) {
             PrintAndLog("GPO response format1:");
@@ -716,8 +704,7 @@ void ProcessGPOResponseFormat1(struct tlvdb *tlvRoot, uint8_t *buf, size_t len,
     }
 }
 
-void ProcessACResponseFormat1(struct tlvdb *tlvRoot, uint8_t *buf, size_t len, bool decodeTLV)
-{
+void ProcessACResponseFormat1(struct tlvdb *tlvRoot, uint8_t *buf, size_t len, bool decodeTLV) {
     if (buf[0] == 0x80) {
         if (decodeTLV) {
             PrintAndLog("GPO response format1:");
@@ -761,8 +748,7 @@ void ProcessACResponseFormat1(struct tlvdb *tlvRoot, uint8_t *buf, size_t len, b
     }
 }
 
-int CmdEMVExec(const char *cmd)
-{
+int CmdEMVExec(const char *cmd) {
     uint8_t buf[APDU_RES_LEN] = {0};
     size_t len = 0;
     uint16_t sw = 0;
@@ -1359,8 +1345,7 @@ int CmdEMVExec(const char *cmd)
     return 0;
 }
 
-int CmdEMVScan(const char *cmd)
-{
+int CmdEMVScan(const char *cmd) {
     uint8_t AID[APDU_AID_LEN] = {0};
     size_t AIDlen = 0;
     uint8_t buf[APDU_RES_LEN] = {0};
@@ -1713,18 +1698,15 @@ int CmdEMVScan(const char *cmd)
     return 0;
 }
 
-int CmdEMVList(const char *Cmd)
-{
+int CmdEMVList(const char *Cmd) {
     return CmdTraceList("7816");
 }
 
-int CmdEMVTest(const char *cmd)
-{
+int CmdEMVTest(const char *cmd) {
     return ExecuteCryptoTests(true);
 }
 
-int CmdEMVRoca(const char *cmd)
-{
+int CmdEMVRoca(const char *cmd) {
     uint8_t AID[APDU_AID_LEN] = {0};
     size_t AIDlen = 0;
     uint8_t buf[APDU_RES_LEN] = {0};
@@ -1980,15 +1962,13 @@ static command_t CommandTable[] =  {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdEMV(const char *Cmd)
-{
+int CmdEMV(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/emv/crypto.c b/client/emv/crypto.c
index 45d3891e8..ccf668477 100644
--- a/client/emv/crypto.c
+++ b/client/emv/crypto.c
@@ -24,8 +24,7 @@
 
 static struct crypto_backend *crypto_backend;
 
-static bool crypto_init(void)
-{
+static bool crypto_init(void) {
     if (crypto_backend)
         return true;
 
@@ -37,8 +36,7 @@ static bool crypto_init(void)
     return true;
 }
 
-struct crypto_hash *crypto_hash_open(enum crypto_algo_hash hash)
-{
+struct crypto_hash *crypto_hash_open(enum crypto_algo_hash hash) {
     struct crypto_hash *ch;
 
     if (!crypto_init())
@@ -51,28 +49,23 @@ struct crypto_hash *crypto_hash_open(enum crypto_algo_hash hash)
     return ch;
 }
 
-void crypto_hash_close(struct crypto_hash *ch)
-{
+void crypto_hash_close(struct crypto_hash *ch) {
     ch->close(ch);
 }
 
-void crypto_hash_write(struct crypto_hash *ch, const unsigned char *buf, size_t len)
-{
+void crypto_hash_write(struct crypto_hash *ch, const unsigned char *buf, size_t len) {
     ch->write(ch, buf, len);
 }
 
-unsigned char *crypto_hash_read(struct crypto_hash *ch)
-{
+unsigned char *crypto_hash_read(struct crypto_hash *ch) {
     return ch->read(ch);
 }
 
-size_t crypto_hash_get_size(const struct crypto_hash *ch)
-{
+size_t crypto_hash_get_size(const struct crypto_hash *ch) {
     return ch->get_size(ch);
 }
 
-struct crypto_pk *crypto_pk_open(enum crypto_algo_pk pk, ...)
-{
+struct crypto_pk *crypto_pk_open(enum crypto_algo_pk pk, ...) {
     struct crypto_pk *cp;
     va_list vl;
 
@@ -89,8 +82,7 @@ struct crypto_pk *crypto_pk_open(enum crypto_algo_pk pk, ...)
     return cp;
 }
 
-struct crypto_pk *crypto_pk_open_priv(enum crypto_algo_pk pk, ...)
-{
+struct crypto_pk *crypto_pk_open_priv(enum crypto_algo_pk pk, ...) {
     struct crypto_pk *cp;
     va_list vl;
 
@@ -110,8 +102,7 @@ struct crypto_pk *crypto_pk_open_priv(enum crypto_algo_pk pk, ...)
     return cp;
 }
 
-struct crypto_pk *crypto_pk_genkey(enum crypto_algo_pk pk, ...)
-{
+struct crypto_pk *crypto_pk_genkey(enum crypto_algo_pk pk, ...) {
     struct crypto_pk *cp;
     va_list vl;
 
@@ -131,18 +122,15 @@ struct crypto_pk *crypto_pk_genkey(enum crypto_algo_pk pk, ...)
     return cp;
 }
 
-void crypto_pk_close(struct crypto_pk *cp)
-{
+void crypto_pk_close(struct crypto_pk *cp) {
     cp->close(cp);
 }
 
-unsigned char *crypto_pk_encrypt(const struct crypto_pk *cp, const unsigned char *buf, size_t len, size_t *clen)
-{
+unsigned char *crypto_pk_encrypt(const struct crypto_pk *cp, const unsigned char *buf, size_t len, size_t *clen) {
     return cp->encrypt(cp, buf, len, clen);
 }
 
-unsigned char *crypto_pk_decrypt(const struct crypto_pk *cp, const unsigned char *buf, size_t len, size_t *clen)
-{
+unsigned char *crypto_pk_decrypt(const struct crypto_pk *cp, const unsigned char *buf, size_t len, size_t *clen) {
     if (!cp->decrypt) {
         *clen = 0;
 
@@ -152,24 +140,21 @@ unsigned char *crypto_pk_decrypt(const struct crypto_pk *cp, const unsigned char
     return cp->decrypt(cp, buf, len, clen);
 }
 
-enum crypto_algo_pk crypto_pk_get_algo(const struct crypto_pk *cp)
-{
+enum crypto_algo_pk crypto_pk_get_algo(const struct crypto_pk *cp) {
     if (!cp)
         return PK_INVALID;
 
     return cp->algo;
 }
 
-size_t crypto_pk_get_nbits(const struct crypto_pk *cp)
-{
+size_t crypto_pk_get_nbits(const struct crypto_pk *cp) {
     if (!cp->get_nbits)
         return 0;
 
     return cp->get_nbits(cp);
 }
 
-unsigned char *crypto_pk_get_parameter(const struct crypto_pk *cp, unsigned param, size_t *plen)
-{
+unsigned char *crypto_pk_get_parameter(const struct crypto_pk *cp, unsigned param, size_t *plen) {
     *plen = 0;
 
     if (!cp->get_parameter)
diff --git a/client/emv/crypto_polarssl.c b/client/emv/crypto_polarssl.c
index 9a4e57e4f..da48f7fa7 100644
--- a/client/emv/crypto_polarssl.c
+++ b/client/emv/crypto_polarssl.c
@@ -34,22 +34,19 @@ struct crypto_hash_polarssl {
     mbedtls_sha1_context ctx;
 };
 
-static void crypto_hash_polarssl_close(struct crypto_hash *_ch)
-{
+static void crypto_hash_polarssl_close(struct crypto_hash *_ch) {
     struct crypto_hash_polarssl *ch = (struct crypto_hash_polarssl *)_ch;
 
     free(ch);
 }
 
-static void crypto_hash_polarssl_write(struct crypto_hash *_ch, const unsigned char *buf, size_t len)
-{
+static void crypto_hash_polarssl_write(struct crypto_hash *_ch, const unsigned char *buf, size_t len) {
     struct crypto_hash_polarssl *ch = (struct crypto_hash_polarssl *)_ch;
 
     mbedtls_sha1_update(&(ch->ctx), buf, len);
 }
 
-static unsigned char *crypto_hash_polarssl_read(struct crypto_hash *_ch)
-{
+static unsigned char *crypto_hash_polarssl_read(struct crypto_hash *_ch) {
     struct crypto_hash_polarssl *ch = (struct crypto_hash_polarssl *)_ch;
 
     static unsigned char sha1sum[20];
@@ -57,16 +54,14 @@ static unsigned char *crypto_hash_polarssl_read(struct crypto_hash *_ch)
     return sha1sum;
 }
 
-static size_t crypto_hash_polarssl_get_size(const struct crypto_hash *ch)
-{
+static size_t crypto_hash_polarssl_get_size(const struct crypto_hash *ch) {
     if (ch->algo == HASH_SHA_1)
         return 20;
     else
         return 0;
 }
 
-static struct crypto_hash *crypto_hash_polarssl_open(enum crypto_algo_hash hash)
-{
+static struct crypto_hash *crypto_hash_polarssl_open(enum crypto_algo_hash hash) {
     if (hash != HASH_SHA_1)
         return NULL;
 
@@ -87,8 +82,7 @@ struct crypto_pk_polarssl {
     mbedtls_rsa_context ctx;
 };
 
-static struct crypto_pk *crypto_pk_polarssl_open_rsa(va_list vl)
-{
+static struct crypto_pk *crypto_pk_polarssl_open_rsa(va_list vl) {
     struct crypto_pk_polarssl *cp = malloc(sizeof(*cp));
     memset(cp, 0x00, sizeof(*cp));
 
@@ -113,8 +107,7 @@ static struct crypto_pk *crypto_pk_polarssl_open_rsa(va_list vl)
     return &cp->cp;
 }
 
-static struct crypto_pk *crypto_pk_polarssl_open_priv_rsa(va_list vl)
-{
+static struct crypto_pk *crypto_pk_polarssl_open_priv_rsa(va_list vl) {
     struct crypto_pk_polarssl *cp = malloc(sizeof(*cp));
     memset(cp, 0x00, sizeof(*cp));
     char *mod = va_arg(vl, char *);
@@ -158,8 +151,7 @@ static struct crypto_pk *crypto_pk_polarssl_open_priv_rsa(va_list vl)
     return &cp->cp;
 }
 
-static int myrand(void *rng_state, unsigned char *output, size_t len)
-{
+static int myrand(void *rng_state, unsigned char *output, size_t len) {
     size_t i;
 
     if (rng_state != NULL)
@@ -172,8 +164,7 @@ static int myrand(void *rng_state, unsigned char *output, size_t len)
 }
 
 
-static struct crypto_pk *crypto_pk_polarssl_genkey_rsa(va_list vl)
-{
+static struct crypto_pk *crypto_pk_polarssl_genkey_rsa(va_list vl) {
     struct crypto_pk_polarssl *cp = malloc(sizeof(*cp));
     memset(cp, 0x00, sizeof(*cp));
 
@@ -194,16 +185,14 @@ static struct crypto_pk *crypto_pk_polarssl_genkey_rsa(va_list vl)
     return &cp->cp;
 }
 
-static void crypto_pk_polarssl_close(struct crypto_pk *_cp)
-{
+static void crypto_pk_polarssl_close(struct crypto_pk *_cp) {
     struct crypto_pk_polarssl *cp = (struct crypto_pk_polarssl *)_cp;
 
     mbedtls_rsa_free(&cp->ctx);
     free(cp);
 }
 
-static unsigned char *crypto_pk_polarssl_encrypt(const struct crypto_pk *_cp, const unsigned char *buf, size_t len, size_t *clen)
-{
+static unsigned char *crypto_pk_polarssl_encrypt(const struct crypto_pk *_cp, const unsigned char *buf, size_t len, size_t *clen) {
     struct crypto_pk_polarssl *cp = (struct crypto_pk_polarssl *)_cp;
     int res;
     unsigned char *result;
@@ -229,8 +218,7 @@ static unsigned char *crypto_pk_polarssl_encrypt(const struct crypto_pk *_cp, co
     return result;
 }
 
-static unsigned char *crypto_pk_polarssl_decrypt(const struct crypto_pk *_cp, const unsigned char *buf, size_t len, size_t *clen)
-{
+static unsigned char *crypto_pk_polarssl_decrypt(const struct crypto_pk *_cp, const unsigned char *buf, size_t len, size_t *clen) {
     struct crypto_pk_polarssl *cp = (struct crypto_pk_polarssl *)_cp;
     int res;
     unsigned char *result;
@@ -256,16 +244,14 @@ static unsigned char *crypto_pk_polarssl_decrypt(const struct crypto_pk *_cp, co
     return result;
 }
 
-static size_t crypto_pk_polarssl_get_nbits(const struct crypto_pk *_cp)
-{
+static size_t crypto_pk_polarssl_get_nbits(const struct crypto_pk *_cp) {
     struct crypto_pk_polarssl *cp = (struct crypto_pk_polarssl *)_cp;
 
     return cp->ctx.len * 8;
     return 0;
 }
 
-static unsigned char *crypto_pk_polarssl_get_parameter(const struct crypto_pk *_cp, unsigned param, size_t *plen)
-{
+static unsigned char *crypto_pk_polarssl_get_parameter(const struct crypto_pk *_cp, unsigned param, size_t *plen) {
     struct crypto_pk_polarssl *cp = (struct crypto_pk_polarssl *)_cp;
     unsigned char *result = NULL;
     switch (param) {
@@ -291,8 +277,7 @@ static unsigned char *crypto_pk_polarssl_get_parameter(const struct crypto_pk *_
     return result;
 }
 
-static struct crypto_pk *crypto_pk_polarssl_open(enum crypto_algo_pk pk, va_list vl)
-{
+static struct crypto_pk *crypto_pk_polarssl_open(enum crypto_algo_pk pk, va_list vl) {
     struct crypto_pk *cp;
 
     if (pk == PK_RSA)
@@ -308,8 +293,7 @@ static struct crypto_pk *crypto_pk_polarssl_open(enum crypto_algo_pk pk, va_list
     return cp;
 }
 
-static struct crypto_pk *crypto_pk_polarssl_open_priv(enum crypto_algo_pk pk, va_list vl)
-{
+static struct crypto_pk *crypto_pk_polarssl_open_priv(enum crypto_algo_pk pk, va_list vl) {
     struct crypto_pk *cp;
 
     if (pk == PK_RSA)
@@ -326,8 +310,7 @@ static struct crypto_pk *crypto_pk_polarssl_open_priv(enum crypto_algo_pk pk, va
     return cp;
 }
 
-static struct crypto_pk *crypto_pk_polarssl_genkey(enum crypto_algo_pk pk, va_list vl)
-{
+static struct crypto_pk *crypto_pk_polarssl_genkey(enum crypto_algo_pk pk, va_list vl) {
     struct crypto_pk *cp;
 
     if (pk == PK_RSA)
@@ -351,7 +334,6 @@ static struct crypto_backend crypto_polarssl_backend = {
     .pk_genkey = crypto_pk_polarssl_genkey,
 };
 
-struct crypto_backend *crypto_polarssl_init(void)
-{
+struct crypto_backend *crypto_polarssl_init(void) {
     return &crypto_polarssl_backend;
 }
diff --git a/client/emv/dol.c b/client/emv/dol.c
index da63a574e..c7f8fd563 100644
--- a/client/emv/dol.c
+++ b/client/emv/dol.c
@@ -23,8 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-static size_t dol_calculate_len(const struct tlv *tlv, size_t data_len)
-{
+static size_t dol_calculate_len(const struct tlv *tlv, size_t data_len) {
     if (!tlv)
         return 0;
 
@@ -47,8 +46,7 @@ static size_t dol_calculate_len(const struct tlv *tlv, size_t data_len)
     return count;
 }
 
-struct tlv *dol_process(const struct tlv *tlv, const struct tlvdb *tlvdb, tlv_tag_t tag)
-{
+struct tlv *dol_process(const struct tlv *tlv, const struct tlvdb *tlvdb, tlv_tag_t tag) {
     size_t res_len;
     if (!tlv || !(res_len = dol_calculate_len(tlv, 0))) {
         struct tlv *res_tlv = malloc(sizeof(*res_tlv));
@@ -97,8 +95,7 @@ struct tlv *dol_process(const struct tlv *tlv, const struct tlvdb *tlvdb, tlv_ta
     return res_tlv;
 }
 
-struct tlvdb *dol_parse(const struct tlv *tlv, const unsigned char *data, size_t data_len)
-{
+struct tlvdb *dol_parse(const struct tlv *tlv, const unsigned char *data, size_t data_len) {
     if (!tlv)
         return NULL;
 
diff --git a/client/emv/dump.c b/client/emv/dump.c
index ca0b1f09c..0614cab36 100644
--- a/client/emv/dump.c
+++ b/client/emv/dump.c
@@ -22,8 +22,7 @@
 
 #define PRINT_INDENT(level) {for (int i = 0; i < (level); i++) fprintf(f, "   ");}
 
-void dump_buffer_simple(const unsigned char *ptr, size_t len, FILE *f)
-{
+void dump_buffer_simple(const unsigned char *ptr, size_t len, FILE *f) {
     int i;
 
     if (!f)
@@ -33,8 +32,7 @@ void dump_buffer_simple(const unsigned char *ptr, size_t len, FILE *f)
         fprintf(f, "%s%02hhX", i ? " " : "", ptr[i]);
 }
 
-void dump_buffer(const unsigned char *ptr, size_t len, FILE *f, int level)
-{
+void dump_buffer(const unsigned char *ptr, size_t len, FILE *f, int level) {
     int i, j;
 
     if (!f)
diff --git a/client/emv/emv_pk.c b/client/emv/emv_pk.c
index 4f2f2669c..4c6afa88e 100644
--- a/client/emv/emv_pk.c
+++ b/client/emv/emv_pk.c
@@ -40,8 +40,7 @@
 
 #define TOHEX(v) ((v) < 10 ? (v) + '0' : (v) - 10 + 'a')
 
-static ssize_t emv_pk_read_bin(char *buf, unsigned char *bin, size_t size, size_t *read)
-{
+static ssize_t emv_pk_read_bin(char *buf, unsigned char *bin, size_t size, size_t *read) {
     size_t left = size;
     char *p = buf;
     while (*p && *p == ' ')
@@ -79,8 +78,7 @@ static ssize_t emv_pk_read_bin(char *buf, unsigned char *bin, size_t size, size_
     return (p - buf);
 }
 
-static ssize_t emv_pk_read_ymv(char *buf, unsigned *ymv)
-{
+static ssize_t emv_pk_read_ymv(char *buf, unsigned *ymv) {
     int i;
     unsigned char temp[3];
     char *p = buf;
@@ -116,8 +114,7 @@ static ssize_t emv_pk_read_ymv(char *buf, unsigned *ymv)
     return (p - buf);
 }
 
-static ssize_t emv_pk_read_string(char *buf, char *str, size_t size)
-{
+static ssize_t emv_pk_read_string(char *buf, char *str, size_t size) {
     char *p = buf;
     while (*p && *p == ' ')
         p++;
@@ -144,8 +141,7 @@ static ssize_t emv_pk_read_string(char *buf, char *str, size_t size)
 }
 
 
-struct emv_pk *emv_pk_parse_pk(char *buf)
-{
+struct emv_pk *emv_pk_parse_pk(char *buf) {
     struct emv_pk *r = calloc(1, sizeof(*r));
     ssize_t l;
     char temp[10];
@@ -209,8 +205,7 @@ out:
     return NULL;
 }
 
-static size_t emv_pk_write_bin(char *out, size_t outlen, const unsigned char *buf, size_t len)
-{
+static size_t emv_pk_write_bin(char *out, size_t outlen, const unsigned char *buf, size_t len) {
     int i;
     size_t pos = 0;
 
@@ -231,8 +226,7 @@ static size_t emv_pk_write_bin(char *out, size_t outlen, const unsigned char *bu
     return pos;
 }
 
-static size_t emv_pk_write_str(char *out, size_t outlen, const char *str)
-{
+static size_t emv_pk_write_str(char *out, size_t outlen, const char *str) {
     size_t len = strlen(str);
 
     if (len == 0)
@@ -245,8 +239,7 @@ static size_t emv_pk_write_str(char *out, size_t outlen, const char *str)
     return len;
 }
 
-char *emv_pk_dump_pk(const struct emv_pk *pk)
-{
+char *emv_pk_dump_pk(const struct emv_pk *pk) {
     size_t outsize = 1024; /* should be enough */
     char *out = malloc(outsize); /* should be enough */
     size_t outpos = 0;
@@ -330,8 +323,7 @@ err:
     return NULL;
 }
 
-bool emv_pk_verify(const struct emv_pk *pk)
-{
+bool emv_pk_verify(const struct emv_pk *pk) {
     struct crypto_hash *ch = crypto_hash_open(pk->hash_algo);
     if (!ch)
         return false;
@@ -355,8 +347,7 @@ bool emv_pk_verify(const struct emv_pk *pk)
     return r;
 }
 
-struct emv_pk *emv_pk_new(size_t modlen, size_t explen)
-{
+struct emv_pk *emv_pk_new(size_t modlen, size_t explen) {
     struct emv_pk *pk;
 
     /* Not supported ATM */
@@ -379,8 +370,7 @@ struct emv_pk *emv_pk_new(size_t modlen, size_t explen)
     return pk;
 }
 
-void emv_pk_free(struct emv_pk *pk)
-{
+void emv_pk_free(struct emv_pk *pk) {
     if (!pk)
         return;
 
@@ -390,8 +380,7 @@ void emv_pk_free(struct emv_pk *pk)
 
 static struct emv_pk *emv_pk_get_ca_pk_from_file(const char *fname,
                                                  const unsigned char *rid,
-                                                 unsigned char idx)
-{
+                                                 unsigned char idx) {
     if (!fname)
         return NULL;
 
@@ -424,8 +413,7 @@ static struct emv_pk *emv_pk_get_ca_pk_from_file(const char *fname,
     return NULL;
 }
 
-char *emv_pk_get_ca_pk_file(const char *dirname, const unsigned char *rid, unsigned char idx)
-{
+char *emv_pk_get_ca_pk_file(const char *dirname, const unsigned char *rid, unsigned char idx) {
     if (!dirname)
         dirname = ".";//openemv_config_get_str("capk.dir", NULL);
 
@@ -445,8 +433,7 @@ char *emv_pk_get_ca_pk_file(const char *dirname, const unsigned char *rid, unsig
     return filename;
 }
 
-char *emv_pk_get_ca_pk_rid_file(const char *dirname, const unsigned char *rid)
-{
+char *emv_pk_get_ca_pk_rid_file(const char *dirname, const unsigned char *rid) {
     if (!dirname)
         dirname = "."; //openemv_config_get_str("capk.dir", NULL);
 
@@ -465,8 +452,7 @@ char *emv_pk_get_ca_pk_rid_file(const char *dirname, const unsigned char *rid)
     return filename;
 }
 
-struct emv_pk *emv_pk_get_ca_pk(const unsigned char *rid, unsigned char idx)
-{
+struct emv_pk *emv_pk_get_ca_pk(const unsigned char *rid, unsigned char idx) {
     struct emv_pk *pk = NULL;
 
     /*  if (!pk) {
diff --git a/client/emv/emv_pki.c b/client/emv/emv_pki.c
index 614ffd27b..33d4eeb16 100644
--- a/client/emv/emv_pki.c
+++ b/client/emv/emv_pki.c
@@ -28,8 +28,7 @@
 #include <stdarg.h>
 
 static bool strictExecution = true;
-void PKISetStrictExecution(bool se)
-{
+void PKISetStrictExecution(bool se) {
     strictExecution = se;
 }
 
@@ -44,8 +43,7 @@ static unsigned char *emv_pki_decode_message(const struct emv_pk *enc_pk,
                                              const struct tlv *cert_tlv,
                                              int tlv_count,
                                              ... /* A list of tlv pointers */
-                                            )
-{
+                                            ) {
     struct crypto_pk *kcp;
     unsigned char *data;
     size_t data_len;
@@ -133,8 +131,7 @@ static unsigned char *emv_pki_decode_message(const struct emv_pk *enc_pk,
     return data;
 }
 
-static unsigned emv_cn_length(const struct tlv *tlv)
-{
+static unsigned emv_cn_length(const struct tlv *tlv) {
     int i;
 
     for (i = 0; i < tlv->len; i++) {
@@ -150,8 +147,7 @@ static unsigned emv_cn_length(const struct tlv *tlv)
     return 2 * tlv->len;
 }
 
-static unsigned char emv_cn_get(const struct tlv *tlv, unsigned pos)
-{
+static unsigned char emv_cn_get(const struct tlv *tlv, unsigned pos) {
     if (pos > tlv->len * 2)
         return 0xf;
 
@@ -172,8 +168,7 @@ static struct emv_pk *emv_pki_decode_key_ex(const struct emv_pk *enc_pk,
                                             const struct tlv *add_tlv,
                                             const struct tlv *sdatl_tlv,
                                             bool showData
-                                           )
-{
+                                           ) {
     size_t pan_length;
     unsigned char *data;
     size_t data_len;
@@ -223,7 +218,7 @@ static struct emv_pk *emv_pki_decode_key_ex(const struct emv_pk *enc_pk,
     unsigned pan2_len = emv_cn_length(&pan2_tlv);
 
     if (((msgtype == 2) && (pan2_len < 4 || pan2_len > pan_len)) ||
-        ((msgtype == 4) && (pan2_len != pan_len))) {
+            ((msgtype == 4) && (pan2_len != pan_len))) {
         printf("ERROR: Invalid PAN lengths\n");
         free(data);
 
@@ -285,13 +280,11 @@ static struct emv_pk *emv_pki_decode_key(const struct emv_pk *enc_pk,
                                          const struct tlv *rem_tlv,
                                          const struct tlv *add_tlv,
                                          const struct tlv *sdatl_tlv
-                                        )
-{
+                                        ) {
     return emv_pki_decode_key_ex(enc_pk, msgtype, pan_tlv, cert_tlv, exp_tlv, rem_tlv, add_tlv, sdatl_tlv, false);
 }
 
-struct emv_pk *emv_pki_recover_issuer_cert(const struct emv_pk *pk, struct tlvdb *db)
-{
+struct emv_pk *emv_pki_recover_issuer_cert(const struct emv_pk *pk, struct tlvdb *db) {
     return emv_pki_decode_key(pk, 2,
                               tlvdb_get(db, 0x5a, NULL),
                               tlvdb_get(db, 0x90, NULL),
@@ -301,8 +294,7 @@ struct emv_pk *emv_pki_recover_issuer_cert(const struct emv_pk *pk, struct tlvdb
                               NULL);
 }
 
-struct emv_pk *emv_pki_recover_icc_cert(const struct emv_pk *pk, struct tlvdb *db, const struct tlv *sda_tlv)
-{
+struct emv_pk *emv_pki_recover_icc_cert(const struct emv_pk *pk, struct tlvdb *db, const struct tlv *sda_tlv) {
     size_t sdatl_len;
     unsigned char *sdatl = emv_pki_sdatl_fill(db, &sdatl_len);
     struct tlv sda_tdata = {
@@ -323,8 +315,7 @@ struct emv_pk *emv_pki_recover_icc_cert(const struct emv_pk *pk, struct tlvdb *d
     return res;
 }
 
-struct emv_pk *emv_pki_recover_icc_pe_cert(const struct emv_pk *pk, struct tlvdb *db)
-{
+struct emv_pk *emv_pki_recover_icc_pe_cert(const struct emv_pk *pk, struct tlvdb *db) {
     return emv_pki_decode_key(pk, 4,
                               tlvdb_get(db, 0x5a, NULL),
                               tlvdb_get(db, 0x9f2d, NULL),
@@ -334,8 +325,7 @@ struct emv_pk *emv_pki_recover_icc_pe_cert(const struct emv_pk *pk, struct tlvdb
                               NULL);
 }
 
-unsigned char *emv_pki_sdatl_fill(const struct tlvdb *db, size_t *sdatl_len)
-{
+unsigned char *emv_pki_sdatl_fill(const struct tlvdb *db, size_t *sdatl_len) {
     uint8_t buf[2048] = {0};
     size_t len = 0;
 
@@ -365,8 +355,7 @@ unsigned char *emv_pki_sdatl_fill(const struct tlvdb *db, size_t *sdatl_len)
 }
 
 
-struct tlvdb *emv_pki_recover_dac_ex(const struct emv_pk *enc_pk, const struct tlvdb *db, const struct tlv *sda_tlv, bool showData)
-{
+struct tlvdb *emv_pki_recover_dac_ex(const struct emv_pk *enc_pk, const struct tlvdb *db, const struct tlv *sda_tlv, bool showData) {
     size_t data_len;
 
     // Static Data Authentication Tag List
@@ -401,18 +390,15 @@ struct tlvdb *emv_pki_recover_dac_ex(const struct emv_pk *enc_pk, const struct t
 
     return dac_db;
 }
-struct tlvdb *emv_pki_recover_dac(const struct emv_pk *enc_pk, const struct tlvdb *db, const struct tlv *sda_tlv)
-{
+struct tlvdb *emv_pki_recover_dac(const struct emv_pk *enc_pk, const struct tlvdb *db, const struct tlv *sda_tlv) {
     return emv_pki_recover_dac_ex(enc_pk, db, sda_tlv, false);
 }
 
-struct tlvdb *emv_pki_recover_idn(const struct emv_pk *enc_pk, const struct tlvdb *db, const struct tlv *dyn_tlv)
-{
+struct tlvdb *emv_pki_recover_idn(const struct emv_pk *enc_pk, const struct tlvdb *db, const struct tlv *dyn_tlv) {
     return emv_pki_recover_idn_ex(enc_pk, db, dyn_tlv, false);
 }
 
-struct tlvdb *emv_pki_recover_idn_ex(const struct emv_pk *enc_pk, const struct tlvdb *db, const struct tlv *dyn_tlv, bool showData)
-{
+struct tlvdb *emv_pki_recover_idn_ex(const struct emv_pk *enc_pk, const struct tlvdb *db, const struct tlv *dyn_tlv, bool showData) {
     size_t data_len;
     unsigned char *data = emv_pki_decode_message(enc_pk, 5, &data_len,
                                                  tlvdb_get(db, 0x9f4b, NULL),
@@ -447,8 +433,7 @@ struct tlvdb *emv_pki_recover_idn_ex(const struct emv_pk *enc_pk, const struct t
     return idn_db;
 }
 
-struct tlvdb *emv_pki_recover_atc_ex(const struct emv_pk *enc_pk, const struct tlvdb *db, bool showData)
-{
+struct tlvdb *emv_pki_recover_atc_ex(const struct emv_pk *enc_pk, const struct tlvdb *db, bool showData) {
     size_t data_len;
     unsigned char *data = emv_pki_decode_message(enc_pk, 5, &data_len,
                                                  tlvdb_get(db, 0x9f4b, NULL),
@@ -486,8 +471,7 @@ struct tlvdb *emv_pki_recover_atc_ex(const struct emv_pk *enc_pk, const struct t
     return atc_db;
 }
 
-static bool tlv_hash(void *data, const struct tlv *tlv, int level, bool is_leaf)
-{
+static bool tlv_hash(void *data, const struct tlv *tlv, int level, bool is_leaf) {
     struct crypto_hash *ch = data;
     size_t tag_len;
     unsigned char *tag;
@@ -509,8 +493,7 @@ struct tlvdb *emv_pki_perform_cda(const struct emv_pk *enc_pk, const struct tlvd
                                   const struct tlvdb *this_db,
                                   const struct tlv *pdol_data_tlv,
                                   const struct tlv *crm1_tlv,
-                                  const struct tlv *crm2_tlv)
-{
+                                  const struct tlv *crm2_tlv) {
     return emv_pki_perform_cda_ex(enc_pk, db, this_db, pdol_data_tlv, crm1_tlv, crm2_tlv, false);
 }
 struct tlvdb *emv_pki_perform_cda_ex(const struct emv_pk *enc_pk, const struct tlvdb *db,
@@ -518,8 +501,7 @@ struct tlvdb *emv_pki_perform_cda_ex(const struct emv_pk *enc_pk, const struct t
                                      const struct tlv *pdol_data_tlv, // PDOL
                                      const struct tlv *crm1_tlv,      // CDOL1
                                      const struct tlv *crm2_tlv,      // CDOL2
-                                     bool showData)
-{
+                                     bool showData) {
     const struct tlv *un_tlv = tlvdb_get(db, 0x9f37, NULL);
     const struct tlv *cid_tlv = tlvdb_get(this_db, 0x9f27, NULL);
 
diff --git a/client/emv/emv_pki_priv.c b/client/emv/emv_pki_priv.c
index 418d922df..5256b4e37 100644
--- a/client/emv/emv_pki_priv.c
+++ b/client/emv/emv_pki_priv.c
@@ -26,8 +26,7 @@
 
 struct emv_pk *emv_pki_make_ca(const struct crypto_pk *cp,
                                const unsigned char *rid, unsigned char index,
-                               unsigned int expire, enum crypto_algo_hash hash_algo)
-{
+                               unsigned int expire, enum crypto_algo_hash hash_algo) {
     size_t modlen, explen;
     unsigned char *mod, *exp;
 
@@ -85,8 +84,7 @@ static struct tlvdb *emv_pki_sign_message(const struct crypto_pk *cp,
                                           tlv_tag_t cert_tag, tlv_tag_t rem_tag,
                                           const unsigned char *msg, size_t msg_len,
                                           ... /* A list of tlv pointers, end with NULL */
-                                         )
-{
+                                         ) {
     size_t tmp_len = (crypto_pk_get_nbits(cp) + 7) / 8;
     unsigned char *tmp = malloc(tmp_len);
     if (!tmp)
@@ -175,8 +173,7 @@ static struct tlvdb *emv_pki_sign_key(const struct crypto_pk *cp,
                                       tlv_tag_t exp_tag,
                                       tlv_tag_t rem_tag,
                                       const struct tlv *add_tlv
-                                     )
-{
+                                     ) {
     unsigned pos = 0;
     unsigned char *msg = malloc(1 + pan_len + 2 + 3 + 1 + 1 + 1 + 1 + ipk->mlen);
 
@@ -219,23 +216,19 @@ static struct tlvdb *emv_pki_sign_key(const struct crypto_pk *cp,
     return db;
 }
 
-struct tlvdb *emv_pki_sign_issuer_cert(const struct crypto_pk *cp, struct emv_pk *issuer_pk)
-{
+struct tlvdb *emv_pki_sign_issuer_cert(const struct crypto_pk *cp, struct emv_pk *issuer_pk) {
     return emv_pki_sign_key(cp, issuer_pk, 2, 4, 0x90, 0x9f32, 0x92, NULL);
 }
 
-struct tlvdb *emv_pki_sign_icc_cert(const struct crypto_pk *cp, struct emv_pk *icc_pk, const struct tlv *sda_tlv)
-{
+struct tlvdb *emv_pki_sign_icc_cert(const struct crypto_pk *cp, struct emv_pk *icc_pk, const struct tlv *sda_tlv) {
     return emv_pki_sign_key(cp, icc_pk, 4, 10, 0x9f46, 0x9f47, 0x9f48, sda_tlv);
 }
 
-struct tlvdb *emv_pki_sign_icc_pe_cert(const struct crypto_pk *cp, struct emv_pk *icc_pe_pk)
-{
+struct tlvdb *emv_pki_sign_icc_pe_cert(const struct crypto_pk *cp, struct emv_pk *icc_pe_pk) {
     return emv_pki_sign_key(cp, icc_pe_pk, 4, 10, 0x9f2d, 0x9f2e, 0x9f2f, NULL);
 }
 
-struct tlvdb *emv_pki_sign_dac(const struct crypto_pk *cp, const struct tlv *dac_tlv, const struct tlv *sda_tlv)
-{
+struct tlvdb *emv_pki_sign_dac(const struct crypto_pk *cp, const struct tlv *dac_tlv, const struct tlv *sda_tlv) {
     unsigned pos = 0;
     unsigned char *msg = malloc(1 + 1 + dac_tlv->len);
 
@@ -258,8 +251,7 @@ struct tlvdb *emv_pki_sign_dac(const struct crypto_pk *cp, const struct tlv *dac
     return db;
 }
 
-struct tlvdb *emv_pki_sign_idn(const struct crypto_pk *cp, const struct tlv *idn_tlv, const struct tlv *dyn_tlv)
-{
+struct tlvdb *emv_pki_sign_idn(const struct crypto_pk *cp, const struct tlv *idn_tlv, const struct tlv *dyn_tlv) {
     unsigned pos = 0;
     unsigned char *msg = malloc(1 + 1 + 1 + 1 + idn_tlv->len);
 
diff --git a/client/emv/emv_roca.c b/client/emv/emv_roca.c
index f7a16bb3e..3a89020c7 100644
--- a/client/emv/emv_roca.c
+++ b/client/emv/emv_roca.c
@@ -29,8 +29,7 @@ static uint8_t g_primes[ROCA_PRINTS_LENGTH] = {
 
 mbedtls_mpi g_prints[ROCA_PRINTS_LENGTH];
 
-void rocacheck_init(void)
-{
+void rocacheck_init(void) {
 
     for (int i = 0; i < ROCA_PRINTS_LENGTH; i++)
         mbedtls_mpi_init(&g_prints[i]);
@@ -54,14 +53,12 @@ void rocacheck_init(void)
     mbedtls_mpi_read_string(&g_prints[16], 10, "126304807362733370595828809000324029340048915994");
 }
 
-void rocacheck_cleanup(void)
-{
+void rocacheck_cleanup(void) {
     for (int i = 0; i < ROCA_PRINTS_LENGTH; i++)
         mbedtls_mpi_free(&g_prints[i]);
 }
 
-int bitand_is_zero(mbedtls_mpi *a, mbedtls_mpi *b)
-{
+int bitand_is_zero(mbedtls_mpi *a, mbedtls_mpi *b) {
 
     for (int i = 0; i < mbedtls_mpi_bitlen(a); i++) {
 
@@ -72,8 +69,7 @@ int bitand_is_zero(mbedtls_mpi *a, mbedtls_mpi *b)
 }
 
 
-mbedtls_mpi_uint mpi_get_uint(const mbedtls_mpi *X)
-{
+mbedtls_mpi_uint mpi_get_uint(const mbedtls_mpi *X) {
 
     if (X->n == 1 && X->s > 0) {
         return X->p[0];
@@ -82,8 +78,7 @@ mbedtls_mpi_uint mpi_get_uint(const mbedtls_mpi *X)
     return 0;
 }
 
-void print_mpi(const char *msg, int radix, const mbedtls_mpi *X)
-{
+void print_mpi(const char *msg, int radix, const mbedtls_mpi *X) {
 
     char Xchar[400] = {0};
     size_t len = 0;
@@ -92,8 +87,7 @@ void print_mpi(const char *msg, int radix, const mbedtls_mpi *X)
     printf("%s[%ld] %s\n", msg, len, Xchar);
 }
 
-bool emv_rocacheck(const unsigned char *buf, size_t buflen, bool verbose)
-{
+bool emv_rocacheck(const unsigned char *buf, size_t buflen, bool verbose) {
 
     mbedtls_mpi t_modulus;
     mbedtls_mpi_init(&t_modulus);
@@ -144,8 +138,7 @@ cleanup:
     return ret;
 }
 
-int roca_self_test(void)
-{
+int roca_self_test(void) {
     int ret = 0;
 
     PrintAndLogEx(INFO, "ROCA check vulnerability tests");
diff --git a/client/emv/emv_tags.c b/client/emv/emv_tags.c
index 9eadcd1f7..605707a65 100644
--- a/client/emv/emv_tags.c
+++ b/client/emv/emv_tags.c
@@ -424,21 +424,18 @@ static const struct emv_tag emv_tags[] = {
     { 0xff8106, "Discretionary Data" },
 };
 
-static int emv_sort_tag(tlv_tag_t tag)
-{
+static int emv_sort_tag(tlv_tag_t tag) {
     return (int)(tag >= 0x100 ? tag : tag << 8);
 }
 
-static int emv_tlv_compare(const void *a, const void *b)
-{
+static int emv_tlv_compare(const void *a, const void *b) {
     const struct tlv *tlv = a;
     const struct emv_tag *tag = b;
 
     return emv_sort_tag(tlv->tag) - (emv_sort_tag(tag->tag));
 }
 
-static const struct emv_tag *emv_get_tag(const struct tlv *tlv)
-{
+static const struct emv_tag *emv_get_tag(const struct tlv *tlv) {
     struct emv_tag *tag = bsearch(tlv, emv_tags, sizeof(emv_tags) / sizeof(emv_tags[0]),
                                   sizeof(emv_tags[0]), emv_tlv_compare);
 
@@ -456,8 +453,7 @@ static const char *bitstrings[] = {
     "1.......",
 };
 
-static void emv_tag_dump_bitmask(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level)
-{
+static void emv_tag_dump_bitmask(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level) {
     const struct emv_tag_bit *bits = tag->data;
     unsigned bit, byte;
 
@@ -477,8 +473,7 @@ static void emv_tag_dump_bitmask(const struct tlv *tlv, const struct emv_tag *ta
     }
 }
 
-static void emv_tag_dump_dol(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level)
-{
+static void emv_tag_dump_dol(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level) {
     const unsigned char *buf = tlv->value;
     size_t left = tlv->len;
 
@@ -499,15 +494,13 @@ static void emv_tag_dump_dol(const struct tlv *tlv, const struct emv_tag *tag, F
     }
 }
 
-static void emv_tag_dump_string(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level)
-{
+static void emv_tag_dump_string(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level) {
     fprintf(f, "\tString value '");
     fwrite(tlv->value, 1, tlv->len, f);
     fprintf(f, "'\n");
 }
 
-static unsigned long emv_value_numeric(const struct tlv *tlv, unsigned start, unsigned end)
-{
+static unsigned long emv_value_numeric(const struct tlv *tlv, unsigned start, unsigned end) {
     unsigned long ret = 0;
     int i;
 
@@ -537,14 +530,12 @@ static unsigned long emv_value_numeric(const struct tlv *tlv, unsigned start, un
     return ret;
 }
 
-static void emv_tag_dump_numeric(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level)
-{
+static void emv_tag_dump_numeric(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level) {
     PRINT_INDENT(level);
     fprintf(f, "\tNumeric value %lu\n", emv_value_numeric(tlv, 0, tlv->len * 2));
 }
 
-static void emv_tag_dump_yymmdd(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level)
-{
+static void emv_tag_dump_yymmdd(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level) {
     PRINT_INDENT(level);
     fprintf(f, "\tDate: 20%02ld.%ld.%ld\n",
             emv_value_numeric(tlv, 0, 2),
@@ -552,14 +543,12 @@ static void emv_tag_dump_yymmdd(const struct tlv *tlv, const struct emv_tag *tag
             emv_value_numeric(tlv, 4, 6));
 }
 
-static uint32_t emv_get_binary(const unsigned char *S)
-{
+static uint32_t emv_get_binary(const unsigned char *S) {
     return (S[0] << 24) | (S[1] << 16) | (S[2] << 8) | (S[3] << 0);
 }
 
 // https://github.com/binaryfoo/emv-bertlv/blob/master/src/main/resources/fields/visa-cvr.txt
-static void emv_tag_dump_cvr(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level)
-{
+static void emv_tag_dump_cvr(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level) {
     if (!tlv || tlv->len < 1) {
         PRINT_INDENT(level);
         fprintf(f, "\tINVALID!\n");
@@ -623,8 +612,7 @@ static void emv_tag_dump_cvr(const struct tlv *tlv, const struct emv_tag *tag, F
 }
 
 // EMV Book 3
-static void emv_tag_dump_cid(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level)
-{
+static void emv_tag_dump_cid(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level) {
     if (!tlv || tlv->len < 1) {
         PRINT_INDENT(level);
         fprintf(f, "\tINVALID!\n");
@@ -665,8 +653,7 @@ static void emv_tag_dump_cid(const struct tlv *tlv, const struct emv_tag *tag, F
     }
 }
 
-static void emv_tag_dump_cvm_list(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level)
-{
+static void emv_tag_dump_cvm_list(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level) {
     uint32_t X, Y;
     int i;
 
@@ -764,8 +751,7 @@ static void emv_tag_dump_cvm_list(const struct tlv *tlv, const struct emv_tag *t
     }
 }
 
-static void emv_tag_dump_afl(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level)
-{
+static void emv_tag_dump_afl(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level) {
     if (tlv->len < 4 || tlv->len % 4) {
         PRINT_INDENT(level);
         fprintf(f, "\tINVALID!\n");
@@ -778,8 +764,7 @@ static void emv_tag_dump_afl(const struct tlv *tlv, const struct emv_tag *tag, F
     }
 }
 
-bool emv_tag_dump(const struct tlv *tlv, FILE *f, int level)
-{
+bool emv_tag_dump(const struct tlv *tlv, FILE *f, int level) {
     if (!tlv) {
         fprintf(f, "NULL\n");
         return false;
@@ -832,8 +817,7 @@ bool emv_tag_dump(const struct tlv *tlv, FILE *f, int level)
     return true;
 }
 
-char *emv_get_tag_name(const struct tlv *tlv)
-{
+char *emv_get_tag_name(const struct tlv *tlv) {
     static char *defstr = "";
 
     if (!tlv)
diff --git a/client/emv/emvcore.c b/client/emv/emvcore.c
index dbe953b66..43d6ddaf1 100644
--- a/client/emv/emvcore.c
+++ b/client/emv/emvcore.c
@@ -91,13 +91,11 @@ static const TAIDList AIDlist [] = {
 static const size_t AIDlistLen = sizeof(AIDlist) / sizeof(TAIDList);
 
 static bool APDULogging = false;
-void SetAPDULogging(bool logging)
-{
+void SetAPDULogging(bool logging) {
     APDULogging = logging;
 }
 
-enum CardPSVendor GetCardPSVendor(uint8_t *AID, size_t AIDlen)
-{
+enum CardPSVendor GetCardPSVendor(uint8_t *AID, size_t AIDlen) {
     char buf[100] = {0};
     if (AIDlen < 1)
         return CV_NA;
@@ -113,8 +111,7 @@ enum CardPSVendor GetCardPSVendor(uint8_t *AID, size_t AIDlen)
     return CV_NA;
 }
 
-static bool print_cb(void *data, const struct tlv *tlv, int level, bool is_leaf)
-{
+static bool print_cb(void *data, const struct tlv *tlv, int level, bool is_leaf) {
     emv_tag_dump(tlv, stdout, level);
     if (is_leaf) {
         dump_buffer(tlv->value, tlv->len, stdout, level);
@@ -123,8 +120,7 @@ static bool print_cb(void *data, const struct tlv *tlv, int level, bool is_leaf)
     return true;
 }
 
-bool TLVPrintFromBuffer(uint8_t *data, int datalen)
-{
+bool TLVPrintFromBuffer(uint8_t *data, int datalen) {
     struct tlvdb *t = NULL;
     t = tlvdb_parse_multi(data, datalen);
     if (t) {
@@ -139,21 +135,18 @@ bool TLVPrintFromBuffer(uint8_t *data, int datalen)
     return false;
 }
 
-void TLVPrintFromTLVLev(struct tlvdb *tlv, int level)
-{
+void TLVPrintFromTLVLev(struct tlvdb *tlv, int level) {
     if (!tlv)
         return;
 
     tlvdb_visit(tlv, print_cb, NULL, level);
 }
 
-void TLVPrintFromTLV(struct tlvdb *tlv)
-{
+void TLVPrintFromTLV(struct tlvdb *tlv) {
     TLVPrintFromTLVLev(tlv, 0);
 }
 
-void TLVPrintAIDlistFromSelectTLV(struct tlvdb *tlv)
-{
+void TLVPrintAIDlistFromSelectTLV(struct tlvdb *tlv) {
     PrintAndLogEx(NORMAL, "|------------------|--------|-------------------------|");
     PrintAndLogEx(NORMAL, "|    AID           |Priority| Name                    |");
     PrintAndLogEx(NORMAL, "|------------------|--------|-------------------------|");
@@ -179,8 +172,7 @@ void TLVPrintAIDlistFromSelectTLV(struct tlvdb *tlv)
     PrintAndLogEx(NORMAL, "|------------------|--------|-------------------------|");
 }
 
-struct tlvdb *GetPANFromTrack2(const struct tlv *track2)
-{
+struct tlvdb *GetPANFromTrack2(const struct tlv *track2) {
     char track2Hex[200] = {0};
     uint8_t PAN[100] = {0};
     int PANlen = 0;
@@ -207,8 +199,7 @@ struct tlvdb *GetPANFromTrack2(const struct tlv *track2)
     return tlvdb_fixed(0x5a, PANlen, PAN);
 }
 
-struct tlvdb *GetdCVVRawFromTrack2(const struct tlv *track2)
-{
+struct tlvdb *GetdCVVRawFromTrack2(const struct tlv *track2) {
     char track2Hex[200] = {0};
     char dCVVHex[100] = {0};
     uint8_t dCVV[100] = {0};
@@ -241,8 +232,7 @@ struct tlvdb *GetdCVVRawFromTrack2(const struct tlv *track2)
     return tlvdb_fixed(0x02, dCVVlen, dCVV);
 }
 
-int EMVExchangeEx(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, sAPDU apdu, bool IncludeLe, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv)
-{
+int EMVExchangeEx(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, sAPDU apdu, bool IncludeLe, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
     uint8_t data[APDU_RES_LEN] = {0};
 
     *ResultLen = 0;
@@ -315,18 +305,15 @@ int EMVExchangeEx(EMVCommandChannel channel, bool ActivateField, bool LeaveField
     return 0;
 }
 
-int EMVExchange(EMVCommandChannel channel, bool LeaveFieldON, sAPDU apdu, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv)
-{
+int EMVExchange(EMVCommandChannel channel, bool LeaveFieldON, sAPDU apdu, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
     return EMVExchangeEx(channel, false, LeaveFieldON, apdu, (channel == ECC_CONTACTLESS), Result, MaxResultLen, ResultLen, sw, tlv);
 }
 
-int EMVSelect(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, uint8_t *AID, size_t AIDLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv)
-{
+int EMVSelect(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, uint8_t *AID, size_t AIDLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
     return EMVExchangeEx(channel, ActivateField, LeaveFieldON, (sAPDU) {0x00, 0xa4, 0x04, 0x00, AIDLen, AID}, (channel == ECC_CONTACTLESS), Result, MaxResultLen, ResultLen, sw, tlv);
 }
 
-int EMVSelectPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, uint8_t PSENum, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw)
-{
+int EMVSelectPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, uint8_t PSENum, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
     uint8_t buf[APDU_AID_LEN] = {0};
     *ResultLen = 0;
     int len = 0;
@@ -348,8 +335,7 @@ int EMVSelectPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldO
     return res;
 }
 
-int EMVSelectWithRetry(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, uint8_t *AID, size_t AIDLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv)
-{
+int EMVSelectWithRetry(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, uint8_t *AID, size_t AIDLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
     int retrycnt = 0;
     int res = 0;
     do {
@@ -376,8 +362,7 @@ int EMVSelectWithRetry(EMVCommandChannel channel, bool ActivateField, bool Leave
     return res;
 }
 
-int EMVCheckAID(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlvdbelm, struct tlvdb *tlv)
-{
+int EMVCheckAID(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlvdbelm, struct tlvdb *tlv) {
     uint8_t data[APDU_RES_LEN] = {0};
     size_t datalen = 0;
     int res = 0;
@@ -409,8 +394,7 @@ int EMVCheckAID(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlvdbel
     return res;
 }
 
-int EMVSearchPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, uint8_t PSENum, bool decodeTLV, struct tlvdb *tlv)
-{
+int EMVSearchPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, uint8_t PSENum, bool decodeTLV, struct tlvdb *tlv) {
     uint8_t data[APDU_RES_LEN] = {0};
     size_t datalen = 0;
     uint8_t sfidata[0x11][APDU_RES_LEN];
@@ -504,8 +488,7 @@ int EMVSearchPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldO
     return res;
 }
 
-int EMVSearch(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, bool decodeTLV, struct tlvdb *tlv)
-{
+int EMVSearch(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, bool decodeTLV, struct tlvdb *tlv) {
     uint8_t aidbuf[APDU_AID_LEN] = {0};
     int aidlen = 0;
     uint8_t data[APDU_RES_LEN] = {0};
@@ -550,8 +533,7 @@ int EMVSearch(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON,
     return 0;
 }
 
-int EMVSelectApplication(struct tlvdb *tlv, uint8_t *AID, size_t *AIDlen)
-{
+int EMVSelectApplication(struct tlvdb *tlv, uint8_t *AID, size_t *AIDlen) {
     // check priority. 0x00 - highest
     int prio = 0xffff;
 
@@ -590,13 +572,11 @@ int EMVSelectApplication(struct tlvdb *tlv, uint8_t *AID, size_t *AIDlen)
     return 0;
 }
 
-int EMVGPO(EMVCommandChannel channel, bool LeaveFieldON, uint8_t *PDOL, size_t PDOLLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv)
-{
+int EMVGPO(EMVCommandChannel channel, bool LeaveFieldON, uint8_t *PDOL, size_t PDOLLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
     return EMVExchange(channel, LeaveFieldON, (sAPDU) {0x80, 0xa8, 0x00, 0x00, PDOLLen, PDOL}, Result, MaxResultLen, ResultLen, sw, tlv);
 }
 
-int EMVReadRecord(EMVCommandChannel channel, bool LeaveFieldON, uint8_t SFI, uint8_t SFIrec, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv)
-{
+int EMVReadRecord(EMVCommandChannel channel, bool LeaveFieldON, uint8_t SFI, uint8_t SFIrec, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
     int res = EMVExchange(channel, LeaveFieldON, (sAPDU) {0x00, 0xb2, SFIrec, (SFI << 3) | 0x04, 0, NULL}, Result, MaxResultLen, ResultLen, sw, tlv);
     if (*sw == 0x6700) {
         PrintAndLogEx(INFO, ">>> trying to reissue command withouth Le...");
@@ -605,13 +585,11 @@ int EMVReadRecord(EMVCommandChannel channel, bool LeaveFieldON, uint8_t SFI, uin
     return res;
 }
 
-int EMVAC(EMVCommandChannel channel, bool LeaveFieldON, uint8_t RefControl, uint8_t *CDOL, size_t CDOLLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv)
-{
+int EMVAC(EMVCommandChannel channel, bool LeaveFieldON, uint8_t RefControl, uint8_t *CDOL, size_t CDOLLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
     return EMVExchange(channel, LeaveFieldON, (sAPDU) {0x80, 0xae, RefControl, 0x00, CDOLLen, CDOL}, Result, MaxResultLen, ResultLen, sw, tlv);
 }
 
-int EMVGenerateChallenge(EMVCommandChannel channel, bool LeaveFieldON, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv)
-{
+int EMVGenerateChallenge(EMVCommandChannel channel, bool LeaveFieldON, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
     int res = EMVExchange(channel, LeaveFieldON, (sAPDU) {0x00, 0x84, 0x00, 0x00, 0x00, NULL}, Result, MaxResultLen, ResultLen, sw, tlv);
     if (*sw == 0x6700) {
         PrintAndLogEx(INFO, ">>> trying to reissue command withouth Le...");
@@ -620,19 +598,16 @@ int EMVGenerateChallenge(EMVCommandChannel channel, bool LeaveFieldON, uint8_t *
     return res;
 }
 
-int EMVInternalAuthenticate(EMVCommandChannel channel, bool LeaveFieldON, uint8_t *DDOL, size_t DDOLLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv)
-{
+int EMVInternalAuthenticate(EMVCommandChannel channel, bool LeaveFieldON, uint8_t *DDOL, size_t DDOLLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
     return EMVExchangeEx(channel, false, LeaveFieldON, (sAPDU) {0x00, 0x88, 0x00, 0x00, DDOLLen, DDOL}, true, Result, MaxResultLen, ResultLen, sw, tlv);
 }
 
-int MSCComputeCryptoChecksum(EMVCommandChannel channel, bool LeaveFieldON, uint8_t *UDOL, uint8_t UDOLlen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv)
-{
+int MSCComputeCryptoChecksum(EMVCommandChannel channel, bool LeaveFieldON, uint8_t *UDOL, uint8_t UDOLlen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
     return EMVExchange(channel, LeaveFieldON, (sAPDU) {0x80, 0x2a, 0x8e, 0x80, UDOLlen, UDOL}, Result, MaxResultLen, ResultLen, sw, tlv);
 }
 
 // Authentication
-struct emv_pk *get_ca_pk(struct tlvdb *db)
-{
+struct emv_pk *get_ca_pk(struct tlvdb *db) {
     const struct tlv *df_tlv = tlvdb_get(db, 0x84, NULL);
     const struct tlv *caidx_tlv = tlvdb_get(db, 0x8f, NULL);
 
@@ -643,8 +618,7 @@ struct emv_pk *get_ca_pk(struct tlvdb *db)
     return emv_pk_get_ca_pk(df_tlv->value, caidx_tlv->value[0]);
 }
 
-int trSDA(struct tlvdb *tlv)
-{
+int trSDA(struct tlvdb *tlv) {
 
     struct emv_pk *pk = get_ca_pk(tlv);
     if (!pk) {
@@ -699,8 +673,7 @@ int trSDA(struct tlvdb *tlv)
 static const unsigned char default_ddol_value[] = {0x9f, 0x37, 0x04};
 static struct tlv default_ddol_tlv = {.tag = 0x9f49, .len = 3, .value = default_ddol_value };
 
-int trDDA(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlv)
-{
+int trDDA(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlv) {
     uint8_t buf[APDU_RES_LEN] = {0};
     size_t len = 0;
     uint16_t sw = 0;
@@ -926,8 +899,7 @@ int trDDA(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlv)
     return 0;
 }
 
-int trCDA(struct tlvdb *tlv, struct tlvdb *ac_tlv, struct tlv *pdol_data_tlv, struct tlv *ac_data_tlv)
-{
+int trCDA(struct tlvdb *tlv, struct tlvdb *ac_tlv, struct tlv *pdol_data_tlv, struct tlv *ac_data_tlv) {
 
     struct emv_pk *pk = get_ca_pk(tlv);
     if (!pk) {
@@ -1013,8 +985,7 @@ int trCDA(struct tlvdb *tlv, struct tlvdb *ac_tlv, struct tlv *pdol_data_tlv, st
     return 0;
 }
 
-int RecoveryCertificates(struct tlvdb *tlvRoot, json_t *root)
-{
+int RecoveryCertificates(struct tlvdb *tlvRoot, json_t *root) {
 
     struct emv_pk *pk = get_ca_pk(tlvRoot);
     if (!pk) {
diff --git a/client/emv/emvjson.c b/client/emv/emvjson.c
index 5885ca294..717f806d9 100644
--- a/client/emv/emvjson.c
+++ b/client/emv/emvjson.c
@@ -60,8 +60,7 @@ static const ApplicationDataElm ApplicationData[] = {
 };
 int ApplicationDataLen = sizeof(ApplicationData) / sizeof(ApplicationDataElm);
 
-char *GetApplicationDataName(tlv_tag_t tag)
-{
+char *GetApplicationDataName(tlv_tag_t tag) {
     for (int i = 0; i < ApplicationDataLen; i++)
         if (ApplicationData[i].Tag == tag)
             return ApplicationData[i].Name;
@@ -69,8 +68,7 @@ char *GetApplicationDataName(tlv_tag_t tag)
     return NULL;
 }
 
-int JsonSaveJsonObject(json_t *root, char *path, json_t *value)
-{
+int JsonSaveJsonObject(json_t *root, char *path, json_t *value) {
     json_error_t error;
 
     if (strlen(path) < 1)
@@ -88,18 +86,15 @@ int JsonSaveJsonObject(json_t *root, char *path, json_t *value)
     }
 }
 
-int JsonSaveInt(json_t *root, char *path, int value)
-{
+int JsonSaveInt(json_t *root, char *path, int value) {
     return JsonSaveJsonObject(root, path, json_integer(value));
 }
 
-int JsonSaveStr(json_t *root, char *path, char *value)
-{
+int JsonSaveStr(json_t *root, char *path, char *value) {
     return JsonSaveJsonObject(root, path, json_string(value));
 };
 
-int JsonSaveBufAsHexCompact(json_t *elm, char *path, uint8_t *data, size_t datalen)
-{
+int JsonSaveBufAsHexCompact(json_t *elm, char *path, uint8_t *data, size_t datalen) {
     char *msg = sprint_hex_inrow(data, datalen);
     if (msg && strlen(msg) && msg[strlen(msg) - 1] == ' ')
         msg[strlen(msg) - 1] = '\0';
@@ -107,8 +102,7 @@ int JsonSaveBufAsHexCompact(json_t *elm, char *path, uint8_t *data, size_t datal
     return JsonSaveStr(elm, path, msg);
 }
 
-int JsonSaveBufAsHex(json_t *elm, char *path, uint8_t *data, size_t datalen)
-{
+int JsonSaveBufAsHex(json_t *elm, char *path, uint8_t *data, size_t datalen) {
     char *msg = sprint_hex(data, datalen);
     if (msg && strlen(msg) && msg[strlen(msg) - 1] == ' ')
         msg[strlen(msg) - 1] = '\0';
@@ -116,8 +110,7 @@ int JsonSaveBufAsHex(json_t *elm, char *path, uint8_t *data, size_t datalen)
     return JsonSaveStr(elm, path, msg);
 }
 
-int JsonSaveHex(json_t *elm, char *path, uint64_t data, int datalen)
-{
+int JsonSaveHex(json_t *elm, char *path, uint64_t data, int datalen) {
     uint8_t bdata[8] = {0};
     int len = 0;
     if (!datalen) {
@@ -137,8 +130,7 @@ int JsonSaveHex(json_t *elm, char *path, uint64_t data, int datalen)
     return JsonSaveBufAsHex(elm, path, bdata, len);
 }
 
-int JsonSaveTLVValue(json_t *root, char *path, struct tlvdb *tlvdbelm)
-{
+int JsonSaveTLVValue(json_t *root, char *path, struct tlvdb *tlvdbelm) {
     const struct tlv *tlvelm = tlvdb_get_tlv(tlvdbelm);
     if (tlvelm)
         return JsonSaveBufAsHex(root, path, (uint8_t *)tlvelm->value, tlvelm->len);
@@ -146,8 +138,7 @@ int JsonSaveTLVValue(json_t *root, char *path, struct tlvdb *tlvdbelm)
         return 1;
 }
 
-int JsonSaveTLVElm(json_t *elm, char *path, struct tlv *tlvelm, bool saveName, bool saveValue, bool saveAppDataLink)
-{
+int JsonSaveTLVElm(json_t *elm, char *path, struct tlv *tlvelm, bool saveName, bool saveValue, bool saveAppDataLink) {
     json_error_t error;
 
     if (strlen(path) < 1 || !tlvelm)
@@ -191,13 +182,11 @@ int JsonSaveTLVElm(json_t *elm, char *path, struct tlv *tlvelm, bool saveName, b
     return 0;
 }
 
-int JsonSaveTLVTreeElm(json_t *elm, char *path, struct tlvdb *tlvdbelm, bool saveName, bool saveValue, bool saveAppDataLink)
-{
+int JsonSaveTLVTreeElm(json_t *elm, char *path, struct tlvdb *tlvdbelm, bool saveName, bool saveValue, bool saveAppDataLink) {
     return JsonSaveTLVElm(elm, path, (struct tlv *)tlvdb_get_tlv(tlvdbelm), saveName, saveValue, saveAppDataLink);
 }
 
-int JsonSaveTLVTree(json_t *root, json_t *elm, char *path, struct tlvdb *tlvdbelm)
-{
+int JsonSaveTLVTree(json_t *root, json_t *elm, char *path, struct tlvdb *tlvdbelm) {
     struct tlvdb *tlvp = tlvdbelm;
     while (tlvp) {
         const struct tlv *tlvpelm = tlvdb_get_tlv(tlvp);
@@ -250,8 +239,7 @@ int JsonSaveTLVTree(json_t *root, json_t *elm, char *path, struct tlvdb *tlvdbel
     return 0;
 }
 
-bool HexToBuffer(const char *errormsg, const char *hexvalue, uint8_t *buffer, size_t maxbufferlen, size_t *bufferlen)
-{
+bool HexToBuffer(const char *errormsg, const char *hexvalue, uint8_t *buffer, size_t maxbufferlen, size_t *bufferlen) {
     int buflen = 0;
 
     switch (param_gethex_to_eol(hexvalue, 0, buffer, maxbufferlen, &buflen)) {
@@ -277,8 +265,7 @@ bool HexToBuffer(const char *errormsg, const char *hexvalue, uint8_t *buffer, si
     return true;
 }
 
-int JsonLoadStr(json_t *root, char *path, char *value)
-{
+int JsonLoadStr(json_t *root, char *path, char *value) {
     if (!value)
         return 1;
 
@@ -295,8 +282,7 @@ int JsonLoadStr(json_t *root, char *path, char *value)
     return 0;
 }
 
-int JsonLoadBufAsHex(json_t *elm, char *path, uint8_t *data, size_t maxbufferlen, size_t *datalen)
-{
+int JsonLoadBufAsHex(json_t *elm, char *path, uint8_t *data, size_t maxbufferlen, size_t *datalen) {
     if (datalen)
         *datalen = 0;
 
@@ -310,8 +296,7 @@ int JsonLoadBufAsHex(json_t *elm, char *path, uint8_t *data, size_t maxbufferlen
     return 0;
 };
 
-bool ParamLoadFromJson(struct tlvdb *tlv)
-{
+bool ParamLoadFromJson(struct tlvdb *tlv) {
     json_t *root;
     json_error_t error;
 
diff --git a/client/emv/test/cda_test.c b/client/emv/test/cda_test.c
index 69c1b6ac9..9627ba972 100644
--- a/client/emv/test/cda_test.c
+++ b/client/emv/test/cda_test.c
@@ -42,8 +42,7 @@ struct emv_pk c_mchip_05 = {
     .exp = { 0x03, },
     .elen = 1,
     .mlen = 1408 / 8,
-    .modulus = (unsigned char[])
-    {
+    .modulus = (unsigned char[]) {
         0xb8, 0x04, 0x8a, 0xbc, 0x30, 0xc9, 0x0d, 0x97, 0x63, 0x36, 0x54, 0x3e, 0x3f, 0xd7, 0x09, 0x1c,
         0x8f, 0xe4, 0x80, 0x0d, 0xf8, 0x20, 0xed, 0x55, 0xe7, 0xe9, 0x48, 0x13, 0xed, 0x00, 0x55, 0x5b,
         0x57, 0x3f, 0xec, 0xa3, 0xd8, 0x4a, 0xf6, 0x13, 0x1a, 0x65, 0x1d, 0x66, 0xcf, 0xf4, 0x28, 0x4f,
@@ -150,8 +149,7 @@ static const struct tlv crm1_tlv = {
     .value = c_crm1,
 };
 
-static int cda_test_raw(bool verbose)
-{
+static int cda_test_raw(bool verbose) {
     const struct emv_pk *pk = &c_mchip_05;
 
     struct crypto_pk *kcp = crypto_pk_open(PK_RSA,
@@ -345,8 +343,7 @@ static int cda_test_raw(bool verbose)
     return 0;
 }
 
-static int cda_test_pk(bool verbose)
-{
+static int cda_test_pk(bool verbose) {
     const struct emv_pk *pk = &c_mchip_05;
     struct tlvdb *db;
 
@@ -421,8 +418,7 @@ static int cda_test_pk(bool verbose)
     return 0;
 }
 
-int exec_cda_test(bool verbose)
-{
+int exec_cda_test(bool verbose) {
     int ret;
     fprintf(stdout, "\n");
 
diff --git a/client/emv/test/crypto_test.c b/client/emv/test/crypto_test.c
index ab8a7cb2e..18e0d1b70 100644
--- a/client/emv/test/crypto_test.c
+++ b/client/emv/test/crypto_test.c
@@ -25,8 +25,7 @@
 #include <string.h>
 #include <inttypes.h>
 
-static int test_genkey(unsigned int keylength, unsigned char *msg, size_t msg_len, bool verbose)
-{
+static int test_genkey(unsigned int keylength, unsigned char *msg, size_t msg_len, bool verbose) {
     int ret = 1;
     size_t tmp_len, tmp2_len;
     unsigned char *tmp, *tmp2;
@@ -192,8 +191,7 @@ static unsigned char pk_I[] = {
     0xd4, 0x42, 0xc9, 0x17, 0xb2, 0x2c, 0x92, 0x12, 0x37, 0x1b, 0xd3, 0xc5, 0x79, 0xd2, 0x65, 0x61,
 };
 
-static int test_pk(bool verbose)
-{
+static int test_pk(bool verbose) {
     int ret = 1;
     size_t tmp_len, tmp2_len;
     unsigned char *tmp, *tmp2;
@@ -300,8 +298,7 @@ close_pub:
     return ret;
 }
 
-int exec_crypto_test(bool verbose)
-{
+int exec_crypto_test(bool verbose) {
     unsigned int keylengths[] = {1024, 1152, 1408, 1984, 2048, 3072, 4096};
     int i;
     int ret;
diff --git a/client/emv/test/cryptotest.c b/client/emv/test/cryptotest.c
index d4c8a96da..39043e544 100644
--- a/client/emv/test/cryptotest.c
+++ b/client/emv/test/cryptotest.c
@@ -33,8 +33,7 @@
 #include "crypto/libpcrypto.h"
 #include "emv/emv_roca.h"
 
-int ExecuteCryptoTests(bool verbose)
-{
+int ExecuteCryptoTests(bool verbose) {
     int res;
     bool TestFail = false;
 
diff --git a/client/emv/test/dda_test.c b/client/emv/test/dda_test.c
index 14f819923..a23a046dc 100644
--- a/client/emv/test/dda_test.c
+++ b/client/emv/test/dda_test.c
@@ -44,8 +44,7 @@ struct emv_pk mchip_05 = {
     .exp = { 0x03, },
     .elen = 1,
     .mlen = 1408 / 8,
-    .modulus = (unsigned char[])
-    {
+    .modulus = (unsigned char[]) {
         0xb8, 0x04, 0x8a, 0xbc, 0x30, 0xc9, 0x0d, 0x97, 0x63, 0x36, 0x54, 0x3e, 0x3f, 0xd7, 0x09, 0x1c,
         0x8f, 0xe4, 0x80, 0x0d, 0xf8, 0x20, 0xed, 0x55, 0xe7, 0xe9, 0x48, 0x13, 0xed, 0x00, 0x55, 0x5b,
         0x57, 0x3f, 0xec, 0xa3, 0xd8, 0x4a, 0xf6, 0x13, 0x1a, 0x65, 0x1d, 0x66, 0xcf, 0xf4, 0x28, 0x4f,
@@ -140,8 +139,7 @@ static const struct tlv dd1_tlv = {
     .value = d_dd1,
 };
 
-static int dda_test_raw(bool verbose)
-{
+static int dda_test_raw(bool verbose) {
     const struct emv_pk *pk = &mchip_05;
 
     struct crypto_pk *kcp = crypto_pk_open(PK_RSA,
@@ -306,8 +304,7 @@ static int dda_test_raw(bool verbose)
     return 0;
 }
 
-static int dda_test_pk(bool verbose)
-{
+static int dda_test_pk(bool verbose) {
     const struct emv_pk *pk = &mchip_05;
     struct tlvdb *db;
 
@@ -369,8 +366,7 @@ static int dda_test_pk(bool verbose)
     return 0;
 }
 
-int exec_dda_test(bool verbose)
-{
+int exec_dda_test(bool verbose) {
     int ret;
     fprintf(stdout, "\n");
 
diff --git a/client/emv/test/sda_test.c b/client/emv/test/sda_test.c
index 7b9fbfffb..1f43d30b2 100644
--- a/client/emv/test/sda_test.c
+++ b/client/emv/test/sda_test.c
@@ -42,8 +42,7 @@ struct emv_pk vsdc_01 = {
     .exp = { 0x03, },
     .elen = 1,
     .mlen = 1024 / 8,
-    .modulus = (unsigned char[])
-    {
+    .modulus = (unsigned char[]) {
         0xc6, 0x96, 0x03, 0x42, 0x13, 0xd7, 0xd8, 0x54, 0x69, 0x84, 0x57, 0x9d, 0x1d, 0x0f, 0x0e, 0xa5,
         0x19, 0xcf, 0xf8, 0xde, 0xff, 0xc4, 0x29, 0x35, 0x4c, 0xf3, 0xa8, 0x71, 0xa6, 0xf7, 0x18, 0x3f,
         0x12, 0x28, 0xda, 0x5c, 0x74, 0x70, 0xc0, 0x55, 0x38, 0x71, 0x00, 0xcb, 0x93, 0x5a, 0x71, 0x2c,
@@ -100,8 +99,7 @@ const unsigned char pan[] = {
     0x42, 0x76, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-static int sda_test_raw(bool verbose)
-{
+static int sda_test_raw(bool verbose) {
     const struct emv_pk *pk = &vsdc_01;
 
     struct crypto_pk *kcp = crypto_pk_open(PK_RSA,
@@ -208,8 +206,7 @@ static int sda_test_raw(bool verbose)
     return 0;
 }
 
-static int sda_test_pk(bool verbose)
-{
+static int sda_test_pk(bool verbose) {
     const struct emv_pk *pk = &vsdc_01;
     struct tlvdb *db;
 
@@ -256,8 +253,7 @@ static int sda_test_pk(bool verbose)
     return 0;
 }
 
-int exec_sda_test(bool verbose)
-{
+int exec_sda_test(bool verbose) {
     int ret;
     fprintf(stdout, "\n");
 
diff --git a/client/emv/tlv.c b/client/emv/tlv.c
index 7c25a6e0a..346bdbe4f 100644
--- a/client/emv/tlv.c
+++ b/client/emv/tlv.c
@@ -54,8 +54,7 @@ struct tlvdb_root {
     unsigned char buf[0];
 };
 
-static tlv_tag_t tlv_parse_tag(const unsigned char **buf, size_t *len)
-{
+static tlv_tag_t tlv_parse_tag(const unsigned char **buf, size_t *len) {
     tlv_tag_t tag;
 
     if (*len == 0)
@@ -77,8 +76,7 @@ static tlv_tag_t tlv_parse_tag(const unsigned char **buf, size_t *len)
     return tag;
 }
 
-static size_t tlv_parse_len(const unsigned char **buf, size_t *len)
-{
+static size_t tlv_parse_len(const unsigned char **buf, size_t *len) {
     size_t l;
 
     if (*len == 0)
@@ -105,8 +103,7 @@ static size_t tlv_parse_len(const unsigned char **buf, size_t *len)
     return l;
 }
 
-bool tlv_parse_tl(const unsigned char **buf, size_t *len, struct tlv *tlv)
-{
+bool tlv_parse_tl(const unsigned char **buf, size_t *len, struct tlv *tlv) {
     tlv->value = 0;
 
     tlv->tag = tlv_parse_tag(buf, len);
@@ -125,8 +122,7 @@ static struct tlvdb *tlvdb_parse_children(struct tlvdb *parent);
 static bool tlvdb_parse_one(struct tlvdb *tlvdb,
                             struct tlvdb *parent,
                             const unsigned char **tmp,
-                            size_t *left)
-{
+                            size_t *left) {
     tlvdb->next = tlvdb->children = NULL;
     tlvdb->parent = parent;
 
@@ -160,8 +156,7 @@ err:
     return false;
 }
 
-static struct tlvdb *tlvdb_parse_children(struct tlvdb *parent)
-{
+static struct tlvdb *tlvdb_parse_children(struct tlvdb *parent) {
     const unsigned char *tmp = parent->tag.value;
     size_t left = parent->tag.len;
     struct tlvdb *tlvdb, *first = NULL, *prev = NULL;
@@ -188,8 +183,7 @@ err:
     return NULL;
 }
 
-struct tlvdb *tlvdb_parse(const unsigned char *buf, size_t len)
-{
+struct tlvdb *tlvdb_parse(const unsigned char *buf, size_t len) {
     struct tlvdb_root *root;
     const unsigned char *tmp;
     size_t left;
@@ -218,8 +212,7 @@ err:
     return NULL;
 }
 
-struct tlvdb *tlvdb_parse_multi(const unsigned char *buf, size_t len)
-{
+struct tlvdb *tlvdb_parse_multi(const unsigned char *buf, size_t len) {
     struct tlvdb_root *root;
     const unsigned char *tmp;
     size_t left;
@@ -255,8 +248,7 @@ err:
     return NULL;
 }
 
-struct tlvdb *tlvdb_fixed(tlv_tag_t tag, size_t len, const unsigned char *value)
-{
+struct tlvdb *tlvdb_fixed(tlv_tag_t tag, size_t len, const unsigned char *value) {
     struct tlvdb_root *root = malloc(sizeof(*root) + len);
 
     root->len = len;
@@ -270,8 +262,7 @@ struct tlvdb *tlvdb_fixed(tlv_tag_t tag, size_t len, const unsigned char *value)
     return &root->db;
 }
 
-struct tlvdb *tlvdb_external(tlv_tag_t tag, size_t len, const unsigned char *value)
-{
+struct tlvdb *tlvdb_external(tlv_tag_t tag, size_t len, const unsigned char *value) {
     struct tlvdb_root *root = malloc(sizeof(*root));
 
     root->len = 0;
@@ -284,8 +275,7 @@ struct tlvdb *tlvdb_external(tlv_tag_t tag, size_t len, const unsigned char *val
     return &root->db;
 }
 
-void tlvdb_free(struct tlvdb *tlvdb)
-{
+void tlvdb_free(struct tlvdb *tlvdb) {
     struct tlvdb *next = NULL;
 
     if (!tlvdb)
@@ -298,16 +288,14 @@ void tlvdb_free(struct tlvdb *tlvdb)
     }
 }
 
-struct tlvdb *tlvdb_find_next(struct tlvdb *tlvdb, tlv_tag_t tag)
-{
+struct tlvdb *tlvdb_find_next(struct tlvdb *tlvdb, tlv_tag_t tag) {
     if (!tlvdb)
         return NULL;
 
     return tlvdb_find(tlvdb->next, tag);
 }
 
-struct tlvdb *tlvdb_find(struct tlvdb *tlvdb, tlv_tag_t tag)
-{
+struct tlvdb *tlvdb_find(struct tlvdb *tlvdb, tlv_tag_t tag) {
     if (!tlvdb)
         return NULL;
 
@@ -319,8 +307,7 @@ struct tlvdb *tlvdb_find(struct tlvdb *tlvdb, tlv_tag_t tag)
     return NULL;
 }
 
-struct tlvdb *tlvdb_find_full(struct tlvdb *tlvdb, tlv_tag_t tag)
-{
+struct tlvdb *tlvdb_find_full(struct tlvdb *tlvdb, tlv_tag_t tag) {
     if (!tlvdb)
         return NULL;
 
@@ -338,8 +325,7 @@ struct tlvdb *tlvdb_find_full(struct tlvdb *tlvdb, tlv_tag_t tag)
     return NULL;
 }
 
-struct tlvdb *tlvdb_find_path(struct tlvdb *tlvdb, tlv_tag_t tag[])
-{
+struct tlvdb *tlvdb_find_path(struct tlvdb *tlvdb, tlv_tag_t tag[]) {
     int i = 0;
     struct tlvdb *tnext = tlvdb;
 
@@ -354,8 +340,7 @@ struct tlvdb *tlvdb_find_path(struct tlvdb *tlvdb, tlv_tag_t tag[])
     return tnext;
 }
 
-void tlvdb_add(struct tlvdb *tlvdb, struct tlvdb *other)
-{
+void tlvdb_add(struct tlvdb *tlvdb, struct tlvdb *other) {
     if (tlvdb == other)
         return;
 
@@ -369,8 +354,7 @@ void tlvdb_add(struct tlvdb *tlvdb, struct tlvdb *other)
     tlvdb->next = other;
 }
 
-void tlvdb_change_or_add_node_ex(struct tlvdb *tlvdb, tlv_tag_t tag, size_t len, const unsigned char *value, struct tlvdb **tlvdb_elm)
-{
+void tlvdb_change_or_add_node_ex(struct tlvdb *tlvdb, tlv_tag_t tag, size_t len, const unsigned char *value, struct tlvdb **tlvdb_elm) {
     struct tlvdb *telm = tlvdb_find_full(tlvdb, tag);
     if (telm == NULL) {
         // new tlv element
@@ -421,13 +405,11 @@ void tlvdb_change_or_add_node_ex(struct tlvdb *tlvdb, tlv_tag_t tag, size_t len,
     return;
 }
 
-void tlvdb_change_or_add_node(struct tlvdb *tlvdb, tlv_tag_t tag, size_t len, const unsigned char *value)
-{
+void tlvdb_change_or_add_node(struct tlvdb *tlvdb, tlv_tag_t tag, size_t len, const unsigned char *value) {
     tlvdb_change_or_add_node_ex(tlvdb, tag, len, value, NULL);
 }
 
-void tlvdb_visit(const struct tlvdb *tlvdb, tlv_cb cb, void *data, int level)
-{
+void tlvdb_visit(const struct tlvdb *tlvdb, tlv_cb cb, void *data, int level) {
     struct tlvdb *next = NULL;
 
     if (!tlvdb)
@@ -440,8 +422,7 @@ void tlvdb_visit(const struct tlvdb *tlvdb, tlv_cb cb, void *data, int level)
     }
 }
 
-static const struct tlvdb *tlvdb_next(const struct tlvdb *tlvdb)
-{
+static const struct tlvdb *tlvdb_next(const struct tlvdb *tlvdb) {
     if (tlvdb->children)
         return tlvdb->children;
 
@@ -455,8 +436,7 @@ static const struct tlvdb *tlvdb_next(const struct tlvdb *tlvdb)
     return NULL;
 }
 
-const struct tlv *tlvdb_get(const struct tlvdb *tlvdb, tlv_tag_t tag, const struct tlv *prev)
-{
+const struct tlv *tlvdb_get(const struct tlvdb *tlvdb, tlv_tag_t tag, const struct tlv *prev) {
     if (prev) {
 // tlvdb = tlvdb_next(container_of(prev, struct tlvdb, tag));
         tlvdb = tlvdb_next((struct tlvdb *)prev);
@@ -473,22 +453,19 @@ const struct tlv *tlvdb_get(const struct tlvdb *tlvdb, tlv_tag_t tag, const stru
     return NULL;
 }
 
-const struct tlv *tlvdb_get_inchild(const struct tlvdb *tlvdb, tlv_tag_t tag, const struct tlv *prev)
-{
+const struct tlv *tlvdb_get_inchild(const struct tlvdb *tlvdb, tlv_tag_t tag, const struct tlv *prev) {
     tlvdb = tlvdb->children;
     return tlvdb_get(tlvdb, tag, prev);
 }
 
-const struct tlv *tlvdb_get_tlv(const struct tlvdb *tlvdb)
-{
+const struct tlv *tlvdb_get_tlv(const struct tlvdb *tlvdb) {
     if (tlvdb)
         return &tlvdb->tag;
     else
         return NULL;
 }
 
-unsigned char *tlv_encode(const struct tlv *tlv, size_t *len)
-{
+unsigned char *tlv_encode(const struct tlv *tlv, size_t *len) {
     size_t size = tlv->len;
     unsigned char *data;
     size_t pos;
@@ -530,13 +507,11 @@ unsigned char *tlv_encode(const struct tlv *tlv, size_t *len)
     return data;
 }
 
-bool tlv_is_constructed(const struct tlv *tlv)
-{
+bool tlv_is_constructed(const struct tlv *tlv) {
     return (tlv->tag < 0x100 ? tlv->tag : tlv->tag >> 8) & TLV_TAG_COMPLEX;
 }
 
-bool tlv_equal(const struct tlv *a, const struct tlv *b)
-{
+bool tlv_equal(const struct tlv *a, const struct tlv *b) {
     if (!a && !b)
         return true;
 
@@ -546,29 +521,24 @@ bool tlv_equal(const struct tlv *a, const struct tlv *b)
     return a->tag == b->tag && a->len == b->len && !memcmp(a->value, b->value, a->len);
 }
 
-struct tlvdb *tlvdb_elm_get_next(struct tlvdb *tlvdb)
-{
+struct tlvdb *tlvdb_elm_get_next(struct tlvdb *tlvdb) {
     return tlvdb->next;
 }
 
-struct tlvdb *tlvdb_elm_get_children(struct tlvdb *tlvdb)
-{
+struct tlvdb *tlvdb_elm_get_children(struct tlvdb *tlvdb) {
     return tlvdb->children;
 }
 
-struct tlvdb *tlvdb_elm_get_parent(struct tlvdb *tlvdb)
-{
+struct tlvdb *tlvdb_elm_get_parent(struct tlvdb *tlvdb) {
     return tlvdb->parent;
 }
 
-bool tlvdb_get_uint8(struct tlvdb *tlvRoot, tlv_tag_t tag, uint8_t *value)
-{
+bool tlvdb_get_uint8(struct tlvdb *tlvRoot, tlv_tag_t tag, uint8_t *value) {
     const struct tlv *tlvelm = tlvdb_get(tlvRoot, tag, NULL);
     return tlv_get_uint8(tlvelm, value);
 }
 
-bool tlv_get_uint8(const struct tlv *etlv, uint8_t *value)
-{
+bool tlv_get_uint8(const struct tlv *etlv, uint8_t *value) {
     *value = 0;
     if (etlv) {
         if (etlv->len == 0)
@@ -582,8 +552,7 @@ bool tlv_get_uint8(const struct tlv *etlv, uint8_t *value)
     return false;
 }
 
-bool tlv_get_int(const struct tlv *etlv, int *value)
-{
+bool tlv_get_int(const struct tlv *etlv, int *value) {
     *value = 0;
     if (etlv) {
         if (etlv->len == 0)
diff --git a/client/fido/cbortools.c b/client/fido/cbortools.c
index 6cd3b3ca4..b12571538 100644
--- a/client/fido/cbortools.c
+++ b/client/fido/cbortools.c
@@ -16,14 +16,12 @@
 #include "util.h"
 #include "fidocore.h"
 
-static void indent(int nestingLevel)
-{
+static void indent(int nestingLevel) {
     while (nestingLevel--)
         printf("  ");
 }
 
-static CborError dumpelm(CborValue *it, bool *got_next, int nestingLevel)
-{
+static CborError dumpelm(CborValue *it, bool *got_next, int nestingLevel) {
     CborError err;
     *got_next = false;
 
@@ -124,8 +122,7 @@ static CborError dumpelm(CborValue *it, bool *got_next, int nestingLevel)
     return CborNoError;
 }
 
-static CborError dumprecursive(uint8_t cmdCode, bool isResponse, CborValue *it, bool isMapType, int nestingLevel)
-{
+static CborError dumprecursive(uint8_t cmdCode, bool isResponse, CborValue *it, bool isMapType, int nestingLevel) {
     int elmCount = 0;
     while (!cbor_value_at_end(it)) {
         CborError err;
@@ -187,8 +184,7 @@ static CborError dumprecursive(uint8_t cmdCode, bool isResponse, CborValue *it,
     return CborNoError;
 }
 
-int TinyCborInit(uint8_t *data, size_t length, CborValue *cb)
-{
+int TinyCborInit(uint8_t *data, size_t length, CborValue *cb) {
     CborParser parser;
     CborError err = cbor_parser_init(data, length, 0, &parser, cb);
     if (err)
@@ -197,8 +193,7 @@ int TinyCborInit(uint8_t *data, size_t length, CborValue *cb)
     return 0;
 }
 
-int TinyCborPrintFIDOPackage(uint8_t cmdCode, bool isResponse, uint8_t *data, size_t length)
-{
+int TinyCborPrintFIDOPackage(uint8_t cmdCode, bool isResponse, uint8_t *data, size_t length) {
     CborValue cb;
     int res;
     res = TinyCborInit(data, length, &cb);
@@ -221,8 +216,7 @@ int TinyCborPrintFIDOPackage(uint8_t cmdCode, bool isResponse, uint8_t *data, si
     return 0;
 }
 
-int JsonObjElmCount(json_t *elm)
-{
+int JsonObjElmCount(json_t *elm) {
     int res = 0;
     const char *key;
     json_t *value;
@@ -238,8 +232,7 @@ int JsonObjElmCount(json_t *elm)
     return res;
 }
 
-int JsonToCbor(json_t *elm, CborEncoder *encoder)
-{
+int JsonToCbor(json_t *elm, CborEncoder *encoder) {
     if (!elm || !encoder)
         return 1;
 
@@ -323,8 +316,7 @@ int JsonToCbor(json_t *elm, CborEncoder *encoder)
     return 0;
 }
 
-int CborMapGetKeyById(CborParser *parser, CborValue *map, uint8_t *data, size_t dataLen, int key)
-{
+int CborMapGetKeyById(CborParser *parser, CborValue *map, uint8_t *data, size_t dataLen, int key) {
     CborValue cb;
 
     CborError err = cbor_parser_init(data, dataLen, 0, parser, &cb);
@@ -361,13 +353,11 @@ int CborMapGetKeyById(CborParser *parser, CborValue *map, uint8_t *data, size_t
     return 2;
 }
 
-CborError CborGetArrayBinStringValue(CborValue *elm, uint8_t *data, size_t maxdatalen, size_t *datalen)
-{
+CborError CborGetArrayBinStringValue(CborValue *elm, uint8_t *data, size_t maxdatalen, size_t *datalen) {
     return CborGetArrayBinStringValueEx(elm, data, maxdatalen, datalen, NULL, 0);
 }
 
-CborError CborGetArrayBinStringValueEx(CborValue *elm, uint8_t *data, size_t maxdatalen, size_t *datalen, uint8_t *delimeter, size_t delimeterlen)
-{
+CborError CborGetArrayBinStringValueEx(CborValue *elm, uint8_t *data, size_t maxdatalen, size_t *datalen, uint8_t *delimeter, size_t delimeterlen) {
     CborValue array;
     if (datalen)
         *datalen = 0;
@@ -399,8 +389,7 @@ CborError CborGetArrayBinStringValueEx(CborValue *elm, uint8_t *data, size_t max
     return CborNoError;
 };
 
-CborError CborGetBinStringValue(CborValue *elm, uint8_t *data, size_t maxdatalen, size_t *datalen)
-{
+CborError CborGetBinStringValue(CborValue *elm, uint8_t *data, size_t maxdatalen, size_t *datalen) {
     if (datalen)
         *datalen = 0;
 
@@ -415,8 +404,7 @@ CborError CborGetBinStringValue(CborValue *elm, uint8_t *data, size_t maxdatalen
     return CborNoError;
 };
 
-CborError CborGetArrayStringValue(CborValue *elm, char *data, size_t maxdatalen, size_t *datalen, char *delimeter)
-{
+CborError CborGetArrayStringValue(CborValue *elm, char *data, size_t maxdatalen, size_t *datalen, char *delimeter) {
     CborValue array;
     if (datalen)
         *datalen = 0;
@@ -449,8 +437,7 @@ CborError CborGetArrayStringValue(CborValue *elm, char *data, size_t maxdatalen,
     return CborNoError;
 };
 
-CborError CborGetStringValue(CborValue *elm, char *data, size_t maxdatalen, size_t *datalen)
-{
+CborError CborGetStringValue(CborValue *elm, char *data, size_t maxdatalen, size_t *datalen) {
     if (datalen)
         *datalen = 0;
 
@@ -465,16 +452,14 @@ CborError CborGetStringValue(CborValue *elm, char *data, size_t maxdatalen, size
     return CborNoError;
 };
 
-CborError CborGetStringValueBuf(CborValue *elm)
-{
+CborError CborGetStringValueBuf(CborValue *elm) {
     static char stringBuf[2048];
     memset(stringBuf, 0x00, sizeof(stringBuf));
 
     return CborGetStringValue(elm, stringBuf, sizeof(stringBuf), NULL);
 };
 
-int CBOREncodeElm(json_t *root, char *rootElmId, CborEncoder *encoder)
-{
+int CBOREncodeElm(json_t *root, char *rootElmId, CborEncoder *encoder) {
     json_t *elm = NULL;
     if (rootElmId && strlen(rootElmId) && rootElmId[0] == '$')
         elm = json_path_get(root, rootElmId);
@@ -489,8 +474,7 @@ int CBOREncodeElm(json_t *root, char *rootElmId, CborEncoder *encoder)
     return res;
 }
 
-CborError CBOREncodeClientDataHash(json_t *root, CborEncoder *encoder)
-{
+CborError CBOREncodeClientDataHash(json_t *root, CborEncoder *encoder) {
     uint8_t buf[100] = {0};
     size_t jlen;
 
diff --git a/client/fido/cose.c b/client/fido/cose.c
index a21dc5601..48fa6d4d1 100644
--- a/client/fido/cose.c
+++ b/client/fido/cose.c
@@ -38,16 +38,14 @@ COSEValueNameDesc_t COSEKeyTypeValueDesc[] = {
     {4, "Symmetric", "Symmetric Key"},
 };
 
-COSEValueNameDesc_t *GetCOSEktyElm(int id)
-{
+COSEValueNameDesc_t *GetCOSEktyElm(int id) {
     for (int i = 0; i < ARRAYLEN(COSEKeyTypeValueDesc); i++)
         if (COSEKeyTypeValueDesc[i].Value == id)
             return &COSEKeyTypeValueDesc[i];
     return NULL;
 }
 
-const char *GetCOSEktyDescription(int id)
-{
+const char *GetCOSEktyDescription(int id) {
     COSEValueNameDesc_t *elm = GetCOSEktyElm(id);
     if (elm)
         return elm->Description;
@@ -65,16 +63,14 @@ COSEValueTypeNameDesc_t COSECurvesDesc[] = {
     {7, "OKP", "Ed448",    "Ed448 for use w/ EdDSA only"},
 };
 
-COSEValueTypeNameDesc_t *GetCOSECurveElm(int id)
-{
+COSEValueTypeNameDesc_t *GetCOSECurveElm(int id) {
     for (int i = 0; i < ARRAYLEN(COSECurvesDesc); i++)
         if (COSECurvesDesc[i].Value == id)
             return &COSECurvesDesc[i];
     return NULL;
 }
 
-const char *GetCOSECurveDescription(int id)
-{
+const char *GetCOSECurveDescription(int id) {
     COSEValueTypeNameDesc_t *elm = GetCOSECurveElm(id);
     if (elm)
         return elm->Description;
@@ -139,32 +135,28 @@ COSEValueNameDesc_t COSEAlg[] = {
     {33,        "AES-CCM-64-128-256",       "AES-CCM mode 256-bit key, 128-bit tag, 7-byte nonce"}
 };
 
-COSEValueNameDesc_t *GetCOSEAlgElm(int id)
-{
+COSEValueNameDesc_t *GetCOSEAlgElm(int id) {
     for (int i = 0; i < ARRAYLEN(COSEAlg); i++)
         if (COSEAlg[i].Value == id)
             return &COSEAlg[i];
     return NULL;
 }
 
-const char *GetCOSEAlgName(int id)
-{
+const char *GetCOSEAlgName(int id) {
     COSEValueNameDesc_t *elm = GetCOSEAlgElm(id);
     if (elm)
         return elm->Name;
     return COSEEmptyStr;
 }
 
-const char *GetCOSEAlgDescription(int id)
-{
+const char *GetCOSEAlgDescription(int id) {
     COSEValueNameDesc_t *elm = GetCOSEAlgElm(id);
     if (elm)
         return elm->Description;
     return COSEEmptyStr;
 }
 
-int COSEGetECDSAKey(uint8_t *data, size_t datalen, bool verbose, uint8_t *public_key)
-{
+int COSEGetECDSAKey(uint8_t *data, size_t datalen, bool verbose, uint8_t *public_key) {
     CborParser parser;
     CborValue map;
     int64_t i64;
diff --git a/client/fido/fidocore.c b/client/fido/fidocore.c
index 6537ce8eb..2b0aa7b94 100644
--- a/client/fido/fidocore.c
+++ b/client/fido/fidocore.c
@@ -149,8 +149,7 @@ fido2Desc_t fido2CmdGetInfoRespDesc[] = {
     {fido2COSEKey,              ptResponse,   -4, "d - private key"},
 };
 
-char *fido2GetCmdErrorDescription(uint8_t errorCode)
-{
+char *fido2GetCmdErrorDescription(uint8_t errorCode) {
     for (int i = 0; i < sizeof(fido2Errors) / sizeof(fido2Error_t); i++)
         if (fido2Errors[i].ErrorCode == errorCode)
             return fido2Errors[i].Description;
@@ -158,26 +157,23 @@ char *fido2GetCmdErrorDescription(uint8_t errorCode)
     return fido2Errors[0].Description;
 }
 
-char *fido2GetCmdMemberDescription(uint8_t cmdCode, bool isResponse, int memberNum)
-{
+char *fido2GetCmdMemberDescription(uint8_t cmdCode, bool isResponse, int memberNum) {
     for (int i = 0; i < sizeof(fido2CmdGetInfoRespDesc) / sizeof(fido2Desc_t); i++)
         if (fido2CmdGetInfoRespDesc[i].Command == cmdCode &&
-            fido2CmdGetInfoRespDesc[i].PckType == (isResponse ? ptResponse : ptQuery) &&
-            fido2CmdGetInfoRespDesc[i].MemberNumber == memberNum)
+                fido2CmdGetInfoRespDesc[i].PckType == (isResponse ? ptResponse : ptQuery) &&
+                fido2CmdGetInfoRespDesc[i].MemberNumber == memberNum)
             return fido2CmdGetInfoRespDesc[i].Description;
 
     return NULL;
 }
 
-int FIDOSelect(bool ActivateField, bool LeaveFieldON, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw)
-{
+int FIDOSelect(bool ActivateField, bool LeaveFieldON, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
     uint8_t data[] = {0xA0, 0x00, 0x00, 0x06, 0x47, 0x2F, 0x00, 0x01};
 
     return EMVSelect(ECC_CONTACTLESS, ActivateField, LeaveFieldON, data, sizeof(data), Result, MaxResultLen, ResultLen, sw, NULL);
 }
 
-int FIDOExchange(sAPDU apdu, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw)
-{
+int FIDOExchange(sAPDU apdu, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
     int res = EMVExchange(ECC_CONTACTLESS, true, apdu, Result, MaxResultLen, ResultLen, sw, NULL);
     if (res == 5) // apdu result (sw) not a 0x9000
         res = 0;
@@ -195,40 +191,34 @@ int FIDOExchange(sAPDU apdu, uint8_t *Result, size_t MaxResultLen, size_t *Resul
     return res;
 }
 
-int FIDORegister(uint8_t *params, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw)
-{
+int FIDORegister(uint8_t *params, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
     return FIDOExchange((sAPDU) {0x00, 0x01, 0x03, 0x00, 64, params}, Result, MaxResultLen, ResultLen, sw);
 }
 
-int FIDOAuthentication(uint8_t *params, uint8_t paramslen, uint8_t controlb, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw)
-{
+int FIDOAuthentication(uint8_t *params, uint8_t paramslen, uint8_t controlb, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
     return FIDOExchange((sAPDU) {0x00, 0x02, controlb, 0x00, paramslen, params}, Result, MaxResultLen, ResultLen, sw);
 }
 
-int FIDO2GetInfo(uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw)
-{
+int FIDO2GetInfo(uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
     uint8_t data[] = {fido2CmdGetInfo};
     return FIDOExchange((sAPDU) {0x80, 0x10, 0x00, 0x00, sizeof(data), data}, Result, MaxResultLen, ResultLen, sw);
 }
 
-int FIDO2MakeCredential(uint8_t *params, uint8_t paramslen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw)
-{
+int FIDO2MakeCredential(uint8_t *params, uint8_t paramslen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
     uint8_t data[paramslen + 1];
     data[0] = fido2CmdMakeCredential;
     memcpy(&data[1], params, paramslen);
     return FIDOExchange((sAPDU) {0x80, 0x10, 0x00, 0x00, sizeof(data), data}, Result, MaxResultLen, ResultLen, sw);
 }
 
-int FIDO2GetAssertion(uint8_t *params, uint8_t paramslen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw)
-{
+int FIDO2GetAssertion(uint8_t *params, uint8_t paramslen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
     uint8_t data[paramslen + 1];
     data[0] = fido2CmdGetAssertion;
     memcpy(&data[1], params, paramslen);
     return FIDOExchange((sAPDU) {0x80, 0x10, 0x00, 0x00, sizeof(data), data}, Result, MaxResultLen, ResultLen, sw);
 }
 
-int FIDOCheckDERAndGetKey(uint8_t *der, size_t derLen, bool verbose, uint8_t *publicKey, size_t publicKeyMaxLen)
-{
+int FIDOCheckDERAndGetKey(uint8_t *der, size_t derLen, bool verbose, uint8_t *publicKey, size_t publicKeyMaxLen) {
     int res;
 
     // load CA's
@@ -292,8 +282,7 @@ int FIDOCheckDERAndGetKey(uint8_t *der, size_t derLen, bool verbose, uint8_t *pu
 #define fido_check_if(r) if ((r) != CborNoError) {return r;} else
 #define fido_check(r) if ((r) != CborNoError) return r;
 
-int FIDO2CreateMakeCredentionalReq(json_t *root, uint8_t *data, size_t maxdatalen, size_t *datalen)
-{
+int FIDO2CreateMakeCredentionalReq(json_t *root, uint8_t *data, size_t maxdatalen, size_t *datalen) {
     if (datalen)
         *datalen = 0;
     if (!root || !data || !maxdatalen)
@@ -353,8 +342,7 @@ int FIDO2CreateMakeCredentionalReq(json_t *root, uint8_t *data, size_t maxdatale
     return 0;
 }
 
-bool CheckrpIdHash(json_t *json, uint8_t *hash)
-{
+bool CheckrpIdHash(json_t *json, uint8_t *hash) {
     char hashval[300] = {0};
     uint8_t hash2[32] = {0};
 
@@ -367,8 +355,7 @@ bool CheckrpIdHash(json_t *json, uint8_t *hash)
 }
 
 // check ANSI X9.62 format ECDSA signature (on P-256)
-int FIDO2CheckSignature(json_t *root, uint8_t *publickey, uint8_t *sign, size_t signLen, uint8_t *authData, size_t authDataLen, bool verbose)
-{
+int FIDO2CheckSignature(json_t *root, uint8_t *publickey, uint8_t *sign, size_t signLen, uint8_t *authData, size_t authDataLen, bool verbose) {
     int res;
     uint8_t rval[300] = {0};
     uint8_t sval[300] = {0};
@@ -413,8 +400,7 @@ int FIDO2CheckSignature(json_t *root, uint8_t *publickey, uint8_t *sign, size_t
     return 0;
 }
 
-int FIDO2MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, bool verbose, bool verbose2, bool showCBOR, bool showDERTLV)
-{
+int FIDO2MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, bool verbose, bool verbose2, bool showCBOR, bool showDERTLV) {
     CborParser parser;
     CborValue map, mapsmt;
     int res;
@@ -580,8 +566,7 @@ int FIDO2MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, b
     return 0;
 }
 
-int FIDO2CreateGetAssertionReq(json_t *root, uint8_t *data, size_t maxdatalen, size_t *datalen, bool createAllowList)
-{
+int FIDO2CreateGetAssertionReq(json_t *root, uint8_t *data, size_t maxdatalen, size_t *datalen, bool createAllowList) {
     if (datalen)
         *datalen = 0;
     if (!root || !data || !maxdatalen)
@@ -655,8 +640,7 @@ int FIDO2CreateGetAssertionReq(json_t *root, uint8_t *data, size_t maxdatalen, s
     return 0;
 }
 
-int FIDO2GetAssertionParseRes(json_t *root, uint8_t *data, size_t dataLen, bool verbose, bool verbose2, bool showCBOR)
-{
+int FIDO2GetAssertionParseRes(json_t *root, uint8_t *data, size_t dataLen, bool verbose, bool verbose2, bool showCBOR) {
     CborParser parser;
     CborValue map, mapint;
     int res;
diff --git a/client/flash.c b/client/flash.c
index 2e655ff5d..c35e1c630 100644
--- a/client/flash.c
+++ b/client/flash.c
@@ -33,8 +33,7 @@ static const uint8_t elf_ident[] = {
 
 // Turn PHDRs into flasher segments, checking for PHDR sanity and merging adjacent
 // unaligned segments if needed
-static int build_segs_from_phdrs(flash_file_t *ctx, FILE *fd, Elf32_Phdr *phdrs, uint16_t num_phdrs)
-{
+static int build_segs_from_phdrs(flash_file_t *ctx, FILE *fd, Elf32_Phdr *phdrs, uint16_t num_phdrs) {
     Elf32_Phdr *phdr = phdrs;
     flash_seg_t *seg;
     uint32_t last_end = 0;
@@ -154,8 +153,7 @@ static int build_segs_from_phdrs(flash_file_t *ctx, FILE *fd, Elf32_Phdr *phdrs,
 }
 
 // Sanity check segments and check for bootloader writes
-static int check_segs(flash_file_t *ctx, int can_write_bl)
-{
+static int check_segs(flash_file_t *ctx, int can_write_bl) {
     for (int i = 0; i < ctx->num_segs; i++) {
         flash_seg_t *seg = &ctx->segments[i];
 
@@ -180,8 +178,7 @@ static int check_segs(flash_file_t *ctx, int can_write_bl)
 }
 
 // Load an ELF file and prepare it for flashing
-int flash_load(flash_file_t *ctx, const char *name, int can_write_bl)
-{
+int flash_load(flash_file_t *ctx, const char *name, int can_write_bl) {
     FILE *fd = NULL;
     Elf32_Ehdr ehdr;
     Elf32_Phdr *phdrs = NULL;
@@ -202,7 +199,7 @@ int flash_load(flash_file_t *ctx, const char *name, int can_write_bl)
         goto fail;
     }
     if (memcmp(ehdr.e_ident, elf_ident, sizeof(elf_ident))
-        || le32(ehdr.e_version) != 1) {
+            || le32(ehdr.e_version) != 1) {
         fprintf(stderr, "Not an ELF file or wrong ELF type\n");
         goto fail;
     }
@@ -261,8 +258,7 @@ fail:
 }
 
 // Get the state of the proxmark, backwards compatible
-static int get_proxmark_state(uint32_t *state)
-{
+static int get_proxmark_state(uint32_t *state) {
     UsbCommand c = {CMD_DEVICE_INFO};
     SendCommand(&c);
     UsbCommand resp;
@@ -292,8 +288,7 @@ static int get_proxmark_state(uint32_t *state)
 }
 
 // Enter the bootloader to be able to start flashing
-static int enter_bootloader(char *serial_port_name)
-{
+static int enter_bootloader(char *serial_port_name) {
     uint32_t state;
 
     if (get_proxmark_state(&state) < 0)
@@ -309,7 +304,7 @@ static int enter_bootloader(char *serial_port_name)
         memset(&c, 0, sizeof(c));
 
         if ((state & DEVICE_INFO_FLAG_BOOTROM_PRESENT)
-            && (state & DEVICE_INFO_FLAG_OSIMAGE_PRESENT)) {
+                && (state & DEVICE_INFO_FLAG_OSIMAGE_PRESENT)) {
             // New style handover: Send CMD_START_FLASH, which will reset the board
             // and enter the bootrom on the next boot.
             c.cmd = CMD_START_FLASH;
@@ -338,8 +333,7 @@ static int enter_bootloader(char *serial_port_name)
     return -1;
 }
 
-static int wait_for_ack(UsbCommand *ack)
-{
+static int wait_for_ack(UsbCommand *ack) {
     WaitForResponse(CMD_UNKNOWN, ack);
 
     if (ack->cmd != CMD_ACK) {
@@ -353,8 +347,7 @@ static int wait_for_ack(UsbCommand *ack)
 }
 
 // Go into flashing mode
-int flash_start_flashing(int enable_bl_writes, char *serial_port_name)
-{
+int flash_start_flashing(int enable_bl_writes, char *serial_port_name) {
     uint32_t state;
 
     if (enter_bootloader(serial_port_name) < 0)
@@ -386,8 +379,7 @@ int flash_start_flashing(int enable_bl_writes, char *serial_port_name)
     return 0;
 }
 
-static int write_block(uint32_t address, uint8_t *data, uint32_t length)
-{
+static int write_block(uint32_t address, uint8_t *data, uint32_t length) {
     uint8_t block_buf[BLOCK_SIZE];
     memset(block_buf, 0xFF, BLOCK_SIZE);
     memcpy(block_buf, data, length);
@@ -409,8 +401,7 @@ static int write_block(uint32_t address, uint8_t *data, uint32_t length)
 }
 
 // Write a file's segments to Flash
-int flash_write(flash_file_t *ctx)
-{
+int flash_write(flash_file_t *ctx) {
     fprintf(stdout, "Writing segments for file: %s\n", ctx->filename);
     for (int i = 0; i < ctx->num_segs; i++) {
         flash_seg_t *seg = &ctx->segments[i];
@@ -450,8 +441,7 @@ int flash_write(flash_file_t *ctx)
 }
 
 // free a file context
-void flash_free(flash_file_t *ctx)
-{
+void flash_free(flash_file_t *ctx) {
     if (!ctx)
         return;
     if (ctx->segments) {
@@ -464,8 +454,7 @@ void flash_free(flash_file_t *ctx)
 }
 
 // just reset the unit
-int flash_stop_flashing(void)
-{
+int flash_stop_flashing(void) {
     UsbCommand c = {CMD_HARDWARE_RESET};
     SendCommand(&c);
     msleep(100);
diff --git a/client/flasher.c b/client/flasher.c
index 3a784bc08..6e79ca70c 100644
--- a/client/flasher.c
+++ b/client/flasher.c
@@ -20,8 +20,7 @@
 
 #define MAX_FILES 4
 
-void cmd_debug(UsbCommand *c)
-{
+void cmd_debug(UsbCommand *c) {
     //  Debug
     printf("UsbCommand length[len=%zd]\n", sizeof(UsbCommand));
     printf("  cmd[len=%zd]: %016" PRIx64"\n", sizeof(c->cmd), c->cmd);
@@ -36,8 +35,7 @@ void cmd_debug(UsbCommand *c)
     printf("...\n");
 }
 
-static void usage(char *argv0)
-{
+static void usage(char *argv0) {
     fprintf(stdout, "Usage:   %s <port> [-b] image.elf [image.elf...]\n\n", argv0);
     fprintf(stdout, "\t-b\tEnable flashing of bootloader area (DANGEROUS)\n\n");
     fprintf(stdout, "\nExample:\n\n\t %s "SERIAL_PORT_H" armsrc/obj/fullimage.elf\n", argv0);
@@ -50,8 +48,7 @@ static void usage(char *argv0)
 #endif
 }
 
-int main(int argc, char **argv)
-{
+int main(int argc, char **argv) {
     int can_write_bl = 0;
     int num_files = 0;
     int res;
diff --git a/client/fpga_compress.c b/client/fpga_compress.c
index 2ec7fdebf..36e5872e0 100644
--- a/client/fpga_compress.c
+++ b/client/fpga_compress.c
@@ -44,8 +44,7 @@
 
 #define HARDNESTED_TABLE_SIZE (sizeof(uint32_t) * ((1L<<19)+1))
 
-static void usage(void)
-{
+static void usage(void) {
     fprintf(stdout, "Usage: fpga_compress <infile1> <infile2> ... <infile_n> <outfile>\n");
     fprintf(stdout, "          Combine n FPGA bitstream files and compress them into one.\n\n");
     fprintf(stdout, "       fpga_compress -v <infile1> <infile2> ... <infile_n> <outfile>\n");
@@ -57,20 +56,17 @@ static void usage(void)
 }
 
 
-static voidpf fpga_deflate_malloc(voidpf opaque, uInt items, uInt size)
-{
+static voidpf fpga_deflate_malloc(voidpf opaque, uInt items, uInt size) {
     return calloc(items * size, sizeof(uint8_t));
 }
 
 
-static void fpga_deflate_free(voidpf opaque, voidpf address)
-{
+static void fpga_deflate_free(voidpf opaque, voidpf address) {
     free(address);
 }
 
 
-static bool all_feof(FILE *infile[], uint8_t num_infiles)
-{
+static bool all_feof(FILE *infile[], uint8_t num_infiles) {
     for (uint16_t i = 0; i < num_infiles; i++) {
         if (!feof(infile[i])) {
             return false;
@@ -80,8 +76,7 @@ static bool all_feof(FILE *infile[], uint8_t num_infiles)
 }
 
 
-int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile, bool hardnested_mode)
-{
+int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile, bool hardnested_mode) {
     uint8_t *fpga_config;
     uint32_t i;
     int32_t ret;
@@ -195,8 +190,7 @@ int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile, bool hardn
 }
 
 
-int zlib_decompress(FILE *infile, FILE *outfile)
-{
+int zlib_decompress(FILE *infile, FILE *outfile) {
 #define DECOMPRESS_BUF_SIZE 1024
     uint8_t outbuf[DECOMPRESS_BUF_SIZE];
     uint8_t inbuf[DECOMPRESS_BUF_SIZE];
@@ -270,8 +264,7 @@ int zlib_decompress(FILE *infile, FILE *outfile)
  * (big endian), <length> bytes content. Except for section 'e' which has 4 bytes
  * length.
  */
-static int bitparse_find_section(FILE *infile, char section_name, unsigned int *section_length)
-{
+static int bitparse_find_section(FILE *infile, char section_name, unsigned int *section_length) {
     int result = 0;
 #define MAX_FPGA_BIT_STREAM_HEADER_SEARCH 100  // maximum number of bytes to search for the requested section
     uint16_t numbytes = 0;
@@ -315,8 +308,7 @@ static int bitparse_find_section(FILE *infile, char section_name, unsigned int *
     return result;
 }
 
-static int FpgaGatherVersion(FILE *infile, char *infile_name, char *dst, int len)
-{
+static int FpgaGatherVersion(FILE *infile, char *infile_name, char *dst, int len) {
     unsigned int fpga_info_len;
     char tempstr[40] = {0x00};
 
@@ -370,8 +362,7 @@ static int FpgaGatherVersion(FILE *infile, char *infile_name, char *dst, int len
     return 0;
 }
 
-static void print_version_info_preamble(FILE *outfile, int num_infiles)
-{
+static void print_version_info_preamble(FILE *outfile, int num_infiles) {
     fprintf(outfile, "//-----------------------------------------------------------------------------\n");
     fprintf(outfile, "// piwi, 2018\n");
     fprintf(outfile, "//\n");
@@ -389,8 +380,7 @@ static void print_version_info_preamble(FILE *outfile, int num_infiles)
     fprintf(outfile, "const char* const fpga_version_information[%d] = {\n", num_infiles);
 }
 
-static int generate_fpga_version_info(FILE *infile[], char *infile_names[], int num_infiles, FILE *outfile)
-{
+static int generate_fpga_version_info(FILE *infile[], char *infile_names[], int num_infiles, FILE *outfile) {
 
     char version_string[80] = "";
 
@@ -408,8 +398,7 @@ static int generate_fpga_version_info(FILE *infile[], char *infile_names[], int
     return 0;
 }
 
-int main(int argc, char **argv)
-{
+int main(int argc, char **argv) {
     FILE **infiles;
     char **infile_names;
     FILE *outfile;
diff --git a/client/graph.c b/client/graph.c
index b45598d69..4decd40c8 100644
--- a/client/graph.c
+++ b/client/graph.c
@@ -16,8 +16,7 @@ int s_Buff[MAX_GRAPH_TRACE_LEN];
 /* write a manchester bit to the graph
 TODO,  verfy that this doesn't overflow buffer  (iceman)
 */
-void AppendGraph(bool redraw, int clock, int bit)
-{
+void AppendGraph(bool redraw, int clock, int bit) {
     int i;
     //set first half the clock bit (all 1's or 0's for a 0 or 1 bit)
     for (i = 0; i < (int)(clock / 2); ++i)
@@ -31,8 +30,7 @@ void AppendGraph(bool redraw, int clock, int bit)
 }
 
 // clear out our graph window
-int ClearGraph(bool redraw)
-{
+int ClearGraph(bool redraw) {
     int gtl = GraphTraceLen;
     memset(GraphBuffer, 0x00, GraphTraceLen);
     GraphTraceLen = 0;
@@ -41,8 +39,7 @@ int ClearGraph(bool redraw)
     return gtl;
 }
 // option '1' to save GraphBuffer any other to restore
-void save_restoreGB(uint8_t saveOpt)
-{
+void save_restoreGB(uint8_t saveOpt) {
     static int SavedGB[MAX_GRAPH_TRACE_LEN];
     static int SavedGBlen = 0;
     static bool GB_Saved = false;
@@ -62,8 +59,7 @@ void save_restoreGB(uint8_t saveOpt)
     return;
 }
 
-void setGraphBuf(uint8_t *buf, size_t size)
-{
+void setGraphBuf(uint8_t *buf, size_t size) {
     if (buf == NULL) return;
 
     ClearGraph(false);
@@ -79,8 +75,7 @@ void setGraphBuf(uint8_t *buf, size_t size)
     return;
 }
 
-size_t getFromGraphBuf(uint8_t *buf)
-{
+size_t getFromGraphBuf(uint8_t *buf) {
     if (buf == NULL) return 0;
     uint32_t i;
     for (i = 0; i < GraphTraceLen; ++i) {
@@ -93,8 +88,7 @@ size_t getFromGraphBuf(uint8_t *buf)
 }
 
 // A simple test to see if there is any data inside Graphbuffer.
-bool HasGraphData()
-{
+bool HasGraphData() {
     if (GraphTraceLen <= 0) {
         PrintAndLogEx(NORMAL, "No data available, try reading something first");
         return false;
@@ -103,8 +97,7 @@ bool HasGraphData()
 }
 
 // Get or auto-detect ask clock rate
-int GetAskClock(const char *str, bool printAns)
-{
+int GetAskClock(const char *str, bool printAns) {
     if (getSignalProperties()->isnoise)
         return false;
 
@@ -137,8 +130,7 @@ int GetAskClock(const char *str, bool printAns)
     return clock;
 }
 
-uint8_t GetPskCarrier(const char *str, bool printAns)
-{
+uint8_t GetPskCarrier(const char *str, bool printAns) {
     if (getSignalProperties()->isnoise)
         return false;
 
@@ -159,8 +151,7 @@ uint8_t GetPskCarrier(const char *str, bool printAns)
     return carrier;
 }
 
-int GetPskClock(const char *str, bool printAns)
-{
+int GetPskClock(const char *str, bool printAns) {
 
     if (getSignalProperties()->isnoise)
         return -1;
@@ -186,8 +177,7 @@ int GetPskClock(const char *str, bool printAns)
     return clock;
 }
 
-int GetNrzClock(const char *str, bool printAns)
-{
+int GetNrzClock(const char *str, bool printAns) {
 
     if (getSignalProperties()->isnoise)
         return -1;
@@ -213,8 +203,7 @@ int GetNrzClock(const char *str, bool printAns)
 }
 //by marshmellow
 //attempt to detect the field clock and bit clock for FSK
-int GetFskClock(const char *str, bool printAns)
-{
+int GetFskClock(const char *str, bool printAns) {
 
     int clock = param_get32ex(str, 0, 0, 10);
     if (clock != 0)
@@ -237,8 +226,7 @@ int GetFskClock(const char *str, bool printAns)
     PrintAndLogEx(DEBUG, "Detected Field Clocks: FC/%d, FC/%d - Bit Clock: RF/%d", fc1, fc2, rf1);
     return 0;
 }
-bool fskClocks(uint8_t *fc1, uint8_t *fc2, uint8_t *rf1, int *firstClockEdge)
-{
+bool fskClocks(uint8_t *fc1, uint8_t *fc2, uint8_t *rf1, int *firstClockEdge) {
 
     if (getSignalProperties()->isnoise)
         return false;
diff --git a/client/guidummy.cpp b/client/guidummy.cpp
index a51cb37d8..8557b0015 100644
--- a/client/guidummy.cpp
+++ b/client/guidummy.cpp
@@ -10,8 +10,7 @@
 
 #include <stdio.h>
 
-extern "C" void ShowGraphWindow(void)
-{
+extern "C" void ShowGraphWindow(void) {
     static int warned = 0;
 
     if (!warned) {
diff --git a/client/hardnested/hardnested_bf_core.c b/client/hardnested/hardnested_bf_core.c
index a5fbdfcf2..0771ef16e 100644
--- a/client/hardnested/hardnested_bf_core.c
+++ b/client/hardnested/hardnested_bf_core.c
@@ -145,8 +145,7 @@ bitslice_test_nonces_t bitslice_test_nonces_dispatch;
 #define malloc_bitslice(x) __builtin_assume_aligned(_aligned_malloc((x), MAX_BITSLICES/8), MAX_BITSLICES/8)
 #define free_bitslice(x) _aligned_free(x)
 #elif defined (__APPLE__)
-static void *malloc_bitslice(size_t x)
-{
+static void *malloc_bitslice(size_t x) {
     char *allocated_memory;
     if (posix_memalign((void **)&allocated_memory, MAX_BITSLICES / 8, x)) {
         return NULL;
@@ -174,8 +173,7 @@ static bitslice_t bs_ones;
 static bitslice_t bs_zeroes;
 
 
-void BITSLICE_TEST_NONCES(uint32_t nonces_to_bruteforce, uint32_t *bf_test_nonce, uint8_t *bf_test_nonce_par)
-{
+void BITSLICE_TEST_NONCES(uint32_t nonces_to_bruteforce, uint32_t *bf_test_nonce, uint8_t *bf_test_nonce_par) {
 
     // initialize 1 and 0 vectors
     memset(bs_ones.bytes, 0xff, VECTOR_SIZE);
@@ -207,8 +205,7 @@ void BITSLICE_TEST_NONCES(uint32_t nonces_to_bruteforce, uint32_t *bf_test_nonce
 }
 
 
-const uint64_t CRACK_STATES_BITSLICED(uint32_t cuid, uint8_t *best_first_bytes, statelist_t *p, uint32_t *keys_found, uint64_t *num_keys_tested, uint32_t nonces_to_bruteforce, uint8_t *bf_test_nonce_2nd_byte, noncelist_t *nonces)
-{
+const uint64_t CRACK_STATES_BITSLICED(uint32_t cuid, uint8_t *best_first_bytes, statelist_t *p, uint32_t *keys_found, uint64_t *num_keys_tested, uint32_t nonces_to_bruteforce, uint8_t *bf_test_nonce_2nd_byte, noncelist_t *nonces) {
 
     // Unlike aczid's implementation this doesn't roll back at all when performing bitsliced bruteforce.
     // We know that the best first byte is already shifted in. Testing with the remaining three bytes of
@@ -432,11 +429,11 @@ const uint64_t CRACK_STATES_BITSLICED(uint32_t cuid, uint8_t *best_first_bytes,
                         // the short-circuiting also helps
                         if (results.bytes64[0] == 0
 #if MAX_BITSLICES > 64
-                            && results.bytes64[1] == 0
+                                && results.bytes64[1] == 0
 #endif
 #if MAX_BITSLICES > 128
-                            && results.bytes64[2] == 0
-                            && results.bytes64[3] == 0
+                                && results.bytes64[2] == 0
+                                && results.bytes64[3] == 0
 #endif
                            ) {
 #if defined (DEBUG_BRUTE_FORCE)
@@ -551,16 +548,14 @@ bitslice_test_nonces_t *bitslice_test_nonces_function_p = &bitslice_test_nonces_
 
 static SIMDExecInstr intSIMDInstr = SIMD_AUTO;
 
-void SetSIMDInstr(SIMDExecInstr instr)
-{
+void SetSIMDInstr(SIMDExecInstr instr) {
     intSIMDInstr = instr;
 
     crack_states_bitsliced_function_p = &crack_states_bitsliced_dispatch;
     bitslice_test_nonces_function_p = &bitslice_test_nonces_dispatch;
 }
 
-SIMDExecInstr GetSIMDInstr()
-{
+SIMDExecInstr GetSIMDInstr() {
     SIMDExecInstr instr = SIMD_NONE;
 
 #if defined (__i386__) || defined (__x86_64__)
@@ -582,8 +577,7 @@ SIMDExecInstr GetSIMDInstr()
     return instr;
 }
 
-SIMDExecInstr GetSIMDInstrAuto()
-{
+SIMDExecInstr GetSIMDInstrAuto() {
     SIMDExecInstr instr = intSIMDInstr;
     if (instr == SIMD_AUTO)
         return GetSIMDInstr();
@@ -592,8 +586,7 @@ SIMDExecInstr GetSIMDInstrAuto()
 }
 
 // determine the available instruction set at runtime and call the correct function
-const uint64_t crack_states_bitsliced_dispatch(uint32_t cuid, uint8_t *best_first_bytes, statelist_t *p, uint32_t *keys_found, uint64_t *num_keys_tested, uint32_t nonces_to_bruteforce, uint8_t *bf_test_nonce_2nd_byte, noncelist_t *nonces)
-{
+const uint64_t crack_states_bitsliced_dispatch(uint32_t cuid, uint8_t *best_first_bytes, statelist_t *p, uint32_t *keys_found, uint64_t *num_keys_tested, uint32_t nonces_to_bruteforce, uint8_t *bf_test_nonce_2nd_byte, noncelist_t *nonces) {
     switch (GetSIMDInstrAuto()) {
 #if defined (__i386__) || defined (__x86_64__)
 #if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
@@ -625,8 +618,7 @@ const uint64_t crack_states_bitsliced_dispatch(uint32_t cuid, uint8_t *best_firs
     return (*crack_states_bitsliced_function_p)(cuid, best_first_bytes, p, keys_found, num_keys_tested, nonces_to_bruteforce, bf_test_nonce_2nd_byte, nonces);
 }
 
-void bitslice_test_nonces_dispatch(uint32_t nonces_to_bruteforce, uint32_t *bf_test_nonce, uint8_t *bf_test_nonce_par)
-{
+void bitslice_test_nonces_dispatch(uint32_t nonces_to_bruteforce, uint32_t *bf_test_nonce, uint8_t *bf_test_nonce_par) {
     switch (GetSIMDInstrAuto()) {
 #if defined (__i386__) || defined (__x86_64__)
 #if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
@@ -659,13 +651,11 @@ void bitslice_test_nonces_dispatch(uint32_t nonces_to_bruteforce, uint32_t *bf_t
 }
 
 // Entries to dispatched function calls
-const uint64_t crack_states_bitsliced(uint32_t cuid, uint8_t *best_first_bytes, statelist_t *p, uint32_t *keys_found, uint64_t *num_keys_tested, uint32_t nonces_to_bruteforce, uint8_t *bf_test_nonce_2nd_byte, noncelist_t *nonces)
-{
+const uint64_t crack_states_bitsliced(uint32_t cuid, uint8_t *best_first_bytes, statelist_t *p, uint32_t *keys_found, uint64_t *num_keys_tested, uint32_t nonces_to_bruteforce, uint8_t *bf_test_nonce_2nd_byte, noncelist_t *nonces) {
     return (*crack_states_bitsliced_function_p)(cuid, best_first_bytes, p, keys_found, num_keys_tested, nonces_to_bruteforce, bf_test_nonce_2nd_byte, nonces);
 }
 
-void bitslice_test_nonces(uint32_t nonces_to_bruteforce, uint32_t *bf_test_nonce, uint8_t *bf_test_nonce_par)
-{
+void bitslice_test_nonces(uint32_t nonces_to_bruteforce, uint32_t *bf_test_nonce, uint8_t *bf_test_nonce_par) {
     (*bitslice_test_nonces_function_p)(nonces_to_bruteforce, bf_test_nonce, bf_test_nonce_par);
 }
 
diff --git a/client/hardnested/hardnested_bitarray_core.c b/client/hardnested/hardnested_bitarray_core.c
index 6a91f67eb..788d95597 100644
--- a/client/hardnested/hardnested_bitarray_core.c
+++ b/client/hardnested/hardnested_bitarray_core.c
@@ -143,8 +143,7 @@ typedef uint32_t count_bitarray_AND4_t(uint32_t *, uint32_t *, uint32_t *, uint3
 count_bitarray_AND4_t count_bitarray_AND4_AVX512, count_bitarray_AND4_AVX2, count_bitarray_AND4_AVX, count_bitarray_AND4_SSE2, count_bitarray_AND4_MMX, count_bitarray_AND4_NOSIMD, count_bitarray_AND4_dispatch;
 
 
-inline uint32_t *MALLOC_BITARRAY(uint32_t x)
-{
+inline uint32_t *MALLOC_BITARRAY(uint32_t x) {
 #if defined (_WIN32)
     return __builtin_assume_aligned(_aligned_malloc((x), __BIGGEST_ALIGNMENT__), __BIGGEST_ALIGNMENT__);
 #elif defined (__APPLE__)
@@ -160,8 +159,7 @@ inline uint32_t *MALLOC_BITARRAY(uint32_t x)
 }
 
 
-inline void FREE_BITARRAY(uint32_t *x)
-{
+inline void FREE_BITARRAY(uint32_t *x) {
 #ifdef _WIN32
     _aligned_free(x);
 #else
@@ -170,14 +168,12 @@ inline void FREE_BITARRAY(uint32_t *x)
 }
 
 
-inline uint32_t BITCOUNT(uint32_t a)
-{
+inline uint32_t BITCOUNT(uint32_t a) {
     return __builtin_popcountl(a);
 }
 
 
-inline uint32_t COUNT_STATES(uint32_t *A)
-{
+inline uint32_t COUNT_STATES(uint32_t *A) {
     uint32_t count = 0;
     for (uint32_t i = 0; i < (1 << 19); i++) {
         count += BITCOUNT(A[i]);
@@ -186,8 +182,7 @@ inline uint32_t COUNT_STATES(uint32_t *A)
 }
 
 
-inline void BITARRAY_AND(uint32_t *restrict A, uint32_t *restrict B)
-{
+inline void BITARRAY_AND(uint32_t *restrict A, uint32_t *restrict B) {
     A = __builtin_assume_aligned(A, __BIGGEST_ALIGNMENT__);
     B = __builtin_assume_aligned(B, __BIGGEST_ALIGNMENT__);
     for (uint32_t i = 0; i < (1 << 19); i++) {
@@ -196,8 +191,7 @@ inline void BITARRAY_AND(uint32_t *restrict A, uint32_t *restrict B)
 }
 
 
-inline void BITARRAY_LOW20_AND(uint32_t *restrict A, uint32_t *restrict B)
-{
+inline void BITARRAY_LOW20_AND(uint32_t *restrict A, uint32_t *restrict B) {
     uint16_t *a = (uint16_t *)__builtin_assume_aligned(A, __BIGGEST_ALIGNMENT__);
     uint16_t *b = (uint16_t *)__builtin_assume_aligned(B, __BIGGEST_ALIGNMENT__);
 
@@ -209,8 +203,7 @@ inline void BITARRAY_LOW20_AND(uint32_t *restrict A, uint32_t *restrict B)
 }
 
 
-inline uint32_t COUNT_BITARRAY_AND(uint32_t *restrict A, uint32_t *restrict B)
-{
+inline uint32_t COUNT_BITARRAY_AND(uint32_t *restrict A, uint32_t *restrict B) {
     A = __builtin_assume_aligned(A, __BIGGEST_ALIGNMENT__);
     B = __builtin_assume_aligned(B, __BIGGEST_ALIGNMENT__);
     uint32_t count = 0;
@@ -222,8 +215,7 @@ inline uint32_t COUNT_BITARRAY_AND(uint32_t *restrict A, uint32_t *restrict B)
 }
 
 
-inline uint32_t COUNT_BITARRAY_LOW20_AND(uint32_t *restrict A, uint32_t *restrict B)
-{
+inline uint32_t COUNT_BITARRAY_LOW20_AND(uint32_t *restrict A, uint32_t *restrict B) {
     uint16_t *a = (uint16_t *)__builtin_assume_aligned(A, __BIGGEST_ALIGNMENT__);
     uint16_t *b = (uint16_t *)__builtin_assume_aligned(B, __BIGGEST_ALIGNMENT__);
     uint32_t count = 0;
@@ -238,8 +230,7 @@ inline uint32_t COUNT_BITARRAY_LOW20_AND(uint32_t *restrict A, uint32_t *restric
 }
 
 
-inline void BITARRAY_AND4(uint32_t *restrict A, uint32_t *restrict B, uint32_t *restrict C, uint32_t *restrict D)
-{
+inline void BITARRAY_AND4(uint32_t *restrict A, uint32_t *restrict B, uint32_t *restrict C, uint32_t *restrict D) {
     A = __builtin_assume_aligned(A, __BIGGEST_ALIGNMENT__);
     B = __builtin_assume_aligned(B, __BIGGEST_ALIGNMENT__);
     C = __builtin_assume_aligned(C, __BIGGEST_ALIGNMENT__);
@@ -250,8 +241,7 @@ inline void BITARRAY_AND4(uint32_t *restrict A, uint32_t *restrict B, uint32_t *
 }
 
 
-inline void BITARRAY_OR(uint32_t *restrict A, uint32_t *restrict B)
-{
+inline void BITARRAY_OR(uint32_t *restrict A, uint32_t *restrict B) {
     A = __builtin_assume_aligned(A, __BIGGEST_ALIGNMENT__);
     B = __builtin_assume_aligned(B, __BIGGEST_ALIGNMENT__);
     for (uint32_t i = 0; i < (1 << 19); i++) {
@@ -260,8 +250,7 @@ inline void BITARRAY_OR(uint32_t *restrict A, uint32_t *restrict B)
 }
 
 
-inline uint32_t COUNT_BITARRAY_AND2(uint32_t *restrict A, uint32_t *restrict B)
-{
+inline uint32_t COUNT_BITARRAY_AND2(uint32_t *restrict A, uint32_t *restrict B) {
     A = __builtin_assume_aligned(A, __BIGGEST_ALIGNMENT__);
     B = __builtin_assume_aligned(B, __BIGGEST_ALIGNMENT__);
     uint32_t count = 0;
@@ -272,8 +261,7 @@ inline uint32_t COUNT_BITARRAY_AND2(uint32_t *restrict A, uint32_t *restrict B)
 }
 
 
-inline uint32_t COUNT_BITARRAY_AND3(uint32_t *restrict A, uint32_t *restrict B, uint32_t *restrict C)
-{
+inline uint32_t COUNT_BITARRAY_AND3(uint32_t *restrict A, uint32_t *restrict B, uint32_t *restrict C) {
     A = __builtin_assume_aligned(A, __BIGGEST_ALIGNMENT__);
     B = __builtin_assume_aligned(B, __BIGGEST_ALIGNMENT__);
     C = __builtin_assume_aligned(C, __BIGGEST_ALIGNMENT__);
@@ -285,8 +273,7 @@ inline uint32_t COUNT_BITARRAY_AND3(uint32_t *restrict A, uint32_t *restrict B,
 }
 
 
-inline uint32_t COUNT_BITARRAY_AND4(uint32_t *restrict A, uint32_t *restrict B, uint32_t *restrict C, uint32_t *restrict D)
-{
+inline uint32_t COUNT_BITARRAY_AND4(uint32_t *restrict A, uint32_t *restrict B, uint32_t *restrict C, uint32_t *restrict D) {
     A = __builtin_assume_aligned(A, __BIGGEST_ALIGNMENT__);
     B = __builtin_assume_aligned(B, __BIGGEST_ALIGNMENT__);
     C = __builtin_assume_aligned(C, __BIGGEST_ALIGNMENT__);
@@ -317,8 +304,7 @@ count_bitarray_AND3_t *count_bitarray_AND3_function_p = &count_bitarray_AND3_dis
 count_bitarray_AND4_t *count_bitarray_AND4_function_p = &count_bitarray_AND4_dispatch;
 
 // determine the available instruction set at runtime and call the correct function
-uint32_t *malloc_bitarray_dispatch(uint32_t x)
-{
+uint32_t *malloc_bitarray_dispatch(uint32_t x) {
 #if defined (__i386__) || defined (__x86_64__)
 #if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
 #if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
@@ -339,8 +325,7 @@ uint32_t *malloc_bitarray_dispatch(uint32_t x)
     return (*malloc_bitarray_function_p)(x);
 }
 
-void free_bitarray_dispatch(uint32_t *x)
-{
+void free_bitarray_dispatch(uint32_t *x) {
 #if defined (__i386__) || defined (__x86_64__)
 #if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
 #if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
@@ -361,8 +346,7 @@ void free_bitarray_dispatch(uint32_t *x)
     (*free_bitarray_function_p)(x);
 }
 
-uint32_t bitcount_dispatch(uint32_t a)
-{
+uint32_t bitcount_dispatch(uint32_t a) {
 #if defined (__i386__) || defined (__x86_64__)
 #if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
 #if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
@@ -383,8 +367,7 @@ uint32_t bitcount_dispatch(uint32_t a)
     return (*bitcount_function_p)(a);
 }
 
-uint32_t count_states_dispatch(uint32_t *bitarray)
-{
+uint32_t count_states_dispatch(uint32_t *bitarray) {
 #if defined (__i386__) || defined (__x86_64__)
 #if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
 #if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
@@ -405,8 +388,7 @@ uint32_t count_states_dispatch(uint32_t *bitarray)
     return (*count_states_function_p)(bitarray);
 }
 
-void bitarray_AND_dispatch(uint32_t *A, uint32_t *B)
-{
+void bitarray_AND_dispatch(uint32_t *A, uint32_t *B) {
 #if defined (__i386__) || defined (__x86_64__)
 #if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
 #if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
@@ -427,8 +409,7 @@ void bitarray_AND_dispatch(uint32_t *A, uint32_t *B)
     (*bitarray_AND_function_p)(A, B);
 }
 
-void bitarray_low20_AND_dispatch(uint32_t *A, uint32_t *B)
-{
+void bitarray_low20_AND_dispatch(uint32_t *A, uint32_t *B) {
 #if defined (__i386__) || defined (__x86_64__)
 #if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
 #if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
@@ -449,8 +430,7 @@ void bitarray_low20_AND_dispatch(uint32_t *A, uint32_t *B)
     (*bitarray_low20_AND_function_p)(A, B);
 }
 
-uint32_t count_bitarray_AND_dispatch(uint32_t *A, uint32_t *B)
-{
+uint32_t count_bitarray_AND_dispatch(uint32_t *A, uint32_t *B) {
 #if defined (__i386__) || defined (__x86_64__)
 #if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
 #if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
@@ -471,8 +451,7 @@ uint32_t count_bitarray_AND_dispatch(uint32_t *A, uint32_t *B)
     return (*count_bitarray_AND_function_p)(A, B);
 }
 
-uint32_t count_bitarray_low20_AND_dispatch(uint32_t *A, uint32_t *B)
-{
+uint32_t count_bitarray_low20_AND_dispatch(uint32_t *A, uint32_t *B) {
 #if defined (__i386__) || defined (__x86_64__)
 #if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
 #if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
@@ -493,8 +472,7 @@ uint32_t count_bitarray_low20_AND_dispatch(uint32_t *A, uint32_t *B)
     return (*count_bitarray_low20_AND_function_p)(A, B);
 }
 
-void bitarray_AND4_dispatch(uint32_t *A, uint32_t *B, uint32_t *C, uint32_t *D)
-{
+void bitarray_AND4_dispatch(uint32_t *A, uint32_t *B, uint32_t *C, uint32_t *D) {
 #if defined (__i386__) || defined (__x86_64__)
 #if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
 #if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
@@ -515,8 +493,7 @@ void bitarray_AND4_dispatch(uint32_t *A, uint32_t *B, uint32_t *C, uint32_t *D)
     (*bitarray_AND4_function_p)(A, B, C, D);
 }
 
-void bitarray_OR_dispatch(uint32_t *A, uint32_t *B)
-{
+void bitarray_OR_dispatch(uint32_t *A, uint32_t *B) {
 #if defined (__i386__) || defined (__x86_64__)
 #if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
 #if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
@@ -537,8 +514,7 @@ void bitarray_OR_dispatch(uint32_t *A, uint32_t *B)
     (*bitarray_OR_function_p)(A, B);
 }
 
-uint32_t count_bitarray_AND2_dispatch(uint32_t *A, uint32_t *B)
-{
+uint32_t count_bitarray_AND2_dispatch(uint32_t *A, uint32_t *B) {
 #if defined (__i386__) || defined (__x86_64__)
 #if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
 #if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
@@ -559,8 +535,7 @@ uint32_t count_bitarray_AND2_dispatch(uint32_t *A, uint32_t *B)
     return (*count_bitarray_AND2_function_p)(A, B);
 }
 
-uint32_t count_bitarray_AND3_dispatch(uint32_t *A, uint32_t *B, uint32_t *C)
-{
+uint32_t count_bitarray_AND3_dispatch(uint32_t *A, uint32_t *B, uint32_t *C) {
 #if defined (__i386__) || defined (__x86_64__)
 #if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
 #if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
@@ -581,8 +556,7 @@ uint32_t count_bitarray_AND3_dispatch(uint32_t *A, uint32_t *B, uint32_t *C)
     return (*count_bitarray_AND3_function_p)(A, B, C);
 }
 
-uint32_t count_bitarray_AND4_dispatch(uint32_t *A, uint32_t *B, uint32_t *C, uint32_t *D)
-{
+uint32_t count_bitarray_AND4_dispatch(uint32_t *A, uint32_t *B, uint32_t *C, uint32_t *D) {
 #if defined (__i386__) || defined (__x86_64__)
 #if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
 #if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
@@ -607,68 +581,55 @@ uint32_t count_bitarray_AND4_dispatch(uint32_t *A, uint32_t *B, uint32_t *C, uin
 ///////////////////////////////////////////////77
 // Entries to dispatched function calls
 
-uint32_t *malloc_bitarray(uint32_t x)
-{
+uint32_t *malloc_bitarray(uint32_t x) {
     return (*malloc_bitarray_function_p)(x);
 }
 
-void free_bitarray(uint32_t *x)
-{
+void free_bitarray(uint32_t *x) {
     (*free_bitarray_function_p)(x);
 }
 
-uint32_t bitcount(uint32_t a)
-{
+uint32_t bitcount(uint32_t a) {
     return (*bitcount_function_p)(a);
 }
 
-uint32_t count_states(uint32_t *bitarray)
-{
+uint32_t count_states(uint32_t *bitarray) {
     return (*count_states_function_p)(bitarray);
 }
 
-void bitarray_AND(uint32_t *A, uint32_t *B)
-{
+void bitarray_AND(uint32_t *A, uint32_t *B) {
     (*bitarray_AND_function_p)(A, B);
 }
 
-void bitarray_low20_AND(uint32_t *A, uint32_t *B)
-{
+void bitarray_low20_AND(uint32_t *A, uint32_t *B) {
     (*bitarray_low20_AND_function_p)(A, B);
 }
 
-uint32_t count_bitarray_AND(uint32_t *A, uint32_t *B)
-{
+uint32_t count_bitarray_AND(uint32_t *A, uint32_t *B) {
     return (*count_bitarray_AND_function_p)(A, B);
 }
 
-uint32_t count_bitarray_low20_AND(uint32_t *A, uint32_t *B)
-{
+uint32_t count_bitarray_low20_AND(uint32_t *A, uint32_t *B) {
     return (*count_bitarray_low20_AND_function_p)(A, B);
 }
 
-void bitarray_AND4(uint32_t *A, uint32_t *B, uint32_t *C, uint32_t *D)
-{
+void bitarray_AND4(uint32_t *A, uint32_t *B, uint32_t *C, uint32_t *D) {
     (*bitarray_AND4_function_p)(A, B, C, D);
 }
 
-void bitarray_OR(uint32_t *A, uint32_t *B)
-{
+void bitarray_OR(uint32_t *A, uint32_t *B) {
     (*bitarray_OR_function_p)(A, B);
 }
 
-uint32_t count_bitarray_AND2(uint32_t *A, uint32_t *B)
-{
+uint32_t count_bitarray_AND2(uint32_t *A, uint32_t *B) {
     return (*count_bitarray_AND2_function_p)(A, B);
 }
 
-uint32_t count_bitarray_AND3(uint32_t *A, uint32_t *B, uint32_t *C)
-{
+uint32_t count_bitarray_AND3(uint32_t *A, uint32_t *B, uint32_t *C) {
     return (*count_bitarray_AND3_function_p)(A, B, C);
 }
 
-uint32_t count_bitarray_AND4(uint32_t *A, uint32_t *B, uint32_t *C, uint32_t *D)
-{
+uint32_t count_bitarray_AND4(uint32_t *A, uint32_t *B, uint32_t *C, uint32_t *D) {
     return (*count_bitarray_AND4_function_p)(A, B, C, D);
 }
 
diff --git a/client/hardnested/hardnested_bruteforce.c b/client/hardnested/hardnested_bruteforce.c
index 43494bc11..9ecec900a 100644
--- a/client/hardnested/hardnested_bruteforce.c
+++ b/client/hardnested/hardnested_bruteforce.c
@@ -89,8 +89,7 @@ static uint32_t keys_found = 0;
 static uint64_t num_keys_tested;
 static uint64_t found_bs_key = 0;
 
-inline uint8_t trailing_zeros(uint8_t byte)
-{
+inline uint8_t trailing_zeros(uint8_t byte) {
     static const uint8_t trailing_zeros_LUT[256] = {
         8, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
         4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
@@ -114,8 +113,7 @@ inline uint8_t trailing_zeros(uint8_t byte)
 }
 
 
-bool verify_key(uint32_t cuid, noncelist_t *nonces, uint8_t *best_first_bytes, uint32_t odd, uint32_t even)
-{
+bool verify_key(uint32_t cuid, noncelist_t *nonces, uint8_t *best_first_bytes, uint32_t odd, uint32_t even) {
     struct Crypto1State pcs;
     for (uint16_t test_first_byte = 1; test_first_byte < 256; test_first_byte++) {
         noncelistentry_t *test_nonce = nonces[best_first_bytes[test_first_byte]].first;
@@ -144,8 +142,7 @@ static void *
 __attribute__((force_align_arg_pointer))
 #endif
 #endif
-crack_states_thread(void *x)
-{
+crack_states_thread(void *x) {
     struct arg {
         bool silent;
         int thread_ID;
@@ -193,8 +190,7 @@ crack_states_thread(void *x)
 }
 
 
-void prepare_bf_test_nonces(noncelist_t *nonces, uint8_t best_first_byte)
-{
+void prepare_bf_test_nonces(noncelist_t *nonces, uint8_t best_first_byte) {
     // we do bitsliced brute forcing with best_first_bytes[0] only.
     // Extract the corresponding 2nd bytes
     noncelistentry_t *test_nonce = nonces[best_first_byte].first;
@@ -221,13 +217,13 @@ void prepare_bf_test_nonces(noncelist_t *nonces, uint8_t best_first_byte)
             if (n2 != n1) {
                 for (uint16_t n3 = 0; n3 < nonces_to_bruteforce; n3++) {
                     if ((n3 != n2 && n3 != n1) || nonces_to_bruteforce < 3
-                        // && trailing_zeros(bf_test_nonce_2nd_byte[n1] ^ bf_test_nonce_2nd_byte[n2])
-                        // > trailing_zeros(bf_test_nonce_2nd_byte[n2] ^ bf_test_nonce_2nd_byte[n3])
+                            // && trailing_zeros(bf_test_nonce_2nd_byte[n1] ^ bf_test_nonce_2nd_byte[n2])
+                            // > trailing_zeros(bf_test_nonce_2nd_byte[n2] ^ bf_test_nonce_2nd_byte[n3])
                        ) {
                         for (uint16_t n4 = 0; n4 < nonces_to_bruteforce; n4++) {
                             if ((n4 != n3 && n4 != n2 && n4 != n1) || nonces_to_bruteforce < 4
-                                // && trailing_zeros(bf_test_nonce_2nd_byte[n2] ^ bf_test_nonce_2nd_byte[n3])
-                                // > trailing_zeros(bf_test_nonce_2nd_byte[n3] ^ bf_test_nonce_2nd_byte[n4])
+                                    // && trailing_zeros(bf_test_nonce_2nd_byte[n2] ^ bf_test_nonce_2nd_byte[n3])
+                                    // > trailing_zeros(bf_test_nonce_2nd_byte[n3] ^ bf_test_nonce_2nd_byte[n4])
                                ) {
                                 int sum = nonces_to_bruteforce > 1 ? trailing_zeros(bf_test_nonce_2nd_byte[n1] ^ bf_test_nonce_2nd_byte[n2]) : 0.0
                                           + nonces_to_bruteforce > 2 ? trailing_zeros(bf_test_nonce_2nd_byte[n2] ^ bf_test_nonce_2nd_byte[n3]) : 0.0
@@ -265,8 +261,7 @@ void prepare_bf_test_nonces(noncelist_t *nonces, uint8_t best_first_byte)
 
 
 #if defined (WRITE_BENCH_FILE)
-static void write_benchfile(statelist_t *candidates)
-{
+static void write_benchfile(statelist_t *candidates) {
 
     printf("Writing brute force benchmark data...");
     FILE *benchfile = fopen(TEST_BENCH_FILENAME, "wb");
@@ -291,8 +286,7 @@ static void write_benchfile(statelist_t *candidates)
 #endif
 
 
-bool brute_force_bs(float *bf_rate, statelist_t *candidates, uint32_t cuid, uint32_t num_acquired_nonces, uint64_t maximum_states, noncelist_t *nonces, uint8_t *best_first_bytes, uint64_t *foundkey)
-{
+bool brute_force_bs(float *bf_rate, statelist_t *candidates, uint32_t cuid, uint32_t num_acquired_nonces, uint64_t maximum_states, noncelist_t *nonces, uint8_t *best_first_bytes, uint64_t *foundkey) {
 #if defined (WRITE_BENCH_FILE)
     write_benchfile(candidates);
 #endif
@@ -357,8 +351,7 @@ bool brute_force_bs(float *bf_rate, statelist_t *candidates, uint32_t cuid, uint
 }
 
 
-static bool read_bench_data(statelist_t *test_candidates)
-{
+static bool read_bench_data(statelist_t *test_candidates) {
 
     size_t bytes_read = 0;
     uint32_t temp = 0;
@@ -429,8 +422,7 @@ static bool read_bench_data(statelist_t *test_candidates)
 }
 
 
-float brute_force_benchmark()
-{
+float brute_force_benchmark() {
     statelist_t test_candidates[NUM_BRUTE_FORCE_THREADS];
 
     test_candidates[0].states[ODD_STATE] = malloc((TEST_BENCH_SIZE + 1) * sizeof(uint32_t));
diff --git a/client/hardnested/hardnested_tables.c b/client/hardnested/hardnested_tables.c
index 6fb7fc030..bc92e5f10 100644
--- a/client/hardnested/hardnested_tables.c
+++ b/client/hardnested/hardnested_tables.c
@@ -38,8 +38,7 @@ typedef enum {
 } odd_even_t;
 
 
-static uint16_t PartialSumProperty(uint32_t state, odd_even_t odd_even)
-{
+static uint16_t PartialSumProperty(uint32_t state, odd_even_t odd_even) {
     uint16_t sum = 0;
     for (uint16_t j = 0; j < 16; j++) {
         uint32_t st = state;
@@ -68,26 +67,22 @@ static uint16_t PartialSumProperty(uint32_t state, odd_even_t odd_even)
 #define malloc_bitarray(x) __builtin_assume_aligned(_aligned_malloc(x, __BIGGEST_ALIGNMENT__), __BIGGEST_ALIGNMENT__)
 #define free_bitarray(x) _aligned_free(x)
 
-static inline void clear_bitarray24(uint32_t *bitarray)
-{
+static inline void clear_bitarray24(uint32_t *bitarray) {
     memset(bitarray, 0x00, sizeof(uint32_t) * (1 << 19));
 }
 
 
-static inline uint32_t test_bit24(uint32_t *bitarray, uint32_t index)
-{
+static inline uint32_t test_bit24(uint32_t *bitarray, uint32_t index) {
     return bitarray[index >> 5] & (0x80000000 >> (index & 0x0000001f));
 }
 
 
-static inline void set_bit24(uint32_t *bitarray, uint32_t index)
-{
+static inline void set_bit24(uint32_t *bitarray, uint32_t index) {
     bitarray[index >> 5] |= 0x80000000 >> (index & 0x0000001f);
 }
 
 
-static inline uint32_t next_state(uint32_t *bitset, uint32_t state)
-{
+static inline uint32_t next_state(uint32_t *bitset, uint32_t state) {
     if (++state == 1 << 24) return 1 << 24;
     uint32_t index = state >> 5;
     uint_fast8_t bit = state & 0x1f;
@@ -120,8 +115,7 @@ static inline uint32_t next_state(uint32_t *bitset, uint32_t state)
 }
 
 
-static inline uint32_t next_not_state(uint32_t *bitset, uint32_t state)
-{
+static inline uint32_t next_not_state(uint32_t *bitset, uint32_t state) {
     if (++state == 1 << 24) return 1 << 24;
     uint32_t index = state >> 5;
     uint_fast8_t bit = state & 0x1f;
@@ -154,8 +148,7 @@ static inline uint32_t next_not_state(uint32_t *bitset, uint32_t state)
 }
 
 
-static inline uint32_t bitcount(uint32_t a)
-{
+static inline uint32_t bitcount(uint32_t a) {
 #if defined __GNUC__
     return __builtin_popcountl(a);
 #else
@@ -166,8 +159,7 @@ static inline uint32_t bitcount(uint32_t a)
 }
 
 
-static inline uint32_t count_states(uint32_t *bitset)
-{
+static inline uint32_t count_states(uint32_t *bitset) {
     uint32_t count = 0;
     for (uint32_t i = 0; i < (1 << 19); i++) {
         count += bitcount(bitset[i]);
@@ -176,8 +168,7 @@ static inline uint32_t count_states(uint32_t *bitset)
 }
 
 
-static void write_bitflips_file(odd_even_t odd_even, uint16_t bitflip, int sum_a0, uint32_t *bitset, uint32_t count)
-{
+static void write_bitflips_file(odd_even_t odd_even, uint16_t bitflip, int sum_a0, uint32_t *bitset, uint32_t count) {
     char filename[80];
     sprintf(filename, "bitflip_%d_%03" PRIx16 "_sum%d_states.bin", odd_even, bitflip, sum_a0);
     FILE *outfile = fopen(filename, "wb");
@@ -189,8 +180,7 @@ static void write_bitflips_file(odd_even_t odd_even, uint16_t bitflip, int sum_a
 
 uint32_t *restrict part_sum_a0_bitarrays[2][NUM_PART_SUMS];
 
-static void init_part_sum_bitarrays(void)
-{
+static void init_part_sum_bitarrays(void) {
     printf("init_part_sum_bitarrays()...");
     for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
         for (uint16_t part_sum_a0 = 0; part_sum_a0 < NUM_PART_SUMS; part_sum_a0++) {
@@ -215,8 +205,7 @@ static void init_part_sum_bitarrays(void)
 }
 
 
-static void free_part_sum_bitarrays(void)
-{
+static void free_part_sum_bitarrays(void) {
     printf("free_part_sum_bitarrays()...");
     for (int16_t part_sum_a0 = (NUM_PART_SUMS - 1); part_sum_a0 >= 0; part_sum_a0--) {
         free_bitarray(part_sum_a0_bitarrays[ODD_STATE][part_sum_a0]);
@@ -229,8 +218,7 @@ static void free_part_sum_bitarrays(void)
 
 uint32_t *restrict sum_a0_bitarray[2];
 
-void init_sum_bitarray(uint16_t sum_a0)
-{
+void init_sum_bitarray(uint16_t sum_a0) {
     printf("init_sum_bitarray()...\n");
     for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
         sum_a0_bitarray[odd_even] = (uint32_t *)malloc_bitarray(sizeof(uint32_t) * (1 << 19));
@@ -258,8 +246,7 @@ void init_sum_bitarray(uint16_t sum_a0)
 }
 
 
-static void free_sum_bitarray(void)
-{
+static void free_sum_bitarray(void) {
     printf("free_sum_bitarray()...");
     free_bitarray(sum_a0_bitarray[ODD_STATE]);
     free_bitarray(sum_a0_bitarray[EVEN_STATE]);
@@ -267,8 +254,7 @@ static void free_sum_bitarray(void)
 }
 
 
-static void precalculate_bit0_bitflip_bitarrays(uint8_t const bitflip, uint16_t const sum_a0)
-{
+static void precalculate_bit0_bitflip_bitarrays(uint8_t const bitflip, uint16_t const sum_a0) {
     // #define TEST_RUN
 #ifdef TEST_RUN
 #define NUM_TEST_STATES (1<<10)
@@ -529,8 +515,7 @@ static void precalculate_bit0_bitflip_bitarrays(uint8_t const bitflip, uint16_t
 }
 
 
-int main(int argc, char *argv[])
-{
+int main(int argc, char *argv[]) {
 
     unsigned int bitflip_in;
     int sum_a0;
diff --git a/client/hid-flasher/flash.c b/client/hid-flasher/flash.c
index bac79956a..020be9e87 100644
--- a/client/hid-flasher/flash.c
+++ b/client/hid-flasher/flash.c
@@ -34,8 +34,7 @@ static const uint8_t elf_ident[] = {
 
 // Turn PHDRs into flasher segments, checking for PHDR sanity and merging adjacent
 // unaligned segments if needed
-static int build_segs_from_phdrs(flash_file_t *ctx, FILE *fd, Elf32_Phdr *phdrs, int num_phdrs)
-{
+static int build_segs_from_phdrs(flash_file_t *ctx, FILE *fd, Elf32_Phdr *phdrs, int num_phdrs) {
     Elf32_Phdr *phdr = phdrs;
     flash_seg_t *seg;
     uint32_t last_end = 0;
@@ -155,8 +154,7 @@ static int build_segs_from_phdrs(flash_file_t *ctx, FILE *fd, Elf32_Phdr *phdrs,
 }
 
 // Sanity check segments and check for bootloader writes
-static int check_segs(flash_file_t *ctx, int can_write_bl)
-{
+static int check_segs(flash_file_t *ctx, int can_write_bl) {
     for (int i = 0; i < ctx->num_segs; i++) {
         flash_seg_t *seg = &ctx->segments[i];
 
@@ -181,8 +179,7 @@ static int check_segs(flash_file_t *ctx, int can_write_bl)
 }
 
 // Load an ELF file and prepare it for flashing
-int flash_load(flash_file_t *ctx, const char *name, int can_write_bl)
-{
+int flash_load(flash_file_t *ctx, const char *name, int can_write_bl) {
     FILE *fd = NULL;
     Elf32_Ehdr ehdr;
     Elf32_Phdr *phdrs = NULL;
@@ -203,7 +200,7 @@ int flash_load(flash_file_t *ctx, const char *name, int can_write_bl)
         goto fail;
     }
     if (memcmp(ehdr.e_ident, elf_ident, sizeof(elf_ident))
-        || le32(ehdr.e_version) != 1) {
+            || le32(ehdr.e_version) != 1) {
         fprintf(stderr, "Not an ELF file or wrong ELF type\n");
         goto fail;
     }
@@ -262,8 +259,7 @@ fail:
 }
 
 // Get the state of the proxmark, backwards compatible
-static int get_proxmark_state(uint32_t *state)
-{
+static int get_proxmark_state(uint32_t *state) {
     UsbCommand c = {CMD_DEVICE_INFO};
     SendCommand(&c);
     UsbCommand resp;
@@ -294,8 +290,7 @@ static int get_proxmark_state(uint32_t *state)
 }
 
 // Enter the bootloader to be able to start flashing
-static int enter_bootloader(void)
-{
+static int enter_bootloader(void) {
     uint32_t state;
 
     if (get_proxmark_state(&state) < 0)
@@ -312,7 +307,7 @@ static int enter_bootloader(void)
         memset(&c, 0, sizeof(c));
 
         if ((state & DEVICE_INFO_FLAG_BOOTROM_PRESENT)
-            && (state & DEVICE_INFO_FLAG_OSIMAGE_PRESENT)) {
+                && (state & DEVICE_INFO_FLAG_OSIMAGE_PRESENT)) {
             // New style handover: Send CMD_START_FLASH, which will reset the board
             // and enter the bootrom on the next boot.
             c.cmd = CMD_START_FLASH;
@@ -342,8 +337,7 @@ static int enter_bootloader(void)
     return -1;
 }
 
-static int wait_for_ack(void)
-{
+static int wait_for_ack(void) {
     UsbCommand ack;
     ReceiveCommand(&ack);
     if (ack.cmd != CMD_ACK) {
@@ -354,8 +348,7 @@ static int wait_for_ack(void)
 }
 
 // Go into flashing mode
-int flash_start_flashing(int enable_bl_writes)
-{
+int flash_start_flashing(int enable_bl_writes) {
     uint32_t state;
 
     if (enter_bootloader() < 0)
@@ -388,8 +381,7 @@ int flash_start_flashing(int enable_bl_writes)
     return 0;
 }
 
-static int write_block(uint32_t address, uint8_t *data, uint32_t length)
-{
+static int write_block(uint32_t address, uint8_t *data, uint32_t length) {
     uint8_t block_buf[BLOCK_SIZE];
 
     memset(block_buf, 0xFF, BLOCK_SIZE);
@@ -412,8 +404,7 @@ static int write_block(uint32_t address, uint8_t *data, uint32_t length)
 }
 
 // Write a file's segments to Flash
-int flash_write(flash_file_t *ctx)
-{
+int flash_write(flash_file_t *ctx) {
     fprintf(stderr, "Writing segments for file: %s\n", ctx->filename);
     for (int i = 0; i < ctx->num_segs; i++) {
         flash_seg_t *seg = &ctx->segments[i];
@@ -453,8 +444,7 @@ int flash_write(flash_file_t *ctx)
 }
 
 // free a file context
-void flash_free(flash_file_t *ctx)
-{
+void flash_free(flash_file_t *ctx) {
     if (!ctx)
         return;
     if (ctx->segments) {
@@ -467,8 +457,7 @@ void flash_free(flash_file_t *ctx)
 }
 
 // just reset the unit
-int flash_stop_flashing(void)
-{
+int flash_stop_flashing(void) {
     UsbCommand c = {CMD_HARDWARE_RESET};
     SendCommand(&c);
     return 0;
diff --git a/client/hid-flasher/flasher.c b/client/hid-flasher/flasher.c
index 8314afe5b..46a68499c 100644
--- a/client/hid-flasher/flasher.c
+++ b/client/hid-flasher/flasher.c
@@ -13,8 +13,7 @@
 #include "proxusb.h"
 #include "flash.h"
 
-static void usage(char *argv0)
-{
+static void usage(char *argv0) {
     fprintf(stderr, "Usage:   %s [-b] image.elf [image.elf...]\n\n", argv0);
     fprintf(stderr, "\t-b\tEnable flashing of bootloader area (DANGEROUS)\n\n");
     fprintf(stderr, "Example: %s path/to/osimage.elf path/to/fpgaimage.elf\n", argv0);
@@ -22,8 +21,7 @@ static void usage(char *argv0)
 
 #define MAX_FILES 4
 
-int main(int argc, char **argv)
-{
+int main(int argc, char **argv) {
     int can_write_bl = 0;
     int num_files = 0;
     int res;
diff --git a/client/hid-flasher/proxendian.h b/client/hid-flasher/proxendian.h
index e3d939086..6b3c315ce 100644
--- a/client/hid-flasher/proxendian.h
+++ b/client/hid-flasher/proxendian.h
@@ -32,13 +32,11 @@
 # define le32(x) (x)
 #else
 
-static inline uint16_t le16(uint16_t v)
-{
+static inline uint16_t le16(uint16_t v) {
     return (v >> 8) | (v << 8);
 }
 
-static inline uint32_t le32(uint32_t v)
-{
+static inline uint32_t le32(uint32_t v) {
     return (le16(v) << 16) | (le16(v >> 16));
 }
 #endif // HOST_LITTLE_ENDIAN
diff --git a/client/hid-flasher/proxusb.c b/client/hid-flasher/proxusb.c
index 906cc9783..f7ff5d489 100644
--- a/client/hid-flasher/proxusb.c
+++ b/client/hid-flasher/proxusb.c
@@ -20,8 +20,7 @@ static unsigned int claimed_iface = 0;
 unsigned char return_on_error = 0;
 unsigned char error_occured = 0;
 
-void SendCommand(UsbCommand *c)
-{
+void SendCommand(UsbCommand *c) {
     int ret;
 
 #if 0
@@ -49,8 +48,7 @@ void SendCommand(UsbCommand *c)
     }
 }
 
-bool ReceiveCommandPoll(UsbCommand *c)
-{
+bool ReceiveCommandPoll(UsbCommand *c) {
     int ret;
 
     memset(c, 0, sizeof(UsbCommand));
@@ -84,8 +82,7 @@ bool ReceiveCommandPoll(UsbCommand *c)
     return ret > 0;
 }
 
-void ReceiveCommand(UsbCommand *c)
-{
+void ReceiveCommand(UsbCommand *c) {
 //  printf("%s()\n", __FUNCTION__);
     int retval = 0;
     do {
@@ -95,8 +92,7 @@ void ReceiveCommand(UsbCommand *c)
 //  printf("recv %x\n", c->cmd);
 }
 
-usb_dev_handle *findProxmark(int verbose, unsigned int *iface)
-{
+usb_dev_handle *findProxmark(int verbose, unsigned int *iface) {
     struct usb_bus *busses, *bus;
     usb_dev_handle *handle = NULL;
     struct prox_unit units[50];
@@ -168,8 +164,7 @@ usb_dev_handle *findProxmark(int verbose, unsigned int *iface)
     return NULL;
 }
 
-usb_dev_handle *OpenProxmark(int verbose)
-{
+usb_dev_handle *OpenProxmark(int verbose) {
     int ret;
     usb_dev_handle *handle = NULL;
     unsigned int iface;
@@ -205,8 +200,7 @@ usb_dev_handle *OpenProxmark(int verbose)
     return handle;
 }
 
-void CloseProxmark(void)
-{
+void CloseProxmark(void) {
     usb_release_interface(devh, claimed_iface);
     usb_close(devh);
     devh = NULL;
diff --git a/client/jansson/dump.c b/client/jansson/dump.c
index c8957c2a8..afdec8f7a 100644
--- a/client/jansson/dump.c
+++ b/client/jansson/dump.c
@@ -35,13 +35,11 @@ struct buffer {
     char *data;
 };
 
-static int dump_to_strbuffer(const char *buffer, size_t size, void *data)
-{
+static int dump_to_strbuffer(const char *buffer, size_t size, void *data) {
     return strbuffer_append_bytes((strbuffer_t *)data, buffer, size);
 }
 
-static int dump_to_buffer(const char *buffer, size_t size, void *data)
-{
+static int dump_to_buffer(const char *buffer, size_t size, void *data) {
     struct buffer *buf = (struct buffer *)data;
 
     if (buf->used + size <= buf->size)
@@ -51,16 +49,14 @@ static int dump_to_buffer(const char *buffer, size_t size, void *data)
     return 0;
 }
 
-static int dump_to_file(const char *buffer, size_t size, void *data)
-{
+static int dump_to_file(const char *buffer, size_t size, void *data) {
     FILE *dest = (FILE *)data;
     if (fwrite(buffer, size, 1, dest) != 1)
         return -1;
     return 0;
 }
 
-static int dump_to_fd(const char *buffer, size_t size, void *data)
-{
+static int dump_to_fd(const char *buffer, size_t size, void *data) {
 #ifdef HAVE_UNISTD_H
     int *dest = (int *)data;
     if (write(*dest, buffer, size) == (ssize_t)size)
@@ -72,8 +68,7 @@ static int dump_to_fd(const char *buffer, size_t size, void *data)
 /* 32 spaces (the maximum indentation size) */
 static const char whitespace[] = "                                ";
 
-static int dump_indent(size_t flags, int depth, int space, json_dump_callback_t dump, void *data)
-{
+static int dump_indent(size_t flags, int depth, int space, json_dump_callback_t dump, void *data) {
     if (FLAGS_TO_INDENT(flags) > 0) {
         unsigned int ws_count = FLAGS_TO_INDENT(flags), n_spaces = depth * ws_count;
 
@@ -94,8 +89,7 @@ static int dump_indent(size_t flags, int depth, int space, json_dump_callback_t
     return 0;
 }
 
-static int dump_string(const char *str, size_t len, json_dump_callback_t dump, void *data, size_t flags)
-{
+static int dump_string(const char *str, size_t len, json_dump_callback_t dump, void *data, size_t flags) {
     const char *pos, *end, *lim;
     int32_t codepoint = 0;
 
@@ -197,13 +191,11 @@ static int dump_string(const char *str, size_t len, json_dump_callback_t dump, v
     return dump("\"", 1, data);
 }
 
-static int compare_keys(const void *key1, const void *key2)
-{
+static int compare_keys(const void *key1, const void *key2) {
     return strcmp(*(const char **)key1, *(const char **)key2);
 }
 
-static int loop_check(hashtable_t *parents, const json_t *json, char *key, size_t key_size)
-{
+static int loop_check(hashtable_t *parents, const json_t *json, char *key, size_t key_size) {
     snprintf(key, key_size, "%p", json);
     if (hashtable_get(parents, key))
         return -1;
@@ -212,8 +204,7 @@ static int loop_check(hashtable_t *parents, const json_t *json, char *key, size_
 }
 
 static int do_dump(const json_t *json, size_t flags, int depth,
-                   hashtable_t *parents, json_dump_callback_t dump, void *data)
-{
+                   hashtable_t *parents, json_dump_callback_t dump, void *data) {
     int embed = flags & JSON_EMBED;
 
     flags &= ~JSON_EMBED;
@@ -288,7 +279,7 @@ static int do_dump(const json_t *json, size_t flags, int depth,
 
                 if (i < n - 1) {
                     if (dump(",", 1, data) ||
-                        dump_indent(flags, depth + 1, 1, dump, data))
+                            dump_indent(flags, depth + 1, 1, dump, data))
                         return -1;
                 } else {
                     if (dump_indent(flags, depth, 0, dump, data))
@@ -359,14 +350,14 @@ static int do_dump(const json_t *json, size_t flags, int depth,
 
                     dump_string(key, strlen(key), dump, data, flags);
                     if (dump(separator, separator_length, data) ||
-                        do_dump(value, flags, depth + 1, parents, dump, data)) {
+                            do_dump(value, flags, depth + 1, parents, dump, data)) {
                         jsonp_free(keys);
                         return -1;
                     }
 
                     if (i < size - 1) {
                         if (dump(",", 1, data) ||
-                            dump_indent(flags, depth + 1, 1, dump, data)) {
+                                dump_indent(flags, depth + 1, 1, dump, data)) {
                             jsonp_free(keys);
                             return -1;
                         }
@@ -388,13 +379,13 @@ static int do_dump(const json_t *json, size_t flags, int depth,
 
                     dump_string(key, strlen(key), dump, data, flags);
                     if (dump(separator, separator_length, data) ||
-                        do_dump(json_object_iter_value(iter), flags, depth + 1,
-                                parents, dump, data))
+                            do_dump(json_object_iter_value(iter), flags, depth + 1,
+                                    parents, dump, data))
                         return -1;
 
                     if (next) {
                         if (dump(",", 1, data) ||
-                            dump_indent(flags, depth + 1, 1, dump, data))
+                                dump_indent(flags, depth + 1, 1, dump, data))
                             return -1;
                     } else {
                         if (dump_indent(flags, depth, 0, dump, data))
@@ -415,8 +406,7 @@ static int do_dump(const json_t *json, size_t flags, int depth,
     }
 }
 
-char *json_dumps(const json_t *json, size_t flags)
-{
+char *json_dumps(const json_t *json, size_t flags) {
     strbuffer_t strbuff;
     char *result;
 
@@ -432,8 +422,7 @@ char *json_dumps(const json_t *json, size_t flags)
     return result;
 }
 
-size_t json_dumpb(const json_t *json, char *buffer, size_t size, size_t flags)
-{
+size_t json_dumpb(const json_t *json, char *buffer, size_t size, size_t flags) {
     struct buffer buf = { size, 0, buffer };
 
     if (json_dump_callback(json, dump_to_buffer, (void *)&buf, flags))
@@ -442,18 +431,15 @@ size_t json_dumpb(const json_t *json, char *buffer, size_t size, size_t flags)
     return buf.used;
 }
 
-int json_dumpf(const json_t *json, FILE *output, size_t flags)
-{
+int json_dumpf(const json_t *json, FILE *output, size_t flags) {
     return json_dump_callback(json, dump_to_file, (void *)output, flags);
 }
 
-int json_dumpfd(const json_t *json, int output, size_t flags)
-{
+int json_dumpfd(const json_t *json, int output, size_t flags) {
     return json_dump_callback(json, dump_to_fd, (void *)&output, flags);
 }
 
-int json_dump_file(const json_t *json, const char *path, size_t flags)
-{
+int json_dump_file(const json_t *json, const char *path, size_t flags) {
     int result;
 
     FILE *output = fopen(path, "w");
@@ -468,8 +454,7 @@ int json_dump_file(const json_t *json, const char *path, size_t flags)
     return result;
 }
 
-int json_dump_callback(const json_t *json, json_dump_callback_t callback, void *data, size_t flags)
-{
+int json_dump_callback(const json_t *json, json_dump_callback_t callback, void *data, size_t flags) {
     int res;
     hashtable_t parents_set;
 
diff --git a/client/jansson/error.c b/client/jansson/error.c
index dd4d1605f..fd2557367 100644
--- a/client/jansson/error.c
+++ b/client/jansson/error.c
@@ -1,8 +1,7 @@
 #include <string.h>
 #include "jansson_private.h"
 
-void jsonp_error_init(json_error_t *error, const char *source)
-{
+void jsonp_error_init(json_error_t *error, const char *source) {
     if (error) {
         error->text[0] = '\0';
         error->line = -1;
@@ -15,8 +14,7 @@ void jsonp_error_init(json_error_t *error, const char *source)
     }
 }
 
-void jsonp_error_set_source(json_error_t *error, const char *source)
-{
+void jsonp_error_set_source(json_error_t *error, const char *source) {
     size_t length;
 
     if (!error || !source)
@@ -34,8 +32,7 @@ void jsonp_error_set_source(json_error_t *error, const char *source)
 
 void jsonp_error_set(json_error_t *error, int line, int column,
                      size_t position, enum json_error_code code,
-                     const char *msg, ...)
-{
+                     const char *msg, ...) {
     va_list ap;
     va_start(ap, msg);
     jsonp_error_vset(error, line, column, position, code, msg, ap);
@@ -44,8 +41,7 @@ void jsonp_error_set(json_error_t *error, int line, int column,
 
 void jsonp_error_vset(json_error_t *error, int line, int column,
                       size_t position, enum json_error_code code,
-                      const char *msg, va_list ap)
-{
+                      const char *msg, va_list ap) {
     if (!error)
         return;
 
diff --git a/client/jansson/hashtable.c b/client/jansson/hashtable.c
index 472eda1ea..aee159242 100644
--- a/client/jansson/hashtable.c
+++ b/client/jansson/hashtable.c
@@ -37,34 +37,29 @@ extern volatile uint32_t hashtable_seed;
 #define ordered_list_to_pair(list_)  container_of(list_, pair_t, ordered_list)
 #define hash_str(key)        ((size_t)hashlittle((key), strlen(key), hashtable_seed))
 
-static JSON_INLINE void list_init(list_t *list)
-{
+static JSON_INLINE void list_init(list_t *list) {
     list->next = list;
     list->prev = list;
 }
 
-static JSON_INLINE void list_insert(list_t *list, list_t *node)
-{
+static JSON_INLINE void list_insert(list_t *list, list_t *node) {
     node->next = list;
     node->prev = list->prev;
     list->prev->next = node;
     list->prev = node;
 }
 
-static JSON_INLINE void list_remove(list_t *list)
-{
+static JSON_INLINE void list_remove(list_t *list) {
     list->prev->next = list->next;
     list->next->prev = list->prev;
 }
 
-static JSON_INLINE int bucket_is_empty(hashtable_t *hashtable, bucket_t *bucket)
-{
+static JSON_INLINE int bucket_is_empty(hashtable_t *hashtable, bucket_t *bucket) {
     return bucket->first == &hashtable->list && bucket->first == bucket->last;
 }
 
 static void insert_to_bucket(hashtable_t *hashtable, bucket_t *bucket,
-                             list_t *list)
-{
+                             list_t *list) {
     if (bucket_is_empty(hashtable, bucket)) {
         list_insert(&hashtable->list, list);
         bucket->first = bucket->last = list;
@@ -75,8 +70,7 @@ static void insert_to_bucket(hashtable_t *hashtable, bucket_t *bucket,
 }
 
 static pair_t *hashtable_find_pair(hashtable_t *hashtable, bucket_t *bucket,
-                                   const char *key, size_t hash)
-{
+                                   const char *key, size_t hash) {
     list_t *list;
     pair_t *pair;
 
@@ -100,8 +94,7 @@ static pair_t *hashtable_find_pair(hashtable_t *hashtable, bucket_t *bucket,
 
 /* returns 0 on success, -1 if key was not found */
 static int hashtable_do_del(hashtable_t *hashtable,
-                            const char *key, size_t hash)
-{
+                            const char *key, size_t hash) {
     pair_t *pair;
     bucket_t *bucket;
     size_t index;
@@ -132,8 +125,7 @@ static int hashtable_do_del(hashtable_t *hashtable,
     return 0;
 }
 
-static void hashtable_do_clear(hashtable_t *hashtable)
-{
+static void hashtable_do_clear(hashtable_t *hashtable) {
     list_t *list, *next;
     pair_t *pair;
 
@@ -145,8 +137,7 @@ static void hashtable_do_clear(hashtable_t *hashtable)
     }
 }
 
-static int hashtable_do_rehash(hashtable_t *hashtable)
-{
+static int hashtable_do_rehash(hashtable_t *hashtable) {
     list_t *list, *next;
     pair_t *pair;
     size_t i, index, new_size, new_order;
@@ -182,8 +173,7 @@ static int hashtable_do_rehash(hashtable_t *hashtable)
 }
 
 
-int hashtable_init(hashtable_t *hashtable)
-{
+int hashtable_init(hashtable_t *hashtable) {
     size_t i;
 
     hashtable->size = 0;
@@ -203,14 +193,12 @@ int hashtable_init(hashtable_t *hashtable)
     return 0;
 }
 
-void hashtable_close(hashtable_t *hashtable)
-{
+void hashtable_close(hashtable_t *hashtable) {
     hashtable_do_clear(hashtable);
     jsonp_free(hashtable->buckets);
 }
 
-int hashtable_set(hashtable_t *hashtable, const char *key, json_t *value)
-{
+int hashtable_set(hashtable_t *hashtable, const char *key, json_t *value) {
     pair_t *pair;
     bucket_t *bucket;
     size_t hash, index;
@@ -257,8 +245,7 @@ int hashtable_set(hashtable_t *hashtable, const char *key, json_t *value)
     return 0;
 }
 
-void *hashtable_get(hashtable_t *hashtable, const char *key)
-{
+void *hashtable_get(hashtable_t *hashtable, const char *key) {
     pair_t *pair;
     size_t hash;
     bucket_t *bucket;
@@ -273,14 +260,12 @@ void *hashtable_get(hashtable_t *hashtable, const char *key)
     return pair->value;
 }
 
-int hashtable_del(hashtable_t *hashtable, const char *key)
-{
+int hashtable_del(hashtable_t *hashtable, const char *key) {
     size_t hash = hash_str(key);
     return hashtable_do_del(hashtable, key, hash);
 }
 
-void hashtable_clear(hashtable_t *hashtable)
-{
+void hashtable_clear(hashtable_t *hashtable) {
     size_t i;
 
     hashtable_do_clear(hashtable);
@@ -295,13 +280,11 @@ void hashtable_clear(hashtable_t *hashtable)
     hashtable->size = 0;
 }
 
-void *hashtable_iter(hashtable_t *hashtable)
-{
+void *hashtable_iter(hashtable_t *hashtable) {
     return hashtable_iter_next(hashtable, &hashtable->ordered_list);
 }
 
-void *hashtable_iter_at(hashtable_t *hashtable, const char *key)
-{
+void *hashtable_iter_at(hashtable_t *hashtable, const char *key) {
     pair_t *pair;
     size_t hash;
     bucket_t *bucket;
@@ -316,28 +299,24 @@ void *hashtable_iter_at(hashtable_t *hashtable, const char *key)
     return &pair->ordered_list;
 }
 
-void *hashtable_iter_next(hashtable_t *hashtable, void *iter)
-{
+void *hashtable_iter_next(hashtable_t *hashtable, void *iter) {
     list_t *list = (list_t *)iter;
     if (list->next == &hashtable->ordered_list)
         return NULL;
     return list->next;
 }
 
-void *hashtable_iter_key(void *iter)
-{
+void *hashtable_iter_key(void *iter) {
     pair_t *pair = ordered_list_to_pair((list_t *)iter);
     return pair->key;
 }
 
-void *hashtable_iter_value(void *iter)
-{
+void *hashtable_iter_value(void *iter) {
     pair_t *pair = ordered_list_to_pair((list_t *)iter);
     return pair->value;
 }
 
-void hashtable_iter_set(void *iter, json_t *value)
-{
+void hashtable_iter_set(void *iter, json_t *value) {
     pair_t *pair = ordered_list_to_pair((list_t *)iter);
 
     json_decref(pair->value);
diff --git a/client/jansson/hashtable_seed.c b/client/jansson/hashtable_seed.c
index 2567f7250..3856691d3 100644
--- a/client/jansson/hashtable_seed.c
+++ b/client/jansson/hashtable_seed.c
@@ -45,8 +45,7 @@
 #include "jansson.h"
 
 
-static uint32_t buf_to_uint32(char *data)
-{
+static uint32_t buf_to_uint32(char *data) {
     size_t i;
     uint32_t result = 0;
 
@@ -60,8 +59,7 @@ static uint32_t buf_to_uint32(char *data)
 
 /* /dev/urandom */
 #if !defined(_WIN32) && defined(USE_URANDOM)
-static int seed_from_urandom(uint32_t *seed)
-{
+static int seed_from_urandom(uint32_t *seed) {
     /* Use unbuffered I/O if we have open(), close() and read(). Otherwise
        fall back to fopen() */
 
@@ -103,8 +101,7 @@ typedef BOOL (WINAPI *CRYPTACQUIRECONTEXTA)(HCRYPTPROV *phProv, LPCSTR pszContai
 typedef BOOL (WINAPI *CRYPTGENRANDOM)(HCRYPTPROV hProv, DWORD dwLen, BYTE *pbBuffer);
 typedef BOOL (WINAPI *CRYPTRELEASECONTEXT)(HCRYPTPROV hProv, DWORD dwFlags);
 
-static int seed_from_windows_cryptoapi(uint32_t *seed)
-{
+static int seed_from_windows_cryptoapi(uint32_t *seed) {
     HINSTANCE hAdvAPI32 = NULL;
     CRYPTACQUIRECONTEXTA pCryptAcquireContext = NULL;
     CRYPTGENRANDOM pCryptGenRandom = NULL;
@@ -144,8 +141,7 @@ static int seed_from_windows_cryptoapi(uint32_t *seed)
 #endif
 
 /* gettimeofday() and getpid() */
-static int seed_from_timestamp_and_pid(uint32_t *seed)
-{
+static int seed_from_timestamp_and_pid(uint32_t *seed) {
 #ifdef HAVE_GETTIMEOFDAY
     /* XOR of seconds and microseconds */
     struct timeval tv;
@@ -166,8 +162,7 @@ static int seed_from_timestamp_and_pid(uint32_t *seed)
     return 0;
 }
 
-static uint32_t generate_seed()
-{
+static uint32_t generate_seed() {
     uint32_t seed = 0;
     int done = 0;
 
@@ -200,8 +195,7 @@ volatile uint32_t hashtable_seed = 0;
 #if defined(HAVE_ATOMIC_BUILTINS) && (defined(HAVE_SCHED_YIELD) || !defined(_WIN32))
 static volatile char seed_initialized = 0;
 
-void json_object_seed(size_t seed)
-{
+void json_object_seed(size_t seed) {
     uint32_t new_seed = (uint32_t)seed;
 
     if (hashtable_seed == 0) {
@@ -222,8 +216,7 @@ void json_object_seed(size_t seed)
     }
 }
 #elif defined(HAVE_SYNC_BUILTINS) && (defined(HAVE_SCHED_YIELD) || !defined(_WIN32))
-void json_object_seed(size_t seed)
-{
+void json_object_seed(size_t seed) {
     uint32_t new_seed = (uint32_t)seed;
 
     if (hashtable_seed == 0) {
@@ -250,8 +243,7 @@ void json_object_seed(size_t seed)
 }
 #elif defined(_WIN32)
 static long seed_initialized = 0;
-void json_object_seed(size_t seed)
-{
+void json_object_seed(size_t seed) {
     uint32_t new_seed = (uint32_t)seed;
 
     if (hashtable_seed == 0) {
@@ -271,8 +263,7 @@ void json_object_seed(size_t seed)
 }
 #else
 /* Fall back to a thread-unsafe version */
-void json_object_seed(size_t seed)
-{
+void json_object_seed(size_t seed) {
     uint32_t new_seed = (uint32_t)seed;
 
     if (hashtable_seed == 0) {
diff --git a/client/jansson/jansson.h b/client/jansson/jansson.h
index 37861dca0..f5d551b7c 100644
--- a/client/jansson/jansson.h
+++ b/client/jansson/jansson.h
@@ -118,8 +118,7 @@ json_t *json_null(void);
 #endif
 
 static JSON_INLINE
-json_t *json_incref(json_t *json)
-{
+json_t *json_incref(json_t *json) {
     if (json && json->refcount != (size_t) -1)
         JSON_INTERNAL_INCREF(json);
     return json;
@@ -129,16 +128,14 @@ json_t *json_incref(json_t *json)
 void json_delete(json_t *json);
 
 static JSON_INLINE
-void json_decref(json_t *json)
-{
+void json_decref(json_t *json) {
     if (json && json->refcount != (size_t) -1 && JSON_INTERNAL_DECREF(json) == 0)
         json_delete(json);
 }
 
 #if defined(__GNUC__) || defined(__clang__)
 static JSON_INLINE
-void json_decrefp(json_t **json)
-{
+void json_decrefp(json_t **json) {
     if (json) {
         json_decref(*json);
         *json = NULL;
@@ -183,8 +180,7 @@ enum json_error_code {
     json_error_index_out_of_range
 };
 
-static JSON_INLINE enum json_error_code json_error_code(const json_error_t *e)
-{
+static JSON_INLINE enum json_error_code json_error_code(const json_error_t *e) {
     return (enum json_error_code)e->text[JSON_ERROR_TEXT_LENGTH - 1];
 }
 
@@ -210,36 +206,33 @@ int json_object_iter_set_new(json_t *object, void *iter, json_t *value);
 
 #define json_object_foreach(object, key, value) \
     for(key = json_object_iter_key(json_object_iter(object)); \
-        key && (value = json_object_iter_value(json_object_key_to_iter(key))); \
-        key = json_object_iter_key(json_object_iter_next(object, json_object_key_to_iter(key))))
+            key && (value = json_object_iter_value(json_object_key_to_iter(key))); \
+            key = json_object_iter_key(json_object_iter_next(object, json_object_key_to_iter(key))))
 
 #define json_object_foreach_safe(object, n, key, value)     \
     for(key = json_object_iter_key(json_object_iter(object)), \
-        n = json_object_iter_next(object, json_object_key_to_iter(key)); \
-        key && (value = json_object_iter_value(json_object_key_to_iter(key))); \
-        key = json_object_iter_key(n), \
-        n = json_object_iter_next(object, json_object_key_to_iter(key)))
+            n = json_object_iter_next(object, json_object_key_to_iter(key)); \
+            key && (value = json_object_iter_value(json_object_key_to_iter(key))); \
+            key = json_object_iter_key(n), \
+            n = json_object_iter_next(object, json_object_key_to_iter(key)))
 
 #define json_array_foreach(array, index, value) \
     for(index = 0; \
-        index < json_array_size(array) && (value = json_array_get(array, index)); \
-        index++)
+            index < json_array_size(array) && (value = json_array_get(array, index)); \
+            index++)
 
 static JSON_INLINE
-int json_object_set(json_t *object, const char *key, json_t *value)
-{
+int json_object_set(json_t *object, const char *key, json_t *value) {
     return json_object_set_new(object, key, json_incref(value));
 }
 
 static JSON_INLINE
-int json_object_set_nocheck(json_t *object, const char *key, json_t *value)
-{
+int json_object_set_nocheck(json_t *object, const char *key, json_t *value) {
     return json_object_set_new_nocheck(object, key, json_incref(value));
 }
 
 static JSON_INLINE
-int json_object_iter_set(json_t *object, void *iter, json_t *value)
-{
+int json_object_iter_set(json_t *object, void *iter, json_t *value) {
     return json_object_iter_set_new(object, iter, json_incref(value));
 }
 
@@ -253,20 +246,17 @@ int json_array_clear(json_t *array);
 int json_array_extend(json_t *array, json_t *other);
 
 static JSON_INLINE
-int json_array_set(json_t *array, size_t ind, json_t *value)
-{
+int json_array_set(json_t *array, size_t ind, json_t *value) {
     return json_array_set_new(array, ind, json_incref(value));
 }
 
 static JSON_INLINE
-int json_array_append(json_t *array, json_t *value)
-{
+int json_array_append(json_t *array, json_t *value) {
     return json_array_append_new(array, json_incref(value));
 }
 
 static JSON_INLINE
-int json_array_insert(json_t *array, size_t ind, json_t *value)
-{
+int json_array_insert(json_t *array, size_t ind, json_t *value) {
     return json_array_insert_new(array, ind, json_incref(value));
 }
 
@@ -316,8 +306,7 @@ json_t *json_path_get(const json_t *json, const char *path);
 int json_path_set_new(json_t *json, const char *path, json_t *value, size_t flags, json_error_t *error);
 
 static JSON_INLINE
-int json_path_set(json_t *json, const char *path, json_t *value, size_t flags, json_error_t *error)
-{
+int json_path_set(json_t *json, const char *path, json_t *value, size_t flags, json_error_t *error) {
     return json_path_set_new(json, path, json_incref(value), flags, error);
 }
 
diff --git a/client/jansson/load.c b/client/jansson/load.c
index e8ba8d7aa..43e035cb2 100644
--- a/client/jansson/load.c
+++ b/client/jansson/load.c
@@ -85,8 +85,7 @@ typedef struct {
 
 static void error_set(json_error_t *error, const lex_t *lex,
                       enum json_error_code code,
-                      const char *msg, ...)
-{
+                      const char *msg, ...) {
     va_list ap;
     char msg_text[JSON_ERROR_TEXT_LENGTH];
     char msg_with_context[JSON_ERROR_TEXT_LENGTH];
@@ -139,8 +138,7 @@ static void error_set(json_error_t *error, const lex_t *lex,
 /*** lexical analyzer ***/
 
 static void
-stream_init(stream_t *stream, get_func get, void *data)
-{
+stream_init(stream_t *stream, get_func get, void *data) {
     stream->get = get;
     stream->data = data;
     stream->buffer[0] = '\0';
@@ -152,8 +150,7 @@ stream_init(stream_t *stream, get_func get, void *data)
     stream->position = 0;
 }
 
-static int stream_get(stream_t *stream, json_error_t *error)
-{
+static int stream_get(stream_t *stream, json_error_t *error) {
     int c;
 
     if (stream->state != STREAM_STATE_OK)
@@ -211,8 +208,7 @@ out:
     return STREAM_STATE_ERROR;
 }
 
-static void stream_unget(stream_t *stream, int c)
-{
+static void stream_unget(stream_t *stream, int c) {
     if (c == STREAM_STATE_EOF || c == STREAM_STATE_ERROR)
         return;
 
@@ -229,31 +225,26 @@ static void stream_unget(stream_t *stream, int c)
 }
 
 
-static int lex_get(lex_t *lex, json_error_t *error)
-{
+static int lex_get(lex_t *lex, json_error_t *error) {
     return stream_get(&lex->stream, error);
 }
 
-static void lex_save(lex_t *lex, int c)
-{
+static void lex_save(lex_t *lex, int c) {
     strbuffer_append_byte(&lex->saved_text, c);
 }
 
-static int lex_get_save(lex_t *lex, json_error_t *error)
-{
+static int lex_get_save(lex_t *lex, json_error_t *error) {
     int c = stream_get(&lex->stream, error);
     if (c != STREAM_STATE_EOF && c != STREAM_STATE_ERROR)
         lex_save(lex, c);
     return c;
 }
 
-static void lex_unget(lex_t *lex, int c)
-{
+static void lex_unget(lex_t *lex, int c) {
     stream_unget(&lex->stream, c);
 }
 
-static void lex_unget_unsave(lex_t *lex, int c)
-{
+static void lex_unget_unsave(lex_t *lex, int c) {
     if (c != STREAM_STATE_EOF && c != STREAM_STATE_ERROR) {
         /* Since we treat warnings as errors, when assertions are turned
          * off the "d" variable would be set but never used. Which is
@@ -271,8 +262,7 @@ static void lex_unget_unsave(lex_t *lex, int c)
     }
 }
 
-static void lex_save_cached(lex_t *lex)
-{
+static void lex_save_cached(lex_t *lex) {
     while (lex->stream.buffer[lex->stream.buffer_pos] != '\0') {
         lex_save(lex, lex->stream.buffer[lex->stream.buffer_pos]);
         lex->stream.buffer_pos++;
@@ -280,16 +270,14 @@ static void lex_save_cached(lex_t *lex)
     }
 }
 
-static void lex_free_string(lex_t *lex)
-{
+static void lex_free_string(lex_t *lex) {
     jsonp_free(lex->value.string.val);
     lex->value.string.val = NULL;
     lex->value.string.len = 0;
 }
 
 /* assumes that str points to 'u' plus at least 4 valid hex digits */
-static int32_t decode_unicode_escape(const char *str)
-{
+static int32_t decode_unicode_escape(const char *str) {
     int i;
     int32_t value = 0;
 
@@ -311,8 +299,7 @@ static int32_t decode_unicode_escape(const char *str)
     return value;
 }
 
-static void lex_scan_string(lex_t *lex, json_error_t *error)
-{
+static void lex_scan_string(lex_t *lex, json_error_t *error) {
     int c;
     const char *p;
     char *t;
@@ -485,8 +472,7 @@ out:
 #endif
 #endif
 
-static int lex_scan_number(lex_t *lex, int c, json_error_t *error)
-{
+static int lex_scan_number(lex_t *lex, int c, json_error_t *error) {
     const char *saved_text;
     char *end;
     double doubleval;
@@ -512,7 +498,7 @@ static int lex_scan_number(lex_t *lex, int c, json_error_t *error)
     }
 
     if (!(lex->flags & JSON_DECODE_INT_AS_REAL) &&
-        c != '.' && c != 'E' && c != 'e') {
+            c != '.' && c != 'E' && c != 'e') {
         json_int_t intval;
 
         lex_unget_unsave(lex, c);
@@ -579,8 +565,7 @@ out:
     return -1;
 }
 
-static int lex_scan(lex_t *lex, json_error_t *error)
-{
+static int lex_scan(lex_t *lex, json_error_t *error) {
     int c;
 
     strbuffer_clear(&lex->saved_text);
@@ -647,8 +632,7 @@ out:
     return lex->token;
 }
 
-static char *lex_steal_string(lex_t *lex, size_t *out_len)
-{
+static char *lex_steal_string(lex_t *lex, size_t *out_len) {
     char *result = NULL;
     if (lex->token == TOKEN_STRING) {
         result = lex->value.string.val;
@@ -659,8 +643,7 @@ static char *lex_steal_string(lex_t *lex, size_t *out_len)
     return result;
 }
 
-static int lex_init(lex_t *lex, get_func get, size_t flags, void *data)
-{
+static int lex_init(lex_t *lex, get_func get, size_t flags, void *data) {
     stream_init(&lex->stream, get, data);
     if (strbuffer_init(&lex->saved_text))
         return -1;
@@ -670,8 +653,7 @@ static int lex_init(lex_t *lex, get_func get, size_t flags, void *data)
     return 0;
 }
 
-static void lex_close(lex_t *lex)
-{
+static void lex_close(lex_t *lex) {
     if (lex->token == TOKEN_STRING)
         lex_free_string(lex);
     strbuffer_close(&lex->saved_text);
@@ -682,8 +664,7 @@ static void lex_close(lex_t *lex)
 
 static json_t *parse_value(lex_t *lex, size_t flags, json_error_t *error);
 
-static json_t *parse_object(lex_t *lex, size_t flags, json_error_t *error)
-{
+static json_t *parse_object(lex_t *lex, size_t flags, json_error_t *error) {
     json_t *object = json_object();
     if (!object)
         return NULL;
@@ -759,8 +740,7 @@ error:
     return NULL;
 }
 
-static json_t *parse_array(lex_t *lex, size_t flags, json_error_t *error)
-{
+static json_t *parse_array(lex_t *lex, size_t flags, json_error_t *error) {
     json_t *array = json_array();
     if (!array)
         return NULL;
@@ -797,8 +777,7 @@ error:
     return NULL;
 }
 
-static json_t *parse_value(lex_t *lex, size_t flags, json_error_t *error)
-{
+static json_t *parse_value(lex_t *lex, size_t flags, json_error_t *error) {
     json_t *json;
 
     lex->depth++;
@@ -871,8 +850,7 @@ static json_t *parse_value(lex_t *lex, size_t flags, json_error_t *error)
     return json;
 }
 
-static json_t *parse_json(lex_t *lex, size_t flags, json_error_t *error)
-{
+static json_t *parse_json(lex_t *lex, size_t flags, json_error_t *error) {
     json_t *result;
 
     lex->depth = 0;
@@ -911,8 +889,7 @@ typedef struct {
     size_t pos;
 } string_data_t;
 
-static int string_get(void *data)
-{
+static int string_get(void *data) {
     char c;
     string_data_t *stream = (string_data_t *)data;
     c = stream->data[stream->pos];
@@ -924,8 +901,7 @@ static int string_get(void *data)
     }
 }
 
-json_t *json_loads(const char *string, size_t flags, json_error_t *error)
-{
+json_t *json_loads(const char *string, size_t flags, json_error_t *error) {
     lex_t lex;
     json_t *result;
     string_data_t stream_data;
@@ -955,8 +931,7 @@ typedef struct {
     size_t pos;
 } buffer_data_t;
 
-static int buffer_get(void *data)
-{
+static int buffer_get(void *data) {
     char c;
     buffer_data_t *stream = data;
     if (stream->pos >= stream->len)
@@ -967,8 +942,7 @@ static int buffer_get(void *data)
     return (unsigned char)c;
 }
 
-json_t *json_loadb(const char *buffer, size_t buflen, size_t flags, json_error_t *error)
-{
+json_t *json_loadb(const char *buffer, size_t buflen, size_t flags, json_error_t *error) {
     lex_t lex;
     json_t *result;
     buffer_data_t stream_data;
@@ -993,8 +967,7 @@ json_t *json_loadb(const char *buffer, size_t buflen, size_t flags, json_error_t
     return result;
 }
 
-json_t *json_loadf(FILE *input, size_t flags, json_error_t *error)
-{
+json_t *json_loadf(FILE *input, size_t flags, json_error_t *error) {
     lex_t lex;
     const char *source;
     json_t *result;
@@ -1020,8 +993,7 @@ json_t *json_loadf(FILE *input, size_t flags, json_error_t *error)
     return result;
 }
 
-static int fd_get_func(int *fd)
-{
+static int fd_get_func(int *fd) {
 #ifdef HAVE_UNISTD_H
     uint8_t c;
     if (read(*fd, &c, 1) == 1)
@@ -1030,8 +1002,7 @@ static int fd_get_func(int *fd)
     return EOF;
 }
 
-json_t *json_loadfd(int input, size_t flags, json_error_t *error)
-{
+json_t *json_loadfd(int input, size_t flags, json_error_t *error) {
     lex_t lex;
     const char *source;
     json_t *result;
@@ -1059,8 +1030,7 @@ json_t *json_loadfd(int input, size_t flags, json_error_t *error)
     return result;
 }
 
-json_t *json_load_file(const char *path, size_t flags, json_error_t *error)
-{
+json_t *json_load_file(const char *path, size_t flags, json_error_t *error) {
     json_t *result;
     FILE *fp;
 
@@ -1094,8 +1064,7 @@ typedef struct {
     void *arg;
 } callback_data_t;
 
-static int callback_get(void *data)
-{
+static int callback_get(void *data) {
     char c;
     callback_data_t *stream = data;
 
@@ -1111,8 +1080,7 @@ static int callback_get(void *data)
     return (unsigned char)c;
 }
 
-json_t *json_load_callback(json_load_callback_t callback, void *arg, size_t flags, json_error_t *error)
-{
+json_t *json_load_callback(json_load_callback_t callback, void *arg, size_t flags, json_error_t *error) {
     lex_t lex;
     json_t *result;
 
diff --git a/client/jansson/lookup3.h b/client/jansson/lookup3.h
index b75e6b505..45f477480 100644
--- a/client/jansson/lookup3.h
+++ b/client/jansson/lookup3.h
@@ -193,8 +193,7 @@ acceptable.  Do NOT use for cryptographic purposes.
 -------------------------------------------------------------------------------
 */
 
-static uint32_t hashlittle(const void *key, size_t length, uint32_t initval)
-{
+static uint32_t hashlittle(const void *key, size_t length, uint32_t initval) {
     uint32_t a, b, c;                                        /* internal state */
     union { const void *ptr; size_t i; } u;     /* needed for Mac Powerbook G4 */
 
diff --git a/client/jansson/memory.c b/client/jansson/memory.c
index bd4f5abd7..77c512352 100644
--- a/client/jansson/memory.c
+++ b/client/jansson/memory.c
@@ -20,29 +20,25 @@
 static json_malloc_t do_malloc = malloc;
 static json_free_t do_free = free;
 
-void *jsonp_malloc(size_t size)
-{
+void *jsonp_malloc(size_t size) {
     if (!size)
         return NULL;
 
     return (*do_malloc)(size);
 }
 
-void jsonp_free(void *ptr)
-{
+void jsonp_free(void *ptr) {
     if (!ptr)
         return;
 
     (*do_free)(ptr);
 }
 
-char *jsonp_strdup(const char *str)
-{
+char *jsonp_strdup(const char *str) {
     return jsonp_strndup(str, strlen(str));
 }
 
-char *jsonp_strndup(const char *str, size_t len)
-{
+char *jsonp_strndup(const char *str, size_t len) {
     char *new_str;
 
     new_str = jsonp_malloc(len + 1);
@@ -54,14 +50,12 @@ char *jsonp_strndup(const char *str, size_t len)
     return new_str;
 }
 
-void json_set_alloc_funcs(json_malloc_t malloc_fn, json_free_t free_fn)
-{
+void json_set_alloc_funcs(json_malloc_t malloc_fn, json_free_t free_fn) {
     do_malloc = malloc_fn;
     do_free = free_fn;
 }
 
-void json_get_alloc_funcs(json_malloc_t *malloc_fn, json_free_t *free_fn)
-{
+void json_get_alloc_funcs(json_malloc_t *malloc_fn, json_free_t *free_fn) {
     if (malloc_fn)
         *malloc_fn = do_malloc;
     if (free_fn)
diff --git a/client/jansson/pack_unpack.c b/client/jansson/pack_unpack.c
index bdb17380b..af7aab0fd 100644
--- a/client/jansson/pack_unpack.c
+++ b/client/jansson/pack_unpack.c
@@ -50,8 +50,7 @@ static const char *const type_names[] = {
 static const char unpack_value_starters[] = "{[siIbfFOon";
 
 static void scanner_init(scanner_t *s, json_error_t *error,
-                         size_t flags, const char *fmt)
-{
+                         size_t flags, const char *fmt) {
     s->error = error;
     s->flags = flags;
     s->fmt = s->start = fmt;
@@ -64,8 +63,7 @@ static void scanner_init(scanner_t *s, json_error_t *error,
     s->has_error = 0;
 }
 
-static void next_token(scanner_t *s)
-{
+static void next_token(scanner_t *s) {
     const char *t;
     s->prev_token = s->token;
 
@@ -103,15 +101,13 @@ static void next_token(scanner_t *s)
     s->fmt = t;
 }
 
-static void prev_token(scanner_t *s)
-{
+static void prev_token(scanner_t *s) {
     s->next_token = s->token;
     s->token = s->prev_token;
 }
 
 static void set_error(scanner_t *s, const char *source, enum json_error_code code,
-                      const char *fmt, ...)
-{
+                      const char *fmt, ...) {
     va_list ap;
     va_start(ap, fmt);
 
@@ -129,8 +125,7 @@ static json_t *pack(scanner_t *s, va_list *ap);
 /* ours will be set to 1 if jsonp_free() must be called for the result
    afterwards */
 static char *read_string(scanner_t *s, va_list *ap,
-                         const char *purpose, size_t *out_len, int *ours, int optional)
-{
+                         const char *purpose, size_t *out_len, int *ours, int optional) {
     char t;
     strbuffer_t strbuff;
     const char *str;
@@ -222,8 +217,7 @@ static char *read_string(scanner_t *s, va_list *ap,
     return strbuffer_steal_value(&strbuff);
 }
 
-static json_t *pack_object(scanner_t *s, va_list *ap)
-{
+static json_t *pack_object(scanner_t *s, va_list *ap) {
     json_t *object = json_object();
     next_token(s);
 
@@ -288,8 +282,7 @@ error:
     return NULL;
 }
 
-static json_t *pack_array(scanner_t *s, va_list *ap)
-{
+static json_t *pack_array(scanner_t *s, va_list *ap) {
     json_t *array = json_array();
     next_token(s);
 
@@ -336,8 +329,7 @@ error:
     return NULL;
 }
 
-static json_t *pack_string(scanner_t *s, va_list *ap)
-{
+static json_t *pack_string(scanner_t *s, va_list *ap) {
     char *str;
     char t;
     size_t len;
@@ -366,8 +358,7 @@ static json_t *pack_string(scanner_t *s, va_list *ap)
     return json_stringn_nocheck(str, len);
 }
 
-static json_t *pack_object_inter(scanner_t *s, va_list *ap, int need_incref)
-{
+static json_t *pack_object_inter(scanner_t *s, va_list *ap, int need_incref) {
     json_t *json;
     char ntoken;
 
@@ -396,8 +387,7 @@ static json_t *pack_object_inter(scanner_t *s, va_list *ap, int need_incref)
     return NULL;
 }
 
-static json_t *pack_integer(scanner_t *s, json_int_t value)
-{
+static json_t *pack_integer(scanner_t *s, json_int_t value) {
     json_t *json = json_integer(value);
 
     if (!json) {
@@ -408,8 +398,7 @@ static json_t *pack_integer(scanner_t *s, json_int_t value)
     return json;
 }
 
-static json_t *pack_real(scanner_t *s, double value)
-{
+static json_t *pack_real(scanner_t *s, double value) {
     /* Allocate without setting value so we can identify OOM error. */
     json_t *json = json_real(0.0);
 
@@ -432,8 +421,7 @@ static json_t *pack_real(scanner_t *s, double value)
     return json;
 }
 
-static json_t *pack(scanner_t *s, va_list *ap)
-{
+static json_t *pack(scanner_t *s, va_list *ap) {
     switch (token(s)) {
         case '{':
             return pack_object(s, ap);
@@ -475,8 +463,7 @@ static json_t *pack(scanner_t *s, va_list *ap)
 
 static int unpack(scanner_t *s, json_t *root, va_list *ap);
 
-static int unpack_object(scanner_t *s, json_t *root, va_list *ap)
-{
+static int unpack_object(scanner_t *s, json_t *root, va_list *ap) {
     int ret = -1;
     int strict = 0;
     int gotopt = 0;
@@ -604,8 +591,7 @@ out:
     return ret;
 }
 
-static int unpack_array(scanner_t *s, json_t *root, va_list *ap)
-{
+static int unpack_array(scanner_t *s, json_t *root, va_list *ap) {
     size_t i = 0;
     int strict = 0;
 
@@ -673,8 +659,7 @@ static int unpack_array(scanner_t *s, json_t *root, va_list *ap)
     return 0;
 }
 
-static int unpack(scanner_t *s, json_t *root, va_list *ap)
-{
+static int unpack(scanner_t *s, json_t *root, va_list *ap) {
     switch (token(s)) {
         case '{':
             return unpack_object(s, root, ap);
@@ -824,8 +809,7 @@ static int unpack(scanner_t *s, json_t *root, va_list *ap)
 }
 
 json_t *json_vpack_ex(json_error_t *error, size_t flags,
-                      const char *fmt, va_list ap)
-{
+                      const char *fmt, va_list ap) {
     scanner_t s;
     va_list ap_copy;
     json_t *value;
@@ -858,8 +842,7 @@ json_t *json_vpack_ex(json_error_t *error, size_t flags,
     return value;
 }
 
-json_t *json_pack_ex(json_error_t *error, size_t flags, const char *fmt, ...)
-{
+json_t *json_pack_ex(json_error_t *error, size_t flags, const char *fmt, ...) {
     json_t *value;
     va_list ap;
 
@@ -870,8 +853,7 @@ json_t *json_pack_ex(json_error_t *error, size_t flags, const char *fmt, ...)
     return value;
 }
 
-json_t *json_pack(const char *fmt, ...)
-{
+json_t *json_pack(const char *fmt, ...) {
     json_t *value;
     va_list ap;
 
@@ -883,8 +865,7 @@ json_t *json_pack(const char *fmt, ...)
 }
 
 int json_vunpack_ex(json_t *root, json_error_t *error, size_t flags,
-                    const char *fmt, va_list ap)
-{
+                    const char *fmt, va_list ap) {
     scanner_t s;
     va_list ap_copy;
 
@@ -920,8 +901,7 @@ int json_vunpack_ex(json_t *root, json_error_t *error, size_t flags,
     return 0;
 }
 
-int json_unpack_ex(json_t *root, json_error_t *error, size_t flags, const char *fmt, ...)
-{
+int json_unpack_ex(json_t *root, json_error_t *error, size_t flags, const char *fmt, ...) {
     int ret;
     va_list ap;
 
@@ -932,8 +912,7 @@ int json_unpack_ex(json_t *root, json_error_t *error, size_t flags, const char *
     return ret;
 }
 
-int json_unpack(json_t *root, const char *fmt, ...)
-{
+int json_unpack(json_t *root, const char *fmt, ...) {
     int ret;
     va_list ap;
 
diff --git a/client/jansson/path.c b/client/jansson/path.c
index 466ac70ce..ae44a09b2 100644
--- a/client/jansson/path.c
+++ b/client/jansson/path.c
@@ -13,8 +13,7 @@
 #include <jansson.h>
 #include "jansson_private.h"
 
-json_t *json_path_get(const json_t *json, const char *path)
-{
+json_t *json_path_get(const json_t *json, const char *path) {
     static const char root_chr = '$', array_open = '[';
     static const char *path_delims = ".[", *array_close = "]";
     const json_t *cursor;
@@ -68,8 +67,7 @@ fail:
     return NULL;
 }
 
-int json_path_set_new(json_t *json, const char *path, json_t *value, size_t flags, json_error_t *error)
-{
+int json_path_set_new(json_t *json, const char *path, json_t *value, size_t flags, json_error_t *error) {
     static const char root_chr = '$', array_open = '[', object_delim = '.';
     static const char *const path_delims = ".[", *array_close = "]";
 
diff --git a/client/jansson/strbuffer.c b/client/jansson/strbuffer.c
index 49486926f..7e52d3900 100644
--- a/client/jansson/strbuffer.c
+++ b/client/jansson/strbuffer.c
@@ -18,8 +18,7 @@
 #define STRBUFFER_FACTOR    2
 #define STRBUFFER_SIZE_MAX  ((size_t)-1)
 
-int strbuffer_init(strbuffer_t *strbuff)
-{
+int strbuffer_init(strbuffer_t *strbuff) {
     strbuff->size = STRBUFFER_MIN_SIZE;
     strbuff->length = 0;
 
@@ -32,8 +31,7 @@ int strbuffer_init(strbuffer_t *strbuff)
     return 0;
 }
 
-void strbuffer_close(strbuffer_t *strbuff)
-{
+void strbuffer_close(strbuffer_t *strbuff) {
     if (strbuff->value)
         jsonp_free(strbuff->value);
 
@@ -42,39 +40,34 @@ void strbuffer_close(strbuffer_t *strbuff)
     strbuff->value = NULL;
 }
 
-void strbuffer_clear(strbuffer_t *strbuff)
-{
+void strbuffer_clear(strbuffer_t *strbuff) {
     strbuff->length = 0;
     strbuff->value[0] = '\0';
 }
 
-const char *strbuffer_value(const strbuffer_t *strbuff)
-{
+const char *strbuffer_value(const strbuffer_t *strbuff) {
     return strbuff->value;
 }
 
-char *strbuffer_steal_value(strbuffer_t *strbuff)
-{
+char *strbuffer_steal_value(strbuffer_t *strbuff) {
     char *result = strbuff->value;
     strbuff->value = NULL;
     return result;
 }
 
-int strbuffer_append_byte(strbuffer_t *strbuff, char byte)
-{
+int strbuffer_append_byte(strbuffer_t *strbuff, char byte) {
     return strbuffer_append_bytes(strbuff, &byte, 1);
 }
 
-int strbuffer_append_bytes(strbuffer_t *strbuff, const char *data, size_t size)
-{
+int strbuffer_append_bytes(strbuffer_t *strbuff, const char *data, size_t size) {
     if (size >= strbuff->size - strbuff->length) {
         size_t new_size;
         char *new_value;
 
         /* avoid integer overflow */
         if (strbuff->size > STRBUFFER_SIZE_MAX / STRBUFFER_FACTOR
-            || size > STRBUFFER_SIZE_MAX - 1
-            || strbuff->length > STRBUFFER_SIZE_MAX - 1 - size)
+                || size > STRBUFFER_SIZE_MAX - 1
+                || strbuff->length > STRBUFFER_SIZE_MAX - 1 - size)
             return -1;
 
         new_size = max(strbuff->size * STRBUFFER_FACTOR,
@@ -98,8 +91,7 @@ int strbuffer_append_bytes(strbuffer_t *strbuff, const char *data, size_t size)
     return 0;
 }
 
-char strbuffer_pop(strbuffer_t *strbuff)
-{
+char strbuffer_pop(strbuffer_t *strbuff) {
     if (strbuff->length > 0) {
         char c = strbuff->value[--strbuff->length];
         strbuff->value[strbuff->length] = '\0';
diff --git a/client/jansson/strconv.c b/client/jansson/strconv.c
index 3f9d355d8..f8a8a65aa 100644
--- a/client/jansson/strconv.c
+++ b/client/jansson/strconv.c
@@ -31,8 +31,7 @@
     this way. Multi-threaded programs should use uselocale() instead.
 */
 
-static void to_locale(strbuffer_t *strbuffer)
-{
+static void to_locale(strbuffer_t *strbuffer) {
     const char *point;
     char *pos;
 
@@ -47,8 +46,7 @@ static void to_locale(strbuffer_t *strbuffer)
         *pos = *point;
 }
 
-static void from_locale(char *buffer)
-{
+static void from_locale(char *buffer) {
     const char *point;
     char *pos;
 
@@ -64,8 +62,7 @@ static void from_locale(char *buffer)
 }
 #endif
 
-int jsonp_strtod(strbuffer_t *strbuffer, double *out)
-{
+int jsonp_strtod(strbuffer_t *strbuffer, double *out) {
     double value;
     char *end;
 
@@ -86,8 +83,7 @@ int jsonp_strtod(strbuffer_t *strbuffer, double *out)
     return 0;
 }
 
-int jsonp_dtostr(char *buffer, size_t size, double value, int precision)
-{
+int jsonp_dtostr(char *buffer, size_t size, double value, int precision) {
     int ret;
     char *start, *end;
     size_t length;
@@ -110,7 +106,7 @@ int jsonp_dtostr(char *buffer, size_t size, double value, int precision)
     /* Make sure there's a dot or 'e' in the output. Otherwise
        a real is converted to an integer when decoding */
     if (strchr(buffer, '.') == NULL &&
-        strchr(buffer, 'e') == NULL) {
+            strchr(buffer, 'e') == NULL) {
         if (length + 3 >= size) {
             /* No space to append ".0" */
             return -1;
diff --git a/client/jansson/utf.c b/client/jansson/utf.c
index 9f64ae6c0..003c422bd 100644
--- a/client/jansson/utf.c
+++ b/client/jansson/utf.c
@@ -8,8 +8,7 @@
 #include <string.h>
 #include "utf.h"
 
-int utf8_encode(int32_t codepoint, char *buffer, size_t *size)
-{
+int utf8_encode(int32_t codepoint, char *buffer, size_t *size) {
     if (codepoint < 0)
         return -1;
     else if (codepoint < 0x80) {
@@ -36,8 +35,7 @@ int utf8_encode(int32_t codepoint, char *buffer, size_t *size)
     return 0;
 }
 
-size_t utf8_check_first(char byte)
-{
+size_t utf8_check_first(char byte) {
     unsigned char u = (unsigned char)byte;
 
     if (u < 0x80)
@@ -68,8 +66,7 @@ size_t utf8_check_first(char byte)
     }
 }
 
-size_t utf8_check_full(const char *buffer, size_t size, int32_t *codepoint)
-{
+size_t utf8_check_full(const char *buffer, size_t size, int32_t *codepoint) {
     size_t i;
     int32_t value = 0;
     unsigned char u = (unsigned char)buffer[0];
@@ -117,8 +114,7 @@ size_t utf8_check_full(const char *buffer, size_t size, int32_t *codepoint)
     return 1;
 }
 
-const char *utf8_iterate(const char *buffer, size_t bufsize, int32_t *codepoint)
-{
+const char *utf8_iterate(const char *buffer, size_t bufsize, int32_t *codepoint) {
     size_t count;
     int32_t value;
 
@@ -142,8 +138,7 @@ const char *utf8_iterate(const char *buffer, size_t bufsize, int32_t *codepoint)
     return buffer + count;
 }
 
-int utf8_check_string(const char *string, size_t length)
-{
+int utf8_check_string(const char *string, size_t length) {
     size_t i;
 
     for (i = 0; i < length; i++) {
diff --git a/client/jansson/value.c b/client/jansson/value.c
index 487777f11..fcc0caa2c 100644
--- a/client/jansson/value.c
+++ b/client/jansson/value.c
@@ -37,8 +37,7 @@ static JSON_INLINE int isnan(double x) { return x != x; }
 static JSON_INLINE int isinf(double x) { return !isnan(x) && isnan(x - x); }
 #endif
 
-static JSON_INLINE void json_init(json_t *json, json_type type)
-{
+static JSON_INLINE void json_init(json_t *json, json_type type) {
     json->type = type;
     json->refcount = 1;
 }
@@ -48,8 +47,7 @@ static JSON_INLINE void json_init(json_t *json, json_type type)
 
 extern volatile uint32_t hashtable_seed;
 
-json_t *json_object(void)
-{
+json_t *json_object(void) {
     json_object_t *object = jsonp_malloc(sizeof(json_object_t));
     if (!object)
         return NULL;
@@ -69,14 +67,12 @@ json_t *json_object(void)
     return &object->json;
 }
 
-static void json_delete_object(json_object_t *object)
-{
+static void json_delete_object(json_object_t *object) {
     hashtable_close(&object->hashtable);
     jsonp_free(object);
 }
 
-size_t json_object_size(const json_t *json)
-{
+size_t json_object_size(const json_t *json) {
     json_object_t *object;
 
     if (!json_is_object(json))
@@ -86,8 +82,7 @@ size_t json_object_size(const json_t *json)
     return object->hashtable.size;
 }
 
-json_t *json_object_get(const json_t *json, const char *key)
-{
+json_t *json_object_get(const json_t *json, const char *key) {
     json_object_t *object;
 
     if (!key || !json_is_object(json))
@@ -97,8 +92,7 @@ json_t *json_object_get(const json_t *json, const char *key)
     return hashtable_get(&object->hashtable, key);
 }
 
-int json_object_set_new_nocheck(json_t *json, const char *key, json_t *value)
-{
+int json_object_set_new_nocheck(json_t *json, const char *key, json_t *value) {
     json_object_t *object;
 
     if (!value)
@@ -118,8 +112,7 @@ int json_object_set_new_nocheck(json_t *json, const char *key, json_t *value)
     return 0;
 }
 
-int json_object_set_new(json_t *json, const char *key, json_t *value)
-{
+int json_object_set_new(json_t *json, const char *key, json_t *value) {
     if (!key || !utf8_check_string(key, strlen(key))) {
         json_decref(value);
         return -1;
@@ -128,8 +121,7 @@ int json_object_set_new(json_t *json, const char *key, json_t *value)
     return json_object_set_new_nocheck(json, key, value);
 }
 
-int json_object_del(json_t *json, const char *key)
-{
+int json_object_del(json_t *json, const char *key) {
     json_object_t *object;
 
     if (!key || !json_is_object(json))
@@ -139,8 +131,7 @@ int json_object_del(json_t *json, const char *key)
     return hashtable_del(&object->hashtable, key);
 }
 
-int json_object_clear(json_t *json)
-{
+int json_object_clear(json_t *json) {
     json_object_t *object;
 
     if (!json_is_object(json))
@@ -152,8 +143,7 @@ int json_object_clear(json_t *json)
     return 0;
 }
 
-int json_object_update(json_t *object, json_t *other)
-{
+int json_object_update(json_t *object, json_t *other) {
     const char *key;
     json_t *value;
 
@@ -168,8 +158,7 @@ int json_object_update(json_t *object, json_t *other)
     return 0;
 }
 
-int json_object_update_existing(json_t *object, json_t *other)
-{
+int json_object_update_existing(json_t *object, json_t *other) {
     const char *key;
     json_t *value;
 
@@ -184,8 +173,7 @@ int json_object_update_existing(json_t *object, json_t *other)
     return 0;
 }
 
-int json_object_update_missing(json_t *object, json_t *other)
-{
+int json_object_update_missing(json_t *object, json_t *other) {
     const char *key;
     json_t *value;
 
@@ -200,8 +188,7 @@ int json_object_update_missing(json_t *object, json_t *other)
     return 0;
 }
 
-void *json_object_iter(json_t *json)
-{
+void *json_object_iter(json_t *json) {
     json_object_t *object;
 
     if (!json_is_object(json))
@@ -211,8 +198,7 @@ void *json_object_iter(json_t *json)
     return hashtable_iter(&object->hashtable);
 }
 
-void *json_object_iter_at(json_t *json, const char *key)
-{
+void *json_object_iter_at(json_t *json, const char *key) {
     json_object_t *object;
 
     if (!key || !json_is_object(json))
@@ -222,8 +208,7 @@ void *json_object_iter_at(json_t *json, const char *key)
     return hashtable_iter_at(&object->hashtable, key);
 }
 
-void *json_object_iter_next(json_t *json, void *iter)
-{
+void *json_object_iter_next(json_t *json, void *iter) {
     json_object_t *object;
 
     if (!json_is_object(json) || iter == NULL)
@@ -233,24 +218,21 @@ void *json_object_iter_next(json_t *json, void *iter)
     return hashtable_iter_next(&object->hashtable, iter);
 }
 
-const char *json_object_iter_key(void *iter)
-{
+const char *json_object_iter_key(void *iter) {
     if (!iter)
         return NULL;
 
     return hashtable_iter_key(iter);
 }
 
-json_t *json_object_iter_value(void *iter)
-{
+json_t *json_object_iter_value(void *iter) {
     if (!iter)
         return NULL;
 
     return (json_t *)hashtable_iter_value(iter);
 }
 
-int json_object_iter_set_new(json_t *json, void *iter, json_t *value)
-{
+int json_object_iter_set_new(json_t *json, void *iter, json_t *value) {
     if (!json_is_object(json) || !iter || !value) {
         json_decref(value);
         return -1;
@@ -260,16 +242,14 @@ int json_object_iter_set_new(json_t *json, void *iter, json_t *value)
     return 0;
 }
 
-void *json_object_key_to_iter(const char *key)
-{
+void *json_object_key_to_iter(const char *key) {
     if (!key)
         return NULL;
 
     return hashtable_key_to_iter(key);
 }
 
-static int json_object_equal(const json_t *object1, const json_t *object2)
-{
+static int json_object_equal(const json_t *object1, const json_t *object2) {
     const char *key;
     const json_t *value1, *value2;
 
@@ -286,8 +266,7 @@ static int json_object_equal(const json_t *object1, const json_t *object2)
     return 1;
 }
 
-static json_t *json_object_copy(json_t *object)
-{
+static json_t *json_object_copy(json_t *object) {
     json_t *result;
 
     const char *key;
@@ -303,8 +282,7 @@ static json_t *json_object_copy(json_t *object)
     return result;
 }
 
-static json_t *json_object_deep_copy(const json_t *object)
-{
+static json_t *json_object_deep_copy(const json_t *object) {
     json_t *result;
     void *iter;
 
@@ -331,8 +309,7 @@ static json_t *json_object_deep_copy(const json_t *object)
 
 /*** array ***/
 
-json_t *json_array(void)
-{
+json_t *json_array(void) {
     json_array_t *array = jsonp_malloc(sizeof(json_array_t));
     if (!array)
         return NULL;
@@ -350,8 +327,7 @@ json_t *json_array(void)
     return &array->json;
 }
 
-static void json_delete_array(json_array_t *array)
-{
+static void json_delete_array(json_array_t *array) {
     size_t i;
 
     for (i = 0; i < array->entries; i++)
@@ -361,16 +337,14 @@ static void json_delete_array(json_array_t *array)
     jsonp_free(array);
 }
 
-size_t json_array_size(const json_t *json)
-{
+size_t json_array_size(const json_t *json) {
     if (!json_is_array(json))
         return 0;
 
     return json_to_array(json)->entries;
 }
 
-json_t *json_array_get(const json_t *json, size_t index)
-{
+json_t *json_array_get(const json_t *json, size_t index) {
     json_array_t *array;
     if (!json_is_array(json))
         return NULL;
@@ -382,8 +356,7 @@ json_t *json_array_get(const json_t *json, size_t index)
     return array->table[index];
 }
 
-int json_array_set_new(json_t *json, size_t index, json_t *value)
-{
+int json_array_set_new(json_t *json, size_t index, json_t *value) {
     json_array_t *array;
 
     if (!value)
@@ -407,22 +380,19 @@ int json_array_set_new(json_t *json, size_t index, json_t *value)
 }
 
 static void array_move(json_array_t *array, size_t dest,
-                       size_t src, size_t count)
-{
+                       size_t src, size_t count) {
     memmove(&array->table[dest], &array->table[src], count * sizeof(json_t *));
 }
 
 static void array_copy(json_t **dest, size_t dpos,
                        json_t **src, size_t spos,
-                       size_t count)
-{
+                       size_t count) {
     memcpy(&dest[dpos], &src[spos], count * sizeof(json_t *));
 }
 
 static json_t **json_array_grow(json_array_t *array,
                                 size_t amount,
-                                int copy)
-{
+                                int copy) {
     size_t new_size;
     json_t **old_table, **new_table;
 
@@ -448,8 +418,7 @@ static json_t **json_array_grow(json_array_t *array,
     return old_table;
 }
 
-int json_array_append_new(json_t *json, json_t *value)
-{
+int json_array_append_new(json_t *json, json_t *value) {
     json_array_t *array;
 
     if (!value)
@@ -472,8 +441,7 @@ int json_array_append_new(json_t *json, json_t *value)
     return 0;
 }
 
-int json_array_insert_new(json_t *json, size_t index, json_t *value)
-{
+int json_array_insert_new(json_t *json, size_t index, json_t *value) {
     json_array_t *array;
     json_t **old_table;
 
@@ -511,8 +479,7 @@ int json_array_insert_new(json_t *json, size_t index, json_t *value)
     return 0;
 }
 
-int json_array_remove(json_t *json, size_t index)
-{
+int json_array_remove(json_t *json, size_t index) {
     json_array_t *array;
 
     if (!json_is_array(json))
@@ -533,8 +500,7 @@ int json_array_remove(json_t *json, size_t index)
     return 0;
 }
 
-int json_array_clear(json_t *json)
-{
+int json_array_clear(json_t *json) {
     json_array_t *array;
     size_t i;
 
@@ -549,8 +515,7 @@ int json_array_clear(json_t *json)
     return 0;
 }
 
-int json_array_extend(json_t *json, json_t *other_json)
-{
+int json_array_extend(json_t *json, json_t *other_json) {
     json_array_t *array, *other;
     size_t i;
 
@@ -571,8 +536,7 @@ int json_array_extend(json_t *json, json_t *other_json)
     return 0;
 }
 
-static int json_array_equal(const json_t *array1, const json_t *array2)
-{
+static int json_array_equal(const json_t *array1, const json_t *array2) {
     size_t i, size;
 
     size = json_array_size(array1);
@@ -592,8 +556,7 @@ static int json_array_equal(const json_t *array1, const json_t *array2)
     return 1;
 }
 
-static json_t *json_array_copy(json_t *array)
-{
+static json_t *json_array_copy(json_t *array) {
     json_t *result;
     size_t i;
 
@@ -607,8 +570,7 @@ static json_t *json_array_copy(json_t *array)
     return result;
 }
 
-static json_t *json_array_deep_copy(const json_t *array)
-{
+static json_t *json_array_deep_copy(const json_t *array) {
     json_t *result;
     size_t i;
 
@@ -624,8 +586,7 @@ static json_t *json_array_deep_copy(const json_t *array)
 
 /*** string ***/
 
-static json_t *string_create(const char *value, size_t len, int own)
-{
+static json_t *string_create(const char *value, size_t len, int own) {
     char *v;
     json_string_t *string;
 
@@ -652,67 +613,58 @@ static json_t *string_create(const char *value, size_t len, int own)
     return &string->json;
 }
 
-json_t *json_string_nocheck(const char *value)
-{
+json_t *json_string_nocheck(const char *value) {
     if (!value)
         return NULL;
 
     return string_create(value, strlen(value), 0);
 }
 
-json_t *json_stringn_nocheck(const char *value, size_t len)
-{
+json_t *json_stringn_nocheck(const char *value, size_t len) {
     return string_create(value, len, 0);
 }
 
 /* this is private; "steal" is not a public API concept */
-json_t *jsonp_stringn_nocheck_own(const char *value, size_t len)
-{
+json_t *jsonp_stringn_nocheck_own(const char *value, size_t len) {
     return string_create(value, len, 1);
 }
 
-json_t *json_string(const char *value)
-{
+json_t *json_string(const char *value) {
     if (!value)
         return NULL;
 
     return json_stringn(value, strlen(value));
 }
 
-json_t *json_stringn(const char *value, size_t len)
-{
+json_t *json_stringn(const char *value, size_t len) {
     if (!value || !utf8_check_string(value, len))
         return NULL;
 
     return json_stringn_nocheck(value, len);
 }
 
-const char *json_string_value(const json_t *json)
-{
+const char *json_string_value(const json_t *json) {
     if (!json_is_string(json))
         return NULL;
 
     return json_to_string(json)->value;
 }
 
-size_t json_string_length(const json_t *json)
-{
+size_t json_string_length(const json_t *json) {
     if (!json_is_string(json))
         return 0;
 
     return json_to_string(json)->length;
 }
 
-int json_string_set_nocheck(json_t *json, const char *value)
-{
+int json_string_set_nocheck(json_t *json, const char *value) {
     if (!value)
         return -1;
 
     return json_string_setn_nocheck(json, value, strlen(value));
 }
 
-int json_string_setn_nocheck(json_t *json, const char *value, size_t len)
-{
+int json_string_setn_nocheck(json_t *json, const char *value, size_t len) {
     char *dup;
     json_string_t *string;
 
@@ -731,30 +683,26 @@ int json_string_setn_nocheck(json_t *json, const char *value, size_t len)
     return 0;
 }
 
-int json_string_set(json_t *json, const char *value)
-{
+int json_string_set(json_t *json, const char *value) {
     if (!value)
         return -1;
 
     return json_string_setn(json, value, strlen(value));
 }
 
-int json_string_setn(json_t *json, const char *value, size_t len)
-{
+int json_string_setn(json_t *json, const char *value, size_t len) {
     if (!value || !utf8_check_string(value, len))
         return -1;
 
     return json_string_setn_nocheck(json, value, len);
 }
 
-static void json_delete_string(json_string_t *string)
-{
+static void json_delete_string(json_string_t *string) {
     jsonp_free(string->value);
     jsonp_free(string);
 }
 
-static int json_string_equal(const json_t *string1, const json_t *string2)
-{
+static int json_string_equal(const json_t *string1, const json_t *string2) {
     json_string_t *s1, *s2;
 
     s1 = json_to_string(string1);
@@ -762,16 +710,14 @@ static int json_string_equal(const json_t *string1, const json_t *string2)
     return s1->length == s2->length && !memcmp(s1->value, s2->value, s1->length);
 }
 
-static json_t *json_string_copy(const json_t *string)
-{
+static json_t *json_string_copy(const json_t *string) {
     json_string_t *s;
 
     s = json_to_string(string);
     return json_stringn_nocheck(s->value, s->length);
 }
 
-json_t *json_vsprintf(const char *fmt, va_list ap)
-{
+json_t *json_vsprintf(const char *fmt, va_list ap) {
     json_t *json = NULL;
     int length;
     char *buf;
@@ -801,8 +747,7 @@ out:
     return json;
 }
 
-json_t *json_sprintf(const char *fmt, ...)
-{
+json_t *json_sprintf(const char *fmt, ...) {
     json_t *result;
     va_list ap;
 
@@ -816,8 +761,7 @@ json_t *json_sprintf(const char *fmt, ...)
 
 /*** integer ***/
 
-json_t *json_integer(json_int_t value)
-{
+json_t *json_integer(json_int_t value) {
     json_integer_t *integer = jsonp_malloc(sizeof(json_integer_t));
     if (!integer)
         return NULL;
@@ -827,16 +771,14 @@ json_t *json_integer(json_int_t value)
     return &integer->json;
 }
 
-json_int_t json_integer_value(const json_t *json)
-{
+json_int_t json_integer_value(const json_t *json) {
     if (!json_is_integer(json))
         return 0;
 
     return json_to_integer(json)->value;
 }
 
-int json_integer_set(json_t *json, json_int_t value)
-{
+int json_integer_set(json_t *json, json_int_t value) {
     if (!json_is_integer(json))
         return -1;
 
@@ -845,26 +787,22 @@ int json_integer_set(json_t *json, json_int_t value)
     return 0;
 }
 
-static void json_delete_integer(json_integer_t *integer)
-{
+static void json_delete_integer(json_integer_t *integer) {
     jsonp_free(integer);
 }
 
-static int json_integer_equal(const json_t *integer1, const json_t *integer2)
-{
+static int json_integer_equal(const json_t *integer1, const json_t *integer2) {
     return json_integer_value(integer1) == json_integer_value(integer2);
 }
 
-static json_t *json_integer_copy(const json_t *integer)
-{
+static json_t *json_integer_copy(const json_t *integer) {
     return json_integer(json_integer_value(integer));
 }
 
 
 /*** real ***/
 
-json_t *json_real(double value)
-{
+json_t *json_real(double value) {
     json_real_t *real;
 
     if (isnan(value) || isinf(value))
@@ -879,16 +817,14 @@ json_t *json_real(double value)
     return &real->json;
 }
 
-double json_real_value(const json_t *json)
-{
+double json_real_value(const json_t *json) {
     if (!json_is_real(json))
         return 0;
 
     return json_to_real(json)->value;
 }
 
-int json_real_set(json_t *json, double value)
-{
+int json_real_set(json_t *json, double value) {
     if (!json_is_real(json) || isnan(value) || isinf(value))
         return -1;
 
@@ -897,26 +833,22 @@ int json_real_set(json_t *json, double value)
     return 0;
 }
 
-static void json_delete_real(json_real_t *real)
-{
+static void json_delete_real(json_real_t *real) {
     jsonp_free(real);
 }
 
-static int json_real_equal(const json_t *real1, const json_t *real2)
-{
+static int json_real_equal(const json_t *real1, const json_t *real2) {
     return json_real_value(real1) == json_real_value(real2);
 }
 
-static json_t *json_real_copy(const json_t *real)
-{
+static json_t *json_real_copy(const json_t *real) {
     return json_real(json_real_value(real));
 }
 
 
 /*** number ***/
 
-double json_number_value(const json_t *json)
-{
+double json_number_value(const json_t *json) {
     if (json_is_integer(json))
         return (double)json_integer_value(json);
     else if (json_is_real(json))
@@ -928,22 +860,19 @@ double json_number_value(const json_t *json)
 
 /*** simple values ***/
 
-json_t *json_true(void)
-{
+json_t *json_true(void) {
     static json_t the_true = {JSON_TRUE, (size_t) -1};
     return &the_true;
 }
 
 
-json_t *json_false(void)
-{
+json_t *json_false(void) {
     static json_t the_false = {JSON_FALSE, (size_t) -1};
     return &the_false;
 }
 
 
-json_t *json_null(void)
-{
+json_t *json_null(void) {
     static json_t the_null = {JSON_NULL, (size_t) -1};
     return &the_null;
 }
@@ -951,8 +880,7 @@ json_t *json_null(void)
 
 /*** deletion ***/
 
-void json_delete(json_t *json)
-{
+void json_delete(json_t *json) {
     if (!json)
         return;
 
@@ -982,8 +910,7 @@ void json_delete(json_t *json)
 
 /*** equality ***/
 
-int json_equal(const json_t *json1, const json_t *json2)
-{
+int json_equal(const json_t *json1, const json_t *json2) {
     if (!json1 || !json2)
         return 0;
 
@@ -1013,8 +940,7 @@ int json_equal(const json_t *json1, const json_t *json2)
 
 /*** copying ***/
 
-json_t *json_copy(json_t *json)
-{
+json_t *json_copy(json_t *json) {
     if (!json)
         return NULL;
 
@@ -1038,8 +964,7 @@ json_t *json_copy(json_t *json)
     }
 }
 
-json_t *json_deep_copy(const json_t *json)
-{
+json_t *json_deep_copy(const json_t *json) {
     if (!json)
         return NULL;
 
diff --git a/client/loclass/cipher.c b/client/loclass/cipher.c
index 159208beb..da210d98f 100644
--- a/client/loclass/cipher.c
+++ b/client/loclass/cipher.c
@@ -67,8 +67,7 @@ typedef struct {
 *  is defined as
 *  T (x 0 x 1 . . . . . . x 15 ) = x 0 ⊕ x 1 ⊕ x 5 ⊕ x 7 ⊕ x 10 ⊕ x 11 ⊕ x 14 ⊕ x 15 .
 **/
-bool T(State state)
-{
+bool T(State state) {
     bool x0 = state.t & 0x8000;
     bool x1 = state.t & 0x4000;
     bool x5 = state.t & 0x0400;
@@ -83,8 +82,7 @@ bool T(State state)
 *  Similarly, the feedback function for the bottom register B : F 8/2 → F 2 is defined as
 *  B(x 0 x 1 . . . x 7 ) = x 1 ⊕ x 2 ⊕ x 3 ⊕ x 7 .
 **/
-bool B(State state)
-{
+bool B(State state) {
     bool x1 = state.b & 0x40;
     bool x2 = state.b & 0x20;
     bool x3 = state.b & 0x10;
@@ -102,8 +100,7 @@ bool B(State state)
 *  z 1 = (r 0 ∨ r 2 ) ⊕ (r 5 ∨ r 7 ) ⊕ r 1 ⊕ r 6 ⊕ x ⊕ y
 *  z 2 = (r 3 ∧ r 5 ) ⊕ (r 4 ∧ r 6 ) ⊕ r 7 ⊕ x
 **/
-uint8_t _select(bool x, bool y, uint8_t r)
-{
+uint8_t _select(bool x, bool y, uint8_t r) {
     bool r0 = r >> 7 & 0x1;
     bool r1 = r >> 6 & 0x1;
     bool r2 = r >> 5 & 0x1;
@@ -139,8 +136,7 @@ uint8_t _select(bool x, bool y, uint8_t r)
 * @param s - state
 * @param k - array containing 8 bytes
 **/
-State successor(uint8_t *k, State s, bool y)
-{
+State successor(uint8_t *k, State s, bool y) {
     bool r0 = s.r >> 7 & 0x1;
     bool r4 = s.r >> 3 & 0x1;
     bool r7 = s.r & 0x1;
@@ -166,8 +162,7 @@ State successor(uint8_t *k, State s, bool y)
 *  to multiple bit input x ∈ F n 2 which we define as
 * @param k - array containing 8 bytes
 **/
-State suc(uint8_t *k, State s, BitstreamIn *bitstream)
-{
+State suc(uint8_t *k, State s, BitstreamIn *bitstream) {
     if (bitsLeft(bitstream) == 0) {
         return s;
     }
@@ -183,8 +178,7 @@ State suc(uint8_t *k, State s, BitstreamIn *bitstream)
 *  output(k, s, x 0 . . . x n ) = output(s) · output(k, s ′ , x 1 . . . x n )
 *  where s ′ = suc(k, s, x 0 ).
 **/
-void output(uint8_t *k, State s, BitstreamIn *in,  BitstreamOut *out)
-{
+void output(uint8_t *k, State s, BitstreamIn *in,  BitstreamOut *out) {
     if (bitsLeft(in) == 0) {
         return;
     }
@@ -200,8 +194,7 @@ void output(uint8_t *k, State s, BitstreamIn *in,  BitstreamOut *out)
 * key k ∈ (F 82 ) 8 and outputs the initial cipher state s =< l, r, t, b >
 **/
 
-State init(uint8_t *k)
-{
+State init(uint8_t *k) {
     State s = {
         ((k[0] ^ 0x4c) + 0xEC) & 0xFF,// l
         ((k[0] ^ 0x4c) + 0x21) & 0xFF,// r
@@ -210,16 +203,14 @@ State init(uint8_t *k)
     };
     return s;
 }
-void MAC(uint8_t *k, BitstreamIn input, BitstreamOut out)
-{
+void MAC(uint8_t *k, BitstreamIn input, BitstreamOut out) {
     uint8_t zeroes_32[] = {0, 0, 0, 0};
     BitstreamIn input_32_zeroes = {zeroes_32, sizeof(zeroes_32) * 8, 0};
     State initState = suc(k, init(k), &input);
     output(k, initState, &input_32_zeroes, &out);
 }
 
-void doMAC(uint8_t *cc_nr_p, uint8_t *div_key_p, uint8_t mac[4])
-{
+void doMAC(uint8_t *cc_nr_p, uint8_t *div_key_p, uint8_t mac[4]) {
     uint8_t cc_nr[13] = { 0 };
     uint8_t div_key[8];
     //cc_nr=(uint8_t*) calloc(length+1, sizeof(uint8_t));
@@ -238,8 +229,7 @@ void doMAC(uint8_t *cc_nr_p, uint8_t *div_key_p, uint8_t mac[4])
     //free(cc_nr);
     return;
 }
-void doMAC_N(uint8_t *address_data_p, uint8_t address_data_size, uint8_t *div_key_p, uint8_t mac[4])
-{
+void doMAC_N(uint8_t *address_data_p, uint8_t address_data_size, uint8_t *div_key_p, uint8_t mac[4]) {
     uint8_t *address_data;
     uint8_t div_key[8];
     address_data = (uint8_t *) calloc(address_data_size, sizeof(uint8_t));
@@ -260,8 +250,7 @@ void doMAC_N(uint8_t *address_data_p, uint8_t address_data_size, uint8_t *div_ke
 }
 
 #ifndef ON_DEVICE
-int testMAC()
-{
+int testMAC() {
     PrintAndLogDevice(SUCCESS, "Testing MAC calculation...");
 
     //From the "dismantling.IClass" paper:
diff --git a/client/loclass/cipherutils.c b/client/loclass/cipherutils.c
index 4f015251c..9e7a23bac 100644
--- a/client/loclass/cipherutils.c
+++ b/client/loclass/cipherutils.c
@@ -46,8 +46,7 @@
  * @param stream
  * @return
  */
-bool headBit(BitstreamIn *stream)
-{
+bool headBit(BitstreamIn *stream) {
     int bytepos = stream->position >> 3; // divide by 8
     int bitpos = (stream->position++) & 7; // mask out 00000111
     return (*(stream->buffer + bytepos) >> (7 - bitpos)) & 1;
@@ -57,8 +56,7 @@ bool headBit(BitstreamIn *stream)
  * @param stream
  * @return
  */
-bool tailBit(BitstreamIn *stream)
-{
+bool tailBit(BitstreamIn *stream) {
     int bitpos = stream->numbits - 1 - (stream->position++);
 
     int bytepos = bitpos >> 3;
@@ -70,8 +68,7 @@ bool tailBit(BitstreamIn *stream)
  * @param stream
  * @param bit
  */
-void pushBit(BitstreamOut *stream, bool bit)
-{
+void pushBit(BitstreamOut *stream, bool bit) {
     int bytepos = stream->position >> 3; // divide by 8
     int bitpos = stream->position & 7;
     *(stream->buffer + bytepos) |= (bit & 1) << (7 - bitpos);
@@ -85,8 +82,7 @@ void pushBit(BitstreamOut *stream, bool bit)
  * @param stream
  * @param bits
  */
-void push6bits(BitstreamOut *stream, uint8_t bits)
-{
+void push6bits(BitstreamOut *stream, uint8_t bits) {
     pushBit(stream, bits & 0x20);
     pushBit(stream, bits & 0x10);
     pushBit(stream, bits & 0x08);
@@ -100,8 +96,7 @@ void push6bits(BitstreamOut *stream, uint8_t bits)
  * @param stream
  * @return number of bits left in stream
  */
-int bitsLeft(BitstreamIn *stream)
-{
+int bitsLeft(BitstreamIn *stream) {
     return stream->numbits - stream->position;
 }
 /**
@@ -109,21 +104,18 @@ int bitsLeft(BitstreamIn *stream)
  * @param stream
  * @return Number of bits stored in stream
  */
-int numBits(BitstreamOut *stream)
-{
+int numBits(BitstreamOut *stream) {
     return stream->numbits;
 }
 
-void x_num_to_bytes(uint64_t n, size_t len, uint8_t *dest)
-{
+void x_num_to_bytes(uint64_t n, size_t len, uint8_t *dest) {
     while (len--) {
         dest[len] = (uint8_t) n;
         n >>= 8;
     }
 }
 
-uint64_t x_bytes_to_num(uint8_t *src, size_t len)
-{
+uint64_t x_bytes_to_num(uint8_t *src, size_t len) {
     uint64_t num = 0;
     while (len--) {
         num = (num << 8) | (*src);
@@ -131,30 +123,26 @@ uint64_t x_bytes_to_num(uint8_t *src, size_t len)
     }
     return num;
 }
-uint8_t reversebytes(uint8_t b)
-{
+uint8_t reversebytes(uint8_t b) {
     b = (b & 0xF0) >> 4 | (b & 0x0F) << 4;
     b = (b & 0xCC) >> 2 | (b & 0x33) << 2;
     b = (b & 0xAA) >> 1 | (b & 0x55) << 1;
     return b;
 }
-void reverse_arraybytes(uint8_t *arr, size_t len)
-{
+void reverse_arraybytes(uint8_t *arr, size_t len) {
     uint8_t i;
     for (i = 0; i < len ; i++) {
         arr[i] = reversebytes(arr[i]);
     }
 }
-void reverse_arraycopy(uint8_t *arr, uint8_t *dest, size_t len)
-{
+void reverse_arraycopy(uint8_t *arr, uint8_t *dest, size_t len) {
     uint8_t i;
     for (i = 0; i < len ; i++) {
         dest[i] = reversebytes(arr[i]);
     }
 }
 
-void printarr(char *name, uint8_t *arr, int len)
-{
+void printarr(char *name, uint8_t *arr, int len) {
     int cx, i;
     size_t outsize = 40 + strlen(name) + len * 5;
     char *output = calloc(outsize, sizeof(char));
@@ -167,8 +155,7 @@ void printarr(char *name, uint8_t *arr, int len)
     free(output);
 }
 
-void printvar(char *name, uint8_t *arr, int len)
-{
+void printvar(char *name, uint8_t *arr, int len) {
     int cx, i;
     size_t outsize = 40 + strlen(name) + len * 2;
     char *output = calloc(outsize, sizeof(char));
@@ -181,8 +168,7 @@ void printvar(char *name, uint8_t *arr, int len)
     free(output);
 }
 
-void printarr_human_readable(char *title, uint8_t *arr, int len)
-{
+void printarr_human_readable(char *title, uint8_t *arr, int len) {
     int cx, i;
     size_t outsize = 100 + strlen(title) + len * 4;
     char *output = calloc(outsize, sizeof(char));
@@ -201,8 +187,7 @@ void printarr_human_readable(char *title, uint8_t *arr, int len)
 //-----------------------------
 
 #ifndef ON_DEVICE
-int testBitStream()
-{
+int testBitStream() {
     uint8_t input [] = {0xDE, 0xAD, 0xBE, 0xEF, 0xDE, 0xAD, 0xBE, 0xEF};
     uint8_t output [] = {0, 0, 0, 0, 0, 0, 0, 0};
     BitstreamIn in = { input, sizeof(input) * 8, 0};
@@ -227,8 +212,7 @@ int testBitStream()
     return 0;
 }
 
-int testReversedBitstream()
-{
+int testReversedBitstream() {
     uint8_t input [] = {0xDE, 0xAD, 0xBE, 0xEF, 0xDE, 0xAD, 0xBE, 0xEF};
     uint8_t reverse [] = {0, 0, 0, 0, 0, 0, 0, 0};
     uint8_t output [] = {0, 0, 0, 0, 0, 0, 0, 0};
@@ -259,8 +243,7 @@ int testReversedBitstream()
 }
 
 
-int testCipherUtils(void)
-{
+int testCipherUtils(void) {
     PrintAndLogDevice(INFO, "Testing some internals...");
     int retval = 0;
     retval |= testBitStream();
diff --git a/client/loclass/elite_crack.c b/client/loclass/elite_crack.c
index 14e80eb65..41be3d39c 100644
--- a/client/loclass/elite_crack.c
+++ b/client/loclass/elite_crack.c
@@ -69,8 +69,7 @@
  * @param key
  * @param dest
  */
-void permutekey(uint8_t key[8], uint8_t dest[8])
-{
+void permutekey(uint8_t key[8], uint8_t dest[8]) {
     int i;
     for (i = 0 ; i < 8 ; i++) {
         dest[i] = (((key[7] & (0x80 >> i)) >> (7 - i)) << 7) |
@@ -89,8 +88,7 @@ void permutekey(uint8_t key[8], uint8_t dest[8])
  * @param key
  * @param dest
  */
-void permutekey_rev(uint8_t key[8], uint8_t dest[8])
-{
+void permutekey_rev(uint8_t key[8], uint8_t dest[8]) {
     int i;
     for (i = 0 ; i < 8 ; i++) {
         dest[7 - i] = (((key[0] & (0x80 >> i)) >> (7 - i)) << 7) |
@@ -110,8 +108,7 @@ void permutekey_rev(uint8_t key[8], uint8_t dest[8])
  * @param val
  * @return
  */
-inline uint8_t rr(uint8_t val)
-{
+inline uint8_t rr(uint8_t val) {
     return val >> 1 | ((val & 1) << 7);
 }
 
@@ -121,8 +118,7 @@ inline uint8_t rr(uint8_t val)
  * @param val
  * @return
  */
-inline uint8_t rl(uint8_t val)
-{
+inline uint8_t rl(uint8_t val) {
     return val << 1 | ((val & 0x80) >> 7);
 }
 
@@ -132,8 +128,7 @@ inline uint8_t rl(uint8_t val)
  * @param val
  * @return
  */
-inline uint8_t swap(uint8_t val)
-{
+inline uint8_t swap(uint8_t val) {
     return ((val >> 4) & 0xFF) | ((val & 0xFF) << 4);
 }
 
@@ -143,8 +138,7 @@ inline uint8_t swap(uint8_t val)
  * @param csn the CSN used
  * @param k output
  */
-void hash1(uint8_t csn[], uint8_t k[])
-{
+void hash1(uint8_t csn[], uint8_t k[]) {
     k[0] = csn[0] ^ csn[1] ^ csn[2] ^ csn[3] ^ csn[4] ^ csn[5] ^ csn[6] ^ csn[7];
     k[1] = csn[0] + csn[1] + csn[2] + csn[3] + csn[4] + csn[5] + csn[6] + csn[7];
     k[2] = rr(swap(csn[2] + k[1]));
@@ -168,8 +162,7 @@ Definition 14. Define the rotate key function rk : (F 82 ) 8 × N → (F 82 ) 8
 rk(x [0] . . . x [7] , 0) = x [0] . . . x [7]
 rk(x [0] . . . x [7] , n + 1) = rk(rl(x [0] ) . . . rl(x [7] ), n)
 **/
-void rk(uint8_t *key, uint8_t n, uint8_t *outp_key)
-{
+void rk(uint8_t *key, uint8_t n, uint8_t *outp_key) {
     memcpy(outp_key, key, 8);
     uint8_t j;
     while (n-- > 0) {
@@ -182,16 +175,14 @@ void rk(uint8_t *key, uint8_t n, uint8_t *outp_key)
 static mbedtls_des_context ctx_enc;
 static mbedtls_des_context ctx_dec;
 
-void desdecrypt_iclass(uint8_t *iclass_key, uint8_t *input, uint8_t *output)
-{
+void desdecrypt_iclass(uint8_t *iclass_key, uint8_t *input, uint8_t *output) {
     uint8_t key_std_format[8] = {0};
     permutekey_rev(iclass_key, key_std_format);
     mbedtls_des_setkey_dec(&ctx_dec, key_std_format);
     mbedtls_des_crypt_ecb(&ctx_dec, input, output);
 }
 
-void desencrypt_iclass(uint8_t *iclass_key, uint8_t *input, uint8_t *output)
-{
+void desencrypt_iclass(uint8_t *iclass_key, uint8_t *input, uint8_t *output) {
     uint8_t key_std_format[8] = {0};
     permutekey_rev(iclass_key, key_std_format);
     mbedtls_des_setkey_enc(&ctx_enc, key_std_format);
@@ -204,8 +195,7 @@ void desencrypt_iclass(uint8_t *iclass_key, uint8_t *input, uint8_t *output)
  * @param hash1 hash1
  * @param key_sel output key_sel=h[hash1[i]]
  */
-void hash2(uint8_t *key64, uint8_t *outp_keytable)
-{
+void hash2(uint8_t *key64, uint8_t *outp_keytable) {
     /**
      *Expected:
      * High Security Key Table
@@ -276,8 +266,7 @@ void hash2(uint8_t *key64, uint8_t *outp_keytable)
  * @param i the number to read. Should be less than 127, or something is wrong...
  * @return
  */
-int _readFromDump(uint8_t dump[], dumpdata *item, uint8_t i)
-{
+int _readFromDump(uint8_t dump[], dumpdata *item, uint8_t i) {
     size_t itemsize = sizeof(dumpdata);
     memcpy(item, dump + i * itemsize, itemsize);
 
@@ -301,8 +290,7 @@ int _readFromDump(uint8_t dump[], dumpdata *item, uint8_t i)
  * @param keytable where to write found values.
  * @return
  */
-int bruteforceItem(dumpdata item, uint16_t keytable[])
-{
+int bruteforceItem(dumpdata item, uint16_t keytable[]) {
     int errors = 0;
     int found = false;
     uint8_t key_sel_p[8] = {0};
@@ -443,8 +431,7 @@ int bruteforceItem(dumpdata item, uint16_t keytable[])
  * @param master_key where to put the master key
  * @return 0 for ok, 1 for failz
  */
-int calculateMasterKey(uint8_t first16bytes[], uint64_t master_key[])
-{
+int calculateMasterKey(uint8_t first16bytes[], uint64_t master_key[]) {
     mbedtls_des_context ctx_e;
 
     uint8_t z_0[8] = {0};
@@ -502,8 +489,7 @@ int calculateMasterKey(uint8_t first16bytes[], uint64_t master_key[])
  * @param keytable
  * @return
  */
-int bruteforceDump(uint8_t dump[], size_t dumpsize, uint16_t keytable[])
-{
+int bruteforceDump(uint8_t dump[], size_t dumpsize, uint16_t keytable[]) {
     uint8_t i;
     int errors = 0;
     size_t itemsize = sizeof(dumpdata);
@@ -542,8 +528,7 @@ int bruteforceDump(uint8_t dump[], size_t dumpsize, uint16_t keytable[])
  * @param filename
  * @return
  */
-int bruteforceFile(const char *filename, uint16_t keytable[])
-{
+int bruteforceFile(const char *filename, uint16_t keytable[]) {
     FILE *f = fopen(filename, "rb");
     if (!f) {
         PrintAndLogDevice(WARNING, "Failed to read from file '%s'", filename);
@@ -584,8 +569,7 @@ int bruteforceFile(const char *filename, uint16_t keytable[])
  * @param filename
  * @return
  */
-int bruteforceFileNoKeys(const char *filename)
-{
+int bruteforceFileNoKeys(const char *filename) {
     uint16_t keytable[128] = {0};
     return bruteforceFile(filename, keytable);
 }
@@ -596,8 +580,7 @@ int bruteforceFileNoKeys(const char *filename)
 // ----------------------------------------------------------------------------
 // TEST CODE BELOW
 // ----------------------------------------------------------------------------
-int _testBruteforce()
-{
+int _testBruteforce() {
     int errors = 0;
     if (true) {
         // First test
@@ -634,8 +617,7 @@ int _testBruteforce()
     return errors;
 }
 
-int _test_iclass_key_permutation()
-{
+int _test_iclass_key_permutation() {
     uint8_t testcase[8] = {0x6c, 0x8d, 0x44, 0xf9, 0x2a, 0x2d, 0x01, 0xbf};
     uint8_t testcase_output[8] = {0};
     uint8_t testcase_output_correct[8] = {0x8a, 0x0d, 0xb9, 0x88, 0xbb, 0xa7, 0x90, 0xea};
@@ -661,8 +643,7 @@ int _test_iclass_key_permutation()
     return 0;
 }
 
-int _testHash1()
-{
+int _testHash1() {
     uint8_t expected[8] = {0x7E, 0x72, 0x2F, 0x40, 0x2D, 0x02, 0x51, 0x42};
     uint8_t csn[8] = {0x01, 0x02, 0x03, 0x04, 0xF7, 0xFF, 0x12, 0xE0};
     uint8_t k[8] = {0};
@@ -677,8 +658,7 @@ int _testHash1()
     return 0;
 }
 
-int testElite()
-{
+int testElite() {
     PrintAndLogDevice(INFO, "Testing iClass Elite functinality...");
     PrintAndLogDevice(INFO, "Testing hash2");
     uint8_t k_cus[8] = {0x5B, 0x7C, 0x62, 0xC4, 0x91, 0xC1, 0x1B, 0x39};
diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index 6136d2836..4d58c7084 100644
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -45,8 +45,7 @@
  * @param filename
  * @return
  */
-int fileExists(const char *filename)
-{
+int fileExists(const char *filename) {
 
 #ifdef _WIN32
     struct _stat st;
@@ -58,8 +57,7 @@ int fileExists(const char *filename)
     return result == 0;
 }
 
-int saveFile(const char *preferredName, const char *suffix, const void *data, size_t datalen)
-{
+int saveFile(const char *preferredName, const char *suffix, const void *data, size_t datalen) {
     int size = sizeof(char) * (strlen(preferredName) + strlen(suffix) + 10);
     char *fileName = calloc(size, sizeof(char));
     int num = 1;
@@ -85,8 +83,7 @@ int saveFile(const char *preferredName, const char *suffix, const void *data, si
     return 0;
 }
 
-int saveFileEML(const char *preferredName, const char *suffix, uint8_t *data, size_t datalen, size_t blocksize)
-{
+int saveFileEML(const char *preferredName, const char *suffix, uint8_t *data, size_t datalen, size_t blocksize) {
 
     if (preferredName == NULL) return 1;
     if (suffix == NULL) return 1;
@@ -140,8 +137,7 @@ out:
     return retval;
 }
 
-int saveFileJSON(const char *preferredName, const char *suffix, JSONFileType ftype, uint8_t *data, size_t datalen)
-{
+int saveFileJSON(const char *preferredName, const char *suffix, JSONFileType ftype, uint8_t *data, size_t datalen) {
     if (preferredName == NULL) return 1;
     if (suffix == NULL) return 1;
     if (data == NULL) return 1;
@@ -257,8 +253,7 @@ out:
     return retval;
 }
 
-int loadFile(const char *preferredName, const char *suffix, void *data, size_t *datalen)
-{
+int loadFile(const char *preferredName, const char *suffix, void *data, size_t *datalen) {
 
     if (preferredName == NULL) return 1;
     if (suffix == NULL) return 1;
@@ -317,8 +312,7 @@ out:
     return retval;
 }
 
-int loadFileEML(const char *preferredName, const char *suffix, void *data, size_t *datalen)
-{
+int loadFileEML(const char *preferredName, const char *suffix, void *data, size_t *datalen) {
 
     if (preferredName == NULL) return 1;
     if (suffix == NULL) return 1;
@@ -373,8 +367,7 @@ out:
     return retval;
 }
 
-int loadFileJSON(const char *preferredName, const char *suffix, void *data, size_t maxdatalen, size_t *datalen)
-{
+int loadFileJSON(const char *preferredName, const char *suffix, void *data, size_t maxdatalen, size_t *datalen) {
 
     if (preferredName == NULL) return 1;
     if (suffix == NULL) return 1;
@@ -462,8 +455,7 @@ out:
     return retval;
 }
 
-int loadFileDICTIONARY(const char *preferredName, const char *suffix, void *data, size_t *datalen, uint8_t keylen, uint16_t *keycnt)
-{
+int loadFileDICTIONARY(const char *preferredName, const char *suffix, void *data, size_t *datalen, uint8_t keylen, uint16_t *keycnt) {
 
     if (preferredName == NULL) return 1;
     if (suffix == NULL) return 1;
diff --git a/client/loclass/hash1_brute.c b/client/loclass/hash1_brute.c
index af6ef8ace..6007e1b9f 100644
--- a/client/loclass/hash1_brute.c
+++ b/client/loclass/hash1_brute.c
@@ -7,8 +7,7 @@
 #include <ctype.h>
 #include "elite_crack.h"
 
-void calc_score(uint8_t *csn, uint8_t *k)
-{
+void calc_score(uint8_t *csn, uint8_t *k) {
     uint8_t score = 0 ;
     uint8_t i;
     uint8_t goodvals[16] = {0};
@@ -54,8 +53,7 @@ void calc_score(uint8_t *csn, uint8_t *k)
     }
 }
 
-void brute_hash1(void)
-{
+void brute_hash1(void) {
     uint16_t a, b, c, d;
     uint8_t csn[8] = {0, 0, 0, 0, 0xf7, 0xff, 0x12, 0xe0};
     uint8_t k[8] = {0, 0, 0, 0, 0, 0, 0, 0};
diff --git a/client/loclass/ikeys.c b/client/loclass/ikeys.c
index 59eae3d62..16985ccb8 100644
--- a/client/loclass/ikeys.c
+++ b/client/loclass/ikeys.c
@@ -85,8 +85,7 @@ static int debug_print = 0;
  * @param n bitnumber
  * @return
  */
-uint8_t getSixBitByte(uint64_t c, int n)
-{
+uint8_t getSixBitByte(uint64_t c, int n) {
     return (c >> (42 - 6 * n)) & 0x3F;
 }
 
@@ -96,8 +95,7 @@ uint8_t getSixBitByte(uint64_t c, int n)
  * @param z the value to place there
  * @param n bitnumber.
  */
-void pushbackSixBitByte(uint64_t *c, uint8_t z, int n)
-{
+void pushbackSixBitByte(uint64_t *c, uint8_t z, int n) {
     //0x XXXX YYYY ZZZZ ZZZZ ZZZZ
     //             ^z0         ^z7
     //z0:  1111 1100 0000 0000
@@ -122,8 +120,7 @@ void pushbackSixBitByte(uint64_t *c, uint8_t z, int n)
  * @param c
  * @return
  */
-uint64_t swapZvalues(uint64_t c)
-{
+uint64_t swapZvalues(uint64_t c) {
     uint64_t newz = 0;
     pushbackSixBitByte(&newz, getSixBitByte(c, 0), 7);
     pushbackSixBitByte(&newz, getSixBitByte(c, 1), 6);
@@ -140,8 +137,7 @@ uint64_t swapZvalues(uint64_t c)
 /**
 * @return 4 six-bit bytes chunked into a uint64_t,as 00..00a0a1a2a3
 */
-uint64_t ck(int i, int j, uint64_t z)
-{
+uint64_t ck(int i, int j, uint64_t z) {
     if (i == 1 && j == -1) {
         // ck(1, −1, z [0] . . . z [3] ) = z [0] . . . z [3]
         return z;
@@ -183,8 +179,7 @@ uint64_t ck(int i, int j, uint64_t z)
     otherwise.
 **/
 
-uint64_t check(uint64_t z)
-{
+uint64_t check(uint64_t z) {
     //These 64 bits are divided as c = x, y, z [0] , . . . , z [7]
 
     // ck(3, 2, z [0] . . . z [3] )
@@ -202,8 +197,7 @@ uint64_t check(uint64_t z)
 
 }
 
-void permute(BitstreamIn *p_in, uint64_t z, int l, int r, BitstreamOut *out)
-{
+void permute(BitstreamIn *p_in, uint64_t z, int l, int r, BitstreamOut *out) {
     if (bitsLeft(p_in) == 0)
         return;
 
@@ -220,16 +214,14 @@ void permute(BitstreamIn *p_in, uint64_t z, int l, int r, BitstreamOut *out)
         permute(p_in, z, l, r + 1, out);
     }
 }
-void printbegin()
-{
+void printbegin() {
     if (debug_print < 2)
         return;
 
     PrintAndLogDevice(NORMAL, "          | x| y|z0|z1|z2|z3|z4|z5|z6|z7|");
 }
 
-void printState(char *desc, uint64_t c)
-{
+void printState(char *desc, uint64_t c) {
     if (debug_print < 2)
         return;
 
@@ -254,8 +246,7 @@ void printState(char *desc, uint64_t c)
  * @param k this is where the diversified key is put (should be 8 bytes)
  * @return
  */
-void hash0(uint64_t c, uint8_t k[8])
-{
+void hash0(uint64_t c, uint8_t k[8]) {
     c = swapZvalues(c);
 
     printbegin();
@@ -360,8 +351,7 @@ void hash0(uint64_t c, uint8_t k[8])
  * @param key
  * @param div_key
  */
-void diversifyKey(uint8_t csn[8], uint8_t key[8], uint8_t div_key[8])
-{
+void diversifyKey(uint8_t csn[8], uint8_t key[8], uint8_t div_key[8]) {
     // Prepare the DES key
     mbedtls_des_setkey_enc(&ctx_enc, key);
 
@@ -377,8 +367,7 @@ void diversifyKey(uint8_t csn[8], uint8_t key[8], uint8_t div_key[8])
     hash0(crypt_csn, div_key);
 }
 
-void testPermute()
-{
+void testPermute() {
     uint64_t x = 0;
     pushbackSixBitByte(&x, 0x00, 0);
     pushbackSixBitByte(&x, 0x01, 1);
@@ -431,8 +420,7 @@ typedef struct {
     uint8_t div_key[8];
 } Testcase;
 
-int testDES(Testcase testcase, mbedtls_des_context ctx_enc, mbedtls_des_context ctx_dec)
-{
+int testDES(Testcase testcase, mbedtls_des_context ctx_enc, mbedtls_des_context ctx_dec) {
     uint8_t des_encrypted_csn[8] = {0};
     uint8_t decrypted[8] = {0};
     uint8_t div_key[8] = {0};
@@ -468,8 +456,7 @@ int testDES(Testcase testcase, mbedtls_des_context ctx_enc, mbedtls_des_context
     }
     return retval;
 }
-bool des_getParityBitFromKey(uint8_t key)
-{
+bool des_getParityBitFromKey(uint8_t key) {
     // The top 7 bits is used
     bool parity = ((key & 0x80) >> 7)
                   ^ ((key & 0x40) >> 6) ^ ((key & 0x20) >> 5)
@@ -478,8 +465,7 @@ bool des_getParityBitFromKey(uint8_t key)
     return !parity;
 }
 
-void des_checkParity(uint8_t *key)
-{
+void des_checkParity(uint8_t *key) {
     int i;
     int fails = 0;
     for (i = 0; i < 8; i++) {
@@ -567,8 +553,7 @@ Testcase testcases[] = {
     {{0}, {0}, {0}}
 };
 
-int testKeyDiversificationWithMasterkeyTestcases()
-{
+int testKeyDiversificationWithMasterkeyTestcases() {
     int i, error = 0;
     uint8_t empty[8] = {0};
 
@@ -584,13 +569,11 @@ int testKeyDiversificationWithMasterkeyTestcases()
     return error;
 }
 
-void print64bits(char *name, uint64_t val)
-{
+void print64bits(char *name, uint64_t val) {
     printf("%s%08x%08x\n", name, (uint32_t)(val >> 32), (uint32_t)(val & 0xFFFFFFFF));
 }
 
-uint64_t testCryptedCSN(uint64_t crypted_csn, uint64_t expected)
-{
+uint64_t testCryptedCSN(uint64_t crypted_csn, uint64_t expected) {
     int retval = 0;
     uint8_t result[8] = {0};
     if (debug_print) PrintAndLogDevice(DEBUG, "debug_print %d", debug_print);
@@ -617,8 +600,7 @@ uint64_t testCryptedCSN(uint64_t crypted_csn, uint64_t expected)
     return retval;
 }
 
-int testDES2(uint64_t csn, uint64_t expected)
-{
+int testDES2(uint64_t csn, uint64_t expected) {
     uint8_t result[8] = {0};
     uint8_t input[8] = {0};
 
@@ -644,8 +626,7 @@ int testDES2(uint64_t csn, uint64_t expected)
  * @brief doTestsWithKnownInputs
  * @return
  */
-int doTestsWithKnownInputs()
-{
+int doTestsWithKnownInputs() {
     // KSel from http://www.proxmark.org/forum/viewtopic.php?pid=10977#p10977
     int errors = 0;
     PrintAndLogDevice(SUCCESS, "Testing DES encryption");
@@ -673,8 +654,7 @@ int doTestsWithKnownInputs()
     return errors;
 }
 
-static bool readKeyFile(uint8_t key[8])
-{
+static bool readKeyFile(uint8_t key[8]) {
     bool retval = false;
 
     //Test a few variants
@@ -704,8 +684,7 @@ static bool readKeyFile(uint8_t key[8])
     return retval;
 }
 
-int doKeyTests(uint8_t debuglevel)
-{
+int doKeyTests(uint8_t debuglevel) {
     debug_print = debuglevel;
 
     PrintAndLogDevice(INFO, "Checking if the master key is present (iclass_key.bin)...");
diff --git a/client/loclass/main.c b/client/loclass/main.c
index 415ffc14f..8fb9c0494 100644
--- a/client/loclass/main.c
+++ b/client/loclass/main.c
@@ -48,8 +48,7 @@
 #include "fileutils.h"
 #include "elite_crack.h"
 
-int unitTests()
-{
+int unitTests() {
     int errors = testCipherUtils();
     errors += testMAC();
     errors += doKeyTests(0);
@@ -59,8 +58,7 @@ int unitTests()
     }
     return errors;
 }
-int showHelp()
-{
+int showHelp() {
     PrintAndLogDevice(NORMAL, "Usage: loclass [options]");
     PrintAndLogDevice(NORMAL, "Options:");
     PrintAndLogDevice(NORMAL, "-t                 Perform self-test");
@@ -77,8 +75,7 @@ int showHelp()
     return 0;
 }
 
-int main(int argc, char **argv)
-{
+int main(int argc, char **argv) {
     PrintAndLogDevice(NORMAL, "IClass Cipher version 1.2, Copyright (C) 2014 Martin Holst Swende\n");
     PrintAndLogDevice(NORMAL, "Comes with ABSOLUTELY NO WARRANTY");
     PrintAndLogDevice(NORMAL, "Released as GPLv2\n");
diff --git a/client/mifare/mad.c b/client/mifare/mad.c
index 33703440f..4c3d21022 100644
--- a/client/mifare/mad.c
+++ b/client/mifare/mad.c
@@ -95,8 +95,7 @@ static madAIDDescr madKnownClusterCodes[] = {
 
 static const char unknownAID[] = "";
 
-static const char *GetAIDDescription(uint16_t AID)
-{
+static const char *GetAIDDescription(uint16_t AID) {
     for (int i = 0; i < ARRAYLEN(madKnownAIDs); i++)
         if (madKnownAIDs[i].AID == AID)
             return madKnownAIDs[i].Description;
@@ -108,8 +107,7 @@ static const char *GetAIDDescription(uint16_t AID)
     return unknownAID;
 }
 
-int madCRCCheck(uint8_t *sector, bool verbose, int MADver)
-{
+int madCRCCheck(uint8_t *sector, bool verbose, int MADver) {
     if (MADver == 1) {
         uint8_t crc = CRC8Mad(&sector[16 + 1], 15 + 16);
         if (crc != sector[16]) {
@@ -127,16 +125,14 @@ int madCRCCheck(uint8_t *sector, bool verbose, int MADver)
     return 0;
 }
 
-uint16_t madGetAID(uint8_t *sector, int MADver, int sectorNo)
-{
+uint16_t madGetAID(uint8_t *sector, int MADver, int sectorNo) {
     if (MADver == 1)
         return (sector[16 + 2 + (sectorNo - 1) * 2] << 8) + (sector[16 + 2 + (sectorNo - 1) * 2 + 1]);
     else
         return (sector[2 + (sectorNo - 1) * 2] << 8) + (sector[2 + (sectorNo - 1) * 2 + 1]);
 }
 
-int MADCheck(uint8_t *sector0, uint8_t *sector10, bool verbose, bool *haveMAD2)
-{
+int MADCheck(uint8_t *sector0, uint8_t *sector10, bool verbose, bool *haveMAD2) {
     int res = 0;
 
     if (!sector0)
@@ -190,8 +186,7 @@ int MADCheck(uint8_t *sector0, uint8_t *sector10, bool verbose, bool *haveMAD2)
     return res;
 }
 
-int MADDecode(uint8_t *sector0, uint8_t *sector10, uint16_t *mad, size_t *madlen)
-{
+int MADDecode(uint8_t *sector0, uint8_t *sector10, uint16_t *mad, size_t *madlen) {
     *madlen = 0;
     bool haveMAD2 = false;
     MADCheck(sector0, sector10, false, &haveMAD2);
@@ -216,8 +211,7 @@ int MADDecode(uint8_t *sector0, uint8_t *sector10, uint16_t *mad, size_t *madlen
 }
 
 
-int MAD1DecodeAndPrint(uint8_t *sector, bool verbose, bool *haveMAD2)
-{
+int MAD1DecodeAndPrint(uint8_t *sector, bool verbose, bool *haveMAD2) {
 
     // check MAD1 only
     MADCheck(sector, NULL, verbose, haveMAD2);
@@ -242,8 +236,7 @@ int MAD1DecodeAndPrint(uint8_t *sector, bool verbose, bool *haveMAD2)
     return 0;
 };
 
-int MAD2DecodeAndPrint(uint8_t *sector, bool verbose)
-{
+int MAD2DecodeAndPrint(uint8_t *sector, bool verbose) {
     PrintAndLogEx(NORMAL, "16 MAD2");
 
     int res = madCRCCheck(sector, true, 2);
diff --git a/client/mifare/mfkey.c b/client/mifare/mfkey.c
index b239bc672..cefc19164 100644
--- a/client/mifare/mfkey.c
+++ b/client/mifare/mfkey.c
@@ -12,16 +12,14 @@
 #include "mfkey.h"
 
 // MIFARE
-int compare_uint64(const void *a, const void *b)
-{
+int compare_uint64(const void *a, const void *b) {
     if (*(uint64_t *)b == *(uint64_t *)a) return 0;
     if (*(uint64_t *)b < * (uint64_t *)a) return 1;
     return -1;
 }
 
 // create the intersection (common members) of two sorted lists. Lists are terminated by -1. Result will be in list1. Number of elements is returned.
-uint32_t intersection(uint64_t *listA, uint64_t *listB)
-{
+uint32_t intersection(uint64_t *listA, uint64_t *listB) {
     if (listA == NULL || listB == NULL)
         return 0;
 
@@ -44,8 +42,7 @@ uint32_t intersection(uint64_t *listA, uint64_t *listB)
 
 // Darkside attack (hf mf mifare)
 // if successful it will return a list of keys, not just one.
-uint32_t nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint32_t ar, uint64_t par_info, uint64_t ks_info, uint64_t **keys)
-{
+uint32_t nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint32_t ar, uint64_t par_info, uint64_t ks_info, uint64_t **keys) {
     struct Crypto1State *states;
     uint32_t i, pos;
     uint8_t bt, ks3x[8], par[8][8];
@@ -90,8 +87,7 @@ uint32_t nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint32_t ar, uint64_t
 }
 
 // recover key from 2 different reader responses on same tag challenge
-bool mfkey32(nonces_t data, uint64_t *outputkey)
-{
+bool mfkey32(nonces_t data, uint64_t *outputkey) {
     struct Crypto1State *s, *t;
     uint64_t outkey = 0;
     uint64_t key = 0;     // recovered key
@@ -123,8 +119,7 @@ bool mfkey32(nonces_t data, uint64_t *outputkey)
 
 // recover key from 2 reader responses on 2 different tag challenges
 // skip "several found keys".  Only return true if ONE key is found
-bool mfkey32_moebius(nonces_t data, uint64_t *outputkey)
-{
+bool mfkey32_moebius(nonces_t data, uint64_t *outputkey) {
     struct Crypto1State *s, *t;
     uint64_t outkey  = 0;
     uint64_t key     = 0; // recovered key
@@ -156,8 +151,7 @@ bool mfkey32_moebius(nonces_t data, uint64_t *outputkey)
 }
 
 // recover key from reader response and tag response of one authentication sequence
-int mfkey64(nonces_t data, uint64_t *outputkey)
-{
+int mfkey64(nonces_t data, uint64_t *outputkey) {
     uint64_t key = 0;  // recovered key
     uint32_t ks2;      // keystream used to encrypt reader response
     uint32_t ks3;      // keystream used to encrypt tag response
diff --git a/client/mifare/mifare4.c b/client/mifare/mifare4.c
index 4cd529dc3..b3d40dd57 100644
--- a/client/mifare/mifare4.c
+++ b/client/mifare/mifare4.c
@@ -18,8 +18,7 @@
 #include "crypto/libpcrypto.h"
 
 static bool VerboseMode = false;
-void mfpSetVerboseMode(bool verbose)
-{
+void mfpSetVerboseMode(bool verbose) {
     VerboseMode = verbose;
 }
 
@@ -43,8 +42,7 @@ static const PlusErrorsElm PlusErrors[] = {
 };
 int PlusErrorsLen = sizeof(PlusErrors) / sizeof(PlusErrorsElm);
 
-const char *mfpGetErrorDescription(uint8_t errorCode)
-{
+const char *mfpGetErrorDescription(uint8_t errorCode) {
     for (int i = 0; i < PlusErrorsLen; i++)
         if (errorCode == PlusErrors[i].Code)
             return PlusErrors[i].Description;
@@ -74,8 +72,7 @@ AccessConditions_t MFAccessConditionsTrailer[] = {
     {0x07, "rdCbyAB"}
 };
 
-char *mfGetAccessConditionsDesc(uint8_t blockn, uint8_t *data)
-{
+char *mfGetAccessConditionsDesc(uint8_t blockn, uint8_t *data) {
     static char StaticNone[] = "none";
 
     uint8_t data1 = ((data[1] >> 4) & 0x0f) >> blockn;
@@ -99,8 +96,7 @@ char *mfGetAccessConditionsDesc(uint8_t blockn, uint8_t *data)
     return StaticNone;
 };
 
-int CalculateEncIVCommand(mf4Session *session, uint8_t *iv, bool verbose)
-{
+int CalculateEncIVCommand(mf4Session *session, uint8_t *iv, bool verbose) {
     memcpy(&iv[0], session->TI, 4);
     memcpy(&iv[4], &session->R_Ctr, 2);
     memcpy(&iv[6], &session->W_Ctr, 2);
@@ -112,8 +108,7 @@ int CalculateEncIVCommand(mf4Session *session, uint8_t *iv, bool verbose)
     return 0;
 }
 
-int CalculateEncIVResponse(mf4Session *session, uint8_t *iv, bool verbose)
-{
+int CalculateEncIVResponse(mf4Session *session, uint8_t *iv, bool verbose) {
     memcpy(&iv[0], &session->R_Ctr, 2);
     memcpy(&iv[2], &session->W_Ctr, 2);
     memcpy(&iv[4], &session->R_Ctr, 2);
@@ -126,8 +121,7 @@ int CalculateEncIVResponse(mf4Session *session, uint8_t *iv, bool verbose)
 }
 
 
-int CalculateMAC(mf4Session *session, MACType_t mtype, uint8_t blockNum, uint8_t blockCount, uint8_t *data, int datalen, uint8_t *mac, bool verbose)
-{
+int CalculateMAC(mf4Session *session, MACType_t mtype, uint8_t blockNum, uint8_t blockCount, uint8_t *data, int datalen, uint8_t *mac, bool verbose) {
     if (!session || !session->Authenticated || !mac || !data || !datalen || datalen < 1)
         return 1;
 
@@ -175,8 +169,7 @@ int CalculateMAC(mf4Session *session, MACType_t mtype, uint8_t blockNum, uint8_t
     return aes_cmac8(NULL, session->Kmac, macdata, mac, macdatalen);
 }
 
-int MifareAuth4(mf4Session *session, uint8_t *keyn, uint8_t *key, bool activateField, bool leaveSignalON, bool verbose)
-{
+int MifareAuth4(mf4Session *session, uint8_t *keyn, uint8_t *key, bool activateField, bool leaveSignalON, bool verbose) {
     uint8_t data[257] = {0};
     int datalen = 0;
 
@@ -315,8 +308,7 @@ int MifareAuth4(mf4Session *session, uint8_t *keyn, uint8_t *key, bool activateF
     return 0;
 }
 
-int intExchangeRAW14aPlus(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen)
-{
+int intExchangeRAW14aPlus(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
     if (VerboseMode)
         PrintAndLogEx(INFO, ">>> %s", sprint_hex(datain, datainlen));
 
@@ -328,23 +320,20 @@ int intExchangeRAW14aPlus(uint8_t *datain, int datainlen, bool activateField, bo
     return res;
 }
 
-int MFPWritePerso(uint8_t *keyNum, uint8_t *key, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen)
-{
+int MFPWritePerso(uint8_t *keyNum, uint8_t *key, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
     uint8_t rcmd[3 + 16] = {0xa8, keyNum[1], keyNum[0], 0x00};
     memmove(&rcmd[3], key, 16);
 
     return intExchangeRAW14aPlus(rcmd, sizeof(rcmd), activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
 }
 
-int MFPCommitPerso(bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen)
-{
+int MFPCommitPerso(bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
     uint8_t rcmd[1] = {0xaa};
 
     return intExchangeRAW14aPlus(rcmd, sizeof(rcmd), activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
 }
 
-int MFPReadBlock(mf4Session *session, bool plain, uint8_t blockNum, uint8_t blockCount, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen, uint8_t *mac)
-{
+int MFPReadBlock(mf4Session *session, bool plain, uint8_t blockNum, uint8_t blockCount, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen, uint8_t *mac) {
     uint8_t rcmd[4 + 8] = {(plain ? (0x37) : (0x33)), blockNum, 0x00, blockCount};
     if (!plain && session)
         CalculateMAC(session, mtypReadCmd, blockNum, blockCount, rcmd, 4, &rcmd[4], VerboseMode);
@@ -362,8 +351,7 @@ int MFPReadBlock(mf4Session *session, bool plain, uint8_t blockNum, uint8_t bloc
     return 0;
 }
 
-int MFPWriteBlock(mf4Session *session, uint8_t blockNum, uint8_t *data, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen, uint8_t *mac)
-{
+int MFPWriteBlock(mf4Session *session, uint8_t blockNum, uint8_t *data, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen, uint8_t *mac) {
     uint8_t rcmd[1 + 2 + 16 + 8] = {0xA3, blockNum, 0x00};
     memmove(&rcmd[3], data, 16);
     if (session)
@@ -382,8 +370,7 @@ int MFPWriteBlock(mf4Session *session, uint8_t blockNum, uint8_t *data, bool act
     return 0;
 }
 
-int mfpReadSector(uint8_t sectorNo, uint8_t keyType, uint8_t *key, uint8_t *dataout, bool verbose)
-{
+int mfpReadSector(uint8_t sectorNo, uint8_t keyType, uint8_t *key, uint8_t *dataout, bool verbose) {
     uint8_t keyn[2] = {0};
     bool plain = false;
 
@@ -447,24 +434,21 @@ int mfpReadSector(uint8_t sectorNo, uint8_t keyType, uint8_t *key, uint8_t *data
 
 // Mifare Memory Structure: up to 32 Sectors with 4 blocks each (1k and 2k cards),
 // plus evtl. 8 sectors with 16 blocks each (4k cards)
-uint8_t mfNumBlocksPerSector(uint8_t sectorNo)
-{
+uint8_t mfNumBlocksPerSector(uint8_t sectorNo) {
     if (sectorNo < 32)
         return 4;
     else
         return 16;
 }
 
-uint8_t mfFirstBlockOfSector(uint8_t sectorNo)
-{
+uint8_t mfFirstBlockOfSector(uint8_t sectorNo) {
     if (sectorNo < 32)
         return sectorNo * 4;
     else
         return 32 * 4 + (sectorNo - 32) * 16;
 }
 
-uint8_t mfSectorTrailer(uint8_t blockNo)
-{
+uint8_t mfSectorTrailer(uint8_t blockNo) {
     if (blockNo < 32 * 4) {
         return (blockNo | 0x03);
     } else {
@@ -472,13 +456,11 @@ uint8_t mfSectorTrailer(uint8_t blockNo)
     }
 }
 
-bool mfIsSectorTrailer(uint8_t blockNo)
-{
+bool mfIsSectorTrailer(uint8_t blockNo) {
     return (blockNo == mfSectorTrailer(blockNo));
 }
 
-uint8_t mfSectorNum(uint8_t blockNo)
-{
+uint8_t mfSectorNum(uint8_t blockNo) {
     if (blockNo < 32 * 4)
         return blockNo / 4;
     else
diff --git a/client/mifare/mifarehost.c b/client/mifare/mifarehost.c
index 3cdad9ca5..052129928 100644
--- a/client/mifare/mifarehost.c
+++ b/client/mifare/mifarehost.c
@@ -10,8 +10,7 @@
 #include "mifarehost.h"
 #include "cmdmain.h"
 
-int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key)
-{
+int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
     uint32_t uid = 0;
     uint32_t nt = 0, nr = 0, ar = 0;
     uint64_t par_list = 0, ks_list = 0;
@@ -124,8 +123,7 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key)
     free(keylist);
     return 0;
 }
-int mfCheckKeys(uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t keycnt, uint8_t *keyBlock, uint64_t *key)
-{
+int mfCheckKeys(uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t keycnt, uint8_t *keyBlock, uint64_t *key) {
     *key = -1;
     UsbCommand c = {CMD_MIFARE_CHKKEYS, { (blockNo | (keyType << 8)), clear_trace, keycnt}};
     memcpy(c.d.asBytes, keyBlock, 6 * keycnt);
@@ -143,8 +141,7 @@ int mfCheckKeys(uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t keyc
 // 1 ==
 // 2 == Time-out, aborting
 int mfCheckKeys_fast(uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk, uint8_t strategy,
-                     uint32_t size, uint8_t *keyBlock, sector_t *e_sector, bool use_flashmemory)
-{
+                     uint32_t size, uint8_t *keyBlock, sector_t *e_sector, bool use_flashmemory) {
 
     uint64_t t2 = msclock();
     uint32_t timeout = 0;
@@ -221,8 +218,7 @@ int mfCheckKeys_fast(uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk,
 
 // PM3 imp of J-Run mf_key_brute (part 2)
 // ref: https://github.com/J-Run/mf_key_brute
-int mfKeyBrute(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint64_t *resultkey)
-{
+int mfKeyBrute(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint64_t *resultkey) {
 
 #define KEYS_IN_BLOCK 85
 #define KEYBLOCK_SIZE 510
@@ -268,8 +264,7 @@ int mfKeyBrute(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint64_t *resultk
 }
 
 // Compare 16 Bits out of cryptostate
-int Compare16Bits(const void *a, const void *b)
-{
+int Compare16Bits(const void *a, const void *b) {
     if ((*(uint64_t *)b & 0x00ff000000ff0000) == (*(uint64_t *)a & 0x00ff000000ff0000)) return 0;
     if ((*(uint64_t *)b & 0x00ff000000ff0000) > (*(uint64_t *)a & 0x00ff000000ff0000)) return 1;
     return -1;
@@ -282,8 +277,7 @@ void
 __attribute__((force_align_arg_pointer))
 #endif
 #endif
-*nested_worker_thread(void *arg)
-{
+*nested_worker_thread(void *arg) {
     struct Crypto1State *p1;
     StateList_t *statelist = arg;
     statelist->head.slhead = lfsr_recovery32(statelist->ks1, statelist->nt ^ statelist->uid);
@@ -297,8 +291,7 @@ __attribute__((force_align_arg_pointer))
     return statelist->head.slhead;
 }
 
-int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t *resultKey, bool calibrate)
-{
+int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t *resultKey, bool calibrate) {
     uint16_t i;
     uint32_t uid;
     UsbCommand resp;
@@ -425,8 +418,7 @@ out:
 }
 
 // MIFARE
-int mfReadSector(uint8_t sectorNo, uint8_t keyType, uint8_t *key, uint8_t *data)
-{
+int mfReadSector(uint8_t sectorNo, uint8_t keyType, uint8_t *key, uint8_t *data) {
 
     UsbCommand c = {CMD_MIFARE_READSC, {sectorNo, keyType, 0}};
     memcpy(c.d.asBytes, key, 6);
@@ -452,8 +444,7 @@ int mfReadSector(uint8_t sectorNo, uint8_t keyType, uint8_t *key, uint8_t *data)
 }
 
 // EMULATOR
-int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount)
-{
+int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount) {
     UsbCommand c = {CMD_MIFARE_EML_MEMGET, {blockNum, blocksCount, 0}};
     clearCommandBuffer();
     SendCommand(&c);
@@ -463,13 +454,11 @@ int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount)
     return 0;
 }
 
-int mfEmlSetMem(uint8_t *data, int blockNum, int blocksCount)
-{
+int mfEmlSetMem(uint8_t *data, int blockNum, int blocksCount) {
     return mfEmlSetMem_xt(data, blockNum, blocksCount, 16);
 }
 
-int mfEmlSetMem_xt(uint8_t *data, int blockNum, int blocksCount, int blockBtWidth)
-{
+int mfEmlSetMem_xt(uint8_t *data, int blockNum, int blocksCount, int blockBtWidth) {
     UsbCommand c = {CMD_MIFARE_EML_MEMSET, {blockNum, blocksCount, blockBtWidth}};
     memcpy(c.d.asBytes, data, blocksCount * blockBtWidth);
     clearCommandBuffer();
@@ -478,8 +467,7 @@ int mfEmlSetMem_xt(uint8_t *data, int blockNum, int blocksCount, int blockBtWidt
 }
 
 // "MAGIC" CARD
-int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, uint8_t wipecard)
-{
+int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, uint8_t wipecard) {
 
     uint8_t params = MAGIC_SINGLE;
     uint8_t block0[16];
@@ -512,8 +500,7 @@ int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, uint8_
     return mfCSetBlock(0, block0, oldUID, params);
 }
 
-int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, uint8_t params)
-{
+int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, uint8_t params) {
 
     uint8_t isOK = 0;
     UsbCommand c = {CMD_MIFARE_CSETBLOCK, {params, blockNo, 0}};
@@ -534,8 +521,7 @@ int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, uint8_t params)
     return 0;
 }
 
-int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params)
-{
+int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params) {
     uint8_t isOK = 0;
     UsbCommand c = {CMD_MIFARE_CGETBLOCK, {params, blockNo, 0}};
     clearCommandBuffer();
@@ -579,26 +565,22 @@ uint32_t nr_enc = 0;  // encrypted reader challenge
 uint32_t ar_enc = 0;  // encrypted reader response
 uint32_t at_enc = 0;  // encrypted tag response
 
-int isTraceCardEmpty(void)
-{
+int isTraceCardEmpty(void) {
     return ((traceCard[0] == 0) && (traceCard[1] == 0) && (traceCard[2] == 0) && (traceCard[3] == 0));
 }
 
-int isBlockEmpty(int blockN)
-{
+int isBlockEmpty(int blockN) {
     for (int i = 0; i < 16; i++)
         if (traceCard[blockN * 16 + i] != 0) return 0;
 
     return 1;
 }
 
-int isBlockTrailer(int blockN)
-{
+int isBlockTrailer(int blockN) {
     return ((blockN & 0x03) == 0x03);
 }
 
-int loadTraceCard(uint8_t *tuid, uint8_t uidlen)
-{
+int loadTraceCard(uint8_t *tuid, uint8_t uidlen) {
     FILE *f;
     char buf[64] = {0x00};
     uint8_t buf8[64] = {0x00};
@@ -652,8 +634,7 @@ int loadTraceCard(uint8_t *tuid, uint8_t uidlen)
     return 0;
 }
 
-int saveTraceCard(void)
-{
+int saveTraceCard(void) {
 
     if ((!strlen(traceFileName)) || (isTraceCardEmpty())) return 0;
 
@@ -676,8 +657,7 @@ int saveTraceCard(void)
     return 0;
 }
 //
-int mfTraceInit(uint8_t *tuid, uint8_t uidlen, uint8_t *atqa, uint8_t sak, bool wantSaveToEmlFile)
-{
+int mfTraceInit(uint8_t *tuid, uint8_t uidlen, uint8_t *atqa, uint8_t sak, bool wantSaveToEmlFile) {
 
     if (traceCrypto1)
         crypto1_destroy(traceCrypto1);
@@ -696,8 +676,7 @@ int mfTraceInit(uint8_t *tuid, uint8_t uidlen, uint8_t *atqa, uint8_t sak, bool
     return 0;
 }
 
-void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len, bool isEncrypted)
-{
+void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len, bool isEncrypted) {
     uint8_t bt = 0;
     int i;
 
@@ -714,8 +693,7 @@ void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len, bool i
     }
 }
 
-int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile)
-{
+int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
 
     if (traceState == TRACE_ERROR)
         return 1;
@@ -884,8 +862,7 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile)
     return 0;
 }
 
-int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t *data, int len)
-{
+int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t *data, int len) {
     PrintAndLogEx(SUCCESS, "\nencrypted data: [%s]", sprint_hex(data, len));
     struct Crypto1State *s;
     ks2 = ar_enc ^ prng_successor(nt, 64);
@@ -904,8 +881,7 @@ int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t *data,
 *   TRUE if tag uses WEAK prng (ie Now the NACK bug also needs to be present for Darkside attack)
 *   FALSE is tag uses HARDEND prng (ie hardnested attack possible, with known key)
 */
-int detect_classic_prng(void)
-{
+int detect_classic_prng(void) {
 
     UsbCommand resp, respA;
     uint8_t cmd[] = {MIFARE_AUTH_KEYA, 0x00};
@@ -949,8 +925,7 @@ returns:
 2 = has not nack bug
 3 = always leak nacks  (clones)
 */
-int detect_classic_nackbug(bool verbose)
-{
+int detect_classic_nackbug(bool verbose) {
 
     UsbCommand c = {CMD_MIFARE_NACK_DETECT, {0, 0, 0}};
     clearCommandBuffer();
@@ -1035,8 +1010,7 @@ int detect_classic_nackbug(bool verbose)
     return 0;
 }
 /* try to see if card responses to "chinese magic backdoor" commands. */
-void detect_classic_magic(void)
-{
+void detect_classic_magic(void) {
 
     uint8_t isGeneration = 0;
     UsbCommand resp;
diff --git a/client/mifare/ndef.c b/client/mifare/ndef.c
index 2e05fb192..b888d8269 100644
--- a/client/mifare/ndef.c
+++ b/client/mifare/ndef.c
@@ -80,8 +80,7 @@ static const char *URI_s[] = {
     "urn:nfc:"                    // 0x23
 };
 
-uint16_t ndefTLVGetLength(uint8_t *data, size_t *indx)
-{
+uint16_t ndefTLVGetLength(uint8_t *data, size_t *indx) {
     uint16_t len = 0;
     if (data[0] == 0xff) {
         len = (data[1] << 8) + data[2];
@@ -94,8 +93,7 @@ uint16_t ndefTLVGetLength(uint8_t *data, size_t *indx)
     return len;
 }
 
-int ndefDecodeHeader(uint8_t *data, size_t datalen, NDEFHeader_t *header)
-{
+int ndefDecodeHeader(uint8_t *data, size_t datalen, NDEFHeader_t *header) {
     header->Type = NULL;
     header->Payload = NULL;
     header->ID = NULL;
@@ -132,8 +130,7 @@ int ndefDecodeHeader(uint8_t *data, size_t datalen, NDEFHeader_t *header)
     return 0;
 }
 
-int ndefPrintHeader(NDEFHeader_t *header)
-{
+int ndefPrintHeader(NDEFHeader_t *header) {
     PrintAndLogEx(INFO, "Header:");
 
     PrintAndLogEx(NORMAL, "\tMessage Begin:    %s", STRBOOL(header->MessageBegin));
@@ -152,8 +149,7 @@ int ndefPrintHeader(NDEFHeader_t *header)
     return 0;
 }
 
-int ndefDecodeSig(uint8_t *sig, size_t siglen)
-{
+int ndefDecodeSig(uint8_t *sig, size_t siglen) {
     size_t indx = 0;
     PrintAndLogEx(NORMAL, "\tsignature version: 0x%02x", sig[0]);
     if (sig[0] != 0x01) {
@@ -219,8 +215,7 @@ int ndefDecodeSig(uint8_t *sig, size_t siglen)
     return 0;
 };
 
-int ndefDecodePayload(NDEFHeader_t *ndef)
-{
+int ndefDecodePayload(NDEFHeader_t *ndef) {
 
     switch (ndef->TypeNameFormat) {
         case tnfWellKnownRecord:
@@ -251,8 +246,7 @@ int ndefDecodePayload(NDEFHeader_t *ndef)
     return 0;
 }
 
-int ndefRecordDecodeAndPrint(uint8_t *ndefRecord, size_t ndefRecordLen)
-{
+int ndefRecordDecodeAndPrint(uint8_t *ndefRecord, size_t ndefRecordLen) {
     NDEFHeader_t NDEFHeader = {0};
     int res = ndefDecodeHeader(ndefRecord, ndefRecordLen, &NDEFHeader);
     if (res)
@@ -278,8 +272,7 @@ int ndefRecordDecodeAndPrint(uint8_t *ndefRecord, size_t ndefRecordLen)
     return 0;
 }
 
-int ndefRecordsDecodeAndPrint(uint8_t *ndefRecord, size_t ndefRecordLen)
-{
+int ndefRecordsDecodeAndPrint(uint8_t *ndefRecord, size_t ndefRecordLen) {
     bool firstRec = true;
     size_t len = 0;
 
@@ -313,8 +306,7 @@ int ndefRecordsDecodeAndPrint(uint8_t *ndefRecord, size_t ndefRecordLen)
     return 0;
 }
 
-int NDEFDecodeAndPrint(uint8_t *ndef, size_t ndefLen, bool verbose)
-{
+int NDEFDecodeAndPrint(uint8_t *ndef, size_t ndefLen, bool verbose) {
 
     size_t indx = 0;
 
diff --git a/client/pm3_binlib.c b/client/pm3_binlib.c
index 95b1547cc..c90fc96f9 100644
--- a/client/pm3_binlib.c
+++ b/client/pm3_binlib.c
@@ -39,15 +39,13 @@
 #include "pm3_binlib.h"
 
 
-static void badcode(lua_State *L, int c)
-{
+static void badcode(lua_State *L, int c) {
     char s[] = "bad code `?'";
     s[sizeof(s) - 3] = c;
     luaL_argerror(L, 1, s);
 }
 
-static int doendian(int c)
-{
+static int doendian(int c) {
     int x = 1;
     int e = *(char *)&x;
     if (c == OP_LITTLEENDIAN) return !e;
@@ -56,8 +54,7 @@ static int doendian(int c)
     return 0;
 }
 
-static void doswap(int swap, void *p, size_t n)
-{
+static void doswap(int swap, void *p, size_t n) {
     if (swap) {
         char *a = (char *)p;
         int i, j;
@@ -102,8 +99,7 @@ static void doswap(int swap, void *p, size_t n)
 #define HEXDIGITS(DIG) \
     "0123456789ABCDEF"[DIG]
 
-static int l_unpack(lua_State *L)         /** unpack(f,s, [init]) */
-{
+static int l_unpack(lua_State *L) {       /** unpack(f,s, [init]) */
     size_t len;
     const char *s = luaL_checklstring(L, 2, &len); /* switched s and f */
     const char *f = luaL_checkstring(L, 1);
@@ -226,8 +222,7 @@ static int l_unpack(lua_State *L)         /** unpack(f,s, [init]) */
         break;                                      \
     }
 
-static int l_pack(lua_State *L)         /** pack(f,...) */
-{
+static int l_pack(lua_State *L) {       /** pack(f,...) */
     int i = 2;
     const char *f = luaL_checkstring(L, 1);
     int swap = 0;
@@ -324,16 +319,14 @@ static const luaL_Reg binlib[] = {
     {NULL,     NULL}
 };
 
-LUALIB_API int luaopen_binlib(lua_State *L)
-{
+LUALIB_API int luaopen_binlib(lua_State *L) {
     luaL_newlib(L, binlib);
     return 1;
 }
 /*
 ** Open bin library
 */
-int set_bin_library(lua_State *L)
-{
+int set_bin_library(lua_State *L) {
 
     luaL_requiref(L, "bin", luaopen_binlib, 1);
     lua_pop(L, 1);
diff --git a/client/pm3_bitlib.c b/client/pm3_bitlib.c
index 1f4d25b98..9cb89082f 100644
--- a/client/pm3_bitlib.c
+++ b/client/pm3_bitlib.c
@@ -125,8 +125,7 @@ static const struct luaL_Reg bitlib[] = {
     {NULL, NULL}
 };
 
-LUALIB_API int luaopen_bit(lua_State *L)
-{
+LUALIB_API int luaopen_bit(lua_State *L) {
     luaL_newlib(L, bitlib);
     //luaL_register(L, "bit", bitlib);
     lua_pushnumber(L, BIT_BITS);
@@ -145,8 +144,7 @@ LUALIB_API int luaopen_bit (lua_State *L) {
 /*
 ** Open bit library
 */
-int set_bit_library(lua_State *L)
-{
+int set_bit_library(lua_State *L) {
 
     luaL_requiref(L, "bit", luaopen_bit, 1);
     lua_pop(L, 1);
diff --git a/client/proxendian.h b/client/proxendian.h
index 33f9a5f9c..44e099547 100644
--- a/client/proxendian.h
+++ b/client/proxendian.h
@@ -35,13 +35,11 @@
 # define le32(x) (x)
 #else
 
-static inline uint16_t le16(uint16_t v)
-{
+static inline uint16_t le16(uint16_t v) {
     return (v >> 8) | (v << 8);
 }
 
-static inline uint32_t le32(uint32_t v)
-{
+static inline uint32_t le32(uint32_t v) {
     return (le16(v) << 16) | (le16(v >> 16));
 }
 #endif // HOST_LITTLE_ENDIAN
diff --git a/client/proxgui.cpp b/client/proxgui.cpp
index 3acf249ad..9953c07ae 100644
--- a/client/proxgui.cpp
+++ b/client/proxgui.cpp
@@ -15,53 +15,45 @@
 static ProxGuiQT *gui = NULL;
 static WorkerThread *main_loop_thread = NULL;
 
-WorkerThread::WorkerThread(char *script_cmds_file, char *script_cmd, bool usb_present) : script_cmds_file(script_cmds_file), script_cmd(script_cmd), usb_present(usb_present)
-{
+WorkerThread::WorkerThread(char *script_cmds_file, char *script_cmd, bool usb_present) : script_cmds_file(script_cmds_file), script_cmd(script_cmd), usb_present(usb_present) {
 }
 
-WorkerThread::~WorkerThread()
-{
+WorkerThread::~WorkerThread() {
 }
 
-void WorkerThread::run()
-{
+void WorkerThread::run() {
     main_loop(script_cmds_file, script_cmd, usb_present);
 }
 
-extern "C" void ShowGraphWindow(void)
-{
+extern "C" void ShowGraphWindow(void) {
     if (!gui)
         return;
 
     gui->ShowGraphWindow();
 }
 
-extern "C" void HideGraphWindow(void)
-{
+extern "C" void HideGraphWindow(void) {
     if (!gui)
         return;
 
     gui->HideGraphWindow();
 }
 
-extern "C" void RepaintGraphWindow(void)
-{
+extern "C" void RepaintGraphWindow(void) {
     if (!gui)
         return;
 
     gui->RepaintGraphWindow();
 }
 
-extern "C" void MainGraphics(void)
-{
+extern "C" void MainGraphics(void) {
     if (!gui)
         return;
 
     gui->MainLoop();
 }
 
-extern "C" void InitGraphics(int argc, char **argv, char *script_cmds_file, char *script_cmd, bool usb_present)
-{
+extern "C" void InitGraphics(int argc, char **argv, char *script_cmds_file, char *script_cmd, bool usb_present) {
 #ifdef Q_WS_X11
     if (getenv("DISPLAY") == NULL)
         return;
@@ -70,8 +62,7 @@ extern "C" void InitGraphics(int argc, char **argv, char *script_cmds_file, char
     gui = new ProxGuiQT(argc, argv, main_loop_thread);
 }
 
-extern "C" void ExitGraphics(void)
-{
+extern "C" void ExitGraphics(void) {
     if (!gui)
         return;
 
diff --git a/client/proxguiqt.cpp b/client/proxguiqt.cpp
index 8857ba1c5..102b006ce 100644
--- a/client/proxguiqt.cpp
+++ b/client/proxguiqt.cpp
@@ -37,28 +37,23 @@ int startMax;
 int PageWidth;
 int unlockStart = 0;
 
-void ProxGuiQT::ShowGraphWindow(void)
-{
+void ProxGuiQT::ShowGraphWindow(void) {
     emit ShowGraphWindowSignal();
 }
 
-void ProxGuiQT::RepaintGraphWindow(void)
-{
+void ProxGuiQT::RepaintGraphWindow(void) {
     emit RepaintGraphWindowSignal();
 }
 
-void ProxGuiQT::HideGraphWindow(void)
-{
+void ProxGuiQT::HideGraphWindow(void) {
     emit HideGraphWindowSignal();
 }
 
-void ProxGuiQT::Exit(void)
-{
+void ProxGuiQT::Exit(void) {
     emit ExitSignal();
 }
 
-void ProxGuiQT::_ShowGraphWindow(void)
-{
+void ProxGuiQT::_ShowGraphWindow(void) {
     if (!plotapp)
         return;
 
@@ -73,29 +68,25 @@ void ProxGuiQT::_ShowGraphWindow(void)
     plotwidget->show();
 }
 
-void ProxGuiQT::_RepaintGraphWindow(void)
-{
+void ProxGuiQT::_RepaintGraphWindow(void) {
     if (!plotapp || !plotwidget)
         return;
 
     plotwidget->update();
 }
 
-void ProxGuiQT::_HideGraphWindow(void)
-{
+void ProxGuiQT::_HideGraphWindow(void) {
     if (!plotapp || !plotwidget)
         return;
 
     plotwidget->hide();
 }
 
-void ProxGuiQT::_Exit(void)
-{
+void ProxGuiQT::_Exit(void) {
     delete this;
 }
 
-void ProxGuiQT::_StartProxmarkThread(void)
-{
+void ProxGuiQT::_StartProxmarkThread(void) {
     if (!proxmarkThread)
         return;
 
@@ -106,8 +97,7 @@ void ProxGuiQT::_StartProxmarkThread(void)
     proxmarkThread->start();
 }
 
-void ProxGuiQT::MainLoop()
-{
+void ProxGuiQT::MainLoop() {
     plotapp = new QApplication(argc, argv);
 
     connect(this, SIGNAL(ShowGraphWindowSignal()), this, SLOT(_ShowGraphWindow()));
@@ -128,12 +118,10 @@ void ProxGuiQT::MainLoop()
 }
 
 ProxGuiQT::ProxGuiQT(int argc, char **argv, WorkerThread *wthread) : plotapp(NULL), plotwidget(NULL),
-    argc(argc), argv(argv), proxmarkThread(wthread)
-{
+    argc(argc), argv(argv), proxmarkThread(wthread) {
 }
 
-ProxGuiQT::~ProxGuiQT(void)
-{
+ProxGuiQT::~ProxGuiQT(void) {
     if (plotapp) {
         plotapp->quit();
         plotapp = NULL;
@@ -141,51 +129,44 @@ ProxGuiQT::~ProxGuiQT(void)
 }
 
 //--------------------
-void ProxWidget::applyOperation()
-{
+void ProxWidget::applyOperation() {
     //printf("ApplyOperation()");
     save_restoreGB(GRAPH_SAVE);
     memcpy(GraphBuffer, s_Buff, sizeof(int) * GraphTraceLen);
     RepaintGraphWindow();
 }
-void ProxWidget::stickOperation()
-{
+void ProxWidget::stickOperation() {
     save_restoreGB(GRAPH_RESTORE);
     //printf("stickOperation()");
 }
-void ProxWidget::vchange_autocorr(int v)
-{
+void ProxWidget::vchange_autocorr(int v) {
     int ans = AutoCorrelate(GraphBuffer, s_Buff, GraphTraceLen, v, true, false);
     if (g_debugMode) printf("vchange_autocorr(w:%d): %d\n", v, ans);
     g_useOverlays = true;
     RepaintGraphWindow();
 }
-void ProxWidget::vchange_askedge(int v)
-{
+void ProxWidget::vchange_askedge(int v) {
     //extern int AskEdgeDetect(const int *in, int *out, int len, int threshold);
     int ans = AskEdgeDetect(GraphBuffer, s_Buff, GraphTraceLen, v);
     if (g_debugMode) printf("vchange_askedge(w:%d)%d\n", v, ans);
     g_useOverlays = true;
     RepaintGraphWindow();
 }
-void ProxWidget::vchange_dthr_up(int v)
-{
+void ProxWidget::vchange_dthr_up(int v) {
     int down = opsController->horizontalSlider_dirthr_down->value();
     directionalThreshold(GraphBuffer, s_Buff, GraphTraceLen, v, down);
     //printf("vchange_dthr_up(%d)", v);
     g_useOverlays = true;
     RepaintGraphWindow();
 }
-void ProxWidget::vchange_dthr_down(int v)
-{
+void ProxWidget::vchange_dthr_down(int v) {
     //printf("vchange_dthr_down(%d)", v);
     int up = opsController->horizontalSlider_dirthr_up->value();
     directionalThreshold(GraphBuffer, s_Buff, GraphTraceLen, v, up);
     g_useOverlays = true;
     RepaintGraphWindow();
 }
-ProxWidget::ProxWidget(QWidget *parent, ProxGuiQT *master) : QWidget(parent)
-{
+ProxWidget::ProxWidget(QWidget *parent, ProxGuiQT *master) : QWidget(parent) {
     this->master = master;
     resize(800, 400);
 
@@ -226,8 +207,7 @@ ProxWidget::ProxWidget(QWidget *parent, ProxGuiQT *master) : QWidget(parent)
 
 // not 100% sure what i need in this block
 // feel free to fix - marshmellow...
-ProxWidget::~ProxWidget(void)
-{
+ProxWidget::~ProxWidget(void) {
     if (controlWidget) {
         controlWidget->close();
         delete controlWidget;
@@ -245,39 +225,33 @@ ProxWidget::~ProxWidget(void)
         plot = NULL;
     }
 }
-void ProxWidget::closeEvent(QCloseEvent *event)
-{
+void ProxWidget::closeEvent(QCloseEvent *event) {
     event->ignore();
     this->hide();
     g_useOverlays = false;
 }
-void ProxWidget::hideEvent(QHideEvent *event)
-{
+void ProxWidget::hideEvent(QHideEvent *event) {
     controlWidget->hide();
     plot->hide();
 }
-void ProxWidget::showEvent(QShowEvent *event)
-{
+void ProxWidget::showEvent(QShowEvent *event) {
     controlWidget->show();
     plot->show();
 }
 
 //----------- Plotting
 
-int Plot::xCoordOf(int i, QRect r)
-{
+int Plot::xCoordOf(int i, QRect r) {
     return r.left() + (int)((i - GraphStart) * GraphPixelsPerPoint);
 }
 
-int Plot::yCoordOf(int v, QRect r, int maxVal)
-{
+int Plot::yCoordOf(int v, QRect r, int maxVal) {
     int z = (r.bottom() - r.top()) / 2;
     if (maxVal == 0) ++maxVal;
     return -(z * v) / maxVal + z;
 }
 
-int Plot::valueOf_yCoord(int y, QRect r, int maxVal)
-{
+int Plot::valueOf_yCoord(int y, QRect r, int maxVal) {
     int z = (r.bottom() - r.top()) / 2;
     return (y - z) * maxVal / z;
 }
@@ -287,8 +261,7 @@ static const QColor RED   = QColor(255, 100, 100);
 static const QColor BLUE  = QColor(100, 100, 255);
 static const QColor GRAY = QColor(240, 240, 240);
 
-QColor Plot::getColor(int graphNum)
-{
+QColor Plot::getColor(int graphNum) {
     switch (graphNum) {
         case 0:
             return GREEN;  //Green
@@ -301,8 +274,7 @@ QColor Plot::getColor(int graphNum)
     }
 }
 
-void Plot::setMaxAndStart(int *buffer, int len, QRect plotRect)
-{
+void Plot::setMaxAndStart(int *buffer, int len, QRect plotRect) {
     if (len == 0) return;
     startMax = (len - (int)((plotRect.right() - plotRect.left() - 40) / GraphPixelsPerPoint));
     if (startMax < 0) {
@@ -327,8 +299,7 @@ void Plot::setMaxAndStart(int *buffer, int len, QRect plotRect)
     g_absVMax = (int)(g_absVMax * 1.25 + 1);
 }
 
-void Plot::PlotDemod(uint8_t *buffer, size_t len, QRect plotRect, QRect annotationRect, QPainter *painter, int graphNum, int plotOffset)
-{
+void Plot::PlotDemod(uint8_t *buffer, size_t len, QRect plotRect, QRect annotationRect, QPainter *painter, int graphNum, int plotOffset) {
     if (len == 0 || PlotGridX <= 0) return;
     //clock_t begin = clock();
     QPainterPath penPath;
@@ -383,8 +354,7 @@ void Plot::PlotDemod(uint8_t *buffer, size_t len, QRect plotRect, QRect annotati
     painter->drawPath(penPath);
 }
 
-void Plot::PlotGraph(int *buffer, int len, QRect plotRect, QRect annotationRect, QPainter *painter, int graphNum)
-{
+void Plot::PlotGraph(int *buffer, int len, QRect plotRect, QRect annotationRect, QPainter *painter, int graphNum) {
     if (len == 0) return;
     // clock_t begin = clock();
     QPainterPath penPath;
@@ -455,8 +425,7 @@ void Plot::PlotGraph(int *buffer, int len, QRect plotRect, QRect annotationRect,
     //printf("Plot time %f\n", elapsed_secs);
 }
 
-void Plot::plotGridLines(QPainter *painter, QRect r)
-{
+void Plot::plotGridLines(QPainter *painter, QRect r) {
 
     // set GridOffset
     if (PlotGridX <= 0) return;
@@ -493,8 +462,7 @@ void Plot::plotGridLines(QPainter *painter, QRect r)
 #define HEIGHT_INFO 60
 #define WIDTH_AXES 80
 
-void Plot::paintEvent(QPaintEvent *event)
-{
+void Plot::paintEvent(QPaintEvent *event) {
     QPainter painter(this);
     QBrush brush(QColor(100, 255, 100));
     QPen pen(QColor(100, 255, 100));
@@ -579,8 +547,7 @@ void Plot::paintEvent(QPaintEvent *event)
     painter.drawText(20, infoRect.bottom() - 3, str);
 }
 
-Plot::Plot(QWidget *parent) : QWidget(parent), GraphStart(0), GraphPixelsPerPoint(1)
-{
+Plot::Plot(QWidget *parent) : QWidget(parent), GraphStart(0), GraphPixelsPerPoint(1) {
     //Need to set this, otherwise we don't receive keypress events
     setFocusPolicy(Qt::StrongFocus);
     resize(400, 200);
@@ -599,15 +566,13 @@ Plot::Plot(QWidget *parent) : QWidget(parent), GraphStart(0), GraphPixelsPerPoin
     master = parent;
 }
 
-void Plot::closeEvent(QCloseEvent *event)
-{
+void Plot::closeEvent(QCloseEvent *event) {
     event->ignore();
     this->hide();
     g_useOverlays = false;
 }
 
-void Plot::mouseMoveEvent(QMouseEvent *event)
-{
+void Plot::mouseMoveEvent(QMouseEvent *event) {
     int x = event->x();
     x -= WIDTH_AXES;
     x = (int)(x / GraphPixelsPerPoint);
@@ -620,8 +585,7 @@ void Plot::mouseMoveEvent(QMouseEvent *event)
     this->update();
 }
 
-void Plot::keyPressEvent(QKeyEvent *event)
-{
+void Plot::keyPressEvent(QKeyEvent *event) {
     int offset;
 
     if (event->modifiers() & Qt::ShiftModifier) {
diff --git a/client/proxguiqt.h b/client/proxguiqt.h
index a12fe157b..fd6e00f13 100644
--- a/client/proxguiqt.h
+++ b/client/proxguiqt.h
@@ -28,9 +28,8 @@ class ProxWidget;
 /**
  * @brief The actual plot, black area were we paint the graph
  */
-class Plot: public QWidget
-{
-private:
+class Plot: public QWidget {
+  private:
     QWidget *master;
     int GraphStart;
     double GraphPixelsPerPoint;
@@ -45,10 +44,10 @@ private:
     void setMaxAndStart(int *buffer, int len, QRect plotRect);
     QColor getColor(int graphNum);
 
-public:
+  public:
     Plot(QWidget *parent = 0);
 
-protected:
+  protected:
     void paintEvent(QPaintEvent *event);
     void closeEvent(QCloseEvent *event);
     void mouseMoveEvent(QMouseEvent *event);
@@ -60,22 +59,21 @@ class ProxGuiQT;
 /**
  * The window with plot and controls
  */
-class ProxWidget : public QWidget
-{
+class ProxWidget : public QWidget {
     Q_OBJECT; //needed for slot/signal classes
 
-private:
+  private:
     ProxGuiQT *master;
     Plot *plot;
     Ui::Form *opsController;
     QWidget *controlWidget;
 
-public:
+  public:
     ProxWidget(QWidget *parent = 0, ProxGuiQT *master = NULL);
     ~ProxWidget(void);
     //OpsShow(void);
 
-protected:
+  protected:
     //  void paintEvent(QPaintEvent *event);
     void closeEvent(QCloseEvent *event);
     void showEvent(QShowEvent *event);
@@ -83,7 +81,7 @@ protected:
     //  void mouseMoveEvent(QMouseEvent *event);
     //  void mousePressEvent(QMouseEvent *event) { mouseMoveEvent(event); }
     //  void keyPressEvent(QKeyEvent *event);
-public slots:
+  public slots:
     void applyOperation();
     void stickOperation();
     void vchange_autocorr(int v);
@@ -92,24 +90,22 @@ public slots:
     void vchange_dthr_down(int v);
 };
 
-class WorkerThread : public QThread
-{
+class WorkerThread : public QThread {
     Q_OBJECT;
-public:
+  public:
     WorkerThread(char *, char *, bool);
     ~WorkerThread();
     void run();
-private:
+  private:
     char *script_cmds_file = NULL;
     char *script_cmd = NULL;
     bool usb_present;
 };
 
-class ProxGuiQT : public QObject
-{
+class ProxGuiQT : public QObject {
     Q_OBJECT;
 
-private:
+  private:
     QApplication *plotapp;
     ProxWidget *plotwidget;
     int argc;
@@ -117,7 +113,7 @@ private:
     //void (*main_func)(void);
     WorkerThread *proxmarkThread;
 
-public:
+  public:
     ProxGuiQT(int argc, char **argv, WorkerThread *wthread);
     ~ProxGuiQT(void);
     void ShowGraphWindow(void);
@@ -126,14 +122,14 @@ public:
     void MainLoop(void);
     void Exit(void);
 
-private slots:
+  private slots:
     void _ShowGraphWindow(void);
     void _RepaintGraphWindow(void);
     void _HideGraphWindow(void);
     void _Exit(void);
     void _StartProxmarkThread(void);
 
-signals:
+  signals:
     void ShowGraphWindowSignal(void);
     void RepaintGraphWindowSignal(void);
     void HideGraphWindowSignal(void);
diff --git a/client/proxmark3.c b/client/proxmark3.c
index e9df91ef6..e54f0ce74 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -29,8 +29,7 @@
 #include "comms.h"
 
 #if defined(__linux__) || (__APPLE__)
-static void showBanner(void)
-{
+static void showBanner(void) {
     printf("\n\n");
     printf("\e[34m██████╗ ███╗   ███╗ ████╗\e[0m     ...iceman fork\n");
     printf("\e[34m██╔══██╗████╗ ████║   ══█║\e[0m      ...dedicated to \e[34mRDV40\e[0m\n");
@@ -51,8 +50,7 @@ void
 __attribute__((force_align_arg_pointer))
 #endif
 #endif
-main_loop(char *script_cmds_file, char *script_cmd, bool usb_present)
-{
+main_loop(char *script_cmds_file, char *script_cmd, bool usb_present) {
 
     char *cmd = NULL;
     bool execCommand = (script_cmd != NULL);
@@ -196,8 +194,7 @@ main_loop(char *script_cmds_file, char *script_cmd, bool usb_present)
     }
 }
 
-static void dumpAllHelp(int markdown)
-{
+static void dumpAllHelp(int markdown) {
     PrintAndLogEx(NORMAL, "\n%sProxmark3 command dump%s\n\n", markdown ? "# " : "", markdown ? "" : "\n======================");
     PrintAndLogEx(NORMAL, "Some commands are available only if a Proxmark is actually connected.%s\n", markdown ? "  " : "");
     PrintAndLogEx(NORMAL, "Check column \"offline\" for their availability.\n");
@@ -209,18 +206,15 @@ static void dumpAllHelp(int markdown)
 static char *my_executable_path = NULL;
 static char *my_executable_directory = NULL;
 
-const char *get_my_executable_path(void)
-{
+const char *get_my_executable_path(void) {
     return my_executable_path;
 }
 
-const char *get_my_executable_directory(void)
-{
+const char *get_my_executable_directory(void) {
     return my_executable_directory;
 }
 
-static void set_my_executable_path(void)
-{
+static void set_my_executable_path(void) {
     int path_length = wai_getExecutablePath(NULL, 0, NULL);
     if (path_length != -1) {
         my_executable_path = (char *)calloc(path_length + 1, sizeof(uint8_t));
@@ -234,8 +228,7 @@ static void set_my_executable_path(void)
     }
 }
 
-static void show_help(bool showFullHelp, char *command_line)
-{
+static void show_help(bool showFullHelp, char *command_line) {
     PrintAndLogEx(NORMAL, "syntax: %s <port> [-h | -help | -m | -f | -flush | -w | -wait | -c | -command | -l | -lua] [cmd_script_file_name] [command][lua_script_name]\n", command_line);
     PrintAndLogEx(NORMAL, "\texample:'%s "SERIAL_PORT_H"'\n\n", command_line);
 
@@ -257,8 +250,7 @@ static void show_help(bool showFullHelp, char *command_line)
     }
 }
 
-int main(int argc, char *argv[])
-{
+int main(int argc, char *argv[]) {
     srand(time(0));
 
     bool usb_present = false;
diff --git a/client/reveng/bmpbit.c b/client/reveng/bmpbit.c
index 79b1f653a..9d2b2badc 100644
--- a/client/reveng/bmpbit.c
+++ b/client/reveng/bmpbit.c
@@ -41,8 +41,7 @@ int bmpbit;
 int bmpsub;
 
 void
-setbmp(void)
-{
+setbmp(void) {
     /* Initialise BMP_BIT and BMP_SUB for the local architecture. */
     bmp_t bmpmax = ~(bmp_t) 0;
 
@@ -61,8 +60,7 @@ setbmp(void)
 
 #ifdef BMPTST
 int
-main(int argc, char *argv[])
-{
+main(int argc, char *argv[]) {
     /* check the compile-time bitmap width is correct, otherwise
      * searches run forever. */
 #  if BMP_BIT > 0
diff --git a/client/reveng/cli.c b/client/reveng/cli.c
index 834f2d688..bf91269f7 100644
--- a/client/reveng/cli.c
+++ b/client/reveng/cli.c
@@ -70,8 +70,7 @@ static void usage(void);
 
 static const char *myname = "reveng"; /* name of our program */
 
-int reveng_main(int argc, char *argv[])
-{
+int reveng_main(int argc, char *argv[]) {
     /* Command-line interface for CRC RevEng.
      * Process options and switches in the argument list and
      * run the required function.
@@ -496,8 +495,7 @@ ipqx:
 }
 
 void
-ufound(const model_t *model)
-{
+ufound(const model_t *model) {
     /* Callback function to report each model found */
     char *string;
 
@@ -509,16 +507,14 @@ ufound(const model_t *model)
 }
 
 void
-uerror(const char *msg)
-{
+uerror(const char *msg) {
     /* Callback function to report fatal errors */
     fprintf(stderr, "%s: %s\n", myname, msg);
     //exit(EXIT_FAILURE);
 }
 
 void
-uprog(const poly_t gpoly, int flags, unsigned long seq)
-{
+uprog(const poly_t gpoly, int flags, unsigned long seq) {
     /* Callback function to report search progress */
     char *string;
 
@@ -535,8 +531,7 @@ uprog(const poly_t gpoly, int flags, unsigned long seq)
 }
 
 static poly_t
-rdpoly(const char *name, int flags, int bperhx)
-{
+rdpoly(const char *name, int flags, int bperhx) {
     /* read poly from file in chunks and report errors */
 
     poly_t apoly = PZERO, chunk = PZERO;
@@ -564,8 +559,7 @@ rdpoly(const char *name, int flags, int bperhx)
 }
 
 static FILE *
-oread(const char *name)
-{
+oread(const char *name) {
     /* open file for reading and report errors */
     FILE *handle;
 
@@ -581,8 +575,7 @@ oread(const char *name)
 }
 
 static void
-usage(void)
-{
+usage(void) {
     /* print usage if asked, or if syntax incorrect */
     fprintf(stderr,
             "CRC RevEng: arbitrary-precision CRC calculator and algorithm finder\n"
diff --git a/client/reveng/getopt.c b/client/reveng/getopt.c
index 71799a320..2c384e6be 100644
--- a/client/reveng/getopt.c
+++ b/client/reveng/getopt.c
@@ -31,8 +31,7 @@
 char *optarg;
 int optind = 1, opterr, optopt;
 int pos = 0;
-int getopt(int argc, char *argv[], const char *optstring)
-{
+int getopt(int argc, char *argv[], const char *optstring) {
     //static int pos = 0;
     char *str;
 
diff --git a/client/reveng/model.c b/client/reveng/model.c
index f7ad1fb77..5d3ffc759 100644
--- a/client/reveng/model.c
+++ b/client/reveng/model.c
@@ -47,8 +47,7 @@ static const poly_t pzero = PZERO;
 
 /* Definitions */
 
-void mcpy(model_t *dest, const model_t *src)
-{
+void mcpy(model_t *dest, const model_t *src) {
     /* Copies the parameters of src to dest.
      * dest must be an initialised model.
      */
@@ -63,8 +62,7 @@ void mcpy(model_t *dest, const model_t *src)
     dest->name = src->name;
 }
 
-void mfree(model_t *model)
-{
+void mfree(model_t *model) {
     /* Frees the parameters of model. */
     if (!model) return;
     pfree(&model->spoly);
@@ -76,8 +74,7 @@ void mfree(model_t *model)
     /* not model either, it might point to an array! */
 }
 
-int mcmp(const model_t *a, const model_t *b)
-{
+int mcmp(const model_t *a, const model_t *b) {
     /* Compares a and b for identical effect, i.e. disregarding
      * trailing zeroes in parameter polys.
      * Intended for bsearch().
@@ -93,8 +90,7 @@ int mcmp(const model_t *a, const model_t *b)
     return (psncmp(&a->xorout, &b->xorout));
 }
 
-char *mtostr(const model_t *model)
-{
+char *mtostr(const model_t *model) {
     /* Returns a malloc()-ed string containing a Williams model
      * record representing the input model.
      * mcanon() should be called on the argument before printing.
@@ -154,8 +150,7 @@ char *mtostr(const model_t *model)
     return (string);
 }
 
-void mcanon(model_t *model)
-{
+void mcanon(model_t *model) {
     /* canonicalise a model */
     unsigned long dlen;
 
@@ -181,8 +176,7 @@ void mcanon(model_t *model)
         mcheck(model);
 }
 
-void mcheck(model_t *model)
-{
+void mcheck(model_t *model) {
     /* calculate a check for the model */
     poly_t checkstr, check, xorout, magic;
 
@@ -215,8 +209,7 @@ void mcheck(model_t *model)
     model->magic = magic;
 }
 
-void mrev(model_t *model)
-{
+void mrev(model_t *model) {
     /* reverse the model to calculate reversed CRCs */
     /* Here we invert RefIn and RefOut so that the user need only
      * reverse the order of characters in the arguments, not the
@@ -246,8 +239,7 @@ void mrev(model_t *model)
     mnovel(model);
 }
 
-void mnovel(model_t *model)
-{
+void mnovel(model_t *model) {
     /* remove name and check string from modified model */
     model->name = NULL;
     pfree(&model->check);
diff --git a/client/reveng/poly.c b/client/reveng/poly.c
index 774e76a7c..1dc241231 100644
--- a/client/reveng/poly.c
+++ b/client/reveng/poly.c
@@ -127,8 +127,7 @@ static const poly_t pzero = PZERO;
 #endif
 
 poly_t
-filtop(FILE *input, unsigned long length, int flags, int bperhx)
-{
+filtop(FILE *input, unsigned long length, int flags, int bperhx) {
     /* reads binary data from input into a poly_t until EOF or until
      * length bits are read.  Characters are read until
      * ceil(bperhx / CHAR_BIT) bits are collected; if P_LTLBYT is
@@ -181,8 +180,7 @@ filtop(FILE *input, unsigned long length, int flags, int bperhx)
 }
 
 poly_t
-strtop(const char *string, int flags, int bperhx)
-{
+strtop(const char *string, int flags, int bperhx) {
     /* Converts a hex or character string to a poly_t.
      * Each character is converted to a hex nibble yielding 4 bits
      * unless P_DIRECT, when each character yields CHAR_BIT bits.
@@ -311,8 +309,7 @@ strtop(const char *string, int flags, int bperhx)
 }
 
 char *
-ptostr(const poly_t poly, int flags, int bperhx)
-{
+ptostr(const poly_t poly, int flags, int bperhx) {
     /* Returns a malloc()-ed string containing a hexadecimal
      * representation of poly. See phxsubs().
      */
@@ -320,8 +317,7 @@ ptostr(const poly_t poly, int flags, int bperhx)
 }
 
 char *
-pxsubs(const poly_t poly, int flags, int bperhx, unsigned long start, unsigned long end)
-{
+pxsubs(const poly_t poly, int flags, int bperhx, unsigned long start, unsigned long end) {
     /* Returns a malloc()-ed string containing a hexadecimal
      * representation of a portion of poly, from bit offset start to
      * (end - 1) inclusive.  The output is grouped into words of
@@ -393,8 +389,7 @@ pxsubs(const poly_t poly, int flags, int bperhx, unsigned long start, unsigned l
 }
 
 poly_t
-pclone(const poly_t poly)
-{
+pclone(const poly_t poly) {
     /* Returns a freestanding copy of poly.  Does not clean poly or
      * the result.
      */
@@ -405,8 +400,7 @@ pclone(const poly_t poly)
 }
 
 void
-pcpy(poly_t *dest, const poly_t src)
-{
+pcpy(poly_t *dest, const poly_t src) {
     /* Assigns (copies) src into dest.  Does not clean src or dest.
      */
     unsigned long iter, idx;
@@ -417,8 +411,7 @@ pcpy(poly_t *dest, const poly_t src)
 }
 
 void
-pcanon(poly_t *poly)
-{
+pcanon(poly_t *poly) {
     /* Converts poly into a CLEAN object by freeing unused bitmap words
      * and clearing any bits in the last word beyond the last bit.
      * The length field has absolute priority over the contents of the bitmap.
@@ -430,8 +423,7 @@ pcanon(poly_t *poly)
 }
 
 void
-pnorm(poly_t *poly)
-{
+pnorm(poly_t *poly) {
     /* Converts poly into a NORMALISED object by removing leading
      * and trailing zeroes, so that the polynomial starts and ends
      * with significant terms.
@@ -451,8 +443,7 @@ pnorm(poly_t *poly)
 }
 
 void
-psnorm(poly_t *poly)
-{
+psnorm(poly_t *poly) {
     /* Converts poly into a SEMI-NORMALISED object by removing
      * trailing zeroes, so that the polynomial ends with a
      * significant term.
@@ -465,8 +456,7 @@ psnorm(poly_t *poly)
 }
 
 void
-pchop(poly_t *poly)
-{
+pchop(poly_t *poly) {
     /* Normalise poly, then chop off the highest significant term
      * (produces a SEMI-NORMALISED object).  poly becomes a suitable
      * divisor for pcrc().
@@ -481,8 +471,7 @@ pchop(poly_t *poly)
 }
 
 void
-pkchop(poly_t *poly)
-{
+pkchop(poly_t *poly) {
     /* Convert poly from Koopman notation to chopped form (produces
      * a SEMI-NORMALISED object).  poly becomes a suitable divisor
      * for pcrc().
@@ -502,8 +491,7 @@ pkchop(poly_t *poly)
 }
 
 unsigned long
-plen(const poly_t poly)
-{
+plen(const poly_t poly) {
     /* Return length of polynomial.
      * poly may or may not be WELL-FORMED.
      */
@@ -511,8 +499,7 @@ plen(const poly_t poly)
 }
 
 int
-pcmp(const poly_t *a, const poly_t *b)
-{
+pcmp(const poly_t *a, const poly_t *b) {
     /* Compares poly_t objects for identical sizes and contents.
      * a and b must be CLEAN.
      * Defines a total order relation for sorting, etc. although
@@ -539,8 +526,7 @@ pcmp(const poly_t *a, const poly_t *b)
 }
 
 int
-psncmp(const poly_t *a, const poly_t *b)
-{
+psncmp(const poly_t *a, const poly_t *b) {
     /* Compares polys for identical effect, i.e. as though the
      * shorter poly were padded with zeroes to the length of the
      * longer.
@@ -565,8 +551,7 @@ psncmp(const poly_t *a, const poly_t *b)
 
 
 int
-ptst(const poly_t poly)
-{
+ptst(const poly_t poly) {
     /* Tests whether a polynomial equals zero.  Returns 0 if equal,
      * a nonzero value otherwise.
      * poly must be CLEAN.
@@ -580,8 +565,7 @@ ptst(const poly_t poly)
 }
 
 unsigned long
-pfirst(const poly_t poly)
-{
+pfirst(const poly_t poly) {
     /* Returns the index of the first nonzero term in poly.  If none
      * is found, returns the length of poly.
      * poly must be CLEAN.
@@ -604,8 +588,7 @@ pfirst(const poly_t poly)
 }
 
 unsigned long
-plast(const poly_t poly)
-{
+plast(const poly_t poly) {
     /* Returns 1 plus the index of the last nonzero term in poly.
      * If none is found, returns zero.
      * poly must be CLEAN.
@@ -631,16 +614,14 @@ plast(const poly_t poly)
 }
 
 poly_t
-psubs(const poly_t src, unsigned long head, unsigned long start, unsigned long end, unsigned long tail)
-{
+psubs(const poly_t src, unsigned long head, unsigned long start, unsigned long end, unsigned long tail) {
     poly_t dest = PZERO;
     pshift(&dest, src, head, start, end, tail);
     return (dest);
 }
 
 void
-pright(poly_t *poly, unsigned long length)
-{
+pright(poly_t *poly, unsigned long length) {
     /* Trims or extends poly to length at the left edge, prepending
      * zeroes if necessary.  Analogous to praloc() except the
      * rightmost terms of poly are preserved.
@@ -657,8 +638,7 @@ pright(poly_t *poly, unsigned long length)
 }
 
 void
-pshift(poly_t *dest, const poly_t src, unsigned long head, unsigned long start, unsigned long end, unsigned long tail)
-{
+pshift(poly_t *dest, const poly_t src, unsigned long head, unsigned long start, unsigned long end, unsigned long tail) {
     /* copies bits start to end-1 of src to dest, plus the number of leading and trailing zeroes given by head and tail.
      * end may exceed the length of src in which case more zeroes are appended.
      * dest may point to src, in which case the poly is edited in place.
@@ -724,8 +704,7 @@ pshift(poly_t *dest, const poly_t src, unsigned long head, unsigned long start,
 }
 
 void
-ppaste(poly_t *dest, const poly_t src, unsigned long skip, unsigned long seek, unsigned long end, unsigned long fulllength)
-{
+ppaste(poly_t *dest, const poly_t src, unsigned long skip, unsigned long seek, unsigned long end, unsigned long fulllength) {
     /* pastes terms of src, starting from skip, to positions seek to end-1 of dest
      * then sets length of dest to fulllength (>= end)
      * to paste n terms of src, give end = seek + n
@@ -783,8 +762,7 @@ ppaste(poly_t *dest, const poly_t src, unsigned long skip, unsigned long seek, u
 }
 
 void
-pdiff(poly_t *dest, const poly_t src, unsigned long ofs)
-{
+pdiff(poly_t *dest, const poly_t src, unsigned long ofs) {
     /* Subtract src from dest (modulo 2) at offset ofs.
      * In modulo 2 arithmetic, subtraction is equivalent to addition
      * We include an alias for those who wish to retain the distinction
@@ -794,8 +772,7 @@ pdiff(poly_t *dest, const poly_t src, unsigned long ofs)
 }
 
 void
-psum(poly_t *dest, const poly_t src, unsigned long ofs)
-{
+psum(poly_t *dest, const poly_t src, unsigned long ofs) {
     /* Adds src to dest (modulo 2) at offset ofs.
      * When ofs == dest->length, catenates src on to dest.
      * src and dest must be CLEAN.
@@ -816,8 +793,7 @@ psum(poly_t *dest, const poly_t src, unsigned long ofs)
 }
 
 void
-prev(poly_t *poly)
-{
+prev(poly_t *poly) {
     /* Reverse or reciprocate a polynomial.
      * On exit, poly is CLEAN.
      */
@@ -850,8 +826,7 @@ prev(poly_t *poly)
 }
 
 void
-prevch(poly_t *poly, int bperhx)
-{
+prevch(poly_t *poly, int bperhx) {
     /* Reverse each group of bperhx bits in a polynomial.
      * Does not clean poly.
      */
@@ -883,8 +858,7 @@ prevch(poly_t *poly, int bperhx)
 }
 
 void
-prcp(poly_t *poly)
-{
+prcp(poly_t *poly) {
     /* Reciprocate a chopped polynomial.  Use prev() on whole
      * polynomials.
      * On exit, poly is SEMI-NORMALISED.
@@ -903,8 +877,7 @@ prcp(poly_t *poly)
 }
 
 void
-pinv(poly_t *poly)
-{
+pinv(poly_t *poly) {
     /* Invert a polynomial, i.e. add 1 (modulo 2) to the coefficient of each term
      * on exit, poly is CLEAN.
      */
@@ -917,8 +890,7 @@ pinv(poly_t *poly)
 }
 
 poly_t
-pmod(const poly_t dividend, const poly_t divisor)
-{
+pmod(const poly_t dividend, const poly_t divisor) {
     /* Divide dividend by normalised divisor and return the remainder
      * This function generates a temporary 'chopped' divisor for pcrc()
      * If calling repeatedly with a constant divisor, produce a chopped copy
@@ -934,8 +906,7 @@ pmod(const poly_t dividend, const poly_t divisor)
 }
 
 poly_t
-pcrc(const poly_t message, const poly_t divisor, const poly_t init, const poly_t xorout, int flags)
-{
+pcrc(const poly_t message, const poly_t divisor, const poly_t init, const poly_t xorout, int flags) {
     /* Divide message by divisor and return the remainder.
      * init is added to divisor, highest terms aligned, before
      * division.
@@ -960,7 +931,7 @@ pcrc(const poly_t message, const poly_t divisor, const poly_t init, const poly_t
     eptr = message.bitmap + SIZE(message.length);
     probe = ~(~BMP_C(0) >> 1);
     if (divisor.length <= (unsigned long) BMP_BIT
-        && init.length <= (unsigned long) BMP_BIT) {
+            && init.length <= (unsigned long) BMP_BIT) {
         rem = init.length ? *init.bitmap : BMP_C(0);
         dvsr = divisor.length ? *divisor.bitmap : BMP_C(0);
         for (iter = 0UL, ofs = 0UL; iter < max; ++iter, --ofs) {
@@ -1022,8 +993,7 @@ pcrc(const poly_t message, const poly_t divisor, const poly_t init, const poly_t
 }
 
 int
-piter(poly_t *poly)
-{
+piter(poly_t *poly) {
     /* Replace poly with the 'next' polynomial of equal length.
      * Returns zero if the next polynomial is all zeroes, a nonzero
      * value otherwise.
@@ -1040,8 +1010,7 @@ piter(poly_t *poly)
 }
 
 void
-palloc(poly_t *poly, unsigned long length)
-{
+palloc(poly_t *poly, unsigned long length) {
     /* Replaces poly with a CLEAN object of the specified length,
      * consisting of all zeroes.
      * It is safe to call with length = 0, in which case the object
@@ -1065,8 +1034,7 @@ palloc(poly_t *poly, unsigned long length)
 }
 
 void
-pfree(poly_t *poly)
-{
+pfree(poly_t *poly) {
     /* Frees poly's bitmap storage and sets poly equal to the empty
      * polynomial (PZERO).
      * poly may or may not be WELL-FORMED.
@@ -1081,8 +1049,7 @@ pfree(poly_t *poly)
 }
 
 void
-praloc(poly_t *poly, unsigned long length)
-{
+praloc(poly_t *poly, unsigned long length) {
     /* Trims or extends poly to length at the right edge, appending
      * zeroes if necessary.
      * On entry, poly may or may not be WELL-FORMED.
@@ -1124,8 +1091,7 @@ praloc(poly_t *poly, unsigned long length)
 }
 
 int
-pmpar(const poly_t poly, const poly_t mask)
-{
+pmpar(const poly_t poly, const poly_t mask) {
     /* Return even parity of poly masked with mask.
      * Poly and mask must be CLEAN.
      */
@@ -1145,8 +1111,7 @@ pmpar(const poly_t poly, const poly_t mask)
 }
 
 int
-pident(const poly_t a, const poly_t b)
-{
+pident(const poly_t a, const poly_t b) {
     /* Return nonzero if a and b have the same length
      * and point to the same bitmap.
      * a and b need not be CLEAN.
@@ -1157,8 +1122,7 @@ pident(const poly_t a, const poly_t b)
 /* Private functions */
 
 static bmp_t
-getwrd(const poly_t poly, unsigned long iter)
-{
+getwrd(const poly_t poly, unsigned long iter) {
     /* Fetch unaligned word from poly where LSB of result is
      * bit iter of the bitmap (counting from zero).  If iter exceeds
      * the length of poly then zeroes are appended as necessary.
@@ -1181,8 +1145,7 @@ getwrd(const poly_t poly, unsigned long iter)
 }
 
 static bmp_t
-rev(bmp_t accu, int bits)
-{
+rev(bmp_t accu, int bits) {
     /* Returns the bitmap word argument with the given number of
      * least significant bits reversed and the rest cleared.
      */
@@ -1231,8 +1194,7 @@ rev(bmp_t accu, int bits)
 }
 
 static void
-prhex(char **spp, bmp_t bits, int flags, int bperhx)
-{
+prhex(char **spp, bmp_t bits, int flags, int bperhx) {
     /* Appends a hexadecimal string representing the bperhx least
      * significant bits of bits to an external string.
      * spp points to a character pointer that in turn points to the
diff --git a/client/reveng/preset.c b/client/reveng/preset.c
index dbbebe88e..d5bdac2dd 100644
--- a/client/reveng/preset.c
+++ b/client/reveng/preset.c
@@ -792,8 +792,8 @@ static void munpack(model_t *, const struct mpreset *);
         palloc((poly), (preset)->width); \
         if((preset)->field) \
             for(iter=0UL, idx=0UL; \
-                iter < (poly)->length; \
-                iter += BMP_BIT, ++idx) \
+                    iter < (poly)->length; \
+                    iter += BMP_BIT, ++idx) \
                 (poly)->bitmap[idx] = (preset)->field[idx]; \
     }
 
@@ -802,8 +802,7 @@ static void munpack(model_t *, const struct mpreset *);
 
 /* Definitions */
 
-int mbynam(model_t *dest, const char *key)
-{
+int mbynam(model_t *dest, const char *key) {
     /* Sets parameters in dest according to the model named by key.
      */
     size_t left = 0, right = NALIASES, middle = 0;
@@ -837,22 +836,19 @@ int mbynam(model_t *dest, const char *key)
     return (1);
 }
 
-void mbynum(model_t *dest, int num)
-{
+void mbynum(model_t *dest, int num) {
     /* Sets parameters in dest according to the model indexed by num. */
     if (num > NPRESETS)
         num = NPRESETS;
     munpack(dest, num + models);
 }
 
-int mcount(void)
-{
+int mcount(void) {
     /* Returns the number of preset models. */
     return (NPRESETS);
 }
 
-char *mnames(void)
-{
+char *mnames(void) {
     /* Returns a malloc()-ed string of the names of all preset
      * models, separated by newlines and terminated by NULL.
      * Aliases are not listed.
@@ -887,8 +883,7 @@ char *mnames(void)
     return (string);
 }
 
-void mmatch(model_t *model, int flags)
-{
+void mmatch(model_t *model, int flags) {
     /* searches models[] for a model matching the argument, and links a name if found
      * if flags & M_OVERWR, copies the found model onto the argument. */
     size_t left = 0, right = NPRESETS, middle = 0;
@@ -931,8 +926,7 @@ void mmatch(model_t *model, int flags)
 }
 
 /* Private functions */
-static void munpack(model_t *dest, const struct mpreset *src)
-{
+static void munpack(model_t *dest, const struct mpreset *src) {
     /* Copies the parameters of src to dest.
      * dest must be an initialised model.
      */
diff --git a/client/reveng/reveng.c b/client/reveng/reveng.c
index 627c8bc31..1373ef88f 100644
--- a/client/reveng/reveng.c
+++ b/client/reveng/reveng.c
@@ -62,8 +62,7 @@ static void chkres(int *resc, model_t **result, const poly_t divisor, const poly
 static const poly_t pzero = PZERO;
 
 model_t *
-reveng(const model_t *guess, const poly_t qpoly, int rflags, int args, const poly_t *argpolys)
-{
+reveng(const model_t *guess, const poly_t qpoly, int rflags, int args, const poly_t *argpolys) {
     /* Complete the parameters of a model by calculation or brute search. */
     poly_t *pworks, *wptr, rem, gpoly;
     model_t *result = NULL, *rptr;
@@ -159,8 +158,7 @@ requit:
 }
 
 static poly_t *
-modpol(const poly_t init, int rflags, int args, const poly_t *argpolys)
-{
+modpol(const poly_t init, int rflags, int args, const poly_t *argpolys) {
     /* Produce, in ascending length order, a list of differences
      * between the arguments in the list by summing pairs of arguments.
      * If R_HAVEI is not set in rflags, only pairs of equal length are
@@ -225,8 +223,7 @@ modpol(const poly_t init, int rflags, int args, const poly_t *argpolys)
 }
 
 static void
-engini(int *resc, model_t **result, const poly_t divisor, int flags, int args, const poly_t *argpolys)
-{
+engini(int *resc, model_t **result, const poly_t divisor, int flags, int args, const poly_t *argpolys) {
     /* Search for init values implied by the arguments.
      * Method from: Ewing, Gregory C. (March 2010).
      * "Reverse-Engineering a CRC Algorithm". Christchurch:
@@ -367,8 +364,7 @@ engini(int *resc, model_t **result, const poly_t divisor, int flags, int args, c
 }
 
 static void
-calout(int *resc, model_t **result, const poly_t divisor, const poly_t init, int flags, int args, const poly_t *argpolys)
-{
+calout(int *resc, model_t **result, const poly_t divisor, const poly_t init, int flags, int args, const poly_t *argpolys) {
     /* Calculate Xorout, check it against all the arguments and
      * add to results if consistent.
      */
@@ -406,8 +402,7 @@ calout(int *resc, model_t **result, const poly_t divisor, const poly_t init, int
 }
 
 static void
-calini(int *resc, model_t **result, const poly_t divisor, int flags, const poly_t xorout, int args, const poly_t *argpolys)
-{
+calini(int *resc, model_t **result, const poly_t divisor, int flags, const poly_t xorout, int args, const poly_t *argpolys) {
     /* Calculate Init, check it against all the arguments and add to
      * results if consistent.
      */
@@ -455,8 +450,7 @@ calini(int *resc, model_t **result, const poly_t divisor, int flags, const poly_
 }
 
 static void
-chkres(int *resc, model_t **result, const poly_t divisor, const poly_t init, int flags, const poly_t xorout, int args, const poly_t *argpolys)
-{
+chkres(int *resc, model_t **result, const poly_t divisor, const poly_t init, int flags, const poly_t xorout, int args, const poly_t *argpolys) {
     /* Checks a model against the argument list, and adds to the
      * external results table if consistent.
      * Extends the result array and updates the external pointer if
diff --git a/client/scandir.c b/client/scandir.c
index e5003ee74..b06befe8e 100644
--- a/client/scandir.c
+++ b/client/scandir.c
@@ -21,8 +21,7 @@ extern "C" {
 int scandir(const char *dir,
             struct dirent ***namelist,
             int (*select)(const struct dirent *),
-            int (*compar)(const struct dirent **, const struct dirent **))
-{
+            int (*compar)(const struct dirent **, const struct dirent **)) {
     DIR *dirp;
     struct dirent *ent, *etmp, **nl = NULL, **ntmp;
     int count = 0;
@@ -86,8 +85,7 @@ int scandir(const char *dir,
 #ifdef __cplusplus
 extern "C" {
 #endif
-int alphasort(const struct dirent **a, const struct dirent **b)
-{
+int alphasort(const struct dirent **a, const struct dirent **b) {
     return strcoll((*a)->d_name, (*b)->d_name);
 }
 #ifdef __cplusplus
diff --git a/client/scripting.c b/client/scripting.c
index 4377bc1cd..14dc35774 100644
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -17,8 +17,7 @@
  * @param L
  * @return
  */
-static int l_SendCommand(lua_State *L)
-{
+static int l_SendCommand(lua_State *L) {
 
     /*
      The SendCommand (native) expects the following structure:
@@ -54,8 +53,7 @@ static int l_SendCommand(lua_State *L)
  * @param L
  * @return
  */
-static int l_GetFromBigBuf(lua_State *L)
-{
+static int l_GetFromBigBuf(lua_State *L) {
 
     int len = 0, startindex = 0;
 
@@ -101,8 +99,7 @@ static int l_GetFromBigBuf(lua_State *L)
  * @param L
  * @return
  */
-static int l_GetFromFlashMem(lua_State *L)
-{
+static int l_GetFromFlashMem(lua_State *L) {
 
 #ifndef WITH_FLASH
     lua_pushnil(L);
@@ -150,8 +147,7 @@ static int l_GetFromFlashMem(lua_State *L)
  * @param L
  * @return
  */
-static int l_WaitForResponseTimeout(lua_State *L)
-{
+static int l_WaitForResponseTimeout(lua_State *L) {
 
     uint32_t cmd = 0;
     size_t ms_timeout = -1;
@@ -187,8 +183,7 @@ static int l_WaitForResponseTimeout(lua_State *L)
     }
 }
 
-static int returnToLuaWithError(lua_State *L, const char *fmt, ...)
-{
+static int returnToLuaWithError(lua_State *L, const char *fmt, ...) {
     char buffer[200];
     va_list args;
     va_start(args, fmt);
@@ -200,8 +195,7 @@ static int returnToLuaWithError(lua_State *L, const char *fmt, ...)
     return 2;
 }
 
-static int l_mfDarkside(lua_State *L)
-{
+static int l_mfDarkside(lua_State *L) {
 
     uint32_t blockno = 0;
     uint32_t keytype = MIFARE_AUTH_KEYA;
@@ -237,8 +231,7 @@ static int l_mfDarkside(lua_State *L)
     return 2;
 }
 
-static int l_clearCommandBuffer(lua_State *L)
-{
+static int l_clearCommandBuffer(lua_State *L) {
     clearCommandBuffer();
     return 0;
 }
@@ -247,8 +240,7 @@ static int l_clearCommandBuffer(lua_State *L)
  * @param L
  * @return
  */
-static int l_foobar(lua_State *L)
-{
+static int l_foobar(lua_State *L) {
     //Check number of arguments
     int n = lua_gettop(L);
     printf("foobar called with %d arguments", n);
@@ -273,8 +265,7 @@ static int l_foobar(lua_State *L)
  * @param L
  * @return boolean, true if kbhit, false otherwise.
  */
-static int l_ukbhit(lua_State *L)
-{
+static int l_ukbhit(lua_State *L) {
     lua_pushboolean(L, ukbhit() ? true : false);
     return 1;
 }
@@ -284,14 +275,12 @@ static int l_ukbhit(lua_State *L)
  * @param L
  * @return
  */
-static int l_CmdConsole(lua_State *L)
-{
+static int l_CmdConsole(lua_State *L) {
     CommandReceived((char *)luaL_checkstring(L, 1));
     return 0;
 }
 
-static int l_iso15693_crc(lua_State *L)
-{
+static int l_iso15693_crc(lua_State *L) {
     uint32_t tmp;
     unsigned char buf[USB_CMD_DATA_SIZE] = {0x00};
     size_t size = 0;
@@ -308,8 +297,7 @@ static int l_iso15693_crc(lua_State *L)
     return 1;
 }
 
-static int l_iso14443b_crc(lua_State *L)
-{
+static int l_iso14443b_crc(lua_State *L) {
     uint32_t tmp;
     unsigned char buf[USB_CMD_DATA_SIZE] = {0x00};
     size_t size = 0;
@@ -330,8 +318,7 @@ static int l_iso14443b_crc(lua_State *L)
  Simple AES 128 cbc hook up to OpenSSL.
  params:  key, input
 */
-static int l_aes128decrypt_cbc(lua_State *L)
-{
+static int l_aes128decrypt_cbc(lua_State *L) {
     //Check number of arguments
     int i;
     uint32_t tmp;
@@ -362,8 +349,7 @@ static int l_aes128decrypt_cbc(lua_State *L)
     lua_pushlstring(L, (const char *)&outdata, sizeof(outdata));
     return 1;// return 1 to signal one return value
 }
-static int l_aes128decrypt_ecb(lua_State *L)
-{
+static int l_aes128decrypt_ecb(lua_State *L) {
     //Check number of arguments
     int i;
     uint32_t tmp;
@@ -394,8 +380,7 @@ static int l_aes128decrypt_ecb(lua_State *L)
     return 1;// return 1 to signal one return value
 }
 
-static int l_aes128encrypt_cbc(lua_State *L)
-{
+static int l_aes128encrypt_cbc(lua_State *L) {
     //Check number of arguments
     int i;
     uint32_t tmp;
@@ -426,8 +411,7 @@ static int l_aes128encrypt_cbc(lua_State *L)
     return 1;// return 1 to signal one return value
 }
 
-static int l_aes128encrypt_ecb(lua_State *L)
-{
+static int l_aes128encrypt_ecb(lua_State *L) {
     //Check number of arguments
     int i;
     uint32_t tmp;
@@ -456,8 +440,7 @@ static int l_aes128encrypt_ecb(lua_State *L)
     return 1;// return 1 to signal one return value
 }
 
-static int l_crc8legic(lua_State *L)
-{
+static int l_crc8legic(lua_State *L) {
     size_t size;
     const char *p_str = luaL_checklstring(L, 1, &size);
 
@@ -466,8 +449,7 @@ static int l_crc8legic(lua_State *L)
     return 1;
 }
 
-static int l_crc16(lua_State *L)
-{
+static int l_crc16(lua_State *L) {
     size_t size;
     const char *p_str = luaL_checklstring(L, 1, &size);
 
@@ -476,8 +458,7 @@ static int l_crc16(lua_State *L)
     return 1;
 }
 
-static int l_crc64(lua_State *L)
-{
+static int l_crc64(lua_State *L) {
     size_t size;
     uint64_t crc = 0;
     unsigned char outdata[8] = {0x00};
@@ -498,8 +479,7 @@ static int l_crc64(lua_State *L)
     return 1;
 }
 
-static int l_crc64_ecma182(lua_State *L)
-{
+static int l_crc64_ecma182(lua_State *L) {
     //size_t size;
     uint64_t crc = 0;
     unsigned char outdata[8] = {0x00};
@@ -524,8 +504,7 @@ static int l_crc64_ecma182(lua_State *L)
     return 1;
 }
 
-static int l_sha1(lua_State *L)
-{
+static int l_sha1(lua_State *L) {
     size_t size;
     const char *p_str = luaL_checklstring(L, 1, &size);
     unsigned char outdata[20] = {0x00};
@@ -534,8 +513,7 @@ static int l_sha1(lua_State *L)
     return 1;
 }
 
-static int l_reveng_models(lua_State *L)
-{
+static int l_reveng_models(lua_State *L) {
 
 // This array needs to be adjusted if RevEng adds more crc-models.
 #define NMODELS 105
@@ -569,8 +547,7 @@ static int l_reveng_models(lua_State *L)
 // endian    ,char,  'B','b','L','l','t','r' describing if Big-Endian or Little-Endian should be used in different combinations.
 //
 // outputs:  string with hex representation of the CRC result
-static int l_reveng_RunModel(lua_State *L)
-{
+static int l_reveng_RunModel(lua_State *L) {
     //-c || -v
     //inModel = valid model name string - CRC-8
     //inHexStr = input hex string to calculate crc on
@@ -593,8 +570,7 @@ static int l_reveng_RunModel(lua_State *L)
     return 1;
 }
 
-static int l_hardnested(lua_State *L)
-{
+static int l_hardnested(lua_State *L) {
 
     bool haveTarget = true;
     size_t size;
@@ -680,8 +656,7 @@ static int l_hardnested(lua_State *L)
  * @param L
  * @return
  */
-static int l_detect_prng(lua_State *L)
-{
+static int l_detect_prng(lua_State *L) {
     int res = detect_classic_prng();
     lua_pushinteger(L, res);
     return 1;
@@ -691,8 +666,7 @@ static int l_detect_prng(lua_State *L)
  * @param L
  * @return
  */
-static int l_keygen_algoD(lua_State *L)
-{
+static int l_keygen_algoD(lua_State *L) {
     size_t size;
     uint32_t tmp;
     const char *p_uid = luaL_checklstring(L, 1, &size);
@@ -721,8 +695,7 @@ static int l_keygen_algoD(lua_State *L)
  * @param path
  * @return
  */
-int setLuaPath(lua_State *L, const char *path)
-{
+int setLuaPath(lua_State *L, const char *path) {
     lua_getglobal(L, "package");
     lua_getfield(L, -1, "path");   // get field "path" from table at top of stack (-1)
     const char *cur_path = lua_tostring(L, -1);   // grab path string from top of stack
@@ -737,8 +710,7 @@ int setLuaPath(lua_State *L, const char *path)
     return 0; // all done!
 }
 
-int set_pm3_libraries(lua_State *L)
-{
+int set_pm3_libraries(lua_State *L) {
     static const luaL_Reg libs[] = {
         {"SendCommand",                 l_SendCommand},
         {"GetFromBigBuf",               l_GetFromBigBuf},
diff --git a/client/snooper.c b/client/snooper.c
index 66fa3d1b6..88a30edaa 100644
--- a/client/snooper.c
+++ b/client/snooper.c
@@ -17,8 +17,7 @@
         break;\
     }
 
-int main()
-{
+int main() {
     usb_init();
     SetLogFilename("snooper.log");
 
diff --git a/client/tinycbor/cbor.h b/client/tinycbor/cbor.h
index 6a39e5fe7..a71bbcde4 100644
--- a/client/tinycbor/cbor.h
+++ b/client/tinycbor/cbor.h
@@ -246,18 +246,15 @@ CBOR_API CborError cbor_encoder_create_map(CborEncoder *encoder, CborEncoder *ma
 CBOR_API CborError cbor_encoder_close_container(CborEncoder *encoder, const CborEncoder *containerEncoder);
 CBOR_API CborError cbor_encoder_close_container_checked(CborEncoder *encoder, const CborEncoder *containerEncoder);
 
-CBOR_INLINE_API uint8_t *_cbor_encoder_get_buffer_pointer(const CborEncoder *encoder)
-{
+CBOR_INLINE_API uint8_t *_cbor_encoder_get_buffer_pointer(const CborEncoder *encoder) {
     return encoder->data.ptr;
 }
 
-CBOR_INLINE_API size_t cbor_encoder_get_buffer_size(const CborEncoder *encoder, const uint8_t *buffer)
-{
+CBOR_INLINE_API size_t cbor_encoder_get_buffer_size(const CborEncoder *encoder, const uint8_t *buffer) {
     return (size_t)(encoder->data.ptr - buffer);
 }
 
-CBOR_INLINE_API size_t cbor_encoder_get_extra_bytes_needed(const CborEncoder *encoder)
-{
+CBOR_INLINE_API size_t cbor_encoder_get_extra_bytes_needed(const CborEncoder *encoder) {
     return encoder->end ? 0 : (size_t)encoder->data.bytes_needed;
 }
 
@@ -303,8 +300,7 @@ CBOR_API CborError cbor_value_enter_container(const CborValue *it, CborValue *re
 CBOR_API CborError cbor_value_leave_container(CborValue *it, const CborValue *recursed);
 
 CBOR_PRIVATE_API uint64_t _cbor_value_decode_int64_internal(const CborValue *value);
-CBOR_INLINE_API uint64_t _cbor_value_extract_int64_helper(const CborValue *value)
-{
+CBOR_INLINE_API uint64_t _cbor_value_extract_int64_helper(const CborValue *value) {
     return value->flags & CborIteratorFlag_IntegerValueTooLarge ?
            _cbor_value_decode_int64_internal(value) : value->extra;
 }
@@ -323,8 +319,7 @@ CBOR_INLINE_API bool cbor_value_is_undefined(const CborValue *value)
 /* Booleans */
 CBOR_INLINE_API bool cbor_value_is_boolean(const CborValue *value)
 { return value->type == CborBooleanType; }
-CBOR_INLINE_API CborError cbor_value_get_boolean(const CborValue *value, bool *result)
-{
+CBOR_INLINE_API CborError cbor_value_get_boolean(const CborValue *value, bool *result) {
     assert(cbor_value_is_boolean(value));
     *result = !!value->extra;
     return CborNoError;
@@ -333,8 +328,7 @@ CBOR_INLINE_API CborError cbor_value_get_boolean(const CborValue *value, bool *r
 /* Simple types */
 CBOR_INLINE_API bool cbor_value_is_simple_type(const CborValue *value)
 { return value->type == CborSimpleType; }
-CBOR_INLINE_API CborError cbor_value_get_simple_type(const CborValue *value, uint8_t *result)
-{
+CBOR_INLINE_API CborError cbor_value_get_simple_type(const CborValue *value, uint8_t *result) {
     assert(cbor_value_is_simple_type(value));
     *result = (uint8_t)value->extra;
     return CborNoError;
@@ -348,22 +342,19 @@ CBOR_INLINE_API bool cbor_value_is_unsigned_integer(const CborValue *value)
 CBOR_INLINE_API bool cbor_value_is_negative_integer(const CborValue *value)
 { return cbor_value_is_integer(value) && (value->flags & CborIteratorFlag_NegativeInteger); }
 
-CBOR_INLINE_API CborError cbor_value_get_raw_integer(const CborValue *value, uint64_t *result)
-{
+CBOR_INLINE_API CborError cbor_value_get_raw_integer(const CborValue *value, uint64_t *result) {
     assert(cbor_value_is_integer(value));
     *result = _cbor_value_extract_int64_helper(value);
     return CborNoError;
 }
 
-CBOR_INLINE_API CborError cbor_value_get_uint64(const CborValue *value, uint64_t *result)
-{
+CBOR_INLINE_API CborError cbor_value_get_uint64(const CborValue *value, uint64_t *result) {
     assert(cbor_value_is_unsigned_integer(value));
     *result = _cbor_value_extract_int64_helper(value);
     return CborNoError;
 }
 
-CBOR_INLINE_API CborError cbor_value_get_int64(const CborValue *value, int64_t *result)
-{
+CBOR_INLINE_API CborError cbor_value_get_int64(const CborValue *value, int64_t *result) {
     assert(cbor_value_is_integer(value));
     *result = (int64_t) _cbor_value_extract_int64_helper(value);
     if (value->flags & CborIteratorFlag_NegativeInteger)
@@ -371,8 +362,7 @@ CBOR_INLINE_API CborError cbor_value_get_int64(const CborValue *value, int64_t *
     return CborNoError;
 }
 
-CBOR_INLINE_API CborError cbor_value_get_int(const CborValue *value, int *result)
-{
+CBOR_INLINE_API CborError cbor_value_get_int(const CborValue *value, int *result) {
     assert(cbor_value_is_integer(value));
     *result = (int) _cbor_value_extract_int64_helper(value);
     if (value->flags & CborIteratorFlag_NegativeInteger)
@@ -389,8 +379,7 @@ CBOR_INLINE_API bool cbor_value_is_length_known(const CborValue *value)
 /* Tags */
 CBOR_INLINE_API bool cbor_value_is_tag(const CborValue *value)
 { return value->type == CborTagType; }
-CBOR_INLINE_API CborError cbor_value_get_tag(const CborValue *value, CborTag *result)
-{
+CBOR_INLINE_API CborError cbor_value_get_tag(const CborValue *value, CborTag *result) {
     assert(cbor_value_is_tag(value));
     *result = _cbor_value_extract_int64_helper(value);
     return CborNoError;
@@ -403,8 +392,7 @@ CBOR_INLINE_API bool cbor_value_is_byte_string(const CborValue *value)
 CBOR_INLINE_API bool cbor_value_is_text_string(const CborValue *value)
 { return value->type == CborTextStringType; }
 
-CBOR_INLINE_API CborError cbor_value_get_string_length(const CborValue *value, size_t *length)
-{
+CBOR_INLINE_API CborError cbor_value_get_string_length(const CborValue *value, size_t *length) {
     uint64_t v;
     assert(cbor_value_is_byte_string(value) || cbor_value_is_text_string(value));
     if (!cbor_value_is_length_known(value))
@@ -424,27 +412,23 @@ CBOR_PRIVATE_API CborError _cbor_value_dup_string(const CborValue *value, void *
 CBOR_API CborError cbor_value_calculate_string_length(const CborValue *value, size_t *length);
 
 CBOR_INLINE_API CborError cbor_value_copy_text_string(const CborValue *value, char *buffer,
-                                                      size_t *buflen, CborValue *next)
-{
+                                                      size_t *buflen, CborValue *next) {
     assert(cbor_value_is_text_string(value));
     return _cbor_value_copy_string(value, buffer, buflen, next);
 }
 CBOR_INLINE_API CborError cbor_value_copy_byte_string(const CborValue *value, uint8_t *buffer,
-                                                      size_t *buflen, CborValue *next)
-{
+                                                      size_t *buflen, CborValue *next) {
     assert(cbor_value_is_byte_string(value));
     return _cbor_value_copy_string(value, buffer, buflen, next);
 }
 
 CBOR_INLINE_API CborError cbor_value_dup_text_string(const CborValue *value, char **buffer,
-                                                     size_t *buflen, CborValue *next)
-{
+                                                     size_t *buflen, CborValue *next) {
     assert(cbor_value_is_text_string(value));
     return _cbor_value_dup_string(value, (void **)buffer, buflen, next);
 }
 CBOR_INLINE_API CborError cbor_value_dup_byte_string(const CborValue *value, uint8_t **buffer,
-                                                     size_t *buflen, CborValue *next)
-{
+                                                     size_t *buflen, CborValue *next) {
     assert(cbor_value_is_byte_string(value));
     return _cbor_value_dup_string(value, (void **)buffer, buflen, next);
 }
@@ -457,8 +441,7 @@ CBOR_INLINE_API bool cbor_value_is_array(const CborValue *value)
 CBOR_INLINE_API bool cbor_value_is_map(const CborValue *value)
 { return value->type == CborMapType; }
 
-CBOR_INLINE_API CborError cbor_value_get_array_length(const CborValue *value, size_t *length)
-{
+CBOR_INLINE_API CborError cbor_value_get_array_length(const CborValue *value, size_t *length) {
     uint64_t v;
     assert(cbor_value_is_array(value));
     if (!cbor_value_is_length_known(value))
@@ -470,8 +453,7 @@ CBOR_INLINE_API CborError cbor_value_get_array_length(const CborValue *value, si
     return CborNoError;
 }
 
-CBOR_INLINE_API CborError cbor_value_get_map_length(const CborValue *value, size_t *length)
-{
+CBOR_INLINE_API CborError cbor_value_get_map_length(const CborValue *value, size_t *length) {
     uint64_t v;
     assert(cbor_value_is_map(value));
     if (!cbor_value_is_length_known(value))
@@ -492,8 +474,7 @@ CBOR_API CborError cbor_value_get_half_float(const CborValue *value, void *resul
 
 CBOR_INLINE_API bool cbor_value_is_float(const CborValue *value)
 { return value->type == CborFloatType; }
-CBOR_INLINE_API CborError cbor_value_get_float(const CborValue *value, float *result)
-{
+CBOR_INLINE_API CborError cbor_value_get_float(const CborValue *value, float *result) {
     uint32_t data;
     assert(cbor_value_is_float(value));
     assert(value->flags & CborIteratorFlag_IntegerValueTooLarge);
@@ -504,8 +485,7 @@ CBOR_INLINE_API CborError cbor_value_get_float(const CborValue *value, float *re
 
 CBOR_INLINE_API bool cbor_value_is_double(const CborValue *value)
 { return value->type == CborDoubleType; }
-CBOR_INLINE_API CborError cbor_value_get_double(const CborValue *value, double *result)
-{
+CBOR_INLINE_API CborError cbor_value_get_double(const CborValue *value, double *result) {
     uint64_t data;
     assert(cbor_value_is_double(value));
     assert(value->flags & CborIteratorFlag_IntegerValueTooLarge);
@@ -587,8 +567,7 @@ CBOR_API CborError cbor_value_to_pretty_stream(CborStreamFunction streamFunction
 #if !defined(__STDC_HOSTED__) || __STDC_HOSTED__-0 == 1
 CBOR_API CborError cbor_value_to_pretty_advance_flags(FILE *out, CborValue *value, int flags);
 CBOR_API CborError cbor_value_to_pretty_advance(FILE *out, CborValue *value);
-CBOR_INLINE_API CborError cbor_value_to_pretty(FILE *out, const CborValue *value)
-{
+CBOR_INLINE_API CborError cbor_value_to_pretty(FILE *out, const CborValue *value) {
     CborValue copy = *value;
     return cbor_value_to_pretty_advance_flags(out, &copy, CborPrettyDefaultFlags);
 }
diff --git a/client/tinycbor/cborencoder.c b/client/tinycbor/cborencoder.c
index cd0399fc1..570319e67 100644
--- a/client/tinycbor/cborencoder.c
+++ b/client/tinycbor/cborencoder.c
@@ -200,16 +200,14 @@
  * buffer of size \a size. The \a flags field is currently unused and must be
  * zero.
  */
-void cbor_encoder_init(CborEncoder *encoder, uint8_t *buffer, size_t size, int flags)
-{
+void cbor_encoder_init(CborEncoder *encoder, uint8_t *buffer, size_t size, int flags) {
     encoder->data.ptr = buffer;
     encoder->end = buffer + size;
     encoder->remaining = 2;
     encoder->flags = flags;
 }
 
-static inline void put16(void *where, uint16_t v)
-{
+static inline void put16(void *where, uint16_t v) {
     v = cbor_htons(v);
     memcpy(where, &v, sizeof(v));
 }
@@ -219,42 +217,36 @@ static inline void put16(void *where, uint16_t v)
  * but if in the future, any function starts returning a non-OOM error, this will need
  * to be changed to the test.  At the moment, this is done to prevent more branches
  * being created in the tinycbor output */
-static inline bool isOomError(CborError err)
-{
+static inline bool isOomError(CborError err) {
     (void) err;
     return true;
 }
 
-static inline void put32(void *where, uint32_t v)
-{
+static inline void put32(void *where, uint32_t v) {
     v = cbor_htonl(v);
     memcpy(where, &v, sizeof(v));
 }
 
-static inline void put64(void *where, uint64_t v)
-{
+static inline void put64(void *where, uint64_t v) {
     v = cbor_htonll(v);
     memcpy(where, &v, sizeof(v));
 }
 
-static inline bool would_overflow(CborEncoder *encoder, size_t len)
-{
+static inline bool would_overflow(CborEncoder *encoder, size_t len) {
     ptrdiff_t remaining = (ptrdiff_t)encoder->end;
     remaining -= remaining ? (ptrdiff_t)encoder->data.ptr : encoder->data.bytes_needed;
     remaining -= (ptrdiff_t)len;
     return unlikely(remaining < 0);
 }
 
-static inline void advance_ptr(CborEncoder *encoder, size_t n)
-{
+static inline void advance_ptr(CborEncoder *encoder, size_t n) {
     if (encoder->end)
         encoder->data.ptr += n;
     else
         encoder->data.bytes_needed += n;
 }
 
-static inline CborError append_to_buffer(CborEncoder *encoder, const void *data, size_t len)
-{
+static inline CborError append_to_buffer(CborEncoder *encoder, const void *data, size_t len) {
     if (would_overflow(encoder, len)) {
         if (encoder->end != NULL) {
             len -= encoder->end - encoder->data.ptr;
@@ -271,13 +263,11 @@ static inline CborError append_to_buffer(CborEncoder *encoder, const void *data,
     return CborNoError;
 }
 
-static inline CborError append_byte_to_buffer(CborEncoder *encoder, uint8_t byte)
-{
+static inline CborError append_byte_to_buffer(CborEncoder *encoder, uint8_t byte) {
     return append_to_buffer(encoder, &byte, 1);
 }
 
-static inline CborError encode_number_no_update(CborEncoder *encoder, uint64_t ui, uint8_t shiftedMajorType)
-{
+static inline CborError encode_number_no_update(CborEncoder *encoder, uint64_t ui, uint8_t shiftedMajorType) {
     /* Little-endian would have been so much more convenient here:
      * We could just write at the beginning of buf but append_to_buffer
      * only the necessary bytes.
@@ -305,14 +295,12 @@ static inline CborError encode_number_no_update(CborEncoder *encoder, uint64_t u
     return append_to_buffer(encoder, bufstart, bufend - bufstart);
 }
 
-static inline void saturated_decrement(CborEncoder *encoder)
-{
+static inline void saturated_decrement(CborEncoder *encoder) {
     if (encoder->remaining)
         --encoder->remaining;
 }
 
-static inline CborError encode_number(CborEncoder *encoder, uint64_t ui, uint8_t shiftedMajorType)
-{
+static inline CborError encode_number(CborEncoder *encoder, uint64_t ui, uint8_t shiftedMajorType) {
     saturated_decrement(encoder);
     return encode_number_no_update(encoder, ui, shiftedMajorType);
 }
@@ -323,8 +311,7 @@ static inline CborError encode_number(CborEncoder *encoder, uint64_t ui, uint8_t
  *
  * \sa cbor_encode_negative_int, cbor_encode_int
  */
-CborError cbor_encode_uint(CborEncoder *encoder, uint64_t value)
-{
+CborError cbor_encode_uint(CborEncoder *encoder, uint64_t value) {
     return encode_number(encoder, value, UnsignedIntegerType << MajorTypeShift);
 }
 
@@ -336,8 +323,7 @@ CborError cbor_encode_uint(CborEncoder *encoder, uint64_t value)
  *
  * \sa cbor_encode_uint, cbor_encode_int
  */
-CborError cbor_encode_negative_int(CborEncoder *encoder, uint64_t absolute_value)
-{
+CborError cbor_encode_negative_int(CborEncoder *encoder, uint64_t absolute_value) {
     return encode_number(encoder, absolute_value - 1, NegativeIntegerType << MajorTypeShift);
 }
 
@@ -347,8 +333,7 @@ CborError cbor_encode_negative_int(CborEncoder *encoder, uint64_t absolute_value
  *
  * \sa cbor_encode_negative_int, cbor_encode_uint
  */
-CborError cbor_encode_int(CborEncoder *encoder, int64_t value)
-{
+CborError cbor_encode_int(CborEncoder *encoder, int64_t value) {
     /* adapted from code in RFC 7049 appendix C (pseudocode) */
     uint64_t ui = value >> 63;              /* extend sign to whole length */
     uint8_t majorType = ui & 0x20;          /* extract major type */
@@ -363,8 +348,7 @@ CborError cbor_encode_int(CborEncoder *encoder, int64_t value)
  * This function may return error CborErrorIllegalSimpleType if the \a value
  * variable contains a number that is not a valid simple type.
  */
-CborError cbor_encode_simple_value(CborEncoder *encoder, uint8_t value)
-{
+CborError cbor_encode_simple_value(CborEncoder *encoder, uint8_t value) {
 #ifndef CBOR_ENCODER_NO_CHECK_USER
     /* check if this is a valid simple type */
     if (value >= HalfPrecisionFloat && value <= Break)
@@ -384,8 +368,7 @@ CborError cbor_encode_simple_value(CborEncoder *encoder, uint8_t value)
  *
  * \sa cbor_encode_half_float, cbor_encode_float, cbor_encode_double
  */
-CborError cbor_encode_floating_point(CborEncoder *encoder, CborType fpType, const void *value)
-{
+CborError cbor_encode_floating_point(CborEncoder *encoder, CborType fpType, const void *value) {
     unsigned size;
     uint8_t buf[1 + sizeof(uint64_t)];
     cbor_assert(fpType == CborHalfFloatType || fpType == CborFloatType || fpType == CborDoubleType);
@@ -407,14 +390,12 @@ CborError cbor_encode_floating_point(CborEncoder *encoder, CborType fpType, cons
  *
  * \sa CborTag
  */
-CborError cbor_encode_tag(CborEncoder *encoder, CborTag tag)
-{
+CborError cbor_encode_tag(CborEncoder *encoder, CborTag tag) {
     /* tags don't count towards the number of elements in an array or map */
     return encode_number_no_update(encoder, tag, TagType << MajorTypeShift);
 }
 
-static CborError encode_string(CborEncoder *encoder, size_t length, uint8_t shiftedMajorType, const void *string)
-{
+static CborError encode_string(CborEncoder *encoder, size_t length, uint8_t shiftedMajorType, const void *string) {
     CborError err = encode_number(encoder, length, shiftedMajorType);
     if (err && !isOomError(err))
         return err;
@@ -439,8 +420,7 @@ static CborError encode_string(CborEncoder *encoder, size_t length, uint8_t shif
  *
  * \sa CborError cbor_encode_text_stringz, cbor_encode_byte_string
  */
-CborError cbor_encode_byte_string(CborEncoder *encoder, const uint8_t *string, size_t length)
-{
+CborError cbor_encode_byte_string(CborEncoder *encoder, const uint8_t *string, size_t length) {
     return encode_string(encoder, length, ByteStringType << MajorTypeShift, string);
 }
 
@@ -450,16 +430,14 @@ CborError cbor_encode_byte_string(CborEncoder *encoder, const uint8_t *string, s
  *
  * \sa cbor_encode_text_stringz, cbor_encode_text_string
  */
-CborError cbor_encode_text_string(CborEncoder *encoder, const char *string, size_t length)
-{
+CborError cbor_encode_text_string(CborEncoder *encoder, const char *string, size_t length) {
     return encode_string(encoder, length, TextStringType << MajorTypeShift, string);
 }
 
 #ifdef __GNUC__
 __attribute__((noinline))
 #endif
-static CborError create_container(CborEncoder *encoder, CborEncoder *container, size_t length, uint8_t shiftedMajorType)
-{
+static CborError create_container(CborEncoder *encoder, CborEncoder *container, size_t length, uint8_t shiftedMajorType) {
     CborError err;
     container->data.ptr = encoder->data.ptr;
     container->end = encoder->end;
@@ -495,8 +473,7 @@ static CborError create_container(CborEncoder *encoder, CborEncoder *container,
  *
  * \sa cbor_encoder_create_map
  */
-CborError cbor_encoder_create_array(CborEncoder *encoder, CborEncoder *arrayEncoder, size_t length)
-{
+CborError cbor_encoder_create_array(CborEncoder *encoder, CborEncoder *arrayEncoder, size_t length) {
     return create_container(encoder, arrayEncoder, length, ArrayType << MajorTypeShift);
 }
 
@@ -519,8 +496,7 @@ CborError cbor_encoder_create_array(CborEncoder *encoder, CborEncoder *arrayEnco
  *
  * \sa cbor_encoder_create_array
  */
-CborError cbor_encoder_create_map(CborEncoder *encoder, CborEncoder *mapEncoder, size_t length)
-{
+CborError cbor_encoder_create_map(CborEncoder *encoder, CborEncoder *mapEncoder, size_t length) {
     if (length != CborIndefiniteLength && length > SIZE_MAX / 2)
         return CborErrorDataTooLarge;
     return create_container(encoder, mapEncoder, length, MapType << MajorTypeShift);
@@ -538,8 +514,7 @@ CborError cbor_encoder_create_map(CborEncoder *encoder, CborEncoder *mapEncoder,
  *
  * \sa cbor_encoder_create_array(), cbor_encoder_create_map()
  */
-CborError cbor_encoder_close_container(CborEncoder *encoder, const CborEncoder *containerEncoder)
-{
+CborError cbor_encoder_close_container(CborEncoder *encoder, const CborEncoder *containerEncoder) {
     if (encoder->end)
         encoder->data.ptr = containerEncoder->data.ptr;
     else
diff --git a/client/tinycbor/cborencoder_close_container_checked.c b/client/tinycbor/cborencoder_close_container_checked.c
index 5661e4d53..3943f71d8 100644
--- a/client/tinycbor/cborencoder_close_container_checked.c
+++ b/client/tinycbor/cborencoder_close_container_checked.c
@@ -49,8 +49,7 @@
  *
  * \sa cbor_encoder_create_array(), cbor_encoder_create_map()
  */
-CborError cbor_encoder_close_container_checked(CborEncoder *encoder, const CborEncoder *containerEncoder)
-{
+CborError cbor_encoder_close_container_checked(CborEncoder *encoder, const CborEncoder *containerEncoder) {
     return cbor_encoder_close_container(encoder, containerEncoder);
 }
 
diff --git a/client/tinycbor/cborerrorstrings.c b/client/tinycbor/cborerrorstrings.c
index 2ee8f55e3..c37d05ac1 100644
--- a/client/tinycbor/cborerrorstrings.c
+++ b/client/tinycbor/cborerrorstrings.c
@@ -77,8 +77,7 @@
  * \ingroup CborGlobals
  * Returns the error string corresponding to the CBOR error condition \a error.
  */
-const char *cbor_error_string(CborError error)
-{
+const char *cbor_error_string(CborError error) {
     switch (error) {
         case CborNoError:
             return "";
diff --git a/client/tinycbor/cborinternal_p.h b/client/tinycbor/cborinternal_p.h
index f971cf8ab..8609ce2ad 100644
--- a/client/tinycbor/cborinternal_p.h
+++ b/client/tinycbor/cborinternal_p.h
@@ -39,18 +39,15 @@
 #ifndef CBOR_NO_HALF_FLOAT_TYPE
 #  ifdef __F16C__
 #    include <immintrin.h>
-static inline unsigned short encode_half(double val)
-{
+static inline unsigned short encode_half(double val) {
     return _cvtss_sh((float)val, 3);
 }
-static inline double decode_half(unsigned short half)
-{
+static inline double decode_half(unsigned short half) {
     return _cvtsh_ss(half);
 }
 #  else
 /* software implementation of float-to-fp16 conversions */
-static inline unsigned short encode_half(double val)
-{
+static inline unsigned short encode_half(double val) {
     uint64_t v;
     int sign, exp, mant;
     memcpy(&v, &val, sizeof(v));
@@ -83,8 +80,7 @@ static inline unsigned short encode_half(double val)
 }
 
 /* this function was copied & adapted from RFC 7049 Appendix D */
-static inline double decode_half(unsigned short half)
-{
+static inline double decode_half(unsigned short half) {
     int exp = (half >> 10) & 0x1f;
     int mant = half & 0x3ff;
     double val;
diff --git a/client/tinycbor/cborjson.h b/client/tinycbor/cborjson.h
index a88a80e8c..f7abbd2ff 100644
--- a/client/tinycbor/cborjson.h
+++ b/client/tinycbor/cborjson.h
@@ -47,8 +47,7 @@ enum CborToJsonFlags {
 };
 
 CBOR_API CborError cbor_value_to_json_advance(FILE *out, CborValue *value, int flags);
-CBOR_INLINE_API CborError cbor_value_to_json(FILE *out, const CborValue *value, int flags)
-{
+CBOR_INLINE_API CborError cbor_value_to_json(FILE *out, const CborValue *value, int flags) {
     CborValue copy = *value;
     return cbor_value_to_json_advance(out, &copy, flags);
 }
diff --git a/client/tinycbor/cborparser.c b/client/tinycbor/cborparser.c
index 18ba60897..23e87f98a 100644
--- a/client/tinycbor/cborparser.c
+++ b/client/tinycbor/cborparser.c
@@ -142,29 +142,25 @@
  * \endif
  */
 
-static inline uint16_t get16(const uint8_t *ptr)
-{
+static inline uint16_t get16(const uint8_t *ptr) {
     uint16_t result;
     memcpy(&result, ptr, sizeof(result));
     return cbor_ntohs(result);
 }
 
-static inline uint32_t get32(const uint8_t *ptr)
-{
+static inline uint32_t get32(const uint8_t *ptr) {
     uint32_t result;
     memcpy(&result, ptr, sizeof(result));
     return cbor_ntohl(result);
 }
 
-static inline uint64_t get64(const uint8_t *ptr)
-{
+static inline uint64_t get64(const uint8_t *ptr) {
     uint64_t result;
     memcpy(&result, ptr, sizeof(result));
     return cbor_ntohll(result);
 }
 
-CborError CBOR_INTERNAL_API_CC _cbor_value_extract_number(const uint8_t **ptr, const uint8_t *end, uint64_t *len)
-{
+CborError CBOR_INTERNAL_API_CC _cbor_value_extract_number(const uint8_t **ptr, const uint8_t *end, uint64_t *len) {
     size_t bytesNeeded;
     uint8_t additional_information = **ptr & SmallValueMask;
     ++*ptr;
@@ -191,8 +187,7 @@ CborError CBOR_INTERNAL_API_CC _cbor_value_extract_number(const uint8_t **ptr, c
     return CborNoError;
 }
 
-static CborError extract_length(const CborParser *parser, const uint8_t **ptr, size_t *len)
-{
+static CborError extract_length(const CborParser *parser, const uint8_t **ptr, size_t *len) {
     uint64_t v;
     CborError err = _cbor_value_extract_number(ptr, parser->end, &v);
     if (err) {
@@ -206,14 +201,12 @@ static CborError extract_length(const CborParser *parser, const uint8_t **ptr, s
     return CborNoError;
 }
 
-static bool is_fixed_type(uint8_t type)
-{
+static bool is_fixed_type(uint8_t type) {
     return type != CborTextStringType && type != CborByteStringType && type != CborArrayType &&
            type != CborMapType;
 }
 
-static CborError preparse_value(CborValue *it)
-{
+static CborError preparse_value(CborValue *it) {
     const CborParser *parser = it->parser;
     it->type = CborInvalidType;
 
@@ -298,8 +291,7 @@ static CborError preparse_value(CborValue *it)
     return CborNoError;
 }
 
-static CborError preparse_next_value_nodecrement(CborValue *it)
-{
+static CborError preparse_next_value_nodecrement(CborValue *it) {
     if (it->remaining == UINT32_MAX && it->ptr != it->parser->end && *it->ptr == (uint8_t)BreakByte) {
         /* end of map or array */
         ++it->ptr;
@@ -311,8 +303,7 @@ static CborError preparse_next_value_nodecrement(CborValue *it)
     return preparse_value(it);
 }
 
-static CborError preparse_next_value(CborValue *it)
-{
+static CborError preparse_next_value(CborValue *it) {
     if (it->remaining != UINT32_MAX) {
         /* don't decrement the item count if the current item is tag: they don't count */
         if (it->type != CborTagType && --it->remaining == 0) {
@@ -323,8 +314,7 @@ static CborError preparse_next_value(CborValue *it)
     return preparse_next_value_nodecrement(it);
 }
 
-static CborError advance_internal(CborValue *it)
-{
+static CborError advance_internal(CborValue *it) {
     uint64_t length;
     CborError err = _cbor_value_extract_number(&it->ptr, it->parser->end, &length);
     cbor_assert(err == CborNoError);
@@ -348,8 +338,7 @@ static CborError advance_internal(CborValue *it)
  * point values (SinglePrecisionFloat == Value32Bit and DoublePrecisionFloat ==
  * Value64Bit).
  */
-uint64_t _cbor_value_decode_int64_internal(const CborValue *value)
-{
+uint64_t _cbor_value_decode_int64_internal(const CborValue *value) {
     cbor_assert(value->flags & CborIteratorFlag_IntegerValueTooLarge ||
                 value->type == CborFloatType || value->type == CborDoubleType);
 
@@ -373,8 +362,7 @@ uint64_t _cbor_value_decode_int64_internal(const CborValue *value)
  * threads iterating at the same time, but the object can be copied so multiple
  * threads can iterate.
  */
-CborError cbor_parser_init(const uint8_t *buffer, size_t size, uint32_t flags, CborParser *parser, CborValue *it)
-{
+CborError cbor_parser_init(const uint8_t *buffer, size_t size, uint32_t flags, CborParser *parser, CborValue *it) {
     memset(parser, 0, sizeof(*parser));
     parser->end = buffer + size;
     parser->flags = flags;
@@ -448,8 +436,7 @@ CborError cbor_parser_init(const uint8_t *buffer, size_t size, uint32_t flags, C
  *
  * \sa cbor_value_validate(), cbor_value_advance()
  */
-CborError cbor_value_validate_basic(const CborValue *it)
-{
+CborError cbor_value_validate_basic(const CborValue *it) {
     CborValue value = *it;
     return cbor_value_advance(&value);
 }
@@ -469,8 +456,7 @@ CborError cbor_value_validate_basic(const CborValue *it)
  *
  * \sa cbor_value_at_end(), cbor_value_advance(), cbor_value_enter_container(), cbor_value_leave_container()
  */
-CborError cbor_value_advance_fixed(CborValue *it)
-{
+CborError cbor_value_advance_fixed(CborValue *it) {
     cbor_assert(it->type != CborInvalidType);
     cbor_assert(is_fixed_type(it->type));
     if (!it->remaining)
@@ -478,8 +464,7 @@ CborError cbor_value_advance_fixed(CborValue *it)
     return advance_internal(it);
 }
 
-static CborError advance_recursive(CborValue *it, int nestingLevel)
-{
+static CborError advance_recursive(CborValue *it, int nestingLevel) {
     CborError err;
     CborValue recursed;
 
@@ -521,8 +506,7 @@ static CborError advance_recursive(CborValue *it, int nestingLevel)
  *
  * \sa cbor_value_at_end(), cbor_value_advance_fixed(), cbor_value_enter_container(), cbor_value_leave_container()
  */
-CborError cbor_value_advance(CborValue *it)
-{
+CborError cbor_value_advance(CborValue *it) {
     cbor_assert(it->type != CborInvalidType);
     if (!it->remaining)
         return CborErrorAdvancePastEOF;
@@ -557,8 +541,7 @@ CborError cbor_value_advance(CborValue *it)
  *
  * \sa cbor_value_advance_fixed(), cbor_value_advance()
  */
-CborError cbor_value_skip_tag(CborValue *it)
-{
+CborError cbor_value_skip_tag(CborValue *it) {
     while (cbor_value_is_tag(it)) {
         CborError err = cbor_value_advance_fixed(it);
         if (err)
@@ -584,8 +567,7 @@ CborError cbor_value_skip_tag(CborValue *it)
  *
  * \sa cbor_value_is_container(), cbor_value_leave_container(), cbor_value_advance()
  */
-CborError cbor_value_enter_container(const CborValue *it, CborValue *recursed)
-{
+CborError cbor_value_enter_container(const CborValue *it, CborValue *recursed) {
     cbor_assert(cbor_value_is_container(it));
     *recursed = *it;
 
@@ -633,8 +615,7 @@ CborError cbor_value_enter_container(const CborValue *it, CborValue *recursed)
  *
  * \sa cbor_value_enter_container(), cbor_value_at_end()
  */
-CborError cbor_value_leave_container(CborValue *it, const CborValue *recursed)
-{
+CborError cbor_value_leave_container(CborValue *it, const CborValue *recursed) {
     cbor_assert(cbor_value_is_container(it));
     cbor_assert(recursed->type == CborInvalidType);
     it->ptr = recursed->ptr;
@@ -815,8 +796,7 @@ CborError cbor_value_leave_container(CborValue *it, const CborValue *recursed)
  *
  * \sa cbor_value_get_type(), cbor_value_is_valid(), cbor_value_is_integer(), cbor_value_get_int64()
  */
-CborError cbor_value_get_int64_checked(const CborValue *value, int64_t *result)
-{
+CborError cbor_value_get_int64_checked(const CborValue *value, int64_t *result) {
     uint64_t v;
     cbor_assert(cbor_value_is_integer(value));
     v = _cbor_value_extract_int64_helper(value);
@@ -855,8 +835,7 @@ CborError cbor_value_get_int64_checked(const CborValue *value, int64_t *result)
  * \sa cbor_value_get_type(), cbor_value_is_valid(), cbor_value_is_integer(), cbor_value_get_int64(),
  *     cbor_value_get_uint64(), cbor_value_get_int64_checked(), cbor_value_get_raw_integer()
  */
-CborError cbor_value_get_int_checked(const CborValue *value, int *result)
-{
+CborError cbor_value_get_int_checked(const CborValue *value, int *result) {
     uint64_t v;
     cbor_assert(cbor_value_is_integer(value));
     v = _cbor_value_extract_int64_helper(value);
@@ -966,14 +945,12 @@ CborError cbor_value_get_int_checked(const CborValue *value, int *result)
  *
  * \sa cbor_value_get_string_length(), cbor_value_copy_text_string(), cbor_value_copy_byte_string(), cbor_value_is_length_known()
  */
-CborError cbor_value_calculate_string_length(const CborValue *value, size_t *len)
-{
+CborError cbor_value_calculate_string_length(const CborValue *value, size_t *len) {
     *len = SIZE_MAX;
     return _cbor_value_copy_string(value, NULL, len, NULL);
 }
 
-static inline void prepare_string_iteration(CborValue *it)
-{
+static inline void prepare_string_iteration(CborValue *it) {
     if (!cbor_value_is_length_known(it)) {
         /* chunked string: we're before the first chunk;
          * advance to the first chunk */
@@ -982,8 +959,7 @@ static inline void prepare_string_iteration(CborValue *it)
     }
 }
 
-CborError CBOR_INTERNAL_API_CC _cbor_value_prepare_string_iteration(CborValue *it)
-{
+CborError CBOR_INTERNAL_API_CC _cbor_value_prepare_string_iteration(CborValue *it) {
     cbor_assert((it->flags & CborIteratorFlag_IteratingStringChunks) == 0);
     prepare_string_iteration(it);
 
@@ -993,8 +969,7 @@ CborError CBOR_INTERNAL_API_CC _cbor_value_prepare_string_iteration(CborValue *i
     return CborNoError;
 }
 
-static CborError get_string_chunk(CborValue *it, const void **bufferptr, size_t *len)
-{
+static CborError get_string_chunk(CborValue *it, const void **bufferptr, size_t *len) {
     CborError err;
 
     /* Possible states:
@@ -1044,8 +1019,7 @@ last_chunk:
 
 CborError CBOR_INTERNAL_API_CC
 _cbor_value_get_string_chunk(const CborValue *value, const void **bufferptr,
-                             size_t *len, CborValue *next)
-{
+                             size_t *len, CborValue *next) {
     CborValue tmp;
     if (!next)
         next = &tmp;
@@ -1059,27 +1033,23 @@ _cbor_value_get_string_chunk(const CborValue *value, const void **bufferptr,
  * only. */
 typedef uintptr_t (*IterateFunction)(char *, const uint8_t *, size_t);
 
-static uintptr_t iterate_noop(char *dest, const uint8_t *src, size_t len)
-{
+static uintptr_t iterate_noop(char *dest, const uint8_t *src, size_t len) {
     (void)dest;
     (void)src;
     (void)len;
     return true;
 }
 
-static uintptr_t iterate_memcmp(char *s1, const uint8_t *s2, size_t len)
-{
+static uintptr_t iterate_memcmp(char *s1, const uint8_t *s2, size_t len) {
     return memcmp(s1, (const char *)s2, len) == 0;
 }
 
-static uintptr_t iterate_memcpy(char *dest, const uint8_t *src, size_t len)
-{
+static uintptr_t iterate_memcpy(char *dest, const uint8_t *src, size_t len) {
     return (uintptr_t)memcpy(dest, src, len);
 }
 
 static CborError iterate_string_chunks(const CborValue *value, char *buffer, size_t *buflen,
-                                       bool *result, CborValue *next, IterateFunction func)
-{
+                                       bool *result, CborValue *next, IterateFunction func) {
     CborError err;
     CborValue tmp;
     size_t total = 0;
@@ -1189,8 +1159,7 @@ static CborError iterate_string_chunks(const CborValue *value, char *buffer, siz
  */
 
 CborError _cbor_value_copy_string(const CborValue *value, void *buffer,
-                                  size_t *buflen, CborValue *next)
-{
+                                  size_t *buflen, CborValue *next) {
     bool copied_all;
     CborError err = iterate_string_chunks(value, (char *)buffer, buflen, &copied_all, next,
                                           buffer ? iterate_memcpy : iterate_noop);
@@ -1216,8 +1185,7 @@ CborError _cbor_value_copy_string(const CborValue *value, void *buffer,
  *
  * \sa cbor_value_skip_tag(), cbor_value_copy_text_string()
  */
-CborError cbor_value_text_string_equals(const CborValue *value, const char *string, bool *result)
-{
+CborError cbor_value_text_string_equals(const CborValue *value, const char *string, bool *result) {
     size_t len;
     CborValue copy = *value;
     CborError err = cbor_value_skip_tag(&copy);
@@ -1304,8 +1272,7 @@ CborError cbor_value_text_string_equals(const CborValue *value, const char *stri
  *
  * \sa cbor_value_is_valid(), cbor_value_text_string_equals(), cbor_value_advance()
  */
-CborError cbor_value_map_find_value(const CborValue *map, const char *string, CborValue *element)
-{
+CborError cbor_value_map_find_value(const CborValue *map, const char *string, CborValue *element) {
     CborError err;
     size_t len = strlen(string);
     cbor_assert(cbor_value_is_map(map));
@@ -1416,8 +1383,7 @@ error:
  *
  * \sa cbor_value_get_type(), cbor_value_is_valid(), cbor_value_is_half_float(), cbor_value_get_float()
  */
-CborError cbor_value_get_half_float(const CborValue *value, void *result)
-{
+CborError cbor_value_get_half_float(const CborValue *value, void *result) {
     uint16_t v;
     cbor_assert(cbor_value_is_half_float(value));
 
diff --git a/client/tinycbor/cborparser_dup_string.c b/client/tinycbor/cborparser_dup_string.c
index 202cd2022..b011c4e18 100644
--- a/client/tinycbor/cborparser_dup_string.c
+++ b/client/tinycbor/cborparser_dup_string.c
@@ -94,8 +94,7 @@
  *
  * \sa cbor_value_get_text_string_chunk(), cbor_value_copy_byte_string(), cbor_value_dup_text_string()
  */
-CborError _cbor_value_dup_string(const CborValue *value, void **buffer, size_t *buflen, CborValue *next)
-{
+CborError _cbor_value_dup_string(const CborValue *value, void **buffer, size_t *buflen, CborValue *next) {
     CborError err;
     cbor_assert(buffer);
     cbor_assert(buflen);
diff --git a/client/tinycbor/cborpretty.c b/client/tinycbor/cborpretty.c
index c0e9726b9..775d90925 100644
--- a/client/tinycbor/cborpretty.c
+++ b/client/tinycbor/cborpretty.c
@@ -145,8 +145,7 @@
  */
 
 #ifndef CBOR_NO_FLOATING_POINT
-static inline bool convertToUint64(double v, uint64_t *absolute)
-{
+static inline bool convertToUint64(double v, uint64_t *absolute) {
     double supremum;
     v = fabs(v);
 
@@ -177,13 +176,11 @@ static inline bool convertToUint64(double v, uint64_t *absolute)
 }
 #endif
 
-static void printRecursionLimit(CborStreamFunction stream, void *out)
-{
+static void printRecursionLimit(CborStreamFunction stream, void *out) {
     stream(out, "<nesting too deep, recursion stopped>");
 }
 
-static CborError hexDump(CborStreamFunction stream, void *out, const void *ptr, size_t n)
-{
+static CborError hexDump(CborStreamFunction stream, void *out, const void *ptr, size_t n) {
     const uint8_t *buffer = (const uint8_t *)ptr;
     CborError err = CborNoError;
     while (n-- && !err)
@@ -194,8 +191,7 @@ static CborError hexDump(CborStreamFunction stream, void *out, const void *ptr,
 
 /* This function decodes buffer as UTF-8 and prints as escaped UTF-16.
  * On UTF-8 decoding error, it returns CborErrorInvalidUtf8TextString */
-static CborError utf8EscapedDump(CborStreamFunction stream, void *out, const void *ptr, size_t n)
-{
+static CborError utf8EscapedDump(CborStreamFunction stream, void *out, const void *ptr, size_t n) {
     const uint8_t *buffer = (const uint8_t *)ptr;
     const uint8_t *const end = buffer + n;
     CborError err = CborNoError;
@@ -255,8 +251,7 @@ print_utf16:
     return err;
 }
 
-static const char *resolve_indicator(const uint8_t *ptr, const uint8_t *end, int flags)
-{
+static const char *resolve_indicator(const uint8_t *ptr, const uint8_t *end, int flags) {
     static const char indicators[8][3] = {
         "_0", "_1", "_2", "_3",
         "", "", "",             /* these are not possible */
@@ -277,7 +272,7 @@ static const char *resolve_indicator(const uint8_t *ptr, const uint8_t *end, int
 
     /* determine whether to show anything */
     if ((flags & CborPrettyIndicateIndeterminateLength) &&
-        additional_information == IndefiniteLength)
+            additional_information == IndefiniteLength)
         return indicators[IndefiniteLength - Value8Bit];
     if ((flags & CborPrettyIndicateOverlongNumbers) == 0)
         return no_indicator;
@@ -300,15 +295,13 @@ static const char *resolve_indicator(const uint8_t *ptr, const uint8_t *end, int
            indicators[additional_information - Value8Bit];
 }
 
-static const char *get_indicator(const CborValue *it, int flags)
-{
+static const char *get_indicator(const CborValue *it, int flags) {
     return resolve_indicator(it->ptr, it->parser->end, flags);
 }
 
 static CborError value_to_pretty(CborStreamFunction stream, void *out, CborValue *it, int flags, int recursionsLeft);
 static CborError container_to_pretty(CborStreamFunction stream, void *out, CborValue *it, CborType containerType,
-                                     int flags, int recursionsLeft)
-{
+                                     int flags, int recursionsLeft) {
     const char *comma = "";
     CborError err = CborNoError;
 
@@ -336,8 +329,7 @@ static CborError container_to_pretty(CborStreamFunction stream, void *out, CborV
     return err;
 }
 
-static CborError value_to_pretty(CborStreamFunction stream, void *out, CborValue *it, int flags, int recursionsLeft)
-{
+static CborError value_to_pretty(CborStreamFunction stream, void *out, CborValue *it, int flags, int recursionsLeft) {
     CborError err = CborNoError;
     CborType type = cbor_value_get_type(it);
     switch (type) {
@@ -570,8 +562,7 @@ static CborError value_to_pretty(CborStreamFunction stream, void *out, CborValue
  *
  * \sa cbor_value_to_pretty(), cbor_value_to_json_advance()
  */
-CborError cbor_value_to_pretty_stream(CborStreamFunction streamFunction, void *token, CborValue *value, int flags)
-{
+CborError cbor_value_to_pretty_stream(CborStreamFunction streamFunction, void *token, CborValue *value, int flags) {
     return value_to_pretty(streamFunction, token, value, flags, CBOR_PARSER_MAX_RECURSIONS);
 }
 
diff --git a/client/tinycbor/cborpretty_stdio.c b/client/tinycbor/cborpretty_stdio.c
index 20131850c..978ae9054 100644
--- a/client/tinycbor/cborpretty_stdio.c
+++ b/client/tinycbor/cborpretty_stdio.c
@@ -26,8 +26,7 @@
 #include <stdarg.h>
 #include <stdio.h>
 
-static CborError cbor_fprintf(void *out, const char *fmt, ...)
-{
+static CborError cbor_fprintf(void *out, const char *fmt, ...) {
     int n;
 
     va_list list;
@@ -60,8 +59,7 @@ static CborError cbor_fprintf(void *out, const char *fmt, ...)
  *
  * \sa cbor_value_to_pretty(), cbor_value_to_pretty_stream(), cbor_value_to_json_advance()
  */
-CborError cbor_value_to_pretty_advance(FILE *out, CborValue *value)
-{
+CborError cbor_value_to_pretty_advance(FILE *out, CborValue *value) {
     return cbor_value_to_pretty_stream(cbor_fprintf, out, value, CborPrettyDefaultFlags);
 }
 
@@ -80,8 +78,7 @@ CborError cbor_value_to_pretty_advance(FILE *out, CborValue *value)
  *
  * \sa cbor_value_to_pretty_stream(), cbor_value_to_pretty(), cbor_value_to_json_advance()
  */
-CborError cbor_value_to_pretty_advance_flags(FILE *out, CborValue *value, int flags)
-{
+CborError cbor_value_to_pretty_advance_flags(FILE *out, CborValue *value, int flags) {
     return cbor_value_to_pretty_stream(cbor_fprintf, out, value, flags);
 }
 
diff --git a/client/tinycbor/cbortojson.c b/client/tinycbor/cbortojson.c
index 38c4a7851..533e6a721 100644
--- a/client/tinycbor/cbortojson.c
+++ b/client/tinycbor/cbortojson.c
@@ -167,8 +167,7 @@ typedef struct ConversionStatus {
 
 static CborError value_to_json(FILE *out, CborValue *it, int flags, CborType type, ConversionStatus *status);
 
-static CborError dump_bytestring_base16(char **result, CborValue *it)
-{
+static CborError dump_bytestring_base16(char **result, CborValue *it) {
     static const char characters[] = "0123456789abcdef";
     size_t i;
     size_t n = 0;
@@ -194,8 +193,7 @@ static CborError dump_bytestring_base16(char **result, CborValue *it)
     return CborNoError;
 }
 
-static CborError generic_dump_base64(char **result, CborValue *it, const char alphabet[65])
-{
+static CborError generic_dump_base64(char **result, CborValue *it, const char alphabet[65]) {
     size_t n = 0, i;
     uint8_t *buffer, *out, *in;
     CborError err = cbor_value_calculate_string_length(it, &n);
@@ -267,22 +265,19 @@ static CborError generic_dump_base64(char **result, CborValue *it, const char al
     return CborNoError;
 }
 
-static CborError dump_bytestring_base64(char **result, CborValue *it)
-{
+static CborError dump_bytestring_base64(char **result, CborValue *it) {
     static const char alphabet[] = "ABCDEFGH" "IJKLMNOP" "QRSTUVWX" "YZabcdef"
                                    "ghijklmn" "opqrstuv" "wxyz0123" "456789+/" "=";
     return generic_dump_base64(result, it, alphabet);
 }
 
-static CborError dump_bytestring_base64url(char **result, CborValue *it)
-{
+static CborError dump_bytestring_base64url(char **result, CborValue *it) {
     static const char alphabet[] = "ABCDEFGH" "IJKLMNOP" "QRSTUVWX" "YZabcdef"
                                    "ghijklmn" "opqrstuv" "wxyz0123" "456789-_";
     return generic_dump_base64(result, it, alphabet);
 }
 
-static CborError add_value_metadata(FILE *out, CborType type, const ConversionStatus *status)
-{
+static CborError add_value_metadata(FILE *out, CborType type, const ConversionStatus *status) {
     int flags = status->flags;
     if (flags & TypeWasTagged) {
         /* extract the tagged type, which may be JSON native */
@@ -317,8 +312,7 @@ static CborError add_value_metadata(FILE *out, CborType type, const ConversionSt
     return CborNoError;
 }
 
-static CborError find_tagged_type(CborValue *it, CborTag *tag, CborType *type)
-{
+static CborError find_tagged_type(CborValue *it, CborTag *tag, CborType *type) {
     CborError err = CborNoError;
     *type = cbor_value_get_type(it);
     while (*type == CborTagType) {
@@ -332,8 +326,7 @@ static CborError find_tagged_type(CborValue *it, CborTag *tag, CborType *type)
     return err;
 }
 
-static CborError tagged_value_to_json(FILE *out, CborValue *it, int flags, ConversionStatus *status)
-{
+static CborError tagged_value_to_json(FILE *out, CborValue *it, int flags, ConversionStatus *status) {
     CborTag tag;
     CborError err;
 
@@ -352,8 +345,8 @@ static CborError tagged_value_to_json(FILE *out, CborValue *it, int flags, Conve
             return err;
         if (flags & CborConvertAddMetadata && status->flags) {
             if (fprintf(out, ",\"tag%" PRIu64 "$cbor\":{", tag) < 0 ||
-                add_value_metadata(out, type, status) != CborNoError ||
-                fputc('}', out) < 0)
+                    add_value_metadata(out, type, status) != CborNoError ||
+                    fputc('}', out) < 0)
                 return CborErrorIO;
         }
         if (fputc('}', out) < 0)
@@ -370,7 +363,7 @@ static CborError tagged_value_to_json(FILE *out, CborValue *it, int flags, Conve
 
     /* special handling of byte strings? */
     if (type == CborByteStringType && (flags & CborConvertByteStringsToBase64Url) == 0 &&
-        (tag == CborNegativeBignumTag || tag == CborExpectedBase16Tag || tag == CborExpectedBase64Tag)) {
+            (tag == CborNegativeBignumTag || tag == CborExpectedBase16Tag || tag == CborExpectedBase64Tag)) {
         char *str;
         char *pre = "";
 
@@ -396,8 +389,7 @@ static CborError tagged_value_to_json(FILE *out, CborValue *it, int flags, Conve
     return err;
 }
 
-static CborError stringify_map_key(char **key, CborValue *it, int flags, CborType type)
-{
+static CborError stringify_map_key(char **key, CborValue *it, int flags, CborType type) {
     (void)flags;    /* unused */
     (void)type;     /* unused */
 #ifdef WITHOUT_OPEN_MEMSTREAM
@@ -418,8 +410,7 @@ static CborError stringify_map_key(char **key, CborValue *it, int flags, CborTyp
 #endif
 }
 
-static CborError array_to_json(FILE *out, CborValue *it, int flags, ConversionStatus *status)
-{
+static CborError array_to_json(FILE *out, CborValue *it, int flags, ConversionStatus *status) {
     const char *comma = "";
     while (!cbor_value_at_end(it)) {
         if (fprintf(out, "%s", comma) < 0)
@@ -433,8 +424,7 @@ static CborError array_to_json(FILE *out, CborValue *it, int flags, ConversionSt
     return CborNoError;
 }
 
-static CborError map_to_json(FILE *out, CborValue *it, int flags, ConversionStatus *status)
-{
+static CborError map_to_json(FILE *out, CborValue *it, int flags, ConversionStatus *status) {
     const char *comma = "";
     CborError err;
     while (!cbor_value_at_end(it)) {
@@ -473,8 +463,8 @@ static CborError map_to_json(FILE *out, CborValue *it, int flags, ConversionStat
             }
             if (!err && status->flags) {
                 if (fprintf(out, ",\"%s$cbor\":{", key) < 0 ||
-                    add_value_metadata(out, valueType, status) != CborNoError ||
-                    fputc('}', out) < 0)
+                        add_value_metadata(out, valueType, status) != CborNoError ||
+                        fputc('}', out) < 0)
                     err = CborErrorIO;
             }
         }
@@ -486,8 +476,7 @@ static CborError map_to_json(FILE *out, CborValue *it, int flags, ConversionStat
     return CborNoError;
 }
 
-static CborError value_to_json(FILE *out, CborValue *it, int flags, CborType type, ConversionStatus *status)
-{
+static CborError value_to_json(FILE *out, CborValue *it, int flags, CborType type, ConversionStatus *status) {
     CborError err;
     status->flags = 0;
 
@@ -690,8 +679,7 @@ static CborError value_to_json(FILE *out, CborValue *it, int flags, CborType typ
  *
  * \sa cbor_value_to_json(), cbor_value_to_pretty_advance()
  */
-CborError cbor_value_to_json_advance(FILE *out, CborValue *value, int flags)
-{
+CborError cbor_value_to_json_advance(FILE *out, CborValue *value, int flags) {
     ConversionStatus status;
     return value_to_json(out, value, flags, cbor_value_get_type(value), &status);
 }
diff --git a/client/tinycbor/cborvalidation.c b/client/tinycbor/cborvalidation.c
index 532f63025..fc571695a 100644
--- a/client/tinycbor/cborvalidation.c
+++ b/client/tinycbor/cborvalidation.c
@@ -267,8 +267,7 @@ static const struct KnownTagData knownTagData[] = {
 
 static CborError validate_value(CborValue *it, uint32_t flags, int recursionLeft);
 
-static inline CborError validate_utf8_string(const void *ptr, size_t n)
-{
+static inline CborError validate_utf8_string(const void *ptr, size_t n) {
     const uint8_t *buffer = (const uint8_t *)ptr;
     const uint8_t *const end = buffer + n;
     while (buffer < end) {
@@ -279,8 +278,7 @@ static inline CborError validate_utf8_string(const void *ptr, size_t n)
     return CborNoError;
 }
 
-static inline CborError validate_simple_type(uint8_t simple_type, uint32_t flags)
-{
+static inline CborError validate_simple_type(uint8_t simple_type, uint32_t flags) {
     /* At current time, all known simple types are those from RFC 7049,
      * which are parsed by the parser into different CBOR types.
      * That means that if we've got here, the type is unknown */
@@ -290,8 +288,7 @@ static inline CborError validate_simple_type(uint8_t simple_type, uint32_t flags
            CborErrorUnknownSimpleType : CborNoError;
 }
 
-static inline CborError validate_number(const CborValue *it, CborType type, uint32_t flags)
-{
+static inline CborError validate_number(const CborValue *it, CborType type, uint32_t flags) {
     CborError err = CborNoError;
     const uint8_t *ptr = it->ptr;
     size_t bytesUsed, bytesNeeded;
@@ -321,8 +318,7 @@ static inline CborError validate_number(const CborValue *it, CborType type, uint
     return CborNoError;
 }
 
-static inline CborError validate_tag(CborValue *it, CborTag tag, uint32_t flags, int recursionLeft)
-{
+static inline CborError validate_tag(CborValue *it, CborTag tag, uint32_t flags, int recursionLeft) {
     CborType type = cbor_value_get_type(it);
     const size_t knownTagCount = sizeof(knownTagData) / sizeof(knownTagData[0]);
     const struct KnownTagData *tagData = knownTagData;
@@ -374,8 +370,7 @@ static inline CborError validate_tag(CborValue *it, CborTag tag, uint32_t flags,
 }
 
 #ifndef CBOR_NO_FLOATING_POINT
-static inline CborError validate_floating_point(CborValue *it, CborType type, uint32_t flags)
-{
+static inline CborError validate_floating_point(CborValue *it, CborType type, uint32_t flags) {
     CborError err;
     int r;
     double val;
@@ -437,8 +432,7 @@ static inline CborError validate_floating_point(CborValue *it, CborType type, ui
 }
 #endif
 
-static CborError validate_container(CborValue *it, int containerType, uint32_t flags, int recursionLeft)
-{
+static CborError validate_container(CborValue *it, int containerType, uint32_t flags, int recursionLeft) {
     CborError err;
     const uint8_t *previous = NULL;
     const uint8_t *previous_end = NULL;
@@ -511,8 +505,7 @@ static CborError validate_container(CborValue *it, int containerType, uint32_t f
     return CborNoError;
 }
 
-static CborError validate_value(CborValue *it, uint32_t flags, int recursionLeft)
-{
+static CborError validate_value(CborValue *it, uint32_t flags, int recursionLeft) {
     CborError err;
     CborType type = cbor_value_get_type(it);
 
@@ -650,8 +643,7 @@ static CborError validate_value(CborValue *it, uint32_t flags, int recursionLeft
  *
  * \sa CborValidationFlags, cbor_value_validate_basic(), cbor_value_advance()
  */
-CborError cbor_value_validate(const CborValue *it, uint32_t flags)
-{
+CborError cbor_value_validate(const CborValue *it, uint32_t flags) {
     CborValue value = *it;
     CborError err = validate_value(&value, flags, CBOR_PARSER_MAX_RECURSIONS);
     if (err)
diff --git a/client/tinycbor/compilersupport_p.h b/client/tinycbor/compilersupport_p.h
index bd10efc9c..91d88229e 100644
--- a/client/tinycbor/compilersupport_p.h
+++ b/client/tinycbor/compilersupport_p.h
@@ -190,8 +190,7 @@
 #  define unreachable() do {} while (0)
 #endif
 
-static inline bool add_check_overflow(size_t v1, size_t v2, size_t *r)
-{
+static inline bool add_check_overflow(size_t v1, size_t v2, size_t *r) {
 #if ((defined(__GNUC__) && (__GNUC__ >= 5)) && !defined(__INTEL_COMPILER)) || __has_builtin(__builtin_add_overflow)
     return __builtin_add_overflow(v1, v2, r);
 #else
diff --git a/client/tinycbor/open_memstream.c b/client/tinycbor/open_memstream.c
index b7ea77247..899f3b172 100644
--- a/client/tinycbor/open_memstream.c
+++ b/client/tinycbor/open_memstream.c
@@ -53,8 +53,7 @@ struct Buffer {
     size_t alloc;
 };
 
-static RetType write_to_buffer(void *cookie, const char *data, LenType len)
-{
+static RetType write_to_buffer(void *cookie, const char *data, LenType len) {
     struct Buffer *b = (struct Buffer *)cookie;
     char *ptr = *b->ptr;
     size_t newsize;
@@ -78,8 +77,7 @@ static RetType write_to_buffer(void *cookie, const char *data, LenType len)
     return len;
 }
 
-static int close_buffer(void *cookie)
-{
+static int close_buffer(void *cookie) {
     struct Buffer *b = (struct Buffer *)cookie;
     if (*b->ptr)
         (*b->ptr)[*b->len] = '\0';
@@ -87,8 +85,7 @@ static int close_buffer(void *cookie)
     return 0;
 }
 
-FILE *open_memstream(char **bufptr, size_t *lenptr)
-{
+FILE *open_memstream(char **bufptr, size_t *lenptr) {
     struct Buffer *b = (struct Buffer *)calloc(sizeof(struct Buffer), sizeof(uint8_t));
     if (b == NULL)
         return NULL;
diff --git a/client/tinycbor/utf8_p.h b/client/tinycbor/utf8_p.h
index ca438350d..c2e1e8cfa 100644
--- a/client/tinycbor/utf8_p.h
+++ b/client/tinycbor/utf8_p.h
@@ -29,8 +29,7 @@
 
 #include <stdint.h>
 
-static inline uint32_t get_utf8(const uint8_t **buffer, const uint8_t *end)
-{
+static inline uint32_t get_utf8(const uint8_t **buffer, const uint8_t *end) {
     int charsNeeded;
     uint32_t uc, min_uc;
     uint8_t b;
diff --git a/client/ui.c b/client/ui.c
index 79e4140db..d0318dba5 100644
--- a/client/ui.c
+++ b/client/ui.c
@@ -21,8 +21,7 @@ bool showDemod = true;
 pthread_mutex_t print_lock = PTHREAD_MUTEX_INITIALIZER;
 static char *logfilename = "proxmark3.log";
 
-void PrintAndLogOptions(char *str[][2], size_t size, size_t space)
-{
+void PrintAndLogOptions(char *str[][2], size_t size, size_t space) {
     char buff[2000] = "Options:\n";
     char format[2000] = "";
     size_t counts[2] = {0, 0};
@@ -44,8 +43,7 @@ void PrintAndLogOptions(char *str[][2], size_t size, size_t space)
     }
     PrintAndLogEx(NORMAL, "%s", buff);
 }
-void PrintAndLogEx(logLevel_t level, char *fmt, ...)
-{
+void PrintAndLogEx(logLevel_t level, char *fmt, ...) {
 
     // skip debug messages if client debugging is turned off i.e. 'DATA SETDEBUG 0'
     if (g_debugMode == 0 && level == DEBUG)
@@ -119,8 +117,7 @@ void PrintAndLogEx(logLevel_t level, char *fmt, ...)
     }
 }
 
-void PrintAndLog(char *fmt, ...)
-{
+void PrintAndLog(char *fmt, ...) {
     char *saved_line;
     int saved_point;
     va_list argptr, argptr2;
@@ -187,18 +184,15 @@ void PrintAndLog(char *fmt, ...)
     pthread_mutex_unlock(&print_lock);
 }
 
-void SetLogFilename(char *fn)
-{
+void SetLogFilename(char *fn) {
     logfilename = fn;
 }
 
-void SetFlushAfterWrite(bool value)
-{
+void SetFlushAfterWrite(bool value) {
     flushAfterWrite = value;
 }
 
-void iceIIR_Butterworth(int *data, const size_t len)
-{
+void iceIIR_Butterworth(int *data, const size_t len) {
 
     int i, j;
 
@@ -251,8 +245,7 @@ void iceIIR_Butterworth(int *data, const size_t len)
     free(output);
 }
 
-void iceSimple_Filter(int *data, const size_t len, uint8_t k)
-{
+void iceSimple_Filter(int *data, const size_t len, uint8_t k) {
 // ref: http://www.edn.com/design/systems-design/4320010/A-simple-software-lowpass-filter-suits-embedded-system-applications
 // parameter K
 #define FILTER_SHIFT 4
@@ -273,8 +266,7 @@ void iceSimple_Filter(int *data, const size_t len, uint8_t k)
     }
 }
 
-float complex cexpf(float complex Z)
-{
+float complex cexpf(float complex Z) {
     float complex  Res;
     double rho = exp(__real__ Z);
     __real__ Res = rho * cosf(__imag__ Z);
diff --git a/client/util.c b/client/util.c
index cc95533bb..0b3211264 100644
--- a/client/util.c
+++ b/client/util.c
@@ -25,8 +25,7 @@ uint8_t g_debugMode = 0;
 #include <unistd.h>
 #include <stdarg.h>
 
-int ukbhit(void)
-{
+int ukbhit(void) {
     int cnt = 0;
     int error;
     static struct termios Otty, Ntty;
@@ -51,8 +50,7 @@ int ukbhit(void)
 #else
 
 #include <conio.h>
-int ukbhit(void)
-{
+int ukbhit(void) {
     return kbhit();
 }
 #endif
@@ -60,8 +58,7 @@ int ukbhit(void)
 // log files functions
 
 // open, appped and close logfile
-void AddLogLine(char *fn, char *data, char *c)
-{
+void AddLogLine(char *fn, char *data, char *c) {
     FILE *f = NULL;
     char filename[FILE_PATH_SIZE] = {0x00};
     int len = 0;
@@ -83,21 +80,18 @@ void AddLogLine(char *fn, char *data, char *c)
     fclose(f);
 }
 
-void AddLogHex(char *fn, char *extData, const uint8_t *data, const size_t len)
-{
+void AddLogHex(char *fn, char *extData, const uint8_t *data, const size_t len) {
     AddLogLine(fn, extData, sprint_hex(data, len));
 }
 
-void AddLogUint64(char *fn, char *data, const uint64_t value)
-{
+void AddLogUint64(char *fn, char *data, const uint64_t value) {
     char buf[20] = {0};
     memset(buf, 0x00, sizeof(buf));
     sprintf(buf, "%016" PRIx64 "", value);
     AddLogLine(fn, data, buf);
 }
 
-void AddLogCurrentDT(char *fn)
-{
+void AddLogCurrentDT(char *fn) {
     char buf[20];
     memset(buf, 0x00, sizeof(buf));
     struct tm *curTime;
@@ -112,8 +106,7 @@ void AddLogCurrentDT(char *fn)
 // param *uid  -  pointer to uid byte array
 // param *ext  -  ".log"
 // param uidlen - length of uid array.
-void FillFileNameByUID(char *filenamePrefix, uint8_t *uid, const char *ext, int uidlen)
-{
+void FillFileNameByUID(char *filenamePrefix, uint8_t *uid, const char *ext, int uidlen) {
     if (filenamePrefix == NULL || uid == NULL || ext == NULL) {
         printf("[!] error parameter is NULL\n");
         return;
@@ -129,8 +122,7 @@ void FillFileNameByUID(char *filenamePrefix, uint8_t *uid, const char *ext, int
 }
 
 // fill buffer from structure [{uint8_t data, size_t length},...]
-int FillBuffer(uint8_t *data, size_t maxDataLength, size_t *dataLength, ...)
-{
+int FillBuffer(uint8_t *data, size_t maxDataLength, size_t *dataLength, ...) {
     *dataLength = 0;
     va_list valist;
     va_start(valist, dataLength);
@@ -158,8 +150,7 @@ int FillBuffer(uint8_t *data, size_t maxDataLength, size_t *dataLength, ...)
     return 0;
 }
 
-bool CheckStringIsHEXValue(const char *value)
-{
+bool CheckStringIsHEXValue(const char *value) {
     for (int i = 0; i < strlen(value); i++)
         if (!isxdigit(value[i]))
             return false;
@@ -171,8 +162,7 @@ bool CheckStringIsHEXValue(const char *value)
 }
 
 void hex_to_buffer(const uint8_t *buf, const uint8_t *hex_data, const size_t hex_len, const size_t hex_max_len,
-                   const size_t min_str_len, const size_t spaces_between, bool uppercase)
-{
+                   const size_t min_str_len, const size_t spaces_between, bool uppercase) {
 
     char *tmp = (char *)buf;
     size_t i;
@@ -198,16 +188,14 @@ void hex_to_buffer(const uint8_t *buf, const uint8_t *hex_data, const size_t hex
 }
 
 // printing and converting functions
-void print_hex(const uint8_t *data, const size_t len)
-{
+void print_hex(const uint8_t *data, const size_t len) {
     size_t i;
     for (i = 0; i < len; i++)
         printf("%02x ", data[i]);
     printf("\n");
 }
 
-void print_hex_break(const uint8_t *data, const size_t len, uint8_t breaks)
-{
+void print_hex_break(const uint8_t *data, const size_t len, uint8_t breaks) {
     int rownum = 0;
     printf("[%02d] | ", rownum);
     for (int i = 0; i < len; ++i) {
@@ -223,33 +211,28 @@ void print_hex_break(const uint8_t *data, const size_t len, uint8_t breaks)
     printf("\n");
 }
 
-char *sprint_hex(const uint8_t *data, const size_t len)
-{
+char *sprint_hex(const uint8_t *data, const size_t len) {
     static char buf[UTIL_BUFFER_SIZE_SPRINT - 3] = {0};
     hex_to_buffer((uint8_t *)buf, data, len, sizeof(buf) - 1, 0, 1, true);
     return buf;
 }
 
-char *sprint_hex_inrow_ex(const uint8_t *data, const size_t len, const size_t min_str_len)
-{
+char *sprint_hex_inrow_ex(const uint8_t *data, const size_t len, const size_t min_str_len) {
     static char buf[UTIL_BUFFER_SIZE_SPRINT] = {0};
     hex_to_buffer((uint8_t *)buf, data, len, sizeof(buf) - 1, min_str_len, 0, true);
     return buf;
 }
 
-char *sprint_hex_inrow(const uint8_t *data, const size_t len)
-{
+char *sprint_hex_inrow(const uint8_t *data, const size_t len) {
     return sprint_hex_inrow_ex(data, len, 0);
 }
-char *sprint_hex_inrow_spaces(const uint8_t *data, const size_t len, size_t spaces_between)
-{
+char *sprint_hex_inrow_spaces(const uint8_t *data, const size_t len, size_t spaces_between) {
     static char buf[UTIL_BUFFER_SIZE_SPRINT] = {0};
     hex_to_buffer((uint8_t *)buf, data, len, sizeof(buf) - 1, 0, spaces_between, true);
     return buf;
 }
 
-char *sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t breaks)
-{
+char *sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t breaks) {
 
     // make sure we don't go beyond our char array memory
     size_t in_index = 0, out_index = 0;
@@ -320,13 +303,11 @@ void sprint_bin_break_ex(uint8_t *src, size_t srclen, char *dest , uint8_t break
 }
 */
 
-char *sprint_bin(const uint8_t *data, const size_t len)
-{
+char *sprint_bin(const uint8_t *data, const size_t len) {
     return sprint_bin_break(data, len, 0);
 }
 
-char *sprint_hex_ascii(const uint8_t *data, const size_t len)
-{
+char *sprint_hex_ascii(const uint8_t *data, const size_t len) {
     static char buf[UTIL_BUFFER_SIZE_SPRINT];
     char *tmp = buf;
     memset(buf, 0x00, UTIL_BUFFER_SIZE_SPRINT);
@@ -346,8 +327,7 @@ char *sprint_hex_ascii(const uint8_t *data, const size_t len)
     return buf;
 }
 
-char *sprint_ascii_ex(const uint8_t *data, const size_t len, const size_t min_str_len)
-{
+char *sprint_ascii_ex(const uint8_t *data, const size_t len, const size_t min_str_len) {
     static char buf[UTIL_BUFFER_SIZE_SPRINT];
     char *tmp = buf;
     memset(buf, 0x00, UTIL_BUFFER_SIZE_SPRINT);
@@ -365,13 +345,11 @@ char *sprint_ascii_ex(const uint8_t *data, const size_t len, const size_t min_st
 
     return buf;
 }
-char *sprint_ascii(const uint8_t *data, const size_t len)
-{
+char *sprint_ascii(const uint8_t *data, const size_t len) {
     return sprint_ascii_ex(data, len, 0);
 }
 
-void print_blocks(uint32_t *data, size_t len)
-{
+void print_blocks(uint32_t *data, size_t len) {
     PrintAndLogEx(NORMAL, "Blk | Data ");
     PrintAndLogEx(NORMAL, "----+------------");
 
@@ -383,16 +361,14 @@ void print_blocks(uint32_t *data, size_t len)
     }
 }
 
-void num_to_bytes(uint64_t n, size_t len, uint8_t *dest)
-{
+void num_to_bytes(uint64_t n, size_t len, uint8_t *dest) {
     while (len--) {
         dest[len] = n & 0xFF;
         n >>= 8;
     }
 }
 
-uint64_t bytes_to_num(uint8_t *src, size_t len)
-{
+uint64_t bytes_to_num(uint8_t *src, size_t len) {
     uint64_t num = 0;
     while (len--) {
         num = (num << 8) | (*src);
@@ -402,8 +378,7 @@ uint64_t bytes_to_num(uint8_t *src, size_t len)
 }
 
 // takes a number (uint64_t) and creates a binarray in dest.
-void num_to_bytebits(uint64_t n, size_t len, uint8_t *dest)
-{
+void num_to_bytebits(uint64_t n, size_t len, uint8_t *dest) {
     while (len--) {
         dest[len] = n & 1;
         n >>= 1;
@@ -411,8 +386,7 @@ void num_to_bytebits(uint64_t n, size_t len, uint8_t *dest)
 }
 
 //least significant bit first
-void num_to_bytebitsLSBF(uint64_t n, size_t len, uint8_t *dest)
-{
+void num_to_bytebitsLSBF(uint64_t n, size_t len, uint8_t *dest) {
     for (int i = 0 ; i < len ; ++i) {
         dest[i] =  n & 1;
         n >>= 1;
@@ -423,8 +397,7 @@ void num_to_bytebitsLSBF(uint64_t n, size_t len, uint8_t *dest)
 // to
 // hh,gg,ff,ee,dd,cc,bb,aa, pp,oo,nn,mm,ll,kk,jj,ii
 // up to 64 bytes or 512 bits
-uint8_t *SwapEndian64(const uint8_t *src, const size_t len, const uint8_t blockSize)
-{
+uint8_t *SwapEndian64(const uint8_t *src, const size_t len, const uint8_t blockSize) {
     static uint8_t buf[64];
     memset(buf, 0x00, 64);
     uint8_t *tmp = buf;
@@ -438,8 +411,7 @@ uint8_t *SwapEndian64(const uint8_t *src, const size_t len, const uint8_t blockS
 
 // takes a uint8_t src array, for len items and reverses the byte order in blocksizes (8,16,32,64),
 // returns: the dest array contains the reordered src array.
-void SwapEndian64ex(const uint8_t *src, const size_t len, const uint8_t blockSize, uint8_t *dest)
-{
+void SwapEndian64ex(const uint8_t *src, const size_t len, const uint8_t blockSize, uint8_t *dest) {
     for (uint8_t block = 0; block < (uint8_t)(len / blockSize); block++) {
         for (size_t i = 0; i < blockSize; i++) {
             dest[i + (blockSize * block)] = src[(blockSize - 1 - i) + (blockSize * block)];
@@ -456,8 +428,7 @@ void SwapEndian64ex(const uint8_t *src, const size_t len, const uint8_t blockSiz
 //  bg, en   - symbol numbers in param line of beginning and ending parameter
 //  paramnum - param number (from 0)
 //  -------------------------------------------------------------------------
-int param_getptr(const char *line, int *bg, int *en, int paramnum)
-{
+int param_getptr(const char *line, int *bg, int *en, int paramnum) {
     int i;
     int len = strlen(line);
 
@@ -485,8 +456,7 @@ int param_getptr(const char *line, int *bg, int *en, int paramnum)
     return 0;
 }
 
-int param_getlength(const char *line, int paramnum)
-{
+int param_getlength(const char *line, int paramnum) {
     int bg, en;
 
     if (param_getptr(line, &bg, &en, paramnum)) return 0;
@@ -494,13 +464,11 @@ int param_getlength(const char *line, int paramnum)
     return en - bg + 1;
 }
 
-char param_getchar(const char *line, int paramnum)
-{
+char param_getchar(const char *line, int paramnum) {
     return param_getchar_indx(line, 0, paramnum);
 }
 
-char param_getchar_indx(const char *line, int indx, int paramnum)
-{
+char param_getchar_indx(const char *line, int indx, int paramnum) {
     int bg, en;
 
     if (param_getptr(line, &bg, &en, paramnum)) return 0x00;
@@ -511,8 +479,7 @@ char param_getchar_indx(const char *line, int indx, int paramnum)
     return line[bg + indx];
 }
 
-uint8_t param_get8(const char *line, int paramnum)
-{
+uint8_t param_get8(const char *line, int paramnum) {
     return param_get8ex(line, paramnum, 0, 10);
 }
 
@@ -522,8 +489,7 @@ uint8_t param_get8(const char *line, int paramnum)
  * @param paramnum
  * @return -1 if error
  */
-uint8_t param_getdec(const char *line, int paramnum, uint8_t *destination)
-{
+uint8_t param_getdec(const char *line, int paramnum, uint8_t *destination) {
     uint8_t val =  param_get8ex(line, paramnum, 255, 10);
     if ((int8_t) val == -1) return 1;
     (*destination) = val;
@@ -535,8 +501,7 @@ uint8_t param_getdec(const char *line, int paramnum, uint8_t *destination)
  * @param paramnum
  * @return
  */
-uint8_t param_isdec(const char *line, int paramnum)
-{
+uint8_t param_isdec(const char *line, int paramnum) {
     int bg, en;
     //TODO, check more thorougly
     if (!param_getptr(line, &bg, &en, paramnum)) return 1;
@@ -545,8 +510,7 @@ uint8_t param_isdec(const char *line, int paramnum)
     return 0;
 }
 
-uint8_t param_get8ex(const char *line, int paramnum, int deflt, int base)
-{
+uint8_t param_get8ex(const char *line, int paramnum, int deflt, int base) {
     int bg, en;
     if (!param_getptr(line, &bg, &en, paramnum))
         return strtoul(&line[bg], NULL, base) & 0xff;
@@ -554,8 +518,7 @@ uint8_t param_get8ex(const char *line, int paramnum, int deflt, int base)
         return deflt;
 }
 
-uint32_t param_get32ex(const char *line, int paramnum, int deflt, int base)
-{
+uint32_t param_get32ex(const char *line, int paramnum, int deflt, int base) {
     int bg, en;
     if (!param_getptr(line, &bg, &en, paramnum))
         return strtoul(&line[bg], NULL, base);
@@ -563,8 +526,7 @@ uint32_t param_get32ex(const char *line, int paramnum, int deflt, int base)
         return deflt;
 }
 
-uint64_t param_get64ex(const char *line, int paramnum, int deflt, int base)
-{
+uint64_t param_get64ex(const char *line, int paramnum, int deflt, int base) {
     int bg, en;
     if (!param_getptr(line, &bg, &en, paramnum))
         return strtoull(&line[bg], NULL, base);
@@ -572,8 +534,7 @@ uint64_t param_get64ex(const char *line, int paramnum, int deflt, int base)
         return deflt;
 }
 
-int param_gethex(const char *line, int paramnum, uint8_t *data, int hexcnt)
-{
+int param_gethex(const char *line, int paramnum, uint8_t *data, int hexcnt) {
     int bg, en, i;
     uint32_t temp;
 
@@ -592,8 +553,7 @@ int param_gethex(const char *line, int paramnum, uint8_t *data, int hexcnt)
 
     return 0;
 }
-int param_gethex_ex(const char *line, int paramnum, uint8_t *data, int *hexcnt)
-{
+int param_gethex_ex(const char *line, int paramnum, uint8_t *data, int *hexcnt) {
     int bg, en, i;
     uint32_t temp;
 
@@ -613,8 +573,7 @@ int param_gethex_ex(const char *line, int paramnum, uint8_t *data, int *hexcnt)
     return 0;
 }
 
-int param_gethex_to_eol(const char *line, int paramnum, uint8_t *data, int maxdatalen, int *datalen)
-{
+int param_gethex_to_eol(const char *line, int paramnum, uint8_t *data, int maxdatalen, int *datalen) {
     int bg, en;
     uint32_t temp;
     char buf[5] = {0};
@@ -660,8 +619,7 @@ int param_gethex_to_eol(const char *line, int paramnum, uint8_t *data, int maxda
     return 0;
 }
 
-int param_getstr(const char *line, int paramnum, char *str, size_t buffersize)
-{
+int param_getstr(const char *line, int paramnum, char *str, size_t buffersize) {
     int bg, en;
 
     if (param_getptr(line, &bg, &en, paramnum)) {
@@ -686,8 +644,7 @@ https://github.com/ApertureLabsLtd/RFIDler/blob/master/firmware/Pic32/RFIDler.X/
 */
 // convert hex to sequence of 0/1 bit values
 // returns number of bits converted
-int hextobinarray(char *target, char *source)
-{
+int hextobinarray(char *target, char *source) {
     int length, i, count = 0;
     char *start = source;
     char x;
@@ -717,8 +674,7 @@ int hextobinarray(char *target, char *source)
 }
 
 // convert hex to human readable binary string
-int hextobinstring(char *target, char *source)
-{
+int hextobinstring(char *target, char *source) {
     int length;
 
     if (!(length = hextobinarray(target, source)))
@@ -729,8 +685,7 @@ int hextobinstring(char *target, char *source)
 
 // convert binary array of 0x00/0x01 values to hex (safe to do in place as target will always be shorter than source)
 // return number of bits converted
-int binarraytohex(char *target, char *source, int length)
-{
+int binarraytohex(char *target, char *source, int length) {
     unsigned char i, x;
     int j = length;
 
@@ -749,8 +704,7 @@ int binarraytohex(char *target, char *source, int length)
 }
 
 // convert binary array to human readable binary
-void binarraytobinstring(char *target, char *source,  int length)
-{
+void binarraytobinstring(char *target, char *source,  int length) {
     int i;
 
     for (i = 0 ; i < length ; ++i)
@@ -759,8 +713,7 @@ void binarraytobinstring(char *target, char *source,  int length)
 }
 
 // return parity bit required to match type
-uint8_t GetParity(uint8_t *bits, uint8_t type, int length)
-{
+uint8_t GetParity(uint8_t *bits, uint8_t type, int length) {
     int x;
     for (x = 0 ; length > 0 ; --length)
         x += bits[length - 1];
@@ -769,8 +722,7 @@ uint8_t GetParity(uint8_t *bits, uint8_t type, int length)
 }
 
 // add HID parity to binary array: EVEN prefix for 1st half of ID, ODD suffix for 2nd half
-void wiegand_add_parity(uint8_t *target, uint8_t *source, uint8_t length)
-{
+void wiegand_add_parity(uint8_t *target, uint8_t *source, uint8_t length) {
     *(target++) = GetParity(source, EVEN, length / 2);
     memcpy(target, source, length);
     target += length;
@@ -778,19 +730,16 @@ void wiegand_add_parity(uint8_t *target, uint8_t *source, uint8_t length)
 }
 
 // xor two arrays together for len items.  The dst array contains the new xored values.
-void xor(unsigned char *dst, unsigned char *src, size_t len)
-{
+void xor(unsigned char *dst, unsigned char *src, size_t len) {
     for (; len > 0; len--, dst++, src++)
         *dst ^= *src;
 }
 
-int32_t le24toh(uint8_t data[3])
-{
+int32_t le24toh(uint8_t data[3]) {
     return (data[2] << 16) | (data[1] << 8) | data[0];
 }
 // Pack a bitarray into a uint32_t.
-uint32_t PackBits(uint8_t start, uint8_t len, uint8_t *bits)
-{
+uint32_t PackBits(uint8_t start, uint8_t len, uint8_t *bits) {
 
     if (len > 32) return 0;
 
@@ -806,8 +755,7 @@ uint32_t PackBits(uint8_t start, uint8_t len, uint8_t *bits)
 
 // RotateLeft - Ultralight, Desfire, works on byte level
 // 00-01-02  >> 01-02-00
-void rol(uint8_t *data, const size_t len)
-{
+void rol(uint8_t *data, const size_t len) {
     uint8_t first = data[0];
     for (size_t i = 0; i < len - 1; i++) {
         data[i] = data[i + 1];
@@ -823,12 +771,10 @@ uint8_t pw_rev_A(uint8_t b) {
     return b;
 }
 */
-uint8_t reflect8(uint8_t b)
-{
+uint8_t reflect8(uint8_t b) {
     return ((b * 0x80200802ULL) & 0x0884422110ULL) * 0x0101010101ULL >> 32;
 }
-uint16_t reflect16(uint16_t b)
-{
+uint16_t reflect16(uint16_t b) {
     uint16_t v = 0;
     v |= (b & 0x8000) >> 15;
     v |= (b & 0x4000) >> 13;
@@ -854,8 +800,7 @@ uint16_t reflect16(uint16_t b)
  Returns the value v with the bottom b [0,32] bits reflected.
  Example: reflect(0x3e23L,3) == 0x3e26
 */
-uint32_t reflect(uint32_t v, int b)
-{
+uint32_t reflect(uint32_t v, int b) {
     uint32_t t = v;
     for (int i = 0; i < b; ++i) {
         if (t & 1)
@@ -867,8 +812,7 @@ uint32_t reflect(uint32_t v, int b)
     return v;
 }
 
-uint64_t HornerScheme(uint64_t num, uint64_t divider, uint64_t factor)
-{
+uint64_t HornerScheme(uint64_t num, uint64_t divider, uint64_t factor) {
     uint64_t remainder = 0, quotient = 0, result = 0;
     remainder = num % divider;
     quotient = num / divider;
@@ -878,8 +822,7 @@ uint64_t HornerScheme(uint64_t num, uint64_t divider, uint64_t factor)
 }
 
 // determine number of logical CPU cores (use for multithreaded functions)
-extern int num_CPUs(void)
-{
+extern int num_CPUs(void) {
 #if defined(_WIN32)
 #include <sysinfoapi.h>
     SYSTEM_INFO sysinfo;
@@ -893,19 +836,16 @@ extern int num_CPUs(void)
 #endif
 }
 
-extern void str_lower(char *s)
-{
+extern void str_lower(char *s) {
     for (int i = 0; i < strlen(s); i++)
         s[i] = tolower(s[i]);
 }
-extern bool str_startswith(const char *s,  const char *pre)
-{
+extern bool str_startswith(const char *s,  const char *pre) {
     return strncmp(pre, s, strlen(pre)) == 0;
 }
 
 // Replace unprintable characters with a dot in char buffer
-extern void clean_ascii(unsigned char *buf, size_t len)
-{
+extern void clean_ascii(unsigned char *buf, size_t len) {
     for (size_t i = 0; i < len; i++) {
         if (!isprint(buf[i]))
             buf[i] = '.';
@@ -913,23 +853,20 @@ extern void clean_ascii(unsigned char *buf, size_t len)
 }
 
 // replace \r \n to \0
-extern void strcleanrn(char *buf, size_t len)
-{
+extern void strcleanrn(char *buf, size_t len) {
     strcreplace(buf, len, '\n', '\0');
     strcreplace(buf, len, '\r', '\0');
 }
 
 // replace char in buffer
-extern void strcreplace(char *buf, size_t len, char from, char to)
-{
+extern void strcreplace(char *buf, size_t len, char from, char to) {
     for (size_t i = 0; i < len; i++) {
         if (buf[i] == from)
             buf[i] = to;
     }
 }
 
-extern char *strmcopy(char *buf)
-{
+extern char *strmcopy(char *buf) {
     char *str = (char *) calloc(strlen(buf) + 1, sizeof(uint8_t));
     if (str != NULL) {
         memset(str, 0, strlen(buf) + 1);
diff --git a/client/util_posix.c b/client/util_posix.c
index 00cace2ec..ca54d2ae4 100644
--- a/client/util_posix.c
+++ b/client/util_posix.c
@@ -23,16 +23,14 @@
 #if !defined (_WIN32)
 #include <errno.h>
 
-static void nsleep(uint64_t n)
-{
+static void nsleep(uint64_t n) {
     struct timespec timeout;
     timeout.tv_sec = n / 1000000000;
     timeout.tv_nsec = n % 1000000000;
     while (nanosleep(&timeout, &timeout) && errno == EINTR);
 }
 
-void msleep(uint32_t n)
-{
+void msleep(uint32_t n) {
     nsleep(1000000 * (uint64_t)n);
 }
 #endif // _WIN32
@@ -54,8 +52,7 @@ void msleep(uint32_t n)
 /* clock_gettime is not implemented on OSX prior to 10.12 */
 int _civet_clock_gettime(int clk_id, struct timespec *t);
 
-int _civet_clock_gettime(int clk_id, struct timespec *t)
-{
+int _civet_clock_gettime(int clk_id, struct timespec *t) {
     memset(t, 0, sizeof(*t));
     if (clk_id == CLOCK_REALTIME) {
         struct timeval now;
@@ -96,8 +93,7 @@ int _civet_clock_gettime(int clk_id, struct timespec *t)
  * but it may be NULL at runtime. So we need to check before using it. */
 int _civet_safe_clock_gettime(int clk_id, struct timespec *t);
 
-int _civet_safe_clock_gettime(int clk_id, struct timespec *t)
-{
+int _civet_safe_clock_gettime(int clk_id, struct timespec *t) {
     if (clock_gettime) {
         return clock_gettime(clk_id, t);
     }
@@ -112,8 +108,7 @@ int _civet_safe_clock_gettime(int clk_id, struct timespec *t)
 
 
 // a milliseconds timer for performance measurement
-uint64_t msclock(void)
-{
+uint64_t msclock(void) {
 #if defined(_WIN32)
 #include <sys/types.h>
 
diff --git a/client/whereami.c b/client/whereami.c
index 531b7f478..fe61273d2 100644
--- a/client/whereami.c
+++ b/client/whereami.c
@@ -60,8 +60,7 @@ extern "C" {
 #pragma warning(pop)
 #endif
 
-static int WAI_PREFIX(getModulePath_)(HMODULE module, char *out, int capacity, int *dirname_length)
-{
+static int WAI_PREFIX(getModulePath_)(HMODULE module, char *out, int capacity, int *dirname_length) {
     wchar_t buffer1[MAX_PATH];
     wchar_t buffer2[MAX_PATH];
     wchar_t *path = NULL;
@@ -127,8 +126,7 @@ static int WAI_PREFIX(getModulePath_)(HMODULE module, char *out, int capacity, i
 
 WAI_NOINLINE
 WAI_FUNCSPEC
-int WAI_PREFIX(getExecutablePath)(char *out, int capacity, int *dirname_length)
-{
+int WAI_PREFIX(getExecutablePath)(char *out, int capacity, int *dirname_length) {
     return WAI_PREFIX(getModulePath_)(NULL, out, capacity, dirname_length);
 }
 
@@ -173,8 +171,7 @@ int WAI_PREFIX(getModulePath)(char* out, int capacity, int* dirname_length)
 #endif
 
 WAI_FUNCSPEC
-int WAI_PREFIX(getExecutablePath)(char *out, int capacity, int *dirname_length)
-{
+int WAI_PREFIX(getExecutablePath)(char *out, int capacity, int *dirname_length) {
     char buffer[PATH_MAX];
     char *resolved = NULL;
     int length = -1;
@@ -221,8 +218,7 @@ int WAI_PREFIX(getExecutablePath)(char *out, int capacity, int *dirname_length)
 
 WAI_NOINLINE
 WAI_FUNCSPEC
-int WAI_PREFIX(getModulePath)(char *out, int capacity, int *dirname_length)
-{
+int WAI_PREFIX(getModulePath)(char *out, int capacity, int *dirname_length) {
     int length = -1;
     FILE *maps = NULL;
     int i;
@@ -256,10 +252,10 @@ int WAI_PREFIX(getModulePath)(char *out, int capacity, int *dirname_length)
                     length = (int)strlen(resolved);
 #if defined(__ANDROID__) || defined(ANDROID)
                     if (length > 4
-                        && buffer[length - 1] == 'k'
-                        && buffer[length - 2] == 'p'
-                        && buffer[length - 3] == 'a'
-                        && buffer[length - 4] == '.') {
+                            && buffer[length - 1] == 'k'
+                            && buffer[length - 2] == 'p'
+                            && buffer[length - 3] == 'a'
+                            && buffer[length - 4] == '.') {
                         int fd = open(path, O_RDONLY);
                         char *begin;
                         char *p;
@@ -326,8 +322,7 @@ int WAI_PREFIX(getModulePath)(char *out, int capacity, int *dirname_length)
 #include <dlfcn.h>
 
 WAI_FUNCSPEC
-int WAI_PREFIX(getExecutablePath)(char *out, int capacity, int *dirname_length)
-{
+int WAI_PREFIX(getExecutablePath)(char *out, int capacity, int *dirname_length) {
     char buffer1[PATH_MAX];
     char buffer2[PATH_MAX];
     char *path = buffer1;
@@ -373,8 +368,7 @@ int WAI_PREFIX(getExecutablePath)(char *out, int capacity, int *dirname_length)
 
 WAI_NOINLINE
 WAI_FUNCSPEC
-int WAI_PREFIX(getModulePath)(char *out, int capacity, int *dirname_length)
-{
+int WAI_PREFIX(getModulePath)(char *out, int capacity, int *dirname_length) {
     char buffer[PATH_MAX];
     char *resolved = NULL;
     int length = -1;
@@ -423,8 +417,7 @@ int WAI_PREFIX(getModulePath)(char *out, int capacity, int *dirname_length)
 #endif
 
 WAI_FUNCSPEC
-int WAI_PREFIX(getExecutablePath)(char *out, int capacity, int *dirname_length)
-{
+int WAI_PREFIX(getExecutablePath)(char *out, int capacity, int *dirname_length) {
     char buffer1[PATH_MAX];
     char buffer2[PATH_MAX];
     char *resolved = NULL;
@@ -468,8 +461,7 @@ int WAI_PREFIX(getExecutablePath)(char *out, int capacity, int *dirname_length)
 }
 
 WAI_FUNCSPEC
-int WAI_PREFIX(getModulePath)(char *out, int capacity, int *dirname_length)
-{
+int WAI_PREFIX(getModulePath)(char *out, int capacity, int *dirname_length) {
     char buffer[PATH_MAX];
     char *resolved = NULL;
     int length = -1;
@@ -517,8 +509,7 @@ int WAI_PREFIX(getModulePath)(char *out, int capacity, int *dirname_length)
 #include <dlfcn.h>
 
 WAI_FUNCSPEC
-int WAI_PREFIX(getExecutablePath)(char *out, int capacity, int *dirname_length)
-{
+int WAI_PREFIX(getExecutablePath)(char *out, int capacity, int *dirname_length) {
     char buffer1[PATH_MAX];
     char buffer2[PATH_MAX];
     char *path = buffer1;
@@ -567,8 +558,7 @@ int WAI_PREFIX(getExecutablePath)(char *out, int capacity, int *dirname_length)
 
 WAI_NOINLINE
 WAI_FUNCSPEC
-int WAI_PREFIX(getModulePath)(char *out, int capacity, int *dirname_length)
-{
+int WAI_PREFIX(getModulePath)(char *out, int capacity, int *dirname_length) {
     char buffer[PATH_MAX];
     char *resolved = NULL;
     int length = -1;
diff --git a/common/bucketsort.c b/common/bucketsort.c
index f61a24cb7..dd70755ec 100644
--- a/common/bucketsort.c
+++ b/common/bucketsort.c
@@ -2,8 +2,7 @@
 
 extern void bucket_sort_intersect(uint32_t *const estart, uint32_t *const estop,
                                   uint32_t *const ostart, uint32_t *const ostop,
-                                  bucket_info_t *bucket_info, bucket_array_t bucket)
-{
+                                  bucket_info_t *bucket_info, bucket_array_t bucket) {
     uint32_t *p1, *p2;
     uint32_t *start[2];
     uint32_t *stop[2];
diff --git a/common/cmd.c b/common/cmd.c
index aaca19af6..5f42c669a 100644
--- a/common/cmd.c
+++ b/common/cmd.c
@@ -31,8 +31,7 @@
  */
 #include "cmd.h"
 
-uint8_t cmd_send(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len)
-{
+uint8_t cmd_send(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len) {
     UsbCommand txcmd;
 
     for (size_t i = 0; i < sizeof(UsbCommand); i++)
diff --git a/common/crapto1/crapto1.c b/common/crapto1/crapto1.c
index a281e5f7b..ddc9f7be5 100644
--- a/common/crapto1/crapto1.c
+++ b/common/crapto1/crapto1.c
@@ -24,8 +24,7 @@
 
 #if !defined LOWMEM && defined __GNUC__
 static uint8_t filterlut[1 << 20];
-static void __attribute__((constructor)) fill_lut()
-{
+static void __attribute__((constructor)) fill_lut() {
     uint32_t i;
     for (i = 0; i < 1 << 20; ++i)
         filterlut[i] = filter(i);
@@ -36,8 +35,7 @@ static void __attribute__((constructor)) fill_lut()
 /** update_contribution
  * helper, calculates the partial linear feedback contributions and puts in MSB
  */
-static inline void update_contribution(uint32_t *item, const uint32_t mask1, const uint32_t mask2)
-{
+static inline void update_contribution(uint32_t *item, const uint32_t mask1, const uint32_t mask2) {
     uint32_t p = *item >> 25;
 
     p = p << 1 | evenparity32(*item & mask1);
@@ -48,8 +46,7 @@ static inline void update_contribution(uint32_t *item, const uint32_t mask1, con
 /** extend_table
  * using a bit of the keystream extend the table of possible lfsr states
  */
-static inline void extend_table(uint32_t *tbl, uint32_t **end, int bit, int m1, int m2, uint32_t in)
-{
+static inline void extend_table(uint32_t *tbl, uint32_t **end, int bit, int m1, int m2, uint32_t in) {
     in <<= 24;
     for (*tbl <<= 1; tbl <= *end; *++tbl <<= 1)
         if (filter(*tbl) ^ filter(*tbl | 1)) {
@@ -69,8 +66,7 @@ static inline void extend_table(uint32_t *tbl, uint32_t **end, int bit, int m1,
 /** extend_table_simple
  * using a bit of the keystream extend the table of possible lfsr states
  */
-static inline void extend_table_simple(uint32_t *tbl, uint32_t **end, int bit)
-{
+static inline void extend_table_simple(uint32_t *tbl, uint32_t **end, int bit) {
     for (*tbl <<= 1; tbl <= *end; *++tbl <<= 1) {
         if (filter(*tbl) ^ filter(*tbl | 1)) { // replace
             *tbl |= filter(*tbl) ^ bit;
@@ -88,8 +84,7 @@ static inline void extend_table_simple(uint32_t *tbl, uint32_t **end, int bit)
 static struct Crypto1State *
 recover(uint32_t *o_head, uint32_t *o_tail, uint32_t oks,
         uint32_t *e_head, uint32_t *e_tail, uint32_t eks, int rem,
-        struct Crypto1State *sl, uint32_t in, bucket_array_t bucket)
-{
+        struct Crypto1State *sl, uint32_t in, bucket_array_t bucket) {
     uint32_t *o, *e;
     bucket_info_t bucket_info;
 
@@ -133,8 +128,7 @@ recover(uint32_t *o_head, uint32_t *o_tail, uint32_t oks,
  * additionally you can use the in parameter to specify the value
  * that was fed into the lfsr at the time the keystream was generated
  */
-struct Crypto1State *lfsr_recovery32(uint32_t ks2, uint32_t in)
-{
+struct Crypto1State *lfsr_recovery32(uint32_t ks2, uint32_t in) {
     struct Crypto1State *statelist;
     uint32_t *odd_head = 0, *odd_tail = 0, oks = 0;
     uint32_t *even_head = 0, *even_tail = 0, eks = 0;
@@ -225,8 +219,7 @@ static const uint32_t C2[] = { 0x1A822E0, 0x21A822E0, 0x21A822E0};
 /** Reverse 64 bits of keystream into possible cipher states
  * Variation mentioned in the paper. Somewhat optimized version
  */
-struct Crypto1State *lfsr_recovery64(uint32_t ks2, uint32_t ks3)
-{
+struct Crypto1State *lfsr_recovery64(uint32_t ks2, uint32_t ks3) {
     struct Crypto1State *statelist, *sl;
     uint8_t oks[32], eks[32], hi[32];
     uint32_t low = 0,  win = 0;
@@ -296,8 +289,7 @@ continue2:
 /** lfsr_rollback_bit
  * Rollback the shift register in order to get previous states
  */
-uint8_t lfsr_rollback_bit(struct Crypto1State *s, uint32_t in, int fb)
-{
+uint8_t lfsr_rollback_bit(struct Crypto1State *s, uint32_t in, int fb) {
     int out;
     uint8_t ret;
     uint32_t t;
@@ -317,8 +309,7 @@ uint8_t lfsr_rollback_bit(struct Crypto1State *s, uint32_t in, int fb)
 /** lfsr_rollback_byte
  * Rollback the shift register in order to get previous states
  */
-uint8_t lfsr_rollback_byte(struct Crypto1State *s, uint32_t in, int fb)
-{
+uint8_t lfsr_rollback_byte(struct Crypto1State *s, uint32_t in, int fb) {
     uint8_t ret = 0;
     ret |= lfsr_rollback_bit(s, BIT(in, 7), fb) << 7;
     ret |= lfsr_rollback_bit(s, BIT(in, 6), fb) << 6;
@@ -333,8 +324,7 @@ uint8_t lfsr_rollback_byte(struct Crypto1State *s, uint32_t in, int fb)
 /** lfsr_rollback_word
  * Rollback the shift register in order to get previous states
  */
-uint32_t lfsr_rollback_word(struct Crypto1State *s, uint32_t in, int fb)
-{
+uint32_t lfsr_rollback_word(struct Crypto1State *s, uint32_t in, int fb) {
 
     uint32_t ret = 0;
     ret |= lfsr_rollback_bit(s, BEBIT(in, 31), fb) << (31 ^ 24);
@@ -379,8 +369,7 @@ uint32_t lfsr_rollback_word(struct Crypto1State *s, uint32_t in, int fb)
  * x,y valid tag nonces, then prng_successor(x, nonce_distance(x, y)) = y
  */
 static uint16_t *dist = 0;
-int nonce_distance(uint32_t from, uint32_t to)
-{
+int nonce_distance(uint32_t from, uint32_t to) {
     uint16_t x, i;
     if (!dist) {
         dist = calloc(2 << 16,  sizeof(uint8_t));
@@ -400,8 +389,7 @@ int nonce_distance(uint32_t from, uint32_t to)
  *   true = weak prng
  *   false = hardend prng
  */
-bool validate_prng_nonce(uint32_t nonce)
-{
+bool validate_prng_nonce(uint32_t nonce) {
     // init prng table:
     nonce_distance(nonce, nonce);
     return ((65535 - dist[nonce >> 16] + dist[nonce & 0xffff]) % 65535) == 16;
@@ -421,8 +409,7 @@ static uint32_t fastfwd[2][8] = {
  * encrypt the NACK which is observed when varying only the 3 last bits of Nr
  * only correct iff [NR_3] ^ NR_3 does not depend on Nr_3
  */
-uint32_t *lfsr_prefix_ks(uint8_t ks[8], int isodd)
-{
+uint32_t *lfsr_prefix_ks(uint8_t ks[8], int isodd) {
     uint32_t *candidates = calloc(4 << 10, sizeof(uint8_t));
     if (!candidates) return 0;
 
@@ -447,8 +434,7 @@ uint32_t *lfsr_prefix_ks(uint8_t ks[8], int isodd)
 /** check_pfx_parity
  * helper function which eliminates possible secret states using parity bits
  */
-static struct Crypto1State *check_pfx_parity(uint32_t prefix, uint32_t rresp, uint8_t parities[8][8], uint32_t odd, uint32_t even, struct Crypto1State *sl, uint32_t no_par)
-{
+static struct Crypto1State *check_pfx_parity(uint32_t prefix, uint32_t rresp, uint8_t parities[8][8], uint32_t odd, uint32_t even, struct Crypto1State *sl, uint32_t no_par) {
     uint32_t ks1, nr, ks2, rr, ks3, c, good = 1;
 
     for (c = 0; good && c < 8; ++c) {
@@ -489,8 +475,7 @@ static struct Crypto1State *check_pfx_parity(uint32_t prefix, uint32_t rresp, ui
  * tag nonce was fed in
  */
 
-struct Crypto1State *lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8], uint32_t no_par)
-{
+struct Crypto1State *lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8], uint32_t no_par) {
     struct Crypto1State *statelist, *s;
     uint32_t *odd, *even, *o, *e, top;
 
diff --git a/common/crapto1/crapto1.h b/common/crapto1/crapto1.h
index feb0c2b46..251a25089 100644
--- a/common/crapto1/crapto1.h
+++ b/common/crapto1/crapto1.h
@@ -67,8 +67,7 @@ extern bool validate_prng_nonce(uint32_t nonce);
 #define LF_POLY_EVEN (0x870804)
 #define BIT(x, n) ((x) >> (n) & 1)
 #define BEBIT(x, n) BIT(x, (n) ^ 24)
-static inline int filter(uint32_t const x)
-{
+static inline int filter(uint32_t const x) {
     uint32_t f;
 
     f  = 0xf22c0 >> (x       & 0xf) & 16;
diff --git a/common/crapto1/crypto1.c b/common/crapto1/crypto1.c
index a61a99107..0d30597cd 100644
--- a/common/crapto1/crypto1.c
+++ b/common/crapto1/crypto1.c
@@ -26,8 +26,7 @@
     (x = (x >> 8 & 0xff00ff) | (x & 0xff00ff) << 8, x = x >> 16 | x << 16)
 
 #if defined(__arm__) && !defined(__linux__) && !defined(_WIN32) && !defined(__APPLE__) // bare metal ARM Proxmark lacks malloc()/free()
-void crypto1_create(struct Crypto1State *s, uint64_t key)
-{
+void crypto1_create(struct Crypto1State *s, uint64_t key) {
     int i;
 
     for (i = 47; s && i > 0; i -= 2) {
@@ -36,14 +35,12 @@ void crypto1_create(struct Crypto1State *s, uint64_t key)
     }
     return;
 }
-void crypto1_destroy(struct Crypto1State *state)
-{
+void crypto1_destroy(struct Crypto1State *state) {
     state->odd = 0;
     state->even = 0;
 }
 #else
-struct Crypto1State *crypto1_create(uint64_t key)
-{
+struct Crypto1State *crypto1_create(uint64_t key) {
     struct Crypto1State *s = malloc(sizeof(*s));
     if (!s) return NULL;
 
@@ -56,21 +53,18 @@ struct Crypto1State *crypto1_create(uint64_t key)
     }
     return s;
 }
-void crypto1_destroy(struct Crypto1State *state)
-{
+void crypto1_destroy(struct Crypto1State *state) {
     free(state);
 }
 #endif
-void crypto1_get_lfsr(struct Crypto1State *state, uint64_t *lfsr)
-{
+void crypto1_get_lfsr(struct Crypto1State *state, uint64_t *lfsr) {
     int i;
     for (*lfsr = 0, i = 23; i >= 0; --i) {
         *lfsr = *lfsr << 1 | BIT(state->odd, i ^ 3);
         *lfsr = *lfsr << 1 | BIT(state->even, i ^ 3);
     }
 }
-uint8_t crypto1_bit(struct Crypto1State *s, uint8_t in, int is_encrypted)
-{
+uint8_t crypto1_bit(struct Crypto1State *s, uint8_t in, int is_encrypted) {
     uint32_t feedin, t;
     uint8_t ret = filter(s->odd);
 
@@ -86,8 +80,7 @@ uint8_t crypto1_bit(struct Crypto1State *s, uint8_t in, int is_encrypted)
 
     return ret;
 }
-uint8_t crypto1_byte(struct Crypto1State *s, uint8_t in, int is_encrypted)
-{
+uint8_t crypto1_byte(struct Crypto1State *s, uint8_t in, int is_encrypted) {
     uint8_t ret = 0;
     ret |= crypto1_bit(s, BIT(in, 0), is_encrypted) << 0;
     ret |= crypto1_bit(s, BIT(in, 1), is_encrypted) << 1;
@@ -99,8 +92,7 @@ uint8_t crypto1_byte(struct Crypto1State *s, uint8_t in, int is_encrypted)
     ret |= crypto1_bit(s, BIT(in, 7), is_encrypted) << 7;
     return ret;
 }
-uint32_t crypto1_word(struct Crypto1State *s, uint32_t in, int is_encrypted)
-{
+uint32_t crypto1_word(struct Crypto1State *s, uint32_t in, int is_encrypted) {
     uint32_t ret = 0;
     ret |= crypto1_bit(s, BEBIT(in, 0), is_encrypted) << (0 ^ 24);
     ret |= crypto1_bit(s, BEBIT(in, 1), is_encrypted) << (1 ^ 24);
@@ -143,8 +135,7 @@ uint32_t crypto1_word(struct Crypto1State *s, uint32_t in, int is_encrypted)
 /* prng_successor
  * helper used to obscure the keystream during authentication
  */
-uint32_t prng_successor(uint32_t x, uint32_t n)
-{
+uint32_t prng_successor(uint32_t x, uint32_t n) {
     SWAPENDIAN(x);
     while (n--)
         x = x >> 1 | (x >> 16 ^ x >> 18 ^ x >> 19 ^ x >> 21) << 31;
diff --git a/common/crc.c b/common/crc.c
index df479b94a..0846697de 100644
--- a/common/crc.c
+++ b/common/crc.c
@@ -9,16 +9,14 @@
 //
 #include "crc.h"
 
-void crc_init_ref(crc_t *crc, int order, uint32_t polynom, uint32_t initial_value, uint32_t final_xor, bool refin, bool refout)
-{
+void crc_init_ref(crc_t *crc, int order, uint32_t polynom, uint32_t initial_value, uint32_t final_xor, bool refin, bool refout) {
     crc_init(crc, order, polynom, initial_value, final_xor);
     crc->refin = refin;
     crc->refout = refout;
     crc_clear(crc);
 }
 
-void crc_init(crc_t *crc, int order, uint32_t polynom, uint32_t initial_value, uint32_t final_xor)
-{
+void crc_init(crc_t *crc, int order, uint32_t polynom, uint32_t initial_value, uint32_t final_xor) {
     crc->order = order;
     crc->topbit = BITMASK(order - 1);
     crc->polynom = polynom;
@@ -30,16 +28,14 @@ void crc_init(crc_t *crc, int order, uint32_t polynom, uint32_t initial_value, u
     crc_clear(crc);
 }
 
-void crc_clear(crc_t *crc)
-{
+void crc_clear(crc_t *crc) {
 
     crc->state = crc->initial_value & crc->mask;
     if (crc->refin)
         crc->state = reflect(crc->state, crc->order);
 }
 
-void crc_update2(crc_t *crc, uint32_t data, int data_width)
-{
+void crc_update2(crc_t *crc, uint32_t data, int data_width) {
 
     if (crc->refin)
         data = reflect(data, data_width);
@@ -56,8 +52,7 @@ void crc_update2(crc_t *crc, uint32_t data, int data_width)
     }
 }
 
-void crc_update(crc_t *crc, uint32_t data, int data_width)
-{
+void crc_update(crc_t *crc, uint32_t data, int data_width) {
     if (crc->refin)
         data = reflect(data, data_width);
 
@@ -72,8 +67,7 @@ void crc_update(crc_t *crc, uint32_t data, int data_width)
     }
 }
 
-uint32_t crc_finish(crc_t *crc)
-{
+uint32_t crc_finish(crc_t *crc) {
     uint32_t val = crc->state;
     if (crc->refout)
         val = reflect(val, crc->order);
@@ -97,8 +91,7 @@ static void print_crc(crc_t *crc) {
 */
 
 // width=8  poly=0x31  init=0x00  refin=true  refout=true  xorout=0x00  check=0xA1  name="CRC-8/MAXIM"
-uint32_t CRC8Maxim(uint8_t *buff, size_t size)
-{
+uint32_t CRC8Maxim(uint8_t *buff, size_t size) {
     crc_t crc;
     crc_init_ref(&crc, 8, 0x31, 0, 0, true, true);
     for (int i = 0; i < size; ++i)
@@ -106,8 +99,7 @@ uint32_t CRC8Maxim(uint8_t *buff, size_t size)
     return crc_finish(&crc);
 }
 // width=8 poly=0x1d, init=0xc7 (0xe3 - WRONG! but it mentioned in MAD datasheet) refin=false  refout=false  xorout=0x00 name="CRC-8/MIFARE-MAD"
-uint32_t CRC8Mad(uint8_t *buff, size_t size)
-{
+uint32_t CRC8Mad(uint8_t *buff, size_t size) {
     crc_t crc;
     crc_init_ref(&crc, 8, 0x1d, 0xc7, 0, false, false);
     for (int i = 0; i < size; ++i)
@@ -115,8 +107,7 @@ uint32_t CRC8Mad(uint8_t *buff, size_t size)
     return crc_finish(&crc);
 }
 // width=4  poly=0xC, reversed poly=0x7  init=0x5   refin=true  refout=true  xorout=0x0000  check=  name="CRC-4/LEGIC"
-uint32_t CRC4Legic(uint8_t *cmd, size_t size)
-{
+uint32_t CRC4Legic(uint8_t *cmd, size_t size) {
     crc_t crc;
     crc_init_ref(&crc, 4, 0x19 >> 1, 0x5, 0, true, true);
     crc_update2(&crc, 1, 1); /* CMD_READ */
@@ -126,8 +117,7 @@ uint32_t CRC4Legic(uint8_t *cmd, size_t size)
 }
 // width=8  poly=0x63, reversed poly=0x8D  init=0x55  refin=true  refout=true  xorout=0x0000  check=0xC6  name="CRC-8/LEGIC"
 // the CRC needs to be reversed before returned.
-uint32_t CRC8Legic(uint8_t *buff, size_t size)
-{
+uint32_t CRC8Legic(uint8_t *buff, size_t size) {
     crc_t crc;
     crc_init_ref(&crc, 8, 0x63, 0x55, 0, true, true);
     for (int i = 0; i < size; ++i)
diff --git a/common/crc16.c b/common/crc16.c
index 1142fbbac..69ada3b24 100644
--- a/common/crc16.c
+++ b/common/crc16.c
@@ -11,8 +11,7 @@ static uint16_t crc_table[256];
 static bool crc_table_init = false;
 static CrcType_t crc_type = CRC_NONE;
 
-void init_table(CrcType_t ct)
-{
+void init_table(CrcType_t ct) {
 
     // same crc algo, and initialised already
     if (ct == crc_type && crc_table_init)
@@ -50,8 +49,7 @@ void init_table(CrcType_t ct)
     }
 }
 
-void generate_table(uint16_t polynomial, bool refin)
-{
+void generate_table(uint16_t polynomial, bool refin) {
 
     uint16_t i, j, crc, c;
 
@@ -79,16 +77,14 @@ void generate_table(uint16_t polynomial, bool refin)
     crc_table_init = true;
 }
 
-void reset_table(void)
-{
+void reset_table(void) {
     memset(crc_table, 0, sizeof(crc_table));
     crc_table_init = false;
     crc_type = CRC_NONE;
 }
 
 // table lookup LUT solution
-uint16_t crc16_fast(uint8_t const *d, size_t n, uint16_t initval, bool refin, bool refout)
-{
+uint16_t crc16_fast(uint8_t const *d, size_t n, uint16_t initval, bool refin, bool refout) {
 
     // fast lookup table algorithm without augmented zero bytes, e.g. used in pkzip.
     // only usable with polynom orders of 8, 16, 24 or 32.
@@ -112,8 +108,7 @@ uint16_t crc16_fast(uint8_t const *d, size_t n, uint16_t initval, bool refin, bo
 }
 
 // bit looped solution  TODO REMOVED
-uint16_t update_crc16_ex(uint16_t crc, uint8_t c, uint16_t polynomial)
-{
+uint16_t update_crc16_ex(uint16_t crc, uint8_t c, uint16_t polynomial) {
     uint16_t i, v, tmp = 0;
 
     v = (crc ^ c) & 0xff;
@@ -129,14 +124,12 @@ uint16_t update_crc16_ex(uint16_t crc, uint8_t c, uint16_t polynomial)
     }
     return ((crc >> 8) ^ tmp) & 0xffff;
 }
-uint16_t update_crc16(uint16_t crc, uint8_t c)
-{
+uint16_t update_crc16(uint16_t crc, uint8_t c) {
     return update_crc16_ex(crc, c, CRC16_POLY_CCITT);
 }
 
 // two ways.  msb or lsb loop.
-uint16_t crc16(uint8_t const *d, size_t length, uint16_t remainder, uint16_t polynomial, bool refin, bool refout)
-{
+uint16_t crc16(uint8_t const *d, size_t length, uint16_t remainder, uint16_t polynomial, bool refin, bool refout) {
     if (length == 0)
         return (~remainder);
 
@@ -163,8 +156,7 @@ uint16_t crc16(uint8_t const *d, size_t length, uint16_t remainder, uint16_t pol
     return remainder;
 }
 
-void compute_crc(CrcType_t ct, const uint8_t *d, size_t n, uint8_t *first, uint8_t *second)
-{
+void compute_crc(CrcType_t ct, const uint8_t *d, size_t n, uint8_t *first, uint8_t *second) {
 
     // can't calc a crc on less than 1 byte
     if (n == 0) return;
@@ -199,8 +191,7 @@ void compute_crc(CrcType_t ct, const uint8_t *d, size_t n, uint8_t *first, uint8
     *first = (crc & 0xFF);
     *second = ((crc >> 8) & 0xFF);
 }
-uint16_t crc(CrcType_t ct, const uint8_t *d, size_t n)
-{
+uint16_t crc(CrcType_t ct, const uint8_t *d, size_t n) {
 
     // can't calc a crc on less than 3 byte. (1byte + 2 crc bytes)
     if (n < 3) return 0;
@@ -236,8 +227,7 @@ uint16_t crc(CrcType_t ct, const uint8_t *d, size_t n)
 // crc16 algos like CRC-A become 0x000
 // while CRC-15693 become 0x0F47
 // If calculated with crc bytes,  the residue should be 0xF0B8
-bool check_crc(CrcType_t ct, const uint8_t *d, size_t n)
-{
+bool check_crc(CrcType_t ct, const uint8_t *d, size_t n) {
 
     // can't calc a crc on less than 3 byte. (1byte + 2 crc bytes)
     if (n < 3) return false;
@@ -265,22 +255,19 @@ bool check_crc(CrcType_t ct, const uint8_t *d, size_t n)
 }
 
 // poly=0x1021  init=0xffff  refin=false  refout=false  xorout=0x0000  check=0x29b1  residue=0x0000  name="CRC-16/CCITT-FALSE"
-uint16_t crc16_ccitt(uint8_t const *d, size_t n)
-{
+uint16_t crc16_ccitt(uint8_t const *d, size_t n) {
     return crc16_fast(d, n, 0xffff, false, false);
 }
 
 // FDX-B ISO11784/85) uses KERMIT
 // poly=0x1021  init=0x0000  refin=true  refout=true  xorout=0x0000 name="KERMIT"
-uint16_t crc16_kermit(uint8_t const *d, size_t n)
-{
+uint16_t crc16_kermit(uint8_t const *d, size_t n) {
     return crc16_fast(d, n, 0x0000, true, true);
 }
 
 // FeliCa uses XMODEM
 // poly=0x1021  init=0x0000  refin=false  refout=false  xorout=0x0000 name="XMODEM"
-uint16_t crc16_xmodem(uint8_t const *d, size_t n)
-{
+uint16_t crc16_xmodem(uint8_t const *d, size_t n) {
     return crc16_fast(d, n, 0x0000, false, false);
 }
 
@@ -289,16 +276,14 @@ uint16_t crc16_xmodem(uint8_t const *d, size_t n)
 //   ISO 14443 CRC-B
 //   ISO/IEC 13239 (formerly ISO/IEC 3309)
 // poly=0x1021  init=0xffff  refin=true  refout=true  xorout=0xffff name="X-25"
-uint16_t crc16_x25(uint8_t const *d, size_t n)
-{
+uint16_t crc16_x25(uint8_t const *d, size_t n) {
     uint16_t crc = crc16_fast(d, n, 0xffff, true, true);
     crc = ~crc;
     return crc;
 }
 // CRC-A (14443-3)
 // poly=0x1021 init=0xc6c6 refin=true refout=true xorout=0x0000 name="CRC-A"
-uint16_t crc16_a(uint8_t const *d, size_t n)
-{
+uint16_t crc16_a(uint8_t const *d, size_t n) {
     return crc16_fast(d, n, 0xC6C6, true, true);
 }
 
@@ -306,15 +291,13 @@ uint16_t crc16_a(uint8_t const *d, size_t n)
 // initvalue  0x4807 reflected 0xE012
 // poly       0x1021 reflected 0x8408
 // poly=0x1021  init=0x4807  refin=true  refout=true  xorout=0x0BC3  check=0xF0B8  name="CRC-16/ICLASS"
-uint16_t crc16_iclass(uint8_t const *d, size_t n)
-{
+uint16_t crc16_iclass(uint8_t const *d, size_t n) {
     return crc16_fast(d, n, 0x4807, true, true);
 }
 
 // This CRC-16 is used in Legic Advant systems.
 // poly=0xB400,  init=depends  refin=true  refout=true  xorout=0x0000  check=  name="CRC-16/LEGIC"
-uint16_t crc16_legic(uint8_t const *d, size_t n, uint8_t uidcrc)
-{
+uint16_t crc16_legic(uint8_t const *d, size_t n, uint8_t uidcrc) {
     uint16_t initial = uidcrc << 8 | uidcrc;
     return crc16_fast(d, n, initial, true, true);
 }
diff --git a/common/crc32.c b/common/crc32.c
index 245dcf1a8..3ee102ce5 100644
--- a/common/crc32.c
+++ b/common/crc32.c
@@ -5,8 +5,7 @@
 
 static void crc32_byte(uint32_t *crc, const uint8_t value);
 
-static void crc32_byte(uint32_t *crc, const uint8_t value)
-{
+static void crc32_byte(uint32_t *crc, const uint8_t value) {
     /* x32 + x26 + x23 + x22 + x16 + x12 + x11 + x10 + x8 + x7 + x5 + x4 + x2 + x + 1 */
     const uint32_t poly = 0xEDB88320;
 
@@ -19,8 +18,7 @@ static void crc32_byte(uint32_t *crc, const uint8_t value)
     }
 }
 
-void crc32_ex(const uint8_t *data, const size_t len, uint8_t *crc)
-{
+void crc32_ex(const uint8_t *data, const size_t len, uint8_t *crc) {
     uint32_t desfire_crc = CRC32_PRESET;
     for (size_t i = 0; i < len; i++) {
         crc32_byte(&desfire_crc, data[i]);
@@ -29,7 +27,6 @@ void crc32_ex(const uint8_t *data, const size_t len, uint8_t *crc)
     *((uint32_t *)(crc)) = htole32(desfire_crc);
 }
 
-void crc32_append(uint8_t *data, const size_t len)
-{
+void crc32_append(uint8_t *data, const size_t len) {
     crc32_ex(data, len, data + len);
 }
\ No newline at end of file
diff --git a/common/crc64.c b/common/crc64.c
index db33c8db3..7d582da02 100644
--- a/common/crc64.c
+++ b/common/crc64.c
@@ -72,8 +72,7 @@ const uint64_t crc64_table[] = {
     0x5DEDC41A34BBEEB2, 0x1F1D25F19D51D821, 0xD80C07CD676F8394, 0x9AFCE626CE85B507
 };
 
-void crc64(const uint8_t *data, const size_t len, uint64_t *crc)
-{
+void crc64(const uint8_t *data, const size_t len, uint64_t *crc) {
 
     for (size_t i = 0; i < len; i++) {
         uint8_t tableIndex = (((uint8_t)(*crc >> 56)) ^ data[i]) & 0xff;
diff --git a/common/i2c.c b/common/i2c.c
index 344d5d9ee..80fb2690c 100644
--- a/common/i2c.c
+++ b/common/i2c.c
@@ -30,8 +30,7 @@ volatile unsigned long c;
 // timer.
 // I2CSpinDelayClk(4) = 12.31us
 // I2CSpinDelayClk(1) = 3.07us
-void __attribute__((optimize("O0"))) I2CSpinDelayClk(uint16_t delay)
-{
+void __attribute__((optimize("O0"))) I2CSpinDelayClk(uint16_t delay) {
     for (c = delay * 2; c; c--) {};
 }
 
@@ -42,8 +41,7 @@ void __attribute__((optimize("O0"))) I2CSpinDelayClk(uint16_t delay)
 #define  ISO7618_MAX_FRAME 255
 
 // try i2c bus recovery at 100kHz = 5uS high, 5uS low
-void I2C_recovery(void)
-{
+void I2C_recovery(void) {
 
     DbpString("Performing i2c bus recovery");
 
@@ -76,8 +74,7 @@ void I2C_recovery(void)
         DbpString("I2C bus recovery complete");
 }
 
-void I2C_init(void)
-{
+void I2C_init(void) {
     // Configure reset pin, close up pull up, push-pull output, default high
     AT91C_BASE_PIOA->PIO_PPUDR = GPIO_RST;
     AT91C_BASE_PIOA->PIO_MDDR = GPIO_RST;
@@ -100,8 +97,7 @@ void I2C_init(void)
 }
 
 // set the reset state
-void I2C_SetResetStatus(uint8_t LineRST, uint8_t LineSCK, uint8_t LineSDA)
-{
+void I2C_SetResetStatus(uint8_t LineRST, uint8_t LineSCK, uint8_t LineSDA) {
     if (LineRST)
         HIGH(GPIO_RST);
     else
@@ -120,8 +116,7 @@ void I2C_SetResetStatus(uint8_t LineRST, uint8_t LineSCK, uint8_t LineSDA)
 
 // Reset the SIM_Adapter, then  enter the main program
 // Note: the SIM_Adapter will not enter the main program after power up. Please run this function before use SIM_Adapter.
-void I2C_Reset_EnterMainProgram(void)
-{
+void I2C_Reset_EnterMainProgram(void) {
     StartTicks();
     I2C_init();
     I2C_SetResetStatus(0, 0, 0);
@@ -134,8 +129,7 @@ void I2C_Reset_EnterMainProgram(void)
 
 // Reset the SIM_Adapter, then enter the bootloader program
 // Reserve for firmware update.
-void I2C_Reset_EnterBootloader(void)
-{
+void I2C_Reset_EnterBootloader(void) {
     StartTicks();
     I2C_init();
     I2C_SetResetStatus(0, 1, 1);
@@ -145,8 +139,7 @@ void I2C_Reset_EnterBootloader(void)
 }
 
 // Wait for the clock to go High.
-bool WaitSCL_H_delay(uint32_t delay)
-{
+bool WaitSCL_H_delay(uint32_t delay) {
     while (delay--) {
         if (SCL_read) {
             return true;
@@ -158,13 +151,11 @@ bool WaitSCL_H_delay(uint32_t delay)
 
 // 5000 * 3.07us = 15350us. 15.35ms
 // 15000 * 3.07us = 46050us. 46.05ms
-bool WaitSCL_H(void)
-{
+bool WaitSCL_H(void) {
     return WaitSCL_H_delay(15000);
 }
 
-bool WaitSCL_L_delay(uint32_t delay)
-{
+bool WaitSCL_L_delay(uint32_t delay) {
     while (delay--) {
         if (!SCL_read) {
             return true;
@@ -174,16 +165,14 @@ bool WaitSCL_L_delay(uint32_t delay)
     return false;
 }
 // 5000 * 3.07us = 15350us. 15.35ms
-bool WaitSCL_L(void)
-{
+bool WaitSCL_L(void) {
     return WaitSCL_L_delay(15000);
 }
 
 // Wait max 1800ms or until SCL goes LOW.
 // It timeout reading response from card
 // Which ever comes first
-bool WaitSCL_L_timeout(void)
-{
+bool WaitSCL_L_timeout(void) {
     volatile uint16_t delay = 1800;
     while (delay--) {
         // exit on SCL LOW
@@ -195,8 +184,7 @@ bool WaitSCL_L_timeout(void)
     return (delay == 0);
 }
 
-bool I2C_Start(void)
-{
+bool I2C_Start(void) {
 
     I2C_DELAY_XCLK(4);
     SDA_H;
@@ -214,8 +202,7 @@ bool I2C_Start(void)
     return true;
 }
 
-bool I2C_WaitForSim()
-{
+bool I2C_WaitForSim() {
 
     // wait for data from card
     if (!WaitSCL_L_timeout())
@@ -231,8 +218,7 @@ bool I2C_WaitForSim()
 }
 
 // send i2c STOP
-void I2C_Stop(void)
-{
+void I2C_Stop(void) {
     SCL_L;
     I2C_DELAY_2CLK;
     SDA_L;
@@ -245,8 +231,7 @@ void I2C_Stop(void)
 }
 
 // Send i2c ACK
-void I2C_Ack(void)
-{
+void I2C_Ack(void) {
     SCL_L;
     I2C_DELAY_2CLK;
     SDA_L;
@@ -259,8 +244,7 @@ void I2C_Ack(void)
 }
 
 // Send i2c NACK
-void I2C_NoAck(void)
-{
+void I2C_NoAck(void) {
     SCL_L;
     I2C_DELAY_2CLK;
     SDA_H;
@@ -272,8 +256,7 @@ void I2C_NoAck(void)
     I2C_DELAY_2CLK;
 }
 
-bool I2C_WaitAck(void)
-{
+bool I2C_WaitAck(void) {
     SCL_L;
     I2C_DELAY_1CLK;
     SDA_H;
@@ -292,8 +275,7 @@ bool I2C_WaitAck(void)
     return true;
 }
 
-void I2C_SendByte(uint8_t data)
-{
+void I2C_SendByte(uint8_t data) {
     uint8_t bits = 8;
 
     while (bits--) {
@@ -319,8 +301,7 @@ void I2C_SendByte(uint8_t data)
     SCL_L;
 }
 
-int16_t I2C_ReadByte(void)
-{
+int16_t I2C_ReadByte(void) {
     uint8_t bits = 8, b = 0;
 
     SDA_H;
@@ -343,8 +324,7 @@ int16_t I2C_ReadByte(void)
 }
 
 // Sends one byte  ( command to be written, SlaveDevice address)
-bool I2C_WriteCmd(uint8_t device_cmd, uint8_t device_address)
-{
+bool I2C_WriteCmd(uint8_t device_cmd, uint8_t device_address) {
     bool bBreak = true;
     do {
         if (!I2C_Start())
@@ -370,8 +350,7 @@ bool I2C_WriteCmd(uint8_t device_cmd, uint8_t device_address)
 }
 
 // Sends 1 byte data (Data to be written, command to be written , SlaveDevice address  ).
-bool I2C_WriteByte(uint8_t data, uint8_t device_cmd, uint8_t device_address)
-{
+bool I2C_WriteByte(uint8_t data, uint8_t device_cmd, uint8_t device_address) {
     bool bBreak = true;
     do {
         if (!I2C_Start())
@@ -402,8 +381,7 @@ bool I2C_WriteByte(uint8_t data, uint8_t device_cmd, uint8_t device_address)
 
 //Sends array of data (Array, length, command to be written , SlaveDevice address  ).
 // len = uint8 (max buffer to write 256bytes)
-bool I2C_BufferWrite(uint8_t *data, uint8_t len, uint8_t device_cmd, uint8_t device_address)
-{
+bool I2C_BufferWrite(uint8_t *data, uint8_t len, uint8_t device_cmd, uint8_t device_address) {
     bool bBreak = true;
     do {
         if (!I2C_Start())
@@ -441,8 +419,7 @@ bool I2C_BufferWrite(uint8_t *data, uint8_t len, uint8_t device_cmd, uint8_t dev
 
 // read one array of data (Data array, Readout length, command to be written , SlaveDevice address  ).
 // len = uint8 (max buffer to read 256bytes)
-int16_t I2C_BufferRead(uint8_t *data, uint8_t len, uint8_t device_cmd, uint8_t device_address)
-{
+int16_t I2C_BufferRead(uint8_t *data, uint8_t len, uint8_t device_cmd, uint8_t device_address) {
 
     if (!data || len == 0)
         return 0;
@@ -513,8 +490,7 @@ int16_t I2C_BufferRead(uint8_t *data, uint8_t len, uint8_t device_cmd, uint8_t d
     return --readcount;
 }
 
-int16_t I2C_ReadFW(uint8_t *data, uint8_t len, uint8_t msb, uint8_t lsb, uint8_t device_address)
-{
+int16_t I2C_ReadFW(uint8_t *data, uint8_t len, uint8_t msb, uint8_t lsb, uint8_t device_address) {
     //START, 0xB0, 0x00, 0x00, START, 0xB1, xx, yy, zz, ......, STOP
     bool bBreak = true;
     uint8_t readcount = 0;
@@ -576,8 +552,7 @@ int16_t I2C_ReadFW(uint8_t *data, uint8_t len, uint8_t msb, uint8_t lsb, uint8_t
     return readcount;
 }
 
-bool I2C_WriteFW(uint8_t *data, uint8_t len, uint8_t msb, uint8_t lsb, uint8_t device_address)
-{
+bool I2C_WriteFW(uint8_t *data, uint8_t len, uint8_t msb, uint8_t lsb, uint8_t device_address) {
     //START, 0xB0, 0x00, 0x00, xx, yy, zz, ......, STOP
     bool bBreak = true;
 
@@ -619,8 +594,7 @@ bool I2C_WriteFW(uint8_t *data, uint8_t len, uint8_t msb, uint8_t lsb, uint8_t d
     return true;
 }
 
-void I2C_print_status(void)
-{
+void I2C_print_status(void) {
     DbpString("Smart card module (ISO 7816)");
     uint8_t resp[] = {0, 0, 0, 0};
     I2C_Reset_EnterMainProgram();
@@ -632,8 +606,7 @@ void I2C_print_status(void)
 }
 
 // Will read response from smart card module,  retries 3 times to get the data.
-bool sc_rx_bytes(uint8_t *dest, uint8_t *destlen)
-{
+bool sc_rx_bytes(uint8_t *dest, uint8_t *destlen) {
 
     uint8_t i = 3;
     int16_t len = 0;
@@ -660,8 +633,7 @@ bool sc_rx_bytes(uint8_t *dest, uint8_t *destlen)
     return true;
 }
 
-bool GetATR(smart_card_atr_t *card_ptr)
-{
+bool GetATR(smart_card_atr_t *card_ptr) {
 
     if (!card_ptr)
         return false;
@@ -713,8 +685,7 @@ bool GetATR(smart_card_atr_t *card_ptr)
     return true;
 }
 
-void SmartCardAtr(void)
-{
+void SmartCardAtr(void) {
     smart_card_atr_t card;
     LED_D_ON();
     clear_trace();
@@ -726,8 +697,7 @@ void SmartCardAtr(void)
     LEDsoff();
 }
 
-void SmartCardRaw(uint64_t arg0, uint64_t arg1, uint8_t *data)
-{
+void SmartCardRaw(uint64_t arg0, uint64_t arg1, uint8_t *data) {
 
     LED_D_ON();
 
@@ -779,8 +749,7 @@ OUT:
     LEDsoff();
 }
 
-void SmartCardUpgrade(uint64_t arg0)
-{
+void SmartCardUpgrade(uint64_t arg0) {
 
     LED_C_ON();
 
@@ -840,12 +809,10 @@ void SmartCardUpgrade(uint64_t arg0)
     BigBuf_free();
 }
 
-void SmartCardSetBaud(uint64_t arg0)
-{
+void SmartCardSetBaud(uint64_t arg0) {
 }
 
-void SmartCardSetClock(uint64_t arg0)
-{
+void SmartCardSetClock(uint64_t arg0) {
     LED_D_ON();
     set_tracing(true);
     I2C_Reset_EnterMainProgram();
diff --git a/common/iso14443crc.c b/common/iso14443crc.c
index 63fa5459b..d0884cf39 100644
--- a/common/iso14443crc.c
+++ b/common/iso14443crc.c
@@ -9,8 +9,7 @@
 #include "iso14443crc.h"
 
 
-uint16_t UpdateCrc14443(uint8_t b, uint16_t *crc)
-{
+uint16_t UpdateCrc14443(uint8_t b, uint16_t *crc) {
     b = (b ^ (uint8_t)((*crc) & 0x00FF));
     b = (b ^ (b << 4));
     *crc = (*crc >> 8) ^ ((uint16_t) b << 8) ^ ((uint16_t) b << 3) ^ ((uint16_t) b >> 4);
@@ -18,8 +17,7 @@ uint16_t UpdateCrc14443(uint8_t b, uint16_t *crc)
 }
 
 void ComputeCrc14443(uint16_t CrcType, const uint8_t *data, int length,
-                     uint8_t *TransmitFirst, uint8_t *TransmitSecond)
-{
+                     uint8_t *TransmitFirst, uint8_t *TransmitSecond) {
     uint8_t b;
     uint16_t crc = CrcType;
 
@@ -36,8 +34,7 @@ void ComputeCrc14443(uint16_t CrcType, const uint8_t *data, int length,
     return;
 }
 
-bool CheckCrc14443(uint16_t CrcType, const uint8_t *data, int length)
-{
+bool CheckCrc14443(uint16_t CrcType, const uint8_t *data, int length) {
     if (length < 3) return false;
     uint8_t b1, b2;
     ComputeCrc14443(CrcType, data, length - 2, &b1, &b2);
diff --git a/common/iso15693tools.c b/common/iso15693tools.c
index 2da2b236f..7b64c99d1 100644
--- a/common/iso15693tools.c
+++ b/common/iso15693tools.c
@@ -12,8 +12,7 @@
 // target    char* buffer, where to put the UID, if NULL a static buffer is returned
 // uid[]     the UID in transmission order
 // return: ptr to string
-char *Iso15693sprintUID(char *target, uint8_t *uid)
-{
+char *Iso15693sprintUID(char *target, uint8_t *uid) {
 
     static char tempbuf[2 * 8 + 1] = {0};
     if (target == NULL)
diff --git a/common/legic_prng.c b/common/legic_prng.c
index 96202e1a4..fd5543cf7 100644
--- a/common/legic_prng.c
+++ b/common/legic_prng.c
@@ -27,8 +27,7 @@ struct lfsr {
 // it sets b to 0 aswell to make sure we get a all zero keystream out
 // which is used in the initialisation phase sending the IV
 //
-void legic_prng_init(uint8_t iv)
-{
+void legic_prng_init(uint8_t iv) {
     lfsr.a = iv;
     lfsr.b = 0;  // hack to get a always 0 keystream
     lfsr.c = 0;
@@ -36,8 +35,7 @@ void legic_prng_init(uint8_t iv)
         lfsr.b = (iv << 1) | 1;
 }
 
-void legic_prng_forward(int count)
-{
+void legic_prng_forward(int count) {
     if (count == 0) return;
 
     lfsr.c += count;
@@ -48,19 +46,16 @@ void legic_prng_forward(int count)
     }
 }
 
-uint32_t legic_prng_count()
-{
+uint32_t legic_prng_count() {
     return lfsr.c;
 }
 
-uint8_t legic_prng_get_bit()
-{
+uint8_t legic_prng_get_bit() {
     uint8_t idx = 7 - ((lfsr.a & 4) | (lfsr.a >> 2 & 2) | (lfsr.a >> 4 & 1));
     return lfsr.b >> idx & 1;
 }
 
-uint32_t legic_prng_get_bits(uint8_t len)
-{
+uint32_t legic_prng_get_bits(uint8_t len) {
     uint32_t a = 0;
     for (uint8_t i = 0; i < len; ++i) {
         a |= legic_prng_get_bit() << i;
diff --git a/common/lfdemod.c b/common/lfdemod.c
index e86ccf9a1..f356e7578 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -64,13 +64,11 @@ uint8_t g_debugMode = 0;
 #endif
 
 signal_t signalprop = { 255, -255, 0, 0, true };
-signal_t *getSignalProperties(void)
-{
+signal_t *getSignalProperties(void) {
     return &signalprop;
 }
 
-static void resetSignal(void)
-{
+static void resetSignal(void) {
     signalprop.low = 255;
     signalprop.high = -255;
     signalprop.mean = 0;
@@ -78,8 +76,7 @@ static void resetSignal(void)
     signalprop.isnoise = true;
 }
 
-static void printSignal(void)
-{
+static void printSignal(void) {
     prnt("LF signal properties:");
     prnt("  high..........%d", signalprop.high);
     prnt("  low...........%d", signalprop.low);
@@ -89,8 +86,7 @@ static void printSignal(void)
     prnt("  THRESHOLD noise amplitude......%d", NOISE_AMPLITUDE_THRESHOLD);
 }
 
-void computeSignalProperties(uint8_t *samples, uint32_t size)
-{
+void computeSignalProperties(uint8_t *samples, uint32_t size) {
     resetSignal();
 
     uint32_t sum = 0;
@@ -111,8 +107,7 @@ void computeSignalProperties(uint8_t *samples, uint32_t size)
         printSignal();
 }
 
-void removeSignalOffset(uint8_t *samples, uint32_t size)
-{
+void removeSignalOffset(uint8_t *samples, uint32_t size) {
     if (samples == NULL || size < SIGNAL_MIN_SAMPLES) return;
 
     int acc_off = 0;
@@ -134,8 +129,7 @@ void removeSignalOffset(uint8_t *samples, uint32_t size)
 //by marshmellow
 //get high and low values of a wave with passed in fuzz factor. also return noise test = 1 for passed or 0 for only noise
 //void getHiLo(uint8_t *bits, size_t size, int *high, int *low, uint8_t fuzzHi, uint8_t fuzzLo) {
-void getHiLo(int *high, int *low, uint8_t fuzzHi, uint8_t fuzzLo)
-{
+void getHiLo(int *high, int *low, uint8_t fuzzHi, uint8_t fuzzLo) {
     // add fuzz.
     *high = (signalprop.high * fuzzHi) / 100;
     if (signalprop.low < 0) {
@@ -159,16 +153,14 @@ void getHiLo(int *high, int *low, uint8_t fuzzHi, uint8_t fuzzLo)
 // by marshmellow
 // pass bits to be tested in bits, length bits passed in bitLen, and parity type (even=0 | odd=1) in pType
 // returns 1 if passed
-bool parityTest(uint32_t bits, uint8_t bitLen, uint8_t pType)
-{
+bool parityTest(uint32_t bits, uint8_t bitLen, uint8_t pType) {
     return oddparity32(bits) ^ pType;
 }
 
 //by marshmellow
 // takes a array of binary values, start position, length of bits per parity (includes parity bit - MAX 32),
 //   Parity Type (1 for odd; 0 for even; 2 for Always 1's; 3 for Always 0's), and binary Length (length to run)
-size_t removeParity(uint8_t *bits, size_t startIdx, uint8_t pLen, uint8_t pType, size_t bLen)
-{
+size_t removeParity(uint8_t *bits, size_t startIdx, uint8_t pLen, uint8_t pType, size_t bLen) {
     uint32_t parityWd = 0;
     size_t bitCnt = 0;
     for (int word = 0; word < (bLen); word += pLen) {
@@ -203,8 +195,7 @@ size_t removeParity(uint8_t *bits, size_t startIdx, uint8_t pLen, uint8_t pType,
 // takes a array of binary values, length of bits per parity (includes parity bit),
 //   Parity Type (1 for odd; 0 for even; 2 Always 1's; 3 Always 0's), and binary Length (length to run)
 //   Make sure *dest is long enough to store original sourceLen + #_of_parities_to_be_added
-size_t addParity(uint8_t *src, uint8_t *dest, uint8_t sourceLen, uint8_t pLen, uint8_t pType)
-{
+size_t addParity(uint8_t *src, uint8_t *dest, uint8_t sourceLen, uint8_t pLen, uint8_t pType) {
     uint32_t parityWd = 0;
     size_t j = 0, bitCnt = 0;
     for (int word = 0; word < sourceLen; word += pLen - 1) {
@@ -233,8 +224,7 @@ size_t addParity(uint8_t *src, uint8_t *dest, uint8_t sourceLen, uint8_t pLen, u
 }
 
 // array must be size dividable with 8
-uint8_t bits_to_array(const uint8_t *bits, size_t size, uint8_t *dest)
-{
+uint8_t bits_to_array(const uint8_t *bits, size_t size, uint8_t *dest) {
     if ((size == 0) || (size % 8) != 0) return 0;
 
     for (uint32_t i = 0; i < (size / 8); i++)
@@ -243,8 +233,7 @@ uint8_t bits_to_array(const uint8_t *bits, size_t size, uint8_t *dest)
     return 0;
 }
 
-uint32_t bytebits_to_byte(uint8_t *src, size_t numbits)
-{
+uint32_t bytebits_to_byte(uint8_t *src, size_t numbits) {
     uint32_t num = 0;
     for (int i = 0 ; i < numbits ; i++) {
         num = (num << 1) | (*src);
@@ -254,8 +243,7 @@ uint32_t bytebits_to_byte(uint8_t *src, size_t numbits)
 }
 
 //least significant bit first
-uint32_t bytebits_to_byteLSBF(uint8_t *src, size_t numbits)
-{
+uint32_t bytebits_to_byteLSBF(uint8_t *src, size_t numbits) {
     uint32_t num = 0;
     for (int i = 0 ; i < numbits ; i++) {
         num = (num << 1) | *(src + (numbits - (i + 1)));
@@ -265,16 +253,14 @@ uint32_t bytebits_to_byteLSBF(uint8_t *src, size_t numbits)
 
 //by marshmellow
 //search for given preamble in given BitStream and return success = TRUE or fail = FALSE and startIndex and length
-bool preambleSearch(uint8_t *bits, uint8_t *preamble, size_t pLen, size_t *size, size_t *startIdx)
-{
+bool preambleSearch(uint8_t *bits, uint8_t *preamble, size_t pLen, size_t *size, size_t *startIdx) {
     return preambleSearchEx(bits, preamble, pLen, size, startIdx, false);
 }
 //by marshmellow
 // search for given preamble in given BitStream and return success=1 or fail=0 and startIndex (where it was found) and length if not fineone
 // fineone does not look for a repeating preamble for em4x05/4x69 sends preamble once, so look for it once in the first pLen bits
 //(iceman) FINDONE,  only finds start index. NOT SIZE!.  I see Em410xDecode (lfdemod.c) uses SIZE to determine success
-bool preambleSearchEx(uint8_t *bits, uint8_t *preamble, size_t pLen, size_t *size, size_t *startIdx, bool findone)
-{
+bool preambleSearchEx(uint8_t *bits, uint8_t *preamble, size_t pLen, size_t *size, size_t *startIdx, bool findone) {
     // Sanity check.  If preamble length is bigger than bits length.
     if (*size <= pLen) return false;
 
@@ -299,8 +285,7 @@ bool preambleSearchEx(uint8_t *bits, uint8_t *preamble, size_t pLen, size_t *siz
 }
 
 // find start of modulating data (for fsk and psk) in case of beginning noise or slow chip startup.
-size_t findModStart(uint8_t *src, size_t size, uint8_t expWaveSize)
-{
+size_t findModStart(uint8_t *src, size_t size, uint8_t expWaveSize) {
     size_t i = 0;
     size_t waveSizeCnt = 0;
     uint8_t thresholdCnt = 0;
@@ -325,8 +310,7 @@ size_t findModStart(uint8_t *src, size_t size, uint8_t expWaveSize)
     return i;
 }
 
-int getClosestClock(int testclk)
-{
+int getClosestClock(int testclk) {
     uint16_t clocks[] = {8, 16, 32, 40, 50, 64, 128, 256, 384};
     uint8_t limit[]  = {1,  2,  4,  4,  5,  8,   8,   8,   8};
 
@@ -337,21 +321,18 @@ int getClosestClock(int testclk)
     return 0;
 }
 
-void getNextLow(uint8_t *samples, size_t size, int low, size_t *i)
-{
+void getNextLow(uint8_t *samples, size_t size, int low, size_t *i) {
     while ((samples[*i] > low) && (*i < size))
         *i += 1;
 }
 
-void getNextHigh(uint8_t *samples, size_t size, int high, size_t *i)
-{
+void getNextHigh(uint8_t *samples, size_t size, int high, size_t *i) {
     while ((samples[*i] < high) && (*i < size))
         *i += 1;
 }
 
 // load wave counters
-bool loadWaveCounters(uint8_t *samples, size_t size, int lowToLowWaveLen[], int highToLowWaveLen[], int *waveCnt, int *skip, int *minClk, int *high, int *low)
-{
+bool loadWaveCounters(uint8_t *samples, size_t size, int lowToLowWaveLen[], int highToLowWaveLen[], int *waveCnt, int *skip, int *minClk, int *high, int *low) {
     size_t i = 0, firstLow, firstHigh;
     //size_t testsize = (size < 512) ? size : 512;
 
@@ -391,8 +372,7 @@ bool loadWaveCounters(uint8_t *samples, size_t size, int lowToLowWaveLen[], int
     return true;
 }
 
-size_t pskFindFirstPhaseShift(uint8_t *samples, size_t size, uint8_t *curPhase, size_t waveStart, uint16_t fc, uint16_t *fullWaveLen)
-{
+size_t pskFindFirstPhaseShift(uint8_t *samples, size_t size, uint8_t *curPhase, size_t waveStart, uint16_t fc, uint16_t *fullWaveLen) {
     uint16_t loopCnt = (size + 3 < 4096) ? size : 4096; //don't need to loop through entire array...
 
     uint16_t avgWaveVal = 0, lastAvgWaveVal = 0;
@@ -421,8 +401,7 @@ size_t pskFindFirstPhaseShift(uint8_t *samples, size_t size, uint8_t *curPhase,
 
 //by marshmellow
 //amplify based on ask edge detection  -  not accurate enough to use all the time
-void askAmp(uint8_t *bits, size_t size)
-{
+void askAmp(uint8_t *bits, size_t size) {
     uint8_t last = 128;
     for (size_t i = 1; i < size; ++i) {
         if (bits[i] - bits[i - 1] >= 30) //large jump up
@@ -435,8 +414,7 @@ void askAmp(uint8_t *bits, size_t size)
 }
 
 // iceman, simplify this
-uint32_t manchesterEncode2Bytes(uint16_t datain)
-{
+uint32_t manchesterEncode2Bytes(uint16_t datain) {
     uint32_t output = 0;
     uint8_t curBit = 0;
     for (uint8_t i = 0; i < 16; i++) {
@@ -449,8 +427,7 @@ uint32_t manchesterEncode2Bytes(uint16_t datain)
 //by marshmellow
 //encode binary data into binary manchester
 //NOTE: bitstream must have triple the size of "size" available in memory to do the swap
-int ManchesterEncode(uint8_t *bits, size_t size)
-{
+int ManchesterEncode(uint8_t *bits, size_t size) {
     //allow up to 4096b out (means bits must be at least 2048+4096 to handle the swap)
     size = (size > 2048) ? 2048 : size;
     size_t modIdx = size;
@@ -468,8 +445,7 @@ int ManchesterEncode(uint8_t *bits, size_t size)
 // by marshmellow
 // to detect a wave that has heavily clipped (clean) samples
 // loop 512 samples,   if 250 of them is deemed maxed out,  we assume the wave is clipped.
-bool DetectCleanAskWave(uint8_t *dest, size_t size, uint8_t high, uint8_t low)
-{
+bool DetectCleanAskWave(uint8_t *dest, size_t size, uint8_t high, uint8_t low) {
     bool allArePeaks = true;
     uint16_t cntPeaks = 0;
     size_t loopEnd = 512 + 160;
@@ -500,8 +476,7 @@ bool DetectCleanAskWave(uint8_t *dest, size_t size, uint8_t high, uint8_t low)
 // by marshmellow
 // to help detect clocks on heavily clipped samples
 // based on count of low to low
-int DetectStrongAskClock(uint8_t *dest, size_t size, int high, int low, int *clock)
-{
+int DetectStrongAskClock(uint8_t *dest, size_t size, int high, int low, int *clock) {
     size_t startwave;
     size_t i = 100;
     size_t minClk = 512;
@@ -540,8 +515,7 @@ int DetectStrongAskClock(uint8_t *dest, size_t size, int high, int low, int *clo
 // not perfect especially with lower clocks or VERY good antennas (heavy wave clipping)
 // maybe somehow adjust peak trimming value based on samples to fix?
 // return start index of best starting position for that clock and return clock (by reference)
-int DetectASKClock(uint8_t *dest, size_t size, int *clock, int maxErr)
-{
+int DetectASKClock(uint8_t *dest, size_t size, int *clock, int maxErr) {
 
     //don't need to loop through entire array. (cotag has clock of 384)
     uint16_t loopCnt = 1500;
@@ -680,8 +654,7 @@ int DetectASKClock(uint8_t *dest, size_t size, int *clock, int maxErr)
     return bestStart[best];
 }
 
-int DetectStrongNRZClk(uint8_t *dest, size_t size, int peak, int low, bool *strong)
-{
+int DetectStrongNRZClk(uint8_t *dest, size_t size, int peak, int low, bool *strong) {
     //find shortest transition from high to low
     *strong = false;
     size_t i = 0;
@@ -726,8 +699,7 @@ int DetectStrongNRZClk(uint8_t *dest, size_t size, int peak, int low, bool *stro
 
 //by marshmellow
 //detect nrz clock by reading #peaks vs no peaks(or errors)
-int DetectNRZClock(uint8_t *dest, size_t size, int clock, size_t *clockStartIdx)
-{
+int DetectNRZClock(uint8_t *dest, size_t size, int clock, size_t *clockStartIdx) {
     size_t i = 0;
     uint8_t clk[] = {8, 16, 32, 40, 50, 64, 100, 128, 255};
     size_t loopCnt = 4096;  //don't need to loop through entire array...
@@ -857,8 +829,7 @@ int DetectNRZClock(uint8_t *dest, size_t size, int clock, size_t *clockStartIdx)
 //countFC is to detect the field clock lengths.
 //counts and returns the 2 most common wave lengths
 //mainly used for FSK field clock detection
-uint16_t countFC(uint8_t *bits, size_t size, bool fskAdj)
-{
+uint16_t countFC(uint8_t *bits, size_t size, bool fskAdj) {
     uint8_t fcLens[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
     uint16_t fcCnts[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
     uint8_t fcLensFnd = 0;
@@ -948,8 +919,7 @@ uint16_t countFC(uint8_t *bits, size_t size, bool fskAdj)
 //by marshmellow
 //detect psk clock by reading each phase shift
 // a phase shift is determined by measuring the sample length of each wave
-int DetectPSKClock(uint8_t *dest, size_t size, int clock, size_t *firstPhaseShift, uint8_t *curPhase, uint8_t *fc)
-{
+int DetectPSKClock(uint8_t *dest, size_t size, int clock, size_t *firstPhaseShift, uint8_t *curPhase, uint8_t *fc) {
     uint8_t clk[] = {255, 16, 32, 40, 50, 64, 100, 128, 255}; //255 is not a valid clock
     uint16_t loopCnt = 4096;  //don't need to loop through entire array...
 
@@ -1048,8 +1018,7 @@ int DetectPSKClock(uint8_t *dest, size_t size, int clock, size_t *firstPhaseShif
 
 //by marshmellow
 //detects the bit clock for FSK given the high and low Field Clocks
-uint8_t detectFSKClk(uint8_t *bits, size_t size, uint8_t fcHigh, uint8_t fcLow, int *firstClockEdge)
-{
+uint8_t detectFSKClk(uint8_t *bits, size_t size, uint8_t fcHigh, uint8_t fcLow, int *firstClockEdge) {
 
     if (size == 0)
         return 0;
@@ -1163,8 +1132,7 @@ uint8_t detectFSKClk(uint8_t *bits, size_t size, uint8_t fcHigh, uint8_t fcLow,
 
 
 // look for Sequence Terminator - should be pulses of clk*(1 or 2), clk*2, clk*(1.5 or 2), by idx we mean graph position index...
-bool findST(int *stStopLoc, int *stStartIdx, int lowToLowWaveLen[], int highToLowWaveLen[], int clk, int tol, int buffSize, size_t *i)
-{
+bool findST(int *stStopLoc, int *stStartIdx, int lowToLowWaveLen[], int highToLowWaveLen[], int clk, int tol, int buffSize, size_t *i) {
     if (buffSize < *i + 4) return false;
 
     for (; *i < buffSize - 4; *i += 1) {
@@ -1184,8 +1152,7 @@ bool findST(int *stStopLoc, int *stStartIdx, int lowToLowWaveLen[], int highToLo
 }
 //by marshmellow
 //attempt to identify a Sequence Terminator in ASK modulated raw wave
-bool DetectST(uint8_t *buffer, size_t *size, int *foundclock, size_t *ststart, size_t *stend)
-{
+bool DetectST(uint8_t *buffer, size_t *size, int *foundclock, size_t *ststart, size_t *stend) {
     size_t bufsize = *size;
     //need to loop through all samples and identify our clock, look for the ST pattern
     int clk = 0;
@@ -1312,8 +1279,7 @@ bool DetectST(uint8_t *buffer, size_t *size, int *foundclock, size_t *ststart, s
 //check for phase errors - should never have half a 1 or 0 by itself and should never exceed 1111 or 0000 in a row
 //decodes miller encoded binary
 //NOTE  askrawdemod will NOT demod miller encoded ask unless the clock is manually set to 1/2 what it is detected as!
-int millerRawDecode(uint8_t *bits, size_t *size, int invert)
-{
+int millerRawDecode(uint8_t *bits, size_t *size, int invert) {
     if (*size < 16) return -1;
 
     uint16_t MaxBits = 512, errCnt = 0;
@@ -1351,8 +1317,7 @@ int millerRawDecode(uint8_t *bits, size_t *size, int invert)
 //take 01 or 10 = 1 and 11 or 00 = 0
 //check for phase errors - should never have 111 or 000 should be 01001011 or 10110100 for 1010
 //decodes biphase or if inverted it is AKA conditional dephase encoding AKA differential manchester encoding
-int BiphaseRawDecode(uint8_t *bits, size_t *size, int *offset, int invert)
-{
+int BiphaseRawDecode(uint8_t *bits, size_t *size, int *offset, int invert) {
     //sanity check
     if (*size < 51) return -1;
 
@@ -1392,8 +1357,7 @@ int BiphaseRawDecode(uint8_t *bits, size_t *size, int *offset, int invert)
 //by marshmellow
 //take 10 and 01 and manchester decode
 //run through 2 times and take least errCnt
-int manrawdecode(uint8_t *bits, size_t *size, uint8_t invert, uint8_t *alignPos)
-{
+int manrawdecode(uint8_t *bits, size_t *size, uint8_t invert, uint8_t *alignPos) {
 
     // sanity check
     if (*size < 16) return -1;
@@ -1433,8 +1397,7 @@ int manrawdecode(uint8_t *bits, size_t *size, uint8_t invert, uint8_t *alignPos)
 //by marshmellow
 //demodulates strong heavily clipped samples
 //RETURN: num of errors.  if 0, is ok.
-int cleanAskRawDemod(uint8_t *bits, size_t *size, int clk, int invert, int high, int low, int *startIdx)
-{
+int cleanAskRawDemod(uint8_t *bits, size_t *size, int clk, int invert, int high, int low, int *startIdx) {
     *startIdx = 0;
     size_t bitCnt = 0, smplCnt = 1, errCnt = 0, pos = 0;
     uint8_t cl_4 = clk / 4;
@@ -1505,8 +1468,7 @@ int cleanAskRawDemod(uint8_t *bits, size_t *size, int clk, int invert, int high,
 
 //by marshmellow
 //attempts to demodulate ask modulations, askType == 0 for ask/raw, askType==1 for ask/manchester
-int askdemod_ext(uint8_t *bits, size_t *size, int *clk, int *invert, int maxErr, uint8_t amp, uint8_t askType, int *startIdx)
-{
+int askdemod_ext(uint8_t *bits, size_t *size, int *clk, int *invert, int maxErr, uint8_t amp, uint8_t askType, int *startIdx) {
 
     if (*size == 0) return -1;
 
@@ -1604,16 +1566,14 @@ int askdemod_ext(uint8_t *bits, size_t *size, int *clk, int *invert, int maxErr,
     return errCnt;
 }
 
-int askdemod(uint8_t *bits, size_t *size, int *clk, int *invert, int maxErr, uint8_t amp, uint8_t askType)
-{
+int askdemod(uint8_t *bits, size_t *size, int *clk, int *invert, int maxErr, uint8_t amp, uint8_t askType) {
     int start = 0;
     return askdemod_ext(bits, size, clk, invert, maxErr, amp, askType, &start);
 }
 
 // by marshmellow - demodulate NRZ wave - requires a read with strong signal
 // peaks invert bit (high=1 low=0) each clock cycle = 1 bit determined by last peak
-int nrzRawDemod(uint8_t *dest, size_t *size, int *clk, int *invert, int *startIdx)
-{
+int nrzRawDemod(uint8_t *dest, size_t *size, int *clk, int *invert, int *startIdx) {
     if (signalprop.isnoise) return -1;
 
     size_t clkStartIdx = 0;
@@ -1663,8 +1623,7 @@ int nrzRawDemod(uint8_t *dest, size_t *size, int *clk, int *invert, int *startId
 }
 
 //translate wave to 11111100000 (1 for each short wave [higher freq] 0 for each long wave [lower freq])
-size_t fsk_wave_demod(uint8_t *dest, size_t size, uint8_t fchigh, uint8_t fclow, int *startIdx)
-{
+size_t fsk_wave_demod(uint8_t *dest, size_t size, uint8_t fchigh, uint8_t fclow, int *startIdx) {
 
     if (size < 1024) return 0;   // not enough samples
 
@@ -1762,8 +1721,7 @@ size_t fsk_wave_demod(uint8_t *dest, size_t size, uint8_t fchigh, uint8_t fclow,
 
 //translate 11111100000 to 10
 //rfLen = clock, fchigh = larger field clock, fclow = smaller field clock
-size_t aggregate_bits(uint8_t *dest, size_t size, uint8_t clk, uint8_t invert, uint8_t fchigh, uint8_t fclow, int *startIdx)
-{
+size_t aggregate_bits(uint8_t *dest, size_t size, uint8_t clk, uint8_t invert, uint8_t fchigh, uint8_t fclow, int *startIdx) {
 
     uint8_t lastval = dest[0];
     size_t i = 0;
@@ -1822,8 +1780,7 @@ size_t aggregate_bits(uint8_t *dest, size_t size, uint8_t clk, uint8_t invert, u
 
 //by marshmellow  (from holiman's base)
 // full fsk demod from GraphBuffer wave to decoded 1s and 0s (no mandemod)
-size_t fskdemod(uint8_t *dest, size_t size, uint8_t rfLen, uint8_t invert, uint8_t fchigh, uint8_t fclow, int *start_idx)
-{
+size_t fskdemod(uint8_t *dest, size_t size, uint8_t rfLen, uint8_t invert, uint8_t fchigh, uint8_t fclow, int *start_idx) {
     if (signalprop.isnoise) return 0;
     // FSK demodulator
     size = fsk_wave_demod(dest, size, fchigh, fclow, start_idx);
@@ -1835,8 +1792,7 @@ size_t fskdemod(uint8_t *dest, size_t size, uint8_t rfLen, uint8_t invert, uint8
 // convert psk1 demod to psk2 demod
 // only transition waves are 1s
 //TODO: Iceman - hard coded value 7,  should be #define
-void psk1TOpsk2(uint8_t *bits, size_t size)
-{
+void psk1TOpsk2(uint8_t *bits, size_t size) {
     uint8_t lastbit = bits[0];
     for (size_t i = 1; i < size; i++) {
         //ignore errors
@@ -1854,8 +1810,7 @@ void psk1TOpsk2(uint8_t *bits, size_t size)
 // by marshmellow
 // convert psk2 demod to psk1 demod
 // from only transition waves are 1s to phase shifts change bit
-void psk2TOpsk1(uint8_t *bits, size_t size)
-{
+void psk2TOpsk1(uint8_t *bits, size_t size) {
     uint8_t phase = 0;
     for (size_t i = 0; i < size; i++) {
         if (bits[i] == 1) {
@@ -1868,8 +1823,7 @@ void psk2TOpsk1(uint8_t *bits, size_t size)
 //by marshmellow - demodulate PSK1 wave
 //uses wave lengths (# Samples)
 //TODO: Iceman - hard coded value 7,  should be #define
-int pskRawDemod_ext(uint8_t *dest, size_t *size, int *clock, int *invert, int *startIdx)
-{
+int pskRawDemod_ext(uint8_t *dest, size_t *size, int *clock, int *invert, int *startIdx) {
 
     // sanity check
     if (*size < 170) return -1;
@@ -1951,8 +1905,7 @@ int pskRawDemod_ext(uint8_t *dest, size_t *size, int *clock, int *invert, int *s
     return errCnt;
 }
 
-int pskRawDemod(uint8_t *dest, size_t *size, int *clock, int *invert)
-{
+int pskRawDemod(uint8_t *dest, size_t *size, int *clock, int *invert) {
     int start_idx = 0;
     return pskRawDemod_ext(dest, size, clock, invert, &start_idx);
 }
@@ -1965,8 +1918,7 @@ int pskRawDemod(uint8_t *dest, size_t *size, int *clock, int *invert)
 
 // by marshmellow
 // FSK Demod then try to locate an AWID ID
-int detectAWID(uint8_t *dest, size_t *size, int *waveStartIdx)
-{
+int detectAWID(uint8_t *dest, size_t *size, int *waveStartIdx) {
     //make sure buffer has enough data (96bits * 50clock samples)
     if (*size < 96 * 50) return -1;
 
@@ -1991,8 +1943,7 @@ int detectAWID(uint8_t *dest, size_t *size, int *waveStartIdx)
 
 //by marshmellow
 //takes 1s and 0s and searches for EM410x format - output EM ID
-int Em410xDecode(uint8_t *bits, size_t *size, size_t *start_idx, uint32_t *hi, uint64_t *lo)
-{
+int Em410xDecode(uint8_t *bits, size_t *size, size_t *start_idx, uint32_t *hi, uint64_t *lo) {
     // sanity check
     if (bits[1] > 1) return -1;
     if (*size < 64) return -2;
@@ -2033,8 +1984,7 @@ int Em410xDecode(uint8_t *bits, size_t *size, size_t *start_idx, uint32_t *hi, u
 
 
 // loop to get raw HID waveform then FSK demodulate the TAG ID from it
-int HIDdemodFSK(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32_t *lo, int *waveStartIdx)
-{
+int HIDdemodFSK(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32_t *lo, int *waveStartIdx) {
     //make sure buffer has data
     if (*size < 96 * 50) return -1;
 
@@ -2075,8 +2025,7 @@ int HIDdemodFSK(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32
 
 // Find IDTEC PSK1, RF  Preamble == 0x4944544B, Demodsize 64bits
 // by iceman
-int detectIdteck(uint8_t *dest, size_t *size)
-{
+int detectIdteck(uint8_t *dest, size_t *size) {
     //make sure buffer has data
     if (*size < 64 * 2) return -1;
 
@@ -2094,8 +2043,7 @@ int detectIdteck(uint8_t *dest, size_t *size)
     return (int)start_idx;
 }
 
-int detectIOProx(uint8_t *dest, size_t *size, int *waveStartIdx)
-{
+int detectIOProx(uint8_t *dest, size_t *size, int *waveStartIdx) {
     //make sure buffer has data
     if (*size < 66 * 64) return -1;
 
@@ -2125,11 +2073,11 @@ int detectIOProx(uint8_t *dest, size_t *size, int *waveStartIdx)
     if (*size != 64) return -5;
 
     if (!dest[start_idx + 8]
-        && dest[start_idx + 17] == 1
-        && dest[start_idx + 26] == 1
-        && dest[start_idx + 35] == 1
-        && dest[start_idx + 44] == 1
-        && dest[start_idx + 53] == 1) {
+            && dest[start_idx + 17] == 1
+            && dest[start_idx + 26] == 1
+            && dest[start_idx + 35] == 1
+            && dest[start_idx + 44] == 1
+            && dest[start_idx + 53] == 1) {
         //confirmed proper separator bits found
         //return start position
         return (int) start_idx;
diff --git a/common/mbedtls/aes.c b/common/mbedtls/aes.c
index 1aab6e2e5..2fca6b8cb 100644
--- a/common/mbedtls/aes.c
+++ b/common/mbedtls/aes.c
@@ -393,8 +393,7 @@ static uint32_t RCON[10];
 
 static int aes_init_done = 0;
 
-static void aes_gen_tables(void)
-{
+static void aes_gen_tables(void) {
     int i, x, y, z;
     int pow[256];
     int log[256];
@@ -507,13 +506,11 @@ static void aes_gen_tables(void)
 
 #endif /* MBEDTLS_AES_FEWER_TABLES */
 
-void mbedtls_aes_init(mbedtls_aes_context *ctx)
-{
+void mbedtls_aes_init(mbedtls_aes_context *ctx) {
     memset(ctx, 0, sizeof(mbedtls_aes_context));
 }
 
-void mbedtls_aes_free(mbedtls_aes_context *ctx)
-{
+void mbedtls_aes_free(mbedtls_aes_context *ctx) {
     if (ctx == NULL)
         return;
 
@@ -521,14 +518,12 @@ void mbedtls_aes_free(mbedtls_aes_context *ctx)
 }
 
 #if defined(MBEDTLS_CIPHER_MODE_XTS)
-void mbedtls_aes_xts_init(mbedtls_aes_xts_context *ctx)
-{
+void mbedtls_aes_xts_init(mbedtls_aes_xts_context *ctx) {
     mbedtls_aes_init(&ctx->crypt);
     mbedtls_aes_init(&ctx->tweak);
 }
 
-void mbedtls_aes_xts_free(mbedtls_aes_xts_context *ctx)
-{
+void mbedtls_aes_xts_free(mbedtls_aes_xts_context *ctx) {
     mbedtls_aes_free(&ctx->crypt);
     mbedtls_aes_free(&ctx->tweak);
 }
@@ -539,8 +534,7 @@ void mbedtls_aes_xts_free(mbedtls_aes_xts_context *ctx)
  */
 #if !defined(MBEDTLS_AES_SETKEY_ENC_ALT)
 int mbedtls_aes_setkey_enc(mbedtls_aes_context *ctx, const unsigned char *key,
-                           unsigned int keybits)
-{
+                           unsigned int keybits) {
     unsigned int i;
     uint32_t *RK;
 
@@ -653,8 +647,7 @@ int mbedtls_aes_setkey_enc(mbedtls_aes_context *ctx, const unsigned char *key,
  */
 #if !defined(MBEDTLS_AES_SETKEY_DEC_ALT)
 int mbedtls_aes_setkey_dec(mbedtls_aes_context *ctx, const unsigned char *key,
-                           unsigned int keybits)
-{
+                           unsigned int keybits) {
     int i, j, ret;
     mbedtls_aes_context cty;
     uint32_t *RK;
@@ -719,8 +712,7 @@ static int mbedtls_aes_xts_decode_keys(const unsigned char *key,
                                        const unsigned char **key1,
                                        unsigned int *key1bits,
                                        const unsigned char **key2,
-                                       unsigned int *key2bits)
-{
+                                       unsigned int *key2bits) {
     const unsigned int half_keybits = keybits / 2;
     const unsigned int half_keybytes = half_keybits / 8;
 
@@ -743,8 +735,7 @@ static int mbedtls_aes_xts_decode_keys(const unsigned char *key,
 
 int mbedtls_aes_xts_setkey_enc(mbedtls_aes_xts_context *ctx,
                                const unsigned char *key,
-                               unsigned int keybits)
-{
+                               unsigned int keybits) {
     int ret;
     const unsigned char *key1, *key2;
     unsigned int key1bits, key2bits;
@@ -765,8 +756,7 @@ int mbedtls_aes_xts_setkey_enc(mbedtls_aes_xts_context *ctx,
 
 int mbedtls_aes_xts_setkey_dec(mbedtls_aes_xts_context *ctx,
                                const unsigned char *key,
-                               unsigned int keybits)
-{
+                               unsigned int keybits) {
     int ret;
     const unsigned char *key1, *key2;
     unsigned int key1bits, key2bits;
@@ -840,8 +830,7 @@ int mbedtls_aes_xts_setkey_dec(mbedtls_aes_xts_context *ctx,
 #if !defined(MBEDTLS_AES_ENCRYPT_ALT)
 int mbedtls_internal_aes_encrypt(mbedtls_aes_context *ctx,
                                  const unsigned char input[16],
-                                 unsigned char output[16])
-{
+                                 unsigned char output[16]) {
     int i;
     uint32_t *RK, X0, X1, X2, X3, Y0, Y1, Y2, Y3;
 
@@ -899,8 +888,7 @@ int mbedtls_internal_aes_encrypt(mbedtls_aes_context *ctx,
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
 void mbedtls_aes_encrypt(mbedtls_aes_context *ctx,
                          const unsigned char input[16],
-                         unsigned char output[16])
-{
+                         unsigned char output[16]) {
     mbedtls_internal_aes_encrypt(ctx, input, output);
 }
 #endif /* !MBEDTLS_DEPRECATED_REMOVED */
@@ -911,8 +899,7 @@ void mbedtls_aes_encrypt(mbedtls_aes_context *ctx,
 #if !defined(MBEDTLS_AES_DECRYPT_ALT)
 int mbedtls_internal_aes_decrypt(mbedtls_aes_context *ctx,
                                  const unsigned char input[16],
-                                 unsigned char output[16])
-{
+                                 unsigned char output[16]) {
     int i;
     uint32_t *RK, X0, X1, X2, X3, Y0, Y1, Y2, Y3;
 
@@ -970,8 +957,7 @@ int mbedtls_internal_aes_decrypt(mbedtls_aes_context *ctx,
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
 void mbedtls_aes_decrypt(mbedtls_aes_context *ctx,
                          const unsigned char input[16],
-                         unsigned char output[16])
-{
+                         unsigned char output[16]) {
     mbedtls_internal_aes_decrypt(ctx, input, output);
 }
 #endif /* !MBEDTLS_DEPRECATED_REMOVED */
@@ -982,8 +968,7 @@ void mbedtls_aes_decrypt(mbedtls_aes_context *ctx,
 int mbedtls_aes_crypt_ecb(mbedtls_aes_context *ctx,
                           int mode,
                           const unsigned char input[16],
-                          unsigned char output[16])
-{
+                          unsigned char output[16]) {
 #if defined(MBEDTLS_AESNI_C) && defined(MBEDTLS_HAVE_X86_64)
     if (mbedtls_aesni_has_support(MBEDTLS_AESNI_AES))
         return (mbedtls_aesni_crypt_ecb(ctx, mode, input, output));
@@ -1015,8 +1000,7 @@ int mbedtls_aes_crypt_cbc(mbedtls_aes_context *ctx,
                           size_t length,
                           unsigned char iv[16],
                           const unsigned char *input,
-                          unsigned char *output)
-{
+                          unsigned char *output) {
     int i;
     unsigned char temp[16];
 
@@ -1108,8 +1092,7 @@ typedef unsigned char mbedtls_be128[16];
  * endian machines.
  */
 static void mbedtls_gf128mul_x_ble(unsigned char r[16],
-                                   const unsigned char x[16])
-{
+                                   const unsigned char x[16]) {
     uint64_t a, b, ra, rb;
 
     GET_UINT64_LE(a, x, 0);
@@ -1130,8 +1113,7 @@ int mbedtls_aes_crypt_xts(mbedtls_aes_xts_context *ctx,
                           size_t length,
                           const unsigned char data_unit[16],
                           const unsigned char *input,
-                          unsigned char *output)
-{
+                          unsigned char *output) {
     int ret;
     size_t blocks = length / 16;
     size_t leftover = length % 16;
@@ -1231,8 +1213,7 @@ int mbedtls_aes_crypt_cfb128(mbedtls_aes_context *ctx,
                              size_t *iv_off,
                              unsigned char iv[16],
                              const unsigned char *input,
-                             unsigned char *output)
-{
+                             unsigned char *output) {
     int c;
     size_t n = *iv_off;
 
@@ -1271,8 +1252,7 @@ int mbedtls_aes_crypt_cfb8(mbedtls_aes_context *ctx,
                            size_t length,
                            unsigned char iv[16],
                            const unsigned char *input,
-                           unsigned char *output)
-{
+                           unsigned char *output) {
     unsigned char c;
     unsigned char ov[17];
 
@@ -1304,8 +1284,7 @@ int mbedtls_aes_crypt_ofb(mbedtls_aes_context *ctx,
                           size_t *iv_off,
                           unsigned char iv[16],
                           const unsigned char *input,
-                          unsigned char *output)
-{
+                          unsigned char *output) {
     int ret = 0;
     size_t n = *iv_off;
 
@@ -1337,8 +1316,7 @@ int mbedtls_aes_crypt_ctr(mbedtls_aes_context *ctx,
                           unsigned char nonce_counter[16],
                           unsigned char stream_block[16],
                           const unsigned char *input,
-                          unsigned char *output)
-{
+                          unsigned char *output) {
     int c, i;
     size_t n = *nc_off;
 
@@ -1757,8 +1735,7 @@ static const unsigned char aes_test_xts_data_unit[][16] = {
 /*
  * Checkup routine
  */
-int mbedtls_aes_self_test(int verbose)
-{
+int mbedtls_aes_self_test(int verbose) {
     int ret = 0, i, j, u, mode;
     unsigned int keybits;
     unsigned char key[32];
diff --git a/common/mbedtls/arc4.c b/common/mbedtls/arc4.c
index 58a186034..0b245b0c4 100644
--- a/common/mbedtls/arc4.c
+++ b/common/mbedtls/arc4.c
@@ -50,13 +50,11 @@
 
 #if !defined(MBEDTLS_ARC4_ALT)
 
-void mbedtls_arc4_init(mbedtls_arc4_context *ctx)
-{
+void mbedtls_arc4_init(mbedtls_arc4_context *ctx) {
     memset(ctx, 0, sizeof(mbedtls_arc4_context));
 }
 
-void mbedtls_arc4_free(mbedtls_arc4_context *ctx)
-{
+void mbedtls_arc4_free(mbedtls_arc4_context *ctx) {
     if (ctx == NULL)
         return;
 
@@ -67,8 +65,7 @@ void mbedtls_arc4_free(mbedtls_arc4_context *ctx)
  * ARC4 key schedule
  */
 void mbedtls_arc4_setup(mbedtls_arc4_context *ctx, const unsigned char *key,
-                        unsigned int keylen)
-{
+                        unsigned int keylen) {
     int i, j, a;
     unsigned int k;
     unsigned char *m;
@@ -96,8 +93,7 @@ void mbedtls_arc4_setup(mbedtls_arc4_context *ctx, const unsigned char *key,
  * ARC4 cipher function
  */
 int mbedtls_arc4_crypt(mbedtls_arc4_context *ctx, size_t length, const unsigned char *input,
-                       unsigned char *output)
-{
+                       unsigned char *output) {
     int x, y, a, b;
     size_t i;
     unsigned char *m;
@@ -154,8 +150,7 @@ static const unsigned char arc4_test_ct[3][8] = {
 /*
  * Checkup routine
  */
-int mbedtls_arc4_self_test(int verbose)
-{
+int mbedtls_arc4_self_test(int verbose) {
     int i, ret = 0;
     unsigned char ibuf[8];
     unsigned char obuf[8];
diff --git a/common/mbedtls/asn1parse.c b/common/mbedtls/asn1parse.c
index ace2d2146..c39fe29b5 100644
--- a/common/mbedtls/asn1parse.c
+++ b/common/mbedtls/asn1parse.c
@@ -51,8 +51,7 @@
  */
 int mbedtls_asn1_get_len(unsigned char **p,
                          const unsigned char *end,
-                         size_t *len)
-{
+                         size_t *len) {
     if ((end - *p) < 1)
         return (MBEDTLS_ERR_ASN1_OUT_OF_DATA);
 
@@ -107,8 +106,7 @@ int mbedtls_asn1_get_len(unsigned char **p,
 
 int mbedtls_asn1_get_tag(unsigned char **p,
                          const unsigned char *end,
-                         size_t *len, int tag)
-{
+                         size_t *len, int tag) {
     if ((end - *p) < 1)
         return (MBEDTLS_ERR_ASN1_OUT_OF_DATA);
 
@@ -122,8 +120,7 @@ int mbedtls_asn1_get_tag(unsigned char **p,
 
 int mbedtls_asn1_get_bool(unsigned char **p,
                           const unsigned char *end,
-                          int *val)
-{
+                          int *val) {
     int ret;
     size_t len;
 
@@ -141,8 +138,7 @@ int mbedtls_asn1_get_bool(unsigned char **p,
 
 int mbedtls_asn1_get_int(unsigned char **p,
                          const unsigned char *end,
-                         int *val)
-{
+                         int *val) {
     int ret;
     size_t len;
 
@@ -165,8 +161,7 @@ int mbedtls_asn1_get_int(unsigned char **p,
 #if defined(MBEDTLS_BIGNUM_C)
 int mbedtls_asn1_get_mpi(unsigned char **p,
                          const unsigned char *end,
-                         mbedtls_mpi *X)
-{
+                         mbedtls_mpi *X) {
     int ret;
     size_t len;
 
@@ -182,8 +177,7 @@ int mbedtls_asn1_get_mpi(unsigned char **p,
 #endif /* MBEDTLS_BIGNUM_C */
 
 int mbedtls_asn1_get_bitstring(unsigned char **p, const unsigned char *end,
-                               mbedtls_asn1_bitstring *bs)
-{
+                               mbedtls_asn1_bitstring *bs) {
     int ret;
 
     /* Certificate type is a single byte bitstring */
@@ -215,8 +209,7 @@ int mbedtls_asn1_get_bitstring(unsigned char **p, const unsigned char *end,
  * Get a bit string without unused bits
  */
 int mbedtls_asn1_get_bitstring_null(unsigned char **p, const unsigned char *end,
-                                    size_t *len)
-{
+                                    size_t *len) {
     int ret;
 
     if ((ret = mbedtls_asn1_get_tag(p, end, len, MBEDTLS_ASN1_BIT_STRING)) != 0)
@@ -236,8 +229,7 @@ int mbedtls_asn1_get_bitstring_null(unsigned char **p, const unsigned char *end,
 int mbedtls_asn1_get_sequence_of(unsigned char **p,
                                  const unsigned char *end,
                                  mbedtls_asn1_sequence *cur,
-                                 int tag)
-{
+                                 int tag) {
     int ret;
     size_t len;
     mbedtls_asn1_buf *buf;
@@ -283,8 +275,7 @@ int mbedtls_asn1_get_sequence_of(unsigned char **p,
 
 int mbedtls_asn1_get_alg(unsigned char **p,
                          const unsigned char *end,
-                         mbedtls_asn1_buf *alg, mbedtls_asn1_buf *params)
-{
+                         mbedtls_asn1_buf *alg, mbedtls_asn1_buf *params) {
     int ret;
     size_t len;
 
@@ -326,8 +317,7 @@ int mbedtls_asn1_get_alg(unsigned char **p,
 
 int mbedtls_asn1_get_alg_null(unsigned char **p,
                               const unsigned char *end,
-                              mbedtls_asn1_buf *alg)
-{
+                              mbedtls_asn1_buf *alg) {
     int ret;
     mbedtls_asn1_buf params;
 
@@ -342,8 +332,7 @@ int mbedtls_asn1_get_alg_null(unsigned char **p,
     return (0);
 }
 
-void mbedtls_asn1_free_named_data(mbedtls_asn1_named_data *cur)
-{
+void mbedtls_asn1_free_named_data(mbedtls_asn1_named_data *cur) {
     if (cur == NULL)
         return;
 
@@ -353,8 +342,7 @@ void mbedtls_asn1_free_named_data(mbedtls_asn1_named_data *cur)
     mbedtls_platform_zeroize(cur, sizeof(mbedtls_asn1_named_data));
 }
 
-void mbedtls_asn1_free_named_data_list(mbedtls_asn1_named_data **head)
-{
+void mbedtls_asn1_free_named_data_list(mbedtls_asn1_named_data **head) {
     mbedtls_asn1_named_data *cur;
 
     while ((cur = *head) != NULL) {
@@ -365,11 +353,10 @@ void mbedtls_asn1_free_named_data_list(mbedtls_asn1_named_data **head)
 }
 
 mbedtls_asn1_named_data *mbedtls_asn1_find_named_data(mbedtls_asn1_named_data *list,
-                                                      const char *oid, size_t len)
-{
+                                                      const char *oid, size_t len) {
     while (list != NULL) {
         if (list->oid.len == len &&
-            memcmp(list->oid.p, oid, len) == 0) {
+                memcmp(list->oid.p, oid, len) == 0) {
             break;
         }
 
diff --git a/common/mbedtls/asn1write.c b/common/mbedtls/asn1write.c
index 1335ff65d..9b1373d0e 100644
--- a/common/mbedtls/asn1write.c
+++ b/common/mbedtls/asn1write.c
@@ -41,8 +41,7 @@
 #define mbedtls_free       free
 #endif
 
-int mbedtls_asn1_write_len(unsigned char **p, unsigned char *start, size_t len)
-{
+int mbedtls_asn1_write_len(unsigned char **p, unsigned char *start, size_t len) {
     if (len < 0x80) {
         if (*p - start < 1)
             return (MBEDTLS_ERR_ASN1_BUF_TOO_SMALL);
@@ -101,8 +100,7 @@ int mbedtls_asn1_write_len(unsigned char **p, unsigned char *start, size_t len)
 #endif
 }
 
-int mbedtls_asn1_write_tag(unsigned char **p, unsigned char *start, unsigned char tag)
-{
+int mbedtls_asn1_write_tag(unsigned char **p, unsigned char *start, unsigned char tag) {
     if (*p - start < 1)
         return (MBEDTLS_ERR_ASN1_BUF_TOO_SMALL);
 
@@ -112,8 +110,7 @@ int mbedtls_asn1_write_tag(unsigned char **p, unsigned char *start, unsigned cha
 }
 
 int mbedtls_asn1_write_raw_buffer(unsigned char **p, unsigned char *start,
-                                  const unsigned char *buf, size_t size)
-{
+                                  const unsigned char *buf, size_t size) {
     size_t len = 0;
 
     if (*p < start || (size_t)(*p - start) < size)
@@ -127,8 +124,7 @@ int mbedtls_asn1_write_raw_buffer(unsigned char **p, unsigned char *start,
 }
 
 #if defined(MBEDTLS_BIGNUM_C)
-int mbedtls_asn1_write_mpi(unsigned char **p, unsigned char *start, const mbedtls_mpi *X)
-{
+int mbedtls_asn1_write_mpi(unsigned char **p, unsigned char *start, const mbedtls_mpi *X) {
     int ret;
     size_t len = 0;
 
@@ -163,8 +159,7 @@ cleanup:
 }
 #endif /* MBEDTLS_BIGNUM_C */
 
-int mbedtls_asn1_write_null(unsigned char **p, unsigned char *start)
-{
+int mbedtls_asn1_write_null(unsigned char **p, unsigned char *start) {
     int ret;
     size_t len = 0;
 
@@ -177,8 +172,7 @@ int mbedtls_asn1_write_null(unsigned char **p, unsigned char *start)
 }
 
 int mbedtls_asn1_write_oid(unsigned char **p, unsigned char *start,
-                           const char *oid, size_t oid_len)
-{
+                           const char *oid, size_t oid_len) {
     int ret;
     size_t len = 0;
 
@@ -192,8 +186,7 @@ int mbedtls_asn1_write_oid(unsigned char **p, unsigned char *start,
 
 int mbedtls_asn1_write_algorithm_identifier(unsigned char **p, unsigned char *start,
                                             const char *oid, size_t oid_len,
-                                            size_t par_len)
-{
+                                            size_t par_len) {
     int ret;
     size_t len = 0;
 
@@ -211,8 +204,7 @@ int mbedtls_asn1_write_algorithm_identifier(unsigned char **p, unsigned char *st
     return ((int) len);
 }
 
-int mbedtls_asn1_write_bool(unsigned char **p, unsigned char *start, int boolean)
-{
+int mbedtls_asn1_write_bool(unsigned char **p, unsigned char *start, int boolean) {
     int ret;
     size_t len = 0;
 
@@ -228,8 +220,7 @@ int mbedtls_asn1_write_bool(unsigned char **p, unsigned char *start, int boolean
     return ((int) len);
 }
 
-int mbedtls_asn1_write_int(unsigned char **p, unsigned char *start, int val)
-{
+int mbedtls_asn1_write_int(unsigned char **p, unsigned char *start, int val) {
     int ret;
     size_t len = 0;
 
@@ -254,8 +245,7 @@ int mbedtls_asn1_write_int(unsigned char **p, unsigned char *start, int val)
 }
 
 int mbedtls_asn1_write_printable_string(unsigned char **p, unsigned char *start,
-                                        const char *text, size_t text_len)
-{
+                                        const char *text, size_t text_len) {
     int ret;
     size_t len = 0;
 
@@ -269,8 +259,7 @@ int mbedtls_asn1_write_printable_string(unsigned char **p, unsigned char *start,
 }
 
 int mbedtls_asn1_write_ia5_string(unsigned char **p, unsigned char *start,
-                                  const char *text, size_t text_len)
-{
+                                  const char *text, size_t text_len) {
     int ret;
     size_t len = 0;
 
@@ -284,8 +273,7 @@ int mbedtls_asn1_write_ia5_string(unsigned char **p, unsigned char *start,
 }
 
 int mbedtls_asn1_write_bitstring(unsigned char **p, unsigned char *start,
-                                 const unsigned char *buf, size_t bits)
-{
+                                 const unsigned char *buf, size_t bits) {
     int ret;
     size_t len = 0, size;
 
@@ -311,8 +299,7 @@ int mbedtls_asn1_write_bitstring(unsigned char **p, unsigned char *start,
 }
 
 int mbedtls_asn1_write_octet_string(unsigned char **p, unsigned char *start,
-                                    const unsigned char *buf, size_t size)
-{
+                                    const unsigned char *buf, size_t size) {
     int ret;
     size_t len = 0;
 
@@ -327,8 +314,7 @@ int mbedtls_asn1_write_octet_string(unsigned char **p, unsigned char *start,
 mbedtls_asn1_named_data *mbedtls_asn1_store_named_data(mbedtls_asn1_named_data **head,
                                                        const char *oid, size_t oid_len,
                                                        const unsigned char *val,
-                                                       size_t val_len)
-{
+                                                       size_t val_len) {
     mbedtls_asn1_named_data *cur;
 
     if ((cur = mbedtls_asn1_find_named_data(*head, oid, oid_len)) == NULL) {
diff --git a/common/mbedtls/base64.c b/common/mbedtls/base64.c
index f96848942..c917285b9 100644
--- a/common/mbedtls/base64.c
+++ b/common/mbedtls/base64.c
@@ -75,8 +75,7 @@ static const unsigned char base64_dec_map[128] = {
  * Encode a buffer into base64 format
  */
 int mbedtls_base64_encode(unsigned char *dst, size_t dlen, size_t *olen,
-                          const unsigned char *src, size_t slen)
-{
+                          const unsigned char *src, size_t slen) {
     size_t i, n;
     int C1, C2, C3;
     unsigned char *p;
@@ -137,8 +136,7 @@ int mbedtls_base64_encode(unsigned char *dst, size_t dlen, size_t *olen,
  * Decode a base64-formatted buffer
  */
 int mbedtls_base64_decode(unsigned char *dst, size_t dlen, size_t *olen,
-                          const unsigned char *src, size_t slen)
-{
+                          const unsigned char *src, size_t slen) {
     size_t i, n;
     uint32_t j, x;
     unsigned char *p;
@@ -157,7 +155,7 @@ int mbedtls_base64_decode(unsigned char *dst, size_t dlen, size_t *olen,
             break;
 
         if ((slen - i) >= 2 &&
-            src[i] == '\r' && src[i + 1] == '\n')
+                src[i] == '\r' && src[i + 1] == '\n')
             continue;
 
         if (src[i] == '\n')
@@ -236,8 +234,7 @@ static const unsigned char base64_test_enc[] =
 /*
  * Checkup routine
  */
-int mbedtls_base64_self_test(int verbose)
-{
+int mbedtls_base64_self_test(int verbose) {
     size_t len;
     const unsigned char *src;
     unsigned char buffer[128];
@@ -248,7 +245,7 @@ int mbedtls_base64_self_test(int verbose)
     src = base64_test_dec;
 
     if (mbedtls_base64_encode(buffer, sizeof(buffer), &len, src, 64) != 0 ||
-        memcmp(base64_test_enc, buffer, 88) != 0) {
+            memcmp(base64_test_enc, buffer, 88) != 0) {
         if (verbose != 0)
             mbedtls_printf("failed\n");
 
@@ -261,7 +258,7 @@ int mbedtls_base64_self_test(int verbose)
     src = base64_test_enc;
 
     if (mbedtls_base64_decode(buffer, sizeof(buffer), &len, src, 88) != 0 ||
-        memcmp(base64_test_dec, buffer, 64) != 0) {
+            memcmp(base64_test_dec, buffer, 64) != 0) {
         if (verbose != 0)
             mbedtls_printf("failed\n");
 
diff --git a/common/mbedtls/bignum.c b/common/mbedtls/bignum.c
index 47fb06518..3084da5fe 100644
--- a/common/mbedtls/bignum.c
+++ b/common/mbedtls/bignum.c
@@ -75,16 +75,14 @@
 #define CHARS_TO_LIMBS(i) ( (i) / ciL + ( (i) % ciL != 0 ) )
 
 /* Implementation that should never be optimized out by the compiler */
-static void mbedtls_mpi_zeroize(mbedtls_mpi_uint *v, size_t n)
-{
+static void mbedtls_mpi_zeroize(mbedtls_mpi_uint *v, size_t n) {
     mbedtls_platform_zeroize(v, ciL * n);
 }
 
 /*
  * Initialize one MPI
  */
-void mbedtls_mpi_init(mbedtls_mpi *X)
-{
+void mbedtls_mpi_init(mbedtls_mpi *X) {
     if (X == NULL)
         return;
 
@@ -96,8 +94,7 @@ void mbedtls_mpi_init(mbedtls_mpi *X)
 /*
  * Unallocate one MPI
  */
-void mbedtls_mpi_free(mbedtls_mpi *X)
-{
+void mbedtls_mpi_free(mbedtls_mpi *X) {
     if (X == NULL)
         return;
 
@@ -114,8 +111,7 @@ void mbedtls_mpi_free(mbedtls_mpi *X)
 /*
  * Enlarge to the specified number of limbs
  */
-int mbedtls_mpi_grow(mbedtls_mpi *X, size_t nblimbs)
-{
+int mbedtls_mpi_grow(mbedtls_mpi *X, size_t nblimbs) {
     mbedtls_mpi_uint *p;
 
     if (nblimbs > MBEDTLS_MPI_MAX_LIMBS)
@@ -142,8 +138,7 @@ int mbedtls_mpi_grow(mbedtls_mpi *X, size_t nblimbs)
  * Resize down as much as possible,
  * while keeping at least the specified number of limbs
  */
-int mbedtls_mpi_shrink(mbedtls_mpi *X, size_t nblimbs)
-{
+int mbedtls_mpi_shrink(mbedtls_mpi *X, size_t nblimbs) {
     mbedtls_mpi_uint *p;
     size_t i;
 
@@ -177,8 +172,7 @@ int mbedtls_mpi_shrink(mbedtls_mpi *X, size_t nblimbs)
 /*
  * Copy the contents of Y into X
  */
-int mbedtls_mpi_copy(mbedtls_mpi *X, const mbedtls_mpi *Y)
-{
+int mbedtls_mpi_copy(mbedtls_mpi *X, const mbedtls_mpi *Y) {
     int ret = 0;
     size_t i;
 
@@ -213,8 +207,7 @@ cleanup:
 /*
  * Swap the contents of X and Y
  */
-void mbedtls_mpi_swap(mbedtls_mpi *X, mbedtls_mpi *Y)
-{
+void mbedtls_mpi_swap(mbedtls_mpi *X, mbedtls_mpi *Y) {
     mbedtls_mpi T;
 
     memcpy(&T,  X, sizeof(mbedtls_mpi));
@@ -227,8 +220,7 @@ void mbedtls_mpi_swap(mbedtls_mpi *X, mbedtls_mpi *Y)
  * about whether the assignment was made or not.
  * (Leaking information about the respective sizes of X and Y is ok however.)
  */
-int mbedtls_mpi_safe_cond_assign(mbedtls_mpi *X, const mbedtls_mpi *Y, unsigned char assign)
-{
+int mbedtls_mpi_safe_cond_assign(mbedtls_mpi *X, const mbedtls_mpi *Y, unsigned char assign) {
     int ret = 0;
     size_t i;
 
@@ -255,8 +247,7 @@ cleanup:
  * Here it is not ok to simply swap the pointers, which whould lead to
  * different memory access patterns when X and Y are used afterwards.
  */
-int mbedtls_mpi_safe_cond_swap(mbedtls_mpi *X, mbedtls_mpi *Y, unsigned char swap)
-{
+int mbedtls_mpi_safe_cond_swap(mbedtls_mpi *X, mbedtls_mpi *Y, unsigned char swap) {
     int ret, s;
     size_t i;
     mbedtls_mpi_uint tmp;
@@ -288,8 +279,7 @@ cleanup:
 /*
  * Set value from integer
  */
-int mbedtls_mpi_lset(mbedtls_mpi *X, mbedtls_mpi_sint z)
-{
+int mbedtls_mpi_lset(mbedtls_mpi *X, mbedtls_mpi_sint z) {
     int ret;
 
     MBEDTLS_MPI_CHK(mbedtls_mpi_grow(X, 1));
@@ -306,8 +296,7 @@ cleanup:
 /*
  * Get a specific bit
  */
-int mbedtls_mpi_get_bit(const mbedtls_mpi *X, size_t pos)
-{
+int mbedtls_mpi_get_bit(const mbedtls_mpi *X, size_t pos) {
     if (X->n * biL <= pos)
         return (0);
 
@@ -317,8 +306,7 @@ int mbedtls_mpi_get_bit(const mbedtls_mpi *X, size_t pos)
 /*
  * Set a bit to a specific value of 0 or 1
  */
-int mbedtls_mpi_set_bit(mbedtls_mpi *X, size_t pos, unsigned char val)
-{
+int mbedtls_mpi_set_bit(mbedtls_mpi *X, size_t pos, unsigned char val) {
     int ret = 0;
     size_t off = pos / biL;
     size_t idx = pos % biL;
@@ -344,8 +332,7 @@ cleanup:
 /*
  * Return the number of less significant zero-bits
  */
-size_t mbedtls_mpi_lsb(const mbedtls_mpi *X)
-{
+size_t mbedtls_mpi_lsb(const mbedtls_mpi *X) {
     size_t i, j, count = 0;
 
     for (i = 0; i < X->n; i++)
@@ -359,8 +346,7 @@ size_t mbedtls_mpi_lsb(const mbedtls_mpi *X)
 /*
  * Count leading zero bits in a given integer
  */
-static size_t mbedtls_clz(const mbedtls_mpi_uint x)
-{
+static size_t mbedtls_clz(const mbedtls_mpi_uint x) {
     size_t j;
     mbedtls_mpi_uint mask = (mbedtls_mpi_uint) 1 << (biL - 1);
 
@@ -376,8 +362,7 @@ static size_t mbedtls_clz(const mbedtls_mpi_uint x)
 /*
  * Return the number of bits
  */
-size_t mbedtls_mpi_bitlen(const mbedtls_mpi *X)
-{
+size_t mbedtls_mpi_bitlen(const mbedtls_mpi *X) {
     size_t i, j;
 
     if (X->n == 0)
@@ -395,16 +380,14 @@ size_t mbedtls_mpi_bitlen(const mbedtls_mpi *X)
 /*
  * Return the total size in bytes
  */
-size_t mbedtls_mpi_size(const mbedtls_mpi *X)
-{
+size_t mbedtls_mpi_size(const mbedtls_mpi *X) {
     return ((mbedtls_mpi_bitlen(X) + 7) >> 3);
 }
 
 /*
  * Convert an ASCII character to digit value
  */
-static int mpi_get_digit(mbedtls_mpi_uint *d, int radix, char c)
-{
+static int mpi_get_digit(mbedtls_mpi_uint *d, int radix, char c) {
     *d = 255;
 
     if (c >= 0x30 && c <= 0x39) *d = c - 0x30;
@@ -420,8 +403,7 @@ static int mpi_get_digit(mbedtls_mpi_uint *d, int radix, char c)
 /*
  * Import from an ASCII string
  */
-int mbedtls_mpi_read_string(mbedtls_mpi *X, int radix, const char *s)
-{
+int mbedtls_mpi_read_string(mbedtls_mpi *X, int radix, const char *s) {
     int ret;
     size_t i, j, slen, n;
     mbedtls_mpi_uint d;
@@ -482,8 +464,7 @@ cleanup:
 /*
  * Helper to write the digits high-order first
  */
-static int mpi_write_hlp(mbedtls_mpi *X, int radix, char **p)
-{
+static int mpi_write_hlp(mbedtls_mpi *X, int radix, char **p) {
     int ret;
     mbedtls_mpi_uint r;
 
@@ -510,8 +491,7 @@ cleanup:
  * Export into an ASCII string
  */
 int mbedtls_mpi_write_string(const mbedtls_mpi *X, int radix,
-                             char *buf, size_t buflen, size_t *olen)
-{
+                             char *buf, size_t buflen, size_t *olen) {
     int ret = 0;
     size_t n;
     char *p;
@@ -580,8 +560,7 @@ cleanup:
 /*
  * Read X from an opened file
  */
-int mbedtls_mpi_read_file(mbedtls_mpi *X, int radix, FILE *fin)
-{
+int mbedtls_mpi_read_file(mbedtls_mpi *X, int radix, FILE *fin) {
     mbedtls_mpi_uint d;
     size_t slen;
     char *p;
@@ -613,8 +592,7 @@ int mbedtls_mpi_read_file(mbedtls_mpi *X, int radix, FILE *fin)
 /*
  * Write X into an opened file (or stdout if fout == NULL)
  */
-int mbedtls_mpi_write_file(const char *p, const mbedtls_mpi *X, int radix, FILE *fout)
-{
+int mbedtls_mpi_write_file(const char *p, const mbedtls_mpi *X, int radix, FILE *fout) {
     int ret;
     size_t n, slen, plen;
     /*
@@ -636,7 +614,7 @@ int mbedtls_mpi_write_file(const char *p, const mbedtls_mpi *X, int radix, FILE
 
     if (fout != NULL) {
         if (fwrite(p, 1, plen, fout) != plen ||
-            fwrite(s, 1, slen, fout) != slen)
+                fwrite(s, 1, slen, fout) != slen)
             return (MBEDTLS_ERR_MPI_FILE_IO_ERROR);
     } else
         mbedtls_printf("%s%s", p, s);
@@ -650,8 +628,7 @@ cleanup:
 /*
  * Import X from unsigned binary data, big endian
  */
-int mbedtls_mpi_read_binary(mbedtls_mpi *X, const unsigned char *buf, size_t buflen)
-{
+int mbedtls_mpi_read_binary(mbedtls_mpi *X, const unsigned char *buf, size_t buflen) {
     int ret;
     size_t i, j;
     size_t const limbs = CHARS_TO_LIMBS(buflen);
@@ -676,8 +653,7 @@ cleanup:
 /*
  * Export X into unsigned binary data, big endian
  */
-int mbedtls_mpi_write_binary(const mbedtls_mpi *X, unsigned char *buf, size_t buflen)
-{
+int mbedtls_mpi_write_binary(const mbedtls_mpi *X, unsigned char *buf, size_t buflen) {
     size_t i, j, n;
 
     n = mbedtls_mpi_size(X);
@@ -696,8 +672,7 @@ int mbedtls_mpi_write_binary(const mbedtls_mpi *X, unsigned char *buf, size_t bu
 /*
  * Left-shift: X <<= count
  */
-int mbedtls_mpi_shift_l(mbedtls_mpi *X, size_t count)
-{
+int mbedtls_mpi_shift_l(mbedtls_mpi *X, size_t count) {
     int ret;
     size_t i, v0, t1;
     mbedtls_mpi_uint r0 = 0, r1;
@@ -743,8 +718,7 @@ cleanup:
 /*
  * Right-shift: X >>= count
  */
-int mbedtls_mpi_shift_r(mbedtls_mpi *X, size_t count)
-{
+int mbedtls_mpi_shift_r(mbedtls_mpi *X, size_t count) {
     size_t i, v0, v1;
     mbedtls_mpi_uint r0 = 0, r1;
 
@@ -783,8 +757,7 @@ int mbedtls_mpi_shift_r(mbedtls_mpi *X, size_t count)
 /*
  * Compare unsigned values
  */
-int mbedtls_mpi_cmp_abs(const mbedtls_mpi *X, const mbedtls_mpi *Y)
-{
+int mbedtls_mpi_cmp_abs(const mbedtls_mpi *X, const mbedtls_mpi *Y) {
     size_t i, j;
 
     for (i = X->n; i > 0; i--)
@@ -812,8 +785,7 @@ int mbedtls_mpi_cmp_abs(const mbedtls_mpi *X, const mbedtls_mpi *Y)
 /*
  * Compare signed values
  */
-int mbedtls_mpi_cmp_mpi(const mbedtls_mpi *X, const mbedtls_mpi *Y)
-{
+int mbedtls_mpi_cmp_mpi(const mbedtls_mpi *X, const mbedtls_mpi *Y) {
     size_t i, j;
 
     for (i = X->n; i > 0; i--)
@@ -844,8 +816,7 @@ int mbedtls_mpi_cmp_mpi(const mbedtls_mpi *X, const mbedtls_mpi *Y)
 /*
  * Compare signed values
  */
-int mbedtls_mpi_cmp_int(const mbedtls_mpi *X, mbedtls_mpi_sint z)
-{
+int mbedtls_mpi_cmp_int(const mbedtls_mpi *X, mbedtls_mpi_sint z) {
     mbedtls_mpi Y;
     mbedtls_mpi_uint p[1];
 
@@ -860,8 +831,7 @@ int mbedtls_mpi_cmp_int(const mbedtls_mpi *X, mbedtls_mpi_sint z)
 /*
  * Unsigned addition: X = |A| + |B|  (HAC 14.7)
  */
-int mbedtls_mpi_add_abs(mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *B)
-{
+int mbedtls_mpi_add_abs(mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *B) {
     int ret;
     size_t i, j;
     mbedtls_mpi_uint *o, *p, c, tmp;
@@ -921,8 +891,7 @@ cleanup:
 /*
  * Helper for mbedtls_mpi subtraction
  */
-static void mpi_sub_hlp(size_t n, mbedtls_mpi_uint *s, mbedtls_mpi_uint *d)
-{
+static void mpi_sub_hlp(size_t n, mbedtls_mpi_uint *s, mbedtls_mpi_uint *d) {
     size_t i;
     mbedtls_mpi_uint c, z;
 
@@ -944,8 +913,7 @@ static void mpi_sub_hlp(size_t n, mbedtls_mpi_uint *s, mbedtls_mpi_uint *d)
 /*
  * Unsigned subtraction: X = |A| - |B|  (HAC 14.9)
  */
-int mbedtls_mpi_sub_abs(mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *B)
-{
+int mbedtls_mpi_sub_abs(mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *B) {
     mbedtls_mpi TB;
     int ret;
     size_t n;
@@ -986,8 +954,7 @@ cleanup:
 /*
  * Signed addition: X = A + B
  */
-int mbedtls_mpi_add_mpi(mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *B)
-{
+int mbedtls_mpi_add_mpi(mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *B) {
     int ret, s = A->s;
 
     if (A->s * B->s < 0) {
@@ -1011,8 +978,7 @@ cleanup:
 /*
  * Signed subtraction: X = A - B
  */
-int mbedtls_mpi_sub_mpi(mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *B)
-{
+int mbedtls_mpi_sub_mpi(mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *B) {
     int ret, s = A->s;
 
     if (A->s * B->s > 0) {
@@ -1036,8 +1002,7 @@ cleanup:
 /*
  * Signed addition: X = A + b
  */
-int mbedtls_mpi_add_int(mbedtls_mpi *X, const mbedtls_mpi *A, mbedtls_mpi_sint b)
-{
+int mbedtls_mpi_add_int(mbedtls_mpi *X, const mbedtls_mpi *A, mbedtls_mpi_sint b) {
     mbedtls_mpi _B;
     mbedtls_mpi_uint p[1];
 
@@ -1052,8 +1017,7 @@ int mbedtls_mpi_add_int(mbedtls_mpi *X, const mbedtls_mpi *A, mbedtls_mpi_sint b
 /*
  * Signed subtraction: X = A - b
  */
-int mbedtls_mpi_sub_int(mbedtls_mpi *X, const mbedtls_mpi *A, mbedtls_mpi_sint b)
-{
+int mbedtls_mpi_sub_int(mbedtls_mpi *X, const mbedtls_mpi *A, mbedtls_mpi_sint b) {
     mbedtls_mpi _B;
     mbedtls_mpi_uint p[1];
 
@@ -1076,8 +1040,7 @@ static
  */
 __attribute__((noinline))
 #endif
-void mpi_mul_hlp(size_t i, mbedtls_mpi_uint *s, mbedtls_mpi_uint *d, mbedtls_mpi_uint b)
-{
+void mpi_mul_hlp(size_t i, mbedtls_mpi_uint *s, mbedtls_mpi_uint *d, mbedtls_mpi_uint b) {
     mbedtls_mpi_uint c = 0, t = 0;
 
 #if defined(MULADDC_HUIT)
@@ -1136,8 +1099,7 @@ void mpi_mul_hlp(size_t i, mbedtls_mpi_uint *s, mbedtls_mpi_uint *d, mbedtls_mpi
 /*
  * Baseline multiplication: X = A * B  (HAC 14.12)
  */
-int mbedtls_mpi_mul_mpi(mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *B)
-{
+int mbedtls_mpi_mul_mpi(mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *B) {
     int ret;
     size_t i, j;
     mbedtls_mpi TA, TB;
@@ -1175,8 +1137,7 @@ cleanup:
 /*
  * Baseline multiplication: X = A * b
  */
-int mbedtls_mpi_mul_int(mbedtls_mpi *X, const mbedtls_mpi *A, mbedtls_mpi_uint b)
-{
+int mbedtls_mpi_mul_int(mbedtls_mpi *X, const mbedtls_mpi *A, mbedtls_mpi_uint b) {
     mbedtls_mpi _B;
     mbedtls_mpi_uint p[1];
 
@@ -1193,8 +1154,7 @@ int mbedtls_mpi_mul_int(mbedtls_mpi *X, const mbedtls_mpi *A, mbedtls_mpi_uint b
  * mbedtls_mpi_uint divisor, d
  */
 static mbedtls_mpi_uint mbedtls_int_div_int(mbedtls_mpi_uint u1,
-                                            mbedtls_mpi_uint u0, mbedtls_mpi_uint d, mbedtls_mpi_uint *r)
-{
+                                            mbedtls_mpi_uint u0, mbedtls_mpi_uint d, mbedtls_mpi_uint *r) {
 #if defined(MBEDTLS_HAVE_UDBL)
     mbedtls_t_udbl dividend, quotient;
 #else
@@ -1284,8 +1244,7 @@ static mbedtls_mpi_uint mbedtls_int_div_int(mbedtls_mpi_uint u1,
 /*
  * Division by mbedtls_mpi: A = Q * B + R  (HAC 14.20)
  */
-int mbedtls_mpi_div_mpi(mbedtls_mpi *Q, mbedtls_mpi *R, const mbedtls_mpi *A, const mbedtls_mpi *B)
-{
+int mbedtls_mpi_div_mpi(mbedtls_mpi *Q, mbedtls_mpi *R, const mbedtls_mpi *A, const mbedtls_mpi *B) {
     int ret;
     size_t i, n, t, k;
     mbedtls_mpi X, Y, Z, T1, T2;
@@ -1394,8 +1353,7 @@ cleanup:
 /*
  * Division by int: A = Q * b + R
  */
-int mbedtls_mpi_div_int(mbedtls_mpi *Q, mbedtls_mpi *R, const mbedtls_mpi *A, mbedtls_mpi_sint b)
-{
+int mbedtls_mpi_div_int(mbedtls_mpi *Q, mbedtls_mpi *R, const mbedtls_mpi *A, mbedtls_mpi_sint b) {
     mbedtls_mpi _B;
     mbedtls_mpi_uint p[1];
 
@@ -1410,8 +1368,7 @@ int mbedtls_mpi_div_int(mbedtls_mpi *Q, mbedtls_mpi *R, const mbedtls_mpi *A, mb
 /*
  * Modulo: R = A mod B
  */
-int mbedtls_mpi_mod_mpi(mbedtls_mpi *R, const mbedtls_mpi *A, const mbedtls_mpi *B)
-{
+int mbedtls_mpi_mod_mpi(mbedtls_mpi *R, const mbedtls_mpi *A, const mbedtls_mpi *B) {
     int ret;
 
     if (mbedtls_mpi_cmp_int(B, 0) < 0)
@@ -1433,8 +1390,7 @@ cleanup:
 /*
  * Modulo: r = A mod b
  */
-int mbedtls_mpi_mod_int(mbedtls_mpi_uint *r, const mbedtls_mpi *A, mbedtls_mpi_sint b)
-{
+int mbedtls_mpi_mod_int(mbedtls_mpi_uint *r, const mbedtls_mpi *A, mbedtls_mpi_sint b) {
     size_t i;
     mbedtls_mpi_uint x, y, z;
 
@@ -1487,8 +1443,7 @@ int mbedtls_mpi_mod_int(mbedtls_mpi_uint *r, const mbedtls_mpi *A, mbedtls_mpi_s
 /*
  * Fast Montgomery initialization (thanks to Tom St Denis)
  */
-static void mpi_montg_init(mbedtls_mpi_uint *mm, const mbedtls_mpi *N)
-{
+static void mpi_montg_init(mbedtls_mpi_uint *mm, const mbedtls_mpi *N) {
     mbedtls_mpi_uint x, m0 = N->p[0];
     unsigned int i;
 
@@ -1505,8 +1460,7 @@ static void mpi_montg_init(mbedtls_mpi_uint *mm, const mbedtls_mpi *N)
  * Montgomery multiplication: A = A * B * R^-1 mod N  (HAC 14.36)
  */
 static int mpi_montmul(mbedtls_mpi *A, const mbedtls_mpi *B, const mbedtls_mpi *N, mbedtls_mpi_uint mm,
-                       const mbedtls_mpi *T)
-{
+                       const mbedtls_mpi *T) {
     size_t i, n, m;
     mbedtls_mpi_uint u0, u1, *d;
 
@@ -1547,8 +1501,7 @@ static int mpi_montmul(mbedtls_mpi *A, const mbedtls_mpi *B, const mbedtls_mpi *
 /*
  * Montgomery reduction: A = A * R^-1 mod N
  */
-static int mpi_montred(mbedtls_mpi *A, const mbedtls_mpi *N, mbedtls_mpi_uint mm, const mbedtls_mpi *T)
-{
+static int mpi_montred(mbedtls_mpi *A, const mbedtls_mpi *N, mbedtls_mpi_uint mm, const mbedtls_mpi *T) {
     mbedtls_mpi_uint z = 1;
     mbedtls_mpi U;
 
@@ -1561,8 +1514,7 @@ static int mpi_montred(mbedtls_mpi *A, const mbedtls_mpi *N, mbedtls_mpi_uint mm
 /*
  * Sliding-window exponentiation: X = A^E mod N  (HAC 14.85)
  */
-int mbedtls_mpi_exp_mod(mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *E, const mbedtls_mpi *N, mbedtls_mpi *_RR)
-{
+int mbedtls_mpi_exp_mod(mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *E, const mbedtls_mpi *N, mbedtls_mpi *_RR) {
     int ret;
     size_t wbits, wsize, one = 1;
     size_t i, j, nblimbs;
@@ -1761,8 +1713,7 @@ cleanup:
 /*
  * Greatest common divisor: G = gcd(A, B)  (HAC 14.54)
  */
-int mbedtls_mpi_gcd(mbedtls_mpi *G, const mbedtls_mpi *A, const mbedtls_mpi *B)
-{
+int mbedtls_mpi_gcd(mbedtls_mpi *G, const mbedtls_mpi *A, const mbedtls_mpi *B) {
     int ret;
     size_t lz, lzt;
     mbedtls_mpi TG, TA, TB;
@@ -1819,8 +1770,7 @@ cleanup:
  */
 int mbedtls_mpi_fill_random(mbedtls_mpi *X, size_t size,
                             int (*f_rng)(void *, unsigned char *, size_t),
-                            void *p_rng)
-{
+                            void *p_rng) {
     int ret;
     unsigned char buf[MBEDTLS_MPI_MAX_SIZE];
 
@@ -1838,8 +1788,7 @@ cleanup:
 /*
  * Modular inverse: X = A^-1 mod N  (HAC 14.61 / 14.64)
  */
-int mbedtls_mpi_inv_mod(mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *N)
-{
+int mbedtls_mpi_inv_mod(mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi *N) {
     int ret;
     mbedtls_mpi G, TA, TU, U1, U2, TB, TV, V1, V2;
 
@@ -1967,8 +1916,7 @@ static const int small_prime[] = {
  * MBEDTLS_ERR_MPI_NOT_ACCEPTABLE: certain non-prime
  * other negative: error
  */
-static int mpi_check_small_factors(const mbedtls_mpi *X)
-{
+static int mpi_check_small_factors(const mbedtls_mpi *X) {
     int ret = 0;
     size_t i;
     mbedtls_mpi_uint r;
@@ -1995,8 +1943,7 @@ cleanup:
  */
 static int mpi_miller_rabin(const mbedtls_mpi *X,
                             int (*f_rng)(void *, unsigned char *, size_t),
-                            void *p_rng)
-{
+                            void *p_rng) {
     int ret, count;
     size_t i, j, k, n, s;
     mbedtls_mpi W, R, T, A, RR;
@@ -2059,7 +2006,7 @@ static int mpi_miller_rabin(const mbedtls_mpi *X,
         MBEDTLS_MPI_CHK(mbedtls_mpi_exp_mod(&A, &A, &R, X, &RR));
 
         if (mbedtls_mpi_cmp_mpi(&A, &W) == 0 ||
-            mbedtls_mpi_cmp_int(&A,  1) == 0)
+                mbedtls_mpi_cmp_int(&A,  1) == 0)
             continue;
 
         j = 1;
@@ -2080,7 +2027,7 @@ static int mpi_miller_rabin(const mbedtls_mpi *X,
          * not prime if A != |X| - 1 or A == 1
          */
         if (mbedtls_mpi_cmp_mpi(&A, &W) != 0 ||
-            mbedtls_mpi_cmp_int(&A,  1) == 0) {
+                mbedtls_mpi_cmp_int(&A,  1) == 0) {
             ret = MBEDTLS_ERR_MPI_NOT_ACCEPTABLE;
             break;
         }
@@ -2101,8 +2048,7 @@ cleanup:
  */
 int mbedtls_mpi_is_prime(const mbedtls_mpi *X,
                          int (*f_rng)(void *, unsigned char *, size_t),
-                         void *p_rng)
-{
+                         void *p_rng) {
     int ret;
     mbedtls_mpi XX;
 
@@ -2111,7 +2057,7 @@ int mbedtls_mpi_is_prime(const mbedtls_mpi *X,
     XX.p = X->p;
 
     if (mbedtls_mpi_cmp_int(&XX, 0) == 0 ||
-        mbedtls_mpi_cmp_int(&XX, 1) == 0)
+            mbedtls_mpi_cmp_int(&XX, 1) == 0)
         return (MBEDTLS_ERR_MPI_NOT_ACCEPTABLE);
 
     if (mbedtls_mpi_cmp_int(&XX, 2) == 0)
@@ -2136,8 +2082,7 @@ int mbedtls_mpi_is_prime(const mbedtls_mpi *X,
  */
 int mbedtls_mpi_gen_prime(mbedtls_mpi *X, size_t nbits, int dh_flag,
                           int (*f_rng)(void *, unsigned char *, size_t),
-                          void *p_rng)
-{
+                          void *p_rng) {
 #ifdef MBEDTLS_HAVE_INT64
 // ceil(2^63.5)
 #define CEIL_MAXUINT_DIV_SQRT2 0xb504f333f9de6485ULL
@@ -2196,9 +2141,9 @@ int mbedtls_mpi_gen_prime(mbedtls_mpi *X, size_t nbits, int dh_flag,
                  * before doing Miller-Rabin on any of them
                  */
                 if ((ret = mpi_check_small_factors(X)) == 0 &&
-                    (ret = mpi_check_small_factors(&Y)) == 0 &&
-                    (ret = mpi_miller_rabin(X, f_rng, p_rng)) == 0 &&
-                    (ret = mpi_miller_rabin(&Y, f_rng, p_rng)) == 0)
+                        (ret = mpi_check_small_factors(&Y)) == 0 &&
+                        (ret = mpi_miller_rabin(X, f_rng, p_rng)) == 0 &&
+                        (ret = mpi_miller_rabin(&Y, f_rng, p_rng)) == 0)
                     goto cleanup;
 
                 if (ret != MBEDTLS_ERR_MPI_NOT_ACCEPTABLE)
@@ -2237,8 +2182,7 @@ static const int gcd_pairs[GCD_PAIR_COUNT][3] = {
 /*
  * Checkup routine
  */
-int mbedtls_mpi_self_test(int verbose)
-{
+int mbedtls_mpi_self_test(int verbose) {
     int ret, i;
     mbedtls_mpi A, E, N, X, Y, U, V;
 
@@ -2306,7 +2250,7 @@ int mbedtls_mpi_self_test(int verbose)
         mbedtls_printf("  MPI test #2 (div_mpi): ");
 
     if (mbedtls_mpi_cmp_mpi(&X, &U) != 0 ||
-        mbedtls_mpi_cmp_mpi(&Y, &V) != 0) {
+            mbedtls_mpi_cmp_mpi(&Y, &V) != 0) {
         if (verbose != 0)
             mbedtls_printf("failed\n");
 
diff --git a/common/mbedtls/blowfish.c b/common/mbedtls/blowfish.c
index c3e19cdca..e81d9fd19 100644
--- a/common/mbedtls/blowfish.c
+++ b/common/mbedtls/blowfish.c
@@ -76,8 +76,7 @@ static const uint32_t P[MBEDTLS_BLOWFISH_ROUNDS + 2] = {
 /* declarations of data at the end of this file */
 static const uint32_t S[4][256];
 
-static uint32_t F(mbedtls_blowfish_context *ctx, uint32_t x)
-{
+static uint32_t F(mbedtls_blowfish_context *ctx, uint32_t x) {
     unsigned short a, b, c, d;
     uint32_t  y;
 
@@ -95,8 +94,7 @@ static uint32_t F(mbedtls_blowfish_context *ctx, uint32_t x)
     return (y);
 }
 
-static void blowfish_enc(mbedtls_blowfish_context *ctx, uint32_t *xl, uint32_t *xr)
-{
+static void blowfish_enc(mbedtls_blowfish_context *ctx, uint32_t *xl, uint32_t *xr) {
     uint32_t  Xl, Xr, temp;
     short i;
 
@@ -123,8 +121,7 @@ static void blowfish_enc(mbedtls_blowfish_context *ctx, uint32_t *xl, uint32_t *
     *xr = Xr;
 }
 
-static void blowfish_dec(mbedtls_blowfish_context *ctx, uint32_t *xl, uint32_t *xr)
-{
+static void blowfish_dec(mbedtls_blowfish_context *ctx, uint32_t *xl, uint32_t *xr) {
     uint32_t  Xl, Xr, temp;
     short i;
 
@@ -151,13 +148,11 @@ static void blowfish_dec(mbedtls_blowfish_context *ctx, uint32_t *xl, uint32_t *
     *xr = Xr;
 }
 
-void mbedtls_blowfish_init(mbedtls_blowfish_context *ctx)
-{
+void mbedtls_blowfish_init(mbedtls_blowfish_context *ctx) {
     memset(ctx, 0, sizeof(mbedtls_blowfish_context));
 }
 
-void mbedtls_blowfish_free(mbedtls_blowfish_context *ctx)
-{
+void mbedtls_blowfish_free(mbedtls_blowfish_context *ctx) {
     if (ctx == NULL)
         return;
 
@@ -168,13 +163,12 @@ void mbedtls_blowfish_free(mbedtls_blowfish_context *ctx)
  * Blowfish key schedule
  */
 int mbedtls_blowfish_setkey(mbedtls_blowfish_context *ctx, const unsigned char *key,
-                            unsigned int keybits)
-{
+                            unsigned int keybits) {
     unsigned int i, j, k;
     uint32_t data, datal, datar;
 
     if (keybits < MBEDTLS_BLOWFISH_MIN_KEY_BITS || keybits > MBEDTLS_BLOWFISH_MAX_KEY_BITS ||
-        (keybits % 8)) {
+            (keybits % 8)) {
         return (MBEDTLS_ERR_BLOWFISH_INVALID_KEY_LENGTH);
     }
 
@@ -221,8 +215,7 @@ int mbedtls_blowfish_setkey(mbedtls_blowfish_context *ctx, const unsigned char *
 int mbedtls_blowfish_crypt_ecb(mbedtls_blowfish_context *ctx,
                                int mode,
                                const unsigned char input[MBEDTLS_BLOWFISH_BLOCKSIZE],
-                               unsigned char output[MBEDTLS_BLOWFISH_BLOCKSIZE])
-{
+                               unsigned char output[MBEDTLS_BLOWFISH_BLOCKSIZE]) {
     uint32_t X0, X1;
 
     GET_UINT32_BE(X0, input,  0);
@@ -249,8 +242,7 @@ int mbedtls_blowfish_crypt_cbc(mbedtls_blowfish_context *ctx,
                                size_t length,
                                unsigned char iv[MBEDTLS_BLOWFISH_BLOCKSIZE],
                                const unsigned char *input,
-                               unsigned char *output)
-{
+                               unsigned char *output) {
     int i;
     unsigned char temp[MBEDTLS_BLOWFISH_BLOCKSIZE];
 
@@ -299,8 +291,7 @@ int mbedtls_blowfish_crypt_cfb64(mbedtls_blowfish_context *ctx,
                                  size_t *iv_off,
                                  unsigned char iv[MBEDTLS_BLOWFISH_BLOCKSIZE],
                                  const unsigned char *input,
-                                 unsigned char *output)
-{
+                                 unsigned char *output) {
     int c;
     size_t n = *iv_off;
 
@@ -342,8 +333,7 @@ int mbedtls_blowfish_crypt_ctr(mbedtls_blowfish_context *ctx,
                                unsigned char nonce_counter[MBEDTLS_BLOWFISH_BLOCKSIZE],
                                unsigned char stream_block[MBEDTLS_BLOWFISH_BLOCKSIZE],
                                const unsigned char *input,
-                               unsigned char *output)
-{
+                               unsigned char *output) {
     int c, i;
     size_t n = *nc_off;
 
diff --git a/common/mbedtls/camellia.c b/common/mbedtls/camellia.c
index 6f1a8aec2..bb4169ab4 100644
--- a/common/mbedtls/camellia.c
+++ b/common/mbedtls/camellia.c
@@ -304,8 +304,7 @@ static const signed char transposes[2][20] = {
     }
 
 static void camellia_feistel(const uint32_t x[2], const uint32_t k[2],
-                             uint32_t z[2])
-{
+                             uint32_t z[2]) {
     uint32_t I0, I1;
     I0 = x[0] ^ k[0];
     I1 = x[1] ^ k[1];
@@ -328,13 +327,11 @@ static void camellia_feistel(const uint32_t x[2], const uint32_t k[2],
     z[1] ^= I0;
 }
 
-void mbedtls_camellia_init(mbedtls_camellia_context *ctx)
-{
+void mbedtls_camellia_init(mbedtls_camellia_context *ctx) {
     memset(ctx, 0, sizeof(mbedtls_camellia_context));
 }
 
-void mbedtls_camellia_free(mbedtls_camellia_context *ctx)
-{
+void mbedtls_camellia_free(mbedtls_camellia_context *ctx) {
     if (ctx == NULL)
         return;
 
@@ -345,8 +342,7 @@ void mbedtls_camellia_free(mbedtls_camellia_context *ctx)
  * Camellia key schedule (encryption)
  */
 int mbedtls_camellia_setkey_enc(mbedtls_camellia_context *ctx, const unsigned char *key,
-                                unsigned int keybits)
-{
+                                unsigned int keybits) {
     int idx;
     size_t i;
     uint32_t *RK;
@@ -456,8 +452,7 @@ int mbedtls_camellia_setkey_enc(mbedtls_camellia_context *ctx, const unsigned ch
  * Camellia key schedule (decryption)
  */
 int mbedtls_camellia_setkey_dec(mbedtls_camellia_context *ctx, const unsigned char *key,
-                                unsigned int keybits)
-{
+                                unsigned int keybits) {
     int idx, ret;
     size_t i;
     mbedtls_camellia_context cty;
@@ -505,8 +500,7 @@ exit:
 int mbedtls_camellia_crypt_ecb(mbedtls_camellia_context *ctx,
                                int mode,
                                const unsigned char input[16],
-                               unsigned char output[16])
-{
+                               unsigned char output[16]) {
     int NR;
     uint32_t *RK, X[4];
 
@@ -570,8 +564,7 @@ int mbedtls_camellia_crypt_cbc(mbedtls_camellia_context *ctx,
                                size_t length,
                                unsigned char iv[16],
                                const unsigned char *input,
-                               unsigned char *output)
-{
+                               unsigned char *output) {
     int i;
     unsigned char temp[16];
 
@@ -620,8 +613,7 @@ int mbedtls_camellia_crypt_cfb128(mbedtls_camellia_context *ctx,
                                   size_t *iv_off,
                                   unsigned char iv[16],
                                   const unsigned char *input,
-                                  unsigned char *output)
-{
+                                  unsigned char *output) {
     int c;
     size_t n = *iv_off;
 
@@ -663,8 +655,7 @@ int mbedtls_camellia_crypt_ctr(mbedtls_camellia_context *ctx,
                                unsigned char nonce_counter[16],
                                unsigned char stream_block[16],
                                const unsigned char *input,
-                               unsigned char *output)
-{
+                               unsigned char *output) {
     int c, i;
     size_t n = *nc_off;
 
@@ -964,8 +955,7 @@ static const int camellia_test_ctr_len[3] =
 /*
  * Checkup routine
  */
-int mbedtls_camellia_self_test(int verbose)
-{
+int mbedtls_camellia_self_test(int verbose) {
     int i, j, u, v;
     unsigned char key[32];
     unsigned char buf[64];
diff --git a/common/mbedtls/cipher.c b/common/mbedtls/cipher.c
index 9f4ab8efb..068626dcb 100644
--- a/common/mbedtls/cipher.c
+++ b/common/mbedtls/cipher.c
@@ -73,8 +73,7 @@
  * a non-zero value.
  * This is currently only used by GCM and ChaCha20+Poly1305.
  */
-static int mbedtls_constant_time_memcmp(const void *v1, const void *v2, size_t len)
-{
+static int mbedtls_constant_time_memcmp(const void *v1, const void *v2, size_t len) {
     const unsigned char *p1 = (const unsigned char *) v1;
     const unsigned char *p2 = (const unsigned char *) v2;
     size_t i;
@@ -89,8 +88,7 @@ static int mbedtls_constant_time_memcmp(const void *v1, const void *v2, size_t l
 
 static int supported_init = 0;
 
-const int *mbedtls_cipher_list(void)
-{
+const int *mbedtls_cipher_list(void) {
     const mbedtls_cipher_definition_t *def;
     int *type;
 
@@ -109,8 +107,7 @@ const int *mbedtls_cipher_list(void)
     return (mbedtls_cipher_supported);
 }
 
-const mbedtls_cipher_info_t *mbedtls_cipher_info_from_type(const mbedtls_cipher_type_t cipher_type)
-{
+const mbedtls_cipher_info_t *mbedtls_cipher_info_from_type(const mbedtls_cipher_type_t cipher_type) {
     const mbedtls_cipher_definition_t *def;
 
     for (def = mbedtls_cipher_definitions; def->info != NULL; def++)
@@ -120,8 +117,7 @@ const mbedtls_cipher_info_t *mbedtls_cipher_info_from_type(const mbedtls_cipher_
     return (NULL);
 }
 
-const mbedtls_cipher_info_t *mbedtls_cipher_info_from_string(const char *cipher_name)
-{
+const mbedtls_cipher_info_t *mbedtls_cipher_info_from_string(const char *cipher_name) {
     const mbedtls_cipher_definition_t *def;
 
     if (NULL == cipher_name)
@@ -136,26 +132,23 @@ const mbedtls_cipher_info_t *mbedtls_cipher_info_from_string(const char *cipher_
 
 const mbedtls_cipher_info_t *mbedtls_cipher_info_from_values(const mbedtls_cipher_id_t cipher_id,
         int key_bitlen,
-        const mbedtls_cipher_mode_t mode)
-{
+        const mbedtls_cipher_mode_t mode) {
     const mbedtls_cipher_definition_t *def;
 
     for (def = mbedtls_cipher_definitions; def->info != NULL; def++)
         if (def->info->base->cipher == cipher_id &&
-            def->info->key_bitlen == (unsigned) key_bitlen &&
-            def->info->mode == mode)
+                def->info->key_bitlen == (unsigned) key_bitlen &&
+                def->info->mode == mode)
             return (def->info);
 
     return (NULL);
 }
 
-void mbedtls_cipher_init(mbedtls_cipher_context_t *ctx)
-{
+void mbedtls_cipher_init(mbedtls_cipher_context_t *ctx) {
     memset(ctx, 0, sizeof(mbedtls_cipher_context_t));
 }
 
-void mbedtls_cipher_free(mbedtls_cipher_context_t *ctx)
-{
+void mbedtls_cipher_free(mbedtls_cipher_context_t *ctx) {
     if (ctx == NULL)
         return;
 
@@ -173,8 +166,7 @@ void mbedtls_cipher_free(mbedtls_cipher_context_t *ctx)
     mbedtls_platform_zeroize(ctx, sizeof(mbedtls_cipher_context_t));
 }
 
-int mbedtls_cipher_setup(mbedtls_cipher_context_t *ctx, const mbedtls_cipher_info_t *cipher_info)
-{
+int mbedtls_cipher_setup(mbedtls_cipher_context_t *ctx, const mbedtls_cipher_info_t *cipher_info) {
     if (NULL == cipher_info || NULL == ctx)
         return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
 
@@ -200,13 +192,12 @@ int mbedtls_cipher_setup(mbedtls_cipher_context_t *ctx, const mbedtls_cipher_inf
 }
 
 int mbedtls_cipher_setkey(mbedtls_cipher_context_t *ctx, const unsigned char *key,
-                          int key_bitlen, const mbedtls_operation_t operation)
-{
+                          int key_bitlen, const mbedtls_operation_t operation) {
     if (NULL == ctx || NULL == ctx->cipher_info)
         return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
 
     if ((ctx->cipher_info->flags & MBEDTLS_CIPHER_VARIABLE_KEY_LEN) == 0 &&
-        (int) ctx->cipher_info->key_bitlen != key_bitlen) {
+            (int) ctx->cipher_info->key_bitlen != key_bitlen) {
         return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
     }
 
@@ -217,9 +208,9 @@ int mbedtls_cipher_setkey(mbedtls_cipher_context_t *ctx, const unsigned char *ke
      * For OFB, CFB and CTR mode always use the encryption key schedule
      */
     if (MBEDTLS_ENCRYPT == operation ||
-        MBEDTLS_MODE_CFB == ctx->cipher_info->mode ||
-        MBEDTLS_MODE_OFB == ctx->cipher_info->mode ||
-        MBEDTLS_MODE_CTR == ctx->cipher_info->mode) {
+            MBEDTLS_MODE_CFB == ctx->cipher_info->mode ||
+            MBEDTLS_MODE_OFB == ctx->cipher_info->mode ||
+            MBEDTLS_MODE_CTR == ctx->cipher_info->mode) {
         return ctx->cipher_info->base->setkey_enc_func(ctx->cipher_ctx, key,
                                                        ctx->key_bitlen);
     }
@@ -232,8 +223,7 @@ int mbedtls_cipher_setkey(mbedtls_cipher_context_t *ctx, const unsigned char *ke
 }
 
 int mbedtls_cipher_set_iv(mbedtls_cipher_context_t *ctx,
-                          const unsigned char *iv, size_t iv_len)
-{
+                          const unsigned char *iv, size_t iv_len) {
     size_t actual_iv_size;
 
     if (NULL == ctx || NULL == ctx->cipher_info || NULL == iv)
@@ -269,8 +259,7 @@ int mbedtls_cipher_set_iv(mbedtls_cipher_context_t *ctx,
     return (0);
 }
 
-int mbedtls_cipher_reset(mbedtls_cipher_context_t *ctx)
-{
+int mbedtls_cipher_reset(mbedtls_cipher_context_t *ctx) {
     if (NULL == ctx || NULL == ctx->cipher_info)
         return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
 
@@ -281,8 +270,7 @@ int mbedtls_cipher_reset(mbedtls_cipher_context_t *ctx)
 
 #if defined(MBEDTLS_GCM_C) || defined(MBEDTLS_CHACHAPOLY_C)
 int mbedtls_cipher_update_ad(mbedtls_cipher_context_t *ctx,
-                             const unsigned char *ad, size_t ad_len)
-{
+                             const unsigned char *ad, size_t ad_len) {
     if (NULL == ctx || NULL == ctx->cipher_info)
         return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
 
@@ -318,8 +306,7 @@ int mbedtls_cipher_update_ad(mbedtls_cipher_context_t *ctx,
 #endif /* MBEDTLS_GCM_C || MBEDTLS_CHACHAPOLY_C */
 
 int mbedtls_cipher_update(mbedtls_cipher_context_t *ctx, const unsigned char *input,
-                          size_t ilen, unsigned char *output, size_t *olen)
-{
+                          size_t ilen, unsigned char *output, size_t *olen) {
     int ret;
     size_t block_size = 0;
 
@@ -365,7 +352,7 @@ int mbedtls_cipher_update(mbedtls_cipher_context_t *ctx, const unsigned char *in
     }
 
     if (input == output &&
-        (ctx->unprocessed_len != 0 || ilen % block_size)) {
+            (ctx->unprocessed_len != 0 || ilen % block_size)) {
         return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
     }
 
@@ -377,11 +364,11 @@ int mbedtls_cipher_update(mbedtls_cipher_context_t *ctx, const unsigned char *in
          * If there is not enough data for a full block, cache it.
          */
         if ((ctx->operation == MBEDTLS_DECRYPT && NULL != ctx->add_padding &&
-             ilen <= block_size - ctx->unprocessed_len) ||
-            (ctx->operation == MBEDTLS_DECRYPT && NULL == ctx->add_padding &&
-             ilen < block_size - ctx->unprocessed_len) ||
-            (ctx->operation == MBEDTLS_ENCRYPT &&
-             ilen < block_size - ctx->unprocessed_len)) {
+                ilen <= block_size - ctx->unprocessed_len) ||
+                (ctx->operation == MBEDTLS_DECRYPT && NULL == ctx->add_padding &&
+                 ilen < block_size - ctx->unprocessed_len) ||
+                (ctx->operation == MBEDTLS_ENCRYPT &&
+                 ilen < block_size - ctx->unprocessed_len)) {
             memcpy(&(ctx->unprocessed_data[ctx->unprocessed_len]), input,
                    ilen);
 
@@ -426,8 +413,8 @@ int mbedtls_cipher_update(mbedtls_cipher_context_t *ctx, const unsigned char *in
              */
             copy_len = ilen % block_size;
             if (copy_len == 0 &&
-                ctx->operation == MBEDTLS_DECRYPT &&
-                NULL != ctx->add_padding) {
+                    ctx->operation == MBEDTLS_DECRYPT &&
+                    NULL != ctx->add_padding) {
                 copy_len = block_size;
             }
 
@@ -536,8 +523,7 @@ int mbedtls_cipher_update(mbedtls_cipher_context_t *ctx, const unsigned char *in
  * PKCS7 (and PKCS5) padding: fill with ll bytes, with ll = padding_len
  */
 static void add_pkcs_padding(unsigned char *output, size_t output_len,
-                             size_t data_len)
-{
+                             size_t data_len) {
     size_t padding_len = output_len - data_len;
     unsigned char i;
 
@@ -546,8 +532,7 @@ static void add_pkcs_padding(unsigned char *output, size_t output_len,
 }
 
 static int get_pkcs_padding(unsigned char *input, size_t input_len,
-                            size_t *data_len)
-{
+                            size_t *data_len) {
     size_t i, pad_idx;
     unsigned char padding_len, bad = 0;
 
@@ -576,8 +561,7 @@ static int get_pkcs_padding(unsigned char *input, size_t input_len,
  * One and zeros padding: fill with 80 00 ... 00
  */
 static void add_one_and_zeros_padding(unsigned char *output,
-                                      size_t output_len, size_t data_len)
-{
+                                      size_t output_len, size_t data_len) {
     size_t padding_len = output_len - data_len;
     unsigned char i = 0;
 
@@ -587,8 +571,7 @@ static void add_one_and_zeros_padding(unsigned char *output,
 }
 
 static int get_one_and_zeros_padding(unsigned char *input, size_t input_len,
-                                     size_t *data_len)
-{
+                                     size_t *data_len) {
     size_t i;
     unsigned char done = 0, prev_done, bad;
 
@@ -614,8 +597,7 @@ static int get_one_and_zeros_padding(unsigned char *input, size_t input_len,
  * Zeros and len padding: fill with 00 ... 00 ll, where ll is padding length
  */
 static void add_zeros_and_len_padding(unsigned char *output,
-                                      size_t output_len, size_t data_len)
-{
+                                      size_t output_len, size_t data_len) {
     size_t padding_len = output_len - data_len;
     unsigned char i = 0;
 
@@ -625,8 +607,7 @@ static void add_zeros_and_len_padding(unsigned char *output,
 }
 
 static int get_zeros_and_len_padding(unsigned char *input, size_t input_len,
-                                     size_t *data_len)
-{
+                                     size_t *data_len) {
     size_t i, pad_idx;
     unsigned char padding_len, bad = 0;
 
@@ -654,8 +635,7 @@ static int get_zeros_and_len_padding(unsigned char *input, size_t input_len,
  * Zero padding: fill with 00 ... 00
  */
 static void add_zeros_padding(unsigned char *output,
-                              size_t output_len, size_t data_len)
-{
+                              size_t output_len, size_t data_len) {
     size_t i;
 
     for (i = data_len; i < output_len; i++)
@@ -663,8 +643,7 @@ static void add_zeros_padding(unsigned char *output,
 }
 
 static int get_zeros_padding(unsigned char *input, size_t input_len,
-                             size_t *data_len)
-{
+                             size_t *data_len) {
     size_t i;
     unsigned char done = 0, prev_done;
 
@@ -689,8 +668,7 @@ static int get_zeros_padding(unsigned char *input, size_t input_len,
  * but a trivial get_padding function
  */
 static int get_no_padding(unsigned char *input, size_t input_len,
-                          size_t *data_len)
-{
+                          size_t *data_len) {
     if (NULL == input || NULL == data_len)
         return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
 
@@ -701,24 +679,23 @@ static int get_no_padding(unsigned char *input, size_t input_len,
 #endif /* MBEDTLS_CIPHER_MODE_WITH_PADDING */
 
 int mbedtls_cipher_finish(mbedtls_cipher_context_t *ctx,
-                          unsigned char *output, size_t *olen)
-{
+                          unsigned char *output, size_t *olen) {
     if (NULL == ctx || NULL == ctx->cipher_info || NULL == olen)
         return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
 
     *olen = 0;
 
     if (MBEDTLS_MODE_CFB == ctx->cipher_info->mode ||
-        MBEDTLS_MODE_OFB == ctx->cipher_info->mode ||
-        MBEDTLS_MODE_CTR == ctx->cipher_info->mode ||
-        MBEDTLS_MODE_GCM == ctx->cipher_info->mode ||
-        MBEDTLS_MODE_XTS == ctx->cipher_info->mode ||
-        MBEDTLS_MODE_STREAM == ctx->cipher_info->mode) {
+            MBEDTLS_MODE_OFB == ctx->cipher_info->mode ||
+            MBEDTLS_MODE_CTR == ctx->cipher_info->mode ||
+            MBEDTLS_MODE_GCM == ctx->cipher_info->mode ||
+            MBEDTLS_MODE_XTS == ctx->cipher_info->mode ||
+            MBEDTLS_MODE_STREAM == ctx->cipher_info->mode) {
         return (0);
     }
 
     if ((MBEDTLS_CIPHER_CHACHA20          == ctx->cipher_info->type) ||
-        (MBEDTLS_CIPHER_CHACHA20_POLY1305 == ctx->cipher_info->type)) {
+            (MBEDTLS_CIPHER_CHACHA20_POLY1305 == ctx->cipher_info->type)) {
         return (0);
     }
 
@@ -779,10 +756,9 @@ int mbedtls_cipher_finish(mbedtls_cipher_context_t *ctx,
 }
 
 #if defined(MBEDTLS_CIPHER_MODE_WITH_PADDING)
-int mbedtls_cipher_set_padding_mode(mbedtls_cipher_context_t *ctx, mbedtls_cipher_padding_t mode)
-{
+int mbedtls_cipher_set_padding_mode(mbedtls_cipher_context_t *ctx, mbedtls_cipher_padding_t mode) {
     if (NULL == ctx ||
-        MBEDTLS_MODE_CBC != ctx->cipher_info->mode) {
+            MBEDTLS_MODE_CBC != ctx->cipher_info->mode) {
         return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
     }
 
@@ -826,8 +802,7 @@ int mbedtls_cipher_set_padding_mode(mbedtls_cipher_context_t *ctx, mbedtls_ciphe
 
 #if defined(MBEDTLS_GCM_C) || defined(MBEDTLS_CHACHAPOLY_C)
 int mbedtls_cipher_write_tag(mbedtls_cipher_context_t *ctx,
-                             unsigned char *tag, size_t tag_len)
-{
+                             unsigned char *tag, size_t tag_len) {
     if (NULL == ctx || NULL == ctx->cipher_info || NULL == tag)
         return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
 
@@ -854,13 +829,12 @@ int mbedtls_cipher_write_tag(mbedtls_cipher_context_t *ctx,
 }
 
 int mbedtls_cipher_check_tag(mbedtls_cipher_context_t *ctx,
-                             const unsigned char *tag, size_t tag_len)
-{
+                             const unsigned char *tag, size_t tag_len) {
     unsigned char check_tag[16];
     int ret;
 
     if (NULL == ctx || NULL == ctx->cipher_info ||
-        MBEDTLS_DECRYPT != ctx->operation) {
+            MBEDTLS_DECRYPT != ctx->operation) {
         return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
     }
 
@@ -912,8 +886,7 @@ int mbedtls_cipher_check_tag(mbedtls_cipher_context_t *ctx,
 int mbedtls_cipher_crypt(mbedtls_cipher_context_t *ctx,
                          const unsigned char *iv, size_t iv_len,
                          const unsigned char *input, size_t ilen,
-                         unsigned char *output, size_t *olen)
-{
+                         unsigned char *output, size_t *olen) {
     int ret;
     size_t finish_olen;
 
@@ -943,8 +916,7 @@ int mbedtls_cipher_auth_encrypt(mbedtls_cipher_context_t *ctx,
                                 const unsigned char *ad, size_t ad_len,
                                 const unsigned char *input, size_t ilen,
                                 unsigned char *output, size_t *olen,
-                                unsigned char *tag, size_t tag_len)
-{
+                                unsigned char *tag, size_t tag_len) {
 #if defined(MBEDTLS_GCM_C)
     if (MBEDTLS_MODE_GCM == ctx->cipher_info->mode) {
         *olen = ilen;
@@ -965,7 +937,7 @@ int mbedtls_cipher_auth_encrypt(mbedtls_cipher_context_t *ctx,
     if (MBEDTLS_CIPHER_CHACHA20_POLY1305 == ctx->cipher_info->type) {
         /* ChachaPoly has fixed length nonce and MAC (tag) */
         if ((iv_len != ctx->cipher_info->iv_size) ||
-            (tag_len != 16U)) {
+                (tag_len != 16U)) {
             return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
         }
 
@@ -986,8 +958,7 @@ int mbedtls_cipher_auth_decrypt(mbedtls_cipher_context_t *ctx,
                                 const unsigned char *ad, size_t ad_len,
                                 const unsigned char *input, size_t ilen,
                                 unsigned char *output, size_t *olen,
-                                const unsigned char *tag, size_t tag_len)
-{
+                                const unsigned char *tag, size_t tag_len) {
 #if defined(MBEDTLS_GCM_C)
     if (MBEDTLS_MODE_GCM == ctx->cipher_info->mode) {
         int ret;
@@ -1024,7 +995,7 @@ int mbedtls_cipher_auth_decrypt(mbedtls_cipher_context_t *ctx,
 
         /* ChachaPoly has fixed length nonce and MAC (tag) */
         if ((iv_len != ctx->cipher_info->iv_size) ||
-            (tag_len != 16U)) {
+                (tag_len != 16U)) {
             return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
         }
 
diff --git a/common/mbedtls/cipher.h b/common/mbedtls/cipher.h
index 18b5d7140..c653890ad 100644
--- a/common/mbedtls/cipher.h
+++ b/common/mbedtls/cipher.h
@@ -413,8 +413,7 @@ int mbedtls_cipher_setup(mbedtls_cipher_context_t *ctx, const mbedtls_cipher_inf
  * \return       The size of the blocks of the cipher.
  * \return       0 if \p ctx has not been initialized.
  */
-static inline unsigned int mbedtls_cipher_get_block_size(const mbedtls_cipher_context_t *ctx)
-{
+static inline unsigned int mbedtls_cipher_get_block_size(const mbedtls_cipher_context_t *ctx) {
     if (NULL == ctx || NULL == ctx->cipher_info)
         return 0;
 
@@ -430,8 +429,7 @@ static inline unsigned int mbedtls_cipher_get_block_size(const mbedtls_cipher_co
  * \return       The mode of operation.
  * \return       #MBEDTLS_MODE_NONE if \p ctx has not been initialized.
  */
-static inline mbedtls_cipher_mode_t mbedtls_cipher_get_cipher_mode(const mbedtls_cipher_context_t *ctx)
-{
+static inline mbedtls_cipher_mode_t mbedtls_cipher_get_cipher_mode(const mbedtls_cipher_context_t *ctx) {
     if (NULL == ctx || NULL == ctx->cipher_info)
         return MBEDTLS_MODE_NONE;
 
@@ -448,8 +446,7 @@ static inline mbedtls_cipher_mode_t mbedtls_cipher_get_cipher_mode(const mbedtls
  * \return      \c 0 for ciphers not using an IV or a nonce.
  * \return      The actual size if an IV has been set.
  */
-static inline int mbedtls_cipher_get_iv_size(const mbedtls_cipher_context_t *ctx)
-{
+static inline int mbedtls_cipher_get_iv_size(const mbedtls_cipher_context_t *ctx) {
     if (NULL == ctx || NULL == ctx->cipher_info)
         return 0;
 
@@ -467,8 +464,7 @@ static inline int mbedtls_cipher_get_iv_size(const mbedtls_cipher_context_t *ctx
  * \return              The type of the cipher.
  * \return              #MBEDTLS_CIPHER_NONE if \p ctx has not been initialized.
  */
-static inline mbedtls_cipher_type_t mbedtls_cipher_get_type(const mbedtls_cipher_context_t *ctx)
-{
+static inline mbedtls_cipher_type_t mbedtls_cipher_get_type(const mbedtls_cipher_context_t *ctx) {
     if (NULL == ctx || NULL == ctx->cipher_info)
         return MBEDTLS_CIPHER_NONE;
 
@@ -484,8 +480,7 @@ static inline mbedtls_cipher_type_t mbedtls_cipher_get_type(const mbedtls_cipher
  * \return              The name of the cipher.
  * \return              NULL if \p ctx has not been not initialized.
  */
-static inline const char *mbedtls_cipher_get_name(const mbedtls_cipher_context_t *ctx)
-{
+static inline const char *mbedtls_cipher_get_name(const mbedtls_cipher_context_t *ctx) {
     if (NULL == ctx || NULL == ctx->cipher_info)
         return 0;
 
@@ -501,8 +496,7 @@ static inline const char *mbedtls_cipher_get_name(const mbedtls_cipher_context_t
  * \return              #MBEDTLS_KEY_LENGTH_NONE if ctx \p has not been
  *                      initialized.
  */
-static inline int mbedtls_cipher_get_key_bitlen(const mbedtls_cipher_context_t *ctx)
-{
+static inline int mbedtls_cipher_get_key_bitlen(const mbedtls_cipher_context_t *ctx) {
     if (NULL == ctx || NULL == ctx->cipher_info)
         return MBEDTLS_KEY_LENGTH_NONE;
 
@@ -517,8 +511,7 @@ static inline int mbedtls_cipher_get_key_bitlen(const mbedtls_cipher_context_t *
  * \return         The type of operation: #MBEDTLS_ENCRYPT or #MBEDTLS_DECRYPT.
  * \return         #MBEDTLS_OPERATION_NONE if \p ctx has not been initialized.
  */
-static inline mbedtls_operation_t mbedtls_cipher_get_operation(const mbedtls_cipher_context_t *ctx)
-{
+static inline mbedtls_operation_t mbedtls_cipher_get_operation(const mbedtls_cipher_context_t *ctx) {
     if (NULL == ctx || NULL == ctx->cipher_info)
         return MBEDTLS_OPERATION_NONE;
 
diff --git a/common/mbedtls/cipher_wrap.c b/common/mbedtls/cipher_wrap.c
index ec562f463..e9069794d 100644
--- a/common/mbedtls/cipher_wrap.c
+++ b/common/mbedtls/cipher_wrap.c
@@ -89,8 +89,7 @@
 
 #if defined(MBEDTLS_GCM_C)
 /* shared by all GCM ciphers */
-static void *gcm_ctx_alloc(void)
-{
+static void *gcm_ctx_alloc(void) {
     void *ctx = mbedtls_calloc(1, sizeof(mbedtls_gcm_context));
 
     if (ctx != NULL)
@@ -99,8 +98,7 @@ static void *gcm_ctx_alloc(void)
     return (ctx);
 }
 
-static void gcm_ctx_free(void *ctx)
-{
+static void gcm_ctx_free(void *ctx) {
     mbedtls_gcm_free(ctx);
     mbedtls_free(ctx);
 }
@@ -108,8 +106,7 @@ static void gcm_ctx_free(void *ctx)
 
 #if defined(MBEDTLS_CCM_C)
 /* shared by all CCM ciphers */
-static void *ccm_ctx_alloc(void)
-{
+static void *ccm_ctx_alloc(void) {
     void *ctx = mbedtls_calloc(1, sizeof(mbedtls_ccm_context));
 
     if (ctx != NULL)
@@ -118,8 +115,7 @@ static void *ccm_ctx_alloc(void)
     return (ctx);
 }
 
-static void ccm_ctx_free(void *ctx)
-{
+static void ccm_ctx_free(void *ctx) {
     mbedtls_ccm_free(ctx);
     mbedtls_free(ctx);
 }
@@ -128,15 +124,13 @@ static void ccm_ctx_free(void *ctx)
 #if defined(MBEDTLS_AES_C)
 
 static int aes_crypt_ecb_wrap(void *ctx, mbedtls_operation_t operation,
-                              const unsigned char *input, unsigned char *output)
-{
+                              const unsigned char *input, unsigned char *output) {
     return mbedtls_aes_crypt_ecb((mbedtls_aes_context *) ctx, operation, input, output);
 }
 
 #if defined(MBEDTLS_CIPHER_MODE_CBC)
 static int aes_crypt_cbc_wrap(void *ctx, mbedtls_operation_t operation, size_t length,
-                              unsigned char *iv, const unsigned char *input, unsigned char *output)
-{
+                              unsigned char *iv, const unsigned char *input, unsigned char *output) {
     return mbedtls_aes_crypt_cbc((mbedtls_aes_context *) ctx, operation, length, iv, input,
                                  output);
 }
@@ -145,8 +139,7 @@ static int aes_crypt_cbc_wrap(void *ctx, mbedtls_operation_t operation, size_t l
 #if defined(MBEDTLS_CIPHER_MODE_CFB)
 static int aes_crypt_cfb128_wrap(void *ctx, mbedtls_operation_t operation,
                                  size_t length, size_t *iv_off, unsigned char *iv,
-                                 const unsigned char *input, unsigned char *output)
-{
+                                 const unsigned char *input, unsigned char *output) {
     return mbedtls_aes_crypt_cfb128((mbedtls_aes_context *) ctx, operation, length, iv_off, iv,
                                     input, output);
 }
@@ -154,8 +147,7 @@ static int aes_crypt_cfb128_wrap(void *ctx, mbedtls_operation_t operation,
 
 #if defined(MBEDTLS_CIPHER_MODE_OFB)
 static int aes_crypt_ofb_wrap(void *ctx, size_t length, size_t *iv_off,
-                              unsigned char *iv, const unsigned char *input, unsigned char *output)
-{
+                              unsigned char *iv, const unsigned char *input, unsigned char *output) {
     return mbedtls_aes_crypt_ofb((mbedtls_aes_context *) ctx, length, iv_off,
                                  iv, input, output);
 }
@@ -164,8 +156,7 @@ static int aes_crypt_ofb_wrap(void *ctx, size_t length, size_t *iv_off,
 #if defined(MBEDTLS_CIPHER_MODE_CTR)
 static int aes_crypt_ctr_wrap(void *ctx, size_t length, size_t *nc_off,
                               unsigned char *nonce_counter, unsigned char *stream_block,
-                              const unsigned char *input, unsigned char *output)
-{
+                              const unsigned char *input, unsigned char *output) {
     return mbedtls_aes_crypt_ctr((mbedtls_aes_context *) ctx, length, nc_off, nonce_counter,
                                  stream_block, input, output);
 }
@@ -176,8 +167,7 @@ static int aes_crypt_xts_wrap(void *ctx, mbedtls_operation_t operation,
                               size_t length,
                               const unsigned char data_unit[16],
                               const unsigned char *input,
-                              unsigned char *output)
-{
+                              unsigned char *output) {
     mbedtls_aes_xts_context *xts_ctx = ctx;
     int mode;
 
@@ -198,19 +188,16 @@ static int aes_crypt_xts_wrap(void *ctx, mbedtls_operation_t operation,
 #endif /* MBEDTLS_CIPHER_MODE_XTS */
 
 static int aes_setkey_dec_wrap(void *ctx, const unsigned char *key,
-                               unsigned int key_bitlen)
-{
+                               unsigned int key_bitlen) {
     return mbedtls_aes_setkey_dec((mbedtls_aes_context *) ctx, key, key_bitlen);
 }
 
 static int aes_setkey_enc_wrap(void *ctx, const unsigned char *key,
-                               unsigned int key_bitlen)
-{
+                               unsigned int key_bitlen) {
     return mbedtls_aes_setkey_enc((mbedtls_aes_context *) ctx, key, key_bitlen);
 }
 
-static void *aes_ctx_alloc(void)
-{
+static void *aes_ctx_alloc(void) {
     mbedtls_aes_context *aes = mbedtls_calloc(1, sizeof(mbedtls_aes_context));
 
     if (aes == NULL)
@@ -221,8 +208,7 @@ static void *aes_ctx_alloc(void)
     return (aes);
 }
 
-static void aes_ctx_free(void *ctx)
-{
+static void aes_ctx_free(void *ctx) {
     mbedtls_aes_free((mbedtls_aes_context *) ctx);
     mbedtls_free(ctx);
 }
@@ -429,21 +415,18 @@ static const mbedtls_cipher_info_t aes_256_ctr_info = {
 
 #if defined(MBEDTLS_CIPHER_MODE_XTS)
 static int xts_aes_setkey_enc_wrap(void *ctx, const unsigned char *key,
-                                   unsigned int key_bitlen)
-{
+                                   unsigned int key_bitlen) {
     mbedtls_aes_xts_context *xts_ctx = ctx;
     return (mbedtls_aes_xts_setkey_enc(xts_ctx, key, key_bitlen));
 }
 
 static int xts_aes_setkey_dec_wrap(void *ctx, const unsigned char *key,
-                                   unsigned int key_bitlen)
-{
+                                   unsigned int key_bitlen) {
     mbedtls_aes_xts_context *xts_ctx = ctx;
     return (mbedtls_aes_xts_setkey_dec(xts_ctx, key, key_bitlen));
 }
 
-static void *xts_aes_ctx_alloc(void)
-{
+static void *xts_aes_ctx_alloc(void) {
     mbedtls_aes_xts_context *xts_ctx = mbedtls_calloc(1, sizeof(*xts_ctx));
 
     if (xts_ctx != NULL)
@@ -452,8 +435,7 @@ static void *xts_aes_ctx_alloc(void)
     return (xts_ctx);
 }
 
-static void xts_aes_ctx_free(void *ctx)
-{
+static void xts_aes_ctx_free(void *ctx) {
     mbedtls_aes_xts_context *xts_ctx = ctx;
 
     if (xts_ctx == NULL)
@@ -515,8 +497,7 @@ static const mbedtls_cipher_info_t aes_256_xts_info = {
 
 #if defined(MBEDTLS_GCM_C)
 static int gcm_aes_setkey_wrap(void *ctx, const unsigned char *key,
-                               unsigned int key_bitlen)
-{
+                               unsigned int key_bitlen) {
     return mbedtls_gcm_setkey((mbedtls_gcm_context *) ctx, MBEDTLS_CIPHER_ID_AES,
                               key, key_bitlen);
 }
@@ -584,8 +565,7 @@ static const mbedtls_cipher_info_t aes_256_gcm_info = {
 
 #if defined(MBEDTLS_CCM_C)
 static int ccm_aes_setkey_wrap(void *ctx, const unsigned char *key,
-                               unsigned int key_bitlen)
-{
+                               unsigned int key_bitlen) {
     return mbedtls_ccm_setkey((mbedtls_ccm_context *) ctx, MBEDTLS_CIPHER_ID_AES,
                               key, key_bitlen);
 }
@@ -656,8 +636,7 @@ static const mbedtls_cipher_info_t aes_256_ccm_info = {
 #if defined(MBEDTLS_CAMELLIA_C)
 
 static int camellia_crypt_ecb_wrap(void *ctx, mbedtls_operation_t operation,
-                                   const unsigned char *input, unsigned char *output)
-{
+                                   const unsigned char *input, unsigned char *output) {
     return mbedtls_camellia_crypt_ecb((mbedtls_camellia_context *) ctx, operation, input,
                                       output);
 }
@@ -665,8 +644,7 @@ static int camellia_crypt_ecb_wrap(void *ctx, mbedtls_operation_t operation,
 #if defined(MBEDTLS_CIPHER_MODE_CBC)
 static int camellia_crypt_cbc_wrap(void *ctx, mbedtls_operation_t operation,
                                    size_t length, unsigned char *iv,
-                                   const unsigned char *input, unsigned char *output)
-{
+                                   const unsigned char *input, unsigned char *output) {
     return mbedtls_camellia_crypt_cbc((mbedtls_camellia_context *) ctx, operation, length, iv,
                                       input, output);
 }
@@ -675,8 +653,7 @@ static int camellia_crypt_cbc_wrap(void *ctx, mbedtls_operation_t operation,
 #if defined(MBEDTLS_CIPHER_MODE_CFB)
 static int camellia_crypt_cfb128_wrap(void *ctx, mbedtls_operation_t operation,
                                       size_t length, size_t *iv_off, unsigned char *iv,
-                                      const unsigned char *input, unsigned char *output)
-{
+                                      const unsigned char *input, unsigned char *output) {
     return mbedtls_camellia_crypt_cfb128((mbedtls_camellia_context *) ctx, operation, length,
                                          iv_off, iv, input, output);
 }
@@ -685,27 +662,23 @@ static int camellia_crypt_cfb128_wrap(void *ctx, mbedtls_operation_t operation,
 #if defined(MBEDTLS_CIPHER_MODE_CTR)
 static int camellia_crypt_ctr_wrap(void *ctx, size_t length, size_t *nc_off,
                                    unsigned char *nonce_counter, unsigned char *stream_block,
-                                   const unsigned char *input, unsigned char *output)
-{
+                                   const unsigned char *input, unsigned char *output) {
     return mbedtls_camellia_crypt_ctr((mbedtls_camellia_context *) ctx, length, nc_off,
                                       nonce_counter, stream_block, input, output);
 }
 #endif /* MBEDTLS_CIPHER_MODE_CTR */
 
 static int camellia_setkey_dec_wrap(void *ctx, const unsigned char *key,
-                                    unsigned int key_bitlen)
-{
+                                    unsigned int key_bitlen) {
     return mbedtls_camellia_setkey_dec((mbedtls_camellia_context *) ctx, key, key_bitlen);
 }
 
 static int camellia_setkey_enc_wrap(void *ctx, const unsigned char *key,
-                                    unsigned int key_bitlen)
-{
+                                    unsigned int key_bitlen) {
     return mbedtls_camellia_setkey_enc((mbedtls_camellia_context *) ctx, key, key_bitlen);
 }
 
-static void *camellia_ctx_alloc(void)
-{
+static void *camellia_ctx_alloc(void) {
     mbedtls_camellia_context *ctx;
     ctx = mbedtls_calloc(1, sizeof(mbedtls_camellia_context));
 
@@ -717,8 +690,7 @@ static void *camellia_ctx_alloc(void)
     return (ctx);
 }
 
-static void camellia_ctx_free(void *ctx)
-{
+static void camellia_ctx_free(void *ctx) {
     mbedtls_camellia_free((mbedtls_camellia_context *) ctx);
     mbedtls_free(ctx);
 }
@@ -890,8 +862,7 @@ static const mbedtls_cipher_info_t camellia_256_ctr_info = {
 
 #if defined(MBEDTLS_GCM_C)
 static int gcm_camellia_setkey_wrap(void *ctx, const unsigned char *key,
-                                    unsigned int key_bitlen)
-{
+                                    unsigned int key_bitlen) {
     return mbedtls_gcm_setkey((mbedtls_gcm_context *) ctx, MBEDTLS_CIPHER_ID_CAMELLIA,
                               key, key_bitlen);
 }
@@ -959,8 +930,7 @@ static const mbedtls_cipher_info_t camellia_256_gcm_info = {
 
 #if defined(MBEDTLS_CCM_C)
 static int ccm_camellia_setkey_wrap(void *ctx, const unsigned char *key,
-                                    unsigned int key_bitlen)
-{
+                                    unsigned int key_bitlen) {
     return mbedtls_ccm_setkey((mbedtls_ccm_context *) ctx, MBEDTLS_CIPHER_ID_CAMELLIA,
                               key, key_bitlen);
 }
@@ -1031,8 +1001,7 @@ static const mbedtls_cipher_info_t camellia_256_ccm_info = {
 #if defined(MBEDTLS_ARIA_C)
 
 static int aria_crypt_ecb_wrap(void *ctx, mbedtls_operation_t operation,
-                               const unsigned char *input, unsigned char *output)
-{
+                               const unsigned char *input, unsigned char *output) {
     (void) operation;
     return mbedtls_aria_crypt_ecb((mbedtls_aria_context *) ctx, input,
                                   output);
@@ -1041,8 +1010,7 @@ static int aria_crypt_ecb_wrap(void *ctx, mbedtls_operation_t operation,
 #if defined(MBEDTLS_CIPHER_MODE_CBC)
 static int aria_crypt_cbc_wrap(void *ctx, mbedtls_operation_t operation,
                                size_t length, unsigned char *iv,
-                               const unsigned char *input, unsigned char *output)
-{
+                               const unsigned char *input, unsigned char *output) {
     return mbedtls_aria_crypt_cbc((mbedtls_aria_context *) ctx, operation, length, iv,
                                   input, output);
 }
@@ -1051,8 +1019,7 @@ static int aria_crypt_cbc_wrap(void *ctx, mbedtls_operation_t operation,
 #if defined(MBEDTLS_CIPHER_MODE_CFB)
 static int aria_crypt_cfb128_wrap(void *ctx, mbedtls_operation_t operation,
                                   size_t length, size_t *iv_off, unsigned char *iv,
-                                  const unsigned char *input, unsigned char *output)
-{
+                                  const unsigned char *input, unsigned char *output) {
     return mbedtls_aria_crypt_cfb128((mbedtls_aria_context *) ctx, operation, length,
                                      iv_off, iv, input, output);
 }
@@ -1061,27 +1028,23 @@ static int aria_crypt_cfb128_wrap(void *ctx, mbedtls_operation_t operation,
 #if defined(MBEDTLS_CIPHER_MODE_CTR)
 static int aria_crypt_ctr_wrap(void *ctx, size_t length, size_t *nc_off,
                                unsigned char *nonce_counter, unsigned char *stream_block,
-                               const unsigned char *input, unsigned char *output)
-{
+                               const unsigned char *input, unsigned char *output) {
     return mbedtls_aria_crypt_ctr((mbedtls_aria_context *) ctx, length, nc_off,
                                   nonce_counter, stream_block, input, output);
 }
 #endif /* MBEDTLS_CIPHER_MODE_CTR */
 
 static int aria_setkey_dec_wrap(void *ctx, const unsigned char *key,
-                                unsigned int key_bitlen)
-{
+                                unsigned int key_bitlen) {
     return mbedtls_aria_setkey_dec((mbedtls_aria_context *) ctx, key, key_bitlen);
 }
 
 static int aria_setkey_enc_wrap(void *ctx, const unsigned char *key,
-                                unsigned int key_bitlen)
-{
+                                unsigned int key_bitlen) {
     return mbedtls_aria_setkey_enc((mbedtls_aria_context *) ctx, key, key_bitlen);
 }
 
-static void *aria_ctx_alloc(void)
-{
+static void *aria_ctx_alloc(void) {
     mbedtls_aria_context *ctx;
     ctx = mbedtls_calloc(1, sizeof(mbedtls_aria_context));
 
@@ -1093,8 +1056,7 @@ static void *aria_ctx_alloc(void)
     return (ctx);
 }
 
-static void aria_ctx_free(void *ctx)
-{
+static void aria_ctx_free(void *ctx) {
     mbedtls_aria_free((mbedtls_aria_context *) ctx);
     mbedtls_free(ctx);
 }
@@ -1266,8 +1228,7 @@ static const mbedtls_cipher_info_t aria_256_ctr_info = {
 
 #if defined(MBEDTLS_GCM_C)
 static int gcm_aria_setkey_wrap(void *ctx, const unsigned char *key,
-                                unsigned int key_bitlen)
-{
+                                unsigned int key_bitlen) {
     return mbedtls_gcm_setkey((mbedtls_gcm_context *) ctx, MBEDTLS_CIPHER_ID_ARIA,
                               key, key_bitlen);
 }
@@ -1335,8 +1296,7 @@ static const mbedtls_cipher_info_t aria_256_gcm_info = {
 
 #if defined(MBEDTLS_CCM_C)
 static int ccm_aria_setkey_wrap(void *ctx, const unsigned char *key,
-                                unsigned int key_bitlen)
-{
+                                unsigned int key_bitlen) {
     return mbedtls_ccm_setkey((mbedtls_ccm_context *) ctx, MBEDTLS_CIPHER_ID_ARIA,
                               key, key_bitlen);
 }
@@ -1407,23 +1367,20 @@ static const mbedtls_cipher_info_t aria_256_ccm_info = {
 #if defined(MBEDTLS_DES_C)
 
 static int des_crypt_ecb_wrap(void *ctx, mbedtls_operation_t operation,
-                              const unsigned char *input, unsigned char *output)
-{
+                              const unsigned char *input, unsigned char *output) {
     ((void) operation);
     return mbedtls_des_crypt_ecb((mbedtls_des_context *) ctx, input, output);
 }
 
 static int des3_crypt_ecb_wrap(void *ctx, mbedtls_operation_t operation,
-                               const unsigned char *input, unsigned char *output)
-{
+                               const unsigned char *input, unsigned char *output) {
     ((void) operation);
     return mbedtls_des3_crypt_ecb((mbedtls_des3_context *) ctx, input, output);
 }
 
 #if defined(MBEDTLS_CIPHER_MODE_CBC)
 static int des_crypt_cbc_wrap(void *ctx, mbedtls_operation_t operation, size_t length,
-                              unsigned char *iv, const unsigned char *input, unsigned char *output)
-{
+                              unsigned char *iv, const unsigned char *input, unsigned char *output) {
     return mbedtls_des_crypt_cbc((mbedtls_des_context *) ctx, operation, length, iv, input,
                                  output);
 }
@@ -1431,63 +1388,55 @@ static int des_crypt_cbc_wrap(void *ctx, mbedtls_operation_t operation, size_t l
 
 #if defined(MBEDTLS_CIPHER_MODE_CBC)
 static int des3_crypt_cbc_wrap(void *ctx, mbedtls_operation_t operation, size_t length,
-                               unsigned char *iv, const unsigned char *input, unsigned char *output)
-{
+                               unsigned char *iv, const unsigned char *input, unsigned char *output) {
     return mbedtls_des3_crypt_cbc((mbedtls_des3_context *) ctx, operation, length, iv, input,
                                   output);
 }
 #endif /* MBEDTLS_CIPHER_MODE_CBC */
 
 static int des_setkey_dec_wrap(void *ctx, const unsigned char *key,
-                               unsigned int key_bitlen)
-{
+                               unsigned int key_bitlen) {
     ((void) key_bitlen);
 
     return mbedtls_des_setkey_dec((mbedtls_des_context *) ctx, key);
 }
 
 static int des_setkey_enc_wrap(void *ctx, const unsigned char *key,
-                               unsigned int key_bitlen)
-{
+                               unsigned int key_bitlen) {
     ((void) key_bitlen);
 
     return mbedtls_des_setkey_enc((mbedtls_des_context *) ctx, key);
 }
 
 static int des3_set2key_dec_wrap(void *ctx, const unsigned char *key,
-                                 unsigned int key_bitlen)
-{
+                                 unsigned int key_bitlen) {
     ((void) key_bitlen);
 
     return mbedtls_des3_set2key_dec((mbedtls_des3_context *) ctx, key);
 }
 
 static int des3_set2key_enc_wrap(void *ctx, const unsigned char *key,
-                                 unsigned int key_bitlen)
-{
+                                 unsigned int key_bitlen) {
     ((void) key_bitlen);
 
     return mbedtls_des3_set2key_enc((mbedtls_des3_context *) ctx, key);
 }
 
 static int des3_set3key_dec_wrap(void *ctx, const unsigned char *key,
-                                 unsigned int key_bitlen)
-{
+                                 unsigned int key_bitlen) {
     ((void) key_bitlen);
 
     return mbedtls_des3_set3key_dec((mbedtls_des3_context *) ctx, key);
 }
 
 static int des3_set3key_enc_wrap(void *ctx, const unsigned char *key,
-                                 unsigned int key_bitlen)
-{
+                                 unsigned int key_bitlen) {
     ((void) key_bitlen);
 
     return mbedtls_des3_set3key_enc((mbedtls_des3_context *) ctx, key);
 }
 
-static void *des_ctx_alloc(void)
-{
+static void *des_ctx_alloc(void) {
     mbedtls_des_context *des = mbedtls_calloc(1, sizeof(mbedtls_des_context));
 
     if (des == NULL)
@@ -1498,14 +1447,12 @@ static void *des_ctx_alloc(void)
     return (des);
 }
 
-static void des_ctx_free(void *ctx)
-{
+static void des_ctx_free(void *ctx) {
     mbedtls_des_free((mbedtls_des_context *) ctx);
     mbedtls_free(ctx);
 }
 
-static void *des3_ctx_alloc(void)
-{
+static void *des3_ctx_alloc(void) {
     mbedtls_des3_context *des3;
     des3 = mbedtls_calloc(1, sizeof(mbedtls_des3_context));
 
@@ -1517,8 +1464,7 @@ static void *des3_ctx_alloc(void)
     return (des3);
 }
 
-static void des3_ctx_free(void *ctx)
-{
+static void des3_ctx_free(void *ctx) {
     mbedtls_des3_free((mbedtls_des3_context *) ctx);
     mbedtls_free(ctx);
 }
@@ -1679,8 +1625,7 @@ static const mbedtls_cipher_info_t des_ede3_cbc_info = {
 #if defined(MBEDTLS_BLOWFISH_C)
 
 static int blowfish_crypt_ecb_wrap(void *ctx, mbedtls_operation_t operation,
-                                   const unsigned char *input, unsigned char *output)
-{
+                                   const unsigned char *input, unsigned char *output) {
     return mbedtls_blowfish_crypt_ecb((mbedtls_blowfish_context *) ctx, operation, input,
                                       output);
 }
@@ -1688,8 +1633,7 @@ static int blowfish_crypt_ecb_wrap(void *ctx, mbedtls_operation_t operation,
 #if defined(MBEDTLS_CIPHER_MODE_CBC)
 static int blowfish_crypt_cbc_wrap(void *ctx, mbedtls_operation_t operation,
                                    size_t length, unsigned char *iv, const unsigned char *input,
-                                   unsigned char *output)
-{
+                                   unsigned char *output) {
     return mbedtls_blowfish_crypt_cbc((mbedtls_blowfish_context *) ctx, operation, length, iv,
                                       input, output);
 }
@@ -1698,8 +1642,7 @@ static int blowfish_crypt_cbc_wrap(void *ctx, mbedtls_operation_t operation,
 #if defined(MBEDTLS_CIPHER_MODE_CFB)
 static int blowfish_crypt_cfb64_wrap(void *ctx, mbedtls_operation_t operation,
                                      size_t length, size_t *iv_off, unsigned char *iv,
-                                     const unsigned char *input, unsigned char *output)
-{
+                                     const unsigned char *input, unsigned char *output) {
     return mbedtls_blowfish_crypt_cfb64((mbedtls_blowfish_context *) ctx, operation, length,
                                         iv_off, iv, input, output);
 }
@@ -1708,21 +1651,18 @@ static int blowfish_crypt_cfb64_wrap(void *ctx, mbedtls_operation_t operation,
 #if defined(MBEDTLS_CIPHER_MODE_CTR)
 static int blowfish_crypt_ctr_wrap(void *ctx, size_t length, size_t *nc_off,
                                    unsigned char *nonce_counter, unsigned char *stream_block,
-                                   const unsigned char *input, unsigned char *output)
-{
+                                   const unsigned char *input, unsigned char *output) {
     return mbedtls_blowfish_crypt_ctr((mbedtls_blowfish_context *) ctx, length, nc_off,
                                       nonce_counter, stream_block, input, output);
 }
 #endif /* MBEDTLS_CIPHER_MODE_CTR */
 
 static int blowfish_setkey_wrap(void *ctx, const unsigned char *key,
-                                unsigned int key_bitlen)
-{
+                                unsigned int key_bitlen) {
     return mbedtls_blowfish_setkey((mbedtls_blowfish_context *) ctx, key, key_bitlen);
 }
 
-static void *blowfish_ctx_alloc(void)
-{
+static void *blowfish_ctx_alloc(void) {
     mbedtls_blowfish_context *ctx;
     ctx = mbedtls_calloc(1, sizeof(mbedtls_blowfish_context));
 
@@ -1734,8 +1674,7 @@ static void *blowfish_ctx_alloc(void)
     return (ctx);
 }
 
-static void blowfish_ctx_free(void *ctx)
-{
+static void blowfish_ctx_free(void *ctx) {
     mbedtls_blowfish_free((mbedtls_blowfish_context *) ctx);
     mbedtls_free(ctx);
 }
@@ -1821,14 +1760,12 @@ static const mbedtls_cipher_info_t blowfish_ctr_info = {
 #if defined(MBEDTLS_ARC4_C)
 static int arc4_crypt_stream_wrap(void *ctx, size_t length,
                                   const unsigned char *input,
-                                  unsigned char *output)
-{
+                                  unsigned char *output) {
     return (mbedtls_arc4_crypt((mbedtls_arc4_context *) ctx, length, input, output));
 }
 
 static int arc4_setkey_wrap(void *ctx, const unsigned char *key,
-                            unsigned int key_bitlen)
-{
+                            unsigned int key_bitlen) {
     /* we get key_bitlen in bits, arc4 expects it in bytes */
     if (key_bitlen % 8 != 0)
         return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
@@ -1837,8 +1774,7 @@ static int arc4_setkey_wrap(void *ctx, const unsigned char *key,
     return (0);
 }
 
-static void *arc4_ctx_alloc(void)
-{
+static void *arc4_ctx_alloc(void) {
     mbedtls_arc4_context *ctx;
     ctx = mbedtls_calloc(1, sizeof(mbedtls_arc4_context));
 
@@ -1850,8 +1786,7 @@ static void *arc4_ctx_alloc(void)
     return (ctx);
 }
 
-static void arc4_ctx_free(void *ctx)
-{
+static void arc4_ctx_free(void *ctx) {
     mbedtls_arc4_free((mbedtls_arc4_context *) ctx);
     mbedtls_free(ctx);
 }
@@ -1898,8 +1833,7 @@ static const mbedtls_cipher_info_t arc4_128_info = {
 #if defined(MBEDTLS_CHACHA20_C)
 
 static int chacha20_setkey_wrap(void *ctx, const unsigned char *key,
-                                unsigned int key_bitlen)
-{
+                                unsigned int key_bitlen) {
     if (key_bitlen != 256U)
         return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
 
@@ -1911,8 +1845,7 @@ static int chacha20_setkey_wrap(void *ctx, const unsigned char *key,
 
 static int chacha20_stream_wrap(void *ctx,  size_t length,
                                 const unsigned char *input,
-                                unsigned char *output)
-{
+                                unsigned char *output) {
     int ret;
 
     ret = mbedtls_chacha20_update(ctx, length, input, output);
@@ -1922,8 +1855,7 @@ static int chacha20_stream_wrap(void *ctx,  size_t length,
     return (ret);
 }
 
-static void *chacha20_ctx_alloc(void)
-{
+static void *chacha20_ctx_alloc(void) {
     mbedtls_chacha20_context *ctx;
     ctx = mbedtls_calloc(1, sizeof(mbedtls_chacha20_context));
 
@@ -1935,8 +1867,7 @@ static void *chacha20_ctx_alloc(void)
     return (ctx);
 }
 
-static void chacha20_ctx_free(void *ctx)
-{
+static void chacha20_ctx_free(void *ctx) {
     mbedtls_chacha20_free((mbedtls_chacha20_context *) ctx);
     mbedtls_free(ctx);
 }
@@ -1983,8 +1914,7 @@ static const mbedtls_cipher_info_t chacha20_info = {
 
 static int chachapoly_setkey_wrap(void *ctx,
                                   const unsigned char *key,
-                                  unsigned int key_bitlen)
-{
+                                  unsigned int key_bitlen) {
     if (key_bitlen != 256U)
         return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
 
@@ -1994,8 +1924,7 @@ static int chachapoly_setkey_wrap(void *ctx,
     return (0);
 }
 
-static void *chachapoly_ctx_alloc(void)
-{
+static void *chachapoly_ctx_alloc(void) {
     mbedtls_chachapoly_context *ctx;
     ctx = mbedtls_calloc(1, sizeof(mbedtls_chachapoly_context));
 
@@ -2007,8 +1936,7 @@ static void *chachapoly_ctx_alloc(void)
     return (ctx);
 }
 
-static void chachapoly_ctx_free(void *ctx)
-{
+static void chachapoly_ctx_free(void *ctx) {
     mbedtls_chachapoly_free((mbedtls_chachapoly_context *) ctx);
     mbedtls_free(ctx);
 }
@@ -2054,16 +1982,14 @@ static const mbedtls_cipher_info_t chachapoly_info = {
 #if defined(MBEDTLS_CIPHER_NULL_CIPHER)
 static int null_crypt_stream(void *ctx, size_t length,
                              const unsigned char *input,
-                             unsigned char *output)
-{
+                             unsigned char *output) {
     ((void) ctx);
     memmove(output, input, length);
     return (0);
 }
 
 static int null_setkey(void *ctx, const unsigned char *key,
-                       unsigned int key_bitlen)
-{
+                       unsigned int key_bitlen) {
     ((void) ctx);
     ((void) key);
     ((void) key_bitlen);
@@ -2071,13 +1997,11 @@ static int null_setkey(void *ctx, const unsigned char *key,
     return (0);
 }
 
-static void *null_ctx_alloc(void)
-{
+static void *null_ctx_alloc(void) {
     return ((void *) 1);
 }
 
-static void null_ctx_free(void *ctx)
-{
+static void null_ctx_free(void *ctx) {
     ((void) ctx);
 }
 
diff --git a/common/mbedtls/cmac.c b/common/mbedtls/cmac.c
index c1e603840..dcb1521ab 100644
--- a/common/mbedtls/cmac.c
+++ b/common/mbedtls/cmac.c
@@ -84,8 +84,7 @@
  */
 static int cmac_multiply_by_u(unsigned char *output,
                               const unsigned char *input,
-                              size_t blocksize)
-{
+                              size_t blocksize) {
     const unsigned char R_128 = 0x87;
     const unsigned char R_64 = 0x1B;
     unsigned char R_n, mask;
@@ -130,8 +129,7 @@ static int cmac_multiply_by_u(unsigned char *output,
  * - as specified by RFC 4493, section 2.3 Subkey Generation Algorithm
  */
 static int cmac_generate_subkeys(mbedtls_cipher_context_t *ctx,
-                                 unsigned char *K1, unsigned char *K2)
-{
+                                 unsigned char *K1, unsigned char *K2) {
     int ret;
     unsigned char L[MBEDTLS_CIPHER_BLKSIZE_MAX];
     size_t olen, block_size;
@@ -163,8 +161,7 @@ exit:
 #if !defined(MBEDTLS_CMAC_ALT)
 static void cmac_xor_block(unsigned char *output, const unsigned char *input1,
                            const unsigned char *input2,
-                           const size_t block_size)
-{
+                           const size_t block_size) {
     size_t idx;
 
     for (idx = 0; idx < block_size; idx++)
@@ -180,8 +177,7 @@ static void cmac_xor_block(unsigned char *output, const unsigned char *input1,
 static void cmac_pad(unsigned char padded_block[MBEDTLS_CIPHER_BLKSIZE_MAX],
                      size_t padded_block_len,
                      const unsigned char *last_block,
-                     size_t last_block_len)
-{
+                     size_t last_block_len) {
     size_t j;
 
     for (j = 0; j < padded_block_len; j++) {
@@ -195,8 +191,7 @@ static void cmac_pad(unsigned char padded_block[MBEDTLS_CIPHER_BLKSIZE_MAX],
 }
 
 int mbedtls_cipher_cmac_starts(mbedtls_cipher_context_t *ctx,
-                               const unsigned char *key, size_t keybits)
-{
+                               const unsigned char *key, size_t keybits) {
     mbedtls_cipher_type_t type;
     mbedtls_cmac_context_t *cmac_ctx;
     int retval;
@@ -234,15 +229,14 @@ int mbedtls_cipher_cmac_starts(mbedtls_cipher_context_t *ctx,
 }
 
 int mbedtls_cipher_cmac_update(mbedtls_cipher_context_t *ctx,
-                               const unsigned char *input, size_t ilen)
-{
+                               const unsigned char *input, size_t ilen) {
     mbedtls_cmac_context_t *cmac_ctx;
     unsigned char *state;
     int ret = 0;
     size_t n, j, olen, block_size;
 
     if (ctx == NULL || ctx->cipher_info == NULL || input == NULL ||
-        ctx->cmac_ctx == NULL)
+            ctx->cmac_ctx == NULL)
         return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
 
     cmac_ctx = ctx->cmac_ctx;
@@ -252,7 +246,7 @@ int mbedtls_cipher_cmac_update(mbedtls_cipher_context_t *ctx,
     /* Is there data still to process from the last call, that's greater in
      * size than a block? */
     if (cmac_ctx->unprocessed_len > 0 &&
-        ilen > block_size - cmac_ctx->unprocessed_len) {
+            ilen > block_size - cmac_ctx->unprocessed_len) {
         memcpy(&cmac_ctx->unprocessed_block[cmac_ctx->unprocessed_len],
                input,
                block_size - cmac_ctx->unprocessed_len);
@@ -298,8 +292,7 @@ exit:
 }
 
 int mbedtls_cipher_cmac_finish(mbedtls_cipher_context_t *ctx,
-                               unsigned char *output)
-{
+                               unsigned char *output) {
     mbedtls_cmac_context_t *cmac_ctx;
     unsigned char *state, *last_block;
     unsigned char K1[MBEDTLS_CIPHER_BLKSIZE_MAX];
@@ -309,7 +302,7 @@ int mbedtls_cipher_cmac_finish(mbedtls_cipher_context_t *ctx,
     size_t olen, block_size;
 
     if (ctx == NULL || ctx->cipher_info == NULL || ctx->cmac_ctx == NULL ||
-        output == NULL)
+            output == NULL)
         return (MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA);
 
     cmac_ctx = ctx->cmac_ctx;
@@ -354,8 +347,7 @@ exit:
     return (ret);
 }
 
-int mbedtls_cipher_cmac_reset(mbedtls_cipher_context_t *ctx)
-{
+int mbedtls_cipher_cmac_reset(mbedtls_cipher_context_t *ctx) {
     mbedtls_cmac_context_t *cmac_ctx;
 
     if (ctx == NULL || ctx->cipher_info == NULL || ctx->cmac_ctx == NULL)
@@ -376,8 +368,7 @@ int mbedtls_cipher_cmac_reset(mbedtls_cipher_context_t *ctx)
 int mbedtls_cipher_cmac(const mbedtls_cipher_info_t *cipher_info,
                         const unsigned char *key, size_t keylen,
                         const unsigned char *input, size_t ilen,
-                        unsigned char *output)
-{
+                        unsigned char *output) {
     mbedtls_cipher_context_t ctx;
     int ret;
 
@@ -411,8 +402,7 @@ exit:
  */
 int mbedtls_aes_cmac_prf_128(const unsigned char *key, size_t key_length,
                              const unsigned char *input, size_t in_len,
-                             unsigned char *output)
-{
+                             unsigned char *output) {
     int ret;
     const mbedtls_cipher_info_t *cipher_info;
     unsigned char zero_key[MBEDTLS_AES_BLOCK_SIZE];
@@ -747,8 +737,7 @@ static int cmac_test_subkeys(int verbose,
                              const unsigned char *subkeys,
                              mbedtls_cipher_type_t cipher_type,
                              int block_size,
-                             int num_tests)
-{
+                             int num_tests) {
     int i, ret = 0;
     mbedtls_cipher_context_t ctx;
     const mbedtls_cipher_info_t *cipher_info;
@@ -791,7 +780,7 @@ static int cmac_test_subkeys(int verbose,
         }
 
         if ((ret = memcmp(K1, subkeys, block_size)) != 0  ||
-            (ret = memcmp(K2, &subkeys[block_size], block_size)) != 0) {
+                (ret = memcmp(K2, &subkeys[block_size], block_size)) != 0) {
             if (verbose != 0)
                 mbedtls_printf("failed\n");
 
@@ -823,8 +812,7 @@ static int cmac_test_wth_cipher(int verbose,
                                 const unsigned char *expected_result,
                                 mbedtls_cipher_type_t cipher_type,
                                 int block_size,
-                                int num_tests)
-{
+                                int num_tests) {
     const mbedtls_cipher_info_t *cipher_info;
     int i, ret = 0;
     unsigned char output[MBEDTLS_CIPHER_BLKSIZE_MAX];
@@ -863,8 +851,7 @@ exit:
 }
 
 #if defined(MBEDTLS_AES_C)
-static int test_aes128_cmac_prf(int verbose)
-{
+static int test_aes128_cmac_prf(int verbose) {
     int i;
     int ret;
     unsigned char output[MBEDTLS_AES_BLOCK_SIZE];
@@ -873,7 +860,7 @@ static int test_aes128_cmac_prf(int verbose)
         mbedtls_printf("  AES CMAC 128 PRF #%u: ", i);
         ret = mbedtls_aes_cmac_prf_128(PRFK, PRFKlen[i], PRFM, 20, output);
         if (ret != 0 ||
-            memcmp(output, PRFT[i], MBEDTLS_AES_BLOCK_SIZE) != 0) {
+                memcmp(output, PRFT[i], MBEDTLS_AES_BLOCK_SIZE) != 0) {
 
             if (verbose != 0)
                 mbedtls_printf("failed\n");
@@ -887,8 +874,7 @@ static int test_aes128_cmac_prf(int verbose)
 }
 #endif /* MBEDTLS_AES_C */
 
-int mbedtls_cmac_self_test(int verbose)
-{
+int mbedtls_cmac_self_test(int verbose) {
     int ret;
 
 #if defined(MBEDTLS_AES_C)
diff --git a/common/mbedtls/ctr_drbg.c b/common/mbedtls/ctr_drbg.c
index f5b1af54c..7331d1045 100644
--- a/common/mbedtls/ctr_drbg.c
+++ b/common/mbedtls/ctr_drbg.c
@@ -55,8 +55,7 @@
 /*
  * CTR_DRBG context initialization
  */
-void mbedtls_ctr_drbg_init(mbedtls_ctr_drbg_context *ctx)
-{
+void mbedtls_ctr_drbg_init(mbedtls_ctr_drbg_context *ctx) {
     memset(ctx, 0, sizeof(mbedtls_ctr_drbg_context));
 
 #if defined(MBEDTLS_THREADING_C)
@@ -74,8 +73,7 @@ int mbedtls_ctr_drbg_seed_entropy_len(
     void *p_entropy,
     const unsigned char *custom,
     size_t len,
-    size_t entropy_len)
-{
+    size_t entropy_len) {
     int ret;
     unsigned char key[MBEDTLS_CTR_DRBG_KEYSIZE];
 
@@ -106,14 +104,12 @@ int mbedtls_ctr_drbg_seed(mbedtls_ctr_drbg_context *ctx,
                           int (*f_entropy)(void *, unsigned char *, size_t),
                           void *p_entropy,
                           const unsigned char *custom,
-                          size_t len)
-{
+                          size_t len) {
     return (mbedtls_ctr_drbg_seed_entropy_len(ctx, f_entropy, p_entropy, custom, len,
                                               MBEDTLS_CTR_DRBG_ENTROPY_LEN));
 }
 
-void mbedtls_ctr_drbg_free(mbedtls_ctr_drbg_context *ctx)
-{
+void mbedtls_ctr_drbg_free(mbedtls_ctr_drbg_context *ctx) {
     if (ctx == NULL)
         return;
 
@@ -124,24 +120,20 @@ void mbedtls_ctr_drbg_free(mbedtls_ctr_drbg_context *ctx)
     mbedtls_platform_zeroize(ctx, sizeof(mbedtls_ctr_drbg_context));
 }
 
-void mbedtls_ctr_drbg_set_prediction_resistance(mbedtls_ctr_drbg_context *ctx, int resistance)
-{
+void mbedtls_ctr_drbg_set_prediction_resistance(mbedtls_ctr_drbg_context *ctx, int resistance) {
     ctx->prediction_resistance = resistance;
 }
 
-void mbedtls_ctr_drbg_set_entropy_len(mbedtls_ctr_drbg_context *ctx, size_t len)
-{
+void mbedtls_ctr_drbg_set_entropy_len(mbedtls_ctr_drbg_context *ctx, size_t len) {
     ctx->entropy_len = len;
 }
 
-void mbedtls_ctr_drbg_set_reseed_interval(mbedtls_ctr_drbg_context *ctx, int interval)
-{
+void mbedtls_ctr_drbg_set_reseed_interval(mbedtls_ctr_drbg_context *ctx, int interval) {
     ctx->reseed_interval = interval;
 }
 
 static int block_cipher_df(unsigned char *output,
-                           const unsigned char *data, size_t data_len)
-{
+                           const unsigned char *data, size_t data_len) {
     unsigned char buf[MBEDTLS_CTR_DRBG_MAX_SEED_INPUT + MBEDTLS_CTR_DRBG_BLOCKSIZE + 16];
     unsigned char tmp[MBEDTLS_CTR_DRBG_SEEDLEN];
     unsigned char key[MBEDTLS_CTR_DRBG_KEYSIZE];
@@ -249,8 +241,7 @@ exit:
 }
 
 static int ctr_drbg_update_internal(mbedtls_ctr_drbg_context *ctx,
-                                    const unsigned char data[MBEDTLS_CTR_DRBG_SEEDLEN])
-{
+                                    const unsigned char data[MBEDTLS_CTR_DRBG_SEEDLEN]) {
     unsigned char tmp[MBEDTLS_CTR_DRBG_SEEDLEN];
     unsigned char *p = tmp;
     int i, j;
@@ -291,8 +282,7 @@ static int ctr_drbg_update_internal(mbedtls_ctr_drbg_context *ctx,
 }
 
 void mbedtls_ctr_drbg_update(mbedtls_ctr_drbg_context *ctx,
-                             const unsigned char *additional, size_t add_len)
-{
+                             const unsigned char *additional, size_t add_len) {
     unsigned char add_input[MBEDTLS_CTR_DRBG_SEEDLEN];
 
     if (add_len > 0) {
@@ -307,14 +297,13 @@ void mbedtls_ctr_drbg_update(mbedtls_ctr_drbg_context *ctx,
 }
 
 int mbedtls_ctr_drbg_reseed(mbedtls_ctr_drbg_context *ctx,
-                            const unsigned char *additional, size_t len)
-{
+                            const unsigned char *additional, size_t len) {
     unsigned char seed[MBEDTLS_CTR_DRBG_MAX_SEED_INPUT];
     size_t seedlen = 0;
     int ret;
 
     if (ctx->entropy_len > MBEDTLS_CTR_DRBG_MAX_SEED_INPUT ||
-        len > MBEDTLS_CTR_DRBG_MAX_SEED_INPUT - ctx->entropy_len)
+            len > MBEDTLS_CTR_DRBG_MAX_SEED_INPUT - ctx->entropy_len)
         return (MBEDTLS_ERR_CTR_DRBG_INPUT_TOO_BIG);
 
     memset(seed, 0, MBEDTLS_CTR_DRBG_MAX_SEED_INPUT);
@@ -357,8 +346,7 @@ int mbedtls_ctr_drbg_reseed(mbedtls_ctr_drbg_context *ctx,
 
 int mbedtls_ctr_drbg_random_with_add(void *p_rng,
                                      unsigned char *output, size_t output_len,
-                                     const unsigned char *additional, size_t add_len)
-{
+                                     const unsigned char *additional, size_t add_len) {
     int ret = 0;
     mbedtls_ctr_drbg_context *ctx = (mbedtls_ctr_drbg_context *) p_rng;
     unsigned char add_input[MBEDTLS_CTR_DRBG_SEEDLEN];
@@ -376,7 +364,7 @@ int mbedtls_ctr_drbg_random_with_add(void *p_rng,
     memset(add_input, 0, MBEDTLS_CTR_DRBG_SEEDLEN);
 
     if (ctx->reseed_counter > ctx->reseed_interval ||
-        ctx->prediction_resistance) {
+            ctx->prediction_resistance) {
         if ((ret = mbedtls_ctr_drbg_reseed(ctx, additional, add_len)) != 0) {
             return (ret);
         }
@@ -426,8 +414,7 @@ int mbedtls_ctr_drbg_random_with_add(void *p_rng,
     return (0);
 }
 
-int mbedtls_ctr_drbg_random(void *p_rng, unsigned char *output, size_t output_len)
-{
+int mbedtls_ctr_drbg_random(void *p_rng, unsigned char *output, size_t output_len) {
     int ret;
     mbedtls_ctr_drbg_context *ctx = (mbedtls_ctr_drbg_context *) p_rng;
 
@@ -447,8 +434,7 @@ int mbedtls_ctr_drbg_random(void *p_rng, unsigned char *output, size_t output_le
 }
 
 #if defined(MBEDTLS_FS_IO)
-int mbedtls_ctr_drbg_write_seed_file(mbedtls_ctr_drbg_context *ctx, const char *path)
-{
+int mbedtls_ctr_drbg_write_seed_file(mbedtls_ctr_drbg_context *ctx, const char *path) {
     int ret = MBEDTLS_ERR_CTR_DRBG_FILE_IO_ERROR;
     FILE *f;
     unsigned char buf[ MBEDTLS_CTR_DRBG_MAX_INPUT ];
@@ -471,8 +457,7 @@ exit:
     return (ret);
 }
 
-int mbedtls_ctr_drbg_update_seed_file(mbedtls_ctr_drbg_context *ctx, const char *path)
-{
+int mbedtls_ctr_drbg_update_seed_file(mbedtls_ctr_drbg_context *ctx, const char *path) {
     int ret = 0;
     FILE *f;
     size_t n;
@@ -556,8 +541,7 @@ static const unsigned char result_nopr[16] = {
 
 static size_t test_offset;
 static int ctr_drbg_self_test_entropy(void *data, unsigned char *buf,
-                                      size_t len)
-{
+                                      size_t len) {
     const unsigned char *p = data;
     memcpy(buf, p + test_offset, len);
     test_offset += len;
@@ -574,8 +558,7 @@ static int ctr_drbg_self_test_entropy(void *data, unsigned char *buf,
 /*
  * Checkup routine
  */
-int mbedtls_ctr_drbg_self_test(int verbose)
-{
+int mbedtls_ctr_drbg_self_test(int verbose) {
     mbedtls_ctr_drbg_context ctx;
     unsigned char buf[16];
 
diff --git a/common/mbedtls/des.c b/common/mbedtls/des.c
index 54e206310..d9ff262c0 100644
--- a/common/mbedtls/des.c
+++ b/common/mbedtls/des.c
@@ -294,26 +294,22 @@ static const uint32_t RHs[16] = {
 
 #define SWAP(a,b) { uint32_t t = a; a = b; b = t; t = 0; }
 
-void mbedtls_des_init(mbedtls_des_context *ctx)
-{
+void mbedtls_des_init(mbedtls_des_context *ctx) {
     memset(ctx, 0, sizeof(mbedtls_des_context));
 }
 
-void mbedtls_des_free(mbedtls_des_context *ctx)
-{
+void mbedtls_des_free(mbedtls_des_context *ctx) {
     if (ctx == NULL)
         return;
 
     mbedtls_platform_zeroize(ctx, sizeof(mbedtls_des_context));
 }
 
-void mbedtls_des3_init(mbedtls_des3_context *ctx)
-{
+void mbedtls_des3_init(mbedtls_des3_context *ctx) {
     memset(ctx, 0, sizeof(mbedtls_des3_context));
 }
 
-void mbedtls_des3_free(mbedtls_des3_context *ctx)
-{
+void mbedtls_des3_free(mbedtls_des3_context *ctx) {
     if (ctx == NULL)
         return;
 
@@ -332,8 +328,7 @@ static const unsigned char odd_parity_table[128] = { 1,  2,  4,  7,  8,
                                                      254
                                                    };
 
-void mbedtls_des_key_set_parity(unsigned char key[MBEDTLS_DES_KEY_SIZE])
-{
+void mbedtls_des_key_set_parity(unsigned char key[MBEDTLS_DES_KEY_SIZE]) {
     int i;
 
     for (i = 0; i < MBEDTLS_DES_KEY_SIZE; i++)
@@ -343,8 +338,7 @@ void mbedtls_des_key_set_parity(unsigned char key[MBEDTLS_DES_KEY_SIZE])
 /*
  * Check the given key's parity, returns 1 on failure, 0 on SUCCESS
  */
-int mbedtls_des_key_check_key_parity(const unsigned char key[MBEDTLS_DES_KEY_SIZE])
-{
+int mbedtls_des_key_check_key_parity(const unsigned char key[MBEDTLS_DES_KEY_SIZE]) {
     int i;
 
     for (i = 0; i < MBEDTLS_DES_KEY_SIZE; i++)
@@ -397,8 +391,7 @@ static const unsigned char weak_key_table[WEAK_KEY_COUNT][MBEDTLS_DES_KEY_SIZE]
     { 0xFE, 0xE0, 0xFE, 0xE0, 0xFE, 0xF1, 0xFE, 0xF1 }
 };
 
-int mbedtls_des_key_check_weak(const unsigned char key[MBEDTLS_DES_KEY_SIZE])
-{
+int mbedtls_des_key_check_weak(const unsigned char key[MBEDTLS_DES_KEY_SIZE]) {
     int i;
 
     for (i = 0; i < WEAK_KEY_COUNT; i++)
@@ -409,8 +402,7 @@ int mbedtls_des_key_check_weak(const unsigned char key[MBEDTLS_DES_KEY_SIZE])
 }
 
 #if !defined(MBEDTLS_DES_SETKEY_ALT)
-void mbedtls_des_setkey(uint32_t SK[32], const unsigned char key[MBEDTLS_DES_KEY_SIZE])
-{
+void mbedtls_des_setkey(uint32_t SK[32], const unsigned char key[MBEDTLS_DES_KEY_SIZE]) {
     int i;
     uint32_t X, Y, T;
 
@@ -482,8 +474,7 @@ void mbedtls_des_setkey(uint32_t SK[32], const unsigned char key[MBEDTLS_DES_KEY
 /*
  * DES key schedule (56-bit, encryption)
  */
-int mbedtls_des_setkey_enc(mbedtls_des_context *ctx, const unsigned char key[MBEDTLS_DES_KEY_SIZE])
-{
+int mbedtls_des_setkey_enc(mbedtls_des_context *ctx, const unsigned char key[MBEDTLS_DES_KEY_SIZE]) {
     mbedtls_des_setkey(ctx->sk, key);
 
     return (0);
@@ -492,8 +483,7 @@ int mbedtls_des_setkey_enc(mbedtls_des_context *ctx, const unsigned char key[MBE
 /*
  * DES key schedule (56-bit, decryption)
  */
-int mbedtls_des_setkey_dec(mbedtls_des_context *ctx, const unsigned char key[MBEDTLS_DES_KEY_SIZE])
-{
+int mbedtls_des_setkey_dec(mbedtls_des_context *ctx, const unsigned char key[MBEDTLS_DES_KEY_SIZE]) {
     int i;
 
     mbedtls_des_setkey(ctx->sk, key);
@@ -508,8 +498,7 @@ int mbedtls_des_setkey_dec(mbedtls_des_context *ctx, const unsigned char key[MBE
 
 static void des3_set2key(uint32_t esk[96],
                          uint32_t dsk[96],
-                         const unsigned char key[MBEDTLS_DES_KEY_SIZE * 2])
-{
+                         const unsigned char key[MBEDTLS_DES_KEY_SIZE * 2]) {
     int i;
 
     mbedtls_des_setkey(esk, key);
@@ -534,8 +523,7 @@ static void des3_set2key(uint32_t esk[96],
  * Triple-DES key schedule (112-bit, encryption)
  */
 int mbedtls_des3_set2key_enc(mbedtls_des3_context *ctx,
-                             const unsigned char key[MBEDTLS_DES_KEY_SIZE * 2])
-{
+                             const unsigned char key[MBEDTLS_DES_KEY_SIZE * 2]) {
     uint32_t sk[96];
 
     des3_set2key(ctx->sk, sk, key);
@@ -548,8 +536,7 @@ int mbedtls_des3_set2key_enc(mbedtls_des3_context *ctx,
  * Triple-DES key schedule (112-bit, decryption)
  */
 int mbedtls_des3_set2key_dec(mbedtls_des3_context *ctx,
-                             const unsigned char key[MBEDTLS_DES_KEY_SIZE * 2])
-{
+                             const unsigned char key[MBEDTLS_DES_KEY_SIZE * 2]) {
     uint32_t sk[96];
 
     des3_set2key(sk, ctx->sk, key);
@@ -560,8 +547,7 @@ int mbedtls_des3_set2key_dec(mbedtls_des3_context *ctx,
 
 static void des3_set3key(uint32_t esk[96],
                          uint32_t dsk[96],
-                         const unsigned char key[24])
-{
+                         const unsigned char key[24]) {
     int i;
 
     mbedtls_des_setkey(esk, key);
@@ -584,8 +570,7 @@ static void des3_set3key(uint32_t esk[96],
  * Triple-DES key schedule (168-bit, encryption)
  */
 int mbedtls_des3_set3key_enc(mbedtls_des3_context *ctx,
-                             const unsigned char key[MBEDTLS_DES_KEY_SIZE * 3])
-{
+                             const unsigned char key[MBEDTLS_DES_KEY_SIZE * 3]) {
     uint32_t sk[96];
 
     des3_set3key(ctx->sk, sk, key);
@@ -598,8 +583,7 @@ int mbedtls_des3_set3key_enc(mbedtls_des3_context *ctx,
  * Triple-DES key schedule (168-bit, decryption)
  */
 int mbedtls_des3_set3key_dec(mbedtls_des3_context *ctx,
-                             const unsigned char key[MBEDTLS_DES_KEY_SIZE * 3])
-{
+                             const unsigned char key[MBEDTLS_DES_KEY_SIZE * 3]) {
     uint32_t sk[96];
 
     des3_set3key(sk, ctx->sk, key);
@@ -614,8 +598,7 @@ int mbedtls_des3_set3key_dec(mbedtls_des3_context *ctx,
 #if !defined(MBEDTLS_DES_CRYPT_ECB_ALT)
 int mbedtls_des_crypt_ecb(mbedtls_des_context *ctx,
                           const unsigned char input[8],
-                          unsigned char output[8])
-{
+                          unsigned char output[8]) {
     int i;
     uint32_t X, Y, T, *SK;
 
@@ -649,8 +632,7 @@ int mbedtls_des_crypt_cbc(mbedtls_des_context *ctx,
                           size_t length,
                           unsigned char iv[8],
                           const unsigned char *input,
-                          unsigned char *output)
-{
+                          unsigned char *output) {
     int i;
     unsigned char temp[8];
 
@@ -695,8 +677,7 @@ int mbedtls_des_crypt_cbc(mbedtls_des_context *ctx,
 #if !defined(MBEDTLS_DES3_CRYPT_ECB_ALT)
 int mbedtls_des3_crypt_ecb(mbedtls_des3_context *ctx,
                            const unsigned char input[8],
-                           unsigned char output[8])
-{
+                           unsigned char output[8]) {
     int i;
     uint32_t X, Y, T, *SK;
 
@@ -740,8 +721,7 @@ int mbedtls_des3_crypt_cbc(mbedtls_des3_context *ctx,
                            size_t length,
                            unsigned char iv[8],
                            const unsigned char *input,
-                           unsigned char *output)
-{
+                           unsigned char *output) {
     int i;
     unsigned char temp[8];
 
@@ -831,8 +811,7 @@ static const unsigned char des3_test_cbc_enc[3][8] = {
 /*
  * Checkup routine
  */
-int mbedtls_des_self_test(int verbose)
-{
+int mbedtls_des_self_test(int verbose) {
     int i, j, u, v, ret = 0;
     mbedtls_des_context ctx;
     mbedtls_des3_context ctx3;
@@ -895,9 +874,9 @@ int mbedtls_des_self_test(int verbose)
         }
 
         if ((v == MBEDTLS_DES_DECRYPT &&
-             memcmp(buf, des3_test_ecb_dec[u], 8) != 0) ||
-            (v != MBEDTLS_DES_DECRYPT &&
-             memcmp(buf, des3_test_ecb_enc[u], 8) != 0)) {
+                memcmp(buf, des3_test_ecb_dec[u], 8) != 0) ||
+                (v != MBEDTLS_DES_DECRYPT &&
+                 memcmp(buf, des3_test_ecb_enc[u], 8) != 0)) {
             if (verbose != 0)
                 mbedtls_printf("failed\n");
 
@@ -983,9 +962,9 @@ int mbedtls_des_self_test(int verbose)
         }
 
         if ((v == MBEDTLS_DES_DECRYPT &&
-             memcmp(buf, des3_test_cbc_dec[u], 8) != 0) ||
-            (v != MBEDTLS_DES_DECRYPT &&
-             memcmp(buf, des3_test_cbc_enc[u], 8) != 0)) {
+                memcmp(buf, des3_test_cbc_dec[u], 8) != 0) ||
+                (v != MBEDTLS_DES_DECRYPT &&
+                 memcmp(buf, des3_test_cbc_enc[u], 8) != 0)) {
             if (verbose != 0)
                 mbedtls_printf("failed\n");
 
diff --git a/common/mbedtls/ecdsa.c b/common/mbedtls/ecdsa.c
index 0dce37964..2fac6d875 100644
--- a/common/mbedtls/ecdsa.c
+++ b/common/mbedtls/ecdsa.c
@@ -49,8 +49,7 @@
  * SEC1 4.1.3 step 5 aka SEC1 4.1.4 step 3
  */
 static int derive_mpi(const mbedtls_ecp_group *grp, mbedtls_mpi *x,
-                      const unsigned char *buf, size_t blen)
-{
+                      const unsigned char *buf, size_t blen) {
     int ret;
     size_t n_size = (grp->nbits + 7) / 8;
     size_t use_size = blen > n_size ? n_size : blen;
@@ -74,8 +73,7 @@ cleanup:
  */
 int mbedtls_ecdsa_sign(mbedtls_ecp_group *grp, mbedtls_mpi *r, mbedtls_mpi *s,
                        const mbedtls_mpi *d, const unsigned char *buf, size_t blen,
-                       int (*f_rng)(void *, unsigned char *, size_t), void *p_rng)
-{
+                       int (*f_rng)(void *, unsigned char *, size_t), void *p_rng) {
     int ret, key_tries, sign_tries, blind_tries;
     mbedtls_ecp_point R;
     mbedtls_mpi k, e, t;
@@ -164,8 +162,7 @@ cleanup:
  */
 int mbedtls_ecdsa_sign_det(mbedtls_ecp_group *grp, mbedtls_mpi *r, mbedtls_mpi *s,
                            const mbedtls_mpi *d, const unsigned char *buf, size_t blen,
-                           mbedtls_md_type_t md_alg)
-{
+                           mbedtls_md_type_t md_alg) {
     int ret;
     mbedtls_hmac_drbg_context rng_ctx;
     unsigned char data[2 * MBEDTLS_ECP_MAX_BYTES];
@@ -203,8 +200,7 @@ cleanup:
  */
 int mbedtls_ecdsa_verify(mbedtls_ecp_group *grp,
                          const unsigned char *buf, size_t blen,
-                         const mbedtls_ecp_point *Q, const mbedtls_mpi *r, const mbedtls_mpi *s)
-{
+                         const mbedtls_ecp_point *Q, const mbedtls_mpi *r, const mbedtls_mpi *s) {
     int ret;
     mbedtls_mpi e, s_inv, u1, u2;
     mbedtls_ecp_point R;
@@ -223,7 +219,7 @@ int mbedtls_ecdsa_verify(mbedtls_ecp_group *grp,
      * Step 1: make sure r and s are in range 1..n-1
      */
     if (mbedtls_mpi_cmp_int(r, 1) < 0 || mbedtls_mpi_cmp_mpi(r, &grp->N) >= 0 ||
-        mbedtls_mpi_cmp_int(s, 1) < 0 || mbedtls_mpi_cmp_mpi(s, &grp->N) >= 0) {
+            mbedtls_mpi_cmp_int(s, 1) < 0 || mbedtls_mpi_cmp_mpi(s, &grp->N) >= 0) {
         ret = MBEDTLS_ERR_ECP_VERIFY_FAILED;
         goto cleanup;
     }
@@ -291,8 +287,7 @@ cleanup:
  * Convert a signature (given by context) to ASN.1
  */
 static int ecdsa_signature_to_asn1(const mbedtls_mpi *r, const mbedtls_mpi *s,
-                                   unsigned char *sig, size_t *slen)
-{
+                                   unsigned char *sig, size_t *slen) {
     int ret;
     unsigned char buf[MBEDTLS_ECDSA_MAX_LEN];
     unsigned char *p = buf + sizeof(buf);
@@ -318,8 +313,7 @@ int mbedtls_ecdsa_write_signature(mbedtls_ecdsa_context *ctx, mbedtls_md_type_t
                                   const unsigned char *hash, size_t hlen,
                                   unsigned char *sig, size_t *slen,
                                   int (*f_rng)(void *, unsigned char *, size_t),
-                                  void *p_rng)
-{
+                                  void *p_rng) {
     int ret;
     mbedtls_mpi r, s;
 
@@ -353,8 +347,7 @@ cleanup:
 int mbedtls_ecdsa_write_signature_det(mbedtls_ecdsa_context *ctx,
                                       const unsigned char *hash, size_t hlen,
                                       unsigned char *sig, size_t *slen,
-                                      mbedtls_md_type_t md_alg)
-{
+                                      mbedtls_md_type_t md_alg) {
     return (mbedtls_ecdsa_write_signature(ctx, md_alg, hash, hlen, sig, slen,
                                           NULL, NULL));
 }
@@ -365,8 +358,7 @@ int mbedtls_ecdsa_write_signature_det(mbedtls_ecdsa_context *ctx,
  */
 int mbedtls_ecdsa_read_signature(mbedtls_ecdsa_context *ctx,
                                  const unsigned char *hash, size_t hlen,
-                                 const unsigned char *sig, size_t slen)
-{
+                                 const unsigned char *sig, size_t slen) {
     int ret;
     unsigned char *p = (unsigned char *) sig;
     const unsigned char *end = sig + slen;
@@ -389,7 +381,7 @@ int mbedtls_ecdsa_read_signature(mbedtls_ecdsa_context *ctx,
     }
 
     if ((ret = mbedtls_asn1_get_mpi(&p, end, &r)) != 0 ||
-        (ret = mbedtls_asn1_get_mpi(&p, end, &s)) != 0) {
+            (ret = mbedtls_asn1_get_mpi(&p, end, &s)) != 0) {
         ret += MBEDTLS_ERR_ECP_BAD_INPUT_DATA;
         goto cleanup;
     }
@@ -416,8 +408,7 @@ cleanup:
  * Generate key pair
  */
 int mbedtls_ecdsa_genkey(mbedtls_ecdsa_context *ctx, mbedtls_ecp_group_id gid,
-                         int (*f_rng)(void *, unsigned char *, size_t), void *p_rng)
-{
+                         int (*f_rng)(void *, unsigned char *, size_t), void *p_rng) {
     return (mbedtls_ecp_group_load(&ctx->grp, gid) ||
             mbedtls_ecp_gen_keypair(&ctx->grp, &ctx->d, &ctx->Q, f_rng, p_rng));
 }
@@ -426,13 +417,12 @@ int mbedtls_ecdsa_genkey(mbedtls_ecdsa_context *ctx, mbedtls_ecp_group_id gid,
 /*
  * Set context from an mbedtls_ecp_keypair
  */
-int mbedtls_ecdsa_from_keypair(mbedtls_ecdsa_context *ctx, const mbedtls_ecp_keypair *key)
-{
+int mbedtls_ecdsa_from_keypair(mbedtls_ecdsa_context *ctx, const mbedtls_ecp_keypair *key) {
     int ret;
 
     if ((ret = mbedtls_ecp_group_copy(&ctx->grp, &key->grp)) != 0 ||
-        (ret = mbedtls_mpi_copy(&ctx->d, &key->d)) != 0 ||
-        (ret = mbedtls_ecp_copy(&ctx->Q, &key->Q)) != 0) {
+            (ret = mbedtls_mpi_copy(&ctx->d, &key->d)) != 0 ||
+            (ret = mbedtls_ecp_copy(&ctx->Q, &key->Q)) != 0) {
         mbedtls_ecdsa_free(ctx);
     }
 
@@ -442,16 +432,14 @@ int mbedtls_ecdsa_from_keypair(mbedtls_ecdsa_context *ctx, const mbedtls_ecp_key
 /*
  * Initialize context
  */
-void mbedtls_ecdsa_init(mbedtls_ecdsa_context *ctx)
-{
+void mbedtls_ecdsa_init(mbedtls_ecdsa_context *ctx) {
     mbedtls_ecp_keypair_init(ctx);
 }
 
 /*
  * Free context
  */
-void mbedtls_ecdsa_free(mbedtls_ecdsa_context *ctx)
-{
+void mbedtls_ecdsa_free(mbedtls_ecdsa_context *ctx) {
     mbedtls_ecp_keypair_free(ctx);
 }
 
diff --git a/common/mbedtls/ecp.c b/common/mbedtls/ecp.c
index cbb741095..896801dd7 100644
--- a/common/mbedtls/ecp.c
+++ b/common/mbedtls/ecp.c
@@ -169,16 +169,14 @@ static mbedtls_ecp_group_id ecp_supported_grp_id[ECP_NB_CURVES];
 /*
  * List of supported curves and associated info
  */
-const mbedtls_ecp_curve_info *mbedtls_ecp_curve_list(void)
-{
+const mbedtls_ecp_curve_info *mbedtls_ecp_curve_list(void) {
     return (ecp_supported_curves);
 }
 
 /*
  * List of supported curves, group ID only
  */
-const mbedtls_ecp_group_id *mbedtls_ecp_grp_id_list(void)
-{
+const mbedtls_ecp_group_id *mbedtls_ecp_grp_id_list(void) {
     static int init_done = 0;
 
     if (! init_done) {
@@ -186,8 +184,8 @@ const mbedtls_ecp_group_id *mbedtls_ecp_grp_id_list(void)
         const mbedtls_ecp_curve_info *curve_info;
 
         for (curve_info = mbedtls_ecp_curve_list();
-             curve_info->grp_id != MBEDTLS_ECP_DP_NONE;
-             curve_info++) {
+                curve_info->grp_id != MBEDTLS_ECP_DP_NONE;
+                curve_info++) {
             ecp_supported_grp_id[i++] = curve_info->grp_id;
         }
         ecp_supported_grp_id[i] = MBEDTLS_ECP_DP_NONE;
@@ -201,13 +199,12 @@ const mbedtls_ecp_group_id *mbedtls_ecp_grp_id_list(void)
 /*
  * Get the curve info for the internal identifier
  */
-const mbedtls_ecp_curve_info *mbedtls_ecp_curve_info_from_grp_id(mbedtls_ecp_group_id grp_id)
-{
+const mbedtls_ecp_curve_info *mbedtls_ecp_curve_info_from_grp_id(mbedtls_ecp_group_id grp_id) {
     const mbedtls_ecp_curve_info *curve_info;
 
     for (curve_info = mbedtls_ecp_curve_list();
-         curve_info->grp_id != MBEDTLS_ECP_DP_NONE;
-         curve_info++) {
+            curve_info->grp_id != MBEDTLS_ECP_DP_NONE;
+            curve_info++) {
         if (curve_info->grp_id == grp_id)
             return (curve_info);
     }
@@ -218,13 +215,12 @@ const mbedtls_ecp_curve_info *mbedtls_ecp_curve_info_from_grp_id(mbedtls_ecp_gro
 /*
  * Get the curve info from the TLS identifier
  */
-const mbedtls_ecp_curve_info *mbedtls_ecp_curve_info_from_tls_id(uint16_t tls_id)
-{
+const mbedtls_ecp_curve_info *mbedtls_ecp_curve_info_from_tls_id(uint16_t tls_id) {
     const mbedtls_ecp_curve_info *curve_info;
 
     for (curve_info = mbedtls_ecp_curve_list();
-         curve_info->grp_id != MBEDTLS_ECP_DP_NONE;
-         curve_info++) {
+            curve_info->grp_id != MBEDTLS_ECP_DP_NONE;
+            curve_info++) {
         if (curve_info->tls_id == tls_id)
             return (curve_info);
     }
@@ -235,13 +231,12 @@ const mbedtls_ecp_curve_info *mbedtls_ecp_curve_info_from_tls_id(uint16_t tls_id
 /*
  * Get the curve info from the name
  */
-const mbedtls_ecp_curve_info *mbedtls_ecp_curve_info_from_name(const char *name)
-{
+const mbedtls_ecp_curve_info *mbedtls_ecp_curve_info_from_name(const char *name) {
     const mbedtls_ecp_curve_info *curve_info;
 
     for (curve_info = mbedtls_ecp_curve_list();
-         curve_info->grp_id != MBEDTLS_ECP_DP_NONE;
-         curve_info++) {
+            curve_info->grp_id != MBEDTLS_ECP_DP_NONE;
+            curve_info++) {
         if (strcmp(curve_info->name, name) == 0)
             return (curve_info);
     }
@@ -252,8 +247,7 @@ const mbedtls_ecp_curve_info *mbedtls_ecp_curve_info_from_name(const char *name)
 /*
  * Get the type of a curve
  */
-static inline ecp_curve_type ecp_get_type(const mbedtls_ecp_group *grp)
-{
+static inline ecp_curve_type ecp_get_type(const mbedtls_ecp_group *grp) {
     if (grp->G.X.p == NULL)
         return (ECP_TYPE_NONE);
 
@@ -266,8 +260,7 @@ static inline ecp_curve_type ecp_get_type(const mbedtls_ecp_group *grp)
 /*
  * Initialize (the components of) a point
  */
-void mbedtls_ecp_point_init(mbedtls_ecp_point *pt)
-{
+void mbedtls_ecp_point_init(mbedtls_ecp_point *pt) {
     if (pt == NULL)
         return;
 
@@ -279,8 +272,7 @@ void mbedtls_ecp_point_init(mbedtls_ecp_point *pt)
 /*
  * Initialize (the components of) a group
  */
-void mbedtls_ecp_group_init(mbedtls_ecp_group *grp)
-{
+void mbedtls_ecp_group_init(mbedtls_ecp_group *grp) {
     if (grp == NULL)
         return;
 
@@ -290,8 +282,7 @@ void mbedtls_ecp_group_init(mbedtls_ecp_group *grp)
 /*
  * Initialize (the components of) a key pair
  */
-void mbedtls_ecp_keypair_init(mbedtls_ecp_keypair *key)
-{
+void mbedtls_ecp_keypair_init(mbedtls_ecp_keypair *key) {
     if (key == NULL)
         return;
 
@@ -303,8 +294,7 @@ void mbedtls_ecp_keypair_init(mbedtls_ecp_keypair *key)
 /*
  * Unallocate (the components of) a point
  */
-void mbedtls_ecp_point_free(mbedtls_ecp_point *pt)
-{
+void mbedtls_ecp_point_free(mbedtls_ecp_point *pt) {
     if (pt == NULL)
         return;
 
@@ -316,8 +306,7 @@ void mbedtls_ecp_point_free(mbedtls_ecp_point *pt)
 /*
  * Unallocate (the components of) a group
  */
-void mbedtls_ecp_group_free(mbedtls_ecp_group *grp)
-{
+void mbedtls_ecp_group_free(mbedtls_ecp_group *grp) {
     size_t i;
 
     if (grp == NULL)
@@ -343,8 +332,7 @@ void mbedtls_ecp_group_free(mbedtls_ecp_group *grp)
 /*
  * Unallocate (the components of) a key pair
  */
-void mbedtls_ecp_keypair_free(mbedtls_ecp_keypair *key)
-{
+void mbedtls_ecp_keypair_free(mbedtls_ecp_keypair *key) {
     if (key == NULL)
         return;
 
@@ -356,8 +344,7 @@ void mbedtls_ecp_keypair_free(mbedtls_ecp_keypair *key)
 /*
  * Copy the contents of a point
  */
-int mbedtls_ecp_copy(mbedtls_ecp_point *P, const mbedtls_ecp_point *Q)
-{
+int mbedtls_ecp_copy(mbedtls_ecp_point *P, const mbedtls_ecp_point *Q) {
     int ret;
 
     MBEDTLS_MPI_CHK(mbedtls_mpi_copy(&P->X, &Q->X));
@@ -371,16 +358,14 @@ cleanup:
 /*
  * Copy the contents of a group object
  */
-int mbedtls_ecp_group_copy(mbedtls_ecp_group *dst, const mbedtls_ecp_group *src)
-{
+int mbedtls_ecp_group_copy(mbedtls_ecp_group *dst, const mbedtls_ecp_group *src) {
     return mbedtls_ecp_group_load(dst, src->id);
 }
 
 /*
  * Set point to zero
  */
-int mbedtls_ecp_set_zero(mbedtls_ecp_point *pt)
-{
+int mbedtls_ecp_set_zero(mbedtls_ecp_point *pt) {
     int ret;
 
     MBEDTLS_MPI_CHK(mbedtls_mpi_lset(&pt->X, 1));
@@ -394,8 +379,7 @@ cleanup:
 /*
  * Tell if a point is zero
  */
-int mbedtls_ecp_is_zero(mbedtls_ecp_point *pt)
-{
+int mbedtls_ecp_is_zero(mbedtls_ecp_point *pt) {
     return (mbedtls_mpi_cmp_int(&pt->Z, 0) == 0);
 }
 
@@ -403,11 +387,10 @@ int mbedtls_ecp_is_zero(mbedtls_ecp_point *pt)
  * Compare two points lazyly
  */
 int mbedtls_ecp_point_cmp(const mbedtls_ecp_point *P,
-                          const mbedtls_ecp_point *Q)
-{
+                          const mbedtls_ecp_point *Q) {
     if (mbedtls_mpi_cmp_mpi(&P->X, &Q->X) == 0 &&
-        mbedtls_mpi_cmp_mpi(&P->Y, &Q->Y) == 0 &&
-        mbedtls_mpi_cmp_mpi(&P->Z, &Q->Z) == 0) {
+            mbedtls_mpi_cmp_mpi(&P->Y, &Q->Y) == 0 &&
+            mbedtls_mpi_cmp_mpi(&P->Z, &Q->Z) == 0) {
         return (0);
     }
 
@@ -418,8 +401,7 @@ int mbedtls_ecp_point_cmp(const mbedtls_ecp_point *P,
  * Import a non-zero point from ASCII strings
  */
 int mbedtls_ecp_point_read_string(mbedtls_ecp_point *P, int radix,
-                                  const char *x, const char *y)
-{
+                                  const char *x, const char *y) {
     int ret;
 
     MBEDTLS_MPI_CHK(mbedtls_mpi_read_string(&P->X, radix, x));
@@ -435,13 +417,12 @@ cleanup:
  */
 int mbedtls_ecp_point_write_binary(const mbedtls_ecp_group *grp, const mbedtls_ecp_point *P,
                                    int format, size_t *olen,
-                                   unsigned char *buf, size_t buflen)
-{
+                                   unsigned char *buf, size_t buflen) {
     int ret = 0;
     size_t plen;
 
     if (format != MBEDTLS_ECP_PF_UNCOMPRESSED &&
-        format != MBEDTLS_ECP_PF_COMPRESSED)
+            format != MBEDTLS_ECP_PF_COMPRESSED)
         return (MBEDTLS_ERR_ECP_BAD_INPUT_DATA);
 
     /*
@@ -486,8 +467,7 @@ cleanup:
  * Import a point from unsigned binary data (SEC1 2.3.4)
  */
 int mbedtls_ecp_point_read_binary(const mbedtls_ecp_group *grp, mbedtls_ecp_point *pt,
-                                  const unsigned char *buf, size_t ilen)
-{
+                                  const unsigned char *buf, size_t ilen) {
     int ret;
     size_t plen;
 
@@ -524,8 +504,7 @@ cleanup:
  *      } ECPoint;
  */
 int mbedtls_ecp_tls_read_point(const mbedtls_ecp_group *grp, mbedtls_ecp_point *pt,
-                               const unsigned char **buf, size_t buf_len)
-{
+                               const unsigned char **buf, size_t buf_len) {
     unsigned char data_len;
     const unsigned char *buf_start;
 
@@ -556,8 +535,7 @@ int mbedtls_ecp_tls_read_point(const mbedtls_ecp_group *grp, mbedtls_ecp_point *
  */
 int mbedtls_ecp_tls_write_point(const mbedtls_ecp_group *grp, const mbedtls_ecp_point *pt,
                                 int format, size_t *olen,
-                                unsigned char *buf, size_t blen)
-{
+                                unsigned char *buf, size_t blen) {
     int ret;
 
     /*
@@ -582,8 +560,7 @@ int mbedtls_ecp_tls_write_point(const mbedtls_ecp_group *grp, const mbedtls_ecp_
 /*
  * Set a group from an ECParameters record (RFC 4492)
  */
-int mbedtls_ecp_tls_read_group(mbedtls_ecp_group *grp, const unsigned char **buf, size_t len)
-{
+int mbedtls_ecp_tls_read_group(mbedtls_ecp_group *grp, const unsigned char **buf, size_t len) {
     uint16_t tls_id;
     const mbedtls_ecp_curve_info *curve_info;
 
@@ -616,8 +593,7 @@ int mbedtls_ecp_tls_read_group(mbedtls_ecp_group *grp, const unsigned char **buf
  * Write the ECParameters record corresponding to a group (RFC 4492)
  */
 int mbedtls_ecp_tls_write_group(const mbedtls_ecp_group *grp, size_t *olen,
-                                unsigned char *buf, size_t blen)
-{
+                                unsigned char *buf, size_t blen) {
     const mbedtls_ecp_curve_info *curve_info;
 
     if ((curve_info = mbedtls_ecp_curve_info_from_grp_id(grp->id)) == NULL)
@@ -650,8 +626,7 @@ int mbedtls_ecp_tls_write_group(const mbedtls_ecp_group *grp, size_t *olen,
  *
  * This function is in the critial loop for mbedtls_ecp_mul, so pay attention to perf.
  */
-static int ecp_modp(mbedtls_mpi *N, const mbedtls_ecp_group *grp)
-{
+static int ecp_modp(mbedtls_mpi *N, const mbedtls_ecp_group *grp) {
     int ret;
 
     if (grp->modp == NULL)
@@ -659,7 +634,7 @@ static int ecp_modp(mbedtls_mpi *N, const mbedtls_ecp_group *grp)
 
     /* N->s < 0 is a much faster test, which fails only if N is 0 */
     if ((N->s < 0 && mbedtls_mpi_cmp_int(N, 0) != 0) ||
-        mbedtls_mpi_bitlen(N) > 2 * grp->pbits) {
+            mbedtls_mpi_bitlen(N) > 2 * grp->pbits) {
         return (MBEDTLS_ERR_ECP_BAD_INPUT_DATA);
     }
 
@@ -729,8 +704,7 @@ cleanup:
  * Normalize jacobian coordinates so that Z == 0 || Z == 1  (GECC 3.2.1)
  * Cost: 1N := 1I + 3M + 1S
  */
-static int ecp_normalize_jac(const mbedtls_ecp_group *grp, mbedtls_ecp_point *pt)
-{
+static int ecp_normalize_jac(const mbedtls_ecp_group *grp, mbedtls_ecp_point *pt) {
     int ret;
     mbedtls_mpi Zi, ZZi;
 
@@ -787,8 +761,7 @@ cleanup:
  * Cost: 1N(t) := 1I + (6t - 3)M + 1S
  */
 static int ecp_normalize_jac_many(const mbedtls_ecp_group *grp,
-                                  mbedtls_ecp_point *T[], size_t t_len)
-{
+                                  mbedtls_ecp_point *T[], size_t t_len) {
     int ret;
     size_t i;
     mbedtls_mpi *c, u, Zi, ZZi;
@@ -881,8 +854,7 @@ cleanup:
  */
 static int ecp_safe_invert_jac(const mbedtls_ecp_group *grp,
                                mbedtls_ecp_point *Q,
-                               unsigned char inv)
-{
+                               unsigned char inv) {
     int ret;
     unsigned char nonzero;
     mbedtls_mpi mQY;
@@ -915,8 +887,7 @@ cleanup:
  *             3M + 6S + 1a     otherwise
  */
 static int ecp_double_jac(const mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
-                          const mbedtls_ecp_point *P)
-{
+                          const mbedtls_ecp_point *P) {
     int ret;
     mbedtls_mpi M, S, T, U;
 
@@ -1039,8 +1010,7 @@ cleanup:
  * Cost: 1A := 8M + 3S
  */
 static int ecp_add_mixed(const mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
-                         const mbedtls_ecp_point *P, const mbedtls_ecp_point *Q)
-{
+                         const mbedtls_ecp_point *P, const mbedtls_ecp_point *Q) {
     int ret;
     mbedtls_mpi T1, T2, T3, T4, X, Y, Z;
 
@@ -1151,8 +1121,7 @@ cleanup:
  * This countermeasure was first suggested in [2].
  */
 static int ecp_randomize_jac(const mbedtls_ecp_group *grp, mbedtls_ecp_point *pt,
-                             int (*f_rng)(void *, unsigned char *, size_t), void *p_rng)
-{
+                             int (*f_rng)(void *, unsigned char *, size_t), void *p_rng) {
     int ret;
     mbedtls_mpi l, ll;
     size_t p_size;
@@ -1236,8 +1205,7 @@ cleanup:
  *   (the result will be incorrect if these assumptions are not satisfied)
  */
 static void ecp_comb_fixed(unsigned char x[], size_t d,
-                           unsigned char w, const mbedtls_mpi *m)
-{
+                           unsigned char w, const mbedtls_mpi *m) {
     size_t i, j;
     unsigned char c, cc, adjust;
 
@@ -1276,8 +1244,7 @@ static void ecp_comb_fixed(unsigned char x[], size_t d,
  */
 static int ecp_precompute_comb(const mbedtls_ecp_group *grp,
                                mbedtls_ecp_point T[], const mbedtls_ecp_point *P,
-                               unsigned char w, size_t d)
-{
+                               unsigned char w, size_t d) {
     int ret;
     unsigned char i, k;
     size_t j;
@@ -1326,8 +1293,7 @@ cleanup:
  */
 static int ecp_select_comb(const mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
                            const mbedtls_ecp_point T[], unsigned char t_len,
-                           unsigned char i)
-{
+                           unsigned char i) {
     int ret;
     unsigned char ii, j;
 
@@ -1357,8 +1323,7 @@ static int ecp_mul_comb_core(const mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
                              const mbedtls_ecp_point T[], unsigned char t_len,
                              const unsigned char x[], size_t d,
                              int (*f_rng)(void *, unsigned char *, size_t),
-                             void *p_rng)
-{
+                             void *p_rng) {
     int ret;
     mbedtls_ecp_point Txi;
     size_t i;
@@ -1392,8 +1357,7 @@ cleanup:
 static int ecp_mul_comb(mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
                         const mbedtls_mpi *m, const mbedtls_ecp_point *P,
                         int (*f_rng)(void *, unsigned char *, size_t),
-                        void *p_rng)
-{
+                        void *p_rng) {
     int ret;
     unsigned char w, m_is_odd, p_eq_g, pre_len, i;
     size_t d;
@@ -1521,8 +1485,7 @@ cleanup:
  * Normalize Montgomery x/z coordinates: X = X/Z, Z = 1
  * Cost: 1M + 1I
  */
-static int ecp_normalize_mxz(const mbedtls_ecp_group *grp, mbedtls_ecp_point *P)
-{
+static int ecp_normalize_mxz(const mbedtls_ecp_group *grp, mbedtls_ecp_point *P) {
     int ret;
 
 #if defined(MBEDTLS_ECP_NORMALIZE_MXZ_ALT)
@@ -1549,8 +1512,7 @@ cleanup:
  * Cost: 2M
  */
 static int ecp_randomize_mxz(const mbedtls_ecp_group *grp, mbedtls_ecp_point *P,
-                             int (*f_rng)(void *, unsigned char *, size_t), void *p_rng)
-{
+                             int (*f_rng)(void *, unsigned char *, size_t), void *p_rng) {
     int ret;
     mbedtls_mpi l;
     size_t p_size;
@@ -1605,8 +1567,7 @@ cleanup:
 static int ecp_double_add_mxz(const mbedtls_ecp_group *grp,
                               mbedtls_ecp_point *R, mbedtls_ecp_point *S,
                               const mbedtls_ecp_point *P, const mbedtls_ecp_point *Q,
-                              const mbedtls_mpi *d)
-{
+                              const mbedtls_mpi *d) {
     int ret;
     mbedtls_mpi A, AA, B, BB, E, C, D, DA, CB;
 
@@ -1684,8 +1645,7 @@ cleanup:
 static int ecp_mul_mxz(mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
                        const mbedtls_mpi *m, const mbedtls_ecp_point *P,
                        int (*f_rng)(void *, unsigned char *, size_t),
-                       void *p_rng)
-{
+                       void *p_rng) {
     int ret;
     size_t i;
     unsigned char b;
@@ -1745,8 +1705,7 @@ cleanup:
  */
 int mbedtls_ecp_mul(mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
                     const mbedtls_mpi *m, const mbedtls_ecp_point *P,
-                    int (*f_rng)(void *, unsigned char *, size_t), void *p_rng)
-{
+                    int (*f_rng)(void *, unsigned char *, size_t), void *p_rng) {
     int ret = MBEDTLS_ERR_ECP_BAD_INPUT_DATA;
 #if defined(MBEDTLS_ECP_INTERNAL_ALT)
     char is_grp_capable = 0;
@@ -1757,7 +1716,7 @@ int mbedtls_ecp_mul(mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
         return (MBEDTLS_ERR_ECP_BAD_INPUT_DATA);
 
     if ((ret = mbedtls_ecp_check_privkey(grp, m)) != 0 ||
-        (ret = mbedtls_ecp_check_pubkey(grp, P)) != 0)
+            (ret = mbedtls_ecp_check_pubkey(grp, P)) != 0)
         return (ret);
 
 #if defined(MBEDTLS_ECP_INTERNAL_ALT)
@@ -1792,16 +1751,15 @@ cleanup:
  * Check that an affine point is valid as a public key,
  * short weierstrass curves (SEC1 3.2.3.1)
  */
-static int ecp_check_pubkey_sw(const mbedtls_ecp_group *grp, const mbedtls_ecp_point *pt)
-{
+static int ecp_check_pubkey_sw(const mbedtls_ecp_group *grp, const mbedtls_ecp_point *pt) {
     int ret;
     mbedtls_mpi YY, RHS;
 
     /* pt coordinates must be normalized for our checks */
     if (mbedtls_mpi_cmp_int(&pt->X, 0) < 0 ||
-        mbedtls_mpi_cmp_int(&pt->Y, 0) < 0 ||
-        mbedtls_mpi_cmp_mpi(&pt->X, &grp->P) >= 0 ||
-        mbedtls_mpi_cmp_mpi(&pt->Y, &grp->P) >= 0)
+            mbedtls_mpi_cmp_int(&pt->Y, 0) < 0 ||
+            mbedtls_mpi_cmp_mpi(&pt->X, &grp->P) >= 0 ||
+            mbedtls_mpi_cmp_mpi(&pt->Y, &grp->P) >= 0)
         return (MBEDTLS_ERR_ECP_INVALID_KEY);
 
     mbedtls_mpi_init(&YY);
@@ -1849,8 +1807,7 @@ cleanup:
 static int mbedtls_ecp_mul_shortcuts(mbedtls_ecp_group *grp,
                                      mbedtls_ecp_point *R,
                                      const mbedtls_mpi *m,
-                                     const mbedtls_ecp_point *P)
-{
+                                     const mbedtls_ecp_point *P) {
     int ret;
 
     if (mbedtls_mpi_cmp_int(m, 1) == 0) {
@@ -1873,8 +1830,7 @@ cleanup:
  */
 int mbedtls_ecp_muladd(mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
                        const mbedtls_mpi *m, const mbedtls_ecp_point *P,
-                       const mbedtls_mpi *n, const mbedtls_ecp_point *Q)
-{
+                       const mbedtls_mpi *n, const mbedtls_ecp_point *Q) {
     int ret;
     mbedtls_ecp_point mP;
 #if defined(MBEDTLS_ECP_INTERNAL_ALT)
@@ -1916,8 +1872,7 @@ cleanup:
 /*
  * Check validity of a public key for Montgomery curves with x-only schemes
  */
-static int ecp_check_pubkey_mx(const mbedtls_ecp_group *grp, const mbedtls_ecp_point *pt)
-{
+static int ecp_check_pubkey_mx(const mbedtls_ecp_group *grp, const mbedtls_ecp_point *pt) {
     /* [Curve25519 p. 5] Just check X is the correct number of bytes */
     /* Allow any public value, if it's too big then we'll just reduce it mod p
      * (RFC 7748 sec. 5 para. 3). */
@@ -1931,8 +1886,7 @@ static int ecp_check_pubkey_mx(const mbedtls_ecp_group *grp, const mbedtls_ecp_p
 /*
  * Check that a point is valid as a public key
  */
-int mbedtls_ecp_check_pubkey(const mbedtls_ecp_group *grp, const mbedtls_ecp_point *pt)
-{
+int mbedtls_ecp_check_pubkey(const mbedtls_ecp_group *grp, const mbedtls_ecp_point *pt) {
     /* Must use affine coordinates */
     if (mbedtls_mpi_cmp_int(&pt->Z, 1) != 0)
         return (MBEDTLS_ERR_ECP_INVALID_KEY);
@@ -1951,14 +1905,13 @@ int mbedtls_ecp_check_pubkey(const mbedtls_ecp_group *grp, const mbedtls_ecp_poi
 /*
  * Check that an mbedtls_mpi is valid as a private key
  */
-int mbedtls_ecp_check_privkey(const mbedtls_ecp_group *grp, const mbedtls_mpi *d)
-{
+int mbedtls_ecp_check_privkey(const mbedtls_ecp_group *grp, const mbedtls_mpi *d) {
 #if defined(ECP_MONTGOMERY)
     if (ecp_get_type(grp) == ECP_TYPE_MONTGOMERY) {
         /* see RFC 7748 sec. 5 para. 5 */
         if (mbedtls_mpi_get_bit(d, 0) != 0 ||
-            mbedtls_mpi_get_bit(d, 1) != 0 ||
-            mbedtls_mpi_bitlen(d) - 1 != grp->nbits)    /* mbedtls_mpi_bitlen is one-based! */
+                mbedtls_mpi_get_bit(d, 1) != 0 ||
+                mbedtls_mpi_bitlen(d) - 1 != grp->nbits)    /* mbedtls_mpi_bitlen is one-based! */
             return (MBEDTLS_ERR_ECP_INVALID_KEY);
 
         /* see [Curve25519] page 5 */
@@ -1972,7 +1925,7 @@ int mbedtls_ecp_check_privkey(const mbedtls_ecp_group *grp, const mbedtls_mpi *d
     if (ecp_get_type(grp) == ECP_TYPE_SHORT_WEIERSTRASS) {
         /* see SEC1 3.2 */
         if (mbedtls_mpi_cmp_int(d, 1) < 0 ||
-            mbedtls_mpi_cmp_mpi(d, &grp->N) >= 0)
+                mbedtls_mpi_cmp_mpi(d, &grp->N) >= 0)
             return (MBEDTLS_ERR_ECP_INVALID_KEY);
         else
             return (0);
@@ -1989,8 +1942,7 @@ int mbedtls_ecp_gen_keypair_base(mbedtls_ecp_group *grp,
                                  const mbedtls_ecp_point *G,
                                  mbedtls_mpi *d, mbedtls_ecp_point *Q,
                                  int (*f_rng)(void *, unsigned char *, size_t),
-                                 void *p_rng)
-{
+                                 void *p_rng) {
     int ret;
     size_t n_size = (grp->nbits + 7) / 8;
 
@@ -2065,8 +2017,7 @@ cleanup:
 int mbedtls_ecp_gen_keypair(mbedtls_ecp_group *grp,
                             mbedtls_mpi *d, mbedtls_ecp_point *Q,
                             int (*f_rng)(void *, unsigned char *, size_t),
-                            void *p_rng)
-{
+                            void *p_rng) {
     return (mbedtls_ecp_gen_keypair_base(grp, &grp->G, d, Q, f_rng, p_rng));
 }
 
@@ -2074,8 +2025,7 @@ int mbedtls_ecp_gen_keypair(mbedtls_ecp_group *grp,
  * Generate a keypair, prettier wrapper
  */
 int mbedtls_ecp_gen_key(mbedtls_ecp_group_id grp_id, mbedtls_ecp_keypair *key,
-                        int (*f_rng)(void *, unsigned char *, size_t), void *p_rng)
-{
+                        int (*f_rng)(void *, unsigned char *, size_t), void *p_rng) {
     int ret;
 
     if ((ret = mbedtls_ecp_group_load(&key->grp, grp_id)) != 0)
@@ -2087,17 +2037,16 @@ int mbedtls_ecp_gen_key(mbedtls_ecp_group_id grp_id, mbedtls_ecp_keypair *key,
 /*
  * Check a public-private key pair
  */
-int mbedtls_ecp_check_pub_priv(const mbedtls_ecp_keypair *pub, const mbedtls_ecp_keypair *prv)
-{
+int mbedtls_ecp_check_pub_priv(const mbedtls_ecp_keypair *pub, const mbedtls_ecp_keypair *prv) {
     int ret;
     mbedtls_ecp_point Q;
     mbedtls_ecp_group grp;
 
     if (pub->grp.id == MBEDTLS_ECP_DP_NONE ||
-        pub->grp.id != prv->grp.id ||
-        mbedtls_mpi_cmp_mpi(&pub->Q.X, &prv->Q.X) ||
-        mbedtls_mpi_cmp_mpi(&pub->Q.Y, &prv->Q.Y) ||
-        mbedtls_mpi_cmp_mpi(&pub->Q.Z, &prv->Q.Z)) {
+            pub->grp.id != prv->grp.id ||
+            mbedtls_mpi_cmp_mpi(&pub->Q.X, &prv->Q.X) ||
+            mbedtls_mpi_cmp_mpi(&pub->Q.Y, &prv->Q.Y) ||
+            mbedtls_mpi_cmp_mpi(&pub->Q.Z, &prv->Q.Z)) {
         return (MBEDTLS_ERR_ECP_BAD_INPUT_DATA);
     }
 
@@ -2111,8 +2060,8 @@ int mbedtls_ecp_check_pub_priv(const mbedtls_ecp_keypair *pub, const mbedtls_ecp
     MBEDTLS_MPI_CHK(mbedtls_ecp_mul(&grp, &Q, &prv->d, &prv->grp.G, NULL, NULL));
 
     if (mbedtls_mpi_cmp_mpi(&Q.X, &prv->Q.X) ||
-        mbedtls_mpi_cmp_mpi(&Q.Y, &prv->Q.Y) ||
-        mbedtls_mpi_cmp_mpi(&Q.Z, &prv->Q.Z)) {
+            mbedtls_mpi_cmp_mpi(&Q.Y, &prv->Q.Y) ||
+            mbedtls_mpi_cmp_mpi(&Q.Z, &prv->Q.Z)) {
         ret = MBEDTLS_ERR_ECP_BAD_INPUT_DATA;
         goto cleanup;
     }
@@ -2129,8 +2078,7 @@ cleanup:
 /*
  * Checkup routine
  */
-int mbedtls_ecp_self_test(int verbose)
-{
+int mbedtls_ecp_self_test(int verbose) {
     int ret;
     size_t i;
     mbedtls_ecp_group grp;
@@ -2184,8 +2132,8 @@ int mbedtls_ecp_self_test(int verbose)
         MBEDTLS_MPI_CHK(mbedtls_ecp_mul(&grp, &R, &m, &grp.G, NULL, NULL));
 
         if (add_count != add_c_prev ||
-            dbl_count != dbl_c_prev ||
-            mul_count != mul_c_prev) {
+                dbl_count != dbl_c_prev ||
+                mul_count != mul_c_prev) {
             if (verbose != 0)
                 mbedtls_printf("failed (%u)\n", (unsigned int) i);
 
@@ -2219,8 +2167,8 @@ int mbedtls_ecp_self_test(int verbose)
         MBEDTLS_MPI_CHK(mbedtls_ecp_mul(&grp, &R, &m, &P, NULL, NULL));
 
         if (add_count != add_c_prev ||
-            dbl_count != dbl_c_prev ||
-            mul_count != mul_c_prev) {
+                dbl_count != dbl_c_prev ||
+                mul_count != mul_c_prev) {
             if (verbose != 0)
                 mbedtls_printf("failed (%u)\n", (unsigned int) i);
 
diff --git a/common/mbedtls/ecp_curves.c b/common/mbedtls/ecp_curves.c
index 8e7d915f2..2fd9a2daf 100644
--- a/common/mbedtls/ecp_curves.c
+++ b/common/mbedtls/ecp_curves.c
@@ -555,8 +555,7 @@ static const mbedtls_mpi_uint brainpoolP512r1_n[] = {
  * Create an MPI from embedded constants
  * (assumes len is an exact multiple of sizeof mbedtls_mpi_uint)
  */
-static inline void ecp_mpi_load(mbedtls_mpi *X, const mbedtls_mpi_uint *p, size_t len)
-{
+static inline void ecp_mpi_load(mbedtls_mpi *X, const mbedtls_mpi_uint *p, size_t len) {
     X->s = 1;
     X->n = len / sizeof(mbedtls_mpi_uint);
     X->p = (mbedtls_mpi_uint *) p;
@@ -565,8 +564,7 @@ static inline void ecp_mpi_load(mbedtls_mpi *X, const mbedtls_mpi_uint *p, size_
 /*
  * Set an MPI to static value 1
  */
-static inline void ecp_mpi_set1(mbedtls_mpi *X)
-{
+static inline void ecp_mpi_set1(mbedtls_mpi *X) {
     static mbedtls_mpi_uint one[] = { 1 };
     X->s = 1;
     X->n = 1;
@@ -582,8 +580,7 @@ static int ecp_group_load(mbedtls_ecp_group *grp,
                           const mbedtls_mpi_uint *b,  size_t blen,
                           const mbedtls_mpi_uint *gx, size_t gxlen,
                           const mbedtls_mpi_uint *gy, size_t gylen,
-                          const mbedtls_mpi_uint *n,  size_t nlen)
-{
+                          const mbedtls_mpi_uint *n,  size_t nlen) {
     ecp_mpi_load(&grp->P, p, plen);
     if (a != NULL)
         ecp_mpi_load(&grp->A, a, alen);
@@ -662,8 +659,7 @@ static int ecp_mod_p256k1(mbedtls_mpi *);
 /*
  * Specialized function for creating the Curve25519 group
  */
-static int ecp_use_curve25519(mbedtls_ecp_group *grp)
-{
+static int ecp_use_curve25519(mbedtls_ecp_group *grp) {
     int ret;
 
     /* Actually ( A + 2 ) / 4 */
@@ -701,8 +697,7 @@ cleanup:
 /*
  * Specialized function for creating the Curve448 group
  */
-static int ecp_use_curve448(mbedtls_ecp_group *grp)
-{
+static int ecp_use_curve448(mbedtls_ecp_group *grp) {
     mbedtls_mpi Ns;
     int ret;
 
@@ -746,8 +741,7 @@ cleanup:
 /*
  * Set a group using well-known domain parameters
  */
-int mbedtls_ecp_group_load(mbedtls_ecp_group *grp, mbedtls_ecp_group_id id)
-{
+int mbedtls_ecp_group_load(mbedtls_ecp_group *grp, mbedtls_ecp_group_id id) {
     mbedtls_ecp_group_free(grp);
 
     grp->id = id;
@@ -859,8 +853,7 @@ int mbedtls_ecp_group_load(mbedtls_ecp_group *grp, mbedtls_ecp_group_id id)
  */
 
 /* Add 64-bit chunks (dst += src) and update carry */
-static inline void add64(mbedtls_mpi_uint *dst, mbedtls_mpi_uint *src, mbedtls_mpi_uint *carry)
-{
+static inline void add64(mbedtls_mpi_uint *dst, mbedtls_mpi_uint *src, mbedtls_mpi_uint *carry) {
     unsigned char i;
     mbedtls_mpi_uint c = 0;
     for (i = 0; i < 8 / sizeof(mbedtls_mpi_uint); i++, dst++, src++) {
@@ -873,8 +866,7 @@ static inline void add64(mbedtls_mpi_uint *dst, mbedtls_mpi_uint *src, mbedtls_m
 }
 
 /* Add carry to a 64-bit chunk and update carry */
-static inline void carry64(mbedtls_mpi_uint *dst, mbedtls_mpi_uint *carry)
-{
+static inline void carry64(mbedtls_mpi_uint *dst, mbedtls_mpi_uint *carry) {
     unsigned char i;
     for (i = 0; i < 8 / sizeof(mbedtls_mpi_uint); i++, dst++) {
         *dst += *carry;
@@ -891,8 +883,7 @@ static inline void carry64(mbedtls_mpi_uint *dst, mbedtls_mpi_uint *carry)
 /*
  * Fast quasi-reduction modulo p192 (FIPS 186-3 D.2.1)
  */
-static int ecp_mod_p192(mbedtls_mpi *N)
-{
+static int ecp_mod_p192(mbedtls_mpi *N) {
     int ret;
     mbedtls_mpi_uint c = 0;
     mbedtls_mpi_uint *p, *end;
@@ -970,14 +961,12 @@ cleanup:
 /*
  * Helpers for addition and subtraction of chunks, with signed carry.
  */
-static inline void add32(uint32_t *dst, uint32_t src, signed char *carry)
-{
+static inline void add32(uint32_t *dst, uint32_t src, signed char *carry) {
     *dst += src;
     *carry += (*dst < src);
 }
 
-static inline void sub32(uint32_t *dst, uint32_t src, signed char *carry)
-{
+static inline void sub32(uint32_t *dst, uint32_t src, signed char *carry) {
     *carry -= (*dst < src);
     *dst -= src;
 }
@@ -1023,8 +1012,7 @@ static inline void sub32(uint32_t *dst, uint32_t src, signed char *carry)
  * If the result is negative, we get it in the form
  * c * 2^(bits + 32) + N, with c negative and N positive shorter than 'bits'
  */
-static inline int fix_negative(mbedtls_mpi *N, signed char c, mbedtls_mpi *C, size_t bits)
-{
+static inline int fix_negative(mbedtls_mpi *N, signed char c, mbedtls_mpi *C, size_t bits) {
     int ret;
 
     /* C = - c * 2^(bits + 32) */
@@ -1050,8 +1038,7 @@ cleanup:
 /*
  * Fast quasi-reduction modulo p224 (FIPS 186-3 D.2.2)
  */
-static int ecp_mod_p224(mbedtls_mpi *N)
-{
+static int ecp_mod_p224(mbedtls_mpi *N) {
     INIT(224);
 
     SUB(7);
@@ -1088,8 +1075,7 @@ cleanup:
 /*
  * Fast quasi-reduction modulo p256 (FIPS 186-3 D.2.3)
  */
-static int ecp_mod_p256(mbedtls_mpi *N)
-{
+static int ecp_mod_p256(mbedtls_mpi *N) {
     INIT(256);
 
     ADD(8);
@@ -1172,8 +1158,7 @@ cleanup:
 /*
  * Fast quasi-reduction modulo p384 (FIPS 186-3 D.2.4)
  */
-static int ecp_mod_p384(mbedtls_mpi *N)
-{
+static int ecp_mod_p384(mbedtls_mpi *N) {
     INIT(384);
 
     ADD(12);
@@ -1299,8 +1284,7 @@ cleanup:
  * Fast quasi-reduction modulo p521 (FIPS 186-3 D.2.5)
  * Write N as A1 + 2^521 A0, return A0 + A1
  */
-static int ecp_mod_p521(mbedtls_mpi *N)
-{
+static int ecp_mod_p521(mbedtls_mpi *N) {
     int ret;
     size_t i;
     mbedtls_mpi M;
@@ -1348,8 +1332,7 @@ cleanup:
  * Fast quasi-reduction modulo p255 = 2^255 - 19
  * Write N as A0 + 2^255 A1, return A0 + 19 * A1
  */
-static int ecp_mod_p255(mbedtls_mpi *N)
-{
+static int ecp_mod_p255(mbedtls_mpi *N) {
     int ret;
     size_t i;
     mbedtls_mpi M;
@@ -1405,8 +1388,7 @@ cleanup:
  * but for 64-bit targets it should use half the number of operations if we do
  * the reduction with 224-bit limbs, since mpi_add_mpi will then use 64-bit adds.
  */
-static int ecp_mod_p448(mbedtls_mpi *N)
-{
+static int ecp_mod_p448(mbedtls_mpi *N) {
     int ret;
     size_t i;
     mbedtls_mpi M, Q;
@@ -1467,8 +1449,7 @@ cleanup:
 #define P_KOBLITZ_MAX   ( 256 / 8 / sizeof( mbedtls_mpi_uint ) )  // Max limbs in P
 #define P_KOBLITZ_R     ( 8 / sizeof( mbedtls_mpi_uint ) )        // Limbs in R
 static inline int ecp_mod_koblitz(mbedtls_mpi *N, mbedtls_mpi_uint *Rp, size_t p_limbs,
-                                  size_t adjust, size_t shift, mbedtls_mpi_uint mask)
-{
+                                  size_t adjust, size_t shift, mbedtls_mpi_uint mask) {
     int ret;
     size_t i;
     mbedtls_mpi M, R;
@@ -1540,8 +1521,7 @@ cleanup:
  * Fast quasi-reduction modulo p192k1 = 2^192 - R,
  * with R = 2^32 + 2^12 + 2^8 + 2^7 + 2^6 + 2^3 + 1 = 0x0100001119
  */
-static int ecp_mod_p192k1(mbedtls_mpi *N)
-{
+static int ecp_mod_p192k1(mbedtls_mpi *N) {
     static mbedtls_mpi_uint Rp[] = {
         BYTES_TO_T_UINT_8(0xC9, 0x11, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00)
     };
@@ -1555,8 +1535,7 @@ static int ecp_mod_p192k1(mbedtls_mpi *N)
  * Fast quasi-reduction modulo p224k1 = 2^224 - R,
  * with R = 2^32 + 2^12 + 2^11 + 2^9 + 2^7 + 2^4 + 2 + 1 = 0x0100001A93
  */
-static int ecp_mod_p224k1(mbedtls_mpi *N)
-{
+static int ecp_mod_p224k1(mbedtls_mpi *N) {
     static mbedtls_mpi_uint Rp[] = {
         BYTES_TO_T_UINT_8(0x93, 0x1A, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00)
     };
@@ -1575,8 +1554,7 @@ static int ecp_mod_p224k1(mbedtls_mpi *N)
  * Fast quasi-reduction modulo p256k1 = 2^256 - R,
  * with R = 2^32 + 2^9 + 2^8 + 2^7 + 2^6 + 2^4 + 1 = 0x01000003D1
  */
-static int ecp_mod_p256k1(mbedtls_mpi *N)
-{
+static int ecp_mod_p256k1(mbedtls_mpi *N) {
     static mbedtls_mpi_uint Rp[] = {
         BYTES_TO_T_UINT_8(0xD1, 0x03, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00)
     };
diff --git a/common/mbedtls/entropy.c b/common/mbedtls/entropy.c
index 0d510c5c0..4412322bb 100644
--- a/common/mbedtls/entropy.c
+++ b/common/mbedtls/entropy.c
@@ -64,8 +64,7 @@
 
 #define ENTROPY_MAX_LOOP    256     /**< Maximum amount to loop before error */
 
-void mbedtls_entropy_init(mbedtls_entropy_context *ctx)
-{
+void mbedtls_entropy_init(mbedtls_entropy_context *ctx) {
     ctx->source_count = 0;
     memset(ctx->source, 0, sizeof(ctx->source));
 
@@ -121,8 +120,7 @@ void mbedtls_entropy_init(mbedtls_entropy_context *ctx)
 #endif /* MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES */
 }
 
-void mbedtls_entropy_free(mbedtls_entropy_context *ctx)
-{
+void mbedtls_entropy_free(mbedtls_entropy_context *ctx) {
 #if defined(MBEDTLS_HAVEGE_C)
     mbedtls_havege_free(&ctx->havege_data);
 #endif
@@ -144,8 +142,7 @@ void mbedtls_entropy_free(mbedtls_entropy_context *ctx)
 
 int mbedtls_entropy_add_source(mbedtls_entropy_context *ctx,
                                mbedtls_entropy_f_source_ptr f_source, void *p_source,
-                               size_t threshold, int strong)
-{
+                               size_t threshold, int strong) {
     int idx, ret = 0;
 
 #if defined(MBEDTLS_THREADING_C)
@@ -179,8 +176,7 @@ exit:
  * Entropy accumulator update
  */
 static int entropy_update(mbedtls_entropy_context *ctx, unsigned char source_id,
-                          const unsigned char *data, size_t len)
-{
+                          const unsigned char *data, size_t len) {
     unsigned char header[2];
     unsigned char tmp[MBEDTLS_ENTROPY_BLOCK_SIZE];
     size_t use_len = len;
@@ -209,7 +205,7 @@ static int entropy_update(mbedtls_entropy_context *ctx, unsigned char source_id,
      */
 #if defined(MBEDTLS_ENTROPY_SHA512_ACCUMULATOR)
     if (ctx->accumulator_started == 0 &&
-        (ret = mbedtls_sha512_starts_ret(&ctx->accumulator, 0)) != 0)
+            (ret = mbedtls_sha512_starts_ret(&ctx->accumulator, 0)) != 0)
         goto cleanup;
     else
         ctx->accumulator_started = 1;
@@ -218,7 +214,7 @@ static int entropy_update(mbedtls_entropy_context *ctx, unsigned char source_id,
     ret = mbedtls_sha512_update_ret(&ctx->accumulator, p, use_len);
 #else
     if (ctx->accumulator_started == 0 &&
-        (ret = mbedtls_sha256_starts_ret(&ctx->accumulator, 0)) != 0)
+            (ret = mbedtls_sha256_starts_ret(&ctx->accumulator, 0)) != 0)
         goto cleanup;
     else
         ctx->accumulator_started = 1;
@@ -234,8 +230,7 @@ cleanup:
 }
 
 int mbedtls_entropy_update_manual(mbedtls_entropy_context *ctx,
-                                  const unsigned char *data, size_t len)
-{
+                                  const unsigned char *data, size_t len) {
     int ret;
 
 #if defined(MBEDTLS_THREADING_C)
@@ -256,8 +251,7 @@ int mbedtls_entropy_update_manual(mbedtls_entropy_context *ctx,
 /*
  * Run through the different sources to add entropy to our accumulator
  */
-static int entropy_gather_internal(mbedtls_entropy_context *ctx)
-{
+static int entropy_gather_internal(mbedtls_entropy_context *ctx) {
     int ret, i, have_one_strong = 0;
     unsigned char buf[MBEDTLS_ENTROPY_MAX_GATHER];
     size_t olen;
@@ -301,8 +295,7 @@ cleanup:
 /*
  * Thread-safe wrapper for entropy_gather_internal()
  */
-int mbedtls_entropy_gather(mbedtls_entropy_context *ctx)
-{
+int mbedtls_entropy_gather(mbedtls_entropy_context *ctx) {
     int ret;
 
 #if defined(MBEDTLS_THREADING_C)
@@ -320,8 +313,7 @@ int mbedtls_entropy_gather(mbedtls_entropy_context *ctx)
     return (ret);
 }
 
-int mbedtls_entropy_func(void *data, unsigned char *output, size_t len)
-{
+int mbedtls_entropy_func(void *data, unsigned char *output, size_t len) {
     int ret, count = 0, i, done;
     mbedtls_entropy_context *ctx = (mbedtls_entropy_context *) data;
     unsigned char buf[MBEDTLS_ENTROPY_BLOCK_SIZE];
@@ -433,8 +425,7 @@ exit:
 }
 
 #if defined(MBEDTLS_ENTROPY_NV_SEED)
-int mbedtls_entropy_update_nv_seed(mbedtls_entropy_context *ctx)
-{
+int mbedtls_entropy_update_nv_seed(mbedtls_entropy_context *ctx) {
     int ret = MBEDTLS_ERR_ENTROPY_FILE_IO_ERROR;
     unsigned char buf[MBEDTLS_ENTROPY_BLOCK_SIZE];
 
@@ -454,8 +445,7 @@ int mbedtls_entropy_update_nv_seed(mbedtls_entropy_context *ctx)
 #endif /* MBEDTLS_ENTROPY_NV_SEED */
 
 #if defined(MBEDTLS_FS_IO)
-int mbedtls_entropy_write_seed_file(mbedtls_entropy_context *ctx, const char *path)
-{
+int mbedtls_entropy_write_seed_file(mbedtls_entropy_context *ctx, const char *path) {
     int ret = MBEDTLS_ERR_ENTROPY_FILE_IO_ERROR;
     FILE *f;
     unsigned char buf[MBEDTLS_ENTROPY_BLOCK_SIZE];
@@ -480,8 +470,7 @@ exit:
     return (ret);
 }
 
-int mbedtls_entropy_update_seed_file(mbedtls_entropy_context *ctx, const char *path)
-{
+int mbedtls_entropy_update_seed_file(mbedtls_entropy_context *ctx, const char *path) {
     int ret = 0;
     FILE *f;
     size_t n;
@@ -519,8 +508,7 @@ int mbedtls_entropy_update_seed_file(mbedtls_entropy_context *ctx, const char *p
  * Dummy source function
  */
 static int entropy_dummy_source(void *data, unsigned char *output,
-                                size_t len, size_t *olen)
-{
+                                size_t len, size_t *olen) {
     ((void) data);
 
     memset(output, 0x2a, len);
@@ -532,8 +520,7 @@ static int entropy_dummy_source(void *data, unsigned char *output,
 
 #if defined(MBEDTLS_ENTROPY_HARDWARE_ALT)
 
-static int mbedtls_entropy_source_self_test_gather(unsigned char *buf, size_t buf_len)
-{
+static int mbedtls_entropy_source_self_test_gather(unsigned char *buf, size_t buf_len) {
     int ret = 0;
     size_t entropy_len = 0;
     size_t olen = 0;
@@ -557,8 +544,7 @@ static int mbedtls_entropy_source_self_test_gather(unsigned char *buf, size_t bu
 
 
 static int mbedtls_entropy_source_self_test_check_bits(const unsigned char *buf,
-                                                       size_t buf_len)
-{
+                                                       size_t buf_len) {
     unsigned char set = 0xFF;
     unsigned char unset = 0x00;
     size_t i;
@@ -582,8 +568,7 @@ static int mbedtls_entropy_source_self_test_check_bits(const unsigned char *buf,
  *    are not equal.
  *  - The error code returned by the entropy source is not an error.
  */
-int mbedtls_entropy_source_self_test(int verbose)
-{
+int mbedtls_entropy_source_self_test(int verbose) {
     int ret = 0;
     unsigned char buf0[2 * sizeof(unsigned long long int)];
     unsigned char buf1[2 * sizeof(unsigned long long int)];
@@ -629,8 +614,7 @@ cleanup:
  * test that the functions don't cause errors and write the correct
  * amount of data to buffers.
  */
-int mbedtls_entropy_self_test(int verbose)
-{
+int mbedtls_entropy_self_test(int verbose) {
     int ret = 1;
 #if !defined(MBEDTLS_TEST_NULL_ENTROPY)
     mbedtls_entropy_context ctx;
diff --git a/common/mbedtls/entropy_poll.c b/common/mbedtls/entropy_poll.c
index 31fec8145..6e3d7c931 100644
--- a/common/mbedtls/entropy_poll.c
+++ b/common/mbedtls/entropy_poll.c
@@ -66,8 +66,7 @@
 #include <wincrypt.h>
 
 int mbedtls_platform_entropy_poll(void *data, unsigned char *output, size_t len,
-                                  size_t *olen)
-{
+                                  size_t *olen) {
     HCRYPTPROV provider;
     ((void) data);
     *olen = 0;
@@ -100,8 +99,7 @@ int mbedtls_platform_entropy_poll(void *data, unsigned char *output, size_t len,
 #if defined(SYS_getrandom)
 #define HAVE_GETRANDOM
 
-static int getrandom_wrapper(void *buf, size_t buflen, unsigned int flags)
-{
+static int getrandom_wrapper(void *buf, size_t buflen, unsigned int flags) {
     /* MemSan cannot understand that the syscall writes to the buffer */
 #if defined(__has_feature)
 #if __has_feature(memory_sanitizer)
@@ -114,8 +112,7 @@ static int getrandom_wrapper(void *buf, size_t buflen, unsigned int flags)
 
 #include <sys/utsname.h>
 /* Check if version is at least 3.17.0 */
-static int check_version_3_17_plus(void)
-{
+static int check_version_3_17_plus(void) {
     int minor;
     struct utsname un;
     const char *ver;
@@ -155,8 +152,7 @@ static int has_getrandom = -1;
 #include <stdio.h>
 
 int mbedtls_platform_entropy_poll(void *data,
-                                  unsigned char *output, size_t len, size_t *olen)
-{
+                                  unsigned char *output, size_t len, size_t *olen) {
     FILE *file;
     size_t read_len;
     ((void) data);
@@ -198,8 +194,7 @@ int mbedtls_platform_entropy_poll(void *data,
 
 #if defined(MBEDTLS_TEST_NULL_ENTROPY)
 int mbedtls_null_entropy_poll(void *data,
-                              unsigned char *output, size_t len, size_t *olen)
-{
+                              unsigned char *output, size_t len, size_t *olen) {
     ((void) data);
     ((void) output);
     *olen = 0;
@@ -215,8 +210,7 @@ int mbedtls_null_entropy_poll(void *data,
 
 #if defined(MBEDTLS_TIMING_C)
 int mbedtls_hardclock_poll(void *data,
-                           unsigned char *output, size_t len, size_t *olen)
-{
+                           unsigned char *output, size_t len, size_t *olen) {
     unsigned long timer = mbedtls_timing_hardclock();
     ((void) data);
     *olen = 0;
@@ -233,8 +227,7 @@ int mbedtls_hardclock_poll(void *data,
 
 #if defined(MBEDTLS_HAVEGE_C)
 int mbedtls_havege_poll(void *data,
-                        unsigned char *output, size_t len, size_t *olen)
-{
+                        unsigned char *output, size_t len, size_t *olen) {
     mbedtls_havege_state *hs = (mbedtls_havege_state *) data;
     *olen = 0;
 
@@ -249,8 +242,7 @@ int mbedtls_havege_poll(void *data,
 
 #if defined(MBEDTLS_ENTROPY_NV_SEED)
 int mbedtls_nv_seed_poll(void *data,
-                         unsigned char *output, size_t len, size_t *olen)
-{
+                         unsigned char *output, size_t len, size_t *olen) {
     unsigned char buf[MBEDTLS_ENTROPY_BLOCK_SIZE];
     size_t use_len = MBEDTLS_ENTROPY_BLOCK_SIZE;
     ((void) data);
diff --git a/common/mbedtls/error.c b/common/mbedtls/error.c
index c39831388..8b8a27bb6 100644
--- a/common/mbedtls/error.c
+++ b/common/mbedtls/error.c
@@ -208,8 +208,7 @@
 #endif
 
 
-void mbedtls_strerror(int ret, char *buf, size_t buflen)
-{
+void mbedtls_strerror(int ret, char *buf, size_t buflen) {
     size_t len;
     int use_ret;
 
@@ -881,8 +880,7 @@ void mbedtls_strerror(int ret, char *buf, size_t buflen)
 /*
  * Provide an non-function in case MBEDTLS_ERROR_C is not defined
  */
-void mbedtls_strerror(int ret, char *buf, size_t buflen)
-{
+void mbedtls_strerror(int ret, char *buf, size_t buflen) {
     ((void) ret);
 
     if (buflen > 0)
diff --git a/common/mbedtls/md.c b/common/mbedtls/md.c
index fd4c696b7..294896c3d 100644
--- a/common/mbedtls/md.c
+++ b/common/mbedtls/md.c
@@ -89,13 +89,11 @@ static const int supported_digests[] = {
     MBEDTLS_MD_NONE
 };
 
-const int *mbedtls_md_list(void)
-{
+const int *mbedtls_md_list(void) {
     return (supported_digests);
 }
 
-const mbedtls_md_info_t *mbedtls_md_info_from_string(const char *md_name)
-{
+const mbedtls_md_info_t *mbedtls_md_info_from_string(const char *md_name) {
     if (NULL == md_name)
         return (NULL);
 
@@ -135,8 +133,7 @@ const mbedtls_md_info_t *mbedtls_md_info_from_string(const char *md_name)
     return (NULL);
 }
 
-const mbedtls_md_info_t *mbedtls_md_info_from_type(mbedtls_md_type_t md_type)
-{
+const mbedtls_md_info_t *mbedtls_md_info_from_type(mbedtls_md_type_t md_type) {
     switch (md_type) {
 #if defined(MBEDTLS_MD2_C)
         case MBEDTLS_MD_MD2:
@@ -175,13 +172,11 @@ const mbedtls_md_info_t *mbedtls_md_info_from_type(mbedtls_md_type_t md_type)
     }
 }
 
-void mbedtls_md_init(mbedtls_md_context_t *ctx)
-{
+void mbedtls_md_init(mbedtls_md_context_t *ctx) {
     memset(ctx, 0, sizeof(mbedtls_md_context_t));
 }
 
-void mbedtls_md_free(mbedtls_md_context_t *ctx)
-{
+void mbedtls_md_free(mbedtls_md_context_t *ctx) {
     if (ctx == NULL || ctx->md_info == NULL)
         return;
 
@@ -198,11 +193,10 @@ void mbedtls_md_free(mbedtls_md_context_t *ctx)
 }
 
 int mbedtls_md_clone(mbedtls_md_context_t *dst,
-                     const mbedtls_md_context_t *src)
-{
+                     const mbedtls_md_context_t *src) {
     if (dst == NULL || dst->md_info == NULL ||
-        src == NULL || src->md_info == NULL ||
-        dst->md_info != src->md_info) {
+            src == NULL || src->md_info == NULL ||
+            dst->md_info != src->md_info) {
         return (MBEDTLS_ERR_MD_BAD_INPUT_DATA);
     }
 
@@ -212,14 +206,12 @@ int mbedtls_md_clone(mbedtls_md_context_t *dst,
 }
 
 #if ! defined(MBEDTLS_DEPRECATED_REMOVED)
-int mbedtls_md_init_ctx(mbedtls_md_context_t *ctx, const mbedtls_md_info_t *md_info)
-{
+int mbedtls_md_init_ctx(mbedtls_md_context_t *ctx, const mbedtls_md_info_t *md_info) {
     return mbedtls_md_setup(ctx, md_info, 1);
 }
 #endif
 
-int mbedtls_md_setup(mbedtls_md_context_t *ctx, const mbedtls_md_info_t *md_info, int hmac)
-{
+int mbedtls_md_setup(mbedtls_md_context_t *ctx, const mbedtls_md_info_t *md_info, int hmac) {
     if (md_info == NULL || ctx == NULL)
         return (MBEDTLS_ERR_MD_BAD_INPUT_DATA);
 
@@ -239,24 +231,21 @@ int mbedtls_md_setup(mbedtls_md_context_t *ctx, const mbedtls_md_info_t *md_info
     return (0);
 }
 
-int mbedtls_md_starts(mbedtls_md_context_t *ctx)
-{
+int mbedtls_md_starts(mbedtls_md_context_t *ctx) {
     if (ctx == NULL || ctx->md_info == NULL)
         return (MBEDTLS_ERR_MD_BAD_INPUT_DATA);
 
     return (ctx->md_info->starts_func(ctx->md_ctx));
 }
 
-int mbedtls_md_update(mbedtls_md_context_t *ctx, const unsigned char *input, size_t ilen)
-{
+int mbedtls_md_update(mbedtls_md_context_t *ctx, const unsigned char *input, size_t ilen) {
     if (ctx == NULL || ctx->md_info == NULL)
         return (MBEDTLS_ERR_MD_BAD_INPUT_DATA);
 
     return (ctx->md_info->update_func(ctx->md_ctx, input, ilen));
 }
 
-int mbedtls_md_finish(mbedtls_md_context_t *ctx, unsigned char *output)
-{
+int mbedtls_md_finish(mbedtls_md_context_t *ctx, unsigned char *output) {
     if (ctx == NULL || ctx->md_info == NULL)
         return (MBEDTLS_ERR_MD_BAD_INPUT_DATA);
 
@@ -264,8 +253,7 @@ int mbedtls_md_finish(mbedtls_md_context_t *ctx, unsigned char *output)
 }
 
 int mbedtls_md(const mbedtls_md_info_t *md_info, const unsigned char *input, size_t ilen,
-               unsigned char *output)
-{
+               unsigned char *output) {
     if (md_info == NULL)
         return (MBEDTLS_ERR_MD_BAD_INPUT_DATA);
 
@@ -273,8 +261,7 @@ int mbedtls_md(const mbedtls_md_info_t *md_info, const unsigned char *input, siz
 }
 
 #if defined(MBEDTLS_FS_IO)
-int mbedtls_md_file(const mbedtls_md_info_t *md_info, const char *path, unsigned char *output)
-{
+int mbedtls_md_file(const mbedtls_md_info_t *md_info, const char *path, unsigned char *output) {
     int ret;
     FILE *f;
     size_t n;
@@ -313,8 +300,7 @@ cleanup:
 }
 #endif /* MBEDTLS_FS_IO */
 
-int mbedtls_md_hmac_starts(mbedtls_md_context_t *ctx, const unsigned char *key, size_t keylen)
-{
+int mbedtls_md_hmac_starts(mbedtls_md_context_t *ctx, const unsigned char *key, size_t keylen) {
     int ret;
     unsigned char sum[MBEDTLS_MD_MAX_SIZE];
     unsigned char *ipad, *opad;
@@ -358,16 +344,14 @@ cleanup:
     return (ret);
 }
 
-int mbedtls_md_hmac_update(mbedtls_md_context_t *ctx, const unsigned char *input, size_t ilen)
-{
+int mbedtls_md_hmac_update(mbedtls_md_context_t *ctx, const unsigned char *input, size_t ilen) {
     if (ctx == NULL || ctx->md_info == NULL || ctx->hmac_ctx == NULL)
         return (MBEDTLS_ERR_MD_BAD_INPUT_DATA);
 
     return (ctx->md_info->update_func(ctx->md_ctx, input, ilen));
 }
 
-int mbedtls_md_hmac_finish(mbedtls_md_context_t *ctx, unsigned char *output)
-{
+int mbedtls_md_hmac_finish(mbedtls_md_context_t *ctx, unsigned char *output) {
     int ret;
     unsigned char tmp[MBEDTLS_MD_MAX_SIZE];
     unsigned char *opad;
@@ -390,8 +374,7 @@ int mbedtls_md_hmac_finish(mbedtls_md_context_t *ctx, unsigned char *output)
     return (ctx->md_info->finish_func(ctx->md_ctx, output));
 }
 
-int mbedtls_md_hmac_reset(mbedtls_md_context_t *ctx)
-{
+int mbedtls_md_hmac_reset(mbedtls_md_context_t *ctx) {
     int ret;
     unsigned char *ipad;
 
@@ -409,8 +392,7 @@ int mbedtls_md_hmac_reset(mbedtls_md_context_t *ctx)
 int mbedtls_md_hmac(const mbedtls_md_info_t *md_info,
                     const unsigned char *key, size_t keylen,
                     const unsigned char *input, size_t ilen,
-                    unsigned char *output)
-{
+                    unsigned char *output) {
     mbedtls_md_context_t ctx;
     int ret;
 
@@ -435,32 +417,28 @@ cleanup:
     return (ret);
 }
 
-int mbedtls_md_process(mbedtls_md_context_t *ctx, const unsigned char *data)
-{
+int mbedtls_md_process(mbedtls_md_context_t *ctx, const unsigned char *data) {
     if (ctx == NULL || ctx->md_info == NULL)
         return (MBEDTLS_ERR_MD_BAD_INPUT_DATA);
 
     return (ctx->md_info->process_func(ctx->md_ctx, data));
 }
 
-unsigned char mbedtls_md_get_size(const mbedtls_md_info_t *md_info)
-{
+unsigned char mbedtls_md_get_size(const mbedtls_md_info_t *md_info) {
     if (md_info == NULL)
         return (0);
 
     return md_info->size;
 }
 
-mbedtls_md_type_t mbedtls_md_get_type(const mbedtls_md_info_t *md_info)
-{
+mbedtls_md_type_t mbedtls_md_get_type(const mbedtls_md_info_t *md_info) {
     if (md_info == NULL)
         return (MBEDTLS_MD_NONE);
 
     return md_info->type;
 }
 
-const char *mbedtls_md_get_name(const mbedtls_md_info_t *md_info)
-{
+const char *mbedtls_md_get_name(const mbedtls_md_info_t *md_info) {
     if (md_info == NULL)
         return (NULL);
 
diff --git a/common/mbedtls/md5.c b/common/mbedtls/md5.c
index a606c4f23..5466ddbc8 100644
--- a/common/mbedtls/md5.c
+++ b/common/mbedtls/md5.c
@@ -73,13 +73,11 @@
     }
 #endif
 
-void mbedtls_md5_init(mbedtls_md5_context *ctx)
-{
+void mbedtls_md5_init(mbedtls_md5_context *ctx) {
     memset(ctx, 0, sizeof(mbedtls_md5_context));
 }
 
-void mbedtls_md5_free(mbedtls_md5_context *ctx)
-{
+void mbedtls_md5_free(mbedtls_md5_context *ctx) {
     if (ctx == NULL)
         return;
 
@@ -87,16 +85,14 @@ void mbedtls_md5_free(mbedtls_md5_context *ctx)
 }
 
 void mbedtls_md5_clone(mbedtls_md5_context *dst,
-                       const mbedtls_md5_context *src)
-{
+                       const mbedtls_md5_context *src) {
     *dst = *src;
 }
 
 /*
  * MD5 context setup
  */
-int mbedtls_md5_starts_ret(mbedtls_md5_context *ctx)
-{
+int mbedtls_md5_starts_ret(mbedtls_md5_context *ctx) {
     ctx->total[0] = 0;
     ctx->total[1] = 0;
 
@@ -109,16 +105,14 @@ int mbedtls_md5_starts_ret(mbedtls_md5_context *ctx)
 }
 
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
-void mbedtls_md5_starts(mbedtls_md5_context *ctx)
-{
+void mbedtls_md5_starts(mbedtls_md5_context *ctx) {
     mbedtls_md5_starts_ret(ctx);
 }
 #endif
 
 #if !defined(MBEDTLS_MD5_PROCESS_ALT)
 int mbedtls_internal_md5_process(mbedtls_md5_context *ctx,
-                                 const unsigned char data[64])
-{
+                                 const unsigned char data[64]) {
     uint32_t X[16], A, B, C, D;
 
     GET_UINT32_LE(X[ 0], data,  0);
@@ -244,8 +238,7 @@ int mbedtls_internal_md5_process(mbedtls_md5_context *ctx,
 
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
 void mbedtls_md5_process(mbedtls_md5_context *ctx,
-                         const unsigned char data[64])
-{
+                         const unsigned char data[64]) {
     mbedtls_internal_md5_process(ctx, data);
 }
 #endif
@@ -256,8 +249,7 @@ void mbedtls_md5_process(mbedtls_md5_context *ctx,
  */
 int mbedtls_md5_update_ret(mbedtls_md5_context *ctx,
                            const unsigned char *input,
-                           size_t ilen)
-{
+                           size_t ilen) {
     int ret;
     size_t fill;
     uint32_t left;
@@ -302,8 +294,7 @@ int mbedtls_md5_update_ret(mbedtls_md5_context *ctx,
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
 void mbedtls_md5_update(mbedtls_md5_context *ctx,
                         const unsigned char *input,
-                        size_t ilen)
-{
+                        size_t ilen) {
     mbedtls_md5_update_ret(ctx, input, ilen);
 }
 #endif
@@ -312,8 +303,7 @@ void mbedtls_md5_update(mbedtls_md5_context *ctx,
  * MD5 final digest
  */
 int mbedtls_md5_finish_ret(mbedtls_md5_context *ctx,
-                           unsigned char output[16])
-{
+                           unsigned char output[16]) {
     int ret;
     uint32_t used;
     uint32_t high, low;
@@ -364,8 +354,7 @@ int mbedtls_md5_finish_ret(mbedtls_md5_context *ctx,
 
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
 void mbedtls_md5_finish(mbedtls_md5_context *ctx,
-                        unsigned char output[16])
-{
+                        unsigned char output[16]) {
     mbedtls_md5_finish_ret(ctx, output);
 }
 #endif
@@ -377,8 +366,7 @@ void mbedtls_md5_finish(mbedtls_md5_context *ctx,
  */
 int mbedtls_md5_ret(const unsigned char *input,
                     size_t ilen,
-                    unsigned char output[16])
-{
+                    unsigned char output[16]) {
     int ret;
     mbedtls_md5_context ctx;
 
@@ -402,8 +390,7 @@ exit:
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
 void mbedtls_md5(const unsigned char *input,
                  size_t ilen,
-                 unsigned char output[16])
-{
+                 unsigned char output[16]) {
     mbedtls_md5_ret(input, ilen, output);
 }
 #endif
@@ -463,8 +450,7 @@ static const unsigned char md5_test_sum[7][16] = {
 /*
  * Checkup routine
  */
-int mbedtls_md5_self_test(int verbose)
-{
+int mbedtls_md5_self_test(int verbose) {
     int i, ret = 0;
     unsigned char md5sum[16];
 
diff --git a/common/mbedtls/md_wrap.c b/common/mbedtls/md_wrap.c
index 0288d3c01..9b844ae46 100644
--- a/common/mbedtls/md_wrap.c
+++ b/common/mbedtls/md_wrap.c
@@ -73,24 +73,20 @@
 
 #if defined(MBEDTLS_MD2_C)
 
-static int md2_starts_wrap(void *ctx)
-{
+static int md2_starts_wrap(void *ctx) {
     return (mbedtls_md2_starts_ret((mbedtls_md2_context *) ctx));
 }
 
 static int md2_update_wrap(void *ctx, const unsigned char *input,
-                           size_t ilen)
-{
+                           size_t ilen) {
     return (mbedtls_md2_update_ret((mbedtls_md2_context *) ctx, input, ilen));
 }
 
-static int md2_finish_wrap(void *ctx, unsigned char *output)
-{
+static int md2_finish_wrap(void *ctx, unsigned char *output) {
     return (mbedtls_md2_finish_ret((mbedtls_md2_context *) ctx, output));
 }
 
-static void *md2_ctx_alloc(void)
-{
+static void *md2_ctx_alloc(void) {
     void *ctx = mbedtls_calloc(1, sizeof(mbedtls_md2_context));
 
     if (ctx != NULL)
@@ -99,20 +95,17 @@ static void *md2_ctx_alloc(void)
     return (ctx);
 }
 
-static void md2_ctx_free(void *ctx)
-{
+static void md2_ctx_free(void *ctx) {
     mbedtls_md2_free((mbedtls_md2_context *) ctx);
     mbedtls_free(ctx);
 }
 
-static void md2_clone_wrap(void *dst, const void *src)
-{
+static void md2_clone_wrap(void *dst, const void *src) {
     mbedtls_md2_clone((mbedtls_md2_context *) dst,
                       (const mbedtls_md2_context *) src);
 }
 
-static int md2_process_wrap(void *ctx, const unsigned char *data)
-{
+static int md2_process_wrap(void *ctx, const unsigned char *data) {
     ((void) data);
 
     return (mbedtls_internal_md2_process((mbedtls_md2_context *) ctx));
@@ -137,24 +130,20 @@ const mbedtls_md_info_t mbedtls_md2_info = {
 
 #if defined(MBEDTLS_MD4_C)
 
-static int md4_starts_wrap(void *ctx)
-{
+static int md4_starts_wrap(void *ctx) {
     return (mbedtls_md4_starts_ret((mbedtls_md4_context *) ctx));
 }
 
 static int md4_update_wrap(void *ctx, const unsigned char *input,
-                           size_t ilen)
-{
+                           size_t ilen) {
     return (mbedtls_md4_update_ret((mbedtls_md4_context *) ctx, input, ilen));
 }
 
-static int md4_finish_wrap(void *ctx, unsigned char *output)
-{
+static int md4_finish_wrap(void *ctx, unsigned char *output) {
     return (mbedtls_md4_finish_ret((mbedtls_md4_context *) ctx, output));
 }
 
-static void *md4_ctx_alloc(void)
-{
+static void *md4_ctx_alloc(void) {
     void *ctx = mbedtls_calloc(1, sizeof(mbedtls_md4_context));
 
     if (ctx != NULL)
@@ -163,20 +152,17 @@ static void *md4_ctx_alloc(void)
     return (ctx);
 }
 
-static void md4_ctx_free(void *ctx)
-{
+static void md4_ctx_free(void *ctx) {
     mbedtls_md4_free((mbedtls_md4_context *) ctx);
     mbedtls_free(ctx);
 }
 
-static void md4_clone_wrap(void *dst, const void *src)
-{
+static void md4_clone_wrap(void *dst, const void *src) {
     mbedtls_md4_clone((mbedtls_md4_context *) dst,
                       (const mbedtls_md4_context *) src);
 }
 
-static int md4_process_wrap(void *ctx, const unsigned char *data)
-{
+static int md4_process_wrap(void *ctx, const unsigned char *data) {
     return (mbedtls_internal_md4_process((mbedtls_md4_context *) ctx, data));
 }
 
@@ -199,24 +185,20 @@ const mbedtls_md_info_t mbedtls_md4_info = {
 
 #if defined(MBEDTLS_MD5_C)
 
-static int md5_starts_wrap(void *ctx)
-{
+static int md5_starts_wrap(void *ctx) {
     return (mbedtls_md5_starts_ret((mbedtls_md5_context *) ctx));
 }
 
 static int md5_update_wrap(void *ctx, const unsigned char *input,
-                           size_t ilen)
-{
+                           size_t ilen) {
     return (mbedtls_md5_update_ret((mbedtls_md5_context *) ctx, input, ilen));
 }
 
-static int md5_finish_wrap(void *ctx, unsigned char *output)
-{
+static int md5_finish_wrap(void *ctx, unsigned char *output) {
     return (mbedtls_md5_finish_ret((mbedtls_md5_context *) ctx, output));
 }
 
-static void *md5_ctx_alloc(void)
-{
+static void *md5_ctx_alloc(void) {
     void *ctx = mbedtls_calloc(1, sizeof(mbedtls_md5_context));
 
     if (ctx != NULL)
@@ -225,20 +207,17 @@ static void *md5_ctx_alloc(void)
     return (ctx);
 }
 
-static void md5_ctx_free(void *ctx)
-{
+static void md5_ctx_free(void *ctx) {
     mbedtls_md5_free((mbedtls_md5_context *) ctx);
     mbedtls_free(ctx);
 }
 
-static void md5_clone_wrap(void *dst, const void *src)
-{
+static void md5_clone_wrap(void *dst, const void *src) {
     mbedtls_md5_clone((mbedtls_md5_context *) dst,
                       (const mbedtls_md5_context *) src);
 }
 
-static int md5_process_wrap(void *ctx, const unsigned char *data)
-{
+static int md5_process_wrap(void *ctx, const unsigned char *data) {
     return (mbedtls_internal_md5_process((mbedtls_md5_context *) ctx, data));
 }
 
@@ -261,26 +240,22 @@ const mbedtls_md_info_t mbedtls_md5_info = {
 
 #if defined(MBEDTLS_RIPEMD160_C)
 
-static int ripemd160_starts_wrap(void *ctx)
-{
+static int ripemd160_starts_wrap(void *ctx) {
     return (mbedtls_ripemd160_starts_ret((mbedtls_ripemd160_context *) ctx));
 }
 
 static int ripemd160_update_wrap(void *ctx, const unsigned char *input,
-                                 size_t ilen)
-{
+                                 size_t ilen) {
     return (mbedtls_ripemd160_update_ret((mbedtls_ripemd160_context *) ctx,
                                          input, ilen));
 }
 
-static int ripemd160_finish_wrap(void *ctx, unsigned char *output)
-{
+static int ripemd160_finish_wrap(void *ctx, unsigned char *output) {
     return (mbedtls_ripemd160_finish_ret((mbedtls_ripemd160_context *) ctx,
                                          output));
 }
 
-static void *ripemd160_ctx_alloc(void)
-{
+static void *ripemd160_ctx_alloc(void) {
     void *ctx = mbedtls_calloc(1, sizeof(mbedtls_ripemd160_context));
 
     if (ctx != NULL)
@@ -289,20 +264,17 @@ static void *ripemd160_ctx_alloc(void)
     return (ctx);
 }
 
-static void ripemd160_ctx_free(void *ctx)
-{
+static void ripemd160_ctx_free(void *ctx) {
     mbedtls_ripemd160_free((mbedtls_ripemd160_context *) ctx);
     mbedtls_free(ctx);
 }
 
-static void ripemd160_clone_wrap(void *dst, const void *src)
-{
+static void ripemd160_clone_wrap(void *dst, const void *src) {
     mbedtls_ripemd160_clone((mbedtls_ripemd160_context *) dst,
                             (const mbedtls_ripemd160_context *) src);
 }
 
-static int ripemd160_process_wrap(void *ctx, const unsigned char *data)
-{
+static int ripemd160_process_wrap(void *ctx, const unsigned char *data) {
     return (mbedtls_internal_ripemd160_process(
                 (mbedtls_ripemd160_context *) ctx, data));
 }
@@ -326,25 +298,21 @@ const mbedtls_md_info_t mbedtls_ripemd160_info = {
 
 #if defined(MBEDTLS_SHA1_C)
 
-static int sha1_starts_wrap(void *ctx)
-{
+static int sha1_starts_wrap(void *ctx) {
     return (mbedtls_sha1_starts_ret((mbedtls_sha1_context *) ctx));
 }
 
 static int sha1_update_wrap(void *ctx, const unsigned char *input,
-                            size_t ilen)
-{
+                            size_t ilen) {
     return (mbedtls_sha1_update_ret((mbedtls_sha1_context *) ctx,
                                     input, ilen));
 }
 
-static int sha1_finish_wrap(void *ctx, unsigned char *output)
-{
+static int sha1_finish_wrap(void *ctx, unsigned char *output) {
     return (mbedtls_sha1_finish_ret((mbedtls_sha1_context *) ctx, output));
 }
 
-static void *sha1_ctx_alloc(void)
-{
+static void *sha1_ctx_alloc(void) {
     void *ctx = mbedtls_calloc(1, sizeof(mbedtls_sha1_context));
 
     if (ctx != NULL)
@@ -353,20 +321,17 @@ static void *sha1_ctx_alloc(void)
     return (ctx);
 }
 
-static void sha1_clone_wrap(void *dst, const void *src)
-{
+static void sha1_clone_wrap(void *dst, const void *src) {
     mbedtls_sha1_clone((mbedtls_sha1_context *) dst,
                        (const mbedtls_sha1_context *) src);
 }
 
-static void sha1_ctx_free(void *ctx)
-{
+static void sha1_ctx_free(void *ctx) {
     mbedtls_sha1_free((mbedtls_sha1_context *) ctx);
     mbedtls_free(ctx);
 }
 
-static int sha1_process_wrap(void *ctx, const unsigned char *data)
-{
+static int sha1_process_wrap(void *ctx, const unsigned char *data) {
     return (mbedtls_internal_sha1_process((mbedtls_sha1_context *) ctx,
                                           data));
 }
@@ -393,32 +358,27 @@ const mbedtls_md_info_t mbedtls_sha1_info = {
  */
 #if defined(MBEDTLS_SHA256_C)
 
-static int sha224_starts_wrap(void *ctx)
-{
+static int sha224_starts_wrap(void *ctx) {
     return (mbedtls_sha256_starts_ret((mbedtls_sha256_context *) ctx, 1));
 }
 
 static int sha224_update_wrap(void *ctx, const unsigned char *input,
-                              size_t ilen)
-{
+                              size_t ilen) {
     return (mbedtls_sha256_update_ret((mbedtls_sha256_context *) ctx,
                                       input, ilen));
 }
 
-static int sha224_finish_wrap(void *ctx, unsigned char *output)
-{
+static int sha224_finish_wrap(void *ctx, unsigned char *output) {
     return (mbedtls_sha256_finish_ret((mbedtls_sha256_context *) ctx,
                                       output));
 }
 
 static int sha224_wrap(const unsigned char *input, size_t ilen,
-                       unsigned char *output)
-{
+                       unsigned char *output) {
     return (mbedtls_sha256_ret(input, ilen, output, 1));
 }
 
-static void *sha224_ctx_alloc(void)
-{
+static void *sha224_ctx_alloc(void) {
     void *ctx = mbedtls_calloc(1, sizeof(mbedtls_sha256_context));
 
     if (ctx != NULL)
@@ -427,20 +387,17 @@ static void *sha224_ctx_alloc(void)
     return (ctx);
 }
 
-static void sha224_ctx_free(void *ctx)
-{
+static void sha224_ctx_free(void *ctx) {
     mbedtls_sha256_free((mbedtls_sha256_context *) ctx);
     mbedtls_free(ctx);
 }
 
-static void sha224_clone_wrap(void *dst, const void *src)
-{
+static void sha224_clone_wrap(void *dst, const void *src) {
     mbedtls_sha256_clone((mbedtls_sha256_context *) dst,
                          (const mbedtls_sha256_context *) src);
 }
 
-static int sha224_process_wrap(void *ctx, const unsigned char *data)
-{
+static int sha224_process_wrap(void *ctx, const unsigned char *data) {
     return (mbedtls_internal_sha256_process((mbedtls_sha256_context *) ctx,
                                             data));
 }
@@ -460,14 +417,12 @@ const mbedtls_md_info_t mbedtls_sha224_info = {
     sha224_process_wrap,
 };
 
-static int sha256_starts_wrap(void *ctx)
-{
+static int sha256_starts_wrap(void *ctx) {
     return (mbedtls_sha256_starts_ret((mbedtls_sha256_context *) ctx, 0));
 }
 
 static int sha256_wrap(const unsigned char *input, size_t ilen,
-                       unsigned char *output)
-{
+                       unsigned char *output) {
     return (mbedtls_sha256_ret(input, ilen, output, 0));
 }
 
@@ -490,32 +445,27 @@ const mbedtls_md_info_t mbedtls_sha256_info = {
 
 #if defined(MBEDTLS_SHA512_C)
 
-static int sha384_starts_wrap(void *ctx)
-{
+static int sha384_starts_wrap(void *ctx) {
     return (mbedtls_sha512_starts_ret((mbedtls_sha512_context *) ctx, 1));
 }
 
 static int sha384_update_wrap(void *ctx, const unsigned char *input,
-                              size_t ilen)
-{
+                              size_t ilen) {
     return (mbedtls_sha512_update_ret((mbedtls_sha512_context *) ctx,
                                       input, ilen));
 }
 
-static int sha384_finish_wrap(void *ctx, unsigned char *output)
-{
+static int sha384_finish_wrap(void *ctx, unsigned char *output) {
     return (mbedtls_sha512_finish_ret((mbedtls_sha512_context *) ctx,
                                       output));
 }
 
 static int sha384_wrap(const unsigned char *input, size_t ilen,
-                       unsigned char *output)
-{
+                       unsigned char *output) {
     return (mbedtls_sha512_ret(input, ilen, output, 1));
 }
 
-static void *sha384_ctx_alloc(void)
-{
+static void *sha384_ctx_alloc(void) {
     void *ctx = mbedtls_calloc(1, sizeof(mbedtls_sha512_context));
 
     if (ctx != NULL)
@@ -524,20 +474,17 @@ static void *sha384_ctx_alloc(void)
     return (ctx);
 }
 
-static void sha384_ctx_free(void *ctx)
-{
+static void sha384_ctx_free(void *ctx) {
     mbedtls_sha512_free((mbedtls_sha512_context *) ctx);
     mbedtls_free(ctx);
 }
 
-static void sha384_clone_wrap(void *dst, const void *src)
-{
+static void sha384_clone_wrap(void *dst, const void *src) {
     mbedtls_sha512_clone((mbedtls_sha512_context *) dst,
                          (const mbedtls_sha512_context *) src);
 }
 
-static int sha384_process_wrap(void *ctx, const unsigned char *data)
-{
+static int sha384_process_wrap(void *ctx, const unsigned char *data) {
     return (mbedtls_internal_sha512_process((mbedtls_sha512_context *) ctx,
                                             data));
 }
@@ -557,14 +504,12 @@ const mbedtls_md_info_t mbedtls_sha384_info = {
     sha384_process_wrap,
 };
 
-static int sha512_starts_wrap(void *ctx)
-{
+static int sha512_starts_wrap(void *ctx) {
     return (mbedtls_sha512_starts_ret((mbedtls_sha512_context *) ctx, 0));
 }
 
 static int sha512_wrap(const unsigned char *input, size_t ilen,
-                       unsigned char *output)
-{
+                       unsigned char *output) {
     return (mbedtls_sha512_ret(input, ilen, output, 0));
 }
 
diff --git a/common/mbedtls/oid.c b/common/mbedtls/oid.c
index 41770f593..3c2dc61d2 100644
--- a/common/mbedtls/oid.c
+++ b/common/mbedtls/oid.c
@@ -64,7 +64,7 @@
         if( p == NULL || oid == NULL ) return( NULL );                          \
         while( cur->asn1 != NULL ) {                                            \
             if( cur->asn1_len == oid->len &&                                    \
-                memcmp( cur->asn1, oid->p, oid->len ) == 0 ) {                  \
+                    memcmp( cur->asn1, oid->p, oid->len ) == 0 ) {                  \
                 return( p );                                                    \
             }                                                                   \
             p++;                                                                \
@@ -705,8 +705,7 @@ FN_OID_GET_ATTR2(mbedtls_oid_get_pkcs12_pbe_alg, oid_pkcs12_pbe_alg_t, pkcs12_pb
 
 /* Return the x.y.z.... style numeric string for the given OID */
 int mbedtls_oid_get_numeric_string(char *buf, size_t size,
-                                   const mbedtls_asn1_buf *oid)
-{
+                                   const mbedtls_asn1_buf *oid) {
     int ret;
     size_t i, n;
     unsigned int value;
diff --git a/common/mbedtls/pem.c b/common/mbedtls/pem.c
index 55d529547..5c0f1d1e5 100644
--- a/common/mbedtls/pem.c
+++ b/common/mbedtls/pem.c
@@ -48,8 +48,7 @@
 #endif
 
 #if defined(MBEDTLS_PEM_PARSE_C)
-void mbedtls_pem_init(mbedtls_pem_context *ctx)
-{
+void mbedtls_pem_init(mbedtls_pem_context *ctx) {
     memset(ctx, 0, sizeof(mbedtls_pem_context));
 }
 
@@ -59,8 +58,7 @@ void mbedtls_pem_init(mbedtls_pem_context *ctx)
  * Read a 16-byte hex string and convert it to binary
  */
 static int pem_get_iv(const unsigned char *s, unsigned char *iv,
-                      size_t iv_len)
-{
+                      size_t iv_len) {
     size_t i, j, k;
 
     memset(iv, 0, iv_len);
@@ -82,8 +80,7 @@ static int pem_get_iv(const unsigned char *s, unsigned char *iv,
 
 static int pem_pbkdf1(unsigned char *key, size_t keylen,
                       unsigned char *iv,
-                      const unsigned char *pwd, size_t pwdlen)
-{
+                      const unsigned char *pwd, size_t pwdlen) {
     mbedtls_md5_context md5_ctx;
     unsigned char md5sum[16];
     size_t use_len;
@@ -143,8 +140,7 @@ exit:
  */
 static int pem_des_decrypt(unsigned char des_iv[8],
                            unsigned char *buf, size_t buflen,
-                           const unsigned char *pwd, size_t pwdlen)
-{
+                           const unsigned char *pwd, size_t pwdlen) {
     mbedtls_des_context des_ctx;
     unsigned char des_key[8];
     int ret;
@@ -171,8 +167,7 @@ exit:
  */
 static int pem_des3_decrypt(unsigned char des3_iv[8],
                             unsigned char *buf, size_t buflen,
-                            const unsigned char *pwd, size_t pwdlen)
-{
+                            const unsigned char *pwd, size_t pwdlen) {
     mbedtls_des3_context des3_ctx;
     unsigned char des3_key[24];
     int ret;
@@ -201,8 +196,7 @@ exit:
  */
 static int pem_aes_decrypt(unsigned char aes_iv[16], unsigned int keylen,
                            unsigned char *buf, size_t buflen,
-                           const unsigned char *pwd, size_t pwdlen)
-{
+                           const unsigned char *pwd, size_t pwdlen) {
     mbedtls_aes_context aes_ctx;
     unsigned char aes_key[32];
     int ret;
@@ -230,8 +224,7 @@ exit:
 
 int mbedtls_pem_read_buffer(mbedtls_pem_context *ctx, const char *header, const char *footer,
                             const unsigned char *data, const unsigned char *pwd,
-                            size_t pwdlen, size_t *use_len)
-{
+                            size_t pwdlen, size_t *use_len) {
     int ret, enc;
     size_t len;
     unsigned char *buf;
@@ -412,8 +405,7 @@ int mbedtls_pem_read_buffer(mbedtls_pem_context *ctx, const char *header, const
     return (0);
 }
 
-void mbedtls_pem_free(mbedtls_pem_context *ctx)
-{
+void mbedtls_pem_free(mbedtls_pem_context *ctx) {
     if (ctx->buf != NULL)
         mbedtls_platform_zeroize(ctx->buf, ctx->buflen);
     mbedtls_free(ctx->buf);
@@ -426,8 +418,7 @@ void mbedtls_pem_free(mbedtls_pem_context *ctx)
 #if defined(MBEDTLS_PEM_WRITE_C)
 int mbedtls_pem_write_buffer(const char *header, const char *footer,
                              const unsigned char *der_data, size_t der_len,
-                             unsigned char *buf, size_t buf_len, size_t *olen)
-{
+                             unsigned char *buf, size_t buf_len, size_t *olen) {
     int ret;
     unsigned char *encode_buf = NULL, *c, *p = buf;
     size_t len = 0, use_len, add_len = 0;
@@ -441,7 +432,7 @@ int mbedtls_pem_write_buffer(const char *header, const char *footer,
     }
 
     if (use_len != 0 &&
-        ((encode_buf = mbedtls_calloc(1, use_len)) == NULL))
+            ((encode_buf = mbedtls_calloc(1, use_len)) == NULL))
         return (MBEDTLS_ERR_PEM_ALLOC_FAILED);
 
     if ((ret = mbedtls_base64_encode(encode_buf, use_len, &use_len, der_data,
diff --git a/common/mbedtls/pk.c b/common/mbedtls/pk.c
index 72887d9ce..09ff8d193 100644
--- a/common/mbedtls/pk.c
+++ b/common/mbedtls/pk.c
@@ -49,8 +49,7 @@
 /*
  * Initialise a mbedtls_pk_context
  */
-void mbedtls_pk_init(mbedtls_pk_context *ctx)
-{
+void mbedtls_pk_init(mbedtls_pk_context *ctx) {
     if (ctx == NULL)
         return;
 
@@ -61,8 +60,7 @@ void mbedtls_pk_init(mbedtls_pk_context *ctx)
 /*
  * Free (the components of) a mbedtls_pk_context
  */
-void mbedtls_pk_free(mbedtls_pk_context *ctx)
-{
+void mbedtls_pk_free(mbedtls_pk_context *ctx) {
     if (ctx == NULL || ctx->pk_info == NULL)
         return;
 
@@ -74,8 +72,7 @@ void mbedtls_pk_free(mbedtls_pk_context *ctx)
 /*
  * Get pk_info structure from type
  */
-const mbedtls_pk_info_t *mbedtls_pk_info_from_type(mbedtls_pk_type_t pk_type)
-{
+const mbedtls_pk_info_t *mbedtls_pk_info_from_type(mbedtls_pk_type_t pk_type) {
     switch (pk_type) {
 #if defined(MBEDTLS_RSA_C)
         case MBEDTLS_PK_RSA:
@@ -100,8 +97,7 @@ const mbedtls_pk_info_t *mbedtls_pk_info_from_type(mbedtls_pk_type_t pk_type)
 /*
  * Initialise context
  */
-int mbedtls_pk_setup(mbedtls_pk_context *ctx, const mbedtls_pk_info_t *info)
-{
+int mbedtls_pk_setup(mbedtls_pk_context *ctx, const mbedtls_pk_info_t *info) {
     if (ctx == NULL || info == NULL || ctx->pk_info != NULL)
         return (MBEDTLS_ERR_PK_BAD_INPUT_DATA);
 
@@ -120,8 +116,7 @@ int mbedtls_pk_setup(mbedtls_pk_context *ctx, const mbedtls_pk_info_t *info)
 int mbedtls_pk_setup_rsa_alt(mbedtls_pk_context *ctx, void *key,
                              mbedtls_pk_rsa_alt_decrypt_func decrypt_func,
                              mbedtls_pk_rsa_alt_sign_func sign_func,
-                             mbedtls_pk_rsa_alt_key_len_func key_len_func)
-{
+                             mbedtls_pk_rsa_alt_key_len_func key_len_func) {
     mbedtls_rsa_alt_context *rsa_alt;
     const mbedtls_pk_info_t *info = &mbedtls_rsa_alt_info;
 
@@ -147,8 +142,7 @@ int mbedtls_pk_setup_rsa_alt(mbedtls_pk_context *ctx, void *key,
 /*
  * Tell if a PK can do the operations of the given type
  */
-int mbedtls_pk_can_do(const mbedtls_pk_context *ctx, mbedtls_pk_type_t type)
-{
+int mbedtls_pk_can_do(const mbedtls_pk_context *ctx, mbedtls_pk_type_t type) {
     /* null or NONE context can't do anything */
     if (ctx == NULL || ctx->pk_info == NULL)
         return (0);
@@ -159,8 +153,7 @@ int mbedtls_pk_can_do(const mbedtls_pk_context *ctx, mbedtls_pk_type_t type)
 /*
  * Helper for mbedtls_pk_sign and mbedtls_pk_verify
  */
-static inline int pk_hashlen_helper(mbedtls_md_type_t md_alg, size_t *hash_len)
-{
+static inline int pk_hashlen_helper(mbedtls_md_type_t md_alg, size_t *hash_len) {
     const mbedtls_md_info_t *md_info;
 
     if (*hash_len != 0)
@@ -178,10 +171,9 @@ static inline int pk_hashlen_helper(mbedtls_md_type_t md_alg, size_t *hash_len)
  */
 int mbedtls_pk_verify(mbedtls_pk_context *ctx, mbedtls_md_type_t md_alg,
                       const unsigned char *hash, size_t hash_len,
-                      const unsigned char *sig, size_t sig_len)
-{
+                      const unsigned char *sig, size_t sig_len) {
     if (ctx == NULL || ctx->pk_info == NULL ||
-        pk_hashlen_helper(md_alg, &hash_len) != 0)
+            pk_hashlen_helper(md_alg, &hash_len) != 0)
         return (MBEDTLS_ERR_PK_BAD_INPUT_DATA);
 
     if (ctx->pk_info->verify_func == NULL)
@@ -197,8 +189,7 @@ int mbedtls_pk_verify(mbedtls_pk_context *ctx, mbedtls_md_type_t md_alg,
 int mbedtls_pk_verify_ext(mbedtls_pk_type_t type, const void *options,
                           mbedtls_pk_context *ctx, mbedtls_md_type_t md_alg,
                           const unsigned char *hash, size_t hash_len,
-                          const unsigned char *sig, size_t sig_len)
-{
+                          const unsigned char *sig, size_t sig_len) {
     if (ctx == NULL || ctx->pk_info == NULL)
         return (MBEDTLS_ERR_PK_BAD_INPUT_DATA);
 
@@ -254,10 +245,9 @@ int mbedtls_pk_verify_ext(mbedtls_pk_type_t type, const void *options,
 int mbedtls_pk_sign(mbedtls_pk_context *ctx, mbedtls_md_type_t md_alg,
                     const unsigned char *hash, size_t hash_len,
                     unsigned char *sig, size_t *sig_len,
-                    int (*f_rng)(void *, unsigned char *, size_t), void *p_rng)
-{
+                    int (*f_rng)(void *, unsigned char *, size_t), void *p_rng) {
     if (ctx == NULL || ctx->pk_info == NULL ||
-        pk_hashlen_helper(md_alg, &hash_len) != 0)
+            pk_hashlen_helper(md_alg, &hash_len) != 0)
         return (MBEDTLS_ERR_PK_BAD_INPUT_DATA);
 
     if (ctx->pk_info->sign_func == NULL)
@@ -273,8 +263,7 @@ int mbedtls_pk_sign(mbedtls_pk_context *ctx, mbedtls_md_type_t md_alg,
 int mbedtls_pk_decrypt(mbedtls_pk_context *ctx,
                        const unsigned char *input, size_t ilen,
                        unsigned char *output, size_t *olen, size_t osize,
-                       int (*f_rng)(void *, unsigned char *, size_t), void *p_rng)
-{
+                       int (*f_rng)(void *, unsigned char *, size_t), void *p_rng) {
     if (ctx == NULL || ctx->pk_info == NULL)
         return (MBEDTLS_ERR_PK_BAD_INPUT_DATA);
 
@@ -291,8 +280,7 @@ int mbedtls_pk_decrypt(mbedtls_pk_context *ctx,
 int mbedtls_pk_encrypt(mbedtls_pk_context *ctx,
                        const unsigned char *input, size_t ilen,
                        unsigned char *output, size_t *olen, size_t osize,
-                       int (*f_rng)(void *, unsigned char *, size_t), void *p_rng)
-{
+                       int (*f_rng)(void *, unsigned char *, size_t), void *p_rng) {
     if (ctx == NULL || ctx->pk_info == NULL)
         return (MBEDTLS_ERR_PK_BAD_INPUT_DATA);
 
@@ -306,11 +294,10 @@ int mbedtls_pk_encrypt(mbedtls_pk_context *ctx,
 /*
  * Check public-private key pair
  */
-int mbedtls_pk_check_pair(const mbedtls_pk_context *pub, const mbedtls_pk_context *prv)
-{
+int mbedtls_pk_check_pair(const mbedtls_pk_context *pub, const mbedtls_pk_context *prv) {
     if (pub == NULL || pub->pk_info == NULL ||
-        prv == NULL || prv->pk_info == NULL ||
-        prv->pk_info->check_pair_func == NULL) {
+            prv == NULL || prv->pk_info == NULL ||
+            prv->pk_info->check_pair_func == NULL) {
         return (MBEDTLS_ERR_PK_BAD_INPUT_DATA);
     }
 
@@ -328,8 +315,7 @@ int mbedtls_pk_check_pair(const mbedtls_pk_context *pub, const mbedtls_pk_contex
 /*
  * Get key size in bits
  */
-size_t mbedtls_pk_get_bitlen(const mbedtls_pk_context *ctx)
-{
+size_t mbedtls_pk_get_bitlen(const mbedtls_pk_context *ctx) {
     if (ctx == NULL || ctx->pk_info == NULL)
         return (0);
 
@@ -339,8 +325,7 @@ size_t mbedtls_pk_get_bitlen(const mbedtls_pk_context *ctx)
 /*
  * Export debug information
  */
-int mbedtls_pk_debug(const mbedtls_pk_context *ctx, mbedtls_pk_debug_item *items)
-{
+int mbedtls_pk_debug(const mbedtls_pk_context *ctx, mbedtls_pk_debug_item *items) {
     if (ctx == NULL || ctx->pk_info == NULL)
         return (MBEDTLS_ERR_PK_BAD_INPUT_DATA);
 
@@ -354,8 +339,7 @@ int mbedtls_pk_debug(const mbedtls_pk_context *ctx, mbedtls_pk_debug_item *items
 /*
  * Access the PK type name
  */
-const char *mbedtls_pk_get_name(const mbedtls_pk_context *ctx)
-{
+const char *mbedtls_pk_get_name(const mbedtls_pk_context *ctx) {
     if (ctx == NULL || ctx->pk_info == NULL)
         return ("invalid PK");
 
@@ -365,8 +349,7 @@ const char *mbedtls_pk_get_name(const mbedtls_pk_context *ctx)
 /*
  * Access the PK type
  */
-mbedtls_pk_type_t mbedtls_pk_get_type(const mbedtls_pk_context *ctx)
-{
+mbedtls_pk_type_t mbedtls_pk_get_type(const mbedtls_pk_context *ctx) {
     if (ctx == NULL || ctx->pk_info == NULL)
         return (MBEDTLS_PK_NONE);
 
diff --git a/common/mbedtls/pk.h b/common/mbedtls/pk.h
index 3b5de00f2..afe0783ad 100644
--- a/common/mbedtls/pk.h
+++ b/common/mbedtls/pk.h
@@ -136,8 +136,7 @@ typedef struct mbedtls_pk_context {
  * \warning You must make sure the PK context actually holds an RSA context
  * before using this function!
  */
-static inline mbedtls_rsa_context *mbedtls_pk_rsa(const mbedtls_pk_context pk)
-{
+static inline mbedtls_rsa_context *mbedtls_pk_rsa(const mbedtls_pk_context pk) {
     return ((mbedtls_rsa_context *)(pk).pk_ctx);
 }
 #endif /* MBEDTLS_RSA_C */
@@ -149,8 +148,7 @@ static inline mbedtls_rsa_context *mbedtls_pk_rsa(const mbedtls_pk_context pk)
  * \warning You must make sure the PK context actually holds an EC context
  * before using this function!
  */
-static inline mbedtls_ecp_keypair *mbedtls_pk_ec(const mbedtls_pk_context pk)
-{
+static inline mbedtls_ecp_keypair *mbedtls_pk_ec(const mbedtls_pk_context pk) {
     return ((mbedtls_ecp_keypair *)(pk).pk_ctx);
 }
 #endif /* MBEDTLS_ECP_C */
@@ -240,8 +238,7 @@ size_t mbedtls_pk_get_bitlen(const mbedtls_pk_context *ctx);
  *
  * \return          Key length in bytes, or 0 on error
  */
-static inline size_t mbedtls_pk_get_len(const mbedtls_pk_context *ctx)
-{
+static inline size_t mbedtls_pk_get_len(const mbedtls_pk_context *ctx) {
     return ((mbedtls_pk_get_bitlen(ctx) + 7) / 8);
 }
 
diff --git a/common/mbedtls/pk_wrap.c b/common/mbedtls/pk_wrap.c
index fdf4224ba..e83cbeac5 100644
--- a/common/mbedtls/pk_wrap.c
+++ b/common/mbedtls/pk_wrap.c
@@ -59,22 +59,19 @@
 #include <stdint.h>
 
 #if defined(MBEDTLS_RSA_C)
-static int rsa_can_do(mbedtls_pk_type_t type)
-{
+static int rsa_can_do(mbedtls_pk_type_t type) {
     return (type == MBEDTLS_PK_RSA ||
             type == MBEDTLS_PK_RSASSA_PSS);
 }
 
-static size_t rsa_get_bitlen(const void *ctx)
-{
+static size_t rsa_get_bitlen(const void *ctx) {
     const mbedtls_rsa_context *rsa = (const mbedtls_rsa_context *) ctx;
     return (8 * mbedtls_rsa_get_len(rsa));
 }
 
 static int rsa_verify_wrap(void *ctx, mbedtls_md_type_t md_alg,
                            const unsigned char *hash, size_t hash_len,
-                           const unsigned char *sig, size_t sig_len)
-{
+                           const unsigned char *sig, size_t sig_len) {
     int ret;
     mbedtls_rsa_context *rsa = (mbedtls_rsa_context *) ctx;
     size_t rsa_len = mbedtls_rsa_get_len(rsa);
@@ -106,8 +103,7 @@ static int rsa_verify_wrap(void *ctx, mbedtls_md_type_t md_alg,
 static int rsa_sign_wrap(void *ctx, mbedtls_md_type_t md_alg,
                          const unsigned char *hash, size_t hash_len,
                          unsigned char *sig, size_t *sig_len,
-                         int (*f_rng)(void *, unsigned char *, size_t), void *p_rng)
-{
+                         int (*f_rng)(void *, unsigned char *, size_t), void *p_rng) {
     mbedtls_rsa_context *rsa = (mbedtls_rsa_context *) ctx;
 
 #if SIZE_MAX > UINT_MAX
@@ -124,8 +120,7 @@ static int rsa_sign_wrap(void *ctx, mbedtls_md_type_t md_alg,
 static int rsa_decrypt_wrap(void *ctx,
                             const unsigned char *input, size_t ilen,
                             unsigned char *output, size_t *olen, size_t osize,
-                            int (*f_rng)(void *, unsigned char *, size_t), void *p_rng)
-{
+                            int (*f_rng)(void *, unsigned char *, size_t), void *p_rng) {
     mbedtls_rsa_context *rsa = (mbedtls_rsa_context *) ctx;
 
     if (ilen != mbedtls_rsa_get_len(rsa))
@@ -138,8 +133,7 @@ static int rsa_decrypt_wrap(void *ctx,
 static int rsa_encrypt_wrap(void *ctx,
                             const unsigned char *input, size_t ilen,
                             unsigned char *output, size_t *olen, size_t osize,
-                            int (*f_rng)(void *, unsigned char *, size_t), void *p_rng)
-{
+                            int (*f_rng)(void *, unsigned char *, size_t), void *p_rng) {
     mbedtls_rsa_context *rsa = (mbedtls_rsa_context *) ctx;
     *olen = mbedtls_rsa_get_len(rsa);
 
@@ -150,14 +144,12 @@ static int rsa_encrypt_wrap(void *ctx,
                                       ilen, input, output));
 }
 
-static int rsa_check_pair_wrap(const void *pub, const void *prv)
-{
+static int rsa_check_pair_wrap(const void *pub, const void *prv) {
     return (mbedtls_rsa_check_pub_priv((const mbedtls_rsa_context *) pub,
                                        (const mbedtls_rsa_context *) prv));
 }
 
-static void *rsa_alloc_wrap(void)
-{
+static void *rsa_alloc_wrap(void) {
     void *ctx = mbedtls_calloc(1, sizeof(mbedtls_rsa_context));
 
     if (ctx != NULL)
@@ -166,14 +158,12 @@ static void *rsa_alloc_wrap(void)
     return (ctx);
 }
 
-static void rsa_free_wrap(void *ctx)
-{
+static void rsa_free_wrap(void *ctx) {
     mbedtls_rsa_free((mbedtls_rsa_context *) ctx);
     mbedtls_free(ctx);
 }
 
-static void rsa_debug(const void *ctx, mbedtls_pk_debug_item *items)
-{
+static void rsa_debug(const void *ctx, mbedtls_pk_debug_item *items) {
     items->type = MBEDTLS_PK_DEBUG_MPI;
     items->name = "rsa.N";
     items->value = &(((mbedtls_rsa_context *) ctx)->N);
@@ -205,15 +195,13 @@ const mbedtls_pk_info_t mbedtls_rsa_info = {
 /*
  * Generic EC key
  */
-static int eckey_can_do(mbedtls_pk_type_t type)
-{
+static int eckey_can_do(mbedtls_pk_type_t type) {
     return (type == MBEDTLS_PK_ECKEY ||
             type == MBEDTLS_PK_ECKEY_DH ||
             type == MBEDTLS_PK_ECDSA);
 }
 
-static size_t eckey_get_bitlen(const void *ctx)
-{
+static size_t eckey_get_bitlen(const void *ctx) {
     return (((mbedtls_ecp_keypair *) ctx)->grp.pbits);
 }
 
@@ -230,8 +218,7 @@ static int ecdsa_sign_wrap(void *ctx, mbedtls_md_type_t md_alg,
 
 static int eckey_verify_wrap(void *ctx, mbedtls_md_type_t md_alg,
                              const unsigned char *hash, size_t hash_len,
-                             const unsigned char *sig, size_t sig_len)
-{
+                             const unsigned char *sig, size_t sig_len) {
     int ret;
     mbedtls_ecdsa_context ecdsa;
 
@@ -248,8 +235,7 @@ static int eckey_verify_wrap(void *ctx, mbedtls_md_type_t md_alg,
 static int eckey_sign_wrap(void *ctx, mbedtls_md_type_t md_alg,
                            const unsigned char *hash, size_t hash_len,
                            unsigned char *sig, size_t *sig_len,
-                           int (*f_rng)(void *, unsigned char *, size_t), void *p_rng)
-{
+                           int (*f_rng)(void *, unsigned char *, size_t), void *p_rng) {
     int ret;
     mbedtls_ecdsa_context ecdsa;
 
@@ -266,14 +252,12 @@ static int eckey_sign_wrap(void *ctx, mbedtls_md_type_t md_alg,
 
 #endif /* MBEDTLS_ECDSA_C */
 
-static int eckey_check_pair(const void *pub, const void *prv)
-{
+static int eckey_check_pair(const void *pub, const void *prv) {
     return (mbedtls_ecp_check_pub_priv((const mbedtls_ecp_keypair *) pub,
                                        (const mbedtls_ecp_keypair *) prv));
 }
 
-static void *eckey_alloc_wrap(void)
-{
+static void *eckey_alloc_wrap(void) {
     void *ctx = mbedtls_calloc(1, sizeof(mbedtls_ecp_keypair));
 
     if (ctx != NULL)
@@ -282,14 +266,12 @@ static void *eckey_alloc_wrap(void)
     return (ctx);
 }
 
-static void eckey_free_wrap(void *ctx)
-{
+static void eckey_free_wrap(void *ctx) {
     mbedtls_ecp_keypair_free((mbedtls_ecp_keypair *) ctx);
     mbedtls_free(ctx);
 }
 
-static void eckey_debug(const void *ctx, mbedtls_pk_debug_item *items)
-{
+static void eckey_debug(const void *ctx, mbedtls_pk_debug_item *items) {
     items->type = MBEDTLS_PK_DEBUG_ECP;
     items->name = "eckey.Q";
     items->value = &(((mbedtls_ecp_keypair *) ctx)->Q);
@@ -318,8 +300,7 @@ const mbedtls_pk_info_t mbedtls_eckey_info = {
 /*
  * EC key restricted to ECDH
  */
-static int eckeydh_can_do(mbedtls_pk_type_t type)
-{
+static int eckeydh_can_do(mbedtls_pk_type_t type) {
     return (type == MBEDTLS_PK_ECKEY ||
             type == MBEDTLS_PK_ECKEY_DH);
 }
@@ -341,15 +322,13 @@ const mbedtls_pk_info_t mbedtls_eckeydh_info = {
 #endif /* MBEDTLS_ECP_C */
 
 #if defined(MBEDTLS_ECDSA_C)
-static int ecdsa_can_do(mbedtls_pk_type_t type)
-{
+static int ecdsa_can_do(mbedtls_pk_type_t type) {
     return (type == MBEDTLS_PK_ECDSA);
 }
 
 static int ecdsa_verify_wrap(void *ctx, mbedtls_md_type_t md_alg,
                              const unsigned char *hash, size_t hash_len,
-                             const unsigned char *sig, size_t sig_len)
-{
+                             const unsigned char *sig, size_t sig_len) {
     int ret;
     ((void) md_alg);
 
@@ -365,14 +344,12 @@ static int ecdsa_verify_wrap(void *ctx, mbedtls_md_type_t md_alg,
 static int ecdsa_sign_wrap(void *ctx, mbedtls_md_type_t md_alg,
                            const unsigned char *hash, size_t hash_len,
                            unsigned char *sig, size_t *sig_len,
-                           int (*f_rng)(void *, unsigned char *, size_t), void *p_rng)
-{
+                           int (*f_rng)(void *, unsigned char *, size_t), void *p_rng) {
     return (mbedtls_ecdsa_write_signature((mbedtls_ecdsa_context *) ctx,
                                           md_alg, hash, hash_len, sig, sig_len, f_rng, p_rng));
 }
 
-static void *ecdsa_alloc_wrap(void)
-{
+static void *ecdsa_alloc_wrap(void) {
     void *ctx = mbedtls_calloc(1, sizeof(mbedtls_ecdsa_context));
 
     if (ctx != NULL)
@@ -381,8 +358,7 @@ static void *ecdsa_alloc_wrap(void)
     return (ctx);
 }
 
-static void ecdsa_free_wrap(void *ctx)
-{
+static void ecdsa_free_wrap(void *ctx) {
     mbedtls_ecdsa_free((mbedtls_ecdsa_context *) ctx);
     mbedtls_free(ctx);
 }
@@ -408,13 +384,11 @@ const mbedtls_pk_info_t mbedtls_ecdsa_info = {
  * Support for alternative RSA-private implementations
  */
 
-static int rsa_alt_can_do(mbedtls_pk_type_t type)
-{
+static int rsa_alt_can_do(mbedtls_pk_type_t type) {
     return (type == MBEDTLS_PK_RSA);
 }
 
-static size_t rsa_alt_get_bitlen(const void *ctx)
-{
+static size_t rsa_alt_get_bitlen(const void *ctx) {
     const mbedtls_rsa_alt_context *rsa_alt = (const mbedtls_rsa_alt_context *) ctx;
 
     return (8 * rsa_alt->key_len_func(rsa_alt->key));
@@ -423,8 +397,7 @@ static size_t rsa_alt_get_bitlen(const void *ctx)
 static int rsa_alt_sign_wrap(void *ctx, mbedtls_md_type_t md_alg,
                              const unsigned char *hash, size_t hash_len,
                              unsigned char *sig, size_t *sig_len,
-                             int (*f_rng)(void *, unsigned char *, size_t), void *p_rng)
-{
+                             int (*f_rng)(void *, unsigned char *, size_t), void *p_rng) {
     mbedtls_rsa_alt_context *rsa_alt = (mbedtls_rsa_alt_context *) ctx;
 
 #if SIZE_MAX > UINT_MAX
@@ -441,8 +414,7 @@ static int rsa_alt_sign_wrap(void *ctx, mbedtls_md_type_t md_alg,
 static int rsa_alt_decrypt_wrap(void *ctx,
                                 const unsigned char *input, size_t ilen,
                                 unsigned char *output, size_t *olen, size_t osize,
-                                int (*f_rng)(void *, unsigned char *, size_t), void *p_rng)
-{
+                                int (*f_rng)(void *, unsigned char *, size_t), void *p_rng) {
     mbedtls_rsa_alt_context *rsa_alt = (mbedtls_rsa_alt_context *) ctx;
 
     ((void) f_rng);
@@ -456,8 +428,7 @@ static int rsa_alt_decrypt_wrap(void *ctx,
 }
 
 #if defined(MBEDTLS_RSA_C)
-static int rsa_alt_check_pair(const void *pub, const void *prv)
-{
+static int rsa_alt_check_pair(const void *pub, const void *prv) {
     unsigned char sig[MBEDTLS_MPI_MAX_SIZE];
     unsigned char hash[32];
     size_t sig_len = 0;
@@ -483,8 +454,7 @@ static int rsa_alt_check_pair(const void *pub, const void *prv)
 }
 #endif /* MBEDTLS_RSA_C */
 
-static void *rsa_alt_alloc_wrap(void)
-{
+static void *rsa_alt_alloc_wrap(void) {
     void *ctx = mbedtls_calloc(1, sizeof(mbedtls_rsa_alt_context));
 
     if (ctx != NULL)
@@ -493,8 +463,7 @@ static void *rsa_alt_alloc_wrap(void)
     return (ctx);
 }
 
-static void rsa_alt_free_wrap(void *ctx)
-{
+static void rsa_alt_free_wrap(void *ctx) {
     mbedtls_platform_zeroize(ctx, sizeof(mbedtls_rsa_alt_context));
     mbedtls_free(ctx);
 }
diff --git a/common/mbedtls/pkcs12.c b/common/mbedtls/pkcs12.c
index a3d1c81ad..eb15881be 100644
--- a/common/mbedtls/pkcs12.c
+++ b/common/mbedtls/pkcs12.c
@@ -51,8 +51,7 @@
 #endif
 
 static int pkcs12_parse_pbe_params(mbedtls_asn1_buf *params,
-                                   mbedtls_asn1_buf *salt, int *iterations)
-{
+                                   mbedtls_asn1_buf *salt, int *iterations) {
     int ret;
     unsigned char **p = &params->p;
     const unsigned char *end = params->p + params->len;
@@ -89,8 +88,7 @@ static int pkcs12_parse_pbe_params(mbedtls_asn1_buf *params,
 static int pkcs12_pbe_derive_key_iv(mbedtls_asn1_buf *pbe_params, mbedtls_md_type_t md_type,
                                     const unsigned char *pwd,  size_t pwdlen,
                                     unsigned char *key, size_t keylen,
-                                    unsigned char *iv,  size_t ivlen)
-{
+                                    unsigned char *iv,  size_t ivlen) {
     int ret, iterations = 0;
     mbedtls_asn1_buf salt;
     size_t i;
@@ -131,8 +129,7 @@ static int pkcs12_pbe_derive_key_iv(mbedtls_asn1_buf *pbe_params, mbedtls_md_typ
 int mbedtls_pkcs12_pbe_sha1_rc4_128(mbedtls_asn1_buf *pbe_params, int mode,
                                     const unsigned char *pwd,  size_t pwdlen,
                                     const unsigned char *data, size_t len,
-                                    unsigned char *output)
-{
+                                    unsigned char *output) {
 #if !defined(MBEDTLS_ARC4_C)
     ((void) pbe_params);
     ((void) mode);
@@ -172,8 +169,7 @@ int mbedtls_pkcs12_pbe(mbedtls_asn1_buf *pbe_params, int mode,
                        mbedtls_cipher_type_t cipher_type, mbedtls_md_type_t md_type,
                        const unsigned char *pwd,  size_t pwdlen,
                        const unsigned char *data, size_t len,
-                       unsigned char *output)
-{
+                       unsigned char *output) {
     int ret, keylen = 0;
     unsigned char key[32];
     unsigned char iv[16];
@@ -224,8 +220,7 @@ exit:
 }
 
 static void pkcs12_fill_buffer(unsigned char *data, size_t data_len,
-                               const unsigned char *filler, size_t fill_len)
-{
+                               const unsigned char *filler, size_t fill_len) {
     unsigned char *p = data;
     size_t use_len;
 
@@ -240,8 +235,7 @@ static void pkcs12_fill_buffer(unsigned char *data, size_t data_len,
 int mbedtls_pkcs12_derivation(unsigned char *data, size_t datalen,
                               const unsigned char *pwd, size_t pwdlen,
                               const unsigned char *salt, size_t saltlen,
-                              mbedtls_md_type_t md_type, int id, int iterations)
-{
+                              mbedtls_md_type_t md_type, int id, int iterations) {
     int ret;
     unsigned int j;
 
diff --git a/common/mbedtls/pkcs5.c b/common/mbedtls/pkcs5.c
index f6d3b9612..1dd2478ef 100644
--- a/common/mbedtls/pkcs5.c
+++ b/common/mbedtls/pkcs5.c
@@ -60,8 +60,7 @@
 int mbedtls_pkcs5_pbes2(const mbedtls_asn1_buf *pbe_params, int mode,
                         const unsigned char *pwd,  size_t pwdlen,
                         const unsigned char *data, size_t datalen,
-                        unsigned char *output)
-{
+                        unsigned char *output) {
     ((void) pbe_params);
     ((void) mode);
     ((void) pwd);
@@ -74,8 +73,7 @@ int mbedtls_pkcs5_pbes2(const mbedtls_asn1_buf *pbe_params, int mode,
 #else
 static int pkcs5_parse_pbkdf2_params(const mbedtls_asn1_buf *params,
                                      mbedtls_asn1_buf *salt, int *iterations,
-                                     int *keylen, mbedtls_md_type_t *md_type)
-{
+                                     int *keylen, mbedtls_md_type_t *md_type) {
     int ret;
     mbedtls_asn1_buf prf_alg_oid;
     unsigned char *p = params->p;
@@ -129,8 +127,7 @@ static int pkcs5_parse_pbkdf2_params(const mbedtls_asn1_buf *params,
 int mbedtls_pkcs5_pbes2(const mbedtls_asn1_buf *pbe_params, int mode,
                         const unsigned char *pwd,  size_t pwdlen,
                         const unsigned char *data, size_t datalen,
-                        unsigned char *output)
-{
+                        unsigned char *output) {
     int ret, iterations = 0, keylen = 0;
     unsigned char *p, *end;
     mbedtls_asn1_buf kdf_alg_oid, enc_scheme_oid, kdf_alg_params, enc_scheme_params;
@@ -194,7 +191,7 @@ int mbedtls_pkcs5_pbes2(const mbedtls_asn1_buf *pbe_params, int mode,
     keylen = cipher_info->key_bitlen / 8;
 
     if (enc_scheme_params.tag != MBEDTLS_ASN1_OCTET_STRING ||
-        enc_scheme_params.len != cipher_info->iv_size) {
+            enc_scheme_params.len != cipher_info->iv_size) {
         return (MBEDTLS_ERR_PKCS5_INVALID_FORMAT);
     }
 
@@ -232,8 +229,7 @@ exit:
 int mbedtls_pkcs5_pbkdf2_hmac(mbedtls_md_context_t *ctx, const unsigned char *password,
                               size_t plen, const unsigned char *salt, size_t slen,
                               unsigned int iteration_count,
-                              uint32_t key_length, unsigned char *output)
-{
+                              uint32_t key_length, unsigned char *output) {
     int ret, j;
     unsigned int i;
     unsigned char md1[MBEDTLS_MD_MAX_SIZE];
@@ -303,8 +299,7 @@ int mbedtls_pkcs5_pbkdf2_hmac(mbedtls_md_context_t *ctx, const unsigned char *pa
 #if defined(MBEDTLS_SELF_TEST)
 
 #if !defined(MBEDTLS_SHA1_C)
-int mbedtls_pkcs5_self_test(int verbose)
-{
+int mbedtls_pkcs5_self_test(int verbose) {
     if (verbose != 0)
         mbedtls_printf("  PBKDF2 (SHA1): skipped\n\n");
 
@@ -370,8 +365,7 @@ static const unsigned char result_key[MAX_TESTS][32] = {
     },
 };
 
-int mbedtls_pkcs5_self_test(int verbose)
-{
+int mbedtls_pkcs5_self_test(int verbose) {
     mbedtls_md_context_t sha1_ctx;
     const mbedtls_md_info_t *info_sha1;
     int ret, i;
@@ -397,7 +391,7 @@ int mbedtls_pkcs5_self_test(int verbose)
         ret = mbedtls_pkcs5_pbkdf2_hmac(&sha1_ctx, password[i], plen[i], salt[i],
                                         slen[i], it_cnt[i], key_len[i], key);
         if (ret != 0 ||
-            memcmp(result_key[i], key, key_len[i]) != 0) {
+                memcmp(result_key[i], key, key_len[i]) != 0) {
             if (verbose != 0)
                 mbedtls_printf("failed\n");
 
diff --git a/common/mbedtls/pkparse.c b/common/mbedtls/pkparse.c
index 8a2725f12..9b1ded1b2 100644
--- a/common/mbedtls/pkparse.c
+++ b/common/mbedtls/pkparse.c
@@ -71,8 +71,7 @@
  * A terminating null byte is always appended. It is included in the announced
  * length only if the data looks like it is PEM encoded.
  */
-int mbedtls_pk_load_file(const char *path, unsigned char **buf, size_t *n)
-{
+int mbedtls_pk_load_file(const char *path, unsigned char **buf, size_t *n) {
     FILE *f;
     long size;
 
@@ -89,7 +88,7 @@ int mbedtls_pk_load_file(const char *path, unsigned char **buf, size_t *n)
     *n = (size_t) size;
 
     if (*n + 1 == 0 ||
-        (*buf = mbedtls_calloc(1, *n + 1)) == NULL) {
+            (*buf = mbedtls_calloc(1, *n + 1)) == NULL) {
         fclose(f);
         return (MBEDTLS_ERR_PK_ALLOC_FAILED);
     }
@@ -117,8 +116,7 @@ int mbedtls_pk_load_file(const char *path, unsigned char **buf, size_t *n)
  * Load and parse a private key
  */
 int mbedtls_pk_parse_keyfile(mbedtls_pk_context *ctx,
-                             const char *path, const char *pwd)
-{
+                             const char *path, const char *pwd) {
     int ret;
     size_t n;
     unsigned char *buf;
@@ -141,8 +139,7 @@ int mbedtls_pk_parse_keyfile(mbedtls_pk_context *ctx,
 /*
  * Load and parse a public key
  */
-int mbedtls_pk_parse_public_keyfile(mbedtls_pk_context *ctx, const char *path)
-{
+int mbedtls_pk_parse_public_keyfile(mbedtls_pk_context *ctx, const char *path) {
     int ret;
     size_t n;
     unsigned char *buf;
@@ -169,8 +166,7 @@ int mbedtls_pk_parse_public_keyfile(mbedtls_pk_context *ctx, const char *path)
  * }
  */
 static int pk_get_ecparams(unsigned char **p, const unsigned char *end,
-                           mbedtls_asn1_buf *params)
-{
+                           mbedtls_asn1_buf *params) {
     int ret;
 
     if (end - *p < 1)
@@ -181,7 +177,7 @@ static int pk_get_ecparams(unsigned char **p, const unsigned char *end,
     params->tag = **p;
     if (params->tag != MBEDTLS_ASN1_OID
 #if defined(MBEDTLS_PK_PARSE_EC_EXTENDED)
-        && params->tag != (MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE)
+            && params->tag != (MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE)
 #endif
        ) {
         return (MBEDTLS_ERR_PK_KEY_INVALID_FORMAT +
@@ -222,8 +218,7 @@ static int pk_get_ecparams(unsigned char **p, const unsigned char *end,
  *
  * We only support prime-field as field type, and ignore hash and cofactor.
  */
-static int pk_group_from_specified(const mbedtls_asn1_buf *params, mbedtls_ecp_group *grp)
-{
+static int pk_group_from_specified(const mbedtls_asn1_buf *params, mbedtls_ecp_group *grp) {
     int ret;
     unsigned char *p = params->p;
     const unsigned char *const end = params->p + params->len;
@@ -262,7 +257,7 @@ static int pk_group_from_specified(const mbedtls_asn1_buf *params, mbedtls_ecp_g
         return (ret);
 
     if (len != MBEDTLS_OID_SIZE(MBEDTLS_OID_ANSI_X9_62_PRIME_FIELD) ||
-        memcmp(p, MBEDTLS_OID_ANSI_X9_62_PRIME_FIELD, len) != 0) {
+            memcmp(p, MBEDTLS_OID_ANSI_X9_62_PRIME_FIELD, len) != 0) {
         return (MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE);
     }
 
@@ -298,14 +293,14 @@ static int pk_group_from_specified(const mbedtls_asn1_buf *params, mbedtls_ecp_g
      * containing an integer in the case of a prime field
      */
     if ((ret = mbedtls_asn1_get_tag(&p, end_curve, &len, MBEDTLS_ASN1_OCTET_STRING)) != 0 ||
-        (ret = mbedtls_mpi_read_binary(&grp->A, p, len)) != 0) {
+            (ret = mbedtls_mpi_read_binary(&grp->A, p, len)) != 0) {
         return (MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret);
     }
 
     p += len;
 
     if ((ret = mbedtls_asn1_get_tag(&p, end_curve, &len, MBEDTLS_ASN1_OCTET_STRING)) != 0 ||
-        (ret = mbedtls_mpi_read_binary(&grp->B, p, len)) != 0) {
+            (ret = mbedtls_mpi_read_binary(&grp->B, p, len)) != 0) {
         return (MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret);
     }
 
@@ -332,11 +327,11 @@ static int pk_group_from_specified(const mbedtls_asn1_buf *params, mbedtls_ecp_g
          * reading only the X coordinate and the parity bit of Y.
          */
         if (ret != MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE ||
-            (p[0] != 0x02 && p[0] != 0x03) ||
-            len != mbedtls_mpi_size(&grp->P) + 1 ||
-            mbedtls_mpi_read_binary(&grp->G.X, p + 1, len - 1) != 0 ||
-            mbedtls_mpi_lset(&grp->G.Y, p[0] - 2) != 0 ||
-            mbedtls_mpi_lset(&grp->G.Z, 1) != 0) {
+                (p[0] != 0x02 && p[0] != 0x03) ||
+                len != mbedtls_mpi_size(&grp->P) + 1 ||
+                mbedtls_mpi_read_binary(&grp->G.X, p + 1, len - 1) != 0 ||
+                mbedtls_mpi_lset(&grp->G.Y, p[0] - 2) != 0 ||
+                mbedtls_mpi_lset(&grp->G.Z, 1) != 0) {
             return (MBEDTLS_ERR_PK_KEY_INVALID_FORMAT);
         }
     }
@@ -362,8 +357,7 @@ static int pk_group_from_specified(const mbedtls_asn1_buf *params, mbedtls_ecp_g
  * Find the group id associated with an (almost filled) group as generated by
  * pk_group_from_specified(), or return an error if unknown.
  */
-static int pk_group_id_from_group(const mbedtls_ecp_group *grp, mbedtls_ecp_group_id *grp_id)
-{
+static int pk_group_id_from_group(const mbedtls_ecp_group *grp, mbedtls_ecp_group_id *grp_id) {
     int ret = 0;
     mbedtls_ecp_group ref;
     const mbedtls_ecp_group_id *id;
@@ -377,14 +371,14 @@ static int pk_group_id_from_group(const mbedtls_ecp_group *grp, mbedtls_ecp_grou
 
         /* Compare to the group we were given, starting with easy tests */
         if (grp->pbits == ref.pbits && grp->nbits == ref.nbits &&
-            mbedtls_mpi_cmp_mpi(&grp->P, &ref.P) == 0 &&
-            mbedtls_mpi_cmp_mpi(&grp->A, &ref.A) == 0 &&
-            mbedtls_mpi_cmp_mpi(&grp->B, &ref.B) == 0 &&
-            mbedtls_mpi_cmp_mpi(&grp->N, &ref.N) == 0 &&
-            mbedtls_mpi_cmp_mpi(&grp->G.X, &ref.G.X) == 0 &&
-            mbedtls_mpi_cmp_mpi(&grp->G.Z, &ref.G.Z) == 0 &&
-            /* For Y we may only know the parity bit, so compare only that */
-            mbedtls_mpi_get_bit(&grp->G.Y, 0) == mbedtls_mpi_get_bit(&ref.G.Y, 0)) {
+                mbedtls_mpi_cmp_mpi(&grp->P, &ref.P) == 0 &&
+                mbedtls_mpi_cmp_mpi(&grp->A, &ref.A) == 0 &&
+                mbedtls_mpi_cmp_mpi(&grp->B, &ref.B) == 0 &&
+                mbedtls_mpi_cmp_mpi(&grp->N, &ref.N) == 0 &&
+                mbedtls_mpi_cmp_mpi(&grp->G.X, &ref.G.X) == 0 &&
+                mbedtls_mpi_cmp_mpi(&grp->G.Z, &ref.G.Z) == 0 &&
+                /* For Y we may only know the parity bit, so compare only that */
+                mbedtls_mpi_get_bit(&grp->G.Y, 0) == mbedtls_mpi_get_bit(&ref.G.Y, 0)) {
             break;
         }
 
@@ -405,8 +399,7 @@ cleanup:
  * Parse a SpecifiedECDomain (SEC 1 C.2) and find the associated group ID
  */
 static int pk_group_id_from_specified(const mbedtls_asn1_buf *params,
-                                      mbedtls_ecp_group_id *grp_id)
-{
+                                      mbedtls_ecp_group_id *grp_id) {
     int ret;
     mbedtls_ecp_group grp;
 
@@ -432,8 +425,7 @@ cleanup:
  *   specifiedCurve     SpecifiedECDomain -- = SEQUENCE { ... }
  *   -- implicitCurve   NULL
  */
-static int pk_use_ecparams(const mbedtls_asn1_buf *params, mbedtls_ecp_group *grp)
-{
+static int pk_use_ecparams(const mbedtls_asn1_buf *params, mbedtls_ecp_group *grp) {
     int ret;
     mbedtls_ecp_group_id grp_id;
 
@@ -469,8 +461,7 @@ static int pk_use_ecparams(const mbedtls_asn1_buf *params, mbedtls_ecp_group *gr
  * return code of mbedtls_ecp_point_read_binary() and leave p in a usable state.
  */
 static int pk_get_ecpubkey(unsigned char **p, const unsigned char *end,
-                           mbedtls_ecp_keypair *key)
-{
+                           mbedtls_ecp_keypair *key) {
     int ret;
 
     if ((ret = mbedtls_ecp_point_read_binary(&key->grp, &key->Q,
@@ -496,8 +487,7 @@ static int pk_get_ecpubkey(unsigned char **p, const unsigned char *end,
  */
 static int pk_get_rsapubkey(unsigned char **p,
                             const unsigned char *end,
-                            mbedtls_rsa_context *rsa)
-{
+                            mbedtls_rsa_context *rsa) {
     int ret;
     size_t len;
 
@@ -530,7 +520,7 @@ static int pk_get_rsapubkey(unsigned char **p,
     *p += len;
 
     if (mbedtls_rsa_complete(rsa) != 0 ||
-        mbedtls_rsa_check_pubkey(rsa) != 0) {
+            mbedtls_rsa_check_pubkey(rsa) != 0) {
         return (MBEDTLS_ERR_PK_INVALID_PUBKEY);
     }
 
@@ -550,8 +540,7 @@ static int pk_get_rsapubkey(unsigned char **p,
  */
 static int pk_get_pk_alg(unsigned char **p,
                          const unsigned char *end,
-                         mbedtls_pk_type_t *pk_alg, mbedtls_asn1_buf *params)
-{
+                         mbedtls_pk_type_t *pk_alg, mbedtls_asn1_buf *params) {
     int ret;
     mbedtls_asn1_buf alg_oid;
 
@@ -567,8 +556,8 @@ static int pk_get_pk_alg(unsigned char **p,
      * No parameters with RSA (only for EC)
      */
     if (*pk_alg == MBEDTLS_PK_RSA &&
-        ((params->tag != MBEDTLS_ASN1_NULL && params->tag != 0) ||
-         params->len != 0)) {
+            ((params->tag != MBEDTLS_ASN1_NULL && params->tag != 0) ||
+             params->len != 0)) {
         return (MBEDTLS_ERR_PK_INVALID_ALG);
     }
 
@@ -581,8 +570,7 @@ static int pk_get_pk_alg(unsigned char **p,
  *       subjectPublicKey     BIT STRING }
  */
 int mbedtls_pk_parse_subpubkey(unsigned char **p, const unsigned char *end,
-                               mbedtls_pk_context *pk)
-{
+                               mbedtls_pk_context *pk) {
     int ret;
     size_t len;
     mbedtls_asn1_buf alg_params;
@@ -642,8 +630,7 @@ int mbedtls_pk_parse_subpubkey(unsigned char **p, const unsigned char *end,
  */
 static int pk_parse_key_pkcs1_der(mbedtls_rsa_context *rsa,
                                   const unsigned char *key,
-                                  size_t keylen)
-{
+                                  size_t keylen) {
     int ret, version;
     size_t len;
     unsigned char *p, *end;
@@ -688,40 +675,40 @@ static int pk_parse_key_pkcs1_der(mbedtls_rsa_context *rsa,
     /* Import N */
     if ((ret = mbedtls_asn1_get_tag(&p, end, &len,
                                     MBEDTLS_ASN1_INTEGER)) != 0 ||
-        (ret = mbedtls_rsa_import_raw(rsa, p, len, NULL, 0, NULL, 0,
-                                      NULL, 0, NULL, 0)) != 0)
+            (ret = mbedtls_rsa_import_raw(rsa, p, len, NULL, 0, NULL, 0,
+                                          NULL, 0, NULL, 0)) != 0)
         goto cleanup;
     p += len;
 
     /* Import E */
     if ((ret = mbedtls_asn1_get_tag(&p, end, &len,
                                     MBEDTLS_ASN1_INTEGER)) != 0 ||
-        (ret = mbedtls_rsa_import_raw(rsa, NULL, 0, NULL, 0, NULL, 0,
-                                      NULL, 0, p, len)) != 0)
+            (ret = mbedtls_rsa_import_raw(rsa, NULL, 0, NULL, 0, NULL, 0,
+                                          NULL, 0, p, len)) != 0)
         goto cleanup;
     p += len;
 
     /* Import D */
     if ((ret = mbedtls_asn1_get_tag(&p, end, &len,
                                     MBEDTLS_ASN1_INTEGER)) != 0 ||
-        (ret = mbedtls_rsa_import_raw(rsa, NULL, 0, NULL, 0, NULL, 0,
-                                      p, len, NULL, 0)) != 0)
+            (ret = mbedtls_rsa_import_raw(rsa, NULL, 0, NULL, 0, NULL, 0,
+                                          p, len, NULL, 0)) != 0)
         goto cleanup;
     p += len;
 
     /* Import P */
     if ((ret = mbedtls_asn1_get_tag(&p, end, &len,
                                     MBEDTLS_ASN1_INTEGER)) != 0 ||
-        (ret = mbedtls_rsa_import_raw(rsa, NULL, 0, p, len, NULL, 0,
-                                      NULL, 0, NULL, 0)) != 0)
+            (ret = mbedtls_rsa_import_raw(rsa, NULL, 0, p, len, NULL, 0,
+                                          NULL, 0, NULL, 0)) != 0)
         goto cleanup;
     p += len;
 
     /* Import Q */
     if ((ret = mbedtls_asn1_get_tag(&p, end, &len,
                                     MBEDTLS_ASN1_INTEGER)) != 0 ||
-        (ret = mbedtls_rsa_import_raw(rsa, NULL, 0, NULL, 0, p, len,
-                                      NULL, 0, NULL, 0)) != 0)
+            (ret = mbedtls_rsa_import_raw(rsa, NULL, 0, NULL, 0, p, len,
+                                          NULL, 0, NULL, 0)) != 0)
         goto cleanup;
     p += len;
 
@@ -731,8 +718,8 @@ static int pk_parse_key_pkcs1_der(mbedtls_rsa_context *rsa,
 
     /* Check optional parameters */
     if ((ret = mbedtls_asn1_get_mpi(&p, end, &T)) != 0 ||
-        (ret = mbedtls_asn1_get_mpi(&p, end, &T)) != 0 ||
-        (ret = mbedtls_asn1_get_mpi(&p, end, &T)) != 0)
+            (ret = mbedtls_asn1_get_mpi(&p, end, &T)) != 0 ||
+            (ret = mbedtls_asn1_get_mpi(&p, end, &T)) != 0)
         goto cleanup;
 
     if (p != end) {
@@ -764,8 +751,7 @@ cleanup:
  */
 static int pk_parse_key_sec1_der(mbedtls_ecp_keypair *eck,
                                  const unsigned char *key,
-                                 size_t keylen)
-{
+                                 size_t keylen) {
     int ret;
     int version, pubkey_done;
     size_t len;
@@ -815,7 +801,7 @@ static int pk_parse_key_sec1_der(mbedtls_ecp_keypair *eck,
         if ((ret = mbedtls_asn1_get_tag(&p, end, &len,
                                         MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_CONSTRUCTED | 0)) == 0) {
             if ((ret = pk_get_ecparams(&p, p + len, &params)) != 0 ||
-                (ret = pk_use_ecparams(&params, &eck->grp)) != 0) {
+                    (ret = pk_use_ecparams(&params, &eck->grp)) != 0) {
                 mbedtls_ecp_keypair_free(eck);
                 return (ret);
             }
@@ -858,8 +844,8 @@ static int pk_parse_key_sec1_der(mbedtls_ecp_keypair *eck,
     }
 
     if (! pubkey_done &&
-        (ret = mbedtls_ecp_mul(&eck->grp, &eck->Q, &eck->d, &eck->grp.G,
-                               NULL, NULL)) != 0) {
+            (ret = mbedtls_ecp_mul(&eck->grp, &eck->Q, &eck->d, &eck->grp.G,
+                                   NULL, NULL)) != 0) {
         mbedtls_ecp_keypair_free(eck);
         return (MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret);
     }
@@ -889,8 +875,7 @@ static int pk_parse_key_sec1_der(mbedtls_ecp_keypair *eck,
 static int pk_parse_key_pkcs8_unencrypted_der(
     mbedtls_pk_context *pk,
     const unsigned char *key,
-    size_t keylen)
-{
+    size_t keylen) {
     int ret, version;
     size_t len;
     mbedtls_asn1_buf params;
@@ -955,7 +940,7 @@ static int pk_parse_key_pkcs8_unencrypted_der(
 #if defined(MBEDTLS_ECP_C)
         if (pk_alg == MBEDTLS_PK_ECKEY || pk_alg == MBEDTLS_PK_ECKEY_DH) {
             if ((ret = pk_use_ecparams(&params, &mbedtls_pk_ec(*pk)->grp)) != 0 ||
-                (ret = pk_parse_key_sec1_der(mbedtls_pk_ec(*pk), p, len)) != 0) {
+                    (ret = pk_parse_key_sec1_der(mbedtls_pk_ec(*pk), p, len)) != 0) {
                 mbedtls_pk_free(pk);
                 return (ret);
             }
@@ -979,8 +964,7 @@ static int pk_parse_key_pkcs8_unencrypted_der(
 static int pk_parse_key_pkcs8_encrypted_der(
     mbedtls_pk_context *pk,
     unsigned char *key, size_t keylen,
-    const unsigned char *pwd, size_t pwdlen)
-{
+    const unsigned char *pwd, size_t pwdlen) {
     int ret, decrypted = 0;
     size_t len;
     unsigned char *buf;
@@ -1088,8 +1072,7 @@ static int pk_parse_key_pkcs8_encrypted_der(
  */
 int mbedtls_pk_parse_key(mbedtls_pk_context *pk,
                          const unsigned char *key, size_t keylen,
-                         const unsigned char *pwd, size_t pwdlen)
-{
+                         const unsigned char *pwd, size_t pwdlen) {
     int ret;
     const mbedtls_pk_info_t *pk_info;
 
@@ -1112,8 +1095,8 @@ int mbedtls_pk_parse_key(mbedtls_pk_context *pk,
     if (ret == 0) {
         pk_info = mbedtls_pk_info_from_type(MBEDTLS_PK_RSA);
         if ((ret = mbedtls_pk_setup(pk, pk_info)) != 0 ||
-            (ret = pk_parse_key_pkcs1_der(mbedtls_pk_rsa(*pk),
-                                          pem.buf, pem.buflen)) != 0) {
+                (ret = pk_parse_key_pkcs1_der(mbedtls_pk_rsa(*pk),
+                                              pem.buf, pem.buflen)) != 0) {
             mbedtls_pk_free(pk);
         }
 
@@ -1140,8 +1123,8 @@ int mbedtls_pk_parse_key(mbedtls_pk_context *pk,
         pk_info = mbedtls_pk_info_from_type(MBEDTLS_PK_ECKEY);
 
         if ((ret = mbedtls_pk_setup(pk, pk_info)) != 0 ||
-            (ret = pk_parse_key_sec1_der(mbedtls_pk_ec(*pk),
-                                         pem.buf, pem.buflen)) != 0) {
+                (ret = pk_parse_key_sec1_der(mbedtls_pk_ec(*pk),
+                                             pem.buf, pem.buflen)) != 0) {
             mbedtls_pk_free(pk);
         }
 
@@ -1245,8 +1228,8 @@ int mbedtls_pk_parse_key(mbedtls_pk_context *pk,
 
     pk_info = mbedtls_pk_info_from_type(MBEDTLS_PK_RSA);
     if ((ret = mbedtls_pk_setup(pk, pk_info)) != 0 ||
-        (ret = pk_parse_key_pkcs1_der(mbedtls_pk_rsa(*pk),
-                                      key, keylen)) != 0) {
+            (ret = pk_parse_key_pkcs1_der(mbedtls_pk_rsa(*pk),
+                                          key, keylen)) != 0) {
         mbedtls_pk_free(pk);
     } else {
         return (0);
@@ -1258,8 +1241,8 @@ int mbedtls_pk_parse_key(mbedtls_pk_context *pk,
 
     pk_info = mbedtls_pk_info_from_type(MBEDTLS_PK_ECKEY);
     if ((ret = mbedtls_pk_setup(pk, pk_info)) != 0 ||
-        (ret = pk_parse_key_sec1_der(mbedtls_pk_ec(*pk),
-                                     key, keylen)) != 0) {
+            (ret = pk_parse_key_sec1_der(mbedtls_pk_ec(*pk),
+                                         key, keylen)) != 0) {
         mbedtls_pk_free(pk);
     } else {
         return (0);
@@ -1274,8 +1257,7 @@ int mbedtls_pk_parse_key(mbedtls_pk_context *pk,
  * Parse a public key
  */
 int mbedtls_pk_parse_public_key(mbedtls_pk_context *ctx,
-                                const unsigned char *key, size_t keylen)
-{
+                                const unsigned char *key, size_t keylen) {
     int ret;
     unsigned char *p;
 #if defined(MBEDTLS_RSA_C)
diff --git a/common/mbedtls/pkwrite.c b/common/mbedtls/pkwrite.c
index eab151d46..8fccc2bbb 100644
--- a/common/mbedtls/pkwrite.c
+++ b/common/mbedtls/pkwrite.c
@@ -64,8 +64,7 @@
  *  }
  */
 static int pk_write_rsa_pubkey(unsigned char **p, unsigned char *start,
-                               mbedtls_rsa_context *rsa)
-{
+                               mbedtls_rsa_context *rsa) {
     int ret;
     size_t len = 0;
     mbedtls_mpi T;
@@ -74,13 +73,13 @@ static int pk_write_rsa_pubkey(unsigned char **p, unsigned char *start,
 
     /* Export E */
     if ((ret = mbedtls_rsa_export(rsa, NULL, NULL, NULL, NULL, &T)) != 0 ||
-        (ret = mbedtls_asn1_write_mpi(p, start, &T)) < 0)
+            (ret = mbedtls_asn1_write_mpi(p, start, &T)) < 0)
         goto end_of_export;
     len += ret;
 
     /* Export N */
     if ((ret = mbedtls_rsa_export(rsa, &T, NULL, NULL, NULL, NULL)) != 0 ||
-        (ret = mbedtls_asn1_write_mpi(p, start, &T)) < 0)
+            (ret = mbedtls_asn1_write_mpi(p, start, &T)) < 0)
         goto end_of_export;
     len += ret;
 
@@ -103,8 +102,7 @@ end_of_export:
  * EC public key is an EC point
  */
 static int pk_write_ec_pubkey(unsigned char **p, unsigned char *start,
-                              mbedtls_ecp_keypair *ec)
-{
+                              mbedtls_ecp_keypair *ec) {
     int ret;
     size_t len = 0;
     unsigned char buf[MBEDTLS_ECP_MAX_PT_LEN];
@@ -130,8 +128,7 @@ static int pk_write_ec_pubkey(unsigned char **p, unsigned char *start,
  * }
  */
 static int pk_write_ec_param(unsigned char **p, unsigned char *start,
-                             mbedtls_ecp_keypair *ec)
-{
+                             mbedtls_ecp_keypair *ec) {
     int ret;
     size_t len = 0;
     const char *oid;
@@ -147,8 +144,7 @@ static int pk_write_ec_param(unsigned char **p, unsigned char *start,
 #endif /* MBEDTLS_ECP_C */
 
 int mbedtls_pk_write_pubkey(unsigned char **p, unsigned char *start,
-                            const mbedtls_pk_context *key)
-{
+                            const mbedtls_pk_context *key) {
     int ret;
     size_t len = 0;
 
@@ -167,8 +163,7 @@ int mbedtls_pk_write_pubkey(unsigned char **p, unsigned char *start,
     return ((int) len);
 }
 
-int mbedtls_pk_write_pubkey_der(mbedtls_pk_context *key, unsigned char *buf, size_t size)
-{
+int mbedtls_pk_write_pubkey_der(mbedtls_pk_context *key, unsigned char *buf, size_t size) {
     int ret;
     unsigned char *c;
     size_t len = 0, par_len = 0, oid_len;
@@ -213,8 +208,7 @@ int mbedtls_pk_write_pubkey_der(mbedtls_pk_context *key, unsigned char *buf, siz
     return ((int) len);
 }
 
-int mbedtls_pk_write_key_der(mbedtls_pk_context *key, unsigned char *buf, size_t size)
-{
+int mbedtls_pk_write_key_der(mbedtls_pk_context *key, unsigned char *buf, size_t size) {
     int ret;
     unsigned char *c = buf + size;
     size_t len = 0;
@@ -232,54 +226,54 @@ int mbedtls_pk_write_key_der(mbedtls_pk_context *key, unsigned char *buf, size_t
 
         /* Export QP */
         if ((ret = mbedtls_rsa_export_crt(rsa, NULL, NULL, &T)) != 0 ||
-            (ret = mbedtls_asn1_write_mpi(&c, buf, &T)) < 0)
+                (ret = mbedtls_asn1_write_mpi(&c, buf, &T)) < 0)
             goto end_of_export;
         len += ret;
 
         /* Export DQ */
         if ((ret = mbedtls_rsa_export_crt(rsa, NULL, &T, NULL)) != 0 ||
-            (ret = mbedtls_asn1_write_mpi(&c, buf, &T)) < 0)
+                (ret = mbedtls_asn1_write_mpi(&c, buf, &T)) < 0)
             goto end_of_export;
         len += ret;
 
         /* Export DP */
         if ((ret = mbedtls_rsa_export_crt(rsa, &T, NULL, NULL)) != 0 ||
-            (ret = mbedtls_asn1_write_mpi(&c, buf, &T)) < 0)
+                (ret = mbedtls_asn1_write_mpi(&c, buf, &T)) < 0)
             goto end_of_export;
         len += ret;
 
         /* Export Q */
         if ((ret = mbedtls_rsa_export(rsa, NULL, NULL,
                                       &T, NULL, NULL)) != 0 ||
-            (ret = mbedtls_asn1_write_mpi(&c, buf, &T)) < 0)
+                (ret = mbedtls_asn1_write_mpi(&c, buf, &T)) < 0)
             goto end_of_export;
         len += ret;
 
         /* Export P */
         if ((ret = mbedtls_rsa_export(rsa, NULL, &T,
                                       NULL, NULL, NULL)) != 0 ||
-            (ret = mbedtls_asn1_write_mpi(&c, buf, &T)) < 0)
+                (ret = mbedtls_asn1_write_mpi(&c, buf, &T)) < 0)
             goto end_of_export;
         len += ret;
 
         /* Export D */
         if ((ret = mbedtls_rsa_export(rsa, NULL, NULL,
                                       NULL, &T, NULL)) != 0 ||
-            (ret = mbedtls_asn1_write_mpi(&c, buf, &T)) < 0)
+                (ret = mbedtls_asn1_write_mpi(&c, buf, &T)) < 0)
             goto end_of_export;
         len += ret;
 
         /* Export E */
         if ((ret = mbedtls_rsa_export(rsa, NULL, NULL,
                                       NULL, NULL, &T)) != 0 ||
-            (ret = mbedtls_asn1_write_mpi(&c, buf, &T)) < 0)
+                (ret = mbedtls_asn1_write_mpi(&c, buf, &T)) < 0)
             goto end_of_export;
         len += ret;
 
         /* Export N */
         if ((ret = mbedtls_rsa_export(rsa, &T, NULL,
                                       NULL, NULL, NULL)) != 0 ||
-            (ret = mbedtls_asn1_write_mpi(&c, buf, &T)) < 0)
+                (ret = mbedtls_asn1_write_mpi(&c, buf, &T)) < 0)
             goto end_of_export;
         len += ret;
 
@@ -446,8 +440,7 @@ end_of_export:
 #define PRV_DER_MAX_BYTES   RSA_PRV_DER_MAX_BYTES > ECP_PRV_DER_MAX_BYTES ? \
     RSA_PRV_DER_MAX_BYTES : ECP_PRV_DER_MAX_BYTES
 
-int mbedtls_pk_write_pubkey_pem(mbedtls_pk_context *key, unsigned char *buf, size_t size)
-{
+int mbedtls_pk_write_pubkey_pem(mbedtls_pk_context *key, unsigned char *buf, size_t size) {
     int ret;
     unsigned char output_buf[PUB_DER_MAX_BYTES];
     size_t olen = 0;
@@ -466,8 +459,7 @@ int mbedtls_pk_write_pubkey_pem(mbedtls_pk_context *key, unsigned char *buf, siz
     return (0);
 }
 
-int mbedtls_pk_write_key_pem(mbedtls_pk_context *key, unsigned char *buf, size_t size)
-{
+int mbedtls_pk_write_key_pem(mbedtls_pk_context *key, unsigned char *buf, size_t size) {
     int ret;
     unsigned char output_buf[PRV_DER_MAX_BYTES];
     const char *begin, *end;
diff --git a/common/mbedtls/platform.c b/common/mbedtls/platform.c
index 9d8e8f73d..e0905bbfd 100644
--- a/common/mbedtls/platform.c
+++ b/common/mbedtls/platform.c
@@ -34,8 +34,7 @@
 
 #if defined(MBEDTLS_PLATFORM_MEMORY)
 #if !defined(MBEDTLS_PLATFORM_STD_CALLOC)
-static void *platform_calloc_uninit(size_t n, size_t size)
-{
+static void *platform_calloc_uninit(size_t n, size_t size) {
     ((void) n);
     ((void) size);
     return (NULL);
@@ -45,8 +44,7 @@ static void *platform_calloc_uninit(size_t n, size_t size)
 #endif /* !MBEDTLS_PLATFORM_STD_CALLOC */
 
 #if !defined(MBEDTLS_PLATFORM_STD_FREE)
-static void platform_free_uninit(void *ptr)
-{
+static void platform_free_uninit(void *ptr) {
     ((void) ptr);
 }
 
@@ -56,19 +54,16 @@ static void platform_free_uninit(void *ptr)
 static void *(*mbedtls_calloc_func)(size_t, size_t) = MBEDTLS_PLATFORM_STD_CALLOC;
 static void (*mbedtls_free_func)(void *) = MBEDTLS_PLATFORM_STD_FREE;
 
-void *mbedtls_calloc(size_t nmemb, size_t size)
-{
+void *mbedtls_calloc(size_t nmemb, size_t size) {
     return (*mbedtls_calloc_func)(nmemb, size);
 }
 
-void mbedtls_free(void *ptr)
-{
+void mbedtls_free(void *ptr) {
     (*mbedtls_free_func)(ptr);
 }
 
 int mbedtls_platform_set_calloc_free(void *(*calloc_func)(size_t, size_t),
-                                     void (*free_func)(void *))
-{
+                                     void (*free_func)(void *)) {
     mbedtls_calloc_func = calloc_func;
     mbedtls_free_func = free_func;
     return (0);
@@ -77,8 +72,7 @@ int mbedtls_platform_set_calloc_free(void *(*calloc_func)(size_t, size_t),
 
 #if defined(_WIN32)
 #include <stdarg.h>
-int mbedtls_platform_win32_snprintf(char *s, size_t n, const char *fmt, ...)
-{
+int mbedtls_platform_win32_snprintf(char *s, size_t n, const char *fmt, ...) {
     int ret;
     va_list argp;
 
@@ -108,8 +102,7 @@ int mbedtls_platform_win32_snprintf(char *s, size_t n, const char *fmt, ...)
  * Make dummy function to prevent NULL pointer dereferences
  */
 static int platform_snprintf_uninit(char *s, size_t n,
-                                    const char *format, ...)
-{
+                                    const char *format, ...) {
     ((void) s);
     ((void) n);
     ((void) format);
@@ -125,8 +118,7 @@ int (*mbedtls_snprintf)(char *s, size_t n,
 
 int mbedtls_platform_set_snprintf(int (*snprintf_func)(char *s, size_t n,
                                                        const char *format,
-                                                       ...))
-{
+                                                       ...)) {
     mbedtls_snprintf = snprintf_func;
     return (0);
 }
@@ -137,8 +129,7 @@ int mbedtls_platform_set_snprintf(int (*snprintf_func)(char *s, size_t n,
 /*
  * Make dummy function to prevent NULL pointer dereferences
  */
-static int platform_printf_uninit(const char *format, ...)
-{
+static int platform_printf_uninit(const char *format, ...) {
     ((void) format);
     return (0);
 }
@@ -148,8 +139,7 @@ static int platform_printf_uninit(const char *format, ...)
 
 int (*mbedtls_printf)(const char *, ...) = MBEDTLS_PLATFORM_STD_PRINTF;
 
-int mbedtls_platform_set_printf(int (*printf_func)(const char *, ...))
-{
+int mbedtls_platform_set_printf(int (*printf_func)(const char *, ...)) {
     mbedtls_printf = printf_func;
     return (0);
 }
@@ -160,8 +150,7 @@ int mbedtls_platform_set_printf(int (*printf_func)(const char *, ...))
 /*
  * Make dummy function to prevent NULL pointer dereferences
  */
-static int platform_fprintf_uninit(FILE *stream, const char *format, ...)
-{
+static int platform_fprintf_uninit(FILE *stream, const char *format, ...) {
     ((void) stream);
     ((void) format);
     return (0);
@@ -173,8 +162,7 @@ static int platform_fprintf_uninit(FILE *stream, const char *format, ...)
 int (*mbedtls_fprintf)(FILE *, const char *, ...) =
     MBEDTLS_PLATFORM_STD_FPRINTF;
 
-int mbedtls_platform_set_fprintf(int (*fprintf_func)(FILE *, const char *, ...))
-{
+int mbedtls_platform_set_fprintf(int (*fprintf_func)(FILE *, const char *, ...)) {
     mbedtls_fprintf = fprintf_func;
     return (0);
 }
@@ -185,8 +173,7 @@ int mbedtls_platform_set_fprintf(int (*fprintf_func)(FILE *, const char *, ...))
 /*
  * Make dummy function to prevent NULL pointer dereferences
  */
-static void platform_exit_uninit(int status)
-{
+static void platform_exit_uninit(int status) {
     ((void) status);
 }
 
@@ -195,8 +182,7 @@ static void platform_exit_uninit(int status)
 
 void (*mbedtls_exit)(int status) = MBEDTLS_PLATFORM_STD_EXIT;
 
-int mbedtls_platform_set_exit(void (*exit_func)(int status))
-{
+int mbedtls_platform_set_exit(void (*exit_func)(int status)) {
     mbedtls_exit = exit_func;
     return (0);
 }
@@ -209,8 +195,7 @@ int mbedtls_platform_set_exit(void (*exit_func)(int status))
 /*
  * Make dummy function to prevent NULL pointer dereferences
  */
-static mbedtls_time_t platform_time_uninit(mbedtls_time_t *timer)
-{
+static mbedtls_time_t platform_time_uninit(mbedtls_time_t *timer) {
     ((void) timer);
     return (0);
 }
@@ -220,8 +205,7 @@ static mbedtls_time_t platform_time_uninit(mbedtls_time_t *timer)
 
 mbedtls_time_t (*mbedtls_time)(mbedtls_time_t *timer) = MBEDTLS_PLATFORM_STD_TIME;
 
-int mbedtls_platform_set_time(mbedtls_time_t (*time_func)(mbedtls_time_t *timer))
-{
+int mbedtls_platform_set_time(mbedtls_time_t (*time_func)(mbedtls_time_t *timer)) {
     mbedtls_time = time_func;
     return (0);
 }
@@ -234,8 +218,7 @@ int mbedtls_platform_set_time(mbedtls_time_t (*time_func)(mbedtls_time_t *timer)
 /* Default implementations for the platform independent seed functions use
  * standard libc file functions to read from and write to a pre-defined filename
  */
-int mbedtls_platform_std_nv_seed_read(unsigned char *buf, size_t buf_len)
-{
+int mbedtls_platform_std_nv_seed_read(unsigned char *buf, size_t buf_len) {
     FILE *file;
     size_t n;
 
@@ -252,8 +235,7 @@ int mbedtls_platform_std_nv_seed_read(unsigned char *buf, size_t buf_len)
     return ((int)n);
 }
 
-int mbedtls_platform_std_nv_seed_write(unsigned char *buf, size_t buf_len)
-{
+int mbedtls_platform_std_nv_seed_write(unsigned char *buf, size_t buf_len) {
     FILE *file;
     size_t n;
 
@@ -275,8 +257,7 @@ int mbedtls_platform_std_nv_seed_write(unsigned char *buf, size_t buf_len)
 /*
  * Make dummy function to prevent NULL pointer dereferences
  */
-static int platform_nv_seed_read_uninit(unsigned char *buf, size_t buf_len)
-{
+static int platform_nv_seed_read_uninit(unsigned char *buf, size_t buf_len) {
     ((void) buf);
     ((void) buf_len);
     return (-1);
@@ -289,8 +270,7 @@ static int platform_nv_seed_read_uninit(unsigned char *buf, size_t buf_len)
 /*
  * Make dummy function to prevent NULL pointer dereferences
  */
-static int platform_nv_seed_write_uninit(unsigned char *buf, size_t buf_len)
-{
+static int platform_nv_seed_write_uninit(unsigned char *buf, size_t buf_len) {
     ((void) buf);
     ((void) buf_len);
     return (-1);
@@ -306,8 +286,7 @@ int (*mbedtls_nv_seed_write)(unsigned char *buf, size_t buf_len) =
 
 int mbedtls_platform_set_nv_seed(
     int (*nv_seed_read_func)(unsigned char *buf, size_t buf_len),
-    int (*nv_seed_write_func)(unsigned char *buf, size_t buf_len))
-{
+    int (*nv_seed_write_func)(unsigned char *buf, size_t buf_len)) {
     mbedtls_nv_seed_read = nv_seed_read_func;
     mbedtls_nv_seed_write = nv_seed_write_func;
     return (0);
@@ -319,8 +298,7 @@ int mbedtls_platform_set_nv_seed(
 /*
  * Placeholder platform setup that does nothing by default
  */
-int mbedtls_platform_setup(mbedtls_platform_context *ctx)
-{
+int mbedtls_platform_setup(mbedtls_platform_context *ctx) {
     (void)ctx;
 
     return (0);
@@ -329,8 +307,7 @@ int mbedtls_platform_setup(mbedtls_platform_context *ctx)
 /*
  * Placeholder platform teardown that does nothing by default
  */
-void mbedtls_platform_teardown(mbedtls_platform_context *ctx)
-{
+void mbedtls_platform_teardown(mbedtls_platform_context *ctx) {
     (void)ctx;
 }
 #endif /* MBEDTLS_PLATFORM_SETUP_TEARDOWN_ALT */
diff --git a/common/mbedtls/platform_util.c b/common/mbedtls/platform_util.c
index 5c185f565..a3634e246 100644
--- a/common/mbedtls/platform_util.c
+++ b/common/mbedtls/platform_util.c
@@ -62,8 +62,7 @@
  */
 static void *(* const volatile memset_func)(void *, int, size_t) = memset;
 
-void mbedtls_platform_zeroize(void *buf, size_t len)
-{
+void mbedtls_platform_zeroize(void *buf, size_t len) {
     memset_func(buf, 0, len);
 }
 #endif /* MBEDTLS_PLATFORM_ZEROIZE_ALT */
diff --git a/common/mbedtls/rsa.c b/common/mbedtls/rsa.c
index d6250b0af..5e40062fe 100644
--- a/common/mbedtls/rsa.c
+++ b/common/mbedtls/rsa.c
@@ -75,8 +75,7 @@
 
 #if defined(MBEDTLS_PKCS1_V15)
 /* constant-time buffer comparison */
-static inline int mbedtls_safer_memcmp(const void *a, const void *b, size_t n)
-{
+static inline int mbedtls_safer_memcmp(const void *a, const void *b, size_t n) {
     size_t i;
     const unsigned char *A = (const unsigned char *) a;
     const unsigned char *B = (const unsigned char *) b;
@@ -92,15 +91,14 @@ static inline int mbedtls_safer_memcmp(const void *a, const void *b, size_t n)
 int mbedtls_rsa_import(mbedtls_rsa_context *ctx,
                        const mbedtls_mpi *N,
                        const mbedtls_mpi *P, const mbedtls_mpi *Q,
-                       const mbedtls_mpi *D, const mbedtls_mpi *E)
-{
+                       const mbedtls_mpi *D, const mbedtls_mpi *E) {
     int ret;
 
     if ((N != NULL && (ret = mbedtls_mpi_copy(&ctx->N, N)) != 0) ||
-        (P != NULL && (ret = mbedtls_mpi_copy(&ctx->P, P)) != 0) ||
-        (Q != NULL && (ret = mbedtls_mpi_copy(&ctx->Q, Q)) != 0) ||
-        (D != NULL && (ret = mbedtls_mpi_copy(&ctx->D, D)) != 0) ||
-        (E != NULL && (ret = mbedtls_mpi_copy(&ctx->E, E)) != 0)) {
+            (P != NULL && (ret = mbedtls_mpi_copy(&ctx->P, P)) != 0) ||
+            (Q != NULL && (ret = mbedtls_mpi_copy(&ctx->Q, Q)) != 0) ||
+            (D != NULL && (ret = mbedtls_mpi_copy(&ctx->D, D)) != 0) ||
+            (E != NULL && (ret = mbedtls_mpi_copy(&ctx->E, E)) != 0)) {
         return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA + ret);
     }
 
@@ -115,8 +113,7 @@ int mbedtls_rsa_import_raw(mbedtls_rsa_context *ctx,
                            unsigned char const *P, size_t P_len,
                            unsigned char const *Q, size_t Q_len,
                            unsigned char const *D, size_t D_len,
-                           unsigned char const *E, size_t E_len)
-{
+                           unsigned char const *E, size_t E_len) {
     int ret = 0;
 
     if (N != NULL) {
@@ -150,8 +147,7 @@ cleanup:
  * It does *not* make guarantees for consistency of the parameters.
  */
 static int rsa_check_context(mbedtls_rsa_context const *ctx, int is_priv,
-                             int blinding_needed)
-{
+                             int blinding_needed) {
 #if !defined(MBEDTLS_RSA_NO_CRT)
     /* blinding_needed is only used for NO_CRT to decide whether
      * P,Q need to be present or not. */
@@ -159,7 +155,7 @@ static int rsa_check_context(mbedtls_rsa_context const *ctx, int is_priv,
 #endif
 
     if (ctx->len != mbedtls_mpi_size(&ctx->N) ||
-        ctx->len > MBEDTLS_MPI_MAX_SIZE) {
+            ctx->len > MBEDTLS_MPI_MAX_SIZE) {
         return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
     }
 
@@ -170,7 +166,7 @@ static int rsa_check_context(mbedtls_rsa_context const *ctx, int is_priv,
     /* Modular exponentiation wrt. N is always used for
      * RSA public key operations. */
     if (mbedtls_mpi_cmp_int(&ctx->N, 0) <= 0 ||
-        mbedtls_mpi_get_bit(&ctx->N, 0) == 0) {
+            mbedtls_mpi_get_bit(&ctx->N, 0) == 0) {
         return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
     }
 
@@ -179,10 +175,10 @@ static int rsa_check_context(mbedtls_rsa_context const *ctx, int is_priv,
      * used for private key operations and if CRT
      * is used. */
     if (is_priv &&
-        (mbedtls_mpi_cmp_int(&ctx->P, 0) <= 0 ||
-         mbedtls_mpi_get_bit(&ctx->P, 0) == 0 ||
-         mbedtls_mpi_cmp_int(&ctx->Q, 0) <= 0 ||
-         mbedtls_mpi_get_bit(&ctx->Q, 0) == 0)) {
+            (mbedtls_mpi_cmp_int(&ctx->P, 0) <= 0 ||
+             mbedtls_mpi_get_bit(&ctx->P, 0) == 0 ||
+             mbedtls_mpi_cmp_int(&ctx->Q, 0) <= 0 ||
+             mbedtls_mpi_get_bit(&ctx->Q, 0) == 0)) {
         return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
     }
 #endif /* !MBEDTLS_RSA_NO_CRT */
@@ -202,8 +198,8 @@ static int rsa_check_context(mbedtls_rsa_context const *ctx, int is_priv,
         return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
 #else
     if (is_priv &&
-        (mbedtls_mpi_cmp_int(&ctx->DP, 0) <= 0 ||
-         mbedtls_mpi_cmp_int(&ctx->DQ, 0) <= 0)) {
+            (mbedtls_mpi_cmp_int(&ctx->DP, 0) <= 0 ||
+             mbedtls_mpi_cmp_int(&ctx->DQ, 0) <= 0)) {
         return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
     }
 #endif /* MBEDTLS_RSA_NO_CRT */
@@ -213,8 +209,8 @@ static int rsa_check_context(mbedtls_rsa_context const *ctx, int is_priv,
      * done as part of 1. */
 #if defined(MBEDTLS_RSA_NO_CRT)
     if (is_priv && blinding_needed &&
-        (mbedtls_mpi_cmp_int(&ctx->P, 0) <= 0 ||
-         mbedtls_mpi_cmp_int(&ctx->Q, 0) <= 0)) {
+            (mbedtls_mpi_cmp_int(&ctx->P, 0) <= 0 ||
+             mbedtls_mpi_cmp_int(&ctx->Q, 0) <= 0)) {
         return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
     }
 #endif
@@ -223,7 +219,7 @@ static int rsa_check_context(mbedtls_rsa_context const *ctx, int is_priv,
      * but check for QP >= 1 nonetheless. */
 #if !defined(MBEDTLS_RSA_NO_CRT)
     if (is_priv &&
-        mbedtls_mpi_cmp_int(&ctx->QP, 0) <= 0) {
+            mbedtls_mpi_cmp_int(&ctx->QP, 0) <= 0) {
         return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
     }
 #endif
@@ -231,8 +227,7 @@ static int rsa_check_context(mbedtls_rsa_context const *ctx, int is_priv,
     return (0);
 }
 
-int mbedtls_rsa_complete(mbedtls_rsa_context *ctx)
-{
+int mbedtls_rsa_complete(mbedtls_rsa_context *ctx) {
     int ret = 0;
 
     const int have_N = (mbedtls_mpi_cmp_int(&ctx->N, 0) != 0);
@@ -320,8 +315,7 @@ int mbedtls_rsa_export_raw(const mbedtls_rsa_context *ctx,
                            unsigned char *P, size_t P_len,
                            unsigned char *Q, size_t Q_len,
                            unsigned char *D, size_t D_len,
-                           unsigned char *E, size_t E_len)
-{
+                           unsigned char *E, size_t E_len) {
     int ret = 0;
 
     /* Check if key is private or public */
@@ -362,8 +356,7 @@ cleanup:
 
 int mbedtls_rsa_export(const mbedtls_rsa_context *ctx,
                        mbedtls_mpi *N, mbedtls_mpi *P, mbedtls_mpi *Q,
-                       mbedtls_mpi *D, mbedtls_mpi *E)
-{
+                       mbedtls_mpi *D, mbedtls_mpi *E) {
     int ret;
 
     /* Check if key is private or public */
@@ -385,10 +378,10 @@ int mbedtls_rsa_export(const mbedtls_rsa_context *ctx,
     /* Export all requested core parameters. */
 
     if ((N != NULL && (ret = mbedtls_mpi_copy(N, &ctx->N)) != 0) ||
-        (P != NULL && (ret = mbedtls_mpi_copy(P, &ctx->P)) != 0) ||
-        (Q != NULL && (ret = mbedtls_mpi_copy(Q, &ctx->Q)) != 0) ||
-        (D != NULL && (ret = mbedtls_mpi_copy(D, &ctx->D)) != 0) ||
-        (E != NULL && (ret = mbedtls_mpi_copy(E, &ctx->E)) != 0)) {
+            (P != NULL && (ret = mbedtls_mpi_copy(P, &ctx->P)) != 0) ||
+            (Q != NULL && (ret = mbedtls_mpi_copy(Q, &ctx->Q)) != 0) ||
+            (D != NULL && (ret = mbedtls_mpi_copy(D, &ctx->D)) != 0) ||
+            (E != NULL && (ret = mbedtls_mpi_copy(E, &ctx->E)) != 0)) {
         return (ret);
     }
 
@@ -402,8 +395,7 @@ int mbedtls_rsa_export(const mbedtls_rsa_context *ctx,
  * can be used in this case.
  */
 int mbedtls_rsa_export_crt(const mbedtls_rsa_context *ctx,
-                           mbedtls_mpi *DP, mbedtls_mpi *DQ, mbedtls_mpi *QP)
-{
+                           mbedtls_mpi *DP, mbedtls_mpi *DQ, mbedtls_mpi *QP) {
     int ret;
 
     /* Check if key is private or public */
@@ -420,8 +412,8 @@ int mbedtls_rsa_export_crt(const mbedtls_rsa_context *ctx,
 #if !defined(MBEDTLS_RSA_NO_CRT)
     /* Export all requested blinding parameters. */
     if ((DP != NULL && (ret = mbedtls_mpi_copy(DP, &ctx->DP)) != 0) ||
-        (DQ != NULL && (ret = mbedtls_mpi_copy(DQ, &ctx->DQ)) != 0) ||
-        (QP != NULL && (ret = mbedtls_mpi_copy(QP, &ctx->QP)) != 0)) {
+            (DQ != NULL && (ret = mbedtls_mpi_copy(DQ, &ctx->DQ)) != 0) ||
+            (QP != NULL && (ret = mbedtls_mpi_copy(QP, &ctx->QP)) != 0)) {
         return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA + ret);
     }
 #else
@@ -439,8 +431,7 @@ int mbedtls_rsa_export_crt(const mbedtls_rsa_context *ctx,
  */
 void mbedtls_rsa_init(mbedtls_rsa_context *ctx,
                       int padding,
-                      int hash_id)
-{
+                      int hash_id) {
     memset(ctx, 0, sizeof(mbedtls_rsa_context));
 
     mbedtls_rsa_set_padding(ctx, padding, hash_id);
@@ -453,8 +444,7 @@ void mbedtls_rsa_init(mbedtls_rsa_context *ctx,
 /*
  * Set padding for an existing RSA context
  */
-void mbedtls_rsa_set_padding(mbedtls_rsa_context *ctx, int padding, int hash_id)
-{
+void mbedtls_rsa_set_padding(mbedtls_rsa_context *ctx, int padding, int hash_id) {
     ctx->padding = padding;
     ctx->hash_id = hash_id;
 }
@@ -463,8 +453,7 @@ void mbedtls_rsa_set_padding(mbedtls_rsa_context *ctx, int padding, int hash_id)
  * Get length in bytes of RSA modulus
  */
 
-size_t mbedtls_rsa_get_len(const mbedtls_rsa_context *ctx)
-{
+size_t mbedtls_rsa_get_len(const mbedtls_rsa_context *ctx) {
     return (ctx->len);
 }
 
@@ -480,8 +469,7 @@ size_t mbedtls_rsa_get_len(const mbedtls_rsa_context *ctx)
 int mbedtls_rsa_gen_key(mbedtls_rsa_context *ctx,
                         int (*f_rng)(void *, unsigned char *, size_t),
                         void *p_rng,
-                        unsigned int nbits, int exponent)
-{
+                        unsigned int nbits, int exponent) {
     int ret;
     mbedtls_mpi H, G, L;
 
@@ -580,8 +568,7 @@ cleanup:
 /*
  * Check a public RSA key
  */
-int mbedtls_rsa_check_pubkey(const mbedtls_rsa_context *ctx)
-{
+int mbedtls_rsa_check_pubkey(const mbedtls_rsa_context *ctx) {
     if (rsa_check_context(ctx, 0 /* public */, 0 /* no blinding */) != 0)
         return (MBEDTLS_ERR_RSA_KEY_CHECK_FAILED);
 
@@ -590,8 +577,8 @@ int mbedtls_rsa_check_pubkey(const mbedtls_rsa_context *ctx)
     }
 
     if (mbedtls_mpi_get_bit(&ctx->E, 0) == 0 ||
-        mbedtls_mpi_bitlen(&ctx->E)     < 2  ||
-        mbedtls_mpi_cmp_mpi(&ctx->E, &ctx->N) >= 0) {
+            mbedtls_mpi_bitlen(&ctx->E)     < 2  ||
+            mbedtls_mpi_cmp_mpi(&ctx->E, &ctx->N) >= 0) {
         return (MBEDTLS_ERR_RSA_KEY_CHECK_FAILED);
     }
 
@@ -601,10 +588,9 @@ int mbedtls_rsa_check_pubkey(const mbedtls_rsa_context *ctx)
 /*
  * Check for the consistency of all fields in an RSA private key context
  */
-int mbedtls_rsa_check_privkey(const mbedtls_rsa_context *ctx)
-{
+int mbedtls_rsa_check_privkey(const mbedtls_rsa_context *ctx) {
     if (mbedtls_rsa_check_pubkey(ctx) != 0 ||
-        rsa_check_context(ctx, 1 /* private */, 1 /* blinding */) != 0) {
+            rsa_check_context(ctx, 1 /* private */, 1 /* blinding */) != 0) {
         return (MBEDTLS_ERR_RSA_KEY_CHECK_FAILED);
     }
 
@@ -627,15 +613,14 @@ int mbedtls_rsa_check_privkey(const mbedtls_rsa_context *ctx)
  * Check if contexts holding a public and private key match
  */
 int mbedtls_rsa_check_pub_priv(const mbedtls_rsa_context *pub,
-                               const mbedtls_rsa_context *prv)
-{
+                               const mbedtls_rsa_context *prv) {
     if (mbedtls_rsa_check_pubkey(pub)  != 0 ||
-        mbedtls_rsa_check_privkey(prv) != 0) {
+            mbedtls_rsa_check_privkey(prv) != 0) {
         return (MBEDTLS_ERR_RSA_KEY_CHECK_FAILED);
     }
 
     if (mbedtls_mpi_cmp_mpi(&pub->N, &prv->N) != 0 ||
-        mbedtls_mpi_cmp_mpi(&pub->E, &prv->E) != 0) {
+            mbedtls_mpi_cmp_mpi(&pub->E, &prv->E) != 0) {
         return (MBEDTLS_ERR_RSA_KEY_CHECK_FAILED);
     }
 
@@ -647,8 +632,7 @@ int mbedtls_rsa_check_pub_priv(const mbedtls_rsa_context *pub,
  */
 int mbedtls_rsa_public(mbedtls_rsa_context *ctx,
                        const unsigned char *input,
-                       unsigned char *output)
-{
+                       unsigned char *output) {
     int ret;
     size_t olen;
     mbedtls_mpi T;
@@ -695,8 +679,7 @@ cleanup:
  *  Berlin Heidelberg, 1996. p. 104-113.
  */
 static int rsa_prepare_blinding(mbedtls_rsa_context *ctx,
-                                int (*f_rng)(void *, unsigned char *, size_t), void *p_rng)
-{
+                                int (*f_rng)(void *, unsigned char *, size_t), void *p_rng) {
     int ret, count = 0;
 
     if (ctx->Vf.p != NULL) {
@@ -755,8 +738,7 @@ int mbedtls_rsa_private(mbedtls_rsa_context *ctx,
                         int (*f_rng)(void *, unsigned char *, size_t),
                         void *p_rng,
                         const unsigned char *input,
-                        unsigned char *output)
-{
+                        unsigned char *output) {
     int ret;
     size_t olen;
 
@@ -980,8 +962,7 @@ cleanup:
  * \param md_ctx    message digest context to use
  */
 static int mgf_mask(unsigned char *dst, size_t dlen, unsigned char *src,
-                    size_t slen, mbedtls_md_context_t *md_ctx)
-{
+                    size_t slen, mbedtls_md_context_t *md_ctx) {
     unsigned char mask[MBEDTLS_MD_MAX_SIZE];
     unsigned char counter[4];
     unsigned char *p;
@@ -1037,8 +1018,7 @@ int mbedtls_rsa_rsaes_oaep_encrypt(mbedtls_rsa_context *ctx,
                                    const unsigned char *label, size_t label_len,
                                    size_t ilen,
                                    const unsigned char *input,
-                                   unsigned char *output)
-{
+                                   unsigned char *output) {
     size_t olen;
     int ret;
     unsigned char *p = output;
@@ -1116,8 +1096,7 @@ int mbedtls_rsa_rsaes_pkcs1_v15_encrypt(mbedtls_rsa_context *ctx,
                                         void *p_rng,
                                         int mode, size_t ilen,
                                         const unsigned char *input,
-                                        unsigned char *output)
-{
+                                        unsigned char *output) {
     size_t nb_pad, olen;
     int ret;
     unsigned char *p = output;
@@ -1178,8 +1157,7 @@ int mbedtls_rsa_pkcs1_encrypt(mbedtls_rsa_context *ctx,
                               void *p_rng,
                               int mode, size_t ilen,
                               const unsigned char *input,
-                              unsigned char *output)
-{
+                              unsigned char *output) {
     switch (ctx->padding) {
 #if defined(MBEDTLS_PKCS1_V15)
         case MBEDTLS_RSA_PKCS_V15:
@@ -1210,8 +1188,7 @@ int mbedtls_rsa_rsaes_oaep_decrypt(mbedtls_rsa_context *ctx,
                                    size_t *olen,
                                    const unsigned char *input,
                                    unsigned char *output,
-                                   size_t output_max_len)
-{
+                                   size_t output_max_len) {
     int ret;
     size_t ilen, i, pad_len;
     unsigned char *p, bad, pad_done;
@@ -1264,9 +1241,9 @@ int mbedtls_rsa_rsaes_oaep_decrypt(mbedtls_rsa_context *ctx,
     /* seed: Apply seedMask to maskedSeed */
     if ((ret = mgf_mask(buf + 1, hlen, buf + hlen + 1, ilen - hlen - 1,
                         &md_ctx)) != 0 ||
-        /* DB: Apply dbMask to maskedDB */
-        (ret = mgf_mask(buf + hlen + 1, ilen - hlen - 1, buf + 1, hlen,
-                        &md_ctx)) != 0) {
+            /* DB: Apply dbMask to maskedDB */
+            (ret = mgf_mask(buf + hlen + 1, ilen - hlen - 1, buf + 1, hlen,
+                            &md_ctx)) != 0) {
         mbedtls_md_free(&md_ctx);
         goto cleanup;
     }
@@ -1341,8 +1318,7 @@ int mbedtls_rsa_rsaes_pkcs1_v15_decrypt(mbedtls_rsa_context *ctx,
                                         int mode, size_t *olen,
                                         const unsigned char *input,
                                         unsigned char *output,
-                                        size_t output_max_len)
-{
+                                        size_t output_max_len) {
     int ret;
     size_t ilen, pad_count = 0, i;
     unsigned char *p, bad, pad_done = 0;
@@ -1430,8 +1406,7 @@ int mbedtls_rsa_pkcs1_decrypt(mbedtls_rsa_context *ctx,
                               int mode, size_t *olen,
                               const unsigned char *input,
                               unsigned char *output,
-                              size_t output_max_len)
-{
+                              size_t output_max_len) {
     switch (ctx->padding) {
 #if defined(MBEDTLS_PKCS1_V15)
         case MBEDTLS_RSA_PKCS_V15:
@@ -1462,8 +1437,7 @@ int mbedtls_rsa_rsassa_pss_sign(mbedtls_rsa_context *ctx,
                                 mbedtls_md_type_t md_alg,
                                 unsigned int hashlen,
                                 const unsigned char *hash,
-                                unsigned char *sig)
-{
+                                unsigned char *sig) {
     size_t olen;
     unsigned char *p = sig;
     unsigned char salt[MBEDTLS_MD_MAX_SIZE];
@@ -1585,8 +1559,7 @@ static int rsa_rsassa_pkcs1_v15_encode(mbedtls_md_type_t md_alg,
                                        unsigned int hashlen,
                                        const unsigned char *hash,
                                        size_t dst_len,
-                                       unsigned char *dst)
-{
+                                       unsigned char *dst) {
     size_t oid_size  = 0;
     size_t nb_pad    = dst_len;
     unsigned char *p = dst;
@@ -1606,8 +1579,8 @@ static int rsa_rsassa_pkcs1_v15_encode(mbedtls_md_type_t md_alg,
         /* Double-check that 8 + hashlen + oid_size can be used as a
          * 1-byte ASN.1 length encoding and that there's no overflow. */
         if (8 + hashlen + oid_size  >= 0x80         ||
-            10 + hashlen            <  hashlen      ||
-            10 + hashlen + oid_size <  10 + hashlen)
+                10 + hashlen            <  hashlen      ||
+                10 + hashlen + oid_size <  10 + hashlen)
             return (MBEDTLS_ERR_RSA_BAD_INPUT_DATA);
 
         /*
@@ -1698,8 +1671,7 @@ int mbedtls_rsa_rsassa_pkcs1_v15_sign(mbedtls_rsa_context *ctx,
                                       mbedtls_md_type_t md_alg,
                                       unsigned int hashlen,
                                       const unsigned char *hash,
-                                      unsigned char *sig)
-{
+                                      unsigned char *sig) {
     int ret;
     unsigned char *sig_try = NULL, *verif = NULL;
 
@@ -1767,8 +1739,7 @@ int mbedtls_rsa_pkcs1_sign(mbedtls_rsa_context *ctx,
                            mbedtls_md_type_t md_alg,
                            unsigned int hashlen,
                            const unsigned char *hash,
-                           unsigned char *sig)
-{
+                           unsigned char *sig) {
     switch (ctx->padding) {
 #if defined(MBEDTLS_PKCS1_V15)
         case MBEDTLS_RSA_PKCS_V15:
@@ -1800,8 +1771,7 @@ int mbedtls_rsa_rsassa_pss_verify_ext(mbedtls_rsa_context *ctx,
                                       const unsigned char *hash,
                                       mbedtls_md_type_t mgf1_hash_id,
                                       int expected_salt_len,
-                                      const unsigned char *sig)
-{
+                                      const unsigned char *sig) {
     int ret;
     size_t siglen;
     unsigned char *p;
@@ -1890,7 +1860,7 @@ int mbedtls_rsa_rsassa_pss_verify_ext(mbedtls_rsa_context *ctx,
     observed_salt_len = hash_start - p;
 
     if (expected_salt_len != MBEDTLS_RSA_SALT_LEN_ANY &&
-        observed_salt_len != (size_t) expected_salt_len) {
+            observed_salt_len != (size_t) expected_salt_len) {
         ret = MBEDTLS_ERR_RSA_INVALID_PADDING;
         goto exit;
     }
@@ -1935,8 +1905,7 @@ int mbedtls_rsa_rsassa_pss_verify(mbedtls_rsa_context *ctx,
                                   mbedtls_md_type_t md_alg,
                                   unsigned int hashlen,
                                   const unsigned char *hash,
-                                  const unsigned char *sig)
-{
+                                  const unsigned char *sig) {
     mbedtls_md_type_t mgf1_hash_id = (ctx->hash_id != MBEDTLS_MD_NONE)
                                      ? (mbedtls_md_type_t) ctx->hash_id
                                      : md_alg;
@@ -1960,8 +1929,7 @@ int mbedtls_rsa_rsassa_pkcs1_v15_verify(mbedtls_rsa_context *ctx,
                                         mbedtls_md_type_t md_alg,
                                         unsigned int hashlen,
                                         const unsigned char *hash,
-                                        const unsigned char *sig)
-{
+                                        const unsigned char *sig) {
     int ret = 0;
     const size_t sig_len = ctx->len;
     unsigned char *encoded = NULL, *encoded_expected = NULL;
@@ -1974,7 +1942,7 @@ int mbedtls_rsa_rsassa_pkcs1_v15_verify(mbedtls_rsa_context *ctx,
      */
 
     if ((encoded          = mbedtls_calloc(1, sig_len)) == NULL ||
-        (encoded_expected = mbedtls_calloc(1, sig_len)) == NULL) {
+            (encoded_expected = mbedtls_calloc(1, sig_len)) == NULL) {
         ret = MBEDTLS_ERR_MPI_ALLOC_FAILED;
         goto cleanup;
     }
@@ -2029,8 +1997,7 @@ int mbedtls_rsa_pkcs1_verify(mbedtls_rsa_context *ctx,
                              mbedtls_md_type_t md_alg,
                              unsigned int hashlen,
                              const unsigned char *hash,
-                             const unsigned char *sig)
-{
+                             const unsigned char *sig) {
     switch (ctx->padding) {
 #if defined(MBEDTLS_PKCS1_V15)
         case MBEDTLS_RSA_PKCS_V15:
@@ -2052,8 +2019,7 @@ int mbedtls_rsa_pkcs1_verify(mbedtls_rsa_context *ctx,
 /*
  * Copy the components of an RSA key
  */
-int mbedtls_rsa_copy(mbedtls_rsa_context *dst, const mbedtls_rsa_context *src)
-{
+int mbedtls_rsa_copy(mbedtls_rsa_context *dst, const mbedtls_rsa_context *src) {
     int ret;
 
     dst->ver = src->ver;
@@ -2092,8 +2058,7 @@ cleanup:
 /*
  * Free the components of an RSA key
  */
-void mbedtls_rsa_free(mbedtls_rsa_context *ctx)
-{
+void mbedtls_rsa_free(mbedtls_rsa_context *ctx) {
     mbedtls_mpi_free(&ctx->Vi);
     mbedtls_mpi_free(&ctx->Vf);
     mbedtls_mpi_free(&ctx->RN);
@@ -2162,8 +2127,7 @@ void mbedtls_rsa_free(mbedtls_rsa_context *ctx)
     "\x11\x22\x33\x0A\x0B\x0C\xCC\xDD\xDD\xDD\xDD\xDD"
 
 #if defined(MBEDTLS_PKCS1_V15)
-static int myrand(void *rng_state, unsigned char *output, size_t len)
-{
+static int myrand(void *rng_state, unsigned char *output, size_t len) {
 #if !defined(__OpenBSD__)
     size_t i;
 
@@ -2186,8 +2150,7 @@ static int myrand(void *rng_state, unsigned char *output, size_t len)
 /*
  * Checkup routine
  */
-int mbedtls_rsa_self_test(int verbose)
-{
+int mbedtls_rsa_self_test(int verbose) {
     int ret = 0;
 #if defined(MBEDTLS_PKCS1_V15)
     size_t len;
@@ -2221,7 +2184,7 @@ int mbedtls_rsa_self_test(int verbose)
         mbedtls_printf("  RSA key validation: ");
 
     if (mbedtls_rsa_check_pubkey(&rsa) != 0 ||
-        mbedtls_rsa_check_privkey(&rsa) != 0) {
+            mbedtls_rsa_check_privkey(&rsa) != 0) {
         if (verbose != 0)
             mbedtls_printf("failed\n");
 
diff --git a/common/mbedtls/rsa_internal.c b/common/mbedtls/rsa_internal.c
index 226e3e7a3..c9412a911 100644
--- a/common/mbedtls/rsa_internal.c
+++ b/common/mbedtls/rsa_internal.c
@@ -69,8 +69,7 @@
  */
 int mbedtls_rsa_deduce_primes(mbedtls_mpi const *N,
                               mbedtls_mpi const *E, mbedtls_mpi const *D,
-                              mbedtls_mpi *P, mbedtls_mpi *Q)
-{
+                              mbedtls_mpi *P, mbedtls_mpi *Q) {
     int ret = 0;
 
     uint16_t attempt;  /* Number of current attempt  */
@@ -97,10 +96,10 @@ int mbedtls_rsa_deduce_primes(mbedtls_mpi const *N,
         return (MBEDTLS_ERR_MPI_BAD_INPUT_DATA);
 
     if (mbedtls_mpi_cmp_int(N, 0) <= 0 ||
-        mbedtls_mpi_cmp_int(D, 1) <= 0 ||
-        mbedtls_mpi_cmp_mpi(D, N) >= 0 ||
-        mbedtls_mpi_cmp_int(E, 1) <= 0 ||
-        mbedtls_mpi_cmp_mpi(E, N) >= 0) {
+            mbedtls_mpi_cmp_int(D, 1) <= 0 ||
+            mbedtls_mpi_cmp_mpi(D, N) >= 0 ||
+            mbedtls_mpi_cmp_int(E, 1) <= 0 ||
+            mbedtls_mpi_cmp_mpi(E, N) >= 0) {
         return (MBEDTLS_ERR_MPI_BAD_INPUT_DATA);
     }
 
@@ -156,7 +155,7 @@ int mbedtls_rsa_deduce_primes(mbedtls_mpi const *N,
             MBEDTLS_MPI_CHK(mbedtls_mpi_gcd(P, &K, N));
 
             if (mbedtls_mpi_cmp_int(P, 1) ==  1 &&
-                mbedtls_mpi_cmp_mpi(P, N) == -1) {
+                    mbedtls_mpi_cmp_mpi(P, N) == -1) {
                 /*
                  * Have found a nontrivial divisor P of N.
                  * Set Q := N / P.
@@ -199,8 +198,7 @@ cleanup:
 int mbedtls_rsa_deduce_private_exponent(mbedtls_mpi const *P,
                                         mbedtls_mpi const *Q,
                                         mbedtls_mpi const *E,
-                                        mbedtls_mpi *D)
-{
+                                        mbedtls_mpi *D) {
     int ret = 0;
     mbedtls_mpi K, L;
 
@@ -208,8 +206,8 @@ int mbedtls_rsa_deduce_private_exponent(mbedtls_mpi const *P,
         return (MBEDTLS_ERR_MPI_BAD_INPUT_DATA);
 
     if (mbedtls_mpi_cmp_int(P, 1) <= 0 ||
-        mbedtls_mpi_cmp_int(Q, 1) <= 0 ||
-        mbedtls_mpi_cmp_int(E, 0) == 0) {
+            mbedtls_mpi_cmp_int(Q, 1) <= 0 ||
+            mbedtls_mpi_cmp_int(E, 0) == 0) {
         return (MBEDTLS_ERR_MPI_BAD_INPUT_DATA);
     }
 
@@ -243,8 +241,7 @@ cleanup:
  */
 int mbedtls_rsa_validate_crt(const mbedtls_mpi *P,  const mbedtls_mpi *Q,
                              const mbedtls_mpi *D,  const mbedtls_mpi *DP,
-                             const mbedtls_mpi *DQ, const mbedtls_mpi *QP)
-{
+                             const mbedtls_mpi *DQ, const mbedtls_mpi *QP) {
     int ret = 0;
 
     mbedtls_mpi K, L;
@@ -305,8 +302,8 @@ cleanup:
 
     /* Wrap MPI error codes by RSA check failure error code */
     if (ret != 0 &&
-        ret != MBEDTLS_ERR_RSA_KEY_CHECK_FAILED &&
-        ret != MBEDTLS_ERR_RSA_BAD_INPUT_DATA) {
+            ret != MBEDTLS_ERR_RSA_KEY_CHECK_FAILED &&
+            ret != MBEDTLS_ERR_RSA_BAD_INPUT_DATA) {
         ret += MBEDTLS_ERR_RSA_KEY_CHECK_FAILED;
     }
 
@@ -323,8 +320,7 @@ int mbedtls_rsa_validate_params(const mbedtls_mpi *N, const mbedtls_mpi *P,
                                 const mbedtls_mpi *Q, const mbedtls_mpi *D,
                                 const mbedtls_mpi *E,
                                 int (*f_rng)(void *, unsigned char *, size_t),
-                                void *p_rng)
-{
+                                void *p_rng) {
     int ret = 0;
     mbedtls_mpi K, L;
 
@@ -337,13 +333,13 @@ int mbedtls_rsa_validate_params(const mbedtls_mpi *N, const mbedtls_mpi *P,
 
 #if defined(MBEDTLS_GENPRIME)
     if (f_rng != NULL && P != NULL &&
-        (ret = mbedtls_mpi_is_prime(P, f_rng, p_rng)) != 0) {
+            (ret = mbedtls_mpi_is_prime(P, f_rng, p_rng)) != 0) {
         ret = MBEDTLS_ERR_RSA_KEY_CHECK_FAILED;
         goto cleanup;
     }
 
     if (f_rng != NULL && Q != NULL &&
-        (ret = mbedtls_mpi_is_prime(Q, f_rng, p_rng)) != 0) {
+            (ret = mbedtls_mpi_is_prime(Q, f_rng, p_rng)) != 0) {
         ret = MBEDTLS_ERR_RSA_KEY_CHECK_FAILED;
         goto cleanup;
     }
@@ -359,7 +355,7 @@ int mbedtls_rsa_validate_params(const mbedtls_mpi *N, const mbedtls_mpi *P,
     if (P != NULL && Q != NULL && N != NULL) {
         MBEDTLS_MPI_CHK(mbedtls_mpi_mul_mpi(&K, P, Q));
         if (mbedtls_mpi_cmp_int(N, 1)  <= 0 ||
-            mbedtls_mpi_cmp_mpi(&K, N) != 0) {
+                mbedtls_mpi_cmp_mpi(&K, N) != 0) {
             ret = MBEDTLS_ERR_RSA_KEY_CHECK_FAILED;
             goto cleanup;
         }
@@ -371,9 +367,9 @@ int mbedtls_rsa_validate_params(const mbedtls_mpi *N, const mbedtls_mpi *P,
 
     if (N != NULL && D != NULL && E != NULL) {
         if (mbedtls_mpi_cmp_int(D, 1) <= 0 ||
-            mbedtls_mpi_cmp_int(E, 1) <= 0 ||
-            mbedtls_mpi_cmp_mpi(D, N) >= 0 ||
-            mbedtls_mpi_cmp_mpi(E, N) >= 0) {
+                mbedtls_mpi_cmp_int(E, 1) <= 0 ||
+                mbedtls_mpi_cmp_mpi(D, N) >= 0 ||
+                mbedtls_mpi_cmp_mpi(E, N) >= 0) {
             ret = MBEDTLS_ERR_RSA_KEY_CHECK_FAILED;
             goto cleanup;
         }
@@ -385,7 +381,7 @@ int mbedtls_rsa_validate_params(const mbedtls_mpi *N, const mbedtls_mpi *P,
 
     if (P != NULL && Q != NULL && D != NULL && E != NULL) {
         if (mbedtls_mpi_cmp_int(P, 1) <= 0 ||
-            mbedtls_mpi_cmp_int(Q, 1) <= 0) {
+                mbedtls_mpi_cmp_int(Q, 1) <= 0) {
             ret = MBEDTLS_ERR_RSA_KEY_CHECK_FAILED;
             goto cleanup;
         }
@@ -426,8 +422,7 @@ cleanup:
 
 int mbedtls_rsa_deduce_crt(const mbedtls_mpi *P, const mbedtls_mpi *Q,
                            const mbedtls_mpi *D, mbedtls_mpi *DP,
-                           mbedtls_mpi *DQ, mbedtls_mpi *QP)
-{
+                           mbedtls_mpi *DQ, mbedtls_mpi *QP) {
     int ret = 0;
     mbedtls_mpi K;
     mbedtls_mpi_init(&K);
diff --git a/common/mbedtls/sha1.c b/common/mbedtls/sha1.c
index 82dc14f5c..d050e760b 100644
--- a/common/mbedtls/sha1.c
+++ b/common/mbedtls/sha1.c
@@ -73,13 +73,11 @@
     }
 #endif
 
-void mbedtls_sha1_init(mbedtls_sha1_context *ctx)
-{
+void mbedtls_sha1_init(mbedtls_sha1_context *ctx) {
     memset(ctx, 0, sizeof(mbedtls_sha1_context));
 }
 
-void mbedtls_sha1_free(mbedtls_sha1_context *ctx)
-{
+void mbedtls_sha1_free(mbedtls_sha1_context *ctx) {
     if (ctx == NULL)
         return;
 
@@ -87,16 +85,14 @@ void mbedtls_sha1_free(mbedtls_sha1_context *ctx)
 }
 
 void mbedtls_sha1_clone(mbedtls_sha1_context *dst,
-                        const mbedtls_sha1_context *src)
-{
+                        const mbedtls_sha1_context *src) {
     *dst = *src;
 }
 
 /*
  * SHA-1 context setup
  */
-int mbedtls_sha1_starts_ret(mbedtls_sha1_context *ctx)
-{
+int mbedtls_sha1_starts_ret(mbedtls_sha1_context *ctx) {
     ctx->total[0] = 0;
     ctx->total[1] = 0;
 
@@ -110,16 +106,14 @@ int mbedtls_sha1_starts_ret(mbedtls_sha1_context *ctx)
 }
 
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
-void mbedtls_sha1_starts(mbedtls_sha1_context *ctx)
-{
+void mbedtls_sha1_starts(mbedtls_sha1_context *ctx) {
     mbedtls_sha1_starts_ret(ctx);
 }
 #endif
 
 #if !defined(MBEDTLS_SHA1_PROCESS_ALT)
 int mbedtls_internal_sha1_process(mbedtls_sha1_context *ctx,
-                                  const unsigned char data[64])
-{
+                                  const unsigned char data[64]) {
     uint32_t temp, W[16], A, B, C, D, E;
 
     GET_UINT32_BE(W[ 0], data,  0);
@@ -278,8 +272,7 @@ int mbedtls_internal_sha1_process(mbedtls_sha1_context *ctx,
 
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
 void mbedtls_sha1_process(mbedtls_sha1_context *ctx,
-                          const unsigned char data[64])
-{
+                          const unsigned char data[64]) {
     mbedtls_internal_sha1_process(ctx, data);
 }
 #endif
@@ -290,8 +283,7 @@ void mbedtls_sha1_process(mbedtls_sha1_context *ctx,
  */
 int mbedtls_sha1_update_ret(mbedtls_sha1_context *ctx,
                             const unsigned char *input,
-                            size_t ilen)
-{
+                            size_t ilen) {
     int ret;
     size_t fill;
     uint32_t left;
@@ -336,8 +328,7 @@ int mbedtls_sha1_update_ret(mbedtls_sha1_context *ctx,
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
 void mbedtls_sha1_update(mbedtls_sha1_context *ctx,
                          const unsigned char *input,
-                         size_t ilen)
-{
+                         size_t ilen) {
     mbedtls_sha1_update_ret(ctx, input, ilen);
 }
 #endif
@@ -346,8 +337,7 @@ void mbedtls_sha1_update(mbedtls_sha1_context *ctx,
  * SHA-1 final digest
  */
 int mbedtls_sha1_finish_ret(mbedtls_sha1_context *ctx,
-                            unsigned char output[20])
-{
+                            unsigned char output[20]) {
     int ret;
     uint32_t used;
     uint32_t high, low;
@@ -399,8 +389,7 @@ int mbedtls_sha1_finish_ret(mbedtls_sha1_context *ctx,
 
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
 void mbedtls_sha1_finish(mbedtls_sha1_context *ctx,
-                         unsigned char output[20])
-{
+                         unsigned char output[20]) {
     mbedtls_sha1_finish_ret(ctx, output);
 }
 #endif
@@ -412,8 +401,7 @@ void mbedtls_sha1_finish(mbedtls_sha1_context *ctx,
  */
 int mbedtls_sha1_ret(const unsigned char *input,
                      size_t ilen,
-                     unsigned char output[20])
-{
+                     unsigned char output[20]) {
     int ret;
     mbedtls_sha1_context ctx;
 
@@ -437,8 +425,7 @@ exit:
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
 void mbedtls_sha1(const unsigned char *input,
                   size_t ilen,
-                  unsigned char output[20])
-{
+                  unsigned char output[20]) {
     mbedtls_sha1_ret(input, ilen, output);
 }
 #endif
@@ -475,8 +462,7 @@ static const unsigned char sha1_test_sum[3][20] = {
 /*
  * Checkup routine
  */
-int mbedtls_sha1_self_test(int verbose)
-{
+int mbedtls_sha1_self_test(int verbose) {
     int i, j, buflen, ret = 0;
     unsigned char buf[1024];
     unsigned char sha1sum[20];
diff --git a/common/mbedtls/sha256.c b/common/mbedtls/sha256.c
index a1af184b2..161b54dc5 100644
--- a/common/mbedtls/sha256.c
+++ b/common/mbedtls/sha256.c
@@ -76,13 +76,11 @@
     } while( 0 )
 #endif
 
-void mbedtls_sha256_init(mbedtls_sha256_context *ctx)
-{
+void mbedtls_sha256_init(mbedtls_sha256_context *ctx) {
     memset(ctx, 0, sizeof(mbedtls_sha256_context));
 }
 
-void mbedtls_sha256_free(mbedtls_sha256_context *ctx)
-{
+void mbedtls_sha256_free(mbedtls_sha256_context *ctx) {
     if (ctx == NULL)
         return;
 
@@ -90,16 +88,14 @@ void mbedtls_sha256_free(mbedtls_sha256_context *ctx)
 }
 
 void mbedtls_sha256_clone(mbedtls_sha256_context *dst,
-                          const mbedtls_sha256_context *src)
-{
+                          const mbedtls_sha256_context *src) {
     *dst = *src;
 }
 
 /*
  * SHA-256 context setup
  */
-int mbedtls_sha256_starts_ret(mbedtls_sha256_context *ctx, int is224)
-{
+int mbedtls_sha256_starts_ret(mbedtls_sha256_context *ctx, int is224) {
     ctx->total[0] = 0;
     ctx->total[1] = 0;
 
@@ -132,8 +128,7 @@ int mbedtls_sha256_starts_ret(mbedtls_sha256_context *ctx, int is224)
 
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
 void mbedtls_sha256_starts(mbedtls_sha256_context *ctx,
-                           int is224)
-{
+                           int is224) {
     mbedtls_sha256_starts_ret(ctx, is224);
 }
 #endif
@@ -184,8 +179,7 @@ static const uint32_t K[] = {
     }
 
 int mbedtls_internal_sha256_process(mbedtls_sha256_context *ctx,
-                                    const unsigned char data[64])
-{
+                                    const unsigned char data[64]) {
     uint32_t temp1, temp2, W[64];
     uint32_t A[8];
     unsigned int i;
@@ -247,8 +241,7 @@ int mbedtls_internal_sha256_process(mbedtls_sha256_context *ctx,
 
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
 void mbedtls_sha256_process(mbedtls_sha256_context *ctx,
-                            const unsigned char data[64])
-{
+                            const unsigned char data[64]) {
     mbedtls_internal_sha256_process(ctx, data);
 }
 #endif
@@ -259,8 +252,7 @@ void mbedtls_sha256_process(mbedtls_sha256_context *ctx,
  */
 int mbedtls_sha256_update_ret(mbedtls_sha256_context *ctx,
                               const unsigned char *input,
-                              size_t ilen)
-{
+                              size_t ilen) {
     int ret;
     size_t fill;
     uint32_t left;
@@ -305,8 +297,7 @@ int mbedtls_sha256_update_ret(mbedtls_sha256_context *ctx,
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
 void mbedtls_sha256_update(mbedtls_sha256_context *ctx,
                            const unsigned char *input,
-                           size_t ilen)
-{
+                           size_t ilen) {
     mbedtls_sha256_update_ret(ctx, input, ilen);
 }
 #endif
@@ -315,8 +306,7 @@ void mbedtls_sha256_update(mbedtls_sha256_context *ctx,
  * SHA-256 final digest
  */
 int mbedtls_sha256_finish_ret(mbedtls_sha256_context *ctx,
-                              unsigned char output[32])
-{
+                              unsigned char output[32]) {
     int ret;
     uint32_t used;
     uint32_t high, low;
@@ -373,8 +363,7 @@ int mbedtls_sha256_finish_ret(mbedtls_sha256_context *ctx,
 
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
 void mbedtls_sha256_finish(mbedtls_sha256_context *ctx,
-                           unsigned char output[32])
-{
+                           unsigned char output[32]) {
     mbedtls_sha256_finish_ret(ctx, output);
 }
 #endif
@@ -387,8 +376,7 @@ void mbedtls_sha256_finish(mbedtls_sha256_context *ctx,
 int mbedtls_sha256_ret(const unsigned char *input,
                        size_t ilen,
                        unsigned char output[32],
-                       int is224)
-{
+                       int is224) {
     int ret;
     mbedtls_sha256_context ctx;
 
@@ -413,8 +401,7 @@ exit:
 void mbedtls_sha256(const unsigned char *input,
                     size_t ilen,
                     unsigned char output[32],
-                    int is224)
-{
+                    int is224) {
     mbedtls_sha256_ret(input, ilen, output, is224);
 }
 #endif
@@ -482,8 +469,7 @@ static const unsigned char sha256_test_sum[6][32] = {
 /*
  * Checkup routine
  */
-int mbedtls_sha256_self_test(int verbose)
-{
+int mbedtls_sha256_self_test(int verbose) {
     int i, j, k, buflen, ret = 0;
     unsigned char *buf;
     unsigned char sha256sum[32];
diff --git a/common/mbedtls/sha512.c b/common/mbedtls/sha512.c
index cee8df41f..f3dd0d15c 100644
--- a/common/mbedtls/sha512.c
+++ b/common/mbedtls/sha512.c
@@ -90,13 +90,11 @@
     }
 #endif /* PUT_UINT64_BE */
 
-void mbedtls_sha512_init(mbedtls_sha512_context *ctx)
-{
+void mbedtls_sha512_init(mbedtls_sha512_context *ctx) {
     memset(ctx, 0, sizeof(mbedtls_sha512_context));
 }
 
-void mbedtls_sha512_free(mbedtls_sha512_context *ctx)
-{
+void mbedtls_sha512_free(mbedtls_sha512_context *ctx) {
     if (ctx == NULL)
         return;
 
@@ -104,16 +102,14 @@ void mbedtls_sha512_free(mbedtls_sha512_context *ctx)
 }
 
 void mbedtls_sha512_clone(mbedtls_sha512_context *dst,
-                          const mbedtls_sha512_context *src)
-{
+                          const mbedtls_sha512_context *src) {
     *dst = *src;
 }
 
 /*
  * SHA-512 context setup
  */
-int mbedtls_sha512_starts_ret(mbedtls_sha512_context *ctx, int is384)
-{
+int mbedtls_sha512_starts_ret(mbedtls_sha512_context *ctx, int is384) {
     ctx->total[0] = 0;
     ctx->total[1] = 0;
 
@@ -146,8 +142,7 @@ int mbedtls_sha512_starts_ret(mbedtls_sha512_context *ctx, int is384)
 
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
 void mbedtls_sha512_starts(mbedtls_sha512_context *ctx,
-                           int is384)
-{
+                           int is384) {
     mbedtls_sha512_starts_ret(ctx, is384);
 }
 #endif
@@ -201,8 +196,7 @@ static const uint64_t K[80] = {
 };
 
 int mbedtls_internal_sha512_process(mbedtls_sha512_context *ctx,
-                                    const unsigned char data[128])
-{
+                                    const unsigned char data[128]) {
     int i;
     uint64_t temp1, temp2, W[80];
     uint64_t A, B, C, D, E, F, G, H;
@@ -278,8 +272,7 @@ int mbedtls_internal_sha512_process(mbedtls_sha512_context *ctx,
 
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
 void mbedtls_sha512_process(mbedtls_sha512_context *ctx,
-                            const unsigned char data[128])
-{
+                            const unsigned char data[128]) {
     mbedtls_internal_sha512_process(ctx, data);
 }
 #endif
@@ -290,8 +283,7 @@ void mbedtls_sha512_process(mbedtls_sha512_context *ctx,
  */
 int mbedtls_sha512_update_ret(mbedtls_sha512_context *ctx,
                               const unsigned char *input,
-                              size_t ilen)
-{
+                              size_t ilen) {
     int ret;
     size_t fill;
     unsigned int left;
@@ -335,8 +327,7 @@ int mbedtls_sha512_update_ret(mbedtls_sha512_context *ctx,
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
 void mbedtls_sha512_update(mbedtls_sha512_context *ctx,
                            const unsigned char *input,
-                           size_t ilen)
-{
+                           size_t ilen) {
     mbedtls_sha512_update_ret(ctx, input, ilen);
 }
 #endif
@@ -345,8 +336,7 @@ void mbedtls_sha512_update(mbedtls_sha512_context *ctx,
  * SHA-512 final digest
  */
 int mbedtls_sha512_finish_ret(mbedtls_sha512_context *ctx,
-                              unsigned char output[64])
-{
+                              unsigned char output[64]) {
     int ret;
     unsigned used;
     uint64_t high, low;
@@ -404,8 +394,7 @@ int mbedtls_sha512_finish_ret(mbedtls_sha512_context *ctx,
 
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
 void mbedtls_sha512_finish(mbedtls_sha512_context *ctx,
-                           unsigned char output[64])
-{
+                           unsigned char output[64]) {
     mbedtls_sha512_finish_ret(ctx, output);
 }
 #endif
@@ -418,8 +407,7 @@ void mbedtls_sha512_finish(mbedtls_sha512_context *ctx,
 int mbedtls_sha512_ret(const unsigned char *input,
                        size_t ilen,
                        unsigned char output[64],
-                       int is384)
-{
+                       int is384) {
     int ret;
     mbedtls_sha512_context ctx;
 
@@ -444,8 +432,7 @@ exit:
 void mbedtls_sha512(const unsigned char *input,
                     size_t ilen,
                     unsigned char output[64],
-                    int is384)
-{
+                    int is384) {
     mbedtls_sha512_ret(input, ilen, output, is384);
 }
 #endif
@@ -535,8 +522,7 @@ static const unsigned char sha512_test_sum[6][64] = {
 /*
  * Checkup routine
  */
-int mbedtls_sha512_self_test(int verbose)
-{
+int mbedtls_sha512_self_test(int verbose) {
     int i, j, k, buflen, ret = 0;
     unsigned char *buf;
     unsigned char sha512sum[64];
diff --git a/common/mbedtls/threading.c b/common/mbedtls/threading.c
index c84f5b334..1f9e3a053 100644
--- a/common/mbedtls/threading.c
+++ b/common/mbedtls/threading.c
@@ -32,16 +32,14 @@
 #include "mbedtls/threading.h"
 
 #if defined(MBEDTLS_THREADING_PTHREAD)
-static void threading_mutex_init_pthread(mbedtls_threading_mutex_t *mutex)
-{
+static void threading_mutex_init_pthread(mbedtls_threading_mutex_t *mutex) {
     if (mutex == NULL)
         return;
 
     mutex->is_valid = pthread_mutex_init(&mutex->mutex, NULL) == 0;
 }
 
-static void threading_mutex_free_pthread(mbedtls_threading_mutex_t *mutex)
-{
+static void threading_mutex_free_pthread(mbedtls_threading_mutex_t *mutex) {
     if (mutex == NULL || !mutex->is_valid)
         return;
 
@@ -49,8 +47,7 @@ static void threading_mutex_free_pthread(mbedtls_threading_mutex_t *mutex)
     mutex->is_valid = 0;
 }
 
-static int threading_mutex_lock_pthread(mbedtls_threading_mutex_t *mutex)
-{
+static int threading_mutex_lock_pthread(mbedtls_threading_mutex_t *mutex) {
     if (mutex == NULL || ! mutex->is_valid)
         return (MBEDTLS_ERR_THREADING_BAD_INPUT_DATA);
 
@@ -60,8 +57,7 @@ static int threading_mutex_lock_pthread(mbedtls_threading_mutex_t *mutex)
     return (0);
 }
 
-static int threading_mutex_unlock_pthread(mbedtls_threading_mutex_t *mutex)
-{
+static int threading_mutex_unlock_pthread(mbedtls_threading_mutex_t *mutex) {
     if (mutex == NULL || ! mutex->is_valid)
         return (MBEDTLS_ERR_THREADING_BAD_INPUT_DATA);
 
@@ -84,13 +80,11 @@ int (*mbedtls_mutex_unlock)(mbedtls_threading_mutex_t *) = threading_mutex_unloc
 #endif /* MBEDTLS_THREADING_PTHREAD */
 
 #if defined(MBEDTLS_THREADING_ALT)
-static int threading_mutex_fail(mbedtls_threading_mutex_t *mutex)
-{
+static int threading_mutex_fail(mbedtls_threading_mutex_t *mutex) {
     ((void) mutex);
     return (MBEDTLS_ERR_THREADING_BAD_INPUT_DATA);
 }
-static void threading_mutex_dummy(mbedtls_threading_mutex_t *mutex)
-{
+static void threading_mutex_dummy(mbedtls_threading_mutex_t *mutex) {
     ((void) mutex);
     return;
 }
@@ -106,8 +100,7 @@ int (*mbedtls_mutex_unlock)(mbedtls_threading_mutex_t *) = threading_mutex_fail;
 void mbedtls_threading_set_alt(void (*mutex_init)(mbedtls_threading_mutex_t *),
                                void (*mutex_free)(mbedtls_threading_mutex_t *),
                                int (*mutex_lock)(mbedtls_threading_mutex_t *),
-                               int (*mutex_unlock)(mbedtls_threading_mutex_t *))
-{
+                               int (*mutex_unlock)(mbedtls_threading_mutex_t *)) {
     mbedtls_mutex_init = mutex_init;
     mbedtls_mutex_free = mutex_free;
     mbedtls_mutex_lock = mutex_lock;
@@ -121,8 +114,7 @@ void mbedtls_threading_set_alt(void (*mutex_init)(mbedtls_threading_mutex_t *),
 /*
  * Free global mutexes
  */
-void mbedtls_threading_free_alt(void)
-{
+void mbedtls_threading_free_alt(void) {
 #if defined(MBEDTLS_FS_IO)
     mbedtls_mutex_free(&mbedtls_threading_readdir_mutex);
 #endif
diff --git a/common/mbedtls/timing.c b/common/mbedtls/timing.c
index 8539641f6..8f31ff01e 100644
--- a/common/mbedtls/timing.c
+++ b/common/mbedtls/timing.c
@@ -78,8 +78,7 @@ struct _hr_time {
 
 #define HAVE_HARDCLOCK
 
-unsigned long mbedtls_timing_hardclock(void)
-{
+unsigned long mbedtls_timing_hardclock(void) {
     unsigned long tsc;
     __asm   rdtsc
     __asm   mov  [tsc], eax
@@ -95,8 +94,7 @@ unsigned long mbedtls_timing_hardclock(void)
 
 #define HAVE_HARDCLOCK
 
-unsigned long mbedtls_timing_hardclock(void)
-{
+unsigned long mbedtls_timing_hardclock(void) {
     unsigned long lo, hi;
     asm volatile("rdtsc" : "=a"(lo), "=d"(hi));
     return (lo);
@@ -109,8 +107,7 @@ unsigned long mbedtls_timing_hardclock(void)
 
 #define HAVE_HARDCLOCK
 
-unsigned long mbedtls_timing_hardclock(void)
-{
+unsigned long mbedtls_timing_hardclock(void) {
     unsigned long lo, hi;
     asm volatile("rdtsc" : "=a"(lo), "=d"(hi));
     return (lo | (hi << 32));
@@ -123,8 +120,7 @@ unsigned long mbedtls_timing_hardclock(void)
 
 #define HAVE_HARDCLOCK
 
-unsigned long mbedtls_timing_hardclock(void)
-{
+unsigned long mbedtls_timing_hardclock(void) {
     unsigned long tbl, tbu0, tbu1;
 
     do {
@@ -146,8 +142,7 @@ unsigned long mbedtls_timing_hardclock(void)
 #else
 #define HAVE_HARDCLOCK
 
-unsigned long mbedtls_timing_hardclock(void)
-{
+unsigned long mbedtls_timing_hardclock(void) {
     unsigned long tick;
     asm volatile("rdpr %%tick, %0;" : "=&r"(tick));
     return (tick);
@@ -161,8 +156,7 @@ unsigned long mbedtls_timing_hardclock(void)
 
 #define HAVE_HARDCLOCK
 
-unsigned long mbedtls_timing_hardclock(void)
-{
+unsigned long mbedtls_timing_hardclock(void) {
     unsigned long tick;
     asm volatile(".byte 0x83, 0x41, 0x00, 0x00");
     asm volatile("mov   %%g1, %0" : "=r"(tick));
@@ -176,8 +170,7 @@ unsigned long mbedtls_timing_hardclock(void)
 
 #define HAVE_HARDCLOCK
 
-unsigned long mbedtls_timing_hardclock(void)
-{
+unsigned long mbedtls_timing_hardclock(void) {
     unsigned long cc;
     asm volatile("rpcc %0" : "=r"(cc));
     return (cc & 0xFFFFFFFF);
@@ -190,8 +183,7 @@ unsigned long mbedtls_timing_hardclock(void)
 
 #define HAVE_HARDCLOCK
 
-unsigned long mbedtls_timing_hardclock(void)
-{
+unsigned long mbedtls_timing_hardclock(void) {
     unsigned long itc;
     asm volatile("mov %0 = ar.itc" : "=r"(itc));
     return (itc);
@@ -204,8 +196,7 @@ unsigned long mbedtls_timing_hardclock(void)
 
 #define HAVE_HARDCLOCK
 
-unsigned long mbedtls_timing_hardclock(void)
-{
+unsigned long mbedtls_timing_hardclock(void) {
     LARGE_INTEGER offset;
 
     QueryPerformanceCounter(&offset);
@@ -221,8 +212,7 @@ unsigned long mbedtls_timing_hardclock(void)
 static int hardclock_init = 0;
 static struct timeval tv_init;
 
-unsigned long mbedtls_timing_hardclock(void)
-{
+unsigned long mbedtls_timing_hardclock(void) {
     struct timeval tv_cur;
 
     if (hardclock_init == 0) {
@@ -248,8 +238,7 @@ volatile int mbedtls_timing_alarmed = 0;
 
 #if defined(_WIN32) && !defined(EFIX64) && !defined(EFI32)
 
-unsigned long mbedtls_timing_get_timer(struct mbedtls_timing_hr_time *val, int reset)
-{
+unsigned long mbedtls_timing_get_timer(struct mbedtls_timing_hr_time *val, int reset) {
     struct _hr_time *t = (struct _hr_time *) val;
 
     if (reset) {
@@ -269,16 +258,14 @@ unsigned long mbedtls_timing_get_timer(struct mbedtls_timing_hr_time *val, int r
 /* It's OK to use a global because alarm() is supposed to be global anyway */
 static DWORD alarmMs;
 
-static DWORD WINAPI TimerProc(LPVOID TimerContext)
-{
+static DWORD WINAPI TimerProc(LPVOID TimerContext) {
     ((void) TimerContext);
     Sleep(alarmMs);
     mbedtls_timing_alarmed = 1;
     return (TRUE);
 }
 
-void mbedtls_set_alarm(int seconds)
-{
+void mbedtls_set_alarm(int seconds) {
     DWORD ThreadId;
 
     if (seconds == 0) {
@@ -295,8 +282,7 @@ void mbedtls_set_alarm(int seconds)
 
 #else /* _WIN32 && !EFIX64 && !EFI32 */
 
-unsigned long mbedtls_timing_get_timer(struct mbedtls_timing_hr_time *val, int reset)
-{
+unsigned long mbedtls_timing_get_timer(struct mbedtls_timing_hr_time *val, int reset) {
     struct _hr_time *t = (struct _hr_time *) val;
 
     if (reset) {
@@ -312,14 +298,12 @@ unsigned long mbedtls_timing_get_timer(struct mbedtls_timing_hr_time *val, int r
     }
 }
 
-static void sighandler(int signum)
-{
+static void sighandler(int signum) {
     mbedtls_timing_alarmed = 1;
     signal(signum, sighandler);
 }
 
-void mbedtls_set_alarm(int seconds)
-{
+void mbedtls_set_alarm(int seconds) {
     mbedtls_timing_alarmed = 0;
     signal(SIGALRM, sighandler);
     alarm(seconds);
@@ -335,8 +319,7 @@ void mbedtls_set_alarm(int seconds)
 /*
  * Set delays to watch
  */
-void mbedtls_timing_set_delay(void *data, uint32_t int_ms, uint32_t fin_ms)
-{
+void mbedtls_timing_set_delay(void *data, uint32_t int_ms, uint32_t fin_ms) {
     mbedtls_timing_delay_context *ctx = (mbedtls_timing_delay_context *) data;
 
     ctx->int_ms = int_ms;
@@ -349,8 +332,7 @@ void mbedtls_timing_set_delay(void *data, uint32_t int_ms, uint32_t fin_ms)
 /*
  * Get number of delays expired
  */
-int mbedtls_timing_get_delay(void *data)
-{
+int mbedtls_timing_get_delay(void *data) {
     mbedtls_timing_delay_context *ctx = (mbedtls_timing_delay_context *) data;
     unsigned long elapsed_ms;
 
@@ -376,8 +358,7 @@ int mbedtls_timing_get_delay(void *data)
  * Busy-waits for the given number of milliseconds.
  * Used for testing mbedtls_timing_hardclock.
  */
-static void busy_msleep(unsigned long msec)
-{
+static void busy_msleep(unsigned long msec) {
     struct mbedtls_timing_hr_time hires;
     unsigned long i = 0; /* for busy-waiting */
     volatile unsigned long j; /* to prevent optimisation */
@@ -413,8 +394,7 @@ static void busy_msleep(unsigned long msec)
  * Warning: this is work in progress, some tests may not be reliable enough
  * yet! False positives may happen.
  */
-int mbedtls_timing_self_test(int verbose)
-{
+int mbedtls_timing_self_test(int verbose) {
     unsigned long cycles = 0, ratio = 0;
     unsigned long millisecs = 0, secs = 0;
     int hardfail = 0;
@@ -509,7 +489,7 @@ hard_test:
 
         /* Allow variation up to 20% */
         if (cycles / millisecs < ratio - ratio / 5 ||
-            cycles / millisecs > ratio + ratio / 5) {
+                cycles / millisecs > ratio + ratio / 5) {
             hardfail++;
             goto hard_test;
         }
diff --git a/common/mbedtls/x509.c b/common/mbedtls/x509.c
index cd5f5c07a..8b9043033 100644
--- a/common/mbedtls/x509.c
+++ b/common/mbedtls/x509.c
@@ -79,8 +79,7 @@
  *  CertificateSerialNumber  ::=  INTEGER
  */
 int mbedtls_x509_get_serial(unsigned char **p, const unsigned char *end,
-                            mbedtls_x509_buf *serial)
-{
+                            mbedtls_x509_buf *serial) {
     int ret;
 
     if ((end - *p) < 1)
@@ -88,7 +87,7 @@ int mbedtls_x509_get_serial(unsigned char **p, const unsigned char *end,
                 MBEDTLS_ERR_ASN1_OUT_OF_DATA);
 
     if (**p != (MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_PRIMITIVE | 2) &&
-        **p !=   MBEDTLS_ASN1_INTEGER)
+            **p !=   MBEDTLS_ASN1_INTEGER)
         return (MBEDTLS_ERR_X509_INVALID_SERIAL +
                 MBEDTLS_ERR_ASN1_UNEXPECTED_TAG);
 
@@ -110,8 +109,7 @@ int mbedtls_x509_get_serial(unsigned char **p, const unsigned char *end,
  *       parameters              ANY DEFINED BY algorithm OPTIONAL  }
  */
 int mbedtls_x509_get_alg_null(unsigned char **p, const unsigned char *end,
-                              mbedtls_x509_buf *alg)
-{
+                              mbedtls_x509_buf *alg) {
     int ret;
 
     if ((ret = mbedtls_asn1_get_alg_null(p, end, alg)) != 0)
@@ -124,8 +122,7 @@ int mbedtls_x509_get_alg_null(unsigned char **p, const unsigned char *end,
  * Parse an algorithm identifier with (optional) paramaters
  */
 int mbedtls_x509_get_alg(unsigned char **p, const unsigned char *end,
-                         mbedtls_x509_buf *alg, mbedtls_x509_buf *params)
-{
+                         mbedtls_x509_buf *alg, mbedtls_x509_buf *params) {
     int ret;
 
     if ((ret = mbedtls_asn1_get_alg(p, end, alg, params)) != 0)
@@ -144,8 +141,7 @@ int mbedtls_x509_get_alg(unsigned char **p, const unsigned char *end,
  *
  * For HashAlgorithm, parameters MUST be NULL or absent.
  */
-static int x509_get_hash_alg(const mbedtls_x509_buf *alg, mbedtls_md_type_t *md_alg)
-{
+static int x509_get_hash_alg(const mbedtls_x509_buf *alg, mbedtls_md_type_t *md_alg) {
     int ret;
     unsigned char *p;
     const unsigned char *end;
@@ -205,8 +201,7 @@ static int x509_get_hash_alg(const mbedtls_x509_buf *alg, mbedtls_md_type_t *md_
  */
 int mbedtls_x509_get_rsassa_pss_params(const mbedtls_x509_buf *params,
                                        mbedtls_md_type_t *md_alg, mbedtls_md_type_t *mgf_md,
-                                       int *salt_len)
-{
+                                       int *salt_len) {
     int ret;
     unsigned char *p;
     const unsigned char *end, *end2;
@@ -340,8 +335,7 @@ int mbedtls_x509_get_rsassa_pss_params(const mbedtls_x509_buf *params,
  */
 static int x509_get_attr_type_value(unsigned char **p,
                                     const unsigned char *end,
-                                    mbedtls_x509_name *cur)
-{
+                                    mbedtls_x509_name *cur) {
     int ret;
     size_t len;
     mbedtls_x509_buf *oid;
@@ -369,9 +363,9 @@ static int x509_get_attr_type_value(unsigned char **p,
                 MBEDTLS_ERR_ASN1_OUT_OF_DATA);
 
     if (**p != MBEDTLS_ASN1_BMP_STRING && **p != MBEDTLS_ASN1_UTF8_STRING      &&
-        **p != MBEDTLS_ASN1_T61_STRING && **p != MBEDTLS_ASN1_PRINTABLE_STRING &&
-        **p != MBEDTLS_ASN1_IA5_STRING && **p != MBEDTLS_ASN1_UNIVERSAL_STRING &&
-        **p != MBEDTLS_ASN1_BIT_STRING)
+            **p != MBEDTLS_ASN1_T61_STRING && **p != MBEDTLS_ASN1_PRINTABLE_STRING &&
+            **p != MBEDTLS_ASN1_IA5_STRING && **p != MBEDTLS_ASN1_UNIVERSAL_STRING &&
+            **p != MBEDTLS_ASN1_BIT_STRING)
         return (MBEDTLS_ERR_X509_INVALID_NAME +
                 MBEDTLS_ERR_ASN1_UNEXPECTED_TAG);
 
@@ -413,8 +407,7 @@ static int x509_get_attr_type_value(unsigned char **p,
  * this list, eg mbedtls_x509_dn_gets().
  */
 int mbedtls_x509_get_name(unsigned char **p, const unsigned char *end,
-                          mbedtls_x509_name *cur)
-{
+                          mbedtls_x509_name *cur) {
     int ret;
     size_t set_len;
     const unsigned char *end_set;
@@ -463,8 +456,7 @@ int mbedtls_x509_get_name(unsigned char **p, const unsigned char *end,
     }
 }
 
-static int x509_parse_int(unsigned char **p, size_t n, int *res)
-{
+static int x509_parse_int(unsigned char **p, size_t n, int *res) {
     *res = 0;
 
     for (; n > 0; --n) {
@@ -478,8 +470,7 @@ static int x509_parse_int(unsigned char **p, size_t n, int *res)
     return (0);
 }
 
-static int x509_date_is_valid(const mbedtls_x509_time *t)
-{
+static int x509_date_is_valid(const mbedtls_x509_time *t) {
     int ret = MBEDTLS_ERR_X509_INVALID_DATE;
     int month_len;
 
@@ -506,7 +497,7 @@ static int x509_date_is_valid(const mbedtls_x509_time *t)
             break;
         case 2:
             if ((!(t->year % 4) && t->year % 100) ||
-                !(t->year % 400))
+                    !(t->year % 400))
                 month_len = 29;
             else
                 month_len = 28;
@@ -524,8 +515,7 @@ static int x509_date_is_valid(const mbedtls_x509_time *t)
  * field.
  */
 static int x509_parse_time(unsigned char **p, size_t len, size_t yearlen,
-                           mbedtls_x509_time *tm)
-{
+                           mbedtls_x509_time *tm) {
     int ret;
 
     /*
@@ -585,8 +575,7 @@ static int x509_parse_time(unsigned char **p, size_t len, size_t yearlen,
  *       generalTime    GeneralizedTime }
  */
 int mbedtls_x509_get_time(unsigned char **p, const unsigned char *end,
-                          mbedtls_x509_time *tm)
-{
+                          mbedtls_x509_time *tm) {
     int ret;
     size_t len, year_len;
     unsigned char tag;
@@ -614,8 +603,7 @@ int mbedtls_x509_get_time(unsigned char **p, const unsigned char *end,
     return x509_parse_time(p, len, year_len, tm);
 }
 
-int mbedtls_x509_get_sig(unsigned char **p, const unsigned char *end, mbedtls_x509_buf *sig)
-{
+int mbedtls_x509_get_sig(unsigned char **p, const unsigned char *end, mbedtls_x509_buf *sig) {
     int ret;
     size_t len;
     int tag_type;
@@ -643,8 +631,7 @@ int mbedtls_x509_get_sig(unsigned char **p, const unsigned char *end, mbedtls_x5
  */
 int mbedtls_x509_get_sig_alg(const mbedtls_x509_buf *sig_oid, const mbedtls_x509_buf *sig_params,
                              mbedtls_md_type_t *md_alg, mbedtls_pk_type_t *pk_alg,
-                             void **sig_opts)
-{
+                             void **sig_opts) {
     int ret;
 
     if (*sig_opts != NULL)
@@ -676,7 +663,7 @@ int mbedtls_x509_get_sig_alg(const mbedtls_x509_buf *sig_oid, const mbedtls_x509
     {
         /* Make sure parameters are absent or NULL */
         if ((sig_params->tag != MBEDTLS_ASN1_NULL && sig_params->tag != 0) ||
-            sig_params->len != 0)
+                sig_params->len != 0)
             return (MBEDTLS_ERR_X509_INVALID_ALG);
     }
 
@@ -688,8 +675,7 @@ int mbedtls_x509_get_sig_alg(const mbedtls_x509_buf *sig_oid, const mbedtls_x509
  * be either manually updated or extensions should be parsed!)
  */
 int mbedtls_x509_get_ext(unsigned char **p, const unsigned char *end,
-                         mbedtls_x509_buf *ext, int tag)
-{
+                         mbedtls_x509_buf *ext, int tag) {
     int ret;
     size_t len;
 
@@ -728,8 +714,7 @@ int mbedtls_x509_get_ext(unsigned char **p, const unsigned char *end,
  * Store the name in printable form into buf; no more
  * than size characters will be written
  */
-int mbedtls_x509_dn_gets(char *buf, size_t size, const mbedtls_x509_name *dn)
-{
+int mbedtls_x509_dn_gets(char *buf, size_t size, const mbedtls_x509_name *dn) {
     int ret;
     size_t i, n;
     unsigned char c, merge = 0;
@@ -786,8 +771,7 @@ int mbedtls_x509_dn_gets(char *buf, size_t size, const mbedtls_x509_name *dn)
  * Store the serial in printable form into buf; no more
  * than size characters will be written
  */
-int mbedtls_x509_serial_gets(char *buf, size_t size, const mbedtls_x509_buf *serial)
-{
+int mbedtls_x509_serial_gets(char *buf, size_t size, const mbedtls_x509_buf *serial) {
     int ret;
     size_t i, n, nr;
     char *p;
@@ -820,8 +804,7 @@ int mbedtls_x509_serial_gets(char *buf, size_t size, const mbedtls_x509_buf *ser
  */
 int mbedtls_x509_sig_alg_gets(char *buf, size_t size, const mbedtls_x509_buf *sig_oid,
                               mbedtls_pk_type_t pk_alg, mbedtls_md_type_t md_alg,
-                              const void *sig_opts)
-{
+                              const void *sig_opts) {
     int ret;
     char *p = buf;
     size_t n = size;
@@ -862,8 +845,7 @@ int mbedtls_x509_sig_alg_gets(char *buf, size_t size, const mbedtls_x509_buf *si
 /*
  * Helper for writing "RSA key size", "EC key size", etc
  */
-int mbedtls_x509_key_size_helper(char *buf, size_t buf_size, const char *name)
-{
+int mbedtls_x509_key_size_helper(char *buf, size_t buf_size, const char *name) {
     char *p = buf;
     size_t n = buf_size;
     int ret;
@@ -879,8 +861,7 @@ int mbedtls_x509_key_size_helper(char *buf, size_t buf_size, const char *name)
  * Set the time structure to the current time.
  * Return 0 on success, non-zero on failure.
  */
-static int x509_get_current_time(mbedtls_x509_time *now)
-{
+static int x509_get_current_time(mbedtls_x509_time *now) {
     struct tm *lt, tm_buf;
     mbedtls_time_t tt;
     int ret = 0;
@@ -909,46 +890,44 @@ static int x509_get_current_time(mbedtls_x509_time *now)
 /*
  * Return 0 if before <= after, 1 otherwise
  */
-static int x509_check_time(const mbedtls_x509_time *before, const mbedtls_x509_time *after)
-{
+static int x509_check_time(const mbedtls_x509_time *before, const mbedtls_x509_time *after) {
     if (before->year  > after->year)
         return (1);
 
     if (before->year == after->year &&
-        before->mon   > after->mon)
+            before->mon   > after->mon)
         return (1);
 
     if (before->year == after->year &&
-        before->mon  == after->mon  &&
-        before->day   > after->day)
+            before->mon  == after->mon  &&
+            before->day   > after->day)
         return (1);
 
     if (before->year == after->year &&
-        before->mon  == after->mon  &&
-        before->day  == after->day  &&
-        before->hour  > after->hour)
+            before->mon  == after->mon  &&
+            before->day  == after->day  &&
+            before->hour  > after->hour)
         return (1);
 
     if (before->year == after->year &&
-        before->mon  == after->mon  &&
-        before->day  == after->day  &&
-        before->hour == after->hour &&
-        before->min   > after->min)
+            before->mon  == after->mon  &&
+            before->day  == after->day  &&
+            before->hour == after->hour &&
+            before->min   > after->min)
         return (1);
 
     if (before->year == after->year &&
-        before->mon  == after->mon  &&
-        before->day  == after->day  &&
-        before->hour == after->hour &&
-        before->min  == after->min  &&
-        before->sec   > after->sec)
+            before->mon  == after->mon  &&
+            before->day  == after->day  &&
+            before->hour == after->hour &&
+            before->min  == after->min  &&
+            before->sec   > after->sec)
         return (1);
 
     return (0);
 }
 
-int mbedtls_x509_time_is_past(const mbedtls_x509_time *to)
-{
+int mbedtls_x509_time_is_past(const mbedtls_x509_time *to) {
     mbedtls_x509_time now;
 
     if (x509_get_current_time(&now) != 0)
@@ -957,8 +936,7 @@ int mbedtls_x509_time_is_past(const mbedtls_x509_time *to)
     return (x509_check_time(&now, to));
 }
 
-int mbedtls_x509_time_is_future(const mbedtls_x509_time *from)
-{
+int mbedtls_x509_time_is_future(const mbedtls_x509_time *from) {
     mbedtls_x509_time now;
 
     if (x509_get_current_time(&now) != 0)
@@ -969,14 +947,12 @@ int mbedtls_x509_time_is_future(const mbedtls_x509_time *from)
 
 #else  /* MBEDTLS_HAVE_TIME_DATE */
 
-int mbedtls_x509_time_is_past(const mbedtls_x509_time *to)
-{
+int mbedtls_x509_time_is_past(const mbedtls_x509_time *to) {
     ((void) to);
     return (0);
 }
 
-int mbedtls_x509_time_is_future(const mbedtls_x509_time *from)
-{
+int mbedtls_x509_time_is_future(const mbedtls_x509_time *from) {
     ((void) from);
     return (0);
 }
@@ -990,8 +966,7 @@ int mbedtls_x509_time_is_future(const mbedtls_x509_time *from)
 /*
  * Checkup routine
  */
-int mbedtls_x509_self_test(int verbose)
-{
+int mbedtls_x509_self_test(int verbose) {
 #if defined(MBEDTLS_CERTS_C) && defined(MBEDTLS_SHA256_C)
     int ret;
     uint32_t flags;
diff --git a/common/mbedtls/x509_crl.c b/common/mbedtls/x509_crl.c
index d02667e62..1bf08213f 100644
--- a/common/mbedtls/x509_crl.c
+++ b/common/mbedtls/x509_crl.c
@@ -74,8 +74,7 @@
  */
 static int x509_crl_get_version(unsigned char **p,
                                 const unsigned char *end,
-                                int *ver)
-{
+                                int *ver) {
     int ret;
 
     if ((ret = mbedtls_asn1_get_int(p, end, ver)) != 0) {
@@ -99,8 +98,7 @@ static int x509_crl_get_version(unsigned char **p,
  */
 static int x509_get_crl_ext(unsigned char **p,
                             const unsigned char *end,
-                            mbedtls_x509_buf *ext)
-{
+                            mbedtls_x509_buf *ext) {
     int ret;
 
     /*
@@ -142,7 +140,7 @@ static int x509_get_crl_ext(unsigned char **p,
         /* Get optional critical */
         if ((ret = mbedtls_asn1_get_bool(p, end_ext_data,
                                          &is_critical)) != 0 &&
-            (ret != MBEDTLS_ERR_ASN1_UNEXPECTED_TAG)) {
+                (ret != MBEDTLS_ERR_ASN1_UNEXPECTED_TAG)) {
             return (MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret);
         }
 
@@ -175,8 +173,7 @@ static int x509_get_crl_ext(unsigned char **p,
  */
 static int x509_get_crl_entry_ext(unsigned char **p,
                                   const unsigned char *end,
-                                  mbedtls_x509_buf *ext)
-{
+                                  mbedtls_x509_buf *ext) {
     int ret;
     size_t len = 0;
 
@@ -226,8 +223,7 @@ static int x509_get_crl_entry_ext(unsigned char **p,
  */
 static int x509_get_entries(unsigned char **p,
                             const unsigned char *end,
-                            mbedtls_x509_crl_entry *entry)
-{
+                            mbedtls_x509_crl_entry *entry) {
     int ret;
     size_t entry_len;
     mbedtls_x509_crl_entry *cur_entry = entry;
@@ -287,8 +283,7 @@ static int x509_get_entries(unsigned char **p,
  * Parse one  CRLs in DER format and append it to the chained list
  */
 int mbedtls_x509_crl_parse_der(mbedtls_x509_crl *chain,
-                               const unsigned char *buf, size_t buflen)
-{
+                               const unsigned char *buf, size_t buflen) {
     int ret;
     size_t len;
     unsigned char *p = NULL, *end = NULL;
@@ -379,7 +374,7 @@ int mbedtls_x509_crl_parse_der(mbedtls_x509_crl *chain,
      * signature            AlgorithmIdentifier
      */
     if ((ret = x509_crl_get_version(&p, end, &crl->version)) != 0 ||
-        (ret = mbedtls_x509_get_alg(&p, end, &crl->sig_oid, &sig_params1)) != 0) {
+            (ret = mbedtls_x509_get_alg(&p, end, &crl->sig_oid, &sig_params1)) != 0) {
         mbedtls_x509_crl_free(crl);
         return (ret);
     }
@@ -428,8 +423,8 @@ int mbedtls_x509_crl_parse_der(mbedtls_x509_crl *chain,
     if ((ret = mbedtls_x509_get_time(&p, end, &crl->next_update)) != 0) {
         if (ret != (MBEDTLS_ERR_X509_INVALID_DATE +
                     MBEDTLS_ERR_ASN1_UNEXPECTED_TAG) &&
-            ret != (MBEDTLS_ERR_X509_INVALID_DATE +
-                    MBEDTLS_ERR_ASN1_OUT_OF_DATA)) {
+                ret != (MBEDTLS_ERR_X509_INVALID_DATE +
+                        MBEDTLS_ERR_ASN1_OUT_OF_DATA)) {
             mbedtls_x509_crl_free(crl);
             return (ret);
         }
@@ -479,10 +474,10 @@ int mbedtls_x509_crl_parse_der(mbedtls_x509_crl *chain,
     }
 
     if (crl->sig_oid.len != sig_oid2.len ||
-        memcmp(crl->sig_oid.p, sig_oid2.p, crl->sig_oid.len) != 0 ||
-        sig_params1.len != sig_params2.len ||
-        (sig_params1.len != 0 &&
-         memcmp(sig_params1.p, sig_params2.p, sig_params1.len) != 0)) {
+            memcmp(crl->sig_oid.p, sig_oid2.p, crl->sig_oid.len) != 0 ||
+            sig_params1.len != sig_params2.len ||
+            (sig_params1.len != 0 &&
+             memcmp(sig_params1.p, sig_params2.p, sig_params1.len) != 0)) {
         mbedtls_x509_crl_free(crl);
         return (MBEDTLS_ERR_X509_SIG_MISMATCH);
     }
@@ -504,8 +499,7 @@ int mbedtls_x509_crl_parse_der(mbedtls_x509_crl *chain,
 /*
  * Parse one or more CRLs and add them to the chained list
  */
-int mbedtls_x509_crl_parse(mbedtls_x509_crl *chain, const unsigned char *buf, size_t buflen)
-{
+int mbedtls_x509_crl_parse(mbedtls_x509_crl *chain, const unsigned char *buf, size_t buflen) {
 #if defined(MBEDTLS_PEM_PARSE_C)
     int ret;
     size_t use_len;
@@ -564,8 +558,7 @@ int mbedtls_x509_crl_parse(mbedtls_x509_crl *chain, const unsigned char *buf, si
 /*
  * Load one or more CRLs and add them to the chained list
  */
-int mbedtls_x509_crl_parse_file(mbedtls_x509_crl *chain, const char *path)
-{
+int mbedtls_x509_crl_parse_file(mbedtls_x509_crl *chain, const char *path) {
     int ret;
     size_t n;
     unsigned char *buf;
@@ -591,8 +584,7 @@ int mbedtls_x509_crl_parse_file(mbedtls_x509_crl *chain, const char *path)
  * Return an informational string about the CRL.
  */
 int mbedtls_x509_crl_info(char *buf, size_t size, const char *prefix,
-                          const mbedtls_x509_crl *crl)
-{
+                          const mbedtls_x509_crl *crl) {
     int ret;
     size_t n;
     char *p;
@@ -664,16 +656,14 @@ int mbedtls_x509_crl_info(char *buf, size_t size, const char *prefix,
 /*
  * Initialize a CRL chain
  */
-void mbedtls_x509_crl_init(mbedtls_x509_crl *crl)
-{
+void mbedtls_x509_crl_init(mbedtls_x509_crl *crl) {
     memset(crl, 0, sizeof(mbedtls_x509_crl));
 }
 
 /*
  * Unallocate all CRL data
  */
-void mbedtls_x509_crl_free(mbedtls_x509_crl *crl)
-{
+void mbedtls_x509_crl_free(mbedtls_x509_crl *crl) {
     mbedtls_x509_crl *crl_cur = crl;
     mbedtls_x509_crl *crl_prv;
     mbedtls_x509_name *name_cur;
diff --git a/common/mbedtls/x509_crt.c b/common/mbedtls/x509_crt.c
index 4a6567a19..de3e5ece8 100644
--- a/common/mbedtls/x509_crt.c
+++ b/common/mbedtls/x509_crt.c
@@ -160,8 +160,7 @@ const mbedtls_x509_crt_profile mbedtls_x509_crt_profile_suiteb = {
  * Return 0 if md_alg is acceptable for this profile, -1 otherwise
  */
 static int x509_profile_check_md_alg(const mbedtls_x509_crt_profile *profile,
-                                     mbedtls_md_type_t md_alg)
-{
+                                     mbedtls_md_type_t md_alg) {
     if (md_alg == MBEDTLS_MD_NONE)
         return (-1);
 
@@ -176,8 +175,7 @@ static int x509_profile_check_md_alg(const mbedtls_x509_crt_profile *profile,
  * Return 0 if pk_alg is acceptable for this profile, -1 otherwise
  */
 static int x509_profile_check_pk_alg(const mbedtls_x509_crt_profile *profile,
-                                     mbedtls_pk_type_t pk_alg)
-{
+                                     mbedtls_pk_type_t pk_alg) {
     if (pk_alg == MBEDTLS_PK_NONE)
         return (-1);
 
@@ -192,8 +190,7 @@ static int x509_profile_check_pk_alg(const mbedtls_x509_crt_profile *profile,
  * Return 0 if pk is acceptable for this profile, -1 otherwise
  */
 static int x509_profile_check_key(const mbedtls_x509_crt_profile *profile,
-                                  const mbedtls_pk_context *pk)
-{
+                                  const mbedtls_pk_context *pk) {
     const mbedtls_pk_type_t pk_alg = mbedtls_pk_get_type(pk);
 
 #if defined(MBEDTLS_RSA_C)
@@ -207,8 +204,8 @@ static int x509_profile_check_key(const mbedtls_x509_crt_profile *profile,
 
 #if defined(MBEDTLS_ECP_C)
     if (pk_alg == MBEDTLS_PK_ECDSA ||
-        pk_alg == MBEDTLS_PK_ECKEY ||
-        pk_alg == MBEDTLS_PK_ECKEY_DH) {
+            pk_alg == MBEDTLS_PK_ECKEY ||
+            pk_alg == MBEDTLS_PK_ECKEY_DH) {
         const mbedtls_ecp_group_id gid = mbedtls_pk_ec(*pk)->grp.id;
 
         if (gid == MBEDTLS_ECP_DP_NONE)
@@ -229,8 +226,7 @@ static int x509_profile_check_key(const mbedtls_x509_crt_profile *profile,
  */
 static int x509_get_version(unsigned char **p,
                             const unsigned char *end,
-                            int *ver)
-{
+                            int *ver) {
     int ret;
     size_t len;
 
@@ -264,8 +260,7 @@ static int x509_get_version(unsigned char **p,
 static int x509_get_dates(unsigned char **p,
                           const unsigned char *end,
                           mbedtls_x509_time *from,
-                          mbedtls_x509_time *to)
-{
+                          mbedtls_x509_time *to) {
     int ret;
     size_t len;
 
@@ -293,8 +288,7 @@ static int x509_get_dates(unsigned char **p,
  */
 static int x509_get_uid(unsigned char **p,
                         const unsigned char *end,
-                        mbedtls_x509_buf *uid, int n)
-{
+                        mbedtls_x509_buf *uid, int n) {
     int ret;
 
     if (*p == end)
@@ -319,8 +313,7 @@ static int x509_get_uid(unsigned char **p,
 static int x509_get_basic_constraints(unsigned char **p,
                                       const unsigned char *end,
                                       int *ca_istrue,
-                                      int *max_pathlen)
-{
+                                      int *max_pathlen) {
     int ret;
     size_t len;
 
@@ -367,8 +360,7 @@ static int x509_get_basic_constraints(unsigned char **p,
 
 static int x509_get_ns_cert_type(unsigned char **p,
                                  const unsigned char *end,
-                                 unsigned char *ns_cert_type)
-{
+                                 unsigned char *ns_cert_type) {
     int ret;
     mbedtls_x509_bitstring bs = { 0, 0, NULL };
 
@@ -386,8 +378,7 @@ static int x509_get_ns_cert_type(unsigned char **p,
 
 static int x509_get_key_usage(unsigned char **p,
                               const unsigned char *end,
-                              unsigned int *key_usage)
-{
+                              unsigned int *key_usage) {
     int ret;
     size_t i;
     mbedtls_x509_bitstring bs = { 0, 0, NULL };
@@ -415,8 +406,7 @@ static int x509_get_key_usage(unsigned char **p,
  */
 static int x509_get_ext_key_usage(unsigned char **p,
                                   const unsigned char *end,
-                                  mbedtls_x509_sequence *ext_key_usage)
-{
+                                  mbedtls_x509_sequence *ext_key_usage) {
     int ret;
 
     if ((ret = mbedtls_asn1_get_sequence_of(p, end, ext_key_usage, MBEDTLS_ASN1_OID)) != 0)
@@ -458,8 +448,7 @@ static int x509_get_ext_key_usage(unsigned char **p,
  */
 static int x509_get_subject_alt_name(unsigned char **p,
                                      const unsigned char *end,
-                                     mbedtls_x509_sequence *subject_alt_name)
-{
+                                     mbedtls_x509_sequence *subject_alt_name) {
     int ret;
     size_t len, tag_len;
     mbedtls_asn1_buf *buf;
@@ -486,7 +475,7 @@ static int x509_get_subject_alt_name(unsigned char **p,
             return (MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret);
 
         if ((tag & MBEDTLS_ASN1_TAG_CLASS_MASK) !=
-            MBEDTLS_ASN1_CONTEXT_SPECIFIC) {
+                MBEDTLS_ASN1_CONTEXT_SPECIFIC) {
             return (MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
                     MBEDTLS_ERR_ASN1_UNEXPECTED_TAG);
         }
@@ -534,8 +523,7 @@ static int x509_get_subject_alt_name(unsigned char **p,
  */
 static int x509_get_crt_ext(unsigned char **p,
                             const unsigned char *end,
-                            mbedtls_x509_crt *crt)
-{
+                            mbedtls_x509_crt *crt) {
     int ret;
     size_t len;
     unsigned char *end_ext_data, *end_ext_octet;
@@ -575,7 +563,7 @@ static int x509_get_crt_ext(unsigned char **p,
 
         /* Get optional critical */
         if ((ret = mbedtls_asn1_get_bool(p, end_ext_data, &is_critical)) != 0 &&
-            (ret != MBEDTLS_ERR_ASN1_UNEXPECTED_TAG))
+                (ret != MBEDTLS_ERR_ASN1_UNEXPECTED_TAG))
             return (MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret);
 
         /* Data should be octet string type */
@@ -666,8 +654,7 @@ static int x509_get_crt_ext(unsigned char **p,
  * Parse and fill a single X.509 certificate in DER format
  */
 static int x509_crt_parse_der_core(mbedtls_x509_crt *crt, const unsigned char *buf,
-                                   size_t buflen)
-{
+                                   size_t buflen) {
     int ret;
     size_t len;
     unsigned char *p, *end, *crt_end;
@@ -741,9 +728,9 @@ static int x509_crt_parse_der_core(mbedtls_x509_crt *crt, const unsigned char *b
      * signature            AlgorithmIdentifier
      */
     if ((ret = x509_get_version(&p, end, &crt->version)) != 0 ||
-        (ret = mbedtls_x509_get_serial(&p, end, &crt->serial)) != 0 ||
-        (ret = mbedtls_x509_get_alg(&p, end, &crt->sig_oid,
-                                    &sig_params1)) != 0) {
+            (ret = mbedtls_x509_get_serial(&p, end, &crt->serial)) != 0 ||
+            (ret = mbedtls_x509_get_alg(&p, end, &crt->sig_oid,
+                                        &sig_params1)) != 0) {
         mbedtls_x509_crt_free(crt);
         return (ret);
     }
@@ -874,10 +861,10 @@ static int x509_crt_parse_der_core(mbedtls_x509_crt *crt, const unsigned char *b
     }
 
     if (crt->sig_oid.len != sig_oid2.len ||
-        memcmp(crt->sig_oid.p, sig_oid2.p, crt->sig_oid.len) != 0 ||
-        sig_params1.len != sig_params2.len ||
-        (sig_params1.len != 0 &&
-         memcmp(sig_params1.p, sig_params2.p, sig_params1.len) != 0)) {
+            memcmp(crt->sig_oid.p, sig_oid2.p, crt->sig_oid.len) != 0 ||
+            sig_params1.len != sig_params2.len ||
+            (sig_params1.len != 0 &&
+             memcmp(sig_params1.p, sig_params2.p, sig_params1.len) != 0)) {
         mbedtls_x509_crt_free(crt);
         return (MBEDTLS_ERR_X509_SIG_MISMATCH);
     }
@@ -901,8 +888,7 @@ static int x509_crt_parse_der_core(mbedtls_x509_crt *crt, const unsigned char *b
  * chained list
  */
 int mbedtls_x509_crt_parse_der(mbedtls_x509_crt *chain, const unsigned char *buf,
-                               size_t buflen)
-{
+                               size_t buflen) {
     int ret;
     mbedtls_x509_crt *crt = chain, *prev = NULL;
 
@@ -948,8 +934,7 @@ int mbedtls_x509_crt_parse_der(mbedtls_x509_crt *chain, const unsigned char *buf
  * Parse one or more PEM certificates from a buffer and add them to the chained
  * list
  */
-int mbedtls_x509_crt_parse(mbedtls_x509_crt *chain, const unsigned char *buf, size_t buflen)
-{
+int mbedtls_x509_crt_parse(mbedtls_x509_crt *chain, const unsigned char *buf, size_t buflen) {
 #if defined(MBEDTLS_PEM_PARSE_C)
     int success = 0, first_error = 0, total_failed = 0;
     int buf_format = MBEDTLS_X509_FORMAT_DER;
@@ -967,7 +952,7 @@ int mbedtls_x509_crt_parse(mbedtls_x509_crt *chain, const unsigned char *buf, si
      */
 #if defined(MBEDTLS_PEM_PARSE_C)
     if (buflen != 0 && buf[buflen - 1] == '\0' &&
-        strstr((const char *) buf, "-----BEGIN CERTIFICATE-----") != NULL) {
+            strstr((const char *) buf, "-----BEGIN CERTIFICATE-----") != NULL) {
         buf_format = MBEDTLS_X509_FORMAT_PEM;
     }
 
@@ -1053,8 +1038,7 @@ int mbedtls_x509_crt_parse(mbedtls_x509_crt *chain, const unsigned char *buf, si
 /*
  * Load one or more certificates and add them to the chained list
  */
-int mbedtls_x509_crt_parse_file(mbedtls_x509_crt *chain, const char *path)
-{
+int mbedtls_x509_crt_parse_file(mbedtls_x509_crt *chain, const char *path) {
     int ret;
     size_t n;
     unsigned char *buf;
@@ -1070,8 +1054,7 @@ int mbedtls_x509_crt_parse_file(mbedtls_x509_crt *chain, const char *path)
     return (ret);
 }
 
-int mbedtls_x509_crt_parse_path(mbedtls_x509_crt *chain, const char *path)
-{
+int mbedtls_x509_crt_parse_path(mbedtls_x509_crt *chain, const char *path) {
     int ret = 0;
 #if defined(_WIN32) && !defined(EFIX64) && !defined(EFI32)
     int w_ret;
@@ -1187,8 +1170,7 @@ cleanup:
 #endif /* MBEDTLS_FS_IO */
 
 static int x509_info_subject_alt_name(char **buf, size_t *size,
-                                      const mbedtls_x509_sequence *subject_alt_name)
-{
+                                      const mbedtls_x509_sequence *subject_alt_name) {
     size_t i;
     size_t n = *size;
     char *p = *buf;
@@ -1234,8 +1216,7 @@ static int x509_info_subject_alt_name(char **buf, size_t *size,
         PRINT_ITEM( name );
 
 static int x509_info_cert_type(char **buf, size_t *size,
-                               unsigned char ns_cert_type)
-{
+                               unsigned char ns_cert_type) {
     int ret;
     size_t n = *size;
     char *p = *buf;
@@ -1261,8 +1242,7 @@ static int x509_info_cert_type(char **buf, size_t *size,
         PRINT_ITEM( name );
 
 static int x509_info_key_usage(char **buf, size_t *size,
-                               unsigned int key_usage)
-{
+                               unsigned int key_usage) {
     int ret;
     size_t n = *size;
     char *p = *buf;
@@ -1285,8 +1265,7 @@ static int x509_info_key_usage(char **buf, size_t *size,
 }
 
 static int x509_info_ext_key_usage(char **buf, size_t *size,
-                                   const mbedtls_x509_sequence *extended_key_usage)
-{
+                                   const mbedtls_x509_sequence *extended_key_usage) {
     int ret;
     const char *desc;
     size_t n = *size;
@@ -1318,8 +1297,7 @@ static int x509_info_ext_key_usage(char **buf, size_t *size,
 #define BEFORE_COLON    18
 #define BC              "18"
 int mbedtls_x509_crt_info(char *buf, size_t size, const char *prefix,
-                          const mbedtls_x509_crt *crt)
-{
+                          const mbedtls_x509_crt *crt) {
     int ret;
     size_t n;
     char *p;
@@ -1471,8 +1449,7 @@ static const struct x509_crt_verify_string x509_crt_verify_strings[] = {
 };
 
 int mbedtls_x509_crt_verify_info(char *buf, size_t size, const char *prefix,
-                                 uint32_t flags)
-{
+                                 uint32_t flags) {
     int ret;
     const struct x509_crt_verify_string *cur;
     char *p = buf;
@@ -1498,8 +1475,7 @@ int mbedtls_x509_crt_verify_info(char *buf, size_t size, const char *prefix,
 
 #if defined(MBEDTLS_X509_CHECK_KEY_USAGE)
 int mbedtls_x509_crt_check_key_usage(const mbedtls_x509_crt *crt,
-                                     unsigned int usage)
-{
+                                     unsigned int usage) {
     unsigned int usage_must, usage_may;
     unsigned int may_mask = MBEDTLS_X509_KU_ENCIPHER_ONLY
                             | MBEDTLS_X509_KU_DECIPHER_ONLY;
@@ -1524,8 +1500,7 @@ int mbedtls_x509_crt_check_key_usage(const mbedtls_x509_crt *crt,
 #if defined(MBEDTLS_X509_CHECK_EXTENDED_KEY_USAGE)
 int mbedtls_x509_crt_check_extended_key_usage(const mbedtls_x509_crt *crt,
                                               const char *usage_oid,
-                                              size_t usage_len)
-{
+                                              size_t usage_len) {
     const mbedtls_x509_sequence *cur;
 
     /* Extension is not mandatory, absent means no restriction */
@@ -1539,7 +1514,7 @@ int mbedtls_x509_crt_check_extended_key_usage(const mbedtls_x509_crt *crt,
         const mbedtls_x509_buf *cur_oid = &cur->buf;
 
         if (cur_oid->len == usage_len &&
-            memcmp(cur_oid->p, usage_oid, usage_len) == 0) {
+                memcmp(cur_oid->p, usage_oid, usage_len) == 0) {
             return (0);
         }
 
@@ -1555,13 +1530,12 @@ int mbedtls_x509_crt_check_extended_key_usage(const mbedtls_x509_crt *crt,
 /*
  * Return 1 if the certificate is revoked, or 0 otherwise.
  */
-int mbedtls_x509_crt_is_revoked(const mbedtls_x509_crt *crt, const mbedtls_x509_crl *crl)
-{
+int mbedtls_x509_crt_is_revoked(const mbedtls_x509_crt *crt, const mbedtls_x509_crl *crl) {
     const mbedtls_x509_crl_entry *cur = &crl->entry;
 
     while (cur != NULL && cur->serial.len != 0) {
         if (crt->serial.len == cur->serial.len &&
-            memcmp(crt->serial.p, cur->serial.p, crt->serial.len) == 0) {
+                memcmp(crt->serial.p, cur->serial.p, crt->serial.len) == 0) {
             if (mbedtls_x509_time_is_past(&cur->revocation_date))
                 return (1);
         }
@@ -1578,8 +1552,7 @@ int mbedtls_x509_crt_is_revoked(const mbedtls_x509_crt *crt, const mbedtls_x509_
  */
 static int x509_crt_verifycrl(mbedtls_x509_crt *crt, mbedtls_x509_crt *ca,
                               mbedtls_x509_crl *crl_list,
-                              const mbedtls_x509_crt_profile *profile)
-{
+                              const mbedtls_x509_crt_profile *profile) {
     int flags = 0;
     unsigned char hash[MBEDTLS_MD_MAX_SIZE];
     const mbedtls_md_info_t *md_info;
@@ -1589,9 +1562,9 @@ static int x509_crt_verifycrl(mbedtls_x509_crt *crt, mbedtls_x509_crt *ca,
 
     while (crl_list != NULL) {
         if (crl_list->version == 0 ||
-            crl_list->issuer_raw.len != ca->subject_raw.len ||
-            memcmp(crl_list->issuer_raw.p, ca->subject_raw.p,
-                   crl_list->issuer_raw.len) != 0) {
+                crl_list->issuer_raw.len != ca->subject_raw.len ||
+                memcmp(crl_list->issuer_raw.p, ca->subject_raw.p,
+                       crl_list->issuer_raw.len) != 0) {
             crl_list = crl_list->next;
             continue;
         }
@@ -1659,8 +1632,7 @@ static int x509_crt_verifycrl(mbedtls_x509_crt *crt, mbedtls_x509_crt *ca,
 /*
  * Like memcmp, but case-insensitive and always returns -1 if different
  */
-static int x509_memcasecmp(const void *s1, const void *s2, size_t len)
-{
+static int x509_memcasecmp(const void *s1, const void *s2, size_t len) {
     size_t i;
     unsigned char diff;
     const unsigned char *n1 = s1, *n2 = s2;
@@ -1672,8 +1644,8 @@ static int x509_memcasecmp(const void *s1, const void *s2, size_t len)
             continue;
 
         if (diff == 32 &&
-            ((n1[i] >= 'a' && n1[i] <= 'z') ||
-             (n1[i] >= 'A' && n1[i] <= 'Z'))) {
+                ((n1[i] >= 'a' && n1[i] <= 'z') ||
+                 (n1[i] >= 'A' && n1[i] <= 'Z'))) {
             continue;
         }
 
@@ -1686,8 +1658,7 @@ static int x509_memcasecmp(const void *s1, const void *s2, size_t len)
 /*
  * Return 0 if name matches wildcard, -1 otherwise
  */
-static int x509_check_wildcard(const char *cn, const mbedtls_x509_buf *name)
-{
+static int x509_check_wildcard(const char *cn, const mbedtls_x509_buf *name) {
     size_t i;
     size_t cn_idx = 0, cn_len = strlen(cn);
 
@@ -1706,7 +1677,7 @@ static int x509_check_wildcard(const char *cn, const mbedtls_x509_buf *name)
         return (-1);
 
     if (cn_len - cn_idx == name->len - 1 &&
-        x509_memcasecmp(name->p + 1, cn + cn_idx, name->len - 1) == 0) {
+            x509_memcasecmp(name->p + 1, cn + cn_idx, name->len - 1) == 0) {
         return (0);
     }
 
@@ -1719,18 +1690,17 @@ static int x509_check_wildcard(const char *cn, const mbedtls_x509_buf *name)
  *
  * Return 0 if equal, -1 otherwise.
  */
-static int x509_string_cmp(const mbedtls_x509_buf *a, const mbedtls_x509_buf *b)
-{
+static int x509_string_cmp(const mbedtls_x509_buf *a, const mbedtls_x509_buf *b) {
     if (a->tag == b->tag &&
-        a->len == b->len &&
-        memcmp(a->p, b->p, b->len) == 0) {
+            a->len == b->len &&
+            memcmp(a->p, b->p, b->len) == 0) {
         return (0);
     }
 
     if ((a->tag == MBEDTLS_ASN1_UTF8_STRING || a->tag == MBEDTLS_ASN1_PRINTABLE_STRING) &&
-        (b->tag == MBEDTLS_ASN1_UTF8_STRING || b->tag == MBEDTLS_ASN1_PRINTABLE_STRING) &&
-        a->len == b->len &&
-        x509_memcasecmp(a->p, b->p, b->len) == 0) {
+            (b->tag == MBEDTLS_ASN1_UTF8_STRING || b->tag == MBEDTLS_ASN1_PRINTABLE_STRING) &&
+            a->len == b->len &&
+            x509_memcasecmp(a->p, b->p, b->len) == 0) {
         return (0);
     }
 
@@ -1747,8 +1717,7 @@ static int x509_string_cmp(const mbedtls_x509_buf *a, const mbedtls_x509_buf *b)
  *
  * Return 0 if equal, -1 otherwise.
  */
-static int x509_name_cmp(const mbedtls_x509_name *a, const mbedtls_x509_name *b)
-{
+static int x509_name_cmp(const mbedtls_x509_name *a, const mbedtls_x509_name *b) {
     /* Avoid recursion, it might not be optimised by the compiler */
     while (a != NULL || b != NULL) {
         if (a == NULL || b == NULL)
@@ -1756,8 +1725,8 @@ static int x509_name_cmp(const mbedtls_x509_name *a, const mbedtls_x509_name *b)
 
         /* type */
         if (a->oid.tag != b->oid.tag ||
-            a->oid.len != b->oid.len ||
-            memcmp(a->oid.p, b->oid.p, b->oid.len) != 0) {
+                a->oid.len != b->oid.len ||
+                memcmp(a->oid.p, b->oid.p, b->oid.len) != 0) {
             return (-1);
         }
 
@@ -1781,8 +1750,7 @@ static int x509_name_cmp(const mbedtls_x509_name *a, const mbedtls_x509_name *b)
  * Check the signature of a certificate by its parent
  */
 static int x509_crt_check_signature(const mbedtls_x509_crt *child,
-                                    mbedtls_x509_crt *parent)
-{
+                                    mbedtls_x509_crt *parent) {
     const mbedtls_md_info_t *md_info;
     unsigned char hash[MBEDTLS_MD_MAX_SIZE];
 
@@ -1809,8 +1777,7 @@ static int x509_crt_check_signature(const mbedtls_x509_crt *child,
  */
 static int x509_crt_check_parent(const mbedtls_x509_crt *child,
                                  const mbedtls_x509_crt *parent,
-                                 int top)
-{
+                                 int top) {
     int need_ca_bit;
 
     /* Parent must be the issuer */
@@ -1829,7 +1796,7 @@ static int x509_crt_check_parent(const mbedtls_x509_crt *child,
 
 #if defined(MBEDTLS_X509_CHECK_KEY_USAGE)
     if (need_ca_bit &&
-        mbedtls_x509_crt_check_key_usage(parent, MBEDTLS_X509_KU_KEY_CERT_SIGN) != 0) {
+            mbedtls_x509_crt_check_key_usage(parent, MBEDTLS_X509_KU_KEY_CERT_SIGN) != 0) {
         return (-1);
     }
 #endif
@@ -1880,8 +1847,7 @@ static mbedtls_x509_crt *x509_crt_find_parent_in(mbedtls_x509_crt *child,
                                                  mbedtls_x509_crt *candidates,
                                                  int top,
                                                  size_t path_cnt,
-                                                 size_t self_cnt)
-{
+                                                 size_t self_cnt) {
     mbedtls_x509_crt *parent, *badtime_parent = NULL;
 
     for (parent = candidates; parent != NULL; parent = parent->next) {
@@ -1891,7 +1857,7 @@ static mbedtls_x509_crt *x509_crt_find_parent_in(mbedtls_x509_crt *child,
 
         /* +1 because stored max_pathlen is 1 higher that the actual value */
         if (parent->max_pathlen > 0 &&
-            (size_t) parent->max_pathlen < 1 + path_cnt - self_cnt) {
+                (size_t) parent->max_pathlen < 1 + path_cnt - self_cnt) {
             continue;
         }
 
@@ -1902,7 +1868,7 @@ static mbedtls_x509_crt *x509_crt_find_parent_in(mbedtls_x509_crt *child,
 
         /* optional time check */
         if (mbedtls_x509_time_is_past(&parent->valid_to) ||
-            mbedtls_x509_time_is_future(&parent->valid_from)) {
+                mbedtls_x509_time_is_future(&parent->valid_from)) {
             if (badtime_parent == NULL)
                 badtime_parent = parent;
 
@@ -1941,8 +1907,7 @@ static mbedtls_x509_crt *x509_crt_find_parent(mbedtls_x509_crt *child,
                                               mbedtls_x509_crt *trust_ca,
                                               int *parent_is_trusted,
                                               size_t path_cnt,
-                                              size_t self_cnt)
-{
+                                              size_t self_cnt) {
     mbedtls_x509_crt *parent;
 
     /* Look for a parent in trusted CAs */
@@ -1965,8 +1930,7 @@ static mbedtls_x509_crt *x509_crt_find_parent(mbedtls_x509_crt *child,
  */
 static int x509_crt_check_ee_locally_trusted(
     mbedtls_x509_crt *crt,
-    mbedtls_x509_crt *trust_ca)
-{
+    mbedtls_x509_crt *trust_ca) {
     mbedtls_x509_crt *cur;
 
     /* must be self-issued */
@@ -1976,7 +1940,7 @@ static int x509_crt_check_ee_locally_trusted(
     /* look for an exact match with trusted cert */
     for (cur = trust_ca; cur != NULL; cur = cur->next) {
         if (crt->raw.len == cur->raw.len &&
-            memcmp(crt->raw.p, cur->raw.p, crt->raw.len) == 0) {
+                memcmp(crt->raw.p, cur->raw.p, crt->raw.len) == 0) {
             return (0);
         }
     }
@@ -2018,8 +1982,7 @@ static int x509_crt_verify_chain(
     mbedtls_x509_crl *ca_crl,
     const mbedtls_x509_crt_profile *profile,
     x509_crt_verify_chain_item ver_chain[X509_MAX_VERIFY_CHAIN_SIZE],
-    size_t *chain_len)
-{
+    size_t *chain_len) {
     uint32_t *flags;
     mbedtls_x509_crt *child;
     mbedtls_x509_crt *parent;
@@ -2056,7 +2019,7 @@ static int x509_crt_verify_chain(
 
         /* Special case: EE certs that are locally trusted */
         if (*chain_len == 1 &&
-            x509_crt_check_ee_locally_trusted(child, trust_ca) == 0) {
+                x509_crt_check_ee_locally_trusted(child, trust_ca) == 0) {
             return (0);
         }
 
@@ -2074,14 +2037,14 @@ static int x509_crt_verify_chain(
          * These can occur with some strategies for key rollover, see [SIRO],
          * and should be excluded from max_pathlen checks. */
         if (*chain_len != 1 &&
-            x509_name_cmp(&child->issuer, &child->subject) == 0) {
+                x509_name_cmp(&child->issuer, &child->subject) == 0) {
             self_cnt++;
         }
 
         /* path_cnt is 0 for the first intermediate CA,
          * and if parent is trusted it's not an intermediate CA */
         if (! parent_is_trusted &&
-            *chain_len > MBEDTLS_X509_MAX_INTERMEDIATE_CA) {
+                *chain_len > MBEDTLS_X509_MAX_INTERMEDIATE_CA) {
             /* return immediately to avoid overflow the chain array */
             return (MBEDTLS_ERR_X509_FATAL_ERROR);
         }
@@ -2112,11 +2075,10 @@ static int x509_crt_verify_chain(
  * Check for CN match
  */
 static int x509_crt_check_cn(const mbedtls_x509_buf *name,
-                             const char *cn, size_t cn_len)
-{
+                             const char *cn, size_t cn_len) {
     /* try exact match */
     if (name->len == cn_len &&
-        x509_memcasecmp(cn, name->p, cn_len) == 0) {
+            x509_memcasecmp(cn, name->p, cn_len) == 0) {
         return (0);
     }
 
@@ -2133,8 +2095,7 @@ static int x509_crt_check_cn(const mbedtls_x509_buf *name,
  */
 static void x509_crt_verify_name(const mbedtls_x509_crt *crt,
                                  const char *cn,
-                                 uint32_t *flags)
-{
+                                 uint32_t *flags) {
     const mbedtls_x509_name *name;
     const mbedtls_x509_sequence *cur;
     size_t cn_len = strlen(cn);
@@ -2150,7 +2111,7 @@ static void x509_crt_verify_name(const mbedtls_x509_crt *crt,
     } else {
         for (name = &crt->subject; name != NULL; name = name->next) {
             if (MBEDTLS_OID_CMP(MBEDTLS_OID_AT_CN, &name->oid) == 0 &&
-                x509_crt_check_cn(&name->val, cn, cn_len) == 0) {
+                    x509_crt_check_cn(&name->val, cn, cn_len) == 0) {
                 break;
             }
         }
@@ -2168,8 +2129,7 @@ static int x509_crt_merge_flags_with_cb(
     x509_crt_verify_chain_item ver_chain[X509_MAX_VERIFY_CHAIN_SIZE],
     size_t chain_len,
     int (*f_vrfy)(void *, mbedtls_x509_crt *, int, uint32_t *),
-    void *p_vrfy)
-{
+    void *p_vrfy) {
     int ret;
     size_t i;
     uint32_t cur_flags;
@@ -2195,8 +2155,7 @@ int mbedtls_x509_crt_verify(mbedtls_x509_crt *crt,
                             mbedtls_x509_crl *ca_crl,
                             const char *cn, uint32_t *flags,
                             int (*f_vrfy)(void *, mbedtls_x509_crt *, int, uint32_t *),
-                            void *p_vrfy)
-{
+                            void *p_vrfy) {
     return (mbedtls_x509_crt_verify_with_profile(crt, trust_ca, ca_crl,
                                                  &mbedtls_x509_crt_profile_default, cn, flags, f_vrfy, p_vrfy));
 }
@@ -2217,8 +2176,7 @@ int mbedtls_x509_crt_verify_with_profile(mbedtls_x509_crt *crt,
                                          const mbedtls_x509_crt_profile *profile,
                                          const char *cn, uint32_t *flags,
                                          int (*f_vrfy)(void *, mbedtls_x509_crt *, int, uint32_t *),
-                                         void *p_vrfy)
-{
+                                         void *p_vrfy) {
     int ret;
     mbedtls_pk_type_t pk_type;
     x509_crt_verify_chain_item ver_chain[X509_MAX_VERIFY_CHAIN_SIZE];
@@ -2278,16 +2236,14 @@ exit:
 /*
  * Initialize a certificate chain
  */
-void mbedtls_x509_crt_init(mbedtls_x509_crt *crt)
-{
+void mbedtls_x509_crt_init(mbedtls_x509_crt *crt) {
     memset(crt, 0, sizeof(mbedtls_x509_crt));
 }
 
 /*
  * Unallocate all certificate data
  */
-void mbedtls_x509_crt_free(mbedtls_x509_crt *crt)
-{
+void mbedtls_x509_crt_free(mbedtls_x509_crt *crt) {
     mbedtls_x509_crt *cert_cur = crt;
     mbedtls_x509_crt *cert_prv;
     mbedtls_x509_name *name_cur;
diff --git a/common/parity.h b/common/parity.h
index 9b812e4f3..e42616917 100644
--- a/common/parity.h
+++ b/common/parity.h
@@ -21,20 +21,17 @@ extern "C" {
 extern const uint8_t OddByteParity[256];
 
 
-static inline bool oddparity8(const uint8_t x)
-{
+static inline bool oddparity8(const uint8_t x) {
     return OddByteParity[x];
 }
 
 
-static inline bool evenparity8(const uint8_t x)
-{
+static inline bool evenparity8(const uint8_t x) {
     return !OddByteParity[x];
 }
 
 
-static inline bool evenparity32(uint32_t x)
-{
+static inline bool evenparity32(uint32_t x) {
 #if !defined __GNUC__
     x ^= x >> 16;
     x ^= x >> 8;
@@ -45,8 +42,7 @@ static inline bool evenparity32(uint32_t x)
 }
 
 
-static inline bool oddparity32(uint32_t x)
-{
+static inline bool oddparity32(uint32_t x) {
 #if !defined __GNUC__
     x ^= x >> 16;
     x ^= x >> 8;
diff --git a/common/prng.c b/common/prng.c
index d9761e643..fe582205f 100644
--- a/common/prng.c
+++ b/common/prng.c
@@ -6,8 +6,7 @@
 #include "prng.h"
 
 #define rot(x,k) (((x)<<(k))|((x)>>(32-(k))))
-uint32_t burtle_get_mod(prng_ctx *x)
-{
+uint32_t burtle_get_mod(prng_ctx *x) {
     uint32_t e = x->a - rot(x->b, 21);
     x->a = x->b ^ rot(x->c, 19);
     x->b = x->c + rot(x->d, 6);
@@ -16,8 +15,7 @@ uint32_t burtle_get_mod(prng_ctx *x)
     return x->d;
 }
 
-void burtle_init_mod(prng_ctx *x, uint32_t seed)
-{
+void burtle_init_mod(prng_ctx *x, uint32_t seed) {
     x->a = 0xf1ea5eed;
     x->b = x->c = x->d = seed;
     for (uint8_t i = 0; i < 42; ++i) {
@@ -25,8 +23,7 @@ void burtle_init_mod(prng_ctx *x, uint32_t seed)
     }
 }
 
-void burtle_init(prng_ctx *x, uint32_t seed)
-{
+void burtle_init(prng_ctx *x, uint32_t seed) {
     uint32_t i;
     x->a = 0xf1ea5eed, x->b = x->c = x->d = seed;
     for (i = 0; i < 20; ++i) {
@@ -35,8 +32,7 @@ void burtle_init(prng_ctx *x, uint32_t seed)
 }
 
 
-uint32_t GetSimplePrng(uint32_t seed)
-{
+uint32_t GetSimplePrng(uint32_t seed) {
     seed *= 0x19660D;
     seed += 0x3C6EF35F;
     return seed;
diff --git a/common/protocols.c b/common/protocols.c
index 46c0c36eb..188980ee5 100644
--- a/common/protocols.c
+++ b/common/protocols.c
@@ -1,8 +1,7 @@
 #include "protocols.h"
 
 // ATA55xx shared presets & routines
-uint32_t GetT55xxClockBit(uint32_t clock)
-{
+uint32_t GetT55xxClockBit(uint32_t clock) {
     switch (clock) {
         case 128:
             return T55x7_BITRATE_RF_128;
@@ -29,18 +28,15 @@ uint32_t GetT55xxClockBit(uint32_t clock)
 #include "ui.h"
 #define PrintAndLogDevice(level, format, args...)  PrintAndLogEx(level, format , ## args)
 
-uint8_t isset(uint8_t val, uint8_t mask)
-{
+uint8_t isset(uint8_t val, uint8_t mask) {
     return (val & mask);
 }
 
-uint8_t notset(uint8_t val, uint8_t mask)
-{
+uint8_t notset(uint8_t val, uint8_t mask) {
     return !(val & mask);
 }
 
-void fuse_config(const picopass_hdr *hdr)
-{
+void fuse_config(const picopass_hdr *hdr) {
     uint8_t fuses = hdr->conf.fuses;
 
     if (isset(fuses, FUSE_FPERS))
@@ -71,8 +67,7 @@ void fuse_config(const picopass_hdr *hdr)
         PrintAndLogDevice(WARNING, "\tRA: Read access not enabled");
 }
 
-void getMemConfig(uint8_t mem_cfg, uint8_t chip_cfg, uint8_t *max_blk, uint8_t *app_areas, uint8_t *kb)
-{
+void getMemConfig(uint8_t mem_cfg, uint8_t chip_cfg, uint8_t *max_blk, uint8_t *app_areas, uint8_t *kb) {
     // mem-bit 5, mem-bit 7, chip-bit 4: defines chip type
     uint8_t k16 = isset(mem_cfg, 0x80);
     //uint8_t k2 = isset(mem_cfg, 0x08);
@@ -105,8 +100,7 @@ void getMemConfig(uint8_t mem_cfg, uint8_t chip_cfg, uint8_t *max_blk, uint8_t *
     }
 }
 
-void mem_app_config(const picopass_hdr *hdr)
-{
+void mem_app_config(const picopass_hdr *hdr) {
     uint8_t mem = hdr->conf.mem_config;
     uint8_t chip = hdr->conf.chip_config;
     uint8_t applimit = hdr->conf.app_limit;
@@ -142,13 +136,11 @@ void mem_app_config(const picopass_hdr *hdr)
         PrintAndLogDevice(NORMAL, "\tCredit - Kc");
     }
 }
-void print_picopass_info(const picopass_hdr *hdr)
-{
+void print_picopass_info(const picopass_hdr *hdr) {
     fuse_config(hdr);
     mem_app_config(hdr);
 }
-void printIclassDumpInfo(uint8_t *iclass_dump)
-{
+void printIclassDumpInfo(uint8_t *iclass_dump) {
     print_picopass_info((picopass_hdr *) iclass_dump);
 }
 
diff --git a/common/radixsort.c b/common/radixsort.c
index e5509880a..67f2910c1 100644
--- a/common/radixsort.c
+++ b/common/radixsort.c
@@ -1,7 +1,6 @@
 #include "radixsort.h"
 
-uint64_t *radixSort(uint64_t *array, uint32_t size)
-{
+uint64_t *radixSort(uint64_t *array, uint32_t size) {
     rscounts_t counts;
     memset(&counts, 0, 256 * 8 * sizeof(uint32_t));
     uint64_t *cpy = (uint64_t *)calloc(size * sizeof(uint64_t), sizeof(uint8_t));
diff --git a/common/random.c b/common/random.c
index 66269a19b..a6e714c4c 100644
--- a/common/random.c
+++ b/common/random.c
@@ -13,17 +13,14 @@ static uint32_t g_nextrandom;
  * https://software.intel.com/en-us/articles/fast-random-number-generator-on-the-intel-pentiumr-4-processor/
  */
 
-inline void fast_prand()
-{
+inline void fast_prand() {
     fast_prandEx(GetTickCount());
 }
-inline void fast_prandEx(uint32_t seed)
-{
+inline void fast_prandEx(uint32_t seed) {
     g_nextrandom = seed;
 }
 
-uint32_t prand()
-{
+uint32_t prand() {
 // g_nextrandom *= 6364136223846793005;
 // g_nextrandom += 1;
 //return (uint32_t)(g_nextrandom >> 32) % 0xffffffff;
diff --git a/common/tea.c b/common/tea.c
index a7de87fc3..187f8a3bc 100644
--- a/common/tea.c
+++ b/common/tea.c
@@ -11,8 +11,7 @@
 #define DELTA  0x9E3779B9
 #define SUM    0xC6EF3720
 
-void tea_encrypt(uint8_t *v, uint8_t *key)
-{
+void tea_encrypt(uint8_t *v, uint8_t *key) {
 
     uint32_t a = 0, b = 0, c = 0, d = 0, y = 0, z = 0;
     uint32_t sum = 0;
@@ -38,8 +37,7 @@ void tea_encrypt(uint8_t *v, uint8_t *key)
     num_to_bytes(z, 4, v + 4);
 }
 
-void tea_decrypt(uint8_t *v, uint8_t *key)
-{
+void tea_decrypt(uint8_t *v, uint8_t *key) {
 
     uint32_t a = 0, b = 0, c = 0, d = 0, y = 0, z = 0;
     uint32_t sum = SUM;
diff --git a/common/usart.c b/common/usart.c
index 260b8ff75..46e8517fc 100644
--- a/common/usart.c
+++ b/common/usart.c
@@ -44,8 +44,7 @@ static uint8_t us_outbuf[sizeof(UsbCommand)];
 /// Reads data from an USART peripheral
 /// \param data  Pointer to the buffer where the received data will be stored.
 /// \param len  Size of the data buffer (in bytes).
-inline int16_t usart_readbuffer(uint8_t *data, size_t len)
-{
+inline int16_t usart_readbuffer(uint8_t *data, size_t len) {
 
     // Check if the first PDC bank is free
     if (!(pUS1->US_RCR)) {
@@ -69,8 +68,7 @@ inline int16_t usart_readbuffer(uint8_t *data, size_t len)
 
 
 // transfer from device to client
-inline int16_t usart_writebuffer(uint8_t *data, size_t len)
-{
+inline int16_t usart_writebuffer(uint8_t *data, size_t len) {
 
     // Check if the first PDC bank is free
     if (!(pUS1->US_TCR)) {
@@ -94,8 +92,7 @@ inline int16_t usart_writebuffer(uint8_t *data, size_t len)
     }
 }
 
-void usart_init(void)
-{
+void usart_init(void) {
 
     // disable & reset receiver / transmitter for configuration
     pUS1->US_CR = (AT91C_US_RSTRX | AT91C_US_RSTTX | AT91C_US_RXDIS | AT91C_US_TXDIS);
diff --git a/common/usb_cdc.c b/common/usb_cdc.c
index f37737aa8..d70c8ee04 100644
--- a/common/usb_cdc.c
+++ b/common/usb_cdc.c
@@ -391,8 +391,7 @@ static const char StrMS_OSDescriptor[] = {
     'M', 0, 'S', 0, 'F', 0, 'T', 0, '1', 0, '0', 0, '0', 0, MS_VENDOR_CODE, 0
 };
 
-const char *getStringDescriptor(uint8_t idx)
-{
+const char *getStringDescriptor(uint8_t idx) {
     switch (idx) {
         case 0:
             return StrLanguageCodes;
@@ -447,8 +446,7 @@ AT91S_CDC_LINE_CODING line = {
     8
 };     // 8 Data bits
 
-static void SpinDelay(int ms)
-{
+static void SpinDelay(int ms) {
     int us = ms * 1000;
     int ticks = (48 * us) >> 10;
 
@@ -475,8 +473,7 @@ static void SpinDelay(int ms)
 //* \fn    usb_disable
 //* \brief This function deactivates the USB device
 //*----------------------------------------------------------------------------
-void usb_disable()
-{
+void usb_disable() {
     // Disconnect the USB device
     AT91C_BASE_PIOA->PIO_ODR = GPIO_USB_PU;
 
@@ -490,8 +487,7 @@ void usb_disable()
 //* \fn    usb_enable
 //* \brief This function Activates the USB device
 //*----------------------------------------------------------------------------
-void usb_enable()
-{
+void usb_enable() {
     // Set the PLL USB Divider
     AT91C_BASE_CKGR->CKGR_PLLR |= AT91C_CKGR_USBDIV_1 ;
 
@@ -529,25 +525,20 @@ void usb_enable()
 //*----------------------------------------------------------------------------
 static int usb_reconnect = 0;
 static int usb_configured = 0;
-void SetUSBreconnect(int value)
-{
+void SetUSBreconnect(int value) {
     usb_reconnect = value;
 }
-int GetUSBreconnect(void)
-{
+int GetUSBreconnect(void) {
     return usb_reconnect;
 }
-void SetUSBconfigured(int value)
-{
+void SetUSBconfigured(int value) {
     usb_configured = value;
 }
-int GetUSBconfigured(void)
-{
+int GetUSBconfigured(void) {
     return usb_configured;
 }
 
-bool usb_check()
-{
+bool usb_check() {
 
     /*
     // reconnected ONCE and
@@ -598,8 +589,7 @@ bool usb_check()
     return (btConfiguration) ? true : false;
 }
 
-bool usb_poll()
-{
+bool usb_poll() {
     if (!usb_check()) return false;
     return (pUdp->UDP_CSR[AT91C_EP_OUT] & btReceiveBank);
 }
@@ -612,8 +602,7 @@ bool usb_poll()
     that the length available to read is non-zero, thus hopefully fixes the
     bug.
 **/
-bool usb_poll_validate_length()
-{
+bool usb_poll_validate_length() {
     if (!usb_check()) return false;
     if (!(pUdp->UDP_CSR[AT91C_EP_OUT] & btReceiveBank)) return false;
     return ((pUdp->UDP_CSR[AT91C_EP_OUT] & AT91C_UDP_RXBYTECNT) >> 16) >  0;
@@ -623,8 +612,7 @@ bool usb_poll_validate_length()
 //* \fn    usb_read
 //* \brief Read available data from Endpoint 1 OUT (host to device)
 //*----------------------------------------------------------------------------
-uint32_t usb_read(byte_t *data, size_t len)
-{
+uint32_t usb_read(byte_t *data, size_t len) {
 
     if (len == 0) return 0;
 
@@ -662,8 +650,7 @@ uint32_t usb_read(byte_t *data, size_t len)
 //* \fn    usb_write
 //* \brief Send through endpoint 2 (device to host)
 //*----------------------------------------------------------------------------
-uint32_t usb_write(const byte_t *data, const size_t len)
-{
+uint32_t usb_write(const byte_t *data, const size_t len) {
 
     if (!len) return 0;
     if (!usb_check()) return 0;
@@ -719,8 +706,7 @@ uint32_t usb_write(const byte_t *data, const size_t len)
 //* \fn    AT91F_USB_SendData
 //* \brief Send Data through the control endpoint
 //*----------------------------------------------------------------------------
-void AT91F_USB_SendData(AT91PS_UDP pUdp, const char *pData, uint32_t length)
-{
+void AT91F_USB_SendData(AT91PS_UDP pUdp, const char *pData, uint32_t length) {
     uint32_t cpt = 0;
     AT91_REG csr;
 
@@ -761,8 +747,7 @@ void AT91F_USB_SendData(AT91PS_UDP pUdp, const char *pData, uint32_t length)
 //* \fn    AT91F_USB_SendZlp
 //* \brief Send zero length packet through the control endpoint
 //*----------------------------------------------------------------------------
-void AT91F_USB_SendZlp(AT91PS_UDP pUdp)
-{
+void AT91F_USB_SendZlp(AT91PS_UDP pUdp) {
     UDP_SET_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_TXPKTRDY);
     while (!(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_TXCOMP));
     UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_TXCOMP);
@@ -773,8 +758,7 @@ void AT91F_USB_SendZlp(AT91PS_UDP pUdp)
 //* \fn    AT91F_USB_SendStall
 //* \brief Stall the control endpoint
 //*----------------------------------------------------------------------------
-void AT91F_USB_SendStall(AT91PS_UDP pUdp)
-{
+void AT91F_USB_SendStall(AT91PS_UDP pUdp) {
     UDP_SET_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_FORCESTALL);
     while (!(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_ISOERROR));
     UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, (AT91C_UDP_FORCESTALL | AT91C_UDP_ISOERROR));
@@ -788,8 +772,7 @@ void AT91F_USB_SendStall(AT91PS_UDP pUdp)
 //* 1. this is for USB endpoint0.  the control endpoint.
 //* 2. mixed with CDC ACM endpoint3 , interrupt, control endpoint
 //*----------------------------------------------------------------------------
-void AT91F_CDC_Enumerate()
-{
+void AT91F_CDC_Enumerate() {
     byte_t bmRequestType, bRequest;
     uint16_t wValue, wIndex, wLength, wStatus;
 
diff --git a/common/wiegand.c b/common/wiegand.c
index 96b6b1dde..2da88b085 100644
--- a/common/wiegand.c
+++ b/common/wiegand.c
@@ -15,8 +15,7 @@
 * @param type     use the defined values  EVEN|ODD
 * @return parity bit required to match type
 */
-uint8_t getParity(uint8_t *bits, uint8_t len, uint8_t type)
-{
+uint8_t getParity(uint8_t *bits, uint8_t len, uint8_t type) {
     uint8_t x = 0;
     for (; len > 0; --len)
         x += bits[len - 1];
@@ -37,8 +36,7 @@ uint8_t checkParity(uint32_t bits, uint8_t len, uint8_t type);
 // by marshmellow
 // takes a array of binary values, start position, length of bits per parity (includes parity bit),
 // Parity Type (1 for odd; 0 for even; 2 for Always 1's; 3 for Always 0's), and binary Length (length to run)
-size_t removeParity(uint8_t *bitstream, size_t startIdx, uint8_t pLen, uint8_t pType, size_t bLen)
-{
+size_t removeParity(uint8_t *bitstream, size_t startIdx, uint8_t pLen, uint8_t pType, size_t bLen) {
     uint32_t parityWd = 0;
     size_t j = 0, bitcount = 0;
     for (int word = 0; word < (bLen); word += pLen) {
@@ -81,8 +79,7 @@ size_t removeParity(uint8_t *bitstream, size_t startIdx, uint8_t pLen, uint8_t p
 * @param pType      EVEN|ODD|2 (always 1's)|3 (always 0's)
 * @return
 */
-size_t addParity(uint8_t *bits, uint8_t *dest, uint8_t sourceLen, uint8_t pLen, uint8_t pType)
-{
+size_t addParity(uint8_t *bits, uint8_t *dest, uint8_t sourceLen, uint8_t pLen, uint8_t pType) {
     uint32_t parityWd = 0;
     size_t j = 0, bitCnt = 0;
     for (int word = 0; word < sourceLen; word += pLen - 1) {
@@ -119,8 +116,7 @@ size_t addParity(uint8_t *bits, uint8_t *dest, uint8_t sourceLen, uint8_t pLen,
 * @param dest    pointer to the destination where wiegandparity has been appended
 * @param len     number of bits which wiegand parity shall be calculated over. This number is without parities, so a wiegand 26 has 24 bits of data
 */
-void wiegand_add_parity(uint8_t *source, uint8_t *dest, uint8_t len)
-{
+void wiegand_add_parity(uint8_t *source, uint8_t *dest, uint8_t len) {
 
     // Copy to destination, shifted one step to make room for EVEN parity
     memcpy(dest + 1, source, length);
@@ -148,8 +144,7 @@ void wiegand_add_parity(uint8_t *source, uint8_t *dest, uint8_t len)
 * @param dest      pointer to the destination where wiegand bytes will be stored
 * @param formatlen
 */
-void num_to_wiegand_bytes(uint64_t oem, uint64_t fc, uint64_t cn, uint8_t *dest, uint8_t formatlen)
-{
+void num_to_wiegand_bytes(uint64_t oem, uint64_t fc, uint64_t cn, uint8_t *dest, uint8_t formatlen) {
 
     uint8_t data[MAX_BITS_TXX55] = {0};
     memset(data, 0, sizeof(data));
@@ -173,8 +168,7 @@ void num_to_wiegand_bytes(uint64_t oem, uint64_t fc, uint64_t cn, uint8_t *dest,
 * @param dest      pointer to the destination where wiegand bits will be stored
 * @param formatlen
 */
-void num_to_wiegand_bits(uint64_t oem, uint64_t fc, uint64_t cn, uint8_t *dest, uint8_t formatlen)
-{
+void num_to_wiegand_bits(uint64_t oem, uint64_t fc, uint64_t cn, uint8_t *dest, uint8_t formatlen) {
 
     uint8_t bits[MAX_BITS_TXX55] = {0};
     memset(bits, 0, sizeof(bits));
diff --git a/liblua/lapi.c b/liblua/lapi.c
index b1f470fb1..26f552d1c 100644
--- a/liblua/lapi.c
+++ b/liblua/lapi.c
@@ -52,8 +52,7 @@ const char lua_ident[] =
     api_check(L, isstackindex(i, o), "index not in the stack")
 
 
-static TValue *index2addr(lua_State *L, int idx)
-{
+static TValue *index2addr(lua_State *L, int idx) {
     CallInfo *ci = L->ci;
     if (idx > 0) {
         TValue *o = ci->func + idx;
@@ -82,15 +81,13 @@ static TValue *index2addr(lua_State *L, int idx)
 ** to be called by 'lua_checkstack' in protected mode, to grow stack
 ** capturing memory errors
 */
-static void growstack(lua_State *L, void *ud)
-{
+static void growstack(lua_State *L, void *ud) {
     int size = *(int *)ud;
     luaD_growstack(L, size);
 }
 
 
-LUA_API int lua_checkstack(lua_State *L, int size)
-{
+LUA_API int lua_checkstack(lua_State *L, int size) {
     int res;
     CallInfo *ci = L->ci;
     lua_lock(L);
@@ -110,8 +107,7 @@ LUA_API int lua_checkstack(lua_State *L, int size)
 }
 
 
-LUA_API void lua_xmove(lua_State *from, lua_State *to, int n)
-{
+LUA_API void lua_xmove(lua_State *from, lua_State *to, int n) {
     int i;
     if (from == to) return;
     lua_lock(to);
@@ -126,8 +122,7 @@ LUA_API void lua_xmove(lua_State *from, lua_State *to, int n)
 }
 
 
-LUA_API lua_CFunction lua_atpanic(lua_State *L, lua_CFunction panicf)
-{
+LUA_API lua_CFunction lua_atpanic(lua_State *L, lua_CFunction panicf) {
     lua_CFunction old;
     lua_lock(L);
     old = G(L)->panic;
@@ -137,8 +132,7 @@ LUA_API lua_CFunction lua_atpanic(lua_State *L, lua_CFunction panicf)
 }
 
 
-LUA_API const lua_Number *lua_version(lua_State *L)
-{
+LUA_API const lua_Number *lua_version(lua_State *L) {
     static const lua_Number version = LUA_VERSION_NUM;
     if (L == NULL) return &version;
     else return G(L)->version;
@@ -154,22 +148,19 @@ LUA_API const lua_Number *lua_version(lua_State *L)
 /*
 ** convert an acceptable stack index into an absolute index
 */
-LUA_API int lua_absindex(lua_State *L, int idx)
-{
+LUA_API int lua_absindex(lua_State *L, int idx) {
     return (idx > 0 || ispseudo(idx))
            ? idx
            : cast_int(L->top - L->ci->func + idx);
 }
 
 
-LUA_API int lua_gettop(lua_State *L)
-{
+LUA_API int lua_gettop(lua_State *L) {
     return cast_int(L->top - (L->ci->func + 1));
 }
 
 
-LUA_API void lua_settop(lua_State *L, int idx)
-{
+LUA_API void lua_settop(lua_State *L, int idx) {
     StkId func = L->ci->func;
     lua_lock(L);
     if (idx >= 0) {
@@ -185,8 +176,7 @@ LUA_API void lua_settop(lua_State *L, int idx)
 }
 
 
-LUA_API void lua_remove(lua_State *L, int idx)
-{
+LUA_API void lua_remove(lua_State *L, int idx) {
     StkId p;
     lua_lock(L);
     p = index2addr(L, idx);
@@ -197,8 +187,7 @@ LUA_API void lua_remove(lua_State *L, int idx)
 }
 
 
-LUA_API void lua_insert(lua_State *L, int idx)
-{
+LUA_API void lua_insert(lua_State *L, int idx) {
     StkId p;
     StkId q;
     lua_lock(L);
@@ -211,8 +200,7 @@ LUA_API void lua_insert(lua_State *L, int idx)
 }
 
 
-static void moveto(lua_State *L, TValue *fr, int idx)
-{
+static void moveto(lua_State *L, TValue *fr, int idx) {
     TValue *to = index2addr(L, idx);
     api_checkvalidindex(L, to);
     setobj(L, to, fr);
@@ -223,8 +211,7 @@ static void moveto(lua_State *L, TValue *fr, int idx)
 }
 
 
-LUA_API void lua_replace(lua_State *L, int idx)
-{
+LUA_API void lua_replace(lua_State *L, int idx) {
     lua_lock(L);
     api_checknelems(L, 1);
     moveto(L, L->top - 1, idx);
@@ -233,8 +220,7 @@ LUA_API void lua_replace(lua_State *L, int idx)
 }
 
 
-LUA_API void lua_copy(lua_State *L, int fromidx, int toidx)
-{
+LUA_API void lua_copy(lua_State *L, int fromidx, int toidx) {
     TValue *fr;
     lua_lock(L);
     fr = index2addr(L, fromidx);
@@ -243,8 +229,7 @@ LUA_API void lua_copy(lua_State *L, int fromidx, int toidx)
 }
 
 
-LUA_API void lua_pushvalue(lua_State *L, int idx)
-{
+LUA_API void lua_pushvalue(lua_State *L, int idx) {
     lua_lock(L);
     setobj2s(L, L->top, index2addr(L, idx));
     api_incr_top(L);
@@ -258,59 +243,51 @@ LUA_API void lua_pushvalue(lua_State *L, int idx)
 */
 
 
-LUA_API int lua_type(lua_State *L, int idx)
-{
+LUA_API int lua_type(lua_State *L, int idx) {
     StkId o = index2addr(L, idx);
     return (isvalid(o) ? ttypenv(o) : LUA_TNONE);
 }
 
 
-LUA_API const char *lua_typename(lua_State *L, int t)
-{
+LUA_API const char *lua_typename(lua_State *L, int t) {
     UNUSED(L);
     return ttypename(t);
 }
 
 
-LUA_API int lua_iscfunction(lua_State *L, int idx)
-{
+LUA_API int lua_iscfunction(lua_State *L, int idx) {
     StkId o = index2addr(L, idx);
     return (ttislcf(o) || (ttisCclosure(o)));
 }
 
 
-LUA_API int lua_isnumber(lua_State *L, int idx)
-{
+LUA_API int lua_isnumber(lua_State *L, int idx) {
     TValue n;
     const TValue *o = index2addr(L, idx);
     return tonumber(o, &n);
 }
 
 
-LUA_API int lua_isstring(lua_State *L, int idx)
-{
+LUA_API int lua_isstring(lua_State *L, int idx) {
     int t = lua_type(L, idx);
     return (t == LUA_TSTRING || t == LUA_TNUMBER);
 }
 
 
-LUA_API int lua_isuserdata(lua_State *L, int idx)
-{
+LUA_API int lua_isuserdata(lua_State *L, int idx) {
     const TValue *o = index2addr(L, idx);
     return (ttisuserdata(o) || ttislightuserdata(o));
 }
 
 
-LUA_API int lua_rawequal(lua_State *L, int index1, int index2)
-{
+LUA_API int lua_rawequal(lua_State *L, int index1, int index2) {
     StkId o1 = index2addr(L, index1);
     StkId o2 = index2addr(L, index2);
     return (isvalid(o1) && isvalid(o2)) ? luaV_rawequalobj(o1, o2) : 0;
 }
 
 
-LUA_API void lua_arith(lua_State *L, int op)
-{
+LUA_API void lua_arith(lua_State *L, int op) {
     StkId o1;  /* 1st operand */
     StkId o2;  /* 2nd operand */
     lua_lock(L);
@@ -332,8 +309,7 @@ LUA_API void lua_arith(lua_State *L, int op)
 }
 
 
-LUA_API int lua_compare(lua_State *L, int index1, int index2, int op)
-{
+LUA_API int lua_compare(lua_State *L, int index1, int index2, int op) {
     StkId o1, o2;
     int i = 0;
     lua_lock(L);  /* may call tag method */
@@ -359,8 +335,7 @@ LUA_API int lua_compare(lua_State *L, int index1, int index2, int op)
 }
 
 
-LUA_API lua_Number lua_tonumberx(lua_State *L, int idx, int *isnum)
-{
+LUA_API lua_Number lua_tonumberx(lua_State *L, int idx, int *isnum) {
     TValue n;
     const TValue *o = index2addr(L, idx);
     if (tonumber(o, &n)) {
@@ -373,8 +348,7 @@ LUA_API lua_Number lua_tonumberx(lua_State *L, int idx, int *isnum)
 }
 
 
-LUA_API lua_Integer lua_tointegerx(lua_State *L, int idx, int *isnum)
-{
+LUA_API lua_Integer lua_tointegerx(lua_State *L, int idx, int *isnum) {
     TValue n;
     const TValue *o = index2addr(L, idx);
     if (tonumber(o, &n)) {
@@ -390,8 +364,7 @@ LUA_API lua_Integer lua_tointegerx(lua_State *L, int idx, int *isnum)
 }
 
 
-LUA_API lua_Unsigned lua_tounsignedx(lua_State *L, int idx, int *isnum)
-{
+LUA_API lua_Unsigned lua_tounsignedx(lua_State *L, int idx, int *isnum) {
     TValue n;
     const TValue *o = index2addr(L, idx);
     if (tonumber(o, &n)) {
@@ -407,15 +380,13 @@ LUA_API lua_Unsigned lua_tounsignedx(lua_State *L, int idx, int *isnum)
 }
 
 
-LUA_API int lua_toboolean(lua_State *L, int idx)
-{
+LUA_API int lua_toboolean(lua_State *L, int idx) {
     const TValue *o = index2addr(L, idx);
     return !l_isfalse(o);
 }
 
 
-LUA_API const char *lua_tolstring(lua_State *L, int idx, size_t *len)
-{
+LUA_API const char *lua_tolstring(lua_State *L, int idx, size_t *len) {
     StkId o = index2addr(L, idx);
     if (!ttisstring(o)) {
         lua_lock(L);  /* `luaV_tostring' may create a new string */
@@ -433,8 +404,7 @@ LUA_API const char *lua_tolstring(lua_State *L, int idx, size_t *len)
 }
 
 
-LUA_API size_t lua_rawlen(lua_State *L, int idx)
-{
+LUA_API size_t lua_rawlen(lua_State *L, int idx) {
     StkId o = index2addr(L, idx);
     switch (ttypenv(o)) {
         case LUA_TSTRING:
@@ -449,8 +419,7 @@ LUA_API size_t lua_rawlen(lua_State *L, int idx)
 }
 
 
-LUA_API lua_CFunction lua_tocfunction(lua_State *L, int idx)
-{
+LUA_API lua_CFunction lua_tocfunction(lua_State *L, int idx) {
     StkId o = index2addr(L, idx);
     if (ttislcf(o)) return fvalue(o);
     else if (ttisCclosure(o))
@@ -459,8 +428,7 @@ LUA_API lua_CFunction lua_tocfunction(lua_State *L, int idx)
 }
 
 
-LUA_API void *lua_touserdata(lua_State *L, int idx)
-{
+LUA_API void *lua_touserdata(lua_State *L, int idx) {
     StkId o = index2addr(L, idx);
     switch (ttypenv(o)) {
         case LUA_TUSERDATA:
@@ -473,15 +441,13 @@ LUA_API void *lua_touserdata(lua_State *L, int idx)
 }
 
 
-LUA_API lua_State *lua_tothread(lua_State *L, int idx)
-{
+LUA_API lua_State *lua_tothread(lua_State *L, int idx) {
     StkId o = index2addr(L, idx);
     return (!ttisthread(o)) ? NULL : thvalue(o);
 }
 
 
-LUA_API const void *lua_topointer(lua_State *L, int idx)
-{
+LUA_API const void *lua_topointer(lua_State *L, int idx) {
     StkId o = index2addr(L, idx);
     switch (ttype(o)) {
         case LUA_TTABLE:
@@ -509,8 +475,7 @@ LUA_API const void *lua_topointer(lua_State *L, int idx)
 */
 
 
-LUA_API void lua_pushnil(lua_State *L)
-{
+LUA_API void lua_pushnil(lua_State *L) {
     lua_lock(L);
     setnilvalue(L->top);
     api_incr_top(L);
@@ -518,8 +483,7 @@ LUA_API void lua_pushnil(lua_State *L)
 }
 
 
-LUA_API void lua_pushnumber(lua_State *L, lua_Number n)
-{
+LUA_API void lua_pushnumber(lua_State *L, lua_Number n) {
     lua_lock(L);
     setnvalue(L->top, n);
     luai_checknum(L, L->top,
@@ -529,8 +493,7 @@ LUA_API void lua_pushnumber(lua_State *L, lua_Number n)
 }
 
 
-LUA_API void lua_pushinteger(lua_State *L, lua_Integer n)
-{
+LUA_API void lua_pushinteger(lua_State *L, lua_Integer n) {
     lua_lock(L);
     setnvalue(L->top, cast_num(n));
     api_incr_top(L);
@@ -538,8 +501,7 @@ LUA_API void lua_pushinteger(lua_State *L, lua_Integer n)
 }
 
 
-LUA_API void lua_pushunsigned(lua_State *L, lua_Unsigned u)
-{
+LUA_API void lua_pushunsigned(lua_State *L, lua_Unsigned u) {
     lua_Number n;
     lua_lock(L);
     n = lua_unsigned2number(u);
@@ -549,8 +511,7 @@ LUA_API void lua_pushunsigned(lua_State *L, lua_Unsigned u)
 }
 
 
-LUA_API const char *lua_pushlstring(lua_State *L, const char *s, size_t len)
-{
+LUA_API const char *lua_pushlstring(lua_State *L, const char *s, size_t len) {
     TString *ts;
     lua_lock(L);
     luaC_checkGC(L);
@@ -562,8 +523,7 @@ LUA_API const char *lua_pushlstring(lua_State *L, const char *s, size_t len)
 }
 
 
-LUA_API const char *lua_pushstring(lua_State *L, const char *s)
-{
+LUA_API const char *lua_pushstring(lua_State *L, const char *s) {
     if (s == NULL) {
         lua_pushnil(L);
         return NULL;
@@ -581,8 +541,7 @@ LUA_API const char *lua_pushstring(lua_State *L, const char *s)
 
 
 LUA_API const char *lua_pushvfstring(lua_State *L, const char *fmt,
-                                     va_list argp)
-{
+                                     va_list argp) {
     const char *ret;
     lua_lock(L);
     luaC_checkGC(L);
@@ -592,8 +551,7 @@ LUA_API const char *lua_pushvfstring(lua_State *L, const char *fmt,
 }
 
 
-LUA_API const char *lua_pushfstring(lua_State *L, const char *fmt, ...)
-{
+LUA_API const char *lua_pushfstring(lua_State *L, const char *fmt, ...) {
     const char *ret;
     va_list argp;
     lua_lock(L);
@@ -606,8 +564,7 @@ LUA_API const char *lua_pushfstring(lua_State *L, const char *fmt, ...)
 }
 
 
-LUA_API void lua_pushcclosure(lua_State *L, lua_CFunction fn, int n)
-{
+LUA_API void lua_pushcclosure(lua_State *L, lua_CFunction fn, int n) {
     lua_lock(L);
     if (n == 0) {
         setfvalue(L->top, fn);
@@ -628,8 +585,7 @@ LUA_API void lua_pushcclosure(lua_State *L, lua_CFunction fn, int n)
 }
 
 
-LUA_API void lua_pushboolean(lua_State *L, int b)
-{
+LUA_API void lua_pushboolean(lua_State *L, int b) {
     lua_lock(L);
     setbvalue(L->top, (b != 0));  /* ensure that true is 1 */
     api_incr_top(L);
@@ -637,8 +593,7 @@ LUA_API void lua_pushboolean(lua_State *L, int b)
 }
 
 
-LUA_API void lua_pushlightuserdata(lua_State *L, void *p)
-{
+LUA_API void lua_pushlightuserdata(lua_State *L, void *p) {
     lua_lock(L);
     setpvalue(L->top, p);
     api_incr_top(L);
@@ -646,8 +601,7 @@ LUA_API void lua_pushlightuserdata(lua_State *L, void *p)
 }
 
 
-LUA_API int lua_pushthread(lua_State *L)
-{
+LUA_API int lua_pushthread(lua_State *L) {
     lua_lock(L);
     setthvalue(L, L->top, L);
     api_incr_top(L);
@@ -662,8 +616,7 @@ LUA_API int lua_pushthread(lua_State *L)
 */
 
 
-LUA_API void lua_getglobal(lua_State *L, const char *var)
-{
+LUA_API void lua_getglobal(lua_State *L, const char *var) {
     Table *reg = hvalue(&G(L)->l_registry);
     const TValue *gt;  /* global table */
     lua_lock(L);
@@ -674,8 +627,7 @@ LUA_API void lua_getglobal(lua_State *L, const char *var)
 }
 
 
-LUA_API void lua_gettable(lua_State *L, int idx)
-{
+LUA_API void lua_gettable(lua_State *L, int idx) {
     StkId t;
     lua_lock(L);
     t = index2addr(L, idx);
@@ -684,8 +636,7 @@ LUA_API void lua_gettable(lua_State *L, int idx)
 }
 
 
-LUA_API void lua_getfield(lua_State *L, int idx, const char *k)
-{
+LUA_API void lua_getfield(lua_State *L, int idx, const char *k) {
     StkId t;
     lua_lock(L);
     t = index2addr(L, idx);
@@ -696,8 +647,7 @@ LUA_API void lua_getfield(lua_State *L, int idx, const char *k)
 }
 
 
-LUA_API void lua_rawget(lua_State *L, int idx)
-{
+LUA_API void lua_rawget(lua_State *L, int idx) {
     StkId t;
     lua_lock(L);
     t = index2addr(L, idx);
@@ -707,8 +657,7 @@ LUA_API void lua_rawget(lua_State *L, int idx)
 }
 
 
-LUA_API void lua_rawgeti(lua_State *L, int idx, int n)
-{
+LUA_API void lua_rawgeti(lua_State *L, int idx, int n) {
     StkId t;
     lua_lock(L);
     t = index2addr(L, idx);
@@ -719,8 +668,7 @@ LUA_API void lua_rawgeti(lua_State *L, int idx, int n)
 }
 
 
-LUA_API void lua_rawgetp(lua_State *L, int idx, const void *p)
-{
+LUA_API void lua_rawgetp(lua_State *L, int idx, const void *p) {
     StkId t;
     TValue k;
     lua_lock(L);
@@ -733,8 +681,7 @@ LUA_API void lua_rawgetp(lua_State *L, int idx, const void *p)
 }
 
 
-LUA_API void lua_createtable(lua_State *L, int narray, int nrec)
-{
+LUA_API void lua_createtable(lua_State *L, int narray, int nrec) {
     Table *t;
     lua_lock(L);
     luaC_checkGC(L);
@@ -747,8 +694,7 @@ LUA_API void lua_createtable(lua_State *L, int narray, int nrec)
 }
 
 
-LUA_API int lua_getmetatable(lua_State *L, int objindex)
-{
+LUA_API int lua_getmetatable(lua_State *L, int objindex) {
     const TValue *obj;
     Table *mt = NULL;
     int res;
@@ -777,8 +723,7 @@ LUA_API int lua_getmetatable(lua_State *L, int objindex)
 }
 
 
-LUA_API void lua_getuservalue(lua_State *L, int idx)
-{
+LUA_API void lua_getuservalue(lua_State *L, int idx) {
     StkId o;
     lua_lock(L);
     o = index2addr(L, idx);
@@ -797,8 +742,7 @@ LUA_API void lua_getuservalue(lua_State *L, int idx)
 */
 
 
-LUA_API void lua_setglobal(lua_State *L, const char *var)
-{
+LUA_API void lua_setglobal(lua_State *L, const char *var) {
     Table *reg = hvalue(&G(L)->l_registry);
     const TValue *gt;  /* global table */
     lua_lock(L);
@@ -811,8 +755,7 @@ LUA_API void lua_setglobal(lua_State *L, const char *var)
 }
 
 
-LUA_API void lua_settable(lua_State *L, int idx)
-{
+LUA_API void lua_settable(lua_State *L, int idx) {
     StkId t;
     lua_lock(L);
     api_checknelems(L, 2);
@@ -823,8 +766,7 @@ LUA_API void lua_settable(lua_State *L, int idx)
 }
 
 
-LUA_API void lua_setfield(lua_State *L, int idx, const char *k)
-{
+LUA_API void lua_setfield(lua_State *L, int idx, const char *k) {
     StkId t;
     lua_lock(L);
     api_checknelems(L, 1);
@@ -836,8 +778,7 @@ LUA_API void lua_setfield(lua_State *L, int idx, const char *k)
 }
 
 
-LUA_API void lua_rawset(lua_State *L, int idx)
-{
+LUA_API void lua_rawset(lua_State *L, int idx) {
     StkId t;
     lua_lock(L);
     api_checknelems(L, 2);
@@ -851,8 +792,7 @@ LUA_API void lua_rawset(lua_State *L, int idx)
 }
 
 
-LUA_API void lua_rawseti(lua_State *L, int idx, int n)
-{
+LUA_API void lua_rawseti(lua_State *L, int idx, int n) {
     StkId t;
     lua_lock(L);
     api_checknelems(L, 1);
@@ -865,8 +805,7 @@ LUA_API void lua_rawseti(lua_State *L, int idx, int n)
 }
 
 
-LUA_API void lua_rawsetp(lua_State *L, int idx, const void *p)
-{
+LUA_API void lua_rawsetp(lua_State *L, int idx, const void *p) {
     StkId t;
     TValue k;
     lua_lock(L);
@@ -881,8 +820,7 @@ LUA_API void lua_rawsetp(lua_State *L, int idx, const void *p)
 }
 
 
-LUA_API int lua_setmetatable(lua_State *L, int objindex)
-{
+LUA_API int lua_setmetatable(lua_State *L, int objindex) {
     TValue *obj;
     Table *mt;
     lua_lock(L);
@@ -922,8 +860,7 @@ LUA_API int lua_setmetatable(lua_State *L, int objindex)
 }
 
 
-LUA_API void lua_setuservalue(lua_State *L, int idx)
-{
+LUA_API void lua_setuservalue(lua_State *L, int idx) {
     StkId o;
     lua_lock(L);
     api_checknelems(L, 1);
@@ -951,8 +888,7 @@ LUA_API void lua_setuservalue(lua_State *L, int idx)
               "results from function overflow current stack size")
 
 
-LUA_API int lua_getctx(lua_State *L, int *ctx)
-{
+LUA_API int lua_getctx(lua_State *L, int *ctx) {
     if (L->ci->callstatus & CIST_YIELDED) {
         if (ctx) *ctx = L->ci->u.c.ctx;
         return L->ci->u.c.status;
@@ -961,8 +897,7 @@ LUA_API int lua_getctx(lua_State *L, int *ctx)
 
 
 LUA_API void lua_callk(lua_State *L, int nargs, int nresults, int ctx,
-                       lua_CFunction k)
-{
+                       lua_CFunction k) {
     StkId func;
     lua_lock(L);
     api_check(L, k == NULL || !isLua(L->ci),
@@ -992,8 +927,7 @@ struct CallS {  /* data to `f_call' */
 };
 
 
-static void f_call(lua_State *L, void *ud)
-{
+static void f_call(lua_State *L, void *ud) {
     struct CallS *c = cast(struct CallS *, ud);
     luaD_call(L, c->func, c->nresults, 0);
 }
@@ -1001,8 +935,7 @@ static void f_call(lua_State *L, void *ud)
 
 
 LUA_API int lua_pcallk(lua_State *L, int nargs, int nresults, int errfunc,
-                       int ctx, lua_CFunction k)
-{
+                       int ctx, lua_CFunction k) {
     struct CallS c;
     int status;
     ptrdiff_t func;
@@ -1046,8 +979,7 @@ LUA_API int lua_pcallk(lua_State *L, int nargs, int nresults, int errfunc,
 
 
 LUA_API int lua_load(lua_State *L, lua_Reader reader, void *data,
-                     const char *chunkname, const char *mode)
-{
+                     const char *chunkname, const char *mode) {
     ZIO z;
     int status;
     lua_lock(L);
@@ -1070,8 +1002,7 @@ LUA_API int lua_load(lua_State *L, lua_Reader reader, void *data,
 }
 
 
-LUA_API int lua_dump(lua_State *L, lua_Writer writer, void *data)
-{
+LUA_API int lua_dump(lua_State *L, lua_Writer writer, void *data) {
     int status;
     TValue *o;
     lua_lock(L);
@@ -1086,8 +1017,7 @@ LUA_API int lua_dump(lua_State *L, lua_Writer writer, void *data)
 }
 
 
-LUA_API int lua_status(lua_State *L)
-{
+LUA_API int lua_status(lua_State *L) {
     return L->status;
 }
 
@@ -1096,8 +1026,7 @@ LUA_API int lua_status(lua_State *L)
 ** Garbage-collection function
 */
 
-LUA_API int lua_gc(lua_State *L, int what, int data)
-{
+LUA_API int lua_gc(lua_State *L, int what, int data) {
     int res = 0;
     global_State *g;
     lua_lock(L);
@@ -1181,8 +1110,7 @@ LUA_API int lua_gc(lua_State *L, int what, int data)
 */
 
 
-LUA_API int lua_error(lua_State *L)
-{
+LUA_API int lua_error(lua_State *L) {
     lua_lock(L);
     api_checknelems(L, 1);
     luaG_errormsg(L);
@@ -1191,8 +1119,7 @@ LUA_API int lua_error(lua_State *L)
 }
 
 
-LUA_API int lua_next(lua_State *L, int idx)
-{
+LUA_API int lua_next(lua_State *L, int idx) {
     StkId t;
     int more;
     lua_lock(L);
@@ -1208,8 +1135,7 @@ LUA_API int lua_next(lua_State *L, int idx)
 }
 
 
-LUA_API void lua_concat(lua_State *L, int n)
-{
+LUA_API void lua_concat(lua_State *L, int n) {
     lua_lock(L);
     api_checknelems(L, n);
     if (n >= 2) {
@@ -1224,8 +1150,7 @@ LUA_API void lua_concat(lua_State *L, int n)
 }
 
 
-LUA_API void lua_len(lua_State *L, int idx)
-{
+LUA_API void lua_len(lua_State *L, int idx) {
     StkId t;
     lua_lock(L);
     t = index2addr(L, idx);
@@ -1235,8 +1160,7 @@ LUA_API void lua_len(lua_State *L, int idx)
 }
 
 
-LUA_API lua_Alloc lua_getallocf(lua_State *L, void **ud)
-{
+LUA_API lua_Alloc lua_getallocf(lua_State *L, void **ud) {
     lua_Alloc f;
     lua_lock(L);
     if (ud) *ud = G(L)->ud;
@@ -1246,8 +1170,7 @@ LUA_API lua_Alloc lua_getallocf(lua_State *L, void **ud)
 }
 
 
-LUA_API void lua_setallocf(lua_State *L, lua_Alloc f, void *ud)
-{
+LUA_API void lua_setallocf(lua_State *L, lua_Alloc f, void *ud) {
     lua_lock(L);
     G(L)->ud = ud;
     G(L)->frealloc = f;
@@ -1255,8 +1178,7 @@ LUA_API void lua_setallocf(lua_State *L, lua_Alloc f, void *ud)
 }
 
 
-LUA_API void *lua_newuserdata(lua_State *L, size_t size)
-{
+LUA_API void *lua_newuserdata(lua_State *L, size_t size) {
     Udata *u;
     lua_lock(L);
     luaC_checkGC(L);
@@ -1270,8 +1192,7 @@ LUA_API void *lua_newuserdata(lua_State *L, size_t size)
 
 
 static const char *aux_upvalue(StkId fi, int n, TValue **val,
-                               GCObject **owner)
-{
+                               GCObject **owner) {
     switch (ttype(fi)) {
         case LUA_TCCL: {  /* C closure */
             CClosure *f = clCvalue(fi);
@@ -1296,8 +1217,7 @@ static const char *aux_upvalue(StkId fi, int n, TValue **val,
 }
 
 
-LUA_API const char *lua_getupvalue(lua_State *L, int funcindex, int n)
-{
+LUA_API const char *lua_getupvalue(lua_State *L, int funcindex, int n) {
     const char *name;
     TValue *val = NULL;  /* to avoid warnings */
     lua_lock(L);
@@ -1311,8 +1231,7 @@ LUA_API const char *lua_getupvalue(lua_State *L, int funcindex, int n)
 }
 
 
-LUA_API const char *lua_setupvalue(lua_State *L, int funcindex, int n)
-{
+LUA_API const char *lua_setupvalue(lua_State *L, int funcindex, int n) {
     const char *name;
     TValue *val = NULL;  /* to avoid warnings */
     GCObject *owner = NULL;  /* to avoid warnings */
@@ -1331,8 +1250,7 @@ LUA_API const char *lua_setupvalue(lua_State *L, int funcindex, int n)
 }
 
 
-static UpVal **getupvalref(lua_State *L, int fidx, int n, LClosure **pf)
-{
+static UpVal **getupvalref(lua_State *L, int fidx, int n, LClosure **pf) {
     LClosure *f;
     StkId fi = index2addr(L, fidx);
     api_check(L, ttisLclosure(fi), "Lua function expected");
@@ -1343,8 +1261,7 @@ static UpVal **getupvalref(lua_State *L, int fidx, int n, LClosure **pf)
 }
 
 
-LUA_API void *lua_upvalueid(lua_State *L, int fidx, int n)
-{
+LUA_API void *lua_upvalueid(lua_State *L, int fidx, int n) {
     StkId fi = index2addr(L, fidx);
     switch (ttype(fi)) {
         case LUA_TLCL: {  /* lua closure */
@@ -1364,8 +1281,7 @@ LUA_API void *lua_upvalueid(lua_State *L, int fidx, int n)
 
 
 LUA_API void lua_upvaluejoin(lua_State *L, int fidx1, int n1,
-                             int fidx2, int n2)
-{
+                             int fidx2, int n2) {
     LClosure *f1;
     UpVal **up1 = getupvalref(L, fidx1, n1, &f1);
     UpVal **up2 = getupvalref(L, fidx2, n2, NULL);
diff --git a/liblua/lauxlib.c b/liblua/lauxlib.c
index 86666b444..28f687f10 100644
--- a/liblua/lauxlib.c
+++ b/liblua/lauxlib.c
@@ -40,8 +40,7 @@
 ** search for 'objidx' in table at index -1.
 ** return 1 + string at top if find a good name.
 */
-static int findfield(lua_State *L, int objidx, int level)
-{
+static int findfield(lua_State *L, int objidx, int level) {
     if (level == 0 || !lua_istable(L, -1))
         return 0;  /* not found */
     lua_pushnil(L);  /* start 'next' loop */
@@ -64,8 +63,7 @@ static int findfield(lua_State *L, int objidx, int level)
 }
 
 
-static int pushglobalfuncname(lua_State *L, lua_Debug *ar)
-{
+static int pushglobalfuncname(lua_State *L, lua_Debug *ar) {
     int top = lua_gettop(L);
     lua_getinfo(L, "f", ar);  /* push function */
     lua_pushglobaltable(L);
@@ -80,8 +78,7 @@ static int pushglobalfuncname(lua_State *L, lua_Debug *ar)
 }
 
 
-static void pushfuncname(lua_State *L, lua_Debug *ar)
-{
+static void pushfuncname(lua_State *L, lua_Debug *ar) {
     if (*ar->namewhat != '\0')  /* is there a name? */
         lua_pushfstring(L, "function " LUA_QS, ar->name);
     else if (*ar->what == 'm')  /* main? */
@@ -97,8 +94,7 @@ static void pushfuncname(lua_State *L, lua_Debug *ar)
 }
 
 
-static int countlevels(lua_State *L)
-{
+static int countlevels(lua_State *L) {
     lua_Debug ar;
     int li = 1, le = 1;
     /* find an upper bound */
@@ -114,8 +110,7 @@ static int countlevels(lua_State *L)
 
 
 LUALIB_API void luaL_traceback(lua_State *L, lua_State *L1,
-                               const char *msg, int level)
-{
+                               const char *msg, int level) {
     lua_Debug ar;
     int top = lua_gettop(L);
     int numlevels = countlevels(L1);
@@ -150,8 +145,7 @@ LUALIB_API void luaL_traceback(lua_State *L, lua_State *L1,
 ** =======================================================
 */
 
-LUALIB_API int luaL_argerror(lua_State *L, int narg, const char *extramsg)
-{
+LUALIB_API int luaL_argerror(lua_State *L, int narg, const char *extramsg) {
     lua_Debug ar;
     if (!lua_getstack(L, 0, &ar))  /* no stack frame? */
         return luaL_error(L, "bad argument #%d (%s)", narg, extramsg);
@@ -169,22 +163,19 @@ LUALIB_API int luaL_argerror(lua_State *L, int narg, const char *extramsg)
 }
 
 
-static int typeerror(lua_State *L, int narg, const char *tname)
-{
+static int typeerror(lua_State *L, int narg, const char *tname) {
     const char *msg = lua_pushfstring(L, "%s expected, got %s",
                                       tname, luaL_typename(L, narg));
     return luaL_argerror(L, narg, msg);
 }
 
 
-static void tag_error(lua_State *L, int narg, int tag)
-{
+static void tag_error(lua_State *L, int narg, int tag) {
     typeerror(L, narg, lua_typename(L, tag));
 }
 
 
-LUALIB_API void luaL_where(lua_State *L, int level)
-{
+LUALIB_API void luaL_where(lua_State *L, int level) {
     lua_Debug ar;
     if (lua_getstack(L, level, &ar)) {  /* check function at level */
         lua_getinfo(L, "Sl", &ar);  /* get info about it */
@@ -197,8 +188,7 @@ LUALIB_API void luaL_where(lua_State *L, int level)
 }
 
 
-LUALIB_API int luaL_error(lua_State *L, const char *fmt, ...)
-{
+LUALIB_API int luaL_error(lua_State *L, const char *fmt, ...) {
     va_list argp;
     va_start(argp, fmt);
     luaL_where(L, 1);
@@ -209,8 +199,7 @@ LUALIB_API int luaL_error(lua_State *L, const char *fmt, ...)
 }
 
 
-LUALIB_API int luaL_fileresult(lua_State *L, int stat, const char *fname)
-{
+LUALIB_API int luaL_fileresult(lua_State *L, int stat, const char *fname) {
     int en = errno;  /* calls to Lua API may change this value */
     if (stat) {
         lua_pushboolean(L, 1);
@@ -249,8 +238,7 @@ LUALIB_API int luaL_fileresult(lua_State *L, int stat, const char *fname)
 #endif                    /* } */
 
 
-LUALIB_API int luaL_execresult(lua_State *L, int stat)
-{
+LUALIB_API int luaL_execresult(lua_State *L, int stat) {
     const char *what = "exit";  /* type of termination */
     if (stat == -1)  /* error? */
         return luaL_fileresult(L, 0, NULL);
@@ -275,8 +263,7 @@ LUALIB_API int luaL_execresult(lua_State *L, int stat)
 ** =======================================================
 */
 
-LUALIB_API int luaL_newmetatable(lua_State *L, const char *tname)
-{
+LUALIB_API int luaL_newmetatable(lua_State *L, const char *tname) {
     luaL_getmetatable(L, tname);  /* try to get metatable */
     if (!lua_isnil(L, -1))  /* name already in use? */
         return 0;  /* leave previous value on top, but return 0 */
@@ -288,15 +275,13 @@ LUALIB_API int luaL_newmetatable(lua_State *L, const char *tname)
 }
 
 
-LUALIB_API void luaL_setmetatable(lua_State *L, const char *tname)
-{
+LUALIB_API void luaL_setmetatable(lua_State *L, const char *tname) {
     luaL_getmetatable(L, tname);
     lua_setmetatable(L, -2);
 }
 
 
-LUALIB_API void *luaL_testudata(lua_State *L, int ud, const char *tname)
-{
+LUALIB_API void *luaL_testudata(lua_State *L, int ud, const char *tname) {
     void *p = lua_touserdata(L, ud);
     if (p != NULL) {  /* value is a userdata? */
         if (lua_getmetatable(L, ud)) {  /* does it have a metatable? */
@@ -311,8 +296,7 @@ LUALIB_API void *luaL_testudata(lua_State *L, int ud, const char *tname)
 }
 
 
-LUALIB_API void *luaL_checkudata(lua_State *L, int ud, const char *tname)
-{
+LUALIB_API void *luaL_checkudata(lua_State *L, int ud, const char *tname) {
     void *p = luaL_testudata(L, ud, tname);
     if (p == NULL) typeerror(L, ud, tname);
     return p;
@@ -328,8 +312,7 @@ LUALIB_API void *luaL_checkudata(lua_State *L, int ud, const char *tname)
 */
 
 LUALIB_API int luaL_checkoption(lua_State *L, int narg, const char *def,
-                                const char *const lst[])
-{
+                                const char *const lst[]) {
     const char *name = (def) ? luaL_optstring(L, narg, def) :
                        luaL_checkstring(L, narg);
     int i;
@@ -341,8 +324,7 @@ LUALIB_API int luaL_checkoption(lua_State *L, int narg, const char *def,
 }
 
 
-LUALIB_API void luaL_checkstack(lua_State *L, int space, const char *msg)
-{
+LUALIB_API void luaL_checkstack(lua_State *L, int space, const char *msg) {
     /* keep some extra space to run error routines, if needed */
     const int extra = LUA_MINSTACK;
     if (!lua_checkstack(L, space + extra)) {
@@ -354,22 +336,19 @@ LUALIB_API void luaL_checkstack(lua_State *L, int space, const char *msg)
 }
 
 
-LUALIB_API void luaL_checktype(lua_State *L, int narg, int t)
-{
+LUALIB_API void luaL_checktype(lua_State *L, int narg, int t) {
     if (lua_type(L, narg) != t)
         tag_error(L, narg, t);
 }
 
 
-LUALIB_API void luaL_checkany(lua_State *L, int narg)
-{
+LUALIB_API void luaL_checkany(lua_State *L, int narg) {
     if (lua_type(L, narg) == LUA_TNONE)
         luaL_argerror(L, narg, "value expected");
 }
 
 
-LUALIB_API const char *luaL_checklstring(lua_State *L, int narg, size_t *len)
-{
+LUALIB_API const char *luaL_checklstring(lua_State *L, int narg, size_t *len) {
     const char *s = lua_tolstring(L, narg, len);
     if (!s) tag_error(L, narg, LUA_TSTRING);
     return s;
@@ -377,8 +356,7 @@ LUALIB_API const char *luaL_checklstring(lua_State *L, int narg, size_t *len)
 
 
 LUALIB_API const char *luaL_optlstring(lua_State *L, int narg,
-                                       const char *def, size_t *len)
-{
+                                       const char *def, size_t *len) {
     if (lua_isnoneornil(L, narg)) {
         if (len)
             *len = (def ? strlen(def) : 0);
@@ -387,8 +365,7 @@ LUALIB_API const char *luaL_optlstring(lua_State *L, int narg,
 }
 
 
-LUALIB_API lua_Number luaL_checknumber(lua_State *L, int narg)
-{
+LUALIB_API lua_Number luaL_checknumber(lua_State *L, int narg) {
     int isnum;
     lua_Number d = lua_tonumberx(L, narg, &isnum);
     if (!isnum)
@@ -397,14 +374,12 @@ LUALIB_API lua_Number luaL_checknumber(lua_State *L, int narg)
 }
 
 
-LUALIB_API lua_Number luaL_optnumber(lua_State *L, int narg, lua_Number def)
-{
+LUALIB_API lua_Number luaL_optnumber(lua_State *L, int narg, lua_Number def) {
     return luaL_opt(L, luaL_checknumber, narg, def);
 }
 
 
-LUALIB_API lua_Integer luaL_checkinteger(lua_State *L, int narg)
-{
+LUALIB_API lua_Integer luaL_checkinteger(lua_State *L, int narg) {
     int isnum;
     lua_Integer d = lua_tointegerx(L, narg, &isnum);
     if (!isnum)
@@ -413,8 +388,7 @@ LUALIB_API lua_Integer luaL_checkinteger(lua_State *L, int narg)
 }
 
 
-LUALIB_API lua_Unsigned luaL_checkunsigned(lua_State *L, int narg)
-{
+LUALIB_API lua_Unsigned luaL_checkunsigned(lua_State *L, int narg) {
     int isnum;
     lua_Unsigned d = lua_tounsignedx(L, narg, &isnum);
     if (!isnum)
@@ -424,15 +398,13 @@ LUALIB_API lua_Unsigned luaL_checkunsigned(lua_State *L, int narg)
 
 
 LUALIB_API lua_Integer luaL_optinteger(lua_State *L, int narg,
-                                       lua_Integer def)
-{
+                                       lua_Integer def) {
     return luaL_opt(L, luaL_checkinteger, narg, def);
 }
 
 
 LUALIB_API lua_Unsigned luaL_optunsigned(lua_State *L, int narg,
-                                         lua_Unsigned def)
-{
+                                         lua_Unsigned def) {
     return luaL_opt(L, luaL_checkunsigned, narg, def);
 }
 
@@ -455,8 +427,7 @@ LUALIB_API lua_Unsigned luaL_optunsigned(lua_State *L, int narg,
 /*
 ** returns a pointer to a free area with at least 'sz' bytes
 */
-LUALIB_API char *luaL_prepbuffsize(luaL_Buffer *B, size_t sz)
-{
+LUALIB_API char *luaL_prepbuffsize(luaL_Buffer *B, size_t sz) {
     lua_State *L = B->L;
     if (B->size - B->n < sz) {  /* not enough space? */
         char *newbuff;
@@ -478,22 +449,19 @@ LUALIB_API char *luaL_prepbuffsize(luaL_Buffer *B, size_t sz)
 }
 
 
-LUALIB_API void luaL_addlstring(luaL_Buffer *B, const char *s, size_t l)
-{
+LUALIB_API void luaL_addlstring(luaL_Buffer *B, const char *s, size_t l) {
     char *b = luaL_prepbuffsize(B, l);
     memcpy(b, s, l * sizeof(char));
     luaL_addsize(B, l);
 }
 
 
-LUALIB_API void luaL_addstring(luaL_Buffer *B, const char *s)
-{
+LUALIB_API void luaL_addstring(luaL_Buffer *B, const char *s) {
     luaL_addlstring(B, s, strlen(s));
 }
 
 
-LUALIB_API void luaL_pushresult(luaL_Buffer *B)
-{
+LUALIB_API void luaL_pushresult(luaL_Buffer *B) {
     lua_State *L = B->L;
     lua_pushlstring(L, B->b, B->n);
     if (buffonstack(B))
@@ -501,15 +469,13 @@ LUALIB_API void luaL_pushresult(luaL_Buffer *B)
 }
 
 
-LUALIB_API void luaL_pushresultsize(luaL_Buffer *B, size_t sz)
-{
+LUALIB_API void luaL_pushresultsize(luaL_Buffer *B, size_t sz) {
     luaL_addsize(B, sz);
     luaL_pushresult(B);
 }
 
 
-LUALIB_API void luaL_addvalue(luaL_Buffer *B)
-{
+LUALIB_API void luaL_addvalue(luaL_Buffer *B) {
     lua_State *L = B->L;
     size_t l;
     const char *s = lua_tolstring(L, -1, &l);
@@ -520,8 +486,7 @@ LUALIB_API void luaL_addvalue(luaL_Buffer *B)
 }
 
 
-LUALIB_API void luaL_buffinit(lua_State *L, luaL_Buffer *B)
-{
+LUALIB_API void luaL_buffinit(lua_State *L, luaL_Buffer *B) {
     B->L = L;
     B->b = B->initb;
     B->n = 0;
@@ -529,8 +494,7 @@ LUALIB_API void luaL_buffinit(lua_State *L, luaL_Buffer *B)
 }
 
 
-LUALIB_API char *luaL_buffinitsize(lua_State *L, luaL_Buffer *B, size_t sz)
-{
+LUALIB_API char *luaL_buffinitsize(lua_State *L, luaL_Buffer *B, size_t sz) {
     luaL_buffinit(L, B);
     return luaL_prepbuffsize(B, sz);
 }
@@ -548,8 +512,7 @@ LUALIB_API char *luaL_buffinitsize(lua_State *L, luaL_Buffer *B, size_t sz)
 #define freelist 0
 
 
-LUALIB_API int luaL_ref(lua_State *L, int t)
-{
+LUALIB_API int luaL_ref(lua_State *L, int t) {
     int ref;
     if (lua_isnil(L, -1)) {
         lua_pop(L, 1);  /* remove from stack */
@@ -569,8 +532,7 @@ LUALIB_API int luaL_ref(lua_State *L, int t)
 }
 
 
-LUALIB_API void luaL_unref(lua_State *L, int t, int ref)
-{
+LUALIB_API void luaL_unref(lua_State *L, int t, int ref) {
     if (ref >= 0) {
         t = lua_absindex(L, t);
         lua_rawgeti(L, t, freelist);
@@ -596,8 +558,7 @@ typedef struct LoadF {
 } LoadF;
 
 
-static const char *getF(lua_State *L, void *ud, size_t *size)
-{
+static const char *getF(lua_State *L, void *ud, size_t *size) {
     LoadF *lf = (LoadF *)ud;
     (void)L;  /* not used */
     if (lf->n > 0) {  /* are there pre-read characters to be read? */
@@ -614,8 +575,7 @@ static const char *getF(lua_State *L, void *ud, size_t *size)
 }
 
 
-static int errfile(lua_State *L, const char *what, int fnameindex)
-{
+static int errfile(lua_State *L, const char *what, int fnameindex) {
     const char *serr = strerror(errno);
     const char *filename = lua_tostring(L, fnameindex) + 1;
     lua_pushfstring(L, "cannot %s %s: %s", what, filename, serr);
@@ -624,8 +584,7 @@ static int errfile(lua_State *L, const char *what, int fnameindex)
 }
 
 
-static int skipBOM(LoadF *lf)
-{
+static int skipBOM(LoadF *lf) {
     const char *p = "\xEF\xBB\xBF";  /* Utf8 BOM mark */
     int c;
     lf->n = 0;
@@ -646,8 +605,7 @@ static int skipBOM(LoadF *lf)
 ** first "valid" character of the file (after the optional BOM and
 ** a first-line comment).
 */
-static int skipcomment(LoadF *lf, int *cp)
-{
+static int skipcomment(LoadF *lf, int *cp) {
     int c = *cp = skipBOM(lf);
     if (c == '#') {  /* first line is a comment (Unix exec. file)? */
         do {  /* skip first line */
@@ -660,8 +618,7 @@ static int skipcomment(LoadF *lf, int *cp)
 
 
 LUALIB_API int luaL_loadfilex(lua_State *L, const char *filename,
-                              const char *mode)
-{
+                              const char *mode) {
     LoadF lf;
     int status, readstatus;
     int c;
@@ -701,8 +658,7 @@ typedef struct LoadS {
 } LoadS;
 
 
-static const char *getS(lua_State *L, void *ud, size_t *size)
-{
+static const char *getS(lua_State *L, void *ud, size_t *size) {
     LoadS *ls = (LoadS *)ud;
     (void)L;  /* not used */
     if (ls->size == 0) return NULL;
@@ -713,8 +669,7 @@ static const char *getS(lua_State *L, void *ud, size_t *size)
 
 
 LUALIB_API int luaL_loadbufferx(lua_State *L, const char *buff, size_t size,
-                                const char *name, const char *mode)
-{
+                                const char *name, const char *mode) {
     LoadS ls;
     ls.s = buff;
     ls.size = size;
@@ -722,8 +677,7 @@ LUALIB_API int luaL_loadbufferx(lua_State *L, const char *buff, size_t size,
 }
 
 
-LUALIB_API int luaL_loadstring(lua_State *L, const char *s)
-{
+LUALIB_API int luaL_loadstring(lua_State *L, const char *s) {
     return luaL_loadbuffer(L, s, strlen(s), s);
 }
 
@@ -731,8 +685,7 @@ LUALIB_API int luaL_loadstring(lua_State *L, const char *s)
 
 
 
-LUALIB_API int luaL_getmetafield(lua_State *L, int obj, const char *event)
-{
+LUALIB_API int luaL_getmetafield(lua_State *L, int obj, const char *event) {
     if (!lua_getmetatable(L, obj))  /* no metatable? */
         return 0;
     lua_pushstring(L, event);
@@ -747,8 +700,7 @@ LUALIB_API int luaL_getmetafield(lua_State *L, int obj, const char *event)
 }
 
 
-LUALIB_API int luaL_callmeta(lua_State *L, int obj, const char *event)
-{
+LUALIB_API int luaL_callmeta(lua_State *L, int obj, const char *event) {
     obj = lua_absindex(L, obj);
     if (!luaL_getmetafield(L, obj, event))  /* no metafield? */
         return 0;
@@ -758,8 +710,7 @@ LUALIB_API int luaL_callmeta(lua_State *L, int obj, const char *event)
 }
 
 
-LUALIB_API int luaL_len(lua_State *L, int idx)
-{
+LUALIB_API int luaL_len(lua_State *L, int idx) {
     int l;
     int isnum;
     lua_len(L, idx);
@@ -771,8 +722,7 @@ LUALIB_API int luaL_len(lua_State *L, int idx)
 }
 
 
-LUALIB_API const char *luaL_tolstring(lua_State *L, int idx, size_t *len)
-{
+LUALIB_API const char *luaL_tolstring(lua_State *L, int idx, size_t *len) {
     if (!luaL_callmeta(L, idx, "__tostring")) {  /* no metafield? */
         switch (lua_type(L, idx)) {
             case LUA_TNUMBER:
@@ -803,8 +753,7 @@ LUALIB_API const char *luaL_tolstring(lua_State *L, int idx, size_t *len)
 #if defined(LUA_COMPAT_MODULE)
 
 static const char *luaL_findtable(lua_State *L, int idx,
-                                  const char *fname, int szhint)
-{
+                                  const char *fname, int szhint) {
     const char *e;
     if (idx) lua_pushvalue(L, idx);
     do {
@@ -832,8 +781,7 @@ static const char *luaL_findtable(lua_State *L, int idx,
 /*
 ** Count number of elements in a luaL_Reg list.
 */
-static int libsize(const luaL_Reg *l)
-{
+static int libsize(const luaL_Reg *l) {
     int size = 0;
     for (; l && l->name; l++) size++;
     return size;
@@ -847,8 +795,7 @@ static int libsize(const luaL_Reg *l)
 ** the module table.
 */
 LUALIB_API void luaL_pushmodule(lua_State *L, const char *modname,
-                                int sizehint)
-{
+                                int sizehint) {
     luaL_findtable(L, LUA_REGISTRYINDEX, "_LOADED", 1);  /* get _LOADED table */
     lua_getfield(L, -1, modname);  /* get _LOADED[modname] */
     if (!lua_istable(L, -1)) {  /* not found? */
@@ -865,8 +812,7 @@ LUALIB_API void luaL_pushmodule(lua_State *L, const char *modname,
 
 
 LUALIB_API void luaL_openlib(lua_State *L, const char *libname,
-                             const luaL_Reg *l, int nup)
-{
+                             const luaL_Reg *l, int nup) {
     luaL_checkversion(L);
     if (libname) {
         luaL_pushmodule(L, libname, libsize(l));  /* get/create library table */
@@ -886,8 +832,7 @@ LUALIB_API void luaL_openlib(lua_State *L, const char *libname,
 ** function gets the 'nup' elements at the top as upvalues.
 ** Returns with only the table at the stack.
 */
-LUALIB_API void luaL_setfuncs(lua_State *L, const luaL_Reg *l, int nup)
-{
+LUALIB_API void luaL_setfuncs(lua_State *L, const luaL_Reg *l, int nup) {
     luaL_checkversion(L);
     luaL_checkstack(L, nup, "too many upvalues");
     for (; l->name != NULL; l++) {  /* fill the table with given functions */
@@ -905,8 +850,7 @@ LUALIB_API void luaL_setfuncs(lua_State *L, const luaL_Reg *l, int nup)
 ** ensure that stack[idx][fname] has a table and push that table
 ** into the stack
 */
-LUALIB_API int luaL_getsubtable(lua_State *L, int idx, const char *fname)
-{
+LUALIB_API int luaL_getsubtable(lua_State *L, int idx, const char *fname) {
     lua_getfield(L, idx, fname);
     if (lua_istable(L, -1)) return 1;  /* table already there */
     else {
@@ -927,8 +871,7 @@ LUALIB_API int luaL_getsubtable(lua_State *L, int idx, const char *fname)
 ** Leaves resulting module on the top.
 */
 LUALIB_API void luaL_requiref(lua_State *L, const char *modname,
-                              lua_CFunction openf, int glb)
-{
+                              lua_CFunction openf, int glb) {
     lua_pushcfunction(L, openf);
     lua_pushstring(L, modname);  /* argument to open function */
     lua_call(L, 1, 1);  /* open module */
@@ -944,8 +887,7 @@ LUALIB_API void luaL_requiref(lua_State *L, const char *modname,
 
 
 LUALIB_API const char *luaL_gsub(lua_State *L, const char *s, const char *p,
-                                 const char *r)
-{
+                                 const char *r) {
     const char *wild;
     size_t l = strlen(p);
     luaL_Buffer b;
@@ -961,8 +903,7 @@ LUALIB_API const char *luaL_gsub(lua_State *L, const char *s, const char *p,
 }
 
 
-static void *l_alloc(void *ud, void *ptr, size_t osize, size_t nsize)
-{
+static void *l_alloc(void *ud, void *ptr, size_t osize, size_t nsize) {
     (void)ud;
     (void)osize;  /* not used */
     if (nsize == 0) {
@@ -973,24 +914,21 @@ static void *l_alloc(void *ud, void *ptr, size_t osize, size_t nsize)
 }
 
 
-static int panic(lua_State *L)
-{
+static int panic(lua_State *L) {
     luai_writestringerror("PANIC: unprotected error in call to Lua API (%s)\n",
                           lua_tostring(L, -1));
     return 0;  /* return to Lua to abort */
 }
 
 
-LUALIB_API lua_State *luaL_newstate(void)
-{
+LUALIB_API lua_State *luaL_newstate(void) {
     lua_State *L = lua_newstate(l_alloc, NULL);
     if (L) lua_atpanic(L, &panic);
     return L;
 }
 
 
-LUALIB_API void luaL_checkversion_(lua_State *L, lua_Number ver)
-{
+LUALIB_API void luaL_checkversion_(lua_State *L, lua_Number ver) {
     const lua_Number *v = lua_version(L);
     if (v != lua_version(NULL))
         luaL_error(L, "multiple Lua VMs detected");
@@ -1000,7 +938,7 @@ LUALIB_API void luaL_checkversion_(lua_State *L, lua_Number ver)
     /* check conversions number -> integer types */
     lua_pushnumber(L, -(lua_Number)0x1234);
     if (lua_tointeger(L, -1) != -0x1234 ||
-        lua_tounsigned(L, -1) != (lua_Unsigned) - 0x1234)
+            lua_tounsigned(L, -1) != (lua_Unsigned) - 0x1234)
         luaL_error(L, "bad conversion number->int;"
                    " must recompile Lua with proper settings");
     lua_pop(L, 1);
diff --git a/liblua/lbaselib.c b/liblua/lbaselib.c
index 858b7fb4d..bf3905c24 100644
--- a/liblua/lbaselib.c
+++ b/liblua/lbaselib.c
@@ -20,8 +20,7 @@
 #include "lualib.h"
 
 
-static int luaB_print(lua_State *L)
-{
+static int luaB_print(lua_State *L) {
     int n = lua_gettop(L);  /* number of arguments */
     int i;
     lua_getglobal(L, "tostring");
@@ -46,8 +45,7 @@ static int luaB_print(lua_State *L)
 
 #define SPACECHARS " \f\n\r\t\v"
 
-static int luaB_tonumber(lua_State *L)
-{
+static int luaB_tonumber(lua_State *L) {
     if (lua_isnoneornil(L, 2)) {  /* standard conversion */
         int isnum;
         lua_Number n = lua_tonumberx(L, 1, &isnum);
@@ -87,8 +85,7 @@ static int luaB_tonumber(lua_State *L)
 }
 
 
-static int luaB_error(lua_State *L)
-{
+static int luaB_error(lua_State *L) {
     int level = luaL_optint(L, 2, 1);
     lua_settop(L, 1);
     if (lua_isstring(L, 1) && level > 0) {  /* add extra information? */
@@ -100,8 +97,7 @@ static int luaB_error(lua_State *L)
 }
 
 
-static int luaB_getmetatable(lua_State *L)
-{
+static int luaB_getmetatable(lua_State *L) {
     luaL_checkany(L, 1);
     if (!lua_getmetatable(L, 1)) {
         lua_pushnil(L);
@@ -112,8 +108,7 @@ static int luaB_getmetatable(lua_State *L)
 }
 
 
-static int luaB_setmetatable(lua_State *L)
-{
+static int luaB_setmetatable(lua_State *L) {
     int t = lua_type(L, 2);
     luaL_checktype(L, 1, LUA_TTABLE);
     luaL_argcheck(L, t == LUA_TNIL || t == LUA_TTABLE, 2,
@@ -126,8 +121,7 @@ static int luaB_setmetatable(lua_State *L)
 }
 
 
-static int luaB_rawequal(lua_State *L)
-{
+static int luaB_rawequal(lua_State *L) {
     luaL_checkany(L, 1);
     luaL_checkany(L, 2);
     lua_pushboolean(L, lua_rawequal(L, 1, 2));
@@ -135,8 +129,7 @@ static int luaB_rawequal(lua_State *L)
 }
 
 
-static int luaB_rawlen(lua_State *L)
-{
+static int luaB_rawlen(lua_State *L) {
     int t = lua_type(L, 1);
     luaL_argcheck(L, t == LUA_TTABLE || t == LUA_TSTRING, 1,
                   "table or string expected");
@@ -145,8 +138,7 @@ static int luaB_rawlen(lua_State *L)
 }
 
 
-static int luaB_rawget(lua_State *L)
-{
+static int luaB_rawget(lua_State *L) {
     luaL_checktype(L, 1, LUA_TTABLE);
     luaL_checkany(L, 2);
     lua_settop(L, 2);
@@ -154,8 +146,7 @@ static int luaB_rawget(lua_State *L)
     return 1;
 }
 
-static int luaB_rawset(lua_State *L)
-{
+static int luaB_rawset(lua_State *L) {
     luaL_checktype(L, 1, LUA_TTABLE);
     luaL_checkany(L, 2);
     luaL_checkany(L, 3);
@@ -165,8 +156,7 @@ static int luaB_rawset(lua_State *L)
 }
 
 
-static int luaB_collectgarbage(lua_State *L)
-{
+static int luaB_collectgarbage(lua_State *L) {
     static const char *const opts[] = {"stop", "restart", "collect",
                                        "count", "step", "setpause", "setstepmul",
                                        "setmajorinc", "isrunning", "generational", "incremental", NULL
@@ -198,8 +188,7 @@ static int luaB_collectgarbage(lua_State *L)
 }
 
 
-static int luaB_type(lua_State *L)
-{
+static int luaB_type(lua_State *L) {
     luaL_checkany(L, 1);
     lua_pushstring(L, luaL_typename(L, 1));
     return 1;
@@ -207,8 +196,7 @@ static int luaB_type(lua_State *L)
 
 
 static int pairsmeta(lua_State *L, const char *method, int iszero,
-                     lua_CFunction iter)
-{
+                     lua_CFunction iter) {
     if (!luaL_getmetafield(L, 1, method)) {  /* no metamethod? */
         luaL_checktype(L, 1, LUA_TTABLE);  /* argument must be a table */
         lua_pushcfunction(L, iter);  /* will return generator, */
@@ -223,8 +211,7 @@ static int pairsmeta(lua_State *L, const char *method, int iszero,
 }
 
 
-static int luaB_next(lua_State *L)
-{
+static int luaB_next(lua_State *L) {
     luaL_checktype(L, 1, LUA_TTABLE);
     lua_settop(L, 2);  /* create a 2nd argument if there isn't one */
     if (lua_next(L, 1))
@@ -236,14 +223,12 @@ static int luaB_next(lua_State *L)
 }
 
 
-static int luaB_pairs(lua_State *L)
-{
+static int luaB_pairs(lua_State *L) {
     return pairsmeta(L, "__pairs", 0, luaB_next);
 }
 
 
-static int ipairsaux(lua_State *L)
-{
+static int ipairsaux(lua_State *L) {
     int i = luaL_checkint(L, 2);
     luaL_checktype(L, 1, LUA_TTABLE);
     i++;  /* next value */
@@ -253,14 +238,12 @@ static int ipairsaux(lua_State *L)
 }
 
 
-static int luaB_ipairs(lua_State *L)
-{
+static int luaB_ipairs(lua_State *L) {
     return pairsmeta(L, "__ipairs", 1, ipairsaux);
 }
 
 
-static int load_aux(lua_State *L, int status, int envidx)
-{
+static int load_aux(lua_State *L, int status, int envidx) {
     if (status == LUA_OK) {
         if (envidx != 0) {  /* 'env' parameter? */
             lua_pushvalue(L, envidx);  /* environment for loaded function */
@@ -276,8 +259,7 @@ static int load_aux(lua_State *L, int status, int envidx)
 }
 
 
-static int luaB_loadfile(lua_State *L)
-{
+static int luaB_loadfile(lua_State *L) {
     const char *fname = luaL_optstring(L, 1, NULL);
     const char *mode = luaL_optstring(L, 2, NULL);
     int env = (!lua_isnone(L, 3) ? 3 : 0);  /* 'env' index or 0 if no 'env' */
@@ -307,8 +289,7 @@ static int luaB_loadfile(lua_State *L)
 ** stack top. Instead, it keeps its resulting string in a
 ** reserved slot inside the stack.
 */
-static const char *generic_reader(lua_State *L, void *ud, size_t *size)
-{
+static const char *generic_reader(lua_State *L, void *ud, size_t *size) {
     (void)(ud);  /* not used */
     luaL_checkstack(L, 2, "too many nested functions");
     lua_pushvalue(L, 1);  /* get function */
@@ -324,8 +305,7 @@ static const char *generic_reader(lua_State *L, void *ud, size_t *size)
 }
 
 
-static int luaB_load(lua_State *L)
-{
+static int luaB_load(lua_State *L) {
     int status;
     size_t l;
     const char *s = lua_tolstring(L, 1, &l);
@@ -346,14 +326,12 @@ static int luaB_load(lua_State *L)
 /* }====================================================== */
 
 
-static int dofilecont(lua_State *L)
-{
+static int dofilecont(lua_State *L) {
     return lua_gettop(L) - 1;
 }
 
 
-static int luaB_dofile(lua_State *L)
-{
+static int luaB_dofile(lua_State *L) {
     const char *fname = luaL_optstring(L, 1, NULL);
     lua_settop(L, 1);
     if (luaL_loadfile(L, fname) != LUA_OK)
@@ -363,16 +341,14 @@ static int luaB_dofile(lua_State *L)
 }
 
 
-static int luaB_assert(lua_State *L)
-{
+static int luaB_assert(lua_State *L) {
     if (!lua_toboolean(L, 1))
         return luaL_error(L, "%s", luaL_optstring(L, 2, "assertion failed!"));
     return lua_gettop(L);
 }
 
 
-static int luaB_select(lua_State *L)
-{
+static int luaB_select(lua_State *L) {
     int n = lua_gettop(L);
     if (lua_type(L, 1) == LUA_TSTRING && *lua_tostring(L, 1) == '#') {
         lua_pushinteger(L, n - 1);
@@ -387,8 +363,7 @@ static int luaB_select(lua_State *L)
 }
 
 
-static int finishpcall(lua_State *L, int status)
-{
+static int finishpcall(lua_State *L, int status) {
     if (!lua_checkstack(L, 1)) {  /* no space for extra boolean? */
         lua_settop(L, 0);  /* create space for return values */
         lua_pushboolean(L, 0);
@@ -401,15 +376,13 @@ static int finishpcall(lua_State *L, int status)
 }
 
 
-static int pcallcont(lua_State *L)
-{
+static int pcallcont(lua_State *L) {
     int status = lua_getctx(L, NULL);
     return finishpcall(L, (status == LUA_YIELD));
 }
 
 
-static int luaB_pcall(lua_State *L)
-{
+static int luaB_pcall(lua_State *L) {
     int status;
     luaL_checkany(L, 1);
     lua_pushnil(L);
@@ -419,8 +392,7 @@ static int luaB_pcall(lua_State *L)
 }
 
 
-static int luaB_xpcall(lua_State *L)
-{
+static int luaB_xpcall(lua_State *L) {
     int status;
     int n = lua_gettop(L);
     luaL_argcheck(L, n >= 2, 2, "value expected");
@@ -432,8 +404,7 @@ static int luaB_xpcall(lua_State *L)
 }
 
 
-static int luaB_tostring(lua_State *L)
-{
+static int luaB_tostring(lua_State *L) {
     luaL_checkany(L, 1);
     luaL_tolstring(L, 1, NULL);
     return 1;
@@ -470,8 +441,7 @@ static const luaL_Reg base_funcs[] = {
 };
 
 
-LUAMOD_API int luaopen_base(lua_State *L)
-{
+LUAMOD_API int luaopen_base(lua_State *L) {
     /* set global _G */
     lua_pushglobaltable(L);
     lua_pushglobaltable(L);
diff --git a/liblua/lbitlib.c b/liblua/lbitlib.c
index 66c95a5d6..090e52b8b 100644
--- a/liblua/lbitlib.c
+++ b/liblua/lbitlib.c
@@ -33,8 +33,7 @@ typedef lua_Unsigned b_uint;
 
 
 
-static b_uint andaux(lua_State *L)
-{
+static b_uint andaux(lua_State *L) {
     int i, n = lua_gettop(L);
     b_uint r = ~(b_uint)0;
     for (i = 1; i <= n; i++)
@@ -43,24 +42,21 @@ static b_uint andaux(lua_State *L)
 }
 
 
-static int b_and(lua_State *L)
-{
+static int b_and(lua_State *L) {
     b_uint r = andaux(L);
     lua_pushunsigned(L, r);
     return 1;
 }
 
 
-static int b_test(lua_State *L)
-{
+static int b_test(lua_State *L) {
     b_uint r = andaux(L);
     lua_pushboolean(L, r != 0);
     return 1;
 }
 
 
-static int b_or(lua_State *L)
-{
+static int b_or(lua_State *L) {
     int i, n = lua_gettop(L);
     b_uint r = 0;
     for (i = 1; i <= n; i++)
@@ -70,8 +66,7 @@ static int b_or(lua_State *L)
 }
 
 
-static int b_xor(lua_State *L)
-{
+static int b_xor(lua_State *L) {
     int i, n = lua_gettop(L);
     b_uint r = 0;
     for (i = 1; i <= n; i++)
@@ -81,16 +76,14 @@ static int b_xor(lua_State *L)
 }
 
 
-static int b_not(lua_State *L)
-{
+static int b_not(lua_State *L) {
     b_uint r = ~luaL_checkunsigned(L, 1);
     lua_pushunsigned(L, trim(r));
     return 1;
 }
 
 
-static int b_shift(lua_State *L, b_uint r, int i)
-{
+static int b_shift(lua_State *L, b_uint r, int i) {
     if (i < 0) {  /* shift right? */
         i = -i;
         r = trim(r);
@@ -106,20 +99,17 @@ static int b_shift(lua_State *L, b_uint r, int i)
 }
 
 
-static int b_lshift(lua_State *L)
-{
+static int b_lshift(lua_State *L) {
     return b_shift(L, luaL_checkunsigned(L, 1), luaL_checkint(L, 2));
 }
 
 
-static int b_rshift(lua_State *L)
-{
+static int b_rshift(lua_State *L) {
     return b_shift(L, luaL_checkunsigned(L, 1), -luaL_checkint(L, 2));
 }
 
 
-static int b_arshift(lua_State *L)
-{
+static int b_arshift(lua_State *L) {
     b_uint r = luaL_checkunsigned(L, 1);
     int i = luaL_checkint(L, 2);
     if (i < 0 || !(r & ((b_uint)1 << (LUA_NBITS - 1))))
@@ -134,8 +124,7 @@ static int b_arshift(lua_State *L)
 }
 
 
-static int b_rot(lua_State *L, int i)
-{
+static int b_rot(lua_State *L, int i) {
     b_uint r = luaL_checkunsigned(L, 1);
     i &= (LUA_NBITS - 1);  /* i = i % NBITS */
     r = trim(r);
@@ -145,14 +134,12 @@ static int b_rot(lua_State *L, int i)
 }
 
 
-static int b_lrot(lua_State *L)
-{
+static int b_lrot(lua_State *L) {
     return b_rot(L, luaL_checkint(L, 2));
 }
 
 
-static int b_rrot(lua_State *L)
-{
+static int b_rrot(lua_State *L) {
     return b_rot(L, -luaL_checkint(L, 2));
 }
 
@@ -163,8 +150,7 @@ static int b_rrot(lua_State *L)
 ** ('luaL_error' called without 'return' to avoid later warnings about
 ** 'width' being used uninitialized.)
 */
-static int fieldargs(lua_State *L, int farg, int *width)
-{
+static int fieldargs(lua_State *L, int farg, int *width) {
     int f = luaL_checkint(L, farg);
     int w = luaL_optint(L, farg + 1, 1);
     luaL_argcheck(L, 0 <= f, farg, "field cannot be negative");
@@ -176,8 +162,7 @@ static int fieldargs(lua_State *L, int farg, int *width)
 }
 
 
-static int b_extract(lua_State *L)
-{
+static int b_extract(lua_State *L) {
     int w;
     b_uint r = luaL_checkunsigned(L, 1);
     int f = fieldargs(L, 2, &w);
@@ -187,8 +172,7 @@ static int b_extract(lua_State *L)
 }
 
 
-static int b_replace(lua_State *L)
-{
+static int b_replace(lua_State *L) {
     int w;
     b_uint r = luaL_checkunsigned(L, 1);
     b_uint v = luaL_checkunsigned(L, 2);
@@ -219,8 +203,7 @@ static const luaL_Reg bitlib[] = {
 
 
 
-LUAMOD_API int luaopen_bit32(lua_State *L)
-{
+LUAMOD_API int luaopen_bit32(lua_State *L) {
     luaL_newlib(L, bitlib);
     return 1;
 }
diff --git a/liblua/lcode.c b/liblua/lcode.c
index ce163923e..c572c2847 100644
--- a/liblua/lcode.c
+++ b/liblua/lcode.c
@@ -29,14 +29,12 @@
 #define hasjumps(e) ((e)->t != (e)->f)
 
 
-static int isnumeral(expdesc *e)
-{
+static int isnumeral(expdesc *e) {
     return (e->k == VKNUM && e->t == NO_JUMP && e->f == NO_JUMP);
 }
 
 
-void luaK_nil(FuncState *fs, int from, int n)
-{
+void luaK_nil(FuncState *fs, int from, int n) {
     Instruction *previous;
     int l = from + n - 1;  /* last register to set nil */
     if (fs->pc > fs->lasttarget) {  /* no jumps to current position? */
@@ -45,7 +43,7 @@ void luaK_nil(FuncState *fs, int from, int n)
             int pfrom = GETARG_A(*previous);
             int pl = pfrom + GETARG_B(*previous);
             if ((pfrom <= from && from <= pl + 1) ||
-                (from <= pfrom && pfrom <= l + 1)) {  /* can connect both? */
+                    (from <= pfrom && pfrom <= l + 1)) {  /* can connect both? */
                 if (pfrom < from) from = pfrom;  /* from = min(from, pfrom) */
                 if (pl > l) l = pl;  /* l = max(l, pl) */
                 SETARG_A(*previous, from);
@@ -58,8 +56,7 @@ void luaK_nil(FuncState *fs, int from, int n)
 }
 
 
-int luaK_jump(FuncState *fs)
-{
+int luaK_jump(FuncState *fs) {
     int jpc = fs->jpc;  /* save list of jumps to here */
     int j;
     fs->jpc = NO_JUMP;
@@ -69,21 +66,18 @@ int luaK_jump(FuncState *fs)
 }
 
 
-void luaK_ret(FuncState *fs, int first, int nret)
-{
+void luaK_ret(FuncState *fs, int first, int nret) {
     luaK_codeABC(fs, OP_RETURN, first, nret + 1, 0);
 }
 
 
-static int condjump(FuncState *fs, OpCode op, int A, int B, int C)
-{
+static int condjump(FuncState *fs, OpCode op, int A, int B, int C) {
     luaK_codeABC(fs, op, A, B, C);
     return luaK_jump(fs);
 }
 
 
-static void fixjump(FuncState *fs, int pc, int dest)
-{
+static void fixjump(FuncState *fs, int pc, int dest) {
     Instruction *jmp = &fs->f->code[pc];
     int offset = dest - (pc + 1);
     lua_assert(dest != NO_JUMP);
@@ -97,15 +91,13 @@ static void fixjump(FuncState *fs, int pc, int dest)
 ** returns current `pc' and marks it as a jump target (to avoid wrong
 ** optimizations with consecutive instructions not in the same basic block).
 */
-int luaK_getlabel(FuncState *fs)
-{
+int luaK_getlabel(FuncState *fs) {
     fs->lasttarget = fs->pc;
     return fs->pc;
 }
 
 
-static int getjump(FuncState *fs, int pc)
-{
+static int getjump(FuncState *fs, int pc) {
     int offset = GETARG_sBx(fs->f->code[pc]);
     if (offset == NO_JUMP)  /* point to itself represents end of list */
         return NO_JUMP;  /* end of list */
@@ -114,8 +106,7 @@ static int getjump(FuncState *fs, int pc)
 }
 
 
-static Instruction *getjumpcontrol(FuncState *fs, int pc)
-{
+static Instruction *getjumpcontrol(FuncState *fs, int pc) {
     Instruction *pi = &fs->f->code[pc];
     if (pc >= 1 && testTMode(GET_OPCODE(*(pi - 1))))
         return pi - 1;
@@ -128,8 +119,7 @@ static Instruction *getjumpcontrol(FuncState *fs, int pc)
 ** check whether list has any jump that do not produce a value
 ** (or produce an inverted value)
 */
-static int need_value(FuncState *fs, int list)
-{
+static int need_value(FuncState *fs, int list) {
     for (; list != NO_JUMP; list = getjump(fs, list)) {
         Instruction i = *getjumpcontrol(fs, list);
         if (GET_OPCODE(i) != OP_TESTSET) return 1;
@@ -138,8 +128,7 @@ static int need_value(FuncState *fs, int list)
 }
 
 
-static int patchtestreg(FuncState *fs, int node, int reg)
-{
+static int patchtestreg(FuncState *fs, int node, int reg) {
     Instruction *i = getjumpcontrol(fs, node);
     if (GET_OPCODE(*i) != OP_TESTSET)
         return 0;  /* cannot patch other instructions */
@@ -152,16 +141,14 @@ static int patchtestreg(FuncState *fs, int node, int reg)
 }
 
 
-static void removevalues(FuncState *fs, int list)
-{
+static void removevalues(FuncState *fs, int list) {
     for (; list != NO_JUMP; list = getjump(fs, list))
         patchtestreg(fs, list, NO_REG);
 }
 
 
 static void patchlistaux(FuncState *fs, int list, int vtarget, int reg,
-                         int dtarget)
-{
+                         int dtarget) {
     while (list != NO_JUMP) {
         int next = getjump(fs, list);
         if (patchtestreg(fs, list, reg))
@@ -173,15 +160,13 @@ static void patchlistaux(FuncState *fs, int list, int vtarget, int reg,
 }
 
 
-static void dischargejpc(FuncState *fs)
-{
+static void dischargejpc(FuncState *fs) {
     patchlistaux(fs, fs->jpc, fs->pc, NO_REG, fs->pc);
     fs->jpc = NO_JUMP;
 }
 
 
-void luaK_patchlist(FuncState *fs, int list, int target)
-{
+void luaK_patchlist(FuncState *fs, int list, int target) {
     if (target == fs->pc)
         luaK_patchtohere(fs, list);
     else {
@@ -191,8 +176,7 @@ void luaK_patchlist(FuncState *fs, int list, int target)
 }
 
 
-LUAI_FUNC void luaK_patchclose(FuncState *fs, int list, int level)
-{
+LUAI_FUNC void luaK_patchclose(FuncState *fs, int list, int level) {
     level++;  /* argument is +1 to reserve 0 as non-op */
     while (list != NO_JUMP) {
         int next = getjump(fs, list);
@@ -205,15 +189,13 @@ LUAI_FUNC void luaK_patchclose(FuncState *fs, int list, int level)
 }
 
 
-void luaK_patchtohere(FuncState *fs, int list)
-{
+void luaK_patchtohere(FuncState *fs, int list) {
     luaK_getlabel(fs);
     luaK_concat(fs, &fs->jpc, list);
 }
 
 
-void luaK_concat(FuncState *fs, int *l1, int l2)
-{
+void luaK_concat(FuncState *fs, int *l1, int l2) {
     if (l2 == NO_JUMP) return;
     else if (*l1 == NO_JUMP)
         *l1 = l2;
@@ -227,8 +209,7 @@ void luaK_concat(FuncState *fs, int *l1, int l2)
 }
 
 
-static int luaK_code(FuncState *fs, Instruction i)
-{
+static int luaK_code(FuncState *fs, Instruction i) {
     Proto *f = fs->f;
     dischargejpc(fs);  /* `pc' will change */
     /* put new instruction in code array */
@@ -243,8 +224,7 @@ static int luaK_code(FuncState *fs, Instruction i)
 }
 
 
-int luaK_codeABC(FuncState *fs, OpCode o, int a, int b, int c)
-{
+int luaK_codeABC(FuncState *fs, OpCode o, int a, int b, int c) {
     lua_assert(getOpMode(o) == iABC);
     lua_assert(getBMode(o) != OpArgN || b == 0);
     lua_assert(getCMode(o) != OpArgN || c == 0);
@@ -253,8 +233,7 @@ int luaK_codeABC(FuncState *fs, OpCode o, int a, int b, int c)
 }
 
 
-int luaK_codeABx(FuncState *fs, OpCode o, int a, unsigned int bc)
-{
+int luaK_codeABx(FuncState *fs, OpCode o, int a, unsigned int bc) {
     lua_assert(getOpMode(o) == iABx || getOpMode(o) == iAsBx);
     lua_assert(getCMode(o) == OpArgN);
     lua_assert(a <= MAXARG_A && bc <= MAXARG_Bx);
@@ -262,15 +241,13 @@ int luaK_codeABx(FuncState *fs, OpCode o, int a, unsigned int bc)
 }
 
 
-static int codeextraarg(FuncState *fs, int a)
-{
+static int codeextraarg(FuncState *fs, int a) {
     lua_assert(a <= MAXARG_Ax);
     return luaK_code(fs, CREATE_Ax(OP_EXTRAARG, a));
 }
 
 
-int luaK_codek(FuncState *fs, int reg, int k)
-{
+int luaK_codek(FuncState *fs, int reg, int k) {
     if (k <= MAXARG_Bx)
         return luaK_codeABx(fs, OP_LOADK, reg, k);
     else {
@@ -281,8 +258,7 @@ int luaK_codek(FuncState *fs, int reg, int k)
 }
 
 
-void luaK_checkstack(FuncState *fs, int n)
-{
+void luaK_checkstack(FuncState *fs, int n) {
     int newstack = fs->freereg + n;
     if (newstack > fs->f->maxstacksize) {
         if (newstack >= MAXSTACK)
@@ -292,15 +268,13 @@ void luaK_checkstack(FuncState *fs, int n)
 }
 
 
-void luaK_reserveregs(FuncState *fs, int n)
-{
+void luaK_reserveregs(FuncState *fs, int n) {
     luaK_checkstack(fs, n);
     fs->freereg += n;
 }
 
 
-static void freereg(FuncState *fs, int reg)
-{
+static void freereg(FuncState *fs, int reg) {
     if (!ISK(reg) && reg >= fs->nactvar) {
         fs->freereg--;
         lua_assert(reg == fs->freereg);
@@ -308,15 +282,13 @@ static void freereg(FuncState *fs, int reg)
 }
 
 
-static void freeexp(FuncState *fs, expdesc *e)
-{
+static void freeexp(FuncState *fs, expdesc *e) {
     if (e->k == VNONRELOC)
         freereg(fs, e->u.info);
 }
 
 
-static int addk(FuncState *fs, TValue *key, TValue *v)
-{
+static int addk(FuncState *fs, TValue *key, TValue *v) {
     lua_State *L = fs->ls->L;
     TValue *idx = luaH_set(L, fs->h, key);
     Proto *f = fs->f;
@@ -344,16 +316,14 @@ static int addk(FuncState *fs, TValue *key, TValue *v)
 }
 
 
-int luaK_stringK(FuncState *fs, TString *s)
-{
+int luaK_stringK(FuncState *fs, TString *s) {
     TValue o;
     setsvalue(fs->ls->L, &o, s);
     return addk(fs, &o, &o);
 }
 
 
-int luaK_numberK(FuncState *fs, lua_Number r)
-{
+int luaK_numberK(FuncState *fs, lua_Number r) {
     int n;
     lua_State *L = fs->ls->L;
     TValue o;
@@ -369,16 +339,14 @@ int luaK_numberK(FuncState *fs, lua_Number r)
 }
 
 
-static int boolK(FuncState *fs, int b)
-{
+static int boolK(FuncState *fs, int b) {
     TValue o;
     setbvalue(&o, b);
     return addk(fs, &o, &o);
 }
 
 
-static int nilK(FuncState *fs)
-{
+static int nilK(FuncState *fs) {
     TValue k, v;
     setnilvalue(&v);
     /* cannot use nil as key; instead use table itself to represent nil */
@@ -387,8 +355,7 @@ static int nilK(FuncState *fs)
 }
 
 
-void luaK_setreturns(FuncState *fs, expdesc *e, int nresults)
-{
+void luaK_setreturns(FuncState *fs, expdesc *e, int nresults) {
     if (e->k == VCALL) {  /* expression is an open function call? */
         SETARG_C(getcode(fs, e), nresults + 1);
     } else if (e->k == VVARARG) {
@@ -399,8 +366,7 @@ void luaK_setreturns(FuncState *fs, expdesc *e, int nresults)
 }
 
 
-void luaK_setoneret(FuncState *fs, expdesc *e)
-{
+void luaK_setoneret(FuncState *fs, expdesc *e) {
     if (e->k == VCALL) {  /* expression is an open function call? */
         e->k = VNONRELOC;
         e->u.info = GETARG_A(getcode(fs, e));
@@ -411,8 +377,7 @@ void luaK_setoneret(FuncState *fs, expdesc *e)
 }
 
 
-void luaK_dischargevars(FuncState *fs, expdesc *e)
-{
+void luaK_dischargevars(FuncState *fs, expdesc *e) {
     switch (e->k) {
         case VLOCAL: {
             e->k = VNONRELOC;
@@ -445,15 +410,13 @@ void luaK_dischargevars(FuncState *fs, expdesc *e)
 }
 
 
-static int code_label(FuncState *fs, int A, int b, int jump)
-{
+static int code_label(FuncState *fs, int A, int b, int jump) {
     luaK_getlabel(fs);  /* those instructions may be jump targets */
     return luaK_codeABC(fs, OP_LOADBOOL, A, b, jump);
 }
 
 
-static void discharge2reg(FuncState *fs, expdesc *e, int reg)
-{
+static void discharge2reg(FuncState *fs, expdesc *e, int reg) {
     luaK_dischargevars(fs, e);
     switch (e->k) {
         case VNIL: {
@@ -493,8 +456,7 @@ static void discharge2reg(FuncState *fs, expdesc *e, int reg)
 }
 
 
-static void discharge2anyreg(FuncState *fs, expdesc *e)
-{
+static void discharge2anyreg(FuncState *fs, expdesc *e) {
     if (e->k != VNONRELOC) {
         luaK_reserveregs(fs, 1);
         discharge2reg(fs, e, fs->freereg - 1);
@@ -502,8 +464,7 @@ static void discharge2anyreg(FuncState *fs, expdesc *e)
 }
 
 
-static void exp2reg(FuncState *fs, expdesc *e, int reg)
-{
+static void exp2reg(FuncState *fs, expdesc *e, int reg) {
     discharge2reg(fs, e, reg);
     if (e->k == VJMP)
         luaK_concat(fs, &e->t, e->u.info);  /* put this jump in `t' list */
@@ -527,8 +488,7 @@ static void exp2reg(FuncState *fs, expdesc *e, int reg)
 }
 
 
-void luaK_exp2nextreg(FuncState *fs, expdesc *e)
-{
+void luaK_exp2nextreg(FuncState *fs, expdesc *e) {
     luaK_dischargevars(fs, e);
     freeexp(fs, e);
     luaK_reserveregs(fs, 1);
@@ -536,8 +496,7 @@ void luaK_exp2nextreg(FuncState *fs, expdesc *e)
 }
 
 
-int luaK_exp2anyreg(FuncState *fs, expdesc *e)
-{
+int luaK_exp2anyreg(FuncState *fs, expdesc *e) {
     luaK_dischargevars(fs, e);
     if (e->k == VNONRELOC) {
         if (!hasjumps(e)) return e->u.info;  /* exp is already in a register */
@@ -551,15 +510,13 @@ int luaK_exp2anyreg(FuncState *fs, expdesc *e)
 }
 
 
-void luaK_exp2anyregup(FuncState *fs, expdesc *e)
-{
+void luaK_exp2anyregup(FuncState *fs, expdesc *e) {
     if (e->k != VUPVAL || hasjumps(e))
         luaK_exp2anyreg(fs, e);
 }
 
 
-void luaK_exp2val(FuncState *fs, expdesc *e)
-{
+void luaK_exp2val(FuncState *fs, expdesc *e) {
     if (hasjumps(e))
         luaK_exp2anyreg(fs, e);
     else
@@ -567,8 +524,7 @@ void luaK_exp2val(FuncState *fs, expdesc *e)
 }
 
 
-int luaK_exp2RK(FuncState *fs, expdesc *e)
-{
+int luaK_exp2RK(FuncState *fs, expdesc *e) {
     luaK_exp2val(fs, e);
     switch (e->k) {
         case VTRUE:
@@ -598,8 +554,7 @@ int luaK_exp2RK(FuncState *fs, expdesc *e)
 }
 
 
-void luaK_storevar(FuncState *fs, expdesc *var, expdesc *ex)
-{
+void luaK_storevar(FuncState *fs, expdesc *var, expdesc *ex) {
     switch (var->k) {
         case VLOCAL: {
             freeexp(fs, ex);
@@ -626,8 +581,7 @@ void luaK_storevar(FuncState *fs, expdesc *var, expdesc *ex)
 }
 
 
-void luaK_self(FuncState *fs, expdesc *e, expdesc *key)
-{
+void luaK_self(FuncState *fs, expdesc *e, expdesc *key) {
     int ereg;
     luaK_exp2anyreg(fs, e);
     ereg = e->u.info;  /* register where 'e' was placed */
@@ -640,8 +594,7 @@ void luaK_self(FuncState *fs, expdesc *e, expdesc *key)
 }
 
 
-static void invertjump(FuncState *fs, expdesc *e)
-{
+static void invertjump(FuncState *fs, expdesc *e) {
     Instruction *pc = getjumpcontrol(fs, e->u.info);
     lua_assert(testTMode(GET_OPCODE(*pc)) && GET_OPCODE(*pc) != OP_TESTSET &&
                GET_OPCODE(*pc) != OP_TEST);
@@ -649,8 +602,7 @@ static void invertjump(FuncState *fs, expdesc *e)
 }
 
 
-static int jumponcond(FuncState *fs, expdesc *e, int cond)
-{
+static int jumponcond(FuncState *fs, expdesc *e, int cond) {
     if (e->k == VRELOCABLE) {
         Instruction ie = getcode(fs, e);
         if (GET_OPCODE(ie) == OP_NOT) {
@@ -665,8 +617,7 @@ static int jumponcond(FuncState *fs, expdesc *e, int cond)
 }
 
 
-void luaK_goiftrue(FuncState *fs, expdesc *e)
-{
+void luaK_goiftrue(FuncState *fs, expdesc *e) {
     int pc;  /* pc of last jump */
     luaK_dischargevars(fs, e);
     switch (e->k) {
@@ -692,8 +643,7 @@ void luaK_goiftrue(FuncState *fs, expdesc *e)
 }
 
 
-void luaK_goiffalse(FuncState *fs, expdesc *e)
-{
+void luaK_goiffalse(FuncState *fs, expdesc *e) {
     int pc;  /* pc of last jump */
     luaK_dischargevars(fs, e);
     switch (e->k) {
@@ -717,8 +667,7 @@ void luaK_goiffalse(FuncState *fs, expdesc *e)
 }
 
 
-static void codenot(FuncState *fs, expdesc *e)
-{
+static void codenot(FuncState *fs, expdesc *e) {
     luaK_dischargevars(fs, e);
     switch (e->k) {
         case VNIL:
@@ -756,8 +705,7 @@ static void codenot(FuncState *fs, expdesc *e)
 }
 
 
-void luaK_indexed(FuncState *fs, expdesc *t, expdesc *k)
-{
+void luaK_indexed(FuncState *fs, expdesc *t, expdesc *k) {
     lua_assert(!hasjumps(t));
     t->u.ind.t = t->u.info;
     t->u.ind.idx = luaK_exp2RK(fs, k);
@@ -767,8 +715,7 @@ void luaK_indexed(FuncState *fs, expdesc *t, expdesc *k)
 }
 
 
-static int constfolding(OpCode op, expdesc *e1, expdesc *e2)
-{
+static int constfolding(OpCode op, expdesc *e1, expdesc *e2) {
     lua_Number r;
     if (!isnumeral(e1) || !isnumeral(e2)) return 0;
     if ((op == OP_DIV || op == OP_MOD) && e2->u.nval == 0)
@@ -780,8 +727,7 @@ static int constfolding(OpCode op, expdesc *e1, expdesc *e2)
 
 
 static void codearith(FuncState *fs, OpCode op,
-                      expdesc *e1, expdesc *e2, int line)
-{
+                      expdesc *e1, expdesc *e2, int line) {
     if (constfolding(op, e1, e2))
         return;
     else {
@@ -802,8 +748,7 @@ static void codearith(FuncState *fs, OpCode op,
 
 
 static void codecomp(FuncState *fs, OpCode op, int cond, expdesc *e1,
-                     expdesc *e2)
-{
+                     expdesc *e2) {
     int o1 = luaK_exp2RK(fs, e1);
     int o2 = luaK_exp2RK(fs, e2);
     freeexp(fs, e2);
@@ -820,8 +765,7 @@ static void codecomp(FuncState *fs, OpCode op, int cond, expdesc *e1,
 }
 
 
-void luaK_prefix(FuncState *fs, UnOpr op, expdesc *e, int line)
-{
+void luaK_prefix(FuncState *fs, UnOpr op, expdesc *e, int line) {
     expdesc e2;
     e2.t = e2.f = NO_JUMP;
     e2.k = VKNUM;
@@ -850,8 +794,7 @@ void luaK_prefix(FuncState *fs, UnOpr op, expdesc *e, int line)
 }
 
 
-void luaK_infix(FuncState *fs, BinOpr op, expdesc *v)
-{
+void luaK_infix(FuncState *fs, BinOpr op, expdesc *v) {
     switch (op) {
         case OPR_AND: {
             luaK_goiftrue(fs, v);
@@ -883,8 +826,7 @@ void luaK_infix(FuncState *fs, BinOpr op, expdesc *v)
 
 
 void luaK_posfix(FuncState *fs, BinOpr op,
-                 expdesc *e1, expdesc *e2, int line)
-{
+                 expdesc *e1, expdesc *e2, int line) {
     switch (op) {
         case OPR_AND: {
             lua_assert(e1->t == NO_JUMP);  /* list must be closed */
@@ -941,14 +883,12 @@ void luaK_posfix(FuncState *fs, BinOpr op,
 }
 
 
-void luaK_fixline(FuncState *fs, int line)
-{
+void luaK_fixline(FuncState *fs, int line) {
     fs->f->lineinfo[fs->pc - 1] = line;
 }
 
 
-void luaK_setlist(FuncState *fs, int base, int nelems, int tostore)
-{
+void luaK_setlist(FuncState *fs, int base, int nelems, int tostore) {
     int c = (nelems - 1) / LFIELDS_PER_FLUSH + 1;
     int b = (tostore == LUA_MULTRET) ? 0 : tostore;
     lua_assert(tostore != 0);
diff --git a/liblua/lcorolib.c b/liblua/lcorolib.c
index 2f7f5fc92..ed065bb2d 100644
--- a/liblua/lcorolib.c
+++ b/liblua/lcorolib.c
@@ -17,8 +17,7 @@
 #include "lualib.h"
 
 
-static int auxresume(lua_State *L, lua_State *co, int narg)
-{
+static int auxresume(lua_State *L, lua_State *co, int narg) {
     int status;
     if (!lua_checkstack(co, narg)) {
         lua_pushliteral(L, "too many arguments to resume");
@@ -46,8 +45,7 @@ static int auxresume(lua_State *L, lua_State *co, int narg)
 }
 
 
-static int luaB_coresume(lua_State *L)
-{
+static int luaB_coresume(lua_State *L) {
     lua_State *co = lua_tothread(L, 1);
     int r;
     luaL_argcheck(L, co, 1, "coroutine expected");
@@ -64,8 +62,7 @@ static int luaB_coresume(lua_State *L)
 }
 
 
-static int luaB_auxwrap(lua_State *L)
-{
+static int luaB_auxwrap(lua_State *L) {
     lua_State *co = lua_tothread(L, lua_upvalueindex(1));
     int r = auxresume(L, co, lua_gettop(L));
     if (r < 0) {
@@ -80,8 +77,7 @@ static int luaB_auxwrap(lua_State *L)
 }
 
 
-static int luaB_cocreate(lua_State *L)
-{
+static int luaB_cocreate(lua_State *L) {
     lua_State *NL;
     luaL_checktype(L, 1, LUA_TFUNCTION);
     NL = lua_newthread(L);
@@ -91,22 +87,19 @@ static int luaB_cocreate(lua_State *L)
 }
 
 
-static int luaB_cowrap(lua_State *L)
-{
+static int luaB_cowrap(lua_State *L) {
     luaB_cocreate(L);
     lua_pushcclosure(L, luaB_auxwrap, 1);
     return 1;
 }
 
 
-static int luaB_yield(lua_State *L)
-{
+static int luaB_yield(lua_State *L) {
     return lua_yield(L, lua_gettop(L));
 }
 
 
-static int luaB_costatus(lua_State *L)
-{
+static int luaB_costatus(lua_State *L) {
     lua_State *co = lua_tothread(L, 1);
     luaL_argcheck(L, co, 1, "coroutine expected");
     if (L == co) lua_pushliteral(L, "running");
@@ -134,8 +127,7 @@ static int luaB_costatus(lua_State *L)
 }
 
 
-static int luaB_corunning(lua_State *L)
-{
+static int luaB_corunning(lua_State *L) {
     int ismain = lua_pushthread(L);
     lua_pushboolean(L, ismain);
     return 2;
@@ -154,8 +146,7 @@ static const luaL_Reg co_funcs[] = {
 
 
 
-LUAMOD_API int luaopen_coroutine(lua_State *L)
-{
+LUAMOD_API int luaopen_coroutine(lua_State *L) {
     luaL_newlib(L, co_funcs);
     return 1;
 }
diff --git a/liblua/ldblib.c b/liblua/ldblib.c
index f31815876..aed9708fe 100644
--- a/liblua/ldblib.c
+++ b/liblua/ldblib.c
@@ -22,15 +22,13 @@
 
 
 
-static int db_getregistry(lua_State *L)
-{
+static int db_getregistry(lua_State *L) {
     lua_pushvalue(L, LUA_REGISTRYINDEX);
     return 1;
 }
 
 
-static int db_getmetatable(lua_State *L)
-{
+static int db_getmetatable(lua_State *L) {
     luaL_checkany(L, 1);
     if (!lua_getmetatable(L, 1)) {
         lua_pushnil(L);  /* no metatable */
@@ -39,8 +37,7 @@ static int db_getmetatable(lua_State *L)
 }
 
 
-static int db_setmetatable(lua_State *L)
-{
+static int db_setmetatable(lua_State *L) {
     int t = lua_type(L, 2);
     luaL_argcheck(L, t == LUA_TNIL || t == LUA_TTABLE, 2,
                   "nil or table expected");
@@ -50,8 +47,7 @@ static int db_setmetatable(lua_State *L)
 }
 
 
-static int db_getuservalue(lua_State *L)
-{
+static int db_getuservalue(lua_State *L) {
     if (lua_type(L, 1) != LUA_TUSERDATA)
         lua_pushnil(L);
     else
@@ -60,8 +56,7 @@ static int db_getuservalue(lua_State *L)
 }
 
 
-static int db_setuservalue(lua_State *L)
-{
+static int db_setuservalue(lua_State *L) {
     if (lua_type(L, 1) == LUA_TLIGHTUSERDATA)
         luaL_argerror(L, 1, "full userdata expected, got light userdata");
     luaL_checktype(L, 1, LUA_TUSERDATA);
@@ -73,29 +68,25 @@ static int db_setuservalue(lua_State *L)
 }
 
 
-static void settabss(lua_State *L, const char *i, const char *v)
-{
+static void settabss(lua_State *L, const char *i, const char *v) {
     lua_pushstring(L, v);
     lua_setfield(L, -2, i);
 }
 
 
-static void settabsi(lua_State *L, const char *i, int v)
-{
+static void settabsi(lua_State *L, const char *i, int v) {
     lua_pushinteger(L, v);
     lua_setfield(L, -2, i);
 }
 
 
-static void settabsb(lua_State *L, const char *i, int v)
-{
+static void settabsb(lua_State *L, const char *i, int v) {
     lua_pushboolean(L, v);
     lua_setfield(L, -2, i);
 }
 
 
-static lua_State *getthread(lua_State *L, int *arg)
-{
+static lua_State *getthread(lua_State *L, int *arg) {
     if (lua_isthread(L, 1)) {
         *arg = 1;
         return lua_tothread(L, 1);
@@ -106,8 +97,7 @@ static lua_State *getthread(lua_State *L, int *arg)
 }
 
 
-static void treatstackoption(lua_State *L, lua_State *L1, const char *fname)
-{
+static void treatstackoption(lua_State *L, lua_State *L1, const char *fname) {
     if (L == L1) {
         lua_pushvalue(L, -2);
         lua_remove(L, -3);
@@ -117,8 +107,7 @@ static void treatstackoption(lua_State *L, lua_State *L1, const char *fname)
 }
 
 
-static int db_getinfo(lua_State *L)
-{
+static int db_getinfo(lua_State *L) {
     lua_Debug ar;
     int arg;
     lua_State *L1 = getthread(L, &arg);
@@ -166,8 +155,7 @@ static int db_getinfo(lua_State *L)
 }
 
 
-static int db_getlocal(lua_State *L)
-{
+static int db_getlocal(lua_State *L) {
     int arg;
     lua_State *L1 = getthread(L, &arg);
     lua_Debug ar;
@@ -194,8 +182,7 @@ static int db_getlocal(lua_State *L)
 }
 
 
-static int db_setlocal(lua_State *L)
-{
+static int db_setlocal(lua_State *L) {
     int arg;
     lua_State *L1 = getthread(L, &arg);
     lua_Debug ar;
@@ -209,8 +196,7 @@ static int db_setlocal(lua_State *L)
 }
 
 
-static int auxupvalue(lua_State *L, int get)
-{
+static int auxupvalue(lua_State *L, int get) {
     const char *name;
     int n = luaL_checkint(L, 2);
     luaL_checktype(L, 1, LUA_TFUNCTION);
@@ -222,21 +208,18 @@ static int auxupvalue(lua_State *L, int get)
 }
 
 
-static int db_getupvalue(lua_State *L)
-{
+static int db_getupvalue(lua_State *L) {
     return auxupvalue(L, 1);
 }
 
 
-static int db_setupvalue(lua_State *L)
-{
+static int db_setupvalue(lua_State *L) {
     luaL_checkany(L, 3);
     return auxupvalue(L, 0);
 }
 
 
-static int checkupval(lua_State *L, int argf, int argnup)
-{
+static int checkupval(lua_State *L, int argf, int argnup) {
     lua_Debug ar;
     int nup = luaL_checkint(L, argnup);
     luaL_checktype(L, argf, LUA_TFUNCTION);
@@ -247,16 +230,14 @@ static int checkupval(lua_State *L, int argf, int argnup)
 }
 
 
-static int db_upvalueid(lua_State *L)
-{
+static int db_upvalueid(lua_State *L) {
     int n = checkupval(L, 1, 2);
     lua_pushlightuserdata(L, lua_upvalueid(L, 1, n));
     return 1;
 }
 
 
-static int db_upvaluejoin(lua_State *L)
-{
+static int db_upvaluejoin(lua_State *L) {
     int n1 = checkupval(L, 1, 2);
     int n2 = checkupval(L, 3, 4);
     luaL_argcheck(L, !lua_iscfunction(L, 1), 1, "Lua function expected");
@@ -269,8 +250,7 @@ static int db_upvaluejoin(lua_State *L)
 #define gethooktable(L) luaL_getsubtable(L, LUA_REGISTRYINDEX, HOOKKEY)
 
 
-static void hookf(lua_State *L, lua_Debug *ar)
-{
+static void hookf(lua_State *L, lua_Debug *ar) {
     static const char *const hooknames[] =
     {"call", "return", "line", "count", "tail call"};
     gethooktable(L);
@@ -287,8 +267,7 @@ static void hookf(lua_State *L, lua_Debug *ar)
 }
 
 
-static int makemask(const char *smask, int count)
-{
+static int makemask(const char *smask, int count) {
     int mask = 0;
     if (strchr(smask, 'c')) mask |= LUA_MASKCALL;
     if (strchr(smask, 'r')) mask |= LUA_MASKRET;
@@ -298,8 +277,7 @@ static int makemask(const char *smask, int count)
 }
 
 
-static char *unmakemask(int mask, char *smask)
-{
+static char *unmakemask(int mask, char *smask) {
     int i = 0;
     if (mask & LUA_MASKCALL) smask[i++] = 'c';
     if (mask & LUA_MASKRET) smask[i++] = 'r';
@@ -309,8 +287,7 @@ static char *unmakemask(int mask, char *smask)
 }
 
 
-static int db_sethook(lua_State *L)
-{
+static int db_sethook(lua_State *L) {
     int arg, mask, count;
     lua_Hook func;
     lua_State *L1 = getthread(L, &arg);
@@ -341,8 +318,7 @@ static int db_sethook(lua_State *L)
 }
 
 
-static int db_gethook(lua_State *L)
-{
+static int db_gethook(lua_State *L) {
     int arg;
     lua_State *L1 = getthread(L, &arg);
     char buff[5];
@@ -363,24 +339,22 @@ static int db_gethook(lua_State *L)
 }
 
 
-static int db_debug(lua_State *L)
-{
+static int db_debug(lua_State *L) {
     for (;;) {
         char buffer[250];
         luai_writestringerror("%s", "lua_debug> ");
         if (fgets(buffer, sizeof(buffer), stdin) == 0 ||
-            strcmp(buffer, "cont\n") == 0)
+                strcmp(buffer, "cont\n") == 0)
             return 0;
         if (luaL_loadbuffer(L, buffer, strlen(buffer), "=(debug command)") ||
-            lua_pcall(L, 0, 0, 0))
+                lua_pcall(L, 0, 0, 0))
             luai_writestringerror("%s\n", lua_tostring(L, -1));
         lua_settop(L, 0);  /* remove eventual returns */
     }
 }
 
 
-static int db_traceback(lua_State *L)
-{
+static int db_traceback(lua_State *L) {
     int arg;
     lua_State *L1 = getthread(L, &arg);
     const char *msg = lua_tostring(L, arg + 1);
@@ -415,8 +389,7 @@ static const luaL_Reg dblib[] = {
 };
 
 
-LUAMOD_API int luaopen_debug(lua_State *L)
-{
+LUAMOD_API int luaopen_debug(lua_State *L) {
     luaL_newlib(L, dblib);
     return 1;
 }
diff --git a/liblua/ldebug.c b/liblua/ldebug.c
index 2d221450c..a993ad65f 100644
--- a/liblua/ldebug.c
+++ b/liblua/ldebug.c
@@ -36,15 +36,13 @@
 static const char *getfuncname(lua_State *L, CallInfo *ci, const char **name);
 
 
-static int currentpc(CallInfo *ci)
-{
+static int currentpc(CallInfo *ci) {
     lua_assert(isLua(ci));
     return pcRel(ci->u.l.savedpc, ci_func(ci)->p);
 }
 
 
-static int currentline(CallInfo *ci)
-{
+static int currentline(CallInfo *ci) {
     return getfuncline(ci_func(ci)->p, currentpc(ci));
 }
 
@@ -52,8 +50,7 @@ static int currentline(CallInfo *ci)
 /*
 ** this function can be called asynchronous (e.g. during a signal)
 */
-LUA_API int lua_sethook(lua_State *L, lua_Hook func, int mask, int count)
-{
+LUA_API int lua_sethook(lua_State *L, lua_Hook func, int mask, int count) {
     if (func == NULL || mask == 0) {  /* turn off hooks? */
         mask = 0;
         func = NULL;
@@ -68,26 +65,22 @@ LUA_API int lua_sethook(lua_State *L, lua_Hook func, int mask, int count)
 }
 
 
-LUA_API lua_Hook lua_gethook(lua_State *L)
-{
+LUA_API lua_Hook lua_gethook(lua_State *L) {
     return L->hook;
 }
 
 
-LUA_API int lua_gethookmask(lua_State *L)
-{
+LUA_API int lua_gethookmask(lua_State *L) {
     return L->hookmask;
 }
 
 
-LUA_API int lua_gethookcount(lua_State *L)
-{
+LUA_API int lua_gethookcount(lua_State *L) {
     return L->basehookcount;
 }
 
 
-LUA_API int lua_getstack(lua_State *L, int level, lua_Debug *ar)
-{
+LUA_API int lua_getstack(lua_State *L, int level, lua_Debug *ar) {
     int status;
     CallInfo *ci;
     if (level < 0) return 0;  /* invalid (negative) level */
@@ -103,16 +96,14 @@ LUA_API int lua_getstack(lua_State *L, int level, lua_Debug *ar)
 }
 
 
-static const char *upvalname(Proto *p, int uv)
-{
+static const char *upvalname(Proto *p, int uv) {
     TString *s = check_exp(uv < p->sizeupvalues, p->upvalues[uv].name);
     if (s == NULL) return "?";
     else return getstr(s);
 }
 
 
-static const char *findvararg(CallInfo *ci, int n, StkId *pos)
-{
+static const char *findvararg(CallInfo *ci, int n, StkId *pos) {
     int nparams = clLvalue(ci->func)->p->numparams;
     if (n >= ci->u.l.base - ci->func - nparams)
         return NULL;  /* no such vararg */
@@ -124,8 +115,7 @@ static const char *findvararg(CallInfo *ci, int n, StkId *pos)
 
 
 static const char *findlocal(lua_State *L, CallInfo *ci, int n,
-                             StkId *pos)
-{
+                             StkId *pos) {
     const char *name = NULL;
     StkId base;
     if (isLua(ci)) {
@@ -149,8 +139,7 @@ static const char *findlocal(lua_State *L, CallInfo *ci, int n,
 }
 
 
-LUA_API const char *lua_getlocal(lua_State *L, const lua_Debug *ar, int n)
-{
+LUA_API const char *lua_getlocal(lua_State *L, const lua_Debug *ar, int n) {
     const char *name;
     lua_lock(L);
     if (ar == NULL) {  /* information about non-active function? */
@@ -171,8 +160,7 @@ LUA_API const char *lua_getlocal(lua_State *L, const lua_Debug *ar, int n)
 }
 
 
-LUA_API const char *lua_setlocal(lua_State *L, const lua_Debug *ar, int n)
-{
+LUA_API const char *lua_setlocal(lua_State *L, const lua_Debug *ar, int n) {
     StkId pos = 0;  /* to avoid warnings */
     const char *name = findlocal(L, ar->i_ci, n, &pos);
     lua_lock(L);
@@ -184,8 +172,7 @@ LUA_API const char *lua_setlocal(lua_State *L, const lua_Debug *ar, int n)
 }
 
 
-static void funcinfo(lua_Debug *ar, Closure *cl)
-{
+static void funcinfo(lua_Debug *ar, Closure *cl) {
     if (noLuaClosure(cl)) {
         ar->source = "=[C]";
         ar->linedefined = -1;
@@ -202,8 +189,7 @@ static void funcinfo(lua_Debug *ar, Closure *cl)
 }
 
 
-static void collectvalidlines(lua_State *L, Closure *f)
-{
+static void collectvalidlines(lua_State *L, Closure *f) {
     if (noLuaClosure(f)) {
         setnilvalue(L->top);
         api_incr_top(L);
@@ -222,8 +208,7 @@ static void collectvalidlines(lua_State *L, Closure *f)
 
 
 static int auxgetinfo(lua_State *L, const char *what, lua_Debug *ar,
-                      Closure *f, CallInfo *ci)
-{
+                      Closure *f, CallInfo *ci) {
     int status = 1;
     for (; *what; what++) {
         switch (*what) {
@@ -273,8 +258,7 @@ static int auxgetinfo(lua_State *L, const char *what, lua_Debug *ar,
 }
 
 
-LUA_API int lua_getinfo(lua_State *L, const char *what, lua_Debug *ar)
-{
+LUA_API int lua_getinfo(lua_State *L, const char *what, lua_Debug *ar) {
     int status;
     Closure *cl;
     CallInfo *ci;
@@ -317,8 +301,7 @@ static const char *getobjname(Proto *p, int lastpc, int reg,
 /*
 ** find a "name" for the RK value 'c'
 */
-static void kname(Proto *p, int pc, int c, const char **name)
-{
+static void kname(Proto *p, int pc, int c, const char **name) {
     if (ISK(c)) {  /* is 'c' a constant? */
         TValue *kvalue = &p->k[INDEXK(c)];
         if (ttisstring(kvalue)) {  /* literal constant? */
@@ -340,8 +323,7 @@ static void kname(Proto *p, int pc, int c, const char **name)
 /*
 ** try to find last instruction before 'lastpc' that modified register 'reg'
 */
-static int findsetreg(Proto *p, int lastpc, int reg)
-{
+static int findsetreg(Proto *p, int lastpc, int reg) {
     int pc;
     int setreg = -1;  /* keep last instruction that changed 'reg' */
     for (pc = 0; pc < lastpc; pc++) {
@@ -387,8 +369,7 @@ static int findsetreg(Proto *p, int lastpc, int reg)
 
 
 static const char *getobjname(Proto *p, int lastpc, int reg,
-                              const char **name)
-{
+                              const char **name) {
     int pc;
     *name = luaF_getlocalname(p, reg + 1, lastpc);
     if (*name)  /* is a local? */
@@ -442,8 +423,7 @@ static const char *getobjname(Proto *p, int lastpc, int reg,
 }
 
 
-static const char *getfuncname(lua_State *L, CallInfo *ci, const char **name)
-{
+static const char *getfuncname(lua_State *L, CallInfo *ci, const char **name) {
     TMS tm;
     Proto *p = ci_func(ci)->p;  /* calling function */
     int pc = currentpc(ci);  /* calling instruction index */
@@ -517,8 +497,7 @@ static const char *getfuncname(lua_State *L, CallInfo *ci, const char **name)
 ** only ANSI way to check whether a pointer points to an array
 ** (used only for error messages, so efficiency is not a big concern)
 */
-static int isinstack(CallInfo *ci, const TValue *o)
-{
+static int isinstack(CallInfo *ci, const TValue *o) {
     StkId p;
     for (p = ci->u.l.base; p < ci->top; p++)
         if (o == p) return 1;
@@ -527,8 +506,7 @@ static int isinstack(CallInfo *ci, const TValue *o)
 
 
 static const char *getupvalname(CallInfo *ci, const TValue *o,
-                                const char **name)
-{
+                                const char **name) {
     LClosure *c = ci_func(ci);
     int i;
     for (i = 0; i < c->nupvalues; i++) {
@@ -541,8 +519,7 @@ static const char *getupvalname(CallInfo *ci, const TValue *o,
 }
 
 
-l_noret luaG_typeerror(lua_State *L, const TValue *o, const char *op)
-{
+l_noret luaG_typeerror(lua_State *L, const TValue *o, const char *op) {
     CallInfo *ci = L->ci;
     const char *name = NULL;
     const char *t = objtypename(o);
@@ -561,16 +538,14 @@ l_noret luaG_typeerror(lua_State *L, const TValue *o, const char *op)
 }
 
 
-l_noret luaG_concaterror(lua_State *L, StkId p1, StkId p2)
-{
+l_noret luaG_concaterror(lua_State *L, StkId p1, StkId p2) {
     if (ttisstring(p1) || ttisnumber(p1)) p1 = p2;
     lua_assert(!ttisstring(p1) && !ttisnumber(p2));
     luaG_typeerror(L, p1, "concatenate");
 }
 
 
-l_noret luaG_aritherror(lua_State *L, const TValue *p1, const TValue *p2)
-{
+l_noret luaG_aritherror(lua_State *L, const TValue *p1, const TValue *p2) {
     TValue temp;
     if (luaV_tonumber(p1, &temp) == NULL)
         p2 = p1;  /* first operand is wrong */
@@ -578,8 +553,7 @@ l_noret luaG_aritherror(lua_State *L, const TValue *p1, const TValue *p2)
 }
 
 
-l_noret luaG_ordererror(lua_State *L, const TValue *p1, const TValue *p2)
-{
+l_noret luaG_ordererror(lua_State *L, const TValue *p1, const TValue *p2) {
     const char *t1 = objtypename(p1);
     const char *t2 = objtypename(p2);
     if (t1 == t2)
@@ -589,8 +563,7 @@ l_noret luaG_ordererror(lua_State *L, const TValue *p1, const TValue *p2)
 }
 
 
-static void addinfo(lua_State *L, const char *msg)
-{
+static void addinfo(lua_State *L, const char *msg) {
     CallInfo *ci = L->ci;
     if (isLua(ci)) {  /* is Lua code? */
         char buff[LUA_IDSIZE];  /* add file:line information */
@@ -607,8 +580,7 @@ static void addinfo(lua_State *L, const char *msg)
 }
 
 
-l_noret luaG_errormsg(lua_State *L)
-{
+l_noret luaG_errormsg(lua_State *L) {
     if (L->errfunc != 0) {  /* is there an error handling function? */
         StkId errfunc = restorestack(L, L->errfunc);
         if (!ttisfunction(errfunc)) luaD_throw(L, LUA_ERRERR);
@@ -621,8 +593,7 @@ l_noret luaG_errormsg(lua_State *L)
 }
 
 
-l_noret luaG_runerror(lua_State *L, const char *fmt, ...)
-{
+l_noret luaG_runerror(lua_State *L, const char *fmt, ...) {
     va_list argp;
     va_start(argp, fmt);
     addinfo(L, luaO_pushvfstring(L, fmt, argp));
diff --git a/liblua/ldo.c b/liblua/ldo.c
index f7d962450..081f42bd2 100644
--- a/liblua/ldo.c
+++ b/liblua/ldo.c
@@ -81,8 +81,7 @@ struct lua_longjmp {
 };
 
 
-static void seterrorobj(lua_State *L, int errcode, StkId oldtop)
-{
+static void seterrorobj(lua_State *L, int errcode, StkId oldtop) {
     switch (errcode) {
         case LUA_ERRMEM: {  /* memory error? */
             setsvalue2s(L, oldtop, G(L)->memerrmsg); /* reuse preregistered msg. */
@@ -101,8 +100,7 @@ static void seterrorobj(lua_State *L, int errcode, StkId oldtop)
 }
 
 
-l_noret luaD_throw(lua_State *L, int errcode)
-{
+l_noret luaD_throw(lua_State *L, int errcode) {
     if (L->errorJmp) {  /* thread has an error handler? */
         L->errorJmp->status = errcode;  /* set status */
         LUAI_THROW(L, L->errorJmp);  /* jump to it */
@@ -122,8 +120,7 @@ l_noret luaD_throw(lua_State *L, int errcode)
 }
 
 
-int luaD_rawrunprotected(lua_State *L, Pfunc f, void *ud)
-{
+int luaD_rawrunprotected(lua_State *L, Pfunc f, void *ud) {
     unsigned short oldnCcalls = L->nCcalls;
     struct lua_longjmp lj;
     lj.status = LUA_OK;
@@ -140,8 +137,7 @@ int luaD_rawrunprotected(lua_State *L, Pfunc f, void *ud)
 /* }====================================================== */
 
 
-static void correctstack(lua_State *L, TValue *oldstack)
-{
+static void correctstack(lua_State *L, TValue *oldstack) {
     CallInfo *ci;
     GCObject *up;
     L->top = (L->top - oldstack) + L->stack;
@@ -160,8 +156,7 @@ static void correctstack(lua_State *L, TValue *oldstack)
 #define ERRORSTACKSIZE (LUAI_MAXSTACK + 200)
 
 
-void luaD_reallocstack(lua_State *L, int newsize)
-{
+void luaD_reallocstack(lua_State *L, int newsize) {
     TValue *oldstack = L->stack;
     int lim = L->stacksize;
     lua_assert(newsize <= LUAI_MAXSTACK || newsize == ERRORSTACKSIZE);
@@ -175,8 +170,7 @@ void luaD_reallocstack(lua_State *L, int newsize)
 }
 
 
-void luaD_growstack(lua_State *L, int n)
-{
+void luaD_growstack(lua_State *L, int n) {
     int size = L->stacksize;
     if (size > LUAI_MAXSTACK)  /* error after extra size? */
         luaD_throw(L, LUA_ERRERR);
@@ -194,8 +188,7 @@ void luaD_growstack(lua_State *L, int n)
 }
 
 
-static int stackinuse(lua_State *L)
-{
+static int stackinuse(lua_State *L) {
     CallInfo *ci;
     StkId lim = L->top;
     for (ci = L->ci; ci != NULL; ci = ci->previous) {
@@ -206,21 +199,19 @@ static int stackinuse(lua_State *L)
 }
 
 
-void luaD_shrinkstack(lua_State *L)
-{
+void luaD_shrinkstack(lua_State *L) {
     int inuse = stackinuse(L);
     int goodsize = inuse + (inuse / 8) + 2 * EXTRA_STACK;
     if (goodsize > LUAI_MAXSTACK) goodsize = LUAI_MAXSTACK;
     if (inuse > LUAI_MAXSTACK ||  /* handling stack overflow? */
-        goodsize >= L->stacksize)  /* would grow instead of shrink? */
+            goodsize >= L->stacksize)  /* would grow instead of shrink? */
         condmovestack(L);  /* don't change stack (change only for debugging) */
     else
         luaD_reallocstack(L, goodsize);  /* shrink it */
 }
 
 
-void luaD_hook(lua_State *L, int event, int line)
-{
+void luaD_hook(lua_State *L, int event, int line) {
     lua_Hook hook = L->hook;
     if (hook && L->allowhook) {
         CallInfo *ci = L->ci;
@@ -247,12 +238,11 @@ void luaD_hook(lua_State *L, int event, int line)
 }
 
 
-static void callhook(lua_State *L, CallInfo *ci)
-{
+static void callhook(lua_State *L, CallInfo *ci) {
     int hook = LUA_HOOKCALL;
     ci->u.l.savedpc++;  /* hooks assume 'pc' is already incremented */
     if (isLua(ci->previous) &&
-        GET_OPCODE(*(ci->previous->u.l.savedpc - 1)) == OP_TAILCALL) {
+            GET_OPCODE(*(ci->previous->u.l.savedpc - 1)) == OP_TAILCALL) {
         ci->callstatus |= CIST_TAIL;
         hook = LUA_HOOKTAILCALL;
     }
@@ -261,8 +251,7 @@ static void callhook(lua_State *L, CallInfo *ci)
 }
 
 
-static StkId adjust_varargs(lua_State *L, Proto *p, int actual)
-{
+static StkId adjust_varargs(lua_State *L, Proto *p, int actual) {
     int i;
     int nfixargs = p->numparams;
     StkId base, fixed;
@@ -278,8 +267,7 @@ static StkId adjust_varargs(lua_State *L, Proto *p, int actual)
 }
 
 
-static StkId tryfuncTM(lua_State *L, StkId func)
-{
+static StkId tryfuncTM(lua_State *L, StkId func) {
     const TValue *tm = luaT_gettmbyobj(L, func, TM_CALL);
     StkId p;
     ptrdiff_t funcr = savestack(L, func);
@@ -301,8 +289,7 @@ static StkId tryfuncTM(lua_State *L, StkId func)
 /*
 ** returns true if function has been executed (C function)
 */
-int luaD_precall(lua_State *L, StkId func, int nresults)
-{
+int luaD_precall(lua_State *L, StkId func, int nresults) {
     lua_CFunction f;
     CallInfo *ci;
     int n;  /* number of arguments (Lua) or returns (C) */
@@ -362,8 +349,7 @@ Cfunc:
 }
 
 
-int luaD_poscall(lua_State *L, StkId firstResult)
-{
+int luaD_poscall(lua_State *L, StkId firstResult) {
     StkId res;
     int wanted, i;
     CallInfo *ci = L->ci;
@@ -394,8 +380,7 @@ int luaD_poscall(lua_State *L, StkId firstResult)
 ** When returns, all the results are on the stack, starting at the original
 ** function position.
 */
-void luaD_call(lua_State *L, StkId func, int nResults, int allowyield)
-{
+void luaD_call(lua_State *L, StkId func, int nResults, int allowyield) {
     if (++L->nCcalls >= LUAI_MAXCCALLS) {
         if (L->nCcalls == LUAI_MAXCCALLS)
             luaG_runerror(L, "C stack overflow");
@@ -410,8 +395,7 @@ void luaD_call(lua_State *L, StkId func, int nResults, int allowyield)
 }
 
 
-static void finishCcall(lua_State *L)
-{
+static void finishCcall(lua_State *L) {
     CallInfo *ci = L->ci;
     int n;
     lua_assert(ci->u.c.k != NULL);  /* must have a continuation */
@@ -436,8 +420,7 @@ static void finishCcall(lua_State *L)
 }
 
 
-static void unroll(lua_State *L, void *ud)
-{
+static void unroll(lua_State *L, void *ud) {
     UNUSED(ud);
     for (;;) {
         if (L->ci == &L->base_ci)  /* stack is empty? */
@@ -455,8 +438,7 @@ static void unroll(lua_State *L, void *ud)
 /*
 ** check whether thread has a suspended protected call
 */
-static CallInfo *findpcall(lua_State *L)
-{
+static CallInfo *findpcall(lua_State *L) {
     CallInfo *ci;
     for (ci = L->ci; ci != NULL; ci = ci->previous) {  /* search for a pcall */
         if (ci->callstatus & CIST_YPCALL)
@@ -466,8 +448,7 @@ static CallInfo *findpcall(lua_State *L)
 }
 
 
-static int recover(lua_State *L, int status)
-{
+static int recover(lua_State *L, int status) {
     StkId oldtop;
     CallInfo *ci = findpcall(L);
     if (ci == NULL) return 0;  /* no recovery point */
@@ -491,8 +472,7 @@ static int recover(lua_State *L, int status)
 ** coroutine itself. (Such errors should not be handled by any coroutine
 ** error handler and should not kill the coroutine.)
 */
-static l_noret resume_error(lua_State *L, const char *msg, StkId firstArg)
-{
+static l_noret resume_error(lua_State *L, const char *msg, StkId firstArg) {
     L->top = firstArg;  /* remove args from the stack */
     setsvalue2s(L, L->top, luaS_new(L, msg));  /* push error message */
     api_incr_top(L);
@@ -503,8 +483,7 @@ static l_noret resume_error(lua_State *L, const char *msg, StkId firstArg)
 /*
 ** do the work for 'lua_resume' in protected mode
 */
-static void resume(lua_State *L, void *ud)
-{
+static void resume(lua_State *L, void *ud) {
     int nCcalls = L->nCcalls;
     StkId firstArg = cast(StkId, ud);
     CallInfo *ci = L->ci;
@@ -542,8 +521,7 @@ static void resume(lua_State *L, void *ud)
 }
 
 
-LUA_API int lua_resume(lua_State *L, lua_State *from, int nargs)
-{
+LUA_API int lua_resume(lua_State *L, lua_State *from, int nargs) {
     int status;
     lua_lock(L);
     luai_userstateresume(L, nargs);
@@ -574,8 +552,7 @@ LUA_API int lua_resume(lua_State *L, lua_State *from, int nargs)
 }
 
 
-LUA_API int lua_yieldk(lua_State *L, int nresults, int ctx, lua_CFunction k)
-{
+LUA_API int lua_yieldk(lua_State *L, int nresults, int ctx, lua_CFunction k) {
     CallInfo *ci = L->ci;
     luai_userstateyield(L, nresults);
     lua_lock(L);
@@ -603,8 +580,7 @@ LUA_API int lua_yieldk(lua_State *L, int nresults, int ctx, lua_CFunction k)
 
 
 int luaD_pcall(lua_State *L, Pfunc func, void *u,
-               ptrdiff_t old_top, ptrdiff_t ef)
-{
+               ptrdiff_t old_top, ptrdiff_t ef) {
     int status;
     CallInfo *old_ci = L->ci;
     lu_byte old_allowhooks = L->allowhook;
@@ -639,8 +615,7 @@ struct SParser {  /* data to `f_parser' */
 };
 
 
-static void checkmode(lua_State *L, const char *mode, const char *x)
-{
+static void checkmode(lua_State *L, const char *mode, const char *x) {
     if (mode && strchr(mode, x[0]) == NULL) {
         luaO_pushfstring(L,
                          "attempt to load a %s chunk (mode is " LUA_QS ")", x, mode);
@@ -649,8 +624,7 @@ static void checkmode(lua_State *L, const char *mode, const char *x)
 }
 
 
-static void f_parser(lua_State *L, void *ud)
-{
+static void f_parser(lua_State *L, void *ud) {
     int i;
     Closure *cl;
     struct SParser *p = cast(struct SParser *, ud);
@@ -672,8 +646,7 @@ static void f_parser(lua_State *L, void *ud)
 
 
 int luaD_protectedparser(lua_State *L, ZIO *z, const char *name,
-                         const char *mode)
-{
+                         const char *mode) {
     struct SParser p;
     int status;
     L->nny++;  /* cannot yield during parsing */
diff --git a/liblua/ldump.c b/liblua/ldump.c
index df3810a9d..a18d4873b 100644
--- a/liblua/ldump.c
+++ b/liblua/ldump.c
@@ -26,8 +26,7 @@ typedef struct {
 #define DumpMem(b,n,size,D) DumpBlock(b,(n)*(size),D)
 #define DumpVar(x,D)        DumpMem(&x,1,sizeof(x),D)
 
-static void DumpBlock(const void *b, size_t size, DumpState *D)
-{
+static void DumpBlock(const void *b, size_t size, DumpState *D) {
     if (D->status == 0) {
         lua_unlock(D->L);
         D->status = (*D->writer)(D->L, b, size, D->data);
@@ -35,30 +34,25 @@ static void DumpBlock(const void *b, size_t size, DumpState *D)
     }
 }
 
-static void DumpChar(int y, DumpState *D)
-{
+static void DumpChar(int y, DumpState *D) {
     char x = (char)y;
     DumpVar(x, D);
 }
 
-static void DumpInt(int x, DumpState *D)
-{
+static void DumpInt(int x, DumpState *D) {
     DumpVar(x, D);
 }
 
-static void DumpNumber(lua_Number x, DumpState *D)
-{
+static void DumpNumber(lua_Number x, DumpState *D) {
     DumpVar(x, D);
 }
 
-static void DumpVector(const void *b, int n, size_t size, DumpState *D)
-{
+static void DumpVector(const void *b, int n, size_t size, DumpState *D) {
     DumpInt(n, D);
     DumpMem(b, n, size, D);
 }
 
-static void DumpString(const TString *s, DumpState *D)
-{
+static void DumpString(const TString *s, DumpState *D) {
     if (s == NULL) {
         size_t size = 0;
         DumpVar(size, D);
@@ -73,8 +67,7 @@ static void DumpString(const TString *s, DumpState *D)
 
 static void DumpFunction(const Proto *f, DumpState *D);
 
-static void DumpConstants(const Proto *f, DumpState *D)
-{
+static void DumpConstants(const Proto *f, DumpState *D) {
     int i, n = f->sizek;
     DumpInt(n, D);
     for (i = 0; i < n; i++) {
@@ -101,8 +94,7 @@ static void DumpConstants(const Proto *f, DumpState *D)
     for (i = 0; i < n; i++) DumpFunction(f->p[i], D);
 }
 
-static void DumpUpvalues(const Proto *f, DumpState *D)
-{
+static void DumpUpvalues(const Proto *f, DumpState *D) {
     int i, n = f->sizeupvalues;
     DumpInt(n, D);
     for (i = 0; i < n; i++) {
@@ -111,8 +103,7 @@ static void DumpUpvalues(const Proto *f, DumpState *D)
     }
 }
 
-static void DumpDebug(const Proto *f, DumpState *D)
-{
+static void DumpDebug(const Proto *f, DumpState *D) {
     int i, n;
     DumpString((D->strip) ? NULL : f->source, D);
     n = (D->strip) ? 0 : f->sizelineinfo;
@@ -129,8 +120,7 @@ static void DumpDebug(const Proto *f, DumpState *D)
     for (i = 0; i < n; i++) DumpString(f->upvalues[i].name, D);
 }
 
-static void DumpFunction(const Proto *f, DumpState *D)
-{
+static void DumpFunction(const Proto *f, DumpState *D) {
     DumpInt(f->linedefined, D);
     DumpInt(f->lastlinedefined, D);
     DumpChar(f->numparams, D);
@@ -142,8 +132,7 @@ static void DumpFunction(const Proto *f, DumpState *D)
     DumpDebug(f, D);
 }
 
-static void DumpHeader(DumpState *D)
-{
+static void DumpHeader(DumpState *D) {
     lu_byte h[LUAC_HEADERSIZE];
     luaU_header(h);
     DumpBlock(h, LUAC_HEADERSIZE, D);
@@ -152,8 +141,7 @@ static void DumpHeader(DumpState *D)
 /*
 ** dump Lua function as precompiled chunk
 */
-int luaU_dump(lua_State *L, const Proto *f, lua_Writer w, void *data, int strip)
-{
+int luaU_dump(lua_State *L, const Proto *f, lua_Writer w, void *data, int strip) {
     DumpState D;
     D.L = L;
     D.writer = w;
diff --git a/liblua/lfunc.c b/liblua/lfunc.c
index 167b54056..f4a05560a 100644
--- a/liblua/lfunc.c
+++ b/liblua/lfunc.c
@@ -20,16 +20,14 @@
 
 
 
-Closure *luaF_newCclosure(lua_State *L, int n)
-{
+Closure *luaF_newCclosure(lua_State *L, int n) {
     Closure *c = &luaC_newobj(L, LUA_TCCL, sizeCclosure(n), NULL, 0)->cl;
     c->c.nupvalues = cast_byte(n);
     return c;
 }
 
 
-Closure *luaF_newLclosure(lua_State *L, int n)
-{
+Closure *luaF_newLclosure(lua_State *L, int n) {
     Closure *c = &luaC_newobj(L, LUA_TLCL, sizeLclosure(n), NULL, 0)->cl;
     c->l.p = NULL;
     c->l.nupvalues = cast_byte(n);
@@ -38,8 +36,7 @@ Closure *luaF_newLclosure(lua_State *L, int n)
 }
 
 
-UpVal *luaF_newupval(lua_State *L)
-{
+UpVal *luaF_newupval(lua_State *L) {
     UpVal *uv = &luaC_newobj(L, LUA_TUPVAL, sizeof(UpVal), NULL, 0)->uv;
     uv->v = &uv->u.value;
     setnilvalue(uv->v);
@@ -47,8 +44,7 @@ UpVal *luaF_newupval(lua_State *L)
 }
 
 
-UpVal *luaF_findupval(lua_State *L, StkId level)
-{
+UpVal *luaF_findupval(lua_State *L, StkId level) {
     global_State *g = G(L);
     GCObject **pp = &L->openupval;
     UpVal *p;
@@ -76,24 +72,21 @@ UpVal *luaF_findupval(lua_State *L, StkId level)
 }
 
 
-static void unlinkupval(UpVal *uv)
-{
+static void unlinkupval(UpVal *uv) {
     lua_assert(uv->u.l.next->u.l.prev == uv && uv->u.l.prev->u.l.next == uv);
     uv->u.l.next->u.l.prev = uv->u.l.prev;  /* remove from `uvhead' list */
     uv->u.l.prev->u.l.next = uv->u.l.next;
 }
 
 
-void luaF_freeupval(lua_State *L, UpVal *uv)
-{
+void luaF_freeupval(lua_State *L, UpVal *uv) {
     if (uv->v != &uv->u.value)  /* is it open? */
         unlinkupval(uv);  /* remove from open list */
     luaM_free(L, uv);  /* free upvalue */
 }
 
 
-void luaF_close(lua_State *L, StkId level)
-{
+void luaF_close(lua_State *L, StkId level) {
     UpVal *uv;
     global_State *g = G(L);
     while (L->openupval != NULL && (uv = gco2uv(L->openupval))->v >= level) {
@@ -114,8 +107,7 @@ void luaF_close(lua_State *L, StkId level)
 }
 
 
-Proto *luaF_newproto(lua_State *L)
-{
+Proto *luaF_newproto(lua_State *L) {
     Proto *f = &luaC_newobj(L, LUA_TPROTO, sizeof(Proto), NULL, 0)->p;
     f->k = NULL;
     f->sizek = 0;
@@ -140,8 +132,7 @@ Proto *luaF_newproto(lua_State *L)
 }
 
 
-void luaF_freeproto(lua_State *L, Proto *f)
-{
+void luaF_freeproto(lua_State *L, Proto *f) {
     luaM_freearray(L, f->code, f->sizecode);
     luaM_freearray(L, f->p, f->sizep);
     luaM_freearray(L, f->k, f->sizek);
@@ -156,8 +147,7 @@ void luaF_freeproto(lua_State *L, Proto *f)
 ** Look for n-th local variable at line `line' in function `func'.
 ** Returns NULL if not found.
 */
-const char *luaF_getlocalname(const Proto *f, int local_number, int pc)
-{
+const char *luaF_getlocalname(const Proto *f, int local_number, int pc) {
     int i;
     for (i = 0; i < f->sizelocvars && f->locvars[i].startpc <= pc; i++) {
         if (pc < f->locvars[i].endpc) {  /* is variable active? */
diff --git a/liblua/lgc.c b/liblua/lgc.c
index 12a4fddd5..6b407cc86 100644
--- a/liblua/lgc.c
+++ b/liblua/lgc.c
@@ -104,8 +104,7 @@ static void reallymarkobject(global_State *g, GCObject *o);
 ** if key is not marked, mark its entry as dead (therefore removing it
 ** from the table)
 */
-static void removeentry(Node *n)
-{
+static void removeentry(Node *n) {
     lua_assert(ttisnil(gval(n)));
     if (valiswhite(gkey(n)))
         setdeadvalue(gkey(n));  /* unused and unmarked key; remove it */
@@ -119,8 +118,7 @@ static void removeentry(Node *n)
 ** other objects: if really collected, cannot keep them; for objects
 ** being finalized, keep them in keys, but not in values
 */
-static int iscleared(global_State *g, const TValue *o)
-{
+static int iscleared(global_State *g, const TValue *o) {
     if (!iscollectable(o)) return 0;
     else if (ttisstring(o)) {
         markobject(g, rawtsvalue(o));  /* strings are `values', so are never weak */
@@ -133,8 +131,7 @@ static int iscleared(global_State *g, const TValue *o)
 ** barrier that moves collector forward, that is, mark the white object
 ** being pointed by a black object.
 */
-void luaC_barrier_(lua_State *L, GCObject *o, GCObject *v)
-{
+void luaC_barrier_(lua_State *L, GCObject *o, GCObject *v) {
     global_State *g = G(L);
     lua_assert(isblack(o) && iswhite(v) && !isdead(g, v) && !isdead(g, o));
     lua_assert(g->gcstate != GCSpause);
@@ -154,8 +151,7 @@ void luaC_barrier_(lua_State *L, GCObject *o, GCObject *v)
 ** only works for tables; access to 'gclist' is not uniform across
 ** different types.)
 */
-void luaC_barrierback_(lua_State *L, GCObject *o)
-{
+void luaC_barrierback_(lua_State *L, GCObject *o) {
     global_State *g = G(L);
     lua_assert(isblack(o) && !isdead(g, o) && gch(o)->tt == LUA_TTABLE);
     black2gray(o);  /* make object gray (again) */
@@ -172,8 +168,7 @@ void luaC_barrierback_(lua_State *L, GCObject *o)
 ** it again. Otherwise, use a backward barrier, to avoid marking all
 ** possible instances.
 */
-LUAI_FUNC void luaC_barrierproto_(lua_State *L, Proto *p, Closure *c)
-{
+LUAI_FUNC void luaC_barrierproto_(lua_State *L, Proto *p, Closure *c) {
     global_State *g = G(L);
     lua_assert(isblack(obj2gco(p)));
     if (p->cache == NULL) {  /* first time? */
@@ -190,8 +185,7 @@ LUAI_FUNC void luaC_barrierproto_(lua_State *L, Proto *p, Closure *c)
 ** check color (and invariants) for an upvalue that was closed,
 ** i.e., moved into the 'allgc' list
 */
-void luaC_checkupvalcolor(global_State *g, UpVal *uv)
-{
+void luaC_checkupvalcolor(global_State *g, UpVal *uv) {
     GCObject *o = obj2gco(uv);
     lua_assert(!isblack(o));  /* open upvalues are never black */
     if (isgray(o)) {
@@ -213,8 +207,7 @@ void luaC_checkupvalcolor(global_State *g, UpVal *uv)
 ** object itself (used only by states).
 */
 GCObject *luaC_newobj(lua_State *L, int tt, size_t sz, GCObject **list,
-                      int offset)
-{
+                      int offset) {
     global_State *g = G(L);
     char *raw = cast(char *, luaM_newobject(L, novariant(tt), sz));
     GCObject *o = obj2gco(raw + offset);
@@ -244,8 +237,7 @@ GCObject *luaC_newobj(lua_State *L, int tt, size_t sz, GCObject **list,
 ** to appropriate list to be visited (and turned black) later. (Open
 ** upvalues are already linked in 'headuv' list.)
 */
-static void reallymarkobject(global_State *g, GCObject *o)
-{
+static void reallymarkobject(global_State *g, GCObject *o) {
     lu_mem size;
     white2gray(o);
     switch (gch(o)->tt) {
@@ -305,8 +297,7 @@ static void reallymarkobject(global_State *g, GCObject *o)
 /*
 ** mark metamethods for basic types
 */
-static void markmt(global_State *g)
-{
+static void markmt(global_State *g) {
     int i;
     for (i = 0; i < LUA_NUMTAGS; i++)
         markobject(g, g->mt[i]);
@@ -316,8 +307,7 @@ static void markmt(global_State *g)
 /*
 ** mark all objects in list of being-finalized
 */
-static void markbeingfnz(global_State *g)
-{
+static void markbeingfnz(global_State *g) {
     GCObject *o;
     for (o = g->tobefnz; o != NULL; o = gch(o)->next) {
         makewhite(g, o);
@@ -330,8 +320,7 @@ static void markbeingfnz(global_State *g)
 ** mark all values stored in marked open upvalues. (See comment in
 ** 'lstate.h'.)
 */
-static void remarkupvals(global_State *g)
-{
+static void remarkupvals(global_State *g) {
     UpVal *uv;
     for (uv = g->uvhead.u.l.next; uv != &g->uvhead; uv = uv->u.l.next) {
         if (isgray(obj2gco(uv)))
@@ -344,8 +333,7 @@ static void remarkupvals(global_State *g)
 ** mark root set and reset all gray lists, to start a new
 ** incremental (or full) collection
 */
-static void restartcollection(global_State *g)
-{
+static void restartcollection(global_State *g) {
     g->gray = g->grayagain = NULL;
     g->weak = g->allweak = g->ephemeron = NULL;
     markobject(g, g->mainthread);
@@ -363,8 +351,7 @@ static void restartcollection(global_State *g)
 ** =======================================================
 */
 
-static void traverseweakvalue(global_State *g, Table *h)
-{
+static void traverseweakvalue(global_State *g, Table *h) {
     Node *n, *limit = gnodelast(h);
     /* if there is array part, assume it may have white values (do not
        traverse it just to check) */
@@ -387,8 +374,7 @@ static void traverseweakvalue(global_State *g, Table *h)
 }
 
 
-static int traverseephemeron(global_State *g, Table *h)
-{
+static int traverseephemeron(global_State *g, Table *h) {
     int marked = 0;  /* true if an object is marked in this traversal */
     int hasclears = 0;  /* true if table has white keys */
     int prop = 0;  /* true if table has entry "white-key -> white-value" */
@@ -425,8 +411,7 @@ static int traverseephemeron(global_State *g, Table *h)
 }
 
 
-static void traversestrongtable(global_State *g, Table *h)
-{
+static void traversestrongtable(global_State *g, Table *h) {
     Node *n, *limit = gnodelast(h);
     int i;
     for (i = 0; i < h->sizearray; i++)  /* traverse array part */
@@ -444,15 +429,14 @@ static void traversestrongtable(global_State *g, Table *h)
 }
 
 
-static lu_mem traversetable(global_State *g, Table *h)
-{
+static lu_mem traversetable(global_State *g, Table *h) {
     const char *weakkey, *weakvalue;
     const TValue *mode = gfasttm(g, h->metatable, TM_MODE);
     markobject(g, h->metatable);
     if (mode && ttisstring(mode) &&  /* is there a weak mode? */
-        ((weakkey = strchr(svalue(mode), 'k')),
-         (weakvalue = strchr(svalue(mode), 'v')),
-         (weakkey || weakvalue))) {  /* is really weak? */
+            ((weakkey = strchr(svalue(mode), 'k')),
+             (weakvalue = strchr(svalue(mode), 'v')),
+             (weakkey || weakvalue))) {  /* is really weak? */
         black2gray(obj2gco(h));  /* keep table gray */
         if (!weakkey)  /* strong keys? */
             traverseweakvalue(g, h);
@@ -467,8 +451,7 @@ static lu_mem traversetable(global_State *g, Table *h)
 }
 
 
-static int traverseproto(global_State *g, Proto *f)
-{
+static int traverseproto(global_State *g, Proto *f) {
     int i;
     if (f->cache && iswhite(obj2gco(f->cache)))
         f->cache = NULL;  /* allow cache to be collected */
@@ -490,16 +473,14 @@ static int traverseproto(global_State *g, Proto *f)
 }
 
 
-static lu_mem traverseCclosure(global_State *g, CClosure *cl)
-{
+static lu_mem traverseCclosure(global_State *g, CClosure *cl) {
     int i;
     for (i = 0; i < cl->nupvalues; i++)  /* mark its upvalues */
         markvalue(g, &cl->upvalue[i]);
     return sizeCclosure(cl->nupvalues);
 }
 
-static lu_mem traverseLclosure(global_State *g, LClosure *cl)
-{
+static lu_mem traverseLclosure(global_State *g, LClosure *cl) {
     int i;
     markobject(g, cl->p);  /* mark its prototype */
     for (i = 0; i < cl->nupvalues; i++)  /* mark its upvalues */
@@ -508,8 +489,7 @@ static lu_mem traverseLclosure(global_State *g, LClosure *cl)
 }
 
 
-static lu_mem traversestack(global_State *g, lua_State *th)
-{
+static lu_mem traversestack(global_State *g, lua_State *th) {
     StkId o = th->stack;
     if (o == NULL)
         return 1;  /* stack not completely built yet */
@@ -528,8 +508,7 @@ static lu_mem traversestack(global_State *g, lua_State *th)
 ** traverse one gray object, turning it to black (except for threads,
 ** which are always gray).
 */
-static void propagatemark(global_State *g)
-{
+static void propagatemark(global_State *g) {
     lu_mem size;
     GCObject *o = g->gray;
     lua_assert(isgray(o));
@@ -576,14 +555,12 @@ static void propagatemark(global_State *g)
 }
 
 
-static void propagateall(global_State *g)
-{
+static void propagateall(global_State *g) {
     while (g->gray) propagatemark(g);
 }
 
 
-static void propagatelist(global_State *g, GCObject *l)
-{
+static void propagatelist(global_State *g, GCObject *l) {
     lua_assert(g->gray == NULL);  /* no grays left */
     g->gray = l;
     propagateall(g);  /* traverse all elements from 'l' */
@@ -594,8 +571,7 @@ static void propagatelist(global_State *g, GCObject *l)
 ** lists when traversed, traverse the original lists to avoid traversing
 ** twice the same table (which is not wrong, but inefficient)
 */
-static void retraversegrays(global_State *g)
-{
+static void retraversegrays(global_State *g) {
     GCObject *weak = g->weak;  /* save original lists */
     GCObject *grayagain = g->grayagain;
     GCObject *ephemeron = g->ephemeron;
@@ -607,8 +583,7 @@ static void retraversegrays(global_State *g)
 }
 
 
-static void convergeephemerons(global_State *g)
-{
+static void convergeephemerons(global_State *g) {
     int changed;
     do {
         GCObject *w;
@@ -639,8 +614,7 @@ static void convergeephemerons(global_State *g)
 ** clear entries with unmarked keys from all weaktables in list 'l' up
 ** to element 'f'
 */
-static void clearkeys(global_State *g, GCObject *l, GCObject *f)
-{
+static void clearkeys(global_State *g, GCObject *l, GCObject *f) {
     for (; l != f; l = gco2t(l)->gclist) {
         Table *h = gco2t(l);
         Node *n, *limit = gnodelast(h);
@@ -658,8 +632,7 @@ static void clearkeys(global_State *g, GCObject *l, GCObject *f)
 ** clear entries with unmarked values from all weaktables in list 'l' up
 ** to element 'f'
 */
-static void clearvalues(global_State *g, GCObject *l, GCObject *f)
-{
+static void clearvalues(global_State *g, GCObject *l, GCObject *f) {
     for (; l != f; l = gco2t(l)->gclist) {
         Table *h = gco2t(l);
         Node *n, *limit = gnodelast(h);
@@ -679,8 +652,7 @@ static void clearvalues(global_State *g, GCObject *l, GCObject *f)
 }
 
 
-static void freeobj(lua_State *L, GCObject *o)
-{
+static void freeobj(lua_State *L, GCObject *o) {
     switch (gch(o)->tt) {
         case LUA_TPROTO:
             luaF_freeproto(L, gco2p(o));
@@ -726,8 +698,7 @@ static GCObject **sweeplist(lua_State *L, GCObject **p, lu_mem count);
 ** sweep the (open) upvalues of a thread and resize its stack and
 ** list of call-info structures.
 */
-static void sweepthread(lua_State *L, lua_State *L1)
-{
+static void sweepthread(lua_State *L, lua_State *L1) {
     if (L1->stack == NULL) return;  /* stack not completely built yet */
     sweepwholelist(L, &L1->openupval);  /* sweep open upvalues */
     luaE_freeCI(L1);  /* free extra CallInfo slots */
@@ -748,8 +719,7 @@ static void sweepthread(lua_State *L, lua_State *L1)
 ** one will be old too.
 ** When object is a thread, sweep its list of open upvalues too.
 */
-static GCObject **sweeplist(lua_State *L, GCObject **p, lu_mem count)
-{
+static GCObject **sweeplist(lua_State *L, GCObject **p, lu_mem count) {
     global_State *g = G(L);
     int ow = otherwhite(g);
     int toclear, toset;  /* bits to clear and to set in all live objects */
@@ -786,8 +756,7 @@ static GCObject **sweeplist(lua_State *L, GCObject **p, lu_mem count)
 /*
 ** sweep a list until a live object (or end of list)
 */
-static GCObject **sweeptolive(lua_State *L, GCObject **p, int *n)
-{
+static GCObject **sweeptolive(lua_State *L, GCObject **p, int *n) {
     GCObject **old = p;
     int i = 0;
     do {
@@ -807,8 +776,7 @@ static GCObject **sweeptolive(lua_State *L, GCObject **p, int *n)
 ** =======================================================
 */
 
-static void checkSizes(lua_State *L)
-{
+static void checkSizes(lua_State *L) {
     global_State *g = G(L);
     if (g->gckind != KGC_EMERGENCY) {  /* do not change sizes in emergency */
         int hs = g->strt.size / 2;  /* half the size of the string table */
@@ -819,8 +787,7 @@ static void checkSizes(lua_State *L)
 }
 
 
-static GCObject *udata2finalize(global_State *g)
-{
+static GCObject *udata2finalize(global_State *g) {
     GCObject *o = g->tobefnz;  /* get first element */
     lua_assert(isfinalized(o));
     g->tobefnz = gch(o)->next;  /* remove it from 'tobefnz' list */
@@ -834,15 +801,13 @@ static GCObject *udata2finalize(global_State *g)
 }
 
 
-static void dothecall(lua_State *L, void *ud)
-{
+static void dothecall(lua_State *L, void *ud) {
     UNUSED(ud);
     luaD_call(L, L->top - 2, 0, 0);
 }
 
 
-static void GCTM(lua_State *L, int propagateerrors)
-{
+static void GCTM(lua_State *L, int propagateerrors) {
     global_State *g = G(L);
     const TValue *tm;
     TValue v;
@@ -878,8 +843,7 @@ static void GCTM(lua_State *L, int propagateerrors)
 ** move all unreachable objects (or 'all' objects) that need
 ** finalization from list 'finobj' to list 'tobefnz' (to be finalized)
 */
-static void separatetobefnz(lua_State *L, int all)
-{
+static void separatetobefnz(lua_State *L, int all) {
     global_State *g = G(L);
     GCObject **p = &g->finobj;
     GCObject *curr;
@@ -907,12 +871,11 @@ static void separatetobefnz(lua_State *L, int all)
 ** if object 'o' has a finalizer, remove it from 'allgc' list (must
 ** search the list to find it) and link it in 'finobj' list.
 */
-void luaC_checkfinalizer(lua_State *L, GCObject *o, Table *mt)
-{
+void luaC_checkfinalizer(lua_State *L, GCObject *o, Table *mt) {
     global_State *g = G(L);
     if (testbit(gch(o)->marked, SEPARATED) || /* obj. is already separated... */
-        isfinalized(o) ||                           /* ... or is finalized... */
-        gfasttm(g, mt, TM_GC) == NULL)                /* or has no finalizer? */
+            isfinalized(o) ||                           /* ... or is finalized... */
+            gfasttm(g, mt, TM_GC) == NULL)                /* or has no finalizer? */
         return;  /* nothing to be done */
     else {  /* move 'o' to 'finobj' list */
         GCObject **p;
@@ -948,8 +911,7 @@ void luaC_checkfinalizer(lua_State *L, GCObject *o, Table *mt)
 ** set a reasonable "time" to wait before starting a new GC cycle;
 ** cycle will start when memory use hits threshold
 */
-static void setpause(global_State *g, l_mem estimate)
-{
+static void setpause(global_State *g, l_mem estimate) {
     l_mem debt, threshold;
     estimate = estimate / PAUSEADJ;  /* adjust 'estimate' */
     threshold = (g->gcpause < MAX_LMEM / estimate)  /* overflow? */
@@ -972,8 +934,7 @@ static void setpause(global_State *g, l_mem estimate)
 ** of the real sweep.
 ** Returns how many objects it swept.
 */
-static int entersweep(lua_State *L)
-{
+static int entersweep(lua_State *L) {
     global_State *g = G(L);
     int n = 0;
     g->gcstate = GCSsweepstring;
@@ -989,8 +950,7 @@ static int entersweep(lua_State *L)
 /*
 ** change GC mode
 */
-void luaC_changemode(lua_State *L, int mode)
-{
+void luaC_changemode(lua_State *L, int mode) {
     global_State *g = G(L);
     if (mode == g->gckind) return;  /* nothing to change */
     if (mode == KGC_GEN) {  /* change to generational mode */
@@ -1011,8 +971,7 @@ void luaC_changemode(lua_State *L, int mode)
 /*
 ** call all pending finalizers
 */
-static void callallpendingfinalizers(lua_State *L, int propagateerrors)
-{
+static void callallpendingfinalizers(lua_State *L, int propagateerrors) {
     global_State *g = G(L);
     while (g->tobefnz) {
         resetoldbit(g->tobefnz);
@@ -1021,8 +980,7 @@ static void callallpendingfinalizers(lua_State *L, int propagateerrors)
 }
 
 
-void luaC_freeallobjects(lua_State *L)
-{
+void luaC_freeallobjects(lua_State *L) {
     global_State *g = G(L);
     int i;
     separatetobefnz(L, 1);  /* separate all objects with finalizers */
@@ -1038,8 +996,7 @@ void luaC_freeallobjects(lua_State *L)
 }
 
 
-static l_mem atomic(lua_State *L)
-{
+static l_mem atomic(lua_State *L) {
     global_State *g = G(L);
     l_mem work = -cast(l_mem, g->GCmemtrav);  /* start counting work */
     GCObject *origweak, *origall;
@@ -1081,8 +1038,7 @@ static l_mem atomic(lua_State *L)
 }
 
 
-static lu_mem singlestep(lua_State *L)
-{
+static lu_mem singlestep(lua_State *L) {
     global_State *g = G(L);
     switch (g->gcstate) {
         case GCSpause: {
@@ -1151,16 +1107,14 @@ static lu_mem singlestep(lua_State *L)
 ** advances the garbage collector until it reaches a state allowed
 ** by 'statemask'
 */
-void luaC_runtilstate(lua_State *L, int statesmask)
-{
+void luaC_runtilstate(lua_State *L, int statesmask) {
     global_State *g = G(L);
     while (!testbit(statesmask, g->gcstate))
         singlestep(L);
 }
 
 
-static void generationalcollection(lua_State *L)
-{
+static void generationalcollection(lua_State *L) {
     global_State *g = G(L);
     lua_assert(g->gcstate == GCSpropagate);
     if (g->GCestimate == 0) {  /* signal for another major collection? */
@@ -1181,8 +1135,7 @@ static void generationalcollection(lua_State *L)
 }
 
 
-static void incstep(lua_State *L)
-{
+static void incstep(lua_State *L) {
     global_State *g = G(L);
     l_mem debt = g->GCdebt;
     int stepmul = g->gcstepmul;
@@ -1206,8 +1159,7 @@ static void incstep(lua_State *L)
 /*
 ** performs a basic GC step
 */
-void luaC_forcestep(lua_State *L)
-{
+void luaC_forcestep(lua_State *L) {
     global_State *g = G(L);
     int i;
     if (isgenerational(g)) generationalcollection(L);
@@ -1221,8 +1173,7 @@ void luaC_forcestep(lua_State *L)
 /*
 ** performs a basic GC step only if collector is running
 */
-void luaC_step(lua_State *L)
-{
+void luaC_step(lua_State *L) {
     global_State *g = G(L);
     if (g->gcrunning) luaC_forcestep(L);
     else luaE_setdebt(g, -GCSTEPSIZE);  /* avoid being called too often */
@@ -1234,8 +1185,7 @@ void luaC_step(lua_State *L)
 ** performs a full GC cycle; if "isemergency", does not call
 ** finalizers (which could change stack positions)
 */
-void luaC_fullgc(lua_State *L, int isemergency)
-{
+void luaC_fullgc(lua_State *L, int isemergency) {
     global_State *g = G(L);
     int origkind = g->gckind;
     lua_assert(origkind != KGC_EMERGENCY);
diff --git a/liblua/linit.c b/liblua/linit.c
index be9c4a34e..ed3cc0512 100644
--- a/liblua/linit.c
+++ b/liblua/linit.c
@@ -49,8 +49,7 @@ static const luaL_Reg preloadedlibs[] = {
 };
 
 
-LUALIB_API void luaL_openlibs(lua_State *L)
-{
+LUALIB_API void luaL_openlibs(lua_State *L) {
     const luaL_Reg *lib;
     /* call open functions from 'loadedlibs' and set results to global table */
     for (lib = loadedlibs; lib->func; lib++) {
diff --git a/liblua/liolib.c b/liblua/liolib.c
index 7cfe9750b..3d0c3bb2c 100644
--- a/liblua/liolib.c
+++ b/liblua/liolib.c
@@ -126,8 +126,7 @@ typedef luaL_Stream LStream;
 #define isclosed(p) ((p)->closef == NULL)
 
 
-static int io_type(lua_State *L)
-{
+static int io_type(lua_State *L) {
     LStream *p;
     luaL_checkany(L, 1);
     p = (LStream *)luaL_testudata(L, 1, LUA_FILEHANDLE);
@@ -141,8 +140,7 @@ static int io_type(lua_State *L)
 }
 
 
-static int f_tostring(lua_State *L)
-{
+static int f_tostring(lua_State *L) {
     LStream *p = tolstream(L);
     if (isclosed(p))
         lua_pushliteral(L, "file (closed)");
@@ -152,8 +150,7 @@ static int f_tostring(lua_State *L)
 }
 
 
-static FILE *tofile(lua_State *L)
-{
+static FILE *tofile(lua_State *L) {
     LStream *p = tolstream(L);
     if (isclosed(p))
         luaL_error(L, "attempt to use a closed file");
@@ -167,8 +164,7 @@ static FILE *tofile(lua_State *L)
 ** before opening the actual file; so, if there is a memory error, the
 ** file is not left opened.
 */
-static LStream *newprefile(lua_State *L)
-{
+static LStream *newprefile(lua_State *L) {
     LStream *p = (LStream *)lua_newuserdata(L, sizeof(LStream));
     p->closef = NULL;  /* mark file handle as 'closed' */
     luaL_setmetatable(L, LUA_FILEHANDLE);
@@ -176,8 +172,7 @@ static LStream *newprefile(lua_State *L)
 }
 
 
-static int aux_close(lua_State *L)
-{
+static int aux_close(lua_State *L) {
     LStream *p = tolstream(L);
     lua_CFunction cf = p->closef;
     p->closef = NULL;  /* mark stream as closed */
@@ -185,8 +180,7 @@ static int aux_close(lua_State *L)
 }
 
 
-static int io_close(lua_State *L)
-{
+static int io_close(lua_State *L) {
     if (lua_isnone(L, 1))  /* no argument? */
         lua_getfield(L, LUA_REGISTRYINDEX, IO_OUTPUT);  /* use standard output */
     tofile(L);  /* make sure argument is an open stream */
@@ -194,8 +188,7 @@ static int io_close(lua_State *L)
 }
 
 
-static int f_gc(lua_State *L)
-{
+static int f_gc(lua_State *L) {
     LStream *p = tolstream(L);
     if (!isclosed(p) && p->f != NULL)
         aux_close(L);  /* ignore closed and incompletely open files */
@@ -206,16 +199,14 @@ static int f_gc(lua_State *L)
 /*
 ** function to close regular files
 */
-static int io_fclose(lua_State *L)
-{
+static int io_fclose(lua_State *L) {
     LStream *p = tolstream(L);
     int res = fclose(p->f);
     return luaL_fileresult(L, (res == 0), NULL);
 }
 
 
-static LStream *newfile(lua_State *L)
-{
+static LStream *newfile(lua_State *L) {
     LStream *p = newprefile(L);
     p->f = NULL;
     p->closef = &io_fclose;
@@ -223,8 +214,7 @@ static LStream *newfile(lua_State *L)
 }
 
 
-static void opencheck(lua_State *L, const char *fname, const char *mode)
-{
+static void opencheck(lua_State *L, const char *fname, const char *mode) {
     LStream *p = newfile(L);
     p->f = fopen(fname, mode);
     if (p->f == NULL)
@@ -232,8 +222,7 @@ static void opencheck(lua_State *L, const char *fname, const char *mode)
 }
 
 
-static int io_open(lua_State *L)
-{
+static int io_open(lua_State *L) {
     const char *filename = luaL_checkstring(L, 1);
     const char *mode = luaL_optstring(L, 2, "r");
     LStream *p = newfile(L);
@@ -247,15 +236,13 @@ static int io_open(lua_State *L)
 /*
 ** function to close 'popen' files
 */
-static int io_pclose(lua_State *L)
-{
+static int io_pclose(lua_State *L) {
     LStream *p = tolstream(L);
     return luaL_execresult(L, lua_pclose(L, p->f));
 }
 
 
-static int io_popen(lua_State *L)
-{
+static int io_popen(lua_State *L) {
     const char *filename = luaL_checkstring(L, 1);
     const char *mode = luaL_optstring(L, 2, "r");
     LStream *p = newprefile(L);
@@ -265,16 +252,14 @@ static int io_popen(lua_State *L)
 }
 
 
-static int io_tmpfile(lua_State *L)
-{
+static int io_tmpfile(lua_State *L) {
     LStream *p = newfile(L);
     p->f = tmpfile();
     return (p->f == NULL) ? luaL_fileresult(L, 0, NULL) : 1;
 }
 
 
-static FILE *getiofile(lua_State *L, const char *findex)
-{
+static FILE *getiofile(lua_State *L, const char *findex) {
     LStream *p;
     lua_getfield(L, LUA_REGISTRYINDEX, findex);
     p = (LStream *)lua_touserdata(L, -1);
@@ -284,8 +269,7 @@ static FILE *getiofile(lua_State *L, const char *findex)
 }
 
 
-static int g_iofile(lua_State *L, const char *f, const char *mode)
-{
+static int g_iofile(lua_State *L, const char *f, const char *mode) {
     if (!lua_isnoneornil(L, 1)) {
         const char *filename = lua_tostring(L, 1);
         if (filename)
@@ -302,14 +286,12 @@ static int g_iofile(lua_State *L, const char *f, const char *mode)
 }
 
 
-static int io_input(lua_State *L)
-{
+static int io_input(lua_State *L) {
     return g_iofile(L, IO_INPUT, "r");
 }
 
 
-static int io_output(lua_State *L)
-{
+static int io_output(lua_State *L) {
     return g_iofile(L, IO_OUTPUT, "w");
 }
 
@@ -317,8 +299,7 @@ static int io_output(lua_State *L)
 static int io_readline(lua_State *L);
 
 
-static void aux_lines(lua_State *L, int toclose)
-{
+static void aux_lines(lua_State *L, int toclose) {
     int i;
     int n = lua_gettop(L) - 1;  /* number of arguments to read */
     /* ensure that arguments will fit here and into 'io_readline' stack */
@@ -331,16 +312,14 @@ static void aux_lines(lua_State *L, int toclose)
 }
 
 
-static int f_lines(lua_State *L)
-{
+static int f_lines(lua_State *L) {
     tofile(L);  /* check that it's a valid file handle */
     aux_lines(L, 0);
     return 1;
 }
 
 
-static int io_lines(lua_State *L)
-{
+static int io_lines(lua_State *L) {
     int toclose;
     if (lua_isnone(L, 1)) lua_pushnil(L);  /* at least one argument */
     if (lua_isnil(L, 1)) {  /* no file name? */
@@ -366,8 +345,7 @@ static int io_lines(lua_State *L)
 */
 
 
-static int read_number(lua_State *L, FILE *f)
-{
+static int read_number(lua_State *L, FILE *f) {
     lua_Number d;
     if (fscanf(f, LUA_NUMBER_SCAN, &d) == 1) {
         lua_pushnumber(L, d);
@@ -379,8 +357,7 @@ static int read_number(lua_State *L, FILE *f)
 }
 
 
-static int test_eof(lua_State *L, FILE *f)
-{
+static int test_eof(lua_State *L, FILE *f) {
     int c = getc(f);
     ungetc(c, f);
     lua_pushlstring(L, NULL, 0);
@@ -388,8 +365,7 @@ static int test_eof(lua_State *L, FILE *f)
 }
 
 
-static int read_line(lua_State *L, FILE *f, int chop)
-{
+static int read_line(lua_State *L, FILE *f, int chop) {
     luaL_Buffer b;
     luaL_buffinit(L, &b);
     for (;;) {
@@ -413,8 +389,7 @@ static int read_line(lua_State *L, FILE *f, int chop)
 
 #define MAX_SIZE_T (~(size_t)0)
 
-static void read_all(lua_State *L, FILE *f)
-{
+static void read_all(lua_State *L, FILE *f) {
     size_t rlen = LUAL_BUFFERSIZE;  /* how much to read in each cycle */
     luaL_Buffer b;
     luaL_buffinit(L, &b);
@@ -430,8 +405,7 @@ static void read_all(lua_State *L, FILE *f)
 }
 
 
-static int read_chars(lua_State *L, FILE *f, size_t n)
-{
+static int read_chars(lua_State *L, FILE *f, size_t n) {
     size_t nr;  /* number of chars actually read */
     char *p;
     luaL_Buffer b;
@@ -444,8 +418,7 @@ static int read_chars(lua_State *L, FILE *f, size_t n)
 }
 
 
-static int g_read(lua_State *L, FILE *f, int first)
-{
+static int g_read(lua_State *L, FILE *f, int first) {
     int nargs = lua_gettop(L) - 1;
     int success;
     int n;
@@ -493,20 +466,17 @@ static int g_read(lua_State *L, FILE *f, int first)
 }
 
 
-static int io_read(lua_State *L)
-{
+static int io_read(lua_State *L) {
     return g_read(L, getiofile(L, IO_INPUT), 1);
 }
 
 
-static int f_read(lua_State *L)
-{
+static int f_read(lua_State *L) {
     return g_read(L, tofile(L), 2);
 }
 
 
-static int io_readline(lua_State *L)
-{
+static int io_readline(lua_State *L) {
     LStream *p = (LStream *)lua_touserdata(L, lua_upvalueindex(1));
     int i;
     int n = (int)lua_tointeger(L, lua_upvalueindex(2));
@@ -536,8 +506,7 @@ static int io_readline(lua_State *L)
 /* }====================================================== */
 
 
-static int g_write(lua_State *L, FILE *f, int arg)
-{
+static int g_write(lua_State *L, FILE *f, int arg) {
     int nargs = lua_gettop(L) - arg;
     int status = 1;
     for (; nargs--; arg++) {
@@ -556,22 +525,19 @@ static int g_write(lua_State *L, FILE *f, int arg)
 }
 
 
-static int io_write(lua_State *L)
-{
+static int io_write(lua_State *L) {
     return g_write(L, getiofile(L, IO_OUTPUT), 1);
 }
 
 
-static int f_write(lua_State *L)
-{
+static int f_write(lua_State *L) {
     FILE *f = tofile(L);
     lua_pushvalue(L, 1);  /* push file at the stack top (to be returned) */
     return g_write(L, f, 2);
 }
 
 
-static int f_seek(lua_State *L)
-{
+static int f_seek(lua_State *L) {
     static const int mode[] = {SEEK_SET, SEEK_CUR, SEEK_END};
     static const char *const modenames[] = {"set", "cur", "end", NULL};
     FILE *f = tofile(L);
@@ -590,8 +556,7 @@ static int f_seek(lua_State *L)
 }
 
 
-static int f_setvbuf(lua_State *L)
-{
+static int f_setvbuf(lua_State *L) {
     static const int mode[] = {_IONBF, _IOFBF, _IOLBF};
     static const char *const modenames[] = {"no", "full", "line", NULL};
     FILE *f = tofile(L);
@@ -603,14 +568,12 @@ static int f_setvbuf(lua_State *L)
 
 
 
-static int io_flush(lua_State *L)
-{
+static int io_flush(lua_State *L) {
     return luaL_fileresult(L, fflush(getiofile(L, IO_OUTPUT)) == 0, NULL);
 }
 
 
-static int f_flush(lua_State *L)
-{
+static int f_flush(lua_State *L) {
     return luaL_fileresult(L, fflush(tofile(L)) == 0, NULL);
 }
 
@@ -651,8 +614,7 @@ static const luaL_Reg flib[] = {
 };
 
 
-static void createmeta(lua_State *L)
-{
+static void createmeta(lua_State *L) {
     luaL_newmetatable(L, LUA_FILEHANDLE);  /* create metatable for file handles */
     lua_pushvalue(L, -1);  /* push metatable */
     lua_setfield(L, -2, "__index");  /* metatable.__index = metatable */
@@ -664,8 +626,7 @@ static void createmeta(lua_State *L)
 /*
 ** function to (not) close the standard files stdin, stdout, and stderr
 */
-static int io_noclose(lua_State *L)
-{
+static int io_noclose(lua_State *L) {
     LStream *p = tolstream(L);
     p->closef = &io_noclose;  /* keep file opened */
     lua_pushnil(L);
@@ -675,8 +636,7 @@ static int io_noclose(lua_State *L)
 
 
 static void createstdfile(lua_State *L, FILE *f, const char *k,
-                          const char *fname)
-{
+                          const char *fname) {
     LStream *p = newprefile(L);
     p->f = f;
     p->closef = &io_noclose;
@@ -688,8 +648,7 @@ static void createstdfile(lua_State *L, FILE *f, const char *k,
 }
 
 
-LUAMOD_API int luaopen_io(lua_State *L)
-{
+LUAMOD_API int luaopen_io(lua_State *L) {
     luaL_newlib(L, iolib);  /* new module */
     createmeta(L);
     /* create (and set) default files */
diff --git a/liblua/llex.c b/liblua/llex.c
index 0a688cd2b..3f0a1601b 100644
--- a/liblua/llex.c
+++ b/liblua/llex.c
@@ -49,8 +49,7 @@ static const char *const luaX_tokens [] = {
 static l_noret lexerror(LexState *ls, const char *msg, int token);
 
 
-static void save(LexState *ls, int c)
-{
+static void save(LexState *ls, int c) {
     Mbuffer *b = ls->buff;
     if (luaZ_bufflen(b) + 1 > luaZ_sizebuffer(b)) {
         size_t newsize;
@@ -63,8 +62,7 @@ static void save(LexState *ls, int c)
 }
 
 
-void luaX_init(lua_State *L)
-{
+void luaX_init(lua_State *L) {
     int i;
     for (i = 0; i < NUM_RESERVED; i++) {
         TString *ts = luaS_new(L, luaX_tokens[i]);
@@ -74,8 +72,7 @@ void luaX_init(lua_State *L)
 }
 
 
-const char *luaX_token2str(LexState *ls, int token)
-{
+const char *luaX_token2str(LexState *ls, int token) {
     if (token < FIRST_RESERVED) {  /* single-byte symbols? */
         lua_assert(token == cast(unsigned char, token));
         return (lisprint(token)) ? luaO_pushfstring(ls->L, LUA_QL("%c"), token) :
@@ -90,8 +87,7 @@ const char *luaX_token2str(LexState *ls, int token)
 }
 
 
-static const char *txtToken(LexState *ls, int token)
-{
+static const char *txtToken(LexState *ls, int token) {
     switch (token) {
         case TK_NAME:
         case TK_STRING:
@@ -104,8 +100,7 @@ static const char *txtToken(LexState *ls, int token)
 }
 
 
-static l_noret lexerror(LexState *ls, const char *msg, int token)
-{
+static l_noret lexerror(LexState *ls, const char *msg, int token) {
     char buff[LUA_IDSIZE];
     luaO_chunkid(buff, getstr(ls->source), LUA_IDSIZE);
     msg = luaO_pushfstring(ls->L, "%s:%d: %s", buff, ls->linenumber, msg);
@@ -115,8 +110,7 @@ static l_noret lexerror(LexState *ls, const char *msg, int token)
 }
 
 
-l_noret luaX_syntaxerror(LexState *ls, const char *msg)
-{
+l_noret luaX_syntaxerror(LexState *ls, const char *msg) {
     lexerror(ls, msg, ls->t.token);
 }
 
@@ -126,8 +120,7 @@ l_noret luaX_syntaxerror(LexState *ls, const char *msg)
 ** it will not be collected until the end of the function's compilation
 ** (by that time it should be anchored in function's prototype)
 */
-TString *luaX_newstring(LexState *ls, const char *str, size_t l)
-{
+TString *luaX_newstring(LexState *ls, const char *str, size_t l) {
     lua_State *L = ls->L;
     TValue *o;  /* entry for `str' */
     TString *ts = luaS_newlstr(L, str, l);  /* create new string */
@@ -148,8 +141,7 @@ TString *luaX_newstring(LexState *ls, const char *str, size_t l)
 ** increment line number and skips newline sequence (any of
 ** \n, \r, \n\r, or \r\n)
 */
-static void inclinenumber(LexState *ls)
-{
+static void inclinenumber(LexState *ls) {
     int old = ls->current;
     lua_assert(currIsNewline(ls));
     next(ls);  /* skip `\n' or `\r' */
@@ -161,8 +153,7 @@ static void inclinenumber(LexState *ls)
 
 
 void luaX_setinput(lua_State *L, LexState *ls, ZIO *z, TString *source,
-                   int firstchar)
-{
+                   int firstchar) {
     ls->decpoint = '.';
     ls->L = L;
     ls->current = firstchar;
@@ -187,8 +178,7 @@ void luaX_setinput(lua_State *L, LexState *ls, ZIO *z, TString *source,
 
 
 
-static int check_next(LexState *ls, const char *set)
-{
+static int check_next(LexState *ls, const char *set) {
     if (ls->current == '\0' || !strchr(set, ls->current))
         return 0;
     save_and_next(ls);
@@ -199,8 +189,7 @@ static int check_next(LexState *ls, const char *set)
 /*
 ** change all characters 'from' in buffer to 'to'
 */
-static void buffreplace(LexState *ls, char from, char to)
-{
+static void buffreplace(LexState *ls, char from, char to) {
     size_t n = luaZ_bufflen(ls->buff);
     char *p = luaZ_buffer(ls->buff);
     while (n--)
@@ -221,8 +210,7 @@ static void buffreplace(LexState *ls, char from, char to)
 ** in case of format error, try to change decimal point separator to
 ** the one defined in the current locale and check again
 */
-static void trydecpoint(LexState *ls, SemInfo *seminfo)
-{
+static void trydecpoint(LexState *ls, SemInfo *seminfo) {
     char old = ls->decpoint;
     ls->decpoint = getlocaledecpoint();
     buffreplace(ls, old, ls->decpoint);  /* try new decimal separator */
@@ -239,8 +227,7 @@ static void trydecpoint(LexState *ls, SemInfo *seminfo)
 ** this function is quite liberal in what it accepts, as 'luaO_str2d'
 ** will reject ill-formed numerals.
 */
-static void read_numeral(LexState *ls, SemInfo *seminfo)
-{
+static void read_numeral(LexState *ls, SemInfo *seminfo) {
     const char *expo = "Ee";
     int first = ls->current;
     lua_assert(lisdigit(ls->current));
@@ -265,8 +252,7 @@ static void read_numeral(LexState *ls, SemInfo *seminfo)
 ** skip a sequence '[=*[' or ']=*]' and return its number of '='s or
 ** -1 if sequence is malformed
 */
-static int skip_sep(LexState *ls)
-{
+static int skip_sep(LexState *ls) {
     int count = 0;
     int s = ls->current;
     lua_assert(s == '[' || s == ']');
@@ -279,8 +265,7 @@ static int skip_sep(LexState *ls)
 }
 
 
-static void read_long_string(LexState *ls, SemInfo *seminfo, int sep)
-{
+static void read_long_string(LexState *ls, SemInfo *seminfo, int sep) {
     save_and_next(ls);  /* skip 2nd `[' */
     if (currIsNewline(ls))  /* string starts with a newline? */
         inclinenumber(ls);  /* skip it */
@@ -317,8 +302,7 @@ endloop:
 }
 
 
-static void escerror(LexState *ls, int *c, int n, const char *msg)
-{
+static void escerror(LexState *ls, int *c, int n, const char *msg) {
     int i;
     luaZ_resetbuffer(ls->buff);  /* prepare error message */
     save(ls, '\\');
@@ -328,8 +312,7 @@ static void escerror(LexState *ls, int *c, int n, const char *msg)
 }
 
 
-static int readhexaesc(LexState *ls)
-{
+static int readhexaesc(LexState *ls) {
     int c[3], i;  /* keep input for error message */
     int r = 0;  /* result accumulator */
     c[0] = 'x';  /* for error message */
@@ -343,8 +326,7 @@ static int readhexaesc(LexState *ls)
 }
 
 
-static int readdecesc(LexState *ls)
-{
+static int readdecesc(LexState *ls) {
     int c[3], i;
     int r = 0;  /* result accumulator */
     for (i = 0; i < 3 && lisdigit(ls->current); i++) {  /* read up to 3 digits */
@@ -358,8 +340,7 @@ static int readdecesc(LexState *ls)
 }
 
 
-static void read_string(LexState *ls, int del, SemInfo *seminfo)
-{
+static void read_string(LexState *ls, int del, SemInfo *seminfo) {
     save_and_next(ls);  /* keep delimiter (for error messages) */
     while (ls->current != del) {
         switch (ls->current) {
@@ -443,8 +424,7 @@ no_save:
 }
 
 
-static int llex(LexState *ls, SemInfo *seminfo)
-{
+static int llex(LexState *ls, SemInfo *seminfo) {
     luaZ_resetbuffer(ls->buff);
     for (;;) {
         switch (ls->current) {
@@ -567,8 +547,7 @@ static int llex(LexState *ls, SemInfo *seminfo)
 }
 
 
-void luaX_next(LexState *ls)
-{
+void luaX_next(LexState *ls) {
     ls->lastline = ls->linenumber;
     if (ls->lookahead.token != TK_EOS) {  /* is there a look-ahead token? */
         ls->t = ls->lookahead;  /* use this one */
@@ -578,8 +557,7 @@ void luaX_next(LexState *ls)
 }
 
 
-int luaX_lookahead(LexState *ls)
-{
+int luaX_lookahead(LexState *ls) {
     lua_assert(ls->lookahead.token == TK_EOS);
     ls->lookahead.token = llex(ls, &ls->lookahead.seminfo);
     return ls->lookahead.token;
diff --git a/liblua/lmathlib.c b/liblua/lmathlib.c
index 71ac69bbe..4f8b9f51f 100644
--- a/liblua/lmathlib.c
+++ b/liblua/lmathlib.c
@@ -23,94 +23,79 @@
 
 
 
-static int math_abs(lua_State *L)
-{
+static int math_abs(lua_State *L) {
     lua_pushnumber(L, l_mathop(fabs)(luaL_checknumber(L, 1)));
     return 1;
 }
 
-static int math_sin(lua_State *L)
-{
+static int math_sin(lua_State *L) {
     lua_pushnumber(L, l_mathop(sin)(luaL_checknumber(L, 1)));
     return 1;
 }
 
-static int math_sinh(lua_State *L)
-{
+static int math_sinh(lua_State *L) {
     lua_pushnumber(L, l_mathop(sinh)(luaL_checknumber(L, 1)));
     return 1;
 }
 
-static int math_cos(lua_State *L)
-{
+static int math_cos(lua_State *L) {
     lua_pushnumber(L, l_mathop(cos)(luaL_checknumber(L, 1)));
     return 1;
 }
 
-static int math_cosh(lua_State *L)
-{
+static int math_cosh(lua_State *L) {
     lua_pushnumber(L, l_mathop(cosh)(luaL_checknumber(L, 1)));
     return 1;
 }
 
-static int math_tan(lua_State *L)
-{
+static int math_tan(lua_State *L) {
     lua_pushnumber(L, l_mathop(tan)(luaL_checknumber(L, 1)));
     return 1;
 }
 
-static int math_tanh(lua_State *L)
-{
+static int math_tanh(lua_State *L) {
     lua_pushnumber(L, l_mathop(tanh)(luaL_checknumber(L, 1)));
     return 1;
 }
 
-static int math_asin(lua_State *L)
-{
+static int math_asin(lua_State *L) {
     lua_pushnumber(L, l_mathop(asin)(luaL_checknumber(L, 1)));
     return 1;
 }
 
-static int math_acos(lua_State *L)
-{
+static int math_acos(lua_State *L) {
     lua_pushnumber(L, l_mathop(acos)(luaL_checknumber(L, 1)));
     return 1;
 }
 
-static int math_atan(lua_State *L)
-{
+static int math_atan(lua_State *L) {
     lua_pushnumber(L, l_mathop(atan)(luaL_checknumber(L, 1)));
     return 1;
 }
 
-static int math_atan2(lua_State *L)
-{
+static int math_atan2(lua_State *L) {
     lua_pushnumber(L, l_mathop(atan2)(luaL_checknumber(L, 1),
                                       luaL_checknumber(L, 2)));
     return 1;
 }
 
-static int math_ceil(lua_State *L)
-{
+static int math_ceil(lua_State *L) {
     lua_pushnumber(L, l_mathop(ceil)(luaL_checknumber(L, 1)));
     return 1;
 }
 
-static int math_floor(lua_State *L)
-{
+static int math_floor(lua_State *L) {
     lua_pushnumber(L, l_mathop(floor)(luaL_checknumber(L, 1)));
     return 1;
 }
 
-static int math_fmod(lua_State *L)
-{
+static int math_fmod(lua_State *L) {
     lua_pushnumber(L, l_mathop(fmod)(luaL_checknumber(L, 1),
                                      luaL_checknumber(L, 2)));
     return 1;
 }
 
-static int math_modf(lua_State *L)
-{
+static int math_modf(lua_State *L) {
     lua_Number ip;
     lua_Number fp = l_mathop(modf)(luaL_checknumber(L, 1), &ip);
     lua_pushnumber(L, ip);
@@ -118,22 +103,19 @@ static int math_modf(lua_State *L)
     return 2;
 }
 
-static int math_sqrt(lua_State *L)
-{
+static int math_sqrt(lua_State *L) {
     lua_pushnumber(L, l_mathop(sqrt)(luaL_checknumber(L, 1)));
     return 1;
 }
 
-static int math_pow(lua_State *L)
-{
+static int math_pow(lua_State *L) {
     lua_Number x = luaL_checknumber(L, 1);
     lua_Number y = luaL_checknumber(L, 2);
     lua_pushnumber(L, l_mathop(pow)(x, y));
     return 1;
 }
 
-static int math_log(lua_State *L)
-{
+static int math_log(lua_State *L) {
     lua_Number x = luaL_checknumber(L, 1);
     lua_Number res;
     if (lua_isnoneornil(L, 2))
@@ -148,41 +130,35 @@ static int math_log(lua_State *L)
 }
 
 #if defined(LUA_COMPAT_LOG10)
-static int math_log10(lua_State *L)
-{
+static int math_log10(lua_State *L) {
     lua_pushnumber(L, l_mathop(log10)(luaL_checknumber(L, 1)));
     return 1;
 }
 #endif
 
-static int math_exp(lua_State *L)
-{
+static int math_exp(lua_State *L) {
     lua_pushnumber(L, l_mathop(exp)(luaL_checknumber(L, 1)));
     return 1;
 }
 
-static int math_deg(lua_State *L)
-{
+static int math_deg(lua_State *L) {
     lua_pushnumber(L, luaL_checknumber(L, 1) / RADIANS_PER_DEGREE);
     return 1;
 }
 
-static int math_rad(lua_State *L)
-{
+static int math_rad(lua_State *L) {
     lua_pushnumber(L, luaL_checknumber(L, 1)*RADIANS_PER_DEGREE);
     return 1;
 }
 
-static int math_frexp(lua_State *L)
-{
+static int math_frexp(lua_State *L) {
     int e;
     lua_pushnumber(L, l_mathop(frexp)(luaL_checknumber(L, 1), &e));
     lua_pushinteger(L, e);
     return 2;
 }
 
-static int math_ldexp(lua_State *L)
-{
+static int math_ldexp(lua_State *L) {
     lua_Number x = luaL_checknumber(L, 1);
     int ep = luaL_checkint(L, 2);
     lua_pushnumber(L, l_mathop(ldexp)(x, ep));
@@ -191,8 +167,7 @@ static int math_ldexp(lua_State *L)
 
 
 
-static int math_min(lua_State *L)
-{
+static int math_min(lua_State *L) {
     int n = lua_gettop(L);  /* number of arguments */
     lua_Number dmin = luaL_checknumber(L, 1);
     int i;
@@ -206,8 +181,7 @@ static int math_min(lua_State *L)
 }
 
 
-static int math_max(lua_State *L)
-{
+static int math_max(lua_State *L) {
     int n = lua_gettop(L);  /* number of arguments */
     lua_Number dmax = luaL_checknumber(L, 1);
     int i;
@@ -221,8 +195,7 @@ static int math_max(lua_State *L)
 }
 
 
-static int math_random(lua_State *L)
-{
+static int math_random(lua_State *L) {
     /* the `%' avoids the (rare) case of r==1, and is needed also because on
        some systems (SunOS!) `rand()' may return a value larger than RAND_MAX */
     lua_Number r = (lua_Number)(rand() % RAND_MAX) / (lua_Number)RAND_MAX;
@@ -251,8 +224,7 @@ static int math_random(lua_State *L)
 }
 
 
-static int math_randomseed(lua_State *L)
-{
+static int math_randomseed(lua_State *L) {
     srand(luaL_checkunsigned(L, 1));
     (void)rand(); /* discard first value to avoid undesirable correlations */
     return 0;
@@ -297,8 +269,7 @@ static const luaL_Reg mathlib[] = {
 /*
 ** Open math library
 */
-LUAMOD_API int luaopen_math(lua_State *L)
-{
+LUAMOD_API int luaopen_math(lua_State *L) {
     luaL_newlib(L, mathlib);
     lua_pushnumber(L, PI);
     lua_setfield(L, -2, "pi");
diff --git a/liblua/lmem.c b/liblua/lmem.c
index 73ef2e657..95288b7ec 100644
--- a/liblua/lmem.c
+++ b/liblua/lmem.c
@@ -44,8 +44,7 @@
 
 
 void *luaM_growaux_(lua_State *L, void *block, int *size, size_t size_elems,
-                    int limit, const char *what)
-{
+                    int limit, const char *what) {
     void *newblock;
     int newsize;
     if (*size >= limit / 2) { /* cannot double it? */
@@ -63,8 +62,7 @@ void *luaM_growaux_(lua_State *L, void *block, int *size, size_t size_elems,
 }
 
 
-l_noret luaM_toobig(lua_State *L)
-{
+l_noret luaM_toobig(lua_State *L) {
     luaG_runerror(L, "memory allocation error: block too big");
 }
 
@@ -73,8 +71,7 @@ l_noret luaM_toobig(lua_State *L)
 /*
 ** generic allocation routine.
 */
-void *luaM_realloc_(lua_State *L, void *block, size_t osize, size_t nsize)
-{
+void *luaM_realloc_(lua_State *L, void *block, size_t osize, size_t nsize) {
     void *newblock;
     global_State *g = G(L);
     size_t realosize = (block) ? osize : 0;
diff --git a/liblua/loadlib.c b/liblua/loadlib.c
index 942fde583..d3c40decf 100644
--- a/liblua/loadlib.c
+++ b/liblua/loadlib.c
@@ -126,22 +126,19 @@ static lua_CFunction ll_sym(lua_State *L, void *lib, const char *sym);
 
 #include <dlfcn.h>
 
-static void ll_unloadlib(void *lib)
-{
+static void ll_unloadlib(void *lib) {
     dlclose(lib);
 }
 
 
-static void *ll_load(lua_State *L, const char *path, int seeglb)
-{
+static void *ll_load(lua_State *L, const char *path, int seeglb) {
     void *lib = dlopen(path, RTLD_NOW | (seeglb ? RTLD_GLOBAL : RTLD_LOCAL));
     if (lib == NULL) lua_pushstring(L, dlerror());
     return lib;
 }
 
 
-static lua_CFunction ll_sym(lua_State *L, void *lib, const char *sym)
-{
+static lua_CFunction ll_sym(lua_State *L, void *lib, const char *sym) {
     lua_CFunction f = (lua_CFunction)dlsym(lib, sym);
     if (f == NULL) lua_pushstring(L, dlerror());
     return f;
@@ -168,8 +165,7 @@ static lua_CFunction ll_sym(lua_State *L, void *lib, const char *sym)
 #endif
 
 
-static void setprogdir(lua_State *L)
-{
+static void setprogdir(lua_State *L) {
     char buff[MAX_PATH + 1];
     char *lb;
     DWORD nsize = sizeof(buff) / sizeof(char);
@@ -184,8 +180,7 @@ static void setprogdir(lua_State *L)
 }
 
 
-static void pusherror(lua_State *L)
-{
+static void pusherror(lua_State *L) {
     int error = GetLastError();
     char buffer[128];
     if (FormatMessageA(FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_FROM_SYSTEM,
@@ -195,14 +190,12 @@ static void pusherror(lua_State *L)
         lua_pushfstring(L, "system error %d\n", error);
 }
 
-static void ll_unloadlib(void *lib)
-{
+static void ll_unloadlib(void *lib) {
     FreeLibrary((HMODULE)lib);
 }
 
 
-static void *ll_load(lua_State *L, const char *path, int seeglb)
-{
+static void *ll_load(lua_State *L, const char *path, int seeglb) {
     HMODULE lib = LoadLibraryExA(path, NULL, LUA_LLE_FLAGS);
     (void)(seeglb);  /* not used: symbols are 'global' by default */
     if (lib == NULL) pusherror(L);
@@ -210,8 +203,7 @@ static void *ll_load(lua_State *L, const char *path, int seeglb)
 }
 
 
-static lua_CFunction ll_sym(lua_State *L, void *lib, const char *sym)
-{
+static lua_CFunction ll_sym(lua_State *L, void *lib, const char *sym) {
     lua_CFunction f = (lua_CFunction)GetProcAddress((HMODULE)lib, sym);
     if (f == NULL) pusherror(L);
     return f;
@@ -234,14 +226,12 @@ static lua_CFunction ll_sym(lua_State *L, void *lib, const char *sym)
 #define DLMSG "dynamic libraries not enabled; check your Lua installation"
 
 
-static void ll_unloadlib(void *lib)
-{
+static void ll_unloadlib(void *lib) {
     (void)(lib);  /* not used */
 }
 
 
-static void *ll_load(lua_State *L, const char *path, int seeglb)
-{
+static void *ll_load(lua_State *L, const char *path, int seeglb) {
     (void)(path);
     (void)(seeglb);  /* not used */
     lua_pushliteral(L, DLMSG);
@@ -249,8 +239,7 @@ static void *ll_load(lua_State *L, const char *path, int seeglb)
 }
 
 
-static lua_CFunction ll_sym(lua_State *L, void *lib, const char *sym)
-{
+static lua_CFunction ll_sym(lua_State *L, void *lib, const char *sym) {
     (void)(lib);
     (void)(sym);  /* not used */
     lua_pushliteral(L, DLMSG);
@@ -261,8 +250,7 @@ static lua_CFunction ll_sym(lua_State *L, void *lib, const char *sym)
 #endif
 
 
-static void *ll_checkclib(lua_State *L, const char *path)
-{
+static void *ll_checkclib(lua_State *L, const char *path) {
     void *plib;
     lua_getfield(L, LUA_REGISTRYINDEX, CLIBS);
     lua_getfield(L, -1, path);
@@ -272,8 +260,7 @@ static void *ll_checkclib(lua_State *L, const char *path)
 }
 
 
-static void ll_addtoclib(lua_State *L, const char *path, void *plib)
-{
+static void ll_addtoclib(lua_State *L, const char *path, void *plib) {
     lua_getfield(L, LUA_REGISTRYINDEX, CLIBS);
     lua_pushlightuserdata(L, plib);
     lua_pushvalue(L, -1);
@@ -287,8 +274,7 @@ static void ll_addtoclib(lua_State *L, const char *path, void *plib)
 ** __gc tag method for CLIBS table: calls 'll_unloadlib' for all lib
 ** handles in list CLIBS
 */
-static int gctm(lua_State *L)
-{
+static int gctm(lua_State *L) {
     int n = luaL_len(L, 1);
     for (; n >= 1; n--) {  /* for each handle, in reverse order */
         lua_rawgeti(L, 1, n);  /* get handle CLIBS[n] */
@@ -299,8 +285,7 @@ static int gctm(lua_State *L)
 }
 
 
-static int ll_loadfunc(lua_State *L, const char *path, const char *sym)
-{
+static int ll_loadfunc(lua_State *L, const char *path, const char *sym) {
     void *reg = ll_checkclib(L, path);  /* check loaded C libraries */
     if (reg == NULL) {  /* must load library? */
         reg = ll_load(L, path, *sym == '*');
@@ -320,8 +305,7 @@ static int ll_loadfunc(lua_State *L, const char *path, const char *sym)
 }
 
 
-static int ll_loadlib(lua_State *L)
-{
+static int ll_loadlib(lua_State *L) {
     const char *path = luaL_checkstring(L, 1);
     const char *init = luaL_checkstring(L, 2);
     int stat = ll_loadfunc(L, path, init);
@@ -344,8 +328,7 @@ static int ll_loadlib(lua_State *L)
 */
 
 
-static int readable(const char *filename)
-{
+static int readable(const char *filename) {
     FILE *f = fopen(filename, "r");  /* try to open file */
     if (f == NULL) return 0;  /* open failed */
     fclose(f);
@@ -353,8 +336,7 @@ static int readable(const char *filename)
 }
 
 
-static const char *pushnexttemplate(lua_State *L, const char *path)
-{
+static const char *pushnexttemplate(lua_State *L, const char *path) {
     const char *l;
     while (*path == *LUA_PATH_SEP) path++;  /* skip separators */
     if (*path == '\0') return NULL;  /* no more templates */
@@ -368,8 +350,7 @@ static const char *pushnexttemplate(lua_State *L, const char *path)
 static const char *searchpath(lua_State *L, const char *name,
                               const char *path,
                               const char *sep,
-                              const char *dirsep)
-{
+                              const char *dirsep) {
     luaL_Buffer msg;  /* to build error message */
     luaL_buffinit(L, &msg);
     if (*sep != '\0')  /* non-empty separator? */
@@ -389,8 +370,7 @@ static const char *searchpath(lua_State *L, const char *name,
 }
 
 
-static int ll_searchpath(lua_State *L)
-{
+static int ll_searchpath(lua_State *L) {
     const char *f = searchpath(L, luaL_checkstring(L, 1),
                                luaL_checkstring(L, 2),
                                luaL_optstring(L, 3, "."),
@@ -406,8 +386,7 @@ static int ll_searchpath(lua_State *L)
 
 static const char *findfile(lua_State *L, const char *name,
                             const char *pname,
-                            const char *dirsep)
-{
+                            const char *dirsep) {
     const char *path;
     lua_getfield(L, lua_upvalueindex(1), pname);
     path = lua_tostring(L, -1);
@@ -417,8 +396,7 @@ static const char *findfile(lua_State *L, const char *name,
 }
 
 
-static int checkload(lua_State *L, int stat, const char *filename)
-{
+static int checkload(lua_State *L, int stat, const char *filename) {
     if (stat) {  /* module loaded successfully? */
         lua_pushstring(L, filename);  /* will be 2nd argument to module */
         return 2;  /* return open function and file name */
@@ -429,8 +407,7 @@ static int checkload(lua_State *L, int stat, const char *filename)
 }
 
 
-static int searcher_Lua(lua_State *L)
-{
+static int searcher_Lua(lua_State *L) {
     const char *filename;
     const char *name = luaL_checkstring(L, 1);
     filename = findfile(L, name, "path", LUA_LSUBSEP);
@@ -439,8 +416,7 @@ static int searcher_Lua(lua_State *L)
 }
 
 
-static int loadfunc(lua_State *L, const char *filename, const char *modname)
-{
+static int loadfunc(lua_State *L, const char *filename, const char *modname) {
     const char *funcname;
     const char *mark;
     modname = luaL_gsub(L, modname, ".", LUA_OFSEP);
@@ -458,8 +434,7 @@ static int loadfunc(lua_State *L, const char *filename, const char *modname)
 }
 
 
-static int searcher_C(lua_State *L)
-{
+static int searcher_C(lua_State *L) {
     const char *name = luaL_checkstring(L, 1);
     const char *filename = findfile(L, name, "cpath", LUA_CSUBSEP);
     if (filename == NULL) return 1;  /* module not found in this path */
@@ -467,8 +442,7 @@ static int searcher_C(lua_State *L)
 }
 
 
-static int searcher_Croot(lua_State *L)
-{
+static int searcher_Croot(lua_State *L) {
     const char *filename;
     const char *name = luaL_checkstring(L, 1);
     const char *p = strchr(name, '.');
@@ -491,8 +465,7 @@ static int searcher_Croot(lua_State *L)
 }
 
 
-static int searcher_preload(lua_State *L)
-{
+static int searcher_preload(lua_State *L) {
     const char *name = luaL_checkstring(L, 1);
     lua_getfield(L, LUA_REGISTRYINDEX, "_PRELOAD");
     lua_getfield(L, -1, name);
@@ -502,8 +475,7 @@ static int searcher_preload(lua_State *L)
 }
 
 
-static void findloader(lua_State *L, const char *name)
-{
+static void findloader(lua_State *L, const char *name) {
     int i;
     luaL_Buffer msg;  /* to build error message */
     luaL_buffinit(L, &msg);
@@ -532,8 +504,7 @@ static void findloader(lua_State *L, const char *name)
 }
 
 
-static int ll_require(lua_State *L)
-{
+static int ll_require(lua_State *L) {
     const char *name = luaL_checkstring(L, 1);
     lua_settop(L, 1);  /* _LOADED table will be at index 2 */
     lua_getfield(L, LUA_REGISTRYINDEX, "_LOADED");
@@ -571,12 +542,11 @@ static int ll_require(lua_State *L)
 /*
 ** changes the environment variable of calling function
 */
-static void set_env(lua_State *L)
-{
+static void set_env(lua_State *L) {
     lua_Debug ar;
     if (lua_getstack(L, 1, &ar) == 0 ||
-        lua_getinfo(L, "f", &ar) == 0 ||  /* get calling function */
-        lua_iscfunction(L, -1))
+            lua_getinfo(L, "f", &ar) == 0 ||  /* get calling function */
+            lua_iscfunction(L, -1))
         luaL_error(L, LUA_QL("module") " not called from a Lua function");
     lua_pushvalue(L, -2);  /* copy new environment table to top */
     lua_setupvalue(L, -2, 1);
@@ -584,8 +554,7 @@ static void set_env(lua_State *L)
 }
 
 
-static void dooptions(lua_State *L, int n)
-{
+static void dooptions(lua_State *L, int n) {
     int i;
     for (i = 2; i <= n; i++) {
         if (lua_isfunction(L, i)) {  /* avoid 'calling' extra info. */
@@ -597,8 +566,7 @@ static void dooptions(lua_State *L, int n)
 }
 
 
-static void modinit(lua_State *L, const char *modname)
-{
+static void modinit(lua_State *L, const char *modname) {
     const char *dot;
     lua_pushvalue(L, -1);
     lua_setfield(L, -2, "_M");  /* module._M = module */
@@ -613,8 +581,7 @@ static void modinit(lua_State *L, const char *modname)
 }
 
 
-static int ll_module(lua_State *L)
-{
+static int ll_module(lua_State *L) {
     const char *modname = luaL_checkstring(L, 1);
     int lastarg = lua_gettop(L);  /* last parameter */
     luaL_pushmodule(L, modname, 1);  /* get/create module table */
@@ -633,8 +600,7 @@ static int ll_module(lua_State *L)
 }
 
 
-static int ll_seeall(lua_State *L)
-{
+static int ll_seeall(lua_State *L) {
     luaL_checktype(L, 1, LUA_TTABLE);
     if (!lua_getmetatable(L, 1)) {
         lua_createtable(L, 0, 1); /* create new metatable */
@@ -658,8 +624,7 @@ static int ll_seeall(lua_State *L)
 /*
 ** return registry.LUA_NOENV as a boolean
 */
-static int noenv(lua_State *L)
-{
+static int noenv(lua_State *L) {
     int b;
     lua_getfield(L, LUA_REGISTRYINDEX, "LUA_NOENV");
     b = lua_toboolean(L, -1);
@@ -669,8 +634,7 @@ static int noenv(lua_State *L)
 
 
 static void setpath(lua_State *L, const char *fieldname, const char *envname1,
-                    const char *envname2, const char *def)
-{
+                    const char *envname2, const char *def) {
     const char *path = getenv(envname1);
     if (path == NULL)  /* no environment variable? */
         path = getenv(envname2);  /* try alternative name */
@@ -707,8 +671,7 @@ static const luaL_Reg ll_funcs[] = {
 };
 
 
-static void createsearcherstable(lua_State *L)
-{
+static void createsearcherstable(lua_State *L) {
     static const lua_CFunction searchers[] =
     {searcher_preload, searcher_Lua, searcher_C, searcher_Croot, NULL};
     int i;
@@ -723,8 +686,7 @@ static void createsearcherstable(lua_State *L)
 }
 
 
-LUAMOD_API int luaopen_package(lua_State *L)
-{
+LUAMOD_API int luaopen_package(lua_State *L) {
     /* create table CLIBS to keep track of loaded C libraries */
     luaL_getsubtable(L, LUA_REGISTRYINDEX, CLIBS);
     lua_createtable(L, 0, 1);  /* metatable for CLIBS */
diff --git a/liblua/lobject.c b/liblua/lobject.c
index e4a56e148..79ac0b5e6 100644
--- a/liblua/lobject.c
+++ b/liblua/lobject.c
@@ -33,8 +33,7 @@ LUAI_DDEF const TValue luaO_nilobject_ = {NILCONSTANT};
 ** (eeeeexxx), where the real value is (1xxx) * 2^(eeeee - 1) if
 ** eeeee != 0 and (xxx) otherwise.
 */
-int luaO_int2fb(unsigned int x)
-{
+int luaO_int2fb(unsigned int x) {
     int e = 0;  /* exponent */
     if (x < 8) return x;
     while (x >= 0x10) {
@@ -46,16 +45,14 @@ int luaO_int2fb(unsigned int x)
 
 
 /* converts back */
-int luaO_fb2int(int x)
-{
+int luaO_fb2int(int x) {
     int e = (x >> 3) & 0x1f;
     if (e == 0) return x;
     else return ((x & 7) + 8) << (e - 1);
 }
 
 
-int luaO_ceillog2(unsigned int x)
-{
+int luaO_ceillog2(unsigned int x) {
     static const lu_byte log_2[256] = {
         0, 1, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
         6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
@@ -73,8 +70,7 @@ int luaO_ceillog2(unsigned int x)
 }
 
 
-lua_Number luaO_arith(int op, lua_Number v1, lua_Number v2)
-{
+lua_Number luaO_arith(int op, lua_Number v1, lua_Number v2) {
     switch (op) {
         case LUA_OPADD:
             return luai_numadd(NULL, v1, v2);
@@ -97,8 +93,7 @@ lua_Number luaO_arith(int op, lua_Number v1, lua_Number v2)
 }
 
 
-int luaO_hexavalue(int c)
-{
+int luaO_hexavalue(int c) {
     if (lisdigit(c)) return c - '0';
     else return ltolower(c) - 'a' + 10;
 }
@@ -109,16 +104,14 @@ int luaO_hexavalue(int c)
 #include <math.h>
 
 
-static int isneg(const char **s)
-{
+static int isneg(const char **s) {
     if (**s == '-') { (*s)++; return 1; }
     else if (**s == '+')(*s)++;
     return 0;
 }
 
 
-static lua_Number readhexa(const char **s, lua_Number r, int *count)
-{
+static lua_Number readhexa(const char **s, lua_Number r, int *count) {
     for (; lisxdigit(cast_uchar(**s)); (*s)++) {  /* read integer part */
         r = (r * cast_num(16.0)) + cast_num(luaO_hexavalue(cast_uchar(**s)));
         (*count)++;
@@ -131,8 +124,7 @@ static lua_Number readhexa(const char **s, lua_Number r, int *count)
 ** convert an hexadecimal numeric string to a number, following
 ** C99 specification for 'strtod'
 */
-static lua_Number lua_strx2number(const char *s, char **endptr)
-{
+static lua_Number lua_strx2number(const char *s, char **endptr) {
     lua_Number r = 0.0;
     int e = 0, i = 0;
     int neg = 0;  /* 1 if number is negative */
@@ -172,8 +164,7 @@ ret:
 #endif
 
 
-int luaO_str2d(const char *s, size_t len, lua_Number *result)
-{
+int luaO_str2d(const char *s, size_t len, lua_Number *result) {
     char *endptr;
     if (strpbrk(s, "nN"))  /* reject 'inf' and 'nan' */
         return 0;
@@ -188,15 +179,13 @@ int luaO_str2d(const char *s, size_t len, lua_Number *result)
 
 
 
-static void pushstr(lua_State *L, const char *str, size_t l)
-{
+static void pushstr(lua_State *L, const char *str, size_t l) {
     setsvalue2s(L, L->top++, luaS_newlstr(L, str, l));
 }
 
 
 /* this function handles only `%d', `%c', %f, %p, and `%s' formats */
-const char *luaO_pushvfstring(lua_State *L, const char *fmt, va_list argp)
-{
+const char *luaO_pushvfstring(lua_State *L, const char *fmt, va_list argp) {
     int n = 0;
     for (;;) {
         const char *e = strchr(fmt, '%');
@@ -250,8 +239,7 @@ const char *luaO_pushvfstring(lua_State *L, const char *fmt, va_list argp)
 }
 
 
-const char *luaO_pushfstring(lua_State *L, const char *fmt, ...)
-{
+const char *luaO_pushfstring(lua_State *L, const char *fmt, ...) {
     const char *msg;
     va_list argp;
     va_start(argp, fmt);
@@ -270,8 +258,7 @@ const char *luaO_pushfstring(lua_State *L, const char *fmt, ...)
 
 #define addstr(a,b,l) ( memcpy(a,b,(l) * sizeof(char)), a += (l) )
 
-void luaO_chunkid(char *out, const char *source, size_t bufflen)
-{
+void luaO_chunkid(char *out, const char *source, size_t bufflen) {
     size_t l = strlen(source);
     if (*source == '=') {  /* 'literal' source */
         if (l <= bufflen)  /* small enough? */
diff --git a/liblua/loslib.c b/liblua/loslib.c
index cbffd0bb8..ecd2ba657 100644
--- a/liblua/loslib.c
+++ b/liblua/loslib.c
@@ -77,8 +77,7 @@
 
 
 
-static int os_execute(lua_State *L)
-{
+static int os_execute(lua_State *L) {
     const char *cmd = luaL_optstring(L, 1, NULL);
     int stat = system(cmd);
     if (cmd != NULL)
@@ -90,23 +89,20 @@ static int os_execute(lua_State *L)
 }
 
 
-static int os_remove(lua_State *L)
-{
+static int os_remove(lua_State *L) {
     const char *filename = luaL_checkstring(L, 1);
     return luaL_fileresult(L, remove(filename) == 0, filename);
 }
 
 
-static int os_rename(lua_State *L)
-{
+static int os_rename(lua_State *L) {
     const char *fromname = luaL_checkstring(L, 1);
     const char *toname = luaL_checkstring(L, 2);
     return luaL_fileresult(L, rename(fromname, toname) == 0, NULL);
 }
 
 
-static int os_tmpname(lua_State *L)
-{
+static int os_tmpname(lua_State *L) {
     char buff[LUA_TMPNAMBUFSIZE];
     int err;
     lua_tmpnam(buff, err);
@@ -117,15 +113,13 @@ static int os_tmpname(lua_State *L)
 }
 
 
-static int os_getenv(lua_State *L)
-{
+static int os_getenv(lua_State *L) {
     lua_pushstring(L, getenv(luaL_checkstring(L, 1)));  /* if NULL push nil */
     return 1;
 }
 
 
-static int os_clock(lua_State *L)
-{
+static int os_clock(lua_State *L) {
     lua_pushnumber(L, ((lua_Number)clock()) / (lua_Number)CLOCKS_PER_SEC);
     return 1;
 }
@@ -139,22 +133,19 @@ static int os_clock(lua_State *L)
 ** =======================================================
 */
 
-static void setfield(lua_State *L, const char *key, int value)
-{
+static void setfield(lua_State *L, const char *key, int value) {
     lua_pushinteger(L, value);
     lua_setfield(L, -2, key);
 }
 
-static void setboolfield(lua_State *L, const char *key, int value)
-{
+static void setboolfield(lua_State *L, const char *key, int value) {
     if (value < 0)  /* undefined? */
         return;  /* does not set field */
     lua_pushboolean(L, value);
     lua_setfield(L, -2, key);
 }
 
-static int getboolfield(lua_State *L, const char *key)
-{
+static int getboolfield(lua_State *L, const char *key) {
     int res;
     lua_getfield(L, -1, key);
     res = lua_isnil(L, -1) ? -1 : lua_toboolean(L, -1);
@@ -163,8 +154,7 @@ static int getboolfield(lua_State *L, const char *key)
 }
 
 
-static int getfield(lua_State *L, const char *key, int d)
-{
+static int getfield(lua_State *L, const char *key, int d) {
     int res, isnum;
     lua_getfield(L, -1, key);
     res = (int)lua_tointegerx(L, -1, &isnum);
@@ -178,8 +168,7 @@ static int getfield(lua_State *L, const char *key, int d)
 }
 
 
-static const char *checkoption(lua_State *L, const char *conv, char *buff)
-{
+static const char *checkoption(lua_State *L, const char *conv, char *buff) {
     static const char *const options[] = LUA_STRFTIMEOPTIONS;
     unsigned int i;
     for (i = 0; i < sizeof(options) / sizeof(options[0]); i += 2) {
@@ -202,8 +191,7 @@ static const char *checkoption(lua_State *L, const char *conv, char *buff)
 }
 
 
-static int os_date(lua_State *L)
-{
+static int os_date(lua_State *L) {
     const char *s = luaL_optstring(L, 1, "%c");
     time_t t = luaL_opt(L, (time_t)luaL_checknumber, 2, time(NULL));
     struct tm tmr, *stm;
@@ -247,8 +235,7 @@ static int os_date(lua_State *L)
 }
 
 
-static int os_time(lua_State *L)
-{
+static int os_time(lua_State *L) {
     time_t t;
     if (lua_isnoneornil(L, 1))  /* called without args? */
         t = time(NULL);  /* get current time */
@@ -273,8 +260,7 @@ static int os_time(lua_State *L)
 }
 
 
-static int os_difftime(lua_State *L)
-{
+static int os_difftime(lua_State *L) {
     lua_pushnumber(L, difftime((time_t)(luaL_checknumber(L, 1)),
                                (time_t)(luaL_optnumber(L, 2, 0))));
     return 1;
@@ -283,8 +269,7 @@ static int os_difftime(lua_State *L)
 /* }====================================================== */
 
 
-static int os_setlocale(lua_State *L)
-{
+static int os_setlocale(lua_State *L) {
     static const int cat[] = {LC_ALL, LC_COLLATE, LC_CTYPE, LC_MONETARY,
                               LC_NUMERIC, LC_TIME
                              };
@@ -298,8 +283,7 @@ static int os_setlocale(lua_State *L)
 }
 
 
-static int os_exit(lua_State *L)
-{
+static int os_exit(lua_State *L) {
     int status;
     if (lua_isboolean(L, 1))
         status = (lua_toboolean(L, 1) ? EXIT_SUCCESS : EXIT_FAILURE);
@@ -331,8 +315,7 @@ static const luaL_Reg syslib[] = {
 
 
 
-LUAMOD_API int luaopen_os(lua_State *L)
-{
+LUAMOD_API int luaopen_os(lua_State *L) {
     luaL_newlib(L, syslib);
     return 1;
 }
diff --git a/liblua/lparser.c b/liblua/lparser.c
index c751fcbb7..07852bfed 100644
--- a/liblua/lparser.c
+++ b/liblua/lparser.c
@@ -57,8 +57,7 @@ static void statement(LexState *ls);
 static void expr(LexState *ls, expdesc *v);
 
 
-static void anchor_token(LexState *ls)
-{
+static void anchor_token(LexState *ls) {
     /* last token from outer function must be EOS */
     lua_assert(ls->fs != NULL || ls->t.token == TK_EOS);
     if (ls->t.token == TK_NAME || ls->t.token == TK_STRING) {
@@ -69,22 +68,19 @@ static void anchor_token(LexState *ls)
 
 
 /* semantic error */
-static l_noret semerror(LexState *ls, const char *msg)
-{
+static l_noret semerror(LexState *ls, const char *msg) {
     ls->t.token = 0;  /* remove 'near to' from final message */
     luaX_syntaxerror(ls, msg);
 }
 
 
-static l_noret error_expected(LexState *ls, int token)
-{
+static l_noret error_expected(LexState *ls, int token) {
     luaX_syntaxerror(ls,
                      luaO_pushfstring(ls->L, "%s expected", luaX_token2str(ls, token)));
 }
 
 
-static l_noret errorlimit(FuncState *fs, int limit, const char *what)
-{
+static l_noret errorlimit(FuncState *fs, int limit, const char *what) {
     lua_State *L = fs->ls->L;
     const char *msg;
     int line = fs->f->linedefined;
@@ -97,14 +93,12 @@ static l_noret errorlimit(FuncState *fs, int limit, const char *what)
 }
 
 
-static void checklimit(FuncState *fs, int v, int l, const char *what)
-{
+static void checklimit(FuncState *fs, int v, int l, const char *what) {
     if (v > l) errorlimit(fs, l, what);
 }
 
 
-static int testnext(LexState *ls, int c)
-{
+static int testnext(LexState *ls, int c) {
     if (ls->t.token == c) {
         luaX_next(ls);
         return 1;
@@ -112,15 +106,13 @@ static int testnext(LexState *ls, int c)
 }
 
 
-static void check(LexState *ls, int c)
-{
+static void check(LexState *ls, int c) {
     if (ls->t.token != c)
         error_expected(ls, c);
 }
 
 
-static void checknext(LexState *ls, int c)
-{
+static void checknext(LexState *ls, int c) {
     check(ls, c);
     luaX_next(ls);
 }
@@ -130,8 +122,7 @@ static void checknext(LexState *ls, int c)
 
 
 
-static void check_match(LexState *ls, int what, int who, int where)
-{
+static void check_match(LexState *ls, int what, int who, int where) {
     if (!testnext(ls, what)) {
         if (where == ls->linenumber)
             error_expected(ls, what);
@@ -144,8 +135,7 @@ static void check_match(LexState *ls, int what, int who, int where)
 }
 
 
-static TString *str_checkname(LexState *ls)
-{
+static TString *str_checkname(LexState *ls) {
     TString *ts;
     check(ls, TK_NAME);
     ts = ls->t.seminfo.ts;
@@ -154,28 +144,24 @@ static TString *str_checkname(LexState *ls)
 }
 
 
-static void init_exp(expdesc *e, expkind k, int i)
-{
+static void init_exp(expdesc *e, expkind k, int i) {
     e->f = e->t = NO_JUMP;
     e->k = k;
     e->u.info = i;
 }
 
 
-static void codestring(LexState *ls, expdesc *e, TString *s)
-{
+static void codestring(LexState *ls, expdesc *e, TString *s) {
     init_exp(e, VK, luaK_stringK(ls->fs, s));
 }
 
 
-static void checkname(LexState *ls, expdesc *e)
-{
+static void checkname(LexState *ls, expdesc *e) {
     codestring(ls, e, str_checkname(ls));
 }
 
 
-static int registerlocalvar(LexState *ls, TString *varname)
-{
+static int registerlocalvar(LexState *ls, TString *varname) {
     FuncState *fs = ls->fs;
     Proto *f = fs->f;
     int oldsize = f->sizelocvars;
@@ -188,8 +174,7 @@ static int registerlocalvar(LexState *ls, TString *varname)
 }
 
 
-static void new_localvar(LexState *ls, TString *name)
-{
+static void new_localvar(LexState *ls, TString *name) {
     FuncState *fs = ls->fs;
     Dyndata *dyd = ls->dyd;
     int reg = registerlocalvar(ls, name);
@@ -201,8 +186,7 @@ static void new_localvar(LexState *ls, TString *name)
 }
 
 
-static void new_localvarliteral_(LexState *ls, const char *name, size_t sz)
-{
+static void new_localvarliteral_(LexState *ls, const char *name, size_t sz) {
     new_localvar(ls, luaX_newstring(ls, name, sz));
 }
 
@@ -210,16 +194,14 @@ static void new_localvarliteral_(LexState *ls, const char *name, size_t sz)
     new_localvarliteral_(ls, "" v, (sizeof(v)/sizeof(char))-1)
 
 
-static LocVar *getlocvar(FuncState *fs, int i)
-{
+static LocVar *getlocvar(FuncState *fs, int i) {
     int idx = fs->ls->dyd->actvar.arr[fs->firstlocal + i].idx;
     lua_assert(idx < fs->nlocvars);
     return &fs->f->locvars[idx];
 }
 
 
-static void adjustlocalvars(LexState *ls, int nvars)
-{
+static void adjustlocalvars(LexState *ls, int nvars) {
     FuncState *fs = ls->fs;
     fs->nactvar = cast_byte(fs->nactvar + nvars);
     for (; nvars; nvars--) {
@@ -228,16 +210,14 @@ static void adjustlocalvars(LexState *ls, int nvars)
 }
 
 
-static void removevars(FuncState *fs, int tolevel)
-{
+static void removevars(FuncState *fs, int tolevel) {
     fs->ls->dyd->actvar.n -= (fs->nactvar - tolevel);
     while (fs->nactvar > tolevel)
         getlocvar(fs, --fs->nactvar)->endpc = fs->pc;
 }
 
 
-static int searchupvalue(FuncState *fs, TString *name)
-{
+static int searchupvalue(FuncState *fs, TString *name) {
     int i;
     Upvaldesc *up = fs->f->upvalues;
     for (i = 0; i < fs->nups; i++) {
@@ -247,8 +227,7 @@ static int searchupvalue(FuncState *fs, TString *name)
 }
 
 
-static int newupvalue(FuncState *fs, TString *name, expdesc *v)
-{
+static int newupvalue(FuncState *fs, TString *name, expdesc *v) {
     Proto *f = fs->f;
     int oldsize = f->sizeupvalues;
     checklimit(fs, fs->nups + 1, MAXUPVAL, "upvalues");
@@ -263,8 +242,7 @@ static int newupvalue(FuncState *fs, TString *name, expdesc *v)
 }
 
 
-static int searchvar(FuncState *fs, TString *n)
-{
+static int searchvar(FuncState *fs, TString *n) {
     int i;
     for (i = cast_int(fs->nactvar) - 1; i >= 0; i--) {
         if (luaS_eqstr(n, getlocvar(fs, i)->varname))
@@ -278,8 +256,7 @@ static int searchvar(FuncState *fs, TString *n)
   Mark block where variable at given level was defined
   (to emit close instructions later).
 */
-static void markupval(FuncState *fs, int level)
-{
+static void markupval(FuncState *fs, int level) {
     BlockCnt *bl = fs->bl;
     while (bl->nactvar > level) bl = bl->previous;
     bl->upval = 1;
@@ -290,8 +267,7 @@ static void markupval(FuncState *fs, int level)
   Find variable with given name 'n'. If it is an upvalue, add this
   upvalue into all intermediate functions.
 */
-static int singlevaraux(FuncState *fs, TString *n, expdesc *var, int base)
-{
+static int singlevaraux(FuncState *fs, TString *n, expdesc *var, int base) {
     if (fs == NULL)  /* no more levels? */
         return VVOID;  /* default is global */
     else {
@@ -316,8 +292,7 @@ static int singlevaraux(FuncState *fs, TString *n, expdesc *var, int base)
 }
 
 
-static void singlevar(LexState *ls, expdesc *var)
-{
+static void singlevar(LexState *ls, expdesc *var) {
     TString *varname = str_checkname(ls);
     FuncState *fs = ls->fs;
     if (singlevaraux(fs, varname, var, 1) == VVOID) {  /* global name? */
@@ -330,8 +305,7 @@ static void singlevar(LexState *ls, expdesc *var)
 }
 
 
-static void adjust_assign(LexState *ls, int nvars, int nexps, expdesc *e)
-{
+static void adjust_assign(LexState *ls, int nvars, int nexps, expdesc *e) {
     FuncState *fs = ls->fs;
     int extra = nvars - nexps;
     if (hasmultret(e->k)) {
@@ -350,8 +324,7 @@ static void adjust_assign(LexState *ls, int nvars, int nexps, expdesc *e)
 }
 
 
-static void enterlevel(LexState *ls)
-{
+static void enterlevel(LexState *ls) {
     lua_State *L = ls->L;
     ++L->nCcalls;
     checklimit(ls->fs, L->nCcalls, LUAI_MAXCCALLS, "C levels");
@@ -361,8 +334,7 @@ static void enterlevel(LexState *ls)
 #define leavelevel(ls) ((ls)->L->nCcalls--)
 
 
-static void closegoto(LexState *ls, int g, Labeldesc *label)
-{
+static void closegoto(LexState *ls, int g, Labeldesc *label) {
     int i;
     FuncState *fs = ls->fs;
     Labellist *gl = &ls->dyd->gt;
@@ -386,8 +358,7 @@ static void closegoto(LexState *ls, int g, Labeldesc *label)
 /*
 ** try to close a goto with existing labels; this solves backward jumps
 */
-static int findlabel(LexState *ls, int g)
-{
+static int findlabel(LexState *ls, int g) {
     int i;
     BlockCnt *bl = ls->fs->bl;
     Dyndata *dyd = ls->dyd;
@@ -397,7 +368,7 @@ static int findlabel(LexState *ls, int g)
         Labeldesc *lb = &dyd->label.arr[i];
         if (luaS_eqstr(lb->name, gt->name)) {  /* correct label? */
             if (gt->nactvar > lb->nactvar &&
-                (bl->upval || dyd->label.n > bl->firstlabel))
+                    (bl->upval || dyd->label.n > bl->firstlabel))
                 luaK_patchclose(ls->fs, gt->pc, lb->nactvar);
             closegoto(ls, g, lb);  /* close it */
             return 1;
@@ -408,8 +379,7 @@ static int findlabel(LexState *ls, int g)
 
 
 static int newlabelentry(LexState *ls, Labellist *l, TString *name,
-                         int line, int pc)
-{
+                         int line, int pc) {
     int n = l->n;
     luaM_growvector(ls->L, l->arr, n, l->size,
                     Labeldesc, SHRT_MAX, "labels/gotos");
@@ -426,8 +396,7 @@ static int newlabelentry(LexState *ls, Labellist *l, TString *name,
 ** check whether new label 'lb' matches any pending gotos in current
 ** block; solves forward jumps
 */
-static void findgotos(LexState *ls, Labeldesc *lb)
-{
+static void findgotos(LexState *ls, Labeldesc *lb) {
     Labellist *gl = &ls->dyd->gt;
     int i = ls->fs->bl->firstgoto;
     while (i < gl->n) {
@@ -445,8 +414,7 @@ static void findgotos(LexState *ls, Labeldesc *lb)
 ** the goto exits the scope of any variable (which can be the
 ** upvalue), close those variables being exited.
 */
-static void movegotosout(FuncState *fs, BlockCnt *bl)
-{
+static void movegotosout(FuncState *fs, BlockCnt *bl) {
     int i = bl->firstgoto;
     Labellist *gl = &fs->ls->dyd->gt;
     /* correct pending gotos to current block and try to close it
@@ -464,8 +432,7 @@ static void movegotosout(FuncState *fs, BlockCnt *bl)
 }
 
 
-static void enterblock(FuncState *fs, BlockCnt *bl, lu_byte isloop)
-{
+static void enterblock(FuncState *fs, BlockCnt *bl, lu_byte isloop) {
     bl->isloop = isloop;
     bl->nactvar = fs->nactvar;
     bl->firstlabel = fs->ls->dyd->label.n;
@@ -480,8 +447,7 @@ static void enterblock(FuncState *fs, BlockCnt *bl, lu_byte isloop)
 /*
 ** create a label named "break" to resolve break statements
 */
-static void breaklabel(LexState *ls)
-{
+static void breaklabel(LexState *ls) {
     TString *n = luaS_new(ls->L, "break");
     int l = newlabelentry(ls, &ls->dyd->label, n, 0, ls->fs->pc);
     findgotos(ls, &ls->dyd->label.arr[l]);
@@ -491,8 +457,7 @@ static void breaklabel(LexState *ls)
 ** generates an error for an undefined 'goto'; choose appropriate
 ** message when label name is a reserved word (which can only be 'break')
 */
-static l_noret undefgoto(LexState *ls, Labeldesc *gt)
-{
+static l_noret undefgoto(LexState *ls, Labeldesc *gt) {
     const char *msg = isreserved(gt->name)
                       ? "<%s> at line %d not inside a loop"
                       : "no visible label " LUA_QS " for <goto> at line %d";
@@ -501,8 +466,7 @@ static l_noret undefgoto(LexState *ls, Labeldesc *gt)
 }
 
 
-static void leaveblock(FuncState *fs)
-{
+static void leaveblock(FuncState *fs) {
     BlockCnt *bl = fs->bl;
     LexState *ls = fs->ls;
     if (bl->previous && bl->upval) {
@@ -528,8 +492,7 @@ static void leaveblock(FuncState *fs)
 /*
 ** adds a new prototype into list of prototypes
 */
-static Proto *addprototype(LexState *ls)
-{
+static Proto *addprototype(LexState *ls) {
     Proto *clp;
     lua_State *L = ls->L;
     FuncState *fs = ls->fs;
@@ -551,16 +514,14 @@ static Proto *addprototype(LexState *ls)
 ** so that, if it invokes the GC, the GC knows which registers
 ** are in use at that time.
 */
-static void codeclosure(LexState *ls, expdesc *v)
-{
+static void codeclosure(LexState *ls, expdesc *v) {
     FuncState *fs = ls->fs->prev;
     init_exp(v, VRELOCABLE, luaK_codeABx(fs, OP_CLOSURE, 0, fs->np - 1));
     luaK_exp2nextreg(fs, v);  /* fix it at the last register */
 }
 
 
-static void open_func(LexState *ls, FuncState *fs, BlockCnt *bl)
-{
+static void open_func(LexState *ls, FuncState *fs, BlockCnt *bl) {
     lua_State *L = ls->L;
     Proto *f;
     fs->prev = ls->fs;  /* linked list of funcstates */
@@ -588,8 +549,7 @@ static void open_func(LexState *ls, FuncState *fs, BlockCnt *bl)
 }
 
 
-static void close_func(LexState *ls)
-{
+static void close_func(LexState *ls) {
     lua_State *L = ls->L;
     FuncState *fs = ls->fs;
     Proto *f = fs->f;
@@ -627,8 +587,7 @@ static void close_func(LexState *ls)
 ** 'until' closes syntactical blocks, but do not close scope,
 ** so it handled in separate.
 */
-static int block_follow(LexState *ls, int withuntil)
-{
+static int block_follow(LexState *ls, int withuntil) {
     switch (ls->t.token) {
         case TK_ELSE:
         case TK_ELSEIF:
@@ -643,8 +602,7 @@ static int block_follow(LexState *ls, int withuntil)
 }
 
 
-static void statlist(LexState *ls)
-{
+static void statlist(LexState *ls) {
     /* statlist -> { stat [`;'] } */
     while (!block_follow(ls, 1)) {
         if (ls->t.token == TK_RETURN) {
@@ -656,8 +614,7 @@ static void statlist(LexState *ls)
 }
 
 
-static void fieldsel(LexState *ls, expdesc *v)
-{
+static void fieldsel(LexState *ls, expdesc *v) {
     /* fieldsel -> ['.' | ':'] NAME */
     FuncState *fs = ls->fs;
     expdesc key;
@@ -668,8 +625,7 @@ static void fieldsel(LexState *ls, expdesc *v)
 }
 
 
-static void yindex(LexState *ls, expdesc *v)
-{
+static void yindex(LexState *ls, expdesc *v) {
     /* index -> '[' expr ']' */
     luaX_next(ls);  /* skip the '[' */
     expr(ls, v);
@@ -694,8 +650,7 @@ struct ConsControl {
 };
 
 
-static void recfield(LexState *ls, struct ConsControl *cc)
-{
+static void recfield(LexState *ls, struct ConsControl *cc) {
     /* recfield -> (NAME | `['exp1`]') = exp1 */
     FuncState *fs = ls->fs;
     int reg = ls->fs->freereg;
@@ -715,8 +670,7 @@ static void recfield(LexState *ls, struct ConsControl *cc)
 }
 
 
-static void closelistfield(FuncState *fs, struct ConsControl *cc)
-{
+static void closelistfield(FuncState *fs, struct ConsControl *cc) {
     if (cc->v.k == VVOID) return;  /* there is no list item */
     luaK_exp2nextreg(fs, &cc->v);
     cc->v.k = VVOID;
@@ -727,8 +681,7 @@ static void closelistfield(FuncState *fs, struct ConsControl *cc)
 }
 
 
-static void lastlistfield(FuncState *fs, struct ConsControl *cc)
-{
+static void lastlistfield(FuncState *fs, struct ConsControl *cc) {
     if (cc->tostore == 0) return;
     if (hasmultret(cc->v.k)) {
         luaK_setmultret(fs, &cc->v);
@@ -742,8 +695,7 @@ static void lastlistfield(FuncState *fs, struct ConsControl *cc)
 }
 
 
-static void listfield(LexState *ls, struct ConsControl *cc)
-{
+static void listfield(LexState *ls, struct ConsControl *cc) {
     /* listfield -> exp */
     expr(ls, &cc->v);
     checklimit(ls->fs, cc->na, MAX_INT, "items in a constructor");
@@ -752,8 +704,7 @@ static void listfield(LexState *ls, struct ConsControl *cc)
 }
 
 
-static void field(LexState *ls, struct ConsControl *cc)
-{
+static void field(LexState *ls, struct ConsControl *cc) {
     /* field -> listfield | recfield */
     switch (ls->t.token) {
         case TK_NAME: {  /* may be 'listfield' or 'recfield' */
@@ -775,8 +726,7 @@ static void field(LexState *ls, struct ConsControl *cc)
 }
 
 
-static void constructor(LexState *ls, expdesc *t)
-{
+static void constructor(LexState *ls, expdesc *t) {
     /* constructor -> '{' [ field { sep field } [sep] ] '}'
        sep -> ',' | ';' */
     FuncState *fs = ls->fs;
@@ -805,8 +755,7 @@ static void constructor(LexState *ls, expdesc *t)
 
 
 
-static void parlist(LexState *ls)
-{
+static void parlist(LexState *ls) {
     /* parlist -> [ param { `,' param } ] */
     FuncState *fs = ls->fs;
     Proto *f = fs->f;
@@ -836,8 +785,7 @@ static void parlist(LexState *ls)
 }
 
 
-static void body(LexState *ls, expdesc *e, int ismethod, int line)
-{
+static void body(LexState *ls, expdesc *e, int ismethod, int line) {
     /* body ->  `(' parlist `)' block END */
     FuncState new_fs;
     BlockCnt bl;
@@ -859,8 +807,7 @@ static void body(LexState *ls, expdesc *e, int ismethod, int line)
 }
 
 
-static int explist(LexState *ls, expdesc *v)
-{
+static int explist(LexState *ls, expdesc *v) {
     /* explist -> expr { `,' expr } */
     int n = 1;  /* at least one expression */
     expr(ls, v);
@@ -873,8 +820,7 @@ static int explist(LexState *ls, expdesc *v)
 }
 
 
-static void funcargs(LexState *ls, expdesc *f, int line)
-{
+static void funcargs(LexState *ls, expdesc *f, int line) {
     FuncState *fs = ls->fs;
     expdesc args;
     int base, nparams;
@@ -928,8 +874,7 @@ static void funcargs(LexState *ls, expdesc *f, int line)
 */
 
 
-static void primaryexp(LexState *ls, expdesc *v)
-{
+static void primaryexp(LexState *ls, expdesc *v) {
     /* primaryexp -> NAME | '(' expr ')' */
     switch (ls->t.token) {
         case '(': {
@@ -951,8 +896,7 @@ static void primaryexp(LexState *ls, expdesc *v)
 }
 
 
-static void suffixedexp(LexState *ls, expdesc *v)
-{
+static void suffixedexp(LexState *ls, expdesc *v) {
     /* suffixedexp ->
          primaryexp { '.' NAME | '[' exp ']' | ':' NAME funcargs | funcargs } */
     FuncState *fs = ls->fs;
@@ -993,8 +937,7 @@ static void suffixedexp(LexState *ls, expdesc *v)
 }
 
 
-static void simpleexp(LexState *ls, expdesc *v)
-{
+static void simpleexp(LexState *ls, expdesc *v) {
     /* simpleexp -> NUMBER | STRING | NIL | TRUE | FALSE | ... |
                     constructor | FUNCTION body | suffixedexp */
     switch (ls->t.token) {
@@ -1044,8 +987,7 @@ static void simpleexp(LexState *ls, expdesc *v)
 }
 
 
-static UnOpr getunopr(int op)
-{
+static UnOpr getunopr(int op) {
     switch (op) {
         case TK_NOT:
             return OPR_NOT;
@@ -1059,8 +1001,7 @@ static UnOpr getunopr(int op)
 }
 
 
-static BinOpr getbinopr(int op)
-{
+static BinOpr getbinopr(int op) {
     switch (op) {
         case '+':
             return OPR_ADD;
@@ -1116,8 +1057,7 @@ static const struct {
 ** subexpr -> (simpleexp | unop subexpr) { binop subexpr }
 ** where `binop' is any binary operator with a priority higher than `limit'
 */
-static BinOpr subexpr(LexState *ls, expdesc *v, int limit)
-{
+static BinOpr subexpr(LexState *ls, expdesc *v, int limit) {
     BinOpr op;
     UnOpr uop;
     enterlevel(ls);
@@ -1146,8 +1086,7 @@ static BinOpr subexpr(LexState *ls, expdesc *v, int limit)
 }
 
 
-static void expr(LexState *ls, expdesc *v)
-{
+static void expr(LexState *ls, expdesc *v) {
     subexpr(ls, v, 0);
 }
 
@@ -1162,8 +1101,7 @@ static void expr(LexState *ls, expdesc *v)
 */
 
 
-static void block(LexState *ls)
-{
+static void block(LexState *ls) {
     /* block -> statlist */
     FuncState *fs = ls->fs;
     BlockCnt bl;
@@ -1189,8 +1127,7 @@ struct LHS_assign {
 ** table. If so, save original upvalue/local value in a safe place and
 ** use this safe copy in the previous assignment.
 */
-static void check_conflict(LexState *ls, struct LHS_assign *lh, expdesc *v)
-{
+static void check_conflict(LexState *ls, struct LHS_assign *lh, expdesc *v) {
     FuncState *fs = ls->fs;
     int extra = fs->freereg;  /* eventual position to save local variable */
     int conflict = 0;
@@ -1218,8 +1155,7 @@ static void check_conflict(LexState *ls, struct LHS_assign *lh, expdesc *v)
 }
 
 
-static void assignment(LexState *ls, struct LHS_assign *lh, int nvars)
-{
+static void assignment(LexState *ls, struct LHS_assign *lh, int nvars) {
     expdesc e;
     check_condition(ls, vkisvar(lh->v.k), "syntax error");
     if (testnext(ls, ',')) {  /* assignment -> ',' suffixedexp assignment */
@@ -1250,8 +1186,7 @@ static void assignment(LexState *ls, struct LHS_assign *lh, int nvars)
 }
 
 
-static int cond(LexState *ls)
-{
+static int cond(LexState *ls) {
     /* cond -> exp */
     expdesc v;
     expr(ls, &v);  /* read condition */
@@ -1261,8 +1196,7 @@ static int cond(LexState *ls)
 }
 
 
-static void gotostat(LexState *ls, int pc)
-{
+static void gotostat(LexState *ls, int pc) {
     int line = ls->linenumber;
     TString *label;
     int g;
@@ -1278,8 +1212,7 @@ static void gotostat(LexState *ls, int pc)
 
 
 /* check for repeated labels on the same block */
-static void checkrepeated(FuncState *fs, Labellist *ll, TString *label)
-{
+static void checkrepeated(FuncState *fs, Labellist *ll, TString *label) {
     int i;
     for (i = fs->bl->firstlabel; i < ll->n; i++) {
         if (luaS_eqstr(label, ll->arr[i].name)) {
@@ -1293,15 +1226,13 @@ static void checkrepeated(FuncState *fs, Labellist *ll, TString *label)
 
 
 /* skip no-op statements */
-static void skipnoopstat(LexState *ls)
-{
+static void skipnoopstat(LexState *ls) {
     while (ls->t.token == ';' || ls->t.token == TK_DBCOLON)
         statement(ls);
 }
 
 
-static void labelstat(LexState *ls, TString *label, int line)
-{
+static void labelstat(LexState *ls, TString *label, int line) {
     /* label -> '::' NAME '::' */
     FuncState *fs = ls->fs;
     Labellist *ll = &ls->dyd->label;
@@ -1319,8 +1250,7 @@ static void labelstat(LexState *ls, TString *label, int line)
 }
 
 
-static void whilestat(LexState *ls, int line)
-{
+static void whilestat(LexState *ls, int line) {
     /* whilestat -> WHILE cond DO block END */
     FuncState *fs = ls->fs;
     int whileinit;
@@ -1339,8 +1269,7 @@ static void whilestat(LexState *ls, int line)
 }
 
 
-static void repeatstat(LexState *ls, int line)
-{
+static void repeatstat(LexState *ls, int line) {
     /* repeatstat -> REPEAT block UNTIL cond */
     int condexit;
     FuncState *fs = ls->fs;
@@ -1360,8 +1289,7 @@ static void repeatstat(LexState *ls, int line)
 }
 
 
-static int exp1(LexState *ls)
-{
+static int exp1(LexState *ls) {
     expdesc e;
     int reg;
     expr(ls, &e);
@@ -1372,8 +1300,7 @@ static int exp1(LexState *ls)
 }
 
 
-static void forbody(LexState *ls, int base, int line, int nvars, int isnum)
-{
+static void forbody(LexState *ls, int base, int line, int nvars, int isnum) {
     /* forbody -> DO block */
     BlockCnt bl;
     FuncState *fs = ls->fs;
@@ -1399,8 +1326,7 @@ static void forbody(LexState *ls, int base, int line, int nvars, int isnum)
 }
 
 
-static void fornum(LexState *ls, TString *varname, int line)
-{
+static void fornum(LexState *ls, TString *varname, int line) {
     /* fornum -> NAME = exp1,exp1[,exp1] forbody */
     FuncState *fs = ls->fs;
     int base = fs->freereg;
@@ -1422,8 +1348,7 @@ static void fornum(LexState *ls, TString *varname, int line)
 }
 
 
-static void forlist(LexState *ls, TString *indexname)
-{
+static void forlist(LexState *ls, TString *indexname) {
     /* forlist -> NAME {,NAME} IN explist forbody */
     FuncState *fs = ls->fs;
     expdesc e;
@@ -1448,8 +1373,7 @@ static void forlist(LexState *ls, TString *indexname)
 }
 
 
-static void forstat(LexState *ls, int line)
-{
+static void forstat(LexState *ls, int line) {
     /* forstat -> FOR (fornum | forlist) END */
     FuncState *fs = ls->fs;
     TString *varname;
@@ -1473,8 +1397,7 @@ static void forstat(LexState *ls, int line)
 }
 
 
-static void test_then_block(LexState *ls, int *escapelist)
-{
+static void test_then_block(LexState *ls, int *escapelist) {
     /* test_then_block -> [IF | ELSEIF] cond THEN block */
     BlockCnt bl;
     FuncState *fs = ls->fs;
@@ -1501,14 +1424,13 @@ static void test_then_block(LexState *ls, int *escapelist)
     statlist(ls);  /* `then' part */
     leaveblock(fs);
     if (ls->t.token == TK_ELSE ||
-        ls->t.token == TK_ELSEIF)  /* followed by 'else'/'elseif'? */
+            ls->t.token == TK_ELSEIF)  /* followed by 'else'/'elseif'? */
         luaK_concat(fs, escapelist, luaK_jump(fs));  /* must jump over it */
     luaK_patchtohere(fs, jf);
 }
 
 
-static void ifstat(LexState *ls, int line)
-{
+static void ifstat(LexState *ls, int line) {
     /* ifstat -> IF cond THEN block {ELSEIF cond THEN block} [ELSE block] END */
     FuncState *fs = ls->fs;
     int escapelist = NO_JUMP;  /* exit list for finished parts */
@@ -1522,8 +1444,7 @@ static void ifstat(LexState *ls, int line)
 }
 
 
-static void localfunc(LexState *ls)
-{
+static void localfunc(LexState *ls) {
     expdesc b;
     FuncState *fs = ls->fs;
     new_localvar(ls, str_checkname(ls));  /* new local variable */
@@ -1534,8 +1455,7 @@ static void localfunc(LexState *ls)
 }
 
 
-static void localstat(LexState *ls)
-{
+static void localstat(LexState *ls) {
     /* stat -> LOCAL NAME {`,' NAME} [`=' explist] */
     int nvars = 0;
     int nexps;
@@ -1555,8 +1475,7 @@ static void localstat(LexState *ls)
 }
 
 
-static int funcname(LexState *ls, expdesc *v)
-{
+static int funcname(LexState *ls, expdesc *v) {
     /* funcname -> NAME {fieldsel} [`:' NAME] */
     int ismethod = 0;
     singlevar(ls, v);
@@ -1570,8 +1489,7 @@ static int funcname(LexState *ls, expdesc *v)
 }
 
 
-static void funcstat(LexState *ls, int line)
-{
+static void funcstat(LexState *ls, int line) {
     /* funcstat -> FUNCTION funcname body */
     int ismethod;
     expdesc v, b;
@@ -1583,8 +1501,7 @@ static void funcstat(LexState *ls, int line)
 }
 
 
-static void exprstat(LexState *ls)
-{
+static void exprstat(LexState *ls) {
     /* stat -> func | assignment */
     FuncState *fs = ls->fs;
     struct LHS_assign v;
@@ -1599,8 +1516,7 @@ static void exprstat(LexState *ls)
 }
 
 
-static void retstat(LexState *ls)
-{
+static void retstat(LexState *ls) {
     /* stat -> RETURN [explist] [';'] */
     FuncState *fs = ls->fs;
     expdesc e;
@@ -1632,8 +1548,7 @@ static void retstat(LexState *ls)
 }
 
 
-static void statement(LexState *ls)
-{
+static void statement(LexState *ls) {
     int line = ls->linenumber;  /* may be needed for error messages */
     enterlevel(ls);
     switch (ls->t.token) {
@@ -1708,8 +1623,7 @@ static void statement(LexState *ls)
 ** compiles the main function, which is a regular vararg function with an
 ** upvalue named LUA_ENV
 */
-static void mainfunc(LexState *ls, FuncState *fs)
-{
+static void mainfunc(LexState *ls, FuncState *fs) {
     BlockCnt bl;
     expdesc v;
     open_func(ls, fs, &bl);
@@ -1724,8 +1638,7 @@ static void mainfunc(LexState *ls, FuncState *fs)
 
 
 Closure *luaY_parser(lua_State *L, ZIO *z, Mbuffer *buff,
-                     Dyndata *dyd, const char *name, int firstchar)
-{
+                     Dyndata *dyd, const char *name, int firstchar) {
     LexState lexstate;
     FuncState funcstate;
     Closure *cl = luaF_newLclosure(L, 1);  /* create main closure */
diff --git a/liblua/lstate.c b/liblua/lstate.c
index 9c189f89a..284322528 100644
--- a/liblua/lstate.c
+++ b/liblua/lstate.c
@@ -86,8 +86,7 @@ typedef struct LG {
     { size_t t = cast(size_t, e); \
         memcpy(buff + p, &t, sizeof(t)); p += sizeof(t); }
 
-static unsigned int makeseed(lua_State *L)
-{
+static unsigned int makeseed(lua_State *L) {
     char buff[4 * sizeof(size_t)];
     unsigned int h = luai_makeseed();
     int p = 0;
@@ -104,15 +103,13 @@ static unsigned int makeseed(lua_State *L)
 ** set GCdebt to a new value keeping the value (totalbytes + GCdebt)
 ** invariant
 */
-void luaE_setdebt(global_State *g, l_mem debt)
-{
+void luaE_setdebt(global_State *g, l_mem debt) {
     g->totalbytes -= (debt - g->GCdebt);
     g->GCdebt = debt;
 }
 
 
-CallInfo *luaE_extendCI(lua_State *L)
-{
+CallInfo *luaE_extendCI(lua_State *L) {
     CallInfo *ci = luaM_new(L, CallInfo);
     lua_assert(L->ci->next == NULL);
     L->ci->next = ci;
@@ -122,8 +119,7 @@ CallInfo *luaE_extendCI(lua_State *L)
 }
 
 
-void luaE_freeCI(lua_State *L)
-{
+void luaE_freeCI(lua_State *L) {
     CallInfo *ci = L->ci;
     CallInfo *next = ci->next;
     ci->next = NULL;
@@ -134,8 +130,7 @@ void luaE_freeCI(lua_State *L)
 }
 
 
-static void stack_init(lua_State *L1, lua_State *L)
-{
+static void stack_init(lua_State *L1, lua_State *L) {
     int i;
     CallInfo *ci;
     /* initialize stack array */
@@ -156,8 +151,7 @@ static void stack_init(lua_State *L1, lua_State *L)
 }
 
 
-static void freestack(lua_State *L)
-{
+static void freestack(lua_State *L) {
     if (L->stack == NULL)
         return;  /* stack not completely built yet */
     L->ci = &L->base_ci;  /* free the entire 'ci' list */
@@ -169,8 +163,7 @@ static void freestack(lua_State *L)
 /*
 ** Create registry table and its predefined values
 */
-static void init_registry(lua_State *L, global_State *g)
-{
+static void init_registry(lua_State *L, global_State *g) {
     TValue mt;
     /* create registry */
     Table *registry = luaH_new(L);
@@ -188,8 +181,7 @@ static void init_registry(lua_State *L, global_State *g)
 /*
 ** open parts of the state that may cause memory-allocation errors
 */
-static void f_luaopen(lua_State *L, void *ud)
-{
+static void f_luaopen(lua_State *L, void *ud) {
     global_State *g = G(L);
     UNUSED(ud);
     stack_init(L, L);  /* init stack */
@@ -208,8 +200,7 @@ static void f_luaopen(lua_State *L, void *ud)
 ** preinitialize a state with consistent values without allocating
 ** any memory (to avoid errors)
 */
-static void preinit_state(lua_State *L, global_State *g)
-{
+static void preinit_state(lua_State *L, global_State *g) {
     G(L) = g;
     L->stack = NULL;
     L->ci = NULL;
@@ -228,8 +219,7 @@ static void preinit_state(lua_State *L, global_State *g)
 }
 
 
-static void close_state(lua_State *L)
-{
+static void close_state(lua_State *L) {
     global_State *g = G(L);
     luaF_close(L, L->stack);  /* close all upvalues for this thread */
     luaC_freeallobjects(L);  /* collect all objects */
@@ -241,8 +231,7 @@ static void close_state(lua_State *L)
 }
 
 
-LUA_API lua_State *lua_newthread(lua_State *L)
-{
+LUA_API lua_State *lua_newthread(lua_State *L) {
     lua_State *L1;
     lua_lock(L);
     luaC_checkGC(L);
@@ -261,8 +250,7 @@ LUA_API lua_State *lua_newthread(lua_State *L)
 }
 
 
-void luaE_freethread(lua_State *L, lua_State *L1)
-{
+void luaE_freethread(lua_State *L, lua_State *L1) {
     LX *l = fromstate(L1);
     luaF_close(L1, L1->stack);  /* close all upvalues for this thread */
     lua_assert(L1->openupval == NULL);
@@ -272,8 +260,7 @@ void luaE_freethread(lua_State *L, lua_State *L1)
 }
 
 
-LUA_API lua_State *lua_newstate(lua_Alloc f, void *ud)
-{
+LUA_API lua_State *lua_newstate(lua_Alloc f, void *ud) {
     int i;
     lua_State *L;
     global_State *g;
@@ -325,8 +312,7 @@ LUA_API lua_State *lua_newstate(lua_Alloc f, void *ud)
 }
 
 
-LUA_API void lua_close(lua_State *L)
-{
+LUA_API void lua_close(lua_State *L) {
     L = G(L)->mainthread;  /* only the main thread can be closed */
     lua_lock(L);
     luai_userstateclose(L);
diff --git a/liblua/lstring.c b/liblua/lstring.c
index e86e8f2c4..a0457e844 100644
--- a/liblua/lstring.c
+++ b/liblua/lstring.c
@@ -30,8 +30,7 @@
 /*
 ** equality for long strings
 */
-int luaS_eqlngstr(TString *a, TString *b)
-{
+int luaS_eqlngstr(TString *a, TString *b) {
     size_t len = a->tsv.len;
     lua_assert(a->tsv.tt == LUA_TLNGSTR && b->tsv.tt == LUA_TLNGSTR);
     return (a == b) ||  /* same instance or... */
@@ -43,15 +42,13 @@ int luaS_eqlngstr(TString *a, TString *b)
 /*
 ** equality for strings
 */
-int luaS_eqstr(TString *a, TString *b)
-{
+int luaS_eqstr(TString *a, TString *b) {
     return (a->tsv.tt == b->tsv.tt) &&
            (a->tsv.tt == LUA_TSHRSTR ? eqshrstr(a, b) : luaS_eqlngstr(a, b));
 }
 
 
-unsigned int luaS_hash(const char *str, size_t l, unsigned int seed)
-{
+unsigned int luaS_hash(const char *str, size_t l, unsigned int seed) {
     unsigned int h = seed ^ cast(unsigned int, l);
     size_t l1;
     size_t step = (l >> LUAI_HASHLIMIT) + 1;
@@ -64,8 +61,7 @@ unsigned int luaS_hash(const char *str, size_t l, unsigned int seed)
 /*
 ** resizes the string table
 */
-void luaS_resize(lua_State *L, int newsize)
-{
+void luaS_resize(lua_State *L, int newsize) {
     int i;
     stringtable *tb = &G(L)->strt;
     /* cannot resize while GC is traversing strings */
@@ -100,8 +96,7 @@ void luaS_resize(lua_State *L, int newsize)
 ** creates a new string object
 */
 static TString *createstrobj(lua_State *L, const char *str, size_t l,
-                             int tag, unsigned int h, GCObject **list)
-{
+                             int tag, unsigned int h, GCObject **list) {
     TString *ts;
     size_t totalsize;  /* total size of TString object */
     totalsize = sizeof(TString) + ((l + 1) * sizeof(char));
@@ -119,8 +114,7 @@ static TString *createstrobj(lua_State *L, const char *str, size_t l,
 ** creates a new short string, inserting it into string table
 */
 static TString *newshrstr(lua_State *L, const char *str, size_t l,
-                          unsigned int h)
-{
+                          unsigned int h) {
     GCObject **list;  /* (pointer to) list where it will be inserted */
     stringtable *tb = &G(L)->strt;
     TString *s;
@@ -136,18 +130,17 @@ static TString *newshrstr(lua_State *L, const char *str, size_t l,
 /*
 ** checks whether short string exists and reuses it or creates a new one
 */
-static TString *internshrstr(lua_State *L, const char *str, size_t l)
-{
+static TString *internshrstr(lua_State *L, const char *str, size_t l) {
     GCObject *o;
     global_State *g = G(L);
     unsigned int h = luaS_hash(str, l, g->seed);
     for (o = g->strt.hash[lmod(h, g->strt.size)];
-         o != NULL;
-         o = gch(o)->next) {
+            o != NULL;
+            o = gch(o)->next) {
         TString *ts = rawgco2ts(o);
         if (h == ts->tsv.hash &&
-            l == ts->tsv.len &&
-            (memcmp(str, getstr(ts), l * sizeof(char)) == 0)) {
+                l == ts->tsv.len &&
+                (memcmp(str, getstr(ts), l * sizeof(char)) == 0)) {
             if (isdead(G(L), o))  /* string is dead (but was not collected yet)? */
                 changewhite(o);  /* resurrect it */
             return ts;
@@ -160,8 +153,7 @@ static TString *internshrstr(lua_State *L, const char *str, size_t l)
 /*
 ** new string (with explicit length)
 */
-TString *luaS_newlstr(lua_State *L, const char *str, size_t l)
-{
+TString *luaS_newlstr(lua_State *L, const char *str, size_t l) {
     if (l <= LUAI_MAXSHORTLEN)  /* short string? */
         return internshrstr(L, str, l);
     else {
@@ -175,14 +167,12 @@ TString *luaS_newlstr(lua_State *L, const char *str, size_t l)
 /*
 ** new zero-terminated string
 */
-TString *luaS_new(lua_State *L, const char *str)
-{
+TString *luaS_new(lua_State *L, const char *str) {
     return luaS_newlstr(L, str, strlen(str));
 }
 
 
-Udata *luaS_newudata(lua_State *L, size_t s, Table *e)
-{
+Udata *luaS_newudata(lua_State *L, size_t s, Table *e) {
     Udata *u;
     if (s > MAX_SIZET - sizeof(Udata))
         luaM_toobig(L);
diff --git a/liblua/lstrlib.c b/liblua/lstrlib.c
index 09ec93eb5..57b4ebc4b 100644
--- a/liblua/lstrlib.c
+++ b/liblua/lstrlib.c
@@ -34,8 +34,7 @@
 
 
 
-static int str_len(lua_State *L)
-{
+static int str_len(lua_State *L) {
     size_t l;
     luaL_checklstring(L, 1, &l);
     lua_pushinteger(L, (lua_Integer)l);
@@ -44,16 +43,14 @@ static int str_len(lua_State *L)
 
 
 /* translate a relative string position: negative means back from end */
-static size_t posrelat(ptrdiff_t pos, size_t len)
-{
+static size_t posrelat(ptrdiff_t pos, size_t len) {
     if (pos >= 0) return (size_t)pos;
     else if (0u - (size_t)pos > len) return 0;
     else return len - ((size_t) - pos) + 1;
 }
 
 
-static int str_sub(lua_State *L)
-{
+static int str_sub(lua_State *L) {
     size_t l;
     const char *s = luaL_checklstring(L, 1, &l);
     size_t start = posrelat(luaL_checkinteger(L, 2), l);
@@ -67,8 +64,7 @@ static int str_sub(lua_State *L)
 }
 
 
-static int str_reverse(lua_State *L)
-{
+static int str_reverse(lua_State *L) {
     size_t l, i;
     luaL_Buffer b;
     const char *s = luaL_checklstring(L, 1, &l);
@@ -80,8 +76,7 @@ static int str_reverse(lua_State *L)
 }
 
 
-static int str_lower(lua_State *L)
-{
+static int str_lower(lua_State *L) {
     size_t l;
     size_t i;
     luaL_Buffer b;
@@ -94,8 +89,7 @@ static int str_lower(lua_State *L)
 }
 
 
-static int str_upper(lua_State *L)
-{
+static int str_upper(lua_State *L) {
     size_t l;
     size_t i;
     luaL_Buffer b;
@@ -111,8 +105,7 @@ static int str_upper(lua_State *L)
 /* reasonable limit to avoid arithmetic overflow */
 #define MAXSIZE ((~(size_t)0) >> 1)
 
-static int str_rep(lua_State *L)
-{
+static int str_rep(lua_State *L) {
     size_t l, lsep;
     const char *s = luaL_checklstring(L, 1, &l);
     int n = luaL_checkint(L, 2);
@@ -139,8 +132,7 @@ static int str_rep(lua_State *L)
 }
 
 
-static int str_byte(lua_State *L)
-{
+static int str_byte(lua_State *L) {
     size_t l;
     const char *s = luaL_checklstring(L, 1, &l);
     size_t posi = posrelat(luaL_optinteger(L, 2, 1), l);
@@ -159,8 +151,7 @@ static int str_byte(lua_State *L)
 }
 
 
-static int str_char(lua_State *L)
-{
+static int str_char(lua_State *L) {
     int n = lua_gettop(L);  /* number of arguments */
     int i;
     luaL_Buffer b;
@@ -175,16 +166,14 @@ static int str_char(lua_State *L)
 }
 
 
-static int writer(lua_State *L, const void *b, size_t size, void *B)
-{
+static int writer(lua_State *L, const void *b, size_t size, void *B) {
     (void)L;
     luaL_addlstring((luaL_Buffer *) B, (const char *)b, size);
     return 0;
 }
 
 
-static int str_dump(lua_State *L)
-{
+static int str_dump(lua_State *L) {
     luaL_Buffer b;
     luaL_checktype(L, 1, LUA_TFUNCTION);
     lua_settop(L, 1);
@@ -236,8 +225,7 @@ static const char *match(MatchState *ms, const char *s, const char *p);
 #define SPECIALS "^$*+?.([%-"
 
 
-static int check_capture(MatchState *ms, int l)
-{
+static int check_capture(MatchState *ms, int l) {
     l -= '1';
     if (l < 0 || l >= ms->level || ms->capture[l].len == CAP_UNFINISHED)
         return luaL_error(ms->L, "invalid capture index %%%d", l + 1);
@@ -245,8 +233,7 @@ static int check_capture(MatchState *ms, int l)
 }
 
 
-static int capture_to_close(MatchState *ms)
-{
+static int capture_to_close(MatchState *ms) {
     int level = ms->level;
     for (level--; level >= 0; level--)
         if (ms->capture[level].len == CAP_UNFINISHED) return level;
@@ -254,8 +241,7 @@ static int capture_to_close(MatchState *ms)
 }
 
 
-static const char *classend(MatchState *ms, const char *p)
-{
+static const char *classend(MatchState *ms, const char *p) {
     switch (*p++) {
         case L_ESC: {
             if (p == ms->p_end)
@@ -279,8 +265,7 @@ static const char *classend(MatchState *ms, const char *p)
 }
 
 
-static int match_class(int c, int cl)
-{
+static int match_class(int c, int cl) {
     int res;
     switch (tolower(cl)) {
         case 'a' :
@@ -323,8 +308,7 @@ static int match_class(int c, int cl)
 }
 
 
-static int matchbracketclass(int c, const char *p, const char *ec)
-{
+static int matchbracketclass(int c, const char *p, const char *ec) {
     int sig = 1;
     if (*(p + 1) == '^') {
         sig = 0;
@@ -346,8 +330,7 @@ static int matchbracketclass(int c, const char *p, const char *ec)
 
 
 static int singlematch(MatchState *ms, const char *s, const char *p,
-                       const char *ep)
-{
+                       const char *ep) {
     if (s >= ms->src_end)
         return 0;
     else {
@@ -367,8 +350,7 @@ static int singlematch(MatchState *ms, const char *s, const char *p,
 
 
 static const char *matchbalance(MatchState *ms, const char *s,
-                                const char *p)
-{
+                                const char *p) {
     if (p >= ms->p_end - 1)
         luaL_error(ms->L, "malformed pattern "
                    "(missing arguments to " LUA_QL("%%b") ")");
@@ -388,8 +370,7 @@ static const char *matchbalance(MatchState *ms, const char *s,
 
 
 static const char *max_expand(MatchState *ms, const char *s,
-                              const char *p, const char *ep)
-{
+                              const char *p, const char *ep) {
     ptrdiff_t i = 0;  /* counts maximum expand for item */
     while (singlematch(ms, s + i, p, ep))
         i++;
@@ -404,8 +385,7 @@ static const char *max_expand(MatchState *ms, const char *s,
 
 
 static const char *min_expand(MatchState *ms, const char *s,
-                              const char *p, const char *ep)
-{
+                              const char *p, const char *ep) {
     for (;;) {
         const char *res = match(ms, s, ep + 1);
         if (res != NULL)
@@ -418,8 +398,7 @@ static const char *min_expand(MatchState *ms, const char *s,
 
 
 static const char *start_capture(MatchState *ms, const char *s,
-                                 const char *p, int what)
-{
+                                 const char *p, int what) {
     const char *res;
     int level = ms->level;
     if (level >= LUA_MAXCAPTURES) luaL_error(ms->L, "too many captures");
@@ -433,8 +412,7 @@ static const char *start_capture(MatchState *ms, const char *s,
 
 
 static const char *end_capture(MatchState *ms, const char *s,
-                               const char *p)
-{
+                               const char *p) {
     int l = capture_to_close(ms);
     const char *res;
     ms->capture[l].len = s - ms->capture[l].init;  /* close capture */
@@ -444,20 +422,18 @@ static const char *end_capture(MatchState *ms, const char *s,
 }
 
 
-static const char *match_capture(MatchState *ms, const char *s, int l)
-{
+static const char *match_capture(MatchState *ms, const char *s, int l) {
     size_t len;
     l = check_capture(ms, l);
     len = ms->capture[l].len;
     if ((size_t)(ms->src_end - s) >= len &&
-        memcmp(ms->capture[l].init, s, len) == 0)
+            memcmp(ms->capture[l].init, s, len) == 0)
         return s + len;
     else return NULL;
 }
 
 
-static const char *match(MatchState *ms, const char *s, const char *p)
-{
+static const char *match(MatchState *ms, const char *s, const char *p) {
     if (ms->matchdepth-- == 0)
         luaL_error(ms->L, "pattern too complex");
 init: /* using goto's to optimize tail recursion */
@@ -500,7 +476,7 @@ init: /* using goto's to optimize tail recursion */
                         ep = classend(ms, p);  /* points to what is next */
                         previous = (s == ms->src_init) ? '\0' : *(s - 1);
                         if (!matchbracketclass(uchar(previous), p, ep - 1) &&
-                            matchbracketclass(uchar(*s), p, ep - 1)) {
+                                matchbracketclass(uchar(*s), p, ep - 1)) {
                             p = ep;
                             goto init;  /* return match(ms, s, ep); */
                         }
@@ -577,8 +553,7 @@ dflt: {  /* pattern class plus optional suffix */
 
 
 static const char *lmemfind(const char *s1, size_t l1,
-                            const char *s2, size_t l2)
-{
+                            const char *s2, size_t l2) {
     if (l2 == 0) return s1;  /* empty strings are everywhere */
     else if (l2 > l1) return NULL;  /* avoids a negative `l1' */
     else {
@@ -600,8 +575,7 @@ static const char *lmemfind(const char *s1, size_t l1,
 
 
 static void push_onecapture(MatchState *ms, int i, const char *s,
-                            const char *e)
-{
+                            const char *e) {
     if (i >= ms->level) {
         if (i == 0)  /* ms->level == 0, too */
             lua_pushlstring(ms->L, s, e - s);  /* add whole match */
@@ -618,8 +592,7 @@ static void push_onecapture(MatchState *ms, int i, const char *s,
 }
 
 
-static int push_captures(MatchState *ms, const char *s, const char *e)
-{
+static int push_captures(MatchState *ms, const char *s, const char *e) {
     int i;
     int nlevels = (ms->level == 0 && s) ? 1 : ms->level;
     luaL_checkstack(ms->L, nlevels, "too many captures");
@@ -630,8 +603,7 @@ static int push_captures(MatchState *ms, const char *s, const char *e)
 
 
 /* check whether pattern has no special characters */
-static int nospecials(const char *p, size_t l)
-{
+static int nospecials(const char *p, size_t l) {
     size_t upto = 0;
     do {
         if (strpbrk(p + upto, SPECIALS))
@@ -642,8 +614,7 @@ static int nospecials(const char *p, size_t l)
 }
 
 
-static int str_find_aux(lua_State *L, int find)
-{
+static int str_find_aux(lua_State *L, int find) {
     size_t ls, lp;
     const char *s = luaL_checklstring(L, 1, &ls);
     const char *p = luaL_checklstring(L, 2, &lp);
@@ -694,20 +665,17 @@ static int str_find_aux(lua_State *L, int find)
 }
 
 
-static int str_find(lua_State *L)
-{
+static int str_find(lua_State *L) {
     return str_find_aux(L, 1);
 }
 
 
-static int str_match(lua_State *L)
-{
+static int str_match(lua_State *L) {
     return str_find_aux(L, 0);
 }
 
 
-static int gmatch_aux(lua_State *L)
-{
+static int gmatch_aux(lua_State *L) {
     MatchState ms;
     size_t ls, lp;
     const char *s = lua_tolstring(L, lua_upvalueindex(1), &ls);
@@ -719,8 +687,8 @@ static int gmatch_aux(lua_State *L)
     ms.src_end = s + ls;
     ms.p_end = p + lp;
     for (src = s + (size_t)lua_tointeger(L, lua_upvalueindex(3));
-         src <= ms.src_end;
-         src++) {
+            src <= ms.src_end;
+            src++) {
         const char *e;
         ms.level = 0;
         lua_assert(ms.matchdepth == MAXCCALLS);
@@ -736,8 +704,7 @@ static int gmatch_aux(lua_State *L)
 }
 
 
-static int gmatch(lua_State *L)
-{
+static int gmatch(lua_State *L) {
     luaL_checkstring(L, 1);
     luaL_checkstring(L, 2);
     lua_settop(L, 2);
@@ -748,8 +715,7 @@ static int gmatch(lua_State *L)
 
 
 static void add_s(MatchState *ms, luaL_Buffer *b, const char *s,
-                  const char *e)
-{
+                  const char *e) {
     size_t l, i;
     const char *news = lua_tolstring(ms->L, 3, &l);
     for (i = 0; i < l; i++) {
@@ -774,8 +740,7 @@ static void add_s(MatchState *ms, luaL_Buffer *b, const char *s,
 
 
 static void add_value(MatchState *ms, luaL_Buffer *b, const char *s,
-                      const char *e, int tr)
-{
+                      const char *e, int tr) {
     lua_State *L = ms->L;
     switch (tr) {
         case LUA_TFUNCTION: {
@@ -804,8 +769,7 @@ static void add_value(MatchState *ms, luaL_Buffer *b, const char *s,
 }
 
 
-static int str_gsub(lua_State *L)
-{
+static int str_gsub(lua_State *L) {
     size_t srcl, lp;
     const char *src = luaL_checklstring(L, 1, &srcl);
     const char *p = luaL_checklstring(L, 2, &lp);
@@ -904,8 +868,7 @@ static int str_gsub(lua_State *L)
 #define MAX_FORMAT (sizeof(FLAGS) + sizeof(LUA_INTFRMLEN) + 10)
 
 
-static void addquoted(lua_State *L, luaL_Buffer *b, int arg)
-{
+static void addquoted(lua_State *L, luaL_Buffer *b, int arg) {
     size_t l;
     const char *s = luaL_checklstring(L, arg, &l);
     luaL_addchar(b, '"');
@@ -927,8 +890,7 @@ static void addquoted(lua_State *L, luaL_Buffer *b, int arg)
     luaL_addchar(b, '"');
 }
 
-static const char *scanformat(lua_State *L, const char *strfrmt, char *form)
-{
+static const char *scanformat(lua_State *L, const char *strfrmt, char *form) {
     const char *p = strfrmt;
     while (*p != '\0' && strchr(FLAGS, *p) != NULL) p++;  /* skip flags */
     if ((size_t)(p - strfrmt) >= sizeof(FLAGS) / sizeof(char))
@@ -953,8 +915,7 @@ static const char *scanformat(lua_State *L, const char *strfrmt, char *form)
 /*
 ** add length modifier into formats
 */
-static void addlenmod(char *form, const char *lenmod)
-{
+static void addlenmod(char *form, const char *lenmod) {
     size_t l = strlen(form);
     size_t lm = strlen(lenmod);
     char spec = form[l - 1];
@@ -964,8 +925,7 @@ static void addlenmod(char *form, const char *lenmod)
 }
 
 
-static int str_format(lua_State *L)
-{
+static int str_format(lua_State *L) {
     int top = lua_gettop(L);
     int arg = 1;
     size_t sfl;
@@ -1079,8 +1039,7 @@ static const luaL_Reg strlib[] = {
 };
 
 
-static void createmetatable(lua_State *L)
-{
+static void createmetatable(lua_State *L) {
     lua_createtable(L, 0, 1);  /* table to be metatable for strings */
     lua_pushliteral(L, "");  /* dummy string */
     lua_pushvalue(L, -2);  /* copy table */
@@ -1095,8 +1054,7 @@ static void createmetatable(lua_State *L)
 /*
 ** Open string library
 */
-LUAMOD_API int luaopen_string(lua_State *L)
-{
+LUAMOD_API int luaopen_string(lua_State *L) {
     luaL_newlib(L, strlib);
     createmetatable(L);
     return 1;
diff --git a/liblua/ltable.c b/liblua/ltable.c
index 0b3290a6f..5bcb93b47 100644
--- a/liblua/ltable.c
+++ b/liblua/ltable.c
@@ -77,8 +77,7 @@ static const Node dummynode_ = {
 /*
 ** hash for lua_Numbers
 */
-static Node *hashnum(const Table *t, lua_Number n)
-{
+static Node *hashnum(const Table *t, lua_Number n) {
     int i;
     luai_hashnum(i, n);
     if (i < 0) {
@@ -95,8 +94,7 @@ static Node *hashnum(const Table *t, lua_Number n)
 ** returns the `main' position of an element in a table (that is, the index
 ** of its hash value)
 */
-static Node *mainposition(const Table *t, const TValue *key)
-{
+static Node *mainposition(const Table *t, const TValue *key) {
     switch (ttype(key)) {
         case LUA_TNUMBER:
             return hashnum(t, nvalue(key));
@@ -126,8 +124,7 @@ static Node *mainposition(const Table *t, const TValue *key)
 ** returns the index for `key' if `key' is an appropriate key to live in
 ** the array part of the table, -1 otherwise.
 */
-static int arrayindex(const TValue *key)
-{
+static int arrayindex(const TValue *key) {
     if (ttisnumber(key)) {
         lua_Number n = nvalue(key);
         int k;
@@ -144,8 +141,7 @@ static int arrayindex(const TValue *key)
 ** elements in the array part, then elements in the hash part. The
 ** beginning of a traversal is signaled by -1.
 */
-static int findindex(lua_State *L, Table *t, StkId key)
-{
+static int findindex(lua_State *L, Table *t, StkId key) {
     int i;
     if (ttisnil(key)) return -1;  /* first iteration */
     i = arrayindex(key);
@@ -156,8 +152,8 @@ static int findindex(lua_State *L, Table *t, StkId key)
         for (;;) {  /* check whether `key' is somewhere in the chain */
             /* key may be dead already, but it is ok to use it in `next' */
             if (luaV_rawequalobj(gkey(n), key) ||
-                (ttisdeadkey(gkey(n)) && iscollectable(key) &&
-                 deadvalue(gkey(n)) == gcvalue(key))) {
+                    (ttisdeadkey(gkey(n)) && iscollectable(key) &&
+                     deadvalue(gkey(n)) == gcvalue(key))) {
                 i = cast_int(n - gnode(t, 0));  /* key index in hash table */
                 /* hash elements are numbered after array ones */
                 return i + t->sizearray;
@@ -169,8 +165,7 @@ static int findindex(lua_State *L, Table *t, StkId key)
 }
 
 
-int luaH_next(lua_State *L, Table *t, StkId key)
-{
+int luaH_next(lua_State *L, Table *t, StkId key) {
     int i = findindex(L, t, key);  /* find original element */
     for (i++; i < t->sizearray; i++) {  /* try first array part */
         if (!ttisnil(&t->array[i])) {  /* a non-nil value? */
@@ -197,8 +192,7 @@ int luaH_next(lua_State *L, Table *t, StkId key)
 */
 
 
-static int computesizes(int nums[], int *narray)
-{
+static int computesizes(int nums[], int *narray) {
     int i;
     int twotoi;  /* 2^i */
     int a = 0;  /* number of elements smaller than 2^i */
@@ -220,8 +214,7 @@ static int computesizes(int nums[], int *narray)
 }
 
 
-static int countint(const TValue *key, int *nums)
-{
+static int countint(const TValue *key, int *nums) {
     int k = arrayindex(key);
     if (0 < k && k <= MAXASIZE) {  /* is `key' an appropriate array index? */
         nums[luaO_ceillog2(k)]++;  /* count as such */
@@ -231,8 +224,7 @@ static int countint(const TValue *key, int *nums)
 }
 
 
-static int numusearray(const Table *t, int *nums)
-{
+static int numusearray(const Table *t, int *nums) {
     int lg;
     int ttlg;  /* 2^lg */
     int ause = 0;  /* summation of `nums' */
@@ -257,8 +249,7 @@ static int numusearray(const Table *t, int *nums)
 }
 
 
-static int numusehash(const Table *t, int *nums, int *pnasize)
-{
+static int numusehash(const Table *t, int *nums, int *pnasize) {
     int totaluse = 0;  /* total number of elements */
     int ause = 0;  /* summation of `nums' */
     int i = sizenode(t);
@@ -274,8 +265,7 @@ static int numusehash(const Table *t, int *nums, int *pnasize)
 }
 
 
-static void setarrayvector(lua_State *L, Table *t, int size)
-{
+static void setarrayvector(lua_State *L, Table *t, int size) {
     int i;
     luaM_reallocvector(L, t->array, t->sizearray, size, TValue);
     for (i = t->sizearray; i < size; i++)
@@ -284,8 +274,7 @@ static void setarrayvector(lua_State *L, Table *t, int size)
 }
 
 
-static void setnodevector(lua_State *L, Table *t, int size)
-{
+static void setnodevector(lua_State *L, Table *t, int size) {
     int lsize;
     if (size == 0) {  /* no elements to hash part? */
         t->node = cast(Node *, dummynode);  /* use common `dummynode' */
@@ -309,8 +298,7 @@ static void setnodevector(lua_State *L, Table *t, int size)
 }
 
 
-void luaH_resize(lua_State *L, Table *t, int nasize, int nhsize)
-{
+void luaH_resize(lua_State *L, Table *t, int nasize, int nhsize) {
     int i;
     int oldasize = t->sizearray;
     int oldhsize = t->lsizenode;
@@ -343,15 +331,13 @@ void luaH_resize(lua_State *L, Table *t, int nasize, int nhsize)
 }
 
 
-void luaH_resizearray(lua_State *L, Table *t, int nasize)
-{
+void luaH_resizearray(lua_State *L, Table *t, int nasize) {
     int nsize = isdummy(t->node) ? 0 : sizenode(t);
     luaH_resize(L, t, nasize, nsize);
 }
 
 
-static void rehash(lua_State *L, Table *t, const TValue *ek)
-{
+static void rehash(lua_State *L, Table *t, const TValue *ek) {
     int nasize, na;
     int nums[MAXBITS + 1]; /* nums[i] = number of keys with 2^(i-1) < k <= 2^i */
     int i;
@@ -376,8 +362,7 @@ static void rehash(lua_State *L, Table *t, const TValue *ek)
 */
 
 
-Table *luaH_new(lua_State *L)
-{
+Table *luaH_new(lua_State *L) {
     Table *t = &luaC_newobj(L, LUA_TTABLE, sizeof(Table), NULL, 0)->h;
     t->metatable = NULL;
     t->flags = cast_byte(~0);
@@ -388,8 +373,7 @@ Table *luaH_new(lua_State *L)
 }
 
 
-void luaH_free(lua_State *L, Table *t)
-{
+void luaH_free(lua_State *L, Table *t) {
     if (!isdummy(t->node))
         luaM_freearray(L, t->node, cast(size_t, sizenode(t)));
     luaM_freearray(L, t->array, t->sizearray);
@@ -397,8 +381,7 @@ void luaH_free(lua_State *L, Table *t)
 }
 
 
-static Node *getfreepos(Table *t)
-{
+static Node *getfreepos(Table *t) {
     while (t->lastfree > t->node) {
         t->lastfree--;
         if (ttisnil(gkey(t->lastfree)))
@@ -416,8 +399,7 @@ static Node *getfreepos(Table *t)
 ** put new key in its main position; otherwise (colliding node is in its main
 ** position), new key goes to an empty position.
 */
-TValue *luaH_newkey(lua_State *L, Table *t, const TValue *key)
-{
+TValue *luaH_newkey(lua_State *L, Table *t, const TValue *key) {
     Node *mp;
     if (ttisnil(key)) luaG_runerror(L, "table index is nil");
     else if (ttisnumber(key) && luai_numisnan(L, nvalue(key)))
@@ -457,8 +439,7 @@ TValue *luaH_newkey(lua_State *L, Table *t, const TValue *key)
 /*
 ** search function for integers
 */
-const TValue *luaH_getint(Table *t, int key)
-{
+const TValue *luaH_getint(Table *t, int key) {
     /* (1 <= key && key <= t->sizearray) */
     if (cast(unsigned int, key - 1) < cast(unsigned int, t->sizearray))
         return &t->array[key - 1];
@@ -478,8 +459,7 @@ const TValue *luaH_getint(Table *t, int key)
 /*
 ** search function for short strings
 */
-const TValue *luaH_getstr(Table *t, TString *key)
-{
+const TValue *luaH_getstr(Table *t, TString *key) {
     Node *n = hashstr(t, key);
     lua_assert(key->tsv.tt == LUA_TSHRSTR);
     do {  /* check whether `key' is somewhere in the chain */
@@ -494,8 +474,7 @@ const TValue *luaH_getstr(Table *t, TString *key)
 /*
 ** main search function
 */
-const TValue *luaH_get(Table *t, const TValue *key)
-{
+const TValue *luaH_get(Table *t, const TValue *key) {
     switch (ttype(key)) {
         case LUA_TSHRSTR:
             return luaH_getstr(t, rawtsvalue(key));
@@ -526,8 +505,7 @@ const TValue *luaH_get(Table *t, const TValue *key)
 ** beware: when using this function you probably need to check a GC
 ** barrier and invalidate the TM cache.
 */
-TValue *luaH_set(lua_State *L, Table *t, const TValue *key)
-{
+TValue *luaH_set(lua_State *L, Table *t, const TValue *key) {
     const TValue *p = luaH_get(t, key);
     if (p != luaO_nilobject)
         return cast(TValue *, p);
@@ -535,8 +513,7 @@ TValue *luaH_set(lua_State *L, Table *t, const TValue *key)
 }
 
 
-void luaH_setint(lua_State *L, Table *t, int key, TValue *value)
-{
+void luaH_setint(lua_State *L, Table *t, int key, TValue *value) {
     const TValue *p = luaH_getint(t, key);
     TValue *cell;
     if (p != luaO_nilobject)
@@ -550,8 +527,7 @@ void luaH_setint(lua_State *L, Table *t, int key, TValue *value)
 }
 
 
-static int unbound_search(Table *t, unsigned int j)
-{
+static int unbound_search(Table *t, unsigned int j) {
     unsigned int i = j;  /* i is zero or a present index */
     j++;
     /* find `i' and `j' such that i is present and j is not */
@@ -579,8 +555,7 @@ static int unbound_search(Table *t, unsigned int j)
 ** Try to find a boundary in table `t'. A `boundary' is an integer index
 ** such that t[i] is non-nil and t[i+1] is nil (and 0 if t[1] is nil).
 */
-int luaH_getn(Table *t)
-{
+int luaH_getn(Table *t) {
     unsigned int j = t->sizearray;
     if (j > 0 && ttisnil(&t->array[j - 1])) {
         /* there is a boundary in the array part: (binary) search for it */
@@ -602,8 +577,7 @@ int luaH_getn(Table *t)
 
 #if defined(LUA_DEBUG)
 
-Node *luaH_mainposition(const Table *t, const TValue *key)
-{
+Node *luaH_mainposition(const Table *t, const TValue *key) {
     return mainposition(t, key);
 }
 
diff --git a/liblua/ltablib.c b/liblua/ltablib.c
index 1ea05dbc5..db8ee7f62 100644
--- a/liblua/ltablib.c
+++ b/liblua/ltablib.c
@@ -21,8 +21,7 @@
 
 
 #if defined(LUA_COMPAT_MAXN)
-static int maxn(lua_State *L)
-{
+static int maxn(lua_State *L) {
     lua_Number max = 0;
     luaL_checktype(L, 1, LUA_TTABLE);
     lua_pushnil(L);  /* first key */
@@ -39,8 +38,7 @@ static int maxn(lua_State *L)
 #endif
 
 
-static int tinsert(lua_State *L)
-{
+static int tinsert(lua_State *L) {
     int e = aux_getn(L, 1) + 1;  /* first empty element */
     int pos;  /* where to insert new element */
     switch (lua_gettop(L)) {
@@ -67,8 +65,7 @@ static int tinsert(lua_State *L)
 }
 
 
-static int tremove(lua_State *L)
-{
+static int tremove(lua_State *L) {
     int size = aux_getn(L, 1);
     int pos = luaL_optint(L, 2, size);
     if (pos != size)  /* validate 'pos' if given */
@@ -84,8 +81,7 @@ static int tremove(lua_State *L)
 }
 
 
-static void addfield(lua_State *L, luaL_Buffer *b, int i)
-{
+static void addfield(lua_State *L, luaL_Buffer *b, int i) {
     lua_rawgeti(L, 1, i);
     if (!lua_isstring(L, -1))
         luaL_error(L, "invalid value (%s) at index %d in table for "
@@ -94,8 +90,7 @@ static void addfield(lua_State *L, luaL_Buffer *b, int i)
 }
 
 
-static int tconcat(lua_State *L)
-{
+static int tconcat(lua_State *L) {
     luaL_Buffer b;
     size_t lsep;
     int i, last;
@@ -121,8 +116,7 @@ static int tconcat(lua_State *L)
 ** =======================================================
 */
 
-static int pack(lua_State *L)
-{
+static int pack(lua_State *L) {
     int n = lua_gettop(L);  /* number of elements to pack */
     lua_createtable(L, n, 1);  /* create result table */
     lua_pushinteger(L, n);
@@ -139,8 +133,7 @@ static int pack(lua_State *L)
 }
 
 
-static int unpack(lua_State *L)
-{
+static int unpack(lua_State *L) {
     int i, e, n;
     luaL_checktype(L, 1, LUA_TTABLE);
     i = luaL_optint(L, 2, 1);
@@ -168,14 +161,12 @@ static int unpack(lua_State *L)
 */
 
 
-static void set2(lua_State *L, int i, int j)
-{
+static void set2(lua_State *L, int i, int j) {
     lua_rawseti(L, 1, i);
     lua_rawseti(L, 1, j);
 }
 
-static int sort_comp(lua_State *L, int a, int b)
-{
+static int sort_comp(lua_State *L, int a, int b) {
     if (!lua_isnil(L, 2)) {  /* function? */
         int res;
         lua_pushvalue(L, 2);
@@ -189,8 +180,7 @@ static int sort_comp(lua_State *L, int a, int b)
         return lua_compare(L, a, b, LUA_OPLT);
 }
 
-static void auxsort(lua_State *L, int l, int u)
-{
+static void auxsort(lua_State *L, int l, int u) {
     while (l < u) {  /* for tail recursion */
         int i, j;
         /* sort elements a[l], a[(l+u)/2] and a[u] */
@@ -257,8 +247,7 @@ static void auxsort(lua_State *L, int l, int u)
     }  /* repeat the routine for the larger one */
 }
 
-static int sort(lua_State *L)
-{
+static int sort(lua_State *L) {
     int n = aux_getn(L, 1);
     luaL_checkstack(L, 40, "");  /* assume array is smaller than 2^40 */
     if (!lua_isnoneornil(L, 2))  /* is there a 2nd argument? */
@@ -285,8 +274,7 @@ static const luaL_Reg tab_funcs[] = {
 };
 
 
-LUAMOD_API int luaopen_table(lua_State *L)
-{
+LUAMOD_API int luaopen_table(lua_State *L) {
     luaL_newlib(L, tab_funcs);
 #if defined(LUA_COMPAT_UNPACK)
     /* _G.unpack = table.unpack */
diff --git a/liblua/ltm.c b/liblua/ltm.c
index b451ba4e4..d4cc888aa 100644
--- a/liblua/ltm.c
+++ b/liblua/ltm.c
@@ -29,8 +29,7 @@ LUAI_DDEF const char *const luaT_typenames_[LUA_TOTALTAGS] = {
 };
 
 
-void luaT_init(lua_State *L)
-{
+void luaT_init(lua_State *L) {
     static const char *const luaT_eventname[] = {  /* ORDER TM */
         "__index", "__newindex",
         "__gc", "__mode", "__len", "__eq",
@@ -50,8 +49,7 @@ void luaT_init(lua_State *L)
 ** function to be used with macro "fasttm": optimized for absence of
 ** tag methods
 */
-const TValue *luaT_gettm(Table *events, TMS event, TString *ename)
-{
+const TValue *luaT_gettm(Table *events, TMS event, TString *ename) {
     const TValue *tm = luaH_getstr(events, ename);
     lua_assert(event <= TM_EQ);
     if (ttisnil(tm)) {  /* no tag method? */
@@ -61,8 +59,7 @@ const TValue *luaT_gettm(Table *events, TMS event, TString *ename)
 }
 
 
-const TValue *luaT_gettmbyobj(lua_State *L, const TValue *o, TMS event)
-{
+const TValue *luaT_gettmbyobj(lua_State *L, const TValue *o, TMS event) {
     Table *mt;
     switch (ttypenv(o)) {
         case LUA_TTABLE:
diff --git a/liblua/lua.c b/liblua/lua.c
index 17345d2c3..bcc55febc 100644
--- a/liblua/lua.c
+++ b/liblua/lua.c
@@ -91,24 +91,21 @@ static const char *progname = LUA_PROGNAME;
 
 
 
-static void lstop(lua_State *L, lua_Debug *ar)
-{
+static void lstop(lua_State *L, lua_Debug *ar) {
     (void)ar;  /* unused arg. */
     lua_sethook(L, NULL, 0, 0);
     luaL_error(L, "interrupted!");
 }
 
 
-static void laction(int i)
-{
+static void laction(int i) {
     signal(i, SIG_DFL); /* if another SIGINT happens before lstop,
                               terminate process (default action) */
     lua_sethook(globalL, lstop, LUA_MASKCALL | LUA_MASKRET | LUA_MASKCOUNT, 1);
 }
 
 
-static void print_usage(const char *badoption)
-{
+static void print_usage(const char *badoption) {
     luai_writestringerror("%s: ", progname);
     if (badoption[1] == 'e' || badoption[1] == 'l')
         luai_writestringerror("'%s' needs argument\n", badoption);
@@ -129,15 +126,13 @@ static void print_usage(const char *badoption)
 }
 
 
-static void l_message(const char *pname, const char *msg)
-{
+static void l_message(const char *pname, const char *msg) {
     if (pname) luai_writestringerror("%s: ", pname);
     luai_writestringerror("%s\n", msg);
 }
 
 
-static int report(lua_State *L, int status)
-{
+static int report(lua_State *L, int status) {
     if (status != LUA_OK && !lua_isnil(L, -1)) {
         const char *msg = lua_tostring(L, -1);
         if (msg == NULL) msg = "(error object is not a string)";
@@ -151,8 +146,7 @@ static int report(lua_State *L, int status)
 
 
 /* the next function is called unprotected, so it must avoid errors */
-static void finalreport(lua_State *L, int status)
-{
+static void finalreport(lua_State *L, int status) {
     if (status != LUA_OK) {
         const char *msg = (lua_type(L, -1) == LUA_TSTRING) ? lua_tostring(L, -1)
                           : NULL;
@@ -163,8 +157,7 @@ static void finalreport(lua_State *L, int status)
 }
 
 
-static int traceback(lua_State *L)
-{
+static int traceback(lua_State *L) {
     const char *msg = lua_tostring(L, 1);
     if (msg)
         luaL_traceback(L, L, msg, 1);
@@ -176,8 +169,7 @@ static int traceback(lua_State *L)
 }
 
 
-static int docall(lua_State *L, int narg, int nres)
-{
+static int docall(lua_State *L, int narg, int nres) {
     int status;
     int base = lua_gettop(L) - narg;  /* function index */
     lua_pushcfunction(L, traceback);  /* push traceback function */
@@ -191,15 +183,13 @@ static int docall(lua_State *L, int narg, int nres)
 }
 
 
-static void print_version(void)
-{
+static void print_version(void) {
     luai_writestring(LUA_COPYRIGHT, strlen(LUA_COPYRIGHT));
     luai_writeline();
 }
 
 
-static int getargs(lua_State *L, char **argv, int n)
-{
+static int getargs(lua_State *L, char **argv, int n) {
     int narg;
     int i;
     int argc = 0;
@@ -217,24 +207,21 @@ static int getargs(lua_State *L, char **argv, int n)
 }
 
 
-static int dofile(lua_State *L, const char *name)
-{
+static int dofile(lua_State *L, const char *name) {
     int status = luaL_loadfile(L, name);
     if (status == LUA_OK) status = docall(L, 0, 0);
     return report(L, status);
 }
 
 
-static int dostring(lua_State *L, const char *s, const char *name)
-{
+static int dostring(lua_State *L, const char *s, const char *name) {
     int status = luaL_loadbuffer(L, s, strlen(s), name);
     if (status == LUA_OK) status = docall(L, 0, 0);
     return report(L, status);
 }
 
 
-static int dolibrary(lua_State *L, const char *name)
-{
+static int dolibrary(lua_State *L, const char *name) {
     int status;
     lua_getglobal(L, "require");
     lua_pushstring(L, name);
@@ -245,8 +232,7 @@ static int dolibrary(lua_State *L, const char *name)
 }
 
 
-static const char *get_prompt(lua_State *L, int firstline)
-{
+static const char *get_prompt(lua_State *L, int firstline) {
     const char *p;
     lua_getglobal(L, firstline ? "_PROMPT" : "_PROMPT2");
     p = lua_tostring(L, -1);
@@ -258,8 +244,7 @@ static const char *get_prompt(lua_State *L, int firstline)
 #define EOFMARK "<eof>"
 #define marklen (sizeof(EOFMARK)/sizeof(char) - 1)
 
-static int incomplete(lua_State *L, int status)
-{
+static int incomplete(lua_State *L, int status) {
     if (status == LUA_ERRSYNTAX) {
         size_t lmsg;
         const char *msg = lua_tolstring(L, -1, &lmsg);
@@ -272,8 +257,7 @@ static int incomplete(lua_State *L, int status)
 }
 
 
-static int pushline(lua_State *L, int firstline)
-{
+static int pushline(lua_State *L, int firstline) {
     char buffer[LUA_MAXINPUT];
     char *b = buffer;
     size_t l;
@@ -294,8 +278,7 @@ static int pushline(lua_State *L, int firstline)
 }
 
 
-static int loadline(lua_State *L)
-{
+static int loadline(lua_State *L) {
     int status;
     lua_settop(L, 0);
     if (!pushline(L, 1))
@@ -317,8 +300,7 @@ static int loadline(lua_State *L)
 }
 
 
-static void dotty(lua_State *L)
-{
+static void dotty(lua_State *L) {
     int status;
     const char *oldprogname = progname;
     progname = NULL;
@@ -341,8 +323,7 @@ static void dotty(lua_State *L)
 }
 
 
-static int handle_script(lua_State *L, char **argv, int n)
-{
+static int handle_script(lua_State *L, char **argv, int n) {
     int status;
     const char *fname;
     int narg = getargs(L, argv, n);  /* collect arguments */
@@ -373,8 +354,7 @@ static int handle_script(lua_State *L, char **argv, int n)
 #define num_has 4 /* number of 'has_*' */
 
 
-static int collectargs(char **argv, int *args)
-{
+static int collectargs(char **argv, int *args) {
     int i;
     for (i = 1; argv[i] != NULL; i++) {
         if (argv[i][0] != '-')  /* not an option? */
@@ -412,8 +392,7 @@ static int collectargs(char **argv, int *args)
 }
 
 
-static int runargs(lua_State *L, char **argv, int n)
-{
+static int runargs(lua_State *L, char **argv, int n) {
     int i;
     for (i = 1; i < n; i++) {
         lua_assert(argv[i][0] == '-');
@@ -442,8 +421,7 @@ static int runargs(lua_State *L, char **argv, int n)
 }
 
 
-static int handle_luainit(lua_State *L)
-{
+static int handle_luainit(lua_State *L) {
     const char *name = "=" LUA_INITVERSION;
     const char *init = getenv(name + 1);
     if (init == NULL) {
@@ -458,8 +436,7 @@ static int handle_luainit(lua_State *L)
 }
 
 
-static int pmain(lua_State *L)
-{
+static int pmain(lua_State *L) {
     int argc = (int)lua_tointeger(L, 1);
     char **argv = (char **)lua_touserdata(L, 2);
     int script;
@@ -500,8 +477,7 @@ static int pmain(lua_State *L)
 }
 
 
-int main(int argc, char **argv)
-{
+int main(int argc, char **argv) {
     int status, result;
     lua_State *L = luaL_newstate();  /* create state */
     if (L == NULL) {
diff --git a/liblua/luac.c b/liblua/luac.c
index b4aac7222..bf46f82cf 100644
--- a/liblua/luac.c
+++ b/liblua/luac.c
@@ -32,20 +32,17 @@ static char Output[] = { OUTPUT };      /* default output file name */
 static const char *output = Output;     /* actual output file name */
 static const char *progname = PROGNAME; /* actual program name */
 
-static void fatal(const char *message)
-{
+static void fatal(const char *message) {
     fprintf(stderr, "%s: %s\n", progname, message);
     exit(EXIT_FAILURE);
 }
 
-static void cannot(const char *what)
-{
+static void cannot(const char *what) {
     fprintf(stderr, "%s: cannot %s %s: %s\n", progname, what, output, strerror(errno));
     exit(EXIT_FAILURE);
 }
 
-static void usage(const char *message)
-{
+static void usage(const char *message) {
     if (*message == '-')
         fprintf(stderr, "%s: unrecognized option " LUA_QS "\n", progname, message);
     else
@@ -66,8 +63,7 @@ static void usage(const char *message)
 
 #define IS(s) (strcmp(argv[i],s)==0)
 
-static int doargs(int argc, char *argv[])
-{
+static int doargs(int argc, char *argv[]) {
     int i;
     int version = 0;
     if (argv[0] != NULL && *argv[0] != 0) progname = argv[0];
@@ -109,8 +105,7 @@ static int doargs(int argc, char *argv[])
 
 #define FUNCTION "(function()end)();"
 
-static const char *reader(lua_State *L, void *ud, size_t *size)
-{
+static const char *reader(lua_State *L, void *ud, size_t *size) {
     UNUSED(L);
     if ((*(int *)ud)--) {
         *size = sizeof(FUNCTION) - 1;
@@ -123,8 +118,7 @@ static const char *reader(lua_State *L, void *ud, size_t *size)
 
 #define toproto(L,i) getproto(L->top+(i))
 
-static const Proto *combine(lua_State *L, int n)
-{
+static const Proto *combine(lua_State *L, int n) {
     if (n == 1)
         return toproto(L, -1);
     else {
@@ -141,14 +135,12 @@ static const Proto *combine(lua_State *L, int n)
     }
 }
 
-static int writer(lua_State *L, const void *p, size_t size, void *u)
-{
+static int writer(lua_State *L, const void *p, size_t size, void *u) {
     UNUSED(L);
     return (fwrite(p, size, 1, (FILE *)u) != 1) && (size != 0);
 }
 
-static int pmain(lua_State *L)
-{
+static int pmain(lua_State *L) {
     int argc = (int)lua_tointeger(L, 1);
     char **argv = (char **)lua_touserdata(L, 2);
     const Proto *f;
@@ -172,8 +164,7 @@ static int pmain(lua_State *L)
     return 0;
 }
 
-int main(int argc, char *argv[])
-{
+int main(int argc, char *argv[]) {
     lua_State *L;
     int i = doargs(argc, argv);
     argc -= i;
@@ -207,8 +198,7 @@ int main(int argc, char *argv[])
 
 #define VOID(p) ((const void*)(p))
 
-static void PrintString(const TString *ts)
-{
+static void PrintString(const TString *ts) {
     const char *s = getstr(ts);
     size_t i, n = ts->tsv.len;
     printf("%c", '"');
@@ -252,8 +242,7 @@ static void PrintString(const TString *ts)
     printf("%c", '"');
 }
 
-static void PrintConstant(const Proto *f, int i)
-{
+static void PrintConstant(const Proto *f, int i) {
     const TValue *o = &f->k[i];
     switch (ttype(o)) {
         case LUA_TNIL:
@@ -277,8 +266,7 @@ static void PrintConstant(const Proto *f, int i)
 #define UPVALNAME(x) ((f->upvalues[x].name) ? getstr(f->upvalues[x].name) : "-")
 #define MYK(x) (-1-(x))
 
-static void PrintCode(const Proto *f)
-{
+static void PrintCode(const Proto *f) {
     const Instruction *code = f->code;
     int pc, n = f->sizecode;
     for (pc = 0; pc < n; pc++) {
@@ -380,8 +368,7 @@ static void PrintCode(const Proto *f)
 #define SS(x) ((x==1)?"":"s")
 #define S(x)  (int)(x),SS(x)
 
-static void PrintHeader(const Proto *f)
-{
+static void PrintHeader(const Proto *f) {
     const char *s = f->source ? getstr(f->source) : "=?";
     if (*s == '@' || *s == '=')
         s++;
@@ -400,8 +387,7 @@ static void PrintHeader(const Proto *f)
            S(f->sizelocvars), S(f->sizek), S(f->sizep));
 }
 
-static void PrintDebug(const Proto *f)
-{
+static void PrintDebug(const Proto *f) {
     int i, n;
     n = f->sizek;
     printf("constants (%d) for %p:\n", n, VOID(f));
@@ -424,8 +410,7 @@ static void PrintDebug(const Proto *f)
     }
 }
 
-static void PrintFunction(const Proto *f, int full)
-{
+static void PrintFunction(const Proto *f, int full) {
     int i, n = f->sizep;
     PrintHeader(f);
     PrintCode(f);
diff --git a/liblua/lundump.c b/liblua/lundump.c
index b353d3717..980c72564 100644
--- a/liblua/lundump.c
+++ b/liblua/lundump.c
@@ -27,8 +27,7 @@ typedef struct {
     const char *name;
 } LoadState;
 
-static l_noret error(LoadState *S, const char *why)
-{
+static l_noret error(LoadState *S, const char *why) {
     luaO_pushfstring(S->L, "%s: %s precompiled chunk", S->name, why);
     luaD_throw(S->L, LUA_ERRSYNTAX);
 }
@@ -42,35 +41,30 @@ static l_noret error(LoadState *S, const char *why)
 #define luai_verifycode(L,b,f) /* empty */
 #endif
 
-static void LoadBlock(LoadState *S, void *b, size_t size)
-{
+static void LoadBlock(LoadState *S, void *b, size_t size) {
     if (luaZ_read(S->Z, b, size) != 0) error(S, "truncated");
 }
 
-static int LoadChar(LoadState *S)
-{
+static int LoadChar(LoadState *S) {
     char x;
     LoadVar(S, x);
     return x;
 }
 
-static int LoadInt(LoadState *S)
-{
+static int LoadInt(LoadState *S) {
     int x;
     LoadVar(S, x);
     if (x < 0) error(S, "corrupted");
     return x;
 }
 
-static lua_Number LoadNumber(LoadState *S)
-{
+static lua_Number LoadNumber(LoadState *S) {
     lua_Number x;
     LoadVar(S, x);
     return x;
 }
 
-static TString *LoadString(LoadState *S)
-{
+static TString *LoadString(LoadState *S) {
     size_t size;
     LoadVar(S, size);
     if (size == 0)
@@ -82,8 +76,7 @@ static TString *LoadString(LoadState *S)
     }
 }
 
-static void LoadCode(LoadState *S, Proto *f)
-{
+static void LoadCode(LoadState *S, Proto *f) {
     int n = LoadInt(S);
     f->code = luaM_newvector(S->L, n, Instruction);
     f->sizecode = n;
@@ -92,8 +85,7 @@ static void LoadCode(LoadState *S, Proto *f)
 
 static void LoadFunction(LoadState *S, Proto *f);
 
-static void LoadConstants(LoadState *S, Proto *f)
-{
+static void LoadConstants(LoadState *S, Proto *f) {
     int i, n;
     n = LoadInt(S);
     f->k = luaM_newvector(S->L, n, TValue);
@@ -129,8 +121,7 @@ static void LoadConstants(LoadState *S, Proto *f)
     }
 }
 
-static void LoadUpvalues(LoadState *S, Proto *f)
-{
+static void LoadUpvalues(LoadState *S, Proto *f) {
     int i, n;
     n = LoadInt(S);
     f->upvalues = luaM_newvector(S->L, n, Upvaldesc);
@@ -142,8 +133,7 @@ static void LoadUpvalues(LoadState *S, Proto *f)
     }
 }
 
-static void LoadDebug(LoadState *S, Proto *f)
-{
+static void LoadDebug(LoadState *S, Proto *f) {
     int i, n;
     f->source = LoadString(S);
     n = LoadInt(S);
@@ -163,8 +153,7 @@ static void LoadDebug(LoadState *S, Proto *f)
     for (i = 0; i < n; i++) f->upvalues[i].name = LoadString(S);
 }
 
-static void LoadFunction(LoadState *S, Proto *f)
-{
+static void LoadFunction(LoadState *S, Proto *f) {
     f->linedefined = LoadInt(S);
     f->lastlinedefined = LoadInt(S);
     f->numparams = LoadByte(S);
@@ -182,8 +171,7 @@ static void LoadFunction(LoadState *S, Proto *f)
 #define N2 N1+2
 #define N3 N2+6
 
-static void LoadHeader(LoadState *S)
-{
+static void LoadHeader(LoadState *S) {
     lu_byte h[LUAC_HEADERSIZE];
     lu_byte s[LUAC_HEADERSIZE];
     luaU_header(h);
@@ -199,8 +187,7 @@ static void LoadHeader(LoadState *S)
 /*
 ** load precompiled chunk
 */
-Closure *luaU_undump(lua_State *L, ZIO *Z, Mbuffer *buff, const char *name)
-{
+Closure *luaU_undump(lua_State *L, ZIO *Z, Mbuffer *buff, const char *name) {
     LoadState S;
     Closure *cl;
     if (*name == '@' || *name == '=')
@@ -237,8 +224,7 @@ Closure *luaU_undump(lua_State *L, ZIO *Z, Mbuffer *buff, const char *name)
 * if you change the code below be sure to update LoadHeader and FORMAT above
 * and LUAC_HEADERSIZE in lundump.h
 */
-void luaU_header(lu_byte *h)
-{
+void luaU_header(lu_byte *h) {
     int x = 1;
     memcpy(h, LUA_SIGNATURE, sizeof(LUA_SIGNATURE) - sizeof(char));
     h += sizeof(LUA_SIGNATURE) - sizeof(char);
diff --git a/liblua/lvm.c b/liblua/lvm.c
index 1d0fc18c1..14a03573c 100644
--- a/liblua/lvm.c
+++ b/liblua/lvm.c
@@ -32,8 +32,7 @@
 #define MAXTAGLOOP 100
 
 
-const TValue *luaV_tonumber(const TValue *obj, TValue *n)
-{
+const TValue *luaV_tonumber(const TValue *obj, TValue *n) {
     lua_Number num;
     if (ttisnumber(obj)) return obj;
     if (ttisstring(obj) && luaO_str2d(svalue(obj), tsvalue(obj)->len, &num)) {
@@ -44,8 +43,7 @@ const TValue *luaV_tonumber(const TValue *obj, TValue *n)
 }
 
 
-int luaV_tostring(lua_State *L, StkId obj)
-{
+int luaV_tostring(lua_State *L, StkId obj) {
     if (!ttisnumber(obj))
         return 0;
     else {
@@ -58,8 +56,7 @@ int luaV_tostring(lua_State *L, StkId obj)
 }
 
 
-static void traceexec(lua_State *L)
-{
+static void traceexec(lua_State *L) {
     CallInfo *ci = L->ci;
     lu_byte mask = L->hookmask;
     int counthook = ((mask & LUA_MASKCOUNT) && L->hookcount == 0);
@@ -76,8 +73,8 @@ static void traceexec(lua_State *L)
         int npc = pcRel(ci->u.l.savedpc, p);
         int newline = getfuncline(p, npc);
         if (npc == 0 ||  /* call linehook when enter a new function, */
-            ci->u.l.savedpc <= L->oldpc ||  /* when jump back (loop), or when */
-            newline != getfuncline(p, pcRel(L->oldpc, p)))  /* enter a new line */
+                ci->u.l.savedpc <= L->oldpc ||  /* when jump back (loop), or when */
+                newline != getfuncline(p, pcRel(L->oldpc, p)))  /* enter a new line */
             luaD_hook(L, LUA_HOOKLINE, newline);  /* call line hook */
     }
     L->oldpc = ci->u.l.savedpc;
@@ -93,8 +90,7 @@ static void traceexec(lua_State *L)
 
 
 static void callTM(lua_State *L, const TValue *f, const TValue *p1,
-                   const TValue *p2, TValue *p3, int hasres)
-{
+                   const TValue *p2, TValue *p3, int hasres) {
     ptrdiff_t result = savestack(L, p3);
     setobj2s(L, L->top++, f);  /* push function */
     setobj2s(L, L->top++, p1);  /* 1st argument */
@@ -110,8 +106,7 @@ static void callTM(lua_State *L, const TValue *f, const TValue *p1,
 }
 
 
-void luaV_gettable(lua_State *L, const TValue *t, TValue *key, StkId val)
-{
+void luaV_gettable(lua_State *L, const TValue *t, TValue *key, StkId val) {
     int loop;
     for (loop = 0; loop < MAXTAGLOOP; loop++) {
         const TValue *tm;
@@ -119,7 +114,7 @@ void luaV_gettable(lua_State *L, const TValue *t, TValue *key, StkId val)
             Table *h = hvalue(t);
             const TValue *res = luaH_get(h, key); /* do a primitive get */
             if (!ttisnil(res) ||  /* result is not nil? */
-                (tm = fasttm(L, h->metatable, TM_INDEX)) == NULL) { /* or no TM? */
+                    (tm = fasttm(L, h->metatable, TM_INDEX)) == NULL) { /* or no TM? */
                 setobj2s(L, val, res);
                 return;
             }
@@ -136,8 +131,7 @@ void luaV_gettable(lua_State *L, const TValue *t, TValue *key, StkId val)
 }
 
 
-void luaV_settable(lua_State *L, const TValue *t, TValue *key, StkId val)
-{
+void luaV_settable(lua_State *L, const TValue *t, TValue *key, StkId val) {
     int loop;
     for (loop = 0; loop < MAXTAGLOOP; loop++) {
         const TValue *tm;
@@ -147,13 +141,13 @@ void luaV_settable(lua_State *L, const TValue *t, TValue *key, StkId val)
             /* if previous value is not nil, there must be a previous entry
                in the table; moreover, a metamethod has no relevance */
             if (!ttisnil(oldval) ||
-                /* previous value is nil; must check the metamethod */
-                ((tm = fasttm(L, h->metatable, TM_NEWINDEX)) == NULL &&
-                 /* no metamethod; is there a previous entry in the table? */
-                 (oldval != luaO_nilobject ||
-                  /* no previous entry; must create one. (The next test is
-                     always true; we only need the assignment.) */
-                  (oldval = luaH_newkey(L, h, key), 1)))) {
+                    /* previous value is nil; must check the metamethod */
+                    ((tm = fasttm(L, h->metatable, TM_NEWINDEX)) == NULL &&
+                     /* no metamethod; is there a previous entry in the table? */
+                     (oldval != luaO_nilobject ||
+                      /* no previous entry; must create one. (The next test is
+                         always true; we only need the assignment.) */
+                      (oldval = luaH_newkey(L, h, key), 1)))) {
                 /* no metamethod and (now) there is an entry with given key */
                 setobj2t(L, oldval, val);  /* assign new value to that entry */
                 invalidateTMcache(h);
@@ -176,8 +170,7 @@ void luaV_settable(lua_State *L, const TValue *t, TValue *key, StkId val)
 
 
 static int call_binTM(lua_State *L, const TValue *p1, const TValue *p2,
-                      StkId res, TMS event)
-{
+                      StkId res, TMS event) {
     const TValue *tm = luaT_gettmbyobj(L, p1, event);  /* try first operand */
     if (ttisnil(tm))
         tm = luaT_gettmbyobj(L, p2, event);  /* try second operand */
@@ -188,8 +181,7 @@ static int call_binTM(lua_State *L, const TValue *p1, const TValue *p2,
 
 
 static const TValue *get_equalTM(lua_State *L, Table *mt1, Table *mt2,
-                                 TMS event)
-{
+                                 TMS event) {
     const TValue *tm1 = fasttm(L, mt1, event);
     const TValue *tm2;
     if (tm1 == NULL) return NULL;  /* no metamethod */
@@ -203,8 +195,7 @@ static const TValue *get_equalTM(lua_State *L, Table *mt1, Table *mt2,
 
 
 static int call_orderTM(lua_State *L, const TValue *p1, const TValue *p2,
-                        TMS event)
-{
+                        TMS event) {
     if (!call_binTM(L, p1, p2, L->top, event))
         return -1;  /* no metamethod */
     else
@@ -212,8 +203,7 @@ static int call_orderTM(lua_State *L, const TValue *p1, const TValue *p2,
 }
 
 
-static int l_strcmp(const TString *ls, const TString *rs)
-{
+static int l_strcmp(const TString *ls, const TString *rs) {
     const char *l = getstr(ls);
     size_t ll = ls->tsv.len;
     const char *r = getstr(rs);
@@ -238,8 +228,7 @@ static int l_strcmp(const TString *ls, const TString *rs)
 }
 
 
-int luaV_lessthan(lua_State *L, const TValue *l, const TValue *r)
-{
+int luaV_lessthan(lua_State *L, const TValue *l, const TValue *r) {
     int res;
     if (ttisnumber(l) && ttisnumber(r))
         return luai_numlt(L, nvalue(l), nvalue(r));
@@ -251,8 +240,7 @@ int luaV_lessthan(lua_State *L, const TValue *l, const TValue *r)
 }
 
 
-int luaV_lessequal(lua_State *L, const TValue *l, const TValue *r)
-{
+int luaV_lessequal(lua_State *L, const TValue *l, const TValue *r) {
     int res;
     if (ttisnumber(l) && ttisnumber(r))
         return luai_numle(L, nvalue(l), nvalue(r));
@@ -269,8 +257,7 @@ int luaV_lessequal(lua_State *L, const TValue *l, const TValue *r)
 /*
 ** equality of Lua values. L == NULL means raw equality (no metamethods)
 */
-int luaV_equalobj_(lua_State *L, const TValue *t1, const TValue *t2)
-{
+int luaV_equalobj_(lua_State *L, const TValue *t1, const TValue *t2) {
     const TValue *tm;
     lua_assert(ttisequal(t1, t2));
     switch (ttype(t1)) {
@@ -310,8 +297,7 @@ int luaV_equalobj_(lua_State *L, const TValue *t1, const TValue *t2)
 }
 
 
-void luaV_concat(lua_State *L, int total)
-{
+void luaV_concat(lua_State *L, int total) {
     lua_assert(total >= 2);
     do {
         StkId top = L->top;
@@ -351,8 +337,7 @@ void luaV_concat(lua_State *L, int total)
 }
 
 
-void luaV_objlen(lua_State *L, StkId ra, const TValue *rb)
-{
+void luaV_objlen(lua_State *L, StkId ra, const TValue *rb) {
     const TValue *tm;
     switch (ttypenv(rb)) {
         case LUA_TTABLE: {
@@ -378,12 +363,11 @@ void luaV_objlen(lua_State *L, StkId ra, const TValue *rb)
 
 
 void luaV_arith(lua_State *L, StkId ra, const TValue *rb,
-                const TValue *rc, TMS op)
-{
+                const TValue *rc, TMS op) {
     TValue tempb, tempc;
     const TValue *b, *c;
     if ((b = luaV_tonumber(rb, &tempb)) != NULL &&
-        (c = luaV_tonumber(rc, &tempc)) != NULL) {
+            (c = luaV_tonumber(rc, &tempc)) != NULL) {
         lua_Number res = luaO_arith(op - TM_ADD + LUA_OPADD, nvalue(b), nvalue(c));
         setnvalue(ra, res);
     } else if (!call_binTM(L, rb, rc, ra, op))
@@ -396,8 +380,7 @@ void luaV_arith(lua_State *L, StkId ra, const TValue *rb,
 ** whether there is a cached closure with the same upvalues needed by
 ** new closure to be created.
 */
-static Closure *getcached(Proto *p, UpVal **encup, StkId base)
-{
+static Closure *getcached(Proto *p, UpVal **encup, StkId base) {
     Closure *c = p->cache;
     if (c != NULL) {  /* is there a cached closure? */
         int nup = p->sizeupvalues;
@@ -420,8 +403,7 @@ static Closure *getcached(Proto *p, UpVal **encup, StkId base)
 ** original value of that field.
 */
 static void pushclosure(lua_State *L, Proto *p, UpVal **encup, StkId base,
-                        StkId ra)
-{
+                        StkId ra) {
     int nup = p->sizeupvalues;
     Upvaldesc *uv = p->upvalues;
     int i;
@@ -442,8 +424,7 @@ static void pushclosure(lua_State *L, Proto *p, UpVal **encup, StkId base,
 /*
 ** finish execution of an opcode interrupted by an yield
 */
-void luaV_finishOp(lua_State *L)
-{
+void luaV_finishOp(lua_State *L) {
     CallInfo *ci = L->ci;
     StkId base = ci->u.l.base;
     Instruction inst = *(ci->u.l.savedpc - 1);  /* interrupted instruction */
@@ -471,7 +452,7 @@ void luaV_finishOp(lua_State *L)
             /* metamethod should not be called when operand is K */
             lua_assert(!ISK(GETARG_B(inst)));
             if (op == OP_LE &&  /* "<=" using "<" instead? */
-                ttisnil(luaT_gettmbyobj(L, base + GETARG_B(inst), TM_LE)))
+                    ttisnil(luaT_gettmbyobj(L, base + GETARG_B(inst), TM_LE)))
                 res = !res;  /* invert result */
             lua_assert(GET_OPCODE(*ci->u.l.savedpc) == OP_JMP);
             if (res != GETARG_A(inst))  /* condition failed? */
@@ -567,8 +548,7 @@ void luaV_finishOp(lua_State *L)
 #define vmcase(l,b)   case l: {b}  break;
 #define vmcasenb(l,b) case l: {b} /* nb = no break */
 
-void luaV_execute(lua_State *L)
-{
+void luaV_execute(lua_State *L) {
     CallInfo *ci = L->ci;
     LClosure *cl;
     TValue *k;
@@ -583,7 +563,7 @@ newframe:  /* reentry point when frame changes (call/return) */
         Instruction i = *(ci->u.l.savedpc++);
         StkId ra;
         if ((L->hookmask & (LUA_MASKLINE | LUA_MASKCOUNT)) &&
-            (--L->hookcount == 0 || L->hookmask & LUA_MASKLINE)) {
+                (--L->hookcount == 0 || L->hookmask & LUA_MASKLINE)) {
             Protect(traceexec(L));
         }
         /* WARNING: several calls may realloc the stack and invalidate `ra' */
diff --git a/liblua/lzio.c b/liblua/lzio.c
index e607a2166..62b8548e9 100644
--- a/liblua/lzio.c
+++ b/liblua/lzio.c
@@ -18,8 +18,7 @@
 #include "lzio.h"
 
 
-int luaZ_fill(ZIO *z)
-{
+int luaZ_fill(ZIO *z) {
     size_t size;
     lua_State *L = z->L;
     const char *buff;
@@ -34,8 +33,7 @@ int luaZ_fill(ZIO *z)
 }
 
 
-void luaZ_init(lua_State *L, ZIO *z, lua_Reader reader, void *data)
-{
+void luaZ_init(lua_State *L, ZIO *z, lua_Reader reader, void *data) {
     z->L = L;
     z->reader = reader;
     z->data = data;
@@ -45,8 +43,7 @@ void luaZ_init(lua_State *L, ZIO *z, lua_Reader reader, void *data)
 
 
 /* --------------------------------------------------------------- read --- */
-size_t luaZ_read(ZIO *z, void *b, size_t n)
-{
+size_t luaZ_read(ZIO *z, void *b, size_t n) {
     while (n) {
         size_t m;
         if (z->n == 0) {  /* no bytes in buffer? */
@@ -68,8 +65,7 @@ size_t luaZ_read(ZIO *z, void *b, size_t n)
 }
 
 /* ------------------------------------------------------------------------ */
-char *luaZ_openspace(lua_State *L, Mbuffer *buff, size_t n)
-{
+char *luaZ_openspace(lua_State *L, Mbuffer *buff, size_t n) {
     if (n > buff->buffsize) {
         if (n < LUA_MINBUFFER) n = LUA_MINBUFFER;
         luaZ_resizebuffer(L, buff, n);
diff --git a/tools/mfkey/crapto1.c b/tools/mfkey/crapto1.c
index 690e3a4d6..41fe19db3 100755
--- a/tools/mfkey/crapto1.c
+++ b/tools/mfkey/crapto1.c
@@ -22,8 +22,7 @@
 
 #if !defined LOWMEM && defined __GNUC__
 static uint8_t filterlut[1 << 20];
-static void __attribute__((constructor)) fill_lut()
-{
+static void __attribute__((constructor)) fill_lut() {
     uint32_t i;
     for (i = 0; i < 1 << 20; ++i)
         filterlut[i] = filter(i);
@@ -50,8 +49,7 @@ typedef struct bucket_info {
 
 static void bucket_sort_intersect(uint32_t *const estart, uint32_t *const estop,
                                   uint32_t *const ostart, uint32_t *const ostop,
-                                  bucket_info_t *bucket_info, bucket_array_t bucket)
-{
+                                  bucket_info_t *bucket_info, bucket_array_t bucket) {
     uint32_t *p1, *p2;
     uint32_t *start[2];
     uint32_t *stop[2];
@@ -99,8 +97,7 @@ static void bucket_sort_intersect(uint32_t *const estart, uint32_t *const estop,
 /** update_contribution
  * helper, calculates the partial linear feedback contributions and puts in MSB
  */
-static inline void update_contribution(uint32_t *item, const uint32_t mask1, const uint32_t mask2)
-{
+static inline void update_contribution(uint32_t *item, const uint32_t mask1, const uint32_t mask2) {
     uint32_t p = *item >> 25;
 
     p = p << 1 | parity(*item & mask1);
@@ -111,8 +108,7 @@ static inline void update_contribution(uint32_t *item, const uint32_t mask1, con
 /** extend_table
  * using a bit of the keystream extend the table of possible lfsr states
  */
-static inline void extend_table(uint32_t *tbl, uint32_t **end, int bit, int m1, int m2, uint32_t in)
-{
+static inline void extend_table(uint32_t *tbl, uint32_t **end, int bit, int m1, int m2, uint32_t in) {
     in <<= 24;
     for (*tbl <<= 1; tbl <= *end; *++tbl <<= 1)
         if (filter(*tbl) ^ filter(*tbl | 1)) {
@@ -132,8 +128,7 @@ static inline void extend_table(uint32_t *tbl, uint32_t **end, int bit, int m1,
 /** extend_table_simple
  * using a bit of the keystream extend the table of possible lfsr states
  */
-static inline void extend_table_simple(uint32_t *tbl, uint32_t **end, int bit)
-{
+static inline void extend_table_simple(uint32_t *tbl, uint32_t **end, int bit) {
     for (*tbl <<= 1; tbl <= *end; *++tbl <<= 1) {
         if (filter(*tbl) ^ filter(*tbl | 1)) {  // replace
             *tbl |= filter(*tbl) ^ bit;
@@ -151,8 +146,7 @@ static inline void extend_table_simple(uint32_t *tbl, uint32_t **end, int bit)
 static struct Crypto1State *
 recover(uint32_t *o_head, uint32_t *o_tail, uint32_t oks,
         uint32_t *e_head, uint32_t *e_tail, uint32_t eks, int rem,
-        struct Crypto1State *sl, uint32_t in, bucket_array_t bucket)
-{
+        struct Crypto1State *sl, uint32_t in, bucket_array_t bucket) {
     uint32_t *o, *e;
     bucket_info_t bucket_info;
 
@@ -196,8 +190,7 @@ recover(uint32_t *o_head, uint32_t *o_tail, uint32_t oks,
  * additionally you can use the in parameter to specify the value
  * that was fed into the lfsr at the time the keystream was generated
  */
-struct Crypto1State *lfsr_recovery32(uint32_t ks2, uint32_t in)
-{
+struct Crypto1State *lfsr_recovery32(uint32_t ks2, uint32_t in) {
     struct Crypto1State *statelist;
     uint32_t *odd_head = 0, *odd_tail = 0, oks = 0;
     uint32_t *even_head = 0, *even_tail = 0, eks = 0;
@@ -288,8 +281,7 @@ static const uint32_t C2[] = { 0x1A822E0, 0x21A822E0, 0x21A822E0};
 /** Reverse 64 bits of keystream into possible cipher states
  * Variation mentioned in the paper. Somewhat optimized version
  */
-struct Crypto1State *lfsr_recovery64(uint32_t ks2, uint32_t ks3)
-{
+struct Crypto1State *lfsr_recovery64(uint32_t ks2, uint32_t ks3) {
     struct Crypto1State *statelist, *sl;
     uint8_t oks[32], eks[32], hi[32];
     uint32_t low = 0,  win = 0;
@@ -359,8 +351,7 @@ continue2:
 /** lfsr_rollback_bit
  * Rollback the shift register in order to get previous states
  */
-uint8_t lfsr_rollback_bit(struct Crypto1State *s, uint32_t in, int fb)
-{
+uint8_t lfsr_rollback_bit(struct Crypto1State *s, uint32_t in, int fb) {
     int out;
     uint8_t ret;
     uint32_t t;
@@ -380,8 +371,7 @@ uint8_t lfsr_rollback_bit(struct Crypto1State *s, uint32_t in, int fb)
 /** lfsr_rollback_byte
  * Rollback the shift register in order to get previous states
  */
-uint8_t lfsr_rollback_byte(struct Crypto1State *s, uint32_t in, int fb)
-{
+uint8_t lfsr_rollback_byte(struct Crypto1State *s, uint32_t in, int fb) {
     /*
     int i, ret = 0;
     for (i = 7; i >= 0; --i)
@@ -402,8 +392,7 @@ uint8_t lfsr_rollback_byte(struct Crypto1State *s, uint32_t in, int fb)
 /** lfsr_rollback_word
  * Rollback the shift register in order to get previous states
  */
-uint32_t lfsr_rollback_word(struct Crypto1State *s, uint32_t in, int fb)
-{
+uint32_t lfsr_rollback_word(struct Crypto1State *s, uint32_t in, int fb) {
     /*
     int i;
     uint32_t ret = 0;
@@ -454,8 +443,7 @@ uint32_t lfsr_rollback_word(struct Crypto1State *s, uint32_t in, int fb)
  * x,y valid tag nonces, then prng_successor(x, nonce_distance(x, y)) = y
  */
 static uint16_t *dist = 0;
-int nonce_distance(uint32_t from, uint32_t to)
-{
+int nonce_distance(uint32_t from, uint32_t to) {
     uint16_t x, i;
     if (!dist) {
         dist = malloc(2 << 16);
@@ -485,8 +473,7 @@ static uint32_t fastfwd[2][8] = {
  * encrypt the NACK which is observed when varying only the 3 last bits of Nr
  * only correct iff [NR_3] ^ NR_3 does not depend on Nr_3
  */
-uint32_t *lfsr_prefix_ks(uint8_t ks[8], int isodd)
-{
+uint32_t *lfsr_prefix_ks(uint8_t ks[8], int isodd) {
     uint32_t *candidates = malloc(4 << 10);
     if (!candidates) return 0;
 
@@ -511,8 +498,7 @@ uint32_t *lfsr_prefix_ks(uint8_t ks[8], int isodd)
 /** check_pfx_parity
  * helper function which eliminates possible secret states using parity bits
  */
-static struct Crypto1State *check_pfx_parity(uint32_t prefix, uint32_t rresp, uint8_t parities[8][8], uint32_t odd, uint32_t even, struct Crypto1State *sl)
-{
+static struct Crypto1State *check_pfx_parity(uint32_t prefix, uint32_t rresp, uint8_t parities[8][8], uint32_t odd, uint32_t even, struct Crypto1State *sl) {
     uint32_t ks1, nr, ks2, rr, ks3, c, good = 1;
 
     for (c = 0; good && c < 8; ++c) {
@@ -549,8 +535,7 @@ static struct Crypto1State *check_pfx_parity(uint32_t prefix, uint32_t rresp, ui
  * tag nonce was fed in
  */
 
-struct Crypto1State *lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8])
-{
+struct Crypto1State *lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8]) {
     struct Crypto1State *statelist, *s;
     uint32_t *odd, *even, *o, *e, top;
 
diff --git a/tools/mfkey/crapto1.h b/tools/mfkey/crapto1.h
index acede65a1..db8b5cba2 100755
--- a/tools/mfkey/crapto1.h
+++ b/tools/mfkey/crapto1.h
@@ -60,8 +60,7 @@ int nonce_distance(uint32_t from, uint32_t to);
 #define LF_POLY_EVEN (0x870804)
 #define BIT(x, n) ((x) >> (n) & 1)
 #define BEBIT(x, n) BIT(x, (n) ^ 24)
-static inline int parity(uint32_t x)
-{
+static inline int parity(uint32_t x) {
 #if !defined __i386__ || !defined __GNUC__
     x ^= x >> 16;
     x ^= x >> 8;
@@ -78,8 +77,7 @@ static inline int parity(uint32_t x)
     return x;
 #endif
 }
-static inline int filter(uint32_t const x)
-{
+static inline int filter(uint32_t const x) {
     uint32_t f;
 
     f  = 0xf22c0 >> (x       & 0xf) & 16;
diff --git a/tools/mfkey/crypto1.c b/tools/mfkey/crypto1.c
index 248529433..cdb0ffc14 100755
--- a/tools/mfkey/crypto1.c
+++ b/tools/mfkey/crypto1.c
@@ -20,8 +20,7 @@
 #include "crapto1.h"
 #include <stdlib.h>
 
-struct Crypto1State *crypto1_create(uint64_t key)
-{
+struct Crypto1State *crypto1_create(uint64_t key) {
     struct Crypto1State *s = malloc(sizeof(*s));
     if (!s) return NULL;
 
@@ -35,20 +34,17 @@ struct Crypto1State *crypto1_create(uint64_t key)
     }
     return s;
 }
-void crypto1_destroy(struct Crypto1State *state)
-{
+void crypto1_destroy(struct Crypto1State *state) {
     free(state);
 }
-void crypto1_get_lfsr(struct Crypto1State *state, uint64_t *lfsr)
-{
+void crypto1_get_lfsr(struct Crypto1State *state, uint64_t *lfsr) {
     int i;
     for (*lfsr = 0, i = 23; i >= 0; --i) {
         *lfsr = *lfsr << 1 | BIT(state->odd, i ^ 3);
         *lfsr = *lfsr << 1 | BIT(state->even, i ^ 3);
     }
 }
-uint8_t crypto1_bit(struct Crypto1State *s, uint8_t in, int is_encrypted)
-{
+uint8_t crypto1_bit(struct Crypto1State *s, uint8_t in, int is_encrypted) {
     uint32_t feedin;
     uint32_t tmp;
     uint8_t ret = filter(s->odd);
@@ -65,8 +61,7 @@ uint8_t crypto1_bit(struct Crypto1State *s, uint8_t in, int is_encrypted)
 
     return ret;
 }
-uint8_t crypto1_byte(struct Crypto1State *s, uint8_t in, int is_encrypted)
-{
+uint8_t crypto1_byte(struct Crypto1State *s, uint8_t in, int is_encrypted) {
     /*
     uint8_t i, ret = 0;
 
@@ -85,8 +80,7 @@ uint8_t crypto1_byte(struct Crypto1State *s, uint8_t in, int is_encrypted)
     ret |= crypto1_bit(s, BIT(in, 7), is_encrypted) << 7;
     return ret;
 }
-uint32_t crypto1_word(struct Crypto1State *s, uint32_t in, int is_encrypted)
-{
+uint32_t crypto1_word(struct Crypto1State *s, uint32_t in, int is_encrypted) {
     /*
     uint32_t i, ret = 0;
 
@@ -136,8 +130,7 @@ uint32_t crypto1_word(struct Crypto1State *s, uint32_t in, int is_encrypted)
 /* prng_successor
  * helper used to obscure the keystream during authentication
  */
-uint32_t prng_successor(uint32_t x, uint32_t n)
-{
+uint32_t prng_successor(uint32_t x, uint32_t n) {
     SWAPENDIAN(x);
     while (n--)
         x = x >> 1 | (x >> 16 ^ x >> 18 ^ x >> 19 ^ x >> 21) << 31;
diff --git a/tools/mfkey/mfkey32.c b/tools/mfkey/mfkey32.c
index 5afc7ed80..01a8fe8cc 100755
--- a/tools/mfkey/mfkey32.c
+++ b/tools/mfkey/mfkey32.c
@@ -4,8 +4,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-int main(int argc, char *argv[])
-{
+int main(int argc, char *argv[]) {
     struct Crypto1State *s, *t;
     uint64_t key;     // recovered key
     uint32_t uid;     // serial number
diff --git a/tools/mfkey/mfkey32v2.c b/tools/mfkey/mfkey32v2.c
index f934ee8a5..9575d55e3 100644
--- a/tools/mfkey/mfkey32v2.c
+++ b/tools/mfkey/mfkey32v2.c
@@ -4,8 +4,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-int main(int argc, char *argv[])
-{
+int main(int argc, char *argv[]) {
     struct Crypto1State *s, *t;
     uint64_t key;     // recovered key
     uint32_t uid;     // serial number
diff --git a/tools/mfkey/mfkey64.c b/tools/mfkey/mfkey64.c
index 6dba2c782..0bb115297 100755
--- a/tools/mfkey/mfkey64.c
+++ b/tools/mfkey/mfkey64.c
@@ -5,8 +5,7 @@
 #include <inttypes.h>
 #include "crapto1.h"
 
-int main(int argc, char *argv[])
-{
+int main(int argc, char *argv[]) {
     struct Crypto1State *revstate;
     uint64_t key;     // recovered key
     uint32_t uid;     // serial number
diff --git a/tools/nonce2key/crapto1.c b/tools/nonce2key/crapto1.c
index 322e9f262..559e12872 100644
--- a/tools/nonce2key/crapto1.c
+++ b/tools/nonce2key/crapto1.c
@@ -22,8 +22,7 @@
 
 #if !defined LOWMEM && defined __GNUC__
 static uint8_t filterlut[1 << 20];
-static void __attribute__((constructor)) fill_lut()
-{
+static void __attribute__((constructor)) fill_lut() {
     uint32_t i;
     for (i = 0; i < 1 << 20; ++i)
         filterlut[i] = filter(i);
@@ -50,8 +49,7 @@ typedef struct bucket_info {
 
 static void bucket_sort_intersect(uint32_t *const estart, uint32_t *const estop,
                                   uint32_t *const ostart, uint32_t *const ostop,
-                                  bucket_info_t *bucket_info, bucket_array_t bucket)
-{
+                                  bucket_info_t *bucket_info, bucket_array_t bucket) {
     uint32_t *p1, *p2;
     uint32_t *start[2];
     uint32_t *stop[2];
@@ -98,8 +96,7 @@ static void bucket_sort_intersect(uint32_t *const estart, uint32_t *const estop,
 /** update_contribution
  * helper, calculates the partial linear feedback contributions and puts in MSB
  */
-static inline void update_contribution(uint32_t *item, const uint32_t mask1, const uint32_t mask2)
-{
+static inline void update_contribution(uint32_t *item, const uint32_t mask1, const uint32_t mask2) {
     uint32_t p = *item >> 25;
 
     p = p << 1 | parity(*item & mask1);
@@ -110,8 +107,7 @@ static inline void update_contribution(uint32_t *item, const uint32_t mask1, con
 /** extend_table
  * using a bit of the keystream extend the table of possible lfsr states
  */
-static inline void extend_table(uint32_t *tbl, uint32_t **end, int bit, int m1, int m2, uint32_t in)
-{
+static inline void extend_table(uint32_t *tbl, uint32_t **end, int bit, int m1, int m2, uint32_t in) {
     in <<= 24;
     for (*tbl <<= 1; tbl <= *end; *++tbl <<= 1)
         if (filter(*tbl) ^ filter(*tbl | 1)) {
@@ -131,8 +127,7 @@ static inline void extend_table(uint32_t *tbl, uint32_t **end, int bit, int m1,
 /** extend_table_simple
  * using a bit of the keystream extend the table of possible lfsr states
  */
-static inline void extend_table_simple(uint32_t *tbl, uint32_t **end, int bit)
-{
+static inline void extend_table_simple(uint32_t *tbl, uint32_t **end, int bit) {
     for (*tbl <<= 1; tbl <= *end; *++tbl <<= 1) {
         if (filter(*tbl) ^ filter(*tbl | 1)) {  // replace
             *tbl |= filter(*tbl) ^ bit;
@@ -150,8 +145,7 @@ static inline void extend_table_simple(uint32_t *tbl, uint32_t **end, int bit)
 static struct Crypto1State *
 recover(uint32_t *o_head, uint32_t *o_tail, uint32_t oks,
         uint32_t *e_head, uint32_t *e_tail, uint32_t eks, int rem,
-        struct Crypto1State *sl, uint32_t in, bucket_array_t bucket)
-{
+        struct Crypto1State *sl, uint32_t in, bucket_array_t bucket) {
     uint32_t *o, *e;
     bucket_info_t bucket_info;
 
@@ -195,8 +189,7 @@ recover(uint32_t *o_head, uint32_t *o_tail, uint32_t oks,
  * additionally you can use the in parameter to specify the value
  * that was fed into the lfsr at the time the keystream was generated
  */
-struct Crypto1State *lfsr_recovery32(uint32_t ks2, uint32_t in)
-{
+struct Crypto1State *lfsr_recovery32(uint32_t ks2, uint32_t in) {
     struct Crypto1State *statelist;
     uint32_t *odd_head = 0, *odd_tail = 0, oks = 0;
     uint32_t *even_head = 0, *even_tail = 0, eks = 0;
@@ -287,8 +280,7 @@ static const uint32_t C2[] = { 0x1A822E0, 0x21A822E0, 0x21A822E0};
 /** Reverse 64 bits of keystream into possible cipher states
  * Variation mentioned in the paper. Somewhat optimized version
  */
-struct Crypto1State *lfsr_recovery64(uint32_t ks2, uint32_t ks3)
-{
+struct Crypto1State *lfsr_recovery64(uint32_t ks2, uint32_t ks3) {
     struct Crypto1State *statelist, *sl;
     uint8_t oks[32], eks[32], hi[32];
     uint32_t low = 0,  win = 0;
@@ -358,8 +350,7 @@ continue2:
 /** lfsr_rollback_bit
  * Rollback the shift register in order to get previous states
  */
-uint8_t lfsr_rollback_bit(struct Crypto1State *s, uint32_t in, int fb)
-{
+uint8_t lfsr_rollback_bit(struct Crypto1State *s, uint32_t in, int fb) {
     int out;
     uint8_t ret;
     uint32_t t;
@@ -379,8 +370,7 @@ uint8_t lfsr_rollback_bit(struct Crypto1State *s, uint32_t in, int fb)
 /** lfsr_rollback_byte
  * Rollback the shift register in order to get previous states
  */
-uint8_t lfsr_rollback_byte(struct Crypto1State *s, uint32_t in, int fb)
-{
+uint8_t lfsr_rollback_byte(struct Crypto1State *s, uint32_t in, int fb) {
     /*
     int i, ret = 0;
     for (i = 7; i >= 0; --i)
@@ -401,8 +391,7 @@ uint8_t lfsr_rollback_byte(struct Crypto1State *s, uint32_t in, int fb)
 /** lfsr_rollback_word
  * Rollback the shift register in order to get previous states
  */
-uint32_t lfsr_rollback_word(struct Crypto1State *s, uint32_t in, int fb)
-{
+uint32_t lfsr_rollback_word(struct Crypto1State *s, uint32_t in, int fb) {
     /*
     int i;
     uint32_t ret = 0;
@@ -453,8 +442,7 @@ uint32_t lfsr_rollback_word(struct Crypto1State *s, uint32_t in, int fb)
  * x,y valid tag nonces, then prng_successor(x, nonce_distance(x, y)) = y
  */
 static uint16_t *dist = 0;
-int nonce_distance(uint32_t from, uint32_t to)
-{
+int nonce_distance(uint32_t from, uint32_t to) {
     uint16_t x, i;
     if (!dist) {
         dist = malloc(2 << 16);
@@ -484,8 +472,7 @@ static uint32_t fastfwd[2][8] = {
  * encrypt the NACK which is observed when varying only the 3 last bits of Nr
  * only correct iff [NR_3] ^ NR_3 does not depend on Nr_3
  */
-uint32_t *lfsr_prefix_ks(uint8_t ks[8], int isodd)
-{
+uint32_t *lfsr_prefix_ks(uint8_t ks[8], int isodd) {
     uint32_t *candidates = malloc(4 << 10);
     if (!candidates) return 0;
 
@@ -510,8 +497,7 @@ uint32_t *lfsr_prefix_ks(uint8_t ks[8], int isodd)
 /** check_pfx_parity
  * helper function which eliminates possible secret states using parity bits
  */
-static struct Crypto1State *check_pfx_parity(uint32_t prefix, uint32_t rresp, uint8_t parities[8][8], uint32_t odd, uint32_t even, struct Crypto1State *sl)
-{
+static struct Crypto1State *check_pfx_parity(uint32_t prefix, uint32_t rresp, uint8_t parities[8][8], uint32_t odd, uint32_t even, struct Crypto1State *sl) {
     uint32_t ks1, nr, ks2, rr, ks3, c, good = 1;
 
     for (c = 0; good && c < 8; ++c) {
@@ -548,8 +534,7 @@ static struct Crypto1State *check_pfx_parity(uint32_t prefix, uint32_t rresp, ui
  * tag nonce was fed in
  */
 
-struct Crypto1State *lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8])
-{
+struct Crypto1State *lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8]) {
     struct Crypto1State *statelist, *s;
     uint32_t *odd, *even, *o, *e, top;
 
diff --git a/tools/nonce2key/crapto1.h b/tools/nonce2key/crapto1.h
index acede65a1..db8b5cba2 100644
--- a/tools/nonce2key/crapto1.h
+++ b/tools/nonce2key/crapto1.h
@@ -60,8 +60,7 @@ int nonce_distance(uint32_t from, uint32_t to);
 #define LF_POLY_EVEN (0x870804)
 #define BIT(x, n) ((x) >> (n) & 1)
 #define BEBIT(x, n) BIT(x, (n) ^ 24)
-static inline int parity(uint32_t x)
-{
+static inline int parity(uint32_t x) {
 #if !defined __i386__ || !defined __GNUC__
     x ^= x >> 16;
     x ^= x >> 8;
@@ -78,8 +77,7 @@ static inline int parity(uint32_t x)
     return x;
 #endif
 }
-static inline int filter(uint32_t const x)
-{
+static inline int filter(uint32_t const x) {
     uint32_t f;
 
     f  = 0xf22c0 >> (x       & 0xf) & 16;
diff --git a/tools/nonce2key/crypto1.c b/tools/nonce2key/crypto1.c
index 248529433..cdb0ffc14 100644
--- a/tools/nonce2key/crypto1.c
+++ b/tools/nonce2key/crypto1.c
@@ -20,8 +20,7 @@
 #include "crapto1.h"
 #include <stdlib.h>
 
-struct Crypto1State *crypto1_create(uint64_t key)
-{
+struct Crypto1State *crypto1_create(uint64_t key) {
     struct Crypto1State *s = malloc(sizeof(*s));
     if (!s) return NULL;
 
@@ -35,20 +34,17 @@ struct Crypto1State *crypto1_create(uint64_t key)
     }
     return s;
 }
-void crypto1_destroy(struct Crypto1State *state)
-{
+void crypto1_destroy(struct Crypto1State *state) {
     free(state);
 }
-void crypto1_get_lfsr(struct Crypto1State *state, uint64_t *lfsr)
-{
+void crypto1_get_lfsr(struct Crypto1State *state, uint64_t *lfsr) {
     int i;
     for (*lfsr = 0, i = 23; i >= 0; --i) {
         *lfsr = *lfsr << 1 | BIT(state->odd, i ^ 3);
         *lfsr = *lfsr << 1 | BIT(state->even, i ^ 3);
     }
 }
-uint8_t crypto1_bit(struct Crypto1State *s, uint8_t in, int is_encrypted)
-{
+uint8_t crypto1_bit(struct Crypto1State *s, uint8_t in, int is_encrypted) {
     uint32_t feedin;
     uint32_t tmp;
     uint8_t ret = filter(s->odd);
@@ -65,8 +61,7 @@ uint8_t crypto1_bit(struct Crypto1State *s, uint8_t in, int is_encrypted)
 
     return ret;
 }
-uint8_t crypto1_byte(struct Crypto1State *s, uint8_t in, int is_encrypted)
-{
+uint8_t crypto1_byte(struct Crypto1State *s, uint8_t in, int is_encrypted) {
     /*
     uint8_t i, ret = 0;
 
@@ -85,8 +80,7 @@ uint8_t crypto1_byte(struct Crypto1State *s, uint8_t in, int is_encrypted)
     ret |= crypto1_bit(s, BIT(in, 7), is_encrypted) << 7;
     return ret;
 }
-uint32_t crypto1_word(struct Crypto1State *s, uint32_t in, int is_encrypted)
-{
+uint32_t crypto1_word(struct Crypto1State *s, uint32_t in, int is_encrypted) {
     /*
     uint32_t i, ret = 0;
 
@@ -136,8 +130,7 @@ uint32_t crypto1_word(struct Crypto1State *s, uint32_t in, int is_encrypted)
 /* prng_successor
  * helper used to obscure the keystream during authentication
  */
-uint32_t prng_successor(uint32_t x, uint32_t n)
-{
+uint32_t prng_successor(uint32_t x, uint32_t n) {
     SWAPENDIAN(x);
     while (n--)
         x = x >> 1 | (x >> 16 ^ x >> 18 ^ x >> 19 ^ x >> 21) << 31;
diff --git a/tools/nonce2key/nonce2key.c b/tools/nonce2key/nonce2key.c
index 1b5ee8e47..7c1514a28 100644
--- a/tools/nonce2key/nonce2key.c
+++ b/tools/nonce2key/nonce2key.c
@@ -3,8 +3,7 @@
 #include <inttypes.h>
 #include <stdio.h>
 
-int main(const int argc, const char *argv[])
-{
+int main(const int argc, const char *argv[]) {
     struct Crypto1State *state;
     uint32_t pos, uid, nt, nr, rr, nr_diff;
     uint8_t bt, i, ks3x[8], par[8][8];
diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index 37d2cea44..95e9ce070 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -73,8 +73,7 @@ struct timeval timeout = {
     .tv_usec = 30000  // 30 000 micro seconds
 };
 
-serial_port uart_open(const char *pcPortName)
-{
+serial_port uart_open(const char *pcPortName) {
     serial_port_unix *sp = calloc(sizeof(serial_port_unix), sizeof(uint8_t));
     if (sp == 0) return INVALID_SERIAL_PORT;
 
@@ -215,8 +214,7 @@ serial_port uart_open(const char *pcPortName)
     return sp;
 }
 
-void uart_close(const serial_port sp)
-{
+void uart_close(const serial_port sp) {
     serial_port_unix *spu = (serial_port_unix *)sp;
     tcflush(spu->fd, TCIOFLUSH);
     tcsetattr(spu->fd, TCSANOW, &(spu->tiOld));
@@ -236,8 +234,7 @@ void uart_close(const serial_port sp)
     free(sp);
 }
 
-bool uart_receive(const serial_port sp, uint8_t *pbtRx, size_t pszMaxRxLen, size_t *pszRxLen)
-{
+bool uart_receive(const serial_port sp, uint8_t *pbtRx, size_t pszMaxRxLen, size_t *pszRxLen) {
     int res;
     int byteCount;
     fd_set rfds;
@@ -296,8 +293,7 @@ bool uart_receive(const serial_port sp, uint8_t *pbtRx, size_t pszMaxRxLen, size
     return true;
 }
 
-bool uart_send(const serial_port sp, const uint8_t *pbtTx, const size_t len)
-{
+bool uart_send(const serial_port sp, const uint8_t *pbtTx, const size_t len) {
     int32_t res;
     size_t pos = 0;
     fd_set rfds;
@@ -333,8 +329,7 @@ bool uart_send(const serial_port sp, const uint8_t *pbtTx, const size_t len)
     return true;
 }
 
-bool uart_set_speed(serial_port sp, const uint32_t uiPortSpeed)
-{
+bool uart_set_speed(serial_port sp, const uint32_t uiPortSpeed) {
     const serial_port_unix *spu = (serial_port_unix *)sp;
     speed_t stPortSpeed;
     switch (uiPortSpeed) {
@@ -422,8 +417,7 @@ bool uart_set_speed(serial_port sp, const uint32_t uiPortSpeed)
     return (tcsetattr(spu->fd, TCSANOW, &ti) != -1);
 }
 
-uint32_t uart_get_speed(const serial_port sp)
-{
+uint32_t uart_get_speed(const serial_port sp) {
     struct termios ti;
     uint32_t uiPortSpeed;
     const serial_port_unix *spu = (serial_port_unix *)sp;
diff --git a/uart/uart_win32.c b/uart/uart_win32.c
index 422375ae6..0717a24cb 100644
--- a/uart/uart_win32.c
+++ b/uart/uart_win32.c
@@ -48,8 +48,7 @@ typedef struct {
     COMMTIMEOUTS ct;  // Serial port time-out configuration
 } serial_port_windows;
 
-serial_port uart_open(const char *pcPortName)
-{
+serial_port uart_open(const char *pcPortName) {
     char acPortName[255];
     serial_port_windows *sp = calloc(sizeof(serial_port_windows), sizeof(uint8_t));
 
@@ -128,15 +127,13 @@ serial_port uart_open(const char *pcPortName)
     return sp;
 }
 
-void uart_close(const serial_port sp)
-{
+void uart_close(const serial_port sp) {
     if (((serial_port_windows *)sp)->hPort != INVALID_HANDLE_VALUE)
         CloseHandle(((serial_port_windows *)sp)->hPort);
     free(sp);
 }
 
-bool uart_set_speed(serial_port sp, const uint32_t uiPortSpeed)
-{
+bool uart_set_speed(serial_port sp, const uint32_t uiPortSpeed) {
     serial_port_windows *spw;
 
     // Set port speed (Input and Output)
@@ -160,8 +157,7 @@ bool uart_set_speed(serial_port sp, const uint32_t uiPortSpeed)
     return result;
 }
 
-uint32_t uart_get_speed(const serial_port sp)
-{
+uint32_t uart_get_speed(const serial_port sp) {
     const serial_port_windows *spw = (serial_port_windows *)sp;
     if (!GetCommState(spw->hPort, (serial_port) & spw->dcb))
         return spw->dcb.BaudRate;
@@ -169,13 +165,11 @@ uint32_t uart_get_speed(const serial_port sp)
     return 0;
 }
 
-bool uart_receive(const serial_port sp, uint8_t *p_rx, size_t pszMaxRxLen, size_t *len)
-{
+bool uart_receive(const serial_port sp, uint8_t *p_rx, size_t pszMaxRxLen, size_t *len) {
     return ReadFile(((serial_port_windows *)sp)->hPort, p_rx, pszMaxRxLen, (LPDWORD)len, NULL);
 }
 
-bool uart_send(const serial_port sp, const uint8_t *p_tx, const size_t len)
-{
+bool uart_send(const serial_port sp, const uint8_t *p_tx, const size_t len) {
     DWORD txlen = 0;
     return WriteFile(((serial_port_windows *)sp)->hPort, p_tx, len, &txlen, NULL);
 }
diff --git a/zlib/deflate.c b/zlib/deflate.c
index 7575526cd..013f92150 100644
--- a/zlib/deflate.c
+++ b/zlib/deflate.c
@@ -242,7 +242,7 @@ int stream_size;
      */
 
     if (version == Z_NULL || version[0] != my_version[0] ||
-        stream_size != sizeof(z_stream)) {
+            stream_size != sizeof(z_stream)) {
         return Z_VERSION_ERROR;
     }
     if (strm == Z_NULL) return Z_STREAM_ERROR;
@@ -280,8 +280,8 @@ int stream_size;
     }
 #endif
     if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED ||
-        windowBits < 8 || windowBits > 15 || level < 0 || level > 9 ||
-        strategy < 0 || strategy > Z_FIXED) {
+            windowBits < 8 || windowBits > 15 || level < 0 || level > 9 ||
+            strategy < 0 || strategy > Z_FIXED) {
         return Z_STREAM_ERROR;
     }
     if (windowBits == 8) windowBits = 9;  /* until 256-byte window bug fixed */
@@ -314,7 +314,7 @@ int stream_size;
     s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush) + 2L);
 
     if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||
-        s->pending_buf == Z_NULL) {
+            s->pending_buf == Z_NULL) {
         s->status = FINISH_STATE;
         strm->msg = ERR_MSG(Z_MEM_ERROR);
         deflateEnd(strm);
@@ -406,7 +406,7 @@ z_streamp strm;
     deflate_state *s;
 
     if (strm == Z_NULL || strm->state == Z_NULL ||
-        strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0) {
+            strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0) {
         return Z_STREAM_ERROR;
     }
 
@@ -521,7 +521,7 @@ int strategy;
     func = configuration_table[s->level].func;
 
     if ((strategy != s->strategy || func != configuration_table[level].func) &&
-        strm->total_in != 0) {
+            strm->total_in != 0) {
         /* Flush the last buffer: */
         err = deflate(strm, Z_BLOCK);
         if (err == Z_BUF_ERROR && s->pending == 0)
@@ -681,14 +681,14 @@ int flush;
     deflate_state *s;
 
     if (strm == Z_NULL || strm->state == Z_NULL ||
-        flush > Z_BLOCK || flush < 0) {
+            flush > Z_BLOCK || flush < 0) {
         return Z_STREAM_ERROR;
     }
     s = strm->state;
 
     if (strm->next_out == Z_NULL ||
-        (strm->next_in == Z_NULL && strm->avail_in != 0) ||
-        (s->status == FINISH_STATE && flush != Z_FINISH)) {
+            (strm->next_in == Z_NULL && strm->avail_in != 0) ||
+            (s->status == FINISH_STATE && flush != Z_FINISH)) {
         ERR_RETURN(strm, Z_STREAM_ERROR);
     }
     if (strm->avail_out == 0) ERR_RETURN(strm, Z_BUF_ERROR);
@@ -902,7 +902,7 @@ int flush;
     /* Start a new block or continue the current one.
      */
     if (strm->avail_in != 0 || s->lookahead != 0 ||
-        (flush != Z_NO_FLUSH && s->status != FINISH_STATE)) {
+            (flush != Z_NO_FLUSH && s->status != FINISH_STATE)) {
         block_state bstate;
 
         bstate = s->strategy == Z_HUFFMAN_ONLY ? deflate_huff(s, flush) :
@@ -989,12 +989,12 @@ z_streamp strm;
 
     status = strm->state->status;
     if (status != INIT_STATE &&
-        status != EXTRA_STATE &&
-        status != NAME_STATE &&
-        status != COMMENT_STATE &&
-        status != HCRC_STATE &&
-        status != BUSY_STATE &&
-        status != FINISH_STATE) {
+            status != EXTRA_STATE &&
+            status != NAME_STATE &&
+            status != COMMENT_STATE &&
+            status != HCRC_STATE &&
+            status != BUSY_STATE &&
+            status != FINISH_STATE) {
         return Z_STREAM_ERROR;
     }
 
@@ -1048,7 +1048,7 @@ z_streamp source;
     ds->pending_buf = (uchf *) overlay;
 
     if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL ||
-        ds->pending_buf == Z_NULL) {
+            ds->pending_buf == Z_NULL) {
         deflateEnd(dest);
         return Z_MEM_ERROR;
     }
@@ -1217,7 +1217,7 @@ IPos cur_match;                             /* current match */
          * UNALIGNED_OK if your compiler uses a different size.
          */
         if (*(ushf *)(match + best_len - 1) != scan_end ||
-            *(ushf *)match != scan_start) continue;
+                *(ushf *)match != scan_start) continue;
 
         /* It is not necessary to compare scan[2] and match[2] since they are
          * always equal when the other bytes match, given that the hash keys
@@ -1248,9 +1248,9 @@ IPos cur_match;                             /* current match */
 #else /* UNALIGNED_OK */
 
         if (match[best_len]   != scan_end  ||
-            match[best_len - 1] != scan_end1 ||
-            *match            != *scan     ||
-            *++match          != scan[1])      continue;
+                match[best_len - 1] != scan_end1 ||
+                *match            != *scan     ||
+                *++match          != scan[1])      continue;
 
         /* The check at best_len-1 can be removed because it will be made
          * again later. (This heuristic is not always a win.)
@@ -1686,7 +1686,7 @@ int flush;
              */
 #ifndef FASTEST
             if (s->match_length <= s->max_insert_length &&
-                s->lookahead >= MIN_MATCH) {
+                    s->lookahead >= MIN_MATCH) {
                 s->match_length--; /* string at strstart already in table */
                 do {
                     s->strstart++;
@@ -1851,7 +1851,7 @@ int flush;
 
 #else
         if (hash_head != NIL && s->prev_length < s->max_lazy_match &&
-            s->strstart - hash_head <= MAX_DIST(s)) {
+                s->strstart - hash_head <= MAX_DIST(s)) {
             /* To simplify the code, we prevent matches with the string
              * of window index 0 (in particular we have to avoid a match
              * of the string with itself at the start of the input file).
diff --git a/zlib/inflate.c b/zlib/inflate.c
index f8d7b0cb4..9e320be27 100644
--- a/zlib/inflate.c
+++ b/zlib/inflate.c
@@ -199,7 +199,7 @@ int stream_size;
     struct inflate_state FAR *state;
 
     if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
-        stream_size != (int)(sizeof(z_stream)))
+            stream_size != (int)(sizeof(z_stream)))
         return Z_VERSION_ERROR;
     if (strm == Z_NULL) return Z_STREAM_ERROR;
     strm->msg = Z_NULL;                 /* in case we return an error */
@@ -335,8 +335,7 @@ struct inflate_state FAR *state;
 
     a.out > inffixed.h
  */
-void makefixed()
-{
+void makefixed() {
     unsigned low, size;
     struct inflate_state state;
 
@@ -637,7 +636,7 @@ int flush;
     {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
 
     if (strm == Z_NULL || strm->state == Z_NULL || strm->next_out == Z_NULL ||
-        (strm->next_in == Z_NULL && strm->avail_in != 0))
+            (strm->next_in == Z_NULL && strm->avail_in != 0))
         return Z_STREAM_ERROR;
 
     state = (struct inflate_state FAR *)strm->state;
@@ -669,7 +668,7 @@ int flush;
 #else
                 if (
 #endif
-                    ((BITS(8) << 8) + (hold >> 8)) % 31) {
+                        ((BITS(8) << 8) + (hold >> 8)) % 31) {
                     strm->msg = (char *)"incorrect header check";
                     state->mode = BAD;
                     break;
@@ -746,7 +745,7 @@ int flush;
                     if (copy > have) copy = have;
                     if (copy) {
                         if (state->head != Z_NULL &&
-                            state->head->extra != Z_NULL) {
+                                state->head->extra != Z_NULL) {
                             len = state->head->extra_len - state->length;
                             zmemcpy(state->head->extra + len, next,
                                     len + copy > state->head->extra_max ?
@@ -769,8 +768,8 @@ int flush;
                     do {
                         len = (unsigned)(next[copy++]);
                         if (state->head != Z_NULL &&
-                            state->head->name != Z_NULL &&
-                            state->length < state->head->name_max)
+                                state->head->name != Z_NULL &&
+                                state->length < state->head->name_max)
                             state->head->name[state->length++] = len;
                     } while (len && copy < have);
                     if (state->flags & 0x0200)
@@ -789,8 +788,8 @@ int flush;
                     do {
                         len = (unsigned)(next[copy++]);
                         if (state->head != Z_NULL &&
-                            state->head->comment != Z_NULL &&
-                            state->length < state->head->comm_max)
+                                state->head->comment != Z_NULL &&
+                                state->length < state->head->comm_max)
                             state->head->comment[state->length++] = len;
                     } while (len && copy < have);
                     if (state->flags & 0x0200)
@@ -1191,9 +1190,9 @@ int flush;
                     out = left;
                     if ((
 #ifdef GUNZIP
-                            state->flags ? hold :
+                                state->flags ? hold :
 #endif
-                            ZSWAP32(hold)) != state->check) {
+                                ZSWAP32(hold)) != state->check) {
                         strm->msg = (char *)"incorrect data check";
                         state->mode = BAD;
                         break;
@@ -1456,7 +1455,7 @@ z_streamp source;
 
     /* check input */
     if (dest == Z_NULL || source == Z_NULL || source->state == Z_NULL ||
-        source->zalloc == (alloc_func)0 || source->zfree == (free_func)0)
+            source->zalloc == (alloc_func)0 || source->zfree == (free_func)0)
         return Z_STREAM_ERROR;
     state = (struct inflate_state FAR *)source->state;
 
@@ -1478,7 +1477,7 @@ z_streamp source;
     zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream));
     zmemcpy((voidpf)copy, (voidpf)state, sizeof(struct inflate_state));
     if (state->lencode >= state->codes &&
-        state->lencode <= state->codes + ENOUGH - 1) {
+            state->lencode <= state->codes + ENOUGH - 1) {
         copy->lencode = copy->codes + (state->lencode - state->codes);
         copy->distcode = copy->codes + (state->distcode - state->codes);
     }
diff --git a/zlib/inftrees.c b/zlib/inftrees.c
index 4eb3b722a..a3724254f 100644
--- a/zlib/inftrees.c
+++ b/zlib/inftrees.c
@@ -31,8 +31,7 @@ const char inflate_copyright[] =
  */
 int ZLIB_INTERNAL inflate_table(codetype type, unsigned short FAR *lens,
                                 unsigned codes, code FAR *FAR *table,
-                                unsigned FAR *bits, unsigned short FAR *work)
-{
+                                unsigned FAR *bits, unsigned short FAR *work) {
     unsigned len;               /* a code's length in bits */
     unsigned sym;               /* index of code symbols */
     unsigned min, max;          /* minimum and maximum code lengths */
@@ -209,7 +208,7 @@ int ZLIB_INTERNAL inflate_table(codetype type, unsigned short FAR *lens,
 
     /* check available table space */
     if ((type == LENS && used > ENOUGH_LENS) ||
-        (type == DISTS && used > ENOUGH_DISTS))
+            (type == DISTS && used > ENOUGH_DISTS))
         return 1;
 
     /* process all codes and make table entries */
@@ -275,7 +274,7 @@ int ZLIB_INTERNAL inflate_table(codetype type, unsigned short FAR *lens,
             /* check for enough space */
             used += 1U << curr;
             if ((type == LENS && used > ENOUGH_LENS) ||
-                (type == DISTS && used > ENOUGH_DISTS))
+                    (type == DISTS && used > ENOUGH_DISTS))
                 return 1;
 
             /* point entry in root table to sub-table */
diff --git a/zlib/trees.c b/zlib/trees.c
index 5f721f8d7..cc2d477cf 100644
--- a/zlib/trees.c
+++ b/zlib/trees.c
@@ -239,8 +239,7 @@ int length; /* number of bits */
 /* ===========================================================================
  * Initialize the various 'constant' tables.
  */
-local void tr_static_init()
-{
+local void tr_static_init() {
 #if defined(GEN_TREES_H) || !defined(STDC)
     static int static_init_done = 0;
     int n;        /* iterates over tree elements */
@@ -333,8 +332,7 @@ local void tr_static_init()
     ((i) == (last)? "\n};\n\n" :    \
      ((i) % (width) == (width)-1 ? ",\n" : ", "))
 
-void gen_trees_header()
-{
+void gen_trees_header() {
     FILE *header = fopen("trees.h", "w");
     int i;
 
@@ -468,7 +466,7 @@ int k;               /* node to move down */
     while (j <= s->heap_len) {
         /* Set j to the smallest of the two sons: */
         if (j < s->heap_len &&
-            smaller(tree, s->heap[j + 1], s->heap[j], s->depth)) {
+                smaller(tree, s->heap[j + 1], s->heap[j], s->depth)) {
             j++;
         }
         /* Exit if v is smaller than both sons */
@@ -1157,7 +1155,7 @@ deflate_state *s;
 
     /* Check for textual ("white-listed") bytes. */
     if (s->dyn_ltree[9].Freq != 0 || s->dyn_ltree[10].Freq != 0
-        || s->dyn_ltree[13].Freq != 0)
+            || s->dyn_ltree[13].Freq != 0)
         return Z_TEXT;
     for (n = 32; n < LITERALS; n++)
         if (s->dyn_ltree[n].Freq != 0)
diff --git a/zlib/zutil.c b/zlib/zutil.c
index 821949c77..72d373982 100644
--- a/zlib/zutil.c
+++ b/zlib/zutil.c
@@ -28,13 +28,11 @@ z_const char *const z_errmsg[10] = {
 };
 
 
-const char *ZEXPORT zlibVersion()
-{
+const char *ZEXPORT zlibVersion() {
     return ZLIB_VERSION;
 }
 
-uLong ZEXPORT zlibCompileFlags()
-{
+uLong ZEXPORT zlibCompileFlags() {
     uLong flags;
 
     flags = 0;
@@ -242,8 +240,7 @@ local ptr_table table[MAX_PTR];
  * a protected system like OS/2. Use Microsoft C instead.
  */
 
-voidpf ZLIB_INTERNAL zcalloc(voidpf opaque, unsigned items, unsigned size)
-{
+voidpf ZLIB_INTERNAL zcalloc(voidpf opaque, unsigned items, unsigned size) {
     voidpf buf = opaque; /* just to make some compilers happy */
     ulg bsize = (ulg)items * size;
 
@@ -266,8 +263,7 @@ voidpf ZLIB_INTERNAL zcalloc(voidpf opaque, unsigned items, unsigned size)
     return buf;
 }
 
-void ZLIB_INTERNAL zcfree(voidpf opaque, voidpf ptr)
-{
+void ZLIB_INTERNAL zcfree(voidpf opaque, voidpf ptr) {
     int n;
     if (*(ush *)&ptr != 0) { /* object < 64K */
         farfree(ptr);
@@ -301,14 +297,12 @@ void ZLIB_INTERNAL zcfree(voidpf opaque, voidpf ptr)
 #  define _hfree   hfree
 #endif
 
-voidpf ZLIB_INTERNAL zcalloc(voidpf opaque, uInt items, uInt size)
-{
+voidpf ZLIB_INTERNAL zcalloc(voidpf opaque, uInt items, uInt size) {
     if (opaque) opaque = 0; /* to make compiler happy */
     return _halloc((long)items, size);
 }
 
-void ZLIB_INTERNAL zcfree(voidpf opaque, voidpf ptr)
-{
+void ZLIB_INTERNAL zcfree(voidpf opaque, voidpf ptr) {
     if (opaque) opaque = 0; /* to make compiler happy */
     _hfree(ptr);
 }

From 2f12e57408ab7bbcd55b3b302da1f36b501f7d51 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 10 Mar 2019 11:35:03 +0100
Subject: [PATCH 0721/1938] Makefiles: remove spurious spaces/tabs

---
 Makefile                 | 50 ++++++++++++++++++++--------------------
 armsrc/Makefile          | 34 +++++++++++++--------------
 bootrom/Makefile         |  8 +++----
 client/Makefile          | 26 ++++++++++-----------
 client/jansson/Makefile  | 10 ++++----
 client/tinycbor/Makefile | 10 ++++----
 common/mbedtls/Makefile  | 10 ++++----
 fpga/Makefile            |  4 ++--
 fpga/tests/Makefile      |  2 +-
 recovery/Makefile        |  2 +-
 tools/Makefile           |  8 +++----
 tools/mfkey/Makefile     |  4 ++--
 tools/nonce2key/Makefile |  2 +-
 13 files changed, 85 insertions(+), 85 deletions(-)

diff --git a/Makefile b/Makefile
index ba73cff56..fb7cd8a2d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,26 +1,26 @@
 GZIP=gzip
 # Windows' echo echos its input verbatim, on Posix there is some
-#  amount of shell command line parsing going on. echo "" on 
+#  amount of shell command line parsing going on. echo "" on
 #  Windows yields literal "", on Linux yields an empty line
 ifeq ($(shell echo ""),)
-# This is probably a proper system, so we can use uname
-DELETE=rm -rf
-FLASH_TOOL=client/flasher
-platform=$(shell uname)
-ifneq (,$(findstring MINGW,$(platform)))
-FLASH_PORT=com3
-PATHSEP=\\#
+  # This is probably a proper system, so we can use uname
+  DELETE=rm -rf
+  FLASH_TOOL=client/flasher
+  platform=$(shell uname)
+  ifneq (,$(findstring MINGW,$(platform)))
+    FLASH_PORT=com3
+    PATHSEP=\\#
+  else
+    FLASH_PORT=/dev/ttyACM0
+    PATHSEP=/
+  endif
 else
-FLASH_PORT=/dev/ttyACM0
-PATHSEP=/
-endif
-else
-# Assume that we are running on native Windows
-DELETE=del /q
-FLASH_TOOL=client/flasher.exe
-platform=Windows
-FLASH_PORT=com3
-PATHSEP=\\#
+  # Assume that we are running on native Windows
+  DELETE=del /q
+  FLASH_TOOL=client/flasher.exe
+  platform=Windows
+  FLASH_PORT=com3
+  PATHSEP=\\#
 endif
 
 all clean: %: client/% bootrom/% armsrc/% recovery/% mfkey/% nonce2key/%
@@ -44,15 +44,15 @@ FORCE: # Dummy target to force remake in the subdirectories, even if files exist
 help:
 	@echo Multi-OS Makefile, you are running on $(DETECTED_OS)
 	@echo Possible targets:
-	@echo +	all           - Make bootrom, armsrc and the OS-specific host directory
+	@echo + all           - Make bootrom, armsrc and the OS-specific host directory
 	@echo + client        - Make only the OS-specific host directory
 	@echo + flash-bootrom - Make bootrom and flash it
 	@echo + flash-os      - Make armsrc and flash os \(includes fpga\)
 	@echo + flash-all     - Make bootrom and armsrc and flash bootrom and os image
 	@echo + mfkey         - Make tools/mfkey
 	@echo + nounce2key    - Make tools/nounce2key
-	@echo +	clean         - Clean in bootrom, armsrc and the OS-specific host directory
-	
+	@echo + clean         - Clean in bootrom, armsrc and the OS-specific host directory
+
 client: client/all
 
 flash-bootrom: bootrom/obj/bootrom.elf $(FLASH_TOOL)
@@ -71,7 +71,7 @@ newtarbin:
 tarbin: newtarbin client/tarbin armsrc/tarbin bootrom/tarbin
 	$(GZIP) proxmark3-$(platform)-bin.tar
 
-# configure system	
+# configure system
 #  - to ignore PM3 device as a modem (blacklist)
 #  - add user to the dialout group
 # you may need to logout, relogin to get this access right correct.
@@ -84,12 +84,12 @@ ifneq ($(wildcard /etc/arch-release),) #If user is running ArchLinux
 else
 	sudo adduser $(USER) dialout
 endif
- 
+
 # easy printing of MAKE VARIABLES
-print-%: ; @echo $* = $($*) 
+print-%: ; @echo $* = $($*)
 
 style:
-	find . \( -name "*.[ch]" -or -name "*.cpp" -or -name "*.lua" \) -exec perl -pi -e 's/[ \t\r]+$$//' {} \;
+	find . \( -name "*.[ch]" -or -name "*.cpp" -or -name "*.lua" -or -name "Makefile" \) -exec perl -pi -e 's/[ \t\r]+$$//' {} \;
 	find . \( -name "*.[ch]" -or -name "*.cpp" \) -exec astyle --formatted --mode=c --suffix=none \
 	    --indent=spaces=4 --indent-switches --indent-preprocessor \
 	    --keep-one-line-blocks --max-instatement-indent=60 \
diff --git a/armsrc/Makefile b/armsrc/Makefile
index efc443227..53a8b150e 100644
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -10,7 +10,7 @@ APP_INCLUDES = apps.h
 
 #remove one of the following defines and comment out the relevant line
 #in the next section to remove that particular feature from compilation.
-# NO space,TABs after the "\" sign.  
+# NO space,TABs after the "\" sign.
 APP_CFLAGS = -DWITH_CRC \
 			 -DON_DEVICE \
 			 -DWITH_LF \
@@ -48,11 +48,11 @@ SRC_LCD = fonts.c LCD.c
 SRC_LF = lfops.c hitag2.c hitagS.c lfsampling.c pcf7931.c lfdemod.c
 SRC_ISO15693 = iso15693.c iso15693tools.c
 #SRC_ISO14443a = iso14443a.c mifareutil.c mifarecmd.c epa.c mifaresim.c
-SRC_ISO14443a = iso14443a.c mifareutil.c mifarecmd.c epa.c 
+SRC_ISO14443a = iso14443a.c mifareutil.c mifarecmd.c epa.c
 SRC_ISO14443b = iso14443b.c
 SRC_FELICA = felica.c
 SRC_CRAPTO1 = crypto1.c des.c aes.c desfire_key.c desfire_crypto.c mifaredesfire.c
-SRC_CRC = crc.c crc16.c crc32.c 
+SRC_CRC = crc.c crc16.c crc32.c
 SRC_ICLASS = iclass.c optimized_cipher.c
 SRC_LEGIC = legicrf.c legicrfsim.c legic_prng.c
 SRC_BEE = bee.c
@@ -61,19 +61,19 @@ SRC_BEE = bee.c
 ifneq (,$(findstring WITH_FLASH,$(APP_CFLAGS)))
 	SRC_FLASH = flashmem.c
 else
-	SRC_FLASH = 
+	SRC_FLASH =
 endif
 
 ifneq (,$(findstring WITH_SMARTCARD,$(APP_CFLAGS)))
 	SRC_SMARTCARD = i2c.c
 else
-	SRC_SMARTCARD = 
+	SRC_SMARTCARD =
 endif
 
 ifneq (,$(findstring WITH_FPC,$(APP_CFLAGS)))
 	SRC_FPC = usart.c
 else
-	SRC_FPC = 
+	SRC_FPC =
 endif
 
 # Generic standalone Mode injection of source code
@@ -92,7 +92,7 @@ ifneq (,$(findstring WITH_LF_PROXBRUTE,$(APP_CFLAGS)))
 endif
 # WITH_LF_HIDBRUTE
 ifneq (,$(findstring WITH_LF_HIDBRUTE,$(APP_CFLAGS)))
-	SRC_STANDALONE = lf_hidbrute.c 
+	SRC_STANDALONE = lf_hidbrute.c
 endif
 # WITH_HF_YOUNG
 ifneq (,$(findstring WITH_HF_YOUNG,$(APP_CFLAGS)))
@@ -160,16 +160,16 @@ ARMSRC = fpgaloader.c \
 	parity.c \
 	usb_cdc.c \
 	cmd.c
-	
+
 VERSIONSRC = version.c \
 	fpga_version_info.c
-	
+
 # Do not move this inclusion before the definition of {THUMB,ASM,ARM}SRC
 include ../common/Makefile.common
 
-COMMON_FLAGS =  -Os 
+COMMON_FLAGS =  -Os
 
-OBJS = $(OBJDIR)/fullimage.s19 
+OBJS = $(OBJDIR)/fullimage.s19
 FPGA_COMPRESSOR = ../client/fpga_compress
 
 all: $(OBJS)
@@ -179,7 +179,7 @@ all: $(OBJS)
 # version.c should be remade on every compilation
 .PHONY: version.c
 version.c: default_version.c
-	perl ../tools/mkversion.pl .. > $@ || $(COPY) $^ $@ 
+	perl ../tools/mkversion.pl .. > $@ || $(COPY) $^ $@
 
 fpga_version_info.c: $(FPGA_BITSTREAMS) $(FPGA_COMPRESSOR)
 	$(FPGA_COMPRESSOR) -v $(filter %.bit,$^) $@
@@ -188,17 +188,17 @@ $(OBJDIR)/fpga_all.o: $(OBJDIR)/fpga_all.bit.z
 	$(OBJCOPY) -O elf32-littlearm -I binary -B arm --prefix-sections=fpga_all_bit $^ $@
 
 $(OBJDIR)/fpga_all.bit.z: $(FPGA_BITSTREAMS) $(FPGA_COMPRESSOR)
-	$(FPGA_COMPRESSOR) $(filter %.bit,$^) $@  
+	$(FPGA_COMPRESSOR) $(filter %.bit,$^) $@
 
 $(FPGA_COMPRESSOR):
 		$(MAKE) -C ../client $(notdir $(FPGA_COMPRESSOR))
-		
+
 $(OBJDIR)/fullimage.stage1.elf: $(VERSIONOBJ) $(OBJDIR)/fpga_all.o $(THUMBOBJ) $(ARMOBJ)
 	$(CC) $(LDFLAGS) -Wl,-T,ldscript,-Map,$(patsubst %.elf,%.map,$@) -o $@ $^ $(LIBS)
 
 $(OBJDIR)/fullimage.nodata.bin: $(OBJDIR)/fullimage.stage1.elf
 	$(OBJCOPY) -O binary -I elf32-littlearm --remove-section .data $^ $@
-	
+
 $(OBJDIR)/fullimage.nodata.o: $(OBJDIR)/fullimage.nodata.bin
 	$(OBJCOPY) -O elf32-littlearm -I binary -B arm --rename-section .data=stage1_image $^ $@
 
@@ -206,8 +206,8 @@ $(OBJDIR)/fullimage.data.bin: $(OBJDIR)/fullimage.stage1.elf
 	$(OBJCOPY) -O binary -I elf32-littlearm --only-section .data $^ $@
 
 $(OBJDIR)/fullimage.data.bin.z: $(OBJDIR)/fullimage.data.bin $(FPGA_COMPRESSOR)
-	$(FPGA_COMPRESSOR) $(filter %.bin,$^) $@  
-	
+	$(FPGA_COMPRESSOR) $(filter %.bin,$^) $@
+
 $(OBJDIR)/fullimage.data.o: $(OBJDIR)/fullimage.data.bin.z
 	$(OBJCOPY) -O elf32-littlearm -I binary -B arm --rename-section .data=compressed_data $^ $@
 
diff --git a/bootrom/Makefile b/bootrom/Makefile
index c7e879bda..967acc6f5 100644
--- a/bootrom/Makefile
+++ b/bootrom/Makefile
@@ -7,7 +7,7 @@
 #-----------------------------------------------------------------------------
 
 # DO NOT use thumb mode in the phase 1 bootloader since that generates a section with glue code
-ARMSRC = 
+ARMSRC =
 THUMBSRC = cmd.c \
 	usb_cdc.c \
 	bootrom.c
@@ -20,7 +20,7 @@ VERSIONSRC = version.c
 ## zeroes. As a temporary workaround, do not use thumb for the phase 2 bootloader
 ## -- Henryk Plötz <henryk@ploetzli.ch> 2009-09-01
 # ARMSRC := $(ARMSRC) $(THUMBSRC)
-# THUMBSRC := 
+# THUMBSRC :=
 
 # stdint.h provided locally until GCC 4.5 becomes C99 compliant
 APP_CFLAGS = -I. -fno-strict-aliasing -ffunction-sections -fdata-sections
@@ -36,7 +36,7 @@ OBJS = $(OBJDIR)/bootrom.s19
 
 # version.c should be remade on every compilation
 version.c: default_version.c
-	perl ../tools/mkversion.pl .. > $@ || $(COPY) $^ $@ 
+	perl ../tools/mkversion.pl .. > $@ || $(COPY) $^ $@
 
 all: $(OBJS)
 
@@ -54,7 +54,7 @@ clean:
 	$(DELETE) $(OBJDIR)$(PATHSEP)*.d
 	$(DELETE) version.c
 
-.PHONY: all clean help 
+.PHONY: all clean help
 help:
 	@echo Multi-OS Makefile, you are running on $(DETECTED_OS)
 	@echo Possible targets:
diff --git a/client/Makefile b/client/Makefile
index d83fbff5f..76810f893 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -39,13 +39,13 @@ CXXFLAGS = -I../include -Wall -O3
 
 LUAPLATFORM = generic
 platform = $(shell uname)
-ifneq (,$(findstring MINGW,$(platform))) 
+ifneq (,$(findstring MINGW,$(platform)))
     LUAPLATFORM = mingw
 else
 	ifeq ($(platform),Darwin)
     LUAPLATFORM = macosx
 	OBJCSRCS = util_darwin.m
-	LDFLAGS += -framework Foundation -framework AppKit	
+	LDFLAGS += -framework Foundation -framework AppKit
 else
     LUALIB +=  -ldl
     LDLIBS +=  -ltermcap -lncurses
@@ -59,7 +59,7 @@ QTLDLIBS = $(shell pkg-config --libs Qt5Core Qt5Widgets 2>/dev/null)
 MOC = $(shell pkg-config --variable=host_bins Qt5Core)/moc
 UIC = $(shell pkg-config --variable=host_bins Qt5Core)/uic
 ifeq ($(QTINCLUDES), )
-# if Qt5 not found check for correctly configured Qt4	
+# if Qt5 not found check for correctly configured Qt4
 	QTINCLUDES = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null)
 	QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
 	MOC = $(shell pkg-config --variable=moc_location QtCore)
@@ -91,7 +91,7 @@ else
 endif
 
 # RDV40 flag enables flashmemory commands in client.  comment out if you don't have rdv40
-CFLAGS += -DWITH_FLASH -DWITH_SMARTCARD 
+CFLAGS += -DWITH_FLASH -DWITH_SMARTCARD
 
 # Flags to generate temporary dependency files
 DEPFLAGS = -MT $@ -MMD -MP -MF $(OBJDIR)/$*.Td
@@ -232,7 +232,7 @@ endif
 ifeq ($(MULTIARCHSRCS), )
 	CMDSRCS += hardnested/hardnested_bf_core.c hardnested/hardnested_bitarray_core.c
 endif
-		
+
 ZLIBSRCS = deflate.c adler32.c trees.c zutil.c inflate.c inffast.c inftrees.c
 ZLIBFLAGS = -DZ_SOLO -DZ_PREFIX -DNO_GZIP -DZLIB_PM3_TUNED
 #-DDEBUG -Dverbose=1
@@ -271,7 +271,7 @@ WINBINS = $(patsubst %, %.exe, $(BINS))
 CLEAN = $(BINS) $(WINBINS) $(COREOBJS) $(CMDOBJS) $(OBJCOBJS) $(ZLIBOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(OBJDIR)/*.o *.moc.cpp ui/ui_overlays.h lualibs/usb_cmd.lua lualibs/mf_default_keys.lua
 
 # need to assign dependancies to build these first...
-all: lua_build jansson_build mbedtls_build cbor_build $(BINS) 
+all: lua_build jansson_build mbedtls_build cbor_build $(BINS)
 
 all-static: LDLIBS:=-static $(LDLIBS)
 all-static: proxmark3 flasher fpga_compress
@@ -279,7 +279,7 @@ all-static: proxmark3 flasher fpga_compress
 proxmark3: LDLIBS+=$(LUALIB) $(JANSSONLIB) $(MBEDTLSLIB) $(CBORLIB) $(QTLDLIBS)
 proxmark3: $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(OBJCOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(ZLIBOBJS) lualibs/usb_cmd.lua lualibs/mf_default_keys.lua
 	$(LD) $(LDFLAGS) $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(OBJCOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(ZLIBOBJS) $(LDLIBS)  -o $@
-	
+
 flasher: $(OBJDIR)/flash.o $(OBJDIR)/flasher.o $(COREOBJS) $(OBJCOBJS)
 	$(LD) $(LDFLAGS) $^ $(LDLIBS) -o $@
 
@@ -299,7 +299,7 @@ lualibs/usb_cmd.lua: ../include/usb_cmd.h
 
 lualibs/mf_default_keys.lua : default_keys.dic
 	awk -f default_keys_dic2lua.awk $^ > $@
-	
+
 clean:
 	$(RM) $(CLEAN)
 	cd ../liblua && $(MAKE) clean
@@ -313,7 +313,7 @@ tarbin: $(BINS)
 lua_build:
 	@echo Compiling liblua, using platform $(LUAPLATFORM)
 	cd ../liblua && $(MAKE) $(LUAPLATFORM)
-	
+
 jansson_build:
 	@echo Compiling jansson
 	cd $(JANSSONLIBPATH) && $(MAKE) all
@@ -321,15 +321,15 @@ jansson_build:
 mbedtls_build:
 	@echo Compiling mbedtls
 	cd $(MBEDTLSLIBPATH) && $(MAKE) all
-	
+
 cbor_build:
 	@echo Compiling tinycbor
 	cd $(CBORLIBPATH) && $(MAKE) all
-	
+
 .PHONY: all clean
 
 # easy printing of MAKE VARIABLES
-print-%: ; @echo $* = $($*) 
+print-%: ; @echo $* = $($*)
 
 $(OBJDIR)/%_NOSIMD.o : %.c $(OBJDIR)/%.d
 	$(CC) $(DEPFLAGS) $(CFLAGS) $(HARD_SWITCH_NOSIMD) -c -o $@ $<
@@ -363,7 +363,7 @@ $(OBJDIR)/%.o : %.cpp $(OBJDIR)/%.d
 $(OBJDIR)/%.o : %.m $(OBJDIR)/%.d
 	$(CC) $(DEPFLAGS) $(CFLAGS) -c -o $@ $<
 	$(POSTCOMPILE)
-	
+
 #$(CMDOBJS) $(COREOBJS): $(notdir $(%.c)) %.d
 #	$(CC) $(DEPFLAGS) $(CFLAGS) -c -o $@ $<
 #	$(POSTCOMPILE)
diff --git a/client/jansson/Makefile b/client/jansson/Makefile
index 596c1778c..226e87cc3 100644
--- a/client/jansson/Makefile
+++ b/client/jansson/Makefile
@@ -26,11 +26,11 @@ libjansson_la_LDFLAGS = \
 	-export-symbols-regex '^json_' \
 	-version-info 15:0:11
 
-	
+
 CFILES = $(filter %.c, $(libjansson_la_SOURCES))
 CMDOBJS = $(CFILES:%.c=%.o)
 CLEAN = $(CMDOBJS)
-	
+
 CC= gcc
 CFLAGS= -O2 -Wall -Wno-unused-variable -Wno-unused-function -Wno-format-truncation
 LDFLAGS= $(SYSLDFLAGS) $(libjansson_la_LDFLAGS)
@@ -52,13 +52,13 @@ MYOBJS=
 all: $(CMDOBJS)
 	$(AR) $(LIB_A) $(CMDOBJS)
 	$(RANLIB) $(LIB_A)
-	
+
 clean:
 	$(RM) $(CLEAN)
 	$(RM) $(LIB_A)
-	
+
 %.o: %.c
 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(CFLAGS) -c -o $@ $< $(LIBS)
-	
+
 .PHONY: all clean
 
diff --git a/client/tinycbor/Makefile b/client/tinycbor/Makefile
index 78ef64dc0..511f57f7a 100644
--- a/client/tinycbor/Makefile
+++ b/client/tinycbor/Makefile
@@ -9,11 +9,11 @@ tinycbor_SOURCES = \
     cborpretty.c \
     cbortojson.c \
     cborvalidation.c \
-	
+
 CFILES = $(filter %.c, $(tinycbor_SOURCES))
 CMDOBJS = $(CFILES:%.c=%.o)
 CLEAN = $(CMDOBJS)
-	
+
 CC= gcc
 CFLAGS= -O2 -Wall -Wno-unused-variable -Wno-unused-function
 LIBS=  $(SYSLIBS) $(MYLIBS)
@@ -34,13 +34,13 @@ MYOBJS=
 all: $(CMDOBJS)
 	$(AR) $(LIB_A) $(CMDOBJS)
 	$(RANLIB) $(LIB_A)
-	
+
 clean:
 	$(RM) $(CLEAN)
 	$(RM) $(LIB_A)
-	
+
 %.o: %.c
 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(CFLAGS) -c -o $@ $< $(LIBS)
-	
+
 .PHONY: all clean
 
diff --git a/common/mbedtls/Makefile b/common/mbedtls/Makefile
index 2a6bca6f4..d57809c56 100644
--- a/common/mbedtls/Makefile
+++ b/common/mbedtls/Makefile
@@ -49,11 +49,11 @@ mbedtls_LDFLAGS = \
 	-export-symbols-regex '^mbedtls_' \
 	-version-info 15:0:11
 
-	
+
 CFILES = $(filter %.c, $(mbedtls_SOURCES))
 CMDOBJS = $(CFILES:%.c=%.o)
 CLEAN = $(CMDOBJS)
-	
+
 CC= gcc
 CFLAGS= -O2 -Wall -Wno-unused-variable -Wno-unused-function
 LDFLAGS= $(SYSLDFLAGS) $(mbedtls_LDFLAGS)
@@ -75,13 +75,13 @@ MYOBJS=
 all: $(CMDOBJS)
 	$(AR) $(LIB_A) $(CMDOBJS)
 	$(RANLIB) $(LIB_A)
-	
+
 clean:
 	$(RM) $(CLEAN)
 	$(RM) $(LIB_A)
-	
+
 %.o: %.c
 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(CFLAGS) -c -o $@ $< $(LIBS)
-	
+
 .PHONY: all clean
 
diff --git a/fpga/Makefile b/fpga/Makefile
index 578518f7f..324b48c7b 100644
--- a/fpga/Makefile
+++ b/fpga/Makefile
@@ -34,6 +34,6 @@ fpga_lf.ngc: fpga_lf.v fpga.ucf xst_lf.scr util.v clk_divider.v lo_edge_detect.v
 help:
 	@echo Multi-OS Makefile, you are running on $(DETECTED_OS)
 	@echo Possible targets:
-	@echo +	all   - Make fpga.bit, the FPGA bitstream 
+	@echo +	all   - Make fpga.bit, the FPGA bitstream
 	@echo +	clean - Clean intermediate files, does not clean fpga.bit
-	
+
diff --git a/fpga/tests/Makefile b/fpga/tests/Makefile
index 755604633..79ed20816 100644
--- a/fpga/tests/Makefile
+++ b/fpga/tests/Makefile
@@ -64,7 +64,7 @@ tb_lf_edge_detect: tb_lf_edge_detect.vvp | test_dir
 test_dir:
 	@if [ ! -d $(TEST_OUTDIR) ] ; then mkdir $(TEST_OUTDIR) ; fi
 
-.PHONY: all clean 
+.PHONY: all clean
 
 # $(1) = basename
 # $(2) = extension to check
diff --git a/recovery/Makefile b/recovery/Makefile
index bb8e3a763..7806d14b4 100644
--- a/recovery/Makefile
+++ b/recovery/Makefile
@@ -13,6 +13,6 @@ fullimage.bin: ../armsrc/obj/fullimage.elf
 proxmark3_recovery.bin: bootrom.bin fullimage.bin
 	cat bootrom.bin fullimage.bin > $@
 
-clean: 
+clean:
 	rm -f $(BINS)
 
diff --git a/tools/Makefile b/tools/Makefile
index b72503158..51a76677b 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -8,12 +8,12 @@ get_crapto1:
 
 get_nonce_bf:
 #	git clone https://github.com/J-Run/mf_key_brute.git mf_key_brute
-	git clone https://github.com/iceman1001/mf_nonce_brute mf_nonce_brute	
-	
+	git clone https://github.com/iceman1001/mf_nonce_brute mf_nonce_brute
+
 get_xorsearch:
-	mkdir xorsearch	
+	mkdir xorsearch
 	wget -N https://didierstevens.com/files/software/XORSearch_V1_11_2.zip
-#  Mingw 
+#  Mingw
 #	unzzip-big XORSearch_V1_11_2.zip
 #  linux
 #	gunzip  XORSearch_V1_11_2.zip
\ No newline at end of file
diff --git a/tools/mfkey/Makefile b/tools/mfkey/Makefile
index 98f52d696..61e55ef2d 100755
--- a/tools/mfkey/Makefile
+++ b/tools/mfkey/Makefile
@@ -7,7 +7,7 @@ OBJS = crapto1.o crypto1.o
 HEADERS = crapto1.h
 EXES = mfkey64 mfkey32 mfkey32v2
 WINEXE = $(patsubst %, %.exe, $(EXES))
-	
+
 all: $(OBJS) $(EXES)
 
 %.o : %.c
@@ -16,6 +16,6 @@ all: $(OBJS) $(EXES)
 % : %.c
 	$(LD) $(CFLAGS) -o $@ $(OBJS) $<
 
-clean: 
+clean:
 	rm -f $(OBJS) $(EXES) $(WINEXE)
 
diff --git a/tools/nonce2key/Makefile b/tools/nonce2key/Makefile
index 1119ab766..99f9a3598 100644
--- a/tools/nonce2key/Makefile
+++ b/tools/nonce2key/Makefile
@@ -16,5 +16,5 @@ all: $(OBJS) $(EXES)
 % : %.c
 	$(LD) $(LDFLAGS) -o $@ $(OBJS) $<
 
-clean: 
+clean:
 	rm -f $(OBJS) $(EXES) $(WINEXES)

From 21e6f2d8613bc7af49405843820496d15197fcdc Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 10 Mar 2019 11:42:38 +0100
Subject: [PATCH 0722/1938] jansson, tinycbor, mbedtls: avoid recompilations if
 not needed

---
 client/jansson/Makefile  | 4 +++-
 client/tinycbor/Makefile | 4 +++-
 common/mbedtls/Makefile  | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/client/jansson/Makefile b/client/jansson/Makefile
index 226e87cc3..8e138462b 100644
--- a/client/jansson/Makefile
+++ b/client/jansson/Makefile
@@ -49,10 +49,12 @@ SYSLIBS=
 MYLIBS=
 MYOBJS=
 
-all: $(CMDOBJS)
+$(LIB_A): $(CMDOBJS)
 	$(AR) $(LIB_A) $(CMDOBJS)
 	$(RANLIB) $(LIB_A)
 
+all: $(LIB_A)
+
 clean:
 	$(RM) $(CLEAN)
 	$(RM) $(LIB_A)
diff --git a/client/tinycbor/Makefile b/client/tinycbor/Makefile
index 511f57f7a..86e356bbd 100644
--- a/client/tinycbor/Makefile
+++ b/client/tinycbor/Makefile
@@ -31,10 +31,12 @@ SYSLIBS=
 MYLIBS=
 MYOBJS=
 
-all: $(CMDOBJS)
+$(LIB_A): $(CMDOBJS)
 	$(AR) $(LIB_A) $(CMDOBJS)
 	$(RANLIB) $(LIB_A)
 
+all: $(LIB_A)
+
 clean:
 	$(RM) $(CLEAN)
 	$(RM) $(LIB_A)
diff --git a/common/mbedtls/Makefile b/common/mbedtls/Makefile
index d57809c56..11bb22f07 100644
--- a/common/mbedtls/Makefile
+++ b/common/mbedtls/Makefile
@@ -72,10 +72,12 @@ SYSLIBS=
 MYLIBS=
 MYOBJS=
 
-all: $(CMDOBJS)
+$(LIB_A): $(CMDOBJS)
 	$(AR) $(LIB_A) $(CMDOBJS)
 	$(RANLIB) $(LIB_A)
 
+all: $(LIB_A)
+
 clean:
 	$(RM) $(CLEAN)
 	$(RM) $(LIB_A)

From 73437dea6212fa2b203696d50e5bf08734a67747 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 10 Mar 2019 12:22:02 +0100
Subject: [PATCH 0723/1938] Makefile: avoid compiling hardnested multiarch
 stuff systematically

---
 client/Makefile | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/client/Makefile b/client/Makefile
index 76810f893..c7a3df7b6 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -331,23 +331,29 @@ cbor_build:
 # easy printing of MAKE VARIABLES
 print-%: ; @echo $* = $($*)
 
-$(OBJDIR)/%_NOSIMD.o : %.c $(OBJDIR)/%.d
+$(OBJDIR)/%_NOSIMD.o : %.c $(OBJDIR)/%_NOSIMD.d
 	$(CC) $(DEPFLAGS) $(CFLAGS) $(HARD_SWITCH_NOSIMD) -c -o $@ $<
+	$(POSTCOMPILE:%.d=%_NOSIMD.d)
 
-$(OBJDIR)/%_MMX.o : %.c $(OBJDIR)/%.d
+$(OBJDIR)/%_MMX.o : %.c $(OBJDIR)/%_MMX.d
 	$(CC) $(DEPFLAGS) $(CFLAGS) $(HARD_SWITCH_MMX) -c -o $@ $<
+	$(POSTCOMPILE:%.d=%_MMX.d)
 
-$(OBJDIR)/%_SSE2.o : %.c $(OBJDIR)/%.d
+$(OBJDIR)/%_SSE2.o : %.c $(OBJDIR)/%_SSE2.d
 	$(CC) $(DEPFLAGS) $(CFLAGS) $(HARD_SWITCH_SSE2) -c -o $@ $<
+	$(POSTCOMPILE:%.d=%_SSE2.d)
 
-$(OBJDIR)/%_AVX.o : %.c $(OBJDIR)/%.d
+$(OBJDIR)/%_AVX.o : %.c $(OBJDIR)/%_AVX.d
 	$(CC) $(DEPFLAGS) $(CFLAGS) $(HARD_SWITCH_AVX) -c -o $@ $<
+	$(POSTCOMPILE:%.d=%_AVX.d)
 
-$(OBJDIR)/%_AVX2.o : %.c $(OBJDIR)/%.d
+$(OBJDIR)/%_AVX2.o : %.c $(OBJDIR)/%_AVX2.d
 	$(CC) $(DEPFLAGS) $(CFLAGS) $(HARD_SWITCH_AVX2) -c -o $@ $<
+	$(POSTCOMPILE:%.d=%_AVX2.d)
 
-$(OBJDIR)/%_AVX512.o : %.c $(OBJDIR)/%.d
+$(OBJDIR)/%_AVX512.o : %.c $(OBJDIR)/%_AVX512.d
 	$(CC) $(DEPFLAGS) $(CFLAGS) $(HARD_SWITCH_AVX512) -c -o $@ $<
+	$(POSTCOMPILE:%.d=%_AVX512.d)
 
 %.o: %.c
 $(OBJDIR)/%.o : %.c $(OBJDIR)/%.d
@@ -376,7 +382,8 @@ $(OBJDIR)/%.o : %.m $(OBJDIR)/%.d
 #	$(CXX) $(DEPFLAGS) $(CXXFLAGS) -c -o $@ $<
 #	$(POSTCOMPILE)
 
-DEPENDENCY_FILES = $(patsubst %.c, $(OBJDIR)/%.d, $(CORESRCS) $(CMDSRCS) $(ZLIBSRCS) $(MULTIARCHSRCS)) \
+DEPENDENCY_FILES = $(patsubst %.c, $(OBJDIR)/%.d, $(CORESRCS) $(CMDSRCS) $(ZLIBSRCS)) \
+	$(patsubst %.o, %.d, $(MULTIARCHOBJS)) \
 	$(patsubst %.cpp, $(OBJDIR)/%.d, $(QTGUISRCS)) \
 	$(patsubst %.m, $(OBJDIR)/%.d, $(OBJCSRCS)) \
 	$(OBJDIR)/proxmark3.d $(OBJDIR)/flash.d $(OBJDIR)/flasher.d $(OBJDIR)/fpga_compress.d

From 7d25c72e40537a8ca36804ebacc49f992faaaaef Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 10 Mar 2019 12:55:17 +0100
Subject: [PATCH 0724/1938] Makefile: recompile arm only when needed

---
 armsrc/Makefile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/armsrc/Makefile b/armsrc/Makefile
index 53a8b150e..e3dbb7127 100644
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -176,9 +176,8 @@ all: $(OBJS)
 
 .DELETE_ON_ERROR:
 
-# version.c should be remade on every compilation
-.PHONY: version.c
-version.c: default_version.c
+# version.c should be remade on every time fullimage.stage1.elf should be remade
+version.c: default_version.c $(OBJDIR)/fpga_version_info.o $(OBJDIR)/fpga_all.o $(THUMBOBJ) $(ARMOBJ)
 	perl ../tools/mkversion.pl .. > $@ || $(COPY) $^ $@
 
 fpga_version_info.c: $(FPGA_BITSTREAMS) $(FPGA_COMPRESSOR)

From 40ccdb0e735a15deac9287320c92ca05c9faf35c Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 10 Mar 2019 14:39:46 +0100
Subject: [PATCH 0725/1938] clean up

---
 armsrc/hitag2.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/armsrc/hitag2.c b/armsrc/hitag2.c
index d408c0ab3..be82e63dd 100644
--- a/armsrc/hitag2.c
+++ b/armsrc/hitag2.c
@@ -1227,16 +1227,13 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
     bool bStop = false;
     bool bQuitTraceFull = false;
 
-    FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-    // Reset the return status
     bSuccessful = false;
 
-    // Clean up trace and prepare it for storing frames
+    FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
+
     clear_trace();
     set_tracing(true);
 
-    //DbpString("Starting Hitag reader family");
-
     // Check configuration
     switch (htf) {
         case RHT2F_PASSWORD: {
@@ -1360,8 +1357,9 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
         return;
     }
     uint8_t attempt_count = 0;
-    while (!bStop && !BUTTON_PRESS()) {
-        // Watchdog hit
+    
+    while (!bStop && !BUTTON_PRESS() && !usb_poll_validate_length() ) {
+
         WDT_HIT();
 
         // Check if frame was captured and store it
@@ -1499,7 +1497,6 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
                         rxlen++;
                     }
                 } else {
-                    //Dbprintf("DEBUG: Wierd2");
                     errorCount++;
                     // Ignore wierd value, is to small to mean anything
                 }

From b26e60dae9de19cd6e8c2e80a094b070b1869888 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 10 Mar 2019 14:40:41 +0100
Subject: [PATCH 0726/1938] turn off fpc default

---
 armsrc/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/armsrc/Makefile b/armsrc/Makefile
index e3dbb7127..7e948293a 100644
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -23,12 +23,12 @@ APP_CFLAGS = -DWITH_CRC \
 			 -DWITH_FELICA \
  			 -DWITH_FLASH \
 			 -DWITH_SMARTCARD \
-			 -DWITH_FPC \
 			 -DWITH_HFSNOOP \
 			 -DWITH_LF_SAMYRUN \
 			 -fno-strict-aliasing -ffunction-sections -fdata-sections
 
 ### IMPORTANT -  move the commented variable below this line
+#			 -DWITH_FPC \
 #			 -DWITH_LCD \
 #			 -DWITH_EMV \
 #

From 7921e363b0968fa99200ada6fb610b0ef3aa3768 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 10 Mar 2019 14:42:43 +0100
Subject: [PATCH 0727/1938] output

---
 client/cmdlf.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/cmdlf.c b/client/cmdlf.c
index f93fe27c5..1b0d6be9d 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -215,7 +215,7 @@ int CmdFlexdemod(const char *Cmd) {
     }
 
     if (start == size - LONG_WAIT) {
-        PrintAndLogEx(NORMAL, "nothing to wait for");
+		PrintAndLogEx(WARNING, "nothing to wait for");
         return 0;
     }
 
@@ -239,9 +239,9 @@ int CmdFlexdemod(const char *Cmd) {
         for (j = 0; j < 16; j++)
             sum += data[i++];
 
-        if (sum > 0 && bits[bit] != 1) PrintAndLogEx(NORMAL, "oops1 at %d", bit);
+        if (sum > 0 && bits[bit] != 1) PrintAndLogEx(WARNING, "oops1 at %d", bit);
 
-        if (sum < 0 && bits[bit] != 0) PrintAndLogEx(NORMAL, "oops2 at %d", bit);
+        if (sum < 0 && bits[bit] != 0) PrintAndLogEx(WARNING, "oops2 at %d", bit);
 
     }
 

From 7f26ed6e9f6d081f17bb0b5f83cb84b035f363dc Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 10 Mar 2019 14:44:21 +0100
Subject: [PATCH 0728/1938] chg: 'lf hitag reader' - helptext

---
 client/cmdlfhitag.c | 58 ++++++++++++++++++++++++---------------------
 1 file changed, 31 insertions(+), 27 deletions(-)

diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index f03182f34..719c01a96 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -29,6 +29,24 @@ size_t nbytes(size_t nbits) {
     return (nbits / 8) + ((nbits % 8) > 0);
 }
 
+int usage_hitag_reader(void)
+{
+    PrintAndLogEx(NORMAL, "Usage: lf hitag reader [h] <reader function #>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h          This help");
+    PrintAndLogEx(NORMAL, "   HitagS (0*)");
+    PrintAndLogEx(NORMAL, "      01 <nr> <ar>     Challenge, read all pages from a Hitag S tag");
+    PrintAndLogEx(NORMAL, "      02 <key>         Set to 0 if no authentication is needed. Read all pages from a Hitag S tag");
+    PrintAndLogEx(NORMAL, "   Hitag1 (1*)");
+    PrintAndLogEx(NORMAL, "   Hitag2 (2*)");
+    PrintAndLogEx(NORMAL, "      21 <password>    Password mode");
+    PrintAndLogEx(NORMAL, "      22 <nr> <ar>     Authentication");
+    PrintAndLogEx(NORMAL, "      23 <key>         Authentication, key is in format: ISK high + ISK low");
+    PrintAndLogEx(NORMAL, "      25               Test recorded authentications");
+    PrintAndLogEx(NORMAL, "      26               Just read UID");    
+    return 0;
+}
+
 int CmdLFHitagList(const char *Cmd) {
     uint8_t *got = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
     if (!got) {
@@ -201,62 +219,49 @@ int CmdLFHitagSim(const char *Cmd) {
 
 int CmdLFHitagReader(const char *Cmd) {
 
-    UsbCommand c = {CMD_READER_HITAG, {0, 0, 0} }; //, {param_get32ex(Cmd,0,0,10),param_get32ex(Cmd,1,0,16),param_get32ex(Cmd,2,0,16),param_get32ex(Cmd,3,0,16)}};
+    UsbCommand c = {CMD_READER_HITAG, {0, 0, 0} };
     hitag_data *htd = (hitag_data *)c.d.asBytes;
     hitag_function htf = param_get32ex(Cmd, 0, 0, 10);
 
     switch (htf) {
-        case 01: { //RHTSF_CHALLENGE
+        case RHTSF_CHALLENGE: {
             c.cmd = CMD_READ_HITAG_S;
             num_to_bytes(param_get32ex(Cmd, 1, 0, 16), 4, htd->auth.NrAr);
             num_to_bytes(param_get32ex(Cmd, 2, 0, 16), 4, htd->auth.NrAr + 4);
-        }
         break;
-        case 02: { //RHTSF_KEY
+        }
+        case RHTSF_KEY: {
             c.cmd = CMD_READ_HITAG_S;
             num_to_bytes(param_get64ex(Cmd, 1, 0, 16), 6, htd->crypto.key);
-        }
         break;
+        }
         case RHT2F_PASSWORD: {
             num_to_bytes(param_get32ex(Cmd, 1, 0, 16), 4, htd->pwd.password);
-        }
         break;
+        }
         case RHT2F_AUTHENTICATE: {
             num_to_bytes(param_get32ex(Cmd, 1, 0, 16), 4, htd->auth.NrAr);
             num_to_bytes(param_get32ex(Cmd, 2, 0, 16), 4, htd->auth.NrAr + 4);
-        }
         break;
+        }
         case RHT2F_CRYPTO: {
             num_to_bytes(param_get64ex(Cmd, 1, 0, 16), 6, htd->crypto.key);
-        }
         break;
+        }
         case RHT2F_TEST_AUTH_ATTEMPTS: {
             // No additional parameters needed
-        } break;
+            break;
+        }
         case RHT2F_UID_ONLY: {
             // No additional parameters needed
-        } break;
+            break;
+        }
         default: {
             PrintAndLogEx(NORMAL, "\nError: unkown reader function %d", htf);
-            PrintAndLogEx(NORMAL, "");
-            PrintAndLogEx(NORMAL, "Usage: hitag reader <Reader Function #>");
-            PrintAndLogEx(NORMAL, "Reader Functions:");
-            PrintAndLogEx(NORMAL, " HitagS (0*)");
-            PrintAndLogEx(NORMAL, "  01 <nr> <ar> (Challenge) read all pages from a Hitag S tag");
-            PrintAndLogEx(NORMAL, "  02 <key> (set to 0 if no authentication is needed) read all pages from a Hitag S tag");
-            PrintAndLogEx(NORMAL, " Hitag1 (1*)");
-            PrintAndLogEx(NORMAL, " Hitag2 (2*)");
-            PrintAndLogEx(NORMAL, "  21 <password> (password mode)");
-            PrintAndLogEx(NORMAL, "  22 <nr> <ar> (authentication)");
-            PrintAndLogEx(NORMAL, "  23 <key> (authentication) key is in format: ISK high + ISK low");
-            PrintAndLogEx(NORMAL, "  25 (test recorded authentications)");
-            PrintAndLogEx(NORMAL, "  26 just read UID");
-            return 1;
+            return usage_hitag_reader();
         }
-        break;
     }
 
-    // Copy the hitag2 function into the first argument
     c.arg[0] = htf;
     clearCommandBuffer();
     SendCommand(&c);
@@ -266,7 +271,6 @@ int CmdLFHitagReader(const char *Cmd) {
         return 1;
     }
 
-    // Check the return status, stored in the first argument
     if (resp.arg[0] == false) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - hitag failed");
         return 1;

From 119e3f0ed9b6902b99fbd48609e94106c1ec4a0d Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Mon, 11 Mar 2019 00:21:14 +0100
Subject: [PATCH 0729/1938] Makefile: allow alternative platforms, try make
 PLATFORM=foo

---
 Makefile               | 17 +++++++++++++
 armsrc/Makefile        | 21 +++++++++++++---
 client/Makefile        | 19 ++++++++++++--
 common/Makefile.common |  8 +++---
 common/Makefile.hal    | 56 ++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 112 insertions(+), 9 deletions(-)
 create mode 100644 common/Makefile.hal

diff --git a/Makefile b/Makefile
index fb7cd8a2d..27c571ad9 100644
--- a/Makefile
+++ b/Makefile
@@ -23,6 +23,23 @@ else
   PATHSEP=\\#
 endif
 
+ifeq ($(PLATFORM),)
+  -include Makefile.platform
+  ifeq ($(PLATFORM),)
+    PLATFORM=PM3RDV4
+  else
+    ${info using saved PLATFORM '$(PLATFORM)'}
+  endif
+endif
+
+include common/Makefile.hal
+
+$(info ===================================================================)
+$(info PLATFORM: $(PLATFORM))
+$(info $(PLTNAME))
+$(info Included supports: $(PLATFORM_DEFS))
+$(info ===================================================================)
+
 all clean: %: client/% bootrom/% armsrc/% recovery/% mfkey/% nonce2key/%
 
 mfkey/%: FORCE
diff --git a/armsrc/Makefile b/armsrc/Makefile
index 7e948293a..382407e1d 100644
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -8,10 +8,27 @@
 
 APP_INCLUDES = apps.h
 
+# This Makefile might have been called directly, not via the root Makefile, so:
+ifeq ($(PLTNAME),)
+  -include ../Makefile.platform
+  ifeq ($(PLATFORM),)
+    PLATFORM=PM3RDV4
+  else
+    ${info using saved PLATFORM '$(PLATFORM)'}
+  endif
+  include ../common/Makefile.hal
+  $(info ===================================================================)
+  $(info PLATFORM: $(PLATFORM))
+  $(info $(PLTNAME))
+  $(info Included supports: $(PLATFORM_DEFS))
+  $(info ===================================================================)
+endif
+
 #remove one of the following defines and comment out the relevant line
 #in the next section to remove that particular feature from compilation.
 # NO space,TABs after the "\" sign.
-APP_CFLAGS = -DWITH_CRC \
+APP_CFLAGS = $(PLATFORM_DEFS) \
+			 -DWITH_CRC \
 			 -DON_DEVICE \
 			 -DWITH_LF \
 			 -DWITH_HITAG \
@@ -21,8 +38,6 @@ APP_CFLAGS = -DWITH_CRC \
 			 -DWITH_ISO14443a \
 			 -DWITH_ICLASS \
 			 -DWITH_FELICA \
- 			 -DWITH_FLASH \
-			 -DWITH_SMARTCARD \
 			 -DWITH_HFSNOOP \
 			 -DWITH_LF_SAMYRUN \
 			 -fno-strict-aliasing -ffunction-sections -fdata-sections
diff --git a/client/Makefile b/client/Makefile
index c7a3df7b6..ec12dedca 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -4,6 +4,22 @@
 # the license.
 #-----------------------------------------------------------------------------
 
+# This Makefile might have been called directly, not via the root Makefile, so:
+ifeq ($(PLTNAME),)
+  -include ../Makefile.platform
+  ifeq ($(PLATFORM),)
+    PLATFORM=PM3RDV4
+  else
+    ${info using saved PLATFORM '$(PLATFORM)'}
+  endif
+  include ../common/Makefile.hal
+  $(info ===================================================================)
+  $(info PLATFORM: $(PLATFORM))
+  $(info $(PLTNAME))
+  $(info Included supports: $(PLATFORM_DEFS))
+  $(info ===================================================================)
+endif
+
 # reveng will compile without macros, but these may be useful:
 # Add -DBMPMACRO to use bitmap size constant macros (edit config.h)
 # Add -DNOFORCE  to disable the -F switch
@@ -90,8 +106,7 @@ else
     QTGUIOBJS = $(OBJDIR)/guidummy.o
 endif
 
-# RDV40 flag enables flashmemory commands in client.  comment out if you don't have rdv40
-CFLAGS += -DWITH_FLASH -DWITH_SMARTCARD
+CFLAGS += $(PLATFORM_DEFS)
 
 # Flags to generate temporary dependency files
 DEPFLAGS = -MT $@ -MMD -MP -MF $(OBJDIR)/$*.Td
diff --git a/common/Makefile.common b/common/Makefile.common
index 59ac01f29..bfbfc0a80 100644
--- a/common/Makefile.common
+++ b/common/Makefile.common
@@ -21,13 +21,13 @@ platform = $(shell uname)
 all:
 
 CROSS  ?= arm-none-eabi-
-CC	= $(CROSS)gcc
-AS	= $(CROSS)as
-LD	= $(CROSS)ld
+CC = $(CROSS)gcc
+AS = $(CROSS)as
+LD = $(CROSS)ld
 OBJCOPY = $(CROSS)objcopy
 GZIP=gzip
 
-OBJDIR	= obj
+OBJDIR = obj
 
 INCLUDE = -I../include -I../common -I.
 
diff --git a/common/Makefile.hal b/common/Makefile.hal
new file mode 100644
index 000000000..e34095f2d
--- /dev/null
+++ b/common/Makefile.hal
@@ -0,0 +1,56 @@
+define KNOWN_PLATFORMS
+
++--------------------------------------------------------+
+| PLATFORM      | DESCRIPTION                            |
++--------------------------------------------------------+
+| PM3RDV4 (def) | Proxmark3 rdv4      with AT91SAM7S512  |
++--------------------------------------------------------+
+| PM3EVO        | Proxmark3 EVO       with AT91SAM7S512  |
++--------------------------------------------------------+
+| PM3EASY       | Proxmark3 rdv3 Easy with AT91SAM7S256  |
++--------------------------------------------------------+
+| PM3RDV2       | Proxmark3 rdv2      with AT91SAM7S512  |
++--------------------------------------------------------+
+| PM3OLD256     | Proxmark3 V1        with AT91SAM7S256  |
++--------------------------------------------------------+
+| PM3OLD512     | Proxmark3 V1        with AT91SAM7S512  |
++--------------------------------------------------------+
+
+Options to define platform:
+(1) Run make with PLATFORM specified as follows:
+make PLATFORM=PM3EASY
+
+(2) Save a file called Makefile.platform with contents:
+PLATFORM=PM3EASY
+
+endef
+
+PLTNAME = Unknown Platform
+
+ifeq ($(PLATFORM),PM3RDV4)
+  MCU = AT91SAM7S512
+  PLATFORM_DEFS = -DWITH_SMARTCARD -DWITH_FLASH
+  PLTNAME = Proxmark3 rdv4
+else ifeq ($(PLATFORM),PM3EVO)
+  MCU = AT91SAM7S512
+  PLTNAME = Proxmark3 EVO
+else ifeq ($(PLATFORM),PM3EASY)
+  MCU = AT91SAM7S256
+  PLTNAME = Proxmark3 rdv3 Easy
+else ifeq ($(PLATFORM),PM3RDV2)
+  MCU = AT91SAM7S512
+  PLTNAME = Proxmark3 rdv2
+else ifeq ($(PLATFORM),PM3OLD256)
+  MCU = AT91SAM7S256
+  PLTNAME = Proxmark3 V1 with AT91SAM7S256
+else ifeq ($(PLATFORM),PM3OLD512)
+  MCU = AT91SAM7S512
+  PLTNAME = Proxmark3 V1 with AT91SAM7S512
+else
+  $(error Invalid or empty PLATFORM: $(PLATFORM). Known platforms: $(KNOWN_PLATFORMS))
+endif
+
+export PLATFORM
+export PLTNAME
+export MCU
+export PLATFORM_DEFS

From eb906859b5eceeec9026d69a5768d58747f61716 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 11 Mar 2019 07:38:20 +0100
Subject: [PATCH 0730/1938] fix: 'lf ti demod' - hide debug messages

---
 client/cmdlfti.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/cmdlfti.c b/client/cmdlfti.c
index 8c609bddf..6abb9b5de 100644
--- a/client/cmdlfti.c
+++ b/client/cmdlfti.c
@@ -210,11 +210,11 @@ int CmdTIDemod(const char *Cmd) {
 
     RepaintGraphWindow();
 
-    PrintAndLogEx(INFO, "raw tag bits = %s", bits);
+    PrintAndLogEx(DEBUG, "TI tag : raw tag bits | %s", bits);
 
     TagType = (shift3 >> 8) & 0xFF;
     if (TagType != ((shift0 >> 16) & 0xFF)) {
-        PrintAndLogEx(WARNING, "Error: start and stop bits do not match!");
+        PrintAndLogEx(DEBUG, "TI tag : Error: start and stop bits do not match!");
         goto out;
     } else if (TagType == 0x7E) {
         PrintAndLogEx(INFO, "Readonly TI tag detected.");

From ff22f0ca7ac8a5d7e644ad965064260274597896 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 11 Mar 2019 14:55:02 +0100
Subject: [PATCH 0731/1938] rename:  'lf snoop' -> 'lf sniff'  'hf snoop' ->
 'hf sniff'

As of now its gonna be called sniffing everywhere in the repo.
chg: 'lf search' textual
chg: 'hf search' textual
---
 client/cmdhf.c |  34 ++++++++---------
 client/cmdhf.h |   4 +-
 client/cmdlf.c | 102 +++++++++++++++++++++++++------------------------
 client/cmdlf.h |   4 +-
 4 files changed, 73 insertions(+), 71 deletions(-)

diff --git a/client/cmdhf.c b/client/cmdhf.c
index 294dc4be9..5fdce2a16 100644
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -20,19 +20,19 @@ int usage_hf_search() {
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
-int usage_hf_snoop() {
-    PrintAndLogEx(NORMAL, "Usage: hf snoop <skip pairs> <skip triggers>");
-    PrintAndLogEx(NORMAL, "The high frequence snoop will assign all available memory on device for snooped data");
-    PrintAndLogEx(NORMAL, "User the 'data samples' command to download from device,  and 'data plot' to look at it");
-    PrintAndLogEx(NORMAL, "Press button to quit the snooping.");
+int usage_hf_sniff() {
+    PrintAndLogEx(NORMAL, "Usage: hf sniff <skip pairs> <skip triggers>");
+    PrintAndLogEx(NORMAL, "The high frequence snoop will assign all available memory on device for sniffed data");
+    PrintAndLogEx(NORMAL, "User the " _YELLOW_("'data samples'") " command to download from device,  and " _YELLOW_("'data plot'") " to look at it");
+    PrintAndLogEx(NORMAL, "Press button to quit the sniffing.");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       h               - This help");
     PrintAndLogEx(NORMAL, "       <skip pairs>    - skip sample pairs");
     PrintAndLogEx(NORMAL, "       <skip triggers> - skip number of triggers");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
-    PrintAndLogEx(NORMAL, "           hf snoop");
-    PrintAndLogEx(NORMAL, "           hf snoop 1000 0");
+    PrintAndLogEx(NORMAL, "           hf sniff");
+    PrintAndLogEx(NORMAL, "           hf sniff 1000 0");
     return 0;
 }
 
@@ -43,40 +43,40 @@ int CmdHFSearch(const char *Cmd) {
 
     int ans = CmdHF14AInfo("s");
     if (ans > 0) {
-        PrintAndLogEx(SUCCESS, "\nValid ISO14443-A Tag Found\n");
+        PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("ISO14443-A tag") " found\n");
         return ans;
     }
     ans = HF15Reader("", false);
     if (ans) {
-        PrintAndLogEx(SUCCESS, "\nValid ISO15693 Tag Found\n");
+        PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("ISO15693 tag") " found\n");
         return ans;
     }
     ans = HFLegicReader("", false);
     if (ans == 0) {
-        PrintAndLogEx(SUCCESS, "\nValid LEGIC Tag Found\n");
+        PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("LEGIC tag") " found\n");
         return 1;
     }
     ans = CmdHFTopazReader("s");
     if (ans == 0) {
-        PrintAndLogEx(SUCCESS, "\nValid Topaz Tag Found\n");
+        PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Topaz tag") " found\n");
         return 1;
     }
     // 14b and iclass is the longest test (put last)
     ans = HF14BReader(false); //CmdHF14BReader("s");
     if (ans) {
-        PrintAndLogEx(SUCCESS, "\nValid ISO14443-B Tag Found\n");
+        PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("ISO14443-B tag") " found\n");
         return ans;
     }
     ans = HFiClassReader("", false, false);
     if (ans) {
-        PrintAndLogEx(SUCCESS, "\nValid iClass Tag (or PicoPass Tag) Found\n");
+        PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("iClass tag / PicoPass tag") " found\n");
         return ans;
     }
 
     /*
     ans = CmdHFFelicaReader("s");
     if (ans) {
-        PrintAndLogEx(NORMAL, "\nValid ISO18092 / FeliCa Found\n");
+        PrintAndLogEx(NORMAL, "\nValid " _GREEN_("ISO18092 / FeliCa tag") " found\n");
         return ans;
     }
     */
@@ -93,9 +93,9 @@ int CmdHFTune(const char *Cmd) {
     return 0;
 }
 
-int CmdHFSnoop(const char *Cmd) {
+int CmdHFSniff(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
-    if (cmdp == 'h') return usage_hf_snoop();
+    if (cmdp == 'h') return usage_hf_sniff();
 
     int skippairs =  param_get32ex(Cmd, 0, 0, 10);
     int skiptriggers =  param_get32ex(Cmd, 1, 0, 10);
@@ -124,7 +124,7 @@ static command_t CommandTable[] = {
     {"list",        CmdTraceList,     0, "List protocol data in trace buffer"},
     {"tune",        CmdHFTune,        0, "Continuously measure HF antenna tuning"},
     {"search",      CmdHFSearch,      1, "Search for known HF tags [preliminary]"},
-    {"snoop",       CmdHFSnoop,       0, "<samples to skip (10000)> <triggers to skip (1)> Generic HF Snoop"},
+    {"sniff",       CmdHFSniff,       0, "<samples to skip (10000)> <triggers to skip (1)> Generic HF Sniff"},
     {NULL, NULL, 0, NULL}
 };
 
diff --git a/client/cmdhf.h b/client/cmdhf.h
index 6511cc2b8..9e41f2138 100644
--- a/client/cmdhf.h
+++ b/client/cmdhf.h
@@ -36,8 +36,8 @@
 extern int CmdHF(const char *Cmd);
 extern int CmdHFTune(const char *Cmd);
 extern int CmdHFSearch(const char *Cmd);
-extern int CmdHFSnoop(const char *Cmd);
+extern int CmdHFSniff(const char *Cmd);
 
 extern int usage_hf_search();
-extern int usage_hf_snoop();
+extern int usage_hf_sniff();
 #endif
diff --git a/client/cmdlf.c b/client/cmdlf.c
index 1b0d6be9d..b62bcd202 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -41,13 +41,13 @@ int usage_lf_read(void) {
     PrintAndLogEx(NORMAL, "         lf read s");
     return 0;
 }
-int usage_lf_snoop(void) {
-    PrintAndLogEx(NORMAL, "Snoop low frequence signal. Use 'lf config' to set parameters.");
-    PrintAndLogEx(NORMAL, "Usage: lf snoop [h]");
+int usage_lf_sniff(void) {
+    PrintAndLogEx(NORMAL, "Sniff low frequence signal. Use " _YELLOW_("'lf config'") " to set parameters.");
+    PrintAndLogEx(NORMAL, "Usage: lf sniff [h]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "      h         This help");
     PrintAndLogEx(NORMAL, "This function takes no arguments. ");
-    PrintAndLogEx(NORMAL, "Use 'lf config' to set parameters.");
+    PrintAndLogEx(NORMAL, "Use " _YELLOW_("'lf config'") " to set parameters.");
     return 0;
 }
 int usage_lf_config(void) {
@@ -384,9 +384,9 @@ int CmdLFRead(const char *Cmd) {
     return lf_read(silent, samples);
 }
 
-int CmdLFSnoop(const char *Cmd) {
+int CmdLFSniff(const char *Cmd) {
     uint8_t cmdp = tolower(param_getchar(Cmd, 0));
-    if (cmdp == 'h') return usage_lf_snoop();
+    if (cmdp == 'h') return usage_lf_sniff();
 
     UsbCommand c = {CMD_LF_SNOOP_RAW_ADC_SAMPLES, {0, 0, 0}};
     clearCommandBuffer();
@@ -830,7 +830,7 @@ bool CheckChipType(bool getDeviceData) {
     //check for em4x05/em4x69 chips first
     uint32_t word = 0;
     if (EM4x05IsBlock0(&word)) {
-        PrintAndLogEx(SUCCESS, "\nValid EM4x05/EM4x69 Chip Found");
+        PrintAndLogEx(SUCCESS, "\nChipset detection : " _GREEN_("EM4x05/EM4x69") " found");
         PrintAndLogEx(SUCCESS, "Try " _YELLOW_("`lf em 4x05`") " commands");
         retval = true;
         goto out;
@@ -838,12 +838,12 @@ bool CheckChipType(bool getDeviceData) {
 
     //check for t55xx chip...
     if (tryDetectP1(true)) {
-        PrintAndLogEx(SUCCESS, "\nValid T55xx Chip Found");
+        PrintAndLogEx(SUCCESS, "\nChipset detection : " _GREEN_("Atmel T55xx") " found");        
         PrintAndLogEx(SUCCESS, "Try " _YELLOW_("`lf t55xx`")" commands");
         retval = true;
         goto out;
     }
-
+    
 out:
     save_restoreGB(GRAPH_RESTORE);
     save_restoreDB(GRAPH_RESTORE);
@@ -873,8 +873,9 @@ int CmdLFfind(const char *Cmd) {
 
     PrintAndLogEx(INFO, "NOTE: some demods output possible binary");
     PrintAndLogEx(INFO, "if it finds something that looks like a tag");
-    PrintAndLogEx(INFO, "False Positives " _YELLOW_("ARE") "possible\n");
-    PrintAndLogEx(INFO, "\nChecking for known tags:\n");
+    PrintAndLogEx(INFO, "False Positives " _YELLOW_("ARE") "possible");
+    PrintAndLogEx(INFO, "");
+    PrintAndLogEx(INFO, "Checking for known tags:\n");
 
     // only run these tests if device is online
     if (isOnline) {
@@ -885,48 +886,48 @@ int CmdLFfind(const char *Cmd) {
             PrintAndLogEx(INFO, "Signal looks just like noise. Looking for Hitag signal now.");
 
             // 26 === RHT2F_UID_ONLY
-            if (CmdLFHitagReader("26") == 0) { PrintAndLogEx(SUCCESS, "\nValid Hitag Found!"); return 1;}
-            if (CmdCOTAGRead("") > 0) { PrintAndLogEx(SUCCESS, "\nValid COTAG ID Found!"); return 1;}
+            if (CmdLFHitagReader("26") == 0) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Hitag") " found!"); return 1;}
+            if (CmdCOTAGRead("") > 0) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("COTAG ID") " found!"); return 1;}
 
-            PrintAndLogEx(FAILED, "\nNo Data Found! - maybe not an LF tag?");
+            PrintAndLogEx(FAILED, "\nNo data found! - maybe not an LF tag?");
             return 0;
         }
     }
 
-    if (EM4x50Read("", false))  { PrintAndLogEx(SUCCESS, "\nValid EM4x50 ID Found!"); return 1;}
-    if (CmdAWIDDemod(""))       { PrintAndLogEx(SUCCESS, "\nValid AWID ID Found!"); goto out;}
-    if (CmdEM410xDemod(""))     { PrintAndLogEx(SUCCESS, "\nValid EM410x ID Found!"); goto out;}
-    if (CmdFdxDemod(""))        { PrintAndLogEx(SUCCESS, "\nValid FDX-B ID Found!"); goto out;}
-    if (CmdGuardDemod(""))      { PrintAndLogEx(SUCCESS, "\nValid Guardall G-Prox II ID Found!"); goto out; }
-    if (CmdHIDDemod(""))        { PrintAndLogEx(SUCCESS, "\nValid HID Prox ID Found!"); goto out;}
-    if (CmdPSKIdteck(""))       { PrintAndLogEx(SUCCESS, "\nValid Idteck ID Found!"); goto out;}
-    if (CmdIndalaDemod(""))     { PrintAndLogEx(SUCCESS, "\nValid Indala ID Found!");  goto out;}
-    if (CmdIOProxDemod(""))     { PrintAndLogEx(SUCCESS, "\nValid IO Prox ID Found!"); goto out;}
-    if (CmdJablotronDemod(""))  { PrintAndLogEx(SUCCESS, "\nValid Jablotron ID Found!"); goto out;}
-    if (CmdLFNedapDemod(""))    { PrintAndLogEx(SUCCESS, "\nValid NEDAP ID Found!"); goto out;}
-    if (CmdNexWatchDemod(""))   { PrintAndLogEx(SUCCESS, "\nValid NexWatch ID Found!"); goto out;}
-    if (CmdNoralsyDemod(""))    { PrintAndLogEx(SUCCESS, "\nValid Noralsy ID Found!"); goto out;}
-    if (CmdKeriDemod(""))       { PrintAndLogEx(SUCCESS, "\nValid KERI ID Found!"); goto out;}
-    if (CmdPacDemod(""))        { PrintAndLogEx(SUCCESS, "\nValid PAC/Stanley ID Found!"); goto out;}
-    if (CmdParadoxDemod(""))    { PrintAndLogEx(SUCCESS, "\nValid Paradox ID Found!"); goto out;}
-    if (CmdPrescoDemod(""))     { PrintAndLogEx(SUCCESS, "\nValid Presco ID Found!"); goto out;}
-    if (CmdPyramidDemod(""))    { PrintAndLogEx(SUCCESS, "\nValid Pyramid ID Found!"); goto out;}
-    if (CmdSecurakeyDemod(""))  { PrintAndLogEx(SUCCESS, "\nValid Securakey ID Found!"); goto out;}
-    if (CmdVikingDemod(""))     { PrintAndLogEx(SUCCESS, "\nValid Viking ID Found!"); goto out;}
-    if (CmdVisa2kDemod(""))     { PrintAndLogEx(SUCCESS, "\nValid Visa2000 ID Found!"); goto out;}
-    if (CmdTIDemod(""))         { PrintAndLogEx(SUCCESS, "\nValid Texas Instrument ID Found!"); goto out;}
-    //if (CmdFermaxDemod("")) { PrintAndLogEx(SUCCESS, "\nValid Fermax ID Found!"); goto out;}
-    // flexdemod?
+    if (EM4x50Read("", false))  { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("EM4x50 ID") " found!"); return 1;}
+    if (CmdAWIDDemod(""))       { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("AWID ID") " found!"); goto out;}
+    if (CmdEM410xDemod(""))     { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("EM410x ID") " found!"); goto out;}
+    if (CmdFdxDemod(""))        { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("FDX-B ID") " found!"); goto out;}
+    if (CmdGuardDemod(""))      { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Guardall G-Prox II ID") " found!"); goto out; }
+    if (CmdHIDDemod(""))        { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("HID Prox ID") " found!"); goto out;}
+    if (CmdPSKIdteck(""))       { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Idteck ID") " found!"); goto out;}
+    if (CmdIndalaDemod(""))     { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Indala ID") " found!");  goto out;}
+    if (CmdIOProxDemod(""))     { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("IO Prox ID") " found!"); goto out;}
+    if (CmdJablotronDemod(""))  { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Jablotron ID") " found!"); goto out;}
+    if (CmdLFNedapDemod(""))    { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("NEDAP ID") " found!"); goto out;}
+    if (CmdNexWatchDemod(""))   { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("NexWatch ID") " found!"); goto out;}
+    if (CmdNoralsyDemod(""))    { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Noralsy ID") " found!"); goto out;}
+    if (CmdKeriDemod(""))       { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("KERI ID") " found!"); goto out;}
+    if (CmdPacDemod(""))        { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("PAC/Stanley ID") " found!"); goto out;}
+    if (CmdParadoxDemod(""))    { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Paradox ID") " found!"); goto out;}
+    if (CmdPrescoDemod(""))     { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Presco ID") " found!"); goto out;}
+    if (CmdPyramidDemod(""))    { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Pyramid ID") " found!"); goto out;}
+    if (CmdSecurakeyDemod(""))  { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Securakey ID") " found!"); goto out;}
+    if (CmdVikingDemod(""))     { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Viking ID") " found!"); goto out;}
+    if (CmdVisa2kDemod(""))     { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Visa2000 ID") " found!"); goto out;}
+    if (CmdTIDemod(""))         { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Texas Instrument ID") " found!"); goto out;}
+    //if (CmdFermaxDemod(""))     { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Fermax ID") " found!"); goto out;}
+    //if (CmdFlexDemod(""))       { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Flex ID") " found!"); goto out;}
 
-    PrintAndLogEx(FAILED, "\nNo known 125/134 KHz tags Found!\n");
+    PrintAndLogEx(FAILED, _RED_("No known 125/134 KHz tags found!"));
 
     if (testRaw == 'u') {
         //test unknown tag formats (raw mode)
-        PrintAndLogEx(INFO, "\nChecking for Unknown tags:\n");
-        ans = AutoCorrelate(GraphBuffer, GraphBuffer, GraphTraceLen, 4000, false, false);
+        PrintAndLogEx(INFO, "\nChecking for unknown tags:\n");
+        ans = AutoCorrelate(GraphBuffer, GraphBuffer, GraphTraceLen, 8000, false, false);
         if (ans > 0) {
 
-            PrintAndLogEx(INFO, "Possible Auto Correlation of %d repeating samples", ans);
+            PrintAndLogEx(INFO, "Possible auto correlation of %d repeating samples", ans);
 
             if (ans % 8 == 0)
                 PrintAndLogEx(INFO, "Possible %d bytes", (ans / 8));
@@ -935,26 +936,27 @@ int CmdLFfind(const char *Cmd) {
         //fsk
         if (GetFskClock("", false)) {
             if (FSKrawDemod("", true)) {
-                PrintAndLogEx(NORMAL, "\nUnknown FSK Modulated Tag Found!");
+                PrintAndLogEx(NORMAL, "\nUnknown FSK Modulated Tag found!");
                 goto out;
             }
         }
 
         bool st = true;
         if (ASKDemod_ext("0 0 0", true, false, 1, &st)) {
-            PrintAndLogEx(NORMAL, "\nUnknown ASK Modulated and Manchester encoded Tag Found!");
-            PrintAndLogEx(NORMAL, "\nif it does not look right it could instead be ASK/Biphase - try 'data rawdemod ab'");
+            PrintAndLogEx(NORMAL, "\nUnknown ASK Modulated and Manchester encoded Tag found!");
+            PrintAndLogEx(NORMAL, "if it does not look right it could instead be ASK/Biphase - try " _YELLOW_("'data rawdemod ab'") );
             goto out;
         }
 
         if (CmdPSK1rawDemod("")) {
-            PrintAndLogEx(NORMAL, "Possible unknown PSK1 Modulated Tag Found above!\n\nCould also be PSK2 - try 'data rawdemod p2'");
-            PrintAndLogEx(NORMAL, "\nCould also be PSK3 - [currently not supported]");
-            PrintAndLogEx(NORMAL, "\nCould also be NRZ - try 'data nrzrawdemod");
+            PrintAndLogEx(NORMAL, "Possible unknown PSK1 Modulated Tag found above!");
+            PrintAndLogEx(NORMAL, "    Could also be PSK2 - try " _YELLOW_("'data rawdemod p2'") );
+            PrintAndLogEx(NORMAL, "    Could also be PSK3 - [currently not supported]");
+            PrintAndLogEx(NORMAL, "    Could also be  NRZ - try " _YELLOW_("'data rawdemod nr") );
             goto out;
         }
 
-        PrintAndLogEx(FAILED, "\nNo Data Found!\n");
+        PrintAndLogEx(FAILED, _RED_("\nNo data found!") );
     }
 out:
     // identify chipset
@@ -998,7 +1000,7 @@ static command_t CommandTable[] = {
     {"simfsk",      CmdLFfskSim,        0, "[c <clock>] [i] [H <fcHigh>] [L <fcLow>] [d <hexdata>] \n\t\t-- Simulate LF FSK tag from demodbuffer or input"},
     {"simpsk",      CmdLFpskSim,        0, "[1|2|3] [c <clock>] [i] [r <carrier>] [d <raw hex to sim>] \n\t\t-- Simulate LF PSK tag from demodbuffer or input"},
     {"simbidir",    CmdLFSimBidir,      0, "Simulate LF tag (with bidirectional data transmission between reader and tag)"},
-    {"snoop",       CmdLFSnoop,         0, "Snoop LF"},
+    {"sniff",       CmdLFSniff,         0, "Sniff LF traffic between reader and tag"},
     {"vchdemod",    CmdVchDemod,        1, "['clone'] -- Demodulate samples for VeriChip"},
     {NULL, NULL, 0, NULL}
 };
diff --git a/client/cmdlf.h b/client/cmdlf.h
index 3e2aff271..ca3de7eb4 100644
--- a/client/cmdlf.h
+++ b/client/cmdlf.h
@@ -65,7 +65,7 @@ extern int CmdLFaskSim(const char *Cmd);
 extern int CmdLFfskSim(const char *Cmd);
 extern int CmdLFpskSim(const char *Cmd);
 extern int CmdLFSimBidir(const char *Cmd);
-extern int CmdLFSnoop(const char *Cmd);
+extern int CmdLFSniff(const char *Cmd);
 extern int CmdVchDemod(const char *Cmd);
 extern int CmdLFfind(const char *Cmd);
 
@@ -74,7 +74,7 @@ extern bool lf_read(bool silent, uint32_t samples);
 // usages helptext
 extern int usage_lf_cmdread(void);
 extern int usage_lf_read(void);
-extern int usage_lf_snoop(void);
+extern int usage_lf_sniff(void);
 extern int usage_lf_config(void);
 extern int usage_lf_simfsk(void);
 extern int usage_lf_simask(void);

From 780424fe11eb4186f45d4e72f43bb854c2969b96 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 11 Mar 2019 14:56:03 +0100
Subject: [PATCH 0732/1938] chg:  hitag2,  some clean up,  also testing to
 remove  relay_off,  since its never relay_on anywhere.

---
 armsrc/hitag2.c | 88 +++++++++++++++----------------------------------
 1 file changed, 27 insertions(+), 61 deletions(-)

diff --git a/armsrc/hitag2.c b/armsrc/hitag2.c
index be82e63dd..f328ccb0d 100644
--- a/armsrc/hitag2.c
+++ b/armsrc/hitag2.c
@@ -156,8 +156,9 @@ static u64 _hitag2_round(u64 *state) {
 
 static u32 _hitag2_byte(u64 *x) {
     u32 i, c;
-
-    for (i = 0, c = 0; i < 8; i++) c += (u32) _hitag2_round(x) << (i ^ 7);
+    for (i = 0, c = 0; i < 8; i++) {
+        c += (u32) _hitag2_round(x) << (i ^ 7);
+    }
     return c;
 }
 
@@ -659,7 +660,6 @@ static bool hitag2_crypto(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t *
     return true;
 }
 
-
 static bool hitag2_authenticate(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t *txlen) {
     // Reset the transmission frame length
     *txlen = 0;
@@ -702,7 +702,6 @@ static bool hitag2_authenticate(uint8_t *rx, const size_t rxlen, uint8_t *tx, si
     return true;
 }
 
-
 static bool hitag2_test_auth_attempts(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t *txlen) {
 
     // Reset the transmission frame length
@@ -1225,27 +1224,19 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
     int tag_sof;
     int t_wait = HITAG_T_WAIT_MAX;
     bool bStop = false;
-    bool bQuitTraceFull = false;
 
     bSuccessful = false;
 
-    FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-
-    clear_trace();
-    set_tracing(true);
-
     // Check configuration
     switch (htf) {
         case RHT2F_PASSWORD: {
             Dbprintf("List identifier in password mode");
             memcpy(password, htd->pwd.password, 4);
             blocknr = 0;
-            bQuitTraceFull = false;
             bQuiet = false;
             bPwd = false;
+            break;
         }
-        break;
-
         case RHT2F_AUTHENTICATE: {
             DbpString("Authenticating using nr,ar pair:");
             memcpy(NrAr, htd->auth.NrAr, 8);
@@ -1253,10 +1244,8 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
             bQuiet = false;
             bCrypto = false;
             bAuthenticating = false;
-            bQuitTraceFull = true;
+            break;
         }
-        break;
-
         case RHT2F_CRYPTO: {
             DbpString("Authenticating using key:");
             memcpy(key, htd->crypto.key, 6);  //HACK; 4 or 6??  I read both in the code.
@@ -1265,35 +1254,35 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
             bQuiet = false;
             bCrypto = false;
             bAuthenticating = false;
-            bQuitTraceFull = true;
+            break;
         }
-        break;
-
         case RHT2F_TEST_AUTH_ATTEMPTS: {
             Dbprintf("Testing %d authentication attempts", (auth_table_len / 8));
             auth_table_pos = 0;
             memcpy(NrAr, auth_table, 8);
-            bQuitTraceFull = false;
             bQuiet = false;
             bCrypto = false;
+            break;
         }
-        break;
         case RHT2F_UID_ONLY: {
             blocknr = 0;
             bQuiet = false;
             bCrypto = false;
             bAuthenticating = false;
-            bQuitTraceFull = true;
+            break;
         }
-        break;
         default: {
             Dbprintf("Error, unknown function: %d", htf);
             set_tracing(false);
             return;
         }
-        break;
     }
 
+    FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
+    BigBuf_free();    
+    clear_trace();
+    set_tracing(true);
+
     LED_D_ON();
     hitag2_init();
 
@@ -1303,12 +1292,9 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
 
     // Set fpga in edge detect with reader field, we can modulate as reader now
     FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_READER_FIELD);
-    SpinDelay(20);
-
-    // Set Frequency divisor which will drive the FPGA and analog mux selection
     FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
     SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
-    RELAY_OFF();
+//    RELAY_OFF();
 
     // Disable modulation at default, which means enable the field
     LOW(GPIO_SSC_DOUT);
@@ -1352,9 +1338,7 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
         // DbpString("Configured for hitag2 reader");
     } else {
         Dbprintf("Error, unknown hitag reader type: %d", htf);
-        set_tracing(false);
-        LED_D_OFF();
-        return;
+                goto out;
     }
     uint8_t attempt_count = 0;
     
@@ -1365,15 +1349,7 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
         // Check if frame was captured and store it
         if (rxlen > 0) {
             frame_count++;
-            if (!bQuiet) {
-                if (!LogTraceHitag(rx, rxlen, response, 0, false)) {
-                    DbpString("Trace full");
-                    if (bQuitTraceFull)
-                        break;
-                    else
-                        bQuiet = true;
-                }
-            }
+            LogTraceHitag(rx, rxlen, response, 0, false);
         }
 
         // By default reset the transmission buffer
@@ -1381,34 +1357,32 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
         switch (htf) {
             case RHT2F_PASSWORD: {
                 bStop = !hitag2_password(rx, rxlen, tx, &txlen);
+                break;
             }
-            break;
             case RHT2F_AUTHENTICATE: {
                 bStop = !hitag2_authenticate(rx, rxlen, tx, &txlen);
+                break;
             }
-            break;
             case RHT2F_CRYPTO: {
                 bStop = !hitag2_crypto(rx, rxlen, tx, &txlen, false);
+                break;
             }
-            break;
             case RHT2F_TEST_AUTH_ATTEMPTS: {
                 bStop = !hitag2_test_auth_attempts(rx, rxlen, tx, &txlen);
+                break;
             }
-            break;
             case RHT2F_UID_ONLY: {
                 bStop = !hitag2_read_uid(rx, rxlen, tx, &txlen);
                 attempt_count++; //attempt 3 times to get uid then quit
                 if (!bStop && attempt_count == 3)
                     bStop = true;
+                
+                break;
             }
-            break;
             default: {
                 Dbprintf("Error, unknown function: %d", htf);
-                set_tracing(false);
-                LED_D_OFF();
-                return;
+                goto out;
             }
-            break;
         }
 
         // Send and store the reader command
@@ -1431,16 +1405,7 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
         // Add transmitted frame to total count
         if (txlen > 0) {
             frame_count++;
-            if (!bQuiet) {
-                // Store the frame in the trace
-                if (!LogTraceHitag(tx, txlen, HITAG_T_WAIT_2, 0, true)) {
-                    if (bQuitTraceFull) {
-                        break;
-                    } else {
-                        bQuiet = true;
-                    }
-                }
-            }
+            LogTraceHitag(tx, txlen, HITAG_T_WAIT_2, 0, true);
         }
 
         // Reset values for receiving frames
@@ -1509,8 +1474,9 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
             }
         }
     }
-    LED_B_OFF();
-    LED_D_OFF();
+    
+out:    
+    LEDsoff();
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);

From fd642e8f51073307a5c521a71dea23748d4a5253 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 11 Mar 2019 15:08:34 +0100
Subject: [PATCH 0733/1938] adjustemnts

---
 client/cmdhf.c | 10 ++++++----
 client/cmdlf.c |  9 +++++----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/client/cmdhf.c b/client/cmdhf.c
index 5fdce2a16..237149348 100644
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -16,15 +16,15 @@ int usage_hf_search() {
     PrintAndLogEx(NORMAL, "Usage: hf search");
     PrintAndLogEx(NORMAL, "Will try to find a HF read out of the unknown tag. Stops when found.");
     PrintAndLogEx(NORMAL, "Options:");
-    PrintAndLogEx(NORMAL, "       h - This help");
+    PrintAndLogEx(NORMAL, "       h               - This help");
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
 int usage_hf_sniff() {
-    PrintAndLogEx(NORMAL, "Usage: hf sniff <skip pairs> <skip triggers>");
     PrintAndLogEx(NORMAL, "The high frequence snoop will assign all available memory on device for sniffed data");
-    PrintAndLogEx(NORMAL, "User the " _YELLOW_("'data samples'") " command to download from device,  and " _YELLOW_("'data plot'") " to look at it");
-    PrintAndLogEx(NORMAL, "Press button to quit the sniffing.");
+    PrintAndLogEx(NORMAL, "Use " _YELLOW_("'data samples'")" command to download from device,  and " _YELLOW_("'data plot'")" to look at it");
+    PrintAndLogEx(NORMAL, "Press button to quit the sniffing.\n");
+    PrintAndLogEx(NORMAL, "Usage: hf sniff <skip pairs> <skip triggers>");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       h               - This help");
     PrintAndLogEx(NORMAL, "       <skip pairs>    - skip sample pairs");
@@ -41,6 +41,8 @@ int CmdHFSearch(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_hf_search();
 
+    PrintAndLogEx(INFO, "Checking for known tags...\n");
+        
     int ans = CmdHF14AInfo("s");
     if (ans > 0) {
         PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("ISO14443-A tag") " found\n");
diff --git a/client/cmdlf.c b/client/cmdlf.c
index b62bcd202..b6da222c6 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -42,12 +42,13 @@ int usage_lf_read(void) {
     return 0;
 }
 int usage_lf_sniff(void) {
-    PrintAndLogEx(NORMAL, "Sniff low frequence signal. Use " _YELLOW_("'lf config'") " to set parameters.");
+    PrintAndLogEx(NORMAL, "Sniff low frequence signal.");
+    PrintAndLogEx(NORMAL, "Use " _YELLOW_("'lf config'")" to set parameters.");
+    PrintAndLogEx(NORMAL, "Use " _YELLOW_("'data samples'")" command to download from device,  and " _YELLOW_("'data plot'")" to look at it");
+
     PrintAndLogEx(NORMAL, "Usage: lf sniff [h]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "      h         This help");
-    PrintAndLogEx(NORMAL, "This function takes no arguments. ");
-    PrintAndLogEx(NORMAL, "Use " _YELLOW_("'lf config'") " to set parameters.");
     return 0;
 }
 int usage_lf_config(void) {
@@ -875,7 +876,7 @@ int CmdLFfind(const char *Cmd) {
     PrintAndLogEx(INFO, "if it finds something that looks like a tag");
     PrintAndLogEx(INFO, "False Positives " _YELLOW_("ARE") "possible");
     PrintAndLogEx(INFO, "");
-    PrintAndLogEx(INFO, "Checking for known tags:\n");
+    PrintAndLogEx(INFO, "Checking for known tags...\n");
 
     // only run these tests if device is online
     if (isOnline) {

From f24d7c4ba183826037d8b40f922b37423778882f Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Mon, 11 Mar 2019 18:02:42 +0200
Subject: [PATCH 0734/1938] fix mfp wrbl command

---
 client/cmdhfmfp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdhfmfp.c b/client/cmdhfmfp.c
index aac6f3687..7178591a2 100644
--- a/client/cmdhfmfp.c
+++ b/client/cmdhfmfp.c
@@ -576,7 +576,7 @@ int CmdHFMFPWrbl(const char *cmd) {
         keylen = 16;
     }
 
-    if (blockNum > 39) {
+    if (blockNum > 255) {
         PrintAndLogEx(ERR, "<Block Num> must be in range [0..255] instead of: %d", blockNum);
         return 1;
     }

From d21302d39c309a3aadda27cb9f6ddf66b05ebf02 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Mon, 11 Mar 2019 17:49:07 +0100
Subject: [PATCH 0735/1938] make style: test for astyle presence

---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index 27c571ad9..14bf98074 100644
--- a/Makefile
+++ b/Makefile
@@ -106,6 +106,7 @@ endif
 print-%: ; @echo $* = $($*)
 
 style:
+	@which astyle >/dev/null || ( echo "Please install 'astyle' package first" ; exit 1 )
 	find . \( -name "*.[ch]" -or -name "*.cpp" -or -name "*.lua" -or -name "Makefile" \) -exec perl -pi -e 's/[ \t\r]+$$//' {} \;
 	find . \( -name "*.[ch]" -or -name "*.cpp" \) -exec astyle --formatted --mode=c --suffix=none \
 	    --indent=spaces=4 --indent-switches --indent-preprocessor \

From 2c10dc25a7ac4d24c737201489585f516148691e Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 11 Mar 2019 17:52:48 +0100
Subject: [PATCH 0736/1938] FIX: simmodule firmware update.  v3.11

---
 tools/simmodule/SIM011.BIN        | Bin 0 -> 733 bytes
 tools/simmodule/SIM011.md5.txt    |   1 +
 tools/simmodule/SIM011.sha512.txt |   1 +
 tools/simmodule/readme.txt        |  16 ++++++----------
 4 files changed, 8 insertions(+), 10 deletions(-)
 create mode 100644 tools/simmodule/SIM011.BIN
 create mode 100644 tools/simmodule/SIM011.md5.txt
 create mode 100644 tools/simmodule/SIM011.sha512.txt

diff --git a/tools/simmodule/SIM011.BIN b/tools/simmodule/SIM011.BIN
new file mode 100644
index 0000000000000000000000000000000000000000..8b33758b05f8ef52d86684319eccc4a91150f78a
GIT binary patch
literal 733
zcmbVJO=uHA7@gV7<fn<SC_=FZcPD>sqOb%Ho<yn8V+_)>9=v(+@`(pATP6O0l{9go
zAs5+-6tM*D9(sr*PE*_CGLTy_doTxYxfD}v5_dJhdUfV7@4eyszW4DYY@zW{veM}}
zWr4P5B~i{yRD`hp7kdbA{LBBB@jgGy$g4!I#4=jstUwAm({!lWtrXZpc!YbDQPXyK
z8D=lgL`DQMO{ZytJze|QKq1lM+e&MoRvR~EUgDVhIOTpG<RR5)=yw&I6}Vfs0z`y$
zYDp0uhBy)wVn{VCd_qW&K)?`0J?@uO(;|_3X-FbS5#jc*=!8;_s)j-%N=Q<TH}xP*
zs)q2nPV0r3>lF29jG8p=4t_NwN?M5UkeJeZ7r9T6V`CcYlJ0A4salXet_R(Y{($fo
z5_Q#}W+CdW>>Si-l$v~pw*<Fsclqs%Ybxc3v;^mTa6T;DI#}9+50~Nn2&@~hxdj^t
z-i_cHgXajAzroW**nJDTi}NcOHswF~`pOWRSH(+FhEGjcwc&{l{cF$)!p?X2JOV=k
z1%Zmh!u*SqIRRA+>!sZ5+@)Mh@5@t|b(0pByD5v1LVB55)O`%b6oQ!?mWv2EYq@4S
zeyE`VC#;CD^YcC(%lk8)ieT=FlAYGjk8b7mol|+#8G5%J-~avVR`D7q$Fd*iE^17c
tFyqAsd!6BzBiGv`HxUs<#*t~4ss|M<FyMjwt<I1YG0Km=_SQN_>=%y@0Qmp_

literal 0
HcmV?d00001

diff --git a/tools/simmodule/SIM011.md5.txt b/tools/simmodule/SIM011.md5.txt
new file mode 100644
index 000000000..2a564eeb6
--- /dev/null
+++ b/tools/simmodule/SIM011.md5.txt
@@ -0,0 +1 @@
+e0be612fd3e68681ef0ee4706b4f28e2 *SIM011.BIN
diff --git a/tools/simmodule/SIM011.sha512.txt b/tools/simmodule/SIM011.sha512.txt
new file mode 100644
index 000000000..54a8bfd09
--- /dev/null
+++ b/tools/simmodule/SIM011.sha512.txt
@@ -0,0 +1 @@
+752f9d8af3db214a797bacb7362a0b53eff4dd3793853e467047b7d36ddae9d1b4a050d9136225a48830d9c70bbad791f89d05553b0453f004b7bbcdc337e658 *SIM011.BIN
diff --git a/tools/simmodule/readme.txt b/tools/simmodule/readme.txt
index 7efa40205..5dad9cd85 100644
--- a/tools/simmodule/readme.txt
+++ b/tools/simmodule/readme.txt
@@ -1,23 +1,19 @@
 
 2018-12-20 Iceman
-
+2019-03-11 Iceman chg
 =======================================
 
-The latest firmware for the SIM MODULE is :   SIM010.bin
-
+The latest firmware for the SIM MODULE is :   SIM011.bin
 
 You can use it to upgrade you sim module via the pm3 client.
 
-
 pm3 --> sc upgrade -h
-pm3 --> sc upgrade f ../tools/simmodule/SIM010.bin
-
+pm3 --> sc upgrade f ../tools/simmodule/SIM011.bin
 
 
 Even its a quite fast command you should be warned.  You may brick it if you interrupt it.
 
 
-
 Run hw status command to verify that the upgrade went well.
 
 pm3 -->  hw status
@@ -29,8 +25,8 @@ If you didn't download this file from the RRG Repo be aware that it might be cor
 You find to hash text files in this folder.   They were generated with the following linux commands.
 
 
-md5sum -b SIM010.bin > SIM010.md5.txt
-sha512sum -b SIM010.bin > SIM010.sha512.txt
+md5sum -b SIM011.bin > SIM011.md5.txt
+sha512sum -b SIM011.bin > SIM011.sha512.txt
 
 
-You should validate the SIM010.bin file against these hash files in order to be sure the file is not corrupt or faulty.
\ No newline at end of file
+You should validate the SIM011.bin file against these hash files in order to be sure the file is not corrupt or faulty.
\ No newline at end of file

From 0dac90ea1523864daf561576e9d0fe5a8a5d2c44 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 11 Mar 2019 18:14:33 +0100
Subject: [PATCH 0737/1938] updated chanelog.

---
 CHANGELOG.md | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a99c8c522..34bf817bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,31 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [unreleased][unreleased]
- - Chg 'data autocorrelate' - better visual representation and added extra peak detection (@iceman)
+ - Fix 'hf mfp wrbl' - more blocks available (@merlokk)
+ - Add 'make platform' - compile for non-rdv4 devices made simpler (@doegox)
+ - Change Makefiles optimizations when recompiling (@doegox)
+ - Fix 'data load' - loads TITEST.txt again (@iceman)
+ - Change 'lf search' - now detects TI (@iceman)
+ - Change fixing signal cleaning for LF (@doegox)
+ - Fix 'lf paradox demod' - wrong check (@iceman)
+ - Change 'lf t55xx' - aquiredata uses getsamples (@iceman)
+ - Fix 'lf search' - chipset detection restore demod buffer again (@iceman)
+ - Add 'make style' (@doegox)
+ - Fix mixed tabs vs spaces. Now only use 4 space as tab. (@doegox)
+ - Fix 'lf visa2000 read' - too few samples (@iceman)
+ - Fix 'lf t55xx bruteforce' - infinity loop (@doegox)
+ - Fix 'analyse nuid' - correct crc (@doegox)
+ - Add command history not repeating logged commands (@doegox)
+ - Fix path for aidjson (@doegox)
+ - Fix missing init i2x (@doegox)
+ - Fix '14b select card' - (@doegox)
+ - Add 'hf mf ndef' - parsing of NDEF messages (@merlokk)
+ - Add 'hf mf mad' - parsing of Mifare Application Directory (@merlokk)
+ - Rename 'lf snoop' -> 'lf sniff' (@iceman)
+ - Rename 'hf snoop' -> 'hf sniff' (@iceman)
+ - Change generally added more colors (@iceman)
+ - Change 'sc upgrade' updated firmware v3.11 (RDV40) (@sentiprox)
+ - Change 'data autocorrelate' - better visual representation and added extra peak detection (@iceman)
  - Fix 'lf search' - false positive indala identification fixed (@iceman)
  - Add 'lf keri' - basic support for Keri tags (@iceman)
  - Add 'hf mf list' - re-added it again (@iceman)

From ea53e1f9811aa1d353d80deb2da367a55fde3fd9 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 11 Mar 2019 19:31:18 +0100
Subject: [PATCH 0738/1938] clean up

---
 armsrc/lfsampling.c | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/armsrc/lfsampling.c b/armsrc/lfsampling.c
index 12517132e..53b8e75b3 100644
--- a/armsrc/lfsampling.c
+++ b/armsrc/lfsampling.c
@@ -239,7 +239,9 @@ uint32_t ReadLF(bool activeField, bool silent, int sample_size) {
     if (!silent)
         printConfig();
     LFSetupFPGAForADC(config.divisor, activeField);
-    return DoAcquisition_config(silent, sample_size);
+	uint32_t ret = DoAcquisition_config(silent, sample_size);
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+	return ret;
 }
 
 /**
@@ -248,9 +250,7 @@ uint32_t ReadLF(bool activeField, bool silent, int sample_size) {
 **/
 uint32_t SampleLF(bool printCfg, int sample_size) {
     BigBuf_Clear_ext(false);
-    uint32_t ret = ReadLF(true, printCfg, sample_size);
-    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-    return ret;
+	return ReadLF(true, printCfg, sample_size);
 }
 /**
 * Initializes the FPGA for snoop-mode (field off), and acquires the samples.
@@ -258,9 +258,7 @@ uint32_t SampleLF(bool printCfg, int sample_size) {
 **/
 uint32_t SnoopLF() {
     BigBuf_Clear_ext(false);
-    uint32_t ret = ReadLF(false, true, 0);
-    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-    return ret;
+	return ReadLF(false, true, 0);
 }
 
 /**
@@ -355,7 +353,6 @@ void doCotagAcquisition(size_t sample_size) {
 
         if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
             sample = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
-            LED_D_OFF();
 
             // find first peak
             if (!firsthigh) {
@@ -406,7 +403,6 @@ uint32_t doCotagAcquisitionManchester() {
 
         if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
             sample = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
-            LED_D_OFF();
 
             // find first peak
             if (!firsthigh) {
@@ -431,10 +427,12 @@ uint32_t doCotagAcquisitionManchester() {
             if (sample > COTAG_ONE_THRESHOLD) {
                 prev = curr;
                 curr = 1;
-            } else if (sample < COTAG_ZERO_THRESHOLD) {
+			}
+			else if ( sample < COTAG_ZERO_THRESHOLD) {
                 prev = curr;
                 curr = 0;
-            } else {
+			}
+			else {
                 curr = prev;
             }
 

From 842e321cdb107ee59968a23df7056d4a8bdf3316 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Mon, 11 Mar 2019 23:11:26 +0100
Subject: [PATCH 0739/1938] Update HACKING.txt

---
 HACKING.txt | 189 +++++++++++++++++++++++-----------------------------
 1 file changed, 82 insertions(+), 107 deletions(-)

diff --git a/HACKING.txt b/HACKING.txt
index fb68142e9..69eb96201 100644
--- a/HACKING.txt
+++ b/HACKING.txt
@@ -1,38 +1,26 @@
-	"Coding styles are like assholes, everyone has one and no one likes anyone elses."
-	--Eric Warmenhoven
+    "Coding styles are like assholes, everyone has one and no one likes anyone elses."
+    --Eric Warmenhoven
 
 The Proxmark3 codebase is pretty messy and in the process of being cleaned up,
 so we don't have clear guidelines on how to place new code just yet. However,
 please don't make things worse.
 
 However, we have established a set of coding style guidelines in order to
-clean up the code consistently and keep it consistent in the future. Use common
-sense and good taste. If breaking a rule leads to cleaner code, you can do so,
-but laziness is not an excuse.
+clean up the code consistently and keep it consistent in the future.
+Look around and respect the same style.
+Helper script to get some uniformity in the style:
+
+$ make style
+
+It makes use of "astyle" so be sure to install it first.
+
 
 === INDENTATION ===
 
-Use tabs for indentation, but use spaces for alignment:
+Don't use tabs, editors are messing them up too easily.
+Increment unit is four spaces.
 
-	if (foo(this, that, there)
-	    && bar == baz)
-	{
-		dostuff();
-	}
-
-Notice it's like this (T___ for tab, S for space, for a 4-char tab setting):
-
-T___if (foo(this, that, there)
-T___SSSS&& bar == baz)
-
-Another example:
-
-#define THIS            0x10
-#define THAT_THING      0x20
-#define SOMETHING_ELSE  0x80
-
-These should look good no matter what your editor's tab setting is, so go nuts
-and pick whatever you like best.
+If you use "make style", this will be done for you.
 
 === WIDTH ===
 
@@ -65,24 +53,28 @@ use microsoft-style DWORD and the like, we're getting rid of those. Avoid char
 for buffers, uint8_t is more obvious when you're not working with strings. Use
 'const' where things are const. Try to use size_t for sizes.
 
-Pointers are:
-	void *ptr;
+Pointers and reference operators are attached to the variable name:
+    void *ptr;
 not:
-	void* ptr;
+    void* ptr;
 otherwise you're tempted to write:
-	void* in, out;
+    void* in, out;
 and you'll fail.
 
+"make style" will take care of pointers & reference operators.
+
 === EXPRESSIONS ===
 
 In general, use whitespace around binary operators - no unspaced blobs of an
-expression. This rule may be broken if it makes things clearer. For example,
+expression. "make style" will take care of whitespaces around operators.
 
-	if (5*a < b && some_bool_var)
+For example,
+
+    if (5 * a < b && some_bool_var)
 
 but not
 
-	if (5*a<b&&some_bool_var)
+    if (5*a<b&&some_bool_var)
 
 For equality with constants, use i == 0xF00, not 0xF00 == i. The compiler warns
 you about = vs == anyway, and you shouldn't be screwing that one up by now
@@ -90,93 +82,73 @@ anyway.
 
 === IF / FOR / WHILE / etc. ===
 
-Put the opening brace on the same line, with a space before it. Exception: if
-the if/for/while condition/whatever are split over several lines, it might be
-more appealing to put the opening brace on its own line, so use your own
-judgement there:
-
-	if (foo(this, that, there)
-	    && bar == baz)
-	{
-		dostuff();
-	}
-
-If you do split the condition, put the binary operators that join the lines at
-the beginning of the following lines (as above), not at the end of the prior
-lines.
-
+Put the opening brace on the same line, with a space before it.
 There should be a space between the construct name (if/for/whatever) and the
 opening parenthesis, and there should be a space between the closing parenthesis
-and the opening brace.
+and the opening brace, and no space between parenthesis and expression.
+"make style" will take care of all that.
+
+If you do split the condition, put the binary operators that join the lines at
+the beginning of the following lines, not at the end of the prior lines.
 
 For generic for() iterator variables, declare them in-line:
 
-	for (int i = 0; i < 10; i++) {
-		...
-	}
+    for (int i = 0; i < 10; i++) {
+        ...
+    }
 
 Note the spaces after the semicolons.
 
 if/else should be laid out as follows:
 
-	if (foo) {
-		...
-	} else if (bar) {
-		...
-	} else {
-		...
-	}
+    if (foo) {
+        ...
+    } else if (bar) {
+        ...
+    } else {
+        ...
+    }
 
-or
-
-	if (foo)
-		...
-	else if (bar)
-		...
-	else
-		...
-
-Don't mix braces vs. no braces. If any of your bodies are > 1 line, put braces
-around them all.
+You can skip braces around 1 line statements but don't mix braces vs. no braces.
 
 === FUNCTIONS ===
 
-Functions with no arguments are declared as f(void), not f(). Put the return
-type on the same line. Use static for functions that aren't exported, and put
-exported functions in a header file (one header file per source file with
-exported functions usually, no huge headers with all functions). Put a space
-after a comma in argument lists.
+Put the return type on the same line.
+Put a space after a comma in argument lists.
+Open the brace after the declaration (after a space).
+"make style" will take care of all that.
 
-void foo(int a_thing, int something_else)
-{
-	...
+void foo(int a_thing, int something_else) {
+    ...
 }
 
-void baz(void)
-{
-	foo(bluh, blah);
+Functions with no arguments are declared as f(void), not f().
+Use static for functions that aren't exported, and put exported functions
+in a header file (one header file per source file with exported functions
+usually, no huge headers with all functions). 
+
+void baz(void) {
+    foo(bluh, blah);
 }
 
 Function names should be separated_with_underscores(), except for standard
 functions (memcpy, etc.). It may make sense to break this rule for very common,
 generic functions that look like library functions (e.g. dprintf()).
 
-Don't use single-character arguments. Exception: very short functions with one
-argument that's really obvious:
+Don't use single-character arguments.
+Exception: very short functions with one argument that's really obvious:
 
-static int ascii(char c)
-{
-	if (c < 0x20 || c >= 0x7f)
-		return '.';
-	else
-		return c;
+static int ascii(char c) {
+    if (c < 0x20 || c >= 0x7f)
+        return '.';
+    else
+        return c;
 }
 
 vs.
 
-static void hexdump(void *buf, size_t len)
-{
-	...
+static void hexdump(void *buf, size_t len) {
+    ...
 }
 
 As a general guideline, functions shouldn't usually be much more than 30-50
@@ -188,7 +160,7 @@ probably missing some factoring/restructuring opportunity.
 Use typedefs when defining structs. The type should be named something_t.
 
 typedef struct {
-	blah blah;
+    blah blah;
 } prox_cmd_t;
 
 You can use anonymous enums to replace lots of sequential or mostly-sequential
@@ -199,16 +171,18 @@ You can use anonymous enums to replace lots of sequential or mostly-sequential
 Indent once for the case: labels, then again for the body. Like this:
 
 switch(bar) {
-	case OPTION_A:
-		do_stuff();
-		break;
-	case OPTION_B:
-		do_other_stuff();
-		break;
+    case OPTION_A:
+        do_stuff();
+        break;
+    case OPTION_B:
+        do_other_stuff();
+        break;
 }
 
-If you fall through into another case, add an explicit comment; otherwise, it
-can look confusing.
+"make style" will take care of the indentation.
+
+If you fall through into another case, add an explicit comment;
+otherwise, it can look confusing.
 
 If your switch() is too long or has too many cases, it should be cleaned up.
 Split off the cases into functions, break the switch() into parent and children
@@ -218,12 +192,12 @@ the like. In other words, use common sense and your brain.
 If you need local scope variables for a case, you can add braces:
 
 switch(bar) {
-	case OPTION_A: {
-		int baz = 5*bar;
-		do_stuff(baz);
-		break;
-	}
-	...
+    case OPTION_A: {
+        int baz = 5 * bar;
+        do_stuff(baz);
+        break;
+    }
+    ...
 
 But at that point you should probably consider using a separate function.
 
@@ -266,7 +240,7 @@ License/description header first:
 //-----------------------------------------------------------------------------
 
 If you modify a file in any non-trivial way (add code, etc.), add your copyright
-to the top.
+to the top with the current year.
 
 === HEADER FILES ===
 
@@ -287,5 +261,6 @@ you shouldn't use it (same for _FOOBAR_H).
 Avoid trailing whitespace (no line should end in tab or space). People forget
 this all the time if their editor doesn't handle it, but don't be surprised if
 you see someone fixing it from time to time.
+"make style" will take care of that.
 
 Keep a newline (blank line) at the end of each file.

From 346af6e3d1f992fb96491cd2bf7e8add340cb3b0 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Mon, 11 Mar 2019 23:12:31 +0100
Subject: [PATCH 0740/1938] make style

---
 armsrc/hitag2.c     | 14 +++++++-------
 armsrc/lfsampling.c | 16 +++++++---------
 client/cmdhf.c      |  2 +-
 client/cmdlf.c      | 14 +++++++-------
 client/cmdlfhitag.c | 15 +++++++--------
 5 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/armsrc/hitag2.c b/armsrc/hitag2.c
index f328ccb0d..c872c1261 100644
--- a/armsrc/hitag2.c
+++ b/armsrc/hitag2.c
@@ -1279,7 +1279,7 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
     }
 
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-    BigBuf_free();    
+    BigBuf_free();
     clear_trace();
     set_tracing(true);
 
@@ -1338,11 +1338,11 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
         // DbpString("Configured for hitag2 reader");
     } else {
         Dbprintf("Error, unknown hitag reader type: %d", htf);
-                goto out;
+        goto out;
     }
     uint8_t attempt_count = 0;
-    
-    while (!bStop && !BUTTON_PRESS() && !usb_poll_validate_length() ) {
+
+    while (!bStop && !BUTTON_PRESS() && !usb_poll_validate_length()) {
 
         WDT_HIT();
 
@@ -1376,7 +1376,7 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
                 attempt_count++; //attempt 3 times to get uid then quit
                 if (!bStop && attempt_count == 3)
                     bStop = true;
-                
+
                 break;
             }
             default: {
@@ -1474,8 +1474,8 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
             }
         }
     }
-    
-out:    
+
+out:
     LEDsoff();
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
diff --git a/armsrc/lfsampling.c b/armsrc/lfsampling.c
index 53b8e75b3..faf77229c 100644
--- a/armsrc/lfsampling.c
+++ b/armsrc/lfsampling.c
@@ -239,9 +239,9 @@ uint32_t ReadLF(bool activeField, bool silent, int sample_size) {
     if (!silent)
         printConfig();
     LFSetupFPGAForADC(config.divisor, activeField);
-	uint32_t ret = DoAcquisition_config(silent, sample_size);
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	return ret;
+    uint32_t ret = DoAcquisition_config(silent, sample_size);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    return ret;
 }
 
 /**
@@ -250,7 +250,7 @@ uint32_t ReadLF(bool activeField, bool silent, int sample_size) {
 **/
 uint32_t SampleLF(bool printCfg, int sample_size) {
     BigBuf_Clear_ext(false);
-	return ReadLF(true, printCfg, sample_size);
+    return ReadLF(true, printCfg, sample_size);
 }
 /**
 * Initializes the FPGA for snoop-mode (field off), and acquires the samples.
@@ -258,7 +258,7 @@ uint32_t SampleLF(bool printCfg, int sample_size) {
 **/
 uint32_t SnoopLF() {
     BigBuf_Clear_ext(false);
-	return ReadLF(false, true, 0);
+    return ReadLF(false, true, 0);
 }
 
 /**
@@ -427,12 +427,10 @@ uint32_t doCotagAcquisitionManchester() {
             if (sample > COTAG_ONE_THRESHOLD) {
                 prev = curr;
                 curr = 1;
-			}
-			else if ( sample < COTAG_ZERO_THRESHOLD) {
+            } else if (sample < COTAG_ZERO_THRESHOLD) {
                 prev = curr;
                 curr = 0;
-			}
-			else {
+            } else {
                 curr = prev;
             }
 
diff --git a/client/cmdhf.c b/client/cmdhf.c
index 237149348..63bfd6d0f 100644
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -42,7 +42,7 @@ int CmdHFSearch(const char *Cmd) {
     if (cmdp == 'h') return usage_hf_search();
 
     PrintAndLogEx(INFO, "Checking for known tags...\n");
-        
+
     int ans = CmdHF14AInfo("s");
     if (ans > 0) {
         PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("ISO14443-A tag") " found\n");
diff --git a/client/cmdlf.c b/client/cmdlf.c
index b6da222c6..b6202ed73 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -216,7 +216,7 @@ int CmdFlexdemod(const char *Cmd) {
     }
 
     if (start == size - LONG_WAIT) {
-		PrintAndLogEx(WARNING, "nothing to wait for");
+        PrintAndLogEx(WARNING, "nothing to wait for");
         return 0;
     }
 
@@ -839,12 +839,12 @@ bool CheckChipType(bool getDeviceData) {
 
     //check for t55xx chip...
     if (tryDetectP1(true)) {
-        PrintAndLogEx(SUCCESS, "\nChipset detection : " _GREEN_("Atmel T55xx") " found");        
+        PrintAndLogEx(SUCCESS, "\nChipset detection : " _GREEN_("Atmel T55xx") " found");
         PrintAndLogEx(SUCCESS, "Try " _YELLOW_("`lf t55xx`")" commands");
         retval = true;
         goto out;
     }
-    
+
 out:
     save_restoreGB(GRAPH_RESTORE);
     save_restoreDB(GRAPH_RESTORE);
@@ -945,19 +945,19 @@ int CmdLFfind(const char *Cmd) {
         bool st = true;
         if (ASKDemod_ext("0 0 0", true, false, 1, &st)) {
             PrintAndLogEx(NORMAL, "\nUnknown ASK Modulated and Manchester encoded Tag found!");
-            PrintAndLogEx(NORMAL, "if it does not look right it could instead be ASK/Biphase - try " _YELLOW_("'data rawdemod ab'") );
+            PrintAndLogEx(NORMAL, "if it does not look right it could instead be ASK/Biphase - try " _YELLOW_("'data rawdemod ab'"));
             goto out;
         }
 
         if (CmdPSK1rawDemod("")) {
             PrintAndLogEx(NORMAL, "Possible unknown PSK1 Modulated Tag found above!");
-            PrintAndLogEx(NORMAL, "    Could also be PSK2 - try " _YELLOW_("'data rawdemod p2'") );
+            PrintAndLogEx(NORMAL, "    Could also be PSK2 - try " _YELLOW_("'data rawdemod p2'"));
             PrintAndLogEx(NORMAL, "    Could also be PSK3 - [currently not supported]");
-            PrintAndLogEx(NORMAL, "    Could also be  NRZ - try " _YELLOW_("'data rawdemod nr") );
+            PrintAndLogEx(NORMAL, "    Could also be  NRZ - try " _YELLOW_("'data rawdemod nr"));
             goto out;
         }
 
-        PrintAndLogEx(FAILED, _RED_("\nNo data found!") );
+        PrintAndLogEx(FAILED, _RED_("\nNo data found!"));
     }
 out:
     // identify chipset
diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index 719c01a96..42540f305 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -29,8 +29,7 @@ size_t nbytes(size_t nbits) {
     return (nbits / 8) + ((nbits % 8) > 0);
 }
 
-int usage_hitag_reader(void)
-{
+int usage_hitag_reader(void) {
     PrintAndLogEx(NORMAL, "Usage: lf hitag reader [h] <reader function #>");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       h          This help");
@@ -43,7 +42,7 @@ int usage_hitag_reader(void)
     PrintAndLogEx(NORMAL, "      22 <nr> <ar>     Authentication");
     PrintAndLogEx(NORMAL, "      23 <key>         Authentication, key is in format: ISK high + ISK low");
     PrintAndLogEx(NORMAL, "      25               Test recorded authentications");
-    PrintAndLogEx(NORMAL, "      26               Just read UID");    
+    PrintAndLogEx(NORMAL, "      26               Just read UID");
     return 0;
 }
 
@@ -228,25 +227,25 @@ int CmdLFHitagReader(const char *Cmd) {
             c.cmd = CMD_READ_HITAG_S;
             num_to_bytes(param_get32ex(Cmd, 1, 0, 16), 4, htd->auth.NrAr);
             num_to_bytes(param_get32ex(Cmd, 2, 0, 16), 4, htd->auth.NrAr + 4);
-        break;
+            break;
         }
         case RHTSF_KEY: {
             c.cmd = CMD_READ_HITAG_S;
             num_to_bytes(param_get64ex(Cmd, 1, 0, 16), 6, htd->crypto.key);
-        break;
+            break;
         }
         case RHT2F_PASSWORD: {
             num_to_bytes(param_get32ex(Cmd, 1, 0, 16), 4, htd->pwd.password);
-        break;
+            break;
         }
         case RHT2F_AUTHENTICATE: {
             num_to_bytes(param_get32ex(Cmd, 1, 0, 16), 4, htd->auth.NrAr);
             num_to_bytes(param_get32ex(Cmd, 2, 0, 16), 4, htd->auth.NrAr + 4);
-        break;
+            break;
         }
         case RHT2F_CRYPTO: {
             num_to_bytes(param_get64ex(Cmd, 1, 0, 16), 6, htd->crypto.key);
-        break;
+            break;
         }
         case RHT2F_TEST_AUTH_ATTEMPTS: {
             // No additional parameters needed

From f205f9db8760518ec38bc6e4a972207e67f18f80 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 12 Mar 2019 00:11:27 +0100
Subject: [PATCH 0741/1938] make style: take care of EOF LF

---
 HACKING.txt | 8 +++-----
 Makefile    | 8 +++++++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/HACKING.txt b/HACKING.txt
index 69eb96201..9d7bdaedc 100644
--- a/HACKING.txt
+++ b/HACKING.txt
@@ -258,9 +258,7 @@ you shouldn't use it (same for _FOOBAR_H).
 
 === WHITESPACE ===
 
-Avoid trailing whitespace (no line should end in tab or space). People forget
-this all the time if their editor doesn't handle it, but don't be surprised if
-you see someone fixing it from time to time.
-"make style" will take care of that.
-
+Avoid trailing whitespace (no line should end in tab or space).
 Keep a newline (blank line) at the end of each file.
+
+"make style" will take care of both.
diff --git a/Makefile b/Makefile
index 14bf98074..6e7c9abd5 100644
--- a/Makefile
+++ b/Makefile
@@ -106,8 +106,14 @@ endif
 print-%: ; @echo $* = $($*)
 
 style:
+	# Make sure astyle is installed
 	@which astyle >/dev/null || ( echo "Please install 'astyle' package first" ; exit 1 )
-	find . \( -name "*.[ch]" -or -name "*.cpp" -or -name "*.lua" -or -name "Makefile" \) -exec perl -pi -e 's/[ \t\r]+$$//' {} \;
+	# Remove spaces & tabs at EOL, add LF at EOF if needed on *.c, *.h, *.cpp. *.lua, *.py, *.pl, Makefile
+	find . \( -name "*.[ch]" -or -name "*.cpp" -or -name "*.lua" -or -name "*.py" -or -name "*.pl" -or -name "Makefile" \) \
+	    -exec perl -pi -e 's/[ \t\r]+$$//' {} \; \
+	    -exec sh -c "tail -c1 {} | xxd -p | tail -1 | grep -q -v 0a$$" \; \
+	    -exec sh -c "echo >> {}" \;
+	# Apply astyle on *.c, *.h, *.cpp
 	find . \( -name "*.[ch]" -or -name "*.cpp" \) -exec astyle --formatted --mode=c --suffix=none \
 	    --indent=spaces=4 --indent-switches --indent-preprocessor \
 	    --keep-one-line-blocks --max-instatement-indent=60 \

From 1b2601a48ae3a160aae9ed6de2c06b0b2f6d8337 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 12 Mar 2019 00:12:26 +0100
Subject: [PATCH 0742/1938] Add missing EOF LF

---
 armsrc/Standalone/hf_mattyrun.c       | 2 +-
 armsrc/Standalone/hf_mattyrun.h       | 2 +-
 armsrc/Standalone/hf_young.c          | 2 +-
 armsrc/Standalone/hf_young.h          | 2 +-
 armsrc/Standalone/lf_hidbrute.h       | 2 +-
 armsrc/Standalone/lf_proxbrute.c      | 2 +-
 armsrc/Standalone/lf_proxbrute.h      | 2 +-
 armsrc/Standalone/lf_samyrun.c        | 2 +-
 armsrc/Standalone/lf_samyrun.h        | 2 +-
 armsrc/Standalone/standalone.h        | 2 +-
 armsrc/aes.c                          | 2 +-
 armsrc/aes.h                          | 2 +-
 armsrc/buzzer.c                       | 2 +-
 armsrc/desfire_crypto.c               | 2 +-
 armsrc/desfire_key.c                  | 2 +-
 armsrc/desfire_key.h                  | 2 +-
 armsrc/flashmem.h                     | 2 +-
 armsrc/iclass.c                       | 2 +-
 armsrc/iso14443b.c                    | 2 +-
 armsrc/iso15693.c                     | 2 +-
 armsrc/mifarecmd.c                    | 2 +-
 armsrc/mifarecmd.h                    | 2 +-
 armsrc/mifaresniff.c                  | 2 +-
 armsrc/mifaresniff.h                  | 2 +-
 armsrc/pcf7931.c                      | 2 +-
 armsrc/pcf7931.h                      | 2 +-
 armsrc/start.c                        | 2 +-
 armsrc/string.h                       | 2 +-
 armsrc/ticks.h                        | 2 +-
 client/cmdcrc.c                       | 2 +-
 client/cmdflashmem.h                  | 2 +-
 client/cmdhf15.c                      | 2 +-
 client/cmdhfepa.c                     | 2 +-
 client/cmdhffelica.c                  | 2 +-
 client/cmdhffido.h                    | 2 +-
 client/cmdhflegic.c                   | 2 +-
 client/cmdhflist.c                    | 2 +-
 client/cmdhfmfdesfire.h               | 2 +-
 client/cmdhfmfp.h                     | 2 +-
 client/cmdmain.c                      | 2 +-
 client/cmdscript.c                    | 2 +-
 client/cmdsmartcard.h                 | 2 +-
 client/emv/emvjson.h                  | 2 +-
 client/hardnested/hardnested_tables.c | 2 +-
 client/loclass/elite_crack.c          | 2 +-
 client/lualibs/7816_error.lua         | 2 +-
 client/lualibs/hf_reader.lua          | 2 +-
 client/lualibs/precalc.lua            | 2 +-
 client/lualibs/read14b.lua            | 2 +-
 client/lualibs/taglib.lua             | 2 +-
 client/lualibs/utils.lua              | 2 +-
 client/mifare/mifarehost.h            | 2 +-
 client/pm3_eml_mfd_test.py            | 2 +-
 client/reveng/preset.c                | 2 +-
 client/scandir.h                      | 2 +-
 client/scripting.c                    | 2 +-
 client/scripts/Legic_clone.lua        | 2 +-
 client/scripts/brutesim.lua           | 2 +-
 client/scripts/calc_di.lua            | 2 +-
 client/scripts/calc_ev1_it.lua        | 2 +-
 client/scripts/calc_mizip.lua         | 2 +-
 client/scripts/calypso.lua            | 2 +-
 client/scripts/e.lua                  | 2 +-
 client/scripts/emul2dump.lua          | 2 +-
 client/scripts/emul2html.lua          | 2 +-
 client/scripts/formatMifare.lua       | 2 +-
 client/scripts/hf_read.lua            | 2 +-
 client/scripts/htmldump.lua           | 2 +-
 client/scripts/lf_bulk.lua            | 2 +-
 client/scripts/mfkeys.lua             | 2 +-
 client/scripts/ndef_dump.lua          | 2 +-
 client/scripts/ntag_3d.lua            | 2 +-
 client/scripts/parameters.lua         | 2 +-
 client/scripts/test_t55x7_ask.lua     | 2 +-
 client/scripts/test_t55x7_fsk.lua     | 2 +-
 client/scripts/tnp3dump.lua           | 2 +-
 client/scripts/tnp3sim.lua            | 2 +-
 client/scripts/tracetest.lua          | 2 +-
 client/scripts/ufodump.lua            | 2 +-
 client/util.c                         | 2 +-
 client/util.h                         | 2 +-
 client/util_darwin.h                  | 2 +-
 common/bucketsort.h                   | 2 +-
 common/cmd.c                          | 2 +-
 common/crc.c                          | 2 +-
 common/crc16.h                        | 2 +-
 common/crc32.c                        | 2 +-
 common/crc64.c                        | 2 +-
 common/i2c.h                          | 2 +-
 common/iso15693tools.c                | 2 +-
 common/iso15693tools.h                | 2 +-
 common/legic_prng.c                   | 2 +-
 common/prng.h                         | 2 +-
 common/radixsort.c                    | 2 +-
 common/radixsort.h                    | 2 +-
 common/random.h                       | 2 +-
 common/tea.h                          | 2 +-
 common/usart.c                        | 2 +-
 common/usb_cdc.c                      | 2 +-
 common/wiegand.c                      | 2 +-
 include/common.h                      | 2 +-
 tools/Makefile                        | 2 +-
 tools/findbits_test.py                | 2 +-
 tools/mkversion.pl                    | 6 +++---
 uart/uart_win32.c                     | 2 +-
 105 files changed, 107 insertions(+), 107 deletions(-)

diff --git a/armsrc/Standalone/hf_mattyrun.c b/armsrc/Standalone/hf_mattyrun.c
index bf4b71d61..8cac76c35 100644
--- a/armsrc/Standalone/hf_mattyrun.c
+++ b/armsrc/Standalone/hf_mattyrun.c
@@ -433,4 +433,4 @@ void RunMod() {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/armsrc/Standalone/hf_mattyrun.h b/armsrc/Standalone/hf_mattyrun.h
index 8b33e67c5..6602eba54 100644
--- a/armsrc/Standalone/hf_mattyrun.h
+++ b/armsrc/Standalone/hf_mattyrun.h
@@ -20,4 +20,4 @@
 
 #define OPTS 2
 
-#endif /* __HF_MATTYRUN_H */
\ No newline at end of file
+#endif /* __HF_MATTYRUN_H */
diff --git a/armsrc/Standalone/hf_young.c b/armsrc/Standalone/hf_young.c
index 99af4ef1e..4b7a87e99 100644
--- a/armsrc/Standalone/hf_young.c
+++ b/armsrc/Standalone/hf_young.c
@@ -259,4 +259,4 @@ void RunMod() {
             LED(selected + 1, 0);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/armsrc/Standalone/hf_young.h b/armsrc/Standalone/hf_young.h
index 46c0d1361..dcd8b13e7 100644
--- a/armsrc/Standalone/hf_young.h
+++ b/armsrc/Standalone/hf_young.h
@@ -19,4 +19,4 @@
 
 #define OPTS 2
 
-#endif /* __HF_YOUNG_H */
\ No newline at end of file
+#endif /* __HF_YOUNG_H */
diff --git a/armsrc/Standalone/lf_hidbrute.h b/armsrc/Standalone/lf_hidbrute.h
index bc1cf2e31..49b0af6c6 100644
--- a/armsrc/Standalone/lf_hidbrute.h
+++ b/armsrc/Standalone/lf_hidbrute.h
@@ -21,4 +21,4 @@
 
 void hid_corporate_1000_calculate_checksum_and_set(uint32_t *high, uint32_t *low, uint32_t cardnum, uint32_t fc);
 
-#endif /* __LF_HIDBRUTE_H */
\ No newline at end of file
+#endif /* __LF_HIDBRUTE_H */
diff --git a/armsrc/Standalone/lf_proxbrute.c b/armsrc/Standalone/lf_proxbrute.c
index ea1bd1f6f..178ce98fb 100644
--- a/armsrc/Standalone/lf_proxbrute.c
+++ b/armsrc/Standalone/lf_proxbrute.c
@@ -164,4 +164,4 @@ void RunMod() {
 out:
     DbpString("[=] exiting");
     LEDsoff();
-}
\ No newline at end of file
+}
diff --git a/armsrc/Standalone/lf_proxbrute.h b/armsrc/Standalone/lf_proxbrute.h
index 3911fee35..3a9e1ce29 100644
--- a/armsrc/Standalone/lf_proxbrute.h
+++ b/armsrc/Standalone/lf_proxbrute.h
@@ -18,4 +18,4 @@
 
 #define OPTS 2
 
-#endif /* __LF_PROXBRUTE_H */
\ No newline at end of file
+#endif /* __LF_PROXBRUTE_H */
diff --git a/armsrc/Standalone/lf_samyrun.c b/armsrc/Standalone/lf_samyrun.c
index ec0e4d19e..b4530fa2f 100644
--- a/armsrc/Standalone/lf_samyrun.c
+++ b/armsrc/Standalone/lf_samyrun.c
@@ -138,4 +138,4 @@ void RunMod() {
 out:
     DbpString("[=] exiting");
     LEDsoff();
-}
\ No newline at end of file
+}
diff --git a/armsrc/Standalone/lf_samyrun.h b/armsrc/Standalone/lf_samyrun.h
index cf21e1261..52c0bb942 100644
--- a/armsrc/Standalone/lf_samyrun.h
+++ b/armsrc/Standalone/lf_samyrun.h
@@ -19,4 +19,4 @@
 
 #define OPTS 2
 
-#endif /* __LF_SAMYRUN_H */
\ No newline at end of file
+#endif /* __LF_SAMYRUN_H */
diff --git a/armsrc/Standalone/standalone.h b/armsrc/Standalone/standalone.h
index 53d5ff13d..980bcbf46 100644
--- a/armsrc/Standalone/standalone.h
+++ b/armsrc/Standalone/standalone.h
@@ -16,4 +16,4 @@
 
 extern void RunMod();
 
-#endif /* __STANDALONE_H */
\ No newline at end of file
+#endif /* __STANDALONE_H */
diff --git a/armsrc/aes.c b/armsrc/aes.c
index 61a8da76b..f8a36f28c 100644
--- a/armsrc/aes.c
+++ b/armsrc/aes.c
@@ -1167,4 +1167,4 @@ int main() {
 
     return 0;
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/armsrc/aes.h b/armsrc/aes.h
index afe7e5e4e..aa9f0c582 100644
--- a/armsrc/aes.h
+++ b/armsrc/aes.h
@@ -31,4 +31,4 @@ int AesCtxIni(AesCtx *pCtx, unsigned char *pIV, unsigned char *pKey, unsigned in
 int AesEncrypt(AesCtx *pCtx, unsigned char *pData, unsigned char *pCipher, unsigned int DataLen);
 int AesDecrypt(AesCtx *pCtx, unsigned char *pCipher, unsigned char *pData, unsigned int CipherLen);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/armsrc/buzzer.c b/armsrc/buzzer.c
index 27d0cd12a..708b7d3f7 100644
--- a/armsrc/buzzer.c
+++ b/armsrc/buzzer.c
@@ -83,4 +83,4 @@ void Ring_Little_Star(uint16_t count) {
     Ring_BEE_TIME(note_1,2*count);
     LED_B_ON();
     */
-}
\ No newline at end of file
+}
diff --git a/armsrc/desfire_crypto.c b/armsrc/desfire_crypto.c
index 0a23305fd..fd3f30d0d 100644
--- a/armsrc/desfire_crypto.c
+++ b/armsrc/desfire_crypto.c
@@ -630,4 +630,4 @@ void mifare_cypher_blocks_chained(desfiretag_t tag, desfirekey_t key, uint8_t *i
         mifare_cypher_single_block(key, data + offset, ivect, direction, operation, block_size);
         offset += block_size;
     }
-}
\ No newline at end of file
+}
diff --git a/armsrc/desfire_key.c b/armsrc/desfire_key.c
index a723a203e..e1f880c8b 100644
--- a/armsrc/desfire_key.c
+++ b/armsrc/desfire_key.c
@@ -152,4 +152,4 @@ void Desfire_session_key_new(const uint8_t rnda[], const uint8_t rndb[], desfire
             Desfire_aes_key_new(buffer, key);
             break;
     }
-}
\ No newline at end of file
+}
diff --git a/armsrc/desfire_key.h b/armsrc/desfire_key.h
index adbda9c42..4fc02854e 100644
--- a/armsrc/desfire_key.h
+++ b/armsrc/desfire_key.h
@@ -17,4 +17,4 @@ void Desfire_aes_key_new_with_version(const uint8_t value[16], uint8_t version,
 uint8_t Desfire_key_get_version(desfirekey_t key);
 void Desfire_key_set_version(desfirekey_t key, uint8_t version);
 void Desfire_session_key_new(const uint8_t rnda[], const uint8_t rndb[], desfirekey_t authkey, desfirekey_t key);
-#endif
\ No newline at end of file
+#endif
diff --git a/armsrc/flashmem.h b/armsrc/flashmem.h
index 4af499d3a..f4258a11b 100644
--- a/armsrc/flashmem.h
+++ b/armsrc/flashmem.h
@@ -151,4 +151,4 @@ void Flashmem_print_status(void);
 
 
 
-#endif
\ No newline at end of file
+#endif
diff --git a/armsrc/iclass.c b/armsrc/iclass.c
index 7bd725eab..e14a3c145 100644
--- a/armsrc/iclass.c
+++ b/armsrc/iclass.c
@@ -2456,4 +2456,4 @@ void iClass_Clone(uint8_t startblock, uint8_t endblock, uint8_t *data) {
 
     cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
     switch_off();
-}
\ No newline at end of file
+}
diff --git a/armsrc/iso14443b.c b/armsrc/iso14443b.c
index 5b6a85477..57433c682 100644
--- a/armsrc/iso14443b.c
+++ b/armsrc/iso14443b.c
@@ -1634,4 +1634,4 @@ out:
         switch_off(); // disconnect raw
         SpinDelay(20);
     }
-}
\ No newline at end of file
+}
diff --git a/armsrc/iso15693.c b/armsrc/iso15693.c
index b6d53ccea..9959f1ef0 100644
--- a/armsrc/iso15693.c
+++ b/armsrc/iso15693.c
@@ -999,4 +999,4 @@ void DirectTag15693Command(uint32_t datalen, uint32_t speed, uint32_t recv, uint
     } else {
         cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
     }
-}
\ No newline at end of file
+}
diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index 1f1932e27..cca5d137a 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -2098,4 +2098,4 @@ void Mifare_DES_Auth2(uint32_t arg0, uint8_t *datain) {
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     LEDsoff();
     set_tracing(false);
-}
\ No newline at end of file
+}
diff --git a/armsrc/mifarecmd.h b/armsrc/mifarecmd.h
index 595d46395..51ed76ca5 100644
--- a/armsrc/mifarecmd.h
+++ b/armsrc/mifarecmd.h
@@ -25,4 +25,4 @@
 #include "crc.h"
 #include "protocols.h"
 #include "parity.h"
-#endif
\ No newline at end of file
+#endif
diff --git a/armsrc/mifaresniff.c b/armsrc/mifaresniff.c
index 8f391207e..0e75aac35 100644
--- a/armsrc/mifaresniff.c
+++ b/armsrc/mifaresniff.c
@@ -322,4 +322,4 @@ void RAMFUNC MfSniffSend() {
     LED_B_ON();
     cmd_send(CMD_ACK, 2, 0, 0, 0, 0);  // 2 == data transfer finished.
     LED_B_OFF();
-}
\ No newline at end of file
+}
diff --git a/armsrc/mifaresniff.h b/armsrc/mifaresniff.h
index debfd5a09..9b5cb8609 100644
--- a/armsrc/mifaresniff.h
+++ b/armsrc/mifaresniff.h
@@ -39,4 +39,4 @@ bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint8_t *parity, ui
 void RAMFUNC MfSniffSend(void);
 void MfSniffEnd(void);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/armsrc/pcf7931.c b/armsrc/pcf7931.c
index ef371b233..90a6f5d64 100644
--- a/armsrc/pcf7931.c
+++ b/armsrc/pcf7931.c
@@ -518,4 +518,4 @@ bool AddPatternPCF7931(uint32_t a, uint32_t b, uint32_t c, uint32_t *tab) {
     tab[u + 2] = c + tab[u + 1];
 
     return 0;
-}
\ No newline at end of file
+}
diff --git a/armsrc/pcf7931.h b/armsrc/pcf7931.h
index bed33dadc..b8121c29f 100644
--- a/armsrc/pcf7931.h
+++ b/armsrc/pcf7931.h
@@ -17,4 +17,4 @@ bool AddBitPCF7931(bool b, uint32_t *tab, int32_t l, int32_t p);
 bool AddPatternPCF7931(uint32_t a, uint32_t b, uint32_t c, uint32_t *tab);
 void WritePCF7931(uint8_t pass1, uint8_t pass2, uint8_t pass3, uint8_t pass4, uint8_t pass5, uint8_t pass6, uint8_t pass7, uint16_t init_delay, int32_t l, int32_t p, uint8_t address, uint8_t byte, uint8_t data);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/armsrc/start.c b/armsrc/start.c
index a6503f1ea..b5947bdf3 100644
--- a/armsrc/start.c
+++ b/armsrc/start.c
@@ -77,4 +77,4 @@ void __attribute__((section(".startos"))) Vector(void) {
 
     AppMain();
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/armsrc/string.h b/armsrc/string.h
index de8f3ac20..f6f094c48 100644
--- a/armsrc/string.h
+++ b/armsrc/string.h
@@ -24,4 +24,4 @@ char *strcat(char *dest, const char *src);
 void strreverse(char s[]);
 void itoa(int n, char s[]);
 
-#endif /* __STRING_H */
\ No newline at end of file
+#endif /* __STRING_H */
diff --git a/armsrc/ticks.h b/armsrc/ticks.h
index 6e5e334f0..d24d2aac5 100644
--- a/armsrc/ticks.h
+++ b/armsrc/ticks.h
@@ -44,4 +44,4 @@ extern void WaitUS(uint16_t us);
 extern void WaitMS(uint16_t ms);
 
 extern void StopTicks(void);
-#endif
\ No newline at end of file
+#endif
diff --git a/client/cmdcrc.c b/client/cmdcrc.c
index 1a17d1428..be74fc39a 100644
--- a/client/cmdcrc.c
+++ b/client/cmdcrc.c
@@ -483,4 +483,4 @@ int CmdrevengSearch(const char *Cmd) {
 
     if (!found) PrintAndLogEx(FAILED, "\nno matches found\n");
     return 1;
-}
\ No newline at end of file
+}
diff --git a/client/cmdflashmem.h b/client/cmdflashmem.h
index 0a56ebed4..099a4e3b1 100644
--- a/client/cmdflashmem.h
+++ b/client/cmdflashmem.h
@@ -42,4 +42,4 @@ extern int CmdFlashMemWipe(const char *Cmd);
 extern int CmdFlashMemInfo(const char *Cmd);
 #endif
 
-#endif
\ No newline at end of file
+#endif
diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index 2e784962c..f209f361d 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -1315,4 +1315,4 @@ int CmdHF15(const char *Cmd) {
 int CmdHF15Help(const char *Cmd) {
     CmdsHelp(CommandTable15);
     return 0;
-}
\ No newline at end of file
+}
diff --git a/client/cmdhfepa.c b/client/cmdhfepa.c
index fce18f11b..0386155c1 100644
--- a/client/cmdhfepa.c
+++ b/client/cmdhfepa.c
@@ -176,4 +176,4 @@ int CmdHFEPA(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
-}
\ No newline at end of file
+}
diff --git a/client/cmdhffelica.c b/client/cmdhffelica.c
index 59ddc5d65..e06f133e3 100644
--- a/client/cmdhffelica.c
+++ b/client/cmdhffelica.c
@@ -609,4 +609,4 @@ int CmdHFFelica(const char *Cmd) {
 int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
-}
\ No newline at end of file
+}
diff --git a/client/cmdhffido.h b/client/cmdhffido.h
index 2460a170f..96f9153ed 100644
--- a/client/cmdhffido.h
+++ b/client/cmdhffido.h
@@ -24,4 +24,4 @@
 extern int CmdHFFido(const char *Cmd);
 
 
-#endif
\ No newline at end of file
+#endif
diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index a509873da..db65447ac 100644
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -1317,4 +1317,4 @@ int CmdHFLegic(const char *Cmd) {
 int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
-}
\ No newline at end of file
+}
diff --git a/client/cmdhflist.c b/client/cmdhflist.c
index 6bcfe0b20..3c1fb83bd 100644
--- a/client/cmdhflist.c
+++ b/client/cmdhflist.c
@@ -1251,4 +1251,4 @@ uint64_t GetCrypto1ProbableKey(TAuthData *ad) {
     crypto1_get_lfsr(revstate, &key);
     crypto1_destroy(revstate);
     return key;
-}
\ No newline at end of file
+}
diff --git a/client/cmdhfmfdesfire.h b/client/cmdhfmfdesfire.h
index c29fd262a..cc5481b0e 100644
--- a/client/cmdhfmfdesfire.h
+++ b/client/cmdhfmfdesfire.h
@@ -2,4 +2,4 @@
 static int CmdHelp(const char *Cmd);
 int CmdHF14AMfDESAuth(const char *Cmd);
 int CmdHFMFDesfire(const char *Cmd);
-int CmdHelp(const char *Cmd);
\ No newline at end of file
+int CmdHelp(const char *Cmd);
diff --git a/client/cmdhfmfp.h b/client/cmdhfmfp.h
index a5cacb518..ed9d36b79 100644
--- a/client/cmdhfmfp.h
+++ b/client/cmdhfmfp.h
@@ -15,4 +15,4 @@
 extern int CmdHFMFP(const char *Cmd);
 
 
-#endif
\ No newline at end of file
+#endif
diff --git a/client/cmdmain.c b/client/cmdmain.c
index 608a0e668..5bbd689e1 100644
--- a/client/cmdmain.c
+++ b/client/cmdmain.c
@@ -74,4 +74,4 @@ int CmdRev(const char *Cmd) {
 //-----------------------------------------------------------------------------
 int CommandReceived(char *Cmd) {
     return CmdsParse(CommandTable, Cmd);
-}
\ No newline at end of file
+}
diff --git a/client/cmdscript.c b/client/cmdscript.c
index 2e2ec5f53..e1a21ffc4 100644
--- a/client/cmdscript.c
+++ b/client/cmdscript.c
@@ -193,4 +193,4 @@ int CmdScript(const char *Cmd) {
 int CmdHelp(const char *Cmd) {
     PrintAndLogEx(NORMAL, "This is a feature to run Lua-scripts. You can place lua-scripts within the scripts/-folder. ");
     return 0;
-}
\ No newline at end of file
+}
diff --git a/client/cmdsmartcard.h b/client/cmdsmartcard.h
index 14e79cd4e..2e4971bba 100644
--- a/client/cmdsmartcard.h
+++ b/client/cmdsmartcard.h
@@ -40,4 +40,4 @@ extern int usage_sm_raw(void);
 extern int usage_sm_reader(void);
 extern int usage_sm_info(void);
 extern int usage_sm_upgrade(void);
-#endif
\ No newline at end of file
+#endif
diff --git a/client/emv/emvjson.h b/client/emv/emvjson.h
index d47109f7c..18326083f 100644
--- a/client/emv/emvjson.h
+++ b/client/emv/emvjson.h
@@ -38,4 +38,4 @@ extern int JsonLoadBufAsHex(json_t *elm, char *path, uint8_t *data, size_t maxbu
 
 extern bool ParamLoadFromJson(struct tlvdb *tlv);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/client/hardnested/hardnested_tables.c b/client/hardnested/hardnested_tables.c
index bc92e5f10..09de7f5d7 100644
--- a/client/hardnested/hardnested_tables.c
+++ b/client/hardnested/hardnested_tables.c
@@ -577,4 +577,4 @@ int main(int argc, char *argv[]) {
     free_part_sum_bitarrays();
 
     return 0;
-}
\ No newline at end of file
+}
diff --git a/client/loclass/elite_crack.c b/client/loclass/elite_crack.c
index 41be3d39c..038d8e475 100644
--- a/client/loclass/elite_crack.c
+++ b/client/loclass/elite_crack.c
@@ -692,4 +692,4 @@ int testElite() {
     errors += _test_iclass_key_permutation();
     errors += _testBruteforce();
     return errors;
-}
\ No newline at end of file
+}
diff --git a/client/lualibs/7816_error.lua b/client/lualibs/7816_error.lua
index 038f668fb..15f4ef471 100644
--- a/client/lualibs/7816_error.lua
+++ b/client/lualibs/7816_error.lua
@@ -75,4 +75,4 @@ _errorcodes.tostring = function(command)
     end
     return ("Error, numeric or string argument expected, got : %s"):format(tostring(command))
 end
-return _errorcodes
\ No newline at end of file
+return _errorcodes
diff --git a/client/lualibs/hf_reader.lua b/client/lualibs/hf_reader.lua
index d0550a335..b99b521da 100644
--- a/client/lualibs/hf_reader.lua
+++ b/client/lualibs/hf_reader.lua
@@ -32,4 +32,4 @@ end
 
 return {
     waitForTag = waitForTag,
-}
\ No newline at end of file
+}
diff --git a/client/lualibs/precalc.lua b/client/lualibs/precalc.lua
index 71d91c05a..7da08f006 100644
--- a/client/lualibs/precalc.lua
+++ b/client/lualibs/precalc.lua
@@ -91,4 +91,4 @@ local PreCalc =
         return list
     end,
 }
-return PreCalc
\ No newline at end of file
+return PreCalc
diff --git a/client/lualibs/read14b.lua b/client/lualibs/read14b.lua
index 3711c02a3..2ee86c378 100644
--- a/client/lualibs/read14b.lua
+++ b/client/lualibs/read14b.lua
@@ -155,4 +155,4 @@ local library = {
     ISO14B_COMMAND = ISO14B_COMMAND,
 }
 
-return library
\ No newline at end of file
+return library
diff --git a/client/lualibs/taglib.lua b/client/lualibs/taglib.lua
index 715a29487..0612ed2d3 100644
--- a/client/lualibs/taglib.lua
+++ b/client/lualibs/taglib.lua
@@ -121,4 +121,4 @@ return {
 
         return m[value] or "no tag-info available"
     end,
-}
\ No newline at end of file
+}
diff --git a/client/lualibs/utils.lua b/client/lualibs/utils.lua
index 697e48b72..ed9874e40 100644
--- a/client/lualibs/utils.lua
+++ b/client/lualibs/utils.lua
@@ -427,4 +427,4 @@ local Utils =
 -- end
 
 }
-return Utils
\ No newline at end of file
+return Utils
diff --git a/client/mifare/mifarehost.h b/client/mifare/mifarehost.h
index 1d9f0c3ab..626d2cd07 100644
--- a/client/mifare/mifarehost.h
+++ b/client/mifare/mifarehost.h
@@ -100,4 +100,4 @@ extern int detect_classic_prng(void);
 extern int detect_classic_nackbug(bool verbose);
 extern void detect_classic_magic(void);
 extern void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len, bool isEncrypted);
-#endif
\ No newline at end of file
+#endif
diff --git a/client/pm3_eml_mfd_test.py b/client/pm3_eml_mfd_test.py
index 478a050df..171bad843 100644
--- a/client/pm3_eml_mfd_test.py
+++ b/client/pm3_eml_mfd_test.py
@@ -21,7 +21,7 @@ class TestEmlMfd(unittest.TestCase):
             ]
     def test_eml2mfd(self):
         self.three_argument_test(pm3_eml2mfd.main, self.EML2MFD_TESTCASES)
-    
+
     def test_mfd2eml(self):
         self.three_argument_test(pm3_mfd2eml.main,
                 imap(reversed, self.EML2MFD_TESTCASES), c14n=hex_c14n)
diff --git a/client/reveng/preset.c b/client/reveng/preset.c
index d5bdac2dd..2f305a285 100644
--- a/client/reveng/preset.c
+++ b/client/reveng/preset.c
@@ -939,4 +939,4 @@ static void munpack(model_t *dest, const struct mpreset *src) {
     dest->flags = src->flags;
     /* link to the name as it is static */
     dest->name = (src->alias) ? src->alias->name : NULL;
-}
\ No newline at end of file
+}
diff --git a/client/scandir.h b/client/scandir.h
index a41a13319..7155c5a79 100644
--- a/client/scandir.h
+++ b/client/scandir.h
@@ -19,4 +19,4 @@ extern int scandir(const char *dir, struct dirent ***namelist, int (*select)(con
 extern int alphasort(const struct dirent **a, const struct dirent **b);
 #endif // _WIN32
 
-#endif // SCANDIR_H__
\ No newline at end of file
+#endif // SCANDIR_H__
diff --git a/client/scripting.c b/client/scripting.c
index 14dc35774..719798177 100644
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -776,4 +776,4 @@ int set_pm3_libraries(lua_State *L) {
     strcat(libraries_path, LUA_LIBRARIES_WILDCARD);
     setLuaPath(L, libraries_path);
     return 1;
-}
\ No newline at end of file
+}
diff --git a/client/scripts/Legic_clone.lua b/client/scripts/Legic_clone.lua
index dcac7f323..21d756d0e 100644
--- a/client/scripts/Legic_clone.lua
+++ b/client/scripts/Legic_clone.lua
@@ -538,4 +538,4 @@ function main(args)
 end
 
 -- call main with arguments
-main(args)
\ No newline at end of file
+main(args)
diff --git a/client/scripts/brutesim.lua b/client/scripts/brutesim.lua
index 9527d8970..a15cf6e60 100644
--- a/client/scripts/brutesim.lua
+++ b/client/scripts/brutesim.lua
@@ -297,4 +297,4 @@ local function main(args)
     core.console('hw ping')
 end
 
-main(args)
\ No newline at end of file
+main(args)
diff --git a/client/scripts/calc_di.lua b/client/scripts/calc_di.lua
index e0b587332..9a8c051a4 100644
--- a/client/scripts/calc_di.lua
+++ b/client/scripts/calc_di.lua
@@ -173,4 +173,4 @@ local function main(args)
     dumptofile( keys )
 end
 
-main(args)
\ No newline at end of file
+main(args)
diff --git a/client/scripts/calc_ev1_it.lua b/client/scripts/calc_ev1_it.lua
index c6070d20d..b4e995e96 100644
--- a/client/scripts/calc_ev1_it.lua
+++ b/client/scripts/calc_ev1_it.lua
@@ -175,4 +175,4 @@ local function main(args)
     print(string.format('PWD | %s', pwd))
 end
 
-main(args)
\ No newline at end of file
+main(args)
diff --git a/client/scripts/calc_mizip.lua b/client/scripts/calc_mizip.lua
index 42f13c578..8844f6d66 100644
--- a/client/scripts/calc_mizip.lua
+++ b/client/scripts/calc_mizip.lua
@@ -194,4 +194,4 @@ local function main(args)
     dumptofile( keys )
 end
 
-main(args)
\ No newline at end of file
+main(args)
diff --git a/client/scripts/calypso.lua b/client/scripts/calypso.lua
index 2b7252261..74de3cb9a 100644
--- a/client/scripts/calypso.lua
+++ b/client/scripts/calypso.lua
@@ -273,4 +273,4 @@ if "--test"==args then
 else
     -- Call the main
     main(args)
-end
\ No newline at end of file
+end
diff --git a/client/scripts/e.lua b/client/scripts/e.lua
index 6b9d80364..1f9a14eb0 100644
--- a/client/scripts/e.lua
+++ b/client/scripts/e.lua
@@ -74,4 +74,4 @@ function main(args)
     end
 end
 
-main(args)
\ No newline at end of file
+main(args)
diff --git a/client/scripts/emul2dump.lua b/client/scripts/emul2dump.lua
index 04b9da12b..0cbc3a4c2 100644
--- a/client/scripts/emul2dump.lua
+++ b/client/scripts/emul2dump.lua
@@ -57,4 +57,4 @@ local function main(args)
     ExitMsg(("Wrote a BIN dump to the file %s"):format(filename))
 end
 
-main(args)
\ No newline at end of file
+main(args)
diff --git a/client/scripts/emul2html.lua b/client/scripts/emul2html.lua
index db76ec9c0..36230f8af 100644
--- a/client/scripts/emul2html.lua
+++ b/client/scripts/emul2html.lua
@@ -64,4 +64,4 @@ In the future, we may implement so that scripts are invoked directly
 into a 'main' function, instead of being executed blindly. For future
 compatibility, I have done so, but I invoke my main from here.
 --]]
-main(args)
\ No newline at end of file
+main(args)
diff --git a/client/scripts/formatMifare.lua b/client/scripts/formatMifare.lua
index 90801b2a2..fe9cf32e5 100644
--- a/client/scripts/formatMifare.lua
+++ b/client/scripts/formatMifare.lua
@@ -213,4 +213,4 @@ local function main(args)
     end
 end
 
-main(args)
\ No newline at end of file
+main(args)
diff --git a/client/scripts/hf_read.lua b/client/scripts/hf_read.lua
index 7653e6e75..00238a67c 100644
--- a/client/scripts/hf_read.lua
+++ b/client/scripts/hf_read.lua
@@ -15,4 +15,4 @@ local function main(args)
     end
     return
 end
-main(args)
\ No newline at end of file
+main(args)
diff --git a/client/scripts/htmldump.lua b/client/scripts/htmldump.lua
index 40f3028b4..afd76abee 100644
--- a/client/scripts/htmldump.lua
+++ b/client/scripts/htmldump.lua
@@ -62,4 +62,4 @@ In the future, we may implement so that scripts are invoked directly
 into a 'main' function, instead of being executed blindly. For future
 compatibility, I have done so, but I invoke my main from here.
 --]]
-main(args)
\ No newline at end of file
+main(args)
diff --git a/client/scripts/lf_bulk.lua b/client/scripts/lf_bulk.lua
index b4604bebb..dc59572f3 100644
--- a/client/scripts/lf_bulk.lua
+++ b/client/scripts/lf_bulk.lua
@@ -190,4 +190,4 @@ local function main(args)
     end
 end
 
-main(args)
\ No newline at end of file
+main(args)
diff --git a/client/scripts/mfkeys.lua b/client/scripts/mfkeys.lua
index 18078b822..ff739683d 100644
--- a/client/scripts/mfkeys.lua
+++ b/client/scripts/mfkeys.lua
@@ -272,4 +272,4 @@ local function main(args)
     print('mfkeys - Total execution time: '..os.difftime(end_time, start_time)..' sec')
 end
 
-main( args)
\ No newline at end of file
+main( args)
diff --git a/client/scripts/ndef_dump.lua b/client/scripts/ndef_dump.lua
index 4a740d7e6..0bb597a52 100644
--- a/client/scripts/ndef_dump.lua
+++ b/client/scripts/ndef_dump.lua
@@ -244,4 +244,4 @@ local function main( args)
     prlog(string.format("Dumped data into %s", filename))
 
 end
-main(args)
\ No newline at end of file
+main(args)
diff --git a/client/scripts/ntag_3d.lua b/client/scripts/ntag_3d.lua
index 890f29d94..2f08aac85 100644
--- a/client/scripts/ntag_3d.lua
+++ b/client/scripts/ntag_3d.lua
@@ -380,4 +380,4 @@ local function main(args)
     write_tag(uid, t)
 end
 
-main(args)
\ No newline at end of file
+main(args)
diff --git a/client/scripts/parameters.lua b/client/scripts/parameters.lua
index f51266f7f..4eb86446d 100644
--- a/client/scripts/parameters.lua
+++ b/client/scripts/parameters.lua
@@ -42,4 +42,4 @@ In the future, we may implement so that scripts are invoked directly
 into a 'main' function, instead of being executed blindly. For future
 compatibility, I have done so, but I invoke my main from here.
 --]]
-main(args)
\ No newline at end of file
+main(args)
diff --git a/client/scripts/test_t55x7_ask.lua b/client/scripts/test_t55x7_ask.lua
index 3f224b28a..0e0d3d9e3 100644
--- a/client/scripts/test_t55x7_ask.lua
+++ b/client/scripts/test_t55x7_ask.lua
@@ -137,4 +137,4 @@ local function main(args)
     test()
     print( string.rep('--',20) )
 end
-main(args)
\ No newline at end of file
+main(args)
diff --git a/client/scripts/test_t55x7_fsk.lua b/client/scripts/test_t55x7_fsk.lua
index 9dbb1b6bb..492f71681 100644
--- a/client/scripts/test_t55x7_fsk.lua
+++ b/client/scripts/test_t55x7_fsk.lua
@@ -137,4 +137,4 @@ local function main(args)
     test(7)
     print( string.rep('--',20) )
 end
-main(args)
\ No newline at end of file
+main(args)
diff --git a/client/scripts/tnp3dump.lua b/client/scripts/tnp3dump.lua
index 2a5545497..f48abff6c 100644
--- a/client/scripts/tnp3dump.lua
+++ b/client/scripts/tnp3dump.lua
@@ -282,4 +282,4 @@ local function main(args)
 
     core.clearCommandBuffer()
 end
-main(args)
\ No newline at end of file
+main(args)
diff --git a/client/scripts/tnp3sim.lua b/client/scripts/tnp3sim.lua
index f64bebfce..ffda5a46d 100644
--- a/client/scripts/tnp3sim.lua
+++ b/client/scripts/tnp3sim.lua
@@ -486,4 +486,4 @@ local function main(args)
         print('The simulation is now prepared.\n --> run \"hf mf sim u '..uid..'\" <--')
     end
 end
-main(args)
\ No newline at end of file
+main(args)
diff --git a/client/scripts/tracetest.lua b/client/scripts/tracetest.lua
index 96d1f79c6..c3ddedf87 100644
--- a/client/scripts/tracetest.lua
+++ b/client/scripts/tracetest.lua
@@ -123,4 +123,4 @@ local function main(args)
     print( string.rep('--',20) )
 
 end
-main(args)
\ No newline at end of file
+main(args)
diff --git a/client/scripts/ufodump.lua b/client/scripts/ufodump.lua
index 67949fd94..f91949166 100644
--- a/client/scripts/ufodump.lua
+++ b/client/scripts/ufodump.lua
@@ -173,4 +173,4 @@ if "--test"==args then
 else
     -- Call the main
     main(args)
-end
\ No newline at end of file
+end
diff --git a/client/util.c b/client/util.c
index 0b3211264..6efcb8efa 100644
--- a/client/util.c
+++ b/client/util.c
@@ -873,4 +873,4 @@ extern char *strmcopy(char *buf) {
         strcpy(str, buf);
     }
     return str;
-}
\ No newline at end of file
+}
diff --git a/client/util.h b/client/util.h
index 9c68900e7..a96b3b71c 100644
--- a/client/util.h
+++ b/client/util.h
@@ -263,4 +263,4 @@ extern bool str_startswith(const char *s,  const char *pre);  // check for prefi
 extern void strcleanrn(char *buf, size_t len);
 extern void strcreplace(char *buf, size_t len, char from, char to);
 extern char *strmcopy(char *buf);
-#endif
\ No newline at end of file
+#endif
diff --git a/client/util_darwin.h b/client/util_darwin.h
index 15af75404..d89b681f2 100644
--- a/client/util_darwin.h
+++ b/client/util_darwin.h
@@ -16,4 +16,4 @@ void enableAppNap();
 void makeUnfocusable();
 void makeFocusable();
 
-#endif
\ No newline at end of file
+#endif
diff --git a/common/bucketsort.h b/common/bucketsort.h
index 1de175ae5..0a56509c1 100644
--- a/common/bucketsort.h
+++ b/common/bucketsort.h
@@ -21,4 +21,4 @@ typedef struct bucket_info {
 void bucket_sort_intersect(uint32_t *const estart, uint32_t *const estop,
                            uint32_t *const ostart, uint32_t *const ostop,
                            bucket_info_t *bucket_info, bucket_array_t bucket);
-#endif
\ No newline at end of file
+#endif
diff --git a/common/cmd.c b/common/cmd.c
index 5f42c669a..3b45c08ad 100644
--- a/common/cmd.c
+++ b/common/cmd.c
@@ -61,4 +61,4 @@ uint8_t cmd_send(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void
 #endif
 
     return sendlen;
-}
\ No newline at end of file
+}
diff --git a/common/crc.c b/common/crc.c
index 0846697de..2ad7609b1 100644
--- a/common/crc.c
+++ b/common/crc.c
@@ -123,4 +123,4 @@ uint32_t CRC8Legic(uint8_t *buff, size_t size) {
     for (int i = 0; i < size; ++i)
         crc_update2(&crc, buff[i], 8);
     return reflect8(crc_finish(&crc));
-}
\ No newline at end of file
+}
diff --git a/common/crc16.h b/common/crc16.h
index b88995a40..9a202f514 100644
--- a/common/crc16.h
+++ b/common/crc16.h
@@ -67,4 +67,4 @@ void reset_table(void);
 void generate_table(uint16_t polynomial, bool refin);
 uint16_t crc16_fast(uint8_t const *d, size_t n, uint16_t initval, bool refin, bool refout);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/common/crc32.c b/common/crc32.c
index 3ee102ce5..440bed910 100644
--- a/common/crc32.c
+++ b/common/crc32.c
@@ -29,4 +29,4 @@ void crc32_ex(const uint8_t *data, const size_t len, uint8_t *crc) {
 
 void crc32_append(uint8_t *data, const size_t len) {
     crc32_ex(data, len, data + len);
-}
\ No newline at end of file
+}
diff --git a/common/crc64.c b/common/crc64.c
index 7d582da02..23360f6bd 100644
--- a/common/crc64.c
+++ b/common/crc64.c
@@ -80,4 +80,4 @@ void crc64(const uint8_t *data, const size_t len, uint64_t *crc) {
     }
 }
 
-//suint8_t x = (c & 0xFF00000000000000 ) >> 56;
\ No newline at end of file
+//suint8_t x = (c & 0xFF00000000000000 ) >> 56;
diff --git a/common/i2c.h b/common/i2c.h
index 4254a73c3..df7f6698c 100644
--- a/common/i2c.h
+++ b/common/i2c.h
@@ -48,4 +48,4 @@ void SmartCardUpgrade(uint64_t arg0);
 void SmartCardSetBaud(uint64_t arg0);
 void SmartCardSetClock(uint64_t arg0);
 void I2C_print_status(void);
-#endif
\ No newline at end of file
+#endif
diff --git a/common/iso15693tools.c b/common/iso15693tools.c
index 7b64c99d1..c8d413e76 100644
--- a/common/iso15693tools.c
+++ b/common/iso15693tools.c
@@ -22,4 +22,4 @@ char *Iso15693sprintUID(char *target, uint8_t *uid) {
             uid[3], uid[2], uid[1], uid[0]
            );
     return target;
-}
\ No newline at end of file
+}
diff --git a/common/iso15693tools.h b/common/iso15693tools.h
index d7a1b2bb5..26a7a87a7 100644
--- a/common/iso15693tools.h
+++ b/common/iso15693tools.h
@@ -123,4 +123,4 @@ static const int Iso15693FrameEOF[] = {
     -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/common/legic_prng.c b/common/legic_prng.c
index fd5543cf7..5406161fc 100644
--- a/common/legic_prng.c
+++ b/common/legic_prng.c
@@ -62,4 +62,4 @@ uint32_t legic_prng_get_bits(uint8_t len) {
         legic_prng_forward(1);
     }
     return a;
-}
\ No newline at end of file
+}
diff --git a/common/prng.h b/common/prng.h
index f160d6b30..b9f49c6b6 100644
--- a/common/prng.h
+++ b/common/prng.h
@@ -21,4 +21,4 @@ void burtle_init_mod(prng_ctx *x, uint32_t seed);
 void burtle_init(prng_ctx *x, uint32_t seed);
 
 uint32_t GetSimplePrng(uint32_t seed);
-#endif /* __PRNG_H */
\ No newline at end of file
+#endif /* __PRNG_H */
diff --git a/common/radixsort.c b/common/radixsort.c
index 67f2910c1..83b26d609 100644
--- a/common/radixsort.c
+++ b/common/radixsort.c
@@ -96,4 +96,4 @@ uint64_t *radixSort(uint64_t *array, uint32_t size) {
     }
     free(cpy);
     return array;
-}
\ No newline at end of file
+}
diff --git a/common/radixsort.h b/common/radixsort.h
index 29faf9825..41a036461 100644
--- a/common/radixsort.h
+++ b/common/radixsort.h
@@ -20,4 +20,4 @@ typedef union {
 } rscounts_t;
 
 uint64_t *radixSort(uint64_t *array, uint32_t size);
-#endif // RADIXSORT_H__
\ No newline at end of file
+#endif // RADIXSORT_H__
diff --git a/common/random.h b/common/random.h
index 315794f8d..85c90dd38 100644
--- a/common/random.h
+++ b/common/random.h
@@ -18,4 +18,4 @@
 void fast_prand();
 void fast_prandEx(uint32_t seed);
 uint32_t prand();
-#endif
\ No newline at end of file
+#endif
diff --git a/common/tea.h b/common/tea.h
index 3a12a769d..43ac93428 100644
--- a/common/tea.h
+++ b/common/tea.h
@@ -15,4 +15,4 @@
 #include <stddef.h>
 void tea_encrypt(uint8_t *v, uint8_t *key);
 void tea_decrypt(uint8_t *v, uint8_t *key);
-#endif /* __TEA_H */
\ No newline at end of file
+#endif /* __TEA_H */
diff --git a/common/usart.c b/common/usart.c
index 46e8517fc..869179091 100644
--- a/common/usart.c
+++ b/common/usart.c
@@ -140,4 +140,4 @@ void usart_init(void) {
 
     // re-enable receiver / transmitter
     pUS1->US_CR = (AT91C_US_RXEN | AT91C_US_TXEN);
-}
\ No newline at end of file
+}
diff --git a/common/usb_cdc.c b/common/usb_cdc.c
index d70c8ee04..c871de241 100644
--- a/common/usb_cdc.c
+++ b/common/usb_cdc.c
@@ -949,4 +949,4 @@ void AT91F_CDC_Enumerate() {
             AT91F_USB_SendStall(pUdp);
             break;
     }
-}
\ No newline at end of file
+}
diff --git a/common/wiegand.c b/common/wiegand.c
index 2da88b085..e319e1a08 100644
--- a/common/wiegand.c
+++ b/common/wiegand.c
@@ -236,4 +236,4 @@ void num_to_wiegand_bits(uint64_t oem, uint64_t fc, uint64_t cn, uint8_t *dest,
         default:
             break;
     }
-}
\ No newline at end of file
+}
diff --git a/include/common.h b/include/common.h
index 2c3febc98..8bf8ab702 100644
--- a/include/common.h
+++ b/include/common.h
@@ -115,4 +115,4 @@ typedef struct {
 #ifdef __cplusplus
 }
 #endif
-#endif
\ No newline at end of file
+#endif
diff --git a/tools/Makefile b/tools/Makefile
index 51a76677b..3b1dc1b0f 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -16,4 +16,4 @@ get_xorsearch:
 #  Mingw
 #	unzzip-big XORSearch_V1_11_2.zip
 #  linux
-#	gunzip  XORSearch_V1_11_2.zip
\ No newline at end of file
+#	gunzip  XORSearch_V1_11_2.zip
diff --git a/tools/findbits_test.py b/tools/findbits_test.py
index 4415ce726..db8dda8fa 100644
--- a/tools/findbits_test.py
+++ b/tools/findbits_test.py
@@ -65,4 +65,4 @@ class OutputBuffer(object):
 
 
 if __name__ == '__main__':
-    unittest.main()
\ No newline at end of file
+    unittest.main()
diff --git a/tools/mkversion.pl b/tools/mkversion.pl
index 023c84c8b..ed5cea206 100644
--- a/tools/mkversion.pl
+++ b/tools/mkversion.pl
@@ -4,7 +4,7 @@
 # Normally a couple of lines of bash would be enough (see openpcd project, original firmware by Harald Welte and Milosch Meriac)
 # but this will, at least in theory, also work on Windows with our current compile environment.
 # -- Henryk Plötz <henryk@ploetzli.ch> 2009-09-28
-# Modified april 2014 because of the move to github. 
+# Modified april 2014 because of the move to github.
 # --- Martin Holst Swende <martin@swende.se>
 # Modified january 2016 to work with Travis-CI
 # --- iceman <iceman@iuse.se>
@@ -19,9 +19,9 @@ my $ctime;
 # GIT status  0 = dirty,  1 = clean ,  2 = undecided
 my $clean = 2;
 
-# Do we have acces to git command? 
+# Do we have acces to git command?
 #######
-# solves some bug on macos i.e: 
+# solves some bug on macos i.e:
 ##
 # perl ../tools/mkversion.pl .. > version.c || cp ../common/default_version.c version.c
 # /usr/bin/which: /usr/bin/which: cannot execute binary file
diff --git a/uart/uart_win32.c b/uart/uart_win32.c
index 0717a24cb..6107a564e 100644
--- a/uart/uart_win32.c
+++ b/uart/uart_win32.c
@@ -174,4 +174,4 @@ bool uart_send(const serial_port sp, const uint8_t *p_tx, const size_t len) {
     return WriteFile(((serial_port_windows *)sp)->hPort, p_tx, len, &txlen, NULL);
 }
 
-#endif
\ No newline at end of file
+#endif

From a35025f33f3c7716cac0aee631db5e8b171d6b6a Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 12 Mar 2019 12:56:39 +0100
Subject: [PATCH 0743/1938] rename snoop -> sniff

---
 client/cmdlfhitag.c | 4 ++--
 client/cmdlfhitag.h | 2 +-
 client/snooper.c    | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index 42540f305..9ffdfa6cb 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -173,7 +173,7 @@ int CmdLFHitagList(const char *Cmd) {
     return 0;
 }
 
-int CmdLFHitagSnoop(const char *Cmd) {
+int CmdLFHitagSniff(const char *Cmd) {
     UsbCommand c = {CMD_SNOOP_HITAG};
     clearCommandBuffer();
     SendCommand(&c);
@@ -418,7 +418,7 @@ static command_t CommandTable[] = {
     {"reader",  CmdLFHitagReader,  1, "Act like a Hitag Reader"},
     {"sim",     CmdLFHitagSim,     1, "<infile> Simulate Hitag transponder"},
     {"simS",    CmdLFHitagSimS,    1, "<hitagS.hts> Simulate HitagS transponder" },
-    {"snoop",   CmdLFHitagSnoop,   1, "Eavesdrop Hitag communication"},
+    {"sniff",   CmdLFHitagSniff,   1, "Eavesdrop Hitag communication"},
     {"writer",  CmdLFHitagWP,      1, "Act like a Hitag Writer" },
     {"check_challenges", CmdLFHitagCheckChallenges,   1, "<challenges.cc> test all challenges" },
     { NULL, NULL, 0, NULL }
diff --git a/client/cmdlfhitag.h b/client/cmdlfhitag.h
index e43ed58ff..2c39ef345 100644
--- a/client/cmdlfhitag.h
+++ b/client/cmdlfhitag.h
@@ -17,7 +17,7 @@ extern int CmdLFHitagList(const char *Cmd);
 extern int CmdLFHitagReader(const char *Cmd);
 extern int CmdLFHitagSim(const char *Cmd);
 extern int CmdLFHitagSimS(const char *Cmd);
-extern int CmdLFHitagSnoop(const char *Cmd);
+extern int CmdLFHitagSniff(const char *Cmd);
 extern int CmdLFHitagWP(const char *Cmd);
 extern int CmdLFHitagCheckChallenges(const char *Cmd);
 
diff --git a/client/snooper.c b/client/snooper.c
index 88a30edaa..35267bc22 100644
--- a/client/snooper.c
+++ b/client/snooper.c
@@ -5,7 +5,7 @@
 // at your option, any later version. See the LICENSE.txt file for the text of
 // the license.
 //-----------------------------------------------------------------------------
-// Snooper binary
+// Sniff binary
 //-----------------------------------------------------------------------------
 
 #include "util_posix.h"
@@ -19,7 +19,7 @@
 
 int main() {
     usb_init();
-    SetLogFilename("snooper.log");
+    SetLogFilename("sniffer.log");
 
     return_on_error = 1;
 
@@ -27,7 +27,7 @@ int main() {
         while (!OpenProxmark()) { sleep(1); }
         while (1) {
             UsbCommand cmdbuf;
-            CommandReceived("hf 14a snoop");
+            CommandReceived("hf 14a sniff");
             HANDLE_ERROR;
             ReceiveCommand(&cmdbuf);
             HANDLE_ERROR;

From 77693521df0898efdb99d6607b322f9fecad2e99 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 12 Mar 2019 12:56:59 +0100
Subject: [PATCH 0744/1938] rename idteck

---
 client/cmddata.c | 27 ++++++++++++++-------------
 client/cmddata.h |  2 +-
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/client/cmddata.c b/client/cmddata.c
index 5aeaca388..117a1a495 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -482,7 +482,8 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
     if (maxLen < BitLen && maxLen != 0) BitLen = maxLen;
 
     int foundclk = 0;
-    //amp before ST check
+
+    //amplify signal before ST check
     if (amp == 'a')
         askAmp(bits, BitLen);
 
@@ -496,8 +497,8 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
         clk = (clk == 0) ? foundclk : clk;
         CursorCPos = ststart;
         CursorDPos = stend;
-        if (verbose || g_debugMode)
-            PrintAndLogEx(NORMAL, "Found Sequence Terminator - First one is shown by orange and blue graph markers");
+        if (verbose)
+            PrintAndLogEx(DEBUG, "Found Sequence Terminator - First one is shown by orange / blue graph markers");
     }
 
     int startIdx = 0;
@@ -513,19 +514,19 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
         return 0;
     }
 
-    if (verbose || g_debugMode) PrintAndLogEx(DEBUG, "DEBUG: (ASKDemod_ext) Using clock:%d, invert:%d, bits found:%d", clk, invert, BitLen);
+    if (verbose) PrintAndLogEx(DEBUG, "DEBUG: (ASKDemod_ext) Using clock:%d, invert:%d, bits found:%d", clk, invert, BitLen);
 
     //output
     setDemodBuf(bits, BitLen, 0);
     setClockGrid(clk, startIdx);
 
-    if (verbose || g_debugMode) {
+    if (verbose) {
         if (errCnt > 0)
-            PrintAndLogEx(NORMAL, "# Errors during Demoding (shown as 7 in bit stream): %d", errCnt);
+            PrintAndLogEx(DEBUG, "# Errors during Demoding (shown as 7 in bit stream): %d", errCnt);
         if (askType)
-            PrintAndLogEx(NORMAL, "ASK/Manchester - Clock: %d - Decoded bitstream:", clk);
+            PrintAndLogEx(DEBUG, "ASK/Manchester - Clock: %d - Decoded bitstream:", clk);
         else
-            PrintAndLogEx(NORMAL, "ASK/Raw - Clock: %d - Decoded bitstream:", clk);
+            PrintAndLogEx(DEBUG, "ASK/Raw - Clock: %d - Decoded bitstream:", clk);
         // Now output the bitstream to the scrollback by line of 16 bits
         printDemodBuff();
     }
@@ -624,7 +625,7 @@ int CmdBiphaseDecodeRaw(const char *Cmd) {
 
     sscanf(Cmd, "%i %i %i", &offset, &invert, &maxErr);
     if (DemodBufferLen == 0) {
-        PrintAndLogEx(NORMAL, "DemodBuffer Empty - run 'data rawdemod ar' first");
+        PrintAndLogEx(WARNING, "DemodBuffer Empty - run " _YELLOW_("'data rawdemod ar'")" first");
         return 0;
     }
 
@@ -643,7 +644,7 @@ int CmdBiphaseDecodeRaw(const char *Cmd) {
     }
 
     if (errCnt > 0)
-        PrintAndLogEx(WARNING, "# Errors found during Demod (shown as 7 in bit stream): %d", errCnt);
+        PrintAndLogEx(WARNING, "# Errors found during Demod (shown as " _YELLOW_("7")" in bit stream): %d", errCnt);
 
     PrintAndLogEx(NORMAL, "Biphase Decoded using offset: %d - # invert:%d - data:", offset, invert);
     PrintAndLogEx(NORMAL, "%s", sprint_bin_break(bits, size, 16));
@@ -716,7 +717,7 @@ int AutoCorrelate(const int *in, int *out, size_t len, int window, bool SaveGrph
     // sanity check
     if (window > len) window = len;
 
-    if (verbose) PrintAndLogEx(INFO, "performing %d correlations", GraphTraceLen - window);
+    if (verbose) PrintAndLogEx(INFO, "performing " _YELLOW_("%d")" correlations", GraphTraceLen - window);
 
     //test
     double autocv = 0.0;    // Autocovariance value
@@ -1069,7 +1070,7 @@ int FSKrawDemod(const char *Cmd, bool verbose) {
         }
         return 1;
     } else {
-        if (g_debugMode) PrintAndLogEx(NORMAL, "no FSK data found");
+        PrintAndLogEx(DEBUG, "no FSK data found");
     }
     return 0;
 }
@@ -1128,7 +1129,7 @@ int PSKDemod(const char *Cmd, bool verbose) {
     return 1;
 }
 
-int CmdPSKIdteck(const char *Cmd) {
+int CmdIdteckDemod(const char *Cmd) {
 
     if (!PSKDemod("", false)) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - Idteck PSKDemod failed");
diff --git a/client/cmddata.h b/client/cmddata.h
index 86f19d81d..1091c48c2 100644
--- a/client/cmddata.h
+++ b/client/cmddata.h
@@ -54,7 +54,7 @@ int CmdDetectClockRate(const char *Cmd);
 int CmdFSKrawdemod(const char *Cmd);
 int CmdPSK1rawDemod(const char *Cmd);
 int CmdPSK2rawDemod(const char *Cmd);
-int CmdPSKIdteck(const char *Cmd);
+int CmdIdteckDemod(const char *Cmd);
 int CmdGrid(const char *Cmd);
 int CmdGetBitStream(const char *Cmd);
 int CmdHexsamples(const char *Cmd);

From 35bc4a975e378e63ce4c4c3336c483de0193e351 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 12 Mar 2019 13:15:39 +0100
Subject: [PATCH 0745/1938] rename SNOOP -> SNIFF

---
 armsrc/Makefile              |  2 +-
 armsrc/appmain.c             | 20 ++++++++++----------
 armsrc/apps.h                |  4 ++--
 armsrc/felica.c              |  2 +-
 armsrc/hfsnoop.c             | 10 +++++-----
 armsrc/hitag2.c              |  6 +++---
 armsrc/iclass.c              |  2 +-
 armsrc/iso14443b.c           |  2 +-
 armsrc/lfsampling.c          |  6 +++---
 armsrc/lfsampling.h          |  6 +++---
 client/cli.c                 |  2 +-
 client/cmdhf.c               |  2 +-
 client/cmdhf14a.c            |  2 +-
 client/cmdhf14b.c            |  2 +-
 client/cmdhffelica.c         |  2 +-
 client/cmdhficlass.c         |  2 +-
 client/cmdhfmf.c             |  2 +-
 client/cmdlf.c               | 15 +++++++++------
 client/cmdlfhitag.c          |  2 +-
 client/hid-flasher/usb_cmd.h | 12 ++++++------
 include/usb_cmd.h            | 14 +++++++-------
 21 files changed, 60 insertions(+), 57 deletions(-)

diff --git a/armsrc/Makefile b/armsrc/Makefile
index 382407e1d..7db669cb8 100644
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -38,7 +38,7 @@ APP_CFLAGS = $(PLATFORM_DEFS) \
 			 -DWITH_ISO14443a \
 			 -DWITH_ICLASS \
 			 -DWITH_FELICA \
-			 -DWITH_HFSNOOP \
+			 -DWITH_HFSNIFF \
 			 -DWITH_LF_SAMYRUN \
 			 -fno-strict-aliasing -ffunction-sections -fdata-sections
 
diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index dbe20b2b7..ba2aa75e3 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -650,8 +650,8 @@ void UsbPacketReceived(uint8_t *packet, int len) {
         case CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K:
             ModThenAcquireRawAdcSamples125k(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
             break;
-        case CMD_LF_SNOOP_RAW_ADC_SAMPLES: {
-            uint32_t bits = SnoopLF();
+        case CMD_LF_SNIFF_RAW_ADC_SAMPLES: {
+            uint32_t bits = SniffLF();
             cmd_send(CMD_ACK, bits, 0, 0, 0, 0);
             break;
         }
@@ -765,8 +765,8 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 #endif
 
 #ifdef WITH_HITAG
-        case CMD_SNOOP_HITAG: // Eavesdrop Hitag tag, args = type
-            SnoopHitag(c->arg[0]);
+        case CMD_SNIFF_HITAG: // Eavesdrop Hitag tag, args = type
+            SniffHitag(c->arg[0]);
             break;
         case CMD_SIMULATE_HITAG: // Simulate Hitag tag, args = memory content
             SimulateHitagTag((bool)c->arg[0], (byte_t *)c->d.asBytes);
@@ -843,7 +843,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
         case CMD_READ_SRI_TAG:
             ReadSTMemoryIso14443b(c->arg[0]);
             break;
-        case CMD_SNOOP_ISO_14443B:
+        case CMD_SNIFF_ISO_14443B:
             SniffIso14443b();
             break;
         case CMD_SIMULATE_TAG_ISO_14443B:
@@ -862,7 +862,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
         case CMD_FELICA_LITE_SIM:
             felica_sim_lite(c->arg[0]);
             break;
-        case CMD_FELICA_SNOOP:
+        case CMD_FELICA_SNIFF:
             felica_sniff(c->arg[0], c->arg[1]);
             break;
         case CMD_FELICA_LITE_DUMP:
@@ -871,7 +871,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 #endif
 
 #ifdef WITH_ISO14443a
-        case CMD_SNOOP_ISO_14443a:
+        case CMD_SNIFF_ISO_14443a:
             SniffIso14443a(c->arg[0]);
             break;
         case CMD_READER_ISO_14443a:
@@ -1003,7 +1003,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 
 #ifdef WITH_ICLASS
         // Makes use of ISO14443a FPGA Firmware
-        case CMD_SNOOP_ICLASS:
+        case CMD_SNIFF_ICLASS:
             SniffIClass();
             break;
         case CMD_SIMULATE_TAG_ICLASS:
@@ -1043,9 +1043,9 @@ void UsbPacketReceived(uint8_t *packet, int len) {
             break;
 #endif
 
-#ifdef WITH_HFSNOOP
+#ifdef WITH_HFSNIFF
         case CMD_HF_SNIFFER:
-            HfSnoop(c->arg[0], c->arg[1]);
+            HfSniff(c->arg[0], c->arg[1]);
             break;
 #endif
 
diff --git a/armsrc/apps.h b/armsrc/apps.h
index 36c865900..ebc9d302c 100644
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -223,7 +223,7 @@ void iClass_Clone(uint8_t startblock, uint8_t endblock, uint8_t *data);
 void iClass_ReadCheck(uint8_t blockNo, uint8_t keyType);
 
 // hitag2.h
-void SnoopHitag(uint32_t type);
+void SniffHitag(uint32_t type);
 void SimulateHitagTag(bool tag_mem_supplied, byte_t *data);
 void ReaderHitag(hitag_function htf, hitag_data *htd);
 void WriterHitag(hitag_function htf, hitag_data *htd, int page);
@@ -239,7 +239,7 @@ uint8_t cmd_receive(UsbCommand *cmd);
 uint8_t cmd_send(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
 
 // util.h
-void HfSnoop(int, int);
+void HfSniff(int, int);
 
 //felica.c
 extern void felica_sendraw(UsbCommand *c);
diff --git a/armsrc/felica.c b/armsrc/felica.c
index 3aa3c282d..190960bd4 100644
--- a/armsrc/felica.c
+++ b/armsrc/felica.c
@@ -544,7 +544,7 @@ void felica_sniff(uint32_t samplesToSkip, uint32_t triggersToSkip) {
 
     int remFrames = (samplesToSkip) ? samplesToSkip : 0;
 
-    Dbprintf("Snoop FelicaLiteS: Getting first %d frames, Skipping %d triggers.\n", samplesToSkip, triggersToSkip);
+    Dbprintf("Sniff FelicaLiteS: Getting first %d frames, Skipping %d triggers.\n", samplesToSkip, triggersToSkip);
 
     iso18092_setup(FPGA_HF_ISO18092_FLAG_NOMOD);
 
diff --git a/armsrc/hfsnoop.c b/armsrc/hfsnoop.c
index 4ec60d175..11ceff3d9 100644
--- a/armsrc/hfsnoop.c
+++ b/armsrc/hfsnoop.c
@@ -4,9 +4,9 @@
 #include "util.h"
 #include "usb_cdc.h" // for usb_poll_validate_length
 
-static void RAMFUNC optimizedSnoop(void);
+static void RAMFUNC optimizedSniff(void);
 
-static void RAMFUNC optimizedSnoop(void) {
+static void RAMFUNC optimizedSniff(void) {
     int n = BigBuf_max_traceLen() / sizeof(uint16_t); // take all memory
 
     uint16_t *dest = (uint16_t *)BigBuf_get_addr();
@@ -23,7 +23,7 @@ static void RAMFUNC optimizedSnoop(void) {
     set_tracelen(BigBuf_max_traceLen());
 }
 
-void HfSnoop(int samplesToSkip, int triggersToSkip) {
+void HfSniff(int samplesToSkip, int triggersToSkip) {
     BigBuf_free();
     BigBuf_Clear();
 
@@ -66,14 +66,14 @@ void HfSnoop(int samplesToSkip, int triggersToSkip) {
             if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY))
                 waitcount--;
         }
-        optimizedSnoop();
+        optimizedSniff();
         Dbprintf("Trigger kicked! Value: %d, Dumping Samples Hispeed now.", r);
     }
 
     //Resetting Frame mode (First set in fpgaloader.c)
     AT91C_BASE_SSC->SSC_RFMR = SSC_FRAME_MODE_BITS_IN_WORD(8) | AT91C_SSC_MSBF | SSC_FRAME_MODE_WORDS_PER_TRANSFER(0);
 
-    DbpString("HF Snoop end");
+    DbpString("HF Sniffing end");
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     LED_D_OFF();
 }
diff --git a/armsrc/hitag2.c b/armsrc/hitag2.c
index c872c1261..7ed6c88ca 100644
--- a/armsrc/hitag2.c
+++ b/armsrc/hitag2.c
@@ -10,7 +10,7 @@
 // Hitag2 complete rewrite of the code
 // - Fixed modulation/encoding issues
 // - Rewrote code for transponder emulation
-// - Added snooping of transponder communication
+// - Added sniffing of transponder communication
 // - Added reader functionality
 //
 // (c) 2012 Roel Verdult
@@ -801,7 +801,7 @@ static bool hitag2_read_uid(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t
     return true;
 }
 
-void SnoopHitag(uint32_t type) {
+void SniffHitag(uint32_t type) {
     int frame_count;
     int response;
     int overflow;
@@ -829,7 +829,7 @@ void SnoopHitag(uint32_t type) {
     auth_table = (uint8_t *)BigBuf_malloc(AUTH_TABLE_LENGTH);
     memset(auth_table, 0x00, AUTH_TABLE_LENGTH);
 
-    DbpString("Starting Hitag2 snoop");
+    DbpString("Starting Hitag2 sniff");
     LED_D_ON();
 
     // Set up eavesdropping mode, frequency divisor which will drive the FPGA
diff --git a/armsrc/iclass.c b/armsrc/iclass.c
index e14a3c145..1326306b1 100644
--- a/armsrc/iclass.c
+++ b/armsrc/iclass.c
@@ -18,7 +18,7 @@
 //
 // FIX:
 // ====
-// We still have sometimes a demodulation error when snooping iClass communication.
+// We still have sometimes a demodulation error when sniffing iClass communication.
 // The resulting trace of a read-block-03 command may look something like this:
 //
 //  +  22279:    :     0c  03  e8  01
diff --git a/armsrc/iso14443b.c b/armsrc/iso14443b.c
index 57433c682..9586ee0ab 100644
--- a/armsrc/iso14443b.c
+++ b/armsrc/iso14443b.c
@@ -1413,7 +1413,7 @@ static void iso1444b_setup_sniff(void) {
     FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
     BigBuf_free();
     BigBuf_Clear_ext(false);
-    clear_trace();//setup snoop
+    clear_trace();
     set_tracing(true);
 
     // Initialize Demod and Uart structs
diff --git a/armsrc/lfsampling.c b/armsrc/lfsampling.c
index faf77229c..7018fbae2 100644
--- a/armsrc/lfsampling.c
+++ b/armsrc/lfsampling.c
@@ -29,7 +29,7 @@ void printConfig() {
 
 /**
  * Called from the USB-handler to set the sampling configuration
- * The sampling config is used for std reading and snooping.
+ * The sampling config is used for std reading and sniffing.
  *
  * Other functions may read samples and ignore the sampling config,
  * such as functions to read the UID from a prox tag or similar.
@@ -253,10 +253,10 @@ uint32_t SampleLF(bool printCfg, int sample_size) {
     return ReadLF(true, printCfg, sample_size);
 }
 /**
-* Initializes the FPGA for snoop-mode (field off), and acquires the samples.
+* Initializes the FPGA for sniffer-mode (field off), and acquires the samples.
 * @return number of bits sampled
 **/
-uint32_t SnoopLF() {
+uint32_t SniffLF() {
     BigBuf_Clear_ext(false);
     return ReadLF(false, true, 0);
 }
diff --git a/armsrc/lfsampling.h b/armsrc/lfsampling.h
index 94c370ed9..8556cd327 100644
--- a/armsrc/lfsampling.h
+++ b/armsrc/lfsampling.h
@@ -30,10 +30,10 @@ void doT55x7Acquisition(size_t sample_size);
 uint32_t SampleLF(bool silent, int sample_size);
 
 /**
-* Initializes the FPGA for snoop-mode (field off), and acquires the samples.
+* Initializes the FPGA for sniff-mode (field off), and acquires the samples.
 * @return number of bits sampled
 **/
-uint32_t SnoopLF();
+uint32_t SniffLF();
 
 // adds sample size to default options
 uint32_t DoPartialAcquisition(int trigger_threshold, bool silent, int sample_size, uint32_t cancel_after);
@@ -67,7 +67,7 @@ void LFSetupFPGAForADC(int divisor, bool lf_field);
 
 /**
  * Called from the USB-handler to set the sampling configuration
- * The sampling config is used for std reading and snooping.
+ * The sampling config is used for std reading and sniffing.
  *
  * Other functions may read samples and ignore the sampling config,
  * such as functions to read the UID from a prox tag or similar.
diff --git a/client/cli.c b/client/cli.c
index 19e472586..270689732 100644
--- a/client/cli.c
+++ b/client/cli.c
@@ -21,7 +21,7 @@ int main(int argc, char **argv) {
     if (argc != 3 && argc != 4) {
         printf("\n\tusage: cli <command 1> <command 2> [logfile (default cli.log)]\n");
         printf("\n");
-        printf("\texample: cli hi14asnoop hi14alist h14a.log\n");
+        printf("\texample: cli hf 14a sniff hf 14a list h14a.log\n");
         printf("\n");
         return -1;
     }
diff --git a/client/cmdhf.c b/client/cmdhf.c
index 63bfd6d0f..8368160f8 100644
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -21,7 +21,7 @@ int usage_hf_search() {
     return 0;
 }
 int usage_hf_sniff() {
-    PrintAndLogEx(NORMAL, "The high frequence snoop will assign all available memory on device for sniffed data");
+    PrintAndLogEx(NORMAL, "The high frequence sniffer will assign all available memory on device for sniffed data");
     PrintAndLogEx(NORMAL, "Use " _YELLOW_("'data samples'")" command to download from device,  and " _YELLOW_("'data plot'")" to look at it");
     PrintAndLogEx(NORMAL, "Press button to quit the sniffing.\n");
     PrintAndLogEx(NORMAL, "Usage: hf sniff <skip pairs> <skip triggers>");
diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 6d4b39e4e..6dd7149f2 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -803,7 +803,7 @@ int CmdHF14ASniff(const char *Cmd) {
         if (ctmp == 'c') param |= 0x01;
         if (ctmp == 'r') param |= 0x02;
     }
-    UsbCommand c = {CMD_SNOOP_ISO_14443a, {param, 0, 0}};
+    UsbCommand c = {CMD_SNIFF_ISO_14443a, {param, 0, 0}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c
index 564b18012..39b6c4937 100644
--- a/client/cmdhf14b.c
+++ b/client/cmdhf14b.c
@@ -145,7 +145,7 @@ int CmdHF14BSniff(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_hf_14b_sniff();
 
-    UsbCommand c = {CMD_SNOOP_ISO_14443B, {0, 0, 0}};
+    UsbCommand c = {CMD_SNIFF_ISO_14443B, {0, 0, 0}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
diff --git a/client/cmdhffelica.c b/client/cmdhffelica.c
index e06f133e3..33d506a58 100644
--- a/client/cmdhffelica.c
+++ b/client/cmdhffelica.c
@@ -218,7 +218,7 @@ int CmdHFFelicaSniff(const char *Cmd) {
     //Validations
     if (errors || cmdp == 0) return usage_hf_felica_sniff();
 
-    UsbCommand c = {CMD_FELICA_SNOOP, {samples2skip, triggers2skip, 0}};
+    UsbCommand c = {CMD_FELICA_SNIFF, {samples2skip, triggers2skip, 0}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index b71f2fd03..5f77e7c85 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -279,7 +279,7 @@ int CmdHFiClassList(const char *Cmd) {
 int CmdHFiClassSniff(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_hf_iclass_sniff();
-    UsbCommand c = {CMD_SNOOP_ICLASS};
+    UsbCommand c = {CMD_SNIFF_ICLASS};
     SendCommand(&c);
     return 0;
 }
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index e3b8cb957..6ece17850 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -3506,7 +3506,7 @@ static command_t CommandTable[] = {
     {"nack",        CmdHf14AMfNack,         0, "Test for Mifare NACK bug"},
     {"chk",         CmdHF14AMfChk,          0, "Check keys"},
     {"fchk",        CmdHF14AMfChk_fast,     0, "Check keys fast, targets all keys on card"},
-    {"decrypt",     CmdHf14AMfDecryptBytes, 1, "[nt] [ar_enc] [at_enc] [data] - to decrypt snoop or trace"},
+    {"decrypt",     CmdHf14AMfDecryptBytes, 1, "[nt] [ar_enc] [at_enc] [data] - to decrypt sniff or trace"},
     {"-----------", CmdHelp,                1, ""},
     {"dbg",         CmdHF14AMfDbg,          0, "Set default debug mode"},
     {"rdbl",        CmdHF14AMfRdBl,         0, "Read MIFARE classic block"},
diff --git a/client/cmdlf.c b/client/cmdlf.c
index b6202ed73..1b9387848 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -70,8 +70,8 @@ int usage_lf_config(void) {
     PrintAndLogEx(NORMAL, "                    a resolution of 4 bits per sample.");
     PrintAndLogEx(NORMAL, "      lf read");
     PrintAndLogEx(NORMAL, "                    Performs a read (active field)");
-    PrintAndLogEx(NORMAL, "      lf snoop");
-    PrintAndLogEx(NORMAL, "                    Performs a snoop (no active field)");
+    PrintAndLogEx(NORMAL, "      lf sniff");
+    PrintAndLogEx(NORMAL, "                    Performs a sniff (no active field)");
     return 0;
 }
 int usage_lf_simfsk(void) {
@@ -389,7 +389,7 @@ int CmdLFSniff(const char *Cmd) {
     uint8_t cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_lf_sniff();
 
-    UsbCommand c = {CMD_LF_SNOOP_RAW_ADC_SAMPLES, {0, 0, 0}};
+    UsbCommand c = {CMD_LF_SNIFF_RAW_ADC_SAMPLES, {0, 0, 0}};
     clearCommandBuffer();
     SendCommand(&c);
     WaitForResponse(CMD_ACK, NULL);
@@ -896,12 +896,15 @@ int CmdLFfind(const char *Cmd) {
     }
 
     if (EM4x50Read("", false))  { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("EM4x50 ID") " found!"); return 1;}
+
+    if (CmdHIDDemod(""))        { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("HID Prox ID") " found!"); goto out;}   
     if (CmdAWIDDemod(""))       { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("AWID ID") " found!"); goto out;}
+    if (CmdParadoxDemod(""))    { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Paradox ID") " found!"); goto out;}
+    
     if (CmdEM410xDemod(""))     { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("EM410x ID") " found!"); goto out;}
     if (CmdFdxDemod(""))        { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("FDX-B ID") " found!"); goto out;}
     if (CmdGuardDemod(""))      { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Guardall G-Prox II ID") " found!"); goto out; }
-    if (CmdHIDDemod(""))        { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("HID Prox ID") " found!"); goto out;}
-    if (CmdPSKIdteck(""))       { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Idteck ID") " found!"); goto out;}
+    if (CmdIdteckDemod(""))     { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Idteck ID") " found!"); goto out;}
     if (CmdIndalaDemod(""))     { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Indala ID") " found!");  goto out;}
     if (CmdIOProxDemod(""))     { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("IO Prox ID") " found!"); goto out;}
     if (CmdJablotronDemod(""))  { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Jablotron ID") " found!"); goto out;}
@@ -910,7 +913,7 @@ int CmdLFfind(const char *Cmd) {
     if (CmdNoralsyDemod(""))    { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Noralsy ID") " found!"); goto out;}
     if (CmdKeriDemod(""))       { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("KERI ID") " found!"); goto out;}
     if (CmdPacDemod(""))        { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("PAC/Stanley ID") " found!"); goto out;}
-    if (CmdParadoxDemod(""))    { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Paradox ID") " found!"); goto out;}
+
     if (CmdPrescoDemod(""))     { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Presco ID") " found!"); goto out;}
     if (CmdPyramidDemod(""))    { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Pyramid ID") " found!"); goto out;}
     if (CmdSecurakeyDemod(""))  { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Securakey ID") " found!"); goto out;}
diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index 9ffdfa6cb..53d4d5036 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -174,7 +174,7 @@ int CmdLFHitagList(const char *Cmd) {
 }
 
 int CmdLFHitagSniff(const char *Cmd) {
-    UsbCommand c = {CMD_SNOOP_HITAG};
+    UsbCommand c = {CMD_SNIFF_HITAG};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
diff --git a/client/hid-flasher/usb_cmd.h b/client/hid-flasher/usb_cmd.h
index 5e562c10b..ac563bd26 100644
--- a/client/hid-flasher/usb_cmd.h
+++ b/client/hid-flasher/usb_cmd.h
@@ -96,7 +96,7 @@ typedef struct {
 #define CMD_IO_DEMOD_FSK                                                  0x021A
 #define CMD_IO_CLONE_TAG                                                  0x021B
 #define CMD_EM410X_DEMOD                                                  0x021c
-// Sampling configuration for LF reader/snooper
+// Sampling configuration for LF reader/sniffer
 #define CMD_SET_LF_SAMPLING_CONFIG                                        0x021d
 #define CMD_FSK_SIM_TAG                                                   0x021E
 #define CMD_ASK_SIM_TAG                                                   0x021F
@@ -119,10 +119,10 @@ typedef struct {
 #define CMD_ISO_15693_COMMAND                                             0x0313
 #define CMD_ISO_15693_COMMAND_DONE                                        0x0314
 #define CMD_ISO_15693_FIND_AFI                                            0x0315
-#define CMD_LF_SNOOP_RAW_ADC_SAMPLES                                      0x0317
+#define CMD_LF_SNIFF_RAW_ADC_SAMPLES                                      0x0317
 
 // For Hitag2 transponders
-#define CMD_SNOOP_HITAG                                                   0x0370
+#define CMD_SNIFF_HITAG                                                   0x0370
 #define CMD_SIMULATE_HITAG                                                0x0371
 #define CMD_READER_HITAG                                                  0x0372
 
@@ -135,8 +135,8 @@ typedef struct {
 
 #define CMD_ANTIFUZZ_ISO_14443a                                           0x0380
 #define CMD_SIMULATE_TAG_ISO_14443B                                       0x0381
-#define CMD_SNOOP_ISO_14443B                                              0x0382
-#define CMD_SNOOP_ISO_14443a                                              0x0383
+#define CMD_SNIFF_ISO_14443B                                              0x0382
+#define CMD_SNIFF_ISO_14443a                                              0x0383
 #define CMD_SIMULATE_TAG_ISO_14443a                                       0x0384
 #define CMD_READER_ISO_14443a                                             0x0385
 
@@ -151,7 +151,7 @@ typedef struct {
 #define CMD_LEGIC_ESET                                                    0x03BD
 #define CMD_LEGIC_EGET                                                    0x03BE
 
-#define CMD_SNOOP_ICLASS                                                  0x0392
+#define CMD_SNIFF_ICLASS                                                  0x0392
 #define CMD_SIMULATE_TAG_ICLASS                                           0x0393
 #define CMD_READER_ICLASS                                                 0x0394
 #define CMD_READER_ICLASS_REPLAY                                          0x0395
diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index 94ae66eaa..a15229969 100644
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -129,7 +129,7 @@ typedef struct {
 #define CMD_IO_DEMOD_FSK                                                  0x021A
 #define CMD_IO_CLONE_TAG                                                  0x021B
 #define CMD_EM410X_DEMOD                                                  0x021c
-// Sampling configuration for LF reader/snooper
+// Sampling configuration for LF reader/sniffer
 #define CMD_SET_LF_SAMPLING_CONFIG                                        0x021d
 #define CMD_FSK_SIM_TAG                                                   0x021E
 #define CMD_ASK_SIM_TAG                                                   0x021F
@@ -154,10 +154,10 @@ typedef struct {
 #define CMD_ISO_15693_COMMAND                                             0x0313
 #define CMD_ISO_15693_COMMAND_DONE                                        0x0314
 #define CMD_ISO_15693_FIND_AFI                                            0x0315
-#define CMD_LF_SNOOP_RAW_ADC_SAMPLES                                      0x0317
+#define CMD_LF_SNIFF_RAW_ADC_SAMPLES                                      0x0317
 
 // For Hitag2 transponders
-#define CMD_SNOOP_HITAG                                                   0x0370
+#define CMD_SNIFF_HITAG                                                   0x0370
 #define CMD_SIMULATE_HITAG                                                0x0371
 #define CMD_READER_HITAG                                                  0x0372
 
@@ -170,9 +170,9 @@ typedef struct {
 
 #define CMD_ANTIFUZZ_ISO_14443a                                           0x0380
 #define CMD_SIMULATE_TAG_ISO_14443B                                       0x0381
-#define CMD_SNOOP_ISO_14443B                                              0x0382
+#define CMD_SNIFF_ISO_14443B                                              0x0382
 
-#define CMD_SNOOP_ISO_14443a                                              0x0383
+#define CMD_SNIFF_ISO_14443a                                              0x0383
 #define CMD_SIMULATE_TAG_ISO_14443a                                       0x0384
 
 #define CMD_READER_ISO_14443a                                             0x0385
@@ -192,7 +192,7 @@ typedef struct {
 #define CMD_ICLASS_READCHECK                                              0x038F
 #define CMD_ICLASS_CLONE                                                  0x0390
 #define CMD_ICLASS_DUMP                                                   0x0391
-#define CMD_SNOOP_ICLASS                                                  0x0392
+#define CMD_SNIFF_ICLASS                                                  0x0392
 #define CMD_SIMULATE_TAG_ICLASS                                           0x0393
 #define CMD_READER_ICLASS                                                 0x0394
 #define CMD_READER_ICLASS_REPLAY                                          0x0395
@@ -204,7 +204,7 @@ typedef struct {
 
 // For ISO1092 / FeliCa
 #define CMD_FELICA_SIMULATE_TAG                                           0x03A0
-#define CMD_FELICA_SNOOP                                                  0x03A1
+#define CMD_FELICA_SNIFF                                                  0x03A1
 #define CMD_FELICA_COMMAND                                                0x03A2
 //temp
 #define CMD_FELICA_LITE_DUMP                                              0x03AA

From 1d632583889468ae1d1dec14710024fef8ccae46 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 12 Mar 2019 14:41:23 +0100
Subject: [PATCH 0746/1938] add: 'hf 14b raw' - added -t timeout option. see
 https://github.com/RfidResearchGroup/proxmark3/issues/125

---
 armsrc/iso14443b.c |  4 ++++
 client/cmdhf14b.c  | 28 ++++++++++++++++++++++++----
 include/mifare.h   |  3 ++-
 3 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/armsrc/iso14443b.c b/armsrc/iso14443b.c
index 9586ee0ab..4d5b3330c 100644
--- a/armsrc/iso14443b.c
+++ b/armsrc/iso14443b.c
@@ -1570,6 +1570,7 @@ void iso14b_set_trigger(bool enable) {
 void SendRawCommand14443B_Ex(UsbCommand *c) {
     iso14b_command_t param = c->arg[0];
     size_t len = c->arg[1] & 0xffff;
+    uint32_t timeout = c->arg[2];
     uint8_t *cmd = c->d.asBytes;
     uint8_t status = 0;
     uint32_t sendlen = sizeof(iso14b_card_select_t);
@@ -1585,6 +1586,9 @@ void SendRawCommand14443B_Ex(UsbCommand *c) {
         iso14443b_setup();
         clear_trace();
     }
+    
+    if ((param & ISO14B_SET_TIMEOUT))
+        iso14b_set_timeout(timeout);
 
     set_tracing(true);
 
diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c
index 39b6c4937..4be9a53b1 100644
--- a/client/cmdhf14b.c
+++ b/client/cmdhf14b.c
@@ -33,7 +33,7 @@ int usage_hf_14b_reader(void) {
     return 0;
 }
 int usage_hf_14b_raw(void) {
-    PrintAndLogEx(NORMAL, "Usage: hf 14b raw [-h] [-r] [-c] [-p] [-s || -ss] <0A 0B 0C ... hex>");
+    PrintAndLogEx(NORMAL, "Usage: hf 14b raw [-h] [-r] [-c] [-p] [-s / -ss] [-t] <0A 0B 0C ... hex>");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       -h    this help");
     PrintAndLogEx(NORMAL, "       -r    do not read response");
@@ -41,6 +41,7 @@ int usage_hf_14b_raw(void) {
     PrintAndLogEx(NORMAL, "       -p    leave the field on after receive");
     PrintAndLogEx(NORMAL, "       -s    active signal field ON with select");
     PrintAndLogEx(NORMAL, "       -ss   active signal field ON with select for SRx ST Microelectronics tags");
+    PrintAndLogEx(NORMAL, "       -t    timeout in ms");
     PrintAndLogEx(NORMAL, "Example:");
     PrintAndLogEx(NORMAL, "       hf 14b raw -s -c -p 0200a40400");
     return 0;
@@ -152,13 +153,14 @@ int CmdHF14BSniff(const char *Cmd) {
 }
 
 int CmdHF14BCmdRaw(const char *Cmd) {
-    bool reply = true, power = false, select = false;
+    bool reply = true, power = false, select = false, timeout = false;
     char buf[5] = "";
     int i = 0;
     uint8_t data[USB_CMD_DATA_SIZE] = {0x00};
     uint16_t datalen = 0;
     uint32_t flags = ISO14B_CONNECT;
     uint32_t temp = 0;
+    uint32_t time_wait = 0;
 
     if (strlen(Cmd) < 3) return usage_hf_14b_raw();
 
@@ -189,6 +191,14 @@ int CmdHF14BCmdRaw(const char *Cmd) {
                         flags |= ISO14B_SELECT_STD;
                     }
                     break;
+                case 't':
+                    timeout = true;
+                    sscanf(Cmd + i + 2, "%d", &temp);
+                    timeout = temp;
+                    i += 3;
+                    while (Cmd[i] != ' ' && Cmd[i] != '\0') { i++; }
+                    i -= 2;
+                    break;                    
                 default:
                     return usage_hf_14b_raw();
             }
@@ -213,8 +223,18 @@ int CmdHF14BCmdRaw(const char *Cmd) {
         PrintAndLogEx(WARNING, "unknown parameter '%c'\n", param_getchar(Cmd, i));
         return 0;
     }
+    
+    if (timeout) {
+#define MAX_TIMEOUT 40542464 // = (2^32-1) * (8*16) / 13560000Hz * 1000ms/s
+        flags |= ISO14B_SET_TIMEOUT;
+        if (timeout > MAX_TIMEOUT) {
+            timeout = MAX_TIMEOUT;
+            PrintAndLogEx(NORMAL, "Set timeout to 40542 seconds (11.26 hours). The max we can wait for response");
+        }
+        time_wait = 13560000 / 1000 / (8 * 16) * timeout; // timeout in ETUs (time to transfer 1 bit, approx. 9.4 us)
+    }
 
-    if (!power)
+    if (power == 0)
         flags |= ISO14B_DISCONNECT;
 
     if (datalen > 0)
@@ -223,7 +243,7 @@ int CmdHF14BCmdRaw(const char *Cmd) {
     // Max buffer is USB_CMD_DATA_SIZE
     datalen = (datalen > USB_CMD_DATA_SIZE) ? USB_CMD_DATA_SIZE : datalen;
 
-    UsbCommand c = {CMD_ISO_14443B_COMMAND, {flags, datalen, 0}};
+    UsbCommand c = {CMD_ISO_14443B_COMMAND, {flags, datalen, time_wait}};
     memcpy(c.d.asBytes, data, datalen);
     clearCommandBuffer();
     SendCommand(&c);
diff --git a/include/mifare.h b/include/mifare.h
index 104d5cf09..ae5500986 100644
--- a/include/mifare.h
+++ b/include/mifare.h
@@ -71,7 +71,8 @@ typedef enum ISO14B_COMMAND {
     ISO14B_REQUEST_TRIGGER = (1 << 4),
     ISO14B_APPEND_CRC = (1 << 5),
     ISO14B_SELECT_STD = (1 << 6),
-    ISO14B_SELECT_SR = (1 << 7)
+    ISO14B_SELECT_SR = (1 << 7),
+    ISO14B_SET_TIMEOUT = (1 << 8),
 } iso14b_command_t;
 
 typedef enum ISO15_COMMAND {

From 33f9af961980206fa07ad13cd795284479f54903 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 12 Mar 2019 20:50:44 +0100
Subject: [PATCH 0747/1938] chg 'data AutoCorrelate' - adjust the manual limit
 to 4%

---
 client/cmddata.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/client/cmddata.c b/client/cmddata.c
index 117a1a495..0df6268dd 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -770,10 +770,11 @@ int AutoCorrelate(const int *in, int *out, size_t len, int window, bool SaveGrph
     }
 
     int foo = ABS(hi - hi_1);
-    int bar = (int)((int)((hi + hi_1) / 2) * 0.03);
+    int bar = (int)((int)((hi + hi_1) / 2) * 0.04);
+   
     if (verbose && foo < bar) {
         distance = idx_1 - idx;
-        PrintAndLogEx(SUCCESS, "possible 3% visible correlation %4d samples", distance);
+        PrintAndLogEx(SUCCESS, "possible 4% visible correlation %4d samples", distance);
     } else if (verbose && (correlation > 1)) {
         PrintAndLogEx(SUCCESS, "possible correlation %4d samples", correlation);
     } else {

From cdf0a56fadfb6d5efe8cb7288383c439dfad823c Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 12 Mar 2019 19:16:23 +0100
Subject: [PATCH 0748/1938] iso15693: check memcpy and fix
 BuildInventoryResponse

BuildInventoryResponse was copying 5 bytes instead of 12 bytes in the cmd buffer
---
 armsrc/iso15693.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/armsrc/iso15693.c b/armsrc/iso15693.c
index 9959f1ef0..6e6118aae 100644
--- a/armsrc/iso15693.c
+++ b/armsrc/iso15693.c
@@ -621,8 +621,8 @@ void Iso15693InitReader(void) {
 
 // Encode (into the ToSend buffers) an identify request, which is the first
 // thing that you must send to a tag to get a response.
+// It expects "out" to be at least CMD_ID_RESP large
 static void BuildIdentifyRequest(uint8_t *out) {
-
     uint8_t cmd[CMD_ID_RESP] = {0, ISO15_CMD_INVENTORY, 0, 0, 0};
     // flags
     cmd[0] = ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | ISO15_REQ_INVENTORY | ISO15_REQINV_SLOT1;
@@ -665,6 +665,7 @@ static void BuildReadBlockRequest(uint8_t **out, uint8_t *uid, uint8_t blockNumb
 */
 
 // Now the VICC>VCD responses when we are simulating a tag
+// It expects "out" to be at least CMD_INV_RESP large
 static void BuildInventoryResponse(uint8_t *out, uint8_t *uid) {
 
     uint8_t cmd[CMD_INV_RESP] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
@@ -686,7 +687,7 @@ static void BuildInventoryResponse(uint8_t *out, uint8_t *uid) {
     // CRC
     AddCrc(cmd, 10);
     CodeIso15693AsReader(cmd, CMD_INV_RESP);
-    memcpy(out, cmd, CMD_ID_RESP);
+    memcpy(out, cmd, CMD_INV_RESP);
 }
 
 // Universal Method for sending to and recv bytes from a tag

From 049f41a22f817290dc1153990387e61b00e21ce6 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 12 Mar 2019 19:18:16 +0100
Subject: [PATCH 0749/1938] iso15693: fix strncat usage (one must specify
 available room, not total dest buffer size)

---
 armsrc/iso15693.c | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/armsrc/iso15693.c b/armsrc/iso15693.c
index 6e6118aae..12e9cc815 100644
--- a/armsrc/iso15693.c
+++ b/armsrc/iso15693.c
@@ -740,50 +740,50 @@ void DbdecodeIso15693Answer(int len, uint8_t *d) {
 
     if (len > 3) {
         if (d[0] & (1 << 3))
-            strncat(status, "ProtExt ", DBD15STATLEN);
+            strncat(status, "ProtExt ", DBD15STATLEN - strlen(status));
         if (d[0] & 1) {
             // error
-            strncat(status, "Error ", DBD15STATLEN);
+            strncat(status, "Error ", DBD15STATLEN - strlen(status));
             switch (d[1]) {
                 case 0x01:
-                    strncat(status, "01: not supported", DBD15STATLEN);
+                    strncat(status, "01: not supported", DBD15STATLEN - strlen(status));
                     break;
                 case 0x02:
-                    strncat(status, "02: not recognized", DBD15STATLEN);
+                    strncat(status, "02: not recognized", DBD15STATLEN - strlen(status));
                     break;
                 case 0x03:
-                    strncat(status, "03: opt not supported", DBD15STATLEN);
+                    strncat(status, "03: opt not supported", DBD15STATLEN - strlen(status));
                     break;
                 case 0x0f:
-                    strncat(status, "0F: no info", DBD15STATLEN);
+                    strncat(status, "0F: no info", DBD15STATLEN - strlen(status));
                     break;
                 case 0x10:
-                    strncat(status, "10: dont exist", DBD15STATLEN);
+                    strncat(status, "10: dont exist", DBD15STATLEN - strlen(status));
                     break;
                 case 0x11:
-                    strncat(status, "11: lock again", DBD15STATLEN);
+                    strncat(status, "11: lock again", DBD15STATLEN - strlen(status));
                     break;
                 case 0x12:
-                    strncat(status, "12: locked", DBD15STATLEN);
+                    strncat(status, "12: locked", DBD15STATLEN - strlen(status));
                     break;
                 case 0x13:
-                    strncat(status, "13: program error", DBD15STATLEN);
+                    strncat(status, "13: program error", DBD15STATLEN - strlen(status));
                     break;
                 case 0x14:
-                    strncat(status, "14: lock error", DBD15STATLEN);
+                    strncat(status, "14: lock error", DBD15STATLEN - strlen(status));
                     break;
                 default:
-                    strncat(status, "unknown error", DBD15STATLEN);
+                    strncat(status, "unknown error", DBD15STATLEN - strlen(status));
             }
-            strncat(status, " ", DBD15STATLEN);
+            strncat(status, " ", DBD15STATLEN - strlen(status));
         } else {
-            strncat(status, "No error ", DBD15STATLEN);
+            strncat(status, "No error ", DBD15STATLEN - strlen(status));
         }
 
         if (CheckCrc(d, len))
-            strncat(status, "[+] crc OK", DBD15STATLEN);
+            strncat(status, "[+] crc OK", DBD15STATLEN - strlen(status));
         else
-            strncat(status, "[!] crc fail", DBD15STATLEN);
+            strncat(status, "[!] crc fail", DBD15STATLEN - strlen(status));
 
         if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("%s", status);
     }

From c147b434a2a0daf16781acae694eb6957a23ea3b Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 12 Mar 2019 19:31:25 +0100
Subject: [PATCH 0750/1938] iso15693tools: fix buffer overflow

---
 common/iso15693tools.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/common/iso15693tools.c b/common/iso15693tools.c
index c8d413e76..795d1be60 100644
--- a/common/iso15693tools.c
+++ b/common/iso15693tools.c
@@ -14,9 +14,10 @@
 // return: ptr to string
 char *Iso15693sprintUID(char *target, uint8_t *uid) {
 
-    static char tempbuf[2 * 8 + 1] = {0};
+    static char tempbuf[3 * 8 + 1] = {0};
     if (target == NULL)
         target = tempbuf;
+
     sprintf(target, "%02X %02X %02X %02X %02X %02X %02X %02X",
             uid[7], uid[6], uid[5], uid[4],
             uid[3], uid[2], uid[1], uid[0]

From 98ff923d615f2bb27b690b3889099f1f3a689be7 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 12 Mar 2019 22:04:23 +0100
Subject: [PATCH 0751/1938] fix more strncat usage (one must specify available
 room, not total dest buffer size)

---
 client/cmdhf15.c       |  2 +-
 client/fpga_compress.c | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index f209f361d..70058c04d 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -796,7 +796,7 @@ int CmdHF15Restore(const char *Cmd) {
                     case '2':
                     case 'o':
                         strncpy(newCmdPrefix, " ", sizeof(newCmdPrefix) - 1);
-                        strncat(newCmdPrefix, param, sizeof(newCmdPrefix) - 1);
+                        strncat(newCmdPrefix, param, sizeof(newCmdPrefix) - strlen(newCmdPrefix) - 1);
                         break;
                     default:
                         PrintAndLogEx(WARNING, "Unknown parameter '%s'", param);
diff --git a/client/fpga_compress.c b/client/fpga_compress.c
index 36e5872e0..7c5a4a883 100644
--- a/client/fpga_compress.c
+++ b/client/fpga_compress.c
@@ -322,42 +322,42 @@ static int FpgaGatherVersion(FILE *infile, char *infile_name, char *dst, int len
     }
 
     if (!memcmp("fpga_lf", basename(infile_name), 7))
-        strncat(dst, "LF", len - 1);
+        strncat(dst, "LF", len - strlen(dst) - 1);
     else if (!memcmp("fpga_hf", basename(infile_name), 7))
-        strncat(dst, "HF", len - 1);
+        strncat(dst, "HF", len - strlen(dst) - 1);
 
-    strncat(dst, " image built", len - 1);
+    strncat(dst, " image built", len - strlen(dst) - 1);
     if (bitparse_find_section(infile, 'b', &fpga_info_len)) {
-        strncat(dst, " for ", len - 1);
+        strncat(dst, " for ", len - strlen(dst) - 1);
         for (uint16_t i = 0; i < fpga_info_len; i++) {
             char c = (char)fgetc(infile);
             if (i < sizeof(tempstr)) {
                 tempstr[i] = c;
             }
         }
-        strncat(dst, tempstr, len - 1);
+        strncat(dst, tempstr, len - strlen(dst) - 1);
     }
 
     if (bitparse_find_section(infile, 'c', &fpga_info_len)) {
-        strncat(dst, " on ", len - 1);
+        strncat(dst, " on ", len - strlen(dst) - 1);
         for (uint16_t i = 0; i < fpga_info_len; i++) {
             char c = (char)fgetc(infile);
             if (i < sizeof(tempstr)) {
                 tempstr[i] = c;
             }
         }
-        strncat(dst, tempstr, len - 1);
+        strncat(dst, tempstr, len - strlen(dst) - 1);
     }
 
     if (bitparse_find_section(infile, 'd', &fpga_info_len)) {
-        strncat(dst, " at ", len - 1);
+        strncat(dst, " at ", len - strlen(dst) - 1);
         for (uint16_t i = 0; i < fpga_info_len; i++) {
             char c = (char)fgetc(infile);
             if (i < sizeof(tempstr)) {
                 tempstr[i] = c;
             }
         }
-        strncat(dst, tempstr, len - 1);
+        strncat(dst, tempstr, len - strlen(dst) - 1);
     }
     return 0;
 }

From d50de828a11ca1a6ec3ca13c873202fd7a3fbbd3 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 12 Mar 2019 22:50:29 +0100
Subject: [PATCH 0752/1938] flash write: check first page write

---
 armsrc/appmain.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index ba2aa75e3..806505f06 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1322,10 +1322,12 @@ void UsbPacketReceived(uint8_t *packet, int len) {
                     // first mem page
                     res = Flash_WriteDataCont(startidx, data, first_len);
 
+                    isok = (res == first_len) ? 1 : 0;
+
                     // second mem page
                     res = Flash_WriteDataCont(startidx + first_len, data + first_len, len - first_len);
 
-                    isok = (res == (len - first_len)) ? 1 : 0;
+                    isok &= (res == (len - first_len)) ? 1 : 0;
 
                 } else {
                     res = Flash_WriteDataCont(startidx, data, len);

From 2c41a61ee356890f7a9837aee72a0d117386ae3b Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 12 Mar 2019 22:52:15 +0100
Subject: [PATCH 0753/1938] remove always true cond

---
 armsrc/appmain.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 806505f06..293d9e1c8 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -786,7 +786,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
         case CMD_WR_HITAG_S: //writer for Hitag tags args=data to write,page and key or challenge
             if ((hitag_function)c->arg[0] < 10) {
                 WritePageHitagS((hitag_function)c->arg[0], (hitag_data *)c->d.asBytes, c->arg[2]);
-            } else if ((hitag_function)c->arg[0] >= 10) {
+            } else {
                 WriterHitag((hitag_function)c->arg[0], (hitag_data *)c->d.asBytes, c->arg[2]);
             }
             break;

From fb07fd92f34e09e0e3815bc42c8549fb7436c4a3 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 12 Mar 2019 23:14:19 +0100
Subject: [PATCH 0754/1938] epa: check EPA_PACE_MSE_Set_AT return value

---
 armsrc/epa.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/armsrc/epa.c b/armsrc/epa.c
index 95de11550..521bb3f69 100644
--- a/armsrc/epa.c
+++ b/armsrc/epa.c
@@ -305,6 +305,11 @@ void EPA_PACE_Collect_Nonce(UsbCommand *c) {
     // initiate the PACE protocol
     // use the CAN for the password since that doesn't change
     func_return = EPA_PACE_MSE_Set_AT(pace_version_info, 2);
+    // check if the command succeeded
+    if (func_return != 0) {
+        EPA_PACE_Collect_Nonce_Abort(4, func_return);
+        return;
+    }
 
     // now get the nonce
     uint8_t nonce[256] = {0};
@@ -312,7 +317,7 @@ void EPA_PACE_Collect_Nonce(UsbCommand *c) {
     func_return = EPA_PACE_Get_Nonce(requested_size, nonce);
     // check if the command succeeded
     if (func_return < 0) {
-        EPA_PACE_Collect_Nonce_Abort(4, func_return);
+        EPA_PACE_Collect_Nonce_Abort(5, func_return);
         return;
     }
 

From 380784817113fa52d00e13adf9ed06dc6a9b8da5 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 12 Mar 2019 23:37:53 +0100
Subject: [PATCH 0755/1938] fix DetectNACKbug: sync_cycles is signed

---
 armsrc/iso14443a.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index a22a79390..023eb02f9 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -2747,7 +2747,7 @@ void DetectNACKbug() {
     bool received_nack;
 
     // Mifare Classic's random generator repeats every 2^16 cycles (and so do the nonces).
-    uint32_t sync_cycles = PRNG_SEQUENCE_LENGTH;
+    int32_t sync_cycles = PRNG_SEQUENCE_LENGTH;
 
     BigBuf_free();
     BigBuf_Clear_ext(false);

From ebeab59bc44c7dac5d77e945645452fbe6ffdd47 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 12 Mar 2019 23:50:43 +0100
Subject: [PATCH 0756/1938] lfops: remove always true conds

---
 armsrc/lfops.c | 37 +++++++++++++++----------------------
 1 file changed, 15 insertions(+), 22 deletions(-)

diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index ac9f08ed3..bfe0f955f 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -1066,12 +1066,8 @@ void CmdHIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol)
                     }
                 } else { //if bit 38 is not set then 37 bit format is used
                     bitlen = 37;
-                    fc = 0;
-                    cardnum = 0;
-                    if (bitlen == 37) {
-                        cardnum = (lo >> 1) & 0x7FFFF;
-                        fc = ((hi & 0xF) << 12) | (lo >> 20);
-                    }
+                    cardnum = (lo >> 1) & 0x7FFFF;
+                    fc = ((hi & 0xF) << 12) | (lo >> 20);
                 }
                 Dbprintf("TAG ID: %x%08x (%d) - Format Len: %dbit - FC: %d - Card: %d",
                          hi,
@@ -1591,26 +1587,23 @@ void T55xx_ChkPwds() {
     uint32_t candidate = 0;
 
 #ifdef WITH_FLASH
-    bool use_flashmem = true;
-    if (use_flashmem) {
-        BigBuf_Clear_EM();
-        uint16_t isok = 0;
-        uint8_t counter[2] = {0x00, 0x00};
-        isok = Flash_ReadData(DEFAULT_T55XX_KEYS_OFFSET, counter, sizeof(counter));
-        if (isok != sizeof(counter))
-            goto OUT;
+    BigBuf_Clear_EM();
+    uint16_t isok = 0;
+    uint8_t counter[2] = {0x00, 0x00};
+    isok = Flash_ReadData(DEFAULT_T55XX_KEYS_OFFSET, counter, sizeof(counter));
+    if (isok != sizeof(counter))
+        goto OUT;
 
-        pwdCount = counter[1] << 8 | counter[0];
+    pwdCount = counter[1] << 8 | counter[0];
 
-        if (pwdCount == 0 && pwdCount == 0xFFFF)
-            goto OUT;
+    if (pwdCount == 0 && pwdCount == 0xFFFF)
+        goto OUT;
 
-        isok = Flash_ReadData(DEFAULT_T55XX_KEYS_OFFSET + 2, pwds, pwdCount * 4);
-        if (isok != pwdCount * 4)
-            goto OUT;
+    isok = Flash_ReadData(DEFAULT_T55XX_KEYS_OFFSET + 2, pwds, pwdCount * 4);
+    if (isok != pwdCount * 4)
+        goto OUT;
 
-        Dbprintf("[=] Password dictionary count %d ", pwdCount);
-    }
+    Dbprintf("[=] Password dictionary count %d ", pwdCount);
 #endif
 
     uint32_t pwd = 0, curr = 0, prev = 0;

From 61905d2b19fea093216b27317f04b98333efdc79 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 12 Mar 2019 23:51:30 +0100
Subject: [PATCH 0757/1938] lfops: add ledcontrol in API

---
 armsrc/appmain.c |  6 +++---
 armsrc/apps.h    |  6 +++---
 armsrc/lfops.c   | 12 ++++++------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 293d9e1c8..f264e9f65 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -664,13 +664,13 @@ void UsbPacketReceived(uint8_t *packet, int len) {
             CmdHIDsimTAG(c->arg[0], c->arg[1], 1);
             break;
         case CMD_FSK_SIM_TAG:
-            CmdFSKsimTAG(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+            CmdFSKsimTAG(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes, 1);
             break;
         case CMD_ASK_SIM_TAG:
-            CmdASKsimTag(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+            CmdASKsimTag(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes, 1);
             break;
         case CMD_PSK_SIM_TAG:
-            CmdPSKsimTag(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+            CmdPSKsimTag(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes, 1);
             break;
         case CMD_HID_CLONE_TAG:
             CopyHIDtoT55x7(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes[0]);
diff --git a/armsrc/apps.h b/armsrc/apps.h
index ebc9d302c..31071a8ad 100644
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -85,9 +85,9 @@ void SimulateTagLowFrequency(int period, int gap, int ledcontrol);
 void SimulateTagLowFrequencyBidir(int divisor, int max_bitlen);
 void CmdHIDsimTAGEx(uint32_t hi, uint32_t lo, int ledcontrol, int numcycles);
 void CmdHIDsimTAG(uint32_t hi, uint32_t lo, int ledcontrol);
-void CmdFSKsimTAG(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream);
-void CmdASKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream);
-void CmdPSKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream);
+void CmdFSKsimTAG(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream, int ledcontrol);
+void CmdASKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream, int ledcontrol);
+void CmdPSKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream, int ledcontrol);
 void CmdHIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol);
 void CmdAWIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol); // Realtime demodulation mode for AWID26
 void CmdEM410xdemod(int findone, uint32_t *high, uint64_t *low, int ledcontrol);
diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index bfe0f955f..158367dc6 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -829,7 +829,7 @@ void CmdHIDsimTAG(uint32_t hi, uint32_t lo, int ledcontrol) {
 // prepare a waveform pattern in the buffer based on the ID given then
 // simulate a FSK tag until the button is pressed
 // arg1 contains fcHigh and fcLow, arg2 contains STT marker and clock
-void CmdFSKsimTAG(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *bits) {
+void CmdFSKsimTAG(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *bits, int ledcontrol) {
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
 
     // free eventually allocated BigBuf memory
@@ -838,7 +838,7 @@ void CmdFSKsimTAG(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *bits) {
     clear_trace();
     set_tracing(false);
 
-    int ledcontrol = 1, n = 0, i = 0;
+    int n = 0, i = 0;
     uint8_t fcHigh = arg1 >> 8;
     uint8_t fcLow = arg1 & 0xFF;
     uint16_t modCnt = 0;
@@ -906,11 +906,11 @@ static void stAskSimBit(int *n, uint8_t clock) {
 }
 
 // args clock, ask/man or askraw, invert, transmission separator
-void CmdASKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream) {
+void CmdASKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream, int ledcontrol) {
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
     set_tracing(false);
 
-    int ledcontrol = 1, n = 0, i = 0;
+    int n = 0, i = 0;
     uint8_t clk = (arg1 >> 8) & 0xFF;
     uint8_t encoding = arg1 & 0xFF;
     uint8_t separator = arg2 & 1;
@@ -973,11 +973,11 @@ static void pskSimBit(uint8_t waveLen, int *n, uint8_t clk, uint8_t *curPhase, b
 }
 
 // args clock, carrier, invert,
-void CmdPSKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream) {
+void CmdPSKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream, int ledcontrol) {
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
     set_tracing(false);
 
-    int ledcontrol = 1, n = 0, i = 0;
+    int n = 0, i = 0;
     uint8_t clk = arg1 >> 8;
     uint8_t carrier = arg1 & 0xFF;
     uint8_t invert = arg2 & 0xFF;

From 4aeff95259703ec747ff2b0067c0f7a73852d8e9 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 12 Mar 2019 23:53:39 +0100
Subject: [PATCH 0758/1938] T55xx_ChkPwds: fix always false cond

---
 armsrc/lfops.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index 158367dc6..b5a905c98 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -1596,7 +1596,7 @@ void T55xx_ChkPwds() {
 
     pwdCount = counter[1] << 8 | counter[0];
 
-    if (pwdCount == 0 && pwdCount == 0xFFFF)
+    if (pwdCount == 0 || pwdCount == 0xFFFF)
         goto OUT;
 
     isok = Flash_ReadData(DEFAULT_T55XX_KEYS_OFFSET + 2, pwds, pwdCount * 4);

From d9308d912da2997b944c80b3dd01b80594c9cce1 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 12 Mar 2019 23:59:43 +0100
Subject: [PATCH 0759/1938] fix: shifting signed 32-bit value by 31 bits is
 undefined behaviour

---
 armsrc/lfops.c         | 4 ++--
 client/cmdlft55xx.c    | 6 +++---
 client/cmdlfti.c       | 2 +-
 include/at91sam7s512.h | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index b5a905c98..752158929 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -317,7 +317,7 @@ void ReadTItag(void) {
                 // expected for either the low or high frequency
                 if ((samples > (sampleslo - threshold)) && (samples < (sampleslo + threshold))) {
                     // low frequency represents a 1
-                    shift3 |= (1 << 31);
+                    shift3 |= (1u << 31);
                 } else if ((samples > (sampleshi - threshold)) && (samples < (sampleshi + threshold))) {
                     // high frequency represents a 0
                 } else {
@@ -481,7 +481,7 @@ void AcquireTiType(void) {
     // unpack buffer
     for (i = TIBUFLEN - 1; i >= 0; i--) {
         for (j = 0; j < 32; j++) {
-            if (buf[i] & (1 << j)) {
+            if (buf[i] & (1u << j)) {
                 dest[--n] = 1;
             } else {
                 dest[--n] = -1;
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 91f4a456f..41512c6b9 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1882,7 +1882,7 @@ int CmdT55xxRecoverPW(const char *Cmd) {
 
     // first try fliping each bit in the expected password
     while (bit < 32) {
-        curr_password = orig_password ^ (1 << bit);
+        curr_password = orig_password ^ (1u << bit);
         found = tryOnePassword(curr_password);
         if (found == -1) return 0;
         bit++;
@@ -1897,7 +1897,7 @@ int CmdT55xxRecoverPW(const char *Cmd) {
     // from low bit to high bit
     bit = 0;
     while (bit < 32) {
-        mask += (1 << bit);
+        mask += (1u << bit);
         curr_password = orig_password & mask;
         // if updated mask didn't change the password, don't try it again
         if (prev_password == curr_password) {
@@ -1916,7 +1916,7 @@ int CmdT55xxRecoverPW(const char *Cmd) {
     bit = 0;
     mask = 0xffffffff;
     while (bit < 32) {
-        mask -= (1 << bit);
+        mask -= (1u << bit);
         curr_password = orig_password & mask;
         // if updated mask didn't change the password, don't try it again
         if (prev_password == curr_password) {
diff --git a/client/cmdlfti.c b/client/cmdlfti.c
index 6abb9b5de..5d3c2e399 100644
--- a/client/cmdlfti.c
+++ b/client/cmdlfti.c
@@ -191,7 +191,7 @@ int CmdTIDemod(const char *Cmd) {
             bits[i] = '1';
             maxPos += highLen;
             // bitstream arrives lsb first so shift right
-            shift3 |= (1 << 31);
+            shift3 |= (1u << 31);
         } else {
             bits[i] = '.';
             maxPos += lowLen;
diff --git a/include/at91sam7s512.h b/include/at91sam7s512.h
index f8fa2e8d4..f9f5f69b1 100644
--- a/include/at91sam7s512.h
+++ b/include/at91sam7s512.h
@@ -375,7 +375,7 @@ typedef struct _AT91S_DBGU {
 #define AT91C_US_TXBUFE       (0x1 << 11) // (DBGU) TXBUFE Interrupt
 #define AT91C_US_RXBUFF       (0x1 << 12) // (DBGU) RXBUFF Interrupt
 #define AT91C_US_COMM_TX      (0x1 << 30) // (DBGU) COMM_TX Interrupt
-#define AT91C_US_COMM_RX      (0x1 << 31) // (DBGU) COMM_RX Interrupt
+#define AT91C_US_COMM_RX      (0x1u << 31) // (DBGU) COMM_RX Interrupt
 // -------- DBGU_IDR : (DBGU Offset: 0xc) Debug Unit Interrupt Disable Register --------
 // -------- DBGU_IMR : (DBGU Offset: 0x10) Debug Unit Interrupt Mask Register --------
 // -------- DBGU_CSR : (DBGU Offset: 0x14) Debug Unit Channel Status Register --------

From 091ddb26f054d86854991f85da28cc1df3c61fba Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 13 Mar 2019 00:27:03 +0100
Subject: [PATCH 0760/1938] lfops fcAll: avoid division by zero

---
 armsrc/lfops.c | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index 752158929..daa2e5134 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -730,8 +730,6 @@ static void fcAll(uint8_t fc, int *n, uint8_t clock, uint16_t *modCnt) {
     uint8_t halfFC = fc >> 1;
     uint8_t wavesPerClock = clock / fc;
     uint8_t mod = clock % fc;    //modifier
-    uint8_t modAdj = fc / mod;   //how often to apply modifier
-    bool modAdjOk = !(fc % mod); //if (fc % mod==0) modAdjOk = true;
 
     // loop through clock - step field clock
     for (uint8_t idx = 0; idx < wavesPerClock; idx++) {
@@ -740,19 +738,23 @@ static void fcAll(uint8_t fc, int *n, uint8_t clock, uint16_t *modCnt) {
         memset(dest + (*n) + (fc - halfFC), 1, halfFC);
         *n += fc;
     }
-    if (mod > 0)(*modCnt)++;
+    if (mod > 0) {
+        uint8_t modAdj = fc / mod;   //how often to apply modifier
+        bool modAdjOk = !(fc % mod); //if (fc % mod==0) modAdjOk = true;
+        (*modCnt)++;
 
-    if ((mod > 0) && modAdjOk) { //fsk2
-        if ((*modCnt % modAdj) == 0) { //if 4th 8 length wave in a rf/50 add extra 8 length wave
-            memset(dest + (*n), 0, fc - halfFC);
-            memset(dest + (*n) + (fc - halfFC), 1, halfFC);
-            *n += fc;
+        if (modAdjOk) { //fsk2
+            if ((*modCnt % modAdj) == 0) { //if 4th 8 length wave in a rf/50 add extra 8 length wave
+                memset(dest + (*n), 0, fc - halfFC);
+                memset(dest + (*n) + (fc - halfFC), 1, halfFC);
+                *n += fc;
+            }
+        }
+        if (!modAdjOk) { //fsk1
+            memset(dest + (*n), 0, mod - (mod >> 1));
+            memset(dest + (*n) + (mod - (mod >> 1)), 1, mod >> 1);
+            *n += mod;
         }
-    }
-    if (mod > 0 && !modAdjOk) { //fsk1
-        memset(dest + (*n), 0, mod - (mod >> 1));
-        memset(dest + (*n) + (mod - (mod >> 1)), 1, mod >> 1);
-        *n += mod;
     }
 }
 

From 92d94390ac86015b23825072789fbca16e02f498 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 13 Mar 2019 00:30:11 +0100
Subject: [PATCH 0761/1938] MifareChkKeys_fast: fix always false cond

---
 armsrc/mifarecmd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index cca5d137a..9e771679b 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -1247,7 +1247,7 @@ void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *da
 
         keyCount = size[1] << 8 | size[0];
 
-        if (keyCount == 0 && keyCount == 0xFFFF)
+        if (keyCount == 0 || keyCount == 0xFFFF)
             goto OUT;
 
         datain = BigBuf_malloc(keyCount * 6);

From f15a980bd91513a4ac68af4d19018416f2bb9f7a Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 13 Mar 2019 03:02:52 +0100
Subject: [PATCH 0762/1938] text

---
 CHANGELOG.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 34bf817bd..0d847f476 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,23 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [unreleased][unreleased]
+ - Fix fsk sim operations on deviceside - avoid division by zero (@doegox)
+ - Fix 'hf mf fchk' - condition always false (@doegox)
+ - Fix 'lf t55xx recoverpw' - shift as u32 (@doegox)
+ - Fix 'lf ti demod' - shift as u32 (@doegox)
+ - Fix 'lf ti read' - shift as u32 (@doegox)
+ - Fix 'lf t55xx chk' - condition always false (@doegox) 
+ - Change 'lf sim' - ledcontrol refactoring (@doegox)
+ - Fix 'hf mf nack' - signedness bug (@doegox)
+ - Fix 'hf epa cnonce' - check return value (@doegox)
+ - Fix 'lf hitag write' - condition always true (@doegox)
+ - Fix 'mem write' - added extra check (@doegox)
+ - Fix 'iso15693' - bad string cpy (@doegox)
+ - Fix 'make style' - EOF LF support (@doegox)
+ - Add 'hf 14b raw' - added -t for timeout  (@iceman)
+ - Rename 'lf hitag snoop' - renamed to 'lf hitag sniff' (@iceman)
+ - Rename 'lf snoop' - renamed to 'lf sniff' (@iceman)
+ - Rename 'hf snoop' - renamed to 'hf sniff' (@iceman)
  - Fix 'hf mfp wrbl' - more blocks available (@merlokk)
  - Add 'make platform' - compile for non-rdv4 devices made simpler (@doegox)
  - Change Makefiles optimizations when recompiling (@doegox)

From 2563fa0472da506ef1efc3232b64f308483106fd Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 13 Mar 2019 09:10:52 +0100
Subject: [PATCH 0763/1938] moved some macro

---
 armsrc/lfops.c |  7 -------
 armsrc/util.h  | 39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index daa2e5134..bf43cf891 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -21,13 +21,6 @@
 #include "common.h"
 #include "flashmem.h" // persistence on mem
 
-#ifndef SHORT_COIL
-# define SHORT_COIL() LOW(GPIO_SSC_DOUT)
-#endif
-#ifndef OPEN_COIL
-# define OPEN_COIL()  HIGH(GPIO_SSC_DOUT)
-#endif
-
 //#define START_GAP 31*8 // was 250 // SPEC:  1*8 to 50*8 - typ 15*8 (15fc)
 //#define WRITE_GAP 8*8 // 17*8 // was 160 // SPEC:  1*8 to 20*8 - typ 10*8 (10fc)
 //#define WRITE_0   15*8 // 18*8 // was 144 // SPEC: 16*8 to 32*8 - typ 24*8 (24fc)
diff --git a/armsrc/util.h b/armsrc/util.h
index 19b104f51..15f93d1f9 100644
--- a/armsrc/util.h
+++ b/armsrc/util.h
@@ -17,7 +17,18 @@
 #include "BigBuf.h"
 #include "ticks.h"
 
+// Basic macros
+#ifndef SHORT_COIL
+#define SHORT_COIL()     LOW(GPIO_SSC_DOUT)
+#endif
+
+#ifndef OPEN_COIL
+#define OPEN_COIL()      HIGH(GPIO_SSC_DOUT)
+#endif
+
+#ifndef BYTEx
 #define BYTEx(x, n) (((x) >> (n * 8)) & 0xff )
+#endif
 
 #define LED_RED 1
 #define LED_ORANGE 2
@@ -43,6 +54,34 @@
 # define NTIME(n) for (int _index = 0; _index < n; _index++)
 #endif
 
+#ifndef REV8
+#define REV8(x) ((((x)>>7)&1)+((((x)>>6)&1)<<1)+((((x)>>5)&1)<<2)+((((x)>>4)&1)<<3)+((((x)>>3)&1)<<4)+((((x)>>2)&1)<<5)+((((x)>>1)&1)<<6)+(((x)&1)<<7))
+#endif
+
+#ifndef REV16
+#define REV16(x)        (REV8(x) + (REV8 (x >> 8) << 8))
+#endif
+
+#ifndef REV32
+#define REV32(x)        (REV16(x) + (REV16(x >> 16) << 16))
+#endif
+
+#ifndef REV64
+#define REV64(x)        (REV32(x) + (REV32(x >> 32) << 32))
+#endif
+
+#ifndef BIT32
+#define BIT32(x,n)      ((((x)[(n)>>5])>>((n)))&1)
+#endif
+
+#ifndef INV32
+#define INV32(x,i,n)    ((x)[(i)>>5]^=((uint32_t)(n))<<((i)&31))
+#endif
+
+#ifndef ROTL64
+#define ROTL64(x, n)    ((((uint64_t)(x))<<((n)&63))+(((uint64_t)(x))>>((0-(n))&63)))
+#endif
+
 size_t nbytes(size_t nbits);
 
 extern uint32_t reflect(uint32_t v, int b); // used in crc.c ...

From c01497b8af536bd8dd6083f6e5bbfb62a345a27e Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 13 Mar 2019 10:16:12 +0100
Subject: [PATCH 0764/1938] FIX: 'lf hitag' - init of TC0 missing (@piwi) CHG:
 'lf hitag' - factoring code (@iceman)

---
 armsrc/Makefile        |   2 +-
 armsrc/hitag2.c        | 379 ++++++++++++++---------------------------
 armsrc/hitag2_crypto.c | 116 +++++++++++++
 armsrc/hitag2_crypto.h |  36 ++++
 4 files changed, 283 insertions(+), 250 deletions(-)
 create mode 100644 armsrc/hitag2_crypto.c
 create mode 100644 armsrc/hitag2_crypto.h

diff --git a/armsrc/Makefile b/armsrc/Makefile
index 7db669cb8..707325d41 100644
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -60,7 +60,7 @@ APP_CFLAGS = $(PLATFORM_DEFS) \
 
 
 SRC_LCD = fonts.c LCD.c
-SRC_LF = lfops.c hitag2.c hitagS.c lfsampling.c pcf7931.c lfdemod.c
+SRC_LF = lfops.c hitag2_crypto.c hitag2.c hitagS.c lfsampling.c pcf7931.c lfdemod.c
 SRC_ISO15693 = iso15693.c iso15693tools.c
 #SRC_ISO14443a = iso14443a.c mifareutil.c mifarecmd.c epa.c mifaresim.c
 SRC_ISO14443a = iso14443a.c mifareutil.c mifarecmd.c epa.c
diff --git a/armsrc/hitag2.c b/armsrc/hitag2.c
index 7ed6c88ca..237f0820c 100644
--- a/armsrc/hitag2.c
+++ b/armsrc/hitag2.c
@@ -3,7 +3,7 @@
 // at your option, any later version. See the LICENSE.txt file for the text of
 // the license.
 //-----------------------------------------------------------------------------
-// Hitag2 emulation (preliminary test version)
+// Hitag2 emulation
 //
 // (c) 2009 Henryk Plötz <henryk@ploetzli.ch>
 //-----------------------------------------------------------------------------
@@ -15,11 +15,13 @@
 //
 // (c) 2012 Roel Verdult
 //-----------------------------------------------------------------------------
+// Piwi, 2019
+// Iceman, 2019
 
+#include "hitag2_crypto.h"
 #include "proxmark3.h"
 #include "apps.h"
 #include "util.h"
-#include "hitag2.h"
 #include "string.h"
 #include "BigBuf.h"
 
@@ -29,20 +31,6 @@ static bool bAuthenticating;
 static bool bPwd;
 static bool bSuccessful;
 
-struct hitag2_tag {
-    uint32_t uid;
-    enum {
-        TAG_STATE_RESET      = 0x01,       // Just powered up, awaiting GetSnr
-        TAG_STATE_ACTIVATING = 0x02,       // In activation phase (password mode), sent UID, awaiting reader password
-        TAG_STATE_ACTIVATED  = 0x03,       // Activation complete, awaiting read/write commands
-        TAG_STATE_WRITING    = 0x04,       // In write command, awaiting sector contents to be written
-    } state;
-    unsigned int active_sector;
-    uint8_t crypto_active;
-    uint64_t cs;
-    uint8_t sectors[12][4];
-};
-
 static struct hitag2_tag tag = {
     .state = TAG_STATE_RESET,
     .sectors = {                         // Password mode:               | Crypto mode:
@@ -81,87 +69,6 @@ static uint8_t key[8];
 static uint8_t writedata[4];
 static uint64_t cipher_state;
 
-/* Following is a modified version of cryptolib.com/ciphers/hitag2/ */
-// Software optimized 48-bit Philips/NXP Mifare Hitag2 PCF7936/46/47/52 stream cipher algorithm by I.C. Wiener 2006-2007.
-// For educational purposes only.
-// No warranties or guarantees of any kind.
-// This code is released into the public domain by its author.
-
-// Basic macros:
-
-#define u8              uint8_t
-#define u32             uint32_t
-#define u64             uint64_t
-#define rev8(x)         ((((x)>>7)&1)+((((x)>>6)&1)<<1)+((((x)>>5)&1)<<2)+((((x)>>4)&1)<<3)+((((x)>>3)&1)<<4)+((((x)>>2)&1)<<5)+((((x)>>1)&1)<<6)+(((x)&1)<<7))
-#define rev16(x)        (rev8 (x)+(rev8 (x>> 8)<< 8))
-#define rev32(x)        (rev16(x)+(rev16(x>>16)<<16))
-#define rev64(x)        (rev32(x)+(rev32(x>>32)<<32))
-#define bit(x,n)        (((x)>>(n))&1)
-#define bit32(x,n)      ((((x)[(n)>>5])>>((n)))&1)
-#define inv32(x,i,n)    ((x)[(i)>>5]^=((u32)(n))<<((i)&31))
-#define rotl64(x, n)    ((((u64)(x))<<((n)&63))+(((u64)(x))>>((0-(n))&63)))
-
-// Single bit Hitag2 functions:
-#define i4(x,a,b,c,d)    ((u32)((((x)>>(a))&1)+(((x)>>(b))&1)*2+(((x)>>(c))&1)*4+(((x)>>(d))&1)*8))
-
-static const u32 ht2_f4a = 0x2C79;     // 0010 1100 0111 1001
-static const u32 ht2_f4b = 0x6671;     // 0110 0110 0111 0001
-static const u32 ht2_f5c = 0x7907287B; // 0111 1001 0000 0111 0010 1000 0111 1011
-
-static u32 _f20(const u64 x) {
-    u32 i5;
-
-    i5 = ((ht2_f4a >> i4(x, 1, 2, 4, 5)) & 1) * 1
-         + ((ht2_f4b >> i4(x, 7, 11, 13, 14)) & 1) * 2
-         + ((ht2_f4b >> i4(x, 16, 20, 22, 25)) & 1) * 4
-         + ((ht2_f4b >> i4(x, 27, 28, 30, 32)) & 1) * 8
-         + ((ht2_f4a >> i4(x, 33, 42, 43, 45)) & 1) * 16;
-
-    return (ht2_f5c >> i5) & 1;
-}
-
-static u64 _hitag2_init(const u64 key, const u32 serial, const u32 IV) {
-    u32 i;
-    u64 x = ((key & 0xFFFF) << 32) + serial;
-
-    for (i = 0; i < 32; i++) {
-        x >>= 1;
-        x += (u64)(_f20(x) ^ (((IV >> i) ^ (key >> (i + 16))) & 1)) << 47;
-    }
-    return x;
-}
-
-static u64 _hitag2_round(u64 *state) {
-    u64 x = *state;
-
-    x = (x >>  1) +
-        ((((x >>  0) ^ (x >>  2) ^ (x >>  3) ^ (x >>  6)
-           ^ (x >>  7) ^ (x >>  8) ^ (x >> 16) ^ (x >> 22)
-           ^ (x >> 23) ^ (x >> 26) ^ (x >> 30) ^ (x >> 41)
-           ^ (x >> 42) ^ (x >> 43) ^ (x >> 46) ^ (x >> 47)) & 1) << 47);
-
-    *state = x;
-    return _f20(x);
-}
-
-// "MIKRON"             =  O  N  M  I  K  R
-// Key                  = 4F 4E 4D 49 4B 52             - Secret 48-bit key
-// Serial               = 49 43 57 69                   - Serial number of the tag, transmitted in clear
-// Random               = 65 6E 45 72                   - Random IV, transmitted in clear
-//~28~DC~80~31  = D7 23 7F CE                   - Authenticator value = inverted first 4 bytes of the keystream
-
-// The code below must print out "D7 23 7F CE 8C D0 37 A9 57 49 C1 E6 48 00 8A B6".
-// The inverse of the first 4 bytes is sent to the tag to authenticate.
-// The rest is encrypted by XORing it with the subsequent keystream.
-
-static u32 _hitag2_byte(u64 *x) {
-    u32 i, c;
-    for (i = 0, c = 0; i < 8; i++) {
-        c += (u32) _hitag2_round(x) << (i ^ 7);
-    }
-    return c;
-}
-
 static int hitag2_reset(void) {
     tag.state = TAG_STATE_RESET;
     tag.crypto_active = 0;
@@ -173,48 +80,13 @@ static int hitag2_init(void) {
     return 0;
 }
 
-static void hitag2_cipher_reset(struct hitag2_tag *tag, const uint8_t *iv) {
-    uint64_t key = ((uint64_t)tag->sectors[2][2]) |
-                   ((uint64_t)tag->sectors[2][3] << 8) |
-                   ((uint64_t)tag->sectors[1][0] << 16) |
-                   ((uint64_t)tag->sectors[1][1] << 24) |
-                   ((uint64_t)tag->sectors[1][2] << 32) |
-                   ((uint64_t)tag->sectors[1][3] << 40);
-    uint32_t uid = ((uint32_t)tag->sectors[0][0]) |
-                   ((uint32_t)tag->sectors[0][1] << 8) |
-                   ((uint32_t)tag->sectors[0][2] << 16) |
-                   ((uint32_t)tag->sectors[0][3] << 24);
-    uint32_t iv_ = (((uint32_t)(iv[0]))) |
-                   (((uint32_t)(iv[1])) << 8) |
-                   (((uint32_t)(iv[2])) << 16) |
-                   (((uint32_t)(iv[3])) << 24);
-    tag->cs = _hitag2_init(rev64(key), rev32(uid), rev32(iv_));
-}
-
-static int hitag2_cipher_authenticate(uint64_t *cs, const uint8_t *authenticator_is) {
-    uint8_t authenticator_should[4];
-    authenticator_should[0] = ~_hitag2_byte(cs);
-    authenticator_should[1] = ~_hitag2_byte(cs);
-    authenticator_should[2] = ~_hitag2_byte(cs);
-    authenticator_should[3] = ~_hitag2_byte(cs);
-    return (memcmp(authenticator_should, authenticator_is, 4) == 0);
-}
-
-static int hitag2_cipher_transcrypt(uint64_t *cs, uint8_t *data, unsigned int bytes, unsigned int bits) {
-    int i;
-    for (i = 0; i < bytes; i++) data[i] ^= _hitag2_byte(cs);
-    for (i = 0; i < bits; i++) data[bytes] ^= _hitag2_round(cs) << (7 - i);
-    return 0;
-}
-
 // Sam7s has several timers, we will use the source TIMER_CLOCK1 (aka AT91C_TC_CLKS_TIMER_DIV1_CLOCK)
 // TIMER_CLOCK1 = MCK/2, MCK is running at 48 MHz, Timer is running at 48/2 = 24 MHz
 // Hitag units (T0) have duration of 8 microseconds (us), which is 1/125000 per second (carrier)
 // T0 = TIMER_CLOCK1 / 125000 = 192
+#ifndef T0
 #define T0               192
-
-#define SHORT_COIL()     LOW(GPIO_SSC_DOUT)
-#define OPEN_COIL()      HIGH(GPIO_SSC_DOUT)
+#endif
 
 #define HITAG_FRAME_LEN  20
 #define HITAG_T_STOP     36 /* T_EOF should be > 36 */
@@ -241,7 +113,6 @@ static int hitag2_cipher_transcrypt(uint64_t *cs, uint8_t *data, unsigned int by
 #define HITAG_T_TAG_CAPTURE_THREE_HALF  41
 #define HITAG_T_TAG_CAPTURE_FOUR_HALF   57
 
-
 static void hitag_send_bit(int bit) {
     LED_A_ON();
     // Reset clock for the next bit
@@ -279,7 +150,6 @@ static void hitag_send_frame(const uint8_t *frame, size_t frame_len) {
     LOW(GPIO_SSC_DOUT);
 }
 
-
 static void hitag2_handle_reader_command(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t *txlen) {
     uint8_t rx_air[HITAG_FRAME_LEN];
 
@@ -419,7 +289,6 @@ static void hitag_reader_send_bit(int bit) {
 
     // Wait for 4-10 times the carrier period
     while (AT91C_BASE_TC0->TC_CV < T0 * 6);
-    // SpinDelayUs(8*8);
 
     // Disable modulation, just activates the field again
     LOW(GPIO_SSC_DOUT);
@@ -435,7 +304,6 @@ static void hitag_reader_send_bit(int bit) {
     LED_A_OFF();
 }
 
-
 static void hitag_reader_send_frame(const uint8_t *frame, size_t frame_len) {
     // Send the content of the frame
     for (size_t i = 0; i < frame_len; i++) {
@@ -605,8 +473,8 @@ static bool hitag2_crypto(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t *
                 if (!bCrypto) {
                     uint64_t ui64key = key[0] | ((uint64_t)key[1]) << 8 | ((uint64_t)key[2]) << 16 | ((uint64_t)key[3]) << 24 | ((uint64_t)key[4]) << 32 | ((uint64_t)key[5]) << 40;
                     uint32_t ui32uid = rx[0] | ((uint32_t)rx[1]) << 8 | ((uint32_t)rx[2]) << 16 | ((uint32_t)rx[3]) << 24;
-                    Dbprintf("hitag2_crypto: key=0x%x%x uid=0x%x", (uint32_t)((rev64(ui64key)) >> 32), (uint32_t)((rev64(ui64key)) & 0xffffffff), rev32(ui32uid));
-                    cipher_state = _hitag2_init(rev64(ui64key), rev32(ui32uid), 0);
+                    Dbprintf("hitag2_crypto: key=0x%x%x uid=0x%x", (uint32_t)((REV64(ui64key)) >> 32), (uint32_t)((REV64(ui64key)) & 0xffffffff), REV32(ui32uid));
+                    cipher_state = _hitag2_init(REV64(ui64key), REV32(ui32uid), 0);
                     memset(tx, 0x00, 4);
                     memset(tx + 4, 0xff, 4);
                     hitag2_cipher_transcrypt(&cipher_state, tx + 4, 4, 0);
@@ -802,6 +670,9 @@ static bool hitag2_read_uid(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t
 }
 
 void SniffHitag(uint32_t type) {
+
+    StopTicks();
+    
     int frame_count;
     int response;
     int overflow;
@@ -818,8 +689,6 @@ void SniffHitag(uint32_t type) {
     // free eventually allocated BigBuf memory
     BigBuf_free();
     BigBuf_Clear_ext(false);
-
-    // Clean up trace and prepare it for storing frames
     clear_trace();
     set_tracing(true);
 
@@ -829,19 +698,20 @@ void SniffHitag(uint32_t type) {
     auth_table = (uint8_t *)BigBuf_malloc(AUTH_TABLE_LENGTH);
     memset(auth_table, 0x00, AUTH_TABLE_LENGTH);
 
-    DbpString("Starting Hitag2 sniff");
+    DbpString("Starting Hitag2 sniffing");
     LED_D_ON();
 
     // Set up eavesdropping mode, frequency divisor which will drive the FPGA
     // and analog mux selection.
     FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT  | FPGA_LF_EDGE_DETECT_TOGGLE_MODE);
-    FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
+    
+    //125Khz
+    FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95);
     SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
-    RELAY_OFF();
 
     // Configure output pin that is connected to the FPGA (for modulating)
-    AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
-    AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
+    AT91C_BASE_PIOA->PIO_OER |= GPIO_SSC_DOUT;
+    AT91C_BASE_PIOA->PIO_PER |= GPIO_SSC_DOUT;
 
     // Disable modulation, we are going to eavesdrop, not modulate ;)
     LOW(GPIO_SSC_DOUT);
@@ -852,14 +722,16 @@ void SniffHitag(uint32_t type) {
 
     // Disable timer during configuration
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
-
-    // Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
+    
+    // TC1: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
     // external trigger rising edge, load RA on rising edge of TIOA.
-    uint32_t t1_channel_mode = AT91C_TC_CLKS_TIMER_DIV1_CLOCK | AT91C_TC_ETRGEDG_BOTH | AT91C_TC_ABETRG | AT91C_TC_LDRA_BOTH;
-    AT91C_BASE_TC1->TC_CMR = t1_channel_mode;
+    AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK | AT91C_TC_ETRGEDG_BOTH | AT91C_TC_ABETRG | AT91C_TC_LDRA_BOTH;
 
     // Enable and reset counter
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
+    
+    // synchronized startup procedure
+    while (AT91C_BASE_TC1->TC_CV > 0); // wait until TC0 returned to zero
 
     // Reset the received frame, frame count and timing info
     memset(rx, 0x00, sizeof(rx));
@@ -1005,24 +877,25 @@ void SniffHitag(uint32_t type) {
         // Reset the timer to restart while-loop that receives frames
         AT91C_BASE_TC1->TC_CCR = AT91C_TC_SWTRG;
     }
-    LED_A_ON();
-    LED_B_OFF();
-    LED_C_OFF();
-    LED_D_OFF();
+    LEDsoff();
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    set_tracing(false);
+    
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
-    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-    LED_A_OFF();
-    set_tracing(false);
-// Dbprintf("frame received: %d",frame_count);
-// Dbprintf("Authentication Attempts: %d",(auth_table_len/8));
-// DbpString("All done");
+    
+    // release allocated memory from BigBuff.
+    BigBuf_free();
+    StartTicks();   
+    
+    DbpString("Hitag2 sniffing end,  use `lf hitag list` for annotations");
 }
 
 void SimulateHitagTag(bool tag_mem_supplied, uint8_t *data) {
-    int frame_count;
-    int response;
-    int overflow;
+
+    StopTicks();
+    
+    int frame_count = 0, response = 0, overflow = 0;
     uint8_t rx[HITAG_FRAME_LEN];
     size_t rxlen = 0;
     uint8_t tx[HITAG_FRAME_LEN];
@@ -1035,19 +908,19 @@ void SimulateHitagTag(bool tag_mem_supplied, uint8_t *data) {
     // free eventually allocated BigBuf memory
     BigBuf_free();
     BigBuf_Clear_ext(false);
-
-    // Clean up trace and prepare it for storing frames
     clear_trace();
     set_tracing(true);
 
     auth_table_len = 0;
     auth_table_pos = 0;
-    uint8_t *auth_table;
-
-    auth_table = (uint8_t *)BigBuf_malloc(AUTH_TABLE_LENGTH);
+    uint8_t *auth_table = BigBuf_malloc(AUTH_TABLE_LENGTH);
     memset(auth_table, 0x00, AUTH_TABLE_LENGTH);
 
+    // Reset the received frame, frame count and timing info
+    memset(rx, 0x00, sizeof(rx));
+
     DbpString("Starting Hitag2 simulation");
+    
     LED_D_ON();
     hitag2_init();
 
@@ -1064,44 +937,44 @@ void SimulateHitagTag(bool tag_mem_supplied, uint8_t *data) {
         }
         Dbprintf("| %d | %08x |", i, block);
     }
-
+    
     // Set up simulator mode, frequency divisor which will drive the FPGA
     // and analog mux selection.
     FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT);
-    SpinDelay(50);
     FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
     SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
-    RELAY_OFF();
 
     // Configure output pin that is connected to the FPGA (for modulating)
-    AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
-    AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
+    AT91C_BASE_PIOA->PIO_OER |= GPIO_SSC_DOUT;
+    AT91C_BASE_PIOA->PIO_PER |= GPIO_SSC_DOUT;
 
     // Disable modulation at default, which means release resistance
     LOW(GPIO_SSC_DOUT);
 
-    // Enable Peripheral Clock for TIMER_CLOCK0, used to measure exact timing before answering
-    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC0);
+    // Enable Peripheral Clock for 
+    //   TIMER_CLOCK0, used to measure exact timing before answering
+    //   TIMER_CLOCK1, used to capture edges of the tag frames    
+    AT91C_BASE_PMC->PMC_PCER |= (1 << AT91C_ID_TC0) | (1 << AT91C_ID_TC1);
 
-    // Enable Peripheral Clock for TIMER_CLOCK1, used to capture edges of the reader frames
-    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC1);
     AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
 
     // Disable timer during configuration
+    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 
-    // Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
+    // TC0: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), no triggers
+	AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK;
+    
+    // TC1: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
     // external trigger rising edge, load RA on rising edge of TIOA.
     AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK | AT91C_TC_ETRGEDG_RISING | AT91C_TC_ABETRG | AT91C_TC_LDRA_RISING;
 
-    // Reset the received frame, frame count and timing info
-    memset(rx, 0x00, sizeof(rx));
-    frame_count = 0;
-    response = 0;
-    overflow = 0;
-
     // Enable and reset counter
+    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
+    
+    // synchronized startup procedure
+    while (AT91C_BASE_TC1->TC_CV > 0); // wait until TC0 returned to zero
 
     while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
         // Watchdog hit
@@ -1200,17 +1073,25 @@ void SimulateHitagTag(bool tag_mem_supplied, uint8_t *data) {
         // Reset the timer to restart while-loop that receives frames
         AT91C_BASE_TC1->TC_CCR = AT91C_TC_SWTRG;
     }
-    LED_B_OFF();
-    LED_D_OFF();
+
+    LEDsoff();
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    set_tracing(false);    
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
-    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-
+    
+    // release allocated memory from BigBuff.
+    BigBuf_free();
+  
+    StartTicks();
+    
     DbpString("Sim Stopped");
-    set_tracing(false);
 }
 
 void ReaderHitag(hitag_function htf, hitag_data *htd) {
+
+    StopTicks();
+
     int frame_count = 0;
     int response = 0;
     uint8_t rx[HITAG_FRAME_LEN];
@@ -1274,6 +1155,7 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
         default: {
             Dbprintf("Error, unknown function: %d", htf);
             set_tracing(false);
+            StartTicks();
             return;
         }
     }
@@ -1286,33 +1168,35 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
     LED_D_ON();
     hitag2_init();
 
-    // Configure output and enable pin that is connected to the FPGA (for modulating)
-    AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
-    AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
-
+    
     // Set fpga in edge detect with reader field, we can modulate as reader now
     FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_READER_FIELD);
     FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
     SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
-//    RELAY_OFF();
+    
+    // Configure output and enable pin that is connected to the FPGA (for modulating)
+    AT91C_BASE_PIOA->PIO_OER |= GPIO_SSC_DOUT;
+    AT91C_BASE_PIOA->PIO_PER |= GPIO_SSC_DOUT;
 
     // Disable modulation at default, which means enable the field
     LOW(GPIO_SSC_DOUT);
 
-    // Give it a bit of time for the resonant antenna to settle.
-    SpinDelay(30);
-
-    // Enable Peripheral Clock for TIMER_CLOCK0, used to measure exact timing before answering
-    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC0);
-
-    // Enable Peripheral Clock for TIMER_CLOCK1, used to capture edges of the tag frames
-    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC1);
+    // Enable Peripheral Clock for 
+    //   TIMER_CLOCK0, used to measure exact timing before answering
+    //   TIMER_CLOCK1, used to capture edges of the tag frames    
+    AT91C_BASE_PMC->PMC_PCER |= (1 << AT91C_ID_TC0) | (1 << AT91C_ID_TC1);
+                              
+    // PIO_A - BSR
     AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
 
     // Disable timer during configuration
+    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 
-    // Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
+    // TC0: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), no triggers
+	AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK;
+    
+    // TC1: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
     // external trigger rising edge, load RA on falling edge of TIOA.
     AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK | AT91C_TC_ETRGEDG_FALLING | AT91C_TC_ABETRG | AT91C_TC_LDRA_FALLING;
 
@@ -1320,22 +1204,25 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
+    // synchronized startup procedure
+    while (AT91C_BASE_TC0->TC_CV > 0); // wait until TC0 returned to zero
+
     // Tag specific configuration settings (sof, timings, etc.)
     if (htf < 10) {
         // hitagS settings
         reset_sof = 1;
         t_wait = 200;
-        // DbpString("Configured for hitagS reader");
+        DbpString("Configured for hitagS reader");
     } else if (htf < 20) {
         // hitag1 settings
         reset_sof = 1;
         t_wait = 200;
-        // DbpString("Configured for hitag1 reader");
+        DbpString("Configured for hitag1 reader");
     } else if (htf < 30) {
         // hitag2 settings
         reset_sof = 4;
         t_wait = HITAG_T_WAIT_2;
-        // DbpString("Configured for hitag2 reader");
+        DbpString("Configured for hitag2 reader");
     } else {
         Dbprintf("Error, unknown hitag reader type: %d", htf);
         goto out;
@@ -1477,11 +1364,16 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
 
 out:
     LEDsoff();
-    AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
-    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     set_tracing(false);
-
+ 
+    AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
+    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
+ 
+    // release allocated memory from BigBuff.
+    BigBuf_free();
+    StartTicks();
+        
     if (bSuccessful)
         cmd_send(CMD_ACK, bSuccessful, 0, 0, (uint8_t *)tag.sectors, 48);
     else
@@ -1489,6 +1381,9 @@ out:
 }
 
 void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
+    
+    StopTicks();
+    
     int frame_count;
     int response;
     uint8_t rx[HITAG_FRAME_LEN];
@@ -1502,9 +1397,9 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
     int tag_sof;
     int t_wait = HITAG_T_WAIT_MAX;
     bool bStop;
-    bool bQuitTraceFull = false;
 
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
+
     // Reset the return status
     bSuccessful = false;
 
@@ -1525,12 +1420,12 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
             bQuiet = false;
             bCrypto = false;
             bAuthenticating = false;
-            bQuitTraceFull = true;
             writestate = WRITE_STATE_START;
         }
         break;
         default: {
             Dbprintf("Error, unknown function: %d", htf);
+            StartTicks();            
             return;
         }
         break;
@@ -1540,8 +1435,8 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
     hitag2_init();
 
     // Configure output and enable pin that is connected to the FPGA (for modulating)
-    AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
-    AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
+    AT91C_BASE_PIOA->PIO_OER |= GPIO_SSC_DOUT;
+    AT91C_BASE_PIOA->PIO_PER |= GPIO_SSC_DOUT;
 
     // Set fpga in edge detect with reader field, we can modulate as reader now
     FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_READER_FIELD);
@@ -1549,25 +1444,25 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
     // Set Frequency divisor which will drive the FPGA and analog mux selection
     FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
     SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
-    RELAY_OFF();
 
     // Disable modulation at default, which means enable the field
     LOW(GPIO_SSC_DOUT);
 
-    // Give it a bit of time for the resonant antenna to settle.
-    SpinDelay(30);
+    // Enable Peripheral Clock for 
+    //   TIMER_CLOCK0, used to measure exact timing before answering
+    //   TIMER_CLOCK1, used to capture edges of the tag frames
+    AT91C_BASE_PMC->PMC_PCER |= (1 << AT91C_ID_TC0) | (1 << AT91C_ID_TC1);
 
-    // Enable Peripheral Clock for TIMER_CLOCK0, used to measure exact timing before answering
-    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC0);
-
-    // Enable Peripheral Clock for TIMER_CLOCK1, used to capture edges of the tag frames
-    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC1);
     AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
 
     // Disable timer during configuration
+    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 
-    // Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
+    // TC0: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), no triggers
+	AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK;    
+
+    // TC1: Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
     // external trigger rising edge, load RA on falling edge of TIOA.
     AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK | AT91C_TC_ETRGEDG_FALLING | AT91C_TC_ABETRG | AT91C_TC_LDRA_FALLING;
 
@@ -1575,6 +1470,8 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
+    while (AT91C_BASE_TC0->TC_CV > 0);
+    
     // Reset the received frame, frame count and timing info
     frame_count = 0;
     response = 0;
@@ -1608,16 +1505,7 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
         // Check if frame was captured and store it
         if (rxlen > 0) {
             frame_count++;
-            if (!bQuiet) {
-                if (!LogTraceHitag(rx, rxlen, response, 0, false)) {
-                    DbpString("Trace full");
-                    if (bQuitTraceFull) {
-                        break;
-                    } else {
-                        bQuiet = true;
-                    }
-                }
-            }
+            LogTraceHitag(rx, rxlen, response, 0, false);
         }
 
         // By default reset the transmission buffer
@@ -1656,16 +1544,8 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
         // Add transmitted frame to total count
         if (txlen > 0) {
             frame_count++;
-            if (!bQuiet) {
-                // Store the frame in the trace
-                if (!LogTraceHitag(tx, txlen, HITAG_T_WAIT_2, 0, true)) {
-                    if (bQuitTraceFull) {
-                        break;
-                    } else {
-                        bQuiet = true;
-                    }
-                }
-            }
+            // Store the frame in the trace
+            LogTraceHitag(tx, txlen, HITAG_T_WAIT_2, 0, true);
         }
 
         // Reset values for receiving frames
@@ -1760,14 +1640,15 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
             while (AT91C_BASE_TC0->TC_CV < T0 * (HITAG_T_PROG - HITAG_T_WAIT_MAX));
         }
     }
-    // Dbprintf("DEBUG: Done waiting for frame");
 
-    LED_B_OFF();
-    LED_D_OFF();
+    LEDsoff();
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    set_tracing(false);
+    
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
-    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-    // Dbprintf("frame received: %d",frame_count);
-    // DbpString("All done");
+
+    StartTicks();
+    
     cmd_send(CMD_ACK, bSuccessful, 0, 0, (uint8_t *)tag.sectors, 48);
 }
diff --git a/armsrc/hitag2_crypto.c b/armsrc/hitag2_crypto.c
new file mode 100644
index 000000000..7d1e10d87
--- /dev/null
+++ b/armsrc/hitag2_crypto.c
@@ -0,0 +1,116 @@
+//-----------------------------------------------------------------------------
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// Hitag2 Crypto
+//
+// (c) 2009 Henryk Plötz <henryk@ploetzli.ch>
+// (c) 2012 Roel Verdult
+// (c) 2019 Iceman
+//-----------------------------------------------------------------------------
+#include "hitag2_crypto.h"
+
+/* Following is a modified version of cryptolib.com/ciphers/hitag2/ */
+// Software optimized 48-bit Philips/NXP Mifare Hitag2 PCF7936/46/47/52 stream cipher algorithm by I.C. Wiener 2006-2007.
+// For educational purposes only.
+// No warranties or guarantees of any kind.
+// This code is released into the public domain by its author.
+
+// Single bit Hitag2 functions:
+#ifndef i4
+#define i4(x,a,b,c,d)    ((uint32_t)((((x)>>(a))&1)+(((x)>>(b))&1)*2+(((x)>>(c))&1)*4+(((x)>>(d))&1)*8))
+#endif
+
+static const uint32_t ht2_f4a = 0x2C79;     // 0010 1100 0111 1001
+static const uint32_t ht2_f4b = 0x6671;     // 0110 0110 0111 0001
+static const uint32_t ht2_f5c = 0x7907287B; // 0111 1001 0000 0111 0010 1000 0111 1011
+
+uint32_t _f20(const uint64_t x) {
+    uint32_t i5;
+
+    i5 = ((ht2_f4a >> i4(x, 1, 2, 4, 5)) & 1) * 1
+         + ((ht2_f4b >> i4(x, 7, 11, 13, 14)) & 1) * 2
+         + ((ht2_f4b >> i4(x, 16, 20, 22, 25)) & 1) * 4
+         + ((ht2_f4b >> i4(x, 27, 28, 30, 32)) & 1) * 8
+         + ((ht2_f4a >> i4(x, 33, 42, 43, 45)) & 1) * 16;
+
+    return (ht2_f5c >> i5) & 1;
+}
+
+uint64_t _hitag2_init(const uint64_t key, const uint32_t serial, const uint32_t IV) {
+    uint32_t i;
+    uint64_t x = ((key & 0xFFFF) << 32) + serial;
+
+    for (i = 0; i < 32; i++) {
+        x >>= 1;
+        x += (uint64_t)(_f20(x) ^ (((IV >> i) ^ (key >> (i + 16))) & 1)) << 47;
+    }
+    return x;
+}
+
+uint64_t _hitag2_round(uint64_t *state) {
+    uint64_t x = *state;
+
+    x = (x >>  1) +
+        ((((x >>  0) ^ (x >>  2) ^ (x >>  3) ^ (x >>  6)
+           ^ (x >>  7) ^ (x >>  8) ^ (x >> 16) ^ (x >> 22)
+           ^ (x >> 23) ^ (x >> 26) ^ (x >> 30) ^ (x >> 41)
+           ^ (x >> 42) ^ (x >> 43) ^ (x >> 46) ^ (x >> 47)) & 1) << 47);
+
+    *state = x;
+    return _f20(x);
+}
+
+// "MIKRON"             =  O  N  M  I  K  R
+// Key                  = 4F 4E 4D 49 4B 52             - Secret 48-bit key
+// Serial               = 49 43 57 69                   - Serial number of the tag, transmitted in clear
+// Random               = 65 6E 45 72                   - Random IV, transmitted in clear
+//~28~DC~80~31  = D7 23 7F CE                   - Authenticator value = inverted first 4 bytes of the keystream
+
+// The code below must print out "D7 23 7F CE 8C D0 37 A9 57 49 C1 E6 48 00 8A B6".
+// The inverse of the first 4 bytes is sent to the tag to authenticate.
+// The rest is encrypted by XORing it with the subsequent keystream.
+
+uint32_t _hitag2_byte(uint64_t *x) {
+    uint32_t i, c;
+    for (i = 0, c = 0; i < 8; i++) {
+        c += (uint32_t) _hitag2_round(x) << (i ^ 7);
+    }
+    return c;
+}
+
+void hitag2_cipher_reset(struct hitag2_tag *tag, const uint8_t *iv) {
+    uint64_t key = ((uint64_t)tag->sectors[2][2]) |
+                   ((uint64_t)tag->sectors[2][3] << 8) |
+                   ((uint64_t)tag->sectors[1][0] << 16) |
+                   ((uint64_t)tag->sectors[1][1] << 24) |
+                   ((uint64_t)tag->sectors[1][2] << 32) |
+                   ((uint64_t)tag->sectors[1][3] << 40);
+    uint32_t uid = ((uint32_t)tag->sectors[0][0]) |
+                   ((uint32_t)tag->sectors[0][1] << 8) |
+                   ((uint32_t)tag->sectors[0][2] << 16) |
+                   ((uint32_t)tag->sectors[0][3] << 24);
+    uint32_t iv_ = (((uint32_t)(iv[0]))) |
+                   (((uint32_t)(iv[1])) << 8) |
+                   (((uint32_t)(iv[2])) << 16) |
+                   (((uint32_t)(iv[3])) << 24);
+    tag->cs = _hitag2_init(REV64(key), REV32(uid), REV32(iv_));
+}
+
+int hitag2_cipher_authenticate(uint64_t *cs, const uint8_t *authenticator_is) {
+    uint8_t authenticator_should[4];
+    authenticator_should[0] = ~_hitag2_byte(cs);
+    authenticator_should[1] = ~_hitag2_byte(cs);
+    authenticator_should[2] = ~_hitag2_byte(cs);
+    authenticator_should[3] = ~_hitag2_byte(cs);
+    return (memcmp(authenticator_should, authenticator_is, 4) == 0);
+}
+
+int hitag2_cipher_transcrypt(uint64_t *cs, uint8_t *data, uint16_t bytes, uint16_t bits) {
+    int i;
+    for (i = 0; i < bytes; i++) data[i] ^= _hitag2_byte(cs);
+    for (i = 0; i < bits; i++) data[bytes] ^= _hitag2_round(cs) << (7 - i);
+    return 0;
+}
+
diff --git a/armsrc/hitag2_crypto.h b/armsrc/hitag2_crypto.h
new file mode 100644
index 000000000..8af1af412
--- /dev/null
+++ b/armsrc/hitag2_crypto.h
@@ -0,0 +1,36 @@
+#ifndef __HITAG2_CRYPTO_H
+#define __HITAG2_CRYPTO_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "string.h"
+#include "util.h"
+
+struct hitag2_tag {
+    uint32_t uid;
+    enum {
+        TAG_STATE_RESET      = 0x01,       // Just powered up, awaiting GetSnr
+        TAG_STATE_ACTIVATING = 0x02,       // In activation phase (password mode), sent UID, awaiting reader password
+        TAG_STATE_ACTIVATED  = 0x03,       // Activation complete, awaiting read/write commands
+        TAG_STATE_WRITING    = 0x04,       // In write command, awaiting sector contents to be written
+    } state;
+    uint16_t active_sector;
+    uint8_t crypto_active;
+    uint64_t cs;
+    uint8_t sectors[12][4];
+};
+
+extern uint32_t _f20(const uint64_t x);
+extern uint64_t _hitag2_init(const uint64_t key, const uint32_t serial, const uint32_t IV);
+extern uint64_t _hitag2_round(uint64_t *state);
+extern uint32_t _hitag2_byte(uint64_t *x);
+extern void hitag2_cipher_reset(struct hitag2_tag *tag, const uint8_t *iv);
+extern int hitag2_cipher_authenticate(uint64_t *cs, const uint8_t *authenticator_is);
+extern int hitag2_cipher_transcrypt(uint64_t *cs, uint8_t *data, uint16_t bytes, uint16_t bits) ;
+#ifdef __cplusplus
+}
+#endif
+
+#endif

From a117f06380ae23611c3999e07ab155039cd5c50e Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 13 Mar 2019 12:18:37 +0100
Subject: [PATCH 0765/1938] chg:  refactoring of hitag (@piwi) chg: 
 refactoring of hitagS (@iceman)

---
 armsrc/apps.h       |  12 -
 armsrc/hitag2.c     |  35 +-
 armsrc/hitag2.h     |  23 ++
 armsrc/hitagS.c     | 776 +++++++++++++++++++-------------------------
 armsrc/hitagS.h     |  31 ++
 client/cmdlfhitag.c |   3 +-
 include/hitag.h     | 117 +++++++
 include/hitag2.h    |  55 ----
 include/hitagS.h    |  77 -----
 9 files changed, 530 insertions(+), 599 deletions(-)
 create mode 100644 armsrc/hitag2.h
 create mode 100644 armsrc/hitagS.h
 create mode 100644 include/hitag.h
 delete mode 100644 include/hitag2.h
 delete mode 100644 include/hitagS.h

diff --git a/armsrc/apps.h b/armsrc/apps.h
index 31071a8ad..62fce3931 100644
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -222,18 +222,6 @@ void iClass_Dump(uint8_t blockno, uint8_t numblks);
 void iClass_Clone(uint8_t startblock, uint8_t endblock, uint8_t *data);
 void iClass_ReadCheck(uint8_t blockNo, uint8_t keyType);
 
-// hitag2.h
-void SniffHitag(uint32_t type);
-void SimulateHitagTag(bool tag_mem_supplied, byte_t *data);
-void ReaderHitag(hitag_function htf, hitag_data *htd);
-void WriterHitag(hitag_function htf, hitag_data *htd, int page);
-
-//hitagS.h
-void SimulateHitagSTag(bool tag_mem_supplied, byte_t *data);
-void ReadHitagS(hitag_function htf, hitag_data *htd);
-void WritePageHitagS(hitag_function htf, hitag_data *htd, int page);
-void check_challenges(bool file_given, byte_t *data);
-
 // cmd.h
 uint8_t cmd_receive(UsbCommand *cmd);
 uint8_t cmd_send(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
diff --git a/armsrc/hitag2.c b/armsrc/hitag2.c
index 237f0820c..d474cf895 100644
--- a/armsrc/hitag2.c
+++ b/armsrc/hitag2.c
@@ -18,7 +18,9 @@
 // Piwi, 2019
 // Iceman, 2019
 
+#include "hitag2.h"
 #include "hitag2_crypto.h"
+#include "hitag.h"
 #include "proxmark3.h"
 #include "apps.h"
 #include "util.h"
@@ -1076,7 +1078,7 @@ void SimulateHitagTag(bool tag_mem_supplied, uint8_t *data) {
 
     LEDsoff();
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-    set_tracing(false);    
+    set_tracing(false);
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
     
@@ -1384,8 +1386,7 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
     
     StopTicks();
     
-    int frame_count;
-    int response;
+    int frame_count = 0, response = 0;
     uint8_t rx[HITAG_FRAME_LEN];
     size_t rxlen = 0;
     uint8_t txbuf[HITAG_FRAME_LEN];
@@ -1440,8 +1441,6 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
 
     // Set fpga in edge detect with reader field, we can modulate as reader now
     FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_READER_FIELD);
-
-    // Set Frequency divisor which will drive the FPGA and analog mux selection
     FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
     SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
 
@@ -1464,17 +1463,18 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
 
     // TC1: Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
     // external trigger rising edge, load RA on falling edge of TIOA.
-    AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK | AT91C_TC_ETRGEDG_FALLING | AT91C_TC_ABETRG | AT91C_TC_LDRA_FALLING;
+    AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK 
+                             | AT91C_TC_ETRGEDG_FALLING
+                             | AT91C_TC_ABETRG
+                             | AT91C_TC_LDRA_FALLING;
 
     // Enable and reset counters
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
-    while (AT91C_BASE_TC0->TC_CV > 0);
+    while (AT91C_BASE_TC0->TC_CV > 0) {};
     
     // Reset the received frame, frame count and timing info
-    frame_count = 0;
-    response = 0;
     lastbit = 1;
     bStop = false;
 
@@ -1483,23 +1483,24 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
         // hitagS settings
         reset_sof = 1;
         t_wait = 200;
-        // DbpString("Configured for hitagS reader");
+        DbpString("Configured for hitagS reader");
     } else if (htf < 20) {
         // hitag1 settings
         reset_sof = 1;
         t_wait = 200;
-        // DbpString("Configured for hitag1 reader");
+        DbpString("Configured for hitag1 reader");
     } else if (htf < 30) {
         // hitag2 settings
         reset_sof = 4;
         t_wait = HITAG_T_WAIT_2;
-        // DbpString("Configured for hitag2 reader");
+        DbpString("Configured for hitag2 reader");
     } else {
         Dbprintf("Error, unknown hitag reader type: %d", htf);
         return;
     }
-    while (!bStop && !BUTTON_PRESS()) {
-        // Watchdog hit
+    
+    while (!bStop && !BUTTON_PRESS() && !usb_poll_validate_length()) {
+
         WDT_HIT();
 
         // Check if frame was captured and store it
@@ -1531,9 +1532,7 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
         // falling edge occured halfway the period. with respect to this falling edge,
         // we need to wait (T_Wait2 + half_tag_period) when the last was a 'one'.
         // All timer values are in terms of T0 units
-        while (AT91C_BASE_TC0->TC_CV < T0 * (t_wait + (HITAG_T_TAG_HALF_PERIOD * lastbit)));
-
-        // Dbprintf("DEBUG: Sending reader frame");
+        while (AT91C_BASE_TC0->TC_CV < T0 * (t_wait + (HITAG_T_TAG_HALF_PERIOD * lastbit))) {};
 
         // Transmit the reader frame
         hitag_reader_send_frame(tx, txlen);
@@ -1555,7 +1554,6 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
         bSkip = true;
         tag_sof = reset_sof;
         response = 0;
-        // Dbprintf("DEBUG: Waiting to receive frame");
         uint32_t errorCount = 0;
 
         // Receive frame, watch for at most T0*EOF periods
@@ -1628,6 +1626,7 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
             }
             // if we saw over 100 wierd values break it probably isn't hitag...
             if (errorCount > 100) break;
+            
             // We can break this loop if we received the last bit from a frame
             if (AT91C_BASE_TC1->TC_CV > T0 * HITAG_T_EOF) {
                 if (rxlen > 0) break;
diff --git a/armsrc/hitag2.h b/armsrc/hitag2.h
new file mode 100644
index 000000000..2260e5f8d
--- /dev/null
+++ b/armsrc/hitag2.h
@@ -0,0 +1,23 @@
+//-----------------------------------------------------------------------------
+// (c) 2012 Roel Verdult
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// Hitag2 type prototyping
+//-----------------------------------------------------------------------------
+
+#ifndef _HITAG2_H_
+#define _HITAG2_H_
+
+#include <stdint.h>
+#include <stdbool.h>
+#include "hitag.h"
+
+void SniffHitag(uint32_t type);
+void SimulateHitagTag(bool tag_mem_supplied, uint8_t *data);
+void ReaderHitag(hitag_function htf, hitag_data *htd);
+void WriterHitag(hitag_function htf, hitag_data *htd, int page);
+
+#endif
diff --git a/armsrc/hitagS.c b/armsrc/hitagS.c
index b53112081..404230aac 100644
--- a/armsrc/hitagS.c
+++ b/armsrc/hitagS.c
@@ -10,109 +10,46 @@
 //-----------------------------------------------------------------------------
 // Some code was copied from Hitag2.c
 //-----------------------------------------------------------------------------
-#include <stdlib.h>
-#include "proxmark3.h"
-#include "apps.h"
-#include "util.h"
+
 #include "hitagS.h"
-#include "hitag2.h"
-#include "string.h"
-#include "BigBuf.h"
 
 #define CRC_PRESET 0xFF
 #define CRC_POLYNOM 0x1D
 
-#define u8              uint8_t
-#define u32             uint32_t
-#define u64             uint64_t
-#define rev8(x)         ((((x)>>7)&1)+((((x)>>6)&1)<<1)+((((x)>>5)&1)<<2)+((((x)>>4)&1)<<3)+((((x)>>3)&1)<<4)+((((x)>>2)&1)<<5)+((((x)>>1)&1)<<6)+(((x)&1)<<7))
-#define rev16(x)        (rev8 (x)+(rev8 (x>> 8)<< 8))
-#define rev32(x)        (rev16(x)+(rev16(x>>16)<<16))
-#define rev64(x)        (rev32(x)+(rev32(x>>32)<<32))
-#define bit(x,n)        (((x)>>(n))&1)
-#define bit32(x,n)      ((((x)[(n)>>5])>>((n)))&1)
-#define inv32(x,i,n)    ((x)[(i)>>5]^=((u32)(n))<<((i)&31))
-#define rotl64(x, n)    ((((u64)(x))<<((n)&63))+(((u64)(x))>>((0-(n))&63)))
-
 static bool bQuiet;
 static bool bSuccessful;
 static struct hitagS_tag tag;
 static byte_t page_to_be_written = 0;
 static int block_data_left = 0;
+
 typedef enum modulation {
     AC2K = 0,
     AC4K,
     MC4K,
     MC8K
 } MOD;
-static MOD m = AC2K;               //used modulation
+
+static MOD m = AC2K;               // used modulation
 static uint32_t temp_uid;
 static int temp2 = 0;
-static int sof_bits;               //number of start-of-frame bits
-static byte_t pwdh0, pwdl0, pwdl1; //password bytes
-static uint32_t rnd = 0x74124485;  //randomnumber
+static int sof_bits;               // number of start-of-frame bits
+static byte_t pwdh0, pwdl0, pwdl1; // password bytes
+static uint32_t rnd = 0x74124485;  // randomnumber
 static int test = 0;
 size_t blocknr;
 bool end = false;
 
-// Single bit Hitag2 functions:
-#define i4(x,a,b,c,d)       ((u32)((((x)>>(a))&1)+(((x)>>(b))&1)*2+(((x)>>(c))&1)*4+(((x)>>(d))&1)*8))
-static const u32 ht2_f4a = 0x2C79;            // 0010 1100 0111 1001
-static const u32 ht2_f4b = 0x6671;            // 0110 0110 0111 0001
-static const u32 ht2_f5c = 0x7907287B;        // 0111 1001 0000 0111 0010 1000 0111 1011
 #define ht2bs_4a(a,b,c,d)   (~(((a|b)&c)^(a|d)^b))
 #define ht2bs_4b(a,b,c,d)   (~(((d|c)&(a^b))^(d|a|b)))
 #define ht2bs_5c(a,b,c,d,e) (~((((((c^e)|d)&a)^b)&(c^b))^(((d^e)|a)&((d^b)|c))))
-#define uf20bs              u32
-
-static u32 f20(const u64 x) {
-    u32 i5;
-
-    i5 = ((ht2_f4a >> i4(x, 1, 2, 4, 5)) & 1) * 1
-         + ((ht2_f4b >> i4(x, 7, 11, 13, 14)) & 1) * 2
-         + ((ht2_f4b >> i4(x, 16, 20, 22, 25)) & 1) * 4
-         + ((ht2_f4b >> i4(x, 27, 28, 30, 32)) & 1) * 8
-         + ((ht2_f4a >> i4(x, 33, 42, 43, 45)) & 1) * 16;
-
-    return (ht2_f5c >> i5) & 1;
-}
-static u64 hitag2_round(u64 *state) {
-    u64 x = *state;
-
-    x = (x >> 1)
-        + ((((x >> 0) ^ (x >> 2) ^ (x >> 3) ^ (x >> 6) ^ (x >> 7) ^ (x >> 8)
-             ^ (x >> 16) ^ (x >> 22) ^ (x >> 23) ^ (x >> 26) ^ (x >> 30)
-             ^ (x >> 41) ^ (x >> 42) ^ (x >> 43) ^ (x >> 46) ^ (x >> 47))
-            & 1) << 47);
-
-    *state = x;
-    return f20(x);
-}
-static u64 hitag2_init(const u64 key, const u32 serial, const u32 IV) {
-    u32 i;
-    u64 x = ((key & 0xFFFF) << 32) + serial;
-    for (i = 0; i < 32; i++) {
-        x >>= 1;
-        x += (u64)(f20(x) ^ (((IV >> i) ^ (key >> (i + 16))) & 1)) << 47;
-    }
-    return x;
-}
-static u32 hitag2_byte(u64 *x) {
-    u32 i, c;
-
-    for (i = 0, c = 0; i < 8; i++)
-        c += (u32) hitag2_round(x) << (i ^ 7);
-    return c;
-}
 
 // Sam7s has several timers, we will use the source TIMER_CLOCK1 (aka AT91C_TC_CLKS_TIMER_DIV1_CLOCK)
 // TIMER_CLOCK1 = MCK/2, MCK is running at 48 MHz, Timer is running at 48/2 = 24 MHz
 // Hitag units (T0) have duration of 8 microseconds (us), which is 1/125000 per second (carrier)
 // T0 = TIMER_CLOCK1 / 125000 = 192
+#ifndef T0
 #define T0                             192
-
-#define SHORT_COIL()                   LOW(GPIO_SSC_DOUT)
-#define OPEN_COIL()                    HIGH(GPIO_SSC_DOUT)
+#endif 
 
 #define HITAG_FRAME_LEN                20
 #define HITAG_T_STOP                   36  /* T_EOF should be > 36 */
@@ -258,100 +195,85 @@ static void hitag_send_bit(int bit) {
     }
 }
 
-static void hitag_send_frame(const byte_t *frame, size_t frame_len) {
-// Send start of frame
-
+static void hitag_send_frame(const uint8_t *frame, size_t frame_len) {
+    // SOF - send start of frame
     for (size_t i = 0; i < sof_bits; i++) {
         hitag_send_bit(1);
     }
 
-// Send the content of the frame
+    // Send the content of the frame
     for (size_t i = 0; i < frame_len; i++) {
         hitag_send_bit((frame[i / 8] >> (7 - (i % 8))) & 1);
     }
-// Drop the modulation
+
     LOW(GPIO_SSC_DOUT);
 }
 
 static void hitag_reader_send_bit(int bit) {
-//Dbprintf("BIT: %d",bit);
+
     LED_A_ON();
-// Reset clock for the next bit
+    // Reset clock for the next bit
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;
 
-// Binary puls length modulation (BPLM) is used to encode the data stream
-// This means that a transmission of a one takes longer than that of a zero
+    // Binary puls length modulation (BPLM) is used to encode the data stream
+    // This means that a transmission of a one takes longer than that of a zero
 
-// Enable modulation, which means, drop the the field
     HIGH(GPIO_SSC_DOUT);
+
     if (test == 1) {
         // Wait for 4-10 times the carrier period
         while (AT91C_BASE_TC0->TC_CV < T0 * 6) {};
 
-        // SpinDelayUs(8*8);
-
-        // Disable modulation, just activates the field again
         LOW(GPIO_SSC_DOUT);
 
         if (bit == 0) {
             // Zero bit: |_-|
             while (AT91C_BASE_TC0->TC_CV < T0 * 11) {};
-
-            // SpinDelayUs(16*8);
         } else {
             // One bit: |_--|
             while (AT91C_BASE_TC0->TC_CV < T0 * 14) {};
-
-            // SpinDelayUs(22*8);
         }
     } else {
         // Wait for 4-10 times the carrier period
         while (AT91C_BASE_TC0->TC_CV < T0 * 6) {};
 
-        // SpinDelayUs(8*8);
-
-        // Disable modulation, just activates the field again
         LOW(GPIO_SSC_DOUT);
 
         if (bit == 0) {
             // Zero bit: |_-|
             while (AT91C_BASE_TC0->TC_CV < T0 * 22) {};
-
-            // SpinDelayUs(16*8);
         } else {
             // One bit: |_--|
             while (AT91C_BASE_TC0->TC_CV < T0 * 28) {};
-
-            // SpinDelayUs(22*8);
         }
     }
 
     LED_A_OFF();
 }
 
-static void hitag_reader_send_frame(const byte_t *frame, size_t frame_len) {
-// Send the content of the frame
+static void hitag_reader_send_frame(const uint8_t *frame, size_t frame_len) {
+    // Send the content of the frame
     for (size_t i = 0; i < frame_len; i++) {
-        if (frame[0] == 0xf8) {
+//        if (frame[0] == 0xf8) {
             //Dbprintf("BIT: %d",(frame[i / 8] >> (7 - (i % 8))) & 1);
-        }
+//        }
         hitag_reader_send_bit((frame[i / 8] >> (7 - (i % 8))) & 1);
     }
-// Send EOF
+    // send EOF
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;
-// Enable modulation, which means, drop the the field
+
     HIGH(GPIO_SSC_DOUT);
-// Wait for 4-10 times the carrier period
+    
+    // Wait for 4-10 times the carrier period
     while (AT91C_BASE_TC0->TC_CV < T0 * 6) {};
 
-// Disable modulation, just activates the field again
     LOW(GPIO_SSC_DOUT);
 }
 
 /*
  * to check if the right uid was selected
  */
-static int check_select(byte_t *rx, uint32_t uid) {
+static int check_select(uint8_t *rx, uint32_t uid) {
     unsigned char resp[48];
     int i;
     uint32_t ans = 0x0;
@@ -359,31 +281,32 @@ static int check_select(byte_t *rx, uint32_t uid) {
         resp[i] = (rx[i / 8] >> (7 - (i % 8))) & 0x1;
     for (i = 0; i < 32; i++)
         ans += resp[5 + i] << (31 - i);
-    /*if (rx[0] == 0x01 && rx[1] == 0x15 && rx[2] == 0xc1 && rx[3] == 0x14
-     && rx[4] == 0x65 && rx[5] == 0x38)
-     Dbprintf("got uid %X", ans);*/
+
     temp_uid = ans;
     if (ans == tag.uid)
         return 1;
+    
     return 0;
 }
 
 /*
  * handles all commands from a reader
  */
-static void hitagS_handle_reader_command(byte_t *rx, const size_t rxlen,
-                                         byte_t *tx, size_t *txlen) {
-    byte_t rx_air[HITAG_FRAME_LEN];
-    byte_t page;
+static void hitagS_handle_reader_command(uint8_t *rx, const size_t rxlen,
+                                         uint8_t *tx, size_t *txlen) {
+    uint8_t rx_air[HITAG_FRAME_LEN];
+    uint8_t page;
     int i;
-    u64 state;
+    uint64_t state;
     unsigned char crc;
 
-// Copy the (original) received frame how it is send over the air
+    // Copy the (original) received frame how it is send over the air
     memcpy(rx_air, rx, nbytes(rxlen));
-// Reset the transmission frame length
+
+    // Reset the transmission frame length
     *txlen = 0;
-// Try to find out which command was send by selecting on length (in bits)
+
+    // Try to find out which command was send by selecting on length (in bits)
     switch (rxlen) {
         case 5: {
             //UID request with a selected response protocol mode
@@ -452,11 +375,13 @@ static void hitagS_handle_reader_command(byte_t *rx, const size_t rxlen,
             Dbprintf("Challenge for UID: %X", temp_uid);
             temp2++;
             *txlen = 32;
-            state = hitag2_init(rev64(tag.key), rev32(tag.pages[0][0]),
-                                rev32(((rx[3] << 24) + (rx[2] << 16) + (rx[1] << 8) + rx[0])));
-            Dbprintf(
-                ",{0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X}",
-                rx[0], rx[1], rx[2], rx[3], rx[4], rx[5], rx[6], rx[7]);
+            state = _hitag2_init(REV64(tag.key),
+                                REV32(tag.pages[0][0]),
+                                REV32(((rx[3] << 24) + (rx[2] << 16) + (rx[1] << 8) + rx[0]))
+                                );
+            Dbprintf(",{0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X}",
+                    rx[0], rx[1], rx[2], rx[3], rx[4], rx[5], rx[6], rx[7]);
+                    
             switch (tag.mode) {
                 case HT_STANDARD:
                     sof_bits = 1;
@@ -475,12 +400,13 @@ static void hitagS_handle_reader_command(byte_t *rx, const size_t rxlen,
             }
 
             for (i = 0; i < 4; i++)
-                hitag2_byte(&state);
-            //send con2,pwdh0,pwdl0,pwdl1 encrypted as a response
-            tx[0] = hitag2_byte(&state) ^ ((tag.pages[0][1] >> 16) & 0xff);
-            tx[1] = hitag2_byte(&state) ^ tag.pwdh0;
-            tx[2] = hitag2_byte(&state) ^ tag.pwdl0;
-            tx[3] = hitag2_byte(&state) ^ tag.pwdl1;
+                _hitag2_byte(&state);
+            
+            //send con2, pwdh0, pwdl0, pwdl1 encrypted as a response
+            tx[0] = _hitag2_byte(&state) ^ ((tag.pages[0][1] >> 16) & 0xff);
+            tx[1] = _hitag2_byte(&state) ^ tag.pwdh0;
+            tx[2] = _hitag2_byte(&state) ^ tag.pwdl0;
+            tx[3] = _hitag2_byte(&state) ^ tag.pwdl1;
             if (tag.mode != HT_STANDARD) {
                 //add crc8
                 *txlen = 40;
@@ -489,14 +415,12 @@ static void hitagS_handle_reader_command(byte_t *rx, const size_t rxlen,
                 calc_crc(&crc, tag.pwdh0, 8);
                 calc_crc(&crc, tag.pwdl0, 8);
                 calc_crc(&crc, tag.pwdl1, 8);
-                tx[4] = (crc ^ hitag2_byte(&state));
+                tx[4] = (crc ^ _hitag2_byte(&state));
             }
             /*
              * some readers do not allow to authenticate multiple times in a row with the same tag.
              * use this to change the uid between authentications.
-             */
 
-            /*
              if (temp2 % 2 == 0) {
              tag.uid = 0x11223344;
              tag.pages[0][0] = 0x44332211;
@@ -720,18 +644,17 @@ static void hitagS_handle_reader_command(byte_t *rx, const size_t rxlen,
 /*
  * to autenticate to a tag with the given key or challenge
  */
-static int hitagS_handle_tag_auth(hitag_function htf, uint64_t key, uint64_t NrAr, byte_t *rx, const size_t rxlen, byte_t *tx,
-                                  size_t *txlen) {
-    byte_t rx_air[HITAG_FRAME_LEN];
+static int hitagS_handle_tag_auth(hitag_function htf, uint64_t key, uint64_t NrAr, uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t *txlen) {
+    uint8_t rx_air[HITAG_FRAME_LEN];
     int response_bit[200];
     int i, j, z, k;
     unsigned char mask = 1;
     unsigned char uid[32];
-    byte_t uid1 = 0x00, uid2 = 0x00, uid3 = 0x00, uid4 = 0x00;
+    uint8_t uid1 = 0x00, uid2 = 0x00, uid3 = 0x00, uid4 = 0x00;
     unsigned char crc;
-    u64 state;
-    byte_t auth_ks[4];
-    byte_t conf_pages[3];
+    uint64_t state;
+    uint8_t auth_ks[4];
+    uint8_t conf_pages[3];
     memcpy(rx_air, rx, nbytes(rxlen));
     *txlen = 0;
 
@@ -757,16 +680,45 @@ static int hitagS_handle_tag_auth(hitag_function htf, uint64_t key, uint64_t NrA
             if (k > 31)
                 break;
         }
-        uid1 = (uid[0] << 7) | (uid[1] << 6) | (uid[2] << 5) | (uid[3] << 4)
-               | (uid[4] << 3) | (uid[5] << 2) | (uid[6] << 1) | uid[7];
-        uid2 = (uid[8] << 7) | (uid[9] << 6) | (uid[10] << 5) | (uid[11] << 4)
-               | (uid[12] << 3) | (uid[13] << 2) | (uid[14] << 1) | uid[15];
-        uid3 = (uid[16] << 7) | (uid[17] << 6) | (uid[18] << 5) | (uid[19] << 4)
-               | (uid[20] << 3) | (uid[21] << 2) | (uid[22] << 1) | uid[23];
-        uid4 = (uid[24] << 7) | (uid[25] << 6) | (uid[26] << 5) | (uid[27] << 4)
-               | (uid[28] << 3) | (uid[29] << 2) | (uid[30] << 1) | uid[31];
+        uid1 = (uid[0] << 7)
+             | (uid[1] << 6)
+             | (uid[2] << 5)
+             | (uid[3] << 4)
+             | (uid[4] << 3)
+             | (uid[5] << 2)
+             | (uid[6] << 1)
+             | uid[7];
+               
+        uid2 = (uid[8] << 7)
+             | (uid[9] << 6)
+             | (uid[10] << 5)
+             | (uid[11] << 4)
+             | (uid[12] << 3)
+             | (uid[13] << 2)
+             | (uid[14] << 1)
+             | uid[15];
+             
+        uid3 = (uid[16] << 7)
+             | (uid[17] << 6)
+             | (uid[18] << 5)
+             | (uid[19] << 4)
+             | (uid[20] << 3)
+             | (uid[21] << 2)
+             | (uid[22] << 1)
+             | uid[23];
+             
+        uid4 = (uid[24] << 7)
+             | (uid[25] << 6)
+             | (uid[26] << 5)
+             | (uid[27] << 4)
+             | (uid[28] << 3)
+             | (uid[29] << 2)
+             | (uid[30] << 1)
+             | uid[31];
+             
         if (DEBUG)
             Dbprintf("UID: %02X %02X %02X %02X", uid1, uid2, uid3, uid4);
+        
         tag.uid = (uid4 << 24 | uid3 << 16 | uid2 << 8 | uid1);
 
         //select uid
@@ -777,29 +729,40 @@ static int hitagS_handle_tag_auth(hitag_function htf, uint64_t key, uint64_t NrA
         calc_crc(&crc, uid2, 8);
         calc_crc(&crc, uid3, 8);
         calc_crc(&crc, uid4, 8);
+        
         for (i = 0; i < 100; i++) {
             response_bit[i] = 0;
         }
+        
         for (i = 0; i < 5; i++) {
             response_bit[i] = 0;
         }
+        
         for (i = 5; i < 37; i++) {
             response_bit[i] = uid[i - 5];
         }
+        
         for (j = 0; j < 8; j++) {
             response_bit[i] = 0;
             if ((crc & ((mask << 7) >> j)) != 0)
                 response_bit[i] = 1;
             i++;
         }
+        
         k = 0;
         for (i = 0; i < 6; i++) {
-            tx[i] = (response_bit[k] << 7) | (response_bit[k + 1] << 6)
-                    | (response_bit[k + 2] << 5) | (response_bit[k + 3] << 4)
-                    | (response_bit[k + 4] << 3) | (response_bit[k + 5] << 2)
-                    | (response_bit[k + 6] << 1) | response_bit[k + 7];
+            tx[i] = (response_bit[k] << 7)
+                  | (response_bit[k + 1] << 6)
+                  | (response_bit[k + 2] << 5)
+                  | (response_bit[k + 3] << 4)
+                  | (response_bit[k + 4] << 3)
+                  | (response_bit[k + 5] << 2)
+                  | (response_bit[k + 6] << 1)
+                  | response_bit[k + 7];
+                  
             k += 8;
         }
+        
         tag.pstate = HT_INIT;
     } else if (tag.pstate == HT_INIT && rxlen == 44) {
         // received configuration after select command
@@ -847,18 +810,17 @@ static int hitagS_handle_tag_auth(hitag_function htf, uint64_t key, uint64_t NrA
         tag.LCK0 = response_bit[27];
 
         if (DEBUG)
-            Dbprintf("conf0: %02X conf1: %02X conf2: %02X", conf_pages[0],
-                     conf_pages[1], conf_pages[2]);
+            Dbprintf("conf0: %02X conf1: %02X conf2: %02X", conf_pages[0], conf_pages[1], conf_pages[2]);
+                     
         if (tag.auth == 1) {
             //if the tag is in authentication mode try the key or challenge
             *txlen = 64;
             if (end != true) {
                 if (htf == 02 || htf == 04) { //RHTS_KEY //WHTS_KEY
-                    state = hitag2_init(rev64(key), rev32(tag.uid),
-                                        rev32(rnd));
+                    state = _hitag2_init(REV64(key), REV32(tag.uid), REV32(rnd));
 
                     for (i = 0; i < 4; i++) {
-                        auth_ks[i] = hitag2_byte(&state) ^ 0xff;
+                        auth_ks[i] = _hitag2_byte(&state) ^ 0xff;
                     }
                     *txlen = 64;
                     tx[0] = rnd & 0xff;
@@ -906,21 +868,18 @@ static int hitagS_handle_tag_auth(hitag_function htf, uint64_t key, uint64_t NrA
         pwdl1 = 0;
         if (htf == 02 || htf == 04) { //RHTS_KEY //WHTS_KEY
             {
-                state = hitag2_init(rev64(key), rev32(tag.uid), rev32(rnd));
+                state = _hitag2_init(REV64(key), REV32(tag.uid), REV32(rnd));
                 for (i = 0; i < 5; i++)
-                    hitag2_byte(&state);
-                pwdh0 = ((rx[1] & 0x0f) * 16 + ((rx[2] & 0xf0) / 16))
-                        ^ hitag2_byte(&state);
-                pwdl0 = ((rx[2] & 0x0f) * 16 + ((rx[3] & 0xf0) / 16))
-                        ^ hitag2_byte(&state);
-                pwdl1 = ((rx[3] & 0x0f) * 16 + ((rx[4] & 0xf0) / 16))
-                        ^ hitag2_byte(&state);
+                    _hitag2_byte(&state);
+                
+                pwdh0 = ((rx[1] & 0x0f) * 16 + ((rx[2] & 0xf0) / 16)) ^ _hitag2_byte(&state);
+                pwdl0 = ((rx[2] & 0x0f) * 16 + ((rx[3] & 0xf0) / 16)) ^ _hitag2_byte(&state);
+                pwdl1 = ((rx[3] & 0x0f) * 16 + ((rx[4] & 0xf0) / 16)) ^ _hitag2_byte(&state);
             }
 
             if (DEBUG)
                 Dbprintf("pwdh0 %02X pwdl0 %02X pwdl1 %02X", pwdh0, pwdl0, pwdl1);
 
-
             //Dbprintf("%X %02X", rnd, ((rx[4] & 0x0f) * 16) + ((rx[5] & 0xf0) / 16));
             //rnd += 1;
         }
@@ -933,18 +892,22 @@ static int hitagS_handle_tag_auth(hitag_function htf, uint64_t key, uint64_t NrA
 /*
  * Emulates a Hitag S Tag with the given data from the .hts file
  */
-void SimulateHitagSTag(bool tag_mem_supplied, byte_t *data) {
-    int frame_count;
-    int response;
-    int overflow;
+void SimulateHitagSTag(bool tag_mem_supplied, uint8_t *data) {
+    
+    StopTicks();
+        
+    int frame_count = 0, response = 0, overflow = 0;
     int i, j;
-    byte_t rx[HITAG_FRAME_LEN];
+    uint8_t rx[HITAG_FRAME_LEN];
     size_t rxlen = 0;
-    //bool bQuitTraceFull = false;
     bQuiet = false;
-    byte_t txbuf[HITAG_FRAME_LEN];
-    byte_t *tx = txbuf;
+    uint8_t txbuf[HITAG_FRAME_LEN];
+    uint8_t *tx = txbuf;
     size_t txlen = 0;
+
+    // Reset the received frame, frame count and timing info
+    memset(rx, 0x00, sizeof(rx));
+    
     // free eventually allocated BigBuf memory
     BigBuf_free();
     BigBuf_Clear_ext(false);
@@ -958,16 +921,18 @@ void SimulateHitagSTag(bool tag_mem_supplied, byte_t *data) {
 
     tag.pstate = HT_READY;
     tag.tstate = HT_NO_OP;
+
     for (i = 0; i < 16; i++)
         for (j = 0; j < 4; j++)
             tag.pages[i][j] = 0x0;
-    //read tag data into memory
+
+    // read tag data into memory
     if (tag_mem_supplied) {
         DbpString("Loading hitagS memory...");
-        memcpy((byte_t *)tag.pages, data, 4 * 64);
+        memcpy((uint8_t *)tag.pages, data, 4 * 64);
     }
+    
     tag.uid = (uint32_t)tag.pages[0];
-    Dbprintf("Hitag S simulation started");
     tag.key = (intptr_t)tag.pages[3];
     tag.key <<= 16;
     tag.key += ((tag.pages[2][0]) << 8) + tag.pages[2][1];
@@ -1017,48 +982,48 @@ void SimulateHitagSTag(bool tag_mem_supplied, byte_t *data) {
     if ((tag.pages[1][1] & 0x1) == 0x01)
         tag.LCK0 = 1;
 
-// Set up simulator mode, frequency divisor which will drive the FPGA
-// and analog mux selection.
+    // Set up simulator mode, frequency divisor which will drive the FPGA
+    // and analog mux selection.
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
     FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT);
-    SpinDelay(20);
     FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
     SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
-    RELAY_OFF();
 
-// Configure output pin that is connected to the FPGA (for modulating)
+    // Configure output pin that is connected to the FPGA (for modulating)
     AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
     AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
 
-// Disable modulation at default, which means release resistance
+    // Disable modulation at default, which means release resistance
     LOW(GPIO_SSC_DOUT);
 
-// Enable Peripheral Clock for TIMER_CLOCK0, used to measure exact timing before answering
-    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC0);
-
-// Enable Peripheral Clock for TIMER_CLOCK1, used to capture edges of the reader frames
-    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC1);
+    // Enable Peripheral Clock for 
+    //   TIMER_CLOCK0, used to measure exact timing before answering
+    //   TIMER_CLOCK1, used to capture edges of the tag frames    
+    AT91C_BASE_PMC->PMC_PCER |= (1 << AT91C_ID_TC0) | (1 << AT91C_ID_TC1);
+    
     AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
 
-// Disable timer during configuration
+    // Disable timer during configuration
+    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 
-// Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
-// external trigger rising edge, load RA on rising edge of TIOA.
+    // TC0: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), no triggers
+	AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK;
+    
+    // TC1: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
+    // external trigger rising edge, load RA on rising edge of TIOA.
     AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK
                              | AT91C_TC_ETRGEDG_RISING | AT91C_TC_ABETRG | AT91C_TC_LDRA_RISING;
 
-// Reset the received frame, frame count and timing info
-    memset(rx, 0x00, sizeof(rx));
-    frame_count = 0;
-    response = 0;
-    overflow = 0;
-
-// Enable and reset counter
+    // Enable and reset counter
+    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;    
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
-    while (!BUTTON_PRESS()) {
-        // Watchdog hit
+    // synchronized startup procedure
+    while (AT91C_BASE_TC0->TC_CV > 0); // wait until TC0 returned to zero    
+    
+    while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
+
         WDT_HIT();
 
         // Receive frame, watch for at most T0*EOF periods
@@ -1098,12 +1063,7 @@ void SimulateHitagSTag(bool tag_mem_supplied, byte_t *data) {
         // Check if frame was captured
         if (rxlen > 0) {
             frame_count++;
-            if (!bQuiet) {
-                if (!LogTraceHitag(rx, rxlen, response, 0, true)) {
-                    DbpString("Trace full");
-                    clear_trace();
-                }
-            }
+            LogTraceHitag(rx, rxlen, response, 0, true);
 
             // Disable timer 1 with external trigger to avoid triggers during our own modulation
             AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
@@ -1116,20 +1076,13 @@ void SimulateHitagSTag(bool tag_mem_supplied, byte_t *data) {
             // with respect to the falling edge, we need to wait actually (T_Wait1 - T_Low)
             // periods. The gap time T_Low varies (4..10). All timer values are in
             // terms of T0 units
-            while (AT91C_BASE_TC0->TC_CV < T0 * (HITAG_T_WAIT_1 - HITAG_T_LOW))
-                ;
+            while (AT91C_BASE_TC0->TC_CV < T0 * (HITAG_T_WAIT_1 - HITAG_T_LOW)) {};
 
             // Send and store the tag answer (if there is any)
             if (txlen > 0) {
                 // Transmit the tag frame
                 hitag_send_frame(tx, txlen);
-                // Store the frame in the trace
-                if (!bQuiet) {
-                    if (!LogTraceHitag(tx, txlen, 0, 0, false)) {
-                        DbpString("Trace full");
-                        clear_trace();
-                    }
-                }
+                LogTraceHitag(tx, txlen, 0, 0, false);
             }
 
             // Reset the received frame and response timing info
@@ -1147,11 +1100,19 @@ void SimulateHitagSTag(bool tag_mem_supplied, byte_t *data) {
         // Reset the timer to restart while-loop that receives frames
         AT91C_BASE_TC1->TC_CCR = AT91C_TC_SWTRG;
     }
-    LED_B_OFF();
-    LED_D_OFF();
+    
+    LEDsoff();
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    set_tracing(false);
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
-    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+
+    // release allocated memory from BigBuff.
+    BigBuf_free();
+  
+    StartTicks();
+    
+    DbpString("Sim Stopped");    
 }
 
 /*
@@ -1160,22 +1121,23 @@ void SimulateHitagSTag(bool tag_mem_supplied, byte_t *data) {
  * Reads every page of a hitag S transpoder.
  */
 void ReadHitagS(hitag_function htf, hitag_data *htd) {
+
+    StopTicks();
+    
     int i, j, z, k;
-    int frame_count;
+    int frame_count = 0, response = 0;
     int response_bit[200];
-    int response;
-    byte_t rx[HITAG_FRAME_LEN];
+    uint8_t rx[HITAG_FRAME_LEN];
     size_t rxlen = 0;
-    byte_t txbuf[HITAG_FRAME_LEN];
-    byte_t *tx = txbuf;
+    uint8_t txbuf[HITAG_FRAME_LEN];
+    uint8_t *tx = txbuf;
     size_t txlen = 0;
-    int lastbit;
+    int lastbit = 1;
     bool bSkip;
-    int reset_sof;
+    int reset_sof = 1;
     int tag_sof;
     int t_wait = HITAG_T_WAIT_MAX;
     bool bStop = false;
-    bool bQuitTraceFull = false;
     int sendNum = 0;
     unsigned char mask = 1;
     unsigned char crc;
@@ -1183,31 +1145,31 @@ void ReadHitagS(hitag_function htf, hitag_data *htd) {
     page_to_be_written = 0;
 
     //read given key/challenge
-    byte_t NrAr_[8];
+    uint8_t NrAr_[8];
     uint64_t key = 0;
     uint64_t NrAr = 0;
-    byte_t key_[6];
+    uint8_t key_[6];
+    
     switch (htf) {
-        case 01: { //RHTS_CHALLENGE
+        case RHTSF_CHALLENGE: {
             DbpString("Authenticating using nr,ar pair:");
             memcpy(NrAr_, htd->auth.NrAr, 8);
             Dbhexdump(8, NrAr_, false);
             NrAr = NrAr_[7] | ((uint64_t)NrAr_[6]) << 8 | ((uint64_t)NrAr_[5]) << 16 | ((uint64_t)NrAr_[4]) << 24 | ((uint64_t)NrAr_[3]) << 32 |
                    ((uint64_t)NrAr_[2]) << 40 | ((uint64_t)NrAr_[1]) << 48 | ((uint64_t)NrAr_[0]) << 56;
+            break;                   
         }
-        break;
-        case 02: { //RHTS_KEY
+        case RHTSF_KEY: {
             DbpString("Authenticating using key:");
             memcpy(key_, htd->crypto.key, 6);
             Dbhexdump(6, key_, false);
             key = key_[5] | ((uint64_t)key_[4]) << 8 | ((uint64_t)key_[3]) << 16 | ((uint64_t)key_[2]) << 24 | ((uint64_t)key_[1]) << 32 | ((uint64_t)key_[0]) << 40;
+            break;
         }
-        break;
         default: {
             Dbprintf("Error , unknown function: %d", htf);
             return;
         }
-        break;
     }
 
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
@@ -1219,40 +1181,36 @@ void ReadHitagS(hitag_function htf, hitag_data *htd) {
     clear_trace();
 
     bQuiet = false;
-    bQuitTraceFull = true;
 
     LED_D_ON();
 
-    // Configure output and enable pin that is connected to the FPGA (for modulating)
-    AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
-    AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
-
     // Set fpga in edge detect with reader field, we can modulate as reader now
-    FpgaWriteConfWord(
-        FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_READER_FIELD);
-
-    // Set Frequency divisor which will drive the FPGA and analog mux selection
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_READER_FIELD);
     FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
     SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
-    RELAY_OFF();
-
+    
+    // Configure output and enable pin that is connected to the FPGA (for modulating)
+    AT91C_BASE_PIOA->PIO_OER |= GPIO_SSC_DOUT;
+    AT91C_BASE_PIOA->PIO_PER |= GPIO_SSC_DOUT;
+    
     // Disable modulation at default, which means enable the field
     LOW(GPIO_SSC_DOUT);
 
-    // Give it a bit of time for the resonant antenna to settle.
-    SpinDelay(30);
+    // Enable Peripheral Clock for 
+    //   TIMER_CLOCK0, used to measure exact timing before answering
+    //   TIMER_CLOCK1, used to capture edges of the tag frames    
+    AT91C_BASE_PMC->PMC_PCER |= (1 << AT91C_ID_TC0) | (1 << AT91C_ID_TC1);
 
-    // Enable Peripheral Clock for TIMER_CLOCK0, used to measure exact timing before answering
-    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC0);
-
-    // Enable Peripheral Clock for TIMER_CLOCK1, used to capture edges of the tag frames
-    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC1);
     AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
 
     // Disable timer during configuration
+    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 
-    // Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
+    // TC0: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), no triggers
+	AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK;
+    
+    // TC1: Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
     // external trigger rising edge, load RA on falling edge of TIOA.
     AT91C_BASE_TC1->TC_CMR =
         AT91C_TC_CLKS_TIMER_DIV1_CLOCK  |
@@ -1264,32 +1222,20 @@ void ReadHitagS(hitag_function htf, hitag_data *htd) {
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
+    // synchronized startup procedure
+    while (AT91C_BASE_TC0->TC_CV > 0); // wait until TC0 returned to zero
+    
     // Reset the received frame, frame count and timing info
-    frame_count = 0;
-    response = 0;
-    lastbit = 1;
-    bStop = false;
-
-    reset_sof = 1;
     t_wait = 200;
 
-    while (!bStop && !BUTTON_PRESS()) {
-        // Watchdog hit
+    while (!bStop && !BUTTON_PRESS() && !usb_poll_validate_length())  {
+
         WDT_HIT();
 
         // Check if frame was captured and store it
         if (rxlen > 0) {
             frame_count++;
-            if (!bQuiet) {
-                if (!LogTraceHitag(rx, rxlen, response, 0, false)) {
-                    DbpString("Trace full");
-                    if (bQuitTraceFull) {
-                        break;
-                    } else {
-                        bQuiet = true;
-                    }
-                }
-            }
+            LogTraceHitag(rx, rxlen, response, 0, false);
         }
 
         // By default reset the transmission buffer
@@ -1299,13 +1245,14 @@ void ReadHitagS(hitag_function htf, hitag_data *htd) {
         if (rxlen == 0) {
             //start authentication
             txlen = 5;
-            memcpy(tx, "\xc0", nbytes(txlen));
+            memcpy(tx, "\xC0", nbytes(txlen));
             tag.pstate = HT_READY;
             tag.tstate = HT_NO_OP;
         } else if (tag.pstate != HT_SELECTED) {
             if (hitagS_handle_tag_auth(htf, key, NrAr, rx, rxlen, tx, &txlen) == -1)
                 bStop = !false;
         }
+        
         if (tag.pstate == HT_SELECTED && tag.tstate == HT_NO_OP && rxlen > 0) {
             //send read request
             tag.tstate = HT_READING_PAGE;
@@ -1316,8 +1263,9 @@ void ReadHitagS(hitag_function htf, hitag_data *htd) {
             calc_crc(&crc, 0x00 + ((sendNum % 16) * 16), 4);
             tx[1] = 0x00 + ((sendNum % 16) * 16) + (crc / 16);
             tx[2] = 0x00 + (crc % 16) * 16;
-        } else if (tag.pstate == HT_SELECTED && tag.tstate == HT_READING_PAGE
-                   && rxlen > 0) {
+        } else if (tag.pstate == HT_SELECTED 
+                    && tag.tstate == HT_READING_PAGE
+                    && rxlen > 0) {
             //save received data
             z = 0;
             for (i = 0; i < 5; i++) {
@@ -1361,15 +1309,19 @@ void ReadHitagS(hitag_function htf, hitag_data *htd) {
             sendNum++;
             //display key and password if possible
             if (sendNum == 2 && tag.auth == 1 && tag.LKP) {
-                if (htf == 02) { //RHTS_KEY
+                if (htf == RHTSF_KEY) {
                     Dbprintf("Page[ 2]: %02X %02X %02X %02X",
-                             (byte_t)(key >> 8) & 0xff,
-                             (byte_t) key & 0xff, pwdl1, pwdl0);
+                             (uint8_t)(key >> 8) & 0xff,
+                             (uint8_t) key & 0xff,
+                             pwdl1,
+                             pwdl0
+                         );
                     Dbprintf("Page[ 3]: %02X %02X %02X %02X",
-                             (byte_t)(key >> 40) & 0xff,
-                             (byte_t)(key >> 32) & 0xff,
-                             (byte_t)(key >> 24) & 0xff,
-                             (byte_t)(key >> 16) & 0xff);
+                             (uint8_t)(key >> 40) & 0xff,
+                             (uint8_t)(key >> 32) & 0xff,
+                             (uint8_t)(key >> 24) & 0xff,
+                             (uint8_t)(key >> 16) & 0xff
+                        );
                 } else {
                     //if the authentication is done with a challenge the key and password are unknown
                     Dbprintf("Page[ 2]: __ __ __ __");
@@ -1410,17 +1362,7 @@ void ReadHitagS(hitag_function htf, hitag_data *htd) {
         // Add transmitted frame to total count
         if (txlen > 0) {
             frame_count++;
-            if (!bQuiet) {
-                // Store the frame in the trace
-                if (!LogTraceHitag(tx, txlen, HITAG_T_WAIT_2, 0, true)) {
-                    if (bQuitTraceFull) {
-                        DbpString("Trace full");
-                        break;
-                    } else {
-                        bQuiet = true;
-                    }
-                }
-            }
+            LogTraceHitag(tx, txlen, HITAG_T_WAIT_2, 0, true);
         }
 
         // Reset values for receiving frames
@@ -1491,12 +1433,17 @@ void ReadHitagS(hitag_function htf, hitag_data *htd) {
         }
     }
     end = false;
-    LED_B_OFF();
-    LED_D_OFF();
+
+    LEDsoff();
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    set_tracing(false);
+    
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 
+    StartTicks();
+        
     cmd_send(CMD_ACK, bSuccessful, 0, 0, 0, 0);
 }
 
@@ -1505,12 +1452,14 @@ void ReadHitagS(hitag_function htf, hitag_data *htd) {
  * Writes the given 32Bit data into page_
  */
 void WritePageHitagS(hitag_function htf, hitag_data *htd, int page_) {
-    int frame_count;
-    int response;
-    byte_t rx[HITAG_FRAME_LEN];
+    
+    StopTicks();
+    
+    int frame_count = 0, response = 0;
+    uint8_t rx[HITAG_FRAME_LEN];
     size_t rxlen = 0;
-    byte_t txbuf[HITAG_FRAME_LEN];
-    byte_t *tx = txbuf;
+    uint8_t txbuf[HITAG_FRAME_LEN];
+    uint8_t *tx = txbuf;
     size_t txlen = 0;
     int lastbit;
     bool bSkip;
@@ -1518,124 +1467,106 @@ void WritePageHitagS(hitag_function htf, hitag_data *htd, int page_) {
     int tag_sof;
     int t_wait = HITAG_T_WAIT_MAX;
     bool bStop;
-    bool bQuitTraceFull = false;
     int page = page_;
     unsigned char crc;
-    byte_t data[4] = {0, 0, 0, 0};
+    uint8_t data[4] = {0, 0, 0, 0};
 
+    FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
+
+    bSuccessful = false;
+    
+    // Clean up trace and prepare it for storing frames
+    set_tracing(true);
+    clear_trace();
+    
     //read given key/challenge, the page and the data
-    byte_t NrAr_[8];
+    uint8_t NrAr_[8];
     uint64_t key = 0;
     uint64_t NrAr = 0;
-    byte_t key_[6];
+    uint8_t key_[6];
     switch (htf) {
-        case 03: { //WHTS_CHALLENGE
+        case WHTSF_CHALLENGE: {
             memcpy(data, htd->auth.data, 4);
             DbpString("Authenticating using nr,ar pair:");
             memcpy(NrAr_, htd->auth.NrAr, 8);
             Dbhexdump(8, NrAr_, false);
             NrAr = NrAr_[7] | ((uint64_t)NrAr_[6]) << 8 | ((uint64_t)NrAr_[5]) << 16 | ((uint64_t)NrAr_[4]) << 24 | ((uint64_t)NrAr_[3]) << 32 |
                    ((uint64_t)NrAr_[2]) << 40 | ((uint64_t)NrAr_[1]) << 48 | ((uint64_t)NrAr_[0]) << 56;
+            break;
         }
-        break;
-        case 04: { //WHTS_KEY
+
+        case WHTSF_KEY: {
             memcpy(data, htd->crypto.data, 4);
             DbpString("Authenticating using key:");
             memcpy(key_, htd->crypto.key, 6);
             Dbhexdump(6, key_, false);
             key = key_[5] | ((uint64_t)key_[4]) << 8 | ((uint64_t)key_[3]) << 16 | ((uint64_t)key_[2]) << 24 | ((uint64_t)key_[1]) << 32 | ((uint64_t)key_[0]) << 40;
+            break;
         }
-        break;
         default: {
             Dbprintf("Error , unknown function: %d", htf);
             return;
         }
-        break;
     }
 
     Dbprintf("Page: %d", page_);
     Dbprintf("DATA: %02X %02X %02X %02X", data[0], data[1], data[2], data[3]);
-    FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-// Reset the return status
-    bSuccessful = false;
 
     tag.pstate = HT_READY;
     tag.tstate = HT_NO_OP;
 
-// Clean up trace and prepare it for storing frames
-    set_tracing(true);
-    clear_trace();
-
-    bQuiet = false;
-    bQuitTraceFull = true;
-
     LED_D_ON();
 
-// Configure output and enable pin that is connected to the FPGA (for modulating)
+    // Configure output and enable pin that is connected to the FPGA (for modulating)
     AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
     AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
 
-// Set fpga in edge detect with reader field, we can modulate as reader now
-    FpgaWriteConfWord(
-        FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_READER_FIELD);
-
-// Set Frequency divisor which will drive the FPGA and analog mux selection
+    // Set fpga in edge detect with reader field, we can modulate as reader now
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_READER_FIELD);
     FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
     SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
-    RELAY_OFF();
 
-// Disable modulation at default, which means enable the field
+    // Disable modulation at default, which means enable the field
     LOW(GPIO_SSC_DOUT);
 
-// Give it a bit of time for the resonant antenna to settle.
-    SpinDelay(30);
-
-// Enable Peripheral Clock for TIMER_CLOCK0, used to measure exact timing before answering
-    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC0);
-
-// Enable Peripheral Clock for TIMER_CLOCK1, used to capture edges of the tag frames
-    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC1);
+    // Enable Peripheral Clock for 
+    //   TIMER_CLOCK0, used to measure exact timing before answering
+    //   TIMER_CLOCK1, used to capture edges of the tag frames
+    AT91C_BASE_PMC->PMC_PCER |= (1 << AT91C_ID_TC0) | (1 << AT91C_ID_TC1);
+    
     AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
 
-// Disable timer during configuration
+    // Disable timer during configuration
+    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 
-// Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
-// external trigger rising edge, load RA on falling edge of TIOA.
+    // Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
+    // external trigger rising edge, load RA on falling edge of TIOA.
     AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK
-                             | AT91C_TC_ETRGEDG_FALLING | AT91C_TC_ABETRG
+                             | AT91C_TC_ETRGEDG_FALLING
+                             | AT91C_TC_ABETRG
                              | AT91C_TC_LDRA_FALLING;
 
-// Enable and reset counters
+    // Enable and reset counters
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
-// Reset the received frame, frame count and timing info
-    frame_count = 0;
-    response = 0;
+    while (AT91C_BASE_TC0->TC_CV > 0);
+        
+    // Reset the received frame, frame count and timing info
     lastbit = 1;
     bStop = false;
-
     reset_sof = 1;
     t_wait = 200;
 
-    while (!bStop && !BUTTON_PRESS()) {
-        // Watchdog hit
+    while (!bStop && !BUTTON_PRESS() && !usb_poll_validate_length()) {
+
         WDT_HIT();
 
         // Check if frame was captured and store it
         if (rxlen > 0) {
             frame_count++;
-            if (!bQuiet) {
-                if (!LogTraceHitag(rx, rxlen, response, 0, false)) {
-                    DbpString("Trace full");
-                    if (bQuitTraceFull) {
-                        break;
-                    } else {
-                        bQuiet = true;
-                    }
-                }
-            }
+            LogTraceHitag(rx, rxlen, response, 0, false);
         }
 
         //check for valid input
@@ -1711,9 +1642,7 @@ void WritePageHitagS(hitag_function htf, hitag_data *htd, int page_) {
         // we need to wait (T_Wait2 + half_tag_period) when the last was a 'one'.
         // All timer values are in terms of T0 units
 
-        while (AT91C_BASE_TC0->TC_CV
-                < T0 * (t_wait + (HITAG_T_TAG_HALF_PERIOD * lastbit)))
-            ;
+        while (AT91C_BASE_TC0->TC_CV < T0 * (t_wait + (HITAG_T_TAG_HALF_PERIOD * lastbit))) {};
 
         // Transmit the reader frame
         hitag_reader_send_frame(tx, txlen);
@@ -1724,17 +1653,7 @@ void WritePageHitagS(hitag_function htf, hitag_data *htd, int page_) {
         // Add transmitted frame to total count
         if (txlen > 0) {
             frame_count++;
-            if (!bQuiet) {
-                // Store the frame in the trace
-                if (!LogTraceHitag(tx, txlen, HITAG_T_WAIT_2, 0, true)) {
-                    if (bQuitTraceFull) {
-                        DbpString("Trace full");
-                        break;
-                    } else {
-                        bQuiet = true;
-                    }
-                }
-            }
+            LogTraceHitag(tx, txlen, HITAG_T_WAIT_2, 0, true);
         }
 
         // Reset values for receiving frames
@@ -1744,7 +1663,8 @@ void WritePageHitagS(hitag_function htf, hitag_data *htd, int page_) {
         bSkip = true;
         tag_sof = reset_sof;
         response = 0;
-
+        uint32_t errorCount = 0;
+        
         // Receive frame, watch for at most T0*EOF periods
         while (AT91C_BASE_TC1->TC_CV < T0 * HITAG_T_WAIT_MAX) {
             // Check if falling edge in tag modulation is detected
@@ -1794,9 +1714,13 @@ void WritePageHitagS(hitag_function htf, hitag_data *htd, int page_) {
                     }
                 } else {
                     // Ignore wierd value, is to small to mean anything
+                    errorCount++;                    
                 }
             }
-
+            
+            // if we saw over 100 wierd values break it probably isn't hitag...
+            if (errorCount > 100) break;
+            
             // We can break this loop if we received the last bit from a frame
             if (AT91C_BASE_TC1->TC_CV > T0 * HITAG_T_EOF) {
                 if (rxlen > 0)
@@ -1805,11 +1729,15 @@ void WritePageHitagS(hitag_function htf, hitag_data *htd, int page_) {
         }
     }
     end = false;
-    LED_B_OFF();
-    LED_D_OFF();
+    LEDsoff();
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    set_tracing(false);
+    
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
-    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    
+    StartTicks();
+        
     cmd_send(CMD_ACK, bSuccessful, 0, 0, 0, 0);
 }
 
@@ -1820,17 +1748,16 @@ void WritePageHitagS(hitag_function htf, hitag_data *htd, int page_) {
  * is not received correctly due to Antenna problems. This function
  * detects these challenges.
  */
-void check_challenges(bool file_given, byte_t *data) {
+void check_challenges(bool file_given, uint8_t *data) {
     int i, j, z, k;
-    byte_t uid_byte[4];
-    int frame_count;
-    int response;
-    byte_t rx[HITAG_FRAME_LEN];
-    byte_t unlocker[60][8];
+    uint8_t uid_byte[4];
+    int frame_count = 0, response = 0;
+    uint8_t rx[HITAG_FRAME_LEN];
+    uint8_t unlocker[60][8];
     int u1 = 0;
     size_t rxlen = 0;
-    byte_t txbuf[HITAG_FRAME_LEN];
-    byte_t *tx = txbuf;
+    uint8_t txbuf[HITAG_FRAME_LEN];
+    uint8_t *tx = txbuf;
     size_t txlen = 0;
     int lastbit;
     bool bSkip;
@@ -1839,76 +1766,71 @@ void check_challenges(bool file_given, byte_t *data) {
     int t_wait = HITAG_T_WAIT_MAX;
     int STATE = 0;
     bool bStop;
-    bool bQuitTraceFull = false;
     int response_bit[200];
     unsigned char mask = 1;
     unsigned char uid[32];
     unsigned char crc;
 
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-// Reset the return status
+    // Reset the return status
     bSuccessful = false;
 
-// Clean up trace and prepare it for storing frames
+    // Clean up trace and prepare it for storing frames
     set_tracing(true);
     clear_trace();
 
     bQuiet = false;
-    bQuitTraceFull = true;
 
     LED_D_ON();
 
-// Configure output and enable pin that is connected to the FPGA (for modulating)
+    // Configure output and enable pin that is connected to the FPGA (for modulating)
     AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
     AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
 
-// Set fpga in edge detect with reader field, we can modulate as reader now
+    // Set fpga in edge detect with reader field, we can modulate as reader now
     FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_READER_FIELD);
-    SpinDelay(50);
-
-// Set Frequency divisor which will drive the FPGA and analog mux selection
     FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
     SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
-    RELAY_OFF();
 
-// Disable modulation at default, which means enable the field
+    // Disable modulation at default, which means enable the field
     LOW(GPIO_SSC_DOUT);
 
-// Give it a bit of time for the resonant antenna to settle.
-    SpinDelay(30);
+    // Enable Peripheral Clock for 
+    //   TIMER_CLOCK0, used to measure exact timing before answering
+    //   TIMER_CLOCK1, used to capture edges of the tag frames
+    AT91C_BASE_PMC->PMC_PCER |= (1 << AT91C_ID_TC0) | (1 << AT91C_ID_TC1);
 
-// Enable Peripheral Clock for TIMER_CLOCK0, used to measure exact timing before answering
-    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC0);
-
-// Enable Peripheral Clock for TIMER_CLOCK1, used to capture edges of the tag frames
-    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC1);
     AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
 
-// Disable timer during configuration
+    // Disable timer during configuration
+    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 
-// Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
-// external trigger rising edge, load RA on falling edge of TIOA.
+    // TC0: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), no triggers
+	AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK;    
+
+    // TC1:  Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
+    // external trigger rising edge, load RA on falling edge of TIOA.
     AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK
+                             | AT91C_TC_ETRGEDG_FALLING
+                             | AT91C_TC_ABETRG
+                             | AT91C_TC_LDRA_FALLING;
 
-                             | AT91C_TC_ETRGEDG_FALLING | AT91C_TC_ABETRG | AT91C_TC_LDRA_FALLING;
-
-// Enable and reset counters
+    // Enable and reset counters
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
-// Reset the received frame, frame count and timing info
-    frame_count = 0;
-    response = 0;
+    while (AT91C_BASE_TC0->TC_CV > 0) {};
+    
+    // Reset the received frame, frame count and timing info
     lastbit = 1;
     bStop = false;
-
     reset_sof = 1;
     t_wait = 200;
 
     if (file_given) {
         DbpString("Loading challenges...");
-        memcpy((byte_t *)unlocker, data, 60 * 8);
+        memcpy((uint8_t *)unlocker, data, 60 * 8);
     }
 
     while (file_given && !bStop && !BUTTON_PRESS()) {
@@ -1918,16 +1840,7 @@ void check_challenges(bool file_given, byte_t *data) {
         // Check if frame was captured and store it
         if (rxlen > 0) {
             frame_count++;
-            if (!bQuiet) {
-                if (!LogTraceHitag(rx, rxlen, response, 0, false)) {
-                    DbpString("Trace full");
-                    if (bQuitTraceFull) {
-                        break;
-                    } else {
-                        bQuiet = true;
-                    }
-                }
-            }
+            LogTraceHitag(rx, rxlen, response, 0, false);                    
         }
 
         tx = txbuf;
@@ -1943,7 +1856,7 @@ void check_challenges(bool file_given, byte_t *data) {
             STATE = 0;
             txlen = 5;
             //start new authentication
-            memcpy(tx, "\xc0", nbytes(txlen));
+            memcpy(tx, "\xC0", nbytes(txlen));
         } else if (rxlen >= 67 && STATE == 0) {
             //received uid
             z = 0;
@@ -2043,9 +1956,7 @@ void check_challenges(bool file_given, byte_t *data) {
         // we need to wait (T_Wait2 + half_tag_period) when the last was a 'one'.
         // All timer values are in terms of T0 units
 
-        while (AT91C_BASE_TC0->TC_CV
-                < T0 * (t_wait + (HITAG_T_TAG_HALF_PERIOD * lastbit)))
-            ;
+        while (AT91C_BASE_TC0->TC_CV < T0 * (t_wait + (HITAG_T_TAG_HALF_PERIOD * lastbit))) {};
 
         // Transmit the reader frame
         hitag_reader_send_frame(tx, txlen);
@@ -2056,17 +1967,7 @@ void check_challenges(bool file_given, byte_t *data) {
         // Add transmitted frame to total count
         if (txlen > 0) {
             frame_count++;
-            if (!bQuiet) {
-                // Store the frame in the trace
-                if (!LogTraceHitag(tx, txlen, HITAG_T_WAIT_2, 0, true)) {
-                    if (bQuitTraceFull) {
-                        DbpString("Trace full");
-                        break;
-                    } else {
-                        bQuiet = true;
-                    }
-                }
-            }
+            LogTraceHitag(tx, txlen, HITAG_T_WAIT_2, 0, true);
         }
 
         // Reset values for receiving frames
@@ -2136,11 +2037,16 @@ void check_challenges(bool file_given, byte_t *data) {
             }
         }
     }
-    LED_B_OFF();
-    LED_D_OFF();
+
+    LEDsoff();
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    set_tracing(false);
+
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
-    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    
+    StartTicks();
+    
     cmd_send(CMD_ACK, bSuccessful, 0, 0, 0, 0);
 }
 
diff --git a/armsrc/hitagS.h b/armsrc/hitagS.h
new file mode 100644
index 000000000..49a885c4c
--- /dev/null
+++ b/armsrc/hitagS.h
@@ -0,0 +1,31 @@
+//-----------------------------------------------------------------------------
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// HitagS emulation (preliminary test version)
+//
+// (c) 2016 Oguzhan Cicek, Hendrik Schwartke, Ralf Spenneberg
+//     <info@os-s.de>
+//-----------------------------------------------------------------------------
+
+#ifndef _HITAGS_H_
+#define _HITAGS_H_
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include "hitag2_crypto.h"
+#include "hitag.h"
+#include "proxmark3.h"
+#include "apps.h"
+#include "util.h"
+#include "string.h"
+#include "BigBuf.h"
+
+void SimulateHitagSTag(bool tag_mem_supplied, uint8_t *data);
+void ReadHitagS(hitag_function htf, hitag_data *htd);
+void WritePageHitagS(hitag_function htf, hitag_data *htd, int page);
+void check_challenges(bool file_given, uint8_t *data);
+
+#endif
diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index 53d4d5036..9bbe167ee 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -17,8 +17,7 @@
 #include "common.h"
 #include "util.h"
 #include "parity.h"
-#include "hitag2.h"
-#include "hitagS.h"
+#include "hitag.h"
 #include "util_posix.h"
 #include "comms.h"
 #include "cmddata.h"
diff --git a/include/hitag.h b/include/hitag.h
new file mode 100644
index 000000000..209556b65
--- /dev/null
+++ b/include/hitag.h
@@ -0,0 +1,117 @@
+//-----------------------------------------------------------------------------
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// Hitag2, HitagS
+//
+// (c) 2012 Roel Verdult
+// (c) 2016 Oguzhan Cicek, Hendrik Schwartke, Ralf Spenneberg
+//     <info@os-s.de>
+//-----------------------------------------------------------------------------
+
+
+#ifndef HITAG_H__
+#define HITAG_H__
+
+#ifdef _MSC_VER
+#define PACKED
+#else
+#define PACKED __attribute__((packed))
+#endif
+
+typedef enum {
+	RHTSF_CHALLENGE           = 01,
+	RHTSF_KEY                 = 02,
+	WHTSF_CHALLENGE           = 03,
+	WHTSF_KEY                 = 04,
+	RHT2F_PASSWORD            = 21,
+	RHT2F_AUTHENTICATE        = 22,
+	RHT2F_CRYPTO              = 23,
+	WHT2F_CRYPTO              = 24,
+	RHT2F_TEST_AUTH_ATTEMPTS  = 25,
+	RHT2F_UID_ONLY            = 26,
+} hitag_function;
+
+typedef struct {
+	uint8_t password[4];
+} PACKED rht2d_password;
+
+typedef struct {
+	uint8_t NrAr[8];
+	uint8_t data[4];
+} PACKED rht2d_authenticate;
+
+typedef struct {
+	uint8_t key[6];
+	uint8_t data[4];
+} PACKED rht2d_crypto;
+
+typedef union {
+	rht2d_password     pwd;
+	rht2d_authenticate auth;
+	rht2d_crypto       crypto;
+} hitag_data;
+
+
+//---------------------------------------------------------
+// Hitag S
+//---------------------------------------------------------
+// protocol-state
+typedef enum PROTO_STATE {
+    HT_READY = 0,
+    HT_INIT,
+    HT_AUTHENTICATE,
+    HT_SELECTED,
+    HT_QUIET,
+    HT_TTF,
+    HT_FAIL
+} PSTATE;
+
+typedef enum TAG_STATE {
+    HT_NO_OP = 0,
+    HT_READING_PAGE,
+    HT_WRITING_PAGE_ACK,
+    HT_WRITING_PAGE_DATA,
+    HT_WRITING_BLOCK_DATA
+} TSATE;
+
+//number of start-of-frame bits
+typedef enum SOF_TYPE {
+    HT_STANDARD = 0,
+    HT_ADVANCED,
+    HT_FAST_ADVANCED,
+    HT_ONE,
+    HT_NO_BITS
+} stype;                                             
+
+struct hitagS_tag {
+	PSTATE   pstate;  //protocol-state
+	TSATE    tstate;  //tag-state
+	uint32_t uid;
+	uint8_t  pages[64][4];
+	uint64_t key;
+	uint8_t  pwdl0, pwdl1, pwdh0;
+	//con0
+	int      max_page;
+	stype    mode;
+	//con1
+	bool     auth;   //0=Plain 1=Auth
+	bool     TTFC;   //Transponder Talks first coding. 0=Manchester 1=Biphase
+	int      TTFDR;  //data rate in TTF Mode
+	int      TTFM;   //the number of pages that are sent to the RWD
+	bool     LCON;   //0=con1/2 read write 1=con1 read only and con2 OTP
+	bool     LKP;    //0=page2/3 read write 1=page2/3 read only in Plain mode and no access in authenticate mode
+	//con2
+	//0=read write 1=read only
+	bool     LCK7;   //page4/5
+	bool     LCK6;   //page6/7
+	bool     LCK5;   //page8-11
+	bool     LCK4;   //page12-15
+	bool     LCK3;   //page16-23
+	bool     LCK2;   //page24-31
+	bool     LCK1;   //page32-47
+	bool     LCK0;   //page48-63
+};
+
+#endif
diff --git a/include/hitag2.h b/include/hitag2.h
deleted file mode 100644
index 96cfb7abb..000000000
--- a/include/hitag2.h
+++ /dev/null
@@ -1,55 +0,0 @@
-//-----------------------------------------------------------------------------
-// (c) 2012 Roel Verdult
-//
-// This code is licensed to you under the terms of the GNU GPL, version 2 or,
-// at your option, any later version. See the LICENSE.txt file for the text of
-// the license.
-//-----------------------------------------------------------------------------
-// Hitag2 type prototyping
-//-----------------------------------------------------------------------------
-// HitagS added
-//-----------------------------------------------------------------------------
-
-#ifndef _HITAG2_H_
-#define _HITAG2_H_
-
-#ifdef _MSC_VER
-#define PACKED
-#else
-#define PACKED __attribute__((packed))
-#endif
-
-typedef enum {
-    RHTSF_CHALLENGE           = 01,
-    RHTSF_KEY                 = 02,
-    WHTSF_CHALLENGE           = 03,
-    WHTSF_KEY                 = 04,
-    RHT2F_PASSWORD            = 21,
-    RHT2F_AUTHENTICATE        = 22,
-    RHT2F_CRYPTO              = 23,
-    WHT2F_CRYPTO              = 24,
-    RHT2F_TEST_AUTH_ATTEMPTS  = 25,
-    RHT2F_UID_ONLY            = 26,
-} hitag_function;
-
-typedef struct {
-    byte_t password[4];
-} PACKED rht2d_password;
-
-typedef struct {
-    byte_t NrAr[8];
-    byte_t data[4];
-} PACKED rht2d_authenticate;
-
-typedef struct {
-    byte_t key[6];
-    byte_t data[4];
-} PACKED rht2d_crypto;
-
-typedef union {
-    rht2d_password pwd;
-    rht2d_authenticate auth;
-    rht2d_crypto crypto;
-} hitag_data;
-
-#endif
diff --git a/include/hitagS.h b/include/hitagS.h
deleted file mode 100644
index a2f67e464..000000000
--- a/include/hitagS.h
+++ /dev/null
@@ -1,77 +0,0 @@
-//-----------------------------------------------------------------------------
-// This code is licensed to you under the terms of the GNU GPL, version 2 or,
-// at your option, any later version. See the LICENSE.txt file for the text of
-// the license.
-//-----------------------------------------------------------------------------
-// HitagS emulation (preliminary test version)
-//
-// (c) 2016 Oguzhan Cicek, Hendrik Schwartke, Ralf Spenneberg
-//     <info@os-s.de>
-//-----------------------------------------------------------------------------
-
-#include <stdlib.h>
-#include <string.h>
-#include <hitag2.h>
-
-#ifndef _HITAGS_H_
-#define _HITAGS_H_
-
-//protocol-state
-typedef enum PROTO_STATE {
-    HT_READY = 0,
-    HT_INIT,
-    HT_AUTHENTICATE,
-    HT_SELECTED,
-    HT_QUIET,
-    HT_TTF,
-    HT_FAIL
-} PSTATE;
-
-//tag-state
-typedef enum TAG_STATE {
-    HT_NO_OP = 0,
-    HT_READING_PAGE,
-    HT_WRITING_PAGE_ACK,
-    HT_WRITING_PAGE_DATA,
-    HT_WRITING_BLOCK_DATA
-} TSATE;
-
-//number of start-of-frame bits
-typedef enum SOF_TYPE {
-    HT_STANDARD = 0,
-    HT_ADVANCED,
-    HT_FAST_ADVANCED,
-    HT_ONE,
-    HT_NO_BITS
-} stype;
-
-struct hitagS_tag {
-    PSTATE pstate; //protocol-state
-    TSATE tstate;  //tag-state
-    uint32_t uid;
-    uint32_t pages[16][4];
-    uint64_t key;
-    byte_t pwdl0, pwdl1, pwdh0;
-    //con0
-    int max_page;
-    stype mode;
-    //con1
-    bool auth;  //0=Plain 1=Auth
-    bool TTFC;  //Transponder Talks first coding. 0=Manchester 1=Biphase
-    int TTFDR;  //data rate in TTF Mode
-    int TTFM;   //the number of pages that are sent to the RWD
-    bool LCON;  //0=con1/2 read write 1=con1 read only and con2 OTP
-    bool LKP;   //0=page2/3 read write 1=page2/3 read only in Plain mode and no access in authenticate mode
-    //con2
-    //0=read write 1=read only
-    bool LCK7; //page4/5
-    bool LCK6; //page6/7
-    bool LCK5; //page8-11
-    bool LCK4; //page12-15
-    bool LCK3; //page16-23
-    bool LCK2; //page24-31
-    bool LCK1; //page32-47
-    bool LCK0; //page48-63
-} ;
-
-#endif

From e4912b18137ab455acc2b702476fa8b04e8c0bc2 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 13 Mar 2019 12:38:07 +0100
Subject: [PATCH 0766/1938] CHG: adapt noice threshold,  my hitag has an
 amplitude of 11...

---
 common/lfdemod.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/lfdemod.h b/common/lfdemod.h
index 883393cc3..96a91363f 100644
--- a/common/lfdemod.h
+++ b/common/lfdemod.h
@@ -22,7 +22,7 @@
 #include "util.h"    // for ARRAYLEN
 
 //might not be high enough for noisy environments
-#define NOISE_AMPLITUDE_THRESHOLD 10
+#define NOISE_AMPLITUDE_THRESHOLD 15
 //ignore buffer with less than x samples
 #define SIGNAL_MIN_SAMPLES 100
 //ignore first x samples of the buffer

From 7fb359ef8e94592c9c26b6206a5a5701b38affee Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 13 Mar 2019 12:38:21 +0100
Subject: [PATCH 0767/1938] text

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0d847f476..fb62a55b3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,9 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [unreleased][unreleased]
+ - Change 'lf hitag' - refactoring (@iceman)
+ - Change 'lf hitag' - refactoring (@piwi)
+ - Fix 'lf hitag' - generic fix for missing clock init (@piwi)
  - Fix fsk sim operations on deviceside - avoid division by zero (@doegox)
  - Fix 'hf mf fchk' - condition always false (@doegox)
  - Fix 'lf t55xx recoverpw' - shift as u32 (@doegox)

From 9e5f928d2782ff31c46cfffaf0213002b02e886f Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 13 Mar 2019 12:39:21 +0100
Subject: [PATCH 0768/1938] chg: ignore bash history

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 785934f46..9a12efbe5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 # don't push these files to the repository
 
 .history
+.bash_history
 *.log
 *.eml
 *.o

From a95ff04392e4220d0814074245292f1137ffc021 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 13 Mar 2019 12:46:03 +0100
Subject: [PATCH 0769/1938] Fix mem leak in flash mem read

---
 armsrc/appmain.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index f264e9f65..aecfee076 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1391,6 +1391,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
             FlashStop();
 
             cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
+            BigBuf_free();
             LED_B_OFF();
             break;
         }

From 174da2d51970016dc85dde6cecd9221e559db90d Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 13 Mar 2019 15:33:46 +0100
Subject: [PATCH 0770/1938] readme: sim011

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c8c04f852..3e0a2863d 100644
--- a/README.md
+++ b/README.md
@@ -298,7 +298,7 @@ Find version in the long output,  look for these two lines
 This version is obselete. The following command upgrades your device sim module firmware.
 Don't not turn of your device during the execution of this command.
 
-    pm3 --> sc upgrade f ../tools/simmodule/SIM010.BIN 
+    pm3 --> sc upgrade f ../tools/simmodule/SIM011.BIN 
     
 You get the following output,  this is a successful execution.    
     

From a1a04cb567b9a94e336c9b7bd2d3dea712c079f7 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 13 Mar 2019 16:00:15 +0100
Subject: [PATCH 0771/1938] readme: bump sim version

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3e0a2863d..cfdbacc61 100644
--- a/README.md
+++ b/README.md
@@ -286,7 +286,7 @@ You will need to run these commands to make sure your rdv4 is prepared
 
 ### Verify sim module firmware version
 To make sure you got the latest sim module firmware.
-_Lastest version is v3.10_
+_Lastest version is v3.11_
 
     pm3 --> hw status
 

From dda69c593a3e8b076c4983ceb56cbe8186e45871 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 13 Mar 2019 16:31:34 +0100
Subject: [PATCH 0772/1938] chg: 'lf hitag reader 21' - now save BIN/EML
 formats.

---
 client/cmdlfhitag.c | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index 9bbe167ee..2907fd861 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -21,6 +21,7 @@
 #include "util_posix.h"
 #include "comms.h"
 #include "cmddata.h"
+#include "loclass/fileutils.h"  // savefile
 
 static int CmdHelp(const char *Cmd);
 
@@ -277,21 +278,18 @@ int CmdLFHitagReader(const char *Cmd) {
     uint32_t id = bytes_to_num(resp.d.asBytes, 4);
 
     if (htf == RHT2F_UID_ONLY) {
-        PrintAndLogEx(NORMAL, "Valid Hitag2 tag found - UID: %08x", id);
+        PrintAndLogEx(SUCCESS, "Valid Hitag2 tag found - UID: %08x", id);
     } else {
+        
+        uint8_t *data = resp.d.asBytes;
+        
         char filename[FILE_PATH_SIZE];
-        FILE *f = NULL;
-        sprintf(filename, "%08x_%04x.ht2", id, (rand() & 0xffff));
-        f = fopen(filename, "wb");
-        if (!f) {
-            PrintAndLogEx(WARNING, "Error: Could not open file [%s]", filename);
-            return 1;
-        }
+        char *fnameptr = filename;
+        fnameptr += sprintf(fnameptr, "lf-hitag-");
+        FillFileNameByUID(fnameptr, data, "-dump", 4);
 
-        // Write the 48 tag memory bytes to file and finalize
-        fwrite(resp.d.asBytes, 1, 48, f);
-        fclose(f);
-        PrintAndLogEx(NORMAL, "Succesfully saved tag memory to [%s]", filename);
+        saveFile(filename, "bin", data, 48);        
+        saveFileEML(filename, "eml", data, 48, 4);
     }
     return 0;
 }

From b35ea2e352cc15075670eafb2718488e76f19589 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 13 Mar 2019 16:44:32 +0100
Subject: [PATCH 0773/1938] chg: 'lf hitag writer' - refactored with timeouts
 etc. chg: 'lf hitag'  test without toggle mode enabled

---
 armsrc/hitag2.c            |  3 ++-
 client/amiitool/amiitool.c |  2 +-
 client/cmdlfhitag.c        | 51 ++++++++++++++++++++++----------------
 3 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/armsrc/hitag2.c b/armsrc/hitag2.c
index d474cf895..4abc99e10 100644
--- a/armsrc/hitag2.c
+++ b/armsrc/hitag2.c
@@ -705,7 +705,8 @@ void SniffHitag(uint32_t type) {
 
     // Set up eavesdropping mode, frequency divisor which will drive the FPGA
     // and analog mux selection.
-    FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT  | FPGA_LF_EDGE_DETECT_TOGGLE_MODE);
+    //FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT  | FPGA_LF_EDGE_DETECT_TOGGLE_MODE);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT);
     
     //125Khz
     FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95);
diff --git a/client/amiitool/amiitool.c b/client/amiitool/amiitool.c
index a687cb0b1..78c8f4d1e 100644
--- a/client/amiitool/amiitool.c
+++ b/client/amiitool/amiitool.c
@@ -8,7 +8,7 @@
 #include <amiibo.h>
 #include <stdio.h>
 #include <string.h>
-#include "../loclass/fileutil.h"
+#include "../loclass/fileutils.h"
 
 #define NTAG215_SIZE 540
 
diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index 2907fd861..5a245a345 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -30,6 +30,7 @@ size_t nbytes(size_t nbits) {
 }
 
 int usage_hitag_reader(void) {
+    PrintAndLogEx(NORMAL, "Hitag reader functions");
     PrintAndLogEx(NORMAL, "Usage: lf hitag reader [h] <reader function #>");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       h          This help");
@@ -45,6 +46,19 @@ int usage_hitag_reader(void) {
     PrintAndLogEx(NORMAL, "      26               Just read UID");
     return 0;
 }
+int usage_hitag_writer(void) {
+    PrintAndLogEx(NORMAL, "Hitag writer functions");
+    PrintAndLogEx(NORMAL, "Usage: lf hitag write [h] <reader function #>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h          This help");
+    PrintAndLogEx(NORMAL, "   HitagS (0*)");
+    PrintAndLogEx(NORMAL, "      03 <nr,ar> (Challenge) <page> <byte0...byte3> write page on a Hitag S tag");
+    PrintAndLogEx(NORMAL, "      04 <key> (set to 0 if no authentication is needed) <page> <byte0...byte3> write page on a Hitag S tag");
+    PrintAndLogEx(NORMAL, "   Hitag1 (1*)");
+    PrintAndLogEx(NORMAL, "   Hitag2 (2*)");
+    PrintAndLogEx(NORMAL, "      24  <key> (set to 0 if no authentication is needed) <page> <byte0...byte3> write page on a Hitag2 tag");
+    return 0;
+}
 
 int CmdLFHitagList(const char *Cmd) {
     uint8_t *got = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
@@ -256,7 +270,6 @@ int CmdLFHitagReader(const char *Cmd) {
             break;
         }
         default: {
-            PrintAndLogEx(NORMAL, "\nError: unkown reader function %d", htf);
             return usage_hitag_reader();
         }
     }
@@ -368,44 +381,40 @@ int CmdLFHitagWP(const char *Cmd) {
     UsbCommand c = { CMD_WR_HITAG_S };
     hitag_data *htd = (hitag_data *)c.d.asBytes;
     hitag_function htf = param_get32ex(Cmd, 0, 0, 10);
+    
     switch (htf) {
-        case 03: { //WHTSF_CHALLENGE
+        case WHTSF_CHALLENGE: {
             num_to_bytes(param_get64ex(Cmd, 1, 0, 16), 8, htd->auth.NrAr);
             c.arg[2] = param_get32ex(Cmd, 2, 0, 10);
             num_to_bytes(param_get32ex(Cmd, 3, 0, 16), 4, htd->auth.data);
+            break;
         }
-        break;
-        case 04:
-        case 24: {
-            //WHTSF_KEY
+        case WHTSF_KEY:
+        case WHT2F_CRYPTO: {
             num_to_bytes(param_get64ex(Cmd, 1, 0, 16), 6, htd->crypto.key);
             c.arg[2] = param_get32ex(Cmd, 2, 0, 10);
             num_to_bytes(param_get32ex(Cmd, 3, 0, 16), 4, htd->crypto.data);
-
+            break;
         }
-        break;
         default: {
-            PrintAndLogEx(WARNING, "Error: unkown writer function %d", htf);
-            PrintAndLogEx(NORMAL, "Hitag writer functions");
-            PrintAndLogEx(NORMAL, " HitagS (0*)");
-            PrintAndLogEx(NORMAL, "  03 <nr,ar> (Challenge) <page> <byte0...byte3> write page on a Hitag S tag");
-            PrintAndLogEx(NORMAL, "  04 <key> (set to 0 if no authentication is needed) <page> <byte0...byte3> write page on a Hitag S tag");
-            PrintAndLogEx(NORMAL, " Hitag1 (1*)");
-            PrintAndLogEx(NORMAL, " Hitag2 (2*)");
-            return 1;
+            return usage_hitag_writer();
         }
-        break;
     }
-    // Copy the hitag function into the first argument
+
     c.arg[0] = htf;
 
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
-    WaitForResponse(CMD_ACK, &resp);
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 4000)) {
+        PrintAndLogEx(WARNING, "timeout while waiting for reply.");
+        return 1;
+    }    
 
-    // Check the return status, stored in the first argument
-    if (resp.arg[0] == false) return 1;
+    if (resp.arg[0] == false) {
+        PrintAndLogEx(DEBUG, "DEBUG: Error - hitag failed");
+        return 1;
+    }    
     return 0;
 }
 

From 072e83bc4977e3bba98d988cbe95257224af9b33 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 13 Mar 2019 17:50:10 +0100
Subject: [PATCH 0774/1938] chg: 'lf hitag reader' - now support json format

---
 client/cmdlfhitag.c        | 19 ++++++++++---------
 client/cmdlfhitag.h        |  2 +-
 client/loclass/fileutils.c | 24 ++++++++++++++++++++----
 client/loclass/fileutils.h |  5 +++++
 4 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index 5a245a345..52952bef6 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -303,6 +303,7 @@ int CmdLFHitagReader(const char *Cmd) {
 
         saveFile(filename, "bin", data, 48);        
         saveFileEML(filename, "eml", data, 48, 4);
+        saveFileJSON(filename, "json", jsfHitag, (uint8_t *)data, 48);        
     }
     return 0;
 }
@@ -377,7 +378,7 @@ int CmdLFHitagCheckChallenges(const char *Cmd) {
     return 0;
 }
 
-int CmdLFHitagWP(const char *Cmd) {
+int CmdLFHitagWriter(const char *Cmd) {
     UsbCommand c = { CMD_WR_HITAG_S };
     hitag_data *htd = (hitag_data *)c.d.asBytes;
     hitag_function htf = param_get32ex(Cmd, 0, 0, 10);
@@ -419,14 +420,14 @@ int CmdLFHitagWP(const char *Cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",    CmdHelp,           1, "This help"},
-    {"list",    CmdLFHitagList,    1, "<outfile> List Hitag trace history"},
-    {"reader",  CmdLFHitagReader,  1, "Act like a Hitag Reader"},
-    {"sim",     CmdLFHitagSim,     1, "<infile> Simulate Hitag transponder"},
-    {"simS",    CmdLFHitagSimS,    1, "<hitagS.hts> Simulate HitagS transponder" },
-    {"sniff",   CmdLFHitagSniff,   1, "Eavesdrop Hitag communication"},
-    {"writer",  CmdLFHitagWP,      1, "Act like a Hitag Writer" },
-    {"check_challenges", CmdLFHitagCheckChallenges,   1, "<challenges.cc> test all challenges" },
+    {"help",             CmdHelp,                   1, "This help"},
+    {"list",             CmdLFHitagList,            1, "<outfile> List Hitag trace history"},
+    {"reader",           CmdLFHitagReader,          1, "Act like a Hitag Reader"},
+    {"sim",              CmdLFHitagSim,             1, "<infile> Simulate Hitag transponder"},
+    {"simS",             CmdLFHitagSimS,            1, "<hitagS.bin> Simulate HitagS transponder" },
+    {"sniff",            CmdLFHitagSniff,           1, "Eavesdrop Hitag communication"},
+    {"writer",           CmdLFHitagWriter,          1, "Act like a Hitag Writer" },
+    {"check_challenges", CmdLFHitagCheckChallenges, 1, "<challenges.cc> test all challenges" },
     { NULL, NULL, 0, NULL }
 };
 
diff --git a/client/cmdlfhitag.h b/client/cmdlfhitag.h
index 2c39ef345..4fa311f2e 100644
--- a/client/cmdlfhitag.h
+++ b/client/cmdlfhitag.h
@@ -18,7 +18,7 @@ extern int CmdLFHitagReader(const char *Cmd);
 extern int CmdLFHitagSim(const char *Cmd);
 extern int CmdLFHitagSimS(const char *Cmd);
 extern int CmdLFHitagSniff(const char *Cmd);
-extern int CmdLFHitagWP(const char *Cmd);
+extern int CmdLFHitagWriter(const char *Cmd);
 extern int CmdLFHitagCheckChallenges(const char *Cmd);
 
 #endif
diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index 4d58c7084..45be3be04 100644
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -155,11 +155,12 @@ int saveFileJSON(const char *preferredName, const char *suffix, JSONFileType fty
     json_t *root = json_object();
     JsonSaveStr(root, "Created", "proxmark3");
     switch (ftype) {
-        case jsfRaw:
+        case jsfRaw: {
             JsonSaveStr(root, "FileType", "raw");
             JsonSaveBufAsHexCompact(root, "raw", data, datalen);
             break;
-        case jsfCardMemory:
+        }
+        case jsfCardMemory: {
             JsonSaveStr(root, "FileType", "mfcard");
             for (int i = 0; i < (datalen / 16); i++) {
                 char path[PATH_MAX_LENGTH] = {0};
@@ -208,7 +209,8 @@ int saveFileJSON(const char *preferredName, const char *suffix, JSONFileType fty
                 }
             }
             break;
-        case jsfMfuMemory:
+        }
+        case jsfMfuMemory: {
             JsonSaveStr(root, "FileType", "mfu");
 
             mfu_dump_t *tmp = (mfu_dump_t *)data;
@@ -230,12 +232,26 @@ int saveFileJSON(const char *preferredName, const char *suffix, JSONFileType fty
             size_t len = (datalen - DUMP_PREFIX_LENGTH) / 4;
 
             for (int i = 0; i < len; i++) {
-
                 char path[PATH_MAX_LENGTH] = {0};
                 sprintf(path, "$.blocks.%d", i);
                 JsonSaveBufAsHexCompact(root, path, tmp->data + (i * 4), 4);
             }
             break;
+        }
+        case jsfHitag: {
+            JsonSaveStr(root, "FileType", "hitag");
+            uint8_t uid[4] = {0};
+            memcpy(uid, data, 4);
+
+            JsonSaveBufAsHexCompact(root, "$.Card.UID", uid, sizeof(uid));
+            
+            for (int i = 0; i < (datalen / 4); i++) {
+                char path[PATH_MAX_LENGTH] = {0};
+                sprintf(path, "$.blocks.%d", i);
+                JsonSaveBufAsHexCompact(root, path, data + (i * 4), 4);
+            }               
+            break;
+        }
     }
 
     int res = json_dump_file(root, fileName, JSON_INDENT(2));
diff --git a/client/loclass/fileutils.h b/client/loclass/fileutils.h
index c2888c196..f77dfd040 100644
--- a/client/loclass/fileutils.h
+++ b/client/loclass/fileutils.h
@@ -55,6 +55,11 @@ typedef enum {
     jsfRaw,
     jsfCardMemory,
     jsfMfuMemory,
+    jsfHitag,
+//    jsf14b,
+//    jsf15,
+//    jsfLegic,
+//    jsfT55xx,  
 } JSONFileType;
 
 int fileExists(const char *filename);

From e3afad8758b4a285409a1d0b9e0098968fb76e41 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 13 Mar 2019 20:16:11 +0100
Subject: [PATCH 0775/1938] CHG: 'lf hitag sim' - now loads from BIN/EML/JSON. 
  Also merged it with 'lf hitag simS', which is removed.

---
 client/cmdlfhitag.c        | 173 +++++++++++++++++++++++--------------
 client/cmdlfhitag.h        |   2 +-
 client/loclass/fileutils.c |  23 ++++-
 3 files changed, 132 insertions(+), 66 deletions(-)

diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index 52952bef6..4b167e019 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -28,7 +28,37 @@ static int CmdHelp(const char *Cmd);
 size_t nbytes(size_t nbits) {
     return (nbits / 8) + ((nbits % 8) > 0);
 }
-
+int usage_hitag_sniff(void) {
+    PrintAndLogEx(NORMAL, "Usage:   lf hitag sniff");
+    PrintAndLogEx(NORMAL, "  p <pwd>      : password");
+    PrintAndLogEx(NORMAL, "  f <name>     : data filename, if no <name> given, UID will be used as filename");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "         lf hitag sniff");
+    return 0;
+}
+int usage_hitag_sim(void) {
+    PrintAndLogEx(NORMAL, "Simulate Hitag2 transponder");
+    PrintAndLogEx(NORMAL, "Usage:   lf hitag sim [2|s] e|j|b <filename w/o extension>");
+    PrintAndLogEx(NORMAL, " [2|s]             : 2 = hitag2,  s = hitagS");
+    PrintAndLogEx(NORMAL, "  e <filename>     : load data from EML filename");
+    PrintAndLogEx(NORMAL, "  j <filename>     : load data from JSON filename");
+    PrintAndLogEx(NORMAL, "  b <filename>     : load data from BIN filename");    
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "         lf hitag sim 2 b lf-hitag-dump");
+    return 0;
+}
+int usage_hitag_dump(void) {
+    PrintAndLogEx(NORMAL, "Usage:   lf hitag dump p <pwd> f <name>");
+    PrintAndLogEx(NORMAL, "  p <pwd>      : password");
+    PrintAndLogEx(NORMAL, "  f <name>     : data filename, if no <name> given, UID will be used as filename");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "         lf hitag dump f mydump");
+    PrintAndLogEx(NORMAL, "         lf hitag dump p 4D494B52 f mydump");    
+    return 0;
+}
 int usage_hitag_reader(void) {
     PrintAndLogEx(NORMAL, "Hitag reader functions");
     PrintAndLogEx(NORMAL, "Usage: lf hitag reader [h] <reader function #>");
@@ -188,7 +218,11 @@ int CmdLFHitagList(const char *Cmd) {
 }
 
 int CmdLFHitagSniff(const char *Cmd) {
-    UsbCommand c = {CMD_SNIFF_HITAG};
+
+    char ctmp = tolower(param_getchar(Cmd, 0));
+    if (ctmp == 'h') return usage_hitag_sniff();
+    
+    UsbCommand c = {CMD_SNIFF_HITAG, {0, 0, 0}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -196,35 +230,78 @@ int CmdLFHitagSniff(const char *Cmd) {
 
 int CmdLFHitagSim(const char *Cmd) {
 
-    UsbCommand c = {CMD_SIMULATE_HITAG};
-    char filename[FILE_PATH_SIZE] = { 0x00 };
-    FILE *f;
-    bool tag_mem_supplied;
-
-    int len = strlen(Cmd);
-    if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
-    memcpy(filename, Cmd, len);
-
-    if (strlen(filename) > 0) {
-        f = fopen(filename, "rb+");
-        if (!f) {
-            PrintAndLogEx(WARNING, "Error: Could not open file [%s]", filename);
-            return 1;
+    bool errors = false;
+    bool useHitagS = false;
+    bool tag_mem_supplied = false;
+    uint8_t cmdp = 0;
+    size_t maxdatalen = 48;
+    uint8_t *data = calloc(4 * 64, sizeof(uint8_t));
+    size_t datalen = 0;
+    int res = 0;
+    char filename[FILE_PATH_SIZE];
+        
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+            case 'h':
+                return usage_hitag_sim();
+            case '2':
+                maxdatalen = 48;  
+                cmdp++;
+                break;
+            case 's':
+                useHitagS = true;
+                maxdatalen = 4 * 64;
+                cmdp++;
+                break;
+            case 'e':                
+                param_getstr(Cmd, cmdp+1, filename, sizeof(filename));
+                res = loadFileEML(filename, "eml", data, &datalen);
+                if ( res > 0 || datalen != maxdatalen) {
+                    PrintAndLogDevice(FAILED, "error, bytes read mismatch file size");                    
+                    errors = true;
+                    break;
+                }
+                tag_mem_supplied = true;
+                cmdp += 2;
+                break;                
+            case 'j':
+                param_getstr(Cmd, cmdp+1, filename, sizeof(filename));
+                res = loadFileJSON(filename, "json", data, maxdatalen, &datalen);
+                if ( res > 0) {
+                    errors = true;
+                    break;
+                }                
+                tag_mem_supplied = true;
+                cmdp += 2;
+                break;                
+            case 'b':
+                param_getstr(Cmd, cmdp+1, filename, sizeof(filename));
+                res = loadFile(filename, "bin", data, &datalen);
+                if ( res > 0 ) {
+                    errors = true;
+                    break;
+                }                
+                tag_mem_supplied = true;
+                cmdp += 2;                
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                errors = true;
+                break;
         }
-        tag_mem_supplied = true;
-        size_t bytes_read = fread(c.d.asBytes, 1, 48, f);
-        if (bytes_read == 48) {
-            PrintAndLogEx(WARNING, "Error: File reading error");
-            fclose(f);
-            return 1;
-        }
-        fclose(f);
-    } else {
-        tag_mem_supplied = false;
+    }
+    
+    //Validations
+    if (errors || cmdp == 0) return usage_hitag_sim();
+    
+    UsbCommand c = {CMD_SIMULATE_HITAG, {0, 0, 0}};
+    
+    if ( useHitagS ) {
+        c.cmd = CMD_SIMULATE_HITAG_S;
     }
 
-    // Does the tag comes with memory
     c.arg[0] = (uint32_t)tag_mem_supplied;
+    memcpy(c.d.asBytes, data, datalen);
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -308,41 +385,6 @@ int CmdLFHitagReader(const char *Cmd) {
     return 0;
 }
 
-int CmdLFHitagSimS(const char *Cmd) {
-    UsbCommand c = { CMD_SIMULATE_HITAG_S };
-    char filename[FILE_PATH_SIZE] = { 0x00 };
-    FILE *f;
-    bool tag_mem_supplied;
-    int len = strlen(Cmd);
-    if (len > FILE_PATH_SIZE)
-        len = FILE_PATH_SIZE;
-    memcpy(filename, Cmd, len);
-
-    if (strlen(filename) > 0) {
-        f = fopen(filename, "rb+");
-        if (!f) {
-            PrintAndLogEx(WARNING, "Error: Could not open file [%s]", filename);
-            return 1;
-        }
-        tag_mem_supplied = true;
-        size_t bytes_read = fread(c.d.asBytes, 1, 4 * 64, f);
-        if (bytes_read == 4 * 64) {
-            PrintAndLogEx(WARNING, "Error: File reading error");
-            fclose(f);
-            return 1;
-        }
-        fclose(f);
-    } else {
-        tag_mem_supplied = false;
-    }
-
-    // Does the tag comes with memory
-    c.arg[0] = (uint32_t) tag_mem_supplied;
-    clearCommandBuffer();
-    SendCommand(&c);
-    return 0;
-}
-
 int CmdLFHitagCheckChallenges(const char *Cmd) {
     UsbCommand c = { CMD_TEST_HITAGS_TRACES };
     char filename[FILE_PATH_SIZE] = { 0x00 };
@@ -419,12 +461,15 @@ int CmdLFHitagWriter(const char *Cmd) {
     return 0;
 }
 
+int CmdLFHitagDump(const char *cmd) {
+    return usage_hitag_dump();
+}
+
 static command_t CommandTable[] = {
     {"help",             CmdHelp,                   1, "This help"},
     {"list",             CmdLFHitagList,            1, "<outfile> List Hitag trace history"},
     {"reader",           CmdLFHitagReader,          1, "Act like a Hitag Reader"},
-    {"sim",              CmdLFHitagSim,             1, "<infile> Simulate Hitag transponder"},
-    {"simS",             CmdLFHitagSimS,            1, "<hitagS.bin> Simulate HitagS transponder" },
+    {"sim",              CmdLFHitagSim,             1, "Simulate Hitag transponder"},
     {"sniff",            CmdLFHitagSniff,           1, "Eavesdrop Hitag communication"},
     {"writer",           CmdLFHitagWriter,          1, "Act like a Hitag Writer" },
     {"check_challenges", CmdLFHitagCheckChallenges, 1, "<challenges.cc> test all challenges" },
diff --git a/client/cmdlfhitag.h b/client/cmdlfhitag.h
index 4fa311f2e..6772294f5 100644
--- a/client/cmdlfhitag.h
+++ b/client/cmdlfhitag.h
@@ -14,9 +14,9 @@
 extern int CmdLFHitag(const char *Cmd);
 
 extern int CmdLFHitagList(const char *Cmd);
+extern int CmdLFHitagDump(const char *cmd);
 extern int CmdLFHitagReader(const char *Cmd);
 extern int CmdLFHitagSim(const char *Cmd);
-extern int CmdLFHitagSimS(const char *Cmd);
 extern int CmdLFHitagSniff(const char *Cmd);
 extern int CmdLFHitagWriter(const char *Cmd);
 extern int CmdLFHitagCheckChallenges(const char *Cmd);
diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index 45be3be04..8bbfb424e 100644
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -463,8 +463,29 @@ int loadFileJSON(const char *preferredName, const char *suffix, void *data, size
         *datalen = sptr;
     }
 
+    if (!strcmp(ctype, "hitag")) {
+        size_t sptr = 0;
+        for (int i = 0; i < (maxdatalen/4); i++) {
+            if (sptr + 4 > maxdatalen) {
+                retval = 5;
+                goto out;
+            }
 
-    PrintAndLog("loaded from JSON file " _YELLOW_("%s"), fileName);
+            char path[30] = {0};
+            sprintf(path, "$.blocks.%d", i);
+
+            size_t len = 0;
+            JsonLoadBufAsHex(root, path, &udata[sptr], 4, &len);
+            if (!len)
+                break;
+
+            sptr += len;
+        }
+
+        *datalen = sptr;
+    }
+
+    PrintAndLogEx(SUCCESS, "loaded from JSON file " _YELLOW_("%s"), fileName);
 out:
     json_decref(root);
     free(fileName);

From 5608df977195d690ea1958204ccc7ff1bdd836c6 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 13 Mar 2019 22:48:51 +0100
Subject: [PATCH 0776/1938] chg: refactored away hitag logtrace.

---
 armsrc/BigBuf.c     | 41 -----------------------
 armsrc/BigBuf.h     |  1 -
 armsrc/hitag2.c     | 82 +++++++++------------------------------------
 armsrc/hitagS.c     | 16 ++++-----
 client/cmdlfhitag.c | 22 ++++++------
 5 files changed, 34 insertions(+), 128 deletions(-)

diff --git a/armsrc/BigBuf.c b/armsrc/BigBuf.c
index ab45a2681..267e6811b 100644
--- a/armsrc/BigBuf.c
+++ b/armsrc/BigBuf.c
@@ -195,47 +195,6 @@ bool RAMFUNC LogTrace(const uint8_t *btBytes, uint16_t iLen, uint32_t timestamp_
     return true;
 }
 
-int LogTraceHitag(const uint8_t *btBytes, int iBits, int iSamples, uint32_t dwParity, int readerToTag) {
-    /**
-      Todo, rewrite the logger to use the generic functionality instead. It should be noted, however,
-      that this logger takes number of bits as argument, not number of bytes.
-      **/
-
-    if (!tracing) return false;
-
-    uint8_t *trace = BigBuf_get_addr();
-    uint32_t iLen = nbytes(iBits);
-    // Return when trace is full
-    if (traceLen + sizeof(rsamples) + sizeof(dwParity) + sizeof(iBits) + iLen > BigBuf_max_traceLen()) return false;
-
-    //Hitag traces appear to use this traceformat:
-    // 32 bits timestamp (little endian,Highest Bit used as readerToTag flag)
-    // 32 bits parity
-    // 8 bits size (number of bits in the trace entry, not number of bytes)
-    // y Bytes data
-
-    rsamples += iSamples;
-    trace[traceLen++] = ((rsamples >> 0) & 0xff);
-    trace[traceLen++] = ((rsamples >> 8) & 0xff);
-    trace[traceLen++] = ((rsamples >> 16) & 0xff);
-    trace[traceLen++] = ((rsamples >> 24) & 0xff);
-
-    if (!readerToTag) {
-        trace[traceLen - 1] |= 0x80;
-    }
-
-    trace[traceLen++] = ((dwParity >> 0) & 0xff);
-    trace[traceLen++] = ((dwParity >> 8) & 0xff);
-    trace[traceLen++] = ((dwParity >> 16) & 0xff);
-    trace[traceLen++] = ((dwParity >> 24) & 0xff);
-    trace[traceLen++] = iBits;
-
-    memcpy(trace + traceLen, btBytes, iLen);
-    traceLen += iLen;
-
-    return true;
-}
-
 // Emulator memory
 uint8_t emlSet(uint8_t *data, uint32_t offset, uint32_t length) {
     uint8_t *mem = BigBuf_get_EM_addr();
diff --git a/armsrc/BigBuf.h b/armsrc/BigBuf.h
index 995451b9b..bdd2003be 100644
--- a/armsrc/BigBuf.h
+++ b/armsrc/BigBuf.h
@@ -42,6 +42,5 @@ extern void set_tracing(bool enable);
 extern void set_tracelen(uint32_t value);
 extern bool get_tracing(void);
 extern bool RAMFUNC LogTrace(const uint8_t *btBytes, uint16_t iLen, uint32_t timestamp_start, uint32_t timestamp_end, uint8_t *parity, bool readerToTag);
-extern int LogTraceHitag(const uint8_t *btBytes, int iBits, int iSamples, uint32_t dwParity, int bReader);
 extern uint8_t emlSet(uint8_t *data, uint32_t offset, uint32_t length);
 #endif /* __BIGBUF_H */
diff --git a/armsrc/hitag2.c b/armsrc/hitag2.c
index 4abc99e10..7c869f807 100644
--- a/armsrc/hitag2.c
+++ b/armsrc/hitag2.c
@@ -27,7 +27,6 @@
 #include "string.h"
 #include "BigBuf.h"
 
-static bool bQuiet;
 static bool bCrypto;
 static bool bAuthenticating;
 static bool bPwd;
@@ -270,8 +269,8 @@ static void hitag2_handle_reader_command(uint8_t *rx, const size_t rxlen, uint8_
         break;
     }
 
-// LogTraceHitag(rx,rxlen,0,0,false);
-// LogTraceHitag(tx,*txlen,0,0,true);
+// LogTrace(rx, nbytes(rxlen), 0, 0, NULL, false);
+// LogTrace(tx, nbytes(txlen), 0, 0, NULL, true);
 
     if (tag.crypto_active) {
         hitag2_cipher_transcrypt(&(tag.cs), tx, *txlen / 8, *txlen % 8);
@@ -687,8 +686,6 @@ void SniffHitag(uint32_t type) {
     size_t rxlen = 0;
 
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-
-    // free eventually allocated BigBuf memory
     BigBuf_free();
     BigBuf_Clear_ext(false);
     clear_trace();
@@ -705,10 +702,7 @@ void SniffHitag(uint32_t type) {
 
     // Set up eavesdropping mode, frequency divisor which will drive the FPGA
     // and analog mux selection.
-    //FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT  | FPGA_LF_EDGE_DETECT_TOGGLE_MODE);
-    FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT);
-    
-    //125Khz
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT  | FPGA_LF_EDGE_DETECT_TOGGLE_MODE);
     FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95);
     SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
 
@@ -734,7 +728,7 @@ void SniffHitag(uint32_t type) {
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
     
     // synchronized startup procedure
-    while (AT91C_BASE_TC1->TC_CV > 0); // wait until TC0 returned to zero
+    while (AT91C_BASE_TC1->TC_CV > 0) {}; // wait until TC0 returned to zero
 
     // Reset the received frame, frame count and timing info
     memset(rx, 0x00, sizeof(rx));
@@ -846,11 +840,8 @@ void SniffHitag(uint32_t type) {
         // Check if frame was captured
         if (rxlen > 0) {
             frame_count++;
-            if (!LogTraceHitag(rx, rxlen, response, 0, reader_frame)) {
-                DbpString("Trace full");
-                break;
-            }
-
+            LogTrace(rx, nbytes(rxlen), response, 0, NULL, reader_frame);
+            
             // Check if we recognize a valid authentication attempt
             if (nbytes(rxlen) == 8) {
                 // Store the authentication attempt
@@ -903,12 +894,8 @@ void SimulateHitagTag(bool tag_mem_supplied, uint8_t *data) {
     size_t rxlen = 0;
     uint8_t tx[HITAG_FRAME_LEN];
     size_t txlen = 0;
-    bool bQuitTraceFull = false;
-    bQuiet = false;
 
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-
-    // free eventually allocated BigBuf memory
     BigBuf_free();
     BigBuf_Clear_ext(false);
     clear_trace();
@@ -1020,17 +1007,8 @@ void SimulateHitagTag(bool tag_mem_supplied, uint8_t *data) {
         // Check if frame was captured
         if (rxlen > 4) {
             frame_count++;
-            if (!bQuiet) {
-                if (!LogTraceHitag(rx, rxlen, response, 0, true)) {
-                    DbpString("Trace full");
-                    if (bQuitTraceFull) {
-                        break;
-                    } else {
-                        bQuiet = true;
-                    }
-                }
-            }
-
+            LogTrace(rx, nbytes(rxlen), response, response, NULL, true);
+                        
             // Disable timer 1 with external trigger to avoid triggers during our own modulation
             AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 
@@ -1046,19 +1024,8 @@ void SimulateHitagTag(bool tag_mem_supplied, uint8_t *data) {
 
             // Send and store the tag answer (if there is any)
             if (txlen) {
-                // Transmit the tag frame
                 hitag_send_frame(tx, txlen);
-                // Store the frame in the trace
-                if (!bQuiet) {
-                    if (!LogTraceHitag(tx, txlen, 0, 0, false)) {
-                        DbpString("Trace full");
-                        if (bQuitTraceFull) {
-                            break;
-                        } else {
-                            bQuiet = true;
-                        }
-                    }
-                }
+                LogTrace(tx, nbytes(txlen), 0, 0, NULL, false);                
             }
 
             // Reset the received frame and response timing info
@@ -1117,7 +1084,6 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
             Dbprintf("List identifier in password mode");
             memcpy(password, htd->pwd.password, 4);
             blocknr = 0;
-            bQuiet = false;
             bPwd = false;
             break;
         }
@@ -1125,7 +1091,6 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
             DbpString("Authenticating using nr,ar pair:");
             memcpy(NrAr, htd->auth.NrAr, 8);
             Dbhexdump(8, NrAr, false);
-            bQuiet = false;
             bCrypto = false;
             bAuthenticating = false;
             break;
@@ -1135,7 +1100,6 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
             memcpy(key, htd->crypto.key, 6);  //HACK; 4 or 6??  I read both in the code.
             Dbhexdump(6, key, false);
             blocknr = 0;
-            bQuiet = false;
             bCrypto = false;
             bAuthenticating = false;
             break;
@@ -1144,13 +1108,11 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
             Dbprintf("Testing %d authentication attempts", (auth_table_len / 8));
             auth_table_pos = 0;
             memcpy(NrAr, auth_table, 8);
-            bQuiet = false;
             bCrypto = false;
             break;
         }
         case RHT2F_UID_ONLY: {
             blocknr = 0;
-            bQuiet = false;
             bCrypto = false;
             bAuthenticating = false;
             break;
@@ -1208,24 +1170,21 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
     // synchronized startup procedure
-    while (AT91C_BASE_TC0->TC_CV > 0); // wait until TC0 returned to zero
+    while (AT91C_BASE_TC0->TC_CV > 0) {}; // wait until TC0 returned to zero
 
     // Tag specific configuration settings (sof, timings, etc.)
     if (htf < 10) {
         // hitagS settings
         reset_sof = 1;
         t_wait = 200;
-        DbpString("Configured for hitagS reader");
     } else if (htf < 20) {
         // hitag1 settings
         reset_sof = 1;
         t_wait = 200;
-        DbpString("Configured for hitag1 reader");
     } else if (htf < 30) {
         // hitag2 settings
         reset_sof = 4;
         t_wait = HITAG_T_WAIT_2;
-        DbpString("Configured for hitag2 reader");
     } else {
         Dbprintf("Error, unknown hitag reader type: %d", htf);
         goto out;
@@ -1239,7 +1198,7 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
         // Check if frame was captured and store it
         if (rxlen > 0) {
             frame_count++;
-            LogTraceHitag(rx, rxlen, response, 0, false);
+            LogTrace(rx, nbytes(rxlen), response, response, NULL, false);
         }
 
         // By default reset the transmission buffer
@@ -1295,7 +1254,7 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
         // Add transmitted frame to total count
         if (txlen > 0) {
             frame_count++;
-            LogTraceHitag(tx, txlen, HITAG_T_WAIT_2, 0, true);
+            LogTrace(tx, nbytes(txlen), HITAG_T_WAIT_2, HITAG_T_WAIT_2, NULL, true);
         }
 
         // Reset values for receiving frames
@@ -1401,15 +1360,11 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
     bool bStop;
 
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-
-    // Reset the return status
-    bSuccessful = false;
-
-    // Clean up trace and prepare it for storing frames
     set_tracing(true);
     clear_trace();
 
-    // DbpString("Starting Hitag reader family");
+    // Reset the return status
+    bSuccessful = false;
 
     // Check configuration
     switch (htf) {
@@ -1419,7 +1374,6 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
             memcpy(writedata, htd->crypto.data, 4);
             Dbhexdump(6, key, false);
             blocknr = page;
-            bQuiet = false;
             bCrypto = false;
             bAuthenticating = false;
             writestate = WRITE_STATE_START;
@@ -1484,17 +1438,14 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
         // hitagS settings
         reset_sof = 1;
         t_wait = 200;
-        DbpString("Configured for hitagS reader");
     } else if (htf < 20) {
         // hitag1 settings
         reset_sof = 1;
         t_wait = 200;
-        DbpString("Configured for hitag1 reader");
     } else if (htf < 30) {
         // hitag2 settings
         reset_sof = 4;
         t_wait = HITAG_T_WAIT_2;
-        DbpString("Configured for hitag2 reader");
     } else {
         Dbprintf("Error, unknown hitag reader type: %d", htf);
         return;
@@ -1507,7 +1458,7 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
         // Check if frame was captured and store it
         if (rxlen > 0) {
             frame_count++;
-            LogTraceHitag(rx, rxlen, response, 0, false);
+            LogTrace(rx, nbytes(rxlen), response, response, NULL, false);            
         }
 
         // By default reset the transmission buffer
@@ -1544,8 +1495,7 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
         // Add transmitted frame to total count
         if (txlen > 0) {
             frame_count++;
-            // Store the frame in the trace
-            LogTraceHitag(tx, txlen, HITAG_T_WAIT_2, 0, true);
+            LogTrace(tx, nbytes(txlen), HITAG_T_WAIT_2, HITAG_T_WAIT_2, NULL, true);            
         }
 
         // Reset values for receiving frames
diff --git a/armsrc/hitagS.c b/armsrc/hitagS.c
index 404230aac..30e245ac8 100644
--- a/armsrc/hitagS.c
+++ b/armsrc/hitagS.c
@@ -1063,7 +1063,7 @@ void SimulateHitagSTag(bool tag_mem_supplied, uint8_t *data) {
         // Check if frame was captured
         if (rxlen > 0) {
             frame_count++;
-            LogTraceHitag(rx, rxlen, response, 0, true);
+            LogTrace(rx, nbytes(rxlen), response, 0, NULL, true);
 
             // Disable timer 1 with external trigger to avoid triggers during our own modulation
             AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
@@ -1082,7 +1082,7 @@ void SimulateHitagSTag(bool tag_mem_supplied, uint8_t *data) {
             if (txlen > 0) {
                 // Transmit the tag frame
                 hitag_send_frame(tx, txlen);
-                LogTraceHitag(tx, txlen, 0, 0, false);
+                LogTrace(tx, nbytes(txlen), 0, 0, NULL, false);
             }
 
             // Reset the received frame and response timing info
@@ -1235,7 +1235,7 @@ void ReadHitagS(hitag_function htf, hitag_data *htd) {
         // Check if frame was captured and store it
         if (rxlen > 0) {
             frame_count++;
-            LogTraceHitag(rx, rxlen, response, 0, false);
+            LogTrace(rx, nbytes(rxlen), response, 0, NULL, false);
         }
 
         // By default reset the transmission buffer
@@ -1362,7 +1362,7 @@ void ReadHitagS(hitag_function htf, hitag_data *htd) {
         // Add transmitted frame to total count
         if (txlen > 0) {
             frame_count++;
-            LogTraceHitag(tx, txlen, HITAG_T_WAIT_2, 0, true);
+            LogTrace(tx, nbytes(txlen), HITAG_T_WAIT_2, 0, NULL, true);  
         }
 
         // Reset values for receiving frames
@@ -1566,7 +1566,7 @@ void WritePageHitagS(hitag_function htf, hitag_data *htd, int page_) {
         // Check if frame was captured and store it
         if (rxlen > 0) {
             frame_count++;
-            LogTraceHitag(rx, rxlen, response, 0, false);
+            LogTrace(rx, nbytes(rxlen), response, 0, NULL, false);
         }
 
         //check for valid input
@@ -1653,7 +1653,7 @@ void WritePageHitagS(hitag_function htf, hitag_data *htd, int page_) {
         // Add transmitted frame to total count
         if (txlen > 0) {
             frame_count++;
-            LogTraceHitag(tx, txlen, HITAG_T_WAIT_2, 0, true);
+            LogTrace(tx, nbytes(txlen), HITAG_T_WAIT_2, 0, NULL, true);
         }
 
         // Reset values for receiving frames
@@ -1840,7 +1840,7 @@ void check_challenges(bool file_given, uint8_t *data) {
         // Check if frame was captured and store it
         if (rxlen > 0) {
             frame_count++;
-            LogTraceHitag(rx, rxlen, response, 0, false);                    
+            LogTrace(rx, nbytes(rxlen), response, 0, NULL, false);
         }
 
         tx = txbuf;
@@ -1967,7 +1967,7 @@ void check_challenges(bool file_given, uint8_t *data) {
         // Add transmitted frame to total count
         if (txlen > 0) {
             frame_count++;
-            LogTraceHitag(tx, txlen, HITAG_T_WAIT_2, 0, true);
+            LogTrace(tx, nbytes(txlen), HITAG_T_WAIT_2, 0, NULL, true);
         }
 
         // Reset values for receiving frames
diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index 4b167e019..d088247af 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -239,7 +239,9 @@ int CmdLFHitagSim(const char *Cmd) {
     size_t datalen = 0;
     int res = 0;
     char filename[FILE_PATH_SIZE];
-        
+    
+    UsbCommand c = {CMD_SIMULATE_HITAG, {0, 0, 0}};
+    
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
             case 'h':
@@ -249,7 +251,7 @@ int CmdLFHitagSim(const char *Cmd) {
                 cmdp++;
                 break;
             case 's':
-                useHitagS = true;
+                c.cmd = CMD_SIMULATE_HITAG_S;
                 maxdatalen = 4 * 64;
                 cmdp++;
                 break;
@@ -294,14 +296,10 @@ int CmdLFHitagSim(const char *Cmd) {
     //Validations
     if (errors || cmdp == 0) return usage_hitag_sim();
     
-    UsbCommand c = {CMD_SIMULATE_HITAG, {0, 0, 0}};
-    
-    if ( useHitagS ) {
-        c.cmd = CMD_SIMULATE_HITAG_S;
-    }
-
     c.arg[0] = (uint32_t)tag_mem_supplied;
-    memcpy(c.d.asBytes, data, datalen);
+    if ( tag_mem_supplied ) {
+        memcpy(c.d.asBytes, data, datalen);
+    }
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -386,7 +384,7 @@ int CmdLFHitagReader(const char *Cmd) {
 }
 
 int CmdLFHitagCheckChallenges(const char *Cmd) {
-    UsbCommand c = { CMD_TEST_HITAGS_TRACES };
+    UsbCommand c = { CMD_TEST_HITAGS_TRACES, {0, 0, 0}};
     char filename[FILE_PATH_SIZE] = { 0x00 };
     FILE *f;
     bool file_given;
@@ -421,7 +419,7 @@ int CmdLFHitagCheckChallenges(const char *Cmd) {
 }
 
 int CmdLFHitagWriter(const char *Cmd) {
-    UsbCommand c = { CMD_WR_HITAG_S };
+    UsbCommand c = { CMD_WR_HITAG_S, {0, 0, 0}};
     hitag_data *htd = (hitag_data *)c.d.asBytes;
     hitag_function htf = param_get32ex(Cmd, 0, 0, 10);
     
@@ -455,7 +453,7 @@ int CmdLFHitagWriter(const char *Cmd) {
     }    
 
     if (resp.arg[0] == false) {
-        PrintAndLogEx(DEBUG, "DEBUG: Error - hitag failed");
+        PrintAndLogEx(DEBUG, "DEBUG: Error - hitag write failed");
         return 1;
     }    
     return 0;

From 2c4413691337b1b1bf00bd62c46fd0c32d5d248e Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 13 Mar 2019 23:05:45 +0100
Subject: [PATCH 0777/1938] chG: 'trace list hitag' - started to unify hitag2/S
 annotation

---
 client/cmdtrace.c  | 46 ++++++++++++++++++++++++++--------------------
 common/protocols.h |  1 +
 2 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/client/cmdtrace.c b/client/cmdtrace.c
index 77f85ce5c..7251313d6 100644
--- a/client/cmdtrace.c
+++ b/client/cmdtrace.c
@@ -36,6 +36,7 @@ int usage_trace_list() {
     PrintAndLogEx(NORMAL, "    7816   - interpret data as iso7816-4 communications");
     PrintAndLogEx(NORMAL, "    legic  - interpret data as LEGIC communications");
     PrintAndLogEx(NORMAL, "    felica - interpret data as ISO18092 / FeliCa communications");
+    PrintAndLogEx(NORMAL, "    hitag  - interpret data as Hitag2 / HitagS communications");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "        trace list 14a f");
@@ -175,6 +176,7 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
                 crcStatus = iso15693_CRC_check(frame, data_len);
                 break;
             case ISO_7816_4:
+            case PROTO_HITAG:
             default:
                 break;
         }
@@ -189,11 +191,12 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
     for (int j = 0; j < data_len && j / 18 < 18; j++) {
 
         uint8_t parityBits = parityBytes[j >> 3];
-        if (protocol != LEGIC &&
-                protocol != ISO_14443B &&
-                protocol != ISO_7816_4 &&
-                (isResponse || protocol == ISO_14443A) &&
-                (oddparity8(frame[j]) != ((parityBits >> (7 - (j & 0x0007))) & 0x01))) {
+        if ( protocol != LEGIC
+            && protocol != ISO_14443B
+            && protocol != ISO_7816_4
+            && protocol != PROTO_HITAG
+            && (isResponse || protocol == ISO_14443A)
+            && (oddparity8(frame[j]) != ((parityBits >> (7 - (j & 0x0007))) & 0x01))) {
 
             snprintf(line[j / 18] + ((j % 18) * 4), 110, "%02x! ", frame[j]);
         } else {
@@ -556,16 +559,17 @@ int CmdTraceList(const char *Cmd) {
 
             // validate type of output
             if (strcmp(type,     "iclass") == 0)    protocol = ICLASS;
-            else if (strcmp(type, "14a") == 0)       protocol = ISO_14443A;
-            else if (strcmp(type, "14b") == 0)       protocol = ISO_14443B;
-            else if (strcmp(type, "topaz") == 0)     protocol = TOPAZ;
-            else if (strcmp(type, "7816") == 0)      protocol = ISO_7816_4;
-            else if (strcmp(type, "des") == 0)       protocol = MFDES;
-            else if (strcmp(type, "legic") == 0)     protocol = LEGIC;
-            else if (strcmp(type, "15") == 0)        protocol = ISO_15693;
-            else if (strcmp(type, "felica") == 0)    protocol = FELICA;
-            else if (strcmp(type, "mf") == 0)        protocol = PROTO_MIFARE;
-            else if (strcmp(type, "raw") == 0)       protocol = -1; //No crc, no annotations
+            else if (strcmp(type, "14a") == 0)      protocol = ISO_14443A;
+            else if (strcmp(type, "14b") == 0)      protocol = ISO_14443B;
+            else if (strcmp(type, "topaz") == 0)    protocol = TOPAZ;
+            else if (strcmp(type, "7816") == 0)     protocol = ISO_7816_4;
+            else if (strcmp(type, "des") == 0)      protocol = MFDES;
+            else if (strcmp(type, "legic") == 0)    protocol = LEGIC;
+            else if (strcmp(type, "15") == 0)       protocol = ISO_15693;
+            else if (strcmp(type, "felica") == 0)   protocol = FELICA;
+            else if (strcmp(type, "mf") == 0)       protocol = PROTO_MIFARE;
+            else if (strcmp(type, "hitag") == 0)    protocol = PROTO_HITAG;
+            else if (strcmp(type, "raw") == 0)      protocol = -1; //No crc, no annotations
             else errors = true;
 
             cmdp++;
@@ -625,6 +629,8 @@ int CmdTraceList(const char *Cmd) {
             PrintAndLogEx(NORMAL, "ISO15693 - Timings are not as accurate");
         if (protocol == ISO_7816_4)
             PrintAndLogEx(NORMAL, "ISO7816-4 / Smartcard - Timings N/A yet");
+        if (protocol == PROTO_HITAG)
+            PrintAndLogEx(NORMAL, "Hitag2 / HitagS - Timings in ETU (8us)");
 
         PrintAndLogEx(NORMAL, "");
         PrintAndLogEx(NORMAL, "      Start |        End | Src | Data (! denotes parity error)                                           | CRC | Annotation");
@@ -642,8 +648,8 @@ int CmdTraceLoad(const char *Cmd) {
 
     FILE *f = NULL;
     char filename[FILE_PATH_SIZE];
-    char cmdp = param_getchar(Cmd, 0);
-    if (strlen(Cmd) < 1 || cmdp == 'h' || cmdp == 'H') return usage_trace_load();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) < 1 || cmdp == 'h') return usage_trace_load();
 
     param_getstr(Cmd, 0, filename, sizeof(filename));
 
@@ -688,13 +694,13 @@ int CmdTraceLoad(const char *Cmd) {
 int CmdTraceSave(const char *Cmd) {
 
     if (traceLen == 0) {
-        PrintAndLogEx(WARNING, "trace is empty, exiting...");
+        PrintAndLogEx(WARNING, "trace is empty, nothing to save");
         return 0;
     }
 
     char filename[FILE_PATH_SIZE];
-    char cmdp = param_getchar(Cmd, 0);
-    if (strlen(Cmd) < 1 || cmdp == 'h' || cmdp == 'H') return usage_trace_save();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) < 1 || cmdp == 'h') return usage_trace_save();
 
     param_getstr(Cmd, 0, filename, sizeof(filename));
     saveFile(filename, "bin", trace, traceLen);
diff --git a/common/protocols.h b/common/protocols.h
index fde10f38a..f8ed2781e 100644
--- a/common/protocols.h
+++ b/common/protocols.h
@@ -276,6 +276,7 @@ ISO 7816-4 Basic interindustry commands. For command APDU's.
 #define ISO_15693        7
 #define FELICA           8
 #define PROTO_MIFARE     9
+#define PROTO_HITAG     10
 
 //-- Picopass fuses
 #define FUSE_FPERS   0x80

From e4a9e348d657d08608b0b5f6c0ae4906404e108d Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 14 Mar 2019 07:42:48 +0100
Subject: [PATCH 0778/1938] chg: 'lf hitag list' - now uses the generic list.

---
 client/cmdlfhitag.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index d088247af..bdf5c7605 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -90,7 +90,11 @@ int usage_hitag_writer(void) {
     return 0;
 }
 
-int CmdLFHitagList(const char *Cmd) {
+int CmdLFHitagList(const char *Cmd) {    
+    CmdTraceList("hitag");
+    return 0;
+
+    /*
     uint8_t *got = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
     if (!got) {
         PrintAndLogEx(WARNING, "Cannot allocate memory for trace");
@@ -215,6 +219,7 @@ int CmdLFHitagList(const char *Cmd) {
 
     free(got);
     return 0;
+    */
 }
 
 int CmdLFHitagSniff(const char *Cmd) {
@@ -231,7 +236,6 @@ int CmdLFHitagSniff(const char *Cmd) {
 int CmdLFHitagSim(const char *Cmd) {
 
     bool errors = false;
-    bool useHitagS = false;
     bool tag_mem_supplied = false;
     uint8_t cmdp = 0;
     size_t maxdatalen = 48;

From 7d88c22aaf716037956bf3760f2f32f12afee356 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 14 Mar 2019 08:24:49 +0100
Subject: [PATCH 0779/1938] chg: added limit check for loadfile rename: 'lf
 hitag checkchallenges'  ->  'lf hitag cc' chg: 'lf hitag checkchallenges' -
 refactored, added helptext

---
 client/cmdflashmem.c       |   2 +-
 client/cmdhfmf.c           |   4 +-
 client/cmdlfhitag.c        | 120 +++++++++++++++++++++++--------------
 client/loclass/fileutils.c |   7 ++-
 client/loclass/fileutils.h |   3 +-
 5 files changed, 85 insertions(+), 51 deletions(-)

diff --git a/client/cmdflashmem.c b/client/cmdflashmem.c
index 0701f1d2d..c75fadb3c 100644
--- a/client/cmdflashmem.c
+++ b/client/cmdflashmem.c
@@ -245,7 +245,7 @@ int CmdFlashMemLoad(const char *Cmd) {
             break;
         default:
 
-            res = loadFile(filename, "bin", data, &datalen);
+            res = loadFile(filename, "bin", data, FLASH_MEM_MAX_SIZE, &datalen);
             //int res = loadFileEML( filename, "eml", data, &datalen);
             if (res) {
                 free(data);
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 6ece17850..44722a7bb 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -2541,7 +2541,7 @@ int CmdHF14AMfELoad(const char *Cmd) {
 
     uint8_t *data = calloc(4096, sizeof(uint8_t));
     size_t datalen = 0;
-    //int res = loadFile(filename, "bin", data, &datalen);
+    //int res = loadFile(filename, "bin", data, maxdatalen, &datalen);
     int res = loadFileEML(filename, "eml", data, &datalen);
     if (res) {
         free(data);
@@ -2827,7 +2827,7 @@ int CmdHF14AMfCLoad(const char *Cmd) {
     size_t datalen = 0;
     int res = 0;
     if (fillFromBin) {
-        res = loadFile(fileName, "bin", data, &datalen);
+        res = loadFile(fileName, "bin", data, maxdatalen, &datalen);
     } else {
         if (fillFromJson) {
             res = loadFileJSON(fileName, "json", data, maxdatalen, &datalen);
diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index bdf5c7605..85944048c 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -29,30 +29,36 @@ size_t nbytes(size_t nbits) {
     return (nbits / 8) + ((nbits % 8) > 0);
 }
 int usage_hitag_sniff(void) {
-    PrintAndLogEx(NORMAL, "Usage:   lf hitag sniff");
-    PrintAndLogEx(NORMAL, "  p <pwd>      : password");
-    PrintAndLogEx(NORMAL, "  f <name>     : data filename, if no <name> given, UID will be used as filename");
+    PrintAndLogEx(NORMAL, "Sniff traffic between Hitag reader and tag. Use " _YELLOW_("`lf hitag list`")" to view collected data.");
+    PrintAndLogEx(NORMAL, "Usage:   lf hitag sniff [h] ");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h             This help");
+//    PrintAndLogEx(NORMAL, "       p <pwd>       Password");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "         lf hitag sniff");
     return 0;
 }
 int usage_hitag_sim(void) {
-    PrintAndLogEx(NORMAL, "Simulate Hitag2 transponder");
-    PrintAndLogEx(NORMAL, "Usage:   lf hitag sim [2|s] e|j|b <filename w/o extension>");
-    PrintAndLogEx(NORMAL, " [2|s]             : 2 = hitag2,  s = hitagS");
-    PrintAndLogEx(NORMAL, "  e <filename>     : load data from EML filename");
-    PrintAndLogEx(NORMAL, "  j <filename>     : load data from JSON filename");
-    PrintAndLogEx(NORMAL, "  b <filename>     : load data from BIN filename");    
+    PrintAndLogEx(NORMAL, "Simulate " _YELLOW_("Hitag2 / HitagS")" transponder");
+    PrintAndLogEx(NORMAL, "Usage:   lf hitag sim [h] [2|s] e|j|b <filename w/o extension>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h             This help");
+    PrintAndLogEx(NORMAL, "       [2|s]         2 = hitag2,  s = hitagS");
+    PrintAndLogEx(NORMAL, "       e <filename>  Load data from EML file");
+    PrintAndLogEx(NORMAL, "       j <filename>  Load data from JSON file");
+    PrintAndLogEx(NORMAL, "       b <filename>  Load data from BIN file");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "         lf hitag sim 2 b lf-hitag-dump");
     return 0;
 }
 int usage_hitag_dump(void) {
-    PrintAndLogEx(NORMAL, "Usage:   lf hitag dump p <pwd> f <name>");
-    PrintAndLogEx(NORMAL, "  p <pwd>      : password");
-    PrintAndLogEx(NORMAL, "  f <name>     : data filename, if no <name> given, UID will be used as filename");
+    PrintAndLogEx(NORMAL, "Usage:   lf hitag dump [h] p <pwd> f <name>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h          This help");    
+//    PrintAndLogEx(NORMAL, "       p <pwd>    password");
+//    PrintAndLogEx(NORMAL, "       f <name>   data filename, if no <name> given, UID will be used as filename");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "         lf hitag dump f mydump");
@@ -63,7 +69,7 @@ int usage_hitag_reader(void) {
     PrintAndLogEx(NORMAL, "Hitag reader functions");
     PrintAndLogEx(NORMAL, "Usage: lf hitag reader [h] <reader function #>");
     PrintAndLogEx(NORMAL, "Options:");
-    PrintAndLogEx(NORMAL, "       h          This help");
+    PrintAndLogEx(NORMAL, "       h               This help");
     PrintAndLogEx(NORMAL, "   HitagS (0*)");
     PrintAndLogEx(NORMAL, "      01 <nr> <ar>     Challenge, read all pages from a Hitag S tag");
     PrintAndLogEx(NORMAL, "      02 <key>         Set to 0 if no authentication is needed. Read all pages from a Hitag S tag");
@@ -89,7 +95,20 @@ int usage_hitag_writer(void) {
     PrintAndLogEx(NORMAL, "      24  <key> (set to 0 if no authentication is needed) <page> <byte0...byte3> write page on a Hitag2 tag");
     return 0;
 }
-
+int usage_hitag_checkchallenges(void) {
+    PrintAndLogEx(NORMAL, "Check challenges, load a file with save hitag crypto challenges and test them all.");
+    PrintAndLogEx(NORMAL, "The file should be 8 * 60 bytes long,  the file extension defaults to " _YELLOW_("`.cc`") );
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:   lf hitag cc [h] f <filename w/o extension>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h              This help");
+    PrintAndLogEx(NORMAL, "       f <filename>   Load data from BIN file");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "         lf hitag cc f lf-hitag-challenges");
+    return 0;
+}
+    
 int CmdLFHitagList(const char *Cmd) {    
     CmdTraceList("hitag");
     return 0;
@@ -242,7 +261,7 @@ int CmdLFHitagSim(const char *Cmd) {
     uint8_t *data = calloc(4 * 64, sizeof(uint8_t));
     size_t datalen = 0;
     int res = 0;
-    char filename[FILE_PATH_SIZE];
+    char filename[FILE_PATH_SIZE] = { 0x00 };
     
     UsbCommand c = {CMD_SIMULATE_HITAG, {0, 0, 0}};
     
@@ -282,7 +301,7 @@ int CmdLFHitagSim(const char *Cmd) {
                 break;                
             case 'b':
                 param_getstr(Cmd, cmdp+1, filename, sizeof(filename));
-                res = loadFile(filename, "bin", data, &datalen);
+                res = loadFile(filename, "bin", data, maxdatalen, &datalen);
                 if ( res > 0 ) {
                     errors = true;
                     break;
@@ -388,33 +407,42 @@ int CmdLFHitagReader(const char *Cmd) {
 }
 
 int CmdLFHitagCheckChallenges(const char *Cmd) {
+  
     UsbCommand c = { CMD_TEST_HITAGS_TRACES, {0, 0, 0}};
     char filename[FILE_PATH_SIZE] = { 0x00 };
-    FILE *f;
-    bool file_given;
-    int len = strlen(Cmd);
-    if (len > FILE_PATH_SIZE)
-        len = FILE_PATH_SIZE;
-    memcpy(filename, Cmd, len);
-
-    if (strlen(filename) > 0) {
-        f = fopen(filename, "rb+");
-        if (!f) {
-            PrintAndLogEx(WARNING, "Error: Could not open file [%s]", filename);
-            return 1;
+    size_t datalen = 0;
+    int res = 0;
+    bool file_given = false;
+    bool errors = false;    
+    uint8_t cmdp = 0;
+    uint8_t *data = calloc(8 * 60, sizeof(uint8_t));
+        
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+            case 'h':
+                return usage_hitag_checkchallenges();
+            case 'f':
+                param_getstr(Cmd, cmdp+1, filename, sizeof(filename));
+                res = loadFile(filename, "cc", data, 8 * 60, &datalen);
+                if ( res > 0 ) {
+                    errors = true;
+                    break;
+                }
+                
+                memcpy(c.d.asBytes, data, datalen);
+                file_given = true;
+                cmdp += 2;                
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                errors = true;
+                break;
         }
-        file_given = true;
-        size_t bytes_read = fread(c.d.asBytes, 1, 8 * 60, f);
-        if (bytes_read == 8 * 60) {
-            PrintAndLogEx(WARNING, "Error: File reading error");
-            fclose(f);
-            return 1;
-        }
-        fclose(f);
-    } else {
-        file_given = false;
     }
-
+    
+    //Validations
+    if (errors) return usage_hitag_checkchallenges();
+    
     //file with all the challenges to try
     c.arg[0] = (uint32_t)file_given;
     clearCommandBuffer();
@@ -468,13 +496,13 @@ int CmdLFHitagDump(const char *cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",             CmdHelp,                   1, "This help"},
-    {"list",             CmdLFHitagList,            1, "<outfile> List Hitag trace history"},
-    {"reader",           CmdLFHitagReader,          1, "Act like a Hitag Reader"},
-    {"sim",              CmdLFHitagSim,             1, "Simulate Hitag transponder"},
-    {"sniff",            CmdLFHitagSniff,           1, "Eavesdrop Hitag communication"},
-    {"writer",           CmdLFHitagWriter,          1, "Act like a Hitag Writer" },
-    {"check_challenges", CmdLFHitagCheckChallenges, 1, "<challenges.cc> test all challenges" },
+    {"help",     CmdHelp,                   1, "This help"},
+    {"list",     CmdLFHitagList,            0, "List Hitag trace history"},
+    {"reader",   CmdLFHitagReader,          1, "Act like a Hitag Reader"},
+    {"sim",      CmdLFHitagSim,             1, "Simulate Hitag transponder"},
+    {"sniff",    CmdLFHitagSniff,           1, "Eavesdrop Hitag communication"},
+    {"writer",   CmdLFHitagWriter,          1, "Act like a Hitag Writer" },
+    {"cc",       CmdLFHitagCheckChallenges, 1, "Test all challenges" },
     { NULL, NULL, 0, NULL }
 };
 
diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index 8bbfb424e..f9ef1244e 100644
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -269,7 +269,7 @@ out:
     return retval;
 }
 
-int loadFile(const char *preferredName, const char *suffix, void *data, size_t *datalen) {
+int loadFile(const char *preferredName, const char *suffix, void *data, size_t maxdatalen, size_t *datalen) {
 
     if (preferredName == NULL) return 1;
     if (suffix == NULL) return 1;
@@ -313,6 +313,11 @@ int loadFile(const char *preferredName, const char *suffix, void *data, size_t *
         retval = 3;
         goto out;
     }
+    
+    if ( bytes_read != maxdatalen ) {
+        PrintAndLogDevice(WARNING, "Warning, bytes read exeed calling array limit. Max bytes is %d bytes", maxdatalen);
+        bytes_read = maxdatalen;        
+    }
 
     memcpy((data), dump, bytes_read);
     free(dump);
diff --git a/client/loclass/fileutils.h b/client/loclass/fileutils.h
index f77dfd040..de5bbdfbd 100644
--- a/client/loclass/fileutils.h
+++ b/client/loclass/fileutils.h
@@ -112,10 +112,11 @@ extern int saveFileJSON(const char *preferredName, const char *suffix, JSONFileT
  * @param preferredName
  * @param suffix the file suffix. Leave out the ".".
  * @param data The data array to store the loaded bytes from file
+ * @param maxdatalen the number of bytes that your data array has
  * @param datalen the number of bytes loaded from file
  * @return 0 for ok, 1 for failz
 */
-extern int loadFile(const char *preferredName, const char *suffix, void *data, size_t *datalen);
+extern int loadFile(const char *preferredName, const char *suffix, void *data, size_t maxdatalen, size_t *datalen);
 
 /**
  * @brief  Utility function to load data from a textfile (EML). This method takes a preferred name.

From 15020ffaa24c792862fe556a7bcb0dff188e7d6b Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 14 Mar 2019 08:30:20 +0100
Subject: [PATCH 0780/1938] add: 'lf hitag info' - added a skeleton function. 
 Needs to gather and print tag information.

---
 client/cmdlfhitag.c | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index 85944048c..5b17fa859 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -53,6 +53,15 @@ int usage_hitag_sim(void) {
     PrintAndLogEx(NORMAL, "         lf hitag sim 2 b lf-hitag-dump");
     return 0;
 }
+int usage_hitag_info(void) {
+    PrintAndLogEx(NORMAL, "Usage:   lf hitag info [h] p <pwd>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h          This help");
+    PrintAndLogEx(NORMAL, "       p <pwd>    password");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "         lf hitag info");
+    return 0;
+}
 int usage_hitag_dump(void) {
     PrintAndLogEx(NORMAL, "Usage:   lf hitag dump [h] p <pwd> f <name>");
     PrintAndLogEx(NORMAL, "Options:");
@@ -328,6 +337,15 @@ int CmdLFHitagSim(const char *Cmd) {
     return 0;
 }
 
+int CmdLFHitagInfo(const char *Cmd) {
+    PrintAndLogEx(INFO, "Gather tag information ");
+    PrintAndLogEx(INFO, "To be done!");
+        
+    char ctmp = tolower(param_getchar(Cmd, 0));
+    if (ctmp == 'h') return usage_hitag_info();    
+    return 0;
+}
+
 int CmdLFHitagReader(const char *Cmd) {
 
     UsbCommand c = {CMD_READER_HITAG, {0, 0, 0} };
@@ -496,11 +514,12 @@ int CmdLFHitagDump(const char *cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",     CmdHelp,                   1, "This help"},
-    {"list",     CmdLFHitagList,            0, "List Hitag trace history"},
-    {"reader",   CmdLFHitagReader,          1, "Act like a Hitag Reader"},
-    {"sim",      CmdLFHitagSim,             1, "Simulate Hitag transponder"},
-    {"sniff",    CmdLFHitagSniff,           1, "Eavesdrop Hitag communication"},
+    {"help",     CmdHelp,                   1, "This help" },
+    {"list",     CmdLFHitagList,            0, "List Hitag trace history" },
+    {"info",     CmdLFHitagInfo,            1, "Tag information" },
+    {"reader",   CmdLFHitagReader,          1, "Act like a Hitag Reader" },
+    {"sim",      CmdLFHitagSim,             1, "Simulate Hitag transponder" },
+    {"sniff",    CmdLFHitagSniff,           1, "Eavesdrop Hitag communication" },
     {"writer",   CmdLFHitagWriter,          1, "Act like a Hitag Writer" },
     {"cc",       CmdLFHitagCheckChallenges, 1, "Test all challenges" },
     { NULL, NULL, 0, NULL }

From e5a71fdd2648ff2ebe6a84dce18d549fc6227bb0 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 14 Mar 2019 10:01:07 +0100
Subject: [PATCH 0781/1938] fix: 'hf iclass clone' - missing fclose

---
 client/cmdhficlass.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index 5f77e7c85..11677a32c 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -1375,11 +1375,14 @@ int CmdHFiClassCloneTag(const char *Cmd) {
         return 2;
     }
 
+    fclose(f);
+            
     uint8_t MAC[4] = {0x00, 0x00, 0x00, 0x00};
     uint8_t div_key[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
-    if (!select_and_auth(KEY, MAC, div_key, use_credit_key, elite, rawkey, verbose))
+    if (!select_and_auth(KEY, MAC, div_key, use_credit_key, elite, rawkey, verbose)) {
         return 0;
+    }
 
     UsbCommand w = {CMD_ICLASS_CLONE, {startblock, endblock}};
     uint8_t *ptr;
@@ -1401,11 +1404,12 @@ int CmdHFiClassCloneTag(const char *Cmd) {
         PrintAndLogEx(NORMAL, " %02x%02x%02x%02x%02x%02x%02x%02x |", p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7]);
         PrintAndLogEx(NORMAL, " MAC |%02x%02x%02x%02x|\n", p[8], p[9], p[10], p[11]);
     }
+    
     UsbCommand resp;
     clearCommandBuffer();
     SendCommand(&w);
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 4500)) {
-        PrintAndLogEx(WARNING, "command execute timeout");
+        PrintAndLogEx(WARNING, "command execute timeout");        
         return 0;
     }
     return 1;

From 1f8040596fb8d67ff1f7d9227497d0ac4eecc967 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 14 Mar 2019 10:23:58 +0100
Subject: [PATCH 0782/1938] fix: 'hf 15 dump f' - now also selects card

---
 client/cmdhf15.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index 70058c04d..c6f4c207e 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -684,15 +684,15 @@ int CmdHF15Dump(const char *Cmd) {
     //Validations
     if (errors) return usage_15_dump();
 
+    if (!getUID(uid)) {
+        PrintAndLogEx(WARNING, "No tag found.");
+        return 1;
+    }
+    
     if (fileNameLen < 1) {
 
         PrintAndLogEx(INFO, "Using UID as filename");
 
-        if (!getUID(uid)) {
-            PrintAndLogEx(WARNING, "No tag found.");
-            return 1;
-        }
-
         fptr += sprintf(fptr, "hf-15-");
         FillFileNameByUID(fptr, uid, "-dump", sizeof(uid));
     }

From cbab48659e92d248f3ddd6c1b2fd750ef77b7c17 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 14 Mar 2019 11:20:44 +0100
Subject: [PATCH 0783/1938] fix: 'lf hitag sim' - mem leaks fix: 'lf hitag cc'
 - mem leaks

---
 client/cmdlfhitag.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index 5b17fa859..4fe348539 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -277,6 +277,7 @@ int CmdLFHitagSim(const char *Cmd) {
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
             case 'h':
+                free(data);
                 return usage_hitag_sim();
             case '2':
                 maxdatalen = 48;  
@@ -326,7 +327,10 @@ int CmdLFHitagSim(const char *Cmd) {
     }
     
     //Validations
-    if (errors || cmdp == 0) return usage_hitag_sim();
+    if (errors || cmdp == 0) {
+        free(data);
+        return usage_hitag_sim();
+    }
     
     c.arg[0] = (uint32_t)tag_mem_supplied;
     if ( tag_mem_supplied ) {
@@ -334,6 +338,8 @@ int CmdLFHitagSim(const char *Cmd) {
     }
     clearCommandBuffer();
     SendCommand(&c);
+
+    free(data);    
     return 0;
 }
 
@@ -438,6 +444,7 @@ int CmdLFHitagCheckChallenges(const char *Cmd) {
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
             case 'h':
+                free(data);
                 return usage_hitag_checkchallenges();
             case 'f':
                 param_getstr(Cmd, cmdp+1, filename, sizeof(filename));
@@ -459,12 +466,17 @@ int CmdLFHitagCheckChallenges(const char *Cmd) {
     }
     
     //Validations
-    if (errors) return usage_hitag_checkchallenges();
+    if (errors) {
+        free(data);        
+        return usage_hitag_checkchallenges();
+    }
     
     //file with all the challenges to try
     c.arg[0] = (uint32_t)file_given;
     clearCommandBuffer();
     SendCommand(&c);
+
+    free(data);    
     return 0;
 }
 

From b65dc0a4c8bfdfea6a3776b48e320cb5d27e94d0 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 14 Mar 2019 11:29:50 +0100
Subject: [PATCH 0784/1938] text

---
 client/cmdlfhitag.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index 4fe348539..68e534060 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -522,6 +522,10 @@ int CmdLFHitagWriter(const char *Cmd) {
 }
 
 int CmdLFHitagDump(const char *cmd) {
+    PrintAndLogEx(INFO, "Dumping of tag memory");
+    PrintAndLogEx(INFO, "To be done!");
+        
+    char ctmp = tolower(param_getchar(Cmd, 0));    
     return usage_hitag_dump();
 }
 

From 55f4942ab74afc852271f811917669f066ab6797 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 14 Mar 2019 11:30:49 +0100
Subject: [PATCH 0785/1938] text

---
 client/cmdlfhitag.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index 68e534060..e1b79891f 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -526,7 +526,8 @@ int CmdLFHitagDump(const char *cmd) {
     PrintAndLogEx(INFO, "To be done!");
         
     char ctmp = tolower(param_getchar(Cmd, 0));    
-    return usage_hitag_dump();
+    if (ctmp == 'h') return usage_hitag_dump();
+    return 0;
 }
 
 static command_t CommandTable[] = {

From 71160ddbcad9f34dff637687c8d232a4fa5d656e Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 14 Mar 2019 11:34:32 +0100
Subject: [PATCH 0786/1938] fiddling

---
 client/cmdlfhitag.c | 2 +-
 client/cmdlfhitag.h | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index e1b79891f..9af707efe 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -521,7 +521,7 @@ int CmdLFHitagWriter(const char *Cmd) {
     return 0;
 }
 
-int CmdLFHitagDump(const char *cmd) {
+int CmdLFHitagDump(const char *Cmd) {
     PrintAndLogEx(INFO, "Dumping of tag memory");
     PrintAndLogEx(INFO, "To be done!");
         
diff --git a/client/cmdlfhitag.h b/client/cmdlfhitag.h
index 6772294f5..eb5bb2dd0 100644
--- a/client/cmdlfhitag.h
+++ b/client/cmdlfhitag.h
@@ -14,11 +14,12 @@
 extern int CmdLFHitag(const char *Cmd);
 
 extern int CmdLFHitagList(const char *Cmd);
-extern int CmdLFHitagDump(const char *cmd);
-extern int CmdLFHitagReader(const char *Cmd);
-extern int CmdLFHitagSim(const char *Cmd);
 extern int CmdLFHitagSniff(const char *Cmd);
-extern int CmdLFHitagWriter(const char *Cmd);
+extern int CmdLFHitagSim(const char *Cmd);
+extern int CmdLFHitagInfo(const char *Cmd);
+extern int CmdLFHitagReader(const char *Cmd);
 extern int CmdLFHitagCheckChallenges(const char *Cmd);
+extern int CmdLFHitagWriter(const char *Cmd);
+extern int CmdLFHitagDump(const char *cmd);
 
 #endif

From 9c2736d1ebca6357e190196b490187b7953d1aaa Mon Sep 17 00:00:00 2001
From: "osboxes.org" <iceman@iuse.se>
Date: Thu, 14 Mar 2019 12:30:32 +0100
Subject: [PATCH 0787/1938] spaces

---
 armsrc/hitag2.c            |  88 +++++++--------
 armsrc/hitagS.c            | 224 ++++++++++++++++++-------------------
 armsrc/iso14443b.c         |   2 +-
 client/cmddata.c           |   2 +-
 client/cmdhf14b.c          |   4 +-
 client/cmdhf15.c           |   2 +-
 client/cmdhficlass.c       |   6 +-
 client/cmdlf.c             |   4 +-
 client/cmdlfhitag.c        |  96 ++++++++--------
 client/cmdtrace.c          |  12 +-
 client/loclass/fileutils.c |  12 +-
 client/loclass/fileutils.h |   2 +-
 include/hitag.h            |  90 +++++++--------
 proxmark3.sh               |   2 +-
 14 files changed, 273 insertions(+), 273 deletions(-)

diff --git a/armsrc/hitag2.c b/armsrc/hitag2.c
index 7c869f807..57200c701 100644
--- a/armsrc/hitag2.c
+++ b/armsrc/hitag2.c
@@ -673,7 +673,7 @@ static bool hitag2_read_uid(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t
 void SniffHitag(uint32_t type) {
 
     StopTicks();
-    
+
     int frame_count;
     int response;
     int overflow;
@@ -719,14 +719,14 @@ void SniffHitag(uint32_t type) {
 
     // Disable timer during configuration
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
-    
+
     // TC1: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
     // external trigger rising edge, load RA on rising edge of TIOA.
     AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK | AT91C_TC_ETRGEDG_BOTH | AT91C_TC_ABETRG | AT91C_TC_LDRA_BOTH;
 
     // Enable and reset counter
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
-    
+
     // synchronized startup procedure
     while (AT91C_BASE_TC1->TC_CV > 0) {}; // wait until TC0 returned to zero
 
@@ -841,7 +841,7 @@ void SniffHitag(uint32_t type) {
         if (rxlen > 0) {
             frame_count++;
             LogTrace(rx, nbytes(rxlen), response, 0, NULL, reader_frame);
-            
+
             // Check if we recognize a valid authentication attempt
             if (nbytes(rxlen) == 8) {
                 // Store the authentication attempt
@@ -874,21 +874,21 @@ void SniffHitag(uint32_t type) {
     LEDsoff();
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     set_tracing(false);
-    
+
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
-    
+
     // release allocated memory from BigBuff.
     BigBuf_free();
-    StartTicks();   
-    
+    StartTicks();
+
     DbpString("Hitag2 sniffing end,  use `lf hitag list` for annotations");
 }
 
 void SimulateHitagTag(bool tag_mem_supplied, uint8_t *data) {
 
     StopTicks();
-    
+
     int frame_count = 0, response = 0, overflow = 0;
     uint8_t rx[HITAG_FRAME_LEN];
     size_t rxlen = 0;
@@ -910,7 +910,7 @@ void SimulateHitagTag(bool tag_mem_supplied, uint8_t *data) {
     memset(rx, 0x00, sizeof(rx));
 
     DbpString("Starting Hitag2 simulation");
-    
+
     LED_D_ON();
     hitag2_init();
 
@@ -927,7 +927,7 @@ void SimulateHitagTag(bool tag_mem_supplied, uint8_t *data) {
         }
         Dbprintf("| %d | %08x |", i, block);
     }
-    
+
     // Set up simulator mode, frequency divisor which will drive the FPGA
     // and analog mux selection.
     FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT);
@@ -941,9 +941,9 @@ void SimulateHitagTag(bool tag_mem_supplied, uint8_t *data) {
     // Disable modulation at default, which means release resistance
     LOW(GPIO_SSC_DOUT);
 
-    // Enable Peripheral Clock for 
+    // Enable Peripheral Clock for
     //   TIMER_CLOCK0, used to measure exact timing before answering
-    //   TIMER_CLOCK1, used to capture edges of the tag frames    
+    //   TIMER_CLOCK1, used to capture edges of the tag frames
     AT91C_BASE_PMC->PMC_PCER |= (1 << AT91C_ID_TC0) | (1 << AT91C_ID_TC1);
 
     AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
@@ -953,8 +953,8 @@ void SimulateHitagTag(bool tag_mem_supplied, uint8_t *data) {
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 
     // TC0: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), no triggers
-	AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK;
-    
+    AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK;
+
     // TC1: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
     // external trigger rising edge, load RA on rising edge of TIOA.
     AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK | AT91C_TC_ETRGEDG_RISING | AT91C_TC_ABETRG | AT91C_TC_LDRA_RISING;
@@ -962,7 +962,7 @@ void SimulateHitagTag(bool tag_mem_supplied, uint8_t *data) {
     // Enable and reset counter
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
-    
+
     // synchronized startup procedure
     while (AT91C_BASE_TC1->TC_CV > 0); // wait until TC0 returned to zero
 
@@ -1008,7 +1008,7 @@ void SimulateHitagTag(bool tag_mem_supplied, uint8_t *data) {
         if (rxlen > 4) {
             frame_count++;
             LogTrace(rx, nbytes(rxlen), response, response, NULL, true);
-                        
+
             // Disable timer 1 with external trigger to avoid triggers during our own modulation
             AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 
@@ -1025,7 +1025,7 @@ void SimulateHitagTag(bool tag_mem_supplied, uint8_t *data) {
             // Send and store the tag answer (if there is any)
             if (txlen) {
                 hitag_send_frame(tx, txlen);
-                LogTrace(tx, nbytes(txlen), 0, 0, NULL, false);                
+                LogTrace(tx, nbytes(txlen), 0, 0, NULL, false);
             }
 
             // Reset the received frame and response timing info
@@ -1049,12 +1049,12 @@ void SimulateHitagTag(bool tag_mem_supplied, uint8_t *data) {
     set_tracing(false);
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
-    
+
     // release allocated memory from BigBuff.
     BigBuf_free();
-  
+
     StartTicks();
-    
+
     DbpString("Sim Stopped");
 }
 
@@ -1133,12 +1133,12 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
     LED_D_ON();
     hitag2_init();
 
-    
+
     // Set fpga in edge detect with reader field, we can modulate as reader now
     FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_READER_FIELD);
     FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
     SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
-    
+
     // Configure output and enable pin that is connected to the FPGA (for modulating)
     AT91C_BASE_PIOA->PIO_OER |= GPIO_SSC_DOUT;
     AT91C_BASE_PIOA->PIO_PER |= GPIO_SSC_DOUT;
@@ -1146,11 +1146,11 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
     // Disable modulation at default, which means enable the field
     LOW(GPIO_SSC_DOUT);
 
-    // Enable Peripheral Clock for 
+    // Enable Peripheral Clock for
     //   TIMER_CLOCK0, used to measure exact timing before answering
-    //   TIMER_CLOCK1, used to capture edges of the tag frames    
+    //   TIMER_CLOCK1, used to capture edges of the tag frames
     AT91C_BASE_PMC->PMC_PCER |= (1 << AT91C_ID_TC0) | (1 << AT91C_ID_TC1);
-                              
+
     // PIO_A - BSR
     AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
 
@@ -1159,8 +1159,8 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 
     // TC0: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), no triggers
-	AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK;
-    
+    AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK;
+
     // TC1: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
     // external trigger rising edge, load RA on falling edge of TIOA.
     AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK | AT91C_TC_ETRGEDG_FALLING | AT91C_TC_ABETRG | AT91C_TC_LDRA_FALLING;
@@ -1328,14 +1328,14 @@ out:
     LEDsoff();
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     set_tracing(false);
- 
+
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
- 
+
     // release allocated memory from BigBuff.
     BigBuf_free();
     StartTicks();
-        
+
     if (bSuccessful)
         cmd_send(CMD_ACK, bSuccessful, 0, 0, (uint8_t *)tag.sectors, 48);
     else
@@ -1343,9 +1343,9 @@ out:
 }
 
 void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
-    
+
     StopTicks();
-    
+
     int frame_count = 0, response = 0;
     uint8_t rx[HITAG_FRAME_LEN];
     size_t rxlen = 0;
@@ -1381,7 +1381,7 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
         break;
         default: {
             Dbprintf("Error, unknown function: %d", htf);
-            StartTicks();            
+            StartTicks();
             return;
         }
         break;
@@ -1402,7 +1402,7 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
     // Disable modulation at default, which means enable the field
     LOW(GPIO_SSC_DOUT);
 
-    // Enable Peripheral Clock for 
+    // Enable Peripheral Clock for
     //   TIMER_CLOCK0, used to measure exact timing before answering
     //   TIMER_CLOCK1, used to capture edges of the tag frames
     AT91C_BASE_PMC->PMC_PCER |= (1 << AT91C_ID_TC0) | (1 << AT91C_ID_TC1);
@@ -1414,11 +1414,11 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 
     // TC0: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), no triggers
-	AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK;    
+    AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK;
 
     // TC1: Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
     // external trigger rising edge, load RA on falling edge of TIOA.
-    AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK 
+    AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK
                              | AT91C_TC_ETRGEDG_FALLING
                              | AT91C_TC_ABETRG
                              | AT91C_TC_LDRA_FALLING;
@@ -1428,7 +1428,7 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
     while (AT91C_BASE_TC0->TC_CV > 0) {};
-    
+
     // Reset the received frame, frame count and timing info
     lastbit = 1;
     bStop = false;
@@ -1450,7 +1450,7 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
         Dbprintf("Error, unknown hitag reader type: %d", htf);
         return;
     }
-    
+
     while (!bStop && !BUTTON_PRESS() && !usb_poll_validate_length()) {
 
         WDT_HIT();
@@ -1458,7 +1458,7 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
         // Check if frame was captured and store it
         if (rxlen > 0) {
             frame_count++;
-            LogTrace(rx, nbytes(rxlen), response, response, NULL, false);            
+            LogTrace(rx, nbytes(rxlen), response, response, NULL, false);
         }
 
         // By default reset the transmission buffer
@@ -1495,7 +1495,7 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
         // Add transmitted frame to total count
         if (txlen > 0) {
             frame_count++;
-            LogTrace(tx, nbytes(txlen), HITAG_T_WAIT_2, HITAG_T_WAIT_2, NULL, true);            
+            LogTrace(tx, nbytes(txlen), HITAG_T_WAIT_2, HITAG_T_WAIT_2, NULL, true);
         }
 
         // Reset values for receiving frames
@@ -1577,7 +1577,7 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
             }
             // if we saw over 100 wierd values break it probably isn't hitag...
             if (errorCount > 100) break;
-            
+
             // We can break this loop if we received the last bit from a frame
             if (AT91C_BASE_TC1->TC_CV > T0 * HITAG_T_EOF) {
                 if (rxlen > 0) break;
@@ -1594,11 +1594,11 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
     LEDsoff();
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     set_tracing(false);
-    
+
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
 
     StartTicks();
-    
+
     cmd_send(CMD_ACK, bSuccessful, 0, 0, (uint8_t *)tag.sectors, 48);
 }
diff --git a/armsrc/hitagS.c b/armsrc/hitagS.c
index 30e245ac8..5fece9d26 100644
--- a/armsrc/hitagS.c
+++ b/armsrc/hitagS.c
@@ -49,7 +49,7 @@ bool end = false;
 // T0 = TIMER_CLOCK1 / 125000 = 192
 #ifndef T0
 #define T0                             192
-#endif 
+#endif
 
 #define HITAG_FRAME_LEN                20
 #define HITAG_T_STOP                   36  /* T_EOF should be > 36 */
@@ -255,7 +255,7 @@ static void hitag_reader_send_frame(const uint8_t *frame, size_t frame_len) {
     // Send the content of the frame
     for (size_t i = 0; i < frame_len; i++) {
 //        if (frame[0] == 0xf8) {
-            //Dbprintf("BIT: %d",(frame[i / 8] >> (7 - (i % 8))) & 1);
+        //Dbprintf("BIT: %d",(frame[i / 8] >> (7 - (i % 8))) & 1);
 //        }
         hitag_reader_send_bit((frame[i / 8] >> (7 - (i % 8))) & 1);
     }
@@ -263,7 +263,7 @@ static void hitag_reader_send_frame(const uint8_t *frame, size_t frame_len) {
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;
 
     HIGH(GPIO_SSC_DOUT);
-    
+
     // Wait for 4-10 times the carrier period
     while (AT91C_BASE_TC0->TC_CV < T0 * 6) {};
 
@@ -285,7 +285,7 @@ static int check_select(uint8_t *rx, uint32_t uid) {
     temp_uid = ans;
     if (ans == tag.uid)
         return 1;
-    
+
     return 0;
 }
 
@@ -376,12 +376,12 @@ static void hitagS_handle_reader_command(uint8_t *rx, const size_t rxlen,
             temp2++;
             *txlen = 32;
             state = _hitag2_init(REV64(tag.key),
-                                REV32(tag.pages[0][0]),
-                                REV32(((rx[3] << 24) + (rx[2] << 16) + (rx[1] << 8) + rx[0]))
+                                 REV32(tag.pages[0][0]),
+                                 REV32(((rx[3] << 24) + (rx[2] << 16) + (rx[1] << 8) + rx[0]))
                                 );
             Dbprintf(",{0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X}",
-                    rx[0], rx[1], rx[2], rx[3], rx[4], rx[5], rx[6], rx[7]);
-                    
+                     rx[0], rx[1], rx[2], rx[3], rx[4], rx[5], rx[6], rx[7]);
+
             switch (tag.mode) {
                 case HT_STANDARD:
                     sof_bits = 1;
@@ -401,7 +401,7 @@ static void hitagS_handle_reader_command(uint8_t *rx, const size_t rxlen,
 
             for (i = 0; i < 4; i++)
                 _hitag2_byte(&state);
-            
+
             //send con2, pwdh0, pwdl0, pwdl1 encrypted as a response
             tx[0] = _hitag2_byte(&state) ^ ((tag.pages[0][1] >> 16) & 0xff);
             tx[1] = _hitag2_byte(&state) ^ tag.pwdh0;
@@ -681,44 +681,44 @@ static int hitagS_handle_tag_auth(hitag_function htf, uint64_t key, uint64_t NrA
                 break;
         }
         uid1 = (uid[0] << 7)
-             | (uid[1] << 6)
-             | (uid[2] << 5)
-             | (uid[3] << 4)
-             | (uid[4] << 3)
-             | (uid[5] << 2)
-             | (uid[6] << 1)
-             | uid[7];
-               
+               | (uid[1] << 6)
+               | (uid[2] << 5)
+               | (uid[3] << 4)
+               | (uid[4] << 3)
+               | (uid[5] << 2)
+               | (uid[6] << 1)
+               | uid[7];
+
         uid2 = (uid[8] << 7)
-             | (uid[9] << 6)
-             | (uid[10] << 5)
-             | (uid[11] << 4)
-             | (uid[12] << 3)
-             | (uid[13] << 2)
-             | (uid[14] << 1)
-             | uid[15];
-             
+               | (uid[9] << 6)
+               | (uid[10] << 5)
+               | (uid[11] << 4)
+               | (uid[12] << 3)
+               | (uid[13] << 2)
+               | (uid[14] << 1)
+               | uid[15];
+
         uid3 = (uid[16] << 7)
-             | (uid[17] << 6)
-             | (uid[18] << 5)
-             | (uid[19] << 4)
-             | (uid[20] << 3)
-             | (uid[21] << 2)
-             | (uid[22] << 1)
-             | uid[23];
-             
+               | (uid[17] << 6)
+               | (uid[18] << 5)
+               | (uid[19] << 4)
+               | (uid[20] << 3)
+               | (uid[21] << 2)
+               | (uid[22] << 1)
+               | uid[23];
+
         uid4 = (uid[24] << 7)
-             | (uid[25] << 6)
-             | (uid[26] << 5)
-             | (uid[27] << 4)
-             | (uid[28] << 3)
-             | (uid[29] << 2)
-             | (uid[30] << 1)
-             | uid[31];
-             
+               | (uid[25] << 6)
+               | (uid[26] << 5)
+               | (uid[27] << 4)
+               | (uid[28] << 3)
+               | (uid[29] << 2)
+               | (uid[30] << 1)
+               | uid[31];
+
         if (DEBUG)
             Dbprintf("UID: %02X %02X %02X %02X", uid1, uid2, uid3, uid4);
-        
+
         tag.uid = (uid4 << 24 | uid3 << 16 | uid2 << 8 | uid1);
 
         //select uid
@@ -729,40 +729,40 @@ static int hitagS_handle_tag_auth(hitag_function htf, uint64_t key, uint64_t NrA
         calc_crc(&crc, uid2, 8);
         calc_crc(&crc, uid3, 8);
         calc_crc(&crc, uid4, 8);
-        
+
         for (i = 0; i < 100; i++) {
             response_bit[i] = 0;
         }
-        
+
         for (i = 0; i < 5; i++) {
             response_bit[i] = 0;
         }
-        
+
         for (i = 5; i < 37; i++) {
             response_bit[i] = uid[i - 5];
         }
-        
+
         for (j = 0; j < 8; j++) {
             response_bit[i] = 0;
             if ((crc & ((mask << 7) >> j)) != 0)
                 response_bit[i] = 1;
             i++;
         }
-        
+
         k = 0;
         for (i = 0; i < 6; i++) {
             tx[i] = (response_bit[k] << 7)
-                  | (response_bit[k + 1] << 6)
-                  | (response_bit[k + 2] << 5)
-                  | (response_bit[k + 3] << 4)
-                  | (response_bit[k + 4] << 3)
-                  | (response_bit[k + 5] << 2)
-                  | (response_bit[k + 6] << 1)
-                  | response_bit[k + 7];
-                  
+                    | (response_bit[k + 1] << 6)
+                    | (response_bit[k + 2] << 5)
+                    | (response_bit[k + 3] << 4)
+                    | (response_bit[k + 4] << 3)
+                    | (response_bit[k + 5] << 2)
+                    | (response_bit[k + 6] << 1)
+                    | response_bit[k + 7];
+
             k += 8;
         }
-        
+
         tag.pstate = HT_INIT;
     } else if (tag.pstate == HT_INIT && rxlen == 44) {
         // received configuration after select command
@@ -811,7 +811,7 @@ static int hitagS_handle_tag_auth(hitag_function htf, uint64_t key, uint64_t NrA
 
         if (DEBUG)
             Dbprintf("conf0: %02X conf1: %02X conf2: %02X", conf_pages[0], conf_pages[1], conf_pages[2]);
-                     
+
         if (tag.auth == 1) {
             //if the tag is in authentication mode try the key or challenge
             *txlen = 64;
@@ -871,7 +871,7 @@ static int hitagS_handle_tag_auth(hitag_function htf, uint64_t key, uint64_t NrA
                 state = _hitag2_init(REV64(key), REV32(tag.uid), REV32(rnd));
                 for (i = 0; i < 5; i++)
                     _hitag2_byte(&state);
-                
+
                 pwdh0 = ((rx[1] & 0x0f) * 16 + ((rx[2] & 0xf0) / 16)) ^ _hitag2_byte(&state);
                 pwdl0 = ((rx[2] & 0x0f) * 16 + ((rx[3] & 0xf0) / 16)) ^ _hitag2_byte(&state);
                 pwdl1 = ((rx[3] & 0x0f) * 16 + ((rx[4] & 0xf0) / 16)) ^ _hitag2_byte(&state);
@@ -893,9 +893,9 @@ static int hitagS_handle_tag_auth(hitag_function htf, uint64_t key, uint64_t NrA
  * Emulates a Hitag S Tag with the given data from the .hts file
  */
 void SimulateHitagSTag(bool tag_mem_supplied, uint8_t *data) {
-    
+
     StopTicks();
-        
+
     int frame_count = 0, response = 0, overflow = 0;
     int i, j;
     uint8_t rx[HITAG_FRAME_LEN];
@@ -907,7 +907,7 @@ void SimulateHitagSTag(bool tag_mem_supplied, uint8_t *data) {
 
     // Reset the received frame, frame count and timing info
     memset(rx, 0x00, sizeof(rx));
-    
+
     // free eventually allocated BigBuf memory
     BigBuf_free();
     BigBuf_Clear_ext(false);
@@ -931,7 +931,7 @@ void SimulateHitagSTag(bool tag_mem_supplied, uint8_t *data) {
         DbpString("Loading hitagS memory...");
         memcpy((uint8_t *)tag.pages, data, 4 * 64);
     }
-    
+
     tag.uid = (uint32_t)tag.pages[0];
     tag.key = (intptr_t)tag.pages[3];
     tag.key <<= 16;
@@ -996,11 +996,11 @@ void SimulateHitagSTag(bool tag_mem_supplied, uint8_t *data) {
     // Disable modulation at default, which means release resistance
     LOW(GPIO_SSC_DOUT);
 
-    // Enable Peripheral Clock for 
+    // Enable Peripheral Clock for
     //   TIMER_CLOCK0, used to measure exact timing before answering
-    //   TIMER_CLOCK1, used to capture edges of the tag frames    
+    //   TIMER_CLOCK1, used to capture edges of the tag frames
     AT91C_BASE_PMC->PMC_PCER |= (1 << AT91C_ID_TC0) | (1 << AT91C_ID_TC1);
-    
+
     AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
 
     // Disable timer during configuration
@@ -1008,20 +1008,20 @@ void SimulateHitagSTag(bool tag_mem_supplied, uint8_t *data) {
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 
     // TC0: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), no triggers
-	AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK;
-    
+    AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK;
+
     // TC1: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
     // external trigger rising edge, load RA on rising edge of TIOA.
     AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK
                              | AT91C_TC_ETRGEDG_RISING | AT91C_TC_ABETRG | AT91C_TC_LDRA_RISING;
 
     // Enable and reset counter
-    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;    
+    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
     // synchronized startup procedure
-    while (AT91C_BASE_TC0->TC_CV > 0); // wait until TC0 returned to zero    
-    
+    while (AT91C_BASE_TC0->TC_CV > 0); // wait until TC0 returned to zero
+
     while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
 
         WDT_HIT();
@@ -1100,7 +1100,7 @@ void SimulateHitagSTag(bool tag_mem_supplied, uint8_t *data) {
         // Reset the timer to restart while-loop that receives frames
         AT91C_BASE_TC1->TC_CCR = AT91C_TC_SWTRG;
     }
-    
+
     LEDsoff();
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     set_tracing(false);
@@ -1109,10 +1109,10 @@ void SimulateHitagSTag(bool tag_mem_supplied, uint8_t *data) {
 
     // release allocated memory from BigBuff.
     BigBuf_free();
-  
+
     StartTicks();
-    
-    DbpString("Sim Stopped");    
+
+    DbpString("Sim Stopped");
 }
 
 /*
@@ -1123,7 +1123,7 @@ void SimulateHitagSTag(bool tag_mem_supplied, uint8_t *data) {
 void ReadHitagS(hitag_function htf, hitag_data *htd) {
 
     StopTicks();
-    
+
     int i, j, z, k;
     int frame_count = 0, response = 0;
     int response_bit[200];
@@ -1149,7 +1149,7 @@ void ReadHitagS(hitag_function htf, hitag_data *htd) {
     uint64_t key = 0;
     uint64_t NrAr = 0;
     uint8_t key_[6];
-    
+
     switch (htf) {
         case RHTSF_CHALLENGE: {
             DbpString("Authenticating using nr,ar pair:");
@@ -1157,7 +1157,7 @@ void ReadHitagS(hitag_function htf, hitag_data *htd) {
             Dbhexdump(8, NrAr_, false);
             NrAr = NrAr_[7] | ((uint64_t)NrAr_[6]) << 8 | ((uint64_t)NrAr_[5]) << 16 | ((uint64_t)NrAr_[4]) << 24 | ((uint64_t)NrAr_[3]) << 32 |
                    ((uint64_t)NrAr_[2]) << 40 | ((uint64_t)NrAr_[1]) << 48 | ((uint64_t)NrAr_[0]) << 56;
-            break;                   
+            break;
         }
         case RHTSF_KEY: {
             DbpString("Authenticating using key:");
@@ -1188,17 +1188,17 @@ void ReadHitagS(hitag_function htf, hitag_data *htd) {
     FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_READER_FIELD);
     FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
     SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
-    
+
     // Configure output and enable pin that is connected to the FPGA (for modulating)
     AT91C_BASE_PIOA->PIO_OER |= GPIO_SSC_DOUT;
     AT91C_BASE_PIOA->PIO_PER |= GPIO_SSC_DOUT;
-    
+
     // Disable modulation at default, which means enable the field
     LOW(GPIO_SSC_DOUT);
 
-    // Enable Peripheral Clock for 
+    // Enable Peripheral Clock for
     //   TIMER_CLOCK0, used to measure exact timing before answering
-    //   TIMER_CLOCK1, used to capture edges of the tag frames    
+    //   TIMER_CLOCK1, used to capture edges of the tag frames
     AT91C_BASE_PMC->PMC_PCER |= (1 << AT91C_ID_TC0) | (1 << AT91C_ID_TC1);
 
     AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
@@ -1208,8 +1208,8 @@ void ReadHitagS(hitag_function htf, hitag_data *htd) {
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 
     // TC0: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), no triggers
-	AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK;
-    
+    AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK;
+
     // TC1: Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
     // external trigger rising edge, load RA on falling edge of TIOA.
     AT91C_BASE_TC1->TC_CMR =
@@ -1224,7 +1224,7 @@ void ReadHitagS(hitag_function htf, hitag_data *htd) {
 
     // synchronized startup procedure
     while (AT91C_BASE_TC0->TC_CV > 0); // wait until TC0 returned to zero
-    
+
     // Reset the received frame, frame count and timing info
     t_wait = 200;
 
@@ -1252,7 +1252,7 @@ void ReadHitagS(hitag_function htf, hitag_data *htd) {
             if (hitagS_handle_tag_auth(htf, key, NrAr, rx, rxlen, tx, &txlen) == -1)
                 bStop = !false;
         }
-        
+
         if (tag.pstate == HT_SELECTED && tag.tstate == HT_NO_OP && rxlen > 0) {
             //send read request
             tag.tstate = HT_READING_PAGE;
@@ -1263,9 +1263,9 @@ void ReadHitagS(hitag_function htf, hitag_data *htd) {
             calc_crc(&crc, 0x00 + ((sendNum % 16) * 16), 4);
             tx[1] = 0x00 + ((sendNum % 16) * 16) + (crc / 16);
             tx[2] = 0x00 + (crc % 16) * 16;
-        } else if (tag.pstate == HT_SELECTED 
-                    && tag.tstate == HT_READING_PAGE
-                    && rxlen > 0) {
+        } else if (tag.pstate == HT_SELECTED
+                   && tag.tstate == HT_READING_PAGE
+                   && rxlen > 0) {
             //save received data
             z = 0;
             for (i = 0; i < 5; i++) {
@@ -1315,13 +1315,13 @@ void ReadHitagS(hitag_function htf, hitag_data *htd) {
                              (uint8_t) key & 0xff,
                              pwdl1,
                              pwdl0
-                         );
+                            );
                     Dbprintf("Page[ 3]: %02X %02X %02X %02X",
                              (uint8_t)(key >> 40) & 0xff,
                              (uint8_t)(key >> 32) & 0xff,
                              (uint8_t)(key >> 24) & 0xff,
                              (uint8_t)(key >> 16) & 0xff
-                        );
+                            );
                 } else {
                     //if the authentication is done with a challenge the key and password are unknown
                     Dbprintf("Page[ 2]: __ __ __ __");
@@ -1362,7 +1362,7 @@ void ReadHitagS(hitag_function htf, hitag_data *htd) {
         // Add transmitted frame to total count
         if (txlen > 0) {
             frame_count++;
-            LogTrace(tx, nbytes(txlen), HITAG_T_WAIT_2, 0, NULL, true);  
+            LogTrace(tx, nbytes(txlen), HITAG_T_WAIT_2, 0, NULL, true);
         }
 
         // Reset values for receiving frames
@@ -1437,13 +1437,13 @@ void ReadHitagS(hitag_function htf, hitag_data *htd) {
     LEDsoff();
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     set_tracing(false);
-    
+
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 
     StartTicks();
-        
+
     cmd_send(CMD_ACK, bSuccessful, 0, 0, 0, 0);
 }
 
@@ -1452,9 +1452,9 @@ void ReadHitagS(hitag_function htf, hitag_data *htd) {
  * Writes the given 32Bit data into page_
  */
 void WritePageHitagS(hitag_function htf, hitag_data *htd, int page_) {
-    
+
     StopTicks();
-    
+
     int frame_count = 0, response = 0;
     uint8_t rx[HITAG_FRAME_LEN];
     size_t rxlen = 0;
@@ -1474,11 +1474,11 @@ void WritePageHitagS(hitag_function htf, hitag_data *htd, int page_) {
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
 
     bSuccessful = false;
-    
+
     // Clean up trace and prepare it for storing frames
     set_tracing(true);
     clear_trace();
-    
+
     //read given key/challenge, the page and the data
     uint8_t NrAr_[8];
     uint64_t key = 0;
@@ -1529,11 +1529,11 @@ void WritePageHitagS(hitag_function htf, hitag_data *htd, int page_) {
     // Disable modulation at default, which means enable the field
     LOW(GPIO_SSC_DOUT);
 
-    // Enable Peripheral Clock for 
+    // Enable Peripheral Clock for
     //   TIMER_CLOCK0, used to measure exact timing before answering
     //   TIMER_CLOCK1, used to capture edges of the tag frames
     AT91C_BASE_PMC->PMC_PCER |= (1 << AT91C_ID_TC0) | (1 << AT91C_ID_TC1);
-    
+
     AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
 
     // Disable timer during configuration
@@ -1552,7 +1552,7 @@ void WritePageHitagS(hitag_function htf, hitag_data *htd, int page_) {
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
     while (AT91C_BASE_TC0->TC_CV > 0);
-        
+
     // Reset the received frame, frame count and timing info
     lastbit = 1;
     bStop = false;
@@ -1664,7 +1664,7 @@ void WritePageHitagS(hitag_function htf, hitag_data *htd, int page_) {
         tag_sof = reset_sof;
         response = 0;
         uint32_t errorCount = 0;
-        
+
         // Receive frame, watch for at most T0*EOF periods
         while (AT91C_BASE_TC1->TC_CV < T0 * HITAG_T_WAIT_MAX) {
             // Check if falling edge in tag modulation is detected
@@ -1714,13 +1714,13 @@ void WritePageHitagS(hitag_function htf, hitag_data *htd, int page_) {
                     }
                 } else {
                     // Ignore wierd value, is to small to mean anything
-                    errorCount++;                    
+                    errorCount++;
                 }
             }
-            
+
             // if we saw over 100 wierd values break it probably isn't hitag...
             if (errorCount > 100) break;
-            
+
             // We can break this loop if we received the last bit from a frame
             if (AT91C_BASE_TC1->TC_CV > T0 * HITAG_T_EOF) {
                 if (rxlen > 0)
@@ -1732,12 +1732,12 @@ void WritePageHitagS(hitag_function htf, hitag_data *htd, int page_) {
     LEDsoff();
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     set_tracing(false);
-    
+
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
-    
+
     StartTicks();
-        
+
     cmd_send(CMD_ACK, bSuccessful, 0, 0, 0, 0);
 }
 
@@ -1795,7 +1795,7 @@ void check_challenges(bool file_given, uint8_t *data) {
     // Disable modulation at default, which means enable the field
     LOW(GPIO_SSC_DOUT);
 
-    // Enable Peripheral Clock for 
+    // Enable Peripheral Clock for
     //   TIMER_CLOCK0, used to measure exact timing before answering
     //   TIMER_CLOCK1, used to capture edges of the tag frames
     AT91C_BASE_PMC->PMC_PCER |= (1 << AT91C_ID_TC0) | (1 << AT91C_ID_TC1);
@@ -1807,7 +1807,7 @@ void check_challenges(bool file_given, uint8_t *data) {
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 
     // TC0: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), no triggers
-	AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK;    
+    AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK;
 
     // TC1:  Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
     // external trigger rising edge, load RA on falling edge of TIOA.
@@ -1821,7 +1821,7 @@ void check_challenges(bool file_given, uint8_t *data) {
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
     while (AT91C_BASE_TC0->TC_CV > 0) {};
-    
+
     // Reset the received frame, frame count and timing info
     lastbit = 1;
     bStop = false;
@@ -2044,9 +2044,9 @@ void check_challenges(bool file_given, uint8_t *data) {
 
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
-    
+
     StartTicks();
-    
+
     cmd_send(CMD_ACK, bSuccessful, 0, 0, 0, 0);
 }
 
diff --git a/armsrc/iso14443b.c b/armsrc/iso14443b.c
index 4d5b3330c..5d988459b 100644
--- a/armsrc/iso14443b.c
+++ b/armsrc/iso14443b.c
@@ -1586,7 +1586,7 @@ void SendRawCommand14443B_Ex(UsbCommand *c) {
         iso14443b_setup();
         clear_trace();
     }
-    
+
     if ((param & ISO14B_SET_TIMEOUT))
         iso14b_set_timeout(timeout);
 
diff --git a/client/cmddata.c b/client/cmddata.c
index 0df6268dd..bb68f90c1 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -771,7 +771,7 @@ int AutoCorrelate(const int *in, int *out, size_t len, int window, bool SaveGrph
 
     int foo = ABS(hi - hi_1);
     int bar = (int)((int)((hi + hi_1) / 2) * 0.04);
-   
+
     if (verbose && foo < bar) {
         distance = idx_1 - idx;
         PrintAndLogEx(SUCCESS, "possible 4% visible correlation %4d samples", distance);
diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c
index 4be9a53b1..19e48a902 100644
--- a/client/cmdhf14b.c
+++ b/client/cmdhf14b.c
@@ -198,7 +198,7 @@ int CmdHF14BCmdRaw(const char *Cmd) {
                     i += 3;
                     while (Cmd[i] != ' ' && Cmd[i] != '\0') { i++; }
                     i -= 2;
-                    break;                    
+                    break;
                 default:
                     return usage_hf_14b_raw();
             }
@@ -223,7 +223,7 @@ int CmdHF14BCmdRaw(const char *Cmd) {
         PrintAndLogEx(WARNING, "unknown parameter '%c'\n", param_getchar(Cmd, i));
         return 0;
     }
-    
+
     if (timeout) {
 #define MAX_TIMEOUT 40542464 // = (2^32-1) * (8*16) / 13560000Hz * 1000ms/s
         flags |= ISO14B_SET_TIMEOUT;
diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index c6f4c207e..23a756062 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -688,7 +688,7 @@ int CmdHF15Dump(const char *Cmd) {
         PrintAndLogEx(WARNING, "No tag found.");
         return 1;
     }
-    
+
     if (fileNameLen < 1) {
 
         PrintAndLogEx(INFO, "Using UID as filename");
diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index 11677a32c..ad0f510a7 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -1376,7 +1376,7 @@ int CmdHFiClassCloneTag(const char *Cmd) {
     }
 
     fclose(f);
-            
+
     uint8_t MAC[4] = {0x00, 0x00, 0x00, 0x00};
     uint8_t div_key[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
@@ -1404,12 +1404,12 @@ int CmdHFiClassCloneTag(const char *Cmd) {
         PrintAndLogEx(NORMAL, " %02x%02x%02x%02x%02x%02x%02x%02x |", p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7]);
         PrintAndLogEx(NORMAL, " MAC |%02x%02x%02x%02x|\n", p[8], p[9], p[10], p[11]);
     }
-    
+
     UsbCommand resp;
     clearCommandBuffer();
     SendCommand(&w);
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 4500)) {
-        PrintAndLogEx(WARNING, "command execute timeout");        
+        PrintAndLogEx(WARNING, "command execute timeout");
         return 0;
     }
     return 1;
diff --git a/client/cmdlf.c b/client/cmdlf.c
index 1b9387848..948cf2235 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -897,10 +897,10 @@ int CmdLFfind(const char *Cmd) {
 
     if (EM4x50Read("", false))  { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("EM4x50 ID") " found!"); return 1;}
 
-    if (CmdHIDDemod(""))        { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("HID Prox ID") " found!"); goto out;}   
+    if (CmdHIDDemod(""))        { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("HID Prox ID") " found!"); goto out;}
     if (CmdAWIDDemod(""))       { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("AWID ID") " found!"); goto out;}
     if (CmdParadoxDemod(""))    { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Paradox ID") " found!"); goto out;}
-    
+
     if (CmdEM410xDemod(""))     { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("EM410x ID") " found!"); goto out;}
     if (CmdFdxDemod(""))        { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("FDX-B ID") " found!"); goto out;}
     if (CmdGuardDemod(""))      { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Guardall G-Prox II ID") " found!"); goto out; }
diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index 9af707efe..e869c10a0 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -65,13 +65,13 @@ int usage_hitag_info(void) {
 int usage_hitag_dump(void) {
     PrintAndLogEx(NORMAL, "Usage:   lf hitag dump [h] p <pwd> f <name>");
     PrintAndLogEx(NORMAL, "Options:");
-    PrintAndLogEx(NORMAL, "       h          This help");    
+    PrintAndLogEx(NORMAL, "       h          This help");
 //    PrintAndLogEx(NORMAL, "       p <pwd>    password");
 //    PrintAndLogEx(NORMAL, "       f <name>   data filename, if no <name> given, UID will be used as filename");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "         lf hitag dump f mydump");
-    PrintAndLogEx(NORMAL, "         lf hitag dump p 4D494B52 f mydump");    
+    PrintAndLogEx(NORMAL, "         lf hitag dump p 4D494B52 f mydump");
     return 0;
 }
 int usage_hitag_reader(void) {
@@ -106,7 +106,7 @@ int usage_hitag_writer(void) {
 }
 int usage_hitag_checkchallenges(void) {
     PrintAndLogEx(NORMAL, "Check challenges, load a file with save hitag crypto challenges and test them all.");
-    PrintAndLogEx(NORMAL, "The file should be 8 * 60 bytes long,  the file extension defaults to " _YELLOW_("`.cc`") );
+    PrintAndLogEx(NORMAL, "The file should be 8 * 60 bytes long,  the file extension defaults to " _YELLOW_("`.cc`"));
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:   lf hitag cc [h] f <filename w/o extension>");
     PrintAndLogEx(NORMAL, "Options:");
@@ -117,8 +117,8 @@ int usage_hitag_checkchallenges(void) {
     PrintAndLogEx(NORMAL, "         lf hitag cc f lf-hitag-challenges");
     return 0;
 }
-    
-int CmdLFHitagList(const char *Cmd) {    
+
+int CmdLFHitagList(const char *Cmd) {
     CmdTraceList("hitag");
     return 0;
 
@@ -254,7 +254,7 @@ int CmdLFHitagSniff(const char *Cmd) {
 
     char ctmp = tolower(param_getchar(Cmd, 0));
     if (ctmp == 'h') return usage_hitag_sniff();
-    
+
     UsbCommand c = {CMD_SNIFF_HITAG, {0, 0, 0}};
     clearCommandBuffer();
     SendCommand(&c);
@@ -271,16 +271,16 @@ int CmdLFHitagSim(const char *Cmd) {
     size_t datalen = 0;
     int res = 0;
     char filename[FILE_PATH_SIZE] = { 0x00 };
-    
+
     UsbCommand c = {CMD_SIMULATE_HITAG, {0, 0, 0}};
-    
+
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
             case 'h':
                 free(data);
                 return usage_hitag_sim();
             case '2':
-                maxdatalen = 48;  
+                maxdatalen = 48;
                 cmdp++;
                 break;
             case 's':
@@ -288,36 +288,36 @@ int CmdLFHitagSim(const char *Cmd) {
                 maxdatalen = 4 * 64;
                 cmdp++;
                 break;
-            case 'e':                
-                param_getstr(Cmd, cmdp+1, filename, sizeof(filename));
+            case 'e':
+                param_getstr(Cmd, cmdp + 1, filename, sizeof(filename));
                 res = loadFileEML(filename, "eml", data, &datalen);
-                if ( res > 0 || datalen != maxdatalen) {
-                    PrintAndLogDevice(FAILED, "error, bytes read mismatch file size");                    
+                if (res > 0 || datalen != maxdatalen) {
+                    PrintAndLogDevice(FAILED, "error, bytes read mismatch file size");
                     errors = true;
                     break;
                 }
                 tag_mem_supplied = true;
                 cmdp += 2;
-                break;                
+                break;
             case 'j':
-                param_getstr(Cmd, cmdp+1, filename, sizeof(filename));
+                param_getstr(Cmd, cmdp + 1, filename, sizeof(filename));
                 res = loadFileJSON(filename, "json", data, maxdatalen, &datalen);
-                if ( res > 0) {
+                if (res > 0) {
                     errors = true;
                     break;
-                }                
+                }
                 tag_mem_supplied = true;
                 cmdp += 2;
-                break;                
+                break;
             case 'b':
-                param_getstr(Cmd, cmdp+1, filename, sizeof(filename));
+                param_getstr(Cmd, cmdp + 1, filename, sizeof(filename));
                 res = loadFile(filename, "bin", data, maxdatalen, &datalen);
-                if ( res > 0 ) {
+                if (res > 0) {
                     errors = true;
                     break;
-                }                
+                }
                 tag_mem_supplied = true;
-                cmdp += 2;                
+                cmdp += 2;
                 break;
             default:
                 PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
@@ -325,30 +325,30 @@ int CmdLFHitagSim(const char *Cmd) {
                 break;
         }
     }
-    
+
     //Validations
     if (errors || cmdp == 0) {
         free(data);
         return usage_hitag_sim();
     }
-    
+
     c.arg[0] = (uint32_t)tag_mem_supplied;
-    if ( tag_mem_supplied ) {
+    if (tag_mem_supplied) {
         memcpy(c.d.asBytes, data, datalen);
     }
     clearCommandBuffer();
     SendCommand(&c);
 
-    free(data);    
+    free(data);
     return 0;
 }
 
 int CmdLFHitagInfo(const char *Cmd) {
     PrintAndLogEx(INFO, "Gather tag information ");
     PrintAndLogEx(INFO, "To be done!");
-        
+
     char ctmp = tolower(param_getchar(Cmd, 0));
-    if (ctmp == 'h') return usage_hitag_info();    
+    if (ctmp == 'h') return usage_hitag_info();
     return 0;
 }
 
@@ -415,48 +415,48 @@ int CmdLFHitagReader(const char *Cmd) {
     if (htf == RHT2F_UID_ONLY) {
         PrintAndLogEx(SUCCESS, "Valid Hitag2 tag found - UID: %08x", id);
     } else {
-        
+
         uint8_t *data = resp.d.asBytes;
-        
+
         char filename[FILE_PATH_SIZE];
         char *fnameptr = filename;
         fnameptr += sprintf(fnameptr, "lf-hitag-");
         FillFileNameByUID(fnameptr, data, "-dump", 4);
 
-        saveFile(filename, "bin", data, 48);        
+        saveFile(filename, "bin", data, 48);
         saveFileEML(filename, "eml", data, 48, 4);
-        saveFileJSON(filename, "json", jsfHitag, (uint8_t *)data, 48);        
+        saveFileJSON(filename, "json", jsfHitag, (uint8_t *)data, 48);
     }
     return 0;
 }
 
 int CmdLFHitagCheckChallenges(const char *Cmd) {
-  
+
     UsbCommand c = { CMD_TEST_HITAGS_TRACES, {0, 0, 0}};
     char filename[FILE_PATH_SIZE] = { 0x00 };
     size_t datalen = 0;
     int res = 0;
     bool file_given = false;
-    bool errors = false;    
+    bool errors = false;
     uint8_t cmdp = 0;
     uint8_t *data = calloc(8 * 60, sizeof(uint8_t));
-        
+
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
             case 'h':
                 free(data);
                 return usage_hitag_checkchallenges();
             case 'f':
-                param_getstr(Cmd, cmdp+1, filename, sizeof(filename));
+                param_getstr(Cmd, cmdp + 1, filename, sizeof(filename));
                 res = loadFile(filename, "cc", data, 8 * 60, &datalen);
-                if ( res > 0 ) {
+                if (res > 0) {
                     errors = true;
                     break;
                 }
-                
+
                 memcpy(c.d.asBytes, data, datalen);
                 file_given = true;
-                cmdp += 2;                
+                cmdp += 2;
                 break;
             default:
                 PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
@@ -464,19 +464,19 @@ int CmdLFHitagCheckChallenges(const char *Cmd) {
                 break;
         }
     }
-    
+
     //Validations
     if (errors) {
-        free(data);        
+        free(data);
         return usage_hitag_checkchallenges();
     }
-    
+
     //file with all the challenges to try
     c.arg[0] = (uint32_t)file_given;
     clearCommandBuffer();
     SendCommand(&c);
 
-    free(data);    
+    free(data);
     return 0;
 }
 
@@ -484,7 +484,7 @@ int CmdLFHitagWriter(const char *Cmd) {
     UsbCommand c = { CMD_WR_HITAG_S, {0, 0, 0}};
     hitag_data *htd = (hitag_data *)c.d.asBytes;
     hitag_function htf = param_get32ex(Cmd, 0, 0, 10);
-    
+
     switch (htf) {
         case WHTSF_CHALLENGE: {
             num_to_bytes(param_get64ex(Cmd, 1, 0, 16), 8, htd->auth.NrAr);
@@ -512,20 +512,20 @@ int CmdLFHitagWriter(const char *Cmd) {
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 4000)) {
         PrintAndLogEx(WARNING, "timeout while waiting for reply.");
         return 1;
-    }    
+    }
 
     if (resp.arg[0] == false) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - hitag write failed");
         return 1;
-    }    
+    }
     return 0;
 }
 
 int CmdLFHitagDump(const char *Cmd) {
     PrintAndLogEx(INFO, "Dumping of tag memory");
     PrintAndLogEx(INFO, "To be done!");
-        
-    char ctmp = tolower(param_getchar(Cmd, 0));    
+
+    char ctmp = tolower(param_getchar(Cmd, 0));
     if (ctmp == 'h') return usage_hitag_dump();
     return 0;
 }
diff --git a/client/cmdtrace.c b/client/cmdtrace.c
index 7251313d6..05a85a050 100644
--- a/client/cmdtrace.c
+++ b/client/cmdtrace.c
@@ -191,12 +191,12 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
     for (int j = 0; j < data_len && j / 18 < 18; j++) {
 
         uint8_t parityBits = parityBytes[j >> 3];
-        if ( protocol != LEGIC
-            && protocol != ISO_14443B
-            && protocol != ISO_7816_4
-            && protocol != PROTO_HITAG
-            && (isResponse || protocol == ISO_14443A)
-            && (oddparity8(frame[j]) != ((parityBits >> (7 - (j & 0x0007))) & 0x01))) {
+        if (protocol != LEGIC
+                && protocol != ISO_14443B
+                && protocol != ISO_7816_4
+                && protocol != PROTO_HITAG
+                && (isResponse || protocol == ISO_14443A)
+                && (oddparity8(frame[j]) != ((parityBits >> (7 - (j & 0x0007))) & 0x01))) {
 
             snprintf(line[j / 18] + ((j % 18) * 4), 110, "%02x! ", frame[j]);
         } else {
diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index f9ef1244e..0c345ca14 100644
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -244,12 +244,12 @@ int saveFileJSON(const char *preferredName, const char *suffix, JSONFileType fty
             memcpy(uid, data, 4);
 
             JsonSaveBufAsHexCompact(root, "$.Card.UID", uid, sizeof(uid));
-            
+
             for (int i = 0; i < (datalen / 4); i++) {
                 char path[PATH_MAX_LENGTH] = {0};
                 sprintf(path, "$.blocks.%d", i);
                 JsonSaveBufAsHexCompact(root, path, data + (i * 4), 4);
-            }               
+            }
             break;
         }
     }
@@ -313,10 +313,10 @@ int loadFile(const char *preferredName, const char *suffix, void *data, size_t m
         retval = 3;
         goto out;
     }
-    
-    if ( bytes_read != maxdatalen ) {
+
+    if (bytes_read != maxdatalen) {
         PrintAndLogDevice(WARNING, "Warning, bytes read exeed calling array limit. Max bytes is %d bytes", maxdatalen);
-        bytes_read = maxdatalen;        
+        bytes_read = maxdatalen;
     }
 
     memcpy((data), dump, bytes_read);
@@ -470,7 +470,7 @@ int loadFileJSON(const char *preferredName, const char *suffix, void *data, size
 
     if (!strcmp(ctype, "hitag")) {
         size_t sptr = 0;
-        for (int i = 0; i < (maxdatalen/4); i++) {
+        for (int i = 0; i < (maxdatalen / 4); i++) {
             if (sptr + 4 > maxdatalen) {
                 retval = 5;
                 goto out;
diff --git a/client/loclass/fileutils.h b/client/loclass/fileutils.h
index de5bbdfbd..7b358331a 100644
--- a/client/loclass/fileutils.h
+++ b/client/loclass/fileutils.h
@@ -59,7 +59,7 @@ typedef enum {
 //    jsf14b,
 //    jsf15,
 //    jsfLegic,
-//    jsfT55xx,  
+//    jsfT55xx,
 } JSONFileType;
 
 int fileExists(const char *filename);
diff --git a/include/hitag.h b/include/hitag.h
index 209556b65..742d7ecd0 100644
--- a/include/hitag.h
+++ b/include/hitag.h
@@ -21,36 +21,36 @@
 #endif
 
 typedef enum {
-	RHTSF_CHALLENGE           = 01,
-	RHTSF_KEY                 = 02,
-	WHTSF_CHALLENGE           = 03,
-	WHTSF_KEY                 = 04,
-	RHT2F_PASSWORD            = 21,
-	RHT2F_AUTHENTICATE        = 22,
-	RHT2F_CRYPTO              = 23,
-	WHT2F_CRYPTO              = 24,
-	RHT2F_TEST_AUTH_ATTEMPTS  = 25,
-	RHT2F_UID_ONLY            = 26,
+    RHTSF_CHALLENGE           = 01,
+    RHTSF_KEY                 = 02,
+    WHTSF_CHALLENGE           = 03,
+    WHTSF_KEY                 = 04,
+    RHT2F_PASSWORD            = 21,
+    RHT2F_AUTHENTICATE        = 22,
+    RHT2F_CRYPTO              = 23,
+    WHT2F_CRYPTO              = 24,
+    RHT2F_TEST_AUTH_ATTEMPTS  = 25,
+    RHT2F_UID_ONLY            = 26,
 } hitag_function;
 
 typedef struct {
-	uint8_t password[4];
+    uint8_t password[4];
 } PACKED rht2d_password;
 
 typedef struct {
-	uint8_t NrAr[8];
-	uint8_t data[4];
+    uint8_t NrAr[8];
+    uint8_t data[4];
 } PACKED rht2d_authenticate;
 
 typedef struct {
-	uint8_t key[6];
-	uint8_t data[4];
+    uint8_t key[6];
+    uint8_t data[4];
 } PACKED rht2d_crypto;
 
 typedef union {
-	rht2d_password     pwd;
-	rht2d_authenticate auth;
-	rht2d_crypto       crypto;
+    rht2d_password     pwd;
+    rht2d_authenticate auth;
+    rht2d_crypto       crypto;
 } hitag_data;
 
 
@@ -83,35 +83,35 @@ typedef enum SOF_TYPE {
     HT_FAST_ADVANCED,
     HT_ONE,
     HT_NO_BITS
-} stype;                                             
+} stype;
 
 struct hitagS_tag {
-	PSTATE   pstate;  //protocol-state
-	TSATE    tstate;  //tag-state
-	uint32_t uid;
-	uint8_t  pages[64][4];
-	uint64_t key;
-	uint8_t  pwdl0, pwdl1, pwdh0;
-	//con0
-	int      max_page;
-	stype    mode;
-	//con1
-	bool     auth;   //0=Plain 1=Auth
-	bool     TTFC;   //Transponder Talks first coding. 0=Manchester 1=Biphase
-	int      TTFDR;  //data rate in TTF Mode
-	int      TTFM;   //the number of pages that are sent to the RWD
-	bool     LCON;   //0=con1/2 read write 1=con1 read only and con2 OTP
-	bool     LKP;    //0=page2/3 read write 1=page2/3 read only in Plain mode and no access in authenticate mode
-	//con2
-	//0=read write 1=read only
-	bool     LCK7;   //page4/5
-	bool     LCK6;   //page6/7
-	bool     LCK5;   //page8-11
-	bool     LCK4;   //page12-15
-	bool     LCK3;   //page16-23
-	bool     LCK2;   //page24-31
-	bool     LCK1;   //page32-47
-	bool     LCK0;   //page48-63
+    PSTATE   pstate;  //protocol-state
+    TSATE    tstate;  //tag-state
+    uint32_t uid;
+    uint8_t  pages[64][4];
+    uint64_t key;
+    uint8_t  pwdl0, pwdl1, pwdh0;
+    //con0
+    int      max_page;
+    stype    mode;
+    //con1
+    bool     auth;   //0=Plain 1=Auth
+    bool     TTFC;   //Transponder Talks first coding. 0=Manchester 1=Biphase
+    int      TTFDR;  //data rate in TTF Mode
+    int      TTFM;   //the number of pages that are sent to the RWD
+    bool     LCON;   //0=con1/2 read write 1=con1 read only and con2 OTP
+    bool     LKP;    //0=page2/3 read write 1=page2/3 read only in Plain mode and no access in authenticate mode
+    //con2
+    //0=read write 1=read only
+    bool     LCK7;   //page4/5
+    bool     LCK6;   //page6/7
+    bool     LCK5;   //page8-11
+    bool     LCK4;   //page12-15
+    bool     LCK3;   //page16-23
+    bool     LCK2;   //page24-31
+    bool     LCK1;   //page32-47
+    bool     LCK0;   //page48-63
 };
 
 #endif
diff --git a/proxmark3.sh b/proxmark3.sh
index 34691b95a..b109d82e6 100755
--- a/proxmark3.sh
+++ b/proxmark3.sh
@@ -2,7 +2,7 @@
 
 function wait4proxmark_Linux {
     echo >&2 "Waiting for Proxmark to appear..."
-    while [ ! -c /dev/ttyACM? -a ! -L /dev/pm3-? ]; do
+    while [ ! -c /dev/ttyACM? -a ! -c /dev/pm3-? ]; do
         sleep .1
     done
     local PM3=`ls -1 /dev/pm3-? /dev/ttyACM? 2>/dev/null | head -1`

From f7b0c5e6d64924173e8ce34f0a72949fa7b67489 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 14 Mar 2019 13:19:16 +0100
Subject: [PATCH 0788/1938] fix manrawdecode last bit missing

---
 common/lfdemod.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/lfdemod.c b/common/lfdemod.c
index f356e7578..e2c10bf2c 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -1368,7 +1368,7 @@ int manrawdecode(uint8_t *bits, size_t *size, uint8_t invert, uint8_t *alignPos)
 
     //find correct start position [alignment]
     for (k = 0; k < 2; ++k) {
-        for (i = k; i < *size - 3; i += 2) {
+        for (i = k; i < *size - 1; i += 2) {
             if (bits[i] == bits[i + 1])
                 errCnt++;
         }
@@ -1380,7 +1380,7 @@ int manrawdecode(uint8_t *bits, size_t *size, uint8_t invert, uint8_t *alignPos)
     }
     *alignPos = bestRun;
     //decode
-    for (i = bestRun; i < *size - 3; i += 2) {
+    for (i = bestRun; i < *size - 1; i += 2) {
         if (bits[i] == 1 && (bits[i + 1] == 0)) {
             bits[bitnum++] = invert;
         } else if ((bits[i] == 0) && bits[i + 1] == 1) {

From 24e53ccbc87264a89ee6bbcf30feba546e18d579 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 14 Mar 2019 17:04:20 +0100
Subject: [PATCH 0789/1938] text

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb62a55b3..b6de5eb76 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [unreleased][unreleased]
+ - Fix 'data rawdemod am' - last bit was missing (@doegox)
+ - Fix 'hf 15 dump f' - also selects tag first (@iceman)
+ - Fix 'hf iclass clone' - missing fileclose (@iceman)
+ - Add 'trace list hitag' - old hitag annotations now use the new trace (@iceman)
+ - Change 'lf hitag sim' - loads bin/eml/json (@iceman)
+ - Change 'lf hitag reader 21' - saves in bin/eml/json (@iceman)
  - Change 'lf hitag' - refactoring (@iceman)
  - Change 'lf hitag' - refactoring (@piwi)
  - Fix 'lf hitag' - generic fix for missing clock init (@piwi)

From 5c3f12ee43878be0d54f5fc4a9afc3d6e8e897e4 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 14 Mar 2019 23:30:45 +0100
Subject: [PATCH 0790/1938] chg: 'lf hitag info' - added printing of
 configuration byte. (work-in-progress)

---
 client/cmdlfhitag.c | 103 ++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 100 insertions(+), 3 deletions(-)

diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index e869c10a0..ac5d6f795 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -343,12 +343,109 @@ int CmdLFHitagSim(const char *Cmd) {
     return 0;
 }
 
-int CmdLFHitagInfo(const char *Cmd) {
-    PrintAndLogEx(INFO, "Gather tag information ");
-    PrintAndLogEx(INFO, "To be done!");
+static void printHitagConfiguration(uint8_t config) {
+    char msg[80];
+    memset(msg, 0, sizeof(msg));
+    // encoding
+    if (config & 0x1) {
+        strcat(msg, "Biphase encoding");        
+    } else {
+        strcat(msg, "Manchester encoding");
+    }
+    PrintAndLogEx(SUCCESS, "%s", msg);
+    memset(msg, 0, sizeof(msg));
+    
+    // version
+    strcat(msg, "Coding in HITAG 2 operation: %s");
+    uint8_t foo = (config & 0x6) >> 1;
+    switch ( foo ) {
+        case 0:
+            PrintAndLogEx(SUCCESS, "Version: public mode B, Coding: biphase");
+            PrintAndLogEx(SUCCESS, msg, (config & 0x1) ? "biphase" : "manchester");
+            break;
+        case 1:
+            PrintAndLogEx(SUCCESS, "Version: public mode A, Coding: manchester");
+            PrintAndLogEx(SUCCESS, msg, (config & 0x1) ? "biphase" : "manchester");
+            break;        
+        case 2:
+            PrintAndLogEx(SUCCESS, "Version: public mode C, Coding: biphase");
+            PrintAndLogEx(SUCCESS, msg, (config & 0x1) ? "biphase" : "manchester");
+            break;        
+        case 3:
+            PrintAndLogEx(SUCCESS, "Version: Hitag2");
+            PrintAndLogEx(SUCCESS, msg, (config & 0x1) ? "biphase" : "manchester");
+            break;
+    }
+    memset(msg, 0, sizeof(msg));
+     
+    // mode
+    if (config & 0x8) {
+        strcat(msg, "Tag is in : " _YELLOW_("Crypto mode") );
+    } else  {
+        strcat(msg, "Tag is in : " _YELLOW_("Password mode") );
+    }
+    PrintAndLogEx(SUCCESS, "%s", msg);    
+    memset(msg, 0, sizeof(msg));
+       
+    // page access
+    if (config & 0x10) {
+        strcat(msg, "Page 6,7  : read only");
+    } else  {
+        strcat(msg, "Page 6,7  : " _GREEN_("read write"));
+    }
+    PrintAndLogEx(SUCCESS, "%s", msg); 
+    memset(msg, 0, sizeof(msg));
+    
+    // page access
+    if (config & 0x20) {
+        strcat(msg, "Page 4,5  : read only");
+    } else  {
+        strcat(msg, "Page 4,5  : " _GREEN_("read write"));
+    }
+    PrintAndLogEx(SUCCESS, "%s", msg); 
+    memset(msg, 0, sizeof(msg));
+    
+    // OTP
+    if (config & 0x40) {
+        strcat(msg, "Page 3    : read only. Configuration byte and password tag " _RED_("FIXED / IRREVERSIBLE") );
+    } else  {
+        strcat(msg, "Page 3    : " _GREEN_("read write"));
+    }    
+    PrintAndLogEx(SUCCESS, "%s", msg); 
+    memset(msg, 0, sizeof(msg));
+    
+    // OTP
+    if (config & 0x80) {
+        strcat(msg, "Page 1 " _RED_("locked") "\n");
+        
+        if (config & 0x8) {
+            strcat(msg + strlen(msg), "Page 2  : " _RED_("locked") );
+        } else {
+            strcat(msg + strlen(msg), "Page 2  : read only");
+        }
+    } else  {
+        strcat(msg, "Page 1,2  : " _GREEN_("read write"));
+    }
+    PrintAndLogEx(SUCCESS, "%s", msg);
+    PrintAndLogEx(INFO, "------------------------------------");
+}
 
+int CmdLFHitagInfo(const char *Cmd) {
+    PrintAndLogEx(INFO, "Hitag2 tag information ");
+    PrintAndLogEx(INFO, "To be done!");
+    PrintAndLogEx(INFO, "------------------------------------");
+    
     char ctmp = tolower(param_getchar(Cmd, 0));
     if (ctmp == 'h') return usage_hitag_info();
+    
+    // read block3,  get configuration byte.
+
+    // common configurations.
+    printHitagConfiguration( 0x06 );
+    //printHitagConfiguration( 0x0E );
+    //printHitagConfiguration( 0x02 );
+    //printHitagConfiguration( 0x00 );
+    //printHitagConfiguration( 0x04 );
     return 0;
 }
 

From da5ad8438cf6b700204f43c3292e5f815db20fc5 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 14 Mar 2019 23:31:33 +0100
Subject: [PATCH 0791/1938] textual

---
 client/cmddata.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmddata.c b/client/cmddata.c
index bb68f90c1..e07ff23bf 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -475,7 +475,7 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
 
     size_t BitLen = getFromGraphBuf(bits);
 
-    PrintAndLogEx(DEBUG, "DEBUG: (ASKDemod_ext) Bitlen from grphbuff: %d", BitLen);
+    PrintAndLogEx(DEBUG, "DEBUG: (ASKDemod_ext) #samples from graphbuff: %d", BitLen);
 
     if (BitLen < 255) return 0;
 

From f1a0e57f65fc4715af15c7757d8a26b5df2ebcd8 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 15 Mar 2019 00:09:40 +0100
Subject: [PATCH 0792/1938] binarraytohex: handle Manchester wrong bit markers

---
 client/cmddata.c |  7 +++---
 client/util.c    | 58 ++++++++++++++++++++++++++++++++++--------------
 client/util.h    |  2 +-
 common/lfdemod.c |  1 +
 4 files changed, 46 insertions(+), 22 deletions(-)

diff --git a/client/cmddata.c b/client/cmddata.c
index e07ff23bf..c6e6cb5c3 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -417,18 +417,17 @@ int CmdPrintDemodBuff(const char *Cmd) {
         return 0;
     }
     length = (length > (DemodBufferLen - offset)) ? DemodBufferLen - offset : length;
-    int numBits = (length) & 0x00FFC; //make sure we don't exceed our string
 
     if (hexMode) {
         char *buf = (char *)(DemodBuffer + offset);
-        numBits = (numBits > sizeof(hex)) ? sizeof(hex) : numBits;
-        numBits = binarraytohex(hex, buf, numBits);
+        int numBits = binarraytohex(hex, sizeof(hex), buf, length);
         if (numBits == 0) {
             return 0;
         }
+        PrintAndLogEx(NORMAL, "DemodBuffer: %i bits consumed", numBits);
         PrintAndLogEx(NORMAL, "DemodBuffer: %s", hex);
     } else {
-        PrintAndLogEx(NORMAL, "DemodBuffer:\n%s", sprint_bin_break(DemodBuffer + offset, numBits, 16));
+        PrintAndLogEx(NORMAL, "DemodBuffer:\n%s", sprint_bin_break(DemodBuffer + offset, length, 16));
     }
     return 1;
 }
diff --git a/client/util.c b/client/util.c
index 6efcb8efa..03680bb48 100644
--- a/client/util.c
+++ b/client/util.c
@@ -252,7 +252,10 @@ char *sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t brea
     // loop through the out_index to make sure we don't go too far
     for (out_index = 0; out_index < rowlen; out_index++) {
         // set character
-        sprintf(tmp++, "%u", data[in_index]);
+        if (data[in_index] == 7) // Manchester wrong bit marker
+            sprintf(tmp++, ".");
+        else
+            sprintf(tmp++, "%u", data[in_index]);
         // check if a line break is needed and we have room to print it in our array
         if ((breaks > 0) && !((in_index + 1) % breaks) && (out_index + 1 != rowlen)) {
             // increment and print line break
@@ -683,24 +686,45 @@ int hextobinstring(char *target, char *source) {
     return length;
 }
 
-// convert binary array of 0x00/0x01 values to hex (safe to do in place as target will always be shorter than source)
+// convert binary array of 0x00/0x01 values to hex
 // return number of bits converted
-int binarraytohex(char *target, char *source, int length) {
-    unsigned char i, x;
-    int j = length;
-
-    if (j % 4)
-        return 0;
-
-    while (j) {
-        for (i = x = 0 ; i < 4 ; ++i)
-            x += (source[i] << (3 - i));
-        sprintf(target, "%X", x);
-        ++target;
-        source += 4;
-        j -= 4;
+int binarraytohex(char *target, const size_t targetlen, char *source, size_t srclen) {
+    uint8_t i = 0, x = 0;
+    uint32_t t = 0; // written target chars
+    uint32_t r = 0; // consumed bits
+    uint8_t w = 0; // wrong bits separator printed
+    for (size_t s = 0 ; s < srclen; s++) {
+        if ((source[s]==0) || (source[s]==1)) {
+            w = 0;
+            x += (source[s] << (3 - i));
+            i++;
+            if (i == 4) {
+                if (t >= targetlen - 2) return r;
+                sprintf(target + t, "%X", x);
+                t++;
+                r+=4;
+                x = 0;
+                i = 0;
+            }
+        } else {
+            if (i > 0) {
+                if (t >= targetlen - 5) return r;
+                w = 0;
+                sprintf(target + t, "%X[%i]", x, i);
+                t+=4;
+                r+=i;
+                x = 0;
+                i = 0;
+            }
+            if (w == 0) {
+                if (t >= targetlen - 2) return r;
+                sprintf(target + t, " ");
+                t++;
+            }
+            r++;
+        }
     }
-    return length;
+    return r;
 }
 
 // convert binary array to human readable binary
diff --git a/client/util.h b/client/util.h
index a96b3b71c..c754542ab 100644
--- a/client/util.h
+++ b/client/util.h
@@ -241,7 +241,7 @@ extern int param_getstr(const char *line, int paramnum, char *str, size_t buffer
 
 extern int hextobinarray(char *target,  char *source);
 extern int hextobinstring(char *target,  char *source);
-extern int binarraytohex(char *target,  char *source,  int length);
+extern int binarraytohex(char *target, const size_t targetlen, char *source, size_t srclen);
 extern void binarraytobinstring(char *target,  char *source,  int length);
 extern uint8_t GetParity(uint8_t *string, uint8_t type,  int length);
 extern void wiegand_add_parity(uint8_t *target, uint8_t *source, uint8_t length);
diff --git a/common/lfdemod.c b/common/lfdemod.c
index e2c10bf2c..653c2a308 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -1357,6 +1357,7 @@ int BiphaseRawDecode(uint8_t *bits, size_t *size, int *offset, int invert) {
 //by marshmellow
 //take 10 and 01 and manchester decode
 //run through 2 times and take least errCnt
+// "7" indicates 00 or 11 wrong bit
 int manrawdecode(uint8_t *bits, size_t *size, uint8_t invert, uint8_t *alignPos) {
 
     // sanity check

From 2f2dfd6239166da1ebfbb8980ac9ee2beaefb819 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 15 Mar 2019 00:19:18 +0100
Subject: [PATCH 0793/1938] remove debug line

---
 client/cmddata.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/cmddata.c b/client/cmddata.c
index c6e6cb5c3..aa44611ed 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -424,7 +424,6 @@ int CmdPrintDemodBuff(const char *Cmd) {
         if (numBits == 0) {
             return 0;
         }
-        PrintAndLogEx(NORMAL, "DemodBuffer: %i bits consumed", numBits);
         PrintAndLogEx(NORMAL, "DemodBuffer: %s", hex);
     } else {
         PrintAndLogEx(NORMAL, "DemodBuffer:\n%s", sprint_bin_break(DemodBuffer + offset, length, 16));

From b538a67ba348f339df71e76fbf53997db21a7477 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 15 Mar 2019 00:20:42 +0100
Subject: [PATCH 0794/1938] make style

---
 client/cmdlfhitag.c | 46 ++++++++++++++++++++++-----------------------
 client/util.c       |  8 ++++----
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index ac5d6f795..717b2b854 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -348,17 +348,17 @@ static void printHitagConfiguration(uint8_t config) {
     memset(msg, 0, sizeof(msg));
     // encoding
     if (config & 0x1) {
-        strcat(msg, "Biphase encoding");        
+        strcat(msg, "Biphase encoding");
     } else {
         strcat(msg, "Manchester encoding");
     }
     PrintAndLogEx(SUCCESS, "%s", msg);
     memset(msg, 0, sizeof(msg));
-    
+
     // version
     strcat(msg, "Coding in HITAG 2 operation: %s");
     uint8_t foo = (config & 0x6) >> 1;
-    switch ( foo ) {
+    switch (foo) {
         case 0:
             PrintAndLogEx(SUCCESS, "Version: public mode B, Coding: biphase");
             PrintAndLogEx(SUCCESS, msg, (config & 0x1) ? "biphase" : "manchester");
@@ -366,60 +366,60 @@ static void printHitagConfiguration(uint8_t config) {
         case 1:
             PrintAndLogEx(SUCCESS, "Version: public mode A, Coding: manchester");
             PrintAndLogEx(SUCCESS, msg, (config & 0x1) ? "biphase" : "manchester");
-            break;        
+            break;
         case 2:
             PrintAndLogEx(SUCCESS, "Version: public mode C, Coding: biphase");
             PrintAndLogEx(SUCCESS, msg, (config & 0x1) ? "biphase" : "manchester");
-            break;        
+            break;
         case 3:
             PrintAndLogEx(SUCCESS, "Version: Hitag2");
             PrintAndLogEx(SUCCESS, msg, (config & 0x1) ? "biphase" : "manchester");
             break;
     }
     memset(msg, 0, sizeof(msg));
-     
+
     // mode
     if (config & 0x8) {
-        strcat(msg, "Tag is in : " _YELLOW_("Crypto mode") );
+        strcat(msg, "Tag is in : " _YELLOW_("Crypto mode"));
     } else  {
-        strcat(msg, "Tag is in : " _YELLOW_("Password mode") );
+        strcat(msg, "Tag is in : " _YELLOW_("Password mode"));
     }
-    PrintAndLogEx(SUCCESS, "%s", msg);    
+    PrintAndLogEx(SUCCESS, "%s", msg);
     memset(msg, 0, sizeof(msg));
-       
+
     // page access
     if (config & 0x10) {
         strcat(msg, "Page 6,7  : read only");
     } else  {
         strcat(msg, "Page 6,7  : " _GREEN_("read write"));
     }
-    PrintAndLogEx(SUCCESS, "%s", msg); 
+    PrintAndLogEx(SUCCESS, "%s", msg);
     memset(msg, 0, sizeof(msg));
-    
+
     // page access
     if (config & 0x20) {
         strcat(msg, "Page 4,5  : read only");
     } else  {
         strcat(msg, "Page 4,5  : " _GREEN_("read write"));
     }
-    PrintAndLogEx(SUCCESS, "%s", msg); 
+    PrintAndLogEx(SUCCESS, "%s", msg);
     memset(msg, 0, sizeof(msg));
-    
+
     // OTP
     if (config & 0x40) {
-        strcat(msg, "Page 3    : read only. Configuration byte and password tag " _RED_("FIXED / IRREVERSIBLE") );
+        strcat(msg, "Page 3    : read only. Configuration byte and password tag " _RED_("FIXED / IRREVERSIBLE"));
     } else  {
         strcat(msg, "Page 3    : " _GREEN_("read write"));
-    }    
-    PrintAndLogEx(SUCCESS, "%s", msg); 
+    }
+    PrintAndLogEx(SUCCESS, "%s", msg);
     memset(msg, 0, sizeof(msg));
-    
+
     // OTP
     if (config & 0x80) {
         strcat(msg, "Page 1 " _RED_("locked") "\n");
-        
+
         if (config & 0x8) {
-            strcat(msg + strlen(msg), "Page 2  : " _RED_("locked") );
+            strcat(msg + strlen(msg), "Page 2  : " _RED_("locked"));
         } else {
             strcat(msg + strlen(msg), "Page 2  : read only");
         }
@@ -434,14 +434,14 @@ int CmdLFHitagInfo(const char *Cmd) {
     PrintAndLogEx(INFO, "Hitag2 tag information ");
     PrintAndLogEx(INFO, "To be done!");
     PrintAndLogEx(INFO, "------------------------------------");
-    
+
     char ctmp = tolower(param_getchar(Cmd, 0));
     if (ctmp == 'h') return usage_hitag_info();
-    
+
     // read block3,  get configuration byte.
 
     // common configurations.
-    printHitagConfiguration( 0x06 );
+    printHitagConfiguration(0x06);
     //printHitagConfiguration( 0x0E );
     //printHitagConfiguration( 0x02 );
     //printHitagConfiguration( 0x00 );
diff --git a/client/util.c b/client/util.c
index 03680bb48..a3f275a0b 100644
--- a/client/util.c
+++ b/client/util.c
@@ -694,7 +694,7 @@ int binarraytohex(char *target, const size_t targetlen, char *source, size_t src
     uint32_t r = 0; // consumed bits
     uint8_t w = 0; // wrong bits separator printed
     for (size_t s = 0 ; s < srclen; s++) {
-        if ((source[s]==0) || (source[s]==1)) {
+        if ((source[s] == 0) || (source[s] == 1)) {
             w = 0;
             x += (source[s] << (3 - i));
             i++;
@@ -702,7 +702,7 @@ int binarraytohex(char *target, const size_t targetlen, char *source, size_t src
                 if (t >= targetlen - 2) return r;
                 sprintf(target + t, "%X", x);
                 t++;
-                r+=4;
+                r += 4;
                 x = 0;
                 i = 0;
             }
@@ -711,8 +711,8 @@ int binarraytohex(char *target, const size_t targetlen, char *source, size_t src
                 if (t >= targetlen - 5) return r;
                 w = 0;
                 sprintf(target + t, "%X[%i]", x, i);
-                t+=4;
-                r+=i;
+                t += 4;
+                r += i;
                 x = 0;
                 i = 0;
             }

From f760677e32193d384be3536f242c62d7eb231972 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 15 Mar 2019 00:21:43 +0100
Subject: [PATCH 0795/1938] overflow

---
 client/cmdlfhitag.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index ac5d6f795..3628aa3c9 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -344,7 +344,7 @@ int CmdLFHitagSim(const char *Cmd) {
 }
 
 static void printHitagConfiguration(uint8_t config) {
-    char msg[80];
+    char msg[90];
     memset(msg, 0, sizeof(msg));
     // encoding
     if (config & 0x1) {

From 9b3cc10e0b6ce0d073ea325ac4348839a6025296 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 15 Mar 2019 00:27:26 +0100
Subject: [PATCH 0796/1938] fix Coverity string overflow

---
 client/cmdlfhitag.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index 717b2b854..40c90d5ef 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -344,7 +344,7 @@ int CmdLFHitagSim(const char *Cmd) {
 }
 
 static void printHitagConfiguration(uint8_t config) {
-    char msg[80];
+    char msg[100];
     memset(msg, 0, sizeof(msg));
     // encoding
     if (config & 0x1) {

From bf99a181a8dd9fe581bbd499515315353c8af766 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 15 Mar 2019 00:32:50 +0100
Subject: [PATCH 0797/1938] free?

---
 client/emv/cmdemv.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index 31886cf75..b5edfa81c 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -288,6 +288,7 @@ int CmdEMVGPO(const char *cmd) {
         PrintAndLogEx(ERR, "Can't create PDOL data.");
         tlvdb_free(tmp_ext);
         tlvdb_free(tlvRoot);
+        free(pdol_data_tlv);
         return 4;
     }
     PrintAndLogEx(INFO, "PDOL data[%d]: %s", pdol_data_tlv_data_len, sprint_hex(pdol_data_tlv_data, pdol_data_tlv_data_len));
@@ -1577,6 +1578,7 @@ int CmdEMVScan(const char *cmd) {
     if (!pdol_data_tlv_data) {
         PrintAndLogEx(ERR, "Can't create PDOL data.");
         tlvdb_free(tlvRoot);
+        free(pdol_data_tlv);
         DropFieldEx(channel);
         return 6;
     }

From c143f79e65065b4276ef5e99054ee17478ba90bc Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 15 Mar 2019 01:54:43 +0100
Subject: [PATCH 0798/1938] chg: 'sc upgrade' - verify firmware file integrity
 with sha512 validation (@piwi)

---
 client/cmdsmartcard.c      | 158 +++++++++++++++++++++++++++++--------
 client/cmdsmartcard.h      |   1 +
 client/crypto/libpcrypto.c |  15 ++++
 client/crypto/libpcrypto.h |   1 +
 client/hitag2.ht2          | Bin 48 -> 0 bytes
 5 files changed, 142 insertions(+), 33 deletions(-)
 delete mode 100644 client/hitag2.ht2

diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index 27b2afc39..2bd14b781 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -49,13 +49,13 @@ int usage_sm_info(void) {
     return 0;
 }
 int usage_sm_upgrade(void) {
-    PrintAndLogEx(NORMAL, "Upgrade firmware");
+    PrintAndLogEx(NORMAL, "Upgrade RDV4.0 Smartcard module firmware");
     PrintAndLogEx(NORMAL, "Usage:  sc upgrade f <file name>");
     PrintAndLogEx(NORMAL, "       h               :  this help");
     PrintAndLogEx(NORMAL, "       f <filename>    :  firmware file name");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
-    PrintAndLogEx(NORMAL, "        sc upgrade f myfile");
+    PrintAndLogEx(NORMAL, "        sc upgrade f ../tools/simmodule/SIM011.BIN");
     return 0;
 }
 int usage_sm_setclock(void) {
@@ -116,7 +116,7 @@ uint8_t GetATRTA1(uint8_t *atr, size_t atrlen) {
             return atr[2];
     }
 
-    return 0x11; // default value is ‘0x11’, corresponding to fmax=5 MHz, Fi=372, Di=1.
+    return 0x11; // default value is 0x11, corresponding to fmax=5 MHz, Fi=372, Di=1.
 }
 
 int DiArray[] = {
@@ -196,6 +196,8 @@ static int PrintATR(uint8_t *atr, size_t atrlen) {
     uint8_t T0 = atr[1];
     uint8_t K = T0 & 0x0F;
     uint8_t TD1 = 0, T1len = 0, TD1len = 0, TDilen = 0;
+	bool protocol_T0_present = true;
+	bool protocol_T15_present = false;
 
     if (T0 & 0x10) {
         PrintAndLog("\t- TA1 (Maximum clock frequency, proposed bit duration) [ 0x%02x ]", atr[2 + T1len]);
@@ -215,6 +217,14 @@ static int PrintATR(uint8_t *atr, size_t atrlen) {
     if (T0 & 0x80) {
         TD1 = atr[2 + T1len];
         PrintAndLog("\t- TD1 (First offered transmission protocol, presence of TA2..TD2) [ 0x%02x ] Protocol T%d", TD1, TD1 & 0x0f);
+		protocol_T0_present = false;
+		if ((TD1 & 0x0f) == 0) {
+			protocol_T0_present = true;
+		}
+		if ((TD1 & 0x0f) == 15) {
+			protocol_T15_present = true;
+		}
+		
         T1len++;
 
         if (TD1 & 0x10) {
@@ -232,6 +242,12 @@ static int PrintATR(uint8_t *atr, size_t atrlen) {
         if (TD1 & 0x80) {
             uint8_t TDi = atr[2 + T1len + TD1len];
             PrintAndLog("\t- TD2 (A supported protocol or more global parameters, presence of TA3..TD3) [ 0x%02x ] Protocol T%d", TDi, TDi & 0x0f);
+			if ((TDi & 0x0f) == 0) {
+				protocol_T0_present = true;
+			}
+			if ((TDi & 0x0f) == 15) {
+				protocol_T15_present = true;
+			}
             TD1len++;
 
             bool nextCycle = true;
@@ -262,19 +278,20 @@ static int PrintATR(uint8_t *atr, size_t atrlen) {
         }
     }
 
+	if (!protocol_T0_present || protocol_T15_present) { // there is CRC Check Byte TCK
     uint8_t vxor = 0;
     for (int i = 1; i < atrlen; i++)
         vxor ^= atr[i];
 
     if (vxor)
-        PrintAndLogEx(WARNING, "Check summ error. Must be 0 got 0x%02X", vxor);
+			PrintAndLogEx(WARNING, "Check sum error. Must be 0 got 0x%02X", vxor);
     else
-        PrintAndLogEx(INFO, "Check summ OK.");
+			PrintAndLogEx(INFO, "Check sum OK.");
+	}
 
     if (atr[0] != 0x3b)
         PrintAndLogEx(WARNING, "Not a direct convention [ 0x%02x ]", atr[0]);
 
-
     uint8_t calen = 2 + T1len + TD1len + TDilen + K;
 
     if (atrlen != calen && atrlen != calen + 1)  // may be CRC
@@ -561,8 +578,9 @@ int ExchangeAPDUSC(uint8_t *datain, int datainlen, bool activateCard, bool leave
 
 int CmdSmartUpgrade(const char *Cmd) {
 
-    PrintAndLogEx(WARNING, "WARNING - Smartcard socket firmware upgrade.");
-    PrintAndLogEx(WARNING, "A dangerous command, do wrong and you will brick the smart card socket");
+    PrintAndLogEx(WARNING, "WARNING - Sim module firmware upgrade.");
+    PrintAndLogEx(WARNING, "A dangerous command, do wrong and you could brick the sim module");
+	PrintAndLogEx(NORMAL, "");
 
     FILE *f;
     char filename[FILE_PATH_SIZE] = {0};
@@ -592,10 +610,33 @@ int CmdSmartUpgrade(const char *Cmd) {
     //Validations
     if (errors || cmdp == 0) return usage_sm_upgrade();
 
-    // load file
-    f = fopen(filename, "rb");
+
+	char sha512filename[FILE_PATH_SIZE] = {'\0'};
+	char *bin_extension = filename;
+	char *dot_position = NULL;
+	while ((dot_position = strchr(bin_extension, '.')) != NULL) {
+		bin_extension = dot_position + 1;
+	}
+    
+	if (!strcmp(bin_extension, "BIN") 
+#ifdef _WIN32
+	    || !strcmp(bin_extension, "bin")
+#endif
+	    ) {
+		memcpy(sha512filename, filename, strlen(filename) - strlen("bin"));
+		strcat(sha512filename, "sha512.txt");
+	} else {
+		PrintAndLogEx(FAILED, "Filename extension of firmware upgrade file must be .BIN");
+		return 1;
+	}
+	
+    PrintAndLogEx(INFO, "firmware file      : " _YELLOW_("%s"), filename);
+	PrintAndLogEx(INFO, "Checking integrity : " _YELLOW_("%s"), sha512filename);
+		
+	// load firmware file
+	f = fopen(filename, "rb");
     if (!f) {
-        PrintAndLogEx(FAILED, "File: " _YELLOW_("%s") ": not found or locked.", filename);
+        PrintAndLogEx(FAILED, "Firmware file " _YELLOW_("%s") " not found or locked.", filename);
         return 1;
     }
 
@@ -605,27 +646,76 @@ int CmdSmartUpgrade(const char *Cmd) {
     fseek(f, 0, SEEK_SET);
 
     if (fsize < 0) {
-        PrintAndLogDevice(WARNING, "error, when getting filesize");
+        PrintAndLogEx(WARNING, "error, when getting filesize");
         fclose(f);
         return 1;
     }
 
     uint8_t *dump = calloc(fsize, sizeof(uint8_t));
     if (!dump) {
-        PrintAndLogDevice(WARNING, "error, cannot allocate memory ");
+        PrintAndLogEx(WARNING, "error, cannot allocate memory ");
         fclose(f);
         return 1;
     }
 
-    size_t bytes_read = fread(dump, 1, fsize, f);
+	size_t firmware_size = fread(dump, 1, fsize, f);
     if (f)
         fclose(f);
 
-    PrintAndLogEx(SUCCESS, "Smartcard socket firmware uploading to PM3");
+	// load sha512 file
+	f = fopen(sha512filename, "rb");
+	if ( !f ){
+		PrintAndLogEx(FAILED, "SHA-512 file not found or locked.");
+		return 1;
+	}
+
+	// get filesize in order to malloc memory
+	fseek(f, 0, SEEK_END);
+	fsize = ftell(f);
+	fseek(f, 0, SEEK_SET);
+
+	if (fsize < 0)  {
+		PrintAndLogEx(FAILED, "Could not determine size of SHA-512 file");
+		fclose(f);
+		return 1;
+	}
+	
+	if (fsize < 128) {
+		PrintAndLogEx(FAILED, "SHA-512 file too short");
+		fclose(f);
+		return 1;
+	}
+
+	char hashstring[129];
+	size_t bytes_read = fread(hashstring, 1, 128, f);
+	hashstring[128] = '\0';
+
+	if (f)
+		fclose(f);
+
+	uint8_t hash1[64];
+	if (bytes_read != 128 || param_gethex(hashstring, 0, hash1, 128)) {
+		PrintAndLogEx(FAILED, "Couldn't read SHA-512 file");
+		return 1;
+	}
+	
+	uint8_t hash2[64];
+	if (sha512hash(dump, firmware_size, hash2)) {
+		PrintAndLogEx(FAILED, "Couldn't calculate SHA-512 of firmware");
+		return 1;
+	}
+
+	if (memcmp(hash1, hash2, 64)) {
+		PrintAndLogEx(FAILED, "Couldn't verify integrity of firmware file " _RED_("(wrong SHA-512 hash)") );
+		return 1;
+	}
+		
+	PrintAndLogEx(SUCCESS, "Sim module firmware uploading to PM3");
+
     //Send to device
     uint32_t index = 0;
     uint32_t bytes_sent = 0;
-    uint32_t bytes_remaining = bytes_read;
+	uint32_t bytes_remaining = firmware_size;
 
     while (bytes_remaining > 0) {
         uint32_t bytes_in_packet = MIN(USB_CMD_DATA_SIZE, bytes_remaining);
@@ -649,10 +739,10 @@ int CmdSmartUpgrade(const char *Cmd) {
     }
     free(dump);
     printf("\n");
-    PrintAndLogEx(SUCCESS, "Smartcard socket firmware updating,  don\'t turn off your PM3!");
+    PrintAndLogEx(SUCCESS, "Sim module firmware updating,  don\'t turn off your PM3!");
 
     // trigger the firmware upgrade
-    UsbCommand c = {CMD_SMART_UPGRADE, {bytes_read, 0, 0}};
+	UsbCommand c = {CMD_SMART_UPGRADE, {firmware_size, 0, 0}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
@@ -660,10 +750,12 @@ int CmdSmartUpgrade(const char *Cmd) {
         PrintAndLogEx(WARNING, "timeout while waiting for reply.");
         return 1;
     }
-    if ((resp.arg[0] & 0xFF))
-        PrintAndLogEx(SUCCESS, "Smartcard socket firmware upgraded successful");
-    else
-        PrintAndLogEx(FAILED, "Smartcard socket firmware updating failed");
+    if ((resp.arg[0] & 0xFF)) {
+        PrintAndLogEx(SUCCESS, "Sim module firmware upgrade " _GREEN_("successful") );
+        PrintAndLogEx(SUCCESS, "\n run " _YELLOW_("`hw status`") " to validate the fw version " );
+    } else {
+        PrintAndLogEx(FAILED, "Sim module firmware upgrade " _RED_("failed") );
+    }
     return 0;
 }
 
@@ -874,11 +966,11 @@ static void smart_brute_prim() {
 
         if (len > 2) {
 
-            //if ( decodeTLV ) {
-            //if (!TLVPrintFromBuffer(buf, len-2)) {
+            // if ( decodeTLV ) {
+            // if (!TLVPrintFromBuffer(buf, len-2)) {
             PrintAndLogEx(SUCCESS, "\tHEX  %d |: %s", len, sprint_hex(buf, len));
-            //}
-            //}
+            // }
+            // }
         }
         len = 0;
     }
@@ -1124,14 +1216,14 @@ int CmdSmartBruteforceSFI(const char *Cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",    CmdHelp,               1, "This help"},
-    {"list",    CmdSmartList,          0, "List ISO 7816 history"},
-    {"info",    CmdSmartInfo,          1, "Tag information"},
-    {"reader",  CmdSmartReader,        1, "Act like an IS07816 reader"},
-    {"raw",     CmdSmartRaw,           1, "Send raw hex data to tag"},
-    {"upgrade", CmdSmartUpgrade,       1, "Upgrade firmware"},
+    {"help",     CmdHelp,               1, "This help"},
+    {"list",     CmdSmartList,          0, "List ISO 7816 history"},
+    {"info",     CmdSmartInfo,          1, "Tag information"},
+    {"reader",   CmdSmartReader,        1, "Act like an IS07816 reader"},
+    {"raw",      CmdSmartRaw,           1, "Send raw hex data to tag"},
+    {"upgrade",  CmdSmartUpgrade,       1, "Upgrade sim module firmware"},
     {"setclock", CmdSmartSetClock,      1, "Set clock speed"},
-    {"brute",   CmdSmartBruteforceSFI, 1, "Bruteforce SFI"},
+    {"brute",    CmdSmartBruteforceSFI, 1, "Bruteforce SFI"},
     {NULL, NULL, 0, NULL}
 };
 
diff --git a/client/cmdsmartcard.h b/client/cmdsmartcard.h
index 2e4971bba..251859761 100644
--- a/client/cmdsmartcard.h
+++ b/client/cmdsmartcard.h
@@ -25,6 +25,7 @@
 #include "emv/emvcore.h"        // decodeTVL
 #include "emv/apduinfo.h"       // APDUcode description
 #include "emv/dump.h"           // dump_buffer
+#include "crypto/libpcrypto.h"	// sha512hash
 
 extern int CmdSmartcard(const char *Cmd);
 
diff --git a/client/crypto/libpcrypto.c b/client/crypto/libpcrypto.c
index 883de0dbb..d3335487e 100644
--- a/client/crypto/libpcrypto.c
+++ b/client/crypto/libpcrypto.c
@@ -19,6 +19,7 @@
 #include <mbedtls/pk.h>
 #include <mbedtls/ecdsa.h>
 #include <mbedtls/sha256.h>
+#include <mbedtls/sha512.h>
 #include <mbedtls/ctr_drbg.h>
 #include <mbedtls/entropy.h>
 #include <mbedtls/error.h>
@@ -102,6 +103,20 @@ int sha256hash(uint8_t *input, int length, uint8_t *hash) {
     mbedtls_sha256_update(&sctx, input, length);
     mbedtls_sha256_finish(&sctx, hash);
     mbedtls_sha256_free(&sctx);
+	
+	return 0;
+}
+
+int sha512hash(uint8_t *input, int length, uint8_t *hash) {
+	if (!hash || !input)
+		return 1;
+	
+	mbedtls_sha512_context sctx;
+	mbedtls_sha512_init(&sctx);
+	mbedtls_sha512_starts(&sctx, 0); //SHA-512, not 384
+	mbedtls_sha512_update(&sctx, input, length);
+	mbedtls_sha512_finish(&sctx, hash);	
+	mbedtls_sha512_free(&sctx);
 
     return 0;
 }
diff --git a/client/crypto/libpcrypto.h b/client/crypto/libpcrypto.h
index 5f3592b7a..2cb4644a8 100644
--- a/client/crypto/libpcrypto.h
+++ b/client/crypto/libpcrypto.h
@@ -22,6 +22,7 @@ extern int aes_cmac(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *mac, int
 extern int aes_cmac8(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *mac, int length);
 
 extern int sha256hash(uint8_t *input, int length, uint8_t *hash);
+extern int sha512hash(uint8_t *input, int length, uint8_t *hash);
 
 extern int ecdsa_key_create(uint8_t *key_d, uint8_t *key_xy);
 extern int ecdsa_public_key_from_pk(mbedtls_pk_context *pk, uint8_t *key, size_t keylen);
diff --git a/client/hitag2.ht2 b/client/hitag2.ht2
deleted file mode 100644
index 2b6d5055b953160a9efe965a18a91088016c3468..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 48
ncmZSCs37C(=^ezt;P1z_$|J-r-rqYE2vz|B6DvCl0~!DTDAWmC


From 4d132902858b0a52157d9090c36dbadfc4470bfb Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 15 Mar 2019 01:57:47 +0100
Subject: [PATCH 0799/1938] text

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b6de5eb76..c8e4b67c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,8 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [unreleased][unreleased]
+ - Change - printing of fault bit markers (7) using a dot (@doegox)
+ - Change 'sc upgrade' - firmware file integrity check (@piwi)
  - Fix 'data rawdemod am' - last bit was missing (@doegox)
  - Fix 'hf 15 dump f' - also selects tag first (@iceman)
  - Fix 'hf iclass clone' - missing fileclose (@iceman)

From e3127f744068c59d4966274f3104d17e497d14b9 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 15 Mar 2019 02:05:15 +0100
Subject: [PATCH 0800/1938] fix: 'hf 14b raw -t' - a bit messed up

---
 client/cmdhf14b.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c
index 19e48a902..9d542f228 100644
--- a/client/cmdhf14b.c
+++ b/client/cmdhf14b.c
@@ -153,14 +153,13 @@ int CmdHF14BSniff(const char *Cmd) {
 }
 
 int CmdHF14BCmdRaw(const char *Cmd) {
-    bool reply = true, power = false, select = false, timeout = false;
+    bool reply = true, power = false, select = false, hasTimeout = false;
     char buf[5] = "";
     int i = 0;
     uint8_t data[USB_CMD_DATA_SIZE] = {0x00};
     uint16_t datalen = 0;
     uint32_t flags = ISO14B_CONNECT;
-    uint32_t temp = 0;
-    uint32_t time_wait = 0;
+    uint32_t temp = 0, user_timeout = 0, time_wait = 0;
 
     if (strlen(Cmd) < 3) return usage_hf_14b_raw();
 
@@ -192,9 +191,8 @@ int CmdHF14BCmdRaw(const char *Cmd) {
                     }
                     break;
                 case 't':
-                    timeout = true;
-                    sscanf(Cmd + i + 2, "%d", &temp);
-                    timeout = temp;
+                    hasTimeout = true;
+                    sscanf(Cmd + i + 2, "%d", &user_timeout);
                     i += 3;
                     while (Cmd[i] != ' ' && Cmd[i] != '\0') { i++; }
                     i -= 2;
@@ -224,14 +222,14 @@ int CmdHF14BCmdRaw(const char *Cmd) {
         return 0;
     }
 
-    if (timeout) {
+    if (hasTimeout) {
 #define MAX_TIMEOUT 40542464 // = (2^32-1) * (8*16) / 13560000Hz * 1000ms/s
         flags |= ISO14B_SET_TIMEOUT;
-        if (timeout > MAX_TIMEOUT) {
-            timeout = MAX_TIMEOUT;
+        if (user_timeout > MAX_TIMEOUT) {
+            user_timeout = MAX_TIMEOUT;
             PrintAndLogEx(NORMAL, "Set timeout to 40542 seconds (11.26 hours). The max we can wait for response");
         }
-        time_wait = 13560000 / 1000 / (8 * 16) * timeout; // timeout in ETUs (time to transfer 1 bit, approx. 9.4 us)
+        time_wait = 13560000 / 1000 / (8 * 16) * user_timeout; // timeout in ETUs (time to transfer 1 bit, approx. 9.4 us)
     }
 
     if (power == 0)

From b6f80e075b359c31551c5f29956a30145d9b8ad2 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 15 Mar 2019 02:05:44 +0100
Subject: [PATCH 0801/1938] textual

---
 client/cmdsmartcard.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index 2bd14b781..9bbf1412b 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -49,7 +49,7 @@ int usage_sm_info(void) {
     return 0;
 }
 int usage_sm_upgrade(void) {
-    PrintAndLogEx(NORMAL, "Upgrade RDV4.0 Smartcard module firmware");
+    PrintAndLogEx(NORMAL, "Upgrade RDV4.0 Sim module firmware");
     PrintAndLogEx(NORMAL, "Usage:  sc upgrade f <file name>");
     PrintAndLogEx(NORMAL, "       h               :  this help");
     PrintAndLogEx(NORMAL, "       f <filename>    :  firmware file name");

From 6436f88fb2ca74c4a5936207a237bfdff685e904 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 15 Mar 2019 09:17:17 +0100
Subject: [PATCH 0802/1938] changlog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c8e4b67c1..95c590a52 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [unreleased][unreleased]
+ - Change - handling fault bit markers (7) and partial nibbles in hex printing (@doegox)
  - Change - printing of fault bit markers (7) using a dot (@doegox)
  - Change 'sc upgrade' - firmware file integrity check (@piwi)
  - Fix 'data rawdemod am' - last bit was missing (@doegox)

From 2d2b12875492cfd8fa3c5d3fa43bb6b78a5ee906 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 15 Mar 2019 09:18:07 +0100
Subject: [PATCH 0803/1938] make style

---
 client/cmdsmartcard.c      | 192 ++++++++++++++++++-------------------
 client/crypto/libpcrypto.c |  22 ++---
 2 files changed, 107 insertions(+), 107 deletions(-)

diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index 9bbf1412b..f00fc0907 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -196,8 +196,8 @@ static int PrintATR(uint8_t *atr, size_t atrlen) {
     uint8_t T0 = atr[1];
     uint8_t K = T0 & 0x0F;
     uint8_t TD1 = 0, T1len = 0, TD1len = 0, TDilen = 0;
-	bool protocol_T0_present = true;
-	bool protocol_T15_present = false;
+    bool protocol_T0_present = true;
+    bool protocol_T15_present = false;
 
     if (T0 & 0x10) {
         PrintAndLog("\t- TA1 (Maximum clock frequency, proposed bit duration) [ 0x%02x ]", atr[2 + T1len]);
@@ -217,14 +217,14 @@ static int PrintATR(uint8_t *atr, size_t atrlen) {
     if (T0 & 0x80) {
         TD1 = atr[2 + T1len];
         PrintAndLog("\t- TD1 (First offered transmission protocol, presence of TA2..TD2) [ 0x%02x ] Protocol T%d", TD1, TD1 & 0x0f);
-		protocol_T0_present = false;
-		if ((TD1 & 0x0f) == 0) {
-			protocol_T0_present = true;
-		}
-		if ((TD1 & 0x0f) == 15) {
-			protocol_T15_present = true;
-		}
-		
+        protocol_T0_present = false;
+        if ((TD1 & 0x0f) == 0) {
+            protocol_T0_present = true;
+        }
+        if ((TD1 & 0x0f) == 15) {
+            protocol_T15_present = true;
+        }
+
         T1len++;
 
         if (TD1 & 0x10) {
@@ -242,12 +242,12 @@ static int PrintATR(uint8_t *atr, size_t atrlen) {
         if (TD1 & 0x80) {
             uint8_t TDi = atr[2 + T1len + TD1len];
             PrintAndLog("\t- TD2 (A supported protocol or more global parameters, presence of TA3..TD3) [ 0x%02x ] Protocol T%d", TDi, TDi & 0x0f);
-			if ((TDi & 0x0f) == 0) {
-				protocol_T0_present = true;
-			}
-			if ((TDi & 0x0f) == 15) {
-				protocol_T15_present = true;
-			}
+            if ((TDi & 0x0f) == 0) {
+                protocol_T0_present = true;
+            }
+            if ((TDi & 0x0f) == 15) {
+                protocol_T15_present = true;
+            }
             TD1len++;
 
             bool nextCycle = true;
@@ -278,16 +278,16 @@ static int PrintATR(uint8_t *atr, size_t atrlen) {
         }
     }
 
-	if (!protocol_T0_present || protocol_T15_present) { // there is CRC Check Byte TCK
-    uint8_t vxor = 0;
-    for (int i = 1; i < atrlen; i++)
-        vxor ^= atr[i];
+    if (!protocol_T0_present || protocol_T15_present) { // there is CRC Check Byte TCK
+        uint8_t vxor = 0;
+        for (int i = 1; i < atrlen; i++)
+            vxor ^= atr[i];
 
-    if (vxor)
-			PrintAndLogEx(WARNING, "Check sum error. Must be 0 got 0x%02X", vxor);
-    else
-			PrintAndLogEx(INFO, "Check sum OK.");
-	}
+        if (vxor)
+            PrintAndLogEx(WARNING, "Check sum error. Must be 0 got 0x%02X", vxor);
+        else
+            PrintAndLogEx(INFO, "Check sum OK.");
+    }
 
     if (atr[0] != 0x3b)
         PrintAndLogEx(WARNING, "Not a direct convention [ 0x%02x ]", atr[0]);
@@ -580,7 +580,7 @@ int CmdSmartUpgrade(const char *Cmd) {
 
     PrintAndLogEx(WARNING, "WARNING - Sim module firmware upgrade.");
     PrintAndLogEx(WARNING, "A dangerous command, do wrong and you could brick the sim module");
-	PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "");
 
     FILE *f;
     char filename[FILE_PATH_SIZE] = {0};
@@ -611,30 +611,30 @@ int CmdSmartUpgrade(const char *Cmd) {
     if (errors || cmdp == 0) return usage_sm_upgrade();
 
 
-	char sha512filename[FILE_PATH_SIZE] = {'\0'};
-	char *bin_extension = filename;
-	char *dot_position = NULL;
-	while ((dot_position = strchr(bin_extension, '.')) != NULL) {
-		bin_extension = dot_position + 1;
-	}
-    
-	if (!strcmp(bin_extension, "BIN") 
+    char sha512filename[FILE_PATH_SIZE] = {'\0'};
+    char *bin_extension = filename;
+    char *dot_position = NULL;
+    while ((dot_position = strchr(bin_extension, '.')) != NULL) {
+        bin_extension = dot_position + 1;
+    }
+
+    if (!strcmp(bin_extension, "BIN")
 #ifdef _WIN32
-	    || !strcmp(bin_extension, "bin")
+            || !strcmp(bin_extension, "bin")
 #endif
-	    ) {
-		memcpy(sha512filename, filename, strlen(filename) - strlen("bin"));
-		strcat(sha512filename, "sha512.txt");
-	} else {
-		PrintAndLogEx(FAILED, "Filename extension of firmware upgrade file must be .BIN");
-		return 1;
-	}
-	
+       ) {
+        memcpy(sha512filename, filename, strlen(filename) - strlen("bin"));
+        strcat(sha512filename, "sha512.txt");
+    } else {
+        PrintAndLogEx(FAILED, "Filename extension of firmware upgrade file must be .BIN");
+        return 1;
+    }
+
     PrintAndLogEx(INFO, "firmware file      : " _YELLOW_("%s"), filename);
-	PrintAndLogEx(INFO, "Checking integrity : " _YELLOW_("%s"), sha512filename);
-		
-	// load firmware file
-	f = fopen(filename, "rb");
+    PrintAndLogEx(INFO, "Checking integrity : " _YELLOW_("%s"), sha512filename);
+
+    // load firmware file
+    f = fopen(filename, "rb");
     if (!f) {
         PrintAndLogEx(FAILED, "Firmware file " _YELLOW_("%s") " not found or locked.", filename);
         return 1;
@@ -658,64 +658,64 @@ int CmdSmartUpgrade(const char *Cmd) {
         return 1;
     }
 
-	size_t firmware_size = fread(dump, 1, fsize, f);
+    size_t firmware_size = fread(dump, 1, fsize, f);
     if (f)
         fclose(f);
 
-	// load sha512 file
-	f = fopen(sha512filename, "rb");
-	if ( !f ){
-		PrintAndLogEx(FAILED, "SHA-512 file not found or locked.");
-		return 1;
-	}
+    // load sha512 file
+    f = fopen(sha512filename, "rb");
+    if (!f) {
+        PrintAndLogEx(FAILED, "SHA-512 file not found or locked.");
+        return 1;
+    }
 
-	// get filesize in order to malloc memory
-	fseek(f, 0, SEEK_END);
-	fsize = ftell(f);
-	fseek(f, 0, SEEK_SET);
+    // get filesize in order to malloc memory
+    fseek(f, 0, SEEK_END);
+    fsize = ftell(f);
+    fseek(f, 0, SEEK_SET);
 
-	if (fsize < 0)  {
-		PrintAndLogEx(FAILED, "Could not determine size of SHA-512 file");
-		fclose(f);
-		return 1;
-	}
-	
-	if (fsize < 128) {
-		PrintAndLogEx(FAILED, "SHA-512 file too short");
-		fclose(f);
-		return 1;
-	}
+    if (fsize < 0)  {
+        PrintAndLogEx(FAILED, "Could not determine size of SHA-512 file");
+        fclose(f);
+        return 1;
+    }
 
-	char hashstring[129];
-	size_t bytes_read = fread(hashstring, 1, 128, f);
-	hashstring[128] = '\0';
+    if (fsize < 128) {
+        PrintAndLogEx(FAILED, "SHA-512 file too short");
+        fclose(f);
+        return 1;
+    }
 
-	if (f)
-		fclose(f);
+    char hashstring[129];
+    size_t bytes_read = fread(hashstring, 1, 128, f);
+    hashstring[128] = '\0';
 
-	uint8_t hash1[64];
-	if (bytes_read != 128 || param_gethex(hashstring, 0, hash1, 128)) {
-		PrintAndLogEx(FAILED, "Couldn't read SHA-512 file");
-		return 1;
-	}
-	
-	uint8_t hash2[64];
-	if (sha512hash(dump, firmware_size, hash2)) {
-		PrintAndLogEx(FAILED, "Couldn't calculate SHA-512 of firmware");
-		return 1;
-	}
+    if (f)
+        fclose(f);
 
-	if (memcmp(hash1, hash2, 64)) {
-		PrintAndLogEx(FAILED, "Couldn't verify integrity of firmware file " _RED_("(wrong SHA-512 hash)") );
-		return 1;
-	}
-		
-	PrintAndLogEx(SUCCESS, "Sim module firmware uploading to PM3");
+    uint8_t hash1[64];
+    if (bytes_read != 128 || param_gethex(hashstring, 0, hash1, 128)) {
+        PrintAndLogEx(FAILED, "Couldn't read SHA-512 file");
+        return 1;
+    }
+
+    uint8_t hash2[64];
+    if (sha512hash(dump, firmware_size, hash2)) {
+        PrintAndLogEx(FAILED, "Couldn't calculate SHA-512 of firmware");
+        return 1;
+    }
+
+    if (memcmp(hash1, hash2, 64)) {
+        PrintAndLogEx(FAILED, "Couldn't verify integrity of firmware file " _RED_("(wrong SHA-512 hash)"));
+        return 1;
+    }
+
+    PrintAndLogEx(SUCCESS, "Sim module firmware uploading to PM3");
 
     //Send to device
     uint32_t index = 0;
     uint32_t bytes_sent = 0;
-	uint32_t bytes_remaining = firmware_size;
+    uint32_t bytes_remaining = firmware_size;
 
     while (bytes_remaining > 0) {
         uint32_t bytes_in_packet = MIN(USB_CMD_DATA_SIZE, bytes_remaining);
@@ -742,7 +742,7 @@ int CmdSmartUpgrade(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "Sim module firmware updating,  don\'t turn off your PM3!");
 
     // trigger the firmware upgrade
-	UsbCommand c = {CMD_SMART_UPGRADE, {firmware_size, 0, 0}};
+    UsbCommand c = {CMD_SMART_UPGRADE, {firmware_size, 0, 0}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
@@ -751,10 +751,10 @@ int CmdSmartUpgrade(const char *Cmd) {
         return 1;
     }
     if ((resp.arg[0] & 0xFF)) {
-        PrintAndLogEx(SUCCESS, "Sim module firmware upgrade " _GREEN_("successful") );
-        PrintAndLogEx(SUCCESS, "\n run " _YELLOW_("`hw status`") " to validate the fw version " );
+        PrintAndLogEx(SUCCESS, "Sim module firmware upgrade " _GREEN_("successful"));
+        PrintAndLogEx(SUCCESS, "\n run " _YELLOW_("`hw status`") " to validate the fw version ");
     } else {
-        PrintAndLogEx(FAILED, "Sim module firmware upgrade " _RED_("failed") );
+        PrintAndLogEx(FAILED, "Sim module firmware upgrade " _RED_("failed"));
     }
     return 0;
 }
diff --git a/client/crypto/libpcrypto.c b/client/crypto/libpcrypto.c
index d3335487e..095d16af3 100644
--- a/client/crypto/libpcrypto.c
+++ b/client/crypto/libpcrypto.c
@@ -103,20 +103,20 @@ int sha256hash(uint8_t *input, int length, uint8_t *hash) {
     mbedtls_sha256_update(&sctx, input, length);
     mbedtls_sha256_finish(&sctx, hash);
     mbedtls_sha256_free(&sctx);
-	
-	return 0;
+
+    return 0;
 }
 
 int sha512hash(uint8_t *input, int length, uint8_t *hash) {
-	if (!hash || !input)
-		return 1;
-	
-	mbedtls_sha512_context sctx;
-	mbedtls_sha512_init(&sctx);
-	mbedtls_sha512_starts(&sctx, 0); //SHA-512, not 384
-	mbedtls_sha512_update(&sctx, input, length);
-	mbedtls_sha512_finish(&sctx, hash);	
-	mbedtls_sha512_free(&sctx);
+    if (!hash || !input)
+        return 1;
+
+    mbedtls_sha512_context sctx;
+    mbedtls_sha512_init(&sctx);
+    mbedtls_sha512_starts(&sctx, 0); //SHA-512, not 384
+    mbedtls_sha512_update(&sctx, input, length);
+    mbedtls_sha512_finish(&sctx, hash);
+    mbedtls_sha512_free(&sctx);
 
     return 0;
 }

From 24df97b09b705abb1b90878176121c941611f98f Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 15 Mar 2019 10:00:47 +0100
Subject: [PATCH 0804/1938] chg; remove compiler warning

---
 client/cmdsmartcard.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index f00fc0907..8d00fa128 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -659,8 +659,9 @@ int CmdSmartUpgrade(const char *Cmd) {
     }
 
     size_t firmware_size = fread(dump, 1, fsize, f);
-    if (f)
+    if (f) {
         fclose(f);
+    }
 
     // load sha512 file
     f = fopen(sha512filename, "rb");

From f0d5b79abb9c3292855830584ba6419cf91b1fd0 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 15 Mar 2019 20:10:17 +0100
Subject: [PATCH 0805/1938] chg: 'lf hitag reader' - more output

---
 client/cmdlfhitag.c | 106 ++++++++++++++++++++++++++++++++++----------
 1 file changed, 83 insertions(+), 23 deletions(-)

diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index 40c90d5ef..5a7d58307 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -344,13 +344,29 @@ int CmdLFHitagSim(const char *Cmd) {
 }
 
 static void printHitagConfiguration(uint8_t config) {
+    
     char msg[100];
     memset(msg, 0, sizeof(msg));
+
+    char bits[9];
+    char *bs = bits;
+    for (uint8_t i = 0 ; i < 8 ; i++) {
+        snprintf(bs, sizeof(bits), "%d", (config >> (7 - i)) & 1);
+        bs++;
+    }
+
+    PrintAndLogEx(INFO, "\n\nHitag2 tag information ");
+    PrintAndLogEx(INFO, "------------------------------------");
+    
+    //configuration byte
+    PrintAndLogEx(SUCCESS, "Config byte : %02X - %s", config, bits);    
+    
     // encoding
+    strcat(msg, "Encoding    : ");
     if (config & 0x1) {
-        strcat(msg, "Biphase encoding");
+        strcat(msg + strlen(msg), _YELLOW_("Biphase"));
     } else {
-        strcat(msg, "Manchester encoding");
+        strcat(msg + strlen(msg), _YELLOW_("Manchester"));
     }
     PrintAndLogEx(SUCCESS, "%s", msg);
     memset(msg, 0, sizeof(msg));
@@ -360,76 +376,103 @@ static void printHitagConfiguration(uint8_t config) {
     uint8_t foo = (config & 0x6) >> 1;
     switch (foo) {
         case 0:
-            PrintAndLogEx(SUCCESS, "Version: public mode B, Coding: biphase");
+            PrintAndLogEx(SUCCESS, "Version     : public mode B, Coding: biphase");
             PrintAndLogEx(SUCCESS, msg, (config & 0x1) ? "biphase" : "manchester");
             break;
         case 1:
-            PrintAndLogEx(SUCCESS, "Version: public mode A, Coding: manchester");
+            PrintAndLogEx(SUCCESS, "Version     : public mode A, Coding: manchester");
             PrintAndLogEx(SUCCESS, msg, (config & 0x1) ? "biphase" : "manchester");
             break;
         case 2:
-            PrintAndLogEx(SUCCESS, "Version: public mode C, Coding: biphase");
+            PrintAndLogEx(SUCCESS, "Version     : public mode C, Coding: biphase");
             PrintAndLogEx(SUCCESS, msg, (config & 0x1) ? "biphase" : "manchester");
             break;
         case 3:
-            PrintAndLogEx(SUCCESS, "Version: Hitag2");
+            PrintAndLogEx(SUCCESS, "Version     : Hitag2");
             PrintAndLogEx(SUCCESS, msg, (config & 0x1) ? "biphase" : "manchester");
             break;
     }
     memset(msg, 0, sizeof(msg));
 
     // mode
+    strcat(msg, "Tag is in   : ");
     if (config & 0x8) {
-        strcat(msg, "Tag is in : " _YELLOW_("Crypto mode"));
+        strcat(msg + strlen(msg), _YELLOW_("Crypto mode"));
     } else  {
-        strcat(msg, "Tag is in : " _YELLOW_("Password mode"));
+        strcat(msg + strlen(msg), _YELLOW_("Password mode"));
     }
     PrintAndLogEx(SUCCESS, "%s", msg);
     memset(msg, 0, sizeof(msg));
 
     // page access
+    strcat(msg, "Page 6,7    : ");
     if (config & 0x10) {
-        strcat(msg, "Page 6,7  : read only");
+        strcat(msg + strlen(msg), "read only");
     } else  {
-        strcat(msg, "Page 6,7  : " _GREEN_("read write"));
+        strcat(msg + strlen(msg), _GREEN_("read write"));
     }
     PrintAndLogEx(SUCCESS, "%s", msg);
     memset(msg, 0, sizeof(msg));
 
     // page access
+    strcat(msg, "Page 4,5    : ");    
     if (config & 0x20) {
-        strcat(msg, "Page 4,5  : read only");
+        strcat(msg + strlen(msg), "read only");
     } else  {
-        strcat(msg, "Page 4,5  : " _GREEN_("read write"));
+        strcat(msg + strlen(msg), _GREEN_("read write"));
     }
     PrintAndLogEx(SUCCESS, "%s", msg);
     memset(msg, 0, sizeof(msg));
 
     // OTP
+    strcat(msg, "Page 3      : ");
     if (config & 0x40) {
-        strcat(msg, "Page 3    : read only. Configuration byte and password tag " _RED_("FIXED / IRREVERSIBLE"));
+        strcat(msg + strlen(msg), "read only. Configuration byte and password tag " _RED_("FIXED / IRREVERSIBLE"));
     } else  {
-        strcat(msg, "Page 3    : " _GREEN_("read write"));
+        strcat(msg + strlen(msg), _GREEN_("read write"));
     }
     PrintAndLogEx(SUCCESS, "%s", msg);
     memset(msg, 0, sizeof(msg));
 
     // OTP
     if (config & 0x80) {
-        strcat(msg, "Page 1 " _RED_("locked") "\n");
+        strcat(msg, "Page 1      : " _RED_("locked") "\n");
 
+        strcat(msg + strlen(msg), "Page 2      : ");
         if (config & 0x8) {
-            strcat(msg + strlen(msg), "Page 2  : " _RED_("locked"));
+            strcat(msg + strlen(msg), _RED_("locked"));
         } else {
-            strcat(msg + strlen(msg), "Page 2  : read only");
+            strcat(msg + strlen(msg), "read only");
         }
     } else  {
-        strcat(msg, "Page 1,2  : " _GREEN_("read write"));
+        strcat(msg, "Page 1,2    : " _GREEN_("read write"));
     }
     PrintAndLogEx(SUCCESS, "%s", msg);
     PrintAndLogEx(INFO, "------------------------------------");
 }
 
+static bool getHitagUid(uint32_t *uid) {
+
+    UsbCommand c = {CMD_READER_HITAG, {RHT2F_UID_ONLY, 0, 0} };
+    clearCommandBuffer();
+    SendCommand(&c);
+    UsbCommand resp;
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
+        PrintAndLogEx(WARNING, "timeout while waiting for reply.");
+        return false;
+    }
+
+    if (resp.arg[0] == false) {
+        PrintAndLogEx(DEBUG, "DEBUG: Error - failed getting UID");
+        return false;
+    }
+
+    if ( uid )
+        *uid = bytes_to_num(resp.d.asBytes, 4);
+   
+    return true;
+}
+
 int CmdLFHitagInfo(const char *Cmd) {
     PrintAndLogEx(INFO, "Hitag2 tag information ");
     PrintAndLogEx(INFO, "To be done!");
@@ -437,7 +480,18 @@ int CmdLFHitagInfo(const char *Cmd) {
 
     char ctmp = tolower(param_getchar(Cmd, 0));
     if (ctmp == 'h') return usage_hitag_info();
+    
+    // pwd or key
 
+    // read UID
+    uint32_t uid = 0;
+    if ( getHitagUid( &uid ) == false ) 
+        return 1;
+    
+    PrintAndLogEx(SUCCESS, "UID: %08X", uid);
+    
+    // how to detemine Hitag types?
+    
     // read block3,  get configuration byte.
 
     // common configurations.
@@ -449,6 +503,9 @@ int CmdLFHitagInfo(const char *Cmd) {
     return 0;
 }
 
+// TODO: iceman 
+// Hitag2 reader,  problem is that this command mixes up stuff.  So 26 give uid.  21 etc will also give you a memory dump !?
+//
 int CmdLFHitagReader(const char *Cmd) {
 
     UsbCommand c = {CMD_READER_HITAG, {0, 0, 0} };
@@ -509,10 +566,10 @@ int CmdLFHitagReader(const char *Cmd) {
 
     uint32_t id = bytes_to_num(resp.d.asBytes, 4);
 
-    if (htf == RHT2F_UID_ONLY) {
-        PrintAndLogEx(SUCCESS, "Valid Hitag2 tag found - UID: %08x", id);
-    } else {
-
+    PrintAndLogEx(SUCCESS, "Valid Hitag2 tag found - UID: %08x", id);
+    if (htf != RHT2F_UID_ONLY) {
+        
+        PrintAndLogEx(SUCCESS, "Dumping tag memory..." );
         uint8_t *data = resp.d.asBytes;
 
         char filename[FILE_PATH_SIZE];
@@ -522,7 +579,10 @@ int CmdLFHitagReader(const char *Cmd) {
 
         saveFile(filename, "bin", data, 48);
         saveFileEML(filename, "eml", data, 48, 4);
-        saveFileJSON(filename, "json", jsfHitag, (uint8_t *)data, 48);
+        saveFileJSON(filename, "json", jsfHitag, data, 48);
+        
+        // block3, 1 byte
+        printHitagConfiguration(data[4*3] );
     }
     return 0;
 }

From 64c3ae8b34fa9ffdd5d4fd98ce14ae960d185e86 Mon Sep 17 00:00:00 2001
From: vratiskol <vincent.ratiskol@github.com>
Date: Fri, 15 Mar 2019 21:04:25 +0100
Subject: [PATCH 0806/1938] hf mf sim

---
 armsrc/Makefile     |    3 +-
 armsrc/apps.h       |    6 +-
 armsrc/iso14443a.c  |  704 +++-----------------------
 armsrc/iso14443a.h  |   20 +-
 armsrc/mifaresim.c  | 1149 +++++++++++++++++++++++++++++++++++++++++++
 armsrc/mifaresim.h  |   59 +++
 armsrc/mifareutil.c |   11 +
 armsrc/mifareutil.h |   22 +
 client/cmdhfmf.c    |   31 +-
 common/protocols.h  |    1 +
 include/mifare.h    |    5 +-
 include/usb_cmd.h   |    6 +-
 12 files changed, 1369 insertions(+), 648 deletions(-)
 create mode 100644 armsrc/mifaresim.c
 create mode 100644 armsrc/mifaresim.h

diff --git a/armsrc/Makefile b/armsrc/Makefile
index 382407e1d..3c93c4af8 100644
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -62,8 +62,7 @@ APP_CFLAGS = $(PLATFORM_DEFS) \
 SRC_LCD = fonts.c LCD.c
 SRC_LF = lfops.c hitag2.c hitagS.c lfsampling.c pcf7931.c lfdemod.c
 SRC_ISO15693 = iso15693.c iso15693tools.c
-#SRC_ISO14443a = iso14443a.c mifareutil.c mifarecmd.c epa.c mifaresim.c
-SRC_ISO14443a = iso14443a.c mifareutil.c mifarecmd.c epa.c
+SRC_ISO14443a = iso14443a.c mifareutil.c mifarecmd.c epa.c mifaresim.c
 SRC_ISO14443b = iso14443b.c
 SRC_FELICA = felica.c
 SRC_CRAPTO1 = crypto1.c des.c aes.c desfire_key.c desfire_crypto.c mifaredesfire.c
diff --git a/armsrc/apps.h b/armsrc/apps.h
index 36c865900..5bb92dc18 100644
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -133,8 +133,8 @@ void ReaderIso14443a(UsbCommand *c);
 void GetParity(const uint8_t *pbtCmd, uint16_t len, uint8_t *parity);
 void iso14a_set_trigger(bool enable);
 // also used in emv
-bool prepare_allocated_tag_modulation(tag_response_info_t *response_info);
-int GetIso14443aCommandFromReader(uint8_t *received, uint8_t *parity, int *len);
+//bool prepare_allocated_tag_modulation(tag_response_info_t *response_info);
+//int GetIso14443aCommandFromReader(uint8_t *received, uint8_t *parity, int *len);
 
 // epa.h
 void EPA_PACE_Collect_Nonce(UsbCommand *c);
@@ -154,7 +154,7 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
 void MifareAcquireNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *datain);
 void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain);
 void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain);
-void Mifare1ksim(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain);
+void Mifare1ksim(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain);
 void MifareSetDbgLvl(uint16_t arg0);
 void MifareEMemClr(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain);
 void MifareEMemSet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain);
diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index a22a79390..e556e0ff1 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -16,9 +16,6 @@ static uint32_t iso14a_timeout;
 
 uint8_t colpos = 0;
 int rsamples = 0;
-//int ReqCount;
-//char CollisionIndicators[10*8];
-
 uint8_t trigger = 0;
 // the block number for the ISO14443-4 PCB
 static uint8_t iso14_pcb_blocknum = 0;
@@ -53,17 +50,6 @@ static uint8_t *free_buffer_pointer;
 // 1 tick to assign mod_sig_coil
 #define DELAY_ARM2AIR_AS_READER (4*16 + 8*16 + 8 + 8 + 1)
 
-// When the PM acts as tag and is receiving it takes
-// 2 ticks delay in the RF part (for the first falling edge),
-// 3 ticks for the A/D conversion,
-// 8 ticks on average until the start of the SSC transfer,
-// 8 ticks until the SSC samples the first data
-// 7*16 ticks to complete the transfer from FPGA to ARM
-// 8 ticks until the next ssp_clk rising edge
-// 4*16 ticks until we measure the time
-// - 8*16 ticks because we measure the time of the previous transfer
-#define DELAY_AIR2ARM_AS_TAG (2 + 3 + 8 + 8 + 7*16 + 8 + 4*16 - 8*16)
-
 // The FPGA will report its internal sending delay in
 uint16_t FpgaSendQueueDelay;
 // the 5 first bits are the number of bits buffered in mod_sig_buf
@@ -755,12 +741,40 @@ static void Code4bitAnswerAsTag(uint8_t cmd) {
     ToSendMax++;
 }
 
+static uint8_t *LastReaderTraceTime = NULL;
+
+void EmLogTraceReader(void) {
+    // remember last reader trace start to fix timing info later
+    LastReaderTraceTime = BigBuf_get_addr() + BigBuf_get_traceLen();
+    LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+}
+
+static void FixLastReaderTraceTime(uint32_t tag_StartTime) {
+    uint32_t reader_EndTime = Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG;
+    uint32_t reader_StartTime = Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG;
+    uint16_t reader_modlen = reader_EndTime - reader_StartTime;
+    uint16_t approx_fdt = tag_StartTime - reader_EndTime;
+    uint16_t exact_fdt = (approx_fdt - 20 + 32) / 64 * 64 + 20;
+    reader_StartTime = tag_StartTime - exact_fdt - reader_modlen;
+    LastReaderTraceTime[0] = (reader_StartTime >> 0) & 0xff;
+    LastReaderTraceTime[1] = (reader_StartTime >> 8) & 0xff;
+    LastReaderTraceTime[2] = (reader_StartTime >> 16) & 0xff;
+    LastReaderTraceTime[3] = (reader_StartTime >> 24) & 0xff;
+}
+
+static void EmLogTraceTag(uint8_t *tag_data, uint16_t tag_len, uint8_t *tag_Parity, uint32_t ProxToAirDuration) {
+    uint32_t tag_StartTime = LastTimeProxToAirStart * 16 + DELAY_ARM2AIR_AS_TAG;
+    uint32_t tag_EndTime = (LastTimeProxToAirStart + ProxToAirDuration) * 16 + DELAY_ARM2AIR_AS_TAG;
+    LogTrace(tag_data, tag_len, tag_StartTime, tag_EndTime, tag_Parity, false);
+    FixLastReaderTraceTime(tag_StartTime);
+}
+
 //-----------------------------------------------------------------------------
 // Wait for commands from reader
 // stop when button is pressed
 // or return TRUE when command is captured
 //-----------------------------------------------------------------------------
-int GetIso14443aCommandFromReader(uint8_t *received, uint8_t *parity, int *len) {
+static int GetIso14443aCommandFromReader(uint8_t *received, uint8_t *parity, int *len) {
     // Set FPGA mode to "simulated ISO 14443 tag", no modulation (listen
     // only, since we are receiving, not transmitting).
     // Signal field is off with the appropriate LED
@@ -780,6 +794,7 @@ int GetIso14443aCommandFromReader(uint8_t *received, uint8_t *parity, int *len)
             b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
             if (MillerDecoding(b, 0)) {
                 *len = Uart.len;
+                EmLogTraceReader();
                 return true;
             }
         }
@@ -787,7 +802,7 @@ int GetIso14443aCommandFromReader(uint8_t *received, uint8_t *parity, int *len)
     return false;
 }
 
-bool prepare_tag_modulation(tag_response_info_t *response_info, size_t max_buffer_size) {
+static bool prepare_tag_modulation(tag_response_info_t *response_info, size_t max_buffer_size)  {
     // Example response, answer to MIFARE Classic read block will be 16 bytes + 2 CRC = 18 bytes
     // This will need the following byte array for a modulation sequence
     //    144        data bits (18 * 8)
@@ -825,23 +840,21 @@ bool prepare_tag_modulation(tag_response_info_t *response_info, size_t max_buffe
 // 47 * 8 data bits, 47 * 1 parity bits, 10 start bits, 10 stop bits, 10 correction bits
 #define ALLOCATED_TAG_MODULATION_BUFFER_SIZE 453
 
-bool prepare_allocated_tag_modulation(tag_response_info_t *response_info) {
-    // Retrieve and store the current buffer index
-    response_info->modulation = free_buffer_pointer;
+bool prepare_allocated_tag_modulation(tag_response_info_t *response_info, uint8_t **buffer, size_t *max_buffer_size) {
 
-    // Determine the maximum size we can use from our buffer
-    size_t max_buffer_size = ALLOCATED_TAG_MODULATION_BUFFER_SIZE;
+    // Retrieve and store the current buffer index
+    response_info->modulation = *buffer;
 
     // Forward the prepare tag modulation function to the inner function
-    if (prepare_tag_modulation(response_info, max_buffer_size)) {
-        // Update the free buffer offset
-        free_buffer_pointer += ToSendMax;
+    if (prepare_tag_modulation(response_info, *max_buffer_size)) {
+        // Update the free buffer offset and the remaining buffer size
+        *buffer += ToSendMax;
+        *max_buffer_size -= ToSendMax;
         return true;
     } else {
         return false;
     }
 }
-
 //-----------------------------------------------------------------------------
 // Main loop of simulated tag: receive commands from reader, decide what
 // response to send, and send it.
@@ -1040,12 +1053,13 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
     // allocate buffers:
     uint8_t *receivedCmd = BigBuf_malloc(MAX_FRAME_SIZE);
     uint8_t *receivedCmdPar = BigBuf_malloc(MAX_PARITY_SIZE);
-    free_buffer_pointer = BigBuf_malloc(ALLOCATED_TAG_MODULATION_BUFFER_SIZE);
+    //free_buffer_pointer = BigBuf_malloc(ALLOCATED_TAG_MODULATION_BUFFER_SIZE);
+    size_t free_buffer_size = ALLOCATED_TAG_MODULATION_BUFFER_SIZE;
 
     // Prepare the responses of the anticollision phase
     // there will be not enough time to do this at the moment the reader sends it REQA
     for (size_t i = 0; i < TAG_RESPONSE_COUNT; i++)
-        prepare_allocated_tag_modulation(&responses[i]);
+        prepare_allocated_tag_modulation(&responses[i], &free_buffer_pointer, &free_buffer_size);
 
     int len = 0;
 
@@ -1621,7 +1635,7 @@ int EmGetCmd(uint8_t *received, uint16_t *len, uint8_t *parity) {
             analogAVG += AT91C_BASE_ADC->ADC_CDR[ADC_CHAN_HF];
             AT91C_BASE_ADC->ADC_CR = AT91C_ADC_START;
             if (analogCnt >= 32) {
-                if ((MAX_ADC_HF_VOLTAGE * (analogAVG / analogCnt) >> 10) < MF_MINFIELDV) {
+                if ((MAX_ADC_HF_VOLTAGE_RDV40 * (analogAVG / analogCnt) >> 10) < MF_MINFIELDV) {
                     vtime = GetTickCount();
                     if (!timer) timer = vtime;
                     // 50ms no field --> card to idle state
@@ -1637,6 +1651,7 @@ int EmGetCmd(uint8_t *received, uint16_t *len, uint8_t *parity) {
             b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
             if (MillerDecoding(b, 0)) {
                 *len = Uart.len;
+                EmLogTraceReader();
                 return 0;
             }
         }
@@ -1755,11 +1770,30 @@ int EmSendCmdEx(uint8_t *resp, uint16_t respLen, bool collision) {
     return EmSendCmdParEx(resp, respLen, par, collision);
 }
 
-bool EmLogTrace(uint8_t *reader_data, uint16_t reader_len, uint32_t reader_StartTime, uint32_t reader_EndTime, uint8_t *reader_Parity,
-                uint8_t *tag_data, uint16_t tag_len, uint32_t tag_StartTime, uint32_t tag_EndTime, uint8_t *tag_Parity) {
+int EmSendPrecompiledCmd(tag_response_info_t *response_info) {
+    int ret = EmSendCmd14443aRaw(response_info->modulation, response_info->modulation_n);
+
+    // do the tracing for the previous reader request and this tag answer:
+    EmLogTraceTag(response_info->response, response_info->response_n,
+                  &(response_info->par), response_info->ProxToAirDuration);
+
+    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
+        Dbprintf("response_info->response %02X", response_info->response);
+        Dbprintf("response_info->response_n %02X", response_info->response_n);
+        Dbprintf("response_info->par %02X", &(response_info->par));
+    }
+
+    return ret;
+}
+
+bool EmLogTrace(uint8_t *reader_data, uint16_t reader_len, uint32_t reader_StartTime,
+                uint32_t reader_EndTime, uint8_t *reader_Parity, uint8_t *tag_data,
+                uint16_t tag_len, uint32_t tag_StartTime, uint32_t tag_EndTime, uint8_t *tag_Parity) {
+
     // we cannot exactly measure the end and start of a received command from reader. However we know that the delay from
     // end of the received command to start of the tag's (simulated by us) answer is n*128+20 or n*128+84 resp.
     // with n >= 9. The start of the tags answer can be measured and therefore the end of the received command be calculated:
+
     uint16_t reader_modlen = reader_EndTime - reader_StartTime;
     uint16_t approx_fdt = tag_StartTime - reader_EndTime;
     uint16_t exact_fdt = (approx_fdt - 20 + 32) / 64 * 64 + 20;
@@ -2949,610 +2983,6 @@ void DetectNACKbug() {
     set_tracing(false);
 }
 
-/**
-  *MIFARE 1K simulate.
-  *
-  *@param flags :
-  * FLAG_INTERACTIVE           - In interactive mode, we are expected to finish the operation with an ACK
-  * FLAG_4B_UID_IN_DATA        - use 4-byte UID in the data-section
-  * FLAG_7B_UID_IN_DATA        - use 7-byte UID in the data-section
-  * FLAG_10B_UID_IN_DATA       - use 10-byte UID in the data-section
-  * FLAG_UID_IN_EMUL           - use 4-byte UID from emulator memory
-  * FLAG_NR_AR_ATTACK          - collect NR_AR responses for bruteforcing later
-  *@param exitAfterNReads, exit simulation after n blocks have been read, 0 is inifite
-* (unless reader attack mode enabled then it runs util it gets enough nonces to recover all keys attmpted)
-  */
-void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *datain) {
-
-    int cardSTATE = MFEMUL_NOFIELD;
-    int _UID_LEN = 0;  // 4, 7, 10
-    int vHf = 0;    // in mV
-    int res = 0;
-    uint32_t selTimer = 0;
-    uint32_t authTimer = 0;
-    uint16_t len = 0;
-    uint8_t cardWRBL = 0;
-    uint8_t cardAUTHSC = 0;
-    uint8_t cardAUTHKEY = 0xff;  // no authentication
-    uint32_t cuid = 0;
-    uint32_t ans = 0;
-    uint32_t cardINTREG = 0;
-    uint8_t cardINTBLOCK = 0;
-    struct Crypto1State mpcs = {0, 0};
-    struct Crypto1State *pcs;
-    pcs = &mpcs;
-    uint32_t numReads = 0;    // Counts numer of times reader read a block
-    uint8_t receivedCmd[MAX_MIFARE_FRAME_SIZE] = {0x00};
-    uint8_t receivedCmd_par[MAX_MIFARE_PARITY_SIZE] = {0x00};
-    uint8_t response[MAX_MIFARE_FRAME_SIZE] = {0x00};
-    uint8_t response_par[MAX_MIFARE_PARITY_SIZE] = {0x00};
-
-    uint8_t atqa[]   = {0x04, 0x00}; // Mifare classic 1k
-    uint8_t sak_4[]  = {0x0C, 0x00, 0x00}; // CL1 - 4b uid
-    uint8_t sak_7[]  = {0x0C, 0x00, 0x00}; // CL2 - 7b uid
-    uint8_t sak_10[] = {0x0C, 0x00, 0x00}; // CL3 - 10b uid
-    // uint8_t sak[] = {0x09, 0x3f, 0xcc };  // Mifare Mini
-
-    uint8_t rUIDBCC1[] = {0xde, 0xad, 0xbe, 0xaf, 0x62};
-    uint8_t rUIDBCC2[] = {0xde, 0xad, 0xbe, 0xaf, 0x62};
-    uint8_t rUIDBCC3[] = {0xde, 0xad, 0xbe, 0xaf, 0x62};
-
-    // TAG Nonce - Authenticate response
-    uint8_t rAUTH_NT[4];
-    uint32_t nonce = prng_successor(GetTickCount(), 32);
-    num_to_bytes(nonce, 4, rAUTH_NT);
-
-    // uint8_t rAUTH_NT[] = {0x55, 0x41, 0x49, 0x92};// nonce from nested? why this?
-    uint8_t rAUTH_AT[] = {0x00, 0x00, 0x00, 0x00};
-
-    // Here, we collect CUID, NT, NR, AR, CUID2, NT2, NR2, AR2
-    // This can be used in a reader-only attack.
-    nonces_t ar_nr_nonces[ATTACK_KEY_COUNT];
-    memset(ar_nr_nonces, 0x00, sizeof(ar_nr_nonces));
-
-    // -- Determine the UID
-    // Can be set from emulator memory or incoming data
-    // Length: 4,7,or 10 bytes
-    if ((flags & FLAG_UID_IN_EMUL) == FLAG_UID_IN_EMUL)
-        emlGetMemBt(datain, 0, 10);  // load 10bytes from EMUL to the datain pointer. to be used below.
-
-    if ((flags & FLAG_4B_UID_IN_DATA) == FLAG_4B_UID_IN_DATA) {
-        memcpy(rUIDBCC1, datain, 4);
-        _UID_LEN = 4;
-    } else if ((flags & FLAG_7B_UID_IN_DATA) == FLAG_7B_UID_IN_DATA) {
-        memcpy(&rUIDBCC1[1], datain,   3);
-        memcpy(rUIDBCC2,    datain + 3, 4);
-        _UID_LEN = 7;
-    } else if ((flags & FLAG_10B_UID_IN_DATA) == FLAG_10B_UID_IN_DATA) {
-        memcpy(&rUIDBCC1[1], datain,   3);
-        memcpy(&rUIDBCC2[1], datain + 3, 3);
-        memcpy(rUIDBCC3,    datain + 6, 4);
-        _UID_LEN = 10;
-    }
-
-    switch (_UID_LEN) {
-        case 4:
-            sak_4[0] &= 0xFB;
-            // save CUID
-            cuid = bytes_to_num(rUIDBCC1, 4);
-            // BCC
-            rUIDBCC1[4] = rUIDBCC1[0] ^ rUIDBCC1[1] ^ rUIDBCC1[2] ^ rUIDBCC1[3];
-            if (MF_DBGLEVEL >= 2)    {
-                Dbprintf("4B UID: %02x%02x%02x%02x",
-                         rUIDBCC1[0],
-                         rUIDBCC1[1],
-                         rUIDBCC1[2],
-                         rUIDBCC1[3]
-                        );
-            }
-            break;
-        case 7:
-            atqa[0] |= 0x40;
-            sak_7[0] &= 0xFB;
-            // save CUID
-            cuid = bytes_to_num(rUIDBCC2, 4);
-            // CascadeTag, CT
-            rUIDBCC1[0] = 0x88;
-            // BCC
-            rUIDBCC1[4] = rUIDBCC1[0] ^ rUIDBCC1[1] ^ rUIDBCC1[2] ^ rUIDBCC1[3];
-            rUIDBCC2[4] = rUIDBCC2[0] ^ rUIDBCC2[1] ^ rUIDBCC2[2] ^ rUIDBCC2[3];
-            if (MF_DBGLEVEL >= 2)    {
-                Dbprintf("7B UID: %02x %02x %02x %02x %02x %02x %02x",
-                         rUIDBCC1[1],
-                         rUIDBCC1[2],
-                         rUIDBCC1[3],
-                         rUIDBCC2[0],
-                         rUIDBCC2[1],
-                         rUIDBCC2[2],
-                         rUIDBCC2[3]
-                        );
-            }
-            break;
-        case 10:
-            atqa[0] |= 0x80;
-            sak_10[0] &= 0xFB;
-            // save CUID
-            cuid = bytes_to_num(rUIDBCC3, 4);
-            // CascadeTag, CT
-            rUIDBCC1[0] = 0x88;
-            rUIDBCC2[0] = 0x88;
-            // BCC
-            rUIDBCC1[4] = rUIDBCC1[0] ^ rUIDBCC1[1] ^ rUIDBCC1[2] ^ rUIDBCC1[3];
-            rUIDBCC2[4] = rUIDBCC2[0] ^ rUIDBCC2[1] ^ rUIDBCC2[2] ^ rUIDBCC2[3];
-            rUIDBCC3[4] = rUIDBCC3[0] ^ rUIDBCC3[1] ^ rUIDBCC3[2] ^ rUIDBCC3[3];
-
-            if (MF_DBGLEVEL >= 2)    {
-                Dbprintf("10B UID: %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x",
-                         rUIDBCC1[1],
-                         rUIDBCC1[2],
-                         rUIDBCC1[3],
-                         rUIDBCC2[1],
-                         rUIDBCC2[2],
-                         rUIDBCC2[3],
-                         rUIDBCC3[0],
-                         rUIDBCC3[1],
-                         rUIDBCC3[2],
-                         rUIDBCC3[3]
-                        );
-            }
-            break;
-        default:
-            break;
-    }
-    // calc some crcs
-    compute_crc(CRC_14443_A, sak_4, 1, &sak_4[1], &sak_4[2]);
-    compute_crc(CRC_14443_A, sak_7, 1, &sak_7[1], &sak_7[2]);
-    compute_crc(CRC_14443_A, sak_10, 1, &sak_10[1], &sak_10[2]);
-
-    // We need to listen to the high-frequency, peak-detected path.
-    iso14443a_setup(FPGA_HF_ISO14443A_TAGSIM_LISTEN);
-
-    // free eventually allocated BigBuf memory but keep Emulator Memory
-    BigBuf_free_keep_EM();
-    clear_trace();
-    set_tracing(true);
-    LED_D_ON();
-
-    bool finished = false;
-    while (!BUTTON_PRESS() && !finished && !usb_poll_validate_length()) {
-        WDT_HIT();
-
-        // find reader field
-        if (cardSTATE == MFEMUL_NOFIELD) {
-
-            vHf = (MAX_ADC_HF_VOLTAGE * AvgAdc(ADC_CHAN_HF)) >> 10;
-            if (vHf > MF_MINFIELDV) {
-                cardSTATE_TO_IDLE();
-                LED_A_ON();
-            }
-        }
-        if (cardSTATE == MFEMUL_NOFIELD) continue;
-
-        // Now, get data
-        res = EmGetCmd(receivedCmd, &len, receivedCmd_par);
-        if (res == 2) { //Field is off!
-            cardSTATE = MFEMUL_NOFIELD;
-            LEDsoff();
-            continue;
-        } else if (res == 1) {
-            break;     // return value 1 means button press
-        }
-
-        // REQ or WUP request in ANY state and WUP in HALTED state
-        // this if-statement doesn't match the specification above. (iceman)
-        if (len == 1 && ((receivedCmd[0] == ISO14443A_CMD_REQA && cardSTATE != MFEMUL_HALTED) || receivedCmd[0] == ISO14443A_CMD_WUPA)) {
-            selTimer = GetTickCount();
-            EmSendCmd(atqa, sizeof(atqa));
-            cardSTATE = MFEMUL_SELECT1;
-            crypto1_destroy(pcs);
-            cardAUTHKEY = 0xff;
-            nonce = prng_successor(selTimer, 32);
-            continue;
-        }
-
-        switch (cardSTATE) {
-            case MFEMUL_NOFIELD:
-            case MFEMUL_HALTED:
-            case MFEMUL_IDLE: {
-                LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
-                break;
-            }
-            case MFEMUL_SELECT1: {
-                if (len == 2 && (receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT && receivedCmd[1] == 0x20)) {
-                    if (MF_DBGLEVEL >= 4)    Dbprintf("SELECT ALL received");
-                    EmSendCmd(rUIDBCC1, sizeof(rUIDBCC1));
-                    break;
-                }
-                // select card
-                if (len == 9 &&
-                        (receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT &&
-                         receivedCmd[1] == 0x70 &&
-                         memcmp(&receivedCmd[2], rUIDBCC1, 4) == 0)) {
-
-                    // SAK 4b
-                    EmSendCmd(sak_4, sizeof(sak_4));
-                    switch (_UID_LEN) {
-                        case 4:
-                            cardSTATE = MFEMUL_WORK;
-                            LED_B_ON();
-                            if (MF_DBGLEVEL >= 4)    Dbprintf("--> WORK. anticol1 time: %d", GetTickCount() - selTimer);
-                            continue;
-                        case 7:
-                        case 10:
-                            cardSTATE = MFEMUL_SELECT2;
-                            continue;
-                        default:
-                            break;
-                    }
-                } else {
-                    cardSTATE_TO_IDLE();
-                }
-                break;
-            }
-            case MFEMUL_SELECT2: {
-                if (!len) {
-                    LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
-                    break;
-                }
-                if (len == 2 && (receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2 && receivedCmd[1] == 0x20)) {
-                    EmSendCmd(rUIDBCC2, sizeof(rUIDBCC2));
-                    break;
-                }
-                if (len == 9 &&
-                        (receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2 &&
-                         receivedCmd[1] == 0x70 &&
-                         memcmp(&receivedCmd[2], rUIDBCC2, 4) == 0)) {
-
-                    EmSendCmd(sak_7, sizeof(sak_7));
-                    switch (_UID_LEN) {
-                        case 7:
-                            cardSTATE = MFEMUL_WORK;
-                            LED_B_ON();
-                            if (MF_DBGLEVEL >= 4)    Dbprintf("--> WORK. anticol2 time: %d", GetTickCount() - selTimer);
-                            continue;
-                        case 10:
-                            cardSTATE = MFEMUL_SELECT3;
-                            continue;
-                        default:
-                            break;
-                    }
-                }
-                cardSTATE_TO_IDLE();
-                break;
-            }
-            case MFEMUL_SELECT3: {
-                if (!len) {
-                    LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
-                    break;
-                }
-                if (len == 2 && (receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_3 && receivedCmd[1] == 0x20)) {
-                    EmSendCmd(rUIDBCC3, sizeof(rUIDBCC3));
-                    break;
-                }
-                if (len == 9 &&
-                        (receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_3 &&
-                         receivedCmd[1] == 0x70 &&
-                         memcmp(&receivedCmd[2], rUIDBCC3, 4) == 0)) {
-
-                    EmSendCmd(sak_10, sizeof(sak_10));
-                    cardSTATE = MFEMUL_WORK;
-                    LED_B_ON();
-                    if (MF_DBGLEVEL >= 4)    Dbprintf("--> WORK. anticol3 time: %d", GetTickCount() - selTimer);
-                    break;
-                }
-                cardSTATE_TO_IDLE();
-                break;
-            }
-            case MFEMUL_AUTH1: {
-                if (len != 8) {
-                    cardSTATE_TO_IDLE();
-                    LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
-                    break;
-                }
-
-                uint32_t nr = bytes_to_num(receivedCmd, 4);
-                uint32_t ar = bytes_to_num(&receivedCmd[4], 4);
-
-                // Collect AR/NR per keytype & sector
-                if ((flags & FLAG_NR_AR_ATTACK) == FLAG_NR_AR_ATTACK) {
-
-                    int8_t index = -1;
-                    int8_t empty = -1;
-                    for (uint8_t i = 0; i < ATTACK_KEY_COUNT; i++) {
-                        // find which index to use
-                        if ((cardAUTHSC == ar_nr_nonces[i].sector) && (cardAUTHKEY == ar_nr_nonces[i].keytype))
-                            index = i;
-
-                        // keep track of empty slots.
-                        if (ar_nr_nonces[i].state == EMPTY)
-                            empty = i;
-                    }
-                    // if no empty slots.  Choose first and overwrite.
-                    if (index == -1) {
-                        if (empty == -1) {
-                            index = 0;
-                            ar_nr_nonces[index].state = EMPTY;
-                        } else {
-                            index = empty;
-                        }
-                    }
-
-                    switch (ar_nr_nonces[index].state) {
-                        case EMPTY: {
-                            // first nonce collect
-                            ar_nr_nonces[index].cuid = cuid;
-                            ar_nr_nonces[index].sector = cardAUTHSC;
-                            ar_nr_nonces[index].keytype = cardAUTHKEY;
-                            ar_nr_nonces[index].nonce = nonce;
-                            ar_nr_nonces[index].nr = nr;
-                            ar_nr_nonces[index].ar = ar;
-                            ar_nr_nonces[index].state = FIRST;
-                            break;
-                        }
-                        case FIRST : {
-                            // second nonce collect
-                            ar_nr_nonces[index].nonce2 = nonce;
-                            ar_nr_nonces[index].nr2 = nr;
-                            ar_nr_nonces[index].ar2 = ar;
-                            ar_nr_nonces[index].state = SECOND;
-
-                            // send to client
-                            cmd_send(CMD_ACK, CMD_SIMULATE_MIFARE_CARD, 0, 0, &ar_nr_nonces[index], sizeof(nonces_t));
-
-                            ar_nr_nonces[index].state = EMPTY;
-                            ar_nr_nonces[index].sector = 0;
-                            ar_nr_nonces[index].keytype = 0;
-                            break;
-                        }
-                        default:
-                            break;
-                    }
-                }
-
-                crypto1_word(pcs, nr, 1);
-                uint32_t cardRr = ar ^ crypto1_word(pcs, 0, 0);
-
-                //test if auth OK
-                if (cardRr != prng_successor(nonce, 64)) {
-
-                    if (MF_DBGLEVEL >= 3) {
-                        Dbprintf("AUTH FAILED for sector %d with key %c. [nr=%08x  cardRr=%08x] [nt=%08x succ=%08x]"
-                                 , cardAUTHSC
-                                 , (cardAUTHKEY == 0) ? 'A' : 'B'
-                                 , nr
-                                 , cardRr
-                                 , nonce // nt
-                                 , prng_successor(nonce, 64)
-                                );
-                    }
-                    // Shouldn't we respond anything here?
-                    // Right now, we don't nack or anything, which causes the
-                    // reader to do a WUPA after a while. /Martin
-                    // -- which is the correct response. /piwi
-                    cardSTATE_TO_IDLE();
-                    LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
-                    break;
-                }
-
-                ans = prng_successor(nonce, 96) ^ crypto1_word(pcs, 0, 0);
-                num_to_bytes(ans, 4, rAUTH_AT);
-                EmSendCmd(rAUTH_AT, sizeof(rAUTH_AT));
-                LED_C_ON();
-
-                if (MF_DBGLEVEL >= 3) {
-                    Dbprintf("AUTH COMPLETED for sector %d with key %c. time=%d",
-                             cardAUTHSC,
-                             cardAUTHKEY == 0 ? 'A' : 'B',
-                             GetTickCount() - authTimer
-                            );
-                }
-                cardSTATE = MFEMUL_WORK;
-                break;
-            }
-            case MFEMUL_WORK: {
-                if (len == 0) {
-                    LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
-                    break;
-                }
-                bool encrypted_data = (cardAUTHKEY != 0xFF) ;
-
-                if (encrypted_data)
-                    mf_crypto1_decrypt(pcs, receivedCmd, len);
-
-                if (len == 4 && (receivedCmd[0] == MIFARE_AUTH_KEYA ||
-                                 receivedCmd[0] == MIFARE_AUTH_KEYB)) {
-
-                    authTimer = GetTickCount();
-                    cardAUTHSC = receivedCmd[1] / 4;  // received block -> sector
-                    cardAUTHKEY = receivedCmd[0] & 0x1;
-                    crypto1_destroy(pcs);
-
-                    // load key into crypto
-                    crypto1_create(pcs, emlGetKey(cardAUTHSC, cardAUTHKEY));
-
-                    if (!encrypted_data) {
-                        // first authentication
-                        // Update crypto state init  (UID ^ NONCE)
-                        crypto1_word(pcs, cuid ^ nonce, 0);
-                        num_to_bytes(nonce, 4, rAUTH_AT);
-                    } else {
-                        // nested authentication
-                        ans = nonce ^ crypto1_word(pcs, cuid ^ nonce, 0);
-                        num_to_bytes(ans, 4, rAUTH_AT);
-
-                        if (MF_DBGLEVEL >= 3) Dbprintf("Reader doing nested authentication for block %d (0x%02x) with key %c", receivedCmd[1], receivedCmd[1],     cardAUTHKEY == 0 ? 'A' : 'B');
-                    }
-
-                    EmSendCmd(rAUTH_AT, sizeof(rAUTH_AT));
-                    cardSTATE = MFEMUL_AUTH1;
-                    break;
-                }
-
-                // rule 13 of 7.5.3. in ISO 14443-4. chaining shall be continued
-                // BUT... ACK --> NACK
-                if (len == 1 && receivedCmd[0] == CARD_ACK) {
-                    EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
-                    break;
-                }
-
-                // rule 12 of 7.5.3. in ISO 14443-4. R(NAK) --> R(ACK)
-                if (len == 1 && receivedCmd[0] == CARD_NACK_NA) {
-                    EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_ACK));
-                    break;
-                }
-
-                if (len != 4) {
-                    LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
-                    break;
-                }
-
-                if (receivedCmd[0] == ISO14443A_CMD_READBLOCK ||
-                        receivedCmd[0] == ISO14443A_CMD_WRITEBLOCK ||
-                        receivedCmd[0] == MIFARE_CMD_INC ||
-                        receivedCmd[0] == MIFARE_CMD_DEC ||
-                        receivedCmd[0] == MIFARE_CMD_RESTORE ||
-                        receivedCmd[0] == MIFARE_CMD_TRANSFER) {
-
-                    if (receivedCmd[1] >= 16 * 4) {
-                        EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
-                        if (MF_DBGLEVEL >= 4) Dbprintf("Reader tried to operate (0x%02) on out of range block: %d (0x%02x), nacking", receivedCmd[0], receivedCmd[1], receivedCmd[1]);
-                        break;
-                    }
-
-                    if (receivedCmd[1] / 4 != cardAUTHSC) {
-                        EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
-                        if (MF_DBGLEVEL >= 4) Dbprintf("Reader tried to operate (0x%02) on block (0x%02x) not authenticated for (0x%02x), nacking", receivedCmd[0], receivedCmd[1], cardAUTHSC);
-                        break;
-                    }
-                }
-                // read block
-                if (receivedCmd[0] == ISO14443A_CMD_READBLOCK) {
-                    if (MF_DBGLEVEL >= 4) Dbprintf("Reader reading block %d (0x%02x)", receivedCmd[1], receivedCmd[1]);
-
-                    emlGetMem(response, receivedCmd[1], 1);
-                    AddCrc14A(response, 16);
-                    mf_crypto1_encrypt(pcs, response, 18, response_par);
-                    EmSendCmdPar(response, 18, response_par);
-                    numReads++;
-                    if (exitAfterNReads > 0 && numReads >= exitAfterNReads) {
-                        Dbprintf("%d reads done, exiting", numReads);
-                        finished = true;
-                    }
-                    break;
-                }
-                // write block
-                if (receivedCmd[0] == ISO14443A_CMD_WRITEBLOCK) {
-                    if (MF_DBGLEVEL >= 4) Dbprintf("RECV 0xA0 write block %d (%02x)", receivedCmd[1], receivedCmd[1]);
-                    EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_ACK));
-                    cardSTATE = MFEMUL_WRITEBL2;
-                    cardWRBL = receivedCmd[1];
-                    break;
-                }
-                // increment, decrement, restore
-                if (receivedCmd[0] == MIFARE_CMD_INC ||
-                        receivedCmd[0] == MIFARE_CMD_DEC ||
-                        receivedCmd[0] == MIFARE_CMD_RESTORE) {
-
-                    if (MF_DBGLEVEL >= 4) Dbprintf("RECV 0x%02x inc(0xC1)/dec(0xC0)/restore(0xC2) block %d (%02x)", receivedCmd[0], receivedCmd[1], receivedCmd[1]);
-
-                    if (emlCheckValBl(receivedCmd[1])) {
-                        if (MF_DBGLEVEL >= 4) Dbprintf("Reader tried to operate on block, but emlCheckValBl failed, nacking");
-                        EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
-                        break;
-                    }
-                    EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_ACK));
-                    if (receivedCmd[0] == MIFARE_CMD_INC)        cardSTATE = MFEMUL_INTREG_INC;
-                    if (receivedCmd[0] == MIFARE_CMD_DEC)        cardSTATE = MFEMUL_INTREG_DEC;
-                    if (receivedCmd[0] == MIFARE_CMD_RESTORE)    cardSTATE = MFEMUL_INTREG_REST;
-                    cardWRBL = receivedCmd[1];
-                    break;
-                }
-                // transfer
-                if (receivedCmd[0] == MIFARE_CMD_TRANSFER) {
-                    if (MF_DBGLEVEL >= 4) Dbprintf("RECV 0x%02x transfer block %d (%02x)", receivedCmd[0], receivedCmd[1], receivedCmd[1]);
-                    if (emlSetValBl(cardINTREG, cardINTBLOCK, receivedCmd[1]))
-                        EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
-                    else
-                        EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_ACK));
-                    break;
-                }
-                // halt
-                if (receivedCmd[0] == ISO14443A_CMD_HALT && receivedCmd[1] == 0x00) {
-                    LED_B_OFF();
-                    LED_C_OFF();
-                    cardSTATE = MFEMUL_HALTED;
-                    if (MF_DBGLEVEL >= 4)    Dbprintf("--> HALTED. Selected time: %d ms",  GetTickCount() - selTimer);
-                    LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
-                    break;
-                }
-                // RATS
-                if (receivedCmd[0] == ISO14443A_CMD_RATS) {
-                    EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
-                    break;
-                }
-                // command not allowed
-                if (MF_DBGLEVEL >= 4)    Dbprintf("Received command not allowed, nacking");
-                EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
-                break;
-            }
-            case MFEMUL_WRITEBL2: {
-                if (len == 18) {
-                    mf_crypto1_decrypt(pcs, receivedCmd, len);
-                    emlSetMem(receivedCmd, cardWRBL, 1);
-                    EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_ACK));
-                    cardSTATE = MFEMUL_WORK;
-                } else {
-                    cardSTATE_TO_IDLE();
-                    LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
-                }
-                break;
-            }
-            case MFEMUL_INTREG_INC: {
-                mf_crypto1_decrypt(pcs, receivedCmd, len);
-                memcpy(&ans, receivedCmd, 4);
-                if (emlGetValBl(&cardINTREG, &cardINTBLOCK, cardWRBL)) {
-                    EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
-                    cardSTATE_TO_IDLE();
-                    break;
-                }
-                LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
-                cardINTREG = cardINTREG + ans;
-                cardSTATE = MFEMUL_WORK;
-                break;
-            }
-            case MFEMUL_INTREG_DEC: {
-                mf_crypto1_decrypt(pcs, receivedCmd, len);
-                memcpy(&ans, receivedCmd, 4);
-                if (emlGetValBl(&cardINTREG, &cardINTBLOCK, cardWRBL)) {
-                    EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
-                    cardSTATE_TO_IDLE();
-                    break;
-                }
-                LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
-                cardINTREG = cardINTREG - ans;
-                cardSTATE = MFEMUL_WORK;
-                break;
-            }
-            case MFEMUL_INTREG_REST: {
-                mf_crypto1_decrypt(pcs, receivedCmd, len);
-                memcpy(&ans, receivedCmd, 4);
-                if (emlGetValBl(&cardINTREG, &cardINTBLOCK, cardWRBL)) {
-                    EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
-                    cardSTATE_TO_IDLE();
-                    break;
-                }
-                LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
-                cardSTATE = MFEMUL_WORK;
-                break;
-            }
-        }
-    }
-
-    if (MF_DBGLEVEL >= 1)
-        Dbprintf("Emulator stopped. Trace length: %d ", BigBuf_get_traceLen());
-
-    cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
-    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-    LEDsoff();
-    set_tracing(false);
-}
+void AppendCrc14443a(uint8_t *data, int len) {
+    compute_crc(CRC_14443_A, data, len, data + len, data + len + 1);
+}
\ No newline at end of file
diff --git a/armsrc/iso14443a.h b/armsrc/iso14443a.h
index 4d28a8dfb..747f0c529 100644
--- a/armsrc/iso14443a.h
+++ b/armsrc/iso14443a.h
@@ -30,6 +30,17 @@ extern "C" {
 #include "random.h"
 #include "mifare.h"  // structs
 
+// When the PM acts as tag and is receiving it takes
+// 2 ticks delay in the RF part (for the first falling edge),
+// 3 ticks for the A/D conversion,
+// 8 ticks on average until the start of the SSC transfer,
+// 8 ticks until the SSC samples the first data
+// 7*16 ticks to complete the transfer from FPGA to ARM
+// 8 ticks until the next ssp_clk rising edge
+// 4*16 ticks until we measure the time
+// - 8*16 ticks because we measure the time of the previous transfer
+#define DELAY_AIR2ARM_AS_TAG (2 + 3 + 8 + 8 + 7*16 + 8 + 4*16 - 8*16)
+
 typedef struct {
     enum {
         DEMOD_UNSYNCD,
@@ -119,6 +130,7 @@ extern int iso14443a_select_card(uint8_t *uid_ptr, iso14a_card_select_t *resp_da
 extern int iso14443a_fast_select_card(uint8_t *uid_ptr, uint8_t num_cascades);
 extern void iso14a_set_trigger(bool enable);
 
+extern int EmSendPrecompiledCmd(tag_response_info_t *response_info);
 extern int EmSendCmd14443aRaw(uint8_t *resp, uint16_t respLen);
 extern int EmSend4bit(uint8_t resp);
 extern int EmSendCmd(uint8_t *resp, uint16_t respLen);
@@ -128,14 +140,18 @@ extern int EmSendCmdPar(uint8_t *resp, uint16_t respLen, uint8_t *par);
 extern int EmSendCmdParEx(uint8_t *resp, uint16_t respLen, uint8_t *par, bool collision);
 extern int EmSendPrecompiledCmd(tag_response_info_t *response_info);
 
+extern void EmLogTraceReader(void);
+
+extern bool prepare_allocated_tag_modulation(tag_response_info_t *response_info, uint8_t **buffer, size_t *max_buffer_size);
+
 bool EmLogTrace(uint8_t *reader_data, uint16_t reader_len, uint32_t reader_StartTime, uint32_t reader_EndTime, uint8_t *reader_Parity,
                 uint8_t *tag_data, uint16_t tag_len, uint32_t tag_StartTime, uint32_t tag_EndTime, uint8_t *tag_Parity);
 
-//extern bool prepare_allocated_tag_modulation(tag_response_info_t *response_info, uint8_t **buffer, size_t *buffer_size);
-
 void ReaderMifare(bool first_try, uint8_t block, uint8_t keytype);
 void DetectNACKbug();
 
+extern void AppendCrc14443a(uint8_t *data, int len);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/armsrc/mifaresim.c b/armsrc/mifaresim.c
new file mode 100644
index 000000000..f5aec6f0e
--- /dev/null
+++ b/armsrc/mifaresim.c
@@ -0,0 +1,1149 @@
+//-----------------------------------------------------------------------------
+// Merlok - June 2011, 2012
+// Gerhard de Koning Gans - May 2008
+// Hagen Fritsch - June 2010
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// Mifare Classic Card Simulation
+//-----------------------------------------------------------------------------
+
+#include "iso14443a.h"
+#include "mifaresim.h"
+#include "iso14443crc.h"
+#include "crapto1/crapto1.h"
+#include "BigBuf.h"
+#include "string.h"
+#include "mifareutil.h"
+#include "fpgaloader.h"
+#include "proxmark3.h"
+#include "usb_cdc.h"
+#include "cmd.h"
+#include "protocols.h"
+#include "apps.h"
+
+static tUart Uart;
+
+uint8_t MifareCardType;
+
+static bool IsTrailerAccessAllowed(uint8_t blockNo, uint8_t keytype, uint8_t action) {
+    uint8_t sector_trailer[16];
+    emlGetMem(sector_trailer, blockNo, 1);
+    uint8_t AC = ((sector_trailer[7] >> 5) & 0x04)
+                 | ((sector_trailer[8] >> 2) & 0x02)
+                 | ((sector_trailer[8] >> 7) & 0x01);
+    switch (action) {
+        case AC_KEYA_READ: {
+            return false;
+            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("IsTrailerAccessAllowed: AC_KEYA_READ");
+            break;
+        }
+        case AC_KEYA_WRITE: {
+            return ((keytype == AUTHKEYA && (AC == 0x00 || AC == 0x01))
+                    || (keytype == AUTHKEYB && (AC == 0x04 || AC == 0x03)));
+            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("IsTrailerAccessAllowed: AC_KEYA_WRITE");
+            break;
+        }
+        case AC_KEYB_READ: {
+            return (keytype == AUTHKEYA && (AC == 0x00 || AC == 0x02 || AC == 0x01));
+            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("IsTrailerAccessAllowed: AC_KEYB_READ");
+            break;
+        }
+        case AC_KEYB_WRITE: {
+            return ((keytype == AUTHKEYA && (AC == 0x00 || AC == 0x04))
+                    || (keytype == AUTHKEYB && (AC == 0x04 || AC == 0x03)));
+            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("IsTrailerAccessAllowed: AC_KEYB_WRITE");
+            break;
+        }
+        case AC_AC_READ: {
+            return ((keytype == AUTHKEYA)
+                    || (keytype == AUTHKEYB && !(AC == 0x00 || AC == 0x02 || AC == 0x01)));
+            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("IsTrailerAccessAllowed: AC_AC_READ");
+            break;
+        }
+        case AC_AC_WRITE: {
+            return ((keytype == AUTHKEYA && (AC == 0x01))
+                    || (keytype == AUTHKEYB && (AC == 0x03 || AC == 0x05)));
+            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("IsTrailerAccessAllowed: AC_AC_WRITE");
+            break;
+        }
+        default:
+            return false;
+    }
+}
+
+
+static bool IsDataAccessAllowed(uint8_t blockNo, uint8_t keytype, uint8_t action) {
+
+    uint8_t sector_trailer[16];
+    emlGetMem(sector_trailer, SectorTrailer(blockNo), 1);
+
+    uint8_t sector_block;
+    if (blockNo < MIFARE_2K_MAXBLOCK) {
+        sector_block = blockNo & 0x03;
+    } else {
+        sector_block = (blockNo & 0x0f) / 5;
+    }
+
+    uint8_t AC;
+    switch (sector_block) {
+        case 0x00: {
+            AC = ((sector_trailer[7] >> 2) & 0x04)
+                 | ((sector_trailer[8] << 1) & 0x02)
+                 | ((sector_trailer[8] >> 4) & 0x01);
+            break;
+        }
+        case 0x01: {
+            AC = ((sector_trailer[7] >> 3) & 0x04)
+                 | ((sector_trailer[8] >> 0) & 0x02)
+                 | ((sector_trailer[8] >> 5) & 0x01);
+            break;
+        }
+        case 0x02: {
+            AC = ((sector_trailer[7] >> 4) & 0x04)
+                 | ((sector_trailer[8] >> 1) & 0x02)
+                 | ((sector_trailer[8] >> 6) & 0x01);
+            break;
+        }
+        default:
+            return false;
+    }
+
+    switch (action) {
+        case AC_DATA_READ: {
+            return ((keytype == AUTHKEYA && !(AC == 0x03 || AC == 0x05 || AC == 0x07))
+                    || (keytype == AUTHKEYB && !(AC == 0x07)));
+            if (MF_DBGLEVEL >= 2)	Dbprintf("AC_DATA_READ: OK");
+            break;
+        }
+        case AC_DATA_WRITE: {
+            return ((keytype == AUTHKEYA && (AC == 0x00))
+                    || (keytype == AUTHKEYB && (AC == 0x00 || AC == 0x04 || AC == 0x06 || AC == 0x03)));
+            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("AC_DATA_WRITE: OK");
+            break;
+        }
+        case AC_DATA_INC: {
+            return ((keytype == AUTHKEYA && (AC == 0x00))
+                    || (keytype == AUTHKEYB && (AC == 0x00 || AC == 0x06)));
+            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("AC_DATA_WRITE: OK");
+            break;
+        }
+        case AC_DATA_DEC_TRANS_REST: {
+            return ((keytype == AUTHKEYA && (AC == 0x00 || AC == 0x06 || AC == 0x01))
+                    || (keytype == AUTHKEYB && (AC == 0x00 || AC == 0x06 || AC == 0x01)));
+            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("AC_DATA_DEC_TRANS_REST: OK");
+            break;
+        }
+    }
+
+    return false;
+}
+
+static bool IsAccessAllowed(uint8_t blockNo, uint8_t keytype, uint8_t action) {
+    if (IsSectorTrailer(blockNo)) {
+        return IsTrailerAccessAllowed(blockNo, keytype, action);
+    } else {
+        return IsDataAccessAllowed(blockNo, keytype, action);
+    }
+}
+
+static void MifareSimInit(uint16_t flags, uint8_t *datain, tag_response_info_t **responses, uint32_t *cuid, uint8_t *uid_len) {
+
+    // SPEC: https://www.nxp.com/docs/en/application-note/AN10833.pdf
+    // ATQA
+
+    static uint8_t rATQA_Mini_4B[]  = {0x44, 0x00};       	// indicate Mifare classic Mini 4Byte UID
+    //static uint8_t rATQA_Mini_7B[]  = {0x44, 0x00};       	// indicate Mifare classic Mini 7Byte UID
+    //static uint8_t rATQA_Mini_10B[] = {0x44, 0x00};       	// indicate Mifare classic Mini 10Byte UID
+
+    static uint8_t rATQA_1k_4B[]  = {0x04, 0x00}; 				// indicate Mifare classic 1k 4Byte UID
+    static uint8_t rATQA_1k_7B[]  = {0x44, 0x00}; 		 		// indicate Mifare classic 1k 7Byte UID
+    static uint8_t rATQA_1k_10B[] = {0x42, 0x00};				  // indicate Mifare classic 4k 10Byte UID
+
+    static uint8_t rATQA_2k_4B[]  = {0x04, 0x00}; 					// indicate Mifare classic 2k 4Byte UID
+    static uint8_t rATQA_2k_7B[]  = {0x44, 0x00}; 					// indicate Mifare classic 2k 7Byte UID
+    static uint8_t rATQA_2k_10B[] = {0x42, 0x00};				  // indicate Mifare classic 4k 10Byte UID
+
+    static uint8_t rATQA_4k_4B[]  = {0x02, 0x00};				  // indicate Mifare classic 4k 4Byte UID
+    static uint8_t rATQA_4k_7B[]  = {0x42, 0x00};				  // indicate Mifare classic 4k 7Byte UID
+    static uint8_t rATQA_4k_10B[] = {0x42, 0x00};				  // indicate Mifare classic 4k 10Byte UID
+
+    static uint8_t rATQA[] = {0x00, 0x00};
+
+    // SAK + CRC
+    static uint8_t rSAK_mini[] = {0x09, 0x3f, 0xcc};				// mifare Mini
+    static uint8_t rSAK_1[]    = {0x08, 0xb6, 0xdd};				// mifare 1k
+    static uint8_t rSAK_2[]    = {0x08, 0xb6, 0xdd};				// mifare 2k
+    static uint8_t rSAK_4[]    = {0x18, 0x37, 0xcd};				// mifare 4k
+
+    static uint8_t rUIDBCC1[]  = {0x00, 0x00, 0x00, 0x00, 0x00};	// UID 1st cascade level
+    static uint8_t rUIDBCC2[]  = {0x00, 0x00, 0x00, 0x00, 0x00};	// UID 2nd cascade level
+    static uint8_t rUIDBCC3[]  = {0x00, 0x00, 0x00, 0x00, 0x00};	// UID 3nd cascade level
+
+    static uint8_t rSAK1[]     = {0x04, 0xda, 0x17}; 			// Acknowledge but indicate UID is not finished. Used for any MIFARE Classic CL1 with double UID size
+
+    *uid_len = 0;
+
+    // -- Determine the UID
+    // Can be set from emulator memory or incoming data
+    // Length: 4,7,or 10 bytes
+    if ((flags & FLAG_UID_IN_EMUL) == FLAG_UID_IN_EMUL) {
+        emlGetMemBt(datain, 0, 10);  // load 10bytes from EMUL to the datain pointer. to be used below.
+    }
+
+    if ((flags & FLAG_4B_UID_IN_DATA) == FLAG_4B_UID_IN_DATA) { 	// get UID from datain
+        memcpy(rUIDBCC1, datain, 4);
+        *uid_len = 4;
+        if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("MifareSimInit - FLAG_4B_UID_IN_DATA => Get UID from datain: %02X - Flag: %02X - UIDBCC1: %02X", FLAG_4B_UID_IN_DATA, flags, rUIDBCC1);
+    } else if ((flags & FLAG_7B_UID_IN_DATA) == FLAG_7B_UID_IN_DATA) {
+        memcpy(&rUIDBCC1[1], datain, 3);
+        memcpy(rUIDBCC2, datain + 3, 4);
+        *uid_len = 7;
+        if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("MifareSimInit - FLAG_7B_UID_IN_DATA => Get UID from datain: %02X - Flag: %02X - UIDBCC1: %02X", FLAG_7B_UID_IN_DATA, flags, rUIDBCC1);
+    } else if ((flags & FLAG_10B_UID_IN_DATA) == FLAG_10B_UID_IN_DATA) {
+        memcpy(&rUIDBCC1[1], datain,   3);
+        memcpy(&rUIDBCC2[1], datain + 3, 3);
+        memcpy(rUIDBCC3,    datain + 6, 4);
+        *uid_len = 10;
+    }
+
+    switch (*uid_len) {
+
+        // UID 4B
+        case 4:
+            switch (MifareCardType) {
+                case 0: // Mifare Mini
+                    memcpy(rATQA, rATQA_Mini_4B, sizeof rATQA_Mini_4B);
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("=> Using rATQA_Mini_4B");
+                    break;
+                case 1: // Mifare 1K
+                    memcpy(rATQA, rATQA_1k_4B, sizeof rATQA_1k_4B);
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("=> Using rATQA_1k_4B");
+                    break;
+                case 2: // Mifare 2L
+                    memcpy(rATQA, rATQA_2k_4B, sizeof rATQA_2k_4B);
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("=> Using rATQA_2k_4B");
+                    break;
+                case 4: // Mifare 4K
+                    memcpy(rATQA, rATQA_4k_4B, sizeof rATQA_4k_4B);
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("=> Using rATQA_4k_4B");
+                    break;
+            }
+
+            // save CUID
+            *cuid = bytes_to_num(rUIDBCC1, 4);
+            // BCC
+            rUIDBCC1[4] = rUIDBCC1[0] ^ rUIDBCC1[1] ^ rUIDBCC1[2] ^ rUIDBCC1[3];
+            if (MF_DBGLEVEL >= 1)	{
+                Dbprintf("4B UID: %02x%02x%02x%02x", rUIDBCC1[0], rUIDBCC1[1], rUIDBCC1[2], rUIDBCC1[3]);
+            }
+            break;
+
+        // UID 7B
+        case 7:
+
+            switch (MifareCardType) {
+                case 1:
+                    memcpy(rATQA, rATQA_1k_7B, sizeof rATQA_1k_7B);
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("=> Using rATQA_1k_7B");
+                    break;
+                case 2:
+                    memcpy(rATQA, rATQA_2k_7B, sizeof rATQA_2k_7B);
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("=> Using rATQA_2k_7B");
+                    break;
+                case 4:
+                    memcpy(rATQA, rATQA_4k_7B, sizeof rATQA_4k_7B);
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("=> Using rATQA_4k_4B");
+                    break;
+            }
+
+            // save CUID
+            *cuid = bytes_to_num(rUIDBCC2, 4);
+            // CascadeTag, CT
+            rUIDBCC1[0] = MIFARE_SELECT_CT;
+            // BCC
+            rUIDBCC1[4] = rUIDBCC1[0] ^ rUIDBCC1[1] ^ rUIDBCC1[2] ^ rUIDBCC1[3];
+            rUIDBCC2[4] = rUIDBCC2[0] ^ rUIDBCC2[1] ^ rUIDBCC2[2] ^ rUIDBCC2[3];
+            if (MF_DBGLEVEL >= 1)	{
+                Dbprintf("7B UID: %02x %02x %02x %02x %02x %02x %02x",
+                         rUIDBCC1[1], rUIDBCC1[2], rUIDBCC1[3], rUIDBCC2[0], rUIDBCC2[1], rUIDBCC2[2], rUIDBCC2[3]);
+            }
+            break;
+
+        // UID 10B
+        case 10:
+
+            switch (MifareCardType) {
+                case 1:
+                    memcpy(rATQA, rATQA_1k_10B, sizeof rATQA_1k_10B);
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("=> Using rATQA_1k_10B");
+                    break;
+                case 2:
+                    memcpy(rATQA, rATQA_2k_10B, sizeof rATQA_2k_10B);
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("=> Using rATQA_2k_10B");
+                    break;
+                case 4:
+                    memcpy(rATQA, rATQA_4k_10B, sizeof rATQA_4k_10B);
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("=> Using rATQA_4k_10B");
+                    break;
+            }
+
+            // save CUID
+            *cuid = bytes_to_num(rUIDBCC3, 4);
+            // CascadeTag, CT
+            rUIDBCC1[0] = MIFARE_SELECT_CT;
+            rUIDBCC2[0] = MIFARE_SELECT_CT;
+            // BCC
+            rUIDBCC1[4] = rUIDBCC1[0] ^ rUIDBCC1[1] ^ rUIDBCC1[2] ^ rUIDBCC1[3];
+            rUIDBCC2[4] = rUIDBCC2[0] ^ rUIDBCC2[1] ^ rUIDBCC2[2] ^ rUIDBCC2[3];
+            rUIDBCC3[4] = rUIDBCC3[0] ^ rUIDBCC3[1] ^ rUIDBCC3[2] ^ rUIDBCC3[3];
+
+            if (MF_DBGLEVEL >= 1)	{
+                Dbprintf("10B UID: %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x",
+                         rUIDBCC1[1], rUIDBCC1[2], rUIDBCC1[3],
+                         rUIDBCC2[1], rUIDBCC2[2], rUIDBCC2[3],
+                         rUIDBCC3[0], rUIDBCC3[1], rUIDBCC3[2], rUIDBCC3[3]
+                        );
+            }
+            break;
+        default:
+            break;
+    }
+
+    static tag_response_info_t responses_init[TAG_RESPONSE_COUNT] = {
+        { .response = rATQA,     .response_n = sizeof(rATQA)     },		  // Answer to request - respond with card type
+        { .response = rUIDBCC1,  .response_n = sizeof(rUIDBCC1)  },	  	// Anticollision cascade1 - respond with first part of uid
+        { .response = rUIDBCC2,  .response_n = sizeof(rUIDBCC2)  },		  // Anticollision cascade2 - respond with 2nd part of uid
+        { .response = rUIDBCC3,  .response_n = sizeof(rUIDBCC3)  },		  // Anticollision cascade3 - respond with 3th part of uid
+        { .response = rSAK_mini, .response_n = sizeof(rSAK_mini) },     //
+        { .response = rSAK_1,    .response_n = sizeof(rSAK_1)    },	    //
+        { .response = rSAK_2,    .response_n = sizeof(rSAK_2)    },	    //
+        { .response = rSAK_4,    .response_n = sizeof(rSAK_4)    },	    //
+        { .response = rSAK1,     .response_n = sizeof(rSAK1)     }		  // Acknowledge select - New another cascades
+    };
+
+    // Prepare ("precompile") the responses of the anticollision phase. There will be not enough time to do this at the moment the reader sends its REQA or SELECT
+    // There are 7 predefined responses with a total of 18 bytes data to transmit. Coded responses need one byte per bit to transfer (data, parity, start, stop, correction)
+    // 18 * 8 data bits, 18 * 1 parity bits, 5 start bits, 5 stop bits, 5 correction bits  ->   need 177 bytes buffer
+
+    uint8_t *free_buffer_pointer = BigBuf_malloc(ALLOCATED_TAG_MODULATION_BUFFER_SIZE);
+    size_t free_buffer_size = ALLOCATED_TAG_MODULATION_BUFFER_SIZE;
+
+    for (size_t i = 0; i < TAG_RESPONSE_COUNT; i++) {
+        prepare_allocated_tag_modulation(&responses_init[i], &free_buffer_pointer, &free_buffer_size);
+    }
+
+    *responses = responses_init;
+
+    // indices into responses array:
+#define ATQA     0
+#define UIDBCC1  1
+#define UIDBCC2  2
+#define UIDBCC3  3
+#define SAK_MINI 4
+#define SAK_1    5
+#define SAK_2    6
+#define SAK_4    7
+#define SAK1     8
+
+}
+
+static bool HasValidCRC(uint8_t *receivedCmd, uint16_t receivedCmd_len) {
+    uint8_t CRC_byte_1, CRC_byte_2;
+    compute_crc(CRC_14443_A, receivedCmd, receivedCmd_len - 2, &CRC_byte_1, &CRC_byte_2);
+    return (receivedCmd[receivedCmd_len - 2] == CRC_byte_1 && receivedCmd[receivedCmd_len - 1] == CRC_byte_2);
+}
+
+
+/**
+*MIFARE 1K simulate.
+*
+*@param flags :
+*	FLAG_INTERACTIVE - In interactive mode, we are expected to finish the operation with an ACK
+* FLAG_4B_UID_IN_DATA - means that there is a 4-byte UID in the data-section, we're expected to use that
+* FLAG_7B_UID_IN_DATA - means that there is a 7-byte UID in the data-section, we're expected to use that
+* FLAG_10B_UID_IN_DATA	- use 10-byte UID in the data-section not finished
+*	FLAG_NR_AR_ATTACK  - means we should collect NR_AR responses for bruteforcing later
+* FLAG_RANDOM_NONCE - means we should generate some pseudo-random nonce data (only allows moebius attack)
+*@param exitAfterNReads, exit simulation after n blocks have been read, 0 is infinite ...
+* (unless reader attack mode enabled then it runs util it gets enough nonces to recover all keys attmpted)
+*/
+void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *datain) {
+    tag_response_info_t *responses;
+    uint8_t	cardSTATE = MFEMUL_NOFIELD;
+    uint8_t uid_len = 0; // 4,7, 10
+    uint32_t cuid = 0;
+
+    int vHf = 0;	// in mV
+
+    uint32_t selTimer = 0;
+    uint32_t authTimer = 0;
+
+    uint8_t blockNo;
+
+    uint8_t cardWRBL = 0;
+    uint8_t cardAUTHSC = 0;
+    uint8_t cardAUTHKEY = AUTHKEYNONE;  // no authentication
+    uint32_t cardRr = 0;
+    uint32_t ans = 0;
+
+    uint32_t cardINTREG = 0;
+    uint8_t cardINTBLOCK = 0;
+    struct Crypto1State mpcs = {0, 0};
+    struct Crypto1State *pcs;
+    pcs = &mpcs;
+
+    uint32_t numReads = 0;	//Counts numer of times reader reads a block
+    uint8_t receivedCmd[MAX_MIFARE_FRAME_SIZE] = {0x00};
+    uint8_t receivedCmd_dec[MAX_MIFARE_FRAME_SIZE] = {0x00};
+    uint8_t receivedCmd_par[MAX_MIFARE_PARITY_SIZE] = {0x00};
+    uint16_t receivedCmd_len;
+
+    uint8_t response[MAX_MIFARE_FRAME_SIZE] = {0x00};
+    uint8_t response_par[MAX_MIFARE_PARITY_SIZE] = {0x00};
+
+    uint8_t rAUTH_NT[] = {0x01, 0x02, 0x03, 0x04};
+    uint8_t rAUTH_AT[] = {0x00, 0x00, 0x00, 0x00};
+
+    //Here, we collect UID,sector,keytype,NT,AR,NR,NT2,AR2,NR2
+    // This will be used in the reader-only attack.
+
+    //allow collecting up to 7 sets of nonces to allow recovery of up to 7 keys
+#define ATTACK_KEY_COUNT 7 // keep same as define in cmdhfmf.c -> readerAttack() (Cannot be more than 7)
+    nonces_t ar_nr_resp[ATTACK_KEY_COUNT * 2]; //*2 for 2 separate attack types (nml, moebius) 36 * 7 * 2 bytes = 504 bytes
+    memset(ar_nr_resp, 0x00, sizeof(ar_nr_resp));
+
+    uint8_t ar_nr_collected[ATTACK_KEY_COUNT * 2]; //*2 for 2nd attack type (moebius)
+    memset(ar_nr_collected, 0x00, sizeof(ar_nr_collected));
+    uint8_t	nonce1_count = 0;
+    uint8_t	nonce2_count = 0;
+    uint8_t	moebius_n_count = 0;
+    bool gettingMoebius = false;
+    uint8_t	mM = 0; //moebius_modifier for collection storage
+
+    // Authenticate response - nonce
+    uint32_t nonce;
+    if ((flags & FLAG_RANDOM_NONCE) == FLAG_RANDOM_NONCE) {
+        nonce = prand();
+    } else {
+        nonce = bytes_to_num(rAUTH_NT, 4);
+    }
+
+
+    if ((flags & FLAG_MF_MINI) == FLAG_MF_MINI) {
+        MifareCardType = 0;
+        Dbprintf("Mifare Mini");
+    }
+    if ((flags & FLAG_MF_1K) == FLAG_MF_1K) {
+        MifareCardType = 1;
+        Dbprintf("Mifare 1K");
+    }
+    if ((flags & FLAG_MF_2K) == FLAG_MF_2K) {
+        MifareCardType = 2;
+        Dbprintf("Mifare 2K");
+    }
+    if ((flags & FLAG_MF_4K) == FLAG_MF_4K) {
+        MifareCardType = 4;
+        Dbprintf("Mifare 4K");
+    }
+
+    MifareSimInit(flags, datain, &responses, &cuid, &uid_len);
+
+    // We need to listen to the high-frequency, peak-detected path.
+    iso14443a_setup(FPGA_HF_ISO14443A_TAGSIM_LISTEN);
+
+    // free eventually allocated BigBuf memory but keep Emulator Memory
+    BigBuf_free_keep_EM();
+    // clear trace
+    clear_trace();
+    set_tracing(true);
+    LED_D_ON();
+    ResetSspClk();
+
+    bool finished = false;
+    bool button_pushed = BUTTON_PRESS();
+
+    while (!button_pushed && !finished && !usb_poll_validate_length()) {
+        WDT_HIT();
+
+        // find reader field
+        if (cardSTATE == MFEMUL_NOFIELD) {
+            vHf = (MAX_ADC_HF_VOLTAGE_RDV40 * AvgAdc(ADC_CHAN_HF)) >> 10;
+            if (vHf > MF_MINFIELDV) {
+                cardSTATE_TO_IDLE();
+                LED_A_ON();
+            }
+            button_pushed = BUTTON_PRESS();
+            continue;
+        }
+  
+        //Now, get data
+        int res = EmGetCmd(receivedCmd, &receivedCmd_len, receivedCmd_par);
+
+        if (res == 2) { //Field is off!
+            LEDsoff();
+            cardSTATE = MFEMUL_NOFIELD;
+            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("cardSTATE = MFEMUL_NOFIELD");
+            continue;
+        } else if (res == 1) { // button pressed
+            button_pushed = true;
+            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("Button pressed");
+            break;
+        }
+
+        // WUPA in HALTED state or REQA or WUPA in any other state
+        if (receivedCmd_len == 1 && ((receivedCmd[0] == ISO14443A_CMD_REQA && cardSTATE != MFEMUL_HALTED) || receivedCmd[0] == ISO14443A_CMD_WUPA)) {
+            selTimer = GetTickCount();
+            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("EmSendPrecompiledCmd(&responses[ATQA]);");
+            EmSendPrecompiledCmd(&responses[ATQA]);
+
+            // init crypto block
+            crypto1_destroy(pcs);
+            cardAUTHKEY = AUTHKEYNONE;
+            //nonce = prng_successor(selTimer, 32) // RRG Repo, same as prand() ???
+            if (flags & FLAG_RANDOM_NONCE) {
+                nonce = prand();
+            }
+            LED_B_OFF();
+            LED_C_OFF();
+            cardSTATE = MFEMUL_SELECT1;
+            continue;
+        }
+
+        switch (cardSTATE) {
+            case MFEMUL_NOFIELD:
+                if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("MFEMUL_NOFIELD");
+            case MFEMUL_HALTED:
+                if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("MFEMUL_HALTED");
+            case MFEMUL_IDLE: {
+                // LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);   Need to be convert ?
+                if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("MFEMUL_IDLE");
+                break;
+            }
+
+
+            // The anti-collision sequence, which is a mandatory part of the card activation sequence.
+            // It auto with 4-byte UID (= Single Size UID),
+            // 7 -byte UID (= Double Size UID) or 10-byte UID (= Triple Size UID).
+
+            // Cascade Level 1
+            //
+            // In the Cascade Level 1, the card send the anti-collision command CL1 (0x93) and the PICC returns
+            // either the 4-byte UID (UID0...UID4) and one-byte BCC
+            // or a Cascade Tag (CT) followed by the first 3 byte of the UID (UID0...UID2) and onebyte BCC.
+            //
+            // The CT (0x88) indicates that the UID is not yet complete, and another Cascade Level is needed
+            //
+            // The UID0 byte of a 4-byte UID must not be 0x88.
+            // The CL1 then must be selected, using the Select command CL1 (0x93). The PICC returns its SAK CL1, which indicates
+            // whether the UID is complete or not, and (if so),
+            // the type of card and whether the card supports T=CL.
+
+            case MFEMUL_SELECT1: {
+                // select all - 0x93 0x20 (Anti Collision CL1)
+                if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("cardSTATE = MFEMUL_SELECT1 - receivedCmd_len: %d - receivedCmd[0]: %02x - receivedCmd[1]: %02x", receivedCmd_len, receivedCmd[0], receivedCmd[1]);
+                if (receivedCmd_len == 2 && (receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT && receivedCmd[1] == 0x20)) {
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("SELECT ALL CL1 received - EmSendPrecompiledCmd(%02x)", &responses[UIDBCC1]);
+                    EmSendPrecompiledCmd(&responses[UIDBCC1]);
+                    break;
+                }
+
+                // select card - 0x93 0x70 (Select CL1)
+                if (receivedCmd_len == 9 &&
+                        (receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT &&
+                         receivedCmd[1] == 0x70 &&
+                         memcmp(&receivedCmd[2], responses[UIDBCC1].response, 4) == 0)) {
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("SELECT CL1 %02x%02x%02x%02x received", receivedCmd[2], receivedCmd[3], receivedCmd[4], receivedCmd[5]);
+                    switch (uid_len) {
+                        case 4:
+                            switch (MifareCardType) {
+                                case 0:
+                                    EmSendPrecompiledCmd(&responses[SAK_MINI]);
+                                    break;
+                                case 1:
+                                    EmSendPrecompiledCmd(&responses[SAK_1]);
+                                    break;
+                                case 2:
+                                    EmSendPrecompiledCmd(&responses[SAK_2]);
+                                    break;
+                                case 4:
+                                    EmSendPrecompiledCmd(&responses[SAK_4]);
+                                    break;
+                            }
+
+                            LED_B_ON();
+                            cardSTATE = MFEMUL_WORK;
+                            if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("cardSTATE = MFEMUL_WORK");
+                            continue;
+                        case 7:
+                            // SAK => Need another select round
+                            EmSendPrecompiledCmd(&responses[SAK1]);
+                            cardSTATE	= MFEMUL_SELECT2;
+                            if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("cardSTATE = MFEMUL_SELECT2");
+                            continue;
+                        case 10:
+                            // SAK => Need another select round
+                            EmSendPrecompiledCmd(&responses[SAK1]);
+                            cardSTATE	= MFEMUL_SELECT2;
+                            if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("cardSTATE = MFEMUL_SELECT2");
+                            continue;
+                        default:
+                            break;
+                    }
+                }
+
+                // IDLE
+                cardSTATE_TO_IDLE();
+                break;
+            }
+
+
+            // Cascade Level 2
+            //
+            // If the UID is not yet complete, the PCD continues with an anti-collision CL2 command (0x95),
+            // and the PICC returns
+            // • either the last 4 bytes of the Double Size UID (UID3...UID6) and one-byte BCC,
+            // • or a Cascade Tag (CT) followed by the next 3 bytes of the Triple Size UID (UID3...UID5) and one-byte BCC.
+            // The CT (0x88) indicates that the UID is not yet complete, and another Cascade Level  has to follow.
+            //
+            // The UID3 byte of a 7 byte or 10-byte UID must not be 0x88
+            // The CL2 then must be selected, using the Select command CL2 (0x95).
+            // The PICC returns its SAK CL2, which indicates
+            // whether the UID is complete or not, and (if so),
+            // the type of card and whether the card supports T=CL.
+
+            // select all cl2 - 0x95 0x20
+
+            case MFEMUL_SELECT2: {
+                if (receivedCmd_len == 2 &&
+                        (receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2 && receivedCmd[1] == 0x20)) {
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("SELECT ALL CL2 received");
+                    EmSendPrecompiledCmd(&responses[UIDBCC2]);
+                    continue;
+                }
+
+                // select cl2 card - 0x95 0x70 xxxxxxxxxxxx
+                if (receivedCmd_len == 9 &&
+                        (receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2 &&
+                         receivedCmd[1] == 0x70 &&
+                         memcmp(&receivedCmd[2], responses[UIDBCC2].response, 4) == 0)) {
+
+                    switch (uid_len) {
+                        case 7:
+                            if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("SELECT CL2 %02x%02x%02x%02x received", receivedCmd[2], receivedCmd[3], receivedCmd[4], receivedCmd[5]);
+
+                            switch (MifareCardType) {
+                                case 0:
+                                    EmSendPrecompiledCmd(&responses[SAK_MINI]);
+                                    break;
+                                case 1:
+                                    EmSendPrecompiledCmd(&responses[SAK_1]);
+                                    break;
+                                case 2:
+                                    EmSendPrecompiledCmd(&responses[SAK_2]);
+                                    break;
+                                case 4:
+                                    EmSendPrecompiledCmd(&responses[SAK_4]);
+                                    break;
+                            }
+                            cardSTATE = MFEMUL_WORK;
+                            LED_B_ON();
+                            continue;
+                        case 10:
+                            // SAK => Need another select round
+                            EmSendPrecompiledCmd(&responses[SAK1]);
+                            cardSTATE = MFEMUL_SELECT3;
+                            continue;
+                        default:
+                            break;
+                    }
+                }
+
+                cardSTATE_TO_IDLE();
+                break;
+            }
+
+
+            // Cascade Level 3
+            // Select command CL3 (0x97)
+            //
+            // If the UID is not yet complete, the PCD continues with an anti-collision CL3 command (0x97)
+            // and the PICC returns the last 4 bytes of the Triple Size UID (UID6...UID9) and one-byte BCC.
+            // The PICC returns its SAK CL3, which indicates the type of card and whether the card supports T=CL
+
+            case MFEMUL_SELECT3: {
+                if (!uid_len) {
+                    LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                    break;
+                }
+                if (receivedCmd_len == 2 && (receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_3 && receivedCmd[1] == 0x20)) {
+                    EmSendPrecompiledCmd(&responses[UIDBCC3]);
+                    break;
+                }
+                if (receivedCmd_len == 9 &&
+                        (receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_3 &&
+                         receivedCmd[1] == 0x70 &&
+                         memcmp(&receivedCmd[2], responses[UIDBCC3].response, 4) == 0)) {
+
+                    switch (MifareCardType) {
+                        case 0:
+                            EmSendPrecompiledCmd(&responses[SAK_MINI]);
+                            break;
+                        case 1:
+                            EmSendPrecompiledCmd(&responses[SAK_1]);
+                            break;
+                        case 2:
+                            EmSendPrecompiledCmd(&responses[SAK_2]);
+                            break;
+                        case 4:
+                            EmSendPrecompiledCmd(&responses[SAK_4]);
+                            break;
+                    }
+
+                    cardSTATE = MFEMUL_WORK;
+                    LED_B_ON();
+                    if (MF_DBGLEVEL >= 4)	Dbprintf("--> WORK. anticol3 time: %d", GetTickCount() - selTimer);
+                    break;
+                }
+                cardSTATE_TO_IDLE();
+                break;
+            }
+
+
+            case MFEMUL_WORK: {
+                if (receivedCmd_len == 0) {
+                    LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("All commands must have exactly 4 bytes: receivedCmd_len=%d", receivedCmd_len);
+                    break;
+                }
+                bool encrypted_data = (cardAUTHKEY != AUTHKEYNONE) ;
+                if (encrypted_data) {
+                    // decrypt seqence
+                    mf_crypto1_decryptEx(pcs, receivedCmd, receivedCmd_len, receivedCmd_dec);
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("decrypt seqence");
+                } else {
+                    memcpy(receivedCmd_dec, receivedCmd, receivedCmd_len);
+                }
+                if (!HasValidCRC(receivedCmd_dec, receivedCmd_len)) { // all commands must have a valid CRC
+                    EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("All commands must have a valid CRC %d", receivedCmd_dec);
+                    break;
+                }
+
+                if (receivedCmd_len == 4 && (receivedCmd_dec[0] == MIFARE_AUTH_KEYA || receivedCmd_dec[0] == MIFARE_AUTH_KEYB)) {
+                    // if authenticating to a block that shouldn't exist - as long as we are not doing the reader attack
+                    if (receivedCmd_dec[1] > MIFARE_4K_MAXBLOCK && !((flags & FLAG_NR_AR_ATTACK) == FLAG_NR_AR_ATTACK)) {
+                        EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
+                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Reader tried to operate (0x%02x) on out of range block: %d (0x%02x), nacking", receivedCmd_dec[0], receivedCmd_dec[1], receivedCmd_dec[1]);
+                        break;
+                    }
+                    cardAUTHSC = receivedCmd_dec[1] / 4;  // received block num, Need to check if ok for 4k card ???
+                    cardAUTHKEY = receivedCmd_dec[0] & 0x01;
+                    crypto1_destroy(pcs);
+                    crypto1_create(pcs, emlGetKey(cardAUTHSC, cardAUTHKEY));
+
+                    // first authentication
+                    if (!encrypted_data) {
+                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Reader authenticating for block %d (0x%02x) with key %d", receivedCmd_dec[1], receivedCmd_dec[1], cardAUTHKEY);
+                        crypto1_word(pcs, cuid ^ nonce, 0); //Update crypto state
+                        num_to_bytes(nonce, 4, rAUTH_AT);   // Send nonce
+                    } else { // nested authentication
+                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Reader doing nested authentication for block %d (0x%02x) with key %d", receivedCmd_dec[1], receivedCmd_dec[1], cardAUTHKEY);
+                        ans = nonce ^ crypto1_word(pcs, cuid ^ nonce, 0);
+                        num_to_bytes(ans, 4, rAUTH_AT);
+                    }
+                    EmSendCmd(rAUTH_AT, sizeof(rAUTH_AT));
+                    cardSTATE = MFEMUL_AUTH1;
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) { 
+                      Dbprintf("cardSTATE = MFEMUL_AUTH1");
+                    }
+                    break;
+                }
+                if (!encrypted_data) { // all other commands must be encrypted (authenticated)
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Commands must be encrypted (authenticated)");
+                    break;
+                }
+                
+                // if Cmd is Read, Write, Inc, Dec, Restore, Transfert
+                if (receivedCmd_dec[0] == ISO14443A_CMD_READBLOCK
+                        || receivedCmd_dec[0] == ISO14443A_CMD_WRITEBLOCK
+                        || receivedCmd_dec[0] == MIFARE_CMD_INC
+                        || receivedCmd_dec[0] == MIFARE_CMD_DEC
+                        || receivedCmd_dec[0] == MIFARE_CMD_RESTORE
+                        || receivedCmd_dec[0] == MIFARE_CMD_TRANSFER) {
+                    // Check if Block num is not too far
+                    if (receivedCmd_dec[1] > MIFARE_4K_MAXBLOCK) {
+                        EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
+                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Reader tried to operate (0x%02x) on out of range block: %d (0x%02x), nacking", receivedCmd_dec[0], receivedCmd_dec[1], receivedCmd_dec[1]);
+                        break;
+                    }
+                    if (receivedCmd_dec[1] / 4 != cardAUTHSC) {
+                        EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
+                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Reader tried to operate (0x%02x) on block (0x%02x) not authenticated for (0x%02x), nacking", receivedCmd_dec[0], receivedCmd_dec[1], cardAUTHSC);
+                        break;
+                    }
+                }
+                
+                // CMD READ block
+                if (receivedCmd_dec[0] == ISO14443A_CMD_READBLOCK) {
+                    blockNo = receivedCmd_dec[1];
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Reader reading block %d (0x%02x)", blockNo, blockNo);
+                    emlGetMem(response, blockNo, 1);
+                    if (MF_DBGLEVEL >= 2) Dbprintf("Data Block: %02x%02x%02x%02x%02x%02x%02x%02x%02x", response);
+                    
+                    
+                    if (IsSectorTrailer(blockNo)) {
+                        memset(response, 0x00, 6); 	// keyA can never be read
+                        if (MF_DBGLEVEL >= 2) Dbprintf("[IsSectorTrailer] keyA can never be read - block %d (0x%02x)", blockNo, blockNo);
+                        if (!IsAccessAllowed(blockNo, cardAUTHKEY, AC_KEYB_READ)) {
+                            memset(response + 10, 0x00, 6); 	// keyB cannot be read
+                              if (MF_DBGLEVEL >= 2) Dbprintf("[IsSectorTrailer] keyB cannot be read - block %d (0x%02x)", blockNo, blockNo);
+                        }
+                        if (!IsAccessAllowed(blockNo, cardAUTHKEY, AC_AC_READ)) {
+                            memset(response + 6, 0x00, 4); 	// AC bits cannot be read
+                            if (MF_DBGLEVEL >= 2) Dbprintf("[IsAccessAllowed] AC bits cannot be read - block %d (0x%02x)", blockNo, blockNo);
+                        }
+                    } else {
+                        if (!IsAccessAllowed(blockNo, cardAUTHKEY, AC_DATA_READ)) {
+                            memset(response, 0x00, 16);		// datablock cannot be read
+                            if (MF_DBGLEVEL >= 2) Dbprintf("[IsAccessAllowed] Data block %d (0x%02x) cannot be read", blockNo, blockNo);
+                        }
+                    }
+                    AppendCrc14443a(response, 16);
+                    mf_crypto1_encrypt(pcs, response, 18, response_par);
+                    EmSendCmdPar(response, 18, response_par);
+                    numReads++;
+                    if (exitAfterNReads > 0 && numReads == exitAfterNReads) {
+                        Dbprintf("%d reads done, exiting", numReads);
+                        finished = true;
+                    }
+                    
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[ISO14443A_CMD_READBLOCK] Finish");
+                    break;
+                } 
+                
+                // CMD WRITEBLOCK
+                if (receivedCmd_dec[0] == ISO14443A_CMD_WRITEBLOCK) {
+                    blockNo = receivedCmd_dec[1];
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("RECV 0xA0 write block %d (%02x)", blockNo, blockNo);
+                    EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_ACK));
+                    cardWRBL = blockNo;
+                    cardSTATE = MFEMUL_WRITEBL2;
+                    break;
+                }
+
+                // CMD INC/DEC/RES
+                if (receivedCmd_dec[0] == MIFARE_CMD_INC || receivedCmd_dec[0] == MIFARE_CMD_DEC || receivedCmd_dec[0] == MIFARE_CMD_RESTORE) {
+                    blockNo = receivedCmd_dec[1];
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("RECV 0x%02x inc(0xC1)/dec(0xC0)/restore(0xC2) block %d (%02x)", receivedCmd_dec[0], blockNo, blockNo);
+                    if (emlCheckValBl(blockNo)) {
+                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Reader tried to operate on block, but emlCheckValBl failed, nacking");
+                        EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
+                        break;
+                    }
+                    EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_ACK));
+                    cardWRBL = blockNo;
+
+                    // INC
+                    if (receivedCmd_dec[0] == MIFARE_CMD_INC) {
+                        cardSTATE = MFEMUL_INTREG_INC;
+                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("cardSTATE = MFEMUL_INTREG_INC");
+                    }
+
+                    // DEC
+                    if (receivedCmd_dec[0] == MIFARE_CMD_DEC) {
+                        cardSTATE = MFEMUL_INTREG_DEC;
+                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("cardSTATE = MFEMUL_INTREG_DEC");
+                    }
+
+                    // REST
+                    if (receivedCmd_dec[0] == MIFARE_CMD_RESTORE) {
+                        cardSTATE = MFEMUL_INTREG_REST;
+                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("cardSTATE = MFEMUL_INTREG_REST");
+                        break;
+                    }
+                }
+                
+                // TRANSFER
+                if (receivedCmd_dec[0] == MIFARE_CMD_TRANSFER) {
+                    blockNo = receivedCmd_dec[1];
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("RECV 0x%02x transfer block %d (%02x)", receivedCmd_dec[0], blockNo, blockNo);
+                    if (emlSetValBl(cardINTREG, cardINTBLOCK, receivedCmd_dec[1]))
+                        EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
+                    else
+                        EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_ACK));
+                    break;
+                }
+
+                // HALT
+                if (receivedCmd_dec[0] == ISO14443A_CMD_HALT && receivedCmd[1] == 0x00) {
+                    LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                    LED_B_OFF();
+                    LED_C_OFF();
+                    cardSTATE = MFEMUL_HALTED;
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("cardSTATE = MFEMUL_HALTED;");
+                    break;
+                }
+
+                // RATS
+                if (receivedCmd[0] == ISO14443A_CMD_RATS) {
+                    EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
+                    break;
+                }
+
+                // command not allowed
+                if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("Received command not allowed, nacking");
+                EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
+                break;
+            }
+
+            case MFEMUL_AUTH1: {
+                if (receivedCmd_len != 8) {
+                    cardSTATE_TO_IDLE();
+                    //LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("MFEMUL_AUTH1: receivedCmd_len != 8 => cardSTATE_TO_IDLE())");
+                    break;
+                }
+                
+                uint32_t nr = bytes_to_num(receivedCmd, 4);
+                uint32_t ar = bytes_to_num(&receivedCmd[4], 4);
+
+                // Collect AR/NR per keytype & sector
+                if ((flags & FLAG_NR_AR_ATTACK) == FLAG_NR_AR_ATTACK) {
+
+                    for (uint8_t i = 0; i < ATTACK_KEY_COUNT; i++) {
+                        if (ar_nr_collected[i + mM] == 0 || ((cardAUTHSC == ar_nr_resp[i + mM].sector) && (cardAUTHKEY == ar_nr_resp[i + mM].keytype) && (ar_nr_collected[i + mM] > 0))) {
+                            // if first auth for sector, or matches sector and keytype of previous auth
+                            if (ar_nr_collected[i + mM] < 2) {
+                                // if we haven't already collected 2 nonces for this sector
+                                if (ar_nr_resp[ar_nr_collected[i + mM]].ar != ar) {
+                                    // Avoid duplicates... probably not necessary, ar should vary.
+                                    if (ar_nr_collected[i + mM] == 0) {
+                                        // first nonce collect
+                                        ar_nr_resp[i + mM].cuid = cuid;
+                                        ar_nr_resp[i + mM].sector = cardAUTHSC;
+                                        ar_nr_resp[i + mM].keytype = cardAUTHKEY;
+                                        ar_nr_resp[i + mM].nonce = nonce;
+                                        ar_nr_resp[i + mM].nr = nr;
+                                        ar_nr_resp[i + mM].ar = ar;
+                                        nonce1_count++;
+                                        // add this nonce to first moebius nonce
+                                        ar_nr_resp[i + ATTACK_KEY_COUNT].cuid = cuid;
+                                        ar_nr_resp[i + ATTACK_KEY_COUNT].sector = cardAUTHSC;
+                                        ar_nr_resp[i + ATTACK_KEY_COUNT].keytype = cardAUTHKEY;
+                                        ar_nr_resp[i + ATTACK_KEY_COUNT].nonce = nonce;
+                                        ar_nr_resp[i + ATTACK_KEY_COUNT].nr = nr;
+                                        ar_nr_resp[i + ATTACK_KEY_COUNT].ar = ar;
+                                        ar_nr_collected[i + ATTACK_KEY_COUNT]++;
+                                    } else { // second nonce collect (std and moebius)
+                                        ar_nr_resp[i + mM].nonce2 = nonce;
+                                        ar_nr_resp[i + mM].nr2 = nr;
+                                        ar_nr_resp[i + mM].ar2 = ar;
+                                        if (!gettingMoebius) {
+                                            nonce2_count++;
+                                            // check if this was the last second nonce we need for std attack
+                                            if (nonce2_count == nonce1_count) {
+                                                // done collecting std test switch to moebius
+                                                // first finish incrementing last sample
+                                                ar_nr_collected[i + mM]++;
+                                                // switch to moebius collection
+                                                gettingMoebius = true;
+                                                mM = ATTACK_KEY_COUNT;
+                                                if (flags & FLAG_RANDOM_NONCE) {
+                                                    nonce = prand();
+                                                } else {
+                                                    nonce = nonce * 7;
+                                                }
+                                                break;
+                                            }
+                                        } else {
+                                            moebius_n_count++;
+                                            // if we've collected all the nonces we need - finish.
+                                            if (nonce1_count == moebius_n_count) finished = true;
+                                        }
+                                    }
+                                    ar_nr_collected[i + mM]++;
+                                }
+                            }
+                            // we found right spot for this nonce stop looking
+                            break;
+                        }
+                    }
+                }
+
+                // --- crypto
+                crypto1_word(pcs, nr, 1);
+                cardRr = ar ^ crypto1_word(pcs, 0, 0);
+
+                // test if auth OK
+                if (cardRr != prng_successor(nonce, 64)) {
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
+                        Dbprintf("AUTH FAILED for sector %d with key %c. [nr=%08x  cardRr=%08x] [nt=%08x succ=%08x]"
+                                 , cardAUTHSC
+                                 , (cardAUTHKEY == 0) ? 'A' : 'B'
+                                 , nr
+                                 , cardRr
+                                 , nonce // nt
+                                 , prng_successor(nonce, 64)
+                                );
+                        }
+
+                        cardAUTHKEY = AUTHKEYNONE;	// not authenticated
+                        LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                        cardSTATE_TO_IDLE();
+                        break;
+                    }
+                
+                ans = prng_successor(nonce, 96) ^ crypto1_word(pcs, 0, 0);
+                num_to_bytes(ans, 4, rAUTH_AT);
+                EmSendCmd(rAUTH_AT, sizeof(rAUTH_AT));
+                if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
+                    Dbprintf("AUTH COMPLETED for sector %d with key %c. time=%d",
+                             cardAUTHSC,
+                             cardAUTHKEY == 0 ? 'A' : 'B',
+                             GetTickCount() - authTimer
+                            );
+                }
+                LED_C_ON();
+                //cardSTATE = MFEMUL_WORK;
+                if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf ("cardSTATE = MFEMUL_WORK");
+                break;
+            }
+
+
+            // WRITE BL2
+            case MFEMUL_WRITEBL2: {
+                if (receivedCmd_len == 18) {
+                    mf_crypto1_decryptEx(pcs, receivedCmd, receivedCmd_len, receivedCmd_dec);
+                    if (HasValidCRC(receivedCmd_dec, receivedCmd_len)) {
+                        if (IsSectorTrailer(cardWRBL)) {
+                            emlGetMem(response, cardWRBL, 1);
+                            if (!IsAccessAllowed(cardWRBL, cardAUTHKEY, AC_KEYA_WRITE)) {
+                                memcpy(receivedCmd_dec, response, 6);	// don't change KeyA
+                            }
+                            if (!IsAccessAllowed(cardWRBL, cardAUTHKEY, AC_KEYB_WRITE)) {
+                                memcpy(receivedCmd_dec + 10, response + 10, 6);	// don't change KeyA
+                            }
+                            if (!IsAccessAllowed(cardWRBL, cardAUTHKEY, AC_AC_WRITE)) {
+                                memcpy(receivedCmd_dec + 6, response + 6, 4);	// don't change AC bits
+                            }
+                        } else {
+                            if (!IsAccessAllowed(cardWRBL, cardAUTHKEY, AC_DATA_WRITE)) {
+                                memcpy(receivedCmd_dec, response, 16);	// don't change anything
+                            }
+                        }
+                        emlSetMem(receivedCmd_dec, cardWRBL, 1);
+                        EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_ACK));	// always ACK?
+                        cardSTATE = MFEMUL_WORK;
+                        break;
+                    }
+                } else {
+                    cardSTATE_TO_IDLE();
+                    // LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                }
+                break;
+            }
+
+            // INC
+            case MFEMUL_INTREG_INC: {
+                if (receivedCmd_len == 6) {
+                    mf_crypto1_decryptEx(pcs, receivedCmd, receivedCmd_len, (uint8_t *)&ans);
+                    if (emlGetValBl(&cardINTREG, &cardINTBLOCK, cardWRBL)) {
+                        EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
+                        cardSTATE_TO_IDLE();
+                        break;
+                    }
+                    LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                    cardINTREG = cardINTREG + ans;
+
+                    cardSTATE = MFEMUL_WORK;
+                    break;
+                }
+            }
+
+            // DEC
+            case MFEMUL_INTREG_DEC: {
+                if (receivedCmd_len == 6) {
+                    mf_crypto1_decryptEx(pcs, receivedCmd, receivedCmd_len, (uint8_t *)&ans);
+                    if (emlGetValBl(&cardINTREG, &cardINTBLOCK, cardWRBL)) {
+                        EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
+                        cardSTATE_TO_IDLE();
+                        break;
+                    }
+                }
+                LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                cardINTREG = cardINTREG - ans;
+                cardSTATE = MFEMUL_WORK;
+                break;
+            }
+
+            // REST
+            case MFEMUL_INTREG_REST: {
+                mf_crypto1_decryptEx(pcs, receivedCmd, receivedCmd_len, (uint8_t *)&ans);
+                if (emlGetValBl(&cardINTREG, &cardINTBLOCK, cardWRBL)) {
+                    EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
+                    cardSTATE_TO_IDLE();
+                    break;
+                }
+                LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                cardSTATE = MFEMUL_WORK;
+                break;
+            }
+
+        }  // End Switch Loop
+
+        button_pushed = BUTTON_PRESS();
+        
+    }  // End While Loop
+
+
+    // NR AR ATTACK
+    if (flags & FLAG_NR_AR_ATTACK && MF_DBGLEVEL >= 1) {
+        for (uint8_t	i = 0; i < ATTACK_KEY_COUNT; i++) {
+            if (ar_nr_collected[i] == 2) {
+                Dbprintf("Collected two pairs of AR/NR which can be used to extract %s from reader for sector %d:", (i < ATTACK_KEY_COUNT / 2) ? "keyA" : "keyB", ar_nr_resp[i].sector);
+                Dbprintf("../tools/mfkey/mfkey32 %08x %08x %08x %08x %08x %08x",
+                         ar_nr_resp[i].cuid,  //UID
+                         ar_nr_resp[i].nonce, //NT
+                         ar_nr_resp[i].nr,    //NR1
+                         ar_nr_resp[i].ar,    //AR1
+                         ar_nr_resp[i].nr2,   //NR2
+                         ar_nr_resp[i].ar2    //AR2
+                        );
+            }
+        }
+    }
+    
+    for (uint8_t	i = ATTACK_KEY_COUNT; i < ATTACK_KEY_COUNT * 2; i++) {
+        if (ar_nr_collected[i] == 2) {
+            Dbprintf("Collected two pairs of AR/NR which can be used to extract %s from reader for sector %d:", (i < ATTACK_KEY_COUNT / 2) ? "keyA" : "keyB", ar_nr_resp[i].sector);
+            Dbprintf("../tools/mfkey/mfkey32v2 %08x %08x %08x %08x %08x %08x %08x",
+                     ar_nr_resp[i].cuid,  //UID
+                     ar_nr_resp[i].nonce, //NT
+                     ar_nr_resp[i].nr,    //NR1
+                     ar_nr_resp[i].ar,    //AR1
+                     ar_nr_resp[i].nonce2,//NT2
+                     ar_nr_resp[i].nr2,   //NR2
+                     ar_nr_resp[i].ar2    //AR2
+                    );
+        }
+    }
+
+if (MF_DBGLEVEL >= 1)	{
+    Dbprintf("Emulator stopped. Tracing: %d  trace length: %d ", get_tracing(), BigBuf_get_traceLen());
+}
+
+// Need to be debug - Card not recognize by my phone if uncommented 
+//if ((flags &FLAG_INTERACTIVE) == FLAG_INTERACTIVE) {   // Interactive mode flag, means we need to send ACK
+    //Send the collected ar_nr in the response
+    
+//    cmd_send(CMD_ACK, CMD_SIMULATE_MIFARE_CARD, button_pushed, 0, &ar_nr_resp, sizeof(ar_nr_resp));
+//}
+
+FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+LEDsoff();
+set_tracing(false);
+
+}
diff --git a/armsrc/mifaresim.h b/armsrc/mifaresim.h
new file mode 100644
index 000000000..f62071966
--- /dev/null
+++ b/armsrc/mifaresim.h
@@ -0,0 +1,59 @@
+//-----------------------------------------------------------------------------
+// Merlok - June 2011, 2012
+// Gerhard de Koning Gans - May 2008
+// Hagen Fritsch - June 2010
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// Mifare Classic Card Simulation
+//-----------------------------------------------------------------------------
+
+#ifndef __MIFARESIM_H
+#define __MIFARESIM_H
+
+#include <stdint.h>
+
+extern void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *datain);
+
+//mifare emulator states
+#define MFEMUL_NOFIELD      0
+#define MFEMUL_IDLE         1
+#define MFEMUL_SELECT1      2
+#define MFEMUL_SELECT2      3
+#define MFEMUL_SELECT3      4
+#define MFEMUL_AUTH1        5
+#define MFEMUL_AUTH2        6
+#define MFEMUL_WORK	        7
+#define MFEMUL_WRITEBL2     8
+#define MFEMUL_INTREG_INC   9
+#define MFEMUL_INTREG_DEC  10
+#define MFEMUL_INTREG_REST 11
+#define MFEMUL_HALTED      12
+
+#define AC_DATA_READ             0
+#define AC_DATA_WRITE            1
+#define AC_DATA_INC              2
+#define AC_DATA_DEC_TRANS_REST	 3
+#define AC_KEYA_READ             0
+#define AC_KEYA_WRITE            1
+#define AC_KEYB_READ             2
+#define AC_KEYB_WRITE            3
+#define AC_AC_READ               4
+#define AC_AC_WRITE              5
+
+#define AUTHKEYA                 0
+#define AUTHKEYB                 1
+#define AUTHKEYNONE              0xff
+
+#define TAG_RESPONSE_COUNT 9								// number of precompiled responses
+
+// Prepare ("precompile") the responses of the anticollision phase.
+// There will be not enough time to do this at the moment the reader sends its REQA or SELECT
+// There are 7 predefined responses with a total of 18 bytes data to transmit.
+// Coded responses need one byte per bit to transfer (data, parity, start, stop, correction)
+// 18 * 8 data bits, 18 * 1 parity bits, 5 start bits, 5 stop bits, 5 correction bits  ->   need 177 bytes buffer
+#define ALLOCATED_TAG_MODULATION_BUFFER_SIZE 512	// number of bytes required for precompiled response
+
+#endif
\ No newline at end of file
diff --git a/armsrc/mifareutil.c b/armsrc/mifareutil.c
index f61987f09..929851b4b 100644
--- a/armsrc/mifareutil.c
+++ b/armsrc/mifareutil.c
@@ -600,6 +600,17 @@ void emlClearMem(void) {
     return;
 }
 
+uint8_t SectorTrailer(uint8_t blockNo) {
+    if (blockNo < 32 * 4) {
+        return (blockNo | 0x03);
+    } else {
+        return (blockNo | 0x0f);
+    }
+}
+
+bool IsSectorTrailer(uint8_t blockNo) {
+    return (blockNo == SectorTrailer(blockNo));
+}
 
 // Mifare desfire commands
 int mifare_sendcmd_special(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t *data, uint8_t *answer, uint8_t *answer_parity, uint32_t *timing) {
diff --git a/armsrc/mifareutil.h b/armsrc/mifareutil.h
index 971ba77f9..521d80202 100644
--- a/armsrc/mifareutil.h
+++ b/armsrc/mifareutil.h
@@ -38,7 +38,26 @@
 #define CARD_NACK_NA  0x04  // 0100 - NACK, not allowed (command not allowed)
 #define CARD_NACK_TR  0x05  // 0101 - NACK, transmission error
 
+// reader voltage field detector
+#define MF_MINFIELDV      4000
 
+// debug
+// 0 - no debug messages 1 - error messages 2 - all messages 4 - extended debug mode
+#define MF_DBG_NONE          0
+#define MF_DBG_ERROR         1
+#define MF_DBG_ALL           2
+#define MF_DBG_EXTENDED      4
+
+// Mifare 4k/2k/1k/mini Max Block / Max Sector
+#define MIFARE_4K_MAXBLOCK 256
+#define MIFARE_2K_MAXBLOCK 128
+#define MIFARE_1K_MAXBLOCK 64
+#define MIFARE_MINI_MAXBLOCK 20
+
+#define MIFARE_MINI_MAXSECTOR 5
+#define MIFARE_1K_MAXSECTOR 16
+#define MIFARE_2K_MAXSECTOR 32
+#define MIFARE_4K_MAXSECTOR 40
 
 //mifare emulator states
 #define MFEMUL_NOFIELD      0
@@ -93,6 +112,9 @@ uint8_t mf_crypto1_encrypt4bit(struct Crypto1State *pcs, uint8_t data);
 uint8_t NumBlocksPerSector(uint8_t sectorNo);
 uint8_t FirstBlockOfSector(uint8_t sectorNo);
 
+bool IsSectorTrailer(uint8_t blockNo);
+uint8_t SectorTrailer(uint8_t blockNo);
+
 // emulator functions
 void emlClearMem(void);
 void emlSetMem(uint8_t *data, int blockNum, int blocksCount);
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index e3b8cb957..71bdb2ec8 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -69,6 +69,10 @@ int usage_hf14_mf1ksim(void) {
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "      h    this help");
     PrintAndLogEx(NORMAL, "      u    (Optional) UID 4,7 or 10bytes. If not specified, the UID 4b from emulator memory will be used");
+    PrintAndLogEx(NORMAL, "      t    (Optional)   0 = MIFARE Mini");
+    PrintAndLogEx(NORMAL, "                        1 = MIFARE Classic 1k (Default)");
+    PrintAndLogEx(NORMAL, "                        1 = MIFARE Classic 2k");
+    PrintAndLogEx(NORMAL, "                        4 = MIFARE Classic 4k");
     PrintAndLogEx(NORMAL, "      n    (Optional) Automatically exit simulation after <numreads> blocks have been read by reader. 0 = infinite");
     PrintAndLogEx(NORMAL, "      i    (Optional) Interactive, means that console will not be returned until simulation finishes or is aborted");
     PrintAndLogEx(NORMAL, "      x    (Optional) Crack, performs the 'reader attack', nr/ar attack against a reader");
@@ -2134,7 +2138,7 @@ int CmdHF14AMf1kSim(const char *Cmd) {
 
     uint8_t uid[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
     uint8_t exitAfterNReads = 0;
-    uint8_t flags = (FLAG_UID_IN_EMUL | FLAG_4B_UID_IN_DATA);
+    uint16_t flags = (FLAG_UID_IN_EMUL | FLAG_4B_UID_IN_DATA);
     int uidlen = 0;
     uint8_t cmdp = 0;
     bool errors = false, verbose = false, setEmulatorMem = false;
@@ -2156,6 +2160,31 @@ int CmdHF14AMf1kSim(const char *Cmd) {
                 exitAfterNReads = param_get8(Cmd, cmdp + 1);
                 cmdp += 2;
                 break;
+            case 't':
+                switch (param_get8(Cmd, cmdp + 1)) {
+                    case 0:
+                        // Mifare MINI
+                        flags |= FLAG_MF_MINI;
+                        break;
+                    case 1:
+                        // Mifare Classic 1k
+                        flags |= FLAG_MF_1K;
+                        break;
+                    case 2:
+                        // Mifare Classic 2k
+                        flags |= FLAG_MF_2K;
+                        break;
+                    case 4:
+                        // Mifare Classic 4k
+                        flags |= FLAG_MF_4K;
+                        break;
+                    default:
+                        // Mifare Classic 1k
+                        flags |= FLAG_MF_1K;
+                        break;
+                }
+                cmdp += 2;
+                break;
             case 'u':
                 param_gethex_ex(Cmd, cmdp + 1, uid, &uidlen);
                 switch (uidlen) {
diff --git a/common/protocols.h b/common/protocols.h
index fde10f38a..00e3ef902 100644
--- a/common/protocols.h
+++ b/common/protocols.h
@@ -152,6 +152,7 @@ ISO 7816-4 Basic interindustry commands. For command APDU's.
 #define ISO14443A_CMD_HALT          0x50
 #define ISO14443A_CMD_RATS          0xE0
 
+#define MIFARE_SELECT_CT            0x88
 #define MIFARE_AUTH_KEYA            0x60
 #define MIFARE_AUTH_KEYB            0x61
 #define MIFARE_MAGICWUPC1           0x40
diff --git a/include/mifare.h b/include/mifare.h
index 104d5cf09..d0b1168fa 100644
--- a/include/mifare.h
+++ b/include/mifare.h
@@ -47,10 +47,11 @@ typedef enum ISO14A_COMMAND {
 
 typedef struct {
     uint8_t *response;
-    size_t   response_n;
     uint8_t *modulation;
-    size_t   modulation_n;
+    uint16_t response_n;
+    uint16_t modulation_n;
     uint32_t ProxToAirDuration;
+    uint8_t  par; // enough for precalculated parity of 8 Byte responses
 } tag_response_info_t;
 //-----------------------------------------------------------------------------
 // ISO 14443B
diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index 94ae66eaa..7ee961466 100644
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -290,7 +290,11 @@ typedef struct {
 #define FLAG_10B_UID_IN_DATA    0x08
 #define FLAG_UID_IN_EMUL        0x10
 #define FLAG_NR_AR_ATTACK       0x20
-//#define FLAG_RANDOM_NONCE       0x40
+#define FLAG_RANDOM_NONCE       0x40
+#define FLAG_MF_MINI            0x80
+#define FLAG_MF_1K              0x100
+#define FLAG_MF_2K              0x200
+#define FLAG_MF_4K              0x400
 
 //Iclass reader flags
 #define FLAG_ICLASS_READER_ONLY_ONCE   0x01

From b66152feb2da37fe87bffae9a37054935c8707e9 Mon Sep 17 00:00:00 2001
From: vratiskol <vincent.ratiskol@github.com>
Date: Fri, 15 Mar 2019 21:07:15 +0100
Subject: [PATCH 0807/1938] Astyle update

---
 armsrc/mifaresim.c | 62 +++++++++++++++++++++++-----------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/armsrc/mifaresim.c b/armsrc/mifaresim.c
index f5aec6f0e..a0978a53c 100644
--- a/armsrc/mifaresim.c
+++ b/armsrc/mifaresim.c
@@ -478,7 +478,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
             button_pushed = BUTTON_PRESS();
             continue;
         }
-  
+
         //Now, get data
         int res = EmGetCmd(receivedCmd, &receivedCmd_len, receivedCmd_par);
 
@@ -756,8 +756,8 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                     }
                     EmSendCmd(rAUTH_AT, sizeof(rAUTH_AT));
                     cardSTATE = MFEMUL_AUTH1;
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) { 
-                      Dbprintf("cardSTATE = MFEMUL_AUTH1");
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
+                        Dbprintf("cardSTATE = MFEMUL_AUTH1");
                     }
                     break;
                 }
@@ -765,7 +765,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                     if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Commands must be encrypted (authenticated)");
                     break;
                 }
-                
+
                 // if Cmd is Read, Write, Inc, Dec, Restore, Transfert
                 if (receivedCmd_dec[0] == ISO14443A_CMD_READBLOCK
                         || receivedCmd_dec[0] == ISO14443A_CMD_WRITEBLOCK
@@ -785,21 +785,21 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                         break;
                     }
                 }
-                
+
                 // CMD READ block
                 if (receivedCmd_dec[0] == ISO14443A_CMD_READBLOCK) {
                     blockNo = receivedCmd_dec[1];
                     if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Reader reading block %d (0x%02x)", blockNo, blockNo);
                     emlGetMem(response, blockNo, 1);
                     if (MF_DBGLEVEL >= 2) Dbprintf("Data Block: %02x%02x%02x%02x%02x%02x%02x%02x%02x", response);
-                    
-                    
+
+
                     if (IsSectorTrailer(blockNo)) {
                         memset(response, 0x00, 6); 	// keyA can never be read
                         if (MF_DBGLEVEL >= 2) Dbprintf("[IsSectorTrailer] keyA can never be read - block %d (0x%02x)", blockNo, blockNo);
                         if (!IsAccessAllowed(blockNo, cardAUTHKEY, AC_KEYB_READ)) {
                             memset(response + 10, 0x00, 6); 	// keyB cannot be read
-                              if (MF_DBGLEVEL >= 2) Dbprintf("[IsSectorTrailer] keyB cannot be read - block %d (0x%02x)", blockNo, blockNo);
+                            if (MF_DBGLEVEL >= 2) Dbprintf("[IsSectorTrailer] keyB cannot be read - block %d (0x%02x)", blockNo, blockNo);
                         }
                         if (!IsAccessAllowed(blockNo, cardAUTHKEY, AC_AC_READ)) {
                             memset(response + 6, 0x00, 4); 	// AC bits cannot be read
@@ -819,11 +819,11 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                         Dbprintf("%d reads done, exiting", numReads);
                         finished = true;
                     }
-                    
+
                     if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[ISO14443A_CMD_READBLOCK] Finish");
                     break;
-                } 
-                
+                }
+
                 // CMD WRITEBLOCK
                 if (receivedCmd_dec[0] == ISO14443A_CMD_WRITEBLOCK) {
                     blockNo = receivedCmd_dec[1];
@@ -865,7 +865,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                         break;
                     }
                 }
-                
+
                 // TRANSFER
                 if (receivedCmd_dec[0] == MIFARE_CMD_TRANSFER) {
                     blockNo = receivedCmd_dec[1];
@@ -906,7 +906,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                     if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("MFEMUL_AUTH1: receivedCmd_len != 8 => cardSTATE_TO_IDLE())");
                     break;
                 }
-                
+
                 uint32_t nr = bytes_to_num(receivedCmd, 4);
                 uint32_t ar = bytes_to_num(&receivedCmd[4], 4);
 
@@ -988,14 +988,14 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                                  , nonce // nt
                                  , prng_successor(nonce, 64)
                                 );
-                        }
-
-                        cardAUTHKEY = AUTHKEYNONE;	// not authenticated
-                        LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
-                        cardSTATE_TO_IDLE();
-                        break;
                     }
-                
+
+                    cardAUTHKEY = AUTHKEYNONE;	// not authenticated
+                    LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                    cardSTATE_TO_IDLE();
+                    break;
+                }
+
                 ans = prng_successor(nonce, 96) ^ crypto1_word(pcs, 0, 0);
                 num_to_bytes(ans, 4, rAUTH_AT);
                 EmSendCmd(rAUTH_AT, sizeof(rAUTH_AT));
@@ -1008,7 +1008,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                 }
                 LED_C_ON();
                 //cardSTATE = MFEMUL_WORK;
-                if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf ("cardSTATE = MFEMUL_WORK");
+                if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("cardSTATE = MFEMUL_WORK");
                 break;
             }
 
@@ -1095,7 +1095,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
         }  // End Switch Loop
 
         button_pushed = BUTTON_PRESS();
-        
+
     }  // End While Loop
 
 
@@ -1115,7 +1115,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
             }
         }
     }
-    
+
     for (uint8_t	i = ATTACK_KEY_COUNT; i < ATTACK_KEY_COUNT * 2; i++) {
         if (ar_nr_collected[i] == 2) {
             Dbprintf("Collected two pairs of AR/NR which can be used to extract %s from reader for sector %d:", (i < ATTACK_KEY_COUNT / 2) ? "keyA" : "keyB", ar_nr_resp[i].sector);
@@ -1131,19 +1131,19 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
         }
     }
 
-if (MF_DBGLEVEL >= 1)	{
-    Dbprintf("Emulator stopped. Tracing: %d  trace length: %d ", get_tracing(), BigBuf_get_traceLen());
-}
+    if (MF_DBGLEVEL >= 1)	{
+        Dbprintf("Emulator stopped. Tracing: %d  trace length: %d ", get_tracing(), BigBuf_get_traceLen());
+    }
 
-// Need to be debug - Card not recognize by my phone if uncommented 
+// Need to be debug - Card not recognize by my phone if uncommented
 //if ((flags &FLAG_INTERACTIVE) == FLAG_INTERACTIVE) {   // Interactive mode flag, means we need to send ACK
     //Send the collected ar_nr in the response
-    
+
 //    cmd_send(CMD_ACK, CMD_SIMULATE_MIFARE_CARD, button_pushed, 0, &ar_nr_resp, sizeof(ar_nr_resp));
 //}
 
-FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-LEDsoff();
-set_tracing(false);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    LEDsoff();
+    set_tracing(false);
 
 }

From af4669eba51331274f1cd16993875e042d2c7cde Mon Sep 17 00:00:00 2001
From: vratiskol <vincent.ratiskol@github.com>
Date: Fri, 15 Mar 2019 21:08:56 +0100
Subject: [PATCH 0808/1938] Force LF

---
 .gitattributes | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitattributes b/.gitattributes
index bae55fcce..73c989a7e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3,4 +3,7 @@
 fpga/fpga.bit -crlf -diff
 *.bin -crlf -diff
 *.z -crlf -diff
- 
\ No newline at end of file
+# Force LF
+*.c text=auto eol=lf
+*.h text=auto eol=lf
+*.lua text=auto eol=lf

From 6a52b6074fec0c6aefcbcc277d3a06d8b70f9d6a Mon Sep 17 00:00:00 2001
From: vratiskol <vincent.ratiskol@github.com>
Date: Fri, 15 Mar 2019 21:17:07 +0100
Subject: [PATCH 0809/1938] Sync from Upstream

---
 .gitignore                            |   1 +
 CHANGELOG.md                          |  29 +
 HACKING.txt                           | 195 +++----
 Makefile                              |   8 +-
 README.md                             |   4 +-
 armsrc/BigBuf.c                       |  41 --
 armsrc/BigBuf.h                       |   1 -
 armsrc/Makefile                       |   4 +-
 armsrc/Standalone/hf_mattyrun.c       |   2 +-
 armsrc/Standalone/hf_mattyrun.h       |   2 +-
 armsrc/Standalone/hf_young.c          |   2 +-
 armsrc/Standalone/hf_young.h          |   2 +-
 armsrc/Standalone/lf_hidbrute.h       |   2 +-
 armsrc/Standalone/lf_proxbrute.c      |   2 +-
 armsrc/Standalone/lf_proxbrute.h      |   2 +-
 armsrc/Standalone/lf_samyrun.c        |   2 +-
 armsrc/Standalone/lf_samyrun.h        |   2 +-
 armsrc/Standalone/standalone.h        |   2 +-
 armsrc/aes.c                          |   2 +-
 armsrc/aes.h                          |   2 +-
 armsrc/appmain.c                      |  33 +-
 armsrc/apps.h                         |  20 +-
 armsrc/buzzer.c                       |   2 +-
 armsrc/desfire_crypto.c               |   2 +-
 armsrc/desfire_key.c                  |   2 +-
 armsrc/desfire_key.h                  |   2 +-
 armsrc/epa.c                          |   7 +-
 armsrc/felica.c                       |   2 +-
 armsrc/flashmem.h                     |   2 +-
 armsrc/hfsnoop.c                      |  10 +-
 armsrc/hitag2.c                       | 463 +++++-----------
 armsrc/hitag2.h                       |  23 +
 armsrc/hitag2_crypto.c                | 116 ++++
 armsrc/hitag2_crypto.h                |  36 ++
 armsrc/hitagS.c                       | 766 +++++++++++---------------
 armsrc/hitagS.h                       |  31 ++
 armsrc/iclass.c                       |   4 +-
 armsrc/iso14443a.c                    |   2 +-
 armsrc/iso14443b.c                    |   8 +-
 armsrc/iso15693.c                     |  39 +-
 armsrc/lfops.c                        |  98 ++--
 armsrc/lfsampling.c                   |  22 +-
 armsrc/lfsampling.h                   |   6 +-
 armsrc/mifarecmd.c                    |   4 +-
 armsrc/mifarecmd.h                    |   2 +-
 armsrc/mifaresniff.c                  |   2 +-
 armsrc/mifaresniff.h                  |   2 +-
 armsrc/pcf7931.c                      |   2 +-
 armsrc/pcf7931.h                      |   2 +-
 armsrc/start.c                        |   2 +-
 armsrc/string.h                       |   2 +-
 armsrc/ticks.h                        |   2 +-
 armsrc/util.h                         |  39 ++
 client/amiitool/amiitool.c            |   2 +-
 client/cli.c                          |   2 +-
 client/cmdcrc.c                       |   2 +-
 client/cmddata.c                      |  40 +-
 client/cmddata.h                      |   2 +-
 client/cmdflashmem.c                  |   2 +-
 client/cmdflashmem.h                  |   2 +-
 client/cmdhf.c                        |   4 +-
 client/cmdhf14a.c                     |   2 +-
 client/cmdhf14b.c                     |  30 +-
 client/cmdhf15.c                      |  14 +-
 client/cmdhfepa.c                     |   2 +-
 client/cmdhffelica.c                  |   4 +-
 client/cmdhffido.h                    |   2 +-
 client/cmdhficlass.c                  |   8 +-
 client/cmdhflegic.c                   |   2 +-
 client/cmdhflist.c                    |   2 +-
 client/cmdhfmf.c                      |   6 +-
 client/cmdhfmfdesfire.h               |   2 +-
 client/cmdhfmfp.h                     |   2 +-
 client/cmdlf.c                        |  29 +-
 client/cmdlfhitag.c                   | 552 ++++++++++++++-----
 client/cmdlfhitag.h                   |   9 +-
 client/cmdlft55xx.c                   |   6 +-
 client/cmdlfti.c                      |   2 +-
 client/cmdmain.c                      |   2 +-
 client/cmdscript.c                    |   2 +-
 client/cmdsmartcard.c                 | 167 ++++--
 client/cmdsmartcard.h                 |   3 +-
 client/cmdtrace.c                     |  46 +-
 client/crypto/libpcrypto.c            |  15 +
 client/crypto/libpcrypto.h            |   1 +
 client/emv/cmdemv.c                   |   2 +
 client/emv/emvjson.h                  |   2 +-
 client/fpga_compress.c                |  18 +-
 client/hardnested/hardnested_tables.c |   2 +-
 client/hid-flasher/usb_cmd.h          |  12 +-
 client/loclass/elite_crack.c          |   2 +-
 client/loclass/fileutils.c            |  54 +-
 client/loclass/fileutils.h            |   8 +-
 client/lualibs/7816_error.lua         |   2 +-
 client/lualibs/hf_reader.lua          |   2 +-
 client/lualibs/precalc.lua            |   2 +-
 client/lualibs/read14b.lua            |   2 +-
 client/lualibs/taglib.lua             |   2 +-
 client/lualibs/utils.lua              |   2 +-
 client/mifare/mifarehost.h            |   2 +-
 client/pm3_eml_mfd_test.py            |   2 +-
 client/reveng/preset.c                |   2 +-
 client/scandir.h                      |   2 +-
 client/scripting.c                    |   2 +-
 client/scripts/Legic_clone.lua        |   2 +-
 client/scripts/brutesim.lua           |   2 +-
 client/scripts/calc_di.lua            |   2 +-
 client/scripts/calc_ev1_it.lua        |   2 +-
 client/scripts/calc_mizip.lua         |   2 +-
 client/scripts/calypso.lua            |   2 +-
 client/scripts/e.lua                  |   2 +-
 client/scripts/emul2dump.lua          |   2 +-
 client/scripts/emul2html.lua          |   2 +-
 client/scripts/formatMifare.lua       |   2 +-
 client/scripts/hf_read.lua            |   2 +-
 client/scripts/htmldump.lua           |   2 +-
 client/scripts/lf_bulk.lua            |   2 +-
 client/scripts/mfkeys.lua             |   2 +-
 client/scripts/ndef_dump.lua          |   2 +-
 client/scripts/ntag_3d.lua            |   2 +-
 client/scripts/parameters.lua         |   2 +-
 client/scripts/test_t55x7_ask.lua     |   2 +-
 client/scripts/test_t55x7_fsk.lua     |   2 +-
 client/scripts/tnp3dump.lua           |   2 +-
 client/scripts/tracetest.lua          |   2 +-
 client/scripts/ufodump.lua            |   2 +-
 client/snooper.c                      |   6 +-
 client/util.c                         |  60 +-
 client/util.h                         |   4 +-
 client/util_darwin.h                  |   2 +-
 common/bucketsort.h                   |   2 +-
 common/cmd.c                          |   2 +-
 common/crc.c                          |   2 +-
 common/crc16.h                        |   2 +-
 common/crc32.c                        |   2 +-
 common/crc64.c                        |   2 +-
 common/i2c.h                          |   2 +-
 common/iso15693tools.c                |   5 +-
 common/iso15693tools.h                |   2 +-
 common/legic_prng.c                   |   2 +-
 common/lfdemod.c                      |   5 +-
 common/lfdemod.h                      |   2 +-
 common/prng.h                         |   2 +-
 common/protocols.h                    |   1 +
 common/radixsort.c                    |   2 +-
 common/radixsort.h                    |   2 +-
 common/random.h                       |   2 +-
 common/tea.h                          |   2 +-
 common/usart.c                        |   2 +-
 common/usb_cdc.c                      |   2 +-
 common/wiegand.c                      |   2 +-
 include/at91sam7s512.h                |   2 +-
 include/common.h                      |   2 +-
 include/hitag.h                       | 117 ++++
 include/mifare.h                      |   3 +-
 include/usb_cmd.h                     |  14 +-
 proxmark3.sh                          |   2 +-
 tools/Makefile                        |   2 +-
 tools/findbits_test.py                |   2 +-
 tools/mkversion.pl                    |   6 +-
 uart/uart_win32.c                     |   2 +-
 161 files changed, 2002 insertions(+), 1463 deletions(-)
 create mode 100644 armsrc/hitag2.h
 create mode 100644 armsrc/hitag2_crypto.c
 create mode 100644 armsrc/hitag2_crypto.h
 create mode 100644 armsrc/hitagS.h
 create mode 100644 include/hitag.h

diff --git a/.gitignore b/.gitignore
index 785934f46..9a12efbe5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 # don't push these files to the repository
 
 .history
+.bash_history
 *.log
 *.eml
 *.o
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 34bf817bd..95c590a52 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,35 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [unreleased][unreleased]
+ - Change - handling fault bit markers (7) and partial nibbles in hex printing (@doegox)
+ - Change - printing of fault bit markers (7) using a dot (@doegox)
+ - Change 'sc upgrade' - firmware file integrity check (@piwi)
+ - Fix 'data rawdemod am' - last bit was missing (@doegox)
+ - Fix 'hf 15 dump f' - also selects tag first (@iceman)
+ - Fix 'hf iclass clone' - missing fileclose (@iceman)
+ - Add 'trace list hitag' - old hitag annotations now use the new trace (@iceman)
+ - Change 'lf hitag sim' - loads bin/eml/json (@iceman)
+ - Change 'lf hitag reader 21' - saves in bin/eml/json (@iceman)
+ - Change 'lf hitag' - refactoring (@iceman)
+ - Change 'lf hitag' - refactoring (@piwi)
+ - Fix 'lf hitag' - generic fix for missing clock init (@piwi)
+ - Fix fsk sim operations on deviceside - avoid division by zero (@doegox)
+ - Fix 'hf mf fchk' - condition always false (@doegox)
+ - Fix 'lf t55xx recoverpw' - shift as u32 (@doegox)
+ - Fix 'lf ti demod' - shift as u32 (@doegox)
+ - Fix 'lf ti read' - shift as u32 (@doegox)
+ - Fix 'lf t55xx chk' - condition always false (@doegox) 
+ - Change 'lf sim' - ledcontrol refactoring (@doegox)
+ - Fix 'hf mf nack' - signedness bug (@doegox)
+ - Fix 'hf epa cnonce' - check return value (@doegox)
+ - Fix 'lf hitag write' - condition always true (@doegox)
+ - Fix 'mem write' - added extra check (@doegox)
+ - Fix 'iso15693' - bad string cpy (@doegox)
+ - Fix 'make style' - EOF LF support (@doegox)
+ - Add 'hf 14b raw' - added -t for timeout  (@iceman)
+ - Rename 'lf hitag snoop' - renamed to 'lf hitag sniff' (@iceman)
+ - Rename 'lf snoop' - renamed to 'lf sniff' (@iceman)
+ - Rename 'hf snoop' - renamed to 'hf sniff' (@iceman)
  - Fix 'hf mfp wrbl' - more blocks available (@merlokk)
  - Add 'make platform' - compile for non-rdv4 devices made simpler (@doegox)
  - Change Makefiles optimizations when recompiling (@doegox)
diff --git a/HACKING.txt b/HACKING.txt
index fb68142e9..9d7bdaedc 100644
--- a/HACKING.txt
+++ b/HACKING.txt
@@ -1,38 +1,26 @@
-	"Coding styles are like assholes, everyone has one and no one likes anyone elses."
-	--Eric Warmenhoven
+    "Coding styles are like assholes, everyone has one and no one likes anyone elses."
+    --Eric Warmenhoven
 
 The Proxmark3 codebase is pretty messy and in the process of being cleaned up,
 so we don't have clear guidelines on how to place new code just yet. However,
 please don't make things worse.
 
 However, we have established a set of coding style guidelines in order to
-clean up the code consistently and keep it consistent in the future. Use common
-sense and good taste. If breaking a rule leads to cleaner code, you can do so,
-but laziness is not an excuse.
+clean up the code consistently and keep it consistent in the future.
+Look around and respect the same style.
+Helper script to get some uniformity in the style:
+
+$ make style
+
+It makes use of "astyle" so be sure to install it first.
+
 
 === INDENTATION ===
 
-Use tabs for indentation, but use spaces for alignment:
+Don't use tabs, editors are messing them up too easily.
+Increment unit is four spaces.
 
-	if (foo(this, that, there)
-	    && bar == baz)
-	{
-		dostuff();
-	}
-
-Notice it's like this (T___ for tab, S for space, for a 4-char tab setting):
-
-T___if (foo(this, that, there)
-T___SSSS&& bar == baz)
-
-Another example:
-
-#define THIS            0x10
-#define THAT_THING      0x20
-#define SOMETHING_ELSE  0x80
-
-These should look good no matter what your editor's tab setting is, so go nuts
-and pick whatever you like best.
+If you use "make style", this will be done for you.
 
 === WIDTH ===
 
@@ -65,24 +53,28 @@ use microsoft-style DWORD and the like, we're getting rid of those. Avoid char
 for buffers, uint8_t is more obvious when you're not working with strings. Use
 'const' where things are const. Try to use size_t for sizes.
 
-Pointers are:
-	void *ptr;
+Pointers and reference operators are attached to the variable name:
+    void *ptr;
 not:
-	void* ptr;
+    void* ptr;
 otherwise you're tempted to write:
-	void* in, out;
+    void* in, out;
 and you'll fail.
 
+"make style" will take care of pointers & reference operators.
+
 === EXPRESSIONS ===
 
 In general, use whitespace around binary operators - no unspaced blobs of an
-expression. This rule may be broken if it makes things clearer. For example,
+expression. "make style" will take care of whitespaces around operators.
 
-	if (5*a < b && some_bool_var)
+For example,
+
+    if (5 * a < b && some_bool_var)
 
 but not
 
-	if (5*a<b&&some_bool_var)
+    if (5*a<b&&some_bool_var)
 
 For equality with constants, use i == 0xF00, not 0xF00 == i. The compiler warns
 you about = vs == anyway, and you shouldn't be screwing that one up by now
@@ -90,93 +82,73 @@ anyway.
 
 === IF / FOR / WHILE / etc. ===
 
-Put the opening brace on the same line, with a space before it. Exception: if
-the if/for/while condition/whatever are split over several lines, it might be
-more appealing to put the opening brace on its own line, so use your own
-judgement there:
-
-	if (foo(this, that, there)
-	    && bar == baz)
-	{
-		dostuff();
-	}
-
-If you do split the condition, put the binary operators that join the lines at
-the beginning of the following lines (as above), not at the end of the prior
-lines.
-
+Put the opening brace on the same line, with a space before it.
 There should be a space between the construct name (if/for/whatever) and the
 opening parenthesis, and there should be a space between the closing parenthesis
-and the opening brace.
+and the opening brace, and no space between parenthesis and expression.
+"make style" will take care of all that.
+
+If you do split the condition, put the binary operators that join the lines at
+the beginning of the following lines, not at the end of the prior lines.
 
 For generic for() iterator variables, declare them in-line:
 
-	for (int i = 0; i < 10; i++) {
-		...
-	}
+    for (int i = 0; i < 10; i++) {
+        ...
+    }
 
 Note the spaces after the semicolons.
 
 if/else should be laid out as follows:
 
-	if (foo) {
-		...
-	} else if (bar) {
-		...
-	} else {
-		...
-	}
+    if (foo) {
+        ...
+    } else if (bar) {
+        ...
+    } else {
+        ...
+    }
 
-or
-
-	if (foo)
-		...
-	else if (bar)
-		...
-	else
-		...
-
-Don't mix braces vs. no braces. If any of your bodies are > 1 line, put braces
-around them all.
+You can skip braces around 1 line statements but don't mix braces vs. no braces.
 
 === FUNCTIONS ===
 
-Functions with no arguments are declared as f(void), not f(). Put the return
-type on the same line. Use static for functions that aren't exported, and put
-exported functions in a header file (one header file per source file with
-exported functions usually, no huge headers with all functions). Put a space
-after a comma in argument lists.
+Put the return type on the same line.
+Put a space after a comma in argument lists.
+Open the brace after the declaration (after a space).
+"make style" will take care of all that.
 
-void foo(int a_thing, int something_else)
-{
-	...
+void foo(int a_thing, int something_else) {
+    ...
 }
 
-void baz(void)
-{
-	foo(bluh, blah);
+Functions with no arguments are declared as f(void), not f().
+Use static for functions that aren't exported, and put exported functions
+in a header file (one header file per source file with exported functions
+usually, no huge headers with all functions). 
+
+void baz(void) {
+    foo(bluh, blah);
 }
 
 Function names should be separated_with_underscores(), except for standard
 functions (memcpy, etc.). It may make sense to break this rule for very common,
 generic functions that look like library functions (e.g. dprintf()).
 
-Don't use single-character arguments. Exception: very short functions with one
-argument that's really obvious:
+Don't use single-character arguments.
+Exception: very short functions with one argument that's really obvious:
 
-static int ascii(char c)
-{
-	if (c < 0x20 || c >= 0x7f)
-		return '.';
-	else
-		return c;
+static int ascii(char c) {
+    if (c < 0x20 || c >= 0x7f)
+        return '.';
+    else
+        return c;
 }
 
 vs.
 
-static void hexdump(void *buf, size_t len)
-{
-	...
+static void hexdump(void *buf, size_t len) {
+    ...
 }
 
 As a general guideline, functions shouldn't usually be much more than 30-50
@@ -188,7 +160,7 @@ probably missing some factoring/restructuring opportunity.
 Use typedefs when defining structs. The type should be named something_t.
 
 typedef struct {
-	blah blah;
+    blah blah;
 } prox_cmd_t;
 
 You can use anonymous enums to replace lots of sequential or mostly-sequential
@@ -199,16 +171,18 @@ You can use anonymous enums to replace lots of sequential or mostly-sequential
 Indent once for the case: labels, then again for the body. Like this:
 
 switch(bar) {
-	case OPTION_A:
-		do_stuff();
-		break;
-	case OPTION_B:
-		do_other_stuff();
-		break;
+    case OPTION_A:
+        do_stuff();
+        break;
+    case OPTION_B:
+        do_other_stuff();
+        break;
 }
 
-If you fall through into another case, add an explicit comment; otherwise, it
-can look confusing.
+"make style" will take care of the indentation.
+
+If you fall through into another case, add an explicit comment;
+otherwise, it can look confusing.
 
 If your switch() is too long or has too many cases, it should be cleaned up.
 Split off the cases into functions, break the switch() into parent and children
@@ -218,12 +192,12 @@ the like. In other words, use common sense and your brain.
 If you need local scope variables for a case, you can add braces:
 
 switch(bar) {
-	case OPTION_A: {
-		int baz = 5*bar;
-		do_stuff(baz);
-		break;
-	}
-	...
+    case OPTION_A: {
+        int baz = 5 * bar;
+        do_stuff(baz);
+        break;
+    }
+    ...
 
 But at that point you should probably consider using a separate function.
 
@@ -266,7 +240,7 @@ License/description header first:
 //-----------------------------------------------------------------------------
 
 If you modify a file in any non-trivial way (add code, etc.), add your copyright
-to the top.
+to the top with the current year.
 
 === HEADER FILES ===
 
@@ -284,8 +258,7 @@ you shouldn't use it (same for _FOOBAR_H).
 
 === WHITESPACE ===
 
-Avoid trailing whitespace (no line should end in tab or space). People forget
-this all the time if their editor doesn't handle it, but don't be surprised if
-you see someone fixing it from time to time.
-
+Avoid trailing whitespace (no line should end in tab or space).
 Keep a newline (blank line) at the end of each file.
+
+"make style" will take care of both.
diff --git a/Makefile b/Makefile
index 14bf98074..6e7c9abd5 100644
--- a/Makefile
+++ b/Makefile
@@ -106,8 +106,14 @@ endif
 print-%: ; @echo $* = $($*)
 
 style:
+	# Make sure astyle is installed
 	@which astyle >/dev/null || ( echo "Please install 'astyle' package first" ; exit 1 )
-	find . \( -name "*.[ch]" -or -name "*.cpp" -or -name "*.lua" -or -name "Makefile" \) -exec perl -pi -e 's/[ \t\r]+$$//' {} \;
+	# Remove spaces & tabs at EOL, add LF at EOF if needed on *.c, *.h, *.cpp. *.lua, *.py, *.pl, Makefile
+	find . \( -name "*.[ch]" -or -name "*.cpp" -or -name "*.lua" -or -name "*.py" -or -name "*.pl" -or -name "Makefile" \) \
+	    -exec perl -pi -e 's/[ \t\r]+$$//' {} \; \
+	    -exec sh -c "tail -c1 {} | xxd -p | tail -1 | grep -q -v 0a$$" \; \
+	    -exec sh -c "echo >> {}" \;
+	# Apply astyle on *.c, *.h, *.cpp
 	find . \( -name "*.[ch]" -or -name "*.cpp" \) -exec astyle --formatted --mode=c --suffix=none \
 	    --indent=spaces=4 --indent-switches --indent-preprocessor \
 	    --keep-one-line-blocks --max-instatement-indent=60 \
diff --git a/README.md b/README.md
index c8c04f852..cfdbacc61 100644
--- a/README.md
+++ b/README.md
@@ -286,7 +286,7 @@ You will need to run these commands to make sure your rdv4 is prepared
 
 ### Verify sim module firmware version
 To make sure you got the latest sim module firmware.
-_Lastest version is v3.10_
+_Lastest version is v3.11_
 
     pm3 --> hw status
 
@@ -298,7 +298,7 @@ Find version in the long output,  look for these two lines
 This version is obselete. The following command upgrades your device sim module firmware.
 Don't not turn of your device during the execution of this command.
 
-    pm3 --> sc upgrade f ../tools/simmodule/SIM010.BIN 
+    pm3 --> sc upgrade f ../tools/simmodule/SIM011.BIN 
     
 You get the following output,  this is a successful execution.    
     
diff --git a/armsrc/BigBuf.c b/armsrc/BigBuf.c
index ab45a2681..267e6811b 100644
--- a/armsrc/BigBuf.c
+++ b/armsrc/BigBuf.c
@@ -195,47 +195,6 @@ bool RAMFUNC LogTrace(const uint8_t *btBytes, uint16_t iLen, uint32_t timestamp_
     return true;
 }
 
-int LogTraceHitag(const uint8_t *btBytes, int iBits, int iSamples, uint32_t dwParity, int readerToTag) {
-    /**
-      Todo, rewrite the logger to use the generic functionality instead. It should be noted, however,
-      that this logger takes number of bits as argument, not number of bytes.
-      **/
-
-    if (!tracing) return false;
-
-    uint8_t *trace = BigBuf_get_addr();
-    uint32_t iLen = nbytes(iBits);
-    // Return when trace is full
-    if (traceLen + sizeof(rsamples) + sizeof(dwParity) + sizeof(iBits) + iLen > BigBuf_max_traceLen()) return false;
-
-    //Hitag traces appear to use this traceformat:
-    // 32 bits timestamp (little endian,Highest Bit used as readerToTag flag)
-    // 32 bits parity
-    // 8 bits size (number of bits in the trace entry, not number of bytes)
-    // y Bytes data
-
-    rsamples += iSamples;
-    trace[traceLen++] = ((rsamples >> 0) & 0xff);
-    trace[traceLen++] = ((rsamples >> 8) & 0xff);
-    trace[traceLen++] = ((rsamples >> 16) & 0xff);
-    trace[traceLen++] = ((rsamples >> 24) & 0xff);
-
-    if (!readerToTag) {
-        trace[traceLen - 1] |= 0x80;
-    }
-
-    trace[traceLen++] = ((dwParity >> 0) & 0xff);
-    trace[traceLen++] = ((dwParity >> 8) & 0xff);
-    trace[traceLen++] = ((dwParity >> 16) & 0xff);
-    trace[traceLen++] = ((dwParity >> 24) & 0xff);
-    trace[traceLen++] = iBits;
-
-    memcpy(trace + traceLen, btBytes, iLen);
-    traceLen += iLen;
-
-    return true;
-}
-
 // Emulator memory
 uint8_t emlSet(uint8_t *data, uint32_t offset, uint32_t length) {
     uint8_t *mem = BigBuf_get_EM_addr();
diff --git a/armsrc/BigBuf.h b/armsrc/BigBuf.h
index 995451b9b..bdd2003be 100644
--- a/armsrc/BigBuf.h
+++ b/armsrc/BigBuf.h
@@ -42,6 +42,5 @@ extern void set_tracing(bool enable);
 extern void set_tracelen(uint32_t value);
 extern bool get_tracing(void);
 extern bool RAMFUNC LogTrace(const uint8_t *btBytes, uint16_t iLen, uint32_t timestamp_start, uint32_t timestamp_end, uint8_t *parity, bool readerToTag);
-extern int LogTraceHitag(const uint8_t *btBytes, int iBits, int iSamples, uint32_t dwParity, int bReader);
 extern uint8_t emlSet(uint8_t *data, uint32_t offset, uint32_t length);
 #endif /* __BIGBUF_H */
diff --git a/armsrc/Makefile b/armsrc/Makefile
index 382407e1d..707325d41 100644
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -38,7 +38,7 @@ APP_CFLAGS = $(PLATFORM_DEFS) \
 			 -DWITH_ISO14443a \
 			 -DWITH_ICLASS \
 			 -DWITH_FELICA \
-			 -DWITH_HFSNOOP \
+			 -DWITH_HFSNIFF \
 			 -DWITH_LF_SAMYRUN \
 			 -fno-strict-aliasing -ffunction-sections -fdata-sections
 
@@ -60,7 +60,7 @@ APP_CFLAGS = $(PLATFORM_DEFS) \
 
 
 SRC_LCD = fonts.c LCD.c
-SRC_LF = lfops.c hitag2.c hitagS.c lfsampling.c pcf7931.c lfdemod.c
+SRC_LF = lfops.c hitag2_crypto.c hitag2.c hitagS.c lfsampling.c pcf7931.c lfdemod.c
 SRC_ISO15693 = iso15693.c iso15693tools.c
 #SRC_ISO14443a = iso14443a.c mifareutil.c mifarecmd.c epa.c mifaresim.c
 SRC_ISO14443a = iso14443a.c mifareutil.c mifarecmd.c epa.c
diff --git a/armsrc/Standalone/hf_mattyrun.c b/armsrc/Standalone/hf_mattyrun.c
index bf4b71d61..8cac76c35 100644
--- a/armsrc/Standalone/hf_mattyrun.c
+++ b/armsrc/Standalone/hf_mattyrun.c
@@ -433,4 +433,4 @@ void RunMod() {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/armsrc/Standalone/hf_mattyrun.h b/armsrc/Standalone/hf_mattyrun.h
index 8b33e67c5..6602eba54 100644
--- a/armsrc/Standalone/hf_mattyrun.h
+++ b/armsrc/Standalone/hf_mattyrun.h
@@ -20,4 +20,4 @@
 
 #define OPTS 2
 
-#endif /* __HF_MATTYRUN_H */
\ No newline at end of file
+#endif /* __HF_MATTYRUN_H */
diff --git a/armsrc/Standalone/hf_young.c b/armsrc/Standalone/hf_young.c
index 99af4ef1e..4b7a87e99 100644
--- a/armsrc/Standalone/hf_young.c
+++ b/armsrc/Standalone/hf_young.c
@@ -259,4 +259,4 @@ void RunMod() {
             LED(selected + 1, 0);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/armsrc/Standalone/hf_young.h b/armsrc/Standalone/hf_young.h
index 46c0d1361..dcd8b13e7 100644
--- a/armsrc/Standalone/hf_young.h
+++ b/armsrc/Standalone/hf_young.h
@@ -19,4 +19,4 @@
 
 #define OPTS 2
 
-#endif /* __HF_YOUNG_H */
\ No newline at end of file
+#endif /* __HF_YOUNG_H */
diff --git a/armsrc/Standalone/lf_hidbrute.h b/armsrc/Standalone/lf_hidbrute.h
index bc1cf2e31..49b0af6c6 100644
--- a/armsrc/Standalone/lf_hidbrute.h
+++ b/armsrc/Standalone/lf_hidbrute.h
@@ -21,4 +21,4 @@
 
 void hid_corporate_1000_calculate_checksum_and_set(uint32_t *high, uint32_t *low, uint32_t cardnum, uint32_t fc);
 
-#endif /* __LF_HIDBRUTE_H */
\ No newline at end of file
+#endif /* __LF_HIDBRUTE_H */
diff --git a/armsrc/Standalone/lf_proxbrute.c b/armsrc/Standalone/lf_proxbrute.c
index ea1bd1f6f..178ce98fb 100644
--- a/armsrc/Standalone/lf_proxbrute.c
+++ b/armsrc/Standalone/lf_proxbrute.c
@@ -164,4 +164,4 @@ void RunMod() {
 out:
     DbpString("[=] exiting");
     LEDsoff();
-}
\ No newline at end of file
+}
diff --git a/armsrc/Standalone/lf_proxbrute.h b/armsrc/Standalone/lf_proxbrute.h
index 3911fee35..3a9e1ce29 100644
--- a/armsrc/Standalone/lf_proxbrute.h
+++ b/armsrc/Standalone/lf_proxbrute.h
@@ -18,4 +18,4 @@
 
 #define OPTS 2
 
-#endif /* __LF_PROXBRUTE_H */
\ No newline at end of file
+#endif /* __LF_PROXBRUTE_H */
diff --git a/armsrc/Standalone/lf_samyrun.c b/armsrc/Standalone/lf_samyrun.c
index ec0e4d19e..b4530fa2f 100644
--- a/armsrc/Standalone/lf_samyrun.c
+++ b/armsrc/Standalone/lf_samyrun.c
@@ -138,4 +138,4 @@ void RunMod() {
 out:
     DbpString("[=] exiting");
     LEDsoff();
-}
\ No newline at end of file
+}
diff --git a/armsrc/Standalone/lf_samyrun.h b/armsrc/Standalone/lf_samyrun.h
index cf21e1261..52c0bb942 100644
--- a/armsrc/Standalone/lf_samyrun.h
+++ b/armsrc/Standalone/lf_samyrun.h
@@ -19,4 +19,4 @@
 
 #define OPTS 2
 
-#endif /* __LF_SAMYRUN_H */
\ No newline at end of file
+#endif /* __LF_SAMYRUN_H */
diff --git a/armsrc/Standalone/standalone.h b/armsrc/Standalone/standalone.h
index 53d5ff13d..980bcbf46 100644
--- a/armsrc/Standalone/standalone.h
+++ b/armsrc/Standalone/standalone.h
@@ -16,4 +16,4 @@
 
 extern void RunMod();
 
-#endif /* __STANDALONE_H */
\ No newline at end of file
+#endif /* __STANDALONE_H */
diff --git a/armsrc/aes.c b/armsrc/aes.c
index 61a8da76b..f8a36f28c 100644
--- a/armsrc/aes.c
+++ b/armsrc/aes.c
@@ -1167,4 +1167,4 @@ int main() {
 
     return 0;
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/armsrc/aes.h b/armsrc/aes.h
index afe7e5e4e..aa9f0c582 100644
--- a/armsrc/aes.h
+++ b/armsrc/aes.h
@@ -31,4 +31,4 @@ int AesCtxIni(AesCtx *pCtx, unsigned char *pIV, unsigned char *pKey, unsigned in
 int AesEncrypt(AesCtx *pCtx, unsigned char *pData, unsigned char *pCipher, unsigned int DataLen);
 int AesDecrypt(AesCtx *pCtx, unsigned char *pCipher, unsigned char *pData, unsigned int CipherLen);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index dbe20b2b7..aecfee076 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -650,8 +650,8 @@ void UsbPacketReceived(uint8_t *packet, int len) {
         case CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K:
             ModThenAcquireRawAdcSamples125k(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
             break;
-        case CMD_LF_SNOOP_RAW_ADC_SAMPLES: {
-            uint32_t bits = SnoopLF();
+        case CMD_LF_SNIFF_RAW_ADC_SAMPLES: {
+            uint32_t bits = SniffLF();
             cmd_send(CMD_ACK, bits, 0, 0, 0, 0);
             break;
         }
@@ -664,13 +664,13 @@ void UsbPacketReceived(uint8_t *packet, int len) {
             CmdHIDsimTAG(c->arg[0], c->arg[1], 1);
             break;
         case CMD_FSK_SIM_TAG:
-            CmdFSKsimTAG(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+            CmdFSKsimTAG(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes, 1);
             break;
         case CMD_ASK_SIM_TAG:
-            CmdASKsimTag(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+            CmdASKsimTag(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes, 1);
             break;
         case CMD_PSK_SIM_TAG:
-            CmdPSKsimTag(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+            CmdPSKsimTag(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes, 1);
             break;
         case CMD_HID_CLONE_TAG:
             CopyHIDtoT55x7(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes[0]);
@@ -765,8 +765,8 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 #endif
 
 #ifdef WITH_HITAG
-        case CMD_SNOOP_HITAG: // Eavesdrop Hitag tag, args = type
-            SnoopHitag(c->arg[0]);
+        case CMD_SNIFF_HITAG: // Eavesdrop Hitag tag, args = type
+            SniffHitag(c->arg[0]);
             break;
         case CMD_SIMULATE_HITAG: // Simulate Hitag tag, args = memory content
             SimulateHitagTag((bool)c->arg[0], (byte_t *)c->d.asBytes);
@@ -786,7 +786,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
         case CMD_WR_HITAG_S: //writer for Hitag tags args=data to write,page and key or challenge
             if ((hitag_function)c->arg[0] < 10) {
                 WritePageHitagS((hitag_function)c->arg[0], (hitag_data *)c->d.asBytes, c->arg[2]);
-            } else if ((hitag_function)c->arg[0] >= 10) {
+            } else {
                 WriterHitag((hitag_function)c->arg[0], (hitag_data *)c->d.asBytes, c->arg[2]);
             }
             break;
@@ -843,7 +843,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
         case CMD_READ_SRI_TAG:
             ReadSTMemoryIso14443b(c->arg[0]);
             break;
-        case CMD_SNOOP_ISO_14443B:
+        case CMD_SNIFF_ISO_14443B:
             SniffIso14443b();
             break;
         case CMD_SIMULATE_TAG_ISO_14443B:
@@ -862,7 +862,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
         case CMD_FELICA_LITE_SIM:
             felica_sim_lite(c->arg[0]);
             break;
-        case CMD_FELICA_SNOOP:
+        case CMD_FELICA_SNIFF:
             felica_sniff(c->arg[0], c->arg[1]);
             break;
         case CMD_FELICA_LITE_DUMP:
@@ -871,7 +871,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 #endif
 
 #ifdef WITH_ISO14443a
-        case CMD_SNOOP_ISO_14443a:
+        case CMD_SNIFF_ISO_14443a:
             SniffIso14443a(c->arg[0]);
             break;
         case CMD_READER_ISO_14443a:
@@ -1003,7 +1003,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 
 #ifdef WITH_ICLASS
         // Makes use of ISO14443a FPGA Firmware
-        case CMD_SNOOP_ICLASS:
+        case CMD_SNIFF_ICLASS:
             SniffIClass();
             break;
         case CMD_SIMULATE_TAG_ICLASS:
@@ -1043,9 +1043,9 @@ void UsbPacketReceived(uint8_t *packet, int len) {
             break;
 #endif
 
-#ifdef WITH_HFSNOOP
+#ifdef WITH_HFSNIFF
         case CMD_HF_SNIFFER:
-            HfSnoop(c->arg[0], c->arg[1]);
+            HfSniff(c->arg[0], c->arg[1]);
             break;
 #endif
 
@@ -1322,10 +1322,12 @@ void UsbPacketReceived(uint8_t *packet, int len) {
                     // first mem page
                     res = Flash_WriteDataCont(startidx, data, first_len);
 
+                    isok = (res == first_len) ? 1 : 0;
+
                     // second mem page
                     res = Flash_WriteDataCont(startidx + first_len, data + first_len, len - first_len);
 
-                    isok = (res == (len - first_len)) ? 1 : 0;
+                    isok &= (res == (len - first_len)) ? 1 : 0;
 
                 } else {
                     res = Flash_WriteDataCont(startidx, data, len);
@@ -1389,6 +1391,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
             FlashStop();
 
             cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
+            BigBuf_free();
             LED_B_OFF();
             break;
         }
diff --git a/armsrc/apps.h b/armsrc/apps.h
index 36c865900..62fce3931 100644
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -85,9 +85,9 @@ void SimulateTagLowFrequency(int period, int gap, int ledcontrol);
 void SimulateTagLowFrequencyBidir(int divisor, int max_bitlen);
 void CmdHIDsimTAGEx(uint32_t hi, uint32_t lo, int ledcontrol, int numcycles);
 void CmdHIDsimTAG(uint32_t hi, uint32_t lo, int ledcontrol);
-void CmdFSKsimTAG(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream);
-void CmdASKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream);
-void CmdPSKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream);
+void CmdFSKsimTAG(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream, int ledcontrol);
+void CmdASKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream, int ledcontrol);
+void CmdPSKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream, int ledcontrol);
 void CmdHIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol);
 void CmdAWIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol); // Realtime demodulation mode for AWID26
 void CmdEM410xdemod(int findone, uint32_t *high, uint64_t *low, int ledcontrol);
@@ -222,24 +222,12 @@ void iClass_Dump(uint8_t blockno, uint8_t numblks);
 void iClass_Clone(uint8_t startblock, uint8_t endblock, uint8_t *data);
 void iClass_ReadCheck(uint8_t blockNo, uint8_t keyType);
 
-// hitag2.h
-void SnoopHitag(uint32_t type);
-void SimulateHitagTag(bool tag_mem_supplied, byte_t *data);
-void ReaderHitag(hitag_function htf, hitag_data *htd);
-void WriterHitag(hitag_function htf, hitag_data *htd, int page);
-
-//hitagS.h
-void SimulateHitagSTag(bool tag_mem_supplied, byte_t *data);
-void ReadHitagS(hitag_function htf, hitag_data *htd);
-void WritePageHitagS(hitag_function htf, hitag_data *htd, int page);
-void check_challenges(bool file_given, byte_t *data);
-
 // cmd.h
 uint8_t cmd_receive(UsbCommand *cmd);
 uint8_t cmd_send(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
 
 // util.h
-void HfSnoop(int, int);
+void HfSniff(int, int);
 
 //felica.c
 extern void felica_sendraw(UsbCommand *c);
diff --git a/armsrc/buzzer.c b/armsrc/buzzer.c
index 27d0cd12a..708b7d3f7 100644
--- a/armsrc/buzzer.c
+++ b/armsrc/buzzer.c
@@ -83,4 +83,4 @@ void Ring_Little_Star(uint16_t count) {
     Ring_BEE_TIME(note_1,2*count);
     LED_B_ON();
     */
-}
\ No newline at end of file
+}
diff --git a/armsrc/desfire_crypto.c b/armsrc/desfire_crypto.c
index 0a23305fd..fd3f30d0d 100644
--- a/armsrc/desfire_crypto.c
+++ b/armsrc/desfire_crypto.c
@@ -630,4 +630,4 @@ void mifare_cypher_blocks_chained(desfiretag_t tag, desfirekey_t key, uint8_t *i
         mifare_cypher_single_block(key, data + offset, ivect, direction, operation, block_size);
         offset += block_size;
     }
-}
\ No newline at end of file
+}
diff --git a/armsrc/desfire_key.c b/armsrc/desfire_key.c
index a723a203e..e1f880c8b 100644
--- a/armsrc/desfire_key.c
+++ b/armsrc/desfire_key.c
@@ -152,4 +152,4 @@ void Desfire_session_key_new(const uint8_t rnda[], const uint8_t rndb[], desfire
             Desfire_aes_key_new(buffer, key);
             break;
     }
-}
\ No newline at end of file
+}
diff --git a/armsrc/desfire_key.h b/armsrc/desfire_key.h
index adbda9c42..4fc02854e 100644
--- a/armsrc/desfire_key.h
+++ b/armsrc/desfire_key.h
@@ -17,4 +17,4 @@ void Desfire_aes_key_new_with_version(const uint8_t value[16], uint8_t version,
 uint8_t Desfire_key_get_version(desfirekey_t key);
 void Desfire_key_set_version(desfirekey_t key, uint8_t version);
 void Desfire_session_key_new(const uint8_t rnda[], const uint8_t rndb[], desfirekey_t authkey, desfirekey_t key);
-#endif
\ No newline at end of file
+#endif
diff --git a/armsrc/epa.c b/armsrc/epa.c
index 95de11550..521bb3f69 100644
--- a/armsrc/epa.c
+++ b/armsrc/epa.c
@@ -305,6 +305,11 @@ void EPA_PACE_Collect_Nonce(UsbCommand *c) {
     // initiate the PACE protocol
     // use the CAN for the password since that doesn't change
     func_return = EPA_PACE_MSE_Set_AT(pace_version_info, 2);
+    // check if the command succeeded
+    if (func_return != 0) {
+        EPA_PACE_Collect_Nonce_Abort(4, func_return);
+        return;
+    }
 
     // now get the nonce
     uint8_t nonce[256] = {0};
@@ -312,7 +317,7 @@ void EPA_PACE_Collect_Nonce(UsbCommand *c) {
     func_return = EPA_PACE_Get_Nonce(requested_size, nonce);
     // check if the command succeeded
     if (func_return < 0) {
-        EPA_PACE_Collect_Nonce_Abort(4, func_return);
+        EPA_PACE_Collect_Nonce_Abort(5, func_return);
         return;
     }
 
diff --git a/armsrc/felica.c b/armsrc/felica.c
index 3aa3c282d..190960bd4 100644
--- a/armsrc/felica.c
+++ b/armsrc/felica.c
@@ -544,7 +544,7 @@ void felica_sniff(uint32_t samplesToSkip, uint32_t triggersToSkip) {
 
     int remFrames = (samplesToSkip) ? samplesToSkip : 0;
 
-    Dbprintf("Snoop FelicaLiteS: Getting first %d frames, Skipping %d triggers.\n", samplesToSkip, triggersToSkip);
+    Dbprintf("Sniff FelicaLiteS: Getting first %d frames, Skipping %d triggers.\n", samplesToSkip, triggersToSkip);
 
     iso18092_setup(FPGA_HF_ISO18092_FLAG_NOMOD);
 
diff --git a/armsrc/flashmem.h b/armsrc/flashmem.h
index 4af499d3a..f4258a11b 100644
--- a/armsrc/flashmem.h
+++ b/armsrc/flashmem.h
@@ -151,4 +151,4 @@ void Flashmem_print_status(void);
 
 
 
-#endif
\ No newline at end of file
+#endif
diff --git a/armsrc/hfsnoop.c b/armsrc/hfsnoop.c
index 4ec60d175..11ceff3d9 100644
--- a/armsrc/hfsnoop.c
+++ b/armsrc/hfsnoop.c
@@ -4,9 +4,9 @@
 #include "util.h"
 #include "usb_cdc.h" // for usb_poll_validate_length
 
-static void RAMFUNC optimizedSnoop(void);
+static void RAMFUNC optimizedSniff(void);
 
-static void RAMFUNC optimizedSnoop(void) {
+static void RAMFUNC optimizedSniff(void) {
     int n = BigBuf_max_traceLen() / sizeof(uint16_t); // take all memory
 
     uint16_t *dest = (uint16_t *)BigBuf_get_addr();
@@ -23,7 +23,7 @@ static void RAMFUNC optimizedSnoop(void) {
     set_tracelen(BigBuf_max_traceLen());
 }
 
-void HfSnoop(int samplesToSkip, int triggersToSkip) {
+void HfSniff(int samplesToSkip, int triggersToSkip) {
     BigBuf_free();
     BigBuf_Clear();
 
@@ -66,14 +66,14 @@ void HfSnoop(int samplesToSkip, int triggersToSkip) {
             if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY))
                 waitcount--;
         }
-        optimizedSnoop();
+        optimizedSniff();
         Dbprintf("Trigger kicked! Value: %d, Dumping Samples Hispeed now.", r);
     }
 
     //Resetting Frame mode (First set in fpgaloader.c)
     AT91C_BASE_SSC->SSC_RFMR = SSC_FRAME_MODE_BITS_IN_WORD(8) | AT91C_SSC_MSBF | SSC_FRAME_MODE_WORDS_PER_TRANSFER(0);
 
-    DbpString("HF Snoop end");
+    DbpString("HF Sniffing end");
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     LED_D_OFF();
 }
diff --git a/armsrc/hitag2.c b/armsrc/hitag2.c
index f328ccb0d..57200c701 100644
--- a/armsrc/hitag2.c
+++ b/armsrc/hitag2.c
@@ -3,46 +3,35 @@
 // at your option, any later version. See the LICENSE.txt file for the text of
 // the license.
 //-----------------------------------------------------------------------------
-// Hitag2 emulation (preliminary test version)
+// Hitag2 emulation
 //
 // (c) 2009 Henryk Plötz <henryk@ploetzli.ch>
 //-----------------------------------------------------------------------------
 // Hitag2 complete rewrite of the code
 // - Fixed modulation/encoding issues
 // - Rewrote code for transponder emulation
-// - Added snooping of transponder communication
+// - Added sniffing of transponder communication
 // - Added reader functionality
 //
 // (c) 2012 Roel Verdult
 //-----------------------------------------------------------------------------
+// Piwi, 2019
+// Iceman, 2019
 
+#include "hitag2.h"
+#include "hitag2_crypto.h"
+#include "hitag.h"
 #include "proxmark3.h"
 #include "apps.h"
 #include "util.h"
-#include "hitag2.h"
 #include "string.h"
 #include "BigBuf.h"
 
-static bool bQuiet;
 static bool bCrypto;
 static bool bAuthenticating;
 static bool bPwd;
 static bool bSuccessful;
 
-struct hitag2_tag {
-    uint32_t uid;
-    enum {
-        TAG_STATE_RESET      = 0x01,       // Just powered up, awaiting GetSnr
-        TAG_STATE_ACTIVATING = 0x02,       // In activation phase (password mode), sent UID, awaiting reader password
-        TAG_STATE_ACTIVATED  = 0x03,       // Activation complete, awaiting read/write commands
-        TAG_STATE_WRITING    = 0x04,       // In write command, awaiting sector contents to be written
-    } state;
-    unsigned int active_sector;
-    uint8_t crypto_active;
-    uint64_t cs;
-    uint8_t sectors[12][4];
-};
-
 static struct hitag2_tag tag = {
     .state = TAG_STATE_RESET,
     .sectors = {                         // Password mode:               | Crypto mode:
@@ -81,87 +70,6 @@ static uint8_t key[8];
 static uint8_t writedata[4];
 static uint64_t cipher_state;
 
-/* Following is a modified version of cryptolib.com/ciphers/hitag2/ */
-// Software optimized 48-bit Philips/NXP Mifare Hitag2 PCF7936/46/47/52 stream cipher algorithm by I.C. Wiener 2006-2007.
-// For educational purposes only.
-// No warranties or guarantees of any kind.
-// This code is released into the public domain by its author.
-
-// Basic macros:
-
-#define u8              uint8_t
-#define u32             uint32_t
-#define u64             uint64_t
-#define rev8(x)         ((((x)>>7)&1)+((((x)>>6)&1)<<1)+((((x)>>5)&1)<<2)+((((x)>>4)&1)<<3)+((((x)>>3)&1)<<4)+((((x)>>2)&1)<<5)+((((x)>>1)&1)<<6)+(((x)&1)<<7))
-#define rev16(x)        (rev8 (x)+(rev8 (x>> 8)<< 8))
-#define rev32(x)        (rev16(x)+(rev16(x>>16)<<16))
-#define rev64(x)        (rev32(x)+(rev32(x>>32)<<32))
-#define bit(x,n)        (((x)>>(n))&1)
-#define bit32(x,n)      ((((x)[(n)>>5])>>((n)))&1)
-#define inv32(x,i,n)    ((x)[(i)>>5]^=((u32)(n))<<((i)&31))
-#define rotl64(x, n)    ((((u64)(x))<<((n)&63))+(((u64)(x))>>((0-(n))&63)))
-
-// Single bit Hitag2 functions:
-#define i4(x,a,b,c,d)    ((u32)((((x)>>(a))&1)+(((x)>>(b))&1)*2+(((x)>>(c))&1)*4+(((x)>>(d))&1)*8))
-
-static const u32 ht2_f4a = 0x2C79;     // 0010 1100 0111 1001
-static const u32 ht2_f4b = 0x6671;     // 0110 0110 0111 0001
-static const u32 ht2_f5c = 0x7907287B; // 0111 1001 0000 0111 0010 1000 0111 1011
-
-static u32 _f20(const u64 x) {
-    u32 i5;
-
-    i5 = ((ht2_f4a >> i4(x, 1, 2, 4, 5)) & 1) * 1
-         + ((ht2_f4b >> i4(x, 7, 11, 13, 14)) & 1) * 2
-         + ((ht2_f4b >> i4(x, 16, 20, 22, 25)) & 1) * 4
-         + ((ht2_f4b >> i4(x, 27, 28, 30, 32)) & 1) * 8
-         + ((ht2_f4a >> i4(x, 33, 42, 43, 45)) & 1) * 16;
-
-    return (ht2_f5c >> i5) & 1;
-}
-
-static u64 _hitag2_init(const u64 key, const u32 serial, const u32 IV) {
-    u32 i;
-    u64 x = ((key & 0xFFFF) << 32) + serial;
-
-    for (i = 0; i < 32; i++) {
-        x >>= 1;
-        x += (u64)(_f20(x) ^ (((IV >> i) ^ (key >> (i + 16))) & 1)) << 47;
-    }
-    return x;
-}
-
-static u64 _hitag2_round(u64 *state) {
-    u64 x = *state;
-
-    x = (x >>  1) +
-        ((((x >>  0) ^ (x >>  2) ^ (x >>  3) ^ (x >>  6)
-           ^ (x >>  7) ^ (x >>  8) ^ (x >> 16) ^ (x >> 22)
-           ^ (x >> 23) ^ (x >> 26) ^ (x >> 30) ^ (x >> 41)
-           ^ (x >> 42) ^ (x >> 43) ^ (x >> 46) ^ (x >> 47)) & 1) << 47);
-
-    *state = x;
-    return _f20(x);
-}
-
-// "MIKRON"             =  O  N  M  I  K  R
-// Key                  = 4F 4E 4D 49 4B 52             - Secret 48-bit key
-// Serial               = 49 43 57 69                   - Serial number of the tag, transmitted in clear
-// Random               = 65 6E 45 72                   - Random IV, transmitted in clear
-//~28~DC~80~31  = D7 23 7F CE                   - Authenticator value = inverted first 4 bytes of the keystream
-
-// The code below must print out "D7 23 7F CE 8C D0 37 A9 57 49 C1 E6 48 00 8A B6".
-// The inverse of the first 4 bytes is sent to the tag to authenticate.
-// The rest is encrypted by XORing it with the subsequent keystream.
-
-static u32 _hitag2_byte(u64 *x) {
-    u32 i, c;
-    for (i = 0, c = 0; i < 8; i++) {
-        c += (u32) _hitag2_round(x) << (i ^ 7);
-    }
-    return c;
-}
-
 static int hitag2_reset(void) {
     tag.state = TAG_STATE_RESET;
     tag.crypto_active = 0;
@@ -173,48 +81,13 @@ static int hitag2_init(void) {
     return 0;
 }
 
-static void hitag2_cipher_reset(struct hitag2_tag *tag, const uint8_t *iv) {
-    uint64_t key = ((uint64_t)tag->sectors[2][2]) |
-                   ((uint64_t)tag->sectors[2][3] << 8) |
-                   ((uint64_t)tag->sectors[1][0] << 16) |
-                   ((uint64_t)tag->sectors[1][1] << 24) |
-                   ((uint64_t)tag->sectors[1][2] << 32) |
-                   ((uint64_t)tag->sectors[1][3] << 40);
-    uint32_t uid = ((uint32_t)tag->sectors[0][0]) |
-                   ((uint32_t)tag->sectors[0][1] << 8) |
-                   ((uint32_t)tag->sectors[0][2] << 16) |
-                   ((uint32_t)tag->sectors[0][3] << 24);
-    uint32_t iv_ = (((uint32_t)(iv[0]))) |
-                   (((uint32_t)(iv[1])) << 8) |
-                   (((uint32_t)(iv[2])) << 16) |
-                   (((uint32_t)(iv[3])) << 24);
-    tag->cs = _hitag2_init(rev64(key), rev32(uid), rev32(iv_));
-}
-
-static int hitag2_cipher_authenticate(uint64_t *cs, const uint8_t *authenticator_is) {
-    uint8_t authenticator_should[4];
-    authenticator_should[0] = ~_hitag2_byte(cs);
-    authenticator_should[1] = ~_hitag2_byte(cs);
-    authenticator_should[2] = ~_hitag2_byte(cs);
-    authenticator_should[3] = ~_hitag2_byte(cs);
-    return (memcmp(authenticator_should, authenticator_is, 4) == 0);
-}
-
-static int hitag2_cipher_transcrypt(uint64_t *cs, uint8_t *data, unsigned int bytes, unsigned int bits) {
-    int i;
-    for (i = 0; i < bytes; i++) data[i] ^= _hitag2_byte(cs);
-    for (i = 0; i < bits; i++) data[bytes] ^= _hitag2_round(cs) << (7 - i);
-    return 0;
-}
-
 // Sam7s has several timers, we will use the source TIMER_CLOCK1 (aka AT91C_TC_CLKS_TIMER_DIV1_CLOCK)
 // TIMER_CLOCK1 = MCK/2, MCK is running at 48 MHz, Timer is running at 48/2 = 24 MHz
 // Hitag units (T0) have duration of 8 microseconds (us), which is 1/125000 per second (carrier)
 // T0 = TIMER_CLOCK1 / 125000 = 192
+#ifndef T0
 #define T0               192
-
-#define SHORT_COIL()     LOW(GPIO_SSC_DOUT)
-#define OPEN_COIL()      HIGH(GPIO_SSC_DOUT)
+#endif
 
 #define HITAG_FRAME_LEN  20
 #define HITAG_T_STOP     36 /* T_EOF should be > 36 */
@@ -241,7 +114,6 @@ static int hitag2_cipher_transcrypt(uint64_t *cs, uint8_t *data, unsigned int by
 #define HITAG_T_TAG_CAPTURE_THREE_HALF  41
 #define HITAG_T_TAG_CAPTURE_FOUR_HALF   57
 
-
 static void hitag_send_bit(int bit) {
     LED_A_ON();
     // Reset clock for the next bit
@@ -279,7 +151,6 @@ static void hitag_send_frame(const uint8_t *frame, size_t frame_len) {
     LOW(GPIO_SSC_DOUT);
 }
 
-
 static void hitag2_handle_reader_command(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t *txlen) {
     uint8_t rx_air[HITAG_FRAME_LEN];
 
@@ -398,8 +269,8 @@ static void hitag2_handle_reader_command(uint8_t *rx, const size_t rxlen, uint8_
         break;
     }
 
-// LogTraceHitag(rx,rxlen,0,0,false);
-// LogTraceHitag(tx,*txlen,0,0,true);
+// LogTrace(rx, nbytes(rxlen), 0, 0, NULL, false);
+// LogTrace(tx, nbytes(txlen), 0, 0, NULL, true);
 
     if (tag.crypto_active) {
         hitag2_cipher_transcrypt(&(tag.cs), tx, *txlen / 8, *txlen % 8);
@@ -419,7 +290,6 @@ static void hitag_reader_send_bit(int bit) {
 
     // Wait for 4-10 times the carrier period
     while (AT91C_BASE_TC0->TC_CV < T0 * 6);
-    // SpinDelayUs(8*8);
 
     // Disable modulation, just activates the field again
     LOW(GPIO_SSC_DOUT);
@@ -435,7 +305,6 @@ static void hitag_reader_send_bit(int bit) {
     LED_A_OFF();
 }
 
-
 static void hitag_reader_send_frame(const uint8_t *frame, size_t frame_len) {
     // Send the content of the frame
     for (size_t i = 0; i < frame_len; i++) {
@@ -605,8 +474,8 @@ static bool hitag2_crypto(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t *
                 if (!bCrypto) {
                     uint64_t ui64key = key[0] | ((uint64_t)key[1]) << 8 | ((uint64_t)key[2]) << 16 | ((uint64_t)key[3]) << 24 | ((uint64_t)key[4]) << 32 | ((uint64_t)key[5]) << 40;
                     uint32_t ui32uid = rx[0] | ((uint32_t)rx[1]) << 8 | ((uint32_t)rx[2]) << 16 | ((uint32_t)rx[3]) << 24;
-                    Dbprintf("hitag2_crypto: key=0x%x%x uid=0x%x", (uint32_t)((rev64(ui64key)) >> 32), (uint32_t)((rev64(ui64key)) & 0xffffffff), rev32(ui32uid));
-                    cipher_state = _hitag2_init(rev64(ui64key), rev32(ui32uid), 0);
+                    Dbprintf("hitag2_crypto: key=0x%x%x uid=0x%x", (uint32_t)((REV64(ui64key)) >> 32), (uint32_t)((REV64(ui64key)) & 0xffffffff), REV32(ui32uid));
+                    cipher_state = _hitag2_init(REV64(ui64key), REV32(ui32uid), 0);
                     memset(tx, 0x00, 4);
                     memset(tx + 4, 0xff, 4);
                     hitag2_cipher_transcrypt(&cipher_state, tx + 4, 4, 0);
@@ -801,7 +670,10 @@ static bool hitag2_read_uid(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t
     return true;
 }
 
-void SnoopHitag(uint32_t type) {
+void SniffHitag(uint32_t type) {
+
+    StopTicks();
+
     int frame_count;
     int response;
     int overflow;
@@ -814,12 +686,8 @@ void SnoopHitag(uint32_t type) {
     size_t rxlen = 0;
 
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-
-    // free eventually allocated BigBuf memory
     BigBuf_free();
     BigBuf_Clear_ext(false);
-
-    // Clean up trace and prepare it for storing frames
     clear_trace();
     set_tracing(true);
 
@@ -829,19 +697,18 @@ void SnoopHitag(uint32_t type) {
     auth_table = (uint8_t *)BigBuf_malloc(AUTH_TABLE_LENGTH);
     memset(auth_table, 0x00, AUTH_TABLE_LENGTH);
 
-    DbpString("Starting Hitag2 snoop");
+    DbpString("Starting Hitag2 sniffing");
     LED_D_ON();
 
     // Set up eavesdropping mode, frequency divisor which will drive the FPGA
     // and analog mux selection.
     FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT  | FPGA_LF_EDGE_DETECT_TOGGLE_MODE);
-    FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
+    FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95);
     SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
-    RELAY_OFF();
 
     // Configure output pin that is connected to the FPGA (for modulating)
-    AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
-    AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
+    AT91C_BASE_PIOA->PIO_OER |= GPIO_SSC_DOUT;
+    AT91C_BASE_PIOA->PIO_PER |= GPIO_SSC_DOUT;
 
     // Disable modulation, we are going to eavesdrop, not modulate ;)
     LOW(GPIO_SSC_DOUT);
@@ -853,14 +720,16 @@ void SnoopHitag(uint32_t type) {
     // Disable timer during configuration
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 
-    // Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
+    // TC1: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
     // external trigger rising edge, load RA on rising edge of TIOA.
-    uint32_t t1_channel_mode = AT91C_TC_CLKS_TIMER_DIV1_CLOCK | AT91C_TC_ETRGEDG_BOTH | AT91C_TC_ABETRG | AT91C_TC_LDRA_BOTH;
-    AT91C_BASE_TC1->TC_CMR = t1_channel_mode;
+    AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK | AT91C_TC_ETRGEDG_BOTH | AT91C_TC_ABETRG | AT91C_TC_LDRA_BOTH;
 
     // Enable and reset counter
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
+    // synchronized startup procedure
+    while (AT91C_BASE_TC1->TC_CV > 0) {}; // wait until TC0 returned to zero
+
     // Reset the received frame, frame count and timing info
     memset(rx, 0x00, sizeof(rx));
     frame_count = 0;
@@ -971,10 +840,7 @@ void SnoopHitag(uint32_t type) {
         // Check if frame was captured
         if (rxlen > 0) {
             frame_count++;
-            if (!LogTraceHitag(rx, rxlen, response, 0, reader_frame)) {
-                DbpString("Trace full");
-                break;
-            }
+            LogTrace(rx, nbytes(rxlen), response, 0, NULL, reader_frame);
 
             // Check if we recognize a valid authentication attempt
             if (nbytes(rxlen) == 8) {
@@ -1005,49 +871,46 @@ void SnoopHitag(uint32_t type) {
         // Reset the timer to restart while-loop that receives frames
         AT91C_BASE_TC1->TC_CCR = AT91C_TC_SWTRG;
     }
-    LED_A_ON();
-    LED_B_OFF();
-    LED_C_OFF();
-    LED_D_OFF();
+    LEDsoff();
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    set_tracing(false);
+
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
-    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-    LED_A_OFF();
-    set_tracing(false);
-// Dbprintf("frame received: %d",frame_count);
-// Dbprintf("Authentication Attempts: %d",(auth_table_len/8));
-// DbpString("All done");
+
+    // release allocated memory from BigBuff.
+    BigBuf_free();
+    StartTicks();
+
+    DbpString("Hitag2 sniffing end,  use `lf hitag list` for annotations");
 }
 
 void SimulateHitagTag(bool tag_mem_supplied, uint8_t *data) {
-    int frame_count;
-    int response;
-    int overflow;
+
+    StopTicks();
+
+    int frame_count = 0, response = 0, overflow = 0;
     uint8_t rx[HITAG_FRAME_LEN];
     size_t rxlen = 0;
     uint8_t tx[HITAG_FRAME_LEN];
     size_t txlen = 0;
-    bool bQuitTraceFull = false;
-    bQuiet = false;
 
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-
-    // free eventually allocated BigBuf memory
     BigBuf_free();
     BigBuf_Clear_ext(false);
-
-    // Clean up trace and prepare it for storing frames
     clear_trace();
     set_tracing(true);
 
     auth_table_len = 0;
     auth_table_pos = 0;
-    uint8_t *auth_table;
-
-    auth_table = (uint8_t *)BigBuf_malloc(AUTH_TABLE_LENGTH);
+    uint8_t *auth_table = BigBuf_malloc(AUTH_TABLE_LENGTH);
     memset(auth_table, 0x00, AUTH_TABLE_LENGTH);
 
+    // Reset the received frame, frame count and timing info
+    memset(rx, 0x00, sizeof(rx));
+
     DbpString("Starting Hitag2 simulation");
+
     LED_D_ON();
     hitag2_init();
 
@@ -1068,41 +931,41 @@ void SimulateHitagTag(bool tag_mem_supplied, uint8_t *data) {
     // Set up simulator mode, frequency divisor which will drive the FPGA
     // and analog mux selection.
     FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT);
-    SpinDelay(50);
     FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
     SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
-    RELAY_OFF();
 
     // Configure output pin that is connected to the FPGA (for modulating)
-    AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
-    AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
+    AT91C_BASE_PIOA->PIO_OER |= GPIO_SSC_DOUT;
+    AT91C_BASE_PIOA->PIO_PER |= GPIO_SSC_DOUT;
 
     // Disable modulation at default, which means release resistance
     LOW(GPIO_SSC_DOUT);
 
-    // Enable Peripheral Clock for TIMER_CLOCK0, used to measure exact timing before answering
-    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC0);
+    // Enable Peripheral Clock for
+    //   TIMER_CLOCK0, used to measure exact timing before answering
+    //   TIMER_CLOCK1, used to capture edges of the tag frames
+    AT91C_BASE_PMC->PMC_PCER |= (1 << AT91C_ID_TC0) | (1 << AT91C_ID_TC1);
 
-    // Enable Peripheral Clock for TIMER_CLOCK1, used to capture edges of the reader frames
-    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC1);
     AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
 
     // Disable timer during configuration
+    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 
-    // Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
+    // TC0: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), no triggers
+    AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK;
+
+    // TC1: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
     // external trigger rising edge, load RA on rising edge of TIOA.
     AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK | AT91C_TC_ETRGEDG_RISING | AT91C_TC_ABETRG | AT91C_TC_LDRA_RISING;
 
-    // Reset the received frame, frame count and timing info
-    memset(rx, 0x00, sizeof(rx));
-    frame_count = 0;
-    response = 0;
-    overflow = 0;
-
     // Enable and reset counter
+    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
+    // synchronized startup procedure
+    while (AT91C_BASE_TC1->TC_CV > 0); // wait until TC0 returned to zero
+
     while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
         // Watchdog hit
         WDT_HIT();
@@ -1144,16 +1007,7 @@ void SimulateHitagTag(bool tag_mem_supplied, uint8_t *data) {
         // Check if frame was captured
         if (rxlen > 4) {
             frame_count++;
-            if (!bQuiet) {
-                if (!LogTraceHitag(rx, rxlen, response, 0, true)) {
-                    DbpString("Trace full");
-                    if (bQuitTraceFull) {
-                        break;
-                    } else {
-                        bQuiet = true;
-                    }
-                }
-            }
+            LogTrace(rx, nbytes(rxlen), response, response, NULL, true);
 
             // Disable timer 1 with external trigger to avoid triggers during our own modulation
             AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
@@ -1170,19 +1024,8 @@ void SimulateHitagTag(bool tag_mem_supplied, uint8_t *data) {
 
             // Send and store the tag answer (if there is any)
             if (txlen) {
-                // Transmit the tag frame
                 hitag_send_frame(tx, txlen);
-                // Store the frame in the trace
-                if (!bQuiet) {
-                    if (!LogTraceHitag(tx, txlen, 0, 0, false)) {
-                        DbpString("Trace full");
-                        if (bQuitTraceFull) {
-                            break;
-                        } else {
-                            bQuiet = true;
-                        }
-                    }
-                }
+                LogTrace(tx, nbytes(txlen), 0, 0, NULL, false);
             }
 
             // Reset the received frame and response timing info
@@ -1200,17 +1043,25 @@ void SimulateHitagTag(bool tag_mem_supplied, uint8_t *data) {
         // Reset the timer to restart while-loop that receives frames
         AT91C_BASE_TC1->TC_CCR = AT91C_TC_SWTRG;
     }
-    LED_B_OFF();
-    LED_D_OFF();
+
+    LEDsoff();
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    set_tracing(false);
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
-    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+
+    // release allocated memory from BigBuff.
+    BigBuf_free();
+
+    StartTicks();
 
     DbpString("Sim Stopped");
-    set_tracing(false);
 }
 
 void ReaderHitag(hitag_function htf, hitag_data *htd) {
+
+    StopTicks();
+
     int frame_count = 0;
     int response = 0;
     uint8_t rx[HITAG_FRAME_LEN];
@@ -1233,7 +1084,6 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
             Dbprintf("List identifier in password mode");
             memcpy(password, htd->pwd.password, 4);
             blocknr = 0;
-            bQuiet = false;
             bPwd = false;
             break;
         }
@@ -1241,7 +1091,6 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
             DbpString("Authenticating using nr,ar pair:");
             memcpy(NrAr, htd->auth.NrAr, 8);
             Dbhexdump(8, NrAr, false);
-            bQuiet = false;
             bCrypto = false;
             bAuthenticating = false;
             break;
@@ -1251,7 +1100,6 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
             memcpy(key, htd->crypto.key, 6);  //HACK; 4 or 6??  I read both in the code.
             Dbhexdump(6, key, false);
             blocknr = 0;
-            bQuiet = false;
             bCrypto = false;
             bAuthenticating = false;
             break;
@@ -1260,13 +1108,11 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
             Dbprintf("Testing %d authentication attempts", (auth_table_len / 8));
             auth_table_pos = 0;
             memcpy(NrAr, auth_table, 8);
-            bQuiet = false;
             bCrypto = false;
             break;
         }
         case RHT2F_UID_ONLY: {
             blocknr = 0;
-            bQuiet = false;
             bCrypto = false;
             bAuthenticating = false;
             break;
@@ -1274,45 +1120,48 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
         default: {
             Dbprintf("Error, unknown function: %d", htf);
             set_tracing(false);
+            StartTicks();
             return;
         }
     }
 
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-    BigBuf_free();    
+    BigBuf_free();
     clear_trace();
     set_tracing(true);
 
     LED_D_ON();
     hitag2_init();
 
-    // Configure output and enable pin that is connected to the FPGA (for modulating)
-    AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
-    AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
 
     // Set fpga in edge detect with reader field, we can modulate as reader now
     FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_READER_FIELD);
     FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
     SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
-//    RELAY_OFF();
+
+    // Configure output and enable pin that is connected to the FPGA (for modulating)
+    AT91C_BASE_PIOA->PIO_OER |= GPIO_SSC_DOUT;
+    AT91C_BASE_PIOA->PIO_PER |= GPIO_SSC_DOUT;
 
     // Disable modulation at default, which means enable the field
     LOW(GPIO_SSC_DOUT);
 
-    // Give it a bit of time for the resonant antenna to settle.
-    SpinDelay(30);
+    // Enable Peripheral Clock for
+    //   TIMER_CLOCK0, used to measure exact timing before answering
+    //   TIMER_CLOCK1, used to capture edges of the tag frames
+    AT91C_BASE_PMC->PMC_PCER |= (1 << AT91C_ID_TC0) | (1 << AT91C_ID_TC1);
 
-    // Enable Peripheral Clock for TIMER_CLOCK0, used to measure exact timing before answering
-    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC0);
-
-    // Enable Peripheral Clock for TIMER_CLOCK1, used to capture edges of the tag frames
-    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC1);
+    // PIO_A - BSR
     AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
 
     // Disable timer during configuration
+    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 
-    // Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
+    // TC0: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), no triggers
+    AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK;
+
+    // TC1: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
     // external trigger rising edge, load RA on falling edge of TIOA.
     AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK | AT91C_TC_ETRGEDG_FALLING | AT91C_TC_ABETRG | AT91C_TC_LDRA_FALLING;
 
@@ -1320,36 +1169,36 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
+    // synchronized startup procedure
+    while (AT91C_BASE_TC0->TC_CV > 0) {}; // wait until TC0 returned to zero
+
     // Tag specific configuration settings (sof, timings, etc.)
     if (htf < 10) {
         // hitagS settings
         reset_sof = 1;
         t_wait = 200;
-        // DbpString("Configured for hitagS reader");
     } else if (htf < 20) {
         // hitag1 settings
         reset_sof = 1;
         t_wait = 200;
-        // DbpString("Configured for hitag1 reader");
     } else if (htf < 30) {
         // hitag2 settings
         reset_sof = 4;
         t_wait = HITAG_T_WAIT_2;
-        // DbpString("Configured for hitag2 reader");
     } else {
         Dbprintf("Error, unknown hitag reader type: %d", htf);
-                goto out;
+        goto out;
     }
     uint8_t attempt_count = 0;
-    
-    while (!bStop && !BUTTON_PRESS() && !usb_poll_validate_length() ) {
+
+    while (!bStop && !BUTTON_PRESS() && !usb_poll_validate_length()) {
 
         WDT_HIT();
 
         // Check if frame was captured and store it
         if (rxlen > 0) {
             frame_count++;
-            LogTraceHitag(rx, rxlen, response, 0, false);
+            LogTrace(rx, nbytes(rxlen), response, response, NULL, false);
         }
 
         // By default reset the transmission buffer
@@ -1376,7 +1225,7 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
                 attempt_count++; //attempt 3 times to get uid then quit
                 if (!bStop && attempt_count == 3)
                     bStop = true;
-                
+
                 break;
             }
             default: {
@@ -1405,7 +1254,7 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
         // Add transmitted frame to total count
         if (txlen > 0) {
             frame_count++;
-            LogTraceHitag(tx, txlen, HITAG_T_WAIT_2, 0, true);
+            LogTrace(tx, nbytes(txlen), HITAG_T_WAIT_2, HITAG_T_WAIT_2, NULL, true);
         }
 
         // Reset values for receiving frames
@@ -1474,14 +1323,19 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
             }
         }
     }
-    
-out:    
+
+out:
     LEDsoff();
-    AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
-    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     set_tracing(false);
 
+    AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
+    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
+
+    // release allocated memory from BigBuff.
+    BigBuf_free();
+    StartTicks();
+
     if (bSuccessful)
         cmd_send(CMD_ACK, bSuccessful, 0, 0, (uint8_t *)tag.sectors, 48);
     else
@@ -1489,8 +1343,10 @@ out:
 }
 
 void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
-    int frame_count;
-    int response;
+
+    StopTicks();
+
+    int frame_count = 0, response = 0;
     uint8_t rx[HITAG_FRAME_LEN];
     size_t rxlen = 0;
     uint8_t txbuf[HITAG_FRAME_LEN];
@@ -1502,17 +1358,13 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
     int tag_sof;
     int t_wait = HITAG_T_WAIT_MAX;
     bool bStop;
-    bool bQuitTraceFull = false;
 
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-    // Reset the return status
-    bSuccessful = false;
-
-    // Clean up trace and prepare it for storing frames
     set_tracing(true);
     clear_trace();
 
-    // DbpString("Starting Hitag reader family");
+    // Reset the return status
+    bSuccessful = false;
 
     // Check configuration
     switch (htf) {
@@ -1522,15 +1374,14 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
             memcpy(writedata, htd->crypto.data, 4);
             Dbhexdump(6, key, false);
             blocknr = page;
-            bQuiet = false;
             bCrypto = false;
             bAuthenticating = false;
-            bQuitTraceFull = true;
             writestate = WRITE_STATE_START;
         }
         break;
         default: {
             Dbprintf("Error, unknown function: %d", htf);
+            StartTicks();
             return;
         }
         break;
@@ -1540,44 +1391,45 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
     hitag2_init();
 
     // Configure output and enable pin that is connected to the FPGA (for modulating)
-    AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
-    AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
+    AT91C_BASE_PIOA->PIO_OER |= GPIO_SSC_DOUT;
+    AT91C_BASE_PIOA->PIO_PER |= GPIO_SSC_DOUT;
 
     // Set fpga in edge detect with reader field, we can modulate as reader now
     FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_READER_FIELD);
-
-    // Set Frequency divisor which will drive the FPGA and analog mux selection
     FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
     SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
-    RELAY_OFF();
 
     // Disable modulation at default, which means enable the field
     LOW(GPIO_SSC_DOUT);
 
-    // Give it a bit of time for the resonant antenna to settle.
-    SpinDelay(30);
+    // Enable Peripheral Clock for
+    //   TIMER_CLOCK0, used to measure exact timing before answering
+    //   TIMER_CLOCK1, used to capture edges of the tag frames
+    AT91C_BASE_PMC->PMC_PCER |= (1 << AT91C_ID_TC0) | (1 << AT91C_ID_TC1);
 
-    // Enable Peripheral Clock for TIMER_CLOCK0, used to measure exact timing before answering
-    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC0);
-
-    // Enable Peripheral Clock for TIMER_CLOCK1, used to capture edges of the tag frames
-    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC1);
     AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
 
     // Disable timer during configuration
+    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 
-    // Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
+    // TC0: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), no triggers
+    AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK;
+
+    // TC1: Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
     // external trigger rising edge, load RA on falling edge of TIOA.
-    AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK | AT91C_TC_ETRGEDG_FALLING | AT91C_TC_ABETRG | AT91C_TC_LDRA_FALLING;
+    AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK
+                             | AT91C_TC_ETRGEDG_FALLING
+                             | AT91C_TC_ABETRG
+                             | AT91C_TC_LDRA_FALLING;
 
     // Enable and reset counters
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
+    while (AT91C_BASE_TC0->TC_CV > 0) {};
+
     // Reset the received frame, frame count and timing info
-    frame_count = 0;
-    response = 0;
     lastbit = 1;
     bStop = false;
 
@@ -1586,38 +1438,27 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
         // hitagS settings
         reset_sof = 1;
         t_wait = 200;
-        // DbpString("Configured for hitagS reader");
     } else if (htf < 20) {
         // hitag1 settings
         reset_sof = 1;
         t_wait = 200;
-        // DbpString("Configured for hitag1 reader");
     } else if (htf < 30) {
         // hitag2 settings
         reset_sof = 4;
         t_wait = HITAG_T_WAIT_2;
-        // DbpString("Configured for hitag2 reader");
     } else {
         Dbprintf("Error, unknown hitag reader type: %d", htf);
         return;
     }
-    while (!bStop && !BUTTON_PRESS()) {
-        // Watchdog hit
+
+    while (!bStop && !BUTTON_PRESS() && !usb_poll_validate_length()) {
+
         WDT_HIT();
 
         // Check if frame was captured and store it
         if (rxlen > 0) {
             frame_count++;
-            if (!bQuiet) {
-                if (!LogTraceHitag(rx, rxlen, response, 0, false)) {
-                    DbpString("Trace full");
-                    if (bQuitTraceFull) {
-                        break;
-                    } else {
-                        bQuiet = true;
-                    }
-                }
-            }
+            LogTrace(rx, nbytes(rxlen), response, response, NULL, false);
         }
 
         // By default reset the transmission buffer
@@ -1643,9 +1484,7 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
         // falling edge occured halfway the period. with respect to this falling edge,
         // we need to wait (T_Wait2 + half_tag_period) when the last was a 'one'.
         // All timer values are in terms of T0 units
-        while (AT91C_BASE_TC0->TC_CV < T0 * (t_wait + (HITAG_T_TAG_HALF_PERIOD * lastbit)));
-
-        // Dbprintf("DEBUG: Sending reader frame");
+        while (AT91C_BASE_TC0->TC_CV < T0 * (t_wait + (HITAG_T_TAG_HALF_PERIOD * lastbit))) {};
 
         // Transmit the reader frame
         hitag_reader_send_frame(tx, txlen);
@@ -1656,16 +1495,7 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
         // Add transmitted frame to total count
         if (txlen > 0) {
             frame_count++;
-            if (!bQuiet) {
-                // Store the frame in the trace
-                if (!LogTraceHitag(tx, txlen, HITAG_T_WAIT_2, 0, true)) {
-                    if (bQuitTraceFull) {
-                        break;
-                    } else {
-                        bQuiet = true;
-                    }
-                }
-            }
+            LogTrace(tx, nbytes(txlen), HITAG_T_WAIT_2, HITAG_T_WAIT_2, NULL, true);
         }
 
         // Reset values for receiving frames
@@ -1675,7 +1505,6 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
         bSkip = true;
         tag_sof = reset_sof;
         response = 0;
-        // Dbprintf("DEBUG: Waiting to receive frame");
         uint32_t errorCount = 0;
 
         // Receive frame, watch for at most T0*EOF periods
@@ -1748,6 +1577,7 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
             }
             // if we saw over 100 wierd values break it probably isn't hitag...
             if (errorCount > 100) break;
+
             // We can break this loop if we received the last bit from a frame
             if (AT91C_BASE_TC1->TC_CV > T0 * HITAG_T_EOF) {
                 if (rxlen > 0) break;
@@ -1760,14 +1590,15 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
             while (AT91C_BASE_TC0->TC_CV < T0 * (HITAG_T_PROG - HITAG_T_WAIT_MAX));
         }
     }
-    // Dbprintf("DEBUG: Done waiting for frame");
 
-    LED_B_OFF();
-    LED_D_OFF();
+    LEDsoff();
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    set_tracing(false);
+
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
-    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-    // Dbprintf("frame received: %d",frame_count);
-    // DbpString("All done");
+
+    StartTicks();
+
     cmd_send(CMD_ACK, bSuccessful, 0, 0, (uint8_t *)tag.sectors, 48);
 }
diff --git a/armsrc/hitag2.h b/armsrc/hitag2.h
new file mode 100644
index 000000000..2260e5f8d
--- /dev/null
+++ b/armsrc/hitag2.h
@@ -0,0 +1,23 @@
+//-----------------------------------------------------------------------------
+// (c) 2012 Roel Verdult
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// Hitag2 type prototyping
+//-----------------------------------------------------------------------------
+
+#ifndef _HITAG2_H_
+#define _HITAG2_H_
+
+#include <stdint.h>
+#include <stdbool.h>
+#include "hitag.h"
+
+void SniffHitag(uint32_t type);
+void SimulateHitagTag(bool tag_mem_supplied, uint8_t *data);
+void ReaderHitag(hitag_function htf, hitag_data *htd);
+void WriterHitag(hitag_function htf, hitag_data *htd, int page);
+
+#endif
diff --git a/armsrc/hitag2_crypto.c b/armsrc/hitag2_crypto.c
new file mode 100644
index 000000000..7d1e10d87
--- /dev/null
+++ b/armsrc/hitag2_crypto.c
@@ -0,0 +1,116 @@
+//-----------------------------------------------------------------------------
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// Hitag2 Crypto
+//
+// (c) 2009 Henryk Plötz <henryk@ploetzli.ch>
+// (c) 2012 Roel Verdult
+// (c) 2019 Iceman
+//-----------------------------------------------------------------------------
+#include "hitag2_crypto.h"
+
+/* Following is a modified version of cryptolib.com/ciphers/hitag2/ */
+// Software optimized 48-bit Philips/NXP Mifare Hitag2 PCF7936/46/47/52 stream cipher algorithm by I.C. Wiener 2006-2007.
+// For educational purposes only.
+// No warranties or guarantees of any kind.
+// This code is released into the public domain by its author.
+
+// Single bit Hitag2 functions:
+#ifndef i4
+#define i4(x,a,b,c,d)    ((uint32_t)((((x)>>(a))&1)+(((x)>>(b))&1)*2+(((x)>>(c))&1)*4+(((x)>>(d))&1)*8))
+#endif
+
+static const uint32_t ht2_f4a = 0x2C79;     // 0010 1100 0111 1001
+static const uint32_t ht2_f4b = 0x6671;     // 0110 0110 0111 0001
+static const uint32_t ht2_f5c = 0x7907287B; // 0111 1001 0000 0111 0010 1000 0111 1011
+
+uint32_t _f20(const uint64_t x) {
+    uint32_t i5;
+
+    i5 = ((ht2_f4a >> i4(x, 1, 2, 4, 5)) & 1) * 1
+         + ((ht2_f4b >> i4(x, 7, 11, 13, 14)) & 1) * 2
+         + ((ht2_f4b >> i4(x, 16, 20, 22, 25)) & 1) * 4
+         + ((ht2_f4b >> i4(x, 27, 28, 30, 32)) & 1) * 8
+         + ((ht2_f4a >> i4(x, 33, 42, 43, 45)) & 1) * 16;
+
+    return (ht2_f5c >> i5) & 1;
+}
+
+uint64_t _hitag2_init(const uint64_t key, const uint32_t serial, const uint32_t IV) {
+    uint32_t i;
+    uint64_t x = ((key & 0xFFFF) << 32) + serial;
+
+    for (i = 0; i < 32; i++) {
+        x >>= 1;
+        x += (uint64_t)(_f20(x) ^ (((IV >> i) ^ (key >> (i + 16))) & 1)) << 47;
+    }
+    return x;
+}
+
+uint64_t _hitag2_round(uint64_t *state) {
+    uint64_t x = *state;
+
+    x = (x >>  1) +
+        ((((x >>  0) ^ (x >>  2) ^ (x >>  3) ^ (x >>  6)
+           ^ (x >>  7) ^ (x >>  8) ^ (x >> 16) ^ (x >> 22)
+           ^ (x >> 23) ^ (x >> 26) ^ (x >> 30) ^ (x >> 41)
+           ^ (x >> 42) ^ (x >> 43) ^ (x >> 46) ^ (x >> 47)) & 1) << 47);
+
+    *state = x;
+    return _f20(x);
+}
+
+// "MIKRON"             =  O  N  M  I  K  R
+// Key                  = 4F 4E 4D 49 4B 52             - Secret 48-bit key
+// Serial               = 49 43 57 69                   - Serial number of the tag, transmitted in clear
+// Random               = 65 6E 45 72                   - Random IV, transmitted in clear
+//~28~DC~80~31  = D7 23 7F CE                   - Authenticator value = inverted first 4 bytes of the keystream
+
+// The code below must print out "D7 23 7F CE 8C D0 37 A9 57 49 C1 E6 48 00 8A B6".
+// The inverse of the first 4 bytes is sent to the tag to authenticate.
+// The rest is encrypted by XORing it with the subsequent keystream.
+
+uint32_t _hitag2_byte(uint64_t *x) {
+    uint32_t i, c;
+    for (i = 0, c = 0; i < 8; i++) {
+        c += (uint32_t) _hitag2_round(x) << (i ^ 7);
+    }
+    return c;
+}
+
+void hitag2_cipher_reset(struct hitag2_tag *tag, const uint8_t *iv) {
+    uint64_t key = ((uint64_t)tag->sectors[2][2]) |
+                   ((uint64_t)tag->sectors[2][3] << 8) |
+                   ((uint64_t)tag->sectors[1][0] << 16) |
+                   ((uint64_t)tag->sectors[1][1] << 24) |
+                   ((uint64_t)tag->sectors[1][2] << 32) |
+                   ((uint64_t)tag->sectors[1][3] << 40);
+    uint32_t uid = ((uint32_t)tag->sectors[0][0]) |
+                   ((uint32_t)tag->sectors[0][1] << 8) |
+                   ((uint32_t)tag->sectors[0][2] << 16) |
+                   ((uint32_t)tag->sectors[0][3] << 24);
+    uint32_t iv_ = (((uint32_t)(iv[0]))) |
+                   (((uint32_t)(iv[1])) << 8) |
+                   (((uint32_t)(iv[2])) << 16) |
+                   (((uint32_t)(iv[3])) << 24);
+    tag->cs = _hitag2_init(REV64(key), REV32(uid), REV32(iv_));
+}
+
+int hitag2_cipher_authenticate(uint64_t *cs, const uint8_t *authenticator_is) {
+    uint8_t authenticator_should[4];
+    authenticator_should[0] = ~_hitag2_byte(cs);
+    authenticator_should[1] = ~_hitag2_byte(cs);
+    authenticator_should[2] = ~_hitag2_byte(cs);
+    authenticator_should[3] = ~_hitag2_byte(cs);
+    return (memcmp(authenticator_should, authenticator_is, 4) == 0);
+}
+
+int hitag2_cipher_transcrypt(uint64_t *cs, uint8_t *data, uint16_t bytes, uint16_t bits) {
+    int i;
+    for (i = 0; i < bytes; i++) data[i] ^= _hitag2_byte(cs);
+    for (i = 0; i < bits; i++) data[bytes] ^= _hitag2_round(cs) << (7 - i);
+    return 0;
+}
+
diff --git a/armsrc/hitag2_crypto.h b/armsrc/hitag2_crypto.h
new file mode 100644
index 000000000..8af1af412
--- /dev/null
+++ b/armsrc/hitag2_crypto.h
@@ -0,0 +1,36 @@
+#ifndef __HITAG2_CRYPTO_H
+#define __HITAG2_CRYPTO_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "string.h"
+#include "util.h"
+
+struct hitag2_tag {
+    uint32_t uid;
+    enum {
+        TAG_STATE_RESET      = 0x01,       // Just powered up, awaiting GetSnr
+        TAG_STATE_ACTIVATING = 0x02,       // In activation phase (password mode), sent UID, awaiting reader password
+        TAG_STATE_ACTIVATED  = 0x03,       // Activation complete, awaiting read/write commands
+        TAG_STATE_WRITING    = 0x04,       // In write command, awaiting sector contents to be written
+    } state;
+    uint16_t active_sector;
+    uint8_t crypto_active;
+    uint64_t cs;
+    uint8_t sectors[12][4];
+};
+
+extern uint32_t _f20(const uint64_t x);
+extern uint64_t _hitag2_init(const uint64_t key, const uint32_t serial, const uint32_t IV);
+extern uint64_t _hitag2_round(uint64_t *state);
+extern uint32_t _hitag2_byte(uint64_t *x);
+extern void hitag2_cipher_reset(struct hitag2_tag *tag, const uint8_t *iv);
+extern int hitag2_cipher_authenticate(uint64_t *cs, const uint8_t *authenticator_is);
+extern int hitag2_cipher_transcrypt(uint64_t *cs, uint8_t *data, uint16_t bytes, uint16_t bits) ;
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/armsrc/hitagS.c b/armsrc/hitagS.c
index b53112081..5fece9d26 100644
--- a/armsrc/hitagS.c
+++ b/armsrc/hitagS.c
@@ -10,109 +10,46 @@
 //-----------------------------------------------------------------------------
 // Some code was copied from Hitag2.c
 //-----------------------------------------------------------------------------
-#include <stdlib.h>
-#include "proxmark3.h"
-#include "apps.h"
-#include "util.h"
+
 #include "hitagS.h"
-#include "hitag2.h"
-#include "string.h"
-#include "BigBuf.h"
 
 #define CRC_PRESET 0xFF
 #define CRC_POLYNOM 0x1D
 
-#define u8              uint8_t
-#define u32             uint32_t
-#define u64             uint64_t
-#define rev8(x)         ((((x)>>7)&1)+((((x)>>6)&1)<<1)+((((x)>>5)&1)<<2)+((((x)>>4)&1)<<3)+((((x)>>3)&1)<<4)+((((x)>>2)&1)<<5)+((((x)>>1)&1)<<6)+(((x)&1)<<7))
-#define rev16(x)        (rev8 (x)+(rev8 (x>> 8)<< 8))
-#define rev32(x)        (rev16(x)+(rev16(x>>16)<<16))
-#define rev64(x)        (rev32(x)+(rev32(x>>32)<<32))
-#define bit(x,n)        (((x)>>(n))&1)
-#define bit32(x,n)      ((((x)[(n)>>5])>>((n)))&1)
-#define inv32(x,i,n)    ((x)[(i)>>5]^=((u32)(n))<<((i)&31))
-#define rotl64(x, n)    ((((u64)(x))<<((n)&63))+(((u64)(x))>>((0-(n))&63)))
-
 static bool bQuiet;
 static bool bSuccessful;
 static struct hitagS_tag tag;
 static byte_t page_to_be_written = 0;
 static int block_data_left = 0;
+
 typedef enum modulation {
     AC2K = 0,
     AC4K,
     MC4K,
     MC8K
 } MOD;
-static MOD m = AC2K;               //used modulation
+
+static MOD m = AC2K;               // used modulation
 static uint32_t temp_uid;
 static int temp2 = 0;
-static int sof_bits;               //number of start-of-frame bits
-static byte_t pwdh0, pwdl0, pwdl1; //password bytes
-static uint32_t rnd = 0x74124485;  //randomnumber
+static int sof_bits;               // number of start-of-frame bits
+static byte_t pwdh0, pwdl0, pwdl1; // password bytes
+static uint32_t rnd = 0x74124485;  // randomnumber
 static int test = 0;
 size_t blocknr;
 bool end = false;
 
-// Single bit Hitag2 functions:
-#define i4(x,a,b,c,d)       ((u32)((((x)>>(a))&1)+(((x)>>(b))&1)*2+(((x)>>(c))&1)*4+(((x)>>(d))&1)*8))
-static const u32 ht2_f4a = 0x2C79;            // 0010 1100 0111 1001
-static const u32 ht2_f4b = 0x6671;            // 0110 0110 0111 0001
-static const u32 ht2_f5c = 0x7907287B;        // 0111 1001 0000 0111 0010 1000 0111 1011
 #define ht2bs_4a(a,b,c,d)   (~(((a|b)&c)^(a|d)^b))
 #define ht2bs_4b(a,b,c,d)   (~(((d|c)&(a^b))^(d|a|b)))
 #define ht2bs_5c(a,b,c,d,e) (~((((((c^e)|d)&a)^b)&(c^b))^(((d^e)|a)&((d^b)|c))))
-#define uf20bs              u32
-
-static u32 f20(const u64 x) {
-    u32 i5;
-
-    i5 = ((ht2_f4a >> i4(x, 1, 2, 4, 5)) & 1) * 1
-         + ((ht2_f4b >> i4(x, 7, 11, 13, 14)) & 1) * 2
-         + ((ht2_f4b >> i4(x, 16, 20, 22, 25)) & 1) * 4
-         + ((ht2_f4b >> i4(x, 27, 28, 30, 32)) & 1) * 8
-         + ((ht2_f4a >> i4(x, 33, 42, 43, 45)) & 1) * 16;
-
-    return (ht2_f5c >> i5) & 1;
-}
-static u64 hitag2_round(u64 *state) {
-    u64 x = *state;
-
-    x = (x >> 1)
-        + ((((x >> 0) ^ (x >> 2) ^ (x >> 3) ^ (x >> 6) ^ (x >> 7) ^ (x >> 8)
-             ^ (x >> 16) ^ (x >> 22) ^ (x >> 23) ^ (x >> 26) ^ (x >> 30)
-             ^ (x >> 41) ^ (x >> 42) ^ (x >> 43) ^ (x >> 46) ^ (x >> 47))
-            & 1) << 47);
-
-    *state = x;
-    return f20(x);
-}
-static u64 hitag2_init(const u64 key, const u32 serial, const u32 IV) {
-    u32 i;
-    u64 x = ((key & 0xFFFF) << 32) + serial;
-    for (i = 0; i < 32; i++) {
-        x >>= 1;
-        x += (u64)(f20(x) ^ (((IV >> i) ^ (key >> (i + 16))) & 1)) << 47;
-    }
-    return x;
-}
-static u32 hitag2_byte(u64 *x) {
-    u32 i, c;
-
-    for (i = 0, c = 0; i < 8; i++)
-        c += (u32) hitag2_round(x) << (i ^ 7);
-    return c;
-}
 
 // Sam7s has several timers, we will use the source TIMER_CLOCK1 (aka AT91C_TC_CLKS_TIMER_DIV1_CLOCK)
 // TIMER_CLOCK1 = MCK/2, MCK is running at 48 MHz, Timer is running at 48/2 = 24 MHz
 // Hitag units (T0) have duration of 8 microseconds (us), which is 1/125000 per second (carrier)
 // T0 = TIMER_CLOCK1 / 125000 = 192
+#ifndef T0
 #define T0                             192
-
-#define SHORT_COIL()                   LOW(GPIO_SSC_DOUT)
-#define OPEN_COIL()                    HIGH(GPIO_SSC_DOUT)
+#endif
 
 #define HITAG_FRAME_LEN                20
 #define HITAG_T_STOP                   36  /* T_EOF should be > 36 */
@@ -258,100 +195,85 @@ static void hitag_send_bit(int bit) {
     }
 }
 
-static void hitag_send_frame(const byte_t *frame, size_t frame_len) {
-// Send start of frame
-
+static void hitag_send_frame(const uint8_t *frame, size_t frame_len) {
+    // SOF - send start of frame
     for (size_t i = 0; i < sof_bits; i++) {
         hitag_send_bit(1);
     }
 
-// Send the content of the frame
+    // Send the content of the frame
     for (size_t i = 0; i < frame_len; i++) {
         hitag_send_bit((frame[i / 8] >> (7 - (i % 8))) & 1);
     }
-// Drop the modulation
+
     LOW(GPIO_SSC_DOUT);
 }
 
 static void hitag_reader_send_bit(int bit) {
-//Dbprintf("BIT: %d",bit);
+
     LED_A_ON();
-// Reset clock for the next bit
+    // Reset clock for the next bit
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;
 
-// Binary puls length modulation (BPLM) is used to encode the data stream
-// This means that a transmission of a one takes longer than that of a zero
+    // Binary puls length modulation (BPLM) is used to encode the data stream
+    // This means that a transmission of a one takes longer than that of a zero
 
-// Enable modulation, which means, drop the the field
     HIGH(GPIO_SSC_DOUT);
+
     if (test == 1) {
         // Wait for 4-10 times the carrier period
         while (AT91C_BASE_TC0->TC_CV < T0 * 6) {};
 
-        // SpinDelayUs(8*8);
-
-        // Disable modulation, just activates the field again
         LOW(GPIO_SSC_DOUT);
 
         if (bit == 0) {
             // Zero bit: |_-|
             while (AT91C_BASE_TC0->TC_CV < T0 * 11) {};
-
-            // SpinDelayUs(16*8);
         } else {
             // One bit: |_--|
             while (AT91C_BASE_TC0->TC_CV < T0 * 14) {};
-
-            // SpinDelayUs(22*8);
         }
     } else {
         // Wait for 4-10 times the carrier period
         while (AT91C_BASE_TC0->TC_CV < T0 * 6) {};
 
-        // SpinDelayUs(8*8);
-
-        // Disable modulation, just activates the field again
         LOW(GPIO_SSC_DOUT);
 
         if (bit == 0) {
             // Zero bit: |_-|
             while (AT91C_BASE_TC0->TC_CV < T0 * 22) {};
-
-            // SpinDelayUs(16*8);
         } else {
             // One bit: |_--|
             while (AT91C_BASE_TC0->TC_CV < T0 * 28) {};
-
-            // SpinDelayUs(22*8);
         }
     }
 
     LED_A_OFF();
 }
 
-static void hitag_reader_send_frame(const byte_t *frame, size_t frame_len) {
-// Send the content of the frame
+static void hitag_reader_send_frame(const uint8_t *frame, size_t frame_len) {
+    // Send the content of the frame
     for (size_t i = 0; i < frame_len; i++) {
-        if (frame[0] == 0xf8) {
-            //Dbprintf("BIT: %d",(frame[i / 8] >> (7 - (i % 8))) & 1);
-        }
+//        if (frame[0] == 0xf8) {
+        //Dbprintf("BIT: %d",(frame[i / 8] >> (7 - (i % 8))) & 1);
+//        }
         hitag_reader_send_bit((frame[i / 8] >> (7 - (i % 8))) & 1);
     }
-// Send EOF
+    // send EOF
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;
-// Enable modulation, which means, drop the the field
+
     HIGH(GPIO_SSC_DOUT);
-// Wait for 4-10 times the carrier period
+
+    // Wait for 4-10 times the carrier period
     while (AT91C_BASE_TC0->TC_CV < T0 * 6) {};
 
-// Disable modulation, just activates the field again
     LOW(GPIO_SSC_DOUT);
 }
 
 /*
  * to check if the right uid was selected
  */
-static int check_select(byte_t *rx, uint32_t uid) {
+static int check_select(uint8_t *rx, uint32_t uid) {
     unsigned char resp[48];
     int i;
     uint32_t ans = 0x0;
@@ -359,31 +281,32 @@ static int check_select(byte_t *rx, uint32_t uid) {
         resp[i] = (rx[i / 8] >> (7 - (i % 8))) & 0x1;
     for (i = 0; i < 32; i++)
         ans += resp[5 + i] << (31 - i);
-    /*if (rx[0] == 0x01 && rx[1] == 0x15 && rx[2] == 0xc1 && rx[3] == 0x14
-     && rx[4] == 0x65 && rx[5] == 0x38)
-     Dbprintf("got uid %X", ans);*/
+
     temp_uid = ans;
     if (ans == tag.uid)
         return 1;
+
     return 0;
 }
 
 /*
  * handles all commands from a reader
  */
-static void hitagS_handle_reader_command(byte_t *rx, const size_t rxlen,
-                                         byte_t *tx, size_t *txlen) {
-    byte_t rx_air[HITAG_FRAME_LEN];
-    byte_t page;
+static void hitagS_handle_reader_command(uint8_t *rx, const size_t rxlen,
+                                         uint8_t *tx, size_t *txlen) {
+    uint8_t rx_air[HITAG_FRAME_LEN];
+    uint8_t page;
     int i;
-    u64 state;
+    uint64_t state;
     unsigned char crc;
 
-// Copy the (original) received frame how it is send over the air
+    // Copy the (original) received frame how it is send over the air
     memcpy(rx_air, rx, nbytes(rxlen));
-// Reset the transmission frame length
+
+    // Reset the transmission frame length
     *txlen = 0;
-// Try to find out which command was send by selecting on length (in bits)
+
+    // Try to find out which command was send by selecting on length (in bits)
     switch (rxlen) {
         case 5: {
             //UID request with a selected response protocol mode
@@ -452,11 +375,13 @@ static void hitagS_handle_reader_command(byte_t *rx, const size_t rxlen,
             Dbprintf("Challenge for UID: %X", temp_uid);
             temp2++;
             *txlen = 32;
-            state = hitag2_init(rev64(tag.key), rev32(tag.pages[0][0]),
-                                rev32(((rx[3] << 24) + (rx[2] << 16) + (rx[1] << 8) + rx[0])));
-            Dbprintf(
-                ",{0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X}",
-                rx[0], rx[1], rx[2], rx[3], rx[4], rx[5], rx[6], rx[7]);
+            state = _hitag2_init(REV64(tag.key),
+                                 REV32(tag.pages[0][0]),
+                                 REV32(((rx[3] << 24) + (rx[2] << 16) + (rx[1] << 8) + rx[0]))
+                                );
+            Dbprintf(",{0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X}",
+                     rx[0], rx[1], rx[2], rx[3], rx[4], rx[5], rx[6], rx[7]);
+
             switch (tag.mode) {
                 case HT_STANDARD:
                     sof_bits = 1;
@@ -475,12 +400,13 @@ static void hitagS_handle_reader_command(byte_t *rx, const size_t rxlen,
             }
 
             for (i = 0; i < 4; i++)
-                hitag2_byte(&state);
-            //send con2,pwdh0,pwdl0,pwdl1 encrypted as a response
-            tx[0] = hitag2_byte(&state) ^ ((tag.pages[0][1] >> 16) & 0xff);
-            tx[1] = hitag2_byte(&state) ^ tag.pwdh0;
-            tx[2] = hitag2_byte(&state) ^ tag.pwdl0;
-            tx[3] = hitag2_byte(&state) ^ tag.pwdl1;
+                _hitag2_byte(&state);
+
+            //send con2, pwdh0, pwdl0, pwdl1 encrypted as a response
+            tx[0] = _hitag2_byte(&state) ^ ((tag.pages[0][1] >> 16) & 0xff);
+            tx[1] = _hitag2_byte(&state) ^ tag.pwdh0;
+            tx[2] = _hitag2_byte(&state) ^ tag.pwdl0;
+            tx[3] = _hitag2_byte(&state) ^ tag.pwdl1;
             if (tag.mode != HT_STANDARD) {
                 //add crc8
                 *txlen = 40;
@@ -489,14 +415,12 @@ static void hitagS_handle_reader_command(byte_t *rx, const size_t rxlen,
                 calc_crc(&crc, tag.pwdh0, 8);
                 calc_crc(&crc, tag.pwdl0, 8);
                 calc_crc(&crc, tag.pwdl1, 8);
-                tx[4] = (crc ^ hitag2_byte(&state));
+                tx[4] = (crc ^ _hitag2_byte(&state));
             }
             /*
              * some readers do not allow to authenticate multiple times in a row with the same tag.
              * use this to change the uid between authentications.
-             */
 
-            /*
              if (temp2 % 2 == 0) {
              tag.uid = 0x11223344;
              tag.pages[0][0] = 0x44332211;
@@ -720,18 +644,17 @@ static void hitagS_handle_reader_command(byte_t *rx, const size_t rxlen,
 /*
  * to autenticate to a tag with the given key or challenge
  */
-static int hitagS_handle_tag_auth(hitag_function htf, uint64_t key, uint64_t NrAr, byte_t *rx, const size_t rxlen, byte_t *tx,
-                                  size_t *txlen) {
-    byte_t rx_air[HITAG_FRAME_LEN];
+static int hitagS_handle_tag_auth(hitag_function htf, uint64_t key, uint64_t NrAr, uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t *txlen) {
+    uint8_t rx_air[HITAG_FRAME_LEN];
     int response_bit[200];
     int i, j, z, k;
     unsigned char mask = 1;
     unsigned char uid[32];
-    byte_t uid1 = 0x00, uid2 = 0x00, uid3 = 0x00, uid4 = 0x00;
+    uint8_t uid1 = 0x00, uid2 = 0x00, uid3 = 0x00, uid4 = 0x00;
     unsigned char crc;
-    u64 state;
-    byte_t auth_ks[4];
-    byte_t conf_pages[3];
+    uint64_t state;
+    uint8_t auth_ks[4];
+    uint8_t conf_pages[3];
     memcpy(rx_air, rx, nbytes(rxlen));
     *txlen = 0;
 
@@ -757,16 +680,45 @@ static int hitagS_handle_tag_auth(hitag_function htf, uint64_t key, uint64_t NrA
             if (k > 31)
                 break;
         }
-        uid1 = (uid[0] << 7) | (uid[1] << 6) | (uid[2] << 5) | (uid[3] << 4)
-               | (uid[4] << 3) | (uid[5] << 2) | (uid[6] << 1) | uid[7];
-        uid2 = (uid[8] << 7) | (uid[9] << 6) | (uid[10] << 5) | (uid[11] << 4)
-               | (uid[12] << 3) | (uid[13] << 2) | (uid[14] << 1) | uid[15];
-        uid3 = (uid[16] << 7) | (uid[17] << 6) | (uid[18] << 5) | (uid[19] << 4)
-               | (uid[20] << 3) | (uid[21] << 2) | (uid[22] << 1) | uid[23];
-        uid4 = (uid[24] << 7) | (uid[25] << 6) | (uid[26] << 5) | (uid[27] << 4)
-               | (uid[28] << 3) | (uid[29] << 2) | (uid[30] << 1) | uid[31];
+        uid1 = (uid[0] << 7)
+               | (uid[1] << 6)
+               | (uid[2] << 5)
+               | (uid[3] << 4)
+               | (uid[4] << 3)
+               | (uid[5] << 2)
+               | (uid[6] << 1)
+               | uid[7];
+
+        uid2 = (uid[8] << 7)
+               | (uid[9] << 6)
+               | (uid[10] << 5)
+               | (uid[11] << 4)
+               | (uid[12] << 3)
+               | (uid[13] << 2)
+               | (uid[14] << 1)
+               | uid[15];
+
+        uid3 = (uid[16] << 7)
+               | (uid[17] << 6)
+               | (uid[18] << 5)
+               | (uid[19] << 4)
+               | (uid[20] << 3)
+               | (uid[21] << 2)
+               | (uid[22] << 1)
+               | uid[23];
+
+        uid4 = (uid[24] << 7)
+               | (uid[25] << 6)
+               | (uid[26] << 5)
+               | (uid[27] << 4)
+               | (uid[28] << 3)
+               | (uid[29] << 2)
+               | (uid[30] << 1)
+               | uid[31];
+
         if (DEBUG)
             Dbprintf("UID: %02X %02X %02X %02X", uid1, uid2, uid3, uid4);
+
         tag.uid = (uid4 << 24 | uid3 << 16 | uid2 << 8 | uid1);
 
         //select uid
@@ -777,29 +729,40 @@ static int hitagS_handle_tag_auth(hitag_function htf, uint64_t key, uint64_t NrA
         calc_crc(&crc, uid2, 8);
         calc_crc(&crc, uid3, 8);
         calc_crc(&crc, uid4, 8);
+
         for (i = 0; i < 100; i++) {
             response_bit[i] = 0;
         }
+
         for (i = 0; i < 5; i++) {
             response_bit[i] = 0;
         }
+
         for (i = 5; i < 37; i++) {
             response_bit[i] = uid[i - 5];
         }
+
         for (j = 0; j < 8; j++) {
             response_bit[i] = 0;
             if ((crc & ((mask << 7) >> j)) != 0)
                 response_bit[i] = 1;
             i++;
         }
+
         k = 0;
         for (i = 0; i < 6; i++) {
-            tx[i] = (response_bit[k] << 7) | (response_bit[k + 1] << 6)
-                    | (response_bit[k + 2] << 5) | (response_bit[k + 3] << 4)
-                    | (response_bit[k + 4] << 3) | (response_bit[k + 5] << 2)
-                    | (response_bit[k + 6] << 1) | response_bit[k + 7];
+            tx[i] = (response_bit[k] << 7)
+                    | (response_bit[k + 1] << 6)
+                    | (response_bit[k + 2] << 5)
+                    | (response_bit[k + 3] << 4)
+                    | (response_bit[k + 4] << 3)
+                    | (response_bit[k + 5] << 2)
+                    | (response_bit[k + 6] << 1)
+                    | response_bit[k + 7];
+
             k += 8;
         }
+
         tag.pstate = HT_INIT;
     } else if (tag.pstate == HT_INIT && rxlen == 44) {
         // received configuration after select command
@@ -847,18 +810,17 @@ static int hitagS_handle_tag_auth(hitag_function htf, uint64_t key, uint64_t NrA
         tag.LCK0 = response_bit[27];
 
         if (DEBUG)
-            Dbprintf("conf0: %02X conf1: %02X conf2: %02X", conf_pages[0],
-                     conf_pages[1], conf_pages[2]);
+            Dbprintf("conf0: %02X conf1: %02X conf2: %02X", conf_pages[0], conf_pages[1], conf_pages[2]);
+
         if (tag.auth == 1) {
             //if the tag is in authentication mode try the key or challenge
             *txlen = 64;
             if (end != true) {
                 if (htf == 02 || htf == 04) { //RHTS_KEY //WHTS_KEY
-                    state = hitag2_init(rev64(key), rev32(tag.uid),
-                                        rev32(rnd));
+                    state = _hitag2_init(REV64(key), REV32(tag.uid), REV32(rnd));
 
                     for (i = 0; i < 4; i++) {
-                        auth_ks[i] = hitag2_byte(&state) ^ 0xff;
+                        auth_ks[i] = _hitag2_byte(&state) ^ 0xff;
                     }
                     *txlen = 64;
                     tx[0] = rnd & 0xff;
@@ -906,21 +868,18 @@ static int hitagS_handle_tag_auth(hitag_function htf, uint64_t key, uint64_t NrA
         pwdl1 = 0;
         if (htf == 02 || htf == 04) { //RHTS_KEY //WHTS_KEY
             {
-                state = hitag2_init(rev64(key), rev32(tag.uid), rev32(rnd));
+                state = _hitag2_init(REV64(key), REV32(tag.uid), REV32(rnd));
                 for (i = 0; i < 5; i++)
-                    hitag2_byte(&state);
-                pwdh0 = ((rx[1] & 0x0f) * 16 + ((rx[2] & 0xf0) / 16))
-                        ^ hitag2_byte(&state);
-                pwdl0 = ((rx[2] & 0x0f) * 16 + ((rx[3] & 0xf0) / 16))
-                        ^ hitag2_byte(&state);
-                pwdl1 = ((rx[3] & 0x0f) * 16 + ((rx[4] & 0xf0) / 16))
-                        ^ hitag2_byte(&state);
+                    _hitag2_byte(&state);
+
+                pwdh0 = ((rx[1] & 0x0f) * 16 + ((rx[2] & 0xf0) / 16)) ^ _hitag2_byte(&state);
+                pwdl0 = ((rx[2] & 0x0f) * 16 + ((rx[3] & 0xf0) / 16)) ^ _hitag2_byte(&state);
+                pwdl1 = ((rx[3] & 0x0f) * 16 + ((rx[4] & 0xf0) / 16)) ^ _hitag2_byte(&state);
             }
 
             if (DEBUG)
                 Dbprintf("pwdh0 %02X pwdl0 %02X pwdl1 %02X", pwdh0, pwdl0, pwdl1);
 
-
             //Dbprintf("%X %02X", rnd, ((rx[4] & 0x0f) * 16) + ((rx[5] & 0xf0) / 16));
             //rnd += 1;
         }
@@ -933,18 +892,22 @@ static int hitagS_handle_tag_auth(hitag_function htf, uint64_t key, uint64_t NrA
 /*
  * Emulates a Hitag S Tag with the given data from the .hts file
  */
-void SimulateHitagSTag(bool tag_mem_supplied, byte_t *data) {
-    int frame_count;
-    int response;
-    int overflow;
+void SimulateHitagSTag(bool tag_mem_supplied, uint8_t *data) {
+
+    StopTicks();
+
+    int frame_count = 0, response = 0, overflow = 0;
     int i, j;
-    byte_t rx[HITAG_FRAME_LEN];
+    uint8_t rx[HITAG_FRAME_LEN];
     size_t rxlen = 0;
-    //bool bQuitTraceFull = false;
     bQuiet = false;
-    byte_t txbuf[HITAG_FRAME_LEN];
-    byte_t *tx = txbuf;
+    uint8_t txbuf[HITAG_FRAME_LEN];
+    uint8_t *tx = txbuf;
     size_t txlen = 0;
+
+    // Reset the received frame, frame count and timing info
+    memset(rx, 0x00, sizeof(rx));
+
     // free eventually allocated BigBuf memory
     BigBuf_free();
     BigBuf_Clear_ext(false);
@@ -958,16 +921,18 @@ void SimulateHitagSTag(bool tag_mem_supplied, byte_t *data) {
 
     tag.pstate = HT_READY;
     tag.tstate = HT_NO_OP;
+
     for (i = 0; i < 16; i++)
         for (j = 0; j < 4; j++)
             tag.pages[i][j] = 0x0;
-    //read tag data into memory
+
+    // read tag data into memory
     if (tag_mem_supplied) {
         DbpString("Loading hitagS memory...");
-        memcpy((byte_t *)tag.pages, data, 4 * 64);
+        memcpy((uint8_t *)tag.pages, data, 4 * 64);
     }
+
     tag.uid = (uint32_t)tag.pages[0];
-    Dbprintf("Hitag S simulation started");
     tag.key = (intptr_t)tag.pages[3];
     tag.key <<= 16;
     tag.key += ((tag.pages[2][0]) << 8) + tag.pages[2][1];
@@ -1017,48 +982,48 @@ void SimulateHitagSTag(bool tag_mem_supplied, byte_t *data) {
     if ((tag.pages[1][1] & 0x1) == 0x01)
         tag.LCK0 = 1;
 
-// Set up simulator mode, frequency divisor which will drive the FPGA
-// and analog mux selection.
+    // Set up simulator mode, frequency divisor which will drive the FPGA
+    // and analog mux selection.
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
     FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT);
-    SpinDelay(20);
     FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
     SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
-    RELAY_OFF();
 
-// Configure output pin that is connected to the FPGA (for modulating)
+    // Configure output pin that is connected to the FPGA (for modulating)
     AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
     AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
 
-// Disable modulation at default, which means release resistance
+    // Disable modulation at default, which means release resistance
     LOW(GPIO_SSC_DOUT);
 
-// Enable Peripheral Clock for TIMER_CLOCK0, used to measure exact timing before answering
-    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC0);
+    // Enable Peripheral Clock for
+    //   TIMER_CLOCK0, used to measure exact timing before answering
+    //   TIMER_CLOCK1, used to capture edges of the tag frames
+    AT91C_BASE_PMC->PMC_PCER |= (1 << AT91C_ID_TC0) | (1 << AT91C_ID_TC1);
 
-// Enable Peripheral Clock for TIMER_CLOCK1, used to capture edges of the reader frames
-    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC1);
     AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
 
-// Disable timer during configuration
+    // Disable timer during configuration
+    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 
-// Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
-// external trigger rising edge, load RA on rising edge of TIOA.
+    // TC0: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), no triggers
+    AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK;
+
+    // TC1: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
+    // external trigger rising edge, load RA on rising edge of TIOA.
     AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK
                              | AT91C_TC_ETRGEDG_RISING | AT91C_TC_ABETRG | AT91C_TC_LDRA_RISING;
 
-// Reset the received frame, frame count and timing info
-    memset(rx, 0x00, sizeof(rx));
-    frame_count = 0;
-    response = 0;
-    overflow = 0;
-
-// Enable and reset counter
+    // Enable and reset counter
+    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
-    while (!BUTTON_PRESS()) {
-        // Watchdog hit
+    // synchronized startup procedure
+    while (AT91C_BASE_TC0->TC_CV > 0); // wait until TC0 returned to zero
+
+    while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
+
         WDT_HIT();
 
         // Receive frame, watch for at most T0*EOF periods
@@ -1098,12 +1063,7 @@ void SimulateHitagSTag(bool tag_mem_supplied, byte_t *data) {
         // Check if frame was captured
         if (rxlen > 0) {
             frame_count++;
-            if (!bQuiet) {
-                if (!LogTraceHitag(rx, rxlen, response, 0, true)) {
-                    DbpString("Trace full");
-                    clear_trace();
-                }
-            }
+            LogTrace(rx, nbytes(rxlen), response, 0, NULL, true);
 
             // Disable timer 1 with external trigger to avoid triggers during our own modulation
             AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
@@ -1116,20 +1076,13 @@ void SimulateHitagSTag(bool tag_mem_supplied, byte_t *data) {
             // with respect to the falling edge, we need to wait actually (T_Wait1 - T_Low)
             // periods. The gap time T_Low varies (4..10). All timer values are in
             // terms of T0 units
-            while (AT91C_BASE_TC0->TC_CV < T0 * (HITAG_T_WAIT_1 - HITAG_T_LOW))
-                ;
+            while (AT91C_BASE_TC0->TC_CV < T0 * (HITAG_T_WAIT_1 - HITAG_T_LOW)) {};
 
             // Send and store the tag answer (if there is any)
             if (txlen > 0) {
                 // Transmit the tag frame
                 hitag_send_frame(tx, txlen);
-                // Store the frame in the trace
-                if (!bQuiet) {
-                    if (!LogTraceHitag(tx, txlen, 0, 0, false)) {
-                        DbpString("Trace full");
-                        clear_trace();
-                    }
-                }
+                LogTrace(tx, nbytes(txlen), 0, 0, NULL, false);
             }
 
             // Reset the received frame and response timing info
@@ -1147,11 +1100,19 @@ void SimulateHitagSTag(bool tag_mem_supplied, byte_t *data) {
         // Reset the timer to restart while-loop that receives frames
         AT91C_BASE_TC1->TC_CCR = AT91C_TC_SWTRG;
     }
-    LED_B_OFF();
-    LED_D_OFF();
+
+    LEDsoff();
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    set_tracing(false);
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
-    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+
+    // release allocated memory from BigBuff.
+    BigBuf_free();
+
+    StartTicks();
+
+    DbpString("Sim Stopped");
 }
 
 /*
@@ -1160,22 +1121,23 @@ void SimulateHitagSTag(bool tag_mem_supplied, byte_t *data) {
  * Reads every page of a hitag S transpoder.
  */
 void ReadHitagS(hitag_function htf, hitag_data *htd) {
+
+    StopTicks();
+
     int i, j, z, k;
-    int frame_count;
+    int frame_count = 0, response = 0;
     int response_bit[200];
-    int response;
-    byte_t rx[HITAG_FRAME_LEN];
+    uint8_t rx[HITAG_FRAME_LEN];
     size_t rxlen = 0;
-    byte_t txbuf[HITAG_FRAME_LEN];
-    byte_t *tx = txbuf;
+    uint8_t txbuf[HITAG_FRAME_LEN];
+    uint8_t *tx = txbuf;
     size_t txlen = 0;
-    int lastbit;
+    int lastbit = 1;
     bool bSkip;
-    int reset_sof;
+    int reset_sof = 1;
     int tag_sof;
     int t_wait = HITAG_T_WAIT_MAX;
     bool bStop = false;
-    bool bQuitTraceFull = false;
     int sendNum = 0;
     unsigned char mask = 1;
     unsigned char crc;
@@ -1183,31 +1145,31 @@ void ReadHitagS(hitag_function htf, hitag_data *htd) {
     page_to_be_written = 0;
 
     //read given key/challenge
-    byte_t NrAr_[8];
+    uint8_t NrAr_[8];
     uint64_t key = 0;
     uint64_t NrAr = 0;
-    byte_t key_[6];
+    uint8_t key_[6];
+
     switch (htf) {
-        case 01: { //RHTS_CHALLENGE
+        case RHTSF_CHALLENGE: {
             DbpString("Authenticating using nr,ar pair:");
             memcpy(NrAr_, htd->auth.NrAr, 8);
             Dbhexdump(8, NrAr_, false);
             NrAr = NrAr_[7] | ((uint64_t)NrAr_[6]) << 8 | ((uint64_t)NrAr_[5]) << 16 | ((uint64_t)NrAr_[4]) << 24 | ((uint64_t)NrAr_[3]) << 32 |
                    ((uint64_t)NrAr_[2]) << 40 | ((uint64_t)NrAr_[1]) << 48 | ((uint64_t)NrAr_[0]) << 56;
+            break;
         }
-        break;
-        case 02: { //RHTS_KEY
+        case RHTSF_KEY: {
             DbpString("Authenticating using key:");
             memcpy(key_, htd->crypto.key, 6);
             Dbhexdump(6, key_, false);
             key = key_[5] | ((uint64_t)key_[4]) << 8 | ((uint64_t)key_[3]) << 16 | ((uint64_t)key_[2]) << 24 | ((uint64_t)key_[1]) << 32 | ((uint64_t)key_[0]) << 40;
+            break;
         }
-        break;
         default: {
             Dbprintf("Error , unknown function: %d", htf);
             return;
         }
-        break;
     }
 
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
@@ -1219,40 +1181,36 @@ void ReadHitagS(hitag_function htf, hitag_data *htd) {
     clear_trace();
 
     bQuiet = false;
-    bQuitTraceFull = true;
 
     LED_D_ON();
 
-    // Configure output and enable pin that is connected to the FPGA (for modulating)
-    AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
-    AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
-
     // Set fpga in edge detect with reader field, we can modulate as reader now
-    FpgaWriteConfWord(
-        FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_READER_FIELD);
-
-    // Set Frequency divisor which will drive the FPGA and analog mux selection
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_READER_FIELD);
     FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
     SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
-    RELAY_OFF();
+
+    // Configure output and enable pin that is connected to the FPGA (for modulating)
+    AT91C_BASE_PIOA->PIO_OER |= GPIO_SSC_DOUT;
+    AT91C_BASE_PIOA->PIO_PER |= GPIO_SSC_DOUT;
 
     // Disable modulation at default, which means enable the field
     LOW(GPIO_SSC_DOUT);
 
-    // Give it a bit of time for the resonant antenna to settle.
-    SpinDelay(30);
+    // Enable Peripheral Clock for
+    //   TIMER_CLOCK0, used to measure exact timing before answering
+    //   TIMER_CLOCK1, used to capture edges of the tag frames
+    AT91C_BASE_PMC->PMC_PCER |= (1 << AT91C_ID_TC0) | (1 << AT91C_ID_TC1);
 
-    // Enable Peripheral Clock for TIMER_CLOCK0, used to measure exact timing before answering
-    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC0);
-
-    // Enable Peripheral Clock for TIMER_CLOCK1, used to capture edges of the tag frames
-    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC1);
     AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
 
     // Disable timer during configuration
+    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 
-    // Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
+    // TC0: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), no triggers
+    AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK;
+
+    // TC1: Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
     // external trigger rising edge, load RA on falling edge of TIOA.
     AT91C_BASE_TC1->TC_CMR =
         AT91C_TC_CLKS_TIMER_DIV1_CLOCK  |
@@ -1264,32 +1222,20 @@ void ReadHitagS(hitag_function htf, hitag_data *htd) {
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
-    // Reset the received frame, frame count and timing info
-    frame_count = 0;
-    response = 0;
-    lastbit = 1;
-    bStop = false;
+    // synchronized startup procedure
+    while (AT91C_BASE_TC0->TC_CV > 0); // wait until TC0 returned to zero
 
-    reset_sof = 1;
+    // Reset the received frame, frame count and timing info
     t_wait = 200;
 
-    while (!bStop && !BUTTON_PRESS()) {
-        // Watchdog hit
+    while (!bStop && !BUTTON_PRESS() && !usb_poll_validate_length())  {
+
         WDT_HIT();
 
         // Check if frame was captured and store it
         if (rxlen > 0) {
             frame_count++;
-            if (!bQuiet) {
-                if (!LogTraceHitag(rx, rxlen, response, 0, false)) {
-                    DbpString("Trace full");
-                    if (bQuitTraceFull) {
-                        break;
-                    } else {
-                        bQuiet = true;
-                    }
-                }
-            }
+            LogTrace(rx, nbytes(rxlen), response, 0, NULL, false);
         }
 
         // By default reset the transmission buffer
@@ -1299,13 +1245,14 @@ void ReadHitagS(hitag_function htf, hitag_data *htd) {
         if (rxlen == 0) {
             //start authentication
             txlen = 5;
-            memcpy(tx, "\xc0", nbytes(txlen));
+            memcpy(tx, "\xC0", nbytes(txlen));
             tag.pstate = HT_READY;
             tag.tstate = HT_NO_OP;
         } else if (tag.pstate != HT_SELECTED) {
             if (hitagS_handle_tag_auth(htf, key, NrAr, rx, rxlen, tx, &txlen) == -1)
                 bStop = !false;
         }
+
         if (tag.pstate == HT_SELECTED && tag.tstate == HT_NO_OP && rxlen > 0) {
             //send read request
             tag.tstate = HT_READING_PAGE;
@@ -1316,7 +1263,8 @@ void ReadHitagS(hitag_function htf, hitag_data *htd) {
             calc_crc(&crc, 0x00 + ((sendNum % 16) * 16), 4);
             tx[1] = 0x00 + ((sendNum % 16) * 16) + (crc / 16);
             tx[2] = 0x00 + (crc % 16) * 16;
-        } else if (tag.pstate == HT_SELECTED && tag.tstate == HT_READING_PAGE
+        } else if (tag.pstate == HT_SELECTED
+                   && tag.tstate == HT_READING_PAGE
                    && rxlen > 0) {
             //save received data
             z = 0;
@@ -1361,15 +1309,19 @@ void ReadHitagS(hitag_function htf, hitag_data *htd) {
             sendNum++;
             //display key and password if possible
             if (sendNum == 2 && tag.auth == 1 && tag.LKP) {
-                if (htf == 02) { //RHTS_KEY
+                if (htf == RHTSF_KEY) {
                     Dbprintf("Page[ 2]: %02X %02X %02X %02X",
-                             (byte_t)(key >> 8) & 0xff,
-                             (byte_t) key & 0xff, pwdl1, pwdl0);
+                             (uint8_t)(key >> 8) & 0xff,
+                             (uint8_t) key & 0xff,
+                             pwdl1,
+                             pwdl0
+                            );
                     Dbprintf("Page[ 3]: %02X %02X %02X %02X",
-                             (byte_t)(key >> 40) & 0xff,
-                             (byte_t)(key >> 32) & 0xff,
-                             (byte_t)(key >> 24) & 0xff,
-                             (byte_t)(key >> 16) & 0xff);
+                             (uint8_t)(key >> 40) & 0xff,
+                             (uint8_t)(key >> 32) & 0xff,
+                             (uint8_t)(key >> 24) & 0xff,
+                             (uint8_t)(key >> 16) & 0xff
+                            );
                 } else {
                     //if the authentication is done with a challenge the key and password are unknown
                     Dbprintf("Page[ 2]: __ __ __ __");
@@ -1410,17 +1362,7 @@ void ReadHitagS(hitag_function htf, hitag_data *htd) {
         // Add transmitted frame to total count
         if (txlen > 0) {
             frame_count++;
-            if (!bQuiet) {
-                // Store the frame in the trace
-                if (!LogTraceHitag(tx, txlen, HITAG_T_WAIT_2, 0, true)) {
-                    if (bQuitTraceFull) {
-                        DbpString("Trace full");
-                        break;
-                    } else {
-                        bQuiet = true;
-                    }
-                }
-            }
+            LogTrace(tx, nbytes(txlen), HITAG_T_WAIT_2, 0, NULL, true);
         }
 
         // Reset values for receiving frames
@@ -1491,12 +1433,17 @@ void ReadHitagS(hitag_function htf, hitag_data *htd) {
         }
     }
     end = false;
-    LED_B_OFF();
-    LED_D_OFF();
+
+    LEDsoff();
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    set_tracing(false);
+
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 
+    StartTicks();
+
     cmd_send(CMD_ACK, bSuccessful, 0, 0, 0, 0);
 }
 
@@ -1505,12 +1452,14 @@ void ReadHitagS(hitag_function htf, hitag_data *htd) {
  * Writes the given 32Bit data into page_
  */
 void WritePageHitagS(hitag_function htf, hitag_data *htd, int page_) {
-    int frame_count;
-    int response;
-    byte_t rx[HITAG_FRAME_LEN];
+
+    StopTicks();
+
+    int frame_count = 0, response = 0;
+    uint8_t rx[HITAG_FRAME_LEN];
     size_t rxlen = 0;
-    byte_t txbuf[HITAG_FRAME_LEN];
-    byte_t *tx = txbuf;
+    uint8_t txbuf[HITAG_FRAME_LEN];
+    uint8_t *tx = txbuf;
     size_t txlen = 0;
     int lastbit;
     bool bSkip;
@@ -1518,124 +1467,106 @@ void WritePageHitagS(hitag_function htf, hitag_data *htd, int page_) {
     int tag_sof;
     int t_wait = HITAG_T_WAIT_MAX;
     bool bStop;
-    bool bQuitTraceFull = false;
     int page = page_;
     unsigned char crc;
-    byte_t data[4] = {0, 0, 0, 0};
+    uint8_t data[4] = {0, 0, 0, 0};
+
+    FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
+
+    bSuccessful = false;
+
+    // Clean up trace and prepare it for storing frames
+    set_tracing(true);
+    clear_trace();
 
     //read given key/challenge, the page and the data
-    byte_t NrAr_[8];
+    uint8_t NrAr_[8];
     uint64_t key = 0;
     uint64_t NrAr = 0;
-    byte_t key_[6];
+    uint8_t key_[6];
     switch (htf) {
-        case 03: { //WHTS_CHALLENGE
+        case WHTSF_CHALLENGE: {
             memcpy(data, htd->auth.data, 4);
             DbpString("Authenticating using nr,ar pair:");
             memcpy(NrAr_, htd->auth.NrAr, 8);
             Dbhexdump(8, NrAr_, false);
             NrAr = NrAr_[7] | ((uint64_t)NrAr_[6]) << 8 | ((uint64_t)NrAr_[5]) << 16 | ((uint64_t)NrAr_[4]) << 24 | ((uint64_t)NrAr_[3]) << 32 |
                    ((uint64_t)NrAr_[2]) << 40 | ((uint64_t)NrAr_[1]) << 48 | ((uint64_t)NrAr_[0]) << 56;
+            break;
         }
-        break;
-        case 04: { //WHTS_KEY
+
+        case WHTSF_KEY: {
             memcpy(data, htd->crypto.data, 4);
             DbpString("Authenticating using key:");
             memcpy(key_, htd->crypto.key, 6);
             Dbhexdump(6, key_, false);
             key = key_[5] | ((uint64_t)key_[4]) << 8 | ((uint64_t)key_[3]) << 16 | ((uint64_t)key_[2]) << 24 | ((uint64_t)key_[1]) << 32 | ((uint64_t)key_[0]) << 40;
+            break;
         }
-        break;
         default: {
             Dbprintf("Error , unknown function: %d", htf);
             return;
         }
-        break;
     }
 
     Dbprintf("Page: %d", page_);
     Dbprintf("DATA: %02X %02X %02X %02X", data[0], data[1], data[2], data[3]);
-    FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-// Reset the return status
-    bSuccessful = false;
 
     tag.pstate = HT_READY;
     tag.tstate = HT_NO_OP;
 
-// Clean up trace and prepare it for storing frames
-    set_tracing(true);
-    clear_trace();
-
-    bQuiet = false;
-    bQuitTraceFull = true;
-
     LED_D_ON();
 
-// Configure output and enable pin that is connected to the FPGA (for modulating)
+    // Configure output and enable pin that is connected to the FPGA (for modulating)
     AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
     AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
 
-// Set fpga in edge detect with reader field, we can modulate as reader now
-    FpgaWriteConfWord(
-        FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_READER_FIELD);
-
-// Set Frequency divisor which will drive the FPGA and analog mux selection
+    // Set fpga in edge detect with reader field, we can modulate as reader now
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_READER_FIELD);
     FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
     SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
-    RELAY_OFF();
 
-// Disable modulation at default, which means enable the field
+    // Disable modulation at default, which means enable the field
     LOW(GPIO_SSC_DOUT);
 
-// Give it a bit of time for the resonant antenna to settle.
-    SpinDelay(30);
+    // Enable Peripheral Clock for
+    //   TIMER_CLOCK0, used to measure exact timing before answering
+    //   TIMER_CLOCK1, used to capture edges of the tag frames
+    AT91C_BASE_PMC->PMC_PCER |= (1 << AT91C_ID_TC0) | (1 << AT91C_ID_TC1);
 
-// Enable Peripheral Clock for TIMER_CLOCK0, used to measure exact timing before answering
-    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC0);
-
-// Enable Peripheral Clock for TIMER_CLOCK1, used to capture edges of the tag frames
-    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC1);
     AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
 
-// Disable timer during configuration
+    // Disable timer during configuration
+    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 
-// Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
-// external trigger rising edge, load RA on falling edge of TIOA.
+    // Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
+    // external trigger rising edge, load RA on falling edge of TIOA.
     AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK
-                             | AT91C_TC_ETRGEDG_FALLING | AT91C_TC_ABETRG
+                             | AT91C_TC_ETRGEDG_FALLING
+                             | AT91C_TC_ABETRG
                              | AT91C_TC_LDRA_FALLING;
 
-// Enable and reset counters
+    // Enable and reset counters
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
-// Reset the received frame, frame count and timing info
-    frame_count = 0;
-    response = 0;
+    while (AT91C_BASE_TC0->TC_CV > 0);
+
+    // Reset the received frame, frame count and timing info
     lastbit = 1;
     bStop = false;
-
     reset_sof = 1;
     t_wait = 200;
 
-    while (!bStop && !BUTTON_PRESS()) {
-        // Watchdog hit
+    while (!bStop && !BUTTON_PRESS() && !usb_poll_validate_length()) {
+
         WDT_HIT();
 
         // Check if frame was captured and store it
         if (rxlen > 0) {
             frame_count++;
-            if (!bQuiet) {
-                if (!LogTraceHitag(rx, rxlen, response, 0, false)) {
-                    DbpString("Trace full");
-                    if (bQuitTraceFull) {
-                        break;
-                    } else {
-                        bQuiet = true;
-                    }
-                }
-            }
+            LogTrace(rx, nbytes(rxlen), response, 0, NULL, false);
         }
 
         //check for valid input
@@ -1711,9 +1642,7 @@ void WritePageHitagS(hitag_function htf, hitag_data *htd, int page_) {
         // we need to wait (T_Wait2 + half_tag_period) when the last was a 'one'.
         // All timer values are in terms of T0 units
 
-        while (AT91C_BASE_TC0->TC_CV
-                < T0 * (t_wait + (HITAG_T_TAG_HALF_PERIOD * lastbit)))
-            ;
+        while (AT91C_BASE_TC0->TC_CV < T0 * (t_wait + (HITAG_T_TAG_HALF_PERIOD * lastbit))) {};
 
         // Transmit the reader frame
         hitag_reader_send_frame(tx, txlen);
@@ -1724,17 +1653,7 @@ void WritePageHitagS(hitag_function htf, hitag_data *htd, int page_) {
         // Add transmitted frame to total count
         if (txlen > 0) {
             frame_count++;
-            if (!bQuiet) {
-                // Store the frame in the trace
-                if (!LogTraceHitag(tx, txlen, HITAG_T_WAIT_2, 0, true)) {
-                    if (bQuitTraceFull) {
-                        DbpString("Trace full");
-                        break;
-                    } else {
-                        bQuiet = true;
-                    }
-                }
-            }
+            LogTrace(tx, nbytes(txlen), HITAG_T_WAIT_2, 0, NULL, true);
         }
 
         // Reset values for receiving frames
@@ -1744,6 +1663,7 @@ void WritePageHitagS(hitag_function htf, hitag_data *htd, int page_) {
         bSkip = true;
         tag_sof = reset_sof;
         response = 0;
+        uint32_t errorCount = 0;
 
         // Receive frame, watch for at most T0*EOF periods
         while (AT91C_BASE_TC1->TC_CV < T0 * HITAG_T_WAIT_MAX) {
@@ -1794,9 +1714,13 @@ void WritePageHitagS(hitag_function htf, hitag_data *htd, int page_) {
                     }
                 } else {
                     // Ignore wierd value, is to small to mean anything
+                    errorCount++;
                 }
             }
 
+            // if we saw over 100 wierd values break it probably isn't hitag...
+            if (errorCount > 100) break;
+
             // We can break this loop if we received the last bit from a frame
             if (AT91C_BASE_TC1->TC_CV > T0 * HITAG_T_EOF) {
                 if (rxlen > 0)
@@ -1805,11 +1729,15 @@ void WritePageHitagS(hitag_function htf, hitag_data *htd, int page_) {
         }
     }
     end = false;
-    LED_B_OFF();
-    LED_D_OFF();
+    LEDsoff();
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    set_tracing(false);
+
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
-    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+
+    StartTicks();
+
     cmd_send(CMD_ACK, bSuccessful, 0, 0, 0, 0);
 }
 
@@ -1820,17 +1748,16 @@ void WritePageHitagS(hitag_function htf, hitag_data *htd, int page_) {
  * is not received correctly due to Antenna problems. This function
  * detects these challenges.
  */
-void check_challenges(bool file_given, byte_t *data) {
+void check_challenges(bool file_given, uint8_t *data) {
     int i, j, z, k;
-    byte_t uid_byte[4];
-    int frame_count;
-    int response;
-    byte_t rx[HITAG_FRAME_LEN];
-    byte_t unlocker[60][8];
+    uint8_t uid_byte[4];
+    int frame_count = 0, response = 0;
+    uint8_t rx[HITAG_FRAME_LEN];
+    uint8_t unlocker[60][8];
     int u1 = 0;
     size_t rxlen = 0;
-    byte_t txbuf[HITAG_FRAME_LEN];
-    byte_t *tx = txbuf;
+    uint8_t txbuf[HITAG_FRAME_LEN];
+    uint8_t *tx = txbuf;
     size_t txlen = 0;
     int lastbit;
     bool bSkip;
@@ -1839,76 +1766,71 @@ void check_challenges(bool file_given, byte_t *data) {
     int t_wait = HITAG_T_WAIT_MAX;
     int STATE = 0;
     bool bStop;
-    bool bQuitTraceFull = false;
     int response_bit[200];
     unsigned char mask = 1;
     unsigned char uid[32];
     unsigned char crc;
 
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-// Reset the return status
+    // Reset the return status
     bSuccessful = false;
 
-// Clean up trace and prepare it for storing frames
+    // Clean up trace and prepare it for storing frames
     set_tracing(true);
     clear_trace();
 
     bQuiet = false;
-    bQuitTraceFull = true;
 
     LED_D_ON();
 
-// Configure output and enable pin that is connected to the FPGA (for modulating)
+    // Configure output and enable pin that is connected to the FPGA (for modulating)
     AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
     AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
 
-// Set fpga in edge detect with reader field, we can modulate as reader now
+    // Set fpga in edge detect with reader field, we can modulate as reader now
     FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_READER_FIELD);
-    SpinDelay(50);
-
-// Set Frequency divisor which will drive the FPGA and analog mux selection
     FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
     SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
-    RELAY_OFF();
 
-// Disable modulation at default, which means enable the field
+    // Disable modulation at default, which means enable the field
     LOW(GPIO_SSC_DOUT);
 
-// Give it a bit of time for the resonant antenna to settle.
-    SpinDelay(30);
+    // Enable Peripheral Clock for
+    //   TIMER_CLOCK0, used to measure exact timing before answering
+    //   TIMER_CLOCK1, used to capture edges of the tag frames
+    AT91C_BASE_PMC->PMC_PCER |= (1 << AT91C_ID_TC0) | (1 << AT91C_ID_TC1);
 
-// Enable Peripheral Clock for TIMER_CLOCK0, used to measure exact timing before answering
-    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC0);
-
-// Enable Peripheral Clock for TIMER_CLOCK1, used to capture edges of the tag frames
-    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC1);
     AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
 
-// Disable timer during configuration
+    // Disable timer during configuration
+    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 
-// Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
-// external trigger rising edge, load RA on falling edge of TIOA.
+    // TC0: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), no triggers
+    AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK;
+
+    // TC1:  Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
+    // external trigger rising edge, load RA on falling edge of TIOA.
     AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK
+                             | AT91C_TC_ETRGEDG_FALLING
+                             | AT91C_TC_ABETRG
+                             | AT91C_TC_LDRA_FALLING;
 
-                             | AT91C_TC_ETRGEDG_FALLING | AT91C_TC_ABETRG | AT91C_TC_LDRA_FALLING;
-
-// Enable and reset counters
+    // Enable and reset counters
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
-// Reset the received frame, frame count and timing info
-    frame_count = 0;
-    response = 0;
+    while (AT91C_BASE_TC0->TC_CV > 0) {};
+
+    // Reset the received frame, frame count and timing info
     lastbit = 1;
     bStop = false;
-
     reset_sof = 1;
     t_wait = 200;
 
     if (file_given) {
         DbpString("Loading challenges...");
-        memcpy((byte_t *)unlocker, data, 60 * 8);
+        memcpy((uint8_t *)unlocker, data, 60 * 8);
     }
 
     while (file_given && !bStop && !BUTTON_PRESS()) {
@@ -1918,16 +1840,7 @@ void check_challenges(bool file_given, byte_t *data) {
         // Check if frame was captured and store it
         if (rxlen > 0) {
             frame_count++;
-            if (!bQuiet) {
-                if (!LogTraceHitag(rx, rxlen, response, 0, false)) {
-                    DbpString("Trace full");
-                    if (bQuitTraceFull) {
-                        break;
-                    } else {
-                        bQuiet = true;
-                    }
-                }
-            }
+            LogTrace(rx, nbytes(rxlen), response, 0, NULL, false);
         }
 
         tx = txbuf;
@@ -1943,7 +1856,7 @@ void check_challenges(bool file_given, byte_t *data) {
             STATE = 0;
             txlen = 5;
             //start new authentication
-            memcpy(tx, "\xc0", nbytes(txlen));
+            memcpy(tx, "\xC0", nbytes(txlen));
         } else if (rxlen >= 67 && STATE == 0) {
             //received uid
             z = 0;
@@ -2043,9 +1956,7 @@ void check_challenges(bool file_given, byte_t *data) {
         // we need to wait (T_Wait2 + half_tag_period) when the last was a 'one'.
         // All timer values are in terms of T0 units
 
-        while (AT91C_BASE_TC0->TC_CV
-                < T0 * (t_wait + (HITAG_T_TAG_HALF_PERIOD * lastbit)))
-            ;
+        while (AT91C_BASE_TC0->TC_CV < T0 * (t_wait + (HITAG_T_TAG_HALF_PERIOD * lastbit))) {};
 
         // Transmit the reader frame
         hitag_reader_send_frame(tx, txlen);
@@ -2056,17 +1967,7 @@ void check_challenges(bool file_given, byte_t *data) {
         // Add transmitted frame to total count
         if (txlen > 0) {
             frame_count++;
-            if (!bQuiet) {
-                // Store the frame in the trace
-                if (!LogTraceHitag(tx, txlen, HITAG_T_WAIT_2, 0, true)) {
-                    if (bQuitTraceFull) {
-                        DbpString("Trace full");
-                        break;
-                    } else {
-                        bQuiet = true;
-                    }
-                }
-            }
+            LogTrace(tx, nbytes(txlen), HITAG_T_WAIT_2, 0, NULL, true);
         }
 
         // Reset values for receiving frames
@@ -2136,11 +2037,16 @@ void check_challenges(bool file_given, byte_t *data) {
             }
         }
     }
-    LED_B_OFF();
-    LED_D_OFF();
+
+    LEDsoff();
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    set_tracing(false);
+
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
-    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+
+    StartTicks();
+
     cmd_send(CMD_ACK, bSuccessful, 0, 0, 0, 0);
 }
 
diff --git a/armsrc/hitagS.h b/armsrc/hitagS.h
new file mode 100644
index 000000000..49a885c4c
--- /dev/null
+++ b/armsrc/hitagS.h
@@ -0,0 +1,31 @@
+//-----------------------------------------------------------------------------
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// HitagS emulation (preliminary test version)
+//
+// (c) 2016 Oguzhan Cicek, Hendrik Schwartke, Ralf Spenneberg
+//     <info@os-s.de>
+//-----------------------------------------------------------------------------
+
+#ifndef _HITAGS_H_
+#define _HITAGS_H_
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include "hitag2_crypto.h"
+#include "hitag.h"
+#include "proxmark3.h"
+#include "apps.h"
+#include "util.h"
+#include "string.h"
+#include "BigBuf.h"
+
+void SimulateHitagSTag(bool tag_mem_supplied, uint8_t *data);
+void ReadHitagS(hitag_function htf, hitag_data *htd);
+void WritePageHitagS(hitag_function htf, hitag_data *htd, int page);
+void check_challenges(bool file_given, uint8_t *data);
+
+#endif
diff --git a/armsrc/iclass.c b/armsrc/iclass.c
index 7bd725eab..1326306b1 100644
--- a/armsrc/iclass.c
+++ b/armsrc/iclass.c
@@ -18,7 +18,7 @@
 //
 // FIX:
 // ====
-// We still have sometimes a demodulation error when snooping iClass communication.
+// We still have sometimes a demodulation error when sniffing iClass communication.
 // The resulting trace of a read-block-03 command may look something like this:
 //
 //  +  22279:    :     0c  03  e8  01
@@ -2456,4 +2456,4 @@ void iClass_Clone(uint8_t startblock, uint8_t endblock, uint8_t *data) {
 
     cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
     switch_off();
-}
\ No newline at end of file
+}
diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index a22a79390..023eb02f9 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -2747,7 +2747,7 @@ void DetectNACKbug() {
     bool received_nack;
 
     // Mifare Classic's random generator repeats every 2^16 cycles (and so do the nonces).
-    uint32_t sync_cycles = PRNG_SEQUENCE_LENGTH;
+    int32_t sync_cycles = PRNG_SEQUENCE_LENGTH;
 
     BigBuf_free();
     BigBuf_Clear_ext(false);
diff --git a/armsrc/iso14443b.c b/armsrc/iso14443b.c
index 5b6a85477..5d988459b 100644
--- a/armsrc/iso14443b.c
+++ b/armsrc/iso14443b.c
@@ -1413,7 +1413,7 @@ static void iso1444b_setup_sniff(void) {
     FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
     BigBuf_free();
     BigBuf_Clear_ext(false);
-    clear_trace();//setup snoop
+    clear_trace();
     set_tracing(true);
 
     // Initialize Demod and Uart structs
@@ -1570,6 +1570,7 @@ void iso14b_set_trigger(bool enable) {
 void SendRawCommand14443B_Ex(UsbCommand *c) {
     iso14b_command_t param = c->arg[0];
     size_t len = c->arg[1] & 0xffff;
+    uint32_t timeout = c->arg[2];
     uint8_t *cmd = c->d.asBytes;
     uint8_t status = 0;
     uint32_t sendlen = sizeof(iso14b_card_select_t);
@@ -1586,6 +1587,9 @@ void SendRawCommand14443B_Ex(UsbCommand *c) {
         clear_trace();
     }
 
+    if ((param & ISO14B_SET_TIMEOUT))
+        iso14b_set_timeout(timeout);
+
     set_tracing(true);
 
     if ((param & ISO14B_SELECT_STD) == ISO14B_SELECT_STD) {
@@ -1634,4 +1638,4 @@ out:
         switch_off(); // disconnect raw
         SpinDelay(20);
     }
-}
\ No newline at end of file
+}
diff --git a/armsrc/iso15693.c b/armsrc/iso15693.c
index b6d53ccea..12e9cc815 100644
--- a/armsrc/iso15693.c
+++ b/armsrc/iso15693.c
@@ -621,8 +621,8 @@ void Iso15693InitReader(void) {
 
 // Encode (into the ToSend buffers) an identify request, which is the first
 // thing that you must send to a tag to get a response.
+// It expects "out" to be at least CMD_ID_RESP large
 static void BuildIdentifyRequest(uint8_t *out) {
-
     uint8_t cmd[CMD_ID_RESP] = {0, ISO15_CMD_INVENTORY, 0, 0, 0};
     // flags
     cmd[0] = ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | ISO15_REQ_INVENTORY | ISO15_REQINV_SLOT1;
@@ -665,6 +665,7 @@ static void BuildReadBlockRequest(uint8_t **out, uint8_t *uid, uint8_t blockNumb
 */
 
 // Now the VICC>VCD responses when we are simulating a tag
+// It expects "out" to be at least CMD_INV_RESP large
 static void BuildInventoryResponse(uint8_t *out, uint8_t *uid) {
 
     uint8_t cmd[CMD_INV_RESP] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
@@ -686,7 +687,7 @@ static void BuildInventoryResponse(uint8_t *out, uint8_t *uid) {
     // CRC
     AddCrc(cmd, 10);
     CodeIso15693AsReader(cmd, CMD_INV_RESP);
-    memcpy(out, cmd, CMD_ID_RESP);
+    memcpy(out, cmd, CMD_INV_RESP);
 }
 
 // Universal Method for sending to and recv bytes from a tag
@@ -739,50 +740,50 @@ void DbdecodeIso15693Answer(int len, uint8_t *d) {
 
     if (len > 3) {
         if (d[0] & (1 << 3))
-            strncat(status, "ProtExt ", DBD15STATLEN);
+            strncat(status, "ProtExt ", DBD15STATLEN - strlen(status));
         if (d[0] & 1) {
             // error
-            strncat(status, "Error ", DBD15STATLEN);
+            strncat(status, "Error ", DBD15STATLEN - strlen(status));
             switch (d[1]) {
                 case 0x01:
-                    strncat(status, "01: not supported", DBD15STATLEN);
+                    strncat(status, "01: not supported", DBD15STATLEN - strlen(status));
                     break;
                 case 0x02:
-                    strncat(status, "02: not recognized", DBD15STATLEN);
+                    strncat(status, "02: not recognized", DBD15STATLEN - strlen(status));
                     break;
                 case 0x03:
-                    strncat(status, "03: opt not supported", DBD15STATLEN);
+                    strncat(status, "03: opt not supported", DBD15STATLEN - strlen(status));
                     break;
                 case 0x0f:
-                    strncat(status, "0F: no info", DBD15STATLEN);
+                    strncat(status, "0F: no info", DBD15STATLEN - strlen(status));
                     break;
                 case 0x10:
-                    strncat(status, "10: dont exist", DBD15STATLEN);
+                    strncat(status, "10: dont exist", DBD15STATLEN - strlen(status));
                     break;
                 case 0x11:
-                    strncat(status, "11: lock again", DBD15STATLEN);
+                    strncat(status, "11: lock again", DBD15STATLEN - strlen(status));
                     break;
                 case 0x12:
-                    strncat(status, "12: locked", DBD15STATLEN);
+                    strncat(status, "12: locked", DBD15STATLEN - strlen(status));
                     break;
                 case 0x13:
-                    strncat(status, "13: program error", DBD15STATLEN);
+                    strncat(status, "13: program error", DBD15STATLEN - strlen(status));
                     break;
                 case 0x14:
-                    strncat(status, "14: lock error", DBD15STATLEN);
+                    strncat(status, "14: lock error", DBD15STATLEN - strlen(status));
                     break;
                 default:
-                    strncat(status, "unknown error", DBD15STATLEN);
+                    strncat(status, "unknown error", DBD15STATLEN - strlen(status));
             }
-            strncat(status, " ", DBD15STATLEN);
+            strncat(status, " ", DBD15STATLEN - strlen(status));
         } else {
-            strncat(status, "No error ", DBD15STATLEN);
+            strncat(status, "No error ", DBD15STATLEN - strlen(status));
         }
 
         if (CheckCrc(d, len))
-            strncat(status, "[+] crc OK", DBD15STATLEN);
+            strncat(status, "[+] crc OK", DBD15STATLEN - strlen(status));
         else
-            strncat(status, "[!] crc fail", DBD15STATLEN);
+            strncat(status, "[!] crc fail", DBD15STATLEN - strlen(status));
 
         if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("%s", status);
     }
@@ -999,4 +1000,4 @@ void DirectTag15693Command(uint32_t datalen, uint32_t speed, uint32_t recv, uint
     } else {
         cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
     }
-}
\ No newline at end of file
+}
diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index ac9f08ed3..a40e5e977 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -21,13 +21,6 @@
 #include "common.h"
 #include "flashmem.h" // persistence on mem
 
-#ifndef SHORT_COIL
-# define SHORT_COIL() LOW(GPIO_SSC_DOUT)
-#endif
-#ifndef OPEN_COIL
-# define OPEN_COIL()  HIGH(GPIO_SSC_DOUT)
-#endif
-
 //#define START_GAP 31*8 // was 250 // SPEC:  1*8 to 50*8 - typ 15*8 (15fc)
 //#define WRITE_GAP 8*8 // 17*8 // was 160 // SPEC:  1*8 to 20*8 - typ 10*8 (10fc)
 //#define WRITE_0   15*8 // 18*8 // was 144 // SPEC: 16*8 to 32*8 - typ 24*8 (24fc)
@@ -317,7 +310,7 @@ void ReadTItag(void) {
                 // expected for either the low or high frequency
                 if ((samples > (sampleslo - threshold)) && (samples < (sampleslo + threshold))) {
                     // low frequency represents a 1
-                    shift3 |= (1 << 31);
+                    shift3 |= (1u << 31);
                 } else if ((samples > (sampleshi - threshold)) && (samples < (sampleshi + threshold))) {
                     // high frequency represents a 0
                 } else {
@@ -481,7 +474,7 @@ void AcquireTiType(void) {
     // unpack buffer
     for (i = TIBUFLEN - 1; i >= 0; i--) {
         for (j = 0; j < 32; j++) {
-            if (buf[i] & (1 << j)) {
+            if (buf[i] & (1u << j)) {
                 dest[--n] = 1;
             } else {
                 dest[--n] = -1;
@@ -730,8 +723,6 @@ static void fcAll(uint8_t fc, int *n, uint8_t clock, uint16_t *modCnt) {
     uint8_t halfFC = fc >> 1;
     uint8_t wavesPerClock = clock / fc;
     uint8_t mod = clock % fc;    //modifier
-    uint8_t modAdj = fc / mod;   //how often to apply modifier
-    bool modAdjOk = !(fc % mod); //if (fc % mod==0) modAdjOk = true;
 
     // loop through clock - step field clock
     for (uint8_t idx = 0; idx < wavesPerClock; idx++) {
@@ -740,19 +731,23 @@ static void fcAll(uint8_t fc, int *n, uint8_t clock, uint16_t *modCnt) {
         memset(dest + (*n) + (fc - halfFC), 1, halfFC);
         *n += fc;
     }
-    if (mod > 0)(*modCnt)++;
+    if (mod > 0) {
+        uint8_t modAdj = fc / mod;   //how often to apply modifier
+        bool modAdjOk = !(fc % mod); //if (fc % mod==0) modAdjOk = true;
+        (*modCnt)++;
 
-    if ((mod > 0) && modAdjOk) { //fsk2
-        if ((*modCnt % modAdj) == 0) { //if 4th 8 length wave in a rf/50 add extra 8 length wave
-            memset(dest + (*n), 0, fc - halfFC);
-            memset(dest + (*n) + (fc - halfFC), 1, halfFC);
-            *n += fc;
+        if (modAdjOk) { //fsk2
+            if ((*modCnt % modAdj) == 0) { //if 4th 8 length wave in a rf/50 add extra 8 length wave
+                memset(dest + (*n), 0, fc - halfFC);
+                memset(dest + (*n) + (fc - halfFC), 1, halfFC);
+                *n += fc;
+            }
+        }
+        if (!modAdjOk) { //fsk1
+            memset(dest + (*n), 0, mod - (mod >> 1));
+            memset(dest + (*n) + (mod - (mod >> 1)), 1, mod >> 1);
+            *n += mod;
         }
-    }
-    if (mod > 0 && !modAdjOk) { //fsk1
-        memset(dest + (*n), 0, mod - (mod >> 1));
-        memset(dest + (*n) + (mod - (mod >> 1)), 1, mod >> 1);
-        *n += mod;
     }
 }
 
@@ -829,7 +824,7 @@ void CmdHIDsimTAG(uint32_t hi, uint32_t lo, int ledcontrol) {
 // prepare a waveform pattern in the buffer based on the ID given then
 // simulate a FSK tag until the button is pressed
 // arg1 contains fcHigh and fcLow, arg2 contains STT marker and clock
-void CmdFSKsimTAG(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *bits) {
+void CmdFSKsimTAG(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *bits, int ledcontrol) {
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
 
     // free eventually allocated BigBuf memory
@@ -838,7 +833,7 @@ void CmdFSKsimTAG(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *bits) {
     clear_trace();
     set_tracing(false);
 
-    int ledcontrol = 1, n = 0, i = 0;
+    int n = 0, i = 0;
     uint8_t fcHigh = arg1 >> 8;
     uint8_t fcLow = arg1 & 0xFF;
     uint16_t modCnt = 0;
@@ -906,11 +901,11 @@ static void stAskSimBit(int *n, uint8_t clock) {
 }
 
 // args clock, ask/man or askraw, invert, transmission separator
-void CmdASKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream) {
+void CmdASKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream, int ledcontrol) {
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
     set_tracing(false);
 
-    int ledcontrol = 1, n = 0, i = 0;
+    int n = 0, i = 0;
     uint8_t clk = (arg1 >> 8) & 0xFF;
     uint8_t encoding = arg1 & 0xFF;
     uint8_t separator = arg2 & 1;
@@ -973,11 +968,11 @@ static void pskSimBit(uint8_t waveLen, int *n, uint8_t clk, uint8_t *curPhase, b
 }
 
 // args clock, carrier, invert,
-void CmdPSKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream) {
+void CmdPSKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream, int ledcontrol) {
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
     set_tracing(false);
 
-    int ledcontrol = 1, n = 0, i = 0;
+    int n = 0, i = 0;
     uint8_t clk = arg1 >> 8;
     uint8_t carrier = arg1 & 0xFF;
     uint8_t invert = arg2 & 0xFF;
@@ -1066,12 +1061,8 @@ void CmdHIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol)
                     }
                 } else { //if bit 38 is not set then 37 bit format is used
                     bitlen = 37;
-                    fc = 0;
-                    cardnum = 0;
-                    if (bitlen == 37) {
-                        cardnum = (lo >> 1) & 0x7FFFF;
-                        fc = ((hi & 0xF) << 12) | (lo >> 20);
-                    }
+                    cardnum = (lo >> 1) & 0x7FFFF;
+                    fc = ((hi & 0xF) << 12) | (lo >> 20);
                 }
                 Dbprintf("TAG ID: %x%08x (%d) - Format Len: %dbit - FC: %d - Card: %d",
                          hi,
@@ -1382,8 +1373,6 @@ void T55xxResetRead(void) {
     //clear buffer now so it does not interfere with timing later
     BigBuf_Clear_keep_EM();
 
-    StartTicks();
-
     // Set up FPGA, 125kHz
     LFSetupFPGAForADC(95, true);
     // make sure tag is fully powered up...
@@ -1416,8 +1405,6 @@ void T55xxWriteBlockExt(uint32_t Data, uint8_t Block, uint32_t Pwd, uint8_t arg)
     bool testMode = arg & 0x4;
     uint32_t i = 0;
 
-    StartTicks();
-
     // Set up FPGA, 125kHz
     LFSetupFPGAForADC(95, true);
 
@@ -1491,7 +1478,7 @@ void T55xxWriteBlock(uint32_t Data, uint8_t Block, uint32_t Pwd, uint8_t arg) {
 // Read one card block in page [page]
 void T55xxReadBlock(uint16_t arg0, uint8_t Block, uint32_t Pwd) {
     LED_A_ON();
-    bool PwdMode =    arg0 & 0x1;
+    bool PwdMode = arg0 & 0x1;
     uint8_t Page = (arg0 & 0x2) >> 1;
     bool brute_mem =  arg0 & 0x4;
 
@@ -1513,8 +1500,6 @@ void T55xxReadBlock(uint16_t arg0, uint8_t Block, uint32_t Pwd) {
     //make sure block is at max 7
     Block &= 0x7;
 
-    StartTicks();
-
     // Set up FPGA, 125kHz to power up the tag
     LFSetupFPGAForADC(95, true);
     // make sure tag is fully powered up...
@@ -1591,26 +1576,23 @@ void T55xx_ChkPwds() {
     uint32_t candidate = 0;
 
 #ifdef WITH_FLASH
-    bool use_flashmem = true;
-    if (use_flashmem) {
-        BigBuf_Clear_EM();
-        uint16_t isok = 0;
-        uint8_t counter[2] = {0x00, 0x00};
-        isok = Flash_ReadData(DEFAULT_T55XX_KEYS_OFFSET, counter, sizeof(counter));
-        if (isok != sizeof(counter))
-            goto OUT;
+    BigBuf_Clear_EM();
+    uint16_t isok = 0;
+    uint8_t counter[2] = {0x00, 0x00};
+    isok = Flash_ReadData(DEFAULT_T55XX_KEYS_OFFSET, counter, sizeof(counter));
+    if (isok != sizeof(counter))
+        goto OUT;
 
-        pwdCount = counter[1] << 8 | counter[0];
+    pwdCount = counter[1] << 8 | counter[0];
 
-        if (pwdCount == 0 && pwdCount == 0xFFFF)
-            goto OUT;
+    if (pwdCount == 0 || pwdCount == 0xFFFF)
+        goto OUT;
 
-        isok = Flash_ReadData(DEFAULT_T55XX_KEYS_OFFSET + 2, pwds, pwdCount * 4);
-        if (isok != pwdCount * 4)
-            goto OUT;
+    isok = Flash_ReadData(DEFAULT_T55XX_KEYS_OFFSET + 2, pwds, pwdCount * 4);
+    if (isok != pwdCount * 4)
+        goto OUT;
 
-        Dbprintf("[=] Password dictionary count %d ", pwdCount);
-    }
+    Dbprintf("[=] Password dictionary count %d ", pwdCount);
 #endif
 
     uint32_t pwd = 0, curr = 0, prev = 0;
@@ -1661,8 +1643,6 @@ void T55xxWakeUp(uint32_t Pwd) {
     LED_B_ON();
     uint32_t i = 0;
 
-    StartTicks();
-
     // Set up FPGA, 125kHz
     LFSetupFPGAForADC(95, true);
     // make sure tag is fully powered up...
diff --git a/armsrc/lfsampling.c b/armsrc/lfsampling.c
index 53b8e75b3..7018fbae2 100644
--- a/armsrc/lfsampling.c
+++ b/armsrc/lfsampling.c
@@ -29,7 +29,7 @@ void printConfig() {
 
 /**
  * Called from the USB-handler to set the sampling configuration
- * The sampling config is used for std reading and snooping.
+ * The sampling config is used for std reading and sniffing.
  *
  * Other functions may read samples and ignore the sampling config,
  * such as functions to read the UID from a prox tag or similar.
@@ -239,9 +239,9 @@ uint32_t ReadLF(bool activeField, bool silent, int sample_size) {
     if (!silent)
         printConfig();
     LFSetupFPGAForADC(config.divisor, activeField);
-	uint32_t ret = DoAcquisition_config(silent, sample_size);
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	return ret;
+    uint32_t ret = DoAcquisition_config(silent, sample_size);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    return ret;
 }
 
 /**
@@ -250,15 +250,15 @@ uint32_t ReadLF(bool activeField, bool silent, int sample_size) {
 **/
 uint32_t SampleLF(bool printCfg, int sample_size) {
     BigBuf_Clear_ext(false);
-	return ReadLF(true, printCfg, sample_size);
+    return ReadLF(true, printCfg, sample_size);
 }
 /**
-* Initializes the FPGA for snoop-mode (field off), and acquires the samples.
+* Initializes the FPGA for sniffer-mode (field off), and acquires the samples.
 * @return number of bits sampled
 **/
-uint32_t SnoopLF() {
+uint32_t SniffLF() {
     BigBuf_Clear_ext(false);
-	return ReadLF(false, true, 0);
+    return ReadLF(false, true, 0);
 }
 
 /**
@@ -427,12 +427,10 @@ uint32_t doCotagAcquisitionManchester() {
             if (sample > COTAG_ONE_THRESHOLD) {
                 prev = curr;
                 curr = 1;
-			}
-			else if ( sample < COTAG_ZERO_THRESHOLD) {
+            } else if (sample < COTAG_ZERO_THRESHOLD) {
                 prev = curr;
                 curr = 0;
-			}
-			else {
+            } else {
                 curr = prev;
             }
 
diff --git a/armsrc/lfsampling.h b/armsrc/lfsampling.h
index 94c370ed9..8556cd327 100644
--- a/armsrc/lfsampling.h
+++ b/armsrc/lfsampling.h
@@ -30,10 +30,10 @@ void doT55x7Acquisition(size_t sample_size);
 uint32_t SampleLF(bool silent, int sample_size);
 
 /**
-* Initializes the FPGA for snoop-mode (field off), and acquires the samples.
+* Initializes the FPGA for sniff-mode (field off), and acquires the samples.
 * @return number of bits sampled
 **/
-uint32_t SnoopLF();
+uint32_t SniffLF();
 
 // adds sample size to default options
 uint32_t DoPartialAcquisition(int trigger_threshold, bool silent, int sample_size, uint32_t cancel_after);
@@ -67,7 +67,7 @@ void LFSetupFPGAForADC(int divisor, bool lf_field);
 
 /**
  * Called from the USB-handler to set the sampling configuration
- * The sampling config is used for std reading and snooping.
+ * The sampling config is used for std reading and sniffing.
  *
  * Other functions may read samples and ignore the sampling config,
  * such as functions to read the UID from a prox tag or similar.
diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index 1f1932e27..9e771679b 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -1247,7 +1247,7 @@ void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *da
 
         keyCount = size[1] << 8 | size[0];
 
-        if (keyCount == 0 && keyCount == 0xFFFF)
+        if (keyCount == 0 || keyCount == 0xFFFF)
             goto OUT;
 
         datain = BigBuf_malloc(keyCount * 6);
@@ -2098,4 +2098,4 @@ void Mifare_DES_Auth2(uint32_t arg0, uint8_t *datain) {
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     LEDsoff();
     set_tracing(false);
-}
\ No newline at end of file
+}
diff --git a/armsrc/mifarecmd.h b/armsrc/mifarecmd.h
index 595d46395..51ed76ca5 100644
--- a/armsrc/mifarecmd.h
+++ b/armsrc/mifarecmd.h
@@ -25,4 +25,4 @@
 #include "crc.h"
 #include "protocols.h"
 #include "parity.h"
-#endif
\ No newline at end of file
+#endif
diff --git a/armsrc/mifaresniff.c b/armsrc/mifaresniff.c
index 8f391207e..0e75aac35 100644
--- a/armsrc/mifaresniff.c
+++ b/armsrc/mifaresniff.c
@@ -322,4 +322,4 @@ void RAMFUNC MfSniffSend() {
     LED_B_ON();
     cmd_send(CMD_ACK, 2, 0, 0, 0, 0);  // 2 == data transfer finished.
     LED_B_OFF();
-}
\ No newline at end of file
+}
diff --git a/armsrc/mifaresniff.h b/armsrc/mifaresniff.h
index debfd5a09..9b5cb8609 100644
--- a/armsrc/mifaresniff.h
+++ b/armsrc/mifaresniff.h
@@ -39,4 +39,4 @@ bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint8_t *parity, ui
 void RAMFUNC MfSniffSend(void);
 void MfSniffEnd(void);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/armsrc/pcf7931.c b/armsrc/pcf7931.c
index ef371b233..90a6f5d64 100644
--- a/armsrc/pcf7931.c
+++ b/armsrc/pcf7931.c
@@ -518,4 +518,4 @@ bool AddPatternPCF7931(uint32_t a, uint32_t b, uint32_t c, uint32_t *tab) {
     tab[u + 2] = c + tab[u + 1];
 
     return 0;
-}
\ No newline at end of file
+}
diff --git a/armsrc/pcf7931.h b/armsrc/pcf7931.h
index bed33dadc..b8121c29f 100644
--- a/armsrc/pcf7931.h
+++ b/armsrc/pcf7931.h
@@ -17,4 +17,4 @@ bool AddBitPCF7931(bool b, uint32_t *tab, int32_t l, int32_t p);
 bool AddPatternPCF7931(uint32_t a, uint32_t b, uint32_t c, uint32_t *tab);
 void WritePCF7931(uint8_t pass1, uint8_t pass2, uint8_t pass3, uint8_t pass4, uint8_t pass5, uint8_t pass6, uint8_t pass7, uint16_t init_delay, int32_t l, int32_t p, uint8_t address, uint8_t byte, uint8_t data);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/armsrc/start.c b/armsrc/start.c
index a6503f1ea..b5947bdf3 100644
--- a/armsrc/start.c
+++ b/armsrc/start.c
@@ -77,4 +77,4 @@ void __attribute__((section(".startos"))) Vector(void) {
 
     AppMain();
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/armsrc/string.h b/armsrc/string.h
index de8f3ac20..f6f094c48 100644
--- a/armsrc/string.h
+++ b/armsrc/string.h
@@ -24,4 +24,4 @@ char *strcat(char *dest, const char *src);
 void strreverse(char s[]);
 void itoa(int n, char s[]);
 
-#endif /* __STRING_H */
\ No newline at end of file
+#endif /* __STRING_H */
diff --git a/armsrc/ticks.h b/armsrc/ticks.h
index 6e5e334f0..d24d2aac5 100644
--- a/armsrc/ticks.h
+++ b/armsrc/ticks.h
@@ -44,4 +44,4 @@ extern void WaitUS(uint16_t us);
 extern void WaitMS(uint16_t ms);
 
 extern void StopTicks(void);
-#endif
\ No newline at end of file
+#endif
diff --git a/armsrc/util.h b/armsrc/util.h
index 19b104f51..15f93d1f9 100644
--- a/armsrc/util.h
+++ b/armsrc/util.h
@@ -17,7 +17,18 @@
 #include "BigBuf.h"
 #include "ticks.h"
 
+// Basic macros
+#ifndef SHORT_COIL
+#define SHORT_COIL()     LOW(GPIO_SSC_DOUT)
+#endif
+
+#ifndef OPEN_COIL
+#define OPEN_COIL()      HIGH(GPIO_SSC_DOUT)
+#endif
+
+#ifndef BYTEx
 #define BYTEx(x, n) (((x) >> (n * 8)) & 0xff )
+#endif
 
 #define LED_RED 1
 #define LED_ORANGE 2
@@ -43,6 +54,34 @@
 # define NTIME(n) for (int _index = 0; _index < n; _index++)
 #endif
 
+#ifndef REV8
+#define REV8(x) ((((x)>>7)&1)+((((x)>>6)&1)<<1)+((((x)>>5)&1)<<2)+((((x)>>4)&1)<<3)+((((x)>>3)&1)<<4)+((((x)>>2)&1)<<5)+((((x)>>1)&1)<<6)+(((x)&1)<<7))
+#endif
+
+#ifndef REV16
+#define REV16(x)        (REV8(x) + (REV8 (x >> 8) << 8))
+#endif
+
+#ifndef REV32
+#define REV32(x)        (REV16(x) + (REV16(x >> 16) << 16))
+#endif
+
+#ifndef REV64
+#define REV64(x)        (REV32(x) + (REV32(x >> 32) << 32))
+#endif
+
+#ifndef BIT32
+#define BIT32(x,n)      ((((x)[(n)>>5])>>((n)))&1)
+#endif
+
+#ifndef INV32
+#define INV32(x,i,n)    ((x)[(i)>>5]^=((uint32_t)(n))<<((i)&31))
+#endif
+
+#ifndef ROTL64
+#define ROTL64(x, n)    ((((uint64_t)(x))<<((n)&63))+(((uint64_t)(x))>>((0-(n))&63)))
+#endif
+
 size_t nbytes(size_t nbits);
 
 extern uint32_t reflect(uint32_t v, int b); // used in crc.c ...
diff --git a/client/amiitool/amiitool.c b/client/amiitool/amiitool.c
index a687cb0b1..78c8f4d1e 100644
--- a/client/amiitool/amiitool.c
+++ b/client/amiitool/amiitool.c
@@ -8,7 +8,7 @@
 #include <amiibo.h>
 #include <stdio.h>
 #include <string.h>
-#include "../loclass/fileutil.h"
+#include "../loclass/fileutils.h"
 
 #define NTAG215_SIZE 540
 
diff --git a/client/cli.c b/client/cli.c
index 19e472586..270689732 100644
--- a/client/cli.c
+++ b/client/cli.c
@@ -21,7 +21,7 @@ int main(int argc, char **argv) {
     if (argc != 3 && argc != 4) {
         printf("\n\tusage: cli <command 1> <command 2> [logfile (default cli.log)]\n");
         printf("\n");
-        printf("\texample: cli hi14asnoop hi14alist h14a.log\n");
+        printf("\texample: cli hf 14a sniff hf 14a list h14a.log\n");
         printf("\n");
         return -1;
     }
diff --git a/client/cmdcrc.c b/client/cmdcrc.c
index 1a17d1428..be74fc39a 100644
--- a/client/cmdcrc.c
+++ b/client/cmdcrc.c
@@ -483,4 +483,4 @@ int CmdrevengSearch(const char *Cmd) {
 
     if (!found) PrintAndLogEx(FAILED, "\nno matches found\n");
     return 1;
-}
\ No newline at end of file
+}
diff --git a/client/cmddata.c b/client/cmddata.c
index 5aeaca388..aa44611ed 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -417,18 +417,16 @@ int CmdPrintDemodBuff(const char *Cmd) {
         return 0;
     }
     length = (length > (DemodBufferLen - offset)) ? DemodBufferLen - offset : length;
-    int numBits = (length) & 0x00FFC; //make sure we don't exceed our string
 
     if (hexMode) {
         char *buf = (char *)(DemodBuffer + offset);
-        numBits = (numBits > sizeof(hex)) ? sizeof(hex) : numBits;
-        numBits = binarraytohex(hex, buf, numBits);
+        int numBits = binarraytohex(hex, sizeof(hex), buf, length);
         if (numBits == 0) {
             return 0;
         }
         PrintAndLogEx(NORMAL, "DemodBuffer: %s", hex);
     } else {
-        PrintAndLogEx(NORMAL, "DemodBuffer:\n%s", sprint_bin_break(DemodBuffer + offset, numBits, 16));
+        PrintAndLogEx(NORMAL, "DemodBuffer:\n%s", sprint_bin_break(DemodBuffer + offset, length, 16));
     }
     return 1;
 }
@@ -475,14 +473,15 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
 
     size_t BitLen = getFromGraphBuf(bits);
 
-    PrintAndLogEx(DEBUG, "DEBUG: (ASKDemod_ext) Bitlen from grphbuff: %d", BitLen);
+    PrintAndLogEx(DEBUG, "DEBUG: (ASKDemod_ext) #samples from graphbuff: %d", BitLen);
 
     if (BitLen < 255) return 0;
 
     if (maxLen < BitLen && maxLen != 0) BitLen = maxLen;
 
     int foundclk = 0;
-    //amp before ST check
+
+    //amplify signal before ST check
     if (amp == 'a')
         askAmp(bits, BitLen);
 
@@ -496,8 +495,8 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
         clk = (clk == 0) ? foundclk : clk;
         CursorCPos = ststart;
         CursorDPos = stend;
-        if (verbose || g_debugMode)
-            PrintAndLogEx(NORMAL, "Found Sequence Terminator - First one is shown by orange and blue graph markers");
+        if (verbose)
+            PrintAndLogEx(DEBUG, "Found Sequence Terminator - First one is shown by orange / blue graph markers");
     }
 
     int startIdx = 0;
@@ -513,19 +512,19 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
         return 0;
     }
 
-    if (verbose || g_debugMode) PrintAndLogEx(DEBUG, "DEBUG: (ASKDemod_ext) Using clock:%d, invert:%d, bits found:%d", clk, invert, BitLen);
+    if (verbose) PrintAndLogEx(DEBUG, "DEBUG: (ASKDemod_ext) Using clock:%d, invert:%d, bits found:%d", clk, invert, BitLen);
 
     //output
     setDemodBuf(bits, BitLen, 0);
     setClockGrid(clk, startIdx);
 
-    if (verbose || g_debugMode) {
+    if (verbose) {
         if (errCnt > 0)
-            PrintAndLogEx(NORMAL, "# Errors during Demoding (shown as 7 in bit stream): %d", errCnt);
+            PrintAndLogEx(DEBUG, "# Errors during Demoding (shown as 7 in bit stream): %d", errCnt);
         if (askType)
-            PrintAndLogEx(NORMAL, "ASK/Manchester - Clock: %d - Decoded bitstream:", clk);
+            PrintAndLogEx(DEBUG, "ASK/Manchester - Clock: %d - Decoded bitstream:", clk);
         else
-            PrintAndLogEx(NORMAL, "ASK/Raw - Clock: %d - Decoded bitstream:", clk);
+            PrintAndLogEx(DEBUG, "ASK/Raw - Clock: %d - Decoded bitstream:", clk);
         // Now output the bitstream to the scrollback by line of 16 bits
         printDemodBuff();
     }
@@ -624,7 +623,7 @@ int CmdBiphaseDecodeRaw(const char *Cmd) {
 
     sscanf(Cmd, "%i %i %i", &offset, &invert, &maxErr);
     if (DemodBufferLen == 0) {
-        PrintAndLogEx(NORMAL, "DemodBuffer Empty - run 'data rawdemod ar' first");
+        PrintAndLogEx(WARNING, "DemodBuffer Empty - run " _YELLOW_("'data rawdemod ar'")" first");
         return 0;
     }
 
@@ -643,7 +642,7 @@ int CmdBiphaseDecodeRaw(const char *Cmd) {
     }
 
     if (errCnt > 0)
-        PrintAndLogEx(WARNING, "# Errors found during Demod (shown as 7 in bit stream): %d", errCnt);
+        PrintAndLogEx(WARNING, "# Errors found during Demod (shown as " _YELLOW_("7")" in bit stream): %d", errCnt);
 
     PrintAndLogEx(NORMAL, "Biphase Decoded using offset: %d - # invert:%d - data:", offset, invert);
     PrintAndLogEx(NORMAL, "%s", sprint_bin_break(bits, size, 16));
@@ -716,7 +715,7 @@ int AutoCorrelate(const int *in, int *out, size_t len, int window, bool SaveGrph
     // sanity check
     if (window > len) window = len;
 
-    if (verbose) PrintAndLogEx(INFO, "performing %d correlations", GraphTraceLen - window);
+    if (verbose) PrintAndLogEx(INFO, "performing " _YELLOW_("%d")" correlations", GraphTraceLen - window);
 
     //test
     double autocv = 0.0;    // Autocovariance value
@@ -769,10 +768,11 @@ int AutoCorrelate(const int *in, int *out, size_t len, int window, bool SaveGrph
     }
 
     int foo = ABS(hi - hi_1);
-    int bar = (int)((int)((hi + hi_1) / 2) * 0.03);
+    int bar = (int)((int)((hi + hi_1) / 2) * 0.04);
+
     if (verbose && foo < bar) {
         distance = idx_1 - idx;
-        PrintAndLogEx(SUCCESS, "possible 3% visible correlation %4d samples", distance);
+        PrintAndLogEx(SUCCESS, "possible 4% visible correlation %4d samples", distance);
     } else if (verbose && (correlation > 1)) {
         PrintAndLogEx(SUCCESS, "possible correlation %4d samples", correlation);
     } else {
@@ -1069,7 +1069,7 @@ int FSKrawDemod(const char *Cmd, bool verbose) {
         }
         return 1;
     } else {
-        if (g_debugMode) PrintAndLogEx(NORMAL, "no FSK data found");
+        PrintAndLogEx(DEBUG, "no FSK data found");
     }
     return 0;
 }
@@ -1128,7 +1128,7 @@ int PSKDemod(const char *Cmd, bool verbose) {
     return 1;
 }
 
-int CmdPSKIdteck(const char *Cmd) {
+int CmdIdteckDemod(const char *Cmd) {
 
     if (!PSKDemod("", false)) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - Idteck PSKDemod failed");
diff --git a/client/cmddata.h b/client/cmddata.h
index 86f19d81d..1091c48c2 100644
--- a/client/cmddata.h
+++ b/client/cmddata.h
@@ -54,7 +54,7 @@ int CmdDetectClockRate(const char *Cmd);
 int CmdFSKrawdemod(const char *Cmd);
 int CmdPSK1rawDemod(const char *Cmd);
 int CmdPSK2rawDemod(const char *Cmd);
-int CmdPSKIdteck(const char *Cmd);
+int CmdIdteckDemod(const char *Cmd);
 int CmdGrid(const char *Cmd);
 int CmdGetBitStream(const char *Cmd);
 int CmdHexsamples(const char *Cmd);
diff --git a/client/cmdflashmem.c b/client/cmdflashmem.c
index 0701f1d2d..c75fadb3c 100644
--- a/client/cmdflashmem.c
+++ b/client/cmdflashmem.c
@@ -245,7 +245,7 @@ int CmdFlashMemLoad(const char *Cmd) {
             break;
         default:
 
-            res = loadFile(filename, "bin", data, &datalen);
+            res = loadFile(filename, "bin", data, FLASH_MEM_MAX_SIZE, &datalen);
             //int res = loadFileEML( filename, "eml", data, &datalen);
             if (res) {
                 free(data);
diff --git a/client/cmdflashmem.h b/client/cmdflashmem.h
index 0a56ebed4..099a4e3b1 100644
--- a/client/cmdflashmem.h
+++ b/client/cmdflashmem.h
@@ -42,4 +42,4 @@ extern int CmdFlashMemWipe(const char *Cmd);
 extern int CmdFlashMemInfo(const char *Cmd);
 #endif
 
-#endif
\ No newline at end of file
+#endif
diff --git a/client/cmdhf.c b/client/cmdhf.c
index 237149348..8368160f8 100644
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -21,7 +21,7 @@ int usage_hf_search() {
     return 0;
 }
 int usage_hf_sniff() {
-    PrintAndLogEx(NORMAL, "The high frequence snoop will assign all available memory on device for sniffed data");
+    PrintAndLogEx(NORMAL, "The high frequence sniffer will assign all available memory on device for sniffed data");
     PrintAndLogEx(NORMAL, "Use " _YELLOW_("'data samples'")" command to download from device,  and " _YELLOW_("'data plot'")" to look at it");
     PrintAndLogEx(NORMAL, "Press button to quit the sniffing.\n");
     PrintAndLogEx(NORMAL, "Usage: hf sniff <skip pairs> <skip triggers>");
@@ -42,7 +42,7 @@ int CmdHFSearch(const char *Cmd) {
     if (cmdp == 'h') return usage_hf_search();
 
     PrintAndLogEx(INFO, "Checking for known tags...\n");
-        
+
     int ans = CmdHF14AInfo("s");
     if (ans > 0) {
         PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("ISO14443-A tag") " found\n");
diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 6d4b39e4e..6dd7149f2 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -803,7 +803,7 @@ int CmdHF14ASniff(const char *Cmd) {
         if (ctmp == 'c') param |= 0x01;
         if (ctmp == 'r') param |= 0x02;
     }
-    UsbCommand c = {CMD_SNOOP_ISO_14443a, {param, 0, 0}};
+    UsbCommand c = {CMD_SNIFF_ISO_14443a, {param, 0, 0}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c
index 564b18012..9d542f228 100644
--- a/client/cmdhf14b.c
+++ b/client/cmdhf14b.c
@@ -33,7 +33,7 @@ int usage_hf_14b_reader(void) {
     return 0;
 }
 int usage_hf_14b_raw(void) {
-    PrintAndLogEx(NORMAL, "Usage: hf 14b raw [-h] [-r] [-c] [-p] [-s || -ss] <0A 0B 0C ... hex>");
+    PrintAndLogEx(NORMAL, "Usage: hf 14b raw [-h] [-r] [-c] [-p] [-s / -ss] [-t] <0A 0B 0C ... hex>");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       -h    this help");
     PrintAndLogEx(NORMAL, "       -r    do not read response");
@@ -41,6 +41,7 @@ int usage_hf_14b_raw(void) {
     PrintAndLogEx(NORMAL, "       -p    leave the field on after receive");
     PrintAndLogEx(NORMAL, "       -s    active signal field ON with select");
     PrintAndLogEx(NORMAL, "       -ss   active signal field ON with select for SRx ST Microelectronics tags");
+    PrintAndLogEx(NORMAL, "       -t    timeout in ms");
     PrintAndLogEx(NORMAL, "Example:");
     PrintAndLogEx(NORMAL, "       hf 14b raw -s -c -p 0200a40400");
     return 0;
@@ -145,20 +146,20 @@ int CmdHF14BSniff(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_hf_14b_sniff();
 
-    UsbCommand c = {CMD_SNOOP_ISO_14443B, {0, 0, 0}};
+    UsbCommand c = {CMD_SNIFF_ISO_14443B, {0, 0, 0}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
 }
 
 int CmdHF14BCmdRaw(const char *Cmd) {
-    bool reply = true, power = false, select = false;
+    bool reply = true, power = false, select = false, hasTimeout = false;
     char buf[5] = "";
     int i = 0;
     uint8_t data[USB_CMD_DATA_SIZE] = {0x00};
     uint16_t datalen = 0;
     uint32_t flags = ISO14B_CONNECT;
-    uint32_t temp = 0;
+    uint32_t temp = 0, user_timeout = 0, time_wait = 0;
 
     if (strlen(Cmd) < 3) return usage_hf_14b_raw();
 
@@ -189,6 +190,13 @@ int CmdHF14BCmdRaw(const char *Cmd) {
                         flags |= ISO14B_SELECT_STD;
                     }
                     break;
+                case 't':
+                    hasTimeout = true;
+                    sscanf(Cmd + i + 2, "%d", &user_timeout);
+                    i += 3;
+                    while (Cmd[i] != ' ' && Cmd[i] != '\0') { i++; }
+                    i -= 2;
+                    break;
                 default:
                     return usage_hf_14b_raw();
             }
@@ -214,7 +222,17 @@ int CmdHF14BCmdRaw(const char *Cmd) {
         return 0;
     }
 
-    if (!power)
+    if (hasTimeout) {
+#define MAX_TIMEOUT 40542464 // = (2^32-1) * (8*16) / 13560000Hz * 1000ms/s
+        flags |= ISO14B_SET_TIMEOUT;
+        if (user_timeout > MAX_TIMEOUT) {
+            user_timeout = MAX_TIMEOUT;
+            PrintAndLogEx(NORMAL, "Set timeout to 40542 seconds (11.26 hours). The max we can wait for response");
+        }
+        time_wait = 13560000 / 1000 / (8 * 16) * user_timeout; // timeout in ETUs (time to transfer 1 bit, approx. 9.4 us)
+    }
+
+    if (power == 0)
         flags |= ISO14B_DISCONNECT;
 
     if (datalen > 0)
@@ -223,7 +241,7 @@ int CmdHF14BCmdRaw(const char *Cmd) {
     // Max buffer is USB_CMD_DATA_SIZE
     datalen = (datalen > USB_CMD_DATA_SIZE) ? USB_CMD_DATA_SIZE : datalen;
 
-    UsbCommand c = {CMD_ISO_14443B_COMMAND, {flags, datalen, 0}};
+    UsbCommand c = {CMD_ISO_14443B_COMMAND, {flags, datalen, time_wait}};
     memcpy(c.d.asBytes, data, datalen);
     clearCommandBuffer();
     SendCommand(&c);
diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index 2e784962c..23a756062 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -684,15 +684,15 @@ int CmdHF15Dump(const char *Cmd) {
     //Validations
     if (errors) return usage_15_dump();
 
+    if (!getUID(uid)) {
+        PrintAndLogEx(WARNING, "No tag found.");
+        return 1;
+    }
+
     if (fileNameLen < 1) {
 
         PrintAndLogEx(INFO, "Using UID as filename");
 
-        if (!getUID(uid)) {
-            PrintAndLogEx(WARNING, "No tag found.");
-            return 1;
-        }
-
         fptr += sprintf(fptr, "hf-15-");
         FillFileNameByUID(fptr, uid, "-dump", sizeof(uid));
     }
@@ -796,7 +796,7 @@ int CmdHF15Restore(const char *Cmd) {
                     case '2':
                     case 'o':
                         strncpy(newCmdPrefix, " ", sizeof(newCmdPrefix) - 1);
-                        strncat(newCmdPrefix, param, sizeof(newCmdPrefix) - 1);
+                        strncat(newCmdPrefix, param, sizeof(newCmdPrefix) - strlen(newCmdPrefix) - 1);
                         break;
                     default:
                         PrintAndLogEx(WARNING, "Unknown parameter '%s'", param);
@@ -1315,4 +1315,4 @@ int CmdHF15(const char *Cmd) {
 int CmdHF15Help(const char *Cmd) {
     CmdsHelp(CommandTable15);
     return 0;
-}
\ No newline at end of file
+}
diff --git a/client/cmdhfepa.c b/client/cmdhfepa.c
index fce18f11b..0386155c1 100644
--- a/client/cmdhfepa.c
+++ b/client/cmdhfepa.c
@@ -176,4 +176,4 @@ int CmdHFEPA(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
-}
\ No newline at end of file
+}
diff --git a/client/cmdhffelica.c b/client/cmdhffelica.c
index 59ddc5d65..33d506a58 100644
--- a/client/cmdhffelica.c
+++ b/client/cmdhffelica.c
@@ -218,7 +218,7 @@ int CmdHFFelicaSniff(const char *Cmd) {
     //Validations
     if (errors || cmdp == 0) return usage_hf_felica_sniff();
 
-    UsbCommand c = {CMD_FELICA_SNOOP, {samples2skip, triggers2skip, 0}};
+    UsbCommand c = {CMD_FELICA_SNIFF, {samples2skip, triggers2skip, 0}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -609,4 +609,4 @@ int CmdHFFelica(const char *Cmd) {
 int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
-}
\ No newline at end of file
+}
diff --git a/client/cmdhffido.h b/client/cmdhffido.h
index 2460a170f..96f9153ed 100644
--- a/client/cmdhffido.h
+++ b/client/cmdhffido.h
@@ -24,4 +24,4 @@
 extern int CmdHFFido(const char *Cmd);
 
 
-#endif
\ No newline at end of file
+#endif
diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index b71f2fd03..ad0f510a7 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -279,7 +279,7 @@ int CmdHFiClassList(const char *Cmd) {
 int CmdHFiClassSniff(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_hf_iclass_sniff();
-    UsbCommand c = {CMD_SNOOP_ICLASS};
+    UsbCommand c = {CMD_SNIFF_ICLASS};
     SendCommand(&c);
     return 0;
 }
@@ -1375,11 +1375,14 @@ int CmdHFiClassCloneTag(const char *Cmd) {
         return 2;
     }
 
+    fclose(f);
+
     uint8_t MAC[4] = {0x00, 0x00, 0x00, 0x00};
     uint8_t div_key[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
-    if (!select_and_auth(KEY, MAC, div_key, use_credit_key, elite, rawkey, verbose))
+    if (!select_and_auth(KEY, MAC, div_key, use_credit_key, elite, rawkey, verbose)) {
         return 0;
+    }
 
     UsbCommand w = {CMD_ICLASS_CLONE, {startblock, endblock}};
     uint8_t *ptr;
@@ -1401,6 +1404,7 @@ int CmdHFiClassCloneTag(const char *Cmd) {
         PrintAndLogEx(NORMAL, " %02x%02x%02x%02x%02x%02x%02x%02x |", p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7]);
         PrintAndLogEx(NORMAL, " MAC |%02x%02x%02x%02x|\n", p[8], p[9], p[10], p[11]);
     }
+
     UsbCommand resp;
     clearCommandBuffer();
     SendCommand(&w);
diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index a509873da..db65447ac 100644
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -1317,4 +1317,4 @@ int CmdHFLegic(const char *Cmd) {
 int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
-}
\ No newline at end of file
+}
diff --git a/client/cmdhflist.c b/client/cmdhflist.c
index 6bcfe0b20..3c1fb83bd 100644
--- a/client/cmdhflist.c
+++ b/client/cmdhflist.c
@@ -1251,4 +1251,4 @@ uint64_t GetCrypto1ProbableKey(TAuthData *ad) {
     crypto1_get_lfsr(revstate, &key);
     crypto1_destroy(revstate);
     return key;
-}
\ No newline at end of file
+}
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index e3b8cb957..44722a7bb 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -2541,7 +2541,7 @@ int CmdHF14AMfELoad(const char *Cmd) {
 
     uint8_t *data = calloc(4096, sizeof(uint8_t));
     size_t datalen = 0;
-    //int res = loadFile(filename, "bin", data, &datalen);
+    //int res = loadFile(filename, "bin", data, maxdatalen, &datalen);
     int res = loadFileEML(filename, "eml", data, &datalen);
     if (res) {
         free(data);
@@ -2827,7 +2827,7 @@ int CmdHF14AMfCLoad(const char *Cmd) {
     size_t datalen = 0;
     int res = 0;
     if (fillFromBin) {
-        res = loadFile(fileName, "bin", data, &datalen);
+        res = loadFile(fileName, "bin", data, maxdatalen, &datalen);
     } else {
         if (fillFromJson) {
             res = loadFileJSON(fileName, "json", data, maxdatalen, &datalen);
@@ -3506,7 +3506,7 @@ static command_t CommandTable[] = {
     {"nack",        CmdHf14AMfNack,         0, "Test for Mifare NACK bug"},
     {"chk",         CmdHF14AMfChk,          0, "Check keys"},
     {"fchk",        CmdHF14AMfChk_fast,     0, "Check keys fast, targets all keys on card"},
-    {"decrypt",     CmdHf14AMfDecryptBytes, 1, "[nt] [ar_enc] [at_enc] [data] - to decrypt snoop or trace"},
+    {"decrypt",     CmdHf14AMfDecryptBytes, 1, "[nt] [ar_enc] [at_enc] [data] - to decrypt sniff or trace"},
     {"-----------", CmdHelp,                1, ""},
     {"dbg",         CmdHF14AMfDbg,          0, "Set default debug mode"},
     {"rdbl",        CmdHF14AMfRdBl,         0, "Read MIFARE classic block"},
diff --git a/client/cmdhfmfdesfire.h b/client/cmdhfmfdesfire.h
index c29fd262a..cc5481b0e 100644
--- a/client/cmdhfmfdesfire.h
+++ b/client/cmdhfmfdesfire.h
@@ -2,4 +2,4 @@
 static int CmdHelp(const char *Cmd);
 int CmdHF14AMfDESAuth(const char *Cmd);
 int CmdHFMFDesfire(const char *Cmd);
-int CmdHelp(const char *Cmd);
\ No newline at end of file
+int CmdHelp(const char *Cmd);
diff --git a/client/cmdhfmfp.h b/client/cmdhfmfp.h
index a5cacb518..ed9d36b79 100644
--- a/client/cmdhfmfp.h
+++ b/client/cmdhfmfp.h
@@ -15,4 +15,4 @@
 extern int CmdHFMFP(const char *Cmd);
 
 
-#endif
\ No newline at end of file
+#endif
diff --git a/client/cmdlf.c b/client/cmdlf.c
index b6da222c6..948cf2235 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -70,8 +70,8 @@ int usage_lf_config(void) {
     PrintAndLogEx(NORMAL, "                    a resolution of 4 bits per sample.");
     PrintAndLogEx(NORMAL, "      lf read");
     PrintAndLogEx(NORMAL, "                    Performs a read (active field)");
-    PrintAndLogEx(NORMAL, "      lf snoop");
-    PrintAndLogEx(NORMAL, "                    Performs a snoop (no active field)");
+    PrintAndLogEx(NORMAL, "      lf sniff");
+    PrintAndLogEx(NORMAL, "                    Performs a sniff (no active field)");
     return 0;
 }
 int usage_lf_simfsk(void) {
@@ -216,7 +216,7 @@ int CmdFlexdemod(const char *Cmd) {
     }
 
     if (start == size - LONG_WAIT) {
-		PrintAndLogEx(WARNING, "nothing to wait for");
+        PrintAndLogEx(WARNING, "nothing to wait for");
         return 0;
     }
 
@@ -389,7 +389,7 @@ int CmdLFSniff(const char *Cmd) {
     uint8_t cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_lf_sniff();
 
-    UsbCommand c = {CMD_LF_SNOOP_RAW_ADC_SAMPLES, {0, 0, 0}};
+    UsbCommand c = {CMD_LF_SNIFF_RAW_ADC_SAMPLES, {0, 0, 0}};
     clearCommandBuffer();
     SendCommand(&c);
     WaitForResponse(CMD_ACK, NULL);
@@ -839,12 +839,12 @@ bool CheckChipType(bool getDeviceData) {
 
     //check for t55xx chip...
     if (tryDetectP1(true)) {
-        PrintAndLogEx(SUCCESS, "\nChipset detection : " _GREEN_("Atmel T55xx") " found");        
+        PrintAndLogEx(SUCCESS, "\nChipset detection : " _GREEN_("Atmel T55xx") " found");
         PrintAndLogEx(SUCCESS, "Try " _YELLOW_("`lf t55xx`")" commands");
         retval = true;
         goto out;
     }
-    
+
 out:
     save_restoreGB(GRAPH_RESTORE);
     save_restoreDB(GRAPH_RESTORE);
@@ -896,12 +896,15 @@ int CmdLFfind(const char *Cmd) {
     }
 
     if (EM4x50Read("", false))  { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("EM4x50 ID") " found!"); return 1;}
+
+    if (CmdHIDDemod(""))        { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("HID Prox ID") " found!"); goto out;}
     if (CmdAWIDDemod(""))       { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("AWID ID") " found!"); goto out;}
+    if (CmdParadoxDemod(""))    { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Paradox ID") " found!"); goto out;}
+
     if (CmdEM410xDemod(""))     { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("EM410x ID") " found!"); goto out;}
     if (CmdFdxDemod(""))        { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("FDX-B ID") " found!"); goto out;}
     if (CmdGuardDemod(""))      { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Guardall G-Prox II ID") " found!"); goto out; }
-    if (CmdHIDDemod(""))        { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("HID Prox ID") " found!"); goto out;}
-    if (CmdPSKIdteck(""))       { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Idteck ID") " found!"); goto out;}
+    if (CmdIdteckDemod(""))     { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Idteck ID") " found!"); goto out;}
     if (CmdIndalaDemod(""))     { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Indala ID") " found!");  goto out;}
     if (CmdIOProxDemod(""))     { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("IO Prox ID") " found!"); goto out;}
     if (CmdJablotronDemod(""))  { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Jablotron ID") " found!"); goto out;}
@@ -910,7 +913,7 @@ int CmdLFfind(const char *Cmd) {
     if (CmdNoralsyDemod(""))    { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Noralsy ID") " found!"); goto out;}
     if (CmdKeriDemod(""))       { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("KERI ID") " found!"); goto out;}
     if (CmdPacDemod(""))        { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("PAC/Stanley ID") " found!"); goto out;}
-    if (CmdParadoxDemod(""))    { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Paradox ID") " found!"); goto out;}
+
     if (CmdPrescoDemod(""))     { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Presco ID") " found!"); goto out;}
     if (CmdPyramidDemod(""))    { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Pyramid ID") " found!"); goto out;}
     if (CmdSecurakeyDemod(""))  { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Securakey ID") " found!"); goto out;}
@@ -945,19 +948,19 @@ int CmdLFfind(const char *Cmd) {
         bool st = true;
         if (ASKDemod_ext("0 0 0", true, false, 1, &st)) {
             PrintAndLogEx(NORMAL, "\nUnknown ASK Modulated and Manchester encoded Tag found!");
-            PrintAndLogEx(NORMAL, "if it does not look right it could instead be ASK/Biphase - try " _YELLOW_("'data rawdemod ab'") );
+            PrintAndLogEx(NORMAL, "if it does not look right it could instead be ASK/Biphase - try " _YELLOW_("'data rawdemod ab'"));
             goto out;
         }
 
         if (CmdPSK1rawDemod("")) {
             PrintAndLogEx(NORMAL, "Possible unknown PSK1 Modulated Tag found above!");
-            PrintAndLogEx(NORMAL, "    Could also be PSK2 - try " _YELLOW_("'data rawdemod p2'") );
+            PrintAndLogEx(NORMAL, "    Could also be PSK2 - try " _YELLOW_("'data rawdemod p2'"));
             PrintAndLogEx(NORMAL, "    Could also be PSK3 - [currently not supported]");
-            PrintAndLogEx(NORMAL, "    Could also be  NRZ - try " _YELLOW_("'data rawdemod nr") );
+            PrintAndLogEx(NORMAL, "    Could also be  NRZ - try " _YELLOW_("'data rawdemod nr"));
             goto out;
         }
 
-        PrintAndLogEx(FAILED, _RED_("\nNo data found!") );
+        PrintAndLogEx(FAILED, _RED_("\nNo data found!"));
     }
 out:
     // identify chipset
diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index 719c01a96..5a7d58307 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -17,23 +17,68 @@
 #include "common.h"
 #include "util.h"
 #include "parity.h"
-#include "hitag2.h"
-#include "hitagS.h"
+#include "hitag.h"
 #include "util_posix.h"
 #include "comms.h"
 #include "cmddata.h"
+#include "loclass/fileutils.h"  // savefile
 
 static int CmdHelp(const char *Cmd);
 
 size_t nbytes(size_t nbits) {
     return (nbits / 8) + ((nbits % 8) > 0);
 }
-
-int usage_hitag_reader(void)
-{
-    PrintAndLogEx(NORMAL, "Usage: lf hitag reader [h] <reader function #>");
+int usage_hitag_sniff(void) {
+    PrintAndLogEx(NORMAL, "Sniff traffic between Hitag reader and tag. Use " _YELLOW_("`lf hitag list`")" to view collected data.");
+    PrintAndLogEx(NORMAL, "Usage:   lf hitag sniff [h] ");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h             This help");
+//    PrintAndLogEx(NORMAL, "       p <pwd>       Password");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "         lf hitag sniff");
+    return 0;
+}
+int usage_hitag_sim(void) {
+    PrintAndLogEx(NORMAL, "Simulate " _YELLOW_("Hitag2 / HitagS")" transponder");
+    PrintAndLogEx(NORMAL, "Usage:   lf hitag sim [h] [2|s] e|j|b <filename w/o extension>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h             This help");
+    PrintAndLogEx(NORMAL, "       [2|s]         2 = hitag2,  s = hitagS");
+    PrintAndLogEx(NORMAL, "       e <filename>  Load data from EML file");
+    PrintAndLogEx(NORMAL, "       j <filename>  Load data from JSON file");
+    PrintAndLogEx(NORMAL, "       b <filename>  Load data from BIN file");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "         lf hitag sim 2 b lf-hitag-dump");
+    return 0;
+}
+int usage_hitag_info(void) {
+    PrintAndLogEx(NORMAL, "Usage:   lf hitag info [h] p <pwd>");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       h          This help");
+    PrintAndLogEx(NORMAL, "       p <pwd>    password");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "         lf hitag info");
+    return 0;
+}
+int usage_hitag_dump(void) {
+    PrintAndLogEx(NORMAL, "Usage:   lf hitag dump [h] p <pwd> f <name>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h          This help");
+//    PrintAndLogEx(NORMAL, "       p <pwd>    password");
+//    PrintAndLogEx(NORMAL, "       f <name>   data filename, if no <name> given, UID will be used as filename");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "         lf hitag dump f mydump");
+    PrintAndLogEx(NORMAL, "         lf hitag dump p 4D494B52 f mydump");
+    return 0;
+}
+int usage_hitag_reader(void) {
+    PrintAndLogEx(NORMAL, "Hitag reader functions");
+    PrintAndLogEx(NORMAL, "Usage: lf hitag reader [h] <reader function #>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h               This help");
     PrintAndLogEx(NORMAL, "   HitagS (0*)");
     PrintAndLogEx(NORMAL, "      01 <nr> <ar>     Challenge, read all pages from a Hitag S tag");
     PrintAndLogEx(NORMAL, "      02 <key>         Set to 0 if no authentication is needed. Read all pages from a Hitag S tag");
@@ -43,11 +88,41 @@ int usage_hitag_reader(void)
     PrintAndLogEx(NORMAL, "      22 <nr> <ar>     Authentication");
     PrintAndLogEx(NORMAL, "      23 <key>         Authentication, key is in format: ISK high + ISK low");
     PrintAndLogEx(NORMAL, "      25               Test recorded authentications");
-    PrintAndLogEx(NORMAL, "      26               Just read UID");    
+    PrintAndLogEx(NORMAL, "      26               Just read UID");
+    return 0;
+}
+int usage_hitag_writer(void) {
+    PrintAndLogEx(NORMAL, "Hitag writer functions");
+    PrintAndLogEx(NORMAL, "Usage: lf hitag write [h] <reader function #>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h          This help");
+    PrintAndLogEx(NORMAL, "   HitagS (0*)");
+    PrintAndLogEx(NORMAL, "      03 <nr,ar> (Challenge) <page> <byte0...byte3> write page on a Hitag S tag");
+    PrintAndLogEx(NORMAL, "      04 <key> (set to 0 if no authentication is needed) <page> <byte0...byte3> write page on a Hitag S tag");
+    PrintAndLogEx(NORMAL, "   Hitag1 (1*)");
+    PrintAndLogEx(NORMAL, "   Hitag2 (2*)");
+    PrintAndLogEx(NORMAL, "      24  <key> (set to 0 if no authentication is needed) <page> <byte0...byte3> write page on a Hitag2 tag");
+    return 0;
+}
+int usage_hitag_checkchallenges(void) {
+    PrintAndLogEx(NORMAL, "Check challenges, load a file with save hitag crypto challenges and test them all.");
+    PrintAndLogEx(NORMAL, "The file should be 8 * 60 bytes long,  the file extension defaults to " _YELLOW_("`.cc`"));
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:   lf hitag cc [h] f <filename w/o extension>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h              This help");
+    PrintAndLogEx(NORMAL, "       f <filename>   Load data from BIN file");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "         lf hitag cc f lf-hitag-challenges");
     return 0;
 }
 
 int CmdLFHitagList(const char *Cmd) {
+    CmdTraceList("hitag");
+    return 0;
+
+    /*
     uint8_t *got = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
     if (!got) {
         PrintAndLogEx(WARNING, "Cannot allocate memory for trace");
@@ -172,10 +247,15 @@ int CmdLFHitagList(const char *Cmd) {
 
     free(got);
     return 0;
+    */
 }
 
-int CmdLFHitagSnoop(const char *Cmd) {
-    UsbCommand c = {CMD_SNOOP_HITAG};
+int CmdLFHitagSniff(const char *Cmd) {
+
+    char ctmp = tolower(param_getchar(Cmd, 0));
+    if (ctmp == 'h') return usage_hitag_sniff();
+
+    UsbCommand c = {CMD_SNIFF_HITAG, {0, 0, 0}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -183,40 +263,249 @@ int CmdLFHitagSnoop(const char *Cmd) {
 
 int CmdLFHitagSim(const char *Cmd) {
 
-    UsbCommand c = {CMD_SIMULATE_HITAG};
+    bool errors = false;
+    bool tag_mem_supplied = false;
+    uint8_t cmdp = 0;
+    size_t maxdatalen = 48;
+    uint8_t *data = calloc(4 * 64, sizeof(uint8_t));
+    size_t datalen = 0;
+    int res = 0;
     char filename[FILE_PATH_SIZE] = { 0x00 };
-    FILE *f;
-    bool tag_mem_supplied;
 
-    int len = strlen(Cmd);
-    if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
-    memcpy(filename, Cmd, len);
+    UsbCommand c = {CMD_SIMULATE_HITAG, {0, 0, 0}};
 
-    if (strlen(filename) > 0) {
-        f = fopen(filename, "rb+");
-        if (!f) {
-            PrintAndLogEx(WARNING, "Error: Could not open file [%s]", filename);
-            return 1;
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+            case 'h':
+                free(data);
+                return usage_hitag_sim();
+            case '2':
+                maxdatalen = 48;
+                cmdp++;
+                break;
+            case 's':
+                c.cmd = CMD_SIMULATE_HITAG_S;
+                maxdatalen = 4 * 64;
+                cmdp++;
+                break;
+            case 'e':
+                param_getstr(Cmd, cmdp + 1, filename, sizeof(filename));
+                res = loadFileEML(filename, "eml", data, &datalen);
+                if (res > 0 || datalen != maxdatalen) {
+                    PrintAndLogDevice(FAILED, "error, bytes read mismatch file size");
+                    errors = true;
+                    break;
+                }
+                tag_mem_supplied = true;
+                cmdp += 2;
+                break;
+            case 'j':
+                param_getstr(Cmd, cmdp + 1, filename, sizeof(filename));
+                res = loadFileJSON(filename, "json", data, maxdatalen, &datalen);
+                if (res > 0) {
+                    errors = true;
+                    break;
+                }
+                tag_mem_supplied = true;
+                cmdp += 2;
+                break;
+            case 'b':
+                param_getstr(Cmd, cmdp + 1, filename, sizeof(filename));
+                res = loadFile(filename, "bin", data, maxdatalen, &datalen);
+                if (res > 0) {
+                    errors = true;
+                    break;
+                }
+                tag_mem_supplied = true;
+                cmdp += 2;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                errors = true;
+                break;
         }
-        tag_mem_supplied = true;
-        size_t bytes_read = fread(c.d.asBytes, 1, 48, f);
-        if (bytes_read == 48) {
-            PrintAndLogEx(WARNING, "Error: File reading error");
-            fclose(f);
-            return 1;
-        }
-        fclose(f);
-    } else {
-        tag_mem_supplied = false;
     }
 
-    // Does the tag comes with memory
+    //Validations
+    if (errors || cmdp == 0) {
+        free(data);
+        return usage_hitag_sim();
+    }
+
     c.arg[0] = (uint32_t)tag_mem_supplied;
+    if (tag_mem_supplied) {
+        memcpy(c.d.asBytes, data, datalen);
+    }
     clearCommandBuffer();
     SendCommand(&c);
+
+    free(data);
     return 0;
 }
 
+static void printHitagConfiguration(uint8_t config) {
+    
+    char msg[100];
+    memset(msg, 0, sizeof(msg));
+
+    char bits[9];
+    char *bs = bits;
+    for (uint8_t i = 0 ; i < 8 ; i++) {
+        snprintf(bs, sizeof(bits), "%d", (config >> (7 - i)) & 1);
+        bs++;
+    }
+
+    PrintAndLogEx(INFO, "\n\nHitag2 tag information ");
+    PrintAndLogEx(INFO, "------------------------------------");
+    
+    //configuration byte
+    PrintAndLogEx(SUCCESS, "Config byte : %02X - %s", config, bits);    
+    
+    // encoding
+    strcat(msg, "Encoding    : ");
+    if (config & 0x1) {
+        strcat(msg + strlen(msg), _YELLOW_("Biphase"));
+    } else {
+        strcat(msg + strlen(msg), _YELLOW_("Manchester"));
+    }
+    PrintAndLogEx(SUCCESS, "%s", msg);
+    memset(msg, 0, sizeof(msg));
+
+    // version
+    strcat(msg, "Coding in HITAG 2 operation: %s");
+    uint8_t foo = (config & 0x6) >> 1;
+    switch (foo) {
+        case 0:
+            PrintAndLogEx(SUCCESS, "Version     : public mode B, Coding: biphase");
+            PrintAndLogEx(SUCCESS, msg, (config & 0x1) ? "biphase" : "manchester");
+            break;
+        case 1:
+            PrintAndLogEx(SUCCESS, "Version     : public mode A, Coding: manchester");
+            PrintAndLogEx(SUCCESS, msg, (config & 0x1) ? "biphase" : "manchester");
+            break;
+        case 2:
+            PrintAndLogEx(SUCCESS, "Version     : public mode C, Coding: biphase");
+            PrintAndLogEx(SUCCESS, msg, (config & 0x1) ? "biphase" : "manchester");
+            break;
+        case 3:
+            PrintAndLogEx(SUCCESS, "Version     : Hitag2");
+            PrintAndLogEx(SUCCESS, msg, (config & 0x1) ? "biphase" : "manchester");
+            break;
+    }
+    memset(msg, 0, sizeof(msg));
+
+    // mode
+    strcat(msg, "Tag is in   : ");
+    if (config & 0x8) {
+        strcat(msg + strlen(msg), _YELLOW_("Crypto mode"));
+    } else  {
+        strcat(msg + strlen(msg), _YELLOW_("Password mode"));
+    }
+    PrintAndLogEx(SUCCESS, "%s", msg);
+    memset(msg, 0, sizeof(msg));
+
+    // page access
+    strcat(msg, "Page 6,7    : ");
+    if (config & 0x10) {
+        strcat(msg + strlen(msg), "read only");
+    } else  {
+        strcat(msg + strlen(msg), _GREEN_("read write"));
+    }
+    PrintAndLogEx(SUCCESS, "%s", msg);
+    memset(msg, 0, sizeof(msg));
+
+    // page access
+    strcat(msg, "Page 4,5    : ");    
+    if (config & 0x20) {
+        strcat(msg + strlen(msg), "read only");
+    } else  {
+        strcat(msg + strlen(msg), _GREEN_("read write"));
+    }
+    PrintAndLogEx(SUCCESS, "%s", msg);
+    memset(msg, 0, sizeof(msg));
+
+    // OTP
+    strcat(msg, "Page 3      : ");
+    if (config & 0x40) {
+        strcat(msg + strlen(msg), "read only. Configuration byte and password tag " _RED_("FIXED / IRREVERSIBLE"));
+    } else  {
+        strcat(msg + strlen(msg), _GREEN_("read write"));
+    }
+    PrintAndLogEx(SUCCESS, "%s", msg);
+    memset(msg, 0, sizeof(msg));
+
+    // OTP
+    if (config & 0x80) {
+        strcat(msg, "Page 1      : " _RED_("locked") "\n");
+
+        strcat(msg + strlen(msg), "Page 2      : ");
+        if (config & 0x8) {
+            strcat(msg + strlen(msg), _RED_("locked"));
+        } else {
+            strcat(msg + strlen(msg), "read only");
+        }
+    } else  {
+        strcat(msg, "Page 1,2    : " _GREEN_("read write"));
+    }
+    PrintAndLogEx(SUCCESS, "%s", msg);
+    PrintAndLogEx(INFO, "------------------------------------");
+}
+
+static bool getHitagUid(uint32_t *uid) {
+
+    UsbCommand c = {CMD_READER_HITAG, {RHT2F_UID_ONLY, 0, 0} };
+    clearCommandBuffer();
+    SendCommand(&c);
+    UsbCommand resp;
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
+        PrintAndLogEx(WARNING, "timeout while waiting for reply.");
+        return false;
+    }
+
+    if (resp.arg[0] == false) {
+        PrintAndLogEx(DEBUG, "DEBUG: Error - failed getting UID");
+        return false;
+    }
+
+    if ( uid )
+        *uid = bytes_to_num(resp.d.asBytes, 4);
+   
+    return true;
+}
+
+int CmdLFHitagInfo(const char *Cmd) {
+    PrintAndLogEx(INFO, "Hitag2 tag information ");
+    PrintAndLogEx(INFO, "To be done!");
+    PrintAndLogEx(INFO, "------------------------------------");
+
+    char ctmp = tolower(param_getchar(Cmd, 0));
+    if (ctmp == 'h') return usage_hitag_info();
+    
+    // pwd or key
+
+    // read UID
+    uint32_t uid = 0;
+    if ( getHitagUid( &uid ) == false ) 
+        return 1;
+    
+    PrintAndLogEx(SUCCESS, "UID: %08X", uid);
+    
+    // how to detemine Hitag types?
+    
+    // read block3,  get configuration byte.
+
+    // common configurations.
+    printHitagConfiguration(0x06);
+    //printHitagConfiguration( 0x0E );
+    //printHitagConfiguration( 0x02 );
+    //printHitagConfiguration( 0x00 );
+    //printHitagConfiguration( 0x04 );
+    return 0;
+}
+
+// TODO: iceman 
+// Hitag2 reader,  problem is that this command mixes up stuff.  So 26 give uid.  21 etc will also give you a memory dump !?
+//
 int CmdLFHitagReader(const char *Cmd) {
 
     UsbCommand c = {CMD_READER_HITAG, {0, 0, 0} };
@@ -228,25 +517,25 @@ int CmdLFHitagReader(const char *Cmd) {
             c.cmd = CMD_READ_HITAG_S;
             num_to_bytes(param_get32ex(Cmd, 1, 0, 16), 4, htd->auth.NrAr);
             num_to_bytes(param_get32ex(Cmd, 2, 0, 16), 4, htd->auth.NrAr + 4);
-        break;
+            break;
         }
         case RHTSF_KEY: {
             c.cmd = CMD_READ_HITAG_S;
             num_to_bytes(param_get64ex(Cmd, 1, 0, 16), 6, htd->crypto.key);
-        break;
+            break;
         }
         case RHT2F_PASSWORD: {
             num_to_bytes(param_get32ex(Cmd, 1, 0, 16), 4, htd->pwd.password);
-        break;
+            break;
         }
         case RHT2F_AUTHENTICATE: {
             num_to_bytes(param_get32ex(Cmd, 1, 0, 16), 4, htd->auth.NrAr);
             num_to_bytes(param_get32ex(Cmd, 2, 0, 16), 4, htd->auth.NrAr + 4);
-        break;
+            break;
         }
         case RHT2F_CRYPTO: {
             num_to_bytes(param_get64ex(Cmd, 1, 0, 16), 6, htd->crypto.key);
-        break;
+            break;
         }
         case RHT2F_TEST_AUTH_ATTEMPTS: {
             // No additional parameters needed
@@ -257,7 +546,6 @@ int CmdLFHitagReader(const char *Cmd) {
             break;
         }
         default: {
-            PrintAndLogEx(NORMAL, "\nError: unkown reader function %d", htf);
             return usage_hitag_reader();
         }
     }
@@ -278,150 +566,136 @@ int CmdLFHitagReader(const char *Cmd) {
 
     uint32_t id = bytes_to_num(resp.d.asBytes, 4);
 
-    if (htf == RHT2F_UID_ONLY) {
-        PrintAndLogEx(NORMAL, "Valid Hitag2 tag found - UID: %08x", id);
-    } else {
+    PrintAndLogEx(SUCCESS, "Valid Hitag2 tag found - UID: %08x", id);
+    if (htf != RHT2F_UID_ONLY) {
+        
+        PrintAndLogEx(SUCCESS, "Dumping tag memory..." );
+        uint8_t *data = resp.d.asBytes;
+
         char filename[FILE_PATH_SIZE];
-        FILE *f = NULL;
-        sprintf(filename, "%08x_%04x.ht2", id, (rand() & 0xffff));
-        f = fopen(filename, "wb");
-        if (!f) {
-            PrintAndLogEx(WARNING, "Error: Could not open file [%s]", filename);
-            return 1;
-        }
+        char *fnameptr = filename;
+        fnameptr += sprintf(fnameptr, "lf-hitag-");
+        FillFileNameByUID(fnameptr, data, "-dump", 4);
 
-        // Write the 48 tag memory bytes to file and finalize
-        fwrite(resp.d.asBytes, 1, 48, f);
-        fclose(f);
-        PrintAndLogEx(NORMAL, "Succesfully saved tag memory to [%s]", filename);
+        saveFile(filename, "bin", data, 48);
+        saveFileEML(filename, "eml", data, 48, 4);
+        saveFileJSON(filename, "json", jsfHitag, data, 48);
+        
+        // block3, 1 byte
+        printHitagConfiguration(data[4*3] );
     }
     return 0;
 }
 
-int CmdLFHitagSimS(const char *Cmd) {
-    UsbCommand c = { CMD_SIMULATE_HITAG_S };
-    char filename[FILE_PATH_SIZE] = { 0x00 };
-    FILE *f;
-    bool tag_mem_supplied;
-    int len = strlen(Cmd);
-    if (len > FILE_PATH_SIZE)
-        len = FILE_PATH_SIZE;
-    memcpy(filename, Cmd, len);
-
-    if (strlen(filename) > 0) {
-        f = fopen(filename, "rb+");
-        if (!f) {
-            PrintAndLogEx(WARNING, "Error: Could not open file [%s]", filename);
-            return 1;
-        }
-        tag_mem_supplied = true;
-        size_t bytes_read = fread(c.d.asBytes, 1, 4 * 64, f);
-        if (bytes_read == 4 * 64) {
-            PrintAndLogEx(WARNING, "Error: File reading error");
-            fclose(f);
-            return 1;
-        }
-        fclose(f);
-    } else {
-        tag_mem_supplied = false;
-    }
-
-    // Does the tag comes with memory
-    c.arg[0] = (uint32_t) tag_mem_supplied;
-    clearCommandBuffer();
-    SendCommand(&c);
-    return 0;
-}
-
 int CmdLFHitagCheckChallenges(const char *Cmd) {
-    UsbCommand c = { CMD_TEST_HITAGS_TRACES };
-    char filename[FILE_PATH_SIZE] = { 0x00 };
-    FILE *f;
-    bool file_given;
-    int len = strlen(Cmd);
-    if (len > FILE_PATH_SIZE)
-        len = FILE_PATH_SIZE;
-    memcpy(filename, Cmd, len);
 
-    if (strlen(filename) > 0) {
-        f = fopen(filename, "rb+");
-        if (!f) {
-            PrintAndLogEx(WARNING, "Error: Could not open file [%s]", filename);
-            return 1;
+    UsbCommand c = { CMD_TEST_HITAGS_TRACES, {0, 0, 0}};
+    char filename[FILE_PATH_SIZE] = { 0x00 };
+    size_t datalen = 0;
+    int res = 0;
+    bool file_given = false;
+    bool errors = false;
+    uint8_t cmdp = 0;
+    uint8_t *data = calloc(8 * 60, sizeof(uint8_t));
+
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+            case 'h':
+                free(data);
+                return usage_hitag_checkchallenges();
+            case 'f':
+                param_getstr(Cmd, cmdp + 1, filename, sizeof(filename));
+                res = loadFile(filename, "cc", data, 8 * 60, &datalen);
+                if (res > 0) {
+                    errors = true;
+                    break;
+                }
+
+                memcpy(c.d.asBytes, data, datalen);
+                file_given = true;
+                cmdp += 2;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                errors = true;
+                break;
         }
-        file_given = true;
-        size_t bytes_read = fread(c.d.asBytes, 1, 8 * 60, f);
-        if (bytes_read == 8 * 60) {
-            PrintAndLogEx(WARNING, "Error: File reading error");
-            fclose(f);
-            return 1;
-        }
-        fclose(f);
-    } else {
-        file_given = false;
+    }
+
+    //Validations
+    if (errors) {
+        free(data);
+        return usage_hitag_checkchallenges();
     }
 
     //file with all the challenges to try
     c.arg[0] = (uint32_t)file_given;
     clearCommandBuffer();
     SendCommand(&c);
+
+    free(data);
     return 0;
 }
 
-int CmdLFHitagWP(const char *Cmd) {
-    UsbCommand c = { CMD_WR_HITAG_S };
+int CmdLFHitagWriter(const char *Cmd) {
+    UsbCommand c = { CMD_WR_HITAG_S, {0, 0, 0}};
     hitag_data *htd = (hitag_data *)c.d.asBytes;
     hitag_function htf = param_get32ex(Cmd, 0, 0, 10);
+
     switch (htf) {
-        case 03: { //WHTSF_CHALLENGE
+        case WHTSF_CHALLENGE: {
             num_to_bytes(param_get64ex(Cmd, 1, 0, 16), 8, htd->auth.NrAr);
             c.arg[2] = param_get32ex(Cmd, 2, 0, 10);
             num_to_bytes(param_get32ex(Cmd, 3, 0, 16), 4, htd->auth.data);
+            break;
         }
-        break;
-        case 04:
-        case 24: {
-            //WHTSF_KEY
+        case WHTSF_KEY:
+        case WHT2F_CRYPTO: {
             num_to_bytes(param_get64ex(Cmd, 1, 0, 16), 6, htd->crypto.key);
             c.arg[2] = param_get32ex(Cmd, 2, 0, 10);
             num_to_bytes(param_get32ex(Cmd, 3, 0, 16), 4, htd->crypto.data);
-
+            break;
         }
-        break;
         default: {
-            PrintAndLogEx(WARNING, "Error: unkown writer function %d", htf);
-            PrintAndLogEx(NORMAL, "Hitag writer functions");
-            PrintAndLogEx(NORMAL, " HitagS (0*)");
-            PrintAndLogEx(NORMAL, "  03 <nr,ar> (Challenge) <page> <byte0...byte3> write page on a Hitag S tag");
-            PrintAndLogEx(NORMAL, "  04 <key> (set to 0 if no authentication is needed) <page> <byte0...byte3> write page on a Hitag S tag");
-            PrintAndLogEx(NORMAL, " Hitag1 (1*)");
-            PrintAndLogEx(NORMAL, " Hitag2 (2*)");
-            return 1;
+            return usage_hitag_writer();
         }
-        break;
     }
-    // Copy the hitag function into the first argument
+
     c.arg[0] = htf;
 
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
-    WaitForResponse(CMD_ACK, &resp);
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 4000)) {
+        PrintAndLogEx(WARNING, "timeout while waiting for reply.");
+        return 1;
+    }
 
-    // Check the return status, stored in the first argument
-    if (resp.arg[0] == false) return 1;
+    if (resp.arg[0] == false) {
+        PrintAndLogEx(DEBUG, "DEBUG: Error - hitag write failed");
+        return 1;
+    }
+    return 0;
+}
+
+int CmdLFHitagDump(const char *Cmd) {
+    PrintAndLogEx(INFO, "Dumping of tag memory");
+    PrintAndLogEx(INFO, "To be done!");
+
+    char ctmp = tolower(param_getchar(Cmd, 0));
+    if (ctmp == 'h') return usage_hitag_dump();
     return 0;
 }
 
 static command_t CommandTable[] = {
-    {"help",    CmdHelp,           1, "This help"},
-    {"list",    CmdLFHitagList,    1, "<outfile> List Hitag trace history"},
-    {"reader",  CmdLFHitagReader,  1, "Act like a Hitag Reader"},
-    {"sim",     CmdLFHitagSim,     1, "<infile> Simulate Hitag transponder"},
-    {"simS",    CmdLFHitagSimS,    1, "<hitagS.hts> Simulate HitagS transponder" },
-    {"snoop",   CmdLFHitagSnoop,   1, "Eavesdrop Hitag communication"},
-    {"writer",  CmdLFHitagWP,      1, "Act like a Hitag Writer" },
-    {"check_challenges", CmdLFHitagCheckChallenges,   1, "<challenges.cc> test all challenges" },
+    {"help",     CmdHelp,                   1, "This help" },
+    {"list",     CmdLFHitagList,            0, "List Hitag trace history" },
+    {"info",     CmdLFHitagInfo,            1, "Tag information" },
+    {"reader",   CmdLFHitagReader,          1, "Act like a Hitag Reader" },
+    {"sim",      CmdLFHitagSim,             1, "Simulate Hitag transponder" },
+    {"sniff",    CmdLFHitagSniff,           1, "Eavesdrop Hitag communication" },
+    {"writer",   CmdLFHitagWriter,          1, "Act like a Hitag Writer" },
+    {"cc",       CmdLFHitagCheckChallenges, 1, "Test all challenges" },
     { NULL, NULL, 0, NULL }
 };
 
diff --git a/client/cmdlfhitag.h b/client/cmdlfhitag.h
index e43ed58ff..eb5bb2dd0 100644
--- a/client/cmdlfhitag.h
+++ b/client/cmdlfhitag.h
@@ -14,11 +14,12 @@
 extern int CmdLFHitag(const char *Cmd);
 
 extern int CmdLFHitagList(const char *Cmd);
-extern int CmdLFHitagReader(const char *Cmd);
+extern int CmdLFHitagSniff(const char *Cmd);
 extern int CmdLFHitagSim(const char *Cmd);
-extern int CmdLFHitagSimS(const char *Cmd);
-extern int CmdLFHitagSnoop(const char *Cmd);
-extern int CmdLFHitagWP(const char *Cmd);
+extern int CmdLFHitagInfo(const char *Cmd);
+extern int CmdLFHitagReader(const char *Cmd);
 extern int CmdLFHitagCheckChallenges(const char *Cmd);
+extern int CmdLFHitagWriter(const char *Cmd);
+extern int CmdLFHitagDump(const char *cmd);
 
 #endif
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 91f4a456f..41512c6b9 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1882,7 +1882,7 @@ int CmdT55xxRecoverPW(const char *Cmd) {
 
     // first try fliping each bit in the expected password
     while (bit < 32) {
-        curr_password = orig_password ^ (1 << bit);
+        curr_password = orig_password ^ (1u << bit);
         found = tryOnePassword(curr_password);
         if (found == -1) return 0;
         bit++;
@@ -1897,7 +1897,7 @@ int CmdT55xxRecoverPW(const char *Cmd) {
     // from low bit to high bit
     bit = 0;
     while (bit < 32) {
-        mask += (1 << bit);
+        mask += (1u << bit);
         curr_password = orig_password & mask;
         // if updated mask didn't change the password, don't try it again
         if (prev_password == curr_password) {
@@ -1916,7 +1916,7 @@ int CmdT55xxRecoverPW(const char *Cmd) {
     bit = 0;
     mask = 0xffffffff;
     while (bit < 32) {
-        mask -= (1 << bit);
+        mask -= (1u << bit);
         curr_password = orig_password & mask;
         // if updated mask didn't change the password, don't try it again
         if (prev_password == curr_password) {
diff --git a/client/cmdlfti.c b/client/cmdlfti.c
index 6abb9b5de..5d3c2e399 100644
--- a/client/cmdlfti.c
+++ b/client/cmdlfti.c
@@ -191,7 +191,7 @@ int CmdTIDemod(const char *Cmd) {
             bits[i] = '1';
             maxPos += highLen;
             // bitstream arrives lsb first so shift right
-            shift3 |= (1 << 31);
+            shift3 |= (1u << 31);
         } else {
             bits[i] = '.';
             maxPos += lowLen;
diff --git a/client/cmdmain.c b/client/cmdmain.c
index 608a0e668..5bbd689e1 100644
--- a/client/cmdmain.c
+++ b/client/cmdmain.c
@@ -74,4 +74,4 @@ int CmdRev(const char *Cmd) {
 //-----------------------------------------------------------------------------
 int CommandReceived(char *Cmd) {
     return CmdsParse(CommandTable, Cmd);
-}
\ No newline at end of file
+}
diff --git a/client/cmdscript.c b/client/cmdscript.c
index 2e2ec5f53..e1a21ffc4 100644
--- a/client/cmdscript.c
+++ b/client/cmdscript.c
@@ -193,4 +193,4 @@ int CmdScript(const char *Cmd) {
 int CmdHelp(const char *Cmd) {
     PrintAndLogEx(NORMAL, "This is a feature to run Lua-scripts. You can place lua-scripts within the scripts/-folder. ");
     return 0;
-}
\ No newline at end of file
+}
diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index 27b2afc39..8d00fa128 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -49,13 +49,13 @@ int usage_sm_info(void) {
     return 0;
 }
 int usage_sm_upgrade(void) {
-    PrintAndLogEx(NORMAL, "Upgrade firmware");
+    PrintAndLogEx(NORMAL, "Upgrade RDV4.0 Sim module firmware");
     PrintAndLogEx(NORMAL, "Usage:  sc upgrade f <file name>");
     PrintAndLogEx(NORMAL, "       h               :  this help");
     PrintAndLogEx(NORMAL, "       f <filename>    :  firmware file name");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
-    PrintAndLogEx(NORMAL, "        sc upgrade f myfile");
+    PrintAndLogEx(NORMAL, "        sc upgrade f ../tools/simmodule/SIM011.BIN");
     return 0;
 }
 int usage_sm_setclock(void) {
@@ -116,7 +116,7 @@ uint8_t GetATRTA1(uint8_t *atr, size_t atrlen) {
             return atr[2];
     }
 
-    return 0x11; // default value is ‘0x11’, corresponding to fmax=5 MHz, Fi=372, Di=1.
+    return 0x11; // default value is 0x11, corresponding to fmax=5 MHz, Fi=372, Di=1.
 }
 
 int DiArray[] = {
@@ -196,6 +196,8 @@ static int PrintATR(uint8_t *atr, size_t atrlen) {
     uint8_t T0 = atr[1];
     uint8_t K = T0 & 0x0F;
     uint8_t TD1 = 0, T1len = 0, TD1len = 0, TDilen = 0;
+    bool protocol_T0_present = true;
+    bool protocol_T15_present = false;
 
     if (T0 & 0x10) {
         PrintAndLog("\t- TA1 (Maximum clock frequency, proposed bit duration) [ 0x%02x ]", atr[2 + T1len]);
@@ -215,6 +217,14 @@ static int PrintATR(uint8_t *atr, size_t atrlen) {
     if (T0 & 0x80) {
         TD1 = atr[2 + T1len];
         PrintAndLog("\t- TD1 (First offered transmission protocol, presence of TA2..TD2) [ 0x%02x ] Protocol T%d", TD1, TD1 & 0x0f);
+        protocol_T0_present = false;
+        if ((TD1 & 0x0f) == 0) {
+            protocol_T0_present = true;
+        }
+        if ((TD1 & 0x0f) == 15) {
+            protocol_T15_present = true;
+        }
+
         T1len++;
 
         if (TD1 & 0x10) {
@@ -232,6 +242,12 @@ static int PrintATR(uint8_t *atr, size_t atrlen) {
         if (TD1 & 0x80) {
             uint8_t TDi = atr[2 + T1len + TD1len];
             PrintAndLog("\t- TD2 (A supported protocol or more global parameters, presence of TA3..TD3) [ 0x%02x ] Protocol T%d", TDi, TDi & 0x0f);
+            if ((TDi & 0x0f) == 0) {
+                protocol_T0_present = true;
+            }
+            if ((TDi & 0x0f) == 15) {
+                protocol_T15_present = true;
+            }
             TD1len++;
 
             bool nextCycle = true;
@@ -262,19 +278,20 @@ static int PrintATR(uint8_t *atr, size_t atrlen) {
         }
     }
 
-    uint8_t vxor = 0;
-    for (int i = 1; i < atrlen; i++)
-        vxor ^= atr[i];
+    if (!protocol_T0_present || protocol_T15_present) { // there is CRC Check Byte TCK
+        uint8_t vxor = 0;
+        for (int i = 1; i < atrlen; i++)
+            vxor ^= atr[i];
 
-    if (vxor)
-        PrintAndLogEx(WARNING, "Check summ error. Must be 0 got 0x%02X", vxor);
-    else
-        PrintAndLogEx(INFO, "Check summ OK.");
+        if (vxor)
+            PrintAndLogEx(WARNING, "Check sum error. Must be 0 got 0x%02X", vxor);
+        else
+            PrintAndLogEx(INFO, "Check sum OK.");
+    }
 
     if (atr[0] != 0x3b)
         PrintAndLogEx(WARNING, "Not a direct convention [ 0x%02x ]", atr[0]);
 
-
     uint8_t calen = 2 + T1len + TD1len + TDilen + K;
 
     if (atrlen != calen && atrlen != calen + 1)  // may be CRC
@@ -561,8 +578,9 @@ int ExchangeAPDUSC(uint8_t *datain, int datainlen, bool activateCard, bool leave
 
 int CmdSmartUpgrade(const char *Cmd) {
 
-    PrintAndLogEx(WARNING, "WARNING - Smartcard socket firmware upgrade.");
-    PrintAndLogEx(WARNING, "A dangerous command, do wrong and you will brick the smart card socket");
+    PrintAndLogEx(WARNING, "WARNING - Sim module firmware upgrade.");
+    PrintAndLogEx(WARNING, "A dangerous command, do wrong and you could brick the sim module");
+    PrintAndLogEx(NORMAL, "");
 
     FILE *f;
     char filename[FILE_PATH_SIZE] = {0};
@@ -592,10 +610,33 @@ int CmdSmartUpgrade(const char *Cmd) {
     //Validations
     if (errors || cmdp == 0) return usage_sm_upgrade();
 
-    // load file
+
+    char sha512filename[FILE_PATH_SIZE] = {'\0'};
+    char *bin_extension = filename;
+    char *dot_position = NULL;
+    while ((dot_position = strchr(bin_extension, '.')) != NULL) {
+        bin_extension = dot_position + 1;
+    }
+
+    if (!strcmp(bin_extension, "BIN")
+#ifdef _WIN32
+            || !strcmp(bin_extension, "bin")
+#endif
+       ) {
+        memcpy(sha512filename, filename, strlen(filename) - strlen("bin"));
+        strcat(sha512filename, "sha512.txt");
+    } else {
+        PrintAndLogEx(FAILED, "Filename extension of firmware upgrade file must be .BIN");
+        return 1;
+    }
+
+    PrintAndLogEx(INFO, "firmware file      : " _YELLOW_("%s"), filename);
+    PrintAndLogEx(INFO, "Checking integrity : " _YELLOW_("%s"), sha512filename);
+
+    // load firmware file
     f = fopen(filename, "rb");
     if (!f) {
-        PrintAndLogEx(FAILED, "File: " _YELLOW_("%s") ": not found or locked.", filename);
+        PrintAndLogEx(FAILED, "Firmware file " _YELLOW_("%s") " not found or locked.", filename);
         return 1;
     }
 
@@ -605,27 +646,77 @@ int CmdSmartUpgrade(const char *Cmd) {
     fseek(f, 0, SEEK_SET);
 
     if (fsize < 0) {
-        PrintAndLogDevice(WARNING, "error, when getting filesize");
+        PrintAndLogEx(WARNING, "error, when getting filesize");
         fclose(f);
         return 1;
     }
 
     uint8_t *dump = calloc(fsize, sizeof(uint8_t));
     if (!dump) {
-        PrintAndLogDevice(WARNING, "error, cannot allocate memory ");
+        PrintAndLogEx(WARNING, "error, cannot allocate memory ");
         fclose(f);
         return 1;
     }
 
-    size_t bytes_read = fread(dump, 1, fsize, f);
+    size_t firmware_size = fread(dump, 1, fsize, f);
+    if (f) {
+        fclose(f);
+    }
+
+    // load sha512 file
+    f = fopen(sha512filename, "rb");
+    if (!f) {
+        PrintAndLogEx(FAILED, "SHA-512 file not found or locked.");
+        return 1;
+    }
+
+    // get filesize in order to malloc memory
+    fseek(f, 0, SEEK_END);
+    fsize = ftell(f);
+    fseek(f, 0, SEEK_SET);
+
+    if (fsize < 0)  {
+        PrintAndLogEx(FAILED, "Could not determine size of SHA-512 file");
+        fclose(f);
+        return 1;
+    }
+
+    if (fsize < 128) {
+        PrintAndLogEx(FAILED, "SHA-512 file too short");
+        fclose(f);
+        return 1;
+    }
+
+    char hashstring[129];
+    size_t bytes_read = fread(hashstring, 1, 128, f);
+    hashstring[128] = '\0';
+
     if (f)
         fclose(f);
 
-    PrintAndLogEx(SUCCESS, "Smartcard socket firmware uploading to PM3");
+    uint8_t hash1[64];
+    if (bytes_read != 128 || param_gethex(hashstring, 0, hash1, 128)) {
+        PrintAndLogEx(FAILED, "Couldn't read SHA-512 file");
+        return 1;
+    }
+
+    uint8_t hash2[64];
+    if (sha512hash(dump, firmware_size, hash2)) {
+        PrintAndLogEx(FAILED, "Couldn't calculate SHA-512 of firmware");
+        return 1;
+    }
+
+    if (memcmp(hash1, hash2, 64)) {
+        PrintAndLogEx(FAILED, "Couldn't verify integrity of firmware file " _RED_("(wrong SHA-512 hash)"));
+        return 1;
+    }
+
+    PrintAndLogEx(SUCCESS, "Sim module firmware uploading to PM3");
+
     //Send to device
     uint32_t index = 0;
     uint32_t bytes_sent = 0;
-    uint32_t bytes_remaining = bytes_read;
+    uint32_t bytes_remaining = firmware_size;
 
     while (bytes_remaining > 0) {
         uint32_t bytes_in_packet = MIN(USB_CMD_DATA_SIZE, bytes_remaining);
@@ -649,10 +740,10 @@ int CmdSmartUpgrade(const char *Cmd) {
     }
     free(dump);
     printf("\n");
-    PrintAndLogEx(SUCCESS, "Smartcard socket firmware updating,  don\'t turn off your PM3!");
+    PrintAndLogEx(SUCCESS, "Sim module firmware updating,  don\'t turn off your PM3!");
 
     // trigger the firmware upgrade
-    UsbCommand c = {CMD_SMART_UPGRADE, {bytes_read, 0, 0}};
+    UsbCommand c = {CMD_SMART_UPGRADE, {firmware_size, 0, 0}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
@@ -660,10 +751,12 @@ int CmdSmartUpgrade(const char *Cmd) {
         PrintAndLogEx(WARNING, "timeout while waiting for reply.");
         return 1;
     }
-    if ((resp.arg[0] & 0xFF))
-        PrintAndLogEx(SUCCESS, "Smartcard socket firmware upgraded successful");
-    else
-        PrintAndLogEx(FAILED, "Smartcard socket firmware updating failed");
+    if ((resp.arg[0] & 0xFF)) {
+        PrintAndLogEx(SUCCESS, "Sim module firmware upgrade " _GREEN_("successful"));
+        PrintAndLogEx(SUCCESS, "\n run " _YELLOW_("`hw status`") " to validate the fw version ");
+    } else {
+        PrintAndLogEx(FAILED, "Sim module firmware upgrade " _RED_("failed"));
+    }
     return 0;
 }
 
@@ -874,11 +967,11 @@ static void smart_brute_prim() {
 
         if (len > 2) {
 
-            //if ( decodeTLV ) {
-            //if (!TLVPrintFromBuffer(buf, len-2)) {
+            // if ( decodeTLV ) {
+            // if (!TLVPrintFromBuffer(buf, len-2)) {
             PrintAndLogEx(SUCCESS, "\tHEX  %d |: %s", len, sprint_hex(buf, len));
-            //}
-            //}
+            // }
+            // }
         }
         len = 0;
     }
@@ -1124,14 +1217,14 @@ int CmdSmartBruteforceSFI(const char *Cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",    CmdHelp,               1, "This help"},
-    {"list",    CmdSmartList,          0, "List ISO 7816 history"},
-    {"info",    CmdSmartInfo,          1, "Tag information"},
-    {"reader",  CmdSmartReader,        1, "Act like an IS07816 reader"},
-    {"raw",     CmdSmartRaw,           1, "Send raw hex data to tag"},
-    {"upgrade", CmdSmartUpgrade,       1, "Upgrade firmware"},
+    {"help",     CmdHelp,               1, "This help"},
+    {"list",     CmdSmartList,          0, "List ISO 7816 history"},
+    {"info",     CmdSmartInfo,          1, "Tag information"},
+    {"reader",   CmdSmartReader,        1, "Act like an IS07816 reader"},
+    {"raw",      CmdSmartRaw,           1, "Send raw hex data to tag"},
+    {"upgrade",  CmdSmartUpgrade,       1, "Upgrade sim module firmware"},
     {"setclock", CmdSmartSetClock,      1, "Set clock speed"},
-    {"brute",   CmdSmartBruteforceSFI, 1, "Bruteforce SFI"},
+    {"brute",    CmdSmartBruteforceSFI, 1, "Bruteforce SFI"},
     {NULL, NULL, 0, NULL}
 };
 
diff --git a/client/cmdsmartcard.h b/client/cmdsmartcard.h
index 14e79cd4e..251859761 100644
--- a/client/cmdsmartcard.h
+++ b/client/cmdsmartcard.h
@@ -25,6 +25,7 @@
 #include "emv/emvcore.h"        // decodeTVL
 #include "emv/apduinfo.h"       // APDUcode description
 #include "emv/dump.h"           // dump_buffer
+#include "crypto/libpcrypto.h"	// sha512hash
 
 extern int CmdSmartcard(const char *Cmd);
 
@@ -40,4 +41,4 @@ extern int usage_sm_raw(void);
 extern int usage_sm_reader(void);
 extern int usage_sm_info(void);
 extern int usage_sm_upgrade(void);
-#endif
\ No newline at end of file
+#endif
diff --git a/client/cmdtrace.c b/client/cmdtrace.c
index 77f85ce5c..05a85a050 100644
--- a/client/cmdtrace.c
+++ b/client/cmdtrace.c
@@ -36,6 +36,7 @@ int usage_trace_list() {
     PrintAndLogEx(NORMAL, "    7816   - interpret data as iso7816-4 communications");
     PrintAndLogEx(NORMAL, "    legic  - interpret data as LEGIC communications");
     PrintAndLogEx(NORMAL, "    felica - interpret data as ISO18092 / FeliCa communications");
+    PrintAndLogEx(NORMAL, "    hitag  - interpret data as Hitag2 / HitagS communications");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "        trace list 14a f");
@@ -175,6 +176,7 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
                 crcStatus = iso15693_CRC_check(frame, data_len);
                 break;
             case ISO_7816_4:
+            case PROTO_HITAG:
             default:
                 break;
         }
@@ -189,11 +191,12 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
     for (int j = 0; j < data_len && j / 18 < 18; j++) {
 
         uint8_t parityBits = parityBytes[j >> 3];
-        if (protocol != LEGIC &&
-                protocol != ISO_14443B &&
-                protocol != ISO_7816_4 &&
-                (isResponse || protocol == ISO_14443A) &&
-                (oddparity8(frame[j]) != ((parityBits >> (7 - (j & 0x0007))) & 0x01))) {
+        if (protocol != LEGIC
+                && protocol != ISO_14443B
+                && protocol != ISO_7816_4
+                && protocol != PROTO_HITAG
+                && (isResponse || protocol == ISO_14443A)
+                && (oddparity8(frame[j]) != ((parityBits >> (7 - (j & 0x0007))) & 0x01))) {
 
             snprintf(line[j / 18] + ((j % 18) * 4), 110, "%02x! ", frame[j]);
         } else {
@@ -556,16 +559,17 @@ int CmdTraceList(const char *Cmd) {
 
             // validate type of output
             if (strcmp(type,     "iclass") == 0)    protocol = ICLASS;
-            else if (strcmp(type, "14a") == 0)       protocol = ISO_14443A;
-            else if (strcmp(type, "14b") == 0)       protocol = ISO_14443B;
-            else if (strcmp(type, "topaz") == 0)     protocol = TOPAZ;
-            else if (strcmp(type, "7816") == 0)      protocol = ISO_7816_4;
-            else if (strcmp(type, "des") == 0)       protocol = MFDES;
-            else if (strcmp(type, "legic") == 0)     protocol = LEGIC;
-            else if (strcmp(type, "15") == 0)        protocol = ISO_15693;
-            else if (strcmp(type, "felica") == 0)    protocol = FELICA;
-            else if (strcmp(type, "mf") == 0)        protocol = PROTO_MIFARE;
-            else if (strcmp(type, "raw") == 0)       protocol = -1; //No crc, no annotations
+            else if (strcmp(type, "14a") == 0)      protocol = ISO_14443A;
+            else if (strcmp(type, "14b") == 0)      protocol = ISO_14443B;
+            else if (strcmp(type, "topaz") == 0)    protocol = TOPAZ;
+            else if (strcmp(type, "7816") == 0)     protocol = ISO_7816_4;
+            else if (strcmp(type, "des") == 0)      protocol = MFDES;
+            else if (strcmp(type, "legic") == 0)    protocol = LEGIC;
+            else if (strcmp(type, "15") == 0)       protocol = ISO_15693;
+            else if (strcmp(type, "felica") == 0)   protocol = FELICA;
+            else if (strcmp(type, "mf") == 0)       protocol = PROTO_MIFARE;
+            else if (strcmp(type, "hitag") == 0)    protocol = PROTO_HITAG;
+            else if (strcmp(type, "raw") == 0)      protocol = -1; //No crc, no annotations
             else errors = true;
 
             cmdp++;
@@ -625,6 +629,8 @@ int CmdTraceList(const char *Cmd) {
             PrintAndLogEx(NORMAL, "ISO15693 - Timings are not as accurate");
         if (protocol == ISO_7816_4)
             PrintAndLogEx(NORMAL, "ISO7816-4 / Smartcard - Timings N/A yet");
+        if (protocol == PROTO_HITAG)
+            PrintAndLogEx(NORMAL, "Hitag2 / HitagS - Timings in ETU (8us)");
 
         PrintAndLogEx(NORMAL, "");
         PrintAndLogEx(NORMAL, "      Start |        End | Src | Data (! denotes parity error)                                           | CRC | Annotation");
@@ -642,8 +648,8 @@ int CmdTraceLoad(const char *Cmd) {
 
     FILE *f = NULL;
     char filename[FILE_PATH_SIZE];
-    char cmdp = param_getchar(Cmd, 0);
-    if (strlen(Cmd) < 1 || cmdp == 'h' || cmdp == 'H') return usage_trace_load();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) < 1 || cmdp == 'h') return usage_trace_load();
 
     param_getstr(Cmd, 0, filename, sizeof(filename));
 
@@ -688,13 +694,13 @@ int CmdTraceLoad(const char *Cmd) {
 int CmdTraceSave(const char *Cmd) {
 
     if (traceLen == 0) {
-        PrintAndLogEx(WARNING, "trace is empty, exiting...");
+        PrintAndLogEx(WARNING, "trace is empty, nothing to save");
         return 0;
     }
 
     char filename[FILE_PATH_SIZE];
-    char cmdp = param_getchar(Cmd, 0);
-    if (strlen(Cmd) < 1 || cmdp == 'h' || cmdp == 'H') return usage_trace_save();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) < 1 || cmdp == 'h') return usage_trace_save();
 
     param_getstr(Cmd, 0, filename, sizeof(filename));
     saveFile(filename, "bin", trace, traceLen);
diff --git a/client/crypto/libpcrypto.c b/client/crypto/libpcrypto.c
index 883de0dbb..095d16af3 100644
--- a/client/crypto/libpcrypto.c
+++ b/client/crypto/libpcrypto.c
@@ -19,6 +19,7 @@
 #include <mbedtls/pk.h>
 #include <mbedtls/ecdsa.h>
 #include <mbedtls/sha256.h>
+#include <mbedtls/sha512.h>
 #include <mbedtls/ctr_drbg.h>
 #include <mbedtls/entropy.h>
 #include <mbedtls/error.h>
@@ -106,6 +107,20 @@ int sha256hash(uint8_t *input, int length, uint8_t *hash) {
     return 0;
 }
 
+int sha512hash(uint8_t *input, int length, uint8_t *hash) {
+    if (!hash || !input)
+        return 1;
+
+    mbedtls_sha512_context sctx;
+    mbedtls_sha512_init(&sctx);
+    mbedtls_sha512_starts(&sctx, 0); //SHA-512, not 384
+    mbedtls_sha512_update(&sctx, input, length);
+    mbedtls_sha512_finish(&sctx, hash);
+    mbedtls_sha512_free(&sctx);
+
+    return 0;
+}
+
 int ecdsa_init_str(mbedtls_ecdsa_context *ctx, char *key_d, char *key_x, char *key_y) {
     if (!ctx)
         return 1;
diff --git a/client/crypto/libpcrypto.h b/client/crypto/libpcrypto.h
index 5f3592b7a..2cb4644a8 100644
--- a/client/crypto/libpcrypto.h
+++ b/client/crypto/libpcrypto.h
@@ -22,6 +22,7 @@ extern int aes_cmac(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *mac, int
 extern int aes_cmac8(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *mac, int length);
 
 extern int sha256hash(uint8_t *input, int length, uint8_t *hash);
+extern int sha512hash(uint8_t *input, int length, uint8_t *hash);
 
 extern int ecdsa_key_create(uint8_t *key_d, uint8_t *key_xy);
 extern int ecdsa_public_key_from_pk(mbedtls_pk_context *pk, uint8_t *key, size_t keylen);
diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index 31886cf75..b5edfa81c 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -288,6 +288,7 @@ int CmdEMVGPO(const char *cmd) {
         PrintAndLogEx(ERR, "Can't create PDOL data.");
         tlvdb_free(tmp_ext);
         tlvdb_free(tlvRoot);
+        free(pdol_data_tlv);
         return 4;
     }
     PrintAndLogEx(INFO, "PDOL data[%d]: %s", pdol_data_tlv_data_len, sprint_hex(pdol_data_tlv_data, pdol_data_tlv_data_len));
@@ -1577,6 +1578,7 @@ int CmdEMVScan(const char *cmd) {
     if (!pdol_data_tlv_data) {
         PrintAndLogEx(ERR, "Can't create PDOL data.");
         tlvdb_free(tlvRoot);
+        free(pdol_data_tlv);
         DropFieldEx(channel);
         return 6;
     }
diff --git a/client/emv/emvjson.h b/client/emv/emvjson.h
index d47109f7c..18326083f 100644
--- a/client/emv/emvjson.h
+++ b/client/emv/emvjson.h
@@ -38,4 +38,4 @@ extern int JsonLoadBufAsHex(json_t *elm, char *path, uint8_t *data, size_t maxbu
 
 extern bool ParamLoadFromJson(struct tlvdb *tlv);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/client/fpga_compress.c b/client/fpga_compress.c
index 36e5872e0..7c5a4a883 100644
--- a/client/fpga_compress.c
+++ b/client/fpga_compress.c
@@ -322,42 +322,42 @@ static int FpgaGatherVersion(FILE *infile, char *infile_name, char *dst, int len
     }
 
     if (!memcmp("fpga_lf", basename(infile_name), 7))
-        strncat(dst, "LF", len - 1);
+        strncat(dst, "LF", len - strlen(dst) - 1);
     else if (!memcmp("fpga_hf", basename(infile_name), 7))
-        strncat(dst, "HF", len - 1);
+        strncat(dst, "HF", len - strlen(dst) - 1);
 
-    strncat(dst, " image built", len - 1);
+    strncat(dst, " image built", len - strlen(dst) - 1);
     if (bitparse_find_section(infile, 'b', &fpga_info_len)) {
-        strncat(dst, " for ", len - 1);
+        strncat(dst, " for ", len - strlen(dst) - 1);
         for (uint16_t i = 0; i < fpga_info_len; i++) {
             char c = (char)fgetc(infile);
             if (i < sizeof(tempstr)) {
                 tempstr[i] = c;
             }
         }
-        strncat(dst, tempstr, len - 1);
+        strncat(dst, tempstr, len - strlen(dst) - 1);
     }
 
     if (bitparse_find_section(infile, 'c', &fpga_info_len)) {
-        strncat(dst, " on ", len - 1);
+        strncat(dst, " on ", len - strlen(dst) - 1);
         for (uint16_t i = 0; i < fpga_info_len; i++) {
             char c = (char)fgetc(infile);
             if (i < sizeof(tempstr)) {
                 tempstr[i] = c;
             }
         }
-        strncat(dst, tempstr, len - 1);
+        strncat(dst, tempstr, len - strlen(dst) - 1);
     }
 
     if (bitparse_find_section(infile, 'd', &fpga_info_len)) {
-        strncat(dst, " at ", len - 1);
+        strncat(dst, " at ", len - strlen(dst) - 1);
         for (uint16_t i = 0; i < fpga_info_len; i++) {
             char c = (char)fgetc(infile);
             if (i < sizeof(tempstr)) {
                 tempstr[i] = c;
             }
         }
-        strncat(dst, tempstr, len - 1);
+        strncat(dst, tempstr, len - strlen(dst) - 1);
     }
     return 0;
 }
diff --git a/client/hardnested/hardnested_tables.c b/client/hardnested/hardnested_tables.c
index bc92e5f10..09de7f5d7 100644
--- a/client/hardnested/hardnested_tables.c
+++ b/client/hardnested/hardnested_tables.c
@@ -577,4 +577,4 @@ int main(int argc, char *argv[]) {
     free_part_sum_bitarrays();
 
     return 0;
-}
\ No newline at end of file
+}
diff --git a/client/hid-flasher/usb_cmd.h b/client/hid-flasher/usb_cmd.h
index 5e562c10b..ac563bd26 100644
--- a/client/hid-flasher/usb_cmd.h
+++ b/client/hid-flasher/usb_cmd.h
@@ -96,7 +96,7 @@ typedef struct {
 #define CMD_IO_DEMOD_FSK                                                  0x021A
 #define CMD_IO_CLONE_TAG                                                  0x021B
 #define CMD_EM410X_DEMOD                                                  0x021c
-// Sampling configuration for LF reader/snooper
+// Sampling configuration for LF reader/sniffer
 #define CMD_SET_LF_SAMPLING_CONFIG                                        0x021d
 #define CMD_FSK_SIM_TAG                                                   0x021E
 #define CMD_ASK_SIM_TAG                                                   0x021F
@@ -119,10 +119,10 @@ typedef struct {
 #define CMD_ISO_15693_COMMAND                                             0x0313
 #define CMD_ISO_15693_COMMAND_DONE                                        0x0314
 #define CMD_ISO_15693_FIND_AFI                                            0x0315
-#define CMD_LF_SNOOP_RAW_ADC_SAMPLES                                      0x0317
+#define CMD_LF_SNIFF_RAW_ADC_SAMPLES                                      0x0317
 
 // For Hitag2 transponders
-#define CMD_SNOOP_HITAG                                                   0x0370
+#define CMD_SNIFF_HITAG                                                   0x0370
 #define CMD_SIMULATE_HITAG                                                0x0371
 #define CMD_READER_HITAG                                                  0x0372
 
@@ -135,8 +135,8 @@ typedef struct {
 
 #define CMD_ANTIFUZZ_ISO_14443a                                           0x0380
 #define CMD_SIMULATE_TAG_ISO_14443B                                       0x0381
-#define CMD_SNOOP_ISO_14443B                                              0x0382
-#define CMD_SNOOP_ISO_14443a                                              0x0383
+#define CMD_SNIFF_ISO_14443B                                              0x0382
+#define CMD_SNIFF_ISO_14443a                                              0x0383
 #define CMD_SIMULATE_TAG_ISO_14443a                                       0x0384
 #define CMD_READER_ISO_14443a                                             0x0385
 
@@ -151,7 +151,7 @@ typedef struct {
 #define CMD_LEGIC_ESET                                                    0x03BD
 #define CMD_LEGIC_EGET                                                    0x03BE
 
-#define CMD_SNOOP_ICLASS                                                  0x0392
+#define CMD_SNIFF_ICLASS                                                  0x0392
 #define CMD_SIMULATE_TAG_ICLASS                                           0x0393
 #define CMD_READER_ICLASS                                                 0x0394
 #define CMD_READER_ICLASS_REPLAY                                          0x0395
diff --git a/client/loclass/elite_crack.c b/client/loclass/elite_crack.c
index 41be3d39c..038d8e475 100644
--- a/client/loclass/elite_crack.c
+++ b/client/loclass/elite_crack.c
@@ -692,4 +692,4 @@ int testElite() {
     errors += _test_iclass_key_permutation();
     errors += _testBruteforce();
     return errors;
-}
\ No newline at end of file
+}
diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index 4d58c7084..0c345ca14 100644
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -155,11 +155,12 @@ int saveFileJSON(const char *preferredName, const char *suffix, JSONFileType fty
     json_t *root = json_object();
     JsonSaveStr(root, "Created", "proxmark3");
     switch (ftype) {
-        case jsfRaw:
+        case jsfRaw: {
             JsonSaveStr(root, "FileType", "raw");
             JsonSaveBufAsHexCompact(root, "raw", data, datalen);
             break;
-        case jsfCardMemory:
+        }
+        case jsfCardMemory: {
             JsonSaveStr(root, "FileType", "mfcard");
             for (int i = 0; i < (datalen / 16); i++) {
                 char path[PATH_MAX_LENGTH] = {0};
@@ -208,7 +209,8 @@ int saveFileJSON(const char *preferredName, const char *suffix, JSONFileType fty
                 }
             }
             break;
-        case jsfMfuMemory:
+        }
+        case jsfMfuMemory: {
             JsonSaveStr(root, "FileType", "mfu");
 
             mfu_dump_t *tmp = (mfu_dump_t *)data;
@@ -230,12 +232,26 @@ int saveFileJSON(const char *preferredName, const char *suffix, JSONFileType fty
             size_t len = (datalen - DUMP_PREFIX_LENGTH) / 4;
 
             for (int i = 0; i < len; i++) {
-
                 char path[PATH_MAX_LENGTH] = {0};
                 sprintf(path, "$.blocks.%d", i);
                 JsonSaveBufAsHexCompact(root, path, tmp->data + (i * 4), 4);
             }
             break;
+        }
+        case jsfHitag: {
+            JsonSaveStr(root, "FileType", "hitag");
+            uint8_t uid[4] = {0};
+            memcpy(uid, data, 4);
+
+            JsonSaveBufAsHexCompact(root, "$.Card.UID", uid, sizeof(uid));
+
+            for (int i = 0; i < (datalen / 4); i++) {
+                char path[PATH_MAX_LENGTH] = {0};
+                sprintf(path, "$.blocks.%d", i);
+                JsonSaveBufAsHexCompact(root, path, data + (i * 4), 4);
+            }
+            break;
+        }
     }
 
     int res = json_dump_file(root, fileName, JSON_INDENT(2));
@@ -253,7 +269,7 @@ out:
     return retval;
 }
 
-int loadFile(const char *preferredName, const char *suffix, void *data, size_t *datalen) {
+int loadFile(const char *preferredName, const char *suffix, void *data, size_t maxdatalen, size_t *datalen) {
 
     if (preferredName == NULL) return 1;
     if (suffix == NULL) return 1;
@@ -298,6 +314,11 @@ int loadFile(const char *preferredName, const char *suffix, void *data, size_t *
         goto out;
     }
 
+    if (bytes_read != maxdatalen) {
+        PrintAndLogDevice(WARNING, "Warning, bytes read exeed calling array limit. Max bytes is %d bytes", maxdatalen);
+        bytes_read = maxdatalen;
+    }
+
     memcpy((data), dump, bytes_read);
     free(dump);
 
@@ -447,8 +468,29 @@ int loadFileJSON(const char *preferredName, const char *suffix, void *data, size
         *datalen = sptr;
     }
 
+    if (!strcmp(ctype, "hitag")) {
+        size_t sptr = 0;
+        for (int i = 0; i < (maxdatalen / 4); i++) {
+            if (sptr + 4 > maxdatalen) {
+                retval = 5;
+                goto out;
+            }
 
-    PrintAndLog("loaded from JSON file " _YELLOW_("%s"), fileName);
+            char path[30] = {0};
+            sprintf(path, "$.blocks.%d", i);
+
+            size_t len = 0;
+            JsonLoadBufAsHex(root, path, &udata[sptr], 4, &len);
+            if (!len)
+                break;
+
+            sptr += len;
+        }
+
+        *datalen = sptr;
+    }
+
+    PrintAndLogEx(SUCCESS, "loaded from JSON file " _YELLOW_("%s"), fileName);
 out:
     json_decref(root);
     free(fileName);
diff --git a/client/loclass/fileutils.h b/client/loclass/fileutils.h
index c2888c196..7b358331a 100644
--- a/client/loclass/fileutils.h
+++ b/client/loclass/fileutils.h
@@ -55,6 +55,11 @@ typedef enum {
     jsfRaw,
     jsfCardMemory,
     jsfMfuMemory,
+    jsfHitag,
+//    jsf14b,
+//    jsf15,
+//    jsfLegic,
+//    jsfT55xx,
 } JSONFileType;
 
 int fileExists(const char *filename);
@@ -107,10 +112,11 @@ extern int saveFileJSON(const char *preferredName, const char *suffix, JSONFileT
  * @param preferredName
  * @param suffix the file suffix. Leave out the ".".
  * @param data The data array to store the loaded bytes from file
+ * @param maxdatalen the number of bytes that your data array has
  * @param datalen the number of bytes loaded from file
  * @return 0 for ok, 1 for failz
 */
-extern int loadFile(const char *preferredName, const char *suffix, void *data, size_t *datalen);
+extern int loadFile(const char *preferredName, const char *suffix, void *data, size_t maxdatalen, size_t *datalen);
 
 /**
  * @brief  Utility function to load data from a textfile (EML). This method takes a preferred name.
diff --git a/client/lualibs/7816_error.lua b/client/lualibs/7816_error.lua
index 038f668fb..15f4ef471 100644
--- a/client/lualibs/7816_error.lua
+++ b/client/lualibs/7816_error.lua
@@ -75,4 +75,4 @@ _errorcodes.tostring = function(command)
     end
     return ("Error, numeric or string argument expected, got : %s"):format(tostring(command))
 end
-return _errorcodes
\ No newline at end of file
+return _errorcodes
diff --git a/client/lualibs/hf_reader.lua b/client/lualibs/hf_reader.lua
index d0550a335..b99b521da 100644
--- a/client/lualibs/hf_reader.lua
+++ b/client/lualibs/hf_reader.lua
@@ -32,4 +32,4 @@ end
 
 return {
     waitForTag = waitForTag,
-}
\ No newline at end of file
+}
diff --git a/client/lualibs/precalc.lua b/client/lualibs/precalc.lua
index 71d91c05a..7da08f006 100644
--- a/client/lualibs/precalc.lua
+++ b/client/lualibs/precalc.lua
@@ -91,4 +91,4 @@ local PreCalc =
         return list
     end,
 }
-return PreCalc
\ No newline at end of file
+return PreCalc
diff --git a/client/lualibs/read14b.lua b/client/lualibs/read14b.lua
index 3711c02a3..2ee86c378 100644
--- a/client/lualibs/read14b.lua
+++ b/client/lualibs/read14b.lua
@@ -155,4 +155,4 @@ local library = {
     ISO14B_COMMAND = ISO14B_COMMAND,
 }
 
-return library
\ No newline at end of file
+return library
diff --git a/client/lualibs/taglib.lua b/client/lualibs/taglib.lua
index 715a29487..0612ed2d3 100644
--- a/client/lualibs/taglib.lua
+++ b/client/lualibs/taglib.lua
@@ -121,4 +121,4 @@ return {
 
         return m[value] or "no tag-info available"
     end,
-}
\ No newline at end of file
+}
diff --git a/client/lualibs/utils.lua b/client/lualibs/utils.lua
index 697e48b72..ed9874e40 100644
--- a/client/lualibs/utils.lua
+++ b/client/lualibs/utils.lua
@@ -427,4 +427,4 @@ local Utils =
 -- end
 
 }
-return Utils
\ No newline at end of file
+return Utils
diff --git a/client/mifare/mifarehost.h b/client/mifare/mifarehost.h
index 1d9f0c3ab..626d2cd07 100644
--- a/client/mifare/mifarehost.h
+++ b/client/mifare/mifarehost.h
@@ -100,4 +100,4 @@ extern int detect_classic_prng(void);
 extern int detect_classic_nackbug(bool verbose);
 extern void detect_classic_magic(void);
 extern void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len, bool isEncrypted);
-#endif
\ No newline at end of file
+#endif
diff --git a/client/pm3_eml_mfd_test.py b/client/pm3_eml_mfd_test.py
index 478a050df..171bad843 100644
--- a/client/pm3_eml_mfd_test.py
+++ b/client/pm3_eml_mfd_test.py
@@ -21,7 +21,7 @@ class TestEmlMfd(unittest.TestCase):
             ]
     def test_eml2mfd(self):
         self.three_argument_test(pm3_eml2mfd.main, self.EML2MFD_TESTCASES)
-    
+
     def test_mfd2eml(self):
         self.three_argument_test(pm3_mfd2eml.main,
                 imap(reversed, self.EML2MFD_TESTCASES), c14n=hex_c14n)
diff --git a/client/reveng/preset.c b/client/reveng/preset.c
index d5bdac2dd..2f305a285 100644
--- a/client/reveng/preset.c
+++ b/client/reveng/preset.c
@@ -939,4 +939,4 @@ static void munpack(model_t *dest, const struct mpreset *src) {
     dest->flags = src->flags;
     /* link to the name as it is static */
     dest->name = (src->alias) ? src->alias->name : NULL;
-}
\ No newline at end of file
+}
diff --git a/client/scandir.h b/client/scandir.h
index a41a13319..7155c5a79 100644
--- a/client/scandir.h
+++ b/client/scandir.h
@@ -19,4 +19,4 @@ extern int scandir(const char *dir, struct dirent ***namelist, int (*select)(con
 extern int alphasort(const struct dirent **a, const struct dirent **b);
 #endif // _WIN32
 
-#endif // SCANDIR_H__
\ No newline at end of file
+#endif // SCANDIR_H__
diff --git a/client/scripting.c b/client/scripting.c
index 14dc35774..719798177 100644
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -776,4 +776,4 @@ int set_pm3_libraries(lua_State *L) {
     strcat(libraries_path, LUA_LIBRARIES_WILDCARD);
     setLuaPath(L, libraries_path);
     return 1;
-}
\ No newline at end of file
+}
diff --git a/client/scripts/Legic_clone.lua b/client/scripts/Legic_clone.lua
index dcac7f323..21d756d0e 100644
--- a/client/scripts/Legic_clone.lua
+++ b/client/scripts/Legic_clone.lua
@@ -538,4 +538,4 @@ function main(args)
 end
 
 -- call main with arguments
-main(args)
\ No newline at end of file
+main(args)
diff --git a/client/scripts/brutesim.lua b/client/scripts/brutesim.lua
index 9527d8970..a15cf6e60 100644
--- a/client/scripts/brutesim.lua
+++ b/client/scripts/brutesim.lua
@@ -297,4 +297,4 @@ local function main(args)
     core.console('hw ping')
 end
 
-main(args)
\ No newline at end of file
+main(args)
diff --git a/client/scripts/calc_di.lua b/client/scripts/calc_di.lua
index e0b587332..9a8c051a4 100644
--- a/client/scripts/calc_di.lua
+++ b/client/scripts/calc_di.lua
@@ -173,4 +173,4 @@ local function main(args)
     dumptofile( keys )
 end
 
-main(args)
\ No newline at end of file
+main(args)
diff --git a/client/scripts/calc_ev1_it.lua b/client/scripts/calc_ev1_it.lua
index c6070d20d..b4e995e96 100644
--- a/client/scripts/calc_ev1_it.lua
+++ b/client/scripts/calc_ev1_it.lua
@@ -175,4 +175,4 @@ local function main(args)
     print(string.format('PWD | %s', pwd))
 end
 
-main(args)
\ No newline at end of file
+main(args)
diff --git a/client/scripts/calc_mizip.lua b/client/scripts/calc_mizip.lua
index 42f13c578..8844f6d66 100644
--- a/client/scripts/calc_mizip.lua
+++ b/client/scripts/calc_mizip.lua
@@ -194,4 +194,4 @@ local function main(args)
     dumptofile( keys )
 end
 
-main(args)
\ No newline at end of file
+main(args)
diff --git a/client/scripts/calypso.lua b/client/scripts/calypso.lua
index 2b7252261..74de3cb9a 100644
--- a/client/scripts/calypso.lua
+++ b/client/scripts/calypso.lua
@@ -273,4 +273,4 @@ if "--test"==args then
 else
     -- Call the main
     main(args)
-end
\ No newline at end of file
+end
diff --git a/client/scripts/e.lua b/client/scripts/e.lua
index 6b9d80364..1f9a14eb0 100644
--- a/client/scripts/e.lua
+++ b/client/scripts/e.lua
@@ -74,4 +74,4 @@ function main(args)
     end
 end
 
-main(args)
\ No newline at end of file
+main(args)
diff --git a/client/scripts/emul2dump.lua b/client/scripts/emul2dump.lua
index 04b9da12b..0cbc3a4c2 100644
--- a/client/scripts/emul2dump.lua
+++ b/client/scripts/emul2dump.lua
@@ -57,4 +57,4 @@ local function main(args)
     ExitMsg(("Wrote a BIN dump to the file %s"):format(filename))
 end
 
-main(args)
\ No newline at end of file
+main(args)
diff --git a/client/scripts/emul2html.lua b/client/scripts/emul2html.lua
index db76ec9c0..36230f8af 100644
--- a/client/scripts/emul2html.lua
+++ b/client/scripts/emul2html.lua
@@ -64,4 +64,4 @@ In the future, we may implement so that scripts are invoked directly
 into a 'main' function, instead of being executed blindly. For future
 compatibility, I have done so, but I invoke my main from here.
 --]]
-main(args)
\ No newline at end of file
+main(args)
diff --git a/client/scripts/formatMifare.lua b/client/scripts/formatMifare.lua
index 90801b2a2..fe9cf32e5 100644
--- a/client/scripts/formatMifare.lua
+++ b/client/scripts/formatMifare.lua
@@ -213,4 +213,4 @@ local function main(args)
     end
 end
 
-main(args)
\ No newline at end of file
+main(args)
diff --git a/client/scripts/hf_read.lua b/client/scripts/hf_read.lua
index 7653e6e75..00238a67c 100644
--- a/client/scripts/hf_read.lua
+++ b/client/scripts/hf_read.lua
@@ -15,4 +15,4 @@ local function main(args)
     end
     return
 end
-main(args)
\ No newline at end of file
+main(args)
diff --git a/client/scripts/htmldump.lua b/client/scripts/htmldump.lua
index 40f3028b4..afd76abee 100644
--- a/client/scripts/htmldump.lua
+++ b/client/scripts/htmldump.lua
@@ -62,4 +62,4 @@ In the future, we may implement so that scripts are invoked directly
 into a 'main' function, instead of being executed blindly. For future
 compatibility, I have done so, but I invoke my main from here.
 --]]
-main(args)
\ No newline at end of file
+main(args)
diff --git a/client/scripts/lf_bulk.lua b/client/scripts/lf_bulk.lua
index b4604bebb..dc59572f3 100644
--- a/client/scripts/lf_bulk.lua
+++ b/client/scripts/lf_bulk.lua
@@ -190,4 +190,4 @@ local function main(args)
     end
 end
 
-main(args)
\ No newline at end of file
+main(args)
diff --git a/client/scripts/mfkeys.lua b/client/scripts/mfkeys.lua
index 18078b822..ff739683d 100644
--- a/client/scripts/mfkeys.lua
+++ b/client/scripts/mfkeys.lua
@@ -272,4 +272,4 @@ local function main(args)
     print('mfkeys - Total execution time: '..os.difftime(end_time, start_time)..' sec')
 end
 
-main( args)
\ No newline at end of file
+main( args)
diff --git a/client/scripts/ndef_dump.lua b/client/scripts/ndef_dump.lua
index 4a740d7e6..0bb597a52 100644
--- a/client/scripts/ndef_dump.lua
+++ b/client/scripts/ndef_dump.lua
@@ -244,4 +244,4 @@ local function main( args)
     prlog(string.format("Dumped data into %s", filename))
 
 end
-main(args)
\ No newline at end of file
+main(args)
diff --git a/client/scripts/ntag_3d.lua b/client/scripts/ntag_3d.lua
index 890f29d94..2f08aac85 100644
--- a/client/scripts/ntag_3d.lua
+++ b/client/scripts/ntag_3d.lua
@@ -380,4 +380,4 @@ local function main(args)
     write_tag(uid, t)
 end
 
-main(args)
\ No newline at end of file
+main(args)
diff --git a/client/scripts/parameters.lua b/client/scripts/parameters.lua
index f51266f7f..4eb86446d 100644
--- a/client/scripts/parameters.lua
+++ b/client/scripts/parameters.lua
@@ -42,4 +42,4 @@ In the future, we may implement so that scripts are invoked directly
 into a 'main' function, instead of being executed blindly. For future
 compatibility, I have done so, but I invoke my main from here.
 --]]
-main(args)
\ No newline at end of file
+main(args)
diff --git a/client/scripts/test_t55x7_ask.lua b/client/scripts/test_t55x7_ask.lua
index 3f224b28a..0e0d3d9e3 100644
--- a/client/scripts/test_t55x7_ask.lua
+++ b/client/scripts/test_t55x7_ask.lua
@@ -137,4 +137,4 @@ local function main(args)
     test()
     print( string.rep('--',20) )
 end
-main(args)
\ No newline at end of file
+main(args)
diff --git a/client/scripts/test_t55x7_fsk.lua b/client/scripts/test_t55x7_fsk.lua
index 9dbb1b6bb..492f71681 100644
--- a/client/scripts/test_t55x7_fsk.lua
+++ b/client/scripts/test_t55x7_fsk.lua
@@ -137,4 +137,4 @@ local function main(args)
     test(7)
     print( string.rep('--',20) )
 end
-main(args)
\ No newline at end of file
+main(args)
diff --git a/client/scripts/tnp3dump.lua b/client/scripts/tnp3dump.lua
index 2a5545497..f48abff6c 100644
--- a/client/scripts/tnp3dump.lua
+++ b/client/scripts/tnp3dump.lua
@@ -282,4 +282,4 @@ local function main(args)
 
     core.clearCommandBuffer()
 end
-main(args)
\ No newline at end of file
+main(args)
diff --git a/client/scripts/tracetest.lua b/client/scripts/tracetest.lua
index 96d1f79c6..c3ddedf87 100644
--- a/client/scripts/tracetest.lua
+++ b/client/scripts/tracetest.lua
@@ -123,4 +123,4 @@ local function main(args)
     print( string.rep('--',20) )
 
 end
-main(args)
\ No newline at end of file
+main(args)
diff --git a/client/scripts/ufodump.lua b/client/scripts/ufodump.lua
index 67949fd94..f91949166 100644
--- a/client/scripts/ufodump.lua
+++ b/client/scripts/ufodump.lua
@@ -173,4 +173,4 @@ if "--test"==args then
 else
     -- Call the main
     main(args)
-end
\ No newline at end of file
+end
diff --git a/client/snooper.c b/client/snooper.c
index 88a30edaa..35267bc22 100644
--- a/client/snooper.c
+++ b/client/snooper.c
@@ -5,7 +5,7 @@
 // at your option, any later version. See the LICENSE.txt file for the text of
 // the license.
 //-----------------------------------------------------------------------------
-// Snooper binary
+// Sniff binary
 //-----------------------------------------------------------------------------
 
 #include "util_posix.h"
@@ -19,7 +19,7 @@
 
 int main() {
     usb_init();
-    SetLogFilename("snooper.log");
+    SetLogFilename("sniffer.log");
 
     return_on_error = 1;
 
@@ -27,7 +27,7 @@ int main() {
         while (!OpenProxmark()) { sleep(1); }
         while (1) {
             UsbCommand cmdbuf;
-            CommandReceived("hf 14a snoop");
+            CommandReceived("hf 14a sniff");
             HANDLE_ERROR;
             ReceiveCommand(&cmdbuf);
             HANDLE_ERROR;
diff --git a/client/util.c b/client/util.c
index 0b3211264..a3f275a0b 100644
--- a/client/util.c
+++ b/client/util.c
@@ -252,7 +252,10 @@ char *sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t brea
     // loop through the out_index to make sure we don't go too far
     for (out_index = 0; out_index < rowlen; out_index++) {
         // set character
-        sprintf(tmp++, "%u", data[in_index]);
+        if (data[in_index] == 7) // Manchester wrong bit marker
+            sprintf(tmp++, ".");
+        else
+            sprintf(tmp++, "%u", data[in_index]);
         // check if a line break is needed and we have room to print it in our array
         if ((breaks > 0) && !((in_index + 1) % breaks) && (out_index + 1 != rowlen)) {
             // increment and print line break
@@ -683,24 +686,45 @@ int hextobinstring(char *target, char *source) {
     return length;
 }
 
-// convert binary array of 0x00/0x01 values to hex (safe to do in place as target will always be shorter than source)
+// convert binary array of 0x00/0x01 values to hex
 // return number of bits converted
-int binarraytohex(char *target, char *source, int length) {
-    unsigned char i, x;
-    int j = length;
-
-    if (j % 4)
-        return 0;
-
-    while (j) {
-        for (i = x = 0 ; i < 4 ; ++i)
-            x += (source[i] << (3 - i));
-        sprintf(target, "%X", x);
-        ++target;
-        source += 4;
-        j -= 4;
+int binarraytohex(char *target, const size_t targetlen, char *source, size_t srclen) {
+    uint8_t i = 0, x = 0;
+    uint32_t t = 0; // written target chars
+    uint32_t r = 0; // consumed bits
+    uint8_t w = 0; // wrong bits separator printed
+    for (size_t s = 0 ; s < srclen; s++) {
+        if ((source[s] == 0) || (source[s] == 1)) {
+            w = 0;
+            x += (source[s] << (3 - i));
+            i++;
+            if (i == 4) {
+                if (t >= targetlen - 2) return r;
+                sprintf(target + t, "%X", x);
+                t++;
+                r += 4;
+                x = 0;
+                i = 0;
+            }
+        } else {
+            if (i > 0) {
+                if (t >= targetlen - 5) return r;
+                w = 0;
+                sprintf(target + t, "%X[%i]", x, i);
+                t += 4;
+                r += i;
+                x = 0;
+                i = 0;
+            }
+            if (w == 0) {
+                if (t >= targetlen - 2) return r;
+                sprintf(target + t, " ");
+                t++;
+            }
+            r++;
+        }
     }
-    return length;
+    return r;
 }
 
 // convert binary array to human readable binary
@@ -873,4 +897,4 @@ extern char *strmcopy(char *buf) {
         strcpy(str, buf);
     }
     return str;
-}
\ No newline at end of file
+}
diff --git a/client/util.h b/client/util.h
index 9c68900e7..c754542ab 100644
--- a/client/util.h
+++ b/client/util.h
@@ -241,7 +241,7 @@ extern int param_getstr(const char *line, int paramnum, char *str, size_t buffer
 
 extern int hextobinarray(char *target,  char *source);
 extern int hextobinstring(char *target,  char *source);
-extern int binarraytohex(char *target,  char *source,  int length);
+extern int binarraytohex(char *target, const size_t targetlen, char *source, size_t srclen);
 extern void binarraytobinstring(char *target,  char *source,  int length);
 extern uint8_t GetParity(uint8_t *string, uint8_t type,  int length);
 extern void wiegand_add_parity(uint8_t *target, uint8_t *source, uint8_t length);
@@ -263,4 +263,4 @@ extern bool str_startswith(const char *s,  const char *pre);  // check for prefi
 extern void strcleanrn(char *buf, size_t len);
 extern void strcreplace(char *buf, size_t len, char from, char to);
 extern char *strmcopy(char *buf);
-#endif
\ No newline at end of file
+#endif
diff --git a/client/util_darwin.h b/client/util_darwin.h
index 15af75404..d89b681f2 100644
--- a/client/util_darwin.h
+++ b/client/util_darwin.h
@@ -16,4 +16,4 @@ void enableAppNap();
 void makeUnfocusable();
 void makeFocusable();
 
-#endif
\ No newline at end of file
+#endif
diff --git a/common/bucketsort.h b/common/bucketsort.h
index 1de175ae5..0a56509c1 100644
--- a/common/bucketsort.h
+++ b/common/bucketsort.h
@@ -21,4 +21,4 @@ typedef struct bucket_info {
 void bucket_sort_intersect(uint32_t *const estart, uint32_t *const estop,
                            uint32_t *const ostart, uint32_t *const ostop,
                            bucket_info_t *bucket_info, bucket_array_t bucket);
-#endif
\ No newline at end of file
+#endif
diff --git a/common/cmd.c b/common/cmd.c
index 5f42c669a..3b45c08ad 100644
--- a/common/cmd.c
+++ b/common/cmd.c
@@ -61,4 +61,4 @@ uint8_t cmd_send(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void
 #endif
 
     return sendlen;
-}
\ No newline at end of file
+}
diff --git a/common/crc.c b/common/crc.c
index 0846697de..2ad7609b1 100644
--- a/common/crc.c
+++ b/common/crc.c
@@ -123,4 +123,4 @@ uint32_t CRC8Legic(uint8_t *buff, size_t size) {
     for (int i = 0; i < size; ++i)
         crc_update2(&crc, buff[i], 8);
     return reflect8(crc_finish(&crc));
-}
\ No newline at end of file
+}
diff --git a/common/crc16.h b/common/crc16.h
index b88995a40..9a202f514 100644
--- a/common/crc16.h
+++ b/common/crc16.h
@@ -67,4 +67,4 @@ void reset_table(void);
 void generate_table(uint16_t polynomial, bool refin);
 uint16_t crc16_fast(uint8_t const *d, size_t n, uint16_t initval, bool refin, bool refout);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/common/crc32.c b/common/crc32.c
index 3ee102ce5..440bed910 100644
--- a/common/crc32.c
+++ b/common/crc32.c
@@ -29,4 +29,4 @@ void crc32_ex(const uint8_t *data, const size_t len, uint8_t *crc) {
 
 void crc32_append(uint8_t *data, const size_t len) {
     crc32_ex(data, len, data + len);
-}
\ No newline at end of file
+}
diff --git a/common/crc64.c b/common/crc64.c
index 7d582da02..23360f6bd 100644
--- a/common/crc64.c
+++ b/common/crc64.c
@@ -80,4 +80,4 @@ void crc64(const uint8_t *data, const size_t len, uint64_t *crc) {
     }
 }
 
-//suint8_t x = (c & 0xFF00000000000000 ) >> 56;
\ No newline at end of file
+//suint8_t x = (c & 0xFF00000000000000 ) >> 56;
diff --git a/common/i2c.h b/common/i2c.h
index 4254a73c3..df7f6698c 100644
--- a/common/i2c.h
+++ b/common/i2c.h
@@ -48,4 +48,4 @@ void SmartCardUpgrade(uint64_t arg0);
 void SmartCardSetBaud(uint64_t arg0);
 void SmartCardSetClock(uint64_t arg0);
 void I2C_print_status(void);
-#endif
\ No newline at end of file
+#endif
diff --git a/common/iso15693tools.c b/common/iso15693tools.c
index 7b64c99d1..795d1be60 100644
--- a/common/iso15693tools.c
+++ b/common/iso15693tools.c
@@ -14,12 +14,13 @@
 // return: ptr to string
 char *Iso15693sprintUID(char *target, uint8_t *uid) {
 
-    static char tempbuf[2 * 8 + 1] = {0};
+    static char tempbuf[3 * 8 + 1] = {0};
     if (target == NULL)
         target = tempbuf;
+
     sprintf(target, "%02X %02X %02X %02X %02X %02X %02X %02X",
             uid[7], uid[6], uid[5], uid[4],
             uid[3], uid[2], uid[1], uid[0]
            );
     return target;
-}
\ No newline at end of file
+}
diff --git a/common/iso15693tools.h b/common/iso15693tools.h
index d7a1b2bb5..26a7a87a7 100644
--- a/common/iso15693tools.h
+++ b/common/iso15693tools.h
@@ -123,4 +123,4 @@ static const int Iso15693FrameEOF[] = {
     -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/common/legic_prng.c b/common/legic_prng.c
index fd5543cf7..5406161fc 100644
--- a/common/legic_prng.c
+++ b/common/legic_prng.c
@@ -62,4 +62,4 @@ uint32_t legic_prng_get_bits(uint8_t len) {
         legic_prng_forward(1);
     }
     return a;
-}
\ No newline at end of file
+}
diff --git a/common/lfdemod.c b/common/lfdemod.c
index f356e7578..653c2a308 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -1357,6 +1357,7 @@ int BiphaseRawDecode(uint8_t *bits, size_t *size, int *offset, int invert) {
 //by marshmellow
 //take 10 and 01 and manchester decode
 //run through 2 times and take least errCnt
+// "7" indicates 00 or 11 wrong bit
 int manrawdecode(uint8_t *bits, size_t *size, uint8_t invert, uint8_t *alignPos) {
 
     // sanity check
@@ -1368,7 +1369,7 @@ int manrawdecode(uint8_t *bits, size_t *size, uint8_t invert, uint8_t *alignPos)
 
     //find correct start position [alignment]
     for (k = 0; k < 2; ++k) {
-        for (i = k; i < *size - 3; i += 2) {
+        for (i = k; i < *size - 1; i += 2) {
             if (bits[i] == bits[i + 1])
                 errCnt++;
         }
@@ -1380,7 +1381,7 @@ int manrawdecode(uint8_t *bits, size_t *size, uint8_t invert, uint8_t *alignPos)
     }
     *alignPos = bestRun;
     //decode
-    for (i = bestRun; i < *size - 3; i += 2) {
+    for (i = bestRun; i < *size - 1; i += 2) {
         if (bits[i] == 1 && (bits[i + 1] == 0)) {
             bits[bitnum++] = invert;
         } else if ((bits[i] == 0) && bits[i + 1] == 1) {
diff --git a/common/lfdemod.h b/common/lfdemod.h
index 883393cc3..96a91363f 100644
--- a/common/lfdemod.h
+++ b/common/lfdemod.h
@@ -22,7 +22,7 @@
 #include "util.h"    // for ARRAYLEN
 
 //might not be high enough for noisy environments
-#define NOISE_AMPLITUDE_THRESHOLD 10
+#define NOISE_AMPLITUDE_THRESHOLD 15
 //ignore buffer with less than x samples
 #define SIGNAL_MIN_SAMPLES 100
 //ignore first x samples of the buffer
diff --git a/common/prng.h b/common/prng.h
index f160d6b30..b9f49c6b6 100644
--- a/common/prng.h
+++ b/common/prng.h
@@ -21,4 +21,4 @@ void burtle_init_mod(prng_ctx *x, uint32_t seed);
 void burtle_init(prng_ctx *x, uint32_t seed);
 
 uint32_t GetSimplePrng(uint32_t seed);
-#endif /* __PRNG_H */
\ No newline at end of file
+#endif /* __PRNG_H */
diff --git a/common/protocols.h b/common/protocols.h
index fde10f38a..f8ed2781e 100644
--- a/common/protocols.h
+++ b/common/protocols.h
@@ -276,6 +276,7 @@ ISO 7816-4 Basic interindustry commands. For command APDU's.
 #define ISO_15693        7
 #define FELICA           8
 #define PROTO_MIFARE     9
+#define PROTO_HITAG     10
 
 //-- Picopass fuses
 #define FUSE_FPERS   0x80
diff --git a/common/radixsort.c b/common/radixsort.c
index 67f2910c1..83b26d609 100644
--- a/common/radixsort.c
+++ b/common/radixsort.c
@@ -96,4 +96,4 @@ uint64_t *radixSort(uint64_t *array, uint32_t size) {
     }
     free(cpy);
     return array;
-}
\ No newline at end of file
+}
diff --git a/common/radixsort.h b/common/radixsort.h
index 29faf9825..41a036461 100644
--- a/common/radixsort.h
+++ b/common/radixsort.h
@@ -20,4 +20,4 @@ typedef union {
 } rscounts_t;
 
 uint64_t *radixSort(uint64_t *array, uint32_t size);
-#endif // RADIXSORT_H__
\ No newline at end of file
+#endif // RADIXSORT_H__
diff --git a/common/random.h b/common/random.h
index 315794f8d..85c90dd38 100644
--- a/common/random.h
+++ b/common/random.h
@@ -18,4 +18,4 @@
 void fast_prand();
 void fast_prandEx(uint32_t seed);
 uint32_t prand();
-#endif
\ No newline at end of file
+#endif
diff --git a/common/tea.h b/common/tea.h
index 3a12a769d..43ac93428 100644
--- a/common/tea.h
+++ b/common/tea.h
@@ -15,4 +15,4 @@
 #include <stddef.h>
 void tea_encrypt(uint8_t *v, uint8_t *key);
 void tea_decrypt(uint8_t *v, uint8_t *key);
-#endif /* __TEA_H */
\ No newline at end of file
+#endif /* __TEA_H */
diff --git a/common/usart.c b/common/usart.c
index 46e8517fc..869179091 100644
--- a/common/usart.c
+++ b/common/usart.c
@@ -140,4 +140,4 @@ void usart_init(void) {
 
     // re-enable receiver / transmitter
     pUS1->US_CR = (AT91C_US_RXEN | AT91C_US_TXEN);
-}
\ No newline at end of file
+}
diff --git a/common/usb_cdc.c b/common/usb_cdc.c
index d70c8ee04..c871de241 100644
--- a/common/usb_cdc.c
+++ b/common/usb_cdc.c
@@ -949,4 +949,4 @@ void AT91F_CDC_Enumerate() {
             AT91F_USB_SendStall(pUdp);
             break;
     }
-}
\ No newline at end of file
+}
diff --git a/common/wiegand.c b/common/wiegand.c
index 2da88b085..e319e1a08 100644
--- a/common/wiegand.c
+++ b/common/wiegand.c
@@ -236,4 +236,4 @@ void num_to_wiegand_bits(uint64_t oem, uint64_t fc, uint64_t cn, uint8_t *dest,
         default:
             break;
     }
-}
\ No newline at end of file
+}
diff --git a/include/at91sam7s512.h b/include/at91sam7s512.h
index f8fa2e8d4..f9f5f69b1 100644
--- a/include/at91sam7s512.h
+++ b/include/at91sam7s512.h
@@ -375,7 +375,7 @@ typedef struct _AT91S_DBGU {
 #define AT91C_US_TXBUFE       (0x1 << 11) // (DBGU) TXBUFE Interrupt
 #define AT91C_US_RXBUFF       (0x1 << 12) // (DBGU) RXBUFF Interrupt
 #define AT91C_US_COMM_TX      (0x1 << 30) // (DBGU) COMM_TX Interrupt
-#define AT91C_US_COMM_RX      (0x1 << 31) // (DBGU) COMM_RX Interrupt
+#define AT91C_US_COMM_RX      (0x1u << 31) // (DBGU) COMM_RX Interrupt
 // -------- DBGU_IDR : (DBGU Offset: 0xc) Debug Unit Interrupt Disable Register --------
 // -------- DBGU_IMR : (DBGU Offset: 0x10) Debug Unit Interrupt Mask Register --------
 // -------- DBGU_CSR : (DBGU Offset: 0x14) Debug Unit Channel Status Register --------
diff --git a/include/common.h b/include/common.h
index 2c3febc98..8bf8ab702 100644
--- a/include/common.h
+++ b/include/common.h
@@ -115,4 +115,4 @@ typedef struct {
 #ifdef __cplusplus
 }
 #endif
-#endif
\ No newline at end of file
+#endif
diff --git a/include/hitag.h b/include/hitag.h
new file mode 100644
index 000000000..742d7ecd0
--- /dev/null
+++ b/include/hitag.h
@@ -0,0 +1,117 @@
+//-----------------------------------------------------------------------------
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// Hitag2, HitagS
+//
+// (c) 2012 Roel Verdult
+// (c) 2016 Oguzhan Cicek, Hendrik Schwartke, Ralf Spenneberg
+//     <info@os-s.de>
+//-----------------------------------------------------------------------------
+
+
+#ifndef HITAG_H__
+#define HITAG_H__
+
+#ifdef _MSC_VER
+#define PACKED
+#else
+#define PACKED __attribute__((packed))
+#endif
+
+typedef enum {
+    RHTSF_CHALLENGE           = 01,
+    RHTSF_KEY                 = 02,
+    WHTSF_CHALLENGE           = 03,
+    WHTSF_KEY                 = 04,
+    RHT2F_PASSWORD            = 21,
+    RHT2F_AUTHENTICATE        = 22,
+    RHT2F_CRYPTO              = 23,
+    WHT2F_CRYPTO              = 24,
+    RHT2F_TEST_AUTH_ATTEMPTS  = 25,
+    RHT2F_UID_ONLY            = 26,
+} hitag_function;
+
+typedef struct {
+    uint8_t password[4];
+} PACKED rht2d_password;
+
+typedef struct {
+    uint8_t NrAr[8];
+    uint8_t data[4];
+} PACKED rht2d_authenticate;
+
+typedef struct {
+    uint8_t key[6];
+    uint8_t data[4];
+} PACKED rht2d_crypto;
+
+typedef union {
+    rht2d_password     pwd;
+    rht2d_authenticate auth;
+    rht2d_crypto       crypto;
+} hitag_data;
+
+
+//---------------------------------------------------------
+// Hitag S
+//---------------------------------------------------------
+// protocol-state
+typedef enum PROTO_STATE {
+    HT_READY = 0,
+    HT_INIT,
+    HT_AUTHENTICATE,
+    HT_SELECTED,
+    HT_QUIET,
+    HT_TTF,
+    HT_FAIL
+} PSTATE;
+
+typedef enum TAG_STATE {
+    HT_NO_OP = 0,
+    HT_READING_PAGE,
+    HT_WRITING_PAGE_ACK,
+    HT_WRITING_PAGE_DATA,
+    HT_WRITING_BLOCK_DATA
+} TSATE;
+
+//number of start-of-frame bits
+typedef enum SOF_TYPE {
+    HT_STANDARD = 0,
+    HT_ADVANCED,
+    HT_FAST_ADVANCED,
+    HT_ONE,
+    HT_NO_BITS
+} stype;
+
+struct hitagS_tag {
+    PSTATE   pstate;  //protocol-state
+    TSATE    tstate;  //tag-state
+    uint32_t uid;
+    uint8_t  pages[64][4];
+    uint64_t key;
+    uint8_t  pwdl0, pwdl1, pwdh0;
+    //con0
+    int      max_page;
+    stype    mode;
+    //con1
+    bool     auth;   //0=Plain 1=Auth
+    bool     TTFC;   //Transponder Talks first coding. 0=Manchester 1=Biphase
+    int      TTFDR;  //data rate in TTF Mode
+    int      TTFM;   //the number of pages that are sent to the RWD
+    bool     LCON;   //0=con1/2 read write 1=con1 read only and con2 OTP
+    bool     LKP;    //0=page2/3 read write 1=page2/3 read only in Plain mode and no access in authenticate mode
+    //con2
+    //0=read write 1=read only
+    bool     LCK7;   //page4/5
+    bool     LCK6;   //page6/7
+    bool     LCK5;   //page8-11
+    bool     LCK4;   //page12-15
+    bool     LCK3;   //page16-23
+    bool     LCK2;   //page24-31
+    bool     LCK1;   //page32-47
+    bool     LCK0;   //page48-63
+};
+
+#endif
diff --git a/include/mifare.h b/include/mifare.h
index 104d5cf09..ae5500986 100644
--- a/include/mifare.h
+++ b/include/mifare.h
@@ -71,7 +71,8 @@ typedef enum ISO14B_COMMAND {
     ISO14B_REQUEST_TRIGGER = (1 << 4),
     ISO14B_APPEND_CRC = (1 << 5),
     ISO14B_SELECT_STD = (1 << 6),
-    ISO14B_SELECT_SR = (1 << 7)
+    ISO14B_SELECT_SR = (1 << 7),
+    ISO14B_SET_TIMEOUT = (1 << 8),
 } iso14b_command_t;
 
 typedef enum ISO15_COMMAND {
diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index 94ae66eaa..a15229969 100644
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -129,7 +129,7 @@ typedef struct {
 #define CMD_IO_DEMOD_FSK                                                  0x021A
 #define CMD_IO_CLONE_TAG                                                  0x021B
 #define CMD_EM410X_DEMOD                                                  0x021c
-// Sampling configuration for LF reader/snooper
+// Sampling configuration for LF reader/sniffer
 #define CMD_SET_LF_SAMPLING_CONFIG                                        0x021d
 #define CMD_FSK_SIM_TAG                                                   0x021E
 #define CMD_ASK_SIM_TAG                                                   0x021F
@@ -154,10 +154,10 @@ typedef struct {
 #define CMD_ISO_15693_COMMAND                                             0x0313
 #define CMD_ISO_15693_COMMAND_DONE                                        0x0314
 #define CMD_ISO_15693_FIND_AFI                                            0x0315
-#define CMD_LF_SNOOP_RAW_ADC_SAMPLES                                      0x0317
+#define CMD_LF_SNIFF_RAW_ADC_SAMPLES                                      0x0317
 
 // For Hitag2 transponders
-#define CMD_SNOOP_HITAG                                                   0x0370
+#define CMD_SNIFF_HITAG                                                   0x0370
 #define CMD_SIMULATE_HITAG                                                0x0371
 #define CMD_READER_HITAG                                                  0x0372
 
@@ -170,9 +170,9 @@ typedef struct {
 
 #define CMD_ANTIFUZZ_ISO_14443a                                           0x0380
 #define CMD_SIMULATE_TAG_ISO_14443B                                       0x0381
-#define CMD_SNOOP_ISO_14443B                                              0x0382
+#define CMD_SNIFF_ISO_14443B                                              0x0382
 
-#define CMD_SNOOP_ISO_14443a                                              0x0383
+#define CMD_SNIFF_ISO_14443a                                              0x0383
 #define CMD_SIMULATE_TAG_ISO_14443a                                       0x0384
 
 #define CMD_READER_ISO_14443a                                             0x0385
@@ -192,7 +192,7 @@ typedef struct {
 #define CMD_ICLASS_READCHECK                                              0x038F
 #define CMD_ICLASS_CLONE                                                  0x0390
 #define CMD_ICLASS_DUMP                                                   0x0391
-#define CMD_SNOOP_ICLASS                                                  0x0392
+#define CMD_SNIFF_ICLASS                                                  0x0392
 #define CMD_SIMULATE_TAG_ICLASS                                           0x0393
 #define CMD_READER_ICLASS                                                 0x0394
 #define CMD_READER_ICLASS_REPLAY                                          0x0395
@@ -204,7 +204,7 @@ typedef struct {
 
 // For ISO1092 / FeliCa
 #define CMD_FELICA_SIMULATE_TAG                                           0x03A0
-#define CMD_FELICA_SNOOP                                                  0x03A1
+#define CMD_FELICA_SNIFF                                                  0x03A1
 #define CMD_FELICA_COMMAND                                                0x03A2
 //temp
 #define CMD_FELICA_LITE_DUMP                                              0x03AA
diff --git a/proxmark3.sh b/proxmark3.sh
index 34691b95a..b109d82e6 100755
--- a/proxmark3.sh
+++ b/proxmark3.sh
@@ -2,7 +2,7 @@
 
 function wait4proxmark_Linux {
     echo >&2 "Waiting for Proxmark to appear..."
-    while [ ! -c /dev/ttyACM? -a ! -L /dev/pm3-? ]; do
+    while [ ! -c /dev/ttyACM? -a ! -c /dev/pm3-? ]; do
         sleep .1
     done
     local PM3=`ls -1 /dev/pm3-? /dev/ttyACM? 2>/dev/null | head -1`
diff --git a/tools/Makefile b/tools/Makefile
index 51a76677b..3b1dc1b0f 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -16,4 +16,4 @@ get_xorsearch:
 #  Mingw
 #	unzzip-big XORSearch_V1_11_2.zip
 #  linux
-#	gunzip  XORSearch_V1_11_2.zip
\ No newline at end of file
+#	gunzip  XORSearch_V1_11_2.zip
diff --git a/tools/findbits_test.py b/tools/findbits_test.py
index 4415ce726..db8dda8fa 100644
--- a/tools/findbits_test.py
+++ b/tools/findbits_test.py
@@ -65,4 +65,4 @@ class OutputBuffer(object):
 
 
 if __name__ == '__main__':
-    unittest.main()
\ No newline at end of file
+    unittest.main()
diff --git a/tools/mkversion.pl b/tools/mkversion.pl
index 023c84c8b..ed5cea206 100644
--- a/tools/mkversion.pl
+++ b/tools/mkversion.pl
@@ -4,7 +4,7 @@
 # Normally a couple of lines of bash would be enough (see openpcd project, original firmware by Harald Welte and Milosch Meriac)
 # but this will, at least in theory, also work on Windows with our current compile environment.
 # -- Henryk Plötz <henryk@ploetzli.ch> 2009-09-28
-# Modified april 2014 because of the move to github. 
+# Modified april 2014 because of the move to github.
 # --- Martin Holst Swende <martin@swende.se>
 # Modified january 2016 to work with Travis-CI
 # --- iceman <iceman@iuse.se>
@@ -19,9 +19,9 @@ my $ctime;
 # GIT status  0 = dirty,  1 = clean ,  2 = undecided
 my $clean = 2;
 
-# Do we have acces to git command? 
+# Do we have acces to git command?
 #######
-# solves some bug on macos i.e: 
+# solves some bug on macos i.e:
 ##
 # perl ../tools/mkversion.pl .. > version.c || cp ../common/default_version.c version.c
 # /usr/bin/which: /usr/bin/which: cannot execute binary file
diff --git a/uart/uart_win32.c b/uart/uart_win32.c
index 0717a24cb..6107a564e 100644
--- a/uart/uart_win32.c
+++ b/uart/uart_win32.c
@@ -174,4 +174,4 @@ bool uart_send(const serial_port sp, const uint8_t *p_tx, const size_t len) {
     return WriteFile(((serial_port_windows *)sp)->hPort, p_tx, len, &txlen, NULL);
 }
 
-#endif
\ No newline at end of file
+#endif

From cfe2b2797e5f6f920886a1ab7ee14571ad607b1e Mon Sep 17 00:00:00 2001
From: vratiskol <vincent.ratiskol@github.com>
Date: Fri, 15 Mar 2019 21:45:00 +0100
Subject: [PATCH 0810/1938] Revert "Merge branch 'master' into hf_mf_sim"

This reverts commit cbea5d9d022483fefb3e714bcd6c6e834b71447b, reversing
changes made to b66152feb2da37fe87bffae9a37054935c8707e9.
---
 .gitignore                            |   1 -
 CHANGELOG.md                          |  29 -
 HACKING.txt                           | 195 ++++---
 Makefile                              |   8 +-
 README.md                             |   4 +-
 armsrc/BigBuf.c                       |  41 ++
 armsrc/BigBuf.h                       |   1 +
 armsrc/Makefile                       |   4 +-
 armsrc/Standalone/hf_mattyrun.c       |   2 +-
 armsrc/Standalone/hf_mattyrun.h       |   2 +-
 armsrc/Standalone/hf_young.c          |   2 +-
 armsrc/Standalone/hf_young.h          |   2 +-
 armsrc/Standalone/lf_hidbrute.h       |   2 +-
 armsrc/Standalone/lf_proxbrute.c      |   2 +-
 armsrc/Standalone/lf_proxbrute.h      |   2 +-
 armsrc/Standalone/lf_samyrun.c        |   2 +-
 armsrc/Standalone/lf_samyrun.h        |   2 +-
 armsrc/Standalone/standalone.h        |   2 +-
 armsrc/aes.c                          |   2 +-
 armsrc/aes.h                          |   2 +-
 armsrc/appmain.c                      |  33 +-
 armsrc/apps.h                         |  20 +-
 armsrc/buzzer.c                       |   2 +-
 armsrc/desfire_crypto.c               |   2 +-
 armsrc/desfire_key.c                  |   2 +-
 armsrc/desfire_key.h                  |   2 +-
 armsrc/epa.c                          |   7 +-
 armsrc/felica.c                       |   2 +-
 armsrc/flashmem.h                     |   2 +-
 armsrc/hfsnoop.c                      |  10 +-
 armsrc/hitag2.c                       | 465 +++++++++++-----
 armsrc/hitag2.h                       |  23 -
 armsrc/hitag2_crypto.c                | 116 ----
 armsrc/hitag2_crypto.h                |  36 --
 armsrc/hitagS.c                       | 766 +++++++++++++++-----------
 armsrc/hitagS.h                       |  31 --
 armsrc/iclass.c                       |   4 +-
 armsrc/iso14443a.c                    |   2 +-
 armsrc/iso14443b.c                    |   8 +-
 armsrc/iso15693.c                     |  39 +-
 armsrc/lfops.c                        |  98 ++--
 armsrc/lfsampling.c                   |  22 +-
 armsrc/lfsampling.h                   |   6 +-
 armsrc/mifarecmd.c                    |   4 +-
 armsrc/mifarecmd.h                    |   2 +-
 armsrc/mifaresniff.c                  |   2 +-
 armsrc/mifaresniff.h                  |   2 +-
 armsrc/pcf7931.c                      |   2 +-
 armsrc/pcf7931.h                      |   2 +-
 armsrc/start.c                        |   2 +-
 armsrc/string.h                       |   2 +-
 armsrc/ticks.h                        |   2 +-
 armsrc/util.h                         |  39 --
 client/amiitool/amiitool.c            |   2 +-
 client/cli.c                          |   2 +-
 client/cmdcrc.c                       |   2 +-
 client/cmddata.c                      |  40 +-
 client/cmddata.h                      |   2 +-
 client/cmdflashmem.c                  |   2 +-
 client/cmdflashmem.h                  |   2 +-
 client/cmdhf.c                        |   4 +-
 client/cmdhf14a.c                     |   2 +-
 client/cmdhf14b.c                     |  30 +-
 client/cmdhf15.c                      |  14 +-
 client/cmdhfepa.c                     |   2 +-
 client/cmdhffelica.c                  |   4 +-
 client/cmdhffido.h                    |   2 +-
 client/cmdhficlass.c                  |   8 +-
 client/cmdhflegic.c                   |   2 +-
 client/cmdhflist.c                    |   2 +-
 client/cmdhfmf.c                      |   6 +-
 client/cmdhfmfdesfire.h               |   2 +-
 client/cmdhfmfp.h                     |   2 +-
 client/cmdlf.c                        |  29 +-
 client/cmdlfhitag.c                   | 554 +++++--------------
 client/cmdlfhitag.h                   |   9 +-
 client/cmdlft55xx.c                   |   6 +-
 client/cmdlfti.c                      |   2 +-
 client/cmdmain.c                      |   2 +-
 client/cmdscript.c                    |   2 +-
 client/cmdsmartcard.c                 | 167 ++----
 client/cmdsmartcard.h                 |   3 +-
 client/cmdtrace.c                     |  46 +-
 client/crypto/libpcrypto.c            |  15 -
 client/crypto/libpcrypto.h            |   1 -
 client/emv/cmdemv.c                   |   2 -
 client/emv/emvjson.h                  |   2 +-
 client/fpga_compress.c                |  18 +-
 client/hardnested/hardnested_tables.c |   2 +-
 client/hid-flasher/usb_cmd.h          |  12 +-
 client/loclass/elite_crack.c          |   2 +-
 client/loclass/fileutils.c            |  54 +-
 client/loclass/fileutils.h            |   8 +-
 client/lualibs/7816_error.lua         |   2 +-
 client/lualibs/hf_reader.lua          |   2 +-
 client/lualibs/precalc.lua            |   2 +-
 client/lualibs/read14b.lua            |   2 +-
 client/lualibs/taglib.lua             |   2 +-
 client/lualibs/utils.lua              |   2 +-
 client/mifare/mifarehost.h            |   2 +-
 client/pm3_eml_mfd_test.py            |   2 +-
 client/reveng/preset.c                |   2 +-
 client/scandir.h                      |   2 +-
 client/scripting.c                    |   2 +-
 client/scripts/Legic_clone.lua        |   2 +-
 client/scripts/brutesim.lua           |   2 +-
 client/scripts/calc_di.lua            |   2 +-
 client/scripts/calc_ev1_it.lua        |   2 +-
 client/scripts/calc_mizip.lua         |   2 +-
 client/scripts/calypso.lua            |   2 +-
 client/scripts/e.lua                  |   2 +-
 client/scripts/emul2dump.lua          |   2 +-
 client/scripts/emul2html.lua          |   2 +-
 client/scripts/formatMifare.lua       |   2 +-
 client/scripts/hf_read.lua            |   2 +-
 client/scripts/htmldump.lua           |   2 +-
 client/scripts/lf_bulk.lua            |   2 +-
 client/scripts/mfkeys.lua             |   2 +-
 client/scripts/ndef_dump.lua          |   2 +-
 client/scripts/ntag_3d.lua            |   2 +-
 client/scripts/parameters.lua         |   2 +-
 client/scripts/test_t55x7_ask.lua     |   2 +-
 client/scripts/test_t55x7_fsk.lua     |   2 +-
 client/scripts/tnp3dump.lua           |   2 +-
 client/scripts/tracetest.lua          |   2 +-
 client/scripts/ufodump.lua            |   2 +-
 client/snooper.c                      |   6 +-
 client/util.c                         |  60 +-
 client/util.h                         |   4 +-
 client/util_darwin.h                  |   2 +-
 common/bucketsort.h                   |   2 +-
 common/cmd.c                          |   2 +-
 common/crc.c                          |   2 +-
 common/crc16.h                        |   2 +-
 common/crc32.c                        |   2 +-
 common/crc64.c                        |   2 +-
 common/i2c.h                          |   2 +-
 common/iso15693tools.c                |   5 +-
 common/iso15693tools.h                |   2 +-
 common/legic_prng.c                   |   2 +-
 common/lfdemod.c                      |   5 +-
 common/lfdemod.h                      |   2 +-
 common/prng.h                         |   2 +-
 common/protocols.h                    |   1 -
 common/radixsort.c                    |   2 +-
 common/radixsort.h                    |   2 +-
 common/random.h                       |   2 +-
 common/tea.h                          |   2 +-
 common/usart.c                        |   2 +-
 common/usb_cdc.c                      |   2 +-
 common/wiegand.c                      |   2 +-
 include/at91sam7s512.h                |   2 +-
 include/common.h                      |   2 +-
 include/hitag.h                       | 117 ----
 include/mifare.h                      |   3 +-
 include/usb_cmd.h                     |  14 +-
 proxmark3.sh                          |   2 +-
 tools/Makefile                        |   2 +-
 tools/findbits_test.py                |   2 +-
 tools/mkversion.pl                    |   6 +-
 uart/uart_win32.c                     |   2 +-
 161 files changed, 1465 insertions(+), 2004 deletions(-)
 delete mode 100644 armsrc/hitag2.h
 delete mode 100644 armsrc/hitag2_crypto.c
 delete mode 100644 armsrc/hitag2_crypto.h
 delete mode 100644 armsrc/hitagS.h
 delete mode 100644 include/hitag.h

diff --git a/.gitignore b/.gitignore
index 9a12efbe5..785934f46 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,6 @@
 # don't push these files to the repository
 
 .history
-.bash_history
 *.log
 *.eml
 *.o
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 95c590a52..34bf817bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,35 +3,6 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [unreleased][unreleased]
- - Change - handling fault bit markers (7) and partial nibbles in hex printing (@doegox)
- - Change - printing of fault bit markers (7) using a dot (@doegox)
- - Change 'sc upgrade' - firmware file integrity check (@piwi)
- - Fix 'data rawdemod am' - last bit was missing (@doegox)
- - Fix 'hf 15 dump f' - also selects tag first (@iceman)
- - Fix 'hf iclass clone' - missing fileclose (@iceman)
- - Add 'trace list hitag' - old hitag annotations now use the new trace (@iceman)
- - Change 'lf hitag sim' - loads bin/eml/json (@iceman)
- - Change 'lf hitag reader 21' - saves in bin/eml/json (@iceman)
- - Change 'lf hitag' - refactoring (@iceman)
- - Change 'lf hitag' - refactoring (@piwi)
- - Fix 'lf hitag' - generic fix for missing clock init (@piwi)
- - Fix fsk sim operations on deviceside - avoid division by zero (@doegox)
- - Fix 'hf mf fchk' - condition always false (@doegox)
- - Fix 'lf t55xx recoverpw' - shift as u32 (@doegox)
- - Fix 'lf ti demod' - shift as u32 (@doegox)
- - Fix 'lf ti read' - shift as u32 (@doegox)
- - Fix 'lf t55xx chk' - condition always false (@doegox) 
- - Change 'lf sim' - ledcontrol refactoring (@doegox)
- - Fix 'hf mf nack' - signedness bug (@doegox)
- - Fix 'hf epa cnonce' - check return value (@doegox)
- - Fix 'lf hitag write' - condition always true (@doegox)
- - Fix 'mem write' - added extra check (@doegox)
- - Fix 'iso15693' - bad string cpy (@doegox)
- - Fix 'make style' - EOF LF support (@doegox)
- - Add 'hf 14b raw' - added -t for timeout  (@iceman)
- - Rename 'lf hitag snoop' - renamed to 'lf hitag sniff' (@iceman)
- - Rename 'lf snoop' - renamed to 'lf sniff' (@iceman)
- - Rename 'hf snoop' - renamed to 'hf sniff' (@iceman)
  - Fix 'hf mfp wrbl' - more blocks available (@merlokk)
  - Add 'make platform' - compile for non-rdv4 devices made simpler (@doegox)
  - Change Makefiles optimizations when recompiling (@doegox)
diff --git a/HACKING.txt b/HACKING.txt
index 9d7bdaedc..fb68142e9 100644
--- a/HACKING.txt
+++ b/HACKING.txt
@@ -1,26 +1,38 @@
-    "Coding styles are like assholes, everyone has one and no one likes anyone elses."
-    --Eric Warmenhoven
+	"Coding styles are like assholes, everyone has one and no one likes anyone elses."
+	--Eric Warmenhoven
 
 The Proxmark3 codebase is pretty messy and in the process of being cleaned up,
 so we don't have clear guidelines on how to place new code just yet. However,
 please don't make things worse.
 
 However, we have established a set of coding style guidelines in order to
-clean up the code consistently and keep it consistent in the future.
-Look around and respect the same style.
-Helper script to get some uniformity in the style:
-
-$ make style
-
-It makes use of "astyle" so be sure to install it first.
-
+clean up the code consistently and keep it consistent in the future. Use common
+sense and good taste. If breaking a rule leads to cleaner code, you can do so,
+but laziness is not an excuse.
 
 === INDENTATION ===
 
-Don't use tabs, editors are messing them up too easily.
-Increment unit is four spaces.
+Use tabs for indentation, but use spaces for alignment:
 
-If you use "make style", this will be done for you.
+	if (foo(this, that, there)
+	    && bar == baz)
+	{
+		dostuff();
+	}
+
+Notice it's like this (T___ for tab, S for space, for a 4-char tab setting):
+
+T___if (foo(this, that, there)
+T___SSSS&& bar == baz)
+
+Another example:
+
+#define THIS            0x10
+#define THAT_THING      0x20
+#define SOMETHING_ELSE  0x80
+
+These should look good no matter what your editor's tab setting is, so go nuts
+and pick whatever you like best.
 
 === WIDTH ===
 
@@ -53,28 +65,24 @@ use microsoft-style DWORD and the like, we're getting rid of those. Avoid char
 for buffers, uint8_t is more obvious when you're not working with strings. Use
 'const' where things are const. Try to use size_t for sizes.
 
-Pointers and reference operators are attached to the variable name:
-    void *ptr;
+Pointers are:
+	void *ptr;
 not:
-    void* ptr;
+	void* ptr;
 otherwise you're tempted to write:
-    void* in, out;
+	void* in, out;
 and you'll fail.
 
-"make style" will take care of pointers & reference operators.
-
 === EXPRESSIONS ===
 
 In general, use whitespace around binary operators - no unspaced blobs of an
-expression. "make style" will take care of whitespaces around operators.
+expression. This rule may be broken if it makes things clearer. For example,
 
-For example,
-
-    if (5 * a < b && some_bool_var)
+	if (5*a < b && some_bool_var)
 
 but not
 
-    if (5*a<b&&some_bool_var)
+	if (5*a<b&&some_bool_var)
 
 For equality with constants, use i == 0xF00, not 0xF00 == i. The compiler warns
 you about = vs == anyway, and you shouldn't be screwing that one up by now
@@ -82,73 +90,93 @@ anyway.
 
 === IF / FOR / WHILE / etc. ===
 
-Put the opening brace on the same line, with a space before it.
-There should be a space between the construct name (if/for/whatever) and the
-opening parenthesis, and there should be a space between the closing parenthesis
-and the opening brace, and no space between parenthesis and expression.
-"make style" will take care of all that.
+Put the opening brace on the same line, with a space before it. Exception: if
+the if/for/while condition/whatever are split over several lines, it might be
+more appealing to put the opening brace on its own line, so use your own
+judgement there:
+
+	if (foo(this, that, there)
+	    && bar == baz)
+	{
+		dostuff();
+	}
 
 If you do split the condition, put the binary operators that join the lines at
-the beginning of the following lines, not at the end of the prior lines.
+the beginning of the following lines (as above), not at the end of the prior
+lines.
+
+There should be a space between the construct name (if/for/whatever) and the
+opening parenthesis, and there should be a space between the closing parenthesis
+and the opening brace.
 
 For generic for() iterator variables, declare them in-line:
 
-    for (int i = 0; i < 10; i++) {
-        ...
-    }
+	for (int i = 0; i < 10; i++) {
+		...
+	}
 
 Note the spaces after the semicolons.
 
 if/else should be laid out as follows:
 
-    if (foo) {
-        ...
-    } else if (bar) {
-        ...
-    } else {
-        ...
-    }
+	if (foo) {
+		...
+	} else if (bar) {
+		...
+	} else {
+		...
+	}
 
-You can skip braces around 1 line statements but don't mix braces vs. no braces.
+or
+
+	if (foo)
+		...
+	else if (bar)
+		...
+	else
+		...
+
+Don't mix braces vs. no braces. If any of your bodies are > 1 line, put braces
+around them all.
 
 === FUNCTIONS ===
 
-Put the return type on the same line.
-Put a space after a comma in argument lists.
-Open the brace after the declaration (after a space).
-"make style" will take care of all that.
+Functions with no arguments are declared as f(void), not f(). Put the return
+type on the same line. Use static for functions that aren't exported, and put
+exported functions in a header file (one header file per source file with
+exported functions usually, no huge headers with all functions). Put a space
+after a comma in argument lists.
 
-void foo(int a_thing, int something_else) {
-    ...
+void foo(int a_thing, int something_else)
+{
+	...
 }
 
-Functions with no arguments are declared as f(void), not f().
-Use static for functions that aren't exported, and put exported functions
-in a header file (one header file per source file with exported functions
-usually, no huge headers with all functions). 
-
-void baz(void) {
-    foo(bluh, blah);
+void baz(void)
+{
+	foo(bluh, blah);
 }
 
 Function names should be separated_with_underscores(), except for standard
 functions (memcpy, etc.). It may make sense to break this rule for very common,
 generic functions that look like library functions (e.g. dprintf()).
 
-Don't use single-character arguments.
-Exception: very short functions with one argument that's really obvious:
+Don't use single-character arguments. Exception: very short functions with one
+argument that's really obvious:
 
-static int ascii(char c) {
-    if (c < 0x20 || c >= 0x7f)
-        return '.';
-    else
-        return c;
+static int ascii(char c)
+{
+	if (c < 0x20 || c >= 0x7f)
+		return '.';
+	else
+		return c;
 }
 
 vs.
 
-static void hexdump(void *buf, size_t len) {
-    ...
+static void hexdump(void *buf, size_t len)
+{
+	...
 }
 
 As a general guideline, functions shouldn't usually be much more than 30-50
@@ -160,7 +188,7 @@ probably missing some factoring/restructuring opportunity.
 Use typedefs when defining structs. The type should be named something_t.
 
 typedef struct {
-    blah blah;
+	blah blah;
 } prox_cmd_t;
 
 You can use anonymous enums to replace lots of sequential or mostly-sequential
@@ -171,18 +199,16 @@ You can use anonymous enums to replace lots of sequential or mostly-sequential
 Indent once for the case: labels, then again for the body. Like this:
 
 switch(bar) {
-    case OPTION_A:
-        do_stuff();
-        break;
-    case OPTION_B:
-        do_other_stuff();
-        break;
+	case OPTION_A:
+		do_stuff();
+		break;
+	case OPTION_B:
+		do_other_stuff();
+		break;
 }
 
-"make style" will take care of the indentation.
-
-If you fall through into another case, add an explicit comment;
-otherwise, it can look confusing.
+If you fall through into another case, add an explicit comment; otherwise, it
+can look confusing.
 
 If your switch() is too long or has too many cases, it should be cleaned up.
 Split off the cases into functions, break the switch() into parent and children
@@ -192,12 +218,12 @@ the like. In other words, use common sense and your brain.
 If you need local scope variables for a case, you can add braces:
 
 switch(bar) {
-    case OPTION_A: {
-        int baz = 5 * bar;
-        do_stuff(baz);
-        break;
-    }
-    ...
+	case OPTION_A: {
+		int baz = 5*bar;
+		do_stuff(baz);
+		break;
+	}
+	...
 
 But at that point you should probably consider using a separate function.
 
@@ -240,7 +266,7 @@ License/description header first:
 //-----------------------------------------------------------------------------
 
 If you modify a file in any non-trivial way (add code, etc.), add your copyright
-to the top with the current year.
+to the top.
 
 === HEADER FILES ===
 
@@ -258,7 +284,8 @@ you shouldn't use it (same for _FOOBAR_H).
 
 === WHITESPACE ===
 
-Avoid trailing whitespace (no line should end in tab or space).
-Keep a newline (blank line) at the end of each file.
+Avoid trailing whitespace (no line should end in tab or space). People forget
+this all the time if their editor doesn't handle it, but don't be surprised if
+you see someone fixing it from time to time.
 
-"make style" will take care of both.
+Keep a newline (blank line) at the end of each file.
diff --git a/Makefile b/Makefile
index 6e7c9abd5..14bf98074 100644
--- a/Makefile
+++ b/Makefile
@@ -106,14 +106,8 @@ endif
 print-%: ; @echo $* = $($*)
 
 style:
-	# Make sure astyle is installed
 	@which astyle >/dev/null || ( echo "Please install 'astyle' package first" ; exit 1 )
-	# Remove spaces & tabs at EOL, add LF at EOF if needed on *.c, *.h, *.cpp. *.lua, *.py, *.pl, Makefile
-	find . \( -name "*.[ch]" -or -name "*.cpp" -or -name "*.lua" -or -name "*.py" -or -name "*.pl" -or -name "Makefile" \) \
-	    -exec perl -pi -e 's/[ \t\r]+$$//' {} \; \
-	    -exec sh -c "tail -c1 {} | xxd -p | tail -1 | grep -q -v 0a$$" \; \
-	    -exec sh -c "echo >> {}" \;
-	# Apply astyle on *.c, *.h, *.cpp
+	find . \( -name "*.[ch]" -or -name "*.cpp" -or -name "*.lua" -or -name "Makefile" \) -exec perl -pi -e 's/[ \t\r]+$$//' {} \;
 	find . \( -name "*.[ch]" -or -name "*.cpp" \) -exec astyle --formatted --mode=c --suffix=none \
 	    --indent=spaces=4 --indent-switches --indent-preprocessor \
 	    --keep-one-line-blocks --max-instatement-indent=60 \
diff --git a/README.md b/README.md
index cfdbacc61..c8c04f852 100644
--- a/README.md
+++ b/README.md
@@ -286,7 +286,7 @@ You will need to run these commands to make sure your rdv4 is prepared
 
 ### Verify sim module firmware version
 To make sure you got the latest sim module firmware.
-_Lastest version is v3.11_
+_Lastest version is v3.10_
 
     pm3 --> hw status
 
@@ -298,7 +298,7 @@ Find version in the long output,  look for these two lines
 This version is obselete. The following command upgrades your device sim module firmware.
 Don't not turn of your device during the execution of this command.
 
-    pm3 --> sc upgrade f ../tools/simmodule/SIM011.BIN 
+    pm3 --> sc upgrade f ../tools/simmodule/SIM010.BIN 
     
 You get the following output,  this is a successful execution.    
     
diff --git a/armsrc/BigBuf.c b/armsrc/BigBuf.c
index 267e6811b..ab45a2681 100644
--- a/armsrc/BigBuf.c
+++ b/armsrc/BigBuf.c
@@ -195,6 +195,47 @@ bool RAMFUNC LogTrace(const uint8_t *btBytes, uint16_t iLen, uint32_t timestamp_
     return true;
 }
 
+int LogTraceHitag(const uint8_t *btBytes, int iBits, int iSamples, uint32_t dwParity, int readerToTag) {
+    /**
+      Todo, rewrite the logger to use the generic functionality instead. It should be noted, however,
+      that this logger takes number of bits as argument, not number of bytes.
+      **/
+
+    if (!tracing) return false;
+
+    uint8_t *trace = BigBuf_get_addr();
+    uint32_t iLen = nbytes(iBits);
+    // Return when trace is full
+    if (traceLen + sizeof(rsamples) + sizeof(dwParity) + sizeof(iBits) + iLen > BigBuf_max_traceLen()) return false;
+
+    //Hitag traces appear to use this traceformat:
+    // 32 bits timestamp (little endian,Highest Bit used as readerToTag flag)
+    // 32 bits parity
+    // 8 bits size (number of bits in the trace entry, not number of bytes)
+    // y Bytes data
+
+    rsamples += iSamples;
+    trace[traceLen++] = ((rsamples >> 0) & 0xff);
+    trace[traceLen++] = ((rsamples >> 8) & 0xff);
+    trace[traceLen++] = ((rsamples >> 16) & 0xff);
+    trace[traceLen++] = ((rsamples >> 24) & 0xff);
+
+    if (!readerToTag) {
+        trace[traceLen - 1] |= 0x80;
+    }
+
+    trace[traceLen++] = ((dwParity >> 0) & 0xff);
+    trace[traceLen++] = ((dwParity >> 8) & 0xff);
+    trace[traceLen++] = ((dwParity >> 16) & 0xff);
+    trace[traceLen++] = ((dwParity >> 24) & 0xff);
+    trace[traceLen++] = iBits;
+
+    memcpy(trace + traceLen, btBytes, iLen);
+    traceLen += iLen;
+
+    return true;
+}
+
 // Emulator memory
 uint8_t emlSet(uint8_t *data, uint32_t offset, uint32_t length) {
     uint8_t *mem = BigBuf_get_EM_addr();
diff --git a/armsrc/BigBuf.h b/armsrc/BigBuf.h
index bdd2003be..995451b9b 100644
--- a/armsrc/BigBuf.h
+++ b/armsrc/BigBuf.h
@@ -42,5 +42,6 @@ extern void set_tracing(bool enable);
 extern void set_tracelen(uint32_t value);
 extern bool get_tracing(void);
 extern bool RAMFUNC LogTrace(const uint8_t *btBytes, uint16_t iLen, uint32_t timestamp_start, uint32_t timestamp_end, uint8_t *parity, bool readerToTag);
+extern int LogTraceHitag(const uint8_t *btBytes, int iBits, int iSamples, uint32_t dwParity, int bReader);
 extern uint8_t emlSet(uint8_t *data, uint32_t offset, uint32_t length);
 #endif /* __BIGBUF_H */
diff --git a/armsrc/Makefile b/armsrc/Makefile
index cf63f6356..3c93c4af8 100644
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -38,7 +38,7 @@ APP_CFLAGS = $(PLATFORM_DEFS) \
 			 -DWITH_ISO14443a \
 			 -DWITH_ICLASS \
 			 -DWITH_FELICA \
-			 -DWITH_HFSNIFF \
+			 -DWITH_HFSNOOP \
 			 -DWITH_LF_SAMYRUN \
 			 -fno-strict-aliasing -ffunction-sections -fdata-sections
 
@@ -60,7 +60,7 @@ APP_CFLAGS = $(PLATFORM_DEFS) \
 
 
 SRC_LCD = fonts.c LCD.c
-SRC_LF = lfops.c hitag2_crypto.c hitag2.c hitagS.c lfsampling.c pcf7931.c lfdemod.c
+SRC_LF = lfops.c hitag2.c hitagS.c lfsampling.c pcf7931.c lfdemod.c
 SRC_ISO15693 = iso15693.c iso15693tools.c
 SRC_ISO14443a = iso14443a.c mifareutil.c mifarecmd.c epa.c mifaresim.c
 SRC_ISO14443b = iso14443b.c
diff --git a/armsrc/Standalone/hf_mattyrun.c b/armsrc/Standalone/hf_mattyrun.c
index 8cac76c35..bf4b71d61 100644
--- a/armsrc/Standalone/hf_mattyrun.c
+++ b/armsrc/Standalone/hf_mattyrun.c
@@ -433,4 +433,4 @@ void RunMod() {
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/armsrc/Standalone/hf_mattyrun.h b/armsrc/Standalone/hf_mattyrun.h
index 6602eba54..8b33e67c5 100644
--- a/armsrc/Standalone/hf_mattyrun.h
+++ b/armsrc/Standalone/hf_mattyrun.h
@@ -20,4 +20,4 @@
 
 #define OPTS 2
 
-#endif /* __HF_MATTYRUN_H */
+#endif /* __HF_MATTYRUN_H */
\ No newline at end of file
diff --git a/armsrc/Standalone/hf_young.c b/armsrc/Standalone/hf_young.c
index 4b7a87e99..99af4ef1e 100644
--- a/armsrc/Standalone/hf_young.c
+++ b/armsrc/Standalone/hf_young.c
@@ -259,4 +259,4 @@ void RunMod() {
             LED(selected + 1, 0);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/armsrc/Standalone/hf_young.h b/armsrc/Standalone/hf_young.h
index dcd8b13e7..46c0d1361 100644
--- a/armsrc/Standalone/hf_young.h
+++ b/armsrc/Standalone/hf_young.h
@@ -19,4 +19,4 @@
 
 #define OPTS 2
 
-#endif /* __HF_YOUNG_H */
+#endif /* __HF_YOUNG_H */
\ No newline at end of file
diff --git a/armsrc/Standalone/lf_hidbrute.h b/armsrc/Standalone/lf_hidbrute.h
index 49b0af6c6..bc1cf2e31 100644
--- a/armsrc/Standalone/lf_hidbrute.h
+++ b/armsrc/Standalone/lf_hidbrute.h
@@ -21,4 +21,4 @@
 
 void hid_corporate_1000_calculate_checksum_and_set(uint32_t *high, uint32_t *low, uint32_t cardnum, uint32_t fc);
 
-#endif /* __LF_HIDBRUTE_H */
+#endif /* __LF_HIDBRUTE_H */
\ No newline at end of file
diff --git a/armsrc/Standalone/lf_proxbrute.c b/armsrc/Standalone/lf_proxbrute.c
index 178ce98fb..ea1bd1f6f 100644
--- a/armsrc/Standalone/lf_proxbrute.c
+++ b/armsrc/Standalone/lf_proxbrute.c
@@ -164,4 +164,4 @@ void RunMod() {
 out:
     DbpString("[=] exiting");
     LEDsoff();
-}
+}
\ No newline at end of file
diff --git a/armsrc/Standalone/lf_proxbrute.h b/armsrc/Standalone/lf_proxbrute.h
index 3a9e1ce29..3911fee35 100644
--- a/armsrc/Standalone/lf_proxbrute.h
+++ b/armsrc/Standalone/lf_proxbrute.h
@@ -18,4 +18,4 @@
 
 #define OPTS 2
 
-#endif /* __LF_PROXBRUTE_H */
+#endif /* __LF_PROXBRUTE_H */
\ No newline at end of file
diff --git a/armsrc/Standalone/lf_samyrun.c b/armsrc/Standalone/lf_samyrun.c
index b4530fa2f..ec0e4d19e 100644
--- a/armsrc/Standalone/lf_samyrun.c
+++ b/armsrc/Standalone/lf_samyrun.c
@@ -138,4 +138,4 @@ void RunMod() {
 out:
     DbpString("[=] exiting");
     LEDsoff();
-}
+}
\ No newline at end of file
diff --git a/armsrc/Standalone/lf_samyrun.h b/armsrc/Standalone/lf_samyrun.h
index 52c0bb942..cf21e1261 100644
--- a/armsrc/Standalone/lf_samyrun.h
+++ b/armsrc/Standalone/lf_samyrun.h
@@ -19,4 +19,4 @@
 
 #define OPTS 2
 
-#endif /* __LF_SAMYRUN_H */
+#endif /* __LF_SAMYRUN_H */
\ No newline at end of file
diff --git a/armsrc/Standalone/standalone.h b/armsrc/Standalone/standalone.h
index 980bcbf46..53d5ff13d 100644
--- a/armsrc/Standalone/standalone.h
+++ b/armsrc/Standalone/standalone.h
@@ -16,4 +16,4 @@
 
 extern void RunMod();
 
-#endif /* __STANDALONE_H */
+#endif /* __STANDALONE_H */
\ No newline at end of file
diff --git a/armsrc/aes.c b/armsrc/aes.c
index f8a36f28c..61a8da76b 100644
--- a/armsrc/aes.c
+++ b/armsrc/aes.c
@@ -1167,4 +1167,4 @@ int main() {
 
     return 0;
 }
-#endif
+#endif
\ No newline at end of file
diff --git a/armsrc/aes.h b/armsrc/aes.h
index aa9f0c582..afe7e5e4e 100644
--- a/armsrc/aes.h
+++ b/armsrc/aes.h
@@ -31,4 +31,4 @@ int AesCtxIni(AesCtx *pCtx, unsigned char *pIV, unsigned char *pKey, unsigned in
 int AesEncrypt(AesCtx *pCtx, unsigned char *pData, unsigned char *pCipher, unsigned int DataLen);
 int AesDecrypt(AesCtx *pCtx, unsigned char *pCipher, unsigned char *pData, unsigned int CipherLen);
 
-#endif
+#endif
\ No newline at end of file
diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index aecfee076..dbe20b2b7 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -650,8 +650,8 @@ void UsbPacketReceived(uint8_t *packet, int len) {
         case CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K:
             ModThenAcquireRawAdcSamples125k(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
             break;
-        case CMD_LF_SNIFF_RAW_ADC_SAMPLES: {
-            uint32_t bits = SniffLF();
+        case CMD_LF_SNOOP_RAW_ADC_SAMPLES: {
+            uint32_t bits = SnoopLF();
             cmd_send(CMD_ACK, bits, 0, 0, 0, 0);
             break;
         }
@@ -664,13 +664,13 @@ void UsbPacketReceived(uint8_t *packet, int len) {
             CmdHIDsimTAG(c->arg[0], c->arg[1], 1);
             break;
         case CMD_FSK_SIM_TAG:
-            CmdFSKsimTAG(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes, 1);
+            CmdFSKsimTAG(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
             break;
         case CMD_ASK_SIM_TAG:
-            CmdASKsimTag(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes, 1);
+            CmdASKsimTag(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
             break;
         case CMD_PSK_SIM_TAG:
-            CmdPSKsimTag(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes, 1);
+            CmdPSKsimTag(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
             break;
         case CMD_HID_CLONE_TAG:
             CopyHIDtoT55x7(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes[0]);
@@ -765,8 +765,8 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 #endif
 
 #ifdef WITH_HITAG
-        case CMD_SNIFF_HITAG: // Eavesdrop Hitag tag, args = type
-            SniffHitag(c->arg[0]);
+        case CMD_SNOOP_HITAG: // Eavesdrop Hitag tag, args = type
+            SnoopHitag(c->arg[0]);
             break;
         case CMD_SIMULATE_HITAG: // Simulate Hitag tag, args = memory content
             SimulateHitagTag((bool)c->arg[0], (byte_t *)c->d.asBytes);
@@ -786,7 +786,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
         case CMD_WR_HITAG_S: //writer for Hitag tags args=data to write,page and key or challenge
             if ((hitag_function)c->arg[0] < 10) {
                 WritePageHitagS((hitag_function)c->arg[0], (hitag_data *)c->d.asBytes, c->arg[2]);
-            } else {
+            } else if ((hitag_function)c->arg[0] >= 10) {
                 WriterHitag((hitag_function)c->arg[0], (hitag_data *)c->d.asBytes, c->arg[2]);
             }
             break;
@@ -843,7 +843,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
         case CMD_READ_SRI_TAG:
             ReadSTMemoryIso14443b(c->arg[0]);
             break;
-        case CMD_SNIFF_ISO_14443B:
+        case CMD_SNOOP_ISO_14443B:
             SniffIso14443b();
             break;
         case CMD_SIMULATE_TAG_ISO_14443B:
@@ -862,7 +862,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
         case CMD_FELICA_LITE_SIM:
             felica_sim_lite(c->arg[0]);
             break;
-        case CMD_FELICA_SNIFF:
+        case CMD_FELICA_SNOOP:
             felica_sniff(c->arg[0], c->arg[1]);
             break;
         case CMD_FELICA_LITE_DUMP:
@@ -871,7 +871,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 #endif
 
 #ifdef WITH_ISO14443a
-        case CMD_SNIFF_ISO_14443a:
+        case CMD_SNOOP_ISO_14443a:
             SniffIso14443a(c->arg[0]);
             break;
         case CMD_READER_ISO_14443a:
@@ -1003,7 +1003,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 
 #ifdef WITH_ICLASS
         // Makes use of ISO14443a FPGA Firmware
-        case CMD_SNIFF_ICLASS:
+        case CMD_SNOOP_ICLASS:
             SniffIClass();
             break;
         case CMD_SIMULATE_TAG_ICLASS:
@@ -1043,9 +1043,9 @@ void UsbPacketReceived(uint8_t *packet, int len) {
             break;
 #endif
 
-#ifdef WITH_HFSNIFF
+#ifdef WITH_HFSNOOP
         case CMD_HF_SNIFFER:
-            HfSniff(c->arg[0], c->arg[1]);
+            HfSnoop(c->arg[0], c->arg[1]);
             break;
 #endif
 
@@ -1322,12 +1322,10 @@ void UsbPacketReceived(uint8_t *packet, int len) {
                     // first mem page
                     res = Flash_WriteDataCont(startidx, data, first_len);
 
-                    isok = (res == first_len) ? 1 : 0;
-
                     // second mem page
                     res = Flash_WriteDataCont(startidx + first_len, data + first_len, len - first_len);
 
-                    isok &= (res == (len - first_len)) ? 1 : 0;
+                    isok = (res == (len - first_len)) ? 1 : 0;
 
                 } else {
                     res = Flash_WriteDataCont(startidx, data, len);
@@ -1391,7 +1389,6 @@ void UsbPacketReceived(uint8_t *packet, int len) {
             FlashStop();
 
             cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
-            BigBuf_free();
             LED_B_OFF();
             break;
         }
diff --git a/armsrc/apps.h b/armsrc/apps.h
index 57095a953..5bb92dc18 100644
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -85,9 +85,9 @@ void SimulateTagLowFrequency(int period, int gap, int ledcontrol);
 void SimulateTagLowFrequencyBidir(int divisor, int max_bitlen);
 void CmdHIDsimTAGEx(uint32_t hi, uint32_t lo, int ledcontrol, int numcycles);
 void CmdHIDsimTAG(uint32_t hi, uint32_t lo, int ledcontrol);
-void CmdFSKsimTAG(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream, int ledcontrol);
-void CmdASKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream, int ledcontrol);
-void CmdPSKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream, int ledcontrol);
+void CmdFSKsimTAG(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream);
+void CmdASKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream);
+void CmdPSKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream);
 void CmdHIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol);
 void CmdAWIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol); // Realtime demodulation mode for AWID26
 void CmdEM410xdemod(int findone, uint32_t *high, uint64_t *low, int ledcontrol);
@@ -222,12 +222,24 @@ void iClass_Dump(uint8_t blockno, uint8_t numblks);
 void iClass_Clone(uint8_t startblock, uint8_t endblock, uint8_t *data);
 void iClass_ReadCheck(uint8_t blockNo, uint8_t keyType);
 
+// hitag2.h
+void SnoopHitag(uint32_t type);
+void SimulateHitagTag(bool tag_mem_supplied, byte_t *data);
+void ReaderHitag(hitag_function htf, hitag_data *htd);
+void WriterHitag(hitag_function htf, hitag_data *htd, int page);
+
+//hitagS.h
+void SimulateHitagSTag(bool tag_mem_supplied, byte_t *data);
+void ReadHitagS(hitag_function htf, hitag_data *htd);
+void WritePageHitagS(hitag_function htf, hitag_data *htd, int page);
+void check_challenges(bool file_given, byte_t *data);
+
 // cmd.h
 uint8_t cmd_receive(UsbCommand *cmd);
 uint8_t cmd_send(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
 
 // util.h
-void HfSniff(int, int);
+void HfSnoop(int, int);
 
 //felica.c
 extern void felica_sendraw(UsbCommand *c);
diff --git a/armsrc/buzzer.c b/armsrc/buzzer.c
index 708b7d3f7..27d0cd12a 100644
--- a/armsrc/buzzer.c
+++ b/armsrc/buzzer.c
@@ -83,4 +83,4 @@ void Ring_Little_Star(uint16_t count) {
     Ring_BEE_TIME(note_1,2*count);
     LED_B_ON();
     */
-}
+}
\ No newline at end of file
diff --git a/armsrc/desfire_crypto.c b/armsrc/desfire_crypto.c
index fd3f30d0d..0a23305fd 100644
--- a/armsrc/desfire_crypto.c
+++ b/armsrc/desfire_crypto.c
@@ -630,4 +630,4 @@ void mifare_cypher_blocks_chained(desfiretag_t tag, desfirekey_t key, uint8_t *i
         mifare_cypher_single_block(key, data + offset, ivect, direction, operation, block_size);
         offset += block_size;
     }
-}
+}
\ No newline at end of file
diff --git a/armsrc/desfire_key.c b/armsrc/desfire_key.c
index e1f880c8b..a723a203e 100644
--- a/armsrc/desfire_key.c
+++ b/armsrc/desfire_key.c
@@ -152,4 +152,4 @@ void Desfire_session_key_new(const uint8_t rnda[], const uint8_t rndb[], desfire
             Desfire_aes_key_new(buffer, key);
             break;
     }
-}
+}
\ No newline at end of file
diff --git a/armsrc/desfire_key.h b/armsrc/desfire_key.h
index 4fc02854e..adbda9c42 100644
--- a/armsrc/desfire_key.h
+++ b/armsrc/desfire_key.h
@@ -17,4 +17,4 @@ void Desfire_aes_key_new_with_version(const uint8_t value[16], uint8_t version,
 uint8_t Desfire_key_get_version(desfirekey_t key);
 void Desfire_key_set_version(desfirekey_t key, uint8_t version);
 void Desfire_session_key_new(const uint8_t rnda[], const uint8_t rndb[], desfirekey_t authkey, desfirekey_t key);
-#endif
+#endif
\ No newline at end of file
diff --git a/armsrc/epa.c b/armsrc/epa.c
index 521bb3f69..95de11550 100644
--- a/armsrc/epa.c
+++ b/armsrc/epa.c
@@ -305,11 +305,6 @@ void EPA_PACE_Collect_Nonce(UsbCommand *c) {
     // initiate the PACE protocol
     // use the CAN for the password since that doesn't change
     func_return = EPA_PACE_MSE_Set_AT(pace_version_info, 2);
-    // check if the command succeeded
-    if (func_return != 0) {
-        EPA_PACE_Collect_Nonce_Abort(4, func_return);
-        return;
-    }
 
     // now get the nonce
     uint8_t nonce[256] = {0};
@@ -317,7 +312,7 @@ void EPA_PACE_Collect_Nonce(UsbCommand *c) {
     func_return = EPA_PACE_Get_Nonce(requested_size, nonce);
     // check if the command succeeded
     if (func_return < 0) {
-        EPA_PACE_Collect_Nonce_Abort(5, func_return);
+        EPA_PACE_Collect_Nonce_Abort(4, func_return);
         return;
     }
 
diff --git a/armsrc/felica.c b/armsrc/felica.c
index 190960bd4..3aa3c282d 100644
--- a/armsrc/felica.c
+++ b/armsrc/felica.c
@@ -544,7 +544,7 @@ void felica_sniff(uint32_t samplesToSkip, uint32_t triggersToSkip) {
 
     int remFrames = (samplesToSkip) ? samplesToSkip : 0;
 
-    Dbprintf("Sniff FelicaLiteS: Getting first %d frames, Skipping %d triggers.\n", samplesToSkip, triggersToSkip);
+    Dbprintf("Snoop FelicaLiteS: Getting first %d frames, Skipping %d triggers.\n", samplesToSkip, triggersToSkip);
 
     iso18092_setup(FPGA_HF_ISO18092_FLAG_NOMOD);
 
diff --git a/armsrc/flashmem.h b/armsrc/flashmem.h
index f4258a11b..4af499d3a 100644
--- a/armsrc/flashmem.h
+++ b/armsrc/flashmem.h
@@ -151,4 +151,4 @@ void Flashmem_print_status(void);
 
 
 
-#endif
+#endif
\ No newline at end of file
diff --git a/armsrc/hfsnoop.c b/armsrc/hfsnoop.c
index 11ceff3d9..4ec60d175 100644
--- a/armsrc/hfsnoop.c
+++ b/armsrc/hfsnoop.c
@@ -4,9 +4,9 @@
 #include "util.h"
 #include "usb_cdc.h" // for usb_poll_validate_length
 
-static void RAMFUNC optimizedSniff(void);
+static void RAMFUNC optimizedSnoop(void);
 
-static void RAMFUNC optimizedSniff(void) {
+static void RAMFUNC optimizedSnoop(void) {
     int n = BigBuf_max_traceLen() / sizeof(uint16_t); // take all memory
 
     uint16_t *dest = (uint16_t *)BigBuf_get_addr();
@@ -23,7 +23,7 @@ static void RAMFUNC optimizedSniff(void) {
     set_tracelen(BigBuf_max_traceLen());
 }
 
-void HfSniff(int samplesToSkip, int triggersToSkip) {
+void HfSnoop(int samplesToSkip, int triggersToSkip) {
     BigBuf_free();
     BigBuf_Clear();
 
@@ -66,14 +66,14 @@ void HfSniff(int samplesToSkip, int triggersToSkip) {
             if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY))
                 waitcount--;
         }
-        optimizedSniff();
+        optimizedSnoop();
         Dbprintf("Trigger kicked! Value: %d, Dumping Samples Hispeed now.", r);
     }
 
     //Resetting Frame mode (First set in fpgaloader.c)
     AT91C_BASE_SSC->SSC_RFMR = SSC_FRAME_MODE_BITS_IN_WORD(8) | AT91C_SSC_MSBF | SSC_FRAME_MODE_WORDS_PER_TRANSFER(0);
 
-    DbpString("HF Sniffing end");
+    DbpString("HF Snoop end");
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     LED_D_OFF();
 }
diff --git a/armsrc/hitag2.c b/armsrc/hitag2.c
index 57200c701..f328ccb0d 100644
--- a/armsrc/hitag2.c
+++ b/armsrc/hitag2.c
@@ -3,35 +3,46 @@
 // at your option, any later version. See the LICENSE.txt file for the text of
 // the license.
 //-----------------------------------------------------------------------------
-// Hitag2 emulation
+// Hitag2 emulation (preliminary test version)
 //
 // (c) 2009 Henryk Plötz <henryk@ploetzli.ch>
 //-----------------------------------------------------------------------------
 // Hitag2 complete rewrite of the code
 // - Fixed modulation/encoding issues
 // - Rewrote code for transponder emulation
-// - Added sniffing of transponder communication
+// - Added snooping of transponder communication
 // - Added reader functionality
 //
 // (c) 2012 Roel Verdult
 //-----------------------------------------------------------------------------
-// Piwi, 2019
-// Iceman, 2019
 
-#include "hitag2.h"
-#include "hitag2_crypto.h"
-#include "hitag.h"
 #include "proxmark3.h"
 #include "apps.h"
 #include "util.h"
+#include "hitag2.h"
 #include "string.h"
 #include "BigBuf.h"
 
+static bool bQuiet;
 static bool bCrypto;
 static bool bAuthenticating;
 static bool bPwd;
 static bool bSuccessful;
 
+struct hitag2_tag {
+    uint32_t uid;
+    enum {
+        TAG_STATE_RESET      = 0x01,       // Just powered up, awaiting GetSnr
+        TAG_STATE_ACTIVATING = 0x02,       // In activation phase (password mode), sent UID, awaiting reader password
+        TAG_STATE_ACTIVATED  = 0x03,       // Activation complete, awaiting read/write commands
+        TAG_STATE_WRITING    = 0x04,       // In write command, awaiting sector contents to be written
+    } state;
+    unsigned int active_sector;
+    uint8_t crypto_active;
+    uint64_t cs;
+    uint8_t sectors[12][4];
+};
+
 static struct hitag2_tag tag = {
     .state = TAG_STATE_RESET,
     .sectors = {                         // Password mode:               | Crypto mode:
@@ -70,6 +81,87 @@ static uint8_t key[8];
 static uint8_t writedata[4];
 static uint64_t cipher_state;
 
+/* Following is a modified version of cryptolib.com/ciphers/hitag2/ */
+// Software optimized 48-bit Philips/NXP Mifare Hitag2 PCF7936/46/47/52 stream cipher algorithm by I.C. Wiener 2006-2007.
+// For educational purposes only.
+// No warranties or guarantees of any kind.
+// This code is released into the public domain by its author.
+
+// Basic macros:
+
+#define u8              uint8_t
+#define u32             uint32_t
+#define u64             uint64_t
+#define rev8(x)         ((((x)>>7)&1)+((((x)>>6)&1)<<1)+((((x)>>5)&1)<<2)+((((x)>>4)&1)<<3)+((((x)>>3)&1)<<4)+((((x)>>2)&1)<<5)+((((x)>>1)&1)<<6)+(((x)&1)<<7))
+#define rev16(x)        (rev8 (x)+(rev8 (x>> 8)<< 8))
+#define rev32(x)        (rev16(x)+(rev16(x>>16)<<16))
+#define rev64(x)        (rev32(x)+(rev32(x>>32)<<32))
+#define bit(x,n)        (((x)>>(n))&1)
+#define bit32(x,n)      ((((x)[(n)>>5])>>((n)))&1)
+#define inv32(x,i,n)    ((x)[(i)>>5]^=((u32)(n))<<((i)&31))
+#define rotl64(x, n)    ((((u64)(x))<<((n)&63))+(((u64)(x))>>((0-(n))&63)))
+
+// Single bit Hitag2 functions:
+#define i4(x,a,b,c,d)    ((u32)((((x)>>(a))&1)+(((x)>>(b))&1)*2+(((x)>>(c))&1)*4+(((x)>>(d))&1)*8))
+
+static const u32 ht2_f4a = 0x2C79;     // 0010 1100 0111 1001
+static const u32 ht2_f4b = 0x6671;     // 0110 0110 0111 0001
+static const u32 ht2_f5c = 0x7907287B; // 0111 1001 0000 0111 0010 1000 0111 1011
+
+static u32 _f20(const u64 x) {
+    u32 i5;
+
+    i5 = ((ht2_f4a >> i4(x, 1, 2, 4, 5)) & 1) * 1
+         + ((ht2_f4b >> i4(x, 7, 11, 13, 14)) & 1) * 2
+         + ((ht2_f4b >> i4(x, 16, 20, 22, 25)) & 1) * 4
+         + ((ht2_f4b >> i4(x, 27, 28, 30, 32)) & 1) * 8
+         + ((ht2_f4a >> i4(x, 33, 42, 43, 45)) & 1) * 16;
+
+    return (ht2_f5c >> i5) & 1;
+}
+
+static u64 _hitag2_init(const u64 key, const u32 serial, const u32 IV) {
+    u32 i;
+    u64 x = ((key & 0xFFFF) << 32) + serial;
+
+    for (i = 0; i < 32; i++) {
+        x >>= 1;
+        x += (u64)(_f20(x) ^ (((IV >> i) ^ (key >> (i + 16))) & 1)) << 47;
+    }
+    return x;
+}
+
+static u64 _hitag2_round(u64 *state) {
+    u64 x = *state;
+
+    x = (x >>  1) +
+        ((((x >>  0) ^ (x >>  2) ^ (x >>  3) ^ (x >>  6)
+           ^ (x >>  7) ^ (x >>  8) ^ (x >> 16) ^ (x >> 22)
+           ^ (x >> 23) ^ (x >> 26) ^ (x >> 30) ^ (x >> 41)
+           ^ (x >> 42) ^ (x >> 43) ^ (x >> 46) ^ (x >> 47)) & 1) << 47);
+
+    *state = x;
+    return _f20(x);
+}
+
+// "MIKRON"             =  O  N  M  I  K  R
+// Key                  = 4F 4E 4D 49 4B 52             - Secret 48-bit key
+// Serial               = 49 43 57 69                   - Serial number of the tag, transmitted in clear
+// Random               = 65 6E 45 72                   - Random IV, transmitted in clear
+//~28~DC~80~31  = D7 23 7F CE                   - Authenticator value = inverted first 4 bytes of the keystream
+
+// The code below must print out "D7 23 7F CE 8C D0 37 A9 57 49 C1 E6 48 00 8A B6".
+// The inverse of the first 4 bytes is sent to the tag to authenticate.
+// The rest is encrypted by XORing it with the subsequent keystream.
+
+static u32 _hitag2_byte(u64 *x) {
+    u32 i, c;
+    for (i = 0, c = 0; i < 8; i++) {
+        c += (u32) _hitag2_round(x) << (i ^ 7);
+    }
+    return c;
+}
+
 static int hitag2_reset(void) {
     tag.state = TAG_STATE_RESET;
     tag.crypto_active = 0;
@@ -81,13 +173,48 @@ static int hitag2_init(void) {
     return 0;
 }
 
+static void hitag2_cipher_reset(struct hitag2_tag *tag, const uint8_t *iv) {
+    uint64_t key = ((uint64_t)tag->sectors[2][2]) |
+                   ((uint64_t)tag->sectors[2][3] << 8) |
+                   ((uint64_t)tag->sectors[1][0] << 16) |
+                   ((uint64_t)tag->sectors[1][1] << 24) |
+                   ((uint64_t)tag->sectors[1][2] << 32) |
+                   ((uint64_t)tag->sectors[1][3] << 40);
+    uint32_t uid = ((uint32_t)tag->sectors[0][0]) |
+                   ((uint32_t)tag->sectors[0][1] << 8) |
+                   ((uint32_t)tag->sectors[0][2] << 16) |
+                   ((uint32_t)tag->sectors[0][3] << 24);
+    uint32_t iv_ = (((uint32_t)(iv[0]))) |
+                   (((uint32_t)(iv[1])) << 8) |
+                   (((uint32_t)(iv[2])) << 16) |
+                   (((uint32_t)(iv[3])) << 24);
+    tag->cs = _hitag2_init(rev64(key), rev32(uid), rev32(iv_));
+}
+
+static int hitag2_cipher_authenticate(uint64_t *cs, const uint8_t *authenticator_is) {
+    uint8_t authenticator_should[4];
+    authenticator_should[0] = ~_hitag2_byte(cs);
+    authenticator_should[1] = ~_hitag2_byte(cs);
+    authenticator_should[2] = ~_hitag2_byte(cs);
+    authenticator_should[3] = ~_hitag2_byte(cs);
+    return (memcmp(authenticator_should, authenticator_is, 4) == 0);
+}
+
+static int hitag2_cipher_transcrypt(uint64_t *cs, uint8_t *data, unsigned int bytes, unsigned int bits) {
+    int i;
+    for (i = 0; i < bytes; i++) data[i] ^= _hitag2_byte(cs);
+    for (i = 0; i < bits; i++) data[bytes] ^= _hitag2_round(cs) << (7 - i);
+    return 0;
+}
+
 // Sam7s has several timers, we will use the source TIMER_CLOCK1 (aka AT91C_TC_CLKS_TIMER_DIV1_CLOCK)
 // TIMER_CLOCK1 = MCK/2, MCK is running at 48 MHz, Timer is running at 48/2 = 24 MHz
 // Hitag units (T0) have duration of 8 microseconds (us), which is 1/125000 per second (carrier)
 // T0 = TIMER_CLOCK1 / 125000 = 192
-#ifndef T0
 #define T0               192
-#endif
+
+#define SHORT_COIL()     LOW(GPIO_SSC_DOUT)
+#define OPEN_COIL()      HIGH(GPIO_SSC_DOUT)
 
 #define HITAG_FRAME_LEN  20
 #define HITAG_T_STOP     36 /* T_EOF should be > 36 */
@@ -114,6 +241,7 @@ static int hitag2_init(void) {
 #define HITAG_T_TAG_CAPTURE_THREE_HALF  41
 #define HITAG_T_TAG_CAPTURE_FOUR_HALF   57
 
+
 static void hitag_send_bit(int bit) {
     LED_A_ON();
     // Reset clock for the next bit
@@ -151,6 +279,7 @@ static void hitag_send_frame(const uint8_t *frame, size_t frame_len) {
     LOW(GPIO_SSC_DOUT);
 }
 
+
 static void hitag2_handle_reader_command(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t *txlen) {
     uint8_t rx_air[HITAG_FRAME_LEN];
 
@@ -269,8 +398,8 @@ static void hitag2_handle_reader_command(uint8_t *rx, const size_t rxlen, uint8_
         break;
     }
 
-// LogTrace(rx, nbytes(rxlen), 0, 0, NULL, false);
-// LogTrace(tx, nbytes(txlen), 0, 0, NULL, true);
+// LogTraceHitag(rx,rxlen,0,0,false);
+// LogTraceHitag(tx,*txlen,0,0,true);
 
     if (tag.crypto_active) {
         hitag2_cipher_transcrypt(&(tag.cs), tx, *txlen / 8, *txlen % 8);
@@ -290,6 +419,7 @@ static void hitag_reader_send_bit(int bit) {
 
     // Wait for 4-10 times the carrier period
     while (AT91C_BASE_TC0->TC_CV < T0 * 6);
+    // SpinDelayUs(8*8);
 
     // Disable modulation, just activates the field again
     LOW(GPIO_SSC_DOUT);
@@ -305,6 +435,7 @@ static void hitag_reader_send_bit(int bit) {
     LED_A_OFF();
 }
 
+
 static void hitag_reader_send_frame(const uint8_t *frame, size_t frame_len) {
     // Send the content of the frame
     for (size_t i = 0; i < frame_len; i++) {
@@ -474,8 +605,8 @@ static bool hitag2_crypto(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t *
                 if (!bCrypto) {
                     uint64_t ui64key = key[0] | ((uint64_t)key[1]) << 8 | ((uint64_t)key[2]) << 16 | ((uint64_t)key[3]) << 24 | ((uint64_t)key[4]) << 32 | ((uint64_t)key[5]) << 40;
                     uint32_t ui32uid = rx[0] | ((uint32_t)rx[1]) << 8 | ((uint32_t)rx[2]) << 16 | ((uint32_t)rx[3]) << 24;
-                    Dbprintf("hitag2_crypto: key=0x%x%x uid=0x%x", (uint32_t)((REV64(ui64key)) >> 32), (uint32_t)((REV64(ui64key)) & 0xffffffff), REV32(ui32uid));
-                    cipher_state = _hitag2_init(REV64(ui64key), REV32(ui32uid), 0);
+                    Dbprintf("hitag2_crypto: key=0x%x%x uid=0x%x", (uint32_t)((rev64(ui64key)) >> 32), (uint32_t)((rev64(ui64key)) & 0xffffffff), rev32(ui32uid));
+                    cipher_state = _hitag2_init(rev64(ui64key), rev32(ui32uid), 0);
                     memset(tx, 0x00, 4);
                     memset(tx + 4, 0xff, 4);
                     hitag2_cipher_transcrypt(&cipher_state, tx + 4, 4, 0);
@@ -670,10 +801,7 @@ static bool hitag2_read_uid(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t
     return true;
 }
 
-void SniffHitag(uint32_t type) {
-
-    StopTicks();
-
+void SnoopHitag(uint32_t type) {
     int frame_count;
     int response;
     int overflow;
@@ -686,8 +814,12 @@ void SniffHitag(uint32_t type) {
     size_t rxlen = 0;
 
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
+
+    // free eventually allocated BigBuf memory
     BigBuf_free();
     BigBuf_Clear_ext(false);
+
+    // Clean up trace and prepare it for storing frames
     clear_trace();
     set_tracing(true);
 
@@ -697,18 +829,19 @@ void SniffHitag(uint32_t type) {
     auth_table = (uint8_t *)BigBuf_malloc(AUTH_TABLE_LENGTH);
     memset(auth_table, 0x00, AUTH_TABLE_LENGTH);
 
-    DbpString("Starting Hitag2 sniffing");
+    DbpString("Starting Hitag2 snoop");
     LED_D_ON();
 
     // Set up eavesdropping mode, frequency divisor which will drive the FPGA
     // and analog mux selection.
     FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT  | FPGA_LF_EDGE_DETECT_TOGGLE_MODE);
-    FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95);
+    FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
     SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
+    RELAY_OFF();
 
     // Configure output pin that is connected to the FPGA (for modulating)
-    AT91C_BASE_PIOA->PIO_OER |= GPIO_SSC_DOUT;
-    AT91C_BASE_PIOA->PIO_PER |= GPIO_SSC_DOUT;
+    AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
+    AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
 
     // Disable modulation, we are going to eavesdrop, not modulate ;)
     LOW(GPIO_SSC_DOUT);
@@ -720,16 +853,14 @@ void SniffHitag(uint32_t type) {
     // Disable timer during configuration
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 
-    // TC1: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
+    // Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
     // external trigger rising edge, load RA on rising edge of TIOA.
-    AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK | AT91C_TC_ETRGEDG_BOTH | AT91C_TC_ABETRG | AT91C_TC_LDRA_BOTH;
+    uint32_t t1_channel_mode = AT91C_TC_CLKS_TIMER_DIV1_CLOCK | AT91C_TC_ETRGEDG_BOTH | AT91C_TC_ABETRG | AT91C_TC_LDRA_BOTH;
+    AT91C_BASE_TC1->TC_CMR = t1_channel_mode;
 
     // Enable and reset counter
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
-    // synchronized startup procedure
-    while (AT91C_BASE_TC1->TC_CV > 0) {}; // wait until TC0 returned to zero
-
     // Reset the received frame, frame count and timing info
     memset(rx, 0x00, sizeof(rx));
     frame_count = 0;
@@ -840,7 +971,10 @@ void SniffHitag(uint32_t type) {
         // Check if frame was captured
         if (rxlen > 0) {
             frame_count++;
-            LogTrace(rx, nbytes(rxlen), response, 0, NULL, reader_frame);
+            if (!LogTraceHitag(rx, rxlen, response, 0, reader_frame)) {
+                DbpString("Trace full");
+                break;
+            }
 
             // Check if we recognize a valid authentication attempt
             if (nbytes(rxlen) == 8) {
@@ -871,46 +1005,49 @@ void SniffHitag(uint32_t type) {
         // Reset the timer to restart while-loop that receives frames
         AT91C_BASE_TC1->TC_CCR = AT91C_TC_SWTRG;
     }
-    LEDsoff();
-    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-    set_tracing(false);
-
+    LED_A_ON();
+    LED_B_OFF();
+    LED_C_OFF();
+    LED_D_OFF();
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
-
-    // release allocated memory from BigBuff.
-    BigBuf_free();
-    StartTicks();
-
-    DbpString("Hitag2 sniffing end,  use `lf hitag list` for annotations");
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    LED_A_OFF();
+    set_tracing(false);
+// Dbprintf("frame received: %d",frame_count);
+// Dbprintf("Authentication Attempts: %d",(auth_table_len/8));
+// DbpString("All done");
 }
 
 void SimulateHitagTag(bool tag_mem_supplied, uint8_t *data) {
-
-    StopTicks();
-
-    int frame_count = 0, response = 0, overflow = 0;
+    int frame_count;
+    int response;
+    int overflow;
     uint8_t rx[HITAG_FRAME_LEN];
     size_t rxlen = 0;
     uint8_t tx[HITAG_FRAME_LEN];
     size_t txlen = 0;
+    bool bQuitTraceFull = false;
+    bQuiet = false;
 
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
+
+    // free eventually allocated BigBuf memory
     BigBuf_free();
     BigBuf_Clear_ext(false);
+
+    // Clean up trace and prepare it for storing frames
     clear_trace();
     set_tracing(true);
 
     auth_table_len = 0;
     auth_table_pos = 0;
-    uint8_t *auth_table = BigBuf_malloc(AUTH_TABLE_LENGTH);
+    uint8_t *auth_table;
+
+    auth_table = (uint8_t *)BigBuf_malloc(AUTH_TABLE_LENGTH);
     memset(auth_table, 0x00, AUTH_TABLE_LENGTH);
 
-    // Reset the received frame, frame count and timing info
-    memset(rx, 0x00, sizeof(rx));
-
     DbpString("Starting Hitag2 simulation");
-
     LED_D_ON();
     hitag2_init();
 
@@ -931,40 +1068,40 @@ void SimulateHitagTag(bool tag_mem_supplied, uint8_t *data) {
     // Set up simulator mode, frequency divisor which will drive the FPGA
     // and analog mux selection.
     FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT);
+    SpinDelay(50);
     FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
     SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
+    RELAY_OFF();
 
     // Configure output pin that is connected to the FPGA (for modulating)
-    AT91C_BASE_PIOA->PIO_OER |= GPIO_SSC_DOUT;
-    AT91C_BASE_PIOA->PIO_PER |= GPIO_SSC_DOUT;
+    AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
+    AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
 
     // Disable modulation at default, which means release resistance
     LOW(GPIO_SSC_DOUT);
 
-    // Enable Peripheral Clock for
-    //   TIMER_CLOCK0, used to measure exact timing before answering
-    //   TIMER_CLOCK1, used to capture edges of the tag frames
-    AT91C_BASE_PMC->PMC_PCER |= (1 << AT91C_ID_TC0) | (1 << AT91C_ID_TC1);
+    // Enable Peripheral Clock for TIMER_CLOCK0, used to measure exact timing before answering
+    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC0);
 
+    // Enable Peripheral Clock for TIMER_CLOCK1, used to capture edges of the reader frames
+    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC1);
     AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
 
     // Disable timer during configuration
-    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 
-    // TC0: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), no triggers
-    AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK;
-
-    // TC1: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
+    // Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
     // external trigger rising edge, load RA on rising edge of TIOA.
     AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK | AT91C_TC_ETRGEDG_RISING | AT91C_TC_ABETRG | AT91C_TC_LDRA_RISING;
 
-    // Enable and reset counter
-    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
-    AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
+    // Reset the received frame, frame count and timing info
+    memset(rx, 0x00, sizeof(rx));
+    frame_count = 0;
+    response = 0;
+    overflow = 0;
 
-    // synchronized startup procedure
-    while (AT91C_BASE_TC1->TC_CV > 0); // wait until TC0 returned to zero
+    // Enable and reset counter
+    AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
     while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
         // Watchdog hit
@@ -1007,7 +1144,16 @@ void SimulateHitagTag(bool tag_mem_supplied, uint8_t *data) {
         // Check if frame was captured
         if (rxlen > 4) {
             frame_count++;
-            LogTrace(rx, nbytes(rxlen), response, response, NULL, true);
+            if (!bQuiet) {
+                if (!LogTraceHitag(rx, rxlen, response, 0, true)) {
+                    DbpString("Trace full");
+                    if (bQuitTraceFull) {
+                        break;
+                    } else {
+                        bQuiet = true;
+                    }
+                }
+            }
 
             // Disable timer 1 with external trigger to avoid triggers during our own modulation
             AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
@@ -1024,8 +1170,19 @@ void SimulateHitagTag(bool tag_mem_supplied, uint8_t *data) {
 
             // Send and store the tag answer (if there is any)
             if (txlen) {
+                // Transmit the tag frame
                 hitag_send_frame(tx, txlen);
-                LogTrace(tx, nbytes(txlen), 0, 0, NULL, false);
+                // Store the frame in the trace
+                if (!bQuiet) {
+                    if (!LogTraceHitag(tx, txlen, 0, 0, false)) {
+                        DbpString("Trace full");
+                        if (bQuitTraceFull) {
+                            break;
+                        } else {
+                            bQuiet = true;
+                        }
+                    }
+                }
             }
 
             // Reset the received frame and response timing info
@@ -1043,25 +1200,17 @@ void SimulateHitagTag(bool tag_mem_supplied, uint8_t *data) {
         // Reset the timer to restart while-loop that receives frames
         AT91C_BASE_TC1->TC_CCR = AT91C_TC_SWTRG;
     }
-
-    LEDsoff();
-    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-    set_tracing(false);
+    LED_B_OFF();
+    LED_D_OFF();
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
-
-    // release allocated memory from BigBuff.
-    BigBuf_free();
-
-    StartTicks();
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 
     DbpString("Sim Stopped");
+    set_tracing(false);
 }
 
 void ReaderHitag(hitag_function htf, hitag_data *htd) {
-
-    StopTicks();
-
     int frame_count = 0;
     int response = 0;
     uint8_t rx[HITAG_FRAME_LEN];
@@ -1084,6 +1233,7 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
             Dbprintf("List identifier in password mode");
             memcpy(password, htd->pwd.password, 4);
             blocknr = 0;
+            bQuiet = false;
             bPwd = false;
             break;
         }
@@ -1091,6 +1241,7 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
             DbpString("Authenticating using nr,ar pair:");
             memcpy(NrAr, htd->auth.NrAr, 8);
             Dbhexdump(8, NrAr, false);
+            bQuiet = false;
             bCrypto = false;
             bAuthenticating = false;
             break;
@@ -1100,6 +1251,7 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
             memcpy(key, htd->crypto.key, 6);  //HACK; 4 or 6??  I read both in the code.
             Dbhexdump(6, key, false);
             blocknr = 0;
+            bQuiet = false;
             bCrypto = false;
             bAuthenticating = false;
             break;
@@ -1108,11 +1260,13 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
             Dbprintf("Testing %d authentication attempts", (auth_table_len / 8));
             auth_table_pos = 0;
             memcpy(NrAr, auth_table, 8);
+            bQuiet = false;
             bCrypto = false;
             break;
         }
         case RHT2F_UID_ONLY: {
             blocknr = 0;
+            bQuiet = false;
             bCrypto = false;
             bAuthenticating = false;
             break;
@@ -1120,48 +1274,45 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
         default: {
             Dbprintf("Error, unknown function: %d", htf);
             set_tracing(false);
-            StartTicks();
             return;
         }
     }
 
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-    BigBuf_free();
+    BigBuf_free();    
     clear_trace();
     set_tracing(true);
 
     LED_D_ON();
     hitag2_init();
 
+    // Configure output and enable pin that is connected to the FPGA (for modulating)
+    AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
+    AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
 
     // Set fpga in edge detect with reader field, we can modulate as reader now
     FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_READER_FIELD);
     FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
     SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
-
-    // Configure output and enable pin that is connected to the FPGA (for modulating)
-    AT91C_BASE_PIOA->PIO_OER |= GPIO_SSC_DOUT;
-    AT91C_BASE_PIOA->PIO_PER |= GPIO_SSC_DOUT;
+//    RELAY_OFF();
 
     // Disable modulation at default, which means enable the field
     LOW(GPIO_SSC_DOUT);
 
-    // Enable Peripheral Clock for
-    //   TIMER_CLOCK0, used to measure exact timing before answering
-    //   TIMER_CLOCK1, used to capture edges of the tag frames
-    AT91C_BASE_PMC->PMC_PCER |= (1 << AT91C_ID_TC0) | (1 << AT91C_ID_TC1);
+    // Give it a bit of time for the resonant antenna to settle.
+    SpinDelay(30);
 
-    // PIO_A - BSR
+    // Enable Peripheral Clock for TIMER_CLOCK0, used to measure exact timing before answering
+    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC0);
+
+    // Enable Peripheral Clock for TIMER_CLOCK1, used to capture edges of the tag frames
+    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC1);
     AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
 
     // Disable timer during configuration
-    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 
-    // TC0: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), no triggers
-    AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK;
-
-    // TC1: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
+    // Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
     // external trigger rising edge, load RA on falling edge of TIOA.
     AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK | AT91C_TC_ETRGEDG_FALLING | AT91C_TC_ABETRG | AT91C_TC_LDRA_FALLING;
 
@@ -1169,36 +1320,36 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
-    // synchronized startup procedure
-    while (AT91C_BASE_TC0->TC_CV > 0) {}; // wait until TC0 returned to zero
-
     // Tag specific configuration settings (sof, timings, etc.)
     if (htf < 10) {
         // hitagS settings
         reset_sof = 1;
         t_wait = 200;
+        // DbpString("Configured for hitagS reader");
     } else if (htf < 20) {
         // hitag1 settings
         reset_sof = 1;
         t_wait = 200;
+        // DbpString("Configured for hitag1 reader");
     } else if (htf < 30) {
         // hitag2 settings
         reset_sof = 4;
         t_wait = HITAG_T_WAIT_2;
+        // DbpString("Configured for hitag2 reader");
     } else {
         Dbprintf("Error, unknown hitag reader type: %d", htf);
-        goto out;
+                goto out;
     }
     uint8_t attempt_count = 0;
-
-    while (!bStop && !BUTTON_PRESS() && !usb_poll_validate_length()) {
+    
+    while (!bStop && !BUTTON_PRESS() && !usb_poll_validate_length() ) {
 
         WDT_HIT();
 
         // Check if frame was captured and store it
         if (rxlen > 0) {
             frame_count++;
-            LogTrace(rx, nbytes(rxlen), response, response, NULL, false);
+            LogTraceHitag(rx, rxlen, response, 0, false);
         }
 
         // By default reset the transmission buffer
@@ -1225,7 +1376,7 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
                 attempt_count++; //attempt 3 times to get uid then quit
                 if (!bStop && attempt_count == 3)
                     bStop = true;
-
+                
                 break;
             }
             default: {
@@ -1254,7 +1405,7 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
         // Add transmitted frame to total count
         if (txlen > 0) {
             frame_count++;
-            LogTrace(tx, nbytes(txlen), HITAG_T_WAIT_2, HITAG_T_WAIT_2, NULL, true);
+            LogTraceHitag(tx, txlen, HITAG_T_WAIT_2, 0, true);
         }
 
         // Reset values for receiving frames
@@ -1323,18 +1474,13 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
             }
         }
     }
-
-out:
+    
+out:    
     LEDsoff();
-    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-    set_tracing(false);
-
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
-
-    // release allocated memory from BigBuff.
-    BigBuf_free();
-    StartTicks();
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    set_tracing(false);
 
     if (bSuccessful)
         cmd_send(CMD_ACK, bSuccessful, 0, 0, (uint8_t *)tag.sectors, 48);
@@ -1343,10 +1489,8 @@ out:
 }
 
 void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
-
-    StopTicks();
-
-    int frame_count = 0, response = 0;
+    int frame_count;
+    int response;
     uint8_t rx[HITAG_FRAME_LEN];
     size_t rxlen = 0;
     uint8_t txbuf[HITAG_FRAME_LEN];
@@ -1358,13 +1502,17 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
     int tag_sof;
     int t_wait = HITAG_T_WAIT_MAX;
     bool bStop;
+    bool bQuitTraceFull = false;
 
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
+    // Reset the return status
+    bSuccessful = false;
+
+    // Clean up trace and prepare it for storing frames
     set_tracing(true);
     clear_trace();
 
-    // Reset the return status
-    bSuccessful = false;
+    // DbpString("Starting Hitag reader family");
 
     // Check configuration
     switch (htf) {
@@ -1374,14 +1522,15 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
             memcpy(writedata, htd->crypto.data, 4);
             Dbhexdump(6, key, false);
             blocknr = page;
+            bQuiet = false;
             bCrypto = false;
             bAuthenticating = false;
+            bQuitTraceFull = true;
             writestate = WRITE_STATE_START;
         }
         break;
         default: {
             Dbprintf("Error, unknown function: %d", htf);
-            StartTicks();
             return;
         }
         break;
@@ -1391,45 +1540,44 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
     hitag2_init();
 
     // Configure output and enable pin that is connected to the FPGA (for modulating)
-    AT91C_BASE_PIOA->PIO_OER |= GPIO_SSC_DOUT;
-    AT91C_BASE_PIOA->PIO_PER |= GPIO_SSC_DOUT;
+    AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
+    AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
 
     // Set fpga in edge detect with reader field, we can modulate as reader now
     FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_READER_FIELD);
+
+    // Set Frequency divisor which will drive the FPGA and analog mux selection
     FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
     SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
+    RELAY_OFF();
 
     // Disable modulation at default, which means enable the field
     LOW(GPIO_SSC_DOUT);
 
-    // Enable Peripheral Clock for
-    //   TIMER_CLOCK0, used to measure exact timing before answering
-    //   TIMER_CLOCK1, used to capture edges of the tag frames
-    AT91C_BASE_PMC->PMC_PCER |= (1 << AT91C_ID_TC0) | (1 << AT91C_ID_TC1);
+    // Give it a bit of time for the resonant antenna to settle.
+    SpinDelay(30);
 
+    // Enable Peripheral Clock for TIMER_CLOCK0, used to measure exact timing before answering
+    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC0);
+
+    // Enable Peripheral Clock for TIMER_CLOCK1, used to capture edges of the tag frames
+    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC1);
     AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
 
     // Disable timer during configuration
-    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 
-    // TC0: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), no triggers
-    AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK;
-
-    // TC1: Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
+    // Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
     // external trigger rising edge, load RA on falling edge of TIOA.
-    AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK
-                             | AT91C_TC_ETRGEDG_FALLING
-                             | AT91C_TC_ABETRG
-                             | AT91C_TC_LDRA_FALLING;
+    AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK | AT91C_TC_ETRGEDG_FALLING | AT91C_TC_ABETRG | AT91C_TC_LDRA_FALLING;
 
     // Enable and reset counters
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
-    while (AT91C_BASE_TC0->TC_CV > 0) {};
-
     // Reset the received frame, frame count and timing info
+    frame_count = 0;
+    response = 0;
     lastbit = 1;
     bStop = false;
 
@@ -1438,27 +1586,38 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
         // hitagS settings
         reset_sof = 1;
         t_wait = 200;
+        // DbpString("Configured for hitagS reader");
     } else if (htf < 20) {
         // hitag1 settings
         reset_sof = 1;
         t_wait = 200;
+        // DbpString("Configured for hitag1 reader");
     } else if (htf < 30) {
         // hitag2 settings
         reset_sof = 4;
         t_wait = HITAG_T_WAIT_2;
+        // DbpString("Configured for hitag2 reader");
     } else {
         Dbprintf("Error, unknown hitag reader type: %d", htf);
         return;
     }
-
-    while (!bStop && !BUTTON_PRESS() && !usb_poll_validate_length()) {
-
+    while (!bStop && !BUTTON_PRESS()) {
+        // Watchdog hit
         WDT_HIT();
 
         // Check if frame was captured and store it
         if (rxlen > 0) {
             frame_count++;
-            LogTrace(rx, nbytes(rxlen), response, response, NULL, false);
+            if (!bQuiet) {
+                if (!LogTraceHitag(rx, rxlen, response, 0, false)) {
+                    DbpString("Trace full");
+                    if (bQuitTraceFull) {
+                        break;
+                    } else {
+                        bQuiet = true;
+                    }
+                }
+            }
         }
 
         // By default reset the transmission buffer
@@ -1484,7 +1643,9 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
         // falling edge occured halfway the period. with respect to this falling edge,
         // we need to wait (T_Wait2 + half_tag_period) when the last was a 'one'.
         // All timer values are in terms of T0 units
-        while (AT91C_BASE_TC0->TC_CV < T0 * (t_wait + (HITAG_T_TAG_HALF_PERIOD * lastbit))) {};
+        while (AT91C_BASE_TC0->TC_CV < T0 * (t_wait + (HITAG_T_TAG_HALF_PERIOD * lastbit)));
+
+        // Dbprintf("DEBUG: Sending reader frame");
 
         // Transmit the reader frame
         hitag_reader_send_frame(tx, txlen);
@@ -1495,7 +1656,16 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
         // Add transmitted frame to total count
         if (txlen > 0) {
             frame_count++;
-            LogTrace(tx, nbytes(txlen), HITAG_T_WAIT_2, HITAG_T_WAIT_2, NULL, true);
+            if (!bQuiet) {
+                // Store the frame in the trace
+                if (!LogTraceHitag(tx, txlen, HITAG_T_WAIT_2, 0, true)) {
+                    if (bQuitTraceFull) {
+                        break;
+                    } else {
+                        bQuiet = true;
+                    }
+                }
+            }
         }
 
         // Reset values for receiving frames
@@ -1505,6 +1675,7 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
         bSkip = true;
         tag_sof = reset_sof;
         response = 0;
+        // Dbprintf("DEBUG: Waiting to receive frame");
         uint32_t errorCount = 0;
 
         // Receive frame, watch for at most T0*EOF periods
@@ -1577,7 +1748,6 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
             }
             // if we saw over 100 wierd values break it probably isn't hitag...
             if (errorCount > 100) break;
-
             // We can break this loop if we received the last bit from a frame
             if (AT91C_BASE_TC1->TC_CV > T0 * HITAG_T_EOF) {
                 if (rxlen > 0) break;
@@ -1590,15 +1760,14 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
             while (AT91C_BASE_TC0->TC_CV < T0 * (HITAG_T_PROG - HITAG_T_WAIT_MAX));
         }
     }
+    // Dbprintf("DEBUG: Done waiting for frame");
 
-    LEDsoff();
-    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-    set_tracing(false);
-
+    LED_B_OFF();
+    LED_D_OFF();
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
-
-    StartTicks();
-
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    // Dbprintf("frame received: %d",frame_count);
+    // DbpString("All done");
     cmd_send(CMD_ACK, bSuccessful, 0, 0, (uint8_t *)tag.sectors, 48);
 }
diff --git a/armsrc/hitag2.h b/armsrc/hitag2.h
deleted file mode 100644
index 2260e5f8d..000000000
--- a/armsrc/hitag2.h
+++ /dev/null
@@ -1,23 +0,0 @@
-//-----------------------------------------------------------------------------
-// (c) 2012 Roel Verdult
-//
-// This code is licensed to you under the terms of the GNU GPL, version 2 or,
-// at your option, any later version. See the LICENSE.txt file for the text of
-// the license.
-//-----------------------------------------------------------------------------
-// Hitag2 type prototyping
-//-----------------------------------------------------------------------------
-
-#ifndef _HITAG2_H_
-#define _HITAG2_H_
-
-#include <stdint.h>
-#include <stdbool.h>
-#include "hitag.h"
-
-void SniffHitag(uint32_t type);
-void SimulateHitagTag(bool tag_mem_supplied, uint8_t *data);
-void ReaderHitag(hitag_function htf, hitag_data *htd);
-void WriterHitag(hitag_function htf, hitag_data *htd, int page);
-
-#endif
diff --git a/armsrc/hitag2_crypto.c b/armsrc/hitag2_crypto.c
deleted file mode 100644
index 7d1e10d87..000000000
--- a/armsrc/hitag2_crypto.c
+++ /dev/null
@@ -1,116 +0,0 @@
-//-----------------------------------------------------------------------------
-// This code is licensed to you under the terms of the GNU GPL, version 2 or,
-// at your option, any later version. See the LICENSE.txt file for the text of
-// the license.
-//-----------------------------------------------------------------------------
-// Hitag2 Crypto
-//
-// (c) 2009 Henryk Plötz <henryk@ploetzli.ch>
-// (c) 2012 Roel Verdult
-// (c) 2019 Iceman
-//-----------------------------------------------------------------------------
-#include "hitag2_crypto.h"
-
-/* Following is a modified version of cryptolib.com/ciphers/hitag2/ */
-// Software optimized 48-bit Philips/NXP Mifare Hitag2 PCF7936/46/47/52 stream cipher algorithm by I.C. Wiener 2006-2007.
-// For educational purposes only.
-// No warranties or guarantees of any kind.
-// This code is released into the public domain by its author.
-
-// Single bit Hitag2 functions:
-#ifndef i4
-#define i4(x,a,b,c,d)    ((uint32_t)((((x)>>(a))&1)+(((x)>>(b))&1)*2+(((x)>>(c))&1)*4+(((x)>>(d))&1)*8))
-#endif
-
-static const uint32_t ht2_f4a = 0x2C79;     // 0010 1100 0111 1001
-static const uint32_t ht2_f4b = 0x6671;     // 0110 0110 0111 0001
-static const uint32_t ht2_f5c = 0x7907287B; // 0111 1001 0000 0111 0010 1000 0111 1011
-
-uint32_t _f20(const uint64_t x) {
-    uint32_t i5;
-
-    i5 = ((ht2_f4a >> i4(x, 1, 2, 4, 5)) & 1) * 1
-         + ((ht2_f4b >> i4(x, 7, 11, 13, 14)) & 1) * 2
-         + ((ht2_f4b >> i4(x, 16, 20, 22, 25)) & 1) * 4
-         + ((ht2_f4b >> i4(x, 27, 28, 30, 32)) & 1) * 8
-         + ((ht2_f4a >> i4(x, 33, 42, 43, 45)) & 1) * 16;
-
-    return (ht2_f5c >> i5) & 1;
-}
-
-uint64_t _hitag2_init(const uint64_t key, const uint32_t serial, const uint32_t IV) {
-    uint32_t i;
-    uint64_t x = ((key & 0xFFFF) << 32) + serial;
-
-    for (i = 0; i < 32; i++) {
-        x >>= 1;
-        x += (uint64_t)(_f20(x) ^ (((IV >> i) ^ (key >> (i + 16))) & 1)) << 47;
-    }
-    return x;
-}
-
-uint64_t _hitag2_round(uint64_t *state) {
-    uint64_t x = *state;
-
-    x = (x >>  1) +
-        ((((x >>  0) ^ (x >>  2) ^ (x >>  3) ^ (x >>  6)
-           ^ (x >>  7) ^ (x >>  8) ^ (x >> 16) ^ (x >> 22)
-           ^ (x >> 23) ^ (x >> 26) ^ (x >> 30) ^ (x >> 41)
-           ^ (x >> 42) ^ (x >> 43) ^ (x >> 46) ^ (x >> 47)) & 1) << 47);
-
-    *state = x;
-    return _f20(x);
-}
-
-// "MIKRON"             =  O  N  M  I  K  R
-// Key                  = 4F 4E 4D 49 4B 52             - Secret 48-bit key
-// Serial               = 49 43 57 69                   - Serial number of the tag, transmitted in clear
-// Random               = 65 6E 45 72                   - Random IV, transmitted in clear
-//~28~DC~80~31  = D7 23 7F CE                   - Authenticator value = inverted first 4 bytes of the keystream
-
-// The code below must print out "D7 23 7F CE 8C D0 37 A9 57 49 C1 E6 48 00 8A B6".
-// The inverse of the first 4 bytes is sent to the tag to authenticate.
-// The rest is encrypted by XORing it with the subsequent keystream.
-
-uint32_t _hitag2_byte(uint64_t *x) {
-    uint32_t i, c;
-    for (i = 0, c = 0; i < 8; i++) {
-        c += (uint32_t) _hitag2_round(x) << (i ^ 7);
-    }
-    return c;
-}
-
-void hitag2_cipher_reset(struct hitag2_tag *tag, const uint8_t *iv) {
-    uint64_t key = ((uint64_t)tag->sectors[2][2]) |
-                   ((uint64_t)tag->sectors[2][3] << 8) |
-                   ((uint64_t)tag->sectors[1][0] << 16) |
-                   ((uint64_t)tag->sectors[1][1] << 24) |
-                   ((uint64_t)tag->sectors[1][2] << 32) |
-                   ((uint64_t)tag->sectors[1][3] << 40);
-    uint32_t uid = ((uint32_t)tag->sectors[0][0]) |
-                   ((uint32_t)tag->sectors[0][1] << 8) |
-                   ((uint32_t)tag->sectors[0][2] << 16) |
-                   ((uint32_t)tag->sectors[0][3] << 24);
-    uint32_t iv_ = (((uint32_t)(iv[0]))) |
-                   (((uint32_t)(iv[1])) << 8) |
-                   (((uint32_t)(iv[2])) << 16) |
-                   (((uint32_t)(iv[3])) << 24);
-    tag->cs = _hitag2_init(REV64(key), REV32(uid), REV32(iv_));
-}
-
-int hitag2_cipher_authenticate(uint64_t *cs, const uint8_t *authenticator_is) {
-    uint8_t authenticator_should[4];
-    authenticator_should[0] = ~_hitag2_byte(cs);
-    authenticator_should[1] = ~_hitag2_byte(cs);
-    authenticator_should[2] = ~_hitag2_byte(cs);
-    authenticator_should[3] = ~_hitag2_byte(cs);
-    return (memcmp(authenticator_should, authenticator_is, 4) == 0);
-}
-
-int hitag2_cipher_transcrypt(uint64_t *cs, uint8_t *data, uint16_t bytes, uint16_t bits) {
-    int i;
-    for (i = 0; i < bytes; i++) data[i] ^= _hitag2_byte(cs);
-    for (i = 0; i < bits; i++) data[bytes] ^= _hitag2_round(cs) << (7 - i);
-    return 0;
-}
-
diff --git a/armsrc/hitag2_crypto.h b/armsrc/hitag2_crypto.h
deleted file mode 100644
index 8af1af412..000000000
--- a/armsrc/hitag2_crypto.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef __HITAG2_CRYPTO_H
-#define __HITAG2_CRYPTO_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "string.h"
-#include "util.h"
-
-struct hitag2_tag {
-    uint32_t uid;
-    enum {
-        TAG_STATE_RESET      = 0x01,       // Just powered up, awaiting GetSnr
-        TAG_STATE_ACTIVATING = 0x02,       // In activation phase (password mode), sent UID, awaiting reader password
-        TAG_STATE_ACTIVATED  = 0x03,       // Activation complete, awaiting read/write commands
-        TAG_STATE_WRITING    = 0x04,       // In write command, awaiting sector contents to be written
-    } state;
-    uint16_t active_sector;
-    uint8_t crypto_active;
-    uint64_t cs;
-    uint8_t sectors[12][4];
-};
-
-extern uint32_t _f20(const uint64_t x);
-extern uint64_t _hitag2_init(const uint64_t key, const uint32_t serial, const uint32_t IV);
-extern uint64_t _hitag2_round(uint64_t *state);
-extern uint32_t _hitag2_byte(uint64_t *x);
-extern void hitag2_cipher_reset(struct hitag2_tag *tag, const uint8_t *iv);
-extern int hitag2_cipher_authenticate(uint64_t *cs, const uint8_t *authenticator_is);
-extern int hitag2_cipher_transcrypt(uint64_t *cs, uint8_t *data, uint16_t bytes, uint16_t bits) ;
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/armsrc/hitagS.c b/armsrc/hitagS.c
index 5fece9d26..b53112081 100644
--- a/armsrc/hitagS.c
+++ b/armsrc/hitagS.c
@@ -10,46 +10,109 @@
 //-----------------------------------------------------------------------------
 // Some code was copied from Hitag2.c
 //-----------------------------------------------------------------------------
-
+#include <stdlib.h>
+#include "proxmark3.h"
+#include "apps.h"
+#include "util.h"
 #include "hitagS.h"
+#include "hitag2.h"
+#include "string.h"
+#include "BigBuf.h"
 
 #define CRC_PRESET 0xFF
 #define CRC_POLYNOM 0x1D
 
+#define u8              uint8_t
+#define u32             uint32_t
+#define u64             uint64_t
+#define rev8(x)         ((((x)>>7)&1)+((((x)>>6)&1)<<1)+((((x)>>5)&1)<<2)+((((x)>>4)&1)<<3)+((((x)>>3)&1)<<4)+((((x)>>2)&1)<<5)+((((x)>>1)&1)<<6)+(((x)&1)<<7))
+#define rev16(x)        (rev8 (x)+(rev8 (x>> 8)<< 8))
+#define rev32(x)        (rev16(x)+(rev16(x>>16)<<16))
+#define rev64(x)        (rev32(x)+(rev32(x>>32)<<32))
+#define bit(x,n)        (((x)>>(n))&1)
+#define bit32(x,n)      ((((x)[(n)>>5])>>((n)))&1)
+#define inv32(x,i,n)    ((x)[(i)>>5]^=((u32)(n))<<((i)&31))
+#define rotl64(x, n)    ((((u64)(x))<<((n)&63))+(((u64)(x))>>((0-(n))&63)))
+
 static bool bQuiet;
 static bool bSuccessful;
 static struct hitagS_tag tag;
 static byte_t page_to_be_written = 0;
 static int block_data_left = 0;
-
 typedef enum modulation {
     AC2K = 0,
     AC4K,
     MC4K,
     MC8K
 } MOD;
-
-static MOD m = AC2K;               // used modulation
+static MOD m = AC2K;               //used modulation
 static uint32_t temp_uid;
 static int temp2 = 0;
-static int sof_bits;               // number of start-of-frame bits
-static byte_t pwdh0, pwdl0, pwdl1; // password bytes
-static uint32_t rnd = 0x74124485;  // randomnumber
+static int sof_bits;               //number of start-of-frame bits
+static byte_t pwdh0, pwdl0, pwdl1; //password bytes
+static uint32_t rnd = 0x74124485;  //randomnumber
 static int test = 0;
 size_t blocknr;
 bool end = false;
 
+// Single bit Hitag2 functions:
+#define i4(x,a,b,c,d)       ((u32)((((x)>>(a))&1)+(((x)>>(b))&1)*2+(((x)>>(c))&1)*4+(((x)>>(d))&1)*8))
+static const u32 ht2_f4a = 0x2C79;            // 0010 1100 0111 1001
+static const u32 ht2_f4b = 0x6671;            // 0110 0110 0111 0001
+static const u32 ht2_f5c = 0x7907287B;        // 0111 1001 0000 0111 0010 1000 0111 1011
 #define ht2bs_4a(a,b,c,d)   (~(((a|b)&c)^(a|d)^b))
 #define ht2bs_4b(a,b,c,d)   (~(((d|c)&(a^b))^(d|a|b)))
 #define ht2bs_5c(a,b,c,d,e) (~((((((c^e)|d)&a)^b)&(c^b))^(((d^e)|a)&((d^b)|c))))
+#define uf20bs              u32
+
+static u32 f20(const u64 x) {
+    u32 i5;
+
+    i5 = ((ht2_f4a >> i4(x, 1, 2, 4, 5)) & 1) * 1
+         + ((ht2_f4b >> i4(x, 7, 11, 13, 14)) & 1) * 2
+         + ((ht2_f4b >> i4(x, 16, 20, 22, 25)) & 1) * 4
+         + ((ht2_f4b >> i4(x, 27, 28, 30, 32)) & 1) * 8
+         + ((ht2_f4a >> i4(x, 33, 42, 43, 45)) & 1) * 16;
+
+    return (ht2_f5c >> i5) & 1;
+}
+static u64 hitag2_round(u64 *state) {
+    u64 x = *state;
+
+    x = (x >> 1)
+        + ((((x >> 0) ^ (x >> 2) ^ (x >> 3) ^ (x >> 6) ^ (x >> 7) ^ (x >> 8)
+             ^ (x >> 16) ^ (x >> 22) ^ (x >> 23) ^ (x >> 26) ^ (x >> 30)
+             ^ (x >> 41) ^ (x >> 42) ^ (x >> 43) ^ (x >> 46) ^ (x >> 47))
+            & 1) << 47);
+
+    *state = x;
+    return f20(x);
+}
+static u64 hitag2_init(const u64 key, const u32 serial, const u32 IV) {
+    u32 i;
+    u64 x = ((key & 0xFFFF) << 32) + serial;
+    for (i = 0; i < 32; i++) {
+        x >>= 1;
+        x += (u64)(f20(x) ^ (((IV >> i) ^ (key >> (i + 16))) & 1)) << 47;
+    }
+    return x;
+}
+static u32 hitag2_byte(u64 *x) {
+    u32 i, c;
+
+    for (i = 0, c = 0; i < 8; i++)
+        c += (u32) hitag2_round(x) << (i ^ 7);
+    return c;
+}
 
 // Sam7s has several timers, we will use the source TIMER_CLOCK1 (aka AT91C_TC_CLKS_TIMER_DIV1_CLOCK)
 // TIMER_CLOCK1 = MCK/2, MCK is running at 48 MHz, Timer is running at 48/2 = 24 MHz
 // Hitag units (T0) have duration of 8 microseconds (us), which is 1/125000 per second (carrier)
 // T0 = TIMER_CLOCK1 / 125000 = 192
-#ifndef T0
 #define T0                             192
-#endif
+
+#define SHORT_COIL()                   LOW(GPIO_SSC_DOUT)
+#define OPEN_COIL()                    HIGH(GPIO_SSC_DOUT)
 
 #define HITAG_FRAME_LEN                20
 #define HITAG_T_STOP                   36  /* T_EOF should be > 36 */
@@ -195,85 +258,100 @@ static void hitag_send_bit(int bit) {
     }
 }
 
-static void hitag_send_frame(const uint8_t *frame, size_t frame_len) {
-    // SOF - send start of frame
+static void hitag_send_frame(const byte_t *frame, size_t frame_len) {
+// Send start of frame
+
     for (size_t i = 0; i < sof_bits; i++) {
         hitag_send_bit(1);
     }
 
-    // Send the content of the frame
+// Send the content of the frame
     for (size_t i = 0; i < frame_len; i++) {
         hitag_send_bit((frame[i / 8] >> (7 - (i % 8))) & 1);
     }
-
+// Drop the modulation
     LOW(GPIO_SSC_DOUT);
 }
 
 static void hitag_reader_send_bit(int bit) {
-
+//Dbprintf("BIT: %d",bit);
     LED_A_ON();
-    // Reset clock for the next bit
+// Reset clock for the next bit
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;
 
-    // Binary puls length modulation (BPLM) is used to encode the data stream
-    // This means that a transmission of a one takes longer than that of a zero
+// Binary puls length modulation (BPLM) is used to encode the data stream
+// This means that a transmission of a one takes longer than that of a zero
 
+// Enable modulation, which means, drop the the field
     HIGH(GPIO_SSC_DOUT);
-
     if (test == 1) {
         // Wait for 4-10 times the carrier period
         while (AT91C_BASE_TC0->TC_CV < T0 * 6) {};
 
+        // SpinDelayUs(8*8);
+
+        // Disable modulation, just activates the field again
         LOW(GPIO_SSC_DOUT);
 
         if (bit == 0) {
             // Zero bit: |_-|
             while (AT91C_BASE_TC0->TC_CV < T0 * 11) {};
+
+            // SpinDelayUs(16*8);
         } else {
             // One bit: |_--|
             while (AT91C_BASE_TC0->TC_CV < T0 * 14) {};
+
+            // SpinDelayUs(22*8);
         }
     } else {
         // Wait for 4-10 times the carrier period
         while (AT91C_BASE_TC0->TC_CV < T0 * 6) {};
 
+        // SpinDelayUs(8*8);
+
+        // Disable modulation, just activates the field again
         LOW(GPIO_SSC_DOUT);
 
         if (bit == 0) {
             // Zero bit: |_-|
             while (AT91C_BASE_TC0->TC_CV < T0 * 22) {};
+
+            // SpinDelayUs(16*8);
         } else {
             // One bit: |_--|
             while (AT91C_BASE_TC0->TC_CV < T0 * 28) {};
+
+            // SpinDelayUs(22*8);
         }
     }
 
     LED_A_OFF();
 }
 
-static void hitag_reader_send_frame(const uint8_t *frame, size_t frame_len) {
-    // Send the content of the frame
+static void hitag_reader_send_frame(const byte_t *frame, size_t frame_len) {
+// Send the content of the frame
     for (size_t i = 0; i < frame_len; i++) {
-//        if (frame[0] == 0xf8) {
-        //Dbprintf("BIT: %d",(frame[i / 8] >> (7 - (i % 8))) & 1);
-//        }
+        if (frame[0] == 0xf8) {
+            //Dbprintf("BIT: %d",(frame[i / 8] >> (7 - (i % 8))) & 1);
+        }
         hitag_reader_send_bit((frame[i / 8] >> (7 - (i % 8))) & 1);
     }
-    // send EOF
+// Send EOF
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG;
-
+// Enable modulation, which means, drop the the field
     HIGH(GPIO_SSC_DOUT);
-
-    // Wait for 4-10 times the carrier period
+// Wait for 4-10 times the carrier period
     while (AT91C_BASE_TC0->TC_CV < T0 * 6) {};
 
+// Disable modulation, just activates the field again
     LOW(GPIO_SSC_DOUT);
 }
 
 /*
  * to check if the right uid was selected
  */
-static int check_select(uint8_t *rx, uint32_t uid) {
+static int check_select(byte_t *rx, uint32_t uid) {
     unsigned char resp[48];
     int i;
     uint32_t ans = 0x0;
@@ -281,32 +359,31 @@ static int check_select(uint8_t *rx, uint32_t uid) {
         resp[i] = (rx[i / 8] >> (7 - (i % 8))) & 0x1;
     for (i = 0; i < 32; i++)
         ans += resp[5 + i] << (31 - i);
-
+    /*if (rx[0] == 0x01 && rx[1] == 0x15 && rx[2] == 0xc1 && rx[3] == 0x14
+     && rx[4] == 0x65 && rx[5] == 0x38)
+     Dbprintf("got uid %X", ans);*/
     temp_uid = ans;
     if (ans == tag.uid)
         return 1;
-
     return 0;
 }
 
 /*
  * handles all commands from a reader
  */
-static void hitagS_handle_reader_command(uint8_t *rx, const size_t rxlen,
-                                         uint8_t *tx, size_t *txlen) {
-    uint8_t rx_air[HITAG_FRAME_LEN];
-    uint8_t page;
+static void hitagS_handle_reader_command(byte_t *rx, const size_t rxlen,
+                                         byte_t *tx, size_t *txlen) {
+    byte_t rx_air[HITAG_FRAME_LEN];
+    byte_t page;
     int i;
-    uint64_t state;
+    u64 state;
     unsigned char crc;
 
-    // Copy the (original) received frame how it is send over the air
+// Copy the (original) received frame how it is send over the air
     memcpy(rx_air, rx, nbytes(rxlen));
-
-    // Reset the transmission frame length
+// Reset the transmission frame length
     *txlen = 0;
-
-    // Try to find out which command was send by selecting on length (in bits)
+// Try to find out which command was send by selecting on length (in bits)
     switch (rxlen) {
         case 5: {
             //UID request with a selected response protocol mode
@@ -375,13 +452,11 @@ static void hitagS_handle_reader_command(uint8_t *rx, const size_t rxlen,
             Dbprintf("Challenge for UID: %X", temp_uid);
             temp2++;
             *txlen = 32;
-            state = _hitag2_init(REV64(tag.key),
-                                 REV32(tag.pages[0][0]),
-                                 REV32(((rx[3] << 24) + (rx[2] << 16) + (rx[1] << 8) + rx[0]))
-                                );
-            Dbprintf(",{0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X}",
-                     rx[0], rx[1], rx[2], rx[3], rx[4], rx[5], rx[6], rx[7]);
-
+            state = hitag2_init(rev64(tag.key), rev32(tag.pages[0][0]),
+                                rev32(((rx[3] << 24) + (rx[2] << 16) + (rx[1] << 8) + rx[0])));
+            Dbprintf(
+                ",{0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X}",
+                rx[0], rx[1], rx[2], rx[3], rx[4], rx[5], rx[6], rx[7]);
             switch (tag.mode) {
                 case HT_STANDARD:
                     sof_bits = 1;
@@ -400,13 +475,12 @@ static void hitagS_handle_reader_command(uint8_t *rx, const size_t rxlen,
             }
 
             for (i = 0; i < 4; i++)
-                _hitag2_byte(&state);
-
-            //send con2, pwdh0, pwdl0, pwdl1 encrypted as a response
-            tx[0] = _hitag2_byte(&state) ^ ((tag.pages[0][1] >> 16) & 0xff);
-            tx[1] = _hitag2_byte(&state) ^ tag.pwdh0;
-            tx[2] = _hitag2_byte(&state) ^ tag.pwdl0;
-            tx[3] = _hitag2_byte(&state) ^ tag.pwdl1;
+                hitag2_byte(&state);
+            //send con2,pwdh0,pwdl0,pwdl1 encrypted as a response
+            tx[0] = hitag2_byte(&state) ^ ((tag.pages[0][1] >> 16) & 0xff);
+            tx[1] = hitag2_byte(&state) ^ tag.pwdh0;
+            tx[2] = hitag2_byte(&state) ^ tag.pwdl0;
+            tx[3] = hitag2_byte(&state) ^ tag.pwdl1;
             if (tag.mode != HT_STANDARD) {
                 //add crc8
                 *txlen = 40;
@@ -415,12 +489,14 @@ static void hitagS_handle_reader_command(uint8_t *rx, const size_t rxlen,
                 calc_crc(&crc, tag.pwdh0, 8);
                 calc_crc(&crc, tag.pwdl0, 8);
                 calc_crc(&crc, tag.pwdl1, 8);
-                tx[4] = (crc ^ _hitag2_byte(&state));
+                tx[4] = (crc ^ hitag2_byte(&state));
             }
             /*
              * some readers do not allow to authenticate multiple times in a row with the same tag.
              * use this to change the uid between authentications.
+             */
 
+            /*
              if (temp2 % 2 == 0) {
              tag.uid = 0x11223344;
              tag.pages[0][0] = 0x44332211;
@@ -644,17 +720,18 @@ static void hitagS_handle_reader_command(uint8_t *rx, const size_t rxlen,
 /*
  * to autenticate to a tag with the given key or challenge
  */
-static int hitagS_handle_tag_auth(hitag_function htf, uint64_t key, uint64_t NrAr, uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t *txlen) {
-    uint8_t rx_air[HITAG_FRAME_LEN];
+static int hitagS_handle_tag_auth(hitag_function htf, uint64_t key, uint64_t NrAr, byte_t *rx, const size_t rxlen, byte_t *tx,
+                                  size_t *txlen) {
+    byte_t rx_air[HITAG_FRAME_LEN];
     int response_bit[200];
     int i, j, z, k;
     unsigned char mask = 1;
     unsigned char uid[32];
-    uint8_t uid1 = 0x00, uid2 = 0x00, uid3 = 0x00, uid4 = 0x00;
+    byte_t uid1 = 0x00, uid2 = 0x00, uid3 = 0x00, uid4 = 0x00;
     unsigned char crc;
-    uint64_t state;
-    uint8_t auth_ks[4];
-    uint8_t conf_pages[3];
+    u64 state;
+    byte_t auth_ks[4];
+    byte_t conf_pages[3];
     memcpy(rx_air, rx, nbytes(rxlen));
     *txlen = 0;
 
@@ -680,45 +757,16 @@ static int hitagS_handle_tag_auth(hitag_function htf, uint64_t key, uint64_t NrA
             if (k > 31)
                 break;
         }
-        uid1 = (uid[0] << 7)
-               | (uid[1] << 6)
-               | (uid[2] << 5)
-               | (uid[3] << 4)
-               | (uid[4] << 3)
-               | (uid[5] << 2)
-               | (uid[6] << 1)
-               | uid[7];
-
-        uid2 = (uid[8] << 7)
-               | (uid[9] << 6)
-               | (uid[10] << 5)
-               | (uid[11] << 4)
-               | (uid[12] << 3)
-               | (uid[13] << 2)
-               | (uid[14] << 1)
-               | uid[15];
-
-        uid3 = (uid[16] << 7)
-               | (uid[17] << 6)
-               | (uid[18] << 5)
-               | (uid[19] << 4)
-               | (uid[20] << 3)
-               | (uid[21] << 2)
-               | (uid[22] << 1)
-               | uid[23];
-
-        uid4 = (uid[24] << 7)
-               | (uid[25] << 6)
-               | (uid[26] << 5)
-               | (uid[27] << 4)
-               | (uid[28] << 3)
-               | (uid[29] << 2)
-               | (uid[30] << 1)
-               | uid[31];
-
+        uid1 = (uid[0] << 7) | (uid[1] << 6) | (uid[2] << 5) | (uid[3] << 4)
+               | (uid[4] << 3) | (uid[5] << 2) | (uid[6] << 1) | uid[7];
+        uid2 = (uid[8] << 7) | (uid[9] << 6) | (uid[10] << 5) | (uid[11] << 4)
+               | (uid[12] << 3) | (uid[13] << 2) | (uid[14] << 1) | uid[15];
+        uid3 = (uid[16] << 7) | (uid[17] << 6) | (uid[18] << 5) | (uid[19] << 4)
+               | (uid[20] << 3) | (uid[21] << 2) | (uid[22] << 1) | uid[23];
+        uid4 = (uid[24] << 7) | (uid[25] << 6) | (uid[26] << 5) | (uid[27] << 4)
+               | (uid[28] << 3) | (uid[29] << 2) | (uid[30] << 1) | uid[31];
         if (DEBUG)
             Dbprintf("UID: %02X %02X %02X %02X", uid1, uid2, uid3, uid4);
-
         tag.uid = (uid4 << 24 | uid3 << 16 | uid2 << 8 | uid1);
 
         //select uid
@@ -729,40 +777,29 @@ static int hitagS_handle_tag_auth(hitag_function htf, uint64_t key, uint64_t NrA
         calc_crc(&crc, uid2, 8);
         calc_crc(&crc, uid3, 8);
         calc_crc(&crc, uid4, 8);
-
         for (i = 0; i < 100; i++) {
             response_bit[i] = 0;
         }
-
         for (i = 0; i < 5; i++) {
             response_bit[i] = 0;
         }
-
         for (i = 5; i < 37; i++) {
             response_bit[i] = uid[i - 5];
         }
-
         for (j = 0; j < 8; j++) {
             response_bit[i] = 0;
             if ((crc & ((mask << 7) >> j)) != 0)
                 response_bit[i] = 1;
             i++;
         }
-
         k = 0;
         for (i = 0; i < 6; i++) {
-            tx[i] = (response_bit[k] << 7)
-                    | (response_bit[k + 1] << 6)
-                    | (response_bit[k + 2] << 5)
-                    | (response_bit[k + 3] << 4)
-                    | (response_bit[k + 4] << 3)
-                    | (response_bit[k + 5] << 2)
-                    | (response_bit[k + 6] << 1)
-                    | response_bit[k + 7];
-
+            tx[i] = (response_bit[k] << 7) | (response_bit[k + 1] << 6)
+                    | (response_bit[k + 2] << 5) | (response_bit[k + 3] << 4)
+                    | (response_bit[k + 4] << 3) | (response_bit[k + 5] << 2)
+                    | (response_bit[k + 6] << 1) | response_bit[k + 7];
             k += 8;
         }
-
         tag.pstate = HT_INIT;
     } else if (tag.pstate == HT_INIT && rxlen == 44) {
         // received configuration after select command
@@ -810,17 +847,18 @@ static int hitagS_handle_tag_auth(hitag_function htf, uint64_t key, uint64_t NrA
         tag.LCK0 = response_bit[27];
 
         if (DEBUG)
-            Dbprintf("conf0: %02X conf1: %02X conf2: %02X", conf_pages[0], conf_pages[1], conf_pages[2]);
-
+            Dbprintf("conf0: %02X conf1: %02X conf2: %02X", conf_pages[0],
+                     conf_pages[1], conf_pages[2]);
         if (tag.auth == 1) {
             //if the tag is in authentication mode try the key or challenge
             *txlen = 64;
             if (end != true) {
                 if (htf == 02 || htf == 04) { //RHTS_KEY //WHTS_KEY
-                    state = _hitag2_init(REV64(key), REV32(tag.uid), REV32(rnd));
+                    state = hitag2_init(rev64(key), rev32(tag.uid),
+                                        rev32(rnd));
 
                     for (i = 0; i < 4; i++) {
-                        auth_ks[i] = _hitag2_byte(&state) ^ 0xff;
+                        auth_ks[i] = hitag2_byte(&state) ^ 0xff;
                     }
                     *txlen = 64;
                     tx[0] = rnd & 0xff;
@@ -868,18 +906,21 @@ static int hitagS_handle_tag_auth(hitag_function htf, uint64_t key, uint64_t NrA
         pwdl1 = 0;
         if (htf == 02 || htf == 04) { //RHTS_KEY //WHTS_KEY
             {
-                state = _hitag2_init(REV64(key), REV32(tag.uid), REV32(rnd));
+                state = hitag2_init(rev64(key), rev32(tag.uid), rev32(rnd));
                 for (i = 0; i < 5; i++)
-                    _hitag2_byte(&state);
-
-                pwdh0 = ((rx[1] & 0x0f) * 16 + ((rx[2] & 0xf0) / 16)) ^ _hitag2_byte(&state);
-                pwdl0 = ((rx[2] & 0x0f) * 16 + ((rx[3] & 0xf0) / 16)) ^ _hitag2_byte(&state);
-                pwdl1 = ((rx[3] & 0x0f) * 16 + ((rx[4] & 0xf0) / 16)) ^ _hitag2_byte(&state);
+                    hitag2_byte(&state);
+                pwdh0 = ((rx[1] & 0x0f) * 16 + ((rx[2] & 0xf0) / 16))
+                        ^ hitag2_byte(&state);
+                pwdl0 = ((rx[2] & 0x0f) * 16 + ((rx[3] & 0xf0) / 16))
+                        ^ hitag2_byte(&state);
+                pwdl1 = ((rx[3] & 0x0f) * 16 + ((rx[4] & 0xf0) / 16))
+                        ^ hitag2_byte(&state);
             }
 
             if (DEBUG)
                 Dbprintf("pwdh0 %02X pwdl0 %02X pwdl1 %02X", pwdh0, pwdl0, pwdl1);
 
+
             //Dbprintf("%X %02X", rnd, ((rx[4] & 0x0f) * 16) + ((rx[5] & 0xf0) / 16));
             //rnd += 1;
         }
@@ -892,22 +933,18 @@ static int hitagS_handle_tag_auth(hitag_function htf, uint64_t key, uint64_t NrA
 /*
  * Emulates a Hitag S Tag with the given data from the .hts file
  */
-void SimulateHitagSTag(bool tag_mem_supplied, uint8_t *data) {
-
-    StopTicks();
-
-    int frame_count = 0, response = 0, overflow = 0;
+void SimulateHitagSTag(bool tag_mem_supplied, byte_t *data) {
+    int frame_count;
+    int response;
+    int overflow;
     int i, j;
-    uint8_t rx[HITAG_FRAME_LEN];
+    byte_t rx[HITAG_FRAME_LEN];
     size_t rxlen = 0;
+    //bool bQuitTraceFull = false;
     bQuiet = false;
-    uint8_t txbuf[HITAG_FRAME_LEN];
-    uint8_t *tx = txbuf;
+    byte_t txbuf[HITAG_FRAME_LEN];
+    byte_t *tx = txbuf;
     size_t txlen = 0;
-
-    // Reset the received frame, frame count and timing info
-    memset(rx, 0x00, sizeof(rx));
-
     // free eventually allocated BigBuf memory
     BigBuf_free();
     BigBuf_Clear_ext(false);
@@ -921,18 +958,16 @@ void SimulateHitagSTag(bool tag_mem_supplied, uint8_t *data) {
 
     tag.pstate = HT_READY;
     tag.tstate = HT_NO_OP;
-
     for (i = 0; i < 16; i++)
         for (j = 0; j < 4; j++)
             tag.pages[i][j] = 0x0;
-
-    // read tag data into memory
+    //read tag data into memory
     if (tag_mem_supplied) {
         DbpString("Loading hitagS memory...");
-        memcpy((uint8_t *)tag.pages, data, 4 * 64);
+        memcpy((byte_t *)tag.pages, data, 4 * 64);
     }
-
     tag.uid = (uint32_t)tag.pages[0];
+    Dbprintf("Hitag S simulation started");
     tag.key = (intptr_t)tag.pages[3];
     tag.key <<= 16;
     tag.key += ((tag.pages[2][0]) << 8) + tag.pages[2][1];
@@ -982,48 +1017,48 @@ void SimulateHitagSTag(bool tag_mem_supplied, uint8_t *data) {
     if ((tag.pages[1][1] & 0x1) == 0x01)
         tag.LCK0 = 1;
 
-    // Set up simulator mode, frequency divisor which will drive the FPGA
-    // and analog mux selection.
+// Set up simulator mode, frequency divisor which will drive the FPGA
+// and analog mux selection.
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
     FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT);
+    SpinDelay(20);
     FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
     SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
+    RELAY_OFF();
 
-    // Configure output pin that is connected to the FPGA (for modulating)
+// Configure output pin that is connected to the FPGA (for modulating)
     AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
     AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
 
-    // Disable modulation at default, which means release resistance
+// Disable modulation at default, which means release resistance
     LOW(GPIO_SSC_DOUT);
 
-    // Enable Peripheral Clock for
-    //   TIMER_CLOCK0, used to measure exact timing before answering
-    //   TIMER_CLOCK1, used to capture edges of the tag frames
-    AT91C_BASE_PMC->PMC_PCER |= (1 << AT91C_ID_TC0) | (1 << AT91C_ID_TC1);
+// Enable Peripheral Clock for TIMER_CLOCK0, used to measure exact timing before answering
+    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC0);
 
+// Enable Peripheral Clock for TIMER_CLOCK1, used to capture edges of the reader frames
+    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC1);
     AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
 
-    // Disable timer during configuration
-    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
+// Disable timer during configuration
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 
-    // TC0: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), no triggers
-    AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK;
-
-    // TC1: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
-    // external trigger rising edge, load RA on rising edge of TIOA.
+// Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
+// external trigger rising edge, load RA on rising edge of TIOA.
     AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK
                              | AT91C_TC_ETRGEDG_RISING | AT91C_TC_ABETRG | AT91C_TC_LDRA_RISING;
 
-    // Enable and reset counter
-    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
+// Reset the received frame, frame count and timing info
+    memset(rx, 0x00, sizeof(rx));
+    frame_count = 0;
+    response = 0;
+    overflow = 0;
+
+// Enable and reset counter
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
-    // synchronized startup procedure
-    while (AT91C_BASE_TC0->TC_CV > 0); // wait until TC0 returned to zero
-
-    while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
-
+    while (!BUTTON_PRESS()) {
+        // Watchdog hit
         WDT_HIT();
 
         // Receive frame, watch for at most T0*EOF periods
@@ -1063,7 +1098,12 @@ void SimulateHitagSTag(bool tag_mem_supplied, uint8_t *data) {
         // Check if frame was captured
         if (rxlen > 0) {
             frame_count++;
-            LogTrace(rx, nbytes(rxlen), response, 0, NULL, true);
+            if (!bQuiet) {
+                if (!LogTraceHitag(rx, rxlen, response, 0, true)) {
+                    DbpString("Trace full");
+                    clear_trace();
+                }
+            }
 
             // Disable timer 1 with external trigger to avoid triggers during our own modulation
             AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
@@ -1076,13 +1116,20 @@ void SimulateHitagSTag(bool tag_mem_supplied, uint8_t *data) {
             // with respect to the falling edge, we need to wait actually (T_Wait1 - T_Low)
             // periods. The gap time T_Low varies (4..10). All timer values are in
             // terms of T0 units
-            while (AT91C_BASE_TC0->TC_CV < T0 * (HITAG_T_WAIT_1 - HITAG_T_LOW)) {};
+            while (AT91C_BASE_TC0->TC_CV < T0 * (HITAG_T_WAIT_1 - HITAG_T_LOW))
+                ;
 
             // Send and store the tag answer (if there is any)
             if (txlen > 0) {
                 // Transmit the tag frame
                 hitag_send_frame(tx, txlen);
-                LogTrace(tx, nbytes(txlen), 0, 0, NULL, false);
+                // Store the frame in the trace
+                if (!bQuiet) {
+                    if (!LogTraceHitag(tx, txlen, 0, 0, false)) {
+                        DbpString("Trace full");
+                        clear_trace();
+                    }
+                }
             }
 
             // Reset the received frame and response timing info
@@ -1100,19 +1147,11 @@ void SimulateHitagSTag(bool tag_mem_supplied, uint8_t *data) {
         // Reset the timer to restart while-loop that receives frames
         AT91C_BASE_TC1->TC_CCR = AT91C_TC_SWTRG;
     }
-
-    LEDsoff();
-    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-    set_tracing(false);
+    LED_B_OFF();
+    LED_D_OFF();
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
-
-    // release allocated memory from BigBuff.
-    BigBuf_free();
-
-    StartTicks();
-
-    DbpString("Sim Stopped");
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 }
 
 /*
@@ -1121,23 +1160,22 @@ void SimulateHitagSTag(bool tag_mem_supplied, uint8_t *data) {
  * Reads every page of a hitag S transpoder.
  */
 void ReadHitagS(hitag_function htf, hitag_data *htd) {
-
-    StopTicks();
-
     int i, j, z, k;
-    int frame_count = 0, response = 0;
+    int frame_count;
     int response_bit[200];
-    uint8_t rx[HITAG_FRAME_LEN];
+    int response;
+    byte_t rx[HITAG_FRAME_LEN];
     size_t rxlen = 0;
-    uint8_t txbuf[HITAG_FRAME_LEN];
-    uint8_t *tx = txbuf;
+    byte_t txbuf[HITAG_FRAME_LEN];
+    byte_t *tx = txbuf;
     size_t txlen = 0;
-    int lastbit = 1;
+    int lastbit;
     bool bSkip;
-    int reset_sof = 1;
+    int reset_sof;
     int tag_sof;
     int t_wait = HITAG_T_WAIT_MAX;
     bool bStop = false;
+    bool bQuitTraceFull = false;
     int sendNum = 0;
     unsigned char mask = 1;
     unsigned char crc;
@@ -1145,31 +1183,31 @@ void ReadHitagS(hitag_function htf, hitag_data *htd) {
     page_to_be_written = 0;
 
     //read given key/challenge
-    uint8_t NrAr_[8];
+    byte_t NrAr_[8];
     uint64_t key = 0;
     uint64_t NrAr = 0;
-    uint8_t key_[6];
-
+    byte_t key_[6];
     switch (htf) {
-        case RHTSF_CHALLENGE: {
+        case 01: { //RHTS_CHALLENGE
             DbpString("Authenticating using nr,ar pair:");
             memcpy(NrAr_, htd->auth.NrAr, 8);
             Dbhexdump(8, NrAr_, false);
             NrAr = NrAr_[7] | ((uint64_t)NrAr_[6]) << 8 | ((uint64_t)NrAr_[5]) << 16 | ((uint64_t)NrAr_[4]) << 24 | ((uint64_t)NrAr_[3]) << 32 |
                    ((uint64_t)NrAr_[2]) << 40 | ((uint64_t)NrAr_[1]) << 48 | ((uint64_t)NrAr_[0]) << 56;
-            break;
         }
-        case RHTSF_KEY: {
+        break;
+        case 02: { //RHTS_KEY
             DbpString("Authenticating using key:");
             memcpy(key_, htd->crypto.key, 6);
             Dbhexdump(6, key_, false);
             key = key_[5] | ((uint64_t)key_[4]) << 8 | ((uint64_t)key_[3]) << 16 | ((uint64_t)key_[2]) << 24 | ((uint64_t)key_[1]) << 32 | ((uint64_t)key_[0]) << 40;
-            break;
         }
+        break;
         default: {
             Dbprintf("Error , unknown function: %d", htf);
             return;
         }
+        break;
     }
 
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
@@ -1181,36 +1219,40 @@ void ReadHitagS(hitag_function htf, hitag_data *htd) {
     clear_trace();
 
     bQuiet = false;
+    bQuitTraceFull = true;
 
     LED_D_ON();
 
+    // Configure output and enable pin that is connected to the FPGA (for modulating)
+    AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
+    AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
+
     // Set fpga in edge detect with reader field, we can modulate as reader now
-    FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_READER_FIELD);
+    FpgaWriteConfWord(
+        FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_READER_FIELD);
+
+    // Set Frequency divisor which will drive the FPGA and analog mux selection
     FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
     SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
-
-    // Configure output and enable pin that is connected to the FPGA (for modulating)
-    AT91C_BASE_PIOA->PIO_OER |= GPIO_SSC_DOUT;
-    AT91C_BASE_PIOA->PIO_PER |= GPIO_SSC_DOUT;
+    RELAY_OFF();
 
     // Disable modulation at default, which means enable the field
     LOW(GPIO_SSC_DOUT);
 
-    // Enable Peripheral Clock for
-    //   TIMER_CLOCK0, used to measure exact timing before answering
-    //   TIMER_CLOCK1, used to capture edges of the tag frames
-    AT91C_BASE_PMC->PMC_PCER |= (1 << AT91C_ID_TC0) | (1 << AT91C_ID_TC1);
+    // Give it a bit of time for the resonant antenna to settle.
+    SpinDelay(30);
 
+    // Enable Peripheral Clock for TIMER_CLOCK0, used to measure exact timing before answering
+    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC0);
+
+    // Enable Peripheral Clock for TIMER_CLOCK1, used to capture edges of the tag frames
+    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC1);
     AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
 
     // Disable timer during configuration
-    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 
-    // TC0: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), no triggers
-    AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK;
-
-    // TC1: Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
+    // Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
     // external trigger rising edge, load RA on falling edge of TIOA.
     AT91C_BASE_TC1->TC_CMR =
         AT91C_TC_CLKS_TIMER_DIV1_CLOCK  |
@@ -1222,20 +1264,32 @@ void ReadHitagS(hitag_function htf, hitag_data *htd) {
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
-    // synchronized startup procedure
-    while (AT91C_BASE_TC0->TC_CV > 0); // wait until TC0 returned to zero
-
     // Reset the received frame, frame count and timing info
+    frame_count = 0;
+    response = 0;
+    lastbit = 1;
+    bStop = false;
+
+    reset_sof = 1;
     t_wait = 200;
 
-    while (!bStop && !BUTTON_PRESS() && !usb_poll_validate_length())  {
-
+    while (!bStop && !BUTTON_PRESS()) {
+        // Watchdog hit
         WDT_HIT();
 
         // Check if frame was captured and store it
         if (rxlen > 0) {
             frame_count++;
-            LogTrace(rx, nbytes(rxlen), response, 0, NULL, false);
+            if (!bQuiet) {
+                if (!LogTraceHitag(rx, rxlen, response, 0, false)) {
+                    DbpString("Trace full");
+                    if (bQuitTraceFull) {
+                        break;
+                    } else {
+                        bQuiet = true;
+                    }
+                }
+            }
         }
 
         // By default reset the transmission buffer
@@ -1245,14 +1299,13 @@ void ReadHitagS(hitag_function htf, hitag_data *htd) {
         if (rxlen == 0) {
             //start authentication
             txlen = 5;
-            memcpy(tx, "\xC0", nbytes(txlen));
+            memcpy(tx, "\xc0", nbytes(txlen));
             tag.pstate = HT_READY;
             tag.tstate = HT_NO_OP;
         } else if (tag.pstate != HT_SELECTED) {
             if (hitagS_handle_tag_auth(htf, key, NrAr, rx, rxlen, tx, &txlen) == -1)
                 bStop = !false;
         }
-
         if (tag.pstate == HT_SELECTED && tag.tstate == HT_NO_OP && rxlen > 0) {
             //send read request
             tag.tstate = HT_READING_PAGE;
@@ -1263,8 +1316,7 @@ void ReadHitagS(hitag_function htf, hitag_data *htd) {
             calc_crc(&crc, 0x00 + ((sendNum % 16) * 16), 4);
             tx[1] = 0x00 + ((sendNum % 16) * 16) + (crc / 16);
             tx[2] = 0x00 + (crc % 16) * 16;
-        } else if (tag.pstate == HT_SELECTED
-                   && tag.tstate == HT_READING_PAGE
+        } else if (tag.pstate == HT_SELECTED && tag.tstate == HT_READING_PAGE
                    && rxlen > 0) {
             //save received data
             z = 0;
@@ -1309,19 +1361,15 @@ void ReadHitagS(hitag_function htf, hitag_data *htd) {
             sendNum++;
             //display key and password if possible
             if (sendNum == 2 && tag.auth == 1 && tag.LKP) {
-                if (htf == RHTSF_KEY) {
+                if (htf == 02) { //RHTS_KEY
                     Dbprintf("Page[ 2]: %02X %02X %02X %02X",
-                             (uint8_t)(key >> 8) & 0xff,
-                             (uint8_t) key & 0xff,
-                             pwdl1,
-                             pwdl0
-                            );
+                             (byte_t)(key >> 8) & 0xff,
+                             (byte_t) key & 0xff, pwdl1, pwdl0);
                     Dbprintf("Page[ 3]: %02X %02X %02X %02X",
-                             (uint8_t)(key >> 40) & 0xff,
-                             (uint8_t)(key >> 32) & 0xff,
-                             (uint8_t)(key >> 24) & 0xff,
-                             (uint8_t)(key >> 16) & 0xff
-                            );
+                             (byte_t)(key >> 40) & 0xff,
+                             (byte_t)(key >> 32) & 0xff,
+                             (byte_t)(key >> 24) & 0xff,
+                             (byte_t)(key >> 16) & 0xff);
                 } else {
                     //if the authentication is done with a challenge the key and password are unknown
                     Dbprintf("Page[ 2]: __ __ __ __");
@@ -1362,7 +1410,17 @@ void ReadHitagS(hitag_function htf, hitag_data *htd) {
         // Add transmitted frame to total count
         if (txlen > 0) {
             frame_count++;
-            LogTrace(tx, nbytes(txlen), HITAG_T_WAIT_2, 0, NULL, true);
+            if (!bQuiet) {
+                // Store the frame in the trace
+                if (!LogTraceHitag(tx, txlen, HITAG_T_WAIT_2, 0, true)) {
+                    if (bQuitTraceFull) {
+                        DbpString("Trace full");
+                        break;
+                    } else {
+                        bQuiet = true;
+                    }
+                }
+            }
         }
 
         // Reset values for receiving frames
@@ -1433,17 +1491,12 @@ void ReadHitagS(hitag_function htf, hitag_data *htd) {
         }
     }
     end = false;
-
-    LEDsoff();
-    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-    set_tracing(false);
-
+    LED_B_OFF();
+    LED_D_OFF();
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 
-    StartTicks();
-
     cmd_send(CMD_ACK, bSuccessful, 0, 0, 0, 0);
 }
 
@@ -1452,14 +1505,12 @@ void ReadHitagS(hitag_function htf, hitag_data *htd) {
  * Writes the given 32Bit data into page_
  */
 void WritePageHitagS(hitag_function htf, hitag_data *htd, int page_) {
-
-    StopTicks();
-
-    int frame_count = 0, response = 0;
-    uint8_t rx[HITAG_FRAME_LEN];
+    int frame_count;
+    int response;
+    byte_t rx[HITAG_FRAME_LEN];
     size_t rxlen = 0;
-    uint8_t txbuf[HITAG_FRAME_LEN];
-    uint8_t *tx = txbuf;
+    byte_t txbuf[HITAG_FRAME_LEN];
+    byte_t *tx = txbuf;
     size_t txlen = 0;
     int lastbit;
     bool bSkip;
@@ -1467,106 +1518,124 @@ void WritePageHitagS(hitag_function htf, hitag_data *htd, int page_) {
     int tag_sof;
     int t_wait = HITAG_T_WAIT_MAX;
     bool bStop;
+    bool bQuitTraceFull = false;
     int page = page_;
     unsigned char crc;
-    uint8_t data[4] = {0, 0, 0, 0};
-
-    FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-
-    bSuccessful = false;
-
-    // Clean up trace and prepare it for storing frames
-    set_tracing(true);
-    clear_trace();
+    byte_t data[4] = {0, 0, 0, 0};
 
     //read given key/challenge, the page and the data
-    uint8_t NrAr_[8];
+    byte_t NrAr_[8];
     uint64_t key = 0;
     uint64_t NrAr = 0;
-    uint8_t key_[6];
+    byte_t key_[6];
     switch (htf) {
-        case WHTSF_CHALLENGE: {
+        case 03: { //WHTS_CHALLENGE
             memcpy(data, htd->auth.data, 4);
             DbpString("Authenticating using nr,ar pair:");
             memcpy(NrAr_, htd->auth.NrAr, 8);
             Dbhexdump(8, NrAr_, false);
             NrAr = NrAr_[7] | ((uint64_t)NrAr_[6]) << 8 | ((uint64_t)NrAr_[5]) << 16 | ((uint64_t)NrAr_[4]) << 24 | ((uint64_t)NrAr_[3]) << 32 |
                    ((uint64_t)NrAr_[2]) << 40 | ((uint64_t)NrAr_[1]) << 48 | ((uint64_t)NrAr_[0]) << 56;
-            break;
         }
-
-        case WHTSF_KEY: {
+        break;
+        case 04: { //WHTS_KEY
             memcpy(data, htd->crypto.data, 4);
             DbpString("Authenticating using key:");
             memcpy(key_, htd->crypto.key, 6);
             Dbhexdump(6, key_, false);
             key = key_[5] | ((uint64_t)key_[4]) << 8 | ((uint64_t)key_[3]) << 16 | ((uint64_t)key_[2]) << 24 | ((uint64_t)key_[1]) << 32 | ((uint64_t)key_[0]) << 40;
-            break;
         }
+        break;
         default: {
             Dbprintf("Error , unknown function: %d", htf);
             return;
         }
+        break;
     }
 
     Dbprintf("Page: %d", page_);
     Dbprintf("DATA: %02X %02X %02X %02X", data[0], data[1], data[2], data[3]);
+    FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
+// Reset the return status
+    bSuccessful = false;
 
     tag.pstate = HT_READY;
     tag.tstate = HT_NO_OP;
 
+// Clean up trace and prepare it for storing frames
+    set_tracing(true);
+    clear_trace();
+
+    bQuiet = false;
+    bQuitTraceFull = true;
+
     LED_D_ON();
 
-    // Configure output and enable pin that is connected to the FPGA (for modulating)
+// Configure output and enable pin that is connected to the FPGA (for modulating)
     AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
     AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
 
-    // Set fpga in edge detect with reader field, we can modulate as reader now
-    FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_READER_FIELD);
+// Set fpga in edge detect with reader field, we can modulate as reader now
+    FpgaWriteConfWord(
+        FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_READER_FIELD);
+
+// Set Frequency divisor which will drive the FPGA and analog mux selection
     FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
     SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
+    RELAY_OFF();
 
-    // Disable modulation at default, which means enable the field
+// Disable modulation at default, which means enable the field
     LOW(GPIO_SSC_DOUT);
 
-    // Enable Peripheral Clock for
-    //   TIMER_CLOCK0, used to measure exact timing before answering
-    //   TIMER_CLOCK1, used to capture edges of the tag frames
-    AT91C_BASE_PMC->PMC_PCER |= (1 << AT91C_ID_TC0) | (1 << AT91C_ID_TC1);
+// Give it a bit of time for the resonant antenna to settle.
+    SpinDelay(30);
 
+// Enable Peripheral Clock for TIMER_CLOCK0, used to measure exact timing before answering
+    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC0);
+
+// Enable Peripheral Clock for TIMER_CLOCK1, used to capture edges of the tag frames
+    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC1);
     AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
 
-    // Disable timer during configuration
-    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
+// Disable timer during configuration
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 
-    // Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
-    // external trigger rising edge, load RA on falling edge of TIOA.
+// Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
+// external trigger rising edge, load RA on falling edge of TIOA.
     AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK
-                             | AT91C_TC_ETRGEDG_FALLING
-                             | AT91C_TC_ABETRG
+                             | AT91C_TC_ETRGEDG_FALLING | AT91C_TC_ABETRG
                              | AT91C_TC_LDRA_FALLING;
 
-    // Enable and reset counters
+// Enable and reset counters
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
-    while (AT91C_BASE_TC0->TC_CV > 0);
-
-    // Reset the received frame, frame count and timing info
+// Reset the received frame, frame count and timing info
+    frame_count = 0;
+    response = 0;
     lastbit = 1;
     bStop = false;
+
     reset_sof = 1;
     t_wait = 200;
 
-    while (!bStop && !BUTTON_PRESS() && !usb_poll_validate_length()) {
-
+    while (!bStop && !BUTTON_PRESS()) {
+        // Watchdog hit
         WDT_HIT();
 
         // Check if frame was captured and store it
         if (rxlen > 0) {
             frame_count++;
-            LogTrace(rx, nbytes(rxlen), response, 0, NULL, false);
+            if (!bQuiet) {
+                if (!LogTraceHitag(rx, rxlen, response, 0, false)) {
+                    DbpString("Trace full");
+                    if (bQuitTraceFull) {
+                        break;
+                    } else {
+                        bQuiet = true;
+                    }
+                }
+            }
         }
 
         //check for valid input
@@ -1642,7 +1711,9 @@ void WritePageHitagS(hitag_function htf, hitag_data *htd, int page_) {
         // we need to wait (T_Wait2 + half_tag_period) when the last was a 'one'.
         // All timer values are in terms of T0 units
 
-        while (AT91C_BASE_TC0->TC_CV < T0 * (t_wait + (HITAG_T_TAG_HALF_PERIOD * lastbit))) {};
+        while (AT91C_BASE_TC0->TC_CV
+                < T0 * (t_wait + (HITAG_T_TAG_HALF_PERIOD * lastbit)))
+            ;
 
         // Transmit the reader frame
         hitag_reader_send_frame(tx, txlen);
@@ -1653,7 +1724,17 @@ void WritePageHitagS(hitag_function htf, hitag_data *htd, int page_) {
         // Add transmitted frame to total count
         if (txlen > 0) {
             frame_count++;
-            LogTrace(tx, nbytes(txlen), HITAG_T_WAIT_2, 0, NULL, true);
+            if (!bQuiet) {
+                // Store the frame in the trace
+                if (!LogTraceHitag(tx, txlen, HITAG_T_WAIT_2, 0, true)) {
+                    if (bQuitTraceFull) {
+                        DbpString("Trace full");
+                        break;
+                    } else {
+                        bQuiet = true;
+                    }
+                }
+            }
         }
 
         // Reset values for receiving frames
@@ -1663,7 +1744,6 @@ void WritePageHitagS(hitag_function htf, hitag_data *htd, int page_) {
         bSkip = true;
         tag_sof = reset_sof;
         response = 0;
-        uint32_t errorCount = 0;
 
         // Receive frame, watch for at most T0*EOF periods
         while (AT91C_BASE_TC1->TC_CV < T0 * HITAG_T_WAIT_MAX) {
@@ -1714,13 +1794,9 @@ void WritePageHitagS(hitag_function htf, hitag_data *htd, int page_) {
                     }
                 } else {
                     // Ignore wierd value, is to small to mean anything
-                    errorCount++;
                 }
             }
 
-            // if we saw over 100 wierd values break it probably isn't hitag...
-            if (errorCount > 100) break;
-
             // We can break this loop if we received the last bit from a frame
             if (AT91C_BASE_TC1->TC_CV > T0 * HITAG_T_EOF) {
                 if (rxlen > 0)
@@ -1729,15 +1805,11 @@ void WritePageHitagS(hitag_function htf, hitag_data *htd, int page_) {
         }
     }
     end = false;
-    LEDsoff();
-    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-    set_tracing(false);
-
+    LED_B_OFF();
+    LED_D_OFF();
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
-
-    StartTicks();
-
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     cmd_send(CMD_ACK, bSuccessful, 0, 0, 0, 0);
 }
 
@@ -1748,16 +1820,17 @@ void WritePageHitagS(hitag_function htf, hitag_data *htd, int page_) {
  * is not received correctly due to Antenna problems. This function
  * detects these challenges.
  */
-void check_challenges(bool file_given, uint8_t *data) {
+void check_challenges(bool file_given, byte_t *data) {
     int i, j, z, k;
-    uint8_t uid_byte[4];
-    int frame_count = 0, response = 0;
-    uint8_t rx[HITAG_FRAME_LEN];
-    uint8_t unlocker[60][8];
+    byte_t uid_byte[4];
+    int frame_count;
+    int response;
+    byte_t rx[HITAG_FRAME_LEN];
+    byte_t unlocker[60][8];
     int u1 = 0;
     size_t rxlen = 0;
-    uint8_t txbuf[HITAG_FRAME_LEN];
-    uint8_t *tx = txbuf;
+    byte_t txbuf[HITAG_FRAME_LEN];
+    byte_t *tx = txbuf;
     size_t txlen = 0;
     int lastbit;
     bool bSkip;
@@ -1766,71 +1839,76 @@ void check_challenges(bool file_given, uint8_t *data) {
     int t_wait = HITAG_T_WAIT_MAX;
     int STATE = 0;
     bool bStop;
+    bool bQuitTraceFull = false;
     int response_bit[200];
     unsigned char mask = 1;
     unsigned char uid[32];
     unsigned char crc;
 
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-    // Reset the return status
+// Reset the return status
     bSuccessful = false;
 
-    // Clean up trace and prepare it for storing frames
+// Clean up trace and prepare it for storing frames
     set_tracing(true);
     clear_trace();
 
     bQuiet = false;
+    bQuitTraceFull = true;
 
     LED_D_ON();
 
-    // Configure output and enable pin that is connected to the FPGA (for modulating)
+// Configure output and enable pin that is connected to the FPGA (for modulating)
     AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
     AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
 
-    // Set fpga in edge detect with reader field, we can modulate as reader now
+// Set fpga in edge detect with reader field, we can modulate as reader now
     FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_READER_FIELD);
+    SpinDelay(50);
+
+// Set Frequency divisor which will drive the FPGA and analog mux selection
     FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
     SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
+    RELAY_OFF();
 
-    // Disable modulation at default, which means enable the field
+// Disable modulation at default, which means enable the field
     LOW(GPIO_SSC_DOUT);
 
-    // Enable Peripheral Clock for
-    //   TIMER_CLOCK0, used to measure exact timing before answering
-    //   TIMER_CLOCK1, used to capture edges of the tag frames
-    AT91C_BASE_PMC->PMC_PCER |= (1 << AT91C_ID_TC0) | (1 << AT91C_ID_TC1);
+// Give it a bit of time for the resonant antenna to settle.
+    SpinDelay(30);
 
+// Enable Peripheral Clock for TIMER_CLOCK0, used to measure exact timing before answering
+    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC0);
+
+// Enable Peripheral Clock for TIMER_CLOCK1, used to capture edges of the tag frames
+    AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC1);
     AT91C_BASE_PIOA->PIO_BSR = GPIO_SSC_FRAME;
 
-    // Disable timer during configuration
-    AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
+// Disable timer during configuration
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 
-    // TC0: Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), no triggers
-    AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK;
-
-    // TC1:  Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
-    // external trigger rising edge, load RA on falling edge of TIOA.
+// Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
+// external trigger rising edge, load RA on falling edge of TIOA.
     AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK
-                             | AT91C_TC_ETRGEDG_FALLING
-                             | AT91C_TC_ABETRG
-                             | AT91C_TC_LDRA_FALLING;
 
-    // Enable and reset counters
+                             | AT91C_TC_ETRGEDG_FALLING | AT91C_TC_ABETRG | AT91C_TC_LDRA_FALLING;
+
+// Enable and reset counters
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
-    while (AT91C_BASE_TC0->TC_CV > 0) {};
-
-    // Reset the received frame, frame count and timing info
+// Reset the received frame, frame count and timing info
+    frame_count = 0;
+    response = 0;
     lastbit = 1;
     bStop = false;
+
     reset_sof = 1;
     t_wait = 200;
 
     if (file_given) {
         DbpString("Loading challenges...");
-        memcpy((uint8_t *)unlocker, data, 60 * 8);
+        memcpy((byte_t *)unlocker, data, 60 * 8);
     }
 
     while (file_given && !bStop && !BUTTON_PRESS()) {
@@ -1840,7 +1918,16 @@ void check_challenges(bool file_given, uint8_t *data) {
         // Check if frame was captured and store it
         if (rxlen > 0) {
             frame_count++;
-            LogTrace(rx, nbytes(rxlen), response, 0, NULL, false);
+            if (!bQuiet) {
+                if (!LogTraceHitag(rx, rxlen, response, 0, false)) {
+                    DbpString("Trace full");
+                    if (bQuitTraceFull) {
+                        break;
+                    } else {
+                        bQuiet = true;
+                    }
+                }
+            }
         }
 
         tx = txbuf;
@@ -1856,7 +1943,7 @@ void check_challenges(bool file_given, uint8_t *data) {
             STATE = 0;
             txlen = 5;
             //start new authentication
-            memcpy(tx, "\xC0", nbytes(txlen));
+            memcpy(tx, "\xc0", nbytes(txlen));
         } else if (rxlen >= 67 && STATE == 0) {
             //received uid
             z = 0;
@@ -1956,7 +2043,9 @@ void check_challenges(bool file_given, uint8_t *data) {
         // we need to wait (T_Wait2 + half_tag_period) when the last was a 'one'.
         // All timer values are in terms of T0 units
 
-        while (AT91C_BASE_TC0->TC_CV < T0 * (t_wait + (HITAG_T_TAG_HALF_PERIOD * lastbit))) {};
+        while (AT91C_BASE_TC0->TC_CV
+                < T0 * (t_wait + (HITAG_T_TAG_HALF_PERIOD * lastbit)))
+            ;
 
         // Transmit the reader frame
         hitag_reader_send_frame(tx, txlen);
@@ -1967,7 +2056,17 @@ void check_challenges(bool file_given, uint8_t *data) {
         // Add transmitted frame to total count
         if (txlen > 0) {
             frame_count++;
-            LogTrace(tx, nbytes(txlen), HITAG_T_WAIT_2, 0, NULL, true);
+            if (!bQuiet) {
+                // Store the frame in the trace
+                if (!LogTraceHitag(tx, txlen, HITAG_T_WAIT_2, 0, true)) {
+                    if (bQuitTraceFull) {
+                        DbpString("Trace full");
+                        break;
+                    } else {
+                        bQuiet = true;
+                    }
+                }
+            }
         }
 
         // Reset values for receiving frames
@@ -2037,16 +2136,11 @@ void check_challenges(bool file_given, uint8_t *data) {
             }
         }
     }
-
-    LEDsoff();
-    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-    set_tracing(false);
-
+    LED_B_OFF();
+    LED_D_OFF();
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
-
-    StartTicks();
-
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     cmd_send(CMD_ACK, bSuccessful, 0, 0, 0, 0);
 }
 
diff --git a/armsrc/hitagS.h b/armsrc/hitagS.h
deleted file mode 100644
index 49a885c4c..000000000
--- a/armsrc/hitagS.h
+++ /dev/null
@@ -1,31 +0,0 @@
-//-----------------------------------------------------------------------------
-// This code is licensed to you under the terms of the GNU GPL, version 2 or,
-// at your option, any later version. See the LICENSE.txt file for the text of
-// the license.
-//-----------------------------------------------------------------------------
-// HitagS emulation (preliminary test version)
-//
-// (c) 2016 Oguzhan Cicek, Hendrik Schwartke, Ralf Spenneberg
-//     <info@os-s.de>
-//-----------------------------------------------------------------------------
-
-#ifndef _HITAGS_H_
-#define _HITAGS_H_
-
-#include <stdint.h>
-#include <stdbool.h>
-#include <stdlib.h>
-#include "hitag2_crypto.h"
-#include "hitag.h"
-#include "proxmark3.h"
-#include "apps.h"
-#include "util.h"
-#include "string.h"
-#include "BigBuf.h"
-
-void SimulateHitagSTag(bool tag_mem_supplied, uint8_t *data);
-void ReadHitagS(hitag_function htf, hitag_data *htd);
-void WritePageHitagS(hitag_function htf, hitag_data *htd, int page);
-void check_challenges(bool file_given, uint8_t *data);
-
-#endif
diff --git a/armsrc/iclass.c b/armsrc/iclass.c
index 1326306b1..7bd725eab 100644
--- a/armsrc/iclass.c
+++ b/armsrc/iclass.c
@@ -18,7 +18,7 @@
 //
 // FIX:
 // ====
-// We still have sometimes a demodulation error when sniffing iClass communication.
+// We still have sometimes a demodulation error when snooping iClass communication.
 // The resulting trace of a read-block-03 command may look something like this:
 //
 //  +  22279:    :     0c  03  e8  01
@@ -2456,4 +2456,4 @@ void iClass_Clone(uint8_t startblock, uint8_t endblock, uint8_t *data) {
 
     cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
     switch_off();
-}
+}
\ No newline at end of file
diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index f599e779c..e556e0ff1 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -2781,7 +2781,7 @@ void DetectNACKbug() {
     bool received_nack;
 
     // Mifare Classic's random generator repeats every 2^16 cycles (and so do the nonces).
-    int32_t sync_cycles = PRNG_SEQUENCE_LENGTH;
+    uint32_t sync_cycles = PRNG_SEQUENCE_LENGTH;
 
     BigBuf_free();
     BigBuf_Clear_ext(false);
diff --git a/armsrc/iso14443b.c b/armsrc/iso14443b.c
index 5d988459b..5b6a85477 100644
--- a/armsrc/iso14443b.c
+++ b/armsrc/iso14443b.c
@@ -1413,7 +1413,7 @@ static void iso1444b_setup_sniff(void) {
     FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
     BigBuf_free();
     BigBuf_Clear_ext(false);
-    clear_trace();
+    clear_trace();//setup snoop
     set_tracing(true);
 
     // Initialize Demod and Uart structs
@@ -1570,7 +1570,6 @@ void iso14b_set_trigger(bool enable) {
 void SendRawCommand14443B_Ex(UsbCommand *c) {
     iso14b_command_t param = c->arg[0];
     size_t len = c->arg[1] & 0xffff;
-    uint32_t timeout = c->arg[2];
     uint8_t *cmd = c->d.asBytes;
     uint8_t status = 0;
     uint32_t sendlen = sizeof(iso14b_card_select_t);
@@ -1587,9 +1586,6 @@ void SendRawCommand14443B_Ex(UsbCommand *c) {
         clear_trace();
     }
 
-    if ((param & ISO14B_SET_TIMEOUT))
-        iso14b_set_timeout(timeout);
-
     set_tracing(true);
 
     if ((param & ISO14B_SELECT_STD) == ISO14B_SELECT_STD) {
@@ -1638,4 +1634,4 @@ out:
         switch_off(); // disconnect raw
         SpinDelay(20);
     }
-}
+}
\ No newline at end of file
diff --git a/armsrc/iso15693.c b/armsrc/iso15693.c
index 12e9cc815..b6d53ccea 100644
--- a/armsrc/iso15693.c
+++ b/armsrc/iso15693.c
@@ -621,8 +621,8 @@ void Iso15693InitReader(void) {
 
 // Encode (into the ToSend buffers) an identify request, which is the first
 // thing that you must send to a tag to get a response.
-// It expects "out" to be at least CMD_ID_RESP large
 static void BuildIdentifyRequest(uint8_t *out) {
+
     uint8_t cmd[CMD_ID_RESP] = {0, ISO15_CMD_INVENTORY, 0, 0, 0};
     // flags
     cmd[0] = ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | ISO15_REQ_INVENTORY | ISO15_REQINV_SLOT1;
@@ -665,7 +665,6 @@ static void BuildReadBlockRequest(uint8_t **out, uint8_t *uid, uint8_t blockNumb
 */
 
 // Now the VICC>VCD responses when we are simulating a tag
-// It expects "out" to be at least CMD_INV_RESP large
 static void BuildInventoryResponse(uint8_t *out, uint8_t *uid) {
 
     uint8_t cmd[CMD_INV_RESP] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
@@ -687,7 +686,7 @@ static void BuildInventoryResponse(uint8_t *out, uint8_t *uid) {
     // CRC
     AddCrc(cmd, 10);
     CodeIso15693AsReader(cmd, CMD_INV_RESP);
-    memcpy(out, cmd, CMD_INV_RESP);
+    memcpy(out, cmd, CMD_ID_RESP);
 }
 
 // Universal Method for sending to and recv bytes from a tag
@@ -740,50 +739,50 @@ void DbdecodeIso15693Answer(int len, uint8_t *d) {
 
     if (len > 3) {
         if (d[0] & (1 << 3))
-            strncat(status, "ProtExt ", DBD15STATLEN - strlen(status));
+            strncat(status, "ProtExt ", DBD15STATLEN);
         if (d[0] & 1) {
             // error
-            strncat(status, "Error ", DBD15STATLEN - strlen(status));
+            strncat(status, "Error ", DBD15STATLEN);
             switch (d[1]) {
                 case 0x01:
-                    strncat(status, "01: not supported", DBD15STATLEN - strlen(status));
+                    strncat(status, "01: not supported", DBD15STATLEN);
                     break;
                 case 0x02:
-                    strncat(status, "02: not recognized", DBD15STATLEN - strlen(status));
+                    strncat(status, "02: not recognized", DBD15STATLEN);
                     break;
                 case 0x03:
-                    strncat(status, "03: opt not supported", DBD15STATLEN - strlen(status));
+                    strncat(status, "03: opt not supported", DBD15STATLEN);
                     break;
                 case 0x0f:
-                    strncat(status, "0F: no info", DBD15STATLEN - strlen(status));
+                    strncat(status, "0F: no info", DBD15STATLEN);
                     break;
                 case 0x10:
-                    strncat(status, "10: dont exist", DBD15STATLEN - strlen(status));
+                    strncat(status, "10: dont exist", DBD15STATLEN);
                     break;
                 case 0x11:
-                    strncat(status, "11: lock again", DBD15STATLEN - strlen(status));
+                    strncat(status, "11: lock again", DBD15STATLEN);
                     break;
                 case 0x12:
-                    strncat(status, "12: locked", DBD15STATLEN - strlen(status));
+                    strncat(status, "12: locked", DBD15STATLEN);
                     break;
                 case 0x13:
-                    strncat(status, "13: program error", DBD15STATLEN - strlen(status));
+                    strncat(status, "13: program error", DBD15STATLEN);
                     break;
                 case 0x14:
-                    strncat(status, "14: lock error", DBD15STATLEN - strlen(status));
+                    strncat(status, "14: lock error", DBD15STATLEN);
                     break;
                 default:
-                    strncat(status, "unknown error", DBD15STATLEN - strlen(status));
+                    strncat(status, "unknown error", DBD15STATLEN);
             }
-            strncat(status, " ", DBD15STATLEN - strlen(status));
+            strncat(status, " ", DBD15STATLEN);
         } else {
-            strncat(status, "No error ", DBD15STATLEN - strlen(status));
+            strncat(status, "No error ", DBD15STATLEN);
         }
 
         if (CheckCrc(d, len))
-            strncat(status, "[+] crc OK", DBD15STATLEN - strlen(status));
+            strncat(status, "[+] crc OK", DBD15STATLEN);
         else
-            strncat(status, "[!] crc fail", DBD15STATLEN - strlen(status));
+            strncat(status, "[!] crc fail", DBD15STATLEN);
 
         if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("%s", status);
     }
@@ -1000,4 +999,4 @@ void DirectTag15693Command(uint32_t datalen, uint32_t speed, uint32_t recv, uint
     } else {
         cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
     }
-}
+}
\ No newline at end of file
diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index a40e5e977..ac9f08ed3 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -21,6 +21,13 @@
 #include "common.h"
 #include "flashmem.h" // persistence on mem
 
+#ifndef SHORT_COIL
+# define SHORT_COIL() LOW(GPIO_SSC_DOUT)
+#endif
+#ifndef OPEN_COIL
+# define OPEN_COIL()  HIGH(GPIO_SSC_DOUT)
+#endif
+
 //#define START_GAP 31*8 // was 250 // SPEC:  1*8 to 50*8 - typ 15*8 (15fc)
 //#define WRITE_GAP 8*8 // 17*8 // was 160 // SPEC:  1*8 to 20*8 - typ 10*8 (10fc)
 //#define WRITE_0   15*8 // 18*8 // was 144 // SPEC: 16*8 to 32*8 - typ 24*8 (24fc)
@@ -310,7 +317,7 @@ void ReadTItag(void) {
                 // expected for either the low or high frequency
                 if ((samples > (sampleslo - threshold)) && (samples < (sampleslo + threshold))) {
                     // low frequency represents a 1
-                    shift3 |= (1u << 31);
+                    shift3 |= (1 << 31);
                 } else if ((samples > (sampleshi - threshold)) && (samples < (sampleshi + threshold))) {
                     // high frequency represents a 0
                 } else {
@@ -474,7 +481,7 @@ void AcquireTiType(void) {
     // unpack buffer
     for (i = TIBUFLEN - 1; i >= 0; i--) {
         for (j = 0; j < 32; j++) {
-            if (buf[i] & (1u << j)) {
+            if (buf[i] & (1 << j)) {
                 dest[--n] = 1;
             } else {
                 dest[--n] = -1;
@@ -723,6 +730,8 @@ static void fcAll(uint8_t fc, int *n, uint8_t clock, uint16_t *modCnt) {
     uint8_t halfFC = fc >> 1;
     uint8_t wavesPerClock = clock / fc;
     uint8_t mod = clock % fc;    //modifier
+    uint8_t modAdj = fc / mod;   //how often to apply modifier
+    bool modAdjOk = !(fc % mod); //if (fc % mod==0) modAdjOk = true;
 
     // loop through clock - step field clock
     for (uint8_t idx = 0; idx < wavesPerClock; idx++) {
@@ -731,24 +740,20 @@ static void fcAll(uint8_t fc, int *n, uint8_t clock, uint16_t *modCnt) {
         memset(dest + (*n) + (fc - halfFC), 1, halfFC);
         *n += fc;
     }
-    if (mod > 0) {
-        uint8_t modAdj = fc / mod;   //how often to apply modifier
-        bool modAdjOk = !(fc % mod); //if (fc % mod==0) modAdjOk = true;
-        (*modCnt)++;
+    if (mod > 0)(*modCnt)++;
 
-        if (modAdjOk) { //fsk2
-            if ((*modCnt % modAdj) == 0) { //if 4th 8 length wave in a rf/50 add extra 8 length wave
-                memset(dest + (*n), 0, fc - halfFC);
-                memset(dest + (*n) + (fc - halfFC), 1, halfFC);
-                *n += fc;
-            }
-        }
-        if (!modAdjOk) { //fsk1
-            memset(dest + (*n), 0, mod - (mod >> 1));
-            memset(dest + (*n) + (mod - (mod >> 1)), 1, mod >> 1);
-            *n += mod;
+    if ((mod > 0) && modAdjOk) { //fsk2
+        if ((*modCnt % modAdj) == 0) { //if 4th 8 length wave in a rf/50 add extra 8 length wave
+            memset(dest + (*n), 0, fc - halfFC);
+            memset(dest + (*n) + (fc - halfFC), 1, halfFC);
+            *n += fc;
         }
     }
+    if (mod > 0 && !modAdjOk) { //fsk1
+        memset(dest + (*n), 0, mod - (mod >> 1));
+        memset(dest + (*n) + (mod - (mod >> 1)), 1, mod >> 1);
+        *n += mod;
+    }
 }
 
 // prepare a waveform pattern in the buffer based on the ID given then
@@ -824,7 +829,7 @@ void CmdHIDsimTAG(uint32_t hi, uint32_t lo, int ledcontrol) {
 // prepare a waveform pattern in the buffer based on the ID given then
 // simulate a FSK tag until the button is pressed
 // arg1 contains fcHigh and fcLow, arg2 contains STT marker and clock
-void CmdFSKsimTAG(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *bits, int ledcontrol) {
+void CmdFSKsimTAG(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *bits) {
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
 
     // free eventually allocated BigBuf memory
@@ -833,7 +838,7 @@ void CmdFSKsimTAG(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *bits, int
     clear_trace();
     set_tracing(false);
 
-    int n = 0, i = 0;
+    int ledcontrol = 1, n = 0, i = 0;
     uint8_t fcHigh = arg1 >> 8;
     uint8_t fcLow = arg1 & 0xFF;
     uint16_t modCnt = 0;
@@ -901,11 +906,11 @@ static void stAskSimBit(int *n, uint8_t clock) {
 }
 
 // args clock, ask/man or askraw, invert, transmission separator
-void CmdASKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream, int ledcontrol) {
+void CmdASKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream) {
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
     set_tracing(false);
 
-    int n = 0, i = 0;
+    int ledcontrol = 1, n = 0, i = 0;
     uint8_t clk = (arg1 >> 8) & 0xFF;
     uint8_t encoding = arg1 & 0xFF;
     uint8_t separator = arg2 & 1;
@@ -968,11 +973,11 @@ static void pskSimBit(uint8_t waveLen, int *n, uint8_t clk, uint8_t *curPhase, b
 }
 
 // args clock, carrier, invert,
-void CmdPSKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream, int ledcontrol) {
+void CmdPSKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream) {
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
     set_tracing(false);
 
-    int n = 0, i = 0;
+    int ledcontrol = 1, n = 0, i = 0;
     uint8_t clk = arg1 >> 8;
     uint8_t carrier = arg1 & 0xFF;
     uint8_t invert = arg2 & 0xFF;
@@ -1061,8 +1066,12 @@ void CmdHIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol)
                     }
                 } else { //if bit 38 is not set then 37 bit format is used
                     bitlen = 37;
-                    cardnum = (lo >> 1) & 0x7FFFF;
-                    fc = ((hi & 0xF) << 12) | (lo >> 20);
+                    fc = 0;
+                    cardnum = 0;
+                    if (bitlen == 37) {
+                        cardnum = (lo >> 1) & 0x7FFFF;
+                        fc = ((hi & 0xF) << 12) | (lo >> 20);
+                    }
                 }
                 Dbprintf("TAG ID: %x%08x (%d) - Format Len: %dbit - FC: %d - Card: %d",
                          hi,
@@ -1373,6 +1382,8 @@ void T55xxResetRead(void) {
     //clear buffer now so it does not interfere with timing later
     BigBuf_Clear_keep_EM();
 
+    StartTicks();
+
     // Set up FPGA, 125kHz
     LFSetupFPGAForADC(95, true);
     // make sure tag is fully powered up...
@@ -1405,6 +1416,8 @@ void T55xxWriteBlockExt(uint32_t Data, uint8_t Block, uint32_t Pwd, uint8_t arg)
     bool testMode = arg & 0x4;
     uint32_t i = 0;
 
+    StartTicks();
+
     // Set up FPGA, 125kHz
     LFSetupFPGAForADC(95, true);
 
@@ -1478,7 +1491,7 @@ void T55xxWriteBlock(uint32_t Data, uint8_t Block, uint32_t Pwd, uint8_t arg) {
 // Read one card block in page [page]
 void T55xxReadBlock(uint16_t arg0, uint8_t Block, uint32_t Pwd) {
     LED_A_ON();
-    bool PwdMode = arg0 & 0x1;
+    bool PwdMode =    arg0 & 0x1;
     uint8_t Page = (arg0 & 0x2) >> 1;
     bool brute_mem =  arg0 & 0x4;
 
@@ -1500,6 +1513,8 @@ void T55xxReadBlock(uint16_t arg0, uint8_t Block, uint32_t Pwd) {
     //make sure block is at max 7
     Block &= 0x7;
 
+    StartTicks();
+
     // Set up FPGA, 125kHz to power up the tag
     LFSetupFPGAForADC(95, true);
     // make sure tag is fully powered up...
@@ -1576,23 +1591,26 @@ void T55xx_ChkPwds() {
     uint32_t candidate = 0;
 
 #ifdef WITH_FLASH
-    BigBuf_Clear_EM();
-    uint16_t isok = 0;
-    uint8_t counter[2] = {0x00, 0x00};
-    isok = Flash_ReadData(DEFAULT_T55XX_KEYS_OFFSET, counter, sizeof(counter));
-    if (isok != sizeof(counter))
-        goto OUT;
+    bool use_flashmem = true;
+    if (use_flashmem) {
+        BigBuf_Clear_EM();
+        uint16_t isok = 0;
+        uint8_t counter[2] = {0x00, 0x00};
+        isok = Flash_ReadData(DEFAULT_T55XX_KEYS_OFFSET, counter, sizeof(counter));
+        if (isok != sizeof(counter))
+            goto OUT;
 
-    pwdCount = counter[1] << 8 | counter[0];
+        pwdCount = counter[1] << 8 | counter[0];
 
-    if (pwdCount == 0 || pwdCount == 0xFFFF)
-        goto OUT;
+        if (pwdCount == 0 && pwdCount == 0xFFFF)
+            goto OUT;
 
-    isok = Flash_ReadData(DEFAULT_T55XX_KEYS_OFFSET + 2, pwds, pwdCount * 4);
-    if (isok != pwdCount * 4)
-        goto OUT;
+        isok = Flash_ReadData(DEFAULT_T55XX_KEYS_OFFSET + 2, pwds, pwdCount * 4);
+        if (isok != pwdCount * 4)
+            goto OUT;
 
-    Dbprintf("[=] Password dictionary count %d ", pwdCount);
+        Dbprintf("[=] Password dictionary count %d ", pwdCount);
+    }
 #endif
 
     uint32_t pwd = 0, curr = 0, prev = 0;
@@ -1643,6 +1661,8 @@ void T55xxWakeUp(uint32_t Pwd) {
     LED_B_ON();
     uint32_t i = 0;
 
+    StartTicks();
+
     // Set up FPGA, 125kHz
     LFSetupFPGAForADC(95, true);
     // make sure tag is fully powered up...
diff --git a/armsrc/lfsampling.c b/armsrc/lfsampling.c
index 7018fbae2..53b8e75b3 100644
--- a/armsrc/lfsampling.c
+++ b/armsrc/lfsampling.c
@@ -29,7 +29,7 @@ void printConfig() {
 
 /**
  * Called from the USB-handler to set the sampling configuration
- * The sampling config is used for std reading and sniffing.
+ * The sampling config is used for std reading and snooping.
  *
  * Other functions may read samples and ignore the sampling config,
  * such as functions to read the UID from a prox tag or similar.
@@ -239,9 +239,9 @@ uint32_t ReadLF(bool activeField, bool silent, int sample_size) {
     if (!silent)
         printConfig();
     LFSetupFPGAForADC(config.divisor, activeField);
-    uint32_t ret = DoAcquisition_config(silent, sample_size);
-    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-    return ret;
+	uint32_t ret = DoAcquisition_config(silent, sample_size);
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+	return ret;
 }
 
 /**
@@ -250,15 +250,15 @@ uint32_t ReadLF(bool activeField, bool silent, int sample_size) {
 **/
 uint32_t SampleLF(bool printCfg, int sample_size) {
     BigBuf_Clear_ext(false);
-    return ReadLF(true, printCfg, sample_size);
+	return ReadLF(true, printCfg, sample_size);
 }
 /**
-* Initializes the FPGA for sniffer-mode (field off), and acquires the samples.
+* Initializes the FPGA for snoop-mode (field off), and acquires the samples.
 * @return number of bits sampled
 **/
-uint32_t SniffLF() {
+uint32_t SnoopLF() {
     BigBuf_Clear_ext(false);
-    return ReadLF(false, true, 0);
+	return ReadLF(false, true, 0);
 }
 
 /**
@@ -427,10 +427,12 @@ uint32_t doCotagAcquisitionManchester() {
             if (sample > COTAG_ONE_THRESHOLD) {
                 prev = curr;
                 curr = 1;
-            } else if (sample < COTAG_ZERO_THRESHOLD) {
+			}
+			else if ( sample < COTAG_ZERO_THRESHOLD) {
                 prev = curr;
                 curr = 0;
-            } else {
+			}
+			else {
                 curr = prev;
             }
 
diff --git a/armsrc/lfsampling.h b/armsrc/lfsampling.h
index 8556cd327..94c370ed9 100644
--- a/armsrc/lfsampling.h
+++ b/armsrc/lfsampling.h
@@ -30,10 +30,10 @@ void doT55x7Acquisition(size_t sample_size);
 uint32_t SampleLF(bool silent, int sample_size);
 
 /**
-* Initializes the FPGA for sniff-mode (field off), and acquires the samples.
+* Initializes the FPGA for snoop-mode (field off), and acquires the samples.
 * @return number of bits sampled
 **/
-uint32_t SniffLF();
+uint32_t SnoopLF();
 
 // adds sample size to default options
 uint32_t DoPartialAcquisition(int trigger_threshold, bool silent, int sample_size, uint32_t cancel_after);
@@ -67,7 +67,7 @@ void LFSetupFPGAForADC(int divisor, bool lf_field);
 
 /**
  * Called from the USB-handler to set the sampling configuration
- * The sampling config is used for std reading and sniffing.
+ * The sampling config is used for std reading and snooping.
  *
  * Other functions may read samples and ignore the sampling config,
  * such as functions to read the UID from a prox tag or similar.
diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index 9e771679b..1f1932e27 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -1247,7 +1247,7 @@ void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *da
 
         keyCount = size[1] << 8 | size[0];
 
-        if (keyCount == 0 || keyCount == 0xFFFF)
+        if (keyCount == 0 && keyCount == 0xFFFF)
             goto OUT;
 
         datain = BigBuf_malloc(keyCount * 6);
@@ -2098,4 +2098,4 @@ void Mifare_DES_Auth2(uint32_t arg0, uint8_t *datain) {
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     LEDsoff();
     set_tracing(false);
-}
+}
\ No newline at end of file
diff --git a/armsrc/mifarecmd.h b/armsrc/mifarecmd.h
index 51ed76ca5..595d46395 100644
--- a/armsrc/mifarecmd.h
+++ b/armsrc/mifarecmd.h
@@ -25,4 +25,4 @@
 #include "crc.h"
 #include "protocols.h"
 #include "parity.h"
-#endif
+#endif
\ No newline at end of file
diff --git a/armsrc/mifaresniff.c b/armsrc/mifaresniff.c
index 0e75aac35..8f391207e 100644
--- a/armsrc/mifaresniff.c
+++ b/armsrc/mifaresniff.c
@@ -322,4 +322,4 @@ void RAMFUNC MfSniffSend() {
     LED_B_ON();
     cmd_send(CMD_ACK, 2, 0, 0, 0, 0);  // 2 == data transfer finished.
     LED_B_OFF();
-}
+}
\ No newline at end of file
diff --git a/armsrc/mifaresniff.h b/armsrc/mifaresniff.h
index 9b5cb8609..debfd5a09 100644
--- a/armsrc/mifaresniff.h
+++ b/armsrc/mifaresniff.h
@@ -39,4 +39,4 @@ bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint8_t *parity, ui
 void RAMFUNC MfSniffSend(void);
 void MfSniffEnd(void);
 
-#endif
+#endif
\ No newline at end of file
diff --git a/armsrc/pcf7931.c b/armsrc/pcf7931.c
index 90a6f5d64..ef371b233 100644
--- a/armsrc/pcf7931.c
+++ b/armsrc/pcf7931.c
@@ -518,4 +518,4 @@ bool AddPatternPCF7931(uint32_t a, uint32_t b, uint32_t c, uint32_t *tab) {
     tab[u + 2] = c + tab[u + 1];
 
     return 0;
-}
+}
\ No newline at end of file
diff --git a/armsrc/pcf7931.h b/armsrc/pcf7931.h
index b8121c29f..bed33dadc 100644
--- a/armsrc/pcf7931.h
+++ b/armsrc/pcf7931.h
@@ -17,4 +17,4 @@ bool AddBitPCF7931(bool b, uint32_t *tab, int32_t l, int32_t p);
 bool AddPatternPCF7931(uint32_t a, uint32_t b, uint32_t c, uint32_t *tab);
 void WritePCF7931(uint8_t pass1, uint8_t pass2, uint8_t pass3, uint8_t pass4, uint8_t pass5, uint8_t pass6, uint8_t pass7, uint16_t init_delay, int32_t l, int32_t p, uint8_t address, uint8_t byte, uint8_t data);
 
-#endif
+#endif
\ No newline at end of file
diff --git a/armsrc/start.c b/armsrc/start.c
index b5947bdf3..a6503f1ea 100644
--- a/armsrc/start.c
+++ b/armsrc/start.c
@@ -77,4 +77,4 @@ void __attribute__((section(".startos"))) Vector(void) {
 
     AppMain();
 }
-#endif
+#endif
\ No newline at end of file
diff --git a/armsrc/string.h b/armsrc/string.h
index f6f094c48..de8f3ac20 100644
--- a/armsrc/string.h
+++ b/armsrc/string.h
@@ -24,4 +24,4 @@ char *strcat(char *dest, const char *src);
 void strreverse(char s[]);
 void itoa(int n, char s[]);
 
-#endif /* __STRING_H */
+#endif /* __STRING_H */
\ No newline at end of file
diff --git a/armsrc/ticks.h b/armsrc/ticks.h
index d24d2aac5..6e5e334f0 100644
--- a/armsrc/ticks.h
+++ b/armsrc/ticks.h
@@ -44,4 +44,4 @@ extern void WaitUS(uint16_t us);
 extern void WaitMS(uint16_t ms);
 
 extern void StopTicks(void);
-#endif
+#endif
\ No newline at end of file
diff --git a/armsrc/util.h b/armsrc/util.h
index 15f93d1f9..19b104f51 100644
--- a/armsrc/util.h
+++ b/armsrc/util.h
@@ -17,18 +17,7 @@
 #include "BigBuf.h"
 #include "ticks.h"
 
-// Basic macros
-#ifndef SHORT_COIL
-#define SHORT_COIL()     LOW(GPIO_SSC_DOUT)
-#endif
-
-#ifndef OPEN_COIL
-#define OPEN_COIL()      HIGH(GPIO_SSC_DOUT)
-#endif
-
-#ifndef BYTEx
 #define BYTEx(x, n) (((x) >> (n * 8)) & 0xff )
-#endif
 
 #define LED_RED 1
 #define LED_ORANGE 2
@@ -54,34 +43,6 @@
 # define NTIME(n) for (int _index = 0; _index < n; _index++)
 #endif
 
-#ifndef REV8
-#define REV8(x) ((((x)>>7)&1)+((((x)>>6)&1)<<1)+((((x)>>5)&1)<<2)+((((x)>>4)&1)<<3)+((((x)>>3)&1)<<4)+((((x)>>2)&1)<<5)+((((x)>>1)&1)<<6)+(((x)&1)<<7))
-#endif
-
-#ifndef REV16
-#define REV16(x)        (REV8(x) + (REV8 (x >> 8) << 8))
-#endif
-
-#ifndef REV32
-#define REV32(x)        (REV16(x) + (REV16(x >> 16) << 16))
-#endif
-
-#ifndef REV64
-#define REV64(x)        (REV32(x) + (REV32(x >> 32) << 32))
-#endif
-
-#ifndef BIT32
-#define BIT32(x,n)      ((((x)[(n)>>5])>>((n)))&1)
-#endif
-
-#ifndef INV32
-#define INV32(x,i,n)    ((x)[(i)>>5]^=((uint32_t)(n))<<((i)&31))
-#endif
-
-#ifndef ROTL64
-#define ROTL64(x, n)    ((((uint64_t)(x))<<((n)&63))+(((uint64_t)(x))>>((0-(n))&63)))
-#endif
-
 size_t nbytes(size_t nbits);
 
 extern uint32_t reflect(uint32_t v, int b); // used in crc.c ...
diff --git a/client/amiitool/amiitool.c b/client/amiitool/amiitool.c
index 78c8f4d1e..a687cb0b1 100644
--- a/client/amiitool/amiitool.c
+++ b/client/amiitool/amiitool.c
@@ -8,7 +8,7 @@
 #include <amiibo.h>
 #include <stdio.h>
 #include <string.h>
-#include "../loclass/fileutils.h"
+#include "../loclass/fileutil.h"
 
 #define NTAG215_SIZE 540
 
diff --git a/client/cli.c b/client/cli.c
index 270689732..19e472586 100644
--- a/client/cli.c
+++ b/client/cli.c
@@ -21,7 +21,7 @@ int main(int argc, char **argv) {
     if (argc != 3 && argc != 4) {
         printf("\n\tusage: cli <command 1> <command 2> [logfile (default cli.log)]\n");
         printf("\n");
-        printf("\texample: cli hf 14a sniff hf 14a list h14a.log\n");
+        printf("\texample: cli hi14asnoop hi14alist h14a.log\n");
         printf("\n");
         return -1;
     }
diff --git a/client/cmdcrc.c b/client/cmdcrc.c
index be74fc39a..1a17d1428 100644
--- a/client/cmdcrc.c
+++ b/client/cmdcrc.c
@@ -483,4 +483,4 @@ int CmdrevengSearch(const char *Cmd) {
 
     if (!found) PrintAndLogEx(FAILED, "\nno matches found\n");
     return 1;
-}
+}
\ No newline at end of file
diff --git a/client/cmddata.c b/client/cmddata.c
index aa44611ed..5aeaca388 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -417,16 +417,18 @@ int CmdPrintDemodBuff(const char *Cmd) {
         return 0;
     }
     length = (length > (DemodBufferLen - offset)) ? DemodBufferLen - offset : length;
+    int numBits = (length) & 0x00FFC; //make sure we don't exceed our string
 
     if (hexMode) {
         char *buf = (char *)(DemodBuffer + offset);
-        int numBits = binarraytohex(hex, sizeof(hex), buf, length);
+        numBits = (numBits > sizeof(hex)) ? sizeof(hex) : numBits;
+        numBits = binarraytohex(hex, buf, numBits);
         if (numBits == 0) {
             return 0;
         }
         PrintAndLogEx(NORMAL, "DemodBuffer: %s", hex);
     } else {
-        PrintAndLogEx(NORMAL, "DemodBuffer:\n%s", sprint_bin_break(DemodBuffer + offset, length, 16));
+        PrintAndLogEx(NORMAL, "DemodBuffer:\n%s", sprint_bin_break(DemodBuffer + offset, numBits, 16));
     }
     return 1;
 }
@@ -473,15 +475,14 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
 
     size_t BitLen = getFromGraphBuf(bits);
 
-    PrintAndLogEx(DEBUG, "DEBUG: (ASKDemod_ext) #samples from graphbuff: %d", BitLen);
+    PrintAndLogEx(DEBUG, "DEBUG: (ASKDemod_ext) Bitlen from grphbuff: %d", BitLen);
 
     if (BitLen < 255) return 0;
 
     if (maxLen < BitLen && maxLen != 0) BitLen = maxLen;
 
     int foundclk = 0;
-
-    //amplify signal before ST check
+    //amp before ST check
     if (amp == 'a')
         askAmp(bits, BitLen);
 
@@ -495,8 +496,8 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
         clk = (clk == 0) ? foundclk : clk;
         CursorCPos = ststart;
         CursorDPos = stend;
-        if (verbose)
-            PrintAndLogEx(DEBUG, "Found Sequence Terminator - First one is shown by orange / blue graph markers");
+        if (verbose || g_debugMode)
+            PrintAndLogEx(NORMAL, "Found Sequence Terminator - First one is shown by orange and blue graph markers");
     }
 
     int startIdx = 0;
@@ -512,19 +513,19 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
         return 0;
     }
 
-    if (verbose) PrintAndLogEx(DEBUG, "DEBUG: (ASKDemod_ext) Using clock:%d, invert:%d, bits found:%d", clk, invert, BitLen);
+    if (verbose || g_debugMode) PrintAndLogEx(DEBUG, "DEBUG: (ASKDemod_ext) Using clock:%d, invert:%d, bits found:%d", clk, invert, BitLen);
 
     //output
     setDemodBuf(bits, BitLen, 0);
     setClockGrid(clk, startIdx);
 
-    if (verbose) {
+    if (verbose || g_debugMode) {
         if (errCnt > 0)
-            PrintAndLogEx(DEBUG, "# Errors during Demoding (shown as 7 in bit stream): %d", errCnt);
+            PrintAndLogEx(NORMAL, "# Errors during Demoding (shown as 7 in bit stream): %d", errCnt);
         if (askType)
-            PrintAndLogEx(DEBUG, "ASK/Manchester - Clock: %d - Decoded bitstream:", clk);
+            PrintAndLogEx(NORMAL, "ASK/Manchester - Clock: %d - Decoded bitstream:", clk);
         else
-            PrintAndLogEx(DEBUG, "ASK/Raw - Clock: %d - Decoded bitstream:", clk);
+            PrintAndLogEx(NORMAL, "ASK/Raw - Clock: %d - Decoded bitstream:", clk);
         // Now output the bitstream to the scrollback by line of 16 bits
         printDemodBuff();
     }
@@ -623,7 +624,7 @@ int CmdBiphaseDecodeRaw(const char *Cmd) {
 
     sscanf(Cmd, "%i %i %i", &offset, &invert, &maxErr);
     if (DemodBufferLen == 0) {
-        PrintAndLogEx(WARNING, "DemodBuffer Empty - run " _YELLOW_("'data rawdemod ar'")" first");
+        PrintAndLogEx(NORMAL, "DemodBuffer Empty - run 'data rawdemod ar' first");
         return 0;
     }
 
@@ -642,7 +643,7 @@ int CmdBiphaseDecodeRaw(const char *Cmd) {
     }
 
     if (errCnt > 0)
-        PrintAndLogEx(WARNING, "# Errors found during Demod (shown as " _YELLOW_("7")" in bit stream): %d", errCnt);
+        PrintAndLogEx(WARNING, "# Errors found during Demod (shown as 7 in bit stream): %d", errCnt);
 
     PrintAndLogEx(NORMAL, "Biphase Decoded using offset: %d - # invert:%d - data:", offset, invert);
     PrintAndLogEx(NORMAL, "%s", sprint_bin_break(bits, size, 16));
@@ -715,7 +716,7 @@ int AutoCorrelate(const int *in, int *out, size_t len, int window, bool SaveGrph
     // sanity check
     if (window > len) window = len;
 
-    if (verbose) PrintAndLogEx(INFO, "performing " _YELLOW_("%d")" correlations", GraphTraceLen - window);
+    if (verbose) PrintAndLogEx(INFO, "performing %d correlations", GraphTraceLen - window);
 
     //test
     double autocv = 0.0;    // Autocovariance value
@@ -768,11 +769,10 @@ int AutoCorrelate(const int *in, int *out, size_t len, int window, bool SaveGrph
     }
 
     int foo = ABS(hi - hi_1);
-    int bar = (int)((int)((hi + hi_1) / 2) * 0.04);
-
+    int bar = (int)((int)((hi + hi_1) / 2) * 0.03);
     if (verbose && foo < bar) {
         distance = idx_1 - idx;
-        PrintAndLogEx(SUCCESS, "possible 4% visible correlation %4d samples", distance);
+        PrintAndLogEx(SUCCESS, "possible 3% visible correlation %4d samples", distance);
     } else if (verbose && (correlation > 1)) {
         PrintAndLogEx(SUCCESS, "possible correlation %4d samples", correlation);
     } else {
@@ -1069,7 +1069,7 @@ int FSKrawDemod(const char *Cmd, bool verbose) {
         }
         return 1;
     } else {
-        PrintAndLogEx(DEBUG, "no FSK data found");
+        if (g_debugMode) PrintAndLogEx(NORMAL, "no FSK data found");
     }
     return 0;
 }
@@ -1128,7 +1128,7 @@ int PSKDemod(const char *Cmd, bool verbose) {
     return 1;
 }
 
-int CmdIdteckDemod(const char *Cmd) {
+int CmdPSKIdteck(const char *Cmd) {
 
     if (!PSKDemod("", false)) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - Idteck PSKDemod failed");
diff --git a/client/cmddata.h b/client/cmddata.h
index 1091c48c2..86f19d81d 100644
--- a/client/cmddata.h
+++ b/client/cmddata.h
@@ -54,7 +54,7 @@ int CmdDetectClockRate(const char *Cmd);
 int CmdFSKrawdemod(const char *Cmd);
 int CmdPSK1rawDemod(const char *Cmd);
 int CmdPSK2rawDemod(const char *Cmd);
-int CmdIdteckDemod(const char *Cmd);
+int CmdPSKIdteck(const char *Cmd);
 int CmdGrid(const char *Cmd);
 int CmdGetBitStream(const char *Cmd);
 int CmdHexsamples(const char *Cmd);
diff --git a/client/cmdflashmem.c b/client/cmdflashmem.c
index c75fadb3c..0701f1d2d 100644
--- a/client/cmdflashmem.c
+++ b/client/cmdflashmem.c
@@ -245,7 +245,7 @@ int CmdFlashMemLoad(const char *Cmd) {
             break;
         default:
 
-            res = loadFile(filename, "bin", data, FLASH_MEM_MAX_SIZE, &datalen);
+            res = loadFile(filename, "bin", data, &datalen);
             //int res = loadFileEML( filename, "eml", data, &datalen);
             if (res) {
                 free(data);
diff --git a/client/cmdflashmem.h b/client/cmdflashmem.h
index 099a4e3b1..0a56ebed4 100644
--- a/client/cmdflashmem.h
+++ b/client/cmdflashmem.h
@@ -42,4 +42,4 @@ extern int CmdFlashMemWipe(const char *Cmd);
 extern int CmdFlashMemInfo(const char *Cmd);
 #endif
 
-#endif
+#endif
\ No newline at end of file
diff --git a/client/cmdhf.c b/client/cmdhf.c
index 8368160f8..237149348 100644
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -21,7 +21,7 @@ int usage_hf_search() {
     return 0;
 }
 int usage_hf_sniff() {
-    PrintAndLogEx(NORMAL, "The high frequence sniffer will assign all available memory on device for sniffed data");
+    PrintAndLogEx(NORMAL, "The high frequence snoop will assign all available memory on device for sniffed data");
     PrintAndLogEx(NORMAL, "Use " _YELLOW_("'data samples'")" command to download from device,  and " _YELLOW_("'data plot'")" to look at it");
     PrintAndLogEx(NORMAL, "Press button to quit the sniffing.\n");
     PrintAndLogEx(NORMAL, "Usage: hf sniff <skip pairs> <skip triggers>");
@@ -42,7 +42,7 @@ int CmdHFSearch(const char *Cmd) {
     if (cmdp == 'h') return usage_hf_search();
 
     PrintAndLogEx(INFO, "Checking for known tags...\n");
-
+        
     int ans = CmdHF14AInfo("s");
     if (ans > 0) {
         PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("ISO14443-A tag") " found\n");
diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 6dd7149f2..6d4b39e4e 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -803,7 +803,7 @@ int CmdHF14ASniff(const char *Cmd) {
         if (ctmp == 'c') param |= 0x01;
         if (ctmp == 'r') param |= 0x02;
     }
-    UsbCommand c = {CMD_SNIFF_ISO_14443a, {param, 0, 0}};
+    UsbCommand c = {CMD_SNOOP_ISO_14443a, {param, 0, 0}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c
index 9d542f228..564b18012 100644
--- a/client/cmdhf14b.c
+++ b/client/cmdhf14b.c
@@ -33,7 +33,7 @@ int usage_hf_14b_reader(void) {
     return 0;
 }
 int usage_hf_14b_raw(void) {
-    PrintAndLogEx(NORMAL, "Usage: hf 14b raw [-h] [-r] [-c] [-p] [-s / -ss] [-t] <0A 0B 0C ... hex>");
+    PrintAndLogEx(NORMAL, "Usage: hf 14b raw [-h] [-r] [-c] [-p] [-s || -ss] <0A 0B 0C ... hex>");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       -h    this help");
     PrintAndLogEx(NORMAL, "       -r    do not read response");
@@ -41,7 +41,6 @@ int usage_hf_14b_raw(void) {
     PrintAndLogEx(NORMAL, "       -p    leave the field on after receive");
     PrintAndLogEx(NORMAL, "       -s    active signal field ON with select");
     PrintAndLogEx(NORMAL, "       -ss   active signal field ON with select for SRx ST Microelectronics tags");
-    PrintAndLogEx(NORMAL, "       -t    timeout in ms");
     PrintAndLogEx(NORMAL, "Example:");
     PrintAndLogEx(NORMAL, "       hf 14b raw -s -c -p 0200a40400");
     return 0;
@@ -146,20 +145,20 @@ int CmdHF14BSniff(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_hf_14b_sniff();
 
-    UsbCommand c = {CMD_SNIFF_ISO_14443B, {0, 0, 0}};
+    UsbCommand c = {CMD_SNOOP_ISO_14443B, {0, 0, 0}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
 }
 
 int CmdHF14BCmdRaw(const char *Cmd) {
-    bool reply = true, power = false, select = false, hasTimeout = false;
+    bool reply = true, power = false, select = false;
     char buf[5] = "";
     int i = 0;
     uint8_t data[USB_CMD_DATA_SIZE] = {0x00};
     uint16_t datalen = 0;
     uint32_t flags = ISO14B_CONNECT;
-    uint32_t temp = 0, user_timeout = 0, time_wait = 0;
+    uint32_t temp = 0;
 
     if (strlen(Cmd) < 3) return usage_hf_14b_raw();
 
@@ -190,13 +189,6 @@ int CmdHF14BCmdRaw(const char *Cmd) {
                         flags |= ISO14B_SELECT_STD;
                     }
                     break;
-                case 't':
-                    hasTimeout = true;
-                    sscanf(Cmd + i + 2, "%d", &user_timeout);
-                    i += 3;
-                    while (Cmd[i] != ' ' && Cmd[i] != '\0') { i++; }
-                    i -= 2;
-                    break;
                 default:
                     return usage_hf_14b_raw();
             }
@@ -222,17 +214,7 @@ int CmdHF14BCmdRaw(const char *Cmd) {
         return 0;
     }
 
-    if (hasTimeout) {
-#define MAX_TIMEOUT 40542464 // = (2^32-1) * (8*16) / 13560000Hz * 1000ms/s
-        flags |= ISO14B_SET_TIMEOUT;
-        if (user_timeout > MAX_TIMEOUT) {
-            user_timeout = MAX_TIMEOUT;
-            PrintAndLogEx(NORMAL, "Set timeout to 40542 seconds (11.26 hours). The max we can wait for response");
-        }
-        time_wait = 13560000 / 1000 / (8 * 16) * user_timeout; // timeout in ETUs (time to transfer 1 bit, approx. 9.4 us)
-    }
-
-    if (power == 0)
+    if (!power)
         flags |= ISO14B_DISCONNECT;
 
     if (datalen > 0)
@@ -241,7 +223,7 @@ int CmdHF14BCmdRaw(const char *Cmd) {
     // Max buffer is USB_CMD_DATA_SIZE
     datalen = (datalen > USB_CMD_DATA_SIZE) ? USB_CMD_DATA_SIZE : datalen;
 
-    UsbCommand c = {CMD_ISO_14443B_COMMAND, {flags, datalen, time_wait}};
+    UsbCommand c = {CMD_ISO_14443B_COMMAND, {flags, datalen, 0}};
     memcpy(c.d.asBytes, data, datalen);
     clearCommandBuffer();
     SendCommand(&c);
diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index 23a756062..2e784962c 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -684,15 +684,15 @@ int CmdHF15Dump(const char *Cmd) {
     //Validations
     if (errors) return usage_15_dump();
 
-    if (!getUID(uid)) {
-        PrintAndLogEx(WARNING, "No tag found.");
-        return 1;
-    }
-
     if (fileNameLen < 1) {
 
         PrintAndLogEx(INFO, "Using UID as filename");
 
+        if (!getUID(uid)) {
+            PrintAndLogEx(WARNING, "No tag found.");
+            return 1;
+        }
+
         fptr += sprintf(fptr, "hf-15-");
         FillFileNameByUID(fptr, uid, "-dump", sizeof(uid));
     }
@@ -796,7 +796,7 @@ int CmdHF15Restore(const char *Cmd) {
                     case '2':
                     case 'o':
                         strncpy(newCmdPrefix, " ", sizeof(newCmdPrefix) - 1);
-                        strncat(newCmdPrefix, param, sizeof(newCmdPrefix) - strlen(newCmdPrefix) - 1);
+                        strncat(newCmdPrefix, param, sizeof(newCmdPrefix) - 1);
                         break;
                     default:
                         PrintAndLogEx(WARNING, "Unknown parameter '%s'", param);
@@ -1315,4 +1315,4 @@ int CmdHF15(const char *Cmd) {
 int CmdHF15Help(const char *Cmd) {
     CmdsHelp(CommandTable15);
     return 0;
-}
+}
\ No newline at end of file
diff --git a/client/cmdhfepa.c b/client/cmdhfepa.c
index 0386155c1..fce18f11b 100644
--- a/client/cmdhfepa.c
+++ b/client/cmdhfepa.c
@@ -176,4 +176,4 @@ int CmdHFEPA(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
-}
+}
\ No newline at end of file
diff --git a/client/cmdhffelica.c b/client/cmdhffelica.c
index 33d506a58..59ddc5d65 100644
--- a/client/cmdhffelica.c
+++ b/client/cmdhffelica.c
@@ -218,7 +218,7 @@ int CmdHFFelicaSniff(const char *Cmd) {
     //Validations
     if (errors || cmdp == 0) return usage_hf_felica_sniff();
 
-    UsbCommand c = {CMD_FELICA_SNIFF, {samples2skip, triggers2skip, 0}};
+    UsbCommand c = {CMD_FELICA_SNOOP, {samples2skip, triggers2skip, 0}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -609,4 +609,4 @@ int CmdHFFelica(const char *Cmd) {
 int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
-}
+}
\ No newline at end of file
diff --git a/client/cmdhffido.h b/client/cmdhffido.h
index 96f9153ed..2460a170f 100644
--- a/client/cmdhffido.h
+++ b/client/cmdhffido.h
@@ -24,4 +24,4 @@
 extern int CmdHFFido(const char *Cmd);
 
 
-#endif
+#endif
\ No newline at end of file
diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index ad0f510a7..b71f2fd03 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -279,7 +279,7 @@ int CmdHFiClassList(const char *Cmd) {
 int CmdHFiClassSniff(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_hf_iclass_sniff();
-    UsbCommand c = {CMD_SNIFF_ICLASS};
+    UsbCommand c = {CMD_SNOOP_ICLASS};
     SendCommand(&c);
     return 0;
 }
@@ -1375,14 +1375,11 @@ int CmdHFiClassCloneTag(const char *Cmd) {
         return 2;
     }
 
-    fclose(f);
-
     uint8_t MAC[4] = {0x00, 0x00, 0x00, 0x00};
     uint8_t div_key[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
-    if (!select_and_auth(KEY, MAC, div_key, use_credit_key, elite, rawkey, verbose)) {
+    if (!select_and_auth(KEY, MAC, div_key, use_credit_key, elite, rawkey, verbose))
         return 0;
-    }
 
     UsbCommand w = {CMD_ICLASS_CLONE, {startblock, endblock}};
     uint8_t *ptr;
@@ -1404,7 +1401,6 @@ int CmdHFiClassCloneTag(const char *Cmd) {
         PrintAndLogEx(NORMAL, " %02x%02x%02x%02x%02x%02x%02x%02x |", p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7]);
         PrintAndLogEx(NORMAL, " MAC |%02x%02x%02x%02x|\n", p[8], p[9], p[10], p[11]);
     }
-
     UsbCommand resp;
     clearCommandBuffer();
     SendCommand(&w);
diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index db65447ac..a509873da 100644
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -1317,4 +1317,4 @@ int CmdHFLegic(const char *Cmd) {
 int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
-}
+}
\ No newline at end of file
diff --git a/client/cmdhflist.c b/client/cmdhflist.c
index 3c1fb83bd..6bcfe0b20 100644
--- a/client/cmdhflist.c
+++ b/client/cmdhflist.c
@@ -1251,4 +1251,4 @@ uint64_t GetCrypto1ProbableKey(TAuthData *ad) {
     crypto1_get_lfsr(revstate, &key);
     crypto1_destroy(revstate);
     return key;
-}
+}
\ No newline at end of file
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index cea2b5508..71bdb2ec8 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -2570,7 +2570,7 @@ int CmdHF14AMfELoad(const char *Cmd) {
 
     uint8_t *data = calloc(4096, sizeof(uint8_t));
     size_t datalen = 0;
-    //int res = loadFile(filename, "bin", data, maxdatalen, &datalen);
+    //int res = loadFile(filename, "bin", data, &datalen);
     int res = loadFileEML(filename, "eml", data, &datalen);
     if (res) {
         free(data);
@@ -2856,7 +2856,7 @@ int CmdHF14AMfCLoad(const char *Cmd) {
     size_t datalen = 0;
     int res = 0;
     if (fillFromBin) {
-        res = loadFile(fileName, "bin", data, maxdatalen, &datalen);
+        res = loadFile(fileName, "bin", data, &datalen);
     } else {
         if (fillFromJson) {
             res = loadFileJSON(fileName, "json", data, maxdatalen, &datalen);
@@ -3535,7 +3535,7 @@ static command_t CommandTable[] = {
     {"nack",        CmdHf14AMfNack,         0, "Test for Mifare NACK bug"},
     {"chk",         CmdHF14AMfChk,          0, "Check keys"},
     {"fchk",        CmdHF14AMfChk_fast,     0, "Check keys fast, targets all keys on card"},
-    {"decrypt",     CmdHf14AMfDecryptBytes, 1, "[nt] [ar_enc] [at_enc] [data] - to decrypt sniff or trace"},
+    {"decrypt",     CmdHf14AMfDecryptBytes, 1, "[nt] [ar_enc] [at_enc] [data] - to decrypt snoop or trace"},
     {"-----------", CmdHelp,                1, ""},
     {"dbg",         CmdHF14AMfDbg,          0, "Set default debug mode"},
     {"rdbl",        CmdHF14AMfRdBl,         0, "Read MIFARE classic block"},
diff --git a/client/cmdhfmfdesfire.h b/client/cmdhfmfdesfire.h
index cc5481b0e..c29fd262a 100644
--- a/client/cmdhfmfdesfire.h
+++ b/client/cmdhfmfdesfire.h
@@ -2,4 +2,4 @@
 static int CmdHelp(const char *Cmd);
 int CmdHF14AMfDESAuth(const char *Cmd);
 int CmdHFMFDesfire(const char *Cmd);
-int CmdHelp(const char *Cmd);
+int CmdHelp(const char *Cmd);
\ No newline at end of file
diff --git a/client/cmdhfmfp.h b/client/cmdhfmfp.h
index ed9d36b79..a5cacb518 100644
--- a/client/cmdhfmfp.h
+++ b/client/cmdhfmfp.h
@@ -15,4 +15,4 @@
 extern int CmdHFMFP(const char *Cmd);
 
 
-#endif
+#endif
\ No newline at end of file
diff --git a/client/cmdlf.c b/client/cmdlf.c
index 948cf2235..b6da222c6 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -70,8 +70,8 @@ int usage_lf_config(void) {
     PrintAndLogEx(NORMAL, "                    a resolution of 4 bits per sample.");
     PrintAndLogEx(NORMAL, "      lf read");
     PrintAndLogEx(NORMAL, "                    Performs a read (active field)");
-    PrintAndLogEx(NORMAL, "      lf sniff");
-    PrintAndLogEx(NORMAL, "                    Performs a sniff (no active field)");
+    PrintAndLogEx(NORMAL, "      lf snoop");
+    PrintAndLogEx(NORMAL, "                    Performs a snoop (no active field)");
     return 0;
 }
 int usage_lf_simfsk(void) {
@@ -216,7 +216,7 @@ int CmdFlexdemod(const char *Cmd) {
     }
 
     if (start == size - LONG_WAIT) {
-        PrintAndLogEx(WARNING, "nothing to wait for");
+		PrintAndLogEx(WARNING, "nothing to wait for");
         return 0;
     }
 
@@ -389,7 +389,7 @@ int CmdLFSniff(const char *Cmd) {
     uint8_t cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_lf_sniff();
 
-    UsbCommand c = {CMD_LF_SNIFF_RAW_ADC_SAMPLES, {0, 0, 0}};
+    UsbCommand c = {CMD_LF_SNOOP_RAW_ADC_SAMPLES, {0, 0, 0}};
     clearCommandBuffer();
     SendCommand(&c);
     WaitForResponse(CMD_ACK, NULL);
@@ -839,12 +839,12 @@ bool CheckChipType(bool getDeviceData) {
 
     //check for t55xx chip...
     if (tryDetectP1(true)) {
-        PrintAndLogEx(SUCCESS, "\nChipset detection : " _GREEN_("Atmel T55xx") " found");
+        PrintAndLogEx(SUCCESS, "\nChipset detection : " _GREEN_("Atmel T55xx") " found");        
         PrintAndLogEx(SUCCESS, "Try " _YELLOW_("`lf t55xx`")" commands");
         retval = true;
         goto out;
     }
-
+    
 out:
     save_restoreGB(GRAPH_RESTORE);
     save_restoreDB(GRAPH_RESTORE);
@@ -896,15 +896,12 @@ int CmdLFfind(const char *Cmd) {
     }
 
     if (EM4x50Read("", false))  { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("EM4x50 ID") " found!"); return 1;}
-
-    if (CmdHIDDemod(""))        { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("HID Prox ID") " found!"); goto out;}
     if (CmdAWIDDemod(""))       { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("AWID ID") " found!"); goto out;}
-    if (CmdParadoxDemod(""))    { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Paradox ID") " found!"); goto out;}
-
     if (CmdEM410xDemod(""))     { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("EM410x ID") " found!"); goto out;}
     if (CmdFdxDemod(""))        { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("FDX-B ID") " found!"); goto out;}
     if (CmdGuardDemod(""))      { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Guardall G-Prox II ID") " found!"); goto out; }
-    if (CmdIdteckDemod(""))     { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Idteck ID") " found!"); goto out;}
+    if (CmdHIDDemod(""))        { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("HID Prox ID") " found!"); goto out;}
+    if (CmdPSKIdteck(""))       { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Idteck ID") " found!"); goto out;}
     if (CmdIndalaDemod(""))     { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Indala ID") " found!");  goto out;}
     if (CmdIOProxDemod(""))     { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("IO Prox ID") " found!"); goto out;}
     if (CmdJablotronDemod(""))  { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Jablotron ID") " found!"); goto out;}
@@ -913,7 +910,7 @@ int CmdLFfind(const char *Cmd) {
     if (CmdNoralsyDemod(""))    { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Noralsy ID") " found!"); goto out;}
     if (CmdKeriDemod(""))       { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("KERI ID") " found!"); goto out;}
     if (CmdPacDemod(""))        { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("PAC/Stanley ID") " found!"); goto out;}
-
+    if (CmdParadoxDemod(""))    { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Paradox ID") " found!"); goto out;}
     if (CmdPrescoDemod(""))     { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Presco ID") " found!"); goto out;}
     if (CmdPyramidDemod(""))    { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Pyramid ID") " found!"); goto out;}
     if (CmdSecurakeyDemod(""))  { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Securakey ID") " found!"); goto out;}
@@ -948,19 +945,19 @@ int CmdLFfind(const char *Cmd) {
         bool st = true;
         if (ASKDemod_ext("0 0 0", true, false, 1, &st)) {
             PrintAndLogEx(NORMAL, "\nUnknown ASK Modulated and Manchester encoded Tag found!");
-            PrintAndLogEx(NORMAL, "if it does not look right it could instead be ASK/Biphase - try " _YELLOW_("'data rawdemod ab'"));
+            PrintAndLogEx(NORMAL, "if it does not look right it could instead be ASK/Biphase - try " _YELLOW_("'data rawdemod ab'") );
             goto out;
         }
 
         if (CmdPSK1rawDemod("")) {
             PrintAndLogEx(NORMAL, "Possible unknown PSK1 Modulated Tag found above!");
-            PrintAndLogEx(NORMAL, "    Could also be PSK2 - try " _YELLOW_("'data rawdemod p2'"));
+            PrintAndLogEx(NORMAL, "    Could also be PSK2 - try " _YELLOW_("'data rawdemod p2'") );
             PrintAndLogEx(NORMAL, "    Could also be PSK3 - [currently not supported]");
-            PrintAndLogEx(NORMAL, "    Could also be  NRZ - try " _YELLOW_("'data rawdemod nr"));
+            PrintAndLogEx(NORMAL, "    Could also be  NRZ - try " _YELLOW_("'data rawdemod nr") );
             goto out;
         }
 
-        PrintAndLogEx(FAILED, _RED_("\nNo data found!"));
+        PrintAndLogEx(FAILED, _RED_("\nNo data found!") );
     }
 out:
     // identify chipset
diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index 5a7d58307..719c01a96 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -17,68 +17,23 @@
 #include "common.h"
 #include "util.h"
 #include "parity.h"
-#include "hitag.h"
+#include "hitag2.h"
+#include "hitagS.h"
 #include "util_posix.h"
 #include "comms.h"
 #include "cmddata.h"
-#include "loclass/fileutils.h"  // savefile
 
 static int CmdHelp(const char *Cmd);
 
 size_t nbytes(size_t nbits) {
     return (nbits / 8) + ((nbits % 8) > 0);
 }
-int usage_hitag_sniff(void) {
-    PrintAndLogEx(NORMAL, "Sniff traffic between Hitag reader and tag. Use " _YELLOW_("`lf hitag list`")" to view collected data.");
-    PrintAndLogEx(NORMAL, "Usage:   lf hitag sniff [h] ");
-    PrintAndLogEx(NORMAL, "Options:");
-    PrintAndLogEx(NORMAL, "       h             This help");
-//    PrintAndLogEx(NORMAL, "       p <pwd>       Password");
-    PrintAndLogEx(NORMAL, "");
-    PrintAndLogEx(NORMAL, "Examples:");
-    PrintAndLogEx(NORMAL, "         lf hitag sniff");
-    return 0;
-}
-int usage_hitag_sim(void) {
-    PrintAndLogEx(NORMAL, "Simulate " _YELLOW_("Hitag2 / HitagS")" transponder");
-    PrintAndLogEx(NORMAL, "Usage:   lf hitag sim [h] [2|s] e|j|b <filename w/o extension>");
-    PrintAndLogEx(NORMAL, "Options:");
-    PrintAndLogEx(NORMAL, "       h             This help");
-    PrintAndLogEx(NORMAL, "       [2|s]         2 = hitag2,  s = hitagS");
-    PrintAndLogEx(NORMAL, "       e <filename>  Load data from EML file");
-    PrintAndLogEx(NORMAL, "       j <filename>  Load data from JSON file");
-    PrintAndLogEx(NORMAL, "       b <filename>  Load data from BIN file");
-    PrintAndLogEx(NORMAL, "");
-    PrintAndLogEx(NORMAL, "Examples:");
-    PrintAndLogEx(NORMAL, "         lf hitag sim 2 b lf-hitag-dump");
-    return 0;
-}
-int usage_hitag_info(void) {
-    PrintAndLogEx(NORMAL, "Usage:   lf hitag info [h] p <pwd>");
-    PrintAndLogEx(NORMAL, "Options:");
-    PrintAndLogEx(NORMAL, "       h          This help");
-    PrintAndLogEx(NORMAL, "       p <pwd>    password");
-    PrintAndLogEx(NORMAL, "Examples:");
-    PrintAndLogEx(NORMAL, "         lf hitag info");
-    return 0;
-}
-int usage_hitag_dump(void) {
-    PrintAndLogEx(NORMAL, "Usage:   lf hitag dump [h] p <pwd> f <name>");
-    PrintAndLogEx(NORMAL, "Options:");
-    PrintAndLogEx(NORMAL, "       h          This help");
-//    PrintAndLogEx(NORMAL, "       p <pwd>    password");
-//    PrintAndLogEx(NORMAL, "       f <name>   data filename, if no <name> given, UID will be used as filename");
-    PrintAndLogEx(NORMAL, "");
-    PrintAndLogEx(NORMAL, "Examples:");
-    PrintAndLogEx(NORMAL, "         lf hitag dump f mydump");
-    PrintAndLogEx(NORMAL, "         lf hitag dump p 4D494B52 f mydump");
-    return 0;
-}
-int usage_hitag_reader(void) {
-    PrintAndLogEx(NORMAL, "Hitag reader functions");
+
+int usage_hitag_reader(void)
+{
     PrintAndLogEx(NORMAL, "Usage: lf hitag reader [h] <reader function #>");
     PrintAndLogEx(NORMAL, "Options:");
-    PrintAndLogEx(NORMAL, "       h               This help");
+    PrintAndLogEx(NORMAL, "       h          This help");
     PrintAndLogEx(NORMAL, "   HitagS (0*)");
     PrintAndLogEx(NORMAL, "      01 <nr> <ar>     Challenge, read all pages from a Hitag S tag");
     PrintAndLogEx(NORMAL, "      02 <key>         Set to 0 if no authentication is needed. Read all pages from a Hitag S tag");
@@ -88,41 +43,11 @@ int usage_hitag_reader(void) {
     PrintAndLogEx(NORMAL, "      22 <nr> <ar>     Authentication");
     PrintAndLogEx(NORMAL, "      23 <key>         Authentication, key is in format: ISK high + ISK low");
     PrintAndLogEx(NORMAL, "      25               Test recorded authentications");
-    PrintAndLogEx(NORMAL, "      26               Just read UID");
-    return 0;
-}
-int usage_hitag_writer(void) {
-    PrintAndLogEx(NORMAL, "Hitag writer functions");
-    PrintAndLogEx(NORMAL, "Usage: lf hitag write [h] <reader function #>");
-    PrintAndLogEx(NORMAL, "Options:");
-    PrintAndLogEx(NORMAL, "       h          This help");
-    PrintAndLogEx(NORMAL, "   HitagS (0*)");
-    PrintAndLogEx(NORMAL, "      03 <nr,ar> (Challenge) <page> <byte0...byte3> write page on a Hitag S tag");
-    PrintAndLogEx(NORMAL, "      04 <key> (set to 0 if no authentication is needed) <page> <byte0...byte3> write page on a Hitag S tag");
-    PrintAndLogEx(NORMAL, "   Hitag1 (1*)");
-    PrintAndLogEx(NORMAL, "   Hitag2 (2*)");
-    PrintAndLogEx(NORMAL, "      24  <key> (set to 0 if no authentication is needed) <page> <byte0...byte3> write page on a Hitag2 tag");
-    return 0;
-}
-int usage_hitag_checkchallenges(void) {
-    PrintAndLogEx(NORMAL, "Check challenges, load a file with save hitag crypto challenges and test them all.");
-    PrintAndLogEx(NORMAL, "The file should be 8 * 60 bytes long,  the file extension defaults to " _YELLOW_("`.cc`"));
-    PrintAndLogEx(NORMAL, "");
-    PrintAndLogEx(NORMAL, "Usage:   lf hitag cc [h] f <filename w/o extension>");
-    PrintAndLogEx(NORMAL, "Options:");
-    PrintAndLogEx(NORMAL, "       h              This help");
-    PrintAndLogEx(NORMAL, "       f <filename>   Load data from BIN file");
-    PrintAndLogEx(NORMAL, "");
-    PrintAndLogEx(NORMAL, "Examples:");
-    PrintAndLogEx(NORMAL, "         lf hitag cc f lf-hitag-challenges");
+    PrintAndLogEx(NORMAL, "      26               Just read UID");    
     return 0;
 }
 
 int CmdLFHitagList(const char *Cmd) {
-    CmdTraceList("hitag");
-    return 0;
-
-    /*
     uint8_t *got = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
     if (!got) {
         PrintAndLogEx(WARNING, "Cannot allocate memory for trace");
@@ -247,15 +172,10 @@ int CmdLFHitagList(const char *Cmd) {
 
     free(got);
     return 0;
-    */
 }
 
-int CmdLFHitagSniff(const char *Cmd) {
-
-    char ctmp = tolower(param_getchar(Cmd, 0));
-    if (ctmp == 'h') return usage_hitag_sniff();
-
-    UsbCommand c = {CMD_SNIFF_HITAG, {0, 0, 0}};
+int CmdLFHitagSnoop(const char *Cmd) {
+    UsbCommand c = {CMD_SNOOP_HITAG};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -263,249 +183,40 @@ int CmdLFHitagSniff(const char *Cmd) {
 
 int CmdLFHitagSim(const char *Cmd) {
 
-    bool errors = false;
-    bool tag_mem_supplied = false;
-    uint8_t cmdp = 0;
-    size_t maxdatalen = 48;
-    uint8_t *data = calloc(4 * 64, sizeof(uint8_t));
-    size_t datalen = 0;
-    int res = 0;
+    UsbCommand c = {CMD_SIMULATE_HITAG};
     char filename[FILE_PATH_SIZE] = { 0x00 };
+    FILE *f;
+    bool tag_mem_supplied;
 
-    UsbCommand c = {CMD_SIMULATE_HITAG, {0, 0, 0}};
+    int len = strlen(Cmd);
+    if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
+    memcpy(filename, Cmd, len);
 
-    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-        switch (tolower(param_getchar(Cmd, cmdp))) {
-            case 'h':
-                free(data);
-                return usage_hitag_sim();
-            case '2':
-                maxdatalen = 48;
-                cmdp++;
-                break;
-            case 's':
-                c.cmd = CMD_SIMULATE_HITAG_S;
-                maxdatalen = 4 * 64;
-                cmdp++;
-                break;
-            case 'e':
-                param_getstr(Cmd, cmdp + 1, filename, sizeof(filename));
-                res = loadFileEML(filename, "eml", data, &datalen);
-                if (res > 0 || datalen != maxdatalen) {
-                    PrintAndLogDevice(FAILED, "error, bytes read mismatch file size");
-                    errors = true;
-                    break;
-                }
-                tag_mem_supplied = true;
-                cmdp += 2;
-                break;
-            case 'j':
-                param_getstr(Cmd, cmdp + 1, filename, sizeof(filename));
-                res = loadFileJSON(filename, "json", data, maxdatalen, &datalen);
-                if (res > 0) {
-                    errors = true;
-                    break;
-                }
-                tag_mem_supplied = true;
-                cmdp += 2;
-                break;
-            case 'b':
-                param_getstr(Cmd, cmdp + 1, filename, sizeof(filename));
-                res = loadFile(filename, "bin", data, maxdatalen, &datalen);
-                if (res > 0) {
-                    errors = true;
-                    break;
-                }
-                tag_mem_supplied = true;
-                cmdp += 2;
-                break;
-            default:
-                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-                errors = true;
-                break;
+    if (strlen(filename) > 0) {
+        f = fopen(filename, "rb+");
+        if (!f) {
+            PrintAndLogEx(WARNING, "Error: Could not open file [%s]", filename);
+            return 1;
         }
-    }
-
-    //Validations
-    if (errors || cmdp == 0) {
-        free(data);
-        return usage_hitag_sim();
-    }
-
-    c.arg[0] = (uint32_t)tag_mem_supplied;
-    if (tag_mem_supplied) {
-        memcpy(c.d.asBytes, data, datalen);
-    }
-    clearCommandBuffer();
-    SendCommand(&c);
-
-    free(data);
-    return 0;
-}
-
-static void printHitagConfiguration(uint8_t config) {
-    
-    char msg[100];
-    memset(msg, 0, sizeof(msg));
-
-    char bits[9];
-    char *bs = bits;
-    for (uint8_t i = 0 ; i < 8 ; i++) {
-        snprintf(bs, sizeof(bits), "%d", (config >> (7 - i)) & 1);
-        bs++;
-    }
-
-    PrintAndLogEx(INFO, "\n\nHitag2 tag information ");
-    PrintAndLogEx(INFO, "------------------------------------");
-    
-    //configuration byte
-    PrintAndLogEx(SUCCESS, "Config byte : %02X - %s", config, bits);    
-    
-    // encoding
-    strcat(msg, "Encoding    : ");
-    if (config & 0x1) {
-        strcat(msg + strlen(msg), _YELLOW_("Biphase"));
+        tag_mem_supplied = true;
+        size_t bytes_read = fread(c.d.asBytes, 1, 48, f);
+        if (bytes_read == 48) {
+            PrintAndLogEx(WARNING, "Error: File reading error");
+            fclose(f);
+            return 1;
+        }
+        fclose(f);
     } else {
-        strcat(msg + strlen(msg), _YELLOW_("Manchester"));
+        tag_mem_supplied = false;
     }
-    PrintAndLogEx(SUCCESS, "%s", msg);
-    memset(msg, 0, sizeof(msg));
 
-    // version
-    strcat(msg, "Coding in HITAG 2 operation: %s");
-    uint8_t foo = (config & 0x6) >> 1;
-    switch (foo) {
-        case 0:
-            PrintAndLogEx(SUCCESS, "Version     : public mode B, Coding: biphase");
-            PrintAndLogEx(SUCCESS, msg, (config & 0x1) ? "biphase" : "manchester");
-            break;
-        case 1:
-            PrintAndLogEx(SUCCESS, "Version     : public mode A, Coding: manchester");
-            PrintAndLogEx(SUCCESS, msg, (config & 0x1) ? "biphase" : "manchester");
-            break;
-        case 2:
-            PrintAndLogEx(SUCCESS, "Version     : public mode C, Coding: biphase");
-            PrintAndLogEx(SUCCESS, msg, (config & 0x1) ? "biphase" : "manchester");
-            break;
-        case 3:
-            PrintAndLogEx(SUCCESS, "Version     : Hitag2");
-            PrintAndLogEx(SUCCESS, msg, (config & 0x1) ? "biphase" : "manchester");
-            break;
-    }
-    memset(msg, 0, sizeof(msg));
-
-    // mode
-    strcat(msg, "Tag is in   : ");
-    if (config & 0x8) {
-        strcat(msg + strlen(msg), _YELLOW_("Crypto mode"));
-    } else  {
-        strcat(msg + strlen(msg), _YELLOW_("Password mode"));
-    }
-    PrintAndLogEx(SUCCESS, "%s", msg);
-    memset(msg, 0, sizeof(msg));
-
-    // page access
-    strcat(msg, "Page 6,7    : ");
-    if (config & 0x10) {
-        strcat(msg + strlen(msg), "read only");
-    } else  {
-        strcat(msg + strlen(msg), _GREEN_("read write"));
-    }
-    PrintAndLogEx(SUCCESS, "%s", msg);
-    memset(msg, 0, sizeof(msg));
-
-    // page access
-    strcat(msg, "Page 4,5    : ");    
-    if (config & 0x20) {
-        strcat(msg + strlen(msg), "read only");
-    } else  {
-        strcat(msg + strlen(msg), _GREEN_("read write"));
-    }
-    PrintAndLogEx(SUCCESS, "%s", msg);
-    memset(msg, 0, sizeof(msg));
-
-    // OTP
-    strcat(msg, "Page 3      : ");
-    if (config & 0x40) {
-        strcat(msg + strlen(msg), "read only. Configuration byte and password tag " _RED_("FIXED / IRREVERSIBLE"));
-    } else  {
-        strcat(msg + strlen(msg), _GREEN_("read write"));
-    }
-    PrintAndLogEx(SUCCESS, "%s", msg);
-    memset(msg, 0, sizeof(msg));
-
-    // OTP
-    if (config & 0x80) {
-        strcat(msg, "Page 1      : " _RED_("locked") "\n");
-
-        strcat(msg + strlen(msg), "Page 2      : ");
-        if (config & 0x8) {
-            strcat(msg + strlen(msg), _RED_("locked"));
-        } else {
-            strcat(msg + strlen(msg), "read only");
-        }
-    } else  {
-        strcat(msg, "Page 1,2    : " _GREEN_("read write"));
-    }
-    PrintAndLogEx(SUCCESS, "%s", msg);
-    PrintAndLogEx(INFO, "------------------------------------");
-}
-
-static bool getHitagUid(uint32_t *uid) {
-
-    UsbCommand c = {CMD_READER_HITAG, {RHT2F_UID_ONLY, 0, 0} };
+    // Does the tag comes with memory
+    c.arg[0] = (uint32_t)tag_mem_supplied;
     clearCommandBuffer();
     SendCommand(&c);
-    UsbCommand resp;
-    if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
-        PrintAndLogEx(WARNING, "timeout while waiting for reply.");
-        return false;
-    }
-
-    if (resp.arg[0] == false) {
-        PrintAndLogEx(DEBUG, "DEBUG: Error - failed getting UID");
-        return false;
-    }
-
-    if ( uid )
-        *uid = bytes_to_num(resp.d.asBytes, 4);
-   
-    return true;
-}
-
-int CmdLFHitagInfo(const char *Cmd) {
-    PrintAndLogEx(INFO, "Hitag2 tag information ");
-    PrintAndLogEx(INFO, "To be done!");
-    PrintAndLogEx(INFO, "------------------------------------");
-
-    char ctmp = tolower(param_getchar(Cmd, 0));
-    if (ctmp == 'h') return usage_hitag_info();
-    
-    // pwd or key
-
-    // read UID
-    uint32_t uid = 0;
-    if ( getHitagUid( &uid ) == false ) 
-        return 1;
-    
-    PrintAndLogEx(SUCCESS, "UID: %08X", uid);
-    
-    // how to detemine Hitag types?
-    
-    // read block3,  get configuration byte.
-
-    // common configurations.
-    printHitagConfiguration(0x06);
-    //printHitagConfiguration( 0x0E );
-    //printHitagConfiguration( 0x02 );
-    //printHitagConfiguration( 0x00 );
-    //printHitagConfiguration( 0x04 );
     return 0;
 }
 
-// TODO: iceman 
-// Hitag2 reader,  problem is that this command mixes up stuff.  So 26 give uid.  21 etc will also give you a memory dump !?
-//
 int CmdLFHitagReader(const char *Cmd) {
 
     UsbCommand c = {CMD_READER_HITAG, {0, 0, 0} };
@@ -517,25 +228,25 @@ int CmdLFHitagReader(const char *Cmd) {
             c.cmd = CMD_READ_HITAG_S;
             num_to_bytes(param_get32ex(Cmd, 1, 0, 16), 4, htd->auth.NrAr);
             num_to_bytes(param_get32ex(Cmd, 2, 0, 16), 4, htd->auth.NrAr + 4);
-            break;
+        break;
         }
         case RHTSF_KEY: {
             c.cmd = CMD_READ_HITAG_S;
             num_to_bytes(param_get64ex(Cmd, 1, 0, 16), 6, htd->crypto.key);
-            break;
+        break;
         }
         case RHT2F_PASSWORD: {
             num_to_bytes(param_get32ex(Cmd, 1, 0, 16), 4, htd->pwd.password);
-            break;
+        break;
         }
         case RHT2F_AUTHENTICATE: {
             num_to_bytes(param_get32ex(Cmd, 1, 0, 16), 4, htd->auth.NrAr);
             num_to_bytes(param_get32ex(Cmd, 2, 0, 16), 4, htd->auth.NrAr + 4);
-            break;
+        break;
         }
         case RHT2F_CRYPTO: {
             num_to_bytes(param_get64ex(Cmd, 1, 0, 16), 6, htd->crypto.key);
-            break;
+        break;
         }
         case RHT2F_TEST_AUTH_ATTEMPTS: {
             // No additional parameters needed
@@ -546,6 +257,7 @@ int CmdLFHitagReader(const char *Cmd) {
             break;
         }
         default: {
+            PrintAndLogEx(NORMAL, "\nError: unkown reader function %d", htf);
             return usage_hitag_reader();
         }
     }
@@ -566,136 +278,150 @@ int CmdLFHitagReader(const char *Cmd) {
 
     uint32_t id = bytes_to_num(resp.d.asBytes, 4);
 
-    PrintAndLogEx(SUCCESS, "Valid Hitag2 tag found - UID: %08x", id);
-    if (htf != RHT2F_UID_ONLY) {
-        
-        PrintAndLogEx(SUCCESS, "Dumping tag memory..." );
-        uint8_t *data = resp.d.asBytes;
-
+    if (htf == RHT2F_UID_ONLY) {
+        PrintAndLogEx(NORMAL, "Valid Hitag2 tag found - UID: %08x", id);
+    } else {
         char filename[FILE_PATH_SIZE];
-        char *fnameptr = filename;
-        fnameptr += sprintf(fnameptr, "lf-hitag-");
-        FillFileNameByUID(fnameptr, data, "-dump", 4);
+        FILE *f = NULL;
+        sprintf(filename, "%08x_%04x.ht2", id, (rand() & 0xffff));
+        f = fopen(filename, "wb");
+        if (!f) {
+            PrintAndLogEx(WARNING, "Error: Could not open file [%s]", filename);
+            return 1;
+        }
 
-        saveFile(filename, "bin", data, 48);
-        saveFileEML(filename, "eml", data, 48, 4);
-        saveFileJSON(filename, "json", jsfHitag, data, 48);
-        
-        // block3, 1 byte
-        printHitagConfiguration(data[4*3] );
+        // Write the 48 tag memory bytes to file and finalize
+        fwrite(resp.d.asBytes, 1, 48, f);
+        fclose(f);
+        PrintAndLogEx(NORMAL, "Succesfully saved tag memory to [%s]", filename);
     }
     return 0;
 }
 
-int CmdLFHitagCheckChallenges(const char *Cmd) {
-
-    UsbCommand c = { CMD_TEST_HITAGS_TRACES, {0, 0, 0}};
+int CmdLFHitagSimS(const char *Cmd) {
+    UsbCommand c = { CMD_SIMULATE_HITAG_S };
     char filename[FILE_PATH_SIZE] = { 0x00 };
-    size_t datalen = 0;
-    int res = 0;
-    bool file_given = false;
-    bool errors = false;
-    uint8_t cmdp = 0;
-    uint8_t *data = calloc(8 * 60, sizeof(uint8_t));
+    FILE *f;
+    bool tag_mem_supplied;
+    int len = strlen(Cmd);
+    if (len > FILE_PATH_SIZE)
+        len = FILE_PATH_SIZE;
+    memcpy(filename, Cmd, len);
 
-    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-        switch (tolower(param_getchar(Cmd, cmdp))) {
-            case 'h':
-                free(data);
-                return usage_hitag_checkchallenges();
-            case 'f':
-                param_getstr(Cmd, cmdp + 1, filename, sizeof(filename));
-                res = loadFile(filename, "cc", data, 8 * 60, &datalen);
-                if (res > 0) {
-                    errors = true;
-                    break;
-                }
-
-                memcpy(c.d.asBytes, data, datalen);
-                file_given = true;
-                cmdp += 2;
-                break;
-            default:
-                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-                errors = true;
-                break;
+    if (strlen(filename) > 0) {
+        f = fopen(filename, "rb+");
+        if (!f) {
+            PrintAndLogEx(WARNING, "Error: Could not open file [%s]", filename);
+            return 1;
         }
+        tag_mem_supplied = true;
+        size_t bytes_read = fread(c.d.asBytes, 1, 4 * 64, f);
+        if (bytes_read == 4 * 64) {
+            PrintAndLogEx(WARNING, "Error: File reading error");
+            fclose(f);
+            return 1;
+        }
+        fclose(f);
+    } else {
+        tag_mem_supplied = false;
     }
 
-    //Validations
-    if (errors) {
-        free(data);
-        return usage_hitag_checkchallenges();
+    // Does the tag comes with memory
+    c.arg[0] = (uint32_t) tag_mem_supplied;
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
+}
+
+int CmdLFHitagCheckChallenges(const char *Cmd) {
+    UsbCommand c = { CMD_TEST_HITAGS_TRACES };
+    char filename[FILE_PATH_SIZE] = { 0x00 };
+    FILE *f;
+    bool file_given;
+    int len = strlen(Cmd);
+    if (len > FILE_PATH_SIZE)
+        len = FILE_PATH_SIZE;
+    memcpy(filename, Cmd, len);
+
+    if (strlen(filename) > 0) {
+        f = fopen(filename, "rb+");
+        if (!f) {
+            PrintAndLogEx(WARNING, "Error: Could not open file [%s]", filename);
+            return 1;
+        }
+        file_given = true;
+        size_t bytes_read = fread(c.d.asBytes, 1, 8 * 60, f);
+        if (bytes_read == 8 * 60) {
+            PrintAndLogEx(WARNING, "Error: File reading error");
+            fclose(f);
+            return 1;
+        }
+        fclose(f);
+    } else {
+        file_given = false;
     }
 
     //file with all the challenges to try
     c.arg[0] = (uint32_t)file_given;
     clearCommandBuffer();
     SendCommand(&c);
-
-    free(data);
     return 0;
 }
 
-int CmdLFHitagWriter(const char *Cmd) {
-    UsbCommand c = { CMD_WR_HITAG_S, {0, 0, 0}};
+int CmdLFHitagWP(const char *Cmd) {
+    UsbCommand c = { CMD_WR_HITAG_S };
     hitag_data *htd = (hitag_data *)c.d.asBytes;
     hitag_function htf = param_get32ex(Cmd, 0, 0, 10);
-
     switch (htf) {
-        case WHTSF_CHALLENGE: {
+        case 03: { //WHTSF_CHALLENGE
             num_to_bytes(param_get64ex(Cmd, 1, 0, 16), 8, htd->auth.NrAr);
             c.arg[2] = param_get32ex(Cmd, 2, 0, 10);
             num_to_bytes(param_get32ex(Cmd, 3, 0, 16), 4, htd->auth.data);
-            break;
         }
-        case WHTSF_KEY:
-        case WHT2F_CRYPTO: {
+        break;
+        case 04:
+        case 24: {
+            //WHTSF_KEY
             num_to_bytes(param_get64ex(Cmd, 1, 0, 16), 6, htd->crypto.key);
             c.arg[2] = param_get32ex(Cmd, 2, 0, 10);
             num_to_bytes(param_get32ex(Cmd, 3, 0, 16), 4, htd->crypto.data);
-            break;
-        }
-        default: {
-            return usage_hitag_writer();
-        }
-    }
 
+        }
+        break;
+        default: {
+            PrintAndLogEx(WARNING, "Error: unkown writer function %d", htf);
+            PrintAndLogEx(NORMAL, "Hitag writer functions");
+            PrintAndLogEx(NORMAL, " HitagS (0*)");
+            PrintAndLogEx(NORMAL, "  03 <nr,ar> (Challenge) <page> <byte0...byte3> write page on a Hitag S tag");
+            PrintAndLogEx(NORMAL, "  04 <key> (set to 0 if no authentication is needed) <page> <byte0...byte3> write page on a Hitag S tag");
+            PrintAndLogEx(NORMAL, " Hitag1 (1*)");
+            PrintAndLogEx(NORMAL, " Hitag2 (2*)");
+            return 1;
+        }
+        break;
+    }
+    // Copy the hitag function into the first argument
     c.arg[0] = htf;
 
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
-    if (!WaitForResponseTimeout(CMD_ACK, &resp, 4000)) {
-        PrintAndLogEx(WARNING, "timeout while waiting for reply.");
-        return 1;
-    }
+    WaitForResponse(CMD_ACK, &resp);
 
-    if (resp.arg[0] == false) {
-        PrintAndLogEx(DEBUG, "DEBUG: Error - hitag write failed");
-        return 1;
-    }
-    return 0;
-}
-
-int CmdLFHitagDump(const char *Cmd) {
-    PrintAndLogEx(INFO, "Dumping of tag memory");
-    PrintAndLogEx(INFO, "To be done!");
-
-    char ctmp = tolower(param_getchar(Cmd, 0));
-    if (ctmp == 'h') return usage_hitag_dump();
+    // Check the return status, stored in the first argument
+    if (resp.arg[0] == false) return 1;
     return 0;
 }
 
 static command_t CommandTable[] = {
-    {"help",     CmdHelp,                   1, "This help" },
-    {"list",     CmdLFHitagList,            0, "List Hitag trace history" },
-    {"info",     CmdLFHitagInfo,            1, "Tag information" },
-    {"reader",   CmdLFHitagReader,          1, "Act like a Hitag Reader" },
-    {"sim",      CmdLFHitagSim,             1, "Simulate Hitag transponder" },
-    {"sniff",    CmdLFHitagSniff,           1, "Eavesdrop Hitag communication" },
-    {"writer",   CmdLFHitagWriter,          1, "Act like a Hitag Writer" },
-    {"cc",       CmdLFHitagCheckChallenges, 1, "Test all challenges" },
+    {"help",    CmdHelp,           1, "This help"},
+    {"list",    CmdLFHitagList,    1, "<outfile> List Hitag trace history"},
+    {"reader",  CmdLFHitagReader,  1, "Act like a Hitag Reader"},
+    {"sim",     CmdLFHitagSim,     1, "<infile> Simulate Hitag transponder"},
+    {"simS",    CmdLFHitagSimS,    1, "<hitagS.hts> Simulate HitagS transponder" },
+    {"snoop",   CmdLFHitagSnoop,   1, "Eavesdrop Hitag communication"},
+    {"writer",  CmdLFHitagWP,      1, "Act like a Hitag Writer" },
+    {"check_challenges", CmdLFHitagCheckChallenges,   1, "<challenges.cc> test all challenges" },
     { NULL, NULL, 0, NULL }
 };
 
diff --git a/client/cmdlfhitag.h b/client/cmdlfhitag.h
index eb5bb2dd0..e43ed58ff 100644
--- a/client/cmdlfhitag.h
+++ b/client/cmdlfhitag.h
@@ -14,12 +14,11 @@
 extern int CmdLFHitag(const char *Cmd);
 
 extern int CmdLFHitagList(const char *Cmd);
-extern int CmdLFHitagSniff(const char *Cmd);
-extern int CmdLFHitagSim(const char *Cmd);
-extern int CmdLFHitagInfo(const char *Cmd);
 extern int CmdLFHitagReader(const char *Cmd);
+extern int CmdLFHitagSim(const char *Cmd);
+extern int CmdLFHitagSimS(const char *Cmd);
+extern int CmdLFHitagSnoop(const char *Cmd);
+extern int CmdLFHitagWP(const char *Cmd);
 extern int CmdLFHitagCheckChallenges(const char *Cmd);
-extern int CmdLFHitagWriter(const char *Cmd);
-extern int CmdLFHitagDump(const char *cmd);
 
 #endif
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 41512c6b9..91f4a456f 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1882,7 +1882,7 @@ int CmdT55xxRecoverPW(const char *Cmd) {
 
     // first try fliping each bit in the expected password
     while (bit < 32) {
-        curr_password = orig_password ^ (1u << bit);
+        curr_password = orig_password ^ (1 << bit);
         found = tryOnePassword(curr_password);
         if (found == -1) return 0;
         bit++;
@@ -1897,7 +1897,7 @@ int CmdT55xxRecoverPW(const char *Cmd) {
     // from low bit to high bit
     bit = 0;
     while (bit < 32) {
-        mask += (1u << bit);
+        mask += (1 << bit);
         curr_password = orig_password & mask;
         // if updated mask didn't change the password, don't try it again
         if (prev_password == curr_password) {
@@ -1916,7 +1916,7 @@ int CmdT55xxRecoverPW(const char *Cmd) {
     bit = 0;
     mask = 0xffffffff;
     while (bit < 32) {
-        mask -= (1u << bit);
+        mask -= (1 << bit);
         curr_password = orig_password & mask;
         // if updated mask didn't change the password, don't try it again
         if (prev_password == curr_password) {
diff --git a/client/cmdlfti.c b/client/cmdlfti.c
index 5d3c2e399..6abb9b5de 100644
--- a/client/cmdlfti.c
+++ b/client/cmdlfti.c
@@ -191,7 +191,7 @@ int CmdTIDemod(const char *Cmd) {
             bits[i] = '1';
             maxPos += highLen;
             // bitstream arrives lsb first so shift right
-            shift3 |= (1u << 31);
+            shift3 |= (1 << 31);
         } else {
             bits[i] = '.';
             maxPos += lowLen;
diff --git a/client/cmdmain.c b/client/cmdmain.c
index 5bbd689e1..608a0e668 100644
--- a/client/cmdmain.c
+++ b/client/cmdmain.c
@@ -74,4 +74,4 @@ int CmdRev(const char *Cmd) {
 //-----------------------------------------------------------------------------
 int CommandReceived(char *Cmd) {
     return CmdsParse(CommandTable, Cmd);
-}
+}
\ No newline at end of file
diff --git a/client/cmdscript.c b/client/cmdscript.c
index e1a21ffc4..2e2ec5f53 100644
--- a/client/cmdscript.c
+++ b/client/cmdscript.c
@@ -193,4 +193,4 @@ int CmdScript(const char *Cmd) {
 int CmdHelp(const char *Cmd) {
     PrintAndLogEx(NORMAL, "This is a feature to run Lua-scripts. You can place lua-scripts within the scripts/-folder. ");
     return 0;
-}
+}
\ No newline at end of file
diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index 8d00fa128..27b2afc39 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -49,13 +49,13 @@ int usage_sm_info(void) {
     return 0;
 }
 int usage_sm_upgrade(void) {
-    PrintAndLogEx(NORMAL, "Upgrade RDV4.0 Sim module firmware");
+    PrintAndLogEx(NORMAL, "Upgrade firmware");
     PrintAndLogEx(NORMAL, "Usage:  sc upgrade f <file name>");
     PrintAndLogEx(NORMAL, "       h               :  this help");
     PrintAndLogEx(NORMAL, "       f <filename>    :  firmware file name");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
-    PrintAndLogEx(NORMAL, "        sc upgrade f ../tools/simmodule/SIM011.BIN");
+    PrintAndLogEx(NORMAL, "        sc upgrade f myfile");
     return 0;
 }
 int usage_sm_setclock(void) {
@@ -116,7 +116,7 @@ uint8_t GetATRTA1(uint8_t *atr, size_t atrlen) {
             return atr[2];
     }
 
-    return 0x11; // default value is 0x11, corresponding to fmax=5 MHz, Fi=372, Di=1.
+    return 0x11; // default value is ‘0x11’, corresponding to fmax=5 MHz, Fi=372, Di=1.
 }
 
 int DiArray[] = {
@@ -196,8 +196,6 @@ static int PrintATR(uint8_t *atr, size_t atrlen) {
     uint8_t T0 = atr[1];
     uint8_t K = T0 & 0x0F;
     uint8_t TD1 = 0, T1len = 0, TD1len = 0, TDilen = 0;
-    bool protocol_T0_present = true;
-    bool protocol_T15_present = false;
 
     if (T0 & 0x10) {
         PrintAndLog("\t- TA1 (Maximum clock frequency, proposed bit duration) [ 0x%02x ]", atr[2 + T1len]);
@@ -217,14 +215,6 @@ static int PrintATR(uint8_t *atr, size_t atrlen) {
     if (T0 & 0x80) {
         TD1 = atr[2 + T1len];
         PrintAndLog("\t- TD1 (First offered transmission protocol, presence of TA2..TD2) [ 0x%02x ] Protocol T%d", TD1, TD1 & 0x0f);
-        protocol_T0_present = false;
-        if ((TD1 & 0x0f) == 0) {
-            protocol_T0_present = true;
-        }
-        if ((TD1 & 0x0f) == 15) {
-            protocol_T15_present = true;
-        }
-
         T1len++;
 
         if (TD1 & 0x10) {
@@ -242,12 +232,6 @@ static int PrintATR(uint8_t *atr, size_t atrlen) {
         if (TD1 & 0x80) {
             uint8_t TDi = atr[2 + T1len + TD1len];
             PrintAndLog("\t- TD2 (A supported protocol or more global parameters, presence of TA3..TD3) [ 0x%02x ] Protocol T%d", TDi, TDi & 0x0f);
-            if ((TDi & 0x0f) == 0) {
-                protocol_T0_present = true;
-            }
-            if ((TDi & 0x0f) == 15) {
-                protocol_T15_present = true;
-            }
             TD1len++;
 
             bool nextCycle = true;
@@ -278,20 +262,19 @@ static int PrintATR(uint8_t *atr, size_t atrlen) {
         }
     }
 
-    if (!protocol_T0_present || protocol_T15_present) { // there is CRC Check Byte TCK
-        uint8_t vxor = 0;
-        for (int i = 1; i < atrlen; i++)
-            vxor ^= atr[i];
+    uint8_t vxor = 0;
+    for (int i = 1; i < atrlen; i++)
+        vxor ^= atr[i];
 
-        if (vxor)
-            PrintAndLogEx(WARNING, "Check sum error. Must be 0 got 0x%02X", vxor);
-        else
-            PrintAndLogEx(INFO, "Check sum OK.");
-    }
+    if (vxor)
+        PrintAndLogEx(WARNING, "Check summ error. Must be 0 got 0x%02X", vxor);
+    else
+        PrintAndLogEx(INFO, "Check summ OK.");
 
     if (atr[0] != 0x3b)
         PrintAndLogEx(WARNING, "Not a direct convention [ 0x%02x ]", atr[0]);
 
+
     uint8_t calen = 2 + T1len + TD1len + TDilen + K;
 
     if (atrlen != calen && atrlen != calen + 1)  // may be CRC
@@ -578,9 +561,8 @@ int ExchangeAPDUSC(uint8_t *datain, int datainlen, bool activateCard, bool leave
 
 int CmdSmartUpgrade(const char *Cmd) {
 
-    PrintAndLogEx(WARNING, "WARNING - Sim module firmware upgrade.");
-    PrintAndLogEx(WARNING, "A dangerous command, do wrong and you could brick the sim module");
-    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(WARNING, "WARNING - Smartcard socket firmware upgrade.");
+    PrintAndLogEx(WARNING, "A dangerous command, do wrong and you will brick the smart card socket");
 
     FILE *f;
     char filename[FILE_PATH_SIZE] = {0};
@@ -610,33 +592,10 @@ int CmdSmartUpgrade(const char *Cmd) {
     //Validations
     if (errors || cmdp == 0) return usage_sm_upgrade();
 
-
-    char sha512filename[FILE_PATH_SIZE] = {'\0'};
-    char *bin_extension = filename;
-    char *dot_position = NULL;
-    while ((dot_position = strchr(bin_extension, '.')) != NULL) {
-        bin_extension = dot_position + 1;
-    }
-
-    if (!strcmp(bin_extension, "BIN")
-#ifdef _WIN32
-            || !strcmp(bin_extension, "bin")
-#endif
-       ) {
-        memcpy(sha512filename, filename, strlen(filename) - strlen("bin"));
-        strcat(sha512filename, "sha512.txt");
-    } else {
-        PrintAndLogEx(FAILED, "Filename extension of firmware upgrade file must be .BIN");
-        return 1;
-    }
-
-    PrintAndLogEx(INFO, "firmware file      : " _YELLOW_("%s"), filename);
-    PrintAndLogEx(INFO, "Checking integrity : " _YELLOW_("%s"), sha512filename);
-
-    // load firmware file
+    // load file
     f = fopen(filename, "rb");
     if (!f) {
-        PrintAndLogEx(FAILED, "Firmware file " _YELLOW_("%s") " not found or locked.", filename);
+        PrintAndLogEx(FAILED, "File: " _YELLOW_("%s") ": not found or locked.", filename);
         return 1;
     }
 
@@ -646,77 +605,27 @@ int CmdSmartUpgrade(const char *Cmd) {
     fseek(f, 0, SEEK_SET);
 
     if (fsize < 0) {
-        PrintAndLogEx(WARNING, "error, when getting filesize");
+        PrintAndLogDevice(WARNING, "error, when getting filesize");
         fclose(f);
         return 1;
     }
 
     uint8_t *dump = calloc(fsize, sizeof(uint8_t));
     if (!dump) {
-        PrintAndLogEx(WARNING, "error, cannot allocate memory ");
+        PrintAndLogDevice(WARNING, "error, cannot allocate memory ");
         fclose(f);
         return 1;
     }
 
-    size_t firmware_size = fread(dump, 1, fsize, f);
-    if (f) {
-        fclose(f);
-    }
-
-    // load sha512 file
-    f = fopen(sha512filename, "rb");
-    if (!f) {
-        PrintAndLogEx(FAILED, "SHA-512 file not found or locked.");
-        return 1;
-    }
-
-    // get filesize in order to malloc memory
-    fseek(f, 0, SEEK_END);
-    fsize = ftell(f);
-    fseek(f, 0, SEEK_SET);
-
-    if (fsize < 0)  {
-        PrintAndLogEx(FAILED, "Could not determine size of SHA-512 file");
-        fclose(f);
-        return 1;
-    }
-
-    if (fsize < 128) {
-        PrintAndLogEx(FAILED, "SHA-512 file too short");
-        fclose(f);
-        return 1;
-    }
-
-    char hashstring[129];
-    size_t bytes_read = fread(hashstring, 1, 128, f);
-    hashstring[128] = '\0';
-
+    size_t bytes_read = fread(dump, 1, fsize, f);
     if (f)
         fclose(f);
 
-    uint8_t hash1[64];
-    if (bytes_read != 128 || param_gethex(hashstring, 0, hash1, 128)) {
-        PrintAndLogEx(FAILED, "Couldn't read SHA-512 file");
-        return 1;
-    }
-
-    uint8_t hash2[64];
-    if (sha512hash(dump, firmware_size, hash2)) {
-        PrintAndLogEx(FAILED, "Couldn't calculate SHA-512 of firmware");
-        return 1;
-    }
-
-    if (memcmp(hash1, hash2, 64)) {
-        PrintAndLogEx(FAILED, "Couldn't verify integrity of firmware file " _RED_("(wrong SHA-512 hash)"));
-        return 1;
-    }
-
-    PrintAndLogEx(SUCCESS, "Sim module firmware uploading to PM3");
-
+    PrintAndLogEx(SUCCESS, "Smartcard socket firmware uploading to PM3");
     //Send to device
     uint32_t index = 0;
     uint32_t bytes_sent = 0;
-    uint32_t bytes_remaining = firmware_size;
+    uint32_t bytes_remaining = bytes_read;
 
     while (bytes_remaining > 0) {
         uint32_t bytes_in_packet = MIN(USB_CMD_DATA_SIZE, bytes_remaining);
@@ -740,10 +649,10 @@ int CmdSmartUpgrade(const char *Cmd) {
     }
     free(dump);
     printf("\n");
-    PrintAndLogEx(SUCCESS, "Sim module firmware updating,  don\'t turn off your PM3!");
+    PrintAndLogEx(SUCCESS, "Smartcard socket firmware updating,  don\'t turn off your PM3!");
 
     // trigger the firmware upgrade
-    UsbCommand c = {CMD_SMART_UPGRADE, {firmware_size, 0, 0}};
+    UsbCommand c = {CMD_SMART_UPGRADE, {bytes_read, 0, 0}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
@@ -751,12 +660,10 @@ int CmdSmartUpgrade(const char *Cmd) {
         PrintAndLogEx(WARNING, "timeout while waiting for reply.");
         return 1;
     }
-    if ((resp.arg[0] & 0xFF)) {
-        PrintAndLogEx(SUCCESS, "Sim module firmware upgrade " _GREEN_("successful"));
-        PrintAndLogEx(SUCCESS, "\n run " _YELLOW_("`hw status`") " to validate the fw version ");
-    } else {
-        PrintAndLogEx(FAILED, "Sim module firmware upgrade " _RED_("failed"));
-    }
+    if ((resp.arg[0] & 0xFF))
+        PrintAndLogEx(SUCCESS, "Smartcard socket firmware upgraded successful");
+    else
+        PrintAndLogEx(FAILED, "Smartcard socket firmware updating failed");
     return 0;
 }
 
@@ -967,11 +874,11 @@ static void smart_brute_prim() {
 
         if (len > 2) {
 
-            // if ( decodeTLV ) {
-            // if (!TLVPrintFromBuffer(buf, len-2)) {
+            //if ( decodeTLV ) {
+            //if (!TLVPrintFromBuffer(buf, len-2)) {
             PrintAndLogEx(SUCCESS, "\tHEX  %d |: %s", len, sprint_hex(buf, len));
-            // }
-            // }
+            //}
+            //}
         }
         len = 0;
     }
@@ -1217,14 +1124,14 @@ int CmdSmartBruteforceSFI(const char *Cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",     CmdHelp,               1, "This help"},
-    {"list",     CmdSmartList,          0, "List ISO 7816 history"},
-    {"info",     CmdSmartInfo,          1, "Tag information"},
-    {"reader",   CmdSmartReader,        1, "Act like an IS07816 reader"},
-    {"raw",      CmdSmartRaw,           1, "Send raw hex data to tag"},
-    {"upgrade",  CmdSmartUpgrade,       1, "Upgrade sim module firmware"},
+    {"help",    CmdHelp,               1, "This help"},
+    {"list",    CmdSmartList,          0, "List ISO 7816 history"},
+    {"info",    CmdSmartInfo,          1, "Tag information"},
+    {"reader",  CmdSmartReader,        1, "Act like an IS07816 reader"},
+    {"raw",     CmdSmartRaw,           1, "Send raw hex data to tag"},
+    {"upgrade", CmdSmartUpgrade,       1, "Upgrade firmware"},
     {"setclock", CmdSmartSetClock,      1, "Set clock speed"},
-    {"brute",    CmdSmartBruteforceSFI, 1, "Bruteforce SFI"},
+    {"brute",   CmdSmartBruteforceSFI, 1, "Bruteforce SFI"},
     {NULL, NULL, 0, NULL}
 };
 
diff --git a/client/cmdsmartcard.h b/client/cmdsmartcard.h
index 251859761..14e79cd4e 100644
--- a/client/cmdsmartcard.h
+++ b/client/cmdsmartcard.h
@@ -25,7 +25,6 @@
 #include "emv/emvcore.h"        // decodeTVL
 #include "emv/apduinfo.h"       // APDUcode description
 #include "emv/dump.h"           // dump_buffer
-#include "crypto/libpcrypto.h"	// sha512hash
 
 extern int CmdSmartcard(const char *Cmd);
 
@@ -41,4 +40,4 @@ extern int usage_sm_raw(void);
 extern int usage_sm_reader(void);
 extern int usage_sm_info(void);
 extern int usage_sm_upgrade(void);
-#endif
+#endif
\ No newline at end of file
diff --git a/client/cmdtrace.c b/client/cmdtrace.c
index 05a85a050..77f85ce5c 100644
--- a/client/cmdtrace.c
+++ b/client/cmdtrace.c
@@ -36,7 +36,6 @@ int usage_trace_list() {
     PrintAndLogEx(NORMAL, "    7816   - interpret data as iso7816-4 communications");
     PrintAndLogEx(NORMAL, "    legic  - interpret data as LEGIC communications");
     PrintAndLogEx(NORMAL, "    felica - interpret data as ISO18092 / FeliCa communications");
-    PrintAndLogEx(NORMAL, "    hitag  - interpret data as Hitag2 / HitagS communications");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "        trace list 14a f");
@@ -176,7 +175,6 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
                 crcStatus = iso15693_CRC_check(frame, data_len);
                 break;
             case ISO_7816_4:
-            case PROTO_HITAG:
             default:
                 break;
         }
@@ -191,12 +189,11 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
     for (int j = 0; j < data_len && j / 18 < 18; j++) {
 
         uint8_t parityBits = parityBytes[j >> 3];
-        if (protocol != LEGIC
-                && protocol != ISO_14443B
-                && protocol != ISO_7816_4
-                && protocol != PROTO_HITAG
-                && (isResponse || protocol == ISO_14443A)
-                && (oddparity8(frame[j]) != ((parityBits >> (7 - (j & 0x0007))) & 0x01))) {
+        if (protocol != LEGIC &&
+                protocol != ISO_14443B &&
+                protocol != ISO_7816_4 &&
+                (isResponse || protocol == ISO_14443A) &&
+                (oddparity8(frame[j]) != ((parityBits >> (7 - (j & 0x0007))) & 0x01))) {
 
             snprintf(line[j / 18] + ((j % 18) * 4), 110, "%02x! ", frame[j]);
         } else {
@@ -559,17 +556,16 @@ int CmdTraceList(const char *Cmd) {
 
             // validate type of output
             if (strcmp(type,     "iclass") == 0)    protocol = ICLASS;
-            else if (strcmp(type, "14a") == 0)      protocol = ISO_14443A;
-            else if (strcmp(type, "14b") == 0)      protocol = ISO_14443B;
-            else if (strcmp(type, "topaz") == 0)    protocol = TOPAZ;
-            else if (strcmp(type, "7816") == 0)     protocol = ISO_7816_4;
-            else if (strcmp(type, "des") == 0)      protocol = MFDES;
-            else if (strcmp(type, "legic") == 0)    protocol = LEGIC;
-            else if (strcmp(type, "15") == 0)       protocol = ISO_15693;
-            else if (strcmp(type, "felica") == 0)   protocol = FELICA;
-            else if (strcmp(type, "mf") == 0)       protocol = PROTO_MIFARE;
-            else if (strcmp(type, "hitag") == 0)    protocol = PROTO_HITAG;
-            else if (strcmp(type, "raw") == 0)      protocol = -1; //No crc, no annotations
+            else if (strcmp(type, "14a") == 0)       protocol = ISO_14443A;
+            else if (strcmp(type, "14b") == 0)       protocol = ISO_14443B;
+            else if (strcmp(type, "topaz") == 0)     protocol = TOPAZ;
+            else if (strcmp(type, "7816") == 0)      protocol = ISO_7816_4;
+            else if (strcmp(type, "des") == 0)       protocol = MFDES;
+            else if (strcmp(type, "legic") == 0)     protocol = LEGIC;
+            else if (strcmp(type, "15") == 0)        protocol = ISO_15693;
+            else if (strcmp(type, "felica") == 0)    protocol = FELICA;
+            else if (strcmp(type, "mf") == 0)        protocol = PROTO_MIFARE;
+            else if (strcmp(type, "raw") == 0)       protocol = -1; //No crc, no annotations
             else errors = true;
 
             cmdp++;
@@ -629,8 +625,6 @@ int CmdTraceList(const char *Cmd) {
             PrintAndLogEx(NORMAL, "ISO15693 - Timings are not as accurate");
         if (protocol == ISO_7816_4)
             PrintAndLogEx(NORMAL, "ISO7816-4 / Smartcard - Timings N/A yet");
-        if (protocol == PROTO_HITAG)
-            PrintAndLogEx(NORMAL, "Hitag2 / HitagS - Timings in ETU (8us)");
 
         PrintAndLogEx(NORMAL, "");
         PrintAndLogEx(NORMAL, "      Start |        End | Src | Data (! denotes parity error)                                           | CRC | Annotation");
@@ -648,8 +642,8 @@ int CmdTraceLoad(const char *Cmd) {
 
     FILE *f = NULL;
     char filename[FILE_PATH_SIZE];
-    char cmdp = tolower(param_getchar(Cmd, 0));
-    if (strlen(Cmd) < 1 || cmdp == 'h') return usage_trace_load();
+    char cmdp = param_getchar(Cmd, 0);
+    if (strlen(Cmd) < 1 || cmdp == 'h' || cmdp == 'H') return usage_trace_load();
 
     param_getstr(Cmd, 0, filename, sizeof(filename));
 
@@ -694,13 +688,13 @@ int CmdTraceLoad(const char *Cmd) {
 int CmdTraceSave(const char *Cmd) {
 
     if (traceLen == 0) {
-        PrintAndLogEx(WARNING, "trace is empty, nothing to save");
+        PrintAndLogEx(WARNING, "trace is empty, exiting...");
         return 0;
     }
 
     char filename[FILE_PATH_SIZE];
-    char cmdp = tolower(param_getchar(Cmd, 0));
-    if (strlen(Cmd) < 1 || cmdp == 'h') return usage_trace_save();
+    char cmdp = param_getchar(Cmd, 0);
+    if (strlen(Cmd) < 1 || cmdp == 'h' || cmdp == 'H') return usage_trace_save();
 
     param_getstr(Cmd, 0, filename, sizeof(filename));
     saveFile(filename, "bin", trace, traceLen);
diff --git a/client/crypto/libpcrypto.c b/client/crypto/libpcrypto.c
index 095d16af3..883de0dbb 100644
--- a/client/crypto/libpcrypto.c
+++ b/client/crypto/libpcrypto.c
@@ -19,7 +19,6 @@
 #include <mbedtls/pk.h>
 #include <mbedtls/ecdsa.h>
 #include <mbedtls/sha256.h>
-#include <mbedtls/sha512.h>
 #include <mbedtls/ctr_drbg.h>
 #include <mbedtls/entropy.h>
 #include <mbedtls/error.h>
@@ -107,20 +106,6 @@ int sha256hash(uint8_t *input, int length, uint8_t *hash) {
     return 0;
 }
 
-int sha512hash(uint8_t *input, int length, uint8_t *hash) {
-    if (!hash || !input)
-        return 1;
-
-    mbedtls_sha512_context sctx;
-    mbedtls_sha512_init(&sctx);
-    mbedtls_sha512_starts(&sctx, 0); //SHA-512, not 384
-    mbedtls_sha512_update(&sctx, input, length);
-    mbedtls_sha512_finish(&sctx, hash);
-    mbedtls_sha512_free(&sctx);
-
-    return 0;
-}
-
 int ecdsa_init_str(mbedtls_ecdsa_context *ctx, char *key_d, char *key_x, char *key_y) {
     if (!ctx)
         return 1;
diff --git a/client/crypto/libpcrypto.h b/client/crypto/libpcrypto.h
index 2cb4644a8..5f3592b7a 100644
--- a/client/crypto/libpcrypto.h
+++ b/client/crypto/libpcrypto.h
@@ -22,7 +22,6 @@ extern int aes_cmac(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *mac, int
 extern int aes_cmac8(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *mac, int length);
 
 extern int sha256hash(uint8_t *input, int length, uint8_t *hash);
-extern int sha512hash(uint8_t *input, int length, uint8_t *hash);
 
 extern int ecdsa_key_create(uint8_t *key_d, uint8_t *key_xy);
 extern int ecdsa_public_key_from_pk(mbedtls_pk_context *pk, uint8_t *key, size_t keylen);
diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index b5edfa81c..31886cf75 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -288,7 +288,6 @@ int CmdEMVGPO(const char *cmd) {
         PrintAndLogEx(ERR, "Can't create PDOL data.");
         tlvdb_free(tmp_ext);
         tlvdb_free(tlvRoot);
-        free(pdol_data_tlv);
         return 4;
     }
     PrintAndLogEx(INFO, "PDOL data[%d]: %s", pdol_data_tlv_data_len, sprint_hex(pdol_data_tlv_data, pdol_data_tlv_data_len));
@@ -1578,7 +1577,6 @@ int CmdEMVScan(const char *cmd) {
     if (!pdol_data_tlv_data) {
         PrintAndLogEx(ERR, "Can't create PDOL data.");
         tlvdb_free(tlvRoot);
-        free(pdol_data_tlv);
         DropFieldEx(channel);
         return 6;
     }
diff --git a/client/emv/emvjson.h b/client/emv/emvjson.h
index 18326083f..d47109f7c 100644
--- a/client/emv/emvjson.h
+++ b/client/emv/emvjson.h
@@ -38,4 +38,4 @@ extern int JsonLoadBufAsHex(json_t *elm, char *path, uint8_t *data, size_t maxbu
 
 extern bool ParamLoadFromJson(struct tlvdb *tlv);
 
-#endif
+#endif
\ No newline at end of file
diff --git a/client/fpga_compress.c b/client/fpga_compress.c
index 7c5a4a883..36e5872e0 100644
--- a/client/fpga_compress.c
+++ b/client/fpga_compress.c
@@ -322,42 +322,42 @@ static int FpgaGatherVersion(FILE *infile, char *infile_name, char *dst, int len
     }
 
     if (!memcmp("fpga_lf", basename(infile_name), 7))
-        strncat(dst, "LF", len - strlen(dst) - 1);
+        strncat(dst, "LF", len - 1);
     else if (!memcmp("fpga_hf", basename(infile_name), 7))
-        strncat(dst, "HF", len - strlen(dst) - 1);
+        strncat(dst, "HF", len - 1);
 
-    strncat(dst, " image built", len - strlen(dst) - 1);
+    strncat(dst, " image built", len - 1);
     if (bitparse_find_section(infile, 'b', &fpga_info_len)) {
-        strncat(dst, " for ", len - strlen(dst) - 1);
+        strncat(dst, " for ", len - 1);
         for (uint16_t i = 0; i < fpga_info_len; i++) {
             char c = (char)fgetc(infile);
             if (i < sizeof(tempstr)) {
                 tempstr[i] = c;
             }
         }
-        strncat(dst, tempstr, len - strlen(dst) - 1);
+        strncat(dst, tempstr, len - 1);
     }
 
     if (bitparse_find_section(infile, 'c', &fpga_info_len)) {
-        strncat(dst, " on ", len - strlen(dst) - 1);
+        strncat(dst, " on ", len - 1);
         for (uint16_t i = 0; i < fpga_info_len; i++) {
             char c = (char)fgetc(infile);
             if (i < sizeof(tempstr)) {
                 tempstr[i] = c;
             }
         }
-        strncat(dst, tempstr, len - strlen(dst) - 1);
+        strncat(dst, tempstr, len - 1);
     }
 
     if (bitparse_find_section(infile, 'd', &fpga_info_len)) {
-        strncat(dst, " at ", len - strlen(dst) - 1);
+        strncat(dst, " at ", len - 1);
         for (uint16_t i = 0; i < fpga_info_len; i++) {
             char c = (char)fgetc(infile);
             if (i < sizeof(tempstr)) {
                 tempstr[i] = c;
             }
         }
-        strncat(dst, tempstr, len - strlen(dst) - 1);
+        strncat(dst, tempstr, len - 1);
     }
     return 0;
 }
diff --git a/client/hardnested/hardnested_tables.c b/client/hardnested/hardnested_tables.c
index 09de7f5d7..bc92e5f10 100644
--- a/client/hardnested/hardnested_tables.c
+++ b/client/hardnested/hardnested_tables.c
@@ -577,4 +577,4 @@ int main(int argc, char *argv[]) {
     free_part_sum_bitarrays();
 
     return 0;
-}
+}
\ No newline at end of file
diff --git a/client/hid-flasher/usb_cmd.h b/client/hid-flasher/usb_cmd.h
index ac563bd26..5e562c10b 100644
--- a/client/hid-flasher/usb_cmd.h
+++ b/client/hid-flasher/usb_cmd.h
@@ -96,7 +96,7 @@ typedef struct {
 #define CMD_IO_DEMOD_FSK                                                  0x021A
 #define CMD_IO_CLONE_TAG                                                  0x021B
 #define CMD_EM410X_DEMOD                                                  0x021c
-// Sampling configuration for LF reader/sniffer
+// Sampling configuration for LF reader/snooper
 #define CMD_SET_LF_SAMPLING_CONFIG                                        0x021d
 #define CMD_FSK_SIM_TAG                                                   0x021E
 #define CMD_ASK_SIM_TAG                                                   0x021F
@@ -119,10 +119,10 @@ typedef struct {
 #define CMD_ISO_15693_COMMAND                                             0x0313
 #define CMD_ISO_15693_COMMAND_DONE                                        0x0314
 #define CMD_ISO_15693_FIND_AFI                                            0x0315
-#define CMD_LF_SNIFF_RAW_ADC_SAMPLES                                      0x0317
+#define CMD_LF_SNOOP_RAW_ADC_SAMPLES                                      0x0317
 
 // For Hitag2 transponders
-#define CMD_SNIFF_HITAG                                                   0x0370
+#define CMD_SNOOP_HITAG                                                   0x0370
 #define CMD_SIMULATE_HITAG                                                0x0371
 #define CMD_READER_HITAG                                                  0x0372
 
@@ -135,8 +135,8 @@ typedef struct {
 
 #define CMD_ANTIFUZZ_ISO_14443a                                           0x0380
 #define CMD_SIMULATE_TAG_ISO_14443B                                       0x0381
-#define CMD_SNIFF_ISO_14443B                                              0x0382
-#define CMD_SNIFF_ISO_14443a                                              0x0383
+#define CMD_SNOOP_ISO_14443B                                              0x0382
+#define CMD_SNOOP_ISO_14443a                                              0x0383
 #define CMD_SIMULATE_TAG_ISO_14443a                                       0x0384
 #define CMD_READER_ISO_14443a                                             0x0385
 
@@ -151,7 +151,7 @@ typedef struct {
 #define CMD_LEGIC_ESET                                                    0x03BD
 #define CMD_LEGIC_EGET                                                    0x03BE
 
-#define CMD_SNIFF_ICLASS                                                  0x0392
+#define CMD_SNOOP_ICLASS                                                  0x0392
 #define CMD_SIMULATE_TAG_ICLASS                                           0x0393
 #define CMD_READER_ICLASS                                                 0x0394
 #define CMD_READER_ICLASS_REPLAY                                          0x0395
diff --git a/client/loclass/elite_crack.c b/client/loclass/elite_crack.c
index 038d8e475..41be3d39c 100644
--- a/client/loclass/elite_crack.c
+++ b/client/loclass/elite_crack.c
@@ -692,4 +692,4 @@ int testElite() {
     errors += _test_iclass_key_permutation();
     errors += _testBruteforce();
     return errors;
-}
+}
\ No newline at end of file
diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index 0c345ca14..4d58c7084 100644
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -155,12 +155,11 @@ int saveFileJSON(const char *preferredName, const char *suffix, JSONFileType fty
     json_t *root = json_object();
     JsonSaveStr(root, "Created", "proxmark3");
     switch (ftype) {
-        case jsfRaw: {
+        case jsfRaw:
             JsonSaveStr(root, "FileType", "raw");
             JsonSaveBufAsHexCompact(root, "raw", data, datalen);
             break;
-        }
-        case jsfCardMemory: {
+        case jsfCardMemory:
             JsonSaveStr(root, "FileType", "mfcard");
             for (int i = 0; i < (datalen / 16); i++) {
                 char path[PATH_MAX_LENGTH] = {0};
@@ -209,8 +208,7 @@ int saveFileJSON(const char *preferredName, const char *suffix, JSONFileType fty
                 }
             }
             break;
-        }
-        case jsfMfuMemory: {
+        case jsfMfuMemory:
             JsonSaveStr(root, "FileType", "mfu");
 
             mfu_dump_t *tmp = (mfu_dump_t *)data;
@@ -232,26 +230,12 @@ int saveFileJSON(const char *preferredName, const char *suffix, JSONFileType fty
             size_t len = (datalen - DUMP_PREFIX_LENGTH) / 4;
 
             for (int i = 0; i < len; i++) {
+
                 char path[PATH_MAX_LENGTH] = {0};
                 sprintf(path, "$.blocks.%d", i);
                 JsonSaveBufAsHexCompact(root, path, tmp->data + (i * 4), 4);
             }
             break;
-        }
-        case jsfHitag: {
-            JsonSaveStr(root, "FileType", "hitag");
-            uint8_t uid[4] = {0};
-            memcpy(uid, data, 4);
-
-            JsonSaveBufAsHexCompact(root, "$.Card.UID", uid, sizeof(uid));
-
-            for (int i = 0; i < (datalen / 4); i++) {
-                char path[PATH_MAX_LENGTH] = {0};
-                sprintf(path, "$.blocks.%d", i);
-                JsonSaveBufAsHexCompact(root, path, data + (i * 4), 4);
-            }
-            break;
-        }
     }
 
     int res = json_dump_file(root, fileName, JSON_INDENT(2));
@@ -269,7 +253,7 @@ out:
     return retval;
 }
 
-int loadFile(const char *preferredName, const char *suffix, void *data, size_t maxdatalen, size_t *datalen) {
+int loadFile(const char *preferredName, const char *suffix, void *data, size_t *datalen) {
 
     if (preferredName == NULL) return 1;
     if (suffix == NULL) return 1;
@@ -314,11 +298,6 @@ int loadFile(const char *preferredName, const char *suffix, void *data, size_t m
         goto out;
     }
 
-    if (bytes_read != maxdatalen) {
-        PrintAndLogDevice(WARNING, "Warning, bytes read exeed calling array limit. Max bytes is %d bytes", maxdatalen);
-        bytes_read = maxdatalen;
-    }
-
     memcpy((data), dump, bytes_read);
     free(dump);
 
@@ -468,29 +447,8 @@ int loadFileJSON(const char *preferredName, const char *suffix, void *data, size
         *datalen = sptr;
     }
 
-    if (!strcmp(ctype, "hitag")) {
-        size_t sptr = 0;
-        for (int i = 0; i < (maxdatalen / 4); i++) {
-            if (sptr + 4 > maxdatalen) {
-                retval = 5;
-                goto out;
-            }
 
-            char path[30] = {0};
-            sprintf(path, "$.blocks.%d", i);
-
-            size_t len = 0;
-            JsonLoadBufAsHex(root, path, &udata[sptr], 4, &len);
-            if (!len)
-                break;
-
-            sptr += len;
-        }
-
-        *datalen = sptr;
-    }
-
-    PrintAndLogEx(SUCCESS, "loaded from JSON file " _YELLOW_("%s"), fileName);
+    PrintAndLog("loaded from JSON file " _YELLOW_("%s"), fileName);
 out:
     json_decref(root);
     free(fileName);
diff --git a/client/loclass/fileutils.h b/client/loclass/fileutils.h
index 7b358331a..c2888c196 100644
--- a/client/loclass/fileutils.h
+++ b/client/loclass/fileutils.h
@@ -55,11 +55,6 @@ typedef enum {
     jsfRaw,
     jsfCardMemory,
     jsfMfuMemory,
-    jsfHitag,
-//    jsf14b,
-//    jsf15,
-//    jsfLegic,
-//    jsfT55xx,
 } JSONFileType;
 
 int fileExists(const char *filename);
@@ -112,11 +107,10 @@ extern int saveFileJSON(const char *preferredName, const char *suffix, JSONFileT
  * @param preferredName
  * @param suffix the file suffix. Leave out the ".".
  * @param data The data array to store the loaded bytes from file
- * @param maxdatalen the number of bytes that your data array has
  * @param datalen the number of bytes loaded from file
  * @return 0 for ok, 1 for failz
 */
-extern int loadFile(const char *preferredName, const char *suffix, void *data, size_t maxdatalen, size_t *datalen);
+extern int loadFile(const char *preferredName, const char *suffix, void *data, size_t *datalen);
 
 /**
  * @brief  Utility function to load data from a textfile (EML). This method takes a preferred name.
diff --git a/client/lualibs/7816_error.lua b/client/lualibs/7816_error.lua
index 15f4ef471..038f668fb 100644
--- a/client/lualibs/7816_error.lua
+++ b/client/lualibs/7816_error.lua
@@ -75,4 +75,4 @@ _errorcodes.tostring = function(command)
     end
     return ("Error, numeric or string argument expected, got : %s"):format(tostring(command))
 end
-return _errorcodes
+return _errorcodes
\ No newline at end of file
diff --git a/client/lualibs/hf_reader.lua b/client/lualibs/hf_reader.lua
index b99b521da..d0550a335 100644
--- a/client/lualibs/hf_reader.lua
+++ b/client/lualibs/hf_reader.lua
@@ -32,4 +32,4 @@ end
 
 return {
     waitForTag = waitForTag,
-}
+}
\ No newline at end of file
diff --git a/client/lualibs/precalc.lua b/client/lualibs/precalc.lua
index 7da08f006..71d91c05a 100644
--- a/client/lualibs/precalc.lua
+++ b/client/lualibs/precalc.lua
@@ -91,4 +91,4 @@ local PreCalc =
         return list
     end,
 }
-return PreCalc
+return PreCalc
\ No newline at end of file
diff --git a/client/lualibs/read14b.lua b/client/lualibs/read14b.lua
index 2ee86c378..3711c02a3 100644
--- a/client/lualibs/read14b.lua
+++ b/client/lualibs/read14b.lua
@@ -155,4 +155,4 @@ local library = {
     ISO14B_COMMAND = ISO14B_COMMAND,
 }
 
-return library
+return library
\ No newline at end of file
diff --git a/client/lualibs/taglib.lua b/client/lualibs/taglib.lua
index 0612ed2d3..715a29487 100644
--- a/client/lualibs/taglib.lua
+++ b/client/lualibs/taglib.lua
@@ -121,4 +121,4 @@ return {
 
         return m[value] or "no tag-info available"
     end,
-}
+}
\ No newline at end of file
diff --git a/client/lualibs/utils.lua b/client/lualibs/utils.lua
index ed9874e40..697e48b72 100644
--- a/client/lualibs/utils.lua
+++ b/client/lualibs/utils.lua
@@ -427,4 +427,4 @@ local Utils =
 -- end
 
 }
-return Utils
+return Utils
\ No newline at end of file
diff --git a/client/mifare/mifarehost.h b/client/mifare/mifarehost.h
index 626d2cd07..1d9f0c3ab 100644
--- a/client/mifare/mifarehost.h
+++ b/client/mifare/mifarehost.h
@@ -100,4 +100,4 @@ extern int detect_classic_prng(void);
 extern int detect_classic_nackbug(bool verbose);
 extern void detect_classic_magic(void);
 extern void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len, bool isEncrypted);
-#endif
+#endif
\ No newline at end of file
diff --git a/client/pm3_eml_mfd_test.py b/client/pm3_eml_mfd_test.py
index 171bad843..478a050df 100644
--- a/client/pm3_eml_mfd_test.py
+++ b/client/pm3_eml_mfd_test.py
@@ -21,7 +21,7 @@ class TestEmlMfd(unittest.TestCase):
             ]
     def test_eml2mfd(self):
         self.three_argument_test(pm3_eml2mfd.main, self.EML2MFD_TESTCASES)
-
+    
     def test_mfd2eml(self):
         self.three_argument_test(pm3_mfd2eml.main,
                 imap(reversed, self.EML2MFD_TESTCASES), c14n=hex_c14n)
diff --git a/client/reveng/preset.c b/client/reveng/preset.c
index 2f305a285..d5bdac2dd 100644
--- a/client/reveng/preset.c
+++ b/client/reveng/preset.c
@@ -939,4 +939,4 @@ static void munpack(model_t *dest, const struct mpreset *src) {
     dest->flags = src->flags;
     /* link to the name as it is static */
     dest->name = (src->alias) ? src->alias->name : NULL;
-}
+}
\ No newline at end of file
diff --git a/client/scandir.h b/client/scandir.h
index 7155c5a79..a41a13319 100644
--- a/client/scandir.h
+++ b/client/scandir.h
@@ -19,4 +19,4 @@ extern int scandir(const char *dir, struct dirent ***namelist, int (*select)(con
 extern int alphasort(const struct dirent **a, const struct dirent **b);
 #endif // _WIN32
 
-#endif // SCANDIR_H__
+#endif // SCANDIR_H__
\ No newline at end of file
diff --git a/client/scripting.c b/client/scripting.c
index 719798177..14dc35774 100644
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -776,4 +776,4 @@ int set_pm3_libraries(lua_State *L) {
     strcat(libraries_path, LUA_LIBRARIES_WILDCARD);
     setLuaPath(L, libraries_path);
     return 1;
-}
+}
\ No newline at end of file
diff --git a/client/scripts/Legic_clone.lua b/client/scripts/Legic_clone.lua
index 21d756d0e..dcac7f323 100644
--- a/client/scripts/Legic_clone.lua
+++ b/client/scripts/Legic_clone.lua
@@ -538,4 +538,4 @@ function main(args)
 end
 
 -- call main with arguments
-main(args)
+main(args)
\ No newline at end of file
diff --git a/client/scripts/brutesim.lua b/client/scripts/brutesim.lua
index a15cf6e60..9527d8970 100644
--- a/client/scripts/brutesim.lua
+++ b/client/scripts/brutesim.lua
@@ -297,4 +297,4 @@ local function main(args)
     core.console('hw ping')
 end
 
-main(args)
+main(args)
\ No newline at end of file
diff --git a/client/scripts/calc_di.lua b/client/scripts/calc_di.lua
index 9a8c051a4..e0b587332 100644
--- a/client/scripts/calc_di.lua
+++ b/client/scripts/calc_di.lua
@@ -173,4 +173,4 @@ local function main(args)
     dumptofile( keys )
 end
 
-main(args)
+main(args)
\ No newline at end of file
diff --git a/client/scripts/calc_ev1_it.lua b/client/scripts/calc_ev1_it.lua
index b4e995e96..c6070d20d 100644
--- a/client/scripts/calc_ev1_it.lua
+++ b/client/scripts/calc_ev1_it.lua
@@ -175,4 +175,4 @@ local function main(args)
     print(string.format('PWD | %s', pwd))
 end
 
-main(args)
+main(args)
\ No newline at end of file
diff --git a/client/scripts/calc_mizip.lua b/client/scripts/calc_mizip.lua
index 8844f6d66..42f13c578 100644
--- a/client/scripts/calc_mizip.lua
+++ b/client/scripts/calc_mizip.lua
@@ -194,4 +194,4 @@ local function main(args)
     dumptofile( keys )
 end
 
-main(args)
+main(args)
\ No newline at end of file
diff --git a/client/scripts/calypso.lua b/client/scripts/calypso.lua
index 74de3cb9a..2b7252261 100644
--- a/client/scripts/calypso.lua
+++ b/client/scripts/calypso.lua
@@ -273,4 +273,4 @@ if "--test"==args then
 else
     -- Call the main
     main(args)
-end
+end
\ No newline at end of file
diff --git a/client/scripts/e.lua b/client/scripts/e.lua
index 1f9a14eb0..6b9d80364 100644
--- a/client/scripts/e.lua
+++ b/client/scripts/e.lua
@@ -74,4 +74,4 @@ function main(args)
     end
 end
 
-main(args)
+main(args)
\ No newline at end of file
diff --git a/client/scripts/emul2dump.lua b/client/scripts/emul2dump.lua
index 0cbc3a4c2..04b9da12b 100644
--- a/client/scripts/emul2dump.lua
+++ b/client/scripts/emul2dump.lua
@@ -57,4 +57,4 @@ local function main(args)
     ExitMsg(("Wrote a BIN dump to the file %s"):format(filename))
 end
 
-main(args)
+main(args)
\ No newline at end of file
diff --git a/client/scripts/emul2html.lua b/client/scripts/emul2html.lua
index 36230f8af..db76ec9c0 100644
--- a/client/scripts/emul2html.lua
+++ b/client/scripts/emul2html.lua
@@ -64,4 +64,4 @@ In the future, we may implement so that scripts are invoked directly
 into a 'main' function, instead of being executed blindly. For future
 compatibility, I have done so, but I invoke my main from here.
 --]]
-main(args)
+main(args)
\ No newline at end of file
diff --git a/client/scripts/formatMifare.lua b/client/scripts/formatMifare.lua
index fe9cf32e5..90801b2a2 100644
--- a/client/scripts/formatMifare.lua
+++ b/client/scripts/formatMifare.lua
@@ -213,4 +213,4 @@ local function main(args)
     end
 end
 
-main(args)
+main(args)
\ No newline at end of file
diff --git a/client/scripts/hf_read.lua b/client/scripts/hf_read.lua
index 00238a67c..7653e6e75 100644
--- a/client/scripts/hf_read.lua
+++ b/client/scripts/hf_read.lua
@@ -15,4 +15,4 @@ local function main(args)
     end
     return
 end
-main(args)
+main(args)
\ No newline at end of file
diff --git a/client/scripts/htmldump.lua b/client/scripts/htmldump.lua
index afd76abee..40f3028b4 100644
--- a/client/scripts/htmldump.lua
+++ b/client/scripts/htmldump.lua
@@ -62,4 +62,4 @@ In the future, we may implement so that scripts are invoked directly
 into a 'main' function, instead of being executed blindly. For future
 compatibility, I have done so, but I invoke my main from here.
 --]]
-main(args)
+main(args)
\ No newline at end of file
diff --git a/client/scripts/lf_bulk.lua b/client/scripts/lf_bulk.lua
index dc59572f3..b4604bebb 100644
--- a/client/scripts/lf_bulk.lua
+++ b/client/scripts/lf_bulk.lua
@@ -190,4 +190,4 @@ local function main(args)
     end
 end
 
-main(args)
+main(args)
\ No newline at end of file
diff --git a/client/scripts/mfkeys.lua b/client/scripts/mfkeys.lua
index ff739683d..18078b822 100644
--- a/client/scripts/mfkeys.lua
+++ b/client/scripts/mfkeys.lua
@@ -272,4 +272,4 @@ local function main(args)
     print('mfkeys - Total execution time: '..os.difftime(end_time, start_time)..' sec')
 end
 
-main( args)
+main( args)
\ No newline at end of file
diff --git a/client/scripts/ndef_dump.lua b/client/scripts/ndef_dump.lua
index 0bb597a52..4a740d7e6 100644
--- a/client/scripts/ndef_dump.lua
+++ b/client/scripts/ndef_dump.lua
@@ -244,4 +244,4 @@ local function main( args)
     prlog(string.format("Dumped data into %s", filename))
 
 end
-main(args)
+main(args)
\ No newline at end of file
diff --git a/client/scripts/ntag_3d.lua b/client/scripts/ntag_3d.lua
index 2f08aac85..890f29d94 100644
--- a/client/scripts/ntag_3d.lua
+++ b/client/scripts/ntag_3d.lua
@@ -380,4 +380,4 @@ local function main(args)
     write_tag(uid, t)
 end
 
-main(args)
+main(args)
\ No newline at end of file
diff --git a/client/scripts/parameters.lua b/client/scripts/parameters.lua
index 4eb86446d..f51266f7f 100644
--- a/client/scripts/parameters.lua
+++ b/client/scripts/parameters.lua
@@ -42,4 +42,4 @@ In the future, we may implement so that scripts are invoked directly
 into a 'main' function, instead of being executed blindly. For future
 compatibility, I have done so, but I invoke my main from here.
 --]]
-main(args)
+main(args)
\ No newline at end of file
diff --git a/client/scripts/test_t55x7_ask.lua b/client/scripts/test_t55x7_ask.lua
index 0e0d3d9e3..3f224b28a 100644
--- a/client/scripts/test_t55x7_ask.lua
+++ b/client/scripts/test_t55x7_ask.lua
@@ -137,4 +137,4 @@ local function main(args)
     test()
     print( string.rep('--',20) )
 end
-main(args)
+main(args)
\ No newline at end of file
diff --git a/client/scripts/test_t55x7_fsk.lua b/client/scripts/test_t55x7_fsk.lua
index 492f71681..9dbb1b6bb 100644
--- a/client/scripts/test_t55x7_fsk.lua
+++ b/client/scripts/test_t55x7_fsk.lua
@@ -137,4 +137,4 @@ local function main(args)
     test(7)
     print( string.rep('--',20) )
 end
-main(args)
+main(args)
\ No newline at end of file
diff --git a/client/scripts/tnp3dump.lua b/client/scripts/tnp3dump.lua
index f48abff6c..2a5545497 100644
--- a/client/scripts/tnp3dump.lua
+++ b/client/scripts/tnp3dump.lua
@@ -282,4 +282,4 @@ local function main(args)
 
     core.clearCommandBuffer()
 end
-main(args)
+main(args)
\ No newline at end of file
diff --git a/client/scripts/tracetest.lua b/client/scripts/tracetest.lua
index c3ddedf87..96d1f79c6 100644
--- a/client/scripts/tracetest.lua
+++ b/client/scripts/tracetest.lua
@@ -123,4 +123,4 @@ local function main(args)
     print( string.rep('--',20) )
 
 end
-main(args)
+main(args)
\ No newline at end of file
diff --git a/client/scripts/ufodump.lua b/client/scripts/ufodump.lua
index f91949166..67949fd94 100644
--- a/client/scripts/ufodump.lua
+++ b/client/scripts/ufodump.lua
@@ -173,4 +173,4 @@ if "--test"==args then
 else
     -- Call the main
     main(args)
-end
+end
\ No newline at end of file
diff --git a/client/snooper.c b/client/snooper.c
index 35267bc22..88a30edaa 100644
--- a/client/snooper.c
+++ b/client/snooper.c
@@ -5,7 +5,7 @@
 // at your option, any later version. See the LICENSE.txt file for the text of
 // the license.
 //-----------------------------------------------------------------------------
-// Sniff binary
+// Snooper binary
 //-----------------------------------------------------------------------------
 
 #include "util_posix.h"
@@ -19,7 +19,7 @@
 
 int main() {
     usb_init();
-    SetLogFilename("sniffer.log");
+    SetLogFilename("snooper.log");
 
     return_on_error = 1;
 
@@ -27,7 +27,7 @@ int main() {
         while (!OpenProxmark()) { sleep(1); }
         while (1) {
             UsbCommand cmdbuf;
-            CommandReceived("hf 14a sniff");
+            CommandReceived("hf 14a snoop");
             HANDLE_ERROR;
             ReceiveCommand(&cmdbuf);
             HANDLE_ERROR;
diff --git a/client/util.c b/client/util.c
index a3f275a0b..0b3211264 100644
--- a/client/util.c
+++ b/client/util.c
@@ -252,10 +252,7 @@ char *sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t brea
     // loop through the out_index to make sure we don't go too far
     for (out_index = 0; out_index < rowlen; out_index++) {
         // set character
-        if (data[in_index] == 7) // Manchester wrong bit marker
-            sprintf(tmp++, ".");
-        else
-            sprintf(tmp++, "%u", data[in_index]);
+        sprintf(tmp++, "%u", data[in_index]);
         // check if a line break is needed and we have room to print it in our array
         if ((breaks > 0) && !((in_index + 1) % breaks) && (out_index + 1 != rowlen)) {
             // increment and print line break
@@ -686,45 +683,24 @@ int hextobinstring(char *target, char *source) {
     return length;
 }
 
-// convert binary array of 0x00/0x01 values to hex
+// convert binary array of 0x00/0x01 values to hex (safe to do in place as target will always be shorter than source)
 // return number of bits converted
-int binarraytohex(char *target, const size_t targetlen, char *source, size_t srclen) {
-    uint8_t i = 0, x = 0;
-    uint32_t t = 0; // written target chars
-    uint32_t r = 0; // consumed bits
-    uint8_t w = 0; // wrong bits separator printed
-    for (size_t s = 0 ; s < srclen; s++) {
-        if ((source[s] == 0) || (source[s] == 1)) {
-            w = 0;
-            x += (source[s] << (3 - i));
-            i++;
-            if (i == 4) {
-                if (t >= targetlen - 2) return r;
-                sprintf(target + t, "%X", x);
-                t++;
-                r += 4;
-                x = 0;
-                i = 0;
-            }
-        } else {
-            if (i > 0) {
-                if (t >= targetlen - 5) return r;
-                w = 0;
-                sprintf(target + t, "%X[%i]", x, i);
-                t += 4;
-                r += i;
-                x = 0;
-                i = 0;
-            }
-            if (w == 0) {
-                if (t >= targetlen - 2) return r;
-                sprintf(target + t, " ");
-                t++;
-            }
-            r++;
-        }
+int binarraytohex(char *target, char *source, int length) {
+    unsigned char i, x;
+    int j = length;
+
+    if (j % 4)
+        return 0;
+
+    while (j) {
+        for (i = x = 0 ; i < 4 ; ++i)
+            x += (source[i] << (3 - i));
+        sprintf(target, "%X", x);
+        ++target;
+        source += 4;
+        j -= 4;
     }
-    return r;
+    return length;
 }
 
 // convert binary array to human readable binary
@@ -897,4 +873,4 @@ extern char *strmcopy(char *buf) {
         strcpy(str, buf);
     }
     return str;
-}
+}
\ No newline at end of file
diff --git a/client/util.h b/client/util.h
index c754542ab..9c68900e7 100644
--- a/client/util.h
+++ b/client/util.h
@@ -241,7 +241,7 @@ extern int param_getstr(const char *line, int paramnum, char *str, size_t buffer
 
 extern int hextobinarray(char *target,  char *source);
 extern int hextobinstring(char *target,  char *source);
-extern int binarraytohex(char *target, const size_t targetlen, char *source, size_t srclen);
+extern int binarraytohex(char *target,  char *source,  int length);
 extern void binarraytobinstring(char *target,  char *source,  int length);
 extern uint8_t GetParity(uint8_t *string, uint8_t type,  int length);
 extern void wiegand_add_parity(uint8_t *target, uint8_t *source, uint8_t length);
@@ -263,4 +263,4 @@ extern bool str_startswith(const char *s,  const char *pre);  // check for prefi
 extern void strcleanrn(char *buf, size_t len);
 extern void strcreplace(char *buf, size_t len, char from, char to);
 extern char *strmcopy(char *buf);
-#endif
+#endif
\ No newline at end of file
diff --git a/client/util_darwin.h b/client/util_darwin.h
index d89b681f2..15af75404 100644
--- a/client/util_darwin.h
+++ b/client/util_darwin.h
@@ -16,4 +16,4 @@ void enableAppNap();
 void makeUnfocusable();
 void makeFocusable();
 
-#endif
+#endif
\ No newline at end of file
diff --git a/common/bucketsort.h b/common/bucketsort.h
index 0a56509c1..1de175ae5 100644
--- a/common/bucketsort.h
+++ b/common/bucketsort.h
@@ -21,4 +21,4 @@ typedef struct bucket_info {
 void bucket_sort_intersect(uint32_t *const estart, uint32_t *const estop,
                            uint32_t *const ostart, uint32_t *const ostop,
                            bucket_info_t *bucket_info, bucket_array_t bucket);
-#endif
+#endif
\ No newline at end of file
diff --git a/common/cmd.c b/common/cmd.c
index 3b45c08ad..5f42c669a 100644
--- a/common/cmd.c
+++ b/common/cmd.c
@@ -61,4 +61,4 @@ uint8_t cmd_send(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void
 #endif
 
     return sendlen;
-}
+}
\ No newline at end of file
diff --git a/common/crc.c b/common/crc.c
index 2ad7609b1..0846697de 100644
--- a/common/crc.c
+++ b/common/crc.c
@@ -123,4 +123,4 @@ uint32_t CRC8Legic(uint8_t *buff, size_t size) {
     for (int i = 0; i < size; ++i)
         crc_update2(&crc, buff[i], 8);
     return reflect8(crc_finish(&crc));
-}
+}
\ No newline at end of file
diff --git a/common/crc16.h b/common/crc16.h
index 9a202f514..b88995a40 100644
--- a/common/crc16.h
+++ b/common/crc16.h
@@ -67,4 +67,4 @@ void reset_table(void);
 void generate_table(uint16_t polynomial, bool refin);
 uint16_t crc16_fast(uint8_t const *d, size_t n, uint16_t initval, bool refin, bool refout);
 
-#endif
+#endif
\ No newline at end of file
diff --git a/common/crc32.c b/common/crc32.c
index 440bed910..3ee102ce5 100644
--- a/common/crc32.c
+++ b/common/crc32.c
@@ -29,4 +29,4 @@ void crc32_ex(const uint8_t *data, const size_t len, uint8_t *crc) {
 
 void crc32_append(uint8_t *data, const size_t len) {
     crc32_ex(data, len, data + len);
-}
+}
\ No newline at end of file
diff --git a/common/crc64.c b/common/crc64.c
index 23360f6bd..7d582da02 100644
--- a/common/crc64.c
+++ b/common/crc64.c
@@ -80,4 +80,4 @@ void crc64(const uint8_t *data, const size_t len, uint64_t *crc) {
     }
 }
 
-//suint8_t x = (c & 0xFF00000000000000 ) >> 56;
+//suint8_t x = (c & 0xFF00000000000000 ) >> 56;
\ No newline at end of file
diff --git a/common/i2c.h b/common/i2c.h
index df7f6698c..4254a73c3 100644
--- a/common/i2c.h
+++ b/common/i2c.h
@@ -48,4 +48,4 @@ void SmartCardUpgrade(uint64_t arg0);
 void SmartCardSetBaud(uint64_t arg0);
 void SmartCardSetClock(uint64_t arg0);
 void I2C_print_status(void);
-#endif
+#endif
\ No newline at end of file
diff --git a/common/iso15693tools.c b/common/iso15693tools.c
index 795d1be60..7b64c99d1 100644
--- a/common/iso15693tools.c
+++ b/common/iso15693tools.c
@@ -14,13 +14,12 @@
 // return: ptr to string
 char *Iso15693sprintUID(char *target, uint8_t *uid) {
 
-    static char tempbuf[3 * 8 + 1] = {0};
+    static char tempbuf[2 * 8 + 1] = {0};
     if (target == NULL)
         target = tempbuf;
-
     sprintf(target, "%02X %02X %02X %02X %02X %02X %02X %02X",
             uid[7], uid[6], uid[5], uid[4],
             uid[3], uid[2], uid[1], uid[0]
            );
     return target;
-}
+}
\ No newline at end of file
diff --git a/common/iso15693tools.h b/common/iso15693tools.h
index 26a7a87a7..d7a1b2bb5 100644
--- a/common/iso15693tools.h
+++ b/common/iso15693tools.h
@@ -123,4 +123,4 @@ static const int Iso15693FrameEOF[] = {
     -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
 };
 
-#endif
+#endif
\ No newline at end of file
diff --git a/common/legic_prng.c b/common/legic_prng.c
index 5406161fc..fd5543cf7 100644
--- a/common/legic_prng.c
+++ b/common/legic_prng.c
@@ -62,4 +62,4 @@ uint32_t legic_prng_get_bits(uint8_t len) {
         legic_prng_forward(1);
     }
     return a;
-}
+}
\ No newline at end of file
diff --git a/common/lfdemod.c b/common/lfdemod.c
index 653c2a308..f356e7578 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -1357,7 +1357,6 @@ int BiphaseRawDecode(uint8_t *bits, size_t *size, int *offset, int invert) {
 //by marshmellow
 //take 10 and 01 and manchester decode
 //run through 2 times and take least errCnt
-// "7" indicates 00 or 11 wrong bit
 int manrawdecode(uint8_t *bits, size_t *size, uint8_t invert, uint8_t *alignPos) {
 
     // sanity check
@@ -1369,7 +1368,7 @@ int manrawdecode(uint8_t *bits, size_t *size, uint8_t invert, uint8_t *alignPos)
 
     //find correct start position [alignment]
     for (k = 0; k < 2; ++k) {
-        for (i = k; i < *size - 1; i += 2) {
+        for (i = k; i < *size - 3; i += 2) {
             if (bits[i] == bits[i + 1])
                 errCnt++;
         }
@@ -1381,7 +1380,7 @@ int manrawdecode(uint8_t *bits, size_t *size, uint8_t invert, uint8_t *alignPos)
     }
     *alignPos = bestRun;
     //decode
-    for (i = bestRun; i < *size - 1; i += 2) {
+    for (i = bestRun; i < *size - 3; i += 2) {
         if (bits[i] == 1 && (bits[i + 1] == 0)) {
             bits[bitnum++] = invert;
         } else if ((bits[i] == 0) && bits[i + 1] == 1) {
diff --git a/common/lfdemod.h b/common/lfdemod.h
index 96a91363f..883393cc3 100644
--- a/common/lfdemod.h
+++ b/common/lfdemod.h
@@ -22,7 +22,7 @@
 #include "util.h"    // for ARRAYLEN
 
 //might not be high enough for noisy environments
-#define NOISE_AMPLITUDE_THRESHOLD 15
+#define NOISE_AMPLITUDE_THRESHOLD 10
 //ignore buffer with less than x samples
 #define SIGNAL_MIN_SAMPLES 100
 //ignore first x samples of the buffer
diff --git a/common/prng.h b/common/prng.h
index b9f49c6b6..f160d6b30 100644
--- a/common/prng.h
+++ b/common/prng.h
@@ -21,4 +21,4 @@ void burtle_init_mod(prng_ctx *x, uint32_t seed);
 void burtle_init(prng_ctx *x, uint32_t seed);
 
 uint32_t GetSimplePrng(uint32_t seed);
-#endif /* __PRNG_H */
+#endif /* __PRNG_H */
\ No newline at end of file
diff --git a/common/protocols.h b/common/protocols.h
index 9fc168d46..00e3ef902 100644
--- a/common/protocols.h
+++ b/common/protocols.h
@@ -277,7 +277,6 @@ ISO 7816-4 Basic interindustry commands. For command APDU's.
 #define ISO_15693        7
 #define FELICA           8
 #define PROTO_MIFARE     9
-#define PROTO_HITAG     10
 
 //-- Picopass fuses
 #define FUSE_FPERS   0x80
diff --git a/common/radixsort.c b/common/radixsort.c
index 83b26d609..67f2910c1 100644
--- a/common/radixsort.c
+++ b/common/radixsort.c
@@ -96,4 +96,4 @@ uint64_t *radixSort(uint64_t *array, uint32_t size) {
     }
     free(cpy);
     return array;
-}
+}
\ No newline at end of file
diff --git a/common/radixsort.h b/common/radixsort.h
index 41a036461..29faf9825 100644
--- a/common/radixsort.h
+++ b/common/radixsort.h
@@ -20,4 +20,4 @@ typedef union {
 } rscounts_t;
 
 uint64_t *radixSort(uint64_t *array, uint32_t size);
-#endif // RADIXSORT_H__
+#endif // RADIXSORT_H__
\ No newline at end of file
diff --git a/common/random.h b/common/random.h
index 85c90dd38..315794f8d 100644
--- a/common/random.h
+++ b/common/random.h
@@ -18,4 +18,4 @@
 void fast_prand();
 void fast_prandEx(uint32_t seed);
 uint32_t prand();
-#endif
+#endif
\ No newline at end of file
diff --git a/common/tea.h b/common/tea.h
index 43ac93428..3a12a769d 100644
--- a/common/tea.h
+++ b/common/tea.h
@@ -15,4 +15,4 @@
 #include <stddef.h>
 void tea_encrypt(uint8_t *v, uint8_t *key);
 void tea_decrypt(uint8_t *v, uint8_t *key);
-#endif /* __TEA_H */
+#endif /* __TEA_H */
\ No newline at end of file
diff --git a/common/usart.c b/common/usart.c
index 869179091..46e8517fc 100644
--- a/common/usart.c
+++ b/common/usart.c
@@ -140,4 +140,4 @@ void usart_init(void) {
 
     // re-enable receiver / transmitter
     pUS1->US_CR = (AT91C_US_RXEN | AT91C_US_TXEN);
-}
+}
\ No newline at end of file
diff --git a/common/usb_cdc.c b/common/usb_cdc.c
index c871de241..d70c8ee04 100644
--- a/common/usb_cdc.c
+++ b/common/usb_cdc.c
@@ -949,4 +949,4 @@ void AT91F_CDC_Enumerate() {
             AT91F_USB_SendStall(pUdp);
             break;
     }
-}
+}
\ No newline at end of file
diff --git a/common/wiegand.c b/common/wiegand.c
index e319e1a08..2da88b085 100644
--- a/common/wiegand.c
+++ b/common/wiegand.c
@@ -236,4 +236,4 @@ void num_to_wiegand_bits(uint64_t oem, uint64_t fc, uint64_t cn, uint8_t *dest,
         default:
             break;
     }
-}
+}
\ No newline at end of file
diff --git a/include/at91sam7s512.h b/include/at91sam7s512.h
index f9f5f69b1..f8fa2e8d4 100644
--- a/include/at91sam7s512.h
+++ b/include/at91sam7s512.h
@@ -375,7 +375,7 @@ typedef struct _AT91S_DBGU {
 #define AT91C_US_TXBUFE       (0x1 << 11) // (DBGU) TXBUFE Interrupt
 #define AT91C_US_RXBUFF       (0x1 << 12) // (DBGU) RXBUFF Interrupt
 #define AT91C_US_COMM_TX      (0x1 << 30) // (DBGU) COMM_TX Interrupt
-#define AT91C_US_COMM_RX      (0x1u << 31) // (DBGU) COMM_RX Interrupt
+#define AT91C_US_COMM_RX      (0x1 << 31) // (DBGU) COMM_RX Interrupt
 // -------- DBGU_IDR : (DBGU Offset: 0xc) Debug Unit Interrupt Disable Register --------
 // -------- DBGU_IMR : (DBGU Offset: 0x10) Debug Unit Interrupt Mask Register --------
 // -------- DBGU_CSR : (DBGU Offset: 0x14) Debug Unit Channel Status Register --------
diff --git a/include/common.h b/include/common.h
index 8bf8ab702..2c3febc98 100644
--- a/include/common.h
+++ b/include/common.h
@@ -115,4 +115,4 @@ typedef struct {
 #ifdef __cplusplus
 }
 #endif
-#endif
+#endif
\ No newline at end of file
diff --git a/include/hitag.h b/include/hitag.h
deleted file mode 100644
index 742d7ecd0..000000000
--- a/include/hitag.h
+++ /dev/null
@@ -1,117 +0,0 @@
-//-----------------------------------------------------------------------------
-// This code is licensed to you under the terms of the GNU GPL, version 2 or,
-// at your option, any later version. See the LICENSE.txt file for the text of
-// the license.
-//-----------------------------------------------------------------------------
-// Hitag2, HitagS
-//
-// (c) 2012 Roel Verdult
-// (c) 2016 Oguzhan Cicek, Hendrik Schwartke, Ralf Spenneberg
-//     <info@os-s.de>
-//-----------------------------------------------------------------------------
-
-
-#ifndef HITAG_H__
-#define HITAG_H__
-
-#ifdef _MSC_VER
-#define PACKED
-#else
-#define PACKED __attribute__((packed))
-#endif
-
-typedef enum {
-    RHTSF_CHALLENGE           = 01,
-    RHTSF_KEY                 = 02,
-    WHTSF_CHALLENGE           = 03,
-    WHTSF_KEY                 = 04,
-    RHT2F_PASSWORD            = 21,
-    RHT2F_AUTHENTICATE        = 22,
-    RHT2F_CRYPTO              = 23,
-    WHT2F_CRYPTO              = 24,
-    RHT2F_TEST_AUTH_ATTEMPTS  = 25,
-    RHT2F_UID_ONLY            = 26,
-} hitag_function;
-
-typedef struct {
-    uint8_t password[4];
-} PACKED rht2d_password;
-
-typedef struct {
-    uint8_t NrAr[8];
-    uint8_t data[4];
-} PACKED rht2d_authenticate;
-
-typedef struct {
-    uint8_t key[6];
-    uint8_t data[4];
-} PACKED rht2d_crypto;
-
-typedef union {
-    rht2d_password     pwd;
-    rht2d_authenticate auth;
-    rht2d_crypto       crypto;
-} hitag_data;
-
-
-//---------------------------------------------------------
-// Hitag S
-//---------------------------------------------------------
-// protocol-state
-typedef enum PROTO_STATE {
-    HT_READY = 0,
-    HT_INIT,
-    HT_AUTHENTICATE,
-    HT_SELECTED,
-    HT_QUIET,
-    HT_TTF,
-    HT_FAIL
-} PSTATE;
-
-typedef enum TAG_STATE {
-    HT_NO_OP = 0,
-    HT_READING_PAGE,
-    HT_WRITING_PAGE_ACK,
-    HT_WRITING_PAGE_DATA,
-    HT_WRITING_BLOCK_DATA
-} TSATE;
-
-//number of start-of-frame bits
-typedef enum SOF_TYPE {
-    HT_STANDARD = 0,
-    HT_ADVANCED,
-    HT_FAST_ADVANCED,
-    HT_ONE,
-    HT_NO_BITS
-} stype;
-
-struct hitagS_tag {
-    PSTATE   pstate;  //protocol-state
-    TSATE    tstate;  //tag-state
-    uint32_t uid;
-    uint8_t  pages[64][4];
-    uint64_t key;
-    uint8_t  pwdl0, pwdl1, pwdh0;
-    //con0
-    int      max_page;
-    stype    mode;
-    //con1
-    bool     auth;   //0=Plain 1=Auth
-    bool     TTFC;   //Transponder Talks first coding. 0=Manchester 1=Biphase
-    int      TTFDR;  //data rate in TTF Mode
-    int      TTFM;   //the number of pages that are sent to the RWD
-    bool     LCON;   //0=con1/2 read write 1=con1 read only and con2 OTP
-    bool     LKP;    //0=page2/3 read write 1=page2/3 read only in Plain mode and no access in authenticate mode
-    //con2
-    //0=read write 1=read only
-    bool     LCK7;   //page4/5
-    bool     LCK6;   //page6/7
-    bool     LCK5;   //page8-11
-    bool     LCK4;   //page12-15
-    bool     LCK3;   //page16-23
-    bool     LCK2;   //page24-31
-    bool     LCK1;   //page32-47
-    bool     LCK0;   //page48-63
-};
-
-#endif
diff --git a/include/mifare.h b/include/mifare.h
index 83b5ccd12..d0b1168fa 100644
--- a/include/mifare.h
+++ b/include/mifare.h
@@ -72,8 +72,7 @@ typedef enum ISO14B_COMMAND {
     ISO14B_REQUEST_TRIGGER = (1 << 4),
     ISO14B_APPEND_CRC = (1 << 5),
     ISO14B_SELECT_STD = (1 << 6),
-    ISO14B_SELECT_SR = (1 << 7),
-    ISO14B_SET_TIMEOUT = (1 << 8),
+    ISO14B_SELECT_SR = (1 << 7)
 } iso14b_command_t;
 
 typedef enum ISO15_COMMAND {
diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index bd270c9d4..7ee961466 100644
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -129,7 +129,7 @@ typedef struct {
 #define CMD_IO_DEMOD_FSK                                                  0x021A
 #define CMD_IO_CLONE_TAG                                                  0x021B
 #define CMD_EM410X_DEMOD                                                  0x021c
-// Sampling configuration for LF reader/sniffer
+// Sampling configuration for LF reader/snooper
 #define CMD_SET_LF_SAMPLING_CONFIG                                        0x021d
 #define CMD_FSK_SIM_TAG                                                   0x021E
 #define CMD_ASK_SIM_TAG                                                   0x021F
@@ -154,10 +154,10 @@ typedef struct {
 #define CMD_ISO_15693_COMMAND                                             0x0313
 #define CMD_ISO_15693_COMMAND_DONE                                        0x0314
 #define CMD_ISO_15693_FIND_AFI                                            0x0315
-#define CMD_LF_SNIFF_RAW_ADC_SAMPLES                                      0x0317
+#define CMD_LF_SNOOP_RAW_ADC_SAMPLES                                      0x0317
 
 // For Hitag2 transponders
-#define CMD_SNIFF_HITAG                                                   0x0370
+#define CMD_SNOOP_HITAG                                                   0x0370
 #define CMD_SIMULATE_HITAG                                                0x0371
 #define CMD_READER_HITAG                                                  0x0372
 
@@ -170,9 +170,9 @@ typedef struct {
 
 #define CMD_ANTIFUZZ_ISO_14443a                                           0x0380
 #define CMD_SIMULATE_TAG_ISO_14443B                                       0x0381
-#define CMD_SNIFF_ISO_14443B                                              0x0382
+#define CMD_SNOOP_ISO_14443B                                              0x0382
 
-#define CMD_SNIFF_ISO_14443a                                              0x0383
+#define CMD_SNOOP_ISO_14443a                                              0x0383
 #define CMD_SIMULATE_TAG_ISO_14443a                                       0x0384
 
 #define CMD_READER_ISO_14443a                                             0x0385
@@ -192,7 +192,7 @@ typedef struct {
 #define CMD_ICLASS_READCHECK                                              0x038F
 #define CMD_ICLASS_CLONE                                                  0x0390
 #define CMD_ICLASS_DUMP                                                   0x0391
-#define CMD_SNIFF_ICLASS                                                  0x0392
+#define CMD_SNOOP_ICLASS                                                  0x0392
 #define CMD_SIMULATE_TAG_ICLASS                                           0x0393
 #define CMD_READER_ICLASS                                                 0x0394
 #define CMD_READER_ICLASS_REPLAY                                          0x0395
@@ -204,7 +204,7 @@ typedef struct {
 
 // For ISO1092 / FeliCa
 #define CMD_FELICA_SIMULATE_TAG                                           0x03A0
-#define CMD_FELICA_SNIFF                                                  0x03A1
+#define CMD_FELICA_SNOOP                                                  0x03A1
 #define CMD_FELICA_COMMAND                                                0x03A2
 //temp
 #define CMD_FELICA_LITE_DUMP                                              0x03AA
diff --git a/proxmark3.sh b/proxmark3.sh
index b109d82e6..34691b95a 100755
--- a/proxmark3.sh
+++ b/proxmark3.sh
@@ -2,7 +2,7 @@
 
 function wait4proxmark_Linux {
     echo >&2 "Waiting for Proxmark to appear..."
-    while [ ! -c /dev/ttyACM? -a ! -c /dev/pm3-? ]; do
+    while [ ! -c /dev/ttyACM? -a ! -L /dev/pm3-? ]; do
         sleep .1
     done
     local PM3=`ls -1 /dev/pm3-? /dev/ttyACM? 2>/dev/null | head -1`
diff --git a/tools/Makefile b/tools/Makefile
index 3b1dc1b0f..51a76677b 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -16,4 +16,4 @@ get_xorsearch:
 #  Mingw
 #	unzzip-big XORSearch_V1_11_2.zip
 #  linux
-#	gunzip  XORSearch_V1_11_2.zip
+#	gunzip  XORSearch_V1_11_2.zip
\ No newline at end of file
diff --git a/tools/findbits_test.py b/tools/findbits_test.py
index db8dda8fa..4415ce726 100644
--- a/tools/findbits_test.py
+++ b/tools/findbits_test.py
@@ -65,4 +65,4 @@ class OutputBuffer(object):
 
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main()
\ No newline at end of file
diff --git a/tools/mkversion.pl b/tools/mkversion.pl
index ed5cea206..023c84c8b 100644
--- a/tools/mkversion.pl
+++ b/tools/mkversion.pl
@@ -4,7 +4,7 @@
 # Normally a couple of lines of bash would be enough (see openpcd project, original firmware by Harald Welte and Milosch Meriac)
 # but this will, at least in theory, also work on Windows with our current compile environment.
 # -- Henryk Plötz <henryk@ploetzli.ch> 2009-09-28
-# Modified april 2014 because of the move to github.
+# Modified april 2014 because of the move to github. 
 # --- Martin Holst Swende <martin@swende.se>
 # Modified january 2016 to work with Travis-CI
 # --- iceman <iceman@iuse.se>
@@ -19,9 +19,9 @@ my $ctime;
 # GIT status  0 = dirty,  1 = clean ,  2 = undecided
 my $clean = 2;
 
-# Do we have acces to git command?
+# Do we have acces to git command? 
 #######
-# solves some bug on macos i.e:
+# solves some bug on macos i.e: 
 ##
 # perl ../tools/mkversion.pl .. > version.c || cp ../common/default_version.c version.c
 # /usr/bin/which: /usr/bin/which: cannot execute binary file
diff --git a/uart/uart_win32.c b/uart/uart_win32.c
index 6107a564e..0717a24cb 100644
--- a/uart/uart_win32.c
+++ b/uart/uart_win32.c
@@ -174,4 +174,4 @@ bool uart_send(const serial_port sp, const uint8_t *p_tx, const size_t len) {
     return WriteFile(((serial_port_windows *)sp)->hPort, p_tx, len, &txlen, NULL);
 }
 
-#endif
+#endif
\ No newline at end of file

From 48a28fa575512b468d1705cfe268b4b6d041ad3a Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 15 Mar 2019 22:05:36 +0100
Subject: [PATCH 0811/1938] fix: mem leaks

---
 client/cmddata.c      | 6 ++----
 client/cmdlfhitag.c   | 4 ++--
 client/cmdsmartcard.c | 6 ++++++
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/client/cmddata.c b/client/cmddata.c
index aa44611ed..072e8a73e 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -1865,11 +1865,9 @@ int Cmdhex2bin(const char *Cmd) {
         else
             continue;
 
-        //Uses printf instead of PrintAndLog since the latter
-        // adds linebreaks to each printout - this way was more convenient since we don't have to
-        // allocate a string and write to that first...
+        //Uses printf instead of PrintAndLog since the latter adds linebreaks to each printout
         for (int i = 0 ; i < 4 ; ++i)
-            PrintAndLogEx(NORMAL, "%d", (x >> (3 - i)) & 1);
+            printf("%d", (x >> (3 - i)) & 1);
     }
     PrintAndLogEx(NORMAL, "\n");
     return 0;
diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index 5a7d58307..c0d24c0bb 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -351,7 +351,7 @@ static void printHitagConfiguration(uint8_t config) {
     char bits[9];
     char *bs = bits;
     for (uint8_t i = 0 ; i < 8 ; i++) {
-        snprintf(bs, sizeof(bits), "%d", (config >> (7 - i)) & 1);
+        snprintf(bs, sizeof(bits) - i, "%1d", (config >> (7 - i)) & 1);
         bs++;
     }
 
@@ -359,7 +359,7 @@ static void printHitagConfiguration(uint8_t config) {
     PrintAndLogEx(INFO, "------------------------------------");
     
     //configuration byte
-    PrintAndLogEx(SUCCESS, "Config byte : %02X - %s", config, bits);    
+    PrintAndLogEx(SUCCESS, "Config byte : 0x%02X [ %s ]", config, bits);    
     
     // encoding
     strcat(msg, "Encoding    : ");
diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index 8d00fa128..125475080 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -667,6 +667,7 @@ int CmdSmartUpgrade(const char *Cmd) {
     f = fopen(sha512filename, "rb");
     if (!f) {
         PrintAndLogEx(FAILED, "SHA-512 file not found or locked.");
+        free(dump);
         return 1;
     }
 
@@ -678,12 +679,14 @@ int CmdSmartUpgrade(const char *Cmd) {
     if (fsize < 0)  {
         PrintAndLogEx(FAILED, "Could not determine size of SHA-512 file");
         fclose(f);
+        free(dump);        
         return 1;
     }
 
     if (fsize < 128) {
         PrintAndLogEx(FAILED, "SHA-512 file too short");
         fclose(f);
+        free(dump);        
         return 1;
     }
 
@@ -697,17 +700,20 @@ int CmdSmartUpgrade(const char *Cmd) {
     uint8_t hash1[64];
     if (bytes_read != 128 || param_gethex(hashstring, 0, hash1, 128)) {
         PrintAndLogEx(FAILED, "Couldn't read SHA-512 file");
+        free(dump);        
         return 1;
     }
 
     uint8_t hash2[64];
     if (sha512hash(dump, firmware_size, hash2)) {
         PrintAndLogEx(FAILED, "Couldn't calculate SHA-512 of firmware");
+        free(dump);        
         return 1;
     }
 
     if (memcmp(hash1, hash2, 64)) {
         PrintAndLogEx(FAILED, "Couldn't verify integrity of firmware file " _RED_("(wrong SHA-512 hash)"));
+        free(dump);        
         return 1;
     }
 

From 35da3707d33dbdf7c3314f49b23aeb5344f888ac Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 15 Mar 2019 22:07:21 +0100
Subject: [PATCH 0812/1938] fix: 'hf iclass decrypt' - use after free

---
 client/cmdhficlass.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index ad0f510a7..4fd8b5b1f 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -784,8 +784,8 @@ int CmdHFiClassDecrypt(const char *Cmd) {
     }
 
     saveFile(outfilename, "bin", decrypted, fsize);
-    free(decrypted);
     printIclassDumpContents(decrypted, 1, (fsize / 8), fsize);
+    free(decrypted);    
     return 0;
 }
 

From 77ebf1ddbf37c2d875bc08bf5316f2671b1a1f72 Mon Sep 17 00:00:00 2001
From: vratiskol <vincent.ratiskol@github.com>
Date: Fri, 15 Mar 2019 23:14:19 +0100
Subject: [PATCH 0813/1938] Correct return

---
 armsrc/mifaresim.c | 33 +++++++++++++--------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/armsrc/mifaresim.c b/armsrc/mifaresim.c
index a0978a53c..ab060b919 100644
--- a/armsrc/mifaresim.c
+++ b/armsrc/mifaresim.c
@@ -36,38 +36,32 @@ static bool IsTrailerAccessAllowed(uint8_t blockNo, uint8_t keytype, uint8_t act
                  | ((sector_trailer[8] >> 7) & 0x01);
     switch (action) {
         case AC_KEYA_READ: {
-            return false;
             if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("IsTrailerAccessAllowed: AC_KEYA_READ");
-            break;
+            return false;
         }
         case AC_KEYA_WRITE: {
+            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("IsTrailerAccessAllowed: AC_KEYA_WRITE");
             return ((keytype == AUTHKEYA && (AC == 0x00 || AC == 0x01))
                     || (keytype == AUTHKEYB && (AC == 0x04 || AC == 0x03)));
-            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("IsTrailerAccessAllowed: AC_KEYA_WRITE");
-            break;
         }
         case AC_KEYB_READ: {
-            return (keytype == AUTHKEYA && (AC == 0x00 || AC == 0x02 || AC == 0x01));
             if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("IsTrailerAccessAllowed: AC_KEYB_READ");
-            break;
+            return (keytype == AUTHKEYA && (AC == 0x00 || AC == 0x02 || AC == 0x01));
         }
         case AC_KEYB_WRITE: {
+            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("IsTrailerAccessAllowed: AC_KEYB_WRITE");
             return ((keytype == AUTHKEYA && (AC == 0x00 || AC == 0x04))
                     || (keytype == AUTHKEYB && (AC == 0x04 || AC == 0x03)));
-            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("IsTrailerAccessAllowed: AC_KEYB_WRITE");
-            break;
         }
         case AC_AC_READ: {
+            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("IsTrailerAccessAllowed: AC_AC_READ");
             return ((keytype == AUTHKEYA)
                     || (keytype == AUTHKEYB && !(AC == 0x00 || AC == 0x02 || AC == 0x01)));
-            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("IsTrailerAccessAllowed: AC_AC_READ");
-            break;
         }
         case AC_AC_WRITE: {
+            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("IsTrailerAccessAllowed: AC_AC_WRITE");
             return ((keytype == AUTHKEYA && (AC == 0x01))
                     || (keytype == AUTHKEYB && (AC == 0x03 || AC == 0x05)));
-            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("IsTrailerAccessAllowed: AC_AC_WRITE");
-            break;
         }
         default:
             return false;
@@ -93,18 +87,21 @@ static bool IsDataAccessAllowed(uint8_t blockNo, uint8_t keytype, uint8_t action
             AC = ((sector_trailer[7] >> 2) & 0x04)
                  | ((sector_trailer[8] << 1) & 0x02)
                  | ((sector_trailer[8] >> 4) & 0x01);
+            if (MF_DBGLEVEL >= 2)	Dbprintf("IsDataAccessAllowed: case 0x00");
             break;
         }
         case 0x01: {
             AC = ((sector_trailer[7] >> 3) & 0x04)
                  | ((sector_trailer[8] >> 0) & 0x02)
                  | ((sector_trailer[8] >> 5) & 0x01);
+            if (MF_DBGLEVEL >= 2)	Dbprintf("IsDataAccessAllowed: case 0x01");
             break;
         }
         case 0x02: {
             AC = ((sector_trailer[7] >> 4) & 0x04)
                  | ((sector_trailer[8] >> 1) & 0x02)
                  | ((sector_trailer[8] >> 6) & 0x01);
+            if (MF_DBGLEVEL >= 2)	Dbprintf("IsDataAccessAllowed: case 0x02");
             break;
         }
         default:
@@ -113,28 +110,24 @@ static bool IsDataAccessAllowed(uint8_t blockNo, uint8_t keytype, uint8_t action
 
     switch (action) {
         case AC_DATA_READ: {
+            if (MF_DBGLEVEL >= 2)	Dbprintf("AC_DATA_READ: OK");
             return ((keytype == AUTHKEYA && !(AC == 0x03 || AC == 0x05 || AC == 0x07))
                     || (keytype == AUTHKEYB && !(AC == 0x07)));
-            if (MF_DBGLEVEL >= 2)	Dbprintf("AC_DATA_READ: OK");
-            break;
         }
         case AC_DATA_WRITE: {
+            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("AC_DATA_WRITE: OK");
             return ((keytype == AUTHKEYA && (AC == 0x00))
                     || (keytype == AUTHKEYB && (AC == 0x00 || AC == 0x04 || AC == 0x06 || AC == 0x03)));
-            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("AC_DATA_WRITE: OK");
-            break;
         }
         case AC_DATA_INC: {
+            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("AC_DATA_WRITE: OK");
             return ((keytype == AUTHKEYA && (AC == 0x00))
                     || (keytype == AUTHKEYB && (AC == 0x00 || AC == 0x06)));
-            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("AC_DATA_WRITE: OK");
-            break;
         }
         case AC_DATA_DEC_TRANS_REST: {
+            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("AC_DATA_DEC_TRANS_REST: OK");
             return ((keytype == AUTHKEYA && (AC == 0x00 || AC == 0x06 || AC == 0x01))
                     || (keytype == AUTHKEYB && (AC == 0x00 || AC == 0x06 || AC == 0x01)));
-            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("AC_DATA_DEC_TRANS_REST: OK");
-            break;
         }
     }
 

From ac575cf3ce5259c3dc399a698bb29a210e7a672d Mon Sep 17 00:00:00 2001
From: vratiskol <vincent.ratiskol@github.com>
Date: Sat, 16 Mar 2019 00:17:13 +0100
Subject: [PATCH 0814/1938] Correct flags & test

---
 armsrc/mifaresim.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/armsrc/mifaresim.c b/armsrc/mifaresim.c
index ab060b919..83f82078c 100644
--- a/armsrc/mifaresim.c
+++ b/armsrc/mifaresim.c
@@ -496,7 +496,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
             crypto1_destroy(pcs);
             cardAUTHKEY = AUTHKEYNONE;
             //nonce = prng_successor(selTimer, 32) // RRG Repo, same as prand() ???
-            if (flags & FLAG_RANDOM_NONCE) {
+            if (( flags & FLAG_RANDOM_NONCE) == FLAG_RANDOM_NONCE ) {
                 nonce = prand();
             }
             LED_B_OFF();
@@ -944,7 +944,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                                                 // switch to moebius collection
                                                 gettingMoebius = true;
                                                 mM = ATTACK_KEY_COUNT;
-                                                if (flags & FLAG_RANDOM_NONCE) {
+                                                if ((flags & FLAG_RANDOM_NONCE) == FLAG_RANDOM_NONCE)  {
                                                     nonce = prand();
                                                 } else {
                                                     nonce = nonce * 7;
@@ -1093,7 +1093,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
 
 
     // NR AR ATTACK
-    if (flags & FLAG_NR_AR_ATTACK && MF_DBGLEVEL >= 1) {
+    if (((flags & FLAG_NR_AR_ATTACK) == FLAG_NR_AR_ATTACK) && (MF_DBGLEVEL >= 1)) {
         for (uint8_t	i = 0; i < ATTACK_KEY_COUNT; i++) {
             if (ar_nr_collected[i] == 2) {
                 Dbprintf("Collected two pairs of AR/NR which can be used to extract %s from reader for sector %d:", (i < ATTACK_KEY_COUNT / 2) ? "keyA" : "keyB", ar_nr_resp[i].sector);

From 0a648e38071fcbee94bb4eddd2a278eaaa0a419b Mon Sep 17 00:00:00 2001
From: vratiskol <vincent.ratiskol@github.com>
Date: Sat, 16 Mar 2019 01:25:10 +0100
Subject: [PATCH 0815/1938] Add Data Block debug

---
 armsrc/mifaresim.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/armsrc/mifaresim.c b/armsrc/mifaresim.c
index 83f82078c..07c9df116 100644
--- a/armsrc/mifaresim.c
+++ b/armsrc/mifaresim.c
@@ -105,6 +105,7 @@ static bool IsDataAccessAllowed(uint8_t blockNo, uint8_t keytype, uint8_t action
             break;
         }
         default:
+            if (MF_DBGLEVEL >= 2)	Dbprintf("IsDataAccessAllowed: Error");
             return false;
     }
 
@@ -697,7 +698,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
 
                     cardSTATE = MFEMUL_WORK;
                     LED_B_ON();
-                    if (MF_DBGLEVEL >= 4)	Dbprintf("--> WORK. anticol3 time: %d", GetTickCount() - selTimer);
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("--> WORK. anticol3 time: %d", GetTickCount() - selTimer);
                     break;
                 }
                 cardSTATE_TO_IDLE();
@@ -784,7 +785,12 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                     blockNo = receivedCmd_dec[1];
                     if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Reader reading block %d (0x%02x)", blockNo, blockNo);
                     emlGetMem(response, blockNo, 1);
-                    if (MF_DBGLEVEL >= 2) Dbprintf("Data Block: %02x%02x%02x%02x%02x%02x%02x%02x%02x", response);
+                    if (MF_DBGLEVEL >= 2)  {
+                       Dbprintf("Data Block[%d]: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", blockNo,
+                       response[0], response[1], response[2], response[3],  response[4],  response[5],  response[6],
+                       response[7], response[8], response[9], response[10], response[11], response[12], response[13],
+                       response[14],response[15]);
+                    }
 
 
                     if (IsSectorTrailer(blockNo)) {
@@ -1000,7 +1006,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                             );
                 }
                 LED_C_ON();
-                //cardSTATE = MFEMUL_WORK;
+                cardSTATE = MFEMUL_WORK;
                 if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("cardSTATE = MFEMUL_WORK");
                 break;
             }

From f51e6fbad211846c4618178ca25f73a07fe2b13d Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 16 Mar 2019 01:26:15 +0100
Subject: [PATCH 0816/1938] fix double free

---
 client/cmdhfmf.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 44722a7bb..07394c2fc 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -1321,8 +1321,6 @@ int CmdHF14AMfNested(const char *Cmd) {
         }
         free(e_sector);
     }
-
-    free(e_sector);
     return 0;
 }
 

From a856ad638c718f5e890c305be0bb46bbe9a438a4 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 16 Mar 2019 01:35:34 +0100
Subject: [PATCH 0817/1938] Adjust mifare_autopwn to latest hf mf dump

---
 client/scripts/mifare_autopwn.lua | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/client/scripts/mifare_autopwn.lua b/client/scripts/mifare_autopwn.lua
index b99488d96..9a94b7a98 100644
--- a/client/scripts/mifare_autopwn.lua
+++ b/client/scripts/mifare_autopwn.lua
@@ -107,7 +107,7 @@ local function dump(uid, numsectors)
 
     if utils.confirm('Do you wish to create a memory dump of tag?') then
 
-        local dumpfile = 'hf-mf-'..uid..'-data.bin'
+        local dumpfile = 'hf-mf-'..uid..'-data'
 
         local dmp = ('hf mf dump %s f %s'):format(typ, dumpfile)
         core.console(dmp)
@@ -115,14 +115,10 @@ local function dump(uid, numsectors)
         -- Save the global args, those are *our* arguments
         local myargs = args
         -- Set the arguments for htmldump script
-        args =('-i %s -o %s.html'):format(dumpfile, uid)
+        args =('-i %s.bin -o %s.html'):format(dumpfile, dumpfile)
         -- call it
         require('htmldump')
 
-        -- dump to emulator
-        args =('-i %s -o %s.eml'):format(dumpfile, uid)
-        require('dumptoemul')
-
         -- Set back args. Not that it's used, just for the karma...
         args = myargs
     end

From a3e0e90bf3a53d176a3772e4bd74ab502bd94498 Mon Sep 17 00:00:00 2001
From: vratiskol <vincent.ratiskol@github.com>
Date: Sat, 16 Mar 2019 03:01:03 +0100
Subject: [PATCH 0818/1938] Add Variable for MAX_MIFARE_FRAME_SIZE

---
 armsrc/mifaresim.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/armsrc/mifaresim.c b/armsrc/mifaresim.c
index 07c9df116..1c0fc3a20 100644
--- a/armsrc/mifaresim.c
+++ b/armsrc/mifaresim.c
@@ -36,7 +36,7 @@ static bool IsTrailerAccessAllowed(uint8_t blockNo, uint8_t keytype, uint8_t act
                  | ((sector_trailer[8] >> 7) & 0x01);
     switch (action) {
         case AC_KEYA_READ: {
-            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("IsTrailerAccessAllowed: AC_KEYA_READ");
+            if (MF_DBGLEVEL >= 2)	Dbprintf("IsTrailerAccessAllowed: AC_KEYA_READ");
             return false;
         }
         case AC_KEYA_WRITE: {
@@ -45,7 +45,7 @@ static bool IsTrailerAccessAllowed(uint8_t blockNo, uint8_t keytype, uint8_t act
                     || (keytype == AUTHKEYB && (AC == 0x04 || AC == 0x03)));
         }
         case AC_KEYB_READ: {
-            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("IsTrailerAccessAllowed: AC_KEYB_READ");
+            if (MF_DBGLEVEL >= 2)	Dbprintf("IsTrailerAccessAllowed: AC_KEYB_READ");
             return (keytype == AUTHKEYA && (AC == 0x00 || AC == 0x02 || AC == 0x01));
         }
         case AC_KEYB_WRITE: {
@@ -811,9 +811,10 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                         }
                     }
                     AppendCrc14443a(response, 16);
-                    mf_crypto1_encrypt(pcs, response, 18, response_par);
-                    EmSendCmdPar(response, 18, response_par);
+                    mf_crypto1_encrypt(pcs, response, MAX_MIFARE_FRAME_SIZE, response_par);
+                    EmSendCmdPar(response, MAX_MIFARE_FRAME_SIZE, response_par);
                     numReads++;
+                    if (MF_DBGLEVEL >= 2) Dbprintf("Num Read: %d",numReads);
                     if (exitAfterNReads > 0 && numReads == exitAfterNReads) {
                         Dbprintf("%d reads done, exiting", numReads);
                         finished = true;
@@ -1014,7 +1015,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
 
             // WRITE BL2
             case MFEMUL_WRITEBL2: {
-                if (receivedCmd_len == 18) {
+                if (receivedCmd_len == MAX_MIFARE_FRAME_SIZE) {
                     mf_crypto1_decryptEx(pcs, receivedCmd, receivedCmd_len, receivedCmd_dec);
                     if (HasValidCRC(receivedCmd_dec, receivedCmd_len)) {
                         if (IsSectorTrailer(cardWRBL)) {

From 619ef2ba373ed71439b6b78b558f1fc90ca40f40 Mon Sep 17 00:00:00 2001
From: vratiskol <vincent.ratiskol@github.com>
Date: Sat, 16 Mar 2019 03:46:36 +0100
Subject: [PATCH 0819/1938] Use Variable

---
 armsrc/mifareutil.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/armsrc/mifareutil.c b/armsrc/mifareutil.c
index 929851b4b..fa4a6518e 100644
--- a/armsrc/mifareutil.c
+++ b/armsrc/mifareutil.c
@@ -592,7 +592,7 @@ void emlClearMem(void) {
     memset(emCARD, 0, CARD_MEMORY_SIZE);
 
     // fill sectors trailer data
-    for (uint16_t b = 3; b < 256; ((b < 127) ? (b += 4) : (b += 16)))
+    for (uint16_t b = 3; b <= MIFARE_4K_MAXBLOCK; ((b <= MIFARE_2K_MAXBLOCK ) ? (b += 4) : (b += 16)))
         emlSetMem((uint8_t *)trailer, b, 1);
 
     // uid
@@ -601,9 +601,11 @@ void emlClearMem(void) {
 }
 
 uint8_t SectorTrailer(uint8_t blockNo) {
-    if (blockNo < 32 * 4) {
+    if (blockNo <= MIFARE_2K_MAXBLOCK) {
+        if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("Sector Trailer for block %d : %d", blockNo, (blockNo | 0x03));  
         return (blockNo | 0x03);
     } else {
+        if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("Sector Trailer for block %d : %d", blockNo, (blockNo | 0x0f));
         return (blockNo | 0x0f);
     }
 }

From 3efa05060e6cab61a41910b85571e60ec7f14455 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 16 Mar 2019 07:18:58 +0100
Subject: [PATCH 0820/1938] chg: update reveng v1.6.0 ->  v1.6.2

---
 client/cmdcrc.c        |   2 +-
 client/reveng/bmpbit.c |   6 +-
 client/reveng/cli.c    |   8 +-
 client/reveng/config.h |   6 +-
 client/reveng/model.c  |  11 +-
 client/reveng/poly.c   |   6 +-
 client/reveng/preset.c | 627 +++++++++++++++++++++--------------------
 client/reveng/reveng.c |   6 +-
 client/reveng/reveng.h |   8 +-
 client/scripting.c     |   2 +-
 10 files changed, 345 insertions(+), 337 deletions(-)

diff --git a/client/cmdcrc.c b/client/cmdcrc.c
index be74fc39a..2b50f2b91 100644
--- a/client/cmdcrc.c
+++ b/client/cmdcrc.c
@@ -401,7 +401,7 @@ char *SwapEndianStr(const char *inStr, const size_t len, const uint8_t blockSize
 // takes hex string in and searches for a matching result (hex string must include checksum)
 int CmdrevengSearch(const char *Cmd) {
 
-#define NMODELS 105
+#define NMODELS 106
 
     char inHexStr[100] = {0x00};
     int dataLen = param_getstr(Cmd, 0, inHexStr, sizeof(inHexStr));
diff --git a/client/reveng/bmpbit.c b/client/reveng/bmpbit.c
index 9d2b2badc..d529b0e96 100644
--- a/client/reveng/bmpbit.c
+++ b/client/reveng/bmpbit.c
@@ -1,10 +1,10 @@
 /* bmpbit.c
- * Greg Cook, 26/Jul/2018
+ * Greg Cook, 23/Feb/2019
  */
 
 /* CRC RevEng: arbitrary-precision CRC calculator and algorithm finder
- * Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
- * Gregory Cook
+ * Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018,
+ * 2019  Gregory Cook
  *
  * This file is part of CRC RevEng.
  *
diff --git a/client/reveng/cli.c b/client/reveng/cli.c
index bf91269f7..6aa4b5077 100644
--- a/client/reveng/cli.c
+++ b/client/reveng/cli.c
@@ -1,10 +1,10 @@
 /* cli.c
- * Greg Cook, 26/Jul/2018
+ * Greg Cook, 23/Feb/2019
  */
 
 /* CRC RevEng: arbitrary-precision CRC calculator and algorithm finder
- * Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
- * Gregory Cook
+ * Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018,
+ * 2019  Gregory Cook
  *
  * This file is part of CRC RevEng.
  *
@@ -628,7 +628,7 @@ usage(void) {
             "\t      preset values\n"
             "\n"
             "Copyright (C)\n"
-            "2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018  Gregory Cook\n"
+			"2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019  Gregory Cook\n"
             "This is free software; see the source for copying conditions.  There is NO\n"
             "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
             "Version "
diff --git a/client/reveng/config.h b/client/reveng/config.h
index eeca55231..a4d46e9f2 100644
--- a/client/reveng/config.h
+++ b/client/reveng/config.h
@@ -1,10 +1,10 @@
 /* config.h
- * Greg Cook, 26/Jul/2018
+ * Greg Cook, 23/Feb/2019
  */
 
 /* CRC RevEng: arbitrary-precision CRC calculator and algorithm finder
- * Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
- * Gregory Cook
+ * Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018,
+ * 2019  Gregory Cook
  *
  * This file is part of CRC RevEng.
  *
diff --git a/client/reveng/model.c b/client/reveng/model.c
index 5d3ffc759..ba5e84f07 100644
--- a/client/reveng/model.c
+++ b/client/reveng/model.c
@@ -1,10 +1,10 @@
 /* model.c
- * Greg Cook, 26/Jul/2018
+ * Greg Cook, 23/Feb/2019
  */
 
 /* CRC RevEng: arbitrary-precision CRC calculator and algorithm finder
- * Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
- * Gregory Cook
+ * Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018,
+ * 2019  Gregory Cook
  *
  * This file is part of CRC RevEng.
  *
@@ -22,7 +22,8 @@
  * along with CRC RevEng.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-/* 2017-02-19: revised residue calculation for crossed-endian models
+/* 2018-12-17: mnovel() clears class flags
+ * 2017-02-19: revised residue calculation for crossed-endian models
  * 2017-02-05: added magic field
  * 2016-02-22: split off preset.c
  * 2012-03-03: single-line Williams model string conversion
@@ -241,7 +242,9 @@ void mrev(model_t *model) {
 
 void mnovel(model_t *model) {
     /* remove name and check string from modified model */
+	/* previous classification no longer applies */
     model->name = NULL;
+	model->flags &= ~P_CLMASK;
     pfree(&model->check);
     pfree(&model->magic);
 }
diff --git a/client/reveng/poly.c b/client/reveng/poly.c
index 1dc241231..6c07e5241 100644
--- a/client/reveng/poly.c
+++ b/client/reveng/poly.c
@@ -1,10 +1,10 @@
 /* poly.c
- * Greg Cook, 26/Jul/2018
+ * Greg Cook, 23/Feb/2019
  */
 
 /* CRC RevEng: arbitrary-precision CRC calculator and algorithm finder
- * Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
- * Gregory Cook
+ * Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018,
+ * 2019  Gregory Cook
  *
  * This file is part of CRC RevEng.
  *
diff --git a/client/reveng/preset.c b/client/reveng/preset.c
index 2f305a285..eb07f9085 100644
--- a/client/reveng/preset.c
+++ b/client/reveng/preset.c
@@ -1,10 +1,10 @@
 /* preset.c
- * Greg Cook, 21/Nov/2018
+ * Greg Cook, 23/Feb/2019
  */
 
 /* CRC RevEng: arbitrary-precision CRC calculator and algorithm finder
- * Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
- * Gregory Cook
+ * Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018,
+ * 2019  Gregory Cook
  *
  * This file is part of CRC RevEng.
  *
@@ -22,7 +22,8 @@
  * along with CRC RevEng.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-/* 2018-11-21: added CRC-8/NRSC-5, CRC-16/NRSC-5
+/* 2019-02-23: added CRC-8/MIFARE-MAD
+ * 2018-11-21: added CRC-8/NRSC-5, CRC-16/NRSC-5
  * 2018-11-21: renamed algorithms, new aliases, added classes
  * 2018-07-26: added CRC-24/OS-9
  * 2018-07-26: struct malias.name declared const char *const
@@ -378,96 +379,98 @@ static const bmp_t b32[] = {
                       BMP_C(0x94000000) << (BMP_BIT - 32),    /* 115 --  8,      94 */
                       BMP_C(0x97000000) << (BMP_BIT - 32),    /* 116 --  8,      97 */
                       BMP_C(0x98000000) << (BMP_BIT - 32),    /* 117 --  6,      26 */
-                      BMP_C(0x9b000000) << (BMP_BIT - 32),    /* 118 --  8,      9b */
-                      BMP_C(0x9c000000) << (BMP_BIT - 32),    /* 119 --  6,      27 */
-                      BMP_C(0x9d5e4de2) << (BMP_BIT - 32),    /* 120 -- 31,4eaf26f1 */
-                      BMP_C(0x9e000000) << (BMP_BIT - 32),    /* 121 --  7,      4f */
-                      BMP_C(0x9ecf0000) << (BMP_BIT - 32),    /* 122 -- 16,    9ecf */
-                      BMP_C(0xa0660000) << (BMP_BIT - 32),    /* 123 -- 16,    a066 */
-                      BMP_C(0xa0970000) << (BMP_BIT - 32),    /* 124 -- 16,    a097 */
-                      BMP_C(0xa1000000) << (BMP_BIT - 32),    /* 125 --  8,      a1 */
-                      BMP_C(0xa3660000) << (BMP_BIT - 32),    /* 126 -- 16,    a366 */
-                      BMP_C(0xa6000000) << (BMP_BIT - 32),    /* 127 --  7,      53 */
-                      BMP_C(0xa7000000) << (BMP_BIT - 32),    /* 128 --  8,      a7 */
-                      BMP_C(0xa8000000) << (BMP_BIT - 32),    /* 129 --  5,      15 */
-                      BMP_C(0xa8190000) << (BMP_BIT - 32),    /* 130 -- 16,    a819 */
-                      BMP_C(0xa833982b) << (BMP_BIT - 32),    /* 131 -- 32,a833982b */
-                      BMP_C(0xabcdef00) << (BMP_BIT - 32),    /* 132 -- 24,  abcdef */
-                      BMP_C(0xac000000) << (BMP_BIT - 32),    /* 133 --  8,      ac */
-                      BMP_C(0xaee70000) << (BMP_BIT - 32),    /* 134 -- 16,    aee7 */
-                      BMP_C(0xb0000000) << (BMP_BIT - 32),    /* 135 --  4,       b */
-                      BMP_C(0xb0010000) << (BMP_BIT - 32),    /* 136 -- 16,    b001 */
-                      BMP_C(0xb2aa0000) << (BMP_BIT - 32),    /* 137 -- 16,    b2aa */
-                      BMP_C(0xb3400000) << (BMP_BIT - 32),    /* 138 -- 12,     b34 */
-                      BMP_C(0xb42d8000) << (BMP_BIT - 32),    /* 139 -- 17,   1685b */
-                      BMP_C(0xb4600000) << (BMP_BIT - 32),    /* 140 -- 11,     5a3 */
-                      BMP_C(0xb4c80000) << (BMP_BIT - 32),    /* 141 -- 16,    b4c8 */
-                      BMP_C(0xb4f3e600) << (BMP_BIT - 32),    /* 142 -- 24,  b4f3e6 */
-                      BMP_C(0xb704ce00) << (BMP_BIT - 32),    /* 143 -- 24,  b704ce */
-                      BMP_C(0xb798b438) << (BMP_BIT - 32),    /* 144 -- 32,b798b438 */
-                      BMP_C(0xbb3d0000) << (BMP_BIT - 32),    /* 145 -- 16,    bb3d */
-                      BMP_C(0xbc000000) << (BMP_BIT - 32),    /* 146 --  6,2f/ 8,bc */
-                      BMP_C(0xbd0be338) << (BMP_BIT - 32),    /* 147 -- 32,bd0be338 */
-                      BMP_C(0xbdf40000) << (BMP_BIT - 32),    /* 148 -- 16,    bdf4 */
-                      BMP_C(0xbf050000) << (BMP_BIT - 32),    /* 149 -- 16,    bf05 */
-                      BMP_C(0xc0000000) << (BMP_BIT - 32),    /* 150 --  3,       6 */
-                      BMP_C(0xc2000000) << (BMP_BIT - 32),    /* 151 --  7,      61 */
-                      BMP_C(0xc25a5600) << (BMP_BIT - 32),    /* 152 -- 24,  c25a56 */
-                      BMP_C(0xc2b70000) << (BMP_BIT - 32),    /* 153 -- 16,    c2b7 */
-                      BMP_C(0xc2b80000) << (BMP_BIT - 32),    /* 154 -- 14,    30ae */
-                      BMP_C(0xc4000000) << (BMP_BIT - 32),    /* 155 --  8,      c4 */
-                      BMP_C(0xc6c60000) << (BMP_BIT - 32),    /* 156 -- 16,    c6c6 */
-                      BMP_C(0xc704dd7b) << (BMP_BIT - 32),    /* 157 -- 32,c704dd7b */
-                      BMP_C(0xc8000000) << (BMP_BIT - 32),    /* 158 --  5,      19 */
-                      BMP_C(0xc8670000) << (BMP_BIT - 32),    /* 159 -- 16,    c867 */
-                      BMP_C(0xcbf43926) << (BMP_BIT - 32),    /* 160 -- 32,cbf43926 */
-                      BMP_C(0xcde70300) << (BMP_BIT - 32),    /* 161 -- 24,  cde703 */
-                      BMP_C(0xce3c0000) << (BMP_BIT - 32),    /* 162 -- 16,    ce3c */
-                      BMP_C(0xd0000000) << (BMP_BIT - 32),    /* 163 --  8,      d0 */
-                      BMP_C(0xd02a0000) << (BMP_BIT - 32),    /* 164 -- 15,    6815 */
-                      BMP_C(0xd0db0000) << (BMP_BIT - 32),    /* 165 -- 16,    d0db */
-                      BMP_C(0xd3100000) << (BMP_BIT - 32),    /* 166 -- 12,     d31 */
-                      BMP_C(0xd3be9568) << (BMP_BIT - 32),    /* 167 -- 30,34efa55a */
-                      BMP_C(0xd4d00000) << (BMP_BIT - 32),    /* 168 -- 12,     d4d */
-                      BMP_C(0xd5000000) << (BMP_BIT - 32),    /* 169 --  8,      d5 */
-                      BMP_C(0xd64e0000) << (BMP_BIT - 32),    /* 170 -- 16,    d64e */
-                      BMP_C(0xda000000) << (BMP_BIT - 32),    /* 171 --  8,      da */
-                      BMP_C(0xdaf00000) << (BMP_BIT - 32),    /* 172 -- 12,     daf */
-                      BMP_C(0xdebb20e3) << (BMP_BIT - 32),    /* 173 -- 32,debb20e3 */
-                      BMP_C(0xdf000000) << (BMP_BIT - 32),    /* 174 --  8,      df */
-                      BMP_C(0xe0000000) << (BMP_BIT - 32),    /* 175 --  3,       7 */
-                      BMP_C(0xe3069283) << (BMP_BIT - 32),    /* 176 -- 32,e3069283 */
-                      BMP_C(0xe3940000) << (BMP_BIT - 32),    /* 177 -- 16,    e394 */
-                      BMP_C(0xe5cc0000) << (BMP_BIT - 32),    /* 178 -- 16,    e5cc */
-                      BMP_C(0xe7a80000) << (BMP_BIT - 32),    /* 179 -- 13,    1cf5 */
-                      BMP_C(0xe8000000) << (BMP_BIT - 32),    /* 180 --  6,      3a */
-                      BMP_C(0xea000000) << (BMP_BIT - 32),    /* 181 --  7,      75 */
-                      BMP_C(0xea820000) << (BMP_BIT - 32),    /* 182 -- 16,    ea82 */
-                      BMP_C(0xec000000) << (BMP_BIT - 32),    /* 183 --  6,      3b */
-                      BMP_C(0xf0000000) << (BMP_BIT - 32),    /* 184 --  4,       f */
-                      BMP_C(0xf0b80000) << (BMP_BIT - 32),    /* 185 -- 16,    f0b8 */
-                      BMP_C(0xf1300000) << (BMP_BIT - 32),    /* 186 -- 12,     f13 */
-                      BMP_C(0xf4000000) << (BMP_BIT - 32),    /* 187 --  8,      f4 */
-                      BMP_C(0xf4acfb13) << (BMP_BIT - 32),    /* 188 -- 32,f4acfb13 */
-                      BMP_C(0xf5b00000) << (BMP_BIT - 32),    /* 189 -- 12,     f5b */
-                      BMP_C(0xf6400000) << (BMP_BIT - 32),    /* 190 -- 10,     3d9 */
-                      BMP_C(0xf7000000) << (BMP_BIT - 32),    /* 191 --  8,      f7 */
-                      BMP_C(0xf8000000) << (BMP_BIT - 32),    /* 192 --  5,      1f */
-                      BMP_C(0xfc000000) << (BMP_BIT - 32),    /* 193 --  6,      3f */
-                      BMP_C(0xfc891918) << (BMP_BIT - 32),    /* 194 -- 32,fc891918 */
-                      BMP_C(0xfd000000) << (BMP_BIT - 32),    /* 195 --  8,      fd */
-                      BMP_C(0xfe000000) << (BMP_BIT - 32),    /* 196 --  7,      7f */
-                      BMP_C(0xfedcba00) << (BMP_BIT - 32),    /* 197 -- 24,  fedcba */
-                      BMP_C(0xfee80000) << (BMP_BIT - 32),    /* 198 -- 16,    fee8 */
-                      BMP_C(0xff000000) << (BMP_BIT - 32),    /* 199 --  8,      ff */
-                      BMP_C(0xffc00000) << (BMP_BIT - 32),    /* 200 -- 10,     3ff */
-                      BMP_C(0xfff00000) << (BMP_BIT - 32),    /* 201 -- 12,     fff */
-                      BMP_C(0xfffc0000) << (BMP_BIT - 32),    /* 202 -- 14,    3fff */
-                      BMP_C(0xffff0000) << (BMP_BIT - 32),    /* 203 -- 16,    ffff */
-                      BMP_C(0xffffff00) << (BMP_BIT - 32),    /* 204 -- 24,  ffffff */
-                      BMP_C(0xfffffffc) << (BMP_BIT - 32),    /* 205 -- 30,3fffffff */
-                      BMP_C(0xfffffffe) << (BMP_BIT - 32),    /* 206 -- 31,7fffffff */
-                      BMP_C(0xffffffff) << (BMP_BIT - 32),    /* 207 -- 32,ffffffff */
+	BMP_C(0x99000000) << (BMP_BIT - 32),	/* 118 --  8,      99 */
+	BMP_C(0x9b000000) << (BMP_BIT - 32),	/* 119 --  8,      9b */
+	BMP_C(0x9c000000) << (BMP_BIT - 32),	/* 120 --  6,      27 */
+	BMP_C(0x9d5e4de2) << (BMP_BIT - 32),	/* 121 -- 31,4eaf26f1 */
+	BMP_C(0x9e000000) << (BMP_BIT - 32),	/* 122 --  7,      4f */
+	BMP_C(0x9ecf0000) << (BMP_BIT - 32),	/* 123 -- 16,    9ecf */
+	BMP_C(0xa0660000) << (BMP_BIT - 32),	/* 124 -- 16,    a066 */
+	BMP_C(0xa0970000) << (BMP_BIT - 32),	/* 125 -- 16,    a097 */
+	BMP_C(0xa1000000) << (BMP_BIT - 32),	/* 126 --  8,      a1 */
+	BMP_C(0xa3660000) << (BMP_BIT - 32),	/* 127 -- 16,    a366 */
+	BMP_C(0xa6000000) << (BMP_BIT - 32),	/* 128 --  7,      53 */
+	BMP_C(0xa7000000) << (BMP_BIT - 32),	/* 129 --  8,      a7 */
+	BMP_C(0xa8000000) << (BMP_BIT - 32),	/* 130 --  5,      15 */
+	BMP_C(0xa8190000) << (BMP_BIT - 32),	/* 131 -- 16,    a819 */
+	BMP_C(0xa833982b) << (BMP_BIT - 32),	/* 132 -- 32,a833982b */
+	BMP_C(0xabcdef00) << (BMP_BIT - 32),	/* 133 -- 24,  abcdef */
+	BMP_C(0xac000000) << (BMP_BIT - 32),	/* 134 --  8,      ac */
+	BMP_C(0xaee70000) << (BMP_BIT - 32),	/* 135 -- 16,    aee7 */
+	BMP_C(0xb0000000) << (BMP_BIT - 32),	/* 136 --  4,       b */
+	BMP_C(0xb0010000) << (BMP_BIT - 32),	/* 137 -- 16,    b001 */
+	BMP_C(0xb2aa0000) << (BMP_BIT - 32),	/* 138 -- 16,    b2aa */
+	BMP_C(0xb3400000) << (BMP_BIT - 32),	/* 139 -- 12,     b34 */
+	BMP_C(0xb42d8000) << (BMP_BIT - 32),	/* 140 -- 17,   1685b */
+	BMP_C(0xb4600000) << (BMP_BIT - 32),	/* 141 -- 11,     5a3 */
+	BMP_C(0xb4c80000) << (BMP_BIT - 32),	/* 142 -- 16,    b4c8 */
+	BMP_C(0xb4f3e600) << (BMP_BIT - 32),	/* 143 -- 24,  b4f3e6 */
+	BMP_C(0xb704ce00) << (BMP_BIT - 32),	/* 144 -- 24,  b704ce */
+	BMP_C(0xb798b438) << (BMP_BIT - 32),	/* 145 -- 32,b798b438 */
+	BMP_C(0xbb3d0000) << (BMP_BIT - 32),	/* 146 -- 16,    bb3d */
+	BMP_C(0xbc000000) << (BMP_BIT - 32),	/* 147 --  6,2f/ 8,bc */
+	BMP_C(0xbd0be338) << (BMP_BIT - 32),	/* 148 -- 32,bd0be338 */
+	BMP_C(0xbdf40000) << (BMP_BIT - 32),	/* 149 -- 16,    bdf4 */
+	BMP_C(0xbf050000) << (BMP_BIT - 32),	/* 150 -- 16,    bf05 */
+	BMP_C(0xc0000000) << (BMP_BIT - 32),	/* 151 --  3,       6 */
+	BMP_C(0xc2000000) << (BMP_BIT - 32),	/* 152 --  7,      61 */
+	BMP_C(0xc25a5600) << (BMP_BIT - 32),	/* 153 -- 24,  c25a56 */
+	BMP_C(0xc2b70000) << (BMP_BIT - 32),	/* 154 -- 16,    c2b7 */
+	BMP_C(0xc2b80000) << (BMP_BIT - 32),	/* 155 -- 14,    30ae */
+	BMP_C(0xc4000000) << (BMP_BIT - 32),	/* 156 --  8,      c4 */
+	BMP_C(0xc6c60000) << (BMP_BIT - 32),	/* 157 -- 16,    c6c6 */
+	BMP_C(0xc7000000) << (BMP_BIT - 32),	/* 158 --  8,      c7 */
+	BMP_C(0xc704dd7b) << (BMP_BIT - 32),	/* 159 -- 32,c704dd7b */
+	BMP_C(0xc8000000) << (BMP_BIT - 32),	/* 160 --  5,      19 */
+	BMP_C(0xc8670000) << (BMP_BIT - 32),	/* 161 -- 16,    c867 */
+	BMP_C(0xcbf43926) << (BMP_BIT - 32),	/* 162 -- 32,cbf43926 */
+	BMP_C(0xcde70300) << (BMP_BIT - 32),	/* 163 -- 24,  cde703 */
+	BMP_C(0xce3c0000) << (BMP_BIT - 32),	/* 164 -- 16,    ce3c */
+	BMP_C(0xd0000000) << (BMP_BIT - 32),	/* 165 --  8,      d0 */
+	BMP_C(0xd02a0000) << (BMP_BIT - 32),	/* 166 -- 15,    6815 */
+	BMP_C(0xd0db0000) << (BMP_BIT - 32),	/* 167 -- 16,    d0db */
+	BMP_C(0xd3100000) << (BMP_BIT - 32),	/* 168 -- 12,     d31 */
+	BMP_C(0xd3be9568) << (BMP_BIT - 32),	/* 169 -- 30,34efa55a */
+	BMP_C(0xd4d00000) << (BMP_BIT - 32),	/* 170 -- 12,     d4d */
+	BMP_C(0xd5000000) << (BMP_BIT - 32),	/* 171 --  8,      d5 */
+	BMP_C(0xd64e0000) << (BMP_BIT - 32),	/* 172 -- 16,    d64e */
+	BMP_C(0xda000000) << (BMP_BIT - 32),	/* 173 --  8,      da */
+	BMP_C(0xdaf00000) << (BMP_BIT - 32),	/* 174 -- 12,     daf */
+	BMP_C(0xdebb20e3) << (BMP_BIT - 32),	/* 175 -- 32,debb20e3 */
+	BMP_C(0xdf000000) << (BMP_BIT - 32),	/* 176 --  8,      df */
+	BMP_C(0xe0000000) << (BMP_BIT - 32),	/* 177 --  3,       7 */
+	BMP_C(0xe3069283) << (BMP_BIT - 32),	/* 178 -- 32,e3069283 */
+	BMP_C(0xe3940000) << (BMP_BIT - 32),	/* 179 -- 16,    e394 */
+	BMP_C(0xe5cc0000) << (BMP_BIT - 32),	/* 180 -- 16,    e5cc */
+	BMP_C(0xe7a80000) << (BMP_BIT - 32),	/* 181 -- 13,    1cf5 */
+	BMP_C(0xe8000000) << (BMP_BIT - 32),	/* 182 --  6,      3a */
+	BMP_C(0xea000000) << (BMP_BIT - 32),	/* 183 --  7,      75 */
+	BMP_C(0xea820000) << (BMP_BIT - 32),	/* 184 -- 16,    ea82 */
+	BMP_C(0xec000000) << (BMP_BIT - 32),	/* 185 --  6,      3b */
+	BMP_C(0xf0000000) << (BMP_BIT - 32),	/* 186 --  4,       f */
+	BMP_C(0xf0b80000) << (BMP_BIT - 32),	/* 187 -- 16,    f0b8 */
+	BMP_C(0xf1300000) << (BMP_BIT - 32),	/* 188 -- 12,     f13 */
+	BMP_C(0xf4000000) << (BMP_BIT - 32),	/* 189 --  8,      f4 */
+	BMP_C(0xf4acfb13) << (BMP_BIT - 32),	/* 190 -- 32,f4acfb13 */
+	BMP_C(0xf5b00000) << (BMP_BIT - 32),	/* 191 -- 12,     f5b */
+	BMP_C(0xf6400000) << (BMP_BIT - 32),	/* 192 -- 10,     3d9 */
+	BMP_C(0xf7000000) << (BMP_BIT - 32),	/* 193 --  8,      f7 */
+	BMP_C(0xf8000000) << (BMP_BIT - 32),	/* 194 --  5,      1f */
+	BMP_C(0xfc000000) << (BMP_BIT - 32),	/* 195 --  6,      3f */
+	BMP_C(0xfc891918) << (BMP_BIT - 32),	/* 196 -- 32,fc891918 */
+	BMP_C(0xfd000000) << (BMP_BIT - 32),	/* 197 --  8,      fd */
+	BMP_C(0xfe000000) << (BMP_BIT - 32),	/* 198 --  7,      7f */
+	BMP_C(0xfedcba00) << (BMP_BIT - 32),	/* 199 -- 24,  fedcba */
+	BMP_C(0xfee80000) << (BMP_BIT - 32),	/* 200 -- 16,    fee8 */
+	BMP_C(0xff000000) << (BMP_BIT - 32),	/* 201 --  8,      ff */
+	BMP_C(0xffc00000) << (BMP_BIT - 32),	/* 202 -- 10,     3ff */
+	BMP_C(0xfff00000) << (BMP_BIT - 32),	/* 203 -- 12,     fff */
+	BMP_C(0xfffc0000) << (BMP_BIT - 32),	/* 204 -- 14,    3fff */
+	BMP_C(0xffff0000) << (BMP_BIT - 32),	/* 205 -- 16,    ffff */
+	BMP_C(0xffffff00) << (BMP_BIT - 32),	/* 206 -- 24,  ffffff */
+	BMP_C(0xfffffffc) << (BMP_BIT - 32),	/* 207 -- 30,3fffffff */
+	BMP_C(0xfffffffe) << (BMP_BIT - 32),	/* 208 -- 31,7fffffff */
+	BMP_C(0xffffffff) << (BMP_BIT - 32),	/* 209 -- 32,ffffffff */
 };
 
 static const struct malias aliases[];
@@ -477,155 +480,156 @@ static const struct malias aliases[];
  */
 static const struct mpreset models[] = {
     {64UL, b64,     b64a,    P_LE   | P_CONFIR, b64a,    b64b,    b64c,    aliases + 130},  /*   0 */
-    {32UL, b32 +  0, 0,       P_BE   | P_CONFIR, 0,       b32 + 147, 0,       aliases + 107}, /*   1 */
+	{32UL, b32+  0, 0,       P_BE   | P_CONFIR, 0,       b32+148, 0,       aliases+107},	/*   1 */
     {40UL, b40,     0,       P_BE   | P_ACADEM, b40a,    b40b,    b40c,    aliases + 115},  /*   2 */
-    {24UL, b32 +  3, b32 + 76, P_LE   | P_ATTEST, 0,       b32 + 152, 0,       aliases + 77}, /*   3 */
-    {32UL, b32 +  8, 0,       P_BE   | P_ATTEST, b32 + 207, b32 + 92, b32 + 157, aliases + 98}, /*   4 */
-    {32UL, b32 +  8, b32 + 207, P_BE   | P_ATTEST, 0,       b32 +  7, 0,       aliases + 104}, /*   5 */
-    {32UL, b32 +  8, b32 + 207, P_BE   | P_ATTEST, b32 + 207, b32 + 194, b32 + 157, aliases + 96}, /*   6 */
-    {32UL, b32 +  8, b32 + 207, P_LE   | P_CONFIR, 0,       b32 + 56, 0,       aliases + 103}, /*   7 */
-    {32UL, b32 +  8, b32 + 207, P_LE   | P_ATTEST, b32 + 207, b32 + 160, b32 + 173, aliases + 102}, /*   8 */
+	{24UL, b32+  3, b32+ 76, P_LE   | P_ATTEST, 0,       b32+153, 0,       aliases+ 77},	/*   3 */
+	{32UL, b32+  8, 0,       P_BE   | P_ATTEST, b32+209, b32+ 92, b32+159, aliases+ 98},	/*   4 */
+	{32UL, b32+  8, b32+209, P_BE   | P_ATTEST, 0,       b32+  7, 0,       aliases+104},	/*   5 */
+	{32UL, b32+  8, b32+209, P_BE   | P_ATTEST, b32+209, b32+196, b32+159, aliases+ 96},	/*   6 */
+	{32UL, b32+  8, b32+209, P_LE   | P_CONFIR, 0,       b32+ 56, 0,       aliases+103},	/*   7 */
+	{32UL, b32+  8, b32+209, P_LE   | P_ATTEST, b32+209, b32+162, b32+175, aliases+102},	/*   8 */
     {16UL, b32 +  9, 0,       P_BE   | P_ATTEST, 0,       b32 +  5, 0,       aliases + 36}, /*   9 */
     {16UL, b32 +  9, 0,       P_BE   | P_ATTEST, b32 +  1, b32 +  4, b32 +  9, aliases + 35}, /*  10 */
-    { 8UL, b32 + 10, 0,       P_BE   | P_ATTEST, 0,       b32 + 187, 0,       aliases + 157}, /*  11 */
-    { 8UL, b32 + 10, 0,       P_BE   | P_ACADEM, b32 + 75, b32 + 125, b32 + 133, aliases + 147}, /*  12 */
-    { 8UL, b32 + 10, b32 + 199, P_LE   | P_ACADEM, 0,       b32 + 163, 0,       aliases + 155}, /*  13 */
-    {16UL, b32 + 11, b32 + 203, P_LE   | P_ATTEST, 0,       b32 + 123, 0,       aliases + 58}, /*  14 */
-    {31UL, b32 + 12, b32 + 206, P_BE   | P_CONFIR, b32 + 206, b32 + 26, b32 + 120, aliases + 88}, /*  15 */
+	{ 8UL, b32+ 10, 0,       P_BE   | P_ATTEST, 0,       b32+189, 0,       aliases+158},	/*  11 */
+	{ 8UL, b32+ 10, 0,       P_BE   | P_ACADEM, b32+ 75, b32+126, b32+134, aliases+147},	/*  12 */
+	{ 8UL, b32+ 10, b32+201, P_LE   | P_ACADEM, 0,       b32+165, 0,       aliases+156},	/*  13 */
+	{16UL, b32+ 11, b32+205, P_LE   | P_ATTEST, 0,       b32+124, 0,       aliases+ 58},	/*  14 */
+	{31UL, b32+ 12, b32+208, P_BE   | P_CONFIR, b32+208, b32+ 26, b32+121, aliases+ 88},	/*  15 */
     { 6UL, b32 + 14, 0,       P_LE   | P_ACADEM, 0,       b32 + 25, 0,       aliases + 124}, /*  16 */
-    {82UL, b82,     0,       P_LE   | P_ATTEST, 0,       b82a,    0,       aliases + 160},  /*  17 */
+	{82UL, b82,     0,       P_LE   | P_ATTEST, 0,       b82a,    0,       aliases+161},	/*  17 */
     {16UL, b32 + 18, 0,       P_BE   | P_ATTEST, 0,       b32 + 53, 0,       aliases + 73}, /*  18 */
-    {16UL, b32 + 18, 0,       P_BE   | P_ACADEM, b32 + 203, b32 + 162, b32 + 29, aliases + 42}, /*  19 */
+	{16UL, b32+ 18, 0,       P_BE   | P_ACADEM, b32+205, b32+164, b32+ 29, aliases+ 42},	/*  19 */
     {16UL, b32 + 18, 0,       P_LE   | P_ATTEST, 0,       b32 + 38, 0,       aliases + 50}, /*  20 */
-    {16UL, b32 + 18, b32 + 29, P_BE   | P_ATTEST, 0,       b32 + 178, 0,       aliases + 63}, /*  21 */
+	{16UL, b32+ 18, b32+ 29, P_BE   | P_ATTEST, 0,       b32+180, 0,       aliases+ 63},	/*  21 */
     {16UL, b32 + 18, b32 + 108, P_LE   | P_ATTEST, 0,       b32 + 43, 0,       aliases + 66}, /*  22 */
-    {16UL, b32 + 18, b32 + 137, P_LE   | P_THIRDP, 0,       b32 + 83, 0,       aliases + 62}, /*  23 */
-    {16UL, b32 + 18, b32 + 156, P_LE   | P_ATTEST, 0,       b32 + 149, 0,       aliases + 48}, /*  24 */
-    {16UL, b32 + 18, b32 + 203, P_BE   | P_ATTEST, 0,       b32 + 47, 0,       aliases + 44}, /*  25 */
-    {16UL, b32 + 18, b32 + 203, P_BE   | P_ATTEST, b32 + 203, b32 + 170, b32 + 29, aliases + 41}, /*  26 */
-    {16UL, b32 + 18, b32 + 203, P_LE   | P_ATTEST, 0,       b32 + 88, 0,       aliases + 56}, /*  27 */
-    {16UL, b32 + 18, b32 + 203, P_LE   | P_ATTEST, b32 + 203, b32 + 114, b32 + 185, aliases + 45}, /*  28 */
-    { 7UL, b32 + 19, 0,       P_BE   | P_ACADEM, 0,       b32 + 181, 0,       aliases + 134}, /*  29 */
-    { 6UL, b32 + 27, b32 + 193, P_BE   | P_ACADEM, 0,       b32 + 183, 0,       aliases + 122}, /*  30 */
+	{16UL, b32+ 18, b32+138, P_LE   | P_THIRDP, 0,       b32+ 83, 0,       aliases+ 62},	/*  23 */
+	{16UL, b32+ 18, b32+157, P_LE   | P_ATTEST, 0,       b32+150, 0,       aliases+ 48},	/*  24 */
+	{16UL, b32+ 18, b32+205, P_BE   | P_ATTEST, 0,       b32+ 47, 0,       aliases+ 44},	/*  25 */
+	{16UL, b32+ 18, b32+205, P_BE   | P_ATTEST, b32+205, b32+172, b32+ 29, aliases+ 41},	/*  26 */
+	{16UL, b32+ 18, b32+205, P_LE   | P_ATTEST, 0,       b32+ 88, 0,       aliases+ 56},	/*  27 */
+	{16UL, b32+ 18, b32+205, P_LE   | P_ATTEST, b32+205, b32+114, b32+187, aliases+ 45},	/*  28 */
+	{ 7UL, b32+ 19, 0,       P_BE   | P_ACADEM, 0,       b32+183, 0,       aliases+134},	/*  29 */
+	{ 6UL, b32+ 27, b32+195, P_BE   | P_ACADEM, 0,       b32+185, 0,       aliases+122},	/*  30 */
     { 8UL, b32 + 28, 0,       P_BE   | P_ACADEM, 0,       b32 + 57, 0,       aliases + 145}, /*  31 */
-    { 8UL, b32 + 28, b32 + 195, P_BE   | P_ATTEST, 0,       b32 + 95, 0,       aliases + 148}, /*  32 */
-    { 8UL, b32 + 28, b32 + 199, P_BE   | P_ATTEST, b32 + 199, b32 + 70, b32 + 155, aliases + 156}, /*  33 */
-    { 8UL, b32 + 28, b32 + 199, P_LE   | P_ATTEST, 0,       b32 + 116, 0,       aliases + 158}, /*  34 */
-    {16UL, b32 + 30, b32 + 203, P_BE   | P_ATTEST, b32 + 203, b32 + 130, b32 + 177, aliases + 61}, /*  35 */
-    {32UL, b32 + 31, b32 + 207, P_LE   | P_ATTEST, b32 + 207, b32 + 176, b32 + 144, aliases + 101}, /*  36 */
-    {14UL, b32 + 35, 0,       P_LE   | P_ATTEST, 0,       b32 + 36, 0,       aliases + 17}, /*  37 */
-    { 5UL, b32 + 46, b32 + 192, P_LE   | P_THIRDP, b32 + 192, b32 + 158, b32 + 49, aliases + 120}, /*  38 */
-    { 8UL, b32 + 48, 0,       P_BE   | P_ATTEST, 0,       b32 + 61, 0,       aliases + 154}, /*  39 */
-    { 8UL, b32 + 48, b32 + 199, P_BE   | P_ATTEST, b32 + 199, b32 + 174, b32 + 63, aliases + 139}, /*  40 */
-    { 4UL, b32 + 49, 0,       P_LE   | P_ACADEM, 0,       b32 + 89, 0,       aliases + 112}, /*  41 */
-    { 4UL, b32 + 49, b32 + 184, P_BE   | P_ACADEM, b32 + 184, b32 + 135, b32 + 33, aliases + 113}, /*  42 */
-    { 8UL, b32 + 51, 0,       P_LE   | P_ATTEST, 0,       b32 + 125, 0,       aliases + 152}, /*  43 */
-    { 8UL, b32 + 51, b32 + 199, P_BE   | P_ATTEST, 0,       b32 + 191, 0,       aliases + 153}, /*  44 */
-    {24UL, b32 + 54, b32 + 204, P_BE   | P_ACADEM, b32 + 204, b32 + 142, b32 + 21, aliases + 80}, /*  45 */
-    { 8UL, b32 + 59, 0,       P_LE   | P_ATTEST, 0,       b32 + 22, 0,       aliases + 142}, /*  46 */
-    {16UL, b32 + 60, 0,       P_BE   | P_CONFIR, b32 + 203, b32 + 153, b32 + 126, aliases + 38}, /*  47 */
-    {16UL, b32 + 60, 0,       P_LE   | P_CONFIR, b32 + 203, b32 + 182, b32 + 86, aliases + 37}, /*  48 */
-    {64UL, b64d,    0,       P_BE   | P_ACADEM, 0,       b64e,    0,       aliases + 128},  /*  49 */
-    {64UL, b64d,    b64a,    P_BE   | P_CONFIR, b64a,    b64f,    b64g,    aliases + 131},  /*  50 */
-    {64UL, b64d,    b64a,    P_LE   | P_ATTEST, b64a,    b64h,    b64i,    aliases + 132},  /*  51 */
-    { 5UL, b32 + 66, b32 + 66, P_BE   | P_ATTEST, 0,       0,       0,       aliases + 117}, /*  52 */
-    { 8UL, b32 + 67, 0,       P_BE   | P_ACADEM, b32 + 199, b32 + 115, b32 + 74, aliases + 146}, /*  53 */
-    {16UL, b32 + 77, 0,       P_BE   | P_ATTEST, 0,       b32 + 78, 0,       aliases + 59}, /*  54 */
-    {10UL, b32 + 79, 0,       P_BE   | P_ACADEM, b32 + 200, b32 + 68, b32 + 52, aliases +  6}, /*  55 */
-    {24UL, b32 + 80, b32 + 132, P_BE   | P_ATTEST, 0,       b32 + 32, 0,       aliases + 79}, /*  56 */
-    {24UL, b32 + 80, b32 + 197, P_BE   | P_ATTEST, 0,       b32 + 94, 0,       aliases + 78}, /*  57 */
-    { 3UL, b32 + 81, 0,       P_BE   | P_ACADEM, b32 + 175, b32 + 96, b32 + 62, aliases + 85}, /*  58 */
-    { 3UL, b32 + 81, b32 + 175, P_LE   | P_ACADEM, 0,       b32 + 150, 0,       aliases + 86}, /*  59 */
-    {11UL, b32 + 82, 0,       P_BE   | P_ACADEM, 0,       b32 + 15, 0,       aliases + 10}, /*  60 */
-    { 6UL, b32 + 84, 0,       P_LE   | P_ATTEST, 0,       b32 + 117, 0,       aliases + 123}, /*  61 */
-    {16UL, b32 + 87, 0,       P_BE   | P_THIRDP, 0,       b32 + 148, 0,       aliases + 52}, /*  62 */
-    {11UL, b32 + 90, b32 +  6, P_BE   | P_ATTEST, 0,       b32 + 140, 0,       aliases +  9}, /*  63 */
-    {16UL, b32 + 91, 0,       P_BE   | P_ATTEST, 0,       b32 + 37, 0,       aliases + 60}, /*  64 */
-    {24UL, b32 + 97, 0,       P_BE   | P_ACADEM, 0,       b32 + 40, 0,       aliases + 82}, /*  65 */
-    {24UL, b32 + 97, b32 + 204, P_BE   | P_ATTEST, b32 + 204, b32 + 34, b32 + 100, aliases + 84}, /*  66 */
-    {16UL, b32 + 98, 0,       P_BE   | P_ATTEST, 0,       b32 + 198, 0,       aliases + 67}, /*  67 */
-    {16UL, b32 + 98, 0,       P_LE   | P_CONFIR, 0,       b32 + 145, 0,       aliases + 24}, /*  68 */
-    {16UL, b32 + 98, 0,       P_LE   | P_ATTEST, b32 + 203, b32 + 64, b32 + 136, aliases + 55}, /*  69 */
-    {16UL, b32 + 98, b32 + 99, P_BE   | P_ATTEST, 0,       b32 + 122, 0,       aliases + 34}, /*  70 */
-    {16UL, b32 + 98, b32 + 203, P_BE   | P_THIRDP, 0,       b32 + 134, 0,       aliases + 32}, /*  71 */
-    {16UL, b32 + 98, b32 + 203, P_LE   | P_ATTEST, 0,       b32 + 71, 0,       aliases + 57}, /*  72 */
-    {16UL, b32 + 98, b32 + 203, P_LE   | P_THIRDP, b32 + 203, b32 + 141, b32 + 136, aliases + 68}, /*  73 */
-    {14UL, b32 + 101, 0,       P_BE   | P_ACADEM, b32 + 202, b32 + 154, b32 + 16, aliases + 18}, /*  74 */
-    {30UL, b32 + 102, b32 + 205, P_BE   | P_ACADEM, b32 + 205, b32 + 20, b32 + 167, aliases + 87}, /*  75 */
-    {12UL, b32 + 103, 0,       P_BE   | P_ACADEM, 0,       b32 + 189, 0,       aliases + 13}, /*  76 */
-    {12UL, b32 + 103, 0,       P_BELE | P_ACADEM, 0,       b32 + 172, 0,       aliases + 15}, /*  77 */
-    {32UL, b32 + 104, 0,       P_BE   | P_ATTEST, 0,       b32 + 50, 0,       aliases + 92}, /*  78 */
-    {21UL, b32 + 105, 0,       P_BE   | P_ACADEM, 0,       b32 + 93, 0,       aliases + 75}, /*  79 */
-    {24UL, b32 + 106, 0,       P_BE   | P_ACADEM, 0,       b32 + 161, 0,       aliases + 81}, /*  80 */
-    {24UL, b32 + 106, b32 + 143, P_BE   | P_ATTEST, 0,       b32 + 39, 0,       aliases + 83}, /*  81 */
-    { 7UL, b32 + 109, 0,       P_BE   | P_ACADEM, 0,       b32 + 151, 0,       aliases + 136}, /*  82 */
-    {15UL, b32 + 110, 0,       P_BE   | P_ACADEM, 0,       b32 + 13, 0,       aliases + 20}, /*  83 */
-    {16UL, b32 + 111, 0,       P_BE   | P_ATTEST, 0,       b32 + 165, 0,       aliases + 64}, /*  84 */
-    {10UL, b32 + 112, 0,       P_BE   | P_ATTEST, 0,       b32 + 85, 0,       aliases +  4}, /*  85 */
-    { 8UL, b32 + 118, 0,       P_BE   | P_ACADEM, 0,       b32 + 181, 0,       aliases + 150}, /*  86 */
-    { 8UL, b32 + 118, 0,       P_LE   | P_THIRDP, 0,       b32 + 41, 0,       aliases + 159}, /*  87 */
-    { 8UL, b32 + 118, b32 + 199, P_BE   | P_ACADEM, 0,       b32 + 171, 0,       aliases + 141}, /*  88 */
-    { 6UL, b32 + 119, b32 + 193, P_BE   | P_ATTEST, 0,       b32 + 55, 0,       aliases + 121}, /*  89 */
-    { 7UL, b32 + 121, b32 + 196, P_LE   | P_ACADEM, 0,       b32 + 127, 0,       aliases + 135}, /*  90 */
-    {16UL, b32 + 124, 0,       P_BE   | P_CONFIR, 0,       b32 + 17, 0,       aliases + 65}, /*  91 */
-    { 8UL, b32 + 128, 0,       P_LE   | P_ATTEST, 0,       b32 + 42, 0,       aliases + 140}, /*  92 */
-    { 5UL, b32 + 129, 0,       P_LE   | P_ACADEM, 0,       b32 + 58, 0,       aliases + 118}, /*  93 */
-    {32UL, b32 + 131, b32 + 207, P_LE   | P_CONFIR, b32 + 207, b32 + 107, b32 + 65, aliases + 95}, /*  94 */
-    {17UL, b32 + 139, 0,       P_BE   | P_ACADEM, 0,       b32 + 44, 0,       aliases + 74}, /*  95 */
-    { 6UL, b32 + 146, 0,       P_BE   | P_ACADEM, b32 + 193, b32 + 72, b32 + 180, aliases + 125}, /*  96 */
-    {16UL, b32 + 159, b32 + 203, P_BE   | P_ACADEM, 0,       b32 + 73, 0,       aliases + 31}, /*  97 */
-    {15UL, b32 + 164, 0,       P_BE   | P_ATTEST, b32 +  2, b32 + 69, b32 + 164, aliases + 21}, /*  98 */
-    {12UL, b32 + 166, 0,       P_BE   | P_ACADEM, b32 + 201, b32 + 138, b32 + 24, aliases + 14}, /*  99 */
-    { 8UL, b32 + 169, 0,       P_BE   | P_ACADEM, 0,       b32 + 146, 0,       aliases + 143}, /* 100 */
-    {13UL, b32 + 179, 0,       P_BE   | P_ATTEST, 0,       b32 + 45, 0,       aliases + 16}, /* 101 */
-    {12UL, b32 + 186, b32 + 201, P_BE   | P_ACADEM, 0,       b32 + 168, 0,       aliases + 12}, /* 102 */
-    {32UL, b32 + 188, b32 + 207, P_LE   | P_ATTEST, b32 + 207, b32 + 23, b32 + 113, aliases + 93}, /* 103 */
-    {10UL, b32 + 190, b32 + 200, P_BE   | P_ACADEM, 0,       b32 + 112, 0,       aliases +  5}, /* 104 */
+	{ 8UL, b32+ 28, b32+158, P_BE   | P_ATTEST, 0,       b32+118, 0,       aliases+153},	/*  32 */
+	{ 8UL, b32+ 28, b32+197, P_BE   | P_ATTEST, 0,       b32+ 95, 0,       aliases+148},	/*  33 */
+	{ 8UL, b32+ 28, b32+201, P_BE   | P_ATTEST, b32+201, b32+ 70, b32+156, aliases+157},	/*  34 */
+	{ 8UL, b32+ 28, b32+201, P_LE   | P_ATTEST, 0,       b32+116, 0,       aliases+159},	/*  35 */
+	{16UL, b32+ 30, b32+205, P_BE   | P_ATTEST, b32+205, b32+131, b32+179, aliases+ 61},	/*  36 */
+	{32UL, b32+ 31, b32+209, P_LE   | P_ATTEST, b32+209, b32+178, b32+145, aliases+101},	/*  37 */
+	{14UL, b32+ 35, 0,       P_LE   | P_ATTEST, 0,       b32+ 36, 0,       aliases+ 17},	/*  38 */
+	{ 5UL, b32+ 46, b32+194, P_LE   | P_THIRDP, b32+194, b32+160, b32+ 49, aliases+120},	/*  39 */
+	{ 8UL, b32+ 48, 0,       P_BE   | P_ATTEST, 0,       b32+ 61, 0,       aliases+155},	/*  40 */
+	{ 8UL, b32+ 48, b32+201, P_BE   | P_ATTEST, b32+201, b32+176, b32+ 63, aliases+139},	/*  41 */
+	{ 4UL, b32+ 49, 0,       P_LE   | P_ACADEM, 0,       b32+ 89, 0,       aliases+112},	/*  42 */
+	{ 4UL, b32+ 49, b32+186, P_BE   | P_ACADEM, b32+186, b32+136, b32+ 33, aliases+113},	/*  43 */
+	{ 8UL, b32+ 51, 0,       P_LE   | P_ATTEST, 0,       b32+126, 0,       aliases+152},	/*  44 */
+	{ 8UL, b32+ 51, b32+201, P_BE   | P_ATTEST, 0,       b32+193, 0,       aliases+154},	/*  45 */
+	{24UL, b32+ 54, b32+206, P_BE   | P_ACADEM, b32+206, b32+143, b32+ 21, aliases+ 80},	/*  46 */
+	{ 8UL, b32+ 59, 0,       P_LE   | P_ATTEST, 0,       b32+ 22, 0,       aliases+142},	/*  47 */
+	{16UL, b32+ 60, 0,       P_BE   | P_CONFIR, b32+205, b32+154, b32+127, aliases+ 38},	/*  48 */
+	{16UL, b32+ 60, 0,       P_LE   | P_CONFIR, b32+205, b32+184, b32+ 86, aliases+ 37},	/*  49 */
+	{64UL, b64d,    0,       P_BE   | P_ACADEM, 0,       b64e,    0,       aliases+128},	/*  50 */
+	{64UL, b64d,    b64a,    P_BE   | P_CONFIR, b64a,    b64f,    b64g,    aliases+131},	/*  51 */
+	{64UL, b64d,    b64a,    P_LE   | P_ATTEST, b64a,    b64h,    b64i,    aliases+132},	/*  52 */
+	{ 5UL, b32+ 66, b32+ 66, P_BE   | P_ATTEST, 0,       0,       0,       aliases+117},	/*  53 */
+	{ 8UL, b32+ 67, 0,       P_BE   | P_ACADEM, b32+201, b32+115, b32+ 74, aliases+146},	/*  54 */
+	{16UL, b32+ 77, 0,       P_BE   | P_ATTEST, 0,       b32+ 78, 0,       aliases+ 59},	/*  55 */
+	{10UL, b32+ 79, 0,       P_BE   | P_ACADEM, b32+202, b32+ 68, b32+ 52, aliases+  6},	/*  56 */
+	{24UL, b32+ 80, b32+133, P_BE   | P_ATTEST, 0,       b32+ 32, 0,       aliases+ 79},	/*  57 */
+	{24UL, b32+ 80, b32+199, P_BE   | P_ATTEST, 0,       b32+ 94, 0,       aliases+ 78},	/*  58 */
+	{ 3UL, b32+ 81, 0,       P_BE   | P_ACADEM, b32+177, b32+ 96, b32+ 62, aliases+ 85},	/*  59 */
+	{ 3UL, b32+ 81, b32+177, P_LE   | P_ACADEM, 0,       b32+151, 0,       aliases+ 86},	/*  60 */
+	{11UL, b32+ 82, 0,       P_BE   | P_ACADEM, 0,       b32+ 15, 0,       aliases+ 10},	/*  61 */
+	{ 6UL, b32+ 84, 0,       P_LE   | P_ATTEST, 0,       b32+117, 0,       aliases+123},	/*  62 */
+	{16UL, b32+ 87, 0,       P_BE   | P_THIRDP, 0,       b32+149, 0,       aliases+ 52},	/*  63 */
+	{11UL, b32+ 90, b32+  6, P_BE   | P_ATTEST, 0,       b32+141, 0,       aliases+  9},	/*  64 */
+	{16UL, b32+ 91, 0,       P_BE   | P_ATTEST, 0,       b32+ 37, 0,       aliases+ 60},	/*  65 */
+	{24UL, b32+ 97, 0,       P_BE   | P_ACADEM, 0,       b32+ 40, 0,       aliases+ 82},	/*  66 */
+	{24UL, b32+ 97, b32+206, P_BE   | P_ATTEST, b32+206, b32+ 34, b32+100, aliases+ 84},	/*  67 */
+	{16UL, b32+ 98, 0,       P_BE   | P_ATTEST, 0,       b32+200, 0,       aliases+ 67},	/*  68 */
+	{16UL, b32+ 98, 0,       P_LE   | P_CONFIR, 0,       b32+146, 0,       aliases+ 24},	/*  69 */
+	{16UL, b32+ 98, 0,       P_LE   | P_ATTEST, b32+205, b32+ 64, b32+137, aliases+ 55},	/*  70 */
+	{16UL, b32+ 98, b32+ 99, P_BE   | P_ATTEST, 0,       b32+123, 0,       aliases+ 34},	/*  71 */
+	{16UL, b32+ 98, b32+205, P_BE   | P_THIRDP, 0,       b32+135, 0,       aliases+ 32},	/*  72 */
+	{16UL, b32+ 98, b32+205, P_LE   | P_ATTEST, 0,       b32+ 71, 0,       aliases+ 57},	/*  73 */
+	{16UL, b32+ 98, b32+205, P_LE   | P_THIRDP, b32+205, b32+142, b32+137, aliases+ 68},	/*  74 */
+	{14UL, b32+101, 0,       P_BE   | P_ACADEM, b32+204, b32+155, b32+ 16, aliases+ 18},	/*  75 */
+	{30UL, b32+102, b32+207, P_BE   | P_ACADEM, b32+207, b32+ 20, b32+169, aliases+ 87},	/*  76 */
+	{12UL, b32+103, 0,       P_BE   | P_ACADEM, 0,       b32+191, 0,       aliases+ 13},	/*  77 */
+	{12UL, b32+103, 0,       P_BELE | P_ACADEM, 0,       b32+174, 0,       aliases+ 15},	/*  78 */
+	{32UL, b32+104, 0,       P_BE   | P_ATTEST, 0,       b32+ 50, 0,       aliases+ 92},	/*  79 */
+	{21UL, b32+105, 0,       P_BE   | P_ACADEM, 0,       b32+ 93, 0,       aliases+ 75},	/*  80 */
+	{24UL, b32+106, 0,       P_BE   | P_ACADEM, 0,       b32+163, 0,       aliases+ 81},	/*  81 */
+	{24UL, b32+106, b32+144, P_BE   | P_ATTEST, 0,       b32+ 39, 0,       aliases+ 83},	/*  82 */
+	{ 7UL, b32+109, 0,       P_BE   | P_ACADEM, 0,       b32+152, 0,       aliases+136},	/*  83 */
+	{15UL, b32+110, 0,       P_BE   | P_ACADEM, 0,       b32+ 13, 0,       aliases+ 20},	/*  84 */
+	{16UL, b32+111, 0,       P_BE   | P_ATTEST, 0,       b32+167, 0,       aliases+ 64},	/*  85 */
+	{10UL, b32+112, 0,       P_BE   | P_ATTEST, 0,       b32+ 85, 0,       aliases+  4},	/*  86 */
+	{ 8UL, b32+119, 0,       P_BE   | P_ACADEM, 0,       b32+183, 0,       aliases+150},	/*  87 */
+	{ 8UL, b32+119, 0,       P_LE   | P_THIRDP, 0,       b32+ 41, 0,       aliases+160},	/*  88 */
+	{ 8UL, b32+119, b32+201, P_BE   | P_ACADEM, 0,       b32+173, 0,       aliases+141},	/*  89 */
+	{ 6UL, b32+120, b32+195, P_BE   | P_ATTEST, 0,       b32+ 55, 0,       aliases+121},	/*  90 */
+	{ 7UL, b32+122, b32+198, P_LE   | P_ACADEM, 0,       b32+128, 0,       aliases+135},	/*  91 */
+	{16UL, b32+125, 0,       P_BE   | P_CONFIR, 0,       b32+ 17, 0,       aliases+ 65},	/*  92 */
+	{ 8UL, b32+129, 0,       P_LE   | P_ATTEST, 0,       b32+ 42, 0,       aliases+140},	/*  93 */
+	{ 5UL, b32+130, 0,       P_LE   | P_ACADEM, 0,       b32+ 58, 0,       aliases+118},	/*  94 */
+	{32UL, b32+132, b32+209, P_LE   | P_CONFIR, b32+209, b32+107, b32+ 65, aliases+ 95},	/*  95 */
+	{17UL, b32+140, 0,       P_BE   | P_ACADEM, 0,       b32+ 44, 0,       aliases+ 74},	/*  96 */
+	{ 6UL, b32+147, 0,       P_BE   | P_ACADEM, b32+195, b32+ 72, b32+182, aliases+125},	/*  97 */
+	{16UL, b32+161, b32+205, P_BE   | P_ACADEM, 0,       b32+ 73, 0,       aliases+ 31},	/*  98 */
+	{15UL, b32+166, 0,       P_BE   | P_ATTEST, b32+  2, b32+ 69, b32+166, aliases+ 21},	/*  99 */
+	{12UL, b32+168, 0,       P_BE   | P_ACADEM, b32+203, b32+139, b32+ 24, aliases+ 14},	/* 100 */
+	{ 8UL, b32+171, 0,       P_BE   | P_ACADEM, 0,       b32+147, 0,       aliases+143},	/* 101 */
+	{13UL, b32+181, 0,       P_BE   | P_ATTEST, 0,       b32+ 45, 0,       aliases+ 16},	/* 102 */
+	{12UL, b32+188, b32+203, P_BE   | P_ACADEM, 0,       b32+170, 0,       aliases+ 12},	/* 103 */
+	{32UL, b32+190, b32+209, P_LE   | P_ATTEST, b32+209, b32+ 23, b32+113, aliases+ 93},	/* 104 */
+	{10UL, b32+192, b32+202, P_BE   | P_ACADEM, 0,       b32+112, 0,       aliases+  5},	/* 105 */
     { 0UL, 0,       0,       P_BE   | P_UNDFCL, 0,       0,       0,       NULL       },    /* terminating entry */
 };
-#    define NPRESETS 105
+#    define NPRESETS 106
 
 /* List of names with pointers to models, pre-sorted for use with bsearch() */
 static const struct malias aliases[] = {
-    {"ARC",                 models + 68},   /*   0 */
+	{"ARC",				models+ 69},	/*   0 */
     {"B-CRC-32",            models +  6},   /*   1 */
     {"CKSUM",               models +  4},   /*   2 */
-    {"CRC-10",              models + 85},   /*   3 */
-    {"CRC-10/ATM",          models + 85},   /*   4 */
-    {"CRC-10/CDMA2000",     models + 104},  /*   5 */
-    {"CRC-10/GSM",          models + 55},   /*   6 */
-    {"CRC-10/I-610",        models + 85},   /*   7 */
-    {"CRC-11",              models + 63},   /*   8 */
-    {"CRC-11/FLEXRAY",      models + 63},   /*   9 */
-    {"CRC-11/UMTS",         models + 60},   /*  10 */
-    {"CRC-12/3GPP",         models + 77},   /*  11 */
-    {"CRC-12/CDMA2000",     models + 102},  /*  12 */
-    {"CRC-12/DECT",         models + 76},   /*  13 */
-    {"CRC-12/GSM",          models + 99},   /*  14 */
-    {"CRC-12/UMTS",         models + 77},   /*  15 */
-    {"CRC-13/BBC",          models + 101},  /*  16 */
-    {"CRC-14/DARC",         models + 37},   /*  17 */
-    {"CRC-14/GSM",          models + 74},   /*  18 */
-    {"CRC-15",              models + 83},   /*  19 */
-    {"CRC-15/CAN",          models + 83},   /*  20 */
-    {"CRC-15/MPT1327",      models + 98},   /*  21 */
-    {"CRC-16",              models + 68},   /*  22 */
+	{"CRC-10",			models+ 86},	/*   3 */
+	{"CRC-10/ATM",			models+ 86},	/*   4 */
+	{"CRC-10/CDMA2000",		models+105},	/*   5 */
+	{"CRC-10/GSM",			models+ 56},	/*   6 */
+	{"CRC-10/I-610",		models+ 86},	/*   7 */
+	{"CRC-11",			models+ 64},	/*   8 */
+	{"CRC-11/FLEXRAY",		models+ 64},	/*   9 */
+	{"CRC-11/UMTS",			models+ 61},	/*  10 */
+	{"CRC-12/3GPP",			models+ 78},	/*  11 */
+	{"CRC-12/CDMA2000",		models+103},	/*  12 */
+	{"CRC-12/DECT",			models+ 77},	/*  13 */
+	{"CRC-12/GSM",			models+100},	/*  14 */
+	{"CRC-12/UMTS",			models+ 78},	/*  15 */
+	{"CRC-13/BBC",			models+102},	/*  16 */
+	{"CRC-14/DARC",			models+ 38},	/*  17 */
+	{"CRC-14/GSM",			models+ 75},	/*  18 */
+	{"CRC-15",			models+ 84},	/*  19 */
+	{"CRC-15/CAN",			models+ 84},	/*  20 */
+	{"CRC-15/MPT1327",		models+ 99},	/*  21 */
+	{"CRC-16",			models+ 69},	/*  22 */
     {"CRC-16/ACORN",        models + 18},   /*  23 */
-    {"CRC-16/ARC",          models + 68},   /*  24 */
+	{"CRC-16/ARC",			models+ 69},	/*  24 */
     {"CRC-16/AUG-CCITT",    models + 21},   /*  25 */
     {"CRC-16/AUTOSAR",      models + 25},   /*  26 */
-    {"CRC-16/BUYPASS",      models + 67},   /*  27 */
+	{"CRC-16/BUYPASS",		models+ 68},	/*  27 */
     {"CRC-16/CCITT",        models + 20},   /*  28 */
     {"CRC-16/CCITT-FALSE",  models + 25},   /*  29 */
     {"CRC-16/CCITT-TRUE",   models + 20},   /*  30 */
-    {"CRC-16/CDMA2000",     models + 97},   /*  31 */
-    {"CRC-16/CMS",          models + 71},   /*  32 */
+	{"CRC-16/CDMA2000",		models+ 98},	/*  31 */
+	{"CRC-16/CMS",			models+ 72},	/*  32 */
     {"CRC-16/DARC",         models + 26},   /*  33 */
-    {"CRC-16/DDS-110",      models + 70},   /*  34 */
+	{"CRC-16/DDS-110",		models+ 71},	/*  34 */
     {"CRC-16/DECT-R",       models + 10},   /*  35 */
     {"CRC-16/DECT-X",       models +  9},   /*  36 */
-    {"CRC-16/DNP",          models + 48},   /*  37 */
-    {"CRC-16/EN-13757",     models + 47},   /*  38 */
+	{"CRC-16/DNP",			models+ 49},	/*  37 */
+	{"CRC-16/EN-13757",		models+ 48},	/*  38 */
     {"CRC-16/EPC",          models + 26},   /*  39 */
     {"CRC-16/EPC-C1G2",     models + 26},   /*  40 */
     {"CRC-16/GENIBUS",      models + 26},   /*  41 */
@@ -633,62 +637,62 @@ static const struct malias aliases[] = {
     {"CRC-16/I-CODE",       models + 26},   /*  43 */
     {"CRC-16/IBM-3740",     models + 25},   /*  44 */
     {"CRC-16/IBM-SDLC",     models + 28},   /*  45 */
-    {"CRC-16/IEC-61158-2",  models + 35},   /*  46 */
+	{"CRC-16/IEC-61158-2",		models+ 36},	/*  46 */
     {"CRC-16/ISO-HDLC",     models + 28},   /*  47 */
     {"CRC-16/ISO-IEC-14443-3-A",    models + 24},   /*  48 */
     {"CRC-16/ISO-IEC-14443-3-B",    models + 28},   /*  49 */
     {"CRC-16/KERMIT",       models + 20},   /*  50 */
-    {"CRC-16/LHA",          models + 68},   /*  51 */
-    {"CRC-16/LJ1200",       models + 62},   /*  52 */
+	{"CRC-16/LHA",			models+ 69},	/*  51 */
+	{"CRC-16/LJ1200",		models+ 63},	/*  52 */
     {"CRC-16/LTE",          models + 18},   /*  53 */
-    {"CRC-16/MAXIM",        models + 69},   /*  54 */
-    {"CRC-16/MAXIM-DOW",    models + 69},   /*  55 */
+	{"CRC-16/MAXIM",		models+ 70},	/*  54 */
+	{"CRC-16/MAXIM-DOW",		models+ 70},	/*  55 */
     {"CRC-16/MCRF4XX",      models + 27},   /*  56 */
-    {"CRC-16/MODBUS",       models + 72},   /*  57 */
+	{"CRC-16/MODBUS",		models+ 73},	/*  57 */
     {"CRC-16/NRSC-5",       models + 14},   /*  58 */
-    {"CRC-16/OPENSAFETY-A", models + 54},   /*  59 */
-    {"CRC-16/OPENSAFETY-B", models + 64},   /*  60 */
-    {"CRC-16/PROFIBUS",     models + 35},   /*  61 */
+	{"CRC-16/OPENSAFETY-A",		models+ 55},	/*  59 */
+	{"CRC-16/OPENSAFETY-B",		models+ 65},	/*  60 */
+	{"CRC-16/PROFIBUS",		models+ 36},	/*  61 */
     {"CRC-16/RIELLO",       models + 23},   /*  62 */
     {"CRC-16/SPI-FUJITSU",  models + 21},   /*  63 */
-    {"CRC-16/T10-DIF",      models + 84},   /*  64 */
-    {"CRC-16/TELEDISK",     models + 91},   /*  65 */
+	{"CRC-16/T10-DIF",		models+ 85},	/*  64 */
+	{"CRC-16/TELEDISK",		models+ 92},	/*  65 */
     {"CRC-16/TMS37157",     models + 22},   /*  66 */
-    {"CRC-16/UMTS",         models + 67},   /*  67 */
-    {"CRC-16/USB",          models + 73},   /*  68 */
+	{"CRC-16/UMTS",			models+ 68},	/*  67 */
+	{"CRC-16/USB",			models+ 74},	/*  68 */
     {"CRC-16/V-41-LSB",     models + 20},   /*  69 */
     {"CRC-16/V-41-MSB",     models + 18},   /*  70 */
-    {"CRC-16/VERIFONE",     models + 67},   /*  71 */
+	{"CRC-16/VERIFONE",		models+ 68},	/*  71 */
     {"CRC-16/X-25",         models + 28},   /*  72 */
     {"CRC-16/XMODEM",       models + 18},   /*  73 */
-    {"CRC-17/CAN-FD",       models + 95},   /*  74 */
-    {"CRC-21/CAN-FD",       models + 79},   /*  75 */
-    {"CRC-24",              models + 81},   /*  76 */
+	{"CRC-17/CAN-FD",		models+ 96},	/*  74 */
+	{"CRC-21/CAN-FD",		models+ 80},	/*  75 */
+	{"CRC-24",			models+ 82},	/*  76 */
     {"CRC-24/BLE",          models +  3},   /*  77 */
-    {"CRC-24/FLEXRAY-A",    models + 57},   /*  78 */
-    {"CRC-24/FLEXRAY-B",    models + 56},   /*  79 */
-    {"CRC-24/INTERLAKEN",   models + 45},   /*  80 */
-    {"CRC-24/LTE-A",        models + 80},   /*  81 */
-    {"CRC-24/LTE-B",        models + 65},   /*  82 */
-    {"CRC-24/OPENPGP",      models + 81},   /*  83 */
-    {"CRC-24/OS-9",         models + 66},   /*  84 */
-    {"CRC-3/GSM",           models + 58},   /*  85 */
-    {"CRC-3/ROHC",          models + 59},   /*  86 */
-    {"CRC-30/CDMA",         models + 75},   /*  87 */
+	{"CRC-24/FLEXRAY-A",		models+ 58},	/*  78 */
+	{"CRC-24/FLEXRAY-B",		models+ 57},	/*  79 */
+	{"CRC-24/INTERLAKEN",		models+ 46},	/*  80 */
+	{"CRC-24/LTE-A",		models+ 81},	/*  81 */
+	{"CRC-24/LTE-B",		models+ 66},	/*  82 */
+	{"CRC-24/OPENPGP",		models+ 82},	/*  83 */
+	{"CRC-24/OS-9",			models+ 67},	/*  84 */
+	{"CRC-3/GSM",			models+ 59},	/*  85 */
+	{"CRC-3/ROHC",			models+ 60},	/*  86 */
+	{"CRC-30/CDMA",			models+ 76},	/*  87 */
     {"CRC-31/PHILIPS",      models + 15},   /*  88 */
     {"CRC-32",              models +  8},   /*  89 */
     {"CRC-32/AAL5",         models +  6},   /*  90 */
     {"CRC-32/ADCCP",        models +  8},   /*  91 */
-    {"CRC-32/AIXM",         models + 78},   /*  92 */
-    {"CRC-32/AUTOSAR",      models + 103},  /*  93 */
-    {"CRC-32/BASE91-C",     models + 36},   /*  94 */
-    {"CRC-32/BASE91-D",     models + 94},   /*  95 */
+	{"CRC-32/AIXM",			models+ 79},	/*  92 */
+	{"CRC-32/AUTOSAR",		models+104},	/*  93 */
+	{"CRC-32/BASE91-C",		models+ 37},	/*  94 */
+	{"CRC-32/BASE91-D",		models+ 95},	/*  95 */
     {"CRC-32/BZIP2",        models +  6},   /*  96 */
-    {"CRC-32/CASTAGNOLI",   models + 36},   /*  97 */
+	{"CRC-32/CASTAGNOLI",		models+ 37},	/*  97 */
     {"CRC-32/CKSUM",        models +  4},   /*  98 */
     {"CRC-32/DECT-B",       models +  6},   /*  99 */
-    {"CRC-32/INTERLAKEN",   models + 36},   /* 100 */
-    {"CRC-32/ISCSI",        models + 36},   /* 101 */
+	{"CRC-32/INTERLAKEN",		models+ 37},	/* 100 */
+	{"CRC-32/ISCSI",		models+ 37},	/* 101 */
     {"CRC-32/ISO-HDLC",     models +  8},   /* 102 */
     {"CRC-32/JAMCRC",       models +  7},   /* 103 */
     {"CRC-32/MPEG-2",       models +  5},   /* 104 */
@@ -696,77 +700,78 @@ static const struct malias aliases[] = {
     {"CRC-32/V-42",         models +  8},   /* 106 */
     {"CRC-32/XFER",         models +  1},   /* 107 */
     {"CRC-32/XZ",           models +  8},   /* 108 */
-    {"CRC-32C",             models + 36},   /* 109 */
-    {"CRC-32D",             models + 94},   /* 110 */
-    {"CRC-32Q",             models + 78},   /* 111 */
-    {"CRC-4/G-704",         models + 41},   /* 112 */
-    {"CRC-4/INTERLAKEN",    models + 42},   /* 113 */
-    {"CRC-4/ITU",           models + 41},   /* 114 */
+	{"CRC-32C",			models+ 37},	/* 109 */
+	{"CRC-32D",			models+ 95},	/* 110 */
+	{"CRC-32Q",			models+ 79},	/* 111 */
+	{"CRC-4/G-704",			models+ 42},	/* 112 */
+	{"CRC-4/INTERLAKEN",		models+ 43},	/* 113 */
+	{"CRC-4/ITU",			models+ 42},	/* 114 */
     {"CRC-40/GSM",          models +  2},   /* 115 */
-    {"CRC-5/EPC",           models + 52},   /* 116 */
-    {"CRC-5/EPC-C1G2",      models + 52},   /* 117 */
-    {"CRC-5/G-704",         models + 93},   /* 118 */
-    {"CRC-5/ITU",           models + 93},   /* 119 */
-    {"CRC-5/USB",           models + 38},   /* 120 */
-    {"CRC-6/CDMA2000-A",    models + 89},   /* 121 */
+	{"CRC-5/EPC",			models+ 53},	/* 116 */
+	{"CRC-5/EPC-C1G2",		models+ 53},	/* 117 */
+	{"CRC-5/G-704",			models+ 94},	/* 118 */
+	{"CRC-5/ITU",			models+ 94},	/* 119 */
+	{"CRC-5/USB",			models+ 39},	/* 120 */
+	{"CRC-6/CDMA2000-A",		models+ 90},	/* 121 */
     {"CRC-6/CDMA2000-B",    models + 30},   /* 122 */
-    {"CRC-6/DARC",          models + 61},   /* 123 */
+	{"CRC-6/DARC",			models+ 62},	/* 123 */
     {"CRC-6/G-704",         models + 16},   /* 124 */
-    {"CRC-6/GSM",           models + 96},   /* 125 */
+	{"CRC-6/GSM",			models+ 97},	/* 125 */
     {"CRC-6/ITU",           models + 16},   /* 126 */
-    {"CRC-64",              models + 49},   /* 127 */
-    {"CRC-64/ECMA-182",     models + 49},   /* 128 */
-    {"CRC-64/GO-ECMA",      models + 51},   /* 129 */
+	{"CRC-64",			models+ 50},	/* 127 */
+	{"CRC-64/ECMA-182",		models+ 50},	/* 128 */
+	{"CRC-64/GO-ECMA",		models+ 52},	/* 129 */
     {"CRC-64/GO-ISO",       models +  0},   /* 130 */
-    {"CRC-64/WE",           models + 50},   /* 131 */
-    {"CRC-64/XZ",           models + 51},   /* 132 */
+	{"CRC-64/WE",			models+ 51},	/* 131 */
+	{"CRC-64/XZ",			models+ 52},	/* 132 */
     {"CRC-7",               models + 29},   /* 133 */
     {"CRC-7/MMC",           models + 29},   /* 134 */
-    {"CRC-7/ROHC",          models + 90},   /* 135 */
-    {"CRC-7/UMTS",          models + 82},   /* 136 */
+	{"CRC-7/ROHC",			models+ 91},	/* 135 */
+	{"CRC-7/UMTS",			models+ 83},	/* 136 */
     {"CRC-8",               models + 11},   /* 137 */
-    {"CRC-8/AES",           models + 34},   /* 138 */
-    {"CRC-8/AUTOSAR",       models + 40},   /* 139 */
-    {"CRC-8/BLUETOOTH",     models + 92},   /* 140 */
-    {"CRC-8/CDMA2000",      models + 88},   /* 141 */
-    {"CRC-8/DARC",          models + 46},   /* 142 */
-    {"CRC-8/DVB-S2",        models + 100},  /* 143 */
-    {"CRC-8/EBU",           models + 34},   /* 144 */
+	{"CRC-8/AES",			models+ 35},	/* 138 */
+	{"CRC-8/AUTOSAR",		models+ 41},	/* 139 */
+	{"CRC-8/BLUETOOTH",		models+ 93},	/* 140 */
+	{"CRC-8/CDMA2000",		models+ 89},	/* 141 */
+	{"CRC-8/DARC",			models+ 47},	/* 142 */
+	{"CRC-8/DVB-S2",		models+101},	/* 143 */
+	{"CRC-8/EBU",			models+ 35},	/* 144 */
     {"CRC-8/GSM-A",         models + 31},   /* 145 */
-    {"CRC-8/GSM-B",         models + 53},   /* 146 */
+	{"CRC-8/GSM-B",			models+ 54},	/* 146 */
     {"CRC-8/I-432-1",       models + 12},   /* 147 */
-    {"CRC-8/I-CODE",        models + 32},   /* 148 */
+	{"CRC-8/I-CODE",		models+ 33},	/* 148 */
     {"CRC-8/ITU",           models + 12},   /* 149 */
-    {"CRC-8/LTE",           models + 86},   /* 150 */
-    {"CRC-8/MAXIM",         models + 43},   /* 151 */
-    {"CRC-8/MAXIM-DOW",     models + 43},   /* 152 */
-    {"CRC-8/NRSC-5",        models + 44},   /* 153 */
-    {"CRC-8/OPENSAFETY",    models + 39},   /* 154 */
-    {"CRC-8/ROHC",          models + 13},   /* 155 */
-    {"CRC-8/SAE-J1850",     models + 33},   /* 156 */
-    {"CRC-8/SMBUS",         models + 11},   /* 157 */
-    {"CRC-8/TECH-3250",     models + 34},   /* 158 */
-    {"CRC-8/WCDMA",         models + 87},   /* 159 */
-    {"CRC-82/DARC",         models + 17},   /* 160 */
-    {"CRC-A",               models + 24},   /* 161 */
-    {"CRC-B",               models + 28},   /* 162 */
-    {"CRC-CCITT",           models + 20},   /* 163 */
-    {"CRC-IBM",             models + 68},   /* 164 */
-    {"DOW-CRC",             models + 43},   /* 165 */
-    {"JAMCRC",              models +  7},   /* 166 */
-    {"KERMIT",              models + 20},   /* 167 */
-    {"MODBUS",              models + 72},   /* 168 */
-    {"PKZIP",               models +  8},   /* 169 */
-    {"R-CRC-16",            models + 10},   /* 170 */
-    {"X-25",                models + 28},   /* 171 */
-    {"X-CRC-12",            models + 76},   /* 172 */
-    {"X-CRC-16",            models +  9},   /* 173 */
-    {"XFER",                models +  1},   /* 174 */
-    {"XMODEM",              models + 18},   /* 175 */
-    {"ZMODEM",              models + 18},   /* 176 */
+	{"CRC-8/LTE",			models+ 87},	/* 150 */
+	{"CRC-8/MAXIM",			models+ 44},	/* 151 */
+	{"CRC-8/MAXIM-DOW",		models+ 44},	/* 152 */
+	{"CRC-8/MIFARE-MAD",		models+ 32},	/* 153 */
+	{"CRC-8/NRSC-5",		models+ 45},	/* 154 */
+	{"CRC-8/OPENSAFETY",		models+ 40},	/* 155 */
+	{"CRC-8/ROHC",			models+ 13},	/* 156 */
+	{"CRC-8/SAE-J1850",		models+ 34},	/* 157 */
+	{"CRC-8/SMBUS",			models+ 11},	/* 158 */
+	{"CRC-8/TECH-3250",		models+ 35},	/* 159 */
+	{"CRC-8/WCDMA",			models+ 88},	/* 160 */
+	{"CRC-82/DARC",			models+ 17},	/* 161 */
+	{"CRC-A",			models+ 24},	/* 162 */
+	{"CRC-B",			models+ 28},	/* 163 */
+	{"CRC-CCITT",			models+ 20},	/* 164 */
+	{"CRC-IBM",			models+ 69},	/* 165 */
+	{"DOW-CRC",			models+ 44},	/* 166 */
+	{"JAMCRC",			models+  7},	/* 167 */
+	{"KERMIT",			models+ 20},	/* 168 */
+	{"MODBUS",			models+ 73},	/* 169 */
+	{"PKZIP",			models+  8},	/* 170 */
+	{"R-CRC-16",			models+ 10},	/* 171 */
+	{"X-25",			models+ 28},	/* 172 */
+	{"X-CRC-12",			models+ 77},	/* 173 */
+	{"X-CRC-16",			models+  9},	/* 174 */
+	{"XFER",			models+  1},	/* 175 */
+	{"XMODEM",			models+ 18},	/* 176 */
+	{"ZMODEM",			models+ 18},	/* 177 */
     {NULL,                  NULL      },    /* terminating entry */
 };
-#    define NALIASES 177
+#    define NALIASES 178
 
 #  endif /* BMP_BIT */
 #else /* PRESETS */
diff --git a/client/reveng/reveng.c b/client/reveng/reveng.c
index 1373ef88f..f36ccc2f4 100644
--- a/client/reveng/reveng.c
+++ b/client/reveng/reveng.c
@@ -1,10 +1,10 @@
 /* reveng.c
- * Greg Cook, 26/Jul/2018
+ * Greg Cook, 23/Feb/2019
  */
 
 /* CRC RevEng: arbitrary-precision CRC calculator and algorithm finder
- * Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
- * Gregory Cook
+ * Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018,
+ * 2019  Gregory Cook
  *
  * This file is part of CRC RevEng.
  *
diff --git a/client/reveng/reveng.h b/client/reveng/reveng.h
index 66db6ba81..110b3f620 100644
--- a/client/reveng/reveng.h
+++ b/client/reveng/reveng.h
@@ -1,10 +1,10 @@
 /* reveng.h
- * Greg Cook, 21/Nov/2018
+ * Greg Cook, 23/Feb/2019
  */
 
 /* CRC RevEng: arbitrary-precision CRC calculator and algorithm finder
- * Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
- * Gregory Cook
+ * Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018,
+ * 2019  Gregory Cook
  *
  * This file is part of CRC RevEng.
  *
@@ -93,7 +93,7 @@
 /* Global definitions */
 
 /* CRC RevEng version string */
-#define VERSION "1.6.0"
+#define VERSION "1.6.2"
 
 /* bmpbit.c */
 typedef BMP_T bmp_t;
diff --git a/client/scripting.c b/client/scripting.c
index 719798177..82378bf76 100644
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -516,7 +516,7 @@ static int l_sha1(lua_State *L) {
 static int l_reveng_models(lua_State *L) {
 
 // This array needs to be adjusted if RevEng adds more crc-models.
-#define NMODELS 105
+#define NMODELS 106
 
     int count = 0;
     uint8_t in_width = luaL_checkunsigned(L, 1);

From c83b2e7ffff6b2197eab19ecbd06d3799c58f31a Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 16 Mar 2019 07:31:00 +0100
Subject: [PATCH 0821/1938] fix: null check

---
 client/cmdcrc.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/client/cmdcrc.c b/client/cmdcrc.c
index 2b50f2b91..178df6add 100644
--- a/client/cmdcrc.c
+++ b/client/cmdcrc.c
@@ -93,9 +93,11 @@ int GetModels(char *Models[], int *count, uint8_t *width) {
                 PrintAndLogEx(WARNING, "out of memory?");
                 return 0;
             }
-            memcpy(tmp, model.name, size);
-            Models[mode] = tmp;
-            width[mode] = plen(model.spoly);
+            if ( model.name != NULL ) {
+                memcpy(tmp, model.name, size);
+                Models[mode] = tmp;
+                width[mode] = plen(model.spoly);
+            }
         }
         mfree(&model);
     } else { //reveng -s

From 1fcd0f66c5062ec04e4440e16b7328de3bf40d82 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 16 Mar 2019 07:31:13 +0100
Subject: [PATCH 0822/1938] fix: null check

---
 client/reveng/poly.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/client/reveng/poly.c b/client/reveng/poly.c
index 6c07e5241..1a2ca958f 100644
--- a/client/reveng/poly.c
+++ b/client/reveng/poly.c
@@ -988,7 +988,10 @@ pcrc(const poly_t message, const poly_t divisor, const poly_t init, const poly_t
         /* 0 <= ofs <= BMP_BIT, location of the first bit of the result */
         pshift(&result, result, 0UL, ofs, (init.length > max + divisor.length ? init.length - max - divisor.length : 0UL) + divisor.length + ofs, 0UL);
     }
-    psum(&result, xorout, 0UL);
+    
+    if ( result.bitmap != NULL )
+        psum(&result, xorout, 0UL);
+    
     return (result);
 }
 

From 4632cc0203b87374acd254a86dd5efdedf369e0e Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 16 Mar 2019 10:50:01 +0100
Subject: [PATCH 0823/1938] typo

---
 client/scripts/formatMifare.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/scripts/formatMifare.lua b/client/scripts/formatMifare.lua
index fe9cf32e5..f53a05eff 100644
--- a/client/scripts/formatMifare.lua
+++ b/client/scripts/formatMifare.lua
@@ -11,7 +11,7 @@ example = [[
     -- generate command, replacing key with new key.
     2. script run formatMifare -k aabbccddeeff -n 112233445566 -a FF0780
 
-    -- generate commands and excute them against card.
+    -- generate commands and execute them against card.
     3. script run formatMifare -x
 ]]
 copyright = ''

From 5583cfbc703fd19bd856441b8d179fe3ebf4b4fd Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 16 Mar 2019 11:07:49 +0100
Subject: [PATCH 0824/1938] chg: 'lf search' - text

---
 client/cmdlf.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/client/cmdlf.c b/client/cmdlf.c
index 948cf2235..aa3501f6b 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -884,13 +884,10 @@ int CmdLFfind(const char *Cmd) {
         // The improved noise detection will find Cotag.
         if (getSignalProperties()->isnoise) {
 
-            PrintAndLogEx(INFO, "Signal looks just like noise. Looking for Hitag signal now.");
-
-            // 26 === RHT2F_UID_ONLY
             if (CmdLFHitagReader("26") == 0) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Hitag") " found!"); return 1;}
             if (CmdCOTAGRead("") > 0) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("COTAG ID") " found!"); return 1;}
 
-            PrintAndLogEx(FAILED, "\nNo data found! - maybe not an LF tag?");
+            PrintAndLogEx(FAILED, "\n" _YELLOW_("No data found!") " - Signal looks like noise. Maybe not an LF tag?");
             return 0;
         }
     }

From 9f9ee2f1fd806ba4972e1c780e3784cc8728f622 Mon Sep 17 00:00:00 2001
From: Iceman <iceman@iuse.se>
Date: Sat, 16 Mar 2019 11:22:36 +0100
Subject: [PATCH 0825/1938] Update ntag_3d.lua

---
 client/scripts/ntag_3d.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/scripts/ntag_3d.lua b/client/scripts/ntag_3d.lua
index 2f08aac85..abbfe5946 100644
--- a/client/scripts/ntag_3d.lua
+++ b/client/scripts/ntag_3d.lua
@@ -20,7 +20,7 @@ example =[[
      script run ntag_3d -u 11223344556677 -c 46 -m 50 -p 5448 -s 4555  -l 200 -1
 ]]
 usage = [[
-script run calc_ntag_3d -h -t -u <uid> -c <color> -m <material> -p <region> -s <region> -l <length>
+script run ntag_3d -h -t -u <uid> -c <color> -m <material> -p <region> -s <region> -l <length>
 
 Arguments:
     -h             : this help

From d447fb838fc146b386e4e94d3f85d203b50bc774 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 17 Mar 2019 00:02:58 +0100
Subject: [PATCH 0826/1938] global makefile: cleanup targets

---
 Makefile | 40 +++++++++++++++++++++++++++++-----------
 1 file changed, 29 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 6e7c9abd5..327d1ab6d 100644
--- a/Makefile
+++ b/Makefile
@@ -56,22 +56,40 @@ recovery/%: FORCE
 	$(MAKE) -C recovery $(patsubst recovery/%,%,$@)
 FORCE: # Dummy target to force remake in the subdirectories, even if files exist (this Makefile doesn't know about the prerequisites)
 
-.PHONY: all clean help _test flash-bootrom flash-os flash-all style FORCE
+.PHONY: all clean help _test bootrom flash-bootrom os flash-os flash-all recovery client mfkey nounce2key style FORCE
 
 help:
-	@echo Multi-OS Makefile, you are running on $(DETECTED_OS)
-	@echo Possible targets:
-	@echo + all           - Make bootrom, armsrc and the OS-specific host directory
-	@echo + client        - Make only the OS-specific host directory
-	@echo + flash-bootrom - Make bootrom and flash it
-	@echo + flash-os      - Make armsrc and flash os \(includes fpga\)
-	@echo + flash-all     - Make bootrom and armsrc and flash bootrom and os image
-	@echo + mfkey         - Make tools/mfkey
-	@echo + nounce2key    - Make tools/nounce2key
-	@echo + clean         - Clean in bootrom, armsrc and the OS-specific host directory
+	@echo "Multi-OS Makefile"
+	@echo
+	@echo "Possible targets:"
+	@echo "+ all           - Make all targets: bootrom, armsrc and OS-specific host tools"
+	@echo "+ clean         - Clean in all targets"
+	@echo
+	@echo "+ bootrom       - Make bootrom"
+	@echo "+ os            - Make armsrc \(includes fpga\)"
+	@echo "+ flash-bootrom - Make bootrom and flash it"
+	@echo "+ flash-os      - Make armsrc and flash os image \(includes fpga\)"
+	@echo "+ flash-all     - Make bootrom and armsrc and flash bootrom and os image"
+	@echo "+ recovery      - Make bootrom and armsrc images for JTAG flashing"
+	@echo
+	@echo "+ client        - Make only the OS-specific host client"
+	@echo "+ mfkey         - Make tools/mfkey"
+	@echo "+ nounce2key    - Make tools/nounce2key"
+	@echo
+	@echo "Possible platforms: try \"make PLATFORM=\" for more info, default is PM3RDV4"
 
 client: client/all
 
+bootrom: bootrom/all
+
+os: armsrc/all
+
+recovery: recovery/all
+
+mfkey: mfkey/all
+
+nonce2key: nonce2key/all
+
 flash-bootrom: bootrom/obj/bootrom.elf $(FLASH_TOOL)
 	$(FLASH_TOOL) $(FLASH_PORT) -b $(subst /,$(PATHSEP),$<)
 

From fd3d4925a2784eb48d007153ec320396374fc040 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 17 Mar 2019 00:03:22 +0100
Subject: [PATCH 0827/1938] mfkey: fix file modes

---
 tools/mfkey/Makefile  | 0
 tools/mfkey/crapto1.c | 0
 tools/mfkey/crapto1.h | 0
 tools/mfkey/crypto1.c | 0
 tools/mfkey/mfkey32.c | 0
 tools/mfkey/mfkey64.c | 0
 6 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 tools/mfkey/Makefile
 mode change 100755 => 100644 tools/mfkey/crapto1.c
 mode change 100755 => 100644 tools/mfkey/crapto1.h
 mode change 100755 => 100644 tools/mfkey/crypto1.c
 mode change 100755 => 100644 tools/mfkey/mfkey32.c
 mode change 100755 => 100644 tools/mfkey/mfkey64.c

diff --git a/tools/mfkey/Makefile b/tools/mfkey/Makefile
old mode 100755
new mode 100644
diff --git a/tools/mfkey/crapto1.c b/tools/mfkey/crapto1.c
old mode 100755
new mode 100644
diff --git a/tools/mfkey/crapto1.h b/tools/mfkey/crapto1.h
old mode 100755
new mode 100644
diff --git a/tools/mfkey/crypto1.c b/tools/mfkey/crypto1.c
old mode 100755
new mode 100644
diff --git a/tools/mfkey/mfkey32.c b/tools/mfkey/mfkey32.c
old mode 100755
new mode 100644
diff --git a/tools/mfkey/mfkey64.c b/tools/mfkey/mfkey64.c
old mode 100755
new mode 100644

From c9cb16d428928c6f8d1d7b16fd31346e59e46558 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 17 Mar 2019 13:51:47 +0100
Subject: [PATCH 0828/1938] fix: mfkey32, cut and paste error?

---
 client/mifare/mfkey.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/mifare/mfkey.c b/client/mifare/mfkey.c
index cefc19164..b55c7e3c7 100644
--- a/client/mifare/mfkey.c
+++ b/client/mifare/mfkey.c
@@ -95,7 +95,7 @@ bool mfkey32(nonces_t data, uint64_t *outputkey) {
     uint8_t counter = 0;
 
     uint32_t p640 = prng_successor(data.nonce, 64);
-    uint32_t p641 = prng_successor(data.nonce2, 64);
+
     s = lfsr_recovery32(data.ar ^ p640, 0);
 
     for (t = s; t->odd | t->even; ++t) {
@@ -105,7 +105,7 @@ bool mfkey32(nonces_t data, uint64_t *outputkey) {
         crypto1_get_lfsr(t, &key);
         crypto1_word(t, data.cuid ^ data.nonce, 0);
         crypto1_word(t, data.nr2, 1);
-        if (data.ar2 == (crypto1_word(t, 0, 0) ^ p641)) {
+        if (data.ar2 == (crypto1_word(t, 0, 0) ^ p640)) {
             outkey = key;
             counter++;
             if (counter == 20) break;

From 65a45fe187919b9e14eec394f6af9447467f8f32 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 17 Mar 2019 13:57:28 +0100
Subject: [PATCH 0829/1938] chg: mfkeys: adapting old refactoring  (@piwi)

---
 tools/mfkey/Makefile    |  17 +-
 tools/mfkey/crapto1.c   | 565 ----------------------------------------
 tools/mfkey/crapto1.h   |  93 -------
 tools/mfkey/crypto1.c   | 139 ----------
 tools/mfkey/mfkey32.c   |   6 +-
 tools/mfkey/mfkey32v2.c |   4 +-
 tools/mfkey/mfkey64.c   |  18 +-
 7 files changed, 25 insertions(+), 817 deletions(-)
 delete mode 100644 tools/mfkey/crapto1.c
 delete mode 100644 tools/mfkey/crapto1.h
 delete mode 100644 tools/mfkey/crypto1.c

diff --git a/tools/mfkey/Makefile b/tools/mfkey/Makefile
index 61e55ef2d..149759cc9 100644
--- a/tools/mfkey/Makefile
+++ b/tools/mfkey/Makefile
@@ -1,21 +1,20 @@
+VPATH = ../../common ../../common/crapto1 ../../client
 CC = gcc
 LD = gcc
-CFLAGS +=  -std=c99 -march=native -Wall -Winline -O3
+CFLAGS += -std=c99 -D_ISOC99_SOURCE -I../../include -I../../common -I../../client -Wall -O3
 LDFLAGS +=
 
-OBJS = crapto1.o crypto1.o
-HEADERS = crapto1.h
-EXES = mfkey64 mfkey32 mfkey32v2
-WINEXE = $(patsubst %, %.exe, $(EXES))
+OBJS = crypto1.o crapto1.o parity.o util_posix.o bucketsort.o
+EXES = mfkey32 mfkey32v2 mfkey64 
+WINEXES = $(patsubst %, %.exe, $(EXES))
 
 all: $(OBJS) $(EXES)
 
 %.o : %.c
 	$(CC) $(CFLAGS) -c -o $@ $<
 
-% : %.c
-	$(LD) $(CFLAGS) -o $@ $(OBJS) $<
+% : %.c $(OBJS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $<
 
 clean:
-	rm -f $(OBJS) $(EXES) $(WINEXE)
-
+	rm -f $(OBJS) $(EXES) $(WINEXES)
diff --git a/tools/mfkey/crapto1.c b/tools/mfkey/crapto1.c
deleted file mode 100644
index 41fe19db3..000000000
--- a/tools/mfkey/crapto1.c
+++ /dev/null
@@ -1,565 +0,0 @@
-/*  crapto1.c
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation; either version 2
-    of the License, or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA  02110-1301, US$
-
-    Copyright (C) 2008-2014 bla <blapost@gmail.com>
-*/
-#include "crapto1.h"
-#include <stdlib.h>
-
-#if !defined LOWMEM && defined __GNUC__
-static uint8_t filterlut[1 << 20];
-static void __attribute__((constructor)) fill_lut() {
-    uint32_t i;
-    for (i = 0; i < 1 << 20; ++i)
-        filterlut[i] = filter(i);
-}
-#define filter(x) (filterlut[(x) & 0xfffff])
-#endif
-
-
-
-typedef struct bucket {
-    uint32_t *head;
-    uint32_t *bp;
-} bucket_t;
-
-typedef bucket_t bucket_array_t[2][0x100];
-
-typedef struct bucket_info {
-    struct {
-        uint32_t *head, *tail;
-    } bucket_info[2][0x100];
-    uint32_t numbuckets;
-} bucket_info_t;
-
-
-static void bucket_sort_intersect(uint32_t *const estart, uint32_t *const estop,
-                                  uint32_t *const ostart, uint32_t *const ostop,
-                                  bucket_info_t *bucket_info, bucket_array_t bucket) {
-    uint32_t *p1, *p2;
-    uint32_t *start[2];
-    uint32_t *stop[2];
-
-    start[0] = estart;
-    stop[0] = estop;
-    start[1] = ostart;
-    stop[1] = ostop;
-
-    // init buckets to be empty
-    for (uint32_t i = 0; i < 2; i++) {
-        for (uint32_t j = 0x00; j <= 0xff; j++) {
-            bucket[i][j].bp = bucket[i][j].head;
-        }
-    }
-
-    // sort the lists into the buckets based on the MSB (contribution bits)
-    for (uint32_t i = 0; i < 2; i++) {
-        for (p1 = start[i]; p1 <= stop[i]; p1++) {
-            uint32_t bucket_index = (*p1 & 0xff000000) >> 24;
-            *(bucket[i][bucket_index].bp++) = *p1;
-        }
-    }
-
-
-    // write back intersecting buckets as sorted list.
-    // fill in bucket_info with head and tail of the bucket contents in the list and number of non-empty buckets.
-    uint32_t nonempty_bucket;
-    for (uint32_t i = 0; i < 2; i++) {
-        p1 = start[i];
-        nonempty_bucket = 0;
-        for (uint32_t j = 0x00; j <= 0xff; j++) {
-            if (bucket[0][j].bp != bucket[0][j].head && bucket[1][j].bp != bucket[1][j].head) { // non-empty intersecting buckets only
-                bucket_info->bucket_info[i][nonempty_bucket].head = p1;
-                for (p2 = bucket[i][j].head; p2 < bucket[i][j].bp; *p1++ = *p2++);
-                bucket_info->bucket_info[i][nonempty_bucket].tail = p1 - 1;
-                nonempty_bucket++;
-            }
-        }
-        bucket_info->numbuckets = nonempty_bucket;
-    }
-}
-
-
-/** update_contribution
- * helper, calculates the partial linear feedback contributions and puts in MSB
- */
-static inline void update_contribution(uint32_t *item, const uint32_t mask1, const uint32_t mask2) {
-    uint32_t p = *item >> 25;
-
-    p = p << 1 | parity(*item & mask1);
-    p = p << 1 | parity(*item & mask2);
-    *item = p << 24 | (*item & 0xffffff);
-}
-
-/** extend_table
- * using a bit of the keystream extend the table of possible lfsr states
- */
-static inline void extend_table(uint32_t *tbl, uint32_t **end, int bit, int m1, int m2, uint32_t in) {
-    in <<= 24;
-    for (*tbl <<= 1; tbl <= *end; *++tbl <<= 1)
-        if (filter(*tbl) ^ filter(*tbl | 1)) {
-            *tbl |= filter(*tbl) ^ bit;
-            update_contribution(tbl, m1, m2);
-            *tbl ^= in;
-        } else if (filter(*tbl) == bit) {
-            *++*end = tbl[1];
-            tbl[1] = tbl[0] | 1;
-            update_contribution(tbl, m1, m2);
-            *tbl++ ^= in;
-            update_contribution(tbl, m1, m2);
-            *tbl ^= in;
-        } else
-            *tbl-- = *(*end)--;
-}
-/** extend_table_simple
- * using a bit of the keystream extend the table of possible lfsr states
- */
-static inline void extend_table_simple(uint32_t *tbl, uint32_t **end, int bit) {
-    for (*tbl <<= 1; tbl <= *end; *++tbl <<= 1) {
-        if (filter(*tbl) ^ filter(*tbl | 1)) {  // replace
-            *tbl |= filter(*tbl) ^ bit;
-        } else if (filter(*tbl) == bit) {       // insert
-            *++*end = *++tbl;
-            *tbl = tbl[-1] | 1;
-        } else {                                // drop
-            *tbl-- = *(*end)--;
-        }
-    }
-}
-/** recover
- * recursively narrow down the search space, 4 bits of keystream at a time
- */
-static struct Crypto1State *
-recover(uint32_t *o_head, uint32_t *o_tail, uint32_t oks,
-        uint32_t *e_head, uint32_t *e_tail, uint32_t eks, int rem,
-        struct Crypto1State *sl, uint32_t in, bucket_array_t bucket) {
-    uint32_t *o, *e;
-    bucket_info_t bucket_info;
-
-    if (rem == -1) {
-        for (e = e_head; e <= e_tail; ++e) {
-            *e = *e << 1 ^ parity(*e & LF_POLY_EVEN) ^ !!(in & 4);
-            for (o = o_head; o <= o_tail; ++o, ++sl) {
-                sl->even = *o;
-                sl->odd = *e ^ parity(*o & LF_POLY_ODD);
-                sl[1].odd = sl[1].even = 0;
-            }
-        }
-        return sl;
-    }
-
-    for (uint32_t i = 0; i < 4 && rem--; i++) {
-        oks >>= 1;
-        eks >>= 1;
-        in >>= 2;
-        extend_table(o_head, &o_tail, oks & 1, LF_POLY_EVEN << 1 | 1, LF_POLY_ODD << 1, 0);
-        if (o_head > o_tail)
-            return sl;
-
-        extend_table(e_head, &e_tail, eks & 1, LF_POLY_ODD, LF_POLY_EVEN << 1 | 1, in & 3);
-        if (e_head > e_tail)
-            return sl;
-    }
-
-    bucket_sort_intersect(e_head, e_tail, o_head, o_tail, &bucket_info, bucket);
-
-    for (int i = bucket_info.numbuckets - 1; i >= 0; i--) {
-        sl = recover(bucket_info.bucket_info[1][i].head, bucket_info.bucket_info[1][i].tail, oks,
-                     bucket_info.bucket_info[0][i].head, bucket_info.bucket_info[0][i].tail, eks,
-                     rem, sl, in, bucket);
-    }
-
-    return sl;
-}
-/** lfsr_recovery
- * recover the state of the lfsr given 32 bits of the keystream
- * additionally you can use the in parameter to specify the value
- * that was fed into the lfsr at the time the keystream was generated
- */
-struct Crypto1State *lfsr_recovery32(uint32_t ks2, uint32_t in) {
-    struct Crypto1State *statelist;
-    uint32_t *odd_head = 0, *odd_tail = 0, oks = 0;
-    uint32_t *even_head = 0, *even_tail = 0, eks = 0;
-    int i;
-
-    // split the keystream into an odd and even part
-    for (i = 31; i >= 0; i -= 2)
-        oks = oks << 1 | BEBIT(ks2, i);
-    for (i = 30; i >= 0; i -= 2)
-        eks = eks << 1 | BEBIT(ks2, i);
-
-    odd_head = odd_tail = malloc(sizeof(uint32_t) << 21);
-    even_head = even_tail = malloc(sizeof(uint32_t) << 21);
-    statelist =  malloc(sizeof(struct Crypto1State) << 18);
-    if (!odd_tail-- || !even_tail-- || !statelist) {
-        free(statelist);
-        statelist = 0;
-        goto out;
-    }
-
-    statelist->odd = statelist->even = 0;
-
-    // allocate memory for out of place bucket_sort
-    bucket_array_t bucket;
-
-    for (uint32_t i = 0; i < 2; i++) {
-        for (uint32_t j = 0; j <= 0xff; j++) {
-            bucket[i][j].head = malloc(sizeof(uint32_t) << 14);
-            if (!bucket[i][j].head) {
-                goto out;
-            }
-        }
-    }
-
-    // initialize statelists: add all possible states which would result into the rightmost 2 bits of the keystream
-    for (i = 1 << 20; i >= 0; --i) {
-        if (filter(i) == (oks & 1))
-            *++odd_tail = i;
-        if (filter(i) == (eks & 1))
-            *++even_tail = i;
-    }
-
-    // extend the statelists. Look at the next 8 Bits of the keystream (4 Bit each odd and even):
-    for (i = 0; i < 4; i++) {
-        extend_table_simple(odd_head,  &odd_tail, (oks >>= 1) & 1);
-        extend_table_simple(even_head, &even_tail, (eks >>= 1) & 1);
-    }
-
-    // the statelists now contain all states which could have generated the last 10 Bits of the keystream.
-    // 22 bits to go to recover 32 bits in total. From now on, we need to take the "in"
-    // parameter into account.
-    in = (in >> 16 & 0xff) | (in << 16) | (in & 0xff00); // Byte swapping
-    recover(odd_head, odd_tail, oks, even_head, even_tail, eks, 11, statelist, in << 1, bucket);
-
-out:
-    for (uint32_t i = 0; i < 2; i++)
-        for (uint32_t j = 0; j <= 0xff; j++)
-            free(bucket[i][j].head);
-    free(odd_head);
-    free(even_head);
-    return statelist;
-}
-
-static const uint32_t S1[] = {     0x62141, 0x310A0, 0x18850, 0x0C428, 0x06214,
-                                   0x0310A, 0x85E30, 0xC69AD, 0x634D6, 0xB5CDE, 0xDE8DA, 0x6F46D, 0xB3C83,
-                                   0x59E41, 0xA8995, 0xD027F, 0x6813F, 0x3409F, 0x9E6FA
-                             };
-static const uint32_t S2[] = {  0x3A557B00, 0x5D2ABD80, 0x2E955EC0, 0x174AAF60,
-                                0x0BA557B0, 0x05D2ABD8, 0x0449DE68, 0x048464B0, 0x42423258, 0x278192A8,
-                                0x156042D0, 0x0AB02168, 0x43F89B30, 0x61FC4D98, 0x765EAD48, 0x7D8FDD20,
-                                0x7EC7EE90, 0x7F63F748, 0x79117020
-                             };
-static const uint32_t T1[] = {
-    0x4F37D, 0x279BE, 0x97A6A, 0x4BD35, 0x25E9A, 0x12F4D, 0x097A6, 0x80D66,
-    0xC4006, 0x62003, 0xB56B4, 0x5AB5A, 0xA9318, 0xD0F39, 0x6879C, 0xB057B,
-    0x582BD, 0x2C15E, 0x160AF, 0x8F6E2, 0xC3DC4, 0xE5857, 0x72C2B, 0x39615,
-    0x98DBF, 0xC806A, 0xE0680, 0x70340, 0x381A0, 0x98665, 0x4C332, 0xA272C
-};
-static const uint32_t T2[] = {  0x3C88B810, 0x5E445C08, 0x2982A580, 0x14C152C0,
-                                0x4A60A960, 0x253054B0, 0x52982A58, 0x2FEC9EA8, 0x1156C4D0, 0x08AB6268,
-                                0x42F53AB0, 0x217A9D58, 0x161DC528, 0x0DAE6910, 0x46D73488, 0x25CB11C0,
-                                0x52E588E0, 0x6972C470, 0x34B96238, 0x5CFC3A98, 0x28DE96C8, 0x12CFC0E0,
-                                0x4967E070, 0x64B3F038, 0x74F97398, 0x7CDC3248, 0x38CE92A0, 0x1C674950,
-                                0x0E33A4A8, 0x01B959D0, 0x40DCACE8, 0x26CEDDF0
-                             };
-static const uint32_t C1[] = { 0x846B5, 0x4235A, 0x211AD};
-static const uint32_t C2[] = { 0x1A822E0, 0x21A822E0, 0x21A822E0};
-/** Reverse 64 bits of keystream into possible cipher states
- * Variation mentioned in the paper. Somewhat optimized version
- */
-struct Crypto1State *lfsr_recovery64(uint32_t ks2, uint32_t ks3) {
-    struct Crypto1State *statelist, *sl;
-    uint8_t oks[32], eks[32], hi[32];
-    uint32_t low = 0,  win = 0;
-    uint32_t *tail, table[1 << 16];
-    int i, j;
-
-    sl = statelist = malloc(sizeof(struct Crypto1State) << 4);
-    if (!sl)
-        return 0;
-    sl->odd = sl->even = 0;
-
-    for (i = 30; i >= 0; i -= 2) {
-        oks[i >> 1] = BEBIT(ks2, i);
-        oks[16 + (i >> 1)] = BEBIT(ks3, i);
-    }
-    for (i = 31; i >= 0; i -= 2) {
-        eks[i >> 1] = BEBIT(ks2, i);
-        eks[16 + (i >> 1)] = BEBIT(ks3, i);
-    }
-
-    for (i = 0xfffff; i >= 0; --i) {
-        if (filter(i) != oks[0])
-            continue;
-
-        *(tail = table) = i;
-        for (j = 1; tail >= table && j < 29; ++j)
-            extend_table_simple(table, &tail, oks[j]);
-
-        if (tail < table)
-            continue;
-
-        for (j = 0; j < 19; ++j)
-            low = low << 1 | parity(i & S1[j]);
-        for (j = 0; j < 32; ++j)
-            hi[j] = parity(i & T1[j]);
-
-        for (; tail >= table; --tail) {
-            for (j = 0; j < 3; ++j) {
-                *tail = *tail << 1;
-                *tail |= parity((i & C1[j]) ^ (*tail & C2[j]));
-                if (filter(*tail) != oks[29 + j])
-                    goto continue2;
-            }
-
-            for (j = 0; j < 19; ++j)
-                win = win << 1 | parity(*tail & S2[j]);
-
-            win ^= low;
-            for (j = 0; j < 32; ++j) {
-                win = win << 1 ^ hi[j] ^ parity(*tail & T2[j]);
-                if (filter(win) != eks[j])
-                    goto continue2;
-            }
-
-            *tail = *tail << 1 | parity(LF_POLY_EVEN & *tail);
-            sl->odd = *tail ^ parity(LF_POLY_ODD & win);
-            sl->even = win;
-            ++sl;
-            sl->odd = sl->even = 0;
-continue2:
-            ;
-        }
-    }
-    return statelist;
-}
-
-/** lfsr_rollback_bit
- * Rollback the shift register in order to get previous states
- */
-uint8_t lfsr_rollback_bit(struct Crypto1State *s, uint32_t in, int fb) {
-    int out;
-    uint8_t ret;
-    uint32_t t;
-
-    s->odd &= 0xffffff;
-    t = s->odd, s->odd = s->even, s->even = t;
-
-    out = s->even & 1;
-    out ^= LF_POLY_EVEN & (s->even >>= 1);
-    out ^= LF_POLY_ODD & s->odd;
-    out ^= !!in;
-    out ^= (ret = filter(s->odd)) & !!fb;
-
-    s->even |= parity(out) << 23;
-    return ret;
-}
-/** lfsr_rollback_byte
- * Rollback the shift register in order to get previous states
- */
-uint8_t lfsr_rollback_byte(struct Crypto1State *s, uint32_t in, int fb) {
-    /*
-    int i, ret = 0;
-    for (i = 7; i >= 0; --i)
-        ret |= lfsr_rollback_bit(s, BIT(in, i), fb) << i;
-    */
-// unfold loop 20160112
-    uint8_t ret = 0;
-    ret |= lfsr_rollback_bit(s, BIT(in, 7), fb) << 7;
-    ret |= lfsr_rollback_bit(s, BIT(in, 6), fb) << 6;
-    ret |= lfsr_rollback_bit(s, BIT(in, 5), fb) << 5;
-    ret |= lfsr_rollback_bit(s, BIT(in, 4), fb) << 4;
-    ret |= lfsr_rollback_bit(s, BIT(in, 3), fb) << 3;
-    ret |= lfsr_rollback_bit(s, BIT(in, 2), fb) << 2;
-    ret |= lfsr_rollback_bit(s, BIT(in, 1), fb) << 1;
-    ret |= lfsr_rollback_bit(s, BIT(in, 0), fb) << 0;
-    return ret;
-}
-/** lfsr_rollback_word
- * Rollback the shift register in order to get previous states
- */
-uint32_t lfsr_rollback_word(struct Crypto1State *s, uint32_t in, int fb) {
-    /*
-    int i;
-    uint32_t ret = 0;
-    for (i = 31; i >= 0; --i)
-        ret |= lfsr_rollback_bit(s, BEBIT(in, i), fb) << (i ^ 24);
-    */
-// unfold loop 20160112
-    uint32_t ret = 0;
-    ret |= lfsr_rollback_bit(s, BEBIT(in, 31), fb) << (31 ^ 24);
-    ret |= lfsr_rollback_bit(s, BEBIT(in, 30), fb) << (30 ^ 24);
-    ret |= lfsr_rollback_bit(s, BEBIT(in, 29), fb) << (29 ^ 24);
-    ret |= lfsr_rollback_bit(s, BEBIT(in, 28), fb) << (28 ^ 24);
-    ret |= lfsr_rollback_bit(s, BEBIT(in, 27), fb) << (27 ^ 24);
-    ret |= lfsr_rollback_bit(s, BEBIT(in, 26), fb) << (26 ^ 24);
-    ret |= lfsr_rollback_bit(s, BEBIT(in, 25), fb) << (25 ^ 24);
-    ret |= lfsr_rollback_bit(s, BEBIT(in, 24), fb) << (24 ^ 24);
-
-    ret |= lfsr_rollback_bit(s, BEBIT(in, 23), fb) << (23 ^ 24);
-    ret |= lfsr_rollback_bit(s, BEBIT(in, 22), fb) << (22 ^ 24);
-    ret |= lfsr_rollback_bit(s, BEBIT(in, 21), fb) << (21 ^ 24);
-    ret |= lfsr_rollback_bit(s, BEBIT(in, 20), fb) << (20 ^ 24);
-    ret |= lfsr_rollback_bit(s, BEBIT(in, 19), fb) << (19 ^ 24);
-    ret |= lfsr_rollback_bit(s, BEBIT(in, 18), fb) << (18 ^ 24);
-    ret |= lfsr_rollback_bit(s, BEBIT(in, 17), fb) << (17 ^ 24);
-    ret |= lfsr_rollback_bit(s, BEBIT(in, 16), fb) << (16 ^ 24);
-
-    ret |= lfsr_rollback_bit(s, BEBIT(in, 15), fb) << (15 ^ 24);
-    ret |= lfsr_rollback_bit(s, BEBIT(in, 14), fb) << (14 ^ 24);
-    ret |= lfsr_rollback_bit(s, BEBIT(in, 13), fb) << (13 ^ 24);
-    ret |= lfsr_rollback_bit(s, BEBIT(in, 12), fb) << (12 ^ 24);
-    ret |= lfsr_rollback_bit(s, BEBIT(in, 11), fb) << (11 ^ 24);
-    ret |= lfsr_rollback_bit(s, BEBIT(in, 10), fb) << (10 ^ 24);
-    ret |= lfsr_rollback_bit(s, BEBIT(in, 9), fb) << (9 ^ 24);
-    ret |= lfsr_rollback_bit(s, BEBIT(in, 8), fb) << (8 ^ 24);
-
-    ret |= lfsr_rollback_bit(s, BEBIT(in, 7), fb) << (7 ^ 24);
-    ret |= lfsr_rollback_bit(s, BEBIT(in, 6), fb) << (6 ^ 24);
-    ret |= lfsr_rollback_bit(s, BEBIT(in, 5), fb) << (5 ^ 24);
-    ret |= lfsr_rollback_bit(s, BEBIT(in, 4), fb) << (4 ^ 24);
-    ret |= lfsr_rollback_bit(s, BEBIT(in, 3), fb) << (3 ^ 24);
-    ret |= lfsr_rollback_bit(s, BEBIT(in, 2), fb) << (2 ^ 24);
-    ret |= lfsr_rollback_bit(s, BEBIT(in, 1), fb) << (1 ^ 24);
-    ret |= lfsr_rollback_bit(s, BEBIT(in, 0), fb) << (0 ^ 24);
-    return ret;
-}
-
-/** nonce_distance
- * x,y valid tag nonces, then prng_successor(x, nonce_distance(x, y)) = y
- */
-static uint16_t *dist = 0;
-int nonce_distance(uint32_t from, uint32_t to) {
-    uint16_t x, i;
-    if (!dist) {
-        dist = malloc(2 << 16);
-        if (!dist)
-            return -1;
-        for (x = i = 1; i; ++i) {
-            dist[(x & 0xff) << 8 | x >> 8] = i;
-            x = x >> 1 | (x ^ x >> 2 ^ x >> 3 ^ x >> 5) << 15;
-        }
-    }
-    return (65535 + dist[to >> 16] - dist[from >> 16]) % 65535;
-}
-
-
-static uint32_t fastfwd[2][8] = {
-    { 0, 0x4BC53, 0xECB1, 0x450E2, 0x25E29, 0x6E27A, 0x2B298, 0x60ECB},
-    { 0, 0x1D962, 0x4BC53, 0x56531, 0xECB1, 0x135D3, 0x450E2, 0x58980}
-};
-
-
-/** lfsr_prefix_ks
- *
- * Is an exported helper function from the common prefix attack
- * Described in the "dark side" paper. It returns an -1 terminated array
- * of possible partial(21 bit) secret state.
- * The required keystream(ks) needs to contain the keystream that was used to
- * encrypt the NACK which is observed when varying only the 3 last bits of Nr
- * only correct iff [NR_3] ^ NR_3 does not depend on Nr_3
- */
-uint32_t *lfsr_prefix_ks(uint8_t ks[8], int isodd) {
-    uint32_t *candidates = malloc(4 << 10);
-    if (!candidates) return 0;
-
-    uint32_t c,  entry;
-    int size = 0, i, good;
-
-    for (i = 0; i < 1 << 21; ++i) {
-        for (c = 0, good = 1; good && c < 8; ++c) {
-            entry = i ^ fastfwd[isodd][c];
-            good &= (BIT(ks[c], isodd) == filter(entry >> 1));
-            good &= (BIT(ks[c], isodd + 2) == filter(entry));
-        }
-        if (good)
-            candidates[size++] = i;
-    }
-
-    candidates[size] = -1;
-
-    return candidates;
-}
-
-/** check_pfx_parity
- * helper function which eliminates possible secret states using parity bits
- */
-static struct Crypto1State *check_pfx_parity(uint32_t prefix, uint32_t rresp, uint8_t parities[8][8], uint32_t odd, uint32_t even, struct Crypto1State *sl) {
-    uint32_t ks1, nr, ks2, rr, ks3, c, good = 1;
-
-    for (c = 0; good && c < 8; ++c) {
-        sl->odd = odd ^ fastfwd[1][c];
-        sl->even = even ^ fastfwd[0][c];
-
-        lfsr_rollback_bit(sl, 0, 0);
-        lfsr_rollback_bit(sl, 0, 0);
-
-        ks3 = lfsr_rollback_bit(sl, 0, 0);
-        ks2 = lfsr_rollback_word(sl, 0, 0);
-        ks1 = lfsr_rollback_word(sl, prefix | c << 5, 1);
-
-        nr = ks1 ^ (prefix | c << 5);
-        rr = ks2 ^ rresp;
-
-        good &= parity(nr & 0x000000ff) ^ parities[c][3] ^ BIT(ks2, 24);
-        good &= parity(rr & 0xff000000) ^ parities[c][4] ^ BIT(ks2, 16);
-        good &= parity(rr & 0x00ff0000) ^ parities[c][5] ^ BIT(ks2,  8);
-        good &= parity(rr & 0x0000ff00) ^ parities[c][6] ^ BIT(ks2,  0);
-        good &= parity(rr & 0x000000ff) ^ parities[c][7] ^ ks3;
-    }
-
-    return sl + good;
-}
-
-/** lfsr_common_prefix
- * Implentation of the common prefix attack.
- * Requires the 28 bit constant prefix used as reader nonce (pfx)
- * The reader response used (rr)
- * The keystream used to encrypt the observed NACK's (ks)
- * The parity bits (par)
- * It returns a zero terminated list of possible cipher states after the
- * tag nonce was fed in
- */
-
-struct Crypto1State *lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8]) {
-    struct Crypto1State *statelist, *s;
-    uint32_t *odd, *even, *o, *e, top;
-
-    odd = lfsr_prefix_ks(ks, 1);
-    even = lfsr_prefix_ks(ks, 0);
-
-    s = statelist = malloc((sizeof * statelist) << 24);
-    if (!s || !odd || !even) {
-        free(statelist);
-        statelist = 0;
-        goto out;
-    }
-
-    for (o = odd; *o + 1; ++o)
-        for (e = even; *e + 1; ++e)
-            for (top = 0; top < 64; ++top) {
-                *o += 1 << 21;
-                *e += (!(top & 7) + 1) << 21;
-                s = check_pfx_parity(pfx, rr, par, *o, *e, s);
-            }
-
-    s->odd = s->even = 0;
-out:
-    free(odd);
-    free(even);
-    return statelist;
-}
diff --git a/tools/mfkey/crapto1.h b/tools/mfkey/crapto1.h
deleted file mode 100644
index db8b5cba2..000000000
--- a/tools/mfkey/crapto1.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*  crapto1.h
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation; either version 2
-    of the License, or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-    MA  02110-1301, US$
-
-    Copyright (C) 2008-2014 bla <blapost@gmail.com>
-*/
-#ifndef CRAPTO1_H__
-#define CRAPTO1_H__
-#include <stdint.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct Crypto1State {uint32_t odd, even;};
-struct Crypto1State *crypto1_create(uint64_t);
-void crypto1_destroy(struct Crypto1State *);
-void crypto1_get_lfsr(struct Crypto1State *, uint64_t *);
-uint8_t crypto1_bit(struct Crypto1State *, uint8_t, int);
-uint8_t crypto1_byte(struct Crypto1State *, uint8_t, int);
-uint32_t crypto1_word(struct Crypto1State *, uint32_t, int);
-uint32_t prng_successor(uint32_t x, uint32_t n);
-
-struct Crypto1State *lfsr_recovery32(uint32_t ks2, uint32_t in);
-struct Crypto1State *lfsr_recovery64(uint32_t ks2, uint32_t ks3);
-uint32_t *lfsr_prefix_ks(uint8_t ks[8], int isodd);
-struct Crypto1State *lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8]);
-
-uint8_t lfsr_rollback_bit(struct Crypto1State *s, uint32_t in, int fb);
-uint8_t lfsr_rollback_byte(struct Crypto1State *s, uint32_t in, int fb);
-uint32_t lfsr_rollback_word(struct Crypto1State *s, uint32_t in, int fb);
-int nonce_distance(uint32_t from, uint32_t to);
-#define SWAPENDIAN(x)\
-    (x = (x >> 8 & 0xff00ff) | (x & 0xff00ff) << 8, x = x >> 16 | x << 16)
-
-#define FOREACH_VALID_NONCE(N, FILTER, FSIZE)\
-    uint32_t __n = 0,__M = 0, N = 0;\
-    int __i;\
-    for(; __n < 1 << 16; N = prng_successor(__M = ++__n, 16))\
-        for(__i = FSIZE - 1; __i >= 0; __i--)\
-            if(BIT(FILTER, __i) ^ parity(__M & 0xFF01))\
-                break;\
-            else if(__i)\
-                __M = prng_successor(__M, (__i == 7) ? 48 : 8);\
-            else
-
-#define LF_POLY_ODD (0x29CE5C)
-#define LF_POLY_EVEN (0x870804)
-#define BIT(x, n) ((x) >> (n) & 1)
-#define BEBIT(x, n) BIT(x, (n) ^ 24)
-static inline int parity(uint32_t x) {
-#if !defined __i386__ || !defined __GNUC__
-    x ^= x >> 16;
-    x ^= x >> 8;
-    x ^= x >> 4;
-    return BIT(0x6996, x & 0xf);
-#else
-    __asm__("movl %1, %%eax\n"
-            "mov %%ax, %%cx\n"
-            "shrl $0x10, %%eax\n"
-            "xor %%ax, %%cx\n"
-            "xor %%ch, %%cl\n"
-            "setpo %%al\n"
-            "movzx %%al, %0\n": "=r"(x) : "r"(x): "eax", "ecx");
-    return x;
-#endif
-}
-static inline int filter(uint32_t const x) {
-    uint32_t f;
-
-    f  = 0xf22c0 >> (x       & 0xf) & 16;
-    f |= 0x6c9c0 >> (x >>  4 & 0xf) &  8;
-    f |= 0x3c8b0 >> (x >>  8 & 0xf) &  4;
-    f |= 0x1e458 >> (x >> 12 & 0xf) &  2;
-    f |= 0x0d938 >> (x >> 16 & 0xf) &  1;
-    return BIT(0xEC57E80A, f);
-}
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/tools/mfkey/crypto1.c b/tools/mfkey/crypto1.c
deleted file mode 100644
index cdb0ffc14..000000000
--- a/tools/mfkey/crypto1.c
+++ /dev/null
@@ -1,139 +0,0 @@
-/*  crypto1.c
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation; either version 2
-    of the License, or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-    MA  02110-1301, US
-
-    Copyright (C) 2008-2008 bla <blapost@gmail.com>
-*/
-#include "crapto1.h"
-#include <stdlib.h>
-
-struct Crypto1State *crypto1_create(uint64_t key) {
-    struct Crypto1State *s = malloc(sizeof(*s));
-    if (!s) return NULL;
-
-    s->odd = s->even = 0;
-
-    int i;
-    //for(i = 47;s && i > 0; i -= 2) {
-    for (i = 47; i > 0; i -= 2) {
-        s->odd  = s->odd  << 1 | BIT(key, (i - 1) ^ 7);
-        s->even = s->even << 1 | BIT(key, i ^ 7);
-    }
-    return s;
-}
-void crypto1_destroy(struct Crypto1State *state) {
-    free(state);
-}
-void crypto1_get_lfsr(struct Crypto1State *state, uint64_t *lfsr) {
-    int i;
-    for (*lfsr = 0, i = 23; i >= 0; --i) {
-        *lfsr = *lfsr << 1 | BIT(state->odd, i ^ 3);
-        *lfsr = *lfsr << 1 | BIT(state->even, i ^ 3);
-    }
-}
-uint8_t crypto1_bit(struct Crypto1State *s, uint8_t in, int is_encrypted) {
-    uint32_t feedin;
-    uint32_t tmp;
-    uint8_t ret = filter(s->odd);
-
-    feedin  = ret & !!is_encrypted;
-    feedin ^= !!in;
-    feedin ^= LF_POLY_ODD & s->odd;
-    feedin ^= LF_POLY_EVEN & s->even;
-    s->even = s->even << 1 | parity(feedin);
-
-    tmp = s->odd;
-    s->odd = s->even;
-    s->even = tmp;
-
-    return ret;
-}
-uint8_t crypto1_byte(struct Crypto1State *s, uint8_t in, int is_encrypted) {
-    /*
-    uint8_t i, ret = 0;
-
-    for (i = 0; i < 8; ++i)
-        ret |= crypto1_bit(s, BIT(in, i), is_encrypted) << i;
-    */
-// unfold loop 20161012
-    uint8_t ret = 0;
-    ret |= crypto1_bit(s, BIT(in, 0), is_encrypted) << 0;
-    ret |= crypto1_bit(s, BIT(in, 1), is_encrypted) << 1;
-    ret |= crypto1_bit(s, BIT(in, 2), is_encrypted) << 2;
-    ret |= crypto1_bit(s, BIT(in, 3), is_encrypted) << 3;
-    ret |= crypto1_bit(s, BIT(in, 4), is_encrypted) << 4;
-    ret |= crypto1_bit(s, BIT(in, 5), is_encrypted) << 5;
-    ret |= crypto1_bit(s, BIT(in, 6), is_encrypted) << 6;
-    ret |= crypto1_bit(s, BIT(in, 7), is_encrypted) << 7;
-    return ret;
-}
-uint32_t crypto1_word(struct Crypto1State *s, uint32_t in, int is_encrypted) {
-    /*
-    uint32_t i, ret = 0;
-
-    for (i = 0; i < 32; ++i)
-        ret |= crypto1_bit(s, BEBIT(in, i), is_encrypted) << (i ^ 24);
-    */
-//unfold loop 2016012
-    uint32_t ret = 0;
-    ret |= crypto1_bit(s, BEBIT(in, 0), is_encrypted) << (0 ^ 24);
-    ret |= crypto1_bit(s, BEBIT(in, 1), is_encrypted) << (1 ^ 24);
-    ret |= crypto1_bit(s, BEBIT(in, 2), is_encrypted) << (2 ^ 24);
-    ret |= crypto1_bit(s, BEBIT(in, 3), is_encrypted) << (3 ^ 24);
-    ret |= crypto1_bit(s, BEBIT(in, 4), is_encrypted) << (4 ^ 24);
-    ret |= crypto1_bit(s, BEBIT(in, 5), is_encrypted) << (5 ^ 24);
-    ret |= crypto1_bit(s, BEBIT(in, 6), is_encrypted) << (6 ^ 24);
-    ret |= crypto1_bit(s, BEBIT(in, 7), is_encrypted) << (7 ^ 24);
-
-    ret |= crypto1_bit(s, BEBIT(in, 8), is_encrypted) << (8 ^ 24);
-    ret |= crypto1_bit(s, BEBIT(in, 9), is_encrypted) << (9 ^ 24);
-    ret |= crypto1_bit(s, BEBIT(in, 10), is_encrypted) << (10 ^ 24);
-    ret |= crypto1_bit(s, BEBIT(in, 11), is_encrypted) << (11 ^ 24);
-    ret |= crypto1_bit(s, BEBIT(in, 12), is_encrypted) << (12 ^ 24);
-    ret |= crypto1_bit(s, BEBIT(in, 13), is_encrypted) << (13 ^ 24);
-    ret |= crypto1_bit(s, BEBIT(in, 14), is_encrypted) << (14 ^ 24);
-    ret |= crypto1_bit(s, BEBIT(in, 15), is_encrypted) << (15 ^ 24);
-
-    ret |= crypto1_bit(s, BEBIT(in, 16), is_encrypted) << (16 ^ 24);
-    ret |= crypto1_bit(s, BEBIT(in, 17), is_encrypted) << (17 ^ 24);
-    ret |= crypto1_bit(s, BEBIT(in, 18), is_encrypted) << (18 ^ 24);
-    ret |= crypto1_bit(s, BEBIT(in, 19), is_encrypted) << (19 ^ 24);
-    ret |= crypto1_bit(s, BEBIT(in, 20), is_encrypted) << (20 ^ 24);
-    ret |= crypto1_bit(s, BEBIT(in, 21), is_encrypted) << (21 ^ 24);
-    ret |= crypto1_bit(s, BEBIT(in, 22), is_encrypted) << (22 ^ 24);
-    ret |= crypto1_bit(s, BEBIT(in, 23), is_encrypted) << (23 ^ 24);
-
-    ret |= crypto1_bit(s, BEBIT(in, 24), is_encrypted) << (24 ^ 24);
-    ret |= crypto1_bit(s, BEBIT(in, 25), is_encrypted) << (25 ^ 24);
-    ret |= crypto1_bit(s, BEBIT(in, 26), is_encrypted) << (26 ^ 24);
-    ret |= crypto1_bit(s, BEBIT(in, 27), is_encrypted) << (27 ^ 24);
-    ret |= crypto1_bit(s, BEBIT(in, 28), is_encrypted) << (28 ^ 24);
-    ret |= crypto1_bit(s, BEBIT(in, 29), is_encrypted) << (29 ^ 24);
-    ret |= crypto1_bit(s, BEBIT(in, 30), is_encrypted) << (30 ^ 24);
-    ret |= crypto1_bit(s, BEBIT(in, 31), is_encrypted) << (31 ^ 24);
-    return ret;
-}
-
-/* prng_successor
- * helper used to obscure the keystream during authentication
- */
-uint32_t prng_successor(uint32_t x, uint32_t n) {
-    SWAPENDIAN(x);
-    while (n--)
-        x = x >> 1 | (x >> 16 ^ x >> 18 ^ x >> 19 ^ x >> 21) << 31;
-
-    return SWAPENDIAN(x);
-}
diff --git a/tools/mfkey/mfkey32.c b/tools/mfkey/mfkey32.c
index 01a8fe8cc..615373c83 100644
--- a/tools/mfkey/mfkey32.c
+++ b/tools/mfkey/mfkey32.c
@@ -1,8 +1,10 @@
 #define __STDC_FORMAT_MACROS
 #include <inttypes.h>
-#include "crapto1.h"
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include "crapto1/crapto1.h"
+#include "util_posix.h"		
 
 int main(int argc, char *argv[]) {
     struct Crypto1State *s, *t;
@@ -15,7 +17,7 @@ int main(int argc, char *argv[]) {
     uint32_t ar1_enc; // second encrypted reader response
     uint32_t ks2;     // keystream used to encrypt reader response
 
-    printf("MIFARE Classic key recovery - based 32 bits of keystream\n");
+    printf("MIFARE Classic key recovery - based on 32 bits of keystream\n");
     printf("Recover key from two 32-bit reader authentication answers only!\n\n");
 
     if (argc < 7) {
diff --git a/tools/mfkey/mfkey32v2.c b/tools/mfkey/mfkey32v2.c
index 9575d55e3..86e528783 100644
--- a/tools/mfkey/mfkey32v2.c
+++ b/tools/mfkey/mfkey32v2.c
@@ -1,8 +1,10 @@
 #define __STDC_FORMAT_MACROS
 #include <inttypes.h>
-#include "crapto1.h"
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include "crapto1/crapto1.h"
+#include "util_posix.h"		
 
 int main(int argc, char *argv[]) {
     struct Crypto1State *s, *t;
diff --git a/tools/mfkey/mfkey64.c b/tools/mfkey/mfkey64.c
index 0bb115297..45f0ffee2 100644
--- a/tools/mfkey/mfkey64.c
+++ b/tools/mfkey/mfkey64.c
@@ -1,9 +1,10 @@
 #define __STDC_FORMAT_MACROS
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
 #include <inttypes.h>
-#include "crapto1.h"
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include "crapto1/crapto1.h"
+#include "util_posix.h"
 
 int main(int argc, char *argv[]) {
     struct Crypto1State *revstate;
@@ -58,13 +59,14 @@ int main(int argc, char *argv[]) {
 
     // Generate lfsr succesors of the tag challenge
     printf("\nLFSR succesors of the tag challenge:\n");
-    printf("  nt': %08x\n", prng_successor(nt, 64));
-    printf(" nt'': %08x\n", prng_successor(nt, 96));
+    uint32_t p64 = prng_successor(nt, 64);
+    printf("  nt': %08x\n", p64);
+    printf(" nt'': %08x\n", prng_successor(p64, 32));
 
     // Extract the keystream from the messages
     printf("\nKeystream used to generate {ar} and {at}:\n");
-    ks2 = ar_enc ^ prng_successor(nt, 64);
-    ks3 = at_enc ^ prng_successor(nt, 96);
+    ks2 = ar_enc ^ p64;
+    ks3 = at_enc ^ prng_successor(p64, 32);
     printf("  ks2: %08x\n", ks2);
     printf("  ks3: %08x\n", ks3);
 

From ca24b7ae74e8e99facee476527d75dedf63ce7ca Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 17 Mar 2019 21:52:14 +0100
Subject: [PATCH 0830/1938] chg: 'hf 14a sim' - send 4bit ACK/NACK responses

---
 armsrc/iso14443a.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 023eb02f9..c1ace2e61 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -1138,8 +1138,7 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
             uint8_t index = receivedCmd[1];
             if (index > 2) {
                 // send NACK 0x0 == invalid argument
-                uint8_t nack[] = {0x00};
-                EmSendCmd(nack, sizeof(nack));
+                EmSend4bit(0x00);
             } else {
                 uint8_t cmd[] =  {0x00, 0x00, 0x00, 0x14, 0xa5};
                 num_to_bytes(counters[index], 3, cmd);
@@ -1151,8 +1150,7 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
             uint8_t index = receivedCmd[1];
             if (index > 2) {
                 // send NACK 0x0 == invalid argument
-                uint8_t nack[] = {0x00};
-                EmSendCmd(nack, sizeof(nack));
+                EmSend4bit(0x00);
             } else {
 
                 uint32_t val = bytes_to_num(receivedCmd + 2, 4);
@@ -1160,13 +1158,12 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
                 // if new value + old value is bigger 24bits,  fail
                 if (val + counters[index] > 0xFFFFFF) {
                     // send NACK 0x4 == counter overflow
-                    uint8_t nack[] = {0x04};
-                    EmSendCmd(nack, sizeof(nack));
+                    EmSend4bit(CARD_NACK_NA);
                 } else {
                     counters[index] = val;
                     // send ACK
-                    uint8_t ack[] = {0x0a};
-                    EmSendCmd(ack, sizeof(ack));
+                    EmSend4bit(CARD_ACK);
+                    CARD_ACK
                 }
             }
             p_response = NULL;
@@ -1176,8 +1173,7 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
             uint8_t index = receivedCmd[1];
             if (index > 2) {
                 // send NACK 0x0 == invalid argument
-                uint8_t nack[] = {0x00};
-                EmSendCmd(nack, sizeof(nack));
+                EmSend4bit(0x00);
             } else {
                 emlGetMemBt(emdata, 10 + index, 1);
                 AddCrc14A(emdata, sizeof(emdata) - 2);

From e925dc9f7ab11476d191750e643a046085a8c178 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 17 Mar 2019 21:53:26 +0100
Subject: [PATCH 0831/1938] clean

---
 armsrc/iso14443a.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index c1ace2e61..10a428e62 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -1163,7 +1163,6 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
                     counters[index] = val;
                     // send ACK
                     EmSend4bit(CARD_ACK);
-                    CARD_ACK
                 }
             }
             p_response = NULL;

From 86955c1de26e7ec887c0dfede0e95842d78e1a36 Mon Sep 17 00:00:00 2001
From: vratiskol <vincent.ratiskol@github.com>
Date: Mon, 18 Mar 2019 13:36:36 +0100
Subject: [PATCH 0832/1938] Log Level

---
 armsrc/mifaresim.c | 69 ++++++++++++++++++++++++++--------------------
 1 file changed, 39 insertions(+), 30 deletions(-)

diff --git a/armsrc/mifaresim.c b/armsrc/mifaresim.c
index 1c0fc3a20..adecf4cf9 100644
--- a/armsrc/mifaresim.c
+++ b/armsrc/mifaresim.c
@@ -36,32 +36,32 @@ static bool IsTrailerAccessAllowed(uint8_t blockNo, uint8_t keytype, uint8_t act
                  | ((sector_trailer[8] >> 7) & 0x01);
     switch (action) {
         case AC_KEYA_READ: {
-            if (MF_DBGLEVEL >= 2)	Dbprintf("IsTrailerAccessAllowed: AC_KEYA_READ");
+            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("IsTrailerAccessAllowed: AC_KEYA_READ");
             return false;
         }
         case AC_KEYA_WRITE: {
             if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("IsTrailerAccessAllowed: AC_KEYA_WRITE");
             return ((keytype == AUTHKEYA && (AC == 0x00 || AC == 0x01))
-                    || (keytype == AUTHKEYB && (AC == 0x04 || AC == 0x03)));
+                 || (keytype == AUTHKEYB && (AC == 0x04 || AC == 0x03)));
         }
         case AC_KEYB_READ: {
-            if (MF_DBGLEVEL >= 2)	Dbprintf("IsTrailerAccessAllowed: AC_KEYB_READ");
+            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("IsTrailerAccessAllowed: AC_KEYB_READ");
             return (keytype == AUTHKEYA && (AC == 0x00 || AC == 0x02 || AC == 0x01));
         }
         case AC_KEYB_WRITE: {
             if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("IsTrailerAccessAllowed: AC_KEYB_WRITE");
             return ((keytype == AUTHKEYA && (AC == 0x00 || AC == 0x04))
-                    || (keytype == AUTHKEYB && (AC == 0x04 || AC == 0x03)));
+                 || (keytype == AUTHKEYB && (AC == 0x04 || AC == 0x03)));
         }
         case AC_AC_READ: {
             if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("IsTrailerAccessAllowed: AC_AC_READ");
             return ((keytype == AUTHKEYA)
-                    || (keytype == AUTHKEYB && !(AC == 0x00 || AC == 0x02 || AC == 0x01)));
+                || (keytype == AUTHKEYB && !(AC == 0x00 || AC == 0x02 || AC == 0x01)));
         }
         case AC_AC_WRITE: {
             if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("IsTrailerAccessAllowed: AC_AC_WRITE");
             return ((keytype == AUTHKEYA && (AC == 0x01))
-                    || (keytype == AUTHKEYB && (AC == 0x03 || AC == 0x05)));
+                 || (keytype == AUTHKEYB && (AC == 0x03 || AC == 0x05)));
         }
         default:
             return false;
@@ -73,9 +73,9 @@ static bool IsDataAccessAllowed(uint8_t blockNo, uint8_t keytype, uint8_t action
 
     uint8_t sector_trailer[16];
     emlGetMem(sector_trailer, SectorTrailer(blockNo), 1);
-
+    
     uint8_t sector_block;
-    if (blockNo < MIFARE_2K_MAXBLOCK) {
+    if (blockNo <= MIFARE_2K_MAXBLOCK) {
         sector_block = blockNo & 0x03;
     } else {
         sector_block = (blockNo & 0x0f) / 5;
@@ -85,43 +85,43 @@ static bool IsDataAccessAllowed(uint8_t blockNo, uint8_t keytype, uint8_t action
     switch (sector_block) {
         case 0x00: {
             AC = ((sector_trailer[7] >> 2) & 0x04)
-                 | ((sector_trailer[8] << 1) & 0x02)
-                 | ((sector_trailer[8] >> 4) & 0x01);
-            if (MF_DBGLEVEL >= 2)	Dbprintf("IsDataAccessAllowed: case 0x00");
+               | ((sector_trailer[8] << 1) & 0x02)
+               | ((sector_trailer[8] >> 4) & 0x01);
+            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("IsDataAccessAllowed: case 0x00 - %02x", AC);
             break;
         }
         case 0x01: {
             AC = ((sector_trailer[7] >> 3) & 0x04)
-                 | ((sector_trailer[8] >> 0) & 0x02)
-                 | ((sector_trailer[8] >> 5) & 0x01);
-            if (MF_DBGLEVEL >= 2)	Dbprintf("IsDataAccessAllowed: case 0x01");
+               | ((sector_trailer[8] >> 0) & 0x02)
+               | ((sector_trailer[8] >> 5) & 0x01);
+            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("IsDataAccessAllowed: case 0x01 - %02x", AC);
             break;
         }
         case 0x02: {
             AC = ((sector_trailer[7] >> 4) & 0x04)
-                 | ((sector_trailer[8] >> 1) & 0x02)
-                 | ((sector_trailer[8] >> 6) & 0x01);
-            if (MF_DBGLEVEL >= 2)	Dbprintf("IsDataAccessAllowed: case 0x02");
+               | ((sector_trailer[8] >> 1) & 0x02)
+               | ((sector_trailer[8] >> 6) & 0x01);
+            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("IsDataAccessAllowed: case 0x02  - %02x", AC);
             break;
         }
         default:
-            if (MF_DBGLEVEL >= 2)	Dbprintf("IsDataAccessAllowed: Error");
+            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("IsDataAccessAllowed: Error");
             return false;
     }
 
     switch (action) {
         case AC_DATA_READ: {
-            if (MF_DBGLEVEL >= 2)	Dbprintf("AC_DATA_READ: OK");
+            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("IsDataAccessAllowed - AC_DATA_READ: OK");
             return ((keytype == AUTHKEYA && !(AC == 0x03 || AC == 0x05 || AC == 0x07))
                     || (keytype == AUTHKEYB && !(AC == 0x07)));
         }
         case AC_DATA_WRITE: {
-            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("AC_DATA_WRITE: OK");
+            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("IsDataAccessAllowed - AC_DATA_WRITE: OK");
             return ((keytype == AUTHKEYA && (AC == 0x00))
                     || (keytype == AUTHKEYB && (AC == 0x00 || AC == 0x04 || AC == 0x06 || AC == 0x03)));
         }
         case AC_DATA_INC: {
-            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("AC_DATA_WRITE: OK");
+            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("IsDataAccessAllowed - AC_DATA_INC: OK");
             return ((keytype == AUTHKEYA && (AC == 0x00))
                     || (keytype == AUTHKEYB && (AC == 0x00 || AC == 0x06)));
         }
@@ -785,36 +785,45 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                     blockNo = receivedCmd_dec[1];
                     if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Reader reading block %d (0x%02x)", blockNo, blockNo);
                     emlGetMem(response, blockNo, 1);
-                    if (MF_DBGLEVEL >= 2)  {
-                       Dbprintf("Data Block[%d]: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", blockNo,
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED)  {
+                       Dbprintf("[ISO14443A_CMD_READBLOCK] Data Block[%d]: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", blockNo,
                        response[0], response[1], response[2], response[3],  response[4],  response[5],  response[6],
                        response[7], response[8], response[9], response[10], response[11], response[12], response[13],
                        response[14],response[15]);
                     }
 
-
                     if (IsSectorTrailer(blockNo)) {
-                        memset(response, 0x00, 6); 	// keyA can never be read
-                        if (MF_DBGLEVEL >= 2) Dbprintf("[IsSectorTrailer] keyA can never be read - block %d (0x%02x)", blockNo, blockNo);
+                      
+                        if (!IsAccessAllowed(blockNo, cardAUTHKEY, AC_KEYA_READ)) {
+                            memset(response, 0x00, 6); 	// keyA can never be read, Why ??? Need source ?
+                                                      // a0a1a2a3a4a561e789c1b0b1b2b3b4b5 => 00000000000061e789c1b0b1b2b3b4b5
+                            if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[IsSectorTrailer] keyA can never be read - block %d (0x%02x)", blockNo, blockNo);
+                        }
                         if (!IsAccessAllowed(blockNo, cardAUTHKEY, AC_KEYB_READ)) {
                             memset(response + 10, 0x00, 6); 	// keyB cannot be read
-                            if (MF_DBGLEVEL >= 2) Dbprintf("[IsSectorTrailer] keyB cannot be read - block %d (0x%02x)", blockNo, blockNo);
+                            if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[IsSectorTrailer] keyB cannot be read - block %d (0x%02x)", blockNo, blockNo);
                         }
                         if (!IsAccessAllowed(blockNo, cardAUTHKEY, AC_AC_READ)) {
                             memset(response + 6, 0x00, 4); 	// AC bits cannot be read
-                            if (MF_DBGLEVEL >= 2) Dbprintf("[IsAccessAllowed] AC bits cannot be read - block %d (0x%02x)", blockNo, blockNo);
+                            if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[IsAccessAllowed] AC bits cannot be read - block %d (0x%02x)", blockNo, blockNo);
                         }
                     } else {
                         if (!IsAccessAllowed(blockNo, cardAUTHKEY, AC_DATA_READ)) {
                             memset(response, 0x00, 16);		// datablock cannot be read
-                            if (MF_DBGLEVEL >= 2) Dbprintf("[IsAccessAllowed] Data block %d (0x%02x) cannot be read", blockNo, blockNo);
+                            if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[IsAccessAllowed] Data block %d (0x%02x) cannot be read", blockNo, blockNo);
                         }
                     }
                     AppendCrc14443a(response, 16);
                     mf_crypto1_encrypt(pcs, response, MAX_MIFARE_FRAME_SIZE, response_par);
                     EmSendCmdPar(response, MAX_MIFARE_FRAME_SIZE, response_par);
+                    if (MF_DBGLEVEL >= 2) {
+                      Dbprintf("[EmSendCmdPar] Data Block[%d]: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", blockNo,
+                      response[0], response[1], response[2], response[3],  response[4],  response[5],  response[6],
+                      response[7], response[8], response[9], response[10], response[11], response[12], response[13],
+                      response[14],response[15]);
+                    }  
                     numReads++;
-                    if (MF_DBGLEVEL >= 2) Dbprintf("Num Read: %d",numReads);
+
                     if (exitAfterNReads > 0 && numReads == exitAfterNReads) {
                         Dbprintf("%d reads done, exiting", numReads);
                         finished = true;

From 027cda47d219717be9de3a41de146043d095818d Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Mar 2019 13:40:51 +0100
Subject: [PATCH 0833/1938] chg: adjust ask demod

---
 common/lfdemod.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/common/lfdemod.c b/common/lfdemod.c
index 653c2a308..eb7c629f5 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -1473,16 +1473,21 @@ int askdemod_ext(uint8_t *bits, size_t *size, int *clk, int *invert, int maxErr,
 
     if (*size == 0) return -1;
 
+    if (signalprop.isnoise) {
+        if (g_debugMode == 2) prnt("DEBUG (askdemod_ext) just noise detected - aborting");
+        return -2;
+    }
+    
     int start = DetectASKClock(bits, *size, clk, maxErr);
     if (*clk == 0 || start < 0) return -3;
-
+   
     if (*invert != 1) *invert = 0;
 
     // amplify signal data.
     // ICEMAN todo,
     if (amp == 1) askAmp(bits, *size);
 
-    if (g_debugMode == 2) prnt("DEBUG ASK: clk %d, beststart %d, amp %d", *clk, start, amp);
+    if (g_debugMode == 2) prnt("DEBUG (askdemod_ext) clk %d, beststart %d, amp %d", *clk, start, amp);
 
     //start pos from detect ask clock is 1/2 clock offset
     // NOTE: can be negative (demod assumes rest of wave was there)
@@ -1490,12 +1495,6 @@ int askdemod_ext(uint8_t *bits, size_t *size, int *clk, int *invert, int maxErr,
     uint16_t initLoopMax = 1024;
     if (initLoopMax > *size) initLoopMax = *size;
 
-    // just noise - no super good detection. good enough
-    if (signalprop.isnoise) {
-        if (g_debugMode == 2) prnt("DEBUG askdemod_ext: just noise detected - aborting");
-        return -2;
-    }
-
     // Detect high and lows
     //25% clip in case highs and lows aren't clipped [marshmellow]
     int high, low;
@@ -1539,7 +1538,7 @@ int askdemod_ext(uint8_t *bits, size_t *size, int *clk, int *invert, int maxErr,
                 bits[bitnum++] = *invert ^ 1;
             } else if (i - lastBit >= *clk + tol) {
                 if (bitnum > 0) {
-                    if (g_debugMode == 2) prnt("DEBUG: (askdemod_ext) Modulation Error at: %u", i);
+//                    if (g_debugMode == 2) prnt("DEBUG: (askdemod_ext) Modulation Error at: %u", i);
                     bits[bitnum++] = 7;
                     errCnt++;
                 }

From dcec5627d17dd894d95676b43c42d56e2b03547c Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Mar 2019 13:41:59 +0100
Subject: [PATCH 0834/1938] chg: unsigned byte can't be less than zero.

---
 armsrc/desfire_crypto.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/armsrc/desfire_crypto.c b/armsrc/desfire_crypto.c
index fd3f30d0d..111db131c 100644
--- a/armsrc/desfire_crypto.c
+++ b/armsrc/desfire_crypto.c
@@ -313,7 +313,7 @@ void *mifare_cryto_postprocess_data(desfiretag_t tag, void *data, size_t *nbytes
                 case AS_LEGACY:
                     if (communication_settings & MAC_VERIFY) {
                         *nbytes -= key_macing_length(key);
-                        if (*nbytes <= 0) {
+                        if (*nbytes == 0) {
                             *nbytes = -1;
                             res = NULL;
 #ifdef WITH_DEBUG

From f24416a71e82746cb6ffbc025cee90c583ec766f Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Mar 2019 13:42:17 +0100
Subject: [PATCH 0835/1938] clean

---
 armsrc/pcf7931.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/armsrc/pcf7931.c b/armsrc/pcf7931.c
index 90a6f5d64..0d4c41048 100644
--- a/armsrc/pcf7931.c
+++ b/armsrc/pcf7931.c
@@ -142,10 +142,16 @@ bool IsBlock0PCF7931(uint8_t *block) {
 
 bool IsBlock1PCF7931(uint8_t *block) {
     // assuming all RFU bits are set to 0
-    if (block[10] == 0 && block[11] == 0 && block[12] == 0 && block[13] == 0)
-        if ((block[14] & 0x7f) <= 9 && block[15] <= 9)
-            return true;
-
+    if (block[10] == 0
+        && block[11] == 0 
+        && block[12] == 0 
+        && block[13] == 0) {
+        
+        if ( (block[14] & 0x7f) <= 9 
+              && block[15] <= 9) {
+                return true;
+            }
+        }
     return false;
 }
 
@@ -153,7 +159,6 @@ void ReadPCF7931() {
     int found_blocks = 0; // successfully read blocks
     int max_blocks = 8;   // readable blocks
     uint8_t memory_blocks[8][17]; // PCF content
-
     uint8_t single_blocks[8][17]; // PFC blocks with unknown position
     int single_blocks_cnt = 0;
 

From 03f89d2f3fe9c0e2deaa44c5a2c85ed358754ff1 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Mar 2019 13:44:51 +0100
Subject: [PATCH 0836/1938] chg: details

---
 armsrc/hitag2.c | 39 ++++++++++++++++++++++++++-------------
 1 file changed, 26 insertions(+), 13 deletions(-)

diff --git a/armsrc/hitag2.c b/armsrc/hitag2.c
index 57200c701..0c602e00b 100644
--- a/armsrc/hitag2.c
+++ b/armsrc/hitag2.c
@@ -137,10 +137,12 @@ static void hitag_send_bit(int bit) {
 }
 
 static void hitag_send_frame(const uint8_t *frame, size_t frame_len) {
-    // Send start of frame
-    for (size_t i = 0; i < 5; i++) {
+    // SOF - send start of frame
         hitag_send_bit(1);
-    }
+    hitag_send_bit(1);
+    hitag_send_bit(1);
+    hitag_send_bit(1);
+    hitag_send_bit(1);
 
     // Send the content of the frame
     for (size_t i = 0; i < frame_len; i++) {
@@ -151,6 +153,7 @@ static void hitag_send_frame(const uint8_t *frame, size_t frame_len) {
     LOW(GPIO_SSC_DOUT);
 }
 
+// sim
 static void hitag2_handle_reader_command(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t *txlen) {
     uint8_t rx_air[HITAG_FRAME_LEN];
 
@@ -277,6 +280,7 @@ static void hitag2_handle_reader_command(uint8_t *rx, const size_t rxlen, uint8_
     }
 }
 
+// sim
 static void hitag_reader_send_bit(int bit) {
     LED_A_ON();
     // Reset clock for the next bit
@@ -289,7 +293,7 @@ static void hitag_reader_send_bit(int bit) {
     HIGH(GPIO_SSC_DOUT);
 
     // Wait for 4-10 times the carrier period
-    while (AT91C_BASE_TC0->TC_CV < T0 * 6);
+    while (AT91C_BASE_TC0->TC_CV < T0 * 6) {};
 
     // Disable modulation, just activates the field again
     LOW(GPIO_SSC_DOUT);
@@ -305,6 +309,7 @@ static void hitag_reader_send_bit(int bit) {
     LED_A_OFF();
 }
 
+// sim
 static void hitag_reader_send_frame(const uint8_t *frame, size_t frame_len) {
     // Send the content of the frame
     for (size_t i = 0; i < frame_len; i++) {
@@ -315,13 +320,17 @@ static void hitag_reader_send_frame(const uint8_t *frame, size_t frame_len) {
     // Enable modulation, which means, drop the field
     HIGH(GPIO_SSC_DOUT);
     // Wait for 4-10 times the carrier period
-    while (AT91C_BASE_TC0->TC_CV < T0 * 6);
+    while (AT91C_BASE_TC0->TC_CV < T0 * 6) {};
     // Disable modulation, just activates the field again
     LOW(GPIO_SSC_DOUT);
 }
 
 size_t blocknr;
 
+//-----------------------------------------------------------------------------
+// Hitag2 operations
+//-----------------------------------------------------------------------------
+
 static bool hitag2_password(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t *txlen) {
     // Reset the transmission frame length
     *txlen = 0;
@@ -336,7 +345,7 @@ static bool hitag2_password(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t
                 return false;
             }
             *txlen = 5;
-            memcpy(tx, "\xc0", nbytes(*txlen));
+            memcpy(tx, "\xC0", nbytes(*txlen));
         }
         break;
 
@@ -364,7 +373,7 @@ static bool hitag2_password(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t
                     return false;
                 }
                 *txlen = 10;
-                tx[0] = 0xc0 | (blocknr << 3) | ((blocknr ^ 7) >> 2);
+                tx[0] = 0xC0 | (blocknr << 3) | ((blocknr ^ 7) >> 2);
                 tx[1] = ((blocknr ^ 7) << 6);
             }
         }
@@ -390,9 +399,10 @@ static bool hitag2_write_page(uint8_t *rx, const size_t rxlen, uint8_t *tx, size
             break;
         case WRITE_STATE_PAGENUM_WRITTEN:
             // Check if page number was received correctly
-            if ((rxlen == 10) &&
-                    (rx[0] == (0x82 | (blocknr << 3) | ((blocknr ^ 7) >> 2))) &&
-                    (rx[1] == (((blocknr & 0x3) ^ 0x3) << 6))) {
+            if (   (rxlen == 10) 
+                && (rx[0] == (0x82 | (blocknr << 3) | ((blocknr ^ 7) >> 2)))
+                && (rx[1] == (((blocknr & 0x3) ^ 0x3) << 6))) {
+                    
                 *txlen = 32;
                 memset(tx, 0, HITAG_FRAME_LEN);
                 memcpy(tx, writedata, 4);
@@ -543,7 +553,7 @@ static bool hitag2_authenticate(uint8_t *rx, const size_t rxlen, uint8_t *tx, si
                 return false;
             }
             *txlen = 5;
-            memcpy(tx, "\xc0", nbytes(*txlen));
+            memcpy(tx, "\xC0", nbytes(*txlen));
         }
         break;
 
@@ -670,6 +680,7 @@ static bool hitag2_read_uid(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t
     return true;
 }
 
+// Hitag2 Sniffing
 void SniffHitag(uint32_t type) {
 
     StopTicks();
@@ -728,7 +739,7 @@ void SniffHitag(uint32_t type) {
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
     // synchronized startup procedure
-    while (AT91C_BASE_TC1->TC_CV > 0) {}; // wait until TC0 returned to zero
+    while (AT91C_BASE_TC0->TC_CV > 0) {}; // wait until TC0 returned to zero
 
     // Reset the received frame, frame count and timing info
     memset(rx, 0x00, sizeof(rx));
@@ -885,6 +896,7 @@ void SniffHitag(uint32_t type) {
     DbpString("Hitag2 sniffing end,  use `lf hitag list` for annotations");
 }
 
+// Hitag2 simulation
 void SimulateHitagTag(bool tag_mem_supplied, uint8_t *data) {
 
     StopTicks();
@@ -964,7 +976,7 @@ void SimulateHitagTag(bool tag_mem_supplied, uint8_t *data) {
     AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
     // synchronized startup procedure
-    while (AT91C_BASE_TC1->TC_CV > 0); // wait until TC0 returned to zero
+    while (AT91C_BASE_TC0->TC_CV > 0) {}; // wait until TC0 returned to zero
 
     while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
         // Watchdog hit
@@ -1268,6 +1280,7 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
 
         // Receive frame, watch for at most T0*EOF periods
         while (AT91C_BASE_TC1->TC_CV < T0 * HITAG_T_WAIT_MAX) {
+            
             // Check if falling edge in tag modulation is detected
             if (AT91C_BASE_TC1->TC_SR & AT91C_TC_LDRAS) {
                 // Retrieve the new timing values

From 283e4e707c2ec4966a179b5cde709093c69bd54d Mon Sep 17 00:00:00 2001
From: Gtpy <13873777+gtpy@users.noreply.github.com>
Date: Mon, 18 Mar 2019 15:56:39 +0100
Subject: [PATCH 0837/1938] Update mfkey64.c

missing include 65a45fe
---
 tools/mfkey/mfkey64.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/mfkey/mfkey64.c b/tools/mfkey/mfkey64.c
index 45f0ffee2..dbf0bea9f 100644
--- a/tools/mfkey/mfkey64.c
+++ b/tools/mfkey/mfkey64.c
@@ -2,6 +2,7 @@
 #include <inttypes.h>
 #include <stdbool.h>
 #include <stdio.h>
+#include <string.h>
 #include <stdlib.h>
 #include "crapto1/crapto1.h"
 #include "util_posix.h"

From 2a6be74fd1a764230c262bc58858a63d5ef75662 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Mar 2019 16:57:41 +0100
Subject: [PATCH 0838/1938] fix: operations inside macro expansion

---
 client/cmdhfmfu.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index e1fb615c5..e6f017763 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -84,10 +84,15 @@ void transform_D(uint8_t *ru) {
     uint32_t v1 = ((ru[3] << 24) | (ru[2] << 16) | (ru[1] << 8) | ru[0]) + c_D[p++];
     uint32_t v2 = ((ru[7] << 24) | (ru[6] << 16) | (ru[5] << 8) | ru[4]) + c_D[p++];
     for (i = 0; i < 12; i += 2) {
-        uint32_t t1 = ROTL(v1 ^ v2, v2 & 0x1F) + c_D[p++];
-        uint32_t t2 = ROTL(v2 ^ t1, t1 & 0x1F) + c_D[p++];
-        v1 = ROTL(t1 ^ t2, t2 & 0x1F) + c_D[p++];
-        v2 = ROTL(t2 ^ v1, v1 & 0x1F) + c_D[p++];
+        
+        uint32_t xor1 = v1 ^ v2;
+        uint32_t t1 = ROTL(xor1, v2 & 0x1F) + c_D[p++];
+        uint32_t xor2 = v2 ^ t1;       
+        uint32_t t2 = ROTL(xor2, t1 & 0x1F) + c_D[p++];        
+        uint32_t xor3 = t1 ^ t2;
+        uint32_t xor4 = t2 ^ v1;
+        v1 = ROTL(xor3, t2 & 0x1F) + c_D[p++];
+        v2 = ROTL(xor4, v1 & 0x1F) + c_D[p++];
     }
 
     //Re-use ru

From c8c9a69e3e3d5115b8e16eccd066677fa63892b8 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Mar 2019 16:59:21 +0100
Subject: [PATCH 0839/1938] unsigned value cant be less than zero

---
 client/cmdlf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdlf.c b/client/cmdlf.c
index aa3501f6b..2932caaab 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -707,7 +707,7 @@ int CmdLFpskSim(const char *Cmd) {
         setDemodBuf(data, dataLen, 0);
     }
 
-    if (clk <= 0) clk = 32;
+    if (clk == 0) clk = 32;
 
     if (carrier != 2 && carrier != 4 && carrier != 8)
         carrier = 2;

From 0ed99ce0c462df827b4c2d48dd2e3a4063638736 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Mar 2019 17:16:27 +0100
Subject: [PATCH 0840/1938] unsigned variables cant be negative

---
 armsrc/Standalone/lf_hidbrute.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/armsrc/Standalone/lf_hidbrute.c b/armsrc/Standalone/lf_hidbrute.c
index aaeae9a9a..8571c0ce1 100644
--- a/armsrc/Standalone/lf_hidbrute.c
+++ b/armsrc/Standalone/lf_hidbrute.c
@@ -164,7 +164,7 @@ void RunMod() {
 
                 Dbprintf("[=] Proxbrute - starting decrementing card number");
 
-                while (cardnum >= 0) {
+                while (cardnum > 0) {
 
                     // Needed for exiting from proxbrute when button is pressed
                     if (BUTTON_PRESS()) {

From d54f4bd46f15370e68c094da17412a4a37113b58 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Mar 2019 17:22:02 +0100
Subject: [PATCH 0841/1938] value needs to be unsigned

---
 include/at91sam7s512.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/at91sam7s512.h b/include/at91sam7s512.h
index f9f5f69b1..db27893e2 100644
--- a/include/at91sam7s512.h
+++ b/include/at91sam7s512.h
@@ -778,7 +778,7 @@ typedef struct _AT91S_EFC {
 #define AT91C_MC_LOCKS12      (0x1 << 28) // (EFC) Sector 12 Lock Status
 #define AT91C_MC_LOCKS13      (0x1 << 29) // (EFC) Sector 13 Lock Status
 #define AT91C_MC_LOCKS14      (0x1 << 30) // (EFC) Sector 14 Lock Status
-#define AT91C_MC_LOCKS15      (0x1 << 31) // (EFC) Sector 15 Lock Status
+#define AT91C_MC_LOCKS15      (0x1u << 31) // (EFC) Sector 15 Lock Status
 // -------- EFC_VR : (EFC Offset: 0xc) EFC version register --------
 #define AT91C_EFC_VERSION     (0xFFF <<  0) // (EFC) EFC version number
 #define AT91C_EFC_MFN         (0x7 << 16) // (EFC) EFC MFN
@@ -2198,7 +2198,7 @@ typedef struct _AT91S_UDP {
 #define AT91C_PIO_PA30       (1 << 30) // Pin Controlled by PA30
 #define AT91C_PA30_IRQ1     (AT91C_PIO_PA30) //  External Interrupt 1
 #define AT91C_PA30_NPCS2    (AT91C_PIO_PA30) //  SPI Peripheral Chip Select 2
-#define AT91C_PIO_PA31       (1 << 31) // Pin Controlled by PA31
+#define AT91C_PIO_PA31       (1u << 31) // Pin Controlled by PA31
 #define AT91C_PA31_NPCS1    (AT91C_PIO_PA31) //  SPI Peripheral Chip Select 1
 #define AT91C_PA31_PCK2     (AT91C_PIO_PA31) //  PMC Programmable Clock Output 2
 

From 3e26b564cdf790010504a80f0a0cfd9ac51f1e92 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Mar 2019 17:42:49 +0100
Subject: [PATCH 0842/1938] nameing stuff

---
 client/cmdhf14a.c | 42 +++++++++++++++++++++---------------------
 client/cmdhf14a.h |  2 +-
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 6dd7149f2..83e1673ef 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -1132,7 +1132,7 @@ int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool lea
 }
 
 // ISO14443-4. 7. Half-duplex block transmission protocol
-int CmdHF14AAPDU(const char *cmd) {
+int CmdHF14AAPDU(const char *Cmd) {
     uint8_t data[USB_CMD_DATA_SIZE];
     int datalen = 0;
     bool activateField = false;
@@ -1151,7 +1151,7 @@ int CmdHF14AAPDU(const char *cmd) {
         arg_strx1(NULL, NULL,      "<APDU (hex)>", NULL),
         arg_param_end
     };
-    CLIExecWithReturn(cmd, argtable, false);
+    CLIExecWithReturn(Cmd, argtable, false);
 
     activateField = arg_get_lit(1);
     leaveSignalON = arg_get_lit(2);
@@ -1179,7 +1179,7 @@ int CmdHF14AAPDU(const char *cmd) {
     return 0;
 }
 
-int CmdHF14ACmdRaw(const char *cmd) {
+int CmdHF14ACmdRaw(const char *Cmd) {
     UsbCommand c = {CMD_READER_ISO_14443a, {0, 0, 0}};
     bool reply = 1;
     bool crc = false;
@@ -1197,15 +1197,15 @@ int CmdHF14ACmdRaw(const char *cmd) {
     uint16_t datalen = 0;
     uint32_t temp;
 
-    if (strlen(cmd) < 2) return usage_hf_14a_raw();
+    if (strlen(Cmd) < 2) return usage_hf_14a_raw();
 
     // strip
-    while (*cmd == ' ' || *cmd == '\t') cmd++;
+    while (*Cmd == ' ' || *Cmd == '\t') Cmd++;
 
-    while (cmd[i] != '\0') {
-        if (cmd[i] == ' ' || cmd[i] == '\t') { i++; continue; }
-        if (cmd[i] == '-') {
-            switch (cmd[i + 1]) {
+    while (Cmd[i] != '\0') {
+        if (Cmd[i] == ' ' || Cmd[i] == '\t') { i++; continue; }
+        if (Cmd[i] == '-') {
+            switch (Cmd[i + 1]) {
                 case 'H':
                 case 'h':
                     return usage_hf_14a_raw();
@@ -1225,18 +1225,18 @@ int CmdHF14ACmdRaw(const char *cmd) {
                     active_select = true;
                     break;
                 case 'b':
-                    sscanf(cmd + i + 2, "%d", &temp);
+                    sscanf(Cmd + i + 2, "%d", &temp);
                     numbits = temp & 0xFFFF;
                     i += 3;
-                    while (cmd[i] != ' ' && cmd[i] != '\0') { i++; }
+                    while (Cmd[i] != ' ' && Cmd[i] != '\0') { i++; }
                     i -= 2;
                     break;
                 case 't':
                     bTimeout = true;
-                    sscanf(cmd + i + 2, "%d", &temp);
+                    sscanf(Cmd + i + 2, "%d", &temp);
                     timeout = temp;
                     i += 3;
-                    while (cmd[i] != ' ' && cmd[i] != '\0') { i++; }
+                    while (Cmd[i] != ' ' && Cmd[i] != '\0') { i++; }
                     i -= 2;
                     break;
                 case 'T':
@@ -1251,11 +1251,11 @@ int CmdHF14ACmdRaw(const char *cmd) {
             i += 2;
             continue;
         }
-        if ((cmd[i] >= '0' && cmd[i] <= '9') ||
-                (cmd[i] >= 'a' && cmd[i] <= 'f') ||
-                (cmd[i] >= 'A' && cmd[i] <= 'F')) {
+        if ((Cmd[i] >= '0' && Cmd[i] <= '9') ||
+                (Cmd[i] >= 'a' && Cmd[i] <= 'f') ||
+                (Cmd[i] >= 'A' && Cmd[i] <= 'F')) {
             buf[strlen(buf) + 1] = 0;
-            buf[strlen(buf)] = cmd[i];
+            buf[strlen(buf)] = Cmd[i];
             i++;
 
             if (strlen(buf) >= 2) {
@@ -1363,7 +1363,7 @@ static int waitCmd(uint8_t iSelect) {
     return 0;
 }
 
-int CmdHF14AAntiFuzz(const char *cmd) {
+int CmdHF14AAntiFuzz(const char *Cmd) {
 
     CLIParserInit("hf 14a antifuzz",
                   "Tries to fuzz the ISO14443a anticollision phase",
@@ -1377,7 +1377,7 @@ int CmdHF14AAntiFuzz(const char *cmd) {
         arg_lit0(NULL,  "10",  "10 byte uid"),
         arg_param_end
     };
-    CLIExecWithReturn(cmd, argtable, false);
+    CLIExecWithReturn(Cmd, argtable, false);
 
     uint8_t arg0 = FLAG_4B_UID_IN_DATA;
     if (arg_get_lit(2))
@@ -1392,7 +1392,7 @@ int CmdHF14AAntiFuzz(const char *cmd) {
     return 0;
 }
 
-int CmdHF14AChaining(const char *cmd) {
+int CmdHF14AChaining(const char *Cmd) {
 
     CLIParserInit("hf 14a chaining",
                   "Enable/Disable ISO14443a input chaining. Maximum input length goes from ATS.",
@@ -1405,7 +1405,7 @@ int CmdHF14AChaining(const char *cmd) {
         arg_str0(NULL, NULL,      "<enable/disable or 0/1>", NULL),
         arg_param_end
     };
-    CLIExecWithReturn(cmd, argtable, true);
+    CLIExecWithReturn(Cmd, argtable, true);
 
     struct arg_str *str = arg_get_str(1);
     int len = arg_get_str_len(1);
diff --git a/client/cmdhf14a.h b/client/cmdhf14a.h
index 55b94bb08..6020b6f8b 100644
--- a/client/cmdhf14a.h
+++ b/client/cmdhf14a.h
@@ -47,7 +47,7 @@ extern int CmdHF14ASim(const char *Cmd);
 extern int CmdHF14ASniff(const char *Cmd);
 extern int CmdHF14ACmdRaw(const char *Cmd);
 extern int CmdHF14ACUIDs(const char *Cmd);
-extern int CmdHF14AAntiFuzz(const char *cmd);
+extern int CmdHF14AAntiFuzz(const char *Cmd);
 
 extern char *getTagInfo(uint8_t uid);
 extern int Hf14443_4aGetCardData(iso14a_card_select_t *card);

From cc9a99ed57a37044bc135af8f079ff7061c0774a Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Mar 2019 17:46:52 +0100
Subject: [PATCH 0843/1938] string formats

---
 client/cmdlft55xx.c | 50 ++++++++++++++++++++++-----------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 41512c6b9..703d22fe1 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1363,7 +1363,7 @@ bool AquireData(uint8_t page, uint8_t block, bool pwdmode, uint32_t password) {
     //  bit1 = page to read from
     // arg1: which block to read
     // arg2: password
-    uint8_t arg0 = (page << 1) | pwdmode;
+    uint8_t arg0 = ((page << 1) | pwdmode);
     UsbCommand c = {CMD_T55XX_READ_BLOCK, {arg0, block, password}};
     clearCommandBuffer();
     SendCommand(&c);
@@ -1386,31 +1386,31 @@ char *GetBitRateStr(uint32_t id, bool xmode) {
     } else {
         switch (id) {
             case 0:
-                snprintf(retStr, sizeof(buf), "%d - RF/8", id);
+                snprintf(retStr, sizeof(buf), "%u - RF/8", id);
                 break;
             case 1:
-                snprintf(retStr, sizeof(buf), "%d - RF/16", id);
+                snprintf(retStr, sizeof(buf), "%u - RF/16", id);
                 break;
             case 2:
-                snprintf(retStr, sizeof(buf), "%d - RF/32", id);
+                snprintf(retStr, sizeof(buf), "%u - RF/32", id);
                 break;
             case 3:
-                snprintf(retStr, sizeof(buf), "%d - RF/40", id);
+                snprintf(retStr, sizeof(buf), "%u - RF/40", id);
                 break;
             case 4:
-                snprintf(retStr, sizeof(buf), "%d - RF/50", id);
+                snprintf(retStr, sizeof(buf), "%u - RF/50", id);
                 break;
             case 5:
-                snprintf(retStr, sizeof(buf), "%d - RF/64", id);
+                snprintf(retStr, sizeof(buf), "%u - RF/64", id);
                 break;
             case 6:
-                snprintf(retStr, sizeof(buf), "%d - RF/100", id);
+                snprintf(retStr, sizeof(buf), "%u - RF/100", id);
                 break;
             case 7:
-                snprintf(retStr, sizeof(buf), "%d - RF/128", id);
+                snprintf(retStr, sizeof(buf), "%u - RF/128", id);
                 break;
             default:
-                snprintf(retStr, sizeof(buf), "%d - (Unknown)", id);
+                snprintf(retStr, sizeof(buf), "%u - (Unknown)", id);
                 break;
         }
     }
@@ -1421,12 +1421,12 @@ char *GetSaferStr(uint32_t id) {
     static char buf[40];
     char *retStr = buf;
 
-    snprintf(retStr, sizeof(buf), "%d", id);
+    snprintf(retStr, sizeof(buf), "%u", id);
     if (id == 6) {
-        snprintf(retStr, sizeof(buf), "%d - passwd", id);
+        snprintf(retStr, sizeof(buf), "%u - " _YELLOW_("passwd"), id);
     }
     if (id == 9) {
-        snprintf(retStr, sizeof(buf), "%d - testmode", id);
+        snprintf(retStr, sizeof(buf), "%u - " _YELLOW_("testmode"), id);
     }
 
     return buf;
@@ -1438,40 +1438,40 @@ char *GetModulationStr(uint32_t id) {
 
     switch (id) {
         case 0:
-            snprintf(retStr, sizeof(buf), "%d - DIRECT (ASK/NRZ)", id);
+            snprintf(retStr, sizeof(buf), "%u - DIRECT (ASK/NRZ)", id);
             break;
         case 1:
-            snprintf(retStr, sizeof(buf), "%d - PSK 1 phase change when input changes", id);
+            snprintf(retStr, sizeof(buf), "%u - PSK 1 phase change when input changes", id);
             break;
         case 2:
-            snprintf(retStr, sizeof(buf), "%d - PSK 2 phase change on bitclk if input high", id);
+            snprintf(retStr, sizeof(buf), "%u - PSK 2 phase change on bitclk if input high", id);
             break;
         case 3:
-            snprintf(retStr, sizeof(buf), "%d - PSK 3 phase change on rising edge of input", id);
+            snprintf(retStr, sizeof(buf), "%u - PSK 3 phase change on rising edge of input", id);
             break;
         case 4:
-            snprintf(retStr, sizeof(buf), "%d - FSK 1 RF/8  RF/5", id);
+            snprintf(retStr, sizeof(buf), "%u - FSK 1 RF/8  RF/5", id);
             break;
         case 5:
-            snprintf(retStr, sizeof(buf), "%d - FSK 2 RF/8  RF/10", id);
+            snprintf(retStr, sizeof(buf), "%u - FSK 2 RF/8  RF/10", id);
             break;
         case 6:
-            snprintf(retStr, sizeof(buf), "%d - FSK 1a RF/5  RF/8", id);
+            snprintf(retStr, sizeof(buf), "%u - FSK 1a RF/5  RF/8", id);
             break;
         case 7:
-            snprintf(retStr, sizeof(buf), "%d - FSK 2a RF/10  RF/8", id);
+            snprintf(retStr, sizeof(buf), "%u - FSK 2a RF/10  RF/8", id);
             break;
         case 8:
-            snprintf(retStr, sizeof(buf), "%d - Manchester", id);
+            snprintf(retStr, sizeof(buf), "%u - Manchester", id);
             break;
         case 16:
-            snprintf(retStr, sizeof(buf), "%d - Biphase", id);
+            snprintf(retStr, sizeof(buf), "%u - Biphase", id);
             break;
         case 0x18:
-            snprintf(retStr, sizeof(buf), "%d - Biphase a - AKA Conditional Dephase Encoding(CDP)", id);
+            snprintf(retStr, sizeof(buf), "%u - Biphase a - AKA Conditional Dephase Encoding(CDP)", id);
             break;
         case 17:
-            snprintf(retStr, sizeof(buf), "%d - Reserved", id);
+            snprintf(retStr, sizeof(buf), "%u - Reserved", id);
             break;
         default:
             snprintf(retStr, sizeof(buf), "0x%02X (Unknown)", id);

From 1d14c497b7f9c8aca6b7a7ca59c7db65b97d490f Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Mar 2019 17:53:46 +0100
Subject: [PATCH 0844/1938] swapping order

---
 client/cmdlfem4x.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 915acfc1c..89d602125 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -808,21 +808,21 @@ int EM4x50Read(const char *Cmd, bool verbose) {
     low = sp->low;
 
     // get to first full low to prime loop and skip incomplete first pulse
-    while ((bits[i] < high) && (i < size))
+    while ((i < size) && (bits[i] < high))
         ++i;
-    while ((bits[i] > low) && (i < size))
+    while ((i < size) && (bits[i] > low))
         ++i;
     skip = i;
 
     // populate tmpbuff buffer with pulse lengths
     while (i < size) {
         // measure from low to low
-        while ((bits[i] > low) && (i < size))
+        while ((i < size) && (bits[i] > low))
             ++i;
         start = i;
-        while ((bits[i] < high) && (i < size))
+        while ((i < size) && (bits[i] < high))
             ++i;
-        while ((bits[i] > low) && (i < size))
+        while ((i < size) && (bits[i] > low))
             ++i;
         if (j >= (MAX_GRAPH_TRACE_LEN / 64)) {
             break;

From 9e6b10985659dfca08ca9ad5f814c768052e5507 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Mar 2019 20:01:17 +0100
Subject: [PATCH 0845/1938] string formatter

---
 client/emv/crypto_polarssl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/emv/crypto_polarssl.c b/client/emv/crypto_polarssl.c
index da48f7fa7..e1f59ddf3 100644
--- a/client/emv/crypto_polarssl.c
+++ b/client/emv/crypto_polarssl.c
@@ -177,7 +177,7 @@ static struct crypto_pk *crypto_pk_polarssl_genkey_rsa(va_list vl) {
 
     int res = mbedtls_rsa_gen_key(&cp->ctx, &myrand, NULL, nbits, exp);
     if (res) {
-        fprintf(stderr, "PolarSSL private key generation error res=%x exp=%d nbits=%d.\n", res * -1, exp, nbits);
+        fprintf(stderr, "PolarSSL private key generation error res=%x exp=%u nbits=%u.\n", res * -1, exp, nbits);
         free(cp);
         return NULL;
     }

From 6889489555adca018329bb69076f54e787c1353b Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Mar 2019 20:02:00 +0100
Subject: [PATCH 0846/1938] uninit?

---
 client/cmdtrace.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/cmdtrace.c b/client/cmdtrace.c
index 05a85a050..78e382854 100644
--- a/client/cmdtrace.c
+++ b/client/cmdtrace.c
@@ -186,7 +186,7 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
     //2 Not crc-command
 
     //--- Draw the data column
-    char line[18][110];
+    char line[18][110] = {{0}};
 
     for (int j = 0; j < data_len && j / 18 < 18; j++) {
 
@@ -335,7 +335,7 @@ void printFelica(uint16_t traceLen, uint8_t *trace) {
         uint8_t cmd = trace[tracepos];
         uint8_t isResponse = cmd & 1;
 
-        char line[32][110];
+        char line[32][110] = {{0}};
         for (int j = 0; j < len + 1 && j / 8 < 32; j++) {
             snprintf(line[j / 8] + ((j % 8) * 4), 110, " %02x ", trace[tracepos + j]);
         }

From 4706d279035a769a792f6fadd3c0873a54a5531f Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Mar 2019 20:11:19 +0100
Subject: [PATCH 0847/1938] reassigned

---
 armsrc/Standalone/hf_colin.c    | 2 +-
 armsrc/Standalone/hf_mattyrun.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/armsrc/Standalone/hf_colin.c b/armsrc/Standalone/hf_colin.c
index 97ee329de..46a9a2dfc 100644
--- a/armsrc/Standalone/hf_colin.c
+++ b/armsrc/Standalone/hf_colin.c
@@ -207,7 +207,7 @@ void RunMod() {
     cjcuid = 0;
     uint8_t sectorsCnt = (MF1KSZ / MF1KSZSIZE);
     uint64_t key64;           // Defines current key
-    uint8_t *keyBlock = NULL; // Where the keys will be held in memory.
+    uint8_t *keyBlock; // Where the keys will be held in memory.
 
     /* VIGIK EXPIRED DUMP FOR STUDY
     Sector 0
diff --git a/armsrc/Standalone/hf_mattyrun.c b/armsrc/Standalone/hf_mattyrun.c
index 8cac76c35..2945a5fbd 100644
--- a/armsrc/Standalone/hf_mattyrun.c
+++ b/armsrc/Standalone/hf_mattyrun.c
@@ -191,7 +191,6 @@ static int saMifareChkKeys(uint8_t blockNo, uint8_t keyType, bool clearTrace, ui
     return -1;
 }
 
-
 void RunMod() {
     StandAloneMode();
     Dbprintf(">>  Matty mifare chk/dump/sim  a.k.a MattyRun Started  <<");
@@ -230,7 +229,7 @@ void RunMod() {
     uint8_t sectorsCnt = (mifare_size / sectorSize);
     uint8_t keyType = 2;            // Keytype buffer
     uint64_t key64;                 // Defines current key
-    uint8_t *keyBlock = NULL;       // Where the keys will be held in memory.
+    uint8_t *keyBlock;              // Where the keys will be held in memory.
     uint8_t stKeyBlock = 20;        // Set the quantity of keys in the block.
     uint8_t filled = 0;             // Used to check if the memory was filled with success.
     bool keyFound = false;

From aa28143e16101c5b340b416f3a0d173740944616 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Mar 2019 20:16:04 +0100
Subject: [PATCH 0848/1938] style

---
 armsrc/printf.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/armsrc/printf.h b/armsrc/printf.h
index 21d9c8fa4..616752ed6 100644
--- a/armsrc/printf.h
+++ b/armsrc/printf.h
@@ -16,7 +16,7 @@
 #include "string.h"
 
 int kvsprintf(const char *format, void *arg, int radix, va_list ap) __attribute__((format(printf, 1, 0)));
-int vsprintf(char *str, const char *format, va_list ap) __attribute__((format(printf, 2, 0)));
-int sprintf(char *str, const char *format, ...) __attribute__((format(printf, 2, 3)));
+int vsprintf(char *dest, const char *fmt, va_list ap) __attribute__((format(printf, 2, 0)));
+int sprintf(char *dest, const char *fmt, ...) __attribute__((format(printf, 2, 3)));
 
 #endif

From 3727abd28cd329a1695a85211363bcc96765464b Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Mar 2019 20:17:24 +0100
Subject: [PATCH 0849/1938] style

---
 client/cmdflashmem.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/cmdflashmem.h b/client/cmdflashmem.h
index 099a4e3b1..9f946908c 100644
--- a/client/cmdflashmem.h
+++ b/client/cmdflashmem.h
@@ -35,9 +35,9 @@ typedef enum {
 
 extern int CmdFlashMem(const char *Cmd);
 
-extern int CmdFlashMemRead(const char *cmd);
-extern int CmdFlashMemLoad(const char *cmd);
-extern int CmdFlashMemSave(const char *cmd);
+extern int CmdFlashMemRead(const char *Cmd);
+extern int CmdFlashMemLoad(const char *Cmd);
+extern int CmdFlashMemSave(const char *Cmd);
 extern int CmdFlashMemWipe(const char *Cmd);
 extern int CmdFlashMemInfo(const char *Cmd);
 #endif

From 4f88d7105f638302b0fe6ea8a414462306d4ed05 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Mar 2019 20:24:09 +0100
Subject: [PATCH 0850/1938] style

---
 client/cmdhfmf.c |  8 +++----
 client/cmdhfmf.h | 54 ++++++++++++++++++++++++------------------------
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 07394c2fc..b8e343b7c 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -3295,7 +3295,7 @@ int CmdHF14AMfAuth4(const char *Cmd) {
 }
 
 // https://www.nxp.com/docs/en/application-note/AN10787.pdf
-int CmdHF14AMfMAD(const char *cmd) {
+int CmdHF14AMfMAD(const char *Cmd) {
 
     CLIParserInit("hf mf mad",
                   "Checks and prints Mifare Application Directory (MAD)",
@@ -3310,7 +3310,7 @@ int CmdHF14AMfMAD(const char *cmd) {
         arg_lit0("bB",  "keyb",     "use key B for access printing sectors (by default: key A)"),
         arg_param_end
     };
-    CLIExecWithReturn(cmd, argtable, true);
+    CLIExecWithReturn(Cmd, argtable, true);
     bool verbose = arg_get_lit(1);
     uint8_t aid[2] = {0};
     int aidlen;
@@ -3385,7 +3385,7 @@ int CmdHF14AMfMAD(const char *cmd) {
     return 0;
 }
 
-int CmdHFMFNDEF(const char *cmd) {
+int CmdHFMFNDEF(const char *Cmd) {
 
     CLIParserInit("hf mf ndef",
                   "Prints NFC Data Exchange Format (NDEF)",
@@ -3400,7 +3400,7 @@ int CmdHFMFNDEF(const char *cmd) {
         arg_lit0("bB",  "keyb",     "use key B for access sectors (by default: key A)"),
         arg_param_end
     };
-    CLIExecWithReturn(cmd, argtable, true);
+    CLIExecWithReturn(Cmd, argtable, true);
 
     bool verbose = arg_get_lit(1);
     bool verbose2 = arg_get_lit(1) > 1;
diff --git a/client/cmdhfmf.h b/client/cmdhfmf.h
index a7d337b07..699aaa33e 100644
--- a/client/cmdhfmf.h
+++ b/client/cmdhfmf.h
@@ -36,35 +36,35 @@
 extern int CmdHFMF(const char *Cmd);
 
 extern int CmdHF14AMfList(const char *Cmd);
-extern int CmdHF14AMfDbg(const char *cmd);
-extern int CmdHF14AMfRdBl(const char *cmd);
-extern int CmdHF14AMfURdBl(const char *cmd);
-extern int CmdHF14AMfRdSc(const char *cmd);
-extern int CmdHF14SMfURdCard(const char *cmd);
-extern int CmdHF14AMfDump(const char *cmd);
-extern int CmdHF14AMfRestore(const char *cmd);
-extern int CmdHF14AMfWrBl(const char *cmd);
-extern int CmdHF14AMfUWrBl(const char *cmd);
-extern int CmdHF14AMfChk(const char *cmd);
-extern int CmdHF14AMfDarkside(const char *cmd);
-extern int CmdHF14AMfNested(const char *cmd);
+extern int CmdHF14AMfDbg(const char *Cmd);
+extern int CmdHF14AMfRdBl(const char *Cmd);
+extern int CmdHF14AMfURdBl(const char *Cmd);
+extern int CmdHF14AMfRdSc(const char *Cmd);
+extern int CmdHF14SMfURdCard(const char *Cmd);
+extern int CmdHF14AMfDump(const char *Cmd);
+extern int CmdHF14AMfRestore(const char *Cmd);
+extern int CmdHF14AMfWrBl(const char *Cmd);
+extern int CmdHF14AMfUWrBl(const char *Cmd);
+extern int CmdHF14AMfChk(const char *Cmd);
+extern int CmdHF14AMfDarkside(const char *Cmd);
+extern int CmdHF14AMfNested(const char *Cmd);
 extern int CmdHF14AMfNestedHard(const char *Cmd);
-//extern int CmdHF14AMfSniff(const char* cmd);
-extern int CmdHF14AMf1kSim(const char *cmd);
+//extern int CmdHF14AMfSniff(const char* Cmd);
+extern int CmdHF14AMf1kSim(const char *Cmd);
 extern int CmdHF14AMfKeyBrute(const char *Cmd);
-extern int CmdHF14AMfEClear(const char *cmd);
-extern int CmdHF14AMfEGet(const char *cmd);
-extern int CmdHF14AMfESet(const char *cmd);
-extern int CmdHF14AMfELoad(const char *cmd);
-extern int CmdHF14AMfESave(const char *cmd);
-extern int CmdHF14AMfECFill(const char *cmd);
-extern int CmdHF14AMfEKeyPrn(const char *cmd);
-extern int CmdHF14AMfCSetUID(const char *cmd);
-extern int CmdHF14AMfCSetBlk(const char *cmd);
-extern int CmdHF14AMfCGetBlk(const char *cmd);
-extern int CmdHF14AMfCGetSc(const char *cmd);
-extern int CmdHF14AMfCLoad(const char *cmd);
-extern int CmdHF14AMfCSave(const char *cmd);
+extern int CmdHF14AMfEClear(const char *Cmd);
+extern int CmdHF14AMfEGet(const char *Cmd);
+extern int CmdHF14AMfESet(const char *Cmd);
+extern int CmdHF14AMfELoad(const char *Cmd);
+extern int CmdHF14AMfESave(const char *Cmd);
+extern int CmdHF14AMfECFill(const char *Cmd);
+extern int CmdHF14AMfEKeyPrn(const char *Cmd);
+extern int CmdHF14AMfCSetUID(const char *Cmd);
+extern int CmdHF14AMfCSetBlk(const char *Cmd);
+extern int CmdHF14AMfCGetBlk(const char *Cmd);
+extern int CmdHF14AMfCGetSc(const char *Cmd);
+extern int CmdHF14AMfCLoad(const char *Cmd);
+extern int CmdHF14AMfCSave(const char *Cmd);
 extern int CmdHf14MfDecryptBytes(const char *Cmd);
 extern int CmdHf14AMfSetMod(const char *Cmd);
 extern int CmdHf14AMfNack(const char *Cmd);

From 5350f871ff426e789d13bb8364384fa2a2a82152 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Mar 2019 20:29:18 +0100
Subject: [PATCH 0851/1938] style

---
 client/util.h | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/client/util.h b/client/util.h
index c754542ab..bc0eaf872 100644
--- a/client/util.h
+++ b/client/util.h
@@ -189,10 +189,10 @@
 extern uint8_t g_debugMode;
 
 extern int ukbhit(void);
-extern void AddLogLine(char *fileName, char *extData, char *c);
-extern void AddLogHex(char *fileName, char *extData, const uint8_t *data, const size_t len);
-extern void AddLogUint64(char *fileName, char *extData, const uint64_t data);
-extern void AddLogCurrentDT(char *fileName);
+extern void AddLogLine(char *fn, char *data, char *c);
+extern void AddLogHex(char *fn, char *data, const uint8_t *data, const size_t len);
+extern void AddLogUint64(char *fn, char *data, const uint64_t value);
+extern void AddLogCurrentDT(char *fn);
 extern void FillFileNameByUID(char *filenamePrefix, uint8_t *uid, const char *ext, int uidlen);
 
 // fill buffer from structure [{uint8_t data, size_t length},...]
@@ -239,11 +239,11 @@ extern int param_gethex_ex(const char *line, int paramnum, uint8_t *data, int *h
 extern int param_gethex_to_eol(const char *line, int paramnum, uint8_t *data, int maxdatalen, int *datalen);
 extern int param_getstr(const char *line, int paramnum, char *str, size_t buffersize);
 
-extern int hextobinarray(char *target,  char *source);
-extern int hextobinstring(char *target,  char *source);
+extern int hextobinarray(char *target, char *source);
+extern int hextobinstring(char *target, char *source);
 extern int binarraytohex(char *target, const size_t targetlen, char *source, size_t srclen);
-extern void binarraytobinstring(char *target,  char *source,  int length);
-extern uint8_t GetParity(uint8_t *string, uint8_t type,  int length);
+extern void binarraytobinstring(char *target,  char *source, int length);
+extern uint8_t GetParity(uint8_t *bits, uint8_t type, int length);
 extern void wiegand_add_parity(uint8_t *target, uint8_t *source, uint8_t length);
 
 extern void xor(unsigned char *dst, unsigned char *src, size_t len);

From 20019b14ee22b90fd139142c3dfee87acfffab8e Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Mar 2019 20:34:00 +0100
Subject: [PATCH 0852/1938] style

---
 client/util.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/util.h b/client/util.h
index bc0eaf872..cf5f97360 100644
--- a/client/util.h
+++ b/client/util.h
@@ -190,7 +190,7 @@ extern uint8_t g_debugMode;
 
 extern int ukbhit(void);
 extern void AddLogLine(char *fn, char *data, char *c);
-extern void AddLogHex(char *fn, char *data, const uint8_t *data, const size_t len);
+extern void AddLogHex(char *fn, char *extData, const uint8_t *data, const size_t len);
 extern void AddLogUint64(char *fn, char *data, const uint64_t value);
 extern void AddLogCurrentDT(char *fn);
 extern void FillFileNameByUID(char *filenamePrefix, uint8_t *uid, const char *ext, int uidlen);

From 28b074106d6d6a0238bfe09618c748b9beae2eb8 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Mar 2019 20:34:24 +0100
Subject: [PATCH 0853/1938] style

---
 common/usb_cdc.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/common/usb_cdc.c b/common/usb_cdc.c
index c871de241..e928b1b06 100644
--- a/common/usb_cdc.c
+++ b/common/usb_cdc.c
@@ -686,7 +686,7 @@ uint32_t usb_write(const byte_t *data, const size_t len) {
         }
 
         UDP_CLEAR_EP_FLAGS(AT91C_EP_IN, AT91C_UDP_TXCOMP);
-        while (pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP);
+        while (pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP) {};
         UDP_SET_EP_FLAGS(AT91C_EP_IN, AT91C_UDP_TXPKTRDY);
 
     }
@@ -697,7 +697,7 @@ uint32_t usb_write(const byte_t *data, const size_t len) {
     }
 
     UDP_CLEAR_EP_FLAGS(AT91C_EP_IN, AT91C_UDP_TXCOMP);
-    while (pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP);
+    while (pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP) {};
 
     return length;
 }
@@ -749,9 +749,9 @@ void AT91F_USB_SendData(AT91PS_UDP pUdp, const char *pData, uint32_t length) {
 //*----------------------------------------------------------------------------
 void AT91F_USB_SendZlp(AT91PS_UDP pUdp) {
     UDP_SET_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_TXPKTRDY);
-    while (!(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_TXCOMP));
+    while (!(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_TXCOMP)) {};
     UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_TXCOMP);
-    while (pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_TXCOMP);
+    while (pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_TXCOMP) {};
 }
 
 //*----------------------------------------------------------------------------
@@ -760,9 +760,9 @@ void AT91F_USB_SendZlp(AT91PS_UDP pUdp) {
 //*----------------------------------------------------------------------------
 void AT91F_USB_SendStall(AT91PS_UDP pUdp) {
     UDP_SET_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_FORCESTALL);
-    while (!(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_ISOERROR));
+    while (!(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_ISOERROR)) {};
     UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, (AT91C_UDP_FORCESTALL | AT91C_UDP_ISOERROR));
-    while (pUdp->UDP_CSR[AT91C_EP_CONTROL] & (AT91C_UDP_FORCESTALL | AT91C_UDP_ISOERROR));
+    while (pUdp->UDP_CSR[AT91C_EP_CONTROL] & (AT91C_UDP_FORCESTALL | AT91C_UDP_ISOERROR)) {};
 }
 
 //*----------------------------------------------------------------------------
@@ -790,10 +790,10 @@ void AT91F_CDC_Enumerate() {
 
     if (bmRequestType & 0x80) {        // Data Phase Transfer Direction Device to Host
         UDP_SET_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_DIR);
-        while (!(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_DIR));
+        while (!(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_DIR)) {};
     }
     UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_RXSETUP);
-    while ((pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_RXSETUP));
+    while ((pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_RXSETUP)) {};
 
     /*
     if ( bRequest == MS_VENDOR_CODE) {
@@ -933,7 +933,7 @@ void AT91F_CDC_Enumerate() {
                     ((uint8_t*)&line)[i] =  pUdp->UDP_FDR[AT91C_EP_CONTROL];
                 }  */
             // ignore SET_LINE_CODING...
-            while (!(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_RX_DATA_BK0));
+            while (!(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_RX_DATA_BK0)) {};
             UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_RX_DATA_BK0);
             AT91F_USB_SendZlp(pUdp);
             break;

From 7deb99b9992574ef636d47c58018bd6c9ed4c2ba Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Mar 2019 20:35:03 +0100
Subject: [PATCH 0854/1938] realloc check?

---
 client/cmdflashmem.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/client/cmdflashmem.c b/client/cmdflashmem.c
index c75fadb3c..af8584ce7 100644
--- a/client/cmdflashmem.c
+++ b/client/cmdflashmem.c
@@ -261,6 +261,9 @@ int CmdFlashMemLoad(const char *Cmd) {
     }
 
     data = realloc(data, datalen);
+    if (!data) {
+        return 1;
+    }
 
     //Send to device
     uint32_t bytes_sent = 0;

From dce51f34ed3e93b28aa0217e059f1c76c2c27cfe Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Mar 2019 21:21:15 +0100
Subject: [PATCH 0855/1938] style

---
 client/jansson/jansson.h | 48 ++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/client/jansson/jansson.h b/client/jansson/jansson.h
index f5d551b7c..b832a791f 100644
--- a/client/jansson/jansson.h
+++ b/client/jansson/jansson.h
@@ -187,22 +187,22 @@ static JSON_INLINE enum json_error_code json_error_code(const json_error_t *e) {
 /* getters, setters, manipulation */
 
 void json_object_seed(size_t seed);
-size_t json_object_size(const json_t *object);
-json_t *json_object_get(const json_t *object, const char *key) JANSSON_ATTRS(warn_unused_result);
-int json_object_set_new(json_t *object, const char *key, json_t *value);
-int json_object_set_new_nocheck(json_t *object, const char *key, json_t *value);
-int json_object_del(json_t *object, const char *key);
-int json_object_clear(json_t *object);
+size_t json_object_size(const json_t *json);
+json_t *json_object_get(const json_t *json, const char *key) JANSSON_ATTRS(warn_unused_result);
+int json_object_set_new(json_t *json, const char *key, json_t *value);
+int json_object_set_new_nocheck(json_t *json, const char *key, json_t *value);
+int json_object_del(json_t *json, const char *key);
+int json_object_clear(json_t *json);
 int json_object_update(json_t *object, json_t *other);
 int json_object_update_existing(json_t *object, json_t *other);
 int json_object_update_missing(json_t *object, json_t *other);
-void *json_object_iter(json_t *object);
-void *json_object_iter_at(json_t *object, const char *key);
+void *json_object_iter(json_t *json);
+void *json_object_iter_at(json_t *json, const char *key);
 void *json_object_key_to_iter(const char *key);
-void *json_object_iter_next(json_t *object, void *iter);
+void *json_object_iter_next(json_t *json, void *iter);
 const char *json_object_iter_key(void *iter);
 json_t *json_object_iter_value(void *iter);
-int json_object_iter_set_new(json_t *object, void *iter, json_t *value);
+int json_object_iter_set_new(json_t *json, void *iter, json_t *value);
 
 #define json_object_foreach(object, key, value) \
     for(key = json_object_iter_key(json_object_iter(object)); \
@@ -236,14 +236,14 @@ int json_object_iter_set(json_t *object, void *iter, json_t *value) {
     return json_object_iter_set_new(object, iter, json_incref(value));
 }
 
-size_t json_array_size(const json_t *array);
-json_t *json_array_get(const json_t *array, size_t index) JANSSON_ATTRS(warn_unused_result);
-int json_array_set_new(json_t *array, size_t index, json_t *value);
-int json_array_append_new(json_t *array, json_t *value);
-int json_array_insert_new(json_t *array, size_t index, json_t *value);
-int json_array_remove(json_t *array, size_t index);
-int json_array_clear(json_t *array);
-int json_array_extend(json_t *array, json_t *other);
+size_t json_array_size(const json_t *json);
+json_t *json_array_get(const json_t *json, size_t index) JANSSON_ATTRS(warn_unused_result);
+int json_array_set_new(json_t *json, size_t index, json_t *value);
+int json_array_append_new(json_t *json, json_t *value);
+int json_array_insert_new(json_t *json, size_t index, json_t *value);
+int json_array_remove(json_t *json, size_t index);
+int json_array_clear(json_t *json);
+int json_array_extend(json_t *json, json_t *other);
 
 static JSON_INLINE
 int json_array_set(json_t *array, size_t ind, json_t *value) {
@@ -260,16 +260,16 @@ int json_array_insert(json_t *array, size_t ind, json_t *value) {
     return json_array_insert_new(array, ind, json_incref(value));
 }
 
-const char *json_string_value(const json_t *string);
-size_t json_string_length(const json_t *string);
+const char *json_string_value(const json_t *json);
+size_t json_string_length(const json_t *json);
 json_int_t json_integer_value(const json_t *integer);
 double json_real_value(const json_t *real);
 double json_number_value(const json_t *json);
 
-int json_string_set(json_t *string, const char *value);
-int json_string_setn(json_t *string, const char *value, size_t len);
-int json_string_set_nocheck(json_t *string, const char *value);
-int json_string_setn_nocheck(json_t *string, const char *value, size_t len);
+int json_string_set(json_t *json, const char *value);
+int json_string_setn(json_t *json, const char *value, size_t len);
+int json_string_set_nocheck(json_t *json, const char *value);
+int json_string_setn_nocheck(json_t *json, const char *value, size_t len);
 int json_integer_set(json_t *integer, json_int_t value);
 int json_real_set(json_t *real, double value);
 

From 52b90d3d6b85cff6cb895fda0f9f2ca1a5f39eb2 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Mar 2019 21:24:10 +0100
Subject: [PATCH 0856/1938] bad comparission

---
 client/cmdhflist.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdhflist.c b/client/cmdhflist.c
index 3c1fb83bd..504456a11 100644
--- a/client/cmdhflist.c
+++ b/client/cmdhflist.c
@@ -44,7 +44,7 @@ void ClearAuthData() {
 
 uint8_t iso14443A_CRC_check(bool isResponse, uint8_t *d, uint8_t n) {
     if (n < 3) return 2;
-    if (isResponse & (n < 6)) return 2;
+    if (isResponse && (n < 6)) return 2;
     return check_crc(CRC_14443_A, d, n);
 }
 

From aafa627095357167539e1de60de1c10c41131df0 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Mar 2019 21:26:02 +0100
Subject: [PATCH 0857/1938] style

---
 client/cmdhflist.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdhflist.h b/client/cmdhflist.h
index a7edb51f6..105328b9b 100644
--- a/client/cmdhflist.h
+++ b/client/cmdhflist.h
@@ -53,7 +53,7 @@ typedef struct {
 } TAuthData;
 extern void ClearAuthData();
 
-extern uint8_t iso14443A_CRC_check(bool isResponse, uint8_t *data, uint8_t len);
+extern uint8_t iso14443A_CRC_check(bool isResponse, uint8_t *d, uint8_t n);
 extern uint8_t iso14443B_CRC_check(uint8_t *d, uint8_t n);
 extern uint8_t mifare_CRC_check(bool isResponse, uint8_t *data, uint8_t len);
 extern uint8_t iso15693_CRC_check(uint8_t *d, uint8_t n);

From 4fdbe9c3b207c6d313d0083d41b0faa529305aea Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Mar 2019 21:29:35 +0100
Subject: [PATCH 0858/1938] chg: 'hf mf hard' - negativ comparison style

---
 client/cmdhfmfhard.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/cmdhfmfhard.c b/client/cmdhfmfhard.c
index eac9c04d6..ac3066c84 100644
--- a/client/cmdhfmfhard.c
+++ b/client/cmdhfmfhard.c
@@ -367,7 +367,7 @@ static uint16_t PartialSumProperty(uint32_t state, odd_even_t odd_even) {
         uint32_t st = state;
         uint16_t part_sum = 0;
         if (odd_even == ODD_STATE) {
-            for (uint16_t i = 0; i < 5; i++) {
+            for (uint16_t i = 0; i < 4; i++) {
                 part_sum ^= filter(st);
                 st = (st << 1) | ((j >> (3 - i)) & 0x01) ;
             }
@@ -1073,7 +1073,7 @@ static int read_nonce_file(char *filename) {
     fclose(fnonces);
 
     char progress_string[80];
-    sprintf(progress_string, "Read %d nonces from file. cuid=%08x", num_acquired_nonces, cuid);
+    sprintf(progress_string, "Read %u nonces from file. cuid = %08x", num_acquired_nonces, cuid);
     hardnested_print_progress(num_acquired_nonces, progress_string, (float)(1LL << 47), 0);
     sprintf(progress_string, "Target Block=%d, Keytype=%c", trgBlockNo, trgKeyType == 0 ? 'A' : 'B');
     hardnested_print_progress(num_acquired_nonces, progress_string, (float)(1LL << 47), 0);
@@ -1353,7 +1353,7 @@ static void simulate_acquire_nonces() {
     // difftime(end_time, time1)!=0.0?(float)total_num_nonces*60.0/difftime(end_time, time1):INFINITY
     // );
 
-    fprintf(fstats, "%" PRId32 ";%" PRId32 ";%1.0f;", total_num_nonces, num_acquired_nonces, difftime(end_time, time1));
+    fprintf(fstats, "%" PRIu32 ";%" PRIu32 ";%1.0f;", total_num_nonces, num_acquired_nonces, difftime(end_time, time1));
 
 }
 

From 1b48948486381cb559b0f9d7759bfcf4de2f78cc Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Mar 2019 21:45:06 +0100
Subject: [PATCH 0859/1938] clear

---
 client/cmdlf.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/cmdlf.c b/client/cmdlf.c
index 2932caaab..049edb824 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -471,7 +471,7 @@ int CmdLFfskSim(const char *Cmd) {
                 cmdp += 2;
                 break;
             case 's':
-                separator = 1;
+                separator = true;
                 cmdp++;
                 break;
             case 'd':
@@ -519,7 +519,7 @@ int CmdLFfskSim(const char *Cmd) {
 
     uint16_t arg1, arg2;
     arg1 = fcHigh << 8 | fcLow;
-    arg2 = separator << 8 | clk;
+    arg2 = (separator << 8) | clk;
     size_t size = DemodBufferLen;
     if (size > USB_CMD_DATA_SIZE) {
         PrintAndLogEx(NORMAL, "DemodBuffer too long for current implementation - length: %d - max: %d", size, USB_CMD_DATA_SIZE);

From 910b5f31c2a74a70a2930f1d9b6c43ca8bba7253 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Mar 2019 21:49:15 +0100
Subject: [PATCH 0860/1938] null terminated

---
 client/cmdhflegic.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index db65447ac..8d79e2d2c 100644
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -230,21 +230,21 @@ int CmdLegicInfo(const char *Cmd) {
         int fl = 0;
 
         if (data[6] == 0xec) {
-            strncpy(token_type, "XAM", sizeof(token_type));
+            strncpy(token_type, "XAM", sizeof(token_type) - 1);
             fl = 1;
             stamp_len = 0x0c - (data[5] >> 4);
         } else {
             switch (data[5] & 0x7f) {
                 case 0x00 ... 0x2f:
-                    strncpy(token_type, "IAM", sizeof(token_type));
+                    strncpy(token_type, "IAM", sizeof(token_type) - 1);
                     fl = (0x2f - (data[5] & 0x7f)) + 1;
                     break;
                 case 0x30 ... 0x6f:
-                    strncpy(token_type, "SAM", sizeof(token_type));
+                    strncpy(token_type, "SAM", sizeof(token_type) - 1);
                     fl = (0x6f - (data[5] & 0x7f)) + 1;
                     break;
                 case 0x70 ... 0x7f:
-                    strncpy(token_type, "GAM", sizeof(token_type));
+                    strncpy(token_type, "GAM", sizeof(token_type) - 1);
                     fl = (0x7f - (data[5] & 0x7f)) + 1;
                     break;
             }
@@ -266,9 +266,9 @@ int CmdLegicInfo(const char *Cmd) {
 
         if (data[7] == 0x9F && data[8] == 0xFF) {
             bIsSegmented = 1;
-            strncpy(token_type, "IM-S", sizeof(token_type));
+            strncpy(token_type, "IM-S", sizeof(token_type) - 1);
         } else {
-            strncpy(token_type, "IM", sizeof(token_type));
+            strncpy(token_type, "IM", sizeof(token_type) - 1);
         }
 
         PrintAndLogEx(NORMAL, "DCF: %d (%02x %02x), Token Type=%s (OLE=%01u)",

From 38b24d94ba02cbdf69e3adf69cf683285ed75d69 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Mar 2019 21:53:57 +0100
Subject: [PATCH 0861/1938] mem leaks

---
 client/fpga_compress.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/client/fpga_compress.c b/client/fpga_compress.c
index 7c5a4a883..770005021 100644
--- a/client/fpga_compress.c
+++ b/client/fpga_compress.c
@@ -413,18 +413,22 @@ int main(int argc, char **argv) {
         infiles = calloc(1, sizeof(FILE *));
         if (argc != 4) {
             usage();
+            free(infiles);
             return (EXIT_FAILURE);
         }
         infiles[0] = fopen(argv[2], "rb");
         if (infiles[0] == NULL) {
             fprintf(stderr, "Error. Cannot open input file %s\n\n", argv[2]);
+            free(infiles);            
             return (EXIT_FAILURE);
         }
         outfile = fopen(argv[3], "wb");
         if (outfile == NULL) {
             fprintf(stderr, "Error. Cannot open output file %s\n\n", argv[3]);
+            free(infiles);            
             return (EXIT_FAILURE);
         }
+        
         return zlib_decompress(infiles[0], outfile);
 
     } else { // Compress or gemerate version info
@@ -453,6 +457,7 @@ int main(int argc, char **argv) {
             infiles[i] = fopen(infile_names[i], "rb");
             if (infiles[i] == NULL) {
                 fprintf(stderr, "Error. Cannot open input file %s\n\n", infile_names[i]);
+                free(infile_names);
                 return (EXIT_FAILURE);
             }
         }

From 524ed17894bc9ae0f0e29299ab3c840e0e718db8 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Mar 2019 21:56:44 +0100
Subject: [PATCH 0862/1938] styles

---
 client/hardnested/hardnested_tables.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/hardnested/hardnested_tables.c b/client/hardnested/hardnested_tables.c
index 09de7f5d7..aacf0f63f 100644
--- a/client/hardnested/hardnested_tables.c
+++ b/client/hardnested/hardnested_tables.c
@@ -44,7 +44,7 @@ static uint16_t PartialSumProperty(uint32_t state, odd_even_t odd_even) {
         uint32_t st = state;
         uint16_t part_sum = 0;
         if (odd_even == ODD_STATE) {
-            for (uint16_t i = 0; i < 5; i++) {
+            for (uint16_t i = 0; i < 4; i++) {
                 part_sum ^= filter(st);
                 st = (st << 1) | ((j >> (3 - i)) & 0x01) ;
             }
@@ -368,7 +368,7 @@ static void precalculate_bit0_bitflip_bitarrays(uint8_t const bitflip, uint16_t
         if (count[odd_even] != 1 << 24) {
             for (uint32_t state = 0; state < (1 << 24); state += 1 << 4) {
                 uint32_t line = test_bitarray[odd_even][state >> 5];
-                uint16_t half_line = state & 0x000000010 ? line & 0x0000ffff : line >> 16;
+                uint16_t half_line = (state & 0x000000010) ? line & 0x0000ffff : line >> 16;
                 if (half_line != 0) {
                     for (uint32_t low_bits = 0; low_bits < (1 << 4); low_bits++) {
                         set_bit24(test_bitarray_2nd, low_bits << 20 | state >> 4);
@@ -480,7 +480,7 @@ static void precalculate_bit0_bitflip_bitarrays(uint8_t const bitflip, uint16_t
         if (count[odd_even] != 1 << 24) {
             for (uint32_t state = 0; state < (1 << 24); state += 1 << 4) {
                 uint32_t line = test_not_bitarray[odd_even][state >> 5];
-                uint16_t half_line = state & 0x000000010 ? line & 0x0000ffff : line >> 16;
+                uint16_t half_line = (state & 0x000000010) ? line & 0x0000ffff : line >> 16;
                 if (half_line != 0) {
                     for (uint32_t low_bits = 0; low_bits < (1 << 4); low_bits++) {
                         set_bit24(test_bitarray_2nd, low_bits << 20 | state >> 4);
@@ -518,7 +518,7 @@ static void precalculate_bit0_bitflip_bitarrays(uint8_t const bitflip, uint16_t
 int main(int argc, char *argv[]) {
 
     unsigned int bitflip_in;
-    int sum_a0;
+    int sum_a0 = 0;
 
     printf("Create tables required by hardnested attack.\n");
     printf("Expect a runtime in the range of days or weeks.\n");

From 4288e9db7305731095c71292771711ff41202037 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Mar 2019 22:04:53 +0100
Subject: [PATCH 0863/1938] style

---
 client/cmdhfmfu.c       |  7 +++++--
 client/cmdlft55xx.h     |  3 ++-
 client/loclass/cipher.c |  2 --
 client/scripting.c      | 16 +++++++++++++++-
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index e6f017763..85e73d034 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -322,6 +322,9 @@ static int ul_read(uint8_t page, uint8_t *response, uint16_t responseLength) {
 
 static int ul_comp_write(uint8_t page, uint8_t *data, uint8_t datalen) {
 
+    if (data == NULL) 
+        return -1;
+    
     uint8_t cmd[18];
     memset(cmd, 0x00, sizeof(cmd));
     datalen = (datalen > 16) ? 16 : datalen;
@@ -330,7 +333,7 @@ static int ul_comp_write(uint8_t page, uint8_t *data, uint8_t datalen) {
     cmd[1] = page;
     memcpy(cmd + 2, data, datalen);
 
-    uint8_t response[1] = {0xff};
+    uint8_t response[1] = {0xFF};
     ul_send_cmd_raw(cmd, 2 + datalen, response, sizeof(response));
     // ACK
     if (response[0] == 0x0a) return 0;
@@ -948,7 +951,7 @@ int CmdHF14AMfUInfo(const char *Cmd) {
     uint8_t pwd[4] = {0, 0, 0, 0};
     uint8_t *key = pwd;
     uint8_t pack[4] = {0, 0, 0, 0};
-    int len = 0;
+    int len;
     char tempStr[50];
 
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
diff --git a/client/cmdlft55xx.h b/client/cmdlft55xx.h
index f0a438ef5..25b8c7c17 100644
--- a/client/cmdlft55xx.h
+++ b/client/cmdlft55xx.h
@@ -26,7 +26,6 @@
 #include "lfdemod.h"
 #include "cmdhf14a.h" //for getTagInfo
 
-
 #define T55x7_CONFIGURATION_BLOCK 0x00
 #define T55x7_PAGE0 0x00
 #define T55x7_PAGE1 0x01
@@ -37,6 +36,7 @@
 #define T55X7_DEFAULT_CONFIG_BLOCK      0x000880E8  // ASK, compat mode, data rate 32, manchester, STT, 7 data blocks
 #define T55X7_RAW_CONFIG_BLOCK          0x000880E0  // ASK, compat mode, data rate 32, manchester, 7 data blocks
 #define T55X7_EM_UNIQUE_CONFIG_BLOCK    0x00148040  // ASK, emulate em4x02/unique - compat mode, manchester, data rate 64, 2 data blocks
+#define T55X7_EM_PAXTON_CONFIG_BLOCK    0x00148040  // ASK, emulate em4x02/paxton - compat mode, manchester, data rate 64, 2 data blocks
 // FDXB requires data inversion and BiPhase 57 is simply BiPhase 50 inverted, so we can either do it using the modulation scheme or the inversion flag
 // we've done both below to prove that it works either way, and the modulation value for BiPhase 50 in the Atmel data sheet of binary "10001" (17) is a typo,
 // and it should actually be "10000" (16)
@@ -53,6 +53,7 @@
 #define T55X7_PRESCO_CONFIG_BLOCK       0x00088088  // ASK, data rate 32, Manchester, 5 data blocks, STT
 #define T55X7_NEDAP_64_CONFIG_BLOCK     0x907f0042  // BiPhase,  data rate 64, 3 data blocks
 #define T55X7_NEDAP_128_CONFIG_BLOCK    0x907f0082  // BiPhase,  data rate 64, 5 data blocks
+
 #define T55X7_bin 0b0010
 
 #define T5555_DEFAULT_CONFIG_BLOCK      0x6001F004  // data rate 64 , ask, manchester, 2 data blocks?
diff --git a/client/loclass/cipher.c b/client/loclass/cipher.c
index da210d98f..2fe178829 100644
--- a/client/loclass/cipher.c
+++ b/client/loclass/cipher.c
@@ -87,9 +87,7 @@ bool B(State state) {
     bool x2 = state.b & 0x20;
     bool x3 = state.b & 0x10;
     bool x7 = state.b & 0x01;
-
     return x1 ^ x2 ^ x3 ^ x7;
-
 }
 
 
diff --git a/client/scripting.c b/client/scripting.c
index 82378bf76..e9ebe1dea 100644
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -69,6 +69,13 @@ static int l_GetFromBigBuf(lua_State *L) {
         startindex = luaL_checknumber(L, 1);
         len = luaL_checknumber(L, 2);
     }
+    
+    if ( len == 0 ) {
+        //signal error by returning Nil, errorstring
+        lua_pushnil(L);
+        lua_pushstring(L, "You need to supply number of bytes larger than zero");
+        return 2; // two return values        
+    }
 
     uint8_t *data = calloc(len, sizeof(uint8_t));
     if (!data) {
@@ -118,6 +125,13 @@ static int l_GetFromFlashMem(lua_State *L) {
         startindex = luaL_checknumber(L, 1);
         len = luaL_checknumber(L, 2);
     }
+    
+    if ( len == 0 ) {
+        //signal error by returning Nil, errorstring
+        lua_pushnil(L);
+        lua_pushstring(L, "You need to supply number of bytes larger than zero");
+        return 2; // two return values        
+    }    
 
     uint8_t *data = calloc(len, sizeof(uint8_t));
     if (!data) {
@@ -627,7 +641,7 @@ static int l_hardnested(lua_State *L) {
 
     uint8_t key[6] = {0, 0, 0, 0, 0, 0};
     uint8_t trgkey[6] = {0, 0, 0, 0, 0, 0};
-    for (int i = 0; i < 32; i += 2) {
+    for (int i = 0; i < 12; i += 2) {
         sscanf(&p_key[i], "%02x", &tmp);
         key[i / 2] = tmp & 0xFF;
         if (haveTarget) {

From af8e81d0a0e87140cca3d96c19c18316932f57ff Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Mar 2019 22:07:44 +0100
Subject: [PATCH 0864/1938] bool as bitwise

---
 common/crapto1/crapto1.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/crapto1/crapto1.c b/common/crapto1/crapto1.c
index ddc9f7be5..17355e162 100644
--- a/common/crapto1/crapto1.c
+++ b/common/crapto1/crapto1.c
@@ -38,8 +38,8 @@ static void __attribute__((constructor)) fill_lut() {
 static inline void update_contribution(uint32_t *item, const uint32_t mask1, const uint32_t mask2) {
     uint32_t p = *item >> 25;
 
-    p = p << 1 | evenparity32(*item & mask1);
-    p = p << 1 | evenparity32(*item & mask2);
+    p = p << 1 | (evenparity32(*item & mask1));
+    p = p << 1 | (evenparity32(*item & mask2));
     *item = p << 24 | (*item & 0xffffff);
 }
 
@@ -90,10 +90,10 @@ recover(uint32_t *o_head, uint32_t *o_tail, uint32_t oks,
 
     if (rem == -1) {
         for (e = e_head; e <= e_tail; ++e) {
-            *e = *e << 1 ^ evenparity32(*e & LF_POLY_EVEN) ^ !!(in & 4);
+            *e = *e << 1 ^ (evenparity32(*e & LF_POLY_EVEN)) ^ !!(in & 4);
             for (o = o_head; o <= o_tail; ++o, ++sl) {
                 sl->even = *o;
-                sl->odd = *e ^ evenparity32(*o & LF_POLY_ODD);
+                sl->odd = *e ^ (evenparity32(*o & LF_POLY_ODD));
                 sl[1].odd = sl[1].even = 0;
             }
         }

From 580159ed979dac6aa792b4f1ced75da25b937595 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Mar 2019 22:11:31 +0100
Subject: [PATCH 0865/1938] mem leak

---
 client/cmdhflegic.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index 8d79e2d2c..7aa93f456 100644
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -614,8 +614,7 @@ int CmdLegicRfWrite(const char *Cmd) {
         PrintAndLogEx(NORMAL, "############# DANGER ################");
         PrintAndLogEx(NORMAL, "# changing the DCF is irreversible  #");
         PrintAndLogEx(NORMAL, "#####################################");
-        char *answer = NULL;
-        answer = readline("do you really want to continue? y(es) n(o) : ");
+        char *answer = readline("do you really want to continue? y(es) n(o) : ");
         bool overwrite = (answer[0] == 'y' || answer[0] == 'Y');
         if (!overwrite) {
             PrintAndLogEx(NORMAL, "command cancelled");
@@ -1283,6 +1282,7 @@ int CmdLegicWipe(const char *Cmd) {
         }
     }
     PrintAndLogEx(SUCCESS, "ok\n");
+    free(data);    
     return 0;
 }
 

From b9cbc5cb7f652a154947ff972e56f204207c9b25 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Mar 2019 22:14:07 +0100
Subject: [PATCH 0866/1938] bad logic

---
 client/cmdhffelica.c | 39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/client/cmdhffelica.c b/client/cmdhffelica.c
index 33d506a58..08319840a 100644
--- a/client/cmdhffelica.c
+++ b/client/cmdhffelica.c
@@ -425,34 +425,33 @@ int CmdHFFelicaDumpLite(const char *Cmd) {
     }
 
     uint64_t tracelen = resp.arg[1];
+    if (tracelen == 0) 
+        return 1;   
+
     uint8_t *trace = calloc(tracelen, sizeof(uint8_t));
     if (trace == NULL) {
         PrintAndLogEx(WARNING, "Cannot allocate memory for trace");
         return 1;
     }
 
-    // only download data if there is any.
-    if (tracelen > 0) {
-
-        if (!GetFromDevice(BIG_BUF, trace, tracelen, 0, NULL, 2500, false)) {
-            PrintAndLogEx(WARNING, "command execution time out");
-            free(trace);
-            return 0;
-        }
-
-        PrintAndLogEx(SUCCESS, "Recorded Activity (trace len = %d bytes)", tracelen);
-
-        print_hex_break(trace, tracelen, 32);
-
-        printSep();
-        uint16_t tracepos = 0;
-        while (tracepos < tracelen)
-            tracepos = PrintFliteBlock(tracepos, trace, tracelen);
-
-        printSep();
+    if (!GetFromDevice(BIG_BUF, trace, tracelen, 0, NULL, 2500, false)) {
+        PrintAndLogEx(WARNING, "command execution time out");
+        free(trace);
+        return 0;
     }
 
-    free(trace);
+    PrintAndLogEx(SUCCESS, "Recorded Activity (trace len = %d bytes)", tracelen);
+
+    print_hex_break(trace, tracelen, 32);
+    printSep();
+    
+    uint16_t tracepos = 0;
+    while (tracepos < tracelen)
+        tracepos = PrintFliteBlock(tracepos, trace, tracelen);
+
+    printSep();
+
+    free(trace);        
     return 0;
 }
 

From 17f5df152beed163ee1f986c826f212a2ae8e00c Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Mar 2019 22:16:05 +0100
Subject: [PATCH 0867/1938] style

---
 client/cmdhffelica.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/client/cmdhffelica.c b/client/cmdhffelica.c
index 08319840a..dc9234001 100644
--- a/client/cmdhffelica.c
+++ b/client/cmdhffelica.c
@@ -455,7 +455,7 @@ int CmdHFFelicaDumpLite(const char *Cmd) {
     return 0;
 }
 
-int CmdHFFelicaCmdRaw(const char *cmd) {
+int CmdHFFelicaCmdRaw(const char *Cmd) {
     UsbCommand c = {CMD_FELICA_COMMAND, {0, 0, 0}};
     bool reply = 1;
     bool crc = false;
@@ -469,15 +469,15 @@ int CmdHFFelicaCmdRaw(const char *cmd) {
     uint16_t datalen = 0;
     uint32_t temp;
 
-    if (strlen(cmd) < 2) return usage_hf_felica_raw();
+    if (strlen(Cmd) < 2) return usage_hf_felica_raw();
 
     // strip
-    while (*cmd == ' ' || *cmd == '\t') cmd++;
+    while (*Cmd == ' ' || *Cmd == '\t') Cmd++;
 
-    while (cmd[i] != '\0') {
-        if (cmd[i] == ' ' || cmd[i] == '\t') { i++; continue; }
-        if (cmd[i] == '-') {
-            switch (cmd[i + 1]) {
+    while (Cmd[i] != '\0') {
+        if (Cmd[i] == ' ' || Cmd[i] == '\t') { i++; continue; }
+        if (Cmd[i] == '-') {
+            switch (Cmd[i + 1]) {
                 case 'H':
                 case 'h':
                     return usage_hf_felica_raw();
@@ -497,10 +497,10 @@ int CmdHFFelicaCmdRaw(const char *cmd) {
                     active_select = true;
                     break;
                 case 'b':
-                    sscanf(cmd + i + 2, "%d", &temp);
+                    sscanf(Cmd + i + 2, "%d", &temp);
                     numbits = temp & 0xFFFF;
                     i += 3;
-                    while (cmd[i] != ' ' && cmd[i] != '\0') { i++; }
+                    while (Cmd[i] != ' ' && Cmd[i] != '\0') { i++; }
                     i -= 2;
                     break;
                 default:
@@ -509,11 +509,11 @@ int CmdHFFelicaCmdRaw(const char *cmd) {
             i += 2;
             continue;
         }
-        if ((cmd[i] >= '0' && cmd[i] <= '9') ||
-                (cmd[i] >= 'a' && cmd[i] <= 'f') ||
-                (cmd[i] >= 'A' && cmd[i] <= 'F')) {
+        if ((Cmd[i] >= '0' && Cmd[i] <= '9') ||
+                (Cmd[i] >= 'a' && Cmd[i] <= 'f') ||
+                (Cmd[i] >= 'A' && Cmd[i] <= 'F')) {
             buf[strlen(buf) + 1] = 0;
-            buf[strlen(buf)] = cmd[i];
+            buf[strlen(buf)] = Cmd[i];
             i++;
 
             if (strlen(buf) >= 2) {

From 433f84ca0d11ecebbee4eeb83855c2d27cce7eb8 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Mar 2019 22:25:21 +0100
Subject: [PATCH 0868/1938] style

---
 armsrc/pcf7931.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/armsrc/pcf7931.c b/armsrc/pcf7931.c
index 0d4c41048..d0edc2698 100644
--- a/armsrc/pcf7931.c
+++ b/armsrc/pcf7931.c
@@ -12,25 +12,19 @@ size_t DemodPCF7931(uint8_t **outBlocks) {
     if (GraphTraceLen > 18000)
         GraphTraceLen = 18000;
 
-    int i, j, lastval, bitidx, half_switch;
+    int i = 2, j, lastval, bitidx, half_switch;
     int clock = 64;
     int tolerance = clock / 8;
     int pmc, block_done;
     int lc, warnings = 0;
     size_t num_blocks = 0;
-    int lmin = 128, lmax = 128;
+    int lmin = 64, lmax = 192;
     uint8_t dir;
-    //clear read buffer
-    BigBuf_Clear_keep_EM();
 
+    BigBuf_Clear_keep_EM();
     LFSetupFPGAForADC(95, true);
     DoAcquisition_default(0, true);
 
-    lmin = 64;
-    lmax = 192;
-
-    i = 2;
-
     /* Find first local max/min */
     if (dest[1] > dest[0]) {
         while (i < GraphTraceLen) {

From 93a91454f9b2b6b47d9aaa5ed611839d7cbc2494 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Mar 2019 22:30:13 +0100
Subject: [PATCH 0869/1938] style and fixes

---
 client/cmdhf14a.c | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 83e1673ef..01b4e8228 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -541,7 +541,11 @@ int CmdHF14AInfo(const char *Cmd) {
             if (strlen(dr) != 0) dr[strlen(dr) - 2] = '\0';
             PrintAndLogEx(NORMAL, "       - TA1 : different divisors are%s supported, "
                           "DR: [%s], DS: [%s]",
-                          (card.ats[pos] & 0x80 ? " NOT" : ""), dr, ds);
+                          ((card.ats[pos] & 0x80) ? " NOT" : ""),
+                          dr,
+                          ds
+                  );
+                  
             pos++;
         }
         if (tb1) {
@@ -810,12 +814,12 @@ int CmdHF14ASniff(const char *Cmd) {
 }
 
 int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
-    static bool responseNum = false;
+    static uint8_t responseNum = 0;
     uint16_t cmdc = 0;
     *dataoutlen = 0;
 
     if (activateField) {
-        responseNum = false;
+        responseNum = 1;
         UsbCommand resp;
 
         // Anticollision + SELECT card
@@ -848,7 +852,7 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
                 return 1;
             }
 
-            if (resp.arg[0] <= 0) { // ats_len
+            if (resp.arg[0] == 0) { // ats_len
                 PrintAndLogEx(ERR, "Can't get ATS.");
                 return 1;
             }
@@ -859,7 +863,7 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
         cmdc |= ISO14A_NO_DISCONNECT;
 
     UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_APPEND_CRC | cmdc, (datainlen & 0xFFFF) + 2, 0}};
-    uint8_t header[] = {0x0a | responseNum, 0x00};
+    uint8_t header[] = { 0x0a | responseNum, 0x00};
     responseNum ^= 1;
     memcpy(c.d.asBytes, header, 2);
     memcpy(&c.d.asBytes[2], datain, datainlen);
@@ -899,7 +903,6 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
             return 3;
         }
 
-
     } else {
         PrintAndLogEx(ERR, "Reply timeout.");
         return 4;
@@ -948,7 +951,7 @@ int SelectCard14443_4(bool disconnect, iso14a_card_select_t *card) {
             return 1;
         }
 
-        if (resp.arg[0] <= 0) { // ats_len
+        if (resp.arg[0] == 0) { // ats_len
             PrintAndLogEx(ERR, "Can't get ATS.");
             return 1;
         }
@@ -997,7 +1000,10 @@ int CmdExchangeAPDU(bool chainingin, uint8_t *datain, int datainlen, bool activa
     // here length USB_CMD_DATA_SIZE=512
     // timeout must be authomatically set by "get ATS"
     UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_APDU | ISO14A_NO_DISCONNECT | cmdc, (datainlen & 0xFFFF), 0}};
-    memcpy(c.d.asBytes, datain, datainlen);
+    
+    if ( datain )
+        memcpy(c.d.asBytes, datain, datainlen);
+    
     SendCommand(&c);
 
     uint8_t *recv;

From e26e66673489dab50f6bffed68e3069ab3b4cd12 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Mar 2019 22:31:31 +0100
Subject: [PATCH 0870/1938] style

---
 client/tinycbor/cbor.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/tinycbor/cbor.h b/client/tinycbor/cbor.h
index a71bbcde4..a6175d3ab 100644
--- a/client/tinycbor/cbor.h
+++ b/client/tinycbor/cbor.h
@@ -301,7 +301,7 @@ CBOR_API CborError cbor_value_leave_container(CborValue *it, const CborValue *re
 
 CBOR_PRIVATE_API uint64_t _cbor_value_decode_int64_internal(const CborValue *value);
 CBOR_INLINE_API uint64_t _cbor_value_extract_int64_helper(const CborValue *value) {
-    return value->flags & CborIteratorFlag_IntegerValueTooLarge ?
+    return (value->flags & CborIteratorFlag_IntegerValueTooLarge) ?
            _cbor_value_decode_int64_internal(value) : value->extra;
 }
 

From 7344d9128f909bf8564ecc7f91f0ea2921c46544 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Mar 2019 22:35:33 +0100
Subject: [PATCH 0871/1938] style

---
 client/cmdhffido.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index e099c35d0..496ae5427 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -215,7 +215,7 @@ int CmdHFFidoRegister(const char *cmd) {
     if (paramsPlain) {
         memset(cdata, 0x00, 32);
         CLIGetStrWithReturn(6, cdata, &chlen);
-        if (chlen && chlen > 16) {
+        if (chlen > 16) {
             PrintAndLog("ERROR: challenge parameter length in ASCII mode must be less than 16 chars instead of: %d", chlen);
             return 1;
         }
@@ -233,7 +233,7 @@ int CmdHFFidoRegister(const char *cmd) {
     if (paramsPlain) {
         memset(adata, 0x00, 32);
         CLIGetStrWithReturn(7, adata, &applen);
-        if (applen && applen > 16) {
+        if (applen > 16) {
             PrintAndLog("ERROR: application parameter length in ASCII mode must be less than 16 chars instead of: %d", applen);
             return 1;
         }
@@ -479,7 +479,7 @@ int CmdHFFidoAuthenticate(const char *cmd) {
     if (paramsPlain) {
         memset(hdata, 0x00, 32);
         CLIGetStrWithReturn(9, hdata, &hdatalen);
-        if (hdatalen && hdatalen > 16) {
+        if (hdatalen > 16) {
             PrintAndLog("ERROR: challenge parameter length in ASCII mode must be less than 16 chars instead of: %d", hdatalen);
             return 1;
         }
@@ -496,7 +496,7 @@ int CmdHFFidoAuthenticate(const char *cmd) {
     if (paramsPlain) {
         memset(hdata, 0x00, 32);
         CLIGetStrWithReturn(11, hdata, &hdatalen);
-        if (hdatalen && hdatalen > 16) {
+        if (hdatalen > 16) {
             PrintAndLog("ERROR: application parameter length in ASCII mode must be less than 16 chars instead of: %d", hdatalen);
             return 1;
         }

From b57c2d59358138119e8f795e639064fd131d3356 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Mar 2019 23:31:04 +0100
Subject: [PATCH 0872/1938] reverting..

---
 client/cmdhfmfhard.c                  |  5 +++--
 client/hardnested/hardnested_tables.c | 12 ++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/client/cmdhfmfhard.c b/client/cmdhfmfhard.c
index ac3066c84..415bcbaa2 100644
--- a/client/cmdhfmfhard.c
+++ b/client/cmdhfmfhard.c
@@ -367,7 +367,7 @@ static uint16_t PartialSumProperty(uint32_t state, odd_even_t odd_even) {
         uint32_t st = state;
         uint16_t part_sum = 0;
         if (odd_even == ODD_STATE) {
-            for (uint16_t i = 0; i < 4; i++) {
+            for (uint16_t i = 0; i < 5; i++) {
                 part_sum ^= filter(st);
                 st = (st << 1) | ((j >> (3 - i)) & 0x01) ;
             }
@@ -1013,7 +1013,8 @@ static bool shrink_key_space(float *brute_forces) {
 //iceman 2018
     return ((hardnested_stage & CHECK_2ND_BYTES) &&
             reduction_rate >= 0.0 &&
-            (reduction_rate < brute_force_per_second * (float)sample_period / 1000.0  || *brute_forces < 0x1F00000000));
+            (reduction_rate < brute_force_per_second * (float)sample_period / 1000.0  || *brute_forces < 0xF00000));
+
 }
 
 
diff --git a/client/hardnested/hardnested_tables.c b/client/hardnested/hardnested_tables.c
index aacf0f63f..e1bc68549 100644
--- a/client/hardnested/hardnested_tables.c
+++ b/client/hardnested/hardnested_tables.c
@@ -240,7 +240,7 @@ void init_sum_bitarray(uint16_t sum_a0) {
     }
     for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
         uint32_t count = count_states(sum_a0_bitarray[odd_even]);
-        printf("sum_a0_bitarray[%s] has %d states (%5.2f%%)\n", odd_even == EVEN_STATE ? "even" : "odd ", count, (float)count / (1 << 24) * 100.0);
+        printf("sum_a0_bitarray[%s] has %u states (%5.2f%%)\n", odd_even == EVEN_STATE ? "even" : "odd ", count, (float)count / (1 << 24) * 100.0);
     }
     printf("done.\n");
 }
@@ -350,7 +350,7 @@ static void precalculate_bit0_bitflip_bitarrays(uint8_t const bitflip, uint16_t
     for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
         count[odd_even] = count_states(test_bitarray[odd_even]);
         if (count[odd_even] != 1 << 24) {
-            printf("Writing %d possible %s states for bitflip property %03x (%d (%1.2f%%) states eliminated)\n",
+            printf("Writing %u possible %s states for bitflip property %03x (%d (%1.2f%%) states eliminated)\n",
                    count[odd_even],
                    odd_even == EVEN_STATE ? "even" : "odd",
                    bitflip, (1 << 24) - count[odd_even],
@@ -377,7 +377,7 @@ static void precalculate_bit0_bitflip_bitarrays(uint8_t const bitflip, uint16_t
             }
             count[odd_even] = count_states(test_bitarray_2nd);
             if (count[odd_even] != 1 << 24) {
-                printf("Writing %d possible %s states for bitflip property %03x (%d (%1.2f%%) states eliminated)\n",
+                printf("Writing %u possible %s states for bitflip property %03x (%d (%1.2f%%) states eliminated)\n",
                        count[odd_even],
                        odd_even == EVEN_STATE ? "even" : "odd",
                        bitflip | BITFLIP_2ND_BYTE, (1 << 24) - count[odd_even],
@@ -462,7 +462,7 @@ static void precalculate_bit0_bitflip_bitarrays(uint8_t const bitflip, uint16_t
     for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
         count[odd_even] = count_states(test_not_bitarray[odd_even]);
         if (count[odd_even] != 1 << 24) {
-            printf("Writing %d possible %s states for bitflip property %03x (%d (%1.2f%%) states eliminated)\n",
+            printf("Writing %u possible %s states for bitflip property %03x (%d (%1.2f%%) states eliminated)\n",
                    count[odd_even],
                    odd_even == EVEN_STATE ? "even" : "odd",
                    bitflip | 0x100, (1 << 24) - count[odd_even],
@@ -489,7 +489,7 @@ static void precalculate_bit0_bitflip_bitarrays(uint8_t const bitflip, uint16_t
             }
             count[odd_even] = count_states(test_bitarray_2nd);
             if (count[odd_even] != 1 << 24) {
-                printf("Writing %d possible %s states for bitflip property %03x (%d (%1.2f%%) states eliminated)\n",
+                printf("Writing %u possible %s states for bitflip property %03x (%d (%1.2f%%) states eliminated)\n",
                        count[odd_even],
                        odd_even == EVEN_STATE ? "even" : "odd",
                        bitflip | 0x100 | BITFLIP_2ND_BYTE, (1 << 24) - count[odd_even],
@@ -542,7 +542,7 @@ int main(int argc, char *argv[]) {
     }
 
     switch (sum_a0) {
-        case 0:
+        case  0:
         case  32:
         case  56:
         case  64:

From 35592b979db6d1a043cc968b54227896ad0a7d9e Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Mar 2019 23:43:44 +0100
Subject: [PATCH 0873/1938] unsigned long long

---
 client/cmdhf15.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index 23a756062..7391fd38c 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -233,7 +233,7 @@ static char *getTagInfo_15(uint8_t *uid) {
     int i = 0, best = -1;
     memcpy(&myuid, uid, sizeof(uint64_t));
     while (uidmapping[i].mask > 0) {
-        mask = (~0LL) << (64 - uidmapping[i].mask);
+        mask = (~0ULL) << (64 - uidmapping[i].mask);
         if ((myuid & mask) == uidmapping[i].uid) {
             if (best == -1) {
                 best = i;

From fd198b0048f8c4dc17dde7520113b2d1242156d1 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Mar 2019 23:46:26 +0100
Subject: [PATCH 0874/1938] mem leaks

---
 client/fpga_compress.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/client/fpga_compress.c b/client/fpga_compress.c
index 770005021..cdd899782 100644
--- a/client/fpga_compress.c
+++ b/client/fpga_compress.c
@@ -419,7 +419,7 @@ int main(int argc, char **argv) {
         infiles[0] = fopen(argv[2], "rb");
         if (infiles[0] == NULL) {
             fprintf(stderr, "Error. Cannot open input file %s\n\n", argv[2]);
-            free(infiles);            
+            free(infiles);          
             return (EXIT_FAILURE);
         }
         outfile = fopen(argv[3], "wb");
@@ -458,16 +458,21 @@ int main(int argc, char **argv) {
             if (infiles[i] == NULL) {
                 fprintf(stderr, "Error. Cannot open input file %s\n\n", infile_names[i]);
                 free(infile_names);
+                free(infiles);
                 return (EXIT_FAILURE);
             }
         }
         outfile = fopen(argv[argc - 1], "wb");
         if (outfile == NULL) {
             fprintf(stderr, "Error. Cannot open output file %s\n\n", argv[argc - 1]);
+            free(infile_names);
+            free(infiles);          
             return (EXIT_FAILURE);
         }
         if (generate_version_file) {
             if (generate_fpga_version_info(infiles, infile_names, num_input_files, outfile)) {
+                free(infile_names);
+                free(infiles);                
                 return (EXIT_FAILURE);
             }
         } else {

From 26804cb85fea762b4418ece06015432bb5e42010 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Mar 2019 23:48:40 +0100
Subject: [PATCH 0875/1938] style

---
 client/flash.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/flash.c b/client/flash.c
index c35e1c630..c60dfcbf1 100644
--- a/client/flash.c
+++ b/client/flash.c
@@ -64,9 +64,9 @@ static int build_segs_from_phdrs(flash_file_t *ctx, FILE *fd, Elf32_Phdr *phdrs,
         }
         fprintf(stdout, "%d: V 0x%08x P 0x%08x (0x%08x->0x%08x) [%c%c%c] @0x%x\n",
                 i, vaddr, paddr, filesz, memsz,
-                flags & PF_R ? 'R' : ' ',
-                flags & PF_W ? 'W' : ' ',
-                flags & PF_X ? 'X' : ' ',
+                (flags & PF_R) ? 'R' : ' ',
+                (flags & PF_W) ? 'W' : ' ',
+                (flags & PF_X) ? 'X' : ' ',
                 offset);
         if (filesz != memsz) {
             fprintf(stderr, "Error: PHDR file size does not equal memory size\n"
@@ -179,7 +179,7 @@ static int check_segs(flash_file_t *ctx, int can_write_bl) {
 
 // Load an ELF file and prepare it for flashing
 int flash_load(flash_file_t *ctx, const char *name, int can_write_bl) {
-    FILE *fd = NULL;
+    FILE *fd;
     Elf32_Ehdr ehdr;
     Elf32_Phdr *phdrs = NULL;
     uint16_t num_phdrs;
@@ -410,7 +410,7 @@ int flash_write(flash_file_t *ctx) {
         uint32_t blocks = (length + BLOCK_SIZE - 1) / BLOCK_SIZE;
         uint32_t end = seg->start + length;
 
-        fprintf(stdout, " 0x%08x..0x%08x [0x%x / %d blocks]", seg->start, end - 1, length, blocks);
+        fprintf(stdout, " 0x%08x..0x%08x [0x%x / %u blocks]", seg->start, end - 1, length, blocks);
         fflush(stdout);
         int block = 0;
         uint8_t *data = seg->data;
@@ -423,7 +423,7 @@ int flash_write(flash_file_t *ctx) {
 
             if (write_block(baddr, data, block_size) < 0) {
                 fprintf(stderr, " ERROR\n");
-                fprintf(stderr, "Error writing block %d of %d\n", block, blocks);
+                fprintf(stderr, "Error writing block %d of %u\n", block, blocks);
                 return -1;
             }
 

From 122807148c55e71cc40cf6a8956c384541e8f128 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Mar 2019 23:49:51 +0100
Subject: [PATCH 0876/1938] style

---
 client/emv/test/crypto_test.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/emv/test/crypto_test.c b/client/emv/test/crypto_test.c
index 18e0d1b70..21e924858 100644
--- a/client/emv/test/crypto_test.c
+++ b/client/emv/test/crypto_test.c
@@ -315,7 +315,7 @@ int exec_crypto_test(bool verbose) {
         unsigned int kl = keylengths[i];
         ret = test_genkey(kl, message, kl / 8, verbose);
         if (ret) {
-            fprintf(stderr, "Crypto generate key[%d] test: failed\n", kl);
+            fprintf(stderr, "Crypto generate key[%u] test: failed\n", kl);
             return ret;
         }
     }

From 2276779b01af76e049b14b4e1515f8c161686462 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Mar 2019 23:55:39 +0100
Subject: [PATCH 0877/1938] style

---
 client/cmdlft55xx.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 703d22fe1..434e46ff3 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1363,7 +1363,7 @@ bool AquireData(uint8_t page, uint8_t block, bool pwdmode, uint32_t password) {
     //  bit1 = page to read from
     // arg1: which block to read
     // arg2: password
-    uint8_t arg0 = ((page << 1) | pwdmode);
+    uint8_t arg0 = ( page << 1 | (pwdmode) );
     UsbCommand c = {CMD_T55XX_READ_BLOCK, {arg0, block, password}};
     clearCommandBuffer();
     SendCommand(&c);
@@ -1382,7 +1382,7 @@ char *GetBitRateStr(uint32_t id, bool xmode) {
 
     char *retStr = buf;
     if (xmode) { //xmode bitrate calc is same as em4x05 calc
-        snprintf(retStr, sizeof(buf), "%d - RF/%d", id, EM4x05_GET_BITRATE(id));
+        snprintf(retStr, sizeof(buf), "%u - RF/%d", id, EM4x05_GET_BITRATE(id));
     } else {
         switch (id) {
             case 0:

From b8c5faee92467b37a277afa124f5f1ddb41e6321 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Mar 2019 23:55:53 +0100
Subject: [PATCH 0878/1938] style

---
 client/crypto/asn1utils.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/client/crypto/asn1utils.c b/client/crypto/asn1utils.c
index 50d257d7e..87fdd8c9d 100644
--- a/client/crypto/asn1utils.c
+++ b/client/crypto/asn1utils.c
@@ -73,8 +73,7 @@ static bool print_cb(void *data, const struct tlv *tlv, int level, bool is_leaf)
 
 int asn1_print(uint8_t *asn1buf, size_t asn1buflen, char *indent) {
 
-    struct tlvdb *t = NULL;
-    t = tlvdb_parse_multi(asn1buf, asn1buflen);
+    struct tlvdb *t = tlvdb_parse_multi(asn1buf, asn1buflen);
     if (t) {
         tlvdb_visit(t, print_cb, NULL, 0);
         tlvdb_free(t);

From b7b7840ae142c437fa65ec13c8eadf0e75b23788 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Mar 2019 23:57:00 +0100
Subject: [PATCH 0879/1938] bool

---
 client/cmdlfio.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/cmdlfio.c b/client/cmdlfio.c
index d367515ee..df994b1a1 100644
--- a/client/cmdlfio.c
+++ b/client/cmdlfio.c
@@ -257,7 +257,7 @@ int CmdIOProxSim(const char *Cmd) {
     fc = param_get8(Cmd, 1);
     cn = param_get32ex(Cmd, 2, 0, 10);
 
-    if (!version | !fc || !cn) return usage_lf_io_sim();
+    if (!version || !fc || !cn) return usage_lf_io_sim();
 
     if ((cn & 0xFFFF) != cn) {
         cn &= 0xFFFF;
@@ -303,7 +303,7 @@ int CmdIOProxClone(const char *Cmd) {
     fc = param_get8(Cmd, 1);
     cn = param_get32ex(Cmd, 2, 0, 10);
 
-    if (!version | !fc || !cn) return usage_lf_io_clone();
+    if (!version || !fc || !cn) return usage_lf_io_clone();
 
     if ((cn & 0xFFFF) != cn) {
         cn &= 0xFFFF;

From 690400d145d1555a99b4f41e429dff56b9100090 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Mar 2019 23:57:44 +0100
Subject: [PATCH 0880/1938] style

---
 client/cmdlfem4x.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 89d602125..3f9a95c12 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -1244,7 +1244,7 @@ int CmdEM4x05Write(const char *Cmd) {
         PrintAndLogEx(NORMAL, "Writing address %d data %08X using password %08X", addr, data, pwd);
     }
 
-    uint16_t flag = (addr << 8) | usePwd;
+    uint16_t flag = (addr << 8) | (usePwd);
 
     UsbCommand c = {CMD_EM4X_WRITE_WORD, {flag, data, pwd}};
     clearCommandBuffer();

From fb9d34447e6b11ee0efdd7a9c8005a249933808d Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 18 Mar 2019 23:59:35 +0100
Subject: [PATCH 0881/1938] style

---
 client/cmdhfmf.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index b8e343b7c..451a704bf 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -1348,7 +1348,7 @@ int CmdHF14AMfNestedHard(const char *Cmd) {
         case 'r':
             fptr = GenerateFilename("hf-mf-", "-nonces.bin");
             if (fptr == NULL)
-                strncpy(filename, "nonces.bin", FILE_PATH_SIZE);
+                strncpy(filename, "nonces.bin", FILE_PATH_SIZE - 1);
             else
                 strncpy(filename, fptr, FILE_PATH_SIZE - 1);
 
@@ -1536,7 +1536,7 @@ int CmdHF14AMfChk_fast(const char *Cmd) {
     char buf[13];
     char *fptr;
     uint8_t tempkey[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
-    uint8_t *keyBlock = NULL, *p;
+    uint8_t *keyBlock, *p;
     uint8_t sectorsCnt = 1;
     int i, keycnt = 0;
     int clen = 0;
@@ -1784,7 +1784,7 @@ int CmdHF14AMfChk(const char *Cmd) {
     FILE *f;
     char filename[FILE_PATH_SIZE] = {0};
     char buf[13];
-    uint8_t *keyBlock = NULL, *p;
+    uint8_t *keyBlock, *p;
     sector_t *e_sector = NULL;
 
     uint8_t blockNo = 0;

From 8b8b67ac760ca14ded8bd041c674f1e0f3fc6aaa Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 19 Mar 2019 00:07:57 +0100
Subject: [PATCH 0882/1938] style

---
 common/crapto1/crapto1.c | 12 ++++++------
 common/crapto1/crypto1.c |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/crapto1/crapto1.c b/common/crapto1/crapto1.c
index 17355e162..417ac1c86 100644
--- a/common/crapto1/crapto1.c
+++ b/common/crapto1/crapto1.c
@@ -252,7 +252,7 @@ struct Crypto1State *lfsr_recovery64(uint32_t ks2, uint32_t ks3) {
             continue;
 
         for (j = 0; j < 19; ++j)
-            low = low << 1 | evenparity32(i & S1[j]);
+            low = low << 1 | (evenparity32(i & S1[j]));
         for (j = 0; j < 32; ++j)
             hi[j] = evenparity32(i & T1[j]);
 
@@ -265,17 +265,17 @@ struct Crypto1State *lfsr_recovery64(uint32_t ks2, uint32_t ks3) {
             }
 
             for (j = 0; j < 19; ++j)
-                win = win << 1 | evenparity32(*tail & S2[j]);
+                win = win << 1 | (evenparity32(*tail & S2[j]));
 
             win ^= low;
             for (j = 0; j < 32; ++j) {
-                win = win << 1 ^ hi[j] ^ evenparity32(*tail & T2[j]);
+                win = win << 1 ^ hi[j] ^ (evenparity32(*tail & T2[j]));
                 if (filter(win) != eks[j])
                     goto continue2;
             }
 
-            *tail = *tail << 1 | evenparity32(LF_POLY_EVEN & *tail);
-            sl->odd = *tail ^ evenparity32(LF_POLY_ODD & win);
+            *tail = *tail << 1 | (evenparity32(LF_POLY_EVEN & *tail));
+            sl->odd = *tail ^ (evenparity32(LF_POLY_ODD & win));
             sl->even = win;
             ++sl;
             sl->odd = sl->even = 0;
@@ -303,7 +303,7 @@ uint8_t lfsr_rollback_bit(struct Crypto1State *s, uint32_t in, int fb) {
     out ^= !!in;
     out ^= (ret = filter(s->odd)) & !!fb;
 
-    s->even |= evenparity32(out) << 23;
+    s->even |= (evenparity32(out)) << 23;
     return ret;
 }
 /** lfsr_rollback_byte
diff --git a/common/crapto1/crypto1.c b/common/crapto1/crypto1.c
index 0d30597cd..46e9fc239 100644
--- a/common/crapto1/crypto1.c
+++ b/common/crapto1/crypto1.c
@@ -72,7 +72,7 @@ uint8_t crypto1_bit(struct Crypto1State *s, uint8_t in, int is_encrypted) {
     feedin ^= !!in;
     feedin ^= LF_POLY_ODD & s->odd;
     feedin ^= LF_POLY_EVEN & s->even;
-    s->even = s->even << 1 | evenparity32(feedin);
+    s->even = s->even << 1 | (evenparity32(feedin));
 
     t = s->odd;
     s->odd = s->even;

From e3dbbd32718b5bd257494b71bac0f413150356d6 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 19 Mar 2019 00:11:32 +0100
Subject: [PATCH 0883/1938] style

---
 client/reveng/cli.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/client/reveng/cli.c b/client/reveng/cli.c
index 6aa4b5077..f715d66f7 100644
--- a/client/reveng/cli.c
+++ b/client/reveng/cli.c
@@ -522,10 +522,12 @@ uprog(const poly_t gpoly, int flags, unsigned long seq) {
     if (!seq)
         return;
     string = ptostr(gpoly, P_RTJUST, 4);
-    fprintf(stderr, "%s: searching: width=%ld  poly=0x%s  refin=%s  refout=%s\n",
-            myname, plen(gpoly), string,
-            (flags & P_REFIN ? "true" : "false"),
-            (flags & P_REFOUT ? "true" : "false")
+    fprintf(stderr, "%s: searching: width=%lu  poly=0x%s  refin=%s  refout=%s\n",
+            myname,
+            plen(gpoly),
+            string,
+            ((flags & P_REFIN) ? "true" : "false"),
+            ((flags & P_REFOUT) ? "true" : "false")
            );
     free(string);
 }

From f79c0075c44d30b1ba4dd35e2f940428e38daebd Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 19 Mar 2019 00:12:46 +0100
Subject: [PATCH 0884/1938] style

---
 client/reveng/model.c | 4 ++--
 client/reveng/poly.c  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/reveng/model.c b/client/reveng/model.c
index ba5e84f07..16a791312 100644
--- a/client/reveng/model.c
+++ b/client/reveng/model.c
@@ -113,8 +113,8 @@ char *mtostr(const model_t *model) {
         + strlen(strbuf)
         + (polystr && *polystr ? strlen(polystr) : 6)
         + (initstr && *initstr ? strlen(initstr) : 6)
-        + (model->flags & P_REFIN ? 4 : 5)
-        + (model->flags & P_REFOUT ? 4 : 5)
+        + ((model->flags & P_REFIN) ? 4 : 5)
+        + ((model->flags & P_REFOUT) ? 4 : 5)
         + (xorotstr && *xorotstr ? strlen(xorotstr) : 6)
         + (checkstr && *checkstr ? strlen(checkstr) : 6)
         + (magicstr && *magicstr ? strlen(magicstr) : 6)
diff --git a/client/reveng/poly.c b/client/reveng/poly.c
index 1a2ca958f..7e35be18c 100644
--- a/client/reveng/poly.c
+++ b/client/reveng/poly.c
@@ -1207,7 +1207,7 @@ prhex(char **spp, bmp_t bits, int flags, int bperhx) {
      * Set P_UPPER in flags to write A-F in uppercase.
      */
     static const char hex[] = "0123456789abcdef0123456789ABCDEF";
-    const int upper = (flags & P_UPPER ? 0x10 : 0);
+    const int upper = ((flags & P_UPPER) ? 0x10 : 0);
     while (bperhx > 0) {
         bperhx -= ((bperhx + 3) & 3) + 1;
         *(*spp)++ = hex[(bits >> bperhx & BMP_C(0xf)) | upper];

From ab226c28648bcca6a6270de9b1538774c22196a5 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 19 Mar 2019 10:20:10 +0100
Subject: [PATCH 0885/1938] detectST has better clock detection.   Since 'data
 raw am' fails but 'data detect a' succeed in finding a clock. Lets see if
 anything else breaks because of this?

---
 client/cmddata.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/client/cmddata.c b/client/cmddata.c
index 072e8a73e..b50d44649 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -458,7 +458,7 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
     uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
 
     sscanf(Cmd, "%i %i %i %i %c", &clk, &invert, &maxErr, &maxLen, &amp);
-
+    
     if (!maxLen) maxLen = BIGBUF_SIZE;
 
     if (invert != 0 && invert != 1) {
@@ -485,14 +485,13 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
     if (amp == 'a')
         askAmp(bits, BitLen);
 
-    bool st = false;
     size_t ststart = 0, stend = 0;
-    if (*stCheck)
-        st = DetectST(bits, &BitLen, &foundclk, &ststart, &stend);
-
+//    if (*stCheck)
+    bool st = DetectST(bits, &BitLen, &foundclk, &ststart, &stend);
+    clk = (clk == 0) ? foundclk : clk;
+    
     if (st) {
         *stCheck = st;
-        clk = (clk == 0) ? foundclk : clk;
         CursorCPos = ststart;
         CursorDPos = stend;
         if (verbose)
@@ -1607,8 +1606,7 @@ int CmdLoad(const char *Cmd) {
             break;
     }
 
-    if (f)
-        fclose(f);
+    fclose(f);
 
     PrintAndLogEx(SUCCESS, "loaded %d samples", GraphTraceLen);
 

From 42bbf6a761f24f4cc4d26a5dcf57bdcd4416fdb4 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 19 Mar 2019 10:26:36 +0100
Subject: [PATCH 0886/1938] style

---
 armsrc/apps.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/armsrc/apps.h b/armsrc/apps.h
index 62fce3931..b1a0969f3 100644
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -231,7 +231,7 @@ void HfSniff(int, int);
 
 //felica.c
 extern void felica_sendraw(UsbCommand *c);
-extern void felica_sniff(uint32_t samples, uint32_t triggers);
+extern void felica_sniff(uint32_t samplesToSkip, uint32_t triggersToSkip);
 extern void felica_sim_lite(uint64_t uid);
 extern void felica_dump_lite_s();
 

From a41d6fbfb2c7a46f3ade052d964331c9c4874807 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 19 Mar 2019 10:26:52 +0100
Subject: [PATCH 0887/1938] style

---
 armsrc/felica.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/armsrc/felica.c b/armsrc/felica.c
index 190960bd4..f220a8a24 100644
--- a/armsrc/felica.c
+++ b/armsrc/felica.c
@@ -611,13 +611,13 @@ void felica_sniff(uint32_t samplesToSkip, uint32_t triggersToSkip) {
 #define R_READBLK_LEN  0x21
 //simulate NFC Tag3 card - for now only poll response works
 // second half (4 bytes)  of NDEF2 goes into nfcid2_0, first into nfcid2_1
-void felica_sim_lite(uint64_t nfcid) {
+void felica_sim_lite(uint64_t uid) {
 
     int i, curlen = 0;
     uint8_t *curresp = 0;
 
     uint8_t ndef[8];
-    num_to_bytes(nfcid, 8, ndef);
+    num_to_bytes(uid, 8, ndef);
 
     //prepare our 3 responses...
     uint8_t resp_poll0[R_POLL0_LEN] = { 0xb2, 0x4d, 0x12, FELICA_POLL_ACK, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf1, 0x00, 0x00, 0x00, 0x01, 0x43, 0x00, 0xb3, 0x7f};

From 54a1d576eed93c5f07c9484e1aa01b281a14a121 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 19 Mar 2019 14:41:57 +0100
Subject: [PATCH 0888/1938] fix: better ASK strong /clipped clock detection.

---
 common/lfdemod.c | 48 ++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 44 insertions(+), 4 deletions(-)

diff --git a/common/lfdemod.c b/common/lfdemod.c
index eb7c629f5..3b4a3a30c 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -480,12 +480,25 @@ int DetectStrongAskClock(uint8_t *dest, size_t size, int high, int low, int *clo
     size_t startwave;
     size_t i = 100;
     size_t minClk = 512;
-    int shortestWaveIdx = 0;
+    uint16_t shortestWaveIdx = 0;
 
     // get to first full low to prime loop and skip incomplete first pulse
     getNextHigh(dest, size, high, &i);
     getNextLow(dest, size, low, &i);
 
+    // clock, numoftimes, first idx
+    uint16_t tmpclk[9][3] = {
+        {8,   0, 0}, 
+        {16,  0, 0}, 
+        {32,  0, 0}, 
+        {40,  0, 0}, 
+        {50,  0, 0}, 
+        {64,  0, 0}, 
+        {128, 0, 0},
+        {256, 0, 0}, 
+        {384, 0, 0},
+      };
+    
     // loop through all samples (well, we don't want to go out-of-bounds)
     while (i < size - 512) {
         // measure from low to low
@@ -499,11 +512,38 @@ int DetectStrongAskClock(uint8_t *dest, size_t size, int high, int low, int *clo
             minClk = i - startwave;
             shortestWaveIdx = startwave;
         }
+        
+        int foo = getClosestClock(minClk);
+        if (foo > 0 ) {
+            for (uint8_t i = 0; i < 9; i++) {
+                if ( tmpclk[i][0] == foo ) {
+                    tmpclk[i][1]++;
+                    
+                    if ( tmpclk[i][2] == 0) {
+                        tmpclk[i][2] = shortestWaveIdx;
+                    }
+                    break;
+                }
+            }
+        }
     }
 
-    // set clock
-    if (g_debugMode == 2) prnt("DEBUG ASK: DetectStrongAskClock smallest wave: %d", minClk);
-    *clock = getClosestClock(minClk);
+    // find the clock with most hits and it the first index it was encountered.
+    int max = 0;
+    for (uint8_t i = 0; i < 9; i++) {
+        if (g_debugMode == 2) {
+            prnt("DEBUG, ASK,  clocks %u | hits %u | idx %u"
+                    , tmpclk[i][0]
+                    , tmpclk[i][1]
+                    , tmpclk[i][2]
+                    );
+        }
+        if ( max < tmpclk[i][1] ) {
+            *clock = tmpclk[i][0];
+            shortestWaveIdx = tmpclk[i][2];
+            max = tmpclk[i][1];
+        }
+    }    
 
     if (*clock == 0)
         return -1;

From c8a805c99c65dde69e9da0da23988f048e5a5a10 Mon Sep 17 00:00:00 2001
From: vratiskol <vincent.ratiskol@github.com>
Date: Tue, 19 Mar 2019 17:09:16 +0100
Subject: [PATCH 0889/1938] LogTrace

---
 armsrc/mifaresim.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/armsrc/mifaresim.c b/armsrc/mifaresim.c
index adecf4cf9..2989ca63d 100644
--- a/armsrc/mifaresim.c
+++ b/armsrc/mifaresim.c
@@ -268,7 +268,6 @@ static void MifareSimInit(uint16_t flags, uint8_t *datain, tag_response_info_t *
 
         // UID 10B
         case 10:
-
             switch (MifareCardType) {
                 case 1:
                     memcpy(rATQA, rATQA_1k_10B, sizeof rATQA_1k_10B);
@@ -512,7 +511,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
             case MFEMUL_HALTED:
                 if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("MFEMUL_HALTED");
             case MFEMUL_IDLE: {
-                // LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);   Need to be convert ?
+                LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
                 if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("MFEMUL_IDLE");
                 break;
             }
@@ -712,6 +711,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                     if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("All commands must have exactly 4 bytes: receivedCmd_len=%d", receivedCmd_len);
                     break;
                 }
+                
                 bool encrypted_data = (cardAUTHKEY != AUTHKEYNONE) ;
                 if (encrypted_data) {
                     // decrypt seqence
@@ -740,14 +740,15 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
 
                     // first authentication
                     if (!encrypted_data) {
-                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Reader authenticating for block %d (0x%02x) with key %d", receivedCmd_dec[1], receivedCmd_dec[1], cardAUTHKEY);
                         crypto1_word(pcs, cuid ^ nonce, 0); //Update crypto state
                         num_to_bytes(nonce, 4, rAUTH_AT);   // Send nonce
+                        if (MF_DBGLEVEL >= 2) Dbprintf("Reader authenticating for block %d (0x%02x) with key %d - %s", receivedCmd_dec[1], receivedCmd_dec[1], cardAUTHKEY, emlGetKey(cardAUTHSC, cardAUTHKEY));
                     } else { // nested authentication
-                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Reader doing nested authentication for block %d (0x%02x) with key %d", receivedCmd_dec[1], receivedCmd_dec[1], cardAUTHKEY);
+                        if (MF_DBGLEVEL >= 2) Dbprintf("Reader doing nested authentication for block %d (0x%02x) with key %d", receivedCmd_dec[1], receivedCmd_dec[1], cardAUTHKEY);
                         ans = nonce ^ crypto1_word(pcs, cuid ^ nonce, 0);
                         num_to_bytes(ans, 4, rAUTH_AT);
                     }
+                    
                     EmSendCmd(rAUTH_AT, sizeof(rAUTH_AT));
                     cardSTATE = MFEMUL_AUTH1;
                     if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
@@ -816,7 +817,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                     AppendCrc14443a(response, 16);
                     mf_crypto1_encrypt(pcs, response, MAX_MIFARE_FRAME_SIZE, response_par);
                     EmSendCmdPar(response, MAX_MIFARE_FRAME_SIZE, response_par);
-                    if (MF_DBGLEVEL >= 2) {
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
                       Dbprintf("[EmSendCmdPar] Data Block[%d]: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", blockNo,
                       response[0], response[1], response[2], response[3],  response[4],  response[5],  response[6],
                       response[7], response[8], response[9], response[10], response[11], response[12], response[13],
@@ -829,7 +830,6 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                         finished = true;
                     }
 
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[ISO14443A_CMD_READBLOCK] Finish");
                     break;
                 }
 
@@ -911,7 +911,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
             case MFEMUL_AUTH1: {
                 if (receivedCmd_len != 8) {
                     cardSTATE_TO_IDLE();
-                    //LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                    LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
                     if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("MFEMUL_AUTH1: receivedCmd_len != 8 => cardSTATE_TO_IDLE())");
                     break;
                 }
@@ -1050,7 +1050,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                     }
                 } else {
                     cardSTATE_TO_IDLE();
-                    // LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                    LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
                 }
                 break;
             }

From 8e465d076cda98c9a193bcb12e285c8a1311d791 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 19 Mar 2019 17:53:42 +0100
Subject: [PATCH 0890/1938] chg: use found clock is common

---
 client/cmddata.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/client/cmddata.c b/client/cmddata.c
index b50d44649..72cab3755 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -482,13 +482,19 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
     int foundclk = 0;
 
     //amplify signal before ST check
-    if (amp == 'a')
+    if (amp == 'a') {
         askAmp(bits, BitLen);
-
+    }
+        
     size_t ststart = 0, stend = 0;
 //    if (*stCheck)
     bool st = DetectST(bits, &BitLen, &foundclk, &ststart, &stend);
-    clk = (clk == 0) ? foundclk : clk;
+
+    if ( clk == 0 ) {
+        if ( foundclk == 32 || foundclk == 64 ) {
+            clk = foundclk;
+        }
+    }
     
     if (st) {
         *stCheck = st;

From 1650889d255f36437741371bcf94aa86974b2fb0 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 19 Mar 2019 17:53:58 +0100
Subject: [PATCH 0891/1938] chg: also detect RF/100

---
 common/lfdemod.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/common/lfdemod.c b/common/lfdemod.c
index 3b4a3a30c..1300a1822 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -311,10 +311,10 @@ size_t findModStart(uint8_t *src, size_t size, uint8_t expWaveSize) {
 }
 
 int getClosestClock(int testclk) {
-    uint16_t clocks[] = {8, 16, 32, 40, 50, 64, 128, 256, 384};
-    uint8_t limit[]  = {1,  2,  4,  4,  5,  8,   8,   8,   8};
+    uint16_t clocks[] = {8, 16, 32, 40, 50, 64, 100, 128, 256, 384};
+    uint8_t limit[]  = {1,  2,  4,  4,  5,  8,   8,   8,   8,   8};
 
-    for (uint8_t i = 0; i < 9; i++)
+    for (uint8_t i = 0; i < 100; i++)
         if (testclk >= clocks[i] - limit[i] && testclk <= clocks[i] + limit[i])
             return clocks[i];
 
@@ -487,13 +487,14 @@ int DetectStrongAskClock(uint8_t *dest, size_t size, int high, int low, int *clo
     getNextLow(dest, size, low, &i);
 
     // clock, numoftimes, first idx
-    uint16_t tmpclk[9][3] = {
+    uint16_t tmpclk[10][3] = {
         {8,   0, 0}, 
         {16,  0, 0}, 
         {32,  0, 0}, 
         {40,  0, 0}, 
         {50,  0, 0}, 
         {64,  0, 0}, 
+        {100, 0, 0}, 
         {128, 0, 0},
         {256, 0, 0}, 
         {384, 0, 0},
@@ -515,7 +516,7 @@ int DetectStrongAskClock(uint8_t *dest, size_t size, int high, int low, int *clo
         
         int foo = getClosestClock(minClk);
         if (foo > 0 ) {
-            for (uint8_t i = 0; i < 9; i++) {
+            for (uint8_t i = 0; i < 10; i++) {
                 if ( tmpclk[i][0] == foo ) {
                     tmpclk[i][1]++;
                     
@@ -530,7 +531,7 @@ int DetectStrongAskClock(uint8_t *dest, size_t size, int high, int low, int *clo
 
     // find the clock with most hits and it the first index it was encountered.
     int max = 0;
-    for (uint8_t i = 0; i < 9; i++) {
+    for (uint8_t i = 0; i < 10; i++) {
         if (g_debugMode == 2) {
             prnt("DEBUG, ASK,  clocks %u | hits %u | idx %u"
                     , tmpclk[i][0]

From 3c32fa9f38eecace6ceb4e4fa7d4f51b00f723ae Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 20 Mar 2019 12:37:10 +0100
Subject: [PATCH 0892/1938] color

---
 client/cmdhflist.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdhflist.c b/client/cmdhflist.c
index 504456a11..592720ac1 100644
--- a/client/cmdhflist.c
+++ b/client/cmdhflist.c
@@ -216,7 +216,7 @@ int applyIso14443a(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize) {
             break;
         case MIFARE_ULEV1_AUTH:
             if (cmdsize == 7)
-                snprintf(exp, size, "PWD-AUTH KEY: 0x%02x%02x%02x%02x", cmd[1], cmd[2], cmd[3], cmd[4]);
+                snprintf(exp, size, "PWD-AUTH KEY: " _YELLOW_("0x%02x%02x%02x%02x"), cmd[1], cmd[2], cmd[3], cmd[4]);
             else
                 snprintf(exp, size, "PWD-AUTH");
             break;

From 2534d0200074195a005a3bd4762e32e37840aa21 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 20 Mar 2019 22:04:35 +0100
Subject: [PATCH 0893/1938] text

---
 client/cmdlft55xx.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 434e46ff3..ec53c8a68 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -144,15 +144,15 @@ int usage_t55xx_wakup() {
 int usage_t55xx_chk() {
     PrintAndLogEx(NORMAL, "This command uses a dictionary attack");
     PrintAndLogEx(NORMAL, "press 'enter' to cancel the command");
-    PrintAndLogEx(NORMAL, "Usage: lf t55xx bruteforce [h] <m> [i <*.dic>]");
+    PrintAndLogEx(NORMAL, "Usage: lf t55xx chk [h] <m> [i <*.dic>]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "     h           - this help");
     PrintAndLogEx(NORMAL, "     m           - use dictionary from flashmemory\n");
     PrintAndLogEx(NORMAL, "     i <*.dic>   - loads a default keys dictionary file <*.dic>");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
-    PrintAndLogEx(NORMAL, "       lf t55xx bruteforce m");
-    PrintAndLogEx(NORMAL, "       lf t55xx bruteforce i default_pwd.dic");
+    PrintAndLogEx(NORMAL, "       lf t55xx chk m");
+    PrintAndLogEx(NORMAL, "       lf t55xx chk i default_pwd.dic");
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
@@ -1770,11 +1770,15 @@ int CmdT55xxChkPwds(const char *Cmd) {
 
             PrintAndLogEx(INFO, "Testing %08X", testpwd);
 
+            AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, testpwd);
+            
+            /*
             if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, testpwd)) {
                 PrintAndLogEx(INFO, "Aquireing data from device failed. Quitting");
                 free(keyBlock);
                 return 0;
             }
+*/
 
             found = tryDetectModulation();
             if (found)

From b111b37eb62c1f25aad8c5fd5c462aa1a748e8af Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 20 Mar 2019 22:05:29 +0100
Subject: [PATCH 0894/1938] offline access

---
 client/cmdlfem4x.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 3f9a95c12..e6da5da33 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -1486,8 +1486,8 @@ int CmdEM4x05Info(const char *Cmd) {
 static command_t CommandTable[] = {
     {"help",        CmdHelp,              1, "This help"},
     //{"410x_demod",  CmdEMdemodASK,        0, "Extract ID from EM410x tag on antenna)"},
-    {"410x_demod",  CmdEM410xDemod,       0, "demodulate a EM410x tag from the GraphBuffer"},
-    {"410x_read",   CmdEM410xRead,        1, "attempt to read and extract tag data"},
+    {"410x_demod",  CmdEM410xDemod,       1, "demodulate a EM410x tag from the GraphBuffer"},
+    {"410x_read",   CmdEM410xRead,        0, "attempt to read and extract tag data"},
     {"410x_sim",    CmdEM410xSim,         0, "simulate EM410x tag"},
     {"410x_brute",  CmdEM410xBrute,       0, "reader bruteforce attack by simulating EM410x tags"},
     {"410x_watch",  CmdEM410xWatch,       0, "watches for EM410x 125/134 kHz tags (option 'h' for 134)"},

From 1a871c040f94890a8f4ff38f175f3abff7e679ef Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 20 Mar 2019 22:10:34 +0100
Subject: [PATCH 0895/1938] only 10 clocks..

---
 common/lfdemod.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/common/lfdemod.c b/common/lfdemod.c
index 1300a1822..aed21fbf7 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -314,7 +314,7 @@ int getClosestClock(int testclk) {
     uint16_t clocks[] = {8, 16, 32, 40, 50, 64, 100, 128, 256, 384};
     uint8_t limit[]  = {1,  2,  4,  4,  5,  8,   8,   8,   8,   8};
 
-    for (uint8_t i = 0; i < 100; i++)
+    for (uint8_t i = 0; i < 10; i++)
         if (testclk >= clocks[i] - limit[i] && testclk <= clocks[i] + limit[i])
             return clocks[i];
 
@@ -486,6 +486,9 @@ int DetectStrongAskClock(uint8_t *dest, size_t size, int high, int low, int *clo
     getNextHigh(dest, size, high, &i);
     getNextLow(dest, size, low, &i);
 
+    if (i == size)
+        return -1;
+    
     // clock, numoftimes, first idx
     uint16_t tmpclk[10][3] = {
         {8,   0, 0}, 
@@ -1398,7 +1401,7 @@ int BiphaseRawDecode(uint8_t *bits, size_t *size, int *offset, int invert) {
 //by marshmellow
 //take 10 and 01 and manchester decode
 //run through 2 times and take least errCnt
-// "7" indicates 00 or 11 wrong bit
+// "," indicates 00 or 11 wrong bit
 int manrawdecode(uint8_t *bits, size_t *size, uint8_t invert, uint8_t *alignPos) {
 
     // sanity check

From ffdd91cab6263b4eb1cba362b2fbd0087a96ab76 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 21 Mar 2019 12:53:05 +0100
Subject: [PATCH 0896/1938] add: 'hf 14a info' - uid changeable tests,  finds
 two kinds of Gen2 / CUID.  4byte / 7byte but there other Gen2 cards which
 will not be detected by this.

---
 armsrc/mifarecmd.c         | 48 ++++++++++++++++++++------------------
 client/mifare/mifarehost.c |  4 +++-
 2 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index 9e771679b..3dcd15131 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -1933,13 +1933,18 @@ void MifareCIdent() {
     uint8_t isGen = 0;
     uint8_t rec[1] = {0x00};
     uint8_t recpar[1] = {0x00};
-
+    uint8_t rats[4] = { ISO14443A_CMD_RATS, 0x80, 0x31, 0x73 };
+    uint8_t *par = BigBuf_malloc(MAX_PARITY_SIZE);
+    uint8_t *buf = BigBuf_malloc(USB_CMD_DATA_SIZE);
+    uint8_t *uid = BigBuf_malloc(10);
+    uint32_t cuid = 0;
+    
     iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
 
     // Generation 1 test
     ReaderTransmitBitsPar(wupC1, 7, NULL, NULL);
     if (!ReaderReceive(rec, recpar) || (rec[0] != 0x0a)) {
-        goto TEST2;
+        goto TEST2;         
     };
     isGen = GEN_1B;
 
@@ -1951,32 +1956,29 @@ void MifareCIdent() {
     goto OUT;
 
 TEST2:
-    ;
-    /*
-        // Generation 2 test
-
-        // halt previous.
-        mifare_classic_halt(NULL, 0);
-
-        //select
-        if (!iso14443a_select_card(NULL, NULL, NULL, true, 0, true)) {
-            goto OUT;
-        };
-
-        // MIFARE_CLASSIC_WRITEBLOCK 0xA0
-        // ACK 0x0a
-        uint16_t len = mifare_sendcmd_short(null, 1, 0xA0, 0, rec, recpar, NULL);
-        if ((len != 1) || (rec[0] != 0x0A)) {
+    // reset card
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    SpinDelay(100);
+    iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+    
+    int res = iso14443a_select_card(uid, NULL, &cuid, true, 0, true);
+    if ( res == 2 ) {
+        ReaderTransmit(rats, sizeof(rats), NULL);      
+        res = ReaderReceive(buf, par);
+        if (memcmp(buf, "\x09\x78\x00\x91\x02\xDA\xBC\x19\x10\xF0\x05", 11) == 0) {
             isGen = GEN_2;
-        };
-        */
+            goto OUT;
+        }
+        if (memcmp(buf, "\x0D\x78\x00\x71\x02\x88\x49\xA1\x30\x20\x15\x06\x08\x56\x3D", 15) == 0) {
+            isGen = GEN_2;
+        }
+    };
+    
 OUT:
-    ;
-    // removed the if,  since some magic tags misbehavies and send an answer to it.
-    mifare_classic_halt_ex(NULL);
     cmd_send(CMD_ACK, isGen, 0, 0, 0, 0);
     // turns off
     OnSuccessMagic();
+    BigBuf_free();
 }
 
 void OnSuccessMagic() {
diff --git a/client/mifare/mifarehost.c b/client/mifare/mifarehost.c
index 052129928..9c99f95a3 100644
--- a/client/mifare/mifarehost.c
+++ b/client/mifare/mifarehost.c
@@ -1027,7 +1027,9 @@ void detect_classic_magic(void) {
         case 2:
             PrintAndLogEx(SUCCESS, "Answers to magic commands (GEN 1b): " _GREEN_("YES"));
             break;
-        //case 4: PrintAndLogEx(SUCCESS, "Answers to magic commands (GEN 2): "  _GREEN_("YES")); break;
+        case 4:
+            PrintAndLogEx(SUCCESS, "Answers to magic commands (GEN 2 / CUID): "  _GREEN_("YES"));
+            break;
         default:
             PrintAndLogEx(INFO, "Answers to magic commands: " _YELLOW_("NO"));
             break;

From ca9061bd32a7ef20620c94f27fdbd4a2270a652c Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 21 Mar 2019 15:19:18 +0100
Subject: [PATCH 0897/1938] changed byte_t -> uint8_t

---
 armsrc/Standalone/hf_colin.c    |  6 +++---
 armsrc/Standalone/hf_mattyrun.c |  2 +-
 armsrc/appmain.c                |  6 +++---
 armsrc/hitagS.c                 |  4 ++--
 armsrc/iso14443a.c              |  2 +-
 armsrc/mifarecmd.c              | 32 ++++++++++++++++----------------
 armsrc/mifareutil.c             |  2 +-
 bootrom/bootrom.c               |  4 ++--
 client/lualibs/read14a.lua      | 12 ++++++------
 client/lualibs/read14b.lua      | 10 +++++-----
 common/usb_cdc.c                |  6 +++---
 common/usb_cdc.h                |  4 ++--
 include/mifare.h                | 22 +++++++++++-----------
 13 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/armsrc/Standalone/hf_colin.c b/armsrc/Standalone/hf_colin.c
index 46a9a2dfc..e6ac015fc 100644
--- a/armsrc/Standalone/hf_colin.c
+++ b/armsrc/Standalone/hf_colin.c
@@ -807,8 +807,8 @@ void e_MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *dat
     struct Crypto1State *pcs;
     pcs = &mpcs;
 
-    byte_t dataoutbuf[16];
-    byte_t dataoutbuf2[16];
+    uint8_t dataoutbuf[16];
+    uint8_t dataoutbuf2[16];
 
     iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
 
@@ -1006,7 +1006,7 @@ int saMifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *data
     uint8_t wipeC[] = {0x41};
 
     // variables
-    byte_t isOK = 0;
+    uint8_t isOK = 0;
     uint8_t d_block[18] = {0x00};
 
     uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];
diff --git a/armsrc/Standalone/hf_mattyrun.c b/armsrc/Standalone/hf_mattyrun.c
index 2945a5fbd..31243739b 100644
--- a/armsrc/Standalone/hf_mattyrun.c
+++ b/armsrc/Standalone/hf_mattyrun.c
@@ -59,7 +59,7 @@ static int saMifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_
     uint8_t wipeC[] = {0x41};
 
     // variables
-    byte_t isOK = 0;
+    uint8_t isOK = 0;
     uint8_t d_block[18] = {0x00};
 
     uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];
diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index aecfee076..9abb309bf 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -769,16 +769,16 @@ void UsbPacketReceived(uint8_t *packet, int len) {
             SniffHitag(c->arg[0]);
             break;
         case CMD_SIMULATE_HITAG: // Simulate Hitag tag, args = memory content
-            SimulateHitagTag((bool)c->arg[0], (byte_t *)c->d.asBytes);
+            SimulateHitagTag((bool)c->arg[0], c->d.asBytes);
             break;
         case CMD_READER_HITAG: // Reader for Hitag tags, args = type and function
             ReaderHitag((hitag_function)c->arg[0], (hitag_data *)c->d.asBytes);
             break;
         case CMD_SIMULATE_HITAG_S:// Simulate Hitag s tag, args = memory content
-            SimulateHitagSTag((bool)c->arg[0], (byte_t *)c->d.asBytes);
+            SimulateHitagSTag((bool)c->arg[0], c->d.asBytes);
             break;
         case CMD_TEST_HITAGS_TRACES:// Tests every challenge within the given file
-            check_challenges((bool)c->arg[0], (byte_t *)c->d.asBytes);
+            check_challenges((bool)c->arg[0], c->d.asBytes);
             break;
         case CMD_READ_HITAG_S: //Reader for only Hitag S tags, args = key or challenge
             ReadHitagS((hitag_function)c->arg[0], (hitag_data *)c->d.asBytes);
diff --git a/armsrc/hitagS.c b/armsrc/hitagS.c
index 5fece9d26..cd9573243 100644
--- a/armsrc/hitagS.c
+++ b/armsrc/hitagS.c
@@ -19,7 +19,7 @@
 static bool bQuiet;
 static bool bSuccessful;
 static struct hitagS_tag tag;
-static byte_t page_to_be_written = 0;
+static uint8_t page_to_be_written = 0;
 static int block_data_left = 0;
 
 typedef enum modulation {
@@ -33,7 +33,7 @@ static MOD m = AC2K;               // used modulation
 static uint32_t temp_uid;
 static int temp2 = 0;
 static int sof_bits;               // number of start-of-frame bits
-static byte_t pwdh0, pwdl0, pwdl1; // password bytes
+static uint8_t pwdh0, pwdl0, pwdl1; // password bytes
 static uint32_t rnd = 0x74124485;  // randomnumber
 static int test = 0;
 size_t blocknr;
diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 10a428e62..3e53468de 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -1978,7 +1978,7 @@ static int GetATQA(uint8_t *resp, uint8_t *resp_par) {
 // if anticollision is false, then the UID must be provided in uid_ptr[]
 // and num_cascades must be set (1: 4 Byte UID, 2: 7 Byte UID, 3: 10 Byte UID)
 // requests ATS unless no_rats is true
-int iso14443a_select_card(byte_t *uid_ptr, iso14a_card_select_t *p_card, uint32_t *cuid_ptr, bool anticollision, uint8_t num_cascades, bool no_rats) {
+int iso14443a_select_card(uint8_t *uid_ptr, iso14a_card_select_t *p_card, uint32_t *cuid_ptr, bool anticollision, uint8_t num_cascades, bool no_rats) {
 
     uint8_t sel_all[]    = { ISO14443A_CMD_ANTICOLL_OR_SELECT, 0x20 };
     uint8_t sel_uid[]    = { ISO14443A_CMD_ANTICOLL_OR_SELECT, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index 3dcd15131..65f0bdb22 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -46,8 +46,8 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
     ui64Key = bytes_to_num(datain, 6);
 
     // variables
-    byte_t isOK = 0;
-    byte_t dataoutbuf[16] = {0x00};
+    uint8_t isOK = 0;
+    uint8_t dataoutbuf[16] = {0x00};
     uint8_t uid[10] = {0x00};
     uint32_t cuid = 0;
     struct Crypto1State mpcs = {0, 0};
@@ -137,7 +137,7 @@ void MifareUC_Auth(uint8_t arg0, uint8_t *keybytes) {
 // datain = PWD bytes,
 void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain) {
     uint8_t blockNo = arg0;
-    byte_t dataout[16] = {0x00};
+    uint8_t dataout[16] = {0x00};
     bool useKey = (arg1 == 1); //UL_C
     bool usePwd = (arg1 == 2); //UL_EV1/NTAG
 
@@ -206,8 +206,8 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
     ui64Key = bytes_to_num(datain, 6);
 
     // variables
-    byte_t isOK = 0;
-    byte_t dataoutbuf[16 * 16];
+    uint8_t isOK = 0;
+    uint8_t dataoutbuf[16 * 16];
     uint8_t uid[10] = {0x00};
     uint32_t cuid = 0;
     struct Crypto1State mpcs = {0, 0};
@@ -368,13 +368,13 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
     uint8_t blockNo = arg0;
     uint8_t keyType = arg1;
     uint64_t ui64Key = 0;
-    byte_t blockdata[16] = {0x00};
+    uint8_t blockdata[16] = {0x00};
 
     ui64Key = bytes_to_num(datain, 6);
     memcpy(blockdata, datain + 10, 16);
 
     // variables
-    byte_t isOK = 0;
+    uint8_t isOK = 0;
     uint8_t uid[10] = {0x00};
     uint32_t cuid = 0;
     struct Crypto1State mpcs = {0, 0};
@@ -430,7 +430,7 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
 void MifareUWriteBlockCompat(uint8_t arg0, uint8_t *datain)
 {
     uint8_t blockNo = arg0;
-    byte_t blockdata[16] = {0x00};
+    uint8_t blockdata[16] = {0x00};
 
     memcpy(blockdata, datain, 16);
 
@@ -477,7 +477,7 @@ void MifareUWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain) {
     uint8_t blockNo = arg0;
     bool useKey = (arg1 == 1); //UL_C
     bool usePwd = (arg1 == 2); //UL_EV1/NTAG
-    byte_t blockdata[4] = {0x00};
+    uint8_t blockdata[4] = {0x00};
 
     memcpy(blockdata, datain, 4);
 
@@ -539,7 +539,7 @@ void MifareUWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain) {
 void MifareUSetPwd(uint8_t arg0, uint8_t *datain) {
 
     uint8_t pwd[16] = {0x00};
-    byte_t blockdata[4] = {0x00};
+    uint8_t blockdata[4] = {0x00};
 
     memcpy(pwd, datain, 16);
 
@@ -1630,7 +1630,7 @@ void MifareEMemSet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)
 
 void MifareEMemGet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain) {
     FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-    byte_t buf[USB_CMD_DATA_SIZE] = {0x00};
+    uint8_t buf[USB_CMD_DATA_SIZE] = {0x00};
     emlGetMem(buf, arg0, arg1); // data, block num, blocks count (max 4)
 
     LED_B_ON();
@@ -1652,8 +1652,8 @@ void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
     pcs = &mpcs;
 
     // variables
-    byte_t dataoutbuf[16] = {0x00};
-    byte_t dataoutbuf2[16] = {0x00};
+    uint8_t dataoutbuf[16] = {0x00};
+    uint8_t dataoutbuf2[16] = {0x00};
     uint8_t uid[10] = {0x00};
 
     LED_A_ON();
@@ -2053,7 +2053,7 @@ void MifareSetMod(uint8_t mod, uint8_t *key) {
 // DESFIRE
 //
 void Mifare_DES_Auth1(uint8_t arg0, uint8_t *datain) {
-    byte_t dataout[12] = {0x00};
+    uint8_t dataout[12] = {0x00};
     uint8_t uid[10] = {0x00};
     uint32_t cuid = 0;
 
@@ -2081,8 +2081,8 @@ void Mifare_DES_Auth1(uint8_t arg0, uint8_t *datain) {
 void Mifare_DES_Auth2(uint32_t arg0, uint8_t *datain) {
     uint32_t cuid = arg0;
     uint8_t key[16] = {0x00};
-    byte_t dataout[12] = {0x00};
-    byte_t isOK = 0;
+    uint8_t dataout[12] = {0x00};
+    uint8_t isOK = 0;
 
     memcpy(key, datain, 16);
 
diff --git a/armsrc/mifareutil.c b/armsrc/mifareutil.c
index f61987f09..01f56f776 100644
--- a/armsrc/mifareutil.c
+++ b/armsrc/mifareutil.c
@@ -384,7 +384,7 @@ int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t bl
     uint16_t len = 0;
     uint32_t pos = 0;
     uint8_t par[3] = {0x00, 0x00, 0x00}; // enough for 18 Bytes to send
-    byte_t res = 0;
+    uint8_t res = 0;
 
     uint8_t d_block[18], d_block_enc[18];
     uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};
diff --git a/bootrom/bootrom.c b/bootrom/bootrom.c
index 2b5c49e78..53a33f525 100644
--- a/bootrom/bootrom.c
+++ b/bootrom/bootrom.c
@@ -16,11 +16,11 @@ extern char _bootrom_start, _bootrom_end, _flash_start, _flash_end;
 extern uint32_t _osimage_entry;
 
 void DbpString(char *str) {
-    byte_t len = 0;
+    uint8_t len = 0;
     while (str[len] != 0x00)
         len++;
 
-    cmd_send(CMD_DEBUG_PRINT_STRING, len, 0, 0, (byte_t *)str, len);
+    cmd_send(CMD_DEBUG_PRINT_STRING, len, 0, 0, (uint8_t *)str, len);
 }
 
 static void ConfigClocks(void) {
diff --git a/client/lualibs/read14a.lua b/client/lualibs/read14a.lua
index 8ed87f5eb..8e8ac594a 100644
--- a/client/lualibs/read14a.lua
+++ b/client/lualibs/read14a.lua
@@ -54,12 +54,12 @@ local function parse14443a(data)
     Based on this struct :
 
     typedef struct {
-        byte_t uid[10];
-        byte_t uidlen;
-        byte_t atqa[2];
-        byte_t sak;
-        byte_t ats_len;
-        byte_t ats[256];
+        uint8_t uid[10];
+        uint8_t uidlen;
+        uint8_t atqa[2];
+        uint8_t sak;
+        uint8_t ats_len;
+        uint8_t ats[256];
     } __attribute__((__packed__)) iso14a_card_select_t;
 
     --]]
diff --git a/client/lualibs/read14b.lua b/client/lualibs/read14b.lua
index 2ee86c378..59e451ba4 100644
--- a/client/lualibs/read14b.lua
+++ b/client/lualibs/read14b.lua
@@ -31,11 +31,11 @@ local function parse1443b(data)
     Based on this struct :
 
     typedef struct {
-        byte_t uid[10];
-        byte_t uidlen;
-        byte_t atqb[7];
-        byte_t chipid;
-        byte_t cid;
+        uint8_t uid[10];
+        uint8_t uidlen;
+        uint8_t atqb[7];
+        uint8_t chipid;
+        uint8_t cid;
     } __attribute__((__packed__)) iso14b_card_select_t;
 
     --]]
diff --git a/common/usb_cdc.c b/common/usb_cdc.c
index e928b1b06..010d9d2b7 100644
--- a/common/usb_cdc.c
+++ b/common/usb_cdc.c
@@ -612,7 +612,7 @@ bool usb_poll_validate_length() {
 //* \fn    usb_read
 //* \brief Read available data from Endpoint 1 OUT (host to device)
 //*----------------------------------------------------------------------------
-uint32_t usb_read(byte_t *data, size_t len) {
+uint32_t usb_read(uint8_t *data, size_t len) {
 
     if (len == 0) return 0;
 
@@ -650,7 +650,7 @@ uint32_t usb_read(byte_t *data, size_t len) {
 //* \fn    usb_write
 //* \brief Send through endpoint 2 (device to host)
 //*----------------------------------------------------------------------------
-uint32_t usb_write(const byte_t *data, const size_t len) {
+uint32_t usb_write(const uint8_t *data, const size_t len) {
 
     if (!len) return 0;
     if (!usb_check()) return 0;
@@ -773,7 +773,7 @@ void AT91F_USB_SendStall(AT91PS_UDP pUdp) {
 //* 2. mixed with CDC ACM endpoint3 , interrupt, control endpoint
 //*----------------------------------------------------------------------------
 void AT91F_CDC_Enumerate() {
-    byte_t bmRequestType, bRequest;
+    uint8_t bmRequestType, bRequest;
     uint16_t wValue, wIndex, wLength, wStatus;
 
     if (!(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_RXSETUP))
diff --git a/common/usb_cdc.h b/common/usb_cdc.h
index d364a9b3a..1e735faa6 100644
--- a/common/usb_cdc.h
+++ b/common/usb_cdc.h
@@ -46,8 +46,8 @@ extern void usb_enable();
 extern bool usb_check();
 extern bool usb_poll();
 extern bool usb_poll_validate_length();
-extern uint32_t usb_read(byte_t *data, size_t len);
-extern uint32_t usb_write(const byte_t *data, const size_t len);
+extern uint32_t usb_read(uint8_t *data, size_t len);
+extern uint32_t usb_write(const uint8_t *data, const size_t len);
 
 extern void SetUSBreconnect(int value);
 extern int GetUSBreconnect(void);
diff --git a/include/mifare.h b/include/mifare.h
index ae5500986..68bc700b3 100644
--- a/include/mifare.h
+++ b/include/mifare.h
@@ -23,12 +23,12 @@
 // ISO 14443A
 //-----------------------------------------------------------------------------
 typedef struct {
-    byte_t uid[10];
-    byte_t uidlen;
-    byte_t atqa[2];
-    byte_t sak;
-    byte_t ats_len;
-    byte_t ats[256];
+    uint8_t uid[10];
+    uint8_t uidlen;
+    uint8_t atqa[2];
+    uint8_t sak;
+    uint8_t ats_len;
+    uint8_t ats[256];
 } __attribute__((__packed__)) iso14a_card_select_t;
 
 typedef enum ISO14A_COMMAND {
@@ -56,11 +56,11 @@ typedef struct {
 // ISO 14443B
 //-----------------------------------------------------------------------------
 typedef struct {
-    byte_t uid[10];
-    byte_t uidlen;
-    byte_t atqb[7];
-    byte_t chipid;
-    byte_t cid;
+    uint8_t uid[10];
+    uint8_t uidlen;
+    uint8_t atqb[7];
+    uint8_t chipid;
+    uint8_t cid;
 } __attribute__((__packed__)) iso14b_card_select_t;
 
 typedef enum ISO14B_COMMAND {

From 55b8b8df827841f0c9287877322f6b515f20fed7 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 23 Mar 2019 19:06:52 +0100
Subject: [PATCH 0898/1938] fix: 'lf pyramid demod' - inverted chg: checksum
 colors

---
 client/cmdlfpyramid.c | 12 +++++++-----
 client/cmdlfti.c      |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c
index bcf5ab672..bbdfc408b 100644
--- a/client/cmdlfpyramid.c
+++ b/client/cmdlfpyramid.c
@@ -55,7 +55,7 @@ int detectPyramid(uint8_t *dest, size_t *size, int *waveStartIdx) {
     if (getSignalProperties()->isnoise) return -2;
 
     // FSK demodulator RF/50 FSK 10,8
-    *size = fskdemod(dest, *size, 50, 0, 10, 8, waveStartIdx);  // pyramid fsk2
+    *size = fskdemod(dest, *size, 50, 1, 10, 8, waveStartIdx);  // pyramid fsk2
 
     //did we get a good demod?
     if (*size < 128) return -3;
@@ -235,11 +235,13 @@ int CmdPyramidDemod(const char *Cmd) {
             PrintAndLogEx(SUCCESS, "Pyramid ID Found - BitLength: %d -unknown BitLength- (%d), Raw: %08x%08x%08x%08x", fmtLen, cardnum, rawHi3, rawHi2, rawHi, rawLo);
         }
     }
-    if (checksum == checkCS)
-        PrintAndLogEx(SUCCESS, "Checksum %02x passed", checksum);
-    else
-        PrintAndLogEx(FAILED, "Checksum %02x failed - should have been %02x", checksum, checkCS);
 
+    PrintAndLogEx(SUCCESS, "Checksum : 0x%02X - %02X - %s"
+        , checksum
+        , checkCS
+        , (checksum == checkCS) ? _GREEN_("Passed") : _RED_("Failed")
+        );
+        
     PrintAndLogEx(DEBUG, "DEBUG: Pyramid: idx: %d, Len: %d, Printing Demod Buffer:", idx, 128);
     if (g_debugMode)
         printDemodBuff();
diff --git a/client/cmdlfti.c b/client/cmdlfti.c
index 5d3c2e399..dcf63125c 100644
--- a/client/cmdlfti.c
+++ b/client/cmdlfti.c
@@ -254,7 +254,7 @@ int CmdTIDemod(const char *Cmd) {
 
         //crc =  crc16_ccitt(message, sizeof(message);
 
-        char *crcStr = (crc == (shift2 & 0xFFFF)) ? "Passed" : "Failed";
+        char *crcStr = (crc == (shift2 & 0xFFFF)) ? _GREEN_("Passed") : _RED_("Failed");
 
         PrintAndLogEx(INFO, "Tag data = %08X%08X  [Crc %04X %s]", shift1, shift0, crc, crcStr);
 

From cfb11adeb8e1b662d62dc662b0fea484feb4869e Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 23 Mar 2019 19:08:22 +0100
Subject: [PATCH 0899/1938] simple check

---
 client/cmdlfparadox.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/cmdlfparadox.c b/client/cmdlfparadox.c
index 02ff02005..23d45bc27 100644
--- a/client/cmdlfparadox.c
+++ b/client/cmdlfparadox.c
@@ -147,8 +147,8 @@ int CmdParadoxRead(const char *Cmd) {
 
 int CmdParadoxSim(const char *Cmd) {
 
-    char cmdp = param_getchar(Cmd, 0);
-    if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_paradox_sim();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_paradox_sim();
 
     uint32_t facilitycode = 0, cardnumber = 0, fc = 0, cn = 0;
 

From 08dc8ab695db3e600858d41ffabde0e9eb7149d0 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 23 Mar 2019 19:09:37 +0100
Subject: [PATCH 0900/1938] debug

---
 client/cmdlfpyramid.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c
index bbdfc408b..a2f5942ad 100644
--- a/client/cmdlfpyramid.c
+++ b/client/cmdlfpyramid.c
@@ -236,7 +236,7 @@ int CmdPyramidDemod(const char *Cmd) {
         }
     }
 
-    PrintAndLogEx(SUCCESS, "Checksum : 0x%02X - %02X - %s"
+    PrintAndLogEx(DEBUG, "DEBUG: Pyramid: checksum : 0x%02X - %02X - %s"
         , checksum
         , checkCS
         , (checksum == checkCS) ? _GREEN_("Passed") : _RED_("Failed")

From 44c3a0a8aada7670278fe432faf909a97bdf99cb Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 24 Mar 2019 19:50:53 +0100
Subject: [PATCH 0901/1938] chg: 'lf keri demod' - added stopbits

---
 client/cmdlfkeri.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/client/cmdlfkeri.c b/client/cmdlfkeri.c
index 3228e31f4..0fda6c683 100644
--- a/client/cmdlfkeri.c
+++ b/client/cmdlfkeri.c
@@ -41,8 +41,8 @@ int usage_lf_keri_sim(void) {
 // find KERI preamble in already demoded data
 int detectKeri(uint8_t *dest, size_t *size, bool *invert) {
 
-    uint8_t preamble[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1};
-    uint8_t preamble_i[] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0};
+    uint8_t preamble[] = {1,1,1,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1};
+    uint8_t preamble_i[] = {0,0,0,1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0};
 
     // sanity check.
     if (*size < sizeof(preamble) + 100) return -1;
@@ -157,18 +157,16 @@ int CmdKeriClone(const char *Cmd) {
             2 << T5555_MAXBLOCK_SHIFT;
     }
 
-
     // MSB is ONE
     internalid |= 0x80000000;
-
+    
     // 3 LSB is ONE
     uint64_t data = ((uint64_t)internalid << 3) + 7;
+    PrintAndLogEx(INFO, "Preparing to clone KERI to T55x7 with Internal Id: %" PRIx64, internalid );
 
     //
     blocks[1] = data >> 32;
     blocks[2] = data & 0xFFFFFFFF;
-
-    PrintAndLogEx(INFO, "Preparing to clone KERI to T55x7 with Internal Id: %u", internalid);
     print_blocks(blocks, 3);
 
 

From 19588b045f06e91431cba217ac7b3a0d56144129 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 24 Mar 2019 22:09:25 +0100
Subject: [PATCH 0902/1938] Fix realloc mistake: ptr nulled but not freed upon
 failure

---
 client/cmdflashmem.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/client/cmdflashmem.c b/client/cmdflashmem.c
index af8584ce7..2a9709ef0 100644
--- a/client/cmdflashmem.c
+++ b/client/cmdflashmem.c
@@ -260,9 +260,12 @@ int CmdFlashMemLoad(const char *Cmd) {
             break;
     }
 
-    data = realloc(data, datalen);
-    if (!data) {
+    uint8_t *newdata = realloc(data, datalen);
+    if (newdata == NULL) {
+        free(data);
         return 1;
+    } else {
+        data = newdata;
     }
 
     //Send to device

From eb3f5e12ebf0c8bcce2dfe919a9502c917aac745 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 24 Mar 2019 22:20:58 +0100
Subject: [PATCH 0903/1938] Fix memleak in fpga_compress

---
 client/fpga_compress.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/client/fpga_compress.c b/client/fpga_compress.c
index cdd899782..960af2c29 100644
--- a/client/fpga_compress.c
+++ b/client/fpga_compress.c
@@ -429,9 +429,11 @@ int main(int argc, char **argv) {
             return (EXIT_FAILURE);
         }
         
-        return zlib_decompress(infiles[0], outfile);
+        int ret = zlib_decompress(infiles[0], outfile);
+        free(infiles);
+        return (ret);
 
-    } else { // Compress or gemerate version info
+    } else { // Compress or generate version info
 
         bool hardnested_mode = false;
         bool generate_version_file = false;

From 9d1aa3fb96550c70cf2de38f80275fd31cdf7ae9 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 24 Mar 2019 22:26:49 +0100
Subject: [PATCH 0904/1938] fgpa_compress: dealloc responsibility to main and
 add missing one

---
 client/fpga_compress.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/client/fpga_compress.c b/client/fpga_compress.c
index 960af2c29..c7cd021f8 100644
--- a/client/fpga_compress.c
+++ b/client/fpga_compress.c
@@ -167,7 +167,6 @@ int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile, bool hardn
             fclose(infile[j]);
         }
         fclose(outfile);
-        free(infile);
         free(fpga_config);
         return (EXIT_FAILURE);
     }
@@ -182,7 +181,6 @@ int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile, bool hardn
         fclose(infile[j]);
     }
     fclose(outfile);
-    free(infile);
     free(fpga_config);
 
     return (EXIT_SUCCESS);
@@ -478,7 +476,10 @@ int main(int argc, char **argv) {
                 return (EXIT_FAILURE);
             }
         } else {
-            return zlib_compress(infiles, num_input_files, outfile, hardnested_mode);
+            int ret = zlib_compress(infiles, num_input_files, outfile, hardnested_mode);
+            free(infile_names);
+            free(infiles);
+            return (ret);
         }
     }
 }

From ca68ac108bf5084bbe1011b465c763ac9f618b83 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 24 Mar 2019 23:19:36 +0100
Subject: [PATCH 0905/1938] wiegand: missing ;

---
 common/wiegand.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/wiegand.c b/common/wiegand.c
index e319e1a08..58d80cca4 100644
--- a/common/wiegand.c
+++ b/common/wiegand.c
@@ -228,8 +228,8 @@ void num_to_wiegand_bits(uint64_t oem, uint64_t fc, uint64_t cn, uint8_t *dest,
             break;
         case 50 :               // AWID 50 RBH
             fc &= 0xFFFF;       // 16bits
-            cn &= 0xFFFFFFFF    // 32bits
-                  value = fc << 32 | cn;
+            cn &= 0xFFFFFFFF;   // 32bits
+            value = fc << 32 | cn;
             num_to_bytebits(value, 48, temp);
             wiegand_add_parity(temp, dest, 48);  // verify!
             break;

From 7936626725fcbde4258ea6f3cfcc047776ad329b Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 24 Mar 2019 23:36:45 +0100
Subject: [PATCH 0906/1938] cmdanalyse: use byte arrays

---
 client/cmdanalyse.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/client/cmdanalyse.c b/client/cmdanalyse.c
index 991d082f5..1813917aa 100644
--- a/client/cmdanalyse.c
+++ b/client/cmdanalyse.c
@@ -876,15 +876,19 @@ int CmdAnalyseNuid(const char *Cmd) {
     /* selftest1  UID 040D681AB52281  -> NUID 8F430FEF */
     /* selftest2  UID 04183F09321B85  -> NUID 4F505D7D */
     if (cmdp == 't') {
-        memcpy(uid, "\x04\x0d\x68\x1a\xb5\x22\x81", 7);
+        uint8_t uid_test1[] = {0x04, 0x0d, 0x68, 0x1a, 0xb5, 0x22, 0x81};
+        uint8_t nuid_test1[] = {0x8f, 0x43, 0x0f, 0xef};
+        uint8_t uid_test2[] = {0x04, 0x18, 0x3f, 0x09, 0x32, 0x1b, 0x85};
+        uint8_t nuid_test2[] = {0x4f, 0x50, 0x5d, 0x7d};
+        memcpy(uid, uid_test1, sizeof(uid));
         generate4bNUID(uid, nuid);
 
-        bool test1 = (0 == memcmp(nuid, "\x8f\x43\x0f\xef", 4));
+        bool test1 = (0 == memcmp(nuid, nuid_test1, sizeof(nuid)));
         PrintAndLogEx(SUCCESS, "Selftest1 %s\n",  test1 ? _GREEN_("OK") : _RED_("Fail"));
 
-        memcpy(uid, "\x04\x18\x3f\x09\x32\x1b\x85", 7);
+        memcpy(uid, uid_test2, sizeof(uid));
         generate4bNUID(uid, nuid);
-        bool test2 = (0 == memcmp(nuid, "\x4f\x50\x5d\x7d", 4));
+        bool test2 = (0 == memcmp(nuid, nuid_test2, sizeof(nuid)));
         PrintAndLogEx(SUCCESS, "Selftest2 %s\n", test2 ? _GREEN_("OK") : _RED_("Fail"));
         return 0;
     }

From 59cf25640f6073907bb71081ca5376f63a92d958 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 24 Mar 2019 23:52:00 +0100
Subject: [PATCH 0907/1938] cmdhf14a: Fix usage of sizeof on a uint16_t array

---
 client/cmdhf14a.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 01b4e8228..45fcbcb33 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -524,7 +524,7 @@ int CmdHF14AInfo(const char *Cmd) {
                           (tb1 ? "" : " NOT"),
                           (tc1 ? "" : " NOT"),
                           fsci,
-                          fsci < sizeof(atsFSC) ? atsFSC[fsci] : -1
+                          fsci < sizeof(atsFSC)/sizeof(atsFSC[0]) ? atsFSC[fsci] : -1
                          );
         }
         pos = 2;
@@ -959,7 +959,7 @@ int SelectCard14443_4(bool disconnect, iso14a_card_select_t *card) {
         // get frame length from ATS in data field
         if (resp.arg[0] > 1) {
             uint8_t fsci = resp.d.asBytes[1] & 0x0f;
-            if (fsci < sizeof(atsFSC))
+            if (fsci < sizeof(atsFSC)/sizeof(atsFSC[0]))
                 frameLength = atsFSC[fsci];
         }
     } else {
@@ -967,7 +967,7 @@ int SelectCard14443_4(bool disconnect, iso14a_card_select_t *card) {
         iso14a_card_select_t *vcard = (iso14a_card_select_t *) resp.d.asBytes;
         if (vcard->ats_len > 1) {
             uint8_t fsci = vcard->ats[1] & 0x0f;
-            if (fsci < sizeof(atsFSC))
+            if (fsci < sizeof(atsFSC)/sizeof(atsFSC[0]))
                 frameLength = atsFSC[fsci];
         }
 

From fe740fabfd392635410a382abe13c75950c4e182 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Mon, 25 Mar 2019 00:04:28 +0100
Subject: [PATCH 0908/1938] cmdlfhid: comment unused struct

---
 client/cmdlfhid.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c
index 7e9448f67..c0d55f977 100644
--- a/client/cmdlfhid.c
+++ b/client/cmdlfhid.c
@@ -297,6 +297,8 @@ int CmdHIDClone(const char *Cmd) {
     SendCommand(&c);
     return 0;
 }
+
+/*
 // struct to handle wiegand
 typedef struct {
     uint8_t  FormatLen;
@@ -306,6 +308,7 @@ typedef struct {
     uint8_t *Wiegand;
     size_t   Wiegand_n;
 } wiegand_t;
+*/
 
 static void addHIDMarker(uint8_t fmtlen, uint8_t *out) {
     // temp array

From 8fb0999e0512fdf9cbe3317f05041d927c759c05 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 25 Mar 2019 14:03:36 +0100
Subject: [PATCH 0909/1938] fix: 'data detect p' - removed bad clock detection,
  failed to set all other parameters.

---
 common/lfdemod.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/common/lfdemod.c b/common/lfdemod.c
index aed21fbf7..1e8c3db35 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -262,7 +262,8 @@ bool preambleSearch(uint8_t *bits, uint8_t *preamble, size_t pLen, size_t *size,
 //(iceman) FINDONE,  only finds start index. NOT SIZE!.  I see Em410xDecode (lfdemod.c) uses SIZE to determine success
 bool preambleSearchEx(uint8_t *bits, uint8_t *preamble, size_t pLen, size_t *size, size_t *startIdx, bool findone) {
     // Sanity check.  If preamble length is bigger than bits length.
-    if (*size <= pLen) return false;
+    if (*size <= pLen)
+        return false;
 
     uint8_t foundCnt = 0;
     for (size_t idx = 0; idx < *size - pLen; idx++) {
@@ -967,11 +968,6 @@ int DetectPSKClock(uint8_t *dest, size_t size, int clock, size_t *firstPhaseShif
     uint8_t clk[] = {255, 16, 32, 40, 50, 64, 100, 128, 255}; //255 is not a valid clock
     uint16_t loopCnt = 4096;  //don't need to loop through entire array...
 
-    //if we already have a valid clock quit
-    size_t i = 1;
-    for (; i < 8; ++i)
-        if (clk[i] == clock) return clock;
-
     if (size < 160 + 20) return 0;
     // size must be larger than 20 here, and 160 later on.
     if (size < loopCnt) loopCnt = size - 20;
@@ -995,7 +991,7 @@ int DetectPSKClock(uint8_t *dest, size_t size, int clock, size_t *firstPhaseShif
     uint16_t peaksdet[] = {0, 0, 0, 0, 0, 0, 0, 0, 0};
 
     //find start of modulating data in trace
-    i = findModStart(dest, size, *fc);
+    size_t i = findModStart(dest, size, *fc);
 
     firstFullWave = pskFindFirstPhaseShift(dest, size, curPhase, i, *fc, &fullWaveLen);
     if (firstFullWave == 0) {

From 800bce865da68a565f98296005fb120717832f53 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 25 Mar 2019 14:39:09 +0100
Subject: [PATCH 0910/1938] fix: sprint_bin_break doesn't skip bits when
 newline printing

---
 client/util.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/util.c b/client/util.c
index a3f275a0b..386e56e1e 100644
--- a/client/util.c
+++ b/client/util.c
@@ -256,12 +256,12 @@ char *sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t brea
             sprintf(tmp++, ".");
         else
             sprintf(tmp++, "%u", data[in_index]);
+        
         // check if a line break is needed and we have room to print it in our array
         if ((breaks > 0) && !((in_index + 1) % breaks) && (out_index + 1 != rowlen)) {
-            // increment and print line break
-            out_index++;
             sprintf(tmp++, "%s", "\n");
         }
+        
         in_index++;
     }
 

From 6bc3ab1e44f27cbf8b996bd15670d918bda86c3e Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 25 Mar 2019 14:39:49 +0100
Subject: [PATCH 0911/1938] chg: some pwd from forum

---
 client/default_pwd.dic | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/default_pwd.dic b/client/default_pwd.dic
index 87423478b..42c06460f 100644
--- a/client/default_pwd.dic
+++ b/client/default_pwd.dic
@@ -18,6 +18,8 @@ A5B4C3D2,
 1C0B5848,
 # paxton bullit?
 575F4F4B,
+#
+50520901,
 # Default pwd, simple:
 00000000,
 11111111,

From a820d59368dae37b6a21e7f0ca93ff7126749cd0 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 25 Mar 2019 14:40:29 +0100
Subject: [PATCH 0912/1938] chg: one more step to unified debug printing
 clientside

---
 common/lfdemod.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/lfdemod.c b/common/lfdemod.c
index 1e8c3db35..7e1e60f8f 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -57,7 +57,7 @@ extern void Dbprintf(const char *fmt, ...);
 #include "ui.h"
 # include "cmdparser.h"
 # include "cmddata.h"
-# define prnt PrintAndLog
+# define prnt(args...) PrintAndLogEx(DEBUG, ## args );
 #else
 uint8_t g_debugMode = 0;
 # define prnt Dbprintf

From 68fc65a8c5022a1227df140aa7167d4a876a1916 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 25 Mar 2019 14:41:28 +0100
Subject: [PATCH 0913/1938] chg:  32bits binary strings used as default

---
 client/cmddata.c | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/client/cmddata.c b/client/cmddata.c
index 72cab3755..505bc605e 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -375,7 +375,7 @@ void printDemodBuff(void) {
     }
     if (len > 512) len = 512;
 
-    PrintAndLogEx(NORMAL, "%s", sprint_bin_break(DemodBuffer, len, 16));
+    PrintAndLogEx(NORMAL, "%s", sprint_bin_break(DemodBuffer, len, 32));
 }
 
 int CmdPrintDemodBuff(const char *Cmd) {
@@ -426,7 +426,7 @@ int CmdPrintDemodBuff(const char *Cmd) {
         }
         PrintAndLogEx(NORMAL, "DemodBuffer: %s", hex);
     } else {
-        PrintAndLogEx(NORMAL, "DemodBuffer:\n%s", sprint_bin_break(DemodBuffer + offset, length, 16));
+        PrintAndLogEx(NORMAL, "DemodBuffer:\n%s", sprint_bin_break(DemodBuffer + offset, length, 32));
     }
     return 1;
 }
@@ -599,7 +599,7 @@ int Cmdmandecoderaw(const char *Cmd) {
     }
 
     PrintAndLogEx(NORMAL, "Manchester Decoded - # errors:%d - data:", errCnt);
-    PrintAndLogEx(NORMAL, "%s", sprint_bin_break(bits, size, 16));
+    PrintAndLogEx(NORMAL, "%s", sprint_bin_break(bits, size, 32));
 
     if (errCnt == 0) {
         uint64_t id = 0;
@@ -650,7 +650,7 @@ int CmdBiphaseDecodeRaw(const char *Cmd) {
         PrintAndLogEx(WARNING, "# Errors found during Demod (shown as " _YELLOW_("7")" in bit stream): %d", errCnt);
 
     PrintAndLogEx(NORMAL, "Biphase Decoded using offset: %d - # invert:%d - data:", offset, invert);
-    PrintAndLogEx(NORMAL, "%s", sprint_bin_break(bits, size, 16));
+    PrintAndLogEx(NORMAL, "%s", sprint_bin_break(bits, size, 32));
 
     //remove first bit from raw demod
     if (offset)
@@ -1094,7 +1094,9 @@ int CmdFSKrawdemod(const char *Cmd) {
 //attempt to psk1 demod graph buffer
 int PSKDemod(const char *Cmd, bool verbose) {
     int invert = 0, clk = 0, maxErr = 100;
+    
     sscanf(Cmd, "%i %i %i", &clk, &invert, &maxErr);
+   
     if (clk == 1) {
         invert = 1;
         clk = 0;
@@ -1107,28 +1109,29 @@ int PSKDemod(const char *Cmd, bool verbose) {
     if (getSignalProperties()->isnoise)
         return 0;
 
-    uint8_t BitStream[MAX_GRAPH_TRACE_LEN] = {0};
-    size_t BitLen = getFromGraphBuf(BitStream);
-    if (BitLen == 0) return 0;
-    int errCnt = 0;
+    uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
+    size_t bitlen = getFromGraphBuf(bits);
+    if (bitlen == 0) 
+        return 0;
+    
     int startIdx = 0;
-    errCnt = pskRawDemod_ext(BitStream, &BitLen, &clk, &invert, &startIdx);
+    int errCnt = pskRawDemod_ext(bits, &bitlen, &clk, &invert, &startIdx);
     if (errCnt > maxErr) {
-        if (g_debugMode || verbose) PrintAndLogEx(DEBUG, "DEBUG: (PSKdemod) Too many errors found, clk: %d, invert: %d, numbits: %d, errCnt: %d", clk, invert, BitLen, errCnt);
+        if (g_debugMode || verbose) PrintAndLogEx(DEBUG, "DEBUG: (PSKdemod) Too many errors found, clk: %d, invert: %d, numbits: %d, errCnt: %d", clk, invert, bitlen, errCnt);
         return 0;
     }
-    if (errCnt < 0 || BitLen < 16) { //throw away static - allow 1 and -1 (in case of threshold command first)
-        if (g_debugMode || verbose) PrintAndLogEx(DEBUG, "DEBUG: (PSKdemod) no data found, clk: %d, invert: %d, numbits: %d, errCnt: %d", clk, invert, BitLen, errCnt);
+    if (errCnt < 0 || bitlen < 16) { //throw away static - allow 1 and -1 (in case of threshold command first)
+        if (g_debugMode || verbose) PrintAndLogEx(DEBUG, "DEBUG: (PSKdemod) no data found, clk: %d, invert: %d, numbits: %d, errCnt: %d", clk, invert, bitlen, errCnt);
         return 0;
     }
     if (verbose || g_debugMode) {
-        PrintAndLogEx(DEBUG, "DEBUG: (PSKdemod) Using Clock:%d, invert:%d, Bits Found:%d", clk, invert, BitLen);
+        PrintAndLogEx(DEBUG, "DEBUG: (PSKdemod) Using Clock:%d, invert:%d, Bits Found:%d", clk, invert, bitlen);
         if (errCnt > 0) {
             PrintAndLogEx(DEBUG, "DEBUG: (PSKdemod) errors during Demoding (shown as 7 in bit stream): %d", errCnt);
         }
     }
     //prime demod buffer for output
-    setDemodBuf(BitStream, BitLen, 0);
+    setDemodBuf(bits, bitlen, 0);
     setClockGrid(clk, startIdx);
     return 1;
 }

From 0409fd1f4e6b6acbb14f8a9d582ecacfa1cde9d2 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 25 Mar 2019 14:51:54 +0100
Subject: [PATCH 0914/1938] style

---
 include/legic_prng.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/legic_prng.h b/include/legic_prng.h
index 85d40e794..1f3042779 100644
--- a/include/legic_prng.h
+++ b/include/legic_prng.h
@@ -10,7 +10,7 @@
 #define __LEGIC_PRNG_H
 
 #include <stdint.h>
-extern void legic_prng_init(uint8_t init);
+extern void legic_prng_init(uint8_t iv);
 extern void legic_prng_forward(int count);
 extern uint32_t legic_prng_count();
 extern uint8_t legic_prng_get_bit();

From 43902c7c46b83b3dbf5420dc2a516495c6f4170e Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 25 Mar 2019 14:52:57 +0100
Subject: [PATCH 0915/1938] style

---
 common/wiegand.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/wiegand.h b/common/wiegand.h
index d856e3993..1db50607c 100644
--- a/common/wiegand.h
+++ b/common/wiegand.h
@@ -12,8 +12,8 @@
 #include "common.h"
 #include "util.h"
 
-uint8_t getParity(uint8_t *bits, uint8_t length, uint8_t type);
-uint8_t checkParity(uint32_t bits, uint8_t bitlen, uint8_t type);
+uint8_t getParity(uint8_t *bits, uint8_t len, uint8_t type);
+uint8_t checkParity(uint32_t bits, uint8_t len, uint8_t type);
 
 void num_to_wiegand_bytes(uint64_t oem, uint64_t fc, uint64_t cn, uint8_t *dest, uint8_t formatlen);
 void num_to_wiegand_bits(uint64_t oem, uint64_t fc, uint64_t cn, uint8_t *dest, uint8_t formatlen);

From bc5c07e5501ba82639b4b49bfecb4550137a37bc Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 25 Mar 2019 14:57:10 +0100
Subject: [PATCH 0916/1938] style

---
 common/lfdemod.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/lfdemod.h b/common/lfdemod.h
index 96a91363f..6256aa0bc 100644
--- a/common/lfdemod.h
+++ b/common/lfdemod.h
@@ -38,7 +38,7 @@ typedef struct {
 } signal_t;
 signal_t *getSignalProperties(void);
 
-void computeSignalProperties(uint8_t *bits, uint32_t size);
+void computeSignalProperties(uint8_t *samples, uint32_t size);
 void removeSignalOffset(uint8_t *samples, uint32_t size);
 void getNextLow(uint8_t *samples, size_t size, int low, size_t *i);
 void getNextHigh(uint8_t *samples, size_t size, int high, size_t *i);
@@ -61,7 +61,7 @@ extern int      DetectNRZClock(uint8_t *dest, size_t size, int clock, size_t *cl
 extern int      DetectPSKClock(uint8_t *dest, size_t size, int clock, size_t *firstPhaseShift, uint8_t *curPhase, uint8_t *fc);
 extern int      DetectStrongAskClock(uint8_t *dest, size_t size, int high, int low, int *clock);
 extern bool     DetectST(uint8_t *buffer, size_t *size, int *foundclock, size_t *ststart, size_t *stend);
-extern size_t   fskdemod(uint8_t *dest, size_t size, uint8_t rfLen, uint8_t invert, uint8_t fchigh, uint8_t fclow, int *startIdx);
+extern size_t   fskdemod(uint8_t *dest, size_t size, uint8_t rfLen, uint8_t invert, uint8_t fchigh, uint8_t fclow, int *start_idx);
 //extern void     getHiLo(uint8_t *bits, size_t size, int *high, int *low, uint8_t fuzzHi, uint8_t fuzzLo);
 extern void     getHiLo(int *high, int *low, uint8_t fuzzHi, uint8_t fuzzLo);
 extern uint32_t manchesterEncode2Bytes(uint16_t datain);

From 962e58b47578c6631ab21b237686b702e93ec004 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 25 Mar 2019 14:59:01 +0100
Subject: [PATCH 0917/1938] style

---
 common/wiegand.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/wiegand.c b/common/wiegand.c
index 58d80cca4..3e90c61b6 100644
--- a/common/wiegand.c
+++ b/common/wiegand.c
@@ -36,22 +36,22 @@ uint8_t checkParity(uint32_t bits, uint8_t len, uint8_t type);
 // by marshmellow
 // takes a array of binary values, start position, length of bits per parity (includes parity bit),
 // Parity Type (1 for odd; 0 for even; 2 for Always 1's; 3 for Always 0's), and binary Length (length to run)
-size_t removeParity(uint8_t *bitstream, size_t startIdx, uint8_t pLen, uint8_t pType, size_t bLen) {
+size_t removeParity(uint8_t *bits, size_t startIdx, uint8_t pLen, uint8_t pType, size_t bLen) {
     uint32_t parityWd = 0;
     size_t j = 0, bitcount = 0;
     for (int word = 0; word < (bLen); word += pLen) {
         for (int bit = 0; bit < pLen; ++bit) {
-            parityWd = (parityWd << 1) | bitstream[startIdx + word + bit];
-            bitstream[j++] = (bitstream[startIdx + word + bit]);
+            parityWd = (parityWd << 1) | bits[startIdx + word + bit];
+            bits[j++] = (bits[startIdx + word + bit]);
         }
         j--; // overwrite parity with next data
         // if parity fails then return 0
         switch (pType) {
             case 3:
-                if (bitstream[j] == 1) return 0;
+                if (bits[j] == 1) return 0;
                 break; //should be 0 spacer bit
             case 2:
-                if (bitstream[j] == 0) return 0;
+                if (bits[j] == 0) return 0;
                 break; //should be 1 spacer bit
             default: //test parity
                 if (parityTest(parityWd, pLen, pType) == 0) return 0;

From 8ce361202c651819a04f8eefcb90df635f7ae874 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 25 Mar 2019 15:03:22 +0100
Subject: [PATCH 0918/1938] style - unused

---
 common/legic_prng.c  | 4 ----
 include/legic_prng.h | 1 -
 2 files changed, 5 deletions(-)

diff --git a/common/legic_prng.c b/common/legic_prng.c
index 5406161fc..8646f55a9 100644
--- a/common/legic_prng.c
+++ b/common/legic_prng.c
@@ -46,10 +46,6 @@ void legic_prng_forward(int count) {
     }
 }
 
-uint32_t legic_prng_count() {
-    return lfsr.c;
-}
-
 uint8_t legic_prng_get_bit() {
     uint8_t idx = 7 - ((lfsr.a & 4) | (lfsr.a >> 2 & 2) | (lfsr.a >> 4 & 1));
     return lfsr.b >> idx & 1;
diff --git a/include/legic_prng.h b/include/legic_prng.h
index 1f3042779..16855ab90 100644
--- a/include/legic_prng.h
+++ b/include/legic_prng.h
@@ -12,7 +12,6 @@
 #include <stdint.h>
 extern void legic_prng_init(uint8_t iv);
 extern void legic_prng_forward(int count);
-extern uint32_t legic_prng_count();
 extern uint8_t legic_prng_get_bit();
 extern uint32_t legic_prng_get_bits(uint8_t len);
 #endif

From c939d99884507de0a6b65243dbf6d204a0dd369a Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 25 Mar 2019 15:11:38 +0100
Subject: [PATCH 0919/1938] chg: remove LDC mod be default

---
 armsrc/Makefile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/armsrc/Makefile b/armsrc/Makefile
index 707325d41..7a24b109f 100644
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -58,8 +58,6 @@ APP_CFLAGS = $(PLATFORM_DEFS) \
 #			 -DWITH_HF_COLIN
 #			 -DWITH_HF_BOG
 
-
-SRC_LCD = fonts.c LCD.c
 SRC_LF = lfops.c hitag2_crypto.c hitag2.c hitagS.c lfsampling.c pcf7931.c lfdemod.c
 SRC_ISO15693 = iso15693.c iso15693tools.c
 #SRC_ISO14443a = iso14443a.c mifareutil.c mifarecmd.c epa.c mifaresim.c
@@ -91,6 +89,12 @@ else
 	SRC_FPC =
 endif
 
+ifneq (,$(findstring WITH_LCD,$(APP_CLAGS)))
+    SRC_LCD = fonts.c LCD.c
+else
+    SRC_LCD =
+endif
+
 # Generic standalone Mode injection of source code
 SRC_STANDALONE =
 # WITH_LF_ICERUN

From 52be3f4fe5cb04df5cf176110a4f93d3cc80d409 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 26 Mar 2019 09:09:43 +0100
Subject: [PATCH 0920/1938] chg: 'lf indala clone' - differnt input parms.  
 '-L'  gives a long UID. chg: 'lf indala demod' - tries to descramble parts, 
 and detection is changed.  Still issues with PSK2..

---
 armsrc/appmain.c     |   3 +-
 client/cmddata.c     |   5 +-
 client/cmdlfindala.c | 309 ++++++++++++++++++++++++++++---------------
 client/cmdlfindala.h |   4 +-
 client/cmdlft55xx.c  |   1 +
 client/cmdlft55xx.h  |   2 +-
 common/lfdemod.c     |   2 +-
 7 files changed, 216 insertions(+), 110 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 9abb309bf..9236df6ff 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -23,6 +23,7 @@
 #include "lfsampling.h"
 #include "BigBuf.h"
 #include "mifareutil.h"
+#include "hitag.h"
 
 #define DEBUG 1
 
@@ -707,7 +708,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
             SimulateTagLowFrequencyBidir(c->arg[0], c->arg[1]);
             break;
         case CMD_INDALA_CLONE_TAG:
-            CopyIndala64toT55x7(c->arg[0], c->arg[1]);
+            CopyIndala64toT55x7(c->d.asDwords[0], c->d.asDwords[1]);
             break;
         case CMD_INDALA_CLONE_TAG_L:
             CopyIndala224toT55x7(
diff --git a/client/cmddata.c b/client/cmddata.c
index 505bc605e..9462fc510 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -366,7 +366,8 @@ int CmdSetDebugMode(const char *Cmd) {
 }
 
 //by marshmellow
-// max output to 512 bits if we have more - should be plenty
+// max output to 512 bits if we have more
+// doesn't take inconsideration where the demod offset or bitlen found.
 void printDemodBuff(void) {
     int len = DemodBufferLen;
     if (len < 1) {
@@ -530,7 +531,7 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
             PrintAndLogEx(DEBUG, "ASK/Manchester - Clock: %d - Decoded bitstream:", clk);
         else
             PrintAndLogEx(DEBUG, "ASK/Raw - Clock: %d - Decoded bitstream:", clk);
-        // Now output the bitstream to the scrollback by line of 16 bits
+
         printDemodBuff();
     }
     uint64_t lo = 0;
diff --git a/client/cmdlfindala.c b/client/cmdlfindala.c
index 7dc2e8ecf..aabb0f0e3 100644
--- a/client/cmdlfindala.c
+++ b/client/cmdlfindala.c
@@ -12,6 +12,12 @@
 
 static int CmdHelp(const char *Cmd);
 
+//large 224 bit indala formats (different preamble too...)
+static uint8_t preamble224[] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1};
+
+// standard 64 bit indala formats including 26 bit 40134 format
+static uint8_t preamble64[] =  {1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1};
+
 int usage_lf_indala_demod(void) {
     PrintAndLogEx(NORMAL, "Enables Indala compatible reader mode printing details of scanned tags.");
     PrintAndLogEx(NORMAL, "By default, values are printed and logged until the button is pressed or another USB command is issued.");
@@ -40,69 +46,129 @@ int usage_lf_indala_sim(void) {
 }
 
 int usage_lf_indala_clone(void) {
-    PrintAndLogEx(NORMAL, "Enables cloning of Indala card with specified uid onto T55x7.");
-    PrintAndLogEx(NORMAL, "The T55x7 must be on the antenna when issuing this command.  T55x7 blocks are calculated and printed in the process.");
     PrintAndLogEx(NORMAL, "");
-    PrintAndLogEx(NORMAL, "Usage:  lf indala clone [h] <uid> [Q5]");
+        PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  lf indala clone [h]<l> <uid> [Q5]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "            h :  This help");
-    PrintAndLogEx(NORMAL, "        <uid> :  64/224 UID");
+    PrintAndLogEx(NORMAL, "            l :  long uid 64/224");
+    PrintAndLogEx(NORMAL, "        <uid> :  UID");
     PrintAndLogEx(NORMAL, "           Q5 :  optional - clone to Q5 (T5555) instead of T55x7 chip");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
-    PrintAndLogEx(NORMAL, "       lf indala clone 112233");
+    PrintAndLogEx(NORMAL, "       lf indala clone 112233      -- 64");
+    PrintAndLogEx(NORMAL, "       lf indala clone l 112233    -- long 224");
     return 0;
 }
 
 // redesigned by marshmellow adjusted from existing decode functions
 // indala id decoding
-int indala64decode(uint8_t *dest, size_t *size, uint8_t *invert) {
-    //standard 64 bit indala formats including 26 bit 40134 format
-    uint8_t   preamble64[] = {1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1};
-    uint8_t preamble64_i[] = {0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0};
-    size_t idx = 0;
-    size_t found_size = *size;
-    if (!preambleSearch(dest, preamble64, sizeof(preamble64), &found_size, &idx)) {
-        // if didn't find preamble try again inverting
-        if (!preambleSearch(dest, preamble64_i, sizeof(preamble64_i), &found_size, &idx)) return -1;
-        *invert ^= 1;
-    }
-    if (found_size != 64) return -2;
-
-    if (*invert == 1)
-        for (size_t i = idx; i < found_size + idx; i++)
-            dest[i] ^= 1;
-
-    // note: don't change *size until we are sure we got it...
-    *size = found_size;
-    return (int) idx;
-}
-
-int indala224decode(uint8_t *dest, size_t *size, uint8_t *invert) {
-    //large 224 bit indala formats (different preamble too...)
-    uint8_t   preamble224[] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1};
+int detectIndala(uint8_t *dest, size_t *size, uint8_t *invert) {
+   
+    uint8_t preamble64_i[]  = {0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0};    
     uint8_t preamble224_i[] = {0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0};
+    
     size_t idx = 0;
     size_t found_size = *size;
-    if (!preambleSearch(dest, preamble224, sizeof(preamble224), &found_size, &idx)) {
-        // if didn't find preamble try again inverting
-        if (!preambleSearch(dest, preamble224_i, sizeof(preamble224_i), &found_size, &idx)) return -1;
-        *invert ^= 1;
+    
+    // PSK1 
+    bool res = preambleSearch(dest, preamble64, sizeof(preamble64), &found_size, &idx);
+    if ( res ) {
+        PrintAndLogEx(DEBUG, "DEBUG: detectindala PSK1 found 64");
+        goto out;
     }
-    if (found_size != 224) return -2;
+    idx = 0;
+    found_size = *size;
+    res = preambleSearch(dest, preamble64_i, sizeof(preamble64_i), &found_size, &idx);
+    if ( res ) {
+        PrintAndLogEx(DEBUG, "DEBUG: detectindala PSK1 found 64 inverted preamble");
+        goto inv;
+    }
+    
+    /*
+    idx = 0;
+    found_size = *size;
+    res = preambleSearch(dest, preamble224, sizeof(preamble224), &found_size, &idx);
+    if ( res ) {
+        PrintAndLogEx(DEBUG, "DEBUG: detectindala PSK1 found 224");
+        goto out;
+    }
+    
+    idx = 0;
+    found_size = *size;    
+    res = preambleSearch(dest, preamble224_i, sizeof(preamble224_i), &found_size, &idx);
+    if ( res ) {
+        PrintAndLogEx(DEBUG, "DEBUG: detectindala PSK1 found 224 inverted preamble");        
+        goto inv;
+    }
+    */
 
-    if (*invert == 1 && idx > 0)
-        for (size_t i = idx - 1; i < found_size + idx + 2; i++)
+    // PSK2
+    psk1TOpsk2(dest, *size);
+    PrintAndLogEx(DEBUG, "DEBUG: detectindala Converting PSK1 -> PSK2");
+    
+    idx = 0;
+    found_size = *size;    
+    res = preambleSearch(dest, preamble64, sizeof(preamble64), &found_size, &idx);
+    if ( res ) {
+        PrintAndLogEx(DEBUG, "DEBUG: detectindala PSK2 found 64 preamble");
+        goto out;
+    }
+    
+    idx = 0;
+    found_size = *size;
+    res = preambleSearch(dest, preamble224, sizeof(preamble224), &found_size, &idx);
+    if ( res ) {
+        PrintAndLogEx(DEBUG, "DEBUG: detectindala PSK2 found 224 preamble");
+        goto out;
+    }
+    
+    idx = 0;
+    found_size = *size;  
+    res = preambleSearch(dest, preamble64_i, sizeof(preamble64_i), &found_size, &idx);
+    if ( res ) {
+        PrintAndLogEx(DEBUG, "DEBUG: detectindala PSK2 found 64 inverted preamble");
+        goto inv;
+    }
+    
+    idx = 0;
+    found_size = *size;
+    res = preambleSearch(dest, preamble224_i, sizeof(preamble224_i), &found_size, &idx);
+    if ( res ) {
+        PrintAndLogEx(DEBUG, "DEBUG: detectindala PSK2 found 224 inverted preamble");
+        goto inv;
+    }
+    
+inv:
+    if ( res == 0 ) {
+        return -4;
+    }
+
+    *invert ^= 1;
+
+    if (*invert && idx > 0) {
+        for (size_t i = idx - 1; i < found_size + idx + 2; i++) {
             dest[i] ^= 1;
+        }
+    }
+
+    PrintAndLogEx(DEBUG, "DEBUG: Warning - Indala had to invert bits");
+
+out:
+
+    *size = found_size;
+    
+    //PrintAndLogEx(INFO, "DEBUG: detectindala RES = %d | %d | %d", res, found_size, idx);
+    
+    if (found_size != 224 && found_size != 64) {
+        PrintAndLogEx(INFO, "DEBUG: detectindala | %d", found_size);        
+        return -5;
+    }
 
     // 224 formats are typically PSK2 (afaik 2017 Marshmellow)
     // note loses 1 bit at beginning of transformation...
-    // don't need to verify array is big enough as to get here there has to be a full preamble after all of our data
-    psk1TOpsk2(dest + (idx - 1), found_size + 2);
-    idx++;
-
-    *size = found_size;
-    return (int) idx;
+    return (int) idx;    
+    
 }
 
 // this read is the "normal" read,  which download lf signal and tries to demod here.
@@ -117,9 +183,9 @@ int CmdIndalaRead(const char *Cmd) {
 int CmdIndalaDemod(const char *Cmd) {
     int ans;
     if (strlen(Cmd) > 0)
-        ans = PSKDemod(Cmd, 0);
-    else //default to RF/32
-        ans = PSKDemod("32", 0);
+        ans = PSKDemod(Cmd, true);
+    else
+        ans = PSKDemod("32", true);
 
     if (!ans) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - Indala can't demod signal: %d", ans);
@@ -128,47 +194,77 @@ int CmdIndalaDemod(const char *Cmd) {
 
     uint8_t invert = 0;
     size_t size = DemodBufferLen;
-    int idx = indala64decode(DemodBuffer, &size, &invert);
-    if (idx < 0 || size != 64) {
-        // try 224 indala
-        invert = 0;
-        size = DemodBufferLen;
-        idx = indala224decode(DemodBuffer, &size, &invert);
-        if (idx < 0 || size != 224) {
-            PrintAndLogEx(DEBUG, "DEBUG: Error - Indala wrong size, expected [64|224] got: %d (startindex %i)", size, idx);
-            return 0;
-        }
+    int idx = detectIndala(DemodBuffer, &size, &invert);
+    if (idx < 0) {
+        if (idx == -1)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - Indala: not enough samples");
+        else if (idx == -2)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - Indala: only noise found");
+        else if (idx == -4)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - Indala: preamble not found");
+        else if (idx == -5)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - Indala: size not correct: %d", size);
+        else
+            PrintAndLogEx(DEBUG, "DEBUG: Error - Indala: error demoding psk idx: %d", idx);
+        return 0;
     }
-
-    setDemodBuf(DemodBuffer, size, (size_t)idx);
+    setDemodBuf(DemodBuffer, size, idx);
     setClockGrid(g_DemodClock, g_DemodStartIdx + (idx * g_DemodClock));
-    if (invert) {
-        PrintAndLogEx(DEBUG, "DEBUG: Error - Indala had to invert bits");
-        for (size_t i = 0; i < size; i++)
-            DemodBuffer[i] ^= 1;
-    }
-
+    
     //convert UID to HEX
     uint32_t uid1, uid2, uid3, uid4, uid5, uid6, uid7;
     uid1 = bytebits_to_byte(DemodBuffer, 32);
     uid2 = bytebits_to_byte(DemodBuffer + 32, 32);
+    uint64_t foo = (((uint64_t)uid1 << 32) & 0x1FFFFFFF ) | (uid2 & 0x7FFFFFFF );
+
     if (DemodBufferLen == 64) {
-        PrintAndLogEx(SUCCESS, "Indala Found - bitlength %d, UID = (0x%x%08x)\n%s",
-                      DemodBufferLen, uid1, uid2, sprint_bin_break(DemodBuffer, DemodBufferLen, 32)
-                     );
+        PrintAndLogEx(
+            SUCCESS
+            , "Indala Found - bitlength %d, Raw %x%08x"
+            , DemodBufferLen
+            , uid1
+            , uid2
+        );
+        
+        uint16_t p1  = 0;
+        p1 |= DemodBuffer[32+ 3] << 8;
+        p1 |= DemodBuffer[32+ 6] << 5;
+        p1 |= DemodBuffer[32+ 8] << 4;
+        p1 |= DemodBuffer[32+ 9] << 3;
+        p1 |= DemodBuffer[32+11] << 1;
+        p1 |= DemodBuffer[32+16] << 6;
+        p1 |= DemodBuffer[32+19] << 7;
+        p1 |= DemodBuffer[32+20] << 10;
+        p1 |= DemodBuffer[32+21] << 2;
+        p1 |= DemodBuffer[32+22] << 0;
+        p1 |= DemodBuffer[32+24] << 9;
+        
+        PrintAndLogEx(NORMAL, "");
+        PrintAndLogEx(SUCCESS, "Possible de-scramble patterns");
+        PrintAndLogEx(SUCCESS, "\tPrinted     | __%04d__ [0x%X]", p1, p1);
+        PrintAndLogEx(SUCCESS, "\tInternal ID | %" PRIu64 , foo);
+        
+        
     } else {
         uid3 = bytebits_to_byte(DemodBuffer + 64, 32);
         uid4 = bytebits_to_byte(DemodBuffer + 96, 32);
         uid5 = bytebits_to_byte(DemodBuffer + 128, 32);
         uid6 = bytebits_to_byte(DemodBuffer + 160, 32);
         uid7 = bytebits_to_byte(DemodBuffer + 192, 32);
-        PrintAndLogEx(SUCCESS, "Indala Found - bitlength %d, UID = (0x%x%08x%08x%08x%08x%08x%08x)\n%s",
-                      DemodBufferLen,
-                      uid1, uid2, uid3, uid4, uid5, uid6, uid7, sprint_bin_break(DemodBuffer, DemodBufferLen, 32)
-                     );
+        PrintAndLogEx(SUCCESS, "Indala Found - bitlength %d, UID = 0x%x%08x%08x%08x%08x%08x%08x"
+            , DemodBufferLen
+            , uid1
+            , uid2
+            , uid3
+            , uid4
+            , uid5
+            , uid6
+            , uid7
+            );
     }
+    
     if (g_debugMode) {
-        PrintAndLogEx(DEBUG, "DEBUG: Indala - printing demodbuffer:");
+        PrintAndLogEx(DEBUG, "DEBUG: Indala - printing demodbuffer");
         printDemodBuff();
     }
     return 1;
@@ -420,43 +516,50 @@ int CmdIndalaSim(const char *Cmd) {
 
 // iceman - needs refactoring
 int CmdIndalaClone(const char *Cmd) {
-    UsbCommand c = {0};
-    uint32_t uid1, uid2, uid3, uid4, uid5, uid6, uid7;
-    uid1 =  uid2 = uid3 = uid4 = uid5 = uid6 = uid7 = 0;
-    uint32_t n = 0, i = 0;
 
-    if (strchr(Cmd, 'l') != 0) {
+    bool isLongUid = false;
+    uint8_t data[7*4];
+    int datalen = 0;
+    
+    CLIParserInit("lf indala clone",
+                  "Enables cloning of Indala card with specified uid onto T55x7\n"
+                  "defaults to 64.\n",
+                  "\n"
+                  "Samples:\n"
+                  "\tlf indala clone a0000000a0002021\n"
+                  "\tlf indala clone -l 80000001b23523a6c2e31eba3cbee4afb3c6ad1fcf649393928c14e5");
 
-        while (sscanf(&Cmd[i++], "%1x", &n) == 1) {
-            uid1 = (uid1 << 4) | (uid2 >> 28);
-            uid2 = (uid2 << 4) | (uid3 >> 28);
-            uid3 = (uid3 << 4) | (uid4 >> 28);
-            uid4 = (uid4 << 4) | (uid5 >> 28);
-            uid5 = (uid5 << 4) | (uid6 >> 28);
-            uid6 = (uid6 << 4) | (uid7 >> 28);
-            uid7 = (uid7 << 4) | (n & 0xf);
-        }
+    void *argtable[] = {
+        arg_param_begin,
+        arg_lit0("lL",  "long",  "long UID 224 bits"),
+        arg_strx1(NULL, NULL,    "<uid (hex)>", NULL),
+        arg_param_end
+    };
+    CLIExecWithReturn(Cmd, argtable, false);
 
-        PrintAndLogEx(INFO, "Preparing to clone Indala 224bit tag with UID %x%08x%08x%08x%08x%08x%08x", uid1, uid2, uid3, uid4, uid5, uid6, uid7);
+    isLongUid = arg_get_lit(1);
+    CLIGetHexWithReturn(2, data, &datalen);
+    CLIParserFree();
+
+    UsbCommand c = {0, {0,0,0}};
+    
+    if (isLongUid) {
+        PrintAndLogEx(INFO, "Preparing to clone Indala 224bit tag with UID %s", sprint_hex(data, datalen));
         c.cmd = CMD_INDALA_CLONE_TAG_L;
-        c.d.asDwords[0] = uid1;
-        c.d.asDwords[1] = uid2;
-        c.d.asDwords[2] = uid3;
-        c.d.asDwords[3] = uid4;
-        c.d.asDwords[4] = uid5;
-        c.d.asDwords[5] = uid6;
-        c.d.asDwords[6] = uid7;
+        c.d.asDwords[0] = bytes_to_num(data, 4);
+        c.d.asDwords[1] = bytes_to_num(data +  4, 4);
+        c.d.asDwords[2] = bytes_to_num(data +  8, 4);
+        c.d.asDwords[3] = bytes_to_num(data + 12, 4);
+        c.d.asDwords[4] = bytes_to_num(data + 16, 4);
+        c.d.asDwords[5] = bytes_to_num(data + 20, 4);
+        c.d.asDwords[6] = bytes_to_num(data + 24, 4);
     } else {
-        while (sscanf(&Cmd[i++], "%1x", &n) == 1) {
-            uid1 = (uid1 << 4) | (uid2 >> 28);
-            uid2 = (uid2 << 4) | (n & 0xf);
-        }
-        PrintAndLogEx(INFO, "Preparing to clone Indala 64bit tag with UID %x%08x", uid1, uid2);
-        c.cmd = CMD_INDALA_CLONE_TAG;
-        c.arg[0] = uid1;
-        c.arg[1] = uid2;
+        PrintAndLogEx(INFO, "Preparing to clone Indala 64bit tag with UID %s", sprint_hex(data, datalen));
+        c.cmd = CMD_INDALA_CLONE_TAG;            
+        c.d.asDwords[0] = bytes_to_num(data, 4);
+        c.d.asDwords[1] = bytes_to_num(data + 4, 4);
     }
-
+    
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
diff --git a/client/cmdlfindala.h b/client/cmdlfindala.h
index 3430ad499..8352421cc 100644
--- a/client/cmdlfindala.h
+++ b/client/cmdlfindala.h
@@ -32,8 +32,8 @@ extern int CmdIndalaClone(const char *Cmd);
 extern int CmdIndalaSim(const char *Cmd);
 
 extern int detectIndala26(uint8_t *bitStream, size_t *size, uint8_t *invert);
-extern int indala64decode(uint8_t *bitStream, size_t *size, uint8_t *invert);
-extern int indala224decode(uint8_t *bitStream, size_t *size, uint8_t *invert);
+extern int detectIndala64(uint8_t *bitStream, size_t *size, uint8_t *invert);
+extern int detectIndala224(uint8_t *bitStream, size_t *size, uint8_t *invert);
 
 extern int usage_lf_indala_demod(void);
 extern int usage_lf_indala_clone(void);
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index ec53c8a68..659ddea0c 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1053,6 +1053,7 @@ int CmdT55xxWriteBlock(const char *Cmd) {
         c.arg[2] = password;
         c.d.asBytes[0] |= 0x1;
     }
+    
     clearCommandBuffer();
     SendCommand(&c);
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
diff --git a/client/cmdlft55xx.h b/client/cmdlft55xx.h
index 25b8c7c17..3505b3cee 100644
--- a/client/cmdlft55xx.h
+++ b/client/cmdlft55xx.h
@@ -162,7 +162,7 @@ extern bool tryDetectP1(bool getData);
 bool test(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk, bool *Q5);
 int special(const char *Cmd);
 bool AquireData(uint8_t page, uint8_t block, bool pwdmode, uint32_t password);
-bool AquireDataEx(uint8_t page, uint8_t block, bool pwdmode, uint32_t password, uint32_t timing) ;
+//bool AquireDataEx(uint8_t page, uint8_t block, bool pwdmode, uint32_t password, uint32_t timing) ;
 
 bool detectPassword(int password);
 
diff --git a/common/lfdemod.c b/common/lfdemod.c
index 7e1e60f8f..02b1e5efe 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -1555,7 +1555,7 @@ int askdemod_ext(uint8_t *bits, size_t *size, int *clk, int *invert, int maxErr,
             *startIdx += *clk / 2 * alignPos;
 
             if (g_debugMode)
-                prnt("DEBUG: (askdemod_ext) CLEAN: startIdx %i, alignPos %u", *startIdx, alignPos);
+                prnt("DEBUG: (askdemod_ext) CLEAN: startIdx %i, alignPos %u , bestError %u", *startIdx, alignPos, errCnt);
         }
         return errCnt;
     }

From 9133a9164f5e743dd2c6c0f3f6e9d91e15689a1f Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 26 Mar 2019 16:18:40 +0100
Subject: [PATCH 0921/1938] chg: 'lf t55xx chk' - refactored to use
 loadDictionary

---
 client/cmdlft55xx.c | 81 ++++++++++-----------------------------------
 client/cmdlft55xx.h |  5 +--
 2 files changed, 21 insertions(+), 65 deletions(-)

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 659ddea0c..066b2b846 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1625,17 +1625,14 @@ bool IsCancelled(void) {
     return false;
 }
 
+// load a default pwd file.
 int CmdT55xxChkPwds(const char *Cmd) {
-    // load a default pwd file.
-    char line[9];
+
     char filename[FILE_PATH_SIZE] = {0};
-    int keycnt = 0;
-    uint8_t stKeyBlock = 20;
-    uint8_t *keyBlock = NULL, *p = NULL;
+
     bool found = false;
     uint8_t timeout = 0;
-
-    memset(line, 0, sizeof(line));
+    uint8_t *keyBlock = NULL;
 
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) == 0 || cmdp == 'h') return usage_t55xx_chk();
@@ -1688,78 +1685,37 @@ int CmdT55xxChkPwds(const char *Cmd) {
         goto out;
     }
 
-    keyBlock = calloc(stKeyBlock, 4);
-    if (keyBlock == NULL) return 1;
-
     if (cmdp == 'i') {
-
+        
         int len = strlen(Cmd + 2);
         if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
         memcpy(filename, Cmd + 2, len);
-
-        FILE *f = fopen(filename, "r");
-        if (!f) {
-            PrintAndLogEx(FAILED, "File: " _YELLOW_("%s") ": not found or locked.", filename);
-            free(keyBlock);
+        
+        uint16_t keycount = 0;
+        size_t datalen = 0;
+       
+        // TODO, a way of reallocating memory if file was larger
+        keyBlock = calloc(4*200, sizeof(uint8_t));
+        if ( keyBlock == NULL ) {
+            PrintAndLogDevice(WARNING, "error, cannot allocate memory ");
             return 1;
         }
-
-        while (fgets(line, sizeof(line), f)) {
-            if (strlen(line) < 8 || line[7] == '\n') continue;
-
-            //goto next line
-            while (fgetc(f) != '\n' && !feof(f)) ;
-
-            //The line start with # is comment, skip
-            if (line[0] == '#') continue;
-
-            if (!isxdigit(line[0])) {
-                PrintAndLogEx(WARNING, "File content error. '%s' must include 8 HEX symbols", line);
-                continue;
-            }
-
-            line[8] = 0;
-
-            // realloc keyblock array size.
-            if (stKeyBlock - keycnt < 2) {
-                p = realloc(keyBlock, 4 * (stKeyBlock += 10));
-                if (!p) {
-                    PrintAndLogEx(WARNING, "Cannot allocate memory for defaultKeys");
-                    free(keyBlock);
-                    if (f)
-                        fclose(f);
-                    return 2;
-                }
-                keyBlock = p;
-            }
-            // clear mem
-            memset(keyBlock + 4 * keycnt, 0, 4);
-
-            num_to_bytes(strtoll(line, NULL, 16), 4, keyBlock + 4 * keycnt);
-
-// PrintAndLogEx(NORMAL, "chk custom pwd[%2d] %08X", keycnt, bytes_to_num(keyBlock + 4 * keycnt, 4) );
-            keycnt++;
-            memset(line, 0, sizeof(line));
-        }
-
-        if (f)
-            fclose(f);
-
-        if (keycnt == 0) {
+        
+        int res = loadFileDICTIONARY(filename, "dic", keyBlock, &datalen, 4, &keycount );
+        if (res || keycount == 0) {
             PrintAndLogEx(WARNING, "No keys found in file");
             free(keyBlock);
             return 1;
         }
-        PrintAndLogEx(SUCCESS, "Loaded %d keys", keycnt);
 
         // loop
         uint64_t testpwd = 0x00;
-        for (uint16_t c = 0; c < keycnt; ++c) {
+        for (uint16_t c = 0; c < keycount; ++c) {
 
             if (IsOffline()) {
                 PrintAndLogEx(WARNING, "Device offline\n");
                 free(keyBlock);
-                return  2;
+                return 2;
             }
 
             if (IsCancelled()) {
@@ -1780,7 +1736,6 @@ int CmdT55xxChkPwds(const char *Cmd) {
                 return 0;
             }
 */
-
             found = tryDetectModulation();
             if (found)
                 break;
diff --git a/client/cmdlft55xx.h b/client/cmdlft55xx.h
index 3505b3cee..d9539855a 100644
--- a/client/cmdlft55xx.h
+++ b/client/cmdlft55xx.h
@@ -24,7 +24,9 @@
 #include "cmdlf.h"
 #include "util.h"
 #include "lfdemod.h"
-#include "cmdhf14a.h" //for getTagInfo
+#include "cmdhf14a.h"   // for getTagInfo
+#include "loclass/fileutils.h"  // loadDictionary
+
 
 #define T55x7_CONFIGURATION_BLOCK 0x00
 #define T55x7_PAGE0 0x00
@@ -162,7 +164,6 @@ extern bool tryDetectP1(bool getData);
 bool test(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk, bool *Q5);
 int special(const char *Cmd);
 bool AquireData(uint8_t page, uint8_t block, bool pwdmode, uint32_t password);
-//bool AquireDataEx(uint8_t page, uint8_t block, bool pwdmode, uint32_t password, uint32_t timing) ;
 
 bool detectPassword(int password);
 

From 834832be312b59f3a8b1e842481220d020a46470 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 26 Mar 2019 16:23:19 +0100
Subject: [PATCH 0922/1938] chg 'lf t55xx brute' - AquireData returns isnoise,
 but a pwd protected card signa looks like noise.

---
 client/cmdlft55xx.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 066b2b846..96136eac0 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1791,11 +1791,15 @@ int CmdT55xxBruteForce(const char *Cmd) {
             return 0;
         }
 
+        AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, curr);
+        
+        /*
         if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, curr)) {
             PrintAndLogEx(WARNING, "Aquiring data from device failed. Quitting");
             return 0;
         }
-
+        */
+        
         found = tryDetectModulation();
 
         if (curr == end_password)

From 54e8eafa492b3c3a8ba288599f7ce92c8f13d820 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 26 Mar 2019 20:21:10 +0100
Subject: [PATCH 0923/1938] fix: 'lf t55xx chk' fix: 'lf t55xx brute' fix: 'lf
 t55xx recoverpwd'  - now works like they should again.

---
 client/cmdlft55xx.c | 119 +++++++++++++++++++++-----------------------
 client/cmdlft55xx.h |   2 +-
 2 files changed, 59 insertions(+), 62 deletions(-)

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 96136eac0..4f187367a 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -143,7 +143,9 @@ int usage_t55xx_wakup() {
 }
 int usage_t55xx_chk() {
     PrintAndLogEx(NORMAL, "This command uses a dictionary attack");
-    PrintAndLogEx(NORMAL, "press 'enter' to cancel the command");
+    PrintAndLogEx(NORMAL, "press " _YELLOW_("'enter'") " to cancel the command");
+    PrintAndLogEx(NORMAL, "WARNING: this may brick non-password protected chips!");    
+    PrintAndLogEx(NORMAL, "Try to reading block 7 before\n");    
     PrintAndLogEx(NORMAL, "Usage: lf t55xx chk [h] <m> [i <*.dic>]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "     h           - this help");
@@ -158,7 +160,9 @@ int usage_t55xx_chk() {
 }
 int usage_t55xx_bruteforce() {
     PrintAndLogEx(NORMAL, "This command uses bruteforce to scan a number range");
-    PrintAndLogEx(NORMAL, "press 'enter' to cancel the command");
+    PrintAndLogEx(NORMAL, "press " _YELLOW_("'enter'") " to cancel the command");
+    PrintAndLogEx(NORMAL, "WARNING: this may brick non-password protected chips!");    
+    PrintAndLogEx(NORMAL, "Try to reading block 7 before\n");  
     PrintAndLogEx(NORMAL, "Usage: lf t55xx bruteforce [h] <start password> <end password>");
     PrintAndLogEx(NORMAL, "       password must be 4 bytes (8 hex symbols)");
     PrintAndLogEx(NORMAL, "Options:");
@@ -167,14 +171,15 @@ int usage_t55xx_bruteforce() {
     PrintAndLogEx(NORMAL, "     <end_pwd>   - 4 byte hex value to end pwd search at");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
-    PrintAndLogEx(NORMAL, "       lf t55xx bruteforce aaaaaaaa bbbbbbbb");
+    PrintAndLogEx(NORMAL, "       lf t55xx bruteforce aaaaaa77 aaaaaa99");
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
 int usage_t55xx_recoverpw() {
     PrintAndLogEx(NORMAL, "This command uses a few tricks to try to recover mangled password");
-    PrintAndLogEx(NORMAL, "press 'enter' to cancel the command");
+    PrintAndLogEx(NORMAL, "press " _YELLOW_("'enter'") " to cancel the command");    
     PrintAndLogEx(NORMAL, "WARNING: this may brick non-password protected chips!");
+    PrintAndLogEx(NORMAL, "Try to reading block 7 before\n");     
     PrintAndLogEx(NORMAL, "Usage: lf t55xx recoverpw [password]");
     PrintAndLogEx(NORMAL, "       password must be 4 bytes (8 hex symbols)");
     PrintAndLogEx(NORMAL, "       default password is 51243648, used by many cloners");
@@ -1629,16 +1634,16 @@ bool IsCancelled(void) {
 int CmdT55xxChkPwds(const char *Cmd) {
 
     char filename[FILE_PATH_SIZE] = {0};
-
     bool found = false;
     uint8_t timeout = 0;
     uint8_t *keyBlock = NULL;
-
+    
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) == 0 || cmdp == 'h') return usage_t55xx_chk();
 
     /*
-    if ( T55xxReadBlock(7, 0, 0, 0, 0) ) {
+    // block 7,  page1 = false, usepwd = false, override = false, pwd = 00000000
+    if ( T55xxReadBlock(7, false, false, false, 0x00000000) ) {
 
         // now try to validate it..
         PrintAndLogEx(WARNING, "\n Block 7 was readable");
@@ -1665,21 +1670,18 @@ int CmdT55xxChkPwds(const char *Cmd) {
         }
 
         if (resp.arg[0]) {
-            PrintAndLogEx(SUCCESS, "\nFound a candidate [ %08X ]. Trying to validate", resp.arg[1]);
+            PrintAndLogEx(SUCCESS, "\nFound a candidate [ " _YELLOW_("%08X") " ]. Trying to validate", resp.arg[1]);
 
-            if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, resp.arg[1])) {
-                PrintAndLogEx(INFO, "Aquireing data from device failed. Quitting");
-                return 2;
-            }
+            AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, resp.arg[1]);
 
             found = tryDetectModulation();
             if (found) {
-                PrintAndLogEx(SUCCESS, "Found valid password: [ %08X ]", resp.arg[1]);
+                PrintAndLogEx(SUCCESS, "Found valid password: [ " _GREEN_("%08") " ]", resp.arg[1]);        
             } else {
-                PrintAndLogEx(WARNING, "Password NOT found.");
+                PrintAndLogEx(WARNING, "Check pwd failed");
             }
         } else {
-            PrintAndLogEx(WARNING, "Password NOT found.");
+            PrintAndLogEx(WARNING, "Check pwd failed");
         }
 
         goto out;
@@ -1709,7 +1711,7 @@ int CmdT55xxChkPwds(const char *Cmd) {
         }
 
         // loop
-        uint64_t testpwd = 0x00;
+        uint64_t curr_password = 0x00;
         for (uint16_t c = 0; c < keycount; ++c) {
 
             if (IsOffline()) {
@@ -1723,38 +1725,33 @@ int CmdT55xxChkPwds(const char *Cmd) {
                 return 0;
             }
 
-            testpwd = bytes_to_num(keyBlock + 4 * c, 4);
+            curr_password = bytes_to_num(keyBlock + 4 * c, 4);
 
-            PrintAndLogEx(INFO, "Testing %08X", testpwd);
-
-            AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, testpwd);
+            PrintAndLogEx(INFO, "Testing %08X", curr_password);
             
-            /*
-            if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, testpwd)) {
-                PrintAndLogEx(INFO, "Aquireing data from device failed. Quitting");
-                free(keyBlock);
-                return 0;
+            if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, curr_password)) {
+                continue;
             }
-*/
+
             found = tryDetectModulation();
             if (found)
                 break;
-
         }
         if (found)
-            PrintAndLogEx(SUCCESS, "Found valid password: [ %08X ]", testpwd);
+            PrintAndLogEx(SUCCESS, "Found valid password: [ " _GREEN_("%08X") " ]", curr_password);
         else
-            PrintAndLogEx(WARNING, "Password NOT found.");
+            PrintAndLogEx(WARNING, "Check pwd failed");
     }
 
     free(keyBlock);
 
 out:
     t1 = msclock() - t1;
-    PrintAndLogEx(SUCCESS, "\nTime in bruteforce: %.0f seconds\n", (float)t1 / 1000.0);
+    PrintAndLogEx(SUCCESS, "\nTime in check pwd: %.0f seconds\n", (float)t1 / 1000.0);
     return 0;
 }
 
+// Bruteforce - incremental password range search
 int CmdT55xxBruteForce(const char *Cmd) {
 
     uint32_t start_password = 0x00000000; //start password
@@ -1762,15 +1759,11 @@ int CmdT55xxBruteForce(const char *Cmd) {
     uint32_t curr = 0;
     bool found = false;
 
-
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_t55xx_bruteforce();
 
     uint64_t t1 = msclock();
 
-    // Try to read Block 7, first :)
-
-    // incremental pwd range search
     start_password = param_get32ex(Cmd, 0, 0, 16);
     end_password = param_get32ex(Cmd, 1, 0, 16);
 
@@ -1783,7 +1776,7 @@ int CmdT55xxBruteForce(const char *Cmd) {
     PrintAndLogEx(INFO, "Search password range [%08X -> %08X]", start_password, end_password);
 
     while (!found) {
-
+       
         printf(".");
         fflush(stdout);
 
@@ -1791,28 +1784,20 @@ int CmdT55xxBruteForce(const char *Cmd) {
             return 0;
         }
 
-        AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, curr);
-        
-        /*
-        if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, curr)) {
-            PrintAndLogEx(WARNING, "Aquiring data from device failed. Quitting");
-            return 0;
-        }
-        */
-        
-        found = tryDetectModulation();
+        found = tryOnePassword(curr);
 
         if (curr == end_password)
             break;
+        
         curr++;
     }
 
     PrintAndLogEx(NORMAL, "");
 
     if (found)
-        PrintAndLogEx(SUCCESS, "Found valid password: [ %08X ]", curr);
+        PrintAndLogEx(SUCCESS, "Found valid password: [ " _GREEN_("%08X") " ]", curr);
     else
-        PrintAndLogEx(WARNING, "Password NOT found. Last tried: [ %08X ]", --curr);
+        PrintAndLogEx(WARNING, "Bruteforce failed, last tried: [ " _YELLOW_("%08X") " ]", --curr);
 
     t1 = msclock() - t1;
     PrintAndLogEx(SUCCESS, "\nTime in bruteforce: %.0f seconds\n", (float)t1 / 1000.0);
@@ -1820,12 +1805,13 @@ int CmdT55xxBruteForce(const char *Cmd) {
 }
 
 int tryOnePassword(uint32_t password) {
-    PrintAndLogEx(INFO, "Trying password %08x", password);
-    if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, password)) {
-        PrintAndLogEx(NORMAL, "Acquire data from device failed. Quitting");
-        return -1;
-    }
+    PrintAndLogEx(INFO, "Trying password %08X", password);
+    
+    AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, password);
 
+    if (getSignalProperties()->isnoise == false)
+        return 0;
+    
     if (tryDetectModulation())
         return 1;
     else
@@ -1848,10 +1834,13 @@ int CmdT55xxRecoverPW(const char *Cmd) {
     while (bit < 32) {
         curr_password = orig_password ^ (1u << bit);
         found = tryOnePassword(curr_password);
-        if (found == -1) return 0;
+        if ( found == 1)
+            goto out;
+        
         bit++;
 
-        if (IsCancelled()) return 0;
+        if (IsCancelled()) 
+            return 0;
     }
 
     // now try to use partial original password, since block 7 should have been completely
@@ -1868,12 +1857,16 @@ int CmdT55xxRecoverPW(const char *Cmd) {
             bit++;
             continue;
         }
+        
         found = tryOnePassword(curr_password);
-        if (found == -1) return 0;
+        if ( found == 1 )
+            goto out;        
+        
         bit++;
         prev_password = curr_password;
 
-        if (IsCancelled()) return 0;
+        if (IsCancelled()) 
+            return 0;
     }
 
     // from high bit to low
@@ -1888,20 +1881,24 @@ int CmdT55xxRecoverPW(const char *Cmd) {
             continue;
         }
         found = tryOnePassword(curr_password);
-        if (found == -1)
-            return 0;
+        if ( found == 1 )
+            goto out;
+
         bit++;
         prev_password = curr_password;
 
-        if (IsCancelled()) return 0;
+        if (IsCancelled()) 
+            return 0;
     }
 
+out:
+
     PrintAndLogEx(NORMAL, "");
 
     if (found == 1)
-        PrintAndLogEx(SUCCESS, "Found valid password: [%08x]", curr_password);
+        PrintAndLogEx(SUCCESS, "Found valid password: [ " _GREEN_("%08X") " ]", curr_password);
     else
-        PrintAndLogEx(WARNING, "Password NOT found.");
+        PrintAndLogEx(WARNING, "Recover pwd failed");
 
     return 0;
 }
diff --git a/client/cmdlft55xx.h b/client/cmdlft55xx.h
index d9539855a..1c1d77490 100644
--- a/client/cmdlft55xx.h
+++ b/client/cmdlft55xx.h
@@ -165,7 +165,7 @@ bool test(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk, bool *Q5)
 int special(const char *Cmd);
 bool AquireData(uint8_t page, uint8_t block, bool pwdmode, uint32_t password);
 
-bool detectPassword(int password);
+int tryOnePassword(uint32_t password);
 
 void printT55x7Trace(t55x7_tracedata_t data, uint8_t repeat);
 void printT5555Trace(t5555_tracedata_t data, uint8_t repeat);

From 34f4ee490285cc72b253313f073a7a6cafc54602 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 26 Mar 2019 20:22:12 +0100
Subject: [PATCH 0924/1938] whitespace

---
 client/loclass/fileutils.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index 0c345ca14..4ac77633a 100644
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -539,7 +539,6 @@ int loadFileDICTIONARY(const char *preferredName, const char *suffix, void *data
         if (strlen(line) < keylen)
             continue;
 
-
         // The line start with # is comment, skip
         if (line[0] == '#')
             continue;

From fb665ea7e38a1896cfbc8fab0d4d0c5a8086f247 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 26 Mar 2019 20:22:39 +0100
Subject: [PATCH 0925/1938] chg: textual

---
 client/cmddata.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/client/cmddata.c b/client/cmddata.c
index 9462fc510..146d30ba7 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -1317,7 +1317,10 @@ int CmdRawDemod(const char *Cmd) {
 void setClockGrid(int clk, int offset) {
     g_DemodStartIdx = offset;
     g_DemodClock = clk;
-    PrintAndLogEx(DEBUG, "DEBUG: (setClockGrid) demodoffset %d, clk %d", offset, clk);
+    if ( clk == 0 && offset == 0) 
+        PrintAndLogEx(DEBUG, "DEBUG: (setClockGrid) clear settings");
+    else
+        PrintAndLogEx(DEBUG, "DEBUG: (setClockGrid) demodoffset %d, clk %d", offset, clk);
 
     if (offset > clk) offset %= clk;
     if (offset < 0) offset += clk;

From 069e73d025808681892f1590d0938f017d9601d5 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 26 Mar 2019 21:13:57 +0100
Subject: [PATCH 0926/1938] preparing for more descramble patterns.

---
 client/cmdlfindala.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/client/cmdlfindala.c b/client/cmdlfindala.c
index aabb0f0e3..64857d702 100644
--- a/client/cmdlfindala.c
+++ b/client/cmdlfindala.c
@@ -238,10 +238,24 @@ int CmdIndalaDemod(const char *Cmd) {
         p1 |= DemodBuffer[32+21] << 2;
         p1 |= DemodBuffer[32+22] << 0;
         p1 |= DemodBuffer[32+24] << 9;
-        
+  
+/*  
+        uint16_t fc = 0;
+        fc |= DemodBuffer[32+ 1] << 0;
+        fc |= DemodBuffer[32+ 2] << 1;
+        fc |= DemodBuffer[32+ 4] << 2;
+        fc |= DemodBuffer[32+ 5] << 3;
+        fc |= DemodBuffer[32+ 7] << 4;
+        fc |= DemodBuffer[32+10] << 5;
+        fc |= DemodBuffer[32+14] << 6;
+        fc |= DemodBuffer[32+15] << 7;
+        fc |= DemodBuffer[32+17] << 8;
+*/
+       
         PrintAndLogEx(NORMAL, "");
         PrintAndLogEx(SUCCESS, "Possible de-scramble patterns");
         PrintAndLogEx(SUCCESS, "\tPrinted     | __%04d__ [0x%X]", p1, p1);
+        //PrintAndLogEx(SUCCESS, "\tPrinted     | __%04d__ [0x%X]", fc, fc);
         PrintAndLogEx(SUCCESS, "\tInternal ID | %" PRIu64 , foo);
         
         

From 15fdb0773770d4693ac4e5f64533e37c6a6257b9 Mon Sep 17 00:00:00 2001
From: mazodude <mazodude2000@gmail.com>
Date: Wed, 27 Mar 2019 08:21:06 +1100
Subject: [PATCH 0927/1938] Start key file for Mifare Ultralight

---
 client/default_ultralight_keys.dic | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 client/default_ultralight_keys.dic

diff --git a/client/default_ultralight_keys.dic b/client/default_ultralight_keys.dic
new file mode 100644
index 000000000..3c0c01acd
--- /dev/null
+++ b/client/default_ultralight_keys.dic
@@ -0,0 +1,5 @@
+#
+# Mifare Ultralight Default Keys
+#   -- iceman fork version --
+#   -- contribute to this list, sharing is caring --
+425245414B4D454946594F5543414E21 -- Sample Key (BREAKMEIFYOUCAN!)

From a068f7c2bce4b9dac44893d854b51315d2d435ec Mon Sep 17 00:00:00 2001
From: vratiskol <vincent.ratiskol@github.com>
Date: Wed, 27 Mar 2019 14:18:26 +0100
Subject: [PATCH 0928/1938] Mifare Sim

Compilation OK
Emulation 1k OK with android
---
 armsrc/mifaresim.c    | 321 ++++++++++++++++++++++++++----------------
 armsrc/mifaresim.h    |  15 --
 armsrc/mifareutil.c   |   4 +-
 armsrc/mifareutil.h   |   5 -
 client/cmdhfmfu.c     |  10 +-
 client/reveng/model.c |   4 +-
 6 files changed, 208 insertions(+), 151 deletions(-)

diff --git a/armsrc/mifaresim.c b/armsrc/mifaresim.c
index 2989ca63d..8c6ce792c 100644
--- a/armsrc/mifaresim.c
+++ b/armsrc/mifaresim.c
@@ -42,7 +42,7 @@ static bool IsTrailerAccessAllowed(uint8_t blockNo, uint8_t keytype, uint8_t act
         case AC_KEYA_WRITE: {
             if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("IsTrailerAccessAllowed: AC_KEYA_WRITE");
             return ((keytype == AUTHKEYA && (AC == 0x00 || AC == 0x01))
-                 || (keytype == AUTHKEYB && (AC == 0x04 || AC == 0x03)));
+                    || (keytype == AUTHKEYB && (AC == 0x04 || AC == 0x03)));
         }
         case AC_KEYB_READ: {
             if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("IsTrailerAccessAllowed: AC_KEYB_READ");
@@ -51,17 +51,17 @@ static bool IsTrailerAccessAllowed(uint8_t blockNo, uint8_t keytype, uint8_t act
         case AC_KEYB_WRITE: {
             if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("IsTrailerAccessAllowed: AC_KEYB_WRITE");
             return ((keytype == AUTHKEYA && (AC == 0x00 || AC == 0x04))
-                 || (keytype == AUTHKEYB && (AC == 0x04 || AC == 0x03)));
+                    || (keytype == AUTHKEYB && (AC == 0x04 || AC == 0x03)));
         }
         case AC_AC_READ: {
             if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("IsTrailerAccessAllowed: AC_AC_READ");
             return ((keytype == AUTHKEYA)
-                || (keytype == AUTHKEYB && !(AC == 0x00 || AC == 0x02 || AC == 0x01)));
+                    || (keytype == AUTHKEYB && !(AC == 0x00 || AC == 0x02 || AC == 0x01)));
         }
         case AC_AC_WRITE: {
             if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("IsTrailerAccessAllowed: AC_AC_WRITE");
             return ((keytype == AUTHKEYA && (AC == 0x01))
-                 || (keytype == AUTHKEYB && (AC == 0x03 || AC == 0x05)));
+                    || (keytype == AUTHKEYB && (AC == 0x03 || AC == 0x05)));
         }
         default:
             return false;
@@ -73,7 +73,7 @@ static bool IsDataAccessAllowed(uint8_t blockNo, uint8_t keytype, uint8_t action
 
     uint8_t sector_trailer[16];
     emlGetMem(sector_trailer, SectorTrailer(blockNo), 1);
-    
+
     uint8_t sector_block;
     if (blockNo <= MIFARE_2K_MAXBLOCK) {
         sector_block = blockNo & 0x03;
@@ -85,22 +85,22 @@ static bool IsDataAccessAllowed(uint8_t blockNo, uint8_t keytype, uint8_t action
     switch (sector_block) {
         case 0x00: {
             AC = ((sector_trailer[7] >> 2) & 0x04)
-               | ((sector_trailer[8] << 1) & 0x02)
-               | ((sector_trailer[8] >> 4) & 0x01);
+                 | ((sector_trailer[8] << 1) & 0x02)
+                 | ((sector_trailer[8] >> 4) & 0x01);
             if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("IsDataAccessAllowed: case 0x00 - %02x", AC);
             break;
         }
         case 0x01: {
             AC = ((sector_trailer[7] >> 3) & 0x04)
-               | ((sector_trailer[8] >> 0) & 0x02)
-               | ((sector_trailer[8] >> 5) & 0x01);
+                 | ((sector_trailer[8] >> 0) & 0x02)
+                 | ((sector_trailer[8] >> 5) & 0x01);
             if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("IsDataAccessAllowed: case 0x01 - %02x", AC);
             break;
         }
         case 0x02: {
             AC = ((sector_trailer[7] >> 4) & 0x04)
-               | ((sector_trailer[8] >> 1) & 0x02)
-               | ((sector_trailer[8] >> 6) & 0x01);
+                 | ((sector_trailer[8] >> 1) & 0x02)
+                 | ((sector_trailer[8] >> 6) & 0x01);
             if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("IsDataAccessAllowed: case 0x02  - %02x", AC);
             break;
         }
@@ -376,6 +376,11 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
 
     uint8_t blockNo;
 
+    uint32_t nr;
+    uint32_t ar;
+
+    bool encrypted_data;
+
     uint8_t cardWRBL = 0;
     uint8_t cardAUTHSC = 0;
     uint8_t cardAUTHKEY = AUTHKEYNONE;  // no authentication
@@ -495,10 +500,10 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
             // init crypto block
             crypto1_destroy(pcs);
             cardAUTHKEY = AUTHKEYNONE;
-            //nonce = prng_successor(selTimer, 32) // RRG Repo, same as prand() ???
-            if (( flags & FLAG_RANDOM_NONCE) == FLAG_RANDOM_NONCE ) {
-                nonce = prand();
-            }
+            //nonce = bytes_to_num(rAUTH_NT, 4);
+            nonce = prng_successor(selTimer, 32);
+            if ((flags & FLAG_RANDOM_NONCE) == FLAG_RANDOM_NONCE) nonce = prand();
+
             LED_B_OFF();
             LED_C_OFF();
             cardSTATE = MFEMUL_SELECT1;
@@ -516,7 +521,6 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                 break;
             }
 
-
             // The anti-collision sequence, which is a mandatory part of the card activation sequence.
             // It auto with 4-byte UID (= Single Size UID),
             // 7 -byte UID (= Double Size UID) or 10-byte UID (= Triple Size UID).
@@ -549,6 +553,8 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                          receivedCmd[1] == 0x70 &&
                          memcmp(&receivedCmd[2], responses[UIDBCC1].response, 4) == 0)) {
                     if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("SELECT CL1 %02x%02x%02x%02x received", receivedCmd[2], receivedCmd[3], receivedCmd[4], receivedCmd[5]);
+
+                    // Send SAK according UID len
                     switch (uid_len) {
                         case 4:
                             switch (MifareCardType) {
@@ -568,27 +574,30 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
 
                             LED_B_ON();
                             cardSTATE = MFEMUL_WORK;
-                            if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("cardSTATE = MFEMUL_WORK");
-                            continue;
+                            if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_SELECT1] cardSTATE = MFEMUL_WORK");
+                            break;
                         case 7:
                             // SAK => Need another select round
                             EmSendPrecompiledCmd(&responses[SAK1]);
                             cardSTATE	= MFEMUL_SELECT2;
-                            if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("cardSTATE = MFEMUL_SELECT2");
-                            continue;
+                            if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_SELECT1] cardSTATE = MFEMUL_SELECT2");
+                            break;
                         case 10:
                             // SAK => Need another select round
                             EmSendPrecompiledCmd(&responses[SAK1]);
                             cardSTATE	= MFEMUL_SELECT2;
-                            if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("cardSTATE = MFEMUL_SELECT2");
-                            continue;
+                            if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_SELECT1] cardSTATE = MFEMUL_SELECT2");
+                            break;
                         default:
                             break;
-                    }
-                }
+                    } // End Switch (uid_len)
 
-                // IDLE
-                cardSTATE_TO_IDLE();
+                } else {
+                    // IDLE
+                    cardSTATE_TO_IDLE();
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_SELECT1] cardSTATE = MFEMUL_IDLE");
+                }
+                // Break Case MFEMUL_SELECT1
                 break;
             }
 
@@ -612,9 +621,9 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
             case MFEMUL_SELECT2: {
                 if (receivedCmd_len == 2 &&
                         (receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2 && receivedCmd[1] == 0x20)) {
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("SELECT ALL CL2 received");
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("[MFEMUL_SELECT2] SELECT ALL CL2 received");
                     EmSendPrecompiledCmd(&responses[UIDBCC2]);
-                    continue;
+                    break;
                 }
 
                 // select cl2 card - 0x95 0x70 xxxxxxxxxxxx
@@ -625,7 +634,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
 
                     switch (uid_len) {
                         case 7:
-                            if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("SELECT CL2 %02x%02x%02x%02x received", receivedCmd[2], receivedCmd[3], receivedCmd[4], receivedCmd[5]);
+                            if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_SELECT2] SELECT CL2 %02x%02x%02x%02x received", receivedCmd[2], receivedCmd[3], receivedCmd[4], receivedCmd[5]);
 
                             switch (MifareCardType) {
                                 case 0:
@@ -648,13 +657,15 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                             // SAK => Need another select round
                             EmSendPrecompiledCmd(&responses[SAK1]);
                             cardSTATE = MFEMUL_SELECT3;
-                            continue;
+                            if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_SELECT2] cardSTATE = MFEMUL_SELECT3");
+                            break;
                         default:
                             break;
                     }
                 }
 
                 cardSTATE_TO_IDLE();
+                if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_SELECT2] cardSTATE = MFEMUL_IDLE");
                 break;
             }
 
@@ -697,71 +708,122 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
 
                     cardSTATE = MFEMUL_WORK;
                     LED_B_ON();
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("--> WORK. anticol3 time: %d", GetTickCount() - selTimer);
-                    break;
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
+                        Dbprintf("[MFEMUL_SELECT3] --> WORK. anticol3 time: %d", GetTickCount() - selTimer);
+                        Dbprintf("[MFEMUL_SELECT3] cardSTATE = MFEMUL_WORK");
+                    }
+                    continue;
                 }
                 cardSTATE_TO_IDLE();
+                if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_SELECT3] cardSTATE = MFEMUL_IDLE");
                 break;
             }
 
-
+            // WORK
             case MFEMUL_WORK: {
-                if (receivedCmd_len == 0) {
+
+                if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("[MFEMUL_WORK] Enter in case");
+
+                if (receivedCmd_len != 4) {
                     LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("All commands must have exactly 4 bytes: receivedCmd_len=%d", receivedCmd_len);
+                    mf_crypto1_decryptEx(pcs, receivedCmd, receivedCmd_len, receivedCmd_dec);
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] All commands must have exactly 4 bytes: receivedCmd_len=%d - Cmd: %02X", receivedCmd_len, receivedCmd_dec);
                     break;
                 }
-                
-                bool encrypted_data = (cardAUTHKEY != AUTHKEYNONE) ;
+
+                if (receivedCmd_len == 0) {
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] NO CMD received");
+                    break;
+                }
+
+                encrypted_data = (cardAUTHKEY != AUTHKEYNONE);
                 if (encrypted_data) {
                     // decrypt seqence
                     mf_crypto1_decryptEx(pcs, receivedCmd, receivedCmd_len, receivedCmd_dec);
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("decrypt seqence");
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] Decrypt seqence");
                 } else {
+                    // Data in clear
                     memcpy(receivedCmd_dec, receivedCmd, receivedCmd_len);
                 }
+
                 if (!HasValidCRC(receivedCmd_dec, receivedCmd_len)) { // all commands must have a valid CRC
                     EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("All commands must have a valid CRC %d", receivedCmd_dec);
+                    if (MF_DBGLEVEL >= 1) Dbprintf("[MFEMUL_WORK] All commands must have a valid CRC %02X (%d)", receivedCmd_dec, receivedCmd_len);
                     break;
                 }
 
                 if (receivedCmd_len == 4 && (receivedCmd_dec[0] == MIFARE_AUTH_KEYA || receivedCmd_dec[0] == MIFARE_AUTH_KEYB)) {
+
+                    // Reader asks for AUTH: 6X XX
+                    // RCV: 60 XX => Using KEY A
+                    // RCV: 61 XX => Using KEY B
+                    // XX: Block number
+
                     // if authenticating to a block that shouldn't exist - as long as we are not doing the reader attack
                     if (receivedCmd_dec[1] > MIFARE_4K_MAXBLOCK && !((flags & FLAG_NR_AR_ATTACK) == FLAG_NR_AR_ATTACK)) {
                         EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
                         if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Reader tried to operate (0x%02x) on out of range block: %d (0x%02x), nacking", receivedCmd_dec[0], receivedCmd_dec[1], receivedCmd_dec[1]);
                         break;
                     }
-                    cardAUTHSC = receivedCmd_dec[1] / 4;  // received block num, Need to check if ok for 4k card ???
+
+                    authTimer = GetTickCount();
+
+                    // received block num -> sector
+                    // Example: 6X  [00]
+                    cardAUTHSC = receivedCmd_dec[1] / 4;
+
+                    // cardAUTHKEY: 60 => Auth use Key A
+                    // cardAUTHKEY: 61 => Auth use Key B
                     cardAUTHKEY = receivedCmd_dec[0] & 0x01;
-                    crypto1_destroy(pcs);
-                    crypto1_create(pcs, emlGetKey(cardAUTHSC, cardAUTHKEY));
+
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] KEY: %02X%02X", emlGetKey(cardAUTHSC, cardAUTHKEY));
 
                     // first authentication
+                    crypto1_destroy(pcs);
+
+                    // Load key into crypto
+                    crypto1_create(pcs, emlGetKey(cardAUTHSC, cardAUTHKEY));
+
                     if (!encrypted_data) {
-                        crypto1_word(pcs, cuid ^ nonce, 0); //Update crypto state
-                        num_to_bytes(nonce, 4, rAUTH_AT);   // Send nonce
-                        if (MF_DBGLEVEL >= 2) Dbprintf("Reader authenticating for block %d (0x%02x) with key %d - %s", receivedCmd_dec[1], receivedCmd_dec[1], cardAUTHKEY, emlGetKey(cardAUTHSC, cardAUTHKEY));
-                    } else { // nested authentication
-                        if (MF_DBGLEVEL >= 2) Dbprintf("Reader doing nested authentication for block %d (0x%02x) with key %d", receivedCmd_dec[1], receivedCmd_dec[1], cardAUTHKEY);
+                        // Receive Cmd in clear txt
+                        // Update crypto state (UID ^ NONCE)
+                        crypto1_word(pcs, cuid ^ nonce, 0);
+                        // prepare nonce
+                        num_to_bytes(nonce, 4, rAUTH_AT);
+                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] Reader authenticating for block %d (0x%02x) with key %d - nonce: %02X - ciud: %02X", receivedCmd_dec[1], receivedCmd_dec[1], cardAUTHKEY, rAUTH_AT, cuid);
+                    } else {
+                        // nested authentication
                         ans = nonce ^ crypto1_word(pcs, cuid ^ nonce, 0);
                         num_to_bytes(ans, 4, rAUTH_AT);
+                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] Reader doing nested authentication for block %d (0x%02x) with key %d", receivedCmd_dec[1], receivedCmd_dec[1], cardAUTHKEY);
                     }
-                    
+
+
                     EmSendCmd(rAUTH_AT, sizeof(rAUTH_AT));
                     cardSTATE = MFEMUL_AUTH1;
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
-                        Dbprintf("cardSTATE = MFEMUL_AUTH1");
-                    }
-                    break;
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] cardSTATE = MFEMUL_AUTH1 - rAUTH_AT: %02X", rAUTH_AT);
+                    continue;
                 }
-                if (!encrypted_data) { // all other commands must be encrypted (authenticated)
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Commands must be encrypted (authenticated)");
+
+                // rule 13 of 7.5.3. in ISO 14443-4. chaining shall be continued
+                // BUT... ACK --> NACK
+                if (receivedCmd_len == 1 && receivedCmd_dec[0] == CARD_ACK) {
+                    EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
                     break;
                 }
 
-                // if Cmd is Read, Write, Inc, Dec, Restore, Transfert
+                // rule 12 of 7.5.3. in ISO 14443-4. R(NAK) --> R(ACK)
+                if (receivedCmd_len == 1 && receivedCmd_dec[0] == CARD_NACK_NA) {
+                    EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_ACK));
+                    break;
+                }
+
+                // if (!encrypted_data) { // all other commands must be encrypted (authenticated)
+                //     if (MF_DBGLEVEL >= 0) Dbprintf("Commands must be encrypted (authenticated)");
+                //     break;
+                // }
+
+                // case MFEMUL_WORK => if Cmd is Read, Write, Inc, Dec, Restore, Transfert
                 if (receivedCmd_dec[0] == ISO14443A_CMD_READBLOCK
                         || receivedCmd_dec[0] == ISO14443A_CMD_WRITEBLOCK
                         || receivedCmd_dec[0] == MIFARE_CMD_INC
@@ -771,84 +833,85 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                     // Check if Block num is not too far
                     if (receivedCmd_dec[1] > MIFARE_4K_MAXBLOCK) {
                         EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
-                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Reader tried to operate (0x%02x) on out of range block: %d (0x%02x), nacking", receivedCmd_dec[0], receivedCmd_dec[1], receivedCmd_dec[1]);
+                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] Reader tried to operate (0x%02x) on out of range block: %d (0x%02x), nacking", receivedCmd_dec[0], receivedCmd_dec[1], receivedCmd_dec[1]);
                         break;
                     }
                     if (receivedCmd_dec[1] / 4 != cardAUTHSC) {
                         EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
-                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Reader tried to operate (0x%02x) on block (0x%02x) not authenticated for (0x%02x), nacking", receivedCmd_dec[0], receivedCmd_dec[1], cardAUTHSC);
+                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] Reader tried to operate (0x%02x) on block (0x%02x) not authenticated for (0x%02x), nacking", receivedCmd_dec[0], receivedCmd_dec[1], cardAUTHSC);
                         break;
                     }
                 }
 
-                // CMD READ block
+                // case MFEMUL_WORK => CMD READ block
                 if (receivedCmd_dec[0] == ISO14443A_CMD_READBLOCK) {
                     blockNo = receivedCmd_dec[1];
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Reader reading block %d (0x%02x)", blockNo, blockNo);
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] Reader reading block %d (0x%02x)", blockNo, blockNo);
                     emlGetMem(response, blockNo, 1);
                     if (MF_DBGLEVEL >= MF_DBG_EXTENDED)  {
-                       Dbprintf("[ISO14443A_CMD_READBLOCK] Data Block[%d]: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", blockNo,
-                       response[0], response[1], response[2], response[3],  response[4],  response[5],  response[6],
-                       response[7], response[8], response[9], response[10], response[11], response[12], response[13],
-                       response[14],response[15]);
+                        Dbprintf("[MFEMUL_WORK - ISO14443A_CMD_READBLOCK] Data Block[%d]: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", blockNo,
+                                 response[0], response[1], response[2], response[3],  response[4],  response[5],  response[6],
+                                 response[7], response[8], response[9], response[10], response[11], response[12], response[13],
+                                 response[14], response[15]);
                     }
 
                     if (IsSectorTrailer(blockNo)) {
-                      
+
                         if (!IsAccessAllowed(blockNo, cardAUTHKEY, AC_KEYA_READ)) {
                             memset(response, 0x00, 6); 	// keyA can never be read, Why ??? Need source ?
-                                                      // a0a1a2a3a4a561e789c1b0b1b2b3b4b5 => 00000000000061e789c1b0b1b2b3b4b5
-                            if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[IsSectorTrailer] keyA can never be read - block %d (0x%02x)", blockNo, blockNo);
+                            // a0a1a2a3a4a561e789c1b0b1b2b3b4b5 => 00000000000061e789c1b0b1b2b3b4b5
+                            if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK - IsSectorTrailer] keyA can never be read - block %d (0x%02x)", blockNo, blockNo);
                         }
                         if (!IsAccessAllowed(blockNo, cardAUTHKEY, AC_KEYB_READ)) {
                             memset(response + 10, 0x00, 6); 	// keyB cannot be read
-                            if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[IsSectorTrailer] keyB cannot be read - block %d (0x%02x)", blockNo, blockNo);
+                            if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK - IsSectorTrailer] keyB cannot be read - block %d (0x%02x)", blockNo, blockNo);
                         }
                         if (!IsAccessAllowed(blockNo, cardAUTHKEY, AC_AC_READ)) {
                             memset(response + 6, 0x00, 4); 	// AC bits cannot be read
-                            if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[IsAccessAllowed] AC bits cannot be read - block %d (0x%02x)", blockNo, blockNo);
+                            if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK - IsAccessAllowed] AC bits cannot be read - block %d (0x%02x)", blockNo, blockNo);
                         }
                     } else {
                         if (!IsAccessAllowed(blockNo, cardAUTHKEY, AC_DATA_READ)) {
                             memset(response, 0x00, 16);		// datablock cannot be read
-                            if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[IsAccessAllowed] Data block %d (0x%02x) cannot be read", blockNo, blockNo);
+                            if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK - IsAccessAllowed] Data block %d (0x%02x) cannot be read", blockNo, blockNo);
                         }
                     }
                     AppendCrc14443a(response, 16);
                     mf_crypto1_encrypt(pcs, response, MAX_MIFARE_FRAME_SIZE, response_par);
                     EmSendCmdPar(response, MAX_MIFARE_FRAME_SIZE, response_par);
                     if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
-                      Dbprintf("[EmSendCmdPar] Data Block[%d]: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", blockNo,
-                      response[0], response[1], response[2], response[3],  response[4],  response[5],  response[6],
-                      response[7], response[8], response[9], response[10], response[11], response[12], response[13],
-                      response[14],response[15]);
-                    }  
+                        Dbprintf("[MFEMUL_WORK - EmSendCmdPar] Data Block[%d]: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", blockNo,
+                                 response[0], response[1], response[2], response[3],  response[4],  response[5],  response[6],
+                                 response[7], response[8], response[9], response[10], response[11], response[12], response[13],
+                                 response[14], response[15]);
+                    }
                     numReads++;
 
                     if (exitAfterNReads > 0 && numReads == exitAfterNReads) {
-                        Dbprintf("%d reads done, exiting", numReads);
+                        Dbprintf("[MFEMUL_WORK] %d reads done, exiting", numReads);
                         finished = true;
                     }
-
                     break;
-                }
 
-                // CMD WRITEBLOCK
+                } // End receivedCmd_dec[0] == ISO14443A_CMD_READBLOCK
+
+                // case MFEMUL_WORK => CMD WRITEBLOCK
                 if (receivedCmd_dec[0] == ISO14443A_CMD_WRITEBLOCK) {
                     blockNo = receivedCmd_dec[1];
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("RECV 0xA0 write block %d (%02x)", blockNo, blockNo);
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] RECV 0xA0 write block %d (%02x)", blockNo, blockNo);
                     EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_ACK));
                     cardWRBL = blockNo;
                     cardSTATE = MFEMUL_WRITEBL2;
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] cardSTATE = MFEMUL_WRITEBL2");
                     break;
                 }
 
-                // CMD INC/DEC/RES
+                // case MFEMUL_WORK => CMD INC/DEC/REST
                 if (receivedCmd_dec[0] == MIFARE_CMD_INC || receivedCmd_dec[0] == MIFARE_CMD_DEC || receivedCmd_dec[0] == MIFARE_CMD_RESTORE) {
                     blockNo = receivedCmd_dec[1];
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("RECV 0x%02x inc(0xC1)/dec(0xC0)/restore(0xC2) block %d (%02x)", receivedCmd_dec[0], blockNo, blockNo);
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] RECV 0x%02x inc(0xC1)/dec(0xC0)/restore(0xC2) block %d (%02x)", receivedCmd_dec[0], blockNo, blockNo);
                     if (emlCheckValBl(blockNo)) {
-                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Reader tried to operate on block, but emlCheckValBl failed, nacking");
+                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] Reader tried to operate on block, but emlCheckValBl failed, nacking");
                         EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
                         break;
                     }
@@ -858,27 +921,29 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                     // INC
                     if (receivedCmd_dec[0] == MIFARE_CMD_INC) {
                         cardSTATE = MFEMUL_INTREG_INC;
-                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("cardSTATE = MFEMUL_INTREG_INC");
+                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] cardSTATE = MFEMUL_INTREG_INC");
                     }
 
                     // DEC
                     if (receivedCmd_dec[0] == MIFARE_CMD_DEC) {
                         cardSTATE = MFEMUL_INTREG_DEC;
-                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("cardSTATE = MFEMUL_INTREG_DEC");
+                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] cardSTATE = MFEMUL_INTREG_DEC");
                     }
 
                     // REST
                     if (receivedCmd_dec[0] == MIFARE_CMD_RESTORE) {
                         cardSTATE = MFEMUL_INTREG_REST;
-                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("cardSTATE = MFEMUL_INTREG_REST");
-                        break;
+                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] cardSTATE = MFEMUL_INTREG_REST");
                     }
-                }
+                    break;
 
-                // TRANSFER
+                } // End case MFEMUL_WORK => CMD INC/DEC/REST
+
+
+                // case MFEMUL_WORK => CMD TRANSFER
                 if (receivedCmd_dec[0] == MIFARE_CMD_TRANSFER) {
                     blockNo = receivedCmd_dec[1];
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("RECV 0x%02x transfer block %d (%02x)", receivedCmd_dec[0], blockNo, blockNo);
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] RECV 0x%02x transfer block %d (%02x)", receivedCmd_dec[0], blockNo, blockNo);
                     if (emlSetValBl(cardINTREG, cardINTBLOCK, receivedCmd_dec[1]))
                         EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
                     else
@@ -886,42 +951,46 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                     break;
                 }
 
-                // HALT
+                // case MFEMUL_WORK => CMD HALT
                 if (receivedCmd_dec[0] == ISO14443A_CMD_HALT && receivedCmd[1] == 0x00) {
                     LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
                     LED_B_OFF();
                     LED_C_OFF();
                     cardSTATE = MFEMUL_HALTED;
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("cardSTATE = MFEMUL_HALTED;");
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("[MFEMUL_WORK] cardSTATE = MFEMUL_HALTED");
                     break;
                 }
 
-                // RATS
+                // case MFEMUL_WORK => CMD RATS
                 if (receivedCmd[0] == ISO14443A_CMD_RATS) {
                     EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
+                    if (MF_DBGLEVEL >= 1)	Dbprintf("[MFEMUL_WORK] RCV RATS => NACK");
                     break;
                 }
 
-                // command not allowed
-                if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("Received command not allowed, nacking");
-                EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
-                break;
+                // case MFEMUL_WORK => command not allowed
+                // if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("Received command not allowed, nacking");
+                // EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
+                // break;
             }
 
+            // AUTH1
             case MFEMUL_AUTH1: {
-                if (receivedCmd_len != 8) {
-                    cardSTATE_TO_IDLE();
-                    LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("MFEMUL_AUTH1: receivedCmd_len != 8 => cardSTATE_TO_IDLE())");
-                    break;
-                }
+                if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("[MFEMUL_AUTH1] Enter case");
 
-                uint32_t nr = bytes_to_num(receivedCmd, 4);
-                uint32_t ar = bytes_to_num(&receivedCmd[4], 4);
+                // if (receivedCmd_len != 4) {
+                //     cardSTATE_TO_IDLE();
+                //     LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                //     if (MF_DBGLEVEL >= 0)	Dbprintf("MFEMUL_AUTH1: receivedCmd_len != 8 (%d) => cardSTATE_TO_IDLE())", receivedCmd_len);
+                //     break;
+                // }
+
+                nr = bytes_to_num(receivedCmd, 4);
+                ar = bytes_to_num(&receivedCmd[4], 4);
 
                 // Collect AR/NR per keytype & sector
                 if ((flags & FLAG_NR_AR_ATTACK) == FLAG_NR_AR_ATTACK) {
-
+                    if (MF_DBGLEVEL >= 0)	Dbprintf("FLAG_NR_AR_ATTACK");
                     for (uint8_t i = 0; i < ATTACK_KEY_COUNT; i++) {
                         if (ar_nr_collected[i + mM] == 0 || ((cardAUTHSC == ar_nr_resp[i + mM].sector) && (cardAUTHKEY == ar_nr_resp[i + mM].keytype) && (ar_nr_collected[i + mM] > 0))) {
                             // if first auth for sector, or matches sector and keytype of previous auth
@@ -986,10 +1055,10 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                 crypto1_word(pcs, nr, 1);
                 cardRr = ar ^ crypto1_word(pcs, 0, 0);
 
-                // test if auth OK
+                // test if auth KO
                 if (cardRr != prng_successor(nonce, 64)) {
                     if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
-                        Dbprintf("AUTH FAILED for sector %d with key %c. [nr=%08x  cardRr=%08x] [nt=%08x succ=%08x]"
+                        Dbprintf("[MFEMUL_AUTH1] AUTH FAILED for sector %d with key %c. [nr=%08x  cardRr=%08x] [nt=%08x succ=%08x]"
                                  , cardAUTHSC
                                  , (cardAUTHKEY == 0) ? 'A' : 'B'
                                  , nr
@@ -998,18 +1067,23 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                                  , prng_successor(nonce, 64)
                                 );
                     }
-
                     cardAUTHKEY = AUTHKEYNONE;	// not authenticated
                     LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
                     cardSTATE_TO_IDLE();
                     break;
                 }
 
-                ans = prng_successor(nonce, 96) ^ crypto1_word(pcs, 0, 0);
+                //ans = prng_successor(nonce, 96) ^ crypto1_word(pcs, 0, 0);
+                //num_to_bytes(ans, 4, rAUTH_AT);
+                //EmSendCmd(rAUTH_AT, sizeof(rAUTH_AT));
+
+                ans = prng_successor(nonce, 96);
                 num_to_bytes(ans, 4, rAUTH_AT);
-                EmSendCmd(rAUTH_AT, sizeof(rAUTH_AT));
+                mf_crypto1_encrypt(pcs, rAUTH_AT, 4, response_par);
+                EmSendCmdPar(rAUTH_AT, 4, response_par);
+
                 if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
-                    Dbprintf("AUTH COMPLETED for sector %d with key %c. time=%d",
+                    Dbprintf("[MFEMUL_AUTH1] AUTH COMPLETED for sector %d with key %c. time=%d",
                              cardAUTHSC,
                              cardAUTHKEY == 0 ? 'A' : 'B',
                              GetTickCount() - authTimer
@@ -1017,11 +1091,10 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                 }
                 LED_C_ON();
                 cardSTATE = MFEMUL_WORK;
-                if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("cardSTATE = MFEMUL_WORK");
+                if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_AUTH1] cardSTATE = MFEMUL_WORK");
                 break;
             }
 
-
             // WRITE BL2
             case MFEMUL_WRITEBL2: {
                 if (receivedCmd_len == MAX_MIFARE_FRAME_SIZE) {
@@ -1046,12 +1119,13 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                         emlSetMem(receivedCmd_dec, cardWRBL, 1);
                         EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_ACK));	// always ACK?
                         cardSTATE = MFEMUL_WORK;
+                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WRITEBL2] cardSTATE = MFEMUL_WORK");
                         break;
                     }
-                } else {
-                    cardSTATE_TO_IDLE();
-                    LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
                 }
+                cardSTATE_TO_IDLE();
+                if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WRITEBL2] cardSTATE = MFEMUL_IDLE");
+                LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
                 break;
             }
 
@@ -1068,13 +1142,15 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                     cardINTREG = cardINTREG + ans;
 
                     cardSTATE = MFEMUL_WORK;
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_INTREG_INC] cardSTATE = MFEMUL_WORK");
                     break;
                 }
             }
 
             // DEC
             case MFEMUL_INTREG_DEC: {
-                if (receivedCmd_len == 6) {
+                if (receivedCmd_len == 6) {  //  Data is encrypted
+                    // Decrypted cmd
                     mf_crypto1_decryptEx(pcs, receivedCmd, receivedCmd_len, (uint8_t *)&ans);
                     if (emlGetValBl(&cardINTREG, &cardINTBLOCK, cardWRBL)) {
                         EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
@@ -1085,6 +1161,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                 LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
                 cardINTREG = cardINTREG - ans;
                 cardSTATE = MFEMUL_WORK;
+                if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_INTREG_DEC] cardSTATE = MFEMUL_WORK");
                 break;
             }
 
@@ -1098,6 +1175,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                 }
                 LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
                 cardSTATE = MFEMUL_WORK;
+                if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_INTREG_REST] cardSTATE = MFEMUL_WORK");
                 break;
             }
 
@@ -1144,12 +1222,11 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
         Dbprintf("Emulator stopped. Tracing: %d  trace length: %d ", get_tracing(), BigBuf_get_traceLen());
     }
 
-// Need to be debug - Card not recognize by my phone if uncommented
-//if ((flags &FLAG_INTERACTIVE) == FLAG_INTERACTIVE) {   // Interactive mode flag, means we need to send ACK
-    //Send the collected ar_nr in the response
 
-//    cmd_send(CMD_ACK, CMD_SIMULATE_MIFARE_CARD, button_pushed, 0, &ar_nr_resp, sizeof(ar_nr_resp));
-//}
+    if ((flags & FLAG_INTERACTIVE) == FLAG_INTERACTIVE) {  // Interactive mode flag, means we need to send ACK
+        //Send the collected ar_nr in the response
+        cmd_send(CMD_ACK, CMD_SIMULATE_MIFARE_CARD, button_pushed, 0, &ar_nr_resp, sizeof(ar_nr_resp));
+    }
 
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     LEDsoff();
diff --git a/armsrc/mifaresim.h b/armsrc/mifaresim.h
index f62071966..c7dab05c5 100644
--- a/armsrc/mifaresim.h
+++ b/armsrc/mifaresim.h
@@ -17,21 +17,6 @@
 
 extern void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *datain);
 
-//mifare emulator states
-#define MFEMUL_NOFIELD      0
-#define MFEMUL_IDLE         1
-#define MFEMUL_SELECT1      2
-#define MFEMUL_SELECT2      3
-#define MFEMUL_SELECT3      4
-#define MFEMUL_AUTH1        5
-#define MFEMUL_AUTH2        6
-#define MFEMUL_WORK	        7
-#define MFEMUL_WRITEBL2     8
-#define MFEMUL_INTREG_INC   9
-#define MFEMUL_INTREG_DEC  10
-#define MFEMUL_INTREG_REST 11
-#define MFEMUL_HALTED      12
-
 #define AC_DATA_READ             0
 #define AC_DATA_WRITE            1
 #define AC_DATA_INC              2
diff --git a/armsrc/mifareutil.c b/armsrc/mifareutil.c
index 5e9214196..ddcdbc326 100644
--- a/armsrc/mifareutil.c
+++ b/armsrc/mifareutil.c
@@ -592,7 +592,7 @@ void emlClearMem(void) {
     memset(emCARD, 0, CARD_MEMORY_SIZE);
 
     // fill sectors trailer data
-    for (uint16_t b = 3; b <= MIFARE_4K_MAXBLOCK; ((b <= MIFARE_2K_MAXBLOCK ) ? (b += 4) : (b += 16)))
+    for (uint16_t b = 3; b <= MIFARE_4K_MAXBLOCK; ((b <= MIFARE_2K_MAXBLOCK) ? (b += 4) : (b += 16)))
         emlSetMem((uint8_t *)trailer, b, 1);
 
     // uid
@@ -602,7 +602,7 @@ void emlClearMem(void) {
 
 uint8_t SectorTrailer(uint8_t blockNo) {
     if (blockNo <= MIFARE_2K_MAXBLOCK) {
-        if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("Sector Trailer for block %d : %d", blockNo, (blockNo | 0x03));  
+        if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("Sector Trailer for block %d : %d", blockNo, (blockNo | 0x03));
         return (blockNo | 0x03);
     } else {
         if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("Sector Trailer for block %d : %d", blockNo, (blockNo | 0x0f));
diff --git a/armsrc/mifareutil.h b/armsrc/mifareutil.h
index 521d80202..4570bb78d 100644
--- a/armsrc/mifareutil.h
+++ b/armsrc/mifareutil.h
@@ -33,11 +33,6 @@
 #define AUTHENTICATION_TIMEOUT 848      // card times out 1ms after wrong authentication (according to NXP documentation)
 #define PRE_AUTHENTICATION_LEADTIME 400 // some (non standard) cards need a pause after select before they are ready for first authentication
 
-// mifare 4bit card answers
-#define CARD_ACK      0x0A  // 1010 - ACK
-#define CARD_NACK_NA  0x04  // 0100 - NACK, not allowed (command not allowed)
-#define CARD_NACK_TR  0x05  // 0101 - NACK, transmission error
-
 // reader voltage field detector
 #define MF_MINFIELDV      4000
 
diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index 85e73d034..4097a0a3a 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -84,11 +84,11 @@ void transform_D(uint8_t *ru) {
     uint32_t v1 = ((ru[3] << 24) | (ru[2] << 16) | (ru[1] << 8) | ru[0]) + c_D[p++];
     uint32_t v2 = ((ru[7] << 24) | (ru[6] << 16) | (ru[5] << 8) | ru[4]) + c_D[p++];
     for (i = 0; i < 12; i += 2) {
-        
+
         uint32_t xor1 = v1 ^ v2;
         uint32_t t1 = ROTL(xor1, v2 & 0x1F) + c_D[p++];
-        uint32_t xor2 = v2 ^ t1;       
-        uint32_t t2 = ROTL(xor2, t1 & 0x1F) + c_D[p++];        
+        uint32_t xor2 = v2 ^ t1;
+        uint32_t t2 = ROTL(xor2, t1 & 0x1F) + c_D[p++];
         uint32_t xor3 = t1 ^ t2;
         uint32_t xor4 = t2 ^ v1;
         v1 = ROTL(xor3, t2 & 0x1F) + c_D[p++];
@@ -322,9 +322,9 @@ static int ul_read(uint8_t page, uint8_t *response, uint16_t responseLength) {
 
 static int ul_comp_write(uint8_t page, uint8_t *data, uint8_t datalen) {
 
-    if (data == NULL) 
+    if (data == NULL)
         return -1;
-    
+
     uint8_t cmd[18];
     memset(cmd, 0x00, sizeof(cmd));
     datalen = (datalen > 16) ? 16 : datalen;
diff --git a/client/reveng/model.c b/client/reveng/model.c
index 16a791312..297f638db 100644
--- a/client/reveng/model.c
+++ b/client/reveng/model.c
@@ -242,9 +242,9 @@ void mrev(model_t *model) {
 
 void mnovel(model_t *model) {
     /* remove name and check string from modified model */
-	/* previous classification no longer applies */
+    /* previous classification no longer applies */
     model->name = NULL;
-	model->flags &= ~P_CLMASK;
+    model->flags &= ~P_CLMASK;
     pfree(&model->check);
     pfree(&model->magic);
 }

From 459835b5ca0e0d8eb3a7b2ec9c73b8ec7f27c3ae Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 27 Mar 2019 15:29:45 +0100
Subject: [PATCH 0929/1938] fix: 'hf mf sim' -  Mifare simulation now works
 against Android etc. Thanks to @eloff

---
 armsrc/iso14443a.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 3e53468de..1b8d9d092 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -3329,9 +3329,18 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
                     break;
                 }
 
+
+                /*
                 ans = prng_successor(nonce, 96) ^ crypto1_word(pcs, 0, 0);
                 num_to_bytes(ans, 4, rAUTH_AT);
                 EmSendCmd(rAUTH_AT, sizeof(rAUTH_AT));
+                */
+
+                ans = prng_successor(nonce, 96);
+                num_to_bytes(ans, 4, response);
+                mf_crypto1_encrypt(pcs, response, 4, response_par);
+                EmSendCmdPar(response, 4, response_par);
+                
                 LED_C_ON();
 
                 if (MF_DBGLEVEL >= 3) {

From 5fd98db92da9b7da43fef8df1bd6c7c5995295b6 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 27 Mar 2019 15:35:43 +0100
Subject: [PATCH 0930/1938] fix: LF FDX-B demod - more lenient with max errors.
 Thanks to @maltehillmann

---
 client/cmddata.c  | 19 +++++++++++--------
 client/cmdlffdx.c |  4 ++--
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/client/cmddata.c b/client/cmddata.c
index 146d30ba7..dfa15f598 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -615,17 +615,20 @@ int Cmdmandecoderaw(const char *Cmd) {
     return 1;
 }
 
-//by marshmellow
-//biphase decode
-//take 01 or 10 = 0 and 11 or 00 = 1
-//takes 2 arguments "offset" default = 0 if 1 it will shift the decode by one bit
-// and "invert" default = 0 if 1 it will invert output
-//  the argument offset allows us to manually shift if the output is incorrect - [EDIT: now auto detects]
+/*
+ *  @author marshmellow
+ * biphase decode
+ * decodes 01 or 10 -> ZERO 
+ *         11 or 00 -> ONE
+ * param offset adjust start position
+ * param invert invert output
+ * param masxErr maximum tolerated errors 
+ */
 int CmdBiphaseDecodeRaw(const char *Cmd) {
     size_t size = 0;
     int offset = 0, invert = 0, maxErr = 20, errCnt = 0;
     char cmdp = tolower(param_getchar(Cmd, 0));
-    if (strlen(Cmd) > 3 || cmdp == 'h') return usage_data_biphaserawdecode();
+    if (strlen(Cmd) > 5 || cmdp == 'h') return usage_data_biphaserawdecode();
 
     sscanf(Cmd, "%i %i %i", &offset, &invert, &maxErr);
     if (DemodBufferLen == 0) {
@@ -665,7 +668,7 @@ int CmdBiphaseDecodeRaw(const char *Cmd) {
 // - ASK Demod then Biphase decode GraphBuffer samples
 int ASKbiphaseDemod(const char *Cmd, bool verbose) {
     //ask raw demod GraphBuffer first
-    int offset = 0, clk = 0, invert = 0, maxErr = 0;
+    int offset = 0, clk = 0, invert = 0, maxErr = 100;
     sscanf(Cmd, "%i %i %i %i", &offset, &clk, &invert, &maxErr);
 
     uint8_t BitStream[MAX_DEMOD_BUF_LEN];
diff --git a/client/cmdlffdx.c b/client/cmdlffdx.c
index bc1f1e9dc..972ef9627 100644
--- a/client/cmdlffdx.c
+++ b/client/cmdlffdx.c
@@ -160,7 +160,7 @@ int getFDXBits(uint64_t national_id, uint16_t country, uint8_t isanimal, uint8_t
 int CmdFDXBdemodBI(const char *Cmd) {
 
     int clk = 32;
-    int invert = 1, errCnt = 0, offset = 0, maxErr = 0;
+    int invert = 1, errCnt = 0, offset = 0, maxErr = 100;
     uint8_t bs[MAX_DEMOD_BUF_LEN];
     size_t size = getFromGraphBuf(bs);
 
@@ -236,7 +236,7 @@ int CmdFdxDemod(const char *Cmd) {
 
     //Differential Biphase / di-phase (inverted biphase)
     //get binary from ask wave
-    if (!ASKbiphaseDemod("0 32 1 0", false)) {
+    if (!ASKbiphaseDemod("0 32 1 100", false)) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - FDX-B ASKbiphaseDemod failed");
         return 0;
     }

From 722c7c3dfad62ca4271c463a5b1b30842c3b361e Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 27 Mar 2019 17:51:08 +0100
Subject: [PATCH 0931/1938] updates

---
 CHANGELOG.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 95c590a52..dc9f264cd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,18 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [unreleased][unreleased]
+ - Add - dictionary key file for MFU. (not in use at the moment) (@mazodude)
+ - Change 'lf fdx demod - better biphase maxerrors. (@MalteHillmann)
+ - Change 'hf mf sim' - now works better against android (@mceloff)
+ - Fix 'lf t55xx brute' - now works after aquiredata adaptations (@iceman)
+ - Fix 'lf t55xx chk' - now works after aquiredata adaptations (@iceman)
+ - Fix 'lf t55xx recoverpwd' - now works after aquiredata adaptations (@iceman)
+ - Fix 'data detect p' - reverted bad clock detection (@iceman)
+ - Change 'data detect a' - better clock detection (@iceman)
+ - Add 'hf 14a info' - now detects some magic card Gen2 (@iceman)
+ - Removed 'LCD' code in armsrc compilation (@iceman)
+ - Change - Generic fixes of codestyle (@doegox) (@iceman)
+ - Change 'lf indala demod' - refactoring (@iceman)
  - Change - handling fault bit markers (7) and partial nibbles in hex printing (@doegox)
  - Change - printing of fault bit markers (7) using a dot (@doegox)
  - Change 'sc upgrade' - firmware file integrity check (@piwi)

From 8f11fcc193738fdd209c37b8ffb61b6f6cf15037 Mon Sep 17 00:00:00 2001
From: vratiskol <vincent.ratiskol@github.com>
Date: Wed, 27 Mar 2019 22:35:11 +0100
Subject: [PATCH 0932/1938] Remove FLAG_RANDOM_NONCE

---
 armsrc/mifaresim.c  | 26 ++++----------------------
 armsrc/mifareutil.h |  1 -
 include/usb_cmd.h   |  1 -
 3 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/armsrc/mifaresim.c b/armsrc/mifaresim.c
index 8c6ce792c..84f350e66 100644
--- a/armsrc/mifaresim.c
+++ b/armsrc/mifaresim.c
@@ -359,7 +359,6 @@ static bool HasValidCRC(uint8_t *receivedCmd, uint16_t receivedCmd_len) {
 * FLAG_7B_UID_IN_DATA - means that there is a 7-byte UID in the data-section, we're expected to use that
 * FLAG_10B_UID_IN_DATA	- use 10-byte UID in the data-section not finished
 *	FLAG_NR_AR_ATTACK  - means we should collect NR_AR responses for bruteforcing later
-* FLAG_RANDOM_NONCE - means we should generate some pseudo-random nonce data (only allows moebius attack)
 *@param exitAfterNReads, exit simulation after n blocks have been read, 0 is infinite ...
 * (unless reader attack mode enabled then it runs util it gets enough nonces to recover all keys attmpted)
 */
@@ -402,7 +401,6 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
     uint8_t response[MAX_MIFARE_FRAME_SIZE] = {0x00};
     uint8_t response_par[MAX_MIFARE_PARITY_SIZE] = {0x00};
 
-    uint8_t rAUTH_NT[] = {0x01, 0x02, 0x03, 0x04};
     uint8_t rAUTH_AT[] = {0x00, 0x00, 0x00, 0x00};
 
     //Here, we collect UID,sector,keytype,NT,AR,NR,NT2,AR2,NR2
@@ -422,14 +420,8 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
     uint8_t	mM = 0; //moebius_modifier for collection storage
 
     // Authenticate response - nonce
-    uint32_t nonce;
-    if ((flags & FLAG_RANDOM_NONCE) == FLAG_RANDOM_NONCE) {
-        nonce = prand();
-    } else {
-        nonce = bytes_to_num(rAUTH_NT, 4);
-    }
-
-
+    uint32_t nonce = prng_successor(selTimer, 32) ;
+  
     if ((flags & FLAG_MF_MINI) == FLAG_MF_MINI) {
         MifareCardType = 0;
         Dbprintf("Mifare Mini");
@@ -500,10 +492,8 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
             // init crypto block
             crypto1_destroy(pcs);
             cardAUTHKEY = AUTHKEYNONE;
-            //nonce = bytes_to_num(rAUTH_NT, 4);
             nonce = prng_successor(selTimer, 32);
-            if ((flags & FLAG_RANDOM_NONCE) == FLAG_RANDOM_NONCE) nonce = prand();
-
+            
             LED_B_OFF();
             LED_C_OFF();
             cardSTATE = MFEMUL_SELECT1;
@@ -1029,11 +1019,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                                                 // switch to moebius collection
                                                 gettingMoebius = true;
                                                 mM = ATTACK_KEY_COUNT;
-                                                if ((flags & FLAG_RANDOM_NONCE) == FLAG_RANDOM_NONCE)  {
-                                                    nonce = prand();
-                                                } else {
-                                                    nonce = nonce * 7;
-                                                }
+                                                nonce = nonce * 7;
                                                 break;
                                             }
                                         } else {
@@ -1073,10 +1059,6 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                     break;
                 }
 
-                //ans = prng_successor(nonce, 96) ^ crypto1_word(pcs, 0, 0);
-                //num_to_bytes(ans, 4, rAUTH_AT);
-                //EmSendCmd(rAUTH_AT, sizeof(rAUTH_AT));
-
                 ans = prng_successor(nonce, 96);
                 num_to_bytes(ans, 4, rAUTH_AT);
                 mf_crypto1_encrypt(pcs, rAUTH_AT, 4, response_par);
diff --git a/armsrc/mifareutil.h b/armsrc/mifareutil.h
index 4570bb78d..a6d4c28fe 100644
--- a/armsrc/mifareutil.h
+++ b/armsrc/mifareutil.h
@@ -61,7 +61,6 @@
 #define MFEMUL_SELECT2      3
 #define MFEMUL_SELECT3      4
 #define MFEMUL_AUTH1        5
-#define MFEMUL_AUTH2        6
 #define MFEMUL_WORK         7
 #define MFEMUL_WRITEBL2     8
 #define MFEMUL_INTREG_INC   9
diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index bd270c9d4..f164b0f8d 100644
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -290,7 +290,6 @@ typedef struct {
 #define FLAG_10B_UID_IN_DATA    0x08
 #define FLAG_UID_IN_EMUL        0x10
 #define FLAG_NR_AR_ATTACK       0x20
-#define FLAG_RANDOM_NONCE       0x40
 #define FLAG_MF_MINI            0x80
 #define FLAG_MF_1K              0x100
 #define FLAG_MF_2K              0x200

From b3b5d294523044e2198f898538530270cd99f71b Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 27 Mar 2019 22:48:46 +0100
Subject: [PATCH 0933/1938] nonce2key makefile: fix race condition when using
 make -jN and add header dependency

---
 tools/nonce2key/Makefile | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/tools/nonce2key/Makefile b/tools/nonce2key/Makefile
index 99f9a3598..44657419a 100644
--- a/tools/nonce2key/Makefile
+++ b/tools/nonce2key/Makefile
@@ -1,20 +1,23 @@
 CC = gcc
-LD = gcc
-CFLAGS = -std=c99 -Wall -O3 -c
-LDFLAGS =
+CFLAGS = -std=c99 -Wall -O3 -I.
+LDFLAGS = -std=c99 -Wall
+SRC := $(wildcard *.c)
+OBJ := $(SRC:.c=.o)
+DEP := $(SRC:.c=.d)
+PROG := nonce2key
 
-OBJS = crypto1.o crapto1.o
-HEADERS = crapto1.h
-EXES = nonce2key
-WINEXES = $(patsubst %, %.exe, $(EXES))
+all: $(PROG)
 
-all: $(OBJS) $(EXES)
-
-%.o : %.c
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-% : %.c
-	$(LD) $(LDFLAGS) -o $@ $(OBJS) $<
+$(PROG): $(OBJ)
+	$(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@
 
 clean:
-	rm -f $(OBJS) $(EXES) $(WINEXES)
+	@$(RM) $(DEP) $(OBJ) $(PROG)
+
+ifneq ($(filter clean,$(MAKECMDGOALS)),clean)
+-include $(DEP)
+endif
+
+%.d: %.c
+	$(info GEN $@)
+	@$(CC) -MM $(CFLAGS) $< | sed 's/\($*\)\.o[ :]*/\1.o $@ : /g' > $@

From 2ebada74f094dd9a1aff65d619d801f5c571b70a Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 27 Mar 2019 23:13:32 +0100
Subject: [PATCH 0934/1938] makefile: fix race condition, now we can make -j8
 :)

---
 client/Makefile | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/client/Makefile b/client/Makefile
index ec12dedca..705e8db47 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -347,28 +347,28 @@ cbor_build:
 print-%: ; @echo $* = $($*)
 
 $(OBJDIR)/%_NOSIMD.o : %.c $(OBJDIR)/%_NOSIMD.d
-	$(CC) $(DEPFLAGS) $(CFLAGS) $(HARD_SWITCH_NOSIMD) -c -o $@ $<
-	$(POSTCOMPILE:%.d=%_NOSIMD.d)
+	$(CC) $(DEPFLAGS:%.Td=%_NOSIMD.Td) $(CFLAGS) $(HARD_SWITCH_NOSIMD) -c -o $@ $<
+	$(MV) -f $(OBJDIR)/$*_NOSIMD.Td $(OBJDIR)/$*_NOSIMD.d
 
 $(OBJDIR)/%_MMX.o : %.c $(OBJDIR)/%_MMX.d
-	$(CC) $(DEPFLAGS) $(CFLAGS) $(HARD_SWITCH_MMX) -c -o $@ $<
-	$(POSTCOMPILE:%.d=%_MMX.d)
+	$(CC) $(DEPFLAGS:%.Td=%_MMX.Td) $(CFLAGS) $(HARD_SWITCH_MMX) -c -o $@ $<
+	$(MV) -f $(OBJDIR)/$*_MMX.Td $(OBJDIR)/$*_MMX.d
 
 $(OBJDIR)/%_SSE2.o : %.c $(OBJDIR)/%_SSE2.d
-	$(CC) $(DEPFLAGS) $(CFLAGS) $(HARD_SWITCH_SSE2) -c -o $@ $<
-	$(POSTCOMPILE:%.d=%_SSE2.d)
+	$(CC) $(DEPFLAGS:%.Td=%_SSE2.Td) $(CFLAGS) $(HARD_SWITCH_SSE2) -c -o $@ $<
+	$(MV) -f $(OBJDIR)/$*_SSE2.Td $(OBJDIR)/$*_SSE2.d
 
 $(OBJDIR)/%_AVX.o : %.c $(OBJDIR)/%_AVX.d
-	$(CC) $(DEPFLAGS) $(CFLAGS) $(HARD_SWITCH_AVX) -c -o $@ $<
-	$(POSTCOMPILE:%.d=%_AVX.d)
+	$(CC) $(DEPFLAGS:%.Td=%_AVX.Td) $(CFLAGS) $(HARD_SWITCH_AVX) -c -o $@ $<
+	$(MV) -f $(OBJDIR)/$*_AVX.Td $(OBJDIR)/$*_AVX.d
 
 $(OBJDIR)/%_AVX2.o : %.c $(OBJDIR)/%_AVX2.d
-	$(CC) $(DEPFLAGS) $(CFLAGS) $(HARD_SWITCH_AVX2) -c -o $@ $<
-	$(POSTCOMPILE:%.d=%_AVX2.d)
+	$(CC) $(DEPFLAGS:%.Td=%_AVX2.Td) $(CFLAGS) $(HARD_SWITCH_AVX2) -c -o $@ $<
+	$(MV) -f $(OBJDIR)/$*_AVX2.Td $(OBJDIR)/$*_AVX2.d
 
 $(OBJDIR)/%_AVX512.o : %.c $(OBJDIR)/%_AVX512.d
-	$(CC) $(DEPFLAGS) $(CFLAGS) $(HARD_SWITCH_AVX512) -c -o $@ $<
-	$(POSTCOMPILE:%.d=%_AVX512.d)
+	$(CC) $(DEPFLAGS:%.Td=%_AVX512.Td) $(CFLAGS) $(HARD_SWITCH_AVX512) -c -o $@ $<
+	$(MV) -f $(OBJDIR)/$*_AVX512.Td $(OBJDIR)/$*_AVX512.d
 
 %.o: %.c
 $(OBJDIR)/%.o : %.c $(OBJDIR)/%.d

From 953107294868ec77135afbcac57d5b749ad7826c Mon Sep 17 00:00:00 2001
From: vratiskol <vincent.ratiskol@github.com>
Date: Wed, 27 Mar 2019 23:33:02 +0100
Subject: [PATCH 0935/1938] Add ignore json file

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 9a12efbe5..38058230d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,7 @@
 *.exe
 *.dsym
 version.c
+*.json
 
 !client/hardnested/*.bin
 !client/hardnested/tables/*.z

From edfce24cad0f029290e9ee2d41e0802c6e1a615f Mon Sep 17 00:00:00 2001
From: vratiskol <vincent.ratiskol@github.com>
Date: Thu, 28 Mar 2019 00:37:48 +0100
Subject: [PATCH 0936/1938] cardAUTHKEY log

Add key type as A or B
---
 armsrc/mifaresim.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/armsrc/mifaresim.c b/armsrc/mifaresim.c
index 84f350e66..31cafb2d4 100644
--- a/armsrc/mifaresim.c
+++ b/armsrc/mifaresim.c
@@ -766,7 +766,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                     // cardAUTHKEY: 61 => Auth use Key B
                     cardAUTHKEY = receivedCmd_dec[0] & 0x01;
 
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] KEY: %02X%02X", emlGetKey(cardAUTHSC, cardAUTHKEY));
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] KEY %c: %02X%02X", (cardAUTHKEY == 0) ? 'A' : 'B', emlGetKey(cardAUTHSC, cardAUTHKEY));
 
                     // first authentication
                     crypto1_destroy(pcs);
@@ -780,12 +780,12 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                         crypto1_word(pcs, cuid ^ nonce, 0);
                         // prepare nonce
                         num_to_bytes(nonce, 4, rAUTH_AT);
-                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] Reader authenticating for block %d (0x%02x) with key %d - nonce: %02X - ciud: %02X", receivedCmd_dec[1], receivedCmd_dec[1], cardAUTHKEY, rAUTH_AT, cuid);
+                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] Reader authenticating for block %d (0x%02x) with key %c - nonce: %02X - ciud: %02X", receivedCmd_dec[1], receivedCmd_dec[1], (cardAUTHKEY == 0) ? 'A' : 'B', rAUTH_AT, cuid);
                     } else {
                         // nested authentication
                         ans = nonce ^ crypto1_word(pcs, cuid ^ nonce, 0);
                         num_to_bytes(ans, 4, rAUTH_AT);
-                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] Reader doing nested authentication for block %d (0x%02x) with key %d", receivedCmd_dec[1], receivedCmd_dec[1], cardAUTHKEY);
+                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] Reader doing nested authentication for block %d (0x%02x) with key %c", receivedCmd_dec[1], receivedCmd_dec[1], (cardAUTHKEY == 0) ? 'A' : 'B');
                     }
 
 

From db4aa08b78205580474bab5d755ac414ed2c7adb Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 28 Mar 2019 14:19:41 +0100
Subject: [PATCH 0937/1938] make style

---
 armsrc/hitag2.c         |  12 +-
 armsrc/iso14443a.c      |   2 +-
 armsrc/mifarecmd.c      |  12 +-
 armsrc/pcf7931.c        |  16 +-
 client/cmdcrc.c         |   2 +-
 client/cmddata.c        |  24 +-
 client/cmdhf14a.c       |  16 +-
 client/cmdhffelica.c    |   8 +-
 client/cmdhficlass.c    |   2 +-
 client/cmdhflegic.c     |   2 +-
 client/cmdhfmfu.c       |  10 +-
 client/cmdlfhitag.c     |  34 +-
 client/cmdlfindala.c    | 152 ++++----
 client/cmdlfkeri.c      |   8 +-
 client/cmdlfpyramid.c   |  10 +-
 client/cmdlft55xx.c     |  64 ++--
 client/cmdsmartcard.c   |  10 +-
 client/fpga_compress.c  |  10 +-
 client/reveng/cli.c     |   2 +-
 client/reveng/model.c   |   4 +-
 client/reveng/poly.c    |   6 +-
 client/reveng/preset.c  | 756 ++++++++++++++++++++--------------------
 client/scripting.c      |  14 +-
 client/util.c           |   4 +-
 common/lfdemod.c        |  48 +--
 tools/mfkey/Makefile    |   2 +-
 tools/mfkey/mfkey32.c   |   2 +-
 tools/mfkey/mfkey32v2.c |   2 +-
 28 files changed, 617 insertions(+), 617 deletions(-)

diff --git a/armsrc/hitag2.c b/armsrc/hitag2.c
index 0c602e00b..43c1bd831 100644
--- a/armsrc/hitag2.c
+++ b/armsrc/hitag2.c
@@ -138,7 +138,7 @@ static void hitag_send_bit(int bit) {
 
 static void hitag_send_frame(const uint8_t *frame, size_t frame_len) {
     // SOF - send start of frame
-        hitag_send_bit(1);
+    hitag_send_bit(1);
     hitag_send_bit(1);
     hitag_send_bit(1);
     hitag_send_bit(1);
@@ -399,10 +399,10 @@ static bool hitag2_write_page(uint8_t *rx, const size_t rxlen, uint8_t *tx, size
             break;
         case WRITE_STATE_PAGENUM_WRITTEN:
             // Check if page number was received correctly
-            if (   (rxlen == 10) 
-                && (rx[0] == (0x82 | (blocknr << 3) | ((blocknr ^ 7) >> 2)))
-                && (rx[1] == (((blocknr & 0x3) ^ 0x3) << 6))) {
-                    
+            if ((rxlen == 10)
+                    && (rx[0] == (0x82 | (blocknr << 3) | ((blocknr ^ 7) >> 2)))
+                    && (rx[1] == (((blocknr & 0x3) ^ 0x3) << 6))) {
+
                 *txlen = 32;
                 memset(tx, 0, HITAG_FRAME_LEN);
                 memcpy(tx, writedata, 4);
@@ -1280,7 +1280,7 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
 
         // Receive frame, watch for at most T0*EOF periods
         while (AT91C_BASE_TC1->TC_CV < T0 * HITAG_T_WAIT_MAX) {
-            
+
             // Check if falling edge in tag modulation is detected
             if (AT91C_BASE_TC1->TC_SR & AT91C_TC_LDRAS) {
                 // Retrieve the new timing values
diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 1b8d9d092..20ca3bdb2 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -3340,7 +3340,7 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
                 num_to_bytes(ans, 4, response);
                 mf_crypto1_encrypt(pcs, response, 4, response_par);
                 EmSendCmdPar(response, 4, response_par);
-                
+
                 LED_C_ON();
 
                 if (MF_DBGLEVEL >= 3) {
diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index 65f0bdb22..f6b7692e2 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -1938,13 +1938,13 @@ void MifareCIdent() {
     uint8_t *buf = BigBuf_malloc(USB_CMD_DATA_SIZE);
     uint8_t *uid = BigBuf_malloc(10);
     uint32_t cuid = 0;
-    
+
     iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
 
     // Generation 1 test
     ReaderTransmitBitsPar(wupC1, 7, NULL, NULL);
     if (!ReaderReceive(rec, recpar) || (rec[0] != 0x0a)) {
-        goto TEST2;         
+        goto TEST2;
     };
     isGen = GEN_1B;
 
@@ -1960,10 +1960,10 @@ TEST2:
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     SpinDelay(100);
     iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
-    
+
     int res = iso14443a_select_card(uid, NULL, &cuid, true, 0, true);
-    if ( res == 2 ) {
-        ReaderTransmit(rats, sizeof(rats), NULL);      
+    if (res == 2) {
+        ReaderTransmit(rats, sizeof(rats), NULL);
         res = ReaderReceive(buf, par);
         if (memcmp(buf, "\x09\x78\x00\x91\x02\xDA\xBC\x19\x10\xF0\x05", 11) == 0) {
             isGen = GEN_2;
@@ -1973,7 +1973,7 @@ TEST2:
             isGen = GEN_2;
         }
     };
-    
+
 OUT:
     cmd_send(CMD_ACK, isGen, 0, 0, 0, 0);
     // turns off
diff --git a/armsrc/pcf7931.c b/armsrc/pcf7931.c
index d0edc2698..a308853e7 100644
--- a/armsrc/pcf7931.c
+++ b/armsrc/pcf7931.c
@@ -137,15 +137,15 @@ bool IsBlock0PCF7931(uint8_t *block) {
 bool IsBlock1PCF7931(uint8_t *block) {
     // assuming all RFU bits are set to 0
     if (block[10] == 0
-        && block[11] == 0 
-        && block[12] == 0 
-        && block[13] == 0) {
-        
-        if ( (block[14] & 0x7f) <= 9 
-              && block[15] <= 9) {
-                return true;
-            }
+            && block[11] == 0
+            && block[12] == 0
+            && block[13] == 0) {
+
+        if ((block[14] & 0x7f) <= 9
+                && block[15] <= 9) {
+            return true;
         }
+    }
     return false;
 }
 
diff --git a/client/cmdcrc.c b/client/cmdcrc.c
index 178df6add..7b1819c0e 100644
--- a/client/cmdcrc.c
+++ b/client/cmdcrc.c
@@ -93,7 +93,7 @@ int GetModels(char *Models[], int *count, uint8_t *width) {
                 PrintAndLogEx(WARNING, "out of memory?");
                 return 0;
             }
-            if ( model.name != NULL ) {
+            if (model.name != NULL) {
                 memcpy(tmp, model.name, size);
                 Models[mode] = tmp;
                 width[mode] = plen(model.spoly);
diff --git a/client/cmddata.c b/client/cmddata.c
index dfa15f598..5b3074433 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -459,7 +459,7 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
     uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
 
     sscanf(Cmd, "%i %i %i %i %c", &clk, &invert, &maxErr, &maxLen, &amp);
-    
+
     if (!maxLen) maxLen = BIGBUF_SIZE;
 
     if (invert != 0 && invert != 1) {
@@ -486,17 +486,17 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
     if (amp == 'a') {
         askAmp(bits, BitLen);
     }
-        
+
     size_t ststart = 0, stend = 0;
 //    if (*stCheck)
     bool st = DetectST(bits, &BitLen, &foundclk, &ststart, &stend);
 
-    if ( clk == 0 ) {
-        if ( foundclk == 32 || foundclk == 64 ) {
+    if (clk == 0) {
+        if (foundclk == 32 || foundclk == 64) {
             clk = foundclk;
         }
     }
-    
+
     if (st) {
         *stCheck = st;
         CursorCPos = ststart;
@@ -618,11 +618,11 @@ int Cmdmandecoderaw(const char *Cmd) {
 /*
  *  @author marshmellow
  * biphase decode
- * decodes 01 or 10 -> ZERO 
+ * decodes 01 or 10 -> ZERO
  *         11 or 00 -> ONE
  * param offset adjust start position
  * param invert invert output
- * param masxErr maximum tolerated errors 
+ * param masxErr maximum tolerated errors
  */
 int CmdBiphaseDecodeRaw(const char *Cmd) {
     size_t size = 0;
@@ -1098,9 +1098,9 @@ int CmdFSKrawdemod(const char *Cmd) {
 //attempt to psk1 demod graph buffer
 int PSKDemod(const char *Cmd, bool verbose) {
     int invert = 0, clk = 0, maxErr = 100;
-    
+
     sscanf(Cmd, "%i %i %i", &clk, &invert, &maxErr);
-   
+
     if (clk == 1) {
         invert = 1;
         clk = 0;
@@ -1115,9 +1115,9 @@ int PSKDemod(const char *Cmd, bool verbose) {
 
     uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
     size_t bitlen = getFromGraphBuf(bits);
-    if (bitlen == 0) 
+    if (bitlen == 0)
         return 0;
-    
+
     int startIdx = 0;
     int errCnt = pskRawDemod_ext(bits, &bitlen, &clk, &invert, &startIdx);
     if (errCnt > maxErr) {
@@ -1320,7 +1320,7 @@ int CmdRawDemod(const char *Cmd) {
 void setClockGrid(int clk, int offset) {
     g_DemodStartIdx = offset;
     g_DemodClock = clk;
-    if ( clk == 0 && offset == 0) 
+    if (clk == 0 && offset == 0)
         PrintAndLogEx(DEBUG, "DEBUG: (setClockGrid) clear settings");
     else
         PrintAndLogEx(DEBUG, "DEBUG: (setClockGrid) demodoffset %d, clk %d", offset, clk);
diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 45fcbcb33..0894c578f 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -524,7 +524,7 @@ int CmdHF14AInfo(const char *Cmd) {
                           (tb1 ? "" : " NOT"),
                           (tc1 ? "" : " NOT"),
                           fsci,
-                          fsci < sizeof(atsFSC)/sizeof(atsFSC[0]) ? atsFSC[fsci] : -1
+                          fsci < sizeof(atsFSC) / sizeof(atsFSC[0]) ? atsFSC[fsci] : -1
                          );
         }
         pos = 2;
@@ -544,8 +544,8 @@ int CmdHF14AInfo(const char *Cmd) {
                           ((card.ats[pos] & 0x80) ? " NOT" : ""),
                           dr,
                           ds
-                  );
-                  
+                         );
+
             pos++;
         }
         if (tb1) {
@@ -959,7 +959,7 @@ int SelectCard14443_4(bool disconnect, iso14a_card_select_t *card) {
         // get frame length from ATS in data field
         if (resp.arg[0] > 1) {
             uint8_t fsci = resp.d.asBytes[1] & 0x0f;
-            if (fsci < sizeof(atsFSC)/sizeof(atsFSC[0]))
+            if (fsci < sizeof(atsFSC) / sizeof(atsFSC[0]))
                 frameLength = atsFSC[fsci];
         }
     } else {
@@ -967,7 +967,7 @@ int SelectCard14443_4(bool disconnect, iso14a_card_select_t *card) {
         iso14a_card_select_t *vcard = (iso14a_card_select_t *) resp.d.asBytes;
         if (vcard->ats_len > 1) {
             uint8_t fsci = vcard->ats[1] & 0x0f;
-            if (fsci < sizeof(atsFSC)/sizeof(atsFSC[0]))
+            if (fsci < sizeof(atsFSC) / sizeof(atsFSC[0]))
                 frameLength = atsFSC[fsci];
         }
 
@@ -1000,10 +1000,10 @@ int CmdExchangeAPDU(bool chainingin, uint8_t *datain, int datainlen, bool activa
     // here length USB_CMD_DATA_SIZE=512
     // timeout must be authomatically set by "get ATS"
     UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_APDU | ISO14A_NO_DISCONNECT | cmdc, (datainlen & 0xFFFF), 0}};
-    
-    if ( datain )
+
+    if (datain)
         memcpy(c.d.asBytes, datain, datainlen);
-    
+
     SendCommand(&c);
 
     uint8_t *recv;
diff --git a/client/cmdhffelica.c b/client/cmdhffelica.c
index dc9234001..39dbdbc9b 100644
--- a/client/cmdhffelica.c
+++ b/client/cmdhffelica.c
@@ -425,8 +425,8 @@ int CmdHFFelicaDumpLite(const char *Cmd) {
     }
 
     uint64_t tracelen = resp.arg[1];
-    if (tracelen == 0) 
-        return 1;   
+    if (tracelen == 0)
+        return 1;
 
     uint8_t *trace = calloc(tracelen, sizeof(uint8_t));
     if (trace == NULL) {
@@ -444,14 +444,14 @@ int CmdHFFelicaDumpLite(const char *Cmd) {
 
     print_hex_break(trace, tracelen, 32);
     printSep();
-    
+
     uint16_t tracepos = 0;
     while (tracepos < tracelen)
         tracepos = PrintFliteBlock(tracepos, trace, tracelen);
 
     printSep();
 
-    free(trace);        
+    free(trace);
     return 0;
 }
 
diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index 4fd8b5b1f..39a25019c 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -785,7 +785,7 @@ int CmdHFiClassDecrypt(const char *Cmd) {
 
     saveFile(outfilename, "bin", decrypted, fsize);
     printIclassDumpContents(decrypted, 1, (fsize / 8), fsize);
-    free(decrypted);    
+    free(decrypted);
     return 0;
 }
 
diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index 7aa93f456..867aada9a 100644
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -1282,7 +1282,7 @@ int CmdLegicWipe(const char *Cmd) {
         }
     }
     PrintAndLogEx(SUCCESS, "ok\n");
-    free(data);    
+    free(data);
     return 0;
 }
 
diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index 85e73d034..4097a0a3a 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -84,11 +84,11 @@ void transform_D(uint8_t *ru) {
     uint32_t v1 = ((ru[3] << 24) | (ru[2] << 16) | (ru[1] << 8) | ru[0]) + c_D[p++];
     uint32_t v2 = ((ru[7] << 24) | (ru[6] << 16) | (ru[5] << 8) | ru[4]) + c_D[p++];
     for (i = 0; i < 12; i += 2) {
-        
+
         uint32_t xor1 = v1 ^ v2;
         uint32_t t1 = ROTL(xor1, v2 & 0x1F) + c_D[p++];
-        uint32_t xor2 = v2 ^ t1;       
-        uint32_t t2 = ROTL(xor2, t1 & 0x1F) + c_D[p++];        
+        uint32_t xor2 = v2 ^ t1;
+        uint32_t t2 = ROTL(xor2, t1 & 0x1F) + c_D[p++];
         uint32_t xor3 = t1 ^ t2;
         uint32_t xor4 = t2 ^ v1;
         v1 = ROTL(xor3, t2 & 0x1F) + c_D[p++];
@@ -322,9 +322,9 @@ static int ul_read(uint8_t page, uint8_t *response, uint16_t responseLength) {
 
 static int ul_comp_write(uint8_t page, uint8_t *data, uint8_t datalen) {
 
-    if (data == NULL) 
+    if (data == NULL)
         return -1;
-    
+
     uint8_t cmd[18];
     memset(cmd, 0x00, sizeof(cmd));
     datalen = (datalen > 16) ? 16 : datalen;
diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index c0d24c0bb..166787ba4 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -344,7 +344,7 @@ int CmdLFHitagSim(const char *Cmd) {
 }
 
 static void printHitagConfiguration(uint8_t config) {
-    
+
     char msg[100];
     memset(msg, 0, sizeof(msg));
 
@@ -357,10 +357,10 @@ static void printHitagConfiguration(uint8_t config) {
 
     PrintAndLogEx(INFO, "\n\nHitag2 tag information ");
     PrintAndLogEx(INFO, "------------------------------------");
-    
+
     //configuration byte
-    PrintAndLogEx(SUCCESS, "Config byte : 0x%02X [ %s ]", config, bits);    
-    
+    PrintAndLogEx(SUCCESS, "Config byte : 0x%02X [ %s ]", config, bits);
+
     // encoding
     strcat(msg, "Encoding    : ");
     if (config & 0x1) {
@@ -415,7 +415,7 @@ static void printHitagConfiguration(uint8_t config) {
     memset(msg, 0, sizeof(msg));
 
     // page access
-    strcat(msg, "Page 4,5    : ");    
+    strcat(msg, "Page 4,5    : ");
     if (config & 0x20) {
         strcat(msg + strlen(msg), "read only");
     } else  {
@@ -467,9 +467,9 @@ static bool getHitagUid(uint32_t *uid) {
         return false;
     }
 
-    if ( uid )
+    if (uid)
         *uid = bytes_to_num(resp.d.asBytes, 4);
-   
+
     return true;
 }
 
@@ -480,18 +480,18 @@ int CmdLFHitagInfo(const char *Cmd) {
 
     char ctmp = tolower(param_getchar(Cmd, 0));
     if (ctmp == 'h') return usage_hitag_info();
-    
+
     // pwd or key
 
     // read UID
     uint32_t uid = 0;
-    if ( getHitagUid( &uid ) == false ) 
+    if (getHitagUid(&uid) == false)
         return 1;
-    
+
     PrintAndLogEx(SUCCESS, "UID: %08X", uid);
-    
+
     // how to detemine Hitag types?
-    
+
     // read block3,  get configuration byte.
 
     // common configurations.
@@ -503,7 +503,7 @@ int CmdLFHitagInfo(const char *Cmd) {
     return 0;
 }
 
-// TODO: iceman 
+// TODO: iceman
 // Hitag2 reader,  problem is that this command mixes up stuff.  So 26 give uid.  21 etc will also give you a memory dump !?
 //
 int CmdLFHitagReader(const char *Cmd) {
@@ -568,8 +568,8 @@ int CmdLFHitagReader(const char *Cmd) {
 
     PrintAndLogEx(SUCCESS, "Valid Hitag2 tag found - UID: %08x", id);
     if (htf != RHT2F_UID_ONLY) {
-        
-        PrintAndLogEx(SUCCESS, "Dumping tag memory..." );
+
+        PrintAndLogEx(SUCCESS, "Dumping tag memory...");
         uint8_t *data = resp.d.asBytes;
 
         char filename[FILE_PATH_SIZE];
@@ -580,9 +580,9 @@ int CmdLFHitagReader(const char *Cmd) {
         saveFile(filename, "bin", data, 48);
         saveFileEML(filename, "eml", data, 48, 4);
         saveFileJSON(filename, "json", jsfHitag, data, 48);
-        
+
         // block3, 1 byte
-        printHitagConfiguration(data[4*3] );
+        printHitagConfiguration(data[4 * 3]);
     }
     return 0;
 }
diff --git a/client/cmdlfindala.c b/client/cmdlfindala.c
index 64857d702..c6be8bd29 100644
--- a/client/cmdlfindala.c
+++ b/client/cmdlfindala.c
@@ -47,7 +47,7 @@ int usage_lf_indala_sim(void) {
 
 int usage_lf_indala_clone(void) {
     PrintAndLogEx(NORMAL, "");
-        PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  lf indala clone [h]<l> <uid> [Q5]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "            h :  This help");
@@ -64,27 +64,27 @@ int usage_lf_indala_clone(void) {
 // redesigned by marshmellow adjusted from existing decode functions
 // indala id decoding
 int detectIndala(uint8_t *dest, size_t *size, uint8_t *invert) {
-   
-    uint8_t preamble64_i[]  = {0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0};    
+
+    uint8_t preamble64_i[]  = {0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0};
     uint8_t preamble224_i[] = {0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0};
-    
+
     size_t idx = 0;
     size_t found_size = *size;
-    
-    // PSK1 
+
+    // PSK1
     bool res = preambleSearch(dest, preamble64, sizeof(preamble64), &found_size, &idx);
-    if ( res ) {
+    if (res) {
         PrintAndLogEx(DEBUG, "DEBUG: detectindala PSK1 found 64");
         goto out;
     }
     idx = 0;
     found_size = *size;
     res = preambleSearch(dest, preamble64_i, sizeof(preamble64_i), &found_size, &idx);
-    if ( res ) {
+    if (res) {
         PrintAndLogEx(DEBUG, "DEBUG: detectindala PSK1 found 64 inverted preamble");
         goto inv;
     }
-    
+
     /*
     idx = 0;
     found_size = *size;
@@ -93,12 +93,12 @@ int detectIndala(uint8_t *dest, size_t *size, uint8_t *invert) {
         PrintAndLogEx(DEBUG, "DEBUG: detectindala PSK1 found 224");
         goto out;
     }
-    
+
     idx = 0;
-    found_size = *size;    
+    found_size = *size;
     res = preambleSearch(dest, preamble224_i, sizeof(preamble224_i), &found_size, &idx);
     if ( res ) {
-        PrintAndLogEx(DEBUG, "DEBUG: detectindala PSK1 found 224 inverted preamble");        
+        PrintAndLogEx(DEBUG, "DEBUG: detectindala PSK1 found 224 inverted preamble");
         goto inv;
     }
     */
@@ -106,41 +106,41 @@ int detectIndala(uint8_t *dest, size_t *size, uint8_t *invert) {
     // PSK2
     psk1TOpsk2(dest, *size);
     PrintAndLogEx(DEBUG, "DEBUG: detectindala Converting PSK1 -> PSK2");
-    
+
     idx = 0;
-    found_size = *size;    
+    found_size = *size;
     res = preambleSearch(dest, preamble64, sizeof(preamble64), &found_size, &idx);
-    if ( res ) {
+    if (res) {
         PrintAndLogEx(DEBUG, "DEBUG: detectindala PSK2 found 64 preamble");
         goto out;
     }
-    
+
     idx = 0;
     found_size = *size;
     res = preambleSearch(dest, preamble224, sizeof(preamble224), &found_size, &idx);
-    if ( res ) {
+    if (res) {
         PrintAndLogEx(DEBUG, "DEBUG: detectindala PSK2 found 224 preamble");
         goto out;
     }
-    
+
     idx = 0;
-    found_size = *size;  
+    found_size = *size;
     res = preambleSearch(dest, preamble64_i, sizeof(preamble64_i), &found_size, &idx);
-    if ( res ) {
+    if (res) {
         PrintAndLogEx(DEBUG, "DEBUG: detectindala PSK2 found 64 inverted preamble");
         goto inv;
     }
-    
+
     idx = 0;
     found_size = *size;
     res = preambleSearch(dest, preamble224_i, sizeof(preamble224_i), &found_size, &idx);
-    if ( res ) {
+    if (res) {
         PrintAndLogEx(DEBUG, "DEBUG: detectindala PSK2 found 224 inverted preamble");
         goto inv;
     }
-    
+
 inv:
-    if ( res == 0 ) {
+    if (res == 0) {
         return -4;
     }
 
@@ -157,18 +157,18 @@ inv:
 out:
 
     *size = found_size;
-    
+
     //PrintAndLogEx(INFO, "DEBUG: detectindala RES = %d | %d | %d", res, found_size, idx);
-    
+
     if (found_size != 224 && found_size != 64) {
-        PrintAndLogEx(INFO, "DEBUG: detectindala | %d", found_size);        
+        PrintAndLogEx(INFO, "DEBUG: detectindala | %d", found_size);
         return -5;
     }
 
     // 224 formats are typically PSK2 (afaik 2017 Marshmellow)
     // note loses 1 bit at beginning of transformation...
-    return (int) idx;    
-    
+    return (int) idx;
+
 }
 
 // this read is the "normal" read,  which download lf signal and tries to demod here.
@@ -210,12 +210,12 @@ int CmdIndalaDemod(const char *Cmd) {
     }
     setDemodBuf(DemodBuffer, size, idx);
     setClockGrid(g_DemodClock, g_DemodStartIdx + (idx * g_DemodClock));
-    
+
     //convert UID to HEX
     uint32_t uid1, uid2, uid3, uid4, uid5, uid6, uid7;
     uid1 = bytebits_to_byte(DemodBuffer, 32);
     uid2 = bytebits_to_byte(DemodBuffer + 32, 32);
-    uint64_t foo = (((uint64_t)uid1 << 32) & 0x1FFFFFFF ) | (uid2 & 0x7FFFFFFF );
+    uint64_t foo = (((uint64_t)uid1 << 32) & 0x1FFFFFFF) | (uid2 & 0x7FFFFFFF);
 
     if (DemodBufferLen == 64) {
         PrintAndLogEx(
@@ -225,40 +225,40 @@ int CmdIndalaDemod(const char *Cmd) {
             , uid1
             , uid2
         );
-        
+
         uint16_t p1  = 0;
-        p1 |= DemodBuffer[32+ 3] << 8;
-        p1 |= DemodBuffer[32+ 6] << 5;
-        p1 |= DemodBuffer[32+ 8] << 4;
-        p1 |= DemodBuffer[32+ 9] << 3;
-        p1 |= DemodBuffer[32+11] << 1;
-        p1 |= DemodBuffer[32+16] << 6;
-        p1 |= DemodBuffer[32+19] << 7;
-        p1 |= DemodBuffer[32+20] << 10;
-        p1 |= DemodBuffer[32+21] << 2;
-        p1 |= DemodBuffer[32+22] << 0;
-        p1 |= DemodBuffer[32+24] << 9;
-  
-/*  
-        uint16_t fc = 0;
-        fc |= DemodBuffer[32+ 1] << 0;
-        fc |= DemodBuffer[32+ 2] << 1;
-        fc |= DemodBuffer[32+ 4] << 2;
-        fc |= DemodBuffer[32+ 5] << 3;
-        fc |= DemodBuffer[32+ 7] << 4;
-        fc |= DemodBuffer[32+10] << 5;
-        fc |= DemodBuffer[32+14] << 6;
-        fc |= DemodBuffer[32+15] << 7;
-        fc |= DemodBuffer[32+17] << 8;
-*/
-       
+        p1 |= DemodBuffer[32 + 3] << 8;
+        p1 |= DemodBuffer[32 + 6] << 5;
+        p1 |= DemodBuffer[32 + 8] << 4;
+        p1 |= DemodBuffer[32 + 9] << 3;
+        p1 |= DemodBuffer[32 + 11] << 1;
+        p1 |= DemodBuffer[32 + 16] << 6;
+        p1 |= DemodBuffer[32 + 19] << 7;
+        p1 |= DemodBuffer[32 + 20] << 10;
+        p1 |= DemodBuffer[32 + 21] << 2;
+        p1 |= DemodBuffer[32 + 22] << 0;
+        p1 |= DemodBuffer[32 + 24] << 9;
+
+        /*
+                uint16_t fc = 0;
+                fc |= DemodBuffer[32+ 1] << 0;
+                fc |= DemodBuffer[32+ 2] << 1;
+                fc |= DemodBuffer[32+ 4] << 2;
+                fc |= DemodBuffer[32+ 5] << 3;
+                fc |= DemodBuffer[32+ 7] << 4;
+                fc |= DemodBuffer[32+10] << 5;
+                fc |= DemodBuffer[32+14] << 6;
+                fc |= DemodBuffer[32+15] << 7;
+                fc |= DemodBuffer[32+17] << 8;
+        */
+
         PrintAndLogEx(NORMAL, "");
         PrintAndLogEx(SUCCESS, "Possible de-scramble patterns");
         PrintAndLogEx(SUCCESS, "\tPrinted     | __%04d__ [0x%X]", p1, p1);
         //PrintAndLogEx(SUCCESS, "\tPrinted     | __%04d__ [0x%X]", fc, fc);
-        PrintAndLogEx(SUCCESS, "\tInternal ID | %" PRIu64 , foo);
-        
-        
+        PrintAndLogEx(SUCCESS, "\tInternal ID | %" PRIu64, foo);
+
+
     } else {
         uid3 = bytebits_to_byte(DemodBuffer + 64, 32);
         uid4 = bytebits_to_byte(DemodBuffer + 96, 32);
@@ -266,17 +266,17 @@ int CmdIndalaDemod(const char *Cmd) {
         uid6 = bytebits_to_byte(DemodBuffer + 160, 32);
         uid7 = bytebits_to_byte(DemodBuffer + 192, 32);
         PrintAndLogEx(SUCCESS, "Indala Found - bitlength %d, UID = 0x%x%08x%08x%08x%08x%08x%08x"
-            , DemodBufferLen
-            , uid1
-            , uid2
-            , uid3
-            , uid4
-            , uid5
-            , uid6
-            , uid7
-            );
+                      , DemodBufferLen
+                      , uid1
+                      , uid2
+                      , uid3
+                      , uid4
+                      , uid5
+                      , uid6
+                      , uid7
+                     );
     }
-    
+
     if (g_debugMode) {
         PrintAndLogEx(DEBUG, "DEBUG: Indala - printing demodbuffer");
         printDemodBuff();
@@ -532,9 +532,9 @@ int CmdIndalaSim(const char *Cmd) {
 int CmdIndalaClone(const char *Cmd) {
 
     bool isLongUid = false;
-    uint8_t data[7*4];
+    uint8_t data[7 * 4];
     int datalen = 0;
-    
+
     CLIParserInit("lf indala clone",
                   "Enables cloning of Indala card with specified uid onto T55x7\n"
                   "defaults to 64.\n",
@@ -555,8 +555,8 @@ int CmdIndalaClone(const char *Cmd) {
     CLIGetHexWithReturn(2, data, &datalen);
     CLIParserFree();
 
-    UsbCommand c = {0, {0,0,0}};
-    
+    UsbCommand c = {0, {0, 0, 0}};
+
     if (isLongUid) {
         PrintAndLogEx(INFO, "Preparing to clone Indala 224bit tag with UID %s", sprint_hex(data, datalen));
         c.cmd = CMD_INDALA_CLONE_TAG_L;
@@ -569,11 +569,11 @@ int CmdIndalaClone(const char *Cmd) {
         c.d.asDwords[6] = bytes_to_num(data + 24, 4);
     } else {
         PrintAndLogEx(INFO, "Preparing to clone Indala 64bit tag with UID %s", sprint_hex(data, datalen));
-        c.cmd = CMD_INDALA_CLONE_TAG;            
+        c.cmd = CMD_INDALA_CLONE_TAG;
         c.d.asDwords[0] = bytes_to_num(data, 4);
         c.d.asDwords[1] = bytes_to_num(data + 4, 4);
     }
-    
+
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
diff --git a/client/cmdlfkeri.c b/client/cmdlfkeri.c
index 0fda6c683..199e639a9 100644
--- a/client/cmdlfkeri.c
+++ b/client/cmdlfkeri.c
@@ -41,8 +41,8 @@ int usage_lf_keri_sim(void) {
 // find KERI preamble in already demoded data
 int detectKeri(uint8_t *dest, size_t *size, bool *invert) {
 
-    uint8_t preamble[] = {1,1,1,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1};
-    uint8_t preamble_i[] = {0,0,0,1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0};
+    uint8_t preamble[] = {1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1};
+    uint8_t preamble_i[] = {0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0};
 
     // sanity check.
     if (*size < sizeof(preamble) + 100) return -1;
@@ -159,10 +159,10 @@ int CmdKeriClone(const char *Cmd) {
 
     // MSB is ONE
     internalid |= 0x80000000;
-    
+
     // 3 LSB is ONE
     uint64_t data = ((uint64_t)internalid << 3) + 7;
-    PrintAndLogEx(INFO, "Preparing to clone KERI to T55x7 with Internal Id: %" PRIx64, internalid );
+    PrintAndLogEx(INFO, "Preparing to clone KERI to T55x7 with Internal Id: %" PRIx64, internalid);
 
     //
     blocks[1] = data >> 32;
diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c
index a2f5942ad..169c07194 100644
--- a/client/cmdlfpyramid.c
+++ b/client/cmdlfpyramid.c
@@ -237,11 +237,11 @@ int CmdPyramidDemod(const char *Cmd) {
     }
 
     PrintAndLogEx(DEBUG, "DEBUG: Pyramid: checksum : 0x%02X - %02X - %s"
-        , checksum
-        , checkCS
-        , (checksum == checkCS) ? _GREEN_("Passed") : _RED_("Failed")
-        );
-        
+                  , checksum
+                  , checkCS
+                  , (checksum == checkCS) ? _GREEN_("Passed") : _RED_("Failed")
+                 );
+
     PrintAndLogEx(DEBUG, "DEBUG: Pyramid: idx: %d, Len: %d, Printing Demod Buffer:", idx, 128);
     if (g_debugMode)
         printDemodBuff();
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 4f187367a..c1573285c 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -144,8 +144,8 @@ int usage_t55xx_wakup() {
 int usage_t55xx_chk() {
     PrintAndLogEx(NORMAL, "This command uses a dictionary attack");
     PrintAndLogEx(NORMAL, "press " _YELLOW_("'enter'") " to cancel the command");
-    PrintAndLogEx(NORMAL, "WARNING: this may brick non-password protected chips!");    
-    PrintAndLogEx(NORMAL, "Try to reading block 7 before\n");    
+    PrintAndLogEx(NORMAL, "WARNING: this may brick non-password protected chips!");
+    PrintAndLogEx(NORMAL, "Try to reading block 7 before\n");
     PrintAndLogEx(NORMAL, "Usage: lf t55xx chk [h] <m> [i <*.dic>]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "     h           - this help");
@@ -161,8 +161,8 @@ int usage_t55xx_chk() {
 int usage_t55xx_bruteforce() {
     PrintAndLogEx(NORMAL, "This command uses bruteforce to scan a number range");
     PrintAndLogEx(NORMAL, "press " _YELLOW_("'enter'") " to cancel the command");
-    PrintAndLogEx(NORMAL, "WARNING: this may brick non-password protected chips!");    
-    PrintAndLogEx(NORMAL, "Try to reading block 7 before\n");  
+    PrintAndLogEx(NORMAL, "WARNING: this may brick non-password protected chips!");
+    PrintAndLogEx(NORMAL, "Try to reading block 7 before\n");
     PrintAndLogEx(NORMAL, "Usage: lf t55xx bruteforce [h] <start password> <end password>");
     PrintAndLogEx(NORMAL, "       password must be 4 bytes (8 hex symbols)");
     PrintAndLogEx(NORMAL, "Options:");
@@ -177,9 +177,9 @@ int usage_t55xx_bruteforce() {
 }
 int usage_t55xx_recoverpw() {
     PrintAndLogEx(NORMAL, "This command uses a few tricks to try to recover mangled password");
-    PrintAndLogEx(NORMAL, "press " _YELLOW_("'enter'") " to cancel the command");    
+    PrintAndLogEx(NORMAL, "press " _YELLOW_("'enter'") " to cancel the command");
     PrintAndLogEx(NORMAL, "WARNING: this may brick non-password protected chips!");
-    PrintAndLogEx(NORMAL, "Try to reading block 7 before\n");     
+    PrintAndLogEx(NORMAL, "Try to reading block 7 before\n");
     PrintAndLogEx(NORMAL, "Usage: lf t55xx recoverpw [password]");
     PrintAndLogEx(NORMAL, "       password must be 4 bytes (8 hex symbols)");
     PrintAndLogEx(NORMAL, "       default password is 51243648, used by many cloners");
@@ -1058,7 +1058,7 @@ int CmdT55xxWriteBlock(const char *Cmd) {
         c.arg[2] = password;
         c.d.asBytes[0] |= 0x1;
     }
-    
+
     clearCommandBuffer();
     SendCommand(&c);
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
@@ -1369,7 +1369,7 @@ bool AquireData(uint8_t page, uint8_t block, bool pwdmode, uint32_t password) {
     //  bit1 = page to read from
     // arg1: which block to read
     // arg2: password
-    uint8_t arg0 = ( page << 1 | (pwdmode) );
+    uint8_t arg0 = (page << 1 | (pwdmode));
     UsbCommand c = {CMD_T55XX_READ_BLOCK, {arg0, block, password}};
     clearCommandBuffer();
     SendCommand(&c);
@@ -1637,7 +1637,7 @@ int CmdT55xxChkPwds(const char *Cmd) {
     bool found = false;
     uint8_t timeout = 0;
     uint8_t *keyBlock = NULL;
-    
+
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) == 0 || cmdp == 'h') return usage_t55xx_chk();
 
@@ -1676,7 +1676,7 @@ int CmdT55xxChkPwds(const char *Cmd) {
 
             found = tryDetectModulation();
             if (found) {
-                PrintAndLogEx(SUCCESS, "Found valid password: [ " _GREEN_("%08") " ]", resp.arg[1]);        
+                PrintAndLogEx(SUCCESS, "Found valid password: [ " _GREEN_("%08") " ]", resp.arg[1]);
             } else {
                 PrintAndLogEx(WARNING, "Check pwd failed");
             }
@@ -1688,22 +1688,22 @@ int CmdT55xxChkPwds(const char *Cmd) {
     }
 
     if (cmdp == 'i') {
-        
+
         int len = strlen(Cmd + 2);
         if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
         memcpy(filename, Cmd + 2, len);
-        
+
         uint16_t keycount = 0;
         size_t datalen = 0;
-       
+
         // TODO, a way of reallocating memory if file was larger
-        keyBlock = calloc(4*200, sizeof(uint8_t));
-        if ( keyBlock == NULL ) {
+        keyBlock = calloc(4 * 200, sizeof(uint8_t));
+        if (keyBlock == NULL) {
             PrintAndLogDevice(WARNING, "error, cannot allocate memory ");
             return 1;
         }
-        
-        int res = loadFileDICTIONARY(filename, "dic", keyBlock, &datalen, 4, &keycount );
+
+        int res = loadFileDICTIONARY(filename, "dic", keyBlock, &datalen, 4, &keycount);
         if (res || keycount == 0) {
             PrintAndLogEx(WARNING, "No keys found in file");
             free(keyBlock);
@@ -1728,7 +1728,7 @@ int CmdT55xxChkPwds(const char *Cmd) {
             curr_password = bytes_to_num(keyBlock + 4 * c, 4);
 
             PrintAndLogEx(INFO, "Testing %08X", curr_password);
-            
+
             if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, curr_password)) {
                 continue;
             }
@@ -1776,7 +1776,7 @@ int CmdT55xxBruteForce(const char *Cmd) {
     PrintAndLogEx(INFO, "Search password range [%08X -> %08X]", start_password, end_password);
 
     while (!found) {
-       
+
         printf(".");
         fflush(stdout);
 
@@ -1788,7 +1788,7 @@ int CmdT55xxBruteForce(const char *Cmd) {
 
         if (curr == end_password)
             break;
-        
+
         curr++;
     }
 
@@ -1806,12 +1806,12 @@ int CmdT55xxBruteForce(const char *Cmd) {
 
 int tryOnePassword(uint32_t password) {
     PrintAndLogEx(INFO, "Trying password %08X", password);
-    
+
     AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, password);
 
     if (getSignalProperties()->isnoise == false)
         return 0;
-    
+
     if (tryDetectModulation())
         return 1;
     else
@@ -1834,12 +1834,12 @@ int CmdT55xxRecoverPW(const char *Cmd) {
     while (bit < 32) {
         curr_password = orig_password ^ (1u << bit);
         found = tryOnePassword(curr_password);
-        if ( found == 1)
+        if (found == 1)
             goto out;
-        
+
         bit++;
 
-        if (IsCancelled()) 
+        if (IsCancelled())
             return 0;
     }
 
@@ -1857,15 +1857,15 @@ int CmdT55xxRecoverPW(const char *Cmd) {
             bit++;
             continue;
         }
-        
+
         found = tryOnePassword(curr_password);
-        if ( found == 1 )
-            goto out;        
-        
+        if (found == 1)
+            goto out;
+
         bit++;
         prev_password = curr_password;
 
-        if (IsCancelled()) 
+        if (IsCancelled())
             return 0;
     }
 
@@ -1881,13 +1881,13 @@ int CmdT55xxRecoverPW(const char *Cmd) {
             continue;
         }
         found = tryOnePassword(curr_password);
-        if ( found == 1 )
+        if (found == 1)
             goto out;
 
         bit++;
         prev_password = curr_password;
 
-        if (IsCancelled()) 
+        if (IsCancelled())
             return 0;
     }
 
diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index 125475080..2a0216aa7 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -679,14 +679,14 @@ int CmdSmartUpgrade(const char *Cmd) {
     if (fsize < 0)  {
         PrintAndLogEx(FAILED, "Could not determine size of SHA-512 file");
         fclose(f);
-        free(dump);        
+        free(dump);
         return 1;
     }
 
     if (fsize < 128) {
         PrintAndLogEx(FAILED, "SHA-512 file too short");
         fclose(f);
-        free(dump);        
+        free(dump);
         return 1;
     }
 
@@ -700,20 +700,20 @@ int CmdSmartUpgrade(const char *Cmd) {
     uint8_t hash1[64];
     if (bytes_read != 128 || param_gethex(hashstring, 0, hash1, 128)) {
         PrintAndLogEx(FAILED, "Couldn't read SHA-512 file");
-        free(dump);        
+        free(dump);
         return 1;
     }
 
     uint8_t hash2[64];
     if (sha512hash(dump, firmware_size, hash2)) {
         PrintAndLogEx(FAILED, "Couldn't calculate SHA-512 of firmware");
-        free(dump);        
+        free(dump);
         return 1;
     }
 
     if (memcmp(hash1, hash2, 64)) {
         PrintAndLogEx(FAILED, "Couldn't verify integrity of firmware file " _RED_("(wrong SHA-512 hash)"));
-        free(dump);        
+        free(dump);
         return 1;
     }
 
diff --git a/client/fpga_compress.c b/client/fpga_compress.c
index c7cd021f8..0f4220632 100644
--- a/client/fpga_compress.c
+++ b/client/fpga_compress.c
@@ -417,16 +417,16 @@ int main(int argc, char **argv) {
         infiles[0] = fopen(argv[2], "rb");
         if (infiles[0] == NULL) {
             fprintf(stderr, "Error. Cannot open input file %s\n\n", argv[2]);
-            free(infiles);          
+            free(infiles);
             return (EXIT_FAILURE);
         }
         outfile = fopen(argv[3], "wb");
         if (outfile == NULL) {
             fprintf(stderr, "Error. Cannot open output file %s\n\n", argv[3]);
-            free(infiles);            
+            free(infiles);
             return (EXIT_FAILURE);
         }
-        
+
         int ret = zlib_decompress(infiles[0], outfile);
         free(infiles);
         return (ret);
@@ -466,13 +466,13 @@ int main(int argc, char **argv) {
         if (outfile == NULL) {
             fprintf(stderr, "Error. Cannot open output file %s\n\n", argv[argc - 1]);
             free(infile_names);
-            free(infiles);          
+            free(infiles);
             return (EXIT_FAILURE);
         }
         if (generate_version_file) {
             if (generate_fpga_version_info(infiles, infile_names, num_input_files, outfile)) {
                 free(infile_names);
-                free(infiles);                
+                free(infiles);
                 return (EXIT_FAILURE);
             }
         } else {
diff --git a/client/reveng/cli.c b/client/reveng/cli.c
index f715d66f7..6ecdcecab 100644
--- a/client/reveng/cli.c
+++ b/client/reveng/cli.c
@@ -630,7 +630,7 @@ usage(void) {
             "\t      preset values\n"
             "\n"
             "Copyright (C)\n"
-			"2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019  Gregory Cook\n"
+            "2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019  Gregory Cook\n"
             "This is free software; see the source for copying conditions.  There is NO\n"
             "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
             "Version "
diff --git a/client/reveng/model.c b/client/reveng/model.c
index 16a791312..297f638db 100644
--- a/client/reveng/model.c
+++ b/client/reveng/model.c
@@ -242,9 +242,9 @@ void mrev(model_t *model) {
 
 void mnovel(model_t *model) {
     /* remove name and check string from modified model */
-	/* previous classification no longer applies */
+    /* previous classification no longer applies */
     model->name = NULL;
-	model->flags &= ~P_CLMASK;
+    model->flags &= ~P_CLMASK;
     pfree(&model->check);
     pfree(&model->magic);
 }
diff --git a/client/reveng/poly.c b/client/reveng/poly.c
index 7e35be18c..0ce60aac2 100644
--- a/client/reveng/poly.c
+++ b/client/reveng/poly.c
@@ -988,10 +988,10 @@ pcrc(const poly_t message, const poly_t divisor, const poly_t init, const poly_t
         /* 0 <= ofs <= BMP_BIT, location of the first bit of the result */
         pshift(&result, result, 0UL, ofs, (init.length > max + divisor.length ? init.length - max - divisor.length : 0UL) + divisor.length + ofs, 0UL);
     }
-    
-    if ( result.bitmap != NULL )
+
+    if (result.bitmap != NULL)
         psum(&result, xorout, 0UL);
-    
+
     return (result);
 }
 
diff --git a/client/reveng/preset.c b/client/reveng/preset.c
index eb07f9085..6f41ac9f5 100644
--- a/client/reveng/preset.c
+++ b/client/reveng/preset.c
@@ -379,98 +379,98 @@ static const bmp_t b32[] = {
                       BMP_C(0x94000000) << (BMP_BIT - 32),    /* 115 --  8,      94 */
                       BMP_C(0x97000000) << (BMP_BIT - 32),    /* 116 --  8,      97 */
                       BMP_C(0x98000000) << (BMP_BIT - 32),    /* 117 --  6,      26 */
-	BMP_C(0x99000000) << (BMP_BIT - 32),	/* 118 --  8,      99 */
-	BMP_C(0x9b000000) << (BMP_BIT - 32),	/* 119 --  8,      9b */
-	BMP_C(0x9c000000) << (BMP_BIT - 32),	/* 120 --  6,      27 */
-	BMP_C(0x9d5e4de2) << (BMP_BIT - 32),	/* 121 -- 31,4eaf26f1 */
-	BMP_C(0x9e000000) << (BMP_BIT - 32),	/* 122 --  7,      4f */
-	BMP_C(0x9ecf0000) << (BMP_BIT - 32),	/* 123 -- 16,    9ecf */
-	BMP_C(0xa0660000) << (BMP_BIT - 32),	/* 124 -- 16,    a066 */
-	BMP_C(0xa0970000) << (BMP_BIT - 32),	/* 125 -- 16,    a097 */
-	BMP_C(0xa1000000) << (BMP_BIT - 32),	/* 126 --  8,      a1 */
-	BMP_C(0xa3660000) << (BMP_BIT - 32),	/* 127 -- 16,    a366 */
-	BMP_C(0xa6000000) << (BMP_BIT - 32),	/* 128 --  7,      53 */
-	BMP_C(0xa7000000) << (BMP_BIT - 32),	/* 129 --  8,      a7 */
-	BMP_C(0xa8000000) << (BMP_BIT - 32),	/* 130 --  5,      15 */
-	BMP_C(0xa8190000) << (BMP_BIT - 32),	/* 131 -- 16,    a819 */
-	BMP_C(0xa833982b) << (BMP_BIT - 32),	/* 132 -- 32,a833982b */
-	BMP_C(0xabcdef00) << (BMP_BIT - 32),	/* 133 -- 24,  abcdef */
-	BMP_C(0xac000000) << (BMP_BIT - 32),	/* 134 --  8,      ac */
-	BMP_C(0xaee70000) << (BMP_BIT - 32),	/* 135 -- 16,    aee7 */
-	BMP_C(0xb0000000) << (BMP_BIT - 32),	/* 136 --  4,       b */
-	BMP_C(0xb0010000) << (BMP_BIT - 32),	/* 137 -- 16,    b001 */
-	BMP_C(0xb2aa0000) << (BMP_BIT - 32),	/* 138 -- 16,    b2aa */
-	BMP_C(0xb3400000) << (BMP_BIT - 32),	/* 139 -- 12,     b34 */
-	BMP_C(0xb42d8000) << (BMP_BIT - 32),	/* 140 -- 17,   1685b */
-	BMP_C(0xb4600000) << (BMP_BIT - 32),	/* 141 -- 11,     5a3 */
-	BMP_C(0xb4c80000) << (BMP_BIT - 32),	/* 142 -- 16,    b4c8 */
-	BMP_C(0xb4f3e600) << (BMP_BIT - 32),	/* 143 -- 24,  b4f3e6 */
-	BMP_C(0xb704ce00) << (BMP_BIT - 32),	/* 144 -- 24,  b704ce */
-	BMP_C(0xb798b438) << (BMP_BIT - 32),	/* 145 -- 32,b798b438 */
-	BMP_C(0xbb3d0000) << (BMP_BIT - 32),	/* 146 -- 16,    bb3d */
-	BMP_C(0xbc000000) << (BMP_BIT - 32),	/* 147 --  6,2f/ 8,bc */
-	BMP_C(0xbd0be338) << (BMP_BIT - 32),	/* 148 -- 32,bd0be338 */
-	BMP_C(0xbdf40000) << (BMP_BIT - 32),	/* 149 -- 16,    bdf4 */
-	BMP_C(0xbf050000) << (BMP_BIT - 32),	/* 150 -- 16,    bf05 */
-	BMP_C(0xc0000000) << (BMP_BIT - 32),	/* 151 --  3,       6 */
-	BMP_C(0xc2000000) << (BMP_BIT - 32),	/* 152 --  7,      61 */
-	BMP_C(0xc25a5600) << (BMP_BIT - 32),	/* 153 -- 24,  c25a56 */
-	BMP_C(0xc2b70000) << (BMP_BIT - 32),	/* 154 -- 16,    c2b7 */
-	BMP_C(0xc2b80000) << (BMP_BIT - 32),	/* 155 -- 14,    30ae */
-	BMP_C(0xc4000000) << (BMP_BIT - 32),	/* 156 --  8,      c4 */
-	BMP_C(0xc6c60000) << (BMP_BIT - 32),	/* 157 -- 16,    c6c6 */
-	BMP_C(0xc7000000) << (BMP_BIT - 32),	/* 158 --  8,      c7 */
-	BMP_C(0xc704dd7b) << (BMP_BIT - 32),	/* 159 -- 32,c704dd7b */
-	BMP_C(0xc8000000) << (BMP_BIT - 32),	/* 160 --  5,      19 */
-	BMP_C(0xc8670000) << (BMP_BIT - 32),	/* 161 -- 16,    c867 */
-	BMP_C(0xcbf43926) << (BMP_BIT - 32),	/* 162 -- 32,cbf43926 */
-	BMP_C(0xcde70300) << (BMP_BIT - 32),	/* 163 -- 24,  cde703 */
-	BMP_C(0xce3c0000) << (BMP_BIT - 32),	/* 164 -- 16,    ce3c */
-	BMP_C(0xd0000000) << (BMP_BIT - 32),	/* 165 --  8,      d0 */
-	BMP_C(0xd02a0000) << (BMP_BIT - 32),	/* 166 -- 15,    6815 */
-	BMP_C(0xd0db0000) << (BMP_BIT - 32),	/* 167 -- 16,    d0db */
-	BMP_C(0xd3100000) << (BMP_BIT - 32),	/* 168 -- 12,     d31 */
-	BMP_C(0xd3be9568) << (BMP_BIT - 32),	/* 169 -- 30,34efa55a */
-	BMP_C(0xd4d00000) << (BMP_BIT - 32),	/* 170 -- 12,     d4d */
-	BMP_C(0xd5000000) << (BMP_BIT - 32),	/* 171 --  8,      d5 */
-	BMP_C(0xd64e0000) << (BMP_BIT - 32),	/* 172 -- 16,    d64e */
-	BMP_C(0xda000000) << (BMP_BIT - 32),	/* 173 --  8,      da */
-	BMP_C(0xdaf00000) << (BMP_BIT - 32),	/* 174 -- 12,     daf */
-	BMP_C(0xdebb20e3) << (BMP_BIT - 32),	/* 175 -- 32,debb20e3 */
-	BMP_C(0xdf000000) << (BMP_BIT - 32),	/* 176 --  8,      df */
-	BMP_C(0xe0000000) << (BMP_BIT - 32),	/* 177 --  3,       7 */
-	BMP_C(0xe3069283) << (BMP_BIT - 32),	/* 178 -- 32,e3069283 */
-	BMP_C(0xe3940000) << (BMP_BIT - 32),	/* 179 -- 16,    e394 */
-	BMP_C(0xe5cc0000) << (BMP_BIT - 32),	/* 180 -- 16,    e5cc */
-	BMP_C(0xe7a80000) << (BMP_BIT - 32),	/* 181 -- 13,    1cf5 */
-	BMP_C(0xe8000000) << (BMP_BIT - 32),	/* 182 --  6,      3a */
-	BMP_C(0xea000000) << (BMP_BIT - 32),	/* 183 --  7,      75 */
-	BMP_C(0xea820000) << (BMP_BIT - 32),	/* 184 -- 16,    ea82 */
-	BMP_C(0xec000000) << (BMP_BIT - 32),	/* 185 --  6,      3b */
-	BMP_C(0xf0000000) << (BMP_BIT - 32),	/* 186 --  4,       f */
-	BMP_C(0xf0b80000) << (BMP_BIT - 32),	/* 187 -- 16,    f0b8 */
-	BMP_C(0xf1300000) << (BMP_BIT - 32),	/* 188 -- 12,     f13 */
-	BMP_C(0xf4000000) << (BMP_BIT - 32),	/* 189 --  8,      f4 */
-	BMP_C(0xf4acfb13) << (BMP_BIT - 32),	/* 190 -- 32,f4acfb13 */
-	BMP_C(0xf5b00000) << (BMP_BIT - 32),	/* 191 -- 12,     f5b */
-	BMP_C(0xf6400000) << (BMP_BIT - 32),	/* 192 -- 10,     3d9 */
-	BMP_C(0xf7000000) << (BMP_BIT - 32),	/* 193 --  8,      f7 */
-	BMP_C(0xf8000000) << (BMP_BIT - 32),	/* 194 --  5,      1f */
-	BMP_C(0xfc000000) << (BMP_BIT - 32),	/* 195 --  6,      3f */
-	BMP_C(0xfc891918) << (BMP_BIT - 32),	/* 196 -- 32,fc891918 */
-	BMP_C(0xfd000000) << (BMP_BIT - 32),	/* 197 --  8,      fd */
-	BMP_C(0xfe000000) << (BMP_BIT - 32),	/* 198 --  7,      7f */
-	BMP_C(0xfedcba00) << (BMP_BIT - 32),	/* 199 -- 24,  fedcba */
-	BMP_C(0xfee80000) << (BMP_BIT - 32),	/* 200 -- 16,    fee8 */
-	BMP_C(0xff000000) << (BMP_BIT - 32),	/* 201 --  8,      ff */
-	BMP_C(0xffc00000) << (BMP_BIT - 32),	/* 202 -- 10,     3ff */
-	BMP_C(0xfff00000) << (BMP_BIT - 32),	/* 203 -- 12,     fff */
-	BMP_C(0xfffc0000) << (BMP_BIT - 32),	/* 204 -- 14,    3fff */
-	BMP_C(0xffff0000) << (BMP_BIT - 32),	/* 205 -- 16,    ffff */
-	BMP_C(0xffffff00) << (BMP_BIT - 32),	/* 206 -- 24,  ffffff */
-	BMP_C(0xfffffffc) << (BMP_BIT - 32),	/* 207 -- 30,3fffffff */
-	BMP_C(0xfffffffe) << (BMP_BIT - 32),	/* 208 -- 31,7fffffff */
-	BMP_C(0xffffffff) << (BMP_BIT - 32),	/* 209 -- 32,ffffffff */
+                      BMP_C(0x99000000) << (BMP_BIT - 32),    /* 118 --  8,      99 */
+                      BMP_C(0x9b000000) << (BMP_BIT - 32),    /* 119 --  8,      9b */
+                      BMP_C(0x9c000000) << (BMP_BIT - 32),    /* 120 --  6,      27 */
+                      BMP_C(0x9d5e4de2) << (BMP_BIT - 32),    /* 121 -- 31,4eaf26f1 */
+                      BMP_C(0x9e000000) << (BMP_BIT - 32),    /* 122 --  7,      4f */
+                      BMP_C(0x9ecf0000) << (BMP_BIT - 32),    /* 123 -- 16,    9ecf */
+                      BMP_C(0xa0660000) << (BMP_BIT - 32),    /* 124 -- 16,    a066 */
+                      BMP_C(0xa0970000) << (BMP_BIT - 32),    /* 125 -- 16,    a097 */
+                      BMP_C(0xa1000000) << (BMP_BIT - 32),    /* 126 --  8,      a1 */
+                      BMP_C(0xa3660000) << (BMP_BIT - 32),    /* 127 -- 16,    a366 */
+                      BMP_C(0xa6000000) << (BMP_BIT - 32),    /* 128 --  7,      53 */
+                      BMP_C(0xa7000000) << (BMP_BIT - 32),    /* 129 --  8,      a7 */
+                      BMP_C(0xa8000000) << (BMP_BIT - 32),    /* 130 --  5,      15 */
+                      BMP_C(0xa8190000) << (BMP_BIT - 32),    /* 131 -- 16,    a819 */
+                      BMP_C(0xa833982b) << (BMP_BIT - 32),    /* 132 -- 32,a833982b */
+                      BMP_C(0xabcdef00) << (BMP_BIT - 32),    /* 133 -- 24,  abcdef */
+                      BMP_C(0xac000000) << (BMP_BIT - 32),    /* 134 --  8,      ac */
+                      BMP_C(0xaee70000) << (BMP_BIT - 32),    /* 135 -- 16,    aee7 */
+                      BMP_C(0xb0000000) << (BMP_BIT - 32),    /* 136 --  4,       b */
+                      BMP_C(0xb0010000) << (BMP_BIT - 32),    /* 137 -- 16,    b001 */
+                      BMP_C(0xb2aa0000) << (BMP_BIT - 32),    /* 138 -- 16,    b2aa */
+                      BMP_C(0xb3400000) << (BMP_BIT - 32),    /* 139 -- 12,     b34 */
+                      BMP_C(0xb42d8000) << (BMP_BIT - 32),    /* 140 -- 17,   1685b */
+                      BMP_C(0xb4600000) << (BMP_BIT - 32),    /* 141 -- 11,     5a3 */
+                      BMP_C(0xb4c80000) << (BMP_BIT - 32),    /* 142 -- 16,    b4c8 */
+                      BMP_C(0xb4f3e600) << (BMP_BIT - 32),    /* 143 -- 24,  b4f3e6 */
+                      BMP_C(0xb704ce00) << (BMP_BIT - 32),    /* 144 -- 24,  b704ce */
+                      BMP_C(0xb798b438) << (BMP_BIT - 32),    /* 145 -- 32,b798b438 */
+                      BMP_C(0xbb3d0000) << (BMP_BIT - 32),    /* 146 -- 16,    bb3d */
+                      BMP_C(0xbc000000) << (BMP_BIT - 32),    /* 147 --  6,2f/ 8,bc */
+                      BMP_C(0xbd0be338) << (BMP_BIT - 32),    /* 148 -- 32,bd0be338 */
+                      BMP_C(0xbdf40000) << (BMP_BIT - 32),    /* 149 -- 16,    bdf4 */
+                      BMP_C(0xbf050000) << (BMP_BIT - 32),    /* 150 -- 16,    bf05 */
+                      BMP_C(0xc0000000) << (BMP_BIT - 32),    /* 151 --  3,       6 */
+                      BMP_C(0xc2000000) << (BMP_BIT - 32),    /* 152 --  7,      61 */
+                      BMP_C(0xc25a5600) << (BMP_BIT - 32),    /* 153 -- 24,  c25a56 */
+                      BMP_C(0xc2b70000) << (BMP_BIT - 32),    /* 154 -- 16,    c2b7 */
+                      BMP_C(0xc2b80000) << (BMP_BIT - 32),    /* 155 -- 14,    30ae */
+                      BMP_C(0xc4000000) << (BMP_BIT - 32),    /* 156 --  8,      c4 */
+                      BMP_C(0xc6c60000) << (BMP_BIT - 32),    /* 157 -- 16,    c6c6 */
+                      BMP_C(0xc7000000) << (BMP_BIT - 32),    /* 158 --  8,      c7 */
+                      BMP_C(0xc704dd7b) << (BMP_BIT - 32),    /* 159 -- 32,c704dd7b */
+                      BMP_C(0xc8000000) << (BMP_BIT - 32),    /* 160 --  5,      19 */
+                      BMP_C(0xc8670000) << (BMP_BIT - 32),    /* 161 -- 16,    c867 */
+                      BMP_C(0xcbf43926) << (BMP_BIT - 32),    /* 162 -- 32,cbf43926 */
+                      BMP_C(0xcde70300) << (BMP_BIT - 32),    /* 163 -- 24,  cde703 */
+                      BMP_C(0xce3c0000) << (BMP_BIT - 32),    /* 164 -- 16,    ce3c */
+                      BMP_C(0xd0000000) << (BMP_BIT - 32),    /* 165 --  8,      d0 */
+                      BMP_C(0xd02a0000) << (BMP_BIT - 32),    /* 166 -- 15,    6815 */
+                      BMP_C(0xd0db0000) << (BMP_BIT - 32),    /* 167 -- 16,    d0db */
+                      BMP_C(0xd3100000) << (BMP_BIT - 32),    /* 168 -- 12,     d31 */
+                      BMP_C(0xd3be9568) << (BMP_BIT - 32),    /* 169 -- 30,34efa55a */
+                      BMP_C(0xd4d00000) << (BMP_BIT - 32),    /* 170 -- 12,     d4d */
+                      BMP_C(0xd5000000) << (BMP_BIT - 32),    /* 171 --  8,      d5 */
+                      BMP_C(0xd64e0000) << (BMP_BIT - 32),    /* 172 -- 16,    d64e */
+                      BMP_C(0xda000000) << (BMP_BIT - 32),    /* 173 --  8,      da */
+                      BMP_C(0xdaf00000) << (BMP_BIT - 32),    /* 174 -- 12,     daf */
+                      BMP_C(0xdebb20e3) << (BMP_BIT - 32),    /* 175 -- 32,debb20e3 */
+                      BMP_C(0xdf000000) << (BMP_BIT - 32),    /* 176 --  8,      df */
+                      BMP_C(0xe0000000) << (BMP_BIT - 32),    /* 177 --  3,       7 */
+                      BMP_C(0xe3069283) << (BMP_BIT - 32),    /* 178 -- 32,e3069283 */
+                      BMP_C(0xe3940000) << (BMP_BIT - 32),    /* 179 -- 16,    e394 */
+                      BMP_C(0xe5cc0000) << (BMP_BIT - 32),    /* 180 -- 16,    e5cc */
+                      BMP_C(0xe7a80000) << (BMP_BIT - 32),    /* 181 -- 13,    1cf5 */
+                      BMP_C(0xe8000000) << (BMP_BIT - 32),    /* 182 --  6,      3a */
+                      BMP_C(0xea000000) << (BMP_BIT - 32),    /* 183 --  7,      75 */
+                      BMP_C(0xea820000) << (BMP_BIT - 32),    /* 184 -- 16,    ea82 */
+                      BMP_C(0xec000000) << (BMP_BIT - 32),    /* 185 --  6,      3b */
+                      BMP_C(0xf0000000) << (BMP_BIT - 32),    /* 186 --  4,       f */
+                      BMP_C(0xf0b80000) << (BMP_BIT - 32),    /* 187 -- 16,    f0b8 */
+                      BMP_C(0xf1300000) << (BMP_BIT - 32),    /* 188 -- 12,     f13 */
+                      BMP_C(0xf4000000) << (BMP_BIT - 32),    /* 189 --  8,      f4 */
+                      BMP_C(0xf4acfb13) << (BMP_BIT - 32),    /* 190 -- 32,f4acfb13 */
+                      BMP_C(0xf5b00000) << (BMP_BIT - 32),    /* 191 -- 12,     f5b */
+                      BMP_C(0xf6400000) << (BMP_BIT - 32),    /* 192 -- 10,     3d9 */
+                      BMP_C(0xf7000000) << (BMP_BIT - 32),    /* 193 --  8,      f7 */
+                      BMP_C(0xf8000000) << (BMP_BIT - 32),    /* 194 --  5,      1f */
+                      BMP_C(0xfc000000) << (BMP_BIT - 32),    /* 195 --  6,      3f */
+                      BMP_C(0xfc891918) << (BMP_BIT - 32),    /* 196 -- 32,fc891918 */
+                      BMP_C(0xfd000000) << (BMP_BIT - 32),    /* 197 --  8,      fd */
+                      BMP_C(0xfe000000) << (BMP_BIT - 32),    /* 198 --  7,      7f */
+                      BMP_C(0xfedcba00) << (BMP_BIT - 32),    /* 199 -- 24,  fedcba */
+                      BMP_C(0xfee80000) << (BMP_BIT - 32),    /* 200 -- 16,    fee8 */
+                      BMP_C(0xff000000) << (BMP_BIT - 32),    /* 201 --  8,      ff */
+                      BMP_C(0xffc00000) << (BMP_BIT - 32),    /* 202 -- 10,     3ff */
+                      BMP_C(0xfff00000) << (BMP_BIT - 32),    /* 203 -- 12,     fff */
+                      BMP_C(0xfffc0000) << (BMP_BIT - 32),    /* 204 -- 14,    3fff */
+                      BMP_C(0xffff0000) << (BMP_BIT - 32),    /* 205 -- 16,    ffff */
+                      BMP_C(0xffffff00) << (BMP_BIT - 32),    /* 206 -- 24,  ffffff */
+                      BMP_C(0xfffffffc) << (BMP_BIT - 32),    /* 207 -- 30,3fffffff */
+                      BMP_C(0xfffffffe) << (BMP_BIT - 32),    /* 208 -- 31,7fffffff */
+                      BMP_C(0xffffffff) << (BMP_BIT - 32),    /* 209 -- 32,ffffffff */
 };
 
 static const struct malias aliases[];
@@ -479,297 +479,297 @@ static const struct malias aliases[];
  * Sorted by left-justified polynomial for bsearch().
  */
 static const struct mpreset models[] = {
-    {64UL, b64,     b64a,    P_LE   | P_CONFIR, b64a,    b64b,    b64c,    aliases + 130},  /*   0 */
-	{32UL, b32+  0, 0,       P_BE   | P_CONFIR, 0,       b32+148, 0,       aliases+107},	/*   1 */
-    {40UL, b40,     0,       P_BE   | P_ACADEM, b40a,    b40b,    b40c,    aliases + 115},  /*   2 */
-	{24UL, b32+  3, b32+ 76, P_LE   | P_ATTEST, 0,       b32+153, 0,       aliases+ 77},	/*   3 */
-	{32UL, b32+  8, 0,       P_BE   | P_ATTEST, b32+209, b32+ 92, b32+159, aliases+ 98},	/*   4 */
-	{32UL, b32+  8, b32+209, P_BE   | P_ATTEST, 0,       b32+  7, 0,       aliases+104},	/*   5 */
-	{32UL, b32+  8, b32+209, P_BE   | P_ATTEST, b32+209, b32+196, b32+159, aliases+ 96},	/*   6 */
-	{32UL, b32+  8, b32+209, P_LE   | P_CONFIR, 0,       b32+ 56, 0,       aliases+103},	/*   7 */
-	{32UL, b32+  8, b32+209, P_LE   | P_ATTEST, b32+209, b32+162, b32+175, aliases+102},	/*   8 */
-    {16UL, b32 +  9, 0,       P_BE   | P_ATTEST, 0,       b32 +  5, 0,       aliases + 36}, /*   9 */
-    {16UL, b32 +  9, 0,       P_BE   | P_ATTEST, b32 +  1, b32 +  4, b32 +  9, aliases + 35}, /*  10 */
-	{ 8UL, b32+ 10, 0,       P_BE   | P_ATTEST, 0,       b32+189, 0,       aliases+158},	/*  11 */
-	{ 8UL, b32+ 10, 0,       P_BE   | P_ACADEM, b32+ 75, b32+126, b32+134, aliases+147},	/*  12 */
-	{ 8UL, b32+ 10, b32+201, P_LE   | P_ACADEM, 0,       b32+165, 0,       aliases+156},	/*  13 */
-	{16UL, b32+ 11, b32+205, P_LE   | P_ATTEST, 0,       b32+124, 0,       aliases+ 58},	/*  14 */
-	{31UL, b32+ 12, b32+208, P_BE   | P_CONFIR, b32+208, b32+ 26, b32+121, aliases+ 88},	/*  15 */
-    { 6UL, b32 + 14, 0,       P_LE   | P_ACADEM, 0,       b32 + 25, 0,       aliases + 124}, /*  16 */
-	{82UL, b82,     0,       P_LE   | P_ATTEST, 0,       b82a,    0,       aliases+161},	/*  17 */
-    {16UL, b32 + 18, 0,       P_BE   | P_ATTEST, 0,       b32 + 53, 0,       aliases + 73}, /*  18 */
-	{16UL, b32+ 18, 0,       P_BE   | P_ACADEM, b32+205, b32+164, b32+ 29, aliases+ 42},	/*  19 */
-    {16UL, b32 + 18, 0,       P_LE   | P_ATTEST, 0,       b32 + 38, 0,       aliases + 50}, /*  20 */
-	{16UL, b32+ 18, b32+ 29, P_BE   | P_ATTEST, 0,       b32+180, 0,       aliases+ 63},	/*  21 */
-    {16UL, b32 + 18, b32 + 108, P_LE   | P_ATTEST, 0,       b32 + 43, 0,       aliases + 66}, /*  22 */
-	{16UL, b32+ 18, b32+138, P_LE   | P_THIRDP, 0,       b32+ 83, 0,       aliases+ 62},	/*  23 */
-	{16UL, b32+ 18, b32+157, P_LE   | P_ATTEST, 0,       b32+150, 0,       aliases+ 48},	/*  24 */
-	{16UL, b32+ 18, b32+205, P_BE   | P_ATTEST, 0,       b32+ 47, 0,       aliases+ 44},	/*  25 */
-	{16UL, b32+ 18, b32+205, P_BE   | P_ATTEST, b32+205, b32+172, b32+ 29, aliases+ 41},	/*  26 */
-	{16UL, b32+ 18, b32+205, P_LE   | P_ATTEST, 0,       b32+ 88, 0,       aliases+ 56},	/*  27 */
-	{16UL, b32+ 18, b32+205, P_LE   | P_ATTEST, b32+205, b32+114, b32+187, aliases+ 45},	/*  28 */
-	{ 7UL, b32+ 19, 0,       P_BE   | P_ACADEM, 0,       b32+183, 0,       aliases+134},	/*  29 */
-	{ 6UL, b32+ 27, b32+195, P_BE   | P_ACADEM, 0,       b32+185, 0,       aliases+122},	/*  30 */
-    { 8UL, b32 + 28, 0,       P_BE   | P_ACADEM, 0,       b32 + 57, 0,       aliases + 145}, /*  31 */
-	{ 8UL, b32+ 28, b32+158, P_BE   | P_ATTEST, 0,       b32+118, 0,       aliases+153},	/*  32 */
-	{ 8UL, b32+ 28, b32+197, P_BE   | P_ATTEST, 0,       b32+ 95, 0,       aliases+148},	/*  33 */
-	{ 8UL, b32+ 28, b32+201, P_BE   | P_ATTEST, b32+201, b32+ 70, b32+156, aliases+157},	/*  34 */
-	{ 8UL, b32+ 28, b32+201, P_LE   | P_ATTEST, 0,       b32+116, 0,       aliases+159},	/*  35 */
-	{16UL, b32+ 30, b32+205, P_BE   | P_ATTEST, b32+205, b32+131, b32+179, aliases+ 61},	/*  36 */
-	{32UL, b32+ 31, b32+209, P_LE   | P_ATTEST, b32+209, b32+178, b32+145, aliases+101},	/*  37 */
-	{14UL, b32+ 35, 0,       P_LE   | P_ATTEST, 0,       b32+ 36, 0,       aliases+ 17},	/*  38 */
-	{ 5UL, b32+ 46, b32+194, P_LE   | P_THIRDP, b32+194, b32+160, b32+ 49, aliases+120},	/*  39 */
-	{ 8UL, b32+ 48, 0,       P_BE   | P_ATTEST, 0,       b32+ 61, 0,       aliases+155},	/*  40 */
-	{ 8UL, b32+ 48, b32+201, P_BE   | P_ATTEST, b32+201, b32+176, b32+ 63, aliases+139},	/*  41 */
-	{ 4UL, b32+ 49, 0,       P_LE   | P_ACADEM, 0,       b32+ 89, 0,       aliases+112},	/*  42 */
-	{ 4UL, b32+ 49, b32+186, P_BE   | P_ACADEM, b32+186, b32+136, b32+ 33, aliases+113},	/*  43 */
-	{ 8UL, b32+ 51, 0,       P_LE   | P_ATTEST, 0,       b32+126, 0,       aliases+152},	/*  44 */
-	{ 8UL, b32+ 51, b32+201, P_BE   | P_ATTEST, 0,       b32+193, 0,       aliases+154},	/*  45 */
-	{24UL, b32+ 54, b32+206, P_BE   | P_ACADEM, b32+206, b32+143, b32+ 21, aliases+ 80},	/*  46 */
-	{ 8UL, b32+ 59, 0,       P_LE   | P_ATTEST, 0,       b32+ 22, 0,       aliases+142},	/*  47 */
-	{16UL, b32+ 60, 0,       P_BE   | P_CONFIR, b32+205, b32+154, b32+127, aliases+ 38},	/*  48 */
-	{16UL, b32+ 60, 0,       P_LE   | P_CONFIR, b32+205, b32+184, b32+ 86, aliases+ 37},	/*  49 */
-	{64UL, b64d,    0,       P_BE   | P_ACADEM, 0,       b64e,    0,       aliases+128},	/*  50 */
-	{64UL, b64d,    b64a,    P_BE   | P_CONFIR, b64a,    b64f,    b64g,    aliases+131},	/*  51 */
-	{64UL, b64d,    b64a,    P_LE   | P_ATTEST, b64a,    b64h,    b64i,    aliases+132},	/*  52 */
-	{ 5UL, b32+ 66, b32+ 66, P_BE   | P_ATTEST, 0,       0,       0,       aliases+117},	/*  53 */
-	{ 8UL, b32+ 67, 0,       P_BE   | P_ACADEM, b32+201, b32+115, b32+ 74, aliases+146},	/*  54 */
-	{16UL, b32+ 77, 0,       P_BE   | P_ATTEST, 0,       b32+ 78, 0,       aliases+ 59},	/*  55 */
-	{10UL, b32+ 79, 0,       P_BE   | P_ACADEM, b32+202, b32+ 68, b32+ 52, aliases+  6},	/*  56 */
-	{24UL, b32+ 80, b32+133, P_BE   | P_ATTEST, 0,       b32+ 32, 0,       aliases+ 79},	/*  57 */
-	{24UL, b32+ 80, b32+199, P_BE   | P_ATTEST, 0,       b32+ 94, 0,       aliases+ 78},	/*  58 */
-	{ 3UL, b32+ 81, 0,       P_BE   | P_ACADEM, b32+177, b32+ 96, b32+ 62, aliases+ 85},	/*  59 */
-	{ 3UL, b32+ 81, b32+177, P_LE   | P_ACADEM, 0,       b32+151, 0,       aliases+ 86},	/*  60 */
-	{11UL, b32+ 82, 0,       P_BE   | P_ACADEM, 0,       b32+ 15, 0,       aliases+ 10},	/*  61 */
-	{ 6UL, b32+ 84, 0,       P_LE   | P_ATTEST, 0,       b32+117, 0,       aliases+123},	/*  62 */
-	{16UL, b32+ 87, 0,       P_BE   | P_THIRDP, 0,       b32+149, 0,       aliases+ 52},	/*  63 */
-	{11UL, b32+ 90, b32+  6, P_BE   | P_ATTEST, 0,       b32+141, 0,       aliases+  9},	/*  64 */
-	{16UL, b32+ 91, 0,       P_BE   | P_ATTEST, 0,       b32+ 37, 0,       aliases+ 60},	/*  65 */
-	{24UL, b32+ 97, 0,       P_BE   | P_ACADEM, 0,       b32+ 40, 0,       aliases+ 82},	/*  66 */
-	{24UL, b32+ 97, b32+206, P_BE   | P_ATTEST, b32+206, b32+ 34, b32+100, aliases+ 84},	/*  67 */
-	{16UL, b32+ 98, 0,       P_BE   | P_ATTEST, 0,       b32+200, 0,       aliases+ 67},	/*  68 */
-	{16UL, b32+ 98, 0,       P_LE   | P_CONFIR, 0,       b32+146, 0,       aliases+ 24},	/*  69 */
-	{16UL, b32+ 98, 0,       P_LE   | P_ATTEST, b32+205, b32+ 64, b32+137, aliases+ 55},	/*  70 */
-	{16UL, b32+ 98, b32+ 99, P_BE   | P_ATTEST, 0,       b32+123, 0,       aliases+ 34},	/*  71 */
-	{16UL, b32+ 98, b32+205, P_BE   | P_THIRDP, 0,       b32+135, 0,       aliases+ 32},	/*  72 */
-	{16UL, b32+ 98, b32+205, P_LE   | P_ATTEST, 0,       b32+ 71, 0,       aliases+ 57},	/*  73 */
-	{16UL, b32+ 98, b32+205, P_LE   | P_THIRDP, b32+205, b32+142, b32+137, aliases+ 68},	/*  74 */
-	{14UL, b32+101, 0,       P_BE   | P_ACADEM, b32+204, b32+155, b32+ 16, aliases+ 18},	/*  75 */
-	{30UL, b32+102, b32+207, P_BE   | P_ACADEM, b32+207, b32+ 20, b32+169, aliases+ 87},	/*  76 */
-	{12UL, b32+103, 0,       P_BE   | P_ACADEM, 0,       b32+191, 0,       aliases+ 13},	/*  77 */
-	{12UL, b32+103, 0,       P_BELE | P_ACADEM, 0,       b32+174, 0,       aliases+ 15},	/*  78 */
-	{32UL, b32+104, 0,       P_BE   | P_ATTEST, 0,       b32+ 50, 0,       aliases+ 92},	/*  79 */
-	{21UL, b32+105, 0,       P_BE   | P_ACADEM, 0,       b32+ 93, 0,       aliases+ 75},	/*  80 */
-	{24UL, b32+106, 0,       P_BE   | P_ACADEM, 0,       b32+163, 0,       aliases+ 81},	/*  81 */
-	{24UL, b32+106, b32+144, P_BE   | P_ATTEST, 0,       b32+ 39, 0,       aliases+ 83},	/*  82 */
-	{ 7UL, b32+109, 0,       P_BE   | P_ACADEM, 0,       b32+152, 0,       aliases+136},	/*  83 */
-	{15UL, b32+110, 0,       P_BE   | P_ACADEM, 0,       b32+ 13, 0,       aliases+ 20},	/*  84 */
-	{16UL, b32+111, 0,       P_BE   | P_ATTEST, 0,       b32+167, 0,       aliases+ 64},	/*  85 */
-	{10UL, b32+112, 0,       P_BE   | P_ATTEST, 0,       b32+ 85, 0,       aliases+  4},	/*  86 */
-	{ 8UL, b32+119, 0,       P_BE   | P_ACADEM, 0,       b32+183, 0,       aliases+150},	/*  87 */
-	{ 8UL, b32+119, 0,       P_LE   | P_THIRDP, 0,       b32+ 41, 0,       aliases+160},	/*  88 */
-	{ 8UL, b32+119, b32+201, P_BE   | P_ACADEM, 0,       b32+173, 0,       aliases+141},	/*  89 */
-	{ 6UL, b32+120, b32+195, P_BE   | P_ATTEST, 0,       b32+ 55, 0,       aliases+121},	/*  90 */
-	{ 7UL, b32+122, b32+198, P_LE   | P_ACADEM, 0,       b32+128, 0,       aliases+135},	/*  91 */
-	{16UL, b32+125, 0,       P_BE   | P_CONFIR, 0,       b32+ 17, 0,       aliases+ 65},	/*  92 */
-	{ 8UL, b32+129, 0,       P_LE   | P_ATTEST, 0,       b32+ 42, 0,       aliases+140},	/*  93 */
-	{ 5UL, b32+130, 0,       P_LE   | P_ACADEM, 0,       b32+ 58, 0,       aliases+118},	/*  94 */
-	{32UL, b32+132, b32+209, P_LE   | P_CONFIR, b32+209, b32+107, b32+ 65, aliases+ 95},	/*  95 */
-	{17UL, b32+140, 0,       P_BE   | P_ACADEM, 0,       b32+ 44, 0,       aliases+ 74},	/*  96 */
-	{ 6UL, b32+147, 0,       P_BE   | P_ACADEM, b32+195, b32+ 72, b32+182, aliases+125},	/*  97 */
-	{16UL, b32+161, b32+205, P_BE   | P_ACADEM, 0,       b32+ 73, 0,       aliases+ 31},	/*  98 */
-	{15UL, b32+166, 0,       P_BE   | P_ATTEST, b32+  2, b32+ 69, b32+166, aliases+ 21},	/*  99 */
-	{12UL, b32+168, 0,       P_BE   | P_ACADEM, b32+203, b32+139, b32+ 24, aliases+ 14},	/* 100 */
-	{ 8UL, b32+171, 0,       P_BE   | P_ACADEM, 0,       b32+147, 0,       aliases+143},	/* 101 */
-	{13UL, b32+181, 0,       P_BE   | P_ATTEST, 0,       b32+ 45, 0,       aliases+ 16},	/* 102 */
-	{12UL, b32+188, b32+203, P_BE   | P_ACADEM, 0,       b32+170, 0,       aliases+ 12},	/* 103 */
-	{32UL, b32+190, b32+209, P_LE   | P_ATTEST, b32+209, b32+ 23, b32+113, aliases+ 93},	/* 104 */
-	{10UL, b32+192, b32+202, P_BE   | P_ACADEM, 0,       b32+112, 0,       aliases+  5},	/* 105 */
-    { 0UL, 0,       0,       P_BE   | P_UNDFCL, 0,       0,       0,       NULL       },    /* terminating entry */
+    {64UL, b64,       b64a,      P_LE   | P_CONFIR, b64a,      b64b,      b64c,      aliases + 130}, /*   0 */
+    {32UL, b32 +  0,  0,         P_BE   | P_CONFIR, 0,         b32 + 148, 0,         aliases + 107}, /*   1 */
+    {40UL, b40,       0,         P_BE   | P_ACADEM, b40a,      b40b,      b40c,      aliases + 115}, /*   2 */
+    {24UL, b32 +  3,  b32 + 76,  P_LE   | P_ATTEST, 0,         b32 + 153, 0,         aliases + 77},  /*   3 */
+    {32UL, b32 +  8,  0,         P_BE   | P_ATTEST, b32 + 209, b32 + 92,  b32 + 159, aliases + 98},  /*   4 */
+    {32UL, b32 +  8,  b32 + 209, P_BE   | P_ATTEST, 0,         b32 +  7,  0,         aliases + 104}, /*   5 */
+    {32UL, b32 +  8,  b32 + 209, P_BE   | P_ATTEST, b32 + 209, b32 + 196, b32 + 159, aliases + 96},  /*   6 */
+    {32UL, b32 +  8,  b32 + 209, P_LE   | P_CONFIR, 0,         b32 + 56,  0,         aliases + 103}, /*   7 */
+    {32UL, b32 +  8,  b32 + 209, P_LE   | P_ATTEST, b32 + 209, b32 + 162, b32 + 175, aliases + 102}, /*   8 */
+    {16UL, b32 +  9,  0,         P_BE   | P_ATTEST, 0,         b32 +  5,  0,         aliases + 36},  /*   9 */
+    {16UL, b32 +  9,  0,         P_BE   | P_ATTEST, b32 +  1,  b32 +  4,  b32 +  9,  aliases + 35},  /*  10 */
+    { 8UL, b32 + 10,  0,         P_BE   | P_ATTEST, 0,         b32 + 189, 0,         aliases + 158}, /*  11 */
+    { 8UL, b32 + 10,  0,         P_BE   | P_ACADEM, b32 + 75,  b32 + 126, b32 + 134, aliases + 147}, /*  12 */
+    { 8UL, b32 + 10,  b32 + 201, P_LE   | P_ACADEM, 0,         b32 + 165, 0,         aliases + 156}, /*  13 */
+    {16UL, b32 + 11,  b32 + 205, P_LE   | P_ATTEST, 0,         b32 + 124, 0,         aliases + 58},  /*  14 */
+    {31UL, b32 + 12,  b32 + 208, P_BE   | P_CONFIR, b32 + 208, b32 + 26,  b32 + 121, aliases + 88},  /*  15 */
+    { 6UL, b32 + 14,  0,         P_LE   | P_ACADEM, 0,         b32 + 25,  0,         aliases + 124}, /*  16 */
+    {82UL, b82,       0,         P_LE   | P_ATTEST, 0,         b82a,      0,         aliases + 161}, /*  17 */
+    {16UL, b32 + 18,  0,         P_BE   | P_ATTEST, 0,         b32 + 53,  0,         aliases + 73},  /*  18 */
+    {16UL, b32 + 18,  0,         P_BE   | P_ACADEM, b32 + 205, b32 + 164, b32 + 29,  aliases + 42},  /*  19 */
+    {16UL, b32 + 18,  0,         P_LE   | P_ATTEST, 0,         b32 + 38,  0,         aliases + 50},  /*  20 */
+    {16UL, b32 + 18,  b32 + 29,  P_BE   | P_ATTEST, 0,         b32 + 180, 0,         aliases + 63},  /*  21 */
+    {16UL, b32 + 18,  b32 + 108, P_LE   | P_ATTEST, 0,         b32 + 43,  0,         aliases + 66},  /*  22 */
+    {16UL, b32 + 18,  b32 + 138, P_LE   | P_THIRDP, 0,         b32 + 83,  0,         aliases + 62},  /*  23 */
+    {16UL, b32 + 18,  b32 + 157, P_LE   | P_ATTEST, 0,         b32 + 150, 0,         aliases + 48},  /*  24 */
+    {16UL, b32 + 18,  b32 + 205, P_BE   | P_ATTEST, 0,         b32 + 47,  0,         aliases + 44},  /*  25 */
+    {16UL, b32 + 18,  b32 + 205, P_BE   | P_ATTEST, b32 + 205, b32 + 172, b32 + 29,  aliases + 41},  /*  26 */
+    {16UL, b32 + 18,  b32 + 205, P_LE   | P_ATTEST, 0,         b32 + 88,  0,         aliases + 56},  /*  27 */
+    {16UL, b32 + 18,  b32 + 205, P_LE   | P_ATTEST, b32 + 205, b32 + 114, b32 + 187, aliases + 45},  /*  28 */
+    { 7UL, b32 + 19,  0,         P_BE   | P_ACADEM, 0,         b32 + 183, 0,         aliases + 134}, /*  29 */
+    { 6UL, b32 + 27,  b32 + 195, P_BE   | P_ACADEM, 0,         b32 + 185, 0,         aliases + 122}, /*  30 */
+    { 8UL, b32 + 28,  0,         P_BE   | P_ACADEM, 0,         b32 + 57,  0,         aliases + 145}, /*  31 */
+    { 8UL, b32 + 28,  b32 + 158, P_BE   | P_ATTEST, 0,         b32 + 118, 0,         aliases + 153}, /*  32 */
+    { 8UL, b32 + 28,  b32 + 197, P_BE   | P_ATTEST, 0,         b32 + 95,  0,         aliases + 148}, /*  33 */
+    { 8UL, b32 + 28,  b32 + 201, P_BE   | P_ATTEST, b32 + 201, b32 + 70,  b32 + 156, aliases + 157}, /*  34 */
+    { 8UL, b32 + 28,  b32 + 201, P_LE   | P_ATTEST, 0,         b32 + 116, 0,         aliases + 159}, /*  35 */
+    {16UL, b32 + 30,  b32 + 205, P_BE   | P_ATTEST, b32 + 205, b32 + 131, b32 + 179, aliases + 61},  /*  36 */
+    {32UL, b32 + 31,  b32 + 209, P_LE   | P_ATTEST, b32 + 209, b32 + 178, b32 + 145, aliases + 101}, /*  37 */
+    {14UL, b32 + 35,  0,         P_LE   | P_ATTEST, 0,         b32 + 36,  0,         aliases + 17},  /*  38 */
+    { 5UL, b32 + 46,  b32 + 194, P_LE   | P_THIRDP, b32 + 194, b32 + 160, b32 + 49,  aliases + 120}, /*  39 */
+    { 8UL, b32 + 48,  0,         P_BE   | P_ATTEST, 0,         b32 + 61,  0,         aliases + 155}, /*  40 */
+    { 8UL, b32 + 48,  b32 + 201, P_BE   | P_ATTEST, b32 + 201, b32 + 176, b32 + 63,  aliases + 139}, /*  41 */
+    { 4UL, b32 + 49,  0,         P_LE   | P_ACADEM, 0,         b32 + 89,  0,         aliases + 112}, /*  42 */
+    { 4UL, b32 + 49,  b32 + 186, P_BE   | P_ACADEM, b32 + 186, b32 + 136, b32 + 33,  aliases + 113}, /*  43 */
+    { 8UL, b32 + 51,  0,         P_LE   | P_ATTEST, 0,         b32 + 126, 0,         aliases + 152}, /*  44 */
+    { 8UL, b32 + 51,  b32 + 201, P_BE   | P_ATTEST, 0,         b32 + 193, 0,         aliases + 154}, /*  45 */
+    {24UL, b32 + 54,  b32 + 206, P_BE   | P_ACADEM, b32 + 206, b32 + 143, b32 + 21,  aliases + 80},  /*  46 */
+    { 8UL, b32 + 59,  0,         P_LE   | P_ATTEST, 0,         b32 + 22,  0,         aliases + 142}, /*  47 */
+    {16UL, b32 + 60,  0,         P_BE   | P_CONFIR, b32 + 205, b32 + 154, b32 + 127, aliases + 38},  /*  48 */
+    {16UL, b32 + 60,  0,         P_LE   | P_CONFIR, b32 + 205, b32 + 184, b32 + 86,  aliases + 37},  /*  49 */
+    {64UL, b64d,      0,         P_BE   | P_ACADEM, 0,         b64e,      0,         aliases + 128}, /*  50 */
+    {64UL, b64d,      b64a,      P_BE   | P_CONFIR, b64a,      b64f,      b64g,      aliases + 131}, /*  51 */
+    {64UL, b64d,      b64a,      P_LE   | P_ATTEST, b64a,      b64h,      b64i,      aliases + 132}, /*  52 */
+    { 5UL, b32 + 66,  b32 + 66,  P_BE   | P_ATTEST, 0,         0,         0,         aliases + 117}, /*  53 */
+    { 8UL, b32 + 67,  0,         P_BE   | P_ACADEM, b32 + 201, b32 + 115, b32 + 74,  aliases + 146}, /*  54 */
+    {16UL, b32 + 77,  0,         P_BE   | P_ATTEST, 0,         b32 + 78,  0,         aliases + 59},  /*  55 */
+    {10UL, b32 + 79,  0,         P_BE   | P_ACADEM, b32 + 202, b32 + 68,  b32 + 52,  aliases +  6},  /*  56 */
+    {24UL, b32 + 80,  b32 + 133, P_BE   | P_ATTEST, 0,         b32 + 32,  0,         aliases + 79},  /*  57 */
+    {24UL, b32 + 80,  b32 + 199, P_BE   | P_ATTEST, 0,         b32 + 94,  0,         aliases + 78},  /*  58 */
+    { 3UL, b32 + 81,  0,         P_BE   | P_ACADEM, b32 + 177, b32 + 96,  b32 + 62,  aliases + 85},  /*  59 */
+    { 3UL, b32 + 81,  b32 + 177, P_LE   | P_ACADEM, 0,         b32 + 151, 0,         aliases + 86},  /*  60 */
+    {11UL, b32 + 82,  0,         P_BE   | P_ACADEM, 0,         b32 + 15,  0,         aliases + 10},  /*  61 */
+    { 6UL, b32 + 84,  0,         P_LE   | P_ATTEST, 0,         b32 + 117, 0,         aliases + 123}, /*  62 */
+    {16UL, b32 + 87,  0,         P_BE   | P_THIRDP, 0,         b32 + 149, 0,         aliases + 52},  /*  63 */
+    {11UL, b32 + 90,  b32 +  6,  P_BE   | P_ATTEST, 0,         b32 + 141, 0,         aliases +  9},  /*  64 */
+    {16UL, b32 + 91,  0,         P_BE   | P_ATTEST, 0,         b32 + 37,  0,         aliases + 60},  /*  65 */
+    {24UL, b32 + 97,  0,         P_BE   | P_ACADEM, 0,         b32 + 40,  0,         aliases + 82},  /*  66 */
+    {24UL, b32 + 97,  b32 + 206, P_BE   | P_ATTEST, b32 + 206, b32 + 34,  b32 + 100, aliases + 84},  /*  67 */
+    {16UL, b32 + 98,  0,         P_BE   | P_ATTEST, 0,         b32 + 200, 0,         aliases + 67},  /*  68 */
+    {16UL, b32 + 98,  0,         P_LE   | P_CONFIR, 0,         b32 + 146, 0,         aliases + 24},  /*  69 */
+    {16UL, b32 + 98,  0,         P_LE   | P_ATTEST, b32 + 205, b32 + 64,  b32 + 137, aliases + 55},  /*  70 */
+    {16UL, b32 + 98,  b32 + 99,  P_BE   | P_ATTEST, 0,         b32 + 123, 0,         aliases + 34},  /*  71 */
+    {16UL, b32 + 98,  b32 + 205, P_BE   | P_THIRDP, 0,         b32 + 135, 0,         aliases + 32},  /*  72 */
+    {16UL, b32 + 98,  b32 + 205, P_LE   | P_ATTEST, 0,         b32 + 71,  0,         aliases + 57},  /*  73 */
+    {16UL, b32 + 98,  b32 + 205, P_LE   | P_THIRDP, b32 + 205, b32 + 142, b32 + 137, aliases + 68},  /*  74 */
+    {14UL, b32 + 101, 0,         P_BE   | P_ACADEM, b32 + 204, b32 + 155, b32 + 16,  aliases + 18},  /*  75 */
+    {30UL, b32 + 102, b32 + 207, P_BE   | P_ACADEM, b32 + 207, b32 + 20,  b32 + 169, aliases + 87},  /*  76 */
+    {12UL, b32 + 103, 0,         P_BE   | P_ACADEM, 0,         b32 + 191, 0,         aliases + 13},  /*  77 */
+    {12UL, b32 + 103, 0,         P_BELE | P_ACADEM, 0,         b32 + 174, 0,         aliases + 15},  /*  78 */
+    {32UL, b32 + 104, 0,         P_BE   | P_ATTEST, 0,         b32 + 50,  0,         aliases + 92},  /*  79 */
+    {21UL, b32 + 105, 0,         P_BE   | P_ACADEM, 0,         b32 + 93,  0,         aliases + 75},  /*  80 */
+    {24UL, b32 + 106, 0,         P_BE   | P_ACADEM, 0,         b32 + 163, 0,         aliases + 81},  /*  81 */
+    {24UL, b32 + 106, b32 + 144, P_BE   | P_ATTEST, 0,         b32 + 39,  0,         aliases + 83},  /*  82 */
+    { 7UL, b32 + 109, 0,         P_BE   | P_ACADEM, 0,         b32 + 152, 0,         aliases + 136}, /*  83 */
+    {15UL, b32 + 110, 0,         P_BE   | P_ACADEM, 0,         b32 + 13,  0,         aliases + 20},  /*  84 */
+    {16UL, b32 + 111, 0,         P_BE   | P_ATTEST, 0,         b32 + 167, 0,         aliases + 64},  /*  85 */
+    {10UL, b32 + 112, 0,         P_BE   | P_ATTEST, 0,         b32 + 85,  0,         aliases +  4},  /*  86 */
+    { 8UL, b32 + 119, 0,         P_BE   | P_ACADEM, 0,         b32 + 183, 0,         aliases + 150}, /*  87 */
+    { 8UL, b32 + 119, 0,         P_LE   | P_THIRDP, 0,         b32 + 41,  0,         aliases + 160}, /*  88 */
+    { 8UL, b32 + 119, b32 + 201, P_BE   | P_ACADEM, 0,         b32 + 173, 0,         aliases + 141}, /*  89 */
+    { 6UL, b32 + 120, b32 + 195, P_BE   | P_ATTEST, 0,         b32 + 55,  0,         aliases + 121}, /*  90 */
+    { 7UL, b32 + 122, b32 + 198, P_LE   | P_ACADEM, 0,         b32 + 128, 0,         aliases + 135}, /*  91 */
+    {16UL, b32 + 125, 0,         P_BE   | P_CONFIR, 0,         b32 + 17,  0,         aliases + 65},  /*  92 */
+    { 8UL, b32 + 129, 0,         P_LE   | P_ATTEST, 0,         b32 + 42,  0,         aliases + 140}, /*  93 */
+    { 5UL, b32 + 130, 0,         P_LE   | P_ACADEM, 0,         b32 + 58,  0,         aliases + 118}, /*  94 */
+    {32UL, b32 + 132, b32 + 209, P_LE   | P_CONFIR, b32 + 209, b32 + 107, b32 + 65,  aliases + 95},  /*  95 */
+    {17UL, b32 + 140, 0,         P_BE   | P_ACADEM, 0,         b32 + 44,  0,         aliases + 74},  /*  96 */
+    { 6UL, b32 + 147, 0,         P_BE   | P_ACADEM, b32 + 195, b32 + 72,  b32 + 182, aliases + 125}, /*  97 */
+    {16UL, b32 + 161, b32 + 205, P_BE   | P_ACADEM, 0,         b32 + 73,  0,         aliases + 31},  /*  98 */
+    {15UL, b32 + 166, 0,         P_BE   | P_ATTEST, b32 +  2,  b32 + 69,  b32 + 166, aliases + 21},  /*  99 */
+    {12UL, b32 + 168, 0,         P_BE   | P_ACADEM, b32 + 203, b32 + 139, b32 + 24,  aliases + 14},  /* 100 */
+    { 8UL, b32 + 171, 0,         P_BE   | P_ACADEM, 0,         b32 + 147, 0,         aliases + 143}, /* 101 */
+    {13UL, b32 + 181, 0,         P_BE   | P_ATTEST, 0,         b32 + 45,  0,         aliases + 16},  /* 102 */
+    {12UL, b32 + 188, b32 + 203, P_BE   | P_ACADEM, 0,         b32 + 170, 0,         aliases + 12},  /* 103 */
+    {32UL, b32 + 190, b32 + 209, P_LE   | P_ATTEST, b32 + 209, b32 + 23,  b32 + 113, aliases + 93},  /* 104 */
+    {10UL, b32 + 192, b32 + 202, P_BE   | P_ACADEM, 0,         b32 + 112, 0,         aliases +  5},  /* 105 */
+    { 0UL, 0,         0,         P_BE   | P_UNDFCL, 0,         0,         0,         NULL       },   /* terminating entry */
 };
 #    define NPRESETS 106
 
 /* List of names with pointers to models, pre-sorted for use with bsearch() */
 static const struct malias aliases[] = {
-	{"ARC",				models+ 69},	/*   0 */
-    {"B-CRC-32",            models +  6},   /*   1 */
-    {"CKSUM",               models +  4},   /*   2 */
-	{"CRC-10",			models+ 86},	/*   3 */
-	{"CRC-10/ATM",			models+ 86},	/*   4 */
-	{"CRC-10/CDMA2000",		models+105},	/*   5 */
-	{"CRC-10/GSM",			models+ 56},	/*   6 */
-	{"CRC-10/I-610",		models+ 86},	/*   7 */
-	{"CRC-11",			models+ 64},	/*   8 */
-	{"CRC-11/FLEXRAY",		models+ 64},	/*   9 */
-	{"CRC-11/UMTS",			models+ 61},	/*  10 */
-	{"CRC-12/3GPP",			models+ 78},	/*  11 */
-	{"CRC-12/CDMA2000",		models+103},	/*  12 */
-	{"CRC-12/DECT",			models+ 77},	/*  13 */
-	{"CRC-12/GSM",			models+100},	/*  14 */
-	{"CRC-12/UMTS",			models+ 78},	/*  15 */
-	{"CRC-13/BBC",			models+102},	/*  16 */
-	{"CRC-14/DARC",			models+ 38},	/*  17 */
-	{"CRC-14/GSM",			models+ 75},	/*  18 */
-	{"CRC-15",			models+ 84},	/*  19 */
-	{"CRC-15/CAN",			models+ 84},	/*  20 */
-	{"CRC-15/MPT1327",		models+ 99},	/*  21 */
-	{"CRC-16",			models+ 69},	/*  22 */
-    {"CRC-16/ACORN",        models + 18},   /*  23 */
-	{"CRC-16/ARC",			models+ 69},	/*  24 */
-    {"CRC-16/AUG-CCITT",    models + 21},   /*  25 */
-    {"CRC-16/AUTOSAR",      models + 25},   /*  26 */
-	{"CRC-16/BUYPASS",		models+ 68},	/*  27 */
-    {"CRC-16/CCITT",        models + 20},   /*  28 */
-    {"CRC-16/CCITT-FALSE",  models + 25},   /*  29 */
-    {"CRC-16/CCITT-TRUE",   models + 20},   /*  30 */
-	{"CRC-16/CDMA2000",		models+ 98},	/*  31 */
-	{"CRC-16/CMS",			models+ 72},	/*  32 */
-    {"CRC-16/DARC",         models + 26},   /*  33 */
-	{"CRC-16/DDS-110",		models+ 71},	/*  34 */
-    {"CRC-16/DECT-R",       models + 10},   /*  35 */
-    {"CRC-16/DECT-X",       models +  9},   /*  36 */
-	{"CRC-16/DNP",			models+ 49},	/*  37 */
-	{"CRC-16/EN-13757",		models+ 48},	/*  38 */
-    {"CRC-16/EPC",          models + 26},   /*  39 */
-    {"CRC-16/EPC-C1G2",     models + 26},   /*  40 */
-    {"CRC-16/GENIBUS",      models + 26},   /*  41 */
-    {"CRC-16/GSM",          models + 19},   /*  42 */
-    {"CRC-16/I-CODE",       models + 26},   /*  43 */
-    {"CRC-16/IBM-3740",     models + 25},   /*  44 */
-    {"CRC-16/IBM-SDLC",     models + 28},   /*  45 */
-	{"CRC-16/IEC-61158-2",		models+ 36},	/*  46 */
-    {"CRC-16/ISO-HDLC",     models + 28},   /*  47 */
-    {"CRC-16/ISO-IEC-14443-3-A",    models + 24},   /*  48 */
-    {"CRC-16/ISO-IEC-14443-3-B",    models + 28},   /*  49 */
-    {"CRC-16/KERMIT",       models + 20},   /*  50 */
-	{"CRC-16/LHA",			models+ 69},	/*  51 */
-	{"CRC-16/LJ1200",		models+ 63},	/*  52 */
-    {"CRC-16/LTE",          models + 18},   /*  53 */
-	{"CRC-16/MAXIM",		models+ 70},	/*  54 */
-	{"CRC-16/MAXIM-DOW",		models+ 70},	/*  55 */
-    {"CRC-16/MCRF4XX",      models + 27},   /*  56 */
-	{"CRC-16/MODBUS",		models+ 73},	/*  57 */
-    {"CRC-16/NRSC-5",       models + 14},   /*  58 */
-	{"CRC-16/OPENSAFETY-A",		models+ 55},	/*  59 */
-	{"CRC-16/OPENSAFETY-B",		models+ 65},	/*  60 */
-	{"CRC-16/PROFIBUS",		models+ 36},	/*  61 */
-    {"CRC-16/RIELLO",       models + 23},   /*  62 */
-    {"CRC-16/SPI-FUJITSU",  models + 21},   /*  63 */
-	{"CRC-16/T10-DIF",		models+ 85},	/*  64 */
-	{"CRC-16/TELEDISK",		models+ 92},	/*  65 */
-    {"CRC-16/TMS37157",     models + 22},   /*  66 */
-	{"CRC-16/UMTS",			models+ 68},	/*  67 */
-	{"CRC-16/USB",			models+ 74},	/*  68 */
-    {"CRC-16/V-41-LSB",     models + 20},   /*  69 */
-    {"CRC-16/V-41-MSB",     models + 18},   /*  70 */
-	{"CRC-16/VERIFONE",		models+ 68},	/*  71 */
-    {"CRC-16/X-25",         models + 28},   /*  72 */
-    {"CRC-16/XMODEM",       models + 18},   /*  73 */
-	{"CRC-17/CAN-FD",		models+ 96},	/*  74 */
-	{"CRC-21/CAN-FD",		models+ 80},	/*  75 */
-	{"CRC-24",			models+ 82},	/*  76 */
-    {"CRC-24/BLE",          models +  3},   /*  77 */
-	{"CRC-24/FLEXRAY-A",		models+ 58},	/*  78 */
-	{"CRC-24/FLEXRAY-B",		models+ 57},	/*  79 */
-	{"CRC-24/INTERLAKEN",		models+ 46},	/*  80 */
-	{"CRC-24/LTE-A",		models+ 81},	/*  81 */
-	{"CRC-24/LTE-B",		models+ 66},	/*  82 */
-	{"CRC-24/OPENPGP",		models+ 82},	/*  83 */
-	{"CRC-24/OS-9",			models+ 67},	/*  84 */
-	{"CRC-3/GSM",			models+ 59},	/*  85 */
-	{"CRC-3/ROHC",			models+ 60},	/*  86 */
-	{"CRC-30/CDMA",			models+ 76},	/*  87 */
-    {"CRC-31/PHILIPS",      models + 15},   /*  88 */
-    {"CRC-32",              models +  8},   /*  89 */
-    {"CRC-32/AAL5",         models +  6},   /*  90 */
-    {"CRC-32/ADCCP",        models +  8},   /*  91 */
-	{"CRC-32/AIXM",			models+ 79},	/*  92 */
-	{"CRC-32/AUTOSAR",		models+104},	/*  93 */
-	{"CRC-32/BASE91-C",		models+ 37},	/*  94 */
-	{"CRC-32/BASE91-D",		models+ 95},	/*  95 */
-    {"CRC-32/BZIP2",        models +  6},   /*  96 */
-	{"CRC-32/CASTAGNOLI",		models+ 37},	/*  97 */
-    {"CRC-32/CKSUM",        models +  4},   /*  98 */
-    {"CRC-32/DECT-B",       models +  6},   /*  99 */
-	{"CRC-32/INTERLAKEN",		models+ 37},	/* 100 */
-	{"CRC-32/ISCSI",		models+ 37},	/* 101 */
-    {"CRC-32/ISO-HDLC",     models +  8},   /* 102 */
-    {"CRC-32/JAMCRC",       models +  7},   /* 103 */
-    {"CRC-32/MPEG-2",       models +  5},   /* 104 */
-    {"CRC-32/POSIX",        models +  4},   /* 105 */
-    {"CRC-32/V-42",         models +  8},   /* 106 */
-    {"CRC-32/XFER",         models +  1},   /* 107 */
-    {"CRC-32/XZ",           models +  8},   /* 108 */
-	{"CRC-32C",			models+ 37},	/* 109 */
-	{"CRC-32D",			models+ 95},	/* 110 */
-	{"CRC-32Q",			models+ 79},	/* 111 */
-	{"CRC-4/G-704",			models+ 42},	/* 112 */
-	{"CRC-4/INTERLAKEN",		models+ 43},	/* 113 */
-	{"CRC-4/ITU",			models+ 42},	/* 114 */
-    {"CRC-40/GSM",          models +  2},   /* 115 */
-	{"CRC-5/EPC",			models+ 53},	/* 116 */
-	{"CRC-5/EPC-C1G2",		models+ 53},	/* 117 */
-	{"CRC-5/G-704",			models+ 94},	/* 118 */
-	{"CRC-5/ITU",			models+ 94},	/* 119 */
-	{"CRC-5/USB",			models+ 39},	/* 120 */
-	{"CRC-6/CDMA2000-A",		models+ 90},	/* 121 */
-    {"CRC-6/CDMA2000-B",    models + 30},   /* 122 */
-	{"CRC-6/DARC",			models+ 62},	/* 123 */
-    {"CRC-6/G-704",         models + 16},   /* 124 */
-	{"CRC-6/GSM",			models+ 97},	/* 125 */
-    {"CRC-6/ITU",           models + 16},   /* 126 */
-	{"CRC-64",			models+ 50},	/* 127 */
-	{"CRC-64/ECMA-182",		models+ 50},	/* 128 */
-	{"CRC-64/GO-ECMA",		models+ 52},	/* 129 */
-    {"CRC-64/GO-ISO",       models +  0},   /* 130 */
-	{"CRC-64/WE",			models+ 51},	/* 131 */
-	{"CRC-64/XZ",			models+ 52},	/* 132 */
-    {"CRC-7",               models + 29},   /* 133 */
-    {"CRC-7/MMC",           models + 29},   /* 134 */
-	{"CRC-7/ROHC",			models+ 91},	/* 135 */
-	{"CRC-7/UMTS",			models+ 83},	/* 136 */
-    {"CRC-8",               models + 11},   /* 137 */
-	{"CRC-8/AES",			models+ 35},	/* 138 */
-	{"CRC-8/AUTOSAR",		models+ 41},	/* 139 */
-	{"CRC-8/BLUETOOTH",		models+ 93},	/* 140 */
-	{"CRC-8/CDMA2000",		models+ 89},	/* 141 */
-	{"CRC-8/DARC",			models+ 47},	/* 142 */
-	{"CRC-8/DVB-S2",		models+101},	/* 143 */
-	{"CRC-8/EBU",			models+ 35},	/* 144 */
-    {"CRC-8/GSM-A",         models + 31},   /* 145 */
-	{"CRC-8/GSM-B",			models+ 54},	/* 146 */
-    {"CRC-8/I-432-1",       models + 12},   /* 147 */
-	{"CRC-8/I-CODE",		models+ 33},	/* 148 */
-    {"CRC-8/ITU",           models + 12},   /* 149 */
-	{"CRC-8/LTE",			models+ 87},	/* 150 */
-	{"CRC-8/MAXIM",			models+ 44},	/* 151 */
-	{"CRC-8/MAXIM-DOW",		models+ 44},	/* 152 */
-	{"CRC-8/MIFARE-MAD",		models+ 32},	/* 153 */
-	{"CRC-8/NRSC-5",		models+ 45},	/* 154 */
-	{"CRC-8/OPENSAFETY",		models+ 40},	/* 155 */
-	{"CRC-8/ROHC",			models+ 13},	/* 156 */
-	{"CRC-8/SAE-J1850",		models+ 34},	/* 157 */
-	{"CRC-8/SMBUS",			models+ 11},	/* 158 */
-	{"CRC-8/TECH-3250",		models+ 35},	/* 159 */
-	{"CRC-8/WCDMA",			models+ 88},	/* 160 */
-	{"CRC-82/DARC",			models+ 17},	/* 161 */
-	{"CRC-A",			models+ 24},	/* 162 */
-	{"CRC-B",			models+ 28},	/* 163 */
-	{"CRC-CCITT",			models+ 20},	/* 164 */
-	{"CRC-IBM",			models+ 69},	/* 165 */
-	{"DOW-CRC",			models+ 44},	/* 166 */
-	{"JAMCRC",			models+  7},	/* 167 */
-	{"KERMIT",			models+ 20},	/* 168 */
-	{"MODBUS",			models+ 73},	/* 169 */
-	{"PKZIP",			models+  8},	/* 170 */
-	{"R-CRC-16",			models+ 10},	/* 171 */
-	{"X-25",			models+ 28},	/* 172 */
-	{"X-CRC-12",			models+ 77},	/* 173 */
-	{"X-CRC-16",			models+  9},	/* 174 */
-	{"XFER",			models+  1},	/* 175 */
-	{"XMODEM",			models+ 18},	/* 176 */
-	{"ZMODEM",			models+ 18},	/* 177 */
-    {NULL,                  NULL      },    /* terminating entry */
+    {"ARC",                      models + 69},   /*   0 */
+    {"B-CRC-32",                 models +  6},   /*   1 */
+    {"CKSUM",                    models +  4},   /*   2 */
+    {"CRC-10",                   models + 86},   /*   3 */
+    {"CRC-10/ATM",               models + 86},   /*   4 */
+    {"CRC-10/CDMA2000",          models + 105},  /*   5 */
+    {"CRC-10/GSM",               models + 56},   /*   6 */
+    {"CRC-10/I-610",             models + 86},   /*   7 */
+    {"CRC-11",                   models + 64},   /*   8 */
+    {"CRC-11/FLEXRAY",           models + 64},   /*   9 */
+    {"CRC-11/UMTS",              models + 61},   /*  10 */
+    {"CRC-12/3GPP",              models + 78},   /*  11 */
+    {"CRC-12/CDMA2000",          models + 103},  /*  12 */
+    {"CRC-12/DECT",              models + 77},   /*  13 */
+    {"CRC-12/GSM",               models + 100},  /*  14 */
+    {"CRC-12/UMTS",              models + 78},   /*  15 */
+    {"CRC-13/BBC",               models + 102},  /*  16 */
+    {"CRC-14/DARC",              models + 38},   /*  17 */
+    {"CRC-14/GSM",               models + 75},   /*  18 */
+    {"CRC-15",                   models + 84},   /*  19 */
+    {"CRC-15/CAN",               models + 84},   /*  20 */
+    {"CRC-15/MPT1327",           models + 99},   /*  21 */
+    {"CRC-16",                   models + 69},   /*  22 */
+    {"CRC-16/ACORN",             models + 18},   /*  23 */
+    {"CRC-16/ARC",               models + 69},   /*  24 */
+    {"CRC-16/AUG-CCITT",         models + 21},   /*  25 */
+    {"CRC-16/AUTOSAR",           models + 25},   /*  26 */
+    {"CRC-16/BUYPASS",           models + 68},   /*  27 */
+    {"CRC-16/CCITT",             models + 20},   /*  28 */
+    {"CRC-16/CCITT-FALSE",       models + 25},   /*  29 */
+    {"CRC-16/CCITT-TRUE",        models + 20},   /*  30 */
+    {"CRC-16/CDMA2000",          models + 98},   /*  31 */
+    {"CRC-16/CMS",               models + 72},   /*  32 */
+    {"CRC-16/DARC",              models + 26},   /*  33 */
+    {"CRC-16/DDS-110",           models + 71},   /*  34 */
+    {"CRC-16/DECT-R",            models + 10},   /*  35 */
+    {"CRC-16/DECT-X",            models +  9},   /*  36 */
+    {"CRC-16/DNP",               models + 49},   /*  37 */
+    {"CRC-16/EN-13757",          models + 48},   /*  38 */
+    {"CRC-16/EPC",               models + 26},   /*  39 */
+    {"CRC-16/EPC-C1G2",          models + 26},   /*  40 */
+    {"CRC-16/GENIBUS",           models + 26},   /*  41 */
+    {"CRC-16/GSM",               models + 19},   /*  42 */
+    {"CRC-16/I-CODE",            models + 26},   /*  43 */
+    {"CRC-16/IBM-3740",          models + 25},   /*  44 */
+    {"CRC-16/IBM-SDLC",          models + 28},   /*  45 */
+    {"CRC-16/IEC-61158-2",       models + 36},   /*  46 */
+    {"CRC-16/ISO-HDLC",          models + 28},   /*  47 */
+    {"CRC-16/ISO-IEC-14443-3-A", models + 24},   /*  48 */
+    {"CRC-16/ISO-IEC-14443-3-B", models + 28},   /*  49 */
+    {"CRC-16/KERMIT",            models + 20},   /*  50 */
+    {"CRC-16/LHA",               models + 69},   /*  51 */
+    {"CRC-16/LJ1200",            models + 63},   /*  52 */
+    {"CRC-16/LTE",               models + 18},   /*  53 */
+    {"CRC-16/MAXIM",             models + 70},   /*  54 */
+    {"CRC-16/MAXIM-DOW",         models + 70},   /*  55 */
+    {"CRC-16/MCRF4XX",           models + 27},   /*  56 */
+    {"CRC-16/MODBUS",            models + 73},   /*  57 */
+    {"CRC-16/NRSC-5",            models + 14},   /*  58 */
+    {"CRC-16/OPENSAFETY-A",      models + 55},   /*  59 */
+    {"CRC-16/OPENSAFETY-B",      models + 65},   /*  60 */
+    {"CRC-16/PROFIBUS",          models + 36},   /*  61 */
+    {"CRC-16/RIELLO",            models + 23},   /*  62 */
+    {"CRC-16/SPI-FUJITSU",       models + 21},   /*  63 */
+    {"CRC-16/T10-DIF",           models + 85},   /*  64 */
+    {"CRC-16/TELEDISK",          models + 92},   /*  65 */
+    {"CRC-16/TMS37157",          models + 22},   /*  66 */
+    {"CRC-16/UMTS",              models + 68},   /*  67 */
+    {"CRC-16/USB",               models + 74},   /*  68 */
+    {"CRC-16/V-41-LSB",          models + 20},   /*  69 */
+    {"CRC-16/V-41-MSB",          models + 18},   /*  70 */
+    {"CRC-16/VERIFONE",          models + 68},   /*  71 */
+    {"CRC-16/X-25",              models + 28},   /*  72 */
+    {"CRC-16/XMODEM",            models + 18},   /*  73 */
+    {"CRC-17/CAN-FD",            models + 96},   /*  74 */
+    {"CRC-21/CAN-FD",            models + 80},   /*  75 */
+    {"CRC-24",                   models + 82},   /*  76 */
+    {"CRC-24/BLE",               models +  3},   /*  77 */
+    {"CRC-24/FLEXRAY-A",         models + 58},   /*  78 */
+    {"CRC-24/FLEXRAY-B",         models + 57},   /*  79 */
+    {"CRC-24/INTERLAKEN",        models + 46},   /*  80 */
+    {"CRC-24/LTE-A",             models + 81},   /*  81 */
+    {"CRC-24/LTE-B",             models + 66},   /*  82 */
+    {"CRC-24/OPENPGP",           models + 82},   /*  83 */
+    {"CRC-24/OS-9",              models + 67},   /*  84 */
+    {"CRC-3/GSM",                models + 59},   /*  85 */
+    {"CRC-3/ROHC",               models + 60},   /*  86 */
+    {"CRC-30/CDMA",              models + 76},   /*  87 */
+    {"CRC-31/PHILIPS",           models + 15},   /*  88 */
+    {"CRC-32",                   models +  8},   /*  89 */
+    {"CRC-32/AAL5",              models +  6},   /*  90 */
+    {"CRC-32/ADCCP",             models +  8},   /*  91 */
+    {"CRC-32/AIXM",              models + 79},   /*  92 */
+    {"CRC-32/AUTOSAR",           models + 104},  /*  93 */
+    {"CRC-32/BASE91-C",          models + 37},   /*  94 */
+    {"CRC-32/BASE91-D",          models + 95},   /*  95 */
+    {"CRC-32/BZIP2",             models +  6},   /*  96 */
+    {"CRC-32/CASTAGNOLI",        models + 37},   /*  97 */
+    {"CRC-32/CKSUM",             models +  4},   /*  98 */
+    {"CRC-32/DECT-B",            models +  6},   /*  99 */
+    {"CRC-32/INTERLAKEN",        models + 37},   /* 100 */
+    {"CRC-32/ISCSI",             models + 37},   /* 101 */
+    {"CRC-32/ISO-HDLC",          models +  8},   /* 102 */
+    {"CRC-32/JAMCRC",            models +  7},   /* 103 */
+    {"CRC-32/MPEG-2",            models +  5},   /* 104 */
+    {"CRC-32/POSIX",             models +  4},   /* 105 */
+    {"CRC-32/V-42",              models +  8},   /* 106 */
+    {"CRC-32/XFER",              models +  1},   /* 107 */
+    {"CRC-32/XZ",                models +  8},   /* 108 */
+    {"CRC-32C",                  models + 37},   /* 109 */
+    {"CRC-32D",                  models + 95},   /* 110 */
+    {"CRC-32Q",                  models + 79},   /* 111 */
+    {"CRC-4/G-704",              models + 42},   /* 112 */
+    {"CRC-4/INTERLAKEN",         models + 43},   /* 113 */
+    {"CRC-4/ITU",                models + 42},   /* 114 */
+    {"CRC-40/GSM",               models +  2},   /* 115 */
+    {"CRC-5/EPC",                models + 53},   /* 116 */
+    {"CRC-5/EPC-C1G2",           models + 53},   /* 117 */
+    {"CRC-5/G-704",              models + 94},   /* 118 */
+    {"CRC-5/ITU",                models + 94},   /* 119 */
+    {"CRC-5/USB",                models + 39},   /* 120 */
+    {"CRC-6/CDMA2000-A",         models + 90},   /* 121 */
+    {"CRC-6/CDMA2000-B",         models + 30},   /* 122 */
+    {"CRC-6/DARC",               models + 62},   /* 123 */
+    {"CRC-6/G-704",              models + 16},   /* 124 */
+    {"CRC-6/GSM",                models + 97},   /* 125 */
+    {"CRC-6/ITU",                models + 16},   /* 126 */
+    {"CRC-64",                   models + 50},   /* 127 */
+    {"CRC-64/ECMA-182",          models + 50},   /* 128 */
+    {"CRC-64/GO-ECMA",           models + 52},   /* 129 */
+    {"CRC-64/GO-ISO",            models +  0},   /* 130 */
+    {"CRC-64/WE",                models + 51},   /* 131 */
+    {"CRC-64/XZ",                models + 52},   /* 132 */
+    {"CRC-7",                    models + 29},   /* 133 */
+    {"CRC-7/MMC",                models + 29},   /* 134 */
+    {"CRC-7/ROHC",               models + 91},   /* 135 */
+    {"CRC-7/UMTS",               models + 83},   /* 136 */
+    {"CRC-8",                    models + 11},   /* 137 */
+    {"CRC-8/AES",                models + 35},   /* 138 */
+    {"CRC-8/AUTOSAR",            models + 41},   /* 139 */
+    {"CRC-8/BLUETOOTH",          models + 93},   /* 140 */
+    {"CRC-8/CDMA2000",           models + 89},   /* 141 */
+    {"CRC-8/DARC",               models + 47},   /* 142 */
+    {"CRC-8/DVB-S2",             models + 101},  /* 143 */
+    {"CRC-8/EBU",                models + 35},   /* 144 */
+    {"CRC-8/GSM-A",              models + 31},   /* 145 */
+    {"CRC-8/GSM-B",              models + 54},   /* 146 */
+    {"CRC-8/I-432-1",            models + 12},   /* 147 */
+    {"CRC-8/I-CODE",             models + 33},   /* 148 */
+    {"CRC-8/ITU",                models + 12},   /* 149 */
+    {"CRC-8/LTE",                models + 87},   /* 150 */
+    {"CRC-8/MAXIM",              models + 44},   /* 151 */
+    {"CRC-8/MAXIM-DOW",          models + 44},   /* 152 */
+    {"CRC-8/MIFARE-MAD",         models + 32},   /* 153 */
+    {"CRC-8/NRSC-5",             models + 45},   /* 154 */
+    {"CRC-8/OPENSAFETY",         models + 40},   /* 155 */
+    {"CRC-8/ROHC",               models + 13},   /* 156 */
+    {"CRC-8/SAE-J1850",          models + 34},   /* 157 */
+    {"CRC-8/SMBUS",              models + 11},   /* 158 */
+    {"CRC-8/TECH-3250",          models + 35},   /* 159 */
+    {"CRC-8/WCDMA",              models + 88},   /* 160 */
+    {"CRC-82/DARC",              models + 17},   /* 161 */
+    {"CRC-A",                    models + 24},   /* 162 */
+    {"CRC-B",                    models + 28},   /* 163 */
+    {"CRC-CCITT",                models + 20},   /* 164 */
+    {"CRC-IBM",                  models + 69},   /* 165 */
+    {"DOW-CRC",                  models + 44},   /* 166 */
+    {"JAMCRC",                   models +  7},   /* 167 */
+    {"KERMIT",                   models + 20},   /* 168 */
+    {"MODBUS",                   models + 73},   /* 169 */
+    {"PKZIP",                    models +  8},   /* 170 */
+    {"R-CRC-16",                 models + 10},   /* 171 */
+    {"X-25",                     models + 28},   /* 172 */
+    {"X-CRC-12",                 models + 77},   /* 173 */
+    {"X-CRC-16",                 models +  9},   /* 174 */
+    {"XFER",                     models +  1},   /* 175 */
+    {"XMODEM",                   models + 18},   /* 176 */
+    {"ZMODEM",                   models + 18},   /* 177 */
+    {NULL,                       NULL},          /* terminating entry */
 };
 #    define NALIASES 178
 
diff --git a/client/scripting.c b/client/scripting.c
index e9ebe1dea..a26db0c19 100644
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -69,12 +69,12 @@ static int l_GetFromBigBuf(lua_State *L) {
         startindex = luaL_checknumber(L, 1);
         len = luaL_checknumber(L, 2);
     }
-    
-    if ( len == 0 ) {
+
+    if (len == 0) {
         //signal error by returning Nil, errorstring
         lua_pushnil(L);
         lua_pushstring(L, "You need to supply number of bytes larger than zero");
-        return 2; // two return values        
+        return 2; // two return values
     }
 
     uint8_t *data = calloc(len, sizeof(uint8_t));
@@ -125,13 +125,13 @@ static int l_GetFromFlashMem(lua_State *L) {
         startindex = luaL_checknumber(L, 1);
         len = luaL_checknumber(L, 2);
     }
-    
-    if ( len == 0 ) {
+
+    if (len == 0) {
         //signal error by returning Nil, errorstring
         lua_pushnil(L);
         lua_pushstring(L, "You need to supply number of bytes larger than zero");
-        return 2; // two return values        
-    }    
+        return 2; // two return values
+    }
 
     uint8_t *data = calloc(len, sizeof(uint8_t));
     if (!data) {
diff --git a/client/util.c b/client/util.c
index 386e56e1e..8be1aa896 100644
--- a/client/util.c
+++ b/client/util.c
@@ -256,12 +256,12 @@ char *sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t brea
             sprintf(tmp++, ".");
         else
             sprintf(tmp++, "%u", data[in_index]);
-        
+
         // check if a line break is needed and we have room to print it in our array
         if ((breaks > 0) && !((in_index + 1) % breaks) && (out_index + 1 != rowlen)) {
             sprintf(tmp++, "%s", "\n");
         }
-        
+
         in_index++;
     }
 
diff --git a/common/lfdemod.c b/common/lfdemod.c
index 02b1e5efe..0d33091a6 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -489,21 +489,21 @@ int DetectStrongAskClock(uint8_t *dest, size_t size, int high, int low, int *clo
 
     if (i == size)
         return -1;
-    
+
     // clock, numoftimes, first idx
     uint16_t tmpclk[10][3] = {
-        {8,   0, 0}, 
-        {16,  0, 0}, 
-        {32,  0, 0}, 
-        {40,  0, 0}, 
-        {50,  0, 0}, 
-        {64,  0, 0}, 
-        {100, 0, 0}, 
+        {8,   0, 0},
+        {16,  0, 0},
+        {32,  0, 0},
+        {40,  0, 0},
+        {50,  0, 0},
+        {64,  0, 0},
+        {100, 0, 0},
         {128, 0, 0},
-        {256, 0, 0}, 
+        {256, 0, 0},
         {384, 0, 0},
-      };
-    
+    };
+
     // loop through all samples (well, we don't want to go out-of-bounds)
     while (i < size - 512) {
         // measure from low to low
@@ -517,14 +517,14 @@ int DetectStrongAskClock(uint8_t *dest, size_t size, int high, int low, int *clo
             minClk = i - startwave;
             shortestWaveIdx = startwave;
         }
-        
+
         int foo = getClosestClock(minClk);
-        if (foo > 0 ) {
+        if (foo > 0) {
             for (uint8_t i = 0; i < 10; i++) {
-                if ( tmpclk[i][0] == foo ) {
+                if (tmpclk[i][0] == foo) {
                     tmpclk[i][1]++;
-                    
-                    if ( tmpclk[i][2] == 0) {
+
+                    if (tmpclk[i][2] == 0) {
                         tmpclk[i][2] = shortestWaveIdx;
                     }
                     break;
@@ -538,17 +538,17 @@ int DetectStrongAskClock(uint8_t *dest, size_t size, int high, int low, int *clo
     for (uint8_t i = 0; i < 10; i++) {
         if (g_debugMode == 2) {
             prnt("DEBUG, ASK,  clocks %u | hits %u | idx %u"
-                    , tmpclk[i][0]
-                    , tmpclk[i][1]
-                    , tmpclk[i][2]
-                    );
+                 , tmpclk[i][0]
+                 , tmpclk[i][1]
+                 , tmpclk[i][2]
+                );
         }
-        if ( max < tmpclk[i][1] ) {
+        if (max < tmpclk[i][1]) {
             *clock = tmpclk[i][0];
             shortestWaveIdx = tmpclk[i][2];
             max = tmpclk[i][1];
         }
-    }    
+    }
 
     if (*clock == 0)
         return -1;
@@ -1517,10 +1517,10 @@ int askdemod_ext(uint8_t *bits, size_t *size, int *clk, int *invert, int maxErr,
         if (g_debugMode == 2) prnt("DEBUG (askdemod_ext) just noise detected - aborting");
         return -2;
     }
-    
+
     int start = DetectASKClock(bits, *size, clk, maxErr);
     if (*clk == 0 || start < 0) return -3;
-   
+
     if (*invert != 1) *invert = 0;
 
     // amplify signal data.
diff --git a/tools/mfkey/Makefile b/tools/mfkey/Makefile
index 149759cc9..7b6c0fd8a 100644
--- a/tools/mfkey/Makefile
+++ b/tools/mfkey/Makefile
@@ -5,7 +5,7 @@ CFLAGS += -std=c99 -D_ISOC99_SOURCE -I../../include -I../../common -I../../clien
 LDFLAGS +=
 
 OBJS = crypto1.o crapto1.o parity.o util_posix.o bucketsort.o
-EXES = mfkey32 mfkey32v2 mfkey64 
+EXES = mfkey32 mfkey32v2 mfkey64
 WINEXES = $(patsubst %, %.exe, $(EXES))
 
 all: $(OBJS) $(EXES)
diff --git a/tools/mfkey/mfkey32.c b/tools/mfkey/mfkey32.c
index 615373c83..d88c3c74d 100644
--- a/tools/mfkey/mfkey32.c
+++ b/tools/mfkey/mfkey32.c
@@ -4,7 +4,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "crapto1/crapto1.h"
-#include "util_posix.h"		
+#include "util_posix.h"
 
 int main(int argc, char *argv[]) {
     struct Crypto1State *s, *t;
diff --git a/tools/mfkey/mfkey32v2.c b/tools/mfkey/mfkey32v2.c
index 86e528783..f5256fb1c 100644
--- a/tools/mfkey/mfkey32v2.c
+++ b/tools/mfkey/mfkey32v2.c
@@ -4,7 +4,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "crapto1/crapto1.h"
-#include "util_posix.h"		
+#include "util_posix.h"
 
 int main(int argc, char *argv[]) {
     struct Crypto1State *s, *t;

From 9b9120b0f2c3963600b76047f292fde64e5267d4 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 28 Mar 2019 14:28:42 +0100
Subject: [PATCH 0938/1938] Move CRLF normalization from make style to git
 attributes

---
 .gitattributes | 6 ++++++
 Makefile       | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.gitattributes b/.gitattributes
index 73c989a7e..de1ad82c8 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,9 +1,15 @@
 # .gitattributes
+
 # prevent binary files from CRLF handling, diff and merge:
 fpga/fpga.bit -crlf -diff
 *.bin -crlf -diff
 *.z -crlf -diff
+
 # Force LF
 *.c text=auto eol=lf
+*.cpp text=auto eol=lf
 *.h text=auto eol=lf
 *.lua text=auto eol=lf
+*.py text=auto eol=lf
+*.pl text=auto eol=lf
+Makefile text=auto eol=lf
diff --git a/Makefile b/Makefile
index 327d1ab6d..2ad01ba5f 100644
--- a/Makefile
+++ b/Makefile
@@ -128,7 +128,7 @@ style:
 	@which astyle >/dev/null || ( echo "Please install 'astyle' package first" ; exit 1 )
 	# Remove spaces & tabs at EOL, add LF at EOF if needed on *.c, *.h, *.cpp. *.lua, *.py, *.pl, Makefile
 	find . \( -name "*.[ch]" -or -name "*.cpp" -or -name "*.lua" -or -name "*.py" -or -name "*.pl" -or -name "Makefile" \) \
-	    -exec perl -pi -e 's/[ \t\r]+$$//' {} \; \
+	    -exec perl -pi -e 's/[ \t]+$$//' {} \; \
 	    -exec sh -c "tail -c1 {} | xxd -p | tail -1 | grep -q -v 0a$$" \; \
 	    -exec sh -c "echo >> {}" \;
 	# Apply astyle on *.c, *.h, *.cpp

From 4bef91465340d3b1c226d4321f51ba05516097ba Mon Sep 17 00:00:00 2001
From: vratiskol <vincent.ratiskol@github.com>
Date: Thu, 28 Mar 2019 15:18:53 +0100
Subject: [PATCH 0939/1938] Mifare 10B UID

---
 armsrc/mifaresim.c | 54 +++++++++++++++++++++++++++++++---------------
 1 file changed, 37 insertions(+), 17 deletions(-)

diff --git a/armsrc/mifaresim.c b/armsrc/mifaresim.c
index 31cafb2d4..3ab0c2d8a 100644
--- a/armsrc/mifaresim.c
+++ b/armsrc/mifaresim.c
@@ -201,6 +201,7 @@ static void MifareSimInit(uint16_t flags, uint8_t *datain, tag_response_info_t *
         memcpy(&rUIDBCC2[1], datain + 3, 3);
         memcpy(rUIDBCC3,    datain + 6, 4);
         *uid_len = 10;
+        if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("MifareSimInit - FLAG_10B_UID_IN_DATA => Get UID from datain: %02X - Flag: %02X - UIDBCC1: %02X", FLAG_10B_UID_IN_DATA, flags, rUIDBCC1);
     }
 
     switch (*uid_len) {
@@ -230,7 +231,7 @@ static void MifareSimInit(uint16_t flags, uint8_t *datain, tag_response_info_t *
             *cuid = bytes_to_num(rUIDBCC1, 4);
             // BCC
             rUIDBCC1[4] = rUIDBCC1[0] ^ rUIDBCC1[1] ^ rUIDBCC1[2] ^ rUIDBCC1[3];
-            if (MF_DBGLEVEL >= 1)	{
+            if (MF_DBGLEVEL >= MF_DBG_ALL)	{
                 Dbprintf("4B UID: %02x%02x%02x%02x", rUIDBCC1[0], rUIDBCC1[1], rUIDBCC1[2], rUIDBCC1[3]);
             }
             break;
@@ -260,7 +261,7 @@ static void MifareSimInit(uint16_t flags, uint8_t *datain, tag_response_info_t *
             // BCC
             rUIDBCC1[4] = rUIDBCC1[0] ^ rUIDBCC1[1] ^ rUIDBCC1[2] ^ rUIDBCC1[3];
             rUIDBCC2[4] = rUIDBCC2[0] ^ rUIDBCC2[1] ^ rUIDBCC2[2] ^ rUIDBCC2[3];
-            if (MF_DBGLEVEL >= 1)	{
+            if (MF_DBGLEVEL >= MF_DBG_ALL)	{
                 Dbprintf("7B UID: %02x %02x %02x %02x %02x %02x %02x",
                          rUIDBCC1[1], rUIDBCC1[2], rUIDBCC1[3], rUIDBCC2[0], rUIDBCC2[1], rUIDBCC2[2], rUIDBCC2[3]);
             }
@@ -293,7 +294,7 @@ static void MifareSimInit(uint16_t flags, uint8_t *datain, tag_response_info_t *
             rUIDBCC2[4] = rUIDBCC2[0] ^ rUIDBCC2[1] ^ rUIDBCC2[2] ^ rUIDBCC2[3];
             rUIDBCC3[4] = rUIDBCC3[0] ^ rUIDBCC3[1] ^ rUIDBCC3[2] ^ rUIDBCC3[3];
 
-            if (MF_DBGLEVEL >= 1)	{
+            if (MF_DBGLEVEL >= MF_DBG_ALL)	{
                 Dbprintf("10B UID: %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x",
                          rUIDBCC1[1], rUIDBCC1[2], rUIDBCC1[3],
                          rUIDBCC2[1], rUIDBCC2[2], rUIDBCC2[3],
@@ -421,7 +422,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
 
     // Authenticate response - nonce
     uint32_t nonce = prng_successor(selTimer, 32) ;
-  
+
     if ((flags & FLAG_MF_MINI) == FLAG_MF_MINI) {
         MifareCardType = 0;
         Dbprintf("Mifare Mini");
@@ -493,7 +494,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
             crypto1_destroy(pcs);
             cardAUTHKEY = AUTHKEYNONE;
             nonce = prng_successor(selTimer, 32);
-            
+
             LED_B_OFF();
             LED_C_OFF();
             cardSTATE = MFEMUL_SELECT1;
@@ -642,21 +643,23 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                             }
                             cardSTATE = MFEMUL_WORK;
                             LED_B_ON();
-                            continue;
+                            break;
                         case 10:
                             // SAK => Need another select round
                             EmSendPrecompiledCmd(&responses[SAK1]);
                             cardSTATE = MFEMUL_SELECT3;
                             if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_SELECT2] cardSTATE = MFEMUL_SELECT3");
-                            break;
                         default:
                             break;
                     }
-                }
 
-                cardSTATE_TO_IDLE();
-                if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_SELECT2] cardSTATE = MFEMUL_IDLE");
-                break;
+                } else {
+                    // IDLE
+                    cardSTATE_TO_IDLE();
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_SELECT2] cardSTATE = MFEMUL_IDLE");
+                }
+                // Break Case MFEMUL_SELECT2
+                continue;
             }
 
 
@@ -703,9 +706,12 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                         Dbprintf("[MFEMUL_SELECT3] cardSTATE = MFEMUL_WORK");
                     }
                     continue;
+                } else {
+                    // IDLE
+                    cardSTATE_TO_IDLE();
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_SELECT3] cardSTATE = MFEMUL_IDLE");
                 }
-                cardSTATE_TO_IDLE();
-                if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_SELECT3] cardSTATE = MFEMUL_IDLE");
+                // Break Case MFEMUL_SELECT3
                 break;
             }
 
@@ -738,7 +744,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
 
                 if (!HasValidCRC(receivedCmd_dec, receivedCmd_len)) { // all commands must have a valid CRC
                     EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
-                    if (MF_DBGLEVEL >= 1) Dbprintf("[MFEMUL_WORK] All commands must have a valid CRC %02X (%d)", receivedCmd_dec, receivedCmd_len);
+                    if (MF_DBGLEVEL >= MF_DBG_ALL) Dbprintf("[MFEMUL_WORK] All commands must have a valid CRC %02X (%d)", receivedCmd_dec, receivedCmd_len);
                     break;
                 }
 
@@ -845,11 +851,25 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                                  response[14], response[15]);
                     }
 
+                    // Access permission managment:
+                    //
+                    // Sector Trailer:
+                    // - KEY A access
+                    // - KEY B access
+                    // - AC bits access
+                    //
+                    // Data block:
+                    // - Data access
+
+                    // If permission is not allowed, data is cleared (00) in emulator memeory.
+                    // ex: a0a1a2a3a4a561e789c1b0b1b2b3b4b5 => 00000000000061e789c1b0b1b2b3b4b5
+
+
+                    // Check if selected Block is a Sector Trailer
                     if (IsSectorTrailer(blockNo)) {
 
                         if (!IsAccessAllowed(blockNo, cardAUTHKEY, AC_KEYA_READ)) {
-                            memset(response, 0x00, 6); 	// keyA can never be read, Why ??? Need source ?
-                            // a0a1a2a3a4a561e789c1b0b1b2b3b4b5 => 00000000000061e789c1b0b1b2b3b4b5
+                            memset(response, 0x00, 6); 	// keyA can never be read
                             if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK - IsSectorTrailer] keyA can never be read - block %d (0x%02x)", blockNo, blockNo);
                         }
                         if (!IsAccessAllowed(blockNo, cardAUTHKEY, AC_KEYB_READ)) {
@@ -954,7 +974,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                 // case MFEMUL_WORK => CMD RATS
                 if (receivedCmd[0] == ISO14443A_CMD_RATS) {
                     EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
-                    if (MF_DBGLEVEL >= 1)	Dbprintf("[MFEMUL_WORK] RCV RATS => NACK");
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("[MFEMUL_WORK] RCV RATS => NACK");
                     break;
                 }
 

From 9cec581f1c435dae07179ae723a5308c74fde65b Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 29 Mar 2019 09:49:42 +0100
Subject: [PATCH 0940/1938] Makefile: remove WINBINS/WINEXES, ProxSpace doesn't
 use them

---
 client/Makefile      | 3 +--
 tools/mfkey/Makefile | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/client/Makefile b/client/Makefile
index 705e8db47..bcd443219 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -282,8 +282,7 @@ ifeq "$(SUPPORTS_AVX512)" "True"
 endif
 
 BINS = proxmark3 flasher fpga_compress
-WINBINS = $(patsubst %, %.exe, $(BINS))
-CLEAN = $(BINS) $(WINBINS) $(COREOBJS) $(CMDOBJS) $(OBJCOBJS) $(ZLIBOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(OBJDIR)/*.o *.moc.cpp ui/ui_overlays.h lualibs/usb_cmd.lua lualibs/mf_default_keys.lua
+CLEAN = $(BINS) $(COREOBJS) $(CMDOBJS) $(OBJCOBJS) $(ZLIBOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(OBJDIR)/*.o *.moc.cpp ui/ui_overlays.h lualibs/usb_cmd.lua lualibs/mf_default_keys.lua
 
 # need to assign dependancies to build these first...
 all: lua_build jansson_build mbedtls_build cbor_build $(BINS)
diff --git a/tools/mfkey/Makefile b/tools/mfkey/Makefile
index 7b6c0fd8a..ed245d02d 100644
--- a/tools/mfkey/Makefile
+++ b/tools/mfkey/Makefile
@@ -6,7 +6,6 @@ LDFLAGS +=
 
 OBJS = crypto1.o crapto1.o parity.o util_posix.o bucketsort.o
 EXES = mfkey32 mfkey32v2 mfkey64
-WINEXES = $(patsubst %, %.exe, $(EXES))
 
 all: $(OBJS) $(EXES)
 
@@ -17,4 +16,4 @@ all: $(OBJS) $(EXES)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $<
 
 clean:
-	rm -f $(OBJS) $(EXES) $(WINEXES)
+	rm -f $(OBJS) $(EXES)

From 032062cfe9e3667e173331257892493da00cfbd3 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 30 Mar 2019 23:01:22 +0100
Subject: [PATCH 0941/1938] Indala 64 on T55x7: use PSK1

---
 armsrc/lfops.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index a40e5e977..221974613 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -1731,13 +1731,13 @@ void CopyIOtoT55x7(uint32_t hi, uint32_t lo) {
 // Clone Indala 64-bit tag by UID to T55x7
 void CopyIndala64toT55x7(uint32_t hi, uint32_t lo) {
     //Program the 2 data blocks for supplied 64bit UID
-    // and the Config for Indala 64 format (RF/32;PSK2 with RF/2;Maxblock=2)
-    uint32_t data[] = { T55x7_BITRATE_RF_32 | T55x7_MODULATION_PSK2 | (2 << T55x7_MAXBLOCK_SHIFT), hi, lo};
+    // and the Config for Indala 64 format (RF/32;PSK1 with RF/2;Maxblock=2)
+    uint32_t data[] = { T55x7_BITRATE_RF_32 | T55x7_MODULATION_PSK1 | (2 << T55x7_MAXBLOCK_SHIFT), hi, lo};
     //TODO add selection of chip for Q5 or T55x7
-    // data[0] = T5555_SET_BITRATE(32 | T5555_MODULATION_PSK2 | 2 << T5555_MAXBLOCK_SHIFT;
+    // data[0] = T5555_SET_BITRATE(32 | T5555_MODULATION_PSK1 | 2 << T5555_MAXBLOCK_SHIFT;
 
     WriteT55xx(data, 0, 3);
-    //Alternative config for Indala (Extended mode;RF/32;PSK2 with RF/2;Maxblock=2;Inverse data)
+    //Alternative config for Indala (Extended mode;RF/32;PSK1 with RF/2;Maxblock=2;Inverse data)
     // T5567WriteBlock(0x603E1042,0);
 }
 // Clone Indala 224-bit tag by UID to T55x7
@@ -1750,7 +1750,7 @@ void CopyIndala224toT55x7(uint32_t uid1, uint32_t uid2, uint32_t uid3, uint32_t
     //TODO add selection of chip for Q5 or T55x7
     // data[0] =  T5555_SET_BITRATE(32 | T5555_MODULATION_PSK2 | 7 << T5555_MAXBLOCK_SHIFT;
     WriteT55xx(data, 0, 8);
-    //Alternative config for Indala (Extended mode;RF/32;PSK2 with RF/2;Maxblock=7;Inverse data)
+    //Alternative config for Indala (Extended mode;RF/32;PSK1 with RF/2;Maxblock=7;Inverse data)
     // T5567WriteBlock(0x603E10E2,0);
 }
 // clone viking tag to T55xx

From 720c4102789c77cb9784ab00367dcd513dd0708c Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 31 Mar 2019 01:13:59 +0100
Subject: [PATCH 0942/1938] Fix lf t55xx trace: read the correct block

---
 client/cmdlft55xx.c | 6 +++---
 client/cmdlft55xx.h | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index c1573285c..10fd1b7be 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1079,7 +1079,7 @@ int CmdT55xxReadTrace(const char *Cmd) {
         // sanity check.
         if (!SanityOfflineCheck(false)) return 1;
 
-        if (!AquireData(T55x7_PAGE1, REGULAR_READ_MODE_BLOCK, pwdmode, password))
+        if (!AquireData(T55x7_PAGE1, T55x7_TRACE_BLOCK1, pwdmode, password))
             return 1;
     }
 
@@ -1914,7 +1914,7 @@ bool tryDetectP1(bool getData) {
     bool st = true;
 
     if (getData) {
-        if (!AquireData(T55x7_PAGE1, 1, false, 0))
+        if (!AquireData(T55x7_PAGE1, T55x7_TRACE_BLOCK1, false, 0))
             return false;
     }
 
@@ -2043,7 +2043,7 @@ int CmdT55xxDetectPage1(const char *Cmd) {
     if (errors) return usage_t55xx_detectP1();
 
     if (!useGB) {
-        if (!AquireData(T55x7_PAGE1, 1, usepwd, password))
+        if (!AquireData(T55x7_PAGE1, T55x7_TRACE_BLOCK1, usepwd, password))
             return false;
     }
     bool success = tryDetectP1(false);
diff --git a/client/cmdlft55xx.h b/client/cmdlft55xx.h
index 1c1d77490..29cdce4fb 100644
--- a/client/cmdlft55xx.h
+++ b/client/cmdlft55xx.h
@@ -29,6 +29,8 @@
 
 
 #define T55x7_CONFIGURATION_BLOCK 0x00
+#define T55x7_TRACE_BLOCK1 0x01
+#define T55x7_TRACE_BLOCK2 0x02
 #define T55x7_PAGE0 0x00
 #define T55x7_PAGE1 0x01
 #define T55x7_PWD 0x00000010

From 4b00dd105318f626bc50cdc766491a33d9b18940 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 31 Mar 2019 01:14:20 +0100
Subject: [PATCH 0943/1938] lf write: leds

---
 armsrc/lfops.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index 221974613..8cd9c68e9 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -1735,10 +1735,11 @@ void CopyIndala64toT55x7(uint32_t hi, uint32_t lo) {
     uint32_t data[] = { T55x7_BITRATE_RF_32 | T55x7_MODULATION_PSK1 | (2 << T55x7_MAXBLOCK_SHIFT), hi, lo};
     //TODO add selection of chip for Q5 or T55x7
     // data[0] = T5555_SET_BITRATE(32 | T5555_MODULATION_PSK1 | 2 << T5555_MAXBLOCK_SHIFT;
-
+    LED_D_ON();
     WriteT55xx(data, 0, 3);
     //Alternative config for Indala (Extended mode;RF/32;PSK1 with RF/2;Maxblock=2;Inverse data)
     // T5567WriteBlock(0x603E1042,0);
+    LED_D_OFF();
 }
 // Clone Indala 224-bit tag by UID to T55x7
 void CopyIndala224toT55x7(uint32_t uid1, uint32_t uid2, uint32_t uid3, uint32_t uid4, uint32_t uid5, uint32_t uid6, uint32_t uid7) {
@@ -1749,9 +1750,11 @@ void CopyIndala224toT55x7(uint32_t uid1, uint32_t uid2, uint32_t uid3, uint32_t
     data[0] = T55x7_BITRATE_RF_32 | T55x7_MODULATION_PSK2 | (7 << T55x7_MAXBLOCK_SHIFT);
     //TODO add selection of chip for Q5 or T55x7
     // data[0] =  T5555_SET_BITRATE(32 | T5555_MODULATION_PSK2 | 7 << T5555_MAXBLOCK_SHIFT;
+    LED_D_ON();
     WriteT55xx(data, 0, 8);
     //Alternative config for Indala (Extended mode;RF/32;PSK1 with RF/2;Maxblock=7;Inverse data)
     // T5567WriteBlock(0x603E10E2,0);
+    LED_D_OFF();
 }
 // clone viking tag to T55xx
 void CopyVikingtoT55xx(uint32_t block1, uint32_t block2, uint8_t Q5) {

From 2080dd396db6c8a955f60bd45baecd3536cb8d5d Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 31 Mar 2019 01:18:00 +0100
Subject: [PATCH 0944/1938] t55xx detection: remove Atmel as it can be others,
 see t55xx trace for real manufacturer

---
 client/cmdlf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdlf.c b/client/cmdlf.c
index 049edb824..263e73749 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -839,7 +839,7 @@ bool CheckChipType(bool getDeviceData) {
 
     //check for t55xx chip...
     if (tryDetectP1(true)) {
-        PrintAndLogEx(SUCCESS, "\nChipset detection : " _GREEN_("Atmel T55xx") " found");
+        PrintAndLogEx(SUCCESS, "\nChipset detection : " _GREEN_("T55xx") " found");
         PrintAndLogEx(SUCCESS, "Try " _YELLOW_("`lf t55xx`")" commands");
         retval = true;
         goto out;

From 21b063da930d0dc6b89384ba8a4ad63b92ffbe4f Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 31 Mar 2019 03:02:09 +0200
Subject: [PATCH 0945/1938] t55xx readblock: don't delay acquisition too much
 else we're sometimes off by one (observed when reading P1B1 on several cards)

---
 armsrc/lfops.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index 8cd9c68e9..1e6f22863 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -1529,7 +1529,7 @@ void T55xxReadBlock(uint16_t arg0, uint8_t Block, uint32_t Pwd) {
     // Turn field on to read the response
     // 137*8 seems to get to the start of data pretty well...
     // but we want to go past the start and let the repeating data settle in...
-    TurnReadLFOn(200 * 8);
+    TurnReadLFOn(150 * 8);
 
     // Acquisition
     // Now do the acquisition

From 43ca641939604d3d6e75b0de451eaa65c9aa31b2 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 31 Mar 2019 12:15:49 +0200
Subject: [PATCH 0946/1938] Flasher: Avoid race condition when flasher finds
 the not yet closed pm3 port

---
 client/flash.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/flash.c b/client/flash.c
index c60dfcbf1..7a8b86d20 100644
--- a/client/flash.c
+++ b/client/flash.c
@@ -318,6 +318,8 @@ static int enter_bootloader(char *serial_port_name) {
         }
         msleep(100);
         CloseProxmark();
+        // Let time to OS to make the port disappear
+        msleep(1000);
 
         bool opened = OpenProxmark(serial_port_name, true, 60, true);
         if (opened) {

From e88fa75fd041e19ade15a960cd115bd9f9e67175 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 31 Mar 2019 19:06:36 +0200
Subject: [PATCH 0947/1938] Revamped t55xx info: support offline block0, Q5,
 fix extended, add warns etc

---
 client/cmdlft55xx.c | 247 ++++++++++++++++++++++++++++++++------------
 client/cmdlft55xx.h |   2 +
 2 files changed, 182 insertions(+), 67 deletions(-)

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 10fd1b7be..6cd4d95d2 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -81,13 +81,19 @@ int usage_t55xx_trace() {
     return 0;
 }
 int usage_t55xx_info() {
-    PrintAndLogEx(NORMAL, "Usage:  lf t55xx info [1]");
+    PrintAndLogEx(NORMAL, "Usage:  lf t55xx info [1] [d <data> [q]]");
     PrintAndLogEx(NORMAL, "Options:");
-    PrintAndLogEx(NORMAL, "     1            - if set, use Graphbuffer otherwise read data from tag.");
+    PrintAndLogEx(NORMAL, "     (default)    - read data from tag.");
+    PrintAndLogEx(NORMAL, "     1            - if set, use Graphbuffer instead of reading tag.");
+    PrintAndLogEx(NORMAL, "     d <data>     - 4 bytes of data (8 hex characters)");
+    PrintAndLogEx(NORMAL, "                    if set, use these data instead of reading tag.");
+    PrintAndLogEx(NORMAL, "     q            - if set, provided data are interpreted as Q5 config.");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "      lf t55xx info");
     PrintAndLogEx(NORMAL, "      lf t55xx info 1");
+    PrintAndLogEx(NORMAL, "      lf t55xx info d 00083040");
+    PrintAndLogEx(NORMAL, "      lf t55xx info d 6001805A q");
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
@@ -1251,7 +1257,6 @@ void printT5555Trace(t5555_tracedata_t data, uint8_t repeat) {
     */
 }
 
-//need to add Q5 info...
 int CmdT55xxInfo(const char *Cmd) {
     /*
         Page 0 Block 0 Configuration data.
@@ -1259,81 +1264,130 @@ int CmdT55xxInfo(const char *Cmd) {
         Extended mode
     */
     bool pwdmode = false;
+    bool frombuff = false;
+    bool gotdata = false;
+    bool dataasq5 = false;
     uint32_t password = 0;
-    char cmdp = tolower(param_getchar(Cmd, 0));
+    uint32_t block0 = 0;
+    uint8_t cmdp = 0;
 
-    if (strlen(Cmd) > 1 || cmdp == 'h') return usage_t55xx_info();
+    while (param_getchar(Cmd, cmdp) != 0x00) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+            case 'h':
+                return usage_t55xx_info();
+            case 'd':
+                block0 = param_get32ex(Cmd, cmdp + 1, 0, 16);
+                gotdata = true;
+                cmdp += 2;
+                break;
+            case '1':
+                frombuff = true;
+                cmdp += 2;
+                break;
+            case 'q':
+                dataasq5 = true;
+                cmdp += 2;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                return usage_t55xx_info();
+        }
+    }
 
-    if (strlen(Cmd) == 0) {
+    if (gotdata && frombuff)
+        return usage_t55xx_info();
+
+    if (dataasq5 && !gotdata)
+        return usage_t55xx_info();
+
+    if (!frombuff && !gotdata) {
         // sanity check.
         if (!SanityOfflineCheck(false)) return 1;
 
         if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, pwdmode, password))
             return 1;
     }
+    if (!gotdata) {
+        if (!DecodeT55xxBlock()) return 1;
 
-    if (!DecodeT55xxBlock()) return 1;
+        // too little space to start with
+        if (DemodBufferLen < 32 + config.offset) return 1;
 
-    // too little space to start with
-    if (DemodBufferLen < 32) return 1;
-
-    //
-    //PrintAndLogEx(NORMAL, "Offset+32 ==%d\n DemodLen == %d", config.offset + 32, DemodBufferLen);
-
-    uint8_t si = config.offset;
-    uint32_t block0   = PackBits(si, 32, DemodBuffer);
-    uint32_t safer    = PackBits(si, 4, DemodBuffer);
-    si += 4;
-    uint32_t resv     = PackBits(si, 7, DemodBuffer);
-    si += 7;
-    uint32_t dbr      = PackBits(si, 3, DemodBuffer);
-    si += 3;
-    uint32_t extend   = PackBits(si, 1, DemodBuffer);
-    si += 1;
-    uint32_t datamod  = PackBits(si, 5, DemodBuffer);
-    si += 5;
-    uint32_t pskcf    = PackBits(si, 2, DemodBuffer);
-    si += 2;
-    uint32_t aor      = PackBits(si, 1, DemodBuffer);
-    si += 1;
-    uint32_t otp      = PackBits(si, 1, DemodBuffer);
-    si += 1;
-    uint32_t maxblk   = PackBits(si, 3, DemodBuffer);
-    si += 3;
-    uint32_t pwd      = PackBits(si, 1, DemodBuffer);
-    si += 1;
-    uint32_t sst      = PackBits(si, 1, DemodBuffer);
-    si += 1;
-    uint32_t fw       = PackBits(si, 1, DemodBuffer);
-    si += 1;
-    uint32_t inv      = PackBits(si, 1, DemodBuffer);
-    si += 1;
-    uint32_t por      = PackBits(si, 1, DemodBuffer);
-    si += 1;
-
-    if (config.Q5)
-        PrintAndLogEx(NORMAL, _RED_("* **Warning ***") " Config Info read off a Q5 will not display as expected");
+        //PrintAndLogEx(NORMAL, "Offset+32 ==%d\n DemodLen == %d", config.offset + 32, DemodBufferLen);
+        block0   = PackBits(config.offset, 32, DemodBuffer);
+    }
 
     PrintAndLogEx(NORMAL, "");
-    PrintAndLogEx(NORMAL, "-- T55x7 Configuration & Tag Information --------------------");
-    PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
-    PrintAndLogEx(NORMAL, " Safer key                 : %s", GetSaferStr(safer));
-    PrintAndLogEx(NORMAL, " reserved                  : %d", resv);
-    PrintAndLogEx(NORMAL, " Data bit rate             : %s", GetBitRateStr(dbr, extend));
-    PrintAndLogEx(NORMAL, " eXtended mode             : %s", (extend) ? _YELLOW_("Yes - Warning") : "No");
-    PrintAndLogEx(NORMAL, " Modulation                : %s", GetModulationStr(datamod));
-    PrintAndLogEx(NORMAL, " PSK clock frequency       : %d", pskcf);
-    PrintAndLogEx(NORMAL, " AOR - Answer on Request   : %s", (aor) ? _GREEN_("Yes") : "No");
-    PrintAndLogEx(NORMAL, " OTP - One Time Pad        : %s", (otp) ? _YELLOW_("Yes - Warning") : "No");
-    PrintAndLogEx(NORMAL, " Max block                 : %d", maxblk);
-    PrintAndLogEx(NORMAL, " Password mode             : %s", (pwd) ? _GREEN_("Yes") : "No");
-    PrintAndLogEx(NORMAL, " Sequence Start Terminator : %s", (sst) ? _GREEN_("Yes") : "No");
-    PrintAndLogEx(NORMAL, " Fast Write                : %s", (fw)  ? _GREEN_("Yes") : "No");
-    PrintAndLogEx(NORMAL, " Inverse data              : %s", (inv) ? _GREEN_("Yes") : "No");
-    PrintAndLogEx(NORMAL, " POR-Delay                 : %s", (por) ? _GREEN_("Yes") : "No");
+    if (config.Q5 || (gotdata && dataasq5)) {
+        uint32_t header   = (block0 >> (32 - 12)) & 0xFFF;
+        uint32_t ps       = (block0 >> (32 - 13)) & 0x01;
+        uint32_t fw       = (block0 >> (32 - 14)) & 0x01;
+        uint32_t dbr      = (block0 >> (32 - 20)) & 0x3F;
+        uint32_t aor      = (block0 >> (32 - 21)) & 0x01;
+        uint32_t pwd      = (block0 >> (32 - 22)) & 0x01;
+        uint32_t pskcf    = (block0 >> (32 - 24)) & 0x03;
+        uint32_t inv      = (block0 >> (32 - 25)) & 0x01;
+        uint32_t datamod  = (block0 >> (32 - 28)) & 0x07;
+        uint32_t maxblk   = (block0 >> (32 - 31)) & 0x07;
+        uint32_t st       = (block0 >> (32 - 32)) & 0x01;
+        PrintAndLogEx(NORMAL, "-- Q5 Configuration & Tag Information -----------------------");
+        PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
+        PrintAndLogEx(NORMAL, " Header                    : 0x%03X%s", header, (header != 0x600) ? _RED_(" - Warning") : "");
+        PrintAndLogEx(NORMAL, " Page select               : %d", ps);
+        PrintAndLogEx(NORMAL, " Fast Write                : %s", (fw)  ? _GREEN_("Yes") : "No");
+        PrintAndLogEx(NORMAL, " Data bit rate             : %s", GetBitRateStr(dbr, 1));
+        PrintAndLogEx(NORMAL, " AOR - Answer on Request   : %s", (aor) ? _GREEN_("Yes") : "No");
+        PrintAndLogEx(NORMAL, " Password mode             : %s", (pwd) ? _GREEN_("Yes") : "No");
+        PrintAndLogEx(NORMAL, " PSK clock frequency       : %s", GetPskCfStr(pskcf, 1));
+        PrintAndLogEx(NORMAL, " Inverse data              : %s", (inv) ? _GREEN_("Yes") : "No");
+        PrintAndLogEx(NORMAL, " Modulation                : %s", GetQ5ModulationStr(datamod));
+        PrintAndLogEx(NORMAL, " Max block                 : %d", maxblk);
+        PrintAndLogEx(NORMAL, " Sequence Terminator       : %s", (st) ? _GREEN_("Yes") : "No");
+    } else {
+        uint32_t safer    = (block0 >> (32 -  4)) & 0x0F;
+        uint32_t extend   = (block0 >> (32 - 15)) & 0x01;
+        uint32_t resv, dbr;
+        if (extend) {
+            resv     = (block0 >> (32 -  8)) & 0x0F;
+            dbr      = (block0 >> (32 - 14)) & 0x3F;
+        } else {
+            resv     = (block0 >> (32 - 11)) & 0x7F;
+            dbr      = (block0 >> (32 - 14)) & 0x07;
+        }
+        uint32_t datamod  = (block0 >> (32 - 20)) & 0x1F;
+        uint32_t pskcf    = (block0 >> (32 - 22)) & 0x03;
+        uint32_t aor      = (block0 >> (32 - 23)) & 0x01;
+        uint32_t otp      = (block0 >> (32 - 24)) & 0x01;
+        uint32_t maxblk   = (block0 >> (32 - 27)) & 0x07;
+        uint32_t pwd      = (block0 >> (32 - 28)) & 0x01;
+        uint32_t sst      = (block0 >> (32 - 29)) & 0x01;
+        uint32_t fw       = (block0 >> (32 - 30)) & 0x01;
+        uint32_t inv      = (block0 >> (32 - 31)) & 0x01;
+        uint32_t por      = (block0 >> (32 - 32)) & 0x01;
+
+        PrintAndLogEx(NORMAL, "-- T55x7 Configuration & Tag Information --------------------");
+        PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
+        PrintAndLogEx(NORMAL, " Safer key                 : %s", GetSaferStr(safer));
+        PrintAndLogEx(NORMAL, " reserved                  : %d", resv);
+        PrintAndLogEx(NORMAL, " Data bit rate             : %s", GetBitRateStr(dbr, extend));
+        PrintAndLogEx(NORMAL, " eXtended mode             : %s", (extend) ? _YELLOW_("Yes - Warning") : "No");
+        PrintAndLogEx(NORMAL, " Modulation                : %s", GetModulationStr(datamod));
+        PrintAndLogEx(NORMAL, " PSK clock frequency       : %s", GetPskCfStr(pskcf, 0));
+        PrintAndLogEx(NORMAL, " AOR - Answer on Request   : %s", (aor) ? _GREEN_("Yes") : "No");
+        PrintAndLogEx(NORMAL, " OTP - One Time Pad        : %s", (otp) ? ((extend) ? _YELLOW_("Yes - Warning") : _RED_("Yes - Warning")) : "No");
+        PrintAndLogEx(NORMAL, " Max block                 : %d", maxblk);
+        PrintAndLogEx(NORMAL, " Password mode             : %s", (pwd) ? _GREEN_("Yes") : "No");
+        PrintAndLogEx(NORMAL, " Sequence %-12s     : %s", (extend) ? "Start Marker" : "Terminator", (sst) ? _GREEN_("Yes") : "No");
+        PrintAndLogEx(NORMAL, " Fast Write                : %s", (fw)  ? ((extend) ? _GREEN_("Yes") : _RED_("Yes - Warning")) : "No");
+        PrintAndLogEx(NORMAL, " Inverse data              : %s", (inv) ? ((extend) ? _GREEN_("Yes") : _RED_("Yes - Warning")) : "No");
+        PrintAndLogEx(NORMAL, " POR-Delay                 : %s", (por) ? _GREEN_("Yes") : "No");
+    }
     PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
     PrintAndLogEx(NORMAL, " Raw Data - Page 0");
-    PrintAndLogEx(NORMAL, "     Block 0  : 0x%08X  %s", block0, sprint_bin(DemodBuffer + config.offset, 32));
+    if (gotdata)
+        PrintAndLogEx(NORMAL, "     Block 0  : 0x%08X", block0);
+    else
+        PrintAndLogEx(NORMAL, "     Block 0  : 0x%08X  %s", block0, sprint_bin(DemodBuffer + config.offset, 32));
     PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
     return 0;
 }
@@ -1383,6 +1437,32 @@ bool AquireData(uint8_t page, uint8_t block, bool pwdmode, uint32_t password) {
     return !getSignalProperties()->isnoise;
 }
 
+char *GetPskCfStr(uint32_t id, bool q5) {
+    static char buf[25];
+    char *retStr = buf;
+    switch (id) {
+        case 0:
+            snprintf(retStr, sizeof(buf), "%u - RF/2", id);
+            break;
+        case 1:
+            snprintf(retStr, sizeof(buf), "%u - RF/4", id);
+            break;
+        case 2:
+            snprintf(retStr, sizeof(buf), "%u - RF/8", id);
+            break;
+        case 3:
+            if (q5)
+                snprintf(retStr, sizeof(buf), "%u - RF/8", id);
+            else
+                snprintf(retStr, sizeof(buf), "%u - " _RED_("(Unknown)"), id);
+            break;
+        default:
+            snprintf(retStr, sizeof(buf), "%u - " _RED_("(Unknown)"), id);
+            break;
+    }
+    return buf;
+}
+
 char *GetBitRateStr(uint32_t id, bool xmode) {
     static char buf[25];
 
@@ -1416,7 +1496,7 @@ char *GetBitRateStr(uint32_t id, bool xmode) {
                 snprintf(retStr, sizeof(buf), "%u - RF/128", id);
                 break;
             default:
-                snprintf(retStr, sizeof(buf), "%u - (Unknown)", id);
+                snprintf(retStr, sizeof(buf), "%u - " _RED_("(Unknown)"), id);
                 break;
         }
     }
@@ -1477,10 +1557,43 @@ char *GetModulationStr(uint32_t id) {
             snprintf(retStr, sizeof(buf), "%u - Biphase a - AKA Conditional Dephase Encoding(CDP)", id);
             break;
         case 17:
-            snprintf(retStr, sizeof(buf), "%u - Reserved", id);
+            snprintf(retStr, sizeof(buf), "%u - " _YELLOW_("Reserved"), id);
             break;
         default:
-            snprintf(retStr, sizeof(buf), "0x%02X (Unknown)", id);
+            snprintf(retStr, sizeof(buf), "0x%02X " _RED_("(Unknown)"), id);
+            break;
+    }
+    return buf;
+}
+
+char *GetQ5ModulationStr(uint32_t id) {
+    static char buf[60];
+    char *retStr = buf;
+
+    switch (id) {
+        case 0:
+            snprintf(retStr, sizeof(buf), "%u - Manchester", id);
+            break;
+        case 1:
+            snprintf(retStr, sizeof(buf), "%u - PSK 1 phase change when input changes", id);
+            break;
+        case 2:
+            snprintf(retStr, sizeof(buf), "%u - PSK 2 phase change on bitclk if input high", id);
+            break;
+        case 3:
+            snprintf(retStr, sizeof(buf), "%u - PSK 3 phase change on rising edge of input", id);
+            break;
+        case 4:
+            snprintf(retStr, sizeof(buf), "%u - FSK 1a RF/5  RF/8", id);
+            break;
+        case 5:
+            snprintf(retStr, sizeof(buf), "%u - FSK 2a RF/10  RF/8", id);
+            break;
+        case 6:
+            snprintf(retStr, sizeof(buf), "%u - Biphase", id);
+            break;
+        case 7:
+            snprintf(retStr, sizeof(buf), "%u - NRZ / Direct", id);
             break;
     }
     return buf;
@@ -1539,7 +1652,7 @@ char *GetSelectedModulationStr(uint8_t id) {
             snprintf(retStr, sizeof(buf), "BIPHASEa - (CDP)");
             break;
         default:
-            snprintf(retStr, sizeof(buf), "(Unknown)");
+            snprintf(retStr, sizeof(buf), _RED_("(Unknown)"));
             break;
     }
     return buf;
diff --git a/client/cmdlft55xx.h b/client/cmdlft55xx.h
index 29cdce4fb..97dc60c75 100644
--- a/client/cmdlft55xx.h
+++ b/client/cmdlft55xx.h
@@ -149,8 +149,10 @@ extern int CmdT55xxDetect(const char *Cmd);
 extern int CmdResetRead(const char *Cmd);
 extern int CmdT55xxWipe(const char *Cmd);
 
+char *GetPskCfStr(uint32_t id, bool q5);
 char *GetBitRateStr(uint32_t id, bool xmode);
 char *GetSaferStr(uint32_t id);
+char *GetQ5ModulationStr(uint32_t id);
 char *GetModulationStr(uint32_t id);
 char *GetModelStrFromCID(uint32_t cid);
 char *GetSelectedModulationStr(uint8_t id);

From 045eda93e9112a7db181e355a3fa913c303c456d Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 31 Mar 2019 19:42:36 +0200
Subject: [PATCH 0948/1938] t55xx config: allow to toggle on/off i/q5/st

---
 client/cmdlft55xx.c | 35 +++++++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 6cd4d95d2..822448894 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -19,15 +19,15 @@ void Set_t55xx_Config(t55xx_conf_block_t conf) {
 }
 
 int usage_t55xx_config() {
-    PrintAndLogEx(NORMAL, "Usage: lf t55xx config [d <demodulation>] [i 1] [o <offset>] [Q5]");
+    PrintAndLogEx(NORMAL, "Usage: lf t55xx config [d <demodulation>] [i [0/1]] [o <offset>] [Q5 [0/1]] [ST [0/1]]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       h                                - This help");
     PrintAndLogEx(NORMAL, "       b <8|16|32|40|50|64|100|128>     - Set bitrate");
     PrintAndLogEx(NORMAL, "       d <FSK|FSK1|FSK1a|FSK2|FSK2a|ASK|PSK1|PSK2|NRZ|BI|BIa>  - Set demodulation FSK / ASK / PSK / NRZ / Biphase / Biphase A");
-    PrintAndLogEx(NORMAL, "       i [1]                            - Invert data signal, defaults to normal");
+    PrintAndLogEx(NORMAL, "       i [0/1]                          - Set/reset data signal inversion");
     PrintAndLogEx(NORMAL, "       o [offset]                       - Set offset, where data should start decode in bitstream");
-    PrintAndLogEx(NORMAL, "       Q5                               - Set as Q5(T5555) chip instead of T55x7");
-    PrintAndLogEx(NORMAL, "       ST                               - Set Sequence Terminator on");
+    PrintAndLogEx(NORMAL, "       Q5 [0/1]                         - Set/reset as Q5(T5555) chip instead of T55x7");
+    PrintAndLogEx(NORMAL, "       ST [0/1]                         - Set/reset Sequence Terminator on");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "      lf t55xx config d FSK          - FSK demodulation");
@@ -306,8 +306,13 @@ int CmdT55xxSetConfig(const char *Cmd) {
                 }
                 break;
             case 'i':
-                config.inverted = param_getchar(Cmd, cmdp + 1) == '1';
-                cmdp += 2;
+                if ((param_getchar(Cmd, cmdp + 1) == '0') || (param_getchar(Cmd, cmdp + 1) == '1')) {
+                    config.inverted = param_getchar(Cmd, cmdp + 1) == '1';
+                    cmdp += 2;
+                } else {
+                    config.inverted = true;
+                    cmdp += 1;
+                }
                 break;
             case 'o':
                 errors |= param_getdec(Cmd, cmdp + 1, &offset);
@@ -316,12 +321,22 @@ int CmdT55xxSetConfig(const char *Cmd) {
                 cmdp += 2;
                 break;
             case 'q':
-                config.Q5 = true;
-                cmdp++;
+                if ((param_getchar(Cmd, cmdp + 1) == '0') || (param_getchar(Cmd, cmdp + 1) == '1')) {
+                    config.Q5 = param_getchar(Cmd, cmdp + 1) == '1';
+                    cmdp += 2;
+                } else {
+                    config.Q5 = true;
+                    cmdp += 1;
+                }
                 break;
             case 's':
-                config.ST = true;
-                cmdp++;
+                if ((param_getchar(Cmd, cmdp + 1) == '0') || (param_getchar(Cmd, cmdp + 1) == '1')) {
+                    config.ST = param_getchar(Cmd, cmdp + 1) == '1';
+                    cmdp += 2;
+                } else {
+                    config.ST = true;
+                    cmdp += 1;
+                }
                 break;
             default:
                 PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));

From d4485495242519fc3f6fbe07872aba4da32c531f Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 31 Mar 2019 21:30:30 +0200
Subject: [PATCH 0949/1938] t55xx info: tag out of spec FSKa modulations in
 standard mode

---
 client/cmdlft55xx.c | 15 ++++++---------
 client/cmdlft55xx.h |  2 +-
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 822448894..db554b769 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1386,7 +1386,7 @@ int CmdT55xxInfo(const char *Cmd) {
         PrintAndLogEx(NORMAL, " reserved                  : %d", resv);
         PrintAndLogEx(NORMAL, " Data bit rate             : %s", GetBitRateStr(dbr, extend));
         PrintAndLogEx(NORMAL, " eXtended mode             : %s", (extend) ? _YELLOW_("Yes - Warning") : "No");
-        PrintAndLogEx(NORMAL, " Modulation                : %s", GetModulationStr(datamod));
+        PrintAndLogEx(NORMAL, " Modulation                : %s", GetModulationStr(datamod, extend));
         PrintAndLogEx(NORMAL, " PSK clock frequency       : %s", GetPskCfStr(pskcf, 0));
         PrintAndLogEx(NORMAL, " AOR - Answer on Request   : %s", (aor) ? _GREEN_("Yes") : "No");
         PrintAndLogEx(NORMAL, " OTP - One Time Pad        : %s", (otp) ? ((extend) ? _YELLOW_("Yes - Warning") : _RED_("Yes - Warning")) : "No");
@@ -1533,7 +1533,7 @@ char *GetSaferStr(uint32_t id) {
     return buf;
 }
 
-char *GetModulationStr(uint32_t id) {
+char *GetModulationStr(uint32_t id, bool xmode) {
     static char buf[60];
     char *retStr = buf;
 
@@ -1557,10 +1557,10 @@ char *GetModulationStr(uint32_t id) {
             snprintf(retStr, sizeof(buf), "%u - FSK 2 RF/8  RF/10", id);
             break;
         case 6:
-            snprintf(retStr, sizeof(buf), "%u - FSK 1a RF/5  RF/8", id);
+            snprintf(retStr, sizeof(buf), "%u - %s RF/5  RF/8", id, (xmode) ? "FSK 1a" : _YELLOW_("FSK 1a"));
             break;
         case 7:
-            snprintf(retStr, sizeof(buf), "%u - FSK 2a RF/10  RF/8", id);
+            snprintf(retStr, sizeof(buf), "%u - %s RF/10  RF/8", id, (xmode) ? "FSK 2a" : _YELLOW_("FSK 2a"));
             break;
         case 8:
             snprintf(retStr, sizeof(buf), "%u - Manchester", id);
@@ -1568,11 +1568,8 @@ char *GetModulationStr(uint32_t id) {
         case 16:
             snprintf(retStr, sizeof(buf), "%u - Biphase", id);
             break;
-        case 0x18:
-            snprintf(retStr, sizeof(buf), "%u - Biphase a - AKA Conditional Dephase Encoding(CDP)", id);
-            break;
-        case 17:
-            snprintf(retStr, sizeof(buf), "%u - " _YELLOW_("Reserved"), id);
+        case 24:
+            snprintf(retStr, sizeof(buf), "%u - %s", id, (xmode) ? "Biphase a - AKA Conditional Dephase Encoding(CDP)" : _YELLOW_("Reserved"));
             break;
         default:
             snprintf(retStr, sizeof(buf), "0x%02X " _RED_("(Unknown)"), id);
diff --git a/client/cmdlft55xx.h b/client/cmdlft55xx.h
index 97dc60c75..cd240e5f2 100644
--- a/client/cmdlft55xx.h
+++ b/client/cmdlft55xx.h
@@ -153,7 +153,7 @@ char *GetPskCfStr(uint32_t id, bool q5);
 char *GetBitRateStr(uint32_t id, bool xmode);
 char *GetSaferStr(uint32_t id);
 char *GetQ5ModulationStr(uint32_t id);
-char *GetModulationStr(uint32_t id);
+char *GetModulationStr(uint32_t id, bool xmode);
 char *GetModelStrFromCID(uint32_t cid);
 char *GetSelectedModulationStr(uint8_t id);
 uint32_t PackBits(uint8_t start, uint8_t len, uint8_t *bitstream);

From 7bd95dd5c3ba1a8f1c4f98629cf1ec5cfca0e215 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 2 Apr 2019 01:06:00 +0200
Subject: [PATCH 0950/1938] FPC experiments: got so far TX_only, usart=115200 +
 usb=460800, see full commit msg

* Add \r\n to sent strings
* remove usart_init() from UsbPacketReceive cmd, it's already init in main.
* Add PLATFORM PM3RDV4FPC to ease dev
* TX: US_TCR is len of data to send, not len of buffer
* Use only one PDC bank as we're using it in sync
* Busy loop to wait for end of TX as we'using it in sync
* Change usart speed to 115200
* Don't downgrade USB speed, keep 460800
* Attempt to detect received data, fail so far
---
 armsrc/appmain.c    | 29 +++++++++++++++--------------
 common/Makefile.hal |  6 ++++++
 common/usart.c      | 21 +++++++--------------
 common/usart.h      |  1 +
 uart/uart_posix.c   |  9 ---------
 5 files changed, 29 insertions(+), 37 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 9236df6ff..2ab2c4c0e 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1105,30 +1105,32 @@ void UsbPacketReceived(uint8_t *packet, int len) {
             */
 
 
-            char dest[USB_CMD_DATA_SIZE] = { '\0' };
-            static const char *welcome = "Proxmark3 Serial interface via FPC ready\n";
-            strncat(dest, welcome, sizeof(dest) - strlen(dest) - 1);
-            sprintf(dest + strlen(dest) - 1, "| bytes 0x%02x 0x%02x 0x%02x 0x%02x \n"
+            char dest[USB_CMD_DATA_SIZE]={'\0'};
+            sprintf(dest, usart_dataavailable() ? "DATA!\r\n" : "no data\r\n");
+            cmd_send(CMD_DEBUG_PRINT_STRING, strlen(dest), 0, 0, dest, strlen(dest));
+
+            static const char *welcome = "Proxmark3 Serial interface via FPC ready\r\n";
+            usart_writebuffer((uint8_t *)welcome, strlen(welcome));
+
+            sprintf(dest, "| bytes 0x%02x 0x%02x 0x%02x 0x%02x\r\n"
                     , c->d.asBytes[0]
                     , c->d.asBytes[1]
                     , c->d.asBytes[2]
                     , c->d.asBytes[3]
                    );
+            usart_writebuffer((uint8_t *)dest, strlen(dest));
 
-            UsbCommand txcmd = { CMD_DEBUG_PRINT_STRING, { strlen(dest), 0, 0 } };
-            memcpy(txcmd.d.asBytes, dest, sizeof(dest));
 
             LED_A_ON();
 
-            usart_init();
-            usart_writebuffer((uint8_t *)&txcmd, sizeof(UsbCommand));
 
             //usb
             cmd_send(CMD_DEBUG_PRINT_STRING, strlen(dest), 0, 0, dest, strlen(dest));
+
+            sprintf(dest, usart_dataavailable() ? "DATA!\r\n" : "no data\r\n");
+            cmd_send(CMD_DEBUG_PRINT_STRING, strlen(dest), 0, 0, dest, strlen(dest));
             LED_A_OFF();
-
-
-            /*
+/*
             uint8_t my_rx[sizeof(UsbCommand)];
             while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
                 LED_B_INV();
@@ -1136,13 +1138,12 @@ void UsbPacketReceived(uint8_t *packet, int len) {
                     //UsbPacketReceived(my_rx, sizeof(my_rx));
 
                     UsbCommand *my = (UsbCommand *)my_rx;
-                    if (mc->cmd > 0 ) {
+                    if (my->cmd > 0 ) {
                         Dbprintf("received command: 0x%04x and args: %d %d %d", my->cmd, my->arg[0], my->arg[1], my->arg[2]);
                     }
                 }
             }
-            */
-
+*/
             //cmd_send(CMD_DEBUG_PRINT_STRING, strlen(dest), 0, 0, dest, strlen(dest));
 
             cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
diff --git a/common/Makefile.hal b/common/Makefile.hal
index e34095f2d..0e109340e 100644
--- a/common/Makefile.hal
+++ b/common/Makefile.hal
@@ -5,6 +5,8 @@ define KNOWN_PLATFORMS
 +--------------------------------------------------------+
 | PM3RDV4 (def) | Proxmark3 rdv4      with AT91SAM7S512  |
 +--------------------------------------------------------+
+| PM3RDV4FPC    | Proxmark3 rdv4+FPC     (experimental)  |
++--------------------------------------------------------+
 | PM3EVO        | Proxmark3 EVO       with AT91SAM7S512  |
 +--------------------------------------------------------+
 | PM3EASY       | Proxmark3 rdv3 Easy with AT91SAM7S256  |
@@ -31,6 +33,10 @@ ifeq ($(PLATFORM),PM3RDV4)
   MCU = AT91SAM7S512
   PLATFORM_DEFS = -DWITH_SMARTCARD -DWITH_FLASH
   PLTNAME = Proxmark3 rdv4
+else ifeq ($(PLATFORM),PM3RDV4FPC)
+  MCU = AT91SAM7S512
+  PLATFORM_DEFS = -DWITH_SMARTCARD -DWITH_FLASH -DWITH_FPC
+  PLTNAME = Proxmark3 rdv4
 else ifeq ($(PLATFORM),PM3EVO)
   MCU = AT91SAM7S512
   PLTNAME = Proxmark3 EVO
diff --git a/common/usart.c b/common/usart.c
index 869179091..e82d343ec 100644
--- a/common/usart.c
+++ b/common/usart.c
@@ -66,27 +66,20 @@ inline int16_t usart_readbuffer(uint8_t *data, size_t len) {
     }
 }
 
+inline bool usart_dataavailable(void) {
+    return (pUS1->US_CSR & AT91C_US_RXRDY) != 0;
+}
 
 // transfer from device to client
 inline int16_t usart_writebuffer(uint8_t *data, size_t len) {
-
-    // Check if the first PDC bank is free
-    if (!(pUS1->US_TCR)) {
+    if (pUS1->US_TCR == 0) {
         memcpy(us_outbuf, data, len);
         pUS1->US_TPR = (uint32_t)us_outbuf;
-        pUS1->US_TCR = sizeof(us_outbuf);
+        pUS1->US_TCR = len;
 
         pUS1->US_PTCR = AT91C_PDC_TXTEN | AT91C_PDC_RXTDIS;
+        while((pUS1->US_CSR & AT91C_US_TXEMPTY) ==0) {};
         return 2;
-    }
-    // Check if the second PDC bank is free
-    else if (!(pUS1->US_TNCR)) {
-        memcpy(us_outbuf, data, len);
-        pUS1->US_TNPR = (uint32_t)us_outbuf;
-        pUS1->US_TNCR = sizeof(us_outbuf);
-
-        pUS1->US_PTCR = AT91C_PDC_TXTEN | AT91C_PDC_RXTDIS;
-        return 1;
     } else {
         return 0;
     }
@@ -130,7 +123,7 @@ void usart_init(void) {
     // 115200 * 16 == 1843200
     //
     //pUS1->US_BRGR = (48UL*1000*1000) / (9600*16);
-    pUS1->US_BRGR =  48054841 / (9600 << 4);
+    pUS1->US_BRGR =  48054841 / (115200 << 4);
 
     // Write the Timeguard Register
     pUS1->US_TTGR = 0;
diff --git a/common/usart.h b/common/usart.h
index 7e8d3eb7b..c49b0a8fd 100644
--- a/common/usart.h
+++ b/common/usart.h
@@ -9,4 +9,5 @@ void usart_close(void);
 
 int16_t usart_readbuffer(uint8_t *data, size_t len);
 int16_t usart_writebuffer(uint8_t *data, size_t len);
+bool usart_dataavailable(void);
 #endif
diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index 95e9ce070..0b12cd76b 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -194,14 +194,6 @@ serial_port uart_open(const char *pcPortName) {
     // Flush all lingering data that may exist
     tcflush(sp->fd, TCIOFLUSH);
 
-#ifdef WITH_FPC
-    if (uart_set_speed(sp, 115200)) {
-        printf("[=] UART Setting serial baudrate 115200 [FPC enabled]\n");
-    } else {
-        uart_set_speed(sp, 9600);
-        printf("[=] UART Setting serial baudrate 9600 [FPC enabled]\n");
-    }
-#else
     // set speed, works for UBUNTU 14.04
     bool success = uart_set_speed(sp, 460800);
     if (success) {
@@ -210,7 +202,6 @@ serial_port uart_open(const char *pcPortName) {
         uart_set_speed(sp, 115200);
         printf("[=] UART Setting serial baudrate 115200\n");
     }
-#endif
     return sp;
 }
 

From dae6eefa52a506c554549fafb9be4ab6c0b403b2 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 2 Apr 2019 01:20:02 +0200
Subject: [PATCH 0951/1938] FPC experiments: use oversampling, tested FPC at
 460800 ^^

---
 common/usart.c | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/common/usart.c b/common/usart.c
index e82d343ec..2bfa79280 100644
--- a/common/usart.c
+++ b/common/usart.c
@@ -87,6 +87,9 @@ inline int16_t usart_writebuffer(uint8_t *data, size_t len) {
 
 void usart_init(void) {
 
+    // For a nice detailed sample, interrupt driven but still relevant.
+    // See https://www.sparkfun.com/datasheets/DevTools/SAM7/at91sam7%20serial%20communications.pdf
+
     // disable & reset receiver / transmitter for configuration
     pUS1->US_CR = (AT91C_US_RSTRX | AT91C_US_RSTTX | AT91C_US_RXDIS | AT91C_US_TXDIS);
 
@@ -106,6 +109,7 @@ void usart_init(void) {
     // set mode
     pUS1->US_MR = AT91C_US_USMODE_NORMAL |      // normal mode
                   AT91C_US_CLKS_CLOCK |            // MCK (48MHz)
+                  AT91C_US_OVER |                  // oversampling
                   AT91C_US_CHRL_8_BITS |           // 8 bits
                   AT91C_US_PAR_NONE |              // parity: none
                   AT91C_US_NBSTOP_1_BIT |          // 1 stop bit
@@ -114,16 +118,9 @@ void usart_init(void) {
     // all interrupts disabled
     pUS1->US_IDR = 0xFFFF;
 
-    // iceman,  setting 115200 doesn't work. Only speed I got to work is 9600.
-    // something fishy with the AT91SAM7S512 USART..  Or I missed something
-    // For a nice detailed sample, interrupt driven but still relevant.
-    // See https://www.sparkfun.com/datasheets/DevTools/SAM7/at91sam7%20serial%20communications.pdf
-
-    // set baudrate to 115200
-    // 115200 * 16 == 1843200
-    //
-    //pUS1->US_BRGR = (48UL*1000*1000) / (9600*16);
-    pUS1->US_BRGR =  48054841 / (115200 << 4);
+    pUS1->US_BRGR =  48054841 / (115200 << 3);
+    // Need speed?
+    //pUS1->US_BRGR =  48054841 / (460800 << 3);
 
     // Write the Timeguard Register
     pUS1->US_TTGR = 0;

From 4eff3521a759ecaacad6274990fe1d84afe862cf Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 2 Apr 2019 10:33:25 +0200
Subject: [PATCH 0952/1938] Chg: 'lf t55xx info' - now prints if its a known
 config block

---
 client/cmdlft55xx.c | 66 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index db554b769..8c1ebffb1 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1272,6 +1272,71 @@ void printT5555Trace(t5555_tracedata_t data, uint8_t repeat) {
     */
 }
 
+static void printT5x7KnownBlock0(uint32_t b0) {
+    
+    char s[40];
+    memset(s, 0, sizeof(s));
+    
+    switch(b0) {
+        case T55X7_DEFAULT_CONFIG_BLOCK:
+            snprintf(s, sizeof(s)-strlen(s), "T55x7 Default ");
+            break;
+        case T55X7_RAW_CONFIG_BLOCK:
+            snprintf(s + strlen(s), sizeof(s)-strlen(s), "T55x7 Raw ");
+            break;
+        case T55X7_EM_UNIQUE_CONFIG_BLOCK:
+            snprintf(s + strlen(s), sizeof(s)-strlen(s), "EM Unique ");
+            break;
+/*
+        case T55X7_EM_PAXTON_CONFIG_BLOCK:
+            snprintf(s + strlen(s), sizeof(s)-strlen(s), "EM Paxton ");
+            break;
+*/
+        case T55X7_FDXB_CONFIG_BLOCK:
+            snprintf(s + strlen(s), sizeof(s)-strlen(s), "FDXB ");
+            break;
+        case T55X7_HID_26_CONFIG_BLOCK:
+            snprintf(s + strlen(s), sizeof(s)-strlen(s), "HID 26b ");
+            break;
+        case T55X7_PYRAMID_CONFIG_BLOCK:
+            snprintf(s + strlen(s), sizeof(s)-strlen(s), "Pyramid ");
+            break;
+        case T55X7_INDALA_64_CONFIG_BLOCK:
+            snprintf(s + strlen(s), sizeof(s)-strlen(s), "Indala 64");
+            break;
+        case T55X7_INDALA_224_CONFIG_BLOCK:
+            snprintf(s + strlen(s), sizeof(s)-strlen(s), "Indala 224 ");
+            break;
+        case T55X7_GUARDPROXII_CONFIG_BLOCK:
+            snprintf(s + strlen(s), sizeof(s)-strlen(s), "Guard Prox II ");
+            break;
+        case T55X7_VIKING_CONFIG_BLOCK:
+            snprintf(s + strlen(s), sizeof(s)-strlen(s), "Viking ");
+            break;
+        case T55X7_NORALYS_CONFIG_BLOCK:
+            snprintf(s + strlen(s), sizeof(s)-strlen(s), "Noralys ");
+            break;
+        case T55X7_IOPROX_CONFIG_BLOCK:
+            snprintf(s + strlen(s), sizeof(s)-strlen(s), "IO Prox ");
+            break;
+        case T55X7_PRESCO_CONFIG_BLOCK:
+            snprintf(s + strlen(s), sizeof(s)-strlen(s), "Presco ");
+            break;
+        case T55X7_NEDAP_64_CONFIG_BLOCK:
+            snprintf(s + strlen(s), sizeof(s)-strlen(s), "Nedap 64 ");
+            break;
+        case T55X7_NEDAP_128_CONFIG_BLOCK:
+            snprintf(s + strlen(s), sizeof(s)-strlen(s), "Nedap 128 ");
+            break;
+        default: break;
+    }
+    
+    if ( strlen(s) > 0 ) {
+        PrintAndLogEx(NORMAL, " Config block is usually found in T55x7 : " _YELLOW_("%s"), s);
+        PrintAndLogEx(NORMAL, "-------------------------------------------------------------"); 
+    }    
+}
+
 int CmdT55xxInfo(const char *Cmd) {
     /*
         Page 0 Block 0 Configuration data.
@@ -1404,6 +1469,7 @@ int CmdT55xxInfo(const char *Cmd) {
     else
         PrintAndLogEx(NORMAL, "     Block 0  : 0x%08X  %s", block0, sprint_bin(DemodBuffer + config.offset, 32));
     PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
+    printT5x7KnownBlock0(block0);
     return 0;
 }
 

From 4c007beefdb3407503590b5ff2f45ce93b603ed2 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 2 Apr 2019 10:36:32 +0200
Subject: [PATCH 0953/1938] textual

---
 client/cmdlft55xx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 8c1ebffb1..7bc06c9fb 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1332,7 +1332,7 @@ static void printT5x7KnownBlock0(uint32_t b0) {
     }
     
     if ( strlen(s) > 0 ) {
-        PrintAndLogEx(NORMAL, " Config block is usually found in T55x7 : " _YELLOW_("%s"), s);
+        PrintAndLogEx(NORMAL, " Known T55x7 Config block found : " _YELLOW_("%s"), s);
         PrintAndLogEx(NORMAL, "-------------------------------------------------------------"); 
     }    
 }

From 21be6d44007bae62ca88551a2ca85f00744853e6 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 2 Apr 2019 22:06:10 +0200
Subject: [PATCH 0954/1938] FPC: got RX working, got client over usart somehow
 working..., see detailed commit msg

* using WITH_FPC:
  * activate basic usart
  * no double buffer for now, no interrupt
  * usart_dataavailable/usart_readbuffer/usart_writebuffer, to demo it:
    * pm3 client over USB, minicom over usart
    * analyse a d 414243
* using WITH_FPC_HOST:
  * it implies WITH_FPC as it's based on it
  * control pm3 with client over usart
  * EXPERIMENTAL! still some frame desync issues
  * you can connect both from usart & USB with two pm3 clients
    * actually you *have* to connect USB for the moment because
      it's used to send debug messages about buggy usart... See Dbprintf_usb below
  * "sessions": msgs are directed to the latest client to have sent a cmd
  * Dbprintf_usb macro to send msgs to USB client to help debugging usart...
  * We now have an option to run client at different speed as usart is 115200:
    client/proxmark3 /dev/ttyUSB0 -b 115200
  * Consequently, argc,argv handling is a bit revamped, it was so messy...
  * USB and flashing are still at 460800, don't try flashing over usart yet ^^
---
 armsrc/appmain.c    | 29 ++++++++++---------
 client/cmdhw.c      |  6 +++-
 client/comms.c      |  8 +++---
 client/comms.h      |  3 +-
 client/flash.c      |  2 +-
 client/flasher.c    |  2 +-
 client/proxmark3.c  | 44 ++++++++++++++++++++++++----
 common/Makefile.hal |  7 ++++-
 common/cmd.c        | 24 +++++++++++++---
 common/usart.c      | 70 ++++++++++++++++++++++++++++-----------------
 common/usart.h      |  4 ++-
 include/usb_cmd.h   |  6 ++++
 uart/uart.h         |  2 +-
 uart/uart_posix.c   | 21 ++++++++------
 uart/uart_win32.c   | 30 +++++++++----------
 15 files changed, 174 insertions(+), 84 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 2ab2c4c0e..82a3015df 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -632,7 +632,6 @@ void ListenReaderField(int limit) {
 
 void UsbPacketReceived(uint8_t *packet, int len) {
     UsbCommand *c = (UsbCommand *)packet;
-
     //Dbprintf("received %d bytes, with command: 0x%04x and args: %d %d %d", len, c->cmd, c->arg[0], c->arg[1], c->arg[2]);
 
     switch (c->cmd) {
@@ -1106,8 +1105,12 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 
 
             char dest[USB_CMD_DATA_SIZE]={'\0'};
-            sprintf(dest, usart_dataavailable() ? "DATA!\r\n" : "no data\r\n");
-            cmd_send(CMD_DEBUG_PRINT_STRING, strlen(dest), 0, 0, dest, strlen(dest));
+            if (usart_dataavailable()) {
+                Dbprintf("RX DATA!");
+                uint16_t len = usart_readbuffer((uint8_t*)dest);
+                dest[len] = '\0';
+                Dbprintf("RX: %d | %02X %02X %02X %02X %02X %02X %02X %02X ", len,  dest[0], dest[1], dest[2], dest[3], dest[4], dest[5], dest[6], dest[7]);
+            }
 
             static const char *welcome = "Proxmark3 Serial interface via FPC ready\r\n";
             usart_writebuffer((uint8_t *)welcome, strlen(welcome));
@@ -1126,9 +1129,6 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 
             //usb
             cmd_send(CMD_DEBUG_PRINT_STRING, strlen(dest), 0, 0, dest, strlen(dest));
-
-            sprintf(dest, usart_dataavailable() ? "DATA!\r\n" : "no data\r\n");
-            cmd_send(CMD_DEBUG_PRINT_STRING, strlen(dest), 0, 0, dest, strlen(dest));
             LED_A_OFF();
 /*
             uint8_t my_rx[sizeof(UsbCommand)];
@@ -1560,16 +1560,17 @@ void  __attribute__((noreturn)) AppMain(void) {
         // Check if there is a usb packet available
         if (usb_poll_validate_length()) {
             if (usb_read(rx, sizeof(rx)))
+#ifdef WITH_FPC_HOST
+                reply_via_fpc = 0;
+#endif
                 UsbPacketReceived(rx, sizeof(rx));
         }
-#ifdef WITH_FPC
-        // Check is there is FPC package available
-        /*
-        usart_init();
-        if (usart_readbuffer(rx, sizeof(rx)) )
-            UsbPacketReceived(rx, sizeof(rx) );
-        */
-
+#ifdef WITH_FPC_HOST
+        // Check if there is a FPC packet available
+        if (usart_readcommand(rx) > 0) {
+            reply_via_fpc = 1;
+            UsbPacketReceived(rx, sizeof(rx));
+        }
 #endif
 
         // Press button for one second to enter a possible standalone mode
diff --git a/client/cmdhw.c b/client/cmdhw.c
index d40e5db4c..080f5fb28 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -423,7 +423,7 @@ int CmdVersion(const char *Cmd) {
 #else
         PrintAndLogEx(NORMAL, "\n\e[34m [ Proxmark3 RFID instrument ]\e[0m\n");
 #endif
-        char s[50] = {0};
+        char s[60] = {0};
 #if defined(WITH_FLASH) || defined(WITH_SMARTCARD) || defined(WITH_FPC)
         strncat(s, "build for RDV40 with ", sizeof(s) - strlen(s) - 1);
 #endif
@@ -434,7 +434,11 @@ int CmdVersion(const char *Cmd) {
         strncat(s, "smartcard; ", sizeof(s) - strlen(s) - 1);
 #endif
 #ifdef WITH_FPC
+  #ifdef WITH_FPC_HOST
+        strncat(s, "fpc-host; ", sizeof(s) - strlen(s) - 1);
+  #else
         strncat(s, "fpc; ", sizeof(s) - strlen(s) - 1);
+  #endif
 #endif
         PrintAndLogEx(NORMAL, "\n [ CLIENT ]");
         PrintAndLogEx(NORMAL, "  client: iceman %s \n", s);
diff --git a/client/comms.c b/client/comms.c
index de6394915..9ffa37977 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -194,7 +194,7 @@ static void UsbCommandReceived(UsbCommand *c) {
 /*
 bool hookUpPM3() {
     bool ret = false;
-    sp = uart_open( comport );
+    sp = uart_open( comport, speed );
 
     if (sp == INVALID_SERIAL_PORT) {
         PrintAndLogEx(WARNING, "Reconnect failed, retrying...  (reason: invalid serial port)\n");
@@ -298,17 +298,17 @@ __attribute__((force_align_arg_pointer))
     return NULL;
 }
 
-bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode) {
+bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode, uint32_t speed) {
 
     char *portname = (char *)port;
     if (!wait_for_port) {
-        sp = uart_open(portname);
+        sp = uart_open(portname, speed);
     } else {
         PrintAndLogEx(SUCCESS, "Waiting for Proxmark to appear on " _YELLOW_("%s"), portname);
         fflush(stdout);
         int openCount = 0;
         do {
-            sp = uart_open(portname);
+            sp = uart_open(portname, speed);
             msleep(500);
             printf(".");
             fflush(stdout);
diff --git a/client/comms.h b/client/comms.h
index f56bdb57e..b0687ac60 100644
--- a/client/comms.h
+++ b/client/comms.h
@@ -54,7 +54,8 @@ void *uart_receiver(void *targ);
 void SendCommand(UsbCommand *c);
 void clearCommandBuffer();
 
-bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode);
+#define FLASHMODE_SPEED 460800
+bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode, uint32_t speed);
 void CloseProxmark(void);
 
 bool WaitForResponseTimeoutW(uint32_t cmd, UsbCommand *response, size_t ms_timeout, bool show_warning);
diff --git a/client/flash.c b/client/flash.c
index 7a8b86d20..defcd7feb 100644
--- a/client/flash.c
+++ b/client/flash.c
@@ -321,7 +321,7 @@ static int enter_bootloader(char *serial_port_name) {
         // Let time to OS to make the port disappear
         msleep(1000);
 
-        bool opened = OpenProxmark(serial_port_name, true, 60, true);
+        bool opened = OpenProxmark(serial_port_name, true, 60, true, FLASHMODE_SPEED);
         if (opened) {
             fprintf(stdout, " " _GREEN_("Found") "\n");
             return 0;
diff --git a/client/flasher.c b/client/flasher.c
index 6e79ca70c..bc744b339 100644
--- a/client/flasher.c
+++ b/client/flasher.c
@@ -81,7 +81,7 @@ int main(int argc, char **argv) {
 
     char *serial_port_name = argv[1];
 
-    if (!OpenProxmark(serial_port_name, true, 60, true)) {
+    if (!OpenProxmark(serial_port_name, true, 60, true, FLASHMODE_SPEED)) {
         fprintf(stderr, "Could not find Proxmark on " _RED_("%s") ".\n\n", serial_port_name);
         return -1;
     } else {
diff --git a/client/proxmark3.c b/client/proxmark3.c
index e54f0ce74..add7cf287 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -259,6 +259,9 @@ int main(int argc, char *argv[]) {
     bool addLuaExec = false;
     char *script_cmds_file = NULL;
     char *script_cmd = NULL;
+    char *lastarg = NULL;
+    char *port = NULL;
+    uint32_t speed = 0;
 
     /* initialize history */
     using_history();
@@ -272,7 +275,9 @@ int main(int argc, char *argv[]) {
         return 1;
     }
 
-    for (int i = 1; i < argc; i++) {
+    uint32_t i = 1;
+    port = argv[i++];
+    for (i; i < argc; i++) {
 
         // helptext
         if (strcmp(argv[i], "-h") == 0 || strcmp(argv[i], "-help") == 0) {
@@ -291,29 +296,58 @@ int main(int argc, char *argv[]) {
         if (strcmp(argv[i], "-f") == 0 || strcmp(argv[i], "-flush") == 0) {
             SetFlushAfterWrite(true);
             PrintAndLogEx(INFO, "Output will be flushed after every print.\n");
+            continue;
+        }
+
+        // set baudrate
+        if (strcmp(argv[i], "-b") == 0 || strcmp(argv[i], "-baud") == 0) {
+            uint32_t tmpspeed = strtoul(argv[i+1], NULL, 10);
+            if ((tmpspeed == ULONG_MAX) || (tmpspeed == 0)) {
+                PrintAndLogEx(WARNING, "ERROR: invalid baudrate: %s %s\n", argv[i], argv[i+1]);
+                return 1;
+            }
+            speed = tmpspeed;
+            i++;
+            continue;
         }
 
         // wait for comport
         if (strcmp(argv[i], "-w") == 0 || strcmp(argv[i], "-wait") == 0) {
             waitCOMPort = true;
+            continue;
         }
 
         // execute pm3 command
         if (strcmp(argv[i], "-c") == 0 || strcmp(argv[i], "-command") == 0) {
             executeCommand = true;
+            continue;
         }
 
         // execute lua script
         if (strcmp(argv[i], "-l") == 0 || strcmp(argv[i], "-lua") == 0) {
             executeCommand = true;
             addLuaExec = true;
+            continue;
+        }
+
+        if (i < argc - 1) {
+            // We got an unknown parameter
+            PrintAndLogEx(WARNING, "WARNING: ignoring invalid parameter: %s\n", argv[i]);
+        }
+
+        if (i == argc - 1) {
+            // We got presumably a command or a filename
+            lastarg = argv[argc - 1];
         }
     }
 
+    if (speed == 0)
+        speed = 460800;
+
     // If the user passed the filename of the 'script' to execute, get it from last parameter
-    if (argc > 2 && argv[argc - 1] && argv[argc - 1][0] != '-') {
+    if (lastarg) {
         if (executeCommand) {
-            script_cmd = argv[argc - 1];
+            script_cmd = lastarg;
 
             while (script_cmd[strlen(script_cmd) - 1] == ' ')
                 script_cmd[strlen(script_cmd) - 1] = 0x00;
@@ -336,7 +370,7 @@ int main(int argc, char *argv[]) {
                 PrintAndLogEx(SUCCESS, "execute command from commandline: %s\n", script_cmd);
             }
         } else {
-            script_cmds_file = argv[argc - 1];
+            script_cmds_file = lastarg;
         }
     }
 
@@ -358,7 +392,7 @@ int main(int argc, char *argv[]) {
     set_my_executable_path();
 
     // try to open USB connection to Proxmark
-    usb_present = OpenProxmark(argv[1], waitCOMPort, 20, false);
+    usb_present = OpenProxmark(port, waitCOMPort, 20, false, speed);
 
 #ifdef HAVE_GUI
 
diff --git a/common/Makefile.hal b/common/Makefile.hal
index 0e109340e..717d59110 100644
--- a/common/Makefile.hal
+++ b/common/Makefile.hal
@@ -35,7 +35,7 @@ ifeq ($(PLATFORM),PM3RDV4)
   PLTNAME = Proxmark3 rdv4
 else ifeq ($(PLATFORM),PM3RDV4FPC)
   MCU = AT91SAM7S512
-  PLATFORM_DEFS = -DWITH_SMARTCARD -DWITH_FLASH -DWITH_FPC
+  PLATFORM_DEFS = -DWITH_SMARTCARD -DWITH_FLASH -DWITH_FPC_HOST
   PLTNAME = Proxmark3 rdv4
 else ifeq ($(PLATFORM),PM3EVO)
   MCU = AT91SAM7S512
@@ -56,6 +56,11 @@ else
   $(error Invalid or empty PLATFORM: $(PLATFORM). Known platforms: $(KNOWN_PLATFORMS))
 endif
 
+# Add flags dependencies
+ifneq (,$(findstring WITH_FPC_,$(PLATFORM_DEFS)))
+  PLATFORM_DEFS += -DWITH_FPC
+endif
+
 export PLATFORM
 export PLTNAME
 export MCU
diff --git a/common/cmd.c b/common/cmd.c
index 3b45c08ad..0f37fb2db 100644
--- a/common/cmd.c
+++ b/common/cmd.c
@@ -31,6 +31,17 @@
  */
 #include "cmd.h"
 
+#ifdef WITH_FPC_HOST
+// "Session" flag, to tell via which interface next msgs should be sent: USB or FPC USART
+bool reply_via_fpc = 0;
+
+extern void Dbprintf(const char *fmt, ...);
+#define Dbprintf_usb(...) {\
+    reply_via_fpc = 0;\
+    Dbprintf(__VA_ARGS__);\
+    reply_via_fpc = 1;}
+#endif
+
 uint8_t cmd_send(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len) {
     UsbCommand txcmd;
 
@@ -53,11 +64,16 @@ uint8_t cmd_send(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void
 
     uint32_t sendlen = 0;
     // Send frame and make sure all bytes are transmitted
-    sendlen = usb_write((uint8_t *)&txcmd, sizeof(UsbCommand));
 
-#ifdef WITH_FPC
-// usart_init();
-// usart_writebuffer( (uint8_t*)&txcmd, sizeof(UsbCommand) );
+#ifdef WITH_FPC_HOST
+    if (reply_via_fpc) {
+        sendlen = usart_writebuffer( (uint8_t*)&txcmd, sizeof(UsbCommand) );
+        Dbprintf_usb("Sent %i bytes over usart", len);
+    } else {
+        sendlen = usb_write((uint8_t *)&txcmd, sizeof(UsbCommand));
+    }
+#else
+    sendlen = usb_write((uint8_t *)&txcmd, sizeof(UsbCommand));
 #endif
 
     return sendlen;
diff --git a/common/usart.c b/common/usart.c
index 2bfa79280..b29c5cb88 100644
--- a/common/usart.c
+++ b/common/usart.c
@@ -10,6 +10,7 @@
 //-----------------------------------------------------------------------------
 #include "usart.h"
 #include "string.h"
+#include "apps.h"  // for Dbprintf
 
 #define AT91_BAUD_RATE 115200
 
@@ -39,52 +40,58 @@ void usart_close(void) {
 }
 */
 
+static uint8_t us_inbuf[sizeof(UsbCommand)];
 static uint8_t us_outbuf[sizeof(UsbCommand)];
 
-/// Reads data from an USART peripheral
-/// \param data  Pointer to the buffer where the received data will be stored.
-/// \param len  Size of the data buffer (in bytes).
-inline int16_t usart_readbuffer(uint8_t *data, size_t len) {
-
-    // Check if the first PDC bank is free
-    if (!(pUS1->US_RCR)) {
-        pUS1->US_RPR = (uint32_t)data;
-        pUS1->US_RCR = len;
-
-        pUS1->US_PTCR = AT91C_PDC_RXTEN | AT91C_PDC_TXTDIS;
-        return 2;
-    }
-    // Check if the second PDC bank is free
-    else if (!(pUS1->US_RNCR)) {
-        pUS1->US_RNPR = (uint32_t)data;
-        pUS1->US_RNCR = len;
-
-        pUS1->US_PTCR = AT91C_PDC_RXTEN | AT91C_PDC_TXTDIS;
-        return 1;
+// transfer from client to device
+inline int16_t usart_readbuffer(uint8_t *data) {
+    uint32_t rcr = pUS1->US_RCR;
+    if (rcr < sizeof(us_inbuf)) {
+        pUS1->US_PTCR = AT91C_PDC_RXTDIS;
+        memcpy(data, us_inbuf, sizeof(us_inbuf) - rcr);
+        // Reset DMA buffer
+        pUS1->US_RPR = (uint32_t)us_inbuf;
+        pUS1->US_RCR = sizeof(us_inbuf);
+        pUS1->US_PTCR = AT91C_PDC_RXTEN;
+        return sizeof(us_inbuf) - rcr;
     } else {
         return 0;
     }
 }
 
 inline bool usart_dataavailable(void) {
-    return (pUS1->US_CSR & AT91C_US_RXRDY) != 0;
+    return pUS1->US_RCR < sizeof(us_inbuf);
+}
+
+inline int16_t usart_readcommand(uint8_t *data) {
+    if (pUS1->US_RCR == 0)
+        return usart_readbuffer(data);
+    else
+        return 0;
+}
+
+inline bool usart_commandavailable(void) {
+    return pUS1->US_RCR == 0;
 }
 
 // transfer from device to client
 inline int16_t usart_writebuffer(uint8_t *data, size_t len) {
-    if (pUS1->US_TCR == 0) {
+
+
+    if (pUS1->US_CSR & AT91C_US_ENDTX) {
         memcpy(us_outbuf, data, len);
         pUS1->US_TPR = (uint32_t)us_outbuf;
         pUS1->US_TCR = len;
-
-        pUS1->US_PTCR = AT91C_PDC_TXTEN | AT91C_PDC_RXTDIS;
-        while((pUS1->US_CSR & AT91C_US_TXEMPTY) ==0) {};
-        return 2;
+        pUS1->US_PTCR = AT91C_PDC_TXTEN;
+        while(!(pUS1->US_CSR & AT91C_US_ENDTX)) {};
+        pUS1->US_PTCR = AT91C_PDC_TXTDIS;
+        return len;
     } else {
         return 0;
     }
 }
 
+
 void usart_init(void) {
 
     // For a nice detailed sample, interrupt driven but still relevant.
@@ -128,6 +135,17 @@ void usart_init(void) {
     pUS1->US_FIDI = 0;
     pUS1->US_IF = 0;
 
+    // Disable double buffers for now
+    pUS1->US_TNPR = (uint32_t)0;
+    pUS1->US_TNCR = 0;
+    pUS1->US_RNPR = (uint32_t)0;
+    pUS1->US_RNCR = 0;
+
+
     // re-enable receiver / transmitter
     pUS1->US_CR = (AT91C_US_RXEN | AT91C_US_TXEN);
+    // ready to receive
+    pUS1->US_RPR = (uint32_t)us_inbuf;
+    pUS1->US_RCR = sizeof(us_inbuf);
+    pUS1->US_PTCR = AT91C_PDC_RXTEN;
 }
diff --git a/common/usart.h b/common/usart.h
index c49b0a8fd..f98424841 100644
--- a/common/usart.h
+++ b/common/usart.h
@@ -7,7 +7,9 @@
 void usart_init(void);
 void usart_close(void);
 
-int16_t usart_readbuffer(uint8_t *data, size_t len);
+int16_t usart_readbuffer(uint8_t *data);
 int16_t usart_writebuffer(uint8_t *data, size_t len);
 bool usart_dataavailable(void);
+int16_t usart_readcommand(uint8_t *data);
+bool usart_commandavailable(void);
 #endif
diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index a15229969..99563d0fa 100644
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -34,6 +34,12 @@ typedef struct {
         uint32_t asDwords[USB_CMD_DATA_SIZE / 4];
     } d;
 } PACKED UsbCommand;
+
+#ifdef WITH_FPC_HOST
+    // "Session" flag, to tell via which interface next msgs should be sent: USB or FPC USART
+    extern bool reply_via_fpc;
+#endif
+
 // A struct used to send sample-configs over USB
 typedef struct {
     uint8_t decimation;
diff --git a/uart/uart.h b/uart/uart.h
index 582f394e7..714f646b9 100644
--- a/uart/uart.h
+++ b/uart/uart.h
@@ -71,7 +71,7 @@ typedef void *serial_port;
  *
  * On errors, this method returns INVALID_SERIAL_PORT or CLAIMED_SERIAL_PORT.
  */
-serial_port uart_open(const char *pcPortName);
+serial_port uart_open(const char *pcPortName, uint32_t speed);
 
 /* Closes the given port.
  */
diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index 0b12cd76b..92af6774a 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -73,7 +73,7 @@ struct timeval timeout = {
     .tv_usec = 30000  // 30 000 micro seconds
 };
 
-serial_port uart_open(const char *pcPortName) {
+serial_port uart_open(const char *pcPortName, uint32_t speed) {
     serial_port_unix *sp = calloc(sizeof(serial_port_unix), sizeof(uint8_t));
     if (sp == 0) return INVALID_SERIAL_PORT;
 
@@ -194,14 +194,19 @@ serial_port uart_open(const char *pcPortName) {
     // Flush all lingering data that may exist
     tcflush(sp->fd, TCIOFLUSH);
 
-    // set speed, works for UBUNTU 14.04
-    bool success = uart_set_speed(sp, 460800);
-    if (success) {
-        printf("[=] UART Setting serial baudrate 460800\n");
-    } else {
-        uart_set_speed(sp, 115200);
-        printf("[=] UART Setting serial baudrate 115200\n");
+    if (!uart_set_speed(sp, speed)) {
+        // trying some fallbacks automatically
+        speed = 115200;
+        if (!uart_set_speed(sp, speed)) {
+            speed = 9600;
+            if (!uart_set_speed(sp, speed)) {
+                uart_close(sp);
+                printf("[!] UART error while setting baudrate\n");
+                return INVALID_SERIAL_PORT;
+            }
+        }
     }
+    printf("[=] UART Setting serial baudrate %i\n", speed);
     return sp;
 }
 
diff --git a/uart/uart_win32.c b/uart/uart_win32.c
index 6107a564e..2ed5c9bcf 100644
--- a/uart/uart_win32.c
+++ b/uart/uart_win32.c
@@ -48,7 +48,7 @@ typedef struct {
     COMMTIMEOUTS ct;  // Serial port time-out configuration
 } serial_port_windows;
 
-serial_port uart_open(const char *pcPortName) {
+serial_port uart_open(const char *pcPortName, uint32_t speed) {
     char acPortName[255];
     serial_port_windows *sp = calloc(sizeof(serial_port_windows), sizeof(uint8_t));
 
@@ -87,6 +87,7 @@ serial_port uart_open(const char *pcPortName) {
     // all zero's configure: no timeout for read/write used.
     // took settings from libnfc/buses/uart.c
 #ifdef WITH_FPC
+    // Still relevant?
     sp->ct.ReadIntervalTimeout         = 1000;
     sp->ct.ReadTotalTimeoutMultiplier  = 0;
     sp->ct.ReadTotalTimeoutConstant    = 1500;
@@ -108,22 +109,19 @@ serial_port uart_open(const char *pcPortName) {
 
     PurgeComm(sp->hPort, PURGE_RXABORT | PURGE_RXCLEAR);
 
-#ifdef WITH_FPC
-    if (uart_set_speed(sp, 115200)) {
-        printf("[=] UART Setting serial baudrate 115200 [FPC enabled]\n");
-    } else {
-        uart_set_speed(sp, 9600);
-        printf("[=] UART Setting serial baudrate 9600 [FPC enabled]\n");
+    if (!uart_set_speed(sp, speed)) {
+        // trying some fallbacks automatically
+        speed = 115200;
+        if (!uart_set_speed(sp, speed)) {
+            speed = 9600;
+            if (!uart_set_speed(sp, speed)) {
+                uart_close(sp);
+                printf("[!] UART error while setting baudrate\n");
+                return INVALID_SERIAL_PORT;
+            }
+        }
     }
-#else
-    bool success = uart_set_speed(sp, 460800);
-    if (success) {
-        printf("[=] UART Setting serial baudrate 460800\n");
-    } else {
-        uart_set_speed(sp, 115200);
-        printf("[=] UART Setting serial baudrate 115200\n");
-    }
-#endif
+    printf("[=] UART Setting serial baudrate %i\n", speed);
     return sp;
 }
 

From 5225722a5047b7783fccc73bd8bb19bc369baefb Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 2 Apr 2019 22:08:50 +0200
Subject: [PATCH 0955/1938] t55xx info: fix q5 condition

---
 client/cmdlft55xx.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 7bc06c9fb..19026a2a9 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1398,7 +1398,7 @@ int CmdT55xxInfo(const char *Cmd) {
     }
 
     PrintAndLogEx(NORMAL, "");
-    if (config.Q5 || (gotdata && dataasq5)) {
+    if (((!gotdata) && config.Q5) || (gotdata && dataasq5)) {
         uint32_t header   = (block0 >> (32 - 12)) & 0xFFF;
         uint32_t ps       = (block0 >> (32 - 13)) & 0x01;
         uint32_t fw       = (block0 >> (32 - 14)) & 0x01;
@@ -1469,7 +1469,8 @@ int CmdT55xxInfo(const char *Cmd) {
     else
         PrintAndLogEx(NORMAL, "     Block 0  : 0x%08X  %s", block0, sprint_bin(DemodBuffer + config.offset, 32));
     PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
-    printT5x7KnownBlock0(block0);
+    if (((!gotdata) && (!config.Q5)) || (gotdata && (!dataasq5)))
+        printT5x7KnownBlock0(block0);
     return 0;
 }
 

From 23917e7963078dff83698f83ce5073531dac75b3 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 2 Apr 2019 22:28:01 +0200
Subject: [PATCH 0956/1938] update changelog

---
 CHANGELOG.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc9f264cd..294935b9d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [unreleased][unreleased]
+ - *WIP* Add FPC usart with pm3 client: WITH_FPC_HOST. (@doegox)
+ - Add '-b baudrate' option to the client. (@doegox)
+ - Change 'lf t55xx info': tell if known configuration block0. (@iceman)
+ - Fix/Add FPC usart: fix TX, bring RX, full speed. (@doegox)
+ - Change 'lf t55xx config' options: allow to toggle on/off i/q5/st
+ - Change 'lf t55xx info': support offline block0, Q5, fix extended, add warns. (@doegox)
+ - Avoid race condition when flasher finds the not yet closed pm3 port. (@doegox)
+ - Fix 'lf t55xx trace': read the proper block. (@doegox)
+ - Fix Indala 64 on T55xx: use PSK1. (@doegox)
+ - Force proper LF handling in ProxSpace. (@vratiskol)
+ - Fix Makefiles race conditions to allow parallel compilation, e.g. 'make -j8'. (@doegox)
  - Add - dictionary key file for MFU. (not in use at the moment) (@mazodude)
  - Change 'lf fdx demod - better biphase maxerrors. (@MalteHillmann)
  - Change 'hf mf sim' - now works better against android (@mceloff)

From 64ce30c06c8a4c24cb241b6cdacbf64ec9829d74 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 2 Apr 2019 22:32:45 +0200
Subject: [PATCH 0957/1938] make style

---
 armsrc/appmain.c    | 10 ++++-----
 client/cmdhw.c      |  6 +++---
 client/cmdlft55xx.c | 51 +++++++++++++++++++++++----------------------
 client/proxmark3.c  |  4 ++--
 common/cmd.c        |  8 +++----
 common/usart.c      |  2 +-
 include/usb_cmd.h   |  4 ++--
 7 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 82a3015df..d0a512c0f 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1104,10 +1104,10 @@ void UsbPacketReceived(uint8_t *packet, int len) {
             */
 
 
-            char dest[USB_CMD_DATA_SIZE]={'\0'};
+            char dest[USB_CMD_DATA_SIZE] = {'\0'};
             if (usart_dataavailable()) {
                 Dbprintf("RX DATA!");
-                uint16_t len = usart_readbuffer((uint8_t*)dest);
+                uint16_t len = usart_readbuffer((uint8_t *)dest);
                 dest[len] = '\0';
                 Dbprintf("RX: %d | %02X %02X %02X %02X %02X %02X %02X %02X ", len,  dest[0], dest[1], dest[2], dest[3], dest[4], dest[5], dest[6], dest[7]);
             }
@@ -1130,7 +1130,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
             //usb
             cmd_send(CMD_DEBUG_PRINT_STRING, strlen(dest), 0, 0, dest, strlen(dest));
             LED_A_OFF();
-/*
+            /*
             uint8_t my_rx[sizeof(UsbCommand)];
             while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
                 LED_B_INV();
@@ -1143,7 +1143,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
                     }
                 }
             }
-*/
+            */
             //cmd_send(CMD_DEBUG_PRINT_STRING, strlen(dest), 0, 0, dest, strlen(dest));
 
             cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
@@ -1563,7 +1563,7 @@ void  __attribute__((noreturn)) AppMain(void) {
 #ifdef WITH_FPC_HOST
                 reply_via_fpc = 0;
 #endif
-                UsbPacketReceived(rx, sizeof(rx));
+            UsbPacketReceived(rx, sizeof(rx));
         }
 #ifdef WITH_FPC_HOST
         // Check if there is a FPC packet available
diff --git a/client/cmdhw.c b/client/cmdhw.c
index 080f5fb28..4f17c682a 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -434,11 +434,11 @@ int CmdVersion(const char *Cmd) {
         strncat(s, "smartcard; ", sizeof(s) - strlen(s) - 1);
 #endif
 #ifdef WITH_FPC
-  #ifdef WITH_FPC_HOST
+#ifdef WITH_FPC_HOST
         strncat(s, "fpc-host; ", sizeof(s) - strlen(s) - 1);
-  #else
+#else
         strncat(s, "fpc; ", sizeof(s) - strlen(s) - 1);
-  #endif
+#endif
 #endif
         PrintAndLogEx(NORMAL, "\n [ CLIENT ]");
         PrintAndLogEx(NORMAL, "  client: iceman %s \n", s);
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 19026a2a9..3fcc4fdda 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1273,68 +1273,69 @@ void printT5555Trace(t5555_tracedata_t data, uint8_t repeat) {
 }
 
 static void printT5x7KnownBlock0(uint32_t b0) {
-    
+
     char s[40];
     memset(s, 0, sizeof(s));
-    
-    switch(b0) {
+
+    switch (b0) {
         case T55X7_DEFAULT_CONFIG_BLOCK:
-            snprintf(s, sizeof(s)-strlen(s), "T55x7 Default ");
+            snprintf(s, sizeof(s) - strlen(s), "T55x7 Default ");
             break;
         case T55X7_RAW_CONFIG_BLOCK:
-            snprintf(s + strlen(s), sizeof(s)-strlen(s), "T55x7 Raw ");
+            snprintf(s + strlen(s), sizeof(s) - strlen(s), "T55x7 Raw ");
             break;
         case T55X7_EM_UNIQUE_CONFIG_BLOCK:
-            snprintf(s + strlen(s), sizeof(s)-strlen(s), "EM Unique ");
+            snprintf(s + strlen(s), sizeof(s) - strlen(s), "EM Unique ");
             break;
-/*
+        /*
         case T55X7_EM_PAXTON_CONFIG_BLOCK:
             snprintf(s + strlen(s), sizeof(s)-strlen(s), "EM Paxton ");
             break;
-*/
+        */
         case T55X7_FDXB_CONFIG_BLOCK:
-            snprintf(s + strlen(s), sizeof(s)-strlen(s), "FDXB ");
+            snprintf(s + strlen(s), sizeof(s) - strlen(s), "FDXB ");
             break;
         case T55X7_HID_26_CONFIG_BLOCK:
-            snprintf(s + strlen(s), sizeof(s)-strlen(s), "HID 26b ");
+            snprintf(s + strlen(s), sizeof(s) - strlen(s), "HID 26b ");
             break;
         case T55X7_PYRAMID_CONFIG_BLOCK:
-            snprintf(s + strlen(s), sizeof(s)-strlen(s), "Pyramid ");
+            snprintf(s + strlen(s), sizeof(s) - strlen(s), "Pyramid ");
             break;
         case T55X7_INDALA_64_CONFIG_BLOCK:
-            snprintf(s + strlen(s), sizeof(s)-strlen(s), "Indala 64");
+            snprintf(s + strlen(s), sizeof(s) - strlen(s), "Indala 64");
             break;
         case T55X7_INDALA_224_CONFIG_BLOCK:
-            snprintf(s + strlen(s), sizeof(s)-strlen(s), "Indala 224 ");
+            snprintf(s + strlen(s), sizeof(s) - strlen(s), "Indala 224 ");
             break;
         case T55X7_GUARDPROXII_CONFIG_BLOCK:
-            snprintf(s + strlen(s), sizeof(s)-strlen(s), "Guard Prox II ");
+            snprintf(s + strlen(s), sizeof(s) - strlen(s), "Guard Prox II ");
             break;
         case T55X7_VIKING_CONFIG_BLOCK:
-            snprintf(s + strlen(s), sizeof(s)-strlen(s), "Viking ");
+            snprintf(s + strlen(s), sizeof(s) - strlen(s), "Viking ");
             break;
         case T55X7_NORALYS_CONFIG_BLOCK:
-            snprintf(s + strlen(s), sizeof(s)-strlen(s), "Noralys ");
+            snprintf(s + strlen(s), sizeof(s) - strlen(s), "Noralys ");
             break;
         case T55X7_IOPROX_CONFIG_BLOCK:
-            snprintf(s + strlen(s), sizeof(s)-strlen(s), "IO Prox ");
+            snprintf(s + strlen(s), sizeof(s) - strlen(s), "IO Prox ");
             break;
         case T55X7_PRESCO_CONFIG_BLOCK:
-            snprintf(s + strlen(s), sizeof(s)-strlen(s), "Presco ");
+            snprintf(s + strlen(s), sizeof(s) - strlen(s), "Presco ");
             break;
         case T55X7_NEDAP_64_CONFIG_BLOCK:
-            snprintf(s + strlen(s), sizeof(s)-strlen(s), "Nedap 64 ");
+            snprintf(s + strlen(s), sizeof(s) - strlen(s), "Nedap 64 ");
             break;
         case T55X7_NEDAP_128_CONFIG_BLOCK:
-            snprintf(s + strlen(s), sizeof(s)-strlen(s), "Nedap 128 ");
+            snprintf(s + strlen(s), sizeof(s) - strlen(s), "Nedap 128 ");
+            break;
+        default:
             break;
-        default: break;
     }
-    
-    if ( strlen(s) > 0 ) {
+
+    if (strlen(s) > 0) {
         PrintAndLogEx(NORMAL, " Known T55x7 Config block found : " _YELLOW_("%s"), s);
-        PrintAndLogEx(NORMAL, "-------------------------------------------------------------"); 
-    }    
+        PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
+    }
 }
 
 int CmdT55xxInfo(const char *Cmd) {
diff --git a/client/proxmark3.c b/client/proxmark3.c
index add7cf287..2f371c5f3 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -301,9 +301,9 @@ int main(int argc, char *argv[]) {
 
         // set baudrate
         if (strcmp(argv[i], "-b") == 0 || strcmp(argv[i], "-baud") == 0) {
-            uint32_t tmpspeed = strtoul(argv[i+1], NULL, 10);
+            uint32_t tmpspeed = strtoul(argv[i + 1], NULL, 10);
             if ((tmpspeed == ULONG_MAX) || (tmpspeed == 0)) {
-                PrintAndLogEx(WARNING, "ERROR: invalid baudrate: %s %s\n", argv[i], argv[i+1]);
+                PrintAndLogEx(WARNING, "ERROR: invalid baudrate: %s %s\n", argv[i], argv[i + 1]);
                 return 1;
             }
             speed = tmpspeed;
diff --git a/common/cmd.c b/common/cmd.c
index 0f37fb2db..73c95bcd5 100644
--- a/common/cmd.c
+++ b/common/cmd.c
@@ -37,9 +37,9 @@ bool reply_via_fpc = 0;
 
 extern void Dbprintf(const char *fmt, ...);
 #define Dbprintf_usb(...) {\
-    reply_via_fpc = 0;\
-    Dbprintf(__VA_ARGS__);\
-    reply_via_fpc = 1;}
+        reply_via_fpc = 0;\
+        Dbprintf(__VA_ARGS__);\
+        reply_via_fpc = 1;}
 #endif
 
 uint8_t cmd_send(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len) {
@@ -67,7 +67,7 @@ uint8_t cmd_send(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void
 
 #ifdef WITH_FPC_HOST
     if (reply_via_fpc) {
-        sendlen = usart_writebuffer( (uint8_t*)&txcmd, sizeof(UsbCommand) );
+        sendlen = usart_writebuffer((uint8_t *)&txcmd, sizeof(UsbCommand));
         Dbprintf_usb("Sent %i bytes over usart", len);
     } else {
         sendlen = usb_write((uint8_t *)&txcmd, sizeof(UsbCommand));
diff --git a/common/usart.c b/common/usart.c
index b29c5cb88..8680d500a 100644
--- a/common/usart.c
+++ b/common/usart.c
@@ -83,7 +83,7 @@ inline int16_t usart_writebuffer(uint8_t *data, size_t len) {
         pUS1->US_TPR = (uint32_t)us_outbuf;
         pUS1->US_TCR = len;
         pUS1->US_PTCR = AT91C_PDC_TXTEN;
-        while(!(pUS1->US_CSR & AT91C_US_ENDTX)) {};
+        while (!(pUS1->US_CSR & AT91C_US_ENDTX)) {};
         pUS1->US_PTCR = AT91C_PDC_TXTDIS;
         return len;
     } else {
diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index 99563d0fa..113cc7e57 100644
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -36,8 +36,8 @@ typedef struct {
 } PACKED UsbCommand;
 
 #ifdef WITH_FPC_HOST
-    // "Session" flag, to tell via which interface next msgs should be sent: USB or FPC USART
-    extern bool reply_via_fpc;
+// "Session" flag, to tell via which interface next msgs should be sent: USB or FPC USART
+extern bool reply_via_fpc;
 #endif
 
 // A struct used to send sample-configs over USB

From 07cc0d0a29fa29136360a3769d347d79a1084d21 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 2 Apr 2019 22:34:00 +0200
Subject: [PATCH 0958/1938] make style helped revealing my bug :)

---
 armsrc/appmain.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index d0a512c0f..c1967663e 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1559,11 +1559,12 @@ void  __attribute__((noreturn)) AppMain(void) {
 
         // Check if there is a usb packet available
         if (usb_poll_validate_length()) {
-            if (usb_read(rx, sizeof(rx)))
+            if (usb_read(rx, sizeof(rx))) {
 #ifdef WITH_FPC_HOST
                 reply_via_fpc = 0;
 #endif
-            UsbPacketReceived(rx, sizeof(rx));
+                UsbPacketReceived(rx, sizeof(rx));
+            }
         }
 #ifdef WITH_FPC_HOST
         // Check if there is a FPC packet available

From cbf81cf5c32770ee05b10c17d25b6ad13de3257a Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 2 Apr 2019 22:43:00 +0200
Subject: [PATCH 0959/1938] remove compilation warning

---
 client/proxmark3.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/proxmark3.c b/client/proxmark3.c
index 2f371c5f3..50180a79c 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -277,7 +277,7 @@ int main(int argc, char *argv[]) {
 
     uint32_t i = 1;
     port = argv[i++];
-    for (i; i < argc; i++) {
+    for (; i < argc; i++) {
 
         // helptext
         if (strcmp(argv[i], "-h") == 0 || strcmp(argv[i], "-help") == 0) {

From 8c74b2f9da5c77171a3d9c0536a448799d38b4ce Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 2 Apr 2019 22:48:22 +0200
Subject: [PATCH 0960/1938] Remove compilation warning, even if it was not real
 issue
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

cmdhflegic.c:269:13: warning: ‘strncpy’ output truncated before terminating nul copying 4 bytes from a string of the same length [-Wstringop-truncation]
---
 client/cmdhflegic.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index 867aada9a..85920e813 100644
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -169,7 +169,7 @@ int CmdLegicInfo(const char *Cmd) {
     int crc = 0, wrp = 0, wrc = 0;
     uint8_t stamp_len = 0;
     uint16_t datalen = 0;
-    char token_type[5] = {0, 0, 0, 0, 0};
+    char token_type[6] = {0, 0, 0, 0, 0, 0};
     int dcf = 0;
     int bIsSegmented = 0;
 

From a185e83ffbaa934ed67cea1c8a78cbad5b6103c6 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 2 Apr 2019 23:04:29 +0200
Subject: [PATCH 0961/1938] textual

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 294935b9d..bbdb1e03c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
 
 ## [unreleased][unreleased]
  - *WIP* Add FPC usart with pm3 client: WITH_FPC_HOST. (@doegox)
- - Add '-b baudrate' option to the client. (@doegox)
+ - Add '-b baudrate' option to the pm3 client. (@doegox)
  - Change 'lf t55xx info': tell if known configuration block0. (@iceman)
  - Fix/Add FPC usart: fix TX, bring RX, full speed. (@doegox)
  - Change 'lf t55xx config' options: allow to toggle on/off i/q5/st
@@ -12,7 +12,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
  - Avoid race condition when flasher finds the not yet closed pm3 port. (@doegox)
  - Fix 'lf t55xx trace': read the proper block. (@doegox)
  - Fix Indala 64 on T55xx: use PSK1. (@doegox)
- - Force proper LF handling in ProxSpace. (@vratiskol)
+ - Force proper Linefeed (LF) handling in ProxSpace. (@vratiskol)
  - Fix Makefiles race conditions to allow parallel compilation, e.g. 'make -j8'. (@doegox)
  - Add - dictionary key file for MFU. (not in use at the moment) (@mazodude)
  - Change 'lf fdx demod - better biphase maxerrors. (@MalteHillmann)

From 0383d7f052e0c5646ce1987799febdf13dadbb6d Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 3 Apr 2019 15:34:36 +0200
Subject: [PATCH 0962/1938] chg: 'hf mf restore' - add finish message chg: 'hf
 mfu restore' - add finish message chg: 'hf 15 restore' - add finish message, 
 close filehandle when failing.

---
 client/cmdhf15.c  | 8 +++++++-
 client/cmdhfmf.c  | 2 +-
 client/cmdhfmfu.c | 1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index 7391fd38c..f9fe0be2a 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -847,6 +847,8 @@ int CmdHF15Restore(const char *Cmd) {
         return 3;
     }
 
+    PrintAndLogEx(INFO, "Restoring data blocks.");
+        
     while (1) {
         tried = 0;
         hex[0] = 0x00;
@@ -877,12 +879,16 @@ int CmdHF15Restore(const char *Cmd) {
         for (tried = 0; tried < retries; tried++)
             if (!(retval = CmdHF15Write(tmpCmd)))
                 break;
-        if (tried >= retries)
+        if (tried >= retries) {
+            fclose(f);
             return retval;
+        }
 
         i++;
     }
     fclose(f);
+    PrintAndLogEx(INFO, "Finish restore");
+    return 0;
 }
 
 int CmdHF15List(const char *Cmd) {
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 451a704bf..1a236cdc4 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -1055,8 +1055,8 @@ int CmdHF14AMfRestore(const char *Cmd) {
             }
         }
     }
-
     fclose(fdump);
+    PrintAndLogEx(INFO, "Finish restore");    
     return 0;
 }
 
diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index 4097a0a3a..956cc1a70 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -2223,6 +2223,7 @@ int CmdHF14AMfURestore(const char *Cmd) {
 
     DropField();
     free(dump);
+    PrintAndLogEx(INFO, "Finish restore");    
     return 0;
 }
 //

From c03e425550ba7c88d773ddd91670d52e7792ab55 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 3 Apr 2019 15:42:42 +0200
Subject: [PATCH 0963/1938] chg: 'hf 15 restore' - fail message added

---
 client/cmdhf15.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index f9fe0be2a..55e4aa478 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -876,11 +876,14 @@ int CmdHF15Restore(const char *Cmd) {
         snprintf(tmpCmd, sizeof(tmpCmd), "%s u %u %s", newCmdPrefix, i, hex);
         PrintAndLogEx(DEBUG, "Command to be sent| %s", tmpCmd);
 
-        for (tried = 0; tried < retries; tried++)
-            if (!(retval = CmdHF15Write(tmpCmd)))
+        for (tried = 0; tried < retries; tried++) {
+            if (!(retval = CmdHF15Write(tmpCmd))) {
                 break;
+            }
+        }
         if (tried >= retries) {
             fclose(f);
+            PrintAndLogEx(FAILED, "Restore failed. Too many retries.");
             return retval;
         }
 

From 38162917dc6f6950465207c544ff2257e7c2848b Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 3 Apr 2019 19:48:00 +0200
Subject: [PATCH 0964/1938] Add: new lua scripting support for some t55xx
 commands.

  core.t55xx_detect()    - same as 'lf t55xx detect'
  core.t55xx_readblock() - read t55xx block, don't forget to run detect before.  Returns actual blockdata.
---
 client/cmdlft55xx.c |  67 +++++++++++---------
 client/cmdlft55xx.h |   9 +--
 client/scripting.c  | 147 +++++++++++++++++++++++++++++++++++++++++++-
 client/scripting.h  |   1 +
 4 files changed, 187 insertions(+), 37 deletions(-)

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 3fcc4fdda..b25054b2d 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -431,7 +431,7 @@ int CmdT55xxReadBlock(const char *Cmd) {
     return T55xxReadBlock(block, page1, usepwd, override, password);
 }
 
-bool DecodeT55xxBlock() {
+bool DecodeT55xxBlock(void) {
 
     char buf[30] = {0x00};
     char *cmdStr = buf;
@@ -462,7 +462,7 @@ bool DecodeT55xxBlock() {
         case DEMOD_PSK1:
             // skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)
             save_restoreGB(GRAPH_SAVE);
-            CmdLtrim("160");
+            CmdLtrim("150");
             snprintf(cmdStr, sizeof(buf), "%d %d 6", bitRate[config.bitrate], config.inverted);
             ans = PSKDemod(cmdStr, false);
             //undo trim samples
@@ -472,7 +472,7 @@ bool DecodeT55xxBlock() {
         case DEMOD_PSK3: //not fully implemented
             // skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)
             save_restoreGB(GRAPH_SAVE);
-            CmdLtrim("160");
+            CmdLtrim("150");
             snprintf(cmdStr, sizeof(buf), "%d 0 6", bitRate[config.bitrate]);
             ans = PSKDemod(cmdStr, false);
             psk1TOpsk2(DemodBuffer, DemodBufferLen);
@@ -494,7 +494,7 @@ bool DecodeT55xxBlock() {
     return (bool) ans;
 }
 
-bool DecodeT5555TraceBlock() {
+bool DecodeT5555TraceBlock(void) {
     DemodBufferLen = 0x00;
 
     // According to datasheet. Always: RF/64, not inverted, Manchester
@@ -547,13 +547,13 @@ int CmdT55xxDetect(const char *Cmd) {
     }
 
     if (!tryDetectModulation())
-        PrintAndLogEx(WARNING, "Could not detect modulation automatically. Try setting it manually with \'lf t55xx config\'");
+        PrintAndLogEx(WARNING, "Could not detect modulation automatically. Try setting it manually with " _YELLOW_("\'lf t55xx config\'") );
 
     return 0;
 }
 
 // detect configuration?
-bool tryDetectModulation() {
+bool tryDetectModulation(void) {
 
     t55xx_conf_block_t tests[15];
     int bitRate = 0, clk = 0, firstClockEdge = 0;
@@ -754,11 +754,42 @@ bool testKnownConfigBlock(uint32_t block0) {
         case T55X7_NORALYS_CONFIG_BLOCK:
         case T55X7_IOPROX_CONFIG_BLOCK:
         case T55X7_PRESCO_CONFIG_BLOCK:
+        case T55X7_NEDAP_64_CONFIG_BLOCK:
+        case T55X7_NEDAP_128_CONFIG_BLOCK:
             return true;
     }
     return false;
 }
 
+bool GetT55xxBlockData(uint32_t *blockdata) {
+
+    if (DemodBufferLen == 0)
+        return false;
+
+    uint8_t idx = config.offset;
+        
+    if (idx + 32 > DemodBufferLen) {
+        PrintAndLogEx(WARNING, "The configured offset %d is too big. Possible offset: %d)", idx, DemodBufferLen - 32);
+        return false;
+    }
+
+    *blockdata = PackBits(0, 32, DemodBuffer + idx);
+    return true;
+}
+
+void printT55xxBlock(const char *blockNum) {
+
+    uint32_t blockData = 0;
+    uint8_t bytes[4] = {0};
+
+    if (GetT55xxBlockData(&blockData) == false)
+        return;
+
+    num_to_bytes(blockData, 4, bytes);
+
+    PrintAndLogEx(NORMAL, " %s | %08X | %s | %s", blockNum, blockData, sprint_bin(DemodBuffer + config.offset, 32), sprint_ascii(bytes, 4));
+}
+
 bool testModulation(uint8_t mode, uint8_t modread) {
     switch (mode) {
         case DEMOD_FSK:
@@ -932,30 +963,6 @@ bool test(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk, bool *Q5)
     return false;
 }
 
-void printT55xxBlock(const char *blockNum) {
-
-    uint8_t i = config.offset;
-    uint8_t endpos = 32 + i;
-    uint32_t blockData = 0;
-    uint8_t bits[64] = {0x00};
-
-    if (!DemodBufferLen) return;
-
-    if (endpos > DemodBufferLen) {
-        PrintAndLogEx(NORMAL, "The configured offset %d is too big. Possible offset: %d)", i, DemodBufferLen - 32);
-        return;
-    }
-
-    for (; i < endpos; ++i)
-        bits[i - config.offset] = DemodBuffer[i];
-
-    blockData = PackBits(0, 32, bits);
-    uint8_t bytes[4] = {0};
-    num_to_bytes(blockData, 4, bytes);
-
-    PrintAndLogEx(NORMAL, " %s | %08X | %s | %s", blockNum, blockData, sprint_bin(bits, 32), sprint_ascii(bytes, 4));
-}
-
 int special(const char *Cmd) {
     uint32_t blockData = 0;
     uint8_t bits[32] = {0x00};
diff --git a/client/cmdlft55xx.h b/client/cmdlft55xx.h
index cd240e5f2..ce990bebd 100644
--- a/client/cmdlft55xx.h
+++ b/client/cmdlft55xx.h
@@ -156,19 +156,20 @@ char *GetQ5ModulationStr(uint32_t id);
 char *GetModulationStr(uint32_t id, bool xmode);
 char *GetModelStrFromCID(uint32_t cid);
 char *GetSelectedModulationStr(uint8_t id);
-uint32_t PackBits(uint8_t start, uint8_t len, uint8_t *bitstream);
 void printT5xxHeader(uint8_t page);
 void printT55xxBlock(const char *demodStr);
 int printConfiguration(t55xx_conf_block_t b);
 
+extern int T55xxReadBlock(uint8_t block, bool page1, bool usepwd, bool override, uint32_t password);
+bool GetT55xxBlockData(uint32_t *blockdata);
 bool DecodeT55xxBlock(void);
-bool tryDetectModulation(void);
+extern bool tryDetectModulation(void);
 bool testKnownConfigBlock(uint32_t block0);
+
 extern bool tryDetectP1(bool getData);
 bool test(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk, bool *Q5);
 int special(const char *Cmd);
-bool AquireData(uint8_t page, uint8_t block, bool pwdmode, uint32_t password);
-
+extern bool AquireData(uint8_t page, uint8_t block, bool pwdmode, uint32_t password);
 int tryOnePassword(uint32_t password);
 
 void printT55x7Trace(t55x7_tracedata_t data, uint8_t repeat);
diff --git a/client/scripting.c b/client/scripting.c
index a26db0c19..f3afb18d4 100644
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -95,7 +95,7 @@ static int l_GetFromBigBuf(lua_State *L) {
     //Push it as a string
     lua_pushlstring(L, (const char *)data, len);
     free(data);
-    return 1;// return 1 to signal one return value
+    return 1; // return 1 to signal one return value
 }
 
 /**
@@ -561,7 +561,7 @@ static int l_reveng_models(lua_State *L) {
 // endian    ,char,  'B','b','L','l','t','r' describing if Big-Endian or Little-Endian should be used in different combinations.
 //
 // outputs:  string with hex representation of the CRC result
-static int l_reveng_RunModel(lua_State *L) {
+static int l_reveng_runmodel(lua_State *L) {
     //-c || -v
     //inModel = valid model name string - CRC-8
     //inHexStr = input hex string to calculate crc on
@@ -701,6 +701,145 @@ static int l_keygen_algoD(lua_State *L) {
     return 2;
 }
 
+/*
+Read T55Xx block. 
+param1 uint8_t block
+param2 bool page1
+param3 bool override
+param4 uint32_t password
+*/
+static int l_T55xx_readblock(lua_State *L) {
+    
+    //Check number of arguments
+    int n = lua_gettop(L);
+    if ( n != 4 ) {
+         return returnToLuaWithError(L, "Wrong number of arguments, got %d bytes, expected 4", n);
+    }
+    
+    uint32_t block, usepage1, override, password;
+    bool usepwd;
+    size_t size;
+    
+    const char *p_blockno = luaL_checklstring(L, 1, &size);
+    if (size < 1 || size > 2)  return returnToLuaWithError(L, "Wrong size of blockNo, got %d, expected 1 or 2", (int) size);
+    sscanf(p_blockno, "%x", &block);
+    
+    const char *p_usepage1 = luaL_checklstring(L, 2, &size);
+    if (size != 1)  return returnToLuaWithError(L, "Wrong size of usePage1, got %d, expected 1", (int) size);
+    sscanf(p_usepage1, "%x", &usepage1);
+       
+    const char *p_override = luaL_checklstring(L, 3, &size);
+    if (size != 1)  return returnToLuaWithError(L, "Wrong size of override, got %d, expected 1", (int) size);
+    sscanf(p_override, "%x", &override);
+    
+    const char *p_pwd = luaL_checklstring(L, 4, &size);
+    if ( size == 0 ) {
+        usepwd = false;
+    } else {
+
+        if (size != 8) return returnToLuaWithError(L, "Wrong size of pwd, got %d , expected 8", (int) size);
+        sscanf(p_pwd, "%08x", &password);
+        usepwd = true;
+    }  
+    
+    //Password mode
+    if (usepwd) {
+        // try reading the config block and verify that PWD bit is set before doing this!
+        if (!override) {
+
+            if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, false, 0)) {
+                return returnToLuaWithError(L, "Failed to read config block");
+            }
+
+            if (!tryDetectModulation()) {
+                PrintAndLogEx(NORMAL, "Safety Check: Could not detect if PWD bit is set in config block. Exits.");
+                return 0;
+            } else {
+                PrintAndLogEx(NORMAL, "Safety Check: PWD bit is NOT set in config block. Reading without password...");
+                usepwd = false;
+                usepage1 = false;
+            }
+        } else {
+            PrintAndLogEx(NORMAL, "Safety Check Overriden - proceeding despite risk");
+        }
+    }
+
+    if (!AquireData(usepage1, block, usepwd, password)) {
+        return returnToLuaWithError(L, "Failed to aquire data from card");
+    }
+    
+    if (!DecodeT55xxBlock()) {
+        return returnToLuaWithError(L, "Failed to decode signal");
+    }
+    
+    uint32_t blockData = 0;
+    if (GetT55xxBlockData(&blockData) == false) {
+        return returnToLuaWithError(L, "Failed to get actual data");
+    }
+       
+    lua_pushunsigned(L, blockData);
+    return 1;
+}
+
+// arg 1 = pwd
+// arg 2 = use GB
+static int l_T55xx_detect(lua_State *L) {
+    bool useGB = false, usepwd = false, isok;
+    uint32_t password;
+    uint32_t gb;
+    size_t size;
+    
+    //Check number of arguments
+    int n = lua_gettop(L);
+
+    switch (n) {
+        case 2: {
+            const char *p_gb = luaL_checklstring(L, 2, &size);
+            if (size != 1)  return returnToLuaWithError(L, "Wrong size of useGB, got %d , expected 1", (int) size);
+            sscanf(p_gb, "%u", &gb);
+            useGB = ( gb ) ? true : false;
+            printf("p_gb size  %u | %c \n", size, useGB ? 'Y':'N');
+        }
+        case 1: {
+            const char *p_pwd = luaL_checklstring(L, 1, &size);
+            if ( size == 0 ) {
+                usepwd = false;
+            } else {
+                
+                if (size != 8)  return returnToLuaWithError(L, "Wrong size of pwd, got %d , expected 8", (int) size);
+                sscanf(p_pwd, "%08x", &password);
+                usepwd = true;
+            }
+            break;
+        }
+        default :
+            break;
+    }
+   
+    if (!useGB) {
+    
+        isok = AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, usepwd, password);
+        if ( isok == false ) {
+            // signal error by returning Nil, errorstring
+            lua_pushnil(L);
+            lua_pushstring(L, "Failed to aquire LF signal data");
+            return 2;
+        }
+    }
+    
+    isok = tryDetectModulation();
+    if ( isok == false ) {
+        // signal error by returning Nil, errorstring
+        lua_pushnil(L);
+        lua_pushstring(L,  "Could not detect modulation automatically. Try setting it manually with \'lf t55xx config\'");
+        return 2;       
+    }
+
+    lua_pushinteger(L, isok);
+    lua_pushstring(L, "Success");
+    return 2;
+}
+
 /**
  * @brief Sets the lua path to include "./lualibs/?.lua", in order for a script to be
  * able to do "require('foobar')" if foobar.lua is within lualibs folder.
@@ -747,13 +886,15 @@ int set_pm3_libraries(lua_State *L) {
         {"crc64_ecma182",               l_crc64_ecma182},
         {"sha1",                        l_sha1},
         {"reveng_models",               l_reveng_models},
-        {"reveng_runmodel",             l_reveng_RunModel},
+        {"reveng_runmodel",             l_reveng_runmodel},
         {"hardnested",                  l_hardnested},
         {"detect_prng",                 l_detect_prng},
 //        {"keygen.algoA",                l_keygen_algoA},
 //        {"keygen.algoB",                l_keygen_algoB},
 //        {"keygen.algoC",                l_keygen_algoC},
         {"keygen_algo_d",               l_keygen_algoD},
+        {"t55xx_readblock",             l_T55xx_readblock},
+        {"t55xx_detect",                l_T55xx_detect},
         {NULL, NULL}
     };
 
diff --git a/client/scripting.h b/client/scripting.h
index ca405f43f..75a08605b 100644
--- a/client/scripting.h
+++ b/client/scripting.h
@@ -29,6 +29,7 @@
 #include "cmdhfmfhard.h"
 #include "cmdhfmfu.h"
 #include "protocols.h"
+#include "cmdlft55xx.h"  // read t55xx etc
 
 #define LUA_LIBRARIES_DIRECTORY "lualibs/"
 #define LUA_SCRIPTS_DIRECTORY   "scripts/"

From 19cf50a6ffac93cdd9c5e04b1c7bd54c602399ce Mon Sep 17 00:00:00 2001
From: Eloff <eloff@mail.ru>
Date: Wed, 3 Apr 2019 20:56:15 +0300
Subject: [PATCH 0965/1938] Mifare Ultralight/NTAG simulation. Add WRITE and
 COMPATIBLE_WRITE support

---
 armsrc/iso14443a.c | 18 ++++++++++++++++++
 armsrc/iso14443a.h |  4 ++++
 common/protocols.h |  2 +-
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 20ca3bdb2..7da7ef8e5 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -1126,6 +1126,24 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
             AddCrc14A(emdata, len);
             EmSendCmd(emdata, len + 2);
             p_response = NULL;
+		} else if ((receivedCmd[0] == MIFARE_ULC_WRITE || receivedCmd[0] == MIFARE_ULC_COMP_WRITE) && (tagType == 2 || tagType == 7)) {        // Received a WRITE
+			// cmd + block + 4/16 bytes data + 2 bytes crc
+			if (len == 8 || len == 20) {
+				bool isCrcCorrect = CheckCrc14A(receivedCmd, len);
+				if (isCrcCorrect) {
+					int block = receivedCmd[1] + 12; // first 12 blocks of emu are [getversion answer - check tearing - pack - 0x00 - signature]
+					emlSetMem_xt(&receivedCmd[2], block, 1, 4);
+					// send ACK
+					EmSend4bit(CARD_ACK);
+				} else {
+					// send NACK 0x1 == crc/parity error
+					EmSend4bit(CARD_NACK_PA);
+				}	
+			} else {
+	   			// send NACK 0x0 == invalid argument
+				EmSend4bit(CARD_NACK_IV);
+			}
+			p_response = NULL;
         } else if (receivedCmd[0] == MIFARE_ULEV1_READSIG && tagType == 7) {    // Received a READ SIGNATURE --
             // first 12 blocks of emu are [getversion answer - check tearing - pack - 0x00 - signature]
             uint16_t start = 4 * 4;
diff --git a/armsrc/iso14443a.h b/armsrc/iso14443a.h
index 4d28a8dfb..777932540 100644
--- a/armsrc/iso14443a.h
+++ b/armsrc/iso14443a.h
@@ -93,6 +93,10 @@ typedef struct {
 # define AddCrc14B(data, len) compute_crc(CRC_14443_B, (data), (len), (data)+(len), (data)+(len)+1)
 #endif
 
+#ifndef CheckCrc14A
+# define	CheckCrc14A(data, len)	check_crc(CRC_14443_A, (data), (len))
+#endif 
+
 extern void GetParity(const uint8_t *pbtCmd, uint16_t len, uint8_t *par);
 
 extern tDemod *GetDemod(void);
diff --git a/common/protocols.h b/common/protocols.h
index f8ed2781e..1752d75ed 100644
--- a/common/protocols.h
+++ b/common/protocols.h
@@ -166,7 +166,7 @@ ISO 7816-4 Basic interindustry commands. For command APDU's.
 #define MIFARE_EV1_SETMODE          0x43
 
 #define MIFARE_ULC_WRITE            0xA2
-//#define MIFARE_ULC__COMP_WRITE      0xA0
+#define MIFARE_ULC_COMP_WRITE      0xA0
 #define MIFARE_ULC_AUTH_1           0x1A
 #define MIFARE_ULC_AUTH_2           0xAF
 

From 436b026b275bd4140257afca5728a65e5c6986ba Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 4 Apr 2019 07:21:58 +0200
Subject: [PATCH 0966/1938] ADD: 'script run test_t55x7' - a script to do
 regression test for t55xx programming / proxmark3 capability to
 read/demodulate different t55x7 configurations

---
 client/scripts/test_t55x7.lua | 200 ++++++++++++++++++++++++++++++++++
 1 file changed, 200 insertions(+)
 create mode 100644 client/scripts/test_t55x7.lua

diff --git a/client/scripts/test_t55x7.lua b/client/scripts/test_t55x7.lua
new file mode 100644
index 000000000..3b7ea2e02
--- /dev/null
+++ b/client/scripts/test_t55x7.lua
@@ -0,0 +1,200 @@
+local cmds = require('commands')
+local getopt = require('getopt')
+local bin = require('bin')
+local utils = require('utils')
+
+local format=string.format
+local floor=math.floor
+
+copyright = ''
+author = "Iceman"
+version  = ''
+desc =[[
+This script will program a T55x7 TAG with a configuration and four blocks of data.
+It will then try to detect and read back those block data and compare if read data matches the expected data.
+
+
+lf t55xx wipe
+lf t55xx detect
+lf t55xx write b 1 d 00000000
+lf t55xx write b 2 d ffffffff
+lf t55xx write b 3 d 80000000
+lf t55xx write b 4 d 00000001
+
+Loop:
+
+try write different configuration blocks, and read block1-4 and comparing the read values with the values used to write.
+
+testsuit for T55XX commands demodulation
+
+]]
+example = [[
+    1. script run test_t55x7
+]]
+usage = [[
+
+script run test_t55x7
+
+Arguments:
+    -h       this help
+]]
+
+local TIMEOUT = 2000 -- Shouldn't take longer than 2 seconds
+local DEBUG = true -- the debug flag
+
+local data_blocks_cmds = {    
+    [1] = '00000000',
+    [2] = 'ffffffff',
+    [3] = '80000000',
+    [4] = '00000001',
+}
+
+---
+-- A debug printout-function
+local function dbg(args)
+    if not DEBUG then
+        return
+    end
+
+    if type(args) == "table" then
+        local i = 1
+        while args[i] do
+            dbg(args[i])
+            i = i+1
+        end
+    else
+        print("###", args)
+    end
+end
+---
+-- This is only meant to be used when errors occur
+local function oops(err)
+    print("ERROR: ",err)
+end
+---
+-- Usage help
+local function help()
+    print(copyright)
+    print(author)
+    print(version)
+    print(desc)
+    print("Example usage")
+    print(example)
+end
+---
+-- Exit message
+local function exitMsg(msg)
+    print( string.rep('--',20) )
+    print( string.rep('--',20) )
+    print(msg)
+    print()
+end
+
+local function WipeCard()
+
+   local wipe_cmds = {
+        [1] = 'lf t55xx wipe',
+        [2] = 'lf t55xx detect',
+   }
+    for _ = 1, #wipe_cmds do
+        local c = wipe_cmds[_]
+        dbg(c);  core.console(c)
+    end
+    
+    local wipe_data_cmd = "lf t55xx write b %s d %s"
+    for _ = 1, #data_blocks_cmds do
+        local val = data_blocks_cmds[_]
+        local c = string.format(wipe_data_cmd, _, val);
+        core.console(c)
+    end
+end
+---
+-- lf t55xx read
+local function CheckReadBlock(block)
+    local data, msg
+    -- blockno, page1, override, pwd
+    data, msg = core.t55xx_readblock(block, "0", "0", "")
+    if not data then
+        return ""
+    end
+    return ('%08X'):format(data)
+end
+
+local function test()
+    
+    -- PSK1 Modulations to test.  (2blocks)
+    local process_block0_cmds = {
+        [1] = '00001040',
+        [2] = '00041040', 
+        [3] = '00081040',
+        [4] = '000c1040',
+        [5] = '00101040',
+        [6] = '00141040',
+        [7] = '00181040',
+        [8] = '001c1040',
+    }
+
+    local y
+    local block = "00"
+
+    for _ = 1, #process_block0_cmds do
+    
+        local p_config_cmd = process_block0_cmds[_]
+        core.clearCommandBuffer()
+
+        -- Write Config block
+        dbg(('lf t55xx write b 0 d %s'):format(p_config_cmd))
+        local config = tonumber(p_config_cmd, 16)
+        local writecmd = Command:new{cmd = cmds.CMD_T55XX_WRITE_BLOCK,arg1 = config, arg2 = block, arg3 = '00', data = '00'}
+        local err = core.SendCommand(writecmd:getBytes())
+        if err then return oops(err) end
+        local response = core.WaitForResponseTimeout(cmds.CMD_ACK,TIMEOUT)
+
+        -- Detect 
+        local res, msg = core.t55xx_detect()
+        if not res then 
+            print("can't detect modulation, skip to next config")
+        else
+            -- Loop block1-2
+            for _ = 1, #data_blocks_cmds do
+                local val = data_blocks_cmds[_]
+                local blockdata, msg = CheckReadBlock(_)
+                if blockdata ~= val then
+                    print( ('Test %s == %s Failed'):format(val, blockdata))
+                    core.console( format('rem -- block %d  value %s failed', _, val))
+                else
+                    print( ('Test %s == %s OK'):format(val, blockdata))
+                end
+            end
+        end       
+    end
+end
+
+local function main(args)
+
+    print( string.rep('--',20) )
+    print( string.rep('--',20) )
+
+    -- Arguments for the script
+    for o, arg in getopt.getopt(args, 'h') do
+        if o == "h" then return help() end
+    end
+
+    core.clearCommandBuffer()
+
+    print('Starting test,  wiping card')
+    WipeCard()
+    print('Detecting card')
+    local res, msg = core.t55xx_detect()
+    if res then
+        print('Starting test')
+        test()
+    else
+        print("can't detect modulation. Test failed. Ending.")
+    end
+    
+--    test()
+    exitMsg('Tests finished')
+    
+end
+main(args)

From 2fa31d33fcd6ad0c9f863636b517c93b58837315 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 4 Apr 2019 07:23:18 +0200
Subject: [PATCH 0967/1938] style

---
 common/lfdemod.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/common/lfdemod.c b/common/lfdemod.c
index 0d33091a6..93ae2266f 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -1915,7 +1915,14 @@ int pskRawDemod_ext(uint8_t *dest, size_t *size, int *clock, int *invert, int *s
                 waveLenCnt = waveEnd - waveStart;
                 if (waveLenCnt > fc) {
                     //this wave is a phase shift
-                    //prnt("DEBUG: phase shift at: %d, len: %d, nextClk: %d, i: %d, fc: %d",waveStart,waveLenCnt,lastClkBit+*clock-tol,i+1,fc);
+                    /*
+                   prnt("DEBUG: phase shift at: %d, len: %d, nextClk: %d, i: %d, fc: %d"
+                        , waveStart
+                        , waveLenCnt
+                        , lastClkBit + *clock - tol
+                        , i + 1
+                        , fc);
+                      */  
                     if (i + 1 >= lastClkBit + *clock - tol) { //should be a clock bit
                         curPhase ^= 1;
                         dest[numBits++] = curPhase;

From 116837e9a095b9e3cdcecc5dba19f7b8abb61c49 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 4 Apr 2019 20:06:15 +0200
Subject: [PATCH 0968/1938] chg: 'lf t55xx info' - text layout

---
 client/cmdlft55xx.c | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index b25054b2d..dd02db95e 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1292,13 +1292,8 @@ static void printT5x7KnownBlock0(uint32_t b0) {
             snprintf(s + strlen(s), sizeof(s) - strlen(s), "T55x7 Raw ");
             break;
         case T55X7_EM_UNIQUE_CONFIG_BLOCK:
-            snprintf(s + strlen(s), sizeof(s) - strlen(s), "EM Unique ");
+            snprintf(s + strlen(s), sizeof(s) - strlen(s), "EM unique, Paxton ");
             break;
-        /*
-        case T55X7_EM_PAXTON_CONFIG_BLOCK:
-            snprintf(s + strlen(s), sizeof(s)-strlen(s), "EM Paxton ");
-            break;
-        */
         case T55X7_FDXB_CONFIG_BLOCK:
             snprintf(s + strlen(s), sizeof(s) - strlen(s), "FDXB ");
             break;
@@ -1339,10 +1334,8 @@ static void printT5x7KnownBlock0(uint32_t b0) {
             break;
     }
 
-    if (strlen(s) > 0) {
-        PrintAndLogEx(NORMAL, " Known T55x7 Config block found : " _YELLOW_("%s"), s);
-        PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
-    }
+    if (strlen(s) > 0)
+        PrintAndLogEx(NORMAL, "\n Config block match        : " _YELLOW_("%s"), s);
 }
 
 int CmdT55xxInfo(const char *Cmd) {
@@ -1476,9 +1469,12 @@ int CmdT55xxInfo(const char *Cmd) {
         PrintAndLogEx(NORMAL, "     Block 0  : 0x%08X", block0);
     else
         PrintAndLogEx(NORMAL, "     Block 0  : 0x%08X  %s", block0, sprint_bin(DemodBuffer + config.offset, 32));
-    PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
+
     if (((!gotdata) && (!config.Q5)) || (gotdata && (!dataasq5)))
         printT5x7KnownBlock0(block0);
+    
+    PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
+
     return 0;
 }
 

From cd78a0878bcf3a291a1f45352f3ba8706e0bc84e Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 4 Apr 2019 22:08:23 +0200
Subject: [PATCH 0969/1938] fix: duplicate breaks

---
 client/mifare/mifarehost.c | 1 -
 client/mifare/ndef.c       | 1 -
 2 files changed, 2 deletions(-)

diff --git a/client/mifare/mifarehost.c b/client/mifare/mifarehost.c
index 9c99f95a3..905fdcc82 100644
--- a/client/mifare/mifarehost.c
+++ b/client/mifare/mifarehost.c
@@ -960,7 +960,6 @@ int detect_classic_nackbug(bool verbose) {
             int gc = getchar();
             (void)gc;
             return -1;
-            break;
         }
 
         if (WaitForResponseTimeout(CMD_ACK, &resp, 500)) {
diff --git a/client/mifare/ndef.c b/client/mifare/ndef.c
index b888d8269..da03ecc8f 100644
--- a/client/mifare/ndef.c
+++ b/client/mifare/ndef.c
@@ -344,7 +344,6 @@ int NDEFDecodeAndPrint(uint8_t *ndef, size_t ndefLen, bool verbose) {
             case 0xfe: {
                 PrintAndLogEx(INFO, "-- NDEF Terminator. Done.");
                 return 0;
-                break;
             }
             default: {
                 PrintAndLogEx(ERR, "unknown tag 0x%02x", ndef[indx]);

From ff25fc700e1b083dd766ae4ac61cd872118e20ec Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 4 Apr 2019 22:09:43 +0200
Subject: [PATCH 0970/1938] fix: duplicate break

---
 client/cliparser/argtable3.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/cliparser/argtable3.c b/client/cliparser/argtable3.c
index 0750ed601..f8e4c2387 100644
--- a/client/cliparser/argtable3.c
+++ b/client/cliparser/argtable3.c
@@ -3263,7 +3263,6 @@ static const TRexChar *trex_matchnode(TRex *exp, TRexNode *node, const TRexChar
                     return asd;
             }
             return NULL;
-            break;
         }
         case OP_EXPR:
         case OP_NOCAPEXPR: {

From 0dc0a96b3cd82fb1be71c49c45fa7649bd03dd33 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 4 Apr 2019 22:10:46 +0200
Subject: [PATCH 0971/1938] fix: duplicate break

---
 client/cmdanalyse.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdanalyse.c b/client/cmdanalyse.c
index 1813917aa..5ca75b79f 100644
--- a/client/cmdanalyse.c
+++ b/client/cmdanalyse.c
@@ -615,7 +615,7 @@ int CmdAnalyseA(const char *Cmd) {
         }
 
         */
-    return 0;
+//    return 0;
 
     // 14443-A
     uint8_t u14_c[] = {0x09, 0x78, 0x00, 0x92, 0x02, 0x54, 0x13, 0x02, 0x04, 0x2d, 0xe8 }; // atqs w crc

From 7a152dc3832f9ae2cfdc454a0250bb7ba692ca49 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 4 Apr 2019 22:11:30 +0200
Subject: [PATCH 0972/1938] fix: duplicate break

---
 client/cmdhficlass.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index 39a25019c..edc15df74 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -2194,7 +2194,6 @@ int CmdHFiClassLookUp(const char *Cmd) {
                 }
                 cmdp += 2;
                 break;
-                break;
             case 'e':
                 use_elite = true;
                 cmdp++;

From 419eef5a433ab87d5656aa6d41433e3b054c80c3 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 4 Apr 2019 22:22:31 +0200
Subject: [PATCH 0973/1938] fix: duplicate break

---
 client/emv/crypto_polarssl.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/client/emv/crypto_polarssl.c b/client/emv/crypto_polarssl.c
index e1f59ddf3..3b0a7d801 100644
--- a/client/emv/crypto_polarssl.c
+++ b/client/emv/crypto_polarssl.c
@@ -248,7 +248,6 @@ static size_t crypto_pk_polarssl_get_nbits(const struct crypto_pk *_cp) {
     struct crypto_pk_polarssl *cp = (struct crypto_pk_polarssl *)_cp;
 
     return cp->ctx.len * 8;
-    return 0;
 }
 
 static unsigned char *crypto_pk_polarssl_get_parameter(const struct crypto_pk *_cp, unsigned param, size_t *plen) {
@@ -270,7 +269,7 @@ static unsigned char *crypto_pk_polarssl_get_parameter(const struct crypto_pk *_
             mbedtls_mpi_write_binary(&cp->ctx.E, result, *plen);
             break;
         default:
-            printf("Error get parameter. Param=%d", param);
+            printf("Error get parameter. Param = %u", param);
             break;
     }
 

From d127c2294c9e3461d516880692740b730011f9dc Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 4 Apr 2019 22:35:38 +0200
Subject: [PATCH 0974/1938] fix: compare unsigned

---
 client/emv/emv_pki.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/emv/emv_pki.c b/client/emv/emv_pki.c
index 33d4eeb16..cb2486bb4 100644
--- a/client/emv/emv_pki.c
+++ b/client/emv/emv_pki.c
@@ -332,7 +332,7 @@ unsigned char *emv_pki_sdatl_fill(const struct tlvdb *db, size_t *sdatl_len) {
     *sdatl_len = 0;
 
     const struct tlv *sda_tl = tlvdb_get(db, 0x9f4a, NULL);
-    if (!sda_tl || sda_tl->len <= 0)
+    if (!sda_tl || sda_tl->len == 0)
         return NULL;
 
     for (int i = 0; i < sda_tl->len; i++) {

From 4d18b5a11c228fe178e43b00b51e8b03f6072d12 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 4 Apr 2019 22:36:45 +0200
Subject: [PATCH 0975/1938] fix: compare unsigned

---
 client/jansson/utf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/jansson/utf.c b/client/jansson/utf.c
index 003c422bd..61f0a381b 100644
--- a/client/jansson/utf.c
+++ b/client/jansson/utf.c
@@ -122,7 +122,7 @@ const char *utf8_iterate(const char *buffer, size_t bufsize, int32_t *codepoint)
         return buffer;
 
     count = utf8_check_first(buffer[0]);
-    if (count <= 0)
+    if (count == 0)
         return NULL;
 
     if (count == 1)

From 791ff18381a246f2b30c0de30438b6f415e301a7 Mon Sep 17 00:00:00 2001
From: Eloff <eloff@mail.ru>
Date: Thu, 4 Apr 2019 23:17:01 +0300
Subject: [PATCH 0976/1938] 'hf mf sim' - bugs fix, refactoring

---
 armsrc/iso14443a.c  | 192 ++++++++++++++++++++++++++------------------
 armsrc/mifareutil.c |   8 +-
 armsrc/mifareutil.h |   5 ++
 3 files changed, 124 insertions(+), 81 deletions(-)

diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 7da7ef8e5..bca6b4c1f 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -2317,7 +2317,7 @@ int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, bool send_chaining, void *data, u
             *res = data_bytes[0];
 
         // crc check
-        if (len >= 3 && !check_crc(CRC_14443_A, data_bytes, len)) {
+        if (len >= 3 && !CheckCrc14A(data_bytes, len)) {
             return -1;
         }
 
@@ -2979,6 +2979,7 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
 
     int cardSTATE = MFEMUL_NOFIELD;
     int _UID_LEN = 0;  // 4, 7, 10
+    int _SECTORS = 16;  // 16, 32, 40 
     int vHf = 0;    // in mV
     int res = 0;
     uint32_t selTimer = 0;
@@ -2996,6 +2997,7 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
     pcs = &mpcs;
     uint32_t numReads = 0;    // Counts numer of times reader read a block
     uint8_t receivedCmd[MAX_MIFARE_FRAME_SIZE] = {0x00};
+    uint8_t decryptedCmd[MAX_MIFARE_FRAME_SIZE] = {0x00};
     uint8_t receivedCmd_par[MAX_MIFARE_PARITY_SIZE] = {0x00};
     uint8_t response[MAX_MIFARE_FRAME_SIZE] = {0x00};
     uint8_t response_par[MAX_MIFARE_PARITY_SIZE] = {0x00};
@@ -3012,11 +3014,11 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
 
     // TAG Nonce - Authenticate response
     uint8_t rAUTH_NT[4];
-    uint32_t nonce = prng_successor(GetTickCount(), 32);
-    num_to_bytes(nonce, 4, rAUTH_NT);
+    uint8_t rAUTH_NT_keystream[4];
+    uint32_t nonce = 0;
 
     // uint8_t rAUTH_NT[] = {0x55, 0x41, 0x49, 0x92};// nonce from nested? why this?
-    uint8_t rAUTH_AT[] = {0x00, 0x00, 0x00, 0x00};
+    // uint8_t rAUTH_AT[] = {0x00, 0x00, 0x00, 0x00};
 
     // Here, we collect CUID, NT, NR, AR, CUID2, NT2, NR2, AR2
     // This can be used in a reader-only attack.
@@ -3113,9 +3115,9 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
             break;
     }
     // calc some crcs
-    compute_crc(CRC_14443_A, sak_4, 1, &sak_4[1], &sak_4[2]);
-    compute_crc(CRC_14443_A, sak_7, 1, &sak_7[1], &sak_7[2]);
-    compute_crc(CRC_14443_A, sak_10, 1, &sak_10[1], &sak_10[2]);
+    AddCrc14A(sak_4, sizeof(sak_4) - 2);
+    AddCrc14A(sak_7, sizeof(sak_7) - 2);
+    AddCrc14A(sak_10, sizeof(sak_10) - 2);
 
     // We need to listen to the high-frequency, peak-detected path.
     iso14443a_setup(FPGA_HF_ISO14443A_TAGSIM_LISTEN);
@@ -3160,6 +3162,8 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
             crypto1_destroy(pcs);
             cardAUTHKEY = 0xff;
             nonce = prng_successor(selTimer, 32);
+            num_to_bytes(nonce, 4, rAUTH_NT);
+            num_to_bytes(cuid ^ nonce, 4, rAUTH_NT_keystream);
             continue;
         }
 
@@ -3338,12 +3342,9 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
                                  , prng_successor(nonce, 64)
                                 );
                     }
-                    // Shouldn't we respond anything here?
-                    // Right now, we don't nack or anything, which causes the
-                    // reader to do a WUPA after a while. /Martin
-                    // -- which is the correct response. /piwi
+                    // sends encrypted NACK response to do no wait timeout
                     cardSTATE_TO_IDLE();
-                    LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                    EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
                     break;
                 }
 
@@ -3377,16 +3378,33 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
                     break;
                 }
                 bool encrypted_data = (cardAUTHKEY != 0xFF) ;
+                uint8_t *pRecvCmd = receivedCmd;
 
-                if (encrypted_data)
-                    mf_crypto1_decrypt(pcs, receivedCmd, len);
+                if (encrypted_data) {
+                    // decrypt request to separate buffer, trace log saves encrypted source sequence
+                    mf_crypto1_decryptEx(pcs, receivedCmd, len, decryptedCmd);
+                    pRecvCmd = decryptedCmd;
+                }
 
-                if (len == 4 && (receivedCmd[0] == MIFARE_AUTH_KEYA ||
-                                 receivedCmd[0] == MIFARE_AUTH_KEYB)) {
+                uint8_t block = 0;
+                uint8_t sector = 0;
+
+                if (len == 4 && (pRecvCmd[0] == MIFARE_AUTH_KEYA ||
+                                 pRecvCmd[0] == MIFARE_AUTH_KEYB)) {
+
+                    // received block -> sector
+                    block = pRecvCmd[1];
+                    sector = MifareBlockToSector(block);
+
+                    if (cardAUTHSC >= _SECTORS) {
+                        EmSend4bit(encrypted_data ? mf_crypto1_encrypt4bit(pcs, CARD_NACK_IV) : CARD_NACK_IV);
+                        if (MF_DBGLEVEL >= 4) Dbprintf("Reader tried to operate (0x%02) on out of range block: %d (0x%02x), nacking", pRecvCmd[0], block, block);
+                        break;
+                    }
 
                     authTimer = GetTickCount();
-                    cardAUTHSC = receivedCmd[1] / 4;  // received block -> sector
-                    cardAUTHKEY = receivedCmd[0] & 0x1;
+                    cardAUTHSC = sector;
+                    cardAUTHKEY = pRecvCmd[0] & 0x1;
                     crypto1_destroy(pcs);
 
                     // load key into crypto
@@ -3396,62 +3414,92 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
                         // first authentication
                         // Update crypto state init  (UID ^ NONCE)
                         crypto1_word(pcs, cuid ^ nonce, 0);
-                        num_to_bytes(nonce, 4, rAUTH_AT);
+                        EmSendCmd(rAUTH_NT, sizeof(rAUTH_NT));
                     } else {
                         // nested authentication
-                        ans = nonce ^ crypto1_word(pcs, cuid ^ nonce, 0);
+                        /*
+                        ans = nonce ^ crypto1_word(pcs, cuid ^ nonce, 0)
                         num_to_bytes(ans, 4, rAUTH_AT);
+                        */
+                        mf_crypto1_encryptEx(pcs, rAUTH_NT, rAUTH_NT_keystream, response, 4, response_par);
+                        EmSendCmdPar(response, 4, response_par);
 
-                        if (MF_DBGLEVEL >= 3) Dbprintf("Reader doing nested authentication for block %d (0x%02x) with key %c", receivedCmd[1], receivedCmd[1],     cardAUTHKEY == 0 ? 'A' : 'B');
+                        if (MF_DBGLEVEL >= 3) Dbprintf("Reader doing nested authentication for block %d (0x%02x) with key %c", block, block,     cardAUTHKEY == 0 ? 'A' : 'B');
                     }
 
-                    EmSendCmd(rAUTH_AT, sizeof(rAUTH_AT));
                     cardSTATE = MFEMUL_AUTH1;
                     break;
                 }
 
                 // rule 13 of 7.5.3. in ISO 14443-4. chaining shall be continued
                 // BUT... ACK --> NACK
-                if (len == 1 && receivedCmd[0] == CARD_ACK) {
-                    EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
+                if (len == 1 && pRecvCmd[0] == CARD_ACK) {
+                    EmSend4bit(encrypted_data ? mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA) : CARD_NACK_NA);
                     break;
                 }
 
                 // rule 12 of 7.5.3. in ISO 14443-4. R(NAK) --> R(ACK)
-                if (len == 1 && receivedCmd[0] == CARD_NACK_NA) {
-                    EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_ACK));
+                if (len == 1 && pRecvCmd[0] == CARD_NACK_NA) {
+                    EmSend4bit(encrypted_data ? mf_crypto1_encrypt4bit(pcs, CARD_ACK) : CARD_ACK);
                     break;
                 }
 
-                if (len != 4) {
+                // halt
+                if (len > 1 && pRecvCmd[0] == ISO14443A_CMD_HALT && pRecvCmd[1] == 0x00) {
+                    LED_B_OFF();
+                    LED_C_OFF();
+                    cardSTATE = MFEMUL_HALTED;
+                    if (MF_DBGLEVEL >= 4)    Dbprintf("--> HALTED. Selected time: %d ms",  GetTickCount() - selTimer);
                     LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                    cardAUTHKEY = 0xff;
                     break;
                 }
 
-                if (receivedCmd[0] == ISO14443A_CMD_READBLOCK ||
-                        receivedCmd[0] == ISO14443A_CMD_WRITEBLOCK ||
-                        receivedCmd[0] == MIFARE_CMD_INC ||
-                        receivedCmd[0] == MIFARE_CMD_DEC ||
-                        receivedCmd[0] == MIFARE_CMD_RESTORE ||
-                        receivedCmd[0] == MIFARE_CMD_TRANSFER) {
+                // RATS
+                if (pRecvCmd[0] == ISO14443A_CMD_RATS) {
+                    EmSend4bit(encrypted_data ? mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA) : CARD_NACK_NA);
+                    break;
+                }
 
-                    if (receivedCmd[1] >= 16 * 4) {
-                        EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
-                        if (MF_DBGLEVEL >= 4) Dbprintf("Reader tried to operate (0x%02) on out of range block: %d (0x%02x), nacking", receivedCmd[0], receivedCmd[1], receivedCmd[1]);
+                if (pRecvCmd[0] == ISO14443A_CMD_READBLOCK ||
+                        pRecvCmd[0] == ISO14443A_CMD_WRITEBLOCK ||
+                        pRecvCmd[0] == MIFARE_CMD_INC ||
+                        pRecvCmd[0] == MIFARE_CMD_DEC ||
+                        pRecvCmd[0] == MIFARE_CMD_RESTORE ||
+                        pRecvCmd[0] == MIFARE_CMD_TRANSFER) {
+
+                    if (!encrypted_data) {
+                        EmSend4bit(CARD_NACK_NA);
+                        if (MF_DBGLEVEL >= 4) Dbprintf("Reader tried to operate (0x%02) under non-encrypted state, nacking", pRecvCmd[0]);
                         break;
                     }
 
-                    if (receivedCmd[1] / 4 != cardAUTHSC) {
+                    if (len != 4) {
                         EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
-                        if (MF_DBGLEVEL >= 4) Dbprintf("Reader tried to operate (0x%02) on block (0x%02x) not authenticated for (0x%02x), nacking", receivedCmd[0], receivedCmd[1], cardAUTHSC);
+                        if (MF_DBGLEVEL >= 4) Dbprintf("Request (0x%02) has invalid length, nacking", pRecvCmd[0]);
+                        break;
+                    }
+
+                    block = pRecvCmd[1];
+                    sector = MifareBlockToSector(block);
+
+                    if (sector >= _SECTORS) {
+                        EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
+                        if (MF_DBGLEVEL >= 4) Dbprintf("Reader tried to operate (0x%02) on out of range block: %d (0x%02x), nacking", pRecvCmd[0], block, block);
+                        break;
+                    }
+
+                    if (sector != cardAUTHSC) {
+                        EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
+                        if (MF_DBGLEVEL >= 4) Dbprintf("Reader tried to operate (0x%02) on block (0x%02x) not authenticated for (0x%02x) sector, nacking", pRecvCmd[0], block, cardAUTHSC);
                         break;
                     }
                 }
                 // read block
-                if (receivedCmd[0] == ISO14443A_CMD_READBLOCK) {
-                    if (MF_DBGLEVEL >= 4) Dbprintf("Reader reading block %d (0x%02x)", receivedCmd[1], receivedCmd[1]);
+                if (pRecvCmd[0] == ISO14443A_CMD_READBLOCK) {
+                    if (MF_DBGLEVEL >= 4) Dbprintf("Reader reading block %d (0x%02x)", block, block);
 
-                    emlGetMem(response, receivedCmd[1], 1);
+                    emlGetMem(response, block, 1);
                     AddCrc14A(response, 16);
                     mf_crypto1_encrypt(pcs, response, 18, response_par);
                     EmSendCmdPar(response, 18, response_par);
@@ -3463,64 +3511,50 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
                     break;
                 }
                 // write block
-                if (receivedCmd[0] == ISO14443A_CMD_WRITEBLOCK) {
-                    if (MF_DBGLEVEL >= 4) Dbprintf("RECV 0xA0 write block %d (%02x)", receivedCmd[1], receivedCmd[1]);
+                if (pRecvCmd[0] == ISO14443A_CMD_WRITEBLOCK) {
+                    if (MF_DBGLEVEL >= 4) Dbprintf("RECV 0xA0 write block %d (%02x)", block, block);
                     EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_ACK));
                     cardSTATE = MFEMUL_WRITEBL2;
-                    cardWRBL = receivedCmd[1];
+                    cardWRBL = block;
                     break;
                 }
                 // increment, decrement, restore
-                if (receivedCmd[0] == MIFARE_CMD_INC ||
-                        receivedCmd[0] == MIFARE_CMD_DEC ||
-                        receivedCmd[0] == MIFARE_CMD_RESTORE) {
+                if (pRecvCmd[0] == MIFARE_CMD_INC ||
+                        pRecvCmd[0] == MIFARE_CMD_DEC ||
+                        pRecvCmd[0] == MIFARE_CMD_RESTORE) {
 
-                    if (MF_DBGLEVEL >= 4) Dbprintf("RECV 0x%02x inc(0xC1)/dec(0xC0)/restore(0xC2) block %d (%02x)", receivedCmd[0], receivedCmd[1], receivedCmd[1]);
+                    if (MF_DBGLEVEL >= 4) Dbprintf("RECV 0x%02x inc(0xC1)/dec(0xC0)/restore(0xC2) block %d (%02x)", pRecvCmd[0], block, block);
 
-                    if (emlCheckValBl(receivedCmd[1])) {
+                    if (emlCheckValBl(block)) {
                         if (MF_DBGLEVEL >= 4) Dbprintf("Reader tried to operate on block, but emlCheckValBl failed, nacking");
                         EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
                         break;
                     }
                     EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_ACK));
-                    if (receivedCmd[0] == MIFARE_CMD_INC)        cardSTATE = MFEMUL_INTREG_INC;
-                    if (receivedCmd[0] == MIFARE_CMD_DEC)        cardSTATE = MFEMUL_INTREG_DEC;
-                    if (receivedCmd[0] == MIFARE_CMD_RESTORE)    cardSTATE = MFEMUL_INTREG_REST;
-                    cardWRBL = receivedCmd[1];
+                    if (pRecvCmd[0] == MIFARE_CMD_INC)        cardSTATE = MFEMUL_INTREG_INC;
+                    if (pRecvCmd[0] == MIFARE_CMD_DEC)        cardSTATE = MFEMUL_INTREG_DEC;
+                    if (pRecvCmd[0] == MIFARE_CMD_RESTORE)    cardSTATE = MFEMUL_INTREG_REST;
+                    cardWRBL = block;
                     break;
                 }
                 // transfer
-                if (receivedCmd[0] == MIFARE_CMD_TRANSFER) {
-                    if (MF_DBGLEVEL >= 4) Dbprintf("RECV 0x%02x transfer block %d (%02x)", receivedCmd[0], receivedCmd[1], receivedCmd[1]);
-                    if (emlSetValBl(cardINTREG, cardINTBLOCK, receivedCmd[1]))
+                if (pRecvCmd[0] == MIFARE_CMD_TRANSFER) {
+                    if (MF_DBGLEVEL >= 4) Dbprintf("RECV 0x%02x transfer block %d (%02x)", pRecvCmd[0], block, block);
+                    if (emlSetValBl(cardINTREG, cardINTBLOCK, block))
                         EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
                     else
                         EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_ACK));
                     break;
                 }
-                // halt
-                if (receivedCmd[0] == ISO14443A_CMD_HALT && receivedCmd[1] == 0x00) {
-                    LED_B_OFF();
-                    LED_C_OFF();
-                    cardSTATE = MFEMUL_HALTED;
-                    if (MF_DBGLEVEL >= 4)    Dbprintf("--> HALTED. Selected time: %d ms",  GetTickCount() - selTimer);
-                    LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
-                    break;
-                }
-                // RATS
-                if (receivedCmd[0] == ISO14443A_CMD_RATS) {
-                    EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
-                    break;
-                }
                 // command not allowed
                 if (MF_DBGLEVEL >= 4)    Dbprintf("Received command not allowed, nacking");
-                EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
+                EmSend4bit(encrypted_data ? mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA) : CARD_NACK_NA);
                 break;
             }
             case MFEMUL_WRITEBL2: {
                 if (len == 18) {
-                    mf_crypto1_decrypt(pcs, receivedCmd, len);
-                    emlSetMem(receivedCmd, cardWRBL, 1);
+                    mf_crypto1_decryptEx(pcs, receivedCmd, len, decryptedCmd);
+                    emlSetMem(decryptedCmd, cardWRBL, 1);
                     EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_ACK));
                     cardSTATE = MFEMUL_WORK;
                 } else {
@@ -3530,8 +3564,8 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
                 break;
             }
             case MFEMUL_INTREG_INC: {
-                mf_crypto1_decrypt(pcs, receivedCmd, len);
-                memcpy(&ans, receivedCmd, 4);
+                mf_crypto1_decryptEx(pcs, receivedCmd, len, decryptedCmd);
+                memcpy(&ans, decryptedCmd, 4);
                 if (emlGetValBl(&cardINTREG, &cardINTBLOCK, cardWRBL)) {
                     EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
                     cardSTATE_TO_IDLE();
@@ -3543,8 +3577,8 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
                 break;
             }
             case MFEMUL_INTREG_DEC: {
-                mf_crypto1_decrypt(pcs, receivedCmd, len);
-                memcpy(&ans, receivedCmd, 4);
+                mf_crypto1_decryptEx(pcs, receivedCmd, len, decryptedCmd);
+                memcpy(&ans, decryptedCmd, 4);
                 if (emlGetValBl(&cardINTREG, &cardINTBLOCK, cardWRBL)) {
                     EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
                     cardSTATE_TO_IDLE();
@@ -3556,8 +3590,8 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
                 break;
             }
             case MFEMUL_INTREG_REST: {
-                mf_crypto1_decrypt(pcs, receivedCmd, len);
-                memcpy(&ans, receivedCmd, 4);
+                mf_crypto1_decryptEx(pcs, receivedCmd, len, decryptedCmd);
+                memcpy(&ans, decryptedCmd, 4);
                 if (emlGetValBl(&cardINTREG, &cardINTBLOCK, cardWRBL)) {
                     EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
                     cardSTATE_TO_IDLE();
diff --git a/armsrc/mifareutil.c b/armsrc/mifareutil.c
index 01f56f776..4cb3bd9ea 100644
--- a/armsrc/mifareutil.c
+++ b/armsrc/mifareutil.c
@@ -35,13 +35,17 @@ void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len) {
 }
 
 void mf_crypto1_encrypt(struct Crypto1State *pcs, uint8_t *data, uint16_t len, uint8_t *par) {
+    mf_crypto1_encryptEx(pcs, data, NULL, data, len, par);
+}
+
+void mf_crypto1_encryptEx(struct Crypto1State *pcs, uint8_t *data_in, uint8_t *keystream, uint8_t *data_out, uint16_t len, uint8_t *par) {
     uint8_t bt = 0;
     int i;
     par[0] = 0;
 
     for (i = 0; i < len; i++) {
-        bt = data[i];
-        data[i] = crypto1_byte(pcs, 0x00, 0) ^ data[i];
+        bt = data_in[i];
+        data_out[i] = crypto1_byte(pcs, keystream ? keystream[i] : 0x00, 0) ^ data_in[i];
         if ((i & 0x0007) == 0)
             par[ i >> 3 ] = 0;
         par[ i >> 3 ] |= (((filter(pcs->odd) ^ oddparity8(bt)) & 0x01) << (7 - (i & 0x0007)));
diff --git a/armsrc/mifareutil.h b/armsrc/mifareutil.h
index 971ba77f9..62cc1bbff 100644
--- a/armsrc/mifareutil.h
+++ b/armsrc/mifareutil.h
@@ -57,6 +57,10 @@
 
 #define cardSTATE_TO_IDLE() cardSTATE = MFEMUL_IDLE; LED_B_OFF(); LED_C_OFF();
 
+#ifndef MifareBlockToSector
+#define MifareBlockToSector(block) (block < 128 ? block / 4 : (block - 128) / 16 + 32)
+#endif
+
 //functions
 int mifare_sendcmd(uint8_t cmd, uint8_t *data, uint8_t data_size, uint8_t *answer, uint8_t *answer_parity, uint32_t *timing);
 int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t data, uint8_t *answer, uint8_t *answer_parity, uint32_t *timing);
@@ -87,6 +91,7 @@ int mifare_desfire_des_auth2(uint32_t uid, uint8_t *key, uint8_t *blockData);
 void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *receivedCmd, int len);
 void mf_crypto1_decryptEx(struct Crypto1State *pcs, uint8_t *data_in, int len, uint8_t *data_out);
 void mf_crypto1_encrypt(struct Crypto1State *pcs, uint8_t *data, uint16_t len, uint8_t *par);
+void mf_crypto1_encryptEx(struct Crypto1State *pcs, uint8_t *data_in, uint8_t *keystream, uint8_t *data_out, uint16_t len, uint8_t *par);
 uint8_t mf_crypto1_encrypt4bit(struct Crypto1State *pcs, uint8_t data);
 
 // Mifare memory structure

From 463661869ad49ee8a797d5aff153b980bc2b6038 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 4 Apr 2019 23:32:47 +0200
Subject: [PATCH 0977/1938] clean uo

---
 common/lfdemod.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/common/lfdemod.c b/common/lfdemod.c
index 93ae2266f..bd51a29b4 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -1614,16 +1614,14 @@ int askdemod(uint8_t *bits, size_t *size, int *clk, int *invert, int maxErr, uin
 // by marshmellow - demodulate NRZ wave - requires a read with strong signal
 // peaks invert bit (high=1 low=0) each clock cycle = 1 bit determined by last peak
 int nrzRawDemod(uint8_t *dest, size_t *size, int *clk, int *invert, int *startIdx) {
+
     if (signalprop.isnoise) return -1;
 
     size_t clkStartIdx = 0;
     *clk = DetectNRZClock(dest, *size, *clk, &clkStartIdx);
     if (*clk == 0) return -2;
 
-    size_t i, gLen = 4096;
-    if (gLen > *size)
-        gLen = *size - 20;
-
+    size_t i;
 
     // just noise - no super good detection. good enough
     if (signalprop.isnoise) {
@@ -1632,7 +1630,7 @@ int nrzRawDemod(uint8_t *dest, size_t *size, int *clk, int *invert, int *startId
     }
 
     int high, low;
-    //getHiLo(dest, gLen, &high, &low, 75, 75);
+
     getHiLo(&high, &low, 75, 75);
     getHiLo(&high, &low, 75, 75);
 

From 287a9dd20466e402682898a696a89589075ee8d0 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 4 Apr 2019 23:42:02 +0200
Subject: [PATCH 0978/1938] chg: 'data raw nr' - cleanup

---
 common/lfdemod.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/common/lfdemod.c b/common/lfdemod.c
index bd51a29b4..cfac0a0b5 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -1615,20 +1615,16 @@ int askdemod(uint8_t *bits, size_t *size, int *clk, int *invert, int maxErr, uin
 // peaks invert bit (high=1 low=0) each clock cycle = 1 bit determined by last peak
 int nrzRawDemod(uint8_t *dest, size_t *size, int *clk, int *invert, int *startIdx) {
 
-    if (signalprop.isnoise) return -1;
-
+    if (signalprop.isnoise) {
+        if (g_debugMode == 2) prnt("DEBUG nrzRawDemod: just noise detected - quitting");
+        return -1;
+    }
+    
     size_t clkStartIdx = 0;
     *clk = DetectNRZClock(dest, *size, *clk, &clkStartIdx);
     if (*clk == 0) return -2;
 
     size_t i;
-
-    // just noise - no super good detection. good enough
-    if (signalprop.isnoise) {
-        if (g_debugMode == 2) prnt("DEBUG nrzRawDemod: just noise detected - quitting");
-        return -3;
-    }
-
     int high, low;
 
     getHiLo(&high, &low, 75, 75);
@@ -1673,7 +1669,7 @@ size_t fsk_wave_demod(uint8_t *dest, size_t size, uint8_t fchigh, uint8_t fclow,
     size_t LastSample = 0;
     size_t currSample = 0;
     size_t last_transition = 0;
-    size_t idx = 1;
+    size_t idx;
     size_t numBits = 0;
 
     //find start of modulating data in trace

From 444c12717cd70e1b337c1b171ce1099ae342166f Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 4 Apr 2019 23:45:58 +0200
Subject: [PATCH 0979/1938] clarify

---
 client/tinycbor/cbortojson.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/client/tinycbor/cbortojson.c b/client/tinycbor/cbortojson.c
index 533e6a721..3ea90cee8 100644
--- a/client/tinycbor/cbortojson.c
+++ b/client/tinycbor/cbortojson.c
@@ -284,8 +284,7 @@ static CborError add_value_metadata(FILE *out, CborType type, const ConversionSt
         type = flags & FinalTypeMask;
         flags &= ~(FinalTypeMask | TypeWasTagged);
 
-        if (fprintf(out, "\"tag\":\"%" PRIu64 "\"%s", status->lastTag,
-                    flags & ~TypeWasTagged ? "," : "") < 0)
+        if (fprintf(out, "\"tag\":\"%" PRIu64 "\"%s", status->lastTag, (flags & ~TypeWasTagged) ? "," : "") < 0)
             return CborErrorIO;
     }
 
@@ -300,11 +299,10 @@ static CborError add_value_metadata(FILE *out, CborType type, const ConversionSt
         if (fprintf(out, ",\"v\":\"nan\"") < 0)
             return CborErrorIO;
     if (flags & NumberWasInfinite)
-        if (fprintf(out, ",\"v\":\"%sinf\"", flags & NumberWasNegative ? "-" : "") < 0)
+        if (fprintf(out, ",\"v\":\"%sinf\"", (flags & NumberWasNegative) ? "-" : "") < 0)
             return CborErrorIO;
     if (flags & NumberPrecisionWasLost)
-        if (fprintf(out, ",\"v\":\"%c%" PRIx64 "\"", flags & NumberWasNegative ? '-' : '+',
-                    status->originalNumber) < 0)
+        if (fprintf(out, ",\"v\":\"%c%" PRIx64 "\"", (flags & NumberWasNegative) ? '-' : '+', status->originalNumber) < 0)
             return CborErrorIO;
     if (type == CborSimpleType)
         if (fprintf(out, ",\"v\":%d", (int)status->originalNumber) < 0)

From 4326d05674fa593d6ceb5d27c32c3bb1b87c33b6 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 4 Apr 2019 23:48:00 +0200
Subject: [PATCH 0980/1938] clarify

---
 client/tinycbor/cborinternal_p.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/tinycbor/cborinternal_p.h b/client/tinycbor/cborinternal_p.h
index 8609ce2ad..65c42cdf4 100644
--- a/client/tinycbor/cborinternal_p.h
+++ b/client/tinycbor/cborinternal_p.h
@@ -87,7 +87,7 @@ static inline double decode_half(unsigned short half) {
     if (exp == 0) val = ldexp(mant, -24);
     else if (exp != 31) val = ldexp(mant + 1024, exp - 25);
     else val = mant == 0 ? INFINITY : NAN;
-    return half & 0x8000 ? -val : val;
+    return (half & 0x8000) ? -val : val;
 }
 #  endif
 #endif /* CBOR_NO_HALF_FLOAT_TYPE */

From ad97aa3d29178234f6a7da0bb28bfbe841db998d Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 5 Apr 2019 00:08:36 +0200
Subject: [PATCH 0981/1938] chg: 'hf iclass sim' - void*, should be uin8_t*

---
 client/cmdhficlass.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index edc15df74..c25bebdd3 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -405,7 +405,7 @@ int CmdHFiClassSim(const char *Cmd) {
                 break;
 
             size_t datalen = NUM_CSNS * 24;
-            void *dump = calloc(datalen, sizeof(uint8_t));
+            uint8_t *dump = calloc(datalen, sizeof(uint8_t));
             if (!dump) {
                 PrintAndLogEx(WARNING, "Failed to allocate memory");
                 return 2;
@@ -458,7 +458,7 @@ int CmdHFiClassSim(const char *Cmd) {
                 break;
 
             size_t datalen = NUM_CSNS * 24;
-            void *dump = calloc(datalen, sizeof(uint8_t));
+            uint8_t *dump = calloc(datalen, sizeof(uint8_t));
             if (!dump) {
                 PrintAndLogEx(WARNING, "Failed to allocate memory");
                 return 2;

From bc11ff88ea67d779b428a01386b4adca65b9132c Mon Sep 17 00:00:00 2001
From: vratiskol <vincent.ratiskol@github.com>
Date: Fri, 5 Apr 2019 03:58:15 +0200
Subject: [PATCH 0982/1938] Add Encrypted data test

---
 armsrc/mifaresim.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/armsrc/mifaresim.c b/armsrc/mifaresim.c
index 3ab0c2d8a..8c8d18c4d 100644
--- a/armsrc/mifaresim.c
+++ b/armsrc/mifaresim.c
@@ -743,7 +743,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                 }
 
                 if (!HasValidCRC(receivedCmd_dec, receivedCmd_len)) { // all commands must have a valid CRC
-                    EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
+                    EmSend4bit(encrypted_data ? mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA) : CARD_NACK_NA);
                     if (MF_DBGLEVEL >= MF_DBG_ALL) Dbprintf("[MFEMUL_WORK] All commands must have a valid CRC %02X (%d)", receivedCmd_dec, receivedCmd_len);
                     break;
                 }
@@ -804,13 +804,13 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                 // rule 13 of 7.5.3. in ISO 14443-4. chaining shall be continued
                 // BUT... ACK --> NACK
                 if (receivedCmd_len == 1 && receivedCmd_dec[0] == CARD_ACK) {
-                    EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
+                    EmSend4bit(encrypted_data ? mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA) : CARD_NACK_NA);
                     break;
                 }
 
                 // rule 12 of 7.5.3. in ISO 14443-4. R(NAK) --> R(ACK)
                 if (receivedCmd_len == 1 && receivedCmd_dec[0] == CARD_NACK_NA) {
-                    EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_ACK));
+                    EmSend4bit(encrypted_data ? mf_crypto1_encrypt4bit(pcs, CARD_ACK) : CARD_ACK);
                     break;
                 }
 
@@ -973,15 +973,15 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
 
                 // case MFEMUL_WORK => CMD RATS
                 if (receivedCmd[0] == ISO14443A_CMD_RATS) {
-                    EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
+                    EmSend4bit(encrypted_data ? mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA) : CARD_NACK_NA);
                     if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("[MFEMUL_WORK] RCV RATS => NACK");
                     break;
                 }
 
                 // case MFEMUL_WORK => command not allowed
-                // if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("Received command not allowed, nacking");
-                // EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
-                // break;
+                if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("Received command not allowed, nacking");
+                EmSend4bit(encrypted_data ? mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA) : CARD_NACK_NA);
+                break;
             }
 
             // AUTH1
@@ -1074,8 +1074,9 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                                 );
                     }
                     cardAUTHKEY = AUTHKEYNONE;	// not authenticated
-                    LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                    // LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
                     cardSTATE_TO_IDLE();
+                    EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
                     break;
                 }
 

From 7f198192ec6596def6d300ea0fa5b744145a9cde Mon Sep 17 00:00:00 2001
From: vratiskol <vincent.ratiskol@github.com>
Date: Fri, 5 Apr 2019 04:09:20 +0200
Subject: [PATCH 0983/1938] ReSync file

---
 client/cmdlffdx.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/cmdlffdx.c b/client/cmdlffdx.c
index bc1f1e9dc..972ef9627 100644
--- a/client/cmdlffdx.c
+++ b/client/cmdlffdx.c
@@ -160,7 +160,7 @@ int getFDXBits(uint64_t national_id, uint16_t country, uint8_t isanimal, uint8_t
 int CmdFDXBdemodBI(const char *Cmd) {
 
     int clk = 32;
-    int invert = 1, errCnt = 0, offset = 0, maxErr = 0;
+    int invert = 1, errCnt = 0, offset = 0, maxErr = 100;
     uint8_t bs[MAX_DEMOD_BUF_LEN];
     size_t size = getFromGraphBuf(bs);
 
@@ -236,7 +236,7 @@ int CmdFdxDemod(const char *Cmd) {
 
     //Differential Biphase / di-phase (inverted biphase)
     //get binary from ask wave
-    if (!ASKbiphaseDemod("0 32 1 0", false)) {
+    if (!ASKbiphaseDemod("0 32 1 100", false)) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - FDX-B ASKbiphaseDemod failed");
         return 0;
     }

From 1a565ae953583fe5a45149cee3a28174e9a52883 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 5 Apr 2019 07:39:07 +0200
Subject: [PATCH 0984/1938] fix uninitialised

---
 client/scripting.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/client/scripting.c b/client/scripting.c
index f3afb18d4..cf9b5c590 100644
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -785,8 +785,7 @@ static int l_T55xx_readblock(lua_State *L) {
 // arg 2 = use GB
 static int l_T55xx_detect(lua_State *L) {
     bool useGB = false, usepwd = false, isok;
-    uint32_t password;
-    uint32_t gb;
+    uint32_t gb, password = 0;
     size_t size;
     
     //Check number of arguments

From a499e30608bc716f878674ee4fbee3e3e20eb6fe Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 5 Apr 2019 08:21:10 +0200
Subject: [PATCH 0985/1938] chg: 'script run test_t55x7' - more modulations and
 better wipe card

---
 client/scripts/test_t55x7.lua | 185 +++++++++++++++++++++++++++-------
 1 file changed, 146 insertions(+), 39 deletions(-)

diff --git a/client/scripts/test_t55x7.lua b/client/scripts/test_t55x7.lua
index 3b7ea2e02..0d89147c6 100644
--- a/client/scripts/test_t55x7.lua
+++ b/client/scripts/test_t55x7.lua
@@ -89,23 +89,134 @@ local function exitMsg(msg)
     print(msg)
     print()
 end
+---
+-- ask/fsk/psk configuration blocks to test
+local function GetConfigs( modulation )
 
+    local t = {}
+    
+    t['ASK'] = {
+                [1] = '00008040',
+                [2] = '00048040', 
+                [3] = '00088040',
+                [4] = '000c8040',
+                [5] = '00108040',
+                [6] = '00148040',
+                [7] = '00188040',
+                [8] = '001c8040',
+            }
+            
+    t['BI'] = {
+                [1] = '00010040',
+                [2] = '00050040',
+                [3] = '00090040',
+                [4] = '000d0040',
+                [5] = '00110040',
+                [6] = '00150040',
+                [7] = '00190040',
+                [8] = '001d0040',
+            }
+            
+    t['FSK2A'] = {
+                [1] = '00007040',
+                [2] = '00047040',
+                [3] = '00087040',
+                [4] = '000c7040',
+                [5] = '00107040',
+                [6] = '00147040',
+                [7] = '00187040',
+                [8] = '001c7040',
+            }
+            
+    t['FSK1A'] = {
+                [1] = '00006040',
+                [2] = '00046040',
+                [3] = '00086040',
+                [4] = '000c6040',
+                [5] = '00106040',
+                [6] = '00146040',
+                [7] = '00186040',
+                [8] = '001c6040',
+            }
+            
+    t['FSK2'] = {
+                [1] = '00005040',
+                [2] = '00045040',
+                [3] = '00085040',
+                [4] = '000c5040',
+                [5] = '00105040',
+                [6] = '00145040',
+                [7] = '00185040',
+                [8] = '001c5040',
+            }
+            
+    t['FSK1'] = {
+                [1] = '00004040',
+                [2] = '00004040',
+                [3] = '00044040',
+                [4] = '00084040',
+                [5] = '000c4040',
+                [6] = '00104040',
+                [7] = '00144040',
+                [8] = '00184040',
+                [9] = '001c4040',
+            }
+            
+    t['PSK1'] = {
+                [1] = '00001040',
+                [2] = '00041040', 
+                [3] = '00081040',
+                [4] = '000c1040',
+                [5] = '00101040',
+                [6] = '00141040',
+                [7] = '00181040',
+                [8] = '001c1040',
+            }
+
+    t['PSK2'] = {
+                [1] = '00002040',
+                [2] = '00042040',
+                [3] = '00082040',
+                [4] = '000c2040',
+                [5] = '00102040',
+                [6] = '00142040',
+                [7] = '00182040',
+                [8] = '001c2040',
+            }
+            
+    t['PSK3'] = {
+                [1] = '00003040',
+                [2] = '00043040',
+                [3] = '00083040',
+                [4] = '000c3040',
+                [5] = '00103040',
+                [6] = '00143040',
+                [7] = '00183040',
+                [8] = '001c3040',
+        }
+    return t[modulation]
+end
+---
+-- lf t55xx wipe
 local function WipeCard()
 
-   local wipe_cmds = {
-        [1] = 'lf t55xx wipe',
-        [2] = 'lf t55xx detect',
-   }
-    for _ = 1, #wipe_cmds do
-        local c = wipe_cmds[_]
-        dbg(c);  core.console(c)
-    end
+    print('Wiping card')
+    core.console('lf t55xx wipe')
     
-    local wipe_data_cmd = "lf t55xx write b %s d %s"
-    for _ = 1, #data_blocks_cmds do
-        local val = data_blocks_cmds[_]
-        local c = string.format(wipe_data_cmd, _, val);
-        core.console(c)
+    print('Detecting card'); 
+    local res, msg = core.t55xx_detect()
+    if not res then 
+        oops("can't detect modulation. Test failed."); 
+        core.console("rem Failed to detect");
+        return false
+    else
+        local wipe_data_cmd = "lf t55xx write b %s d %s"
+        for _ = 1, #data_blocks_cmds do
+            local val = data_blocks_cmds[_]
+            local c = string.format(wipe_data_cmd, _, val);
+            core.console(c)
+        end
+        return true
     end
 end
 ---
@@ -120,23 +231,18 @@ local function CheckReadBlock(block)
     return ('%08X'):format(data)
 end
 
-local function test()
+local function test(modulation)
     
-    -- PSK1 Modulations to test.  (2blocks)
-    local process_block0_cmds = {
-        [1] = '00001040',
-        [2] = '00041040', 
-        [3] = '00081040',
-        [4] = '000c1040',
-        [5] = '00101040',
-        [6] = '00141040',
-        [7] = '00181040',
-        [8] = '001c1040',
-    }
-
+    local process_block0_cmds = {}
     local y
     local block = "00"
-
+    
+    local s = ('Start test of %s'):format(modulation)
+    print(s)
+    core.console('rem '..s)
+    
+    process_block0_cmds = GetConfigs(modulation)
+    
     for _ = 1, #process_block0_cmds do
     
         local p_config_cmd = process_block0_cmds[_]
@@ -181,19 +287,20 @@ local function main(args)
     end
 
     core.clearCommandBuffer()
-
-    print('Starting test,  wiping card')
-    WipeCard()
-    print('Detecting card')
-    local res, msg = core.t55xx_detect()
-    if res then
-        print('Starting test')
-        test()
-    else
-        print("can't detect modulation. Test failed. Ending.")
-    end
+    local res
     
---    test()
+    res = WipeCard()
+    if res then test("ASK") end
+
+--    res = WipeCard()
+--    if res then test("FSK1") end
+
+--    res = WipeCard()
+--    if res then test("FSK2") end
+
+--    res = WipeCard()
+--    if res then test("PSK1") end    
+
     exitMsg('Tests finished')
     
 end

From 229452719a09753382ee3239c7611be3a11a1afd Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 5 Apr 2019 08:36:12 +0200
Subject: [PATCH 0986/1938] chg: compare with low case

---
 client/scripts/test_t55x7.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/scripts/test_t55x7.lua b/client/scripts/test_t55x7.lua
index 0d89147c6..c1cbd214e 100644
--- a/client/scripts/test_t55x7.lua
+++ b/client/scripts/test_t55x7.lua
@@ -265,7 +265,7 @@ local function test(modulation)
             for _ = 1, #data_blocks_cmds do
                 local val = data_blocks_cmds[_]
                 local blockdata, msg = CheckReadBlock(_)
-                if blockdata ~= val then
+                if blockdata:lower() ~= val:lower() then
                     print( ('Test %s == %s Failed'):format(val, blockdata))
                     core.console( format('rem -- block %d  value %s failed', _, val))
                 else

From 6dae35fc9e3e12ca028b945d428e5ec48a64a8af Mon Sep 17 00:00:00 2001
From: "m.elov" <m.elov@bftcom.com>
Date: Fri, 5 Apr 2019 09:51:25 +0300
Subject: [PATCH 0987/1938] changelog for pull requests #144, #145

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bbdb1e03c..ef081137b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,8 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [unreleased][unreleased]
+ - 'hf mf sim' - bugs fix, refactoring (@mceloff)
+ - Mifare Ultralight/NTAG simulation. Add WRITE and COMPATIBLE_WRITE support (@mceloff)
  - *WIP* Add FPC usart with pm3 client: WITH_FPC_HOST. (@doegox)
  - Add '-b baudrate' option to the pm3 client. (@doegox)
  - Change 'lf t55xx info': tell if known configuration block0. (@iceman)

From 774cbc5cb9f4e920988dc78aa1611d12e17532b0 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 5 Apr 2019 08:58:12 +0200
Subject: [PATCH 0988/1938] chg: 'script run test_t55x7' - better test loops

---
 client/scripts/test_t55x7.lua | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/client/scripts/test_t55x7.lua b/client/scripts/test_t55x7.lua
index c1cbd214e..015b578c0 100644
--- a/client/scripts/test_t55x7.lua
+++ b/client/scripts/test_t55x7.lua
@@ -194,7 +194,7 @@ local function GetConfigs( modulation )
                 [7] = '00183040',
                 [8] = '001c3040',
         }
-    return t[modulation]
+    return t[modulation:upper()]
 end
 ---
 -- lf t55xx wipe
@@ -243,6 +243,8 @@ local function test(modulation)
     
     process_block0_cmds = GetConfigs(modulation)
     
+    if process_block0_cmds == nil then return oops('Cant find modulation '..modulation) end
+    
     for _ = 1, #process_block0_cmds do
     
         local p_config_cmd = process_block0_cmds[_]
@@ -289,17 +291,14 @@ local function main(args)
     core.clearCommandBuffer()
     local res
     
-    res = WipeCard()
-    if res then test("ASK") end
-
---    res = WipeCard()
---    if res then test("FSK1") end
-
---    res = WipeCard()
---    if res then test("FSK2") end
-
---    res = WipeCard()
---    if res then test("PSK1") end    
+    -- Adjust this table to set which configurations should be tested
+    local test_modes = { 'ASK', 'PSK1' }
+    
+    for _ = 1, #test_modes do
+        res = WipeCard()
+        print (test_modes[_])
+        if res then test(test_modes[_]) end        
+    end
 
     exitMsg('Tests finished')
     

From 5b0eed26b58249a8566adfd0cdaac7099c4028e0 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 5 Apr 2019 09:14:40 +0200
Subject: [PATCH 0989/1938] style

---
 client/emv/emv_tags.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/emv/emv_tags.c b/client/emv/emv_tags.c
index 605707a65..ee6824b32 100644
--- a/client/emv/emv_tags.c
+++ b/client/emv/emv_tags.c
@@ -537,7 +537,7 @@ static void emv_tag_dump_numeric(const struct tlv *tlv, const struct emv_tag *ta
 
 static void emv_tag_dump_yymmdd(const struct tlv *tlv, const struct emv_tag *tag, FILE *f, int level) {
     PRINT_INDENT(level);
-    fprintf(f, "\tDate: 20%02ld.%ld.%ld\n",
+    fprintf(f, "\tDate: 20%02lu.%lu.%lu\n",
             emv_value_numeric(tlv, 0, 2),
             emv_value_numeric(tlv, 2, 4),
             emv_value_numeric(tlv, 4, 6));
@@ -667,9 +667,9 @@ static void emv_tag_dump_cvm_list(const struct tlv *tlv, const struct emv_tag *t
     Y = emv_get_binary(tlv->value + 4);
 
     PRINT_INDENT(level);
-    fprintf(f, "\tX: %d\n", X);
+    fprintf(f, "\tX: %u\n", X);
     PRINT_INDENT(level);
-    fprintf(f, "\tY: %d\n", Y);
+    fprintf(f, "\tY: %u\n", Y);
 
     for (i = 8; i < tlv->len; i += 2) {
         const char *method;

From 632e80e9b142f9187b7e28c80be1204f9ee607d0 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 5 Apr 2019 09:16:01 +0200
Subject: [PATCH 0990/1938] style

---
 client/hid-flasher/flash.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/hid-flasher/flash.c b/client/hid-flasher/flash.c
index 020be9e87..edfc6b776 100644
--- a/client/hid-flasher/flash.c
+++ b/client/hid-flasher/flash.c
@@ -413,7 +413,7 @@ int flash_write(flash_file_t *ctx) {
         uint32_t blocks = (length + BLOCK_SIZE - 1) / BLOCK_SIZE;
         uint32_t end = seg->start + length;
 
-        fprintf(stderr, " 0x%08x..0x%08x [0x%x / %d blocks]",
+        fprintf(stderr, " 0x%08x..0x%08x [0x%x / %u blocks]",
                 seg->start, end - 1, length, blocks);
 
         int block = 0;
@@ -427,7 +427,7 @@ int flash_write(flash_file_t *ctx) {
 
             if (write_block(baddr, data, block_size) < 0) {
                 fprintf(stderr, " ERROR\n");
-                fprintf(stderr, "Error writing block %d of %d\n", block, blocks);
+                fprintf(stderr, "Error writing block %d of %u\n", block, blocks);
                 return -1;
             }
 

From 647dcc596f40b63bd9f869af3930c51c7b5362a8 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 5 Apr 2019 09:18:52 +0200
Subject: [PATCH 0991/1938] style

---
 client/cmdhfmfu.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index 956cc1a70..ac1391c47 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -1134,8 +1134,6 @@ int CmdHF14AMfUInfo(const char *Cmd) {
         // hasAuthKey,  if we was called with key, skip test.
         if (!authlim && !hasAuthKey) {
             PrintAndLogEx(NORMAL, "\n--- Known EV1/NTAG passwords.");
-            len = 0;
-
             // test pwd gen A
             num_to_bytes(ul_ev1_pwdgenA(card.uid), 4, key);
             len = ulev1_requestAuthentication(key, pack, sizeof(pack));

From 6404c974b63bd730346e46f112eea6d3a441e7c3 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 5 Apr 2019 09:20:37 +0200
Subject: [PATCH 0992/1938] style

---
 client/cmdlfem4x.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index e6da5da33..8d5ebb68b 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -1225,9 +1225,8 @@ int CmdEM4x05Write(const char *Cmd) {
     if (strlen(Cmd) == 0 || ctmp == 'h') return usage_lf_em4x05_write();
 
     bool usePwd = false;
-    uint8_t addr = 50; // default to invalid address
-    uint32_t data = 0; // default to blank data
-    uint32_t pwd = 1; // default to blank password
+    uint8_t addr;
+    uint32_t data, pwd;
 
     addr = param_get8ex(Cmd, 0, 50, 10);
     data = param_get32ex(Cmd, 1, 0, 16);

From 82f4388abed041270627b1eeaed8491447479921 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 5 Apr 2019 09:22:12 +0200
Subject: [PATCH 0993/1938] style

---
 client/hid-flasher/flash.c   | 2 +-
 client/hid-flasher/proxusb.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/hid-flasher/flash.c b/client/hid-flasher/flash.c
index edfc6b776..967888e17 100644
--- a/client/hid-flasher/flash.c
+++ b/client/hid-flasher/flash.c
@@ -180,7 +180,7 @@ static int check_segs(flash_file_t *ctx, int can_write_bl) {
 
 // Load an ELF file and prepare it for flashing
 int flash_load(flash_file_t *ctx, const char *name, int can_write_bl) {
-    FILE *fd = NULL;
+    FILE *fd;
     Elf32_Ehdr ehdr;
     Elf32_Phdr *phdrs = NULL;
     int num_phdrs;
diff --git a/client/hid-flasher/proxusb.c b/client/hid-flasher/proxusb.c
index f7ff5d489..7563429d8 100644
--- a/client/hid-flasher/proxusb.c
+++ b/client/hid-flasher/proxusb.c
@@ -166,7 +166,7 @@ usb_dev_handle *findProxmark(int verbose, unsigned int *iface) {
 
 usb_dev_handle *OpenProxmark(int verbose) {
     int ret;
-    usb_dev_handle *handle = NULL;
+    usb_dev_handle *handle;
     unsigned int iface;
 
     handle = findProxmark(verbose, &iface);

From ea5dddafef732107ec081097efed554109f94c72 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 5 Apr 2019 18:47:36 +0200
Subject: [PATCH 0994/1938] fix: invalidPrintfArg

---
 client/emv/crypto_polarssl.c |  4 ++--
 client/emv/emv_pk.c          |  2 +-
 client/emv/emv_roca.c        |  2 +-
 client/flasher.c             | 10 +++++-----
 uart/uart_posix.c            |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/client/emv/crypto_polarssl.c b/client/emv/crypto_polarssl.c
index 3b0a7d801..ff5a867a9 100644
--- a/client/emv/crypto_polarssl.c
+++ b/client/emv/crypto_polarssl.c
@@ -208,7 +208,7 @@ static unsigned char *crypto_pk_polarssl_encrypt(const struct crypto_pk *_cp, co
 
     res = mbedtls_rsa_public(&cp->ctx, buf, result);
     if (res) {
-        printf("RSA encrypt failed. Error: %x data len: %zd key len: %zd\n", res * -1, len, keylen);
+        printf("RSA encrypt failed. Error: %x data len: %zu key len: %zu\n", res * -1, len, keylen);
         free(result);
         return NULL;
     }
@@ -234,7 +234,7 @@ static unsigned char *crypto_pk_polarssl_decrypt(const struct crypto_pk *_cp, co
 
     res = mbedtls_rsa_private(&cp->ctx, NULL, NULL, buf, result); // CHECK???
     if (res) {
-        printf("RSA decrypt failed. Error: %x data len: %zd key len: %zd\n", res * -1, len, keylen);
+        printf("RSA decrypt failed. Error: %x data len: %zu key len: %zu\n", res * -1, len, keylen);
         free(result);
         return NULL;
     }
diff --git a/client/emv/emv_pk.c b/client/emv/emv_pk.c
index 4c6afa88e..9b5f2e714 100644
--- a/client/emv/emv_pk.c
+++ b/client/emv/emv_pk.c
@@ -483,7 +483,7 @@ struct emv_pk *emv_pk_get_ca_pk(const unsigned char *rid, unsigned char idx) {
     if (!pk)
         return NULL;
 
-    printf("Verifying CA PK for %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx %zd bits...",
+    printf("Verifying CA PK for %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx %zu bits...",
            pk->rid[0],
            pk->rid[1],
            pk->rid[2],
diff --git a/client/emv/emv_roca.c b/client/emv/emv_roca.c
index 3a89020c7..c0d0d419d 100644
--- a/client/emv/emv_roca.c
+++ b/client/emv/emv_roca.c
@@ -84,7 +84,7 @@ void print_mpi(const char *msg, int radix, const mbedtls_mpi *X) {
     size_t len = 0;
 
     mbedtls_mpi_write_string(X, radix, Xchar, sizeof(Xchar), &len);
-    printf("%s[%ld] %s\n", msg, len, Xchar);
+    printf("%s[%zu] %s\n", msg, len, Xchar);
 }
 
 bool emv_rocacheck(const unsigned char *buf, size_t buflen, bool verbose) {
diff --git a/client/flasher.c b/client/flasher.c
index bc744b339..cb77ce719 100644
--- a/client/flasher.c
+++ b/client/flasher.c
@@ -23,11 +23,11 @@
 void cmd_debug(UsbCommand *c) {
     //  Debug
     printf("UsbCommand length[len=%zd]\n", sizeof(UsbCommand));
-    printf("  cmd[len=%zd]: %016" PRIx64"\n", sizeof(c->cmd), c->cmd);
-    printf(" arg0[len=%zd]: %016" PRIx64"\n", sizeof(c->arg[0]), c->arg[0]);
-    printf(" arg1[len=%zd]: %016" PRIx64"\n", sizeof(c->arg[1]), c->arg[1]);
-    printf(" arg2[len=%zd]: %016" PRIx64"\n", sizeof(c->arg[2]), c->arg[2]);
-    printf(" data[len=%zd]: ", sizeof(c->d.asBytes));
+    printf("  cmd[len=%zu]: %016" PRIx64"\n", sizeof(c->cmd), c->cmd);
+    printf(" arg0[len=%zu]: %016" PRIx64"\n", sizeof(c->arg[0]), c->arg[0]);
+    printf(" arg1[len=%zu]: %016" PRIx64"\n", sizeof(c->arg[1]), c->arg[1]);
+    printf(" arg2[len=%zu]: %016" PRIx64"\n", sizeof(c->arg[2]), c->arg[2]);
+    printf(" data[len=%zu]: ", sizeof(c->d.asBytes));
 
     for (size_t i = 0; i < 16; i++)
         printf("%02x", c->d.asBytes[i]);
diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index 92af6774a..4c9e8b990 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -206,7 +206,7 @@ serial_port uart_open(const char *pcPortName, uint32_t speed) {
             }
         }
     }
-    printf("[=] UART Setting serial baudrate %i\n", speed);
+    printf("[=] UART Setting serial baudrate %u\n", speed);
     return sp;
 }
 

From 1773cfcf390bb7e7142f0a462f9d729df751694f Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 5 Apr 2019 18:51:19 +0200
Subject: [PATCH 0995/1938] style

---
 armsrc/Standalone/hf_young.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/armsrc/Standalone/hf_young.c b/armsrc/Standalone/hf_young.c
index 4b7a87e99..866b13e0c 100644
--- a/armsrc/Standalone/hf_young.c
+++ b/armsrc/Standalone/hf_young.c
@@ -158,7 +158,7 @@ void RunMod() {
                             Bytes 5-7 are reserved SAK and ATQA for mifare classic
                     -Use mfCSetBlock(0, block0, oldUID, wantWipe, MAGIC_SINGLE) to write it
             */
-            uint8_t oldBlock0[16] = {0}, newBlock0[16] = {0}, testBlock0[16] = {0};
+            uint8_t oldBlock0[16] = {0}, newBlock0[16], testBlock0[16] = {0};
             // arg0 = Flags, arg1=blockNo
             MifareCGetBlock(params, 0, oldBlock0);
             if (oldBlock0[0] == 0 && oldBlock0[0] == oldBlock0[1]  && oldBlock0[1] == oldBlock0[2] && oldBlock0[2] == oldBlock0[3]) {

From e7406de2191d8d508fccd6ee4cafcc35fd862137 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 5 Apr 2019 18:53:17 +0200
Subject: [PATCH 0996/1938] redundant.

---
 client/cmdlfhid.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c
index c0d55f977..b44a5e68a 100644
--- a/client/cmdlfhid.c
+++ b/client/cmdlfhid.c
@@ -459,8 +459,8 @@ int CmdHIDWiegand(const char *Cmd) {
     uint8_t *bs = bits;
     memset(bs, 0, sizeof(bits));
 
-    uint8_t ctmp = param_getchar(Cmd, 0);
-    if (strlen(Cmd) == 0 || strlen(Cmd) < 3 || ctmp == 'H' || ctmp == 'h') return usage_lf_hid_wiegand();
+    uint8_t ctmp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) < 3 || ctmp == 'h') return usage_lf_hid_wiegand();
 
     oem = param_get8(Cmd, 0);
     fc = param_get32ex(Cmd, 1, 0, 10);

From d42b779cbe484891c05cf02cfc31e841e6fbe6b5 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 5 Apr 2019 18:55:31 +0200
Subject: [PATCH 0997/1938] style

---
 client/crypto/asn1dump.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/crypto/asn1dump.c b/client/crypto/asn1dump.c
index b62d83cbc..c55244286 100644
--- a/client/crypto/asn1dump.c
+++ b/client/crypto/asn1dump.c
@@ -323,7 +323,7 @@ bool asn1_tag_dump(const struct tlv *tlv, FILE *f, int level, bool *candump) {
     const struct asn1_tag *tag = asn1_get_tag(tlv);
 
     PRINT_INDENT(level);
-    fprintf(f, "--%2hx[%02zx] '%s':", tlv->tag, tlv->len, tag->name);
+    fprintf(f, "--%2x[%02zx] '%s':", tlv->tag, tlv->len, tag->name);
 
     switch (tag->type) {
         case ASN1_TAG_GENERIC:

From ffdfe09659a571b5e2d22531b4a3685ebf0a1355 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 5 Apr 2019 18:57:05 +0200
Subject: [PATCH 0998/1938] style

---
 client/emv/emv_tags.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/emv/emv_tags.c b/client/emv/emv_tags.c
index ee6824b32..dc6503f4b 100644
--- a/client/emv/emv_tags.c
+++ b/client/emv/emv_tags.c
@@ -490,7 +490,7 @@ static void emv_tag_dump_dol(const struct tlv *tlv, const struct emv_tag *tag, F
         doltag = emv_get_tag(&doltlv);
 
         PRINT_INDENT(level);
-        fprintf(f, "\tTag %4hx len %02zx ('%s')\n", doltlv.tag, doltlv.len, doltag->name);
+        fprintf(f, "\tTag %4x len %02zx ('%s')\n", doltlv.tag, doltlv.len, doltag->name);
     }
 }
 
@@ -773,7 +773,7 @@ bool emv_tag_dump(const struct tlv *tlv, FILE *f, int level) {
     const struct emv_tag *tag = emv_get_tag(tlv);
 
     PRINT_INDENT(level);
-    fprintf(f, "--%2hx[%02zx] '%s':", tlv->tag, tlv->len, tag->name);
+    fprintf(f, "--%2x[%02zx] '%s':", tlv->tag, tlv->len, tag->name);
 
     switch (tag->type) {
         case EMV_TAG_GENERIC:

From 4be92f129a0b8816b4ce11000c51b5f33a775327 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 5 Apr 2019 19:13:03 +0200
Subject: [PATCH 0999/1938] style

---
 client/flasher.c       | 2 +-
 client/fpga_compress.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/flasher.c b/client/flasher.c
index cb77ce719..be74ef8e6 100644
--- a/client/flasher.c
+++ b/client/flasher.c
@@ -22,7 +22,7 @@
 
 void cmd_debug(UsbCommand *c) {
     //  Debug
-    printf("UsbCommand length[len=%zd]\n", sizeof(UsbCommand));
+    printf("UsbCommand length[len=%zu]\n", sizeof(UsbCommand));
     printf("  cmd[len=%zu]: %016" PRIx64"\n", sizeof(c->cmd), c->cmd);
     printf(" arg0[len=%zu]: %016" PRIx64"\n", sizeof(c->arg[0]), c->arg[0]);
     printf(" arg1[len=%zu]: %016" PRIx64"\n", sizeof(c->arg[1]), c->arg[1]);
diff --git a/client/fpga_compress.c b/client/fpga_compress.c
index 0f4220632..3a06a62d3 100644
--- a/client/fpga_compress.c
+++ b/client/fpga_compress.c
@@ -98,12 +98,12 @@ int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile, bool hardn
 #if __WORDSIZE == 64
                         "Input file too big (> %" PRIu64 " bytes). This is probably not a hardnested bitflip state table.\n"
 #else
-                        "Input file too big (> %lu bytes). This is probably not a hardnested bitflip state table.\n"
+                        "Input file too big (> %zu bytes). This is probably not a hardnested bitflip state table.\n"
 #endif
                         , HARDNESTED_TABLE_SIZE);
 
             } else {
-                fprintf(stderr, "Input files too big (total > %lu bytes). These are probably not PM3 FPGA config files.\n", num_infiles * FPGA_CONFIG_SIZE);
+                fprintf(stderr, "Input files too big (total > %zu bytes). These are probably not PM3 FPGA config files.\n", num_infiles * FPGA_CONFIG_SIZE);
             }
             for (uint16_t j = 0; j < num_infiles; j++) {
                 fclose(infile[j]);

From fa0a2914f657c60571a2f3ef23095f8f2a595651 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 5 Apr 2019 19:29:16 +0200
Subject: [PATCH 1000/1938] style

---
 client/cmdsmartcard.c  | 2 +-
 client/fpga_compress.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index 2a0216aa7..b1c3c3797 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -1107,7 +1107,7 @@ int CmdSmartBruteforceSFI(const char *Cmd) {
     //Validations
     if (errors) return usage_sm_brute();
 
-    const char *SELECT = "00a40400%02x%s";
+    const char *SELECT = "00a40400%02zu%s";
 
 //  uint8_t GENERATE_AC[] = {0x80, 0xAE};
 //  uint8_t GET_CHALLENGE[] = {0x00, 0x84, 0x00};
diff --git a/client/fpga_compress.c b/client/fpga_compress.c
index 3a06a62d3..00e62d74b 100644
--- a/client/fpga_compress.c
+++ b/client/fpga_compress.c
@@ -98,12 +98,12 @@ int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile, bool hardn
 #if __WORDSIZE == 64
                         "Input file too big (> %" PRIu64 " bytes). This is probably not a hardnested bitflip state table.\n"
 #else
-                        "Input file too big (> %zu bytes). This is probably not a hardnested bitflip state table.\n"
+                        "Input file too big (> %li bytes). This is probably not a hardnested bitflip state table.\n"
 #endif
                         , HARDNESTED_TABLE_SIZE);
 
             } else {
-                fprintf(stderr, "Input files too big (total > %zu bytes). These are probably not PM3 FPGA config files.\n", num_infiles * FPGA_CONFIG_SIZE);
+                fprintf(stderr, "Input files too big (total > %li bytes). These are probably not PM3 FPGA config files.\n", num_infiles * FPGA_CONFIG_SIZE);
             }
             for (uint16_t j = 0; j < num_infiles; j++) {
                 fclose(infile[j]);

From 841f20c5e5129a057970b3bf6594ae87f3bfb1b3 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 5 Apr 2019 19:34:05 +0200
Subject: [PATCH 1001/1938] test_t55x7 logs & stats

---
 client/scripts/test_t55x7.lua | 177 +++++++++++++++++++---------------
 1 file changed, 99 insertions(+), 78 deletions(-)

diff --git a/client/scripts/test_t55x7.lua b/client/scripts/test_t55x7.lua
index 015b578c0..3d21cc9e5 100644
--- a/client/scripts/test_t55x7.lua
+++ b/client/scripts/test_t55x7.lua
@@ -40,7 +40,9 @@ Arguments:
 ]]
 
 local TIMEOUT = 2000 -- Shouldn't take longer than 2 seconds
-local DEBUG = true -- the debug flag
+local DEBUG = false -- the debug flag
+local total_tests = 0
+local total_pass = 0
 
 local data_blocks_cmds = {    
     [1] = '00000000',
@@ -95,73 +97,6 @@ local function GetConfigs( modulation )
 
     local t = {}
     
-    t['ASK'] = {
-                [1] = '00008040',
-                [2] = '00048040', 
-                [3] = '00088040',
-                [4] = '000c8040',
-                [5] = '00108040',
-                [6] = '00148040',
-                [7] = '00188040',
-                [8] = '001c8040',
-            }
-            
-    t['BI'] = {
-                [1] = '00010040',
-                [2] = '00050040',
-                [3] = '00090040',
-                [4] = '000d0040',
-                [5] = '00110040',
-                [6] = '00150040',
-                [7] = '00190040',
-                [8] = '001d0040',
-            }
-            
-    t['FSK2A'] = {
-                [1] = '00007040',
-                [2] = '00047040',
-                [3] = '00087040',
-                [4] = '000c7040',
-                [5] = '00107040',
-                [6] = '00147040',
-                [7] = '00187040',
-                [8] = '001c7040',
-            }
-            
-    t['FSK1A'] = {
-                [1] = '00006040',
-                [2] = '00046040',
-                [3] = '00086040',
-                [4] = '000c6040',
-                [5] = '00106040',
-                [6] = '00146040',
-                [7] = '00186040',
-                [8] = '001c6040',
-            }
-            
-    t['FSK2'] = {
-                [1] = '00005040',
-                [2] = '00045040',
-                [3] = '00085040',
-                [4] = '000c5040',
-                [5] = '00105040',
-                [6] = '00145040',
-                [7] = '00185040',
-                [8] = '001c5040',
-            }
-            
-    t['FSK1'] = {
-                [1] = '00004040',
-                [2] = '00004040',
-                [3] = '00044040',
-                [4] = '00084040',
-                [5] = '000c4040',
-                [6] = '00104040',
-                [7] = '00144040',
-                [8] = '00184040',
-                [9] = '001c4040',
-            }
-            
     t['PSK1'] = {
                 [1] = '00001040',
                 [2] = '00041040', 
@@ -193,7 +128,75 @@ local function GetConfigs( modulation )
                 [6] = '00143040',
                 [7] = '00183040',
                 [8] = '001c3040',
-        }
+            }
+
+    t['FSK1'] = {
+                [1] = '00004040',
+                [2] = '00004040',
+                [3] = '00044040',
+                [4] = '00084040',
+                [5] = '000c4040',
+                [6] = '00104040',
+                [7] = '00144040',
+                [8] = '00184040',
+                [9] = '001c4040',
+            }
+            
+    t['FSK2'] = {
+                [1] = '00005040',
+                [2] = '00045040',
+                [3] = '00085040',
+                [4] = '000c5040',
+                [5] = '00105040',
+                [6] = '00145040',
+                [7] = '00185040',
+                [8] = '001c5040',
+            }
+            
+    t['FSK1A'] = {
+                [1] = '00006040',
+                [2] = '00046040',
+                [3] = '00086040',
+                [4] = '000c6040',
+                [5] = '00106040',
+                [6] = '00146040',
+                [7] = '00186040',
+                [8] = '001c6040',
+            }
+            
+    t['FSK2A'] = {
+                [1] = '00007040',
+                [2] = '00047040',
+                [3] = '00087040',
+                [4] = '000c7040',
+                [5] = '00107040',
+                [6] = '00147040',
+                [7] = '00187040',
+                [8] = '001c7040',
+            }
+            
+    t['ASK'] = {
+                [1] = '00008040',
+                [2] = '00048040', 
+                [3] = '00088040',
+                [4] = '000c8040',
+                [5] = '00108040',
+                [6] = '00148040',
+                [7] = '00188040',
+                [8] = '001c8040',
+            }
+            
+    t['BI'] = {
+                [1] = '00010040',
+                [2] = '00050040',
+                [3] = '00090040',
+                [4] = '000d0040',
+                [5] = '00110040',
+                [6] = '00150040',
+                [7] = '00190040',
+                [8] = '001d0040',
+            }
+            
     return t[modulation:upper()]
 end
 ---
@@ -203,17 +206,17 @@ local function WipeCard()
     print('Wiping card')
     core.console('lf t55xx wipe')
     
-    print('Detecting card'); 
+    print('Detecting card')
     local res, msg = core.t55xx_detect()
     if not res then 
-        oops("can't detect modulation. Test failed."); 
-        core.console("rem Failed to detect");
+        oops("Can't detect modulation. Test failed.")
+        core.console("rem [ERR:DETECT:WIPED] Failed to detect after wipe")
         return false
     else
         local wipe_data_cmd = "lf t55xx write b %s d %s"
         for _ = 1, #data_blocks_cmds do
             local val = data_blocks_cmds[_]
-            local c = string.format(wipe_data_cmd, _, val);
+            local c = string.format(wipe_data_cmd, _, val)
             core.console(c)
         end
         return true
@@ -239,7 +242,6 @@ local function test(modulation)
     
     local s = ('Start test of %s'):format(modulation)
     print(s)
-    core.console('rem '..s)
     
     process_block0_cmds = GetConfigs(modulation)
     
@@ -248,6 +250,7 @@ local function test(modulation)
     for _ = 1, #process_block0_cmds do
     
         local p_config_cmd = process_block0_cmds[_]
+        local errors = 0
         core.clearCommandBuffer()
 
         -- Write Config block
@@ -262,19 +265,30 @@ local function test(modulation)
         local res, msg = core.t55xx_detect()
         if not res then 
             print("can't detect modulation, skip to next config")
+            core.console(format("rem [ERR:DETECT:%s] Failed to detect modulation", p_config_cmd))
+            core.console(format('rem [SUMMARY:%s] FAIL detection', p_config_cmd))
+            total_tests = total_tests + #data_blocks_cmds
         else
             -- Loop block1-2
             for _ = 1, #data_blocks_cmds do
+                total_tests = total_tests + 1
                 local val = data_blocks_cmds[_]
                 local blockdata, msg = CheckReadBlock(_)
                 if blockdata:lower() ~= val:lower() then
                     print( ('Test %s == %s Failed'):format(val, blockdata))
-                    core.console( format('rem -- block %d  value %s failed', _, val))
+                    core.console( format('rem [ERR:READ:%s:%d] block %d: read %s instead of %s', p_config_cmd, _, _, blockdata, val))
+                    errors = errors+1
                 else
                     print( ('Test %s == %s OK'):format(val, blockdata))
+                    total_pass = total_pass + 1
                 end
             end
-        end       
+            if errors >0 then
+                core.console( format('rem [SUMMARY:%s] FAIL %d test%s', p_config_cmd, errors, errors > 1 and "s" or ""))
+            else
+                core.console( format('rem [SUMMARY:%s] PASS all tests', p_config_cmd))
+            end
+        end
     end
 end
 
@@ -292,15 +306,22 @@ local function main(args)
     local res
     
     -- Adjust this table to set which configurations should be tested
+--    local test_modes = { 'PSK1', 'PSK2', 'PSK3', 'FSK1', 'FSK2', 'FSK1A', 'FSK2A', 'ASK', 'BI' }
     local test_modes = { 'ASK', 'PSK1' }
     
     for _ = 1, #test_modes do
         res = WipeCard()
-        print (test_modes[_])
-        if res then test(test_modes[_]) end        
+        if res then
+            print (test_modes[_])
+            test(test_modes[_])
+        else
+            exitMsg('Abort!')
+            return
+        end
     end
 
     exitMsg('Tests finished')
+    core.console( format('rem [SUMMARY] Success rate: %d/%d tests passed%s', total_pass, total_tests, total_pass < total_tests and ", help me improving that number!" or " \\o/"))
     
 end
 main(args)

From 8c017157d40958db8b5ef3a0c5183d0fa40ec236 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 5 Apr 2019 20:28:58 +0200
Subject: [PATCH 1002/1938] chg: better strong wave detection for biphase

---
 common/lfdemod.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/common/lfdemod.c b/common/lfdemod.c
index cfac0a0b5..a0dea9d9d 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -445,11 +445,11 @@ int ManchesterEncode(uint8_t *bits, size_t size) {
 
 // by marshmellow
 // to detect a wave that has heavily clipped (clean) samples
-// loop 512 samples,   if 250 of them is deemed maxed out,  we assume the wave is clipped.
+// loop 1024 samples,   if 250 of them is deemed maxed out,  we assume the wave is clipped.
 bool DetectCleanAskWave(uint8_t *dest, size_t size, uint8_t high, uint8_t low) {
     bool allArePeaks = true;
     uint16_t cntPeaks = 0;
-    size_t loopEnd = 512 + 160;
+    size_t loopEnd = 1024 + 160;
 
     // sanity check
     if (loopEnd > size) loopEnd = size;
@@ -463,7 +463,8 @@ bool DetectCleanAskWave(uint8_t *dest, size_t size, uint8_t high, uint8_t low) {
     }
 
     if (!allArePeaks) {
-        if (cntPeaks > 250) return true;
+        if (g_debugMode == 2) prnt("DEBUG DetectCleanAskWave: peaks (200) %u", cntPeaks);
+        if (cntPeaks > 200) return true;
     }
     return allArePeaks;
 }

From 84753b91c041643b02dbba15948982d0df38aeed Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 5 Apr 2019 21:12:32 +0200
Subject: [PATCH 1003/1938] fix %u <> size_t compilation warning

---
 client/scripting.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/scripting.c b/client/scripting.c
index cf9b5c590..d4efac99f 100644
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -797,7 +797,7 @@ static int l_T55xx_detect(lua_State *L) {
             if (size != 1)  return returnToLuaWithError(L, "Wrong size of useGB, got %d , expected 1", (int) size);
             sscanf(p_gb, "%u", &gb);
             useGB = ( gb ) ? true : false;
-            printf("p_gb size  %u | %c \n", size, useGB ? 'Y':'N');
+            printf("p_gb size  %zu | %c \n", size, useGB ? 'Y':'N');
         }
         case 1: {
             const char *p_pwd = luaL_checklstring(L, 1, &size);

From 404e92a0b1808c4119fe36d74c0d93b22ad61884 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 5 Apr 2019 22:37:41 +0200
Subject: [PATCH 1004/1938] utf8 Chinese... we might just translate it
 appropriately...

---
 common/i2c.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/common/i2c.c b/common/i2c.c
index 80fb2690c..ad0f8964c 100644
--- a/common/i2c.c
+++ b/common/i2c.c
@@ -26,7 +26,7 @@
 
 volatile unsigned long c;
 
-// ֱ��ʹ��ѭ������ʱ��һ��ѭ�� 6 ��ָ�48M�� Delay=1 ���Ϊ 200kbps
+// 直接使用循环来延时，一个循环 6 条指令，48M， Delay=1 大概为 200kbps
 // timer.
 // I2CSpinDelayClk(4) = 12.31us
 // I2CSpinDelayClk(1) = 3.07us
@@ -467,8 +467,7 @@ int16_t I2C_BufferRead(uint8_t *data, uint8_t len, uint8_t device_cmd, uint8_t d
         *data = (uint8_t)tmp & 0xFF;
 
         len--;
-
-        // ��ȡ�ĵ�һ���ֽ�Ϊ��������
+        // 读取的第一个字节为后续长度
         // The first byte in response is the message length
         if (!readcount && (len > *data)) {
             len = *data;

From a738cdcdb2bf59c081c041b1be4ac373bc1dd11d Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 5 Apr 2019 22:44:50 +0200
Subject: [PATCH 1005/1938] Detecting weird codepages

---
 Makefile | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 2ad01ba5f..53bb2d559 100644
--- a/Makefile
+++ b/Makefile
@@ -56,7 +56,7 @@ recovery/%: FORCE
 	$(MAKE) -C recovery $(patsubst recovery/%,%,$@)
 FORCE: # Dummy target to force remake in the subdirectories, even if files exist (this Makefile doesn't know about the prerequisites)
 
-.PHONY: all clean help _test bootrom flash-bootrom os flash-os flash-all recovery client mfkey nounce2key style FORCE
+.PHONY: all clean help _test bootrom flash-bootrom os flash-os flash-all recovery client mfkey nounce2key style checks FORCE
 
 help:
 	@echo "Multi-OS Makefile"
@@ -76,6 +76,8 @@ help:
 	@echo "+ mfkey         - Make tools/mfkey"
 	@echo "+ nounce2key    - Make tools/nounce2key"
 	@echo
+	@echo "+ style         - Apply some automated source code formatting rules"
+	@echo "+ checks        - Detect various encoding issues in source code"
 	@echo "Possible platforms: try \"make PLATFORM=\" for more info, default is PM3RDV4"
 
 client: client/all
@@ -138,5 +140,10 @@ style:
 	    --style=google --pad-oper --unpad-paren --pad-header \
 	    --align-pointer=name {} \;
 
+# Detecting weird codepages.
+checks:
+	find . \( -name "*.[ch]" -or -name "*.cpp" -or -name "*.lua" -or -name "*.py" -or -name "*.pl" -or -name "Makefile" \) \
+	      -exec sh -c "cat {} |recode utf8.. >/dev/null || echo {}" \;
+
 # Dummy target to test for GNU make availability
 _test:

From 7fa4b86df6868234728c30c3f4511688a8d46104 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 5 Apr 2019 22:45:42 +0200
Subject: [PATCH 1006/1938] textual

---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index 53bb2d559..77c205e68 100644
--- a/Makefile
+++ b/Makefile
@@ -78,6 +78,7 @@ help:
 	@echo
 	@echo "+ style         - Apply some automated source code formatting rules"
 	@echo "+ checks        - Detect various encoding issues in source code"
+	@echo
 	@echo "Possible platforms: try \"make PLATFORM=\" for more info, default is PM3RDV4"
 
 client: client/all

From 9ff5a4e2fa318c63ea0410f866db2fec4fc25903 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 5 Apr 2019 23:17:16 +0200
Subject: [PATCH 1007/1938] style

---
 client/ui.c | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/client/ui.c b/client/ui.c
index d0318dba5..216fbccff 100644
--- a/client/ui.c
+++ b/client/ui.c
@@ -21,6 +21,8 @@ bool showDemod = true;
 pthread_mutex_t print_lock = PTHREAD_MUTEX_INITIALIZER;
 static char *logfilename = "proxmark3.log";
 
+float complex cexpf(float complex Z);
+
 void PrintAndLogOptions(char *str[][2], size_t size, size_t space) {
     char buff[2000] = "Options:\n";
     char format[2000] = "";
@@ -53,7 +55,6 @@ void PrintAndLogEx(logLevel_t level, char *fmt, ...) {
     char buffer[MAX_PRINT_BUFFER] = {0};
     char buffer2[MAX_PRINT_BUFFER + 20] = {0};
     char *token = NULL;
-    int size = 0;
     //   {NORMAL, SUCCESS, INFO, FAILED, WARNING, ERR, DEBUG}
     static char *prefixes[7] = { "", "[+] ", "[=] ", "[-] ", "[!] ", "[!!] ", "[#] "};
 
@@ -101,7 +102,7 @@ void PrintAndLogEx(logLevel_t level, char *fmt, ...) {
 
         while (token != NULL) {
 
-            size = strlen(buffer2);
+            size_t size = strlen(buffer2);
 
             if (strlen(token))
                 snprintf(buffer2 + size, sizeof(buffer2) - size, "%s%s\n", prefix, token);
@@ -210,13 +211,11 @@ void iceIIR_Butterworth(int *data, const size_t len) {
     float b[3] = {0.003621681514929,  0.007243363029857, 0.003621681514929};
     float a[3] = {1.000000000000000, -1.822694925196308, 0.837181651256023};
 
-    float sample           = 0;      // input sample read from array
-    float complex x_prime  = 1.0f;   // save sample for estimating frequency
-    float complex x;
-
     for (i = 0; i < adjustedLen; ++i) {
 
-        sample = data[i];
+        float sample = data[i];          // input sample read from array
+        float complex x_prime  = 1.0f;   // save sample for estimating frequency
+        float complex x;
 
         // remove DC offset and mix to complex baseband
         x = (sample - 127.5f) * cexpf(_Complex_I * 2 * M_PI * fc * i);
@@ -251,18 +250,14 @@ void iceSimple_Filter(int *data, const size_t len, uint8_t k) {
 #define FILTER_SHIFT 4
 
     int32_t filter_reg = 0;
-    int16_t input, output;
     int8_t shift = (k <= 8) ? k : FILTER_SHIFT;
 
     for (int i = 0; i < len; ++i) {
-
-        input = data[i];
         // Update filter with current sample
-        filter_reg = filter_reg - (filter_reg >> shift) + input;
+        filter_reg = filter_reg - (filter_reg >> shift) + data[i];
 
         // Scale output for unity gain
-        output = filter_reg >> shift;
-        data[i] = output;
+        data[i] = filter_reg >> shift;
     }
 }
 

From 7effdfc2751cc8edee3039e111f93cad62ce1bf4 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 5 Apr 2019 23:29:19 +0200
Subject: [PATCH 1008/1938] style

---
 uart/uart_posix.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index 4c9e8b990..fc5eced7f 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -231,7 +231,6 @@ void uart_close(const serial_port sp) {
 }
 
 bool uart_receive(const serial_port sp, uint8_t *pbtRx, size_t pszMaxRxLen, size_t *pszRxLen) {
-    int res;
     int byteCount;
     fd_set rfds;
     struct timeval tv;
@@ -244,7 +243,7 @@ bool uart_receive(const serial_port sp, uint8_t *pbtRx, size_t pszMaxRxLen, size
         FD_ZERO(&rfds);
         FD_SET(((serial_port_unix *)sp)->fd, &rfds);
         tv = timeout;
-        res = select(((serial_port_unix *)sp)->fd + 1, &rfds, NULL, NULL, &tv);
+        int res = select(((serial_port_unix *)sp)->fd + 1, &rfds, NULL, NULL, &tv);
 
         // Read error
         if (res < 0) {
@@ -290,7 +289,6 @@ bool uart_receive(const serial_port sp, uint8_t *pbtRx, size_t pszMaxRxLen, size
 }
 
 bool uart_send(const serial_port sp, const uint8_t *pbtTx, const size_t len) {
-    int32_t res;
     size_t pos = 0;
     fd_set rfds;
     struct timeval tv;
@@ -300,7 +298,7 @@ bool uart_send(const serial_port sp, const uint8_t *pbtTx, const size_t len) {
         FD_ZERO(&rfds);
         FD_SET(((serial_port_unix *)sp)->fd, &rfds);
         tv = timeout;
-        res = select(((serial_port_unix *)sp)->fd + 1, NULL, &rfds, NULL, &tv);
+        int res = select(((serial_port_unix *)sp)->fd + 1, NULL, &rfds, NULL, &tv);
 
         // Write error
         if (res < 0) {

From 366c1ec901a021b1c3ad10428406585aae0e6bf8 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 6 Apr 2019 00:07:48 +0200
Subject: [PATCH 1009/1938] style

---
 client/mifare/mifarehost.c | 53 ++++++++++++++------------------------
 client/mifare/mifarehost.h |  2 +-
 tools/nonce2key/crapto1.c  | 35 ++++++++++++-------------
 tools/nonce2key/crypto1.c  |  2 +-
 4 files changed, 37 insertions(+), 55 deletions(-)

diff --git a/client/mifare/mifarehost.c b/client/mifare/mifarehost.c
index 905fdcc82..de2ac2cfa 100644
--- a/client/mifare/mifarehost.c
+++ b/client/mifare/mifarehost.c
@@ -15,8 +15,6 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
     uint32_t nt = 0, nr = 0, ar = 0;
     uint64_t par_list = 0, ks_list = 0;
     uint64_t *keylist = NULL, *last_keylist = NULL;
-    uint32_t keycount = 0;
-    int16_t isOK = 0;
 
     UsbCommand c = {CMD_READER_MIFARE, {true, blockno, key_type}};
 
@@ -49,7 +47,7 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
 
             UsbCommand resp;
             if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
-                isOK  = resp.arg[0];
+                int16_t isOK  = resp.arg[0];
                 if (isOK < 0)
                     return isOK;
 
@@ -69,7 +67,7 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
         }
         c.arg[0] = false;
 
-        keycount = nonce2key(uid, nt, nr, ar, par_list, ks_list, &keylist);
+        uint32_t keycount = nonce2key(uid, nt, nr, ar, par_list, ks_list, &keylist);
 
         if (keycount == 0) {
             PrintAndLogEx(FAILED, "key not found (lfsr_common_prefix list is null). Nt=%08x", nt);
@@ -502,14 +500,13 @@ int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, uint8_
 
 int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, uint8_t params) {
 
-    uint8_t isOK = 0;
     UsbCommand c = {CMD_MIFARE_CSETBLOCK, {params, blockNo, 0}};
     memcpy(c.d.asBytes, data, 16);
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-        isOK  = resp.arg[0] & 0xff;
+        uint8_t isOK  = resp.arg[0] & 0xff;
         if (uid != NULL)
             memcpy(uid, resp.d.asBytes, 4);
         if (!isOK)
@@ -522,13 +519,12 @@ int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, uint8_t params) {
 }
 
 int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params) {
-    uint8_t isOK = 0;
     UsbCommand c = {CMD_MIFARE_CGETBLOCK, {params, blockNo, 0}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-        isOK  = resp.arg[0] & 0xff;
+        uint8_t isOK  = resp.arg[0] & 0xff;
         if (!isOK)
             return 2;
         memcpy(data, resp.d.asBytes, 16);
@@ -555,15 +551,8 @@ static uint8_t traceCurKey = 0;
 
 struct Crypto1State *traceCrypto1 = NULL;
 struct Crypto1State *revstate = NULL;
-uint64_t key = 0;
-uint32_t ks2 = 0;
-uint32_t ks3 = 0;
 
 uint32_t cuid = 0;    // uid part used for crypto1.
-uint32_t nt = 0;      // tag challenge
-uint32_t nr_enc = 0;  // encrypted reader challenge
-uint32_t ar_enc = 0;  // encrypted reader response
-uint32_t at_enc = 0;  // encrypted tag response
 
 int isTraceCardEmpty(void) {
     return ((traceCard[0] == 0) && (traceCard[1] == 0) && (traceCard[2] == 0) && (traceCard[3] == 0));
@@ -605,18 +594,14 @@ int loadTraceCard(uint8_t *tuid, uint8_t uidlen) {
         memset(buf, 0, sizeof(buf));
         if (fgets(buf, sizeof(buf), f) == NULL) {
             PrintAndLogEx(FAILED, "No trace file found or reading error.");
-            if (f) {
-                fclose(f);
-            }
+            fclose(f);
             return 2;
         }
 
         if (strlen(buf) < 32) {
             if (feof(f)) break;
             PrintAndLogEx(FAILED, "File content error. Block data must include 32 HEX symbols");
-            if (f) {
-                fclose(f);
-            }
+            fclose(f);
             return 2;
         }
         for (i = 0; i < 32; i += 2) {
@@ -628,9 +613,7 @@ int loadTraceCard(uint8_t *tuid, uint8_t uidlen) {
 
         blockNum++;
     }
-    if (f) {
-        fclose(f);
-    }
+    fclose(f);
     return 0;
 }
 
@@ -677,14 +660,11 @@ int mfTraceInit(uint8_t *tuid, uint8_t uidlen, uint8_t *atqa, uint8_t sak, bool
 }
 
 void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len, bool isEncrypted) {
-    uint8_t bt = 0;
-    int i;
-
     if (len != 1) {
-        for (i = 0; i < len; i++)
+        for (int i = 0; i < len; i++)
             data[i] = crypto1_byte(pcs, 0x00, isEncrypted) ^ data[i];
     } else {
-        bt = 0;
+        uint8_t bt = 0;
         bt |= (crypto1_bit(pcs, 0, isEncrypted) ^ BIT(data[0], 0)) << 0;
         bt |= (crypto1_bit(pcs, 0, isEncrypted) ^ BIT(data[0], 1)) << 1;
         bt |= (crypto1_bit(pcs, 0, isEncrypted) ^ BIT(data[0], 2)) << 2;
@@ -694,7 +674,10 @@ void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len, bool i
 }
 
 int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
-
+    uint32_t nt = 0;      // tag challenge
+    uint32_t nr_enc = 0;  // encrypted reader challenge
+    uint32_t ar_enc = 0;  // encrypted reader response
+    uint32_t at_enc = 0;  // encrypted tag response
     if (traceState == TRACE_ERROR)
         return 1;
 
@@ -813,11 +796,13 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
         case TRACE_AUTH_OK:
             if (len == 4) {
                 traceState = TRACE_IDLE;
+                // encrypted tag response
                 at_enc = bytes_to_num(data, 4);
 
                 //  mfkey64 recover key.
-                ks2 = ar_enc ^ prng_successor(nt, 64);
-                ks3 = at_enc ^ prng_successor(nt, 96);
+                uint64_t key = 0;
+                uint32_t ks2 = ar_enc ^ prng_successor(nt, 64);
+                uint32_t ks3 = at_enc ^ prng_successor(nt, 96);
                 revstate = lfsr_recovery64(ks2, ks3);
                 lfsr_rollback_word(revstate, 0, 0);
                 lfsr_rollback_word(revstate, 0, 0);
@@ -865,8 +850,8 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
 int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t *data, int len) {
     PrintAndLogEx(SUCCESS, "\nencrypted data: [%s]", sprint_hex(data, len));
     struct Crypto1State *s;
-    ks2 = ar_enc ^ prng_successor(nt, 64);
-    ks3 = at_enc ^ prng_successor(nt, 96);
+    uint32_t ks2 = ar_enc ^ prng_successor(nt, 64);
+    uint32_t ks3 = at_enc ^ prng_successor(nt, 96);
     s = lfsr_recovery64(ks2, ks3);
     mf_crypto1_decrypt(s, data, len, false);
     PrintAndLogEx(SUCCESS, "decrypted data: [%s]", sprint_hex(data, len));
diff --git a/client/mifare/mifarehost.h b/client/mifare/mifarehost.h
index 626d2cd07..7481647ad 100644
--- a/client/mifare/mifarehost.h
+++ b/client/mifare/mifarehost.h
@@ -70,7 +70,7 @@ typedef struct {
 extern char logHexFileName[FILE_PATH_SIZE];
 
 extern int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key);
-extern int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t *ResultKeys, bool calibrate);
+extern int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t *resultKeys, bool calibrate);
 extern int mfCheckKeys(uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t keycnt, uint8_t *keyBlock, uint64_t *key);
 extern int mfCheckKeys_fast(uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk,
                             uint8_t strategy, uint32_t size, uint8_t *keyBlock, sector_t *e_sector, bool use_flashmemory);
diff --git a/tools/nonce2key/crapto1.c b/tools/nonce2key/crapto1.c
index 559e12872..9026a57bb 100644
--- a/tools/nonce2key/crapto1.c
+++ b/tools/nonce2key/crapto1.c
@@ -77,10 +77,9 @@ static void bucket_sort_intersect(uint32_t *const estart, uint32_t *const estop,
 
     // write back intersecting buckets as sorted list.
     // fill in bucket_info with head and tail of the bucket contents in the list and number of non-empty buckets.
-    uint32_t nonempty_bucket;
     for (uint32_t i = 0; i < 2; i++) {
         p1 = start[i];
-        nonempty_bucket = 0;
+        uint32_t nonempty_bucket = 0;
         for (uint32_t j = 0x00; j <= 0xff; j++) {
             if (bucket[0][j].bp != bucket[0][j].head && bucket[1][j].bp != bucket[1][j].head) { // non-empty intersecting buckets only
                 bucket_info->bucket_info[i][nonempty_bucket].head = p1;
@@ -146,13 +145,12 @@ static struct Crypto1State *
 recover(uint32_t *o_head, uint32_t *o_tail, uint32_t oks,
         uint32_t *e_head, uint32_t *e_tail, uint32_t eks, int rem,
         struct Crypto1State *sl, uint32_t in, bucket_array_t bucket) {
-    uint32_t *o, *e;
     bucket_info_t bucket_info;
 
     if (rem == -1) {
-        for (e = e_head; e <= e_tail; ++e) {
-            *e = *e << 1 ^ parity(*e & LF_POLY_EVEN) ^ !!(in & 4);
-            for (o = o_head; o <= o_tail; ++o, ++sl) {
+        for (uint32_t *e = e_head; e <= e_tail; ++e) {
+            *e = *e << 1 ^ parity(*e & LF_POLY_EVEN) ^ (!!(in & 4));
+            for (uint32_t *o = o_head; o <= o_tail; ++o, ++sl) {
                 sl->even = *o;
                 sl->odd = *e ^ parity(*o & LF_POLY_ODD);
                 sl[1].odd = sl[1].even = 0;
@@ -193,12 +191,11 @@ struct Crypto1State *lfsr_recovery32(uint32_t ks2, uint32_t in) {
     struct Crypto1State *statelist;
     uint32_t *odd_head = 0, *odd_tail = 0, oks = 0;
     uint32_t *even_head = 0, *even_tail = 0, eks = 0;
-    int i;
 
     // split the keystream into an odd and even part
-    for (i = 31; i >= 0; i -= 2)
+    for (int i = 31; i >= 0; i -= 2)
         oks = oks << 1 | BEBIT(ks2, i);
-    for (i = 30; i >= 0; i -= 2)
+    for (int i = 30; i >= 0; i -= 2)
         eks = eks << 1 | BEBIT(ks2, i);
 
     odd_head = odd_tail = malloc(sizeof(uint32_t) << 21);
@@ -225,7 +222,7 @@ struct Crypto1State *lfsr_recovery32(uint32_t ks2, uint32_t in) {
     }
 
     // initialize statelists: add all possible states which would result into the rightmost 2 bits of the keystream
-    for (i = 1 << 20; i >= 0; --i) {
+    for (int i = 1 << 20; i >= 0; --i) {
         if (filter(i) == (oks & 1))
             *++odd_tail = i;
         if (filter(i) == (eks & 1))
@@ -233,7 +230,7 @@ struct Crypto1State *lfsr_recovery32(uint32_t ks2, uint32_t in) {
     }
 
     // extend the statelists. Look at the next 8 Bits of the keystream (4 Bit each odd and even):
-    for (i = 0; i < 4; i++) {
+    for (uint8_t i = 0; i < 4; i++) {
         extend_table_simple(odd_head,  &odd_tail, (oks >>= 1) & 1);
         extend_table_simple(even_head, &even_tail, (eks >>= 1) & 1);
     }
@@ -362,7 +359,7 @@ uint8_t lfsr_rollback_bit(struct Crypto1State *s, uint32_t in, int fb) {
     out ^= LF_POLY_EVEN & (s->even >>= 1);
     out ^= LF_POLY_ODD & s->odd;
     out ^= !!in;
-    out ^= (ret = filter(s->odd)) & !!fb;
+    out ^= (ret = filter(s->odd)) & (!!fb);
 
     s->even |= parity(out) << 23;
     return ret;
@@ -498,21 +495,21 @@ uint32_t *lfsr_prefix_ks(uint8_t ks[8], int isodd) {
  * helper function which eliminates possible secret states using parity bits
  */
 static struct Crypto1State *check_pfx_parity(uint32_t prefix, uint32_t rresp, uint8_t parities[8][8], uint32_t odd, uint32_t even, struct Crypto1State *sl) {
-    uint32_t ks1, nr, ks2, rr, ks3, c, good = 1;
+    uint32_t good = 1;
 
-    for (c = 0; good && c < 8; ++c) {
+    for (uint32_t c = 0; good && c < 8; ++c) {
         sl->odd = odd ^ fastfwd[1][c];
         sl->even = even ^ fastfwd[0][c];
 
         lfsr_rollback_bit(sl, 0, 0);
         lfsr_rollback_bit(sl, 0, 0);
 
-        ks3 = lfsr_rollback_bit(sl, 0, 0);
-        ks2 = lfsr_rollback_word(sl, 0, 0);
-        ks1 = lfsr_rollback_word(sl, prefix | c << 5, 1);
+        uint32_t ks3 = lfsr_rollback_bit(sl, 0, 0);
+        uint32_t ks2 = lfsr_rollback_word(sl, 0, 0);
+        uint32_t ks1 = lfsr_rollback_word(sl, prefix | c << 5, 1);
 
-        nr = ks1 ^ (prefix | c << 5);
-        rr = ks2 ^ rresp;
+        uint32_t nr = ks1 ^ (prefix | c << 5);
+        uint32_t rr = ks2 ^ rresp;
 
         good &= parity(nr & 0x000000ff) ^ parities[c][3] ^ BIT(ks2, 24);
         good &= parity(rr & 0xff000000) ^ parities[c][4] ^ BIT(ks2, 16);
diff --git a/tools/nonce2key/crypto1.c b/tools/nonce2key/crypto1.c
index cdb0ffc14..0c3f97b88 100644
--- a/tools/nonce2key/crypto1.c
+++ b/tools/nonce2key/crypto1.c
@@ -49,7 +49,7 @@ uint8_t crypto1_bit(struct Crypto1State *s, uint8_t in, int is_encrypted) {
     uint32_t tmp;
     uint8_t ret = filter(s->odd);
 
-    feedin  = ret & !!is_encrypted;
+    feedin  = ret & (!!is_encrypted);
     feedin ^= !!in;
     feedin ^= LF_POLY_ODD & s->odd;
     feedin ^= LF_POLY_EVEN & s->even;

From 38f6fd037f7246b6ba5828c1c83a98e8342b912f Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 6 Apr 2019 00:14:07 +0200
Subject: [PATCH 1010/1938] style

---
 common/wiegand.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/wiegand.c b/common/wiegand.c
index 3e90c61b6..cd4fb3eb6 100644
--- a/common/wiegand.c
+++ b/common/wiegand.c
@@ -72,20 +72,20 @@ size_t removeParity(uint8_t *bits, size_t startIdx, uint8_t pLen, uint8_t pType,
 // Make sure *dest is long enough to store original sourceLen + #_of_parities_to_be_added
 /*
 * @brief addParity
-* @param bits       pointer to the source bitstream of binary values
+* @param src        pointer to the source bitstream of binary values
 * @param dest       pointer to the destination where parities together with bits are added.
 * @param sourceLen  number of
 * @param pLen       length bits to be checked
 * @param pType      EVEN|ODD|2 (always 1's)|3 (always 0's)
 * @return
 */
-size_t addParity(uint8_t *bits, uint8_t *dest, uint8_t sourceLen, uint8_t pLen, uint8_t pType) {
+size_t addParity(uint8_t *src, uint8_t *dest, uint8_t sourceLen, uint8_t pLen, uint8_t pType) {
     uint32_t parityWd = 0;
     size_t j = 0, bitCnt = 0;
     for (int word = 0; word < sourceLen; word += pLen - 1) {
         for (int bit = 0; bit < pLen - 1; ++bit) {
-            parityWd = (parityWd << 1) | bits[word + bit];
-            dest[j++] = (bits[word + bit]);
+            parityWd = (parityWd << 1) | src[word + bit];
+            dest[j++] = (src[word + bit]);
         }
 
         // if parity fails then return 0

From 682f23440deae5306503de929b5549c116a4d1e6 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 6 Apr 2019 00:23:01 +0200
Subject: [PATCH 1011/1938] style

---
 common/lfdemod.c | 26 +++++++++++++-------------
 common/lfdemod.h |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/common/lfdemod.c b/common/lfdemod.c
index a0dea9d9d..17e38caa7 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -521,12 +521,12 @@ int DetectStrongAskClock(uint8_t *dest, size_t size, int high, int low, int *clo
 
         int foo = getClosestClock(minClk);
         if (foo > 0) {
-            for (uint8_t i = 0; i < 10; i++) {
-                if (tmpclk[i][0] == foo) {
-                    tmpclk[i][1]++;
+            for (uint8_t j = 0; j < 10; j++) {
+                if (tmpclk[j][0] == foo) {
+                    tmpclk[j][1]++;
 
-                    if (tmpclk[i][2] == 0) {
-                        tmpclk[i][2] = shortestWaveIdx;
+                    if (tmpclk[j][2] == 0) {
+                        tmpclk[j][2] = shortestWaveIdx;
                     }
                     break;
                 }
@@ -536,18 +536,18 @@ int DetectStrongAskClock(uint8_t *dest, size_t size, int high, int low, int *clo
 
     // find the clock with most hits and it the first index it was encountered.
     int max = 0;
-    for (uint8_t i = 0; i < 10; i++) {
+    for (uint8_t j = 0; j < 10; j++) {
         if (g_debugMode == 2) {
             prnt("DEBUG, ASK,  clocks %u | hits %u | idx %u"
-                 , tmpclk[i][0]
-                 , tmpclk[i][1]
-                 , tmpclk[i][2]
+                 , tmpclk[j][0]
+                 , tmpclk[j][1]
+                 , tmpclk[j][2]
                 );
         }
-        if (max < tmpclk[i][1]) {
-            *clock = tmpclk[i][0];
-            shortestWaveIdx = tmpclk[i][2];
-            max = tmpclk[i][1];
+        if (max < tmpclk[j][1]) {
+            *clock = tmpclk[j][0];
+            shortestWaveIdx = tmpclk[j][2];
+            max = tmpclk[j][1];
         }
     }
 
diff --git a/common/lfdemod.h b/common/lfdemod.h
index 6256aa0bc..9a807a02c 100644
--- a/common/lfdemod.h
+++ b/common/lfdemod.h
@@ -79,7 +79,7 @@ extern size_t   removeParity(uint8_t *bits, size_t startIdx, uint8_t pLen, uint8
 
 //tag specific
 extern int detectAWID(uint8_t *dest, size_t *size, int *waveStartIdx);
-extern int Em410xDecode(uint8_t *dest, size_t *size, size_t *startIdx, uint32_t *hi, uint64_t *lo);
+extern int Em410xDecode(uint8_t *bits, size_t *size, size_t *start_idx, uint32_t *hi, uint64_t *lo);
 extern int HIDdemodFSK(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32_t *lo, int *waveStartIdx);
 extern int detectIdteck(uint8_t *dest, size_t *size);
 extern int detectIOProx(uint8_t *dest, size_t *size, int *waveStartIdx);

From e24a0cfe17274ae33e0dd6364eb15fa95dfc6739 Mon Sep 17 00:00:00 2001
From: vratiskol <vincent.ratiskol@github.com>
Date: Sat, 6 Apr 2019 00:32:11 +0200
Subject: [PATCH 1012/1938] Verbose mode

---
 armsrc/mifaresim.c | 63 ++++++++++++++++++++++++++++------------------
 1 file changed, 39 insertions(+), 24 deletions(-)

diff --git a/armsrc/mifaresim.c b/armsrc/mifaresim.c
index 8c8d18c4d..a300e7b57 100644
--- a/armsrc/mifaresim.c
+++ b/armsrc/mifaresim.c
@@ -10,6 +10,12 @@
 // Mifare Classic Card Simulation
 //-----------------------------------------------------------------------------
 
+// Verbose Mode: 
+// MF_DBG_NONE          0
+// MF_DBG_ERROR         1
+// MF_DBG_ALL           2
+// MF_DBG_EXTENDED      4
+
 #include "iso14443a.h"
 #include "mifaresim.h"
 #include "iso14443crc.h"
@@ -149,8 +155,8 @@ static void MifareSimInit(uint16_t flags, uint8_t *datain, tag_response_info_t *
     // ATQA
 
     static uint8_t rATQA_Mini_4B[]  = {0x44, 0x00};       	// indicate Mifare classic Mini 4Byte UID
-    //static uint8_t rATQA_Mini_7B[]  = {0x44, 0x00};       	// indicate Mifare classic Mini 7Byte UID
-    //static uint8_t rATQA_Mini_10B[] = {0x44, 0x00};       	// indicate Mifare classic Mini 10Byte UID
+    static uint8_t rATQA_Mini_7B[]  = {0x44, 0x00};       	// indicate Mifare classic Mini 7Byte UID
+    static uint8_t rATQA_Mini_10B[] = {0x44, 0x00};       	// indicate Mifare classic Mini 10Byte UID
 
     static uint8_t rATQA_1k_4B[]  = {0x04, 0x00}; 				// indicate Mifare classic 1k 4Byte UID
     static uint8_t rATQA_1k_7B[]  = {0x44, 0x00}; 		 		// indicate Mifare classic 1k 7Byte UID
@@ -231,7 +237,7 @@ static void MifareSimInit(uint16_t flags, uint8_t *datain, tag_response_info_t *
             *cuid = bytes_to_num(rUIDBCC1, 4);
             // BCC
             rUIDBCC1[4] = rUIDBCC1[0] ^ rUIDBCC1[1] ^ rUIDBCC1[2] ^ rUIDBCC1[3];
-            if (MF_DBGLEVEL >= MF_DBG_ALL)	{
+            if (MF_DBGLEVEL >= MF_DBG_NONE)	{
                 Dbprintf("4B UID: %02x%02x%02x%02x", rUIDBCC1[0], rUIDBCC1[1], rUIDBCC1[2], rUIDBCC1[3]);
             }
             break;
@@ -240,6 +246,10 @@ static void MifareSimInit(uint16_t flags, uint8_t *datain, tag_response_info_t *
         case 7:
 
             switch (MifareCardType) {
+                case 0: // Mifare Mini
+                    memcpy(rATQA, rATQA_Mini_7B, sizeof rATQA_Mini_7B);
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("=> Using rATQA_Mini_7B");
+                    break;
                 case 1:
                     memcpy(rATQA, rATQA_1k_7B, sizeof rATQA_1k_7B);
                     if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("=> Using rATQA_1k_7B");
@@ -261,7 +271,7 @@ static void MifareSimInit(uint16_t flags, uint8_t *datain, tag_response_info_t *
             // BCC
             rUIDBCC1[4] = rUIDBCC1[0] ^ rUIDBCC1[1] ^ rUIDBCC1[2] ^ rUIDBCC1[3];
             rUIDBCC2[4] = rUIDBCC2[0] ^ rUIDBCC2[1] ^ rUIDBCC2[2] ^ rUIDBCC2[3];
-            if (MF_DBGLEVEL >= MF_DBG_ALL)	{
+            if (MF_DBGLEVEL >= MF_DBG_NONE)	{
                 Dbprintf("7B UID: %02x %02x %02x %02x %02x %02x %02x",
                          rUIDBCC1[1], rUIDBCC1[2], rUIDBCC1[3], rUIDBCC2[0], rUIDBCC2[1], rUIDBCC2[2], rUIDBCC2[3]);
             }
@@ -270,6 +280,10 @@ static void MifareSimInit(uint16_t flags, uint8_t *datain, tag_response_info_t *
         // UID 10B
         case 10:
             switch (MifareCardType) {
+                case 0: // Mifare Mini
+                    memcpy(rATQA, rATQA_Mini_10B, sizeof rATQA_Mini_10B);
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("=> Using rATQA_Mini_10B");
+                    break;
                 case 1:
                     memcpy(rATQA, rATQA_1k_10B, sizeof rATQA_1k_10B);
                     if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("=> Using rATQA_1k_10B");
@@ -294,7 +308,7 @@ static void MifareSimInit(uint16_t flags, uint8_t *datain, tag_response_info_t *
             rUIDBCC2[4] = rUIDBCC2[0] ^ rUIDBCC2[1] ^ rUIDBCC2[2] ^ rUIDBCC2[3];
             rUIDBCC3[4] = rUIDBCC3[0] ^ rUIDBCC3[1] ^ rUIDBCC3[2] ^ rUIDBCC3[3];
 
-            if (MF_DBGLEVEL >= MF_DBG_ALL)	{
+            if (MF_DBGLEVEL >= MF_DBG_NONE)	{
                 Dbprintf("10B UID: %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x",
                          rUIDBCC1[1], rUIDBCC1[2], rUIDBCC1[3],
                          rUIDBCC2[1], rUIDBCC2[2], rUIDBCC2[3],
@@ -421,7 +435,8 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
     uint8_t	mM = 0; //moebius_modifier for collection storage
 
     // Authenticate response - nonce
-    uint32_t nonce = prng_successor(selTimer, 32) ;
+    uint32_t nonce = 0; 
+    // = prng_successor(selTimer, 32) ;
 
     if ((flags & FLAG_MF_MINI) == FLAG_MF_MINI) {
         MifareCardType = 0;
@@ -659,7 +674,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                     if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_SELECT2] cardSTATE = MFEMUL_IDLE");
                 }
                 // Break Case MFEMUL_SELECT2
-                continue;
+                break;
             }
 
 
@@ -718,7 +733,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
             // WORK
             case MFEMUL_WORK: {
 
-                if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("[MFEMUL_WORK] Enter in case");
+                if (MF_DBGLEVEL >= 1)	Dbprintf("[MFEMUL_WORK] Enter in case");
 
                 if (receivedCmd_len != 4) {
                     LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
@@ -744,7 +759,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
 
                 if (!HasValidCRC(receivedCmd_dec, receivedCmd_len)) { // all commands must have a valid CRC
                     EmSend4bit(encrypted_data ? mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA) : CARD_NACK_NA);
-                    if (MF_DBGLEVEL >= MF_DBG_ALL) Dbprintf("[MFEMUL_WORK] All commands must have a valid CRC %02X (%d)", receivedCmd_dec, receivedCmd_len);
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] All commands must have a valid CRC %02X (%d)", receivedCmd_dec, receivedCmd_len);
                     break;
                 }
 
@@ -768,11 +783,11 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                     // Example: 6X  [00]
                     cardAUTHSC = receivedCmd_dec[1] / 4;
 
-                    // cardAUTHKEY: 60 => Auth use Key A
+                    // cardAUTHKEY: 60 => Auth use Key A 
                     // cardAUTHKEY: 61 => Auth use Key B
                     cardAUTHKEY = receivedCmd_dec[0] & 0x01;
 
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] KEY %c: %02X%02X", (cardAUTHKEY == 0) ? 'A' : 'B', emlGetKey(cardAUTHSC, cardAUTHKEY));
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] KEY %c: %012" PRIx64, (cardAUTHKEY == 0) ? 'A' : 'B', emlGetKey(cardAUTHSC, cardAUTHKEY));
 
                     // first authentication
                     crypto1_destroy(pcs);
@@ -814,10 +829,10 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                     break;
                 }
 
-                // if (!encrypted_data) { // all other commands must be encrypted (authenticated)
-                //     if (MF_DBGLEVEL >= 0) Dbprintf("Commands must be encrypted (authenticated)");
+                //if (!encrypted_data) { // all other commands must be encrypted (authenticated)
+                //     if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Commands must be encrypted (authenticated)");
                 //     break;
-                // }
+                //}
 
                 // case MFEMUL_WORK => if Cmd is Read, Write, Inc, Dec, Restore, Transfert
                 if (receivedCmd_dec[0] == ISO14443A_CMD_READBLOCK
@@ -829,12 +844,12 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                     // Check if Block num is not too far
                     if (receivedCmd_dec[1] > MIFARE_4K_MAXBLOCK) {
                         EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
-                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] Reader tried to operate (0x%02x) on out of range block: %d (0x%02x), nacking", receivedCmd_dec[0], receivedCmd_dec[1], receivedCmd_dec[1]);
+                        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("[MFEMUL_WORK] Reader tried to operate (0x%02x) on out of range block: %d (0x%02x), nacking", receivedCmd_dec[0], receivedCmd_dec[1], receivedCmd_dec[1]);
                         break;
                     }
                     if (receivedCmd_dec[1] / 4 != cardAUTHSC) {
                         EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
-                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] Reader tried to operate (0x%02x) on block (0x%02x) not authenticated for (0x%02x), nacking", receivedCmd_dec[0], receivedCmd_dec[1], cardAUTHSC);
+                        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("[MFEMUL_WORK] Reader tried to operate (0x%02x) on block (0x%02x) not authenticated for (0x%02x), nacking", receivedCmd_dec[0], receivedCmd_dec[1], cardAUTHSC);
                         break;
                     }
                 }
@@ -921,7 +936,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                     blockNo = receivedCmd_dec[1];
                     if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] RECV 0x%02x inc(0xC1)/dec(0xC0)/restore(0xC2) block %d (%02x)", receivedCmd_dec[0], blockNo, blockNo);
                     if (emlCheckValBl(blockNo)) {
-                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] Reader tried to operate on block, but emlCheckValBl failed, nacking");
+                        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("[MFEMUL_WORK] Reader tried to operate on block, but emlCheckValBl failed, nacking");
                         EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
                         break;
                     }
@@ -988,12 +1003,12 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
             case MFEMUL_AUTH1: {
                 if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("[MFEMUL_AUTH1] Enter case");
 
-                // if (receivedCmd_len != 4) {
-                //     cardSTATE_TO_IDLE();
-                //     LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
-                //     if (MF_DBGLEVEL >= 0)	Dbprintf("MFEMUL_AUTH1: receivedCmd_len != 8 (%d) => cardSTATE_TO_IDLE())", receivedCmd_len);
-                //     break;
-                // }
+                if (receivedCmd_len != 4) {
+                     cardSTATE_TO_IDLE();
+                     LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                     if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("MFEMUL_AUTH1: receivedCmd_len != 8 (%d) => cardSTATE_TO_IDLE())", receivedCmd_len);
+                     break;
+                }
 
                 nr = bytes_to_num(receivedCmd, 4);
                 ar = bytes_to_num(&receivedCmd[4], 4);
@@ -1075,8 +1090,8 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                     }
                     cardAUTHKEY = AUTHKEYNONE;	// not authenticated
                     // LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                    EmSend4bit(CARD_NACK_NA);
                     cardSTATE_TO_IDLE();
-                    EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
                     break;
                 }
 

From 59d40068e2919201cd8b436e5f6a4fba435aa3f3 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 6 Apr 2019 00:38:22 +0200
Subject: [PATCH 1013/1938] style

---
 client/cmdcrc.h           |   8 +--
 client/cmddata.h          |   2 +-
 client/cmdflashmem.h      |  12 ++--
 client/cmdhf.h            |  12 ++--
 client/cmdhf14a.h         |  34 +++++------
 client/cmdhf14b.h         |  26 ++++----
 client/cmdhf15.h          |  56 ++++++++---------
 client/cmdhfepa.h         |   6 +-
 client/cmdhffelica.h      |  22 +++----
 client/cmdhffido.h        |   2 +-
 client/cmdhficlass.h      |  46 +++++++-------
 client/cmdhflegic.h       |  26 ++++----
 client/cmdhflist.h        |  43 ++++++-------
 client/cmdhfmf.h          |  68 ++++++++++-----------
 client/cmdhfmfdesfire.h   |   1 -
 client/cmdhfmfhard.h      |   4 +-
 client/cmdhfmfp.h         |   2 +-
 client/cmdhfmfu.h         |  50 +++++++--------
 client/cmdhftopaz.h       |  10 +--
 client/cmdlf.h            |  40 ++++++------
 client/cmdlfawid.h        |  22 +++----
 client/cmdlfcotag.h       |   8 +--
 client/cmdlfem4x.h        |  62 +++++++++----------
 client/cmdlffdx.h         |  18 +++---
 client/cmdlfguard.h       |  14 ++---
 client/cmdlfhid.h         |  26 ++++----
 client/cmdlfhitag.h       |  18 +++---
 client/cmdlfindala.h      |  24 ++++----
 client/cmdlfio.h          |  16 ++---
 client/cmdlfjablotron.h   |  22 +++----
 client/cmdlfkeri.h        |  16 ++---
 client/cmdlfnedap.h       |  20 +++---
 client/cmdlfnexwatch.h    |   8 +--
 client/cmdlfnoralsy.h     |  18 +++---
 client/cmdlfpac.h         |   8 +--
 client/cmdlfparadox.h     |  12 ++--
 client/cmdlfpresco.h      |  16 ++---
 client/cmdlfpyramid.h     |  16 ++---
 client/cmdlfsecurakey.h   |  10 +--
 client/cmdlfviking.h      |  16 ++---
 client/cmdlfvisa2000.h    |  20 +++---
 client/cmdmain.h          |   4 +-
 client/cmdscript.h        |   6 +-
 client/cmdsmartcard.h     |  22 +++----
 client/cmdtrace.h         |  14 ++---
 client/comms.h            |   2 +-
 client/crypto/asn1utils.h |   4 +-
 client/proxgui.h          |   8 +--
 client/scandir.h          |   4 +-
 client/ui.h               |   8 +--
 client/util.h             | 124 +++++++++++++++++++-------------------
 51 files changed, 528 insertions(+), 528 deletions(-)

diff --git a/client/cmdcrc.h b/client/cmdcrc.h
index ba9540c45..f52727c2c 100644
--- a/client/cmdcrc.h
+++ b/client/cmdcrc.h
@@ -28,9 +28,9 @@
 #include "ui.h"
 #include "util.h"
 
-extern int CmdCrc(const char *Cmd);
+int CmdCrc(const char *Cmd);
 
-extern int CmdrevengSearch(const char *Cmd);
-extern int GetModels(char *Models[], int *count, uint8_t *width);
-extern int RunModel(char *inModel, char *inHexStr, bool reverse, char endian, char *result);
+int CmdrevengSearch(const char *Cmd);
+int GetModels(char *Models[], int *count, uint8_t *width);
+int RunModel(char *inModel, char *inHexStr, bool reverse, char endian, char *result);
 #endif
diff --git a/client/cmddata.h b/client/cmddata.h
index 1091c48c2..5f0fe80e0 100644
--- a/client/cmddata.h
+++ b/client/cmddata.h
@@ -84,7 +84,7 @@ int NRZrawDemod(const char *Cmd, bool verbose);
 int getSamples(int n, bool silent);
 void setClockGrid(int clk, int offset);
 int directionalThreshold(const int *in, int *out, size_t len, int8_t up, int8_t down);
-extern int AskEdgeDetect(const int *in, int *out, int len, int threshold);
+int AskEdgeDetect(const int *in, int *out, int len, int threshold);
 
 int CmdDataIIR(const char *Cmd);
 
diff --git a/client/cmdflashmem.h b/client/cmdflashmem.h
index 9f946908c..1cf06c1bc 100644
--- a/client/cmdflashmem.h
+++ b/client/cmdflashmem.h
@@ -33,13 +33,13 @@ typedef enum {
     DICTIONARY_ICLASS
 } Dictionary_t;
 
-extern int CmdFlashMem(const char *Cmd);
+int CmdFlashMem(const char *Cmd);
 
-extern int CmdFlashMemRead(const char *Cmd);
-extern int CmdFlashMemLoad(const char *Cmd);
-extern int CmdFlashMemSave(const char *Cmd);
-extern int CmdFlashMemWipe(const char *Cmd);
-extern int CmdFlashMemInfo(const char *Cmd);
+int CmdFlashMemRead(const char *Cmd);
+int CmdFlashMemLoad(const char *Cmd);
+int CmdFlashMemSave(const char *Cmd);
+int CmdFlashMemWipe(const char *Cmd);
+int CmdFlashMemInfo(const char *Cmd);
 #endif
 
 #endif
diff --git a/client/cmdhf.h b/client/cmdhf.h
index 9e41f2138..3237e1df6 100644
--- a/client/cmdhf.h
+++ b/client/cmdhf.h
@@ -33,11 +33,11 @@
 #include "cmdhffido.h"      // FIDO authenticators
 #include "cmdtrace.h"       // trace list
 
-extern int CmdHF(const char *Cmd);
-extern int CmdHFTune(const char *Cmd);
-extern int CmdHFSearch(const char *Cmd);
-extern int CmdHFSniff(const char *Cmd);
+int CmdHF(const char *Cmd);
+int CmdHFTune(const char *Cmd);
+int CmdHFSearch(const char *Cmd);
+int CmdHFSniff(const char *Cmd);
 
-extern int usage_hf_search();
-extern int usage_hf_sniff();
+int usage_hf_search();
+int usage_hf_sniff();
 #endif
diff --git a/client/cmdhf14a.h b/client/cmdhf14a.h
index 6020b6f8b..e218a398f 100644
--- a/client/cmdhf14a.h
+++ b/client/cmdhf14a.h
@@ -39,23 +39,23 @@ typedef struct {
     char *desc;
 } manufactureName;
 
-extern int CmdHF14A(const char *Cmd);
-extern int CmdHF14AList(const char *Cmd);
-extern int CmdHF14AReader(const char *Cmd);
-extern int CmdHF14AInfo(const char *Cmd);
-extern int CmdHF14ASim(const char *Cmd);
-extern int CmdHF14ASniff(const char *Cmd);
-extern int CmdHF14ACmdRaw(const char *Cmd);
-extern int CmdHF14ACUIDs(const char *Cmd);
-extern int CmdHF14AAntiFuzz(const char *Cmd);
+int CmdHF14A(const char *Cmd);
+int CmdHF14AList(const char *Cmd);
+int CmdHF14AReader(const char *Cmd);
+int CmdHF14AInfo(const char *Cmd);
+int CmdHF14ASim(const char *Cmd);
+int CmdHF14ASniff(const char *Cmd);
+int CmdHF14ACmdRaw(const char *Cmd);
+int CmdHF14ACUIDs(const char *Cmd);
+int CmdHF14AAntiFuzz(const char *Cmd);
 
-extern char *getTagInfo(uint8_t uid);
-extern int Hf14443_4aGetCardData(iso14a_card_select_t *card);
-extern int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen);
-extern int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen);
+char *getTagInfo(uint8_t uid);
+int Hf14443_4aGetCardData(iso14a_card_select_t *card);
+int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen);
+int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen);
 
-extern int usage_hf_14a_sim(void);
-extern int usage_hf_14a_sniff(void);
-extern int usage_hf_14a_raw(void);
-extern int usage_hf_14a_antifuzz(void);
+int usage_hf_14a_sim(void);
+int usage_hf_14a_sniff(void);
+int usage_hf_14a_raw(void);
+int usage_hf_14a_antifuzz(void);
 #endif
diff --git a/client/cmdhf14b.h b/client/cmdhf14b.h
index 56114af94..f2d78778c 100644
--- a/client/cmdhf14b.h
+++ b/client/cmdhf14b.h
@@ -37,23 +37,23 @@ int usage_hf_14b_sim(void);
 int usage_hf_14b_read_srx(void);
 int usage_hf_14b_write_srx(void);
 
-extern int CmdHF14B(const char *Cmd);
-extern int CmdHF14BList(const char *Cmd);
-extern int CmdHF14BInfo(const char *Cmd);
-extern int CmdHF14BSim(const char *Cmd);
-extern int CmdHF14BSniff(const char *Cmd);
-extern int CmdHF14BWrite(const char *cmd);
-extern int CmdHF14BReader(const char *Cmd);
+int CmdHF14B(const char *Cmd);
+int CmdHF14BList(const char *Cmd);
+int CmdHF14BInfo(const char *Cmd);
+int CmdHF14BSim(const char *Cmd);
+int CmdHF14BSniff(const char *Cmd);
+int CmdHF14BWrite(const char *cmd);
+int CmdHF14BReader(const char *Cmd);
 
-extern int CmdHF14BDump(const char *Cmd);
+int CmdHF14BDump(const char *Cmd);
 
-extern bool HF14BInfo(bool verbose);
-extern bool HF14BReader(bool verbose);
-extern int CmdHF14BCmdRaw(const char *Cmd);
+bool HF14BInfo(bool verbose);
+bool HF14BReader(bool verbose);
+int CmdHF14BCmdRaw(const char *Cmd);
 
 // SRi  ST Microelectronics read/write
-extern int CmdHF14BReadSri(const char *Cmd);
-extern int CmdHF14BWriteSri(const char *Cmd);
+int CmdHF14BReadSri(const char *Cmd);
+int CmdHF14BWriteSri(const char *Cmd);
 
 bool waitCmd14b(bool verbose);
 #endif
diff --git a/client/cmdhf15.h b/client/cmdhf15.h
index 942fd2952..141163547 100644
--- a/client/cmdhf15.h
+++ b/client/cmdhf15.h
@@ -28,38 +28,38 @@
 
 int CmdHF15(const char *Cmd);
 
-extern int HF15Reader(const char *Cmd, bool verbose);
+int HF15Reader(const char *Cmd, bool verbose);
 
-extern int CmdHF15Demod(const char *Cmd);
-extern int CmdHF15Samples(const char *Cmd);
-extern int CmdHF15Info(const char *Cmd);
-extern int CmdHF15Record(const char *Cmd);
-extern int CmdHF15Reader(const char *Cmd);
-extern int CmdHF15Sim(const char *Cmd);
-extern int CmdHF15Afi(const char *Cmd);
-extern int CmdHF15Dump(const char *Cmd);
-extern int CmdHF15Raw(const char *cmd);
-extern int CmdHF15Readmulti(const char *Cmd);
-extern int CmdHF15Read(const char *Cmd);
-extern int CmdHF15Write(const char *Cmd);
+int CmdHF15Demod(const char *Cmd);
+int CmdHF15Samples(const char *Cmd);
+int CmdHF15Info(const char *Cmd);
+int CmdHF15Record(const char *Cmd);
+int CmdHF15Reader(const char *Cmd);
+int CmdHF15Sim(const char *Cmd);
+int CmdHF15Afi(const char *Cmd);
+int CmdHF15Dump(const char *Cmd);
+int CmdHF15Raw(const char *cmd);
+int CmdHF15Readmulti(const char *Cmd);
+int CmdHF15Read(const char *Cmd);
+int CmdHF15Write(const char *Cmd);
 
-extern int CmdHF15Help(const char *Cmd);
+int CmdHF15Help(const char *Cmd);
 
 // usages
-extern int usage_15_demod(void);
-extern int usage_15_samples(void);
-extern int usage_15_info(void);
-extern int usage_15_record(void);
-extern int usage_15_reader(void);
-extern int usage_15_sim(void);
-extern int usage_15_findafi(void);
-extern int usage_15_dump(void);
-extern int usage_15_restore(void);
-extern int usage_15_raw(void);
+int usage_15_demod(void);
+int usage_15_samples(void);
+int usage_15_info(void);
+int usage_15_record(void);
+int usage_15_reader(void);
+int usage_15_sim(void);
+int usage_15_findafi(void);
+int usage_15_dump(void);
+int usage_15_restore(void);
+int usage_15_raw(void);
 
-extern int usage_15_read(void);
-extern int usage_15_write(void);
-extern int usage_15_readmulti(void);
+int usage_15_read(void);
+int usage_15_write(void);
+int usage_15_readmulti(void);
 
-extern int prepareHF15Cmd(char **cmd, UsbCommand *c, uint8_t iso15cmd);
+int prepareHF15Cmd(char **cmd, UsbCommand *c, uint8_t iso15cmd);
 #endif
diff --git a/client/cmdhfepa.h b/client/cmdhfepa.h
index 914ce4c5d..c526c6eb0 100644
--- a/client/cmdhfepa.h
+++ b/client/cmdhfepa.h
@@ -25,8 +25,8 @@
 #include "util_posix.h"
 
 
-extern int CmdHFEPA(const char *Cmd);
-extern int CmdHFEPACollectPACENonces(const char *Cmd);
-extern int CmdHFEPAPACEReplay(const char *Cmd);
+int CmdHFEPA(const char *Cmd);
+int CmdHFEPACollectPACENonces(const char *Cmd);
+int CmdHFEPAPACEReplay(const char *Cmd);
 
 #endif // CMDHFEPA_H__
diff --git a/client/cmdhffelica.h b/client/cmdhffelica.h
index 80a09f7d3..6eeb5b44f 100644
--- a/client/cmdhffelica.h
+++ b/client/cmdhffelica.h
@@ -26,21 +26,21 @@
 #include "cmdhf.h"      // list cmd
 #include "mifare.h"     // felica_card_select_t struct
 
-extern int CmdHFFelica(const char *Cmd);
-extern int CmdHFFelicaList(const char *Cmd);
-extern int CmdHFFelicaReader(const char *Cmd);
-extern int CmdHFFelicaSim(const char *Cmd);
-extern int CmdHFFelicaSniff(const char *Cmd);
-extern int CmdHFFelicaCmdRaw(const char *Cmd);
+int CmdHFFelica(const char *Cmd);
+int CmdHFFelicaList(const char *Cmd);
+int CmdHFFelicaReader(const char *Cmd);
+int CmdHFFelicaSim(const char *Cmd);
+int CmdHFFelicaSniff(const char *Cmd);
+int CmdHFFelicaCmdRaw(const char *Cmd);
 
-extern int usage_hf_felica_sim(void);
-extern int usage_hf_felica_sniff(void);
-extern int usage_hf_fFelica_raw(void);
+int usage_hf_felica_sim(void);
+int usage_hf_felica_sniff(void);
+int usage_hf_fFelica_raw(void);
 
 void waitCmdFelica(uint8_t iSelect);
 
 //temp
-extern int CmdHFFelicaSimLite(const char *Cmd);
-extern int CmdHFFelicaDumpLite(const char *Cmd);
+int CmdHFFelicaSimLite(const char *Cmd);
+int CmdHFFelicaDumpLite(const char *Cmd);
 
 #endif
diff --git a/client/cmdhffido.h b/client/cmdhffido.h
index 96f9153ed..b54f53118 100644
--- a/client/cmdhffido.h
+++ b/client/cmdhffido.h
@@ -21,7 +21,7 @@
 #ifndef CMDHFFIDO_H__
 #define CMDHFFIDO_H__
 
-extern int CmdHFFido(const char *Cmd);
+int CmdHFFido(const char *Cmd);
 
 
 #endif
diff --git a/client/cmdhficlass.h b/client/cmdhficlass.h
index dff0d0b24..01dfd0076 100644
--- a/client/cmdhficlass.h
+++ b/client/cmdhficlass.h
@@ -52,29 +52,29 @@ typedef struct iclass_prekey {
 
 int CmdHFiClass(const char *Cmd);
 
-extern int CmdHFiClassCalcNewKey(const char *Cmd);
-extern int CmdHFiClassCloneTag(const char *Cmd);
-extern int CmdHFiClassDecrypt(const char *Cmd);
-extern int CmdHFiClassEncryptBlk(const char *Cmd);
-extern int CmdHFiClassELoad(const char *Cmd);
-extern int CmdHFiClassList(const char *Cmd);
-extern int HFiClassReader(const char *Cmd, bool loop, bool verbose);
-extern int CmdHFiClassReader(const char *Cmd);
-extern int CmdHFiClassReader_Dump(const char *Cmd);
-extern int CmdHFiClassReader_Replay(const char *Cmd);
-extern int CmdHFiClassReadKeyFile(const char *filename);
-extern int CmdHFiClassReadTagFile(const char *Cmd);
-extern int CmdHFiClass_ReadBlock(const char *Cmd);
-extern int CmdHFiClass_TestMac(const char *Cmd);
-extern int CmdHFiClassManageKeys(const char *Cmd);
-extern int CmdHFiClass_loclass(const char *Cmd);
-extern int CmdHFiClassSniff(const char *Cmd);
-extern int CmdHFiClassSim(const char *Cmd);
-extern int CmdHFiClassWriteKeyFile(const char *Cmd);
-extern int CmdHFiClass_WriteBlock(const char *Cmd);
-extern int CmdHFiClassCheckKeys(const char *Cmd);
-extern int CmdHFiClassLookUp(const char *Cmd);
-extern int CmdHFiClassPermuteKey(const char *Cmd);
+int CmdHFiClassCalcNewKey(const char *Cmd);
+int CmdHFiClassCloneTag(const char *Cmd);
+int CmdHFiClassDecrypt(const char *Cmd);
+int CmdHFiClassEncryptBlk(const char *Cmd);
+int CmdHFiClassELoad(const char *Cmd);
+int CmdHFiClassList(const char *Cmd);
+int HFiClassReader(const char *Cmd, bool loop, bool verbose);
+int CmdHFiClassReader(const char *Cmd);
+int CmdHFiClassReader_Dump(const char *Cmd);
+int CmdHFiClassReader_Replay(const char *Cmd);
+int CmdHFiClassReadKeyFile(const char *filename);
+int CmdHFiClassReadTagFile(const char *Cmd);
+int CmdHFiClass_ReadBlock(const char *Cmd);
+int CmdHFiClass_TestMac(const char *Cmd);
+int CmdHFiClassManageKeys(const char *Cmd);
+int CmdHFiClass_loclass(const char *Cmd);
+int CmdHFiClassSniff(const char *Cmd);
+int CmdHFiClassSim(const char *Cmd);
+int CmdHFiClassWriteKeyFile(const char *Cmd);
+int CmdHFiClass_WriteBlock(const char *Cmd);
+int CmdHFiClassCheckKeys(const char *Cmd);
+int CmdHFiClassLookUp(const char *Cmd);
+int CmdHFiClassPermuteKey(const char *Cmd);
 
 void printIclassDumpContents(uint8_t *iclass_dump, uint8_t startblock, uint8_t endblock, size_t filesize);
 void HFiClassCalcDivKey(uint8_t *CSN, uint8_t *KEY, uint8_t *div_key, bool elite);
diff --git a/client/cmdhflegic.h b/client/cmdhflegic.h
index 6ee08253c..9bd8d98ac 100644
--- a/client/cmdhflegic.h
+++ b/client/cmdhflegic.h
@@ -26,19 +26,19 @@
 
 int CmdHFLegic(const char *Cmd);
 
-extern int CmdLegicInfo(const char *Cmd);
-extern int CmdLegicRdmem(const char *Cmd);
-extern int CmdLegicLoad(const char *Cmd);
-extern int CmdLegicRfSim(const char *Cmd);
-extern int CmdLegicRfWrite(const char *Cmd);
-extern int CmdLegicCalcCrc(const char *Cmd);
-extern int CmdLegicDump(const char *Cmd);
-extern int CmdLegicRestore(const char *Cmd);
-extern int CmdLegicReader(const char *Cmd);
-extern int CmdLegicELoad(const char *Cmd);
-extern int CmdLegicESave(const char *Cmd);
-extern int CmdLegicList(const char *Cmd);
-extern int CmdLegicWipe(const char *Cmd);
+int CmdLegicInfo(const char *Cmd);
+int CmdLegicRdmem(const char *Cmd);
+int CmdLegicLoad(const char *Cmd);
+int CmdLegicRfSim(const char *Cmd);
+int CmdLegicRfWrite(const char *Cmd);
+int CmdLegicCalcCrc(const char *Cmd);
+int CmdLegicDump(const char *Cmd);
+int CmdLegicRestore(const char *Cmd);
+int CmdLegicReader(const char *Cmd);
+int CmdLegicELoad(const char *Cmd);
+int CmdLegicESave(const char *Cmd);
+int CmdLegicList(const char *Cmd);
+int CmdLegicWipe(const char *Cmd);
 
 int HFLegicReader(const char *Cmd, bool verbose);
 int legic_print_type(uint32_t tagtype, uint8_t spaces);
diff --git a/client/cmdhflist.h b/client/cmdhflist.h
index 105328b9b..35a5493ff 100644
--- a/client/cmdhflist.h
+++ b/client/cmdhflist.h
@@ -51,31 +51,32 @@ typedef struct {
     uint32_t ks2;       // ar ^ ar_enc
     uint32_t ks3;       // at ^ at_enc
 } TAuthData;
-extern void ClearAuthData();
 
-extern uint8_t iso14443A_CRC_check(bool isResponse, uint8_t *d, uint8_t n);
-extern uint8_t iso14443B_CRC_check(uint8_t *d, uint8_t n);
-extern uint8_t mifare_CRC_check(bool isResponse, uint8_t *data, uint8_t len);
-extern uint8_t iso15693_CRC_check(uint8_t *d, uint8_t n);
-extern uint8_t iclass_CRC_check(bool isResponse, uint8_t *d, uint8_t n);
+void ClearAuthData();
+
+uint8_t iso14443A_CRC_check(bool isResponse, uint8_t *d, uint8_t n);
+uint8_t iso14443B_CRC_check(uint8_t *d, uint8_t n);
+uint8_t mifare_CRC_check(bool isResponse, uint8_t *data, uint8_t len);
+uint8_t iso15693_CRC_check(uint8_t *d, uint8_t n);
+uint8_t iclass_CRC_check(bool isResponse, uint8_t *d, uint8_t n);
 
 int applyIso14443a(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize);
 
-extern void annotateIclass(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize);
-extern void annotateIso15693(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize);
-extern void annotateTopaz(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize);
-extern void annotateLegic(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize);
-extern void annotateFelica(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize);
-extern void annotateIso7816(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize);
-extern void annotateIso14443b(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize);
-extern void annotateIso14443a(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize);
-extern void annotateMfDesfire(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize);
-extern void annotateMifare(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize, uint8_t *parity, uint8_t paritysize, bool isResponse);
+void annotateIclass(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize);
+void annotateIso15693(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize);
+void annotateTopaz(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize);
+void annotateLegic(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize);
+void annotateFelica(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize);
+void annotateIso7816(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize);
+void annotateIso14443b(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize);
+void annotateIso14443a(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize);
+void annotateMfDesfire(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize);
+void annotateMifare(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize, uint8_t *parity, uint8_t paritysize, bool isResponse);
 
-extern bool DecodeMifareData(uint8_t *cmd, uint8_t cmdsize, uint8_t *parity, bool isResponse, uint8_t *mfData, size_t *mfDataLen);
-extern bool NTParityChk(TAuthData *ad, uint32_t ntx);
-extern bool NestedCheckKey(uint64_t key, TAuthData *ad, uint8_t *cmd, uint8_t cmdsize, uint8_t *parity);
-extern bool CheckCrypto1Parity(uint8_t *cmd_enc, uint8_t cmdsize, uint8_t *cmd, uint8_t *parity_enc);
-extern uint64_t GetCrypto1ProbableKey(TAuthData *ad);
+bool DecodeMifareData(uint8_t *cmd, uint8_t cmdsize, uint8_t *parity, bool isResponse, uint8_t *mfData, size_t *mfDataLen);
+bool NTParityChk(TAuthData *ad, uint32_t ntx);
+bool NestedCheckKey(uint64_t key, TAuthData *ad, uint8_t *cmd, uint8_t cmdsize, uint8_t *parity);
+bool CheckCrypto1Parity(uint8_t *cmd_enc, uint8_t cmdsize, uint8_t *cmd, uint8_t *parity_enc);
+uint64_t GetCrypto1ProbableKey(TAuthData *ad);
 
 #endif // CMDHFLIST
diff --git a/client/cmdhfmf.h b/client/cmdhfmf.h
index 699aaa33e..0e471580b 100644
--- a/client/cmdhfmf.h
+++ b/client/cmdhfmf.h
@@ -33,41 +33,41 @@
 #include "cliparser/cliparser.h"           // argtable
 #include "hardnested/hardnested_bf_core.h" // SetSIMDInstr
 
-extern int CmdHFMF(const char *Cmd);
+int CmdHFMF(const char *Cmd);
 
-extern int CmdHF14AMfList(const char *Cmd);
-extern int CmdHF14AMfDbg(const char *Cmd);
-extern int CmdHF14AMfRdBl(const char *Cmd);
-extern int CmdHF14AMfURdBl(const char *Cmd);
-extern int CmdHF14AMfRdSc(const char *Cmd);
-extern int CmdHF14SMfURdCard(const char *Cmd);
-extern int CmdHF14AMfDump(const char *Cmd);
-extern int CmdHF14AMfRestore(const char *Cmd);
-extern int CmdHF14AMfWrBl(const char *Cmd);
-extern int CmdHF14AMfUWrBl(const char *Cmd);
-extern int CmdHF14AMfChk(const char *Cmd);
-extern int CmdHF14AMfDarkside(const char *Cmd);
-extern int CmdHF14AMfNested(const char *Cmd);
-extern int CmdHF14AMfNestedHard(const char *Cmd);
-//extern int CmdHF14AMfSniff(const char* Cmd);
-extern int CmdHF14AMf1kSim(const char *Cmd);
-extern int CmdHF14AMfKeyBrute(const char *Cmd);
-extern int CmdHF14AMfEClear(const char *Cmd);
-extern int CmdHF14AMfEGet(const char *Cmd);
-extern int CmdHF14AMfESet(const char *Cmd);
-extern int CmdHF14AMfELoad(const char *Cmd);
-extern int CmdHF14AMfESave(const char *Cmd);
-extern int CmdHF14AMfECFill(const char *Cmd);
-extern int CmdHF14AMfEKeyPrn(const char *Cmd);
-extern int CmdHF14AMfCSetUID(const char *Cmd);
-extern int CmdHF14AMfCSetBlk(const char *Cmd);
-extern int CmdHF14AMfCGetBlk(const char *Cmd);
-extern int CmdHF14AMfCGetSc(const char *Cmd);
-extern int CmdHF14AMfCLoad(const char *Cmd);
-extern int CmdHF14AMfCSave(const char *Cmd);
-extern int CmdHf14MfDecryptBytes(const char *Cmd);
-extern int CmdHf14AMfSetMod(const char *Cmd);
-extern int CmdHf14AMfNack(const char *Cmd);
+int CmdHF14AMfList(const char *Cmd);
+int CmdHF14AMfDbg(const char *Cmd);
+int CmdHF14AMfRdBl(const char *Cmd);
+int CmdHF14AMfURdBl(const char *Cmd);
+int CmdHF14AMfRdSc(const char *Cmd);
+int CmdHF14SMfURdCard(const char *Cmd);
+int CmdHF14AMfDump(const char *Cmd);
+int CmdHF14AMfRestore(const char *Cmd);
+int CmdHF14AMfWrBl(const char *Cmd);
+int CmdHF14AMfUWrBl(const char *Cmd);
+int CmdHF14AMfChk(const char *Cmd);
+int CmdHF14AMfDarkside(const char *Cmd);
+int CmdHF14AMfNested(const char *Cmd);
+int CmdHF14AMfNestedHard(const char *Cmd);
+//int CmdHF14AMfSniff(const char* Cmd);
+int CmdHF14AMf1kSim(const char *Cmd);
+int CmdHF14AMfKeyBrute(const char *Cmd);
+int CmdHF14AMfEClear(const char *Cmd);
+int CmdHF14AMfEGet(const char *Cmd);
+int CmdHF14AMfESet(const char *Cmd);
+int CmdHF14AMfELoad(const char *Cmd);
+int CmdHF14AMfESave(const char *Cmd);
+int CmdHF14AMfECFill(const char *Cmd);
+int CmdHF14AMfEKeyPrn(const char *Cmd);
+int CmdHF14AMfCSetUID(const char *Cmd);
+int CmdHF14AMfCSetBlk(const char *Cmd);
+int CmdHF14AMfCGetBlk(const char *Cmd);
+int CmdHF14AMfCGetSc(const char *Cmd);
+int CmdHF14AMfCLoad(const char *Cmd);
+int CmdHF14AMfCSave(const char *Cmd);
+int CmdHf14MfDecryptBytes(const char *Cmd);
+int CmdHf14AMfSetMod(const char *Cmd);
+int CmdHf14AMfNack(const char *Cmd);
 
 void showSectorTable(void);
 void readerAttack(nonces_t data, bool setEmulatorMem, bool verbose);
diff --git a/client/cmdhfmfdesfire.h b/client/cmdhfmfdesfire.h
index cc5481b0e..46737c684 100644
--- a/client/cmdhfmfdesfire.h
+++ b/client/cmdhfmfdesfire.h
@@ -1,5 +1,4 @@
 
-static int CmdHelp(const char *Cmd);
 int CmdHF14AMfDESAuth(const char *Cmd);
 int CmdHFMFDesfire(const char *Cmd);
 int CmdHelp(const char *Cmd);
diff --git a/client/cmdhfmfhard.h b/client/cmdhfmfhard.h
index e39358c7f..7d3e4fa0b 100644
--- a/client/cmdhfmfhard.h
+++ b/client/cmdhfmfhard.h
@@ -41,8 +41,8 @@ typedef struct noncelist {
     noncelistentry_t *first;
 } noncelist_t;
 
-extern int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t *trgkey, bool nonce_file_read, bool nonce_file_write, bool slow, int tests, uint64_t *foundkey, char *filename);
-extern void hardnested_print_progress(uint32_t nonces, char *activity, float brute_force, uint64_t min_diff_print_time);
+int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t *trgkey, bool nonce_file_read, bool nonce_file_write, bool slow, int tests, uint64_t *foundkey, char *filename);
+void hardnested_print_progress(uint32_t nonces, char *activity, float brute_force, uint64_t min_diff_print_time);
 
 #endif
 
diff --git a/client/cmdhfmfp.h b/client/cmdhfmfp.h
index ed9d36b79..76917315b 100644
--- a/client/cmdhfmfp.h
+++ b/client/cmdhfmfp.h
@@ -12,7 +12,7 @@
 
 #include "mifare/mifaredefault.h"
 
-extern int CmdHFMFP(const char *Cmd);
+int CmdHFMFP(const char *Cmd);
 
 
 #endif
diff --git a/client/cmdhfmfu.h b/client/cmdhfmfu.h
index 6be4beb6c..315b4b542 100644
--- a/client/cmdhfmfu.h
+++ b/client/cmdhfmfu.h
@@ -25,40 +25,40 @@ typedef struct {
     uint8_t data[1024];
 } mfu_dump_t;
 
-extern int CmdHF14AMfUWrBl(const char *Cmd);
-extern int CmdHF14AMfURdBl(const char *Cmd);
+int CmdHF14AMfUWrBl(const char *Cmd);
+int CmdHF14AMfURdBl(const char *Cmd);
 
 //Crypto Cards
-extern int CmdHF14AMfucAuth(const char *Cmd);
-extern int CmdHF14AMfucSetPwd(const char *Cmd);
-extern int CmdHF14AMfucSetUid(const char *Cmd);
-extern int CmdHF14AMfuGenDiverseKeys(const char *Cmd);
-extern int CmdHF14AMfuPwdGen(const char *Cmd);
+int CmdHF14AMfucAuth(const char *Cmd);
+int CmdHF14AMfucSetPwd(const char *Cmd);
+int CmdHF14AMfucSetUid(const char *Cmd);
+int CmdHF14AMfuGenDiverseKeys(const char *Cmd);
+int CmdHF14AMfuPwdGen(const char *Cmd);
 
 //general stuff
-extern int CmdHF14AMfUDump(const char *Cmd);
-extern int CmdHF14AMfURestore(const char *Cmd);
-extern int CmdHF14AMfUInfo(const char *Cmd);
-extern int CmdHF14AMfUeLoad(const char *Cmd);
-extern int CmdHF14AMfUSim(const char *Cmd);
+int CmdHF14AMfUDump(const char *Cmd);
+int CmdHF14AMfURestore(const char *Cmd);
+int CmdHF14AMfUInfo(const char *Cmd);
+int CmdHF14AMfUeLoad(const char *Cmd);
+int CmdHF14AMfUSim(const char *Cmd);
 
-extern uint32_t GetHF14AMfU_Type(void);
-extern int ul_print_type(uint32_t tagtype, uint8_t spacer);
+uint32_t GetHF14AMfU_Type(void);
+int ul_print_type(uint32_t tagtype, uint8_t spacer);
 
 void printMFUdump(mfu_dump_t *card);
 void printMFUdumpEx(mfu_dump_t *card, uint16_t pages, uint8_t startpage);
 
-extern int usage_hf_mfu_info(void);
-extern int usage_hf_mfu_dump(void);
-extern int usage_hf_mfu_rdbl(void);
-extern int usage_hf_mfu_wrbl(void);
-extern int usage_hf_mfu_eload(void);
-extern int usage_hf_mfu_sim(void);
-extern int usage_hf_mfu_ucauth(void);
-extern int usage_hf_mfu_ucsetpwd(void);
-extern int usage_hf_mfu_ucsetuid(void);
-extern int usage_hf_mfu_gendiverse(void);
-extern int usage_hf_mfu_pwdgen(void);
+int usage_hf_mfu_info(void);
+int usage_hf_mfu_dump(void);
+int usage_hf_mfu_rdbl(void);
+int usage_hf_mfu_wrbl(void);
+int usage_hf_mfu_eload(void);
+int usage_hf_mfu_sim(void);
+int usage_hf_mfu_ucauth(void);
+int usage_hf_mfu_ucsetpwd(void);
+int usage_hf_mfu_ucsetuid(void);
+int usage_hf_mfu_gendiverse(void);
+int usage_hf_mfu_pwdgen(void);
 
 int CmdHFMFUltra(const char *Cmd);
 
diff --git a/client/cmdhftopaz.h b/client/cmdhftopaz.h
index e6ba1bdcb..551031778 100644
--- a/client/cmdhftopaz.h
+++ b/client/cmdhftopaz.h
@@ -25,10 +25,10 @@
 #include "protocols.h"
 #include "cmdhf.h"
 
-extern int CmdHFTopaz(const char *Cmd);
-extern int CmdHFTopazReader(const char *Cmd);
-extern int CmdHFTopazSim(const char *Cmd);
-extern int CmdHFTopazCmdRaw(const char *Cmd);
-extern int CmdHFTopazList(const char *Cmd);
+int CmdHFTopaz(const char *Cmd);
+int CmdHFTopazReader(const char *Cmd);
+int CmdHFTopazSim(const char *Cmd);
+int CmdHFTopazCmdRaw(const char *Cmd);
+int CmdHFTopazList(const char *Cmd);
 
 #endif
diff --git a/client/cmdlf.h b/client/cmdlf.h
index ca3de7eb4..bf914d21a 100644
--- a/client/cmdlf.h
+++ b/client/cmdlf.h
@@ -55,28 +55,28 @@
 
 int CmdLF(const char *Cmd);
 
-extern int CmdLFSetConfig(const char *Cmd);
+int CmdLFSetConfig(const char *Cmd);
 
-extern int CmdLFCommandRead(const char *Cmd);
-extern int CmdFlexdemod(const char *Cmd);
-extern int CmdLFRead(const char *Cmd);
-extern int CmdLFSim(const char *Cmd);
-extern int CmdLFaskSim(const char *Cmd);
-extern int CmdLFfskSim(const char *Cmd);
-extern int CmdLFpskSim(const char *Cmd);
-extern int CmdLFSimBidir(const char *Cmd);
-extern int CmdLFSniff(const char *Cmd);
-extern int CmdVchDemod(const char *Cmd);
-extern int CmdLFfind(const char *Cmd);
+int CmdLFCommandRead(const char *Cmd);
+int CmdFlexdemod(const char *Cmd);
+int CmdLFRead(const char *Cmd);
+int CmdLFSim(const char *Cmd);
+int CmdLFaskSim(const char *Cmd);
+int CmdLFfskSim(const char *Cmd);
+int CmdLFpskSim(const char *Cmd);
+int CmdLFSimBidir(const char *Cmd);
+int CmdLFSniff(const char *Cmd);
+int CmdVchDemod(const char *Cmd);
+int CmdLFfind(const char *Cmd);
 
-extern bool lf_read(bool silent, uint32_t samples);
+bool lf_read(bool silent, uint32_t samples);
 
 // usages helptext
-extern int usage_lf_cmdread(void);
-extern int usage_lf_read(void);
-extern int usage_lf_sniff(void);
-extern int usage_lf_config(void);
-extern int usage_lf_simfsk(void);
-extern int usage_lf_simask(void);
-extern int usage_lf_simpsk(void);
+int usage_lf_cmdread(void);
+int usage_lf_read(void);
+int usage_lf_sniff(void);
+int usage_lf_config(void);
+int usage_lf_simfsk(void);
+int usage_lf_simask(void);
+int usage_lf_simpsk(void);
 #endif
diff --git a/client/cmdlfawid.h b/client/cmdlfawid.h
index edee0473c..e971225e2 100644
--- a/client/cmdlfawid.h
+++ b/client/cmdlfawid.h
@@ -24,17 +24,17 @@
 #include "util_posix.h"
 
 
-extern int CmdLFAWID(const char *Cmd);
-extern int CmdAWIDDemod(const char *Cmd);
-extern int CmdAWIDRead(const char *Cmd);
-extern int CmdAWIDSim(const char *Cmd);
-extern int CmdAWIDClone(const char *Cmd);
-extern int CmdAWIDBrute(const char *Cmd);
-extern int getAWIDBits(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint8_t *bits);
+int CmdLFAWID(const char *Cmd);
+int CmdAWIDDemod(const char *Cmd);
+int CmdAWIDRead(const char *Cmd);
+int CmdAWIDSim(const char *Cmd);
+int CmdAWIDClone(const char *Cmd);
+int CmdAWIDBrute(const char *Cmd);
+int getAWIDBits(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint8_t *bits);
 
-extern int usage_lf_awid_read(void);
-extern int usage_lf_awid_sim(void);
-extern int usage_lf_awid_clone(void);
-extern int usage_lf_awid_brute(void);
+int usage_lf_awid_read(void);
+int usage_lf_awid_sim(void);
+int usage_lf_awid_clone(void);
+int usage_lf_awid_brute(void);
 
 #endif
diff --git a/client/cmdlfcotag.h b/client/cmdlfcotag.h
index b774b12a8..7b0922019 100644
--- a/client/cmdlfcotag.h
+++ b/client/cmdlfcotag.h
@@ -23,9 +23,9 @@
 #define COTAG_BITS 264
 #endif
 
-extern int CmdLFCOTAG(const char *Cmd);
-extern int CmdCOTAGRead(const char *Cmd);
-extern int CmdCOTAGDemod(const char *Cmd);
+int CmdLFCOTAG(const char *Cmd);
+int CmdCOTAGRead(const char *Cmd);
+int CmdCOTAGDemod(const char *Cmd);
 
-extern int usage_lf_cotag_read(void);
+int usage_lf_cotag_read(void);
 #endif
diff --git a/client/cmdlfem4x.h b/client/cmdlfem4x.h
index d01dedc57..08670a4b3 100644
--- a/client/cmdlfem4x.h
+++ b/client/cmdlfem4x.h
@@ -25,44 +25,44 @@
 #include "cmdlf.h"
 #include "lfdemod.h"
 
-extern int CmdLFEM4X(const char *Cmd);
+int CmdLFEM4X(const char *Cmd);
 
 
-extern int CmdEM410xDemod(const char *Cmd);
-extern int CmdEM410xRead(const char *Cmd);
-extern int CmdEM410xSim(const char *Cmd);
-extern int CmdEM410xBrute(const char *Cmd);
-extern int CmdEM410xWatch(const char *Cmd);
-extern int CmdEM410xWatchnSpoof(const char *Cmd);
-extern int CmdEM410xWrite(const char *Cmd);
-extern int CmdEM4x05Dump(const char *Cmd);
-extern int CmdEM4x05Info(const char *Cmd);
-extern int CmdEM4x05Read(const char *Cmd);
-extern int CmdEM4x05Write(const char *Cmd);
-extern int CmdEM4x50Read(const char *Cmd);
-extern int CmdEM4x50Write(const char *Cmd);
-extern int CmdEM4x50Dump(const char *Cmd);
+int CmdEM410xDemod(const char *Cmd);
+int CmdEM410xRead(const char *Cmd);
+int CmdEM410xSim(const char *Cmd);
+int CmdEM410xBrute(const char *Cmd);
+int CmdEM410xWatch(const char *Cmd);
+int CmdEM410xWatchnSpoof(const char *Cmd);
+int CmdEM410xWrite(const char *Cmd);
+int CmdEM4x05Dump(const char *Cmd);
+int CmdEM4x05Info(const char *Cmd);
+int CmdEM4x05Read(const char *Cmd);
+int CmdEM4x05Write(const char *Cmd);
+int CmdEM4x50Read(const char *Cmd);
+int CmdEM4x50Write(const char *Cmd);
+int CmdEM4x50Dump(const char *Cmd);
 
-extern int EM4x50Read(const char *Cmd, bool verbose);
+int EM4x50Read(const char *Cmd, bool verbose);
 bool EM4x05IsBlock0(uint32_t *word);
 
-extern void printEM410x(uint32_t hi, uint64_t id);
-extern int AskEm410xDecode(bool verbose, uint32_t *hi, uint64_t *lo);
-extern int AskEm410xDemod(const char *Cmd, uint32_t *hi, uint64_t *lo, bool verbose);
+void printEM410x(uint32_t hi, uint64_t id);
+int AskEm410xDecode(bool verbose, uint32_t *hi, uint64_t *lo);
+int AskEm410xDemod(const char *Cmd, uint32_t *hi, uint64_t *lo, bool verbose);
 
-extern int usage_lf_em410x_sim(void);
-extern int usage_lf_em410x_ws(void);
-extern int usage_lf_em410x_clone(void);
-extern int usage_lf_em410x_sim(void);
-extern int usage_lf_em410x_brute(void);
+int usage_lf_em410x_sim(void);
+int usage_lf_em410x_ws(void);
+int usage_lf_em410x_clone(void);
+int usage_lf_em410x_sim(void);
+int usage_lf_em410x_brute(void);
 
-extern int usage_lf_em4x50_dump(void);
-extern int usage_lf_em4x50_read(void);
-extern int usage_lf_em4x50_write(void);
+int usage_lf_em4x50_dump(void);
+int usage_lf_em4x50_read(void);
+int usage_lf_em4x50_write(void);
 
-extern int usage_lf_em4x05_dump(void);
-extern int usage_lf_em4x05_read(void);
-extern int usage_lf_em4x05_write(void);
-extern int usage_lf_em4x05_info(void);
+int usage_lf_em4x05_dump(void);
+int usage_lf_em4x05_read(void);
+int usage_lf_em4x05_write(void);
+int usage_lf_em4x05_info(void);
 
 #endif
diff --git a/client/cmdlffdx.h b/client/cmdlffdx.h
index 1ae12633a..1bc2428fc 100644
--- a/client/cmdlffdx.h
+++ b/client/cmdlffdx.h
@@ -19,17 +19,17 @@
 #include "protocols.h"  // for T55xx config register definitions
 #include "lfdemod.h"    // parityTest
 
-extern int CmdLFFdx(const char *Cmd);
-extern int CmdFdxClone(const char *Cmd);
-extern int CmdFdxSim(const char *Cmd);
-extern int CmdFdxRead(const char *Cmd);
-extern int CmdFdxDemod(const char *Cmd);
+int CmdLFFdx(const char *Cmd);
+int CmdFdxClone(const char *Cmd);
+int CmdFdxSim(const char *Cmd);
+int CmdFdxRead(const char *Cmd);
+int CmdFdxDemod(const char *Cmd);
 
 int getFDXBits(uint64_t national_id, uint16_t country, uint8_t isanimal, uint8_t isextended, uint32_t extended, uint8_t *bits);
 
-extern int usage_lf_fdx_clone(void);
-extern int usage_lf_fdx_sim(void);
-extern int usage_lf_fdx_read(void);
-extern int usage_lf_fdx_demod(void);
+int usage_lf_fdx_clone(void);
+int usage_lf_fdx_sim(void);
+int usage_lf_fdx_read(void);
+int usage_lf_fdx_demod(void);
 #endif
 
diff --git a/client/cmdlfguard.h b/client/cmdlfguard.h
index b01a99aff..749307bea 100644
--- a/client/cmdlfguard.h
+++ b/client/cmdlfguard.h
@@ -22,12 +22,12 @@
 #include "lfdemod.h"    // parityTest
 #include "crc.h"
 
-extern int CmdLFGuard(const char *Cmd);
-extern int CmdGuardDemod(const char *Cmd);
-extern int CmdGuardRead(const char *Cmd);
-extern int CmdGuardClone(const char *Cmd);
-extern int CmdGuardSim(const char *Cmd);
+int CmdLFGuard(const char *Cmd);
+int CmdGuardDemod(const char *Cmd);
+int CmdGuardRead(const char *Cmd);
+int CmdGuardClone(const char *Cmd);
+int CmdGuardSim(const char *Cmd);
 
-extern int usage_lf_guard_clone(void);
-extern int usage_lf_quard_sim(void);
+int usage_lf_guard_clone(void);
+int usage_lf_quard_sim(void);
 #endif
diff --git a/client/cmdlfhid.h b/client/cmdlfhid.h
index 48d6f63a2..422658822 100644
--- a/client/cmdlfhid.h
+++ b/client/cmdlfhid.h
@@ -24,20 +24,20 @@
 #include "util_posix.h"
 #include "lfdemod.h"
 
-extern int CmdLFHID(const char *Cmd);
-extern int CmdHIDDemod(const char *Cmd);
-extern int CmdHIDRead(const char *Cmd);
-extern int CmdHIDSim(const char *Cmd);
-extern int CmdHIDClone(const char *Cmd);
-extern int CmdHIDWiegand(const char *Cmd);
-extern int CmdHIDBrute(const char *Cmd);
+int CmdLFHID(const char *Cmd);
+int CmdHIDDemod(const char *Cmd);
+int CmdHIDRead(const char *Cmd);
+int CmdHIDSim(const char *Cmd);
+int CmdHIDClone(const char *Cmd);
+int CmdHIDWiegand(const char *Cmd);
+int CmdHIDBrute(const char *Cmd);
 
-extern int usage_lf_hid_read(void);
-extern int usage_lf_hid_wiegand(void);
-extern int usage_lf_hid_sim(void);
-extern int usage_lf_hid_clone(void);
-extern int usage_lf_hid_brute(void);
+int usage_lf_hid_read(void);
+int usage_lf_hid_wiegand(void);
+int usage_lf_hid_sim(void);
+int usage_lf_hid_clone(void);
+int usage_lf_hid_brute(void);
 
 //void calc26(uint16_t fc, uint32_t cardno, uint8_t *out);
-extern void calcWiegand(uint8_t fmtlen, uint16_t fc, uint64_t cardno, uint8_t *bits);
+void calcWiegand(uint8_t fmtlen, uint16_t fc, uint64_t cardno, uint8_t *bits);
 #endif
diff --git a/client/cmdlfhitag.h b/client/cmdlfhitag.h
index eb5bb2dd0..6728d00e0 100644
--- a/client/cmdlfhitag.h
+++ b/client/cmdlfhitag.h
@@ -11,15 +11,15 @@
 #ifndef CMDLFHITAG_H__
 #define CMDLFHITAG_H__
 
-extern int CmdLFHitag(const char *Cmd);
+int CmdLFHitag(const char *Cmd);
 
-extern int CmdLFHitagList(const char *Cmd);
-extern int CmdLFHitagSniff(const char *Cmd);
-extern int CmdLFHitagSim(const char *Cmd);
-extern int CmdLFHitagInfo(const char *Cmd);
-extern int CmdLFHitagReader(const char *Cmd);
-extern int CmdLFHitagCheckChallenges(const char *Cmd);
-extern int CmdLFHitagWriter(const char *Cmd);
-extern int CmdLFHitagDump(const char *cmd);
+int CmdLFHitagList(const char *Cmd);
+int CmdLFHitagSniff(const char *Cmd);
+int CmdLFHitagSim(const char *Cmd);
+int CmdLFHitagInfo(const char *Cmd);
+int CmdLFHitagReader(const char *Cmd);
+int CmdLFHitagCheckChallenges(const char *Cmd);
+int CmdLFHitagWriter(const char *Cmd);
+int CmdLFHitagDump(const char *cmd);
 
 #endif
diff --git a/client/cmdlfindala.h b/client/cmdlfindala.h
index 8352421cc..7bfdd1eae 100644
--- a/client/cmdlfindala.h
+++ b/client/cmdlfindala.h
@@ -23,19 +23,19 @@
 #include "cmddata.h"
 #include "cmdlf.h"      // lf_read
 
-extern int CmdLFINDALA(const char *Cmd);
+int CmdLFINDALA(const char *Cmd);
 
-extern int CmdIndalaDemod(const char *Cmd);
-extern int CmdIndalaDemodAlt(const char *Cmd);
-extern int CmdIndalaRead(const char *Cmd);
-extern int CmdIndalaClone(const char *Cmd);
-extern int CmdIndalaSim(const char *Cmd);
+int CmdIndalaDemod(const char *Cmd);
+int CmdIndalaDemodAlt(const char *Cmd);
+int CmdIndalaRead(const char *Cmd);
+int CmdIndalaClone(const char *Cmd);
+int CmdIndalaSim(const char *Cmd);
 
-extern int detectIndala26(uint8_t *bitStream, size_t *size, uint8_t *invert);
-extern int detectIndala64(uint8_t *bitStream, size_t *size, uint8_t *invert);
-extern int detectIndala224(uint8_t *bitStream, size_t *size, uint8_t *invert);
+int detectIndala26(uint8_t *bitStream, size_t *size, uint8_t *invert);
+int detectIndala64(uint8_t *bitStream, size_t *size, uint8_t *invert);
+int detectIndala224(uint8_t *bitStream, size_t *size, uint8_t *invert);
 
-extern int usage_lf_indala_demod(void);
-extern int usage_lf_indala_clone(void);
-extern int usage_lf_indala_sim(void);
+int usage_lf_indala_demod(void);
+int usage_lf_indala_clone(void);
+int usage_lf_indala_sim(void);
 #endif
diff --git a/client/cmdlfio.h b/client/cmdlfio.h
index 6bdb4b88f..5066fee87 100644
--- a/client/cmdlfio.h
+++ b/client/cmdlfio.h
@@ -16,15 +16,15 @@
 #include "cmdmain.h"
 #include "cmddata.h"
 
-extern int CmdLFIO(const char *Cmd);
-extern int CmdIOProxDemod(const char *Cmd);
-extern int CmdIOProxRead(const char *Cmd);
-extern int CmdIOProxSim(const char *Cmd);
-extern int CmdIOProxClone(const char *Cmd);
+int CmdLFIO(const char *Cmd);
+int CmdIOProxDemod(const char *Cmd);
+int CmdIOProxRead(const char *Cmd);
+int CmdIOProxSim(const char *Cmd);
+int CmdIOProxClone(const char *Cmd);
 
 int getIOProxBits(uint8_t version, uint8_t fc, uint16_t cn, uint8_t *bits);
 
-extern int usage_lf_io_read(void);
-extern int usage_lf_io_clone(void);
-extern int usage_lf_io_sim(void);
+int usage_lf_io_read(void);
+int usage_lf_io_clone(void);
+int usage_lf_io_sim(void);
 #endif
diff --git a/client/cmdlfjablotron.h b/client/cmdlfjablotron.h
index 127157e67..5079a6f76 100644
--- a/client/cmdlfjablotron.h
+++ b/client/cmdlfjablotron.h
@@ -22,20 +22,20 @@
 #include "protocols.h"  // for T55xx config register definitions
 #include "lfdemod.h"    // parityTest
 
-extern int CmdLFJablotron(const char *Cmd);
+int CmdLFJablotron(const char *Cmd);
 
-extern int CmdJablotronDemod(const char *Cmd);
-extern int CmdJablotronRead(const char *Cmd);
-extern int CmdJablotronClone(const char *Cmd);
-extern int CmdJablotronSim(const char *Cmd);
+int CmdJablotronDemod(const char *Cmd);
+int CmdJablotronRead(const char *Cmd);
+int CmdJablotronClone(const char *Cmd);
+int CmdJablotronSim(const char *Cmd);
 
-extern int detectJablotron(uint8_t *bits, size_t *size);
-extern int getJablotronBits(uint64_t fullcode, uint8_t *bits);
+int detectJablotron(uint8_t *bits, size_t *size);
+int getJablotronBits(uint64_t fullcode, uint8_t *bits);
 
-//extern int usage_lf_jablotron_demod(void);
-//extern int usage_lf_jablotron_read(void);
-extern int usage_lf_jablotron_clone(void);
-extern int usage_lf_jablotron_sim(void);
+//int usage_lf_jablotron_demod(void);
+//int usage_lf_jablotron_read(void);
+int usage_lf_jablotron_clone(void);
+int usage_lf_jablotron_sim(void);
 
 #endif
 
diff --git a/client/cmdlfkeri.h b/client/cmdlfkeri.h
index ed0629b37..b2e1c89ad 100644
--- a/client/cmdlfkeri.h
+++ b/client/cmdlfkeri.h
@@ -22,15 +22,15 @@
 #include "protocols.h"  // for T55xx config register definitions
 #include "lfdemod.h"    // preamble test
 
-extern int CmdLFKeri(const char *Cmd);
-extern int CmdKeriRead(const char *Cmd);
-extern int CmdKeriDemod(const char *Cmd);
-extern int CmdKeriClone(const char *Cmd);
-extern int CmdKeriSim(const char *Cmd);
+int CmdLFKeri(const char *Cmd);
+int CmdKeriRead(const char *Cmd);
+int CmdKeriDemod(const char *Cmd);
+int CmdKeriClone(const char *Cmd);
+int CmdKeriSim(const char *Cmd);
 
-extern int detectKeri(uint8_t *dest, size_t *size, bool *invert);
+int detectKeri(uint8_t *dest, size_t *size, bool *invert);
 
-extern int usage_lf_keri_clone(void);
-extern int usage_lf_keri_sim(void);
+int usage_lf_keri_clone(void);
+int usage_lf_keri_sim(void);
 #endif
 
diff --git a/client/cmdlfnedap.h b/client/cmdlfnedap.h
index fd10c5e76..6cacfd638 100644
--- a/client/cmdlfnedap.h
+++ b/client/cmdlfnedap.h
@@ -22,17 +22,17 @@
 #include "lfdemod.h"    // parityTest
 #include "crc.h"
 
-extern int CmdLFNedap(const char *Cmd);
-extern int CmdLFNedapDemod(const char *Cmd);
-extern int CmdLFNedapRead(const char *Cmd);
-//extern int CmdLFNedapClone(const char *Cmd);
-extern int CmdLFNedapSim(const char *Cmd);
-extern int CmdLFNedapChk(const char *Cmd);
+int CmdLFNedap(const char *Cmd);
+int CmdLFNedapDemod(const char *Cmd);
+int CmdLFNedapRead(const char *Cmd);
+//int CmdLFNedapClone(const char *Cmd);
+int CmdLFNedapSim(const char *Cmd);
+int CmdLFNedapChk(const char *Cmd);
 
-extern int detectNedap(uint8_t *dest, size_t *size);
+int detectNedap(uint8_t *dest, size_t *size);
 
-extern int usage_lf_nedap_read(void);
-//extern int usage_lf_nedap_clone(void);
-extern int usage_lf_nedap_sim(void);
+int usage_lf_nedap_read(void);
+//int usage_lf_nedap_clone(void);
+int usage_lf_nedap_sim(void);
 #endif
 
diff --git a/client/cmdlfnexwatch.h b/client/cmdlfnexwatch.h
index 82782926a..7b08c1294 100644
--- a/client/cmdlfnexwatch.h
+++ b/client/cmdlfnexwatch.h
@@ -22,9 +22,9 @@
 #include "cmdlf.h"
 #include "lfdemod.h"
 
-extern int CmdLFNEXWATCH(const char *Cmd);
-extern int CmdNexWatchDemod(const char *Cmd);
-extern int CmdNexWatchRead(const char *Cmd);
+int CmdLFNEXWATCH(const char *Cmd);
+int CmdNexWatchDemod(const char *Cmd);
+int CmdNexWatchRead(const char *Cmd);
 
-extern int detectNexWatch(uint8_t *dest, size_t *size, bool *invert);
+int detectNexWatch(uint8_t *dest, size_t *size, bool *invert);
 #endif
diff --git a/client/cmdlfnoralsy.h b/client/cmdlfnoralsy.h
index 63065a0d6..c9986d0ea 100644
--- a/client/cmdlfnoralsy.h
+++ b/client/cmdlfnoralsy.h
@@ -22,17 +22,17 @@
 #include "protocols.h"  // for T55xx config register definitions
 #include "lfdemod.h"    // parityTest
 
-extern int CmdLFNoralsy(const char *Cmd);
-extern int CmdNoralsyDemod(const char *Cmd);
-extern int CmdNoralsyRead(const char *Cmd);
-extern int CmdNoralsyClone(const char *Cmd);
-extern int CmdNoralsySim(const char *Cmd);
+int CmdLFNoralsy(const char *Cmd);
+int CmdNoralsyDemod(const char *Cmd);
+int CmdNoralsyRead(const char *Cmd);
+int CmdNoralsyClone(const char *Cmd);
+int CmdNoralsySim(const char *Cmd);
 
 int getnoralsyBits(uint32_t id, uint16_t year, uint8_t *bits);
 
-extern int usage_lf_noralsy_clone(void);
-extern int usage_lf_noralsy_sim(void);
-//extern int usage_lf_noralsy_read(void);
-//extern int usage_lf_noralsy_demod(void);
+int usage_lf_noralsy_clone(void);
+int usage_lf_noralsy_sim(void);
+//int usage_lf_noralsy_read(void);
+//int usage_lf_noralsy_demod(void);
 #endif
 
diff --git a/client/cmdlfpac.h b/client/cmdlfpac.h
index 88e97a42e..54b2b3366 100644
--- a/client/cmdlfpac.h
+++ b/client/cmdlfpac.h
@@ -21,10 +21,10 @@
 #include "cmdlf.h"
 #include "lfdemod.h"    // preamble test
 
-extern int CmdLFPac(const char *Cmd);
-extern int CmdPacRead(const char *Cmd);
-extern int CmdPacDemod(const char *Cmd);
+int CmdLFPac(const char *Cmd);
+int CmdPacRead(const char *Cmd);
+int CmdPacDemod(const char *Cmd);
 
-extern int detectPac(uint8_t *dest, size_t *size);
+int detectPac(uint8_t *dest, size_t *size);
 #endif
 
diff --git a/client/cmdlfparadox.h b/client/cmdlfparadox.h
index 44045f114..1b6211716 100644
--- a/client/cmdlfparadox.h
+++ b/client/cmdlfparadox.h
@@ -8,12 +8,12 @@
 //-----------------------------------------------------------------------------
 #ifndef CMDLFPARADOX_H__
 #define CMDLFPARADOX_H__
-extern int CmdLFParadox(const char *Cmd);
-extern int CmdParadoxDemod(const char *Cmd);
-extern int CmdParadoxRead(const char *Cmd);
+int CmdLFParadox(const char *Cmd);
+int CmdParadoxDemod(const char *Cmd);
+int CmdParadoxRead(const char *Cmd);
 
-//extern int CmdParadoxClone(const char *Cmd);
-extern int CmdParadoxSim(const char *Cmd);
+//int CmdParadoxClone(const char *Cmd);
+int CmdParadoxSim(const char *Cmd);
 
-extern int detectParadox(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32_t *lo, int *waveStartIdx);
+int detectParadox(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32_t *lo, int *waveStartIdx);
 #endif
diff --git a/client/cmdlfpresco.h b/client/cmdlfpresco.h
index 563f0ac98..5ae74a11f 100644
--- a/client/cmdlfpresco.h
+++ b/client/cmdlfpresco.h
@@ -21,16 +21,16 @@
 #include "protocols.h"  // for T55xx config register definitions
 #include "lfdemod.h"    // parityTest
 
-extern int CmdLFPresco(const char *Cmd);
-extern int CmdPrescoRead(const char *Cmd);
-extern int CmdPrescoDemod(const char *Cmd);
-extern int CmdPrescoClone(const char *Cmd);
-extern int CmdPrescoSim(const char *Cmd);
+int CmdLFPresco(const char *Cmd);
+int CmdPrescoRead(const char *Cmd);
+int CmdPrescoDemod(const char *Cmd);
+int CmdPrescoClone(const char *Cmd);
+int CmdPrescoSim(const char *Cmd);
 
-extern int detectPresco(uint8_t *dest, size_t *size);
+int detectPresco(uint8_t *dest, size_t *size);
 int GetWiegandFromPresco(const char *id, uint32_t *sitecode, uint32_t *usercode, uint32_t *fullcode, bool *Q5);
 
-extern int usage_lf_presco_clone(void);
-extern int usage_lf_presco_sim(void);
+int usage_lf_presco_clone(void);
+int usage_lf_presco_sim(void);
 #endif
 
diff --git a/client/cmdlfpyramid.h b/client/cmdlfpyramid.h
index 425914bbb..fe2b62ef9 100644
--- a/client/cmdlfpyramid.h
+++ b/client/cmdlfpyramid.h
@@ -22,15 +22,15 @@
 #include "lfdemod.h"    // parityTest
 #include "crc.h"
 
-extern int CmdLFPyramid(const char *Cmd);
-extern int CmdPyramidDemod(const char *Cmd);
-extern int CmdPyramidRead(const char *Cmd);
-extern int CmdPyramidClone(const char *Cmd);
-extern int CmdPyramidSim(const char *Cmd);
+int CmdLFPyramid(const char *Cmd);
+int CmdPyramidDemod(const char *Cmd);
+int CmdPyramidRead(const char *Cmd);
+int CmdPyramidClone(const char *Cmd);
+int CmdPyramidSim(const char *Cmd);
 
-extern int detectPyramid(uint8_t *dest, size_t *size, int *waveStartIdx);
+int detectPyramid(uint8_t *dest, size_t *size, int *waveStartIdx);
 
-extern int usage_lf_pyramid_clone(void);
-extern int usage_lf_pyramid_sim(void);
+int usage_lf_pyramid_clone(void);
+int usage_lf_pyramid_sim(void);
 #endif
 
diff --git a/client/cmdlfsecurakey.h b/client/cmdlfsecurakey.h
index 5155c2ada..bdeae02b7 100644
--- a/client/cmdlfsecurakey.h
+++ b/client/cmdlfsecurakey.h
@@ -24,11 +24,11 @@
 #include "lfdemod.h"    // preamble test
 #include "parity.h"     // for wiegand parity test
 
-extern int CmdLFSecurakey(const char *Cmd);
-//extern int CmdSecurakeyClone(const char *Cmd);
-//extern int CmdSecurakeySim(const char *Cmd);
-extern int CmdSecurakeyRead(const char *Cmd);
-extern int CmdSecurakeyDemod(const char *Cmd);
+int CmdLFSecurakey(const char *Cmd);
+//int CmdSecurakeyClone(const char *Cmd);
+//int CmdSecurakeySim(const char *Cmd);
+int CmdSecurakeyRead(const char *Cmd);
+int CmdSecurakeyDemod(const char *Cmd);
 
 #endif
 
diff --git a/client/cmdlfviking.h b/client/cmdlfviking.h
index 503534eaf..96b4e9ac4 100644
--- a/client/cmdlfviking.h
+++ b/client/cmdlfviking.h
@@ -21,16 +21,16 @@
 #include "cmdlf.h"
 #include "lfdemod.h"
 
-extern int CmdLFViking(const char *Cmd);
+int CmdLFViking(const char *Cmd);
 
-extern int CmdVikingDemod(const char *Cmd);
-extern int CmdVikingRead(const char *Cmd);
-extern int CmdVikingClone(const char *Cmd);
-extern int CmdVikingSim(const char *Cmd);
+int CmdVikingDemod(const char *Cmd);
+int CmdVikingRead(const char *Cmd);
+int CmdVikingClone(const char *Cmd);
+int CmdVikingSim(const char *Cmd);
 
-extern int detectViking(uint8_t *dest, size_t *size);
+int detectViking(uint8_t *dest, size_t *size);
 
-extern int usage_lf_viking_clone(void);
-extern int usage_lf_viking_sim(void);
+int usage_lf_viking_clone(void);
+int usage_lf_viking_sim(void);
 #endif
 
diff --git a/client/cmdlfvisa2000.h b/client/cmdlfvisa2000.h
index a266fa76e..cb0b102de 100644
--- a/client/cmdlfvisa2000.h
+++ b/client/cmdlfvisa2000.h
@@ -21,19 +21,19 @@
 #include "cmdlf.h"
 #include "protocols.h"  // for T55xx config register definitions
 #include "lfdemod.h"    // parityTest
-extern int CmdLFVisa2k(const char *Cmd);
+int CmdLFVisa2k(const char *Cmd);
 
-extern int CmdVisa2kDemod(const char *Cmd);
-extern int CmdVisa2kRead(const char *Cmd);
-extern int CmdVisa2kClone(const char *Cmd);
-extern int CmdVisa2kSim(const char *Cmd);
+int CmdVisa2kDemod(const char *Cmd);
+int CmdVisa2kRead(const char *Cmd);
+int CmdVisa2kClone(const char *Cmd);
+int CmdVisa2kSim(const char *Cmd);
 
 int getvisa2kBits(uint64_t fullcode, uint8_t *bits);
-extern int detectVisa2k(uint8_t *dest, size_t *size);
+int detectVisa2k(uint8_t *dest, size_t *size);
 
-extern int usage_lf_visa2k_clone(void);
-extern int usage_lf_visa2k_sim(void);
-//extern int usage_lf_visa2k_read(void);
-//extern int usage_lf_visa2k_demod(void);
+int usage_lf_visa2k_clone(void);
+int usage_lf_visa2k_sim(void);
+//int usage_lf_visa2k_read(void);
+//int usage_lf_visa2k_demod(void);
 #endif
 
diff --git a/client/cmdmain.h b/client/cmdmain.h
index d5ac8e5a4..c729f8d77 100644
--- a/client/cmdmain.h
+++ b/client/cmdmain.h
@@ -41,7 +41,7 @@
 #include "cmdsmartcard.h" // rdv40 smart card ISO7816 commands
 #endif
 
-extern int CommandReceived(char *Cmd);
-extern command_t *getTopLevelCommandTable();
+int CommandReceived(char *Cmd);
+command_t *getTopLevelCommandTable();
 
 #endif
diff --git a/client/cmdscript.h b/client/cmdscript.h
index fb915d950..55d735c0a 100644
--- a/client/cmdscript.h
+++ b/client/cmdscript.h
@@ -11,8 +11,8 @@
 #ifndef CMDSCRIPT_H__
 #define CMDSCRIPT_H__
 
-extern int CmdScript(const char *Cmd);
+int CmdScript(const char *Cmd);
 
-extern int CmdScriptList(const char *Cmd);
-extern int CmdScriptRun(const char *Cmd);
+int CmdScriptList(const char *Cmd);
+int CmdScriptRun(const char *Cmd);
 #endif
diff --git a/client/cmdsmartcard.h b/client/cmdsmartcard.h
index 251859761..f7adb7690 100644
--- a/client/cmdsmartcard.h
+++ b/client/cmdsmartcard.h
@@ -27,18 +27,18 @@
 #include "emv/dump.h"           // dump_buffer
 #include "crypto/libpcrypto.h"	// sha512hash
 
-extern int CmdSmartcard(const char *Cmd);
+int CmdSmartcard(const char *Cmd);
 
-extern int CmdSmartRaw(const char *cmd);
-extern int CmdSmartUpgrade(const char *cmd);
-extern int CmdSmartInfo(const char *cmd);
-extern int CmdSmartReader(const char *Cmd);
+int CmdSmartRaw(const char *cmd);
+int CmdSmartUpgrade(const char *cmd);
+int CmdSmartInfo(const char *cmd);
+int CmdSmartReader(const char *Cmd);
 
-extern bool smart_select(bool silent, smart_card_atr_t *atr);
-extern int ExchangeAPDUSC(uint8_t *datain, int datainlen, bool activateCard, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen);
+bool smart_select(bool silent, smart_card_atr_t *atr);
+int ExchangeAPDUSC(uint8_t *datain, int datainlen, bool activateCard, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen);
 
-extern int usage_sm_raw(void);
-extern int usage_sm_reader(void);
-extern int usage_sm_info(void);
-extern int usage_sm_upgrade(void);
+int usage_sm_raw(void);
+int usage_sm_reader(void);
+int usage_sm_info(void);
+int usage_sm_upgrade(void);
 #endif
diff --git a/client/cmdtrace.h b/client/cmdtrace.h
index 0d370123d..0191bf0e1 100644
--- a/client/cmdtrace.h
+++ b/client/cmdtrace.h
@@ -27,14 +27,14 @@
 #include "comms.h"              // for sending cmds to device. GetFromBigBuf
 #include "loclass/fileutils.h"  // for saveFile
 
-extern int CmdTrace(const char *Cmd);
+int CmdTrace(const char *Cmd);
 
-extern int CmdTraceList(const char *Cmd);
-extern int CmdTraceLoad(const char *Cmd);
-extern int CmdTraceSave(const char *Cmd);
+int CmdTraceList(const char *Cmd);
+int CmdTraceLoad(const char *Cmd);
+int CmdTraceSave(const char *Cmd);
 
 // usages helptext
-extern int usage_trace_list(void);
-extern int usage_trace_load(void);
-extern int usage_trace_save(void);
+int usage_trace_list(void);
+int usage_trace_load(void);
+int usage_trace_save(void);
 #endif
diff --git a/client/comms.h b/client/comms.h
index b0687ac60..b8e33beee 100644
--- a/client/comms.h
+++ b/client/comms.h
@@ -62,7 +62,7 @@ bool WaitForResponseTimeoutW(uint32_t cmd, UsbCommand *response, size_t ms_timeo
 bool WaitForResponseTimeout(uint32_t cmd, UsbCommand *response, size_t ms_timeout);
 bool WaitForResponse(uint32_t cmd, UsbCommand *response);
 
-extern bool GetFromDevice(DeviceMemType_t memtype, uint8_t *dest, uint32_t bytes, uint32_t start_index, UsbCommand *response, size_t ms_timeout, bool show_warning);
+bool GetFromDevice(DeviceMemType_t memtype, uint8_t *dest, uint32_t bytes, uint32_t start_index, UsbCommand *response, size_t ms_timeout, bool show_warning);
 
 #endif
 
diff --git a/client/crypto/asn1utils.h b/client/crypto/asn1utils.h
index 19f8ded70..60c94e34a 100644
--- a/client/crypto/asn1utils.h
+++ b/client/crypto/asn1utils.h
@@ -15,7 +15,7 @@
 #include <stdbool.h>
 #include <stddef.h>
 
-extern int asn1_print(uint8_t *asn1buf, size_t asn1buflen, char *indent);
-extern int ecdsa_asn1_get_signature(uint8_t *signature, size_t signaturelen, uint8_t *rval, uint8_t *sval);
+int asn1_print(uint8_t *asn1buf, size_t asn1buflen, char *indent);
+int ecdsa_asn1_get_signature(uint8_t *signature, size_t signaturelen, uint8_t *rval, uint8_t *sval);
 
 #endif /* asn1utils.h */
diff --git a/client/proxgui.h b/client/proxgui.h
index 5f6d8bd2a..ada09d838 100644
--- a/client/proxgui.h
+++ b/client/proxgui.h
@@ -36,10 +36,10 @@ extern bool GridLocked;
 
 //Operations defined in data_operations
 //extern int autoCorr(const int* in, int *out, size_t len, int window);
-extern int AskEdgeDetect(const int *in, int *out, int len, int threshold);
-extern int AutoCorrelate(const int *in, int *out, size_t len, int window, bool SaveGrph, bool verbose);
-extern int directionalThreshold(const int *in, int *out, size_t len, int8_t up, int8_t down);
-extern void save_restoreGB(uint8_t saveOpt);
+int AskEdgeDetect(const int *in, int *out, int len, int threshold);
+int AutoCorrelate(const int *in, int *out, size_t len, int window, bool SaveGrph, bool verbose);
+int directionalThreshold(const int *in, int *out, size_t len, int8_t up, int8_t down);
+void save_restoreGB(uint8_t saveOpt);
 
 #define GRAPH_SAVE 1
 #define GRAPH_RESTORE 0
diff --git a/client/scandir.h b/client/scandir.h
index 7155c5a79..905431cbe 100644
--- a/client/scandir.h
+++ b/client/scandir.h
@@ -15,8 +15,8 @@
 #include <stdlib.h>
 
 #ifdef _WIN32
-extern int scandir(const char *dir, struct dirent ***namelist, int (*select)(const struct dirent *), int (*compar)(const struct dirent **, const struct dirent **));
-extern int alphasort(const struct dirent **a, const struct dirent **b);
+int scandir(const char *dir, struct dirent ***namelist, int (*select)(const struct dirent *), int (*compar)(const struct dirent **, const struct dirent **));
+int alphasort(const struct dirent **a, const struct dirent **b);
 #endif // _WIN32
 
 #endif // SCANDIR_H__
diff --git a/client/ui.h b/client/ui.h
index 827c3828e..7df965976 100644
--- a/client/ui.h
+++ b/client/ui.h
@@ -33,10 +33,10 @@ void ShowGui(void);
 void HideGraphWindow(void);
 void ShowGraphWindow(void);
 void RepaintGraphWindow(void);
-extern void PrintAndLog(char *fmt, ...);
+void PrintAndLog(char *fmt, ...);
 void PrintAndLogOptions(char *str[][2], size_t size, size_t space);
 void PrintAndLogEx(logLevel_t level, char *fmt, ...);
-extern void SetLogFilename(char *fn);
+void SetLogFilename(char *fn);
 void SetFlushAfterWrite(bool value);
 
 extern double CursorScaleFactor;
@@ -48,6 +48,6 @@ extern bool showDemod;
 
 extern pthread_mutex_t print_lock;
 
-extern void iceIIR_Butterworth(int *data, const size_t len);
-extern void iceSimple_Filter(int *data, const size_t len, uint8_t k);
+void iceIIR_Butterworth(int *data, const size_t len);
+void iceSimple_Filter(int *data, const size_t len, uint8_t k);
 #endif
diff --git a/client/util.h b/client/util.h
index cf5f97360..208ae61f0 100644
--- a/client/util.h
+++ b/client/util.h
@@ -186,81 +186,81 @@
     }
 #endif
 
-extern uint8_t g_debugMode;
+uint8_t g_debugMode;
 
-extern int ukbhit(void);
-extern void AddLogLine(char *fn, char *data, char *c);
-extern void AddLogHex(char *fn, char *extData, const uint8_t *data, const size_t len);
-extern void AddLogUint64(char *fn, char *data, const uint64_t value);
-extern void AddLogCurrentDT(char *fn);
-extern void FillFileNameByUID(char *filenamePrefix, uint8_t *uid, const char *ext, int uidlen);
+int ukbhit(void);
+void AddLogLine(char *fn, char *data, char *c);
+void AddLogHex(char *fn, char *extData, const uint8_t *data, const size_t len);
+void AddLogUint64(char *fn, char *data, const uint64_t value);
+void AddLogCurrentDT(char *fn);
+void FillFileNameByUID(char *filenamePrefix, uint8_t *uid, const char *ext, int uidlen);
 
 // fill buffer from structure [{uint8_t data, size_t length},...]
-extern int FillBuffer(uint8_t *data, size_t maxDataLength, size_t *dataLength, ...);
+int FillBuffer(uint8_t *data, size_t maxDataLength, size_t *dataLength, ...);
 
-extern bool CheckStringIsHEXValue(const char *value);
-extern void hex_to_buffer(const uint8_t *buf, const uint8_t *hex_data, const size_t hex_len,
+bool CheckStringIsHEXValue(const char *value);
+void hex_to_buffer(const uint8_t *buf, const uint8_t *hex_data, const size_t hex_len,
                           const size_t hex_max_len, const size_t min_str_len, const size_t spaces_between,
                           bool uppercase);
 
-extern void print_hex(const uint8_t *data, const size_t len);
-extern void print_hex_break(const uint8_t *data, const size_t len, const uint8_t breaks);
-extern char *sprint_hex(const uint8_t *data, const size_t len);
-extern char *sprint_hex_inrow(const uint8_t *data, const size_t len);
-extern char *sprint_hex_inrow_ex(const uint8_t *data, const size_t len, const size_t min_str_len);
-extern char *sprint_hex_inrow_spaces(const uint8_t *data, const size_t len, size_t spaces_between);
-extern char *sprint_bin(const uint8_t *data, const size_t len);
-extern char *sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t breaks);
-extern char *sprint_hex_ascii(const uint8_t *data, const size_t len);
-extern char *sprint_ascii(const uint8_t *data, const size_t len);
-extern char *sprint_ascii_ex(const uint8_t *data, const size_t len, const size_t min_str_len);
+void print_hex(const uint8_t *data, const size_t len);
+void print_hex_break(const uint8_t *data, const size_t len, const uint8_t breaks);
+char *sprint_hex(const uint8_t *data, const size_t len);
+char *sprint_hex_inrow(const uint8_t *data, const size_t len);
+char *sprint_hex_inrow_ex(const uint8_t *data, const size_t len, const size_t min_str_len);
+char *sprint_hex_inrow_spaces(const uint8_t *data, const size_t len, size_t spaces_between);
+char *sprint_bin(const uint8_t *data, const size_t len);
+char *sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t breaks);
+char *sprint_hex_ascii(const uint8_t *data, const size_t len);
+char *sprint_ascii(const uint8_t *data, const size_t len);
+char *sprint_ascii_ex(const uint8_t *data, const size_t len, const size_t min_str_len);
 
-extern void print_blocks(uint32_t *data, size_t len);
+void print_blocks(uint32_t *data, size_t len);
 
-extern void num_to_bytes(uint64_t n, size_t len, uint8_t *dest);
-extern uint64_t bytes_to_num(uint8_t *src, size_t len);
-extern void num_to_bytebits(uint64_t n, size_t len, uint8_t *dest);
-extern void num_to_bytebitsLSBF(uint64_t n, size_t len, uint8_t *dest);
-extern uint8_t *SwapEndian64(const uint8_t *src, const size_t len, const uint8_t blockSize);
-extern void SwapEndian64ex(const uint8_t *src, const size_t len, const uint8_t blockSize, uint8_t *dest);
+void num_to_bytes(uint64_t n, size_t len, uint8_t *dest);
+uint64_t bytes_to_num(uint8_t *src, size_t len);
+void num_to_bytebits(uint64_t n, size_t len, uint8_t *dest);
+void num_to_bytebitsLSBF(uint64_t n, size_t len, uint8_t *dest);
+uint8_t *SwapEndian64(const uint8_t *src, const size_t len, const uint8_t blockSize);
+void SwapEndian64ex(const uint8_t *src, const size_t len, const uint8_t blockSize, uint8_t *dest);
 
-extern int param_getlength(const char *line, int paramnum);
-extern char param_getchar(const char *line, int paramnum);
-extern char param_getchar_indx(const char *line, int indx, int paramnum);
-extern int param_getptr(const char *line, int *bg, int *en, int paramnum);
-extern uint8_t param_get8(const char *line, int paramnum);
-extern uint8_t param_get8ex(const char *line, int paramnum, int deflt, int base);
-extern uint32_t param_get32ex(const char *line, int paramnum, int deflt, int base);
-extern uint64_t param_get64ex(const char *line, int paramnum, int deflt, int base);
-extern uint8_t param_getdec(const char *line, int paramnum, uint8_t *destination);
-extern uint8_t param_isdec(const char *line, int paramnum);
-extern int param_gethex(const char *line, int paramnum, uint8_t *data, int hexcnt);
-extern int param_gethex_ex(const char *line, int paramnum, uint8_t *data, int *hexcnt);
-extern int param_gethex_to_eol(const char *line, int paramnum, uint8_t *data, int maxdatalen, int *datalen);
-extern int param_getstr(const char *line, int paramnum, char *str, size_t buffersize);
+int param_getlength(const char *line, int paramnum);
+char param_getchar(const char *line, int paramnum);
+char param_getchar_indx(const char *line, int indx, int paramnum);
+int param_getptr(const char *line, int *bg, int *en, int paramnum);
+uint8_t param_get8(const char *line, int paramnum);
+uint8_t param_get8ex(const char *line, int paramnum, int deflt, int base);
+uint32_t param_get32ex(const char *line, int paramnum, int deflt, int base);
+uint64_t param_get64ex(const char *line, int paramnum, int deflt, int base);
+uint8_t param_getdec(const char *line, int paramnum, uint8_t *destination);
+uint8_t param_isdec(const char *line, int paramnum);
+int param_gethex(const char *line, int paramnum, uint8_t *data, int hexcnt);
+int param_gethex_ex(const char *line, int paramnum, uint8_t *data, int *hexcnt);
+int param_gethex_to_eol(const char *line, int paramnum, uint8_t *data, int maxdatalen, int *datalen);
+int param_getstr(const char *line, int paramnum, char *str, size_t buffersize);
 
-extern int hextobinarray(char *target, char *source);
-extern int hextobinstring(char *target, char *source);
-extern int binarraytohex(char *target, const size_t targetlen, char *source, size_t srclen);
-extern void binarraytobinstring(char *target,  char *source, int length);
-extern uint8_t GetParity(uint8_t *bits, uint8_t type, int length);
-extern void wiegand_add_parity(uint8_t *target, uint8_t *source, uint8_t length);
+int hextobinarray(char *target, char *source);
+int hextobinstring(char *target, char *source);
+int binarraytohex(char *target, const size_t targetlen, char *source, size_t srclen);
+void binarraytobinstring(char *target,  char *source, int length);
+uint8_t GetParity(uint8_t *bits, uint8_t type, int length);
+void wiegand_add_parity(uint8_t *target, uint8_t *source, uint8_t length);
 
-extern void xor(unsigned char *dst, unsigned char *src, size_t len);
-extern int32_t le24toh(uint8_t data[3]);
+void xor(unsigned char *dst, unsigned char *src, size_t len);
+int32_t le24toh(uint8_t data[3]);
 
-extern uint32_t PackBits(uint8_t start, uint8_t len, uint8_t *bits);
-extern void rol(uint8_t *data, const size_t len);
-extern uint32_t reflect(uint32_t v, int b);
-extern uint8_t reflect8(uint8_t b); // dedicated 8bit reversal
-extern uint16_t reflect16(uint16_t b); // dedicated 16bit reversal
-extern uint64_t HornerScheme(uint64_t num, uint64_t divider, uint64_t factor);
+uint32_t PackBits(uint8_t start, uint8_t len, uint8_t *bits);
+void rol(uint8_t *data, const size_t len);
+uint32_t reflect(uint32_t v, int b);
+uint8_t reflect8(uint8_t b); // dedicated 8bit reversal
+uint16_t reflect16(uint16_t b); // dedicated 16bit reversal
+uint64_t HornerScheme(uint64_t num, uint64_t divider, uint64_t factor);
 
-extern int num_CPUs(void); // number of logical CPUs
+int num_CPUs(void); // number of logical CPUs
 
-extern void str_lower(char *s); // converts string to lower case
-extern bool str_startswith(const char *s,  const char *pre);  // check for prefix in string
-extern void strcleanrn(char *buf, size_t len);
-extern void strcreplace(char *buf, size_t len, char from, char to);
-extern char *strmcopy(char *buf);
+void str_lower(char *s); // converts string to lower case
+bool str_startswith(const char *s,  const char *pre);  // check for prefix in string
+void strcleanrn(char *buf, size_t len);
+void strcreplace(char *buf, size_t len, char from, char to);
+char *strmcopy(char *buf);
 #endif

From 567ceb017b9d0162deb09231f2f178b55030553a Mon Sep 17 00:00:00 2001
From: vratiskol <vincent.ratiskol@github.com>
Date: Sat, 6 Apr 2019 00:39:27 +0200
Subject: [PATCH 1014/1938] Astyle

---
 armsrc/mifaresim.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/armsrc/mifaresim.c b/armsrc/mifaresim.c
index a300e7b57..d4d998a1a 100644
--- a/armsrc/mifaresim.c
+++ b/armsrc/mifaresim.c
@@ -10,7 +10,7 @@
 // Mifare Classic Card Simulation
 //-----------------------------------------------------------------------------
 
-// Verbose Mode: 
+// Verbose Mode:
 // MF_DBG_NONE          0
 // MF_DBG_ERROR         1
 // MF_DBG_ALL           2
@@ -435,7 +435,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
     uint8_t	mM = 0; //moebius_modifier for collection storage
 
     // Authenticate response - nonce
-    uint32_t nonce = 0; 
+    uint32_t nonce = 0;
     // = prng_successor(selTimer, 32) ;
 
     if ((flags & FLAG_MF_MINI) == FLAG_MF_MINI) {
@@ -783,7 +783,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                     // Example: 6X  [00]
                     cardAUTHSC = receivedCmd_dec[1] / 4;
 
-                    // cardAUTHKEY: 60 => Auth use Key A 
+                    // cardAUTHKEY: 60 => Auth use Key A
                     // cardAUTHKEY: 61 => Auth use Key B
                     cardAUTHKEY = receivedCmd_dec[0] & 0x01;
 
@@ -1004,10 +1004,10 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                 if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("[MFEMUL_AUTH1] Enter case");
 
                 if (receivedCmd_len != 4) {
-                     cardSTATE_TO_IDLE();
-                     LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
-                     if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("MFEMUL_AUTH1: receivedCmd_len != 8 (%d) => cardSTATE_TO_IDLE())", receivedCmd_len);
-                     break;
+                    cardSTATE_TO_IDLE();
+                    LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("MFEMUL_AUTH1: receivedCmd_len != 8 (%d) => cardSTATE_TO_IDLE())", receivedCmd_len);
+                    break;
                 }
 
                 nr = bytes_to_num(receivedCmd, 4);

From 98d940874625b246803d790985520afccb377ec2 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 6 Apr 2019 00:52:55 +0200
Subject: [PATCH 1015/1938] make style

---
 client/cliparser/cliparser.h                 |  14 +--
 client/cmdlft55xx.h                          |  30 +++---
 client/crypto/asn1dump.h                     |   2 +-
 client/crypto/libpcrypto.h                   |  24 ++---
 client/emv/apduinfo.h                        |   4 +-
 client/emv/cmdemv.h                          |  14 +--
 client/emv/emv_pki.h                         |   2 +-
 client/emv/emv_roca.h                        |   4 +-
 client/emv/emvcore.h                         |  48 ++++-----
 client/emv/emvjson.h                         |  28 ++---
 client/emv/test/cda_test.h                   |   2 +-
 client/emv/test/crypto_test.h                |   2 +-
 client/emv/test/cryptotest.h                 |   2 +-
 client/emv/test/dda_test.h                   |   2 +-
 client/emv/test/sda_test.h                   |   2 +-
 client/fido/cbortools.h                      |  22 ++--
 client/fido/cose.h                           |  10 +-
 client/fido/fidocore.h                       |  30 +++---
 client/hardnested/hardnested_bf_core.h       |   8 +-
 client/hardnested/hardnested_bitarray_core.h |  26 ++---
 client/hardnested/hardnested_bruteforce.h    |  10 +-
 client/loclass/fileutils.h                   |  14 +--
 client/loclass/hash1_brute.h                 |   2 +-
 client/mifare/mad.h                          |   8 +-
 client/mifare/mfkey.h                        |  12 +--
 client/mifare/mifare4.h                      |  30 +++---
 client/mifare/mifarehost.h                   |  50 ++++-----
 client/mifare/ndef.h                         |   2 +-
 client/proxgui.h                             |   2 +-
 client/reveng/reveng.h                       | 108 +++++++++----------
 30 files changed, 257 insertions(+), 257 deletions(-)

diff --git a/client/cliparser/cliparser.h b/client/cliparser/cliparser.h
index d42cd50b6..7dd3584bc 100644
--- a/client/cliparser/cliparser.h
+++ b/client/cliparser/cliparser.h
@@ -31,11 +31,11 @@
 #define CLIGetHexWithReturn(paramnum, data, datalen) if (CLIParamHexToBuf(arg_get_str(paramnum), data, sizeof(data), datalen)) {CLIParserFree();return 1;}
 #define CLIGetStrWithReturn(paramnum, data, datalen) if (CLIParamStrToBuf(arg_get_str(paramnum), data, sizeof(data), datalen)) {CLIParserFree();return 1;}
 
-extern int CLIParserInit(char *vprogramName, char *vprogramHint, char *vprogramHelp);
-extern int CLIParserParseString(const char *str, void *argtable[], size_t vargtableLen, bool allowEmptyExec);
-extern int CLIParserParseStringEx(const char *str, void *vargtable[], size_t vargtableLen, bool allowEmptyExec, bool clueData);
-extern int CLIParserParseArg(int argc, char **argv, void *argtable[], size_t vargtableLen, bool allowEmptyExec);
-extern void CLIParserFree();
+int CLIParserInit(char *vprogramName, char *vprogramHint, char *vprogramHelp);
+int CLIParserParseString(const char *str, void *argtable[], size_t vargtableLen, bool allowEmptyExec);
+int CLIParserParseStringEx(const char *str, void *vargtable[], size_t vargtableLen, bool allowEmptyExec, bool clueData);
+int CLIParserParseArg(int argc, char **argv, void *argtable[], size_t vargtableLen, bool allowEmptyExec);
+void CLIParserFree();
 
-extern int CLIParamHexToBuf(struct arg_str *argstr, uint8_t *data, int maxdatalen, int *datalen);
-extern int CLIParamStrToBuf(struct arg_str *argstr, uint8_t *data, int maxdatalen, int *datalen);
+int CLIParamHexToBuf(struct arg_str *argstr, uint8_t *data, int maxdatalen, int *datalen);
+int CLIParamStrToBuf(struct arg_str *argstr, uint8_t *data, int maxdatalen, int *datalen);
diff --git a/client/cmdlft55xx.h b/client/cmdlft55xx.h
index ce990bebd..dca8c6f39 100644
--- a/client/cmdlft55xx.h
+++ b/client/cmdlft55xx.h
@@ -137,17 +137,17 @@ typedef struct {
 t55xx_conf_block_t Get_t55xx_Config(void);
 void Set_t55xx_Config(t55xx_conf_block_t conf);
 
-extern int CmdLFT55XX(const char *Cmd);
-extern int CmdT55xxChk(const char *Cmd);
-extern int CmdT55xxBruteForce(const char *Cmd);
-extern int CmdT55xxSetConfig(const char *Cmd);
-extern int CmdT55xxReadBlock(const char *Cmd);
-extern int CmdT55xxWriteBlock(const char *Cmd);
-extern int CmdT55xxReadTrace(const char *Cmd);
-extern int CmdT55xxInfo(const char *Cmd);
-extern int CmdT55xxDetect(const char *Cmd);
-extern int CmdResetRead(const char *Cmd);
-extern int CmdT55xxWipe(const char *Cmd);
+int CmdLFT55XX(const char *Cmd);
+int CmdT55xxChk(const char *Cmd);
+int CmdT55xxBruteForce(const char *Cmd);
+int CmdT55xxSetConfig(const char *Cmd);
+int CmdT55xxReadBlock(const char *Cmd);
+int CmdT55xxWriteBlock(const char *Cmd);
+int CmdT55xxReadTrace(const char *Cmd);
+int CmdT55xxInfo(const char *Cmd);
+int CmdT55xxDetect(const char *Cmd);
+int CmdResetRead(const char *Cmd);
+int CmdT55xxWipe(const char *Cmd);
 
 char *GetPskCfStr(uint32_t id, bool q5);
 char *GetBitRateStr(uint32_t id, bool xmode);
@@ -160,16 +160,16 @@ void printT5xxHeader(uint8_t page);
 void printT55xxBlock(const char *demodStr);
 int printConfiguration(t55xx_conf_block_t b);
 
-extern int T55xxReadBlock(uint8_t block, bool page1, bool usepwd, bool override, uint32_t password);
+int T55xxReadBlock(uint8_t block, bool page1, bool usepwd, bool override, uint32_t password);
 bool GetT55xxBlockData(uint32_t *blockdata);
 bool DecodeT55xxBlock(void);
-extern bool tryDetectModulation(void);
+bool tryDetectModulation(void);
 bool testKnownConfigBlock(uint32_t block0);
 
-extern bool tryDetectP1(bool getData);
+bool tryDetectP1(bool getData);
 bool test(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk, bool *Q5);
 int special(const char *Cmd);
-extern bool AquireData(uint8_t page, uint8_t block, bool pwdmode, uint32_t password);
+bool AquireData(uint8_t page, uint8_t block, bool pwdmode, uint32_t password);
 int tryOnePassword(uint32_t password);
 
 void printT55x7Trace(t55x7_tracedata_t data, uint8_t repeat);
diff --git a/client/crypto/asn1dump.h b/client/crypto/asn1dump.h
index 1aadf487c..c7aef7e39 100644
--- a/client/crypto/asn1dump.h
+++ b/client/crypto/asn1dump.h
@@ -16,6 +16,6 @@
 #include <stdio.h>
 #include "emv/tlv.h"
 
-extern bool asn1_tag_dump(const struct tlv *tlv, FILE *f, int level, bool *candump);
+bool asn1_tag_dump(const struct tlv *tlv, FILE *f, int level, bool *candump);
 
 #endif /* asn1utils.h */
diff --git a/client/crypto/libpcrypto.h b/client/crypto/libpcrypto.h
index 2cb4644a8..38d37b66a 100644
--- a/client/crypto/libpcrypto.h
+++ b/client/crypto/libpcrypto.h
@@ -16,20 +16,20 @@
 #include <stddef.h>
 #include <mbedtls/pk.h>
 
-extern int aes_encode(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *output, int length);
-extern int aes_decode(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *output, int length);
-extern int aes_cmac(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *mac, int length);
-extern int aes_cmac8(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *mac, int length);
+int aes_encode(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *output, int length);
+int aes_decode(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *output, int length);
+int aes_cmac(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *mac, int length);
+int aes_cmac8(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *mac, int length);
 
-extern int sha256hash(uint8_t *input, int length, uint8_t *hash);
-extern int sha512hash(uint8_t *input, int length, uint8_t *hash);
+int sha256hash(uint8_t *input, int length, uint8_t *hash);
+int sha512hash(uint8_t *input, int length, uint8_t *hash);
 
-extern int ecdsa_key_create(uint8_t *key_d, uint8_t *key_xy);
-extern int ecdsa_public_key_from_pk(mbedtls_pk_context *pk, uint8_t *key, size_t keylen);
-extern int ecdsa_signature_create(uint8_t *key_d, uint8_t *key_xy, uint8_t *input, int length, uint8_t *signature, size_t *signaturelen);
-extern int ecdsa_signature_verify(uint8_t *key_xy, uint8_t *input, int length, uint8_t *signature, size_t signaturelen);
-extern char *ecdsa_get_error(int ret);
+int ecdsa_key_create(uint8_t *key_d, uint8_t *key_xy);
+int ecdsa_public_key_from_pk(mbedtls_pk_context *pk, uint8_t *key, size_t keylen);
+int ecdsa_signature_create(uint8_t *key_d, uint8_t *key_xy, uint8_t *input, int length, uint8_t *signature, size_t *signaturelen);
+int ecdsa_signature_verify(uint8_t *key_xy, uint8_t *input, int length, uint8_t *signature, size_t signaturelen);
+char *ecdsa_get_error(int ret);
 
-extern int ecdsa_nist_test(bool verbose);
+int ecdsa_nist_test(bool verbose);
 
 #endif /* libpcrypto.h */
diff --git a/client/emv/apduinfo.h b/client/emv/apduinfo.h
index 054aeec91..d7811dbc6 100644
--- a/client/emv/apduinfo.h
+++ b/client/emv/apduinfo.h
@@ -28,7 +28,7 @@ typedef struct {
     const char *Description;
 } APDUCode;
 
-extern const APDUCode *const GetAPDUCode(uint8_t sw1, uint8_t sw2);
-extern const char *GetAPDUCodeDescription(uint8_t sw1, uint8_t sw2);
+const APDUCode *const GetAPDUCode(uint8_t sw1, uint8_t sw2);
+const char *GetAPDUCodeDescription(uint8_t sw1, uint8_t sw2);
 
 #endif
diff --git a/client/emv/cmdemv.h b/client/emv/cmdemv.h
index c91f75606..739909215 100644
--- a/client/emv/cmdemv.h
+++ b/client/emv/cmdemv.h
@@ -29,12 +29,12 @@
 
 int CmdEMV(const char *Cmd);
 
-extern int CmdEMVSelect(const char *cmd);
-extern int CmdEMVSearch(const char *cmd);
-extern int CmdEMVPPSE(const char *cmd);
-extern int CmdEMVExec(const char *cmd);
-extern int CmdEMVGetrng(const char *Cmd);
-extern int CmdEMVList(const char *Cmd);
-extern int CmdEMVRoca(const char *Cmd);
+int CmdEMVSelect(const char *cmd);
+int CmdEMVSearch(const char *cmd);
+int CmdEMVPPSE(const char *cmd);
+int CmdEMVExec(const char *cmd);
+int CmdEMVGetrng(const char *Cmd);
+int CmdEMVList(const char *Cmd);
+int CmdEMVRoca(const char *Cmd);
 
 #endif
diff --git a/client/emv/emv_pki.h b/client/emv/emv_pki.h
index 6cc4a97d1..0b80f2665 100644
--- a/client/emv/emv_pki.h
+++ b/client/emv/emv_pki.h
@@ -21,7 +21,7 @@
 
 #include <stddef.h>
 
-extern void PKISetStrictExecution(bool se);
+void PKISetStrictExecution(bool se);
 
 unsigned char *emv_pki_sdatl_fill(const struct tlvdb *db, size_t *sdatl_len);
 struct emv_pk *emv_pki_recover_issuer_cert(const struct emv_pk *pk, struct tlvdb *db);
diff --git a/client/emv/emv_roca.h b/client/emv/emv_roca.h
index 2830ce9c5..6663ce710 100644
--- a/client/emv/emv_roca.h
+++ b/client/emv/emv_roca.h
@@ -31,8 +31,8 @@
 
 #define ROCA_PRINTS_LENGTH 17
 
-extern bool emv_rocacheck(const unsigned char *buf, size_t buflen, bool verbose);
-extern int roca_self_test(void);
+bool emv_rocacheck(const unsigned char *buf, size_t buflen, bool verbose);
+int roca_self_test(void);
 
 #endif
 
diff --git a/client/emv/emvcore.h b/client/emv/emvcore.h
index 7e9afabf7..806a9366f 100644
--- a/client/emv/emvcore.h
+++ b/client/emv/emvcore.h
@@ -63,46 +63,46 @@ enum CardPSVendor {
     CV_CB,
     CV_OTHER,
 };
-extern enum CardPSVendor GetCardPSVendor(uint8_t *AID, size_t AIDlen);
+enum CardPSVendor GetCardPSVendor(uint8_t *AID, size_t AIDlen);
 
-extern bool TLVPrintFromBuffer(uint8_t *data, int datalen);
-extern void TLVPrintFromTLV(struct tlvdb *tlv);
-extern void TLVPrintFromTLVLev(struct tlvdb *tlv, int level);
-extern void TLVPrintAIDlistFromSelectTLV(struct tlvdb *tlv);
+bool TLVPrintFromBuffer(uint8_t *data, int datalen);
+void TLVPrintFromTLV(struct tlvdb *tlv);
+void TLVPrintFromTLVLev(struct tlvdb *tlv, int level);
+void TLVPrintAIDlistFromSelectTLV(struct tlvdb *tlv);
 
-extern struct tlvdb *GetPANFromTrack2(const struct tlv *track2);
-extern struct tlvdb *GetdCVVRawFromTrack2(const struct tlv *track2);
+struct tlvdb *GetPANFromTrack2(const struct tlv *track2);
+struct tlvdb *GetdCVVRawFromTrack2(const struct tlv *track2);
 
-extern void SetAPDULogging(bool logging);
+void SetAPDULogging(bool logging);
 
 // exchange
-extern int EMVExchange(EMVCommandChannel channel, bool LeaveFieldON, sAPDU apdu, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv);
+int EMVExchange(EMVCommandChannel channel, bool LeaveFieldON, sAPDU apdu, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv);
 
 // search application
-extern int EMVSearchPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, uint8_t PSENum, bool decodeTLV, struct tlvdb *tlv);
-extern int EMVSearch(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, bool decodeTLV, struct tlvdb *tlv);
-extern int EMVSelectPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, uint8_t PSENum, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw);
-extern int EMVSelect(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, uint8_t *AID, size_t AIDLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv);
+int EMVSearchPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, uint8_t PSENum, bool decodeTLV, struct tlvdb *tlv);
+int EMVSearch(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, bool decodeTLV, struct tlvdb *tlv);
+int EMVSelectPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, uint8_t PSENum, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw);
+int EMVSelect(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, uint8_t *AID, size_t AIDLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv);
 // select application
-extern int EMVSelectApplication(struct tlvdb *tlv, uint8_t *AID, size_t *AIDlen);
+int EMVSelectApplication(struct tlvdb *tlv, uint8_t *AID, size_t *AIDlen);
 // Get Processing Options
-extern int EMVGPO(EMVCommandChannel channel, bool LeaveFieldON, uint8_t *PDOL, size_t PDOLLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv);
-extern int EMVReadRecord(EMVCommandChannel channel, bool LeaveFieldON, uint8_t SFI, uint8_t SFIrec, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv);
+int EMVGPO(EMVCommandChannel channel, bool LeaveFieldON, uint8_t *PDOL, size_t PDOLLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv);
+int EMVReadRecord(EMVCommandChannel channel, bool LeaveFieldON, uint8_t SFI, uint8_t SFIrec, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv);
 // AC
-extern int EMVGenerateChallenge(EMVCommandChannel channel, bool LeaveFieldON, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv);
-extern int EMVAC(EMVCommandChannel channel, bool LeaveFieldON, uint8_t RefControl, uint8_t *CDOL, size_t CDOLLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv);
+int EMVGenerateChallenge(EMVCommandChannel channel, bool LeaveFieldON, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv);
+int EMVAC(EMVCommandChannel channel, bool LeaveFieldON, uint8_t RefControl, uint8_t *CDOL, size_t CDOLLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv);
 // DDA
-extern int EMVInternalAuthenticate(EMVCommandChannel channel, bool LeaveFieldON, uint8_t *DDOL, size_t DDOLLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv);
+int EMVInternalAuthenticate(EMVCommandChannel channel, bool LeaveFieldON, uint8_t *DDOL, size_t DDOLLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv);
 // Mastercard
 int MSCComputeCryptoChecksum(EMVCommandChannel channel, bool LeaveFieldON, uint8_t *UDOL, uint8_t UDOLlen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv);
 // Auth
-extern int trSDA(struct tlvdb *tlv);
-extern int trDDA(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlv);
-extern int trCDA(struct tlvdb *tlv, struct tlvdb *ac_tlv, struct tlv *pdol_data_tlv, struct tlv *ac_data_tlv);
+int trSDA(struct tlvdb *tlv);
+int trDDA(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlv);
+int trCDA(struct tlvdb *tlv, struct tlvdb *ac_tlv, struct tlv *pdol_data_tlv, struct tlv *ac_data_tlv);
 
-extern int RecoveryCertificates(struct tlvdb *tlvRoot, json_t *root);
+int RecoveryCertificates(struct tlvdb *tlvRoot, json_t *root);
 
-extern struct emv_pk *get_ca_pk(struct tlvdb *db);
+struct emv_pk *get_ca_pk(struct tlvdb *db);
 #endif
 
 
diff --git a/client/emv/emvjson.h b/client/emv/emvjson.h
index 18326083f..23cfba545 100644
--- a/client/emv/emvjson.h
+++ b/client/emv/emvjson.h
@@ -18,24 +18,24 @@ typedef struct {
     char *Name;
 } ApplicationDataElm;
 
-extern char *GetApplicationDataName(tlv_tag_t tag);
+char *GetApplicationDataName(tlv_tag_t tag);
 
-extern int JsonSaveJsonObject(json_t *root, char *path, json_t *value);
-extern int JsonSaveStr(json_t *root, char *path, char *value);
-extern int JsonSaveInt(json_t *root, char *path, int value);
-extern int JsonSaveBufAsHexCompact(json_t *elm, char *path, uint8_t *data, size_t datalen);
-extern int JsonSaveBufAsHex(json_t *elm, char *path, uint8_t *data, size_t datalen);
-extern int JsonSaveHex(json_t *elm, char *path, uint64_t data, int datalen);
+int JsonSaveJsonObject(json_t *root, char *path, json_t *value);
+int JsonSaveStr(json_t *root, char *path, char *value);
+int JsonSaveInt(json_t *root, char *path, int value);
+int JsonSaveBufAsHexCompact(json_t *elm, char *path, uint8_t *data, size_t datalen);
+int JsonSaveBufAsHex(json_t *elm, char *path, uint8_t *data, size_t datalen);
+int JsonSaveHex(json_t *elm, char *path, uint64_t data, int datalen);
 
-extern int JsonSaveTLVValue(json_t *root, char *path, struct tlvdb *tlvdbelm);
-extern int JsonSaveTLVElm(json_t *elm, char *path, struct tlv *tlvelm, bool saveName, bool saveValue, bool saveAppDataLink);
-extern int JsonSaveTLVTreeElm(json_t *elm, char *path, struct tlvdb *tlvdbelm, bool saveName, bool saveValue, bool saveAppDataLink);
+int JsonSaveTLVValue(json_t *root, char *path, struct tlvdb *tlvdbelm);
+int JsonSaveTLVElm(json_t *elm, char *path, struct tlv *tlvelm, bool saveName, bool saveValue, bool saveAppDataLink);
+int JsonSaveTLVTreeElm(json_t *elm, char *path, struct tlvdb *tlvdbelm, bool saveName, bool saveValue, bool saveAppDataLink);
 
-extern int JsonSaveTLVTree(json_t *root, json_t *elm, char *path, struct tlvdb *tlvdbelm);
+int JsonSaveTLVTree(json_t *root, json_t *elm, char *path, struct tlvdb *tlvdbelm);
 
-extern int JsonLoadStr(json_t *root, char *path, char *value);
-extern int JsonLoadBufAsHex(json_t *elm, char *path, uint8_t *data, size_t maxbufferlen, size_t *datalen);
+int JsonLoadStr(json_t *root, char *path, char *value);
+int JsonLoadBufAsHex(json_t *elm, char *path, uint8_t *data, size_t maxbufferlen, size_t *datalen);
 
-extern bool ParamLoadFromJson(struct tlvdb *tlv);
+bool ParamLoadFromJson(struct tlvdb *tlv);
 
 #endif
diff --git a/client/emv/test/cda_test.h b/client/emv/test/cda_test.h
index 8d80043cd..e535c2eee 100644
--- a/client/emv/test/cda_test.h
+++ b/client/emv/test/cda_test.h
@@ -15,4 +15,4 @@
 
 #include <stdbool.h>
 
-extern int exec_cda_test(bool verbose);
+int exec_cda_test(bool verbose);
diff --git a/client/emv/test/crypto_test.h b/client/emv/test/crypto_test.h
index 04159c4f0..afc8a1515 100644
--- a/client/emv/test/crypto_test.h
+++ b/client/emv/test/crypto_test.h
@@ -15,4 +15,4 @@
 
 #include <stdbool.h>
 
-extern int exec_crypto_test(bool verbose);
+int exec_crypto_test(bool verbose);
diff --git a/client/emv/test/cryptotest.h b/client/emv/test/cryptotest.h
index 5c6aaae2d..671de244e 100644
--- a/client/emv/test/cryptotest.h
+++ b/client/emv/test/cryptotest.h
@@ -10,4 +10,4 @@
 
 #include <stdbool.h>
 
-extern int ExecuteCryptoTests(bool verbose);
+int ExecuteCryptoTests(bool verbose);
diff --git a/client/emv/test/dda_test.h b/client/emv/test/dda_test.h
index 1ae1a0660..34381938a 100644
--- a/client/emv/test/dda_test.h
+++ b/client/emv/test/dda_test.h
@@ -15,4 +15,4 @@
 
 #include <stdbool.h>
 
-extern int exec_dda_test(bool verbose);
+int exec_dda_test(bool verbose);
diff --git a/client/emv/test/sda_test.h b/client/emv/test/sda_test.h
index 8d47aa9b3..696a17f9b 100644
--- a/client/emv/test/sda_test.h
+++ b/client/emv/test/sda_test.h
@@ -13,4 +13,4 @@
  * Lesser General Public License for more details.
  */
 
-extern int exec_sda_test(bool verbose);
+int exec_sda_test(bool verbose);
diff --git a/client/fido/cbortools.h b/client/fido/cbortools.h
index 1e3fa8c0f..d42506658 100644
--- a/client/fido/cbortools.h
+++ b/client/fido/cbortools.h
@@ -21,18 +21,18 @@
 #define cbor_check_if(r) if ((r) != CborNoError) {return r;} else
 #define cbor_check(r) if ((r) != CborNoError) return r;
 
-extern int TinyCborPrintFIDOPackage(uint8_t cmdCode, bool isResponse, uint8_t *data, size_t length);
-extern int JsonToCbor(json_t *elm, CborEncoder *encoder);
+int TinyCborPrintFIDOPackage(uint8_t cmdCode, bool isResponse, uint8_t *data, size_t length);
+int JsonToCbor(json_t *elm, CborEncoder *encoder);
 
-extern int CborMapGetKeyById(CborParser *parser, CborValue *map, uint8_t *data, size_t dataLen, int key);
-extern CborError CborGetArrayBinStringValue(CborValue *elm, uint8_t *data, size_t maxdatalen, size_t *datalen);
-extern CborError CborGetArrayBinStringValueEx(CborValue *elm, uint8_t *data, size_t maxdatalen, size_t *datalen, uint8_t *delimeter, size_t delimeterlen);
-extern CborError CborGetBinStringValue(CborValue *elm, uint8_t *data, size_t maxdatalen, size_t *datalen);
-extern CborError CborGetArrayStringValue(CborValue *elm, char *data, size_t maxdatalen, size_t *datalen, char *delimeter);
-extern CborError CborGetStringValue(CborValue *elm, char *data, size_t maxdatalen, size_t *datalen);
-extern CborError CborGetStringValueBuf(CborValue *elm);
+int CborMapGetKeyById(CborParser *parser, CborValue *map, uint8_t *data, size_t dataLen, int key);
+CborError CborGetArrayBinStringValue(CborValue *elm, uint8_t *data, size_t maxdatalen, size_t *datalen);
+CborError CborGetArrayBinStringValueEx(CborValue *elm, uint8_t *data, size_t maxdatalen, size_t *datalen, uint8_t *delimeter, size_t delimeterlen);
+CborError CborGetBinStringValue(CborValue *elm, uint8_t *data, size_t maxdatalen, size_t *datalen);
+CborError CborGetArrayStringValue(CborValue *elm, char *data, size_t maxdatalen, size_t *datalen, char *delimeter);
+CborError CborGetStringValue(CborValue *elm, char *data, size_t maxdatalen, size_t *datalen);
+CborError CborGetStringValueBuf(CborValue *elm);
 
-extern int CBOREncodeElm(json_t *root, char *rootElmId, CborEncoder *encoder);
-extern CborError CBOREncodeClientDataHash(json_t *root, CborEncoder *encoder);
+int CBOREncodeElm(json_t *root, char *rootElmId, CborEncoder *encoder);
+CborError CBOREncodeClientDataHash(json_t *root, CborEncoder *encoder);
 
 #endif /* __CBORTOOLS_H__ */
diff --git a/client/fido/cose.h b/client/fido/cose.h
index 850652fc4..f8f28aabf 100644
--- a/client/fido/cose.h
+++ b/client/fido/cose.h
@@ -17,11 +17,11 @@
 #include <stdint.h>
 #include <cbor.h>
 
-extern const char *GetCOSEAlgName(int id);
-extern const char *GetCOSEAlgDescription(int id);
-extern const char *GetCOSEktyDescription(int id);
-extern const char *GetCOSECurveDescription(int id);
+const char *GetCOSEAlgName(int id);
+const char *GetCOSEAlgDescription(int id);
+const char *GetCOSEktyDescription(int id);
+const char *GetCOSECurveDescription(int id);
 
-extern int COSEGetECDSAKey(uint8_t *data, size_t datalen, bool verbose, uint8_t *public_key);
+int COSEGetECDSAKey(uint8_t *data, size_t datalen, bool verbose, uint8_t *public_key);
 
 #endif /* __COSE_H__ */
diff --git a/client/fido/fidocore.h b/client/fido/fidocore.h
index 60923a44b..676dd2646 100644
--- a/client/fido/fidocore.h
+++ b/client/fido/fidocore.h
@@ -35,23 +35,23 @@ typedef enum  {
     ptResponse,
 } fido2PacketType;
 
-extern int FIDOSelect(bool ActivateField, bool LeaveFieldON, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw);
-extern int FIDOExchange(sAPDU apdu, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw);
-extern int FIDORegister(uint8_t *params, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw);
-extern int FIDOAuthentication(uint8_t *params, uint8_t paramslen, uint8_t controlb, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw);
-extern int FIDO2GetInfo(uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw);
-extern int FIDO2MakeCredential(uint8_t *params, uint8_t paramslen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw);
-extern int FIDO2GetAssertion(uint8_t *params, uint8_t paramslen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw);
+int FIDOSelect(bool ActivateField, bool LeaveFieldON, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw);
+int FIDOExchange(sAPDU apdu, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw);
+int FIDORegister(uint8_t *params, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw);
+int FIDOAuthentication(uint8_t *params, uint8_t paramslen, uint8_t controlb, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw);
+int FIDO2GetInfo(uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw);
+int FIDO2MakeCredential(uint8_t *params, uint8_t paramslen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw);
+int FIDO2GetAssertion(uint8_t *params, uint8_t paramslen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw);
 
-extern int FIDOCheckDERAndGetKey(uint8_t *der, size_t derLen, bool verbose, uint8_t *publicKey, size_t publicKeyMaxLen);
+int FIDOCheckDERAndGetKey(uint8_t *der, size_t derLen, bool verbose, uint8_t *publicKey, size_t publicKeyMaxLen);
 
-extern char *fido2GetCmdMemberDescription(uint8_t cmdCode, bool isResponse, int memberNum);
-extern char *fido2GetCmdErrorDescription(uint8_t errorCode);
+char *fido2GetCmdMemberDescription(uint8_t cmdCode, bool isResponse, int memberNum);
+char *fido2GetCmdErrorDescription(uint8_t errorCode);
 
-extern bool CheckrpIdHash(json_t *json, uint8_t *hash);
-extern int FIDO2CreateMakeCredentionalReq(json_t *root, uint8_t *data, size_t maxdatalen, size_t *datalen);
-extern int FIDO2MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, bool verbose, bool verbose2, bool showCBOR, bool showDERTLV);
-extern int FIDO2CreateGetAssertionReq(json_t *root, uint8_t *data, size_t maxdatalen, size_t *datalen, bool createAllowList);
-extern int FIDO2GetAssertionParseRes(json_t *root, uint8_t *data, size_t dataLen, bool verbose, bool verbose2, bool showCBOR);
+bool CheckrpIdHash(json_t *json, uint8_t *hash);
+int FIDO2CreateMakeCredentionalReq(json_t *root, uint8_t *data, size_t maxdatalen, size_t *datalen);
+int FIDO2MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, bool verbose, bool verbose2, bool showCBOR, bool showDERTLV);
+int FIDO2CreateGetAssertionReq(json_t *root, uint8_t *data, size_t maxdatalen, size_t *datalen, bool createAllowList);
+int FIDO2GetAssertionParseRes(json_t *root, uint8_t *data, size_t dataLen, bool verbose, bool verbose2, bool showCBOR);
 
 #endif /* __FIDOCORE_H__ */
diff --git a/client/hardnested/hardnested_bf_core.h b/client/hardnested/hardnested_bf_core.h
index bd0e83c68..4f481cbc8 100644
--- a/client/hardnested/hardnested_bf_core.h
+++ b/client/hardnested/hardnested_bf_core.h
@@ -61,10 +61,10 @@ typedef enum {
     SIMD_MMX,
     SIMD_NONE,
 } SIMDExecInstr;
-extern void SetSIMDInstr(SIMDExecInstr instr);
-extern SIMDExecInstr GetSIMDInstrAuto();
+void SetSIMDInstr(SIMDExecInstr instr);
+SIMDExecInstr GetSIMDInstrAuto();
 
-extern const uint64_t crack_states_bitsliced(uint32_t cuid, uint8_t *best_first_bytes, statelist_t *p, uint32_t *keys_found, uint64_t *num_keys_tested, uint32_t nonces_to_bruteforce, uint8_t *bf_test_nonces_2nd_byte, noncelist_t *nonces);
-extern void bitslice_test_nonces(uint32_t nonces_to_bruteforce, uint32_t *bf_test_nonces, uint8_t *bf_test_nonce_par);
+const uint64_t crack_states_bitsliced(uint32_t cuid, uint8_t *best_first_bytes, statelist_t *p, uint32_t *keys_found, uint64_t *num_keys_tested, uint32_t nonces_to_bruteforce, uint8_t *bf_test_nonces_2nd_byte, noncelist_t *nonces);
+void bitslice_test_nonces(uint32_t nonces_to_bruteforce, uint32_t *bf_test_nonces, uint8_t *bf_test_nonce_par);
 
 #endif
diff --git a/client/hardnested/hardnested_bitarray_core.h b/client/hardnested/hardnested_bitarray_core.h
index b12fcf89d..91515b57f 100644
--- a/client/hardnested/hardnested_bitarray_core.h
+++ b/client/hardnested/hardnested_bitarray_core.h
@@ -52,18 +52,18 @@ THE SOFTWARE.
 
 #include <stdint.h>
 
-extern uint32_t *malloc_bitarray(uint32_t x);
-extern void free_bitarray(uint32_t *x);
-extern uint32_t bitcount(uint32_t a);
-extern uint32_t count_states(uint32_t *A);
-extern void bitarray_AND(uint32_t *A, uint32_t *B);
-extern void bitarray_low20_AND(uint32_t *A, uint32_t *B);
-extern uint32_t count_bitarray_AND(uint32_t *A, uint32_t *B);
-extern uint32_t count_bitarray_low20_AND(uint32_t *A, uint32_t *B);
-extern void bitarray_AND4(uint32_t *A, uint32_t *B, uint32_t *C, uint32_t *D);
-extern void bitarray_OR(uint32_t *A, uint32_t *B);
-extern uint32_t count_bitarray_AND2(uint32_t *A, uint32_t *B);
-extern uint32_t count_bitarray_AND3(uint32_t *A, uint32_t *B, uint32_t *C);
-extern uint32_t count_bitarray_AND4(uint32_t *A, uint32_t *B, uint32_t *C, uint32_t *D);
+uint32_t *malloc_bitarray(uint32_t x);
+void free_bitarray(uint32_t *x);
+uint32_t bitcount(uint32_t a);
+uint32_t count_states(uint32_t *A);
+void bitarray_AND(uint32_t *A, uint32_t *B);
+void bitarray_low20_AND(uint32_t *A, uint32_t *B);
+uint32_t count_bitarray_AND(uint32_t *A, uint32_t *B);
+uint32_t count_bitarray_low20_AND(uint32_t *A, uint32_t *B);
+void bitarray_AND4(uint32_t *A, uint32_t *B, uint32_t *C, uint32_t *D);
+void bitarray_OR(uint32_t *A, uint32_t *B);
+uint32_t count_bitarray_AND2(uint32_t *A, uint32_t *B);
+uint32_t count_bitarray_AND3(uint32_t *A, uint32_t *B, uint32_t *C);
+uint32_t count_bitarray_AND4(uint32_t *A, uint32_t *B, uint32_t *C, uint32_t *D);
 
 #endif
diff --git a/client/hardnested/hardnested_bruteforce.h b/client/hardnested/hardnested_bruteforce.h
index c104e69ac..180e537d8 100644
--- a/client/hardnested/hardnested_bruteforce.h
+++ b/client/hardnested/hardnested_bruteforce.h
@@ -27,10 +27,10 @@ typedef struct {
     void *next;
 } statelist_t;
 
-extern void prepare_bf_test_nonces(noncelist_t *nonces, uint8_t best_first_byte);
-extern bool brute_force_bs(float *bf_rate, statelist_t *candidates, uint32_t cuid, uint32_t num_acquired_nonces, uint64_t maximum_states, noncelist_t *nonces, uint8_t *best_first_bytes, uint64_t *found_key);
-extern float brute_force_benchmark();
-extern uint8_t trailing_zeros(uint8_t byte);
-extern bool verify_key(uint32_t cuid, noncelist_t *nonces, uint8_t *best_first_bytes, uint32_t odd, uint32_t even);
+void prepare_bf_test_nonces(noncelist_t *nonces, uint8_t best_first_byte);
+bool brute_force_bs(float *bf_rate, statelist_t *candidates, uint32_t cuid, uint32_t num_acquired_nonces, uint64_t maximum_states, noncelist_t *nonces, uint8_t *best_first_bytes, uint64_t *found_key);
+float brute_force_benchmark();
+uint8_t trailing_zeros(uint8_t byte);
+bool verify_key(uint32_t cuid, noncelist_t *nonces, uint8_t *best_first_bytes, uint32_t odd, uint32_t even);
 
 #endif
diff --git a/client/loclass/fileutils.h b/client/loclass/fileutils.h
index 7b358331a..ddc906725 100644
--- a/client/loclass/fileutils.h
+++ b/client/loclass/fileutils.h
@@ -75,7 +75,7 @@ int fileExists(const char *filename);
  * @param datalen the length of the data
  * @return 0 for ok, 1 for failz
  */
-extern int saveFile(const char *preferredName, const char *suffix, const void *data, size_t datalen);
+int saveFile(const char *preferredName, const char *suffix, const void *data, size_t datalen);
 
 /**
  * @brief Utility function to save data to a textfile (EML). This method takes a preferred name, but if that
@@ -89,7 +89,7 @@ extern int saveFile(const char *preferredName, const char *suffix, const void *d
  * @param blocksize the length of one row
  * @return 0 for ok, 1 for failz
 */
-extern int saveFileEML(const char *preferredName, const char *suffix, uint8_t *data, size_t datalen, size_t blocksize);
+int saveFileEML(const char *preferredName, const char *suffix, uint8_t *data, size_t datalen, size_t blocksize);
 
 /** STUB
  * @brief Utility function to save JSON data to a file. This method takes a preferred name, but if that
@@ -103,7 +103,7 @@ extern int saveFileEML(const char *preferredName, const char *suffix, uint8_t *d
  * @param datalen the length of the data
  * @return 0 for ok, 1 for failz
  */
-extern int saveFileJSON(const char *preferredName, const char *suffix, JSONFileType ftype, uint8_t *data, size_t datalen);
+int saveFileJSON(const char *preferredName, const char *suffix, JSONFileType ftype, uint8_t *data, size_t datalen);
 
 /** STUB
  * @brief Utility function to load data from a binary file. This method takes a preferred name.
@@ -116,7 +116,7 @@ extern int saveFileJSON(const char *preferredName, const char *suffix, JSONFileT
  * @param datalen the number of bytes loaded from file
  * @return 0 for ok, 1 for failz
 */
-extern int loadFile(const char *preferredName, const char *suffix, void *data, size_t maxdatalen, size_t *datalen);
+int loadFile(const char *preferredName, const char *suffix, void *data, size_t maxdatalen, size_t *datalen);
 
 /**
  * @brief  Utility function to load data from a textfile (EML). This method takes a preferred name.
@@ -128,7 +128,7 @@ extern int loadFile(const char *preferredName, const char *suffix, void *data, s
  * @param datalen the number of bytes loaded from file
  * @return 0 for ok, 1 for failz
 */
-extern int loadFileEML(const char *preferredName, const char *suffix, void *data, size_t *datalen);
+int loadFileEML(const char *preferredName, const char *suffix, void *data, size_t *datalen);
 
 /**
  * @brief  Utility function to load data from a JSON textfile. This method takes a preferred name.
@@ -141,7 +141,7 @@ extern int loadFileEML(const char *preferredName, const char *suffix, void *data
  * @param datalen the number of bytes loaded from file
  * @return 0 for ok, 1 for failz
 */
-extern int loadFileJSON(const char *preferredName, const char *suffix, void *data, size_t maxdatalen, size_t *datalen);
+int loadFileJSON(const char *preferredName, const char *suffix, void *data, size_t maxdatalen, size_t *datalen);
 
 
 /**
@@ -156,7 +156,7 @@ extern int loadFileJSON(const char *preferredName, const char *suffix, void *dat
  * @param keylen  the number of bytes a key per row is
  * @return 0 for ok, 1 for failz
 */
-extern int loadFileDICTIONARY(const char *preferredName, const char *suffix, void *data, size_t *datalen, uint8_t keylen, uint16_t *keycnt);
+int loadFileDICTIONARY(const char *preferredName, const char *suffix, void *data, size_t *datalen, uint8_t keylen, uint16_t *keycnt);
 
 #define PrintAndLogDevice(level, format, args...)  PrintAndLogEx(level, format , ## args)
 #else
diff --git a/client/loclass/hash1_brute.h b/client/loclass/hash1_brute.h
index 4debebd0d..b26ad96d1 100644
--- a/client/loclass/hash1_brute.h
+++ b/client/loclass/hash1_brute.h
@@ -1,5 +1,5 @@
 #ifndef HASH1_BRUTE_H
 #define HASH1_BRUTE_H
-extern void brute_hash1();
+void brute_hash1();
 
 #endif // HASH1_BRUTE_H
diff --git a/client/mifare/mad.h b/client/mifare/mad.h
index 89fcd795c..d1028e06a 100644
--- a/client/mifare/mad.h
+++ b/client/mifare/mad.h
@@ -20,10 +20,10 @@ typedef struct {
     const char *Description;
 } madAIDDescr;
 
-extern int MADCheck(uint8_t *sector0, uint8_t *sector10, bool verbose, bool *haveMAD2);
-extern int MADDecode(uint8_t *sector0, uint8_t *sector10, uint16_t *mad, size_t *madlen);
-extern int MAD1DecodeAndPrint(uint8_t *sector, bool verbose, bool *haveMAD2);
-extern int MAD2DecodeAndPrint(uint8_t *sector, bool verbose);
+int MADCheck(uint8_t *sector0, uint8_t *sector10, bool verbose, bool *haveMAD2);
+int MADDecode(uint8_t *sector0, uint8_t *sector10, uint16_t *mad, size_t *madlen);
+int MAD1DecodeAndPrint(uint8_t *sector, bool verbose, bool *haveMAD2);
+int MAD2DecodeAndPrint(uint8_t *sector, bool verbose);
 
 
 #endif // _MAD_H_
diff --git a/client/mifare/mfkey.h b/client/mifare/mfkey.h
index 0f8ba8069..4af5175a1 100644
--- a/client/mifare/mfkey.h
+++ b/client/mifare/mfkey.h
@@ -19,12 +19,12 @@
 #include "mifare.h"
 #include "crapto1/crapto1.h"
 
-extern uint32_t nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint32_t ar, uint64_t par_info, uint64_t ks_info, uint64_t **keys);
-extern bool mfkey32(nonces_t data, uint64_t *outputkey);
-extern bool mfkey32_moebius(nonces_t data, uint64_t *outputkey);
-extern int mfkey64(nonces_t data, uint64_t *outputkey);
+uint32_t nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint32_t ar, uint64_t par_info, uint64_t ks_info, uint64_t **keys);
+bool mfkey32(nonces_t data, uint64_t *outputkey);
+bool mfkey32_moebius(nonces_t data, uint64_t *outputkey);
+int mfkey64(nonces_t data, uint64_t *outputkey);
 
-extern int compare_uint64(const void *a, const void *b);
-extern uint32_t intersection(uint64_t *listA, uint64_t *listB);
+int compare_uint64(const void *a, const void *b);
+uint32_t intersection(uint64_t *listA, uint64_t *listB);
 
 #endif
diff --git a/client/mifare/mifare4.h b/client/mifare/mifare4.h
index e33e69fd2..d403bdd94 100644
--- a/client/mifare/mifare4.h
+++ b/client/mifare/mifare4.h
@@ -43,25 +43,25 @@ typedef struct {
     char *description;
 } AccessConditions_t;
 
-extern void mfpSetVerboseMode(bool verbose);
-extern const char *mfpGetErrorDescription(uint8_t errorCode);
+void mfpSetVerboseMode(bool verbose);
+const char *mfpGetErrorDescription(uint8_t errorCode);
 
-extern int CalculateMAC(mf4Session *session, MACType_t mtype, uint8_t blockNum, uint8_t blockCount, uint8_t *data, int datalen, uint8_t *mac, bool verbose);
-extern int MifareAuth4(mf4Session *session, uint8_t *keyn, uint8_t *key, bool activateField, bool leaveSignalON, bool verbose);
+int CalculateMAC(mf4Session *session, MACType_t mtype, uint8_t blockNum, uint8_t blockCount, uint8_t *data, int datalen, uint8_t *mac, bool verbose);
+int MifareAuth4(mf4Session *session, uint8_t *keyn, uint8_t *key, bool activateField, bool leaveSignalON, bool verbose);
 
-extern int MFPWritePerso(uint8_t *keyNum, uint8_t *key, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen);
-extern int MFPCommitPerso(bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen);
-extern int MFPReadBlock(mf4Session *session, bool plain, uint8_t blockNum, uint8_t blockCount, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen, uint8_t *mac);
-extern int MFPWriteBlock(mf4Session *session, uint8_t blockNum, uint8_t *data, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen, uint8_t *mac);
-extern int mfpReadSector(uint8_t sectorNo, uint8_t keyType, uint8_t *key, uint8_t *dataout, bool verbose);
+int MFPWritePerso(uint8_t *keyNum, uint8_t *key, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen);
+int MFPCommitPerso(bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen);
+int MFPReadBlock(mf4Session *session, bool plain, uint8_t blockNum, uint8_t blockCount, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen, uint8_t *mac);
+int MFPWriteBlock(mf4Session *session, uint8_t blockNum, uint8_t *data, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen, uint8_t *mac);
+int mfpReadSector(uint8_t sectorNo, uint8_t keyType, uint8_t *key, uint8_t *dataout, bool verbose);
 
-extern char *mfGetAccessConditionsDesc(uint8_t blockn, uint8_t *data);
+char *mfGetAccessConditionsDesc(uint8_t blockn, uint8_t *data);
 
-extern uint8_t mfNumBlocksPerSector(uint8_t sectorNo);
-extern uint8_t mfFirstBlockOfSector(uint8_t sectorNo);
-extern uint8_t mfSectorTrailer(uint8_t blockNo);
-extern bool mfIsSectorTrailer(uint8_t blockNo);
-extern uint8_t mfSectorNum(uint8_t blockNo);
+uint8_t mfNumBlocksPerSector(uint8_t sectorNo);
+uint8_t mfFirstBlockOfSector(uint8_t sectorNo);
+uint8_t mfSectorTrailer(uint8_t blockNo);
+bool mfIsSectorTrailer(uint8_t blockNo);
+uint8_t mfSectorNum(uint8_t blockNo);
 
 
 #endif // mifare4.h
diff --git a/client/mifare/mifarehost.h b/client/mifare/mifarehost.h
index 7481647ad..81e0e8f03 100644
--- a/client/mifare/mifarehost.h
+++ b/client/mifare/mifarehost.h
@@ -69,35 +69,35 @@ typedef struct {
 
 extern char logHexFileName[FILE_PATH_SIZE];
 
-extern int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key);
-extern int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t *resultKeys, bool calibrate);
-extern int mfCheckKeys(uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t keycnt, uint8_t *keyBlock, uint64_t *key);
-extern int mfCheckKeys_fast(uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk,
-                            uint8_t strategy, uint32_t size, uint8_t *keyBlock, sector_t *e_sector, bool use_flashmemory);
-extern int mfKeyBrute(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint64_t *resultkey);
+int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key);
+int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t *resultKeys, bool calibrate);
+int mfCheckKeys(uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t keycnt, uint8_t *keyBlock, uint64_t *key);
+int mfCheckKeys_fast(uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk,
+                     uint8_t strategy, uint32_t size, uint8_t *keyBlock, sector_t *e_sector, bool use_flashmemory);
+int mfKeyBrute(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint64_t *resultkey);
 
-extern int mfReadSector(uint8_t sectorNo, uint8_t keyType, uint8_t *key, uint8_t *data);
+int mfReadSector(uint8_t sectorNo, uint8_t keyType, uint8_t *key, uint8_t *data);
 
-extern int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount);
-extern int mfEmlSetMem(uint8_t *data, int blockNum, int blocksCount);
-extern int mfEmlSetMem_xt(uint8_t *data, int blockNum, int blocksCount, int blockBtWidth);
+int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount);
+int mfEmlSetMem(uint8_t *data, int blockNum, int blocksCount);
+int mfEmlSetMem_xt(uint8_t *data, int blockNum, int blocksCount, int blockBtWidth);
 
-extern int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, uint8_t wipecard);
-extern int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, uint8_t params);
-extern int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params);
+int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, uint8_t wipecard);
+int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, uint8_t params);
+int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params);
 
-extern int mfTraceInit(uint8_t *tuid, uint8_t uidlen, uint8_t *atqa, uint8_t sak, bool wantSaveToEmlFile);
-extern int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile);
+int mfTraceInit(uint8_t *tuid, uint8_t uidlen, uint8_t *atqa, uint8_t sak, bool wantSaveToEmlFile);
+int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile);
 
-extern int isTraceCardEmpty(void);
-extern int isBlockEmpty(int blockN);
-extern int isBlockTrailer(int blockN);
-extern int loadTraceCard(uint8_t *tuid, uint8_t uidlen);
-extern int saveTraceCard(void);
-extern int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t *data, int len);
+int isTraceCardEmpty(void);
+int isBlockEmpty(int blockN);
+int isBlockTrailer(int blockN);
+int loadTraceCard(uint8_t *tuid, uint8_t uidlen);
+int saveTraceCard(void);
+int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t *data, int len);
 
-extern int detect_classic_prng(void);
-extern int detect_classic_nackbug(bool verbose);
-extern void detect_classic_magic(void);
-extern void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len, bool isEncrypted);
+int detect_classic_prng(void);
+int detect_classic_nackbug(bool verbose);
+void detect_classic_magic(void);
+void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len, bool isEncrypted);
 #endif
diff --git a/client/mifare/ndef.h b/client/mifare/ndef.h
index 1130ebba7..1737a6082 100644
--- a/client/mifare/ndef.h
+++ b/client/mifare/ndef.h
@@ -57,6 +57,6 @@ typedef struct {
     uint8_t *ID;
 } NDEFHeader_t;
 
-extern int NDEFDecodeAndPrint(uint8_t *ndef, size_t ndefLen, bool verbose);
+int NDEFDecodeAndPrint(uint8_t *ndef, size_t ndefLen, bool verbose);
 
 #endif // _NDEF_H_
diff --git a/client/proxgui.h b/client/proxgui.h
index ada09d838..0d43e7823 100644
--- a/client/proxgui.h
+++ b/client/proxgui.h
@@ -35,7 +35,7 @@ extern int offline;
 extern bool GridLocked;
 
 //Operations defined in data_operations
-//extern int autoCorr(const int* in, int *out, size_t len, int window);
+//int autoCorr(const int* in, int *out, size_t len, int window);
 int AskEdgeDetect(const int *in, int *out, int len, int threshold);
 int AutoCorrelate(const int *in, int *out, size_t len, int window, bool SaveGrph, bool verbose);
 int directionalThreshold(const int *in, int *out, size_t len, int8_t up, int8_t down);
diff --git a/client/reveng/reveng.h b/client/reveng/reveng.h
index 110b3f620..59a5f901a 100644
--- a/client/reveng/reveng.h
+++ b/client/reveng/reveng.h
@@ -99,7 +99,7 @@
 typedef BMP_T bmp_t;
 
 extern int bmpbit, bmpsub;
-extern void setbmp(void);
+void setbmp(void);
 
 /* poly.c */
 #define P_REFIN      1
@@ -139,41 +139,41 @@ typedef struct {
     /* left-justified in each word */
 } poly_t;
 
-extern poly_t filtop(FILE *input, unsigned long length, int flags, int bperhx);
-extern poly_t strtop(const char *string, int flags, int bperhx);
-extern char *ptostr(const poly_t poly, int flags, int bperhx);
-extern char *pxsubs(const poly_t poly, int flags, int bperhx, unsigned long start, unsigned long end);
-extern poly_t pclone(const poly_t poly);
-extern void pcpy(poly_t *dest, const poly_t src);
-extern void pcanon(poly_t *poly);
-extern void pnorm(poly_t *poly);
-extern void psnorm(poly_t *poly);
-extern void pchop(poly_t *poly);
-extern void pkchop(poly_t *poly);
-extern unsigned long plen(const poly_t poly);
-extern int pcmp(const poly_t *a, const poly_t *b);
-extern int psncmp(const poly_t *a, const poly_t *b);
-extern int ptst(const poly_t poly);
-extern unsigned long pfirst(const poly_t poly);
-extern unsigned long plast(const poly_t poly);
-extern poly_t psubs(const poly_t src, unsigned long head, unsigned long start, unsigned long end, unsigned long tail);
-extern void pright(poly_t *poly, unsigned long length);
-extern void pshift(poly_t *dest, const poly_t src, unsigned long head, unsigned long start, unsigned long end, unsigned long tail);
-extern void ppaste(poly_t *dest, const poly_t src, unsigned long skip, unsigned long seek, unsigned long end, unsigned long fulllength);
-extern void pdiff(poly_t *dest, const poly_t src, unsigned long ofs);
-extern void psum(poly_t *dest, const poly_t src, unsigned long ofs);
-extern void prev(poly_t *poly);
-extern void prevch(poly_t *poly, int bperhx);
-extern void prcp(poly_t *poly);
-extern void pinv(poly_t *poly);
-extern poly_t pmod(const poly_t dividend, const poly_t divisor);
-extern poly_t pcrc(const poly_t message, const poly_t divisor, const poly_t init, const poly_t xorout, int flags);
-extern int piter(poly_t *poly);
-extern void palloc(poly_t *poly, unsigned long length);
-extern void pfree(poly_t *poly);
-extern void praloc(poly_t *poly, unsigned long length);
-extern int pmpar(const poly_t poly, const poly_t mask);
-extern int pident(const poly_t a, const poly_t b);
+poly_t filtop(FILE *input, unsigned long length, int flags, int bperhx);
+poly_t strtop(const char *string, int flags, int bperhx);
+char *ptostr(const poly_t poly, int flags, int bperhx);
+char *pxsubs(const poly_t poly, int flags, int bperhx, unsigned long start, unsigned long end);
+poly_t pclone(const poly_t poly);
+void pcpy(poly_t *dest, const poly_t src);
+void pcanon(poly_t *poly);
+void pnorm(poly_t *poly);
+void psnorm(poly_t *poly);
+void pchop(poly_t *poly);
+void pkchop(poly_t *poly);
+unsigned long plen(const poly_t poly);
+int pcmp(const poly_t *a, const poly_t *b);
+int psncmp(const poly_t *a, const poly_t *b);
+int ptst(const poly_t poly);
+unsigned long pfirst(const poly_t poly);
+unsigned long plast(const poly_t poly);
+poly_t psubs(const poly_t src, unsigned long head, unsigned long start, unsigned long end, unsigned long tail);
+void pright(poly_t *poly, unsigned long length);
+void pshift(poly_t *dest, const poly_t src, unsigned long head, unsigned long start, unsigned long end, unsigned long tail);
+void ppaste(poly_t *dest, const poly_t src, unsigned long skip, unsigned long seek, unsigned long end, unsigned long fulllength);
+void pdiff(poly_t *dest, const poly_t src, unsigned long ofs);
+void psum(poly_t *dest, const poly_t src, unsigned long ofs);
+void prev(poly_t *poly);
+void prevch(poly_t *poly, int bperhx);
+void prcp(poly_t *poly);
+void pinv(poly_t *poly);
+poly_t pmod(const poly_t dividend, const poly_t divisor);
+poly_t pcrc(const poly_t message, const poly_t divisor, const poly_t init, const poly_t xorout, int flags);
+int piter(poly_t *poly);
+void palloc(poly_t *poly, unsigned long length);
+void pfree(poly_t *poly);
+void praloc(poly_t *poly, unsigned long length);
+int pmpar(const poly_t poly, const poly_t mask);
+int pident(const poly_t a, const poly_t b);
 
 /* model.c */
 
@@ -190,23 +190,23 @@ typedef struct {
     const char *name;   /* optional canonical name of the model */
 } model_t;
 
-extern void mcpy(model_t *dest, const model_t *src);
-extern void mfree(model_t *model);
-extern int mcmp(const model_t *a, const model_t *b);
-extern char *mtostr(const model_t *model);
-extern void mcanon(model_t *model);
-extern void mcheck(model_t *model);
-extern void mrev(model_t *model);
-extern void mnovel(model_t *model);
+void mcpy(model_t *dest, const model_t *src);
+void mfree(model_t *model);
+int mcmp(const model_t *a, const model_t *b);
+char *mtostr(const model_t *model);
+void mcanon(model_t *model);
+void mcheck(model_t *model);
+void mrev(model_t *model);
+void mnovel(model_t *model);
 
 /* preset.c */
 #define M_OVERWR     1
 
-extern int mbynam(model_t *dest, const char *key);
-extern void mbynum(model_t *dest, int num);
-extern int mcount(void);
-extern char *mnames(void);
-extern void mmatch(model_t *model, int flags);
+int mbynam(model_t *dest, const char *key);
+void mbynum(model_t *dest, int num);
+int mcount(void);
+char *mnames(void);
+void mmatch(model_t *model, int flags);
 
 /* reveng.c */
 #define R_HAVEP      1
@@ -218,7 +218,7 @@ extern void mmatch(model_t *model, int flags);
 
 #define R_SPMASK 0x7FFFFFFUL
 
-extern model_t *reveng(const model_t *guess, const poly_t qpoly, int rflags, int args, const poly_t *argpolys);
+model_t *reveng(const model_t *guess, const poly_t qpoly, int rflags, int args, const poly_t *argpolys);
 
 /* cli.c */
 #define C_INFILE  1
@@ -228,9 +228,9 @@ extern model_t *reveng(const model_t *guess, const poly_t qpoly, int rflags, int
 
 #define BUFFER 32768
 
-extern int reveng_main(int argc, char *argv[]);
-extern void ufound(const model_t *model);
-extern void uerror(const char *msg);
-extern void uprog(const poly_t gpoly, int flags, unsigned long seq);
+int reveng_main(int argc, char *argv[]);
+void ufound(const model_t *model);
+void uerror(const char *msg);
+void uprog(const poly_t gpoly, int flags, unsigned long seq);
 
 #endif /* REVENG_H */

From 26eb54b965056f718d115c3d48add52f73dd22a5 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 6 Apr 2019 01:00:54 +0200
Subject: [PATCH 1016/1938] style

---
 armsrc/BigBuf.h                | 36 ++++++++---------
 armsrc/Standalone/standalone.h |  2 +-
 armsrc/apps.h                  | 12 +++---
 armsrc/buzzer.h                | 10 ++---
 armsrc/flashmem.h              |  2 +-
 armsrc/fpgaloader.h            |  2 +-
 armsrc/hitag2_crypto.h         | 14 +++----
 armsrc/iso14443a.h             | 62 ++++++++++++++---------------
 armsrc/iso14443b.h             | 14 +++----
 armsrc/legicrf.h               |  6 +--
 armsrc/legicrfsim.h            |  2 +-
 armsrc/ticks.h                 | 12 +++---
 armsrc/util.h                  |  6 +--
 common/crapto1/crapto1.h       |  2 +-
 common/crc.h                   | 26 ++++++------
 common/lfdemod.c               |  2 +-
 common/lfdemod.h               | 72 +++++++++++++++++-----------------
 common/usb_cdc.h               | 30 +++++++-------
 include/legic_prng.h           |  8 ++--
 19 files changed, 160 insertions(+), 160 deletions(-)

diff --git a/armsrc/BigBuf.h b/armsrc/BigBuf.h
index bdd2003be..12f2521c6 100644
--- a/armsrc/BigBuf.h
+++ b/armsrc/BigBuf.h
@@ -25,22 +25,22 @@
 #define CARD_MEMORY_SIZE        4096
 #define DMA_BUFFER_SIZE         256 //128  (how big is the dma?!?
 
-extern uint8_t *BigBuf_get_addr(void);
-extern uint8_t *BigBuf_get_EM_addr(void);
-extern uint16_t BigBuf_max_traceLen(void);
-extern void BigBuf_Clear(void);
-extern void BigBuf_Clear_ext(bool verbose);
-extern void BigBuf_Clear_keep_EM(void);
-extern void BigBuf_Clear_EM(void);
-extern uint8_t *BigBuf_malloc(uint16_t);
-extern void BigBuf_free(void);
-extern void BigBuf_free_keep_EM(void);
-extern void BigBuf_print_status(void);
-extern uint32_t BigBuf_get_traceLen(void);
-extern void clear_trace(void);
-extern void set_tracing(bool enable);
-extern void set_tracelen(uint32_t value);
-extern bool get_tracing(void);
-extern bool RAMFUNC LogTrace(const uint8_t *btBytes, uint16_t iLen, uint32_t timestamp_start, uint32_t timestamp_end, uint8_t *parity, bool readerToTag);
-extern uint8_t emlSet(uint8_t *data, uint32_t offset, uint32_t length);
+uint8_t *BigBuf_get_addr(void);
+uint8_t *BigBuf_get_EM_addr(void);
+uint16_t BigBuf_max_traceLen(void);
+void BigBuf_Clear(void);
+void BigBuf_Clear_ext(bool verbose);
+void BigBuf_Clear_keep_EM(void);
+void BigBuf_Clear_EM(void);
+uint8_t *BigBuf_malloc(uint16_t);
+void BigBuf_free(void);
+void BigBuf_free_keep_EM(void);
+void BigBuf_print_status(void);
+uint32_t BigBuf_get_traceLen(void);
+void clear_trace(void);
+void set_tracing(bool enable);
+void set_tracelen(uint32_t value);
+bool get_tracing(void);
+bool RAMFUNC LogTrace(const uint8_t *btBytes, uint16_t iLen, uint32_t timestamp_start, uint32_t timestamp_end, uint8_t *parity, bool readerToTag);
+uint8_t emlSet(uint8_t *data, uint32_t offset, uint32_t length);
 #endif /* __BIGBUF_H */
diff --git a/armsrc/Standalone/standalone.h b/armsrc/Standalone/standalone.h
index 980bcbf46..334bbc2b4 100644
--- a/armsrc/Standalone/standalone.h
+++ b/armsrc/Standalone/standalone.h
@@ -14,6 +14,6 @@
 #include <stdbool.h> // for bool
 #include <inttypes.h> // PRIu64
 
-extern void RunMod();
+void RunMod();
 
 #endif /* __STANDALONE_H */
diff --git a/armsrc/apps.h b/armsrc/apps.h
index b1a0969f3..5838c4d8e 100644
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -65,8 +65,8 @@ void ListenReaderField(int limit);
 extern int ToSendMax;
 extern uint8_t ToSend[];
 
-extern void StandAloneMode(void);
-extern void printStandAloneModes(void);
+void StandAloneMode(void);
+void printStandAloneModes(void);
 
 /// lfops.h
 extern uint8_t decimation;
@@ -230,10 +230,10 @@ uint8_t cmd_send(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void
 void HfSniff(int, int);
 
 //felica.c
-extern void felica_sendraw(UsbCommand *c);
-extern void felica_sniff(uint32_t samplesToSkip, uint32_t triggersToSkip);
-extern void felica_sim_lite(uint64_t uid);
-extern void felica_dump_lite_s();
+void felica_sendraw(UsbCommand *c);
+void felica_sniff(uint32_t samplesToSkip, uint32_t triggersToSkip);
+void felica_sim_lite(uint64_t uid);
+void felica_dump_lite_s();
 
 
 #ifdef __cplusplus
diff --git a/armsrc/buzzer.h b/armsrc/buzzer.h
index 801b35a21..082450f04 100644
--- a/armsrc/buzzer.h
+++ b/armsrc/buzzer.h
@@ -20,11 +20,11 @@
 #define note_7          506
 #define note_8          0
 
-extern void Ring_BEE_ONCE(uint16_t music_note);
-extern void Ring_BEE_TIME(uint16_t music_note, uint16_t count);
-extern void ring_2_7khz(uint16_t count);
-extern void Ring_ALL(uint16_t count);
-extern void Ring_Little_Star(uint16_t count);
+void Ring_BEE_ONCE(uint16_t music_note);
+void Ring_BEE_TIME(uint16_t music_note, uint16_t count);
+void ring_2_7khz(uint16_t count);
+void Ring_ALL(uint16_t count);
+void Ring_Little_Star(uint16_t count);
 
 #endif
 
diff --git a/armsrc/flashmem.h b/armsrc/flashmem.h
index f4258a11b..012d6ae7f 100644
--- a/armsrc/flashmem.h
+++ b/armsrc/flashmem.h
@@ -115,7 +115,7 @@
 
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~//
-extern void Dbprintf(const char *fmt, ...);
+void Dbprintf(const char *fmt, ...);
 
 void FlashmemSetSpiBaudrate(uint32_t baudrate);
 bool FlashInit();
diff --git a/armsrc/fpgaloader.h b/armsrc/fpgaloader.h
index ef278cc3e..f9b0e44b0 100644
--- a/armsrc/fpgaloader.h
+++ b/armsrc/fpgaloader.h
@@ -37,7 +37,7 @@ int FpgaGetCurrent(void);
 void SetAdcMuxFor(uint32_t whichGpio);
 
 // extern and generel turn off the antenna method
-extern void switch_off(void);
+void switch_off(void);
 
 // definitions for multiple FPGA config files support
 #define FPGA_BITSTREAM_LF 1
diff --git a/armsrc/hitag2_crypto.h b/armsrc/hitag2_crypto.h
index 8af1af412..d874955e0 100644
--- a/armsrc/hitag2_crypto.h
+++ b/armsrc/hitag2_crypto.h
@@ -22,13 +22,13 @@ struct hitag2_tag {
     uint8_t sectors[12][4];
 };
 
-extern uint32_t _f20(const uint64_t x);
-extern uint64_t _hitag2_init(const uint64_t key, const uint32_t serial, const uint32_t IV);
-extern uint64_t _hitag2_round(uint64_t *state);
-extern uint32_t _hitag2_byte(uint64_t *x);
-extern void hitag2_cipher_reset(struct hitag2_tag *tag, const uint8_t *iv);
-extern int hitag2_cipher_authenticate(uint64_t *cs, const uint8_t *authenticator_is);
-extern int hitag2_cipher_transcrypt(uint64_t *cs, uint8_t *data, uint16_t bytes, uint16_t bits) ;
+uint32_t _f20(const uint64_t x);
+uint64_t _hitag2_init(const uint64_t key, const uint32_t serial, const uint32_t IV);
+uint64_t _hitag2_round(uint64_t *state);
+uint32_t _hitag2_byte(uint64_t *x);
+void hitag2_cipher_reset(struct hitag2_tag *tag, const uint8_t *iv);
+int hitag2_cipher_authenticate(uint64_t *cs, const uint8_t *authenticator_is);
+int hitag2_cipher_transcrypt(uint64_t *cs, uint8_t *data, uint16_t bytes, uint16_t bits) ;
 #ifdef __cplusplus
 }
 #endif
diff --git a/armsrc/iso14443a.h b/armsrc/iso14443a.h
index 777932540..baebe4fc5 100644
--- a/armsrc/iso14443a.h
+++ b/armsrc/iso14443a.h
@@ -97,45 +97,45 @@ typedef struct {
 # define	CheckCrc14A(data, len)	check_crc(CRC_14443_A, (data), (len))
 #endif 
 
-extern void GetParity(const uint8_t *pbtCmd, uint16_t len, uint8_t *par);
+void GetParity(const uint8_t *pbtCmd, uint16_t len, uint8_t *par);
 
-extern tDemod *GetDemod(void);
-extern void DemodReset(void);
-extern void DemodInit(uint8_t *data, uint8_t *parity);
-extern tUart *GetUart(void);
-extern void UartReset(void);
-extern void UartInit(uint8_t *data, uint8_t *parity);
-extern RAMFUNC bool MillerDecoding(uint8_t bit, uint32_t non_real_time);
-extern RAMFUNC int ManchesterDecoding(uint8_t bit, uint16_t offset, uint32_t non_real_time);
+tDemod *GetDemod(void);
+void DemodReset(void);
+void DemodInit(uint8_t *data, uint8_t *parity);
+tUart *GetUart(void);
+void UartReset(void);
+void UartInit(uint8_t *data, uint8_t *parity);
+RAMFUNC bool MillerDecoding(uint8_t bit, uint32_t non_real_time);
+RAMFUNC int ManchesterDecoding(uint8_t bit, uint16_t offset, uint32_t non_real_time);
 
-extern void RAMFUNC SniffIso14443a(uint8_t param);
-extern void SimulateIso14443aTag(int tagType, int flags, uint8_t *data);
-extern void iso14443a_antifuzz(uint32_t flags);
-extern void ReaderIso14443a(UsbCommand *c);
-extern void ReaderTransmit(uint8_t *frame, uint16_t len, uint32_t *timing);
-extern void ReaderTransmitBitsPar(uint8_t *frame, uint16_t bits, uint8_t *par, uint32_t *timing);
-extern void ReaderTransmitPar(uint8_t *frame, uint16_t len, uint8_t *par, uint32_t *timing);
-extern int ReaderReceive(uint8_t *receivedAnswer, uint8_t *par);
+void RAMFUNC SniffIso14443a(uint8_t param);
+void SimulateIso14443aTag(int tagType, int flags, uint8_t *data);
+void iso14443a_antifuzz(uint32_t flags);
+void ReaderIso14443a(UsbCommand *c);
+void ReaderTransmit(uint8_t *frame, uint16_t len, uint32_t *timing);
+void ReaderTransmitBitsPar(uint8_t *frame, uint16_t bits, uint8_t *par, uint32_t *timing);
+void ReaderTransmitPar(uint8_t *frame, uint16_t len, uint8_t *par, uint32_t *timing);
+int ReaderReceive(uint8_t *receivedAnswer, uint8_t *par);
 
-extern void iso14443a_setup(uint8_t fpga_minor_mode);
-extern int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, bool send_chaining, void *data, uint8_t *res);
-extern int iso14443a_select_card(uint8_t *uid_ptr, iso14a_card_select_t *resp_data, uint32_t *cuid_ptr, bool anticollision, uint8_t num_cascades, bool no_rats);
-extern int iso14443a_fast_select_card(uint8_t *uid_ptr, uint8_t num_cascades);
-extern void iso14a_set_trigger(bool enable);
+void iso14443a_setup(uint8_t fpga_minor_mode);
+int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, bool send_chaining, void *data, uint8_t *res);
+int iso14443a_select_card(uint8_t *uid_ptr, iso14a_card_select_t *resp_data, uint32_t *cuid_ptr, bool anticollision, uint8_t num_cascades, bool no_rats);
+int iso14443a_fast_select_card(uint8_t *uid_ptr, uint8_t num_cascades);
+void iso14a_set_trigger(bool enable);
 
-extern int EmSendCmd14443aRaw(uint8_t *resp, uint16_t respLen);
-extern int EmSend4bit(uint8_t resp);
-extern int EmSendCmd(uint8_t *resp, uint16_t respLen);
-extern int EmSendCmdEx(uint8_t *resp, uint16_t respLen, bool collision);
-extern int EmGetCmd(uint8_t *received, uint16_t *len, uint8_t *parity);
-extern int EmSendCmdPar(uint8_t *resp, uint16_t respLen, uint8_t *par);
-extern int EmSendCmdParEx(uint8_t *resp, uint16_t respLen, uint8_t *par, bool collision);
-extern int EmSendPrecompiledCmd(tag_response_info_t *response_info);
+int EmSendCmd14443aRaw(uint8_t *resp, uint16_t respLen);
+int EmSend4bit(uint8_t resp);
+int EmSendCmd(uint8_t *resp, uint16_t respLen);
+int EmSendCmdEx(uint8_t *resp, uint16_t respLen, bool collision);
+int EmGetCmd(uint8_t *received, uint16_t *len, uint8_t *parity);
+int EmSendCmdPar(uint8_t *resp, uint16_t respLen, uint8_t *par);
+int EmSendCmdParEx(uint8_t *resp, uint16_t respLen, uint8_t *par, bool collision);
+int EmSendPrecompiledCmd(tag_response_info_t *response_info);
 
 bool EmLogTrace(uint8_t *reader_data, uint16_t reader_len, uint32_t reader_StartTime, uint32_t reader_EndTime, uint8_t *reader_Parity,
                 uint8_t *tag_data, uint16_t tag_len, uint32_t tag_StartTime, uint32_t tag_EndTime, uint8_t *tag_Parity);
 
-//extern bool prepare_allocated_tag_modulation(tag_response_info_t *response_info, uint8_t **buffer, size_t *buffer_size);
+//bool prepare_allocated_tag_modulation(tag_response_info_t *response_info, uint8_t **buffer, size_t *buffer_size);
 
 void ReaderMifare(bool first_try, uint8_t block, uint8_t keytype);
 void DetectNACKbug();
diff --git a/armsrc/iso14443b.h b/armsrc/iso14443b.h
index e3c6c1dc8..cf16d48aa 100644
--- a/armsrc/iso14443b.h
+++ b/armsrc/iso14443b.h
@@ -34,15 +34,15 @@ extern "C" {
 # define AddCrc14B(data, len) compute_crc(CRC_14443_B, (data), (len), (data)+(len), (data)+(len)+1)
 #endif
 
-extern void SendRawCommand14443B_Ex(UsbCommand *c);
-extern void iso14443b_setup();
-extern uint8_t iso14443b_apdu(uint8_t const *message, size_t message_length, uint8_t *response);
-extern uint8_t iso14443b_select_card(iso14b_card_select_t *card);
-extern uint8_t iso14443b_select_card_srx(iso14b_card_select_t *card);
+void SendRawCommand14443B_Ex(UsbCommand *c);
+void iso14443b_setup();
+uint8_t iso14443b_apdu(uint8_t const *message, size_t message_length, uint8_t *response);
+uint8_t iso14443b_select_card(iso14b_card_select_t *card);
+uint8_t iso14443b_select_card_srx(iso14b_card_select_t *card);
 
 // testfunctions
-extern void WaitForFpgaDelayQueueIsEmpty(uint16_t delay);
-extern void ClearFpgaShiftingRegisters(void);
+void WaitForFpgaDelayQueueIsEmpty(uint16_t delay);
+void ClearFpgaShiftingRegisters(void);
 
 // States for 14B SIM command
 #define SIM_NOFIELD     0
diff --git a/armsrc/legicrf.h b/armsrc/legicrf.h
index 1c275a1ed..9deb445bd 100644
--- a/armsrc/legicrf.h
+++ b/armsrc/legicrf.h
@@ -14,8 +14,8 @@
 
 #include "proxmark3.h"
 
-extern void LegicRfInfo(void);
-extern void LegicRfReader(uint16_t offset, uint16_t len, uint8_t iv);
-extern void LegicRfWriter(uint16_t offset, uint16_t byte, uint8_t iv, uint8_t *data);
+void LegicRfInfo(void);
+void LegicRfReader(uint16_t offset, uint16_t len, uint8_t iv);
+void LegicRfWriter(uint16_t offset, uint16_t byte, uint8_t iv, uint8_t *data);
 
 #endif /* __LEGICRF_H */
diff --git a/armsrc/legicrfsim.h b/armsrc/legicrfsim.h
index da70bff0c..27fce129b 100644
--- a/armsrc/legicrfsim.h
+++ b/armsrc/legicrfsim.h
@@ -14,6 +14,6 @@
 
 #include "proxmark3.h"
 
-extern void LegicRfSimulate(uint8_t tagtype);
+void LegicRfSimulate(uint8_t tagtype);
 
 #endif /* __LEGICRFSIM_H */
diff --git a/armsrc/ticks.h b/armsrc/ticks.h
index d24d2aac5..c6715e177 100644
--- a/armsrc/ticks.h
+++ b/armsrc/ticks.h
@@ -37,11 +37,11 @@ void StartCountSspClk();
 void ResetSspClk(void);
 uint32_t RAMFUNC GetCountSspClk();
 
-extern void StartTicks(void);
-extern uint32_t GetTicks(void);
-extern void WaitTicks(uint32_t ticks);
-extern void WaitUS(uint16_t us);
-extern void WaitMS(uint16_t ms);
+void StartTicks(void);
+uint32_t GetTicks(void);
+void WaitTicks(uint32_t ticks);
+void WaitUS(uint16_t us);
+void WaitMS(uint16_t ms);
 
-extern void StopTicks(void);
+void StopTicks(void);
 #endif
diff --git a/armsrc/util.h b/armsrc/util.h
index 15f93d1f9..fc519fe43 100644
--- a/armsrc/util.h
+++ b/armsrc/util.h
@@ -84,9 +84,9 @@
 
 size_t nbytes(size_t nbits);
 
-extern uint32_t reflect(uint32_t v, int b); // used in crc.c ...
-extern uint8_t reflect8(uint8_t b);         // dedicated 8bit reversal
-extern uint16_t reflect16(uint16_t b);      // dedicated 16bit reversal
+uint32_t reflect(uint32_t v, int b); // used in crc.c ...
+uint8_t reflect8(uint8_t b);         // dedicated 8bit reversal
+uint16_t reflect16(uint16_t b);      // dedicated 16bit reversal
 
 void num_to_bytes(uint64_t n, size_t len, uint8_t *dest);
 uint64_t bytes_to_num(uint8_t *src, size_t len);
diff --git a/common/crapto1/crapto1.h b/common/crapto1/crapto1.h
index 251a25089..49a784cf9 100644
--- a/common/crapto1/crapto1.h
+++ b/common/crapto1/crapto1.h
@@ -51,7 +51,7 @@ uint8_t lfsr_rollback_bit(struct Crypto1State *s, uint32_t in, int fb);
 uint8_t lfsr_rollback_byte(struct Crypto1State *s, uint32_t in, int fb);
 uint32_t lfsr_rollback_word(struct Crypto1State *s, uint32_t in, int fb);
 int nonce_distance(uint32_t from, uint32_t to);
-extern bool validate_prng_nonce(uint32_t nonce);
+bool validate_prng_nonce(uint32_t nonce);
 #define FOREACH_VALID_NONCE(N, FILTER, FSIZE)\
     uint32_t __n = 0,__M = 0, N = 0;\
     int __i;\
diff --git a/common/crc.h b/common/crc.h
index 368758f40..dee8403c9 100644
--- a/common/crc.h
+++ b/common/crc.h
@@ -30,25 +30,25 @@ typedef struct crc {
  * refin is the setting for reversing (bitwise) the bytes during crc
  * refot is the setting for reversing (bitwise) the crc byte before returning it.
  */
-extern void crc_init_ref(crc_t *crc, int order, uint32_t polynom, uint32_t initial_value, uint32_t final_xor, bool refin, bool refout);
+void crc_init_ref(crc_t *crc, int order, uint32_t polynom, uint32_t initial_value, uint32_t final_xor, bool refin, bool refout);
 
 /* Initialize a crc structure. order is the order of the polynom, e.g. 32 for a CRC-32
  * polynom is the CRC polynom. initial_value is the initial value of a clean state.
  * final_xor is XORed onto the state before returning it from crc_result(). */
-extern void crc_init(crc_t *crc, int order, uint32_t polynom, uint32_t initial_value, uint32_t final_xor);
+void crc_init(crc_t *crc, int order, uint32_t polynom, uint32_t initial_value, uint32_t final_xor);
 
 
 /* Update the crc state. data is the data of length data_width bits (only the
  * data_width lower-most bits are used).
  */
-extern void crc_update(crc_t *crc, uint32_t data, int data_width);
-extern void crc_update2(crc_t *crc, uint32_t data, int data_width);
+void crc_update(crc_t *crc, uint32_t data, int data_width);
+void crc_update2(crc_t *crc, uint32_t data, int data_width);
 
 /* Clean the crc state, e.g. reset it to initial_value */
-extern void crc_clear(crc_t *crc);
+void crc_clear(crc_t *crc);
 
 /* Get the result of the crc calculation */
-extern uint32_t crc_finish(crc_t *crc);
+uint32_t crc_finish(crc_t *crc);
 
 // Calculate CRC-8/Maxim checksum
 uint32_t CRC8Maxim(uint8_t *buff, size_t size);
@@ -65,13 +65,13 @@ uint32_t CRC8Legic(uint8_t *buff, size_t size);
 /* Static initialization of a crc structure */
 #define CRC_INITIALIZER(_order, _polynom, _initial_value, _final_xor) { \
         .state = ((_initial_value) & ((1L<<(_order))-1)), \
-                 .order = (_order), \
-                          .polynom = (_polynom), \
-                                     .initial_value = (_initial_value), \
-                                                      .final_xor = (_final_xor), \
-                                                                   .mask = ((1L<<(_order))-1) \
-                                                                           .refin = false, \
-                                                                                   .refout = false \
+        .order = (_order), \
+        .polynom = (_polynom), \
+        .initial_value = (_initial_value), \
+        .final_xor = (_final_xor), \
+        .mask = ((1L<<(_order))-1) \
+        .refin = false, \
+        .refout = false \
     }
 
 #endif /* __CRC_H */
diff --git a/common/lfdemod.c b/common/lfdemod.c
index 17e38caa7..8c4a6b855 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -51,7 +51,7 @@
 //to allow debug print calls when used not on dev
 
 //void dummy(char *fmt, ...){}
-extern void Dbprintf(const char *fmt, ...);
+void Dbprintf(const char *fmt, ...);
 
 #ifndef ON_DEVICE
 #include "ui.h"
diff --git a/common/lfdemod.h b/common/lfdemod.h
index 9a807a02c..32421dea0 100644
--- a/common/lfdemod.h
+++ b/common/lfdemod.h
@@ -45,42 +45,42 @@ void getNextHigh(uint8_t *samples, size_t size, int high, size_t *i);
 bool loadWaveCounters(uint8_t *samples, size_t size, int lowToLowWaveLen[], int highToLowWaveLen[], int *waveCnt, int *skip, int *minClk, int *high, int *low);
 size_t pskFindFirstPhaseShift(uint8_t *samples, size_t size, uint8_t *curPhase, size_t waveStart, uint16_t fc, uint16_t *fullWaveLen);
 
-extern size_t   addParity(uint8_t *src, uint8_t *dest, uint8_t sourceLen, uint8_t pLen, uint8_t pType);
-extern int      askdemod(uint8_t *bits, size_t *size, int *clk, int *invert, int maxErr, uint8_t amp, uint8_t askType);
-extern int      askdemod_ext(uint8_t *bits, size_t *size, int *clk, int *invert, int maxErr, uint8_t amp, uint8_t askType, int *startIdx);
-extern void     askAmp(uint8_t *bits, size_t size);
-extern int      BiphaseRawDecode(uint8_t *bits, size_t *size, int *offset, int invert);
-extern uint8_t  bits_to_array(const uint8_t *bits, size_t size, uint8_t *dest);
-extern uint32_t bytebits_to_byte(uint8_t *src, size_t numbits);
-extern uint32_t bytebits_to_byteLSBF(uint8_t *src, size_t numbits);
-extern uint16_t countFC(uint8_t *bits, size_t size, bool fskAdj);
-extern int      DetectASKClock(uint8_t *dest, size_t size, int *clock, int maxErr);
-extern bool     DetectCleanAskWave(uint8_t *dest, size_t size, uint8_t high, uint8_t low);
-extern uint8_t  detectFSKClk(uint8_t *bits, size_t size, uint8_t fcHigh, uint8_t fcLow, int *firstClockEdge);
-extern int      DetectNRZClock(uint8_t *dest, size_t size, int clock, size_t *clockStartIdx);
-extern int      DetectPSKClock(uint8_t *dest, size_t size, int clock, size_t *firstPhaseShift, uint8_t *curPhase, uint8_t *fc);
-extern int      DetectStrongAskClock(uint8_t *dest, size_t size, int high, int low, int *clock);
-extern bool     DetectST(uint8_t *buffer, size_t *size, int *foundclock, size_t *ststart, size_t *stend);
-extern size_t   fskdemod(uint8_t *dest, size_t size, uint8_t rfLen, uint8_t invert, uint8_t fchigh, uint8_t fclow, int *start_idx);
-//extern void     getHiLo(uint8_t *bits, size_t size, int *high, int *low, uint8_t fuzzHi, uint8_t fuzzLo);
-extern void     getHiLo(int *high, int *low, uint8_t fuzzHi, uint8_t fuzzLo);
-extern uint32_t manchesterEncode2Bytes(uint16_t datain);
-extern int      ManchesterEncode(uint8_t *bits, size_t size);
-extern int      manrawdecode(uint8_t *bits, size_t *size, uint8_t invert, uint8_t *alignPos);
-extern int      nrzRawDemod(uint8_t *dest, size_t *size, int *clk, int *invert, int *startIdx);
-extern bool     parityTest(uint32_t bits, uint8_t bitLen, uint8_t pType);
-extern bool     preambleSearch(uint8_t *bits, uint8_t *preamble, size_t pLen, size_t *size, size_t *startIdx);
-extern bool     preambleSearchEx(uint8_t *bits, uint8_t *preamble, size_t pLen, size_t *size, size_t *startIdx, bool findone);
-extern int      pskRawDemod(uint8_t *dest, size_t *size, int *clock, int *invert);
-extern int      pskRawDemod_ext(uint8_t *dest, size_t *size, int *clock, int *invert, int *startIdx);
-extern void     psk2TOpsk1(uint8_t *bits, size_t size);
-extern void     psk1TOpsk2(uint8_t *bits, size_t size);
-extern size_t   removeParity(uint8_t *bits, size_t startIdx, uint8_t pLen, uint8_t pType, size_t bLen);
+size_t   addParity(uint8_t *src, uint8_t *dest, uint8_t sourceLen, uint8_t pLen, uint8_t pType);
+int      askdemod(uint8_t *bits, size_t *size, int *clk, int *invert, int maxErr, uint8_t amp, uint8_t askType);
+int      askdemod_ext(uint8_t *bits, size_t *size, int *clk, int *invert, int maxErr, uint8_t amp, uint8_t askType, int *startIdx);
+void     askAmp(uint8_t *bits, size_t size);
+int      BiphaseRawDecode(uint8_t *bits, size_t *size, int *offset, int invert);
+uint8_t  bits_to_array(const uint8_t *bits, size_t size, uint8_t *dest);
+uint32_t bytebits_to_byte(uint8_t *src, size_t numbits);
+uint32_t bytebits_to_byteLSBF(uint8_t *src, size_t numbits);
+uint16_t countFC(uint8_t *bits, size_t size, bool fskAdj);
+int      DetectASKClock(uint8_t *dest, size_t size, int *clock, int maxErr);
+bool     DetectCleanAskWave(uint8_t *dest, size_t size, uint8_t high, uint8_t low);
+uint8_t  detectFSKClk(uint8_t *bits, size_t size, uint8_t fcHigh, uint8_t fcLow, int *firstClockEdge);
+int      DetectNRZClock(uint8_t *dest, size_t size, int clock, size_t *clockStartIdx);
+int      DetectPSKClock(uint8_t *dest, size_t size, int clock, size_t *firstPhaseShift, uint8_t *curPhase, uint8_t *fc);
+int      DetectStrongAskClock(uint8_t *dest, size_t size, int high, int low, int *clock);
+bool     DetectST(uint8_t *buffer, size_t *size, int *foundclock, size_t *ststart, size_t *stend);
+size_t   fskdemod(uint8_t *dest, size_t size, uint8_t rfLen, uint8_t invert, uint8_t fchigh, uint8_t fclow, int *start_idx);
+//void     getHiLo(uint8_t *bits, size_t size, int *high, int *low, uint8_t fuzzHi, uint8_t fuzzLo);
+void     getHiLo(int *high, int *low, uint8_t fuzzHi, uint8_t fuzzLo);
+uint32_t manchesterEncode2Bytes(uint16_t datain);
+int      ManchesterEncode(uint8_t *bits, size_t size);
+int      manrawdecode(uint8_t *bits, size_t *size, uint8_t invert, uint8_t *alignPos);
+int      nrzRawDemod(uint8_t *dest, size_t *size, int *clk, int *invert, int *startIdx);
+bool     parityTest(uint32_t bits, uint8_t bitLen, uint8_t pType);
+bool     preambleSearch(uint8_t *bits, uint8_t *preamble, size_t pLen, size_t *size, size_t *startIdx);
+bool     preambleSearchEx(uint8_t *bits, uint8_t *preamble, size_t pLen, size_t *size, size_t *startIdx, bool findone);
+int      pskRawDemod(uint8_t *dest, size_t *size, int *clock, int *invert);
+int      pskRawDemod_ext(uint8_t *dest, size_t *size, int *clock, int *invert, int *startIdx);
+void     psk2TOpsk1(uint8_t *bits, size_t size);
+void     psk1TOpsk2(uint8_t *bits, size_t size);
+size_t   removeParity(uint8_t *bits, size_t startIdx, uint8_t pLen, uint8_t pType, size_t bLen);
 
 //tag specific
-extern int detectAWID(uint8_t *dest, size_t *size, int *waveStartIdx);
-extern int Em410xDecode(uint8_t *bits, size_t *size, size_t *start_idx, uint32_t *hi, uint64_t *lo);
-extern int HIDdemodFSK(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32_t *lo, int *waveStartIdx);
-extern int detectIdteck(uint8_t *dest, size_t *size);
-extern int detectIOProx(uint8_t *dest, size_t *size, int *waveStartIdx);
+int detectAWID(uint8_t *dest, size_t *size, int *waveStartIdx);
+int Em410xDecode(uint8_t *bits, size_t *size, size_t *start_idx, uint32_t *hi, uint64_t *lo);
+int HIDdemodFSK(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32_t *lo, int *waveStartIdx);
+int detectIdteck(uint8_t *dest, size_t *size);
+int detectIOProx(uint8_t *dest, size_t *size, int *waveStartIdx);
 #endif
diff --git a/common/usb_cdc.h b/common/usb_cdc.h
index 1e735faa6..3b95a11c1 100644
--- a/common/usb_cdc.h
+++ b/common/usb_cdc.h
@@ -41,23 +41,23 @@
 #include "proxmark3.h" // USB_CONNECT()
 #include "common.h"
 
-extern void usb_disable();
-extern void usb_enable();
-extern bool usb_check();
-extern bool usb_poll();
-extern bool usb_poll_validate_length();
-extern uint32_t usb_read(uint8_t *data, size_t len);
-extern uint32_t usb_write(const uint8_t *data, const size_t len);
+void usb_disable();
+void usb_enable();
+bool usb_check();
+bool usb_poll();
+bool usb_poll_validate_length();
+uint32_t usb_read(uint8_t *data, size_t len);
+uint32_t usb_write(const uint8_t *data, const size_t len);
 
-extern void SetUSBreconnect(int value);
-extern int GetUSBreconnect(void);
-extern void SetUSBconfigured(int value);
-extern int GetUSBconfigured(void);
+void SetUSBreconnect(int value);
+int GetUSBreconnect(void);
+void SetUSBconfigured(int value);
+int GetUSBconfigured(void);
 
-extern void AT91F_USB_SendData(AT91PS_UDP pUdp, const char *pData, uint32_t length);
-extern void AT91F_USB_SendZlp(AT91PS_UDP pUdp);
-extern void AT91F_USB_SendStall(AT91PS_UDP pUdp);
-extern void AT91F_CDC_Enumerate();
+void AT91F_USB_SendData(AT91PS_UDP pUdp, const char *pData, uint32_t length);
+void AT91F_USB_SendZlp(AT91PS_UDP pUdp);
+void AT91F_USB_SendStall(AT91PS_UDP pUdp);
+void AT91F_CDC_Enumerate();
 
 #endif // _USB_CDC_H_
 
diff --git a/include/legic_prng.h b/include/legic_prng.h
index 16855ab90..8f37e04a1 100644
--- a/include/legic_prng.h
+++ b/include/legic_prng.h
@@ -10,9 +10,9 @@
 #define __LEGIC_PRNG_H
 
 #include <stdint.h>
-extern void legic_prng_init(uint8_t iv);
-extern void legic_prng_forward(int count);
-extern uint8_t legic_prng_get_bit();
-extern uint32_t legic_prng_get_bits(uint8_t len);
+void legic_prng_init(uint8_t iv);
+void legic_prng_forward(int count);
+uint8_t legic_prng_get_bit();
+uint32_t legic_prng_get_bits(uint8_t len);
 #endif
 

From 127dc746744ec57f7c21602c6f502fc75471ead0 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 6 Apr 2019 15:50:45 +0200
Subject: [PATCH 1017/1938] chg: only english

---
 armsrc/mifaredesfire.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/armsrc/mifaredesfire.c b/armsrc/mifaredesfire.c
index 3bbf667b5..050de439e 100644
--- a/armsrc/mifaredesfire.c
+++ b/armsrc/mifaredesfire.c
@@ -195,11 +195,11 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
     LED_B_OFF();
     LED_C_OFF();
 
-    // 3 olika s�tt att authenticera.   AUTH (CRC16) , AUTH_ISO (CRC32) , AUTH_AES (CRC32)
-    // 4 olika crypto algo   DES, 3DES, 3K3DES, AES
-    // 3 olika kommunikations s�tt,   PLAIN,MAC,CRYPTO
+    // 3 different way to authenticate   AUTH (CRC16) , AUTH_ISO (CRC32) , AUTH_AES (CRC32)
+    // 4 different crypto algo   DES, 3DES, 3K3DES, AES
+    // 3 different communication modes,  PLAIN,MAC,CRYPTO
 
-    // des, nyckel 0,
+    // des, key 0,
     switch (mode) {
         case 1: {
             uint8_t keybytes[16];
@@ -495,7 +495,7 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
     cmd_send(CMD_ACK, 1, len, 0, resp, len);
 }
 
-// 3 olika ISO s�tt att skicka data till DESFIRE (direkt, inkapslat, inkapslat ISO)
+// 3 different ISO ways to send data to a DESFIRE (direct, capsuled, capsuled ISO)
 // cmd  =  cmd bytes to send
 // cmd_len = length of cmd
 // dataout = pointer to response data array
@@ -540,7 +540,7 @@ size_t CreateAPDU(uint8_t *datain, size_t len, uint8_t *dataout) {
     uint8_t cmd[cmdlen];
     memset(cmd, 0, cmdlen);
 
-    cmd[0] = 0x0A;  //  0x0A = skicka cid,  0x02 = ingen cid. S�rskilda bitar //
+    cmd[0] = 0x0A;  //  0x0A = send cid,  0x02 = no cid. 
     cmd[0] |= pcb_blocknum; // OR the block number into the PCB
     cmd[1] = 0x00;  //  CID: 0x00 //TODO: allow multiple selected cards
 

From 41f36ca20b339246848e512a039c2cf18943bed8 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 6 Apr 2019 19:09:01 +0200
Subject: [PATCH 1018/1938] make style

---
 armsrc/iso14443a.c            | 36 ++++++++++++------------
 armsrc/iso14443a.h            |  2 +-
 armsrc/mifaredesfire.c        |  2 +-
 armsrc/mifaresim.h            |  2 +-
 client/cmdhf15.c              |  2 +-
 client/cmdhfmf.c              |  2 +-
 client/cmdhfmfu.c             |  2 +-
 client/cmdlft55xx.c           |  6 ++--
 client/scripting.c            | 52 +++++++++++++++++------------------
 client/scripts/test_t55x7.lua | 48 ++++++++++++++++----------------
 client/util.h                 |  4 +--
 common/crc.h                  | 14 +++++-----
 common/lfdemod.c              |  6 ++--
 13 files changed, 89 insertions(+), 89 deletions(-)

diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 0f8d61888..13af0cfb4 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -1140,24 +1140,24 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
             AddCrc14A(emdata, len);
             EmSendCmd(emdata, len + 2);
             p_response = NULL;
-		} else if ((receivedCmd[0] == MIFARE_ULC_WRITE || receivedCmd[0] == MIFARE_ULC_COMP_WRITE) && (tagType == 2 || tagType == 7)) {        // Received a WRITE
-			// cmd + block + 4/16 bytes data + 2 bytes crc
-			if (len == 8 || len == 20) {
-				bool isCrcCorrect = CheckCrc14A(receivedCmd, len);
-				if (isCrcCorrect) {
-					int block = receivedCmd[1] + 12; // first 12 blocks of emu are [getversion answer - check tearing - pack - 0x00 - signature]
-					emlSetMem_xt(&receivedCmd[2], block, 1, 4);
-					// send ACK
-					EmSend4bit(CARD_ACK);
-				} else {
-					// send NACK 0x1 == crc/parity error
-					EmSend4bit(CARD_NACK_PA);
-				}	
-			} else {
-	   			// send NACK 0x0 == invalid argument
-				EmSend4bit(CARD_NACK_IV);
-			}
-			p_response = NULL;
+        } else if ((receivedCmd[0] == MIFARE_ULC_WRITE || receivedCmd[0] == MIFARE_ULC_COMP_WRITE) && (tagType == 2 || tagType == 7)) {        // Received a WRITE
+            // cmd + block + 4/16 bytes data + 2 bytes crc
+            if (len == 8 || len == 20) {
+                bool isCrcCorrect = CheckCrc14A(receivedCmd, len);
+                if (isCrcCorrect) {
+                    int block = receivedCmd[1] + 12; // first 12 blocks of emu are [getversion answer - check tearing - pack - 0x00 - signature]
+                    emlSetMem_xt(&receivedCmd[2], block, 1, 4);
+                    // send ACK
+                    EmSend4bit(CARD_ACK);
+                } else {
+                    // send NACK 0x1 == crc/parity error
+                    EmSend4bit(CARD_NACK_PA);
+                }
+            } else {
+                // send NACK 0x0 == invalid argument
+                EmSend4bit(CARD_NACK_IV);
+            }
+            p_response = NULL;
         } else if (receivedCmd[0] == MIFARE_ULEV1_READSIG && tagType == 7) {    // Received a READ SIGNATURE --
             // first 12 blocks of emu are [getversion answer - check tearing - pack - 0x00 - signature]
             uint16_t start = 4 * 4;
diff --git a/armsrc/iso14443a.h b/armsrc/iso14443a.h
index 2fba30ce4..d43ba6565 100644
--- a/armsrc/iso14443a.h
+++ b/armsrc/iso14443a.h
@@ -106,7 +106,7 @@ typedef struct {
 
 #ifndef CheckCrc14A
 # define	CheckCrc14A(data, len)	check_crc(CRC_14443_A, (data), (len))
-#endif 
+#endif
 
 void GetParity(const uint8_t *pbtCmd, uint16_t len, uint8_t *par);
 
diff --git a/armsrc/mifaredesfire.c b/armsrc/mifaredesfire.c
index 050de439e..1bddf3374 100644
--- a/armsrc/mifaredesfire.c
+++ b/armsrc/mifaredesfire.c
@@ -540,7 +540,7 @@ size_t CreateAPDU(uint8_t *datain, size_t len, uint8_t *dataout) {
     uint8_t cmd[cmdlen];
     memset(cmd, 0, cmdlen);
 
-    cmd[0] = 0x0A;  //  0x0A = send cid,  0x02 = no cid. 
+    cmd[0] = 0x0A;  //  0x0A = send cid,  0x02 = no cid.
     cmd[0] |= pcb_blocknum; // OR the block number into the PCB
     cmd[1] = 0x00;  //  CID: 0x00 //TODO: allow multiple selected cards
 
diff --git a/armsrc/mifaresim.h b/armsrc/mifaresim.h
index c7dab05c5..c735cc1dd 100644
--- a/armsrc/mifaresim.h
+++ b/armsrc/mifaresim.h
@@ -41,4 +41,4 @@ extern void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, u
 // 18 * 8 data bits, 18 * 1 parity bits, 5 start bits, 5 stop bits, 5 correction bits  ->   need 177 bytes buffer
 #define ALLOCATED_TAG_MODULATION_BUFFER_SIZE 512	// number of bytes required for precompiled response
 
-#endif
\ No newline at end of file
+#endif
diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index 55e4aa478..31d266d6d 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -848,7 +848,7 @@ int CmdHF15Restore(const char *Cmd) {
     }
 
     PrintAndLogEx(INFO, "Restoring data blocks.");
-        
+
     while (1) {
         tried = 0;
         hex[0] = 0x00;
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index fdbaa7563..f00093acb 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -1060,7 +1060,7 @@ int CmdHF14AMfRestore(const char *Cmd) {
         }
     }
     fclose(fdump);
-    PrintAndLogEx(INFO, "Finish restore");    
+    PrintAndLogEx(INFO, "Finish restore");
     return 0;
 }
 
diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index ac1391c47..f20665df6 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -2221,7 +2221,7 @@ int CmdHF14AMfURestore(const char *Cmd) {
 
     DropField();
     free(dump);
-    PrintAndLogEx(INFO, "Finish restore");    
+    PrintAndLogEx(INFO, "Finish restore");
     return 0;
 }
 //
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index dd02db95e..61507cea4 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -547,7 +547,7 @@ int CmdT55xxDetect(const char *Cmd) {
     }
 
     if (!tryDetectModulation())
-        PrintAndLogEx(WARNING, "Could not detect modulation automatically. Try setting it manually with " _YELLOW_("\'lf t55xx config\'") );
+        PrintAndLogEx(WARNING, "Could not detect modulation automatically. Try setting it manually with " _YELLOW_("\'lf t55xx config\'"));
 
     return 0;
 }
@@ -767,7 +767,7 @@ bool GetT55xxBlockData(uint32_t *blockdata) {
         return false;
 
     uint8_t idx = config.offset;
-        
+
     if (idx + 32 > DemodBufferLen) {
         PrintAndLogEx(WARNING, "The configured offset %d is too big. Possible offset: %d)", idx, DemodBufferLen - 32);
         return false;
@@ -1472,7 +1472,7 @@ int CmdT55xxInfo(const char *Cmd) {
 
     if (((!gotdata) && (!config.Q5)) || (gotdata && (!dataasq5)))
         printT5x7KnownBlock0(block0);
-    
+
     PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
 
     return 0;
diff --git a/client/scripting.c b/client/scripting.c
index d4efac99f..4d8aa5fe8 100644
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -702,46 +702,46 @@ static int l_keygen_algoD(lua_State *L) {
 }
 
 /*
-Read T55Xx block. 
+Read T55Xx block.
 param1 uint8_t block
 param2 bool page1
 param3 bool override
 param4 uint32_t password
 */
 static int l_T55xx_readblock(lua_State *L) {
-    
+
     //Check number of arguments
     int n = lua_gettop(L);
-    if ( n != 4 ) {
-         return returnToLuaWithError(L, "Wrong number of arguments, got %d bytes, expected 4", n);
+    if (n != 4) {
+        return returnToLuaWithError(L, "Wrong number of arguments, got %d bytes, expected 4", n);
     }
-    
+
     uint32_t block, usepage1, override, password;
     bool usepwd;
     size_t size;
-    
+
     const char *p_blockno = luaL_checklstring(L, 1, &size);
     if (size < 1 || size > 2)  return returnToLuaWithError(L, "Wrong size of blockNo, got %d, expected 1 or 2", (int) size);
     sscanf(p_blockno, "%x", &block);
-    
+
     const char *p_usepage1 = luaL_checklstring(L, 2, &size);
     if (size != 1)  return returnToLuaWithError(L, "Wrong size of usePage1, got %d, expected 1", (int) size);
     sscanf(p_usepage1, "%x", &usepage1);
-       
+
     const char *p_override = luaL_checklstring(L, 3, &size);
     if (size != 1)  return returnToLuaWithError(L, "Wrong size of override, got %d, expected 1", (int) size);
     sscanf(p_override, "%x", &override);
-    
+
     const char *p_pwd = luaL_checklstring(L, 4, &size);
-    if ( size == 0 ) {
+    if (size == 0) {
         usepwd = false;
     } else {
 
         if (size != 8) return returnToLuaWithError(L, "Wrong size of pwd, got %d , expected 8", (int) size);
         sscanf(p_pwd, "%08x", &password);
         usepwd = true;
-    }  
-    
+    }
+
     //Password mode
     if (usepwd) {
         // try reading the config block and verify that PWD bit is set before doing this!
@@ -767,16 +767,16 @@ static int l_T55xx_readblock(lua_State *L) {
     if (!AquireData(usepage1, block, usepwd, password)) {
         return returnToLuaWithError(L, "Failed to aquire data from card");
     }
-    
+
     if (!DecodeT55xxBlock()) {
         return returnToLuaWithError(L, "Failed to decode signal");
     }
-    
+
     uint32_t blockData = 0;
     if (GetT55xxBlockData(&blockData) == false) {
         return returnToLuaWithError(L, "Failed to get actual data");
     }
-       
+
     lua_pushunsigned(L, blockData);
     return 1;
 }
@@ -787,7 +787,7 @@ static int l_T55xx_detect(lua_State *L) {
     bool useGB = false, usepwd = false, isok;
     uint32_t gb, password = 0;
     size_t size;
-    
+
     //Check number of arguments
     int n = lua_gettop(L);
 
@@ -796,15 +796,15 @@ static int l_T55xx_detect(lua_State *L) {
             const char *p_gb = luaL_checklstring(L, 2, &size);
             if (size != 1)  return returnToLuaWithError(L, "Wrong size of useGB, got %d , expected 1", (int) size);
             sscanf(p_gb, "%u", &gb);
-            useGB = ( gb ) ? true : false;
-            printf("p_gb size  %zu | %c \n", size, useGB ? 'Y':'N');
+            useGB = (gb) ? true : false;
+            printf("p_gb size  %zu | %c \n", size, useGB ? 'Y' : 'N');
         }
         case 1: {
             const char *p_pwd = luaL_checklstring(L, 1, &size);
-            if ( size == 0 ) {
+            if (size == 0) {
                 usepwd = false;
             } else {
-                
+
                 if (size != 8)  return returnToLuaWithError(L, "Wrong size of pwd, got %d , expected 8", (int) size);
                 sscanf(p_pwd, "%08x", &password);
                 usepwd = true;
@@ -814,24 +814,24 @@ static int l_T55xx_detect(lua_State *L) {
         default :
             break;
     }
-   
+
     if (!useGB) {
-    
+
         isok = AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, usepwd, password);
-        if ( isok == false ) {
+        if (isok == false) {
             // signal error by returning Nil, errorstring
             lua_pushnil(L);
             lua_pushstring(L, "Failed to aquire LF signal data");
             return 2;
         }
     }
-    
+
     isok = tryDetectModulation();
-    if ( isok == false ) {
+    if (isok == false) {
         // signal error by returning Nil, errorstring
         lua_pushnil(L);
         lua_pushstring(L,  "Could not detect modulation automatically. Try setting it manually with \'lf t55xx config\'");
-        return 2;       
+        return 2;
     }
 
     lua_pushinteger(L, isok);
diff --git a/client/scripts/test_t55x7.lua b/client/scripts/test_t55x7.lua
index 3d21cc9e5..710df0c3f 100644
--- a/client/scripts/test_t55x7.lua
+++ b/client/scripts/test_t55x7.lua
@@ -44,7 +44,7 @@ local DEBUG = false -- the debug flag
 local total_tests = 0
 local total_pass = 0
 
-local data_blocks_cmds = {    
+local data_blocks_cmds = {
     [1] = '00000000',
     [2] = 'ffffffff',
     [3] = '80000000',
@@ -96,10 +96,10 @@ end
 local function GetConfigs( modulation )
 
     local t = {}
-    
+
     t['PSK1'] = {
                 [1] = '00001040',
-                [2] = '00041040', 
+                [2] = '00041040',
                 [3] = '00081040',
                 [4] = '000c1040',
                 [5] = '00101040',
@@ -118,7 +118,7 @@ local function GetConfigs( modulation )
                 [7] = '00182040',
                 [8] = '001c2040',
             }
-            
+
     t['PSK3'] = {
                 [1] = '00003040',
                 [2] = '00043040',
@@ -141,7 +141,7 @@ local function GetConfigs( modulation )
                 [8] = '00184040',
                 [9] = '001c4040',
             }
-            
+
     t['FSK2'] = {
                 [1] = '00005040',
                 [2] = '00045040',
@@ -152,7 +152,7 @@ local function GetConfigs( modulation )
                 [7] = '00185040',
                 [8] = '001c5040',
             }
-            
+
     t['FSK1A'] = {
                 [1] = '00006040',
                 [2] = '00046040',
@@ -163,7 +163,7 @@ local function GetConfigs( modulation )
                 [7] = '00186040',
                 [8] = '001c6040',
             }
-            
+
     t['FSK2A'] = {
                 [1] = '00007040',
                 [2] = '00047040',
@@ -174,10 +174,10 @@ local function GetConfigs( modulation )
                 [7] = '00187040',
                 [8] = '001c7040',
             }
-            
+
     t['ASK'] = {
                 [1] = '00008040',
-                [2] = '00048040', 
+                [2] = '00048040',
                 [3] = '00088040',
                 [4] = '000c8040',
                 [5] = '00108040',
@@ -185,7 +185,7 @@ local function GetConfigs( modulation )
                 [7] = '00188040',
                 [8] = '001c8040',
             }
-            
+
     t['BI'] = {
                 [1] = '00010040',
                 [2] = '00050040',
@@ -196,7 +196,7 @@ local function GetConfigs( modulation )
                 [7] = '00190040',
                 [8] = '001d0040',
             }
-            
+
     return t[modulation:upper()]
 end
 ---
@@ -205,10 +205,10 @@ local function WipeCard()
 
     print('Wiping card')
     core.console('lf t55xx wipe')
-    
+
     print('Detecting card')
     local res, msg = core.t55xx_detect()
-    if not res then 
+    if not res then
         oops("Can't detect modulation. Test failed.")
         core.console("rem [ERR:DETECT:WIPED] Failed to detect after wipe")
         return false
@@ -235,20 +235,20 @@ local function CheckReadBlock(block)
 end
 
 local function test(modulation)
-    
+
     local process_block0_cmds = {}
     local y
     local block = "00"
-    
+
     local s = ('Start test of %s'):format(modulation)
     print(s)
-    
+
     process_block0_cmds = GetConfigs(modulation)
-    
+
     if process_block0_cmds == nil then return oops('Cant find modulation '..modulation) end
-    
+
     for _ = 1, #process_block0_cmds do
-    
+
         local p_config_cmd = process_block0_cmds[_]
         local errors = 0
         core.clearCommandBuffer()
@@ -261,9 +261,9 @@ local function test(modulation)
         if err then return oops(err) end
         local response = core.WaitForResponseTimeout(cmds.CMD_ACK,TIMEOUT)
 
-        -- Detect 
+        -- Detect
         local res, msg = core.t55xx_detect()
-        if not res then 
+        if not res then
             print("can't detect modulation, skip to next config")
             core.console(format("rem [ERR:DETECT:%s] Failed to detect modulation", p_config_cmd))
             core.console(format('rem [SUMMARY:%s] FAIL detection', p_config_cmd))
@@ -304,11 +304,11 @@ local function main(args)
 
     core.clearCommandBuffer()
     local res
-    
+
     -- Adjust this table to set which configurations should be tested
 --    local test_modes = { 'PSK1', 'PSK2', 'PSK3', 'FSK1', 'FSK2', 'FSK1A', 'FSK2A', 'ASK', 'BI' }
     local test_modes = { 'ASK', 'PSK1' }
-    
+
     for _ = 1, #test_modes do
         res = WipeCard()
         if res then
@@ -322,6 +322,6 @@ local function main(args)
 
     exitMsg('Tests finished')
     core.console( format('rem [SUMMARY] Success rate: %d/%d tests passed%s', total_pass, total_tests, total_pass < total_tests and ", help me improving that number!" or " \\o/"))
-    
+
 end
 main(args)
diff --git a/client/util.h b/client/util.h
index 208ae61f0..83a5c87cd 100644
--- a/client/util.h
+++ b/client/util.h
@@ -200,8 +200,8 @@ int FillBuffer(uint8_t *data, size_t maxDataLength, size_t *dataLength, ...);
 
 bool CheckStringIsHEXValue(const char *value);
 void hex_to_buffer(const uint8_t *buf, const uint8_t *hex_data, const size_t hex_len,
-                          const size_t hex_max_len, const size_t min_str_len, const size_t spaces_between,
-                          bool uppercase);
+                   const size_t hex_max_len, const size_t min_str_len, const size_t spaces_between,
+                   bool uppercase);
 
 void print_hex(const uint8_t *data, const size_t len);
 void print_hex_break(const uint8_t *data, const size_t len, const uint8_t breaks);
diff --git a/common/crc.h b/common/crc.h
index dee8403c9..449b51bf3 100644
--- a/common/crc.h
+++ b/common/crc.h
@@ -65,13 +65,13 @@ uint32_t CRC8Legic(uint8_t *buff, size_t size);
 /* Static initialization of a crc structure */
 #define CRC_INITIALIZER(_order, _polynom, _initial_value, _final_xor) { \
         .state = ((_initial_value) & ((1L<<(_order))-1)), \
-        .order = (_order), \
-        .polynom = (_polynom), \
-        .initial_value = (_initial_value), \
-        .final_xor = (_final_xor), \
-        .mask = ((1L<<(_order))-1) \
-        .refin = false, \
-        .refout = false \
+                 .order = (_order), \
+                          .polynom = (_polynom), \
+                                     .initial_value = (_initial_value), \
+                                                      .final_xor = (_final_xor), \
+                                                                   .mask = ((1L<<(_order))-1) \
+                                                                           .refin = false, \
+                                                                                   .refout = false \
     }
 
 #endif /* __CRC_H */
diff --git a/common/lfdemod.c b/common/lfdemod.c
index 8c4a6b855..dfe959a37 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -1620,7 +1620,7 @@ int nrzRawDemod(uint8_t *dest, size_t *size, int *clk, int *invert, int *startId
         if (g_debugMode == 2) prnt("DEBUG nrzRawDemod: just noise detected - quitting");
         return -1;
     }
-    
+
     size_t clkStartIdx = 0;
     *clk = DetectNRZClock(dest, *size, *clk, &clkStartIdx);
     if (*clk == 0) return -2;
@@ -1911,13 +1911,13 @@ int pskRawDemod_ext(uint8_t *dest, size_t *size, int *clock, int *invert, int *s
                 if (waveLenCnt > fc) {
                     //this wave is a phase shift
                     /*
-                   prnt("DEBUG: phase shift at: %d, len: %d, nextClk: %d, i: %d, fc: %d"
+                    prnt("DEBUG: phase shift at: %d, len: %d, nextClk: %d, i: %d, fc: %d"
                         , waveStart
                         , waveLenCnt
                         , lastClkBit + *clock - tol
                         , i + 1
                         , fc);
-                      */  
+                      */
                     if (i + 1 >= lastClkBit + *clock - tol) { //should be a clock bit
                         curPhase ^= 1;
                         dest[numBits++] = curPhase;

From 1b9914288d2e9933ac3a654c9ba965582df848d2 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 6 Apr 2019 19:10:34 +0200
Subject: [PATCH 1019/1938] remove extern

---
 armsrc/mifaresim.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/armsrc/mifaresim.h b/armsrc/mifaresim.h
index c735cc1dd..65eabdf68 100644
--- a/armsrc/mifaresim.h
+++ b/armsrc/mifaresim.h
@@ -15,7 +15,7 @@
 
 #include <stdint.h>
 
-extern void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *datain);
+void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *datain);
 
 #define AC_DATA_READ             0
 #define AC_DATA_WRITE            1

From a27d549a6082731510de9563ed62fd0a5058b6ce Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 6 Apr 2019 19:48:20 +0200
Subject: [PATCH 1020/1938] WritePageHitagS: why on earth page <> page_

---
 armsrc/hitagS.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/armsrc/hitagS.c b/armsrc/hitagS.c
index cd9573243..5c7bec491 100644
--- a/armsrc/hitagS.c
+++ b/armsrc/hitagS.c
@@ -1451,7 +1451,7 @@ void ReadHitagS(hitag_function htf, hitag_data *htd) {
  * Authenticates to the Tag with the given Key or Challenge.
  * Writes the given 32Bit data into page_
  */
-void WritePageHitagS(hitag_function htf, hitag_data *htd, int page_) {
+void WritePageHitagS(hitag_function htf, hitag_data *htd, int page) {
 
     StopTicks();
 
@@ -1467,7 +1467,6 @@ void WritePageHitagS(hitag_function htf, hitag_data *htd, int page_) {
     int tag_sof;
     int t_wait = HITAG_T_WAIT_MAX;
     bool bStop;
-    int page = page_;
     unsigned char crc;
     uint8_t data[4] = {0, 0, 0, 0};
 
@@ -1509,7 +1508,7 @@ void WritePageHitagS(hitag_function htf, hitag_data *htd, int page_) {
         }
     }
 
-    Dbprintf("Page: %d", page_);
+    Dbprintf("Page: %d", page);
     Dbprintf("DATA: %02X %02X %02X %02X", data[0], data[1], data[2], data[3]);
 
     tag.pstate = HT_READY;
@@ -1582,7 +1581,7 @@ void WritePageHitagS(hitag_function htf, hitag_data *htd, int page_) {
 
         if (rxlen == 0 && tag.tstate == HT_WRITING_PAGE_ACK) {
             //no write access on this page
-            Dbprintf("no write access on page %d", page_);
+            Dbprintf("no write access on page %d", page);
             bStop = !false;
         } else if (rxlen == 0 && tag.tstate != HT_WRITING_PAGE_DATA) {
             //start the authetication

From a52a0bf53721d99de00c31e01975d941a001b527 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 6 Apr 2019 20:21:03 +0200
Subject: [PATCH 1021/1938] args names

---
 armsrc/apps.h       | 18 +++++------
 armsrc/iclass.c     | 22 ++++++-------
 armsrc/iso14443a.c  | 78 ++++++++++++++++++++++-----------------------
 armsrc/iso14443a.h  |  6 ++--
 armsrc/iso15693.c   | 10 +++---
 armsrc/legicrf.h    |  2 +-
 armsrc/lfops.c      |  6 ++--
 armsrc/lfsampling.c |  4 +--
 8 files changed, 73 insertions(+), 73 deletions(-)

diff --git a/armsrc/apps.h b/armsrc/apps.h
index c1893975c..529f197ca 100644
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -99,8 +99,8 @@ void WriteEM410x(uint32_t card, uint32_t id_hi, uint32_t id_lo);
 void CopyIndala64toT55x7(uint32_t hi, uint32_t lo); // Clone Indala 64-bit tag by UID to T55x7
 void CopyIndala224toT55x7(uint32_t uid1, uint32_t uid2, uint32_t uid3, uint32_t uid4, uint32_t uid5, uint32_t uid6, uint32_t uid7); // Clone Indala 224-bit tag by UID to T55x7
 void T55xxResetRead(void);
-void T55xxWriteBlock(uint32_t Data, uint8_t Block, uint32_t Pwd, uint8_t PwdMode);
-void T55xxWriteBlockExt(uint32_t Data, uint8_t Block, uint32_t Pwd, uint8_t PwdMode);
+void T55xxWriteBlock(uint32_t Data, uint8_t Block, uint32_t Pwd, uint8_t arg);
+void T55xxWriteBlockExt(uint32_t Data, uint8_t Block, uint32_t Pwd, uint8_t arg);
 void T55xxReadBlock(uint16_t arg0, uint8_t Block, uint32_t Pwd);
 void T55xxWakeUp(uint32_t Pwd);
 void T55xx_ChkPwds(void);
@@ -130,7 +130,7 @@ void ReaderIso14443a(UsbCommand *c);
 
 // Also used in iclass.c
 //bool RAMFUNC LogTrace(const uint8_t *btBytes, uint16_t len, uint32_t timestamp_start, uint32_t timestamp_end, uint8_t *parity, bool readerToTag);
-void GetParity(const uint8_t *pbtCmd, uint16_t len, uint8_t *parity);
+void GetParity(const uint8_t *pbtCmd, uint16_t len, uint8_t *par);
 void iso14a_set_trigger(bool enable);
 // also used in emv
 //bool prepare_allocated_tag_modulation(tag_response_info_t *response_info);
@@ -212,15 +212,15 @@ void Iso15693InitReader(void);
 void RAMFUNC SniffIClass(void);
 void SimulateIClass(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain);
 void ReaderIClass(uint8_t arg0);
-void ReaderIClass_Replay(uint8_t arg0, uint8_t *MAC);
-void iClass_Authentication(uint8_t *MAC);
+void ReaderIClass_Replay(uint8_t arg0, uint8_t *mac);
+void iClass_Authentication(uint8_t *mac);
 void iClass_Authentication_fast(uint64_t arg0, uint64_t arg1, uint8_t *datain);
-void iClass_WriteBlock(uint8_t blockNo, uint8_t *data);
-void iClass_ReadBlk(uint8_t blockNo);
-bool iClass_ReadBlock(uint8_t blockNo, uint8_t *data, uint8_t datalen);
+void iClass_WriteBlock(uint8_t blockno, uint8_t *data);
+void iClass_ReadBlk(uint8_t blockno);
+bool iClass_ReadBlock(uint8_t blockno, uint8_t *data, uint8_t len);
 void iClass_Dump(uint8_t blockno, uint8_t numblks);
 void iClass_Clone(uint8_t startblock, uint8_t endblock, uint8_t *data);
-void iClass_ReadCheck(uint8_t blockNo, uint8_t keyType);
+void iClass_ReadCheck(uint8_t blockno, uint8_t keytype);
 
 // cmd.h
 uint8_t cmd_receive(UsbCommand *cmd);
diff --git a/armsrc/iclass.c b/armsrc/iclass.c
index 1326306b1..658962a3c 100644
--- a/armsrc/iclass.c
+++ b/armsrc/iclass.c
@@ -2107,7 +2107,7 @@ void ReaderIClass(uint8_t arg0) {
 }
 
 // turn off afterwards
-void ReaderIClass_Replay(uint8_t arg0, uint8_t *MAC) {
+void ReaderIClass_Replay(uint8_t arg0, uint8_t *mac) {
 
     uint8_t cardsize = 0;
     uint8_t mem = 0;
@@ -2134,7 +2134,7 @@ void ReaderIClass_Replay(uint8_t arg0, uint8_t *MAC) {
         if (read_status < 2) continue;
 
         //for now replay captured auth (as cc not updated)
-        memcpy(check + 5, MAC, 4);
+        memcpy(check + 5, mac, 4);
 
         if (!sendCmdGetResponseWithRetries(check, sizeof(check), resp, 4, 5)) {
             DbpString("Error: Authentication Fail!");
@@ -2227,8 +2227,8 @@ void ReaderIClass_Replay(uint8_t arg0, uint8_t *MAC) {
 
 // not used. ?!? ( CMD_ICLASS_READCHECK)
 // turn off afterwards
-void iClass_ReadCheck(uint8_t blockNo, uint8_t keyType) {
-    uint8_t readcheck[] = { keyType, blockNo };
+void iClass_ReadCheck(uint8_t blockno, uint8_t keytype) {
+    uint8_t readcheck[] = { keytype, blockno };
     uint8_t resp[] = {0, 0, 0, 0, 0, 0, 0, 0};
     size_t isOK = 0;
     isOK = sendCmdGetResponseWithRetries(readcheck, sizeof(readcheck), resp, sizeof(resp), 6);
@@ -2348,9 +2348,9 @@ out:
 
 // Tries to read block.
 // retries 10times.
-bool iClass_ReadBlock(uint8_t blockNo, uint8_t *data, uint8_t len) {
+bool iClass_ReadBlock(uint8_t blockno, uint8_t *data, uint8_t len) {
     uint8_t resp[10];
-    uint8_t cmd[] = {ICLASS_CMD_READ_OR_IDENTIFY, blockNo, 0x00, 0x00};
+    uint8_t cmd[] = {ICLASS_CMD_READ_OR_IDENTIFY, blockno, 0x00, 0x00};
     AddCrc(cmd + 1, 1);
     // expect size 10,  retry 5times
     bool isOK = sendCmdGetResponseWithRetries(cmd, sizeof(cmd), resp, 10, 5);
@@ -2402,10 +2402,10 @@ void iClass_Dump(uint8_t blockno, uint8_t numblks) {
     BigBuf_free();
 }
 
-bool iClass_WriteBlock_ext(uint8_t blockNo, uint8_t *data) {
+bool iClass_WriteBlock_ext(uint8_t blockno, uint8_t *data) {
 
     uint8_t resp[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-    uint8_t write[] = { ICLASS_CMD_UPDATE, blockNo, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+    uint8_t write[] = { ICLASS_CMD_UPDATE, blockno, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
     memcpy(write + 2, data, 12); // data + mac
     AddCrc(write + 1, 13);
 
@@ -2416,7 +2416,7 @@ bool iClass_WriteBlock_ext(uint8_t blockNo, uint8_t *data) {
         if (memcmp(write + 2, resp, 8)) {
 
             //if not programming key areas (note key blocks don't get programmed with actual key data it is xor data)
-            if (blockNo != 3 && blockNo != 4) {
+            if (blockno != 3 && blockno != 4) {
                 isOK = sendCmdGetResponseWithRetries(write, sizeof(write), resp, sizeof(resp), 5);
             }
         }
@@ -2425,8 +2425,8 @@ bool iClass_WriteBlock_ext(uint8_t blockNo, uint8_t *data) {
 }
 
 // turn off afterwards
-void iClass_WriteBlock(uint8_t blockNo, uint8_t *data) {
-    bool isOK = iClass_WriteBlock_ext(blockNo, data);
+void iClass_WriteBlock(uint8_t blockno, uint8_t *data) {
+    bool isOK = iClass_WriteBlock_ext(blockno, data);
     cmd_send(CMD_ACK, isOK, 0, 0, 0, 0);
     switch_off();
 }
diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 13af0cfb4..465b73678 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -121,12 +121,12 @@ uint32_t iso14a_get_timeout(void) {
 //-----------------------------------------------------------------------------
 // Generate the parity value for a byte sequence
 //-----------------------------------------------------------------------------
-void GetParity(const uint8_t *pbtCmd, uint16_t iLen, uint8_t *par) {
+void GetParity(const uint8_t *pbtCmd, uint16_t len, uint8_t *par) {
     uint16_t paritybit_cnt = 0;
     uint16_t paritybyte_cnt = 0;
     uint8_t parityBits = 0;
 
-    for (uint16_t i = 0; i < iLen; i++) {
+    for (uint16_t i = 0; i < len; i++) {
         // Generate the parity bits
         parityBits |= ((oddparity8(pbtCmd[i])) << (7 - paritybit_cnt));
         if (paritybit_cnt == 7) {
@@ -193,9 +193,9 @@ void UartReset(void) {
     Uart.syncBit = 9999;
 }
 
-void UartInit(uint8_t *data, uint8_t *parity) {
+void UartInit(uint8_t *data, uint8_t *par) {
     Uart.output = data;
-    Uart.parity = parity;
+    Uart.parity = par;
     UartReset();
 }
 
@@ -366,9 +366,9 @@ void DemodReset(void) {
     Demod.samples = 0;
 }
 
-void DemodInit(uint8_t *data, uint8_t *parity) {
+void DemodInit(uint8_t *data, uint8_t *par) {
     Demod.output = data;
-    Demod.parity = parity;
+    Demod.parity = par;
     DemodReset();
 }
 
@@ -636,7 +636,7 @@ void RAMFUNC SniffIso14443a(uint8_t param) {
 //-----------------------------------------------------------------------------
 // Prepare tag messages
 //-----------------------------------------------------------------------------
-static void CodeIso14443aAsTagPar(const uint8_t *cmd, uint16_t len, uint8_t *parity, bool collision) {
+static void CodeIso14443aAsTagPar(const uint8_t *cmd, uint16_t len, uint8_t *par, bool collision) {
 
     //uint8_t localCol = 0;
     ToSendReset();
@@ -679,7 +679,7 @@ static void CodeIso14443aAsTagPar(const uint8_t *cmd, uint16_t len, uint8_t *par
             LastProxToAirDuration = 8 * ToSendMax;
         } else {
             // Get the parity bit
-            if (parity[i >> 3] & (0x80 >> (i & 0x0007))) {
+            if (par[i >> 3] & (0x80 >> (i & 0x0007))) {
                 ToSend[++ToSendMax] = SEC_D;
                 LastProxToAirDuration = 8 * ToSendMax - 4;
             } else {
@@ -774,7 +774,7 @@ static void EmLogTraceTag(uint8_t *tag_data, uint16_t tag_len, uint8_t *tag_Pari
 // stop when button is pressed
 // or return TRUE when command is captured
 //-----------------------------------------------------------------------------
-static int GetIso14443aCommandFromReader(uint8_t *received, uint8_t *parity, int *len) {
+static int GetIso14443aCommandFromReader(uint8_t *received, uint8_t *par, int *len) {
     // Set FPGA mode to "simulated ISO 14443 tag", no modulation (listen
     // only, since we are receiving, not transmitting).
     // Signal field is off with the appropriate LED
@@ -782,7 +782,7 @@ static int GetIso14443aCommandFromReader(uint8_t *received, uint8_t *parity, int
     FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_TAGSIM_LISTEN);
 
     // Now run a `software UART` on the stream of incoming samples.
-    UartInit(received, parity);
+    UartInit(received, par);
 
     // clear RXRDY:
     uint8_t b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
@@ -1520,7 +1520,7 @@ static void TransmitFor14443a(const uint8_t *cmd, uint16_t len, uint32_t *timing
 //-----------------------------------------------------------------------------
 // Prepare reader command (in bits, support short frames) to send to FPGA
 //-----------------------------------------------------------------------------
-void CodeIso14443aBitsAsReaderPar(const uint8_t *cmd, uint16_t bits, const uint8_t *parity) {
+void CodeIso14443aBitsAsReaderPar(const uint8_t *cmd, uint16_t bits, const uint8_t *par) {
     int i, j;
     int last = 0;
     uint8_t b;
@@ -1559,9 +1559,9 @@ void CodeIso14443aBitsAsReaderPar(const uint8_t *cmd, uint16_t bits, const uint8
         }
 
         // Only transmit parity bit if we transmitted a complete byte
-        if (j == 8 && parity != NULL) {
+        if (j == 8 && par != NULL) {
             // Get the parity bit
-            if (parity[i >> 3] & (0x80 >> (i & 0x0007))) {
+            if (par[i >> 3] & (0x80 >> (i & 0x0007))) {
                 // Sequence X
                 ToSend[++ToSendMax] = SEC_X;
                 LastProxToAirDuration = 8 * (ToSendMax + 1) - 2;
@@ -1599,8 +1599,8 @@ void CodeIso14443aBitsAsReaderPar(const uint8_t *cmd, uint16_t bits, const uint8
 //-----------------------------------------------------------------------------
 // Prepare reader command to send to FPGA
 //-----------------------------------------------------------------------------
-void CodeIso14443aAsReaderPar(const uint8_t *cmd, uint16_t len, const uint8_t *parity) {
-    CodeIso14443aBitsAsReaderPar(cmd, len * 8, parity);
+void CodeIso14443aAsReaderPar(const uint8_t *cmd, uint16_t len, const uint8_t *par) {
+    CodeIso14443aBitsAsReaderPar(cmd, len * 8, par);
 }
 
 //-----------------------------------------------------------------------------
@@ -1608,7 +1608,7 @@ void CodeIso14443aAsReaderPar(const uint8_t *cmd, uint16_t len, const uint8_t *p
 // Stop when button is pressed (return 1) or field was gone (return 2)
 // Or return 0 when command is captured
 //-----------------------------------------------------------------------------
-int EmGetCmd(uint8_t *received, uint16_t *len, uint8_t *parity) {
+int EmGetCmd(uint8_t *received, uint16_t *len, uint8_t *par) {
     *len = 0;
 
     uint32_t timer = 0, vtime = 0;
@@ -1632,7 +1632,7 @@ int EmGetCmd(uint8_t *received, uint16_t *len, uint8_t *parity) {
     AT91C_BASE_ADC->ADC_CR = AT91C_ADC_START;
 
     // Now run a 'software UART' on the stream of incoming samples.
-    UartInit(received, parity);
+    UartInit(received, par);
 
     // Clear RXRDY:
     uint8_t b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
@@ -1884,17 +1884,17 @@ void ReaderTransmit(uint8_t *frame, uint16_t len, uint32_t *timing) {
     ReaderTransmitBitsPar(frame, len * 8, par, timing);
 }
 
-int ReaderReceiveOffset(uint8_t *receivedAnswer, uint16_t offset, uint8_t *parity) {
-    if (!GetIso14443aAnswerFromTag(receivedAnswer, parity, offset))
+int ReaderReceiveOffset(uint8_t *receivedAnswer, uint16_t offset, uint8_t *par) {
+    if (!GetIso14443aAnswerFromTag(receivedAnswer, par, offset))
         return false;
-    LogTrace(receivedAnswer, Demod.len, Demod.startTime * 16 - DELAY_AIR2ARM_AS_READER, Demod.endTime * 16 - DELAY_AIR2ARM_AS_READER, parity, false);
+    LogTrace(receivedAnswer, Demod.len, Demod.startTime * 16 - DELAY_AIR2ARM_AS_READER, Demod.endTime * 16 - DELAY_AIR2ARM_AS_READER, par, false);
     return Demod.len;
 }
 
-int ReaderReceive(uint8_t *receivedAnswer, uint8_t *parity) {
-    if (!GetIso14443aAnswerFromTag(receivedAnswer, parity, 0))
+int ReaderReceive(uint8_t *receivedAnswer, uint8_t *par) {
+    if (!GetIso14443aAnswerFromTag(receivedAnswer, par, 0))
         return false;
-    LogTrace(receivedAnswer, Demod.len, Demod.startTime * 16 - DELAY_AIR2ARM_AS_READER, Demod.endTime * 16 - DELAY_AIR2ARM_AS_READER, parity, false);
+    LogTrace(receivedAnswer, Demod.len, Demod.startTime * 16 - DELAY_AIR2ARM_AS_READER, Demod.endTime * 16 - DELAY_AIR2ARM_AS_READER, par, false);
     return Demod.len;
 }
 
@@ -2030,7 +2030,7 @@ static int GetATQA(uint8_t *resp, uint8_t *resp_par) {
 // if anticollision is false, then the UID must be provided in uid_ptr[]
 // and num_cascades must be set (1: 4 Byte UID, 2: 7 Byte UID, 3: 10 Byte UID)
 // requests ATS unless no_rats is true
-int iso14443a_select_card(uint8_t *uid_ptr, iso14a_card_select_t *p_card, uint32_t *cuid_ptr, bool anticollision, uint8_t num_cascades, bool no_rats) {
+int iso14443a_select_card(uint8_t *uid_ptr, iso14a_card_select_t *resp_data, uint32_t *cuid_ptr, bool anticollision, uint8_t num_cascades, bool no_rats) {
 
     uint8_t sel_all[]    = { ISO14443A_CMD_ANTICOLL_OR_SELECT, 0x20 };
     uint8_t sel_uid[]    = { ISO14443A_CMD_ANTICOLL_OR_SELECT, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
@@ -2044,19 +2044,19 @@ int iso14443a_select_card(uint8_t *uid_ptr, iso14a_card_select_t *p_card, uint32
     int cascade_level = 0;
     int len;
 
-    if (p_card) {
-        p_card->uidlen = 0;
-        memset(p_card->uid, 0, 10);
-        p_card->ats_len = 0;
+    if (resp_data) {
+        resp_data->uidlen = 0;
+        memset(resp_data->uid, 0, 10);
+        resp_data->ats_len = 0;
     }
 
     if (!GetATQA(resp, resp_par)) {
         return 0;
     }
 
-    if (p_card) {
-        p_card->atqa[0] = resp[0];
-        p_card->atqa[1] = resp[1];
+    if (resp_data) {
+        resp_data->atqa[0] = resp[0];
+        resp_data->atqa[1] = resp[1];
     }
 
     if (anticollision) {
@@ -2151,14 +2151,14 @@ int iso14443a_select_card(uint8_t *uid_ptr, iso14a_card_select_t *p_card, uint32
         if (uid_ptr && anticollision)
             memcpy(uid_ptr + (cascade_level * 3), uid_resp, uid_resp_len);
 
-        if (p_card) {
-            memcpy(p_card->uid + (cascade_level * 3), uid_resp, uid_resp_len);
-            p_card->uidlen += uid_resp_len;
+        if (resp_data) {
+            memcpy(resp_data->uid + (cascade_level * 3), uid_resp, uid_resp_len);
+            resp_data->uidlen += uid_resp_len;
         }
     }
 
-    if (p_card) {
-        p_card->sak = sak;
+    if (resp_data) {
+        resp_data->sak = sak;
     }
 
     // PICC compilant with iso14443a-4 ---> (SAK & 0x20 != 0)
@@ -2173,9 +2173,9 @@ int iso14443a_select_card(uint8_t *uid_ptr, iso14a_card_select_t *p_card, uint32
 
         if (!len) return 0;
 
-        if (p_card) {
-            memcpy(p_card->ats, resp, sizeof(p_card->ats));
-            p_card->ats_len = len;
+        if (resp_data) {
+            memcpy(resp_data->ats, resp, sizeof(resp_data->ats));
+            resp_data->ats_len = len;
         }
 
         // reset the PCB block number
diff --git a/armsrc/iso14443a.h b/armsrc/iso14443a.h
index d43ba6565..92638c10a 100644
--- a/armsrc/iso14443a.h
+++ b/armsrc/iso14443a.h
@@ -112,10 +112,10 @@ void GetParity(const uint8_t *pbtCmd, uint16_t len, uint8_t *par);
 
 tDemod *GetDemod(void);
 void DemodReset(void);
-void DemodInit(uint8_t *data, uint8_t *parity);
+void DemodInit(uint8_t *data, uint8_t *par);
 tUart *GetUart(void);
 void UartReset(void);
-void UartInit(uint8_t *data, uint8_t *parity);
+void UartInit(uint8_t *data, uint8_t *par);
 RAMFUNC bool MillerDecoding(uint8_t bit, uint32_t non_real_time);
 RAMFUNC int ManchesterDecoding(uint8_t bit, uint16_t offset, uint32_t non_real_time);
 
@@ -139,7 +139,7 @@ int EmSendCmd14443aRaw(uint8_t *resp, uint16_t respLen);
 int EmSend4bit(uint8_t resp);
 int EmSendCmd(uint8_t *resp, uint16_t respLen);
 int EmSendCmdEx(uint8_t *resp, uint16_t respLen, bool collision);
-int EmGetCmd(uint8_t *received, uint16_t *len, uint8_t *parity);
+int EmGetCmd(uint8_t *received, uint16_t *len, uint8_t *par);
 int EmSendCmdPar(uint8_t *resp, uint16_t respLen, uint8_t *par);
 int EmSendCmdParEx(uint8_t *resp, uint16_t respLen, uint8_t *par, bool collision);
 int EmSendPrecompiledCmd(tag_response_info_t *response_info);
diff --git a/armsrc/iso15693.c b/armsrc/iso15693.c
index 12e9cc815..497a6aa90 100644
--- a/armsrc/iso15693.c
+++ b/armsrc/iso15693.c
@@ -621,8 +621,8 @@ void Iso15693InitReader(void) {
 
 // Encode (into the ToSend buffers) an identify request, which is the first
 // thing that you must send to a tag to get a response.
-// It expects "out" to be at least CMD_ID_RESP large
-static void BuildIdentifyRequest(uint8_t *out) {
+// It expects "cmdout" to be at least CMD_ID_RESP large
+static void BuildIdentifyRequest(uint8_t *cmdout) {
     uint8_t cmd[CMD_ID_RESP] = {0, ISO15_CMD_INVENTORY, 0, 0, 0};
     // flags
     cmd[0] = ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | ISO15_REQ_INVENTORY | ISO15_REQINV_SLOT1;
@@ -632,7 +632,7 @@ static void BuildIdentifyRequest(uint8_t *out) {
     AddCrc(cmd, 3);
     // coding as high speed (1 out of 4)
     CodeIso15693AsReader(cmd, CMD_ID_RESP);
-    memcpy(out, cmd, CMD_ID_RESP);
+    memcpy(cmdout, cmd, CMD_ID_RESP);
 }
 
 // uid is in transmission order (which is reverse of display order)
@@ -666,7 +666,7 @@ static void BuildReadBlockRequest(uint8_t **out, uint8_t *uid, uint8_t blockNumb
 
 // Now the VICC>VCD responses when we are simulating a tag
 // It expects "out" to be at least CMD_INV_RESP large
-static void BuildInventoryResponse(uint8_t *out, uint8_t *uid) {
+static void BuildInventoryResponse(uint8_t *cmdout, uint8_t *uid) {
 
     uint8_t cmd[CMD_INV_RESP] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 
@@ -687,7 +687,7 @@ static void BuildInventoryResponse(uint8_t *out, uint8_t *uid) {
     // CRC
     AddCrc(cmd, 10);
     CodeIso15693AsReader(cmd, CMD_INV_RESP);
-    memcpy(out, cmd, CMD_INV_RESP);
+    memcpy(cmdout, cmd, CMD_INV_RESP);
 }
 
 // Universal Method for sending to and recv bytes from a tag
diff --git a/armsrc/legicrf.h b/armsrc/legicrf.h
index 9deb445bd..76c392257 100644
--- a/armsrc/legicrf.h
+++ b/armsrc/legicrf.h
@@ -16,6 +16,6 @@
 
 void LegicRfInfo(void);
 void LegicRfReader(uint16_t offset, uint16_t len, uint8_t iv);
-void LegicRfWriter(uint16_t offset, uint16_t byte, uint8_t iv, uint8_t *data);
+void LegicRfWriter(uint16_t offset, uint16_t len, uint8_t iv, uint8_t *data);
 
 #endif /* __LEGICRF_H */
diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index 1e6f22863..d5a1d21c6 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -651,7 +651,7 @@ void SimulateTagLowFrequency(int period, int gap, int ledcontrol) {
 
 
 #define DEBUG_FRAME_CONTENTS 1
-void SimulateTagLowFrequencyBidir(int divisor, int t0) {
+void SimulateTagLowFrequencyBidir(int divisor, int max_bitlen) {
 }
 // compose fc/5 fc/8  waveform (FSK1)
 
@@ -824,7 +824,7 @@ void CmdHIDsimTAG(uint32_t hi, uint32_t lo, int ledcontrol) {
 // prepare a waveform pattern in the buffer based on the ID given then
 // simulate a FSK tag until the button is pressed
 // arg1 contains fcHigh and fcLow, arg2 contains STT marker and clock
-void CmdFSKsimTAG(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *bits, int ledcontrol) {
+void CmdFSKsimTAG(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream, int ledcontrol) {
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
 
     // free eventually allocated BigBuf memory
@@ -846,7 +846,7 @@ void CmdFSKsimTAG(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *bits, int
     }
 
     for (i = 0; i < size; i++) {
-        if (bits[i])
+        if (BitStream[i])
             fcAll(fcLow, &n, clk, &modCnt);
         else
             fcAll(fcHigh, &n, clk, &modCnt);
diff --git a/armsrc/lfsampling.c b/armsrc/lfsampling.c
index 7018fbae2..b20f6766b 100644
--- a/armsrc/lfsampling.c
+++ b/armsrc/lfsampling.c
@@ -248,9 +248,9 @@ uint32_t ReadLF(bool activeField, bool silent, int sample_size) {
 * Initializes the FPGA for reader-mode (field on), and acquires the samples.
 * @return number of bits sampled
 **/
-uint32_t SampleLF(bool printCfg, int sample_size) {
+uint32_t SampleLF(bool silent, int sample_size) {
     BigBuf_Clear_ext(false);
-    return ReadLF(true, printCfg, sample_size);
+    return ReadLF(true, silent, sample_size);
 }
 /**
 * Initializes the FPGA for sniffer-mode (field off), and acquires the samples.

From ebdfba033d7178929f28afb75922f8d3a10290f1 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 6 Apr 2019 20:35:58 +0200
Subject: [PATCH 1022/1938] arg names

---
 armsrc/apps.h          |  2 +-
 armsrc/mifarecmd.c     | 11 +++++-----
 armsrc/mifaredesfire.c | 50 ++++++++++++++++++++++--------------------
 armsrc/mifareutil.h    |  6 ++---
 armsrc/pcf7931.h       |  4 ++--
 armsrc/printf.h        |  2 +-
 6 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/armsrc/apps.h b/armsrc/apps.h
index 529f197ca..4e3e1219b 100644
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -141,7 +141,7 @@ void EPA_PACE_Collect_Nonce(UsbCommand *c);
 void EPA_PACE_Replay(UsbCommand *c);
 
 // mifarecmd.h
-void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *data);
+void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain);
 void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain);
 void MifareUC_Auth(uint8_t arg0, uint8_t *datain);
 void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain);
diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index f6b7692e2..d0822cfbb 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -100,7 +100,7 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
     LEDsoff();
 }
 
-void MifareUC_Auth(uint8_t arg0, uint8_t *keybytes) {
+void MifareUC_Auth(uint8_t arg0, uint8_t *datain) {
 
     bool turnOffField = (arg0 == 1);
 
@@ -119,7 +119,7 @@ void MifareUC_Auth(uint8_t arg0, uint8_t *keybytes) {
         return;
     };
 
-    if (!mifare_ultra_auth(keybytes)) {
+    if (!mifare_ultra_auth(datain)) {
         if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication failed");
         OnError(1);
         return;
@@ -851,12 +851,13 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
 // MIFARE nested authentication.
 //
 //-----------------------------------------------------------------------------
-void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *datain) {
+void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain) {
     // params
     uint8_t blockNo = arg0 & 0xff;
     uint8_t keyType = (arg0 >> 8) & 0xff;
     uint8_t targetBlockNo = arg1 & 0xff;
     uint8_t targetKeyType = (arg1 >> 8) & 0xff;
+    // calibrate = arg2
     uint64_t ui64Key = 0;
 
     ui64Key = bytes_to_num(datain, 6);
@@ -888,14 +889,14 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
     BigBuf_free();
     BigBuf_Clear_ext(false);
 
-    if (calibrate) clear_trace();
+    if (arg2) clear_trace();
     set_tracing(true);
 
     // statistics on nonce distance
     int16_t isOK = 0;
 #define NESTED_MAX_TRIES 12
     uint16_t unsuccessfull_tries = 0;
-    if (calibrate) { // for first call only. Otherwise reuse previous calibration
+    if (arg2) { // calibrate: for first call only. Otherwise reuse previous calibration
         LED_B_ON();
         WDT_HIT();
 
diff --git a/armsrc/mifaredesfire.c b/armsrc/mifaredesfire.c
index 1bddf3374..6168425bc 100644
--- a/armsrc/mifaredesfire.c
+++ b/armsrc/mifaredesfire.c
@@ -167,8 +167,10 @@ void MifareDesfireGetInformation() {
     OnSuccess();
 }
 
-void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain) {
-
+void MifareDES_Auth1(uint8_t arg0, uint8_t arg1, uint8_t arg2,  uint8_t *datain) {
+    // mode = arg0
+    // algo = arg1
+    // keyno = arg2
     int len = 0;
     //uint8_t PICC_MASTER_KEY8[8] = { 0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47};
     uint8_t PICC_MASTER_KEY16[16] = { 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f };
@@ -196,24 +198,24 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
     LED_C_OFF();
 
     // 3 different way to authenticate   AUTH (CRC16) , AUTH_ISO (CRC32) , AUTH_AES (CRC32)
-    // 4 different crypto algo   DES, 3DES, 3K3DES, AES
+    // 4 different crypto arg1   DES, 3DES, 3K3DES, AES
     // 3 different communication modes,  PLAIN,MAC,CRYPTO
 
     // des, key 0,
-    switch (mode) {
+    switch (arg0) {
         case 1: {
             uint8_t keybytes[16];
             uint8_t RndA[8] = {0x00};
             uint8_t RndB[8] = {0x00};
 
-            if (algo == 2) {
+            if (arg1 == 2) {
                 if (datain[1] == 0xff) {
                     memcpy(keybytes, PICC_MASTER_KEY16, 16);
                 } else {
                     memcpy(keybytes, datain + 1, datalen);
                 }
             } else {
-                if (algo == 1) {
+                if (arg1 == 1) {
                     if (datain[1] == 0xff) {
                         memcpy(keybytes, null_key_data8, 8);
                     } else {
@@ -225,13 +227,13 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
             struct desfire_key defaultkey = {0};
             desfirekey_t key = &defaultkey;
 
-            if (algo == 2)
+            if (arg1 == 2)
                 Desfire_3des_key_new_with_version(keybytes, key);
-            else if (algo == 1)
+            else if (arg1 == 1)
                 Desfire_des_key_new(keybytes, key);
 
             cmd[0] = AUTHENTICATE;
-            cmd[1] = keyno;  //keynumber
+            cmd[1] = arg2;  //keynumber
             len = DesfireAPDU(cmd, 2, resp);
             if (!len) {
                 if (MF_DBGLEVEL >= MF_DBG_ERROR) {
@@ -249,9 +251,9 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
             }
 
             memcpy(encRndB, resp + 3, 8);
-            if (algo == 2)
+            if (arg1 == 2)
                 tdes_dec(&decRndB, &encRndB, key->data);
-            else if (algo == 1)
+            else if (arg1 == 1)
                 des_dec(&decRndB, &encRndB, key->data);
 
             memcpy(RndB, decRndB, 8);
@@ -262,9 +264,9 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
             memcpy(RndA, decRndA, 8);
             uint8_t encRndA[8] = {0x00};
 
-            if (algo == 2)
+            if (arg1 == 2)
                 tdes_dec(&encRndA, &decRndA, key->data);
-            else if (algo == 1)
+            else if (arg1 == 1)
                 des_dec(&encRndA, &decRndA, key->data);
 
             memcpy(both, encRndA, 8);
@@ -274,9 +276,9 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
 
             }
 
-            if (algo == 2)
+            if (arg1 == 2)
                 tdes_dec(&encRndB, &decRndB, key->data);
-            else if (algo == 1)
+            else if (arg1 == 1)
                 des_dec(&encRndB, &decRndB, key->data);
 
             memcpy(both + 8, encRndB, 8);
@@ -302,9 +304,9 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
 
                 memcpy(encRndA, resp + 3, 8);
 
-                if (algo == 2)
+                if (arg1 == 2)
                     tdes_dec(&encRndA, &encRndA, key->data);
-                else if (algo == 1)
+                else if (arg1 == 1)
                     des_dec(&encRndA, &encRndA, key->data);
 
                 rol(decRndA, 8);
@@ -320,9 +322,9 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
                 /*
 
                  // Current key is a 3DES key, change it to a DES key
-                 if (algo == 2) {
+                 if (arg1 == 2) {
                 cmd[0] = CHANGE_KEY;
-                cmd[1] = keyno;
+                cmd[1] = arg2;
 
                 uint8_t newKey[16] = {0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77};
 
@@ -362,9 +364,9 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
 
                  } else {
                     // Current key is a DES key, change it to a 3DES key
-                    if (algo == 1) {
+                    if (arg1 == 1) {
                         cmd[0] = CHANGE_KEY;
-                        cmd[1] = keyno;
+                        cmd[1] = arg2;
 
                         uint8_t newKey[16] = {0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4a,0x4b,0x4c,0x4d,0x4e,0x4f};
 
@@ -406,9 +408,9 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
                 */
 
                 OnSuccess();
-                if (algo == 2)
+                if (arg1 == 2)
                     cmd_send(CMD_ACK, 1, 0, 0, skey->data, 16);
-                else if (algo == 1)
+                else if (arg1 == 1)
                     cmd_send(CMD_ACK, 1, 0, 0, skey->data, 8);
             } else {
                 DbpString("Authentication failed.");
@@ -418,7 +420,7 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
         }
         break;
         case 2:
-            //SendDesfireCommand(AUTHENTICATE_ISO, &keyno, resp);
+            //SendDesfireCommand(AUTHENTICATE_ISO, &arg2, resp);
             break;
         case 3: {
 
diff --git a/armsrc/mifareutil.h b/armsrc/mifareutil.h
index a6d4c28fe..a25c64fa4 100644
--- a/armsrc/mifareutil.h
+++ b/armsrc/mifareutil.h
@@ -83,8 +83,8 @@ int mifare_classic_halt_ex(struct Crypto1State *pcs);
 int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData);
 
 // Ultralight/NTAG...
-int mifare_ul_ev1_auth(uint8_t *key, uint8_t *pack);
-int mifare_ultra_auth(uint8_t *key);
+int mifare_ul_ev1_auth(uint8_t *keybytes, uint8_t *pack);
+int mifare_ultra_auth(uint8_t *keybytes);
 int mifare_ultra_readblock(uint8_t blockNo, uint8_t *blockData);
 //int mifare_ultra_writeblock_compat(uint8_t blockNo, uint8_t *blockData);
 int mifare_ultra_writeblock(uint8_t blockNo, uint8_t *blockData);
@@ -97,7 +97,7 @@ int mifare_desfire_des_auth1(uint32_t uid, uint8_t *blockData);
 int mifare_desfire_des_auth2(uint32_t uid, uint8_t *key, uint8_t *blockData);
 
 // crypto functions
-void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *receivedCmd, int len);
+void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len);
 void mf_crypto1_decryptEx(struct Crypto1State *pcs, uint8_t *data_in, int len, uint8_t *data_out);
 void mf_crypto1_encrypt(struct Crypto1State *pcs, uint8_t *data, uint16_t len, uint8_t *par);
 uint8_t mf_crypto1_encrypt4bit(struct Crypto1State *pcs, uint8_t data);
diff --git a/armsrc/pcf7931.h b/armsrc/pcf7931.h
index b8121c29f..5e3c5a8e4 100644
--- a/armsrc/pcf7931.h
+++ b/armsrc/pcf7931.h
@@ -8,8 +8,8 @@
 #include "string.h"
 
 size_t DemodPCF7931(uint8_t **outBlocks);
-bool IsBlock0PCF7931(uint8_t *Block);
-bool IsBlock1PCF7931(uint8_t *Block);
+bool IsBlock0PCF7931(uint8_t *block);
+bool IsBlock1PCF7931(uint8_t *block);
 void ReadPCF7931();
 void SendCmdPCF7931(uint32_t *tab);
 bool AddBytePCF7931(uint8_t byte, uint32_t *tab, int32_t l, int32_t p);
diff --git a/armsrc/printf.h b/armsrc/printf.h
index 616752ed6..ff0143790 100644
--- a/armsrc/printf.h
+++ b/armsrc/printf.h
@@ -15,7 +15,7 @@
 #include <stddef.h>
 #include "string.h"
 
-int kvsprintf(const char *format, void *arg, int radix, va_list ap) __attribute__((format(printf, 1, 0)));
+int kvsprintf(const char *fmt, void *arg, int radix, va_list ap) __attribute__((format(printf, 1, 0)));
 int vsprintf(char *dest, const char *fmt, va_list ap) __attribute__((format(printf, 2, 0)));
 int sprintf(char *dest, const char *fmt, ...) __attribute__((format(printf, 2, 3)));
 

From 51d6fa13ebe56398cbc6e3a315eb76cca2feb51a Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 6 Apr 2019 21:46:00 +0200
Subject: [PATCH 1023/1938] arg names

---
 client/cliparser/argtable3.h                 |  2 +-
 client/cliparser/cliparser.h                 |  4 +--
 client/cmddata.c                             | 30 ++++++++++----------
 client/cmddata.h                             |  4 +--
 client/cmdlf.c                               |  6 ++--
 client/cmdlfawid.c                           |  2 +-
 client/cmdlfcotag.c                          |  2 +-
 client/cmdlfem4x.c                           |  6 ++--
 client/cmdlffdx.c                            |  4 +--
 client/cmdlfguard.c                          |  2 +-
 client/cmdlfhid.c                            |  2 +-
 client/cmdlfindala.c                         |  2 +-
 client/cmdlfio.c                             |  2 +-
 client/cmdlfjablotron.c                      |  2 +-
 client/cmdlfkeri.c                           |  2 +-
 client/cmdlfnedap.c                          |  2 +-
 client/cmdlfnexwatch.c                       |  2 +-
 client/cmdlfnoralsy.c                        |  2 +-
 client/cmdlfpac.c                            |  2 +-
 client/cmdlfparadox.c                        |  2 +-
 client/cmdlfpresco.c                         |  2 +-
 client/cmdlfpyramid.c                        |  2 +-
 client/cmdlfsecurakey.c                      |  2 +-
 client/cmdlfviking.c                         |  2 +-
 client/cmdlfvisa2000.c                       |  2 +-
 client/graph.c                               | 12 ++++----
 client/hardnested/hardnested_bf_core.h       |  4 +--
 client/hardnested/hardnested_bitarray_core.c |  4 +--
 client/mifare/mifarehost.h                   |  2 +-
 common/crc.c                                 |  6 ++--
 common/crc16.c                               | 16 +++++------
 common/crc16.h                               |  2 +-
 32 files changed, 69 insertions(+), 69 deletions(-)

diff --git a/client/cliparser/argtable3.h b/client/cliparser/argtable3.h
index a442ec0d5..c3ec479ea 100644
--- a/client/cliparser/argtable3.h
+++ b/client/cliparser/argtable3.h
@@ -271,7 +271,7 @@ struct arg_date *arg_daten(const char *shortopts,
                            int maxcount,
                            const char *glossary);
 
-struct arg_end *arg_end(int maxerrors);
+struct arg_end *arg_end(int maxcount);
 
 
 /**** other functions *******************************************/
diff --git a/client/cliparser/cliparser.h b/client/cliparser/cliparser.h
index 7dd3584bc..d1fa19bce 100644
--- a/client/cliparser/cliparser.h
+++ b/client/cliparser/cliparser.h
@@ -32,9 +32,9 @@
 #define CLIGetStrWithReturn(paramnum, data, datalen) if (CLIParamStrToBuf(arg_get_str(paramnum), data, sizeof(data), datalen)) {CLIParserFree();return 1;}
 
 int CLIParserInit(char *vprogramName, char *vprogramHint, char *vprogramHelp);
-int CLIParserParseString(const char *str, void *argtable[], size_t vargtableLen, bool allowEmptyExec);
+int CLIParserParseString(const char *str, void *vargtable[], size_t vargtableLen, bool allowEmptyExec);
 int CLIParserParseStringEx(const char *str, void *vargtable[], size_t vargtableLen, bool allowEmptyExec, bool clueData);
-int CLIParserParseArg(int argc, char **argv, void *argtable[], size_t vargtableLen, bool allowEmptyExec);
+int CLIParserParseArg(int argc, char **argv, void *vargtable[], size_t vargtableLen, bool allowEmptyExec);
 void CLIParserFree();
 
 int CLIParamHexToBuf(struct arg_str *argstr, uint8_t *data, int maxdatalen, int *datalen);
diff --git a/client/cmddata.c b/client/cmddata.c
index 5b3074433..959472c58 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -237,26 +237,26 @@ int usage_data_fsktonrz() {
 
 //set the demod buffer with given array of binary (one bit per byte)
 //by marshmellow
-void setDemodBuf(uint8_t *buf, size_t size, size_t start_idx) {
-    if (buf == NULL) return;
+void setDemodBuff(uint8_t *buff, size_t size, size_t start_idx) {
+    if (buff == NULL) return;
 
     if (size > MAX_DEMOD_BUF_LEN - start_idx)
         size = MAX_DEMOD_BUF_LEN - start_idx;
 
     for (size_t i = 0; i < size; i++)
-        DemodBuffer[i] = buf[start_idx++];
+        DemodBuffer[i] = buff[start_idx++];
 
     DemodBufferLen = size;
 }
 
-bool getDemodBuf(uint8_t *buf, size_t *size) {
-    if (buf == NULL) return false;
+bool getDemodBuff(uint8_t *buff, size_t *size) {
+    if (buff == NULL) return false;
     if (size == NULL) return false;
     if (*size == 0) return false;
 
     *size = (*size > DemodBufferLen) ? DemodBufferLen : *size;
 
-    memcpy(buf, DemodBuffer, *size);
+    memcpy(buff, DemodBuffer, *size);
     return true;
 }
 
@@ -521,7 +521,7 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
     if (verbose) PrintAndLogEx(DEBUG, "DEBUG: (ASKDemod_ext) Using clock:%d, invert:%d, bits found:%d", clk, invert, BitLen);
 
     //output
-    setDemodBuf(bits, BitLen, 0);
+    setDemodBuff(bits, BitLen, 0);
     setClockGrid(clk, startIdx);
 
     if (verbose) {
@@ -608,7 +608,7 @@ int Cmdmandecoderaw(const char *Cmd) {
         size_t idx = 0;
         if (Em410xDecode(bits, &size, &idx, &hi, &id) == 1) {
             //need to adjust to set bitstream back to manchester encoded data
-            //setDemodBuf(bits, size, idx);
+            //setDemodBuff(bits, size, idx);
             printEM410x(hi, id);
         }
     }
@@ -638,7 +638,7 @@ int CmdBiphaseDecodeRaw(const char *Cmd) {
 
     uint8_t bits[MAX_DEMOD_BUF_LEN] = {0};
     size = sizeof(bits);
-    if (!getDemodBuf(bits, &size)) return 0;
+    if (!getDemodBuff(bits, &size)) return 0;
 
     errCnt = BiphaseRawDecode(bits, &size, &offset, invert);
     if (errCnt < 0) {
@@ -658,7 +658,7 @@ int CmdBiphaseDecodeRaw(const char *Cmd) {
 
     //remove first bit from raw demod
     if (offset)
-        setDemodBuf(DemodBuffer, DemodBufferLen - offset, offset);
+        setDemodBuff(DemodBuffer, DemodBufferLen - offset, offset);
 
     setClockGrid(g_DemodClock, g_DemodStartIdx + g_DemodClock * offset / 2);
     return 1;
@@ -696,7 +696,7 @@ int ASKbiphaseDemod(const char *Cmd, bool verbose) {
         return 0;
     }
     //success set DemodBuffer and return
-    setDemodBuf(BitStream, size, 0);
+    setDemodBuff(BitStream, size, 0);
     setClockGrid(clk, startIdx + clk * offset / 2);
     if (g_debugMode || verbose) {
         PrintAndLogEx(NORMAL, "Biphase Decoded using offset: %d - clock: %d - # errors:%d - data:", offset, clk, errCnt);
@@ -1067,7 +1067,7 @@ int FSKrawDemod(const char *Cmd, bool verbose) {
     int startIdx = 0;
     int size = fskdemod(bits, BitLen, rfLen, invert, fchigh, fclow, &startIdx);
     if (size > 0) {
-        setDemodBuf(bits, size, 0);
+        setDemodBuff(bits, size, 0);
         setClockGrid(rfLen, startIdx);
 
         // Now output the bitstream to the scrollback by line of 16 bits
@@ -1135,7 +1135,7 @@ int PSKDemod(const char *Cmd, bool verbose) {
         }
     }
     //prime demod buffer for output
-    setDemodBuf(bits, bitlen, 0);
+    setDemodBuff(bits, bitlen, 0);
     setClockGrid(clk, startIdx);
     return 1;
 }
@@ -1185,7 +1185,7 @@ int CmdIdteckDemod(const char *Cmd) {
             return 0;
         }
     }
-    setDemodBuf(DemodBuffer, 64, idx);
+    setDemodBuff(DemodBuffer, 64, idx);
 
     //got a good demod
     uint32_t id = 0;
@@ -1238,7 +1238,7 @@ int NRZrawDemod(const char *Cmd, bool verbose) {
     }
     if (verbose || g_debugMode) PrintAndLogEx(DEBUG, "DEBUG: (NRZrawDemod) Tried NRZ Demod using Clock: %d - invert: %d - Bits Found: %d", clk, invert, BitLen);
     //prime demod buffer for output
-    setDemodBuf(bits, BitLen, 0);
+    setDemodBuff(bits, BitLen, 0);
     setClockGrid(clk, clkStartIdx);
 
 
diff --git a/client/cmddata.h b/client/cmddata.h
index 5f0fe80e0..cca722ed4 100644
--- a/client/cmddata.h
+++ b/client/cmddata.h
@@ -36,8 +36,8 @@ command_t *CmdDataCommands();
 
 int CmdData(const char *Cmd);
 void printDemodBuff(void);
-void setDemodBuf(uint8_t *buff, size_t size, size_t startIdx);
-bool getDemodBuf(uint8_t *buff, size_t *size);
+void setDemodBuff(uint8_t *buff, size_t size, size_t start_idx);
+bool getDemodBuff(uint8_t *buff, size_t *size);
 void save_restoreDB(uint8_t saveOpt);// option '1' to save DemodBuffer any other to restore
 int CmdPrintDemodBuff(const char *Cmd);
 
diff --git a/client/cmdlf.c b/client/cmdlf.c
index 263e73749..1ea81b6ed 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -509,7 +509,7 @@ int CmdLFfskSim(const char *Cmd) {
             }
         }
     } else {
-        setDemodBuf(data, dataLen, 0);
+        setDemodBuff(data, dataLen, 0);
     }
 
     //default if not found
@@ -603,7 +603,7 @@ int CmdLFaskSim(const char *Cmd) {
         if (clk == 0)
             clk = GetAskClock("0", false);
     } else {
-        setDemodBuf(data, dataLen, 0);
+        setDemodBuff(data, dataLen, 0);
     }
     if (clk == 0) clk = 64;
     if (encoding == 0) clk /= 2; //askraw needs to double the clock speed
@@ -704,7 +704,7 @@ int CmdLFpskSim(const char *Cmd) {
         PrintAndLogEx(NORMAL, "carrier: %d", carrier);
 
     } else {
-        setDemodBuf(data, dataLen, 0);
+        setDemodBuff(data, dataLen, 0);
     }
 
     if (clk == 0) clk = 32;
diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c
index 72fc913da..72bd48a07 100644
--- a/client/cmdlfawid.c
+++ b/client/cmdlfawid.c
@@ -267,7 +267,7 @@ int CmdAWIDDemod(const char *Cmd) {
         return 0;
     }
 
-    setDemodBuf(bits, size, idx);
+    setDemodBuff(bits, size, idx);
     setClockGrid(50, waveIdx + (idx * 50));
 
 
diff --git a/client/cmdlfcotag.c b/client/cmdlfcotag.c
index ec26c89ff..53b0d0451 100644
--- a/client/cmdlfcotag.c
+++ b/client/cmdlfcotag.c
@@ -40,7 +40,7 @@ int CmdCOTAGDemod(const char *Cmd) {
         return -1;
     }
 
-    setDemodBuf(bits, bitlen, 0);
+    setDemodBuff(bits, bitlen, 0);
 
     //got a good demod
     uint16_t cn = bytebits_to_byteLSBF(bits + 1, 16);
diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 8d5ebb68b..b3e0c42dd 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -356,7 +356,7 @@ int AskEm410xDecode(bool verbose, uint32_t *hi, uint64_t *lo) {
     size_t idx = 0;
     uint8_t bits[512] = {0};
     size_t size = sizeof(bits);
-    if (!getDemodBuf(bits, &size)) {
+    if (!getDemodBuff(bits, &size)) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - Em410x problem during copy from ASK demod");
         return 0;
     }
@@ -381,7 +381,7 @@ int AskEm410xDecode(bool verbose, uint32_t *hi, uint64_t *lo) {
     }
 
     //set GraphBuffer for clone or sim command
-    setDemodBuf(DemodBuffer, (size == 40) ? 64 : 128, idx + 1);
+    setDemodBuff(DemodBuffer, (size == 40) ? 64 : 128, idx + 1);
     setClockGrid(g_DemodClock, g_DemodStartIdx + ((idx + 1)*g_DemodClock));
 
     PrintAndLogEx(DEBUG, "DEBUG: Em410x idx: %d, Len: %d, Printing Demod Buffer:", idx, size);
@@ -1109,7 +1109,7 @@ bool setDemodBufferEM(uint32_t *word, size_t idx) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - EM, failed removing parity");
         return false;
     }
-    setDemodBuf(DemodBuffer, 32, 0);
+    setDemodBuff(DemodBuffer, 32, 0);
     *word = bytebits_to_byteLSBF(DemodBuffer, 32);
     return true;
 }
diff --git a/client/cmdlffdx.c b/client/cmdlffdx.c
index 972ef9627..46dd0c8ca 100644
--- a/client/cmdlffdx.c
+++ b/client/cmdlffdx.c
@@ -186,7 +186,7 @@ int CmdFDXBdemodBI(const char *Cmd) {
         return 0;
     }
 
-    setDemodBuf(bs, 128, preambleIndex);
+    setDemodBuff(bs, 128, preambleIndex);
 
     // remove marker bits (1's every 9th digit after preamble) (pType = 2)
     size = removeParity(bs, preambleIndex + 11, 9, 2, 117);
@@ -256,7 +256,7 @@ int CmdFdxDemod(const char *Cmd) {
     }
 
     // set and leave DemodBuffer intact
-    setDemodBuf(DemodBuffer, 128, preambleIndex);
+    setDemodBuff(DemodBuffer, 128, preambleIndex);
     setClockGrid(g_DemodClock, g_DemodStartIdx + (preambleIndex * g_DemodClock));
     // remove marker bits (1's every 9th digit after preamble) (pType = 2)
     size = removeParity(DemodBuffer, 11, 9, 2, 117);
diff --git a/client/cmdlfguard.c b/client/cmdlfguard.c
index a3f8bbec9..1f89a87ef 100644
--- a/client/cmdlfguard.c
+++ b/client/cmdlfguard.c
@@ -220,7 +220,7 @@ int CmdGuardDemod(const char *Cmd) {
         PrintAndLogEx(DEBUG, "DEBUG: gProxII byte %u after xor: %02x", (unsigned int)idx, ByteStream[idx]);
     }
 
-    setDemodBuf(DemodBuffer, 96, preambleIndex);
+    setDemodBuff(DemodBuffer, 96, preambleIndex);
     setClockGrid(g_DemodClock, g_DemodStartIdx + (preambleIndex * g_DemodClock));
 
     //ByteStream contains 8 Bytes (64 bits) of decrypted raw tag data
diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c
index b44a5e68a..9dbb721cd 100644
--- a/client/cmdlfhid.c
+++ b/client/cmdlfhid.c
@@ -155,7 +155,7 @@ int CmdHIDDemod(const char *Cmd) {
         return 0;
     }
 
-    setDemodBuf(bits, size, idx);
+    setDemodBuff(bits, size, idx);
     setClockGrid(50, waveIdx + (idx * 50));
 
     if (hi2 == 0 && hi == 0 && lo == 0) {
diff --git a/client/cmdlfindala.c b/client/cmdlfindala.c
index c6be8bd29..b1d970575 100644
--- a/client/cmdlfindala.c
+++ b/client/cmdlfindala.c
@@ -208,7 +208,7 @@ int CmdIndalaDemod(const char *Cmd) {
             PrintAndLogEx(DEBUG, "DEBUG: Error - Indala: error demoding psk idx: %d", idx);
         return 0;
     }
-    setDemodBuf(DemodBuffer, size, idx);
+    setDemodBuff(DemodBuffer, size, idx);
     setClockGrid(g_DemodClock, g_DemodStartIdx + (idx * g_DemodClock));
 
     //convert UID to HEX
diff --git a/client/cmdlfio.c b/client/cmdlfio.c
index df994b1a1..ae18ec4f7 100644
--- a/client/cmdlfio.c
+++ b/client/cmdlfio.c
@@ -112,7 +112,7 @@ int CmdIOProxDemod(const char *Cmd) {
         }
         return 0;
     }
-    setDemodBuf(bits, size, idx);
+    setDemodBuff(bits, size, idx);
     setClockGrid(64, waveIdx + (idx * 64));
 
     if (idx == 0) {
diff --git a/client/cmdlfjablotron.c b/client/cmdlfjablotron.c
index e445b20b6..08312db4b 100644
--- a/client/cmdlfjablotron.c
+++ b/client/cmdlfjablotron.c
@@ -117,7 +117,7 @@ int CmdJablotronDemod(const char *Cmd) {
         return 0;
     }
 
-    setDemodBuf(DemodBuffer, 64, ans);
+    setDemodBuff(DemodBuffer, 64, ans);
     setClockGrid(g_DemodClock, g_DemodStartIdx + (ans * g_DemodClock));
 
     //got a good demod
diff --git a/client/cmdlfkeri.c b/client/cmdlfkeri.c
index 199e639a9..c3df3e7be 100644
--- a/client/cmdlfkeri.c
+++ b/client/cmdlfkeri.c
@@ -84,7 +84,7 @@ int CmdKeriDemod(const char *Cmd) {
 
         return 0;
     }
-    setDemodBuf(DemodBuffer, size, idx);
+    setDemodBuff(DemodBuffer, size, idx);
     setClockGrid(g_DemodClock, g_DemodStartIdx + (idx * g_DemodClock));
 
     //got a good demod
diff --git a/client/cmdlfnedap.c b/client/cmdlfnedap.c
index 320f07d6a..e03401e84 100644
--- a/client/cmdlfnedap.c
+++ b/client/cmdlfnedap.c
@@ -165,7 +165,7 @@ int CmdLFNedapDemod(const char *Cmd) {
     raw[1] = bytebits_to_byte(DemodBuffer + idx + 64, 32);
     raw[2] = bytebits_to_byte(DemodBuffer + idx + 32, 32);
     raw[3] = bytebits_to_byte(DemodBuffer + idx, 32);
-    setDemodBuf(DemodBuffer, 128, idx);
+    setDemodBuff(DemodBuffer, 128, idx);
     setClockGrid(g_DemodClock, g_DemodStartIdx + (idx * g_DemodClock));
 
     uint8_t firstParity = GetParity(DemodBuffer, EVEN, 63);
diff --git a/client/cmdlfnexwatch.c b/client/cmdlfnexwatch.c
index 3d5c1083b..ffe3bd785 100644
--- a/client/cmdlfnexwatch.c
+++ b/client/cmdlfnexwatch.c
@@ -57,7 +57,7 @@ int CmdNexWatchDemod(const char *Cmd) {
         return 0;
     }
 
-    setDemodBuf(DemodBuffer, size, idx + 4);
+    setDemodBuff(DemodBuffer, size, idx + 4);
     setClockGrid(g_DemodClock, g_DemodStartIdx + ((idx + 4)*g_DemodClock));
 
     idx = 8 + 32; // 8 = preamble, 32 = reserved bits (always 0)
diff --git a/client/cmdlfnoralsy.c b/client/cmdlfnoralsy.c
index 0f515ba43..e2c4a5c90 100644
--- a/client/cmdlfnoralsy.c
+++ b/client/cmdlfnoralsy.c
@@ -128,7 +128,7 @@ int CmdNoralsyDemod(const char *Cmd) {
         }
         return 0;
     }
-    setDemodBuf(DemodBuffer, 96, ans);
+    setDemodBuff(DemodBuffer, 96, ans);
     setClockGrid(g_DemodClock, g_DemodStartIdx + (ans * g_DemodClock));
 
     //got a good demod
diff --git a/client/cmdlfpac.c b/client/cmdlfpac.c
index 643e5295f..7c7742d95 100644
--- a/client/cmdlfpac.c
+++ b/client/cmdlfpac.c
@@ -46,7 +46,7 @@ int CmdPacDemod(const char *Cmd) {
 
         return 0;
     }
-    setDemodBuf(DemodBuffer, 128, ans);
+    setDemodBuff(DemodBuffer, 128, ans);
     setClockGrid(g_DemodClock, g_DemodStartIdx + (ans * g_DemodClock));
 
     //got a good demod
diff --git a/client/cmdlfparadox.c b/client/cmdlfparadox.c
index 23d45bc27..5cca09b4e 100644
--- a/client/cmdlfparadox.c
+++ b/client/cmdlfparadox.c
@@ -108,7 +108,7 @@ int CmdParadoxDemod(const char *Cmd) {
         return 0;
     }
 
-    setDemodBuf(bits, size, idx);
+    setDemodBuff(bits, size, idx);
     setClockGrid(50, waveIdx + (idx * 50));
 
     if (hi2 == 0 && hi == 0 && lo == 0) {
diff --git a/client/cmdlfpresco.c b/client/cmdlfpresco.c
index b76cdf5e3..cff86c88b 100644
--- a/client/cmdlfpresco.c
+++ b/client/cmdlfpresco.c
@@ -144,7 +144,7 @@ int CmdPrescoDemod(const char *Cmd) {
             PrintAndLogEx(DEBUG, "DEBUG: Error - Presco: ans: %d", ans);
         return 0;
     }
-    setDemodBuf(DemodBuffer, 128, ans);
+    setDemodBuff(DemodBuffer, 128, ans);
     setClockGrid(g_DemodClock, g_DemodStartIdx + (ans * g_DemodClock));
 
     //got a good demod
diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c
index 169c07194..e3f2a90b5 100644
--- a/client/cmdlfpyramid.c
+++ b/client/cmdlfpyramid.c
@@ -131,7 +131,7 @@ int CmdPyramidDemod(const char *Cmd) {
             PrintAndLogEx(DEBUG, "DEBUG: Error - Pyramid: error demoding fsk idx: %d", idx);
         return 0;
     }
-    setDemodBuf(bits, size, idx);
+    setDemodBuff(bits, size, idx);
     setClockGrid(50, waveIdx + (idx * 50));
 
     // Index map
diff --git a/client/cmdlfsecurakey.c b/client/cmdlfsecurakey.c
index 527aba839..1f14f8083 100644
--- a/client/cmdlfsecurakey.c
+++ b/client/cmdlfsecurakey.c
@@ -47,7 +47,7 @@ int CmdSecurakeyDemod(const char *Cmd) {
             PrintAndLogEx(DEBUG, "DEBUG: Error - Securakey: ans: %d", ans);
         return 0;
     }
-    setDemodBuf(DemodBuffer, 96, ans);
+    setDemodBuff(DemodBuffer, 96, ans);
     setClockGrid(g_DemodClock, g_DemodStartIdx + (ans * g_DemodClock));
 
     //got a good demod
diff --git a/client/cmdlfviking.c b/client/cmdlfviking.c
index 6c4a408b1..49b4ccf2f 100644
--- a/client/cmdlfviking.c
+++ b/client/cmdlfviking.c
@@ -90,7 +90,7 @@ int CmdVikingDemod(const char *Cmd) {
     uint8_t  checksum = bytebits_to_byte(DemodBuffer + ans + 32 + 24, 8);
     PrintAndLogEx(SUCCESS, "Viking Tag Found: Card ID %08X, Checksum: %02X", cardid, checksum);
     PrintAndLogEx(SUCCESS, "Raw: %08X%08X", raw1, raw2);
-    setDemodBuf(DemodBuffer, 64, ans);
+    setDemodBuff(DemodBuffer, 64, ans);
     setClockGrid(g_DemodClock, g_DemodStartIdx + (ans * g_DemodClock));
     return 1;
 }
diff --git a/client/cmdlfvisa2000.c b/client/cmdlfvisa2000.c
index 82bf491c2..3dcc7cf04 100644
--- a/client/cmdlfvisa2000.c
+++ b/client/cmdlfvisa2000.c
@@ -122,7 +122,7 @@ int CmdVisa2kDemod(const char *Cmd) {
         save_restoreGB(GRAPH_RESTORE);
         return 0;
     }
-    setDemodBuf(DemodBuffer, 96, ans);
+    setDemodBuff(DemodBuffer, 96, ans);
     setClockGrid(g_DemodClock, g_DemodStartIdx + (ans * g_DemodClock));
 
     //got a good demod
diff --git a/client/graph.c b/client/graph.c
index 4decd40c8..1557efb7d 100644
--- a/client/graph.c
+++ b/client/graph.c
@@ -59,8 +59,8 @@ void save_restoreGB(uint8_t saveOpt) {
     return;
 }
 
-void setGraphBuf(uint8_t *buf, size_t size) {
-    if (buf == NULL) return;
+void setGraphBuf(uint8_t *buff, size_t size) {
+    if (buff == NULL) return;
 
     ClearGraph(false);
 
@@ -68,21 +68,21 @@ void setGraphBuf(uint8_t *buf, size_t size) {
         size = MAX_GRAPH_TRACE_LEN;
 
     for (uint32_t i = 0; i < size; ++i)
-        GraphBuffer[i] = buf[i] - 128;
+        GraphBuffer[i] = buff[i] - 128;
 
     GraphTraceLen = size;
     RepaintGraphWindow();
     return;
 }
 
-size_t getFromGraphBuf(uint8_t *buf) {
-    if (buf == NULL) return 0;
+size_t getFromGraphBuf(uint8_t *buff) {
+    if (buff == NULL) return 0;
     uint32_t i;
     for (i = 0; i < GraphTraceLen; ++i) {
         //trim
         if (GraphBuffer[i] > 127) GraphBuffer[i] = 127;
         if (GraphBuffer[i] < -127) GraphBuffer[i] = -127;
-        buf[i] = (uint8_t)(GraphBuffer[i] + 128);
+        buff[i] = (uint8_t)(GraphBuffer[i] + 128);
     }
     return i;
 }
diff --git a/client/hardnested/hardnested_bf_core.h b/client/hardnested/hardnested_bf_core.h
index 4f481cbc8..872fa2d08 100644
--- a/client/hardnested/hardnested_bf_core.h
+++ b/client/hardnested/hardnested_bf_core.h
@@ -64,7 +64,7 @@ typedef enum {
 void SetSIMDInstr(SIMDExecInstr instr);
 SIMDExecInstr GetSIMDInstrAuto();
 
-const uint64_t crack_states_bitsliced(uint32_t cuid, uint8_t *best_first_bytes, statelist_t *p, uint32_t *keys_found, uint64_t *num_keys_tested, uint32_t nonces_to_bruteforce, uint8_t *bf_test_nonces_2nd_byte, noncelist_t *nonces);
-void bitslice_test_nonces(uint32_t nonces_to_bruteforce, uint32_t *bf_test_nonces, uint8_t *bf_test_nonce_par);
+const uint64_t crack_states_bitsliced(uint32_t cuid, uint8_t *best_first_bytes, statelist_t *p, uint32_t *keys_found, uint64_t *num_keys_tested, uint32_t nonces_to_bruteforce, uint8_t *bf_test_nonce_2nd_byte, noncelist_t *nonces);
+void bitslice_test_nonces(uint32_t nonces_to_bruteforce, uint32_t *bf_test_nonce, uint8_t *bf_test_nonce_par);
 
 #endif
diff --git a/client/hardnested/hardnested_bitarray_core.c b/client/hardnested/hardnested_bitarray_core.c
index 788d95597..e9e84aa40 100644
--- a/client/hardnested/hardnested_bitarray_core.c
+++ b/client/hardnested/hardnested_bitarray_core.c
@@ -593,8 +593,8 @@ uint32_t bitcount(uint32_t a) {
     return (*bitcount_function_p)(a);
 }
 
-uint32_t count_states(uint32_t *bitarray) {
-    return (*count_states_function_p)(bitarray);
+uint32_t count_states(uint32_t *A) {
+    return (*count_states_function_p)(A);
 }
 
 void bitarray_AND(uint32_t *A, uint32_t *B) {
diff --git a/client/mifare/mifarehost.h b/client/mifare/mifarehost.h
index 81e0e8f03..fd3935d41 100644
--- a/client/mifare/mifarehost.h
+++ b/client/mifare/mifarehost.h
@@ -70,7 +70,7 @@ typedef struct {
 extern char logHexFileName[FILE_PATH_SIZE];
 
 int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key);
-int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t *resultKeys, bool calibrate);
+int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t *resultKey, bool calibrate);
 int mfCheckKeys(uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t keycnt, uint8_t *keyBlock, uint64_t *key);
 int mfCheckKeys_fast(uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk,
                      uint8_t strategy, uint32_t size, uint8_t *keyBlock, sector_t *e_sector, bool use_flashmemory);
diff --git a/common/crc.c b/common/crc.c
index 2ad7609b1..c3bd90064 100644
--- a/common/crc.c
+++ b/common/crc.c
@@ -107,12 +107,12 @@ uint32_t CRC8Mad(uint8_t *buff, size_t size) {
     return crc_finish(&crc);
 }
 // width=4  poly=0xC, reversed poly=0x7  init=0x5   refin=true  refout=true  xorout=0x0000  check=  name="CRC-4/LEGIC"
-uint32_t CRC4Legic(uint8_t *cmd, size_t size) {
+uint32_t CRC4Legic(uint8_t *buff, size_t size) {
     crc_t crc;
     crc_init_ref(&crc, 4, 0x19 >> 1, 0x5, 0, true, true);
     crc_update2(&crc, 1, 1); /* CMD_READ */
-    crc_update2(&crc, cmd[0], 8);
-    crc_update2(&crc, cmd[1], 8);
+    crc_update2(&crc, buff[0], 8);
+    crc_update2(&crc, buff[1], 8);
     return reflect(crc_finish(&crc), 4);
 }
 // width=8  poly=0x63, reversed poly=0x8D  init=0x55  refin=true  refout=true  xorout=0x0000  check=0xC6  name="CRC-8/LEGIC"
diff --git a/common/crc16.c b/common/crc16.c
index 69ada3b24..075b5d724 100644
--- a/common/crc16.c
+++ b/common/crc16.c
@@ -9,21 +9,21 @@
 
 static uint16_t crc_table[256];
 static bool crc_table_init = false;
-static CrcType_t crc_type = CRC_NONE;
+static CrcType_t current_crc_type = CRC_NONE;
 
-void init_table(CrcType_t ct) {
+void init_table(CrcType_t crctype) {
 
     // same crc algo, and initialised already
-    if (ct == crc_type && crc_table_init)
+    if (crctype == current_crc_type && crc_table_init)
         return;
 
     // not the same crc algo. reset table.
-    if (ct != crc_type)
+    if (crctype != current_crc_type)
         reset_table();
 
-    crc_type = ct;
+    current_crc_type = crctype;
 
-    switch (ct) {
+    switch (crctype) {
         case CRC_14443_A:
         case CRC_14443_B:
         case CRC_15693:
@@ -44,7 +44,7 @@ void init_table(CrcType_t ct) {
             break;
         default:
             crc_table_init = false;
-            crc_type = CRC_NONE;
+            current_crc_type = CRC_NONE;
             break;
     }
 }
@@ -80,7 +80,7 @@ void generate_table(uint16_t polynomial, bool refin) {
 void reset_table(void) {
     memset(crc_table, 0, sizeof(crc_table));
     crc_table_init = false;
-    crc_type = CRC_NONE;
+    current_crc_type = CRC_NONE;
 }
 
 // table lookup LUT solution
diff --git a/common/crc16.h b/common/crc16.h
index 9a202f514..e59ed1832 100644
--- a/common/crc16.h
+++ b/common/crc16.h
@@ -32,7 +32,7 @@ typedef enum {
 
 uint16_t update_crc16_ex(uint16_t crc, uint8_t c, uint16_t polynomial);
 uint16_t update_crc16(uint16_t crc, uint8_t c);
-uint16_t crc16(uint8_t const *message, size_t length, uint16_t remainder, uint16_t polynomial, bool refin, bool refout);
+uint16_t crc16(uint8_t const *d, size_t length, uint16_t remainder, uint16_t polynomial, bool refin, bool refout);
 
 uint16_t crc(CrcType_t ct, const uint8_t *d, size_t n);
 void compute_crc(CrcType_t ct, const uint8_t *d, size_t n, uint8_t *first, uint8_t *second);

From 50e131f99b028e539dc7689d945731cd1be00f51 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 6 Apr 2019 21:59:34 +0200
Subject: [PATCH 1024/1938] arg names

---
 client/cmdhf14a.c    | 2 +-
 client/cmdhf15.h     | 2 +-
 client/cmdhfmfdes.h  | 6 +++---
 client/cmdhfmfu.h    | 2 +-
 client/cmdlfhitag.h  | 2 +-
 client/cmdlfpresco.h | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 0894c578f..dad8495a3 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -15,7 +15,7 @@
 bool APDUInFramingEnable = true;
 
 static int CmdHelp(const char *Cmd);
-static int waitCmd(uint8_t iLen);
+static int waitCmd(uint8_t iSelect);
 
 static const manufactureName manufactureMapping[] = {
     // ID,  "Vendor Country"
diff --git a/client/cmdhf15.h b/client/cmdhf15.h
index 141163547..5a3753100 100644
--- a/client/cmdhf15.h
+++ b/client/cmdhf15.h
@@ -38,7 +38,7 @@ int CmdHF15Reader(const char *Cmd);
 int CmdHF15Sim(const char *Cmd);
 int CmdHF15Afi(const char *Cmd);
 int CmdHF15Dump(const char *Cmd);
-int CmdHF15Raw(const char *cmd);
+int CmdHF15Raw(const char *Cmd);
 int CmdHF15Readmulti(const char *Cmd);
 int CmdHF15Read(const char *Cmd);
 int CmdHF15Write(const char *Cmd);
diff --git a/client/cmdhfmfdes.h b/client/cmdhfmfdes.h
index 9aeb7dbeb..6f2f0fa3f 100644
--- a/client/cmdhfmfdes.h
+++ b/client/cmdhfmfdes.h
@@ -11,9 +11,9 @@
 #define __MFDESFIRE_H
 
 int CmdHFMFDes(const char *Cmd);
-int CmdHF14ADesAuth(const char *cmd);
-int CmdHF14ADesRb(const char *cmd);
-int CmdHF14ADesWb(const char *cmd);
+int CmdHF14ADesAuth(const char *Cmd);
+int CmdHF14ADesRb(const char *Cmd);
+int CmdHF14ADesWb(const char *Cmd);
 int CmdHF14ADesInfo(const char *Cmd);
 int CmdHF14ADesEnumApplications(const char *Cmd);
 
diff --git a/client/cmdhfmfu.h b/client/cmdhfmfu.h
index 315b4b542..28f79d086 100644
--- a/client/cmdhfmfu.h
+++ b/client/cmdhfmfu.h
@@ -43,7 +43,7 @@ int CmdHF14AMfUeLoad(const char *Cmd);
 int CmdHF14AMfUSim(const char *Cmd);
 
 uint32_t GetHF14AMfU_Type(void);
-int ul_print_type(uint32_t tagtype, uint8_t spacer);
+int ul_print_type(uint32_t tagtype, uint8_t spaces);
 
 void printMFUdump(mfu_dump_t *card);
 void printMFUdumpEx(mfu_dump_t *card, uint16_t pages, uint8_t startpage);
diff --git a/client/cmdlfhitag.h b/client/cmdlfhitag.h
index 6728d00e0..650e5d892 100644
--- a/client/cmdlfhitag.h
+++ b/client/cmdlfhitag.h
@@ -20,6 +20,6 @@ int CmdLFHitagInfo(const char *Cmd);
 int CmdLFHitagReader(const char *Cmd);
 int CmdLFHitagCheckChallenges(const char *Cmd);
 int CmdLFHitagWriter(const char *Cmd);
-int CmdLFHitagDump(const char *cmd);
+int CmdLFHitagDump(const char *Cmd);
 
 #endif
diff --git a/client/cmdlfpresco.h b/client/cmdlfpresco.h
index 5ae74a11f..9c84f75b6 100644
--- a/client/cmdlfpresco.h
+++ b/client/cmdlfpresco.h
@@ -28,7 +28,7 @@ int CmdPrescoClone(const char *Cmd);
 int CmdPrescoSim(const char *Cmd);
 
 int detectPresco(uint8_t *dest, size_t *size);
-int GetWiegandFromPresco(const char *id, uint32_t *sitecode, uint32_t *usercode, uint32_t *fullcode, bool *Q5);
+int GetWiegandFromPresco(const char *Cmd, uint32_t *sitecode, uint32_t *usercode, uint32_t *fullcode, bool *Q5);
 
 int usage_lf_presco_clone(void);
 int usage_lf_presco_sim(void);

From 7259a27f05072576c13354ab9b5f4850fabac19a Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 6 Apr 2019 22:04:02 +0200
Subject: [PATCH 1025/1938] Change printT55xxBlock API

---
 client/cmdlft55xx.c | 8 +++-----
 client/cmdlft55xx.h | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 61507cea4..835df18f2 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -379,9 +379,7 @@ int T55xxReadBlock(uint8_t block, bool page1, bool usepwd, bool override, uint32
     if (!AquireData(page1, block, usepwd, password)) return 0;
     if (!DecodeT55xxBlock()) return 0;
 
-    char blk[10] = {0};
-    sprintf(blk, "%02d", block);
-    printT55xxBlock(blk);
+    printT55xxBlock(block);
     return 1;
 }
 
@@ -777,7 +775,7 @@ bool GetT55xxBlockData(uint32_t *blockdata) {
     return true;
 }
 
-void printT55xxBlock(const char *blockNum) {
+void printT55xxBlock(uint8_t blockNum) {
 
     uint32_t blockData = 0;
     uint8_t bytes[4] = {0};
@@ -787,7 +785,7 @@ void printT55xxBlock(const char *blockNum) {
 
     num_to_bytes(blockData, 4, bytes);
 
-    PrintAndLogEx(NORMAL, " %s | %08X | %s | %s", blockNum, blockData, sprint_bin(DemodBuffer + config.offset, 32), sprint_ascii(bytes, 4));
+    PrintAndLogEx(NORMAL, " %02d | %08X | %s | %s", blockNum, blockData, sprint_bin(DemodBuffer + config.offset, 32), sprint_ascii(bytes, 4));
 }
 
 bool testModulation(uint8_t mode, uint8_t modread) {
diff --git a/client/cmdlft55xx.h b/client/cmdlft55xx.h
index dca8c6f39..71526b997 100644
--- a/client/cmdlft55xx.h
+++ b/client/cmdlft55xx.h
@@ -157,7 +157,7 @@ char *GetModulationStr(uint32_t id, bool xmode);
 char *GetModelStrFromCID(uint32_t cid);
 char *GetSelectedModulationStr(uint8_t id);
 void printT5xxHeader(uint8_t page);
-void printT55xxBlock(const char *demodStr);
+void printT55xxBlock(uint8_t blockNum);
 int printConfiguration(t55xx_conf_block_t b);
 
 int T55xxReadBlock(uint8_t block, bool page1, bool usepwd, bool override, uint32_t password);

From 24acbf86eba0cd5ce9b9a91350d869b7745b4853 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 6 Apr 2019 22:15:57 +0200
Subject: [PATCH 1026/1938] arg names

---
 client/cmdsmartcard.h | 6 +++---
 client/emv/dol.h      | 2 +-
 client/emv/emv_pki.h  | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/client/cmdsmartcard.h b/client/cmdsmartcard.h
index f7adb7690..1e94499af 100644
--- a/client/cmdsmartcard.h
+++ b/client/cmdsmartcard.h
@@ -29,9 +29,9 @@
 
 int CmdSmartcard(const char *Cmd);
 
-int CmdSmartRaw(const char *cmd);
-int CmdSmartUpgrade(const char *cmd);
-int CmdSmartInfo(const char *cmd);
+int CmdSmartRaw(const char *Cmd);
+int CmdSmartUpgrade(const char *Cmd);
+int CmdSmartInfo(const char *Cmd);
 int CmdSmartReader(const char *Cmd);
 
 bool smart_select(bool silent, smart_card_atr_t *atr);
diff --git a/client/emv/dol.h b/client/emv/dol.h
index 9b1b51656..496ae66f5 100644
--- a/client/emv/dol.h
+++ b/client/emv/dol.h
@@ -20,6 +20,6 @@
 #include <stddef.h>
 
 struct tlv *dol_process(const struct tlv *tlv, const struct tlvdb *tlvdb, tlv_tag_t tag);
-struct tlvdb *dol_parse(const struct tlv *tlv, const unsigned char *buf, size_t len);
+struct tlvdb *dol_parse(const struct tlv *tlv, const unsigned char *data, size_t data_len);
 
 #endif
diff --git a/client/emv/emv_pki.h b/client/emv/emv_pki.h
index 0b80f2665..91ff60166 100644
--- a/client/emv/emv_pki.h
+++ b/client/emv/emv_pki.h
@@ -28,10 +28,10 @@ struct emv_pk *emv_pki_recover_issuer_cert(const struct emv_pk *pk, struct tlvdb
 struct emv_pk *emv_pki_recover_icc_cert(const struct emv_pk *pk, struct tlvdb *db, const struct tlv *sda_tlv);
 struct emv_pk *emv_pki_recover_icc_pe_cert(const struct emv_pk *pk, struct tlvdb *db);
 
-struct tlvdb *emv_pki_recover_dac(const struct emv_pk *pk, const struct tlvdb *db, const struct tlv *sda_tlv);
-struct tlvdb *emv_pki_recover_dac_ex(const struct emv_pk *pk, const struct tlvdb *db, const struct tlv *sda_tlv, bool showData);
-struct tlvdb *emv_pki_recover_idn(const struct emv_pk *pk, const struct tlvdb *db, const struct tlv *dyn_tlv);
-struct tlvdb *emv_pki_recover_idn_ex(const struct emv_pk *pk, const struct tlvdb *db, const struct tlv *dyn_tlv, bool showData);
+struct tlvdb *emv_pki_recover_dac(const struct emv_pk *enc_pk, const struct tlvdb *db, const struct tlv *sda_tlv);
+struct tlvdb *emv_pki_recover_dac_ex(const struct emv_pk *enc_pk, const struct tlvdb *db, const struct tlv *sda_tlv, bool showData);
+struct tlvdb *emv_pki_recover_idn(const struct emv_pk *enc_pk, const struct tlvdb *db, const struct tlv *dyn_tlv);
+struct tlvdb *emv_pki_recover_idn_ex(const struct emv_pk *enc_pk, const struct tlvdb *db, const struct tlv *dyn_tlv, bool showData);
 struct tlvdb *emv_pki_recover_atc_ex(const struct emv_pk *enc_pk, const struct tlvdb *db, bool showData);
 struct tlvdb *emv_pki_perform_cda(const struct emv_pk *enc_pk, const struct tlvdb *db,
                                   const struct tlvdb *this_db,

From 7a24d7fdb6b8ff6f7059a4af17e56de005dc439e Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 7 Apr 2019 08:52:10 +0200
Subject: [PATCH 1027/1938] chg: 'lf indala demod' - texual

---
 client/cmdlfindala.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/client/cmdlfindala.c b/client/cmdlfindala.c
index b1d970575..985ae81d2 100644
--- a/client/cmdlfindala.c
+++ b/client/cmdlfindala.c
@@ -265,7 +265,9 @@ int CmdIndalaDemod(const char *Cmd) {
         uid5 = bytebits_to_byte(DemodBuffer + 128, 32);
         uid6 = bytebits_to_byte(DemodBuffer + 160, 32);
         uid7 = bytebits_to_byte(DemodBuffer + 192, 32);
-        PrintAndLogEx(SUCCESS, "Indala Found - bitlength %d, UID = 0x%x%08x%08x%08x%08x%08x%08x"
+        PrintAndLogEx(
+            SUCCESS
+            , "Indala Found - bitlength %d, Raw 0x%x%08x%08x%08x%08x%08x%08x"
                       , DemodBufferLen
                       , uid1
                       , uid2
@@ -558,7 +560,7 @@ int CmdIndalaClone(const char *Cmd) {
     UsbCommand c = {0, {0, 0, 0}};
 
     if (isLongUid) {
-        PrintAndLogEx(INFO, "Preparing to clone Indala 224bit tag with UID %s", sprint_hex(data, datalen));
+        PrintAndLogEx(INFO, "Preparing to clone Indala 224bit tag with RawID %s", sprint_hex(data, datalen));
         c.cmd = CMD_INDALA_CLONE_TAG_L;
         c.d.asDwords[0] = bytes_to_num(data, 4);
         c.d.asDwords[1] = bytes_to_num(data +  4, 4);
@@ -568,7 +570,7 @@ int CmdIndalaClone(const char *Cmd) {
         c.d.asDwords[5] = bytes_to_num(data + 20, 4);
         c.d.asDwords[6] = bytes_to_num(data + 24, 4);
     } else {
-        PrintAndLogEx(INFO, "Preparing to clone Indala 64bit tag with UID %s", sprint_hex(data, datalen));
+        PrintAndLogEx(INFO, "Preparing to clone Indala 64bit tag with RawID %s", sprint_hex(data, datalen));
         c.cmd = CMD_INDALA_CLONE_TAG;
         c.d.asDwords[0] = bytes_to_num(data, 4);
         c.d.asDwords[1] = bytes_to_num(data + 4, 4);

From aea6c6d3c5797afda00dec5b596eb6c777138d7b Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 7 Apr 2019 10:17:43 +0200
Subject: [PATCH 1028/1938] fixes, shadow

---
 armsrc/Standalone/hf_bog.c | 12 ++++++------
 armsrc/Standalone/hf_bog.h |  4 ----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/armsrc/Standalone/hf_bog.c b/armsrc/Standalone/hf_bog.c
index 40f3abba9..36e600392 100644
--- a/armsrc/Standalone/hf_bog.c
+++ b/armsrc/Standalone/hf_bog.c
@@ -85,7 +85,7 @@ void RAMFUNC SniffAndStore(uint8_t param) {
     uint8_t *data = dmaBuf;
 
     uint8_t previous_data = 0;
-    int dataLen = 0;
+    int dataLen;
     bool TagIsActive = false;
     bool ReaderIsActive = false;
 
@@ -110,7 +110,7 @@ void RAMFUNC SniffAndStore(uint8_t param) {
     // triggered == false -- to wait first for card
     bool triggered = !(param & 0x03);
 
-    uint32_t rsamples = 0;
+    uint32_t my_rsamples = 0;
 
     // Current captured passwords counter
     uint8_t auth_attempts = 0;
@@ -151,11 +151,11 @@ void RAMFUNC SniffAndStore(uint8_t param) {
         LED_A_OFF();
 
         // Need two samples to feed Miller and Manchester-Decoder
-        if (rsamples & 0x01) {
+        if (my_rsamples & 0x01) {
 
             if (!TagIsActive) { // no need to try decoding reader data if the tag is sending
                 uint8_t readerdata = (previous_data & 0xF0) | (*data >> 4);
-                if (MillerDecoding(readerdata, (rsamples - 1) * 4)) {
+                if (MillerDecoding(readerdata, (my_rsamples - 1) * 4)) {
                     LED_C_ON();
 
                     // check - if there is a short 7bit request from reader
@@ -190,7 +190,7 @@ void RAMFUNC SniffAndStore(uint8_t param) {
             // no need to try decoding tag data if the reader is sending - and we cannot afford the time
             if (!ReaderIsActive) {
                 uint8_t tagdata = (previous_data << 4) | (*data & 0x0F);
-                if (ManchesterDecoding(tagdata, 0, (rsamples - 1) * 4)) {
+                if (ManchesterDecoding(tagdata, 0, (my_rsamples - 1) * 4)) {
                     LED_B_ON();
 
                     if (!LogTrace(receivedResp,
@@ -214,7 +214,7 @@ void RAMFUNC SniffAndStore(uint8_t param) {
         }
 
         previous_data = *data;
-        rsamples++;
+        my_rsamples++;
         data++;
         if (data == dmaBuf + DMA_BUFFER_SIZE) {
             data = dmaBuf;
diff --git a/armsrc/Standalone/hf_bog.h b/armsrc/Standalone/hf_bog.h
index 8b7d4c695..3588ff610 100644
--- a/armsrc/Standalone/hf_bog.h
+++ b/armsrc/Standalone/hf_bog.h
@@ -6,10 +6,6 @@
 // StandAlone Mod
 //-----------------------------------------------------------------------------
 
-#ifndef FALSE
-#define FALSE 0
-#endif
-
 #ifndef __HF_BOG_H
 #define __HF_BOG_H
 

From da7dc2353c34251ba058d937b9fa52576933079c Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 7 Apr 2019 10:30:52 +0200
Subject: [PATCH 1029/1938] style and warnings

---
 armsrc/Standalone/hf_colin.c | 119 +++++++++++++++++++----------------
 1 file changed, 65 insertions(+), 54 deletions(-)

diff --git a/armsrc/Standalone/hf_colin.c b/armsrc/Standalone/hf_colin.c
index e6ac015fc..87f89883c 100644
--- a/armsrc/Standalone/hf_colin.c
+++ b/armsrc/Standalone/hf_colin.c
@@ -76,12 +76,14 @@ void cjSetCursLeft() {
 
 void cjTabulize() { DbprintfEx(FLAG_RAWPRINT, "\t\t\t"); }
 
+/*
 void cjPrintKey(uint64_t key, uint8_t *foundKey, uint16_t sectorNo, uint8_t type) {
     char tosendkey[13];
     sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[0], foundKey[1], foundKey[2], foundKey[3], foundKey[4], foundKey[5]);
     cjSetCursRight();
     DbprintfEx(FLAG_NOLOG, "SEC: %02x | KEY : %s | TYP: %d", sectorNo, tosendkey, type);
 }
+*/
 
 void ReadLastTagFromFlash() {
     SpinOff(0);
@@ -89,7 +91,6 @@ void ReadLastTagFromFlash() {
     LED_B_ON();
     LED_C_ON();
     LED_D_ON();
-    uint16_t isok = 0;
     uint32_t startidx = 0;
     uint16_t len = 1024;
 
@@ -109,7 +110,7 @@ void ReadLastTagFromFlash() {
 
     for (size_t i = 0; i < len; i += size) {
         len = MIN((len - i), size);
-        isok = Flash_ReadDataCont(startidx + i, mem, len);
+        uint16_t isok = Flash_ReadDataCont(startidx + i, mem, len);
         if (isok == len) {
             emlSetMem(mem, 0, 64);
         } else {
@@ -137,8 +138,6 @@ void WriteTagToFlash(uint8_t index, size_t size) {
     LED_C_ON();
     LED_D_ON();
 
-    uint8_t isok = 0;
-    uint16_t res = 0;
     uint32_t len = size;
     uint32_t bytes_sent = 0;
     uint32_t bytes_remaining = len;
@@ -168,10 +167,10 @@ void WriteTagToFlash(uint8_t index, size_t size) {
         memcpy(buff, data + bytes_sent, bytes_in_packet);
 
         bytes_remaining -= bytes_in_packet;
-        res = Flash_WriteDataCont(bytes_sent + (index * size), buff, bytes_in_packet);
+        uint16_t res = Flash_WriteDataCont(bytes_sent + (index * size), buff, bytes_in_packet);
         bytes_sent += bytes_in_packet;
 
-        isok = (res == bytes_in_packet) ? 1 : 0;
+        uint8_t isok = (res == bytes_in_packet) ? 1 : 0;
 
         if (!isok) {
             DbprintfEx(FLAG_NOLOG, "FlashMem write FAILEd [offset %u]", bytes_sent);
@@ -305,14 +304,14 @@ void RunMod() {
     //   and why not a simple memset abuse to 0xffize the whole space in one go ?
     // uint8_t foundKey[2][40][6]; //= [ {0xff} ]; /* C99 abusal 6.7.8.21
     uint8_t foundKey[2][40][6];
-    for (uint16_t t = 0; t < 2; t++) {
+    for (uint16_t i = 0; i < 2; i++) {
         for (uint16_t sectorNo = 0; sectorNo < sectorsCnt; sectorNo++) {
-            foundKey[t][sectorNo][0] = 0xFF;
-            foundKey[t][sectorNo][1] = 0xFF;
-            foundKey[t][sectorNo][2] = 0xFF;
-            foundKey[t][sectorNo][3] = 0xFF;
-            foundKey[t][sectorNo][4] = 0xFF;
-            foundKey[t][sectorNo][5] = 0xFF;
+            foundKey[i][sectorNo][0] = 0xFF;
+            foundKey[i][sectorNo][1] = 0xFF;
+            foundKey[i][sectorNo][2] = 0xFF;
+            foundKey[i][sectorNo][3] = 0xFF;
+            foundKey[i][sectorNo][4] = 0xFF;
+            foundKey[i][sectorNo][5] = 0xFF;
         }
     }
 
@@ -465,12 +464,12 @@ failtag:
                         ;
                         // Type 0 / A first
                         uint16_t t = 0;
-                        for (uint16_t sectorNo = 0; sectorNo < sectorsCnt; sectorNo++) {
-                            num_to_bytes(0x484558414354, 6, foundKey[t][sectorNo]);
-                            sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
-                                    foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
+                        for (uint16_t s = 0; s < sectorsCnt; s++) {
+                            num_to_bytes(0x484558414354, 6, foundKey[t][s]);
+                            sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][s][0], foundKey[t][s][1], foundKey[t][s][2],
+                                    foundKey[t][s][3], foundKey[t][s][4], foundKey[t][s][5]);
                             cjSetCursRight();
-                            DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
+                            DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", s, tosendkey, t);
                         }
                         t = 1;
                         uint16_t sectorNo = 0;
@@ -611,14 +610,19 @@ failtag:
 
                         // emlClearMem();
                         // A very weak one...
-                        for (uint16_t t = 0; t < 2; t++) {
-                            for (uint16_t sectorNo = 0; sectorNo < sectorsCnt; sectorNo++) {
-                                num_to_bytes(key64, 6, foundKey[t][sectorNo]);
-                                sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
-                                        foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
+                        for (uint16_t i = 0; i < 2; i++) {
+                            for (uint16_t s = 0; s < sectorsCnt; s++) {
+                                num_to_bytes(key64, 6, foundKey[i][s]);
+                                sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x",
+                                    foundKey[i][s][0],
+                                    foundKey[i][s][1],
+                                    foundKey[i][s][2],
+                                    foundKey[i][s][3],
+                                    foundKey[i][s][4],
+                                    foundKey[i][s][5]
+                                    );
                                 cjSetCursRight();
-
-                                DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
+                                DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", s, tosendkey, i);
                             }
                         }
                         trapped = 1;
@@ -644,25 +648,33 @@ failtag:
                         cjSetCursLeft();
 
                         DbprintfEx(FLAG_NOLOG, "%s>>>>>>>>>>>>!*DONE*!<<<<<<<<<<<<<<%s", _GREEN_, _WHITE_);
-                        ;
+
                         t = 0;
-                        for (uint16_t sectorNo = 0; sectorNo < sectorsCnt; sectorNo++) {
-                            num_to_bytes(0x414c41524f4e, 6, foundKey[t][sectorNo]);
-                            sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
-                                    foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
+                        for (uint16_t s = 0; s < sectorsCnt; s++) {
+                            num_to_bytes(0x414c41524f4e, 6, foundKey[t][s]);
+                            sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x",
+                                foundKey[t][s][0],
+                                foundKey[t][s][1], 
+                                foundKey[t][s][2],
+                                foundKey[t][s][3],
+                                foundKey[t][s][4],
+                                foundKey[t][s][5]);
                             cjSetCursRight();
-
-                            DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
-                            ;
+                            DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", s, tosendkey, t);
                         }
+                        
                         t = 1;
-                        for (uint16_t sectorNo = 0; sectorNo < sectorsCnt; sectorNo++) {
-                            num_to_bytes(0x424c41524f4e, 6, foundKey[t][sectorNo]);
-                            sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
-                                    foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
+                        for (uint16_t s = 0; s < sectorsCnt; s++) {
+                            num_to_bytes(0x424c41524f4e, 6, foundKey[t][s]);
+                            sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x",
+                                foundKey[t][s][0],
+                                foundKey[t][s][1],
+                                foundKey[t][s][2],
+                                foundKey[t][s][3],
+                                foundKey[t][s][4],
+                                foundKey[t][s][5]);
                             cjSetCursRight();
-
-                            DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
+                            DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", s, tosendkey, t);
                         }
                         trapped = 1;
                         break;
@@ -801,7 +813,6 @@ void e_MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *dat
 
     uint8_t numSectors = arg0;
     uint8_t keyType = arg1;
-    uint64_t ui64Key = 0;
 
     struct Crypto1State mpcs = {0, 0};
     struct Crypto1State *pcs;
@@ -823,40 +834,40 @@ void e_MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *dat
             DbprintfEx(FLAG_RAWPRINT, "Can't select card");
     }
 
-    for (uint8_t sectorNo = 0; isOK && sectorNo < numSectors; sectorNo++) {
-        ui64Key = emlGetKey(sectorNo, keyType);
-        if (sectorNo == 0) {
-            if (isOK && mifare_classic_auth(pcs, cjcuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_FIRST)) {
+    for (uint8_t s = 0; isOK && s < numSectors; s++) {
+        uint64_t ui64Key = emlGetKey(s, keyType);
+        if (s == 0) {
+            if (isOK && mifare_classic_auth(pcs, cjcuid, FirstBlockOfSector(s), keyType, ui64Key, AUTH_FIRST)) {
                 isOK = false;
                 if (MF_DBGLEVEL >= 1)
-                    DbprintfEx(FLAG_NOLOG, "Sector[%2d]. Auth error", sectorNo);
+                    DbprintfEx(FLAG_NOLOG, "Sector[%2d]. Auth error", s);
                 break;
             }
         } else {
-            if (isOK && mifare_classic_auth(pcs, cjcuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_NESTED)) {
+            if (isOK && mifare_classic_auth(pcs, cjcuid, FirstBlockOfSector(s), keyType, ui64Key, AUTH_NESTED)) {
                 isOK = false;
                 if (MF_DBGLEVEL >= 1)
-                    DbprintfEx(FLAG_NOLOG, "Sector[%2d]. Auth nested error", sectorNo);
+                    DbprintfEx(FLAG_NOLOG, "Sector[%2d]. Auth nested error", s);
                 break;
             }
         }
 
-        for (uint8_t blockNo = 0; isOK && blockNo < NumBlocksPerSector(sectorNo); blockNo++) {
-            if (isOK && mifare_classic_readblock(pcs, cjcuid, FirstBlockOfSector(sectorNo) + blockNo, dataoutbuf)) {
+        for (uint8_t blockNo = 0; isOK && blockNo < NumBlocksPerSector(s); blockNo++) {
+            if (isOK && mifare_classic_readblock(pcs, cjcuid, FirstBlockOfSector(s) + blockNo, dataoutbuf)) {
                 isOK = false;
                 if (MF_DBGLEVEL >= 1)
-                    DbprintfEx(FLAG_NOLOG, "Error reading sector %2d block %2d", sectorNo, blockNo);
+                    DbprintfEx(FLAG_NOLOG, "Error reading sector %2d block %2d", s, blockNo);
                 break;
             };
             if (isOK) {
                 *datain = 1;
-                if (blockNo < NumBlocksPerSector(sectorNo) - 1) {
-                    emlSetMem(dataoutbuf, FirstBlockOfSector(sectorNo) + blockNo, 1);
+                if (blockNo < NumBlocksPerSector(s) - 1) {
+                    emlSetMem(dataoutbuf, FirstBlockOfSector(s) + blockNo, 1);
                 } else {
                     // sector trailer, keep the keys, set only the AC
-                    emlGetMem(dataoutbuf2, FirstBlockOfSector(sectorNo) + blockNo, 1);
+                    emlGetMem(dataoutbuf2, FirstBlockOfSector(s) + blockNo, 1);
                     memcpy(&dataoutbuf2[6], &dataoutbuf[6], 4);
-                    emlSetMem(dataoutbuf2, FirstBlockOfSector(sectorNo) + blockNo, 1);
+                    emlSetMem(dataoutbuf2, FirstBlockOfSector(s) + blockNo, 1);
                 }
             } else {
                 *datain = 0;

From db78d26b9f13dccd7cb1995fb64b0b8438b80e29 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 7 Apr 2019 10:33:34 +0200
Subject: [PATCH 1030/1938] styles

---
 armsrc/Standalone/hf_mattyrun.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/armsrc/Standalone/hf_mattyrun.c b/armsrc/Standalone/hf_mattyrun.c
index 31243739b..1f2fb6f11 100644
--- a/armsrc/Standalone/hf_mattyrun.c
+++ b/armsrc/Standalone/hf_mattyrun.c
@@ -295,17 +295,15 @@ void RunMod() {
     /*
         Iterates through each sector checking if there is a correct key.
     */
-    int key = -1;
-    int block = 0;
     bool err = 0;
     bool allKeysFound = true;
     uint32_t size = mfKeysCnt;
 
     for (int type = !keyType; type < 2 && !err; keyType == 2 ? (type++) : (type = 2)) {
-        block = blockNo;
+        int block = blockNo;
         for (int sec = 0; sec < sectorsCnt && !err; ++sec) {
             Dbprintf("\tCurrent sector:%3d, block:%3d, key type: %c, key count: %i ", sec, block, type ? 'B' : 'A', mfKeysCnt);
-            key = saMifareChkKeys(block, type, true, size, &keyBlock[0], &key64);
+            int key = saMifareChkKeys(block, type, true, size, &keyBlock[0], &key64);
             if (key == -1) {
                 LED(LED_RED, 50); //red
                 Dbprintf("\t✕ Key not found for this sector!");
@@ -393,12 +391,12 @@ void RunMod() {
                     Needs further testing.
                 */
                 if (fillFromEmulator) {
-                    uint8_t retry = 5, cnt;
+                    uint8_t retry = 5;
                     Dbprintf("\t Trying to dump into blank card.");
                     int flags = 0;
                     LED_A_ON(); //yellow
                     for (int blockNum = 0; blockNum < 16 * 4; blockNum += 1) {
-                        cnt = 0;
+                        uint8_t cnt = 0;
                         emlGetMem(mblock, blockNum, 1);
                         // switch on field and send magic sequence
                         if (blockNum == 0) flags = 0x08 + 0x02;

From 8e6920cd95de32144c323fd0eeaaa4c609d9679f Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 7 Apr 2019 10:40:59 +0200
Subject: [PATCH 1031/1938] fix styles and warnings

---
 armsrc/iclass.c | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/armsrc/iclass.c b/armsrc/iclass.c
index 658962a3c..fd07a5916 100644
--- a/armsrc/iclass.c
+++ b/armsrc/iclass.c
@@ -855,7 +855,7 @@ void RAMFUNC SniffIClass(void) {
 
     //int datalen = 0;
     uint32_t previous_data = 0;
-    uint32_t time_0 = 0, time_start = 0, time_stop  = 0;
+    uint32_t time_0 = 0, time_start = 0, time_stop;
     uint32_t sniffCounter = 0;
     bool TagIsActive = false;
     bool ReaderIsActive = false;
@@ -1395,7 +1395,7 @@ int doIClassSimulation(int simulationMode, uint8_t *reader_mac_buf) {
     // To control where we are in the protocol
     uint32_t time_0 = GetCountSspClk();
     uint32_t t2r_stime = 0, t2r_etime = 0;
-    uint32_t r2t_stime = 0, r2t_etime = 0;
+    uint32_t r2t_stime, r2t_etime = 0;
 
     LED_A_ON();
     bool buttonPressed = false;
@@ -1626,7 +1626,7 @@ send:
  */
 static int SendIClassAnswer(uint8_t *resp, int respLen, uint16_t delay) {
     int i = 0;
-    volatile uint8_t b = 0;
+    volatile uint8_t b;
 
     FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_SIMULATOR | FPGA_HF_SIMULATOR_MODULATE_424K_8BIT);
 
@@ -1720,7 +1720,6 @@ static void TransmitIClassCommand(const uint8_t *cmd, int len, int *samples, int
 //-----------------------------------------------------------------------------
 void CodeIClassCommand(const uint8_t *cmd, int len) {
     int i, j, k;
-    uint8_t b;
 
     ToSendReset();
 
@@ -1732,7 +1731,7 @@ void CodeIClassCommand(const uint8_t *cmd, int len) {
 
     // Modulate the bytes
     for (i = 0; i < len; i++) {
-        b = cmd[i];
+        uint8_t b = cmd[i];
         for (j = 0; j < 4; j++) {
             for (k = 0; k < 4; k++) {
 
@@ -1875,14 +1874,13 @@ void setupIclassReader() {
 }
 
 bool sendCmdGetResponseWithRetries(uint8_t *command, size_t cmdsize, uint8_t *resp, uint8_t expected_size, uint8_t retries) {
-    uint8_t got_n = 0;
     while (retries-- > 0) {
 
         ReaderTransmitIClass(command, cmdsize);
 
         //iceman - if received size is bigger than expected, we smash the stack here
         // since its called with fixed sized arrays
-        got_n = ReaderReceiveIClass(resp);
+        uint8_t got_n = ReaderReceiveIClass(resp);
 
         // 0xBB is the internal debug separator byte..
         if (expected_size != got_n || (resp[0] == 0xBB || resp[7] == 0xBB || resp[2] == 0xBB)) {
@@ -1983,9 +1981,7 @@ void ReaderIClass(uint8_t arg0) {
     //Read App Issuer Area block CRC(0x05) => 0xde  0x64
     uint8_t readAA[] = { ICLASS_CMD_READ_OR_IDENTIFY, 0x05, 0xde, 0x64};
 
-    int read_status = 0;
     uint16_t tryCnt = 0;
-    uint8_t result_status = 0;
 
     bool abort_after_read = arg0 & FLAG_ICLASS_READER_ONLY_ONCE;  // flag to read until one tag is found successfully
     bool try_once = arg0 & FLAG_ICLASS_READER_ONE_TRY;            // flag to not to loop continuously, looking for tag
@@ -2008,9 +2004,9 @@ void ReaderIClass(uint8_t arg0) {
         }
 
         tryCnt++;
-        result_status = 0;
+        uint8_t result_status = 0;
 
-        read_status = handshakeIclassTag_ext(card_data, use_credit_key);
+        int read_status = handshakeIclassTag_ext(card_data, use_credit_key);
 
         if (read_status == 0) continue;
         if (read_status == 1) result_status = FLAG_ICLASS_READER_CSN;

From 3ab9dbe4c667167073dfb5035bd9e7f790acf4ac Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 7 Apr 2019 10:52:52 +0200
Subject: [PATCH 1032/1938] fix styles

---
 armsrc/flashmem.c |  2 ++
 armsrc/flashmem.h | 10 ----------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/armsrc/flashmem.c b/armsrc/flashmem.c
index 56b564b1d..d2010fe6d 100644
--- a/armsrc/flashmem.c
+++ b/armsrc/flashmem.c
@@ -504,10 +504,12 @@ bool Flash_Erase64k(uint8_t block) {
     return true;
 }
 
+/*
 // Erase chip
 void Flash_EraseChip(void) {
     FlashSendLastByte(CHIPERASE);
 }
+*/
 
 void Flashmem_print_status(void) {
     DbpString("Flash memory");
diff --git a/armsrc/flashmem.h b/armsrc/flashmem.h
index 012d6ae7f..d899a4d31 100644
--- a/armsrc/flashmem.h
+++ b/armsrc/flashmem.h
@@ -101,9 +101,6 @@
 #define MAX_BLOCKS      4
 #define MAX_SECTORS     16
 
-
-
-
 #define MCK 48000000
 //#define FLASH_BAUD 24000000
 #define FLASH_MINFAST 24000000 //33000000
@@ -113,7 +110,6 @@
 
 #define FASTFLASH (FLASHMEM_SPIBAUDRATE > FLASH_MINFAST)
 
-
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~//
 void Dbprintf(const char *fmt, ...);
 
@@ -129,7 +125,6 @@ void Flash_TransferAdresse(uint32_t address);
 
 bool Flash_CheckBusy(uint32_t timeout);
 
-
 void Flash_WriteEnable();
 bool Flash_WipeMemoryPage(uint8_t page);
 bool Flash_WipeMemory();
@@ -137,18 +132,13 @@ bool Flash_Erase4k(uint8_t block, uint8_t sector);
 //bool Flash_Erase32k(uint32_t address);
 bool Flash_Erase64k(uint8_t block);
 
-
 void Flash_UniqueID(uint8_t *uid);
 uint8_t Flash_ReadID(void);
 uint16_t Flash_ReadData(uint32_t address, uint8_t *out, uint16_t len);
-
 uint16_t Flash_ReadDataCont(uint32_t address, uint8_t *out, uint16_t len);
-
 uint16_t Flash_Write(uint32_t address, uint8_t *in, uint16_t len);
 uint16_t Flash_WriteData(uint32_t address, uint8_t *in, uint16_t len);
 uint16_t Flash_WriteDataCont(uint32_t address, uint8_t *in, uint16_t len);
 void Flashmem_print_status(void);
 
-
-
 #endif

From 593202867a8c309aee76549bbbbe9b7257cf06f8 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 7 Apr 2019 10:56:35 +0200
Subject: [PATCH 1033/1938] remove include

---
 armsrc/mifareutil.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/armsrc/mifareutil.h b/armsrc/mifareutil.h
index a25c64fa4..d0fb5c37f 100644
--- a/armsrc/mifareutil.h
+++ b/armsrc/mifareutil.h
@@ -21,7 +21,6 @@
 #include "iso14443a.h"
 #include "crapto1/crapto1.h"
 #include "des.h"
-#include "random.h" // fast_prand, prand
 
 // mifare authentication
 #define CRYPT_NONE    0

From ff74d567419119f2dd05a1a6d538d2cc49f5f79d Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 7 Apr 2019 10:58:50 +0200
Subject: [PATCH 1034/1938] remove unused

---
 armsrc/Makefile |  3 +--
 common/random.c | 30 ------------------------------
 common/random.h | 21 ---------------------
 3 files changed, 1 insertion(+), 53 deletions(-)
 delete mode 100644 common/random.c
 delete mode 100644 common/random.h

diff --git a/armsrc/Makefile b/armsrc/Makefile
index ef6d8f675..5ec73b2b3 100644
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -67,7 +67,7 @@ SRC_CRAPTO1 = crypto1.c des.c aes.c desfire_key.c desfire_crypto.c mifaredesfire
 SRC_CRC = crc.c crc16.c crc32.c
 SRC_ICLASS = iclass.c optimized_cipher.c
 SRC_LEGIC = legicrf.c legicrfsim.c legic_prng.c
-SRC_BEE = bee.c
+#   SRC_BEE = bee.c
 
 # RDV40 related hardware support
 ifneq (,$(findstring WITH_FLASH,$(APP_CFLAGS)))
@@ -161,7 +161,6 @@ THUMBSRC = start.c \
 	string.c \
 	BigBuf.c \
 	ticks.c \
-	random.c \
 	hfsnoop.c
 
 
diff --git a/common/random.c b/common/random.c
deleted file mode 100644
index a6e714c4c..000000000
--- a/common/random.c
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "random.h"
-
-static uint32_t g_nextrandom;
-
-/* Generates a (non-cryptographically secure) 32-bit random number.
- *
- * We don't have an implementation of the "rand" function. Instead we use a
- * method of seeding with the time it took to call "autoseed" from first run.
- *
- * https://github.com/Proxmark/proxmark3/pull/209/commits/f9c1dcd9f6e68a8c07cffed697a9c4c8caed6015
- *
- * Iceman,  rand needs to be fast.
- * https://software.intel.com/en-us/articles/fast-random-number-generator-on-the-intel-pentiumr-4-processor/
- */
-
-inline void fast_prand() {
-    fast_prandEx(GetTickCount());
-}
-inline void fast_prandEx(uint32_t seed) {
-    g_nextrandom = seed;
-}
-
-uint32_t prand() {
-// g_nextrandom *= 6364136223846793005;
-// g_nextrandom += 1;
-//return (uint32_t)(g_nextrandom >> 32) % 0xffffffff;
-    g_nextrandom = (214013 * g_nextrandom + 2531011);
-    return (g_nextrandom >> 16) & 0xFFFF;
-}
-
diff --git a/common/random.h b/common/random.h
deleted file mode 100644
index 85c90dd38..000000000
--- a/common/random.h
+++ /dev/null
@@ -1,21 +0,0 @@
-//-----------------------------------------------------------------------------
-// Micolous Jan 2017
-// Iceman Jan 2017
-// This code is licensed to you under the terms of the GNU GPL, version 2 or,
-// at your option, any later version. See the LICENSE.txt file for the text of
-// the license.
-//-----------------------------------------------------------------------------
-// pseudo rng generator.  To be used when PM3 simulates Mifare tag.
-// i.e.  'hf mf sim'
-//       'hf 14a sim'
-//-----------------------------------------------------------------------------
-
-#ifndef __RANDOM_H
-#define __RANDOM_H
-
-#include "common.h"
-#include "ticks.h"
-void fast_prand();
-void fast_prandEx(uint32_t seed);
-uint32_t prand();
-#endif

From c9b3dd32d1ee75247181ad43537378aa2823dde0 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 7 Apr 2019 11:00:28 +0200
Subject: [PATCH 1035/1938] remove random

---
 armsrc/Standalone/hf_bog.h | 3 +--
 armsrc/iso14443a.h         | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/armsrc/Standalone/hf_bog.h b/armsrc/Standalone/hf_bog.h
index 3588ff610..3dd68b3e2 100644
--- a/armsrc/Standalone/hf_bog.h
+++ b/armsrc/Standalone/hf_bog.h
@@ -20,8 +20,7 @@
 #include <string.h>
 #include "apps.h"
 #include "printf.h"
-
 #include "parity.h"
-#include "random.h"
+
 
 #endif /* __HF_BOG_H */
diff --git a/armsrc/iso14443a.h b/armsrc/iso14443a.h
index 92638c10a..80cb6d105 100644
--- a/armsrc/iso14443a.h
+++ b/armsrc/iso14443a.h
@@ -27,7 +27,6 @@ extern "C" {
 #include "crapto1/crapto1.h"
 #include "mifareutil.h"
 #include "parity.h"
-#include "random.h"
 #include "mifare.h"  // structs
 
 // When the PM acts as tag and is receiving it takes

From 49a0fda10b7317bf2a5cc27be6629203a100b412 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 7 Apr 2019 11:36:24 +0200
Subject: [PATCH 1036/1938] styles

---
 armsrc/appmain.c | 26 +++++++++++---------------
 armsrc/apps.h    |  3 +--
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index c1967663e..56fecd948 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -78,10 +78,12 @@ void ToSendStuffBit(int b) {
     }
 }
 
+/* useful when debugging new protocol implementations like FeliCa
 void PrintToSendBuffer(void) {
     DbpString("Printing ToSendBuffer:");
     Dbhexdump(ToSendMax, ToSend, 0);
 }
+*/
 
 void print_result(char *name, uint8_t *buf, size_t len) {
 
@@ -159,18 +161,17 @@ void Dbprintf(const char *fmt, ...) {
 // prints HEX & ASCII
 void Dbhexdump(int len, uint8_t *d, bool bAsci) {
 #if DEBUG
-    int l = 0, i;
     char ascii[9];
 
     while (len > 0) {
 
-        l = (len > 8) ? 8 : len;
+        int l = (len > 8) ? 8 : len;
 
         memcpy(ascii, d, l);
         ascii[l] = 0;
 
         // filter safe ascii
-        for (i = 0; i < l; i++) {
+        for (int i = 0; i < l; i++) {
             if (ascii[i] < 32 || ascii[i] > 126) {
                 ascii[i] = '.';
             }
@@ -230,7 +231,7 @@ uint16_t AvgAdc(int ch) {
 void MeasureAntennaTuning(void) {
 
     uint8_t LF_Results[256];
-    uint32_t i, adcval = 0, peak = 0, peakv = 0, peakf = 0;
+    uint32_t i, peak = 0, peakv = 0, peakf = 0;
     uint32_t v_lf125 = 0, v_lf134 = 0, v_hf = 0; // in mV
 
     memset(LF_Results, 0, sizeof(LF_Results));
@@ -253,7 +254,7 @@ void MeasureAntennaTuning(void) {
         WDT_HIT();
         FpgaSendCommand(FPGA_CMD_SET_DIVISOR, i);
         SpinDelay(20);
-        adcval = ((MAX_ADC_LF_VOLTAGE * AvgAdc(ADC_CHAN_LF)) >> 10);
+        uint32_t adcval = ((MAX_ADC_LF_VOLTAGE * AvgAdc(ADC_CHAN_LF)) >> 10);
         if (i == 95)
             v_lf125 = adcval; // voltage at 125Khz
         if (i == 89)
@@ -1177,8 +1178,6 @@ void UsbPacketReceived(uint8_t *packet, int len) {
         case CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K: {
             LED_B_ON();
             uint8_t *mem = BigBuf_get_addr();
-            bool isok = false;
-            size_t len = 0;
             uint32_t startidx = c->arg[0];
             uint32_t numofbytes = c->arg[1];
             // arg0 = startindex
@@ -1187,8 +1186,8 @@ void UsbPacketReceived(uint8_t *packet, int len) {
             //Dbprintf("transfer to client parameters: %" PRIu32 " | %" PRIu32 " | %" PRIu32, startidx, numofbytes, c->arg[2]);
 
             for (size_t i = 0; i < numofbytes; i += USB_CMD_DATA_SIZE) {
-                len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);
-                isok = cmd_send(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K, i, len, BigBuf_get_traceLen(), mem + startidx + i, len);
+                size_t len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);
+                bool isok = cmd_send(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K, i, len, BigBuf_get_traceLen(), mem + startidx + i, len);
                 if (isok != 0)
                     Dbprintf("transfer to client failed ::  | bytes between %d - %d (%d)", i, i + len, len);
             }
@@ -1251,7 +1250,6 @@ void UsbPacketReceived(uint8_t *packet, int len) {
             break;
         case CMD_FLASHMEM_READ: {
             LED_B_ON();
-            uint16_t isok = 0;
             uint32_t startidx = c->arg[0];
             uint16_t len = c->arg[1];
 
@@ -1269,7 +1267,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
                 len = MIN((len - i), size);
 
                 Dbprintf("FlashMem reading  | %d | %d | %d |", startidx + i, i, len);
-                isok = Flash_ReadDataCont(startidx + i, mem, len);
+                uint16_t isok = Flash_ReadDataCont(startidx + i, mem, len);
                 if (isok == len) {
                     print_result("Chunk: ", mem, len);
                 } else {
@@ -1367,8 +1365,6 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 
             LED_B_ON();
             uint8_t *mem = BigBuf_malloc(USB_CMD_DATA_SIZE);
-            bool isok = false;
-            size_t len = 0;
             uint32_t startidx = c->arg[0];
             uint32_t numofbytes = c->arg[1];
             // arg0 = startindex
@@ -1380,9 +1376,9 @@ void UsbPacketReceived(uint8_t *packet, int len) {
             }
 
             for (size_t i = 0; i < numofbytes; i += USB_CMD_DATA_SIZE) {
-                len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);
+                size_t len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);
 
-                isok = Flash_ReadDataCont(startidx + i, mem, len);
+                bool isok = Flash_ReadDataCont(startidx + i, mem, len);
                 if (!isok)
                     Dbprintf("reading flash memory failed ::  | bytes between %d - %d", i, len);
 
diff --git a/armsrc/apps.h b/armsrc/apps.h
index 4e3e1219b..90c53f146 100644
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -58,7 +58,7 @@ void Dbhexdump(int len, uint8_t *d, bool bAsci);
 uint16_t AvgAdc(int ch);
 
 void print_result(char *name, uint8_t *buf, size_t len);
-void PrintToSendBuffer(void);
+//void PrintToSendBuffer(void);
 void ToSendStuffBit(int b);
 void ToSendReset(void);
 void ListenReaderField(int limit);
@@ -154,7 +154,6 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
 void MifareAcquireNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *datain);
 void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain);
 void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain);
-void Mifare1ksim(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain);
 void MifareSetDbgLvl(uint16_t arg0);
 void MifareEMemClr(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain);
 void MifareEMemSet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain);

From 4856252912e755478be22863ca5074a49b735e90 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 7 Apr 2019 11:39:49 +0200
Subject: [PATCH 1037/1938] styles

---
 armsrc/iso14443a.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 465b73678..7f9040c43 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -500,8 +500,7 @@ void RAMFUNC SniffIso14443a(uint8_t param) {
     uint8_t *data = dmaBuf;
 
     uint8_t previous_data = 0;
-    int maxDataLen = 0;
-    int dataLen = 0;
+    int maxDataLen = 0, dataLen;
     bool TagIsActive = false;
     bool ReaderIsActive = false;
 
@@ -1135,7 +1134,7 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
             uint8_t emdata[MAX_FRAME_SIZE];
             // first 12 blocks of emu are [getversion answer - check tearing - pack - 0x00 - signature]
             int start = (receivedCmd[1] + 12) * 4;
-            int len   = (receivedCmd[2] - receivedCmd[1] + 1) * 4;
+            len   = (receivedCmd[2] - receivedCmd[1] + 1) * 4;
             emlGetMemBt(emdata, start, len);
             AddCrc14A(emdata, len);
             EmSendCmd(emdata, len + 2);

From 1e35130fbea441b2a86d8b9db4550d67bf86e36a Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 7 Apr 2019 11:41:43 +0200
Subject: [PATCH 1038/1938] missing include

---
 armsrc/appmain.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 56fecd948..fd0d4cafc 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -23,6 +23,7 @@
 #include "lfsampling.h"
 #include "BigBuf.h"
 #include "mifareutil.h"
+#include "mifaresim.h"
 #include "hitag.h"
 
 #define DEBUG 1

From a78af2bb06319f91b9f9554ff58a20d92677d79d Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 7 Apr 2019 11:51:12 +0200
Subject: [PATCH 1039/1938] rename crc -> crc_ctx.  triggers overshadowing

---
 common/crc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/crc.h b/common/crc.h
index 449b51bf3..7ad2fdc69 100644
--- a/common/crc.h
+++ b/common/crc.h
@@ -12,7 +12,7 @@
 #include "common.h" //stdint, stddef, stdbool
 #include "util.h"   // reflect, bswap_16
 
-typedef struct crc {
+typedef struct crc_ctx {
     uint32_t state;
     int order;
     uint32_t polynom;

From 91897f1f2e7d85acdbf6cac5e1615438c998c3f2 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 7 Apr 2019 12:06:48 +0200
Subject: [PATCH 1040/1938] copy bytes

---
 armsrc/Standalone/hf_young.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/armsrc/Standalone/hf_young.c b/armsrc/Standalone/hf_young.c
index 866b13e0c..24e20dd7f 100644
--- a/armsrc/Standalone/hf_young.c
+++ b/armsrc/Standalone/hf_young.c
@@ -158,7 +158,7 @@ void RunMod() {
                             Bytes 5-7 are reserved SAK and ATQA for mifare classic
                     -Use mfCSetBlock(0, block0, oldUID, wantWipe, MAGIC_SINGLE) to write it
             */
-            uint8_t oldBlock0[16] = {0}, newBlock0[16], testBlock0[16] = {0};
+            uint8_t oldBlock0[16] = {0}, newBlock0[16] = {0}, testBlock0[16] = {0};
             // arg0 = Flags, arg1=blockNo
             MifareCGetBlock(params, 0, oldBlock0);
             if (oldBlock0[0] == 0 && oldBlock0[0] == oldBlock0[1]  && oldBlock0[1] == oldBlock0[2] && oldBlock0[2] == oldBlock0[3]) {
@@ -166,7 +166,7 @@ void RunMod() {
                 playing = 1;
             } else {
                 Dbprintf("UID from target tag: %02X%02X%02X%02X", oldBlock0[0], oldBlock0[1], oldBlock0[2], oldBlock0[3]);
-                memcpy(newBlock0, oldBlock0, 16);
+                memcpy(newBlock0 + 5, oldBlock0 + 5, 11);
 
                 // Copy uid for bank (2nd is for longer UIDs not supported if classic)
                 memcpy(newBlock0, uids[selected].uid, 4);

From c4920d7179999d17b4550cae77a1055377997538 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 7 Apr 2019 12:07:50 +0200
Subject: [PATCH 1041/1938] fix crc overshadowing

---
 armsrc/iso15693.c | 16 ++++++++--------
 client/cmdhf15.c  | 30 +++++++++++++++---------------
 common/crc16.c    |  2 +-
 common/crc16.h    |  2 +-
 4 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/armsrc/iso15693.c b/armsrc/iso15693.c
index 497a6aa90..4afb54c9f 100644
--- a/armsrc/iso15693.c
+++ b/armsrc/iso15693.c
@@ -81,9 +81,9 @@
 #define Logic1                Iso15693Logic1
 #define FrameEOF              Iso15693FrameEOF
 
-#define Crc(data, len)        crc(CRC_15693, (data), (len))
-#define CheckCrc(data, len)   check_crc(CRC_15693, (data), (len))
-#define AddCrc(data, len)     compute_crc(CRC_15693, (data), (len), (data)+(len), (data)+(len)+1)
+//#define Crc(data, len)        Crc(CRC_15693, (data), (len))
+#define CheckCrc15(data, len)   check_crc(CRC_15693, (data), (len))
+#define AddCrc15(data, len)     compute_crc(CRC_15693, (data), (len), (data)+(len), (data)+(len)+1)
 
 #define sprintUID(target,uid) Iso15693sprintUID((target), (uid))
 
@@ -629,7 +629,7 @@ static void BuildIdentifyRequest(uint8_t *cmdout) {
     // no mask
     cmd[2] = 0x00;
     // CRC
-    AddCrc(cmd, 3);
+    AddCrc15(cmd, 3);
     // coding as high speed (1 out of 4)
     CodeIso15693AsReader(cmd, CMD_ID_RESP);
     memcpy(cmdout, cmd, CMD_ID_RESP);
@@ -658,7 +658,7 @@ static void BuildReadBlockRequest(uint8_t **out, uint8_t *uid, uint8_t blockNumb
     // Block number to read
     cmd[10] = blockNumber;//0x00;
     // CRC
-    AddCrc(cmd, 11);
+    AddCrc15(cmd, 11);
     CodeIso15693AsReader(cmd, CMD_READ_RESP);
     memcpy(out, cmd, CMD_ID_RESP);
 }
@@ -685,7 +685,7 @@ static void BuildInventoryResponse(uint8_t *cmdout, uint8_t *uid) {
     cmd[8] = uid[1]; //0x05;
     cmd[9] = uid[0]; //0xe0;
     // CRC
-    AddCrc(cmd, 10);
+    AddCrc15(cmd, 10);
     CodeIso15693AsReader(cmd, CMD_INV_RESP);
     memcpy(cmdout, cmd, CMD_INV_RESP);
 }
@@ -932,7 +932,7 @@ void BruteforceIso15693Afi(uint32_t speed) {
     data[0] = ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | ISO15_REQ_INVENTORY | ISO15_REQINV_SLOT1;
     data[1] = ISO15_CMD_INVENTORY;
     data[2] = 0; // mask length
-    AddCrc(data, 3);
+    AddCrc15(data, 3);
     datalen += 2;
 
     recvlen = SendDataTag(data, datalen, false, speed, buf);
@@ -951,7 +951,7 @@ void BruteforceIso15693Afi(uint32_t speed) {
 
     for (uint16_t i = 0; i < 256; i++) {
         data[2] = i & 0xFF;
-        AddCrc(data, 4);
+        AddCrc15(data, 4);
         datalen += 2;
         recvlen = SendDataTag(data, datalen, false, speed, buf);
         WDT_HIT();
diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index 31d266d6d..670c649ff 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -29,9 +29,9 @@
 #define Logic1                  Iso15693Logic1
 #define FrameEOF                Iso15693FrameEOF
 
-#define Crc(data, len)          crc(CRC_15693, (data), (len))
-#define CheckCrc(data, len)     check_crc(CRC_15693, (data), (len))
-#define AddCrc(data, len)       compute_crc(CRC_15693, (data), (len), (data)+(len), (data)+(len)+1)
+#define Crc15(data, len)          Crc(CRC_15693, (data), (len))
+#define CheckCrc15(data, len)     check_crc(CRC_15693, (data), (len))
+#define AddCrc15(data, len)       compute_crc(CRC_15693, (data), (len), (data)+(len), (data)+(len)+1)
 
 #define sprintUID(target, uid)  Iso15693sprintUID((target), (uid))
 
@@ -198,7 +198,7 @@ int getUID(uint8_t *buf) {
     c.d.asBytes[1] = ISO15_CMD_INVENTORY;
     c.d.asBytes[2] = 0; // mask length
 
-    AddCrc(c.d.asBytes, 3);
+    AddCrc15(c.d.asBytes, 3);
     c.arg[0] = 5; // len
 
     uint8_t retry;
@@ -212,7 +212,7 @@ int getUID(uint8_t *buf) {
         if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
 
             uint8_t resplen = resp.arg[0];
-            if (resplen >= 12 && CheckCrc(resp.d.asBytes, 12)) {
+            if (resplen >= 12 && CheckCrc15(resp.d.asBytes, 12)) {
                 memcpy(buf, resp.d.asBytes + 2, 8);
                 return 1;
             }
@@ -519,7 +519,7 @@ int CmdHF15Info(const char *Cmd) {
     if (!prepareHF15Cmd(&cmd, &c, ISO15_CMD_SYSINFO))
         return 0;
 
-    AddCrc(req,  c.arg[0]);
+    AddCrc15(req,  c.arg[0]);
     c.arg[0] += 2;
 
     //PrintAndLogEx(NORMAL, "cmd %s", sprint_hex(c.d.asBytes, reqlen) );
@@ -721,7 +721,7 @@ int CmdHF15Dump(const char *Cmd) {
     for (int retry = 0; retry < 5; retry++) {
 
         req[10] = blocknum;
-        AddCrc(req, 11);
+        AddCrc15(req, 11);
         c.arg[0] = 13;
 
         clearCommandBuffer();
@@ -737,7 +737,7 @@ int CmdHF15Dump(const char *Cmd) {
 
             recv = resp.d.asBytes;
 
-            if (!CheckCrc(recv, len)) {
+            if (!CheckCrc15(recv, len)) {
                 PrintAndLogEx(FAILED, "crc fail");
                 continue;
             }
@@ -958,7 +958,7 @@ int CmdHF15Raw(const char *Cmd) {
     }
 
     if (crc) {
-        AddCrc(data, datalen);
+        AddCrc15(data, datalen);
         datalen += 2;
     }
 
@@ -1099,7 +1099,7 @@ int CmdHF15Readmulti(const char *Cmd) {
 
     req[reqlen++] = pagenum;
     req[reqlen++] = pagecount;
-    AddCrc(req, reqlen);
+    AddCrc15(req, reqlen);
     c.arg[0] = reqlen + 2;
 
     clearCommandBuffer();
@@ -1118,7 +1118,7 @@ int CmdHF15Readmulti(const char *Cmd) {
 
     recv = resp.d.asBytes;
 
-    if (!CheckCrc(recv, status)) {
+    if (!CheckCrc15(recv, status)) {
         PrintAndLogEx(FAILED, "CRC failed");
         return 2;
     }
@@ -1178,7 +1178,7 @@ int CmdHF15Read(const char *Cmd) {
 
     req[reqlen++] = (uint8_t)blocknum;
 
-    AddCrc(req, reqlen);
+    AddCrc15(req, reqlen);
 
     c.arg[0] = reqlen + 2;
 
@@ -1198,7 +1198,7 @@ int CmdHF15Read(const char *Cmd) {
 
     recv = resp.d.asBytes;
 
-    if (!CheckCrc(recv, status)) {
+    if (!CheckCrc15(recv, status)) {
         PrintAndLogEx(NORMAL, "CRC failed");
         return 2;
     }
@@ -1261,7 +1261,7 @@ int CmdHF15Write(const char *Cmd) {
         req[reqlen++] = temp & 0xff;
         cmd2 += 2;
     }
-    AddCrc(req, reqlen);
+    AddCrc15(req, reqlen);
     c.arg[0] = reqlen + 2;
 
     PrintAndLogEx(NORMAL, "iso15693 writing to page %02d (0x%02X) | data ", pagenum, pagenum);
@@ -1282,7 +1282,7 @@ int CmdHF15Write(const char *Cmd) {
 
     recv = resp.d.asBytes;
 
-    if (!CheckCrc(recv, status)) {
+    if (!CheckCrc15(recv, status)) {
         PrintAndLogEx(FAILED, "CRC failed");
         return 2;
     }
diff --git a/common/crc16.c b/common/crc16.c
index 075b5d724..1396c0fe8 100644
--- a/common/crc16.c
+++ b/common/crc16.c
@@ -191,7 +191,7 @@ void compute_crc(CrcType_t ct, const uint8_t *d, size_t n, uint8_t *first, uint8
     *first = (crc & 0xFF);
     *second = ((crc >> 8) & 0xFF);
 }
-uint16_t crc(CrcType_t ct, const uint8_t *d, size_t n) {
+uint16_t Crc(CrcType_t ct, const uint8_t *d, size_t n) {
 
     // can't calc a crc on less than 3 byte. (1byte + 2 crc bytes)
     if (n < 3) return 0;
diff --git a/common/crc16.h b/common/crc16.h
index e59ed1832..843cc07e5 100644
--- a/common/crc16.h
+++ b/common/crc16.h
@@ -34,7 +34,7 @@ uint16_t update_crc16_ex(uint16_t crc, uint8_t c, uint16_t polynomial);
 uint16_t update_crc16(uint16_t crc, uint8_t c);
 uint16_t crc16(uint8_t const *d, size_t length, uint16_t remainder, uint16_t polynomial, bool refin, bool refout);
 
-uint16_t crc(CrcType_t ct, const uint8_t *d, size_t n);
+uint16_t Crc(CrcType_t ct, const uint8_t *d, size_t n);
 void compute_crc(CrcType_t ct, const uint8_t *d, size_t n, uint8_t *first, uint8_t *second);
 bool check_crc(CrcType_t ct, const uint8_t *d, size_t n);
 

From a8ad793f7f16ba928a5815639fc25e5127b44532 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 7 Apr 2019 12:10:04 +0200
Subject: [PATCH 1042/1938] more crc overshadow

---
 client/cmdanalyse.c | 2 +-
 client/cmdhf15.c    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/cmdanalyse.c b/client/cmdanalyse.c
index 5ca75b79f..3026e49d9 100644
--- a/client/cmdanalyse.c
+++ b/client/cmdanalyse.c
@@ -300,7 +300,7 @@ int CmdAnalyseCRC(const char *Cmd) {
     // ISO14443 crc B
     compute_crc(CRC_14443_B, data, len, &b1, &b2);
     uint16_t crcBB_1 = b1 << 8 | b2;
-    uint16_t bbb = crc(CRC_14443_B, data, len);
+    uint16_t bbb = Crc(CRC_14443_B, data, len);
     PrintAndLogEx(NORMAL, "ISO14443 crc B  | %04x == %04x \n", crcBB_1, bbb);
 
 
diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index 670c649ff..877469fd5 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -479,7 +479,7 @@ int CmdHF15Demod(const char *Cmd) {
     for (i = 0; i < k; i++)
         PrintAndLogEx(NORMAL, "# %2d: %02x ", i, outBuf[i]);
 
-    PrintAndLogEx(NORMAL, "CRC %04x", Crc(outBuf, k - 2));
+    PrintAndLogEx(NORMAL, "CRC %04x", Crc15(outBuf, k - 2));
     return 0;
 }
 

From a7448f802f62e6490c5e8df0566c179e2e0de3e1 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 7 Apr 2019 12:10:51 +0200
Subject: [PATCH 1043/1938] make style: don't indent preprocessor directives

---
 Makefile                     |  2 +-
 armsrc/Standalone/hf_colin.c | 40 ++++++++++++++++++------------------
 client/cmdlfindala.c         | 18 ++++++++--------
 common/crc.h                 | 18 ++++++++--------
 4 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/Makefile b/Makefile
index 77c205e68..512c9e2db 100644
--- a/Makefile
+++ b/Makefile
@@ -136,7 +136,7 @@ style:
 	    -exec sh -c "echo >> {}" \;
 	# Apply astyle on *.c, *.h, *.cpp
 	find . \( -name "*.[ch]" -or -name "*.cpp" \) -exec astyle --formatted --mode=c --suffix=none \
-	    --indent=spaces=4 --indent-switches --indent-preprocessor \
+	    --indent=spaces=4 --indent-switches \
 	    --keep-one-line-blocks --max-instatement-indent=60 \
 	    --style=google --pad-oper --unpad-paren --pad-header \
 	    --align-pointer=name {} \;
diff --git a/armsrc/Standalone/hf_colin.c b/armsrc/Standalone/hf_colin.c
index 87f89883c..d477fe560 100644
--- a/armsrc/Standalone/hf_colin.c
+++ b/armsrc/Standalone/hf_colin.c
@@ -614,13 +614,13 @@ failtag:
                             for (uint16_t s = 0; s < sectorsCnt; s++) {
                                 num_to_bytes(key64, 6, foundKey[i][s]);
                                 sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x",
-                                    foundKey[i][s][0],
-                                    foundKey[i][s][1],
-                                    foundKey[i][s][2],
-                                    foundKey[i][s][3],
-                                    foundKey[i][s][4],
-                                    foundKey[i][s][5]
-                                    );
+                                        foundKey[i][s][0],
+                                        foundKey[i][s][1],
+                                        foundKey[i][s][2],
+                                        foundKey[i][s][3],
+                                        foundKey[i][s][4],
+                                        foundKey[i][s][5]
+                                       );
                                 cjSetCursRight();
                                 DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", s, tosendkey, i);
                             }
@@ -653,26 +653,26 @@ failtag:
                         for (uint16_t s = 0; s < sectorsCnt; s++) {
                             num_to_bytes(0x414c41524f4e, 6, foundKey[t][s]);
                             sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x",
-                                foundKey[t][s][0],
-                                foundKey[t][s][1], 
-                                foundKey[t][s][2],
-                                foundKey[t][s][3],
-                                foundKey[t][s][4],
-                                foundKey[t][s][5]);
+                                    foundKey[t][s][0],
+                                    foundKey[t][s][1],
+                                    foundKey[t][s][2],
+                                    foundKey[t][s][3],
+                                    foundKey[t][s][4],
+                                    foundKey[t][s][5]);
                             cjSetCursRight();
                             DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", s, tosendkey, t);
                         }
-                        
+
                         t = 1;
                         for (uint16_t s = 0; s < sectorsCnt; s++) {
                             num_to_bytes(0x424c41524f4e, 6, foundKey[t][s]);
                             sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x",
-                                foundKey[t][s][0],
-                                foundKey[t][s][1],
-                                foundKey[t][s][2],
-                                foundKey[t][s][3],
-                                foundKey[t][s][4],
-                                foundKey[t][s][5]);
+                                    foundKey[t][s][0],
+                                    foundKey[t][s][1],
+                                    foundKey[t][s][2],
+                                    foundKey[t][s][3],
+                                    foundKey[t][s][4],
+                                    foundKey[t][s][5]);
                             cjSetCursRight();
                             DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", s, tosendkey, t);
                         }
diff --git a/client/cmdlfindala.c b/client/cmdlfindala.c
index 985ae81d2..b136d9434 100644
--- a/client/cmdlfindala.c
+++ b/client/cmdlfindala.c
@@ -268,15 +268,15 @@ int CmdIndalaDemod(const char *Cmd) {
         PrintAndLogEx(
             SUCCESS
             , "Indala Found - bitlength %d, Raw 0x%x%08x%08x%08x%08x%08x%08x"
-                      , DemodBufferLen
-                      , uid1
-                      , uid2
-                      , uid3
-                      , uid4
-                      , uid5
-                      , uid6
-                      , uid7
-                     );
+            , DemodBufferLen
+            , uid1
+            , uid2
+            , uid3
+            , uid4
+            , uid5
+            , uid6
+            , uid7
+        );
     }
 
     if (g_debugMode) {
diff --git a/common/crc.h b/common/crc.h
index 7ad2fdc69..7cb9caff9 100644
--- a/common/crc.h
+++ b/common/crc.h
@@ -64,14 +64,14 @@ uint32_t CRC8Legic(uint8_t *buff, size_t size);
 
 /* Static initialization of a crc structure */
 #define CRC_INITIALIZER(_order, _polynom, _initial_value, _final_xor) { \
-        .state = ((_initial_value) & ((1L<<(_order))-1)), \
-                 .order = (_order), \
-                          .polynom = (_polynom), \
-                                     .initial_value = (_initial_value), \
-                                                      .final_xor = (_final_xor), \
-                                                                   .mask = ((1L<<(_order))-1) \
-                                                                           .refin = false, \
-                                                                                   .refout = false \
-    }
+    .state = ((_initial_value) & ((1L<<(_order))-1)), \
+    .order = (_order), \
+    .polynom = (_polynom), \
+    .initial_value = (_initial_value), \
+    .final_xor = (_final_xor), \
+    .mask = ((1L<<(_order))-1) \
+    .refin = false, \
+    .refout = false \
+}
 
 #endif /* __CRC_H */

From 7eee2acfbf7317ac6adac2d319ecbe3a178af6e7 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 7 Apr 2019 12:10:52 +0200
Subject: [PATCH 1044/1938] more crc overshadow

---
 armsrc/iso15693.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/armsrc/iso15693.c b/armsrc/iso15693.c
index 4afb54c9f..998c43520 100644
--- a/armsrc/iso15693.c
+++ b/armsrc/iso15693.c
@@ -780,7 +780,7 @@ void DbdecodeIso15693Answer(int len, uint8_t *d) {
             strncat(status, "No error ", DBD15STATLEN - strlen(status));
         }
 
-        if (CheckCrc(d, len))
+        if (CheckCrc15(d, len))
             strncat(status, "[+] crc OK", DBD15STATLEN - strlen(status));
         else
             strncat(status, "[!] crc fail", DBD15STATLEN - strlen(status));

From 8003d95be945db6c4b97a33f0f10f8efc110ed24 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 7 Apr 2019 12:13:05 +0200
Subject: [PATCH 1045/1938] crc

---
 client/cmdanalyse.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/client/cmdanalyse.c b/client/cmdanalyse.c
index 3026e49d9..3bd3f08cb 100644
--- a/client/cmdanalyse.c
+++ b/client/cmdanalyse.c
@@ -321,40 +321,40 @@ int CmdAnalyseCRC(const char *Cmd) {
     PrintAndLogEx(NORMAL, "CRC16 based\n\n");
 
     // input from commandline
-    PrintAndLogEx(NORMAL, "CCITT  | %X (29B1 expected)", crc(CRC_CCITT, dataStr, sizeof(dataStr)));
+    PrintAndLogEx(NORMAL, "CCITT  | %X (29B1 expected)", Crc(CRC_CCITT, dataStr, sizeof(dataStr)));
 
     uint8_t poll[] = {0xb2, 0x4d, 0x12, 0x01, 0x01, 0x2e, 0x3d, 0x17, 0x26, 0x47, 0x80, 0x95, 0x00, 0xf1, 0x00, 0x00, 0x00, 0x01, 0x43, 0x00, 0xb3, 0x7f};
-    PrintAndLogEx(NORMAL, "FeliCa | %04X (B37F expected)", crc(CRC_FELICA, poll + 2, sizeof(poll) - 4));
-    PrintAndLogEx(NORMAL, "FeliCa | %04X (0000 expected)", crc(CRC_FELICA, poll + 2, sizeof(poll) - 2));
+    PrintAndLogEx(NORMAL, "FeliCa | %04X (B37F expected)", Crc(CRC_FELICA, poll + 2, sizeof(poll) - 4));
+    PrintAndLogEx(NORMAL, "FeliCa | %04X (0000 expected)", Crc(CRC_FELICA, poll + 2, sizeof(poll) - 2));
 
     uint8_t sel_corr[] = { 0x40, 0xe1, 0xe1, 0xff, 0xfe, 0x5f, 0x02, 0x3c, 0x43, 0x01};
-    PrintAndLogEx(NORMAL, "iCLASS | %04x (0143 expected)", crc(CRC_ICLASS, sel_corr, sizeof(sel_corr) - 2));
+    PrintAndLogEx(NORMAL, "iCLASS | %04x (0143 expected)", Crc(CRC_ICLASS, sel_corr, sizeof(sel_corr) - 2));
     PrintAndLogEx(NORMAL, "---------------------------------------------------------------\n\n\n");
 
     // ISO14443 crc A
     compute_crc(CRC_14443_A, dataStr, sizeof(dataStr), &b1, &b2);
     uint16_t crcAA = b1 << 8 | b2;
-    PrintAndLogEx(NORMAL, "ISO14443 crc A  | %04x or %04x (BF05 expected)\n", crcAA, crc(CRC_14443_A, dataStr, sizeof(dataStr)));
+    PrintAndLogEx(NORMAL, "ISO14443 crc A  | %04x or %04x (BF05 expected)\n", crcAA, Crc(CRC_14443_A, dataStr, sizeof(dataStr)));
 
     // ISO14443 crc B
     compute_crc(CRC_14443_B, dataStr, sizeof(dataStr), &b1, &b2);
     uint16_t crcBB = b1 << 8 | b2;
-    PrintAndLogEx(NORMAL, "ISO14443 crc B  | %04x or %04x (906E expected)\n", crcBB, crc(CRC_14443_B, dataStr, sizeof(dataStr)));
+    PrintAndLogEx(NORMAL, "ISO14443 crc B  | %04x or %04x (906E expected)\n", crcBB, Crc(CRC_14443_B, dataStr, sizeof(dataStr)));
 
     // ISO15693 crc  (x.25)
     compute_crc(CRC_15693, dataStr, sizeof(dataStr), &b1, &b2);
     uint16_t crcCC = b1 << 8 | b2;
-    PrintAndLogEx(NORMAL, "ISO15693 crc X25| %04x or %04x (906E expected)\n", crcCC, crc(CRC_15693, dataStr, sizeof(dataStr)));
+    PrintAndLogEx(NORMAL, "ISO15693 crc X25| %04x or %04x (906E expected)\n", crcCC, Crc(CRC_15693, dataStr, sizeof(dataStr)));
 
     // ICLASS
     compute_crc(CRC_ICLASS, dataStr, sizeof(dataStr), &b1, &b2);
     uint16_t crcDD = b1 << 8 | b2;
-    PrintAndLogEx(NORMAL, "ICLASS crc      | %04x or %04x\n", crcDD, crc(CRC_ICLASS, dataStr, sizeof(dataStr)));
+    PrintAndLogEx(NORMAL, "ICLASS crc      | %04x or %04x\n", crcDD, Crc(CRC_ICLASS, dataStr, sizeof(dataStr)));
 
     // FeliCa
     compute_crc(CRC_FELICA, dataStr, sizeof(dataStr), &b1, &b2);
     uint16_t crcEE = b1 << 8 | b2;
-    PrintAndLogEx(NORMAL, "FeliCa          | %04x or %04x (31C3 expected)\n", crcEE, crc(CRC_FELICA, dataStr, sizeof(dataStr)));
+    PrintAndLogEx(NORMAL, "FeliCa          | %04x or %04x (31C3 expected)\n", crcEE, Crc(CRC_FELICA, dataStr, sizeof(dataStr)));
 
     free(data);
     return 0;

From 12739719915b43f93a384001765e93687ba1b7a3 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 7 Apr 2019 12:14:16 +0200
Subject: [PATCH 1046/1938] more crc

---
 client/scripting.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/scripting.c b/client/scripting.c
index 4d8aa5fe8..9c84bbf93 100644
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -467,7 +467,7 @@ static int l_crc16(lua_State *L) {
     size_t size;
     const char *p_str = luaL_checklstring(L, 1, &size);
 
-    uint16_t checksum = crc(CRC_CCITT, (uint8_t *) p_str, size);
+    uint16_t checksum = Crc(CRC_CCITT, (uint8_t *) p_str, size);
     lua_pushunsigned(L, checksum);
     return 1;
 }

From 9c3a5203000aea659e8ef1ca2d1265a2559c8d0f Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 7 Apr 2019 12:18:15 +0200
Subject: [PATCH 1047/1938] iso14443a_select_card resp_data -> p_card

---
 armsrc/iso14443a.c | 32 ++++++++++++++++----------------
 armsrc/iso14443a.h |  2 +-
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 7f9040c43..881bfa0bd 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -2029,7 +2029,7 @@ static int GetATQA(uint8_t *resp, uint8_t *resp_par) {
 // if anticollision is false, then the UID must be provided in uid_ptr[]
 // and num_cascades must be set (1: 4 Byte UID, 2: 7 Byte UID, 3: 10 Byte UID)
 // requests ATS unless no_rats is true
-int iso14443a_select_card(uint8_t *uid_ptr, iso14a_card_select_t *resp_data, uint32_t *cuid_ptr, bool anticollision, uint8_t num_cascades, bool no_rats) {
+int iso14443a_select_card(uint8_t *uid_ptr, iso14a_card_select_t *p_card, uint32_t *cuid_ptr, bool anticollision, uint8_t num_cascades, bool no_rats) {
 
     uint8_t sel_all[]    = { ISO14443A_CMD_ANTICOLL_OR_SELECT, 0x20 };
     uint8_t sel_uid[]    = { ISO14443A_CMD_ANTICOLL_OR_SELECT, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
@@ -2043,19 +2043,19 @@ int iso14443a_select_card(uint8_t *uid_ptr, iso14a_card_select_t *resp_data, uin
     int cascade_level = 0;
     int len;
 
-    if (resp_data) {
-        resp_data->uidlen = 0;
-        memset(resp_data->uid, 0, 10);
-        resp_data->ats_len = 0;
+    if (p_card) {
+        p_card->uidlen = 0;
+        memset(p_card->uid, 0, 10);
+        p_card->ats_len = 0;
     }
 
     if (!GetATQA(resp, resp_par)) {
         return 0;
     }
 
-    if (resp_data) {
-        resp_data->atqa[0] = resp[0];
-        resp_data->atqa[1] = resp[1];
+    if (p_card) {
+        p_card->atqa[0] = resp[0];
+        p_card->atqa[1] = resp[1];
     }
 
     if (anticollision) {
@@ -2150,14 +2150,14 @@ int iso14443a_select_card(uint8_t *uid_ptr, iso14a_card_select_t *resp_data, uin
         if (uid_ptr && anticollision)
             memcpy(uid_ptr + (cascade_level * 3), uid_resp, uid_resp_len);
 
-        if (resp_data) {
-            memcpy(resp_data->uid + (cascade_level * 3), uid_resp, uid_resp_len);
-            resp_data->uidlen += uid_resp_len;
+        if (p_card) {
+            memcpy(p_card->uid + (cascade_level * 3), uid_resp, uid_resp_len);
+            p_card->uidlen += uid_resp_len;
         }
     }
 
-    if (resp_data) {
-        resp_data->sak = sak;
+    if (p_card) {
+        p_card->sak = sak;
     }
 
     // PICC compilant with iso14443a-4 ---> (SAK & 0x20 != 0)
@@ -2172,9 +2172,9 @@ int iso14443a_select_card(uint8_t *uid_ptr, iso14a_card_select_t *resp_data, uin
 
         if (!len) return 0;
 
-        if (resp_data) {
-            memcpy(resp_data->ats, resp, sizeof(resp_data->ats));
-            resp_data->ats_len = len;
+        if (p_card) {
+            memcpy(p_card->ats, resp, sizeof(p_card->ats));
+            p_card->ats_len = len;
         }
 
         // reset the PCB block number
diff --git a/armsrc/iso14443a.h b/armsrc/iso14443a.h
index 80cb6d105..1e4de4626 100644
--- a/armsrc/iso14443a.h
+++ b/armsrc/iso14443a.h
@@ -129,7 +129,7 @@ int ReaderReceive(uint8_t *receivedAnswer, uint8_t *par);
 
 void iso14443a_setup(uint8_t fpga_minor_mode);
 int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, bool send_chaining, void *data, uint8_t *res);
-int iso14443a_select_card(uint8_t *uid_ptr, iso14a_card_select_t *resp_data, uint32_t *cuid_ptr, bool anticollision, uint8_t num_cascades, bool no_rats);
+int iso14443a_select_card(uint8_t *uid_ptr, iso14a_card_select_t *p_card, uint32_t *cuid_ptr, bool anticollision, uint8_t num_cascades, bool no_rats);
 int iso14443a_fast_select_card(uint8_t *uid_ptr, uint8_t num_cascades);
 void iso14a_set_trigger(bool enable);
 

From ce5fcf1e2d89a276cd9109fdd786b7f1842a2cde Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 7 Apr 2019 12:20:17 +0200
Subject: [PATCH 1048/1938] simplify

---
 bootrom/bootrom.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bootrom/bootrom.c b/bootrom/bootrom.c
index 53a33f525..e5cb77ff7 100644
--- a/bootrom/bootrom.c
+++ b/bootrom/bootrom.c
@@ -311,10 +311,9 @@ void BootROM(void) {
 
         common_area.magic = COMMON_AREA_MAGIC;
         common_area.version = 1;
-        common_area.flags.bootrom_present = 1;
     }
-
     common_area.flags.bootrom_present = 1;
+
     if (common_area.command == COMMON_AREA_COMMAND_ENTER_FLASH_MODE) {
         common_area.command = COMMON_AREA_COMMAND_NONE;
         flash_mode(1);

From 7485c5ed2e2307a021dc250d191c886646b89d7c Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 7 Apr 2019 12:23:34 +0200
Subject: [PATCH 1049/1938] armsrc BitStream -> bits

---
 armsrc/apps.h  |  6 +++---
 armsrc/lfops.c | 20 ++++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/armsrc/apps.h b/armsrc/apps.h
index 90c53f146..f4df953e5 100644
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -85,9 +85,9 @@ void SimulateTagLowFrequency(int period, int gap, int ledcontrol);
 void SimulateTagLowFrequencyBidir(int divisor, int max_bitlen);
 void CmdHIDsimTAGEx(uint32_t hi, uint32_t lo, int ledcontrol, int numcycles);
 void CmdHIDsimTAG(uint32_t hi, uint32_t lo, int ledcontrol);
-void CmdFSKsimTAG(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream, int ledcontrol);
-void CmdASKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream, int ledcontrol);
-void CmdPSKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream, int ledcontrol);
+void CmdFSKsimTAG(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *bits, int ledcontrol);
+void CmdASKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *bits, int ledcontrol);
+void CmdPSKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *bits, int ledcontrol);
 void CmdHIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol);
 void CmdAWIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol); // Realtime demodulation mode for AWID26
 void CmdEM410xdemod(int findone, uint32_t *high, uint64_t *low, int ledcontrol);
diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index d5a1d21c6..4b15c7320 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -824,7 +824,7 @@ void CmdHIDsimTAG(uint32_t hi, uint32_t lo, int ledcontrol) {
 // prepare a waveform pattern in the buffer based on the ID given then
 // simulate a FSK tag until the button is pressed
 // arg1 contains fcHigh and fcLow, arg2 contains STT marker and clock
-void CmdFSKsimTAG(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream, int ledcontrol) {
+void CmdFSKsimTAG(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *bits, int ledcontrol) {
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
 
     // free eventually allocated BigBuf memory
@@ -846,7 +846,7 @@ void CmdFSKsimTAG(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream,
     }
 
     for (i = 0; i < size; i++) {
-        if (BitStream[i])
+        if (bits[i])
             fcAll(fcLow, &n, clk, &modCnt);
         else
             fcAll(fcHigh, &n, clk, &modCnt);
@@ -901,7 +901,7 @@ static void stAskSimBit(int *n, uint8_t clock) {
 }
 
 // args clock, ask/man or askraw, invert, transmission separator
-void CmdASKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream, int ledcontrol) {
+void CmdASKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *bits, int ledcontrol) {
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
     set_tracing(false);
 
@@ -914,20 +914,20 @@ void CmdASKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream,
     if (encoding == 2) { //biphase
         uint8_t phase = 0;
         for (i = 0; i < size; i++) {
-            biphaseSimBit(BitStream[i]^invert, &n, clk, &phase);
+            biphaseSimBit(bits[i]^invert, &n, clk, &phase);
         }
         if (phase == 1) { //run a second set inverted to keep phase in check
             for (i = 0; i < size; i++) {
-                biphaseSimBit(BitStream[i]^invert, &n, clk, &phase);
+                biphaseSimBit(bits[i]^invert, &n, clk, &phase);
             }
         }
     } else {  // ask/manchester || ask/raw
         for (i = 0; i < size; i++) {
-            askSimBit(BitStream[i]^invert, &n, clk, encoding);
+            askSimBit(bits[i]^invert, &n, clk, encoding);
         }
-        if (encoding == 0 && BitStream[0] == BitStream[size - 1]) { //run a second set inverted (for ask/raw || biphase phase)
+        if (encoding == 0 && bits[0] == bits[size - 1]) { //run a second set inverted (for ask/raw || biphase phase)
             for (i = 0; i < size; i++) {
-                askSimBit(BitStream[i]^invert ^ 1, &n, clk, encoding);
+                askSimBit(bits[i]^invert ^ 1, &n, clk, encoding);
             }
         }
     }
@@ -968,7 +968,7 @@ static void pskSimBit(uint8_t waveLen, int *n, uint8_t clk, uint8_t *curPhase, b
 }
 
 // args clock, carrier, invert,
-void CmdPSKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream, int ledcontrol) {
+void CmdPSKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *bits, int ledcontrol) {
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
     set_tracing(false);
 
@@ -978,7 +978,7 @@ void CmdPSKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream,
     uint8_t invert = arg2 & 0xFF;
     uint8_t curPhase = 0;
     for (i = 0; i < size; i++) {
-        if (BitStream[i] == curPhase) {
+        if (bits[i] == curPhase) {
             pskSimBit(carrier, &n, clk, &curPhase, false);
         } else {
             pskSimBit(carrier, &n, clk, &curPhase, true);

From a7dea8f1e71a7bd815383c07b08231f4933d76ba Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 7 Apr 2019 12:30:25 +0200
Subject: [PATCH 1050/1938] overshadowed buf.

---
 client/cliparser/cliparser.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/client/cliparser/cliparser.c b/client/cliparser/cliparser.c
index 766cf9ba4..6bba6f58b 100644
--- a/client/cliparser/cliparser.c
+++ b/client/cliparser/cliparser.c
@@ -26,7 +26,6 @@ int CLIParserInit(char *vprogramName, char *vprogramHint, char *vprogramHelp) {
     programHint = vprogramHint;
     programHelp = vprogramHelp;
     memset(buf, 0x00, 500);
-
     return 0;
 }
 
@@ -155,12 +154,12 @@ int CLIParamHexToBuf(struct arg_str *argstr, uint8_t *data, int maxdatalen, int
     *datalen = 0;
 
     int ibuf = 0;
-    uint8_t buf[256] = {0};
-    int res = CLIParamStrToBuf(argstr, buf, maxdatalen * 2, &ibuf); // *2 because here HEX
+    uint8_t tmp_buf[256] = {0};
+    int res = CLIParamStrToBuf(argstr, tmp_buf, maxdatalen * 2, &ibuf); // *2 because here HEX
     if (res || !ibuf)
         return res;
 
-    switch (param_gethex_to_eol((char *)buf, 0, data, maxdatalen, datalen)) {
+    switch (param_gethex_to_eol((char *)tmp_buf, 0, data, maxdatalen, datalen)) {
         case 1:
             printf("Parameter error: Invalid HEX value.\n");
             return 1;
@@ -180,15 +179,15 @@ int CLIParamStrToBuf(struct arg_str *argstr, uint8_t *data, int maxdatalen, int
     if (!argstr->count)
         return 0;
 
-    uint8_t buf[256] = {0};
+    uint8_t tmp_buf[256] = {0};
     int ibuf = 0;
 
     for (int i = 0; i < argstr->count; i++) {
         int len = strlen(argstr->sval[i]);
-        memcpy(&buf[ibuf], argstr->sval[i], len);
+        memcpy(&tmp_buf[ibuf], argstr->sval[i], len);
         ibuf += len;
     }
-    buf[ibuf] = 0;
+    tmp_buf[ibuf] = 0;
 
     if (!ibuf)
         return 0;
@@ -196,7 +195,7 @@ int CLIParamStrToBuf(struct arg_str *argstr, uint8_t *data, int maxdatalen, int
     if (ibuf > maxdatalen)
         return 2;
 
-    memcpy(data, buf, ibuf);
+    memcpy(data, tmp_buf, ibuf);
     *datalen = ibuf;
 
     return 0;

From 8c359921e927498d0ada94649f21f4c832062baf Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 7 Apr 2019 12:30:49 +0200
Subject: [PATCH 1051/1938] keybytes for MifareUC_Auth

---
 armsrc/apps.h      | 2 +-
 armsrc/mifarecmd.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/armsrc/apps.h b/armsrc/apps.h
index f4df953e5..b4c38098c 100644
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -143,7 +143,7 @@ void EPA_PACE_Replay(UsbCommand *c);
 // mifarecmd.h
 void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain);
 void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain);
-void MifareUC_Auth(uint8_t arg0, uint8_t *datain);
+void MifareUC_Auth(uint8_t arg0, uint8_t *keybytes);
 void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain);
 void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain);
 void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain);
diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index d0822cfbb..56049a9cd 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -100,7 +100,7 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
     LEDsoff();
 }
 
-void MifareUC_Auth(uint8_t arg0, uint8_t *datain) {
+void MifareUC_Auth(uint8_t arg0, uint8_t *keybytes) {
 
     bool turnOffField = (arg0 == 1);
 
@@ -119,7 +119,7 @@ void MifareUC_Auth(uint8_t arg0, uint8_t *datain) {
         return;
     };
 
-    if (!mifare_ultra_auth(datain)) {
+    if (!mifare_ultra_auth(keybytes)) {
         if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication failed");
         OnError(1);
         return;

From 69ba2d6a5b3a782c1acd9c2b10834ca99b9f072b Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 7 Apr 2019 12:33:33 +0200
Subject: [PATCH 1052/1938] rename variables in order to prevent a popular
 usbcommand named as c.

---
 client/util.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/util.h b/client/util.h
index 83a5c87cd..dcd702fb0 100644
--- a/client/util.h
+++ b/client/util.h
@@ -174,7 +174,7 @@
 
 #ifndef DropField
 #define DropField() { \
-        UsbCommand c = {CMD_READER_ISO_14443a, {0,0,0}}; clearCommandBuffer(); SendCommand(&c); \
+        UsbCommand c_drop = {CMD_READER_ISO_14443a, {0,0,0}}; clearCommandBuffer(); SendCommand(&c_drop); \
     }
 #endif
 

From 0b455607a9f7a183ac2da41225c4af8a59ffeb90 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 7 Apr 2019 12:41:29 +0200
Subject: [PATCH 1053/1938] fsize can't be zero

---
 client/cmdhficlass.c         | 8 ++++----
 client/cmdhfmfu.c            | 2 +-
 client/cmdsmartcard.c        | 4 ++--
 client/loclass/elite_crack.c | 2 +-
 client/loclass/fileutils.c   | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index c25bebdd3..ed73a98cc 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -636,7 +636,7 @@ int CmdHFiClassELoad(const char *Cmd) {
     long fsize = ftell(f);
     fseek(f, 0, SEEK_SET);
 
-    if (fsize < 0) {
+    if (fsize <= 0) {
         PrintAndLogDevice(WARNING, "error, when getting filesize");
         fclose(f);
         return 1;
@@ -729,7 +729,7 @@ int CmdHFiClassDecrypt(const char *Cmd) {
     long fsize = ftell(f);
     fseek(f, 0, SEEK_SET);
 
-    if (fsize < 0) {
+    if (fsize <= 0) {
         PrintAndLogEx(WARNING, "error, when getting filesize");
         fclose(f);
         return 2;
@@ -1609,7 +1609,7 @@ int CmdHFiClassReadTagFile(const char *Cmd) {
     long fsize = ftell(f);
     fseek(f, 0, SEEK_SET);
 
-    if (fsize < 0) {
+    if (fsize <= 0) {
         PrintAndLogEx(WARNING, "Error, when getting filesize");
         fclose(f);
         return 1;
@@ -1766,7 +1766,7 @@ static int loadKeys(char *filename) {
     long fsize = ftell(f);
     fseek(f, 0, SEEK_SET);
 
-    if (fsize < 0) {
+    if (fsize <= 0) {
         PrintAndLogEx(WARNING, "Error, when getting filesize");
         fclose(f);
         return 1;
diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index f20665df6..45c67bcb3 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -2076,7 +2076,7 @@ int CmdHF14AMfURestore(const char *Cmd) {
     fseek(f, 0, SEEK_END);
     long fsize = ftell(f);
     fseek(f, 0, SEEK_SET);
-    if (fsize < 0) {
+    if (fsize <= 0) {
         PrintAndLogEx(WARNING, "Error, when getting filesize");
         fclose(f);
         return 1;
diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index b1c3c3797..a930d3be5 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -645,7 +645,7 @@ int CmdSmartUpgrade(const char *Cmd) {
     long fsize = ftell(f);
     fseek(f, 0, SEEK_SET);
 
-    if (fsize < 0) {
+    if (fsize <= 0) {
         PrintAndLogEx(WARNING, "error, when getting filesize");
         fclose(f);
         return 1;
@@ -676,7 +676,7 @@ int CmdSmartUpgrade(const char *Cmd) {
     fsize = ftell(f);
     fseek(f, 0, SEEK_SET);
 
-    if (fsize < 0)  {
+    if (fsize < 0) {
         PrintAndLogEx(FAILED, "Could not determine size of SHA-512 file");
         fclose(f);
         free(dump);
diff --git a/client/loclass/elite_crack.c b/client/loclass/elite_crack.c
index 038d8e475..5a280e7c1 100644
--- a/client/loclass/elite_crack.c
+++ b/client/loclass/elite_crack.c
@@ -539,7 +539,7 @@ int bruteforceFile(const char *filename, uint16_t keytable[]) {
     long fsize = ftell(f);
     fseek(f, 0, SEEK_SET);
 
-    if (fsize < 0) {
+    if (fsize <= 0) {
         PrintAndLogDevice(WARNING, "Error, when getting filesize");
         fclose(f);
         return 1;
diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index 4ac77633a..4bfe0129e 100644
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -292,7 +292,7 @@ int loadFile(const char *preferredName, const char *suffix, void *data, size_t m
     long fsize = ftell(f);
     fseek(f, 0, SEEK_SET);
 
-    if (fsize < 0) {
+    if (fsize <= 0) {
         PrintAndLogDevice(FAILED, "error, when getting filesize");
         retval = 1;
         goto out;

From 5ea649e59dc42da4ea42a37aed8830daab82b8d4 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 7 Apr 2019 15:18:02 +0200
Subject: [PATCH 1054/1938] style

---
 common/lfdemod.c | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/common/lfdemod.c b/common/lfdemod.c
index dfe959a37..abf7d82fe 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -984,10 +984,10 @@ int DetectPSKClock(uint8_t *dest, size_t size, int clock, size_t *firstPhaseShif
     if (*fc != 2 && *fc != 4 && *fc != 8) return 0;
 
 
-    size_t waveStart = 0, waveEnd = 0, firstFullWave = 0, lastClkBit = 0;
+    size_t waveStart, waveEnd, firstFullWave = 0, lastClkBit;
 
-    uint8_t clkCnt, tol = 1;
-    uint16_t peakcnt = 0, errCnt = 0, waveLenCnt = 0, fullWaveLen = 0;
+    uint8_t clkCnt, tol;
+    uint16_t peakcnt, errCnt, waveLenCnt, fullWaveLen = 0;
     uint16_t bestErr[] = {1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000};
     uint16_t peaksdet[] = {0, 0, 0, 0, 0, 0, 0, 0, 0};
 
@@ -1019,7 +1019,6 @@ int DetectPSKClock(uint8_t *dest, size_t size, int clock, size_t *firstPhaseShif
             if (dest[i] < dest[i + 1] && dest[i + 1] >= dest[i + 2]) {
                 if (waveStart == 0) {
                     waveStart = i + 1;
-                    waveLenCnt = 0;
                 } else { //waveEnd
                     waveEnd = i + 1;
                     waveLenCnt = waveEnd - waveStart;
@@ -1666,12 +1665,9 @@ size_t fsk_wave_demod(uint8_t *dest, size_t size, uint8_t fchigh, uint8_t fclow,
     if (fclow == 0) fclow = 8;
 
     //set the threshold close to 0 (graph) or 128 std to avoid static
-    size_t preLastSample = 0;
-    size_t LastSample = 0;
-    size_t currSample = 0;
-    size_t last_transition = 0;
-    size_t idx;
-    size_t numBits = 0;
+    size_t preLastSample, LastSample = 0;
+    size_t currSample = 0, last_transition = 0;
+    size_t idx, numBits = 0;
 
     //find start of modulating data in trace
     idx = findModStart(dest, size, fchigh);
@@ -1865,8 +1861,8 @@ int pskRawDemod_ext(uint8_t *dest, size_t *size, int *clock, int *invert, int *s
 
     uint8_t curPhase = *invert;
     uint8_t fc = 0;
-    size_t i = 0, numBits = 0, waveStart = 1, waveEnd = 0, firstFullWave = 0, lastClkBit = 0;
-    uint16_t fullWaveLen = 0, waveLenCnt = 0, avgWaveVal = 0;
+    size_t i = 0, numBits = 0, waveStart = 1, waveEnd, firstFullWave = 0, lastClkBit = 0;
+    uint16_t fullWaveLen = 0, waveLenCnt, avgWaveVal = 0;
     uint16_t errCnt = 0, errCnt2 = 0;
 
     *clock = DetectPSKClock(dest, *size, *clock, &firstFullWave, &curPhase, &fc);
@@ -1894,8 +1890,11 @@ int pskRawDemod_ext(uint8_t *dest, size_t *size, int *clock, int *invert, int *s
     *startIdx = firstFullWave - (*clock * numBits) + 2;
     //set start of wave as clock align
     lastClkBit = firstFullWave;
-    if (g_debugMode == 2) prnt("DEBUG PSK: firstFullWave: %u, waveLen: %u, startIdx %i", firstFullWave, fullWaveLen, *startIdx);
-    if (g_debugMode == 2) prnt("DEBUG PSK: clk: %d, lastClkBit: %u, fc: %u", *clock, lastClkBit, fc);
+    if (g_debugMode == 2) {
+        prnt("DEBUG PSK: firstFullWave: %u, waveLen: %u, startIdx %i", firstFullWave, fullWaveLen, *startIdx);
+        prnt("DEBUG PSK: clk: %d, lastClkBit: %u, fc: %u", *clock, lastClkBit, fc);
+    }
+    
     waveStart = 0;
     dest[numBits++] = curPhase; //set first read bit
     for (i = firstFullWave + fullWaveLen - 1; i < *size - 3; i++) {
@@ -1903,7 +1902,6 @@ int pskRawDemod_ext(uint8_t *dest, size_t *size, int *clock, int *invert, int *s
         if (dest[i] + fc < dest[i + 1] && dest[i + 1] >= dest[i + 2]) {
             if (waveStart == 0) {
                 waveStart = i + 1;
-                waveLenCnt = 0;
                 avgWaveVal = dest[i + 1];
             } else { //waveEnd
                 waveEnd = i + 1;

From d8f539c217e522a54de4c0f50c0fc561a0bc38e7 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 7 Apr 2019 15:20:27 +0200
Subject: [PATCH 1055/1938] style

---
 client/tinycbor/cbor.h       | 2 +-
 client/tinycbor/cborparser.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/client/tinycbor/cbor.h b/client/tinycbor/cbor.h
index a6175d3ab..238a2717f 100644
--- a/client/tinycbor/cbor.h
+++ b/client/tinycbor/cbor.h
@@ -409,7 +409,7 @@ CBOR_PRIVATE_API CborError _cbor_value_copy_string(const CborValue *value, void
 CBOR_PRIVATE_API CborError _cbor_value_dup_string(const CborValue *value, void **buffer,
                                                   size_t *buflen, CborValue *next);
 
-CBOR_API CborError cbor_value_calculate_string_length(const CborValue *value, size_t *length);
+CBOR_API CborError cbor_value_calculate_string_length(const CborValue *value, size_t *len);
 
 CBOR_INLINE_API CborError cbor_value_copy_text_string(const CborValue *value, char *buffer,
                                                       size_t *buflen, CborValue *next) {
diff --git a/client/tinycbor/cborparser.c b/client/tinycbor/cborparser.c
index 23e87f98a..2dade3a0d 100644
--- a/client/tinycbor/cborparser.c
+++ b/client/tinycbor/cborparser.c
@@ -208,7 +208,6 @@ static bool is_fixed_type(uint8_t type) {
 
 static CborError preparse_value(CborValue *it) {
     const CborParser *parser = it->parser;
-    it->type = CborInvalidType;
 
     /* are we at the end? */
     if (it->ptr == parser->end)

From 7bf24a170fcbd02d9a5a4e026ca2202a66bb7e26 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 7 Apr 2019 15:22:01 +0200
Subject: [PATCH 1056/1938] style

---
 client/mifare/ndef.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/mifare/ndef.c b/client/mifare/ndef.c
index da03ecc8f..12f89b53e 100644
--- a/client/mifare/ndef.c
+++ b/client/mifare/ndef.c
@@ -115,7 +115,6 @@ int ndefDecodeHeader(uint8_t *data, size_t datalen, NDEFHeader_t *header) {
 
     if (header->IDLenPresent) {
         header->IDLen = (header->ShortRecordBit ? (data[3]) : (data[6]));
-        header->Payload = header->Type + header->TypeLen;
     } else {
         header->IDLen = 0;
     }

From ef610f373a7c14f1c590375240e636a25792cfb3 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 7 Apr 2019 16:21:27 +0200
Subject: [PATCH 1057/1938] style

---
 armsrc/lfops.c | 55 ++++++++++++++++++++++----------------------------
 1 file changed, 24 insertions(+), 31 deletions(-)

diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index 4b15c7320..cfb93b7d2 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -997,9 +997,8 @@ void CmdPSKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *bits, int
 // loop to get raw HID waveform then FSK demodulate the TAG ID from it
 void CmdHIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol) {
     uint8_t *dest = BigBuf_get_addr();
-    size_t size = 0;
+    size_t size;
     uint32_t hi2 = 0, hi = 0, lo = 0;
-    int idx = 0;
     int dummyIdx = 0;
     // Configure to go in 125Khz listen mode
     LFSetupFPGAForADC(95, true);
@@ -1015,7 +1014,7 @@ void CmdHIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol)
         DoAcquisition_default(-1, true);
         // FSK demodulator
         size = 50 * 128 * 2; //big enough to catch 2 sequences of largest format
-        idx = HIDdemodFSK(dest, &size, &hi2, &hi, &lo, &dummyIdx);
+        int idx = HIDdemodFSK(dest, &size, &hi2, &hi, &lo, &dummyIdx);
         if (idx < 0) continue;
 
         if (idx > 0 && lo > 0 && (size == 96 || size == 192)) {
@@ -1029,7 +1028,7 @@ void CmdHIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol)
                         );
             } else {  //standard HID tags 44/96 bits
                 uint8_t bitlen = 0;
-                uint32_t fc = 0;
+                uint32_t fac = 0;
                 uint32_t cardnum = 0;
 
                 if (((hi >> 5) & 1) == 1) { //if bit 38 is set then < 37 bit format is used
@@ -1041,35 +1040,35 @@ void CmdHIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol)
                         idx3++;
                     }
                     bitlen = idx3 + 19;
-                    fc = 0;
+                    fac = 0;
                     cardnum = 0;
                     if (bitlen == 26) {
                         cardnum = (lo >> 1) & 0xFFFF;
-                        fc = (lo >> 17) & 0xFF;
+                        fac = (lo >> 17) & 0xFF;
                     }
                     if (bitlen == 37) {
                         cardnum = (lo >> 1) & 0x7FFFF;
-                        fc = ((hi & 0xF) << 12) | (lo >> 20);
+                        fac = ((hi & 0xF) << 12) | (lo >> 20);
                     }
                     if (bitlen == 34) {
                         cardnum = (lo >> 1) & 0xFFFF;
-                        fc = ((hi & 1) << 15) | (lo >> 17);
+                        fac = ((hi & 1) << 15) | (lo >> 17);
                     }
                     if (bitlen == 35) {
                         cardnum = (lo >> 1) & 0xFFFFF;
-                        fc = ((hi & 1) << 11) | (lo >> 21);
+                        fac = ((hi & 1) << 11) | (lo >> 21);
                     }
                 } else { //if bit 38 is not set then 37 bit format is used
                     bitlen = 37;
                     cardnum = (lo >> 1) & 0x7FFFF;
-                    fc = ((hi & 0xF) << 12) | (lo >> 20);
+                    fac = ((hi & 0xF) << 12) | (lo >> 20);
                 }
                 Dbprintf("TAG ID: %x%08x (%d) - Format Len: %dbit - FC: %d - Card: %d",
                          hi,
                          lo,
                          (lo >> 1) & 0xFFFF,
                          bitlen,
-                         fc,
+                         fac,
                          cardnum
                         );
             }
@@ -1095,7 +1094,7 @@ void CmdAWIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol)
     //big enough to catch 2 sequences of largest format
     size_t size = 12800; //50 * 128 * 2;
 
-    int idx = 0, dummyIdx = 0;
+    int dummyIdx = 0;
 
     BigBuf_Clear_keep_EM();
 
@@ -1109,7 +1108,7 @@ void CmdAWIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol)
         DoAcquisition_default(-1, true);
         // FSK demodulator
 
-        idx = detectAWID(dest, &size, &dummyIdx);
+        int idx = detectAWID(dest, &size, &dummyIdx);
 
         if (idx <= 0 || size != 96) continue;
         // Index map
@@ -1147,16 +1146,16 @@ void CmdAWIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol)
         // w = wiegand parity
         // (26 bit format shown)
 
-        uint32_t fc = 0;
+        uint32_t fac = 0;
         uint32_t cardnum = 0;
         uint32_t code1 = 0;
         uint32_t code2 = 0;
         uint8_t fmtLen = bytebits_to_byte(dest, 8);
         if (fmtLen == 26) {
-            fc = bytebits_to_byte(dest + 9, 8);
+            fac = bytebits_to_byte(dest + 9, 8);
             cardnum = bytebits_to_byte(dest + 17, 16);
             code1 = bytebits_to_byte(dest + 8, fmtLen);
-            Dbprintf("AWID Found - BitLength: %d, FC: %d, Card: %d - Wiegand: %x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, rawHi2, rawHi, rawLo);
+            Dbprintf("AWID Found - BitLength: %d, FC: %d, Card: %d - Wiegand: %x, Raw: %08x%08x%08x", fmtLen, fac, cardnum, code1, rawHi2, rawHi, rawLo);
         } else {
             cardnum = bytebits_to_byte(dest + 8 + (fmtLen - 17), 16);
             if (fmtLen > 32) {
@@ -1174,8 +1173,6 @@ void CmdAWIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol)
             *low = rawLo;
             break;
         }
-        // reset
-        idx = 0;
         WDT_HIT();
     }
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
@@ -1186,8 +1183,8 @@ void CmdAWIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol)
 void CmdEM410xdemod(int findone, uint32_t *high, uint64_t *low, int ledcontrol) {
     uint8_t *dest = BigBuf_get_addr();
 
-    size_t size = 0, idx = 0;
-    int clk = 0, invert = 0, errCnt = 0, maxErr = 20;
+    size_t size, idx = 0;
+    int clk = 0, invert = 0, errCnt, maxErr = 20;
     uint32_t hi = 0;
     uint64_t lo = 0;
 
@@ -1238,7 +1235,7 @@ void CmdEM410xdemod(int findone, uint32_t *high, uint64_t *low, int ledcontrol)
         }
         WDT_HIT();
         hi = lo = size = idx = 0;
-        clk = invert = errCnt = 0;
+        clk = invert = 0;
     }
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     DbpString("Stopped");
@@ -1249,7 +1246,7 @@ void CmdIOdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol) {
 
     uint8_t *dest = BigBuf_get_addr();
 
-    int dummyIdx = 0, idx = 0;
+    int dummyIdx = 0;
     uint32_t code = 0, code2 = 0;
     uint8_t version = 0, facilitycode = 0, crc = 0;
     uint16_t number = 0, calccrc = 0;
@@ -1269,7 +1266,7 @@ void CmdIOdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol) {
 
         //fskdemod and get start index
         WDT_HIT();
-        idx = detectIOProx(dest, &size, &dummyIdx);
+        int idx = detectIOProx(dest, &size, &dummyIdx);
         if (idx < 0) continue;
         //valid tag found
 
@@ -1325,8 +1322,6 @@ void CmdIOdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol) {
         code = code2 = 0;
         version = facilitycode = 0;
         number = 0;
-        idx = 0;
-
         WDT_HIT();
     }
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
@@ -1481,8 +1476,7 @@ void T55xxReadBlock(uint16_t arg0, uint8_t Block, uint32_t Pwd) {
     bool PwdMode = arg0 & 0x1;
     uint8_t Page = (arg0 & 0x2) >> 1;
     bool brute_mem =  arg0 & 0x4;
-
-    uint32_t i = 0;
+    uint32_t i;
 
     // regular read mode
     bool RegReadMode = (Block == 0xFF);
@@ -1771,7 +1765,7 @@ void CopyVikingtoT55xx(uint32_t block1, uint32_t block2, uint8_t Q5) {
 #define EM410X_ID_LENGTH 40
 
 void WriteEM410x(uint32_t card, uint32_t id_hi, uint32_t id_lo) {
-    int i, id_bit;
+    int i;
     uint64_t id = EM410X_HEADER;
     uint64_t rev_id = 0; // reversed ID
     int c_parity[4];     // column parity
@@ -1790,7 +1784,7 @@ void WriteEM410x(uint32_t card, uint32_t id_hi, uint32_t id_lo) {
     }
 
     for (i = 0; i < EM410X_ID_LENGTH; ++i) {
-        id_bit = rev_id & 1;
+        int id_bit = rev_id & 1;
 
         if (i % 4 == 0) {
             // Don't write row parity bit at start of parsing
@@ -1926,7 +1920,6 @@ uint8_t Prepare_Addr(uint8_t addr) {
 //====================================================================
 uint8_t Prepare_Data(uint16_t data_low, uint16_t data_hi) {
 
-    register uint8_t line_parity;
     register uint8_t column_parity;
     register uint8_t i, j;
     register uint16_t data;
@@ -1935,7 +1928,7 @@ uint8_t Prepare_Data(uint16_t data_low, uint16_t data_hi) {
     column_parity = 0;
 
     for (i = 0; i < 4; i++) {
-        line_parity = 0;
+        register uint8_t line_parity = 0;
         for (j = 0; j < 8; j++) {
             line_parity ^= data;
             column_parity ^= (data & 1) << j;

From c65d782d73108f4537af32b52faa134d19f47375 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 7 Apr 2019 16:23:07 +0200
Subject: [PATCH 1058/1938] shadowing

---
 client/cmdhf14a.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index dad8495a3..dc85069ab 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -692,8 +692,8 @@ int CmdHF14ACUIDs(const char *Cmd) {
             PrintAndLogEx(WARNING, "card select failed.");
         } else {
             char uid_string[20];
-            for (uint16_t i = 0; i < card->uidlen; i++) {
-                sprintf(&uid_string[2 * i], "%02X", card->uid[i]);
+            for (uint16_t m = 0; m < card->uidlen; m++) {
+                sprintf(&uid_string[2 * m], "%02X", card->uid[m]);
             }
             PrintAndLogEx(NORMAL, "%s", uid_string);
         }

From 0ffe2a4700d8c7624f5caf88ebe8322ae0fcb61a Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 7 Apr 2019 16:25:19 +0200
Subject: [PATCH 1059/1938] shadowing

---
 client/cmdhf14a.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index dc85069ab..5ed16e747 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -418,7 +418,6 @@ int CmdHF14AInfo(const char *Cmd) {
             c.arg[2] = 0;
             clearCommandBuffer();
             SendCommand(&c);
-            UsbCommand resp;
             WaitForResponse(CMD_ACK, &resp);
 
             memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));

From 03b44b324b8452ad7aa49a7f80cc2bb00ef1d0c8 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 7 Apr 2019 16:30:02 +0200
Subject: [PATCH 1060/1938] assign

---
 client/cmdhfepa.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/client/cmdhfepa.c b/client/cmdhfepa.c
index 0386155c1..ecd185783 100644
--- a/client/cmdhfepa.c
+++ b/client/cmdhfepa.c
@@ -61,8 +61,8 @@ int CmdHFEPACollectPACENonces(const char *Cmd) {
 // perform the PACE protocol by replaying APDUs
 int CmdHFEPAPACEReplay(const char *Cmd) {
     // the 4 APDUs which are replayed + their lengths
-    uint8_t msesa_apdu[41], gn_apdu[8], map_apdu[75];
-    uint8_t pka_apdu[75], ma_apdu[18], apdu_lengths[5] = {0};
+    uint8_t msesa_apdu[41] = {0}, gn_apdu[8] = {0}, map_apdu[75] = {0};
+    uint8_t pka_apdu[75] = {0}, ma_apdu[18] = {0}, apdu_lengths[5] = {0};
     // pointers to the arrays to be able to iterate
     uint8_t *apdus[] = {msesa_apdu, gn_apdu, map_apdu, pka_apdu, ma_apdu};
 
@@ -74,15 +74,18 @@ int CmdHFEPAPACEReplay(const char *Cmd) {
     // Proxmark response
     UsbCommand resp;
 
-    int skip = 0, skip_add = 0, scan_return = 0;
+    int skip = 0, skip_add = 0, scan_return;
     // for each APDU
     for (int i = 0; i < sizeof(apdu_lengths); i++) {
         // scan to next space or end of string
         while (Cmd[skip] != ' ' && Cmd[skip] != '\0') {
             // convert
-            scan_return = sscanf(Cmd + skip, "%2X%n",
+            scan_return = sscanf(Cmd + skip,
+                                "%2X%n",
                                  (unsigned int *)(apdus[i] + apdu_lengths[i]),
-                                 &skip_add);
+                                 &skip_add
+                                 );
+                                 
             if (scan_return < 1) {
                 PrintAndLogEx(NORMAL, (char *)usage_msg);
                 PrintAndLogEx(WARNING, "Not enough APDUs! Try again!");

From 9eba3a849a86131743179664c97211b1cd2258ae Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 7 Apr 2019 16:34:21 +0200
Subject: [PATCH 1061/1938] shadowing

---
 client/whereami.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/client/whereami.c b/client/whereami.c
index fe61273d2..9ecfd2870 100644
--- a/client/whereami.c
+++ b/client/whereami.c
@@ -287,11 +287,9 @@ int WAI_PREFIX(getModulePath)(char *out, int capacity, int *dirname_length) {
                         memcpy(out, resolved, length);
 
                         if (dirname_length) {
-                            int i;
-
-                            for (i = length - 1; i >= 0; --i) {
-                                if (out[i] == '/') {
-                                    *dirname_length = i;
+                            for (int j = length - 1; j >= 0; --j) {
+                                if (out[j] == '/') {
+                                    *dirname_length = j;
                                     break;
                                 }
                             }

From 8d9bd810201ae7cfe78b97caeee23ac2bb44c5c3 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 7 Apr 2019 16:49:22 +0200
Subject: [PATCH 1062/1938] never used assignments

---
 client/mifare/mifarehost.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/mifare/mifarehost.c b/client/mifare/mifarehost.c
index de2ac2cfa..6c02ce05e 100644
--- a/client/mifare/mifarehost.c
+++ b/client/mifare/mifarehost.c
@@ -381,7 +381,7 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo,
     uint32_t max_keys = keycnt > (USB_CMD_DATA_SIZE / 6) ? (USB_CMD_DATA_SIZE / 6) : keycnt;
     uint8_t keyBlock[USB_CMD_DATA_SIZE] = {0x00};
 
-    for (int i = 0; i < keycnt; i += max_keys) {
+    for (i = 0; j < keycnt; i += max_keys) {
 
         int size = keycnt - i > max_keys ? max_keys : keycnt - i;
 
@@ -775,7 +775,7 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
         case TRACE_AUTH1:
             if (len == 4) {
                 traceState = TRACE_AUTH2;
-                nt = bytes_to_num(data, 4);
+                //nt = bytes_to_num(data, 4);
                 return 0;
             } else {
                 traceState = TRACE_ERROR;
@@ -785,8 +785,8 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
         case TRACE_AUTH2:
             if (len == 8) {
                 traceState = TRACE_AUTH_OK;
-                nr_enc = bytes_to_num(data, 4);
-                ar_enc = bytes_to_num(data + 4, 4);
+                //nr_enc = bytes_to_num(data, 4);
+                //ar_enc = bytes_to_num(data + 4, 4);
                 return 0;
             } else {
                 traceState = TRACE_ERROR;
@@ -835,7 +835,7 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
 
             } else {
                 PrintAndLogEx(NORMAL, "[!] nested key recovery not implemented!\n");
-                at_enc = bytes_to_num(data, 4);
+                //at_enc = bytes_to_num(data, 4);
                 crypto1_destroy(traceCrypto1);
                 traceState = TRACE_ERROR;
             }

From 27003904ce4572df6fba48042f1c2ab9b0108882 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 7 Apr 2019 18:12:58 +0200
Subject: [PATCH 1063/1938] printandlogs..

---
 client/cmddata.c             |  4 +-
 client/cmdhf14a.c            | 20 ++++----
 client/cmdhfmfp.c            |  2 +-
 client/emv/emvcore.c         | 97 ++++++++++++++++++++++++------------
 client/emv/test/cryptotest.c |  2 +-
 client/loclass/fileutils.c   |  4 +-
 client/mifare/mifare4.c      |  4 +-
 client/ui.h                  |  2 -
 client/util.c                |  8 ++-
 9 files changed, 86 insertions(+), 57 deletions(-)

diff --git a/client/cmddata.c b/client/cmddata.c
index 959472c58..f413a77ef 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -1973,13 +1973,13 @@ int FSKToNRZ(int *data, int *dataLen, int clk, int LowToneFC, int HighToneFC) {
         int firstClockEdge = 0;
         ans = fskClocks((uint8_t *) &LowToneFC, (uint8_t *) &HighToneFC, (uint8_t *) &clk, &firstClockEdge);
         if (g_debugMode > 1) {
-            PrintAndLog("DEBUG FSKtoNRZ: detected clocks: fc_low %i, fc_high %i, clk %i, firstClockEdge %i, ans %u", LowToneFC, HighToneFC, clk, firstClockEdge, ans);
+            PrintAndLogEx(NORMAL, "DEBUG FSKtoNRZ: detected clocks: fc_low %i, fc_high %i, clk %i, firstClockEdge %i, ans %u", LowToneFC, HighToneFC, clk, firstClockEdge, ans);
         }
     }
     // currently only know fsk modulations with field clocks < 10 samples and > 4 samples. filter out to remove false positives (and possibly destroying ask/psk modulated waves...)
     if (ans == 0 || clk == 0 || LowToneFC == 0 || HighToneFC == 0 || LowToneFC > 10 || HighToneFC < 4) {
         if (g_debugMode > 1) {
-            PrintAndLog("DEBUG FSKtoNRZ: no fsk clocks found");
+            PrintAndLogEx(NORMAL,"DEBUG FSKtoNRZ: no fsk clocks found");
         }
         return 0;
     }
diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 5ed16e747..75f30f6f8 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -238,30 +238,30 @@ int Hf14443_4aGetCardData(iso14a_card_select_t *card) {
     uint64_t select_status = resp.arg[0]; // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
 
     if (select_status == 0) {
-        PrintAndLog("E->iso14443a card select failed");
+        PrintAndLogEx(ERR, "E->iso14443a card select failed");
         return 1;
     }
 
     if (select_status == 2) {
-        PrintAndLog("E->Card doesn't support iso14443-4 mode");
+        PrintAndLogEx(ERR, "E->Card doesn't support iso14443-4 mode");
         return 1;
     }
 
     if (select_status == 3) {
-        PrintAndLog("E->Card doesn't support standard iso14443-3 anticollision");
-        PrintAndLog("\tATQA : %02x %02x", card->atqa[1], card->atqa[0]);
+        PrintAndLogEx(NORMAL, "E->Card doesn't support standard iso14443-3 anticollision");
+        PrintAndLogEx(NORMAL, "\tATQA : %02x %02x", card->atqa[1], card->atqa[0]);
         return 1;
     }
 
-    PrintAndLog(" UID: %s", sprint_hex(card->uid, card->uidlen));
-    PrintAndLog("ATQA: %02x %02x", card->atqa[1], card->atqa[0]);
-    PrintAndLog(" SAK: %02x [%" PRIu64 "]", card->sak, resp.arg[0]);
+    PrintAndLogEx(NORMAL, " UID: %s", sprint_hex(card->uid, card->uidlen));
+    PrintAndLogEx(NORMAL, "ATQA: %02x %02x", card->atqa[1], card->atqa[0]);
+    PrintAndLogEx(NORMAL, " SAK: %02x [%" PRIu64 "]", card->sak, resp.arg[0]);
     if (card->ats_len < 3) { // a valid ATS consists of at least the length byte (TL) and 2 CRC bytes
-        PrintAndLog("E-> Error ATS length(%d) : %s", card->ats_len, sprint_hex(card->ats, card->ats_len));
+        PrintAndLogEx(NORMAL, "E-> Error ATS length(%d) : %s", card->ats_len, sprint_hex(card->ats, card->ats_len));
         return 1;
     }
-    PrintAndLog(" ATS: %s", sprint_hex(card->ats, card->ats_len));
-
+    
+    PrintAndLogEx(NORMAL, " ATS: %s", sprint_hex(card->ats, card->ats_len));
     return 0;
 }
 
diff --git a/client/cmdhfmfp.c b/client/cmdhfmfp.c
index 7178591a2..942000755 100644
--- a/client/cmdhfmfp.c
+++ b/client/cmdhfmfp.c
@@ -385,7 +385,7 @@ int CmdHFMFPRdbl(const char *cmd) {
     }
 
     if (blocksCount > 1 && mfIsSectorTrailer(blockn)) {
-        PrintAndLog("WARNING: trailer!");
+        PrintAndLogEx(WARNING, "WARNING: trailer!");
     }
 
     uint8_t sectorNum = mfSectorNum(blockn & 0xff);
diff --git a/client/emv/emvcore.c b/client/emv/emvcore.c
index 43d6ddaf1..d30c307d4 100644
--- a/client/emv/emvcore.c
+++ b/client/emv/emvcore.c
@@ -34,24 +34,24 @@ typedef struct {
 
 static const TAIDList AIDlist [] = {
     // Visa International
-    { CV_VISA,     "A00000000305076010"},        // VISA ELO Credit
-    { CV_VISA,     "A0000000031010" },           // VISA Debit/Credit (Classic)
-    { CV_VISA,     "A000000003101001" },         // VISA Credit
-    { CV_VISA,     "A000000003101002" },         // VISA Debit
-    { CV_VISA,     "A0000000032010" },           // VISA Electron
-    { CV_VISA,     "A0000000032020" },           // VISA
-    { CV_VISA,     "A0000000033010" },           // VISA Interlink
-    { CV_VISA,     "A0000000034010" },           // VISA Specific
-    { CV_VISA,     "A0000000035010" },           // VISA Specific
-    { CV_VISA,     "A0000000036010" },           // Domestic Visa Cash Stored Value
-    { CV_VISA,     "A0000000036020" },           // International Visa Cash Stored Value
-    { CV_VISA,     "A0000000038002" },           // VISA Auth, VisaRemAuthen EMV-CAP (DPA)
-    { CV_VISA,     "A0000000038010" },           // VISA Plus
-    { CV_VISA,     "A0000000039010" },           // VISA Loyalty
-    { CV_VISA,     "A000000003999910" },         // VISA Proprietary ATM
+    { CV_VISA, "A00000000305076010" },           // VISA ELO Credit
+    { CV_VISA, "A0000000031010" },               // VISA Debit/Credit (Classic)
+    { CV_VISA, "A000000003101001" },             // VISA Credit
+    { CV_VISA, "A000000003101002" },             // VISA Debit
+    { CV_VISA, "A0000000032010" },               // VISA Electron
+    { CV_VISA, "A0000000032020" },               // VISA
+    { CV_VISA, "A0000000033010" },               // VISA Interlink
+    { CV_VISA, "A0000000034010" },               // VISA Specific
+    { CV_VISA, "A0000000035010" },               // VISA Specific
+    { CV_VISA, "A0000000036010" },               // Domestic Visa Cash Stored Value
+    { CV_VISA, "A0000000036020" },               // International Visa Cash Stored Value
+    { CV_VISA, "A0000000038002" },               // VISA Auth, VisaRemAuthen EMV-CAP (DPA)
+    { CV_VISA, "A0000000038010" },               // VISA Plus
+    { CV_VISA, "A0000000039010" },               // VISA Loyalty
+    { CV_VISA, "A000000003999910" },             // VISA Proprietary ATM
     // Visa USA
-    { CV_VISA,     "A000000098" },               // Debit Card
-    { CV_VISA,     "A0000000980848" },           // Debit Card
+    { CV_VISA, "A000000098" },                   // Debit Card
+    { CV_VISA, "A0000000980848" },               // Debit Card
     // Mastercard International
     { CV_MASTERCARD, "A00000000401" },           // MasterCard PayPass
     { CV_MASTERCARD, "A0000000041010" },         // MasterCard Credit
@@ -66,6 +66,7 @@ static const TAIDList AIDlist [] = {
     { CV_MASTERCARD, "A0000000046000" },         // Cirrus
     { CV_MASTERCARD, "A0000000048002" },         // SecureCode Auth EMV-CAP
     { CV_MASTERCARD, "A0000000049999" },         // MasterCard PayPass
+	{ CV_MASTERCARD, "B012345678" },             // Maestro TEST Used for development
     // American Express
     { CV_AMERICANEXPRESS, "A000000025" },
     { CV_AMERICANEXPRESS, "A0000000250000" },
@@ -82,11 +83,41 @@ static const TAIDList AIDlist [] = {
     // JCB CO., LTD.
     { CV_JCB, "A00000006510" },                  // JCB
     { CV_JCB, "A0000000651010" },                // JCB J Smart Credit
+	// Switch Card Services Ltd.
+	{ CV_SWITCH, "A0000000050001" },             // Maestro UK
+	{ CV_SWITCH, "A0000000050002" },             // Solo
+	// Diners Club International Ltd.
+	{ CV_DINERS, "A0000001523010" },             // Discover, Pulse D Pas Discover Card
+	{ CV_DINERS, "A0000001524010" },             // Discover, Discover Debit Common Card
     // Other
-    { CV_OTHER, "A0000001544442" },              // Banricompras Debito - Banrisul - Banco do Estado do Rio Grande do SUL - S.A.
-    { CV_OTHER, "F0000000030001" },              // BRADESCO
-    { CV_OTHER, "A0000005241010" },              // RuPay - RuPay
-    { CV_OTHER, "D5780000021010" }               // Bankaxept - Bankaxept
+	{ CV_OTHER, "A00000002401" },                // Midland Bank Plc - Self Service
+	{ CV_OTHER, "A0000000291010" },              // LINK Interchange Network Ltd - Link / American Express
+	{ CV_OTHER, "A00000006900" },                // Société Européenne de Monnaie Electronique SEME - Moneo
+	{ CV_OTHER, "A000000077010000021000000000003B" },  // Oberthur Technologies France - Visa AEPN
+	{ CV_OTHER, "A0000001211010" },              // PBS Danmark A/S - Denmark - Dankort (VISA GEM Vision) - Danish domestic debit card
+	{ CV_OTHER, "A0000001410001" },              // Associazione Bancaria Italiana - Italy - PagoBANCOMAT - CoGeBan Consorzio BANCOMAT (Italian domestic debit card)
+	{ CV_OTHER, "A0000001544442" },              // Banricompras Debito - Banrisul - Banco do Estado do Rio Grande do SUL - S.A.
+	{ CV_OTHER, "A000000172950001" },            // Financial Information Service Co. Ltd. - Taiwan - BAROC Financial Application Taiwan- The Bankers Association of the Republic of China
+	{ CV_OTHER, "A0000001850002" },              // Post Office Limited - United Kingdom - UK Post Office Account card
+	{ CV_OTHER, "A0000002281010" },              // Saudi Arabian Monetary Agency (SAMA) - Kingdom of Saudi Arabia - SPAN (M/Chip) - SPAN2 (Saudi Payments Network) - Saudi Arabia domestic credit/debit card (Saudi Arabia Monetary Agency)
+	{ CV_OTHER, "A0000002282010" },              // Saudi Arabian Monetary Agency (SAMA) - Kingdom of Saudi Arabia - SPAN (VIS) - SPAN2 (Saudi Payments Network) - Saudi Arabia domestic credit/debit card (Saudi Arabia Monetary Agency)
+	{ CV_OTHER, "A0000002771010" },              // Interac Association - Canada - INTERAC - Canadian domestic credit/debit card
+	{ CV_OTHER, "A00000031510100528" },          // Currence Holding/PIN BV - The Netherlands- Currence PuC
+	{ CV_OTHER, "A0000003156020" },              // Currence Holding/PIN BV - The Netherlands - Chipknip
+	{ CV_OTHER, "A0000003591010028001" },        // Euro Alliance of Payment Schemes s.c.r.l. (EAPS) - Belgium - Girocard EAPS - ZKA (Germany)
+	{ CV_OTHER, "A0000003710001" },              // Verve - Nigeria - InterSwitch Verve Card - Nigerian local switch company
+	{ CV_OTHER, "A0000004540010" },              // eTranzact - Nigeria - Etranzact Genesis Card - Nigerian local switch company
+	{ CV_OTHER, "A0000004540011" },              // eTranzact - Nigeria - Etranzact Genesis Card 2 - Nigerian local switch company
+	{ CV_OTHER, "A0000004766C" },                // Google - United States - GOOGLE_PAYMENT_AID
+	{ CV_OTHER, "A0000005241010" },              // RuPay - India - RuPay - RuPay (India)
+	{ CV_OTHER, "A0000006723010" },              // TROY - Turkey - TROY chip credit card - Turkey's Payment Method
+	{ CV_OTHER, "A0000006723020" },              // TROY - Turkey - TROY chip debit card - Turkey's Payment Method
+	{ CV_OTHER, "A0000007705850" },              // Indian Oil Corporation Limited - India - XTRAPOWER Fleet Card Program - Indian Oil’s Pre Paid Program
+	{ CV_OTHER, "D27600002545500100" },          // ZKA - Germany - Girocard - ZKA Girocard (Geldkarte) (Germany)
+	{ CV_OTHER, "D4100000030001" },              // KS X 6923/6924 (T-Money, South Korea and Snapper+, Wellington, New Zealand)
+	{ CV_OTHER, "D5280050218002" },              // The Netherlands - ? - (Netherlands)
+    { CV_OTHER, "D5780000021010" },              // Bankaxept    Norway  Bankaxept   Norwegian domestic debit card
+	{ CV_OTHER, "F0000000030001" },              // BRADESCO - Brazilian Bank Banco Bradesco    
 };
 static const size_t AIDlistLen = sizeof(AIDlist) / sizeof(TAIDList);
 
@@ -403,6 +434,8 @@ int EMVSearchPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldO
     int res;
     bool fileFound = false;
 
+	char *PSE_or_PPSE = PSENum == 1 ? "PSE" : "PPSE";
+	
     // select PPSE
     res = EMVSelectPSE(channel, ActivateField, true, PSENum, data, sizeof(data), &datalen, &sw);
 
@@ -452,7 +485,7 @@ int EMVSearchPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldO
                         if (tsfi) {
                             struct tlvdb *tsfitmp = tlvdb_find_path(tsfi, (tlv_tag_t[]) {0x70, 0x61, 0x00});
                             if (!tsfitmp) {
-                                PrintAndLogEx(FAILED, "SFI 0x%02d don't have records.", sfidatalen[ui]);
+								PrintAndLogEx(FAILED, "SFI 0x%02d doesn't have any records.", sfidatalen[ui]);
                                 continue;
                             }
                             res = EMVCheckAID(channel, decodeTLV, tsfitmp, tlv);
@@ -472,14 +505,14 @@ int EMVSearchPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldO
             }
 
             if (!fileFound)
-                PrintAndLogEx(FAILED, "PPSE don't have records.");
+				PrintAndLogEx(FAILED, "PPSE doesn't have any records.");
 
             tlvdb_free(t);
         } else {
-            PrintAndLogEx(WARNING, "PPSE ERROR: Can't get TLV from response.");
+			PrintAndLogEx(WARNING, "%s ERROR: Can't get TLV from response.", PSE_or_PPSE);
         }
     } else {
-        PrintAndLogEx(WARNING, "PPSE ERROR: Can't select PPSE AID. Error: %d", res);
+		PrintAndLogEx(WARNING, "%s ERROR: Can't select PPSE AID. Error: %d", PSE_or_PPSE, res);
     }
 
     if (!LeaveFieldON)
@@ -798,7 +831,7 @@ int trDDA(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlv) {
             return 4;
         }
 
-        PrintAndLogEx(NORMAL, "\n* * Calc DDOL");
+		PrintAndLogEx(NORMAL, "\n* Calc DDOL");
         const struct tlv *ddol_tlv = tlvdb_get(tlv, 0x9f49, NULL);
         if (!ddol_tlv) {
             ddol_tlv = &default_ddol_tlv;
@@ -816,7 +849,7 @@ int trDDA(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlv) {
 
         PrintAndLogEx(NORMAL, "DDOL data[%d]: %s", ddol_data_tlv->len, sprint_hex(ddol_data_tlv->value, ddol_data_tlv->len));
 
-        PrintAndLogEx(NORMAL, "\n* * Internal Authenticate");
+		PrintAndLogEx(NORMAL, "\n* Internal Authenticate");
         int res = EMVInternalAuthenticate(channel, true, (uint8_t *)ddol_data_tlv->value, ddol_data_tlv->len, buf, sizeof(buf), &len, &sw, NULL);
         if (res) {
             PrintAndLogEx(WARNING, "Internal Authenticate error(%d): %4x. Exit...", res, sw);
@@ -843,7 +876,7 @@ int trDDA(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlv) {
                 tlvdb_free(t80);
 
                 if (decodeTLV) {
-                    PrintAndLogEx(NORMAL, "* * * Decode response format 1:");
+					PrintAndLogEx(NORMAL, "* * Decode response format 1:");
                     TLVPrintFromTLV(dda_db);
                 }
             }
@@ -934,7 +967,7 @@ int trCDA(struct tlvdb *tlv, struct tlvdb *ac_tlv, struct tlv *pdol_data_tlv, st
 
     struct emv_pk *icc_pk = emv_pki_recover_icc_cert(issuer_pk, tlv, sda_tlv);
     if (!icc_pk) {
-        PrintAndLogEx(WARNING, "Error: ICC setrificate not found. Exit.");
+		PrintAndLogEx(WARNING, "Error: ICC certificate not found. Exit.");
         emv_pk_free(pk);
         emv_pk_free(issuer_pk);
         return 2;
@@ -976,7 +1009,7 @@ int trCDA(struct tlvdb *tlv, struct tlvdb *ac_tlv, struct tlv *pdol_data_tlv, st
         PrintAndLogEx(NORMAL, "CDA verified OK.");
         tlvdb_add(tlv, idn_db);
     } else {
-        PrintAndLogEx(NORMAL, "\nERROR: CDA verify error");
+        PrintAndLogEx(ERR, "\nERROR: CDA verify error");
     }
 
     emv_pk_free(pk);
@@ -989,14 +1022,14 @@ int RecoveryCertificates(struct tlvdb *tlvRoot, json_t *root) {
 
     struct emv_pk *pk = get_ca_pk(tlvRoot);
     if (!pk) {
-        PrintAndLog("ERROR: Key not found. Exit.");
+        PrintAndLogEx(ERR, "ERROR: Key not found. Exit.");
         return 1;
     }
 
     struct emv_pk *issuer_pk = emv_pki_recover_issuer_cert(pk, tlvRoot);
     if (!issuer_pk) {
         emv_pk_free(pk);
-        PrintAndLog("WARNING: Issuer certificate not found. Exit.");
+        PrintAndLogEx(WARNING, "WARNING: Issuer certificate not found. Exit.");
         return 2;
     }
     PrintAndLogEx(SUCCESS, "Issuer PK recovered. RID %02hhx:%02hhx:%02hhx:%02hhx:%02hhx IDX %02hhx CSN %02hhx:%02hhx:%02hhx",
diff --git a/client/emv/test/cryptotest.c b/client/emv/test/cryptotest.c
index 39043e544..4bb49f039 100644
--- a/client/emv/test/cryptotest.c
+++ b/client/emv/test/cryptotest.c
@@ -94,7 +94,7 @@ int ExecuteCryptoTests(bool verbose) {
     res = roca_self_test();
     if (res) TestFail = true;
 
-    PrintAndLog("\n--------------------------");
+    PrintAndLogEx(NORMAL, "\n--------------------------");
 
     if (TestFail)
         PrintAndLogEx(FAILED, "\tTest(s) [ %s ]", _RED_("FAIL"));
diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index 4bfe0129e..d85adc0c8 100644
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -405,13 +405,13 @@ int loadFileJSON(const char *preferredName, const char *suffix, void *data, size
 
     root = json_load_file(fileName, 0, &error);
     if (!root) {
-        PrintAndLog("ERROR: json " _YELLOW_("%s") " error on line %d: %s", fileName, error.line, error.text);
+        PrintAndLogEx(ERR, "ERROR: json " _YELLOW_("%s") " error on line %d: %s", fileName, error.line, error.text);
         retval = 2;
         goto out;
     }
 
     if (!json_is_object(root)) {
-        PrintAndLog("ERROR: Invalid json " _YELLOW_("%s") " format. root must be an object.", fileName);
+        PrintAndLogEx(ERR, "ERROR: Invalid json " _YELLOW_("%s") " format. root must be an object.", fileName);
         retval = 3;
         goto out;
     }
diff --git a/client/mifare/mifare4.c b/client/mifare/mifare4.c
index b3d40dd57..f3189f37f 100644
--- a/client/mifare/mifare4.c
+++ b/client/mifare/mifare4.c
@@ -164,7 +164,7 @@ int CalculateMAC(mf4Session *session, MACType_t mtype, uint8_t blockNum, uint8_t
     }
 
     if (verbose)
-        PrintAndLog("MAC data[%d]: %s", macdatalen, sprint_hex(macdata, macdatalen));
+        PrintAndLogEx(NORMAL, "MAC data[%d]: %s", macdatalen, sprint_hex(macdata, macdatalen));
 
     return aes_cmac8(NULL, session->Kmac, macdata, mac, macdatalen);
 }
@@ -285,7 +285,7 @@ int MifareAuth4(mf4Session *session, uint8_t *keyn, uint8_t *key, bool activateF
         DropField();
 
     if (verbose)
-        PrintAndLog("");
+        PrintAndLogEx(NORMAL, "");
 
     if (session) {
         session->Authenticated = true;
diff --git a/client/ui.h b/client/ui.h
index 7df965976..cace7e6fd 100644
--- a/client/ui.h
+++ b/client/ui.h
@@ -44,8 +44,6 @@ extern int PlotGridX, PlotGridY, PlotGridXdefault, PlotGridYdefault, CursorCPos,
 extern bool GridLocked;
 extern bool showDemod;
 
-//extern uint8_t g_debugMode;
-
 extern pthread_mutex_t print_lock;
 
 void iceIIR_Butterworth(int *data, const size_t len);
diff --git a/client/util.c b/client/util.c
index 8be1aa896..b257ea766 100644
--- a/client/util.c
+++ b/client/util.c
@@ -128,13 +128,13 @@ int FillBuffer(uint8_t *data, size_t maxDataLength, size_t *dataLength, ...) {
     va_start(valist, dataLength);
 
     uint8_t *vdata = NULL;
-    size_t vlength = 0;
+
     do {
         vdata = va_arg(valist, uint8_t *);
         if (!vdata)
             break;
 
-        vlength = va_arg(valist, size_t);
+        size_t vlength = va_arg(valist, size_t);
         if (*dataLength + vlength >  maxDataLength) {
             va_end(valist);
             return 1;
@@ -650,12 +650,10 @@ https://github.com/ApertureLabsLtd/RFIDler/blob/master/firmware/Pic32/RFIDler.X/
 int hextobinarray(char *target, char *source) {
     int length, i, count = 0;
     char *start = source;
-    char x;
-
     length = strlen(source);
     // process 4 bits (1 hex digit) at a time
     while (length--) {
-        x = *(source++);
+        char x = *(source++);
         // capitalize
         if (x >= 'a' && x <= 'f')
             x -= 32;

From 4c4471331b0e32ae8560dec82aac803d202a2280 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 7 Apr 2019 18:32:03 +0200
Subject: [PATCH 1064/1938] fix

---
 client/mifare/mifarehost.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/mifare/mifarehost.c b/client/mifare/mifarehost.c
index 6c02ce05e..181d41e87 100644
--- a/client/mifare/mifarehost.c
+++ b/client/mifare/mifarehost.c
@@ -381,7 +381,7 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo,
     uint32_t max_keys = keycnt > (USB_CMD_DATA_SIZE / 6) ? (USB_CMD_DATA_SIZE / 6) : keycnt;
     uint8_t keyBlock[USB_CMD_DATA_SIZE] = {0x00};
 
-    for (i = 0; j < keycnt; i += max_keys) {
+    for (i = 0; i < keycnt; i += max_keys) {
 
         int size = keycnt - i > max_keys ? max_keys : keycnt - i;
 

From c881acd6311c22640ff3e8d9f5fca28f990928e3 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 7 Apr 2019 18:35:01 +0200
Subject: [PATCH 1065/1938] more

---
 client/emv/emvcore.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/emv/emvcore.h b/client/emv/emvcore.h
index 806a9366f..25adc2b85 100644
--- a/client/emv/emvcore.h
+++ b/client/emv/emvcore.h
@@ -61,6 +61,8 @@ enum CardPSVendor {
     CV_AMERICANEXPRESS,
     CV_JCB,
     CV_CB,
+	CV_SWITCH,
+	CV_DINERS,
     CV_OTHER,
 };
 enum CardPSVendor GetCardPSVendor(uint8_t *AID, size_t AIDlen);

From 98d24a4fe8d38d08227e73b7b20c64daa7ce1a89 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 7 Apr 2019 18:42:47 +0200
Subject: [PATCH 1066/1938] style

---
 client/cliparser/argtable3.c | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/client/cliparser/argtable3.c b/client/cliparser/argtable3.c
index f8e4c2387..e1bedbb4f 100644
--- a/client/cliparser/argtable3.c
+++ b/client/cliparser/argtable3.c
@@ -2960,10 +2960,19 @@ static int trex_class(TRex *exp) {
     while (*exp->_p != ']' && exp->_p != exp->_eol) {
         if (*exp->_p == '-' && first != -1) {
             int r, t;
-            if (*exp->_p++ == ']') trex_error(exp, _SC("unfinished range"));
+            if (*exp->_p++ == ']') {
+                trex_error(exp, _SC("unfinished range"));
+            }
+            
             r = trex_newnode(exp, OP_RANGE);
-            if (first > *exp->_p) trex_error(exp, _SC("invalid range"));
-            if (exp->_nodes[first].type == OP_CCLASS) trex_error(exp, _SC("cannot use character classes in ranges"));
+            if (first > *exp->_p) {
+                trex_error(exp, _SC("invalid range"));
+            }
+            
+            if (exp->_nodes[first].type == OP_CCLASS) {
+                trex_error(exp, _SC("cannot use character classes in ranges"));
+            }
+            
             exp->_nodes[r].left = exp->_nodes[first].type;
             t = trex_escapechar(exp);
             exp->_nodes[r].right = t;
@@ -2984,8 +2993,6 @@ static int trex_class(TRex *exp) {
     if (first != -1) {
         int c = first;
         exp->_nodes[chain].next = c;
-        chain = c;
-        first = -1;
     }
     /* hack? */
     exp->_nodes[ret].left = exp->_nodes[ret].next;
@@ -4541,8 +4548,9 @@ void arg_print_formatted(FILE *fp,
     const unsigned colwidth = (rmargin - lmargin) + 1;
 
     /* Someone doesn't like us... */
-    if (line_end < line_start)
-    { fprintf(fp, "%s\n", text); }
+    if (line_end == line_start) { 
+        fprintf(fp, "%s\n", text);
+    }
 
     while (line_end - 1 > line_start) {
         /* Eat leading whitespaces. This is essential because while

From b6345a5df7406b1ebb9d3028efe26849b51a842a Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 7 Apr 2019 18:44:15 +0200
Subject: [PATCH 1067/1938] style

---
 client/cmdhficlass.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index ed73a98cc..5688fb8e1 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -1109,7 +1109,7 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
                 PrintAndLogEx(WARNING, "command execute timeout 2");
                 return 0;
             }
-            uint8_t isOK = resp.arg[0] & 0xff;
+            isOK = resp.arg[0] & 0xff;
             blocksRead = resp.arg[1];
             if (!isOK && !blocksRead) {
                 PrintAndLogEx(WARNING, "read block failed 2");

From c4d88c239bc522154ee475360ce2e9eac4353329 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 7 Apr 2019 19:21:24 +0200
Subject: [PATCH 1068/1938] style

---
 client/jansson/jansson.h | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/client/jansson/jansson.h b/client/jansson/jansson.h
index b832a791f..e282674f3 100644
--- a/client/jansson/jansson.h
+++ b/client/jansson/jansson.h
@@ -243,7 +243,7 @@ int json_array_append_new(json_t *json, json_t *value);
 int json_array_insert_new(json_t *json, size_t index, json_t *value);
 int json_array_remove(json_t *json, size_t index);
 int json_array_clear(json_t *json);
-int json_array_extend(json_t *json, json_t *other);
+int json_array_extend(json_t *json, json_t *other_json);
 
 static JSON_INLINE
 int json_array_set(json_t *array, size_t ind, json_t *value) {
@@ -262,16 +262,16 @@ int json_array_insert(json_t *array, size_t ind, json_t *value) {
 
 const char *json_string_value(const json_t *json);
 size_t json_string_length(const json_t *json);
-json_int_t json_integer_value(const json_t *integer);
-double json_real_value(const json_t *real);
+json_int_t json_integer_value(const json_t *json);
+double json_real_value(const json_t *json);
 double json_number_value(const json_t *json);
 
 int json_string_set(json_t *json, const char *value);
 int json_string_setn(json_t *json, const char *value, size_t len);
 int json_string_set_nocheck(json_t *json, const char *value);
 int json_string_setn_nocheck(json_t *json, const char *value, size_t len);
-int json_integer_set(json_t *integer, json_int_t value);
-int json_real_set(json_t *real, double value);
+int json_integer_set(json_t *json, json_int_t value);
+int json_real_set(json_t *json, double value);
 
 /* pack, unpack */
 
@@ -294,13 +294,13 @@ json_t *json_vsprintf(const char *fmt, va_list ap) JANSSON_ATTRS(warn_unused_res
 
 /* equality */
 
-int json_equal(const json_t *value1, const json_t *value2);
+int json_equal(const json_t *json1, const json_t *json2);
 
 
 /* copying */
 
-json_t *json_copy(json_t *value) JANSSON_ATTRS(warn_unused_result);
-json_t *json_deep_copy(const json_t *value) JANSSON_ATTRS(warn_unused_result);
+json_t *json_copy(json_t *json) JANSSON_ATTRS(warn_unused_result);
+json_t *json_deep_copy(const json_t *json) JANSSON_ATTRS(warn_unused_result);
 
 json_t *json_path_get(const json_t *json, const char *path);
 int json_path_set_new(json_t *json, const char *path, json_t *value, size_t flags, json_error_t *error);

From b37981df74832b053598a5de1eba2c3f13e9b449 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 7 Apr 2019 20:08:53 +0200
Subject: [PATCH 1069/1938] shadow

---
 client/cmdhfmf.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index f00093acb..4706017cb 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -1683,7 +1683,7 @@ int CmdHF14AMfChk_fast(const char *Cmd) {
             PrintAndLogEx(SUCCESS, "Running strategy %u", strategy);
 
             // main keychunk loop
-            for (uint32_t i = 0; i < keycnt; i += chunksize) {
+            for (i = 0; i < keycnt; i += chunksize) {
 
                 if (ukbhit()) {
                     int gc = getchar();
@@ -1717,7 +1717,7 @@ out:
 
     // check..
     uint8_t found_keys = 0;
-    for (uint8_t i = 0; i < sectorsCnt; ++i) {
+    for (i = 0; i < sectorsCnt; ++i) {
 
         if (e_sector[i].foundKey[0])
             found_keys++;
@@ -1734,7 +1734,7 @@ out:
 
         if (transferToEml) {
             uint8_t block[16] = {0x00};
-            for (uint8_t i = 0; i < sectorsCnt; ++i) {
+            for ( i = 0; i < sectorsCnt; ++i) {
                 mfEmlGetMem(block, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
                 if (e_sector[i].foundKey[0])
                     num_to_bytes(e_sector[i].Key[0], 6, block);
@@ -1929,7 +1929,7 @@ int CmdHF14AMfChk(const char *Cmd) {
     }
 
     // empty e_sector
-    for (int i = 0; i < SectorsCnt; ++i) {
+    for (i = 0; i < SectorsCnt; ++i) {
         e_sector[i].Key[0] = 0xffffffffffff;
         e_sector[i].Key[1] = 0xffffffffffff;
         e_sector[i].foundKey[0] = false;
@@ -1948,7 +1948,7 @@ int CmdHF14AMfChk(const char *Cmd) {
     for (trgKeyType = (keyType == 2) ? 0 : keyType; trgKeyType < 2; (keyType == 2) ? (++trgKeyType) : (trgKeyType = 2)) {
 
         int b = blockNo;
-        for (int i = 0; i < SectorsCnt; ++i) {
+        for (i = 0; i < SectorsCnt; ++i) {
 
             // skip already found keys.
             if (e_sector[i].foundKey[trgKeyType]) continue;
@@ -2022,7 +2022,7 @@ out:
 
     if (transferToEml) {
         uint8_t block[16] = {0x00};
-        for (uint8_t i = 0; i < SectorsCnt; ++i) {
+        for (i = 0; i < SectorsCnt; ++i) {
             mfEmlGetMem(block, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
             if (e_sector[i].foundKey[0])
                 num_to_bytes(e_sector[i].Key[0], 6, block);

From f27d618a0837826401208c1bbdece21a8a13205a Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 7 Apr 2019 20:12:24 +0200
Subject: [PATCH 1070/1938] shadowing

---
 client/cmdhfmfhard.c | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/client/cmdhfmfhard.c b/client/cmdhfmfhard.c
index 415bcbaa2..12aec1cb2 100644
--- a/client/cmdhfmfhard.c
+++ b/client/cmdhfmfhard.c
@@ -1284,7 +1284,6 @@ static void simulate_MFplus_RNG(uint32_t test_cuid, uint64_t test_key, uint32_t
 
 }
 
-
 static void simulate_acquire_nonces() {
     time_t time1 = time(NULL);
     last_sample_clock = 0;
@@ -1292,7 +1291,7 @@ static void simulate_acquire_nonces() {
     hardnested_stage = CHECK_1ST_BYTES;
     bool acquisition_completed = false;
     uint32_t total_num_nonces = 0;
-    float brute_force;
+    float brute_force_depth;
     bool reported_suma8 = false;
 
     cuid = (rand() & 0xff) << 24 | (rand() & 0xff) << 16 | (rand() & 0xff) << 8 | (rand() & 0xff);
@@ -1331,19 +1330,19 @@ static void simulate_acquire_nonces() {
                 apply_sum_a0();
             }
             update_nonce_data(true);
-            acquisition_completed = shrink_key_space(&brute_force);
+            acquisition_completed = shrink_key_space(&brute_force_depth);
             if (!reported_suma8) {
                 char progress_string[80];
                 sprintf(progress_string, "Apply Sum property. Sum(a0) = %d", sums[first_byte_Sum]);
-                hardnested_print_progress(num_acquired_nonces, progress_string, brute_force, 0);
+                hardnested_print_progress(num_acquired_nonces, progress_string, brute_force_depth, 0);
                 reported_suma8 = true;
             } else {
-                hardnested_print_progress(num_acquired_nonces, "Apply bit flip properties", brute_force, 0);
+                hardnested_print_progress(num_acquired_nonces, "Apply bit flip properties", brute_force_depth, 0);
             }
         } else {
             update_nonce_data(true);
-            acquisition_completed = shrink_key_space(&brute_force);
-            hardnested_print_progress(num_acquired_nonces, "Apply bit flip properties", brute_force, 0);
+            acquisition_completed = shrink_key_space(&brute_force_depth);
+            hardnested_print_progress(num_acquired_nonces, "Apply bit flip properties", brute_force_depth, 0);
         }
     } while (!acquisition_completed);
 
@@ -1369,7 +1368,7 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
     uint32_t flags = 0;
     uint8_t write_buf[9];
     uint32_t total_num_nonces = 0;
-    float brute_force;
+    float brute_force_depth;
     bool reported_suma8 = false;
     char progress_text[80];
     FILE *fnonces = NULL;
@@ -1453,19 +1452,19 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
                     apply_sum_a0();
                 }
                 update_nonce_data(true);
-                acquisition_completed = shrink_key_space(&brute_force);
+                acquisition_completed = shrink_key_space(&brute_force_depth);
                 if (!reported_suma8) {
                     char progress_string[80];
                     sprintf(progress_string, "Apply Sum property. Sum(a0) = %d", sums[first_byte_Sum]);
-                    hardnested_print_progress(num_acquired_nonces, progress_string, brute_force, 0);
+                    hardnested_print_progress(num_acquired_nonces, progress_string, brute_force_depth, 0);
                     reported_suma8 = true;
                 } else {
-                    hardnested_print_progress(num_acquired_nonces, "Apply bit flip properties", brute_force, 0);
+                    hardnested_print_progress(num_acquired_nonces, "Apply bit flip properties", brute_force_depth, 0);
                 }
             } else {
                 update_nonce_data(true);
-                acquisition_completed = shrink_key_space(&brute_force);
-                hardnested_print_progress(num_acquired_nonces, "Apply bit flip properties", brute_force, 0);
+                acquisition_completed = shrink_key_space(&brute_force_depth);
+                hardnested_print_progress(num_acquired_nonces, "Apply bit flip properties", brute_force_depth, 0);
             }
         }
 
@@ -2293,8 +2292,8 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc
             }
             hardnested_stage = CHECK_1ST_BYTES | CHECK_2ND_BYTES;
             update_nonce_data(false);
-            float brute_force;
-            shrink_key_space(&brute_force);
+            float brute_force_depth;
+            shrink_key_space(&brute_force_depth);
         } else { // acquire nonces.
             uint16_t is_OK = acquire_nonces(blockNo, keyType, key, trgBlockNo, trgKeyType, nonce_file_write, slow, filename);
             if (is_OK != 0) {

From 648706d691702d1dcffa193eecd70852971ddf75 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 7 Apr 2019 20:13:30 +0200
Subject: [PATCH 1071/1938] shadowing

---
 client/cmdlf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdlf.c b/client/cmdlf.c
index 1ea81b6ed..1246b5f04 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -228,7 +228,7 @@ int CmdFlexdemod(const char *Cmd) {
     i = start;
     for (bit = 0; bit < 64; bit++) {
         sum = 0;
-        for (int j = 0; j < 16; j++) {
+        for (j = 0; j < 16; j++) {
             sum += data[i++];
         }
         bits[bit] = (sum > 0) ? 1 : 0;

From e95955b793baf67a1839ab1e26a5dec1a60b878c Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 7 Apr 2019 20:17:59 +0200
Subject: [PATCH 1072/1938] shadowing

---
 client/cmdlfem4x.c | 13 +++++--------
 client/cmdlfem4x.h |  1 -
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index b3e0c42dd..f68bf04b4 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -254,13 +254,11 @@ void printEM410x(uint32_t hi, uint64_t id) {
 
     PrintAndLogEx(SUCCESS, "EM410x %s pattern found", (hi) ? "XL" : "");
 
-    uint64_t iii = 1;
     uint64_t id2lo = 0;
-    uint32_t ii = 0;
-    uint32_t i = 0;
-    for (ii = 5; ii > 0; ii--) {
+    uint8_t m =, i = 0;
+    for (m = 5; m > 0; m--) {
         for (i = 0; i < 8; i++) {
-            id2lo = (id2lo << 1LL) | ((id & (iii << (i + ((ii - 1) * 8)))) >> (i + ((ii - 1) * 8)));
+            id2lo = (id2lo << 1LL) | ((id & (mi << (i + ((m - 1) * 8)))) >> (i + ((m - 1) * 8)));
         }
     }
 
@@ -299,10 +297,9 @@ void printEM410x(uint32_t hi, uint64_t id) {
 
         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;
+        for (int k = 0 ; k < 24; ++k, --j) {
+            arr[k] = (p1id >> k) & 1;
         }
 
         uint32_t p1  = 0;
diff --git a/client/cmdlfem4x.h b/client/cmdlfem4x.h
index 08670a4b3..383b9fa57 100644
--- a/client/cmdlfem4x.h
+++ b/client/cmdlfem4x.h
@@ -27,7 +27,6 @@
 
 int CmdLFEM4X(const char *Cmd);
 
-
 int CmdEM410xDemod(const char *Cmd);
 int CmdEM410xRead(const char *Cmd);
 int CmdEM410xSim(const char *Cmd);

From 8aa5dec805ac9b0fc9ca95913c80266891d7b38f Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 7 Apr 2019 20:21:14 +0200
Subject: [PATCH 1073/1938] styles

---
 client/cmdlfindala.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/client/cmdlfindala.c b/client/cmdlfindala.c
index b136d9434..257e85894 100644
--- a/client/cmdlfindala.c
+++ b/client/cmdlfindala.c
@@ -446,9 +446,8 @@ int CmdIndalaDemodAlt(const char *Cmd) {
     }
 
     // Checking UID against next occurrences
-    int failed = 0;
     for (; i + uidlen <= rawbit;) {
-        failed = 0;
+        int failed = 0;
         for (bit = 0; bit < uidlen; bit++) {
             if (bits[bit] != rawbits[i++]) {
                 failed = 1;
@@ -468,14 +467,13 @@ int CmdIndalaDemodAlt(const char *Cmd) {
     // since this changes graphbuffer data.
     GraphTraceLen = 32 * uidlen;
     i = 0;
-    int phase = 0;
+    int phase;
     for (bit = 0; bit < uidlen; bit++) {
         if (bits[bit] == 0) {
             phase = 0;
         } else {
             phase = 1;
         }
-        int j;
         for (j = 0; j < 32; j++) {
             GraphBuffer[i++] = phase;
             phase = !phase;

From f1a01dcc7bc161a74ba661d061555282a46ea34f Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 7 Apr 2019 20:22:24 +0200
Subject: [PATCH 1074/1938] fix

---
 client/cmdlfem4x.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index f68bf04b4..98b8f4c71 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -255,7 +255,7 @@ void printEM410x(uint32_t hi, uint64_t id) {
     PrintAndLogEx(SUCCESS, "EM410x %s pattern found", (hi) ? "XL" : "");
 
     uint64_t id2lo = 0;
-    uint8_t m =, i = 0;
+    uint8_t m, i = 0;
     for (m = 5; m > 0; m--) {
         for (i = 0; i < 8; i++) {
             id2lo = (id2lo << 1LL) | ((id & (mi << (i + ((m - 1) * 8)))) >> (i + ((m - 1) * 8)));

From 514611e88543c6d09eb8aaf29d6db641f40b5033 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 7 Apr 2019 20:24:13 +0200
Subject: [PATCH 1075/1938] fix

---
 client/cmdlfem4x.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 98b8f4c71..e9998269d 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -254,11 +254,12 @@ void printEM410x(uint32_t hi, uint64_t id) {
 
     PrintAndLogEx(SUCCESS, "EM410x %s pattern found", (hi) ? "XL" : "");
 
+    uint64_t n = 1;
     uint64_t id2lo = 0;
     uint8_t m, i = 0;
     for (m = 5; m > 0; m--) {
         for (i = 0; i < 8; i++) {
-            id2lo = (id2lo << 1LL) | ((id & (mi << (i + ((m - 1) * 8)))) >> (i + ((m - 1) * 8)));
+            id2lo = (id2lo << 1LL) | ((id & (n << (i + ((m - 1) * 8)))) >> (i + ((m - 1) * 8)));
         }
     }
 

From f6a80e0dc8b5e9fc1a4ede81d7d98d7e6ef35d6e Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 7 Apr 2019 20:34:42 +0200
Subject: [PATCH 1076/1938] funcArgNamesDifferent

---
 client/jansson/jansson.h         | 4 ++--
 client/jansson/jansson_private.h | 3 +--
 client/jansson/utf.h             | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/client/jansson/jansson.h b/client/jansson/jansson.h
index e282674f3..6f42d68c1 100644
--- a/client/jansson/jansson.h
+++ b/client/jansson/jansson.h
@@ -320,12 +320,12 @@ int json_path_set(json_t *json, const char *path, json_t *value, size_t flags, j
 
 typedef size_t (*json_load_callback_t)(void *buffer, size_t buflen, void *data);
 
-json_t *json_loads(const char *input, size_t flags, json_error_t *error) JANSSON_ATTRS(warn_unused_result);
+json_t *json_loads(const char *string, size_t flags, json_error_t *error) JANSSON_ATTRS(warn_unused_result);
 json_t *json_loadb(const char *buffer, size_t buflen, size_t flags, json_error_t *error) JANSSON_ATTRS(warn_unused_result);
 json_t *json_loadf(FILE *input, size_t flags, json_error_t *error) JANSSON_ATTRS(warn_unused_result);
 json_t *json_loadfd(int input, size_t flags, json_error_t *error) JANSSON_ATTRS(warn_unused_result);
 json_t *json_load_file(const char *path, size_t flags, json_error_t *error) JANSSON_ATTRS(warn_unused_result);
-json_t *json_load_callback(json_load_callback_t callback, void *data, size_t flags, json_error_t *error) JANSSON_ATTRS(warn_unused_result);
+json_t *json_load_callback(json_load_callback_t callback, void *arg, size_t flags, json_error_t *error) JANSSON_ATTRS(warn_unused_result);
 
 
 /* encoding */
diff --git a/client/jansson/jansson_private.h b/client/jansson/jansson_private.h
index 5957f70b2..094d79e75 100644
--- a/client/jansson/jansson_private.h
+++ b/client/jansson/jansson_private.h
@@ -84,12 +84,11 @@ void jsonp_error_vset(json_error_t *error, int line, int column,
 
 /* Locale independent string<->double conversions */
 int jsonp_strtod(strbuffer_t *strbuffer, double *out);
-int jsonp_dtostr(char *buffer, size_t size, double value, int prec);
+int jsonp_dtostr(char *buffer, size_t size, double value, int precision);
 
 /* Wrappers for custom memory functions */
 void *jsonp_malloc(size_t size) JANSSON_ATTRS(warn_unused_result);
 void jsonp_free(void *ptr);
-char *jsonp_strndup(const char *str, size_t length) JANSSON_ATTRS(warn_unused_result);
 char *jsonp_strdup(const char *str) JANSSON_ATTRS(warn_unused_result);
 char *jsonp_strndup(const char *str, size_t len) JANSSON_ATTRS(warn_unused_result);
 
diff --git a/client/jansson/utf.h b/client/jansson/utf.h
index e182df78f..0ca69253e 100644
--- a/client/jansson/utf.h
+++ b/client/jansson/utf.h
@@ -20,7 +20,7 @@ int utf8_encode(int32_t codepoint, char *buffer, size_t *size);
 
 size_t utf8_check_first(char byte);
 size_t utf8_check_full(const char *buffer, size_t size, int32_t *codepoint);
-const char *utf8_iterate(const char *buffer, size_t size, int32_t *codepoint);
+const char *utf8_iterate(const char *buffer, size_t bufsize, int32_t *codepoint);
 
 int utf8_check_string(const char *string, size_t length);
 

From e3a82cd8491ed4e426eb36237b0ab5bd051934b4 Mon Sep 17 00:00:00 2001
From: Chrissy Morgan <43700993+5w0rdfish@users.noreply.github.com>
Date: Sun, 7 Apr 2019 23:38:00 +0100
Subject: [PATCH 1077/1938] Restructure of RRG repo

Added installtion videos.
Re-wrote installtion instructions
---
 .../Arch-Linux-Installation-Instructions.md   |  60 ++++
 .../Coverity-Scan-Config-&-Run.md             |  24 ++
 ...OS-X-Homebrew-Installation-Instructions.md |  29 ++
 .../Parrot-OS-Proxmark3-RDV4-installation.md  |  98 +++++
 .../Ubuntu-Installation-Instructions.md       | 102 ++++++
 .../Windows-Installation-Instructions.md      |  83 +++++
 README.md                                     | 334 ++----------------
 Use_of_Proxmark/1_Validation.md               |  57 +++
 .../2_Configuration-and-Verification.md       |  38 ++
 Use_of_Proxmark/3_Commands-and-Features.md    |  21 ++
 prox.png                                      | Bin 0 -> 234632 bytes
 11 files changed, 551 insertions(+), 295 deletions(-)
 create mode 100644 Installation_Instructions/Arch-Linux-Installation-Instructions.md
 create mode 100644 Installation_Instructions/Coverity-Scan-Config-&-Run.md
 create mode 100644 Installation_Instructions/Mac-OS-X-Homebrew-Installation-Instructions.md
 create mode 100644 Installation_Instructions/Parrot-OS-Proxmark3-RDV4-installation.md
 create mode 100644 Installation_Instructions/Ubuntu-Installation-Instructions.md
 create mode 100644 Installation_Instructions/Windows-Installation-Instructions.md
 create mode 100644 Use_of_Proxmark/1_Validation.md
 create mode 100644 Use_of_Proxmark/2_Configuration-and-Verification.md
 create mode 100644 Use_of_Proxmark/3_Commands-and-Features.md
 create mode 100644 prox.png

diff --git a/Installation_Instructions/Arch-Linux-Installation-Instructions.md b/Installation_Instructions/Arch-Linux-Installation-Instructions.md
new file mode 100644
index 000000000..28245dbfa
--- /dev/null
+++ b/Installation_Instructions/Arch-Linux-Installation-Instructions.md
@@ -0,0 +1,60 @@
+# Setup and build for ArchLinux
+
+## Notes
+
+Kali and ArchLinux users usually must kill their modem manager in order for the proxmark3 to enumerate properly.   
+`sudo apt remove modemmanager`
+
+## Manual Installation
+Run
+```sh
+sudo pacman -Sy base-devel p7zip libusb readline ncurses arm-none-eabi-newlib --needed
+```
+```sh 
+yaourt -S termcap
+```
+
+```sh
+sudo apt remove modemmanager
+```
+or 
+```sh
+systemctl stop ModemManager
+systemctl disable ModemManager
+```
+
+Clone fork
+```sh
+git clone https://github.com/RfidResearchGroup/proxmark3.git
+```
+
+Get the latest commits
+```sh
+git pull
+```
+
+Install the blacklist rules and  add user to dialout group (if you on a Linux/ubuntu/debian). 
+If you do this one, you need to logout and login in again to make sure your rights got changed.
+```sh
+make udev
+```
+
+Clean and complete compilation
+```sh
+make clean && make all
+```
+	
+Flash the BOOTROM & FULLIMAGE
+```sh
+client/flasher /dev/ttyACM0 -b bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf
+```
+	
+Change into the client folder
+```sh
+cd client
+```
+	
+Run the client
+```sh 
+./proxmark3 /dev/ttyACM0
+```
diff --git a/Installation_Instructions/Coverity-Scan-Config-&-Run.md b/Installation_Instructions/Coverity-Scan-Config-&-Run.md
new file mode 100644
index 000000000..9979c41e1
--- /dev/null
+++ b/Installation_Instructions/Coverity-Scan-Config-&-Run.md
@@ -0,0 +1,24 @@
+
+## Coverity Scan Config & Run
+Download the Coverity Scan Self-buld and install it.
+You will need to configure  ARM-NON-EABI- Compiler for it to use:
+
+ Configure
+
+```sh
+cov-configure --comptype gcc --compiler  /opt/devkitpro/devkitARM/bin/arm-none-eabi-gcc
+```
+
+Run it (I'm running on Ubuntu)
+
+```sh
+cov-build --dir cov-int make all
+```
+
+Make a tarball
+
+```sh
+tar czvf proxmark3.tgz cov-int
+```
+
+Upload it to coverity.com
diff --git a/Installation_Instructions/Mac-OS-X-Homebrew-Installation-Instructions.md b/Installation_Instructions/Mac-OS-X-Homebrew-Installation-Instructions.md
new file mode 100644
index 000000000..61ab754d5
--- /dev/null
+++ b/Installation_Instructions/Mac-OS-X-Homebrew-Installation-Instructions.md
@@ -0,0 +1,29 @@
+## Homebrew (Mac OS X)
+These instructions comes from @Chrisfu, where I got the proxmark3.rb scriptfile from.
+Further questions about Mac & Homebrew,  contact @Chrisfu  (https://github.com/chrisfu/)
+
+1. Install homebrew if you haven't yet already done so: http://brew.sh/
+
+2. Tap this repo: `brew tap RfidResearchGroup/proxmark3`
+
+3. Install Proxmark3: `brew install proxmark3` for stable release or `brew install --HEAD proxmark3` for latest non-stable from GitHub.
+
+Upgrading HomeBrew tap formula
+-----------------------------
+*This method is useful for those looking to run bleeding-edge versions of iceman's client. Keep this in mind when attempting to update your HomeBrew tap formula as this procedure could easily cause a build to break if an update is unstable on macOS.* 
+
+Tested on macOS High Sierra 10.13.2
+
+*Note: This assumes you have already installed iceman's fork from HomeBrew as mentioned above*
+
+1. Force HomeBrew to pull the latest source from github
+`brew upgrade --fetch-HEAD RfidResearchGroup/proxmark3`
+ 
+2. Flash the bootloader & fullimage.elf
+  * With your Proxmark3 unplugged from your machine, press and hold the button on your Proxmark 3 as you plug it into a USB port. Continue to hold the button until after this step is complete and the `proxmark3-flasher` command outputs "Have a nice day!"*
+   `$ sudo proxmark3-flasher /dev/tty.usbmodem881 -b /usr/local/Cellar/proxmark3/HEAD-6a710ef/share/firmware/bootrom.elf /usr/local/Cellar/proxmark3/HEAD-6a710ef/share/firmware/fullimage.elf`
+
+
+`$ sudo proxmark3-flasher /dev/tty.usbmodem881 `
+
+4. Enjoy the update
diff --git a/Installation_Instructions/Parrot-OS-Proxmark3-RDV4-installation.md b/Installation_Instructions/Parrot-OS-Proxmark3-RDV4-installation.md
new file mode 100644
index 000000000..7b6187e1a
--- /dev/null
+++ b/Installation_Instructions/Parrot-OS-Proxmark3-RDV4-installation.md
@@ -0,0 +1,98 @@
+
+# Parrot OS Installation
+
+## Notes
+
+Some further notes can be found at @5w0rdfish repo [Proxmark Installation for Parrot OS](https://github.com/5w0rdfish/Proxmark3-RDV4-ParrotOS)
+
+# Video Installation guide
+[![ParrotOS Installation tutorial](https://github.com/5w0rdfish/Proxmark3-RDV4-ParrotOS/blob/master/screenshot-www.youtube.com-2019.03.17-20-44-33.png)](https://youtu.be/Wl9AsrU4igo "ParrotOS Installation Tutorial")
+
+
+---
+## Manual Install
+First what we want to do is get an update for the system. If you need to upgrade do this **before** the install
+
+### Update
+```sh
+sudo apt-get update
+``` 
+### Requirements.
+
+```sh
+sudo apt-get install p7zip git build-essential libreadline5 libreadline-dev \
+libusb-0.1-4 libusb-dev libqt4-dev perl pkg-config wget libncurses5-dev gcc-arm-none-eabi
+```
+If you do get any issues during the requirements installation, I have found it to help using the synaptic package manager. 
+
+### Clone Fork 
+```sh
+git clone https://github.com/RfidResearchGroup/proxmark3.git
+```
+
+### Change directory into the directory created
+```sh
+cd proxmark3
+```
+
+### Get the latest commits
+```sh
+git pull
+```
+
+### Make Udev
+Iceman has made the udev script which takes care of the blacklist rules. This should take care of the remove modem manager.
+The make udev command also create's an alias for the pm3 under /dev which you will use to connect to the proxmark. 
+
+```sh
+sudo make udev
+```
+
+> **Note**  If you have any issues connecting or during the flash, follow the steps listed [here](https://github.com/RfidResearchGroup/proxmark3/issues/35) and use the command sudo apt remove modemmanager 
+
+Log out and log back in again. And now we are all set to take the next step. 
+
+### Clean and Compile
+Clean and complete compilation *within the proxmark3 folder*
+
+```sh
+ make clean && make all
+```
+### Check Connection
+Once this is complete run the following comands to make sure the proxmark is being picked up by your computer. 
+
+```sh
+sudo dmesg | grep -i usb
+```
+It should show up as a CDC device:
+```sh
+[10416.555108] usb 2-1.2: Product: PM3
+[10416.555111] usb 2-1.2: Manufacturer: proxmark.org
+[10416.555871] cdc_acm 2-1.2:1.0: ttyACM0: USB ACM device
+```
+
+### Flash the BOOTROM & FULLIMAGE
+ ```sh
+ client/flasher /dev/ttyACM0 -b bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf
+```
+### Change into the client folder
+
+```sh
+cd client
+```
+### Run the client
+ ``` sh 
+./proxmark3 /dev/pm #press tab on the keyboard for it to detect the proxmark
+```
+or  
+
+### Run the client 
+ ```sh
+./proxmark3 /dev/ttyACM0
+```
+ 
+### Run a test command
+ ```sh
+hw tune
+```
+
diff --git a/Installation_Instructions/Ubuntu-Installation-Instructions.md b/Installation_Instructions/Ubuntu-Installation-Instructions.md
new file mode 100644
index 000000000..6df3b704e
--- /dev/null
+++ b/Installation_Instructions/Ubuntu-Installation-Instructions.md
@@ -0,0 +1,102 @@
+# Setup and build for UBUNTU
+## Notes
+GC made updates to allow this to build easily on Ubuntu 14.04.2 LTS, 15.10 or 16.04
+See the [Proxmark3 Ubuntu wiki page](https://github.com/Proxmark/proxmark3/wiki/Ubuntu%20Linux)
+
+A nice and cool install script made by @daveio is found here: 
+https://github.com/daveio/attacksurface/blob/master/proxmark3/pm3-setup.sh
+
+Iceman has also added this script to the fork.
+https://github.com/RfidResearchGroup/proxmark3/blob/master/install.sh
+
+# Video Installation guide
+[![ParrotOS Installation tutorial](https://github.com/5w0rdfish/Proxmark3-RDV4-ParrotOS/blob/master/screenshot-www.youtube.com-2019.03.17-20-44-33.png)](https://youtu.be/DThmkH8CdMo "Ubuntu Installation Tutorial")
+
+---
+## Manual Installation
+### Update
+
+```sh
+sudo apt-get update
+```
+### Requirements
+
+```sh
+sudo apt-get install p7zip git build-essential libreadline5 libreadline-dev libusb-0.1-4 libusb-dev libqt4-dev perl pkg-config wget libncurses5-dev gcc-arm-none-eabi
+```
+
+### Clone Fork 
+
+```sh
+git clone https://github.com/RfidResearchGroup/proxmark3.git
+```
+### Change Directory
+
+```sh
+cd proxmark3
+```
+
+### Get the latest commits
+
+```sh
+git pull
+```
+
+### Install the blacklist rules and add user to dialout group. 
+
+```sh
+sudo make udev
+```
+
+### Restart
+Restart Ubuntu
+
+### Enter proxmark folder
+```sh
+cd proxmark3
+```
+### Clean and Compile
+```sh
+make clean && make all
+```
+### Check Connection
+Once this is complete run the following comands to make sure the proxmark is being picked up by your computer. 
+
+```sh
+sudo dmesg | grep -i usb
+```
+
+### Flash the BOOTROM & FULLIMAGE
+ ```sh
+ client/flasher /dev/ttyACM0 -b bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf
+```
+
+### Issues 
+If you have issues with the install please try the following below or head on over to the proxmark forum.
+#### Remove Modem Manager
+
+```sh
+sudo apt remove modemmanager
+```
+and then restart ubuntu.
+
+### Change into the client folder
+```sh
+cd client
+```
+	
+### Run the client
+ ``` sh 
+./proxmark3 /dev/pm #press tab on the keyboard for it to detect the proxmark
+```
+or  
+
+### Run the client 
+ ```sh
+./proxmark3 /dev/ttyACM0
+```
+ 
+### Run a test command
+ ```sh
+hw tune
+```
diff --git a/Installation_Instructions/Windows-Installation-Instructions.md b/Installation_Instructions/Windows-Installation-Instructions.md
new file mode 100644
index 000000000..6a20a510f
--- /dev/null
+++ b/Installation_Instructions/Windows-Installation-Instructions.md
@@ -0,0 +1,83 @@
+# Building on Windows
+You will need to use the Gator96100 Proxspace package to assist in your windows installation.
+This can be downloaded from https://github.com/Gator96100/ProxSpace/
+
+## Notes
+If you receive gcc errors using v3.1 during build, download and use v2.2. This may help resolve the issue.
+
+- https://github.com/Gator96100/ProxSpace/releases/tag/v3.1   (release v3.1 with gcc v7.3.0 )
+- https://github.com/Gator96100/ProxSpace/releases/tag/v2.2   (release v2.2 with gcc v5.3.0 arm-none-eabi-gcc v7.1.0)
+
+---
+# Video Installation guide
+[![Windows Installation tutorial](https://github.com/5w0rdfish/Proxmark3-RDV4-ParrotOS/blob/master/screenshot-www.youtube.com-2019.03.17-20-44-33.png)](https://youtu.be/zzF0NCMJnYU "Windows Installation Tutorial")
+
+## Manual Installation
+
+### Driver Installation
+
+Install required drivers for your windows installation. You will may need admin privileges to do this. 
+(This is covered in the video) Step by step guides are online such as [RiscCorps](https://store.ryscc.com/blogs/news/how-to-install-a-proxmark3-driver-on-windows-10)
+
+### Install Github
+
+Install Github for Windows https://desktop.github.com/
+
+### Download / clone Proxspace repo
+
+Download the required proxspace repo. https://github.com/Gator96100/ProxSpace/
+
+Extract 'ProxSpace' to a location on drive without spaces. 
+For example D:\OneDrive\Documents\GitHub is ok whereas C:\My Documents\My Projects\proxspace is not.
+
+### Clone RFID RESEARCH GROUP files
+
+Clone fork
+```sh
+git clone https://github.com/RfidResearchGroup/proxmark3.git
+```
+### Copy files to Proxspace
+
+Copy all the contents from the proxmark3 folder into the proxspace pm3 folder
+
+### Run the .bat
+
+Run runme.bat or runme64.bat depending on your Windows architecture.
+
+Please note you will need to use / as you are using BASH.
+
+### Make 
+
+CLEAN COMPILE inside the pm3 window.
+```sh
+make clean && make all
+```
+### Flash the image
+
+Flash the BOOTROM & FULLIMAGE
+```sh
+client/flasher.exe comX -b bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf
+```
+	
+### Run the client
+
+Assuming you have Proxmark3 Windows drivers installed you can run the Proxmark software where "X" is the com port number assigned to proxmark3 under Windows. 
+
+Change into the client folder
+```sh
+cd client
+```
+
+Run the client	
+```sh
+./proxmark3.exe comX
+```
+
+### Test
+
+Check your firmware revision on the Proxmark III with 
+```sh
+hw ver
+```
+For basic help type help. Or for help on a set of sub commands type the command followed by help. For example hf mf help.
+Make sure you head over to the use of [proxmark area](https://github.com/5w0rdfish/proxmark3/tree/master/Use_of_Proxmark) to help you get on your way!
diff --git a/README.md b/README.md
index cfdbacc61..47192cb43 100644
--- a/README.md
+++ b/README.md
@@ -1,71 +1,33 @@
-Proxmark3 RDV40 dedicated repo,  based on iceman fork
+Proxmark3 RDV4.0 Dedicated Github
 ===============
+This repo is based on iceman fork for proxmark3. It is dedicated to bringing the most out of the new features for proxmark3 RDV4.0 new hardware and design.
+
 [![Latest release](https://img.shields.io/github/release/RfidResearchGroup/proxmark3.svg)](https://github.com/RfidResearchGroup/proxmark3/releases/latest)
 
-## Notice      
-This repo is based on iceman fork for proxmark3. It is dedicated to bring the most out of the new features for proxmark3 RDV40 device.
+<a href="http://www.youtube.com/watch?feature=player_embedded&v=uyJ-y0kSWfc
+" target="_blank"><img src="https://github.com/5w0rdfish/proxmark3/blob/master/prox.png" 
+alt="Yuotube" width="100%" height="auto" border="10" /></a>
 
-# Donations
-Nothing says thank you as much as a donation,  https://www.patreon.com/iceman1001
+---
 
-## ToC
-
-- Coverity Scan Config & Run
-- Whats changed?
-- Why didn't you based it on offical PM3 Master?
-- Why don't you add this or that functionality?	
-- PM3 GUI
-- Development
-- KALI and ARCHLINUX users
-- Setup and build for UBUNTU
-- Setup and build for ArchLinux
-- Homebrew (Mac OS X)
-- Upgrading HomeBrew tap formula
-- Building on Windows
-- Gator96100 distro
-- Build and run
-- Validating proxmark client functionality
-- Run the following commands
-- Quit client
-- First things on your RDV40
-- Verify sim module firmware version
-
-- The end
-
-## Coverity Scan Config & Run
-Download the Coverity Scan Self-buld and install it.
-You will need to configure  ARM-NON-EABI- Compiler for it to use:
-
-- Configure
-
-`cov-configure --comptype gcc --compiler  /opt/devkitpro/devkitARM/bin/arm-none-eabi-gcc`
-
-- Run it (I'm running on Ubuntu)
-
-`cov-build --dir cov-int make all`
-
-- Make a tarball
-
-`tar czvf proxmark3.tgz cov-int`
-
-- Upload it to coverity.com
+# PROXMARK INSTALLATION AND OVERVIEW
 
 
+| FAQ's & Updates     | Installation        | Use of the Proxmark |
+| ------------- |:-------------:| -----:|
+|[Whats changed?](#whats-changed)  | [Setup and build for ArchLinux](/Installation_Instructions/Arch-Linux-Installation-Instructions.md) | [Validating proxmark client functionality](/Use_of_Proxmark/1_Validation.md)|
+|[Development](#development) | [Setup and build for UBUNTU](/Installation_Instructions/Ubuntu-Installation-Instructions.md)  | [First Use and Verification](/Use_of_Proxmark/2_Configuration-and-Verification.md) |
+| [Why don't you add this or that functionality?](#why-dont-you-add-this-or-that-functionality)  | [Homebrew (Mac OS X) & Upgrading HomeBrew Tap Forumula](/Installation_Instructions/Mac-OS-X-Homebrew-Installation-Instructions.md) | [Commands & Features](/Use_of_Proxmark/3_Commands-and-Features.md)|
+|[Why didn't you based it on offical PM3 Master?](#why-didnt-you-based-it-on-offical-pm3-master) |[ParrotOS Installation ](/Installation_Instructions/Parrot-OS-Proxmark3-RDV4-installation.md)|[PM3 GUI](#pm3-gui)
+|[Notices](#notices)|[Setup and build for Windows](/Installation_Instructions/Windows-Installation-Instructions.md)||
+|[Issues](#issues)|[Coverity Scan Config & Run](/Installation_Instructions/Coverity-Scan-Config-%26-Run.md)||
+|||
+
+---
 ## Whats changed?
 	* added flash memory 256kb.
 	* added smart card module
 	* added FPC connector
-	
----	
-## Why didn't you based it on offical PM3 Master?
-The separation from offical pm3 repo gives us very much freedom to create a firmware/client that suits the RDV40 features. We don't want to mess up the offical pm3 repo with RDV40 specific code.
-
-## Why don't you add this or that functionality?
-Give us a hint, and we'll see if we can't merge in the stuff you have. 
-	
-## PM3 GUI
-The official PM3-GUI from Gaucho will not work.
-The new universial GUI will work. [Proxmark3 Univerisal GUI](https://github.com/burma69/PM3UniversalGUI) 
 
 ## Development
 This fork now compiles just fine on 
@@ -75,248 +37,30 @@ This fork now compiles just fine on
    - ParrotOS
    - WSL (Windows subsystem linux) on Windows 10
    - Docker container
+---	
+## Why didn't you based it on offical PM3 Master?
+The separation from offical pm3 repo gives us very much freedom to create a firmware/client that suits the RDV40 features. We don't want to mess up the offical pm3 repo with RDV40 specific code.
 
-## KALI and ARCHLINUX users
+## Why don't you add this or that functionality?
+Give us a hint, and we'll see if we can't merge in the stuff you have. 
+	
+## PM3 GUI
+The official PM3-GUI from Gaucho will not work.
+The new universial GUI will work. [Proxmark3 Universal GUI](https://github.com/burma69/PM3UniversalGUI) 
+
+## Notices
 Kali and ArchLinux users usually must kill their modem manager in order for the proxmark3 to enumerate properly.   
-```sh
-sudo apt remove modemmanager
-```
-or 
-```sh
-systemctl stop ModemManager
-systemctl disable ModemManager
-```
-
-## Setup and build for UBUNTU
-GC made updates to allow this to build easily on Ubuntu 14.04.2 LTS, 15.10 or 16.04
-See https://github.com/Proxmark/proxmark3/wiki/Ubuntu%20Linux
-
-A nice and cool install script made by @daveio is found here: 
-https://github.com/daveio/attacksurface/blob/master/proxmark3/pm3-setup.sh
-I have also added this script to the fork.
-https://github.com/RfidResearchGroup/proxmark3/blob/master/install.sh
-
-- Run
-`sudo apt-get install p7zip git build-essential libreadline5 libreadline-dev libusb-0.1-4 libusb-dev libqt4-dev perl pkg-config wget libncurses5-dev gcc-arm-none-eabi`
-
-- Clone fork
-`git clone https://github.com/RfidResearchGroup/proxmark3.git`
-
-- Get the latest commits
-`git pull`
-
-- Install the blacklist rules and  add user to dialout group (if you on a Linux/ubuntu/debian). If you do this one, you need to logout and login in again to make sure your rights got changed.
-`make udev`
-
-- Clean and complete compilation
-`make clean && make all`
-	
-- Flash the BOOTROM & FULLIMAGE
-`client/flasher /dev/ttyACM0 -b bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf`
-	
-- Change into the client folder
-`cd client`
-	
-- Run the client
-`./proxmark3 /dev/ttyACM0`
-
-## Setup and build for ArchLinux
-- Run
-`sudo pacman -Sy base-devel p7zip libusb readline ncurses arm-none-eabi-newlib --needed`
-`yaourt -S termcap`
-
-- Remove modemmanager
 `sudo apt remove modemmanager`
+		   
+## Issues
+Please see the [Proxmark Forum](http://www.proxmark.org/forum/index.php) and see if your issue is listed in the first instance google is your friend :) Questions will be answered via the forum by Iceman and the team. 
 
-- Clone fork
-`git clone https://github.com/RfidResearchGroup/proxmark3.git`
+## The end
 
-- Get the latest commits
-`git pull`
+[@herrmann1001](https://mobile.twitter.com/herrmann1001) at host iuse.se
+July 2018, Sweden
+updated Feb 2019 [@5w0rdfish](https://mobile.twitter.com/5w0rdFish)
 
-- Install the blacklist rules and  add user to dialout group (if you on a Linux/ubuntu/debian). If you do this one, you need to logout and login in again to make sure your rights got changed.
-`make udev`
+# Donations
+Nothing says thank you as much as a donation,  https://www.patreon.com/iceman1001
 
-- Clean and complete compilation
-`make clean && make all`
-	
-- Flash the BOOTROM & FULLIMAGE
-`client/flasher /dev/ttyACM0 -b bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf`
-	
-- Change into the client folder
-`cd client`
-	
-- Run the client
-`./proxmark3 /dev/ttyACM0`
-						   
-## Homebrew (Mac OS X)
-These instructions comes from @Chrisfu, where I got the proxmark3.rb scriptfile from.
-Further questions about Mac & Homebrew,  contact @Chrisfu  (https://github.com/chrisfu/)
-
-1. Install homebrew if you haven't yet already done so: http://brew.sh/
-
-2. Tap this repo: `brew tap RfidResearchGroup/proxmark3`
-
-3. Install Proxmark3: `brew install proxmark3` for stable release or `brew install --HEAD proxmark3` for latest non-stable from GitHub.
-
-Upgrading HomeBrew tap formula
------------------------------
-*This method is useful for those looking to run bleeding-edge versions of iceman's client. Keep this in mind when attempting to update your HomeBrew tap formula as this procedure could easily cause a build to break if an update is unstable on macOS.* 
-
-Tested on macOS High Sierra 10.13.2
-
-*Note: This assumes you have already installed iceman's fork from HomeBrew as mentioned above*
-
-1. Force HomeBrew to pull the latest source from github
-`brew upgrade --fetch-HEAD RfidResearchGroup/proxmark3`
- 
-2. Flash the bootloader & fullimage.elf
-  * With your Proxmark3 unplugged from your machine, press and hold the button on your Proxmark 3 as you plug it into a USB port. Continue to hold the button until after this step is complete and the `proxmark3-flasher` command outputs "Have a nice day!"*
-   `$ sudo proxmark3-flasher /dev/tty.usbmodem881 -b /usr/local/Cellar/proxmark3/HEAD-6a710ef/share/firmware/bootrom.elf /usr/local/Cellar/proxmark3/HEAD-6a710ef/share/firmware/fullimage.elf`
-
-
-`$ sudo proxmark3-flasher /dev/tty.usbmodem881 `
-
-4. Enjoy the update
-
-
-## Building on Windows
-
-### Gator96100 distro
-Rather than download and install every one of these packages, a new ProxSpace 
-environment archive file will be made available for download on the project
-page at @Gator96100's repo
-
-Afterwards just clone the iceman repo or download someone elses.
-Read instructions on @Gator96100 repo page. (https://github.com/Gator96100/ProxSpace/)
-
-Links
-- https://github.com/Gator96100/ProxSpace/releases/tag/v3.1   (release v3.1 with gcc v7.3.0 )
-- https://github.com/Gator96100/ProxSpace/releases/tag/v2.2   (release v2.2 with gcc v5.3.0 arm-none-eabi-gcc v7.1.0)
-
-
-### Build and run
-
-- Clone fork
-`git clone https://github.com/RfidResearchGroup/proxmark3.git`
-
-- Get the latest commits	
-`git pull`
-
-- CLEAN COMPILE
-`make clean && make all`
-
-Assuming you have Proxmark3 Windows drivers installed you can run the Proxmark software where "X" is the com port number assigned to proxmark3 under Windows. 
-	
-- Flash the BOOTROM & FULLIMAGE
-`client/flasher.exe comX -b bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf`
-	
-- Change into the client folder
-`cd client`
-	
-- Run the client	
-`proxmark3.exe comX`
-
-
-## Validating proxmark client functionality
-
-If all went well you should get some information about the firmware and memory usage as well as the prompt,  something like this.
-
->[=] UART Setting serial baudrate 460800
->
->Proxmark3 RFID instrument
->
-> [ CLIENT ]
->
-> client: iceman build for RDV40 with flashmem; smartcard;
->
-> [ ARM ]
->
-> bootrom: iceman/master/4517531c-dirty-unclean 2018-12-13 15:42:24
->
->   os: iceman/master/5a34550a-dirty-unclean 2019-01-07 23:04:07
->
-> [ FPGA ]
->
-> LF image built for 2s30vq100 on 2018/ 9/ 8 at 13:57:51
->
-> HF image built for 2s30vq100 on 2018/ 9/ 3 at 21:40:23
->
-> [ Hardware ]
->
->--= uC: AT91SAM7S512 Rev B
->
->--= Embedded Processor: ARM7TDMI
->
->--= Nonvolatile Program Memory Size: 512K bytes, Used: 247065 bytes (47%) Free: 277223 bytes (53%)
->
->--= Second Nonvolatile Program Memory Size: None
->
->--= Internal SRAM Size: 64K bytes
->
->--= Architecture Identifier: AT91SAM7Sxx Series
->
->--= Nonvolatile Program Memory Type: Embedded Flash Memory
->
-> pm3 -->
-
-### Run the following commands
-    pm3 --> hw status
-    pm3 --> hw version
-    pm3 --> hw tune
-
-You are now ready to use your newly upgraded proxmark3 device.  Many commands uses the **h** parameter to show a help text. The client uses a arcaic command structure which will be hard to grasp at first.  Here are some commands to start off with.
-
-    pm3 --> hf
-    pm3 --> hf 14a info
-    pm3 --> lf
-    pm3 --> lf search
-
-### Quit client
-    pm3 --> quit
-
-
-### First things on your RDV40
-You will need to run these commands to make sure your rdv4 is prepared
-
-    pm3 --> mem load f default_keys m
-    pm3 --> mem load f default_pwd t
-    pm3 --> mem load f default_iclass_keys i
-    pm3 --> lf t55xx deviceconfig a 29 b 17 c 15 d 47 e 15 p
-
-### Verify sim module firmware version
-To make sure you got the latest sim module firmware.
-_Lastest version is v3.11_
-
-    pm3 --> hw status
-
-Find version in the long output,  look for these two lines
-
-    #db# Smart card module (ISO 7816)
-    #db#   version.................v2.06
-
-This version is obselete. The following command upgrades your device sim module firmware.
-Don't not turn of your device during the execution of this command.
-
-    pm3 --> sc upgrade f ../tools/simmodule/SIM011.BIN 
-    
-You get the following output,  this is a successful execution.    
-    
-    [!] WARNING - Smartcard socket firmware upgrade.          
-    [!] A dangerous command, do wrong and you will brick the smart card socket          
-    [+] Smartcard socket firmware uploading to PM3          
-    ..
-    [+] Smartcard socket firmware updating,  don't turn off your PM3!          
-    #db# FW 0000          
-    #db# FW 0080          
-    #db# FW 0100          
-    #db# FW 0180          
-    #db# FW 0200          
-    #db# FW 0280          
-    [+] Smartcard socket firmware upgraded successful        
-    
-
-## the end
-
-`iceman at host iuse.se`
-`July 2018, Sweden`
diff --git a/Use_of_Proxmark/1_Validation.md b/Use_of_Proxmark/1_Validation.md
new file mode 100644
index 000000000..334150fe8
--- /dev/null
+++ b/Use_of_Proxmark/1_Validation.md
@@ -0,0 +1,57 @@
+## 1. Validating proxmark client functionality
+
+If all went well you should get some information about the firmware and memory usage as well as the prompt,  something like this.
+We should be able to answer ..can I connect to my proxmark device?   does it respond?
+
+>[=] UART Setting serial baudrate 460800
+>
+>Proxmark3 RFID instrument
+>
+> [ CLIENT ]
+>
+> client: iceman build for RDV40 with flashmem; smartcard;
+>
+> [ ARM ]
+>
+> bootrom: iceman/master/4517531c-dirty-unclean 2018-12-13 15:42:24
+>
+>   os: iceman/master/5a34550a-dirty-unclean 2019-01-07 23:04:07
+>
+> [ FPGA ]
+>
+> LF image built for 2s30vq100 on 2018/ 9/ 8 at 13:57:51
+>
+> HF image built for 2s30vq100 on 2018/ 9/ 3 at 21:40:23
+>
+> [ Hardware ]
+>
+>--= uC: AT91SAM7S512 Rev B
+>
+>--= Embedded Processor: ARM7TDMI
+>
+>--= Nonvolatile Program Memory Size: 512K bytes, Used: 247065 bytes (47%) Free: 277223 bytes (53%)
+>
+>--= Second Nonvolatile Program Memory Size: None
+>
+>--= Internal SRAM Size: 64K bytes
+>
+>--= Architecture Identifier: AT91SAM7Sxx Series
+>
+>--= Nonvolatile Program Memory Type: Embedded Flash Memory
+>
+> pm3 -->
+
+### Run the following commands
+    pm3 --> hw status
+    pm3 --> hw version
+    pm3 --> hw tune
+
+You are now ready to use your newly upgraded proxmark3 device.  Many commands uses the **h** parameter to show a help text. The client uses a arcaic command structure which will be hard to grasp at first.  Here are some commands to start off with.
+
+    pm3 --> hf
+    pm3 --> hf 14a info
+    pm3 --> lf
+    pm3 --> lf search
+
+### Quit client
+    pm3 --> quit
diff --git a/Use_of_Proxmark/2_Configuration-and-Verification.md b/Use_of_Proxmark/2_Configuration-and-Verification.md
new file mode 100644
index 000000000..e226652c6
--- /dev/null
+++ b/Use_of_Proxmark/2_Configuration-and-Verification.md
@@ -0,0 +1,38 @@
+### First things on your RDV40
+You will need to run these commands to make sure your rdv4 is prepared
+
+    pm3 --> mem load f default_keys m
+    pm3 --> mem load f default_pwd t
+    pm3 --> mem load f default_iclass_keys i
+    pm3 --> lf t55xx deviceconfig a 29 b 17 c 15 d 47 e 15 p
+
+### Verify sim module firmware version
+To make sure you got the latest sim module firmware.
+_Lastest version is v3.11_
+
+    pm3 --> hw status
+
+Find version in the long output,  look for these two lines
+
+    #db# Smart card module (ISO 7816)
+    #db#   version.................v2.06
+
+This version is obselete. The following command upgrades your device sim module firmware.
+Don't not turn of your device during the execution of this command.
+
+    pm3 --> sc upgrade f ../tools/simmodule/SIM011.BIN 
+    
+You get the following output,  this is a successful execution.    
+    
+    [!] WARNING - Smartcard socket firmware upgrade.          
+    [!] A dangerous command, do wrong and you will brick the smart card socket          
+    [+] Smartcard socket firmware uploading to PM3          
+    ..
+    [+] Smartcard socket firmware updating,  don't turn off your PM3!          
+    #db# FW 0000          
+    #db# FW 0080          
+    #db# FW 0100          
+    #db# FW 0180          
+    #db# FW 0200          
+    #db# FW 0280          
+    [+] Smartcard socket firmware upgraded successful        
diff --git a/Use_of_Proxmark/3_Commands-and-Features.md b/Use_of_Proxmark/3_Commands-and-Features.md
new file mode 100644
index 000000000..ecc9aae0f
--- /dev/null
+++ b/Use_of_Proxmark/3_Commands-and-Features.md
@@ -0,0 +1,21 @@
+
+# Commands and Features
+
+## New Features in RDV4
+
+Further details coming soon
+
+### Run the following commands
+    pm3 --> hw status
+    pm3 --> hw version
+    pm3 --> hw tune
+
+You are now ready to use your newly upgraded proxmark3 device.  Many commands uses the **h** parameter to show a help text. The client uses a arcaic command structure which will be hard to grasp at first.  Here are some commands to start off with.
+
+    pm3 --> hf
+    pm3 --> hf 14a info
+    pm3 --> lf
+    pm3 --> lf search
+
+### Quit client
+    pm3 --> quit
diff --git a/prox.png b/prox.png
new file mode 100644
index 0000000000000000000000000000000000000000..1fce7e315c7200139777e7a26bc322fb9d082ebc
GIT binary patch
literal 234632
zcmV)KK)Sz)P)<h;3K|Lk000e1NJLTq00U|O00C$S1^@s6CVU7f000{(dQ@0+Qek%>
zaB^>EX>4U6ba`-PAZ2)IW&i+q+O3;uk|Z~Bh5zFeIs)9W9|x<MZlL4qd(p+_kTa4@
zGF7p=va=#15Wc*{5e)Y~{{4l2<EwhjA(z(cs5SDHM;<<T(c`bLUq3D8@9*!c&X|7Q
z{mc8I_Mex|PaTqeK5&2iw8{JB&kwZx^Zxql`=RY$FTDSp=;s%l`1?w_vR?lj*MClw
z{MY;T^Y1WzJ~#6}+|JJ*-#@4QIr-oJog2Y8h4Up3ev_rh-(6QptRRgvlV0oZtb<bG
zwWrSCC8d8IyYTzv--1`i?_2y!?Be`6BK<WKA=aM*>fd7Y^S+h8z5mAv6`_Azk;UIx
z`^zt?S&RSp^$)Ro@AUWXue+PM5~&(~Zt9N^ey=!i5z1fDsC+m66kfOQd+^=4#ZATz
z*<5_@V8fhfKg)J(+Ozxp+_qU__UnzG?%UJ%UQf-3?=LA?-}bzbo)gH0r%l!pZ~O1H
z*mvFWU2j|G%Evg;jguLl_^0piuipH>eE&Ytdn#Qs1(Vd<uLQelnq??+`kSLjh`pbf
zmM^~Fcle#wKfjdNL<Y+j=FSbyxPF~t75lTc(wFDNaV6#uf3=3S^K$}1#I*~Hu|x)_
zgH)_qZ0^mBICk<gS-Dg8iwsyPek?q4lTsx)-F0m~)9gFei~o8XXdw|L)znB04MehX
zF4RxUof?`Yl^jYbwY1X9D6^)TYpJ!iDvX*fwcJXpt+n1pn?3d1ORv54-bbIqM*_mi
zsH26^#~5>R(aEVNpPn2s=kk?SUS-wQR$pVyP5JD+%dWfazQ>-&Pdc>!si%e0&p7ki
zrIc>I<<{G7zvIqFt-bW}E3dxx`WtWl&e~5_|C%-XTju`ztl3Z2l(GCB*Z#~JZ@2cx
zDNJxulru8s*~oZP1}JD(&SJNmU71tP;t*UFCu>%eoMXxu8O+zbJo}xyKQs5=<}H-`
zzsj5cSD6b+-Tz1Cf>QUBxqr^vzsTB|AETr%LFz)qG^Pizalq}<J4g6hMM2wVU)J2#
z1Uv``cg!mrp383WtkrG5c3aZYG95%^C!eF{-Oo-ek#Ll1b64*0oqNZ*#%*5iD6f-7
zy*bZeyRTa~LkIO1OW&=B%ki@oyY01h(gO&~V`bxb+u5I`+F#>*dwFj;AHSEpzLs9?
zYmQsvenyMj#bS28nc%bXJm$JH-84^07f_5Rds^0C9?uU%o*)I_zBEX%WD3wuw%vlA
zIxC3%I`O}pKOeh~VvDCz5IvvehdMDZWAR}U_^j#@yXM>aEaWw<LP6e~C>6VT?$wg<
z+2v*Kkv3@qbFz!QXFKPtPNm;hGI+GoUGFq{zbV5Z68kl8ul{;kL_F3trsdgNA^N>=
zPqrbi@#?ZlZf5G0au<AgtQ>vTd@&H}$Gs7nR%(9MyIbKpoTHW!$#zPQH@SW})c0tc
zpEhS5#@$i#aVs@}syNhai?-vgmx?4o@s0uNy&Oq>%47BZ3N1sr_GBSW@10YizOhHC
zF-;Ft7M#GE2eKsRI&&N25arRVRl=_Ti$2NBE{hCOCu83n^|`cJWxKXsShk$%J%nec
zat9a8djs{9L8)ic@D-%taC<GkO8IV78*I$siK>cJ7o{G?%3G!K2*t|tt~!cy&v#Cs
z=uGSN#CYR#TgT_2FZZ29agM!Wq0C*FeM0NYXdc1ac}7kzJ<~6=blc?8)WZh}g*GYH
zxlqm2<)NlW16j_b|LROAw$Z8abT)NI7HH<3`<A@juTx|8XgT3%8{TFyR@(q6pvCEf
zv{xCoP>}sx7Tq?XUb{!oa{+FhlZs2nejaIZ(CM{aE-^V{mP5lI0XYRS;MO^B==Yq#
zwa5_RsOs8BN40rcI;k8A>5k<y6A0^zoU*k2u`AHrNY9h--Jx&#F;Vk&fiG}j&^-32
zf<EqB1?40SI*!(}y_`g-24F*7#pQ4MI{<~z{nY8cgo_d^KtX<>%haK~K^4!=8lLdA
zdfywVc?e?d6b4E-w>B?<nZffR1t3Rlw0RW-KVB8;o#y6z@CH(?*^nALzzZEdBkNtP
z7XZJ#ZLle{y0{WmPkbOl6@FS3gvqpe1HMOkcY_!A5CMqg3Ax3Qg~d4c@yu^ufjhnA
zs8O<UpJZdwCw<mV>7{mQj!xmB-YEqrjgIlvIahwjO(5ZVO_UiYT8ob^0Kcp~!F&+N
zRZJ}|5EjOzH1QYUr?0INLpcE#?c_CBc%nVYfnl?_ChYDalK6l9=?68^DIY2nj-;g^
z(pv6}r{!{u(iTN1cXpt(MT1aICiE;+bVfZ~vg3BcB$}JlP|jyn-XgZBK-DtvwxCbn
zXdb_S1Pf2~B(M=&?(hy$@Qty_^$pv=#Y~Boo7~8EL!&R6yEIznJfgPiqZm@|%~lug
z`J-*tO8aH-XI-5zD2c#RJUy$KtI8>|Nb1TSB4N?66-K-`KF5Nz2QgT82UFe#8BUu}
zx`#~<#rbF_R>4hgbb$mekj8Z>C3H*&XeP*3ZJ;P%JPIq)162J|f5*Hko|dJ~iL_|w
zV&I3mKGew(EE6gf-(eXy10cJ?(p?msg#P_`CkjZdhN+=1frTgiG#V^J4*^ibI&-;%
zvZ+FxL*?uZkx@Fm-&lRqA+7Dk$;^Ned=sArc-khCuh3!;dj!ytVsWgY?h)MDTbHCr
zigB~A0`#}m!#YR+btL4bs~$`IR0rXM%|J+)6^iSTWP(luI$5X8Tk_p7+B}__*mQo$
zf{YmsU1JRbh3#$?dWwus{i20%s6g?B_W5s-p}H?+bDx7=vr4<sT7zXu`EMW&Hf;de
z*_=X=0l%Qrk-cs}1~iydJXx<qpu9xAc}5&n7W|0NN<o4PJbhTiXux<OAZg4*4!7hq
z!hz3nSK$4Ntp4?qI;%q%ARQ52=;dA}bhJrd-HYpc=^$@XS39B$yoUwfhls1nQ!YdU
zlA{S}ih2exK!iZ_B~&WaQJ@DNL-Q^&`lx;W#Uh~|7GBn+vf(qBzi~b=8}b)=Qh9=y
zT^kOP6P*N2vMjV5>dIgYtax1%?@<vb6bcQ19|>!f&_KnPF4W>zsY8eety<olhoz&h
z0nNKJILv*nF0ZlhdYEXApfZr)roIsuq0#`3JpIH)j>4uMQEK8ZqJt!?lralYaU!z%
zgUOLc{HqER&UcEM*UoiKgyB|NkrXg3Vx5{E-2e<0=IYyhaQ_+U4%MP}h!uhmg^FIh
z+ykl+oP#*~f(vbeHUXFz)H5(eVj<^CdCZD@!Vu7{(qJTr;<%n)oDgdR7t)31FazK|
z8K*KwfC&<wNS(GJKr}{yf}j`#)0=n+;E@}x^c>=p+k>=5$@JT;g%(AiFBUPv+jVi?
zT=7@_(5S>`ZK+AT8L|`%gqt{0ECEh$gsNU?jx*8mw6$E%3)C*u{*ZRa9wLl2z!gnR
zfkfa3&tc;1h+v+MHA|ZpVE%4I;6V_JRY=xEM0G}rPgF<2XBmp|W<=ur072c4frMq!
zDG(h};Kg)4G{}XsJj_NqD<p!u@PP;aK-`O_V^kZ8&@QA%lE$@&gCW=knp4PV&jvzm
z5dh)`-RueFUvxY`18cja!tRI%&<?heW(8nOvdRe{+`wm7;yw#^jgYIlP2Q>_a9hAw
zLzG0c#E6fwlE}v@t%2o36v?S}l-J9j#^2{;kdBaVR*i^5puH8y0<}nhO{9fAMgLLb
ztQXaHCzya%QY9}mEJX$L7j+wQ<C9h;np`Tuwuwmqdkg@kpf7a{Fml@ycAgX*)OgG3
z=<-!n<2iA#L<doLfC?1Jr2@RS&@hq8AnvGd2SDLT&rlb%gp31K<G}vWLypq{nE5?D
zLjkgA`UE-G#UfJAmy-<yGp2BL&@hv5#3rg3Wdu;jZ`5|`pp2mlco<e&C}FhNg}+d2
zPz#MoYFxZ|tC-;K^vM-k%cK9{oPU0{3<=dtuVtqjXM7#?7BGwm3lTDg>Yc<54bXx%
zG<cD#AditQ2rWJc5vdakdF?6-I2i{>-@F#!uPX6E^BjQ<9_#Zx8~u(0*<w93ExNii
zN@QWs67of9Ox$F3=~up?Y}PqsXMy5KzSafM@qqL-Bqv9JcxI6Un!x)(*N~DX6dnBF
zW2_Mci_2!YE^)wuc@s#)qgM18zJYWDHHCibTm_zWOj$bZN+F>%4hnJtnwcgF^k)Xf
z0T56Xj20Kf4r4Sk^hQxRH~0(YfF}WJ+4T(yW60ZzyK{X2?S`Bp3Yx6GC-s7!**XuZ
zr;2^`1L6ns0UCokChjaDE}oS01NjLjZ0do&plDm!;E$$vC>+vT(B@>Yu0F7eAV5tz
z0RiH}+&Fkz5B{ujE0kfH7Seqi69Lw;W(|sBmG8oD@m*muI%zt#cpMFq37;lq&?}sY
z@)D^{&^W7(P#7Q~XCs1{c6UOOdill;mtsv<#fpPzsMX64ar3<KB)L0Qy<m@UKbxXF
zYWbRzOg`*JM}iA99IE<K22>Gg!WKL_2Wp%7(I?4Lg`&}`fj&VVZs`+Y$JOwP?m8GG
zDe&H9?_6`b5+@B}nzGxWDGHh4loL0G9}FNhkyD;9KS2MCzR$2N6G}VN!kT1c$e6nZ
zjEOUOztpenBSi|1gQg>N(gBA`0HQje*P}6kuSArk%SNFLs8}GGf<jxQk0ro668%sT
zkWeps1Xm$K5V0uiJ=F<n;SJGMG;LJ@2+jZjX<qAm8oX+(RR0xv6HZOF1o~jENqh#p
zDpD>|lM{cOPuGa^j4gD~z@%x=vd|2j8btRR{!ZfzE*Zm4nhX`#R<2>?N!ogT;KMjr
zJyh4jmf&=fX(|Q`V^;=BlaySn74j3PtUYYZT1SrTDE$gqO&9_yXbmc%M^rOddjqkM
zI+E4eW`OVt-&7cQ<bdJ{-y|?o{6IrJ8O%zcOGVbShgxfSr)&83d^Im3t%)Q9vYCS}
zpV(1id$pinV#|@PRVWV)Q(<5Pb{)pQ50xf?0y-agCR!ZUBR-&5#T;rZOf6$-(ul?%
zSX`ZBpV#Lm;B<J0cOT8lItY_IRMU(SVbc?BPhNDZSD5vATJilqdDS}?o^Y9n8vX1b
zWYGY6kSdK#o?|D7a>|j`Bt}jnb$AJ+bTRHj-*Z?$6mCT~M?5U#jpgXYA+Rb|%eb$R
z($VZ-U9LCLM~UK{;2fNPwnaJsYp=UND}X<kL2%~uqa7lm4+((T>h9)Uw&!FGWqJ^w
zBJfSjf#AdfU=R5f0FUIbqnTpH?UvDLkO34Rku~~by|Mx_90jQux|#zQf(r&%4*xln
zKAXHY3XSHy;M%zGQj?<w$~$>QsCtRu12S$MOE>ubJCpwYxiSI^H^H4JL2RZz)Phfo
zpn%{t>W}_-1q<QDz!Pv*@kAa1vK+w07WIM*&07;VRz&L-I9&M6U2BVY9~nlP8aT_)
z(KAj6PSAcLKDb9^Jb~Otfy>I|BL1o{JtoDYhHhk#=4*HhH3XF!8s!ZtD)cfHE7v$Q
z0f@K;K#Sy{rZ~L7exM$*fA!3LE+B~>!7n??)iTQ8`E*C5eVf=<Ob=$5rjHb1((I4c
zMZaX20WQK_Efhs&bx2fH4QKtfS0R>4MF6#hrTd~3xMvEq$^T$;k=6(j(+3ceMKd`Z
zM-*3p4^-X(pl4W`YgW@l1#rPgZk3A)xX3?d0*71y6*673HG+mHkmWSuE!0dwMx4<i
zitVE;uu-<`Mb|(^>Z!>`!d_7<b7i!fY<5G)10lQ7gK+-#iV54JhG~tZTYnYd2IUkj
zu_p)9D(X#JA{#=NEJU{uHuNSzKH6FaTs3uW8h->LeXy4g=?ay^hb51MXOjtp2VhOj
zwONS$kXxL&cO<qv$0<lA+~m?`4&4u#qYCi%QW@*fY=GXTa6!&Uou-aTa5zGqg9GSv
zFq3LVbnUOjhtx#qoe0>gW*^|<Z6u`;k*C|38Uif*z&LY31!sXV4O2u+Sut4Nv=4JY
z+kiI(7pUx1b57JZR01~kFGmy$XT&?B+~1?oKv|6mAN=PV$iT;UgjX9obgGggND;=S
z<%>aqTqZ4m>n*)Kjh=VA*_YbcaK>0(unf|E3nIH3O4bu-Dy$yIqgYD8*CG{=Vt^tt
zm&j?>MhFgoj66zE`q32q05RY{1_CYAFjN7h3Iw@^F`Z5Z&>$t#OnQP96ElJ&eo1&s
z!%5cDjk2ip@zaPE)LPtlfV|?<kb=B&N)VTdOF%6Veu%@O#^f$Y9cI&H=`LDE+XNd|
z+tI5Ziv?h5P(N@`EFF4-h1Sa>QKCo!+${WF(mnF&M$@OUw1k3#w$z^H``VzOvKI;z
zXGvvX5V4Qi;PHW!5sG8@GPHFrttq=i`$N|hARncSi;O!a3n3e1)DRjp1%d?&Ol{IG
zqK1X#VgZB|?j%myPQl60YDq&8nEe411i=S3BJfw2_{QLUGjokkq1CBrH;Dn>s4d5N
z<WV_q)6P>CH4SYaKvvqGc-mjv*Lzn6A@c}j+A!@P(vEl<B=RD^M?0ksl;8k0Xpx&j
zb?bwcB2{xz5WpaaG2p<;<A$#WWPKvyqy(vh3E2XBAm=GgT|Uh`yS5(=CI99|=bskP
zyqzjR|7s3;hc+7lD&YR4>Dmjqns+0s(31H4v1A&d_;htD2N7^ec?Bwho25i^)tC^3
zr^z)uMq+|#;2r{+Ue~@sL}&vf@I^=1ZPI|f_#QP#GZbE-21FNl>764YOgz601Esyq
zIxhh64OS9-K(aqE4LHKNus?ooX@kXNH;d>7ozrDP05-rz;ta<)5OC5WNOAO8<lZ(E
zlQbdtluyzgoSrMe95+142OAgPf{fMl1KyxqS)avkfX%r821vMSFbnZIFcnc;00ieE
zi-8)ZJd4`hvI7^Zq2P%r2Ig&GQM;${u8D1^y+Oe55_~9R-O<)J`vtXnpfdH3DAmM*
zHpK35lP0pXFO@+7!RWoCW)U4+@IjiC$-zF6Q5q4j={u;SC{_C7-9@1w3?0rfT8S2*
zhO_4e?BZ`6JV5l3FEq5k3wYz+u<b`KTgWyZcz<OP)aGSq8bV9r<B&qPR{=`H3pNSE
zTr{aEV`vC~xdodJF>>H=%KPJ&gf-(}cl1~R;LyLZ8mN$^-9bz0Qm$m-MGX$`#8l7W
z+#6d!4bx>rkFL<%hw~OHopx9p?+$62Ic!I_46GaX1v?^PxS+<8rM-xm#2h1UozE7u
zC~^<Sq-THX`G%ZDo4KG121J`tjg;I$<4N<$7Zw~6jr{hQfeyYdOMnpYOB^D;N6dJ%
zu~umbZkjL(M$n$JB~iQO6`X@L;e(}08v(p~Xu(W}r|TDP#MHxQGPuUapLAFSvf#R=
z=`|J{y4UWi9>6fo*U=r1%BD4O3Gm{yZcg<W9fW%<C9BAApxQB@p7rr99gq?CmA(eH
za!ROVByU)#Cq1|EzAGd$?#Z+Xhwsc6ZUq}D-P<1JIZo<;3H<>-R-`B<p+uU&VsKf)
z*mpKfLQTf@$_C42!QFi0ffKJNV?4bhIS!(mB5OkskU@Mb;tdd=J^_;eX{h;JB+og$
zIb9C7Q2A@mqj7wD8kqPrN)X|rJ$M2DS7<w9pl4u3jt5;w{zxeHhRMBpBm|J5sW3qG
zy`oJ|WaiZ^QTVv%1wvT_8gFPFBGCSN+gXi`e|CE7rl%1P0of5sfTD)%(-176Us<!H
zZ8?AtP7;+zu+eqg>Nr%$Nf%nzo+;iP0;CDh4RFB5mB2UJgSi8VF(50Jk3}8GKN-xx
zS`aY6wrHu+%Scu}-oNRd3_lIiwkA57^&=K9{AUsvXYFH<_tFy`DFBBrIkkY$rKLz1
zD&~F#UB8vZENwV2DP+k|n$C@{qnV_(63|&$JF`KLH+5FQMe)Fp%)$V{AQ%V)Z~MkU
zNgGKmRfKmr*fs6_Ra6HpaS;Rf$WekG2?UzBW1N}7NVQ!}cu0ygsOIqWh@MxW(5fbH
zkK~#5_>a_(2#1ttGMcb<lLmv^2G`LjF&cn|9O#<BK2e5E2u}@uG~T#0Hri$A!2ocJ
zt_|9lw1&rl86WZknv)LvHf3-E<$N>t)||oyNW9La&4&rFfb@E#v7zrz4sqf&C=oj8
zXD6Eb%R9QZv;h7OwThme)pX-ePmjaQdQcGxjhf_OYPhJL|0sgd8Xt}h(XJhPPoP}a
zNt+%flsUpw>e&Q5Ah$;cYJ-U)sda=rI~*b~{hT4|OWOC6gAiZG0{cuoFb3OU+O%&I
z5j>O*ZxUp0+7Z6cQKmHY1jlmZmZqLmrgDe&Q)5A-++V5fBGC1qFxp2clWRR=Zr9Nm
z)G)c#NjUV#n|9af04SP(EO~@uhG(YX$q|n8O8SDq&y_Z85uUqZZO+XB&V12oFBF{%
zlBo_{@J<V9p^d4cNjEJ>LB521-a@ZKWhOWUGS-w^vszjT8KMVe^xzTziTA1U#_t^b
zR<~bwf;dMykzl;U(ZpV}cx{aRF`)@xI)@Z04k~MBeCx?U)dN5)Vm{;^tLmu^Abq1T
z(S&@II{*kviF#_c2Mse~yZjDY3Hz$5w6R+-fgrExxiH-1A|fz5maq96XdB!bv8<BD
zyi7Y_&X8|3Yr*pYq<R*m(5yZ+{ipGzQa{^DffO)ML-+Jm`8xO(J%a%Kdf;<F`O$cC
znVvwndg22Ki$qM4M=*=_l`AwtobZsO3CDo~P1@OTgq*hM6eH>Ya7Q%kN5-+{+PA$_
z$S>uHjsHD&8HAy!Xb}edTMPQyr{q9g+V|jA)`J5EGoz~TJtjZ6q*DnC^_ZV%VMHv{
zd+WL$nrJXKK%H_&)wT<DViP9NlQ|1G+%%&Y-;;NjPNH(3o+4~=bXi+j_voR?4lg33
z2#KCxKxfkqa4HsrP;4p&YU(&W@`QWkq_`*3lNfX8p)OV+$p=(#bvZ^6yMYV}sLw<x
z7SrR5^vBfxX-P9Zjh8eV0MViiO<%#jrv0(!dhjXgiD9fYg|&SJ#B+ZWbEqA=e!fTD
zit9-u1s^K#1-tB<@qmc~xfUiaJyp29^UdZcuN7o<a48LT<SjZ!J09AE2lo2@o@*d`
zL!bm{*d^XFV&9U<)}$pt==1{W5oY=RKL%RQ(cIuLcY&-$le|KC&;DKa)YQ-vps~i7
zXj6>E<9a5&NU*g9l99as<;?DX_(@qDRvG>iMsOWiME8L600006VoOIv0RI600RN!9
zr;`8x010qNS#tmYE+YT{E+YYWr9XB6000McNliru;{pU195?O-N*n+HAOJ~3K~#9!
z?7dfvWl4JH_lt<*uD|IkT~(Ivs%r15XE>bcF`QY>kV8sZ(JZk9#D!MSg9J&0AVGj$
z^dPPDBCMbnK?DWvjzEyh6*)9xdR))+^t7q!t}gF0E3?v@>&>wddN{W#vusy)_3SQZ
z?;l8Hp>Ccy=SIYd@B4pN0EUkUAq2)4gb?@nG#$<u0D%yu_wPp?mk)iUTlas25$_o5
z*7H8fwfDb=xZ^vff5#(#zil{x2h)OI-xu@JZq2^2JSBS=6WjQmGi)rvl@p)k{MfHj
z{PmZ4`BO*u^wCkCnpBik1vm+d-=}fn|KY+Ln_N5#SI<LD!_a4*qI~SjI3v?2D}%6$
zSWXUGB#5|<=-$9AzsBl?pK<mi{B!~4ANZ`J{Pyqv9xpz9knurD-1WJ!HqMPbzszrZ
zew?rDh0I-7BtSESP=IBD2->u7zQf{~KV|lvKjP|1xO4#))<6$Kk}XjSi(G9=h!T(q
zID)Z^WIS)kx)GhQ#o|Vn&HDCaA1T78Uxeq5!0wR|a=E?a2L>3KY%=J~VOLjZ&%yQU
z@Z+oFyiuRzruK*epIWWX%4!9YM!K#}5tYr8wFKyx#Kc%a;aC<*LZBhA99$)EVxPos
z5k?`g0HlY?3}6+8$z`&rBqH%!L}7=Zvqh`6PLlA6!jkFUOA^qJbVUjB6R>L!Wb@=q
zgQLM!#{2;`#$F}&(h#GWHQHz1<I<TGf;c4W<*3Cjt7}bQjuC90esv#~Sz&#%fp_#J
zs@dIKy0!st{-k%G=YcKm+)-cRKlyL}DgVQN@hcpdc7S(TTzZ$w^DYb5W3t6@o_PKV
zW=0K#ZiI|-V7U;7;3qV@iZ@QL^S}Jr3C2tF{Ne8&;^^2W%a^{(4}W@+@2<f&{a@jC
zC!gd?Pn3CXYMp(9KcHk^f*Vl33`<pbzXJcq{|hGom;(0p-sx+=@;x*5U;VRx!XNyT
zKV)+F2v?Q^zWp~p<$wAg--eAz;29`d&^QVFD_-K;9De~`J_b)8h1~8>vBK|i_L@iS
z%v+2f@fiNhZ?oETsh@kBXNKP5&{O-lS|8<4-hglX)d;xz;fVrY+MiHzvs_rTxcC<<
z(0m(s8#oK(fuq1c@45f>zN=jxETV+R*48=#_}Z5~&r8QY#rW<Sgt7^v2;we{R)fp4
zOMLr{6Rcf&uXpt!utp&60ylul?bA<)^z?g_Gfydn<7N=H16q*85lI}7=oq2X!Hh8&
zqY*;xIB(64vzEL5&wLz_^$2o;d(QTcey!~N)(;p@-1Rr+L&p51zvsWndFi8%KKkh6
z6VdlR_7Q$xl9mea2YmF1<K8*ezb!nB%stNc+o^1L2wW+!q(*1~Mq!MN#vxH5X0SwI
z++!pMIhEj;02ymw1F9AL<ra%en_QiP555oQ02^>?XDM}GKt;Qd%EK6e6cTBH&=x`}
z5-IQv)HWVQ(o*H4*#bX=II%Fo!O9t?1_DO1;N4F_1M*I)iYNeAqC8DOB{)E=p}Gd=
z0cR8PUO+>}>C;;>rFuz(?`ztYM53{zVx*YGk0h;*20C197zXDdlK~xUFj962{04ES
zLxoksDpZ%?#v;r$EkY^DTF?#>ViJ%N5-VL3A#W?9T7pS#DWrx(Ycv9BKp4<y5|f~{
z2BFgbGzktqj*%b~v6aE-1fiVA+%NZs*6G~phpZc70z3~K1-1*h0=W$2y$(*?rdAJ$
z!!}NSnW?Ca>u<2UxlDCy4xK>Y7O7^Zz|BDb8$_&Ju0dGh!d8Pl-S;StN4TpI0WX1b
z44$0=e-+OB47hOnS)A-Dy7fNPIyB}_vbIp8)11UK6p;xCH|n&thlnEbmPC325<wU%
zd?RrNUG^Pz*|^za@#YGuUg7e&Ret<B{AdFX&&=Ws?x)kqvbfZydG!*e1GO8laUCiF
zTyESVX<r47!_XKMyD)ba_~UzKFt_rzls2DaaJb2&RbYBh^6YOu%?H^7eCFt0GETtv
z&o5(Mo8ZJ55br@0K_i0c@FLd!7S3dmX5|20RAn+;Wk6=AD8piPl<bP36?WNG9^$wD
z;2=|DM<``HEEQAA*}V9i;>6Q={=YK;%v(@72$?br?FK6g*QeoZ7x=+F&t9uEfbh18
z?T3<3OA;*+QW6D%R;|m{#yXoz3#={PBC2EX)Dcv9oTSz5-S^$w<9xI;*`RfTGCF;+
zgxRq-`-=a==B@ucee}^sAALL)QQJvoQblyzdzF$k@v+By6oUBiJXwz~ux@>=2jBa{
ztf2;ofrtTN;|U*I#3(|vjz|n7Mqq@4GgM}H)L|@VC<`AaZerRkl6a2p@=cbm&vN!6
zyzy7?fA6@%)Ep$cm!Nn6WtT9PL@9-3SxBQG6c{@O3xe>&zVi@W1fe#>D5SK>xjuv9
zCZ$LsD3Q`N_rV)WXo_B&ywxUSgOf>Tq2Bv=!}oyzluSv55)jAKLmwSV;-aLOwa9rH
z4orCjCZXA?v$#^@&FiqS2J44mdU%mS25bef56ueH8qg3$I-bP#BAh6u8g;1n0SFD!
z=_!o{A$v+>kGN^ANdO@XAW=dig#w*=4HE#PF&Z3`pkg0l&~^cl$zn-~37YBG`J{>3
z9VBgt)JvPB#4+oE<05lqT-U`@634dj90yAng!YMpkhNBhtBJ)Et*dkv4eibbv!`yd
zd23i7NDK^Eu$}|jTv#cQdd-HIpKZcy7bX?im$JNic!HU!ahgrdiQ;Z9{j@iitkT`Q
z$c<AKy65WLxUj%dYYZ`L2vr70*laBO*pZ-}Bt%(7u>eLWx=BK!A_fZ;o*7x>+ovvb
z>O_s}vdM|J7x{}b>7zDQu5)zit8CUZjm0Vp-+`;w;D`6j+%xdyukwZGKF9R%Fj26`
z#q%+z{&WDS0xtmjfemi{=tnF(^<Oj8{ateQi_Dbv^E+RAhW~QU4ErY_tS|9dvBjUy
z3eKMS4DV9q-81Joa0b5iwHmLC%riJ#VsmDM`ld~NbDdZ!A`x+;UM9RAqQw?_Mh5xP
zbHg0iU%;^;jBPRw7zv+QFYwC;ip*at6Str=I8ABSVSJtC+<BWn&tHePesG^1GMSPt
zG|;6Z^Tfiz2noWX8$~RyHMxHAI+xD=09pY6rTx2j^3XK7p=q{S9j=Hv%}N=lee}~(
zYmA8@5g;tksaH(ib2^F-J$L_p5C;7VrXKVOS|5G%(Z}CQqINf-x)rXtP1t^M@o;h|
z9+9x6WKAX-OT?)Y$<)x=C5~+p9iWo|RK})QfU*;iHw~2U6Eru_%~{rO&NDy%T`ruy
zlcWKdS%?l-i3USNRv;V;qdb%gN-B(R&?-P#po%^H^d98E9_Q&#=h-vTCg%i5nMDXm
z-i>e?*XS&)(o`i1g)+EfV2^QsA6p05MCmGy1p{T6I0E^L(7OFMLF(N~NJAgv1mc)x
zWbk8~3F9zS&M-8Pr<e(e!xjS;oV^KGT5#n(C?Uzq0$aL`-=jvm5F9&Z81T9zRH^xf
zYNJh3?WCl}7U^2a)I%k1t(P`PNWEqVv=Atx5GasV`kM%iNR0<tLaYgVA8@fV9(GpI
z^%Y%95JaDp(vu+#doy4O$PHi>hcF7X4)BD*vsCH<bV_7g2S+A2O5r#zQKIPvf_fxq
zSVeF=F3oMxJoh$H7uKOS{?`E;qGf2z0`1=YB|JIFp{YaU?SLe#<CrFcnULv$9J_}H
zXgeJ$BSTyo>7*>0%gkOl#!ua6km3NBmM6%T+w2+86!Hp_aj6FquLC{_wiA-0jw3=`
z-NqzMGL3U&tN)tS6E}G6!eLD4a&qO)nTcu9Y8w`32l=yWe+Z292*z39?{1UY|Lm7W
z`SKU{GCG=LY1O7Iu5fDPKZcF{@WRtD?7-#I{EIWE82ayPRDS1A8GqtW$?yB$`112F
zFg+ELi>|Z0_BuD(7ucgZoPBx^Y>mTGj%&Qj-~1iyJ$8XT&L|_<aaMC#7FT@?Awj6A
zM~bZ*39f4L{H{%&o!DY*a5|lH;+`3x!|2#D-ugAB>ht*dE~C4L*)<d6ClNz&NcD2e
z_ujgDkCc#49%1kJZbBSxHacVma!A`lDl7G<8NqTr;JdFcrte-4)A@v%lA%1TD0vR;
zqQ#|;NkFs#og^eeAf><<4MsnrVb1(pk|p9J5|+n#PSGbree}^sAANlCMD0OBC-tPs
zR3P_+*hlwz-7EC&%yWBG!6-hIVE!Cv+(!`F37se=PI?NBfhevKMge{o{KzMk2HQ^X
z@Ug-wNlVl6R|qT1EH7>{fAvL9zbSxhk8Pddg&tK38so^0i;g`kk;Aex2sg$?pjCnv
z{zIaVa-jBc=<~z8dbrL^`8p+4!qOg6Iw(tE+Ffp5UME?L7#k>38rVyI^dRo=G}yVj
z=41^zYs8%<3UCz+4Z>$<U~U;MhCQN&4Z5eih#n~*A&NBf4S}7Nj3^k&8DusjXu;gg
zZL(LVOx-F%#)bMi5*QgX*s@97Y0~szqas*e-QNDvwoyi6Fi2yN2!y#s*F?`<oO;-h
z5}|CANl1i+5GwUJ2?GYSF%U)=ns^pCwjmZVN<Pk>8UtmgVVZ6k%0pyw0z2st`w@0#
zh(c);VWs5NPGW3f@WYtI_3&(oorFk{pj?|!TlgwNoebnWC={VK#?qNGDNVD1r{T+=
zVR~2)Z=Po5wRK<@X-?Ns_D}BN#aAX79e~bOgXWD@T8k~ZjZv^B@!XhFCdWXjMRnsc
zFu;4s5TBYnz{KbfN5>(lo}-YgGwd|U<q}*6Y%Nf9uyly%HXvFetj*JC&U5q1NzVQV
z&TRslVUL780bJVNwZYp2^}WP}&+zged>(sf4{x^C;lddFcpf+hGiy9IJkMwL-e7cM
z4|86J<;yt^e)+Qu?my0p&mKUCIzKzn;{E^m75?|l@9>@f6MpSe@Wuc1Cw%Iq{S<=&
zix;o){_F2??)^56dWM-XkL5v0C=<B(F0;Vtlb6uyDZG&q4vK2a;D?e(8~g+|+7_Pn
zIJ#9O**Xj35y%WgO-MS>t`IKHlDU2ncm6s?+YFRq#+xA#lI8FMBgu(-x6Gb>eC6mg
zd-hBrtqhe$h^HhuH-jZ)x^JbVn?UL|-EnGG&tY}<;dT|7Zi3@)0*#Nody~W<r9t;%
ziH*5+4jWPrlz4~%%-rWJH;+MZJ}l?zqms1y{f+pLF*VzHY9D6M>!Xi8`skxi)E>ja
zw;cv}OW4RAzaKXYMBH(YJByS&N}kyL1+ft3E^_%Wf&FoWr+LKd4b>L3LkJ^CG$?5k
z#{r!VG+JH!OoA(8WYQt-K)dP_>n&=ln%V37c>Clle3MbYg;(o5pTEY@#uePEOOQKE
zqNdP{k#&a2=3LxN6OV*Q#YA+|C5m=Flim9%z+Rgp!wH9qHAe0C!IvZ!7;g$AJYu2P
zs%O~TvdB7;k-;vLyEmEWXof~TDBQ}R+JNp=Xm60Af)zkeOLM?Rcco6W`D@U*RU|;C
zqz5T?tc8R`QVSBA?TCgIV4E&U1SR)&)E0$|X3vzxK;FiUK?jh8(5S(316J#>e#e?b
z=pe>Og|HL`o!(AKBob{TN*d6hmBO+dY}>+#1x7-sHHk6l;w1?tu`t@8W1rAyq%F{)
z-wXNrD6eD=R0#@$h~ZK4Hi$T;?G2G19%R_6BkD`ED+=M|$>+0pmLzJoi8`Q=#LC6>
zEHYLI-5PNeArc?Q5tNN0lPRDIE@NXk@Tb`Fp5w~97Fdw~T9$wKrQJ-8L~PAh`OEf8
ztiJg<;4plChRIhZn0m6vctKEI?^4w@uBa-Xn}K}?ErLqI=3<Az?uDMScARGl6^>0@
z<<P_;_4p)9)pv>N?_vWP{S|U*H+B*sJF9e;R$1zNz~(Y6uE327oH_;Hm;*RM8hTkI
z4flK*I1McGz3&K~eQ}lNf7Ri)zc|Lo^f=d6%6$L(3;fyXk<__1f1dXG2ZT!++#yCI
z&3M7%tDk$4<DZ`7*#m9bTUQv}THyVs1e}G7z{R%)8Gmtw{nOu}<_vP?T*O;vJT6pi
z0;kJ}9gsI3=O!|6GhNB={cr<&JZ938pezCuu>zrDY$?f)*d#%Ym0H5wrFAk%2Uo>J
zt!2XQ8m;CM>o<SE&1<l*1SSI+@iw0SDzOnPpFPL&`IUQi&@au5a%?is%otcsNMpdp
zk3F(kw--9DF=!IOU8Dh)7GP@kRpKC^(oCo?&OWaB4y|{*&bQw`-81Bwd!FG=<J>Jd
zAa@ws9!Iup%ch;-`P(w=mTb9YaC{uE*T*G(ee}^sAAR(34^jI#Ib~u8VUl-!W*(!6
zg4iLL^?gX&N6k+Y54i5<B{Uy#+zvE5&<P>d4oX0%q3Ofc7PN-DxH=$;L%P18rb9$1
zSl<}uTz!V`J%5mc|KSKPO)91{ZStKbVQG!l3Uuu<daOupFo!pgrBsS3*=_77pe-7N
z%%>LaD6J#cqR`t8sz;1E*zEv1vnT;c{2JYQm!$Y2vN#1+mc(-Dm>gA|rRisgYCfo&
zn0Avwrj48PLA4;NLcC7dxq@!P@&c?TATkgnX<+2-+%P4%oy4MKN`e4POw|uqsfQ#%
z2Rn(WR<}u778tc^WUz5`FEFtSn~Shup!vY1%3u<MkqL1Up&h%o|5U1E8UaS2g$s^@
zWf^1~qvH^*(}E&WT9_SPwFC&F7?Wt?Fd=$qg4zH$c~A;01+I&5G8j9Hl^<l+V1W!F
zotDNa4l_8CBkMQl)HS~Ha5FYeCL*VswBr_CA8<0*u1hi7!ihI&x7TR54Pm!}uwvq9
z2$9cIE=LT<HAcqvGxp@C$^FAgI)P6|wwWG`7|D0o7~IWE&k0tJmpFXr2v6*t;qc@D
zdxk9XHdF&R^is%k8|##s*BKU9*=$`Rs$J*$(k*XIf~;Srb2DP26|->hFS&dMx>YD-
zV08Ms42*$DptA|l1~jk1!VUNUICFchrh)&6@n=56@E(VFBIcrL!R(7LyU13s%1>{6
zz(0sj@_gwad#8%*FA2ng;@zWT%>69gS2xbT#_7zP)X(3*=Qvou&o4bY!L#EbL-kY4
zU;H-C(g_X@zr)q?i=du_@*pP`V#;q>IJRMK6;?YjQCz3hZV@|qgzI9XZreT<IZVSU
zG4AGY9Z6XvXdMv+hPIzzDbQILA6U3qM>Wr5M`x&So}pQTY87tWfU7@*IZ{vg{Hrm0
zCcaN(;M7HU{rp|qDL2OM(L6(Wo2-hFIsn_lwOuSLB{|wiKq90=`u1<50?eMDqgHLw
zXw{itY(D-;*b@!<Howx3C<DwrGUbyYOLw2s;w};=Z<9k~J}xPg50L}9PulwEqmMrN
zcvPbH^T-3xAA?MBUqY4&%XG{;%Qyc#@o!Fm*4xnTrd1U!R}pLIhES<PO;jkfTZB=W
zZqO@Y5fs@nBlu4|#XmkW!^;O?&j5Ioi94gzS6i&sz*jDwXW=>EW(DP3gIr*UT5V#p
zMmGl2g)jgM*;CjAsf#U!l^PoZb>@JuoRXf6>Kjmw7~TIIrI87gH;Cuua9oc}&Oul)
zt#*y2>LN}!N6}efq!8j{W9VKdSck=%aQZAPcu*LI#igCI(JLe(1yX|+y^<Ls1e1`o
zJ1oZm4P&4K6}`Pu9iZL>f(`sq8jaZ4OpA*@7+G*fz|mm*+f^Qgl&N1-2+$A<3*&k?
zj)fv5P9l<Cp%J4siA*a&8j{rhE+N4XCWgdF5){4CBRx1E2OwL9LLMvY;fNTSgh(N=
zlm~7Oui!D{Xk?@@nJk5($8aVh==k`tBFW{+<Rw|Fj&5ucc0znp#Iro?tU)9dy0x2Z
zt!kG2e45kN^udnV|AHVVH9@69ZZhE0uecmJGyno_)}clhhdN#+<d>60lxZ=w9}YdC
z*u6_K&^tLa@FW)N!x1az)~H_kfEyRCapls+9p}O2x7T>Tbd}3?gOlHdH@n-PmVu{8
z1ME&ebiJnez5iyKuYchHnXI86w%Kftu)H$Fr7Ib(T<&uDyX&l+Iz#g*3prG0Qs>#N
zws>Ol)68)kIL+%nSfhP;j?yaRo_>czzx5?v-nB?M3|Tn&4sZVL4><Audt5ya?DaW*
zWSD`034$cx<Z6tq6RM3CTQ#4}O29&#V`O-ga;D65&SI89pu(=FJq89HibaJjfg~aD
zW5OsQi4~S5u^k7kHP@G$ET8=b!7?nJgtaOx0`J^413!8_%^<Y7l}~slp4jCvR4}+I
zAq+rkg%&YbEwB{ExCo(8Qeiu8Z}xBDATYw^Y73`&hVT<O-=qL(MDJ+7Rg(UGUaDS*
z@om|0cQ~Q>m;~qUaP)0*b~o|6yFk@8N&6^e>dhVB<Id~*#H^1#`skyNk4)4)DT1PR
zSR@~(7mfIk68|4J9P!^xtW}`ef>u{xt1Pjpll0n&Rpx69KiQ=dCgilnHWm>srZmiv
znGue^0MCr>w29kvCI+Yn5R247BXk;hXC)S<9#dBh+WI1K8`|}>@?s5*M5BA<G#~)K
z%c=K6^d<~vz+Z<;Rmkx+$A5K=14mw<G&+M@7{#;86x}QZJ4Plon$0!*^=oW)UZazP
zkvzm5IDZOGyanGPm!`%nws)+(b^Dhs1PFyjrv%5ON-jxSr80QHT;5J!+PL4RQ$0FY
zxsw<cGn8C|?#3jE!C(*=gi1-876NP+&y{$VMn(Za5)$c@k!k6rIb;HiNzll2gx<AU
zI7p||>q%vU?SbPV+#)KQ!^vdHx(Y`G;76D+#t4J5C3!2v4g%s(;bcpc-H3cpC+ajY
z+Ga3sQM4muP@&yy(ulI?d=3g(9BY$yrOnz(o@(qt#_H*gX}oLBYT`-3X4^26EK~H(
zFf$aR^21Ce4(m}uyVId**0Gn)(p_&d-Wg$}V=)+qU=0Bw5<`hLUbM>A=1s0#Smv#Z
zlGm1|d-H98LAK&9|LX5*MBMVAZleagL5b};pbx-In`5JEJT);--VJDV+q6dpSRW}d
zz;5JPh09Fw&;NRrJ;UE1(|r>+y9<BwI4^$jt4w@xinq^Cv$i<TAFr>$*~9RIHU9Y*
zwoqH|QVR?pT#oqb>o4%V6KPMe()n{7eC11w?y_jLBiikR&`+oaHj7D_wQP~`LYBRw
zgXA+V>sEA|sEt@vGAh6pI&C%JLpP8F#zi;+*Gb4)5#4Tw3k&Of>n}cZ27sNlf9|cu
znDf9kT}<TTTR9SA5l113-olF`Y}-M)3fC57y$nnaz!Jc7aQt{`ytueV*cb$IK&iK4
zSJ-a1@KH}*bC=a_yG;K!Ioe6W%zX`iAO9RTJBZ*;;`g8yGx~N!$DQ&?d`$V)M<0Fk
z(MKPTP1GKT0DTf(IeDjO-w|@M9R~S}w*U)Uuu+HVpo?Q?(Ck7wt5{h`mIYluA&L#!
z7>p1I+oD{wm>P>YI(T>B5@hZ4=YHr0K7pvB{4;bbu(go(UQ1P>8r!3#o~#D&#=^bh
z_}`wR+ni(H6N8LQJ&A3mKnx&a1G<K(U#7kJ9xKbR+yy6w`X+pE7GB@%<<!yPw)ZaW
zwsw0TC@ByUVj(^umFQ*QtFSkL>ibZ;RROR`)&yjQB9?+qtkFFsO$dQTfOJrH22X)X
zx|pCv9QdFUgtU;Bi?BVE5@<~t0x8n)O>MvkiSTkr>7k{K<=9xt#<FcJ8$20dCkZkM
z&_PTTL7a84mBhx!_q+I}OjgA>!4_e)f?w@oCmFJI(@@rWlV%fQOJU^&ZZ1MLYc%Tt
zRat<Ni%1M64pUc5be(X0oj}cC<Rn4uCJU#kjCJ2+dOS<Elw;D_MXlN-nEM%>OMk|d
zS%~bzSZ<7?G$VW59*LF^X&Uu}#m$gw8-j{6%>F}VuD1oWTd-e2kWgRDrDXMvGNYdd
zz6?x4wgR0GNSixfx@Q$LH%?P|{~*`m4#n&SR%wO8o@dxS@G8;41FUU%u)9LCaFRdz
zV_3O3N4_wJ`=Z55zxH_s_hfi^W}KVXVRa?X$=xMRueQ0q=J5WBHby$EC&LUMcH#S<
z27X2zFo}<=G+n^=AxbRlQkLmbiAfA)M>1G+P{I&*G}snI&{$r@_amYtB?VE>5RlDi
zr1G(n2KZIFTOnsJ+tm5Z)JQ@e80;O-?Vbr@2{^T5Hg<8prVl~0ORLerALx*Ca~NgQ
z>NKfuu9GWNP|6`U;NmEoLe7El0xUg2`Iq+a^pOeLCd+%nBM`mFfuUgvj>Yn3m9_WA
zVRenPnfd)t=>2Z9)0?Dwo^dJV1J3&gk+Zu=*2g;u(mXVC*M0RJIcX2R_U>^0Th}Ka
zDi?(icjVaJNf1AY9PU2)=%bH5{yidUk0Jyg9KMkzev8KxK6h8cx|hfa@u;Pp|9)Y$
z4pVJKJ}+?X5_ZNTJF-r}v2nAcc~K$;p|I_koL6H=u8@fpSouf1OGrl6@sbVbLTw%9
z=Xcf;2}p}GSiN<ycu@DRYe46xu(ViV&!L|%Jq=Ss5PIMm=+t3h4lcg~>+9*x@qslI
zOHzRjfo@OX*`dfNKnN_6R#~)ENE|)N?#u&ElJ<?7Agu^E5By2*^RK|yzs!rrfNF`8
z-#i5?X@lR+<}xx<!e9tx8jdCt5K<z9jj^-1nGCjyhytIe-64!(3<j+f!pYz{4mL5w
z5J`m*3QdAEF+zy6f1R?>LSid{B{aeWSXyI68X*;0$7rpI?F=$&<2o7<bO}O%&Ip8Q
z;n&-=+7>N8gA@@o+xVtKvt@|1jZp$8Zs7)9I$P^h>ISrjC5JG1N!i^Z9BR;9)?B($
z;nI4{fdfUV8#&(jS(U|8*BLLLWoU4X;o<AN0-OK<AOJ~3K~zz?^^i-aYP|X9@IBx+
zvYWK^7@2&)$WW4Qm!9sK0KPGFRF<)kA<BaWBVuOPuR-v$G>-4KLO<LiAHcEyfM5FJ
z*V(ss3O`xo^5r6DzU9Eu=ST~NY>@^4o~H}Ezg$Fn8Dz7K?0k!3FMOM4KR?COho6G{
zK32L<^XLEU4>-#jXWvQ*`G4-d!7DEx=fI$k<7q}m0@kEp#2MiD?g6}vX1<x=Sm0(9
zGovmO&yBF$<3&NJ)1X${MS7B~666auwk6PEh}1EPfH3yaeg)#xFIEXclEg=d7E(kg
z*}|d;egz%QQLmk+vAK(@wXbn5^DG?L1)&WiF6{E4WI)!TxehC9@a|>ORs%_I4m-em
zcaW#e)sWg&8-J)uK4UOivb9?0+Ld{7r99FZVk$d?W!V(676*qst`4|7;Z&J%)*!cs
zgS!t>9y`SFz!<{sva&qSJ2{`TfBrn_PPhxjNyrX@5zuKubG7$=Z=coXp}o)^R<z@B
zjDX^fo}TwcYJ9k%@s`1GyY<YY%DA0gJaZRO`$Z*b{SePS`skyNp94{Ql*9GzWb6Bp
zwa0mkopJq=osFd*PTqbouu+9Z5D+8@wl|2I%Q3pUfEW1W3T<*Kz>x||gHjqd35mB_
zR2Q}wA0LIn0NYjY9)vFF3L?Bg)P&7dIDg-DzV-9qdC&IL?ByF^-GFB#>^TS{MQ|l_
zYcPKqUfXfaE})oA$cQy)>w8Fex*G+qGB`?LOhTO8Rh04`>;pbSS_yChj+J3N1N-yr
zlZ(v0TZZ?1uwLNkrw{Qf&m@S|1qK&~c<pbOZxhs3*9Xf*Wo?uZC=JF)ux%XABbT+Y
zbwtpO@uMy}iqOKwC<kR(SW+SrMItmpNt6<4VUbi-#6pnPB+)1gLMI3TS{q_vuu%wY
zNKhCjt<>noE#h`eY;t%eM0Nt&T4IK$$eSj*x=gp)A`DviCX28XO2_C<M60>M>T-*2
zZ4gEdGIVe^N2c5CvTM-2&e8<DaRpdxaBa56@X(WNh$&9Av$)G&K)?15Gs6jS%i<mX
zG;_=WaC*yTxMg!JlxPzmWdr0E#Oq|jdAxXuf}?PX5{*slX9;T?EMDHZW=*zByX@s3
z{hHu6zhZN6MzLNS=R{!wx%C_$%pZZ>yTPo(4|hQ$-L1pBE-*aV=KAasfAyE}nK?s#
z@)DohcZ%o6GOQg5nf;x^oLroSpKbwf^WDFJr=PwK;Uu*vOQ)NL(T)@qgGGTf5hiXE
zbQ3JkB5T`B4G(f_hs24GFdEl!7#wi0B{(V#=ktw45+=mDM!UO7qjm#KT8S}eL$`5;
z=GqoX<kM;fbUPO9#uAmqGi+Re=HAb<`)j|-fA{oprpq}p5-bVI1>ZoWS*5ly%hsmH
z+^4dfoZm;K3j=PJYO@PJ8;9Uewv9evmc_M@T&6~+)u9tbT$!uzgOk_Tw|gH$lMRN)
z1H59EjGZv-#ayk{*}QU^$&z62v%~Cta+KW%_K_>)s8tNbOu**)2xrTa_w9RK94?S6
z4iFieM$024g685K=erbXtx02U71_9(xS3CoJbhzhWzn{52Rj|x#tu8SZQHiZj&0kv
z(XnmYww;b%pL6ehe_(y8IaiIUnl<vSI(bROTDZ+E)DJ#y46aY_N^bs6-rCRXY=PhS
zK!|%2B)moj@e2G`Z++!JWVvp5_8u&J^H&`oA+q8MKHZX7J7#705OJueX3ocRg(UVb
zZCp)9HcI!4*H0E!tqXvVgh54Te3sx$&{Q{SRw-=MFfccc`WJjxHGtf_^u9&}(?YB%
z_#l|y3Rr6KET?qaO;L1+jN8!x7Xrm6Iii)-Up+1Pz2S+y-SKgIbNa*QC;E+*OpNW$
zf&#V{b`<mLi_Xr@&tXqbA{fu--iZ#6{Za6RLXQZn$i4<+LR!a0>eq#s5IWqWR6Wf7
z;!nJ&i+OyT9RcD6V`ju~(Q@!aal`UD8j)#+L*<_+EO(#i@jFD}aN$S#LBYk=sGv5;
zO{|dB@q(p8a!mqhz$a!x24v@~kUFXfL1=n1vT(ThRm_b(7ql1)WHu{jP7T3-`p|1y
zUWgfGNu&wxf<YsSJrAt;8;B+pZXy4Wa|Xy(yIf@oNTu*wuz}C#5VhFPWvCR@HFF`Z
z5FYqRE`Cx`Gs#I@kAU<~lGdCVwpiXVw)3~9+?7oZ_Xi-oR5R}0p{fJ@=rnSZTHf#Q
z-$xKI6GT^23K44p)?Ub3O4B38T25UYt`c3%#rXBILWjd$BJl9qdutK`m79dxHBJw~
zM7%FriMU*yKYKWa-Qe{Ow7xGucCr5ix0IXil&JbwgS?tPsKn^Bq;)%oOY@3N_g0FD
zdbo1##ugObPH#+t@^R2XjkBsQ3ytU)X6vuT)x)maEm&5gkVj<c^g3vd2ZHek^-?R8
zO5u*Q%BBbo4=W@HlLr|DR03@l3fj8Im(M+xRkwS(D*F*_bv+{OQQB!B4M&rE28S(U
zavv*7ygu8uJ`QSSZ$F$kAR0GZ)Id0)sB0l@we1@BnmLjh-!><~`ziTL21N%>w$A+6
zzK39na#(t?b{!W6a^WaPA*Ng-m0%|Ld!v*8DX!=OR!~xl5*cs_e?jd7t)%F=UpZ&E
zouWPiL4FQ1zcE@HgZuDI%<4nstiss&0$#82?BvEIF>it4N$%^WQ%>O-Tr=l*Ca<2K
zi->M08KLn_2wbNGz>Y(kHe%lR3=IOc-H!s4rvG7EKDNR#n?&?CNv0b|@huXIvWBiw
zqu106-|mNFn+AQT`v#!z4u3a3I)dpz`TS&!<D+RVqsVSBgUt6rf6b1QJPc4Ym>V4!
z%`MR`Wekb_8M-YQIi-!wXNcUVU)8_}S{Im4A<PQZhhGXfzK;=a@<fGBR3#D+xO_~q
z>XK=}6*1I;#8NojUg?D|0<le4bTjk|M#v5Z7g)7&r=c(L&K;e=*z1Ln=6wMVE*OwB
zPg_qm+L=WB`3%Rvkx_aGsf~5uOdPTwsC*yM2Ugh02=?<Q$~q3zz#0|U<z$kjKl&hE
zU@c8iU3epY4E<_T-Ugwy@~LvBvp0RwHtR-%eVn>tUNNx*IGLn;7g<j~q%>&#GNAzR
ztf<kCiFpcCK`Ue$21P?I))=(>0oE%`e)2m+S3$NI#4j?*nL<k|b;ig`Nongaqv#ly
zj0JP%Ey4ng6^nyIhtz{a8hChDOqSBtddJ`?raD*3r*+)yaYrJ13QwpJgjQ}BVWMP1
zW<H_Il(}rQ<(jR-d4Et}xAG}k7o?@u!C~vfi)!#nhlF4ldQULcM4l!m4`tV|yvp!G
zDhapnCoOK9eF|y<h?vBbwH}a<py_$+>dcccNto3!PTh`wxq*er%d7kTJ(Z;9a63*f
zs~v%~u3@X2eybbXn=r82RpkOA*{S0(6Kc)+p=%x5f$lxF9E$rX-L=6d`32;Fh6DYe
zVQ?f+e`#j_T=`1SltD_r_yEJcz;FlkoZ<s9V12%P6Xgkb%;|n8o)=Qwsb5)}q|F8B
z%5>MnQpbA6r@0v4xzWL`vqs#E^~Oj}ruoDCDzaw-NzstN;#DJUVTHI$vgQf5f>n5c
zygSJNs;G69U{128bOX}EF@C)0Ur^XKWt&V%rT|Ht4-;FKKg)B_f0mT0(0;l9n>WVM
zBTHwteNxUF0<CG|E%b^JVU?oHW>bVH$uY6FhLmRT4y;%F7r=UV94445`hRdiE1<Uu
zyZ3MIL9Miq;M`2=pzNP`H)MF;Pb#i8G=hJ38J{Pz{Meq!{QuLo_+qofT9=33%LRw4
z?_T>>7PCyjmoYG#;rmOSU;_`*J9^rML4lw6BCJ&iS%;q$V{V&W*pokLZkP;}R1iw$
zYF?GMdjseS>_4Z^qY)PMOD+Ne+o7hI<h?W9@mOoNYLy3Q?tjfAzX|%K@a#Lo@CNZl
zLk!;0Jl*KRCO&(edjX$-!@?j6nEO`I;rs7NKV$doQ!sQhj2&MPHDMTa1>5q{uu-Mq
za3HwDV*onb?I<0uk8#GvgNDQ5qohbg&?8h%W&$vZ#S5?CIta#4@gStc3ATZzR>7vE
z`S>roSStLjSh$q(i~`Uw)(A!$L7bvPc+@CH;Z12_NDTd((C-Opzz}+AGc77+2m>hG
zUxLAS?bTtwllmG+vCs+=;C)v0ZO00?EEC7XK@&*_1q;H8f}5$6m@O7;e~?lfdy`Fh
zsQ-(~){mA?+^(c5ejnw9d<sh+`W21S+6C^h6PLNLbM7)RHVDdRn%G|0Fc#a%-|)L1
zVZ%7pX@?S6nCk^OflPwRO-?c~fPtYT%;FR%=@~rzeNiN)+neQ2`5RAH_mWQ6;A`kN
ze(u@%b<DxKf}`EV9;u>1QuBf4v{b9K?ww`0L3muNIQ=fI_3&|@NYXj?w=@ok{@d5)
zW_6iNcX)Thf&u1?>b^Nx8g}6N8Gc>?P_DJAinTT|lmyxo14)U<g>0b(q>?ivJm5E7
zoYe`Tw<QsY)E*`!!4A_0U{{__a~iZrJRE~goK(KVHF-)ST`@WoifC_L%N$#G$+;Wh
zLTAPiNMEc)f=k0L(O|39%y;_4tdDc&If%Z*Kjjb>ib83^MPxU^Hp^|-m}uIAYKzTF
zw}ZF$Z`qxdv)L)?wTF}HTf}VaWz+ZmcJceu24JoI3i{n0eZ&{7s+6<|8VVm(xP{v>
zPTI|u9%{$Y+u{$mt|LO5lE)$ur(f_&Tc{;D4~uN$8iH_bJwkkK*>kUOpN+2?CcGn(
zc6}X7W`{#a;Jq2ESo1yLSo{88N8$7!UwF!%Tm$8W)aHf6j$n)UZ{z{sy$A^$F_TqL
zIb0}L(=&PXrohO)-9^|wv9-=G5l^5DypO#s@bnVcjkjRwa@LCD98A2xV$6ud4pK%n
z*eL(Wu*p4h4@mPysM*m=mQEHfMzm0bB4d1^)*uo0)a8N9MEC%TVc$O!W|Q^b6jcLe
zUn;AgL7MCsle}}lluRI`@MF+O3dnMv$HaI=q!5Ro2}aQyF7fOsIRf(Fw1!JEjpNb<
z8YZ`dmK32;{HF~e=juxiTFh<9cwAOMR6+z}tVIoRWROG60sT{j_h5&@!t-dSrYMO(
zagdbG;yha%mI6Z1Y}El2RfsSoGU5nO&HCUm_f<h75u5!w5!56ovFC;w!_#I5>N*`5
zBp7SF{ZUL(>L6A`D8!7Yaul`mpd8_&`=rtp%r0oDsV0d&VX3$&m~$<c<z;NtMnC{z
z--T{LmrL^VyhMsz*T5Ou?uZ&ex38Mr54K~DFY9RUj?nTNy_2WJjrQ~8CmydO0-k}|
z&p-kAYfb&Vz=zdJHH}v4R{Nzo=O?^lSy%cIL7yX~039W$>c5OvYfj8HG>skfgSB7V
z0u3I0Jzv)=yIW22qf19r2FM1KAd>mGI9ilN|8le#O}A=t$jiDx^N=x_1CE={Ed8{$
z0*w2=DR3Bbh+*4}jU(r-As+m$KOh(4Pc>7XhOv{EB9&Pyl`Cd#2j*E?FMVIR@X?<e
z)<^3cojUpkFOy$d9|e%+bjUMj4EiC6Yw`*qrv4JMrP4C?K*CH|^bF}7ltNiCB}F7s
z+qtNBx<`!1U`#jF7!^=UH1>aD=U0PRv0Z=deEJntun=Tv7U=7VKuAsEZUfogkVyhZ
zMp4Bu@gCDCez~FveiiG4+S!8M%r!d!=S8uFvdsGr`;ODKh%OYblSm!Kgh#|C0G{j~
z8)Uv*FbZ1|%eL`N?`Y_266jN6gl3x}?C;zEOMH0A6cQO}e)+WAdbq=<>2E|1iy`VG
zRGvSz254NmU-$SL&$8(sqKlHfDuinOnK<TrwXsJtZlq^#9p9a$3dR+80I``7e5K9+
zb3VdUu_@%tU|%4+vEJ4A<vv-!Nq(1VaLwHLNtWfl`j>(~eX*R3WzL8at2Pcoz*J%)
z99Ezky1GSi{>e`)jG)=8c1H2r8clBGl16~TYR-m>*@}i!3rBno$OzDcCD9qO?~{MT
zC59Wm&^O^cWPC_!(~H@LcWKThVvTV9vvjdx3gSUwI(n?lje-=)U;qjl8C8rmYSj=!
zSchAo6Uol1FRYm%0_1uwChW^Agd{~pXP^q7Gmu8b3d$z3(xB*(N)jG42-BHt^j#g2
zK(5FP(4=-K8bs&ij1uq1jkmY3M1bs57uLzG(;yi^G%^XU(d1@9X<UqS?NCnFZ?~R<
zUsvX;1ds1yg5zYPV{|*JZF?37T;K~_xk=09whwEnRlUeb_dE&Yj3ijR$=>i5@_M7_
zR9EMx`Jjn>;2Yjq-`94+I10u#pqYr}W$&*{<hakqNwU<cqM>m-YnmCd5>mJH!w3bo
zN%ObDd>t>hCgTVTpi#n(-__Z`kiv>W2bg=3bh)_(o$y^Sq#2J=BFwn<4hnM;=2j)N
zoFld{JpJgwCp=fN=7YQJx}E->+0Nt{bIGyr>3PWJd6^uq>VoD+bM?dFS1h9Vv)tUS
zwIC(@GReLf^SsJ{;(fx`i_x8i6N<No6KdBPLSj8*Zo0Xp*i!PR38)ApRn!)C0I4th
zv6!RMmYZnCmrExLS_T?vjZD0h#F-l=2&ib7zRy1T%(?O2ISHrC+%YQrv4ywl!`Ap?
z^HY3A5Nj#K2e<BQ>lf_DTBE)BvBrljiqeaH2b;ZSI-*1m!W5pm-9Ylvq~rnA?j;jj
zxvJg#W$&-r%bm!Ddxu-TMWm%A=;3||R%9^M4*p0CTib;$sDWb`@M-7~rC7>e`Kny9
zZJNE%MoA#8T%5jd!uYy01!tDap(*0Vuw&lBG=&_VP_x;Zqg{OOhro+Qz|hN!3>Q1^
z7C|b$bNpRuBgX5JL1!4}Fs4z|T{+M)uG$u~=!^&JAXc`O7mzR7_V9T?)$_3gs8t4=
zL>)R!3`!9AvBI`{v~>AG?stS@KN={CW{rpV>+~8rXa-Sq#6EyKVh`o~V)f$(O;mi~
zWL3Kd7;Pu)Ol_YND%O~1R5$Xq<b5P{VFi?la>END$*q?0wn?Ks^-mEPDi1Pr8QGMM
z#}&oxuSh-aTNaJA@G}HrVNef{l6;hlglXHz>uE07La3zjg+nV^S4>3)7Do>MYU|lM
zJ;95c?ph00T!@fewzHeeo8dfhSdl)$G0EcsB7cO4eEl>bWdvtR@dQW_%%FCG2!16r
zR7GR#f)LsW&~QZY^0<g9J{b_<BthbO*jZ+QDt=S}%*rrez$i$1LIMd3brCk<0K6?<
zpBj#N3X}&*1OqrU<C21~^xS><xrb^Z(`tzRy0+Ob`S6ots3>rox+(nw8(hys3V8J{
zhhz+&f?Kwm&Y3?vN`Wy@ICOaI0Y8y;!wW>GBq1|xYJ5*bbbYVho3tiyGoIIyc{}ES
zxV%zS$E%%thVa_WuBfzZW~<GxmS~9qHTeLrN#`E)(>gBxVak-6!i(Rg95v^I=R9bO
zx1-1w`2hxjCb0BNam<*A94%)z+Wj{>`lq^sc!!wmdM3Zp2B2g?xgPy)c)tZ+j2Sxk
zp2g?QB2fSh)HXj)_a0qun}}-^0(LF*Q{7s}FaNnn9!N+<RbR}7y%;-Ya(rMu&xt=h
zY^Q(3M#WUlV7Zp%q5<D<+X(kGM*w0!W$#(3?D*XLzt{B!6u-%#HAA(3$3$?9G%255
z$jBbCy0_0Bk}g9AU>WWNDU-$+A(wZabWtZE86>`-<iEq!`l^V(T)z9Djd%H&-5Z5@
z^uPmcq?iALOa|U$VH%km@FL$ZWVj=v*N;#Cqv`QWy3F!-6$m>2vh03}3iUVm@KwQu
zz73|E4%k(l(PRN8LPo-HfiwTBkD%EuNzDv$W>)({^m&jTKy_x_Uv6!{Ht>Rcz4qAM
zjFE9ZQ%NNVu}m@m=t1DQ!kCW7kEISy2I9%A%1V!L0^j!rm6J0W-{O?kEKo>gamodY
z(^CGlJHqE4S5Gy|Bok86E72zh%($(0#vs`;w7NpGy*?}-B2ooH9ink+65K;OI3{03
z^6f8MrDJURtoHH+qlgjp04ittraNA?EO{ODk)U!3Z^J^n;{8|sY<G=doq#2>Mdv{o
zaLuy167ovn{6yg@|I*yjN~rlJ$E$)OmSl=7af68OW#KU;XGO%BdsGz>JCWw^JjxUO
ziDVpL!pM8DEXWnW{D5+3%L)N5Ge3xC8$(p*d1tVhr|@J8Qv{qWrrl`OoONfs+CNj*
zQ!=ViXoJJJ<|3-ixH&pBF*P^3SZUncDJS_Fr)M&@cAMXwN&a++CYz>>Gc$kmKVAM=
zMkTy5bjR<hf?uC6yQAS3iw`Szq55mF4_u`c)U?d25zJYp{q)L6F402G5*&2&$`U<S
zd!o<X6Y~xLg@Qs!{}M=4(lN#~Ps?xFsdD89By{hDZHO3Ol$o}v<@3fWZU1VVx^~b3
zqfmBNpYXr=8m0p}&CT0F9AYQOvBP9yru%p|9yQLhF#1?)LfpthYnvK@_eknlGam@G
zV0)Z9J*<cCE4*WFH%7RhSA2%gw^+(FV)GUX*SaH;s&_{}*slGF8Xq`+!#-kbdnMR)
zevpt|YAH8;<NRum((nOiqE>QhpA1sdi1MA3;;*Y0R5L$qpOU|xN{Qai6dVJ0hj(}K
z<&Lzx*<o@Wapy!CZcoK~A6fkV*b6IS#1CQk4|L^76ehsopPw_YZZzIaz&5h^KVE(w
zA_#>Y`uDx*rkAV=@xHExpYR+k#xjkj_HxQuxQ6VbqE^WmA|<pmGgN;bEWn;mN`}h+
z24@I@Z-p<~kgs7bS3$Wqh2ge$GkDNxZ3g4>n&IvE8MonyLaBo#!?Ez__v`+>SAsE^
z6Gs>@t)jmUE(10cq?yAcW`m#2lt#OL7)8vnQKBtg2YPD)-v-I&lXrJsFMp}j@N<<D
z5-TqV2lHBFu}|)<xu@@F#lZ2E%<_PRwb|eWyNt>lsp<>&t7Z9fL;FWJwB9GR@5dq%
z_Bh-!ZPoo%PiJh|UVQs*`?fb9LcBoYRUW)5R57HgK(RjAYI$Io*StE32+1ON`J%*Z
z11}!GnhUH>AO$I`Cxt>3qGX9Ig+Ku^CA2}DK2l)@uW1$Gzz-usf5q}J0xI)}m~yP7
z2dXY+;F3#_<vczGEO)9ffg&BSwPEniFxXJ`z*O!?RPRWu)`g>OPcdWmteq!oTfiun
zK6|4-rhW5kXq$G#7l1nj`94M}o0WMKZ{$Lih|Jg8pR5-IoJK?aCRQAV4RDk2zew%t
zg4ODsGpen3zeXK78BaR~cSstc%}~#fm_|H&#KaPD2lKbR@uY`r0?n@rD~gHn0|KA_
z4hH^f>s(BriOQ3hjak+3jy!(qDQE*==uS}=-R$O{5u2r;l#oLRcYyHq_(H-Hh*U30
zc+nkL^!=DO2DTf;Cc!Ptk&qIq1-HgabPRLl0dRkTr<L?`4gJeH=DtdO<=1+L(0Si+
zJ58AJ|2e&3#@a-LRTC;Gky>{neA@dU!uLF6Um9orB>(wJC+YgH-_?9dP{%V^@e{lK
z3lUH%Md_aSk<;`zz0SIP`Dk7*7BzYiMlli3KId(RQcuom%y2BQvvTh(p4s~TZN1^y
zXmk(K@{JHJXSruDtv&L;xA4^$*@YZ&+{b4D$-V#4=S^JG`-{U#Cw`XFCl#m~m^(y{
zhN(}zXmO5yIJd#NAY1d?pRU}cHG7(r0Nj`rVkCG8NLxq)SbtWbvZ;iZRPg|<$KNux
z*S(Dd=j@`1n4}M%^FRv5b|bpxpScq;FIJ^#nYD!&G*tz|(nAHh^YyTB<s0gx*`l;X
z1tO~vqSH-fs<31cgxTC(G1DoZc}CCPlg~tsI=R|(v8>kd&f6yT?;IHzKEqclyO}eB
z_k}C&5ayt2Z_xBJU5qo>8f1gyQf{cbEhldaI~ltZC(P&hyNdEB7~Ip?c6EHEr{2Bw
zNBIRrA_RX|2qF05US-MVjZjTzqd_xD3dEC{Wv-8XSPT<Z2X5TL6T!nH3Xa7UlTigY
z@BhFIOx|)Ug2)&dt{3rIFrJ>VD`2T8Q3OHr7;dhX@=!OFu!;vV+Oh+csc{P>^TF5a
zLg`TIjBbf(ZG=5dejxB;eUp>fG1Z%)^1|r-<(ba%&RB3l$>J=&8#Q2Ogb4{-ZN-0B
zkUvVsSYG}8MwN2h@K)$~ALfRvx>D0Gw6J3=igFqmTd0Puu8P04$Z$8epG1L%84_Z0
z^#Z*}jgxN%aTp;lkw}!YQ@XL<_Kwx_&T4BHUNd)mes1FP%Jx%BIf+e=$XCYDb^|k0
zXO~&yZJ$-%xCZ>GK+G6n?Vj}0Ru~&$&N)+=DVzi>>xXer!r*8)1nRFi@m89A7l52K
zqU0_Q3<O65tP81DuK*rRMd#ygZQ7<p4m-opz=X#!f)+)ENTq&5@}atm)1@tpYYW$|
z^V?+AxKb!J*#-K5s3duXf(J~{&j>Kl`e;g4tZ`mdXhXe<u2{O#u`_J-->RaN13VX|
zjystuB`=cKd>sAp*CbXw96`p~1?>N&v#}v%-tw-e+qJyb@~tGN`ImR<?|In19=+YX
zhUzJocUtep(IR|bj_ET47}NJpOpVktT1iq2np8yEeTxD+Z1GS;(5u&Jhlr@)g9c=*
z2|&MM#9>es3<^!@0s@M^&mds}=W8A%P>Lm+E70JR{fUuYUuOf<wA1nyhZN{Q4`fFU
zJSmkrnQTK@lG4ZUzd|7~p&94OE{VV4`Gv+V4y&v58{XnatW#TZzHivAzF7abWJmmt
z+?xj2>iD<h1QKj^3srVc%ehBXomeA(Z5~E#75~`)!V*s>xxmKnj}V2BrPpR=rQ<S6
z_+0}=4;}W&b4TYL*t!QiJ3^Rusnf9p(yN>uA=@fvxB9IDTkMD{)BO(qFAG3RC{eyF
zu)^pv%s$1vri?6niUR8`Xp%!=M>K%BfeNW2Vy+>UA7v!2I4_J03D7~>9U1Hj1JcUZ
zfrntvN`OKtL41ZK!y$0wD^31lH$@Vo%R>oVFzevZ=W!%j$Bhr7Z1Ab*!df9^47^M1
zm1rM95R&PikOTb&li!{Bb`GiaHHb)rD?1{VY!8){+`UE=mXTbAZAbe$_<kj6N_sIZ
z|3UwniE*!<NQN+jCB1?D77$ZoB`hS71p3=lJ$vSc)KbKHfPba0sc%}O$QFjATXcUr
zajMM&$(H6r45H&fyW9Q2+Y5Z}n5Ar}R;fwR*4-&=0B)Wi%q_!F#z+vZt`h_t-gUL_
z<!2exVfBwnd7x^fHM%6Q3*K>8v8)v}SOWYqL}TG#eR`WGhm7e5Uk1%4H*MZtU_5_X
z@A0&_+ezQ(dc4v|TKTcXDv?Wds4}<Vdh6dfFI^#Zz`6p~zRP55bhY!C6^Hba*upw0
z+$hv&dE5dG{V~HMq{<+n>kADqzhbpLB+7+*%5QWF1&vTfsX_6b>pRtLDEHdK)o1hO
zvSTrBhx(7`5lW=fKN|cG)?N`|>*P4Nd=jHCh-F>H8M!`Q__DYsPNfJ=rftL4LWNZx
zm_E6q^$aZZ+d@eh+B$$U0S*3ne}g2QLH0HNmCU$d3aHkt7q&uPObON!MFBEsiwykP
zOw&GR|Fd9hv6yA`43+fBK<tnri3nQKlA45;K1pOv@1HYwcgmT0sv-*fE2z{;BMpsN
z0uLaf|FqrL<qhAFXN|H`dUvpGeLJWP0<iCd4<&>Lay?o`7wJM)lKMmVz+;FmR|FlI
zIb&gL&#=LfWubBQ)(%Ral_E91fs-$5P^6iM2eX#8=jtxuE3Dm?JV$8!j37WD3QKCZ
zeeiTd-%yX|dpC&>Gs^4jhPzKxor-e9Sb2o71WCduxr+2T`T1#yf5!&-vq}+Y2AM+g
zWFfsYV`&rfQW#3~Vm+iWlm?Z&ijeUvX&8UK4Up6B38=77uk<KkojLdj)fuO|a&#pN
zK5Y}07&VJeX+#O}6-|39W{kBck_Y+i6>)G<`g$HtykMC5#K!qS_kET71H$YV4Zd9!
zgHnt^UC8ANq)>J>&FZGAeu3!Mp+on3;>c*t;-@<-yP&o-)_NkvZ+sc1Su}qM$t)m+
zds=^C-nBga%l6tx{S{+|WkG!2JI?DB+gY_w=rcY;68i1=i%~^z=Eo+-DN9;1b<IBs
zO-zt$IIe&3#};$1Vp%!^xKLL2MDLwLNP>P@L42H>qGK?4WgNL4wWADO;_hA$XN1{5
z5mgxN`ssrQ)(eW)6Fnv7Hn~{C^xOmXZ&)9kvR!08fuoDyk%=7=tuJap$-gOZ(!sb{
zbX!p(kZ8a*k{wXHAuI~tOhl<7B~3f&bYU2)RcS>{qbnc`FS$da-NDZSJ_Sn37H!BU
zWH^nCgH#?b6n1m9RvKPYe%c;_cIGZ<f<OXB^g^e(`EvdBiqV%8OVjPu9=1mA;Wb`6
zrv6_vM}@D~n%Hk->LlJTXyX(6q1ZddFGRwbnp!biCNM%-z<BXopm_ES^tk%bz7CS%
z?nF^8@;5gMR>S=Gz^7-+=zJPuKGNl27yrc>Q4t_6v2eIMvznkNORuA%QPC$2KW{Lo
zzq{`V4T`okKerIK=;ZJh$(FVx$vELG08<9Akfk563{rqk0KejYanreDC#U$f!1VFr
z%RP}8%ij&E7^qJ#<Al@f>Igmni6vGPFNfO-jF-yz?VOcnV40|uvuia{LP<(P=0^6K
z+v5_8Y5$j-yysOT$LkPQiphkm`Ulh2@Rp;;N>#$9-!C_<R(OVYVSv!@s_MsEA^(CB
zb;%NXB9RoN<a*H}OJ!-mfV2cNK#y$D0yH9Anc5f|MG8Z2uCFdGMbr{IEK7DwT3qmF
z4_mJixTOGMDN<Na<d)wrwsq7*y!&2TMWRu*9|-M*qJ<I0_3VSNv`)zoxV}N(9|%4D
z@rC3HlAOU%eIKyYGq7{osV$z+sb6a(Ri$xmZ1%NqYxBgvyI50}1tn-)3ncCn$>iwR
zrPm;m`;fZtZV(79V<+!!_mMN?(=ut~X@f8y#Ru>uaESsz%2&u9SFkR1M{cV01xq$L
zY88G39Y%pjV$Ry=ntbllxxc^JY`4)BcY;>2|J<T`n|tXCt9x5x!ag@wkQ9)U7YRas
zeH2Q~C%2ym^;Z^GP6VFK;SHmH1|`tfS15&v<}4e86Bg(F(_u_1)$_hnQs;(8X6}-A
z{=&v)dnYVNg{o&Q*GZfI!BwSW!K!)(7Y)lkZ#t3GZu1&J-V3CMQ}zcvrTUAM*q*IV
z0g^*dzW^6jkmfVe=Y(sFY^08k^2FJaw!h3}_Ym@?wEjdX&6e-}K*l5$DU4!v2OWBv
z31=8Tg2pSvK`8#Od0Z~Kp~SEPyFQ_O<od`W%=1r-<nJEyPxAD(zcTb$Un;AZ6uvVz
z!^SrMLH5B)L>c9{uE&wwjMT@9(By?xombEdog4$pivI7CNo@{7f~MO|zvg{Y%g8{4
zo+0$Y{j%rmTrYTb1l+({X@#_<bcImZ-=(YV%upCT-o3lU{832^lE}D-86=ayK}o!E
zLw<n_b$>ZrIB`$!c5g6^hFM3@z%=%Alo9+<#){K?GQxelMfac4=m^Utu1S-9=YjXZ
zMBk5CxidcK)3R6T4awjt261XIk313y;sF%Ik2;{WQp}e~p7<dd@-(a*3b1Km%NFRN
zSzO*ZxjmJAg28Q}4_<FshmmscS!u9kK%4$&beughg+D{%gZKqxwhS8c@&#c&)B5@t
zh!TDTWJSo#G^8Rz73imw+qSvt;SyeOhT*U%$b~U!X@hl!A=Nbd>H-ruhcpB-R|;`7
z_dYQcKX&94lGCyh5=t_K1M&Th;@nl*-NdH+b>R<lLYis@G+X#GK(B8PQ6PH0xkRS3
zTV|~h^8=6n)P1^eW?F@HPcOvc8T_6vRDf3BvP?LYA4O1a$~a68>RcP3fO2e@5G>oz
zT7DY_QM<Uq>Z>OqD>0R)ghw<8Eh9i0<h8xrMbL)00?D*mQEzh$eA?Ljqn3tZSMXCT
zZ)Z4CNmUJ0w?qAyj@B#5(~@7cy&|TY8Brx^47s=<q#Rs0M{MWmt}{uPX$}@nrN~`D
zJZtc^x29A96+&r=F?t-FD1aS~AsLl4CT$T+_i7pHH=x_GVsK?T+5K-hr&%fsRUt`R
zKBaSwyLEHRT%uovA!BNy_E@q3J0PvF)VtQ<12+jrp4NYsNTLscVuW_yhPVrBo*gKS
z)+uis^3)ZSpNI^kvYZB;fbdOa(+g$OI6_66&UOd)cxAsn1f{7A%dHSr7_Z?fT0>Y}
zzi6taJY)t4mAzJAMjznY=3g@WQJt68H<qJ*TT(W_6_)nNh75cCx$eVBX7yj*(PJxo
zweZXC!vcW}0nBVS93V?8$I!#xx1Tgrg+<(sZ&MtYvP}l%PH@!KH5zXMRwAl*OtC5p
z8oGDN=w%YJ!=Y>P??lfM6PFGzGX&<Y@YM9&4!jT30HeJHv4{(#1^0XkOh<SvXUVb3
zV41_^y$p9s7qI7_A5KF=NTLxV0;i~&eG`>k<F07^A$vO{SN|d@ybmOqqPLn=bb@<9
z$Wrq&_^r@_?(96QVeQ6<4?(=WLj2YyMzKcX57N(;sFq7uq15CY6L)2RR^0R%&qLYY
zMSR8oT`J<mGbFJb?wN^dMe4qom!Zavq-XrQap3WZ>L^A4`~2}I`c^c^bc)<f{};zJ
zosWCAAb$TmY~mBu9AN>9xFM=IKu|@V+TWr)$Y8P#CyxSJ0TVfhN|SVC(JNU}qoJ7H
z+6DLiQQ;>JY_^VOLzJ4jAe&PWuq;Qa;Mrl>(=Gg0`=*lshQRSnjMTCjo5XnBWI2pw
zpNZ*Wi+aOfND?3<a&vpYpC#Ih7HM3DskczCY3V9?(@=Ric}r-NH+(?L&n|Foi9<9@
zcGAw~2y|!mh-sDrq`hZ97uXgN6<hgv?}8^S?G7IpWB^|i6j*5Q1`yJ~2+hY!58Cy!
zdFCj!$A8lsR_G5_#sl~gxTMEv$BmQTS#SKD$1me)yN%7{^%dr{Q3f^E(MpDTF5^>n
zc3r`wBFy&a2*E6VT=6`J-{ED<(WV&X8VM0|q+y03{-IIC#+dsr>(U<HS=#-b+lF(S
z`fZ&;!S_6W5#3?AbXZkY>ytqGX^A>{7h%&l5lrFNY0SH2Q;2f?$Ast=079X?p}H8Z
znwQtsb2Kx1>=T2E0%+*<`FrI=JV^A?KiwG#<KSOEy-A$oIq-EkC73$~3H5|aK)1qg
zbwaQHsL*b=_P^BJC{!&fDg%^N3M@eLDPQh+$4_&;Z48m$!pHk})|y{2_XkVEi;8l0
z>x+7Z9bEoPN2C|OKyEXa>1{xBgX!>(E)b^dt;_r7wbO$&`AHpali@8JME7-!R@)9d
zToHXjr8o28)#dAU<Dj47VO@VHOJ?!1OspL!O|nQXN^yG73__~Fr*dQ8qt3YbjB>q?
z|MZ4zwEc6~`w4-i5cxX@FE)m0P=Y&weaOYg%Od}r)?u4iwS{3TRblx{&GkK3s7cOn
z5zqM>;967dbSFj<9RzlF6lI=3AcGIu8&b>qI<SCN;sjOQi1Oj<`_9h1WeuA)4hgmM
zll81x&-6W`AE`1*VUEZ(Z;SNYKl_k@8Bh*B>due)R3FGYUMIA9gTe_0p#`s2!vXB`
zt7Iby5j3JCNL17AoRXnMV4G9hvjjo?%tb=OHz-S5g_U!fgY&z&;vyLVY|3yll+6=I
zC?Qfs5Fz?uzo*p$!-+x52_>K;AP*3=SkqGy%9RnVgdo@ly+fZ>r2_z`K+*mpyu!#J
z|3doPn=~G_JO%%2JY-MCj-MKsNa%oj<Y~^yQZ)@v781+K6*cv?--+!@Lz1<Kj}U{$
z27k9WwCe}ML#eXZe<zk>Hu=!vc(MRW16JnFtVNnSSb1v05?5dIXH4~ox(CoxZNk7e
zAxgcYze+-Dw@nZJ(q7b>yyUw6l{yvayH-if+cLZGzD~L6WF868Dl)!QtZBxA*aHFD
zxHgG5B=Ll%K)|4z3$?x;hgEs3F(o&qO>QK)1T#O{XM^C8lZlEb7)r|wG|+&8LxL?L
zCtGH}4TC2O#yGE*^5HT*qCou1`UvODT-QuoWmh%LYxVTsHV5~Z3hLk?iJiVva$SX0
zs%fgvvD`mNxN<TSm@DO`gKrgBh|J<f7wQIUqB(Mi3t~1IJXBw5K&Z0OGAMUPsAlIi
z+lL{un*NE1pJ?n@GH(4N)VdAvTnoJxORd1k8JR|LfCZrouDfG)V47%U*E6K|{aF2e
zd`A>e^{Al&ULk)Y`>rA)L=hk?o}^4DA+{;jurnaFck}Z2x2&Gfo4>!9n^5B&=s7ko
z7snnGzWN`rZ#b>&vv8RE*7J52E9Ya9I2JGWcu+8!ge5p+O$^8Sz!Rrv8nB7ZyrO^7
zd-YM;>+yO8h@nfhNO~~mz?n!m6bX<9SRj+c9a@@{ppQ=`!7xigh>-B({B~~$`d35L
zcLvz@Fnc1&62hRlA}qizFQkvk6doWmC_{mPK}~hXoV}6=>K?j1{+?dPxlQc(9e=(+
z=V*+6I&jsKd9-s|D{9mrQc|``lt`Kzc+btPbX*@IsPPnT6bn9PEpzl*B)G+RdK7c_
z)0cICD}Ov%7do1XoXl%p3rX#J=f?41-K9o*v5X9R;Rv62d+6$CkOIKqP~lG)`}JNM
zUdVKuz)I<o>zbw5V+aEeU&#q4YzXfLj|3t#HCB8`hxOHCYaM`(c;an}FVX(Ib8J&P
zc|RU1=WnA%_e)@?{=xETr|anDut94hl(GN|5xF?9C<1(k{Lv@@NR}L+ZXP5F>e#D)
zBJ<Z3P^doOfb!8t1Cfm#Mk&sd7rJwS93BRY!XngffCdW<mc-DJYpXvnem|=8x?<{?
z*<&KVGganfA<(f?y4LG&Ynt}Ogd){-2cu=J47>2?-(Xwox`jKBY(zEtA{C3V%;IPg
zC|(5D3lxYhOQpZ8c+4Wg;X<#R3d;5muT`f=i6B#24;NGhTbCDauA8)Qm4dOptTEKt
zB*W~@Y`Kwf_pL;VX9H$ykE*`sz0ZXtqD;!5DGd5eExBoUU+KcL4ixq>jL!67$SH8R
z;*z-j>qtTb?sDwf_Fl#RVgVEO2?!`BG4VSAG~r=TN;^vl4I`xxjb?I&ln`HXw;2Y8
zD<*4Bi;|aYxZZ(E<gE#thEtgBQ4&=a<E2scKKo7Z?HJeJ<6(PXXsx948X!?Iv4<On
zjfLpxyHl3%@)e~+QWXbjAQ2`92`u(?7{$dYm6b7AGUxrNhwpd~{>P<Q#+N{)q!y_0
zas?=6*T))F5jV&ElX#D5z@CktcCqkv)r*wJ3f0Mks-+RFtUa;$I@_nX_;`BXWsJ9d
z&rc^%10c~vB;-}#h?K<@k>kBa(JNmb`a5%rybvwo3HbAPVb_pvgkE_scf7N@jNN`O
z@RsBM`LFZCFf4pUa7DFa=1;zNr^Nl7EYj^|n=%r!#KBt4VAN9IFC%z@Zg7IUeVu7t
z+n>yaus(eQ65B_Bf5OM1XXaBQU9a9denN2!Xk#9ZZFFpAhlWy2RurL6jx;}XiD;Ls
zNTWy*=(1+qne_<!4Cx_=V#DMtz57k(AlrvfyI|2RRjDUBl}f+x>+)I8_?LeH$S0cn
zU9Bh};$8US3%C0=bn^2WRFAghbhCYMhOVk%?q^Af$N4Qa`N_lNAy`za%%yYKJ`tHv
zL`7^0=3#|W7N1iJo%Er38&Zw|la4cDrP^!eR1iUrOEh`PucTl}C2fArogtUM6z2-m
zmHy%++&je!535&{j}T-!<R%*|r=k$~h(U~f4m@5fL{N(JO|g99YnbsNTtkLxKS_^;
zgGH<Y#w24NmPjV4b9STufY@;o1>vo_|I~fg(ih%Npb{n|5eEPz0x(L89E3B(6&L&{
z{DEY6{Z^?`^j5^1l|?$E%uJQ(K)p_p{bzNjNMn;2Y|ID3--DHe*VwKy^^a|&Ux#|!
zlSU_{3XZdpEts4(?JdBY%aYYihlmCFdlSLN$?9$J@4w$5tGjyNkpvFb*U&?@Fj+!_
zXBy2~9_u<de8I=EiJ4PLrg7v;($Y$#W{}7hNaq}e#o&()w%7Cz_GmT&buL)0EiXG3
zXhMdsbi_LB^vPuUe~q&ZS^Af03!V+$HJ5Fg3B>kR8L4IOxngDSMuigDg>s*=u_dbF
zU%h=wuIJl7Z^NWh)5lN7&X9di=Pz0y1HhGV3QF^U`r-sSO7zk=6O#(G>&o}o?NPU%
zkZcTbL%7Yw^vR)Fa01{;9SK(z)5p%)Y;+c<J6`znW(tcC2os#cMIpdG3bgWR>3!`?
z5@s7?;`kb&rY;D^{*K%Gu7wMoybY;QN%b3MQC<d3a7uX|Q+l;(CuhZ3`o<mA6X&WT
z@qLZUX6f^2%V(ec_{*HX<KQSTq>BMEnq`G4WD1Ij%-8ejAnJhU%)Va^No&#+d6du@
z@&f-1UJ(^=L8PLH%~Yn2g$CDKE#A+#K^dR^`oqEm;yd2MD}h*nH$R)$|2Z^dmPQ{5
zuYpn8-rni8+#CZZ_&LXON7&?M%;*m~j(41ocJ!NF;=UJrb&b#~+fxlJ?+T!@1F6Sv
zS0j>Hx>QUI3Pa;)Wl7fOB6wOdcO>CJ(g?7u{MZuFq<zF<x_o29bIuYI{fz)eUj2$6
zc3cF{+7L~&JR|E2p_)|n18VABUda<HeYSpR0`G9E)@C9uEiZBDpX$d>-)oHDM|_m_
zCEA5O2`A&395po_gF_r8=oso5(@JxpL7%vvI(W4^Wcb5_La7FM3Cj_<Je+-NCiWq$
z9U#h+#1$I)PP#{LcAqqAwn=Htu)p`*&Ni<byP(4zqqVQGBS3ATyCB!QMQ4=k6Cuf2
z!c5T6&{QB`13_w18SPm*^C9LyuAPICH9fEuGDjNV;L{<*Vz9VT19G8@c1k=34wuH^
zbpQ5M&k?xv(j^oT<&(u#@E61taRyNpQ4JoSB1PvL`ti!Fd;eRc$rmyvLs8xL=K@Qh
zLr95u*A!3P7$sHuyYZ)c7W?(xtw-oXEU5LtrdNFQF`R8ENDGU@%&2BG<tYO|M?mG;
zM2oiboj6xx+1%BL`zrF1BC+Zx6Ge*Tw7teg>rnFsKjq4(24_Y^UO5#gV2avkI>%2n
zrI~36tx4JBm(NX{t56?;PYNgs?k?=qB`R})#D|+@=MooJ2Dq9S^8@+jm7jJ+zhdBD
z;rJuN!E(vmI%5aZc7eX>y$*CI#|%4L>Bff#HcIK_bQ&uPfzYpAvTOyBJOUx+(QB)8
zf&vTlb{)Yq>=f~M|HxFT)_K1GnermT5}AlIP7`E98dAj;g$I)o7?{g64_(hA@Ua&<
zrJPQFTf=lp$<ZQVj@sEYTEwjEf;gr)-QFd(=Ci7<C*GN2K-RzJGWePPdst>m{j;no
zjwG8{uTG(3Q{He<>0(5A>a?Uv7uoD_q)#?-Eb+{A$N2CBks-y=6SRsa<fC(N22RWJ
znG?Za-xfz0A5M|w6}EOAV)+Dc5XgTLGXMZk3<vJzw1)ji-%Q<YKPYwO%UAgFhZ+}q
zI!d}!OYh_(dC4P<Gzwt-kF&)<X4$j+Y7auMRFTv}Y%*HdyI{W$j4s7^+X^N3cooiO
z3YEmo4AAHZ#;X>(;k<s%bhiD*!}(=@2Kw>Xi@H+S%X}i6q@Gbvfgv418X2B2EsRg*
zD9;Em0Hvgopthe(^2cFtM*S^FG+n$%6P{n1rs+qtTpu0lt~n*e{oN(yK9Lt{e^uP0
z$Lz%?3xe-U&$nyU2sr*RT}DmDiPD~DlB&V2eLNT?tHE;WX2>cms8sZ5GCKPJr3AJm
zpH4YY&+U$G{oE@rBrI#xoM3VK`P8^VIY{(WHWPiayK()6^9?D_10hK}9Nml8PY5m1
zj}9bb00~qFS%R>LIga+;HX^MlN5yf0&t{J>36PZDo~KxaPRYr0$G0L4>`&?c#kacg
z&Bh<Xs$d>y8(`=c9~b}+)W8-c+hxsX@|#ZG+a$P~Z3`_!-3aP3v)Hk9cq##7C>;As
zsShtp!{3!Lm8Z3`dqn_hhxkV?&&?`6Z(Bq{yGHxc>8vCgClg!~&3o`coD=plNS&b`
zN2xG4fVWbMv${lv>8kM;^RjeeP5vyRkTL!4-<UkRvdN2p&iq1(v(Z+ad}Vre*RsK@
zxzEpOIzqdd#3$SBj>ySjT){MV8<0l0)<3+&x=e)<R+GcW#M4G{@tInq!xpO{6`%u%
zx|AT_=xM=661;Brkd28>N#`s@woFR64eGXvD;v&k%@Ss+>X{dJ*=)PwpPVX{0xcaf
zC*9OL+1pd<viTbj9$Noy+dxRR$GCp}sg1)YRB!i8p9>mRH#T~>FeP)h-X^y6jP}7S
z7Aa4SgXn+TAlvK57UN;WndFQoi3`vHB>9>w49?O1Y(K8aEtq<Vb}_Sf;1KW*KJq=#
zPjDt>lPQyFjIoK@Gu`jdT<vrW6gETdQAdeYGt3N$XBdpaha38sGDIrYHPEG%BuoNQ
zM5WQB&rPD$`RkR9*s~5-=Q!1TIXhy@DBZ#(0}2L>&+DNS1vALPxI&hp)1`YR!y+3_
zy1H_!w$^g)e*~SS4t;t%_DJh(jtDe8r*OweZ2aHQBD$|T@SByWbqDx<kno%fA=`iG
z!0r|_gP(gGendPHyGlI+8Iu$${VzaR7mQoAYuzJc^~AAUQ)~Z5<Nnogd+xuH?I#93
zxgv8807wC}q$sU;-<0zPS^MSdgCpcYbo!DwB@0kQ7|LlGrXXpa<P$+8J0p<=7Qar-
zR&@e<wBE~nUGUwZ&3oq{H8GHA2*^;ySJDw}O0IB+1Sbt?jh7eyeJ6eb3GJ7#kMO0a
zdrB}Wc1E>P1r#e)NP`d?Zd?g3@wt4R^}qE;%vvU2Q(Sl{HC<|Hq!2ZrOE~mhkOSb$
zI$>ShL9V9urpNpkdF6SP`Xz|T`7MpU*XYe@%<tUXFu?&+^pFhB5^MMLr^vswih@}e
zL}HBqt<G$L8h|QkMIJkUl>jgNNkpSo0ru8Ep(w|@^$Q=@zIUj;w|}S-L&mOFq;o!p
zWom}w((S)dUN42HbE}>9g~Qt{vOBM5cc|}=A8<OqFzjvv?R-+{vV5RbY~;&Q)Ke$i
z8;RPQBse;!(v={3S}{R|HpPWnsE<vhr}=nBF6f@l#Kgir;@B?_DybA?#mYcu+#myN
zf>!%vnVBsyGlYRUNy2^<Mx#N3Ub*H&Rb$FS$HNuSQ&Ig8To=ZUZzi{-Ze8t7V)~9)
zi;TFG4%d|@?49%it&M#Tc7s*HBIpRIXLOSb-eW(klKFhw`$<kJCTVEr%j6Uo+UwrY
z9iK)nn|6xVHhbHeMccdJkRjNVF2`A?p19t|hEF+F{IR9c^DjvX(aSf;6l{pCL+S(K
z8!3+*F(ahRtdf&g*jA(9-F<2VOl-llK&kED{`!rbT>u**RH4_lpzK3I6q51=?GHpj
zvoO1~WX+^t%`EBF4BynVOJ^qSy*x73#*qIM<fVbB1pDL6YcHH?6WpKA=oY)Y!IhZC
zDrWtLRp1!Yw(vh2!=kUG2oV7q?E2#fx9ala1}on~JqaS^Q<|3>y9qX^PvvBHh5f*K
zA2kn)5;ER*Fq0rojvEITLAu0%m$>P6+L4;~NgljB*sS%+ZGDI(>W%?O{P)lCZzf5F
ztVkz%CTCAn^Z36k0MZ9d1KKsEdRk~P;21&XA^i<|q*NLmJAjg_q{Q{#lZ=Lq!3W#@
z8{LwwFI=3J755h!_dUA34T7f3hJfr9dN>p!XJtSb@dsqTI5A2*<-7)VNP;01kp~YM
zy*4#R?=6wUy0{%+%>&Dg=Yq8@)TsCFlDlrSLCo%6p?&rF;K6u28f{m>{gmNVF}ck!
z^Y|M3rn@<!okCtHwpu25wlaZ9D@`}v-5g1is(jP{O;ECX+TJ`dje{ygvIf~`q$MmM
ztf@n=wOzy)v%sAVsxvHoB-NrqWtO~c4nE)emctntv-#Ixi9i5+33SO16~7YWX1NGq
zBxnoHgyH62^tgT%0?7RD=mHlI<M!c_#nK`;1*0G#J4E=b;q6*QTNkJCfi{ea9ckds
z6r_3V=@vQpjA|e{Sar>g7u|z8*};h{-5=`lwb_1_onsfNwD*ZzCob0EbYBmYIh;n0
zz#XIhO9fiZqF!w1wqWAg*yhLc2(g1hzoQ7rKd{MzB-c0l!&-}xk;YA~;lhK5(Y(KH
zL*MQpYQZe1)+~$Dh#to|m0g^5N>}7CnOoM@)<iWuDwb&a2Mc%B2$xFA<TfZM1_wUZ
zMz^-nq(PW(K7^;xIn$<e<u)$f$pc{kNshrrCYelVV_tKG2c_IDjv3>N+@U3<kR3F-
z<t=O7O%nxeeGCW4<dI0x{n!S+(UodFQ(Sak1XZ1I8(MYkP<;55FPqMdbneIz<a?{&
z3o4oA0b{}nBdjXxTkx5`em%0T)H`tm*%Vq(Jq5^4Vei5%TWojR6H0)ogDqd@EXS?X
z9wNS_`J5}HV>NJvt>RI*D?lmH9nj=}-?6YW47?q{;HF#2Q=(HGI-6Fahn89&V?!U|
zuFeZd`~|ngSXe7=>FEDsReQT1`z>esetVm`b98zDcN}w=mJvgtPK()v#30M?0WxNb
z)3X!E&W~ynMuupLv=AJyQ<P@yD1VU0rcNRQ)=5Za@9C!3$OtIk?g;rQb9NKow8LDi
z*P3dOh=95AY>KuZx3@}R)bM{S%d<bAfZH!Nv(rwnjxY0hE_4b%J{?y+@QssNS}7;@
zcvCvNFcE<Mi{9WJH5rrXGS3+=z#vn%Rdl{X+U|mb)wVww<~Gr;ujjqjn=>y+<0!7c
z;FPo7z%K_;1Vmz&&@k43s@@6010@X9c-IJ?OW2lQPx7Nlrs17zBUSfkooyF1mq@EP
z7xdh|8zfR?F=QI5OKg#|e`y6;Bl;k;UqYYb-NzUz<{VLq0=MAtP3*Ncr>wrrj%Y<^
zyXzIkwN~u#30F6PL=hQ!KF=t1wwe(@5;|Ibm=tth7g)$Pc7~3EmYB69XyIn=s@Xbq
zv8k<L)Ily$7^HOp+NgUlXBi)2!ALQEd;iO>CpM}?gda;9MHvbimU32JUPT-Y5F}dx
zX`F%li_D=)u%_2=K(weu{eia8@zX}NMpk}d;_wN-PamgrXZXzdv`Ndl+HP*$8hOVC
z6o&yN)$>oB?9ZV9dc&EMYeK_%^m=u?*)VQ(Pq>qP1Pu>(eNa=d>18{|rX~TN?fy-8
zh7P5{b6~KKu+Rf06fI+(7@{qSH-=8ype=@(O>lOyj$j)sIWIyZ%HblsgI%ir!^ta`
z23gggtGj2($)z8M4ADvt*h2vV6o3{jhE&$S(z2Y&Zng^#whg~KWPI`^9RvlCu*)f~
z`Koo)cL1-P>1n}G5AaE-;%Kd!0mjPDYIFH1CwrptXO8jMl)(ZROFP937EY%@Gyf0Q
zKq$ZBjL)Fs!rFkBu3Tqu{asq3$ac3xSkh?TevTJkfWQ8?@WQ?WIYrj{Hvx}UI6q%w
zW}-s*|7Y(_pX@r)GrwQv+0WgV+N*%VPJke|HQDTq5~Ut((;90=8rc&gN7!E+j&S&c
z{m=M=KiCnr6^gN>8IP7;r0KnzY;Mg3#8v<bwb$MEv!9dxa0?^=f+V_|-D-8;C*lU8
z3b)S5JU4G<KKZ`y^AvL!wnP&dQe>FAz_v{eCpx#HMNXO~wW5h`L^$#gCfDd6yvE-C
zqfTZCs1mOomKm+MTy!;(5QI^rc5Ic!6DK%7zfQhhXMUl~%0iK9Nnq-rsf2<SQnk7i
zq=)Rc2nKsh`aAU7yBr?ua_7b^zW?<f@`EEAj{oklKP5b<<B5QHe3Qlg2Kj=H&~zqa
zpPj>fw)U>k>3j>Jpj4b=uKqku{uGn6gufdh+Z%i+{TJA8gcR&uf*AaJ{5^!!_;AWz
z_Awj&U!~3dPwLn9u)q6x`ptb>ef)Ka9L_Mq3^V*%617J;i4#ZU>gThFKRWL#0yz-5
zsl<9A4+~|q<tk6C6ganNa;h3Jm+Rr`DTYeWeV;7qFz)UV$D1(TVA6%gE^J(ZAN~;j
z;S=xMfKiVu@({$BW`b*{6zmiwBf`mm#BUG`hKx)N*Ai$+LKH<rlQF%1LYN5jY(%s#
zc<a^wp8u0Y$RCF<&cRxlr|0w3s(GsQA`2CRiasE2Ioz7-^4EX<GD+v-+V>Rbr{J+=
zsI9QHa)wJ6PV(fc#0~p2q6(!8HGb=o&YC?>H(%nNrpJ}dK91pF**3bFXOc)VE00kr
z;|QIc<zvS?MA2o$;3it);))!uH>BIS$*sLE`v*g|_IwV98j)6}omMHAGZv~IRof#n
z1Ij*p?VAs4cMftEHQP8Uol%HvYR8Kvkh+QC*yx6ZE+i@r2|SG?ikQnw@|r^-Jz)Fh
zH@WhbPd&<05F@(H5$$eFZ<NvRO*m{Ea^w0A?>?w(p5DLT*}d^3(+H$IIt-9Z)%>m^
z!Y$(A4H|cvG%ml+H@`1<gD(Rm=2|JyD;w<H$gz<W@UklTYK~$#L01F3@!|V^*U4y;
z-hPROSfElUG8u(z?OR-LAH%C#{KmyPmAs7`?s0JSI{R<^N51~X-BGB~RyMYP#Gi07
zgOb$Hbpv6V2t7nb9=)zft6N~BSK~7$mOyvVj4`flJn)_VJg@@KJjG`|^E3rZ(HI=i
z8B0o9i5qJR@DBsvYaBZ>&u33AQm<C1%#~PN%Hd=UME5f8aFe;_8YOLkwAaJx{|)2D
z9<Sbp?N=agO`rA7JMdLt8aX~UJ#5JpSh%>r$@vO}qD`q}P%cR-4wza-nuK_hh{;fq
zS`I}k&lBqfPA??nO^v)`68HmpyFCuBzQ*M{52G<30c|i%=R8&-UnyYa^4OMO-OjUg
ze2G&RFR-|NjB>@IXhFe9FqKan^za5v(n*sjYSZ=(869rW*tyQ(-c5E74%pf^dF}fV
zcK~>Xv%mWsg%c+j$|766lwPMp>Ag){E+eunx}!GNZo<2-!~XSY^H%3uoO$l=SX>7q
z2MzyA7?V1ci@!zhav!+H-MD-Vbc6f5Ck5#8h@@v3LZ;L5w4a&Od|K<yFB>tuTZ<+h
zLe_p&2<Z$n%rL_Y{|t!Qy^G`r^<p1Kn5O?PJ~gs-Z+*n0!3L3sd=VT6awZfUj?Gz|
zT~r*O8?jOxvS9kS$ppd)X*R}7TKJP)4#p4;Vcdb{KHPo-zRgD|BR+_CVCz{%-DM)*
zMNcHUAEK!g5siub7V+>V-u_KSeu@xfH02V-CVrq8M<$73BSnp2FvqQP1x`O(WO=o~
zi3OMWl10hZa7>F_zCgWXQj(C&)me+`$OHI`zr5R)<5PlzIC@p#{5sXs$N20@mE~%k
z(%KTIo?hnJ<pignap%w?nirg_!Wx2hHKJu7vNL*<*2KfmOPIOS*b5%Y(J1twS~{Q*
z_er~#8SVUt_KkOFb#pW-dGby`yE*3iW`Vtd%Mc5X1gR<PoX4CUQx^$2HAWdbgn76)
z50{${p=u^LrbH;kRH!Z^MUf)0Esb))rjU1z-Xrja5xt%Sr4Yiv0N(i4Rm#a#ygSd5
z)ADo%It|alOEgAfNqaZo<y#;3`91;s25=FoRanZPmaw?skxbsD{r6Yt-}--OzPZJ%
z!Y-RvUgedIFT)d$vs81b>aa1^=~_0$x=X2IVOkNf@)-0cZ0~KpFI~U=-q&eVcUWMB
zTy23Qst~0mthqJLX%mWWi<}6FJ7X^IZ}GjqxPQu6nb$d9f+!zSFcnftG|fWFIa=dq
z5&2`}iUP|lvsj*E@%UqusuqFjW1II%JpOB_o`-XJzVwAEFTRkHOM2YCnd159Sesj8
zG^z4xZoupRX~YYsa(w=@r0R}v-2o*lqTk!%#<l;8=C;q~64c96(T-QX2d~`zsONkV
z9zV_5(+gCKHnqIQv5HQ`%`no4Fc=fWigBnDCK_I><HrSrFsF)$d6R_&Fl2(QX9%e{
zY-)55;mtcg;UtuRFjGFeSm5IN0?UiXrY721#PU*(GwUWROCgTd2XCLay+t_Kq2Ihi
zbAO9oX9s`SrrW*4)=tLeZP>cC%FXzT)A<S?(D=e1p5TRxtE?^8acmba&S<n#IvX~<
zD;<*EHtiOC?ZNgn;q>3Z=TE@OlP_Q_JjSsztNhUkhg;_deD|#aY<N6OnG-;0ph-EM
zyTvctrhY~)W|(1y8D^LfwR?z`xQ`^=OU!<fG{jF^weiufXMkmbYe7M$mY2*IGnUI9
z$MX}Gq(>?2Lv))-5aLZ>FoMw#Ms4WtLFWz}@Zn<oDeg@X%D6w=0(4&H+MN<7RweVc
zM}))BjL?$~$@nI5>pKi?e2bg6;9&UQV$5A2w^BtoIWot>bZu<MLSM3Y%Cz`=-X`yw
zQx7&X!@)-|#&vzFj!jwj2%{0A?sK?gQ6yx@Gf*tUyn|^-BB_IuXK87U=a1z$zi3jg
zKxN+N;#`+YB_GlzX}?IHCG4z#kP$g16xpO0UuDpMoo(>*@33&;B4oFzXbTi44xu*0
zZ{K0_#tv7ncDZ`sqq!laoW&$6(GDD>nUS+Y@?s2`!qD>M6M-HisKg_U60~f}tv`$m
zDL@kvO+uow=|_-GpS>m^r^B3;P_$!IHlZK+#HJ*ZCaEYO^fn&wH{YwXcTl2I&M{6D
zO+&|WVLXA|Uh)ZJ>k_>5hy1(epXI`dDrPRmS8dGXI)gh~ynF!P{njo1VSJ10E^J+e
zD~mP$@N>slozrnGfzZIxb#jh{YfDs=5==ZIze{W9gAup23E%gx(7SVm<$193U&1Uu
z!E)YV=pQg_wHPKQhEt&*FLJ-7-z^q$aA66Q6OvehShvva3Z?n8Jo$xFoLH@rXUL#m
z<cZaFKJ)Ym=GB1hcT&tGyyseH;qePlb8sUcdC<gHJ!<s|zx#N`6U!Z1y8+8a30*DY
zsBJVaB?tq;W}jZx;Nb90UimtFdmGFt1>+9zL11T%sbcCfoUX8Nro`h5ChK!LRaYR%
zNWuh}hWP!2o}V)EG$LW6I}W;KV&^SNIg6q#DA@|fQ0M|A8kvHzuLz=y&N%+5=AU&;
z9$T5`i8H5II(`n#a_}a7w4{j|-XTaf825MRY`;xo?`7JDuhQ6s-RsbNcPe^v6KL}!
zP=gg0Tn$1W4g*e}6g*Z}td?}@#XP!QM-Nj5L)Z%E`0F39A3e3ZSe!mDBrxJ8DHl(i
zW_j%~iYv#d=d08+6Wb}$>wCPrapt3m+I^F(I{H_B=#XxPyU*iisb`yEh8bp<VMf$`
zCPMUqKhA@q9-mB>K2BEuqf#e-R<qHETu)bEq*RTRIXz}h^Qn_kOvad#eS%TQD1=cT
zT20v9hFiN+o8ym$HYI^*_bk>A+t^=Y^IHa23S&yq3d|V<<^(O?BJTV--OXt!*|*+-
zYb?Q^oaE1zmRXw5<2o9S36>6q0geH#9%E}`OyOZBJ%ryO^(P>6q{R}k3(9X`1Pu!M
z<D7n~#GCN~$LbD?*3{58mO6&6Q!Gl#W{fR8aw4MO53u()NXJ8x{t&P6I1_P-aZq61
zRm4$5;@uz_!eAfXygp6vE5C7>-}#-(1b3iS0b77KDYM_Lal5_9R$L(V3>*cHCCC?I
z3Pyk<$H**1#Rg<4B9<iRNIgfEf{;xNGx^BpZx|+qE-+L^oTMaCLX>8ZDP)?Wr5Q2~
zNRtU^7?WlenN(y#-t#RwK_g#7xF%i@(#kSQX-G4iKzEL*Wy8YJtHjjT>VKd9X+`j_
zzvS|#zhC6p#{`yXGMp@PxYy&|c#doJ-vi*QuRX;y2Kx@j9=AEQT41Fnv19~NA*6|v
z4u+mGi6D+s0xx4YxPLSLZZpTbhf}|TOY^Vs%!_r(wRr}<!QrTgaBNN$3>=ZLT;+X}
zZ<y+P^m0&`*D-`dGfZ-Mm!)Ns`J~P9au))Rf$~`@?(n#oqQ{ChAxUZi>%hN(FF(T{
z{EO49FV`rMPzpE5#!bq`ZB~*4++jw+3s}~hoN_j4Y`@Nx08#~B2ZsA_XXCDL{TGN>
z;u@2q@6SA(DzJJg&*^%eiX(A#MZp#rdW6A*Y?9yw0?#*zBAXzyNlhKQU{NX96dj3c
zDx@jUtPE3ESXzWo0i+Q^WoW`d*KH6PL6-bfv&zz1owLWPTsm21{Ztv<wK;5uY~Kpm
z-`r+D7|_~maP^gK-u#CVZ*q!hapS#$9#24}26YXra9ZTp+K1>iQ3v#J9#e!A97(R4
z#|<?CFQ!~6L1i9#&m7G^C3rlCQIM3CkI`40DEcg}JJeRolosZ&3k&2kmrxBk*7SMz
z!XaGQJ{r#t9D`(_RQAABe3zj8D%Pa^6l=<TYt)RO%`n3ZGtBT$MARN6U7s99dz6Lz
z7pXWEK@=g904IxZvlJ_hFoTe6*k>doA`eC**l)n~tFZZr*Su?LtlzUxe~hx%@Lj(B
zf4>VaEpTqVLDd1xgWe|G_|Dy0w=cueF`jy2nd4^`S*yF0tOz3=A>#=$^U#wq(i=e3
zL52GS{vD$Jj~TUY68O(!l^&xqSHjRIjN1b|?<Ccw8qe7|=JGm@fGiWFn#9lqrlt_d
zR91YV##sG3Y#zMBKyES_oMa>VU&x+MScxET4H9KAiQDWPdB@$&3hV>_;Tuyba|$S&
z0e7j6o;S!Gi=~`~&_EawhL&Lqg{302L`P&fGGQX6KnjHr(==HrGjy$tWwswW7Imp%
zSq6DWB2_|~LJ+2SzJM$xjT7QX;H8Qr(g`C)q7<Ylk&+}bN3kl2w2b9KN+Bme)38P{
zy}^jM;R8<tzX8vkW9|6@r&crE$-CTnb%!h8_!{(fn76lBEtXj;)j-(HI{~?2n|48G
z?XmMb>*|zOp5WYK#NMXjup_Wc4cB(iQbn99gi%6sa*$0>nn{d{(&osoJqMdP;5~5Q
z#H!2YMhGOl(+toLLoU<|igOMNj)oya3bYu9H!$wY&HW0m#V*D11}91-7Bw5w$y2p*
zl*>AP<0|U#UE(B%jCI1B`?N=8wBlooMj@G5gM}~gNB`z4Joik66Q=}=%Q;-5MA-Cb
z-Fk~)@2|PDd4<gc{0MeC(BFWsy)mV?gAaX%U*_~nPjO<giWmCCLBw3n#<evp7aTW3
zXN>X&h>>LCnT$h=k;swQIb6r4Sazs82DYP-b2W0d1}Y>AJyaNwrWw8p@H3wz9Fc^5
z3<<^3aSUq}TT8LBpC+PqjHTrgtCf%yr@^wJqiZIK9B_coB%LFW$Jw8gTseD*H<R1Y
zY(k?4?Q6i1$d3rXZa^o1!5GpHJkEAo&}}ye{RyUsDcJ#*t~1D`l*)=HKjZTDV41qB
zQ#K8XGQmy91YVO-_BNJ)lC?(BO(_*La@7)vED<S(wRV?tTUD-Kt%G_vQOi(hLLksU
zWMnc!q<3d*fe`60$lLPMSZ{tF_q$t{Hp2`v%rL_Y4-mCastfzM(lzyIESis^IQ40D
zFoD=dMG6&aC?kb1C6Wo_NTM<rj-lOw&6^(=MbqvfXF4C$dWq>hke|4CfBRbvzRlF-
zY0R_|<pb2<^A1n1Nsd)ur5IDzJBaZeyvZSv*FudB2!`8ugX@gjoAg`IZ9uyLL+@3b
zrHG~D6)HuYBrMSwE>Njes242qrb164Mv&<mhE$+ZGUelWJvxJ%jK}}T#v$}B!>!%h
z{P?pWe|!#}PeGv{nd-ugH{kV$^sjOBVgo)?*Eww(<aGrk2r`sNkV->S2AZ&tnnV~H
zhS1Qp1YM8O<&=bFSeSYN({4ZXSxO1E4tXO*S22l<(N&5{GLl%JR7RQzVg<3%kXnkV
zC4@((4N@1l&WLP(pHbIF*XkfGkUHKFXj;H&e(QhuEdTP$kFjzF9Cyrkd!M($3Rk`X
z@IBhMeuwS1Lh5~wT0X%rLXu{ed=heMCBP_1s%w3oJYle1lKkiIr1-HwnJ$@vG*Otj
z0=Yt-)KAev8`CaQtVWzTD|t>Ay!Op&;HQi?TCCKT*z5FwfY3~-ltb349(~oI*BWwg
zIA(V*VC(%r(HdMh#uLvJIJOi})da31v2r^3vW}5v+}>~U#?|Y@Y7NIK;ty=zykoI?
zA|nVhlu_Wn`IFQ9+kbVA3#${Pf0?}OP@OwTGYs)ElWQ9pZ+!>$H>TtI3UD`Ja!S(b
zOzR{oP%U%ziFuwmQ)0QI;l&zJtSHa}Z$!|`80<;9fk7v=P-X$k%#pKg3MH3P#ip3k
zD7pg21VMsS0V+*tk0vy`ZIYymDF=w8K^kro^fwqBPNUN&&;L8>$Ew5u#NkhBMx4h!
zdy=B1$VS%~-PxfvcF+u+aa6`N9^=gU^SGr2o=}ogkL~f;I=pku=Z)<l>O0~C)e^Na
z&8hwf>@_t8zCjc#vS0*Rf=FAKvdv0mNG<PUYcXNqGio2uI@sm<(F9gl2N5UOsYgyu
zs8}A#%#)M^b7h^moaDNeJUj_NfYfv}T|;F8k)?=COjSmdLJBqgy->d-WbGG?nSu2T
zGt4l<3?D<(J}`j(X^73w^8`|T3h)24+m(O{Ard5sAdOSvP$xh~MGj$@(&@(>>_14-
z<UI@W-8!_pB<<)&m3=_gKGf_g)0&Y2Q*E_dKo9r`#d&&|)_^))@_vl#B)I7f!u{77
z-QJ_qnlKvl81&ww(}Q;Vh@c%pDoaSCfaUqLdJ-pJLF62?qKjK_$meWKV=B5~q7VW!
zp%6eCE22rCR`bX7ufer<;PTxj{b<bLzmEt~$Vd@diWJib+9zQ+(#R@Blr)g~G(x7K
zBQP+ejizg8nnKr8beW<Hg*Y155{X2|)NNeD!XbQs)J~(Aii|8t2;-O}PDs-Xkz^>P
zk!FfWO+S~66hwl+N6!*$eE`~oLIQ{CfNSrqFn38(EaeeWpOOhAJX_<-FWLOtKY+Cy
z#FGXatwUP6b<~cG+pRXY?+l3c-y#{kjgzb62Qd>bCHDHr$tsziVU}!M|0>30naGdP
zr9{_E&=js~kau(<WfMnv;u08SIKl&!F?u}Z+IvUirgH$xYty{OaSN{rT`y#Rf6Pux
zqch6U7(C518u*XE4j25ZJYO&K-1-)oXM^5FmxmOEKm=O^t=DKY-zGLHluH(YB^a9~
zG7w~;hP3Cna10(_J!H=6u(NxM;UGgAef-#DEDCImF7lTf*B%%Jb*2*fbvRaqwF1Y>
zg2i0KlATagEs`FDV~^f2V9ytfW0N2)l4&_azJOaTP_5XMT}jzUadd?gA(6_6d`MG8
zssdEfM`T@k-F+I{8}wV3Njw<#puYv}d%mClGVft62qMEp70N%sTw;QAo|Ba#qi&C@
zZ@x_b`Zh%ias|j8|3g-vT;SxXltMW`B|b~p9%^@+PJD|SogIeJjYlQ}as2}17m1|H
zz>|360lmXbCe3$<58l8JTJ$1lG-3Y%!WX4w5?>GvN5s7rk?Ej25n3dW*@Q6lA$j;W
zSqPAthSYWROpv7sN=T-1J=2Jrlpn5H{wF#*`~}`iJi_m0X^=C_FvASL_C!r7`Tl}>
zcf$z$Gdtb<=^Fdf`LV^2LK;aTJtNW}5GDy4p6AdT8yxt_QJd~1Xm=N4$p=wDF)d9K
zQ{qD!Ln4mIm}2^$OTa3y4yWdzra|}=yxn3NUl7wxA0yz0NB8*#QF9%?DGA*?f!}5@
zeuLhvw|Vc{0=t76lcY#EHt6-<qBDek@5t`VO|fM}I@IV+G}5Xfx1_OLGpOct3XVkA
zr^<+NmXf3?D3B_f3UCAo!(NBW?@Wce@1a|?h7%?M#6+khfb79ft_FPOsK1hFOznU{
zBnTo0$I+2ihM{FspEGncX`pEWUCYpn1WktMqzIKFPzV$mF`6;KFhgn@?B1u*5|Jbc
zVVvR#jU+Ki69Ys{CS$TVBaRcoL?a_ZWe`UYh5>=sBvGKou-kyC57${*(Fs~|4ypxM
z$is6kV#TFe2`QKnATgp5!9d|<r(yMfg53c>ZUnrvxy5k&4SxJRuvQw_CXj+ZhDqFE
z{`A|FCl-y}kllknVJ?}HQcXw<IZXvMC7@eajzv+#C=7f*Vt>-c-+f>>A55jy_qIE1
zSb|1grxm%3ZHGjYtjwL}<l{A7emj8ef8@&Mw}=joLuHFNDig>iO6D1NW5$i^y!P5F
zeDfP{{BtEDvkHbs&77cH2MEJrakWm~E;H)3@uHh-ZeGWmOz@gJ*tsHEU=V7>dm4Cg
zI`+?>grx%O&WKgLPf;C`rV)N8rk^TCq71T#7nJCyHGIpWI9Fh4-l6Jh<fOngr)Kb}
zRH#HT2|fIHM5-njjL?`6cs(Y)J^aZVG#iRLm!UcN=-FTrB`6{s$D~|!kBE8i6XuWt
zEM20uu!yNkwssEK_{KIOnkGUYtH783>~A=+Sf@}QfbYU^KyrPX$;JkU8+#1j90Tn~
zn6H-Lh2P|vr%ti9Y*DZWr16AS;|{m3zRnx3f18)z`-B-!FVX7xINOILK}rPx03ZNK
zL_t&pkw)l)TlN^mI?<$s=l6J6eHt)5L=hUA5GW}Sng)pkA^EUQ|F4r_@`Fa!_a5rO
zEERHw8D^Ma1^``%hYM~z+Ue#$&qej#KL6xoErB>A4m3g`@w5y>Cg@7XPfYwo!+U=L
zz8g8aN5N4ZEznYdoGJ`X(|$rw(LD>adqmP!fHgS2%K8&E9$(P0Wy<KuW9;-|ZcI#4
zqX32t{-40R8_@hN{Np#cR`0M7<{`HUo$s=9`!rX2HIiI`TrR}Wa%iDM^)liB#xab$
zV@$><U_=ew$+46Mq*(+iL#Pa?Aj=YxI3kQ9K%i$CL>XzIlT2!CeMki^pfw&d_CtbT
z06~}7{~)CeeiP)=@Zw`EUtHpg>jKByqIvrry1RE!mX2;p90PO<Gz2;lDFm9#(6kVt
z`$*v-i4bW9SwfaYM9L>jTO=6>g9pSkeLO!Tjue?`V3-z$oggzs7$k&I$|Q_IOEC<A
z5IRapl4QuB2Z#5`{r@h!@OgOpEH50dv%XklzUH!2mDELtV{(tlPKWYR1<%tMndeE4
zpX5*f$CT|r;iMg!%~u${3V*u??0tCjRjxtnt&qcAc)ONzNhwkxNQDMMqLc(B&<q_j
z1SLV~2EH-~0?F3k;a}nYP_o(6$!jiF$)=VQq+Y_D8!%t?sYeNavps!p>!3le24U7`
zB10k+Nv3hQZSd81OtyoF)0L27xl8Od@EZ-9qnNyToMQ2}sTCcPc*OqRHrH<+(DTmI
z>MgTa=rPG`3iXrlg?|q}cnj8a3M(2HPUI<<i+B^C$!?3Nv&E!YVQaL)xHiY)TAj7U
zGPR1$k`9(k$=N2k-1Pew#Q|~VBjW_6g(TsSQNK;Q+a!rPsN^;(Y%uOa;~m)aA8j_6
z47>C?T~bRR69r}sqK_wPh2>)$KY5%&b)IN4<gHs%@_!dU>VffJVA1_QP|d#rQJ~$~
z<H{{~>)ISY+FAmq4E|Z*!Kj)wCAQ>2b6NcS9KUydjx(hR&gdHBNuTzp#k<$u<Zr*e
z&sOu3``AnJY#w?Hh9ef5W0t!Us`VP7H0bVi>9_8D<ljoEAtVT?5a~3<QJ|(ig-Sh8
zr>q`A-2VBmH;;x{3giqk%rL_Y4<TyzFMioC)na&e5&tx!d*T5F6ZO+vJjs|$rY=RM
zo?;1sE+t8-gOr$VM&zY{HtmG29p(1iBfTt+*n-NCq@;0h4}oxj7kFPK&?&<40*^1*
zoLLg&j2NZzJnq4ZX@S^TL{#T6U4im1ad_)EfAj7C#6SMUUtzrjC#%!F<8H^tD^6I*
zr#Lbq(MISh!)w6qLj~(Pu;*fy>daN<7*7%$b81+es*E&Bh@xbgzLW~|Oe4+mr0Q{e
z?(l({r2{zlq0eM8W<2Vlh8>1ocz>T*S-|}lEBxV8t9<6t3Qw;paubj3g&eQGCTaA+
z)WI?pnjWJIg+_`dVl)wfn4q!=DjO50Au3kHQAQBQc#+R|oX{VG7ks#vu^*Er38qNN
zISO4QBxy_*P04AP2t+C|1(--A3Q5Y~KGO3N{PuHv<tv}#g(pvPcGY010+k$;tpIa8
zVsPs{4&U1#IatRio~OL9%JWr|3t>zU8;GdP*1Nm>?aS-jFPDDLrWyF!-Kf|gAj?8B
zm4KWQl4*vfLKhh_OUUA6D%fCHSgv4>k4Tqwe3X`A$&|7_qGY7RQXs=IS!iR*5570P
zvWaDYkf6yfS=J>?1+g5GD@ITRBl#NfaGFlLa~&qTuyVG<bH5)`um)&;mwvOy_TfDC
z`Z~tRb;jWcS1K-Ad;HId#*fjNj2hUvB4=wp<w}l*viN^{Wzx43SUJhDFRb&_LYbwK
z#eCVqb_8h>k_BT7=|Pq;3MO>MBm8iHDJR%k8x`DQ*xI161>GyK%}*D@*gQya_7aSI
z!pPU4RQafU<oB^ua#*Xo6e>A7!Y9^0oCf#jSHQmlXPz4pr9&Dm*gk+AC&8?xM2iXZ
zvwMPf&%qOCp<c(ZZIUGAjEH!=rkFEgCOdC)eehKVeYkc9zJC1?JE)xlcZtJ(%$@5S
z)a`dTe)=@k`8iS{*>3jPyZqkAALeChI!BOAsh0$qLMHExs@)q+`>2}ZUx$d>ERr_E
z3^U9y!+k_8dw{t7YIj(DN*zqojFAtP1{MlUmn4})=z^Rfh%5oA09}Ak2qYp^DAH*g
zGN$!zLLpTAK$Pbx;Pdd@MR;P7<5io}Il*crqgIM2i7r~uB6TwY^2D`8%4@4EEt(YN
zBBS$?&&@UYzV-@#^R0WYyT`d>7DkjKvLzxtU^0Z($Eu2t==5WnK}IEml9brGzyQ)T
zL5mXNOrfNXuIpfz$x0Vkd;Cdu+yZNJ1}X{I9hX><5#y0hukVv~eVUDX+?VDWe6g~_
z<29G3YB8TFCKSw@R4cb=x;?y65#5kT5uxEDRXpAJWr8$|Nz);5JR*z&q97&=6<*-t
zg$9$TfFC$C+XFfe+vvqHapaRk*|Y{uM5xFo_Cf;RAhjh@3G_6AI3Ud+@<aUh!+|Eu
zALDnPU*M0wSmA{Wf)lQXMIUIu_yF2h7~J_9mw)hIh^#;0)TJRS=M&D)%@G9=L6D)T
zA;o2%_f9zc@XDhc7)(e4ACV?g%}@ytqf~-WDQTJ!#|o4{m|!Md%#XTO=a4YJN@h4j
z$sTFkA`Q<nD4a$)#|X=UX)@~pY1l`l)7VWo`6^L#8!rj)+HaBE1ja63|Ig2pUnw)T
zk1Quj0oRO0&g&-L_zqhKcW5={(8@KAFYBCK8<QnEZW@x`-enMdgRZ^CfqW6WxJbRQ
z!2H|-#frlpIcNFN+78P(hcoL7)QXav49RID(lnzr8qpheF=aqTz|e0n>|SHiy++W7
zxDA6{*!{!@{1mVPx(-PLc;!RyXgg*4R*8a@L$e%eg%X{QBWhw9-Ey(Ch@2cTVL)B>
zADYDY9|2yw|98fyM@{b$>(IGN(rTx9?u!?B?Cd3K^?4K$f9#PCM(EyvgWXN8z5X_@
z@BI`L-RV5X7wRNl#EsiKY)|0L&P{Y~@+f8mahj2+3?t1z=+oL!C61!M$u#%iu6n<a
z4<TariYoo8El%nq2->VRZH5_Um|=$ZiP|skqVQ-E{zv;C@rx&$ew;D#6&eD|%*aGW
znh6XcFoh)20ilpmA(TQMrTk<{k*Rcgnw+YKY<M1n)0e3H-X;F4XXkjVmZNM*T+JiL
z5HoOy8zZ`heG)R<vcvjPfwRk!3X0S!aw4fy?L+Ie`?r_Zw{Ii;B9*d2OGotgKB=N+
z9_#|jwlOUO+tP3?c~pI8lBNnGh13m9Q=pp`CB4q)P89gce1Z82XhD~QgNUvj6ZkPb
zUl0d2y?diuH@;1?x<iY1X$5umS5k`cE(bTR(%G*OrYVM_$l_^DS(1jRY(kPq;!qHT
z30{!m`x@iG!1Fc6p@|n7#0kVwF&Qf!Chm?OG4w-RJt6fIG-84%qBDxw^-{D%Ll-77
zI+0f(kT$+%!^tD{PSfSwahpr!2ItLdoQT2d?Za@BpmCe-;Wn+kH+k=!HedZuFh2kH
zd?A%w2z=(|*OAg?6lqA|(`$AS;nhbTgMqI|5>QEsl8Q7-iIVJSoEa$1MiCRn(CDRn
z++MxaIYp&@k%`}>-M)fVnd6zyu5;$>8s47Ie&a>n`sVlOwfAZ4KsJJ%VUHW*9d3CS
zc&qnkpo;LqJkPAJur!yaWDU^#n{*C$iL45)t<yf})7Y0-D@&{{S5PXZvD-l-W|DgB
z-0`@w_glz?Gd#JvPOe&GVLr!Py@-*oaQd-~v&XM6XdjSw0+b3EcH4}Z5M?8}y+iuV
z4RrrHag@<%!>#wG?sK1vbzm8C>u_$J+QK|Y=rp$B^)^#$=?}14QLN3I6kMBrY|_hF
zbo683<RD*!AckHCG!xcV$rbZxu7Mw<XuUpz)**wPhlzqb+=w6s4j=f!K7A_Y#d9{7
zF6Jne9imv!8|ichF3qOP)yA0D_tt=YUf>k#Tw;vH1_9S;0B-}{L!ZWS&SRmRGSuN-
zS;t3pj8kbwlx9dNk1R7JN@}Pyy@#NPql&GErQ!d&7(m~xS(}lx8D^Mah8gZ7YCnr9
zw0MM*!k?Y2{Uq-b;uotPHVPDy1Urq8I%G(aqa$K@)CQS>xLc=|rPJDs?4!Jcia-TE
zTjjsLP~bODS*({VYGo+sIns&8q^C0?LG*SBdntyuL?NqEHA<9aO6n-G0-RW!<MF3k
zyz=Aw?{Kv>WT7=pN<8@3-bu*M!CZ;eLXJw##x?aL8FL+pBFz+<K2>(pOpVM|I0b{8
zYf-Ielyej0sEykXNYpw(oZ_cC84k+2|88%+a*O1xTXdg=8_VEiaBv9Mx?n75WF#0`
zib@nok`YE3exwLO13$9x1Icg#Lr-I@Ogy2HN(Dk;stofeZS%u}C!`<5m@=cECd6q*
zH?mL^L9<AuLr2<FY!_L!sW=Ynu1VRH<P5M3Ma~?NAHK}sy|>xgO<=M^Yya=rxeYs;
zuzPrcH(zu3K09y-PV%?(y8(+QHEN4%2nmiB;7=x`(W8z&lT_15kYoacQe<&VEPbRV
zr}dAfg^Uw4sSzvlW3P7lsq;Md!b{}xiaWPXk+TnZe!0V$VnRC<jGnwmCo_0s^Q#R1
zx`U@q@&+$5JpLp+b(Rz7=6G^7=3Lq1MA5_*ia}ekzg0$s8iiVwVy!?w(CE1~D^^6o
z7?7qJ!$FEviY(1DDt?anmuk$-&$GN#Wv=2-$@^5CF?n-D986dcecsg$X?OdKdWRhB
z-eKY$5=2`xo6xxoNj9~v_;^xr8aM{_60B9B=z?P*a~4n3i!4?1AYj`pbLCF?L;4+N
z7U7B%M+48$F>Raju{xz{38z@cj}ls)GNn?P#pP8TDUg9rmd5nQ9^G!A_`Z2y36{=)
zvW^NM-~Pl=;P_jVlWi(2;buCabjVx-&2Y(tMs;-=PM+eAZ}<7V-+6+Qr=Nf<Pk)rs
z=#1FeyukkTcL{hE!L)9)cl6xmHUeB{Kx>@vQGy|##6Kb=h5#i5sSwlj^CM33p{lg^
zYli<hn_>U_*TorTm|=z)eocs)`nfQgf4Y;wNA8aJh@HYuh!hxw8CjNKn1W1b#A;eD
zFO@uEj%u3rsP4W#&fs+jgdD4coGpZ$vQicds29LNM+u9DCsAe}CwPlsx5-GA7|dyS
zg&O68haPWXW(QcZMKS;IyL@1WTL8{MwFYhs2fL8oJ>g%5g(7Fm1!@JGqNU@Q65Y6K
zGB6Fu8Zt#`0;wJKTZH6{fLs<~jT`vws|>dbbP5-#MT$6^igG+GT6#Hv%Rl(=GkFR@
z6i&%ul<GvOL7cgSu|}vQahee)Fp8m*8VK8>R?wMd-lb$&1c65E3IgxJho3>BGf)m8
zI%oz|9dKQWd7I^&$%1Q=cT9BC#I`IdjwGkYm|21l5i0C6+5G`8@ASBA7Knlswy(i!
zufyxS2$%i{eiQii{|dlgeh*$8U*n6l&#<_ZQnVFCJw~%rYR03Ez7S1|5mKT=hKN&A
zC5cFo`t-EIHg$w<<Lef>S^U_mJ#})xOHXAi*N=01t;le^L0;Y>>fWYc=XmZ+fSFAA
z>vo^NvoFE(zsc`kdWt8`&2w(O!g9?;mm^{?#3Vqa0vV=wwIYUPQqD>8Zb+aDbR0~T
zkwy~qD$>ql*m>MimE+X{<qFht2?Zm<!h@tkIyoR}_Zbhz_y>oK_pY<G`9ls4+T3~r
zb|;VW%$}HzYv$oX9jY!^I*U0Q)3%U?fi5Mk5L8V`%@ybdq-9B?q|<qTsHq?$i4<`p
zNtKRa<tW)U1!8i_$CZjg*`YRHWxkq+B*s$-k(c550o~sH;j!wuIhNMz3=^Fl$AisJ
z?$O@6&_Dk&<E1K@a)^x@O4G1SLAheGwvy+`vku2XIJZ{hsWS^$W`!V#>5WD-PZ~5&
z2;w)E5iOkr7axg7LYU9!k4(aY0C<k~4Yq%h30Xh@n1Ul6R#2I`XN~xPm_2+w`c)w~
zpCpblBXTp$FvAQpJV4Zb=B4L8!4LJmSjVTw|9%c9t4D1VLL8}&{cM+u6$FVQ6(Dp$
zHmyh_(;j#hM?_70;w`tahIf#?B60#+PNHQF$Pl3=xMobGI>du-aPZzT?XH7k52z$1
zw7QQK-=g1qm3{{%;U~5J0$e;zZn?^;ouQ4&bhi|Tw>JQnf}3N$Xp_$wI2IVXKog(|
ziO>|8F%<;J03qV3Pf|Q4@;VIryNtab(Z18>&2L}i>K7-hMHwp7rbO*05IVbhdql91
zCqpMf1Ixm&3^b{uv<yuph*)8vD49CNoJK7#am{J^RTxUffM+R!4`q4fAzx;pUdFO)
z^0q-SXOVZUsV|vjk~j6KRKBjE>yo^YVXBlYN=Va`C{y%?J%0Fo2+^n<E3$vx<UJzb
z7^l8+g0pq_s`moCI!#9H-tJPDF>7u{*#SobX)DT)Ow_i?{L$3QE}NQ;D=d`INYfOu
z1VfW(x<KkS!k&M~HHzF#3e<!Dk9@kyv090xg*?qhk>*xJqq#@X4KacP?BRE?nozlP
zp5J}?G|xP_%*ll@%Z2MytujKTbb=<sL5hz}nxvE*LBTMvRfY%+l&GOs@(3%BQz%g^
z=gH?x91BW$gQA<_Xf3jEo47Z`8~KcSJ=)D4t#(YK4+qULSKhtG-@n>^1o?%Rpne?t
zRE_0Q4$HPN9S762NHvWpORx-qsevXkG?^jO6f=vFv4<`a9M!~D-49(k5e{i)lVG8Q
zjb&Mc(jxIZqOc7D^0hgtu0c)(M3DzcNR-6%heH~T`(+oaW=PfYa3u__(ZdpTKZGsd
z)>fCL)tk&)b+o(zrUWg<Oha<w5F^_r@~&g&f1AQw6>=raNuQ#TP*n!Y;uz`NI=Yra
zSQd%W2$L9JgbdP@Q^SDMJ4<}`wPk+D9@FUBglWw36DApzlFE!2ffR~N2$VRoDp48t
zOV$4>r2nZ0NZGx0b`Se`h8bp<VTKugPDJhQqWVF)p}MEGOrU<L)Jcv~ZiIG35;Dlt
zr?M}IGl57oG)+fn8j=ji$dp0~-cR=tVtUJu#}C=KQsMSm%<+65TU#J+7*nHZm0@RX
z>}-sRpnYYZH}Cv!*z&h9`gwZQF|NAKq`SxUJFs>5arY^~T9x`*oyXTI)E$B0rL@fj
zRAZCI#9+bJDA@)%Q(|hMi)nxEe&|Ai6bhv>RGK1^fOOJg*uPA3@G|{<xcvk8E|;M-
zzzbqBG<40ubRPZrhN0wI+eNo@Fbv9uPDSb%wuY1vp#+H%*l~)kNlK2O>?Y*2lq^l~
zR7z@O7!MoqBF|dA#Mz|^m7+=BG058*uBl<@8kS~YNQsmwO2mM`P#`izq7+K#NX<c7
z^K|1TJN-VFY8z;7G~LJ2<4bcp9G?Sst;=7%I=yWrU!!OUikhIPXXr<&lKT6?GADs&
znc9N?!w2nMdl7bS16z!H{i(8}F36OI)C>&M0Hu*85o7^6A%+o9oi|x{>^O~UM|SMT
zmpQYrz{bvx;Q+q#A8vE3`gfEoE~nNPiLE^v!Fvo2|AKxG_IBoY?b|Q0Sv|&!E9;!7
zmsuz%(pI1Am-ley1j{Qn-Y}&%@CdS$G}X|AjV1~tdI`-bQ7jd4|9|%0E6A=aJJb92
z-p5{>H$5`p3xxv8bh++oSKaJxvN`mmBr1jz^D;9Lico|mLJ@k<gY+yt&eJ@|OlX1+
ziV&rtW}0leX0t8Zu)IMP3I&${(q~@pj@d>J=O&OS09B|eR2wn>2m}(id5=GPuYawz
z|Gyeis(3VNl1AAOsRZ&}M7j;T+q8Dqxv{#<+Gb9#C+UwQoz&6Oih+&k4=TLA(|Dh7
z_c>q*j?Z!O^ifV7nP*|PL@APJ;Yf8(o@&yuW~enzfG{~y7i-?EP0+f}z>ZL^O>g5m
z$?lzN$;vTQ%Q@54lrT#e1sQn=X&TYX3@E|82mr}wG-S|g(;bcJrH-|J!h2V!4z@1P
z^~V?^@LRk0{eE1y49mxUf*(&&(*_sLGR_?B&N}N?U*V;1y~vXQm3e41An;+BLy}UJ
zWunDt<nc19>_aF)2{1V}8<VCZ9v+W*;zWrrovO0Fd4%<y5jVOi*S1sMNQZ1Oq^Q&1
zMFG-kaD{!E5&|p4T?tt+Rs8>jz`R$%a*v!H$nYQF00%h00e*%=ZNK2h{<UErMhN8o
zC%unI&e%sRgaRcHQWgQko~O^pJwhRn%0qcU5#(44&J=%4(eiW4?D~U(kzIJ{Tl{q?
zN9IEY-359}C8i^f!1GbEL)Pga9fS_vxCl2ceuwt2!m&e84q!BZD=YBh>mP7kW6N@E
zSt`MF$)Z$-stwql(QKs-;eoGQQEiX~*(|KQ9YR?465}>6*5BDIBOQ(C?7YU-MY#Gl
zytcQy%e(Y@BhtJ=7=(mXSYUq}=KG-prI2bIpp+n#vhWKR;CmA11jYlUm{ct_R$FqD
zV{(l(g*>=-w>ZgH%$Eg68jgjUAr5^!CGgaw>M9LV7(8ikSg?hnr^OUvox;NtF<~@I
zrLoPR13!Lee@olj^v*$hO4Gk|E7%XFD=1Y2tj=1DfXp;V-5*hyf1ia<Ekkt`UdkZ-
zKCsLezR+OQZt&W-R_PBDk`#38fdVNl!euB4&d)GelT2^m*>lWQUgz<X*Vxh^yKpvG
zXD(l7xKY$cHh@3<U%rFL70t8DIO%i!M#9Cn4s-2|D%YduDS!0@|K!*-$Ck=88a^@~
zu+y<z?^QT7l`)fO@>HSoIjpK8<1#_1O1VBySgSET?J?8HDXBgx-$IQy(Yrg0dObRw
z9$VWTc6N4I-!)usR@fLsjM5BAhUW`JXpwP%R}ZKjntD%b;Bnv#96ABV7MPkT@zAu-
zV@oBD&zG1k`3NZ(CYt6@G7ySPX=0m`n=Z+)#kjvoKHSEPI;4Xp&1?gmINBS~yo(x1
z$-7QnonzXI@nn--ca4F`K?LLhs30bYDp(iN9rW4VS}TYe6?&PYu&&5&Zf|oNlKyp!
zfd1(I$Di}NF#R@UqrYNlX$`^!HoG}5y!}01eQA=GdG^;R9XbZpIwV6F8&I=wco~0o
zt{6B}2A&2qWC?Ppi3d4xf51YJ@<=0K{O|&UMA01?THTzDe!}I>h@Y-*^NmX(@XC9#
zSOx+IQea%6LW*z`uJ(_i-ETiZ+yC={c*p?`aDW3G;1eTi;tsNQw>kI28%jS&l6L!X
zfJ8`v6sjN?N?<14HXkou5ctX?3_QF*A*CXBmRt+80V^kK(k6-I`@1F^y!(S6vy)54
zS~D8YaCj=DT5?4GCf?u;NWq^N^R|IM`8${fjx|7Qc(eaO$K8YeCiF`%C@L>@w8FUi
z8l6o*kFi1{MUe?tauQ!nijYq1nROSu)EI{|jwE-qx??WB4d?dnZnMdDbI2$uQxP6v
z+@MPP9z<<+63{dO12SN~7BW*-IN{Jv5GaKwJi^HuEh4bS;ZjGQ!(b#x@UT`E9(K~l
z_wEuLWjVe}2*r@Vg?KhVc@8BFLOPrj2uwjvkr?YR(qgd%>9+zUHNNzS@46=NDzAL!
zD%T=-d7q$T6c=RET1T!G!a5T1F!t0}I6CtPr_U~O^o*gByv*98FY>4VJHQ&X%__3>
z4giBZBX<@RN<5h%XyNG|f$Jd$n{=D2w0AGk*?O64*J1l@;6@QHzIB_7{O5s3xa=+P
zH!sGtQq75z9%A}1>ez8camJ%_(>%1`Gdq=2E+xc%3YkZ#9B|B=B~~&0VHq1VC?9Vy
z+bC15K)s}?#fDJq;+r;Z*ksskva`F(&iX3N%~d)rO|u`fJ@8oXXKbZ0eHAlM9^K5+
zkdj#`h>fG{a!S6(Ok;t<Z!mzx<FHVN=^BsBOfy$0A%&(MTV`XJiX`Q@NR(JNV#@T1
z<$!FsLvweF-S!Uc);jI&3k=(kw_x1=AVpNzz4i{*>MhzOL%-8xa|OmDu(D{0E+2k|
z#&k%vQKvWRu(8!*z14x)V<1#<?C(Km{Lx0CADx32&cS0R-hdLk_MYO_sn2|#>E$DZ
zuVb1+)PTcFaQrAVD#gN6oj{%z4&1{o&@UKc)&l1Us$~K{q>f}cHP|tXl7QAI<kN>k
z9;*ue=T|dsd-JshV~g#($zbaQcL-VCH*fi66dJMj`1t?_IKTl8aDWF+)WjYC-fMfj
zjbi-*WJ~u~`@kXHq_!oBHbN&I#(dnpNCM9%41A&>M0kSS7)BWEp7gYpSR_pTuOMxE
zjOSk4U7`Jx4&SLfPg%?&76r4VF_F87ZN19Xx8c%zBFPreYJZ4B-#AaRoUmc0$tz>>
z;RRMN!SxIvWt^rsoguKO$#ryhJOK{tz-Wsx4x<(6_$2Rg<vlw~X$~}L?m#L$RU^DD
z6rKeZf#dMVQL2j$nXb}Zc@xr<N-U_v0x2Lf1?dh0K^PY6<^m5y1||n%1evFbHY?=_
zWmecIcz3(lV|1RNvjCkbl*|#zB0Psug}t>yfK}iOLZk?nA%sC#309!9lq~ZxEO9q=
zyp^kWT38FMa5_S}2AUE`i<%92^w*B?Z<da5>ZnIhhPCVS{CMkO{`BbA;d+Y;-#^QU
zPXp)4^)`0=E@7%rW}ER~gLeNK$>25m&22W<;Q9qvI}b12w)ZmdB(MyhTIQ+aRZcA}
zvvlkXQ?t|1zk+YB5-ZI^M*?ORG^N0!Q8vVWLZCe2pg}2|Le^@?sEQvI?TqD$$5c%a
zg$XiiBStOqPLp0|i*Bn$x80+;(`Icg<;u#4ODiMo#mfT#03ZNKL_t(`Tb69fM@{+U
zQG}6-slZY39G>t=oxykthhdy6N-kh(_6W;gsj;>*fY})iRZASIS9oYPq7f^4qa3S?
z=hhb~(sW4E4!!0Eo!$<~aEDRn0vp%Y*j$0t)#Cm6Fu1-7tE=1h485PMzCu}@rXJ6+
zr4rV6cZ*8aTmZfgssd*B!3=i(A@Y2K*X|-f@`qpj?|AGpUtnf&5o}VBwTDl@iQ_Q8
zKf4eY3Q5TrS_)b_kT@8NLS!fML8Xun!3~fyqY^19QH9wkU|KFv8K32Ucqaq)wTk8%
zJbxd-a_`BG?UA>iUGnZ{hr6j*ihX|{RMie}fCC)h01uR?-A;sl{(S828P+{=cKc*l
z$mBa)WON_Yp$DEM@;%CtLV1cLv*bpQSb?(=A??03<o33B<^9p&;@^IgzrO^-Q!pQZ
zKZ5Q#czFlD_py&WWA)Mn+M6NsjT%~4xUmu34CZyN$&!RT&oC~W+-rF&FtvbnIIA(*
zV6?+J1@;sfUj$B2cr={{W*Iq$aRPxtc_nV?W*mi?MVMJ6KKw9WK68w-3kmd6E>A_A
zzm(xgK^RDsvxUWhD!hmT-x5fNpF50a87W8Ziq=Kn7kJX)1J+smyDkyYSgo<v6o%wB
z#Tr#8(^-iS3TGA8<w!fmnm)#*7-P`6AkQ_!KJ51E=z0~FtFU%q@_IQ6Yv_532>8a$
zz4o#*WNHajS|F&!IFVA%N1Tk-nLR8xedq{M8fLm}c4x}`tKWK-ch`5RH|ChD=L~nZ
zS-bHMG*|j;_L{iSt2EbO_Y$nUSa>DhE=F+@I17j8Xq>2Wsu43Chcs#>%8_JlvBXnP
z&-2J5OKe{4^6o2_8MHH^DCSVDQe1y2C`UD_Ge>C5&rz?2l;Qy2mq?l8%RZj#;oA;b
zYn%4=DxI}0HrIDqSsk+4j_KtQgVB&yU$fmU@%A`k>}TKvPxyi;Qb^&5R6^uONKZ1z
z1tE@5DXj2`{DAUIg(s|F?8cP*5wl9N5ctf-5%pMMjAR5zVM#~ZjCRk{Y`)I5mDkw3
z4z0DK)o|xyzCrI-AG!7pJoIQntv*DjBN%sp1&GR^N>HnRaM|vDP+6dI{80v%pM>!m
z@aE)$6MX&G{xkmQ_rJ!OM^6$|By@UEufaoyVYYI|$SD+1j&Zt<@GD?S;FT#PRC5^Y
zLU#)Wox*O!FGHz8DW2j}hkWGY^9+Zl`JZkKZY3@99D;D)P%QQ-Q59p#KQ6*@;G1@U
z103K02l&K@+U+%!2SwI|*xye1AidabEu6Dbfd!=sdsS(R@cH9FNsFf}fd`SV@B;x(
zFw6x)gOCEJ3$;ff-lO^TzH{|7@EgD~FI>%e;p*xn^e#<4KhJGh>)S9x(KdL07!Dd-
zjb^A<t1O=Ou~>{W)RiSmGm^0;&kT_#u@dB78>A2uLvM?<7V9ilco_K*JoaU#fB#AT
z@OVz8`35h%x{Zj7^L5fk22=Z%)(5cQb9hQ|Xwh-zaKe-G9c*bAyWU|tc8rw7^90I)
zG7^mf;h_|GN`n!25<E1SvlwmhRpDW0t-)w8?rw@}DK<9<YY{HR8G}v~sq=6agwTbt
zw@t9RM>_72q>eP}lca41eMzT(f|ja7IpCq?GMCpDCpR`J&TVEMsv&fONpIW3^p;Mc
zYqQ9TM8-XEU1ZWEx!z@M>jM7nGDqez%+_UUvddFv0}d|&(F*lamrnT=b}sJn!e6iR
z<`|l5caw5>1ULp$3y9ORe0Fh~nduVsnxq;f1bGKf56MywH;kC}wmCHw;#J37bRJv7
zh?*)<4ScjH?t45n&Eb=aEG$%rgE67pL8NVx_Bw;zRkn6^XtjoHv_@Rp9I&xv*y;$H
z1CP`L6(x+u8A&3+Q=FI&=~*A;3F@&&DU>*8$jQ*kClnIt98zln9HDZQ<(NQ88s3;$
zGbGIhg+P!FvAHHw9u9}^fz>%%Yuj9W^^bY`d-r~0J|3PUeEbZJFlO_W8{q!3NVBM4
zVaJ_74XSj9enE8bAt(TyKw`f`ScOvUfe^J5M;G|&nTM!7xy07an4iA$3@d9n|Kc|f
z^Lt-?iqAfEnE7c5qg}8Am|upe(rqNoal6!o3qxE~LYC{m80Q9v-WF_Jh4xm_&ge%F
z3y?lU0xvG}$YGCP>(6oN#xee6kEq!kv?~^svd`@Dj<N546%l_~+8^Ef9OnT^JHP=B
zaDW4RB1G+OB<sPDwU0*7+&#8+=g)hh9tr_M;=}_GOLj$VPTHc;Q3;9f6{JB-+Cq!n
zTO1C%N6tR*RR3$>SK)Ifs6OR5uA97hWd!R19Me#`0#|+jum2zWzVmh9Fr4uq+=Y#|
zVf(@d>}Ls<7g(NYFjuWpFNXxmkY|1J)M2umQIeD7juN1RE0W<tAf?2U0x2v)n8G8@
z`q<hcpZeS}{@EX%;&;wMZO8C~!|=j3I45x;zzZq_vrJ5cFH!AjDymJmy-T`Mp)=@{
zcdoFzxyfL(Kv;*+6DS1QC@cZO3-CgVFC5BR5+wjbl4!C_ktYsM6}A!1dZad{kQLvL
zoIKa$S&G#IGzrE@awE}NgB_5hnj~?IhB@7?rq|c>x*5GLG<Ph!TtiI3@*zQ*jwb<U
z1S$a2gYtmsd53>AVk@nIo1(hpVZuIxq{p~>g>kP<t6gTZB}hz@t?NJKs<+F|E^Os>
zO0|qi_Z-_7FS0&_wRQO3i|@UcG4L306lNFT)C`X<RX92uGFx@b2ZdyNmTQLHAvbor
zbVeaEs&l5I=<jaOTIrLtyC}~iEGvY9)EcxAxIAaUtupNmsiz*ptv0)@ExOGPo9jK+
zHri~p4clFh^`T~?=hz;3Na-;Z2Sma$9_4h6$4DvafuIryN-hMY2t0x348}Mz;gLI!
zNLYl-5i-Z*88)#D(d2$cHW(w)gwZG^R3ZIQjrP!x3Cl=ZoP+Mz(%shl+4nxV)j^;6
z&1ZP@?2|-c%)6(L^W7H@!=;4AuO6Ykw2Tp&f!(VgTkzw8q?M{Xh|0<%b5)*wXpS?B
zM-W=^pFew?EHxZGRN?GHRc692bT*4tM(Kf?E}l!TM3Ksn2t4d9r!$-z<3fk61xPJm
zw}rcY1+lpT8bnwHQ34x5E<tKg32_v1dMV`dPtNftub-e$d@+R-zx8jgs@;+Nb02HW
zKfnPFaDW3G;DD$hK9Pg@a3oFKB#3wW?(P0=`@SOtQVN6+2w6zYf82_iajs|))I}A?
z1rh;xQsN14SaRvGdy0?uMbiEN_&ogc&+=dW(=xyLC@gZ4%^i3n0b7AX;w<UqGUxuT
z&%gWMZUB$M6DK+L)GSXeLe*|FT60`}^D3{umEB`MvoPOaVW!GbqsGkC6f;vHl^|t2
zw6wdLu@$5_<hD?^R8k>?11pfi6rSD^oHfNdHR};Ke4bkx@tInmvyqQFq<QAJp`#62
zf=~frSSGIS5jE(quCTcZgLSZ*uw8>}1edPBhJuHt6iO*V;jn(;zvKrF&xb$=tad0>
zC{Y^g$TEvo0;NFt3MB<jRq*{Gd4BtIk!eGcCnQ-9k*+aJ3Oxl2WH}55&>uj*TVnIN
zV2!=&DS>5R44und?m!_B(SWK4B>}AzHm}fgCA^>o+K0-3psneyZ*$!_`r9wCcKuxj
z@^_)Kh}L5+UH)s#dW)pwGrfG8nVq+|avskAppa@P=;qVFT(Lhj15eahI9%c6Ovr3i
z(FmccG@eZ`CMO#RQtOeLfOcQ7nU&C$GRNnt)EWWJPQq*F`V0n!ZXbrJqdiP;!hr7x
zM4OG3Z7!z)tHBf-n_bpcx7pgx+1M0p_F&)z<Q1PpDRv}mdXgC-@DUi{qXR*Nk8dDU
zj>v~l`ba4WRAC68I|!vCR2GvC(YeN=80La;7GO(0zO(dFOHah?Scl9LDtb&eOCVDS
zA;>bzz$*GC_{2zB5W_P^*Ew@+7SCUxUT#pEZ?HC29GNb&G!-%Kcd%aR)|W~lOjThp
zRU}GS`&h?Njs(+X%dsiTobqu~5!N{>C5bP3u-PQ<wz2&V;Y<zMA$UUwJcO`F&%=2E
zpl~RJ6_93N+u$eIw2#=h0jrk^wUl@UR0$E3!LNYxA#=b8gk`22a(1!C?_OEp&-*Lf
zT$5&taihpy-AzD5?#p5wkg)?C-~b0WzyVSFh`7BD^|M>2_Q53ap0)r|783ogXnVwp
zyLaDw1SFXu);VdeQ5k6Ka0Y}c0uE`5YMQp(XIg&&j?eRzFO~V)XW>iph15p!P@&H!
zfRI_T<%f97KT2r;f4qL2C(kbP%&8j74N0g4<9dU7HpTGjHka-u_pK^;)e19lg>n>8
zsf0A@ikh!Tr9x^!H}eUUL`Yc}U5m-J#1wwD6rN&EJMzSmYe^JYX50>T^D^CvB+hP-
z^@m7j5Lko|_<neYN@54-G-36<U7J;fRSHike36q&jWR==$*?JCG+Cxev?F)LeYQfN
zkvLJ*QI+%wq8iiF0b5%WMLQf&Ce0lEK}M4v=@^=A=(G!R)@i{lTjJpM8+iP)EG^fF
zhgZ4$+MXyxMnV54t&h$@ZqYYd6W6R9xX7jLi_Gg~`irwP*IwtvzX$Kp^E`37Pe`Bh
z=Ue>!tMJt4avqj%v2q>${EdBkkA8#r`Nw%|u|zp4Q4T9q0-ti|C<P#;!Db0=lrkLT
z3{yo|Ei*q?V#XI#$C{bc5(EMDN<=vnG`k7wTM5Gy20Ejk59p73STjJ{0gP7ZCl}b9
zd5U=MaaK1i?_3kCjTG$!Vk@Z!hEfE+go>{?6-SeoQa~tZC`piO60OLbM(Z&l8Bq|U
zge0?uJkuBfh%uv44hBjkpP(EPPleQ~K3SflWsXz<<&t8YrzFE3!_Y6DFBOsJ5SK%I
zze?dr_woZDk+Lx~Z~Pfs;efbthNyIkCr`}qsi00=X%Gbg?Uu)(BTHQ5Ge8F~l$6Up
z-Esh>xLC&dF_7yqSw137`UpRz<SbGOWG=8xL%-K&w6jB)4^UYHPg!WM70;sSBa}fz
zWr)gHzl2j^Q8nvl&}+i>4Y+X`+u26=(+C3a0z?oOOjSxSS<&7oQ^LS!c{=9ou^NAV
zZl=h_?DbY^$8BrWZX470Os{_#l^uU}xO*b<00%h00S<6L)NY$li%It9F<IPP;_!hx
zFFbpM6F4W3$inx_fk1-uK$v~;z(+fok<JOT3_ndl*rF0+Y~j1*?8H~ieFzom1Rm{k
zbUx!yEns#pHmA@<yop7R;B?C7sf>QfW9q2S!wZtRvcNZz)EUx+4l76C(uKQ_?Z{^#
z3aFJrDz%7GNfJu%t-}dRtQ@I=z*7XCEY|i-q#x~GJS7A;1xT!e+&U}<oeo)FU89`l
zgxMA=*HijwPB^Qv*5PD;^6&Ek`x2=N?>2-%*ql7cNOJ*0$Iw}_96Fg~WB?%%N+J{p
z=|F-M0zWL_%}rs-i|mdZ7!4$7#<V&qqt2LC3*KCNzeK^Ul{|h~bEKRT*j=u{KKtS}
zq!xxPupWd9U`LSOT99;Y2d@3a8qc0sqk9!D0le@!QSv%dA*`$b_2Mh%SK-|1dk*Ea
z;?oOoXgZ}FSxS*6QVQV|!bMoE80G<kT#^chD+}fuA#=6Dyj&>{rE;XSM4rK#lvb<B
zR;NcMG(wC>l5N_fRkGo0q^*pruS0hTUw(eb6J<qD_>BAr7v#h~RCHm{V2wanNiC3+
zV;`jy)|p~`nGjg(P*!5JV=(A~wS@I0RH=-~6((^Qe8!na;v})J@JkVuN<d9I%7I2X
zhp&oqZlpY#Bg>V|F=?LCaFTi{pj!56OjU{EfJeUi1ulH|l}{k}pW#28`=>meE_3v-
z<kT_Eq3V#?>6rSQ!jD6C%4Ifom-xXKAAujeN^RU?DhbH4Hsh@Gv5#PE1^vvjJxow`
zOxYMbDUs5VXF0=W8@sbb#g2${iZ{#(COz80w%@|p*O2v-h{h?z%n@9D5rS$#AlEkG
z`U>oBAhlPhH>v>Vhgjb)-m{y-rvN8GL8GEru7^OSAZo_$4ZM>vW54mWxXb)<cVp}W
z9N+-I-1zOU9^r|{=2%=PF&t@r^ba@q%kQimT$lqK;G+|@_pT+lHF3JzB$a;_ldAhb
zBkfz<O-z1Qf-Gd+1s35%;f#y|&qq3m6$&Z52??248M_=zS{P$n`vJ7oF&HIC>0^XI
zPJ&UK!=f=1VjK656)@+~{W;RsNs^@s5pEw9P!v(rRbulJHFtw4bDWZ_6AMQq3=zA8
zYKMxSQ3~%xwk@#~R3b^e>`@N|p0nsolc$<wWJsMMmf(2;srG8Aw@QOTDwH3f0)q%N
zHZvG<ax-Eu6l{ngVz5nf$1)O&h{TYWBwCgc!TntgC3CPD#tDqg3Z=!NAjvH~EC`2j
zlCiMlwg}!m=@7E;e^Xeb&;-6AipvDmn7UIKkz>;iqTge?)gkF=Hs05NE&y&BUFC1R
zNOuSP?foPT;0R=U4#^rK0aDymIO65^$f^J24S>UNB;=8)%M7;R+Fi`%7P_zFZ*8KR
zJw~3v)*2-7A*^?TsCt4pj)`N57Z@^~p-qBkdh~W2nG0weMK?+C(9G8r()C!~IM3$p
zB|LQ%l@4jG!^`LH-1l}zV~oKUf@+{JNDPYD8LV)4frsZy0xW^BMPP0rFcyVI1IlxR
z+A+)=iBYI>ozna)HW`z8eM03CE5TGQ2o!`Ri6;$tGGLH9oRLTkX&%xvKBzJYkj2x?
zHl|r@l$fq7X6g~zmdW$eY+rqz_R0?*=!mrR#P9O8U;k|umydzj#Y^9XWJpB}I1)E0
zSB8{z#?GOLFP)g<hd=gdU3`ORv_ZDB2KoWW^T$3qR19)Mvo~U#ju5_&aE5#^z&3aB
zc6acUW|U`$UXG_N`r0M3@4kiue6A3D?h5M38t(M(;AT%i;vu&C&>Da(<5UIVl|Td_
zJ)D$<WyRjqpo)YI!V&wDsaV0DwyT*u2YXqz+sNA8l7K(UdF2yHCw{Et-~G*T_j8@z
zJAWVGLF2#wZ=RuA@rfgaF#>zDwO1g8qd&|z|8A52_^oSv?Q@Gf{lo$@(=h^xb?%n_
z^u(_;O${%-zR7?3>ua~|=fC)^<D5A?L!%ZV<SpZLfuq?T^P?B8^Sz(!{6b!%T21ox
zFCXKPlMPNCpXTV1DwT3TtDCUC+2`Z7fA7byJ%5O&KefR8Tp1|@#yXsJIOo`Dj`-nE
zZ}7rvA8f|*>t9~tbDv&fsvh0!*4`@=2%tAedG~6IZ+>fqUf&$N2nYCi61Ddm<nNXZ
z{e-F7hn#DQt}BZ`?5%7Arx4zRV8{TeB0SGS3563DgT|N)r!(>_!)6IK8@=yDm)e|B
zmZLm{^c31?tTs1!o<$bbwVTT@-tR=d50{T}{Vl<@nN>E@GRGSl!MNzGlLmry*!^2J
z-}ot4UV(QuzRyCOuo%oRHI-rA4RrT)(mss4_t;IA;`A6l9~0<^&{;y8qq70Ya6o@3
z82N%JC5u+7_r_B~fb{SJM-)Sjz>0*_r1<$3ZlKBY4NUhPdK(Q|ashWZM^AY;Rbl_K
zo%e$ok4VQMqfrs&k5Wi;$uI{;VS-%<wK$w`6O-<u0;jNe!k}D+OS=f&r4&{uMIpk|
z<g!b<yTQhmW2isqNOGWe+yA_CvoG>EaJC>>#}(u&u=ZUbh3@KIwpFJP|L9WGO84HS
z89344=@U8hVy<r8-2r*4RmZ#Gp*Al<7fKC?rlGd<s~mk~jwmYQdjhL7@?nqdcAFb%
z3c14u0jB05WScnKK=fPa(Hd7TtnlI+AACO&9Eo)p9DX3Ec>z*+D5nuh7kU-OVlzW-
z9H}-~D+!#ya{?^{PAP=%QHo<C6*4_jVRo)Ycjz!SL3sk@3_%X$g^{^V9HSJxKtU=Q
zCnaiA)6}AfQshxDdmNpQI5r<LTlI)MOW<W#2YTLedO6}BRvzSN)Zo{jJH&52zsT~j
zd3IZtYgcM0t*8fzId&=MDb{%`hOk`q3z_@vcUj+laQc%`1fDV&lacqkB)uLk2yj+o
zdrjm{3kE&Xz+)sMT;4|wM(CF=F{WtL4T1Vkq15c5{1uG1h_fLi8dL=3S+Ex8DTGqR
z_@#9*oQi$3z=SXO4$4CCDNpf+o+QjBNtBzdun2Bd&)hFJFZ;RAjqgX&KDK1m0p16X
zJUq?fY>By<GNqDtGnuTlV>rrK+Zdp=;i)qnjvs08_?bD5ADN<7_3?dmGfv4eOMjTs
z?j$tZcaHlfj@EeMky)0Os!UZQd|#oBWjM;XdcDiajSe5*aO9K0k%clx57&73#55;Q
zHdvS~1CHS+f1qzkDUuvsuJOo2Gn_b9rxXX2Vh_)gIOk}##w^U0Nz-$@e!lm<+d8~d
z<?QKM7UwHeN<O8Mj}S0Ua)v|A*3N)j8;&lQIrmQQ;6*sV&y%RR`}kb^!kwHD?p7eM
z=cj5l0*8|dAr!s}@%#uc2=V<8&r{%RQ3W$Tc^;Al8F?0Ak^r3yF*dvBbuh+ajYCL_
z#bB)~NZO?9=k}<^zCT&J^h5ssCB<XG4pYsLW<wLX0Vdl*+DrK2M-0~B)gQn&{sR7v
z*H{`~p*(mPbI33iyu-McaAOVDuicAxv>EkdhW&t1<fsWn?u{7_J2baOY;|hbS%-5H
zDfUHBH&xptQkp{jF;J9T1Ww?m1I*wmos|n{^D@0HxbU*z{L&YB_F>K8g#h2LP`*#1
z#&E=7Sfb?l_|lQ)l3alB6mDWkZLC9Jz#1ePiAFh%Co-I|XlKa`*c6-;s5n9fmTZ*L
zT<1PW8r*4#tR~mt_aJy4zI>cVPu5tfcFA}Cfgiqb1N+WfciBz|#~vmsRY|tGMa6=w
zxUeOU!*#<{(5Ib`x%<;rM;=+i&Nf(UZviVswXO~RwaZX_45AvIQVa%tI{hv;+B<BU
zCSl&CL`tcx@$D+x-7T)QAz6dV>3zOiHYd*$3<Bv3VpsUpIj1qMgUAKgI++Q`^^mdC
zSQTPD4-Z9d6jBN*9+YB-a+-iK6=BE)gf=hi9<mIZOKcvHS%vT+s``|p8pEVUT$|yU
z*=ZULMco@xRtY7M6S*FKE>R*N%M63Dq1zoXN<PjwH4X7H#1$B1kX^=SKwWGy#bv5y
zL}J>+-jE=UC`E$64Dd(0L`gu!22^AQk)0G}8x!I`_}G;hL5MLDHy-1fU2Jm$=Ye$w
zI~d?bDbhJ|p%@8=Nk)i48{O}dOpYR$Jk7yH2tJo0$N9}HG(lAGCu1h|8UpDIPG<-V
zLW;>Wpg<}R0uP9+U`p?ksFxGMASV7EFd3Nl^@KZq4ppIp7Rv*Cbo}MFFLLVGG@p5T
zk%v#tP^|=jqd&;GzSiU0KUm?<{^}yzEyF8sb{LFOKKINLPdqx$(xD1b;Ncwf`vYEj
zeVaGVZSu`;-|1ZcSKnG;duPmZ&o1%IrxuuQ#Pqu<Z(nTj!YgZh|0k;t<b3LN#i5yq
zcdiT{*fo0VVxQjdJS$Ii_=A7)FpXMB7^s_Z(}Th&vHbAI*XR#29)4(=hfg$k_{0=*
zGbMu1XJJnA%#%xW`zf!VfB!Yh-~9F!hU1)*#~M8S_&jG$&!D7Ybz{IA=eBwG@-A;*
zY95fZ1N<TowFg1weh&FeSCF-do(FEyHYuz@7=uutq`>zSfiLiUigr06z$%Ok@TJ64
z3avbhQsiDhl8(u<0XLO2Zo((@d_2!XdID<<4vRI#`na3*axtl_iAibA-77j-f$v=4
zM>Rz)t+O*_sc{uK`Uc5PQKY&0H}JOx-kE%3{d|xAaQ<b!_#DjDVLXP5mu`K27Y4+}
zZj)N*Pz)h4gmS>Je}naP&5gn1OivYr$oC|2a?Ema4h9M`x_1T&{Lsg_fN^`w)%BMd
zyaTH%@MFFPr3%Nbk5-Z}o}ye^0JiSyQO$ElnmVi}$*e?pvRF%JGq4%T<ydXW^$4R)
zA>5)tPQ>P%D}*2V8RR(jw=mvk-2!-mq6$_54j0~NxrDDi!EgP>mw9r2p5=-l$XD2W
z`y6g1=LdIO`~WCZ^&%E(vzS_gjjc73_73DJL_<_MV%*xHe@~CCl#|hb=~$vFV^+8K
zac{lCh0Rsult(BW!&a02u+6Byfz%i1j{5YP;Pnb6&+$iiw}xZQV34B%iL(Z01V#vS
z-eo-8C5{)V)@P7qNwcldnIj0iqJpg*#${kkVSkVqunEJ_fGl@7<Dqj!mTF9HFiIdi
zFxKEXLs|LE&rA``ED~3$)MF26Q~IqTqd|9Krk$XI64m({Nitxkld{#abadsT4=A&9
z1T%-o!nlwDy;3Eo!_N9UtX^FvPqyif60%`RRI6h$kI|rm&DKdq8M+<ddfU+M0#CxB
z(_k~$dY8fz@g9(qbzkltnS=_2o{z8sGs;PKx|j=>v7(LhJUkIY7-Bt#&J)sMO0G4s
zvx%ONw47V6e+6la5gElAPMsA?P<<b%Jgg8%HEGters(+<6vRsv;~=P;dLiNdI=q}D
z&-UbYZyWo>{w&+ALHuVjzqntr?S7d3?^P`i@JZoMzj+O~#=riTkK_4@GY`$6lw>^4
zxq7|JzxzLLp9KD||8$vm-fi+<{{C6M`h}y+&lMTVZa?LRKfcC){Oh}CR^PhP<E<+_
zlrLF2R7D8E`Abdy^qUv?tG~PcfD+vB&wlSTGt(vh;@g*a?XB(uyG}ROGj6P3<1<e#
zar#s~sd5!D#Dm1;8wr<hTm`Q3l`kyv#pe$5{Bz43J5nbM6pOPlpL=$hfBi2r{_Vei
z^Pbz;-p%=wZ(IT3fBbKsr7;yzihbTV(5WS_001BWNkl<Zx6Qx#Utgx()dvs%0X})6
zCWLsP=F-22WNm-8bg$1?I*pMUXEl%&9~+Bvg{-$gAe}=AL7*fGuaKtqJVX#8bwrws
zAxYS49IBKnl%f)0<fA-LT9Ro^l4X;<OOOuXWI+ZeRW;`f&fM!B{DgCF`8*UIL8J*Y
z@-MJWSbYh;dmi4t%Qv=w|M!ItagmZ17uNb@qcWYchtgg8P0i&#Xi_TDAv}jv?@4S+
zaJijS5iNT1$2pLm!rBtoufw-jppcM%loL<XS*}7Uw3Kp1y;|Zha4QdZ61+K>(I5t3
z2Y7Z!j3JQrX8fjvB|u}v7-L)L4D1+84tWBj;Rn|#J{*>S-+_fE;fZNZHpT?rn8-5>
zbIXxqb$<Qv3Qr$yusj9%V4Amj0dJP>79bU>kV1OQ)k7L3M=ghoy*{I)2cwMsu7eJ2
zZQS#wVLPv2MS$qvxu|Yy=S^lCO(N4L+kJ&}1o?XLxPCA(dy+!3rVIS^?vynyA(e;A
z67)DBw=u#P2K_F>MDys}3`Y(xU;*PY(q0eGlaz$SlNO~Qb%rdJq^UwDDGXuJdPM?7
z`H&lgbr49b6xhswb3`hnR`#e>GJ>E<s56pYMtf__>h_TBogVG3VexRtBhxTSciGzA
zCAWt-cH$(h@mCqX``r(pWsVe6We?*CHdBqJC_lb^qs{X5CY`ZFCp}EMi>UcDdp^ir
z{PYdF!%JLWk63*-DK>WO_u$NFNOOoXxOQ)%CIBbxy?sO!2%V5+2}z<zyN3M6HQXd6
zP{E^gsESl=QVXdEatyLxY}-u2_`Jw#;2IQFu2kc44Y>wqaY`V3g;WZZED}vh;)E(h
ze)f`1LV{2jS!`SHkp#)Dwr?@n$8BU{-@tMkJ~@){p!`37!DqpPNatsSfBWy>=Gc)M
zN0w^TDnYSMchcJUUcB~phuN7GP93jPE_;+>AA!L4<p<wU>#)YLwKL@0+q(~pqyhZV
zADrZg$L8^sWU3xb=79%`G|S1g#o0m-?m-i^{rKLGH+kdrU6vNgOgCcusfaLC99gRJ
z{O6bH4-)?P|GD^q+gaZl(CQ>u>sa0BACR;I{OpL@KaSJ9a}co3p!JwE2kBXa%dnn@
zls;0b!V+6Zpir-q2(0q(WMLU3U6~-xNs|<lW+>?qmrKNPOeys6JVTlZteyC)Wd%!=
zlc2;|IU$4=CnZ+oIDL<R<l+zb@eSZvn2|7e9schJU1?8pu5NUSsPDGGXh@bPIGthb
zWSyT7Sc*ZGiCBxV7URGehtn3T!4Z*(PXm{MFTroj^QEJPC2yT5$q=J;d~ucX&3%0x
z9$Kb;Qu463jp=VN=wz5Q!6XU35=azM2%JeVwu{Rw`2dDHFf@g?*n<!2z5+Y~U-&$~
z{e|av_OT`A>K(eR3+(Q0)9khJ#M{ia6pM$y#_^d3rkt`n1ykkPJ+^76hlYAMWGWcZ
zQ%(G2he_;DE4j1D^1WEOlCmvQ26vm|Zd_!edl3fEx~~iJ6a+J{Fb#7{)TX9U$u{jP
zW7vHCj^AEvC}ygTL0hvs$}p-3GP;>02+PdOR5`p*!64|2E40%wE=`fv;t7HF6rK|}
zU!p^wv5nFAC<#bQpd40#bqZlUG88DEIEe7$3NF*^tgO@RbV*Z7<{}bVp*iw+x35@p
z0bh?IqLL&Tj~H~<sn+K>b$lAB=lH=#SRN+w9=`74yO3%!pgp-mmv=R1w+5Kpl6O}a
zZ~hH&06Qh9319>}EqLYigumI7;a{k5dZEEqlF{u|;M)5IWgl<@yRh5t(di5b#}&r8
zWEX|OFbyoAX>7EKCqyityyY=P?Mv<(Ar0Unifl(R1S7x{EsH`pPy*|F;CaRPC?!Iw
ziQtkcS|62H5H)8=tfk4sw9t!+&$OK+tz@x%<n7{*Za;DRWJ$(>y!`<lEG$=6x;*`O
zLMiqr$36>lWuAUwnpfYvb43644>x%J^G7(eSfv#Elu90FPtQ=8#NQi-7AjQAJ}cMT
zoO@^cfgSx*XQp`W=_O7aZLqytjA@_9RkD*#99Ou@8uQ7%h^?Wf)lTU3QvzQR29hZB
zICZ?iSDrskr<?GNZ{2v`ZREKn*Opwn4=D_HfCGF?qV|hlP5a~~Y-=;pMB{9N_Cq``
zKzadE1^6mJNe>}B905)$kOH9;fmDQoLYyKVk);{hKoCVlr4pscCs39^35>}Jb3<l9
zYcuh9EzGtZ0z_dCAe_Ysd(YF{NuK8$KboRg@*hq@tz?qzY6DFQ)ujE4j6Tc)azW9~
zSDJ)tdy~pK&GvxNC?!iYI+Xa*PTHOdV<dr__|pN-lIJ-(Hzc}>nfWvv{X86B;5Qzc
zW2u@Un=jJrTqf`RgpDguxCZ=l`244M`fS9h`ZcCT*J)nA!L{9OIs?eZAmRk$CrEPg
z)G_YCU<bDC{<EwDk5SYT)_{v2^C@`-=Dtky+&o`?w9eO`tMMzJt}|D!vvDoq&3AI%
zzSd#&!uNTpd!CuHWT`$!$y_4J-lZPwuXg#9Fd1M#IbR`b?XYbJ>~5~o{g7T-7Vb{c
z_9mzICG!e61L6=IUxGvPRH_kvAepOFnT})3AZK$}<HqKl-!6GWVliSY9Y%&&zgTZj
zQFUUM;tPu}En(nOiX_tH40=O^P{gGe6?*u-M7Rv$8%okc1>j6Zp5`QpA<GR;2s}>`
z2R^k@nUY_^AX#r3c3Yaun~wHq#B4obuHne@06(a3suVC?4yf4#JxZV#;!04JJ!a$%
zhk%U_`6P6<RuK|HuS9QWz@E-$f8!G8-ks-~%DM8wixijZ*Qp*p#`KnDC%?pq@87nq
z*}yUr6#_$DPk!vNY^$Hr9Oi@q+P>m44SMWyWHKV8lTl+t;T{N3o4hU632EDFkaGap
z0MY?cL^vrB&I6$fPeNrui3urFIH3v)6aZEDtKk$$p3zGZ-q@>c`#wk?l)kx+t>}+@
z@A&R+v9^PyV+Z&p!#kH++*s=|J5!=u@|c^A`IXNdzAI4!c<I%3o_TzM`I!>sa=`z`
z-kZl*nw{r;zjMC*?py8ERlWCgPfyQA&X61qmk~+Pq%E0}V=HzL0Zw8Fh@Aimko=VZ
z$zMhg*bo9cixk;WB0~!)k)kM36v1UU8qU_Uc2Do!wRP>wUBCT1Cx3jmtM{4V4CQd-
zdK(ugbltk^cg}gA_kG^yIkdmdlOJvJ;>%n2y#EuA)R`PFVHkp?HJ`tHcIBt?x{vJl
z`0~#m;>58L8daCgEgwHf{@Q@r?zsD3b4TrFQ6?8INwYq-WzuSRlnOS-4mbG1GY47Q
z@p<7spZRXVY;P~xi~m1>+Ry$=)PJoHtx`ppMI>>IlqQDdVObu^R#=t?mV+=|EX&2T
zO{8gHN{LB^sRB|{;Y)~8jbT|}8A!{*Ff^uiv1}LDj)~)pY*;~(kkfvokqetJR8Zqy
zo8lqh7lD)Ta0|vvC>l`9DBC;K`^zlsY(p=AeguJnSb}3fDFI^>me0e&*?0ILa)K0Y
z8LCArQ&9{|+S_@huCv}_yBE?A6{V8K7<%Vv4Jd(-0@ILKQjjP`lB9%@K-mo@kCpic
zkJqS=RGDZvH0?Ig+BvRX`hBjPfgisF@DM!w7+?DIF&^FDrP@Eo+WC1FH`dv>3`=RA
zKw52x!Whedun$||ooukr0Z+k+!!Tu2O0Uqr{B2l#_5)lbC9H>v{GAg9BjxK9)fmm<
z6jOC*YJ;RB+1_%v+Sh#j8-IXhN$i~_4LQf9bLZJ!yMnU|pX=nb$J{q-<N6{=JD;0d
z`}Z=7TmU`_)00rILD_?n!>DUB?YTHo6DA?H2pDl~GG!2y3f!yC82CPZn2}mGUR5G2
z8`lI|OA=oZ`6+3pD4K$zY2!$jZ5<Ixun-t=3Tet9_DN$upB2?UVKg8}HIWpA2ADd)
zPzu*{DA*QK*lZ0TjG(8WZ)&cE3D^2v4*7y=wMDC5q~sWAE!f(G?any5Itgx-PG^Iy
z)i&=pwb@x&BB#OLF7fi#>F0+(eF{GJDNdbwg0aRy+5^S>xpVOKL%?s}ETQNagA`Mc
z&ue|akU}9XP_{!{F0e_13vALG!pU$5#=5}r5U`bj(c!z99R8dFSq7v*uDWB{2r2TS
zk`ic<4LfWK%o|oID#u!u4R#^#oJA1$0i8~VT!l`6d86B=^SRDlo3tBqYx<74Uwsex
z{=H0TFMhV;`_HfN<YN;YJJO_BuxQjgjvZ>;_x`WGy+IJBWLo1nCX?f3jvs2=7pOgY
zYMfTfquY;JT)ejj<D(B&bDE!(Gk4Nd(HkUOy0Xny`|jfHQy&@O=boPB6HiVvJy9ad
zG)2$kBacqdXm}*C;^NgUme=p5`^`?d?4PMpE?5XDNHc{WBwSnQv2Z=OFK7b2n@8N*
zP#bO99640QwM@b&;oRjm+wBidGZaFQCW?&>pY<)Dk32lizNre0n#)5EjPMJeKg#yT
z8(f_8?_bQ;46PL2eb4p`!KqUXY84mDHV{G+g&A9IpVM#N`+KtleCnxjT-VC!t;0r2
znrc>7dz`(Lm)V|ttU;qzxCwGauD75RY;O6Se(UCN`^n=K4op|E?VN&}Wr{FL`S$mh
z_ZI6OQ2P*thAh>&_g9>dSP^Mb!g38PqkwH%n4U|?c5tkm{wQ?<NlKVOA~I49TBRhZ
zB2K}O2HLPNYzx;i@lA<{jof$}jgT^TKe<sf7Wb<je;y{DfnPnzKYFmq(NT+92?};V
zDOo34zQXeS0`uzwHbX^_8d%cCvrSA_gWjRL<*{(i=k;grN2hSWbD`o=tGF~>12>aY
z)HVz46gEOO`Wc;A(MmO1g3ubJB?yI-5<@BsL*}yGLXsdcy#ixnP3ogfs`U!Bl7%NM
z!mPpCMfmnhHvmiu;{nIVws@erM$);$wT(;6y#lu~?-O9<zTz5RgyUb~;O9Td<Bv^q
zU@XSzj<NE3hwpyv73MC!mv&W|TwXr~UcHf;Q&&A|CYb&TE0+^C4!i8DdRYCpVUQu+
z2}*~4j=69DkpJUf{vLzB4Xq+9Zo-@MxA!;^=5PpThpj$r_5Xcb;D?|!4YdZ1(J@A9
zb!@jtYFHSyfoDL~5|}E5%pgrtNMbBQQFQLTMRd9b{m?|XCa#?uyPH}Q14=108K@Mg
z6h+Tt-$V;x7<77l0-cdW32Bz#YYob#s1nj3CJItg!$jGVB!ei{7#du|z%opt%*3(`
zTt`sR4z^>{krr#)1+FNQPn0~yY8oB)@CP>6m4mRF96an&^elE(+H`s!02q~@g2@Ab
zgbPc+_ip*+)9nA{kMosJoaB*5PBMGo0EvRv&oudJeS;VO%_~6eePE%n4N1wiaBYw9
z1AfDfp|KqUuj1j>%Q$X@&CuqCW@wa`Vi=Hjuy2gd9|j%+PUX7*H6TgITi9s?MgfFI
z%b{XpUY!}vo8@3j=qv|cmI<~ANU|hkr`KV1eS5g6<zAM#>Z6&1wj}S;A>^<-e~ZEO
zeRH9`7TaF@?8l{RTWs%4Q>(a?iWZaOCBE?K3BL2gyGulmA0NfFO$;G0OhKjWaP(k{
z`>{dx@2gTNy38$fxODaQ1M$-z8|A4drrAGJqgrvWO^IpB+~>8Qu&~tO$ETP1lfSrm
zvOfL9C|~~kAx=Fw%H&uH$F|5a#msb-uYBnNk|d?mi+KIa8vo1xb~_FJ?|yNX#~&VN
z-$a#a#o84I8H5Sfm;1c(<_f>}$5-x|bM49mX@Ozni~U#s{xP0>bb`r=GL9qZ_hK$w
z+2PyYyUcShe=xsEDFp~ke-QKi=jKRKg=HH|jh7f{7I@;33A%%bfBqY<zH8Iq-A<6F
z9&ho~llwR@Q=?ILa9s;&2$DFX-Hy0$Ws4uZu*mbLZ+}n!>8~8)v!9%0q*=f+jolgA
z-XP}EwH?0m!#PHqE>Ax>&D3NC*D-TWlgO#0{eH~Vxi<CcWxo5|Dj$8g&M$oNC?}7P
zP_O37z5PMV##XQg)b@bdhdZ()BFHqcba31hTV~io;~0X1CG%WEOO!Hl6K$QK(v&32
zhBEdB2nT6Oq#=<qAN<YI;ab08`YLi0ZWKsiqA<9<M|21{0AD)DfANV~K6f0BjYF#h
z1su#!(x2!sSJ~v;<&ah1CC0_JT^!HFwk1Lo2zGXumkr$ZHD0)<N0tQBq;5OZT$f5o
z;;0O>QD>>Wfg+`oCPZ1Tq^LBz76U>{q|iu141MV=3`b#Q8q<-Ki;|Iwq*4}?Jg|j9
zp;2aX@-ZGaUgh}=;2dndK)iB^PP|Fy>JOQ}@=i*X_lkWy`I&uu{xfwRJ)syY_J}rO
zE_N$yoOqJCTg4+p6U<I7lEBpPR>^w`kI!;we1~`|WATMIfJN3<e1fP!5X3BB{w}li
zb;d$XZ*_r7b5D{sj&SlsgQq@qoWJ_kIsWyZf@jzStr2iH!H9-mYm^TFIbLr5oBp(i
zv~6-_%4&Y|EO2dTRxqk9YHo><vPHv9u$>TXN=#egSTdhgQVwR-WXF%`M&M{bSoeIU
zATAQ89!{nq4M?*T!?bcyzbr$ieUd03axF|NW2`12Hpl`+J4o^M@H)2~T-(6R0+IxD
zW@6elo+*jZ_=$za!jlFC*TFT4RHcD!<T-z{=}@Q{T<%B)fluAr!V0(8-X0K%X~MKY
zqhwPl8dM4r-!Tz}_5Kd}eGl>3r=DPT<`^ira_TBS{N4bzUd-?Cv4ed4&;$=nm^?Ne
zapFLZXU6Rc?TZy&oUG;TETANFqj2GPG)hI5Y4Gk-iT95*3COYlL&mr+6vtg==UTK0
zSRo?Ar!oX=w{}P`4{zSEqc#pC9Z+Ex8T(+C^RBtjXeo0t^{@kYgSn`+&IN4q<{G3i
zLAS@+<`$PXmT#suGM{nFKg^+wzhOX{4ZCUgfMmP4Y|jU5FFri+#@p*GEOi+hEm5yJ
z)M_q|of^L<P&@VD2&O3rqZC(IIF7-={WZSwrCI*?&u$-Hed=Q^#z#sR23)?jeOsdc
zl`rk*OV1o+cBV>_WUOxnZ2B>!qQ&@FiLsFqGt(7DM~Wng;?KXAOL(0*yUnp9Eef86
zWl1JR1wue~5V3f@O@ENkA0#YZzlHW;3V!`Rdx(c09HUgS8T1p@Hgjgg$Vh?NsR}cb
z6=wHU7;6>zjo*CpZpbrS@>0S?tH^)%PaosqlcS8a3RJ6kVNGS4MzerpOFF%nw?2Rj
zzLfcVz1EuVKDWvn=Qb&qY%EJM)+#bFR^+LVOz~g-<CuT-+h^|j`&*fh?^G)Km0vu>
z(;uH<YOFvIr?fi}svS@)I<y)d$Bq=4-B;njY>oZ<7Wj8xzX@d5Hv{^EgxP6}v5^9n
zW#R`h(Nao#C*b1c4Z@(p`oTKmqa{Ws3zQ1E6~xv~!0K9$m9-vM=XZt$gC3h(K5>#!
zuen%;BnT6>JHg%}-2-ZW146}Qp-<>}lp+UZ+GxuJoiBFCXEh9|5yYffNSGu<sYVNl
zkl=~jCoR*OC>~OVv<4~AS>Bl%POPDY2EzgE-?9tXFeP|=8Xg(dJkS&zE#;{=<T-h{
znZmZu&h<8NXc3z=oPvW_H1IqV3mYW`-griLg8Klq479*8OkBsI;7RN(MmYv8VBHEa
zvjHlJ$+7}UNu<1?<R*spNV#;sX_z=xMrtNxIzlBrGIem01WO7G5o3^0aSQBw1h`>i
z^2(p`VhT$&*ja*CF8_qz*L0hi+9eLTZT9zf@HUp%T8$8GNv$!<*wK%(c5w@gDjcwA
z2%qhB4bdzdJIdsAgUPzdNY!Psn6kA1i!T7QL0ANheaIl=@(cf(=b~?+ufon6oXJ|u
ze8Oe_$aSWRH<kN>Y(EStPza$E4TZBbV1Q>JF;VUNohT+ov4AB~;z59Vw?XUTQ!p|L
zwgqY^v~HRRndMY9TTrtVB_qQ00}?+&I0c;g2(Dei5e7OlaBY*C?I47p8w-@Oayr{R
zU!nzOK5vxilsL{X5Rj(GD5k$Npx2Kuii#)-P*Ddv8{nx7UnycE2Z^QxTV)6`q@yuy
ziD62L2E^o@IiV7SN-29LZpA@}46+ERV~Tc!P+ih=m9=1jVD${`)p_1pYT_LJkC+xU
zq@gJX86fa8NhFN-wIw{hzr~X$rZ{|P5~VZ^Z$Ni-jMsjY|Ncn5K+Q5?umf9fBLfXy
ziz%_jq_@ezdY7xqH#=YjTYzm+DYz_)I_UQg)VAA8w0CA{*(FF)8lK4k8gxmBN!VhW
z>$DNKbk=SqT3-N;ky9dL1(_cpg8-}yWG)ng1R>0!_=w!KKHF8WRY07;Afdal#oW>=
zf4n;pXXIE*=$qX*LxM7M8l}41qD0@85vli(BJIUq{A|SKYXN62Z*cT*gIdL=Qg(RY
zaFd4~sPfkNn+3Xu9;mQ?rbZZLtga0hX?eJ=$<%0x!~5&psWSBFiE%1rhh9J7{FR&3
z$Rh_!eBvWhJaTdj&$D>_>?(iyolAV}TXQ_|Xp3L?!XZBS<US_HOGqJj;*p76ptdte
z`K{l5n<M*6{I~z~32GG=DPVD_%fJ4&ukqTMyAP^g|IZ)d>5t7&DcZ~}ba>&_Wq$PH
z5?W;Z-7h`BGasK}c3+ix%_U70i_2a9=v#BQchq#gcN83p!w2gGVTK>XT)G<JIR+Es
zWyVKKOpKOz=)@?GKRoe)fSM2>#m(;B##YKV{`@?pqJ?7{)G99fr>i{u<UTr`i2wI%
zm+k;+LqA@v@2iylOJCm4=RdulgZu0B`w<r|Zu9*g&-3HAHu=<}V?6!DK0f;B1XB|w
zDisIUH5o(+-}v*q!}-m>Tp)-Ng5WS8`^Y3CtpZ_~vAo*jn}2bcxy6XN#SNZ)VT1qr
zAD`rNpFP0A**dl*+1LvC_II!FyI;S$`+C~ll;8c`x2cwGMjHi^RPk3YUFW;c&h0JI
zJ)riUmd(%p!JD*E1Dn9Gu?-u`GO;X;GgNCtC1@3)(*a4)rsun4wgxN=156=ul}9Pa
zOf~dD5};&$vouPITs=+5VZ~VvRnY)0f_0sGvVa%Wann((U5&OLumI5|q<<E(yN=oc
z<&LA|KJZ#t+M*<O5PFMHY|yatUd!EmoFsopQ{dQwqGe(m7TR+tRDkX_QK!qGJ0Pf+
z@ob4L#jq)ux81e6@jgHp8q-KfqlBQF5|z57LXes|r+vn&h_sD!2L^cQ^$+k}E&U-2
z&&_kTS75`sLeN=cZSXld)f2>pF=mfT)=NGbLEX$q6F=AXaL0N4k)wR%#3)mhHPrT5
zjP279+(PlFNUBpU3USC<3I5GD;o>)Q8-(-44SuDziJDGXSwBVI2mCY~pW(o`4gMI{
zmR}*icM0qQ!T~GJxSzMQRV+}cmvD@jo|(|weusf>?_nAz9;G@m0j4I6I_RK>j(wuI
z$CfhChC`?fM4C?%`ALcsb}5P6xLP?SgyrCvATyJqWnwxu4k6ay-Xssp?on_;T*oBx
zC4p89B1PPZi2DiUs!5_HS}URu*0wdhzC;-k#|(EBRmlWNl90t2mItPxu|%#np<+dt
z_=IstFR;*AkAeYd)+Pv+2)j!}-BtQq*I8d!;oLmz?4Cbca71#X=;3${iGp4NTITi|
z?<bmOk8xv*QFDt#OUAsAsiNey;qM!kKuDAIos3Io&QnRQGTNxJxzeY<cp87{<^^t$
zVoQy*4T_!x75f9JU@vUK+E#~AyH6>!7%?pvDbkS;2#wh`cq8nf(HsLFrNBIbHF87S
z7l4lqca;!`yI_SKD2{;~7N|66LxN!-3>&10(8IYhrGXS;MYP>#WqFOa=Wn4rIfb0=
zD25<S$Xf(O?i0I6ZIAA_7azWO>GTSp`sfT3qeVQ&U~;_7$p>1u0kxCIM`+Ytws!(9
z&+qWykr58eR47+$W~Zxoh9J15P<Lp54a+jPwy?v+t2YZfM-SE*X%+BXlPFGESnTk%
zAuxLBwN2VvA%_ms85=3$c_vd6Wgb6O=k%L5sgsxH`lL$jt~8}ION)1N^MC1!vpo6O
z6yqaB=9jws+4rvOJ{Q3AKVD*XqQcl{ky62-RrlDxuX<PdC&(M@wq@YD7H^*4;Cs(s
z<E^uO3MTxsUwe$teR`Gy`)V}mE;Cc*_uoyk^I3W!MNWYn#<MSOGCF#VQqktb(H6ym
z#nFRxe(qB<tZfbW%OBjN2WD9g&@|i=s2!SddHQ4fIDWK6mT6u+v&R4Z`)9bely|Sb
z`|JuYpI+gg{gcOe=9BxGnkaMpXp?SlKbJ4JIeV$Qd%q;jn4Bn4EZ9gXFinGgaQj^J
zZ~XQdM#oAt>K?5|0i`vA;O<#IZ3zs^pgV|JSnTliZ(riAbDg~f`X44x`$>V<hveWL
zbm*H7mg(S{2A0TBDVSvFBp{3uf;eFiq-04S5{DfbAzhoIXJVUzvTHJ4GFj@U!?!);
z45{46R%>HOB{ayLW!242*W7C?%{5uR9J5{+qme+%3n1>3^{>#m{yf*;{x;VybXeJj
z(3{0;K0+&)!K{1O))q$p4dVWF!U4my?5_497!Vja70EQfk&wA5t^;tL`EG}UeV<;K
zP$`($mVq(kd<zX4fzTN`i*qUeG$0MTbT>oRlMo7h9HG&fhe+G3uDs3m&QJHNdhtgu
zG54b)E|Pf;Lc`(IGjM#?W#3c_%L$0$1Vbf+13_ot<C}dBHX|OMPM9g|Ft>W1xohVL
zwkteQ>GDz+oaj2WXpu^~!bqNu-qi3L*vy4>Dta6_A>iaEIkbNtA3r(5WHY0?*5WlM
z<HcvsfmesRLDB4^Gz58r001BWNkl<ZllZ<s4HaQz22v-;?45_GD-D}NV?{>BO2nyV
zyPFb|km?v6DlBc{IW<bQLpzJvR2fAnD8xR!PDoz`j5P|BY=!T~1VZ5yO-hbN#hN&}
zk9n7W1sxtj7)^90NrVQei4DLOIIhOFG$?^eHG@zS879iJ39|^D<(=d#i%7!|QzclW
z2qPhr78#Nx74#y>PMp!`CX8*bk`3NwdF4$O=H6g!5e7?;NiZvL)XIGYZ}e~;@JtRi
zUCOS7)ETCfh=N6>Xuq%PYjb^()uqdn9I)&HX}^Q1Zh+_!>eT{;Y6V{!ym|RLo%!b&
zDfig!WxW0Bk6FFtY)sP>fx?x7l3{@5eZYMRvc$qRJSvufV;N+m7`BaX8N`{xSm>}y
zhz3ed#=g{MExQSV=76KXG<j37*l$BM0JD&THL|>WW?H#mh-u{jEz2NHa`*K9fbI27
zE-WnZ18%u?9V@3fN{N#xGAT%JBurvxfPGKpH?en0@5P5QUU_|+#gz^-(`81Q1!@(C
z2aYtz?P~HkcBqME8Z0mO_|ePDlnNHplO-(MV0yB|-}~hw{6Bw?dx<>xXoIoQ5-L+%
zxV+7kxtsL0^^HE8TLV@%`t$|~bBnhp;ujbC?6gCoI7J|EU4uf&y61Ykb;TKXkPlil
zn<qaq&GbZ>G*v7twr>Mz06%(ZokvcLFf&!5QA^p_3fS7b_l&p}5XC8H&#&_vzj@Pm
z+E3w+zHyOLCq|f^s$p6NwW`a*Cn~)0_D|kbb8Ru~{^wn_qLd7V68m5M<{Z_sOTo1`
ze4s|LX!F3K7Qgs~BP=a-Id?e+t4XR*S`Q7n?|zQYe)0fE4>qWj92S;4oPK?E7o^>Y
z&H(=K>t{GPTc_11P%S$=c&y3OAKS;-OE(4Ie)#-4&pfr6(;J%}W32)wkB@O>{`SxM
zrPo$?{GoAL^#YZ$&7%*E^Yy>D-Ba)J$3~f%DAVaiT)e!!2h#RBYJU?WLihWGrcEI8
zN_b`oOrcR}N*F1^#30(uNdg#@=+t4_mNZ-wX&IDoF*3#cdNKrJa+qP}6e84cP9wWB
zF?p8r&)K|K9#DxVNG1&$PK=0m(1Vv~FMNkfZ^G+u!PPYgy?Na6dB$cY*f%lCNO2w`
zYO}lubMuhi4`kaC*OhpV#5NU17J&|LV#cK%*7o<==clx)P|y-#<TG|EQ%F*D91#!t
z_=5p{&?g*h(ivQ(Gk=C9op(u+p@L(l2N%wNknd$EFV6_j$o;>@9oFm=dR++m(3H4z
zu%ehE8CnKx1rePv#_vV=oet|_hqyfk-3VK?ae`4?`<FO!RIq>Y63yTL0WU9X(Op_6
z(*w5shk-Z938){3hxSov)+yIYoH%N8V9IB-lrmNwfC)~+Vr-%SGZJLTh%F%P(2ege
zZjuHO1C@}Nitt@DP>eLd5eX$LA+=4=HlbCdCly8-;zf$Ff=jE}q?x2_rYT#49vdAX
z&M<t1Q;3m5ptOmS&~g+qQ7C1T7-Qr!eAjP#-j!=HTgO0HHcCpQ3ecnosZq8j(J5(`
zcaxP6L^4CEm`o`A6ilsfMMk1x;y6Vo2~iLeBpS=mBoZ>iL0Ktb7?3L1*onBdvCdcj
zBt!AHfpK`y<Vz3iaH95OlGO$51sF0BnJAfzmJDpm$n7&sL7W*l#`}}QfBozlqpged
z{eW_zN_UXb@83uoTpCq}W~~6i<ouk;tIy6+>7640{_GCXRi!cvttps-f@OnK{$Sfw
z3XUl#7c5*1BB@XtT}0VN797mJk3EzuSprH~1Twm9Bz7_HL(&HPHAtqmvFbZumqB_A
zxr=!>%(TE7+JvM@USR4E=x_J9c728CSFZEst!vdbK?n>a4uXuK0-3mV4()dLX(4V@
zt_2?o2F70O#U1hXg-wngY|^L~a2<<7`|Et>lN0>lxfP!I<Tz6kB?f-XmBkL<efByJ
z9dGgQgJU!ulhKh9$8S-KeEgAdiUot6cF0R_+&=5}@*8ao^8#ltZqe&UeD#}icXyS@
z75{{kNSS+*-n%R!c9)yHLy`8;hguw*tx_yltgQ8!U+&%WegEDcou|`}sZ<<R*86<z
zPv`Dk*4H^uTiv+(pu4o#XW%DjrI144IwpnU`<pMeOfmGW%~?S8hQ(m>W~uc5`giB4
z6fIoOWM;BLz3y`I_z3^-@15Yk|K~5|0MI}$zd$Y1`JCE4>;x=VaPol`t%i$6(dh+T
zUA#Ay{lc|~tMl6&oUJiAUZPR+IDDXX*Zp2Pz0ApDBaF5RRBJAeo*dyD-@g5G91J4j
zBqP&`YRTc);Ra7U+Tx|xZq6<qI#8$CEO2e1!^>~1?k&nap!PTP5Y0M-zD?iEXV0?C
z#4-dzDN>csq~-G#3Wz}^q#1aY$w<YdA|b8XOja!#1)taEZh=dY&c6lCEtJPQV&S`d
z^LsINc$n^Ng|SkKtFB{ozQg)uc=ZqA_qatcd=7YFg~w)BnBA9;nXF!i=N8`KG7ttX
z8Uuya`TI&z`{qj;blKSP>GfmcRHMXjx=w(U8gxP&_8D}x*lKs^2LZ9a#b9TVjdO54
zxL-H#Cyi5i&A-}!eN~)RiANeGn)L$JvV|i<`t4N~mM*clwLoumk(FK%SG)Av7IQl`
z^O2h$Tb%)P=D9jiV7ZY|pBTq1J;lr;CS`LCfB8DA4?=V{;M%&yXk!NR<d>;ir`YK#
zK7O#t)V><ywV0|EGBQ@A=44p@JliXCtPebVnG#1U*y<W_9})w?7@~Jjd(;XBfqGA$
zS8uyZ;15W&LRcBLt+1qn)EP<Q5hOmYA*gybjgm(#N@<#swKQYB9g!)E^?rs>P%Rg!
zSBn%qnJcLmT<ilTPyL-Q^H<;eKW~5D>VC9a$1N7X2pISgL6nhYid5uuoj6HRi9#b#
zIwMOpHXb$C#SgZLqaIn3rx0<f3Br^#R+x5f3~v}3*D$DRiG{=~Pf(lq2>;EKlhms%
zDis6AT*LBTCS5$w<<$lJTT+3dEs!F^G$f|XkV4|8nlygjScsP{EV14RXjW=iMv<;h
zUMMg!EEVF&2rU({iusclZgkr|N-p&BS2v-HQkX(fuq2-2K(X+FSB6S_k}Sg420QV9
z6)xfT1W|8<ZPs@cRDIyp6dHH!0)iM#l$V?6Z$iC!B^SRbjDWQBDvKIkq_<AiCyICw
zvasIem2<27tGkYw9E}wPm@)@^xje{CneN>O+f@;{v!k{L()QxR72kdSDj)mEGza!o
zu`GkBi83dTHu=GGD;zygr&TL3zue*U5O`g>w#~-ofNI&MQnZ+wtS~d>&~2w2J=j1g
zSXt}y%4>InfEP}0@xtlbCH-3^!54r2Fb^JWGCNblaZHj#BZR=X-+H=%)9!S}07hCK
z&ANwe8$@x&PW#@X6dT=)-}&l0c$g0BJz8rr4Ox0`=7!4j?)a*d0!zNXlvUo+y%z#p
z?{1L#FMsnb%2gN3l1xvO8EqDL;^9et{nsAmU;OWHptahaPrDPSJ$SIf#CVB<XOkou
zgCL{Ry+0dfezD6=J7jXSh;5rRn;xHiYJ%_o)lC5Yt?ymu=RbRp*_j%iYjX5Zi_d>*
zoWFebCfIuD#3%zlq1R6+mn_CcOFa3=#4b=fajeY#eHD^av9j9dg;zKC7UhQ#sEOf>
zzy~+J{+oP=DwIwLvlKhcFiaC6L1={%3T<eF!Eic11tN$NgtTauJoZ(~xH2RR`b^e3
zRGmIQxDc`1uF6cXhSlmg;ZBdHd<TD)ul1irKY4`1W0z=1$Ts2Px8Qf~^QvE+&u{M@
z0+DI5SP_OPkzrtGHVG9d1hCTvG%^l}L!U4zlcW}onalKRtx#D^8u|3Q+ib0G(HZ!}
zQJcY5k4qm|VCaT2;|!b}h0z*^D-P3Thl#SoSk0nZF(`Q^mNw`XZN%CpFP(mk74~zE
z88|!vBTXibS9!E*Vd!m^moKsWy?NgH(K?S$9cQ9BNn>h?nMM!QzRHzre@4FxJvP~l
zBu7SC?3?tMoo=zcvB^j=q*7Q%MqR=U52H|`=55pNo#pjcU+40mfn{&9ytqi5&u!EG
zDPNgsvVb2Bh_ynbnmF>Y6u5@QF$^N%5NQ*kq3Rfv9FJzXOv7_XRTtrS6bcT-g2&86
zgX!@SwvnJzij)RII8+OV=qx|ZnbW6lej^QNR3x>6rl%BALWpD_OiW>+r6Nruq9_Cv
z<4P!%s*E+7pcPja0xm4INi&n8Dbdydp(3P;k(q_a5_BA3r5YnMNmG~_tMSMq4=}y&
z81-rm#~u*%1D4K5ynN<7m)^RmO+)D!ET>4ADois%=mCD5(enlU#CYGI_h!#Tn+h!i
zV<Tn8COwV?2^TJ0qqDO^cXJ!lbqRU_Oigp}(8oA%;1D~B=G8aH;LIQ8D^6!v2DrAQ
z;M!1nXX;}<Um;PMx~=PUYi#v=Hv9-Pc36lrP6KT;HdWSXaHo#y_FWZsfsaL>j1C#z
zI@t9AMR^hG85Ek}7V->hC>(<ZqJ*?F;QIOwudjCadKTQf`k*xuv8&QA^v&rrfgW0>
z$z5MHt;H=PYyz$K1V#4Z!xf7QDGS#-JaD+d_(+jj#pU2^oiBW9lG%MVOk1#cy~o)L
zd1va|-&y46o|<KPvO=X~Gura_#V;OVbHit1w1V%)T)g(~GXuZ;<^3Ex+@MwWupJA}
zF)*#0s7q*eJ-Y7M>f#<g^nmB(T_@wljQacZfD|`-cL<>o_nB4AXTox%CWN^6YksfK
zxeGuAmU(Yh#qa$7S<0S;Z5fP>6q%eT^VCPD8Tc{1evB3xtwb&?a!VA87UiOiV@u*V
zLuC+#_gAT1TItgt#3-G=F3&Y-HQc-IcX4iq!-wk3OxKv6D01TH$SzR()F;L{e4xSl
zmXDNzBZumgOBN@Nw|MYajk6cpJo(53)8l0}H~qV;9QNWv1k|*?|03CoTd|rNnlh^4
z06n|@LgI#m(QZW0Nr*EOuTWup#G-D;khqK$HLi&11retgQozbrs%zpJg2WbN{rm9U
zR^X4meu-k<Q{uu;?agIqGE}BXGeweVOeGM)#q*ksw@M_2L(_=R@c=*c8AJw_X`m(O
zG$amuf}oG@_vp1Z+1%P@&|hPH=lw`(&yb6SH=$XFdKFq_s^euIth-DXbK!=fY2Z2z
z#j=B2u(2J1sX)0lCZoWoffMla$N21#Q6|S4j5SI$iZQCYz~%F8zHy~YXTHXI)*>yI
zskZ{g?FFuPFYv~z@CS<k>#X&=*t*Ab%V1xn!Irnf;+1P$xw=7=WF*?6F*=1B3+SxB
z&AAKnygffp_yH8fg)D$w0-d3wt^3}u-|v&88HTVK_>d(DhSUVuSk)4xas|)zD7X$z
zxk{l_VBps%+3RE&luHF_1)J$HkI69`oyGY5ge*-lga$98Rk;0t>|MJ;eBvls0n#KU
zPyvC4P-q-2h|`29O-Rxdr4*(in3=3_bf$(#2BdwHg$<i_0+~oj{FEeuGz!46Ax(&)
zkW^S`GjCQGWsiNuYaA~7*jABv&?a0vPkZSiOPhz-YD{89BP0|#^>7of(n3iKvOZz=
zI;-0;nHVSg07L@Y$tXJp)soBjNR48l44Kcu&N7$Q`jl3CluFP}9X|2#Q+)Kq0VXCV
z*y=}Ey2FcSn!pyB)(8}y0iI(~^9t_>;!Pu`4l1qgba~&6z%c1MF0ozZOns6$9)+1H
zCMTz9X^YM4kHFHaz{Pw1{f|*JjF^(h>rGJz$uf+K9m?uWNDo8W0NaDm%DY}kM$ivg
z?gqTE9`l!-gzr-Y)^96xfyzx;$;Z)*p+RdZL|*K<0l@T~i5k0JLPFdZqwd9C{LIFM
z3!9ugI+}wf%V7UZg)csHkVf65KS;QA?PixF1>U~2!6PTfDHm-THIK(18t3|2pHj)<
z+Wdg$p1&_OhA(|~n#Ug<XLh<usb~`?3Ck;eE?@JJhNM<;F%2;k#CZ48`(40D<;4~u
z1+HV!s(C+^&*;6Tpzk+T)#_%~UI5a#_XEu>`uy>qU&M7yKKjT6wVKD_{WZdPhWW)V
z_RuHp&KWhskXWW13V#S3OH%eE8}}>tZ3e_~mJ<lX9SHfBc;V$`9zH(8^hA|P+2Qbk
z2BS@v^{tRo59F2#ufMg%@=BL#)nQ_+#KGArPkm&9vlrUTOjjrtY|ftF<hhp?_ZH)a
z6{zijwD%fvm^cij^ramB@36XjTZWNBqUmV^X*+lYkD_B^CJ9z1@tZzJN84On(ex4*
zY{9rEsk=537vC#$ZR1Yv_c-u0P+~xj3-rh}9P8xij}NQ@XSv-esZLI0dM8WW1pJUR
z4#+}DByEIgAYGSIHA5Q)snU3QKpM2^_dGl&L!<_dj!BaMzqdoTyGp;e!Ju=E&BZ=H
z`N;1q*yFHo2I`|wsWMhCbD-%lS+N-@K-GwIk2k|aS_Pz2#wwOEiw?G_F_Io;kWk)d
zbL<yw>Z2n(a(IN<i8{@CnMT#6AY;N!AGYfpY)$amd=tA>q)-Y`?Rn<5uW|mo=IyQH
zz&T)*)vb$cEO%*%0;465X|K<=?(qE87r1aHMQNx^7<3L=ggYUx-sUZSYIyyu4sY)z
z4BTpi+Q=lPOc}H_+pF96>7)e2iNG^Wq~S0KB}tl+iV{Z}B@Ry1m~50O6iXD!4)v;y
ziWE(|OcbWLB?HgOP1G3-7=%8ZfkJB&*D^^`i4eC7aCCu<os?2DBTQ4$z(@NM8HU8#
zr*CM2P@#m4v@<MAP<2A8W{)Hp;7Om7OlfC|Kxc%8g=cv5V{j6IP9<5Y&@x6_28k)?
z4?@;g7O~ScEVsrWfbF#b8{1H7J;+0!IL@qS5b6wcjAtbjO`FMLLN{zP*NKS=W5nY9
zchs^VB6R|?&_^Z#j&LcODK%4b&d-<_WQ@5`ZPb`4H#oAdMWyOu5-@6n<Wpdf4Z(>a
z!Ld!M1^2!{?M7u=DFyFf)nFR|ZZShRC8|d%%uXHUp{YqGn`5ZNU~y@kzj&z(XE(W@
zXWO^3{EB~+T(1AY4LBxYI*X}9Z{rq<2&;<5B1j~iFlBL&ayHOBH*op4h5?oV$t`=L
z%s^+j<ir7E=p~uYj0iGr9aPgp!xGRp{^_BQ+a5~Wiw|LZ_0Q({=wnkHJ6xyWSxk)O
zYJNeGaQRxBGiPt7qn$ms#nz_>G#eh3lFh*bb&6$&G*w(*?Qv=D-V~Mp<d+Wd%+vds
znXc05MVvjq!LvVJ<hwu0>2&|%e|#F1DU^JV`=8E7=WmTDQ6y=G)=)0lOisMF*;?0=
zgn_!{q2J$He!qJ_lHIwd-aqes{*_HensXEiHV;2ILaAtT>`;@&&}tyd?tUFfs)$pC
zQeYVd#gav1q{!8!d*@w2oD7Krd3VnD6SmrS%Zt78<~Cng=y3el2(_}y{+TLY`O*Ql
zcYF>VsIj@}bNa1iqEK<<V1voA60N$&@uLlX?N?7QF<Qp=Q?AUlS=&ta7UPE%sO=qo
z?=?dcpbZofjm+(Ugv?D~W$w+9-M0BCB9)*sAE^~48HOC-nO(~E1{E9XHuRDJ;*5$`
z)GR1D2C87uu;I<?H@uEM1N<WxeH8xV5>sPcw%4}^)(mL5Jk|&}q8G`!*J*Fe@ajU3
z?Q1p^t1x0g(TDaGIQt#A=WJ94p-->xP_zWLA+QVs$Iu8%ql}0k%g925LC2+25E#lM
zb`(a^BlNrY{VjHO)>&J*%E~o(Uv4L!f)SU|$p(j~Cuo$*G^-xXhDWVrQ7|(^>XSwZ
z3J+PRVV4^eDpg9Ji7R51Z=qtr^s#Y%;dqf!)uU0eX_PF=1%t9D@eBjMRAy{!nxhXK
z<h9htF?y)LW;+<LwceuZG<o=`CQhNxcTO+D55C3A@hs`g6h|h;X_^C~?hf6hbXTmd
zyOQzeE4Q8qp9j7IPaT712Hm&d%<sYG%kQBsAZS(;Gh-Q&l#Nu;<=$d2evpwS5@p*+
z;bB=01yfM+45mkmOpRBlHfq>~BA%7ti4dJdG`)<iV1SvVAWcGFGl&&_lG2X_rkNjU
ziMFuqJ1eIynOgzJLu3hAtVv=?FSgLBrXWI48MbNUzI$0h*xjL5h=~S1{ce{ijA=&#
z)5!2_C|ClONib{-SD~eY)-l4=WD+`2#`2~Q=_bv}CRr@#tgo@Q+9ym8P-)aD+a<Pp
zeXei%gi%DvHqo9$=n6_eW)x7)`>z6LK}^St==%YF;Nw{iu^$s{tfN|8dU1~t?J-t@
zsj8%IMaVcqwU>#uZdSt647AQLja;6(?7g!RWtOGyO8XJn3Ko58HJe&}lwz^U^u!d^
z`V@X7xl*r_^g4X+>~U_Lm%B5r4sQTo0G?QbBV8D8Lb*7=VnC*#6T?yuF7)9=8-D1P
zKo-Et3spC-Wd%axAu!1)mKg#mjG+gcxV_e;^Z(1)9{FCnC(*wbALf`}Y_ru4@m!O7
z)urUwEG>7rd~N%#Wd8ZnoBYyZkIBgjBaH&1O%KbIT$yWgW$xbewZH!h2l(7)4sz^J
zgCIybe{qxl;eUSVjy*)bBj~voc)9a$27W@nAJc3WsFrPJrz(8v$x)ttas8gJtKnJv
z!(TauFa-bWZ@u+_KEwCY1-xH`k=pGL>h}QnzVR0eRLeF+&*JEz2IZoK=Tr!yl#P2R
zSa#YGoo+}NWq7VZwd}Bey2>lB-J1zB((o{?oc|rCiuLUQ-}}+Mi@2Ar?6CY`pUTm^
zV|MDnF*@ClR=vQFUR>n47jvNh`Na+=9vGoqusM9N$;fCCLrUhCI-I+*wYLaA%s}lY
z|C9ev56s~Lmty$tMQ-pb3{2C&H1a|GUEo7TFBlL6im(q+mSU+bqQM*kANm8>x}g@K
zV&X7H76udw4z3qbv7xBp<z)zX8pc1vvH$5X|Kuq+RfV`6vAB~E+ky$JLuugBSqfQR
zj5#qn#`1|O%B@hX*m$;2*0op}U*pH$d4r967UTkgfkWFiaBc7m6DeZSa6lSu5%l_`
z#txBEXgweum~@Rk>EJ4zoh{m%u)YW@@Aw%$0TjtQftvi@w;U$HA}lDpscA;sjLC|i
zS&`JrHl=DA!;+}DL=?xQ+QM?Hlxr1gwGt)I#7H9|G-=IZqG~Zy^e7fgOr0UJ1eqyR
znvrRV;S_0(jB?`WD4*}XMbcSiXU9W3O`ORp2kel2-8M$w<;~Nu$|jee-{kW1XZTwm
zf0Btp!u6}Kas9ru?=dKUiHHBIzr{cJ#5m)Xn6-rxFMa<KfBai7zlT+pA#@i~jaD%#
zY;#{0r7|&1hg!KpqwF9_DOj4at*8|R)gpKvm|g~HOyVbGi9%%>KS<G$z$=*;(m-dD
zOcrp9x#yK(f|;0DcbeW2QgTvij-(Syv@kJ>E`_3t>Iabeki`g{VW^bIPg%`UWReo~
zx~y!(Y-bRe8XHA1O|fKxDWT{&NCOPZBK1?UBmtEYg#nuzeUk0V3`!g5aE)u%>b!aR
z6zy7#DNo{LAv-$*-du_>Oo>;_yK1SPraoa2Sq>X(A4Ee*5~d<IwI?6F$`ZkL62XNF
ztWP#*N}r;w$gqfv9;wn?zcR<AGiP=mB~D{hn&z`=rleq-?~<Ur`<@&1APd&1n>{M^
z8jUJUPFhr29^J?xi~7t@)!@JwTzhZt_B+EH0eoQzCddu5)8Xp<lifE&uC!|RxyyGV
zcW%Ja3UQ;VA@W%@Aq@;9nHbKDC^g(`1yXXm$jDyo#fLO5&9%9{(q*(&pj@<a%aS1G
zt#kKIpx-*b!O7!IMj8cd+rY96mR5TF;693A4;*Q6<UpNr$!2YHz?qA8Kdxa&kP>+h
zk&qk7pwRi;xsVdWkeHUitz7HH<vy$bAA4{1B-eG{d4A5_Z|+%H`-&>;AVGqQD3PK>
zYO!Toa?9>^_bfd<Jrn&h6EQC{|Hiz`M9hODJmDF;r(11XZJE|$ixMSjAtaFm0T4T?
zfZF%0+%xZb&Y6b<2!I4gfKoqLtZxJ&5WvZsnK$oQzQ5)B-R&?sk|UROm>kdZwXYmx
zak;_jR{XyAgMahi9plh!neCnK2N$)w*3^e0VEW@{)n(joPr2P0rygQG`O9xEkjXlD
zp2ggOA{o!dG!5!j_<`QM%L{Fm*P6^smdIu@<Z~`ho*3qv-@bX@YfnxV$z>eURMV)3
ztZua70XzKPes_^mCr6l_DN@KgJa(kQZat*g2)S^1`@L}sH}=>$HA?<KnaS}y!%>E{
ztu~jhR(bc*z9j!Ah^UEAFj><mtw{kT1R4W`i7-qIVPTmzcTOl0h^e)DZ0`oFSxsWU
zj*+(Lv|(`r7MAZ-L0oG=&Pedh1kZ$`4}~$XH=gD-#^7HL@o&EX|KbqL08F^laEXAd
zOfj1tRjb2%w~n6-GHT>8^CfZx2j9w|x)s*VGSM!4|MdO7UkY)Lc2AJ8V~kYbsDvb_
z(``jmThOLUZuc@#Q_#z33<b?~xN%<<y=ma-TgN&B7>DCiaM<Q}5sDc_qFP*8{v5s4
z9jIT2tzQA_EdSy>lLH0Ho{P%+2*<(la%8eLhEjbwS}72QNybuSEk)J_!?4j_h8#YQ
z(U<bg`2vw9bi0B?-7yw7Oq*Q6VR}$-Fu%w3J)e4eoJ!84R8(Y)Hm%MIO3mY1cc-!<
z{^1vAd6HSq^TaLEX#?}zTXOn&`1%RH`lT{2KUQPFj9AHg==vxt&%&9vKjLXqn%ZuM
zxYtD{nnsfc5;ez?3}gh;!w$KOfe;c$MG$vUL5HLn;+Zi<>XIspBo!znNKFUR&!L5d
z<v2K|M&39R9{>O#07*naR4EJB%VD`5Ld6J~AXJFs7e4U5aeEyd6)?2GavVI{#v>t0
zByrHA7j=n}kTliA(qgTa(rQO^YattngXt)SWsC?EDu7Ta3`^j-1_BeuFd#8$#gZV=
zG#VYQZQWq=%#R5dpo2yG@h>4Jj)38l)+CmQ*>1s#$WXCN>LIMPG#M{Tq2kkvLmZ)g
zttHd)TuiesZf)IO3jm@O7XNXD<j^yOBU9KD<0N&9PT1w0s|^-c?@W|lyG0U(eYtF5
zV4CKyy+XBjAZjdP^hU7U5YuYo#s+yDu=3=+9{D_ED;c_rkAD4E-}~Dbn7O`x8aup~
zrk8y}_rYyLVBPBP)hNKcMbr#T0rEEKy`5dVeUiJS_I5{t?zdsj+0P7q67hqdZ19<9
z#yNIqkX**5-HX}S>hi{0+xH#+=7mju_vHgjjrYsOJKdP2l{!1M`!}c-at_(7jcp1%
z$D&-gH?a1HU!G)iD1&SF18}x&QZBmp_=zR-)eN-;%MxTVHZwChwre$>dZL7B8oYhB
z%BAaj%uJQYW^4w^KA(DWod4~AHaUNJhvl^nLcq*Ko@0kA%uW|+bz)Z5?``Gid)*ti
zGU^ZR8M`B?-zS=uWqjOa8`J8)-n0b5e7KgMKmCi#l!_j{Ycf4q=-V2Ieg)P0arVMC
zhvx<;7hUpMo0G?e_&0xYn16pC^~)o(Wd=$f-CoT6VvS2zAFReGfrZ5y&pkCpA?GqO
zlqHH4=ic4o7iaF2u>bh<I-h=alIe+lKU-VJv|BOfFKzEnz)u!Y`vgO$Xf2Vtf7H+d
z6apbEOvA>u?j~yeWsiEq{HDT)T9nKdNd%2LEU&@atq;&7E;b-;gE0%4ER^%$ekx0i
zgv?Bv$MZ!d?s`pMUb_uu4Kmv}nJerh?_hVI#mSX%y%L3tz&F7*6si<5HPr7~tKTnf
zuVQ4NXo-G_mnkJt6YA-mm|7==&gMrQG(Hb}4URs;^z&JUa}kl{FgY{CQ&W-wy^Rce
zbQ6~^JO#bxF5&iB)-Kg}^#}97Mcz1j5Yr!~Fk~=j*f@?&#&xj`fs_UkL6XEMl@diU
zj%i_ACZ?Am@AV^xuB~xIj4~i~94swyjUKj&kvhSpi!0k$U5{qBLJ(`x##Mr#O_1)e
zx%z$1{0f%usW*HEIK}y+2Vt~8E^9I9)JdDeto`^u-8F8AuS_}|DXh}DFwfe$N0`qr
zUNV>+yGxz$L(mPN8+`PkF2g2St3k=}$y*ww`wDrjNU^>flO!=?fx*BaxULC8B4vyg
zP%h>B*(*c$#bmUJm(P;R*^p?`UV@4RnT&^R^gWGlV|itTp^<4UuRyj`APrK2dWUwk
zLnn-g!k9FP5T=2!1+}K8+EsKD563qs2}K;*bhJT~Cd5cmm5@qBn)Y{d!*Q`phmP&C
z94LaVBEMRAfxeI30Zty7;<2eb^;Sr=)1#SaQf!_W^2qxp8p%eZi|g9tvnIVDq1pL0
zYV{o(e3vK@bh;6?8PQAb{f*WZ@=P3knt1FuRnua<y~WQ0t3OxiZ<@OsE3|t7VJe9<
zq(afpHh+8*i?ufFRrlE0*`(X*(sH*j(gtbLBQ?t;%@|8oso1TL|1QIiL1hGNr~iO%
z+R*zbS)+dSfsg{j(jfG$0&)X`e)*$D^s{NVz0<U~l~=oO2>zciN!urDpH$pfY|?Co
z6!H#@R>=Hf?SW&jTxqes*=BC0M8>z+-s!Ni{$Nj+AWVrON!GU+8Oredvy-^CO(#ew
z<!nYrbCgOhmMJg{gUW!%=RPydp}7H;R-5mcR`-Jb`s+9jBSTsK`5zqR#pikyOCFos
zZQedx<JBME;ON`{xtv2O?=m);Bb%`~I9sOH3=qnoP;?k5`b2TU{LMOl`8W5Hm4UL4
z=UZ5&f#+CM20my{a_nH9Y}Uar1(q@?7F;IA^4u#_^l<p{3!_xZ9>s!3FGx9YxWeV@
z?T32ppa0cGig_2$vl*)RU<j=Hcya#q-!F3P@F1mv$M|TDsmVN_e}0-clKj<OnYI7=
zkLEajco4@iS>0%J`d1sg{>F#*uFo$vSYB^2IGDk8Oxm58ciz4CHM@HW*KgK&=E+fV
zS(|1n;>Jq-V;O|+<DWE9`vh+;T7&9GdHWVZq8}F0CWdL^7#5Z-NR!(kU<FCa#i}Cg
zD(nPWHCXzH6Vi1FtU#p#eg%q!l;_PYl)8%C(R4=2lt}4|0qj9o2e|=_x9BYW1uK`}
z+?AN#WR6K;kaK(-r-l>G<3^V;BXA%19TSKX+EM>V`SI~QeEkLf^;bW|mp|(;noa07
zx+ve`K)Hum-C}LA!){unJTOGb$RM}3n9mQ9S)S+bt^*rQmU=NKq(q>wP*?~|!@+WW
zOxr@sh;FA%6en1g!n9p785_&IE%6eg5=9uNU>anMHb!@apj9W<HY(X8Xf&zqox+}b
zmdun*eQTZh3*VqxOWE6jU)*DF@G^}3F4pfp$Jb9C=Gb_ag0V%s{T9m?-rzf@VJo^r
z)O|E&Qe?4um>bO;2L@Bd9E;LJdm9@FL!mz+0n}K($m-S?aNH~f-@>*a<A4^L)HGPE
zri504n-@4vijpxwFDAhxn>Vp^N}5O%X5Vv6#h6immQ8eACGBoNyg*jnYcH_U@;ISA
z%C66VB_Y)`wN2a15n76FPZI>-XB-43iIhms!7Dgqgu;=MSb&z2z0^j!0uzNTKshG1
z1;UgR9S7fck%mE%pMj^R0T*18S`@Oi*`paKwo;$2a5-3j10_Yqim5ddHW~`yK~YA;
zv7(jO{nryc`lIccc(#Q$Y_#w(-7=Y?3*0tBKg{$0)tC6g-~WA196p9pf{XJ@tosgc
zZrAQ;$wY11y^wYg5hjqTl-q(u9~UXG*S5)4704DUSfSo%Gga3ZPLb_K#P-rED{GfO
z#?>cab_#|DA)5mwz_g*;fnEmqaA$T$D-5Cf!XUTEiVy|}3n5HIU!b3RA9j6PT=%_l
z^MCq#P~Sc7gSBV-#O=2ot7{F`w%X+L4%NMYb03lESXiua;z$Kq^jTVIaqar<1II3}
zHCf$g;d?gOjKh<U4Kq7kq|-|Xf|RZ84%NLbrGiUkz-PFU<>ZMWOcSo%yh9jQH(E4W
z5d$TU;Yx;=UznlU3RzrjaQRl&=iMu9Uj4};wrz0i$RLHRL#gOe$a_d7k+LtY(Q1WU
zy0*s;f4cPE^Zml72Knr>lN>xyrjWI9oPK8S<ndwtr+<5bpZ#);OV?Wb@mCM<nWx8@
z7|Zqda|0$ub3Fgd1VNbccRyIZf5Z0s@X`yTJa%+|BL^$YO_v$0WH3#^7e7D4*jSGF
zg*w0d)h3PL!JF*PcFZf^n<tyKdFt^IlvLRE{nzTh{`OT|*W%Mpk1<g4c<ksPzH4%5
zZh-CGHid%Ek%MK*C6A4*Ca2%p;6Hx*`bU0`pTD`o^Pk$|;DIuZ-S0d5{!c#GXtKCc
zXLGAVE@QJ(?Q#Cn&i=&vZ6Ip5D@{IF`YZM~koRTO&=R2}hQ8Bh0k=wcECbs#Nt4?L
zE(4r?PyN-ViGGA$&g(HuHDPopOQ9ecbJj^3XV|;E!;Qpew$#N<wg?(K$an{lUZJz|
zCYMjc5C1RtQ?5ZS!`Hvwz>G7f{3dRAmYww$JDVS_JNRfN;1&A%a9N-Uybjn<PI&Qf
z#0$qGzHr=ON=VwnHTF7f@@ADVdYhe{9h5#ru@W+s+k@^3fp?mb_bTiHR)T;a2$4}l
zn#Rb)#V`$g*CCg6urP3RM6;(r2proXn{luWjYcA*CQKrvY@t<*DOc!iy~)zGCE9wJ
zd`_~yzQwwIkk5a9h%bIxQ+;QUjpaXNGxivnQvAD#UC#Z(kNTZ-Gf#5lD>HokQ)ON{
zHOj#Q4sK$we9@$LWtaG#bAJuf3Mo{|%*_mNGH7A7S7}_nj(X^|Q$6(Waecdso!3-~
zHjZv#r+e78Pp#!}y(<u|W-d`k6(iG_FiJ>Oif7;Psj;mPlRb2&N2}VV({9q})~VN5
zSzP$V2UH1*PKs|PWJG{SQ(SG5@d}g+329ejyICwRgPZa2JRjc;`yM==CJsW9G{sN~
z7fnV89IY{wc#p88!a|vnjOQ|#^BBr_sJwxhH&~D+^(bV$*<`&Ig6lI>aGB0z8T7!6
z+jJUr8eNxE<S}JJx4ny2Cfaf#cLF+RAAKE=35HhqwoR#6W^{NAza)76WtU&PKElLH
zv;5&p$NAdJhd4BoMFZ30v&6l1-dvu9ty91`0JdulHg|StOGT@>%dZ<A0ciFtYHetT
z2^-5R?Cfbasy>Ecvs0^aY5pRtJ*=Cb4Y|Wm8H8eiN-;|%<71kFAdK0x3?kP9{0}8+
z0)5N3$>^_{hJhiBTN)!NT3V18@7rqhZ*idTHd))pCkf}T)wpzh7uPk}*lP2OU+#YB
z_%rYB@Z{qo1Yydh>s4;7K3KW=?_Rw@A!nn}OpO=u923hl34(x2*Q%VmxW#ZKgKb+_
zmPr()tZlS8cWH<3yn3f(|Mj0QF*RPqbxg_y52+N@TEK-XRsQOg8}E(#n{O`?#gfnM
z^*DBDkl`U8-?LF#)9J))Y<IYLd6(BuukzDh^$F>z6J@^s`$u`~@Bl-D*}kAs)Mr}<
z50oet`T`sai*>&6xoIZG3gj~mQPh`d%Vzro)N?I7&*VRS>*j~vzu$Rjj4yxg04I+R
zQ!Kb-GY(2=GQPv9$3{7Lpv?Sija=5|o3}EG55h0cRv8;xK_I9M_$0~w=kL|)ZNBlX
zi_{wdPn;NGY&gs0c!ANO9C4Zwgel!#!j<b)E?uee$`5Z4hYz=|UAkK3i4!BJRC4D0
z)(5=Y0OqgPxN^OUWtl9mH#z;wjs1!D+d$Ne`!-hYOZMOI(2P<j-9J2Q1k$*5q%;f+
zVPTuMTQqJ(evN+C%{EP9VepZuk$Wa33=9--G8S2<h1t4F_52OaFL&7R*Km`I1ob*W
z58@u|tiVsd2j9MZfzDZ8`Nmn2-z%~^)WnHla}~~=|4rSG{|20w;OpZ&Hx=S1OI*8F
zVC&Vthx*S^%_3quK(38Iv4hxKCfV3#FTB9s{Qt+b)39iN72Q3IQLdr(e!$v1tliza
z6{d805kU|V1rdScV|p6fNc!cRBuEP)6D$*4+aTkZn1&=xQlx63qYZR(ji^^84X&_p
z_0Rd~tFWny96oW7y^SU}qdC58E>f~gjDp9}6E84+*rsA^LoFuSfH%*N!^u2POvDV^
zHyOlZ+Mghk*(UXO@pbKeg69|LR_E#MO_R+zxO$7~=DXZ{XM>wRe3Sse!wuW+q#RKK
z+cmLB*jc<rqdmlqGt0J-;e_ddGDyOdC{9V@1awT)>>|?;MS_-XqTVXK&P7_ab=t`b
zWQqfrDq!P2Jxyt_K@!vmL_{1J2$iRtwIMNRN8tJ<nXE-V?~>1Z6dEqBsX(UmB1w=K
zILbt5Fm-}ROq4beriWphc-aDZ9rmNHuE9XYM0hR<7TH)(i%qU6Mbx$M^FCu4o3X5*
zU?qgD4mVb+1esx`$1EJ(rdwN}mzK!pGmIXaVCS8)s7F07$1$WSLThZxq>yvSIXO-O
zW+~6XsR~ENZ4M4~@F@atcqHcNq{AN_pXBd0o`FkiK$SBKH!&;-RLYIz`QON_?8XV*
z7`lncjhe&8$_iUmhjt@kxw&*7!Z6b(WORY`yExi0m>y-QJjg)Sr{LOs4<Vt6lNd`S
zXrWlP4e&D%JU9|%NDackv}{b*M_4YT3Pbm>WQ;J(TaWoCmAvc+Lq7><wIr{fUZuJh
z&}fDqnGibjZjFNnR;iRce)QAj4;@?GP56s%US_u*GCf|vcP)}sv9{IX=WncXZK)qf
z>2wojri(;T%C&_WuYCVraguXa+EjjcgN>~=rLs>Hq}*Jo^Zg%x@csY(`zzdBs`Kfm
z#~2&Q<M|dSO}mq@yx!yoKUiX~duL8xyWU{_My+oN<C*=+q+10@hR_6oWO=p8@_Liu
zD;d@|I(<8&TP4tj(N}`q-085k@zFu8&FwBXmmBXHTx)&Dk5LGasbY1b&DKump?<$_
zeQ${%OqiM|aPC7gRTr<cxp?Iq|NIXQFgsPETyo#*t?LB|+tq-p*Y^0yueKiP`T5>!
zYm5$OiDJoj{^7=b$1JXg{OD)PZ0>Z~+38Yk?o0CjRuHw@!M%IUL?3nI_#|ZC`lXLb
zffV{ZDSnfF!>eHk?(~;R`g!@3oMGab231eoztR2y*aFV3XQAjb<)!#ylc3q4y0FOQ
za0it@w+6cluvUY&9>6WX_q`?_{oL33Z|q*20KUTE|K*GPv(F9j_;3xg?y@j=g>SFJ
z*-LM7`p+C@qZ-co5L0D{yD57$iEQ^+I|JYP0i5HzyfESM^zo2n4=$d)TQuAP$0SjT
zFp7wh7%%PH9q1?`QIKj$6vQZLqm_$L5>rSVL!)&-ue(Ki=MvQ$KVxtGJl*;NSFgjL
zzX_0MS+<C7-e9%y3TF>)Gt`=<VwD&jE;HjMSiK(W)wRCw6Wbhddsw|))-GS>oz4bX
zJ;;c^O?&I7sCfQ;y?@vF$8TTZ@W2e)a|0;frWPDw*Z&*~vp<2w=r{Uw%0$r)Bub>@
z{FqQ|u(0RR8n^lMNS@I=xV9or6rGMHjuVWuN;kMpvv!I4wqSQ@n$t^V;6-@a<X@f4
za&#&|^mdpp!{YnS;;lBU*E;kf8w>~2jd4W`G9-#aWZFUK2;a()b4(nOkOT=*C{hVH
z{espsjgS}!ZDR@($F*^7m%&m2OB<-Phm}Mi9fT>!x+aMMj%8rsvF907Tmw%9n6igV
z6I$&CYk{JWg|eTLQ$2Q~Rhoe&KawLe;Gsuh`%wdq!axZ@CyHrxTJ(Aia*k#&8*_BT
zqEax>L6z3}MKZHBFl^##gOVBW^q~Pd!7M-Aej2K;!ou6UwRR3fde_>JxwU?Lyyqj1
z1<J57eGiJ$1f8o~T)y^!`CEDJBr}yET+1a$H7m_FwWU?q*n|NGMhBTJml?`s$XeiP
z1v()N610plP}m0K9cVk&hpufxgJlZ*jEA4gB5aQ!mLzEc3bfQ9)kn}6aVG%wTeZ*Z
zleA9~-Z@|Ao%8jF9{<;WfAgWo?(Iqb{a=50z~?W&`OyKP*WTFVwKp~&>OC)BYjg41
z!&L$VspkLw4_6*)>}x;Y`nB)%#j7nYUj5DXXZ_=k)*t#L^|#+!`i(z7fBubYA35gd
zZ|(B)w|4g@+iw+7yR}j5Zx;`-p=yZ|8jV5=jZgydo;~Y(1&=5skbsOa6B~iTH}s?M
zGyoQsZE`a%g^|8tZrELB{pJog&%q5I-m5J9SR`!@INoP_+yt)O`+r}X;*VY&=AXUj
zay*kI+DIAP-eh9{`UPbtId}PS3fT&)qb|0e#mRa2`4@@gi#Ux-@RrSKcZ@A9A+y3w
zz6;!5V7g!=I4G2qq)ALFBV;V;CJBK`kUAxb1+n(YXp_Km$haw3nyA;J)7YcBzQp`H
z|CzVH3)?%eJ@h0zHVS1yx4X%517MxMeYHd0_IPeiGFZNj%?7Q#Uvc5eJR7@UAldF&
z>@+m(<|d6=9kUlPWM5@#=`9v6-AABhy~2g`Fxi1=X67=S%GOBMcL`P><1ZKA`HeoE
zhVRf((1{WT-H@S-&$#b0K43FGAjlaVv{J;{N7;EaK0&P5jUHpoI7K`&!pNy9{@Yxc
zf}b#)-D1){kKgza%QxPnz3_m|H&A4J3quH^UK^PzT0uf9g=VuyuN|OE8X;qPy*Bkk
zVY?275M)e=RGL75Hf?MNv<fhEfM;729O#*fPCFzvP2!A;DLfLDBGZ&4mDnbXWo&Gf
zQtO87G!l#?q}qyTVN;MXD(YbfiEC64W(F$>(cK2}<A`DDzA9QLj;J<v+1fVA_gtFo
z2KCUybdIsUTjrf}i%c$_!#84DaS2xqa(Gk_b!;}D^ttrf?a6sN;^{DP^jY%dLBd2)
zt?$vPZbEB^kLv%rCpM!E9NWP0vP_S`%KFB=E5)(T^U^a<@z|l`3>8b52s%N?dac3R
z6`yNG3(|;;<6#3yoDhT(g~AjDDHg)Eu`GdYhS=SYmL*96(~NN)LC!V6F%f7wLJ&qV
zX}9$d#Pl{v+b_xA$3FJ4k9~ZCh?-Kri7oGwuxUz=AXL909>7Fka9f_ce~`FSG@3w~
zA`_5CU&ZXvVY8?*9HdCz*2G4ZYU?%;dOseg-!CTVkGS${eAg4ezl0Z`;^pIzHI~>|
zzQWmmyaN0b2pJsOV79QzwBu7TZqSR~#%=y1auwizfaiXnm%sW9&pkcF(3pYm8<etw
zLRQji9^lF6XLx(Tguz3M4QfRDGOI5NUjNqr!#mdj&cXUDyTc{M2MeT9p=C-KB*bY*
z8b!oPBc(!$kVr`^B2?tyI0k9ZrPGRNwqllV!Z&YMD#$#~9mp`?$24~|?-g`x53&)J
zX-0Kw3m53@`~&q}xOx+c6L3_Hu~3{wl}C`t3Tw?B-Z^&zv;7W>7vS{$f@i<e<FlU*
z`10c^hsHv@c$4*ov%FpZI3(=|{a(QPQ*@PRY#|6ji@Ge3=NZc5c`73rO8JQD=2dR)
zG$~I%$K;_S6pJNPstKJUX12)KP@V%r87dA~QI+0qkF^Um&Ygdgw|)p0A9M&$9Zb^#
zq38rL9chp{F6AU7Y;|e1di27SUZQ9#h)fgPcknPFO-N(}ro^=sNg`?XdIWKT;r7Xa
zFciXuBne4^E>b$wx|-cc(~*7URZl?@E0!aNKsq2jurpwWbUP6{J0U$cN830?*SAT7
zCSkq91C*{m9El`|QamG~+1g`sD`96RVfE(QEbGI3X5awhvCGBfgsatS4DcPM4t#-;
znWrhZ8KPp1Ck9$vdf#P_A34tBj~}8kIzf=a_U<+t>shM1Id-c%Bw-KI6jaQIl?cix
zLC7u{E6@0V%gWRUthNAy+2=pcr=EO<CypIsdTb2e^+=+ac3a^K*vTbaBY?dgy>7~4
zUSZ^O9L#tOW<0Xl43&(BX$xW$jaG|Z7*lh+kGyShvxUxYlNvF$Dj*UI9ma&sCJ&cA
zRJX!lzYQ5R^*#dnN!myEv5$T1V;_%1)b!m!%6-+~k07I(RBI%+l=uw#zFfD+nlQv&
z+pYrDmpeDnSe6Zje6%(U-$r>hhUejBZA8z<&E0R{7l5zBS5I;DnV949B(00z;76~#
z`!T=kDfrUk{JXC|&P&G)D&_!NYbAd5^g({O@H98iU8B15Q|i~NY&jM}T%|hy|8nsR
zytxF3Y5w?&qdfoIFfTr9F*evQ5jBy334?-C5|hEl9Cn$V&=^gFg)l@O=N3@|uFvz6
z(P1V=hnUbBRKH|SNr<IIqEz48E(uASDKhTSc3n)<!VsV$lThdA-F?r86gjGxy*5en
zF5j~!Jj&xaGL@9I`XKMj{~ms+#EH)c^6@)FAy9ESIO<WdB{vs#S=zYB-gS8ULFIFc
z=h$0(lC4sf0pVk{*0}oC3Rhlv)ZgRlOg;Mo)02aE!8NSfJJi<}d2{owI(64&q~uY_
z`=l{+d>_{pWL*POw&>KZu~)my;lne0YH)*z!94^TWmmBC6-t9c6mxO^&|JUHMsSw)
z<{Ml%1Ft-=iXw~U4`SFkv}}>61jBNum<CZ~5^EcYgJIY>PKIKkNLDBK4j>g$o1iVE
z36TRTu?Q3-S|Cgt$L&iqOWiLsG_}Ob`t%~3UgF@n1{upjCX#mQ;Ce9TT9kc(kX`on
zwpiQku-p}7MV8Ql0F4!P==Jo+?1(anrKT69blNdBQ_<^&ytM?-LJAYZ&Cp3Kwwq&2
z2L)y)*BJJvkye>jK4vWc!Jtja*NhbfV}lk+qVN-eXe*4K#F7rF^oSElyWJ(~Jy;B+
zT~oBGJ6OUXgUj&&gPpWYC1>)?tjDPXKC{CPrEG%GAzjs_7i<&lt<YJ&0#|MT15hf%
z%n;9x4Kg)YU?A_2%Q!f;g+>!bG25<7&<$92vmbfa>Jg|L+Z3E_GGk?=H%&`=^ewdK
zA7KsN$3FJ4kA3Xp6GYVd`=7X519=}0JSRw$)~H)b{pvP-yY0w$%eeKP+iUq)jz(B1
zN``bF#lR?&GHe8RqJu3uC?mnXuP^RN`07)9<xigEkB)^*q?-2B8qdgg`QN|ualWX_
zu^EHoM+8qlW-)5HY?n&7j?3U+p3CK3PM`TRPQL>B3Jj*Oehps#5&cZTp(+)BnXKXA
zrGq#!fn*EWX@TitL|2d-ucOvRF;yMgQrO)KSdDL@?nxG1gyoZLABl;RzT{2cAkzd>
z+%g?b5h@^#V-jf)#1@Wa;5asp$YJ<{<cE&{x7eQ<(y9k+RoA(E{jN7N+PGGaOg_)#
z%n4jCq2OuCW}TpVoTaS>U0ow56;8NG+TLYtJ7)gFdYl$4{`A!X=2QhSlE+gC=PO@j
z_jfko2S0o0Ut{=SmOpxFlqVmbBJC!u&bPU~I!9W6o@?{3&|Pa|5Hg$-j1Rbkp`y`J
zbb2v%H^J2@aS-7oyJT8#Vr<SMo13Ka5~(qPm3<6*=vmzI42Fu>S$m7c#aFp`ZGo-c
zi`YkxlN2><T!6J--9yxhr3{{L(`{*DDX|SOmB7Hm@iSyH9+|99p^&4J^J%ssh+?z^
z({yo718v)whJoqyo4y^}!1qmZp^a+^QmLtSB9cT<F=DcwM>gw|@l9;YB$AK|B3fa9
zZ-nISh$O7hiB?ErgU#F!CDX(d3ZXP<zl!<e!LiVeL8Ju=2VoX4-7K&Ob{S)2wEzGh
z07*naR0-F1@UuCJei>gpLAeW=Vw0?sMOz*Pzf3MS%KP06JN0FHts&x;CW#Z0<~DI_
znIzaoNDId<B7{j~et7<=qhWn%hbU-c`#H=6if)gLrO4=QoNxuzfOgj*ibCp*8f$Co
zT)1?BU;Jzdcnszaa_F(coSdFyd}xSL-XrS?98+PCpk+cBglMU#<#RZ$NBj`Ct_d__
z7zz!>rly#i9^vY2ikzQ;-P3$@iRW+Q2Bq(clI~+4``E`m_HjR=#y&}VxIHyRsJ`sG
zq3`PMGYo`fVOkEBh`Hl`YlG$EW-WZBuyv0#>=8ZeAu(uRwzo-YP1<pbpjD@PUxi)|
zjyinin9XMo`HUH}g#JkeYvWw{&IaFm&o1x%3P8pFYZ(J(VSE?{BqS1{=Fx2*+BSx>
zhZ}VnuwCW`Z0sq6=2iIa_xpcL?igYNF#l()UTkpPJb+yrVxp2lv`c-b2fBsT`%6|Y
z!0ETZKLQ(b0z1-NzXad^@%ujFaze8wNmGr|5)gfh1T==QFbo&V>HnX!G8ldi$1<@k
zfoX!DFEKPe%K@&l1kiwHc9@1+f{{JgzD3}!Ez){=962$^=)f=&Ww4T6f}K4Yi6SvP
z%)M=@W|wHy=iTk2#O^@`PNwYI87fZ9&M*J|eINdDKKq%+`Rvm}oSX#JC=zu>Xj~iM
ztsgx6V^_{xVYD>Kq0xXO+@@Dg8DIi;Tu?FR_`%wF)ZRKCCn)(QsbSJ-#cX#2_F_TF
zh)7a_sKWA@*NGQF$57pcc6yb;nX4Q=evxAbpQGR!tgl~Ud3AxU`lrbreSxoz%;7o_
zYYQ#jxSObXU2?u8<3ZRHq<GkPL{gC$f&tsWwFS0gk;}MvmS8Q6Nu<Kj8rP2c%BZQt
zOeB_)kc2>lWu~~6z%Wb{4vFE@lY#-mV6x&;$a!E$dQm_p3=wu4JFbxi+l0GIG&X<9
z$|a!k1*puC2m@beECUiWvFIO-4emU@4>c`CieW19j>o`2fuW%xq>>zLJ;sf;i)C2k
zGCqUDWn|vKX(@!aLn1+Gk5m~bvk1i@Xx<@e7gm~-Dhsr`b&@z_V|$Us8v)w^cn%cG
z21;t;_@fod)|;^249MC6wgEDRC=W~dv$%1MdLfTeF^$G`HrC+MnOhyG124mgBYffL
z98VlN$n4}ag?t%d2$DD?Nm`I}Fw!m-ikxrZIR^0~mUT}ZdV)j8kB}*ha5UDuJ2b$;
z&r{fY{b7E9f8wNVUzUF#``E`m_VLI>?ZY<2`$hjgsYFfo70R^ccF%;s0AV6b8^f|O
zZ4mLTJEbADZ7eTC){vOGL)z=H`>=LNy)D{14mCf674-<)G4=Z@k}PttyG*t{hh+|v
zFON}44-g*t15W<&4ZipG2n=<}HZRk?al2e@1{eZ!8s-i%cX*n~*#f0vOwhQ&-u9bZ
zKYf{*hQ*$1(r8bzDaVP;2%;Y1J;L}|q&N)E`LK5#7G47qzW+D>k+tvsF3-IDEK}1%
z__<jU!@(AHdTW2k>HqL;UI#emLg58YOvPNj^u~P;Hc6sLl>({IsX$4EN)(t9%k(g8
z4;O{9d~%+T@ASn#1Omge7#PTL@CYnj2mApFqr)7qL%J1*)r??u@frl{RM$3X%?ywm
z6l61kG-$AL^E7Y2bAxvmCh(s-gy9Tel|IFEF(9i$OhaS&CZ_IiL!aRMukJDvekS0V
zLp4t2E;H5IVsB}U^3qkDmDe8WvAcHREN_fR!s-+QUWdgs4dnsGGd5D+DucUOCrT8i
zVdJ?m4k<DUXvBilh=}Vww%>*3yD)MR(gfD8!Vd6+1npeI<r)J%Y;3^%(j-gqVZ=n4
z$uWhmx<t<VNJ7}{EBBcuZZ=OTwr~uq-$NKnVi^$22!X`51eRl>Oovn_=s1NWA=W9~
zUXP^F!BZM?31JWu_fljmNfHgh!n0fq6pk$!%!d@SJvzNA_0}4V-F2eY9zJVyt9vY+
zg&ViiPN@Ngfd{xc#gHk6&?J`mp1t%V(Tu2z4hv*69)-NmK-ou17#<nmhHqk82Cf;C
zb7QoY$Ux8z1Z%qql9-KZk7}a}&G+ZUN-TCqX;pKy>$}`sxHHki7{YoJp(Q$b_>bDX
zYizp(@fp~>xs01Yr+II|;q=LudFI*Y7@Iu6^nrsMK6seP@o{n)moR|sy(T-mn}nSR
zq{a{uL!>BDXm%d{LuHO|<j@fg&Wuthl!+3J;~Lzo@1lPCP>b+C<qd@W%-KHnv5$T1
z;}MD4hc%}4k1~BzY{l)d`jg7nZkb*yd8<dQUyFwjCZ@13OdDa|?Mx>~4GU}++wn1^
zPm}?-{jlQO5u1&esi7QY-$Sbc!ccrrOyWn}c>567k4&+8z+%?#A#8`@#8W)`xf1{D
z6r{3=ti@c*4D;GNkkR0knVy~D*oj#ln;T?o*u!@_bO75xB)@hwSKEKfneRaBO(^A_
zBghV7&1pslHO*$0)y5&<Bz*oEUV3(dV?$uqvt0T4YrJ+E;1rj7e?VTp!1&Av<vE8;
z-o^Jd-M#178$8bI|K}F)JpAh!ilZIAwEJ0Z{Nn#$=}deNQIiUkN>NIqwSDXUDzr{f
zI>j;!EL)&WFb$0%02QND|1Nt@j!fy+<(z<u-ldqvC>@fqZ=Yt{++1m~G`U8ny2)Ts
zkj8Z`F5KXo7Xa3w<?_1&gFHTGQ4}q@^(Kv02c2{YJA1gv`y`Feyv^#F!~8NG;F1tj
zYc4zW!z^^Z0{rJkdi1{c!*{v#vv)aobefL+DV}&S19n6^z0LX?q%y%Y6_z20B<#i}
zUCYEs44Umcw}pj|u0wGYqC+LZq`{f<u)7Eg6Hv@TwR@OF=LMRTaV8^;S?l7;4)w+d
zOVh&6F4ka{f(x-3qxz<31eT%`_ULxogxwA@i7^4ohCqVG#L$qW&`$bO%P~P<lBPCc
zXwd6PqA*6M2^JcIh@`zlZF!lkpvlVaHW#;6@i2K}qRipq9?dRP@19&a4;&kXCJ1}j
zGR8sSIt~{7dHASRkUEygM3E#3K@=giMIsbV#s(FU^jbtMfePAmb~o9rt+TFs1S#Cy
zY;xh^4d7m1qTIoQOwJu8o2?L8>u@s!b^XqOSpM1+Wmm#(^@IPOEe!JIPe0C~BhyUG
z9pv!Q;~bisVkmQq>jI0}0&!4hyAhH`Ez+n%ngqx=hQ0US!2*2~>?VE9S%5j1ILseB
ze~6j6IVyuAIIf2sB@E^g4(5I4KN*|I{;6Xh``E`m_VFl04IWNK#JGp7eKLuf1|^Yb
zq}J%Zga`tG76yiCVOkc#i2F@!T7uRn1GH^pTMmwG;+XOw%O5?+WXTq@3=SyF93(-?
z{LL2kwz}=XnKyWKc8p_(U``oK*j=RMao|9ao)OWhcj%HQnJ&SoNh&%dU4>cE%noVh
zhGK>aT^zZ_UV0Y00q@MiJM*6fo`f%q@HMl*kP|`X5S624>c@up$`iAkI#OgT--TU4
zZU<gFT?W3&ssH|I{?+fD<i%$_rbfUp!Er#vM|om=omu}TZ|hl(eR`H-Lp6-e1+L-p
zjWaQKj;Jwlnv$d-wLn-7hGk=$5mJWeG(;LE2pa>9*8Kymk_j?Q&@m{Zh?^M(cA!(I
zv%N<r=+Fo)_L|LG?~`HE$<rWDr_pAs*1~lR%#pA0Cttk8xt}bukOXAR9u?OjFAUsV
z4wONo-XW|lvUl_S0{tQ1`au?5d5S|%j4*c+j_MWM@)<ho@RLUr=3I`(SibUUp7_#n
zhDup-)*edVw%NW(l!PQ{f@6W@WXSr0jO8$BS>&dlWj#0wIh*XLODXR#VAxpAF7M`A
z>|AQ|_D%}q;i*9wEi>y`v?9$$EyPL_HrgL7+uGY%VsfO2ZF$6TLSk4*B~hs)kS5)(
zrq`1wl_I4?q+n|k!&aEKz=#!YVv@KvsfsZS17TVyQy^7J6ozy<A)U0JC2VR%(017E
zOi~w5^2C#6o}M!~SgN9T-r#EO^u5Jp24I?WO_P??6r&i+&=|J$Yb*pFp>k-)(1--e
zvgl}&xYwZFtg~0!!y+bWH`!iZXLos?ptDZ96EeTr<m}?w2d+0gP-1p;km1S*1zXdt
zS6RK5fSvRMGjZ#`*s}JSrze>jFEBDx;P6C+<1>SlGWTv0137^s0+L>hpi?J`BZ43x
zN@6HwpfL%I!qG7(m%(;HN|1_*?{d77XL_v6?Boa&ljG#e6%+=YRvWL8;3#{4H{MtC
z+Q&Zjv5$S+pQ!C`AP)x#vM(soCvBii`c%ynn1+dIo0uj@rEZN;qzDk!ErQV}Y7ZC2
z&r&F57^?V8k0^W{Vr$9P2E4iQ{;@x0<(mb5KHX)kRpQuigsVG<B&2L<Od}>vLtHn@
zOwqxzY`V1#YLOzTYvM+MAljqXeuK4Z=ehXp7lD5P|Kkx}n$B>zs2R*F%5ImO)#GVx
z^OTw8;G|+UzemyBBuFpeB>*$<dl|m?Si-TnI>)94$a`I&0f__I9;E{k_4p>%#ymrI
z%AD9ma*Z9@+$(Gu6GbU;s!>8<*hXJ)!b*w5l&BXFNgLs2F)SA?1PXytCXqBy(nC2V
zGWnrCQCn?tUgqg;B>m^w&(Ifjh`_b6OT!Fihq0p$p3uxpDCiWi!kC3iSE#KS)G}qr
zkCMw}7<V<E)b!#t>K_o}8)ojQL4N0R6`nj~F<?~*8yj@&HL@RzCp^#CbD!h*p$s{9
z1KGGq^xpYhvDc1i2a-&|V7TmYG|~jpr0o0TMzVbRiGI&l6l<bX6G{l&9*69J=9HwW
z4YY7LG2k$q(I8X8I3<=4rUn5YJWOvcZE$G%D6Vf37y@A%$N*Goknvp%(;-zB5=o*B
z3~iAU8g0fXost>?&vY?-pR|{fN=YgcluVIY(u)&zVof9+=1MtE9v|n_slyD6Op^7B
z6kJ8#+#=pN$F;6a(1CmOUAhvK>Wf_{O_-$kjvzH{^zGQwBQBZQLIJN(Kxgx4FNZcw
zFb%lA$oj+(tHXn&-7;ab&C-o+E}y%}xtkXsd`WwNTsB8B>ru|x1O<=jks*YZbb}Uq
zjpV;5Q7d{0IZu=K9R~6~rThnf=QQaMws+_?cL=&|LaFG*F-jPCbAyDs!c!B2Ojiae
zX7b>8Xw$$n9rD=><#LhXN{Nx7GJ}H^oJ^h|mTYb9;_fyHrMJJm>|-DM*vCHhaet!r
zAQIN^!_v2E9fjbNTlRSSekg^IcS%0J$7KzK0j4kzw;R-C3R0m`10_66GlOGiv8|Yg
zl1alL<7obW_TIGDuItS6`>kP5XFlhSoF|bKDT$J;!IEXUU3NLHA%#kz8%d{8NPq-L
z=Usn;ARizI5FoDtB<QYm8(k=Op{ndE4`o{_51J*Cl1On7r^`DJXFg|-YpuLEml8=+
zvLuv)q<nrLad9v9bk<pW?fqZtdHzqWY-v>ub)AsMUG_AAr3Y>QJ^t!{{V|n)b%yps
z4fa=O&|;3vX@u>O<sZ-=HPNa;Ne!^>72=!l&dwpy{sQ|-=jbnIy#9T7n{UCt`2+sv
zKRM3R`wX>og+coU?VW_)xC5mPus)^nCi(gfo%8}5*M7$3HvrDj$WEe0mcjB0Yvl^6
z)?vK8Mt`_KW5!3v=Meq>o%mf?-uOLqbBEF98=U_++*@TVr(fjcra-s?L5?RRLgpBg
zQ6xj+B0!3eD4YmlrS-)0B`a`Vgeuo*G-hc5Z8ApX8XSqh1T5AiaYxZxUV_m8gW}*~
zlcwK976$DMX<M+caFp=n7x~#=zKH()KjPHsr#TVDRJ<Khdkr_bPWxBBj}?yAmpJMv
z_HK0<e6YopTZVVu9q`7xpSACOg#%xDg0DYwh(oiRB)tz<y7WD+ocm~tjebIBP|%D#
zDxqa28qtXrRlmkUD`2*+uvt#KXV@AzGHWPl%VJ4zs1;HQLWBcPSiq8)0w)}W?_r!z
z;Fo^osxmuEUic{M5vUyLIkG&U98?J-jqd}V1Ok*F5&ALG6y(m5WCm#!f!3frGU=0B
z!8j?1(}FCw#0A8jPb>1-H&fz~<Fh>f<U9wDED-u7$a`elJ+3U>pwqs|P7gkc?mG$d
zdqH|&GpeqKE4swGMeaQE&*ST$G;_6pYAvJ`d1wtqQJ}LN=y3MzMQUNhU~Z0dm~icb
z+nl?8`4bPhuvlZZ8sU3j^D)9E)FR1zEo9pc>DnCg8ywY4nxbq@<Vif~AWOin+%s9y
zUcbfG>J7S`4tZ8kC<zv7rHJPaEl>)578jb#)mxOK3Vu{ZmC8h=GSy0zMx#!vS!bqE
zrd}x{w4&2b$l{nvrNaE4eO%*DftP{nzlG11=|t$1DO09Qd7w~ppYY%i2yv%inB5g=
zzs(Pn$x2#b?MIgUyP=P}f4FyBn?q*EjKGKx?N{)_8h)ws>z$|ph{^LYw$MnIqGcCf
zr-Z>L?UV5Dzx_IAXW+}vJ<W-SB+Zrv))|^htgJ%5Rc4_vBI&^O%dmvx%~8lxb1#r>
zF7plz`0@<@-IG=R=n26W>l(6x)yqq~yL_Il)z{d(@g7NXltH=7rntqpdz<U;!FP5O
zO}an*bADk5WSbjoUx;XgDe1rvr-u2tAwl+YF8vJt?T_FZKj7Kg0c;;$|JBz>I?j@2
zIYpk}GE0$zGdX#lkrxF;E_X}R`A8Mwg&sm%tj)=UkBllbTeBS72kn&-VNG*X2S{CI
zt^rAH$SccBFm|N5#UrPrbC42aA(4Wx74pRs@bVS->36@25E(%)M`p|1_}~h!KhOx_
zGC%(A6;8}9aJJDT%l0x<iqY&QwNpQ3>r;n5F4B175ngzDfhSL_6LimW{pL$tc^mGk
z1jqI;VW*!`FBufujM^6&jpwMTfOufJ)y)~imb6fyG)hY9rHI06q*63XnowKfv>-JG
zm*n^es(y&^B4ov59qtLct=9s49pFnJk@qoVc)COocqlW;=|l^((o{-{YGBBcoFsGP
zScI17!janyCj}}9L1-Kbp)^Wq<^oAQ)C9gE>#oqb)**~9p}h)4ny|fggZIu~;r*Ls
zZpF_saWZYem-ch`;2!WjBC|uOXtUE^q2pDEoyMsOnBiv{0hCM$RZd8OO%sMgpDY)Q
z$CG?s+r7;zuZ}r9zeti>ZeHI6?sfnXfVcZI1$-8&0j<bVaznD=m{E6=bg)4lx5-Ca
zm|^=jI;tf_16v4`i^=02gPjek%@_g&Y0UD{8dok{VtM%%{eFzl3MC*4G<#?3*j9s5
zX|ifouQjPOnpCO{%C#ERdX+}GM57u}E%}r}iLaqBP~@6&Ib?oehUdR@hWg?mesJ|U
z_{)n-ayZwgPv|LArc9ag+bz_@uC{paO4%Kks;Nl(s7V}FI1H0THJ^$1<D{h|eCQ<y
zFovvPU?Gzs(kl^`E0oGmYIAQP<_9unr_-a?N$E7k$Y6`n0P;_<8h2p_E`09|{>2{_
zJbY9Wi3@DC;p)4v#E1Y$c@!2;!qNRad9cCWh9*3=N_FuDzZ6#~ch4ht5-26mJBM5O
zDI4eh9dG>%{_0g2a+Z^OPtpuF8Qy^VgS%dNX@O?_47$3Xn%0=mk?R^GoluPS^X71l
zYk0uZyn3e2iTWl7*I#AntsmbbJV`UgNlu<*q+UUe!y19H8YexhlvpOYO+gq?iF~9j
za7BhO1tKU@Z`4>k5<xGeIqWjb4duGSuP8n=JSde2g8-N8(CJ=d5F2z<qDb51`Nez0
z^-uohhujuN$i!Z5+Bqf?^8uE8{e#?Ec!v4M5Asm6Pi6EDw|=_G@(`|l+CJB)^4ys*
zj~%+s%y5;p>u<1nbBXxAe$W~A*=+YI1s*kThj?&>c&LeM2N-!CgR!HVL+A^t9(YO+
zD2b;ewX&k(8OGy`fpcU|QOHT&UpW+L;WG{*?l&DBb=N6uh7mq)cNJO70-GmT=a4wG
zb_5DS3QU@iCWb64D4e6P8F`j6&N4iy2vB%Z;Rl+MD=|~6<Bu||att$A*>cpcC3O2;
zD%Bim4cnU|R(48k6nj~nYeC6}W*PQ03CaO7>2knr(+K-GY3b(*-wP>P^RV^Vgqq16
zqd^bhB$io%dL3P^5oHzFOrY}yNoR*kot+2l9Rk7b7%?d|f$$J6BN^<_^)j+FV{>(#
zjm<TB{Vg`Oir@H<CQ1wBgp5ZiJ6l`WG$mU1P$H$%>u~MX2A6Mc((jHzI(*;5^FyQ`
zqWv;{RHIU>(rDIcHk&kRbsF_5)oMg3@+tX}$OC=XJeCvS$%1BCa`MPL`}fcB#N&o%
zR{Okm`T#%tj)qJB+w^%eWy+K(Q+~UJ+OG>`bZ#on?rji@nRpH&ck6^tGWf*gcXk~i
z0Z1WEFu5Za5*_%cl1C*_R06{|{&gp_urgq4f5vKQKpYshcc6VwF4S@0QP5Rrt;6Pz
z?m5DD{`M@t^HrEpu(P3AVgXnnZ5@Dz5Awv}MIPJNU|%z!8d-EYW`EE{z5Q)&yxikW
z{}Ie#gEzR&)i<v3(qBEozrW%Gdx1GFH$8C2f%_|KKMVitVHTf$iYK2x!9#~UM3E9F
zidtDA^SzvSyvpn^d+hipc=T|ceZdOx(k5@#;Q#)xo>~TpB`X9)VMuekTlUXKD2?_b
zv@=)?N;m>#@r4E9;i-_&cN9fPsZ^y_sljlawUsIi1<c3zKsMNI(6UFh65s`WdTSqW
z?)=ZF&z@nf9y8ot;nqDK5dVfN$G*skFP3<=vO;@hFIRr}7x%TnJUmq4bSvjnGh=_0
zQS`RCxV6QN+n=S=wJCa+*uH&@@%HQ7_@H1Zslr?en|G<Tl^)j?#*~99L8Tzf4Kg#N
zMqs5zcu?~NQn=kI7lW^%9BFEiz!r|UFc@PArH2>!<av(CbA*sc5#o6fY5q~i9pyQ>
zDhQRuxrs|-ZY?&+@R8WGfXw0oL7EvxsiUxZQewdvG6yk|%t|x@m06U@Cxx?1KFwwc
zAuZ!9$Kes@f?>Z$BsS2o#%2i{OUv9|cHA7cST4;%#fP#_EeLQXC+_bMr#pn<46gAI
zk!TQ%*O3^8pJNDEZx5MMRc80sIdbR#jhO{DJ42inT>Qxj_hrf5CDKZOp5(Jh3D$xr
z==Hm-tz`_liqUw;>iR0THy$Ya|Iw*8kI|ZKq5P0RVh~$hI=vCr7?QZhPN&P}&Y14l
z;8Z|RDpRS}DOYDG*ILvXHEQ)5wQ8A0twgmHQYnW-fyVbHQLpM=rAwNp#POJP6cZ^y
zeYQ$2LmIKcFO_i?R&Sl;-Am5_uS}mgQ>ILrGUc~ds7;&TvkEnXGiD-S??i<H0*3&E
zyf2$1Poc=bTC@UBD}1fc`cr0|Sj*OqWVPxu3^ICc$@=D<eUAX&gs(r!Q;$?x3^p09
z*Ld+CzH?7Z+>1X0IKkYZee65aBxuf3pPOg@o>`90SJ~6h)JuXuB#3d0Exk&01HSkA
z|HanZkMi7^(}Z%7o1Ne1<&zb7!hp>H0WyWYgWHE;aPzJU_h8o1TyPvYrg-9jhewxD
zZ-CYzo=9k91<B@^<)Y8Q1;Jjg%V5}Msdje*C_te-jZz+9an@m_L@N(4s3HMd;7o=y
zyX6y{LVF=)ENK=Hm1ihbj{pXmbL>5=anjOFMy#yw3J;fp$O-&_Qt2Qi`BlU)BnSuC
z?p0PkyrzH6$^Yv2_#glIlN{Tx811~vyKk)Ump9<jmAkKf76Oeo8j*Dd408`BPcq#5
z4R+34gm;!dT_5P~aP_qv+V8-4Wunc(BLl?!E3(@Yr$wnMg#I3=K1C!-2n|9xDkYD=
zgUnizw7?=zN>U93fwT;aWt<7(xIo)tQu3g%3}Qj3Jv^_<;(_Dby8h0+U9`w16|`N>
zupd*{1Yrt%CmD}Zimbr%G`Vz)04)?!Nj&SJ#N-<uIgdc8$r68Vkk+Dn4=->?9|9pM
zg+4-MY;WIWy!t&h9gKQ#^@ApFCf{PPcaEdgIzt3VLB%>;I%L@1<km1DKX{n({{777
zj`r<svTo;d4FS1R6rM+|8nJh#!s4DfwQ@ke+v4KFENnbTs7X+2QoTBizzZi~p`#(I
zTRSA<HMD@8HpIWt0ql8b&A=#ww8QbkKFyLwOGA?96a$NOmL$pPk7I_h!BWL<L`2ml
z)z&PttrjygO=jv%YV{J8@+4m`^uX7k#9j7N&P;Mivy3c_Ns@$795Wb<Nz;UKHKJAv
z2*V0Sg(SJ6*NQke7x6CD>GNjFlqplDOoiH%&mz={iSy$f_eaF;Kk<>UxTmIR0_g~n
zF(%5<rq~rYpZ=7iMA8|C*vz9J$Mim2ihBr7KEiWfdW>fukJ#_elW**BK<?+y{_JiM
z(16*!)DQ0G$lN@QR*U9bjk#ut*{Y%(fR+|%V?@!#j3M4F^Yq%4h}W*n!`B|>cfN3x
zuODwP8}&&#D=e+;aI+2TxzFb8!hJ&R=diTM`f8Q#@_@LmQRX7!Ys>V8Wt8mDU;i=r
z%_RoIud>>2QTQwLZ~ZMd?$H4yh(e;k!w)@tT~N3Jghk*cFZ@zsts&1+k}M@Hd_1iP
z1BtPULWYFZd729cIq^uJq!MtnDM`m;dfgb4jy@Db-Cmn~rbMH8jK{xl2;mf(KHF{0
zJlEOeci@|k^R+K6@WOKq9^LOTSYIIO%<;jI6I{A-w^9qC5~3S31l1~~Iz(cYM@}sA
z&BqV&A3v>718%Ov-L1=w2W(W=9BcS2%#|rc9(gX2B&0=7nr6(@LZSdtGYK6PLQx7e
zfpSPEkU|mo9)qEwA7_Zfp~8rAwNA4VU`hjq+cVs{&+8$N3yP|mokIWsAOJ~3K~%87
z8AF<9WEO0Z;+$q&<P>=^31`$$h#U!MA3~)db*KVTs|bCC?<)`j1xR5@b3^7FQQ*_4
z`Zy%#ZdN(}lZUz1O@X6u>Ilb<AK=(R6RAA<xg#koahj40`V6`~I!>~`Qf2Q#lkPB~
zyDrJ{&*`M-dk7(rCPCW)zUxyG31vB=rZOIUR0*MvE?0@lHKgxhih>wJHWsXRe$xZj
z)6`ygj5GW8Qw~b(3`VT4EfdOhMB2rUw=vpM;FB0gt)x&T%B?!3YJ+OMNo!_?nb{_@
zjXJG*M6INWf?s`z80X0HgftyfWMlI2fOtG4NhV>hgB1Fs43ovo<^i>OL@6v&^%O&8
z2ubkF7(Ul}=aeZ^rc9YK6>7h|*c?oO*cEDb0z;h;AOsS5p9YH|9g~fEjD3sAQ!<-U
ze1?e9!b%(-LOZm!1W~*@?OubUb&emZa{OS#ewCvA5OrJg+zh<(VVX=G7AnlN>dej6
znQv8THbd$aMadUv;Sesz6+O~%pJD$_8vnz<7vcCm)X^%(j)gpOL@}!@V>uvdZxiF;
zmuG1``XrZh4p;B;Y<%M{_zx~)Z*iOaYECo1!19%tjdn;;yhZ2sHZT7KUgSHR-UIvR
zV00CJ8Q<4MeTDY!c((||o$?5PlnSjRxhW{(nDHnk3_N@t;0c4lV3dbnZZJRB<dMBS
zRt95&fuX&=&BbeXo$P}h*4MiX_ExA=7MMBcBZbE>9#9((_~Mr}KhS%5_H>!LzR7S!
zQq1h5TG1@b*Ew+D2ynMhTjG)OCWq%YIMv#wHeO}C(WbHV63va5|MB}~=$NfcidHM(
z$k23B#W*eqbWW@4;gIBoz)4NnS5zZ`$qdFyd_Q8b6;dgc7>zRG9Ku?Sg}DZ;s9@9%
z>8;=IWFyc)9pRP8O`F_F1Rh!`3L(j@AuUoMz!w@{Dul9l8a(4D3X4@1qb#}0v7W_h
z(37tnDJ4=VB41MTKuQl=J<7F1^UzXosK%lFRZcYmd<3J^V4cOdoIyIK-S3hPGMJgA
z6a~yy6cUdp@_{nkSCR13P1b<S3(|gv!S*VBUC`?d*jc$ofA!MG-Nhgkm1xqw!c*i~
z44Go+c@tle-xR0*gs(h#hKG+HV6jypz_PJ3<f@m^yRk-l{VENAi+Z{T9oCWF9HsI;
zqM3a(=l3%+Ge@gYXQp1JTJ<J1#2+*?I!Br$jK+ON!!E-?hjG8nxYs33V}z#&qXtG*
zut>(4q`i|+EpMQl!pIUucSyXo#HhOtY)qdwQ>ILrGG!{%rhFDAwbYDtIAbwJB9ug+
z5Yk5|A9=?s0Dv5_m^>LX9ytn=5~q-T>K8MIQyx({WUf`v3}Xfd;N}&86udE2F`|Z{
zEIVkqMZ`_Kdm<}K;3+&$;RTu?)I>f6$|4<;Fh<kI#On<DTeLeqmv|g_4qiCHp%W2L
zFBG)g7T&0f5*visGINpPi-#7_r5Ut5LjPgSxnI7`i+5{~H&cE-Ba!`Cn(kTFZ-;E=
z6~^vKuAl!l@9eG<U0nMkE~XVI-G=xV_cnnP2*;$DwKF&z&N-};NFi`i0uEyxd1i=5
z3EJi4(vjr?<CV~*3bks9rnkZ`UY*FPUnzUWnC*^Xlz7BtiLVSIP&gYS!W{zdJagh0
zE!idQZ1TayJ~g?{Y$d^DTg<i!o;nO~-n?_XZ7#h0JwEutHtu2saf^|eW&3uE_iy|L
zx@MXpDG0R1bKnILeyDLy;sqLGVK@f7kXl9HkzflzDx~M(X-y~vl?vEqNKr`qQbe<1
zkfuZC){*x9m**O_TA5m<M8^y9e226OQ7F7Xks}#pmdq-YU!odCj7BkeVKEM@fWi~R
zzQo#`RDkj|Qfri_sFyXFk>p9taFkLCeM-LO(0qwofrUu0*ON#AgT&Fz3Wh~SCmFLo
z>cMCLUdY_s4E1_Qt>nlHL9JAQ`A1;$_0KT`WVkeDIOwsn)xi^ro$i3m)lYI~Okl8v
ztVC!NB8A489A$Da_BS?K&3^U2<r`0Zfs==i&}`Q6mBnQvq%rJ7aA|de!Rzl4e*yOF
zgW1K?%pUq0dlpZz@7NLM_Z_BQuTzSk^q?pJXUOuDBu*HONAw3n+MOMG?QI5w4#QrT
zcswBR3^TJc1VKRL2N3z>dBiA<+1Q9l(=7_8*=P@FZ*9`)5BYy5OK-}QDO09QnF_Uk
zLb!=gGltwc^sbqRk{Y3Wlo#Onl8=fs888J|W=JxDHIh8n6vd}?b5r04)EWVM=QW-Q
zz`*hqxW*D}U8A=i(4X<Cg*P#47uZ~dmF|7loEv&+!XQbg=P6k(NVUV-0%h8`c$q=x
zGHc5hxp{LxmZ#tkp65@$d4wnD6T*0f{-{m1AsG2XA_RvQC8tV?QmuyP`3&~#VZJ!T
z^_OokiJbffJn=g$KKTqYkM3blDJR--?5Q?s%#29Zj`98f_;>u^wWB=sFVFC$BOcZC
z3M-d7{HK3+Vb^3)f}Gfa<0b;lIWrN+P9n5G77`%}+^*noN|6>BNm1Yk@B$xCMpVls
zYE{_!*tU*9meFMoOP}`kDndAHwoYg5uef;@wvHJ31IOB^jTaBm=`H5UTkNba(c8L&
zyMKXZ;}?AAe>%<V*B|E4x6bgyQ+wEZe2$|@o0qQs**|XA9F9q{j5G&NODYi@o|6a_
z&?@_cUO`qs6oRK5X>2L1Lirv_X_WTRzK4_<!j7@Y0GFkV))RVzHCC1`aN~oszal`i
zws_hSY4AOTOEpS3q;zO!aL(cfnsO9SjY9Io(2X;!afCwS`3m0}vRL2&+T|!=P{Jcp
zpheD3JYqCTXp~DBSEcR)SgOV%3&=Cc$T<4BWt8S@j1w64Vb}wyC<{Y6++t^~!`Rj+
zmunn9{xDZRk5J1J2IC>a*dxhuOrgMrAj`jI$DH=sWki0EAgYoZLmnq!KdWI=9XQHl
zU26bbeDGGMzsa|rIK`<GM_5=mi1y1ANlcdIn0&;jzs9ZQ$@h8TESx?I&wu?Q`wu?G
z{)XkqywB`hgz_GsRg0L>aL91jV>lc!7>*eX$8?87dYvwVUZ2ruNPo~H9j`Fc$Oucv
z@uM=}Bb6jjk`zIITu_LV)aG=03FD+7vuZNIG-b+^DO09Qh1!(QB-EV2SWAJ!0!B!b
z5-8{4YmdO!=uyUpQmk+kg`+SEPiTbnP^#e5Rk1B7v?D4DX6imwQN|{4<QQDL_71$#
z;=;Zjjm%>ZTw=WZQ_j70zxBHU=jf#|-Qf-;FGt!sxs51$Bh>g7<L&dT+<u)KSKuGs
zuRwK{fA-jZe)ow3oS7R^Z1=f*ZOBgSfo#yIX6z}gF%xa!m+ClOq3<mHnTSVfaI0U1
z$DZU5zj1^wKYfU2AK%BJ`jGZYkA75VaZiNYoTYrbL95c>(8(E|JO<^&<9g=UIRk(9
z&ZLVjXo0UB(iUKMSJj-x0ZOPzcpP9b;3@o)Mwyf(iLutAJy7ICo~06f^6gL#p;~nW
zuFu-W+jO_CQjFJl|1CJ*2WF2@-gAPI$?1=mxpH-r8}VzbEnnx>61?>*D)1CnzWF?l
zeEArUJzV1GqN6;nvw3KqgM3Wg^3O}rW-w0a#ug%jGaXbuAP}=uf_Z#TqhyXS24^Hf
zl#!t(3>BUj<BBe3loO|YM#ELc{aYl1F{ud{yG^cNd55>}ufae{nvW?8H4$bAjP^h|
zluaNXV@-i4C4u(vqyzzW;*Sba;Yms4B77{K7Pvg7C=!(Kk!FT*Y{&{jmgOKb!a&fd
zL<B~#SoW!g9=<0Da8wF~Gn$%E^zszq7=jYTV8HtIE!wt?KX-<5ZJxceRn{sI!{KMN
z@5n48k>jjID@o*g6cIElyRMFW@+8d8_7V^w!#Y+AK7GRKqrfqEdY&_j4a$K>l4V@q
z`ZB#&t^qIJv-Oil7C5$Vo`drX%<tKQ4r&bg16GDT*4MXq^UZr56)yt&Ux%l@bcx75
zfnRK)Obt|x!Z?a7BhPb^G@;)g(Cc;RcKY;(3B$M`i8InPVH}Scj$#JgHmhqZwAcQY
zgYyF-@%!LPn3}}%9j4GYQ(&bgGf<!~OmZg!PcsQkoib(0lqplDLT$=t!A`=qoE2Ck
zQYfSVDK%P6a;7}NZXTN0wUc)^;Sd6(R!H?}PZl#uW1RKSBB0_cT4hDEaYyC7#M$q>
z&*+R~ufIn37M#0ZEQk=w0nMPm%U0>FZ<3Dokc$}zhlutH8#iC)^1JZjHGo@C=`iQ-
zFyl371u<zUr(P=&`&G(iOC#zs>+Mh%8;Dd9Ck^ay3p-v#^Z^dSNsosXM(hn&nb9e;
zY8&frQ*>LD`~rXU3bXD<wDKp3whdmzp|i7y_C?%>pFvPk0)@roIRzGD#D|V@!hsML
zDGIO!)*2)h<qYHrNtPi+juty)qYd&;EHvJSY>i@|FtUvqY;xn`8t<QnNp0#9`xdGk
z+FxOR7SLTuSy|qued{`}ykBB_d;Gwc>#sexk4I1D)Q7LJb9RPq)yG)NLnmPA%0Fhu
zyvlNKz{02?P=+91p}%nf;Xg&aHj9=5j3O&QY48K^{0wDd(s+eY`#t&_@3Va4Di_bS
zc%O%O_Q?fK9gdjyhjjf1pEXYl3S%bX3@}n+ounuV;yfWYImSwa6G-QPf=EMQ9mW<E
za`OFZWkBYn){x{DR~Uvl6qzEFAzE3q@~H#?bB!{O`-(sds*yx#fzVL(1CmrCZB9@5
zP%1&CiSt4_-67rW0sEqYaw$QZ0dn|xJQf`&4=ohR7Pw-J%X3^hxJ#sc3!eNUVs-{M
zj^XAlxcx5h+K2bGO$7K=kYeH>`>{L$kA8vq<HtEY-(Y{kW40m*JxN|T9^D!9UaQ5~
zzqP<We7M(4S+Y<MIWXVk=)qYkb;Wi!WYpherJb<4boE!x^wJPsSUS)4+M|T^84{P_
zbcHyvq-jc;<_v~0-NBe%KV}q9R%xw}*rLGX8N*S^#@061uU_KsfB5|mkNvNQ-$#FW
z9%nuLpuiYS;WSEBaVVUVAS6P7uOySg;8UhdnKEU{RH#k)Oz&w9v-=<C5N<LjF6E@?
zvQ!>YCc7(UyT%vJ;hflY#Bhku;QBaT+MwML#IqR%1+J)|MenXHHn{T6y*3sf(SSvt
z#cIf&YC+T7qP^T>d*>7`v;_4WJsi;6g7v$X;nsf1&G$5y=a=vfcu4CQq&31oQw?L3
z>yZyG5f`^9OhGT5XKizt<y(C&0B`|r@1wW4#hSZ8xT$HER@qv*#cIFGOshvQ`XR6V
z2!8m|ZRRd~m+ezkLeu5)Ir#qCoeL>I8jLd}X^u4@bU0~a97U1giVSCR5c%Y1=1~*{
zS(=lj1}RcRvC7uQjosY72N3}`xN+I?ZhfA;(SYv8C2oHx(f~qg$udF5!^Ky~M=AZ-
zW257<y}ii9g5^H3c5IHtxe7SR((ML=sLruwj_?bD>{E7t553NR9W$);pcfnV*9vBW
z0VDeh)_SK&3X5+ARv46*<I5qU=rSI*8E$o0x<2H!>mf`2*EzoLPdW5QvwUSiaHzFK
z%f8EC<yF>3A9p)Aq;dqlLrcdv&q?wWWgRu6vDN|(Eg@2ZKq`cC49FPg1}ijKo}tHM
zijqHB?UNdbLJCC`cqms88xL(Ip{Hs3A$cIlut-l3NT>u8@sb&hz_8t`v28MDn@wiQ
zWlR`RDa}!D?ICkH?OvbH<@=}<p0995Fd7Wm)*I|}I$VA8PIBh&@t^(of6SMj{R%U4
zi*!3Z&c1t&zy3uDUT*_;1kxC?aJLfl$E?KFzr@2||0-WT^CZWP9HmhX(Rmk<Y$9!p
z!?CwsA@UZvIXFt^XJ;o94uEn)8d1UF*?@!d3KX<Tg6*va)kf`sA1wpk{Cj9L|Ax3I
z6RdYAWR<j#WVs_PAWkiDT99WBP@p}ObU15C^McLZkXJ8U=lqM`zvtLL{yx+WY-05u
zf)bztR8S!hlkjHY?o4_~JSC<=ZOW7>Q>ILX+HdyopZX2+|6d4$bp~VZxIQ{?7KcUL
z5o?-Vp=Q7p7-O)uzzQ=lEc`6ZQsgXe^jK|psMOKx3z9ryViorZQ}Ln!^(q94ves05
zLpj@GvwNFsx7Nwkvy}ErO6d)TL+*QNJ<FTlEz{C5>xXMJsu4joVPR&35^b{hUAB5}
z(H=n(|0j0FPjX{zjkjLC%SQgSAMtN{U*o@gShF<~QSls|odvdrG1{yU--18CJlXW>
zCBw^?4p65_?;h{@gs~||3(GijSm)sdWy(>6rwpdZ$TLG>4VVOzrDR2fatbTJnv^VY
z$gIQm_7<1VJ*c6|AT`*SjVssr!IkUm-w)|B+`D<e?d>5qZ+F@13uI{qU6QEM<8ZtV
z(H?l`m-imJl2Fl-**z!l51mE@eGa&va-lfK%FR!y3pAKt>#Oh;ICP8?2NtM@3i6CJ
z4#<YjFp?p|G)KvpEM6iRu2aM@i4nv_lQe&XLH!V?{@@t@{PZEt9B*={2{T+HS^Y8Z
zzkHE*F2V<IKlsenjS(h5Baxm&>JX(RDiiop;vw*b#YqrCpsggwVE{W>OF<Qe{?O3V
z84I%o$_PSFQT8PxVMt9*n&&uY&^Q{+h>}rs;}lOgD&C|XoTtS^RAd2%Y9-<%WJWqX
zCsEZVhxb=FIM-y<-(flZoMV&LNG%wqIXnF^xv{L>UfC^OSmqo5^%wbX{`gs5c>Yo5
zTCm=k<zQ<}-o3%!y}s`*p~mF?Eff$uK&X{??)jtq-m}Mf<_iyV@W4S(9^36L)^GPo
zhdW>`6<^Y-!0|@F>r_7!YDsqmKi{G54?yJ;;o}^Q&@xl`coFp1o1k7C@K|w$`u++!
z%5f^d3J>c9#yX6dOi(Fhk-{OQ1?$L+r9U>DUv;~mDFvPYW+}h0z);Q8PeV!yJRibH
zBDF$mjkOAtLMVmwCiN4iOqnue%9N>4`;FoLX||dxz!W$)$x^#hHqF_I*#*MgE1ztR
zDN>3Ya%;&8i~Wp7Z%dsT8$*j?he6-b83mIUFH#=p?cF%Q{EQ~Zb9%xMYC+8psmmFB
zahuKIh|Qn;1ak%&9&BIYu7b{Y1mXg(WOK|73x>lbSiVTF3On8ga{P1h9muyK?!!*9
z%C*gaAKZVCOHZ+V>MNYsvxm}xAkZ0&EXBr~?A(5n1DC(cZBD~CzQ*r9J<F-m7USiY
z`T2MMf-7qPF&k+{QW%U=IPK$yC8BZ(kC-CPKxw4NFhxP0q~yk-J%v&l=L|)f6333-
zxVF36cR!<h^zI6<^1u>jYYbD%uqfeI4sv)=p-q{RR@4)Tv?Fc@L*9Mk{71W-e~tF_
zFVZ^hIJ2jMPL^1D?^SM{`x)<i%J2SOk@f<}$Ka3;VGrUR7!7&)`KNf~q5ae=K5+uQ
zp<p;V%BZoIYFH;NES>fm%eP*n*M5gXNB@AM$4@i2=LidP2binRGTUe{Hyco^rpWO&
zgOv+hTYsJ9D;Ig=B{=&r*O!e8vP@E#2xLm+Ydq~RCd0Ubv`EPFoZMJ)EGZ5n1=3Ua
z&LRtg$sL|?4C9>sI3>$7gmZXO;jANZ1;ZjCG73RPt7M4Gt_W0`a;Wj7Bexb?6i5by
z#U_=(GKpD4$O<Ydp}hd96+)<q0{%S6Nf@(J5~l;4h$!T4apvk79y`|Ju_FNoTa!N>
zX~OD);pkil#}?q)eqi~oF;X%y&X7#ZLGIkc0gulYJibqGdSAf8oR1M2T_`s4E;}oi
zDDs?)D#Lb8(plr~yLkQPS-KlfGu}B&b0&gHgLIgXbZ=vZo1gd*|M~(1C(0aYdel4*
z4<Dg4;1F1pus9q-P8>Itld$_;H0l-p@R<|Drw>wze5%zFQ4~^*0;-Wl1>mH_DIcjl
zv=^YYM`6XpL05yPBvjP2l-iUjQ>ILr3biSp5o^JiiBNL|7LSQOa~Nka*4|t5+7&ok
zU~)xa429)0)lq|!MDw$_N{>{pGRmQsc)Krl4^n(BT8)sIvcnC!43i;Vk>cUws}j*&
zh8kx-RxKQc6Akvx)Cj9x%=QPo|H?1ed4H1PpD<Y$_(&o?4^J$>>>8Z^%iX^{0nb0q
zQ!hNt3(xN5$N>;uK{g)Y#@me6LLO_4`0n{C(X+?-lPBjmUMjJ3<uc6<{4ak2umf>Q
zRyc%IcuL?YN1z-Uh0q#nJ)9Sir-nQmk!1;?k|?QAQjr@$;Tljq!|BI8&YypUNs!m)
zV3;ECY0miUnKS4t#*ONDsX~bmHEeO6yQ_0u;H7VWn=jNavZtq^YkBp}y}WYsUjg6#
zj3@tHzV@I03D1A^N#^H<bhqB(y>su=-tm~95gce*BHyu|ItC&lua&5I7SB^ilhNyq
zIrsKEG^+62nS!IWF^zJM*+4VnwP^@Jd8}cS(_XvA2j_pp*<ZfKJ8#4A_`l@D;tYfS
z5^Lwbd(Tz%dt+KnP=17`6ClPp$edwZWW?i`QI-P|>G>4O!)frG#1)3Z6bO^yYk`oG
zxX6jKoIE#R9m0S!P$0+^SmCfH2djvbrd*N)UQU|E^!j}^+a1={Z?kdrMK<1BXa4Db
zK{*If{$ypbJs49I78ORHuMcD?u87dm5&4>0IiS@jO~lsz8oo4`;WES(h-&2h9o%q@
z*{b5%Q+s&z+L612+N8$Z<X(=Ltg7wi&2>9?$z{U$A%gS}GF24LBkiuRdgFcG{^fUw
z;}lVPl<mIdonPEr*5cKx8DG76onwa<KpBF@3_IPFYgcZtcI(zBe#FBMog`>35|nEA
zUWoEMgpfFEu{aC@5R<~+LhK4QpQt3+r#xDf3Iajkdjx@p@-!1E=Kza!4(&;NKg0_{
zwCADCBz#;+iP8#!sZg6TWy+K(Q=vBHGh@Km4@H@?cH*#YKv;?R6&E*)GY+i8DFwm<
z_i0TGo`z=*bNXb3#f5b$*>%RfG0uEap<YL5b7W>Paff8nknNdaT(1zwm@N4;=e-H}
zCdIH$NAHks{(@h;|8d*C0E=gM?#uf)TpP0XaKuZ0{vQC3@?OEdL-5c;aCDBzOK8@?
z4u`}(c&9Ae{WZqHEe?7k4tvW4`U6@YHsKNs60&p>S|!PG`G`CzkP3t?CWazPqqW7F
zG3l^N;zFF0C@%o#$b%-c`{CK=a-wLBS6}_KE*_6Fu|a=hS9kU4JQ~A-o`h&Qi?$;I
z6H*E?2D+fmy=9c!E6?)hZyn&x>l)$DQ8~1Sla-11c<ZfC-|J?M%yR0)KEC?Q0rt*q
zvUFuc_vSKQ7UH_^(z&rlT0esD7uh!-B9sH0Bdj9H6dheA*z+{U=iZ=P{D|JUAF&pL
z_Mz4~Ky~Igwbl_@GcB_51{ZH$<d^5*gW!)j_}EjlW=eE6CF2dB-ug#Ex7}W6@7@J!
zwKASe$Wlj|OA?dg#~E>wljN3C;8Tvuc;1k)D-h0L@`5<eNL>cb;VFqI3eq$oOA9a#
zX&urEeB~p3NrI&lr;|KUQ{YU($oA-VS6ErT%H_+y<l<cu5L%?Psu~%D4C0jbC?jx=
z!1F)f?e849G1#KO<uS_n1YSl!f)$!}FX!^rWdhry8VNexn4PtlnX==|!HA77l(}*C
zPFP^hNA|CV`=bypz4;Eu=LL<jVmR1hSd@78>N-FD*;W4LhqrgP`UgJFLiWOK$IQhJ
zo%9Cf@+$3K%7rWIe6Y0hi68OdQ-@htn4waR@O=+Z6JI1Hal#>Y%Vi*U#hRQ<jA-o>
z_?CLP03_P;P}-mD=N#5KjIk(d2(%>fLqcEU`#xFbkW!<B#FrAn>Emh2l>g5m1rJF@
zMG8D22&F_hhc6{sN)({P<Sj_CJNW`gArZI_-;TttTeEa`eisionb;k2?e3eD#Uc?*
zqLS>LsUK%2q4ak5Crq9X778qxwHO4sv&7CZvW{hINUWQFpHrqn?VlzVteLEi8HX(l
zR*Ff@Eh#2BYImX%VUoXQ9mWZq&<LSXpUO<+_u%=XeD$$8P9O9+SoZOT50UM>Lpl7U
z{W=VK7B9`PZHR53i*H|L)*Yc2HCgIBv%6gt>Iy1dSb0D_sT<$rnmb8Sz0AtHA9t?*
z0(gem-#yNAC+i%TO&Ko6_yhRS-@U=;y}xJmhGF~gVGb#a%9q$)*{0hwm}H%J^Zy{f
z0T-^EqrSb5&DshZ*WTl`zqsoZt1;u)!mhc5GX-f<P~dRZVeKTZ#q$(-o{^1vj9iBH
z1VZF!6=TJiW;H`BCM1hjc#~geq7Lvsz?Yxq%cl+L<{94loBtD7rZc+5c)W+)?L(^)
zN+f90!%Ma>gNv-*FJk}r86JM&8IJ6mrBOB<nEQaOH#_u)@ELR(Zg>{@bFjHVKJL=H
z@&+r{SLt(@e6+^xr4D;e&hpU7J<K*Fg~=F?97cf)J^XToBL@z%e<nZ%%Y1O_CO6*$
zRfVIcZ!_-}SO^8p#e#BeOjz}a8;?`e4^W*|l!GxNH-OQ-tC7nqTO2+-Ch#?RoRJPK
zIUX`M<Su12P8cRRrBD-j4(W38(TIFJn%M6fM{FFCb9k=6B_py?LSEQOu2LWoiKOHt
ziUKq4GZZ;-Hm19Co9@<S+8ggP>cgyn^3D71*0_&HLf|<HBXD_vH7OJ+9-pJEvXI~;
zqqHC%#iXIaCNUwFQYgvg|HIy!1<7%x_kO=~PA-+TFTHnT2LTWO0fHPZGaQn$k473@
z?YdfSSYf}|;cz${_M_uI*kQlePmZu1aUEe_TX(Lmq^r?B8qH{CNRb>4iQ$Tc*n!5<
z`%+zdR%V`a{E*d+2H4=HZ6wv70kBX@W>(><jmH20AOJ~3K~&bsli&Y*|L^~K+^S33
z=Qi-;B^+JH@dIjs$AQrft5Y#I-nQGwnTA1wi8NPz7k_mX;{W?y<`*?nht}!2Q=DDY
z{OQsN@Gl3SiAXba_ZJbC>G?J0dU@gnP_{#3z0U018ts1nfnV>`<27cc%T$U1zUQKp
zz>*+D>gH*2Kp4;lD+EY^R05?Ogp^ooFjgUi#C04T$3r+0Z6VPH8O5N%b0of-n!~uR
z!nNQi2S>Sht_!|5ywwab#7_WDxDLm&dG-cARo5k_6uuOAQs9VGg6<5m>y89PO2U)?
zfk^)^#2^pPAiFNMsF=9R$?oT9TOrr>(tbN=jkNikwQ0?>wH9p$L~TIk5^K{xSYm64
zjU_aeuGXx_F}K1#XFF})iId?EJ;acx{nLR3laLsbnu=Jp<>+V!4rWqr6DAHaZ;2iB
zwv`g+L+j+f3ZH$1XHQP?^xi!Cs|h1A#IZAkg)@{hAN=W7qd{xCF(f0rG<SrfN2l-}
zQ|$i~xW30!NiyoJV%IZV`r%8QxqaV;W-r}WyY`E~7?d<LvXDK=)4y<vuRLGkz*LL8
zTA--~56{4N0WSQ1eB+x<itQuRcUe?-p1DQCMyzn{6&hFIyMGF=a*jX#_AS0}qD1Qg
z{CK;fbKTI^a!}8b!Eq!I6Gb73Q3%(;b0iK4aj5CXZH(>{_<e*~MYnF#Zmtt{*I8M5
ziG?fole7uoOHg<SP6-IF!fC_4pZyxY@pI2`@<@ZmtmM`Fb^h(|yuj=$YmDm?>?t27
z@Vcn(6_#!;(QRGk+NJw{iI<`NSq>Bq^To&aabOC1%RYatC39Cl-l$t&xx|_CilTp!
ziW@R_XMt;rVEh}j7B6u1COlt#i2VolqeMa!Yr4G{<5)ajP|gWtHey_@F_|ADcX$%7
z(x=(DNT=Q9_Qf}7%q_7oTOpyt`CG^Ni{3#f70EQZ)Ez;i?a<H#?y04sKxBPFJR*Fw
z&<JA@!V;rtMSa33B2HYi&_r0eRuV~{SjH%6@f`<YG}`v*g_1BaXeICi7v(!>C9&4Q
zv6i^G!R+m;TwYk@;%p06VsiTq@#VuM9-V0uH7=n4<6YXaxKL-$Lm^I9<Gaw04V_+}
zR<rl<NgAZaGXqyjlV08^Tt-!uLcyh&caeUEjR>OUCRP1?CdO-IgNGQ)8Fr0IYBi6w
zwfp6_JFnin*nt;+e~nLnF`_VIX}CpBJzb;tj6+62Hw<}meu?g%j{@J>`kX&DLA6rG
z@pE(%pH`#K((O9SbGHfC=N|a=rfZT~K@)feVPoPr0Sr<qg!GWYK^TD%1Gih!jG9zw
z$YpJsWfKw*7HopFsnWn$jj;wH^uQfgqGZ~j-7^x`b&#%u<GYa0{2kBZ;_iGt#1KQg
z4@VrAU#e9(md`Qac?3$~B9PJ|ZF>D|k})w@!xC0*BVef|cKTRuU20;7YwiQrt|i=8
zP{OwEN2In?n}kkmy>5lUZjn5J6@yHiuoxpqtfgl(OL4@7c85P-tMg_Y4S)C{hD7b3
z23Jc9XSB6jt2vU?f?pyL)<JC10RtFfo7Q%y)NkYium`G#dHA7Sd}?2rgX1pa`5w8%
z!$v;23}ofUJ>Wx3J@F7Hj?b{C<|0Xp`Lh{INzP+e?l9hg_HDSn^_iaq_CdA}-F2W0
zj~(KXCu;01^@-~)1#^PWKl>=3`#e-~Yt-kLxw>Azr&aCTkBa<xbq}3>4bMA8L%Wy&
zTyvXwGtR550MEb|j`8|2kEcI#jgx2pjCX(dTDpNm6G@Pc#PvM<z(E@5>x4vjC@+ie
z^}#lY%o<@o#P<6{$tvBAYpgB3&gufJufg0Icvo-#ep7Hf%Om>_@tMay#iNfF(5<sv
ze)}9Em*LY#vOIazW7RFvm|Uj<)HiPM`nPXTapu@vfYzNic<ZGHwMPJ6I?vqm3z%?*
zTHw>mWf_|}$o^mc3~&A3s~_uE{Nd$@TWe=1+9l!`>WPaMG3x_@J-@unMzhUGDMPy*
zvalY}SAv|M(C<bxnicZ)6vfeTiZf;6LQJysEH`h?apUw=dh3^QDR5Cd4ksp|mIK#k
zF_buYpKLzQ;e%sbI&+t(Rcn)!D+Ma$44rO3J2B|UqN6s*7_GbLI3$jJk|e!@dX6HH
z0WpF;hQ84BZA>GM38h0HjTRP-1*OOZ0V;73x`T)#lsm)2$DZT4ukK@NJjYbAON~XG
z#yPIN*FbL1Yp#0qv_nY<l!?J6Bt{ULPdNQ$0`eIjsTA5IX`^*zQ9*(uBcw=h6qv+d
zlQuSb2hTo5CR3zX&Qh!<OiV4Xwzk<lT$36DJ!n!m0S8Xeojk(S)HM4_Icg=JVn(5)
zCJIAN?ke$W4&M5`bv9+Xhh|0@9j#KSRItKly%BS3E#%^l-k?F_fnQIDE9lM|VS9x{
zhV&zgRFYgiPsS@Er5v;w5!-^Uv~q3pD_AVTq*hC*OJqvitPxm~ASEbak&aB|j#A<{
zAeBNo65m&l{kyz9iQzqLh#@`zKb;HsnUN75&Sn{NJ+e{`h>=Y@4n1h8LzsJ?Gn?<x
z_mZr8NY`fF>&Luew{2*1N)lUCZSX0%{qqv52E<XN1k+lFG0$bfb(!*gzPq-@H`|@z
z02pFO)c)}kH47%KJxlDM6_VKuTolSl-O#ih1Y+8dSc?&)j%gq0`uHTA+{LL~6%LGL
zm;kRpP`?-vjAlZdt|4qhC=2GEc3lb>A<Yx5J#d;kIO6coWQKjU97+{PyaKsAl#pnD
zjQBR}XOpP?5<K)de*P;**u5(UvO}xYAdwEW5towRroWcpT8Bf2;Njf>IV#$+eqjT#
zb$nlgr#{c|FFeK3r>2;yfQ-}nBo)uGbVM_{Yn{L5X&(K|F`n5E(@mF!eP{T-eU0CF
z6`)5PcZm8PNvsjBi;^+Q_K+sTw>{i=m44$Q^@Um18q37J3v@PMX%^l%1558aAOD&!
z{^y_Pv15X4e4TJru<xM~&wgq@LD*xzyw1hj^8|K|vR^{v1=U<aecKlP^3UG*2m|E_
z`1I$A3myv#XSozMNcsvBt}|W!nE9Oi9(M29kM1`)f3*Sqko$#uSFS8@^mv_GsX(JA
zsK<(pRzwtT(ChWd1$!AA&C<vRM9N{q#x&g$8<i^OPVI%pvtS*_=OGZ_XeM33SdgI_
z_$cEM=Cb$f(+f0#ZwP#g>qvy}pp-==4&7dts1p)}5hej?6~2Xxu_ysjLLvo1DU9RM
ziZq^+1?ggp!CH&e8jl2rh%o9<Ejm2^+#wDgJI2WP40$huqc`Z?>2mYDrq^Dlw{6iw
zK5?9pT7|3&Yt2={R*1Dexc(=)^nKqY<GC0ty*Q#1_K3nBopzJB)u!I+Fxm|fQJ<)<
zG3s;3;5bfp23PrHiZO-!*tRXkA3)TeCi}G~`NdO@^7tdin3|l#aTIaX!Sovl)5pY$
zf};sLlbreVA(9`ZL~Zx<1k)4aRBKf<E*ss5w)8%bqyfxdhH~LOnmtK7&d>=p`Fw%N
ziCxsHKADV{8jB2~AA`XdjWDUIz#uS2g3+KfR-_p=t1ZF`QZo^eKF_x7n^fRPq*VAy
zGVVJ&T(?6EF~r|BJ|ATG7bBxQTF6s%9F!0kn-VlLAZqs$uAP^e?A^cZhcK<J#~*PK
z<-WJwUHlgB+osszW7}nz87Z0aeR4{nB!t%Ttxk715QZ2MwSU}1ElG)*v8mO*NsDHU
zkSHNh!a<3M*pd<`o%UW!gB$&z+JE5F;2-7Gk#P=A6`2@u7%PXAMMM%d36m9iZCJmN
z25~sM;jtX92P)BoaUWz8w|$fN!h74cdzGj$iEd^gH;I$0k*SO@HsMo~mOi^!u02V4
z<TR{)9yrdE&+O*u#}07p*dA&%fryr<uPn3LY|w7^SZ%J+O|H|5EA;gkzM98LmXT3|
zcr)R0>Pdd>tGoE@$udtpl4pOhhltw5-H4<YvJk~I76sB%96J>8^sWvg%gbE9v&_|z
z&0}9@uCc<>N*lLth%?~33H`7`KZ*$5E^d5<wcGD-_H8)-E?oM+AMY#d|Ctl~^jDtZ
zxyKS%>2l$(-^TQ>lVOyZsz)>taP!(t7H{UcJvN1H8ARddIPv5@&Yb@9k3LSadwBH7
z7zajLwC2w9XMb>!wPi^@cZuceKmJ%lZgQl`{>cg4%qX=goO$)N_m89YyUZ?pit@-L
zxm=#{N(>ua&M&r^?ZESg^W-W8LYpwR)MI_aV2q$t&hcC>M>`huw8gVAy?#hP5=`VA
z#&ZsVE9qH>Sl`<$xwC$aq&q>9u_Q^1ksh8a!E=bhfJA%5I&}tg9S2`1q&CD!jE;3$
z@U106N|dW8W;0}@gR%lCz{WAn`UWO!61Cb)70Mi*j5xMul~OsuCLW!7gSGYdn45i@
zrPXn=2ls&-<*7rvn4TV|R4x(49TqljvogO#P&tBiKH2mqMQS5&vBU_%M9>K}^MF~8
z*<bHdsU<ktAmSq0JA`&7iOHr}b*<2LvrpJ&U7E*TtNzVZoC$V+;UNFw$s;`X^l?s}
zIKlY1PhZ2G`4$VeT7>NoL!Ydx8P7X>s#fGRs=zuEBNb|u0=XbSBPrxPydC9)Wng3L
zU+*qL^Nl5fiIAJE9G#Znk%N0NZiOH}isyq=0%0T;GpGyEX~XJm>+A-wR-+IYBe0~)
z@Rl^2W~{}EH1IP*AVg{~Af!Yp2Uq=l+@6NA$03GzA5p7RcqE^t>NrRt(AK8c=~gCf
zP$OpVcFWzok{;wmEw&N7&1=uv``*8eQEh)-h<o3#>1DJNce4+WRc?P)2oP2vv1pMR
znkXSCISxm2dDg25-|F^u-pLR{{CyKOA%<h|lilCbf-_@MxuZ>U?no&xN+4w#WNrlm
zIwFZ<Vk416#5*Qarc?6u^LzNr;Ti{b1<Z^^O!z%SdyQ7_7M+dLtj@!mJPNy?<;0hE
zb8N~ZClX9AA<`Ob1KFuipS;F*f6yOzn!Lqpr%Q|n7B`8gOlBCHm>^roGm;-8F?(2<
zImFn*ZFqSve5JtTL`cSKQ>{rJIS6?s=yw&DuSQ(F>9Hn4?kt{0y|v7^Q(}K^jn={?
z?p(jY@*RL@dHAscN2eN$C1;Vh6mhVGZrr54vcXzog<CgY<I33r8>5z}c7^rTMH-7g
z;=<c6aB0gMVU^{TMJ_vC*7Y?q(M3Fw_7`h5(mrnC0?anx_DA~hLMAJ#OqN!8XuODU
za;%m5TwS@!?3En3T?Q?)SUTJ}|A)M~Qo+fbLXUolU-?&$vUf7#Pygh*A8nj;|A4}x
zrE_|MTh1gGlds}Vd$2yqg<G$GtRd%`n7nHk9nVtC)`(kWF1)kxzW1G9@3SwG%uKqt
zwvO%I<f`t0DRZaQBQpn%NLX!Igmf6o3S6lP1h_(w6@cTAcMD{F#c0tX?<#Z*)(r^q
zwR`s0>O$CP(hmw44TKR0g;Wmte4a|7fbTgtjzl{OrMAgXBp?Mw3+VUok_1TzwvSB`
z5Q->-xkgNDBZNMTuO?hS{~oq=k$hzm;g8ep^tg2PI`3Y~GOtcC_NiU`a;?ao@f;aP
z(TkuSLm*tRS*-LCLVu!5-^3AELlF360tZ|{BITeS6}pL_9a~)Ekm!JHw@qoIP1d-q
zw<4C8=2=``;a-;AAA}j(LY!=sM<=ozpU!b&UztNwgAAYoHR{v2-J#RGPMm0xP+?7o
zM*?W7K-QDELL+RH){zlo?R^FFrD^u=IYQrhEL>lMPHHN2V+mMl01aS-vqi!Fz9g{{
zE7Lx7RvFM~04I&W8qmUQ1z^S+M659bIg;J_)dj*+2qm}HwS^T3k(vbwE5Hi0fxAt!
zhZtgrzYqL!vB05hK-qDTgG^dV)b5o%K4_Uk@AQh@oZ0N%^qSp#|F%q;Wsn*Z>2?M#
zBX?s|doL@y@1fo4#rtMju|+V`g`zaeZ?_iVDoU|G2>A74f&b8G4hO^#|L{cZ!6Z!#
zR~|nQdeBSF3|5uZU@}N0Jw{0E_EV_)B)yovFTwQKIjR0tc=iy#d}5Si2df<11-o+{
zGT}PS&MkWD@3K4(=U;^;yWukvJbS3d!BHPiDU1d~f{5#|QD>1Ns~1-I(ZXQ!^Dpox
zr<)}06(-k0_W4C>V_9ZO4*61r$?0i!AHK=14a4nXh}QGmUWBoQ0uSxoOWpxL+hi>0
zu;6DXl=5WnyvA#<e4qHX$NpTKxN(WgmqK276W|uQJ4;+|Q#UQnTwdU8`y%zlw^&?+
z<u$l<30}AZ(Y~AX=0~`dKS#I#mtKNzZ<Rq^gxg&%wQlkHxlh~yZ5v+VwaX{@+Qr>0
z?;4|QTLk$MdTEvOul+F_S2AetA<W1r;`tum``#;v@%{YNzntQypV-AC#ivng-{p^9
z`DlB4`P<*5`N;poiC_OIKKJ<p9H?sQvsEgibuRvI|JO%8>Q-lwPUAYGg@8<Nm6Gf+
zF$s$c_e9<VUJm8BpbVzFOtOB4s5=SeX&ld?ml%W*grv60^-$wE5C}owKt?KrEAV{9
zXwjwQOS++^l|aV#7_AiEcWmoj2S0XE^pSB)BrKjxaHPf|!fK5W3gtLxE9h&51RN<)
zO5nJfuw&>&g0)c7?k5;+afQW~3eU}=@)mNMj&Ycs>mY=~6qa0}Lt|x*m9-x2+$k#4
z2iRQ<@O_7@D~RH>SDTWGv5AA^Yl0Au#l<_HY>h^193k->566)h6BFyfsI+~eutlTY
zL|99EV}p&xEt-v4f?SsMX3V*(^W46Ej`yz}-$$al>tv!j8M8{BwZTG8Dmyi;IX3RR
z#q4{pkcbjJImW`8W`1b_Xs`}M-F4!yh35stD7xJi>-BrZgijpU#oogY;p8gZIn?Fl
zv!ihNTlanA0DPZ}>*IMYj-!yu9RyDi!Wt|xRTjw2sLW!uN#{qCq*enWwdhV8)Jx<*
z@+y@Ys1O7Sn@S<=rc5&XcSO{N_p>2}*a;73^Gtd^j*tVXqu9!xnH{bk`=I#oesX2E
zEpn$;je|MFZVNfZ_VQQm5i0H&l8Sqe;bWGbri4x0-M0lLBx8=pv0NU8L~V$l1fn)P
z1)mfKti{;0d8@{z{k#~sKC0~*HGnR30(!o}#yeTV{|ZbT=gFrgdGw(X4(-aar`Be~
zHV8MC2-h#MeCIM(F2cWG1qkuoJ_R=+?`QG70404KPvRN@ZUAd5l=JuP=GvQl>)M-4
z>|W>bq)55qF%jgL6q-ynV0^;o@!C8aEtjPwNq6BYp$VDDEc2Oz2~O(<>vy2ptr7$-
zGu19<U-~is%QxZJU_iaQwX>UCKK&x+qB8B^I{l@2X8#IaOwY!>xUtCZ-dKF_>ArJo
zkfr-1cnp|hd!?Gbew*7j-{jpN`4k+FwP*@&3g*uJ5pTbAn(9;knkPPUjE5h|5}7q#
zJNF*ljfcrkmDy9xbL8-^!z*v`VIs>EkMiz`BmDgS9LN1j&@{-L!=VFvIWhtlS3laf
zsMlAyeY*!;gYNg(sB`aPz#you`7TN-x?vB$y@Jzu2f`6XJ(rvV#4%V)PC`EsG_)XZ
zEv{qmgi9&wB80+q1%VO>tLa6W$Xdn<f=uMFuLL)?l{$$^1;1J#j(aG&^pGf%VB&~=
z*rnU)LXzN0(%MZSa0ho)Us|ja6G@F02}vBM#LlD=J6C#C^Et9vi6JHvNW!Ga+Uhbk
zY2mtxJ9A51n46$i8)K@Rr;?NS4rpy?MhP3;7;7Yx6Qk6MIX1d|2p2i`NhZxfeY&-f
zBpPEvy4}HuuCG#GxlKk{wAL)%nWc649j1Z>{DQ+uJz;j~LBv7cxAwcp{H-f2&X!r6
zEm6)3a@A3KjV@Q-d51S&{Vs3*_%9IU1Bm=F<~J-?e|)#$L!(ir*Xt4#6A}&WZl7Co
z>-X$+da}fUJvFkWaYkDSj&gb7b{BdtY<pLmG2bO{6`m5fu0*;n(g>17q`mqEgmbGR
z#l&C?#-tK)V^is?Rd&nqO_0islu$TAA;qS1Zff@*IGYtDLkuy*-wUK*%6BOZWZ`-<
zn`ZAy9e0uz+7DwxTLdkw?Z=qAkGF0j+nuw;*1xxOkK(>cGqJ;-Kj1)iGCoObWCw(C
zzz~&ylH)L)@tKs81!IQeVu+u7qP8`Vhq!k}7`Q%~R1mN=83;t$-0^)ubd$L559-!7
zQ3bvP<;U6c3%hy#c$K4j3+%6H#{CAeu|#j<CiTS^xN#YNw57PaLVs>QtJ4`q14XHr
z#m|=rN;%37SPC>VE*Z76Va4LD@9?cZ8E10BW!xXb7B=X2dI%d+Vu@g>#o1Pi@Z5QR
zbm<D^-a&c?BZAHbS65H4R&*%jI{3DY*G{*2ey1H>JI5bggE62EpUe(@NBnp2=#xD2
z*+t~)cX|1DH?sgofiI9!;U<h_VV?)BGw|MKgj|EECatwsdF6XI3C&m7{rN{Zb#jvF
z@)F-)e}#9hU*WMQrkR<MoSYHdeD}9G_jZX=Zx2D=kehg%U;9r-c=L@mSI%x)olgKe
zk<BA~;ZUBOv&8C;{*2r6Q;dD;5MJOgIr`Cw8V0Uj?Qrwz-Sa5a`^Q+pF=Rc3v<WuO
zBh_<MDpm5H#Z3}=QG_uG(ouunS1uL^6M^GE&apVs;<*;1BbqTpR;06qO%NtZ&2zS4
zq#RJo`$Vg0(^2WVsX0Ufag@;OM#TLXM`^4ABQ=q>q=&B|j*ue4GZAj2kvg?T6-uEz
z2hW!Xlgi^VzM|FfsLw9YUw@HiIL^CkC%ChJ7hj*slMMtJU!trbP7M7xp%EqsD;O!d
z6tfaz6&d%FUit=W6OtsPuR$a+ad&W0H)gqY)hBAy=|?fkmv2L|K>8E!)ThT~v#Zcf
zufKBo9ma|dMPJivEmJO6SX*uJ(rfSX@BjC|U^czTz`ORoRCA)-L4#_86?zZ=-MeyA
z&gZC>ixg^Af})~l1KxY8#nOx0iCP`qY#?<Xg~1izIu40Yscm+gx;}1&LN=9zV+=wM
zB#-uP^@tT|Ta!&AZ6yW{Yy<hDkP1&KvaSo{c(6gz5JL>{w}~%h1In(8yG`<VSN6!Z
zNarK+qwOSZlc4E=8YxL@_c10VNm7DJd!iy0D0%n!K?7~GMc6ir<-`MP;^4kIxBE!j
zX04q_m)Eh@4(@AdBk!_OJd(|@&>otK4Dl07)a?7NwIS|<wrFe6R%2~?Dy1=))S!Qd
zAUXz{9gvAhU<!^*;vd?>^AAt)sfR~6b+E+4V=&>bqrwF`YxC6S&og%e-hB<ex3#Ss
z@ahFF))Yly(NlRUxeOD<Dx*0KjM1n(PHp712Ot09>%8)Ikr8h<-O&iys<W^z=){U-
z<u>8`99Zc6_`CeiKmIO1^(15?xKo<u;HTRh8SjxaBii?Lc-{r9!ZzPMfaSl@iT*9v
z{b^1<-KMelHnT4|@bp*tZ-48veD?7<!db&3_ALMB?<wFn__hD?b3Agyko0G{v#`!a
z)MR1y8n0}5s{{~V<owxrW`7KgeJA<vpNkl;_|&`+*7i^G-GB4%I5QPeYgY)D>Lks>
zyzowwR%e5$@(8Lr!ij2z!2T*%&MJ6zjOS)nS(|@_^MC#7`-1U_oTX>;yxV+^Zn4Oi
z*ForIl233C*iLrs`^v1kDEj!W#dUllHAa{b6w3<ZNDP9|LZrcwmW(6tT!H5}_)4K1
zL8vXh&^SiXPXvj9g7092Llk*zbQ~7$D~-$Aguoi4WzeF+!EqGAvsmLGj3PFvL#nk3
zA)rHy&@r|j6Gw))4^bS0BZ)A?MiV#^*ArMYaT4PSND_y|WQ^JPc}|DVg3iFM5+`<5
zm?&i^Wh9;w#EB)0lC&{(Y)BHzdZSMuCEZw)M4z-qt&fiTBoZQ#X0RQV!5L7kc<vI5
z%_gz7kbIDIMh%GC=3}`dS^LB9y+Nnh=KA$HirIjbl{LQohc6FE+5kJ~frDHg<@qUb
zww54p@F%MD2mSksKrWl5P%Kdy87D6@^!+l&S6eK-cpSFn8`rKaV4jJPNTg6GsjyNZ
zwZsT9;AtsYvu4l;TZr^EYX`B`prMknTW+4#>aEtbQpi*WDJ72U;JY4B_z9Wp1w*;y
z5dYM%%k#-fIWYMd{1I%Kh-_DIe5i@z_DVLJZq1qmk|=d7?zXY*{#_>Jg2-mDeil3r
z92XpCpi+`(A-84M27ieM*!mBi(hoSa?b)@>D_e?m_H_oyx<Dy*dp<BEYD4_Q615>d
zgr$MiX&r_USZhEJ+Af+jVA)x;vkROPaOw~zAD-gq-U|C>itL#zv3s(}{t?M^ZjDTT
zj?U^GmhRl-_Vu?p_cr|T_4_szp5>KmiX70jWe!z$;fsh;;NX?ZG{+Axv->q>fSpx?
z9WLHj;;n*1yQ=W<Xm$3`D`lB3_qo3(?q8n1JLOeQLQi`bF@czI;le36zK`*7NjX|%
z;qq%VmwKPzyzT>@g#!w1o`WO@wXgH9{)?~j<)=f;+QYo_#C5__nJ;}N;B&`k=#=+k
zE<MK&ey>38mrwHbpFPGiCk)Ys;LMvLmuEN7^V{jo9k{SfqIu(YS$OXN^W$qc;s&}|
zMudtVzSTm94&C}*=1RvXjZQ+jN?guSEV=}Cj6DbU@ZbCoQ_SqnQO=*^+L?L8?5mu+
zx&1rMqFWo}f`{4l>_IYKlS=D*be6uw?VEr5BQxyv==UQc&!J~Lx-x@Cqm3ZrNUUSg
z1{}x3$h4Nga}}kGgM%T8Es1u}egWk>6huVP7vQ>tk!53}hRoi3|LQb1=#~mtDUi|-
z^+K$bpf#C{i}E~#<D?|c$&zu#OQSsi03ZNKL_t&%bkZm4cT<8U6|r=Pq>GagXbFim
zNJpSB=t!eOgA|%B0+lZ_Rhj0?hcbly)JS!2RZ+=1_|CurK2GR|h9m*24ZXy$-UX=~
zq9macelkf*UnlgU7%3e*N8z|Wo^QzGurVN7akmT79}uzogM7(dNuS;Jc$2ujKkxjV
z(--;9>5C6IqETRF2O8K$+6a?qtW~(iFzM<of>#6zC6|#}iP4EMgjc}Hby-?%^ZkQQ
zz|~EnHc9RHQG#NXOpwR%a|p-Zk}p}EV2wdYnPx#ZBcXw6X_K@GnZ6*b1Z}a}VzePK
z2^xct1|<bbDU?!pp37!U-akBsByEU)`lz@Lo)qaq3IoZb-OQwkt(vlrB!09uWp>tr
zPSOloKZMo>w%LFGCt{!xA_!A5RSF=;VK+&eQiC~03_5EwAa3&gGDypPbL_n=ZhIpD
zD+aB!Q)dy(pk;^>g0eFVk%t%(wSU|gXs)%<7^Ch=12kKD?)PH^j!*OC$!R|OaE-lF
zC1%EROjomvm!TH436d2$^+gtME^+PB3U9mtfBfQ3q1ZaS^#i`M+T^JyPp(?!$haYN
z5}Y_D@XL&kPIGMk9CxnobS!%zH%4DnXyIXei9eOFt6Cu!^oZB4a`AmizGHBpKp~SM
zm$8^)jfsbz<;ct-4(y#^GS?&7=yM~Q<mIL7gT=DSV5o(I=>CH;8NUVp$=CVKX9Gr}
z^W1#n4D0<2&mIl<+LHw`(QytIx}2L|C#zP;NEbinGBvh`Q@@(0zpsromrz}a->>5c
zh02Uj9o@tD1S~zE4DLVv;Wr7w4USBdS&E+K*w+<qAxqzrn2|~LkC!Qpj4?i0rCM_F
z;}&r@;qb{B_U;~IJlCSV?jr8wn9gxu?bFM=`obiKNBf+3bT@_899Pb~#gAXTa&K1T
z<KP1p_^mZq3vncAM~dap=XPkRdOmqa5=W9=lHe(WD;z>&$ixPf5oDBuav<<a%uI|^
z2n1ng37bS9y9m9GD^>||(A-AUZZFN_=5iP<QAqkxM8gQONG3`SnZUvG9fWeo1s*|5
z5Qi~@7UlXlo`cZ_8+8b~eYCbHSE0O=v}q}Dm4mPl#|f^8$%qJJ1dfvAJjrO@rQi#c
zNYDnfu^<JmqwrLWtJ4LPdbdw6imCUKPj=ZGL)%Im>EieS`CJjt4QcdxY;3J=Bp|$j
z_U8T{YICi6^Re0%RD9H9dK5|r$UHKJjG_Db9pKOIc}KfZCyHXS#R6zaoNRDsJ=}Ud
z07}_}N<mV|d#H?$awLcMjq~L%9_Oz{ev9#<;E|be4or@-Z?c+7B=cFYilpB~YmL^)
zK;|fr${E=3r&+U2i?vi@<P3r;fw6)lF+_1hl4z_kAS_Z?gp#SjjM{!)hIl}G;UR|j
zTSHbT93cmOK<Raw5;n0#&+Lwl9rvf&wi$*P1F?mEj9qU**nc0zyI-Ct0MY0{qX$7A
zk<Wqer7cyI0+pH$4Se?RcDvrmbmYSvMr``Ilv9d9uUk+E@@g0&5AhQ~)WqGgf+0S3
z#FlEU^<eeM!nQ`%61iiH5kmmu1;IoSMzS$Aw?j$v@S}u&zeT6J!unE|*;|r#u1)i;
zxv%pMi@*aKEZ=&A*O&4XDgk@ST?z@*#2npr4=F||jkn?YPEBqrjEs&jGcm&Mnj-5t
zxSoaBqvdTtQ*v=}d)DCul#Wt7l4GQx$OQu3lT?c?2eS?bYL<!{Qg8L}l}9aKVWq9p
zKvYSv0hk<j`$t6s;<gz))?j~?-#9VNZ+>BdJzj~q-GVpIwkUe@<bvH~b9oLQ%+T1l
zL3k@<(eW^=^EBdV#vaNLdMjMJvP{06!*eP$f+LI`%}}1qVfq{VKmV@->JWUc4&VO<
zkV?~9cP{dO{LWr}^;bU2%tVEw;}X}CNXJ1t1>F1y<<T0W)f@#UA!%ziOdXdsJY(=A
z_?Z%=k&{dx|0Q_uoA;dQ+b{h-ujFDfjZafD9@pciSe&l1YwCaG_WUOqdk=oeC&pI^
z%2i0uLFMygT*zg7tVrlfhfqme<>NaJuC!!bmz?KO3OuxgT;658+$IohmNsTtt2c<E
z4z1P_cW#_v>AqEi#kyoHbjbTIe&C}bNVLXEgK|MhgA|~w#6e)<7>h$TTfohDM2<z8
z2s$2+Hdu9}L;;?o$od{yrCIAJ>d|a935BGcB)H0>RQ1Vu7Da+i()tQ13>gOk9|B(z
zMwTd!iK3V=5d$y5%(n6OF;2eck;&yL)kc}9jFCh!u~N*fucYHz_XpkXKg_XkJ8AnM
zd=5VQJnr-^j<_y0r_V$_qLR^cyCLT)9&i5T6Tscxe2JRD%}!9LOp#cJ%(}+Sj%-mu
z4Y+X~Pq*-G2S;QmIF_k`<e7s-j*lFnm=CDbMk!Ql<a0T4zKg3AQ4-Tjdg;o0l3-05
zI9XD1Z1twR(IBk>B{3MJ5L+wriP6MSLXt$7B*7{NV=U5I6cSf5m@9@D60{-yK9CVA
z?Rz+AsA1S%pY~Bl;P$c^OWG(i#<n{UrmK7E$*1t2cpRB4(EZ^LF+Y6eo>_1k?Sft#
z(Q89?ld$>VI9R0y;si0s;&0ZjiI435Xt&WgvqeMG|CA79<Z%8O;wONp4Nt+}^u{>|
zNbG~8P50vt)E8*gD>OEs;<afS5bcD9=wo$6yA!jv?s98=gsZBGIA;0u(FSIt#Mv|7
zr+aIM&Guj9dv6BJ6kGUR$+)vZXLXVJwLC575hnL9vvB?LeIHU(axRrphFVDxcn(T}
zGMbzor!(^eCu^_s?i#@3aO?y}500^`rV;%W8tWTG>r1pZ?hqv&;o3Sa*`TqqNV8=~
z+yXeAwBec6AYI7#5cmiMHcFtKhhz=t04{h-<is2!PL+peD(se1_{n=LH_tMEwZTla
zNoReXuu-S8c$w2z8npW-Y0o^#sl$T!_7Avl_B~#{IYI5<)9gDj!O^`ra;+tT#R<;s
zJB;|bV?2KB1{WqT^1?TMaQAeyLssxPSjbVWWKf=qa9mWTNKmd&E(YYiJ~HYN6C*{N
z#^O~ju6oob_mQiPP}zHu&wM$?nv49~KiF=s@&rF<e}%mJB&YTjI8xYP^vVMAET4?1
zeE?d`I*rB#+T^hGC<Yy{igFNu^ymq}s4u7mKIM!<;0uabMI|f9$UdEJi>TRQvC|~!
z%`-Q5jg7`KK|Z3rw#e1LdjCFmjnx<_6%kV7wG`5oI3fltePak?FjnF^Y0oxCLaCT1
zBLx^uC+^cR1|=nd=OD2pQG`h>ju3b*Br?rrb)uL!l=K`yBpd?QAs@K7PAb`n5=~;j
zm{byDjYV5QXeDv4M`R3+l!L<Y;NufDW5~HKwNjPIiCs*Mj}eD`I&qI;d6eeH9BF3E
z^1<2TkGjnLX@2v+`ZYfN^fOFP&fs9_HoG*|>$K~O)Ys;SqaJULk8U?MWqjr!)#^0m
zQW+~0Q<Gyn_wXLR^P@DNxenA9FVSAUL9tN9k3*seWPg?Myk;_AqF5?Xtd5f{kKp)O
z1O}5N=uWZ~&<LTh#Hj>a*wn7yk{SkRjS;E5Q*pQHwZ^6yHJy;enj}f(kJcn$bt+C0
zd_)pE#1KRLZNOJzYxVvfQYO;t_QNYR?{#<-)?kf>D1v5V>$A?jeUzSkp2Cqsbe?;b
z#_88-|Nie2U%a$Mp6(%Qfatcd-8Q0Ff?Qh1CLAYS%-LKO7u%2U!`YhH{{8NIzXW_K
zhJ#{=e|VzyH_fC8A?_n7|D1T59$55Sw6SO<5OUyfCglSbgKxscF<vbD6kUz(2DEYp
zPo#F_28X^?^mIT=7Rb(cJmV{}wuNc+IG%f%*Kb8T+lrt4Hh-O6!z?>Y1R=e4mYW-+
zEM{_y?hVNJSGaLu`)}1FOd=Aa5yDMd3Mh$VJ^Ua?rCeibHv^(pWol226MG62?HZl=
ztGst(jn4WxuAHBx(YZ}?u}HyB=(H`1>j7;e!12;FqmbZxh>W7(Ye1u|A}(Zz+7*a9
zz#`l^&y`CPTzIF;v?x=SJw}QN%U9p#y%+wHSsSwwo?tmRLQwXYee)7GT95Gb<D)!!
z*piqH=3n~;FTHbwU2=qdhsGH53Y5HCO#5pbJX~Y+XpN^&%#*n#dEuTD=we+5mC54f
zOL$p7m0)=;IXA&e>O{Q`-A<pLwwSod#_D-)&)%fG`!gIr@f3SziX7XYC4RWTcYwPb
z?2A0{%;P-u^l?t@fpYT>7q6V5fBxeQIhh6XA+^mnuB}novresM8Og7c?Omqd$dfNt
zDV0l%6b=0Zik=|v7(7qoyCKRpY1bE6TDZuq>p$SqS(sgQ7~OZ2&z%}$y12@E_pbfL
zb`&y}yl;rKL0Ahq#wHQg3bc_J>7iT?*G=#|i|;uIA#tsy*Xh&k^y&00En~=-h)%ah
ztJ|kk)M#zc{g~KBSYnK@WP<?T&!Gt@Wfl31LdZeSAFD{L#Tr4B7&@_~ZzV!GbR$C&
zcF1`ij!Dwh*^k?%%NjCDP|OEZt3@icBHdP#Oh)24YTIr8ZwJ5dE06MvU-}eJJ$;;s
zLK=p&dKH$Jr@1~m#`UW{%~q3B2S#{%K-Bge$S^fgpjgP@xfY=`m6F50@e*(ncn5&X
zXRk0Z`VJUNrZh=6a%r?W$f!>?m!+6hl#3a%`7F}O5GFBU+{fyaP)Q{buA9n`27M)s
zF$ilgT5p{TF_1j6RpVmOR%5gwP7?Y$M%XB=b<-BK#w0uRmK$P-A^y(b$uyI+8PaVk
z3%6R9*?Z}X-HD`a|F^LSt+C;K_3A-}?4DhWoP3n($rBU~A7u5&5n4ZdmGB$?j=0g>
zB5d+LVr82RM6(68Dg>F-ctj0UJKN`(9mv;?^i90~u_cv0`cmNwN#70^jE49JBx-+S
zuJX@WGif#G1fexz(7e$Kuu@``gLEXR;OBnaf!D_P(@YU<N7!9bWTeDO7dP+-az0)z
zpq9xpll3Y1F@ES^8hOf{Dy>tCoO}BLLHg^bso$DmW@I-qH;q%9pjvY&N=@6FV)eot
zTYaQi;&#2kMr)LQ#Ut<(Ql)xt$8iX<8A_$i_ij*?EsDNNDO#endX{sSE^%`<qSFUx
zvb5I3BdrOxauhNFxDLonI(fPh--)2#Bx$wi>m1TAp=9T7-l6?hy!dv+;q1GZJEKgN
zcVXQz`k8>ai*Ix3tt%`ZdY&)-%yAysRU+Sdms>BMroX%kF`mWmwn<u}eE;-CSom!w
zvUAMz#~6#>W#jgXNb?xExIngd8@GFZDl1MCe~u*MD*|8QkYJM-8@B0n`h<N$XnmBU
z5xPNR^)3GV-@HNQ={gxFVoDUrh8GEXuTk1g)E=pFpp-D4+{A6<SY7p)Z|-A#7ay$^
z+h)k?e1sf>%@S%KM`g*YIy%12YI6d|S|$n}QW-k^5MlaA-NuA%n)N#MwK}tRLgrc%
z_`!e8{^!a(Rm-qvEM`yP25RF~y4TsUu5NkZI^{wRFDQeS5E+OJt`PVFN;!voMk1{w
zHiFm~bP~}unogwIh@oy2tJ1*<LyC<SVXse=B&oA%tm(%IMuE%(luJ3J3P@~*i~~vv
zj1~yjA>%u^+R)Ysq1MDkkaZ<lCGbMQN~23+V~kE9oBc%nl%+K&5+Edsn{>PDv|H<h
z-R*Xm8Pbja&B(^d8IKctGfZzYK&%8%*#p(e7)ogx8*3cewZPjv4ZKFs4e`u6p3_gq
zj0JRpGJQ7Xz5w5P2UOwPEU&Lpu1zD|970L_AcOKoaVX*vAx%V*2*PfUUbjm>3R7!+
z*FhN{kQgFtGH6y}212Q={zTgh{7o7}S-{vqHZ9iRq{PiyLt-tFwS4RjwnGdt#3v63
zg+dPUSa!2c4U4s6yP)v_j*r{wXe_B+qy`&XXvAB!Xcn;jXlq`ONU8@9lb_ke#)(H*
zf8uePKllOBZ-0YiFnewiw!2w218b{@pb8~{@C7*XZn>`zcaKM~Bb^kRe{Xxj+Ci<_
zKrP@Qs0zWtP<1@SKW3u#&l>~h$3fHUR2!W-5-Fi@9S@gqhd6K`iwdFLmm~zJAcGeK
zWC}U*g)D`9mU1CSDJRK^4fIBru2w|Z9MunTtln5CvXPtQ;XN}vw0DH5svwtau$Cy6
zXW-o}3&?li=EK~Y8E1DbLoOrn90@Wl=yzS8d|`wttE_X5wYfa?QVl8Z(AhZ4!lhKO
zxE-lWxC=&tr;r{<Eij2iN{#6E=ysYUF+dyLZQr+r4*d8pc%cciFT?2J|CLi;JIcvN
z113r<tSo$=AFo{|)2%R?tkZLr@z%b>k6s?ft?#1Hsj{B?&p7&}3(Vd5Q`XMC$5Qbz
zoNNmju2S6iHWyyIj9s|SJEz~fZ{Iyk9HC5%&|Qckj4)_zh{FgSB_uL~n+4CdX*F-L
zc;^kS0=#yb?uj-Vg(;+S8OK6-`=;}Gj9a8@ax|$>*;C{p)8YB$&vWL|3m<vJeW2U>
zCML6t)e20F<*A4qt@;c$u3(G;6C&&yrnN{C8I+d=&&OtF$c`T6@YFcZj!d(6_au{J
zK4pImI`6P_@gnCgU*`I?oyB}tZ#Afl_89kTXe50rfdJ)cAcUj~Njw-^iWp6!*TLvi
zmMD}<#xax}i82O98XRF!Rv?6f@jR3?WIPa#Ae+sQ&G;yp!Ic(AXoMqh9EtA<;>Z#w
zF}+A*fl@}|ONHpU)Jf=cBeV&5Kq2XeBaG;^nk=o%5w=!n)YrK)f0K51^9RcR|LnbK
zlU&z*=J`A4+%@;w3sqQ%g#@^Oq)3q>Wy_Y-meteU*2vvGYIit#W}@HCyq<`O`2y3Q
zz&$T|!rjx|)2k=!kkpoCtt3T>3rKLmLI4F+0kyBWXWs3cGcRt|0-!*Gw5_ld`9vhD
zP?>da=B<0r{XhTZc_1j~%vxt4EqFdy2QmY_9=VN$AeW%`1_Y{m->&><fuddn9v!@H
z9}^Wg^T-&hOVezvPV)Je&T`?6H~453;?_C^l`uY1B+5LNR~zi?^niV3p&sy^*9=cC
zy~)HxNUbu$^kjjV*%`tDMBQ<E-43ZJkcwRGGL92;md~U)j+a{@X#+ZU0v9G1v;mMp
zA(TW&h23>E8Ys63Bu2<QuG1DHG)8A=J0R!wVdwXT7-ERO4k!e2U|fIKL$Ig#c#!NI
z!q)E1<mWaV^zR{RQLX}c0A5gF;>q(AjvS%+^iwpy`c+!5zC!%R|IdAbBYThj4kFXo
zvGQO}Z6H{*%jzCB(Q}}ZW(HgjA(2Aj4^N9BhD7aG97bcTMpz9tS4)yYfK+)9=|sfY
zAw*5ZAX5siq*MqP9Vz2is}!p>s<kp>m5{NLL)ndR(<YrX#kdw%7V+I&wEDpva77ra
z@yPTDr>4tHS7N-_Aa^zxxmWFaZkvmbcX+H{WinF)u0&dmgTeO%#Zt)8Y1moovwHC@
zE+-RAgv;z~<ObG<Bg|L2w2v`5U*Ls8Xo1c&nJ(qCYBGaf^Uy6^zXsO<=2kiW+jYjv
z9^*$t){X}J=-c1tqoZv`cQk8P*O|KvKWMI_O_j5gBa~(wzFcmy9pt`mx<5%;d6{71
zEMueJ<-h*BSNPLIo9#2ARAaIfopwnLxqk~1haM*FfzB|Aq1A1%e0!0r2dZH~dIgpG
zIBrPb!-&s*wWeZu?3m#ENli&F<f@U$9L4C$XE^DehUyC(oek014OXvT0`|QWgpF`S
zhOvg8DbsVG$3I#@g&~bjo9^~CI-NV5m^sOrV^zjSLkh(To<D}~k5eucsni64(<W^%
zvb=Vct)-uH;|5%~@!)sWOkh+ha2;I7L6M>yNNq|#j_5}zUf`h|2dgBVEQLhl3KxOE
z#Sj{(6aq>`2j2nLadCWuR}2t+ONhZ!f|7Enh7Muq;s{7hiqr{N(x%aF)2MgY?0RT_
z93|bn6))SJDK+$?K3Up_^s`mFbdu3*w#anMib-hH>&(sXdM&tk6H^4GDvslzghDHc
zqg+DeA`L_)Bla!h<uVhMQC!ET*-N>&R)_cRa8Nkt&h?*g`|5K{jE>+;K9yhJ2T&<1
zM#ln1#)}*~J;{YPo&(+`a05ol9#d79$at*PO2}fBdsmMx@YXyq-{<kkJ}*2CV<RqE
za*8<3=tU{Mn_?Xoi^PiDLro}y)D|K0dYVS(r8~o34qPaKP!gmV2#KhCjU3FC$h}sj
zyb7naM(-*>O2M$AHpCFWOrl0kRjkAeX76+HMtjf|?GSEe?;>Y;IWD&^BF*k1eFiXb
zl0SC{Un-4`6O4>doSC6`?lIb5`YpQeyhHp){}OHY4NdlD+0rIrLt`hZ2y&s3y%xy5
zc588HWo@rcIH>&Z*$|Ld?Uc+5b;Eqo5JRH&D~o*@YHh(7iydT&1r8F0R2<UzR0q9|
z*Q^n@3M3N&h$?~SQVKn)C6CdH!$^=&Fda<NAu?S=+9gYOh_g?yV03&&t3I`|&q&ds
z;&)M52Tw+atg=1&{e*UGNHd+!mq?AWn!w2@g-PE2xR!@>S1xxS;<zMWy3o~wqa?u@
zLHoJ!F}{xqJRF%4KY*z1NB=)!@!B|dj-Ce7pr5@!W23{L{%nc06`$?JS$^Q10KdXU
z1XGz}yyoG%RrJUc==LO0`J04i&M|uQ3ft)p$N%EzY#y2tEFfKlR0gU0BvC?Y3|0x8
zY?E$%g-)|U8n@VL7Fp>Oc*}el_-P)z%V*L4ZzD!31ib|&p8vP7>wUd(1+zU$vRS0Q
z@d54C3(SA?XI%TsPkYWi$>|sVA^+r?U*_xym&VF#yz)kc%iSXV_BwZd{ypr*7QJqV
z?QVq~5g`0y)M_DG!b-i*()=c&zQJQNRYs(wW(7{{V|5LoM{wOLw&T%Bwpd$upUW5i
zHP^1gTJ$XC=biv*SX;da%Xjx|YMFs!ah0WrrV%GZ(qeG1+7QJt(oy)XgQpZ2L81+k
z49D>ZTp!_tcv7PPAuU2m949x=HcH}IC`ySh488+_%E;0#{dR+>y+gOP!N%HERu<Qh
z<6q*j^W%h}N4FExh*Ii3O-CC#X@ZQC&wK+;vV>kQ$<4I;U3RuN_mUK~>0?ZcPvMp-
zIIfTDx_Ci=<9bLd^Xij?Qqg5<VubOLD!%6vMVcq-9j+gn<?U-n;l_2~3U9pH;_PFu
z;kgcHpK4Q_JqPae-twJ9O@!^>`<7b8MV_kgqJYt{5dzP}u?eAok+RQ;nJM6T;I(@`
z(HNlF=|#ku#8N^?C%<+j2qloNgKHqo+`LLSm_f5zV+Ieb0h=p)A_YRJysEaVo+iY;
zs+tr?DR&k8b5BZZ5jOv1uG$YBhZtgrzhUfp9SZKRsKJAY+Q(VN418tx2-+@LOH+(_
zu+Wkt6t$^Y!trs+#~-12_6(ipKSy-w3h~cgCw=p+z1<2xm=2=jVh?()$%EwV;o7M0
z`n+~GNFFAOhWJ}a)IM3;XNY~Gmgk@>M&weqayNq`9mE6Uj7ub!*STrhI6A`$iS#9f
z5VBr^b_HqDqnETu`#W^%>vWq-G#g87Y=6SrD(1nk>nI#4P$Xb_m=u!E;h!NN!?j>j
z&|O5<L?kUpcRs_2O?3ZhmSq@~2X0^yNgt!{C212t74l}n0p91|{f7#w^Acx|6j|$>
zrTRid9go$_g{dR_#!-pyJB$@vtWZc55)?=A%V$|@Ptz!zq;hnIv1pyC$q|k|4)0t&
z{O{?D1e5I0t#{~ldUTTvWRI+IiPc-LGJhxUT6=rv@9^jsU*wr5XILwPe*YqC=5s_N
zU%;I$P!<lg=?Z)EKo|dr@BfKMd--!XuEX5BOMK_spW&2q$9VeOF~0KhBRqWy?pz&Z
zWvM`~JB8^wgty_^@;dcagfk&<ypWMlQZ7igI}w{*%Sz-h)44-y@eWI|$EHYV)M2dw
z-uM~LJ@Gt`oR~z?W8v2Oynh`wJD;a?`nNb=nxPjpSoPO<{~n^|DNW#{Xi_|5Q7Qlg
z9tuZi=r}@q3I#aiVjnuo3(<k&5;%(3T1dO}`<g5<$Uy~7NeOD88mSB>?$T{)dJRpp
zvBcWSN375Pg4^%xH}*aKa*J}P@I#j*N{KS)W|FS-No6l@Z&9CZoikRWvEaBwehB^u
zXphR&7&8;&)M_Jmr7A(OKrsvni-p|qJG1D-;yO?(1x!wqsa1>ku0y6_tXd>+Jwngn
z?P^H>#x$3j4PO1lBAB1iX+)ek*I<0+6kd6PP9HXw*J<r6W8xMf?J}WTj8B3m`@~6)
zW}^=h9BmjYyKuIA|6HVy;0F||MU*1}7b#Ruq=Z09ffQh*9f%G&WT{5$fu@o%U>FFA
zkXOru$}8zo<)TwU3_6koLP~^?drQ!s#YsLG12%8N8WOc3hWI7I<UaOVKB)Ea0g<5)
zhk88a#Ws6?MJ>x7$`i_0KK_weg3%GmCr{IT@+sQSK11}?uMl6kO7_#AVVXO6g{|8}
zgaJ6aDv$?eWIu^(iM@}HAaC#A(<3p%Sa^uPl|*fbPeas%wg_tx#=u_Y7_1bZ5NB+1
z`|4kE`|2v&U;8|9b_$V=KsUs08rmvBWC=QH5!Y|BvGOhpOK|DZC;e3go+D7MKuU`h
zHjjq&VT)`RY>Fog4k=1EG3hG()*?F_E3B=htla#o9HSE811V$%s~iNHtltE4kO4jo
z(_d%wnQ@K<@ALjo{=>fJ!P<5H%?IcBM^2HF8*pqwFkwPQDrH70A;pr1qa+f6=lYZj
z9)YM3k4&?)qp3G<(c4%gt$)Dct!p&59`s(9X>HwNdET&@-eGHNjmS7y8PQt5!TWC<
zZ1<Fia)C!`OLZgw03ZNKL_t(fxI9ri%JnQ_MUN2|3%Fr~V;9Ndy9dhN$)4cp>EGh~
z$u=$P!nd2ijZb$tD~pu<5Agd6yJhLDT%@~tk$!y~U$!ZG01cL#eI~S^7`jvfi%UkF
zChTMxb!+H;2tg0JXA(*-Y;3{h8!&omj-ZlIt3FHFGh}I#c6yS!f1V@LGkA_*V|AOf
z+qj=YYJ;Qmo0|+v)Ji@M8E8Y?i-@BPH?YL1A=MJ8JRFtcOM$0EUX5`fwGy3zjt%Gx
zPYFU#l4^@4%d1(f7OnakYa2IMoS);`(*1`@D~)n2fh#EaF4dwTPCUxKPn?8gS$}`v
z{L^0fLZDn16$BKeL$9Q9Lzl@~nQE;>xm=)7E>S6$saA^k#UNKY%nVWsJjbCBI22ul
zYc*0xlrZ=*qvC2N3X+$m%e2di)>go~@4knpzei?Vnq9^8a+^YRly+=c+G?=1u}!<x
zpi$pq{r0<DzYUvTzDj53d6aVm>G<?|F}-#JR+kTnhzzx|i|bmltcy;&SkuQ^jn<kp
zi4a<mT8l{sEsi3eF*8VvI6(M>1u64tno<MN0C}H!+wK^N!48yR4+c$k@cLmkdx#-^
zS@F!lIWj{&c53WCS$i;3+t2UY`?hKCs;C+A#E$tCLUaYcKrme(sEtrKah&McXXwt|
zqVu_Dh+cn#^anr4x11!1V4yTT&<qd{LC|)atfjcWR3U~-&=7w+iP|uO@bGJ!##n<f
zxjE!+&-1QPWG+o@KH-Rd$U8sykQ>V{@mo)x;`rnU6D3PoMkr!z+M-|oh{fA0y#4xM
zcI)Hd2|@*~%qtRNPuKwpW5DXc7q3F6PQTwFO+Ad>q}RB@#?m{?&o_AQZFo4IHV#Y!
zQ*g?o=xx$ny9teYP6m;n3y=vcDcFM~O##p2f9>mh<BKyqS}O6x=ym?%zuukGS%-}c
zmUdi@D2+*cila3q#)?dh6et#alp7$WLJ5tsDKhgI8=c_M&K%pfe!`EM+w|5iaq-P{
ze!BUf&(Nmby2+hoi*3EetxGWX!0M%@=x2D2#Fvr+JIq~um-pVv=-%kFJ^w22zH#vN
z|AgOoW}I_pBqzqIxaVKu5C1ohAO7fjtY7@|hd<x8=ec$36<&E|j;mq9{PoMc{n`re
ztijP4*cGyDC4Gd@D4RfL!IgN@kYpK+$U+S7T!G>^jE;b*RG2v3VtWnV`uQC;7Vi)^
zu(mbM&sSciJ3Ymd8+|;}V|~5D{APOJTTA;1Sq#PqtRz<uwT51j(uy-;D=E2NE}Bya
z2n$(0b6_*HG3d;am|VHhIx;sz&Qgq$NReXFKHW5;-HnJFTP%F^8t=|^9(bstUXM6V
z@cmp$9-|Rj;|qt-FOrxPyuxR??A2~NpcE)+DY=re=TQn=LQmnjF2%s5S_mkIKCUY<
z797vTQ+b66KpRVxWJs+^qKNIy2HPuZbm}dncBllBwCHm^a){o9Lir7FN7(5K+^|7E
zvveX&KQ$y;((2|b&2`|t3qR!esV{Q6FpUZ|JIw~SSJt5Q{vo*?flO2C^)_4O7R`E>
ziS{%>Ws9y`B1#29bkSCzr2^?-Y)+-Dln4|^g(SD)kWwO*GpL-2y<o>!o2$wh!$5^(
zul>{x=-aMxu3<PFGQ<$S)V#B>1NFmwf7o53W$h=#iIzQ|M2y*c*i7HwMrl92zoZ08
zL4hzR(63f;D;3<)8V%P&_j;JuU&lr<6hm@(U@>@40$~R}1NSmCdv|guSAERq)Qrt7
zzxD9U7~*dyQ5)jn7dMNwdhk#f3sUS-v^-!@n1|{fY+ZSS?_SaH!YRHmnK7C!L*p7r
zyH0ZrF4Q0LJ&6QmVr&{=bUqU!Wr!-Ar966X&r?o<Ha17uDG9Liw3dIw<qzTe?>>wb
z@KeCc@YUmdekR~#)i4pXP`%46UR&Y9FX}Ayca48jNCfxmp^wAZI8UEG!n03I@k~&F
zYl_nxAc?n@SwHQeog$;<D$~^>;}wrm=-_$*URc2MB#v&8v|4mKO-LG)?M)W0yvgfV
z;o<`bnmjqf(eVV4ZXw#QvbYJ|dAJ=PT-2W+AJp4rZVNP4C)sua!p;hD=Q<x=zK-d=
z%5<2q`7V5LFvdJpW2B^VQ((8s6VFX>>SUE?Pqp~}{`kkdapB=jmw$HgJ$4q~!;NA7
z&VJ!>;h@_<+(su6{k}_CIfR~~<XSu<!JCAMFVNa-&@!|5&N$L@FiD4Zw>L01cHoU2
z;3SMc3Qr#8?AQq1Bx9{BSdR<zo$7t>tDkCOEifoD6Vu5gt}Cf}65$Gzs|Z3L$Aem-
zKr7T(Eg*@>OiFAt7L6kfR$3CB5oZ}fx`-@;UPKxtbW=@i6&pzbcra0m6HSy_ywuW7
zQ@U|VY6QwJP;@<nFgT?e+197O>@ze*r(|h_PBT1X@I41tI4CP{1h`7#c?!qP)x$hj
z4qB3Pf|F^3F@i)}k|<?oyT#I-W$xU$L!%o}DpqhkpCpX{mo;GS`UaKpJEXFVTe0Al
z5N;9Ibtw^2ol1aHz%4%b5T5@^mvD3gCyZFz>9f{7+>5|*W9qFGYg%0T5Gqa|FZez)
z!o!aY!tWrR62c9@4Nz`?aDAk(C@DZWSd(D~Es|17l-xI>6~-PA^_CbE27$JDvTHA5
z66DpmLAq;5)P@-1ml)2NK`XP&rTOiE=vd3HUHt)mBMyc^?9GAMK?jeuU=%iU?wfNn
zhP_nwr%sXq%388|lm6lo$<h*bb35O@9w<&*nSUi0GRoT+#a$J&yXfZNIXg%gSuDbe
zym4Syw-{nb)P4<CHlxwI-XRBCc!U%vN9M7LIc&MPH&=5yfB4h9X;SDoa4UeV)*v9g
z%|n?!nI5{=px-IdX(xCEjWiOg%7lenHh#Zx%>V~M_`U_*WM_MUW!0gTyv6n{c;lf+
z8o+a$`5(W|xBkIdo|%fNMYrfLU1n(^CSGb#34lGX%NPi`zaO**Zkr<O6m&`<zKs{(
zxW_WM!9rwlYXRfsBBgRbG4OC*l}ou3p|T8{bco|NJKIY%*WP7o;Y}{R3LobyJr%}`
z_)S_JxOo*UUjdGg59e(|O#?nO+yg}I7V|$|g!400RfGDV%z628cKE(j9mmy_OFqX&
zW5&W3y=0qKrN?A7`E=);KFyWwVt%`sPAP0(p?7bAYipfmtAp^1NU87~h39)zgCggr
zk1{bcPFdwGcve{2-8O4|g(-MYKL#TXOjTgA#+k_~XR0p32qZrJ)J0VS?khG57wNbt
zr3pO`uTUfm9X!*g;Awov5;_W_T#A85x!?kVv<FEqMyC-`)~D!#bX_uQiBnDBc(__3
zQVB+(9D!FVQ68U#I~xzqSI7cJ<W(Id70Pi5ONvYgh*PpG!YdR$lgn9}w29-<yb@(C
zf#cvg4w=>@aY~xR*n!xFloH2v@EwKkDwGsx43fOsl%$q!H(`Cd!~A-So9k_~NEy@M
zO2u|RVs}vVojWjoqK-crF)>!8FgAk<s#qkl+vZ3l;PLZt^%mLKC><NJvfV{FntI=&
z9S4{M?mlkX#8{J`ha143U4+&KoPG8?RHvH+Bac!TJxXzO7Ec8T1k#GU%MpuF5*Ig@
z<=>lWlVB{y8nn)GIe+D#91rDqd9_VS%&sz<9E3@OwbBU7uHnZJLk#iDh-cXIKoh&w
zF?;t@hyBi7njM3$_TW(30diy^7yS4PZRaM7>8!3&zdlF(?F+Pi@MDr6|6p(X!g2HV
zYnuxe?d|`b{>4LTYkNF1FRn?fH3%(-siGl<MD14}dQbV$T8l7ZaIwoh9}aowdQ=2P
z$i*`TUuP!Zv018*lsOp)LNg0zdt^x$(_5#pGQ!PwmmzHfAETC-Hi(+5?5rC$Y=yM!
z;maP~PDYv>T%;yoa)Qy(KC*S0+x0ob4y?_=`h6Q6C-;527bVUdukpFZ$9Vb3Hr{H3
zxurR7Z+=9-+e3yN80@n7DW}Xm9JLK=m)XAg3JaAoj(Urmb36A;Z}lKfah1aLRjy8j
zMp_F=hqRy2%M591(56SXv&ogY_xSb?4?92-rpI6{FR`s&*~ZMCV?8S8pY!~)y!_la
zBYvHW*Ke{~*FX(UjKFpimgWb?Ic5Ic+Yfh|+_*&2TgK1kDYRCo&%Mv$^{dQXy1?eb
zr@0mQjLjV9?1>3HSF^dkN*q*~Te#<Z*jZws-sFke7#K~O_K`wUDM~yqV9YNuQuL8R
zki>oBIHjKfB?q1@Lb1SjG2}?WXELyOWC#U;3%(21SN9XOfmn=mJc>mKYXt&N((Oj1
zaUUH;kY>5spUQ2;3YnpwXi`U$nLe#n6X{8+u8++OX=Vur#>bf!WJ2Ofhf?S<UK{(^
zBULOF@RTBO6xw%4w8YQyxwj-sa0Gac`|%2@54yy98EH8}g+ApVps4btG&LE`UJL6u
z6pIzoGzJ^yqCQSO`CyF2nA{lJ7|3Enza7zS^@w_XtWD^rF^#N`i4*Ge?p}hR3v6Wt
zP6jm!Bjb!s&)^luh>b<;Y%$V{dHnb!SFeI6cCfZjoPm%&+HnYqHQ?NRM6Fb+Q193S
zi3s@da{hRMS2^{24bGgeQ65wHzK;qD7z;Yf+n60`uqdn*d0VFtxg~-zm@LH_ohPo8
zkMDYTzK3)iq*O@d4caI3<dy_5HWw)QEN<jO3^BxKBx+*MuX>k&340fh*(W-O$v@hC
zawp6nZ#@`b-BV};IMDw6Fvy}F-PJX=uUuv4^`F!E?)OMPytuc`eBQMHzKalwz4Dk4
zcfZdAt&ZXzvUZTL*#onA!;0DvL!$O8zp&-0BRwE$dAVN<<}CyU=fT6M-WW`sg5xJR
zF<s;2NXS?<V7lrNcn+Qt_^!nfedq;j&c|F20v78TiC$sr&OAHqL$<p;&t}20syooC
z(WrQYsztwjhm||K6mJSnp5W}Hq+(ZzH*a%!ZkJP?2hNaZvlEz_;^^6sX|=)12j635
z`(T#)8qGUzQNO&-&ek@1<sB|xe2+`lAQI=9oxaBQN^)Q<u9-`F--p-u@CR#nw?f``
zKH%yr_ddS@jTULOk4_SjB%<3(G5s!CZ<A&#rEg03ML|()(CzHdPL2W}9hR5dBWXE~
zvK~DNC#!HWgGW4`dc4ONn{?(2j2?ZOFPuNlWO1F%rIhdg$vjKjpY}w#!nN1_gxC9T
zF|QWbUV4><+pxR}AFh0w?G&li0?r&S<I9NdMwjgv0`9GVMzlK#jeeg_uSY>Q==CjR
zMSATnAFcGMRmPc~9HkogltwCy_6<TsSZQ&sWlSn&%VoyO4xJ>WpMvs3M#~lI&HHD&
zGLw;EFpk2p3fE+a1ky;;h`MZV)~QrS2?`!*l90qPanvWyBD4S;59Jof(v)5=B98i4
zqp{YKrWu_yLkLOLFEUnAB$evN9;r&8D5%^bIszPNafL?e1d%2vYw#WKGhg~~mQj^Z
zE_zf0ADv}vHzFF%HpZkB0*_iHAS-xiN03@YV(lK0(N+@28SPe=?M9teyFt`z&}nXx
z>?}TzqWGl|O0`jnl?s(giDIovVgy+lQwTgJiXm5l_dkNKZQWpe>QSoGGt`_KnK#8d
z-%7aiUsl-_vY85Da_Ts$XxX~iz3)tV8z^kv<T3TTxSosWd3ZrUl4|09CnsTc;HPF~
zZo{NC+GLnalOze~6yMEBnKUUb0^fB}j*E2NJypnDEjRx@%XFT^8DfYbehH9!(jU8t
zXS1i+X!pq31GF6vRMU2qTlZt4`(*yzywl+m6Jk-9_MIiRE?#8kr?1lc_Fs^$%pYi?
zKCo+908bq-yXL@P-97UB_P|fX!OtM_8CmjHPs5;tayY0q#E_`{N;9?mA~v80vbJ*1
zJkdca_W@pN2Am?y%<%H#$9VCP5suX)1y|#cVKErtqFjf-5je#HwPY010%6A@g<z*L
z&!u17n;Xy3U0h%(>kxICR6>bkHfV1(_+WWI;6FR=FcWl1>$h3jBWW)H|D5VKpXR^&
zTtrnY;+sBWevBK3+$tUCzkFwoeLcgNUtGVznQ)!0YJ+t179V^dsB?y=9;-1?^yw{M
zV0EuV_c5(ZYd3gj?PCu0twpwq0V5Tck{4mx3G`QJtlwf~=O~q9vmBdgv9a_93zu$i
z^Dfnu0{J{$NM0{INZ>YLy9L3Z(wEKio^%=Ws(3Rm@U5@B!0*23QB6PO!=H_?{Q)ff
z;?tigH{bjzH{U$?lV{;n4T{&GyZVq@>0+ZzdJT=1F_@Uqi5jDYCYv{5pMHkm`v~a}
zM|GN=%dD;^wB5&P_A+iP?ck3Zp2ad<Qb++~V^zLf8zagRc3OQZUV%!<CoD*;E09{^
zIfBfONw(bkuLP4Ku=s((ScTReQaEVar_t}Q({3{v_fdf$i8Fewgt(uO#u<r~7#ZLN
z0yl|B4MbX#+1y(zvzpXEq2N(2`&3JcPQjzfgKNvWyMakNXj9DN29r-mS)F0h495t3
z`B#vCcdAHL#B)4C-@^z?L&x+QE0}%}-*E{8A4dtYINBp1o)_Q+0jUu*TU|Cbw^`p<
zV|{a-&CNxUoyCvetrGZZVAg6ij?yT{C2%F7l2i)*-fQdIbzT@B<?$yUr8+jvQytCB
z^eq3k^0@FH|4(3zW2a9tF*{44Z`o?6uyMbvtQ1{5Cq*f6rO2i8?VwtgWx3}aVozS*
zWC>Xo(~A<?oh~BkFj7*u(vUe8?HFXBP>zQjv`XrM2nj-Btwd|h;Z^)0h8W_nA7;<5
zK9@$b16lrkqJ`L>Q@f9`?HVHH#%B3zr3J@g(|g2393Rw!*WR?-p?>ow+wZ+c{pWAc
z`{Vygl5XEc(C(&rWo*?$coM6`ekoAgR|h;qNLJkS?XKx{9@d$mwB8UyqV}r~4QPZl
zgQY;`DnrsBghB{6AGW{ma?c=?P;xmr5^#JXWVR+K$Osenh<kk^EwReSHz}@-@svkc
zE^(x6C_CHiP@uQbW8(p`jGL=lG+SF#9OyUmwyAxrlC~wiWRupNgF=um!tZ~9|Kp#1
zj&HnVsG6&+&0k_|;Wj(VU3OfDDRu=cz66gx&dKQ`G_1o%?ILknVrM2|v{+(tR$>}W
z)+RZum-5pio1=cI!<A&4etnd!LPp%W$<o|Bw{4Aoc%n<yTVrYE20wfs;3V)g)W%>`
z!lZz(3tL_I@Zg4@2cGA|Q;%}&M48d5M-WIxtD3V%B#%$srqs9CtWHoUQLB0Ub<EC;
zzHox4XDf($pQ{&FS!+E^(le&pT4rf+6IY}(n=zTqFx`9WAVp@%MaD`VBcY+#xXHp=
z#7glDs1W6b#F1vbnSk-}9ZNBAsg-<sse`s2W1&wFNVGLrYw(psT0@kj_uVD|vM9!+
z388Y)O5!LNS4nh~(rNXH#uJ3KD53JIOJYGQr13y&JmugP6jEjcLgGk=B+f_z4OUTb
zT|!47Nsw0HsFd0WG#?<cv%Rs%POF3PN9bpgROhXfsg*chfR8|WpK%E+K1*f#B-L7l
za@i$NDZO-)sDGR7?Jgc&lnMyk0M}Uh<q}!~u1lp@rI<pL8aB3fSX^0RZDo<$s|zGM
zpG-`8oeiRX8+3vrEUqwUo8bt9?@C5Ss=yb3HyN$Xa^{g)9zT5qM+lCONTzD1vHh>o
z-dyF{5B~)-Q#B?gN~pGms(WbWr@abkuZd0i=q!e~OByBl_q&;M$c?Ylj3n;U?$+7b
z+G2Heovg9Vu}O~;kDjBfPT+cwqz;bjBOM>*D3s&iWfs@-F+vb02?qvThZtgrzwv11
zVD(Gxk(NE>$9qW4KL6PzL4)>3A#>6r6u919L=8X&es0}y50Z9^`rI5lmo8KP#T&H#
zuYXB$U{|{Y?QX7B!`4c9U%uny0!C8YGnaO_m)b6kv*h~R?0rUowPv?4IK&V`qV}r|
zn@i1GyC-dHWG<H>g+M76<v75-Y7Y^lJt}DjnMMe!ag@YY5jNf+?yS&mWOPLV-&X`W
zrrEUg(h#qtD7g+v=nxh^{@o?r2j!&u-1=ya`THnj0%L}wN8#}!xvc+K+9F-J%}O0~
z_!XZ1A6{f~ZH23=lgyku&Wq<JnI4gN#H8^U#}bVzpy+PXYQ)5y&v<C7k0FByvwr75
zs%?$V<uyLM3><-)fKeaLhpUKYMsq!8z4;t)0>1cLeECZ!IXly4>7z^hw`+^gZ9zH#
zd;_=utN^F^$N$Sq{N1lT%j{(SH*{nK$xT}8?@+&fh1)w51QW9ueB5A$A`ABr-_H>1
zn<l=tNYNpDn8J=9Qkn2clMah35mu*cZ$O$Jrj3{3I+}tfC^$Zje3Y<ks1`$va>;bS
zMr_F}6oL>(ShTTdo#7~l@rq(BbnzVM^m4Q4Qjp*KqzEa7HQZo|G}>q2&CPXsoi;uN
z1TI1(7-NW%j7(dkwgd4Ai6azB36$?49F6Hk7^%q6q)1#(;VXqrvs`)0Rk*Ien3#6A
zi?R->b(lW!6u0Y#8w)Pn-e6_BkM?7bK5=45jYWC^B?VC`kj>Aq1o|&>^ttmqdh95Z
z)e_~vA?<Z(r!H-^i5AQBt)|^*(G0ior6f*cv~s}nNfSX7W%Lun`o<>9ODo*Edf}mW
zzrDVitD0spuGOe4Zx3~mc%IAHXc<0#3@*IMk%=NlCrda7f|i*wJbQMQ-+BHF!Q2xR
z+$1NKI)nb<XZ3{z_(HSGM7N1lF2ajQQjJNI!K{hEXp^@(#u4>qgXN`pZhmxuSAKQ{
zfUlm1@@N&WG>Yp5xUP%q26#n_=SqYl$y|Z!=IxJh77cGNLk#gtPCFY*ZbmQi_4-iZ
zje~K+VR>i<bE;BcJ%#A`2x8>!OTz%v{@R;%+BD{Gv;E<RZ2j~nwEoq<BISU;**#zP
zZ5zj+79xBPTy;1}J7o4mJmCMkt&qDKBpHHqSW_EfNYs8ER<{gobS`bXtAHdVpioMo
zlsr`9k=6#S^+i_J#+aS(sRb^s+C;Q3QD6NNZd`*qtuutxV^oV(v?<b&g3ubI>Qe7?
z>HHNF&i5}t--DYkvUq2bwI|9<`}64fHQJlYthG+#&d&1UNT2?y;aJh9KUw6&bcykj
zMP`!J_-G5tM5xX({r)PO^Y`w<170Sdtjgd>4UWXnz6v*X%Y$W3oIlO9AJGr*aA^UY
zQI}ApG<WC2R&({rW5=NoU1siecz5J$%ySB!oQ9J}Id^7?CujS})n%Alg3hB%e(5p3
z@H=J7y)tk9`2XeRLdwyj4v(Lf9IG^mVvDC5^w+QQlVAKXfAOccxys+;n}1khc05L5
zslZ>Es4c$p8s6413M?~UKjc0q2g>CDD8?pgjE=dq>f0>eNk3uh4cfgfX_V5HMSOLZ
z!ldS?A5f1X7HtATVWr6hLL8S&3p~%K<U1%K@PsAP8EGaF%Ek9RLeHTX_&B!3Bc~_1
zae1GpMMBcohGM1>Sd!SFtwBghAq-KjBEKpOzMG4Qq#8&Kf)tZvWLQ#}d#SmKTteTK
zNCmNu(cK7yC9@?;g>hz%o`Uxt-~ewTHd+ZzRTKCctMg26sTiQGBx@(whnSPdF`kqE
z=^3WZo#3g{$C(|kQ3@r}YU(;8_Cm5k4UV0MOwyAM5t2?4V`GJo9yUqI(u__oBGH;g
zz0TU&>Zdwy;>;sUL8mD?>7nBuNDoJ7TqP;Ff@jK-_W_ZvpwgZDwo!0m#)}E1f=74j
zJ&f&AZ$OZ?h@bvV&Oh=vg^>v&<FV4}b6mz`en2NOSlLFY1S<!E07C7WBVn~B&Qf;T
zT^3f?c;$^NgRI01-po^^&LpXENVOqOHJ-^3WJnCgB$zb9rhT%wLl$+1_m&}s_$4B-
z`ILqhxiq~d_Z2gCx7zdo(sEF=Lky<cgaoO;b+J^iZ0^s6WrnC;r@Og9)M&8z&bw@W
z@B6g>?Y|*|yF^0njaTyLs)(?NEqdTN;3!1y3vzJq3?4$SL=66wV&8T^ATU5`4c#G6
z8)8V*ehpwP*5re?X75L0VDu_cj>3`o4BOpUf;o>53qFM)LFtevSjOzU$&IV<m*0h}
z%mF=~eBvY{BN1-cB520cS!8=vGk@b@-r(nf(VP^q0NnbR*Dk?NUgu}emN{3g@<RD7
z>R11i8<!Ti-Tf95wSaNIN8+!trY111#4QAP1%*fyWEmbBne~xwgrlzCvsOL_e1oU|
z@d?g8lH$cXWVS$1Y_hW^`OY3uYct|oj?^6DSxJ4<(C(!aOF6we*h%@}Ucv2AXdQ<a
zN|3f-?R7TZcPKB+bLa9Mo<8|`jz9i9Pd#&rM`u8;+`?Ojn+qRs@xwPcKDxzfsZV5U
zOiW5tx5bT{xB2!0z%7=SDyT@ay}8EWq4hK5?UoVn3ir2dxxjD3qvLo^hnb>aya*zy
zGS&Zp^^N?F;MEFLiyp!zw03$#5g>dDfkV-kBoD<ccGzk3SZTzRRKQp`K`1kvEElin
zb+dei&Gp%i4OJzW9;q-nQlR8O97VMI30WctgMdQ8#d8FXGI%N@Ehp5<cc0MJBgZJ!
zYB&;-UY|J5u+k+ALU06*>mnS5bR-4W;weod*7Q?N-)OSTBAr~qT`GlE7U@bHmCr-<
zx)CNyaeWU&K&?_hWfM$!u>OEf)Ruusp-{>}3Y{lig&;~zK1-E;9N{ejPr{j_Fg{MX
zSY@_a;>=`?+0hcAW9ZbkXtg%jZq(V?-X^s%R7Y_O)0F%&)<h(F3z;;*#(+aF%21w0
zYiPCG^y)jGYPs=)Fwa7#G5vlQ&-0PWL&rU`s7<%I#f^nI0B&CW9?NrIV{Gy`luzY^
zFa*o0001BWNkl<Zx}UJIa+9sqn`~Tpk98nrf!n~dPZoLU%TIIe>6aKkauPSF(TxqQ
zW}B?LgN>VHSr3gy8G%$e`4(zlKuI9+{Q^@{kMNCe{sEpFGFq)MGE${lE2F{?l#dZE
zMjO&JChB!aGH7>tw3=INZLM;B_0HeWf_-QSV2B}xM9t(~76;oD@BRMaE~{LW11Z5#
z*s>4p5a?rpcx8>vpZ|j9_3L!6d_?z8zelpMFqn_Kr)qW=-ztDphO&qCU2qgAIUs1_
zQ<Jp&lh$I_oq)_hY%Q(fS~0|ssQsD{H9b&D!lDsK%V6Lhu;Kv{{TlQQHZQ^j*}=36
zY!%ip^+i5<AFl4bZiUNN6ywJ$)Iw0Ei%u8VT>4m%e&FlC%kVqLId{V2bfH5bnWwk-
zBi{P+3v7N&fcleL@Wq>5%7t}SKfJ}O{~rER@}KyP-#E?I#BKVk8SgLtKC{ybDIApJ
zqm+ZlVr<$&WDzFa!6paW@}2_zkpKRF{yo0&tz(=$wMM-14h!=w8oeG1Np4iITU>hY
zogXuPzDS@AwwqVa8WH63;$?C@x`UX7$w&CjQ?pDKx}^O@T5BtOu-Kwno#GEa566zj
zjLt%}>e6UClnVeMAFS7T?D`y=ZUn`nJXHuOnr`mT4Zugd`syYpr;04R5g&f6U;16X
z_~cne%Wc}Lr+MW+|IvZx15p2nm%siw&OACr;P)tn5oM=IcO7b_ZLThE5=9bUSR@fq
zH%1S3<&?{~UI~%)_x!m&5xqW3QIGM&!E=1PVn~=}6e9yQLD361S*s8PK9iLKCyrE^
zsQHj4w1lP?Tcl&Dx)8Ws;<QbtQ77(hP~Ti&Yw2#sxY0sDt?1!sO|PZtMButEN(qd~
zrQEgASOi8oWU(Mi1VLCJDEhP;9pX+Gt5b}t&>0w`Q38A=@s&#|46br;g`gNX5W1AA
zu)cZt@>U8wDg`%xt+ptek@WlMevIhW5xv6(+|I$wW7Hm*;l$J!Q{z=Cg#b@F_@1N^
zI5<+W)97&R`Yjf2yv^qFMbdtr0v3<{CX>ge7#o?vN&BRmhOD`b$hufnM0pO5)mUvv
zlZ1~m?LG{hevfv$LBG?Y+irl-7z_1gljYmXT>t0;dh_oB@bCW&PCxczGC9JrN4Cji
z!2HrWZ@={x7v6e>d-FVxOm=zh(Q%%8`XonBJwc&7N@`%Im9VzH&GO<BJDV#cy*k#W
zVC^9PED>0wl7ybm)aWR+QW0Unb6tGj$8qyEaL1Lnj*C)?G}H9jZIU=9$)MisvbwU&
zt(zagjko@WNZJrX3~?AzYtZ-ES?_bOhf8q?jIen%Op2UHg)YQZOcEimWUv05#^x5p
zDaoxX_o+CFdma!XWKPf+5Hzt%&~{rLKLbe<hkV_AXzYNv4vE?jL!$QULDY;z>s)jp
z_ad=qX^_?;q&TEa+99v7^nn|!y|chiR%@IpZ9^Zf+$a3D$krXn77`xHqW6D?&wqt4
z{Ql$oz0X%UKb}%a*GV@kY~5PtT=@du{m*dizTf);;P?2SzVtFLyrh}d9*vz9;;}!2
zRe1gNo4kHtnH#aWV2V^eO1elTu_8gomL&CoBZRC1Gr-^H+_%p2cfLN$Z@&<5dVHF?
zTOeAm)9D!`_HHrmM#2wYOE`1nWtL8!fvSS613e2OhQ<-tK3Lm2&ewkTasKHyAK_TB
zNo#$C`OPPZ9XMTE;&ga}igN>}IF9tj(Ml1z03K&6mTJ(ZwR($sw1kuSgyt6WbNgFg
zn%`z={xDts-(=+P{saE$w_f7K6E0O6+?jiZV*9K7`JexI@3{WKKmQG0dhrO8<%Fc0
zVr@bi_qe^hjqNUxbfD9PZU#a_FWPUH9UHGws+O_+K56eEy`_w$s1t0K;CTTv<0VX*
zVU6Ks4ay5RIa#7w45$`-MhXhYW+W!T662^YzG$I4bv9Z%)SDYLc9!XEU1oC;mhTZi
zamjFnAyAUQb?IR9fpjZy90!9X)t1aUSm~pMi_nIVP~is-Zj!Lk?PD`=u?Ve+qlhd`
zaRt-@hqg{J!k|qG#v;VPQ2y`(z*q<qB}M34n#~Tq#tu8HYqZ)eTKzstca{(2C%yuY
z9p~Ki1gEA)IXYIRT=a2WiF9&<XDPu|f_^55jp52xo5tM5gS*6TZ%{a67%dkO+GS%W
zpwsRnk{yDQL&2-${&i#+n-122^r4rVJFS?drBz0&B}|s#2LZi)%*N&x*KXb7zkTPs
z`<D>#-Jje+2bVa$*dfZ`>aBTRed8V8eCO@^wms^?sd1OH$7+<uM)!Xnc+?6<a4hIF
zrk?iDX_f~#(hd^Z0wo+Ar3eCx6(yvUxNe@rv4Vm5tjXp0wIxndl75PmmL!T<+uG*p
z<?H<Pr?37^E!M;P)eu8G0FgFmW3kHaOZBs>geX7x3KD=d141_-PfB841!W&m9|g06
zrjNM#{y|%_LkSZUv9gFLd00PhaolZlv|^W_{naXI2Y=z9GNm?_$PRV+hZqvIUl*nZ
z)?&oK^xEoy#IzZxC>=)Byj-4N3P^fDN`GaO%O4+kbC_(z{rF$uOJC=o{lQCo^UEQh
zdkkhAa0%%wt+VWv5$mx07+kwc!hQ@m#$$hQl$V~X@Wp4K$P0{#IeP1V#+83@FR?2i
zJs06fgv=jGXpC{OjtA~6rJ29a<KJ9k^TQffPafwB|37<g79`nqpZWdHId{voGHb8u
zs_L%Z8{GgJ8%cnx$PqcBG~*d*!Xq!T!yZR?iJ0)C!{Ika*kL{R!S*;Do*3H`l4B%|
zD2=FvLva-efFMCM&_Fl3(fd;Sl3BUlyxTd)54XC}I~pWK(NKObot1g>=IwjWJ@<V7
z<@-*$)W<d;n;;7ZNK?ft8H%Z)R4OvYon?(r0?*QT@g%?g<T$nPI_KZJ!fO`{cqQ<U
z-$T?4m14w5uuVbr(8U6K_l*;j9rl(5W4$Y=-V#}Sgj7|K(&EY@uuQ)-OLr$><I11&
z&dcy_1sn;d?n_zjhx#~lUcaO1@GwUf_ON#}BrqH3tcYKl=HT&X`5aZ=JiE+vHDK?A
zV0NU9h?fcbJzUwvwl1-9`3GG3Aw0BG$(f)$5>O~wI<1s`>oFIbQZoYhNJ_q9tm<MC
zh`WZ#g2eHCDxRWVQj`k@bc<H6L%-jlwbQ24+ac<&(cgN58<(1#`v7n6UVEFc)xaqh
zQ3!m`MFvHX2Bj^I@({vB2nV4YoPtN7QyfxMV(<i1%Ox_;LAe%dQ{qGur5Q#Wgw>=b
zBeRfdO@_t@jdUM=zoh*g(y)mgShm+!*jT#BjSJUU-OgZq8tRL<3r})vqRzt91f$g&
z<w`)k>`^HwB!<+OyjM=C+W}nH5!6dAlVzXQy+6Bs5#4_Yu`7n5wWiw-33QV}aU53&
zlrUg5Rswzr;?`r%H8qS0xU$|w%IoYjyEv|5r`_fH(h{$~@#cNsa3`K(y<cFk64LGt
zID4(jT2^E1`7hI0>cGY;x3|?zs5(28gZqhNy$tn=N5OY!D~V1mQtlFEVUbE9tjtRx
zr9en0_eoO<iNxC6Tg_^ld#t4yNt_TxAyL0WYiE<|*RS!-?|vQH!v)e1L;SoET1~R+
z@GQix!u?$<9kE*+c<XP=gQYp_`yw7n<}WQ!FGAOaq|2=?Z+RbGauAer!4b~|&p|j6
zT#@&@-Ql-*o1lq1mPj8&)a*T4Be~>bP7Xz0ybYEN2=#Ct8e&M)K0-uIV@;k>Ge#mr
z?n9C{<eCTgB?<@}95*0K!k^$bA0-jLkJ88X@#6CZKKDf4ot7h@Itp<RG9JMAeTtDT
z&|**JGHyDG9gINGV{*jd=-x4Y>0=EpybgJGY!vp55cm%Aj?x2b6-wCLz}T-)pYre=
zg%yUGf~H>Fq1lW$b9SBf<OH?SBJ)Qx#<~vWL6wi~hd;Xt@N4;R%r7!EKg;~SGWG2>
z20IIQd#2exTVzx=>0b8u;lKGB@3aA~v2^uK-uhmIPQj}jVt&!1=m%K6o6U(f2-9Wy
zeMz_9Bh~^~=FIn&xp5Ubw=$XCC!pex7h>Le^9aS~KglnjsN%J2TzdT*oL&KHV^oSo
zvds<7^deMcjPXj!<Y<w(iGc0#kf`@I{cXYel`?DV%WQQLW=lN?-(z|0QC)*YrVdY1
z8SyY_hfcRi=P{ohp43!J1x6}m3XX%!GK5J{<f0RvD@oIgLD)t|eWJlOo%T((H?FdF
z<1Lmi!|KlCg$4jt*V;^suaQm7k!1>t!c_{#6{M-i`_p8ukfN}7uE6yKahj1PF(Orz
z3jwh!Fg7Ly92A*RBu3EBV2~J;YcblOjV84j<`L)P=6VaERv}BczPiE9^*&^yFh7F3
zXPT#{r<otGF<vV&Uhyb<DsOvG7EHz<)}+SZdk#|MK5P>3Botkf50M9;-D%P8^-)4G
z7z{|lE{=>47_3dPI`;_^fa^M>kC`Nul`55LK$u#tt~c0e_aV(#UvF|_{eGX07hm`i
z$B*o1YHA$Ub#VLwM;wp(<QV;Mz{YHwAN|<ETAnAr`3CehPebR^P&-2IKbRwpHR+&B
z7WJ@Mj1ae~1$F~9LhP#Dl9Mx)D>(`a)+S_WhSo809Fry~Ns=3zH=8Y%Z!UB3+&i3p
z_nqP6WQZaDhS0Z~)Y#iH{8sMzsEOSE`OYdp`+!%s86Lao^WD}Dq|BEr%EP)6Vh6%9
zB2KXA-R)Ig))+W>2F?`-r9e7Zc?WA0GWTh_Mf1cR$ML}GihF(3?$NFk_I3vFR`w7f
z$%LUdBx*x^G>MwHpTvCRp>v{UH5!c(@AssMTc`QH2_(rS{dVUkKJ<Jr3XX;BK?Y?Z
zQ(ljvo6n8!qX%(=G;ESZVDAf>uY>$PEAQ>_>eqjWTCKBxw2x??;l|Yl!iPgof04Px
z3Z|cNbr9eR&^Gs65yB$TU?OxJ5{F%UdiZ9ELSGXO_R<bhI?X=UI$aVm%E{?z_D^QW
z<`UwD<j_2DbssPThg>MN*x9(w#^o{@0pkY_bK<}PNA?vMmz%WD+@#R?8t?ouK$ojq
zA=ft~{XvUD;T^Q;k#r|vx=B1(K{Z~X8xPpl2Uu%uvA+4fvfOQwMv0kcrdXVqVkh(n
zoDQeY{TREspHCjy%hOMkQCmIyzT({#O*-uo)an$+7N|}am>wSxq;GTf>}i^p{*<%3
zNsiOA1!A?Au)WRd+BL5CmnaewCJ!g$ql<gkGh4-TGj^7CXly*b%x6VOMk@uzMtmG%
zTCD`MCesqXP{0XXqI5ua=^DMwci38cm9-miWAi7!6Ixk~nyiwM(2v4=A#W^kmJ+8i
zVbo_3?HV#`O`<a#49bEd4a%g%Iw7^7wZv+ZcR;x=s#HKF8NL!oV~JADAcMg}RotgZ
ziqkYimC(f8EIP1f5<~{R;^^cki_;^_ja8`x3Z=k`T*5!KkffG0F-Vb@HODs31YvS-
zxpp_A)p>A#StIOH4MQ9hQ5X_+w{bj6ob~b2G77M}>OxXHZmo_&xe8?@Hi_xQ8EG%Z
z#+FV8V1e8O?ft;d{9K)h(K6+7fRchj!No5)xUQwqh;b6diM@5s?xu6U3;f30-{HXF
z7g(swL;VO45Jv-6R<>DLxk;zBg)vDUpt&{CnLM_xF}o^p2BmZPeyufG8j&Oe22o5H
z4H)zz24O_2)#c{WI<LKPiKu;X_(UFJh`&K>rx}say9DO_<=dSlfgilOyQ82{-0@AB
z&tZtXZ_WA&w0GO6%<if-3MuoxHX(9V-dm-OVs{aBr-`+A%oN&PE7W_mD|fSU;!dJz
zA=Z}dEEx`pAwG&k?e3t(-;O@ad?GS7&!Abu?I;ZhgmfR!N0UMnqUn7ANjpIv)ouZI
zE@b+Uc@O!{6|OE{V{LhiwS{R8jY(ht<{HuZ5}R8)wBuZg_db{lTzvTg7hi_cC!Xin
z!GMx|h3(7m#=EdFf1bm8%80~J>5Y*@38~2yo`f)96HF2k_d2w<m&rO;>94-VnQuJL
z4?k64u}~$^*XS;vp{HGDX3NZ%6N2alZhVOf0MEjg4)V;D%XG<Se7w%WIMls}dU2b8
zm_nycvD(M+W5&z34!%rzWQ^K;o$>Cwte*b^UcK}La|`?FF19FkzCq_YY&K7^p--{d
zf$!WGz<&nlvvz426HM~lky(z;Oz^}^#5Z1dAxntE45byt%6^V>iPP6FQn%Mx9NR}p
zZ_?S==Gw*$E?mCKw}0^do?m(U#|-EoqE%L|ui~yleFUNhWm8m%vAId+7e*;aP1x9G
zYh|10@mrbjY)WAJ=mBg+5kmSXawGO~As{GtbizI>>noi8+N(6oPj?r1^+~3uYSgP9
z-EK@%rw~QN+Mt!C5D)0~dz33>gvwP>wKiA*X=-qc!CFfi#~5LWB?LMEG=AVPQt?TW
z0WvcP2}*dlB0xTH7ArGy^0S;gv>(4zq&JAE_YzvYkj?fc)<$H5kWQyhL%Br7ycf+?
zdC99mV0PV3rLgEIBQt_1Gr2chDp+YmTxmRnCB}W)Q6Enz`hz~1&S(!H=(lm*5nLRM
zl}PF0`T=qGan5joG=p}SpxZI%4gyKV3y`INf*UYskKRSpFkP@Ak`h8VU^LQ%koHhn
ziZ3K%o|gxH$kiwR?LUX=<ZttA=1`jb7^$qY)6=YN_t@IrAq>O3>d0|&VHlGKXe_xu
zNow-yf>dWDSwa-|8T2~zdR;obE}ecvzZ=o(3}|dMIe+dw?zL+lVu&Gr{<t0u=xU7?
zdHnd6j;pvwO2j@SEdSuZy}hGc(e4s3fl#|{(s%Ccj=nQ-o1lri7nS!eGJndHg4iW#
zcdAQf!qPVxH<IDJG{i@asNK<&`L{|bN8}M@YcV>H9Nji{L?Czl)WmH)rCsPA_CBki
z7l0$c6nwVIi}MZ#s)m|v5Uwt8?#JKahpPaOTG=hZ(q)#e_`FwHAsG)SxnQClx?76%
zfkS9OKhk9RAMk4P^K8!7ILWg#w*J?=KW%A=zgPkvh?&Db^dy5=<b>R4w2n#B0fTUh
z#`-yy-+PN2r{NS9N+pV8V^r;R*3W;HA6(mJ#BEY<3&yfHNp`+NCHMrN`ORPD3;*8p
zJY5ZuVGk>yXjf^kU1$B~O>TArg0a2K&-&<<Hk-W}@(wSLqGt%4HfgfL%3C3?uDk)f
z!Anm-d=5@M@;d%wp8Y4E;&`D+f8`wSZ3)7#&rVAqgK3^U=u)6g8js=oEsDV?C4lHF
zy!+Mxo|vsrD+t;#?DPX1FSio7&BJ!OTw8qu5kn_}y#+}7u$0}3KGyKY%goeER4W1}
zFgOh8Zui()zDaZE!!fBi>C)?NgAEx(5<hSeQcw&W%ASMoTF@C`l>F2r4L~LxoUBJc
znM_C=$3;30_!3Wn&>9`a=tSc<0%bKaP7un&C?Dfw2%}NBpcAw(#5QA)B?Qs|YcM(`
zO%puF5_k^Elo^|RmYZ9*db2(YPt3D-c9f&@6D&-PAcUkLEDC{ZH753Hbwaw`h*c31
zW*(IhOSRxK;wyq%Z4gqRjl~#~t5#Y;q%Bb@X$=gQJBEkWp>~>dx(!?*8FU)A7dL~b
zML|!YOcALRp5ss`mg#ww-M)=Sp$3BhokFe@*~9{!1V~0ej&N_(XLb1+GgG5j6QY#M
zAR5r_wCMFhtaeZ-*etwF(g6MfDE<lbvj2g}{r?rFaELG~(TfdfnwM(|rSeK7YcRV(
zDxGCyX+jjmgyDexphvscq}6WHZZ+sMx7g{l*zRXEyFeobI>V>%5JUWe;GHz4sS`qL
zC@YooD4S=Xj3pQFc(|L|gJam@j?zQB+u>%_E=hYp+2mb)XW|}CCO&BC`5{-UIZ2Zu
z56%gZi<E>~)5ucZOyc377~-Qw)E-~J^`iv?MuWBpEAzQW<N_kbDy)zwsZc_bJ@nKR
zf&Uavev0QlJI{-UN*ox|jCpN>Xp^*4p*PW@E}`{r;Jrs4j|SZ&X<TRd{1WTw6smHF
z*+WN}nl4c{ZF-GwQK~-d`+I=TGx=M;#((h->pUAwvw3`-;M%|DYr7><@h%~JcPHet
zi3OP(dkY~*(OA==*LjP#PDAc@ok#XvB3wdr{{mnCy$c+0Pjk#J5R5i(4NT4M;i-ut
zhbLjal#!7T#xb&gjn2}mocYnWdFA5MOh2c1{`d^#5SnSQJM5OYxLW7<g)Xfd-{RFf
z1pR(+?m_?0&%rP4VKm#I`SJ=pGslyQGaRW@U@T*5IpXSek>y^Q0~39Y6%)Lm&ivdI
zW2(z?w1;91Xu+wsEsHM&oTyGvtHsp49xdhFmn=0JiZ0BJK^Xy|rJ9wf*T*RpJUprJ
zl!N1HvNWW<y-s7TL!<NI@2Q>s4vkKiftCpA<CY|@^6-5R<$%s2!hT3>WX>pm%HUzt
zkLWbENXI4+(!o~}=?Xm8C2*jOBoG1z5LP3M#y5&mxrAR<Bypc!I6!9t*Yoj%0M{#!
zrWyx@(1I-0q*+Rm=A^S!sj=|Hi@fC=0k_1V`3VkAj50kEFj8`Hm8IK@&`}79#aD`Q
zP$EkbY-$Lj1mg^dg&`FM5P1)U?+BE&SOclahnMew=Q=nN+5^K*W?<(bDbB`4vgRC_
zaAE6xrO;%cF*+wV5`*J7l!_&ii7DD^E|})S@5#wMP^&|t;Cc<%zI*O9F?VItfFGSY
zhv!JPw^vZgp}o_h)m%Y&F6HtJY3i`Pc7LtwAD)HsUO47nr!YE>aq^x+DRLoxfxuXe
zPBf{`h@+S|>eKIb*=cuZHFsz<H`v&`%DF2m_ge}AdCY!@A%^%x!crV@AWI3P%<oVE
zSb-3Bmsj1><8|Mw2M{QGC;7VLGb<jjy}0lD_CZYSLy$A^sCVuteH4JUmR6Q>Gad{@
zVu$!B5;gc+JF-Py?vo3LDD*A$Afa+KG$nboPx0S@`A>1^%U|HvKR3>&55wLOOCen&
z-qdW}Xs~G=vWDcT1BUmmd;n1s1CppitKqZLC^GuYUY=YmaBR;cdOE@%{Ab*_{4dz|
zN^XIDH>P0UC@&tE=J}@ze7bOeZF`92Uxu&!&YhE7fRjcHVuN%XeBWZU3y#Eh5|o71
z+xxr-TdVZeZ?J9FSl|61*?JQbE#P|35=<Ro=73?md5PxPRo;^kVYfgk1YUHF3zuHu
ztyA#s*4wnl4sm$8&RCET*lWAP?h5*?D}3dxhn$w+zvSTO3ru9^dF>lJaN>FX!xv_$
zIy)@Yml?<^b(0Y|lAu;bm=Q{o3rz2yWWv8mZ{;GrL7Q4>gqrKosZUTo0G#>+oY>F&
zVx9T9QD!PJVNhqeICGyvR%-)f3ETiOWkCr7-zO+3e9s`$n53W39fa(3y6o&&^iOz8
z*?x~G2FG{sJc)88Mb9B{9js32^xAAUyL1zfV-mCS)2G$8b_UGG7AX~u1DVb+DF_sf
z=Th(#B~Rr_iqb)N0j07}r6lPj9Xe4&I?xnK1&Tp|AP5jvqO2fL9wo<PU@bx@jFlA1
z6^<M|%5RLvG*Usm;<Hfq7%MqQ4DDV*yBpDLhD3nl_!L~9)Gra*ki;bD?hbM46Wa`H
zipXMs6cP{^Yf)H=zM>qsxUNH@Jqmt?O=7;Ww+@#dax&JNP^y6`ynkmVV64tbjsYtq
zp6^p*6i)<fH3~3Txo1ZOsLycV;9jOCrx1RDjY9)2UzmoQn=s))$%9rOT35L<+nxg7
z`O#Ut-Pd;xr7^CPDCj;UDY)5%h19_#4>TcE&IgSqNfXj6CX8eH-9DY27VYLHo15#b
zu3qEf#kEHd6gdW!GPL{m5Y8cn7~*ddXZw8)7fOsdE=7?CWrW>TueSD{aJ;yicRg@9
zXdg_H?4y>C;)7%U_5tMUG5OrxHUPUMO$e}-#9G#)gtNWga4-z<Q6*}BOJOwZ%JFNF
z7a%Ei`(JH735Z8dJY_go<JkT>Cl12Xd!dQ|W?^I%e_)9>BFesDauRqXQM(Eoi(Fdw
zDVb3cp_v=EjMpJR!T3J*?thj;Pkf2bf95awzwfgwdJ|e#F`Y}KTl-08oA|QNR2`lM
z-hTSu;XgQ<Av;aZ40=R^0hkm|L>Sv8N&1*HMC&`s{s1;xY^}F(OvsI04U|Uo3Hsir
zk)w+gX;bT7!{3RxajD6>-7Q*!5ymD8Oo$~`w_;x3H8x)U@n5l7Z&IyZq<QUO=V1<5
z-hKUBJo`_+$ge*YP)o)+F?E&Yu*RO!2$L0`=_ftf-BHTH1eK8lH|`L2LguDQJp1H0
z<+RO}R*#kI4F)LESr6lv7@4iZDVN!*qUKsiLmc5UIzGYP#eIC@Y53vWcN|g=n!Wc6
z%^WP5Xc9Dg_^yC7Ba1Xqa;u2VM>+~?60FHS+?b4YF59IP*2&F=UFBemrQ1!|*%`3f
zN$DDa=hca5{M5HWr#D~_Wq6*z2uZ39I*zfKprrDwtLLgbLhAb%6%$1fGSh^;kU^Nz
zi$Hn?tHHAtX$;aB9APOag(Ezq=OHB&1DDyrLj?gF-3%)%z9aCZB{P;V)--wvtGx)M
zq*8Epqr(a-9R_JaE9s*LeMZs@YXpvvNa0bCdE2??K*52Lq9Q0(5Ke{BQ9-5PqobpI
zyYnU3e3^T*S@=^>n*dpa<=ogJ(V$J1i*9JJR->e%<okHi1=nHgnz&=!?h>_`Q4a5$
zW#9Z9#d3vI3pS4JrPc2stU+gntLqJ}ya6;<@4GG!YKd>`#&jMveBxM;84X5btszY^
z2JwJy*rC&FvD4aNYkh-_<t5I)d*v}lNs)=EQH1NzBqeJPA0I;u-af&4001BWNkl<Z
z@r!~t;)vs6pD8b3#`E!n$OVrq7;y(fdVm6?xR*)YlOeMY-}nOp;UD&+N56Y#b)~$+
zJ}EJ<l_gvrguE6H`_qOP619&Qa?LYs-=D;U$VG{EZ8|;x7h&@zX?GK2X1L25%7cQJ
zq8Q{Vx9$h+YaK4E^V;kvCBHzuc$2NocUfOO#NGoEnKqE3$mq-`dHPfP_^slP`Q5MI
z<G<AU2B&_I@>+EPJAV_s{Fj`+2<L%OwLvXtA=2}RwP_mbD|8werLa%ZT4!^0g_}3G
zxpeQkEjA>vi*c*?V`ZSnRr?&<@(@XJjEarWDnSF*8$-$++8eL2d^4i1&-2dr?%dfn
zfAo#-Z~{2{z;p1M`2XlIpO|Q~@$MPAYMhVF2o`ICk*rKQH%6&5PPH;mZKOv@cabQ@
zW~&@OB9ZM)&aPi$d85GEn$LVS1?kXfMaWu({S)Ji1YK&idEjM4`zf4$5t+jBYL!T8
z1}K91qpwu9J657j@_@=iL20B)spydDkmgqBL#gxBCOw2FFiPzDT{(EZM?o3}nV}bE
zw2X&!OL$K8XF}8xt<gfDtwQ7FzwLsyhQvxTlZ%Hqj)U)k(Gi`NA(4X2D7>IV!7&)6
zFqwhOVzng_n*JcB+wbE#0>@EU9h0OX8Tn}`dJ@M~R00?2Skh3_8)(|8VaI?l77=Gi
zYq3I6DU~S*NcugxVMI5z43dm~tno!gCUb=_;|dZ_VvNC&lAz#Ic6@x-BJ3ig#R50i
zPqNu<b8T}IHn*WvVru^piseyyoh`ODjzgNeB<gH{Fd8crI?b?F<G3COfx>yfY%#*I
z=^6{Oqb$zV86O?R4+7#eV=x%d4+pe+G2^3EdTGqYcb9-0KlQatBk1gO@CuuVLQ0eh
zx}5<#J53tR4K}w{xUqVcotqzSzhe_)6axos46e{*e=E!7hZy1)7hi3+s7M!C9bv-r
z@DRIY&v|Ce+V`s#AKtMh?*8N_A!t7#i4zaqRNVEsyv5k8B_UUNe5c#x>+R-n5DYOS
zY9Bpl@>-_6j{CM3<824V4=R0p1KvHvE2qkQa_$-SyK_9br-)E3X!U9LG6rdnECuse
z%6}<nm!Kr6`Il&1T<3Lrfoyq%alcE{6%71COdZ+BC+Y{8SUAD=zV<tux*f=Wh1EZP
zh2LA7<MRA6b_ZVnW*(VuzWEww24Gw8*4iI)(Q}y+6RZ>+u##S+Sz32^`ChecFVAEY
z%Ogzf`w~16l2ytqcM{f`4Z`RqSFfDm+_f>Xxr3B#fp~C@@Bh`q&4Ax0X<vfp_VV2L
z4Nkpv6UHa`d;3Q@IN{J2d+7HRg}6@``IOu$Bh>~oeu;etrkSgC=q%kJiU%mOLELwd
zQ6C%cuyNJLpFB+MNDZ$xPqlWLINLx);7dhq^eFHSD_{HH`O%DF@91IFY?azrhM%=?
z?@eV$9^aS@$dZ`M&B(IkLoa5dFe0-OE8LvlX$@p(t4Xqy$bw%e;Zi{rYmbz5kV@o2
zIUjVqgFbPV;&^^81utEcu(|wxpwMXIG{%uWN-7*jkS5SeHLjy5cnaxg5^FG4BQUs*
zM0tu#Sh}gs6%%zzquT(L;d)g(Sz^5C6BK*`U!gNi7#n&~MwnTYaFBo!c~;LYcoYML
zaunrafmS!dk&?Ra<BMEGBtf8zq;D*AQlzj5*+oi)=li%sOqLbF{xJ^kt&?g)C(7tW
zF{u$aZi#*>xxS*=nyB8c1GfEjL}?5acxb7J;usyL#Id2d+68VgpCa%C2VYv`#V7W1
zWZxM3=Icz3Rwxx+thV$+pJpduqZwkf<<Rsv8zXz5{nHb*#wM)XyiPYv(O#8K2-}Sg
zSJzh9ym;*=+NbLUcwTOPZL$=RWkZrS#1Ow=Xc^5P>}(NP!_iWSS<k29IJiROf*^Nh
z*6!h9cM&6dFMIlcp0*Fg&mK(2taxa#CAS>na$#<PwxD<Y(l(NabNwFQXf?U1v*92Z
zVo20JddL-wtT7mCbML3!)W5O2QnMepNdG;$|L-PW$-aPGdy1{2bIeT?anvXg2XHD^
z2m)~J<E;0~Ow|f3j0h&h6;>|%5r6T61Dsy?B#ZNhs88=_WO|<Z+$hrrG7cO+%z;By
z_W#>|#vgv?{k@!fZJBeg-M{zmpMU>#|MfrM|9Ty2`@hUfpL~jaGb4=8Bpf+(oeP(?
z-rsO_ldbJlCS`;X6~6q0&%{WFsBw<V7c_4BET>=l3;xwN_rXh=ljRN@*B?gG4ufBU
z_$^=(KJx<q`DgZVsJ@5K9vJ7+vO_iYDT!&u=TdsxpuIBH@hK)M7TLK<du<DJ11U9L
z!Nd1@^ct&NHe-xP7o$7|?FQ{u7tf!ezGs$0i<fxw%(r>(t^G{SJk8AEzr%m`-%Rt*
ze)~FqdiGg<^B*7M=srWC^)`*A(`^3mp2IdDZcN344oRH%2Hbl3-16NrACO&(8q1_{
zhA@IaI!KYy?S|+iA<hI|sm$Vtk4Yjnn*~-MMbzZu5jDt2GmR$&jw8sdMi_zXIs~pF
zNfLVfkOH|sPN`HP5-DMrV1xjp$;e9svrJ(GC{N;e3ODeO#UesNYz>>u4uhyqsnDTR
z9HCUI-~?6B1(L)PMus>QxHwD%P;wO`#Q?_@2q|%0fg_>fI#gXB#}SkRhrks`DNsTp
zt;h*joRPH>EFFwa30#jP(}ZD6W-Pv|7^xPRbUiEzV=aROmKzbv>*lTt-)%y%+$3;4
zq;$~+)>;wlw1C~3;K|SN!i&#veE&RiV<q;CN%qbL?3t3(tD1tJ_x<&Y4uNt>6NhF|
zQSlw91n@H`Cp^CdQFM)<dX2t?Yg;^8Z1w}8C>1MUA<bfvI3i2K;iF@SA$|d|Wi<by
zxydgL${a72nesi#j)N~Ho)9=fprp)82kox)+3kL>oE}N;QP{sXqjd+9y3ONm_lVpf
zm~V4MCws?o%iNL6v*gc5OI}@Ju(y@}_3n1ofDsn6`>!^J$QVLn*ob2;gnj<JH>|@R
zVo20J@<a`7k;dLFXeP*w936IR-5!N+bNctc&FSC&ule}D|I2*oi_h@sk1ufKz!+nd
z0jht7_4i)oN#N~A?#H7dQ(V(TMt@5CJ^1F^SAawCxs&|IpRaRreulZ3IrhzZ6zw<*
z6HSWQi?rT;jc<PFD!AjcN(Y&oSYU2X88cc1*{0F{W43RL%Dv2)A4HvFbfnR?wL9sK
zZQHhO+fF)0C#j@kt7BJen;qNf*mf$mjW6e(d&l?p{Z;SStE$#od(LM*T2FaKz2bO9
zB#XAmx*gLWazcr(Ib4Ap!1Y6k^bhX@1`^k1@uzx5Vy{=I^b?{1i(1|>^f7hZ0z<pO
zx%Q^(g~F)##unw1+4Xw|&lI|{Y7B5EWP~blC>)G{k1X8dI%~-{mJZ_{MLN-B*e~us
z>i91<mk*An>aL;19jwwR^|Up&RJg<Lv7Gl~-YK7B8sGC<IC^<H+|Lnmx?7^dOJCOr
z&l^a~tryywj}g9(cec3B=7Wn}R2qsQ+~D`^(!Jcd{wT9jClphJ=poJt3vmxK;K(&>
zNT6KzdF?IO>&y$_lMI}OAACt7JeXavj+=W_*aG^M#W0n)6TN^zl;%yCG*}c@Bokh`
z9-iUG7n<RRF0_7`BSC1wX}*grrseN~U_<DxDC!r2lSbIaUTl#vNjs-0mSgGBfY?yE
z&Qj_WetfAf1}$V13lL~VuFM^izqfB_Bbm`bJ_Xy5Or9oedPD&!6cwHo%p72$HHU~0
zLxx?WOL?M9<4z0_B+Yi@W_`hKeE*JT^NpQru~a)8*2avc7HyN#I+EyBqw6h%$?@jc
zQYSU7Xj|L6U2I~*q5)g=jy>R#G}AxdbYwU9PX?)-C@zvQXp>aeErt37iQ|IZ(F1Pz
zg(iPfk$?+2PIb2pv6_lSG&eC=1Q<slCbsgQWy_Eolt35Xzno5`7s1=?sW6bTCS#Yf
zyXrQqBQiCKGHVS{0_o*vn})&f$N?D`SP#B6%G&3bBg2~q|EGgrbLR#sXb9Nwi|eG;
zoJ%mZ?QGdBX4(ynW|*p`GL@7~f4Vq5%0R?sdZ#-f|Ec>AS4WQMT1=B$7+9Fa0~QLB
z%ni?@VTmB3PQ&e^l#-`Lh(T`vW^r~&s&BwSk`~X+f)q-lN6(Ivkco4JLU)qW#luj}
z&zBX@{G);jZiRBWM^ub(2<^f%ET5NLraM^I^F80A8|t14Hz#a>`M6>6^#RxAhxav`
z_p_Q3;A&d%phOB<J#yuRlNI<Dxz)}w(X>74*5X0Ibm5t}4xKB<*nj1S_=@9xg40!7
zJ9H4u#qE6XEoYr;cn*%x6+ZtMOjmT)ZG^IfIz>-jG35&JV&^FwS52R+t*d`Fskud2
zX2uH++YSBvPJ2u9%!RT{VWIBbWpx7Yh&gwgNqNgFn9Atr`rg4OvF7dc*H-|KU(k22
znCm+@CMT2g(@KX-vU6I=NEEL_HQK)l2jUSIn`Y-HkC*jOPdcJ_K75`}BFme0Y^>JP
zPw=X8RH$bIIEwg*MJ!L?1sv8ELjLrE7g4McTGYheSc&G?$D~DaW~h}j)HTqoQ&to@
zlI+qno`i!5u?h^?WR6i{m8QYyRuGyn_)@6UFgoHjYZMdoqe)L)ktm2e!v4}IcPv9t
zOa1YP7*is|S4l;<)UpuaApe3JX~$$y3nz?`o+&w|kj7vYSs@nf+@pQC*l}roE-c7d
zO=Af~cC|b!$!V5!`(#$tNs1?~3=%B+O2_+Eii@N_X9LqZy1mz&|4_X$#21jV_lSHi
zAiADHzEaDs(dKQz`h-_)MU-|=Gu&;yv3`%=DFFNmo<{-97p>TcuC`c4FvX3%yuD$P
z4bH+Rc_K{F5$`de1ZI95laq#<&XNx;?|@r>sS-W|*#P5dPbF8FYa0CzZZIiKPRBlv
zF>$l~qnL9WOEAQh6f0Q^XCOiNFF)QFx~3;}?WPg3PHxeujGP9dnoM~aiav#Q-AD~x
zBzcF18lrg<uc*z92`)5ef17G6Sc~X4G833m9~CA~llE}N1*k2j-{li_cFTW@yRW93
zd2B`i%ybaCo>52lTXR6zD)ld#7q<%sR13l0Vc%mlevdcqxxX3~kxNzv@8Bg$RX3p-
zIOGJW)NC9o=D%G7p2hx-r?^QEIpk{P95NXCmCoD+wT_e5BDwoKUW&cFr(}a}L)U`w
zFk&uc!ry5_b_t71z9)>LuASo+puwF9AQRJNh-V>)Iw#g{SyCxTN9VTJ4<vAlGdIP)
zs|BX@$5s8N9u>U*8GiFSt#K^nxp(Yxdill6`$28$cE0435zsVo`FW9ZyZRB!!oe~e
z5CVuHO5M@BG&q>&6O2@2?6aE@{M0bqOn`5ix;>~65-AowA3|;1S5eAF+NWS5h$uoW
zvVo8ab+49Vi4(VuZET7Kc(WtQwhATc<+7?+HgE=B!o28&-Qe?U#lf@7q^s0pP6433
zk)&wpQKhK$>EG!^coI~)rITe7*d<fZZCMK&wAoFTOX}uCTENUpq-W^1y&(8Wt_ebg
zA<^-%G}KGgNrHP^M4-Q{X8I)5+}mCrg<OCiX^>L1vJxqQmkG!4RU9TiYZterq16db
zIas-TIaW#IfpCHFBB;3OfT2lOBnM|<>?R%EHRI!TjAi%xyhA#<3q++3N8`-IP)nXV
z?!hy4N3SGQbQ@y0X-;FZX_jqcwa5h=UO1cvJUctPb!RPzZMv|DDN989FZH<+iz?0_
zlSX`XpY9h*B`kwtzyR*9Hg?JGKUp*0W`Qd_b!|zvu|(8cLSGNy!&i+!^o7wPTcozl
zY9FX17_zhjJ{|=CY@(v07&h&8*J0oS*dcG$d4-)l;a<442;)gLO3@*<KwZz_+L-s@
z8HF(}Hza<*6yfePo7eNx3{1>8Rw_bz={=*!lUB$5XJz1~e=jxbZ)sDjV-?&c|H~RQ
z&X>X&^8FdA=iO^M@57C_D1|Vu7R3OcTR88RB9#~=rnqVh9_MXXs_NgZEjNfY1_t{>
zlVI6#$*LO6Iy2;a=_7$A7J*3AIlSNQanJOj9{R7Ru3~*X5<I=*Znr+QI-DA1>)0pv
z<Pr9NCE7n)Dd6u6I1h94s+faB|Ao-e+&iTN9wn|aa_Z&*3P$e(hwuLV*!%~-e*!62
zg**&MTVs<`sbN|64vKWJBbhr)%h{NE+rfgKe4BcU{Zxw<_&fxEeVlOe1|%d>JzRk@
zQn>vn_P4FVM~@QEvTW*BkI`BX4eLct-?*MPkIkzcHcjQOT6%{JAT9j<kh+T$jk`Dg
zb6=rC?B^%7hEOrXDFw==?{536J*B-F%IHL>g7T4vwsWuO3!!Tn1NHVsObYc$72s#J
zXSs{8hM^g#wF4B;@~L~NQ-1Oc{!~`Y1@^gsSAvX#MfI@g41jUeKW5|6BMA*h21n3i
zDrm@)#q}!du<5nK$wXlO{V;>9g|vlVv|@&&aSF1n5;;%iupC0BLbjfk+%4tD<qtDm
zJtxG<_{Hh!YFq-gl#=ImB9_x#&z8F@{$=g-&4Ba|yV;H&6{dA`$^fHbD;%%2j`j6Q
z`??_SH@NT-2oov{oKX6vlU}S^p+cioiarK}#Q+|fY6v3fW=utX!8*cs*Dv&tu&n+A
zarr91ujPZ#uocSLqO_?>SO<${L<giE3_23^wOU{xNR3))?r0^`UBQgmDPsSTy{5Zf
zd_SDjIRvAxky9?H-#t|EW;S#Cszy863qm)9WvJM4nTu<%OTY!Q_<M0V&Hg;|RmAVd
z9vDN=Sx%I*O_PXu-H=(4EdNTuPuQnHN^8Es2wqc=Gydw9Wr<G`5!3exhuf2OD36al
zL0}oHp{z+?(O=6b29^k++5Ea^f-c_+_E4k+Zq6Cwj*b8wKBZZ&pzZhqJ1|A>cqV?W
zd@D|m%Rk0up6P?nIu>R*HcvG5xkK~+e*A@l2)v<uU$EsijkpGkXb)1*%ECHDKcx4Y
zkG9B&Vn0}a?QhOBq6o8d@hiV5Re%dAp`ZJn(Tmv<He_>AT55(L8=u*3O}-g^k3`;o
zN@5AO6LX&6yC0K;_U4ZZ&T{aT=MzSrgQBYLbyn<lEx@Wls?KDbdTW)oAvwQ~f*HB|
zL=zxAm{zB7tN$ru0~<VAa~9xHm1oJ~0=ea-{Rbf3ylsQ8zf)b?#a306JTZG9;XNWB
zf6Mcp{xgoPEZ9{MCu$nfgB^*U;KV`<L-w-czg%c#QX5VQ!y$uDhFtoSahj}Bf;W(u
zTA5Z`m3>y*uDo|n+dNEFuF|KH?CLvGnoJ?Ov^5IAaMQYhSe`)^haZad7YtcOMZgHW
ziQAZL)gTJwFOGL<Q+BhKV4SmHm>pt~bo4|CyM~O+)+WeH14za<^(9-|W71PDrn;sE
zCZ@s4n1FfY8nHH+O?cIRIu<t5lw@*0cO4@)Cpn;N1dVI_49F+Qu(JwuYt*WM)Q}YG
zqQcuxEwd8btlgWk##I!Ps<Z6<upuHQ%>7^Afd4JW@YN}}7fz$U*aMvrq(8X^U6(vN
zVDd;6$W@Sx@i8S$CToemdalQ=Q6hc!c)DSvdcShn6{6nc1L}($(26I96z?6H#1>6H
z?bpFEf+)l$&UZ@?>MzWB`LM$I&K3hcafDt#45K-ML*d^;l{IJ88GTKlJlBGQ7<u7(
z8>Ag-rkA$oFRv{BGOKMBZidR%Pp(>I&8L}p`w|Tw7%2L@`+;_!aJ9}2Wzl>hf-Vch
zsJD_TJrD(bqhe$4!fUz)k58$19PQ#w;UsMG|3z)(nZrI^5FS|I4=sG78I_Nbwjl$9
zkX5Ji(d5-y)>Q+(8uU%)^Hu0~7@AE?Uabd63|V}!&-F;{HiW4nQ~|-yK9Ta>*WFi4
zpXL#u58m#ZG6+Nhf!>kCtF122^pe=An?3g-?W&;^L4$*JFD#GNa&B&he-Q;y$v+cn
zrN&_DsyJ5hmOL(tEy{8oB}DmXRMTJagQx?~xjbqouBNayG$X(0K-keca#%*N`dPX7
zP}cOF%%VJ~_&GmO`jBIUUfG#CpWsQYo$6d8x;<~N{c5&sW|7F^U`^5cq=8r0`cTJ|
z?lC`1YZre;QN}=tt4RN$xbgu8kjsp)Q`1mCL6D=G(rfzvMi)I;m%xplX3-9hN5qwO
z*zgcFM(5u3IcL^_R)vv)G)drUvW26bUS*Z$h#AKi?-QRRD7-5O*5;eH0m&;W?7zFn
zRb+O0$5d<yLUn)%egACLbAQfaK%DGW+-|?q&4^NxSGj_KSTHZdCWCE-fCT&rXI(uH
zw)m@HY8w*Ws3w#nLLphI6s1-XqguI04U|QfgV68xFVF}6Rvt1A8I%Q6jn@f^hJ+XQ
z-K=^)9WO@kS@};+$JY(r7a*EYe7<2wJ5g?6bpy=~LQ)#}#AknHjd^-w`M&lhfTo9)
zXIb=@(ZMR}I{zzG$8(k6=-j7DbV_#WzOqkt=dBk{ZOLeurOYlEpNhQDuYe1Z<|eEA
z<gg}(`oFH(3l(3sqUW`~t=bPU&KhjZ!hsYP!(HUp)8z{Z&Xh0R?I_1&2V4o)1^;A)
z{`=q0AfeI8*=}v)S-7K-!@5X~V#-{@S$fx=%x747!64cRWyjU1WD^_k7J?(cz$w93
zbfSzXV?gjs5{sk-Wm;M#YZbX^nnjtKrT5-9s2KU5!|lO*r+0t95^_??%otD!=8Sar
zJzbJ-!eJz(bk!p-znF`8)CQCm54n3LO%87qOn&b<e_L<pybnM*##=inPwQI_SBpaL
z1cpM+QA+$mWASOUO4<D5Gc}#PV>R;3B*QG7;E9n$1xvWKU5yGw+@egZ4e5CLmkf0$
ze9KlD`;-kJ%IJLtPOoo~R|6u7*~%@t*9VV=5}yjrjpvM2hOxfDZ7c%W04bFLJ2%rp
z<tTM<Nm+<doiulF`*r`3w%wx-(x1~MZUR(KmzE0;fu*7(L09097Pg+&ql=1YAWUS|
zNAlYcVclpajOr3)SYlJ;5cW2Md~y<Ka99!lOV4laoq{q6+fannAY+u)iICuV-9iwk
z4fa_2u6j1*vK`$!oQmNH-d0#Ia)rSN7$d9`2Ek3sB;y)fw5!KTJeRJSnqYymq5OA~
zU|I%2iIH#{#Kb>QC-$l=>v%AZqgi9PP3!0J`JBxQPJtko5>GP@W-4rg&x^qQiv6}T
z^|>pcoA>;=?Df||uKHH~Qb#Pti{Esi45yU#TSx#ggsOsys@zXK1|1(0KKvOjf~MC|
zlqQFlzLXEB54f0GvegLJ<~19aP~Ci8RXKE+2=cISVUyBh^(>E7=gEHEu73vK%9$~Q
z;}ZV8i)ZozCaZl|-3~^_@2f9gH)AKf^!Qz`;qgk6SF{mUv>&XRIi&wZMsQd0;FQ>1
z5<0q_GS+n7&*9tsQnySqY?dn7C|*0BM&Jvs;>^A*5QzRw@WmZAn^X5D%&H9NDF63O
z1J6u{<m85pd)`|!zR9>Z5CRU9K6o_{$)raUdd_`N)=tfloI*PU`6K{)E$DYZNskx)
zr0dGj9rN-1vu*eH?pN}qYJ<JIXTgnq!Oj>dCLlcz+l@`AUB}?|Rou0E%8Fy+&JHCN
z)GNHAtmKRi>MQ<|uk%m{$iexQx8r&gX{Doa_;yNYaEB*0$vDO74%f?Vr%`L?LFxiT
z!t_4Uz5im=qlT3o99hz$`I2gvbDs6f7y7Nhbozna@aacavuMSu<?j@vgUibx-QtZ^
zWAm!wwQ@&Zxzaf;kAqf(NzX^@7q#V49Yo3CwgGp<b3*x98a*gNx+=n^zw%Otz@+}!
zRUAeS4*NUA%gq;(X2U<Haz^`U&RVT6jbWVye!X82l8PWZ?<7lK>mVj5rCYC0^pEYL
z%WEzrS7xjs_*<%$8~MIU+7&{Z#XgFcPQm+50Zuk33L9YbzXUL^cCYmqTf45YMHz*6
zf3%lx`-Pc$b3d>lEw?8(y7x(}OW-Y0{&MHxHNfzKjdl9>nuK2lSKhVV=?aEGho|7?
zJxoUWjieQ!N1!-#`x+JcKvWBg_?ai&yGj$ojrMw6bY1626V5`ZfRzXkY0>QJh^tai
zGh9W9EQ0j~lCf9g<-Z{Z2=fun&Tw}HC8Gi<nE2mZGl-#Kf{-bQe{*z!zBs@EM8**F
zO~vK8RlO;gI!oGWs(1ml;KL}=d9~VR2%``TV74r`AN+l=yB)h`=qzax^0VoBAv<Yv
za^Cl?aNf74N&w$R86=mnzxv&6Lw>tB#xTC`u-&)Iuu7RWfVPtBfhf-x&V{|$I2!J@
z8Kl41*&Ba8AKQrzyIa6o@SS7*9#fdECvBOoC$?HfZ>J1`PQW!*$TDeaIjqxJvL=@C
zqTCM`Ik&u?DO|TIzMs$CLD4+33oR%WhuFIuyR`>rF;>;eVK+eseG`JeG9a3A0T4jt
zVNfs3@9G9L{J|B|S(=v!r;#hCr<(eCLr<z?Ayfs{?GDeNUHet;A<BAJEQ!HwHu%u;
zbJ{AhV3*B41GIwqW_vW-6<3W^9uLRP{5~Tf{T8WKt(mlUsjlYs@xe#|#;Vs$8$Ev1
z2zO~#m#ZwY8xU9Ore|7^o8ivEV&vIbe=i}v)Dm^O(zJkEJl&zDHsFuA*Z0vZE}m>*
z_Klsv%d;y|M~|XwVQj&^5_wqn{l#`iTVY4*=zU@n%VqgEMc!_S)fWW$Pts95&^<%d
z{-@W+qz1Qh_C1`@LAWJDg-6JztL);RXbf(UuDaKs429)xbB|8@od{qmG79~Sj#nTZ
z7VVxc3<%4^`BS6Go=%go>Bxb<Kc%aF<n;68@i}>I|4ispAp3pv_G!>>1j*1Z>$2;C
z^7BaUP`jLtmu?C*6=$htD^IT#IMXTZboYN+092DW0CPsI%km%}g-9zmt@)!Bo?a%g
z-T2N9!=|U@8;q2NtUybz@l-FGm%JZjC);3&q7vP1hgs&{k2+D@(kzO_#UG~?zg7)n
zMuy41a-&`+_#W7v-u+&Ew&Abn9PhzxQzik=^R%{E$Xd2H?3Aih@|tbruX9jM*e&Tr
z(<0E=NN_(*t{bIPGzyDzwd8<KM{azX7sK#F;CU1p1}q8)*#%el3MF&JOQ(P5Pv>k}
z<*Bx9C61&;w+c3_O@fV+3kzkUXxTgihVCkcaOOC7<zXU!lMe}7XAoKgG*y6q8tn05
z>i&$_4J}>>GHtB&9)M3~nmo_4maP71-1f2F9}B$SC;aU1ezMHuaSLy3H22Il9+c5`
zD&ck&=lnbHJ$eMmF%$D2p$hEIYMA=3+skgB)4bc?keVs!UV}2AuG<Ib6QK?noeeYI
zS5{kFx~J;mN?OXfFwl;FRlipUpkl9x>u?Fn$0}r6#aK4XA`buRC@B$l#xQ^5eD=D%
zAqdl?LZM<|2ub&;EA*6`T8gx&Zvj!&HrUQLc^snF+Ve8WTrs_HJRc|V+W*+S$K6TZ
za2zu>@;|@rUsX>s?>mGI*VyZwOHxpaX?w_FL(~UhnEN_Wa~*Bu8)2)IwOcnAfzc@M
za+1pY9J~ICv?edrKK|#+!H9eutg<=8#9rhag=5FM<`+G45NX#1>Cgp9Rk>}%KdkzS
z{=P|TTR~?RjJzheh7~|0)PmJ4<ea8J^g<YOr&2Cg;RE9yx|EV*T&R>-PFNP5hM6Ga
z`6)o=NS~$nZ-p)5uSSpAV_c_Q;?5-Y7@?Gx6h4u~x_~Z;p5R1c$#>0Uw^B-$m~iWM
zhA%onnxXE&!(#U?(}!c|Q^qGk_jRMK_dXYz>xECK-}}4P@>|uRJ1PB9qi3d3*Wl;#
z3tq<^S^vIyz?omxFk@_ZK8{}Kugp=A+%$yP*48vK(`bd*)JepZHGzW%J`SCSuu${E
zUxrnT+ZA!wN0$Ts0|4T`$tt>}3X1m5;09!oQPeWwC1S3ZAF1bJ{<f9;ujpD#*#%3#
zxT^n1=Jjz_O;b!a)#+g=!$1W+qGXH%)HhO7sG}DM4X5*~;Z9Ul^};a{JhtJDWILFN
z>1c~(B$Kqll5^(*4UYgOopN+>XPDqLw3St*C+K=S(&zc=XgHDe=?x9@(uJzGo0iGt
zoY<!S<irxbILed^wDtLv3~;+<q8QOQNU=}XwhldZ*(F{tIYGg_JA`^%zT>TIB_j!$
zS$Ym2K925>Mkc`VP2!!GfVUp9dg$+Q#!;a7UzedgF%`j>)8|}oi}<{0D1B_0E3$tV
zQt1TR_H|9WJJ!812wQYs?O^LqWKYo*HGm6xcfvg$e1z>Gmln%hYs)&s&Tq-!ldcBd
zRi)*DRwpdD*yDDuiJ{?h1#1Sy7_L`q41Ki{bkHz?al}?AKLoQ+3mQbnDE-=ph(m<O
zyK6Zb%gQPu@~KB|qPV{T;9)=`sn=J*JKO%Ggbdke|1IC%DaF!os4kATd`=Q}V?41y
zB-j3W=t|}2`<L&Tp^XUHtzT1rw)XyroX;e^-b<rgwv9!}cK)qF*Q0~3x0HTCNB!iA
zVXRGAC_Q@;o4CSP9elT7i9+1|MO?C{o>Z@H9!5{8#NL{zk^%o3l6mjoxW6>%c>l(F
zI+kv84nOsFQ**01Rx5;4+nUH+VPEe8!Z7r`|L}rzJmiIHS7Kd9I&LL9;U^&={0hiu
z_>N?&XtKZwnc`SBHH0IAoEaCr_46>=D{N&>zso!R{?IqbsLbK&;_{Q_a|`JMY$@B|
zVD$u7i>SS4wYhuv@$&`tl#NIT<LH5@j+d_GuTVkJYUu-Hg)Kz?Iof6y-V6Z#Z=W#7
z{*`g$@q<8qXOvg}l(RnhqHUf)$P&zm<%p77i%+?OsK{^`%x}dks=enhQr<obwHs3j
z`jjy9oWzTo>G#!|>+ux?#%!L!mlM>iCaGjj#gxAdxtW9bW<25dEUKn-G9UhWX8n%*
zMf7y~%?c$;L-%}lt6(nKDx<Jf6d^2oIwG0m^X3Y<_`L6NJ@?oXsJl8bLFQ#3vaxTK
zc~O#kG9sD_<kwO4^Z<RNJobPBm1;>|Mp3T#hK@gl!41fJX(pH@QTf67^wg1=ZId)N
zVedf<oJO7~XJUutYhcF!XXl*VE5s7sKr75TXMSS-d+yjA-{j#*`kCW96^)2QsRkP?
z8--GS{6_icA*AoZj_j4#<4(Hgh`nt}ZTBCk*3TS1B?B(R_DfNOy4=qX3fl*v^B4+k
zd$9UPbu&muPlya!c@)5+pdg8~go64ve`asLv#?FxjYZT>%@o&Zk}I+G+%hb9aH6gI
ztBzt<W$Wm4Jko_GNp*~&`FR%+bA)2rvWiSnIhh0?b$HrDan$g4$bPh&m66@>_W!ok
zZ}cJQ$h+?z`ESCsi%jLW^;uH*QN7E>{0iFPaj0~^)$ne=@woGJ#W+qt$IoLYsU%+}
zAk?5CkZgfHsrkOuG|Twj%DvsFVX<Io0c?c{`}PPBAMBlOIo}p~-^oj8LfhTS2)^(C
zK=Fd_U^%`*<f`$Tg*xKu7u6}1!#(T^gu3OZ+3|a4$?mT2dv-}lHU)Gb9!@gsQ0cAv
zx(Rz9&D7XCK4x(}FCIXBei+?4bh$*_@1h#<*v7?6SqrEil3Efz>XhTJKF1xsRKVNA
zLiQ%=pX7kn(*!s_-;|#HeB*B0KS5}37g{-cDFZ1U?^1p}pD%}>X?|}-*Z>x?NWKOw
zB1;GM{h=;%oqKDhto<?&OtZs!Z-v%TGeuEVZg#D6Z4iycz}E+AeJnL$!>aq8R*lVu
zb0KuMimsPqTzR__{;6cy;scB0E6^+BCQbFdSVe~MJM5Zi1e~0u&SmwLKDJ}op)-KP
ztf=6y(U=*sscu{rPGZ6_nT7RFV@zz#1y`VNTnnbUW`KHwSdL+{!Zvk1E!ki`KFsRi
z34Cx5kYb*qsx|~f8<D?9J&7&J^O8G2NoJ-2;FeAuz$77<rKO5AUC+<mfB7Bwt%_V(
z4V^}2mpOs}GL3Z7c9z_PAK%fbUI~>TQ3*=ESSkwX!do6@Nu#T+Yrv^w0>HaBT=S7S
z68qubFQCl_)&2MdII%(lrNJ*1{^K30Dj_Cyq<s^f(fEZwJdA*EXP}~vk!_0XBEdmV
z*aG$Mw>S=kdOj(hUqY@<9t%ObUkF&H{jK&?2?6($?$m@XJ!-(cfOv@<1p_E8h=vt7
zA6ym3Y=_pc`olLP8EY2sU4LuX#Q=Y}*O?<`u8`MLmo%iuxU8yIlfxw`v53b*Cl12{
zw4Ekt1`y}ZV9kocMszI`bY2S&u?79lRH%Iw0^RsXSm6xzvyMn5=>9l~T}Vn6L2Yg5
z;njCoSH_ewpS%x@aQZu6t#c5c9;59B*o8bw1=+wJ!k;z2f%cmI*R~S|`*#hA9O&jV
z6<6n&a)RB&OXow%w-q|%+wCpER<FJz`_N8|$b(?3D}cqWK~HE;FN}+6K}@fTe^qH@
z)QaP@H@Q;n$<VTQ=u9tIzumuwj~`1F%hZ>3KF&D~!*rRAZp*EYCh`3yDQRwCmks?k
zkCgYD!8&arj7oF1OwJcK&iF_lVVB;ALdZ*>XrK3&zTqWC$c3*p*Q=3R`;B^2w?%(#
zGqV)0$!nbxQ#Sb}Qk$>K<>;%jna4xz2sHK>knJ-TCV^Qygbph{x+V&|JQlYPdg~i6
zX9Ygb*EP3EmP{y`q4=8_SN*3*u=S+3BSm5uerG2`CA9P;16XDzj3dtd?DYfIq3f4(
zCyXfnU=w4~7I7#ex!X4nW_2Tzl=F)Qm($BpmEjt&kpFPV+D5P+T3Jxf;-{Gx&fN90
za>i+!l#T}SGnJJ`jLsKYi&C(Ql*sw{q<O2OKt!m}mdc9&Cz&CmN&yCuam<Q85fP!(
zd90`gVAkj%F!RG?SPK|oe}J3F&oM<uHL1l7<GlX$PgG5$KsmnhPwZ^}3TnzQMihLn
zH842*$z<Gkj=GdSp?|w*csn~m@RT$XoY?=X?HqHYL5bQq`R*GPJ@IdnD=VCh%6aLa
zFgfw8pY<pn9dbD50=2CxR^liDWqEJQ64eMt3?gIS_x%@t8z>0<zV00AMO~Xe)Uic|
z)IT@wi=&X5wQoe0+_wITcfacU_T{d@CsN{bAML%y$Cm<0hb-b2vFpkN$6?#j$V(WS
z?ODs>4vVXZrw<p(h@ww~S)vUU_{`E9@Ec(Lr@ieB?EaN!QT6M0>T{goa|@C0WEso+
ztxS_0`ANqgF&eBTfC@TNYggxFXEWP+<!~h)2&*QMD9iB)v4hp?>1bnH%FiWe&p1Tw
z9IVZMM&M~?7+1?|-t5fR4nem9#rhZ2QldL7aK5EW44L~W`-hr}84C%-a1ah9Q9=~g
zO1GD2M<OesB6k!6T@{Tum&ZGAPjFW3x*?LLZJWWw=qf8#OPFQN?c{m)&dU?au4VU7
zQHgJs(K%x3_y^ZVtd?&EmLYfl+$l#zr~ltmx0a6wypBbIiRA(L8>*+#!LTYXDZ7_s
zm!)ABfpzYKJ@Nus+j4FS4%6Zw0^hqySJOW!KFQ8)1Fe=yrsX(ZR3s^kcii1J)}U>4
z%T}NF1E_&Z4nnVsjJq{P>tUzY7d#?+Y=$!`LrhWccuWuufFSoCcc;9tO25#xj8@K=
zA<=9=B^$M-g*+`NHdH;ZM@yT5I=aWjKwYJvQi6|B7QIkXCEUO61PlqWYv(SQTM2o!
zsFL6YH-eOElK#ArVlvZk=X#DHCekzp!@Vn3f;mls7+n{7HCs;8Y)@v;1XvI<RaPxG
z_Q<lRnh{YySr!Ry3!6X>mZ)|>!I@-*;^=k;h?C7<@ds6906|$&f;Jmn!}UzZ&#*a|
zO#IGCW0oIS`nGr^crRxJ2xWtmS+!%jYrFL3PljOBj%I2#y2)`#g`m{q?bIFPL{R^d
zpi{;(l`E!EP!eJOT0VyRQw*i}wruz!aapZPbYsNos$>Ugye=v=(bl7gOv8N3YVYlL
z;At*FNH&o(jTzZwgQ#qH9C%P3HJy_w^;lq`v<wJGhMg>&l=3>*os%M5QvMH>kuuz=
z1pBZ5F4LYwgI9N3UzjnLaf5zoHbsle28sSG6tzNnC&}adv(dgT4~IDPI!<W9@>1mn
z*>R6{ZV6}hZ3EK~dlu0^)Ev37m-s5k-+ruQUngoL?HD%Wxj~Z6;=q3=dwa5_5I2)K
zRVwB}aMo2#+P>DMdEz1si~IEnquMYrb%fyKDYkno-Yv~pDf8fF(5375KFp-|<!i@#
z#IQu(NJ*gaG5-FJ;N`kMKYZC82V*wx!J^r}#je~7b@5{$Yc^{-<yj=KzItRd6_1MV
zs?5T<<Vas&q8yEFvvbgDc6WY(>2|__Ud{Zwp_jA&Z&iyq=wqA8IrDpZc-PC*X^Kf9
z-)yxp5|vibHiSn)MBcQVb9bPkaPwbzrdl)War&(I6bc{*ZAIy+Dd!`6diwD!EW=WP
zk#!+DdZPqPfSBoQUZWD#bm{akf=%GU9C<%ff5OTISU*6v-6dk*H)Go2q>2B0_O$t0
zA|Q<b4Iwsl5U24jUbP^^zVbz5E|e~kL<s^FYibVKL|9$AM}?z{wUDwz-gNY*q=q6f
zk)yr>HJZEW;Vn@k)!H9nJa2?5`wUG-u-9de!jO9Ee{(p)pkVHmq7B@{2XsRf5X_M_
zLX3ZX@hGc>%IM5aScaSZ^+Wp>Xn{y@l<)_!=#@_)*0vkCZWU$#h^x_kG@rrhhje6N
z>+pIF0w#E2g4KS0W6&((>J0a4?+oK8AWk<wSX?%Mz1Z5w-)`LYG`+sOtUQ5rYUDPG
zT`n9H#!ZN(L^W=K2HB6&6ou9N{@?L^`?B(DXEiO}5nifeDlA=?1Z^Fs`UMm8tPOG`
zOXp=AYm-cl&7}~;LcPjRtIh~F;=6M6LF&esh4tn~XsYh<cM{O;3c3W&Yba>gI4OY|
z$^WJWB>Er<Iq@ADdk_SITd1Wf;*q=%zB<O;Tz0!eQG4FC9X_3xOkO<=x+uPWCTQ97
z_b;L)?A!mT$k`t&vBckOn;0us+IsqztK{xDz8TYJfB>zY;mbwJAF<3g8WxH+dn`B{
z#9+VqXZM4&FNsl{sImKW8|EKU0Gq!14lUNAw;3QfrO&FqH;t`?$FE!grDXl#5xdBA
zlQ+A5UMP}EKkzE()>dNK_1Mi|y;`gtL0$;d7W)2EOVE3X;tF41BOw_=MOQhz*e{id
z;o5F=GMdHQ(2=v^xLGT;2ockfKw@m^2QF-db@N*0qlgEtnwEU~FHWJK87itf(kVrn
z{v|!XJfy3XtAFzH?`(jAtIp97OE?tAX6Fb6wj_+pP7}(h%c_FVBbp9>%9F(atp}tr
zC;m~P70;3U?G?N}OSQXmw7Z;H{<etG@V%6j+FRS%GK_X8H6r<R=0;Z<p}1OFO$;;T
z?BY_)aK_#()s=)OX~48scB^+rSzV##?~c{@#RZ~6*Da*qGu73>@G&mVZYYEIl9UHn
z-@W5u{wM&y0hC)LO3K_M2_1<}Tqq2qESfKFs!Ohp#^c-=boxX+)qjnfS6n1{GUTBK
zHXE2{H=tvnqJd#<po)p(k&HU5wo6W`NIJ`Hfg7C~t%wQt`+tXN(b9K;0bLt4(@F{K
z$T$Tg4w4_Lv<<Jd%4pOuT}~<jg4JPXWQrT_fn2X~#A>%o5YPzrb30nrP)0n#BEroW
zs4tAwhubZLA{Eh>(&`2(3lyU4)@q0mqPY47+a83ze8LmEvDV9Q$bG7jasgro>iCht
zF99pgh*cR^7YZM>zL~a%OYY?rfQTs9RL83!7vF}(q3jx&S++`pRAwMWfptWItxY29
z+8XFwMBKY+kj6ni{c^|byKA#lN1bJw&-{;@MX6GXYw{&S?qS^$;<N@FbvgczCtd=!
zpN<_PoeJNembk>{fWJ}IG?Hc2#bsh#SYPa)jazlB|J5hdQwz^S-!}_l1CqdK6X?k%
z;VNsTXP`+%777o~5qabpLW{;$)DjlB3qic}E<X6b01bT_2~8y;)P?BeX=Cx1-cd)>
z(k3kC@|wEqxv{4_#3Yjl=9J-dSUdB%>6A+Wmz-qew$&sw#L(=92r8MVRARDOrlV24
z*KzOf1WiacQ&m`s-?b)tY><+9qesXfC0WS#`J$kVNUa)cvk0r}r6Dxp*$AUs+#C{@
z47(>MC;hW80mT9bqeCoOlfA1Ep_qSkRO|h~GuEyqk#;6xqY8P6J*R(>E*ne@0}Kiu
z(o0j+{l#JVE{Cj8T(i{~aL15oe#qK1sJ6(G6-v@ZJE2!UOs|TyGgep3=#m8gpuw|T
zT~$tt$d?|e2hxun3=zYaCnQLq{9Q?v;WuN&dD~4F|L^J?0xs|2mTbPVF}iM)AES(B
z9}SvjraoTn;CrIAxor=rK#0;iG=)0BQJd9TvF8-Hps-bFPZD(%G9z}Gayg0tZa@XW
zsz`=mi2{`)UdfkhTR)}eQ8~Z38n%4YA6Z+E%r>ZkwZTR_i^?=1Hmi2Se@*SemAyXQ
zcs3Liq?X!TwwvW}n`3ka=<4iEBPH8OfmR>99)W4k8<3aEgm-IU(fdhZn0FS1El!s3
zGsUZYSRP4kaS-JgyD5LlDG>iC8+4MG;(k#dt3_1D5jB#D;8}%euaURFN`aE;0@(ZV
zko((Npp23L8DqAFP?~r&iO@IxlB~Fg{<|)<_<l3BQ+Cyh+sH)PR?HmMMmeIIP%fIU
zTufRvO9?T{siGO|&wjA&9y^X;4aHDwp0eu7-91Y>4O?lQ-a;1=R9qzVf;nsJ=E$Ey
z&oojFTk^}wg#dpcRh9b3hCSRm>eS;=BR)UGxNW7Gfk>8eMihG*D=t23#+mV`SOWIN
z#i!Zup3L@%+B8DXOzmtaTS@PuF>??e6pNcf*XT93Y1v%A2BeAH4gJp1Q|hTh_t<79
z<(7+h;=^mF2jh*06S?E%+z|0;O9ewRI1!cO6+V^}O)wC81)7%b@DTxSR`(+12OONF
zbYTLuKn<U>fPPuLC@E0XI=o;D>z61;jM5PHN%=rBhPh!JCJX@c3%MnOnrML{lddd|
za($HA@DJ<p?*Ffw4NL2WRM(18YOMEgQH9y#8DyTp@+{&O$G1Q`rNNaS4J+Q!)2K)x
zHg43FlCOjYQ(rXG!USj->Tn=xh_Gs2;lQK7`gH#zJ8mRPv^KhIt^tyP%s<)DRb{wH
z3~;r%79Gq#Z)#c#NX8G;McNM6K^rwUUuo>+3}x>ez^vNF_Gl`0o3^Q}tc<tkN!Tg*
zKT+>!#lsHQCmlKSR_pQ!LKv;1X(eq@p=78o=@lh>l`RyM)APlYifn&|O(T-Pm2fyc
z4U)4x@iFKDKa-D{?yVTyt_?~P!b~=bya3;;REvX9sEDGlF&+N;*=D^A<ngbYU4k+f
zg+>D2KI}4?`qahql0?4{<IZ-3YFf#w=z9QB9i1z1?S*YfWl<mRo*r7rbH@60<4%I<
z8}v?LWi4<zjF^IJ@qbP=@9}yF;0uLwx>!@teVTAf&hfBzDuL+I4A%l!ODM`1=q?dG
zszqqKD_}vO??W?jGmf!U?WXl7k*&N_-;JJOGY!Af<(B9A;Vv=?D%8w<F|5MR6@1^`
zm!2MsE_#MgeM)-D*kY6rFCV*~v;|um8;~k{WOEw7+O+*$tLTJso-OABoS<JHjS6Je
zBtJAc0~Nv~$E~IE8hc#WvrqFHgD`ProX_bfl*?Hl>K2tX|KxMdn~P*y0zD*?$;GdM
z0A8|ivRSJ>c0!XxI{=>1e+IO#$`Cz2L|$9YSZXS6LS6Y$!i-&+#14BBgk4!y7WIvM
z5lm2_bOk-571$Mf>hbgyQSkhuD-vV_B#W0WoaI){7e{beDKw=8>ob-IWoykB%jDhg
z154s!0_%rXVfh@a^!8`~Kvp~jL6arMxx$|pzT>A1+koxpM?VaL`oCDU9mTbz1I~!8
z0IvbFZO~q*T~|BQoIv%ZU#&u~rRjbh2Vr-8!1!XgoO1Pmj4bUja+BB_;(*fL`ij7g
zl|!iUpcI{iLu;fAJRwIH=C*V(r(`lgvKM21OezKyehkt2W+xZJ!aio68&2IDCHxqY
zfeUyll!}nIO{<X6CuxMgO=W2StX`q|9LrpNaed%AZXE8a-1H;fn4AAV2zk(a?ks9K
zE(LvFNxc0Wk}{8ic-4lJkS?AYs68PDq?%_P!Wg4zEGMg`45X1*p@#&jOwwnl?!&kw
zp$>~ZAYB4LlbC!^M)MLhxv%t723EIkD}hu~C6)L1QD??3q4&{jnF8&SeADuw-z}^|
z8=H;56pcTFua!F9F>(>AkXupfQ9K)bu!gNMRhhx{^x!#$IOX^(E;hn|&=hg`D8F@i
ztg2>oIm_mCa~mYb=g32>)-9?U=Uot7BsD~JG=S!c@sx!#QS8yuyJ6P+7W_CW6f?V<
zo&P=hFMYvOyE0wxqB=VYjT9#u6-y0OS+J<hrb9yoJ*3z#ioQ{)b!nK^yc_laE-r{`
z{=goI_Hvo<bfpu03P5lkXL>!m0<fkYm|t9<Jc@l%FN#62I@h90ED%5jQC^By5KvDZ
zi&nhibM095%!@~=w9mh2bG!GfG5KJ6cJ)QO-bM0w4w&x4;C@AFy@?*vS7BoAeD=HU
zObKxN018EAo8O&jFw!q@`^pP!>_Itb8Z93q7x&E&(&708N2kJH03Mn9^;U($<Cx*K
zb@fP>Kf(O2soahj4R)W6R&(bt_vTFhjKFXjNF}SqJUTF!%4%vs)GJCSzL31WQ+R6C
z+zg<N(Z6z#NOcIV`)H?_4pKqGlGH*6S9Qlt8DY{$Bqyd&0Ib8z{O<(p3^<2a&M_wG
z8PM7gHD<77%!&)?Wh(*H5fSC(GqYlJA}S);7~(3j>2z09Vh_gnWg8dB!GyZdHyz|-
zs=*Ak<|3$5*i>xADx#Umg(JboGn@ql43zyOQdB|^Vp(cN2U<B^=@lu99yVeC^NHH7
z-CZcK(c5DN7wwBb(6&5IqRCocfHmKJs&%W_Vj&YaO#x_vWPX_`myDr#UE;zlIo5FG
z+%F$W-6FFaw1_N}ly$@JxYfZ0Pr?veQcKa1N79Bx&Lys)p9&Jc;LSIn8yd!G5`gU1
zCzJWd!S0?>I;nyGUE2JoornwyXv?pj;HM;2j=ts)rL~bNfIz>5X@8a<VLy(2P+{AQ
z>V>V<C26#`YcCR)dERuBlI5>b>C2zarLFu*G(!0bM}Xz1@d1!S+p5TNHnPgHzb4=U
znH7Ssx{h|c_nSXnzh3xLBqe&1W#Q}x4gSky>QDBbtoOK#H6nI?@AS>v?(wCM9W;Jx
zAIR+CN5kyHxbu#Y=IA}H8d==~%1}L{vlZ@@j<JVX)^{eM-UudRX4CrS;hkulLHF<?
zwNtC%-6qYWdxMt}E#(-BG01h_Q%WebqXvOhUm0FUz+^Lb8jP;5|C;Why2JRS*KsUZ
zr}@Zey|IENzI#wCJ|R*h8;wE3rN4UgMq4A$BZej-hr3!6g9kGl*7IK%v9jRC^sqXG
zhV^lCTc+MIiaVi(3MqxQdFnW+t0am}yc#-%_2$_abvgEw(;rZ3Q2x|$%?D?JnWV1+
z6y&SE#|JLfRF>s0mk`!SoGH>jb13r|8tJTA(c!ZwiO2psj{jz6I75epHt25dMrlti
zr<_0P;4%f!99<D6t9b9)aKBKrrs9OOcK@dZP|l|e|9RphsWF&y+wz!R6NAJ+H0*qA
z1GQxhA5>U-i>nb-n-7ytyVAl%8&HqS^0<U08<-5ezfBvhNvLbnU?VT`4VUYk64lZ+
zsEl^BEjKggZ#^~5SYU_rzu8oBxv&zpe5<Fh3Ve1ItpkPC=pD;-qo2KjOhBeKNcaE!
z8@VKCvUZL9MwhNmJ`=`KC<+I4ND}F5%djZ>!-mku3pmh>Yl|?84TLZ`U;rzBc1;2^
zDLsL$;E)ce0B-;)7(^a!^TJZVk776cR*4y!*)D@s!MkZAZ{m@Nj|V=QFF`E32W&kv
z`DT5d<lMC`Z(4f4ws*X)#;$A%P^QOR>vIo6h3KX@%P~w=Yc){81hM;Fv0c2UVoBBR
zzOk>O0oU6)hi`^>>$OzTSpYwn_cj<}>BbV0g!4Br7zJ8;L0I4M6<fY^TTp2J=K1Aj
zt_fnFutt6-FxC8<k`_>B;}$?9v#4{HW#7a#mw$B~y^|YKrS~YXOm=g+C;qiSjerJ7
z5d}j`@5R<&a9z~m+vkP~gTC63Qz$b@R$2r(-^iH5gp@x$NJk-vU8w3-_)>Y9xEi*U
zXwti>SwUcb|4}qYl*U2l0W#y%N~UIv%5bFAF76kpPqChE77!MfmW~?OTcu$#GdF?=
z5EUiK=V(S8dmMj<wnGWE)3H`LS5{5KHq?K~m4VP|%7;8U3Eh^uPKT2Mn{9xsW_!UC
zqZ~f22i{<l$m&auvalF&xbWlz%8b@{b!|BTE*w>9pz<yHKBa7Np*U>_Dk=&3#4oWO
z=n!=UHXDi_?KSM6`DpHn`aoVK>Bv-ig@3o1q;%8~f&AekAg~dyNU0olLW({F<?>c6
zj%K#+8qswN-u#RMtAX9Gf#bTb+05-sqk>QE|I>&<HyWwuSs*N?TR6EI{UwQG7l;9R
zOGm&2Am2jRU0bn6zb2Nn4QO%{H)&JULjHiHBX6>w#fxsFmMSm^DB-B;DZyy@(IqSw
z^j!gn5RML!UtV?!Y)FlxAlp4=DR|763{@sV)lidt`El`eGj>=SV`TnVg}1)Kf8Y*}
zgnNr|#41@VB|j{Mf9dyxmP~_RnB#`6Cs<eOz-oTTTpTH}NVw>XY&&&pJC(CPj|-d;
zbaSJWhs}}U>)U%>?>zqN{aoRFylSo4pLyL&>Cj0KFG048ZO3oUyL@<+H!+m4b+~ZO
zQRvDd0ZpF6pVvcND57Gj5Y51Pv#N}_e<&-bXOvQTkI?T`n;2B;1gugvjND8hZb-Oy
z6{a@kr@I!#qR6eZi9%jxEs%HG{fd83c~WK0Op0QYW60>zAImGoYqK(!zD2EqD8fs?
zk=bt!w^c}{0{#^!4${N7@0`GEcBuVCW6v{$%5H@$Nd|*i3%%Nnmh!sX8xm+*@}l>E
zp<Pt(Pq)&UzOfx8HQ`m@A&lkbUpIBW<@LKo?RXBKOkjK(3(oqs1-RBnI`*)tax4;O
zjg^E8ARFjdtt?Zi3Wk`G$4r`aU$wQnBZ!`j#zvz?2RDJ>fZTigAf{gg0vC<T(>um#
zMgv*L{v`tGGvbTU^6ezk#mxYU@1>^F)D3f@UW}@I&^@WJrY8r2VjOPu24M{ler|&+
zRPP=C)0^Zq88hb7&qp)){X!TjAHp`?Jd~FXDg0^Q0&Q{eCHd1spGbc#G48>YS4#-2
z1uw$TrNgJ0k<CZfHeqpD;2xogi|I>BPBw*U9E{fhNn67=RhL#|ezid$lAsxspkDvP
z0;E6D)%`O@w@XZJ%i4Zmhjc!SjTE#k(q0T?`1Yi+Ti!yAf758y#)tM2(|@9}WP8U$
ztz8`>hDWpkTU2*n7<e~+RKQo46Homc3eAM4u%IDkqN|4<IKI{IYLM^VNB)sezg0lg
zHJF8mqpIIqL5c5ISOLON6uQTjqa#V|*E`#2Lri)P&ih$9o2s6yt(RErk;wVVBR6mN
zs}v6@PV(C!j5>y|9GQAb&(a+@mKty`Nx}=!LxWkNzO_t3A``t(vvwX<$HwEye$H+M
zfZj#sC@x{JhrXDA9taLKwN$7w@Wq1>5GaC&+6%3@TGaC!l-mm3IeelY>yadC6VTQR
za4y*y_cSf*UJu&A-W2o%206v1bpIW^{?OsnvYo6Uue|SdBb#kFc!K7<?2T*|`bD`s
zeBSgmN9!~70607^Ds76yWtBDA8LOo$A&%K6N~1NfZOGY=BV!^jJ)aDvw>_;GP*gdO
z$D6_-vDd^8qdBxqYm3XUs>Txd$Nt>_JN{A60qGT`cVTAi1}x7RslI0YMu0w%RJ$}u
z=`RIqTY5-aIvcg1D$K_R2tTH{n|D|A|5=wI+rSYPazd}oM{l!>%Ib>Dfwk&zXkEfI
z7PB--kc8MdEfG?bQf69UQgdjscUBb^01U9UP^{=xIUCK3Z74l}5EvLqwb%w+q%nc{
z<1}(|8vBLTqrWlP(xR~umAJXn0e2*FHxAcJetB0X1QvRD{BDdr&Naw_&)nUv4-8)>
zmCSYDG>1;EYXUS1)BLm`S@?admosmmkfv!QzMf2QT`4PR>m#h&8Eka~HUfYBeTn-|
z(==Z?vU;{;4C!L{huE+eg7W-6*i=Qfe0Xprw1xnv;K1M{I{h~9q&Z8I474G)vyy>%
zt9(+>W6?QPmgjW<r8m+2Cn6*>c1Mnm-W~+D*pZd`FGuQl&7Vbsx9Flt;@0CI^rE0y
zRYVcGTr}?BY`J0Q!=DOyr7VNM75APQYEwI}@k~UkX>(EUj)^Mw2we2DmG47tAAeFf
zg|>7$3wJ_l{4a&$0~e<sOw3_ct0;Xvug9fe8e`kt>Ghgjm)q`j9t)A|Ll;%0*W9l4
zv80ZRw^llqa*>IvtQQpzCQ2a`a@fi;+E|18A}AYY=1_<4uLW{?9<Mjiq!egP&EXqa
z=3Qh|Fuul89ZYo(*)(&Yj$}enp^j)g#h#3K_8=0@8h^QTBDcLisMYG6Smkn|07uQV
z990d&cy!Rmr+16zqJ-P`sLXiW>*s%Obwq#liYXyQvS6|)VS3hF!3Us&Q`i-(*!T}+
zRdE_G`1t*kiX&1DauuelL{}J)mu?^fGz`W=n$iKQQ1WfY$ymkGDVFoaaZ_l&s~zsi
z$Y)~gdB~&}!xys@j0C>}L=3&>heEF=yZ5FLC+nZNrmp7Mx(8EyPjjwfyX*Sq3`HEg
z1MpIWsOMvNGNZ9$_@1r{?tZ@Jr!lW@nc;=oKJui#Ryo*DOb9MA0n7`OrsT?Y!DdEC
zLcP9UG-@8ZEwxN*sy_p(+HYn2A(Z6au6EcK`faObjZW&?_)V~r)dvgCcM1lCgMri(
z%zd1Z--!CZ3$zTg6jws?BPEV=^ANJ#`y}%+cpIo>psHxO_w_!CF6xqWR?BTyP%`{w
zHI^e+#$=0mY-;s-WL*2}fAc%CRu6ekq2ThkldJTiV`$8%2dCW$gK+IzV*es`KDybr
z-q9s%H~r)ZFxv_)!Gk8vsj0{xCC3s&mavc^J*dBR>F>qbOu{aCq$!Y{QRW)vt@JUI
zF#aD+=ipFjxV8Psp6n)TXWO<t*_>*!wX==MJ5RQ2vTaV*WVgfD`QCH>hWlR6v+lKi
z*L5krm8Zn!2w^Pv&JNr<8NiVd70p>o?^KjLckXe-R;OYtaAwpOv87eee*P6IWn`m)
z4Dx^*pg`<sat6crCtv23_Bt@!cG9t=^M+(nw~*0ZSb?aZYy2DIJ2SZrlD|K2^S?km
zGvCt0c|8oCtl8O;!nZ06ykgOfyg#_NLo3a)F-ZjG_a|KoDxdxtbL0-9x(M}Z7#gtB
zI%T#+Ul>uUE9%@N)vzb(qjXaeB@m~B_?RQ-Q*=|3u*1k}GKyh9I*>~2t8cALJ$nW}
zVm;dKUkL8^n6F~(uuD9EjMR@lk5l-nMSyu|iQ?Le>Gu?ky>DCJxV@iu#0jez8=C7C
z)&XeseJJY+G*EJ4pJR&{2DU<w!EW2Je2F?+s+zxy^AyV>`l<}uB1Pd2`ry&pcZfpP
zhuTl9B##z}EbFD9y`+Lf@qB6sA2#I3h9wFC)=q>jQpzOpZjGsX9dFImS8_S^DK5WK
zzL4Ak2dM(Fa5bf?3v;W@2eL_CdNHETgiFx4J|M)F=c#XMxxB&2c8_StR_7;r)o=ao
z2M%23ywZa-nM;GE7L=<$Xu3!nfuzt?cKQ}7g++9jVP--HS%`t0$4v#74gc&Qi{Xz<
z#}YrYM=tLvPZBMj-!|To$=KDb(xk8@MBPBMrru#4T>Pf#Qq{9VOHU#fgn3WQ*Qw0D
zq?4@;Mfg@F4g*Tl4+_(bKq)9%16^I+%)|oW^9$dr2rSLaVuDyHDCa;(Itp>$zWz7j
zp2yrhUSSE)Y$|w)ZfD@WDTP+Kpk!!XEev{$23dSpPXW)9wwP!ZlQ`Gy&GLs{?eQ4T
zcc1``EJi&C*`#_s1J&fvCxMU^H=2Yl%hr25eH~4<$rQv2OZG**;CE8R#H{8;#G3v$
z$GB}W82|~uOMs4!jmFMpf^|5%Y%()TzGFpvnjsqIB-k7%u<Ik3+~wZJL4_qJpa|Jp
zE>y@lgo9-fREM35z|!5()*Z-`@YL;=1|g}$mdi4hA1y&gi#W;isZ5MrY84{f1EMs}
zkRszjEbd_;Zy$8Uzb8IwXJOr=w!Uq}Ki#c47fNNZDWKG)u3Rn0GQ7=??wL9Lyw>VP
zqW^riaM)NHsA0}o*Ze$Ci_mEw89&m)(#>=AKyd2veiQ;DFP-9{3%L?uA6(S5-kxxU
zoTGo|&a1mnhK4qg`HKX+gD(uM7{PmhW76Tm`Q5Y*@2Qu;x_U*N+=T`lUK@iv4}~cd
zQN_v9C!7<ba8S}r%cv*)_MMsnFO{mR(Nse$3m4fN{BN@Z$zvN%D(1oXu1#yez<BTc
z_v;pte5ZF?e=6=$q@CMObc|*#o(`|D$yC051L&~9)U(FjX}ppjd%^C}2VoKgqIQjw
zpZFjLZ)_1vFFD6|m3Up-0gl~--gMfNF@j<=c*mD>EJ!<KF+`fu_;7Tb0)ajj>gwgP
zP&Y_n%De0q6Fe|<u0+sywsx8vp{u4^#;0e4re*>zj4qo=c1(r>MiK*=y!wr+7$0#W
zb`QR|E&shfd%J{A&@7Gtw#FjIuc7Rs$?Jmw)jm#eN6Js7p~DQbI9}CXd!v+ypgKze
zeR-cU4>D*uL;+{YftDp_PGvsck5WL@GF9^kpy-cE0uHQZDzI5e<uL)Vu}X$6=)N~A
z*o4i5g{Y1j3rmVjKokHoM0+IwWTCaVhOst77uzWip{-~vnk#iUFxtC-3m6Una9oam
zj8z%+3Jd%T=VH54AC%kQ87yV$nv$Q$mQu&n@dJZ9>(Nz7-hxrLJ4UPgNcG%K<lg=Q
z*b?Je@O?SPaIkdcv}9utBfq;9N{P_3C`2Jr`DuM;MGXTa%*FQn`EBQ9`9>fNK0v3a
zy`f$f^6gf|<XmTHvK#Q1RO2~NsuY{BudECjBSO;x<ZUo82OGR}kT}zK1jQ`tbX<`a
zLWqSy8^-b=Uww`U#dGncWW_Xb%ys2z=<qbL!IE*Zm<k_4`XA{utlLKt;f^0CkI!9>
zol~g|<N90n*K@^+d`RD}1kBMs8#icw(WP_V2J3@5cP`5(8^pO%oDyrs8NT8%_Ij)_
z>9{&r4$>d_daNcy=+Z)Um*{{z5k7Qc;GjmFzOG4K?jSk3T%mbjDI^eWK#sI4P_Ik0
zYpX~#`kSgcanMnL0K!}_6F^N-7n@R7DT`)bS4_3|KO=1=85+#6JywvtLYiXP+&(u`
zy>*qFEvQ7|J1=&9dF@cSz*Mr0%WE}Svu@9tD&T#7=#}XID&B81GHXe_xVgWVU|$1r
zTm0K(nGJ5lcY2YL(v;&o5xUWs_&ycvV7Z0b^9)OnXsIRoAn*@u0sqLz4e**0#9t;O
z$IIw-quK`|rY&+EHi>b!P?^g|lK~{km=hJyB&$QVKv%zE26%Pw7{qp$1?igFuombV
zSjhTIJnoQc$P{5^PYI^+dhAGU`Pu|E{Z!~xbl>`3>hi2;Xc%|AVst$V?%Cb5N(!o3
z+1#|K!=AsxlET7T&G2`ON0a1cD*`bkR}QXfcMmRFkGu&E&JF(7H=NZ7LEvxkX!DU+
zQlVX@(b=EIK!dm9x<K%qCcnup3>27-hrwyEqX6FedCtkyX%0SwC_mkWU?A!HokN0u
zG0*6C_RgJR6I4mkL8W424b}6H;VFe-B?~I771M=lJPHTzG&}+XHERx#&o#NU(s&x$
z2M+bZ4+aTxlwuE*zESRbiE*ufxVOxX-Z_QZ9uPc;T>&5%YkV2@B)HYlerA1<B?4&C
z<M*<_&wel%jf@IDwiebz4jGY?-!uA_O}tg1<!EOV?*srj-Jg!Jt?lVAf;TMDl)-~|
z4RjT<<{6Z#l8@pb%cP8v`aE`oepivCuYh`18$OdHWc>K>j8~+u<cx7;nvnFs2JBhv
zr7T|AUwa;Ll{r#FN@KNx`d@izoc??K4u3lr8fT~E9V$qfV?=gMfJg4<sD+NP)ySz?
zur11(O(ywS#)=YDSQ%e5By^07E!+}akZ^=Ae>(CX&6`Yx!0~QsKq1noAGw1mP$8!a
zfxR+8<@#wQeWpe1OR00gDP<yRIVI3)IP=KS!IRuiZ{xwVV3<dL2omkUvUzxIo`B|}
z%ACD_q4CE;`uNtIQfI>$#^t7IxNG{ARabwv*yMYXIB?QhU2PKCyG1qqnlCN{lARwm
zQJZysaOrk0h~i*+@7d}12nMgO7l9<}HPqHUL(>g)ESgyJ8}w&&3=b7LNQ-5Ej~2Xl
zR;W8ddm2X0nBAP73@h;ctJn7QR7>8+PQ}rA1MW7^uyUe+Hv1drq)9e*L8w3Kyx!fW
zdJIdOh)ruLS0fm5R7xHJ50^6?w_hbcp2yGALe=dz7<21oIF*ktw)fuM70f+IQLgTA
zK<=0zmzOuei_3E-N1y2RN5|XM9G^}PpT0>^g#Kh9vR+4q8GBBIJp#IzY?H<>sFA(>
zV>TywTuM&Rp;wftDHr@0v;rrX&_YeL<cOw)EYwltrSG&bK^XALWPZ~7DQG&NS&JYh
zxhOgsS#@d<YshTij`4^mn=uD*Ld*j`RmgV5X;%ZpOunexPIdU=ZN6I^Gb6gs+T0M0
z;1MMoH_7AwPQNuP_k}bFEs3Hjp2=8as~|m#iFGY7Rp*wW={}VnGiB^e6~bgAzhP!~
zqM}$U4n5Sk2C1b964VQ|gM@1?7i7hV$Ub?eh;X0*F{NO4F|n{NOE<XZLMhbwQu+$M
z)Zh0xlCCwnDe%sV4?spnN~ww<4>CfE*qi6QIH6r3Il_`e;0!r}<KQ!E-(+kbN2j-%
za(S?izwB)5-|hx8aNG56{%T<vg`(wTTiH)trh^4j<t(~IZOrJD&08;&FT==t!xt)R
zreSG%y(UE@351GiVol=(5*o1PYACz0ejWG8jcu89x_p2u8n3Cp7<{58JKHK+4(Rp#
zpgx(}IuiLpWQEF;Stgj|Fn)0rFU)p#v1#n`$I9(bZQWY_W&{g0s3jnr|FQb^#Le^L
za8HPLC_3$!fwO$k4w%TEj3ZW9YN0wuaO6xYVrDR;6L{oByFGmC3-9YYO>+nN*{p$d
zL95m?6^jUOGYCOC(Ja_&YbQR0V`|Aq09`gRLK=l6R*?CGu|SFNF+0&69<uie+grVY
zhB3-ggpJmAPP*S(5XUf455BFt{g<gjezJki5BoUY!wk$OULjP4L7_@|02X_sKiOBg
z*RS+MlNtauvf{q<;8)$Xr<`~$_~>vc)g5|88A--Di6FACRJpL&fy~fq2)NmFXOL6n
z@qr>i3nM42dcPC3)J^L83bC?t@7jBRAMxw+uJ3M`=52Y3_~(nxS*!$zv~<Md$Kngd
z*FUZPwr5yO>|;@4d)e~~vlueG2{gRMsBfFnb&TFRW$&~C)75mfN_3<(+@I96E((qZ
zd{}Ago;>|C>=6eD41tnJuOh_bS!y+O<2TRAy3oeV#T-33x@S^SC3H{+9G57coUB%-
z-u=Q>*5=k<;G+!8XU$yC(y^w?rq%kXRF!Qt&mf&osWVH06*`U>mraT((C5rNT8tlQ
zjqn|=XFI<8-sx-iM+P%A5^xk|&>~*>rgP#fnZ`=$MK{jJ!bgI20V=RmIr{!sQb5sI
zQdivuQuwk(3cV`6bITA*BC^n;ici!&e*{@mRV4*mQZ?xiVedL{wrsjp*qno4js#_e
z@DUIe!hE1$5i3a>orywh^2~SJ*q_u|x+a*l$1S&%+i7yoFmPUUG}U1J-%|U=s%gHk
zWDGNvLeSfu%S=Wo7uc+>cBF-#qT<>8({fRH@vj-L$}d{=`q4mtRCht~v55CpQhE+O
z>y#8@XmYeCInp9Yy&w@DkYP*C)F1bke^s&0nH^(7WR{~NG+^ZRD4%D>i|w}lCS|Lh
z^}VGn!D<K8x@7cqb>@av2<p&RS#r|%PaVbM*8X|=l#_c^pR!i@u$9gD^hz9aeO>d!
zTA{>N&5SZu+ts%&YlEHG-}3g=OK5s3Op7DvBfT`$EjsHf`E!`fQE<rAW=XO+B@?tr
zqPo}`?d0F6hPw{sP*lV77yFXKOdFMX@rhA|fLUo<02M?kIoCuXZ2`|2qiX@?EwA{k
zsaupwG#$Ob!oVDLnU;jw&VLgXu`tE?t5@ZcZuN6!**FP@Khpmo89Wyd3+*LVigfgw
z(wAr<T?^8L)?_aUwA0P5IY`k86qR0u#$OeI4V8RYH2<Q*p*u5{5HBMHqa6T>QmXG*
zk;|TmgCMKuZv@OZ2oht4C~cIoj?8Vw%-M{2{;}e@o;*IBJhU6Vx5;IrUHQkFF3&^0
ztv2!vJ6b>->{PBLzf1^Sf`y0w(<jl`8lAY6^bu%d6ql}jBd&fN{KRdmjfVapc<Ous
zl<>bFsME13q{;xpeETlmiMchzSZf#df$uCPrADk%D5--8-#nQ>C6$62?wB|sm?Err
zF_{*t$Wnv~2b~?n%xoD>jz>bveXM(B%5&iiuvQ{ml$Ynu4ceq?<L`}c<#L|wxAxE+
zc4Sp5m~<g1+B_~7j9YS3E?V|KtD*ec2AAIWH+V+jGV%IgV>PvhETt*>mJoB&#8z4N
zSb_c`n|V$FK5)}1jhzWoNhTb@RdzoAxM2Lt0ga?F0t$(R(X)w_JFYw0#3pz<<%r*b
zDYD3PA}?bW%&Cwk6u#T{oS8sVQ$WMNw$U|+qMyhJR-;$H#6mH-co~J-otpb!PT7J2
z&DlsNrJxg~tBA=`;<+#uE9-Fh>&+=OwAhtk7T;(ra<u{p7zQ}>(9dZ};j!fCN?{|}
zi@4NzeeJ4li8QL?CmzL9NJybh6v|Si%Y1`rDdX%0n!XeZ#Bioq$f{DtNK>WoVp7qL
zCGA*?^(>q5;I$DqGEm75#lZSK_&kox{qwM@$oertbjVz?cVySQ^i}?ZSkOw^@W}i;
zx{E}5xJa=37YmKi|JCB;HE)=(v6U$~4xqFMj-?O(JN=-BlA+lch5-y7YQ}xE;Q0~W
zxk3~DxW5N(j+{G`xV1}CrMU+=fQ|&8R^wP;E(NjxX6Z8=WJp6jSgRlwmcE3XR!Luk
zFxD%nHne9f`qy~2Fy=f<R)U2V_v4c}DuX!Q*A@H_BO-#qRAqXk6`%CSZCzu{ZED>b
z^kIjrDqOGgU(ET6QEV-3;A`pE*Q3iDkVD{C;I}CTeJeXS9luaV{Y~R03fgD`_e)DO
zxD3RhwnFou;=y1I57}^^4Q|XZe+9e&W6nOTm@p{f6f-HX!9%;*O9=6!PkdOz(*Ch;
zL=~HB8bt_vF#I-ZZOKo;X!X(O5p|U`JcHqgFTdgqdUjnzgPq(FmG=f7DWO|8_V)MB
zA)1wB{kxo;GwGQPP3ktO@u_1l#{JdQ)XAizWw44%BXB6u!|EAil7QFN@wUqXht^Yl
zroY@N$dP-K-LvrB5ucW{boOrg-PgFOD?#7p)JJCek;Gr~rSK%53g|uVQjfS;Qo<2^
zi&S*XWExUt%_S0*RJ1U?F(9xk{#f&vvJkQ2#p1=&AkQN_TVHzkjCuboUe!)1QWU&#
z(p>?)sjy>!N5V#k^1xl58KfQI1J}>zz&~CZNdZc8|9j@*!>71a_|3!mk!`S<CCE_m
zH0K^88raYw;M^mF!{-f*Z32nrg8xXk2+$OWK>ziU=#IZcNXf9Aiy4SQtl~^9FB=<6
z&DY(L>(9Vwk|TMj%?|VK)myg$C7ZoaJS3whLvrEnymyQK!ZIU(&jOO|PcLAm&iXyV
zy&h~*A1!eoXZu8R_dKH*_N*9-Zdo23mcHJ-8C``KDdcs(etZAr=(b|daP{7?{8X#6
zGZtOr<gCcjDM;S-Yo-OU*jIq8Y?+{vxv_jAfj=bJS<T4@jMM)kcE>4iT1c_Hg@B{W
z@8N-@)Eo~YO5pd^EA^z(H-p0%7hG$2`r1Bnjli1hCNbThyHj9p0Tuy!=BwT>s0=HP
zK_QsB;F)j+pM~7&lOSf351Cafn&5-juei)TBQJ-rYJm0-ph@-UTObSkOztg$MqwWg
zm2MIXk^AcU9?-G{PbXL^#Jl70lb^iojaefI=?!F6YMX)o3<=tnmW{4o!oH_NWk!y$
zMW1YqBU$=X3Vg;(2!^tSpT_gKnR2F9<Hf-V9G|nSY!}P0Q{s>@Sg5iP+^=4q2Q2nk
z^pY0~TpfYwl9EB)-^Ji5F<d16op@$n%3U2|To@6_@(U4L32_bG`wHJ>C0`87#^*?F
z#ihMYU7r8<Q~g(zvi5&00Cyqv#LoM6${ijJR3sY4i8J0cVaO6}2s9v3PROENHkd}0
zteWOxz>*mS-dB0Y2Sd44i-ST$CbD))e(ZS6VyO}K?B(#^LJYV(t+vu!K=uShlrpT3
zY4#s&Ax{A{R!eYT@e7~BNu3kbVF>D+)mA6TdHj=805nM-Frv5mXURk0)|NpvNh(-)
z+xT7~{Qd=Y6AsG#65J@3R~$xu(Wq;~bsUR)-$X5cjs~C?OQfg};^*hpgZK6T+ka!d
zApZL3We=yR0$Ms&(F=uNW2nk8X~;~9ZE5qjld)ltIe015h)6(;!ipJCN3`QCzVh#4
zwYodv3Wg(qe4~}+Z-Gu{7W*`BfZNJ6q`(wiFr<iC*U(F}1oR6~+4rr+#j8-2WG5)8
zeS$fYa^5~ut2<~Y=2fy)Ta+=U13~nt*m8Wz!gl(ROhfkv_|X{E3d`i^-SJ0o5^{=*
zNHB6R15FWHT}q7A1p<*c7e1<*S@m<rbE%JrcA{dLM|a`ie?lv}L$RoNWcT0>B3h)U
zsPPCQO%yCKQY*C<cdlPbkwH!tTVh0yt9+eW((;r?zc+6;;J_oPz8Q@{Xv1%>N)(zs
zN;nQmGyhl4;1?$8dEa!fG!YOIlHM<ck4e3{wAc>OEr0B3fB^?_$Ln)eHWH<QGlg+l
zu-A*b;44dNz~a~_NkR(~1tnZ8XBShROF=eIxpno&8dh9fMN5NP9GA+Ajht{`#BxN<
zC4~Jx;<b-Dq{?pNMEJ7l4QTYf_%#H~e0`%AnPY$Z{_xLZT;Ce0Pb!eav9@i^EW_M9
z!~r&uG)IF2_l%)PaHv19orJ<QZ|4ce!%^7S@oY8T(#9c{onCPa@j`%h1S06qvCS&&
zTx7jW<h_A%sw1anZjc+5;1FKpC(w1Qf0d6emel_aNKG0{93_Xu$#Oa&%GPyM!47+8
z;T8LrwQtc&TSxkHj7~HITDkbxHbM!5+V5B>@NNa~JfF{j&shO0^eHGlg;>m6W@jX=
zu3A8Q&s(_8v_j$3TQC)j+D(Efg`P;0gA#U^AS%NcRTfH?NHc3aCP2d|A5%S}DXEEP
ze-KksRW(u{^Iki=we?oRA<N&sbF0aG&95|5V&SSqJTbxYMhA%(iuFTDKyL2e1lH}&
zvs*Rtv;A42pLNK|h<7AU8-;`6EYE*>r^q#;JZ1(w27(YNVw|7wkr)_Mah~M`5Fx$d
zh@lv8DE7)xHE3giO|Rx6H5GwZHr3%8IL};36;(wjb%z|ie4MQMiLxk+s{7kPA|!{Y
zMyw#kQ7M4Mq7~c5(R=CDDqcRSWEdB0P%kQ_;nSJnUkL84X9RBI&p5GY#rQCqTE3#q
z>V}Prh6X{)ImQ!I#H?7N?}C4iE;lU9$fz41SK2IA{Kk~OPUV^ij^G<?gWwn#nP$p-
zVums6IZEYx{%M+Fd}^LyGOHR^D(hCF$}36f>BoG<4AW$Gf|`}``~96~BQ8a;l*Tud
z$ZUgxS-z->V)f1Gg-E&Je~RJFM+^hx7EX_Jj0^@w_+(8Z{Y3Y}DIujoKH&+N#ky&0
zGMuzB&eH)^1x9#yKUC#5e=-w>&|J&u%Hk|<AKfZdv3vm%<uK1NX+Y!^W$vc{Jwgv_
z_c^W%FfC0-VuVl>Tu=A8MB<RoG{@IG7}3+jbJZ<$6E#7sXDHZSw`%Np<jkx@R*y$b
zKTn6P>fzfr!`Ua9j6fh`HLYN>9=IbIIcYro+02f?MPW0Ac}rV>9gp^>hHdq217}E@
zfV`Aa4{;e_9rsf5ZCa1mTPF9S>Y+$&u@n%Wz1{!$2sKk$=$=EHC*}-kUdl9529r=i
zGA=CWv}aXosvk)2$<?Iz%H{knHx6dO0Z@M0c?EyTUyE=Lk(wM<&#E68z0GD|*U;l9
zut8qaph4q+sfSP#=k$Md)-br)%E&Pp;$kGI(!?n$Tx^Fk3uOJbb@b9@hjoqT@+h><
z-%~&zP(EooiE&^sw8xq{#cHbH;n>^d+dE96Y%Rr-g?Q`tlA<ff9BliNrOlL6u!oDh
zK<wTa76s)E0-p0jRcHjWm_KJsXyp5@*`Zr;r>`Cl#DrlsH$UPjQfo-HSC%*p?P}y1
zJy73K%A*8fWSwt;^efXv6A6DJxsg8PYqy;Tt%M^n>le=2v&q74Y_<=+f8pb^%vi)f
z4Bp}?vCrM<6N~i*iGnnx0g{wCvaZMJWjhhB8zmL`%S91WGbfE@i{GJ};18bRi?4u^
zI(yz@l^w*!EK9mN)(m=t0w${dGFTEo|Jae5op6ZU%RL`r&TX12L1681c~V6afk8@&
zrffN<m#!+-r<BH|BC5WUHadwzd32sN*}m6!W6*MO*>)(4+Sh7+OuN!Un&_cOR$9t{
zB=<Lzu!?^p`<ge85lIf}W>dxzSw#3DI5YSnyD_JmTIk~1#&k}hCOswGd<t@9?{QBR
z0^>Tv;>LBC%jdN<V&XM-lJ&E)3m>q<=~)|>(3^CV<fmRlio|G9$!^38OE`-cJ?C})
zo<wB*(ZaSqVRNJF#e_*sjVo#*;5Z{ISWr1IAC0)?DfQj`;q|2nsgZkG*G8w)H@pkn
zvU-+74*KjQ*xfG%|MYqJe@yUBaT7Ei2>SawzGVL#xCr@-zzlBX-aUbynC?#+INS7<
z`?}ZAX)H_Ku|fFQ>d~TH;o|)Ux3M(`N0kGzQd35Kez-I!!dHHpMZHwBo;e9rgB}?F
zlvE=j$*>-7oin|uqFM)|^wOchrWjk4|9O#1j&mH9W-?1opE6%5x0k~OXb&E7L2{>&
zPceBxlZ&oIt)rsPA>t{7|IynYBd`NtVQ5Vm{+$RNAGn8IU-x+WH|0Rb@JIu}m(Yl-
zr7PSsmg)@^l3a(Io80u6Doq3{V^YT0JElvbd$tEh=KODgIrR=r%oth+S);mW)>K3W
zs6wl3+~^dq3zZ^+jt0$oU#mp4ST60h>mADz7Xe9PBv(0G<fW8VnqncUd3a1-%7BDu
zRz?@Xgm}XM8d1LyppeIe9Zk4)dbAU;nq-r!=1@`2IS*K-I?V~r7qm1#XCVA4Kdy}1
zDe%wC<%O<#dwHspnw196e0p@X+-{eGNA1<oDn)_Fo`~oSCfkCGq|lcpvG$0wIXAiS
zzZI`_mIPa61%SA+lutU7Ox`U^&pPNWvZofi(WpXIf-b5j&P}2f?n9+o`fSQcuR`e~
z8C=H9d(AV{1t<9^DXbZ0)_fDwxx@&X2V+@Evo=aTSUwGSbGh|eGVTA|6Jx#kxpy4F
zD~@>ngk9l-_m(js(%GM<r0=`DIqmTd{e5I=dosN7`gHjmZX|RfNj2I!zFCF1-ZK=w
zoOd)7%8=_YyU?+*=3d14ATOruymKJ$DH<_CkKq>gyQXI#G&W&#y~o(qY)FPZo2v24
zP7v;wutJ#=ORCL3fhJjP-LxDjiwowRf6ZB6k0d4YNpFw~JUU5kXbWeY$2y^V5UQ5w
znxtaY(o>RILsXR(d?Ux19p-GBBKiWAd?K4tsccmxaxGlJ;x}@;FhaRUd-OEUB+LAj
zm3W0^5KE*2(+-B#XWkF?p-r&SqMsliWHFKI6;NF|2arIHB1gMhCdF8(8g09<M^L2|
z;!U(G%bL2#3{Vu+v)uPm$~-t`D6ae&RZq!GKgLjyL8&muDl25lhCkI26NmO|51&)o
z)jxfA85Gn`VG|d~mntoywCG7fj<I_zneoP90js7LqdJc<qI<>6`%)yX#!sTC+{5dH
zSirCIVY#3{MCLlYn&k&H%o8A18tW8%T~V#)qWSUP0akIO9>NeQUGyE}l9C5h={t)U
zU-=EF%G#7bp{!hZA$c;NF(XONM?<XuO~#14Nn{05RSPRs>Ih-AD1*sbXlDq2s)dy0
zv8^R_R-V{USe;hAg1len05ThJ`IoHlVJy>vuOhGuJTF~+Bib|yC#K{8WhvnRnF+Hk
zJ|IMMTu1UpUjKc0`>&5<*TkY?Ui*Vi%_HD(YiHPlBtY_W=eGw{kXJEy`Q;o9mgzfQ
zmuF`B^x{>r0ddicUX;vy2jvN&zV9`PVE|cSkK3>Bo9z0XPMN>cp_h}DpBB;UJ)QOh
zhR4AmWPtQBokb5fxvUE<3{y?&t5n$b)(=r}>;Ymdn9fd!wcgEdkCA6~^p%wk<iLUs
zpLG65?*(?9ubhKC1?m5c&4Kxogxbri`rk{5;WFmXfUKfue1E<kpu@1rL|<(PGLIt~
zq?mh270VYn-K_O#r0A(*V-HzdX_98r6%Yf0)F1(ZyS1{6Q3xs76@u-T@icx#G&v60
zEbzb7vBCtV@k)97DNT|Nu_Q%POH)RH<T(lE09_%=4H6b5xLc<epoklF2vc#!1L7)_
za2>PHgf}hTPrT~s&bhCe#3X$2`1oivn6Uhsq1o=r-|otFf0yR%9X^PMj!2jHf#^a7
zyop={1Xz??<D@TQ{U%%nP4d?58K!eBl}TMt$M5o_HvWGjekgHH4+B*^lyO30htB?d
zWa9<G7}j<KV9DV(VktX%SIN5;jKqrVK#Rsqu}T@UiJMF~-^(l(cGXU-CFNVPyK?nD
zg>g&+>M6`YpXzYM!C1<o3)I!Ffbe&U>_SOZhXhXlyu|>_Yw0bZ^5x;iC~h_ij`)$L
z{+Er=YfYUf`0w(R8^UkdOx+W9%(+Knp_)@ooCP|C8%8_-!hC)W8$DPhm!;FAY;`t{
zUA?<iZ-?END3hY-bq{fOd!(jwGkAUQU2f@HTHF&c8%E&|LHyaJK0701@PM_4Lv)Vu
z&<f1bl9qj-PB?{BEvDQvt)SEq2&$aAg1gFzemyyWC7k^NOX6~rY;@y6BJi$h26d^N
z?CW4`gAP>7j$ezg4r*O3S=A#QXSe4Tf$B#df*O>X$=^Jg`Qd6kh~$dH$IwV9V>fCq
zs!1@EOtgcIr><I1ZZDf^BWIv;2qT%qCMOj`Lorr3fcYu8V+|{}j+J~N7UP{OPJyO3
zNT8&0uKII&gE)?a1k5EJWgD`Q`($1%WDW5sA(aWDCK3)|_9&?o*>A{;Y30TWN#!x;
zob#@Y^LFy1bCnfJ1KeV6RWTa^-P?63S&Y2vA8LiyWPA7{F5@E~B8DA8CL7_unPAS9
zUlaJmU=g@*^m4-uI7ofXCHnWl)EXNwJN)D%8!6bj6<%Cg8o#F=&`gszI16Tf)c*C!
z6?|R{I|!7L0ozzk0#;0|U)7?!=xo%bnJ@=zw#tlOtXaI|R9o+|dFt(~l_P~Jab%E)
zAw+dRO<zRySVuTRVI&Cg0ScGI%i;K9@wCJ?%IjYY_g|K<!<hZ^KCZgHo;Cfde7`aC
zZ!eBGW2|1_IQ>ud5wrhTjT99n#M8{(86_O_g-K=a3mu_6N*W<-JXQr3h`nN(VhqRW
z0;bhv@~!n>yv?&){g7n!`@4L$UAl&k@Q&6y*!S_*_TOL3I`x}e<T1LsHW;+>pe0K|
zL(o>GnOnL5V<yoV1pVe)CDs7C8i3X%=?{GJL2LHX9%LZ*&Vjbq?YX?~(JmcxH8<~k
zUE=_b1@~S<(=^`W(Chxzp7LT|7(dkCB^*~Ry~Z@Hh&3dg6INOFus34x9%PMQT2m@E
z&Ke`%cr*hO(`+U8Rm=b`hQWSODmCEW#5IJfZR6BP63{s-sRZ+e95f<7#y}&h7FFm}
zq##pNqtcCv19`G1k18B>{q|-1_Nqt>PuwDZ*1o>IapZIkk~r;;v52mDQ3*LSyDL@g
z=ljk}N1bhqT44wvnUsu+8D%e#6@!1@VeZA17nf@}FQya;!vtcE5g-MK9WztO@|UUb
zNX<}+tzbqj$2diXcL%^xMGxaI{Ryp8AJikJb7;ho-pWX1jYNwdd+IRb-wbeYCpJ<t
zy;@%yYC$z%zt$MO^9;6ECIe0&tU02a>?a0H0<(pB^50dYeg8j(Qof8E+x&xjjWm(A
zg-Iq<Wh@ngIK%MF=Fo2K@=D<hXknTEFp!?<_s|0Mqcln<4zDENLXwlh2B>1E<_OIA
zIbi;=(_QZN*T?Ceh(U^UZD9>!k`(j<Zs9dS*!N75sk+9cxh?txMMo)MEayWznbHrh
zS0`SH%;pPv4lU^oRyT_bdqI{x`|;-f)aFqKiuB}HoN4aXMlPvTr`rdN+?uuk&~)vs
z!TbKY<E^RP#BtV;tG15rk9nJv{XrNeqfPVcSMs3lDbn+~yr+d<RL*|!q5-|{e|LI^
zcvR81`!QjE#j%_O&No=s^o|j{501Zfv>5JHIqL7+r!Td2+8%3gj}ZHc%z;x1>%`kG
zTuzAM(V9Su_37Ncdgpw)iMQAHDL)Xv{7y_u12LmfNdluINl{8?0>AC7bo30Vt0fm~
z$(nfjl0`1Yuwrqrr1GnZ*<f@HO~+%{ez7P?#ZY5@vO!u{Q?~hR5o(xE5OcTXpLR6|
zG9ZLtf+rzSjZ$4lb-RVgzJy-&6}jY6d@+E%Zc?e4nmQ{n$|yC0q-p`DQj-Q@y{}jz
z4KfYI5C~z_dctX@bmZ~qcKSAfli^V0ZbWt&i9?4qwc)5G_lZ}|+p;)fSH@`7Boic<
zrpP;jXu1=zAOz=UC4IbJne~G@6p-^bKJ%dvVIU~0hIek>)d~At71I3<<-9ItJqBxn
z7<`_-7D<Eli#aX(n{ahzY_Nr8vD4hp!KnF@vo6o|ccJAPLg;NjyVwRolv6j7?PQ5W
z>E9RXDPaNc&s@SUqYtlaIl)L)dYw0O<T;@cGwDyc`J2eskfX8de(%#CzEFov6fT8a
z!}H8sOL#}|7N}4VWC97qYO>l|94I)AvrM%tSHITr>W*i*xTQ(4pSmS<#gj;M8-b8y
z*Fe64jT3?FfaGGwo`IhBlv%t>wG-u&ZG}vYb&gkRM<WCsqnL;;*hu}u-Br%5wT&I=
z$F1;q<Gzq#qHW@?F2RS#mpguJHT$}rd;C0K@AN!D&xZ!TXa1Twt~{rsuBda!us2qZ
zK-shH8=8+jFD_fmhnj%CAGKqllaf>16tJr;v{OC3^fg_*S!=tZj;LlF-IudhDBnlF
zZGlHiH@Z8<GM9ky+i!uthJ`qJ^{<ff#E_yyFR_vyxU4=p0){`Xa&UPXu>OuFAmL8m
z98%>i>d9KeVS&E=IR9WrZGO)pb)sr;yWB^!0G&6qw~e0KB9$YrucOw|!EF|J`NJ$;
z%_`t2eR`iJ9ZbP+aWU1lH!FcwsXw<me4Mkgs)h0)Ns#mmUYbb<ZR%ADY84y>6+e^e
z^GALvXsYTcMxN~;Scsr;M(z^mX*@}W(fIia_dWWZI_D@gO!oCbHtE6lB`ILI>LwiW
zZoa|AgbOVZ%yH1v&{d4_tVfg60Mw+hhW%js{b0d9O1)NbNAa--3OP7v7!)XY2mTgT
zR2xS2v_1@k7V(cc-_R5QB~fwnm%(+Y=*1vE>6^02`<*uU<w#2_n|g}ZQ<e2T<5Jg$
zvgx(iBm8l3iGMq{nS$<ja{h_IjJrTPUr5b5BkEmKFEyNhv)ii_-*rlJhWCnOa$7cB
zegwZ4`QS@NaT|T#Ip@~0X%SDs@|3GxSCpMIRazhpIX4{b(XG0L+uq#23FYdpfrpY*
z)p~uhTKDyK$TR8`-Y(1jT;b=MIMnIbu`CtFO3H*v<QItn++-FMI8$#ta_oCpFU_zq
zhB3<3>xphA1iWXok~0zW#GQl07mRlhKd!%TA8daVSh7AxfVrz(%;b~PS<hn0j=JoC
zRJ8a7yVzV@)lP?@-&!9z4s8IPA7muevYnNG3Ok3Etb`Ax1Hc+I!@nHm#~SxRsGAhJ
z-SM=XhyOnJ!<p>%OD`L(Lgacrsg7OOkVn7#nhP_07A>^aS?i1vIF@)jT;p8q98N=i
z?T4T~-RY%^dPNqxCr|(A?%#eteo!ZxhL=KMD)o><ypH|MK?t~Wd~OhK?~@WRKU-o1
za_1YkC2n@yVT%8tYSS%nT5N<zh|W>37U`5)(3g<ntf<IWLCW@W%Q-lJ;XB8(z<A+@
z@;(R@h*p_|(c+qNx|pEuE}gNEO;g5GWE)CO5!05jscWX3##p{hr8Z9nvelGCT|nB2
zkk`%e6~N%Gb}$5CNr)=wJE|cOLi-0Mq>bE02nNM}KIGN3u{7oM4)!ILa&?Ay8g|C4
z>8eWKZ19s^M|e)y|6Q`3OyU+#+qGjzzYbXX<EZiMn#S}kYAFkn1oX3>ID<}Y4i%#I
zMpMeaj$9)z*-%B$SSb+;g_`Ly+7Z7Wh)>89f%8OpzQ>vUydD-_7g95Mej0thovsxe
z_4r3g?!so{^>+Gc1JqO&N}M`-JcqwP54aWxnoaw|Lo?2CpQYS&kxYfn-4gbC+VEb(
zszxF$LedR7<lSEPpBm;KM*etBhVy-_a^pinx8fr39IGN*)7d>9C&-oSzMZt-(mDeM
z6)uF;FBoT5{6LDDn<M;m5iQufD_``zY1}<LCnGU93t*B~r39?=Q`Dy2FA_|82dV^9
zR#|h2K^jfLt$f13*LO2I3`;s2LY2<Q6Y#)P88TJ4@rXZo(UM9&v`T%{_YL2cPNAZ%
z4K5r6rFR)4BFt*n)SftP@2PX(M~3fw#KX!_OPngMOZY^Wy9PcdINvLrZLo3bxeV)r
zBAC#m0rZDPGa-+e=0cX&Y~3v)E+&cIx4K_%p!^@WNv;}5q!`L$F3K6DgmRQ*mqJ`$
zTpBC^mblD3@h4k{dsS}LucPa}M}$YbnCA`kGgc}cBhM~p*>=FPy23*v6EoSrR$zrF
zvb{fFyL>Q*I+k1CuRr=f?vHwJes{Lt07(2bgy!))?eWF_&HotUpoo`AT`>>8*rKs_
z3y@WL4NQE?E3fj44qen1eXG%^4{EydzQ%mtpF({;^N8zS#i(zPZLJrZxw{%epjWH=
z`@C?9-qfoW;}W$mwD~PCMpYACinYo;S_MC>KX{hKLV%c!C{}hH%S`^$gKV5VO2Fmk
z%lv1K2M$0W1?|{I>Q6r>f2JCHrUHxFT+ABBnc}H)vIroB1^&C5C1#jp7>a=0@6nrJ
z271=D{6<ObEHPXxNx3w|3<WjVWQffjuA&p)sAu2u*~Wj@p2v2@61$YAtj4o4#hW<E
zZ?C&^Arq^24xtHftL%V-or}d7EPQUqDGA{s=$KwoWep>N7gHaNxQ`SwUTPNSyUnjJ
zqa{KP?rR`-5ySyN=V5E&gY#_EJk+bWn#J?|%izCq=zp!5cP8%BYxA-M@B~eto^XoQ
z`nC;iTfL8zsj$WQ6%5Ocs83gWOdVhV(s_alA>)+&!j+(GP2Tm%q|nFq_J;8XNBk78
z=!+bAjokYQ&EwPiI-%<)Pt^;WOXK)G62)w%2`pMfZgXm$9M|S!U>=0qHdB@xk{!JN
z?zaW@jK3~2wISQ>Tg5rEbL&%?JGa>Ao<GV9=<eqyaSy1Xc>ewI^A|3&hv(a(Mc+&a
z;#^}PE!_~vD}Fn>%#ZcDPuqN}NryvEZ#iGs;2Al;NQ5q0O~n>>#*Tfm{TnoabR9gd
z(ax^?ug=<9`F3Xb-~9UPUQ6N?wL?&gLyk4|-D@U{bTgn&e_~{Hlr~shwa8OwYMv6}
z&HXK{5#^7wz@Lrd@3o>1Z-~rQ%yY&$9Brf43m}<c_{>CV?A2QxU@HFRuv1~|IBsig
zM&iZxL5`hBiu0veYty><?e~BY4<p@DgNxd(-`0k0y@R*(47wy^oI~fg42;Xxo_>8i
zq&I$jv>?3mdbjh-r_n0vOM3>47@^(%o?QRGTj9Q~kG!af0nb3??hocyMYmrEWxYk1
z0uXu(WSuRl)I+zpx_W%db_Z?}RUrUyifnq*0SPghr{U_~bt~KzeTTZ*73#YJ1sFL+
zJml~g_lr6~qS_DR_#6sNsxI&&UJN*9-XeljKKu^sgA5k@oWDz^s;@>>R*Z}z*1}WO
z<_@I6nv~QZXql#nSfAAotf^^IN$Q&HMU-gBO!uD#kHKrJmF67FXxcR17#I-*SJ1Iq
zNG2X(>Gsj$vk{%MUtF@u(cG?rZ?kQcE4+TCy&-^)U5ab*%6s9lrl3%5SPuhx1jG^Y
zct~M>E+GvqGy^kNl3aBgDfWk*Xmc+SIX5XS;+=~?!I+2eWQlPX3O-XxdhV71+%yd0
z4SO6zL<ur9V%Bkjx4<a*uWkV_Ls>MIb8$&+d-d15E0=kPTe<sW?%7XmK08GC1Bth}
z_aUp8qg(L-&5FNwZr8@;JKt~Es?wBo^-?e>We4BjF#TVqzUJv)LJ)sk3+wN!Z|ff%
zj3dF5wRUjs9^mr5{=Ia(LH!V5_5kzk3~fRr7Zp_?Q`gSdG1R_{(?zIWbALF6Yf<bQ
z1$;0#>KpVu=7?phC9QuKuin16JrZ7l%s~(1d{6&4LEL^`BB;?fEUHB2??BKt(%T9D
zaQ*dhhs*6>1zO!!rj^I#uCOUFB9!^<_5AU9&z*^mJV=&g_ttgqNGTzM27*=K@yR5d
z@f0+$QxUTFZz+zp10U$ln_McZVfX()!G50>T}Tlln3)?!rRW=xW+j_`#P<jfcUCln
zQqH-8^*C0pzTLS;IN6+Tb=ebYnXvOc0yFlNNmdz>M-fZbDGPN<XL+<apNsq7M;m?o
z%nfizUbM`6^v_O!`aR3loihW&)b$3}S-+M4&m(e)%WH3a`>>;i8I#J#-b1kSKoVyc
za+5idz^-wcaV`$i^^wb?CSXE3WZku;;9o#*e83ZXuCS#}D3asNaE-Opde5%WR@dXe
zXb&Coo&p+TDDx@weR{cpXY@T!0fYE{Uo?Ze6M5L^|5$)i+F};(iHEB7jZT+5<r;{c
z-@doXM!UsG-?a3Sv=Y=0%pM*d+I*~jRrzpx%_yGay5sGgZFIW@^=iAGk|m3#Uu=Et
zHxX0CHbzNZ#Ix(=nGMNAXv&23z>CISYr`;3fQ?zwNFAaLy%9A3OKC9200X)fh%EI@
z5bAqG`>X+Mi_ApDp`v8g6VH*Np6M-Xk8bUE$;;%N1Yg#^z?8Uben}J{x(<U{21O>d
z3;8oIJUHj9k-|fL2X%N-KN6I>n~#KSX7yb^oM$b-y$JI5sy9AOU@Sah$i!p=LYM!K
z$KOVkSv(h7mK&B;R^$CfHkT67VAmR6sY>GeC$>X)&c<**mvF8xsE^-s#2S@J?WASb
zPNqFB`8(p-#ht)daw)=3;PuXj8@6rm5}zWbaTTVs>`l@+90(xm;<EX19S|^~Mq}(o
zbvW0?727_&W}9;`7(trwIw@>F*%N4lc?U~S#ki!v9a;(Y&tPubJq&n>K6}0H;Tu1Y
zM{0yRsQ|@V@X$ToNuf5<fBJa<Kh6UJ(kGiT77qvr?c8kdx#;Ct?dVyT`tm*wZj+nF
zR?5+4MblAqMs7X@E1&JMtWPth^EKm;lI)s>lpdL?SiyecjEEf_Xwxjdvb4qI2m`fQ
z5U0ZL&Oh%Dd%6I4M5o|4@!KZE9gPCD;?kYL!zKP#q)}=WFH%1=h);e<6I{D)R%%q*
zppx|Xk&F6XH?Gw=)OJXabI@_j|1q-JVfLVq{$?KT5#Sk}7oWR#(^SC7!!zyjEnbPj
z!~=@@dc3j`^X3mw^}Oc*yzLv^!Yq+tuE6b3=jxt(FNrD;q{q|WrzfJmVdA(^dgJnX
z$JF)x@nri6K^Q#Tvn$*Kb#})3GvnuFreGOiuV!m~pNEl8>bB1wxnnk=%Oi-(_GtRK
zRDJYL7sv3siNyg!O?T~RaL@Fc4+8n|Uk^jmYlUyhSf4}St&lT&$IFI>mi|e?o?Yq7
zuNm3T!~w5xxUH?Lq-lWB{9z|H<ArTApELEX09@+9<oNeBpUcmk;h<JXg$$nZ(7xme
z<#g2`{9dqNiC{DiO_Es*CLt$=4TBm1Rv2QW<Sra5U0j49$@Uk`$Qjrj*<ex$0BY6e
z%xZLwHQ9B*dc$gAySU{saBc!On;B7!N7kPo+b0_zm>GU#!B1uPMT!jQ4m9`{<p_VD
z@YE%!lw_GndoT&aKA@1e&aYI{X_4){o*Txeaq+Vr2JBq3iQOjDetvdxhXlG4X86cx
zo%dJtvGaY-Kc=^QU}e*Cth}e&n7XPa7>pLH+t(gFL-37_VJStv>|>zGB<f$l7Hit8
zM5T%qs956{%qYvE)4%J|4aDjs$;;_EBk<{9d|`!}Ft!Y=6WkO$@A%!`KK`rn?l8;c
zZm*<j?DWD08E)W59!amO#Uba>me0kb|K(#>P3t(4{Alj2^(WJcP(h_b?yeAvR`Ht>
zFc7#m*Y0x)pT6-Oe_zR|#AYq<6WdgiS%i!hi%2_Z>D-I<asbJ7okYKR<__HFtGdwQ
zcq~_aY>^o5-(3^66|l_K4yy1CfJ&ulHM8MF&V>t9YrGf(3-}O_i?L2gI{P|{bZqCW
zc_hTB)ntpP%NL2#v^}(aeZgSvOrrQ?#c&qJ5D9_aoe*)~Q?q&f&a9(T{p<HQv1YlH
z)SK`2dM>(-0-laSUu;o_z)-eh;<Ag{Qu{r|_i0voj!^@mV_!&TU>UW3*SK^EOiMK*
z9xz5-c1)~_YK>v7T`E}-K0a`T7{yxDQiO0PqoSb}<B{MZYwm6Mo(ukXz2|V$p-Auv
zn$zU@uuc7*%xT{EXQR(g!GLb!PbS{zA%P=q;6EW`fDIOO;<fVC-6%*Q)YhI6J2F!C
zYmB+fFeO_G^*0il<faHOd3%oL@)4FGYc%=aGnI~YU2RGh&ybV50@2#<aWzdZom$$L
zrAH?u&bz`s5zN9afvX7L6x$X~snNyjZFG+hb9XR-ioxwDKTv9#MOVB3Y&5}a7>9|7
zsL>a}pK&4*-fpyBaXI$*r8Tr5cMhP{StsdN$5B;iG|Smzr|Y!3=SCl`#i0V`%)t1{
z!zz=AF3VFp=Qb#{qp!tw8Z_aoj3~<Ot#af=V(ExRjg1sOA!1|(sMFUfas@UxV#{@v
zU;dI8hna*%N>Kp&$jB2}W{o2POZIGu4doO1Y!=FvPBrKxqt?IMJ5;MMI0)--3Efp@
zSeq3JIZ7AXMBoq>d7~vQoqkWMQevK6=c5)u46=s#DwI#C61;rsb5@<K$8E9*3$6E?
zpkOh2DRm+J5~OZNgE#xKW4z9N@pVEYk7F>Wa0Cal75r^R3tZe&QV+Gj!Pl24_He55
z5LkDiT4qoMQP>4$%GIh+t}P-7srYJq3)Q`OM9HyDUb5X$IjK+qQSjT=%d<Jqa{Q;r
z*KDTr)J4SNC`DT1e5|4*QOmEC&x3jE!^=HBw|~r@^9B-ffFh4V*dKrKIlt6Yu~Me=
zbU(-QZe6I+e){glP750qpU40YYj|gCNB{T%EKy4?Ny@w!^OutERT1TyKJPh%iVw>c
zjmm9<g#Qn{aCceMKJCDNv8XBGM@@3dFS}v$$a!PVEbEjSU86T@x$=+e(QB;9M8SS=
zJc2|6Kj{~4wA<K>2G4aROi&3b%l7Dyq=8Nr3Di`7zxy6d|K%qN5%1}*`S3u!9;8Up
zIcLyT{&CCwaS3U4(R&dS8=5(`*y=`{CP-R^`BlrAFoFNgnfO-@DNXZAdoDTu&y37f
z3I#X^MDgHqk>DMLZ!N8IpmIz_LTHrG3Wo$E{_*FwTf9i<Hks7ZLzEvAH7q@iBgHUB
zLNwR1o)^$Y0$uULUt?TeXDElQr0`|=Q<`ykeco}FtC`t6TteFh`8NogytHayGJ3e;
zbg#;ox+X{h&IP{^ds_>GrNTZ7+P8Shw{AcmCL;c}vARGbbL|j?Dciu(@5fOyD!Y%b
zuvxO1#I8xFWu&#n(L^Tqg_9CY)(?#N+E=HEWY4)lJ4rpYTkLPD1YtLJyPTWKT+sa{
zyR$qd?0@OG>ENZ+DR-U8$x!;QBwad79JLIpv~9TP7RD`ZLKU^Nf1uFb`>_b6U{{<o
zE+vxREth|tIK3vsWaLtmU4<fg?QSw$s{qR);Y4oDRH8g+gjb!Wz1f6_s!7ktT=W{*
zrrQ>(g|sxVi=;F{Sdkc>)8C$1%nx)`Jun&<yJssQ88=OXLfRxeE>0efXHUU))5gre
z^T35~SyZmkl5cz1A%tD)0o$Xda*Jw@639=P?WJHDH&s)bFWbNEf4X!?HJp6$H;OGl
z*uDM&_egbFoBr@^5k<o4E9D9|y7;{DkM4n{(7A8%w@>y-|5We**ox8^C?^YqOpaa2
z!)ZRzEbu1zDIUr$tU^Sh)+)3-I%%X>v%05%c@|fw<+IInDF##3YWLM)SH2O@aCn3i
zgZ{GF@0I-~?q#@tMthmVF6QCE@ML9+4u_7Pacn}^u<D~|;Uyq*HZoVm+Gf?gNe}Le
z8~SAbar~SgC(d@=R!K3)(kgP-yT8Xfa>e<m;sqaPs{u<0Fil_8vFee3>LT@{ZRl4&
z_h~^5foRxbki+3&6$Jo*RH7fu+O1qhucOP8X)@V)+DWujd{jLlQpJZ)epR#r$|k1-
zi3zd{wp(xh1PCts#!1!_g=)4peRg(%1GTTuS{Nx?iZh;*KE;&a)Llr3kn%c~T$=J_
zs<eX^o((<U55JxMHd4E@*q(HcrGA<)co-C0H&pRunSnQ}{UP6=!KRN^=po`SO{f4f
z;LVlZX?*>8>b!TFU_rr4HPCVQ%(m<910gKeJ55=Tt8Z4H*sp(IZ9<~qbpOoF8b@bc
z&F4<z`2PVMLF2xl2SK`^95AHcM`WC2|06RTIXKRAHb_|2v5OfFP5d2y^TWL@nY*X8
z%#Y@hY@l#&kFv-*FbkZ7Pd&k}KlcfK<#RJUzHb|SwMnjdgw2}^oVkO<ekzk9o2gOT
z2U4A8c1pvNXE<9v$=K;fIDK-MoLpy-1dHJj5~&zb)5bJYWYcLfu_adP3l!GoDO79Z
zS0LnG=i1dD^73D=aub8$F_(?y`?aV$0tZj>{L{0XK7NqHNA_`KI?DcpP1b4>w6?%7
zZ~`V_LsBbMSluXbw+=Pxm-)NDtnhlYOsUj;fxP?fJnv2lCUZ%=a1tw<;Yg}TWow=v
zy}AUufO-z%Sz<AhY%Iyh@CZXgSwc|@>4d<ka-^`#<@vpkV*}51@LUj{LV6BT`I7h^
z8p;qTsi6sp6gnX@NFWj>7LAZfBuT{Mn7T!yUZ<fH;YgfVIE00b>(r^$YZOZb3i(a8
z^6PA^FH(O{OaBjV#S-}Hw7auKK4|OsHuo?#_!(uP(bGTHGIvIFTDqhZ?KU*uR$EGB
zFR0S+o4ndjsE-~xI*q$MOGLLVP23%fc8%yY20E#=kVcyY(zKoD->a$5K-vBdSkvV0
zgX&QyX%{j|dd;t8cOH~z^)vU_5l9f|{;#^mZrx@*CFs>iX|tC*$wEyNeSL5pu#M<D
ze;;gVJD5AQ#~drz>4&c5p29Nqx`*TX$F5o>Z<eVM4x1ei@JpYaWGojW7}N+@I-#IJ
zx$5xR8%w<Q)+&b&4DrcleNl&K#9(oy!V51i@ZzhxYeb%Xa)gIZ<QUDxa6QTLT9sPO
zWn?%^IuYdgkJ((C%k#DG-lSIR2W+!5X`X$2j8wuxDuv^CXu3ZytLrts^MgeSMIVUG
z>`(L9Ls`a0B7{OF(vxiD8=N`6!JF@{5)6j;^mC(33`YouOmssd95T>!!I}3q`0H<7
zXM8ly$DbZ$b|%f(a1_hbX*6A)f40OMXIJ_5i@r6C9<uoSa}&%S8e(cZN+K3SO37xv
z&b7Hb|KV#_C=>_3&1Vk8I69L-Xgcc~{;?mNjx%#GNiGw?b0t6bT$y(-tn;n!?Y5$M
z{NWLf&ZHSi1u%4hW#|L~2E}rduYCO)x0lO2aw5yeo}OU#P@15n^VDPG{MFxF<MOq_
zfD}NRgO@wNy~bxhImzUBj6^IzAfSU%RH_bZTXka5E#AGbvFlpT9!xVn5+$37kcbB`
z4UJ~QW3y0WX}Qdq_tyBqYd?W_P0ziqdj8<JgKv1(l}OoJkWJ^l-!tMkl;GK?CO9;m
zBAKwTo06rq3gK9g%Qs5o(qV+qkVv#PQWL!kO^9Fn<tZ|$019wD<@-%aMWNVaW3$dX
z7dFXn`{3rGlNpZBq{(H%1TCFf!(-ug30+%d{#NOpr{>FFI7ntF%qy=ibN<rS2lj6I
z!l$P>xG#-m>J-WiHn$pRhQ|1Cm~=A8vrkX5xK!r#Gs|4QR{W3Ref$8ZeQ1%7|1h?p
zT3aPgwz_9Ey*I1jwmhi1K@h3^%pRHL<gpB=Qvsad61B|&%f&Ee(}QLd;oW9=X97(h
zgUK;wQ(;1;hR_9}utnI65RVU$N~cN1B19u$;$a93*NJL^8*eDyyQ@<23-F^b*CPjc
zbpI!rJ@zGr)1!=Kv*d=7jEx(NimMcEZctq-W2-bn8J$yjoEx~kEDbL}z8J>|pX8a-
zr<lojxLYxl8z+=XGZK$5Bx5v34%3WI5s2vsr;gWfu}hM&sG>XDlvdv5t+^mxAV9*p
z$>krdw#=wq)|TJz#T$cTpXQ5?jgn1;2qeaN=#i5=eR71U;SgcHid#C*=FK;#R6GK?
zlL#~3QmHf1tt1iPuK6grNT~!c0!ODfHZ{ytCQU9Taq8<_zHyy1@6N;OPKcR81c%5B
zg^5HHM8Y9Fuh~*etkSGi(G3TIODGs3mz$!nzR2nx2UKxtm;@1yOHH}HaEPW*njj!d
zOv}X3EexR(2t`Pz(`2$ahSDjb;RvqnP^y&B?It>kX1PeYR-jVZX1kncYio^_<p;`c
z|Byz%S6Q3CX$Stj<%X&^m)!ZCuh{P^X!J5Z9a(oJdJ-eD4`fNv-JZ|bsSXb67^KO5
z6ef0ntL~?wQ%1O(1G}5iaWDHM2Qp55OkoRLAXGOet;7x<PwU&X*kK;MGr;T28@>%&
z`?m_|3zBs5-=gJpCs9K6>_Tg|!tJ=Wa@RQzjtzV3G6#8(3GU{_u#=!v_rO2)&X<(n
zx!wJpn9cB!$H&NJ!swbn*9A+fRiu<GEjJk-i!z)GapGu(vEc~Yg(lI6$(c)=Z0EZ#
zv0wY;8J_>xK8_qp;dzR)7dLt7wM7<gS9t!pah`c>jIq%OYa3%6K9J@s-?+@BYu&&!
zle9Q>Jj3au86pu2*Oh2OU^|jG&#ds~yK59$abcm_WPBvTN1vKxYCKB0V)M@Vb>?sR
zUuZNMWQT%$^r>;CCldq%I;N@PI3Dq+g>6f8O^}EO5I`m!V*ix?y<*vB=0J*|rSsMA
ztn&Hi#uyuof>K067PALaBw`k}=kd_-EU~D?zxu!4*){VgX4CxIFCXF1fh5}noA11I
zlfVAfbuL{l@XvlT%wwm9nVN{>IFb`bv*fZ7{@tHm>f1&*q;ulP5Rab9k%;+VO#w^G
zWeTMxue`ZNHWy)HEXL_$S<>ksvomSJA%p+<fB#V*z~AYs-hY2e!a<W$M>Cu}mL-|6
zs8npO-z@Rg*)`OTKIZ2?I>|Fnj4?GH$Fy{U0iEnnh@n&%)6#GqNu^?Q>R6VsT$KOs
ztJi)qu-0Y-TgR>KantLD|9rMI<&aWRt=bgIgM+PSpBUkbzc9l?Cvyy?LX;~uZ=6}<
zy~~??>wC)_J`iOn6~r{OzO|+o_#HnS=HZh$9y^sI9P(L3UDv49UCv$D<b_vmbwC>U
zmQ53*aX#|+DA`Py)%7ahfAu!!F0J45lzjT56MX8U`$#4Ntgcl)5TG_X9O6I!r6WA`
z=op!Fi0ktOUU+$dAHTJV(lwrWbeLl^X=V<laUIFYqZz*U@&e!f{;i++_wxgw_F;{7
z>0_(>QELYutuhMT=e=6R94#sx&Cf!6fL)`~s8Xp1DOzQkr6%Q??`!4S9*ug9YNtXm
z0Yf9ChZ3ZsX;R4~>1c>>I7m1eCY6kkjE0DZEld=iBk?dWOdZQe5{o~^`0Sg!ckUj}
zYhQ{_A3n)br^gt}jxjYFV=Pp}UcJbz<=1)h%qoRygm5Uva5zIEb)2z@bDY~n=!|ms
zsYf|E5h7?82sWpfoS0%N<KkHwUMPV%Iz%+&q1C{O#28LTNd%f`wQVZvYb-7V5J4M}
zzsSW4Z}H-}58}e*;KV=WfBI)%<O|Oxh{|icb9SAe-Xv`<6Rg{ms&&f6o2*>_He1_o
zk+lCMvE(#fqkyRyjN}qL`dEOM-?{_xjgON&IL-c%4C$DGt~uC^CU$w9jZ%Yhah@};
z+}!b_5SRx!dSaCER0z+rDb*E1H}Gslt+7opzk(7r;bs(57nn*C45ygf{|L_Ici0+K
z<x{M&9g*lw4^Ie;K!9K{L^Kp87K#!}BngE>C{1E$7OB(_Lqi#2(I}b*C0WE(4%KP_
zyIP@9EKuIsWOHSKf-_(aj1a+46d^q9Y7x(Sz_9%kmZu)ZMeFcXqE%NX2LK(>fd+om
z(M>hAO8B&XupyAh9yZJecWPHgz4zZf80vutiroy@9wGm(e~F!+$$l`!PR40BfwptY
z0}BgVtXf+{vfXz^-yC<vI`#rOV#kTePM@IGTQ%vQiPnW!-G06{z|v@!qYV;W859)n
z4XETDY0JTtl494jYL7s`!qm0Sw-AbY-DP8|9XQ&|-7N6zlVhY3!4A8bNqLM7M~TKv
zY{w=Q4-k)<1Ohs#WRQc?Ngg?#<AopI2H>}T^(dcv{vd}BrHF=2uFmJVaCws#UhzLS
zUXwh0GRM?JoFj+QBw`l9kjWqX`*Ym5>AzTCeRGvZPUV<AkYa2kfN5$drLb*DB5t7@
z-FewquQIn#;F%}J(KNy8dX=kld4BZvN@sGeT+8$Di5y2~he#!YC<V6TF+Lh)EEnSC
z*H^f7d4sXhC_=#4aD-$ch@op7nMw1hk4|G+2FoioZY`JaY>!H%$w)3tGH#KG1~7G<
zM@|j%`A<*r&A;mpSbz1GW_k9>afWjd^7%R&n-%{0TQ?|FYW(1}+sqzJad2OXcr3ti
zBa4!X_bzVo=GiWD_0nrgJaQ_Ft_}N)m8s#nid52JYCMK{c8#VjNhC~C$p9hCU^p9Q
z|5TDhDok;^*1a25yCFn%N(g($D{n0_dnmy}Cvq5?&eBSSOIJ6zbY-2hm-3zOJ@fbo
z$7hF760XkWsn;E(k_=}foIIN2;B<;u%px2ziG)oYNAm8)O)g%2|9#PF5VZ!a1pMxi
zj9TcL)-uP|DV3Ytyj|ptGrN_>P90D48(%ugBPWN+X2LX@9yf27c;)p)zV$sn7PvZ>
zXCq&0**WdXGXZen>K04OB_2ASWhfm)*L<s!O2tNKid(n)S+Y0Ita0Q}l7~-bv2Bm-
z?K(><B`#gNw=&wp`;&a`(+4?qEJLO0U<_0Ze}CiPbe#X<*N*edlN01JVOG{EEG!lI
z^KZ_hT8%n?@y!yWxe!wmaSlu;NvA>#XCkB$0sizS0pbsU+J8!nnul~eJkLW)t!vKe
zi(2~%kOI8+^X&;d;k(@9D5&1z+}s7Gf@#X}Eu57#=9cm-t`^xSm8rB#-^C1xhYxXN
zI88dJBcy?;TUe%r5sDCtC&;9uq+%8!Q-b4SYYJr;m;nP_jFTFDnnxZ_pocE-=Iblm
zu|j>wBpd-<NhB7bXn<t6O5y7Fx$*r!;1B-<uATVj{P$nTFg=tc5>5~tq)jsRC{LX{
z%+XOnb3KkxJwR@3grRtmW^;tG*fgmFS%&mQ>Xjm%?cr6{sjgHgtl!|;rPq1)YME83
zA-0#ey756>xG<^I5M$H(*nc2Fq`txR3s=})KTBzT4aZwyr815dO=5&*2v&=@O%LUH
z1oR3xo775qs-*z{#TsS&@G#loIMH~BkQKtvHKbdoQP^N*=>k{ZtM7<@M!<?dEC8V(
zW6>D#XqZ4SfafTTdX0wb;o;)xP_1rJY?O$U5=0^qLRNsFW)ewfm_G3c?u~aS?rcF+
zA;Pf~@gb9dW@3fIgriZyp)gh;L^_=!osNTWk*<ej1_=Z#T)R%AT4if{ll6^dHa1tu
zZ!D5u8+<WDbckd$PRI-Z&}>xj8s!H-?WYOYe4ZbH-ddl;04`||RB3NOc3C62Qxj41
zMKV;Yv`%$3^@Y~+edQ;ygtmjjQ9T}B9rQDZ732;er1wnk)WfFrfEqf-JQ&c40X-@G
zeILCn!JU=#d*EibrnFUM*#cdnr=drvHYOf`v*Zr2)|v|;`a$LZbk%=8YR7rqL$BJ-
z@2J6ZolXU@0y<Lp-geSc<hSd*bFRB){OMP(@|jQWV{$Zx*^)umG~dqQ!j*MC{jmwg
zNBk1PwrfH#pkrG886G>F;@KxBm_3{(8aAlb9IoBi=HL9^=R5nje7(r)@2oOCkszH4
zGBzCH$wx-m%GdZme!uG}^Lu}Ij$|T8AZRc#5^eQ#!uV*6&whNGYdt+-7p`n`<7R<!
z#pcCV7Wm^oyWDr~ufDm;sbe`#AI}kw1#uk@$MevHpx$t}a@_|X*A_}31dpB^CYcO^
zf@s)c|5Sp@H@5imuXlscbC>fRn@y8VhtPGu1a>$RVgF>JZ{Lrc%5eBlnvtwunkmw7
z;%J61fBpb}{>>Y_b#{a2KU(0C)5931Ml@_NF&^j0%upXt19<D*6`p)}oS~r*D5F(c
zr{Q^u_bzPmk3M^VOe#z;U?7!3*94)U!RSz^1JpX1jGo&@?pQz8*6YmQE^*~r9-+gx
zU!3PFU%%cTj${I4hr-kwE;kp8d~Jv9{XhRFC-}vm(>c69h0q1@xW(8=l%q50`vPi%
zV?BlK?9PCG_LI|0PbLWjbWBsDQggU@yT~iAFSC{39UpxDQwKP8G)p!eMk!d|@R_Z@
z`kNbl-&<a(Azh!<-|Nx*w|{(*sfjq*Oqf{M^oau@2!%`rHO##D@*F3RWZ2lM^Uk?d
zUU=zVSt*S#ec=!foyaki4pS;^Q*Zp_#@qkoSB~<L$H$qTh+{h*S8r_dt?%9FfV9r@
z`A6s2H<@507bTkxVI0rWv|YCHb-w%Z;sc=eVBBqZ2v7QQ(4O>_)Bq`TG@+wu214_?
z{n1k4VW9_-X!UKRx&;?ZzF$gkJ?x^&>#Qy<Q>^toWTDfHpPu2^zF|gU0Zg|^wc_Bo
z65EkT7hG51IvSoQX($)z2!w7D3}|SY!jmD)@D!udL6kX6JiE#5wE~;@6>i_S#V*DA
z>TTw3ox@w5C!DJywF!*jWoj#zxN!ll0n`Mh^3c6H^=6a8t}^G-OdLJQ;r*k`WD9IK
z2BpXp>0E-SRY$IRc&<Pg3gy<Q6&G1v@>pxmvlu8-Tz-Q$Us~bj-^+Eo$@caZ+odg5
zRvlu^8chfAHn1ya@yg$zSo?2CB#$w*|C3}#AHxleBMd06Tw?9^TYUR#7w8rZ#Nfab
zM~0JRl3~IT6C)r153jjRaczaAn^#%rJDD_y5txW$#DioEg{3@%6quS$v)Q1i9F*tK
zbZnZQOG7D?rr`iv%eV2YJh|K`@kD||G)O!UCYzlk5>2qRvCPG5S3p8!^aMu^9Aa!_
zh)6(3xf0va(L*7Efgor);jl#_9z;o-My-b9I+TiKid%U$*VkBIU*`7h%hc)v7HDA+
zNMwkFq69-B0)~MQ3eRcMY)U-Od9YOc)S;Sa^%dzzZAbB%+Kq%d<#>J4?fsxmDTxq+
zgLTnjfclCMwH@FOu}2KDv-hgj#(Am$03ZNKL_t(ny+iHAdC^u_>;jcRfK=<4@7{^I
z>jgDEnv4SgVv7+|+Ae0Tk5d#q0wOIFaoT-ieaK4sJ#13+lz>WlVOUp7q?Z$Ir3sbV
z1B7?~-BE%R;+{d;V9H@|NATEim{{0n86=YR%^Fv3<T<mW->A`WaU6+Z>McWGMX}uS
zsj^)>39cuxl%i5|SXr-fwbh^UnNRLx|5So-z{GYu3Z*71YrE^dUweCnPdz(Dv*{v$
z(cvh^XEV$mNN}Y`k?;5a<O11rm}tZ#9tofcm>7-n^kd^(xVqV~7ML81vand@{H1mN
z<SSPOo`0#_z;PAQlRgIb1f_D5t2g>V!`f;U+wqW|Uv7yI=$b}-z#3aB+caITBghd5
z>O{g;f8b~6Sf+-i`_E6n(uv0`;_>eH>U9^-Q%KKGni#rZC>`9jzty!GwYuZCz?**Z
zKq*+;thI8~66r}iS0Qw$Rvp&2YFxg)wdXD43$N|I*MtzferA;$3){T#!`*?mE}&Gk
zxw%;4-S;+keg5+6D}3b9F%IodqN!E_Mu4t~pJ>JGCb|6iG>m?6kg;5p=bo8lVl0Z|
zdX&md<`#;4|Fv8E=~u7r+UC!He1g-*a{hZ(6I5#ss~c6`IlsDl|4O1%SEg=I{;cLY
zy!+ld51+^p3K$4YVCWiCqj63j&vCAYkpx&=bGW@)Wqqr`n`c&8&o}RBF8=AS&hq3V
zV~h+(Fm(T!wC$e^sQu$F&hpqpqfCs&@FZ;I>s-3F#n}t_f#1JyWs}2)(*E-qH90yn
z#K)hRd;ruQjC)G6pp@5XwifM|pXO&9g|N^?vo9+HI;Igsk0vQq>rlN(^>UEQmIiiV
z$IEY))bSZk%uKL9p<y;lY!=FFl@xWtScwQj!5{(CKuKS5NJxe4cqk-NddOy(a@od_
z29_QtoHCg-v&6DC&Bhj|4yT#B{4Q_zCaEr7;k>XpUkec&)5#7sNLIH|g#sNCNo`Tu
z3a}t=aQXT>{9tE$l692X{fEd7MTv(h6ap3@OGhYh?FRMg4d$<JaHBBFba0XK!rQ#^
zy*b|eNmw)SC{qu`3EEpMFJGpzeFrJZdX=@!W#(_!NqTh}M9?D<j9iRZ>LA&|G@;}u
zv2>QO>rzvKt@T@6x_FV7|F#X%GO&M?sj(!Z$r!0bm}tO5+C?_kZnM0y%=%`PQeOqc
z7+N;NSSm>{5&~TV<)L}DuQa867FO9Vm8OmD+P-3$kbbXGOI0cw3{WUmS!11&Aqd9}
zg5fyHV3bjFoPE;=nLYL}c2f}uB}iq585tQO77#S+4N4UkDJ(Qiqv<rU?K-8cE$n)g
zQngIER;F0Yv%YeRn{)F6L%B#`h;Sl-846>W7P@YtX##=7b$#m!B|YSWh2kFsPV?XO
zvhQylu+;JR5<Sb6q`&57caK=t0K3PidXF+Xt;YtUgW3jCV-nRT>EC6td|;^hfLyx=
zZ#OvWe%@;gJrGFk0oVjBof9?S!=8EB2@r*7TLh@SIngw=1CaI<m-e!YJ^GrWZ8acv
z%)ih&rf!`A%1(*q-e%Um*IExqyaVXk`B86K*r3h-<1fuJJ)R&IHIPbDDm6HBew}Z8
z_xb>m!Vld2ITlo_Hu<~{)L#DaDi0lB#IiKfsUXYC6<+w^E#_MNV6z8PB$Gj8OVp%V
zb=l1CHp#qvb(?a<#<o2yOUE=cvY9YXKR((A)Hb)Oy!h$@*-V&IN3-ZAn5MzLsW_i~
z{s8Y>++cglCJ_&Ed#S`%zdg5i`nJU$D_UNao+4jp^2QFO#is1(X%s%|T`V^S`gOT2
z<K?z5S-Y>Vcf9e=2Dg_>jEzLdq(fAyE;nzLxqM}-Z_Y*QMpZ5U*MPY@WON({>B*Ki
zq2ZgHHyqYC{A2t2cW-ihHcK#Q5DFUHUM}<Uk8k%cJ3CrQl~Q;+`p$mySB}zbdi?DV
z=DEFC891No8%<u^*gGJv)Er!|rBbU2noW;Fp~2kE!UwQ;`X^zUI#Xj&-g&nTx~BN(
zQxhCMkfQ0hT)0x^^0hoK{pc1izB0IBerA7)@v$g|p`nz-ZaS>2)i`s0Yv7uNwyS7-
z*Y{q1W0mKh+ea!DA`&vtHOLGFIWV0ZcrII84G@ZVFWuYRJajz6%z+fc*)W!=<GLPF
zsh)n*_dh1b!aV-)D8rcurmj(Mx@>PZSX|j#)a1P@TYU7X8ghRUq3H~zgUlQp;<=~C
zdFe+#oBoUsfZB)1sG&UHoUrrC_RDJo8p6;qbm%g<(x;?_j%k_%0xr#Z9jL)BOc8<c
zEaRCZ!!ZrZ&XZqRU~aL=25ACANycIcQt2e=ghkZU2$&KfJ?frKwc%3rs?@g^Szaoz
z-iQ)TWk@9>SXzQ$I?QA=ht<%D>svIoZgZj3!w?xkhKyCVuDs6Ku?^U0U@TqWa=Wr*
z{tbTcYKFPUB`&<ZGrKYk2eORi;^?}hQrIA$-(<b&;fN>&7RX<Fi8sDq;EXlPqlq;d
z^GjT)-p@5S1{34V9+~3UfpNw&Cf?R1uD*MN7hc~BsGVkFJVMX{L-WvFi9)BTXYi88
zNyKf!Rgb!Y)zw=p%*}K4);2e8-R9MoUgF1jVER$^%?>l33=pP4v%Jm5ttFQ28g@0$
z=JFPs+kml;^mK-(X&_vM84CI3sD_Tx1<G@g%?8qSP<VJsM;98JuHiNv>Yj~j>O?|e
z!iGRK8`zG4Ig}%k(`X1mBpe|bPLNI{Nkx)`!cjsI3r#3I*TZu)q;3)p1qlW<OkKzG
zn$&HNdb3KglxJ&ugK}Y$YBBFCIF`2A+T0vCdy!C%crr;i7(urJ=(^q!4V2Q)5G(27
zwM>N#-N5nO2g}7zakOPbgr;>Fm6pL;7wB}wKQ!TkkKKyYV#ikH9X{`3i8k)&18a0U
zoq9n?Kk#aUpgowocFEw5?+Gzjy50wQ;*N@J9X!_dA80XyePx@f|NOh=)*a)5R%zu9
za3a+J)=(P^l=dj8Y(ap#2A6w(wo_2#KKwI;z_j}NRDSN`lYIOmQw(RrIF4d*wZfV6
zt9<P{*EsWD{;t^s*HhSTH<16=e|U}?Hw&baA#SgfdFeGj06s9CBApBourxgBEACaQ
zHu>$r3_-Q-;J6CY^!udZu>e!!@m=5h>fg?Da4N}gHpECSg03mzQHxVYvi$aMoZ{T2
zE#_|*dFR}n1sFuv&mGyi-yL`G^;K<@*2;(2j-p%}P=TPj5r)Fs<C01K>RZ>y7aELY
zqvQ*9UVim9ufE+q-cZQ&)i^u8c%T`(?-#EX({zf7rLS(->{0Xm-+u2+zBsp^aLD53
zVu4qFytd~(r$ozpuV)_q<-d50Q%AGB`R>Y|Anjhp<EMs5B?DNdz;zY37E8Q)VV$?m
zZ+;LM4WuGq=}eABIe9F{;e81{_VgHs4kVEh-n+EP+4na1qyKP)UVDk1Bbx~mjases
zM_@aOt?j`w_k#)*20hhtw~Cy<w86f~IFXQn0)iofeUk~EeQK0fe%#HVr-njo7n?Mj
zE}nb$_i-v7WF!}%R`aM-9fneVQbb8`eu7ShhmPksFr6S2GVqkIrn$A<WM#Rw=WpIP
zljqmJXydpNp$SY&V<;Kq#O%-mp!Q(gL#o>IkkZ3zD;#McgpQ^g=+Z=(v|Wk;uho7a
z&~=@FVbU}lKV7!7L`6#x3o7(xfx=peQgxN(TQ@ng8p6p$Ign9kNE9AYI(P~^$Hi@y
zsTOK%mTf${LUnV6+w-@$xDm&gbT}|R%4j;laKu1ZCYm%bi~vRuD78*t<{*crr<oLj
zr7JJ<%J(j?I1bh_bP4?hE?->W^1yj%fT-chGUZwWXLFwG*Us_wLJDgxK~k);ePs#1
z*Y+LWzI{J)|8c}89^<#3In3d4gP768vrXK3k=3%mxRV~^P?&U}j&jS?i)ETy?{M+_
zI;Frkx;MgNN}=jyHuD8;FI?d4*|+%GOE$I47`c7VaPqSn782!_sBXBF>IDiLb1dDk
zTj5rMVDb>7`;%mbM~Fwm2(L+_YWto&(!rHBjw6w-gLG_^a`BYJRXW0R(R2e>D$oq9
zP>5(EMj{eGw;MDgO{5jVh=vgo!bXs6Do!FE#WVwGmPIfe#t@QvtxmmKr|i_IdoH!G
zj@N8Z%9kmZO5_W9*0)w!-B{-K!qq#yX8?;>GD9R1BNz%}8bJ)hL<k);iR1a+Y_4?i
zr0bV#=?1!C;n)v=+CL1q)>1ueF=4xbShoaEcG$FD@ei>#5q6jCZ;umLOT|zj#g2|S
z(f{AQX58J)_cDB{!|aJ&Dwcc4yS?DF^Z#NuSW{B<94~!fub*XPPnL1_-?g4nNP5`9
z{_S<or?<Dxw;)iW&5rH>UaDOJxd(IDwg(WZQ(AR*oTlx%yoMpj4MjLOohB5~IXyeX
zu_I|hA%p7+MZc8k>L%ZKah|!k(p}-CY@NTh1DSs7h24EL`=_FWf+m{YvYAjmfGAc5
zmsmG!57+aPaZ)Nm0i9GLIPkmw?k_GdIvV9;Pfd`B1<*9Xa4y0}pPry$yL|KS=HF+C
zpzaw5`@qP5r|&&i3ZX<-U}neo!E4L>;I(D;Psf?x;X8M5Uy{+`D7xt0IXj%sdk$Oe
zIIh-l=>6aQt8dNU0q2NLVgVGI2BC;whWR`H?PGlEW7A}kA&TWD2lmC8yIH!gRqe@#
z#~2-sP^mf0-zxFSk8ksT{^5lWF2>WqwmnuitDL{M&U@GM<g!7Avtfp_VWubIpaj49
zWsm>o&#&ycrC2n8skdqvl*02Q)tY?=kl0fJAbS7Se+_>8_9{<3GDc=7gsy4mnqYD~
z%A?0~eL!tyIzheZaeMLZ^PEfuIW{vysp_$`Qli;(Tla*|=(^tho1>16#z-YvYNE<7
zp)Hjg%&(O1@GF;U&BgT;ru0F7C}{Y~s6V6Q0Z{u;v6>Im6dtlAwQS&<1q-308NH8|
z=a*`9f)x!*H?fru_&VW%79o@}NT>?Uja$rZHmR4lSXx`dsb|2-Q_2U}GCT~YNIe!L
z9yAFWHnLV?yHF)x^>CaD)%+H#n;UGeRzL)ZS{gya!O|OOjVe^uxV^T`=0*>jhKJ|4
zc!ofTDr{G|xeZ`KAPUa*T@1_CVD$zI3kednI{L=DynE&*@2mnBf0D^Q1i2@ed47hU
zKRUsav!k3iJWL|6&C1eM&Rwokt!~n2RB)_mjNk(9poG=dEfyDtn7fg|+A7nS|4aVp
z-(ROfif_+Ob7agyI7QyOw8@Gw3KP>zJ{jR~L?fzKY1YeB@_ANQZnE8}$k0hl9A!8b
z!qO}}J%Aaoh=zlNbb+HJLihZj$JeSxdJZTLAzh?U2wg{)py?W#p<w`q79bdm5e>(P
zMS_^22r{k_ipGe>BX~_0;R=GLfu?jCwufie@RWxx9Lj|f>-i!j+rbQk2xy9Cy-ay)
zi|x$~mKPV;EZtkZsbL1tG*H3^V}^9ll-`j$R|-6(ke-L9JY3}q?d+6UelR}dA-cML
zUA||pKCk{jK<(<~l6MF^ce_mQfm!_JW3as99s#Q8l$ZCH>}fs0rC)B?E;Sqk8AYFy
zbX(4?rB<Q(<09YNtY<%BCkWe%<!gnfd(P8N<L+L!?7ikw+X3EGm%d>y(ShEQ%==`{
z*y}VkbVFcSIsy&bm27S`C=?njuUC2V>>5|E7w(O*=nYB5-TR8ti6EBYOXGCRZ(K#A
zJ{YKZj$eL=@=bmXLnjy-946(rY`*=%JmbSrj?AP91`L9h&iHVQeUnKhN2A<cxf}bV
z`ko%K2OF{%@u}Z+%c^TYzQ^bVX~&PIF*S{J-1lOWO11=o^p1wjUI~p}%rFQ@-|6CN
z0?@kRIl7^7cz>Gz^>;qPqo;F>5Bp_+Gy7Bg@@Ee5yZ`2$_jOwiXTyBybB7qtL|EUf
zbN<pMufDOwpM2%=2Zqtww|~>|xH{+e7%JQ4_y6QPsf5L+p54dH{uE=wF=h^?m^qN<
zfBD@vVFzP1oQ_~w20{p=YN>%sg>8Ghk6U9PP<!R|Wxn*egG`S307weqTR-eDn9rsH
zRO$}b?+S<oPdt<ZA^7h17l}u@y|L}Yp6A_v>0=@uAP_J*_mY&7TEk^^wRXqfIj&!=
z13E}BP0d$@jhHm6KYM-f4}jW-3e<e1GfyhKmKUlN5?zV`1u7CH@#U;F9nCN>q{IU}
zA;A-%>jZ)p5yORMiE`bcS#MIQlxVmPumY=1HcMM<F2+bD(&W-9a_I;$Q{pu$RI5#2
zCD5r-*xq6xUj}SgTV^BRV9Ek+DaeMXQQux>d10HS&a+>H`8npjA|<OpVY#;~CkqJy
z!iM$go!|T0Kj5|RFSDF#U=(g~ef54P_z`$wme1@P;=n|j$;mM$r>2-1OLAbyC6kmW
zw@PVcjm^AErCy;SCCW%LGUc*(br3DSME=qeUw87nX%<<z)b5|yX7S24i}MFyCJBd9
zjK>p<MFT{HjZ<G|bKxy6pWFFb&61qRF)=<&B4mMUQ){|N>Ee_NR5fV2P3oRR2oqED
zU)_eLg8;{K5Cn-w(u6`5nkHL*ED9w9M5A#Mu?XRifuU;{R)|DAOfaBPE>@}4UFx2T
zvK^Wdnzlo}AW>d}N~y$pK2Nz`!*gBiMw#W+d7Se5FEw$UGS!O2Qx2{dMg<~xfJG2Z
z*HEoYz66Bwke-WcH?W({2kXR7duTge_CmBuAjQBJwd^ATb|?(qA(&8uEX-P3lifeH
z%x_yui|8qfL}*>*$bpz;XYr)g2_lq|T@}Th?11psVoeOlF=<*~5G3~aSjzT(dcVJu
z7wR6Y*yX9MwdP0eId5GcCcA-*Qg_EYsuvpc3!C_v@b)_1?Kza4@=e7q{qNndx;xK+
z=X&I~8(g~PCwb0aT)U6_f!Gy$-U|*eO&y{4Ut_5xj+A@E+p^EkOA`X)4nh;(`{5#o
z52nawLrjjwP*S1mg2M+={PO1x@~{8k>^;G>oov*e=YO9lLfzp798Q^h>G^|9j7D)B
z$(0-1ymLO!qw7^X*%H;^{TII8`!V+m1*w)9Ss<VjkDA0{K}1VgbtD(&;S*V&`^Z?Q
zy!B4wnI}dW8IEG<I@1$z6mVm{z?q91{Mld3f1t}|Z!Sr>{pbF}*OxhUEXUMj94lau
zP6Y{CI{)K;)#P9Oen03m!y39!{SaRH<)n8#0MUCagXjO;#Z6`oq)8@xwdGJiXM7~e
zXFf62@f_22f!*}(dc{BX)F{!2#r3&uz@u7qJ6>{~UPI^p8MT0=`)s)I=Rw^g@KZaU
zZy`X_eF2@H#R%g8Q2S7aFDBxNZZC%PR7+%pR)ElcKxNxf7BmgbP#B(v<0(Al_pTWM
zov@`aWR*tUrCzO5ZSE`^%R?;>HP~LCVtaBDS0zaY0jEl}UZdV{aGQ1Vg(}k4{oBH9
z(A-{U(XG;mMG1#>1VQxZ1d+lms_nboy$EwATe}p&mSO$gvOEB+UghR}0kmJ>*`FUK
zmktw14Ks3ZA4jLd98NdMT7q!YA{tj%?jmb9t5ju$?V3ai6T=K3l%QFvu()#P3=P*`
zqgxmdf&Igf9p(5~j*+OqYizQze3duP&%>_s$U!1WE*>HrFbPJ&1Pue_y4cMo^?Cy-
z!B)Q6uZ^VXDTHtcSO$i!6EK4W41p~*Ts=-YJ4reb234ggJ(LFlGfXm(B$)`JJQo)*
z0|Bgnj?-*VELSPpE>dYA6|Upbs8y*|3pA@0O2s@kSC?rPS3i)u-L<PUaQsEHWr(bV
zKyNQQLbXC^4Gj&?b5ZKSD)G}DVi$=crMyd^xszFIhZmwpQ$yPkj`~^jUBRj90;%2c
zf7dm-Eo##CD(ho}`gGX*(#?Lw$$o*6UcWcBBl_16z9*6rt$pnjLb;dH$)12&^_D^2
zVO~}HB4~FB^F`k|cjsd#$m;=&qMyN2YBy}?B@LzY`w;#6K;1Qm-wo1L2Rznl_6HUS
zw}ox)g;A3&QH|bfr3o;#J-MB}9V*lS>xKUD(vO$<$YWz<QXwqUK+^;hqcNU(bd<S;
z(w$2n2jv;W`=L$lJO{ETXdX1a{EG*9=J9b3Os7#w@}sv`_{Mkr<E^!rhx>(y_b#NU
z_1w<>bLO~`OINp8S*sEbStL$m(RJSxe0nO$&p)^Cu0Smr4>B<tV{$CUX1>niN)^-8
zNT))4{OL)K9!hcbMxJkdZ;p*E`zOCId(X(+3Dj2jm0y~r+4RtLfzSlmp%5pJWeG+D
zG%8*AP$>KDDLab?G)=qr;}PvN)$Z|)7Z&))6XQ%z#xV`wQ!SSX^Z4muzWx1M#1k<J
zC7b2Du)z<V$S^h%<<@eUb1g$_+mT4A{PrHD@Fdjj`=49cTMpcM58cZ==$Zza=)7NC
z&sUBu7k)NXr5^yb4|6Dqk_sWa&h)hU)g&64ZlW7D(rp1X)y;Zp_}M)n1PC20lW-UU
znhQ<?yJ}N!-l1$v8-tM~V=0}GZlgR8*RJ8z%G4?zu2LALMlfjOG;F+P1E;CuR1>T!
zgYi(3cql+Ptzqf`ilq|uYJpO@3A~@1|AUOg|4V-Lzy2Iw_|zz)@iK*Cg;F@g$V8Q~
z`c<5zGArAs$xV(ErNYMY+vE!ilo~@g)p6>cL$leSmcIezyXJOaW||{Yql{(ZSXzT}
zxk6!Uj_Wt8tgK(h?t5>9fKkZB7>-#)OdV6#5IUG9D9@(pI@D_o9MA91Qb;_{#*qqT
zYM4l*<KRevp(!-OS8KFlS&|vwh*a|o?1lqIfK)2Q@KBV1;jz70pipzLrNnM3s`Uoj
z)h3mC1+Qfh(I}V5=hxWYSY>1FE<Pz*5D^NaoEq4T_W{;yq)|iYCc0tzrm&iYCNwlu
z$3IIGVuxqfgYlulGqL;G6q11w*>?_8dh+O+=n2?WS7@WdT@3iW-|W@DUbK6{R7ZZY
z8%XymceKHZrgdKGT|tmunR(S8luLhwmB@}#WdCy2s^wC04{*=}O5|N~QsPca;coGc
zet;==T(91Z3=9`r{dj``<ZdvxH`tV_O%aNFU&A}>=e@CC?;ot)eN^i<t|#f3`w7qu
zoj|}G9N?Lt>D^22cpkOpoqJ|=Avkw=lTgTH|8#;-z`!*9GQH1yd>`Na;iA7r-|ftV
z+ViBuz$fh|d+YuWzx^;D|Hvf!ClffX;^iMN@|WMdc8_-kyY9taom3&-&qWuV>)Dpe
z2iV@O^EWRnaC|n+^hBJYbPx@VbTYuHqZz*Z`GfrVH*f5@)k3Mkne)pm+zN4dzKH8+
z{KBWE`245$^YF<WLK|i)KgOx!S^nbdS9$HNwfnmtdy_W8FUi#hpzZBKoqEF|60uNH
zVp%#vsSqE3VuWwMxX}4trP!cpyB#k{fkGF4>G0i;r@J0lx}Y&2B;4Gnv2d%%kwYo6
z=`aXLCW0K;m*Ux{#;MmOx0Y%wEbk4}_D{yxKb2r{rNV1(bW_-kriYTPcFR@;S+#!u
zF<-6f+e@hyyDiYLES<1nQFHeOfR?4BcPb+UO}nl1`m?Dk{Q#(axJV6TD?=w*1wO6+
z(S(k!TNt{H@0F;)Q=J&4Ylovin3w?{s9DOzalnx}QtYMhl!DP=_KyycjhYxVuxmB!
zdWB{~A~c;)z(YAUR6QCBpx%nKE7<Fb4HNWul&~2f7|UUV6WFyl0c(lPtr{Ob5%Ltr
zpMQ)epM8=io=A{Xx43-qB1`!tgt<(z__q`<zQJwr+tlPSa>)vfW(mVv!BSwV0Oe|(
zjlw!hdnG($6Xd3|<Z@wBu>h8#K)JZp4YtbLY^>ej=H;C)@hQk8$t5C$4HL^0fa|jd
zEg2-CNtEW{;NdBWCI!kcP}nGRf>wZdJVrEV;xrv<o`*uiRf<qN$?#Z?^iYhTr6FAb
zS`FoaWr0vO)l!kI{1%0}LN|S%vTCDAxmaO)dxLVljMHqgy}nFw>kjOhksy&wU<HFH
zp>XUfl|q^K+eIdA8`rXNJr~{eK)7g{&!Qo8bR7)Ox#x`GgYowT)_e(W?M{%n$6Q%T
z(X%$SiVS--FWSv9Eh#wF1`oZlO^>pnUurmrvGGL_`hXj4$@q2wW4lR2yK9D4+Z|<f
zU*COzuGh0$?For|Tqx-42NJshRYzc5-6?!-l~nGMa_jY3^Jm>Jk8BCJs6pZT-rjZh
zmN=6GP@A}yn0rSctKGwK+yfZ652UiS-JscYky4@S8Yn?1=zE3@OvhO|hOT!5yoRJ$
z-a8<C>|~B`)Z&F7-o|qz!JxsxY2REr7PB}qljdLi)(L*M$29wH6F3lZYds<nqQ4hx
z_gsnH;BLod{*5oq@`;a3F>@e=VQ6fxRycERjcaq=Uct^TMR#8V(-dORF^hY~X}Z<5
z`p|^*y~qI70@q*t+v^;i$q<hZ6EHPQLt|t(#&ge1arVL{SLcg+Zu{z71?U2fuYCO~
zGY8`ApN=y&93wnt5HNl9<m<O8tglz^^9H5M^tP|pj*%}ksn%Q~5v#LCghS>oGjf1R
z)%UP7O+TTe>w<7t-}5mQJDz_5SW!V^kEuEP-UcU*WXYsM2;qaD@sTLcJu$|)OL^Wt
zySG|tEMal-SO!f9-gvuTp*0dRx@&Z+3L%pUaPt;?;+Y8=w#Sd&T)F3IUEi!zt2rd&
z0W@8p>ktcD9Gr=A{?cG|*oYY<8u61QLibC^D^;8M+a-Qh#{;1DVFNYKLn!6@oM>Jv
ztLyh$py}*Pph{05jn;!G6(|i%zc(#lNel;UsqmCQXeLN!VELG#2`o)u2nDu{-KbG-
zdU#61G(cB&u0cuw03ZNKL_t&yY-gL=pmoYwrgF2wLMq2_DoG?Bz|ss1^Z#e>&4Mkv
zuk*g&f7sKR?%enG?Ey0yB*6iIz)=(>nNeuTrWH%JoK#AwRK*X;OCIu+x0I{$5?3Xu
zxZ;${sd6PLN48@rvPO#{6>$(nkRUOS4WQBUaK|(5=|ALQpYaZjZh!;_oK=NFqjAnY
zd;IV9t#7UGiwPSmv`Rs{(|@1OWeu$@dA`M!tNUz~SGjm~o40OUW@)g)+28`wLwfCh
z<8u8UVjuYw8~1#f<@l5A-h7c)FTBa+H?HxuXI?+R2d=X4&@vk*R#{wVQjY<j;mV9W
zOX=@l=laDP+_*9Q2%SZ&wO9^3DvW8=Yb2qnJkBs!<0!1h7>B?jgvEuP(mD#~a8}@r
zscQNj;<(20(h6&f3H`x<-A<npK^Vj|7n($oLJ5oa4(m#?v`03`aVDpqXtI8ftxkum
zq}rw_NYj-4y?w4-xybI$?OI0agbQob8a3)kM5q<cTk@<&FCSp@chNdvEWWh(u#)2U
zPT~XzDUeEm5J;)HeVf-j-bctbP8h|(blriIVm1jJ&2l+EOc+KBP$imF_0BPJ#jd^}
z#gM}q<G%yRq&&d69qpm!P(y#PVJ-RKY{G%EzdVSf4uF!Qz}P#&6F;11^OL<AbwM27
zV}In|kEHs&KSG`Hb}YsitR1zt)3at%pm%Bmhv(oX?4)-`DY&@Xo((a~=EcZ&Z<yRm
z;eR;yrKtSI1a~GT^4i4?`<+T=yk4*5&TC1)%3^Z#TO|nzb(LTW0i9mK)nk~2U-`lr
z9=?B>XJ6Xl`_J9t`_J9t#9EEDrG!>1L`cc{T8+;<eu^*uhkN|NpS^wC>nW!FRgWkJ
zj9}a}YjT`mhnNO^M||Y*kDg$2qfQ(v`h$Y~cE+V^ox>1*3K$B1G*Xiz6*Muq{uR-E
zXGkpx#h9!WQw`HvRq5&Z3thhV%ysU&XMv5iI?fB~wSbSDTjp24crUO2^XKmBF8bE@
zu5j-DWmXnz#F1ugwZ^%Jmigt+Zt|~w|NLDS5GMF}@?;<MtpnKJP3iP=*4Jv|f=-fX
z&TJl5Bi!9h8RUj2s%F!5Adgia9j&c$>KQ>mppSo_{^3{O=Ce<3a_)g8>UD(_u(q1;
ziAUGDc(u#zB%Ocz@1El$=ho=<3+}(CRgKP=iak5C*`iSohdzGLYQ+4;uRX+X{@Q~?
zvF6qDyE8!TSH5tX51(5ljuh8!_V`!7e}Q7ERr36WU9R8iv9gj7g&|r?mX;#UY}Stj
zYM=VlG7GH)r4&jE`f26q_w=(je`?>zbD;Kq12ylfUjLEFgsUpUekiv*^JrOz9i}UC
zs&#`v6KI9RVvQkBOA0H739rK2gAbWS*pwpe(Q^`8^hq;=u>zqC-VEqx*V*5`T@z!6
za<9YH;xs4xBDF~2ox{r*l{886?DnmfcXdnNi9CCU*S6o{<?|8kn}TMnkU|p42!gXL
zp8bzlSbi3Ld7WbUL#%9kjP=bXN%<OE*I#Dq@?Y}rzcRJC#d}zNaEY~rkcN^3VL}v3
zgzeM6`8L-tUE<;uKs1S(XW2Ztga`yF5pk=|Qca`s0Yx$LfpJ)G@vgv{lCt!ar9nGK
zUI<iRFhY=(Rokg5Ez*@ZA&4Ca6`;eI&<m2>RsXIxXhe#v(<blt2%`{hQucRuNqZUX
z-F;*jQ{c(V9%b5R(C*T1@6g@4Njp8hl|eUGXw_N-aRVLH&{`Af%3!-J`ea#;to!aw
zLA`NRg?5VZaL!dMnv^&p=VsSGDIiTumDH#5_=)&Ng-Tpy{xnQ5{ZLfIA6k1n9;~Q}
zP{NHB8Qt;R&FsD7roGChp@W?HzC6VKOeekKw!h-v0k)1n(U@@?nO{u<)oGOHrxDdV
zgOp0c#7(gllYX+JW~BVsH_aWH)K_@b;isnn4|LY~X}_%@TPDOv*z(|h%klNR-FcK=
zOlAm&?4b~Mp0ppEi3%}R9UQ4~-U(x~bF0sVOKl#wXNhJr!Z}a99<aQ0IO)Cjbd_X=
zfkFt0F_!J^0nfg0m|ghIU%Q_tK5>#fw`}iDij;r;jknp{Xz;NQtq~=HFjm}iro|V3
z;a*-pzsIX@wGUj!q5Z*>jl)rxHmDw+vDnSzb4SYbRKg3wkKvl1x@HgGzrfl`4XxGC
zia?^Zq!!PngUxz4m643*`;OqwlpEi(-jC)7?|ep0N;NtDDGE<cft}y^*XQ~8qwBPq
zA&pvPx3IQc=jT4L$=~{7n?L&M+jo37ef>Mz{Kl8^p_ivaN<pI@a`Hs;?pI48s<~D%
zxo}bl^bvk@S8nuZcM2RHH53bqL&@fPosHERH?}8p@)xgm*xnh?YDNSC!a%XUR^z@i
z4K7@seUC3RVw9@(Lx@QcBMfeT0p7T{$Ikvql3FzfUrPcOS^=dwK9Bp)f9nx`>9hCn
zz<mp3xuqyvWkx^j6w`sARSU=D`^r+x=RbX#BvNeeW!&7F9OJKk@g9EtOAm7Yy-S2z
zu)CMDvD)B&_@~c~f#P?cxy5rYZ*yj|NuwSR1d7$Am{TVgfTO*d9(iDy6DtXUuKFx)
z-01WC%iFwh8|HNm)aG$`5%sPzjJ1`rqetST1ACy_>J8Q#N)#a#nFf{jg%S>La*8x%
zkPllPy_jm%nO+GM+UMk14|0hq4Hkh?4r#j#1~=H*y|c*!-``@Z9kSG@Dv#h13cOUn
zy9H{G!~G|C<o-?0ooR3)*`odSGraKBt5h?pbs(e~BpZRax5&y*VRVh9#hBHm1YZz`
zIeBx9_{>9WgrB6g2?Mo>Y=rdoZgKw2SNN;1euw|(cSgUx29Iv?;mswM7DKcgQ0#5f
zxq6Yky^JjFG3bMH8?2mMrn$7pa<fG%u7fM+rX@y6lE_gSkC6`Jpfm=A#gzrl8eHj6
zo}nLzz?Kf71Hw=e2#@vx;VX5|Rx3dTiZr)4uTVjN%Po`^Gsx(4+jL4$VMK((ra4$a
zQCPBWk8YWf^>^sry2|d}-fhl%NVt5GR<lMDL@257QX!;9N?9?#wxrB6vR?b$U*2K0
zQ49^bb)c$y)mLeJmE>14{qy*7!?ddPNIFr`PvW52a@9U4gdZwv34Aro#>h8kHW76b
z@M7gSuXH2jMkeAT2ix}C_|B2Hfmh;4#Y1@rkQ`Q2nBLVHPHCvf;e<F0*M?xt4~uRi
zU^5zApRjgELqIv5;CYVNpINATyu`Uba{i1d@r#4kVn%4>NY$PSY|o7NjlVd31jnmB
zCPTGZHB{+SN)SexMm>Dj_vB(TtXdKSS&5u@NgQgLwcw7v|JUEU#>4k7v$m2Dg^I;i
z%&8+hl|KKeP1cqYqEJ(omhGL4*Dvhxy#sAvU;O+gfBRP+<jkoS-+lH5ySo!1h_8O*
zD)*hKn4i<9S|}}9Xhl5!(RF^~%MbJ4|Ign$@_b1p@y?-?APN->yJJRCZ)&ubXkE1k
zTP+A9MWb=}97LfeP!c61D38*TD4e8vd0rI`M^Belp2dZTCm-A3rPuekaH+$SkDcJe
zY8|15pi5Q)7)LQh%dLbc(kN94Q)mtG@I2p1oLLVl(JU=cQs5Otp`c!y?DKw}^R4e*
z<$-%!G-@G2Kolt+d2pF8eC`Y{y|%-J%iTM>q3n?T_HI1idRHTL)8{%;Rnc4sP#!HM
zK_FRZ9lqb6eQl4uy%gaEN(=08PVK~MjVC^_#vgxmGN<+jfBrT<|EW`KtT#v^MUp5^
zZ8Z7(r%!X?@~ox6$&ChKpi#r(h1QZrLvwbs$@LrQvHSkwD?42Lxi;%-HEMCdUTV0p
zHQ>VKqXEq?e)bff|MVFizJG~@g=j3a<9$_3a^B<ZP}O|cT@lBcW}_;8^fQB;S{y(3
z<Y^xN=mzU+HJtaHI_a?9@%O*H&%gPD$?V}DfAviszJHN=BV=hIW_h{BhaOz!<XX)2
zt=V~bh2}#Kud;EXj>ogRm-76}Tm0KUJpWVuUY-NB_nlF*2<P$6Vuvq4>n%7pQ4|}!
z-hDCjmQob}69S<mT0x);n4Hp-<kK?`N4<ZgMOcR~3`Q!P*XRI3Sz^jAS?_KnK8ot0
zlmSYCa26*;rLuF^@waIG%47W2<I9{{lEldpi)$@blN;>5BB|5ol|R`Yg0q9ImAhap
zLbuphgv9M}b-Pa|_muU78~It5Y9+aPgSTG)0k2>9I+t$jaOv#;8A0a0*LnK;mw3B&
zKYaWok1hu^l|>YN1~;zJY46a!wZry^ofjLdKX{tug*r(PpjAK|M%1DZn>&iapzugz
z5YAMf!<k{Fu3Er^($r*CAyf#;!r_!AX*38U1>WMlL@Q0bwZQ7?BF!Ws@8_gNfpvy{
z+GT%#8(dClb8;l80Bu2;5?^{UlhH}r+}PWJ^!6_;Szl*iagjz`v1dw*l1*7vH@(GL
zgUJSD{We*D@Sg5`Cln}&(7I}s@owl>G<;!tcc^V`9`AoRF)_FGqlt^5kVYlmIkegp
z6_w_lAN4(s<?2Q%kp~;+q?{54v9m=bG1lD|W5#X-3r1|r$mH1{$*D~M)|4UG6j<@I
zkZj0M;AaIT<@Ah@_Y-t8-sUVz<#7{L%dv%koP}w}NSV(1yv?>Kj!e0aRva9$U;cnu
zHHQG26SMH@Ff-?mU=PKV&453+!^g%0_bhPlnFW$0K<UalK`BY2ra5z}#p54c<p(cp
z-}OED3!gs8;$ln^Yt-;wSXhWSduD;pK5>$7fB*I~FMs}xD?D`nBF#p~BM+?5s0ZA4
z&mzD5_s;Qu4o!zot|vVC*g6|0Y9Ktj?Tqg}bDcl>vstl<&wu(Pf9FdN^YKSdP)`DG
z-s<tWPi^r3{^^9#`TDo7^2sMQSzoV{#0u{O8*4Q_^K+a0SO3|^_^1EJ^Wy^Q_<Tw5
zLJ|hBx{~m#zqrYtObJY!yMLK_5{#LeP$-s{67D~{1WbgW&ONxm+DbyLriY>^l3Jo!
zKT%_0p+>ts;NsN*m#(&X^pRCs4bZA;tNYw1PqVy~aOp~yG_yG8$umo{9-y@(3KUC=
z36DQ|f*-s%0k0o9x61NTTuG_RN|mqGjCtt(B_4Zpm1kbO{WbsChflD)7?DI8sRUXG
znvIatCubS1uRnE}U-`weoIKH_Ue|aJD~l1I_{a%<^UDwMkN?+axf8L7$3L-5vl-5K
zdgi%hcR#(W`|{^Leu5LLHR^SRQUXc!?^ZM9+yhJe@d1`^e`~<?t;!;2sTF~g1X{4V
zTH}+Co#gz54zIsi6;_>beEqL3bI<7(Nu+4hLr$zD{K98X(;wvg?$A8^^PfJ&LMs}#
z%t|GQBG^1pvAR$F;P_dyr=GdR7e2ek$3DEq%3?y67QFR#o9`a;od@n&q}hn*XC>W1
zIRR%wHqBE#@6CEh7*^*t&n$achLnPx-IU(I3|YXC#a2KZs&UhSR+2_NJk;X((yM#?
zyFYsagy4yfuG4BpeB_Z8{=wfp$N%)tX4_u>;cuVgq5GDoH$rZ0r+nw>YyAG7p6AlF
z-cR*=SpomuJUw|ov6@2a5Umt)Bp*8N&$ieyWikdNK-CDs0IjMrwDA%d2ohZ&Ooy!N
z$lj?_&{@1l2*V0!XcZ6zAbpQwutmFlms&VsiztbzAzXYlgXD73>`rA^KMe72@;Cp>
z-{8ObPrk_C|Kce=wwa;weYV?%!62o*f0HX$-{i&fyT>zi`V=QN7g_d~xOMRdJoVkz
zc=@esymf7h&UTw?Z@<lp&ppf6|MIK+&cFV*{NYnMSL=(cpE=Fy8O@SNDY|>KcW$zK
z?F}xzvc>k*ltJ$Vs<qDI(ka$YZ?LkuKqCq&w!t{0ROndaZAQ_rl$?q(qi_YLC@4&Z
zbr#_yR%*gHCW))_?<H8L3F8K}dV{2vkR%a{3k{MeA*oeWUtbL9b@tic-($DE!(Mxr
zolb|{_8z7*c$1P1I&?aF?C<Tcy?ul0TNmkd_rbiwbqMOT78a@3nuI|>AZ69AAtVY(
zl}}q-nUSR(y6r8DeQ#`+jOs*5lQ2#Qq{cgkH4g7Bc!xD5dA~<#iuoGx<6zRnkeL!{
zs4iPc-;D&0z4t>E+F>(xRYt9v>-<nC#N9!;X9%7uMrk4`FNec4Qi!o{keFs;$7&LX
ze?!Ov?P3Q?<IeeUo1mWpBZzALV=QDiB?d4HiI`#JCe`;Tmup`Mp3F|~`H2t9kuYr*
z&U!{wet$^qal{IWsaDQu|Fc=nZlXXn+G8&#7<uH;c^rc<J^SVT@Q9?iEl7LvV<-5f
z&!6SogG;m;5qWOu_6r7?CCd%Qd6rrcXHPd-U5dGIEj^&_d35}ZpFhKAp4{Zr$tD6x
zr(4iZ%W9j((P~DlttIsPCGF1fYsdGVy~RQ^L~22x6;Y^(BSleKR3Q1yUweqhKekRB
zYc5^s@ZBF==lA~PJl}h6YrKt*e`J-v{U1EQBM+@mPXdb4VNAtfc<089&WV*8AN%kc
ztwu;$I@-O0EH{i=7d@V>-Gcx4%Mb9;53ka!2V}XW+b>B6hBUWidC6ZtePak@mific
zon`$*4Qo7|e#xL;lIND(RHoE#4Na?m{YwvU?!jv2r#C3+_e;{ukmruYR>1e3-Kp4W
z?^#_*h$4lqhN%g(L`q4wSMbuSJ8bRrX*MF7^@t#ll*Un%9xdV8^^|rm=a)WviqHI9
z#r#<3=?$uV%QA}x7F!W3OEKMELAQ5!u;NR<d@rARyz)A8-qY=t^amwrZpd>>94cNp
zU(F(|wh|uy_&SYxNKrUCy^=v@hNJ(EK*OtV?7ibX^{c;pFHb(U!OBvCR+2$h^47(D
z{`6}XxP0x-X6?W5nN5EFlc%`v%mPuU>8FPNpdd}naID0!*ot`Z)y@ofOd`ShT8&mS
zA`CS;kc5GvUJuw<s}X6%`M0YPgV*2MXR#SpM(VMqmISOWC7ju8@#!Z{@}Y;8Fve3$
zG-pq>P)gDp6!iKfSz&R`5o*Et+qC?xEJxgb&k|vzxO%O}*Z%4vFTZy5>{p|%DND!2
zD{WqQ`4%s{y3Gr(Z1LPHw|Mr&TRivj7JKcC)s=*1BSIj!x!vbmPhI1CKe)~duWs?p
zr>?NIlaUveM;}???5QS=Mu-6VX~}DE?D6fVuN`VreErRRtTBk8l5mn#=VN^>;qvu9
zMXC7*f9C-{^W-TO7b33S=<%JWukw3;dY-@j{>`8I_w$@ld*3r6i*uH8s6Hm8sHDn;
zL^zEKhO=k0Z_cV6O@Z_dB`lC*O-XS_+71R=TC4#PR?0b&0#gjg`gbR;KP>kkoW)uX
z##QZ2w>2tW1RjL5A7<lo_wzR&UgNPd>wNg$vwY}*kj>>Tec$Ho-Vb=;TY{^$#mZvN
zws{9R+Uw8r><<L;&717M{nvc&jmiJ|tEvV>{OCzOa=OmyW1k?*VnXSWWk%k+!CMzE
zV#dYT2<oS4oH@a%dYw=@ED99{BwB$lDD#XwwdAFtbOo{)(C?@83Wt@T0}Iwr7z0A#
zWl_CAl)~!(izl-lf{>(Hr&dc)ktT{Yb!8cJ`wTh*(p2K|l(e7H>2}#|@6s8hlqjqN
zt1^_&>8CrSgS%&;lne-jLRTs9IPsk1eGXv^&SaRhM_&98Jdk97&;e3~NL6{JId3az
zbnmdnV(q;3@yE)hd5>@&RFzPQp_8L?LruqFlIey(?VzIE?bxGf_C^R%&9^f0#2HS%
zjoSz(kZe|yQOpoKf&(Pk6iAz9(&Us))7T<lO8Qay;T-UgIFnM|);sPfc59Z~b4LKO
z<G$x+1x$`qM?4CkPJ6N)RC=6%U@4B+B@T2mPM=$G{I#29ClBn86b$+WZ(nY+wcW=%
zj~U8~D_ON=w|hCpRL2{Kki8>;A+X-Fy*uEU7jB_7lw}2uwU!v;>2x!!@hJVy(&hi`
z|9XK-SKEB*iIZ%uH|TT=mKPF~tiF5kN|(1T?DOL5JN)h+zsb&SdZ6Cv+3)1M_T~<6
zyuCM`%h}$`W@;2~U(0yq{0^O7j#h%gcmgE|v}9{9rN}Kwr05O|Z(iKz=B+-~Rzgx*
zSAgi&c8VatQ(~;(`pq8SeWubwG}fUizaDmW(s3Ijz<#ITrB`op;o=^}&>&e$S$Rlx
zOB#WqR~o+goofV2aOKHO&TKXaw8C1??taSiFW=%1zVa3TX>QrsOIcq_u+Foyo3Y!@
zDu4tS2RF9*nCEXGe6?><R_sV&9PM6-v7R7MM_=F4vbEjk`_JD*Qu(LJVGX6zG33SM
zo$%I`j2B<oW^X^Mo}6K8Z4_yCc2oL;cg|$)JKN&pA6a8_y+IIE_t4dAJ)VB{#$Cws
zOFV*hx8TLswt3^?K5lsZ)Ua*1-O0&w$I_x^Z_2yt&%be%dM#jYKjY*^gD9$065HLP
z0<-<uJnEnS%a_>QOL_9K4bGlgAWk&Bv{Ho3a?6EF9d`FJ7FrRlMo2#`G1lR%V`nd;
zC~v=xedU{%x&NL;E?w<#<7SV)`1aLfKl{z6uJg^OZqHtS_Q{hx_R;l<gz%nTui*E;
z@+LnxLPhdx-+Y^urI-h|Q?wTBb#lJ-)D`~pYZs5)_8))k5-+~K!<T;XULJm62@nKY
z^Wle<DN08WXtsA!wzdbn^!hgc_wT;No#`F?6u<^xZZZ2lV`CXL32O;q98^^-q0vGh
zT%V$Ui}qegwe~7VR;V`{)I)){hSYe%nrA8Q!C;TwTd?<zR_h8`JIUf=lUf`RXpf>z
z*15vgO*7Rxc_&dLSXyPF5fe!8Wr-<LI@>pxP3L3aqwv@#_~oB_h$kLg=j_H3XHPA2
zdd0C4bg7vhfh>`sB=26}`%itFfATLwF0MYr7tU>Q^Q~|3yTA7?dy7w<Mw~dyV<*=*
zwd!%%buM3ik>{UE4<s$82~M71bs-^&L+Y(Xmg9hclFZ~329zr>rXWjmvVMl8ViK^f
z@}on6(nvXMdDI#m1SnHb^erTHTCEmwR3%|DtWk>+Vy!EGu|N>m4&D8I_WKSWC#XQ<
zvkv{e9lE<WY4^JHi~_9*fHG^pYfBIvFS59}Os(D`3WMQ18pAeRkHLe@DF$siyEo{j
z`FmSrWJGOogN5Z2wCZ)Vge)77W_`SM;0%L)pLY8u-p#?<kB?QWWS|jps14}Gj=6r!
z`nba+(R+M@C?$pr(#XVEO`*197@tXR-YoMq^yRB&<3_VoQwoQE)JiEPt(4wPWKx7U
z8mLKs;Cb`o-*8mLHgSaUw;PI%NW>8!R?Gn0X^=E(Je>u9@&M|R<82(AEA!Lpn_>#q
z`pG$&eB}00>XVr_ZV%SR4VM1c_fR#^?Cvswx?P$wlmoxZ0oo5ew8&yBuI7cULuo;g
z8_vJgp?f=XZV|B9l%#o;EK8{<3jb4{5GvMIWA^q9#vHxYpImJa29nFy2e`XBRy{5j
z|7g?DcizT5n>GH6|MX-0!e`EM_EdvGYPfQv%U?Zpm4Ea<KF!^~P$lohm+RvnSz)mm
z;)SH!EqLa|o!f5j(GM+iVx?Arns&kWp4pzd?-hp?Uhg8STZkF7v-f-_eddXE{@efh
zQ#^eCGTwV$dTpD3^pC&I^RFGvbZV*j<P&SuV#Up^lowvzxuf4Xu@rOWY?C+$D6OTm
z9wh}?Za9CbL*6g>S&BKM_WswcC%wH4Ju-wGD&i@WR7g<{pEnDps%U#rDPMV|h!RC>
z!J@+sKDBoM)B;qXhslk@`id>din|19A|j|as3lPaFl|ARm*ftL+8PWL@DUb1_c&kv
z?0tOrl*G9P_4Nn%*dr@^WW%r$I~3O_Za&TBH@?kwdXnhW6D-CMBpclGp*8MV-{8J@
zn~c4?JGJZUENyOb?}-|X$Ws<6-MyE2_WUI-pFen#PQu0-Cs)>3S!@vnVDgekNu-vj
zKoaDhyeKhgPMN2eL0KtkN{e*{XB{|+Rsw~gG$mF=)awmuk-`on$~(fw0!vE^G;11x
zr*x2)1$kK#n1V7Z>0|>2siBk+Vb~x@LX<8k`=F$x7R2O5k23F5zDF$MaTsf{robvW
z^ym>d?=jBe1b91C6fN`je8(#t5l1me7!idb$~lUmd8PLyrpzg_{v4$J*u!I8)q-8g
z-TNu5<7N}0A4+*|=sh+B4?-w}rxGVY9S_m~IYK2;4tLKT$sEmcZ*GRMn#N5te3)~U
zfQcN<+xa01nr;bnv)}ZL)$05xVe(?!PC5PTiD@N0DXN)eG0R?!Sg}bPqU7kky`ACp
zQ0&Q1%y_3K`^1!RiT4sA90x^R{IuD)cqb3IcS>3<yeq+=+udyM4j{d9{#`2A`jY+5
z-5m2zLsYER?c)0OyPfed@A3NnFzylfwJ)CGb5EY(laHU|#9G2`JLioz_xRRRSNJFY
z;+1!K9pBrvf9|E7yZZc#uj~T5$3I)|A$}Mj4WQMiazmvmv7}H-TCL-Sgp4zM`!0Od
zMsaH|<JMlr2PNh}?Z=P|;YYI)0_o-0J46V9QW~YE)&N`LoW*-JY?0LHK$Fx1YC==i
z>>bo~0+4bjCF}97z!e#Hl!FV2(h4aRO2z0XCW->I25(A=GN+rY!s(N&xFvS{r}*{1
z@yq<yuRqM=XSUeA@ER{)+CgV2Nw!7W7Fb=7_j?RFf5u+-BgBn$B5S}ca_00Z;c`xP
z=@wgWzQf@8QjLY>6;@YU#Er_gMp%#QUgye{OI)~OV5ZgiG&B~`>oqnaNuol6xJE4u
zks_xkd-P2XR#VD?Jnhr#mQ`8YlvwYPfkbHmMv%J#=RJW?ghJsR$hb)@X^<$#Ab_M+
zcS<(d001BWNkl<ZV`F`j)x{c`oL;+w=?_RdeY}iG8V$5i;3P$9NUfzn(~@<PNE5^n
z=(xIsZvTgp7gW{(LoYw;@Oqdqs!9~bo64ijJ9Bq=l^E94r}8<8Ac_*gI3kQ9LLK5=
zF*HdXGLj~zD7y2d;m5r)`DvLBKb!yfA7)ZD+15xzWW)fuv3agP7Nm_*q>&iF?D{8$
zjLj^wGXhp(3IvYZ|GZ?>GB{OE11FDtekOqFXkWAu@{<0D+)f?_lHwiDt2j0>J!FmT
zXMgIj51g1fr-!$2NV(Gu+eiJ#WZW}v#+k=YbYdGxHkLv*PqujUkySqV_y!+(aFr;M
zymEe*S6<uUyU$$b-~HKz`N{erMqE>9RoOjw?<?Df_n`PXk2z5LF-IjkJu?sPt08_R
zXW#73k7Tk1%7L|>vZ!VN?kJBI4!ps6gLeY&4c3&H^3L{C$N()hN@@Zfpo0J@48}W3
zTYxoSEIXNlC?*PHv;b3hY}RJ5eUWQ}0jr(Y$om_xe2!+kPO|*>Xwt_Ri5DSBtw)r<
z&6U@;xbV``{LvvF%NA^`^1ymRYcV2fXd-1O(u{6*ht43S-`!{TN{KHg;7pvlhbK<e
z@nu1~@W^^dGn5D?aYEp2im`plVt_^9O9^F0o)=_gmE6hUtcz3%B^03waoUq2@Nt3;
z6rnPRq(-D;lq`wr0rkaIR#%(EvZUMT(N0UOQD_lj@#N`%)E1OkpFx_Dn;bjnQKmI)
zOVIE2==VDG)0FauRJ?VgHY=$>%1TOCR5lB0$f%UwR;=%x=3`1Bl|=bU(bU`OOQDR3
zqlh?4h~gL>hLnXFimyAIvzW5L*tz24PY7C@#t%QzTzt0OZdxO92*76MsE+T=bK`IN
zNq^(9FlGc0hiltd5Jb!#znGmLoBaRDHY;`SBWAn&@qktwRL6DV5GOVQuZP<a54Jvz
z{!1Jli}MqG%+U^xywVPCbJ8|BYmhyCDx7y?Pc-l6AZ;E$nX$H<@aTtD*jTHvx{|Q6
z6tmEZzzJS^bBCSXlowyy;wyiCg{@9HKVd)Q$TQ2%UPg0kfcKuAy^JiKcgoCx+D~65
z#ArUijU*o(Ra=RxB(P@`%-p2=ND0v1U<QVcu2ir3`5llfzQh_+u_#m(Q|JBd=Kd$I
zaVb$sqNK<9lH8OiYmlPaSMnb8+pzr>a0YmQYgb<9{HtvSS9+MeJ@$M1B*j(s)pv2(
zC-A|;)Z#T-Cq9Q*UP3J2$4c!Y<X@wA>6?7zci!ZsnY~zmvm2b=XtKQ6WHEujrxZ4)
z7<B1wUF7ncCGDB+j7?ZtCfwNMqnm5ov*79O?T~d1Iu41X$7CgiwHRR$Wrp{lmB-qW
zva}ci!nz_Lr_3#=fFKNz2((a$C_w6fAdCpmBtn7?sW%cL9a9!5RyeXErL;MnK}KdQ
z-V2=c7?YFr2lU#zq=S^gSxTFdr713mSX!=8^m_E$KjasRsf1wsPz}y`@YW%mLkW+R
z71JRP=Y&V!BU&R>fY1VAK}w6k;H*W432{`Xo;0Y%HKc;PbT~{U>1#{Md@x@Yeo~jJ
zA2B8r2N%1cT%nv%MVyGsPlKAtOxCny{*aGz6WK^H^Y4))x1ajEkwoGYFq@XR9~G>o
zVVfICRSy5}uw~O90BPR2!{F>l@F$LTIvyXBxTDKdojG@e@%X{*O&y;*bjU}`_7A<^
zCSXm#+@^jWKS9xG1jLa>N=0cL{eH<HE!o*kdF{<TzV+Q3^ON)=jOSn7=G#wS<?YM+
zcn_DacX{TO?fHrM*#&Ap%T+r!u3J_Kg~OE=;T^89*z(|KJ=S~l(1)$eJU!tsUXzyQ
zj(*R3QL$;GK?SdQN9!{o&|yF$35k`!*^<7`C^A)93K&Z%M%5AvybZj{YnM)N|62q4
zi;|X-*yt4D$|kM*9;IbsOzjbxD=ijupL&^4gbj+`MQ(0g<fW&lLD~Y`f0BDwn=I5c
zDw62H;fkDYcZ=<t*V(%XMV62S%fu@Y^+rq(Ce(ruBSJ(H5h#HvQ}QCEv>s7P3RjY+
z8JPtwhe??8cu^Tv`yiwlH>kx4+P7)9`{YKWbPc6tMehfadZ>_25y*gg6jb0OsN|oO
z&*`LHw(^_+k10!Ro|2{o{WK-d2jsmDd$+D1R^Bv*y{r8n(fwD=1sU&A)uh<a!lCkR
z(o&$5LMV0HCs0X+RI2hu)0I$wkl;)ST7s5{dP0;mX~YZE!UW@UoGr1X!I+ZL6ci?(
zuf!izEI1^=q#O!dcsSUsSFKaC0w10ustDunx~k{UPXj`E<hnQkZnNtiLnX-Rx6zbi
z+6aXWchisjz7H><QXYHU)lbQZ)c<Xv*l1tfk%#P%V+K-;4`JFfZrbqrAUK{PQvFe4
zARgx`Z?#FgsAtZq&EqF6_Vx>|T<>xH=72OW81!;>c5(*gyrA%Y#I@@K{+Iv#xeq`N
zKL=_vui~H0?8M@%rF4!^Rh@~#JA|`%S7K%kJ;xb?w+=UKK{3XY355&-92tst8YLY%
z#`}?ciA2eeFj54$Jzkz)=!!9lV(PV+P(dR%w2P9otP&SlUw~{l2$lg9<U*s87R#*y
zRcQ9hCV6uceR_$F1dt1OC2*Ocy>*3)7cTPBOW)y}-}wLdH|GHoIJ3#x#xf@sYqSCf
zMVtLwTkP)l$h!qar=%!O&^o!n$&(>66bKy>CzW}#w}wG(F}6!@uTN@ovaC|mv_(ed
zDnn;Hc%=yfg$lu$9A^YU)FiIesmC$GmZXE6%zCU;1aX5Xk|ZHu4P^mZC?e&^ijpFg
zh|(df22)ZNeFj-ZmbU5j_v!XK>~{8{`0=y^2r58oy~TJx)=d*5!(wE`76@@<>!T8a
zFsh+L4YCqQK`N{ec<Ts-AaWj;#MBp-Xe=+#Xfy~_giUi?R$z*pBG2fjUFNF%^O#mJ
zoc^mxv){pCx#7J!1RnALuT(Kq6XA}@jM~wn96}rhYa>`B{ImpzpZ<9c8EKC`c|@0?
zpOVWw><cFjc%>b*3-`x^IdQPTQ&#?jhrp?r_=!7z<a>5>9^B9;K^$Nu{T+5<%wrxu
zj@a*H?02&HiJ0f`bD%bl_ZZHAwYbva5jf$;#<E7)1Fz!}a*IhkVNf-;c<abZkCqB2
z1WNgLNOmpQ0^=;!D?+K!K}28@qNsO_sE7g;;n9>nfUrhf3kbs;(-~l$#jB7&hUE2A
zu(rag?y-HV!Rm68h2<qylQ+43<07wJS!7wRu(lfGPgtVt4Q^h1o%651$}6v4;<Y#5
z<f&(0<m%QYJaL+H>me;SAnSGM-P&evkW%(`*u7a|U5E;nskLgX)R$RYS*D>Z&J`3&
zqmU>MrFRIW38h4flHR~ldPSfu3R@XZdrO&><b@&*8#HPm!gz$QWcG_JrDH6C@K{}=
z-Vh|U8c`Ax2O%|?QQ8Vv3lBCISmP<n97~CJ8T~9J>+~74_u22?pqn1k#wc}V!eTA_
zh}93ha5!7wT!FAde={!;&f%rUn5u&AghFY7oAT)iR6@PhAc}{6Xx`)9Fp(D3{G$?r
zD2xaf7HF-VV0n3sdQ=~>#RWDm@Oeg&_bIaZOZ9^pVkY^Y0ELNjnjE$~I(M+~anj}}
z#n8!l%3W>p*$G=Fgq#uq;Q$!o5X_re1@R*_$0?xYX8@z0{KnK4rnm0Lvu(3%mY*FX
z<G2>b5fdiF(Xt@^P<kW|qq*U4PUQCeF~4)zPi?Yqe(Ji3d2;qXJSX$>I*)nGf!dFD
znK@)YIuE=BV<50NuaIIW>Ffobh(nULrNIolY@`G!9EEXYfGe3X+dLi|=3`SvFC{{1
zP$5zWM0n6Kkyc2VQKUJ8%tD!x3x!W4btj38z!`8}5z4A%&bS=*N)RF2tsJs#ZtY*>
z@-;<WJja{QeuIDU7fZw+y}*UnPV?}(C+@$+)z`kxzyICWxeRdf0XX$2+^1R8IoaMW
zgWeANTYGfJE#)gD^%l*A7EvQYg|14X%z!}&R)BK`mzOx}@XlhDMg^8qd87_$=m4!s
ztSzu!0+uq(Nu5Gc`RPbwDz?XYyq8#AGLS%+u-0s`80+D2d&*K`WsHt2CM!rYPgbO4
zg8?QlFlInM?b6@dV^E|=f?=rwyfAp@sMJE<hZYTI@I{6%LI@+Y2$4eIoT~u8tP%vJ
z0>Y$8S#|(HTw9`9TOdwiqyp#5is?0#8M5*Y5d;LPMiMn>tgN$g;uOn^ON3U?FZMCn
z09)jElT+lK`C9NnOFO5)$mrc5gqQ^&)9Q<E*jPBmMF$~?V@8o_1c-b!?CWu37EK(G
z<`+|P`fdo~<kbF2DR9mY;fX_xoeBJHe8&VsasNZl@-%CA^!rfUaiTu)daGvm4iVpn
z*fc*>V?ADmauzVlncp4FrcKV@6r%G7_jmrT{~;y|^HVU7dCY;@k9e7x1GJ+uWv~`u
z{jin9<GezsfUq91EC=lF_(@BmuY9}kLG_ZxBb*`24XzNFJ3(qT$CU-vMtG$VN~3f_
z7z>mWNTtz%tlAxgqsU8)w;&^;C`KSj(~=^07^jGo247MRx|N{Fm21NvdW9=b3%**O
z=Z)-Xp8Cr-0m%O1FZjK`s6KJ>Lm%VpYJ=9N?_;H3P$*B=_F%Wi{`NNeV~d*>)LVqL
zgyk?Mjss+%@u5a3hbRk*yhlNRQIf!T3X@^;5+Maj2y!KnVM0`E5Jnp1s@Bo6EOFK&
zYE9~4K&T`p^T<*lye5g8wCZ(2VcE-b$|}`CdXM%Byk=lMg()#MXVC4^$qKrI0sZbi
z{k?5)#gU1ZlnNmQ&Q}bSx9_uAss~?WP$b|jIuIx%#yhODSY&mN2~8L^@ryB1MbzS$
zII0mSg~#Fz2xpK=5($t)dx<b=&}go(eBu-<D<^2g5k;>}QS?dkE?Lnh8}uoQ`P{$<
z3#82gw1a;>a-AHpYGV*J4S?j~`+C$8IVGE4y@K2<P#fcu5&v}9k8IlLdAbQx%!qqT
zyG*;v(0S<B=10OFetJKS2Qst1X|o`y`lc8kw!<Ab{GlJ)kr1qEYo2HX`>B08ygw6>
z7cukuN4?93eB%7(p2s}qF^`{Cpf-<VGG%8g=EoSU)D(Jw`r10DHWE(AB|6ui;f3d+
za+j(+yqxzaKnf4m;BAS!<007smuHwV!2}_p2+-Oi(Ac4=tMlM}fC!dpu6mr;$Z&y$
zR*OV|$x^(~M6n|DC1u)Y&^y8i^ZM7>a&Yk`z)2qdg?l--)*(Cp63<;(=l;{{oLH6&
zx+(N7@Y1sfHxL1v=(A0hl7O0&L|%Y&7+2y-gK`Rm!YPl!;2h-E65t4w11~E(g4~lD
ziB~xR7LBP?9kUc;6~W>X3(bgFI9%?qK>*E!W@~|Fq9Ge#JD!1bls2W4Ya$=wyr*CG
z>G$_Y`yG0N9-V%hUT2pBLxwYto6;JvSX=&Bi>21uYWC4pAW<oW4;&PghZ@eKgd_?R
zbW}rVO{fEelsM_}7OYfAUCrkON~4q{&=JYP5=$#5Sy|hlS!;kP=%p$B-X7iF9=+}k
zyZyOu+6N7wP5wM$xcocTvnsD;i4<-IfE?06^c)6G%>JGCQ|#K5q^Umy{$>R>jxRzU
z{4II-H<?zKl*4_Pv_`svDv{ogMV_2Hd>(zJ95OWqSFwuI9Ny@7<N@Hx3~+_RZJ5WK
zW*=94ofl%~F^_r7V-D1QMzNa3QMEpLr%0n!)=oaenRClL5QOYCF4NxG=B2B{*RPo#
z;&upMnFZg~d$Jgi7j>d2AW)Tgwv-YfEzVana|VqL6Otf634ziHaS$Rgc%_N7BGTZB
zf_zYrA5=1V=u`aCxfYx8%e?u*RlalnVIF?qULIWU(#c-p+LfF9;H772sx59^KDdJ?
zK{k<#ibg#oNn+vv0&5w~sz?ON5C72uAtZq<8Q8KK?NVxN7%qgyc}r3DNZUCsjHtyS
zQV9a3&@v{8Visz38p=@yIlVH3c#-Bxi>9`e`-VnQ35po$=$eAP{vQ27#vp4m=<U$i
zZ)1%)TG2&RUS)U#&QzcK2?&R$aE7q7*wSL9uIA0W1M3jJ5)IKofDsauu2Mp0E2UDY
z5IR7JfKY|RVN9qaqFO?8d6|{f6EvGmgz@ycZT7ae*xA`;cXx~3_Wu0&|A2usDdm_^
z8Uc|??QsY&4x*Bw`Sn;%aZD>Y4$6T{bTRy}6VFfBH$SVCI1Scj!HU3%DZ!9q*40@t
zj)Q(}2UQ`N0%@Z^%i(d4KI6s!ZVa*9G)S6yX1$v_Uw#Tki5Uh_azK1#jJ0OlMrY;t
zkDfO>$fn(%0iDM@<}r_X%z@g^OjPZU4v+U5uN%}FD=aLnvJ`LQx+^rABmapK%HfQG
zl0(VoQOo4rfWwS3?UM(ZAW{TW2HQx1bP}Z{UMRE<QA$?8qD;y91}QZ{g+!4ia5??b
zkOwVJKir}r-eBtz+~}R=(FY&m+_@H;a+hM~D&KkSd7k<H9=pq3IxoOWy8v5ECbrfg
zUL;)6)TBaqK_Dz%Sagx0y&5NZ4v&+PFbELBV=zeN!5Ne>2p=Mp#F;8-Qh`7Ol1Rts
zSfHH6ni4Mp!mvhAYmh`?)wbt6&XgD<&`iW#gs3XqCd+7dQ_?}kpx>d>Yg2Uhj|OK_
zqJ+RYTg@Z>gvuJ0rJ*QG(mcg_3(n!o5@9RvCn*F7g;okD<>X$I5~U)vRz!g$3=^WL
zMjY3v)f%*xnk3CS2v4uS$E~gFT)%aln_D;8ZO=VbK4>6q1jG)CWk`8U3#9ijl!Iq1
zU4O7O@!-NYLL+|i2|o>@j$9BYYcZ9g|Hvj<%!r*-0L}TzEdC$>^HaMfyc`3{qZCso
zviWidw!|2uIXA5798-N0!#UCeZxO&ErI-<#95-q@W~>Hg=g=J9%kj2n#?B7<sLf~1
z=P{3Y%wrDJK3L(0ig_NCNBA6*cIfPCZU!B8c2e5ysf5Bi+|XoH3W1W6g96WY1P-$f
z10})NNWzd%YLpisD$zlNKsZBLR(@FCJ4CLLx=y_n5QP@fF4>@mSvteU>4fzprx{-+
zd+rK5w=Q$3R%76<a_Jht9#@~=<Lb<QYyvT~5>B)dmKI`U0GTf-a)T@ZV=KVqOR!){
zhjEf3j1WnP4nPzZoJ2SU-XOh4dVx@Sn1nc-Py}&}dZJObAj=D!02PM>fgaD?TLe}}
zq)>=FW3W>)@CA9NO|PG_-*2<m*`d9+59WyWDiKuKoVN&X54A1*M3xFnMxJJ9UHQK$
zKsZ;;x;TeZvYLw#6`+?&A(cc0F;P$>i2~v%B1{s(xIr8@iIRjM78J(N8MN8Ed4n4_
zE^_1MMRs?u&L8^^(hBE~22<6uA&&G9n*g>-d2|+}9o*LRpWS4sJOGT2{_YfDK~_bI
zDd>ZgW5_2CN%4;estSBoz(yX}Em;+N#B}SU8y>r_nCT(QH4BiYA(%V{SROv8cUo_5
z*RFWTq}z*`zn`;c^O(mx<}n9qAHZ<nEY^7fWr)l^gY8RP6I=AS$o{n}T(~~<SuaL)
zUl0-@1wy`?-z{+cUHaZ(U4wc=rQkRobgzcaopl&%@YYv~Xf7ZM8t4U05*DPL>)hxq
z(Cb?2rbjw}u7&;Yf1T^!pZdAhS(X<g!m?l|6O?h2B#KxNl0<m|C5e;(DX>mpq(do?
zD1>x)9M+Ur<H>!1a|UBej8<r`5I#gj3Tq3pUW%0(-HegK;tGpY3H3&ug}OlG0_i-t
z69_Bu#^IF5I033Uzpl(F`dxY^CrkTm@9)y?x3Ot@Si@UK6)>clAN0PG*8l0LIeW^i
zPa0?(o<L~=Q5oktQ5k>>VewufhHY0$heTnGq}HHWtFaI#gtZzvj!{7Z0*WG~H|Wsb
z-eTw4b#7g|#Lo5{q|Jfb5n>bvKtLs^;fKKIC~1sY@Z=8|mc28i5QjhMDk*;<9iy=`
zheLWf7LuF>P~#@UV@<S2GiYu+gLX6#<!{4KP3#6H=jMP{+tfK6ZAXfO?UDxp+AP35
zY=AwzzkcePh&h`!k9o{v9&@1f0Rw7&G)rI!Y!|bCgPl^+v)Ad|a?IG9xr!m0ye#GL
zpLf$%XYhkP($e8;32_h*D39>qL^bc=ox^&Mkf23LRysOGNW;{KC=edXORw_6C3qEv
z3Y8jk17r?`fZ7_3)pb@EVrr_SF(~MxkOU;cq016q7UbT67C2WTOfk$)DvvlJ6k#X{
zbk&|%hys^cib7S%l?sr7LM958fe{8|Se;iX(K0~k039f_(4ZHIyh0d*^%hYUq|RWy
zqs%*W+Z}qnK4mc=Pj~6}jyS(6Kt@qD3sUA-Q~uPdD0^EOPopZ3u9O@qX3AlOU*Mg^
zA@Rl|l*bESeMV`5ARMYdI!u|87a85|KD&Ec>}}m(=h`*edvlOBk7+PA+g^82>9A@6
zoRXd&Gge||8{?%>xCwL-fIo^}l6Wts=F{A0S*4nr8*Wfa#*KnPj18~F;mskYX30j+
z3OJ-3dB6F01gfKbn4a4^$`$P(xSUmGoUmT*9l_M>_6`|+bDY209Hh--9`l&T9H@Qp
zQkLQS(nDELmMLW!pb?e-@eB;BL>%03uHHe#s;O!W>h8lrxl7gw$byJaN)R451cc5w
z2qNkW35ibeX@{NjSLpAwXxa|@TcbOug%A$yBI4CG>dgox489bEVbu;ON=xY^R?14X
zQdM(Lp)!<xOJOXw^p$+HsH)IbNrVWALrttTf$-=uC(ToeJjGavmkJR}L@gl<7g!*m
zv;r*)Z0T`c5(tYdEvAf6L1Q>O1+LqnH|SENJqBr?_8?_2=+N!#;_}0?`cg@}S1?S*
zT;9i7|1)t9x?+F{B!Q4PA<<Gzl<B0vQB~8Ou~>3SDan;&AOzAIWcmNI_g-Cc9NCuU
zXTnwJ)B+k5#j30N_U)OTwR){y{nO^(%+ox~{DKj^THL;}id97g5(JP)6&X5Qn^`}Y
zM+zX5WL2T6C}NWU!9Zk$yScgf*>=v^TVtH1tV*)wf^;@!Iy&e4<cK_5d!?<xt%3jb
zzNbr1vl|;x4$-ioD}p6&te)0c-pmu-eE-eYuD)|6a&kou{R>{KL@0$sf%RT&4tHhY
zw#w#75LU9vOiAI_=j(>j-_+Z6MO59b(*1AC^<O8sSI>{%C)@SrXRpOV)>vbWHP%FJ
zjW^-lqmkAjrNLA+l~Kf6p@M`+W~7&0;I{dtu3`ltze}ypw>+^cC@XGr{Guqxik!%n
z)EQ7ieljBmgc{J^-DA+{kl+x`VS@;veQ$;gK}q42Evu3$2O9`f;KfT^AQ4(4>Ke)l
zV;xA1))I`RB0vj`BcPU=P+9^Za4JB@7Ucw?*4`s+(4!TUm_#vK2$D!*ox?bVmLUNO
z<s=e`tqrBgSWZruj>n|gjC?U=JiU!jC{&yfX^E{X^1Q%{!2HPOp{X$0g37l`0wG3f
zr10gn4v7^8X)FRmS$LJuI?q_n6-Y3)rpQtj%Q^XI%xrS<qZ_6*{wRy!HACtZ!LkiW
zd&BoktlqyWE%d#$f*bs%QC75XleSeB>XKmDOXju8sM+TIfl#0{)DC0n%VTm^hk<J(
z@@4b7z2TSU-XdtX^`hM*ShxL*d&Az~O|o@YN$GXpwr?hEw-LB?25pTs)>var)YiCs
zHd}DsOqo?5fsBwr#%2AZFc^2`b#wLmP5J3}9>Y&dMytcr1ESp>wvvcg$AmgYDv7if
zC7~9MT1bRY1T^9&VTjfSk<}m-N`sXaR~brY5YC~rCIqaII4h7cAPGX0v{+kH)lfwO
zCnPcmNOVlnZPShdsA>oj;wZ$3n#xJKQG^U4R1~1d$R<OU(<#eZQVK^_E?JztWH=n&
z(u6MvVvR*$YXAL3Zm@Or<DQ09MQN8v>+OZ5)&w#@x&Yx{L?Dn@s0Ec>P&$V(25e1T
z7UYX5v)OokPp|Ra=3KMfDfMP{=XxJnlj&*d8l4lDStYn8r+@jg_VzWlNmjWPvAadY
z#5v!?>J6nqI@gq@Uy-!cabM}6*lUR}ui$vIl<{prmDOwCwZ!ndlBU~5N!*=e?XKfk
zle9I~SYwSfQCp)47Ob-v{DWQKJ*=z*XElMk{`9m>mdJUPMw(JQ(KJiE!)NPCP0|8k
zw@VNv5Oz@QHk~-8D-=ouD5-EOAq^o>!eJ0Np%6;qjKzr%7h1FtIO}l6U~Ju3v<iYy
zBdtP6$m@#S2?7-mH)d!>ZBbD~(rpo#1<S%xNsUkeXo1KJ>Iw?krrW#E)<9s2%)if6
z)b)bp;)JvFb1p_X^CG7#?#T5BjSRF80_(zi*HQmuGDFsslm!@9BXxiaVszlVvL?O^
z(x7map*A&TSy7b*Ri0Aj3)bP?8o%o<mAqy;cEu0GWv1w6CEis})k<_ktg=woh?nP0
z^6gbkTrQ>8HoI;TJ)}34HpXYtZuSLV35Be_6>+s%zFo?A8#%JyNSc19b^4k@=1otu
zx5xQ<mh85Y$2HbiV~sV|L~V`Rf@A400<^FQYjAZ%EiBf&@vygzoPQ(L@4!o@3+)Nt
zyUMC{Ht4oAkyTjTA!@Y<k^~)Sq;eQ*aiyWEp$<W4i*+^9h6Gv>2|<dXbi$L%y7nGF
z3T*A=@e5(mVL+fXPKIa|pp?Z)M^(}Ye^{)k(L$i4Mrtp3;?j(wQpAO7<nRl~YbxDB
zv}59+Vm4ng9gZ1gDOoWl9e>67>zeA0TR>^$oBy4`Ryk$))18lXU1F?h{OC%8IzkAI
z0F2T|i8m21m!$a;TiW$ayvFZO)!dt9eQ)<<H5Bc#bn%<os8%K64P<~~001BWNkl<Z
zf}8$km+b0|I?0tkTJwL+T1sP3FZ|}2c<URkKCj8Td2)ESisS7ij_+dp-0%FpH91>j
zjWyO-6SXzI3z|%r5u({0Hdx~@7-|dkjVG;_%(qsqIyijLA~i@0=3TIh4P^h2b~~b@
z01={t2!eo6JA^IBjKLzXq6TXbwe<od!uQolVKHS%URs>BIB5yBK)H&dE+~r<6gX>1
zMMW-Sl2%M21u6)Mq_+#e6gXGnkd)Pu`O;BK-`F3Sn$TKe86bj$!qgP`l+nqINjc>7
z?3knBj9Hpv^7-xIoQj&5&0y*h*7=~Tsb&q%8j7l-(z(xlO4;=O7;Ihop29WOcsDbS
z%OXbicB!5e!so1-EZUV!|8?_b`L+eNxJd+W61i(VXTp~(`v1zSVsdH0-X_6+Rc?M+
zK6v^2wXB=FohaR=wD`v)X=|*p#u{s^iP{>!Uqsv(B(FNlYot|PfWy2=9n6(Xx^qo0
zgu__jyV~E$Y)A;BHestx6gUDY!AYE{acPNl7LB0R0x1A0tf{e;zytz=CRCP=NTDvt
zQ7C5-D4eYcaD;(I1_4?a>b#&vV8Vb3OYI~w)I>o^KF`Q9i;cT<+a3Dt7E1ML#VHgP
zB?NW4V7^>3U!>$&MVV*h^Ou~=%G-l0)%05#gEPfj^4V*=4O`c&b7pJ&(U!o5m|YR2
ztI|T*SgE-c`4Kn!)4b>7ZRX9_$=YRSnXf>QqAC4Tm&D5Vsa^@10H~Erh~!2|rj%Eb
z{<rsdi93Ws?mosf)>vbWHP%=YweM#b+%!yh>1QdL26ihDPNL;aqK35?16nmIi>Aib
zhAT7JM#`GsCqE=0N=TF>a1Lh$m5{#VP&lY8MNv@;fe8R5&`zRJxKN{l2&n^*1`$L=
z#^J25R#Mgg5|zY6P7`%H^b{zQQy5JUN{Vd8XgX)P5EMZLmBGmYgUv@gIM`+*saY%*
zOy?=N$*C4ovV6+Lc*^KvLRKv9I4^}jfpj=q;mn$Ltg*)TkF32(Y$VoPkuBR~!Gx1I
zxl)R});o5i%u!yok6quWxorh*GG>0wyp-5|gX~=?D0=DrRX>`$v!rmH?OJ1vHP%>T
zP1JrAQA*Q#(fq+75K<v^NE9i8rMc>@GEKl>{Z6u1A~b+Tw|eyZ0lij*DyPiHj?=~O
zK+=*!T7x#-0779A25KBm`cfd-1V+|W)Yd^5Ayt455<(pl1`$$NYHM*agwUcZ1IG8&
zIRs8dsHjVO`+%q0ioRSjSy=L_U^z30a)udMT(r%`{axBoi&oS^3qw(4WZ9f$wq%h_
zn2&}WA01PacT0UV5*Szvmr>suYpn4Dz}1F|w<|Q4hSmak<tK*oQv2e@YSyr{x3g{5
zdVvxtMUxr3l1dcF%l_ZDODo?blxvc<#u{s^vBsLH{m9{aEv$215m7jd#7m<SqD+KR
zDV1pgm)c^iz(`FH2kdnd+HFg(tq7wSp#rRdd?v`2-!)iJ(BG%k9ngz4A<jE!2bw^F
zwI#Ocg;P<8Hr}*aNUz%HXpCV^O=T+I^ATu7&_<~mYX#Ct!blS)0a^qQCA8Why$A|Z
zVxlfvy$v>Z4tbPA6-3lRVhTf*jyW5RnWkP2-kOYbe!*n;nxedep6OM_(eXy7-x_PI
z@jF5(fe;Gs7`75R`V((_xJL9tSd<h9VSJh7imWyNxJ&JPcMI`bRUL@SOd5b}q$jO)
zm;Gz2lFU{A+D&E06-o22-_?uuQ^o!L7Oj>h%MCAIFW<>$#-ZY1FF`56*?G=vc~cr{
za}ct<8B<k`<MWg}|HJ0z)<#ID6HpYEle6sI1Y1)2P0l|-$$cl$Y;Q#<C8=w}@o7O>
z`!Q*?G<#byVIawinu}4%BKwx-q!2tfXwhzIvaI6kqwKBo*x3x}c0!brl%?hPETydM
zou7BOmk?^fY*{fH-+Y+wY=v}M0ZK{IwC43UT!Vw%gm$7yi<;M`#g(k<Hz0~6hx;wG
z6pSVX7uUXD;Eye7DNOCS7!_~Lw=h&Zyw^f2$#h<De478xvESi-gi?a(qGC3^+x};B
z5U|;cP=TVZ4X<8j6qUIaL)sgk>&vt69)p9um?Y9HvzpWMo5!6*n!Vi!tt44ib9`Rh
z_^j=Xkij6r7{`m(8K%Cv&svdYZ#PCML0MTYMg`04yT@O<+p%9aZaJ>ioOyh&O{=Au
zElOU!PS-?jjXz!VA*{tX=L3<ZN5cw0D6V?peVJrkTWlQCA9UE?s@Ux3-t5`sEVF{i
zWX5!1IU9Wkk{E5$8EnvMw+I78ghSLNB?6@aT1qx%t^xv$kdD9vC@s;_V2q)xD{N^f
ztn~qokU)Zp6G9!LghtAMZZ~10FOlh(;p~)S5tGFwqlv<`H`v?j(u+Wp6<L{bcKnK$
zFON7IUND`UF`mpIN<d`r#zR;K0a6O8s`3IR^;#O_`-tDKBzKKJFG*8qt-bPRBav9E
znz{yO%%5e+bk=~BzSqpkOR}`eq+OTwch)xjZt{|>`D~nRf|~1uZB^PRFAcDrb&a^=
z6-m23qra^m?Wcrxta$pQPrsKChLXB=^m_pxe=-5!=kE_N&hpu_84nIyY;Pu9j56lS
znyrnPle2<FTJYg}eYBGN=Cdha+1m-Zf6%AfiIEbvw<?}JA8~%+gX_l+I~?wHNn#BS
z27`!Se>$ctzj=QC`+vJbw-fQJ-=1@NUR=KZ!Q(DZA8+D-sx<8H<b3kkn7j#&A3f+0
z28z$0&zput!7n}-P}Mb`e>J~+&-O;bd{OY(mopw7w%Fh6GMQ$4_T}vMz<n<vjJ&PQ
z=0-x6)qL`7!bV^7^AENdj#EB+HfN)+IXvj{{MDT0qGo3+VsoR#WL|Q5x}@I?_{)#B
z==Eaq+)(5-jyW%m798$IJbki7D-N*MGFwz2mMmV)zag-XczD>O*G-U8V4UM%zu@Jo
z2}h@X-1c^2{_3M0qEM4&HCbL!RF;#o^v<#09<(THN1oN3T`c(Y+0<Xp`yD=fx(Ps8
z8s^K2@xqX$6(7Fe2jHu(=Tw#9y+>W%f3ktrn!K!e`mo~F>nYD)-5tc=+mE?_(5KZ3
zkV3FIC<((E$ER6yY`b*35!OMT*C>@TTTU<U{m1v)JbBnBNg{-RsxsU=Ncs3TBl6O6
z|FA{76*8I>oDVZUKi=<Q9DMq0iV%YT@b7kMwPTF2WO>EuaL%)@d<oQ(haGy|nBROp
zqAD$i`&}MC?9*uljHfxyP5AP~jQ1b+*cc?7oX>c9l=1%KF1>EdY+mri^VzNE{@1_Q
zWOuuRmXa*5+276i)o(Ab)^WI(@ZO^hl2$-fS!Rm@C*bvoAD8!@blBN!(@H|DvkdwP
zzxninqO=_B#5{epL8lW^RhDI5p_Syz7dPkC|MqvgbXo!b^6?qN@fA7!=z{@|AM|k+
z^1`sUlk%(IOfJjO4|W3{KiH%{XrYy$sw{_lDPMm*=5$o~G5&DCbY60FykyV`xOcD1
zWLj`^vi!lXt!tw8XD4bE#)Mw&Q3|B9xVpxv#^CzK`+e=B(vnUmWNWi#kj$xyg5en)
z58-qO)A_gVPeT8IjsAdMr$rP<0$1Z|FAh@I6(*OIRud?J6JU(R)fEPbmI|D}5a0qu
zAZo1fq|R0)d1k4sL&Pil08MEXwKI^<NJlvrvkn)nfGXF>G(l=jk<^&wgz@N<<CmZF
z<)@!AzrN9QM;}^kYN*zM()S6M@$Va2>cWXe{@kuv+aE%D{{&uGLJG9f-abQWl#n=O
zQC8saWzK&NWen>;u3V*8*)t(mH0)|)>#Z@9mw)G+yjA93%Ik`a?%M9cDwB3SyC#10
zByHuG@Lf*vgQtDof4W6cTIS1=BvBlMU0%IjkQa^*-`m9DP(t$FlMN2{+PprUb1}}@
z?6(NQDZ?TB?7a=NQp}e%^I68vKiFYokdWmyb#2(&PDs-Z=NBXH9VC4CWRs0S!g!Jq
zhLT;?;$kP|#nCqe>jw#c^YcA6H)G1uaC&}x`FD>V_IUcZ&&4RGtPC52h*qrlFaLN7
zz`y;=U0SV>ovnob@{ecy?JqX?+rQc)O)H+gSYnN3Ymo4>_ckfYnr=H}d#lCfAmP<(
zc`H#n*h_fws87G=ga1|%Fd8lS<k^Iuy}!Y~|GNV&Mme@VVskU%;k`ae2!8q75l<iW
z*xu@JG08Di&B1<~hxZ3Wq2%kMIYnhIy+a>8=<)PnpQ5y!k20##P}g@~+|6#lUwpX3
z-fjnD9FtkjpcQhk(`L{O8IF%AO3VF&E{`7csVc+l<&3hjcYf~9R>XUc1`PT!$0tj=
z?SPGqh$vM2^0#9i-0Si5(SVCd#?kSDva)2kVRuvW!Q(#GN$SdQG0M1i*yG+|kGe7x
zrKXj1>32h5$n#gX2k1Y0f1AUD4#SI_qBQh+G54+I_%!3u{h0TkY#^oZ8Nt#tnMi*w
zhX*mg_-LDZ`(0-9ilVI9-i+DVPRR3`Uw<;?(fvOCZcL}WWH>C?+6sC9=@t&lv#;ko
ze$e9m_cp-^Mw6U=*Uu#_1VnvhSX<$;b)mSs7Y~IJin~)ZI7LHocP;J&cXxLy?poYk
ziWPTvEAZu<d++n*M}8!EcCz=*`_7t~HEZSg@E*KMeQe@d-IW+A(HrmKb!i4$+cnng
zgD5S0t0w~c$X7FvJy%iBDegnXCYG2>I@~(FtO~aOijF5pk>0LQY3a^cT47+WNW;AU
zyNWG|d4YaONhQ#%FR`v6(ZuO*JC*O%)>n|MX+10x?Mu7O{!J!x_LTdzc~1eNcV%Gx
zR(yT~o?XAOBDu>Ww{PuGE@9k$@YXv|Yuf>ar-0AqMXSqd%}fl^#}VOwCs<T)zE3xT
z824?OCz`-7Tur!5T-2}to=;iVyP~}z7d9+pdt{$V1bpVVt^#2`A27_hj~HrILDL~$
zB#oQma)c0v#Ru(F5+n4%4&rfj{V(NY`w6@yhU2Qlb?{`}0Xt94@VY1gLgfoZS<V(x
ztfE*r5S%j(E+k}$AV#Nf;1HG=9wiykPR;Cty{ZZ52<~gBQl1!0=t@REIHDeZR6Vq=
zu>4CnUr{A{IG(Y3Tswwndq_BwDr)%?1L0jLYO_8U-`3%wtYpEHD@9+U>c0o-)Ej^M
z9VY<1iZtZXbYC+k&VJF1J=0>`x0?9s*HxC*%7n?5&QWJ~BbN+BmA(qOP%;dEd2xPF
zpT(DJPc>)ldR~qPW|n%xP#1^FTm3AV_#_46<m*UU<9SnOkfh1Ou~}6ky0VL~CA<_2
zq*iQ@%H$V|#Qxa!g-8i$9q%Rob6-UIa%Ew;C0#v9m^g#KdU)0u!73?opl-jTmdZjj
zk2=pm%^*%NNfp39Kta2HCg#wU=6J=?L&%H|H#7T1zTK9;a3kjM=Qqin#QGb6i3x94
zGF5vL(7Fj*KF6>G-?0-i4)$k_exf#uTO>Peg2rFALyV00Rt(ZWI0m>mt;wAb?`(lX
z)-*!0Q}bvAkYqw)-M#THvoAJv><>A%Nh#Nap(@ewz8AspS$mgkN9XMvf9UA%gW*b5
z=s>=)z!<Vvl(p?J<#c}@-8@birIHUYVwNS%I8)C!6U|#)oFObR09cVKm;9d>vNmka
zoZPDW&Rs}hIy?mT?v66o&$wdFF`=RV?V2#--&nOI5*6!WJR#?f!>E@sE7`g(27Ts~
zrACnnhXS(L#BbY>zQC{Duhs}imR2Km;Wu0HN0o3^SRm{m7=r1Q9A+fbn}FqfeJ)0x
zwTrsW_3hvJu8hjx!K{Z;*628c2?1BMeI$y{>KVKsner8u?7~d+@48)GU)sIixBSkc
z2zF#9$ClV<8=xWe8=mDT4pe|BX!Zovyqct<h&CEefgY9tD{9I}T^$;X|7@Jqbg!EV
z*xnqaI0Z;2^oL8oT>cvv<E8Lc!U_rBG9Rf=dFxP^BDBUZ#JJ}>y=cM`W63!1IbV;L
zSBGuDDRdurV(Fv}B@O&DMRPVrS6^u;Fv7!|!A|z{Qo4FmG%(ofmdKj+#QN06V6*7|
zzPy)j%rVJBTHGPjsr9R^bNTwMl7LUf&8UcVQW=kPPD@ft%cV)1jQp0zO|WDx>d#>_
z%i#6(LS%%+;C-$<nN@gk0~Z=z6>Z^$0~Gh?Z^$0HP}9|KCm-~tmsVYQ8ZTsW5}Dac
z+jB1Z7u**fn4Tk9%QXIQ<d|^3!<R0bzM?ZInNk;~O{UDuYXY?X<k?Z`#nEJjjxIse
zuxr&JQNzKa?hBG-NUCADoNDRcRdE>6RFhXga<s^$_Jc4~Ah5WyGA~7gR)P^qPOy5f
zvbxd|24N#BC@vY^7~=#8)tQ_qE&f)gC829FPN&BPt_-}Vz~H~R`zIDE30g<ps;m<f
zV<=Rir>dQV)+SMQ!n!^9iF9|)$J5%uU;jSl2wR?`z?j2;pF=uC{Qbp-T|p{bG%XL8
ztglfz0rYvLp9pt|b9}DJQrGG%pIgA7)!Qlm0iChZ5mLy+6sspqeG?9Ct)0zni!9sz
z3%jl9+}G-`7l(~aF&^+Lwt-pTvT8z<sZ!*{zpyJ>BaV^K1iuIJhg2q1-HuGor9rmr
z{Zre<<z-vth2#jCXxsoF=3;uQ;+y!ZUN=1j#u^L-W)O6d@}T@V9ipv;-pQ}B>Qhn-
z2^I<^`1UnRc^gqYyn4Aso4*8aDdSJinluaXE!5}EAzqKVAye5;MrtZpQt4S$TxW&i
zpx<naT0rzO1!*<@${?0l>swr~vWOc0=xpxK4~YW4t;VjN;~TFNRPC<>)w;}&#{&?>
zuGGICa*efQr;U%BM}F11a=d)mHzR~^ZUhnGGd!QsIL{Q2RP>_?%Fp%?0&Tc(t<Rbj
zz*T+<jJf4#&>*Bt>2`1E9~(eFdwS7m4oDYe21I`Ldir-}nWP}adI-?ecaFQtdH-uB
z()G_HOeMZAklb_CrishUoaxX-jPJ~^e8re;sw`^naM#ArGKgk6-i3d2GdH3vlNm-1
z^@~xcm`pV(>?a6L<Y!*Ocdz3q>}u(=%x(lVHTE=u%*@HB$2r#bb2~H&?;3eBM6@=T
zgr^BDeak-c#F-OuYji`8GrtJs(Hg4hUfy1%*`r|SxI7)dHu9PApj~$=htalYO?G$Y
zCFVPywb0Mrzb@lPHE_T|uBHBG`Q1^T3;r);S|&A%d5O78$nMU6q^x9giDoOoXXFN1
zeH^5S^$n(cW5_fUPxRVPftODyPWjU8hXVpUr;e<XZa+B=>Y42}c7J90>biPTDQ{L_
zAFsp`F6_|=MstQB!Z-krT)y?{kI%>qx~Z~|ncTKxKb-$uUJ2(FN;9fp^e^IBbY6i`
z1}>9{(}ry?-?)E^1@NyjC6C1qbQCV3yFa(gjq?kWpSkp$L#0Mbu^%Vk%HRTZ#necl
zK<j<OSGbGpX1(gMPD7DF6o=7co%~f-nt$f@g_W=%vg2`!(YrcqCFj-sPpKdu;^3n&
zDU1pwgl--_#k+ur1)+d{x?8Gw)vSbcCR_|Mi^QljsV^^~o6@fq#Y(V+Hv9Bp89A&G
z7Vv88wuMI!)hkTqKw!WL$4Y|uQ&a~pQGL7ezF!^=u1#`2dIcQ$u>dej!~zc+#g4<s
zameK`OBGH7VHlPhHDsd|<Tl=m^m1#vKYI2ro`zhab|>npBRmDewb_7%j1#i3F^cd8
z-H=J@(;r$S8w}(Z|I(VL6!x!!)ZT`*7(+OVspu=>g}a?}HSjwE`87T$o=XULJv!ZE
zlCu$=<`zKef+MctUCd&9pF{LuhnnLXlZ2Z@9zX0)FqnHUPJkVjU0t$5y9D?8O_mE9
z?H&qW6Da|dv`GGV$J$fxOF0T<R=-0Ox&N$%LX#w1g!IbNr`rhP9gE*ne>V)L(Vuq5
zkflDO3O(B=s8>E+pCH%E_;V7Nz0PiZbQpVo*_eF9e2>`qE1IIfPaV!dS+l@fQV^i$
z>lj@h9k|XFs4I>IN=*Fs+MOA@XE!y2N%7!j|3|`#S=FIt&fuA{o7xgQ4Z@R|rJKTq
z#tUd7ow_1Mgpi5ZsTtOo{6LObYBf}`gi0_L@4^V{mAsWgp?4X9>3Z1oaWYs|$XDn!
zIAbFJqXf}o)UUcW9D~%7|2RGU!~noOV74Q{F~<~ZkRn7iO@M|urUQ7?X={stHteQv
zD3*X&72MCsJn9heIyo6AC$0(MnEP3IY?LFTM;9L~6Dk%Yf;9x=U=o(UDy#tuX7tDk
zWl=5E8n_|E^?Axr#%*{(lOeMJJBSc0IpYS21$25JX|E5dnUKs-O+UNHM!!E}mKaM+
zK%r(^mEU8HEEc_PPNz7BP()m^cr9HtY_F0Id29UJW5w~lTc%E8%1Is;dY&~1uZmqr
zmKknV!=j+ka5{p>*=V+7JAqm9-_B5hsTw#aSmPl>35TISDjV##;lsE0*C*yRi$F{F
zYNURK`>dUc7L5=4N<E{p)cwkG^d?24s0D-^AOh85<5B7N&*3&J2!Fp<{QU1uO8fMz
zf%w*NTj@LL<BPA*jbgAVE+zD5m9}x&UJ_EE@vNQXCQ^=BV%)b2r0u1U!uhK^uV81n
z^s`mDd9xkVn-O*hF}T?ua?_1+gBU{UuT{pixk$qdXk~EZ@vH(w^6^qBM1R!MS^C~X
z(m&3nvdD(9>zhd9JqN4y!g{JCEL&}b9rx|S1a^LMX=k-DVKs?j09orOC1X(G=ecZx
zj?43ZMcUP+_~0j`ct0YD2eIQ1Y69bx01eGzVrt6Fl5!`B)Xkx@hLGPQBvyF%I2Hgn
zl31i7WrGYQE92Z6^{v=pLj|?Skvi=98RCK)r$xgj;oEf=|Cak{`_Qqj`UTY_F?XYT
z*@CTw{PLPb%Ag*O!QK{5t@fnC&V<u6%~#Jrh&Q3?PkF89+0hk`+NetUvg2z^z9F6f
zTe}{0-=5As9dbdR{<q&BJvy0;v6L64H@;AwvH{7MeSUg*o^AnWs|xQvO;+tMuckGs
zX|Fb)iu|ClKTmc5n=JX<V$wzW54Z=XY90R&y_z@<=~NIQV$jW*bo2h=b}`~NA=>+9
zo1)mA%C47u+XlnW&m{EbJbYyT`~BJO-rTjL^xI4<3<Ig+%)aC4x%l{8I&&8pD-rFQ
z@L_%Z!v5Q9=A45lo&{Zf<_L$GYf0Z<g^0daj2C`Zz0QubnIjkchl{%-XX+XZE6OnM
z`_s-LoovCJgoEUP*$ApXgR=%}&|WJ#&TOSAACuc<Zl5P6qSw`3V#*L|zDRw2(hnaE
zUEWD%mB^qQWy!ep*ZDaWN5{58e8k<LE$BXQ69E`9gIA_h2D1>GNSC=iyNOie)-+=4
zM5W*%!GoXW4&78((g^<D-=HceBxiCC*;N{)sgD!F51GkMPR_|<M{%>Jsg0WfFfrj*
zwUK=vmbA%onE$L>Uv1{1!UpdoN?0<;jxD>7vQ<1jCQ!|3Ih25le?|i<G))1;7EVlz
zV{ZFPi6*vCxR{yw^=X3eAo4T*oYugb%i#n1T6uh5ilfU448Jzh+cAxseYGMPNX~{h
z+D@;)#nqem%uFv*+7PO3*fjB`8&ZO~N@T<ko(`;dI^KgsMBLVOU;^DOM0z{>gxoEL
zZ^ApXzRKWTZo5rJXrRiSAvGG-=UmPp3VLKgr=0L4&_PNX(H*5)#VA#;?ujNrR%|aS
zNU_<fI-i?W!bztPd<B`Hk!q<#7J5=6r?yEF3|@mjo9HcCfbIr7cB2ptC!^X+ljdqg
zf({<AZhJRppYq_7#AxU1*9VNYQ|m^aHCZf?^d&TAHt0WxmtRjeIkJgnAh1tp-Nmog
z=ghj9qg~sEeBJ8iPFXT}2}l5MP-?$uXgOs6W7~e503P$=;m@kgO|$RO%XAYL&T}W^
zsB%-!N3ihMYi*8>vA~N*?{8aZp8sif91Aht<h3uFXG#3b^HQXrw|mZzNgY8Gn~Go1
z!@(bzlK2F_d<a&bfKgEn!KRKxDn)|iB?gd$h+spIv&0L2fSTlFZrZMR*rm%tRsFC~
z2<Z!PkiI8We5ewOZ;@~R6n_{$&m?UYy)sW!rnI;T=@}(q;Djc@AQ8<>G%OG`UYA!L
zh+#Iqt&|}mars~7_9Us~zY#WgtAA8iU6<M4D?*!<f!<CE{D=zR8XPLQ@8o4lAf2~m
zvpCX}PGR+&1<d%&R#(p%^|A4bIHJ1ASp4MtauK9T&gMiEpAf{T02fBOa1S^Kxm0ml
z<=*|=p|?&!jPrFfGuIrRbE?E%6468=5Qo`KB4PLQhsS@D6JI}@i$7;+Om?o}T~dYV
zl-)#}{QbjN6w4Uk!ufW-;%j$a@v2%}_OX0T<Za!!hGN6+=Jy=TV2?9cze>Yw?1sc%
z?lYi3Ia(ZgIP=Mofp`T1){K<-q;7&iKFHP2vMTYLtvQ%>{!ih(5n+BbjA&yG+xAlt
z!v8IRJHb}bGgh0Xu2Z9Tb!SaqNMs{r0yT>Ph@Lv&v)Ilof~o8&Xx-|H)~t#C(3u(%
zdwTAo^rdJ6m4!edg!sji333epS4Zy)`1~naLjFT;9*q0G{?o=gx#VqMrT}(ifELj!
zxpFD$@i34ndP-L>TuQZQ?}<^*wB-D*^yI{|vuj@Ai(Y)DDZYt?+r3vW8|PB<AE<nl
ztpu7!aGRrQqtVmxz1Yl7Jul+RCl^;7p=bS&z)tckTBsaNUqm8vwxTA`s(h49FHvrv
zH^+zdDLIXL#If(leb70%cE%1H9wz48_3?QjzPtfQ03b{NOz8pb&MinobZnB5LSaYV
z6f&TB`ET8fLVPxIvksxObz)g)75d;!G-ig!ENvmNXn;pHn{<2HEU8zC?eH_t=V8Xj
zV=G@BC=i~t34!jCvlfVWttLiTb1AQ8|HlP@33#g8WHchiV0UR=B|C4HF_dRimZsft
z_^XK^n!Ge_3U6X^_>&r%{Ch%Y<UhCS8Aa}-?{W|FMzS^wkshz8s3(^<Y+OfP0h&IW
z$#!|Lnpk1YoIw7azJ8_f<&&VC2F;#HS{rkk9F>B`uG|MFU3#XnZLtT^k19owWNgSJ
zEJmCn`tpi$=P;HJn`;)UTc`Ax{%pvayK)Sb$U;{*J!9YNE4e{wtLyaEA@K7Qy4iv3
zb%!ZSXc*1F7Bo}p&a`*t*g5JGg6?fTZ@<aM8uFLW<6w2kU#xRklk*$ois8He-K8qM
z%+BUFq;zHq8`E$4>PhALno38h$g|f>YvN-!fN8Pmq0Alln_CiPcI1BKx+IqA@acJ_
z<oQLztO33tB*R`F@e{h(<akO|`p!`=07N;1Cmg8|&Zsm}ECeRcIhCzIIt555JIev6
z`W@!Sq6Eh$g2<GwkfF{^h0M_lK5i@g#dyp{Ge!U`A(Z<XO{~bQxsR$>(m9BkQi$xY
z1iQfTtvyL(_)}a3re(%o@&gw6eR)unWqNoP`;wT+)f^f4>Qx=ndE#qJ<Gm{#gFj?q
zf-6It|JIYgq1`)PA%)%o_p=Q&8Q^b+f}D%l6C12SrUsO0FgAS{Zn%loO~we(pq}pz
z5eNn;%=(%3l{u#tA3e^gmlLjv>ZkmmJjj#b#8+bQ2hEtB-S`2gtrU?MS<s;f4nlgl
zGqj=d^luD%Y(93MQ<SoW=-}VU&;c+R!5^9wyT4f;OVIeaRB9Ch^t=T>PgwDt6=!}?
zLZV7zhPL^#uTG{0fhobF%ut+_15+P;MSCzXbB1%~PXO`XKXe=PeI5E9t&luU0O-{U
z-pPz`@W)eH2sYD;(k#Ze&}C0cg!VC&3sWaSUH|wb7^Jj_q40NqN0F|-mU7Cf%gtfo
zVj&tT9>*)B&6crICD2S=1}z}lcl6IkFL&(j0*jiGML^MtDY`D}TC<h=5eG(J2jM}_
zLZuPPgJT5%l}DA@5f0x9DPW|R)>e6D8&~Wee!<n*Hsjd*ruEq?e2|EYs21<nLE<UB
zDEFDj+E`d4rX2?t1`!9s+3`5q_z~J2=rPOlP16=5i-{vlBy!;!S)l<qb@IeY*v!0H
zZ6~i$Ux4YT>ElXO><Z898Vj^<c6SHa@bPg?v#72>?)y-MXOOF9iZ3;UD)eO7%l7ak
zr$UYb<9f~BXNx_)z`<WNTBK|YO+$AcO$yqhicDih?{g3>sZw4+ZJtls^J>|>sg@ik
z;EZU1I(9@W5<oEvq`VHVXv-@x!8BOCayTMArP>ro62Fdu?{47c4P}Y6@Wur6cuMO=
z){pIUpsSf6e;Zk5+0*l7@11{J_Vnm7=Bo}B^S1?kih}>HEnHk5AW(0OCT6#TXI^=e
z0Yy{L6&KI7S586&(O_)$(bb7Wg<J;kRO?PXQoOV6E;x*`RoV08<dN=6Zw+6En@tVj
zB^jhG{D?#~y@}6vl(xW{P2pfX^InnMiPRWk4=xC(Yk>G0^MG234v>I@$X_KHh7O)E
zg<xu$xSn;f8X=UR(7+FXk3V85`I$UqqQ2^}^O8F`eCsj)5Qr%LfcdyA86ki4I%UaV
zzxez?Gw4t$uQWplBZPpn2{=-bJ{!dI>6uSgTN!u&wDL#8^RJ+v<+U&s<%QJGixmW<
z(yB^-u2J_Rpx=vClh0<-GL;?uGK2@v;wpiP?n;JRy#lQM*-NLZa^O`VulO$Y=uoPO
zV0qAdH$y98AQk?lc9i}i1J}3V>UjTkU#^;P?!-3Uc@<(nTGgQ+hYMRmo406v$1mX1
zFy^U9UfWu$h}D=et0`skg)Sm|!^eH}{ptOmtK|Ew?|LT$MA1JcsWt%)!TNP2`!U3;
zkD!Smr2}%;FW+MN(SVZ>eevxI!s%;$cn3>P)^G$JQ0mxTj^I7Ipo(H5ak|4NC--o7
zWPs~)fM!8sq!(|O7AZc=`Q=OpeTfAL?PDC;wR96F&2<9Yo?oj&B*Vw(YQ~DSoz5=C
zCqh=E&}C$B80zxhF!C1F)MW6Wp~^6-bLX*(DKViVPry0s1(B(V3l|n3?bP?gvg36-
z5j-K2?`A(;w2C2plde&HFrLCaq$KSg(R-ZbdK$HZN+Y55gEJSo%D!231Bt;a&HF|W
zc0`KeR@zWLd5J8mc-(YDH~DolcjDe9KwW6=ZeU5n8=Mgc4dq-im8DR-np8)D4&EGS
zvlrum-yD!Si6Zo3`8Ehk<#yo^5~aI#8^Dyh(Sm8KTdlyTAE%z;OBfQ~(ZSnQ;nZ=q
z(u`xra?!PL`m*2h&<-<aMT+!rziMp<(EaV8<>b|+-$gwpcDa?XFT@@_mjD<#(AcT#
z&Zw!+$_=7rMmOu*D~fATMR_T{D0bcNx}#50PklE1wk;{V`DPHJPF5$4+U3LBO<Omy
z+hXAItI-lj?eq8r3EJ}XZh>Qy49+eM0zJbkS|wKI@|pQ4J2)MM<-MdH{-qLLJ*~-O
znw?jzh+v=vOZk)xRMB-wBElYhk*n3uUNjb?Y3$o4KC)H-Cqey%Du=HldjZZbpTIJH
zi%`8p^P^mPhSBi4Uo1Zrk_e%UA7@_gijjNAcusbk^^n^@BfO}!F0rc7o5-6lMcq?B
z69Ys-==TCCjK1iB4%CTJUv}<`JPL+3vvMl1CMHbZe^d~kiHcV@OSCTlKse4sG=;&E
z$*VkpKQWkSwO_d?1XgxlOJbH+1Zm|Eq^oKtAJ!+60eT%g2k&q1?_t$%H}6;IbE7Fc
z&+%YiTG)0=bBof{4m33q;!HaAOBjE*h{C6ke~M*m4*#Y5MqLngaSK`suYZz#P~Qo(
zC$RWJTU0IU6QQ7?#QWvIHAanc8VABUj|72=$fVLHN^2+)1dm!&q97MQSg_`ed5l<!
z3xWH<dSWd#14b64SgI=MIIN-GWB{{N>2;=ncB~n(L~Y@4%3r6m<T^?J2imK~nV$&~
z+EN0-^eVN-Qn(tO3dzELa#|r4>5LF_zT%>b_Qa+UtAEn_!#0JdF%Gt!L`?`-L*Xlf
zaw!4zGVsMMSu%N89iC!q6p)5zZRfU+@h&MmkxJA(NTL>KY6hhh@s+?*ov8S5P2Ou0
z#P6p1R?N-J__H#R&eDKsa2#Z-xhj96IMGh>COKx}+~K=6W0uY2`{?5e7n{3ovEKII
zOJpb8&f13mAzCS>mxhg*F6Y=wN5;a2iEtges&JUrg9=n-e$wpN<hp3)O&f?4JvmC4
ze5#!_|CFaDLKKi3u9UJ{)U)Z$E@!}ip6D)<JfS&BsETinU9du>5@Nm#HzQ^^N}`>#
z`xF4ws~g`pK8kPa_+}uDBK}RNv+{y(`e|!YZaI;El&*%;*M8Ho>Ko5N-(HgTea-~m
z(|SVv$<ED?P>J4Y-#LaeKc$+St}F2bEjYPD$h9ZKL}WAtd3!9e@}+N~<{8`B#l`%=
z)xx#C0Sqm_2Nw$$jLKfKea>Mfo+6M-L1h7m$*%0t4XC4jC+H$XSW>MS9+QVHgA=o$
zgbn8}OOLIXZ74>R_sCyh`89^>*m_|9%BK_Gac4UFUm6;TRlds(OuNrlt|GnstH1W~
zEB=loR2<+n6(=S<aVBRwk@l+4W7rcBDePJdWpH3Ty$S12(b^wu8O*72rgCQNb@}-m
z@M<Plb+Tqyd9Y#5qc47`;cQdVH)!A0TG&d42Z3|&MGmf5=X7gL6}g_DF8{?M4;95V
znm>E~RmM!~*{*Dz-RMI5byj7JNQnjqLblu~{qoRBR^5DlEWF*@M6=mha;Z<~(nKlK
zrrI<>9f4d}OwTz~537-A_qS-`5v9^xMZWvMA($1d?W4!5eA_EJm{hxg-+P-LrVOgB
zk*^>V0hk+!oU3;_-Q7h9%aRXHjA<&BkNRn=7CU^b2pa-j&$5&)8Ktd*pTwqbi=HNe
zl2qRT2JN>pxWlqJ1q&zVgN-j`x3a(f%Swfop{%@U6rFf>I^Y<)VE%H^N+I7RhcSM@
z7qXXmc5cFH5?@XYdfw~@i5f7ut9{4kl*q2n)MMe}H);SnMB!CnPzU5nV8L%%R+g1j
z1hfrnnz9qz1XnJ&a*#6W>C&Ehe10B6SRPIbw1G8vQMlIalAF+(ys`^a35be<(9c6#
z+-@pf%)=|~C)_W#RlPBWJYJL*fB<RYXC0n3|8;-La6aG|Q58Vz2wk>-g_7CUr-{3^
zsgi@omm+=<XL>z4%#*+W485(2d_77i>o<Z!drUG_aXI}L`eQ)7$>h}~?60^6e3Z+4
z?Cmdsn19zA^OB@5M;mB+wn_IFGGM9fCfiPGx}@t^^Y1+2w!?F^P9#wOXT;+_vj;xM
zmlJn`?pcg>`bWOVcwnb7Nk@z{16z)-$2iTvx=Dt)0D&p#`os}x6M?ajy2Q5B1ZFcJ
zN+2pVbNv^uz|LCu1-7Bo0O~3FIe2$Inz6ce0J6FeILd1$z2Mbtx}jL704rM3Wa|?^
z27Yo|Hha%CwCt+f2gGPx^y^8_TNr7DLUQ(T(P<g)GUsjXBl+K#X;Lvp(WEKXW%lQ*
zl3RW%F-W2U6)lkg%cRPmRiRbNBJm0&S$VZL+i)-JnxE5o&F<3k>$H*Wv{hVLx+%8J
zQuD_j!hv_oOyAXZ-7yO4wS}vlm?fLrr17aBgH+W5GwOx%G7XC&|Du+}!zHoLiyI#r
zp(cD4SH&M&u<mEM(HGfb{y(F6=_99xQPv<bG+PLO;7XTZUo&Cr>!bA{PfZ?>VepBo
z%+ztJwNhr~uy^om-5tg5C<n1(S&34TsaqD#Qo=P>(MQ0KK}G9Oj;V`=J442p@*Iso
zYqt)X?OoQwy5%kmPF-K3oH};cYLcj~8dFY5{U45BBK=1=q)Nie*%Ez=tyhjyf6Pfe
zhu}6`1VhE-Xx?5oe0u)=mJ+Yh$wV8O1I*Q9*fP+c;C}g-&}z~K(Xve4hyUu^E@$sq
zKQ*`yWAKNL`HN%%>L8)i#t{$f=A}VI)fr*~w+k}ZTl^0ll3~7j1dk;)BGn)=s0a%s
zF<6@CABszT3FjJQ;uX`PnR`YwK;(Bh$J{J^G#4Ni#L01$L8qD!h6`(@W8~tkv+aJ@
z`XgB!%t-okcp({b14ulnJEQm=JO@TH{a?2HUu3jDC}td!aJpUN#F^Oh3foArs&-h7
z$dS4#0x^$KIyHZ6S*P*abYrI!T8PLUxX9||@WCOPu%Mn6=>9gaSsq`W$}W3gH>hM6
zeAY5pV6*Oezk_M}kNM{u&S93WOU_ISdoYe&xA2%H{c-R_tMHNAng@b!{)bCD^4^yi
z@|x~unF><FKrHOr&^~e#EjBHMR5=1*ctAwjrWYM=Hj(a+LVep*=2>|-%yU5l*9$7X
z(|A*OhnK|sa%nTO4G-YMxhw|s9kYwr!uCM)mBg<i`C-nGc`6kIX)2^XKNb|3?Nr;6
zZ+16+%ZE>Ud+Wm1tbe?7q9(q9tH}MM<3Kb)8XuED)N=4BkZW?E?9+9ORgO}I`6RM#
zc!uh_>cuXDO50bv`?i+hQE%_g@v4!P|0Nw)Ip9An{Anvz6>`GY@8pjCN%_rLNx4(4
z=$2QY+D(vxZSA;bX|X{qXry>|EWLLCZiOl{Z<sOi3YPjkp_AJ?nsMZpfbaQR)1TUe
zO@;kz6&o#;6l1PAE_NFuF4LQk=!pm7dh&WLu!?J=s!G{+wWPGlwH6pk7fNc~e(iN{
zp$@{(4@iES3Usf908u}G&9&F3_MwZ;17iyr<$e9pl8wVsPw5}9XPy3)W8kPN&vaeo
zdsV1Jo;RK4uX?u<nW0tgHiQk;nk7roc2+4Y=h)eAq&j7spqyDNHVz#Z1SS^*Piu<E
zKPP<!I^Upzb@J^Eju}r+j13uMNX$K>nF_ir-7U|m`Av8|+p{*w%sM7dqnspX5-70S
zg@r&S6?&G0TusU%MRv<Pet14+Y@+0Yj8MZ!LWzb04~`W<zO1i4f8fe$G$DBO4AV`c
z`7(L2Vw;Tad8<jkRZdu`CamxBdCC{FQ8bq=T8%pgqbl$okJeN^i8|Ta+lx<Z?TH3{
zrI!uD!tw9dP@4vth+q{Tsw4<IT(n|(dhWhB34pC<kVMkHu&4}*#eLs5nia^K-(yE?
zKUaTv(@&SjRU94fzRewStP_<7g?aad=hYK8Xp}u4ELo-}3IAIr+}pxJ*zv10&yyo9
zpk^U23x16=F+(Et9vFlXSOfi8=X>Got5JJO$0w<9s{E>?0yV@dr8~Sz>t6j~K6?zD
zwPv2S9-lFH8IB5}`#gqXj7;SJ6_|~QKJ`sp-kiA7pXGLD?1tVbPHg)L#)l}M1bgs-
z#WDV*?&nkfz~YG#vS=xufZAFC_1peo9J??3{^1A1`vbD&j|#G29lwjs|2#s|`xt7i
zV2VNr;>C~>D-{xoP+|=}78qUcHt3NBeCo3e>3{g0;5JM76QtEobOwtV5@A3xevKlt
z64tXKr`t~OIww3)Yx5!HAa4O-<6*dA>UYoOBc*Ucs!u0^D>=r|FIu2wpd~%XVmSu)
zy!zAS;Z^L}w?9IclK_hafdHs4w-e-6xs6f;R~nugZj#Q@=Z|DL)+GzrP>xeeOzpUK
zk*KmXvOo|O#2}6(HkY56zigRn1Jgz=u7Zk%QzQV?E&5<7zmTH6ib${RZVjSR+Wxny
zW-|2ItgD{gs`BmMpz8jaoX5Q77PirG2x$q$_WzwWuYbiPi;D6WiM$G2AIu;nY~2D%
zAbZ{SpcM{#&5?V;gQiSg9s%OR#pQ^E-BY#X05w7J;zftp&%>h?c6fa9y6<Xnv#U&+
zy8f+SIWqj>`_n>h(fZ_YW2U+c-($L8XlVF{qWA;$y=3wMq^mCi9&RzO>+;vY14`vP
z7oYnZ^Nbz%=~K?jd<3o~={z2u$f=12SrL@LuTFJ9z=(>tZhlejJc&`oQiIz9kxEj{
zGf2MxsSGbKY}o1rQ^!)ypawj@w_bOz%YlT}xHS})8xOr6lNZYMek=>$3TtpD3cd@C
zoG!@>?1;y2oPETwTOAar@A*VVMyBlKMw%;XcBm4MTCMJbC%r|Z7Ex*-g16hc+WzUU
zjtWnhkldLbpy)T)9h7LOH)C}J$Kbtu2rFxI$ke+{26V|?hn)&sBZ!qILFS+q6%cxF
zee3RiM+9TuYaTMOH^q1QpuK*)l)Y44NCAk|nBg|g77vR+YXWe}gx`C42ooJo)_l}H
z7LJgQxW)0<?nt3W5>mY)6gLsXm9xci;ee2lB4VLp5K{u6OEkP*XeSUUY~klch2Z%C
zT}^4*uCh`}03*DQ(u-8~je^yUCDj1hQzlb=7Kt9J$S`rhKJC+g&XUY$MO=P-?P3l6
z;z|Gau97rI09iy0P7y6A*v-GNXz<Yolud$ihLq7K`@`GiIPbnZ2*0@6gjJFys`4}3
z*?`9V7<*9{&pEK?bB@p8wivG7Ekpgq6|jLM*NYx4bxq|sGXHX9G$QKe@b?ngl7n^6
z8mtaH2s|z(oer+!KzyaWA{o@~zw*1MET;FG?XBZKtQQpc5PZ;ef1fPj5i>28m!zl>
z%)v*nfr%s*BjS!!Krfdx$6icrRWySK{+<kI1G0jR8bk?6su(}s$-S6==lA_H(lN5q
z)%Nz?V_L=jF|qR|lJmQo07~?o1d3;7J1<X1(3W3dU?7cUHSGr{H|4ryLsWSS&cR1G
zUB3h5L}<fhTM9-6->oedDy`JZXCfIw7@W8rRrPe#b>)aQzX2!na%UFt?^(mQZ$g`b
zed&Z+POjq}JtX5jj+U#C7mb~Vtj~7Ckp)QHKjpbaH|#8a$c-exLZ7aiKph^s1L5HR
zJDpBeh~~m|RTV>sA;aExzx8!B12g*>M0~05J^uE0=?7P`3GwtdmW{I+%OK|rCOHP8
zB7lXmJ}Z$GLwG>P@QegZk>p``E<RKl1k_N2S1kUq_?)=D5vKq<pRGIlHleKKwsd0q
zPwc3ZPsQjlU#%1(^bzvlSIQfF?>GXEo?rr#vQ;rOhFsEu0(zysgyErJ!ta{feA&X{
zM#q?vm@QWR<u31If}3``v(e2@YqJ>owus{OcC&GLG}WcQH!Dvvff10XTpcuN<nr*A
zUG?$sbB!=${o5ZNH`Wu>IE>47A>~aPwa|E>l`p+4CT4ay0vU^{ldieAyA2(1dS7})
zl;GgUY+|ym26XLGdoM9JVoM1$t}GxzvrVC1@Lf{6;B8>RG=dG9R(4zoaT74END>^;
zlspS=Xp%OW8C3s9Nw-a2x2@jzyn}tgrpPNE`#ngCszPq<G|M6%ju(48O;b_R3Ogw?
zEU=HUZ&a-RTBZNmFo9m>7LoUX;?uPozf+(SjI*{-vu#t_NiaQtbw$NeHZJ9MCm?D9
zyD#o!QaEg{$d8|U-&|5?wVhSZo7;Xl@gbwMQ^|Y}YG6b!Vil>Ls^X`DRE9MS3SA-U
z(Qh2kl$s^WrWlk?tYcpeTH5+&rH3NwdFKK<G;;{|1FTgvcS>DFMI5cw$v0KBuzH(p
zM_IrNI@$^QK&(UcP+j{;%Im>s^fy-15VO?Utf3N0eyQku<Yfnvl|TSX9zFW%>URV#
z?xmgCBDJqfdVQ$;yCeaoAqMJo^{<cH%;g3(tph5a*>y{SDuLM2id2b|&FLId^w$9b
z6C?F_+IXdPBFJHCC`|AKN-Ep#Nu}e3d@~?^C*fGi?5<`lO9k$}z39@E($OKNrgOQB
zpAOB{c4hn>DO3X?&8uF{R@pA?qBJT$TIcD)1<0!~F9l*$E^6yj+Mf76a#wS<{IrQ~
z)eUsvr@W<=4&zFvZZ6akwNsrv6SuZT*YwS75v_2r;oME}tsOls!WaaT#7*(cta;+K
z|8|G+lu&J=&lTJyk#t_GD=5oQn2o)$E-YQhbm_D*Oc&`OHt|^=X}bp|LQA`^onJA5
z!Z<&=o?&EVD;n}KvXyq77?i)~O9b|Q@hV_#E$(3>vT}J2k6I_tvnyiuHk%&Ye1b7h
zO_S25mGo$chZDYKuuRiDaz)B_@7<@)-smMDI3lfF@-i*n27LP`Ffb-7Zp#|<TYp$q
zK0B#!Cs9D2VUWQjF8^ovbXy(Sl|Uf{Wf3BXT5Tba(RgAE(yvfwg^N?{cc^tv)fiq{
z`ew^AJTirqWYLn9_@_<q_H!6+|Es*d3BxvFj^6eTCIOb1Qev<yBNMD%T_b<-@~zgP
zM09DE|CDh0&W&P9i$`nVfy}nDXm^hPJUzqmMM<P2yg##6rWMv>IFSAHyd79{fb8=+
zR^jDlMXo5*<TB`%UATI`-s|BTmY#ZVnQ?%eOeW)bk2UdoYazZ-14p>?Lz;)O%&Qqy
zR=gz{kX>C{q@r1@zENa8bw~qSEKn)lApOeCZn*bv?4Cr72ueJMk&#i(#ref$d-a3v
zh}&R6q9p$}N%-DoH_&znjB>q1JNuMq6M7F1=PBm*MB$zXP7B>SPkU)!7O(x+rF+b)
zI<zFK(I4yzsH1CGLktq}2JsL9;<%{6M2YYj_+FAi<|`9%eSBDoBN+&DZ2q-Ly`cvq
zHY}uu9;R#iRK31{TkW+DFUkK7IFsPVbA1MNw6Nb3wu9FlfQi7elTvj!kxXH^UH&Ui
z6wOwNU<Azm{J8a({DJ(|y@k~!ViV8HxqYnK*Cnm>DfBfE@<s_D-vcsnv^q3KsKig4
zQN7>3FeMXstEXr~@}_=pdwdQ{7ny%q9Q$4U<`{-)H#rk2ut+|HKk~`+^b-%x3ps8h
zUxS0rG6u#4E#0m)mudVRz&m|t<pgavJLxj(-p9;W{q+@MF2e-gVvsF`^EbQt62Ux*
z<A`4Lq09?%9Y^nMF{AaHUS^q;oK4OM7|&Qy0m+`SXW4yweff8=;e9tcXvRW<jb>O#
zNUbK)egqx=j8e}q^^6XD6=X^07zx|KRwkMYEuZtwV_&&Ggq-zOyK9Q^ohC#Eqak{$
zRE$*7j(~1?3gjH2PtrKf+5Q|-%m!zWyOr{4IcY3dDpT-WsShxZ+7cG&Ydm>beZ?TT
z)=e1Ail8SEYg}q37N6A0Up(C-pX=a~#$hz=RT>ve+{MLUulp+j6%<LC$&Gj0Kn{ni
zSqpP+{H1E=xNKuP-|_A@gNSzF+oy@@<fjXt`X1=sdU5`#rj?VHS(d8_6d>aGbKx_R
z_b)vwsC8u=?SS@`I{_gq?8eU3VnU%;*NM}MI;IW@7nhOC{SBc{=R#7fqL8Mz^zX^P
zsY9zYvkjXwgMN+jt}K^6xQ$xgCeY~RiZC>WSn+)$0p|4N3zI-hrl71nH+EDil4Rz)
zrvEkNEj+p&jvK6=7NoS_YZlfT#)N^mgtuTOHJH0!Dz1naF@*KO#|y6VYKUU#@ivej
z&Zp<?9LCD^z5l!Oo}P6jaMxWdk3Dh*X|LcPR&_%u3j)4BF_no-33eSDx8i*EH|<ao
zd1nUA4X<(ghAX)%yR{9Y3;i5%x5qxJQB>^3ieant@B8q^@aBQ&Ur?>Aep^Ox7XRug
zZL>*(8mVe~CnYtf<1diW!#`d#;Ms`rSi!pOPN`P|+#S&c4Yu|-FI5~KLcX<CVQYKx
zt|#kT<oP!yH%2`&(O68mDBYBAh2Z4DWvm*J3miK=gb00Twi}<Ze7;2_e!mWp?|N=}
zeoB(X=Kgh$L=$7$cW@syhK9iVesw`^@0Ob7RC>e4{5F?!k$~C$?~G7G1nKQY*yi%}
z^{v*|P8>=uq@21lD<1qmE&$p#AgRvldJA?*eKm3}{>6&b6Okc9`y07U<eJ2j4=$%`
zvy;7>1}hcYcQG1MX*A9)_gBc7R_OALP>2%j5i&^^HA)^fk{2>atFo3zI}XJvmmW>R
zH)ZHck16s5C9N#fY`xik;uzVrd*}Szwc5`5SU3vboR%c0F<u2Vaz<(Xb3<L>vi0=Q
z1a{NGjJgsyhb8=~kM74M`8iC=N^ZJMJaq}toke=Q>ActomNqzYQS*C#P}$oO0z}j@
zXtqhEWRE^9EDfueZ_YGwFh52pEB^ZEu0?Edgjb7!H@r+y&!j-d>^L=168r=CN%5z!
zC;wlm_+(m(BJn>bjmRH!>NwVXdEB;ZeV>j5I&G!XNzR3jDHxS+1P9D09u6D6Z9Dw#
z_O3^~<HUmt7_jZxSwFt=eOY28vUw`;UH3eGemhhT(Phr3*RRg0X?iOh?r&to-Vv|&
zRk~ab`Sc4a(by`;M=hh+HyfbX{HdlkDc&@FVJ~*Ch|b-h<>mEq9!e8cs_9~-MG|a!
zn0xMQvS=3b@nYGW+PHw4P<BMb$MbWq{^(vQB7Q1tHML;f?$f@Bl;jOG7=3LN(wpj7
z8XFUGwf(xuFfe!@dT}B6#A~}@z9sY9^`YYGaW@b{g@Ig<92fJ(X!o>$A8IEU+QDLN
z9rb5b_^YYo%L<vR?c|PofI;S*?UUEj!nw2X9lnIYvY_<x->myDzkmqV7lisuzE=(@
zdqo5%8Q;2Iu10t*gX2lL+oY+qQc<7&?Ev_){M>%jG;{Bt$AqAT{Mwzt=KRkRCK)s@
z#FG-8lnLMp5=Xj0c?K1~8cp4-eMa7uV6(ubr_D}u15rZC#Q8uGi|N1++8~aMe!O6|
zztj)FuIL)R&)4_Ee>c5r=w-w6DdpJ;Nnqo*%teIBVbz`#)uY31B1QR%sc29>BKA=s
z76=vG9szC0HFe`|lQk?Rbq1}z>Z?K|wqJxm$d%LPXb4eBumWM&N+chPdTxx>+*s3S
z&?S^*?zEXq%dwe~GQd9<FSJmPt@G6n6kvj~ZZ#KoJskJ#oo^{ml@Y4Hocx3uv}(k(
z+KTI%Zz~UO$<=h%9bVN>F+1%!hOk@`p?wd}7ofIW(x4G~F%BAIw8@{|v5$=}P8as|
z{m}FN*sO8nLj87o;0<Pqd4J>Po(`fy`H0XL`PvtWXf=d>Mv6W#C8V=GxPT#gh&=>f
z!6;9Xx7kin64U8k&<BlGL03FxM(q0$IePo|cjOyyEkha`7%jsvugve;IE;);!F`#H
zQ81`C==*KhfjmZ@uH$c8N5<FZ58hB#{?_ocjr&?xt=~XhW5VV7D^;^yLu<#Z@h?(C
zChN0kqR)Vd;Gw`qm`>ZCgB;+TZP4jy)bcW;X6D1=MD;JnS8z=JbOS$(#4mT2Z%P^|
zG(I;2Y9x6>+r3{497YhE_ooN*(Y>^%){6i+F&Dtvjx}l|+N)CIJC%fxlaRGnTYK@{
zN-S&Zf$^yzFK4rC$vHCtg{OPn@u&ra9G?d9P50AN`G?IITi3_a9l-tlck+wKrwl#4
zz2hVd-)Ga5p;ZP4fkvvwOP2`kB|^<qt6bT>HLw0G?VCcGk;TbW=8JP><H@ET>_!cY
zrEi;?mmb3_N4_~&^wF@}?8`WmSU)}bb^TJa-bkh}_`fY?@3~k0s%!@t(SzI*CFTa9
zv-=%>Kw)TG;g6Pn*D3(TEAk5I-x!2H!y5CioT7O4eqkRrYz*}nt601VgM`qT6n$;~
zh~Mk)uM@pW$yk_1*ItpT2RR)Nei_ZlT3udIt$P3xRL0@bZ+U<n+P*^^11OqTC#r;1
zMhy;C*&&S($8i(til;B@@nZnCv6$P;Eau90A{?u(7D~y>m?zt-yGqE<q=sHALLN)*
zqVM6V=KRD#JJRWWj6?r^^jtdzy8XDeHv&P_lfB*!e0?Ki89&9V);G<Vd3yFg?^qW3
zI+yh6y<ekfXsklvq=Sl~6{eV9jGgP#?T!Rrm0zHN!XabwK22Tk<<k)AEgzMz&|$&>
zAf~xOZfexAr~73O|CjE0tT6zpIlAo?_@o;edrzeNvN=em!Q4oU#$K3M32ZcP^b%0i
zrKf9muNo*yB7ok;&}!NZFN)fF_Wj(Px_W-Y_Zl8oDT+aSt=HQfeA|t~xRl_xno$sZ
zmodj8t%aPx<kQygRMWXWOhL(=fGJ^JS~R?uS4dXp@z1wcyI)Qxk`iqgFAQ1gJz3g<
z<drco=T=MAF0DRAeNgZ*5QG37wZ@HcgnmL;pmcD5(6Yb#Wt(K(c9><7mq$)Z*WB@S
z1vVu)pE#dxd5t{bAU)=MycWtbM|1S?(ww*;?Cuy3;XYVi6YQ#AZ(H0eSiRxsC8C0h
zh>+j+q{_zWzncHESM6InY(~Lckhr_ak~cq%BzXP9>0*ZJ{S1>dx{x>jzHRfo5Cfz7
zKxDT=Ze;)|2@7YVT72eaO~?QsAUmC16mxpC+J9qZnp8w5p=9ZO>(c=9om`DbextkE
zyt&PpUogLCD496#zzFn*Sipm(J!vtRmOKFa&@}o0QJ=|DJ!cICg7=u+{~%cSIm|gh
zy;-V+Taj&z@8*e+`S)y+gnIQ4Qv;Kv!8MdcJGM!ta$#EHfy4ZMcKF!@`mL>za4~l=
zn#(HzOvRwb*`e<+(wJdA<{uaJ$03!=EA4Fx5md42`Fj%m;&PpMcw)m&=Kx$MYu4}N
zN1K<HH9Qp9!Q>$!MsNST-w#_h?R>nG__+^Q34A(ydp6!(qI`b9#upVK_`XJ{y=~6{
z26qCaUa9!`8Dzk9-8nD;ibCMcSx3|&IAux;NufdLG=6#<)XVgvop%pQ*?r^K7`o4E
z#OPPbF;LTzWaY1h$1z0$qW*ze!N<vo@EYe;n4Q8xY<iaDyCGK67^D2*0&Eb*^FZ2?
zVmkO9^Sc+I)v<MA|31{NYjx*upAaHqdaG^E)~44L8UVja(r+<1Yn>I7;x0@IUV7}e
zfsC$Pm~=Mdb;Is;$c?6z`>orshVNfQ+8nRxE$9{#6+E@Hab9!f)*sS*V8Q*3z=P`L
zwfxkc=L-*6;SX&aryGxyyP<DyR}Y@n)-f<+S)@!|kIN=ss~U&~d1JT`ocUq6?VK%|
zy#(}FHzIfr4=8C7Uyv!*PV)tR5ALM4Z=5Mx_LWdfI_y}c3=AMVEWKDS0TOy|G<7X&
zTc$T_a-dgQtC*K(__$J=bJ6#13?TIGmZr;XY-Kin|2GwS*^lmEq1d_WpJl`aMN2k^
z)ck*Hc`D-a<nVp_sw(%YY$m^N;5%Ch#CkTNoTZ~L-Bi)IjRhJWJD}R6XCqzkwPP{c
zxtx$@Qa$}1u7?4WONFve(P<Js^E=%4P?_X9Hru9>juEJlCLc}Bmhy6Lde)FizN$FZ
zPo#`bAb~`5tlyzxSr=7vry^!w4Q<Q%dS_vk%`mD+h6`z#fyMK?T<~z@uz})~mmdrS
z3UQ>Fdo)lO1PgC#+>nfmNb`THAzE;Lx73TOkAp3MTmIfJ9xYdGruq%yRaaTdhiAVR
zjd2kB5fBYBjB>x1^TndS_5ww#CxeZ(M$YBlX9<P%Hs>%?F1=$sF)<&{gsW#_I5n7?
zV^th?z!|cPHePylO{}{w7nq^!^2wH1_9x&#(h42$gx?m+XJ&MHeKWgp`yZ74GxSF9
zEJgSX1Z_IDf6blFK!^<R+Wa)n4wKC9jzPA}#y0HxS1w{D_*f9~950rs5{j?T%zcLb
zGfIWr3MM9|dkeYK4G7gJk0M1%u;g=XV@6#Q_8f&VkcsnmueoY`6ccxKBYjk!Fpv@O
zhy8MS=u>)?-`yGZ#>VPSNJwA(&^qA{UEAxeD&FnF&6(#|5r(f!+$|0Bk_-d-sdZhv
z#y-Dfh}>x{WU2{kC{l7!&#R(ZelqRvH<F_|VY`<t{~^bI7IJcefx<PX9dL>=xbDqu
zc+z$hvDpJSDRD|+Y;9NKmW`OG&m<dxZo6^1^%CE{K^|+8E;}aw>sJ%<#~25dy7rW5
z3ki+@KWM0JZClA(z7zpN;ei0RfF=bL8Ps&F6=J)swF*JQKtyLJWc`&jTjiDy2GkSS
zNY(w`?Cna$pMUQHmpu2;$n#&%{O>K^fUPn}i#Mk5yZG4^4}<4oEtX2I7X<)*RAX3d
zX{kKZ#4I(<{Hd(^imyC}xh*IW8W0T<qbt~itVTexU?R5HaOsl9A@p-a_k^VVb8*T(
z{f6JWbF=wwKiCvF0&9y^Nj~06A-4xoA%+}Os00g%V~fkjloDeHQ%NG2GmQjbty<?M
zQcpNK3V3A|IGgy<;n5di-Mwe4B5fJm7Pi!mX37}E^b18t*2E_9gqBb$DHg2W8T6fo
zhC0!Cs%Jy3M%pk@l;fDH0PeQ>l7IFs9uHkY6otY4Bt%iDZCQRUpN&1uBI9wUz9$wH
zucMfAm1oyOM?@aGran_N9W}sWATmr0e;z}(I$_0JdbU0Th$}<O$^rmrcmy-$2rNO-
z)gNJ^z}nMKw2}1zn6~3;#9XKqDcZZOfLp+zCb<pTvhes}6LhXSeqw@^-xGOIbAMl~
zFcCN@H9i$mY1dyV82xnV5@R~n_W;OJkS;?Hc`Y0b&GA3c$Z*!C(r!l{t?<IJ`*D;j
z;Llmp$S#yp2=k+Rc58Hx4wC}?&kFAbkw6$KSUyH_jApFjW4$dm<%XhYkB=~53KWn#
z%4JB!Y}KfxBly-wY6B@XJ{#+WhB=?NC!D^PQUT(iN~B|h!7WNN_cEFGPt-}qSO?Z;
zPzi*wFZl?!9#m)QN(+;uV?UU;?PK!`^)t;SWkmCs7-iAp3-x~%$ybxIkr1Li6ITU?
z5F*w2gi&|^UEsl1m3{(Cr{|xMXrq+kiqoO^7h0wHO5`Gbc1CF-r=U1-f__NmlOCHZ
z5VYt~H`Jw(I$<p+tlXF=A=6Dk6GS_~grr7VC;uE1z3P^!Eg8nc>FI2}LJJ3?1|+Vi
zn7@qH1NdKFq_ytMWRQ2RQnLbIQ_g7^OgT_;y1W2l3V_R*|3}j`Fjl(t+^KEbwrx#4
zwQbvWJN2pEsX4W6+jcv(rq*}vz3-P_@H~4bJITsQLLsS$<(%2Sy)8IzK!qPe-ITvW
zRNMW4{2D*)yA44Mdrs4sDry62a~nGJ#Q)w)#f&2AMeGNgV|ZWB+Mo_wjIK;m^kY|+
zzZhBlSG0_p3akh*2`svirrBC8TagNMC_s_IT2qHEMD+<o1+FJDs_`(9JxY*++XII)
zLdz2FHJig_8N=tnIbudgOBA+`nenEm*Lc(=mIe5f-HtdsYVO3mJdS+O-e1uCHn=pZ
zHggc#dwUzOHh{yp3|A~SGAj>bNv+O7+3+#p%|V3vi1}nb+38;2H|XA^xB>UFI&CIX
z$INo=0O@AJiDwrQ#CP^&rj(ZP-4Vl+4Pfra9<a<dVF$WcBu?YxFyQ$M1@z2(NJYG_
zFtwy#ztB%|{Se)!83TIP*r^8Db4G@U&F(od;^%=Cor??3w)*v7Tv+uxGhVIR7Cu}&
zKw40uR1F@`@vW}o?g^N|QCCwErr;Br4@yTZhd;!oe~3t8%M|?BgMzIxv@`jxh5Lwz
zdL>X6IR$*UbhYhS@Xg+@47ghTi=}F?oZOnGh`QI!{MgLdWkzLVn}XT7=;_7jr?{Yf
zC34ez?>_|5K&Z+_UyX!@R6ywrZK#Y~EX091b?a==(q9;Xp@9#OtPNoIH}lA}e*e06
z9#hZu{$ngp@Q*z&faITBOTW=i5lQ6luOBg;%<u=n^^5d1>{c*d7rje;C{0|EuO+%k
z>?G$GnN8EvQ+qrau&eXkX+O7^$U>+GRhyV(ol7VzIi&f<Usg?|7)JcR1}Xe6&Vf~5
zl@xZjKXjr7q!6ZUW(moMFO^&0TsbS`)bYeZkxi{YUnV$EySODPQ&3VOsL*qfJ(WrM
z^Lp>&VI2RkmtYeFj?u`9p^Si!ZNKy>Lz&i!8}aWug$v;ps){1NVCzM-d?)WdF##1h
z!#J!M&-d03yhDeLN`O73OHRN>C}v=hER_8*kIab+E&^wV(Z9IHp;Qe=fe!suexP<V
z3y<p7=onM?ohEK_!y+mp`L1g+moIzfsR`1CBi!QBr#f;G=?M`zQaf`;*%}xuja#bL
z`)DQt@x39<`*e4{qQz8ly0L~}DZC|&w@W0y`6|Qi6+`xUbnT=fhz&RO(}*_~xO*M+
zjN^%#O4gRns_jc+g|@dX#)yz)pbv2fxBv@}y#&NwhE}HG=7XQ(nG}Q{Ht^j)cN@D{
z4CWiac)p)rA?omn5ei<I$PN&7ZyRwleg^;^rqY4>C#~L6tf_ZuT)lh4yocoRq?vyI
z{GKE+-d|sbk!Stsiz;2=)hb9l!C`|Z_K1|{AN=~!CBUzkkd_IBgtSJans@S9NFr&Y
zT^*>TT-%bzhMOk!Hh7c*T%MCfF5UOhB*xjS%-Jlt*|`j~GBdvh<?zk5i5JBlz0w85
zHm~X_3nKd3`bAT_t{JX?Z6kI;#)P{QhbPNW)S0ABpH&N&Qqq=y&W`xx*~`!>A;LS$
z>em;p9pFd`zWs@sC!Ba$L?jo)H=JB5uUhp)_Q0BMfx|g%IR{2V2QCYH7Eu}zWVNoJ
zh(ZLNZ!e{<_KdYs`lad}QErZ&c4@mYT93DIF8u+QlOCxHpWaIQWkvZYG`NYRH*`ku
zim?2}%)_h-u!sl2+)LMgr`^|weYef4L&@R&3e2M=XUXBos+tB1(?34+8keYHxHM|&
zT75Gl8^ACD<VM$qX;3yhg%3&BqK0k!*G~7xW|*l=b7zdRSq4T{Rw?Q}FtIa+$v+Mu
zL}_8|{=}n6hJav(l==dvGKd$C(x7X~W~3Eq0XI+n)dtL5(>tF`6L{a#QO}G#`Hjy5
zicH**OuE}!roKKszWT2MUUsG_D+?&~LB&6KlX^SOx~j?@s=xE{xcP6R8bC#qf>X*(
z*z7QEwl5n!IA=Kl?my!FB**U4%D&TBabOIz`kI-X()CFZO)gwQ+S-q724D+4cmSd1
zTcP(U4#6)|97UMV1qY(LfX^MI?bUQ2ncJTCh;v{Op!IDF<m>s3L3en+G$=1H{X4?|
zJ=O1Wd*z+q#JPorV|#wYmK;26R7LN_Rm;ISswGh-G)-eqCos|9DXchsy)Prx4^f`K
zVURRn!kUzTJSheijlI625Qa_#5?d-Arp_@BXC4H_V`7q307l3_z)9+;<vv1X)KEXd
zSVDi$vAt4bkiyK$Ev+PLJR};yd*L`U*J866Gc(78Q&6T&GQfte5X-~KR4WC=C&Ct!
z=U$ssOHzk50-H^=@qjC5>DjdaEQIl+(fCYA*zveA2kGjC5|s;-@Su&Qwe7TU)-OLP
z6zhDpTgTR%J>$lSk6@a<(@5lKHPqOCn)(HnRd2j+D|Y6ABlJF1pkA;utO<QLh%8cj
zLLFfCZ!%-t`W;`F`Vo>mqI0@XMke&;n>!RnsR2a%mG1^Vz`9@DPh#VI$~gkwt+T?y
zC_{{{)&udCe6oTwE4U<nWGt>*K@<(>2+vcB09cl%#uOv7b0lWJRq+rOK?@TAza)lv
zv>kt5E;8G*{k0GsbO!F`Barxq=lGA*@Xpyk^8gGAY3+oRV|n}UOh?Dm5aLtFLa-vx
z!PJ9KS)+1Ead6{k;s`c0^3qX2I<2H-OcVS)sLkIwU@nJAt_3<TC7oxRom7M~6h)Gx
z3<7Inl#F8<FzJ|W!tA>KX6hvkz<HNMszwl%0o@Rmvjs`+Pp{~%UCd-%DAJmyp7{<)
zcH*aujWCsvym!uGy(E=WC}N)qCyfM!B^#3!Lk4HZ197QFzR9@!;wGG1^5$roFBA_(
zSG&#3NgbP+j%PWZbbBXtIe~!XN2(uZ-%9b~?v(O?+2<ycc6LXa_t+<(irTBqV~K&Q
zckvwwrFz-Fmrzg5WXDS}TsBO<EA8Nu+O~8+MOq$dqRIwR6CBXckd4<V^`D5j1#jH*
zdDrq%iMq~ZFH3KD^h5J=;4LkD{Nqw$VUQoWO<0ym<%?gbsc_<P!lt5=^Kj^BWJlo!
zG(j!vfqinauH|#X0QAf|dDy;HEFudV24xuBOHQRl@&!!0Uvdaq%K2_iXXm(f)OV;x
zE}>0D>j}jlID}-(!#}L$bC0l9R5PmCefIry?2rqp@QzjHyH2M9k_2S*SQ){qmm`U9
zEG4ISeJE+pI2BFk)op%O8S+nK$3Xst@_U35Lqs&0>_aAj{oSHoccjK&4kH?N9YO5d
z*rZ7=LlZ1KcPieCvD=p+CN$^Bf0kB-bZ@=oPdT=nbbeu`zakn4%WsNYP#s3@#03`d
z1SwIzCXkLj)`Q12>7>m%{a1x6*ucNNcib7xgdPZURyAE*#lGx)24#6dNi8byG#WJz
zO2~w<v}0O2t6tiX+8|zYiX<r$l3689t`zxR9OA>V(AfCSufAg6X0o((e-B7t$#lvz
znhnk9T?NoHQQ!akvvf961A|H-p=PINAxk;<Ab|l6p$1AR3)?t01}CqTnyy?3R6>Or
z>Wq0nl2PLjF^wCDxAt_IY;;{S>RrCF?quw*MheGG*Jgg@Xnp|+&+Bd81Ks+1cJtpG
z14*b%4y2()RSkte<K`zLC>?Z~y!s@3A`%Gx{4hC`DPl-wpw;pt8RM{20bpfzj<RTz
zh4vzW-gH<{E>?(OVaO(z&b6S~Bx|uGrnNXWR+}~y)65OM>42Wx2<|*xc08BNe4GF;
zs0DO=DzI0Bo{1AX)&*$B5hEKJS+4&aQoJSnceSS;Rm{ruF#s=j|BEv8`jGwL0`c?n
z_4gwFXvd5bG{;&<z2g{33KJ!WUd-)C8H*u_N<WJ`6iRZtyKAO;^O&Z=0TfmR>z=mg
z7w!z@q@>)J)sO-7V%XravU)SEK0`<S^2xQDwx-X>A2<cymC`xGmORzTs)VsaSRf?S
z6H0JGxQ}nAA6WpLT`;jqu(iQewX2QdCS%b6ep#BkpH&!`H%n{c^3(W;i$zn|3C_!G
zmk$>hX1_^h%8nF(ET(NI^kO4+#!(kBvb(h{Ma_*r_eeb(?jZ-ek?ZA3^X%>e&><;q
zos=SfEKr)=9X)$)*_AoR@^e19oeotvD9rCBPtp?_uy~!Cjv0ujF$c(#D5pJz9=)iF
ze$OqWpPbq8zPY*a7~9yOsn%qc7=y#-`JfLU1vZY3O#ntMLqXK&hQEU?WB(*INsbwF
z&us)r2g|&_r^Zpnl?J3H7ip5vj01r5@bO^w75HJCn3+dAUevM-dKIIy?Z(oXA=xLT
zhSX>u2Oe(j&db{28^^AAWq@aLU5C)|j<pUr6!4x(JoXQsHpZOVA?(PB6Z?(B_6TU>
zfq!y9Zr9B2#ChPhd|)B1Q|w5k2;(ll#P%vKG}{qiq#!sTyYvgW#>N-5Na2rkUmu)3
zV3{_CGrd3@9l{frgg?278b%bmk)e(k!bSJaTdQwL(H?o)pf~{mpo?q<ky)iI$BwI#
zTBJ3m0E~n@h@P)5e(|y3xCJpT!-kffkyyOZ{zD?mh3I(W>3G`^7cq0c1hOU9(Ukg5
zg&IrltN}9kTTRs+;rRH|6gnfp+9nE@WPBJ82Sw>eSPiArNrcT60hgs`iX0R+`;$)H
zHx^hm*M47ToSU8Zc(^${!x?6FE?GNYElhbYUhl}FH9@tYl?du-&~^!gnlyB`*bt()
zzGg5RBwD)Vy?ST8XAkk3n%&_my5!S-h>$$bG*gh&Ghik-SeZ>Z=|X-z!|OtR9@Ck*
z<O|@<03;FOvbYO#2S~uv{M={GYMLWd72>rxaptjoB5!Atcs1;>zIVpxy@d40cG^(>
z#F*czo;V_+1xjN>y@mF<OMr%|Kint`OCoWcEmlR~b8GLY;ts&*@ji#Vy<z?ui_~_8
z=8_5I7wtYhIkcjh@_U<q!RuAPE9mFh$`@TFmw()fE-`~lbF=#?gYMDSN5Ci3?mi&H
zWeT!7Ut$;HJIx$qWAzo1C=EE|k(anquWv(`cH3Yr-H&dw?k@3CkEq(YfmuVLWm6ld
z3q)t_YRcS`#I)3$&&X>c`x}GLm-vK_&q*URwEKFpyuGz1dnV!O?9<t-P~a|JVLayb
zjCek7Zf<@mB_G+M<r%tSXFCu?M8$+EAdPd;<^(iZSUwVJDJZhJm!=qSt&(q6EdlMs
z{yV8IRhjVon$JbfIy!OfrTx$Iiy(VHW;g7Q?m;Bqm|AkJ@VVO<Z?g9#sGDemcPPQ<
zzi^o@T)olE%czaVI4K}mK49IScSMYT+Y<vN7fE5o`iVu$zLB7-N781Mpv!0mOMahd
zyk+oAB$esFuCxM2VYU4gX25Z3VbbhjBGVCj0#k&HAH&wIyAwfl1sXqHq#>hbz9I^J
zF(`id%urcTZ&)%fs&I|rFw|GLQHU(_OPr!8gfou&pP#)!W9}40xo*Y#J>Y|XISEah
zop{Pq^L0_qE>9>#pTVET_mK-|8pF<0m*gceq>`m5^$VcVcFbe_ol9le#LM2#DFflz
zO$rTGg$~U@NoX@#DoVoTu(LOxf)v$WiM`bO$J&lPi-6Ift^ce^$M@qX;D}VKDIY-u
z8wC<Y1bsh@g!D#fT+9pg2&U+!wmzr{)CM9kSyM<D%PS=a4dA4eU?Y}`8y*4k<bgOF
z{}ePL?E8y@hVmm3IuvC!O0*|u&ss{%D$XxMP_*^qAXZ<<Fm_0eawd`eA8ubBp_0pO
z!GO=mlzH%H;bcZxWk76o@G@`ZePi!eCu<kXZEZ@lm!0GVV|!_06Is7G9a2Nm@ZM53
zLG0b!HLgisrWRaCB(d!tlzb>$O<DN=a{=y@lndUGf06scEJtUkxx#1BmDNVqiR9Fk
z0b7oOnSVxV6YTOjUcbAM{#rt?YRqKEMF2)@4&l#Ap?7rklqrL-L5rY8k`v#^oWTi|
zEoG`{++>WL=jWMmPi(IcSahC(`XE*Wzn3Ey+=*6#OVGC1k(eu6CDpk3Xsf}~&@Cx|
zERVn5_7m`Sl31FsybL|k{6l4wTHHSET^fo*yoM6tn~G^a8!n%WsY@X}lK{<2Iy6f4
zokWd~26R7VRLKv|W|J{dhxIOlYeu!V!K<Ly!psX^K8d`L<o-m?MH2mmlB^wqjIOR~
zR?hYZ$wks+N>{(YH>?S>n0#2KUJi|lB0=zhjd4<>v_ZUKi|kKhl(t>4Ioiy9Vr~Qq
zs-4J5rc+5&QnqO}Af9cUzLc8nC#%>=O8Eoz6gNKQ><(l--0y${8N+x}F;j{8Z!~gh
z!BN85O>z{5+1^7NE_>W!1pi(iy;2rr>T)7S#8YSyO|r7o&%<Thn5I=}9^;1rs^E=`
z>uCzy(vNrkI+Tcpkz01P(Vs<2)?qS>lOm)slD}p}iOdenVKz)1(3A<iXf}99o74+k
zX0;@<ixLQ^1U#;V3}4m-m3+io3U8A8v9ZlFn=aF#@H$i}A}q+jj|&;QBx`6pY@1**
z8GM;UzZ0223~S%XCB>itXS0Z~8grkS?1LO}lgvn&dWq&99Ug$^4Dm;!7AEYD{ValE
zNs_KS^1swFiz(sk8^++}1=<=ncfm2R>^cvVDGaLyafTLbelfSwP!A@$C~h}DGVFx9
z%W7Ja+Bii>sbwM}6NB>Ij9HTK`fGsj{!LkCYBELQr}cJ2f$$LxZd3xQ3Bt1FPgb%q
z*4YD->w^d%pGM4X3M>M3_1~!Mnb>e|A1DFO_h46F6M1>BT9_ToD>ikrc5}8|N=9I0
zey|L+UQr;89OPEhH;%n~K$;rAAvO^J36W)hgct9Q{tVDimdsG;Jkm~Q2W$n3&rWCE
zQ*mKWLX}cTFerWf^B)y{oen-U7hX>9;`9d1$g=6ZwPF+(G$aEyBwK9OTv}TKlG4vI
zuBdAmCL0iHQh*5>GbrOHK2GbD3UiwKvDL0Pt4$AS^J{b@W*D_+@%zk(CRj=D8GbQb
zV|_ZB^sLbPXUpamLz~N+3hpJMmX+qtcJWt@0f<4~8x5{-<@v&C^B*@Ic5OT784FG8
zpQJ#jcDz2HnnN1E%+0-<A27PN4HDBFbQmV7Bpro}N^@Q>*(W!qtH<U|UgDx|?#bCe
zkJ3N6DjWIQz4!Yc`}xO$^humt(9UmE_AG%k>a*^W`9D@j>k!}j$+-n8^3e<lq<#GE
zJ;u3pbj%`RAj%ok|B$hA?OCFMviKpoG`7gc3`Vp6Rz(*e3LQ$rq=E0ZPOdA(L_bFI
zAK8NH0mCd~)xko$jugG=<QxU|>?hy#K?9V=9kUZDaI`W3F(%<ahDM0k#hyvN=N=3C
zs7!FrCz27%Lm~vG+|)YxNHJS+nOsfvHzS4Au{?UkrmO9}|Met<gbXZ%yqQqwEvt4;
z>c(WtfAJ<V)&%>qBrQ3KoK{9uLw;x~CS!ool={0aC7-PqYVj)}Fk`s#*!9!ri|Fvv
zKzGuft6~q(C?HVPe#zwx5r2mpv$Xv)f>Vs0q{2!VgAFf9ejDk@ZtUnO%(8jtHGyZL
zaT}T~%|jp_4Z(Mtn?>V>p8edoAKAN9Wk>q%Sw(Sm=-FWn|NqBoZ_0Pd@5pv`qma~K
z!uss?!+J_$rOEToM<=l}19@eysiEm7xvD@gY&kkA1a{-H<)k>uVWeuLw?UT7Um+eB
zQP|`=WEqk(L2jClaqd-_P-?FXKaDnZ^73QH<Pcmo8KhCA3j||CD6rRo^ow0&+po4L
zoWPVMM42G;q>nBcI9YS}6{;Qz+oKF~MK4L0O^PY}tmK0vc8p^u)2Y6H1f?kreXm{G
z^_d2xG4qFf<T{%~G}T)sJ(X-HzW)8YOrXrWC~VXZ!v3d3Q6tx=+O_1OjEqa$64QE8
zn-s29Qy$ed$|z)ghAJaw<^1a2hNWivAzP&7=)%T?L&$yfYN*jx;-%D(zQAWkqMx5|
z0s%u7=K~O0FC9xcCQBBahGFIPgOhjKPU9TClMn1JW|P*ji~GFkRt6iURa+bf|1&vR
zv8@{=zK`~W9}ym5`2^)$%K>ur229I*$CzJuSu5Uu!;qnQZl%xyD+UdVBG9*0w<M^G
zs98o-p@v}Q;Btv=QpauNS2GuNqFGWqXDtiofNMKE%ir?n!rAHONXe$qCCy{%;R&u?
zl)f77YoMYrQm995wF)sny#Rhu4Fa<l<YABENTt<_1o4wgrt+}zW}yrccI;QG#Q(NV
z0HF^ne7j~SQ&OAD(aeDjg?U5TGZqBatpdL^Ep0XbvIOOz1l3F?j0{#u4arGu;vY>U
zZ9|&T=?t<0YYUuo*A7EUQ7uiFcCH_O)tFX5>Jf0XIe+1G4wVQkaP*=H!fU8W^RV$m
zFh2${tgV$b+_(FFF^|7E3>b;^9CHHojx|N1hsop9vt?`jPiyTGPUC$;jZ!LxbxBS+
z)E$lh{EqXv|J^oLe8QPeZHDjpRSlv82@4;CupfqIZc+^D0JqD**E)3OT}3X-FX6JE
zp&O_+9Ls+)LoBNpQDoGV-%7r*p?LFbD{^$WoBLpvlJ}4r&ufN)hx8SQ+)v`=EAM)x
zNEt{lGbmgC6eS|#8AeaQVscB$F()Z~msxGcbQPUCv)!NjgYWY~^NTe&<07kTmP6~l
z|A3YJDu3qxbx~@ef;LTB>?7$@1QF5UXFjlrNL5f{L~C8vuPcR<{(=0yD?we>k$Lpx
z(MVdz$>nzZSTh&^`^(o?NEo_?wP87R9$nLfmX-4~Wgas0cV;a(c4a(tSPsdxC_WXj
zMUuCk*ZwJ)z<@<K>Ml)?I7xBUI2%aNAa?X}sX&cD7_-1rm@-;}jN?&JR8wtIUHV<)
zns}qYa^{Pz{6x}Zw&#9BRH4nP*%C0<0g93jj41+1oSa{At))kRn`a@o9qwm_2}K-}
zhtcPmSgV^B>yCP00Xre2tQGhaH1MJA(<cL`J|anpxB*Q*DHKnUr>mAwQT6v|_cd;(
ztAudLK7vk2`WYC7mA*?uZs*RCfu&i4!Go$yS|m>ECLSp6g$RP~Smg1AI=Vh&q$qS!
zJ2Spe!NrsyhksJhLXwB<-~?>d1B&=%7;_Z1^$xYwnWPWb7@|XXzPw+Je$E|`dJgOF
zZ;^XW2ePFuom+Z=kA8uKV5WtNWv{P)##ksUjWmO#G!J#OL`qT*`^;de@(`z0-FJ2m
z6Tv^eWtdnd?R0Ry*&)v0O=`+uPsZ47jZo7%xheQ-)e}$@#mi)F{(bY%p4ms3RY^Su
zwn5I0u0kh*d%p-nx-znnF2wbJUnc=ZZFH6{^8R(%wU&f0?Y{lScZHIur4=S>bP74U
z@%OJ>!y2j76JYokX40ud&8v`^caQmsrTY|lB5Tqhoj#()PUZq!dtKoV8*|ClJQt!(
zvKH+hYMPMI0c>HSh4rkYWc-^mCnwq0bU!~Jm~yfiKA%`c_#Rtw@9s;5n$A~jKK~9=
z5*c{d+IcTa<vzsr=G&~{wfsSp(^=hMdit~Gz{;KHJxi;hqK2@&l3vpb?zZN>o?I5L
z^&R{Y9dMjL4}Dr&++8sUJO4%gpx9-Yio8S|-1?Uwt@BNLiA<nJR>0+PQ|ggbg3ZUe
zKwf=@DPU#tx3{x9y|lh2&9N3oMk0Hnpvy{D0#>v7kAEa`J&bt=Pi>K$t~v!z_s04A
zIzOCqsz@67XhYOOM*I_SBk{e4kau2_lDvu+F4ypIkGaJYNJ@zLx7Y{~Ft;4<c-Y*d
z&tO$T4GwODgRT+TFc*wt{BT*BXlp~@UV=r3qdM{3zeOm!j%%~)QB!Vk6n30Lf2LV-
zb5oFuCskGwWk<x6J!4q#tU9y;j-*f64rExVvQEfMo%h?O0uC{AiFCZL%!TwG*|{J2
zkGEanHoT4D;*A~He_O#<b;^_2Li{6PWjS=SwQbjNxW~CBg+3x6QnBT4fQo1cyZ)C6
z5~1Ciuce*?q4#IB-}=F;gtc#noIAcBHr?;Q!k-~4kl46x8581!{d4U>V)vT?Uy-%r
z(zkM`$a_y^t86nGPqm@N@4<vG+7@GelaA6Mx2td0<kEkAm^_h;d1ax(EVU9ok3`fK
z(%sj;2Hw57J!rqqqGBTX7aH8o1e`wV6uEAi>GNnTeBrUA3nH^#upcSn?^%yU=VAX9
zr4DYbi9H9_jHx+w-P8s~>Q+nQHcio`5o-&ibyKq<eM33_PqNRyQeWW#AJ?B0TwGv$
z@%Hy`I~uk^ugC^M=J<Pk+X$1^SAv;0OCL1A-63GVHhbCnJIImu&tVNXc5M=1JEam;
z$1J17i+kuW-AXoB)4+ZX1Ctb4!}trVqpA#-xb{2Ml*5Zs6b|W&2t%sU1ATfEKA8gV
zOW(Ma_jD~N-GssHRHbt!P2TDQHr@M^pT0z!?@>B!&$9LJQrKH_fFp5Xy~mRa1~6D7
zI_iH!{PIGib~0tcd(CE)Z_!MEp_Q12k1_OoVs09%OyG?;S(b>|_r!%$=vkJrT5&Cl
z+r6X4v$khwz;8tLx8t?pV4vp8F{AH;88!K375G$04dmhya(NPfY(Gh>iNecUDKeV(
zhBT_kY83UI#lqyZN_+gh6~o4yI7;1gFK*nc!rz7F$rR@GOcx&v&F8G)jz4mO)=2hn
zbZVO~u~C=YdvmYx#B6=VaXM5o&Zi_^FmFOgaU?D5ZX%4JH~3!>T~vT8z*_1BXJUj9
z{@alou02+Yp_`B`jf(vp#FVM@b7Vuhh2Y@aZcpP0-{UM!=-of9=WPw_^OMTw{jkNR
z&DNd>aro4yZ-GjPN%bMYx;DHL*O$^V9C@l1If{gGz&e^OI2FhbV>kXKW+K&?&Sof`
z3VPau2?O3x&rcQX2{oMvaEbaeWLWmtrBTx_R`+h3y;}IFJGx$gKE@y2EK{ItZlkbl
z9$(G&W5uQM=weMpdi~C8G*K?AmfGp1@m%R&6TewTZ3;U=7r)s@*-0z4dJS;zWVEw}
zu%NIcWlWhC#VpLQ;LNoUJ`S7_k~?zP*~EBkXEXibf3Na++~YfWH4OshH`-$GuK1bP
z^WkvwtnmT?btIYl@aluj&hcOvQlUShhVZP94?bG|+DD(lp*?6;KnZ)MJ6<p(3{QZ$
zQLJSy$xvTmB2=R6W`cUs%LD)C)ww-8C3-GWWKJXUTUF}kFt(y!-1J-3sEk&zS!%mn
zD&S$<xki&xwPAj8`^vDb=+^WXs?Jg1M9CT_)|=M5Ty$Q;_a`iLpmb{fzQ?^wU+bp}
zj)bD(cA{Y>wGc9%R9-ux#L8xmyTjH-m%<XM#)|U%3_1CF#{T?^w&&A=TVgbN-R=55
z^_7c!0L1RTKp}-fPr-J3x|fTd<5Qx_tg&Om;WK4bAE4inQ(%*H=PSa)gt4^Se^XdT
zXb$2KhYyqY5y_*8EI95nOA9pEd!<gfq(%<BHTID+S`^Zk#Aw40+9rSSA6+qd_jng9
zTTH3CoqqD5u*(7$b()@Vhj?nuZ{=Ami36}iy?N0{Trxd`%mp)@Lt}DemJj~`sI`!k
z8<=AV#BRJna2i(JX&C-7D$k)?ZS%!feaOBeh;@K(W4o8C%JO9JLF8I+hJ)gwc~BZ-
zn90m#Yru=Z^Nm1jJ51Vg7_cgNyxhTTg-2;O^<>Zae&3>!%eeFv&-^j6@=BOJgm*5{
z3!~b^j9bm3yJ7gFhRk2M7FOg3n0&$C7jX=Fb3m%uy?j)~ATmHBQ?OX$lsnZd$}^p<
z00&iou~NDMrXtaj_bumuyEpN33`@=%YwUqm`kaWqCI4r|Yn6bza}50#V1T1wEyDhV
zG0#&#0hJyladBZeNkAS-Ut6@u!6Uc$IvvkwLWZ(7{~y_9pt5$Mwsel>aN9LrMw#nh
zfK3IJM!8{xFtlWCkq<DKY#01ex+nS)*jx{;jzwtZT)|lmGAFKz=a&~Sv?(+)Sp*f^
zy{T>`V4};%kT#3khS~OkbQ@TA%-M4kKY|jkBxZb6r@%qt7%+aFPnQs-k5V06HNu^F
zCNYg7*33=IW{X6`7>F`<QeZA{yMIbOkXA7WZ%yCxP7IY-vlzJubH$XN*`LW<fYy4x
zf!iq-$}OV(`J$%37R%EO*cY$o+_;hT@hk9F-F6=P%ZJkVay&CZHuXO@)y23+*oI4!
z*yOL_YINJ&mag5WBRxA$L>l}wW{5puX4BwI=`)U(?QpZH8PbHAS<NB%@%|5!S)Ob|
zRZVOG9)}aEjD~jQ)<49EpxhI*mFtm{8)};h?G@X=x4z>pDm@B%AL1HcO>JQj!A&6l
z5rH%px=bRNavqIEHP+B5m1p6%JPsCE(xQ~RV14W6H;NC;Ac-G+x~x44rW0`(#QgT?
zjHz&fdGyQDMZAewrHOqOJf8p%H$in$f9FHvDndy^5%IG>=NdJe^DjE%<57Vw(sN3x
zNf};`J*mYlwPbi8q>9&D|2Y9qo5=MF+_dUNtToZ^s%JzytoqICHmo*guF_+Q7_k$i
zB#ImG+(?378o)}!XZ~@{9&#N*0?hIU+JczjGxm~L0?c#P?#_TIK@&mAmYCtYxdQXH
zi<L{rUOweuYF7>z<s}@fB?K*!o63P-j`tw*pig!svIfcYi45<MF>6{}2{a)F*|4xB
zSlwl$QSe#tk5M*xs<p^AtgcyhA1m-pmWw5IsAjYIb4FYG4|;Ly6yo2H{#~nb0EQ%{
zQp4clf;nBncHIEaMt;{Y&0`OAkZXbM4t7QAP;3~MX-=0-tDIoC(&NEjmSYtd|Gq|D
z;?)ksX@WN*j@w3Kf1oF}rBXdgCo*4}6B?5_Li|_!6gHR8gS$1iyKk}Hckcsc;sbnh
zi1ckDp`bR~KIpFexr*JG*8^jxD!FUGz4D^AOs{{u*q?v|w02BnolU96GS=0(<;2e6
zZv9O_HeA0F+|eP~g~;|$bqlGn9;EnU7|Q}K#sN$fHT)Q9R1w93fkakuuRe!fU|Ely
z!{8XP5E$DAv%R`BW1AT9H|fh2g?+PKum-L(4QcG64t7_@DSj9yp=8@DTa#MRm$P;Y
zxgy{A29|ae<`V2d=tMI?+wek0`3qGkZt<6Sla!bf;5hsKjSlmle@E{$5=Z#%ypsCJ
zdrMf(j}bnPBKEjy)K}J2mE*uFF;Oggzq{0i-g}yng7?;Yg9EzlVSlszmUp|B7cgwW
zg*%MofVLiiPq;~Jd%@cJ*THd0jZ$yqpbNx@ufGcl>iyygi97qEv(95=5Y1HhMACH{
z5OnL}X>i@E#`r}0U{-xPu~<w<O7;+>mO-vHo*tA>GOIv#U`0F~N(zdrU6sRVF`t{b
zil6mO2asZbI~7&MkZi{U`6a-jL&4_2E5a<xX+;@)PoqKyt%QJ(7#TbzuxO6Q;ZEC=
z_aQ%Y;7A=#N+*=(09j1xBO;gN-GievfvfV5gT28-;~49b`1thvX@Vavbqh_X$dx9I
zne~8~{BSRSXkL#hUYrZS_Gz=t@?yzhf%koM(e9Dyx<y%9E^RFA9jG1H8gRQJ@E5;n
zDI2*)MTF$v7TSH>f-%_a8er;fN80(=3q_tk0kp38Ah#sJC?X=Jm*roQyhSWn0JD>C
zcmv@T*33?geSZoHa*mxj!Wa#?X=|QkZYZs;ehi78NuLL^=7LiuS=HYs6y2pS5<bN9
zbz0!GB#rIRYWWC;FVw7N_k2&d+s=0Rp@9+N9muU1Ii5^|%gf3JWx-Y#pVVTGdc^AD
zI(H+E9Eqs{+0E6WK+{zGLaFDTX3M|df3Jm^^>4h?5?jXLRr1i+VwS@sTVby$&QYMG
zvJ;FZZkI|#bAEz1Fq8h2%itQ9PB_M&jimV2#rBskj=<wFbZ0Ze`Rx<U|GvQi*uA!S
zT)BZUugdN}{_GgB6Yv!Hv9kq5=u$s!@)+T)w%*nfd3w$hS1n-Z+hd~4HReIzjOCpt
zf^d!pw!FNIy(|VKcVHXMv)EBJ+D#rW!ZrpLs*MO+FY?jTs;e1>y9fP7kQ<IztMcZE
zR16@$Tkx^c^ZnG8^JmbYAxwnV{nNzzkuZ|N-%Vp`mr^t}nn|ONua*+Ys~i*(NS1EI
zG8t-c?ETh2H<M`3Mj_h)&W`&%P2cJ#TUG`r{a9aX@{%n7jM>&_J(=czs)5SEqfWYJ
zu2Z=WE~2sl3b~K$``Nb3jw(CTi-*!k;l?qgFIDdQ8w<iKx6caVeL~TwFepdhxwK~H
zIoiN??CWFa%K)*tC)hD9@9X{RVB_mnb{EeO0XqR)EH^umo6^OA3Xv^BTG&7X%)_Rx
zxoh`ZVC+NqRIJ<b%5oVLLP{lc->g-1TB?#+XU7sVuA1vsa>Ry-`#Ll(46Ucjv!Epx
z$*}N-d=wqIymMaG%s$z)SFq@x*O)1ZMEM$wY-($&o%?(6cP5S51B^g4dLcAg!cN0u
zVoziwSGdJ-f;OmV!Jkp+9pV=pX0xtQLQhBW_4RrU#LD35+?s!P{^tgCBG>0(+puR^
z(bdWWud(#%<v2{+K07CmaYy@C^gRHO`^vpG3M7JGy?<-`S8obuIG+!@0+YnLI~nlZ
z5qdfn66@JZ_j=eqH&T0EHaK=UZ-)A3hEIrYjM=h!7vT?(y*kj3mZiYLZEWBp5DNEj
z2h0&p{3;w5X!K$tdA56+$0E3DoczvN^;Yhty58R3xeV@$D9X9iF^&bKWyl{G!!h<L
zgxM_1Ajy1}cC!^lJXcT|MB%YCC;?vSHO>4)84L@7Uc;KxzMWjLwG3}LN4X{oTH$PE
zW+rDvv#St8#*?P9nAGd<0;%8EFK}c77RXv;m5tpw_SPy@to-@arhgIZ{1=Odqck1B
z%M3jP9J;Bx5Cv(UF=(=<2~?(v_tA-sTJWv1GO38VU0IRyAU7Qp?A`BNDDH$2`GRxR
z_}F*7kzDt9q?~IYX5jN1dUTj+*7W@_bo|!Ar^qw7BUGvvMemz9(Te%>S7N(U9_rfp
zJu3-6ZFxmg2am-P((|N&*B}Sfgo9VD#Lje6Led7IWxHp{Lg+m-Yo&(eQu|ES;NG$4
zXpHEJ(it7Sl0mu#&B{ay+UOMj%)8gnHO$;D^j?h=Tq)6#N5`cvdK-_XlHqSR&NRUT
zcoqs;$7+JVi}X9I4XhpU8Ttc8h2%v^`cRm-rqFH2(FrZpk&nPCd2<Ftq-N?<3mG}X
zSNVNfhLx87zbWvxe!=pDTJ#uwBvxWrtTKfa_~9;Pn*kBt=uh<WPmRocX~d$}Pcd>Y
zJqBtn!mUpIO*f&hsjk~ov(MLtQK^+jEu!96@2S_<Kx^b%JBcH(3ItV-81VG|=|i(i
zWpbzJVr%XWW)eS)J$zr!1KRV#OyrUaqUK0=oH$8%NHJuo4M|G7e1stD0<9Yn91jLN
zRY^QNct$-F*9QSkht7#co3=(GY`s^^)+}iNDj9Kknj32lA&InFgMz?nK4FY7J}$-_
zrycfcgPxmSMyU9vD4(_>NF0f!!;7!mAQp@4r4*bc)-SRtB+LfAXq^ls_18t$Js#~w
zGqK}rZSX0X95$y4iV5(klf<aHfA!?YjXP?SmV0qpodWMgL*$kzODoEtEUdi=z?yR^
za~d7+NGoMBkJhBW$d&-}WHnbYxk$tWkS_E8D<Ig;vpdcQW&8WOaACBt%dWA)=>h$k
zSMoe@E<emKpY2aB18wE<&cSj=+O1LArIg1i4?kn^{K6vo*v5EI4^Ll*<I#G@W~*1o
z1Rlb|t>A{@BaAv5cGaGZB6QF)rCh1XaMIrkt`sS`3|F)g)QrqJEc^|$5$`nbm0@+1
zs$2q^%sH$4EZSe^v$gwLREW12+gy>A_p7ipp&9_~Lx`G=auRz5?Bk<O`Ucih*+*OR
zM&D5CPK@*kkIAtre6QH_AW8BDCJd-E$H|lTg<J-cTQfL$3o2b3t>??Nomctf`sV-Q
z4L@-PsY^c!?4NtL)?<c?=z6qvPM%dY_R_<}ofPtqH55WwP*SPa$>9=`evlNBSs2VY
zFhcL9NtGHAy6xVveZ#yPP#c>8zIi1OHOx^F@KP$1_z#9jd&8j*dkVa1R<fvc+(On+
zId;x3!*8~_9pTr6^I<G}5%G%nFMi}q4vWujJna~cV30Ox*m~{b!;)eY97!yVAla27
zq-iUZzO6jw&W@v(KK%|vNZ2bJO)9gIRukJ-f=^ch=IrgVwdA&6&vS$ax5mdRR$_20
zqWquQnN{HXlH-3Q1y-<iycHXY{i(*9QTEAcpl~CL?(C`7z~oXar5%g7e)w<Mf6=z_
zo<9prJN*7ydYL)K!)*VXefY+?F_PpJZ0C;XH{+Zq#zzZMPyLsaRp{yE$)wFd<R9tV
z5L=9k6lg#6I2b(WEWJxaRzY4$W9FgKL|-h<hw8=DmW9>u8G_a(Iw5~ZgA46Hd5hgU
z5jtl2n(=r!9N^f-k&o;!xDyJvg8(iwEY@*!o2YB^3h{Of>%~2ots^3GLMFU%B}pW6
z1&63;lGW{Thd4)E+v0jG{Xry|iH!}#w*Yoyp1=-b5aQ5_9|~hR!Y)}-(U|#;Z1T4;
zheUjPjrns(D($5&7Ecbz;{^~*V)*SFR*tl|i0aU_L&F<Vhi^*&OeLwMFoW}~z;Ui>
zjJ1@VieyOUY2Q^nLf~))!}4v6Oq98JbSpM8@o*|OUvOA*aX_k~Lpi)6hB&*Tob<6C
zcqba|^$jSu7{l09C9h~B#MsM9ND+lB=$L+5`QJvW9L22bg?C~q)SVQ#td_IQi#}QL
zXHBDz_iX`^D~?jvRLq6!zKi$+b#d+!(@VPv=l^2h0#2k;^XQhOMmpMKmzAKAC@Jw1
z=gVlgrXYzle#Nfc>|ZRXCSw&{KWo#}x!CtVDv9nth~9C&9%~$K2P*mGdU$qkP~I=_
zJU!r=n?I9(w+(T_KM(lLc>0cV8Q=+h-CdAh&S&1-`e-<T6AI+k7p5sK|4{39&AQt2
zyOKxJO44)X=c%i>l*g$AOr%KAPIA!f5b)Ky%C~rUtZi+SLb|RyGhcG2;|f9xJ#X{*
z-rQ38{+&Z`Z6E0V`04R^^W@v|g^eI6bYDLCavQ?e*};+TQyOHRGpvZi9(|h37BjSp
zB9><QGQ@mYi;Wyz4)urw*%noVI?iu!)XyglevKc(o8s!72Q42XS=`TVDw6TcdmAh_
zKX{-=DybBM-Jvq#R$)Ek{6<IQ?&LC}YN12ImLu09Qxs<p{gA;99BDZAUEfkb%LR@$
zj&tHSL!O70)PF9*xF9v`QG|aVP3hjtPE}=+90m+KlJedL9DTql)xzB^)hccRzP75a
z<{J;+5vAwNHp<2cgV%?EediMmQNW|g?|?5w%Vm!``-tOLkJ=SfNsaV%T%=|Kq!yiS
zAJmtD5Q6T{BQju27>Em{*EF4?vvZJh-4)^*(YVEBEA+>+UT7!+1{aYS-%w9X2d>1Z
zP5`EX%OvtATBj=ab={&>gcV}o0J^QdV1-Zo>dv-lLTts;It|hjUuK2q2c-R9kk9dv
z#l66$N`{cwog{Ek(h06%X1GN`W_)biFe8-()m+YO2D}p7B%}IpaS&tL8o3Vs8D>JW
zAnZdx=c03#4B`2B11Em%vT9^}D6@o`6(0%esX6%d12#^10UH|WZB(t1<%Q6IRi4Q&
z_Q#@_Hu_cU$wATAyV;c3j)vZ`{$C1bI89+r>c=<#MeFHh#pZFU`;j5(XJO_75SH0%
za&_sd3+W!h1Qq3CQ<IMEwcSrL`et>0Q9)VREMnxXBJymGF$0G&DX|E;kE&bAj-KmG
zn+4im&{{oxD;-(y?|cWlS8D#veo1)(JiB!<tI!d?FAtnTZx4boNP#1Y1k?jf6P;gI
zyiL*kn`qd!##3hSip(bbZSn46k}1kB==X&Tbt&YbNn7OL@vXYJkL{Adh=UqH+~YE<
z%GPoaTM7NLq)TQJ74Z=XhXY~Xa9uu~@QM||(cw#lP?0~vDYCRAg&|l+D8n*pughe1
z(ULi{q~JH+Iy27#*!3i`Eah64L)x!DE(r$7CYd$hebJ>A)|uwQ4eBJ+q%tcK*$w=h
z`Zc%A8;-TAN4z!~F2UK%oo@juQ`$-bEc&YEu83-Sw;JaL=ZyXin3Xb$r|}FJIR64W
z4jf9dS`ZnR!j)Fm?<>N+M*B_*H>BKo>P~r^fpr%R5<4#6*pdvh2YxmDAqnqa(5GbK
zQw%KB8(O`HA)gAeoz*2|{TXo)K^2NtiEiWn8s>Z+;1_$}b2t(33D&V8bcFTw7q0a!
zVTW@?WCR&8*L$(L`e&?&sV{TUcKcAud0N?4=+=PGX21<JO7Xnd<D<u1mE4J6NWPp2
zR}W=FeMK^dyTT8@DNxZd^TX*qKOk7pS+hVX%arwdj6gFE#s1rBo}{E*k+UckS*R(Z
z|H(8Mq2RWehr{@f821WI{+D%fCrKprgTb<j@QMnahP776O?oJ9q~)Bz0hFkj(}F4a
z>LI>Cwe-qJRnI7Fgt-#%Xz=r>8EK7c403DJy;6RpGEK~JAz4oAZ5LnsHoff(K7R#G
z3|1|FA_+JB&p&rw6cicy?2@U1Q@UQw$)^7~_#tsS$>moFWsZOue{Mzy<9$C^+uJs2
zAxgoLVD1Q`GHYwyKP~Pj%7#EC6*;T|R$3`>NmXM<I(l8RuVp<vD{A-i{P+)#A9_tu
zpCfiS<VtcM^ZRIrd?7-C*=8F5OGoAV$%xo$8$!z$qUH|>TcX_4<n#0E+dil)+v+CU
z9iiR6qGRbBc2GN?UQ?emhYr2p@EA#q2tu(j8<AH00*y;UpXnNS<sOZqomsLQ9kd@=
z_iP*rM`cbow3K!epWL&HjCRweo85kCR8K^8_l{}Yf8{7u+EpU8V-TgnxD*)>uRl7?
zUt>D+=!1ivFN%*)P7;gnTBB>RvNRw}d!(c=H<&HSTEB_RpI8<$BgjO`T=0CH_oGd+
zuGNzlTWiT3!u$D~H?ybVOD$u*X&3KM?~>zu4eexT{9=5<KXwaG3g}5M{tuf<5x;D$
z=RS><d6SnrQNfJ$PZC6RVhgKzC%qAjW~AG9ezs}1wbfbPz;eE3Oom`36Q|&pxc$`I
zEkxQI=gaE+`h>jRv0U5YGi8l>AGp@>RGo`O-?uta-1+te<L~sj(CO_K8x*%DaML(I
z=Ne+u7?QfWY1ZB~ur)$(z65Ua6B#-}^c*jeknCIHY^>r=cI|fd6GmH0sjXGyeXDg~
zWd%8lB5auit*`n<gKdeC0GP92aY@`kg`VsmO72_D^ruS}uffkGstY@za9NIp#{^<3
zq*RV;tr}pki;%85?nvy3HFKLm;0dJ$0gaj@lRt1vU+g9eAM_%L{z5yXOSm4+?h^*R
zkg!SIo~~kDqtoV2X|aw*LP2M-&Ql7VRW4jXxMj)5d$~$;9!<}0(ab&`e{ZAv8<zXj
z^ItQEaG+Mw`8$`%)X;1UPRCt-yEeLR1|c<63ZF6E6%Q`G<d`{5R#<GSTl4K$*IJ0i
z<}#XM{X~>IBm4a&ulLCT(d+uBquCVm!?P>`mjmJ|HcU&iyL4gzRF3}Q{snr~?et0B
z?dMcw?LEU)R?V|J{<D3{fg$Q#Nb1<OpJ->lV_^v{{EZs1E5qAck$-7}GB}8UBIg~&
zrpC2On;v}gE)CPOcVrDDk67|(I9lF!1;+UW!IadL$GarI{yNY&#JXfRl%1A(iGI`g
z(>;^$rEjrN+*k_TIs@TzWkz;g;mw6wF7Oeb_(ba<f&m^0(z${o2)S!pYQ0*IYO)z@
zB*cjAhORj%qH^*&HHitMDCTGf{ZK7zpVp)n6+b5i4ajlgHe|fj-4yb3_&(X=o@)r&
z@C3Y)RK9C#as21TSqsc3=CrjFu&CE<{am}G?Ch_&94X;MZ5d_x@ZbPs4LdDi*uZ%n
z2~8)W<ND;~t*<Xo?_;G1d7TH(H|@0?*lcSX2Ys5%EeZ?J8Y_I9=WgycL7u&1X7MKj
zQ*^nrH1YkIQ^#%<Q|Fo;5iYPu_6zHTPGCTm61`#0yhMamPDuNA+mRFAl5S%#WnXy#
zd{Sf0^jUYkefZxZx(EOu5wK4>>>gv=YY+e(@jd&2T!M{$7;Pl_Ugn5wpMbW#hzs=~
z9T_o_B;N?|x}_kz#opQkiHFD>r8*GaZZ&;h-XJ>X>&|NWTlBAPg4q$oq%u#H1euI*
zeS#!32m(pUxb{`G+pvpGqR*P?<s_2<gIh9$=<=8Ci$IPJy-D(#a=qMa+;9F5pD9^V
zGxzZk>Dx3p?SG?o9jQf3>CDzJwWb+BxiNQ)JtJzt2kgZ$Q);L22_&*hxa7pt-lRbm
zSLsB7&s^&{g<dO>e;$%hdw3OuwuVymlC3@tTgAvARiX@T1uUaMZoQXX>{bT@P0r&*
zamdO}SKn0Dxod>aU`J5IQ*M5>(&bfs&khJfVTpO8AgQJd>FFLLpI-EzXVLD_ngY+r
zXWVkB#gu{lZ?`JO@YD#Nd9Zl$4Plb<dR$|s`V1%tv4dseaGH^t*};U0MP02`!@n(C
z-ZSeU5Zi?b2+&ltJ)Fa<IA)SbayrDT_|L-2mMV3GsGQkPlDM*PrG3jRK==FJ#FKNK
zA}Nendaji)q6iegDR@8!XHiWi=#!d>`R_?N4PLi@ThN;LlTdk>W^lV-DUkB}sZZv-
zWXR^)H9Ir&h1;Y;6#iRPlBcw$;^_Rlk(<gDmotfb`G%o2o6N&k&xhOh+D``v$W#m_
z!NlN@hiniCP?0|~F`M!`ty@-MdI>)PPBS9gzK>9SWHfS#UcGQ?ZJ1JMmGrSeD9101
z4bSq&;%XiI6s(Gk8Ge+m@PEVN?TL*=xz@W6Jq0n?(j!w%gL!~d7rDG*{y3(4bYE!`
z+_caXL%=5#R)g95f!#t5Saowy<+jjbSt2)^DRSnHDz8-{(O!Q*F7G|5*_1+;gQ*h}
ziw?IsljoHnmsqMbq_JtdtFNPl!qrlNrlg_<IbKm1mP6D=97)6u#Rfm;3ha#VbRJ%c
zmL;Wz2KZFIK5CqR-}*@(N@QeCsS3Q=Dkwk4M7ns&rhsNn+*FK<{4n;cE2LE;eb#F3
zyax06ZF<=lK0>B(`n*}p7ZxzZX3d!A^M$jy+0Pgsa)4U@!P+PTjy2T)_n$@U7PwE6
zcCB(5cC}@UPr6EZ!+dIeV>5W@a%s&LP?>;rZQZQQ1<mgcF6WwdXOs>baqcld6w#q!
z;6?ZxHUK6d0mBAerM3v6Tby^7A9;6%?-;TA{jRao@i$Xya=ef0m76@4ZC&?~0o@+)
z_g9_{oWv-P9~_+9Um!Xyp;x;gHXToEJ6ZKz`VEpr_Pp;`A&2G7PB`UUfdVBy5&Yb$
zkq2!0(G5^O`#xIjLRTfh!*SST`@UB>XbH4Y;>aprKm7aQe<7emptK9GDAc;ggq>zY
z%Bw>6G1o}hn*mElv6kOT<HD2JtT}T?7r-h`L8f_eNt>`+&rC^@<j8%uiUj%SwP?R9
zSGz*fB2p1jA$B1v=_I@7VR^_pKoCoN4jl#Coq(e##-!3w9Kd-?q6OUw64X#pvIyoK
zEP;w0^ZZt?R|*#Ru+G4_`i^tRs-z(3$4h1e*LbA~C~begmvBO5<0)3H|F1kMPhsus
z8(7;qMH>wg!y`^lW5$<uSf?aThDlM~&XfM|LRTS{L(G#e{c&PXBTid+BU@|*x05%`
zx!rRI(jxfk;{Qw)H)TEEg7mnGw`1;niJ3LPP*zjVR_@7t<=F|G2}0G6wFCJ%!Zc%U
z+9?dP=KY1a!UQufAld>Yr#Cei8VE%h+9icw<yK`7WX|3zYlvzXVC<?g=1svc_;@(b
zYKFGOhQ^4JU2~_laDvHf01sju@i^!-rl)_86RbiO%4jwuHeR5GeR8p+HAF@_2RhBK
zyau3-X(9kGR{m8|;50>pmce>6JWACy_8_BK3BZ=f<kB?`qg&Zr;n;`T#aBXzC4u<r
z%1e`NCfd)Hc$xc=Qd}yk3n;;Oop*?sjEvmP9)a-d)6TbwbDKU9WcD);%9k+&!^VL>
zUf`%M?tB75BP=7=+XPn3Nf{`QWAW3Q>&9*-;xnEgYFH<g0Lgz*YtMx!?Q1-6I`e9{
zj&agf{J&G6{emIpz%tnX1t<sC`0o^-H^d`?sY7!BAh`sKY+|a>@-Fy1LN+V~2Fr@f
z1uq<S2EMk5U%Q3h`~)2ao=op^dw0si!%J-I2Y7#(2m1|oc7<>6HvIO>!2kZ@KHPl-
zJUL%TIv7!}U!~d*WYWT;1GewnLl0pPckmj3DT)%MBD$Jr5W7Pj-tRbztmKkl>AA<4
zfce}P)$zwv`x8sgmrsu&G53X<3Qi4kSp*{lEOb~5(3d%$_nZYBy~5%$Iduj#j)5C6
ztcDEh;mH$O)!=+ZUDXJVfp4f?o#z3A+UHA}XB+QvRgIS_`KBpo2ndQ-hs$OkPQXd}
zZ<X_x!YzAvE!T0&Li?<jR9ztIP>tz)UgSNN<FiQ5lF1zjYzd5jk%PuT<<fYX7&My3
z)DxgPsT5w0H>=iD7}xRsgR92X{lDoEZn#=>+4rWEvd4mgf`WoKm#EDaJv(6$btwuW
zg5_?r*-PERBI)qXrywvI+H34fYWmkK|E<}%NoQ+rriT_GmW<lVBxsiJfw-pyertR+
z9`U<}m#E@>#&^HuC%?YWcTaY?H#KgpkGWKT%lOGYzx&l4nA`ylPkgtnEqM2OO}o=^
z?*WW)&<v?0U~25_wrFR_v}HQph3SMK8*B`XYSged4eai<Sd4Vjc7Zl@PbFwGrO`7-
z*RqsEfF#jRj9J$Fj~696=W&&%syxy9&6AYTHg7<MhAA4`ls&VHD{j`cP}e@0XLpXp
z8b$AFnyO(i7%&{H(bQ`vzK;qRo~S<cr)rI(Nld}l)OAI)h=!O9r>iPw$x`qhLjYAg
z6;XVeU!*s2e|9C2#6yy)_e^Cl|B>t>ea=~?>m6p<%NM(sV%f({)l#|T1;^b8xB^@j
zxa43YLgQ10%?w&i<&b29@10Xvp<7{)tBR1l$#o)deaYy2y;y#(WPy||%kG;k3cTo&
z>SG~k1qB5K1#bpXTi&=_icF5IbxVtF`h~R4O7Fn5Al?-r<`xY%H?DS0XNOu0V=N|5
zBGiGi1!LKT)3mYxzg)_84E$m&eh>Z0Z}~6lm-wo_$D`YS&%Iwi03HJ!e_(6&x~F54
zPyg&AKK^ixy>D+*hdcaky8^9=1S}pBAKqhsSg~Gpta<2|(oHuQdxv$PrZC=NZ|pd$
zF`KNit+T#<f#M|vcmwTN*kZWggZMlKcp^8rDrLN*rPNxM<WGG>5#scjAE-f7F&GRG
zag1H0UAXS8DbXq7J>FN;)ydP<bQ<ZVfe>QK1ggjIPz`XtqHz^n<>_d1FfQ4PS#!Tw
zE}>JwIhW+~ouN@twHblB=p;E4w#e5nGjr4#jT0(YAwE?GL{Vx><&ye>602qqRcCLl
zs+p9Y|6oH>Chf9IUmF4=4~>A&-FMTxyVe0?fdf;*37O}4erx`Mo~+GEQ0@3}yL|ex
zy6hY!_$wuk&+H9ZP*6}%Q1Ge{HIbE|e8I!|$XeHzLgw!?QYLfp3Bk>J!INrZr0-EM
z1iZtGq|Dl4Ynw&PvO;8EJ1Mqs-0X!UMW6rWL5>=P$)Z<PM)<#&{I}omOMZ7u^mXqX
z$NN59`4{lcCD^SncL!)8gn4mo*ru{A>S~B+i_p@J57}<PW_@Ro^O#oIISHC`y_mt#
z?8RL8;Jm?NGIUS<IkKRHcQHgDsNi$?AH;>sizc717@o_s<h`e<Dx5f~l}4nFfEoBo
z7!EwcK}F+*_LwH8@np)u<dDP30hO<q#6Two6^M64Tvk<dpdD(OGB?89f6)vzk7&e+
zBStWZAc{QmXO*LL#7Pp6ahWPAIPp}20kyC3RY%u$#Ly9*bI;;Y@sNv^`g!0Iuqm+V
z($@yUP#rZ%ZYJhWA23Gd7-6gl>=~z)2`5j!<-RjJrUcS0jhoey&YryK(!bB&(_WfC
zWI;heK|#SwBWfq@QpyScn)*E?>wH)iT#&TXyM9U49H{2(hJwrFO=n?aDvz3#4N2Db
z*M$H`mXF()H<dN`Wn)Fs-0T=%Y6E_If%jhH;~!k%<Lie!ez?O=zi`}n0z6VC+mVOc
z{RmJt1~6@tpg|jqNoRDEn0q0|r&sP>sNd`ulI9#UiJKIoukcvGvao}bm`e_ye&EUp
z*ESojZVhN^I2^a!ebllyzIfT3#h5ZvmEp{YAriVk3>_L<Oxs!Z?^zMEJ)&dYt2Tow
zB1$C=^%aA<rfD4Q_$X-^w+9@w`|M5k@m0;fPMB&;{bw;{&Y~(7H2Z-Fn)|0xnPay6
zu!xXEjZ#aSVJe`{F|j4{apA<H>WD;~KwWvNsv&rxb`|10q4Vfud}^Q8vyioC!HASW
z+YnfHu<nGR!N9;{SiWwalwqqKG|?CWd#5ZYnw1}Ish-#!Sz(T<KCaF!dZg?Tj(@Z+
kno%q$C@3f>cv1NO0nV23H+`VdyZ`_I07*qoM6N<$g45nOQ~&?~

literal 0
HcmV?d00001


From fd2b0d98becd39e644bdb51130901343a003b7d1 Mon Sep 17 00:00:00 2001
From: Chrissy Morgan <43700993+Chrissy-Morgan@users.noreply.github.com>
Date: Mon, 8 Apr 2019 00:05:12 +0100
Subject: [PATCH 1078/1938] Create Kali-Installation-Instructions.md

Created Kali page
---
 .../Kali-Installation-Instructions.md         | 105 ++++++++++++++++++
 1 file changed, 105 insertions(+)
 create mode 100644 Installation_Instructions/Kali-Installation-Instructions.md

diff --git a/Installation_Instructions/Kali-Installation-Instructions.md b/Installation_Instructions/Kali-Installation-Instructions.md
new file mode 100644
index 000000000..cd1b6c959
--- /dev/null
+++ b/Installation_Instructions/Kali-Installation-Instructions.md
@@ -0,0 +1,105 @@
+# Kali Installation
+Kali users usually must kill their modem manager in order for the proxmark3 to enumerate properly.
+''' sudo apt remove modemmanager '''
+
+# Video Installation guide
+[![Kali Installation tutorial](https://github.com/5w0rdfish/Proxmark3-RDV4-ParrotOS/blob/master/screenshot-www.youtube.com-2019.03.17-20-44-33.png)](https://youtu.be/Wl9AsrU4igo "ParrotOS Installation Tutorial")
+
+
+---
+## Manual Install
+First what we want to do is get an update for the system. If you need to upgrade do this **before** the install
+An upgrade was carried out prior to following these instructions. 
+
+### Update
+```sh
+sudo apt-get update
+``` 
+### Requirements.
+
+```sh
+sudo apt-get install p7zip git build-essential libreadline5 libreadline-dev \
+libusb-0.1-4 libusb-dev libqt4-dev perl pkg-config wget libncurses5-dev gcc-arm-none-eabi
+```
+If you do get any issues during the requirements installation, I have found it to help using the synaptic package manager. 
+
+### Clone Fork 
+```sh
+git clone https://github.com/RfidResearchGroup/proxmark3.git
+```
+
+### Change directory into the directory created
+```sh
+cd proxmark3
+```
+
+### Get the latest commits
+```sh
+git pull
+```
+
+### Make Udev
+Iceman has made the udev script which takes care of the blacklist rules. This should take care of the remove modem manager.
+The make udev command also create's an alias for the pm3 under /dev which you will use to connect to the proxmark. 
+
+```sh
+sudo make udev
+```
+if you have any issues:
+```sh
+sudo apt remove modemmanager
+```
+
+> **Note**  If you have any issues connecting or during the flash, follow the steps listed [here](https://github.com/RfidResearchGroup/proxmark3/issues/35) and use the command sudo apt remove modemmanager 
+
+Log out and log back in again. And now we are all set to take the next step. 
+
+Enter the proxmark3 folder
+```sh
+cd proxmark3
+```
+
+### Clean and Compile
+Clean and complete compilation 
+
+```sh
+ make clean && make all
+```
+### Check Connection
+Once this is complete run the following comands to make sure the proxmark is being picked up by your computer. 
+
+```sh
+sudo dmesg | grep -i usb
+```
+It should show up as a CDC device:
+```sh
+[10416.555108] usb 2-1.2: Product: PM3
+[10416.555111] usb 2-1.2: Manufacturer: proxmark.org
+[10416.555871] cdc_acm 2-1.2:1.0: ttyACM0: USB ACM device
+```
+
+### Flash the BOOTROM & FULLIMAGE
+ ```sh
+ client/flasher /dev/ttyACM0 -b bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf
+```
+### Change into the client folder
+
+```sh
+cd client
+```
+### Run the client
+ ``` sh 
+./proxmark3 /dev/pm #press tab on the keyboard for it to detect the proxmark
+```
+or  
+
+### Run the client 
+ ```sh
+./proxmark3 /dev/ttyACM0
+```
+ 
+### Run a test command
+ ```sh
+hw tune
+```
+

From 69bcec5208e23d3453dcb7b23ac0363f84baaebf Mon Sep 17 00:00:00 2001
From: Chrissy Morgan <43700993+Chrissy-Morgan@users.noreply.github.com>
Date: Mon, 8 Apr 2019 00:09:26 +0100
Subject: [PATCH 1079/1938] Added Kali page link

links to Kali instructions
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 47192cb43..67e31b794 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ alt="Yuotube" width="100%" height="auto" border="10" /></a>
 |[Why didn't you based it on offical PM3 Master?](#why-didnt-you-based-it-on-offical-pm3-master) |[ParrotOS Installation ](/Installation_Instructions/Parrot-OS-Proxmark3-RDV4-installation.md)|[PM3 GUI](#pm3-gui)
 |[Notices](#notices)|[Setup and build for Windows](/Installation_Instructions/Windows-Installation-Instructions.md)||
 |[Issues](#issues)|[Coverity Scan Config & Run](/Installation_Instructions/Coverity-Scan-Config-%26-Run.md)||
-|||
+||[Kali Linux Installation Instructions](/Installation_Instructions/Kali-Installation-Instructions.md)|
 
 ---
 ## Whats changed?

From 32de4f8f6fc8fa4bb7991b0a7bd4905e2b16d7de Mon Sep 17 00:00:00 2001
From: Chrissy Morgan <43700993+Chrissy-Morgan@users.noreply.github.com>
Date: Mon, 8 Apr 2019 00:43:02 +0100
Subject: [PATCH 1080/1938] Update Kali-Installation-Instructions.md

---
 .../Kali-Installation-Instructions.md                 | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/Installation_Instructions/Kali-Installation-Instructions.md b/Installation_Instructions/Kali-Installation-Instructions.md
index cd1b6c959..a6b6caf35 100644
--- a/Installation_Instructions/Kali-Installation-Instructions.md
+++ b/Installation_Instructions/Kali-Installation-Instructions.md
@@ -1,6 +1,6 @@
 # Kali Installation
 Kali users usually must kill their modem manager in order for the proxmark3 to enumerate properly.
-''' sudo apt remove modemmanager '''
+```sh sudo apt remove modemmanager```
 
 # Video Installation guide
 [![Kali Installation tutorial](https://github.com/5w0rdfish/Proxmark3-RDV4-ParrotOS/blob/master/screenshot-www.youtube.com-2019.03.17-20-44-33.png)](https://youtu.be/Wl9AsrU4igo "ParrotOS Installation Tutorial")
@@ -38,14 +38,7 @@ cd proxmark3
 git pull
 ```
 
-### Make Udev
-Iceman has made the udev script which takes care of the blacklist rules. This should take care of the remove modem manager.
-The make udev command also create's an alias for the pm3 under /dev which you will use to connect to the proxmark. 
-
-```sh
-sudo make udev
-```
-if you have any issues:
+### Remove Modem Manager
 ```sh
 sudo apt remove modemmanager
 ```

From ef0e53f54b80073a8ff21e7b196d3038f2eae9e0 Mon Sep 17 00:00:00 2001
From: Chrissy Morgan <43700993+Chrissy-Morgan@users.noreply.github.com>
Date: Mon, 8 Apr 2019 00:53:38 +0100
Subject: [PATCH 1081/1938] Update Kali-Installation-Instructions.md

---
 .../Kali-Installation-Instructions.md         | 21 ++++++-------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/Installation_Instructions/Kali-Installation-Instructions.md b/Installation_Instructions/Kali-Installation-Instructions.md
index a6b6caf35..58d783e5b 100644
--- a/Installation_Instructions/Kali-Installation-Instructions.md
+++ b/Installation_Instructions/Kali-Installation-Instructions.md
@@ -1,6 +1,8 @@
 # Kali Installation
 Kali users usually must kill their modem manager in order for the proxmark3 to enumerate properly.
-```sh sudo apt remove modemmanager```
+```sh 
+sudo apt remove modemmanager
+```
 
 # Video Installation guide
 [![Kali Installation tutorial](https://github.com/5w0rdfish/Proxmark3-RDV4-ParrotOS/blob/master/screenshot-www.youtube.com-2019.03.17-20-44-33.png)](https://youtu.be/Wl9AsrU4igo "ParrotOS Installation Tutorial")
@@ -43,15 +45,6 @@ git pull
 sudo apt remove modemmanager
 ```
 
-> **Note**  If you have any issues connecting or during the flash, follow the steps listed [here](https://github.com/RfidResearchGroup/proxmark3/issues/35) and use the command sudo apt remove modemmanager 
-
-Log out and log back in again. And now we are all set to take the next step. 
-
-Enter the proxmark3 folder
-```sh
-cd proxmark3
-```
-
 ### Clean and Compile
 Clean and complete compilation 
 
@@ -75,16 +68,14 @@ It should show up as a CDC device:
  ```sh
  client/flasher /dev/ttyACM0 -b bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf
 ```
+> **Note**  If you have any issues connecting or during the flash, follow the steps listed [here](https://github.com/RfidResearchGroup/proxmark3/issues/35) and use the command sudo apt remove modemmanager 
+
+
 ### Change into the client folder
 
 ```sh
 cd client
 ```
-### Run the client
- ``` sh 
-./proxmark3 /dev/pm #press tab on the keyboard for it to detect the proxmark
-```
-or  
 
 ### Run the client 
  ```sh

From ef52cfef9f2f8dab64d9ee4155e9fb7b8da408c9 Mon Sep 17 00:00:00 2001
From: Chrissy Morgan <43700993+Chrissy-Morgan@users.noreply.github.com>
Date: Mon, 8 Apr 2019 01:42:29 +0100
Subject: [PATCH 1082/1938] Added video link - instruction changes

Installation steps amended and added kali linux video
---
 .../Kali-Installation-Instructions.md               | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/Installation_Instructions/Kali-Installation-Instructions.md b/Installation_Instructions/Kali-Installation-Instructions.md
index 58d783e5b..4d65afead 100644
--- a/Installation_Instructions/Kali-Installation-Instructions.md
+++ b/Installation_Instructions/Kali-Installation-Instructions.md
@@ -5,7 +5,7 @@ sudo apt remove modemmanager
 ```
 
 # Video Installation guide
-[![Kali Installation tutorial](https://github.com/5w0rdfish/Proxmark3-RDV4-ParrotOS/blob/master/screenshot-www.youtube.com-2019.03.17-20-44-33.png)](https://youtu.be/Wl9AsrU4igo "ParrotOS Installation Tutorial")
+[![Kali Installation tutorial](https://github.com/5w0rdfish/Proxmark3-RDV4-ParrotOS/blob/master/screenshot-www.youtube.com-2019.03.17-20-44-33.png)](https://youtu.be/t5eBPS6lV3E "Kali Linux Installation Tutorial")
 
 
 ---
@@ -44,9 +44,18 @@ git pull
 ```sh
 sudo apt remove modemmanager
 ```
+### Reboot Kali
+```sh
+ reboot
+```
+
+### Change directory back to proxmark3
+```sh
+cd proxmark3
+```
 
 ### Clean and Compile
-Clean and complete compilation 
+Clean and complete compile
 
 ```sh
  make clean && make all

From a89ae9cb35ded340cfdc777fde225439b3819383 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 8 Apr 2019 08:08:47 +0200
Subject: [PATCH 1083/1938] check return value from zlib inflateInit2...

---
 armsrc/fpgaloader.c    | 6 ++++--
 armsrc/start.c         | 4 +++-
 client/fpga_compress.c | 4 +++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/armsrc/fpgaloader.c b/armsrc/fpgaloader.c
index 0b94bba45..63957067f 100644
--- a/armsrc/fpgaloader.c
+++ b/armsrc/fpgaloader.c
@@ -229,8 +229,10 @@ static bool reset_fpga_stream(int bitstream_version, z_streamp compressed_fpga_s
     compressed_fpga_stream->zalloc = &fpga_inflate_malloc;
     compressed_fpga_stream->zfree = &fpga_inflate_free;
 
-    inflateInit2(compressed_fpga_stream, 0);
-
+    int res = inflateInit2(compressed_fpga_stream, 0);
+    if ( res < 0 )
+        return false;
+    
     fpga_image_ptr = output_buffer;
 
     for (uint16_t i = 0; i < FPGA_BITSTREAM_FIXED_HEADER_SIZE; i++)
diff --git a/armsrc/start.c b/armsrc/start.c
index b5947bdf3..0b48fc601 100644
--- a/armsrc/start.c
+++ b/armsrc/start.c
@@ -48,7 +48,9 @@ static void uncompress_data_section(void) {
     data_section.opaque = NULL;
 
     // initialize zlib for inflate
-    inflateInit2(&data_section, 15);
+    int res = inflateInit2(&data_section, 15);
+    if ( res < 0 )
+        return;
 
     // uncompress data segment to RAM
     inflate(&data_section, Z_FINISH);
diff --git a/client/fpga_compress.c b/client/fpga_compress.c
index 00e62d74b..cba92a99e 100644
--- a/client/fpga_compress.c
+++ b/client/fpga_compress.c
@@ -206,7 +206,9 @@ int zlib_decompress(FILE *infile, FILE *outfile) {
     compressed_fpga_stream.opaque = Z_NULL;
 
     ret = inflateInit2(&compressed_fpga_stream, 0);
-
+    if ( res < 0 )
+        return (EXIT_FAILURE);
+    
     do {
         if (compressed_fpga_stream.avail_in == 0) {
             compressed_fpga_stream.next_in = inbuf;

From 8d2c02878b19514d5dde3fa5388ef2a6fbdc13f5 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 8 Apr 2019 08:11:18 +0200
Subject: [PATCH 1084/1938] simpler branching

---
 client/cmdlfpyramid.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c
index e3f2a90b5..0be39300f 100644
--- a/client/cmdlfpyramid.c
+++ b/client/cmdlfpyramid.c
@@ -224,16 +224,15 @@ int CmdPyramidDemod(const char *Cmd) {
         fc = bytebits_to_byte(bits + 53, 10);
         cardnum = bytebits_to_byte(bits + 63, 32);
         PrintAndLogEx(SUCCESS, "Pyramid ID Found - BitLength: %d, FC: %d, Card: %d - Raw: %08x%08x%08x%08x", fmtLen, fc, cardnum, rawHi3, rawHi2, rawHi, rawLo);
+    } else if (fmtLen > 32) {
+        cardnum = bytebits_to_byte(bits + 81, 16);
+        //code1 = bytebits_to_byte(bits+(size-fmtLen),fmtLen-32);
+        //code2 = bytebits_to_byte(bits+(size-32),32);
+        PrintAndLogEx(SUCCESS, "Pyramid ID Found - BitLength: %d -unknown BitLength- (%d), Raw: %08x%08x%08x%08x", fmtLen, cardnum, rawHi3, rawHi2, rawHi, rawLo);
     } else {
         cardnum = bytebits_to_byte(bits + 81, 16);
-        if (fmtLen > 32) {
-            //code1 = bytebits_to_byte(bits+(size-fmtLen),fmtLen-32);
-            //code2 = bytebits_to_byte(bits+(size-32),32);
-            PrintAndLogEx(SUCCESS, "Pyramid ID Found - BitLength: %d -unknown BitLength- (%d), Raw: %08x%08x%08x%08x", fmtLen, cardnum, rawHi3, rawHi2, rawHi, rawLo);
-        } else {
-            //code1 = bytebits_to_byte(bits+(size-fmtLen),fmtLen);
-            PrintAndLogEx(SUCCESS, "Pyramid ID Found - BitLength: %d -unknown BitLength- (%d), Raw: %08x%08x%08x%08x", fmtLen, cardnum, rawHi3, rawHi2, rawHi, rawLo);
-        }
+        //code1 = bytebits_to_byte(bits+(size-fmtLen),fmtLen);
+        PrintAndLogEx(SUCCESS, "Pyramid ID Found - BitLength: %d -unknown BitLength- (%d), Raw: %08x%08x%08x%08x", fmtLen, cardnum, rawHi3, rawHi2, rawHi, rawLo);
     }
 
     PrintAndLogEx(DEBUG, "DEBUG: Pyramid: checksum : 0x%02X - %02X - %s"

From 9328a8efbb9475c87b2cd7dec522b7bb3499da4b Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 8 Apr 2019 08:15:28 +0200
Subject: [PATCH 1085/1938] fix

---
 client/fpga_compress.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/fpga_compress.c b/client/fpga_compress.c
index cba92a99e..4b0350c06 100644
--- a/client/fpga_compress.c
+++ b/client/fpga_compress.c
@@ -206,7 +206,7 @@ int zlib_decompress(FILE *infile, FILE *outfile) {
     compressed_fpga_stream.opaque = Z_NULL;
 
     ret = inflateInit2(&compressed_fpga_stream, 0);
-    if ( res < 0 )
+    if ( ret < 0 )
         return (EXIT_FAILURE);
     
     do {

From 075ccebfd514c62398cacc08c5cff6e644d1d24b Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 8 Apr 2019 08:23:11 +0200
Subject: [PATCH 1086/1938] unshadow

---
 client/tinycbor/cborinternal_p.h | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/client/tinycbor/cborinternal_p.h b/client/tinycbor/cborinternal_p.h
index 65c42cdf4..2464ddeea 100644
--- a/client/tinycbor/cborinternal_p.h
+++ b/client/tinycbor/cborinternal_p.h
@@ -49,43 +49,43 @@ static inline double decode_half(unsigned short half) {
 /* software implementation of float-to-fp16 conversions */
 static inline unsigned short encode_half(double val) {
     uint64_t v;
-    int sign, exp, mant;
+    int sign, exp1, mant;
     memcpy(&v, &val, sizeof(v));
     sign = v >> 63 << 15;
-    exp = (v >> 52) & 0x7ff;
+    exp1 = (v >> 52) & 0x7ff;
     mant = v << 12 >> 12 >> (53 - 11);  /* keep only the 11 most significant bits of the mantissa */
-    exp -= 1023;
-    if (exp == 1024) {
+    exp1 -= 1023;
+    if (exp1 == 1024) {
         /* infinity or NaN */
-        exp = 16;
+        exp1 = 16;
         mant >>= 1;
-    } else if (exp >= 16) {
+    } else if (exp1 >= 16) {
         /* overflow, as largest number */
-        exp = 15;
+        exp1 = 15;
         mant = 1023;
-    } else if (exp >= -14) {
+    } else if (exp1 >= -14) {
         /* regular normal */
-    } else if (exp >= -24) {
+    } else if (exp1 >= -24) {
         /* subnormal */
         mant |= 1024;
-        mant >>= -(exp + 14);
-        exp = -15;
+        mant >>= -(exp1 + 14);
+        exp1 = -15;
     } else {
         /* underflow, make zero */
         return 0;
     }
 
     /* safe cast here as bit operations above guarantee not to overflow */
-    return (unsigned short)(sign | ((exp + 15) << 10) | mant);
+    return (unsigned short)(sign | ((exp1 + 15) << 10) | mant);
 }
 
 /* this function was copied & adapted from RFC 7049 Appendix D */
 static inline double decode_half(unsigned short half) {
-    int exp = (half >> 10) & 0x1f;
+    int exp1 = (half >> 10) & 0x1f;
     int mant = half & 0x3ff;
     double val;
-    if (exp == 0) val = ldexp(mant, -24);
-    else if (exp != 31) val = ldexp(mant + 1024, exp - 25);
+    if (exp1 == 0) val = ldexp1(mant, -24);
+    else if (exp1 != 31) val = ldexp1(mant + 1024, exp1 - 25);
     else val = mant == 0 ? INFINITY : NAN;
     return (half & 0x8000) ? -val : val;
 }

From 8f2983368cbfaddaeee05b4ca04c5bf338f6ce63 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 8 Apr 2019 08:26:18 +0200
Subject: [PATCH 1087/1938] style

---
 client/crypto/libpcrypto.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/client/crypto/libpcrypto.c b/client/crypto/libpcrypto.c
index 095d16af3..0def5b2f7 100644
--- a/client/crypto/libpcrypto.c
+++ b/client/crypto/libpcrypto.c
@@ -69,15 +69,15 @@ int aes_cmac(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *mac, int length
 }
 
 int aes_cmac8(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *mac, int length) {
-    uint8_t cmac[16] = {0};
+    uint8_t cmac_tmp[16] = {0};
     memset(mac, 0x00, 8);
 
-    int res = aes_cmac(iv, key, input, cmac, length);
+    int res = aes_cmac(iv, key, input, cmac_tmp, length);
     if (res)
         return res;
 
     for (int i = 0; i < 8; i++)
-        mac[i] = cmac[i * 2 + 1];
+        mac[i] = cmac_tmp[i * 2 + 1];
 
     return 0;
 }
@@ -382,13 +382,13 @@ int ecdsa_nist_test(bool verbose) {
         res = 1;
         goto exit;
     }
-    if (verbose)
+    
+    if (verbose) {
         printf("passed\n");
-
-    // random ecdsa test
-    if (verbose)
         printf("  ECDSA binary signature create/check test: ");
-
+    }
+    
+    // random ecdsa test   
     uint8_t key_d[32] = {0};
     uint8_t key_xy[32 * 2 + 2] = {0};
     memset(signature, 0x00, sizeof(signature));

From 1815376ef5a6e60dec3a3739351f7bd9c0f5e4dc Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 8 Apr 2019 08:26:30 +0200
Subject: [PATCH 1088/1938] style

---
 client/loclass/ikeys.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/client/loclass/ikeys.c b/client/loclass/ikeys.c
index 16985ccb8..d7c965421 100644
--- a/client/loclass/ikeys.c
+++ b/client/loclass/ikeys.c
@@ -679,8 +679,7 @@ static bool readKeyFile(uint8_t key[8]) {
     if (bytes_read == 8)
         retval = true;
 
-    if (f)
-        fclose(f);
+    fclose(f);
     return retval;
 }
 

From a2176b722d48fe6c9e41519d9cb1918c64f0c7f2 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 8 Apr 2019 08:28:43 +0200
Subject: [PATCH 1089/1938] fix

---
 client/tinycbor/cborinternal_p.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/tinycbor/cborinternal_p.h b/client/tinycbor/cborinternal_p.h
index 2464ddeea..d971fa478 100644
--- a/client/tinycbor/cborinternal_p.h
+++ b/client/tinycbor/cborinternal_p.h
@@ -84,8 +84,8 @@ static inline double decode_half(unsigned short half) {
     int exp1 = (half >> 10) & 0x1f;
     int mant = half & 0x3ff;
     double val;
-    if (exp1 == 0) val = ldexp1(mant, -24);
-    else if (exp1 != 31) val = ldexp1(mant + 1024, exp1 - 25);
+    if (exp1 == 0) val = ldexp(mant, -24);
+    else if (exp1 != 31) val = ldexp(mant + 1024, exp1 - 25);
     else val = mant == 0 ? INFINITY : NAN;
     return (half & 0x8000) ? -val : val;
 }

From ec278e60cc1e744b251c4f4ba8d0646b12af93c6 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 8 Apr 2019 08:34:40 +0200
Subject: [PATCH 1090/1938] unshadow

---
 client/util.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/util.c b/client/util.c
index b257ea766..f69138947 100644
--- a/client/util.c
+++ b/client/util.c
@@ -835,11 +835,11 @@ uint32_t reflect(uint32_t v, int b) {
 }
 
 uint64_t HornerScheme(uint64_t num, uint64_t divider, uint64_t factor) {
-    uint64_t remainder = 0, quotient = 0, result = 0;
-    remainder = num % divider;
+    uint64_t remaind = 0, quotient = 0, result = 0;
+    remaind = num % divider;
     quotient = num / divider;
-    if (!(quotient == 0 && remainder == 0))
-        result += HornerScheme(quotient, divider, factor) * factor + remainder;
+    if (!(quotient == 0 && remaind == 0))
+        result += HornerScheme(quotient, divider, factor) * factor + remaind;
     return result;
 }
 

From daa731309578f39df7f89a89b92caf64514a64ed Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 8 Apr 2019 08:36:07 +0200
Subject: [PATCH 1091/1938] unshadow

---
 common/crapto1/crapto1.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/crapto1/crapto1.c b/common/crapto1/crapto1.c
index 417ac1c86..ea496e1c4 100644
--- a/common/crapto1/crapto1.c
+++ b/common/crapto1/crapto1.c
@@ -154,7 +154,7 @@ struct Crypto1State *lfsr_recovery32(uint32_t ks2, uint32_t in) {
     // allocate memory for out of place bucket_sort
     bucket_array_t bucket;
 
-    for (uint32_t i = 0; i < 2; i++) {
+    for (i = 0; i < 2; i++) {
         for (uint32_t j = 0; j <= 0xff; j++) {
             bucket[i][j].head = malloc(sizeof(uint32_t) << 14);
             if (!bucket[i][j].head) {
@@ -184,7 +184,7 @@ struct Crypto1State *lfsr_recovery32(uint32_t ks2, uint32_t in) {
     recover(odd_head, odd_tail, oks, even_head, even_tail, eks, 11, statelist, in << 1, bucket);
 
 out:
-    for (uint32_t i = 0; i < 2; i++)
+    for (i = 0; i < 2; i++)
         for (uint32_t j = 0; j <= 0xff; j++)
             free(bucket[i][j].head);
     free(odd_head);

From 21fd059dc256b31fc5b67e21530ca6ffcace87ef Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 8 Apr 2019 09:08:03 +0200
Subject: [PATCH 1092/1938] unshadow

---
 client/cmdhfmfhard.c | 132 +++++++++++++++++++++----------------------
 1 file changed, 65 insertions(+), 67 deletions(-)

diff --git a/client/cmdhfmfhard.c b/client/cmdhfmfhard.c
index 12aec1cb2..99afc6b01 100644
--- a/client/cmdhfmfhard.c
+++ b/client/cmdhfmfhard.c
@@ -1365,9 +1365,8 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
     bool field_off = false;
     hardnested_stage = CHECK_1ST_BYTES;
     bool acquisition_completed = false;
-    uint32_t flags = 0;
     uint8_t write_buf[9];
-    uint32_t total_num_nonces = 0;
+    //uint32_t total_num_nonces = 0;
     float brute_force_depth;
     bool reported_suma8 = false;
     char progress_text[80];
@@ -1379,7 +1378,7 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
     clearCommandBuffer();
 
     do {
-        flags = 0;
+        uint32_t flags = 0;
         flags |= initialize ? 0x0001 : 0;
         flags |= slow ? 0x0002 : 0;
         flags |= field_off ? 0x0004 : 0;
@@ -1394,9 +1393,9 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
         if (initialize) {
             if (!WaitForResponseTimeout(CMD_ACK, &resp, 3000)) {
                 //strange second call (iceman)
-                UsbCommand c = {CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, 4}};
+                UsbCommand c1 = {CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, 4}};
                 clearCommandBuffer();
-                SendCommand(&c);
+                SendCommand(&c1);
                 return 1;
             }
             if (resp.arg[0]) return resp.arg[0];  // error during nested_hard
@@ -1438,7 +1437,7 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
                 }
                 bufp += 9;
             }
-            total_num_nonces += num_sampled_nonces;
+            //total_num_nonces += num_sampled_nonces;
 
             if (first_byte_num == 256) {
                 if (hardnested_stage == CHECK_1ST_BYTES) {
@@ -1651,7 +1650,8 @@ static uint_fast8_t reverse(uint_fast8_t b) {
 
 
 static bool all_bitflips_match(uint8_t byte, uint32_t state, odd_even_t odd_even) {
-    uint32_t masks[2][8] = {{0x00fffff0, 0x00fffff8, 0x00fffff8, 0x00fffffc, 0x00fffffc, 0x00fffffe, 0x00fffffe, 0x00ffffff},
+    uint32_t masks[2][8] = {
+        {0x00fffff0, 0x00fffff8, 0x00fffff8, 0x00fffffc, 0x00fffffc, 0x00fffffe, 0x00fffffe, 0x00ffffff},
         {0x00fffff0, 0x00fffff0, 0x00fffff8, 0x00fffff8, 0x00fffffc, 0x00fffffc, 0x00fffffe, 0x00fffffe}
     };
 
@@ -1663,6 +1663,7 @@ static bool all_bitflips_match(uint8_t byte, uint32_t state, odd_even_t odd_even
         bool found_match = false;
         for (uint8_t remaining_bits = 0; remaining_bits <= (~mask & 0xff); remaining_bits++) {
             if (remaining_bits_match(num_common, bytes_diff, state, (state & mask) | remaining_bits, odd_even)) {
+                
 #ifdef DEBUG_KEY_ELIMINATION
                 if (bitflips_match(byte2, (state & mask) | remaining_bits, odd_even, true)) {
 #else
@@ -1673,7 +1674,9 @@ static bool all_bitflips_match(uint8_t byte, uint32_t state, odd_even_t odd_even
                 }
             }
         }
+        
         if (!found_match) {
+            
 #ifdef DEBUG_KEY_ELIMINATION
             if (known_target_key != -1 && state == test_state[odd_even]) {
                 PrintAndLogEx(NORMAL, "all_bitflips_match() 1st Byte: %s test state (0x%06x): Eliminated. Bytes = %02x, %02x, Common Bits = %d\n",
@@ -1693,7 +1696,6 @@ static bool all_bitflips_match(uint8_t byte, uint32_t state, odd_even_t odd_even
     return true;
 }
 
-
 static void bitarray_to_list(uint8_t byte, uint32_t *bitarray, uint32_t *state_list, uint32_t *len, odd_even_t odd_even) {
     uint32_t *p = state_list;
     for (uint32_t state = next_state(bitarray, -1L); state < (1 << 24); state = next_state(bitarray, state)) {
@@ -1715,7 +1717,7 @@ static void add_cached_states(statelist_t *candidates, uint16_t part_sum_a0, uin
 
 
 static void add_matching_states(statelist_t *candidates, uint8_t part_sum_a0, uint8_t part_sum_a8, odd_even_t odd_even) {
-    uint32_t worstcase_size = 1 << 20;
+    const uint32_t worstcase_size = 1 << 20;
     candidates->states[odd_even] = (uint32_t *)malloc(sizeof(uint32_t) * worstcase_size);
     if (candidates->states[odd_even] == NULL) {
         PrintAndLogEx(WARNING, "Out of memory error in add_matching_states() - statelist.\n");
@@ -1772,28 +1774,26 @@ static statelist_t *add_more_candidates(void) {
     return new_candidates;
 }
 
-
 static void add_bitflip_candidates(uint8_t byte) {
-    statelist_t *candidates = add_more_candidates();
+    statelist_t *candidates1 = add_more_candidates();
 
     for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
         uint32_t worstcase_size = nonces[byte].num_states_bitarray[odd_even] + 1;
-        candidates->states[odd_even] = (uint32_t *)malloc(sizeof(uint32_t) * worstcase_size);
-        if (candidates->states[odd_even] == NULL) {
+        candidates1->states[odd_even] = (uint32_t *)malloc(sizeof(uint32_t) * worstcase_size);
+        if (candidates1->states[odd_even] == NULL) {
             PrintAndLogEx(WARNING, "Out of memory error in add_bitflip_candidates().\n");
             exit(4);
         }
 
-        bitarray_to_list(byte, nonces[byte].states_bitarray[odd_even], candidates->states[odd_even], &(candidates->len[odd_even]), odd_even);
+        bitarray_to_list(byte, nonces[byte].states_bitarray[odd_even], candidates1->states[odd_even], &(candidates1->len[odd_even]), odd_even);
 
-        if (candidates->len[odd_even] + 1 < worstcase_size) {
-            candidates->states[odd_even] = realloc(candidates->states[odd_even], sizeof(uint32_t) * (candidates->len[odd_even] + 1));
+        if (candidates1->len[odd_even] + 1 < worstcase_size) {
+            candidates1->states[odd_even] = realloc(candidates1->states[odd_even], sizeof(uint32_t) * (candidates1->len[odd_even] + 1));
         }
     }
     return;
 }
 
-
 static bool TestIfKeyExists(uint64_t key) {
     struct Crypto1State *pcs;
     pcs = crypto1_create(key);
@@ -1839,7 +1839,6 @@ static bool TestIfKeyExists(uint64_t key) {
     return false;
 }
 
-
 static work_status_t book_of_work[NUM_PART_SUMS][NUM_PART_SUMS][NUM_PART_SUMS][NUM_PART_SUMS];
 
 static void init_book_of_work(void) {
@@ -2013,12 +2012,12 @@ static void generate_candidates(uint8_t sum_a0_idx, uint8_t sum_a8_idx) {
     // create and run worker threads
     pthread_t thread_id[NUM_REDUCTION_WORKING_THREADS];
 
-    uint16_t sums[NUM_REDUCTION_WORKING_THREADS][3];
+    uint16_t sums1[NUM_REDUCTION_WORKING_THREADS][3];
     for (uint16_t i = 0; i < NUM_REDUCTION_WORKING_THREADS; i++) {
-        sums[i][0] = sum_a0_idx;
-        sums[i][1] = sum_a8_idx;
-        sums[i][2] = i + 1;
-        pthread_create(thread_id + i, NULL, generate_candidates_worker_thread, sums[i]);
+        sums1[i][0] = sum_a0_idx;
+        sums1[i][1] = sum_a8_idx;
+        sums1[i][2] = i + 1;
+        pthread_create(thread_id + i, NULL, generate_candidates_worker_thread, sums1[i]);
     }
 
     // wait for threads to terminate:
@@ -2045,7 +2044,6 @@ static void generate_candidates(uint8_t sum_a0_idx, uint8_t sum_a8_idx) {
     hardnested_print_progress(num_acquired_nonces, "Apply Sum(a8) and all bytes bitflip properties", nonces[best_first_bytes[0]].expected_num_brute_force, 0);
 }
 
-
 static void free_candidates_memory(statelist_t *sl) {
     if (sl == NULL)
         return;
@@ -2054,7 +2052,6 @@ static void free_candidates_memory(statelist_t *sl) {
     free(sl);
 }
 
-
 static void pre_XOR_nonces(void) {
     // prepare acquired nonces for faster brute forcing.
 
@@ -2085,56 +2082,51 @@ static uint16_t SumProperty(struct Crypto1State *s) {
     return (sum_odd * (16 - sum_even) + (16 - sum_odd) * sum_even);
 }
 
-
 static void Tests() {
-    if (known_target_key != -1) {
-        for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
-            uint32_t *bitset = nonces[best_first_bytes[0]].states_bitarray[odd_even];
-            if (!test_bit24(bitset, test_state[odd_even])) {
-                PrintAndLogEx(NORMAL, "\nBUG: known target key's %s state is not member of first nonce byte's (0x%02x) states_bitarray!\n",
-                              odd_even == EVEN_STATE ? "even" : "odd ",
-                              best_first_bytes[0]);
-            }
+    
+    if (known_target_key == -1)
+        return;
+    
+    for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
+        uint32_t *bitset = nonces[best_first_bytes[0]].states_bitarray[odd_even];
+        if (!test_bit24(bitset, test_state[odd_even])) {
+            PrintAndLogEx(NORMAL, "\nBUG: known target key's %s state is not member of first nonce byte's (0x%02x) states_bitarray!\n",
+                          odd_even == EVEN_STATE ? "even" : "odd ",
+                          best_first_bytes[0]);
         }
     }
-
-    if (known_target_key != -1) {
-        for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
-            uint32_t *bitset = all_bitflips_bitarray[odd_even];
-            if (!test_bit24(bitset, test_state[odd_even])) {
-                PrintAndLogEx(NORMAL, "\nBUG: known target key's %s state is not member of all_bitflips_bitarray!\n",
-                              odd_even == EVEN_STATE ? "even" : "odd ");
-            }
+    for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
+        uint32_t *bitset = all_bitflips_bitarray[odd_even];
+        if (!test_bit24(bitset, test_state[odd_even])) {
+            PrintAndLogEx(NORMAL, "\nBUG: known target key's %s state is not member of all_bitflips_bitarray!\n",
+                          odd_even == EVEN_STATE ? "even" : "odd ");
         }
     }
 }
 
-
 static void Tests2(void) {
-    if (known_target_key != -1) {
-        for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
-            uint32_t *bitset = nonces[best_first_byte_smallest_bitarray].states_bitarray[odd_even];
-            if (!test_bit24(bitset, test_state[odd_even])) {
-                PrintAndLogEx(NORMAL, "\nBUG: known target key's %s state is not member of first nonce byte's (0x%02x) states_bitarray!\n",
-                              odd_even == EVEN_STATE ? "even" : "odd ",
-                              best_first_byte_smallest_bitarray);
-            }
+    
+    if (known_target_key == -1)
+        return;
+    
+    for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
+        uint32_t *bitset = nonces[best_first_byte_smallest_bitarray].states_bitarray[odd_even];
+        if (!test_bit24(bitset, test_state[odd_even])) {
+            PrintAndLogEx(NORMAL, "\nBUG: known target key's %s state is not member of first nonce byte's (0x%02x) states_bitarray!\n",
+                          odd_even == EVEN_STATE ? "even" : "odd ",
+                          best_first_byte_smallest_bitarray);
         }
     }
-
-    if (known_target_key != -1) {
-        for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
-            uint32_t *bitset = all_bitflips_bitarray[odd_even];
-            if (!test_bit24(bitset, test_state[odd_even])) {
-                PrintAndLogEx(NORMAL, "\nBUG: known target key's %s state is not member of all_bitflips_bitarray!\n",
-                              odd_even == EVEN_STATE ? "even" : "odd ");
-            }
+    
+    for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
+        uint32_t *bitset = all_bitflips_bitarray[odd_even];
+        if (!test_bit24(bitset, test_state[odd_even])) {
+            PrintAndLogEx(NORMAL, "\nBUG: known target key's %s state is not member of all_bitflips_bitarray!\n",
+                          odd_even == EVEN_STATE ? "even" : "odd ");
         }
     }
-
 }
 
-
 static uint16_t real_sum_a8 = 0;
 
 static void set_test_state(uint8_t byte) {
@@ -2147,7 +2139,6 @@ static void set_test_state(uint8_t byte) {
     crypto1_destroy(pcs);
 }
 
-
 int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t *trgkey, bool nonce_file_read, bool nonce_file_write, bool slow, int tests, uint64_t *foundkey, char *filename) {
     char progress_text[80];
     char instr_set[12] = {0};
@@ -2175,6 +2166,7 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc
             hardnested_print_progress(0, progress_text, (float)(1LL << 47), 0);
             sprintf(progress_text, "Starting Test #%" PRIu32 " ...", i + 1);
             hardnested_print_progress(0, progress_text, (float)(1LL << 47), 0);
+            
             if (trgkey != NULL) {
                 known_target_key = bytes_to_num(trgkey, 6);
             } else {
@@ -2256,9 +2248,18 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc
                 }
             }
 #ifdef DEBUG_KEY_ELIMINATION
-            fprintf(fstats, "%1.1f;%1.0f;%d;%s\n", log(num_keys_tested) / log(2.0), (float)num_keys_tested / brute_force_per_second, key_found, failstr);
+            fprintf(fstats, "%1.1f;%1.0f;%c;%s\n",
+                log(num_keys_tested) / log(2.0),
+                (float)num_keys_tested / brute_force_per_second,
+                key_found ? 'Y' : 'N',
+                failstr
+                );
 #else
-            fprintf(fstats, "%1.0f;%d\n", log(num_keys_tested) / log(2.0), (float)num_keys_tested / brute_force_per_second, key_found);
+            fprintf(fstats, "%1.0f;%d\n",
+                log(num_keys_tested) / log(2.0),
+                (float)num_keys_tested / brute_force_per_second,
+                key_found
+                );
 #endif
 
             free_nonces_memory();
@@ -2303,7 +2304,6 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc
                 free_bitarray(all_bitflips_bitarray[EVEN_STATE]);
                 free_sum_bitarrays();
                 free_part_sum_bitarrays();
-
                 return is_OK;
             }
         }
@@ -2372,7 +2372,6 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc
                     // and calculate new expected number of brute forces
                     update_expected_brute_force(best_first_bytes[0]);
                 }
-
             }
         }
 
@@ -2382,6 +2381,5 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc
         free_sum_bitarrays();
         free_part_sum_bitarrays();
     }
-
     return 0;
 }

From 55cbedc600dcac11174237d36183518338172338 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 8 Apr 2019 09:24:31 +0200
Subject: [PATCH 1093/1938] styles

---
 client/cmdsmartcard.c | 32 +++++++++++++-------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index a930d3be5..6d99dc98c 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -195,7 +195,7 @@ static int PrintATR(uint8_t *atr, size_t atrlen) {
 
     uint8_t T0 = atr[1];
     uint8_t K = T0 & 0x0F;
-    uint8_t TD1 = 0, T1len = 0, TD1len = 0, TDilen = 0;
+    uint8_t T1len = 0, TD1len = 0, TDilen = 0;
     bool protocol_T0_present = true;
     bool protocol_T15_present = false;
 
@@ -215,7 +215,7 @@ static int PrintATR(uint8_t *atr, size_t atrlen) {
     }
 
     if (T0 & 0x80) {
-        TD1 = atr[2 + T1len];
+        uint8_t TD1 = atr[2 + T1len];
         PrintAndLog("\t- TD1 (First offered transmission protocol, presence of TA2..TD2) [ 0x%02x ] Protocol T%d", TD1, TD1 & 0x0f);
         protocol_T0_present = false;
         if ((TD1 & 0x0f) == 0) {
@@ -659,9 +659,7 @@ int CmdSmartUpgrade(const char *Cmd) {
     }
 
     size_t firmware_size = fread(dump, 1, fsize, f);
-    if (f) {
-        fclose(f);
-    }
+    fclose(f);
 
     // load sha512 file
     f = fopen(sha512filename, "rb");
@@ -694,24 +692,23 @@ int CmdSmartUpgrade(const char *Cmd) {
     size_t bytes_read = fread(hashstring, 1, 128, f);
     hashstring[128] = '\0';
 
-    if (f)
-        fclose(f);
+    fclose(f);
 
-    uint8_t hash1[64];
-    if (bytes_read != 128 || param_gethex(hashstring, 0, hash1, 128)) {
+    uint8_t hash_1[64];
+    if (bytes_read != 128 || param_gethex(hashstring, 0, hash_1, 128)) {
         PrintAndLogEx(FAILED, "Couldn't read SHA-512 file");
         free(dump);
         return 1;
     }
 
-    uint8_t hash2[64];
-    if (sha512hash(dump, firmware_size, hash2)) {
+    uint8_t hash_2[64];
+    if (sha512hash(dump, firmware_size, hash_2)) {
         PrintAndLogEx(FAILED, "Couldn't calculate SHA-512 of firmware");
         free(dump);
         return 1;
     }
 
-    if (memcmp(hash1, hash2, 64)) {
+    if (memcmp(hash_1, hash_2, 64)) {
         PrintAndLogEx(FAILED, "Couldn't verify integrity of firmware file " _RED_("(wrong SHA-512 hash)"));
         free(dump);
         return 1;
@@ -951,7 +948,6 @@ static void smart_brute_prim() {
     if (!buf)
         return;
 
-    int len = 0;
     uint8_t get_card_data[] = {
         0x80, 0xCA, 0x9F, 0x13, 0x00,
         0x80, 0xCA, 0x9F, 0x17, 0x00,
@@ -959,27 +955,25 @@ static void smart_brute_prim() {
         0x80, 0xCA, 0x9F, 0x4f, 0x00
     };
 
-    UsbCommand c = {CMD_SMART_RAW, {SC_RAW_T0, 5, 0}};
-
     PrintAndLogEx(INFO, "Reading primitives");
 
+    UsbCommand c = {CMD_SMART_RAW, {SC_RAW_T0, 5, 0}};
+
     for (int i = 0; i < sizeof(get_card_data); i += 5) {
 
         memcpy(c.d.asBytes, get_card_data + i, 5);
         clearCommandBuffer();
         SendCommand(&c);
 
-        len = smart_responseEx(buf, true);
+        int len = smart_responseEx(buf, true);
 
         if (len > 2) {
-
             // if ( decodeTLV ) {
             // if (!TLVPrintFromBuffer(buf, len-2)) {
             PrintAndLogEx(SUCCESS, "\tHEX  %d |: %s", len, sprint_hex(buf, len));
             // }
             // }
         }
-        len = 0;
     }
     free(buf);
 }
@@ -990,7 +984,7 @@ static int smart_brute_sfi(bool decodeTLV) {
     if (!buf)
         return 1;
 
-    int len = 0;
+    int len;
     // READ RECORD
     uint8_t READ_RECORD[] = {0x00, 0xB2, 0x00, 0x00, 0x00};
     UsbCommand c = {CMD_SMART_RAW, {SC_RAW_T0, sizeof(READ_RECORD), 0}};

From eadc9808356b024b88244804c7bbefd0064a145c Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 8 Apr 2019 09:26:39 +0200
Subject: [PATCH 1094/1938] unshadow

---
 client/cmdlfti.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/client/cmdlfti.c b/client/cmdlfti.c
index dcf63125c..db87a2d14 100644
--- a/client/cmdlfti.c
+++ b/client/cmdlfti.c
@@ -138,7 +138,6 @@ int CmdTIDemod(const char *Cmd) {
     // look for 17 low bits followed by 6 highs (common pattern for ro and rw tags)
     int max = 0, maxPos = 0;
     for (i = 0; i < 6000; i++) {
-        int j;
         int dec = 0;
         // searching 17 consecutive lows
         for (j = 0; j < 17 * lowLen; j++) {
@@ -177,9 +176,7 @@ int CmdTIDemod(const char *Cmd) {
     uint32_t shift3 = 0x7e000000, shift2 = 0, shift1 = 0, shift0 = 0;
 
     for (i = 0; i < ARRAYLEN(bits) - 1; i++) {
-        int high = 0;
-        int low = 0;
-        int j;
+        int high = 0, low = 0;
         for (j = 0; j < lowLen; j++) {
             low -= GraphBuffer[maxPos + j];
         }

From 854536b155d675db14e6fc80cda96b850c9f8a79 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 8 Apr 2019 09:39:05 +0200
Subject: [PATCH 1095/1938] unshadow

---
 client/cmdhfmfu.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index 45c67bcb3..ea4b1b49b 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -1413,10 +1413,10 @@ int CmdHF14AMfURdBl(const char *Cmd) {
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         uint8_t isOK = resp.arg[0] & 0xff;
         if (isOK) {
-            uint8_t *data = resp.d.asBytes;
+            uint8_t *d = resp.d.asBytes;
             PrintAndLogEx(NORMAL, "\nBlock#  | Data        | Ascii");
             PrintAndLogEx(NORMAL, "-----------------------------");
-            PrintAndLogEx(NORMAL, "%02d/0x%02X | %s| %s\n", blockNo, blockNo, sprint_hex(data, 4), sprint_ascii(data, 4));
+            PrintAndLogEx(NORMAL, "%02d/0x%02X | %s| %s\n", blockNo, blockNo, sprint_hex(d, 4), sprint_ascii(d, 4));
         } else {
             PrintAndLogEx(WARNING, "Failed reading block: (%02x)", isOK);
         }
@@ -1769,7 +1769,6 @@ int CmdHF14AMfUDump(const char *Cmd) {
     memset(data, 0x00, sizeof(data));
 
     bool hasAuthKey = false;
-    int i = 0;
     int pages = 16;
     uint8_t dataLen = 0;
     uint8_t cmdp = 0;
@@ -1864,8 +1863,9 @@ int CmdHF14AMfUDump(const char *Cmd) {
         PrintAndLogEx(WARNING, "Command execute time-out");
         return 1;
     }
+    
     if (resp.arg[0] != 1) {
-        PrintAndLogEx(WARNING, "Failed reading block: (%02x)", i);
+        PrintAndLogEx(WARNING, "Failed dumping card");
         return 1;
     }
 
@@ -1919,9 +1919,9 @@ int CmdHF14AMfUDump(const char *Cmd) {
             ul_select(&card);
 
         ulev1_getVersion(get_version, sizeof(get_version));
-        for (uint8_t i = 0; i < 3; ++i) {
-            ulev1_readTearing(i, get_tearing + i, 1);
-            ulev1_readCounter(i, get_counter, sizeof(get_counter));
+        for (uint8_t n = 0; n < 3; ++n) {
+            ulev1_readTearing(n, get_tearing + n, 1);
+            ulev1_readCounter(n, get_counter, sizeof(get_counter));
         }
 
         DropField();

From 2fc54ca66718966125b841f4d7063bfd151a50dd Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 8 Apr 2019 09:42:27 +0200
Subject: [PATCH 1096/1938] unshadow clock..  the mysterious variable

---
 client/cmdlfem4x.c    | 18 +++++++++---------
 client/cmdlfguard.c   |  4 ++--
 client/cmdsmartcard.c | 10 +++++-----
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index e9998269d..c51124c76 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -438,19 +438,19 @@ int CmdEM410xSim(const char *Cmd) {
     uint8_t uid[5] = {0x00};
 
     /* clock is 64 in EM410x tags */
-    uint8_t clock = 64;
+    uint8_t clock1 = 64;
 
     if (param_gethex(Cmd, 0, uid, 10)) {
         PrintAndLogEx(FAILED, "UID must include 10 HEX symbols");
         return 0;
     }
 
-    param_getdec(Cmd, 1, &clock);
+    param_getdec(Cmd, 1, &clock1);
 
-    PrintAndLogEx(SUCCESS, "Starting simulating UID %02X%02X%02X%02X%02X  clock: %d", uid[0], uid[1], uid[2], uid[3], uid[4], clock);
+    PrintAndLogEx(SUCCESS, "Starting simulating UID %02X%02X%02X%02X%02X  clock: %d", uid[0], uid[1], uid[2], uid[3], uid[4], clock1);
     PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation");
 
-    ConstructEM410xEmulGraph(Cmd, clock);
+    ConstructEM410xEmulGraph(Cmd, clock1);
 
     CmdLFSim("0"); //240 start_gap.
     return 0;
@@ -465,7 +465,7 @@ int CmdEM410xBrute(const char *Cmd) {
     uint8_t *uidBlock = NULL, *p = NULL;
     uint8_t uid[5] = {0x00};
     /* clock is 64 in EM410x tags */
-    uint8_t clock = 64;
+    uint8_t clock1 = 64;
     /* default pause time: 1 second */
     uint32_t delay = 1000;
 
@@ -475,9 +475,9 @@ int CmdEM410xBrute(const char *Cmd) {
     cmdp = tolower(param_getchar(Cmd, 1));
     if (cmdp == 'd') {
         delay = param_get32ex(Cmd, 2, 1000, 10);
-        param_getdec(Cmd, 4, &clock);
+        param_getdec(Cmd, 4, &clock1);
     } else if (cmdp == 'c') {
-        param_getdec(Cmd, 2, &clock);
+        param_getdec(Cmd, 2, &clock1);
         delay = param_get32ex(Cmd, 4, 1000, 10);
     }
 
@@ -554,9 +554,9 @@ int CmdEM410xBrute(const char *Cmd) {
         }
 
         sprintf(testuid, "%010" PRIX64, bytes_to_num(uidBlock + 5 * c, 5));
-        PrintAndLogEx(NORMAL, "Bruteforce %d / %d: simulating UID  %s, clock %d", c + 1, uidcnt, testuid, clock);
+        PrintAndLogEx(NORMAL, "Bruteforce %d / %d: simulating UID  %s, clock %d", c + 1, uidcnt, testuid, clock1);
 
-        ConstructEM410xEmulGraph(testuid, clock);
+        ConstructEM410xEmulGraph(testuid, clock1);
 
         CmdLFSim("0"); //240 start_gap.
 
diff --git a/client/cmdlfguard.c b/client/cmdlfguard.c
index 1f89a87ef..e4776935e 100644
--- a/client/cmdlfguard.c
+++ b/client/cmdlfguard.c
@@ -312,7 +312,7 @@ int CmdGuardClone(const char *Cmd) {
 int CmdGuardSim(const char *Cmd) {
 
     // Guard uses:  clk: 64, invert: 0, encoding: 2 (ASK Biphase)
-    uint8_t clock = 64, encoding = 2, separator = 0, invert = 0;
+    uint8_t clock1 = 64, encoding = 2, separator = 0, invert = 0;
     uint32_t facilitycode = 0, cardnumber = 0, fc = 0, cn = 0, fmtlen = 0;
 
     char cmdp = param_getchar(Cmd, 0);
@@ -336,7 +336,7 @@ int CmdGuardSim(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "Simulating Guardall - Facility Code: %u, CardNumber: %u", facilitycode, cardnumber);
 
     uint64_t arg1, arg2;
-    arg1 = (clock << 8) | encoding;
+    arg1 = (clock1 << 8) | encoding;
     arg2 = (invert << 8) | separator;
 
     UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};
diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index 6d99dc98c..56352b2fd 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -884,14 +884,14 @@ int CmdSmartReader(const char *Cmd) {
 int CmdSmartSetClock(const char *Cmd) {
     uint8_t cmdp = 0;
     bool errors = false;
-    uint8_t clock = 0;
+    uint8_t clock1 = 0;
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
             case 'h':
                 return usage_sm_setclock();
             case 'c':
-                clock = param_get8ex(Cmd, cmdp + 1, 2, 10);
-                if (clock > 2)
+                clock1 = param_get8ex(Cmd, cmdp + 1, 2, 10);
+                if (clock1 > 2)
                     errors = true;
 
                 cmdp += 2;
@@ -906,7 +906,7 @@ int CmdSmartSetClock(const char *Cmd) {
     //Validations
     if (errors || cmdp == 0) return usage_sm_setclock();
 
-    UsbCommand c = {CMD_SMART_SETCLOCK, {clock, 0, 0}};
+    UsbCommand c = {CMD_SMART_SETCLOCK, {clock1, 0, 0}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
@@ -921,7 +921,7 @@ int CmdSmartSetClock(const char *Cmd) {
         return 1;
     }
 
-    switch (clock) {
+    switch (clock1) {
         case 0:
             PrintAndLogEx(SUCCESS, "Clock changed to 16mhz giving 10800 baudrate");
             break;

From 1833ad5616a3262e7b79ec853d1a606808300044 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 8 Apr 2019 09:46:12 +0200
Subject: [PATCH 1097/1938] unshadow

---
 armsrc/iclass.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/armsrc/iclass.c b/armsrc/iclass.c
index fd07a5916..eb7226bb8 100644
--- a/armsrc/iclass.c
+++ b/armsrc/iclass.c
@@ -877,7 +877,7 @@ void RAMFUNC SniffIClass(void) {
     // time ZERO, the point from which it all is calculated.
     time_0 = GetCountSspClk();
 
-    int div = 0;
+    int divi = 0;
     uint8_t tag_byte = 0, foo = 0;
     // loop and listen
     // every sample (1byte in data),
@@ -903,10 +903,10 @@ void RAMFUNC SniffIClass(void) {
         if (*data & 0xF) {
             //tag_byte <<= 1;
             tag_byte ^= (1 << 4);
-            foo ^= (1 << (3 - div));
+            foo ^= (1 << (3 - divi));
             Dbprintf(" %d|%x == %d|%x", tag_byte, tag_byte, foo, foo);
         }
-        div++;
+        divi++;
 
         // every odd sample
         if (sniffCounter & 0x01) {
@@ -961,7 +961,7 @@ void RAMFUNC SniffIClass(void) {
             }
             tag_byte = 0;
             foo = 0;
-            div = 0;
+            divi = 0;
         }
     } // end main loop
 

From 4b12b2cdf356473370450063e8e8ba13387aed59 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 8 Apr 2019 09:47:20 +0200
Subject: [PATCH 1098/1938] unshadow

---
 armsrc/desfire_crypto.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/armsrc/desfire_crypto.c b/armsrc/desfire_crypto.c
index 111db131c..e29d46492 100644
--- a/armsrc/desfire_crypto.c
+++ b/armsrc/desfire_crypto.c
@@ -441,7 +441,7 @@ void *mifare_cryto_postprocess_data(desfiretag_t tag, void *data, size_t *nbytes
             }
 
             do {
-                uint16_t crc16 = 0x00;
+                uint16_t crc_16 = 0x00;
                 uint32_t crc;
                 switch (DESFIRE(tag)->authentication_scheme) {
                     case AS_LEGACY:
@@ -450,7 +450,7 @@ void *mifare_cryto_postprocess_data(desfiretag_t tag, void *data, size_t *nbytes
                         //
 
 
-                        crc = crc16;
+                        crc = crc_16;
                         break;
                     case AS_NEW:
                         end_crc_pos = crc_pos + 4;

From e1d56b5f941bc94ce0b352d56f98f7838604626c Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 8 Apr 2019 09:50:06 +0200
Subject: [PATCH 1099/1938] unshadow

---
 client/cmddata.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/client/cmddata.c b/client/cmddata.c
index f413a77ef..886144109 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -970,26 +970,26 @@ int CmdDetectClockRate(const char *Cmd) {
     if (strlen(Cmd) > 6 || strlen(Cmd) == 0 || cmdp == 'h')
         return usage_data_detectclock();
 
-    int clock = 0;
+    int clock1 = 0;
     switch (cmdp) {
         case 'a' :
-            clock = GetAskClock(Cmd + 1, true);
+            clock1 = GetAskClock(Cmd + 1, true);
             break;
         case 'f' :
-            clock = GetFskClock("", true);
+            clock1 = GetFskClock("", true);
             break;
         case 'n' :
-            clock = GetNrzClock("", true);
+            clock1 = GetNrzClock("", true);
             break;
         case 'p' :
-            clock = GetPskClock("", true);
+            clock1 = GetPskClock("", true);
             break;
         default :
             PrintAndLogEx(NORMAL, "Please specify a valid modulation to detect the clock of - see option h for help");
             break;
     }
     RepaintGraphWindow();
-    return clock;
+    return clock1;
 }
 
 char *GetFSKType(uint8_t fchigh, uint8_t fclow, uint8_t invert) {
@@ -1047,9 +1047,8 @@ int FSKrawDemod(const char *Cmd, bool verbose) {
     if (BitLen == 0) return 0;
 
     //get field clock lengths
-    uint16_t fcs = 0;
     if (!fchigh || !fclow) {
-        fcs = countFC(bits, BitLen, true);
+        uint16_t fcs = countFC(bits, BitLen, true);
         if (!fcs) {
             fchigh = 10;
             fclow = 8;

From dcb83d2962311d81042142cd2267ea4150551f04 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 8 Apr 2019 10:01:57 +0200
Subject: [PATCH 1100/1938] styles

---
 client/cmdlft55xx.c | 34 ++++++++++++++--------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 835df18f2..c5bd33af0 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -240,15 +240,13 @@ void printT5xxHeader(uint8_t page) {
 
 int CmdT55xxSetConfig(const char *Cmd) {
 
-    uint8_t offset = 0;
+    uint8_t offset = 0, bitRate = 0;
     char modulation[6] = {0x00};
-    char tmp = 0x00;
-    uint8_t bitRate = 0;
     uint8_t rates[9] = {8, 16, 32, 40, 50, 64, 100, 128, 0};
     uint8_t cmdp = 0;
     bool errors = false;
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-        tmp = tolower(param_getchar(Cmd, cmdp));
+        char tmp = tolower(param_getchar(Cmd, cmdp));
         switch (tmp) {
             case 'h':
                 return usage_t55xx_config();
@@ -861,9 +859,9 @@ int convertQ5bitRate(uint8_t bitRateRead) {
 bool testQ5(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk) {
 
     if (DemodBufferLen < 64) return false;
-    uint8_t si = 0;
+
     for (uint8_t idx = 28; idx < 64; idx++) {
-        si = idx;
+        uint8_t si = idx;
         if (PackBits(si, 28, DemodBuffer) == 0x00) continue;
 
         uint8_t safer     = PackBits(si, 4, DemodBuffer);
@@ -962,7 +960,7 @@ bool test(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk, bool *Q5)
 }
 
 int special(const char *Cmd) {
-    uint32_t blockData = 0;
+
     uint8_t bits[32] = {0x00};
 
     PrintAndLogEx(NORMAL, "OFFSET | DATA  | BINARY                              | ASCII");
@@ -973,7 +971,7 @@ int special(const char *Cmd) {
         for (i = 0; i < 32; ++i)
             bits[i] = DemodBuffer[j + i];
 
-        blockData = PackBits(0, 32, bits);
+        uint32_t blockData = PackBits(0, 32, bits);
 
         PrintAndLogEx(NORMAL, "%02d | 0x%08X | %s", j, blockData, sprint_bin(bits, 32));
     }
@@ -1098,13 +1096,12 @@ int CmdT55xxReadTrace(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) > 1 || cmdp == 'h') return usage_t55xx_trace();
 
-    bool pwdmode = false;
-    uint32_t password = 0;
-
     if (strlen(Cmd) == 0) {
         // sanity check.
         if (!SanityOfflineCheck(false)) return 1;
 
+        bool pwdmode = false;
+        uint32_t password = 0;
         if (!AquireData(T55x7_PAGE1, T55x7_TRACE_BLOCK1, pwdmode, password))
             return 1;
     }
@@ -1171,7 +1168,6 @@ int CmdT55xxReadTrace(const char *Cmd) {
         si += 5;
         data.dw    <<= 4;
         data.dw     |= PackBits(si, 4,  DemodBuffer);
-        si += 5;
 
         printT5555Trace(data, repeat);
 
@@ -1342,13 +1338,9 @@ int CmdT55xxInfo(const char *Cmd) {
         Normal mode
         Extended mode
     */
-    bool pwdmode = false;
-    bool frombuff = false;
-    bool gotdata = false;
-    bool dataasq5 = false;
-    uint32_t password = 0;
-    uint32_t block0 = 0;
+    bool frombuff = false, gotdata = false, dataasq5 = false;
     uint8_t cmdp = 0;
+    uint32_t block0 = 0;
 
     while (param_getchar(Cmd, cmdp) != 0x00) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
@@ -1383,6 +1375,8 @@ int CmdT55xxInfo(const char *Cmd) {
         // sanity check.
         if (!SanityOfflineCheck(false)) return 1;
 
+        bool pwdmode = false;
+        uint32_t password = 0;
         if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, pwdmode, password))
             return 1;
     }
@@ -2288,10 +2282,10 @@ int CmdT55xxSetDeviceConfig(const char *Cmd) {
     //Validations
     if (errors || cmdp == 0) return usage_lf_deviceconfig();
 
-    t55xx_config config = { startgap * 8, writegap * 8, write0 * 8, write1 * 8, readgap * 8 };
+    t55xx_config conf = { startgap * 8, writegap * 8, write0 * 8, write1 * 8, readgap * 8 };
 
     UsbCommand c = {CMD_SET_LF_T55XX_CONFIG, {shall_persist, 0, 0} };
-    memcpy(c.d.asBytes, &config, sizeof(t55xx_config));
+    memcpy(c.d.asBytes, &conf, sizeof(t55xx_config));
     clearCommandBuffer();
     SendCommand(&c);
     return 0;

From 5e1c5f72e12fdab06b32f8e565bd724f2753badb Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 8 Apr 2019 10:10:48 +0200
Subject: [PATCH 1101/1938] styles

---
 client/cmdlfpyramid.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c
index 0be39300f..92e7809b2 100644
--- a/client/cmdlfpyramid.c
+++ b/client/cmdlfpyramid.c
@@ -210,9 +210,7 @@ int CmdPyramidDemod(const char *Cmd) {
     }
 
     uint8_t fmtLen = size - j - 8;
-    uint32_t fc = 0;
-    uint32_t cardnum = 0;
-    uint32_t code1 = 0;
+    uint32_t fc, cardnum, code1;
 
     if (fmtLen == 26) {
         fc = bytebits_to_byte(bits + 73, 8);
@@ -224,11 +222,13 @@ int CmdPyramidDemod(const char *Cmd) {
         fc = bytebits_to_byte(bits + 53, 10);
         cardnum = bytebits_to_byte(bits + 63, 32);
         PrintAndLogEx(SUCCESS, "Pyramid ID Found - BitLength: %d, FC: %d, Card: %d - Raw: %08x%08x%08x%08x", fmtLen, fc, cardnum, rawHi3, rawHi2, rawHi, rawLo);
+/*        
     } else if (fmtLen > 32) {
         cardnum = bytebits_to_byte(bits + 81, 16);
         //code1 = bytebits_to_byte(bits+(size-fmtLen),fmtLen-32);
         //code2 = bytebits_to_byte(bits+(size-32),32);
         PrintAndLogEx(SUCCESS, "Pyramid ID Found - BitLength: %d -unknown BitLength- (%d), Raw: %08x%08x%08x%08x", fmtLen, cardnum, rawHi3, rawHi2, rawHi, rawLo);
+        */
     } else {
         cardnum = bytebits_to_byte(bits + 81, 16);
         //code1 = bytebits_to_byte(bits+(size-fmtLen),fmtLen);

From a1d9b574fdda5d887d4cc218d9b32cbc90179735 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 8 Apr 2019 10:11:57 +0200
Subject: [PATCH 1102/1938] style

---
 client/cmdtrace.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdtrace.c b/client/cmdtrace.c
index 78e382854..bb98e6919 100644
--- a/client/cmdtrace.c
+++ b/client/cmdtrace.c
@@ -64,7 +64,7 @@ bool is_last_record(uint16_t tracepos, uint8_t *trace, uint16_t traceLen) {
 
 bool next_record_is_response(uint16_t tracepos, uint8_t *trace) {
     uint16_t next_records_datalen = *((uint16_t *)(trace + tracepos + sizeof(uint32_t) + sizeof(uint16_t)));
-    return (next_records_datalen & 0x8000);
+    return ((next_records_datalen & 0x8000) == 0x8000);
 }
 
 bool merge_topaz_reader_frames(uint32_t timestamp, uint32_t *duration, uint16_t *tracepos, uint16_t traceLen,

From 7f0b1eacd12a579e3221680387727f1ca689ee4b Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 8 Apr 2019 10:13:15 +0200
Subject: [PATCH 1103/1938] unshadow

---
 client/comms.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/comms.c b/client/comms.c
index 9ffa37977..70da8fe9d 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -225,7 +225,7 @@ __attribute__((force_align_arg_pointer))
 #endif
 #endif
 *uart_communication(void *targ) {
-    communication_arg_t *conn = (communication_arg_t *)targ;
+    communication_arg_t *connection = (communication_arg_t *)targ;
     size_t rxlen, totallen = 0;
     UsbCommand rx;
     UsbCommand *prx = &rx;
@@ -236,7 +236,7 @@ __attribute__((force_align_arg_pointer))
     disableAppNap("Proxmark3 polling UART");
 #endif
 
-    while (conn->run) {
+    while (connection->run) {
         rxlen = 0;
         bool ACK_received = false;
 
@@ -263,7 +263,7 @@ __attribute__((force_align_arg_pointer))
 
         pthread_mutex_lock(&txBufferMutex);
 
-        if (conn->block_after_ACK) {
+        if (connection->block_after_ACK) {
             // if we just received an ACK, wait here until a new command is to be transmitted
             if (ACK_received) {
                 while (!txBuffer_pending) {

From 91e34643ab20ab285a19851455e0395d659e5768 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 8 Apr 2019 10:14:22 +0200
Subject: [PATCH 1104/1938] unshadow

---
 client/emv/dump.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/client/emv/dump.c b/client/emv/dump.c
index 0614cab36..24f30ca03 100644
--- a/client/emv/dump.c
+++ b/client/emv/dump.c
@@ -19,8 +19,7 @@
 
 #include "dump.h"
 
-
-#define PRINT_INDENT(level) {for (int i = 0; i < (level); i++) fprintf(f, "   ");}
+#define PRINT_INDENT(level) {for (int myi = 0; myi < (level); myi++) fprintf(f, "   ");}
 
 void dump_buffer_simple(const unsigned char *ptr, size_t len, FILE *f) {
     int i;
@@ -54,4 +53,3 @@ void dump_buffer(const unsigned char *ptr, size_t len, FILE *f, int level) {
         fprintf(f, "\n");
     }
 }
-

From 21d88ae2c2c22ee2ad4cf6769819354482b3f99a Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 8 Apr 2019 10:16:57 +0200
Subject: [PATCH 1105/1938] unshadow, multiple defines.

---
 client/emv/dump.c     | 4 +++-
 client/emv/emv_tags.c | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/client/emv/dump.c b/client/emv/dump.c
index 24f30ca03..edf60d34d 100644
--- a/client/emv/dump.c
+++ b/client/emv/dump.c
@@ -19,7 +19,9 @@
 
 #include "dump.h"
 
-#define PRINT_INDENT(level) {for (int myi = 0; myi < (level); myi++) fprintf(f, "   ");}
+#ifndef PRINT_INDENT
+# define PRINT_INDENT(level) {for (int myi = 0; myi < (level); myi++) fprintf(f, "   ");}
+#endif
 
 void dump_buffer_simple(const unsigned char *ptr, size_t len, FILE *f) {
     int i;
diff --git a/client/emv/emv_tags.c b/client/emv/emv_tags.c
index dc6503f4b..f51442183 100644
--- a/client/emv/emv_tags.c
+++ b/client/emv/emv_tags.c
@@ -23,7 +23,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#define PRINT_INDENT(level) {for (int i = 0; i < (level); i++) fprintf(f, "   ");}
+#ifndef PRINT_INDENT
+# define PRINT_INDENT(level) {for (int myi = 0; myi < (level); myi++) fprintf(f, "   ");}
+#endif
 
 enum emv_tag_t {
     EMV_TAG_GENERIC,

From ebe98723d438f717c81535fc545f211dc040816a Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 8 Apr 2019 10:17:08 +0200
Subject: [PATCH 1106/1938] unshadow

---
 client/crypto/asn1dump.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/crypto/asn1dump.c b/client/crypto/asn1dump.c
index c55244286..a4b491a84 100644
--- a/client/crypto/asn1dump.c
+++ b/client/crypto/asn1dump.c
@@ -25,7 +25,7 @@
 #include "proxmark3.h"
 
 #ifndef PRINT_INDENT
-# define PRINT_INDENT(level) {for (int i = 0; i < (level); i++) fprintf(f, "   ");}
+# define PRINT_INDENT(level) {for (int myi = 0; myi < (level); myi++) fprintf(f, "   ");}
 #endif
 
 enum asn1_tag_t {

From 2b3e5b7aac6a5c50ad8046abcf98b202e1d60d99 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 8 Apr 2019 10:19:01 +0200
Subject: [PATCH 1107/1938] style

---
 client/emv/tlv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/emv/tlv.c b/client/emv/tlv.c
index 346bdbe4f..f3961c7a6 100644
--- a/client/emv/tlv.c
+++ b/client/emv/tlv.c
@@ -508,7 +508,7 @@ unsigned char *tlv_encode(const struct tlv *tlv, size_t *len) {
 }
 
 bool tlv_is_constructed(const struct tlv *tlv) {
-    return (tlv->tag < 0x100 ? tlv->tag : tlv->tag >> 8) & TLV_TAG_COMPLEX;
+    return (((tlv->tag < 0x100 ? tlv->tag : tlv->tag >> 8) & TLV_TAG_COMPLEX) == TLV_TAG_COMPLEX);
 }
 
 bool tlv_equal(const struct tlv *a, const struct tlv *b) {

From 29d73046cc8aafe6981c48633be394c9199ed363 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 8 Apr 2019 10:21:28 +0200
Subject: [PATCH 1108/1938] unshadow clock,  the mysterious one

---
 client/graph.c | 54 ++++++++++++++++++++++++++------------------------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/client/graph.c b/client/graph.c
index 1557efb7d..4d77ef2b3 100644
--- a/client/graph.c
+++ b/client/graph.c
@@ -101,9 +101,9 @@ int GetAskClock(const char *str, bool printAns) {
     if (getSignalProperties()->isnoise)
         return false;
 
-    int clock = param_get32ex(str, 0, 0, 10);
-    if (clock > 0)
-        return clock;
+    int clock1 = param_get32ex(str, 0, 0, 10);
+    if (clock1 > 0)
+        return clock1;
 
     // Auto-detect clock
     uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
@@ -114,20 +114,20 @@ int GetAskClock(const char *str, bool printAns) {
     }
 
     size_t ststart = 0, stend = 0;
-    bool st = DetectST(bits, &size, &clock, &ststart, &stend);
+    bool st = DetectST(bits, &size, &clock1, &ststart, &stend);
     int idx = stend;
     if (st == false) {
-        idx = DetectASKClock(bits, size, &clock, 20);
+        idx = DetectASKClock(bits, size, &clock1, 20);
     }
 
-    if (clock > 0) {
-        setClockGrid(clock, idx);
+    if (clock1 > 0) {
+        setClockGrid(clock1, idx);
     }
     // Only print this message if we're not looping something
     if (printAns || g_debugMode)
-        PrintAndLogEx(SUCCESS, "Auto-detected clock rate: %d, Best Starting Position: %d", clock, idx);
+        PrintAndLogEx(SUCCESS, "Auto-detected clock rate: %d, Best Starting Position: %d", clock1, idx);
 
-    return clock;
+    return clock1;
 }
 
 uint8_t GetPskCarrier(const char *str, bool printAns) {
@@ -156,9 +156,9 @@ int GetPskClock(const char *str, bool printAns) {
     if (getSignalProperties()->isnoise)
         return -1;
 
-    int clock = param_get32ex(str, 0, 0, 10);
-    if (clock != 0)
-        return clock;
+    int clock1 = param_get32ex(str, 0, 0, 10);
+    if (clock1 != 0)
+        return clock1;
 
     // Auto-detect clock
     uint8_t grph[MAX_GRAPH_TRACE_LEN] = {0};
@@ -169,12 +169,13 @@ int GetPskClock(const char *str, bool printAns) {
     }
     size_t firstPhaseShiftLoc = 0;
     uint8_t curPhase = 0, fc = 0;
-    clock = DetectPSKClock(grph, size, 0, &firstPhaseShiftLoc, &curPhase, &fc);
-    setClockGrid(clock, firstPhaseShiftLoc);
+    clock1 = DetectPSKClock(grph, size, 0, &firstPhaseShiftLoc, &curPhase, &fc);
+    setClockGrid(clock1, firstPhaseShiftLoc);
     // Only print this message if we're not looping something
     if (printAns)
-        PrintAndLogEx(SUCCESS, "Auto-detected clock rate: %d", clock);
-    return clock;
+        PrintAndLogEx(SUCCESS, "Auto-detected clock rate: %d", clock1);
+    
+    return clock1;
 }
 
 int GetNrzClock(const char *str, bool printAns) {
@@ -182,9 +183,9 @@ int GetNrzClock(const char *str, bool printAns) {
     if (getSignalProperties()->isnoise)
         return -1;
 
-    int clock = param_get32ex(str, 0, 0, 10);
-    if (clock != 0)
-        return clock;
+    int clock1 = param_get32ex(str, 0, 0, 10);
+    if (clock1 != 0)
+        return clock1;
 
     // Auto-detect clock
     uint8_t grph[MAX_GRAPH_TRACE_LEN] = {0};
@@ -194,20 +195,21 @@ int GetNrzClock(const char *str, bool printAns) {
         return -1;
     }
     size_t clkStartIdx = 0;
-    clock = DetectNRZClock(grph, size, 0, &clkStartIdx);
-    setClockGrid(clock, clkStartIdx);
+    clock1 = DetectNRZClock(grph, size, 0, &clkStartIdx);
+    setClockGrid(clock1, clkStartIdx);
     // Only print this message if we're not looping something
     if (printAns)
-        PrintAndLogEx(SUCCESS, "Auto-detected clock rate: %d", clock);
-    return clock;
+        PrintAndLogEx(SUCCESS, "Auto-detected clock rate: %d", clock1);
+    
+    return clock1;
 }
 //by marshmellow
 //attempt to detect the field clock and bit clock for FSK
 int GetFskClock(const char *str, bool printAns) {
 
-    int clock = param_get32ex(str, 0, 0, 10);
-    if (clock != 0)
-        return clock;
+    int clock1 = param_get32ex(str, 0, 0, 10);
+    if (clock1 != 0)
+        return clock1;
 
     uint8_t fc1 = 0, fc2 = 0, rf1 = 0;
     int firstClockEdge = 0;

From 0b6dce336373344a2d9e7b8043c2331a510011f0 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 8 Apr 2019 10:30:20 +0200
Subject: [PATCH 1109/1938] styles

---
 client/cmddata.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/client/cmddata.c b/client/cmddata.c
index 886144109..b00de9adb 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -916,7 +916,7 @@ int CmdUndec(const char *Cmd) {
 //by marshmellow
 //shift graph zero up or down based on input + or -
 int CmdGraphShiftZero(const char *Cmd) {
-    int shift = 0, shiftedVal = 0;
+    int shift = 0, shiftedVal;
     //set options from parameters entered with the command
     sscanf(Cmd, "%i", &shift);
 
@@ -1579,12 +1579,13 @@ int CmdTuneSamples(const char *Cmd) {
 
     // graph LF measurements
     // even here, these values has 3% error.
-    uint16_t test = 0;
+    uint16_t test1 = 0;
     for (int i = 0; i < 256; i++) {
         GraphBuffer[i] = resp.d.asBytes[i] - 128;
-        test += resp.d.asBytes[i];
+        test1 += resp.d.asBytes[i];
     }
-    if (test > 0) {
+    
+    if (test1 > 0) {
         PrintAndLogEx(SUCCESS, "\nDisplaying LF tuning graph. Divisor 89 is 134khz, 95 is 125khz.\n\n");
         GraphTraceLen = 256;
         ShowGraphWindow();

From 0e05faaf0ccd7755237b0864f6852379735e5dec Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 8 Apr 2019 10:33:06 +0200
Subject: [PATCH 1110/1938] styles

---
 client/cmdlfem4x.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index c51124c76..188e2f507 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -256,7 +256,7 @@ void printEM410x(uint32_t hi, uint64_t id) {
 
     uint64_t n = 1;
     uint64_t id2lo = 0;
-    uint8_t m, i = 0;
+    uint8_t m, i;
     for (m = 5; m > 0; m--) {
         for (i = 0; i < 8; i++) {
             id2lo = (id2lo << 1LL) | ((id & (n << (i + ((m - 1) * 8)))) >> (i + ((m - 1) * 8)));
@@ -611,9 +611,9 @@ int CmdEM410xWrite(const char *Cmd) {
 
     uint64_t id = 0xFFFFFFFFFFFFFFFF; // invalid id value
     int card = 0xFF; // invalid card value
-    uint32_t clock = 0; // invalid clock value
+    uint32_t clock1 = 0; // invalid clock value
 
-    sscanf(Cmd, "%" SCNx64 " %d %d", &id, &card, &clock);
+    sscanf(Cmd, "%" SCNx64 " %d %d", &id, &card, &clock1);
 
     // Check ID
     if (id == 0xFFFFFFFFFFFFFFFF) {
@@ -636,25 +636,25 @@ int CmdEM410xWrite(const char *Cmd) {
     }
 
     // Check Clock
-    if (clock == 0)
-        clock = 64;
+    if (clock1 == 0)
+        clock1 = 64;
 
     // Allowed clock rates: 16, 32, 40 and 64
-    if ((clock != 16) && (clock != 32) && (clock != 64) && (clock != 40)) {
-        PrintAndLogEx(WARNING, "Error! Clock rate %d not valid. Supported clock rates are 16, 32, 40 and 64.\n", clock);
+    if ((clock1 != 16) && (clock1 != 32) && (clock1 != 64) && (clock1 != 40)) {
+        PrintAndLogEx(WARNING, "Error! Clock rate %d not valid. Supported clock rates are 16, 32, 40 and 64.\n", clock1);
         return 0;
     }
 
     if (card == 1) {
-        PrintAndLogEx(SUCCESS, "Writing %s tag with UID 0x%010" PRIx64 " (clock rate: %d)", "T55x7", id, clock);
+        PrintAndLogEx(SUCCESS, "Writing %s tag with UID 0x%010" PRIx64 " (clock rate: %d)", "T55x7", id, clock1);
         // NOTE: We really should pass the clock in as a separate argument, but to
         //   provide for backwards-compatibility for older firmware, and to avoid
         //   having to add another argument to CMD_EM410X_WRITE_TAG, we just store
         //   the clock rate in bits 8-15 of the card value
-        card = (card & 0xFF) | ((clock << 8) & 0xFF00);
+        card = (card & 0xFF) | ((clock1 << 8) & 0xFF00);
     } else if (card == 0) {
-        PrintAndLogEx(SUCCESS, "Writing %s tag with UID 0x%010" PRIx64, "T5555", id, clock);
-        card = (card & 0xFF) | ((clock << 8) & 0xFF00);
+        PrintAndLogEx(SUCCESS, "Writing %s tag with UID 0x%010" PRIx64, "T5555", id, clock1);
+        card = (card & 0xFF) | ((clock1 << 8) & 0xFF00);
     } else {
         PrintAndLogEx(FAILED, "Error! Bad card type selected.\n");
         return 0;

From 4843726d7e8d2f74fe82481dccec5849deec0440 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 8 Apr 2019 10:36:58 +0200
Subject: [PATCH 1111/1938] unshadow bs_ones, bs_zeros

---
 client/hardnested/hardnested_bf_core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/hardnested/hardnested_bf_core.c b/client/hardnested/hardnested_bf_core.c
index 0771ef16e..c180b353a 100644
--- a/client/hardnested/hardnested_bf_core.c
+++ b/client/hardnested/hardnested_bf_core.c
@@ -229,9 +229,9 @@ const uint64_t CRACK_STATES_BITSLICED(uint32_t cuid, uint8_t *best_first_bytes,
 #endif
 
     // constant ones/zeroes
-    bitslice_t bs_ones;
+//    bitslice_t bs_ones;
     memset(bs_ones.bytes, 0xff, VECTOR_SIZE);
-    bitslice_t bs_zeroes;
+//    bitslice_t bs_zeroes;
     memset(bs_zeroes.bytes, 0x00, VECTOR_SIZE);
 
     // bitslice all the even states

From b7b7db8ca4fade5297efb7766d7e79c51ca79e34 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 8 Apr 2019 10:45:55 +0200
Subject: [PATCH 1112/1938] unshadow crc16

---
 client/cmdlffdx.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/cmdlffdx.c b/client/cmdlffdx.c
index 46dd0c8ca..4fdaf133a 100644
--- a/client/cmdlffdx.c
+++ b/client/cmdlffdx.c
@@ -202,7 +202,7 @@ int CmdFDXBdemodBI(const char *Cmd) {
     uint8_t dataBlockBit = bs[48];
     uint32_t reservedCode = bytebits_to_byteLSBF(bs + 49, 14);
     uint8_t animalBit = bs[63];
-    uint32_t crc16 = bytebits_to_byteLSBF(bs + 64, 16);
+    uint32_t crc_16 = bytebits_to_byteLSBF(bs + 64, 16);
     uint32_t extended = bytebits_to_byteLSBF(bs + 80, 24);
 
     uint64_t rawid = ((uint64_t)bytebits_to_byte(bs, 32) << 32) | bytebits_to_byte(bs + 32, 32);
@@ -219,7 +219,7 @@ int CmdFDXBdemodBI(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "Reserved/RFU:      %u", reservedCode);
     PrintAndLogEx(SUCCESS, "Animal Tag:        %s", animalBit ? _YELLOW_("True") : "False");
     PrintAndLogEx(SUCCESS, "Has extended data: %s [0x%X]", dataBlockBit ? _YELLOW_("True") : "False", extended);
-    PrintAndLogEx(SUCCESS, "CRC:           0x%04X - [%04X] - %s", crc16, calcCrc, (calcCrc == crc16) ? _GREEN_("Passed") : "Failed");
+    PrintAndLogEx(SUCCESS, "CRC:           0x%04X - [%04X] - %s", crc_16, calcCrc, (calcCrc == crc_16) ? _GREEN_("Passed") : "Failed");
 
     if (g_debugMode) {
         PrintAndLogEx(DEBUG, "Start marker %d;   Size %d", preambleIndex, size);
@@ -271,7 +271,7 @@ int CmdFdxDemod(const char *Cmd) {
     uint8_t dataBlockBit = DemodBuffer[48];
     uint32_t reservedCode = bytebits_to_byteLSBF(DemodBuffer + 49, 14);
     uint8_t animalBit = DemodBuffer[63];
-    uint32_t crc16 = bytebits_to_byteLSBF(DemodBuffer + 64, 16);
+    uint32_t crc_16 = bytebits_to_byteLSBF(DemodBuffer + 64, 16);
     uint32_t extended = bytebits_to_byteLSBF(DemodBuffer + 80, 24);
     uint64_t rawid = (uint64_t)(bytebits_to_byte(DemodBuffer, 32)) << 32 | bytebits_to_byte(DemodBuffer + 32, 32);
     uint8_t raw[8];
@@ -287,7 +287,7 @@ int CmdFdxDemod(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "Reserved/RFU       %u (0x04%X)", reservedCode,  reservedCode);
     PrintAndLogEx(SUCCESS, "Animal Tag         %s", animalBit ? _YELLOW_("True") : "False");
     PrintAndLogEx(SUCCESS, "Has extended data  %s [0x%X]", dataBlockBit ? _YELLOW_("True") : "False", extended);
-    PrintAndLogEx(SUCCESS, "CRC-16             0x%04X - 0x%04X [%s]", crc16, calcCrc, (calcCrc == crc16) ? _GREEN_("Ok") : "Failed");
+    PrintAndLogEx(SUCCESS, "CRC-16             0x%04X - 0x%04X [%s]", crc_16, calcCrc, (calcCrc == crc_16) ? _GREEN_("Ok") : "Failed");
 
     if (g_debugMode) {
         PrintAndLogEx(DEBUG, "Start marker %d;   Size %d", preambleIndex, size);

From 5585290981654b7028f48b4c565d89240496ecbf Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 8 Apr 2019 11:40:52 +0200
Subject: [PATCH 1113/1938] fix: dereference

---
 armsrc/string.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/armsrc/string.c b/armsrc/string.c
index fe53bf5f4..e8caff26e 100644
--- a/armsrc/string.c
+++ b/armsrc/string.c
@@ -49,12 +49,10 @@ void memxor(uint8_t *dest, uint8_t *src, size_t len) {
 }
 
 int strlen(const char *str) {
-    int l = 0;
-    while (*str) {
-        l++;
-        str++;
+    const char *p;
+    for (p = str; *p != '\0'; ++p) {
     }
-    return l;
+    return p-str;
 }
 
 char *strncat(char *dest, const char *src, unsigned int n) {

From cfe793bd22dc84c899d80f63ea45350fae42c11e Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 8 Apr 2019 12:29:49 +0200
Subject: [PATCH 1114/1938] pointers

---
 client/emv/emv_pk.c | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/client/emv/emv_pk.c b/client/emv/emv_pk.c
index 9b5f2e714..7b8cdd233 100644
--- a/client/emv/emv_pk.c
+++ b/client/emv/emv_pk.c
@@ -43,7 +43,7 @@
 static ssize_t emv_pk_read_bin(char *buf, unsigned char *bin, size_t size, size_t *read) {
     size_t left = size;
     char *p = buf;
-    while (*p && *p == ' ')
+    while (*p != 0 && *p == ' ')
         p++;
 
     while (left > 0) {
@@ -70,7 +70,7 @@ static ssize_t emv_pk_read_bin(char *buf, unsigned char *bin, size_t size, size_
             return -(p - buf);
     }
 
-    while (*p && *p == ' ')
+    while (*p != 0 && *p == ' ')
         p++;
 
     p--;
@@ -85,7 +85,7 @@ static ssize_t emv_pk_read_ymv(char *buf, unsigned *ymv) {
 
     *ymv = 0;
 
-    while (*p && *p == ' ')
+    while (*p != 0 && *p == ' ')
         p++;
 
     for (i = 0; i < 3; i++) {
@@ -101,7 +101,7 @@ static ssize_t emv_pk_read_ymv(char *buf, unsigned *ymv) {
         temp[i] = (c1 * 16 + c2);
     }
 
-    while (*p && *p == ' ')
+    while (*p != 0 && *p == ' ')
         p++;
 
     p--;
@@ -116,7 +116,7 @@ static ssize_t emv_pk_read_ymv(char *buf, unsigned *ymv) {
 
 static ssize_t emv_pk_read_string(char *buf, char *str, size_t size) {
     char *p = buf;
-    while (*p && *p == ' ')
+    while (*p != 0 && *p == ' ')
         p++;
 
     while (size > 1) {
@@ -132,7 +132,7 @@ static ssize_t emv_pk_read_string(char *buf, char *str, size_t size) {
 
     *str = 0;
 
-    while (*p && *p == ' ')
+    while (*p != 0 && *p == ' ')
         p++;
 
     p--;
@@ -471,15 +471,14 @@ struct emv_pk *emv_pk_get_ca_pk(const unsigned char *rid, unsigned char idx) {
             }
         }
     */
-    if (!pk) {
-        const char *relfname = "emv/capk.txt";
+    const char *relfname = "emv/capk.txt";
 
-        char fname[strlen(get_my_executable_directory()) + strlen(relfname) + 1];
-        strcpy(fname, get_my_executable_directory());
-        strcat(fname, relfname);
+    char fname[strlen(get_my_executable_directory()) + strlen(relfname) + 1];
+    strcpy(fname, get_my_executable_directory());
+    strcat(fname, relfname);
+
+    pk = emv_pk_get_ca_pk_from_file(fname, rid, idx);
 
-        pk = emv_pk_get_ca_pk_from_file(fname, rid, idx);
-    }
     if (!pk)
         return NULL;
 
@@ -491,14 +490,13 @@ struct emv_pk *emv_pk_get_ca_pk(const unsigned char *rid, unsigned char idx) {
            pk->rid[4],
            pk->index,
            pk->mlen * 8);
+
     if (emv_pk_verify(pk)) {
         printf("OK\n");
-
         return pk;
     }
 
     printf("Failed!\n");
     emv_pk_free(pk);
-
     return NULL;
 }

From cd85c57e116cf00ef55733fd9f6763d3f0d32358 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 8 Apr 2019 12:38:32 +0200
Subject: [PATCH 1115/1938] style

---
 client/hid-flasher/flash.c | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/client/hid-flasher/flash.c b/client/hid-flasher/flash.c
index 967888e17..6c7f037b9 100644
--- a/client/hid-flasher/flash.c
+++ b/client/hid-flasher/flash.c
@@ -47,7 +47,7 @@ static int build_segs_from_phdrs(flash_file_t *ctx, FILE *fd, Elf32_Phdr *phdrs,
     ctx->num_segs = 0;
     seg = ctx->segments;
 
-    fprintf(stderr, "Loading usable ELF segments:\n");
+    fprintf(stdout, "Loading usable ELF segments:\n");
     for (int i = 0; i < num_phdrs; i++) {
         if (le32(phdr->p_type) != PT_LOAD) {
             phdr++;
@@ -63,11 +63,11 @@ static int build_segs_from_phdrs(flash_file_t *ctx, FILE *fd, Elf32_Phdr *phdrs,
             phdr++;
             continue;
         }
-        fprintf(stderr, "%d: V 0x%08x P 0x%08x (0x%08x->0x%08x) [%c%c%c] @0x%x\n",
+        fprintf(stdout, "%d: V 0x%08x P 0x%08x (0x%08x->0x%08x) [%c%c%c] @0x%x\n",
                 i, vaddr, paddr, filesz, memsz,
-                flags & PF_R ? 'R' : ' ',
-                flags & PF_W ? 'W' : ' ',
-                flags & PF_X ? 'X' : ' ',
+                (flags & PF_R) ? 'R' : ' ',
+                (flags & PF_W) ? 'W' : ' ',
+                (flags & PF_X) ? 'X' : ' ',
                 offset);
         if (filesz != memsz) {
             fprintf(stderr, "Error: PHDR file size does not equal memory size\n"
@@ -91,7 +91,7 @@ static int build_segs_from_phdrs(flash_file_t *ctx, FILE *fd, Elf32_Phdr *phdrs,
         // make extra space if we need to move the data forward
         data = calloc(filesz + BLOCK_SIZE, sizeof(uint8_t));
         if (!data) {
-            fprintf(stderr, "Out of memory\n");
+            fprintf(stderr, "Error: Out of memory\n");
             return -1;
         }
         if (fseek(fd, offset, SEEK_SET) < 0 || fread(data, 1, filesz, fd) != filesz) {
@@ -114,7 +114,7 @@ static int build_segs_from_phdrs(flash_file_t *ctx, FILE *fd, Elf32_Phdr *phdrs,
                     uint32_t hole = this_offset - prev_seg->length;
                     uint8_t *new_data = calloc(new_length, sizeof(uint8_t));
                     if (!new_data) {
-                        fprintf(stderr, "Out of memory\n");
+                        fprintf(stderr, "Error: Out of memory\n");
                         free(data);
                         return -1;
                     }
@@ -405,7 +405,7 @@ static int write_block(uint32_t address, uint8_t *data, uint32_t length) {
 
 // Write a file's segments to Flash
 int flash_write(flash_file_t *ctx) {
-    fprintf(stderr, "Writing segments for file: %s\n", ctx->filename);
+    fprintf(stdout, "Writing segments for file: %s\n", ctx->filename);
     for (int i = 0; i < ctx->num_segs; i++) {
         flash_seg_t *seg = &ctx->segments[i];
 
@@ -413,9 +413,8 @@ int flash_write(flash_file_t *ctx) {
         uint32_t blocks = (length + BLOCK_SIZE - 1) / BLOCK_SIZE;
         uint32_t end = seg->start + length;
 
-        fprintf(stderr, " 0x%08x..0x%08x [0x%x / %u blocks]",
-                seg->start, end - 1, length, blocks);
-
+        fprintf(stdout, " 0x%08x..0x%08x [0x%x / %u blocks]", seg->start, end - 1, length, blocks);
+        fflush(stdout);
         int block = 0;
         uint8_t *data = seg->data;
         uint32_t baddr = seg->start;
@@ -435,10 +434,11 @@ int flash_write(flash_file_t *ctx) {
             baddr += block_size;
             length -= block_size;
             block++;
-            fprintf(stderr, ".");
+            fprintf(stdout, ".");
             fflush(stdout);
         }
         fprintf(stderr, " OK\n");
+        fflush(stdout);
     }
     return 0;
 }
@@ -460,5 +460,6 @@ void flash_free(flash_file_t *ctx) {
 int flash_stop_flashing(void) {
     UsbCommand c = {CMD_HARDWARE_RESET};
     SendCommand(&c);
+    msleep(100);
     return 0;
 }

From 493a26b93a1f585e7a4a8074395ed97031bcbcc6 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 8 Apr 2019 12:47:34 +0200
Subject: [PATCH 1116/1938] updated

---
 client/whereami.c | 11 +++++------
 client/whereami.h |  4 +++-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/client/whereami.c b/client/whereami.c
index 9ecfd2870..a18d2d2f7 100644
--- a/client/whereami.c
+++ b/client/whereami.c
@@ -1,15 +1,14 @@
-// (‑●‑●)> released under the WTFPL v2 license, by Gregory Pakosz (@gpakosz)
+// (‑●‑●)> dual licensed under the WTFPL v2 and MIT licenses
+//   without any warranty.
+//   by Gregory Pakosz (@gpakosz)
 // https://github.com/gpakosz/whereami
 
-// in case you want to #include "whereami.c" in a larger compilation unit
-#if !defined(WHEREAMI_H)
-#include <whereami.h>
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#include <whereami.h>
+
 #if defined(__linux__)
 // make realpath() available:
 #define _DEFAULT_SOURCE
diff --git a/client/whereami.h b/client/whereami.h
index 6610a2ff4..0e0c2b588 100644
--- a/client/whereami.h
+++ b/client/whereami.h
@@ -1,4 +1,6 @@
-// (‑●‑●)> released under the WTFPL v2 license, by Gregory Pakosz (@gpakosz)
+// (‑●‑●)> dual licensed under the WTFPL v2 and MIT licenses
+//   without any warranty.
+//   by Gregory Pakosz (@gpakosz)
 // https://github.com/gpakosz/whereami
 
 #ifndef WHEREAMI_H

From 98d84058305ec6bfbce02b04ed22d5f579820054 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 8 Apr 2019 12:58:26 +0200
Subject: [PATCH 1117/1938] wrong includes

---
 client/cmdhfmfdes.c     | 16 ----------------
 client/cmdhfmfdes.h     | 15 +++++++++++++++
 client/cmdhfmfdesfire.c |  5 +----
 client/cmdhfmfdesfire.h |  9 +++++++++
 4 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/client/cmdhfmfdes.c b/client/cmdhfmfdes.c
index 3de3c6a4a..e0c4245bc 100644
--- a/client/cmdhfmfdes.c
+++ b/client/cmdhfmfdes.c
@@ -7,23 +7,7 @@
 //-----------------------------------------------------------------------------
 // High frequency MIFARE Desfire commands
 //-----------------------------------------------------------------------------
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include "des.h"
-#include "cmdmain.h"
-#include "proxmark3.h"
-#include "../include/common.h"
-#include "../include/mifare.h"
-#include "iso14443crc.h"
-#include "ui.h"
-#include "cmdparser.h"
-#include "util.h"
 #include "cmdhfmfdes.h"
-#include "cmdhf14a.h"
-
 
 uint8_t CMDPOS = 0;
 uint8_t LENPOS = 1;
diff --git a/client/cmdhfmfdes.h b/client/cmdhfmfdes.h
index 6f2f0fa3f..774a2f3e3 100644
--- a/client/cmdhfmfdes.h
+++ b/client/cmdhfmfdes.h
@@ -10,6 +10,21 @@
 #ifndef __MFDESFIRE_H
 #define __MFDESFIRE_H
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include "cmdmain.h"
+#include "proxmark3.h"
+#include "../include/common.h"
+#include "../include/mifare.h"
+#include "iso14443crc.h"
+#include "ui.h"
+#include "cmdparser.h"
+#include "util.h"
+#include "cmdhf14a.h"
+#include "mbedtls/des.h"
+
 int CmdHFMFDes(const char *Cmd);
 int CmdHF14ADesAuth(const char *Cmd);
 int CmdHF14ADesRb(const char *Cmd);
diff --git a/client/cmdhfmfdesfire.c b/client/cmdhfmfdesfire.c
index 78c0bf3b3..cb8259da1 100644
--- a/client/cmdhfmfdesfire.c
+++ b/client/cmdhfmfdesfire.c
@@ -8,10 +8,7 @@
 // High frequency MIFARE commands
 //-----------------------------------------------------------------------------
 
-#include "cmdhfmf.h"
-#include "util.h"
-#include <openssl/des.h>
-#include <openssl/aes.h>
+#include "cmdhfmfdesfire.h"
 
 static int CmdHelp(const char *Cmd);
 
diff --git a/client/cmdhfmfdesfire.h b/client/cmdhfmfdesfire.h
index 46737c684..6ba79c5a2 100644
--- a/client/cmdhfmfdesfire.h
+++ b/client/cmdhfmfdesfire.h
@@ -1,4 +1,13 @@
+#ifndef __MFDESFIRE_AD_H
+#define __MFDESFIRE_AD_H
+
+#include "cmdhfmf.h"
+#include "util.h"
+#include "mbedtls/des.h"
+#include "mbedtls/aes.h"
 
 int CmdHF14AMfDESAuth(const char *Cmd);
 int CmdHFMFDesfire(const char *Cmd);
 int CmdHelp(const char *Cmd);
+
+#endif
\ No newline at end of file

From 726e02b900106e2f365bcdfa02dfe22f2d5c31bd Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 8 Apr 2019 14:22:04 +0200
Subject: [PATCH 1118/1938] color

---
 client/flash.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/flash.c b/client/flash.c
index defcd7feb..f2c802bcf 100644
--- a/client/flash.c
+++ b/client/flash.c
@@ -192,7 +192,7 @@ int flash_load(flash_file_t *ctx, const char *name, int can_write_bl) {
         goto fail;
     }
 
-    fprintf(stdout, _BLUE_("Loading ELF file") "%s\n", name);
+    fprintf(stdout, _BLUE_("Loading ELF file") _YELLOV_("%s") "\n", name);
 
     if (fread(&ehdr, sizeof(ehdr), 1, fd) != 1) {
         fprintf(stderr, "Error while reading ELF file header\n");

From 678293913c84428d6fcdd6aa2563f9b0bf6bdd9c Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 8 Apr 2019 14:22:50 +0200
Subject: [PATCH 1119/1938] ccc

---
 client/flash.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/flash.c b/client/flash.c
index f2c802bcf..627404ad9 100644
--- a/client/flash.c
+++ b/client/flash.c
@@ -192,7 +192,7 @@ int flash_load(flash_file_t *ctx, const char *name, int can_write_bl) {
         goto fail;
     }
 
-    fprintf(stdout, _BLUE_("Loading ELF file") _YELLOV_("%s") "\n", name);
+    fprintf(stdout, _BLUE_("Loading ELF file") _YELLOW_("%s") "\n", name);
 
     if (fread(&ehdr, sizeof(ehdr), 1, fd) != 1) {
         fprintf(stderr, "Error while reading ELF file header\n");

From b0d627bae5d04e79f4eed663539d9fd6d8c4e3ea Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 8 Apr 2019 14:41:06 +0200
Subject: [PATCH 1120/1938] check returnvalue

---
 client/cmdlft55xx.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index c5bd33af0..465c99173 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1860,18 +1860,19 @@ int CmdT55xxChkPwds(const char *Cmd) {
         if (resp.arg[0]) {
             PrintAndLogEx(SUCCESS, "\nFound a candidate [ " _YELLOW_("%08X") " ]. Trying to validate", resp.arg[1]);
 
-            AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, resp.arg[1]);
-
-            found = tryDetectModulation();
-            if (found) {
-                PrintAndLogEx(SUCCESS, "Found valid password: [ " _GREEN_("%08") " ]", resp.arg[1]);
+            if (AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, resp.arg[1])) {
+                found = tryDetectModulation();
+                if (found) {
+                    PrintAndLogEx(SUCCESS, "Found valid password: [ " _GREEN_("%08") " ]", resp.arg[1]);
+                } else {
+                    PrintAndLogEx(WARNING, "Check pwd failed");
+                }
             } else {
                 PrintAndLogEx(WARNING, "Check pwd failed");
             }
         } else {
             PrintAndLogEx(WARNING, "Check pwd failed");
         }
-
         goto out;
     }
 

From f13f7f4cbbdd4cffe4a2a85b781723a87fe45a14 Mon Sep 17 00:00:00 2001
From: Eloff <eloff@mail.ru>
Date: Mon, 8 Apr 2019 19:15:15 +0300
Subject: [PATCH 1121/1938] Pull request #145. Next part of changes

---
 armsrc/iso14443a.c |  4 ----
 armsrc/iso14443a.h |  2 --
 armsrc/mifaresim.c | 22 ++++++++++++++++------
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 6db229d0d..a3a94eed6 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -2994,7 +2994,3 @@ void DetectNACKbug() {
     LEDsoff();
     set_tracing(false);
 }
-
-void AppendCrc14443a(uint8_t *data, int len) {
-    compute_crc(CRC_14443_A, data, len, data + len, data + len + 1);
-}
diff --git a/armsrc/iso14443a.h b/armsrc/iso14443a.h
index 1e4de4626..254d8eded 100644
--- a/armsrc/iso14443a.h
+++ b/armsrc/iso14443a.h
@@ -153,8 +153,6 @@ bool EmLogTrace(uint8_t *reader_data, uint16_t reader_len, uint32_t reader_Start
 void ReaderMifare(bool first_try, uint8_t block, uint8_t keytype);
 void DetectNACKbug();
 
-void AppendCrc14443a(uint8_t *data, int len);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/armsrc/mifaresim.c b/armsrc/mifaresim.c
index d4d998a1a..6322a5ae8 100644
--- a/armsrc/mifaresim.c
+++ b/armsrc/mifaresim.c
@@ -435,6 +435,8 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
     uint8_t	mM = 0; //moebius_modifier for collection storage
 
     // Authenticate response - nonce
+    uint8_t rAUTH_NT[4];
+    uint8_t rAUTH_NT_keystream[4];
     uint32_t nonce = 0;
     // = prng_successor(selTimer, 32) ;
 
@@ -509,6 +511,9 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
             crypto1_destroy(pcs);
             cardAUTHKEY = AUTHKEYNONE;
             nonce = prng_successor(selTimer, 32);
+            // prepare NT for nested authentication
+            num_to_bytes(nonce, 4, rAUTH_NT);
+            num_to_bytes(cuid ^ nonce, 4, rAUTH_NT_keystream);
 
             LED_B_OFF();
             LED_C_OFF();
@@ -781,7 +786,8 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
 
                     // received block num -> sector
                     // Example: 6X  [00]
-                    cardAUTHSC = receivedCmd_dec[1] / 4;
+                    // 4K tags have 16 blocks per sector 32..39
+                    cardAUTHSC = MifareBlockToSector(receivedCmd_dec[1]);
 
                     // cardAUTHKEY: 60 => Auth use Key A
                     // cardAUTHKEY: 61 => Auth use Key B
@@ -799,18 +805,22 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                         // Receive Cmd in clear txt
                         // Update crypto state (UID ^ NONCE)
                         crypto1_word(pcs, cuid ^ nonce, 0);
-                        // prepare nonce
-                        num_to_bytes(nonce, 4, rAUTH_AT);
+                        // rAUTH_NT contains prepared nonce for authenticate
+                        EmSendCmd(rAUTH_NT, sizeof(rAUTH_NT));
                         if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] Reader authenticating for block %d (0x%02x) with key %c - nonce: %02X - ciud: %02X", receivedCmd_dec[1], receivedCmd_dec[1], (cardAUTHKEY == 0) ? 'A' : 'B', rAUTH_AT, cuid);
                     } else {
                         // nested authentication
+                        /*
                         ans = nonce ^ crypto1_word(pcs, cuid ^ nonce, 0);
                         num_to_bytes(ans, 4, rAUTH_AT);
+                        */
+                        // rAUTH_NT, rAUTH_NT_keystream contains prepared nonce and keystream for nested authentication
+                        // we need calculate parity bits for non-encrypted sequence
+                        mf_crypto1_encryptEx(pcs, rAUTH_NT, rAUTH_NT_keystream, response, 4, response_par);
+                        EmSendCmdPar(response, 4, response_par);
                         if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] Reader doing nested authentication for block %d (0x%02x) with key %c", receivedCmd_dec[1], receivedCmd_dec[1], (cardAUTHKEY == 0) ? 'A' : 'B');
                     }
 
-
-                    EmSendCmd(rAUTH_AT, sizeof(rAUTH_AT));
                     cardSTATE = MFEMUL_AUTH1;
                     if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] cardSTATE = MFEMUL_AUTH1 - rAUTH_AT: %02X", rAUTH_AT);
                     continue;
@@ -901,7 +911,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                             if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK - IsAccessAllowed] Data block %d (0x%02x) cannot be read", blockNo, blockNo);
                         }
                     }
-                    AppendCrc14443a(response, 16);
+                    AddCrc14A(response, 16);
                     mf_crypto1_encrypt(pcs, response, MAX_MIFARE_FRAME_SIZE, response_par);
                     EmSendCmdPar(response, MAX_MIFARE_FRAME_SIZE, response_par);
                     if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {

From 1fc5fea623cc765e01376626a193436b33eed8b9 Mon Sep 17 00:00:00 2001
From: vratiskol <vincent.ratiskol@github.com>
Date: Mon, 8 Apr 2019 23:48:27 +0200
Subject: [PATCH 1122/1938] Debug level => MF_DBG_EXTENDED

- Add comment
- Debug level MF_DBG_EXTENDED
---
 armsrc/mifaresim.c | 53 +++++++++++++++++++++++-----------------------
 1 file changed, 26 insertions(+), 27 deletions(-)

diff --git a/armsrc/mifaresim.c b/armsrc/mifaresim.c
index d4d998a1a..a4e743406 100644
--- a/armsrc/mifaresim.c
+++ b/armsrc/mifaresim.c
@@ -223,7 +223,7 @@ static void MifareSimInit(uint16_t flags, uint8_t *datain, tag_response_info_t *
                     memcpy(rATQA, rATQA_1k_4B, sizeof rATQA_1k_4B);
                     if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("=> Using rATQA_1k_4B");
                     break;
-                case 2: // Mifare 2L
+                case 2: // Mifare 2K
                     memcpy(rATQA, rATQA_2k_4B, sizeof rATQA_2k_4B);
                     if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("=> Using rATQA_2k_4B");
                     break;
@@ -250,15 +250,15 @@ static void MifareSimInit(uint16_t flags, uint8_t *datain, tag_response_info_t *
                     memcpy(rATQA, rATQA_Mini_7B, sizeof rATQA_Mini_7B);
                     if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("=> Using rATQA_Mini_7B");
                     break;
-                case 1:
+                case 1: // Mifare 1K
                     memcpy(rATQA, rATQA_1k_7B, sizeof rATQA_1k_7B);
                     if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("=> Using rATQA_1k_7B");
                     break;
-                case 2:
+                case 2: // Mifare 2K
                     memcpy(rATQA, rATQA_2k_7B, sizeof rATQA_2k_7B);
                     if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("=> Using rATQA_2k_7B");
                     break;
-                case 4:
+                case 4: // Mifare 4K
                     memcpy(rATQA, rATQA_4k_7B, sizeof rATQA_4k_7B);
                     if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("=> Using rATQA_4k_4B");
                     break;
@@ -284,15 +284,15 @@ static void MifareSimInit(uint16_t flags, uint8_t *datain, tag_response_info_t *
                     memcpy(rATQA, rATQA_Mini_10B, sizeof rATQA_Mini_10B);
                     if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("=> Using rATQA_Mini_10B");
                     break;
-                case 1:
+                case 1: // Mifare 1K
                     memcpy(rATQA, rATQA_1k_10B, sizeof rATQA_1k_10B);
                     if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("=> Using rATQA_1k_10B");
                     break;
-                case 2:
+                case 2: // Mifare 2K
                     memcpy(rATQA, rATQA_2k_10B, sizeof rATQA_2k_10B);
                     if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("=> Using rATQA_2k_10B");
                     break;
-                case 4:
+                case 4: // Mifare 4K
                     memcpy(rATQA, rATQA_4k_10B, sizeof rATQA_4k_10B);
                     if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("=> Using rATQA_4k_10B");
                     break;
@@ -325,11 +325,11 @@ static void MifareSimInit(uint16_t flags, uint8_t *datain, tag_response_info_t *
         { .response = rUIDBCC1,  .response_n = sizeof(rUIDBCC1)  },	  	// Anticollision cascade1 - respond with first part of uid
         { .response = rUIDBCC2,  .response_n = sizeof(rUIDBCC2)  },		  // Anticollision cascade2 - respond with 2nd part of uid
         { .response = rUIDBCC3,  .response_n = sizeof(rUIDBCC3)  },		  // Anticollision cascade3 - respond with 3th part of uid
-        { .response = rSAK_mini, .response_n = sizeof(rSAK_mini) },     //
-        { .response = rSAK_1,    .response_n = sizeof(rSAK_1)    },	    //
-        { .response = rSAK_2,    .response_n = sizeof(rSAK_2)    },	    //
-        { .response = rSAK_4,    .response_n = sizeof(rSAK_4)    },	    //
-        { .response = rSAK1,     .response_n = sizeof(rSAK1)     }		  // Acknowledge select - New another cascades
+        { .response = rSAK_mini, .response_n = sizeof(rSAK_mini) },     // SAK Mifare Mini
+        { .response = rSAK_1,    .response_n = sizeof(rSAK_1)    },	    // SAK Mifare 1K
+        { .response = rSAK_2,    .response_n = sizeof(rSAK_2)    },	    // SAK Mifare 2K
+        { .response = rSAK_4,    .response_n = sizeof(rSAK_4)    },	    // SAK Mifare 4K
+        { .response = rSAK1,     .response_n = sizeof(rSAK1)     }		  // Acknowledge select - Need another cascades
     };
 
     // Prepare ("precompile") the responses of the anticollision phase. There will be not enough time to do this at the moment the reader sends its REQA or SELECT
@@ -436,7 +436,6 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
 
     // Authenticate response - nonce
     uint32_t nonce = 0;
-    // = prng_successor(selTimer, 32) ;
 
     if ((flags & FLAG_MF_MINI) == FLAG_MF_MINI) {
         MifareCardType = 0;
@@ -564,16 +563,16 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                     switch (uid_len) {
                         case 4:
                             switch (MifareCardType) {
-                                case 0:
+                                case 0: // Mifare Mini
                                     EmSendPrecompiledCmd(&responses[SAK_MINI]);
                                     break;
-                                case 1:
+                                case 1: // Mifare 1K
                                     EmSendPrecompiledCmd(&responses[SAK_1]);
                                     break;
-                                case 2:
+                                case 2: // Mifare 2K
                                     EmSendPrecompiledCmd(&responses[SAK_2]);
                                     break;
-                                case 4:
+                                case 4: // Mifare 4K
                                     EmSendPrecompiledCmd(&responses[SAK_4]);
                                     break;
                             }
@@ -643,16 +642,16 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                             if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_SELECT2] SELECT CL2 %02x%02x%02x%02x received", receivedCmd[2], receivedCmd[3], receivedCmd[4], receivedCmd[5]);
 
                             switch (MifareCardType) {
-                                case 0:
+                                case 0: // Mifare Mini
                                     EmSendPrecompiledCmd(&responses[SAK_MINI]);
-                                    break;
-                                case 1:
+                                    break; 
+                                case 1: // Mifare 1K
                                     EmSendPrecompiledCmd(&responses[SAK_1]);
                                     break;
-                                case 2:
+                                case 2: // Mifare 2K
                                     EmSendPrecompiledCmd(&responses[SAK_2]);
                                     break;
-                                case 4:
+                                case 4: // Mifare 4K
                                     EmSendPrecompiledCmd(&responses[SAK_4]);
                                     break;
                             }
@@ -700,16 +699,16 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                          memcmp(&receivedCmd[2], responses[UIDBCC3].response, 4) == 0)) {
 
                     switch (MifareCardType) {
-                        case 0:
+                        case 0: // Mifare Mini
                             EmSendPrecompiledCmd(&responses[SAK_MINI]);
                             break;
-                        case 1:
+                        case 1: // Mifare 1K
                             EmSendPrecompiledCmd(&responses[SAK_1]);
                             break;
-                        case 2:
+                        case 2: // Mifare 2K
                             EmSendPrecompiledCmd(&responses[SAK_2]);
                             break;
-                        case 4:
+                        case 4: // Mifare 4K
                             EmSendPrecompiledCmd(&responses[SAK_4]);
                             break;
                     }
@@ -733,7 +732,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
             // WORK
             case MFEMUL_WORK: {
 
-                if (MF_DBGLEVEL >= 1)	Dbprintf("[MFEMUL_WORK] Enter in case");
+                if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("[MFEMUL_WORK] Enter in case");
 
                 if (receivedCmd_len != 4) {
                     LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);

From a2a1bbb7a10c3f5e24c86785bb8ca6c57493c349 Mon Sep 17 00:00:00 2001
From: vratiskol <vincent.ratiskol@github.com>
Date: Tue, 9 Apr 2019 00:07:06 +0200
Subject: [PATCH 1123/1938] Add message about debug message

---
 armsrc/mifaresim.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/armsrc/mifaresim.c b/armsrc/mifaresim.c
index a4e743406..37836f1ad 100644
--- a/armsrc/mifaresim.c
+++ b/armsrc/mifaresim.c
@@ -15,6 +15,10 @@
 // MF_DBG_ERROR         1
 // MF_DBG_ALL           2
 // MF_DBG_EXTENDED      4
+//
+//  /!\ Printing Debug message is disrupting emulation, 
+//  Only use with caution during debugging 
+
 
 #include "iso14443a.h"
 #include "mifaresim.h"

From be90c76f4771cdd8a9c8f857044408f5a0c6ece0 Mon Sep 17 00:00:00 2001
From: Fl0-0 <tonymontana277@hotmail.fr>
Date: Tue, 9 Apr 2019 09:45:06 +0200
Subject: [PATCH 1124/1938] Fix sizes for GCC 8.2 string truncation warnings

---
 client/cmdhf15.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index 877469fd5..25126f693 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -781,7 +781,7 @@ int CmdHF15Restore(const char *Cmd) {
     char buff[255] = {0x00};
     size_t blocksize = 4;
     uint8_t cmdp = 0;
-    char newCmdPrefix[255] = {0x00}, tmpCmd[255] = {0x00};
+    char newCmdPrefix[FILE_PATH_SIZE + 1] = {0x00}, tmpCmd[FILE_PATH_SIZE + 262] = {0x00};
     char param[FILE_PATH_SIZE] = "";
     char hex[255] = "";
     uint8_t retries = 3, tried = 0, i = 0;

From ac88c435f637fbf82949565a9be6443b4f84f746 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 9 Apr 2019 10:12:15 +0200
Subject: [PATCH 1125/1938] remove old iso14443crc.c,  fully replaced by
 crc16.c functions.

---
 armsrc/iso14443a.h     |  2 +-
 armsrc/mifarecmd.h     |  1 -
 armsrc/mifaredesfire.h |  1 -
 armsrc/mifaresim.c     |  1 -
 armsrc/mifaresim.h     |  4 ++++
 armsrc/mifaresniff.c   |  8 ++++++--
 armsrc/mifaresniff.h   |  1 -
 armsrc/mifareutil.h    |  1 -
 client/cmdanalyse.c    | 20 +++++++++----------
 client/cmdhf14a.h      |  1 -
 client/cmdhf15.c       | 17 +++++++++++-----
 client/cmdhffelica.h   |  1 -
 client/cmdhficlass.h   |  2 +-
 client/cmdhfmf.h       |  1 -
 client/cmdhfmfdes.h    |  1 -
 client/scripting.c     |  2 +-
 common/crc16.c         |  4 ++--
 common/crc16.h         |  4 ++--
 common/iso14443crc.c   | 44 ------------------------------------------
 common/iso14443crc.h   | 19 ------------------
 20 files changed, 39 insertions(+), 96 deletions(-)
 delete mode 100644 common/iso14443crc.c
 delete mode 100644 common/iso14443crc.h

diff --git a/armsrc/iso14443a.h b/armsrc/iso14443a.h
index 254d8eded..ae3491825 100644
--- a/armsrc/iso14443a.h
+++ b/armsrc/iso14443a.h
@@ -104,7 +104,7 @@ typedef struct {
 #endif
 
 #ifndef CheckCrc14A
-# define	CheckCrc14A(data, len)	check_crc(CRC_14443_A, (data), (len))
+# define CheckCrc14A(data, len)	check_crc(CRC_14443_A, (data), (len))
 #endif
 
 void GetParity(const uint8_t *pbtCmd, uint16_t len, uint8_t *par);
diff --git a/armsrc/mifarecmd.h b/armsrc/mifarecmd.h
index 51ed76ca5..5e4a5cf97 100644
--- a/armsrc/mifarecmd.h
+++ b/armsrc/mifarecmd.h
@@ -17,7 +17,6 @@
 #include "apps.h"
 #include "util.h"
 #include "string.h"
-#include "iso14443crc.h"
 #include "iso14443a.h"
 #include "crapto1/crapto1.h"
 #include "mifareutil.h"
diff --git a/armsrc/mifaredesfire.h b/armsrc/mifaredesfire.h
index 40c623ef9..7547dfcb2 100644
--- a/armsrc/mifaredesfire.h
+++ b/armsrc/mifaredesfire.h
@@ -6,7 +6,6 @@
 #include "apps.h"
 #include "string.h"
 #include "BigBuf.h"
-#include "iso14443crc.h"
 #include "iso14443a.h"
 #include "desfire_key.h"
 #include "mifareutil.h"
diff --git a/armsrc/mifaresim.c b/armsrc/mifaresim.c
index c6edeba43..9cfb238f6 100644
--- a/armsrc/mifaresim.c
+++ b/armsrc/mifaresim.c
@@ -22,7 +22,6 @@
 
 #include "iso14443a.h"
 #include "mifaresim.h"
-#include "iso14443crc.h"
 #include "crapto1/crapto1.h"
 #include "BigBuf.h"
 #include "string.h"
diff --git a/armsrc/mifaresim.h b/armsrc/mifaresim.h
index 65eabdf68..cbd5a4108 100644
--- a/armsrc/mifaresim.h
+++ b/armsrc/mifaresim.h
@@ -15,6 +15,10 @@
 
 #include <stdint.h>
 
+#ifndef CheckCrc14A
+# define CheckCrc14A(data, len)	check_crc(CRC_14443_A, (data), (len))
+#endif
+
 void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *datain);
 
 #define AC_DATA_READ             0
diff --git a/armsrc/mifaresniff.c b/armsrc/mifaresniff.c
index 0e75aac35..317d67547 100644
--- a/armsrc/mifaresniff.c
+++ b/armsrc/mifaresniff.c
@@ -10,6 +10,10 @@
 
 #include "mifaresniff.h"
 
+#ifndef CheckCrc14A
+# define CheckCrc14A(data, len)	check_crc(CRC_14443_A, (data), (len))
+#endif
+
 //static int sniffState = SNF_INIT;
 static uint8_t sniffUIDType = 0;
 static uint8_t sniffUID[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
@@ -229,7 +233,7 @@ bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint8_t *parity, ui
 
             if ( !reader ) break;
             if ( len != 9 ) break;
-            if ( !CheckCrc14443(CRC_14443_A, data, 9)) break;
+            if ( !CheckCrc14A(data, 9)) break;
             if ( data[1] != 0x70 ) break;
 
             Dbprintf("[!] UID | %x", data[0]);
@@ -266,7 +270,7 @@ bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint8_t *parity, ui
         }
         case SNF_SAK:{
             // SAK from card?
-            if ((!reader) && (len == 3) && (CheckCrc14443(CRC_14443_A, data, 3))) {
+            if ((!reader) && (len == 3) && (CheckCrc14A(data, 3))) {
                 sniffSAK = data[0];
                 // CL2 UID part to be expected
                 if (( sniffSAK == 0x04) && (sniffUIDType == SNF_UID_4)) {
diff --git a/armsrc/mifaresniff.h b/armsrc/mifaresniff.h
index 9b5cb8609..198d14daf 100644
--- a/armsrc/mifaresniff.h
+++ b/armsrc/mifaresniff.h
@@ -15,7 +15,6 @@
 #include "apps.h"
 #include "util.h"
 #include "string.h"
-#include "iso14443crc.h"
 #include "iso14443a.h"
 #include "crapto1/crapto1.h"
 #include "mifareutil.h"
diff --git a/armsrc/mifareutil.h b/armsrc/mifareutil.h
index 570af2629..38494ceb0 100644
--- a/armsrc/mifareutil.h
+++ b/armsrc/mifareutil.h
@@ -17,7 +17,6 @@
 #include "parity.h"
 #include "util.h"
 #include "string.h"
-#include "iso14443crc.h"
 #include "iso14443a.h"
 #include "crapto1/crapto1.h"
 #include "des.h"
diff --git a/client/cmdanalyse.c b/client/cmdanalyse.c
index 3bd3f08cb..c04ca2a3b 100644
--- a/client/cmdanalyse.c
+++ b/client/cmdanalyse.c
@@ -300,7 +300,7 @@ int CmdAnalyseCRC(const char *Cmd) {
     // ISO14443 crc B
     compute_crc(CRC_14443_B, data, len, &b1, &b2);
     uint16_t crcBB_1 = b1 << 8 | b2;
-    uint16_t bbb = Crc(CRC_14443_B, data, len);
+    uint16_t bbb = Crc16ex(CRC_14443_B, data, len);
     PrintAndLogEx(NORMAL, "ISO14443 crc B  | %04x == %04x \n", crcBB_1, bbb);
 
 
@@ -321,40 +321,40 @@ int CmdAnalyseCRC(const char *Cmd) {
     PrintAndLogEx(NORMAL, "CRC16 based\n\n");
 
     // input from commandline
-    PrintAndLogEx(NORMAL, "CCITT  | %X (29B1 expected)", Crc(CRC_CCITT, dataStr, sizeof(dataStr)));
+    PrintAndLogEx(NORMAL, "CCITT  | %X (29B1 expected)", Crc16ex(CRC_CCITT, dataStr, sizeof(dataStr)));
 
     uint8_t poll[] = {0xb2, 0x4d, 0x12, 0x01, 0x01, 0x2e, 0x3d, 0x17, 0x26, 0x47, 0x80, 0x95, 0x00, 0xf1, 0x00, 0x00, 0x00, 0x01, 0x43, 0x00, 0xb3, 0x7f};
-    PrintAndLogEx(NORMAL, "FeliCa | %04X (B37F expected)", Crc(CRC_FELICA, poll + 2, sizeof(poll) - 4));
-    PrintAndLogEx(NORMAL, "FeliCa | %04X (0000 expected)", Crc(CRC_FELICA, poll + 2, sizeof(poll) - 2));
+    PrintAndLogEx(NORMAL, "FeliCa | %04X (B37F expected)", Crc16ex(CRC_FELICA, poll + 2, sizeof(poll) - 4));
+    PrintAndLogEx(NORMAL, "FeliCa | %04X (0000 expected)", Crc16ex(CRC_FELICA, poll + 2, sizeof(poll) - 2));
 
     uint8_t sel_corr[] = { 0x40, 0xe1, 0xe1, 0xff, 0xfe, 0x5f, 0x02, 0x3c, 0x43, 0x01};
-    PrintAndLogEx(NORMAL, "iCLASS | %04x (0143 expected)", Crc(CRC_ICLASS, sel_corr, sizeof(sel_corr) - 2));
+    PrintAndLogEx(NORMAL, "iCLASS | %04x (0143 expected)", Crc16ex(CRC_ICLASS, sel_corr, sizeof(sel_corr) - 2));
     PrintAndLogEx(NORMAL, "---------------------------------------------------------------\n\n\n");
 
     // ISO14443 crc A
     compute_crc(CRC_14443_A, dataStr, sizeof(dataStr), &b1, &b2);
     uint16_t crcAA = b1 << 8 | b2;
-    PrintAndLogEx(NORMAL, "ISO14443 crc A  | %04x or %04x (BF05 expected)\n", crcAA, Crc(CRC_14443_A, dataStr, sizeof(dataStr)));
+    PrintAndLogEx(NORMAL, "ISO14443 crc A  | %04x or %04x (BF05 expected)\n", crcAA, Crc16ex(CRC_14443_A, dataStr, sizeof(dataStr)));
 
     // ISO14443 crc B
     compute_crc(CRC_14443_B, dataStr, sizeof(dataStr), &b1, &b2);
     uint16_t crcBB = b1 << 8 | b2;
-    PrintAndLogEx(NORMAL, "ISO14443 crc B  | %04x or %04x (906E expected)\n", crcBB, Crc(CRC_14443_B, dataStr, sizeof(dataStr)));
+    PrintAndLogEx(NORMAL, "ISO14443 crc B  | %04x or %04x (906E expected)\n", crcBB, Crc16ex(CRC_14443_B, dataStr, sizeof(dataStr)));
 
     // ISO15693 crc  (x.25)
     compute_crc(CRC_15693, dataStr, sizeof(dataStr), &b1, &b2);
     uint16_t crcCC = b1 << 8 | b2;
-    PrintAndLogEx(NORMAL, "ISO15693 crc X25| %04x or %04x (906E expected)\n", crcCC, Crc(CRC_15693, dataStr, sizeof(dataStr)));
+    PrintAndLogEx(NORMAL, "ISO15693 crc X25| %04x or %04x (906E expected)\n", crcCC, Crc16ex(CRC_15693, dataStr, sizeof(dataStr)));
 
     // ICLASS
     compute_crc(CRC_ICLASS, dataStr, sizeof(dataStr), &b1, &b2);
     uint16_t crcDD = b1 << 8 | b2;
-    PrintAndLogEx(NORMAL, "ICLASS crc      | %04x or %04x\n", crcDD, Crc(CRC_ICLASS, dataStr, sizeof(dataStr)));
+    PrintAndLogEx(NORMAL, "ICLASS crc      | %04x or %04x\n", crcDD, Crc16ex(CRC_ICLASS, dataStr, sizeof(dataStr)));
 
     // FeliCa
     compute_crc(CRC_FELICA, dataStr, sizeof(dataStr), &b1, &b2);
     uint16_t crcEE = b1 << 8 | b2;
-    PrintAndLogEx(NORMAL, "FeliCa          | %04x or %04x (31C3 expected)\n", crcEE, Crc(CRC_FELICA, dataStr, sizeof(dataStr)));
+    PrintAndLogEx(NORMAL, "FeliCa          | %04x or %04x (31C3 expected)\n", crcEE, Crc16ex(CRC_FELICA, dataStr, sizeof(dataStr)));
 
     free(data);
     return 0;
diff --git a/client/cmdhf14a.h b/client/cmdhf14a.h
index e218a398f..263bb7e9f 100644
--- a/client/cmdhf14a.h
+++ b/client/cmdhf14a.h
@@ -24,7 +24,6 @@
 #include "util.h"
 #include "cmdparser.h"
 #include "cmdmain.h"
-#include "iso14443crc.h"
 #include "mifare.h"
 #include "cmdhfmf.h"
 #include "cmdhfmfu.h"
diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index 25126f693..51f7a0654 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -29,12 +29,19 @@
 #define Logic1                  Iso15693Logic1
 #define FrameEOF                Iso15693FrameEOF
 
-#define Crc15(data, len)          Crc(CRC_15693, (data), (len))
-#define CheckCrc15(data, len)     check_crc(CRC_15693, (data), (len))
-#define AddCrc15(data, len)       compute_crc(CRC_15693, (data), (len), (data)+(len), (data)+(len)+1)
-
-#define sprintUID(target, uid)  Iso15693sprintUID((target), (uid))
+#ifndef Crc15
+# define Crc15(data, len)       Crc16ex(CRC_15693, (data), (len))
+#endif
+#ifndef CheckCrc15
+# define CheckCrc15(data, len)  check_crc(CRC_15693, (data), (len))
+#endif
+#ifndef AddCrc15
+#define AddCrc15(data, len)     compute_crc(CRC_15693, (data), (len), (data)+(len), (data)+(len)+1)
+#endif
 
+#ifndef sprintUID
+# define sprintUID(target, uid)  Iso15693sprintUID((target), (uid))
+#endif
 // structure and database for uid -> tagtype lookups
 typedef struct {
     uint64_t uid;
diff --git a/client/cmdhffelica.h b/client/cmdhffelica.h
index 6eeb5b44f..9dfd78b0b 100644
--- a/client/cmdhffelica.h
+++ b/client/cmdhffelica.h
@@ -22,7 +22,6 @@
 #include "util.h"
 #include "cmdparser.h"
 #include "comms.h"      // getfromdevice
-#include "iso14443crc.h"
 #include "cmdhf.h"      // list cmd
 #include "mifare.h"     // felica_card_select_t struct
 
diff --git a/client/cmdhficlass.h b/client/cmdhficlass.h
index 01dfd0076..616a7d312 100644
--- a/client/cmdhficlass.h
+++ b/client/cmdhficlass.h
@@ -15,7 +15,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
-#include "iso14443crc.h" // Can also be used for iClass, using 0xE012 as CRC-type
+//#include "iso14443crc.h" // Can also be used for iClass, using 0xE012 as CRC-type
 #include "proxmark3.h"
 #include "ui.h"
 #include "cmdparser.h"
diff --git a/client/cmdhfmf.h b/client/cmdhfmf.h
index 0e471580b..6de87291f 100644
--- a/client/cmdhfmf.h
+++ b/client/cmdhfmf.h
@@ -18,7 +18,6 @@
 #include <time.h>
 #include <mbedtls/aes.h>
 #include "proxmark3.h"
-#include "iso14443crc.h"
 #include "ui.h"
 #include "cmdparser.h"
 #include "common.h"
diff --git a/client/cmdhfmfdes.h b/client/cmdhfmfdes.h
index 774a2f3e3..dff5294a5 100644
--- a/client/cmdhfmfdes.h
+++ b/client/cmdhfmfdes.h
@@ -18,7 +18,6 @@
 #include "proxmark3.h"
 #include "../include/common.h"
 #include "../include/mifare.h"
-#include "iso14443crc.h"
 #include "ui.h"
 #include "cmdparser.h"
 #include "util.h"
diff --git a/client/scripting.c b/client/scripting.c
index 9c84bbf93..ed692c728 100644
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -467,7 +467,7 @@ static int l_crc16(lua_State *L) {
     size_t size;
     const char *p_str = luaL_checklstring(L, 1, &size);
 
-    uint16_t checksum = Crc(CRC_CCITT, (uint8_t *) p_str, size);
+    uint16_t checksum = Crc16ex(CRC_CCITT, (uint8_t *) p_str, size);
     lua_pushunsigned(L, checksum);
     return 1;
 }
diff --git a/common/crc16.c b/common/crc16.c
index 1396c0fe8..89afdf02c 100644
--- a/common/crc16.c
+++ b/common/crc16.c
@@ -129,7 +129,7 @@ uint16_t update_crc16(uint16_t crc, uint8_t c) {
 }
 
 // two ways.  msb or lsb loop.
-uint16_t crc16(uint8_t const *d, size_t length, uint16_t remainder, uint16_t polynomial, bool refin, bool refout) {
+uint16_t Crc16(uint8_t const *d, size_t length, uint16_t remainder, uint16_t polynomial, bool refin, bool refout) {
     if (length == 0)
         return (~remainder);
 
@@ -191,7 +191,7 @@ void compute_crc(CrcType_t ct, const uint8_t *d, size_t n, uint8_t *first, uint8
     *first = (crc & 0xFF);
     *second = ((crc >> 8) & 0xFF);
 }
-uint16_t Crc(CrcType_t ct, const uint8_t *d, size_t n) {
+uint16_t Crc16ex(CrcType_t ct, const uint8_t *d, size_t n) {
 
     // can't calc a crc on less than 3 byte. (1byte + 2 crc bytes)
     if (n < 3) return 0;
diff --git a/common/crc16.h b/common/crc16.h
index 843cc07e5..c5c486df9 100644
--- a/common/crc16.h
+++ b/common/crc16.h
@@ -32,9 +32,9 @@ typedef enum {
 
 uint16_t update_crc16_ex(uint16_t crc, uint8_t c, uint16_t polynomial);
 uint16_t update_crc16(uint16_t crc, uint8_t c);
-uint16_t crc16(uint8_t const *d, size_t length, uint16_t remainder, uint16_t polynomial, bool refin, bool refout);
+uint16_t Crc16(uint8_t const *d, size_t length, uint16_t remainder, uint16_t polynomial, bool refin, bool refout);
 
-uint16_t Crc(CrcType_t ct, const uint8_t *d, size_t n);
+uint16_t Crc16ex(CrcType_t ct, const uint8_t *d, size_t n);
 void compute_crc(CrcType_t ct, const uint8_t *d, size_t n, uint8_t *first, uint8_t *second);
 bool check_crc(CrcType_t ct, const uint8_t *d, size_t n);
 
diff --git a/common/iso14443crc.c b/common/iso14443crc.c
deleted file mode 100644
index d0884cf39..000000000
--- a/common/iso14443crc.c
+++ /dev/null
@@ -1,44 +0,0 @@
-//-----------------------------------------------------------------------------
-// This code is licensed to you under the terms of the GNU GPL, version 2 or,
-// at your option, any later version. See the LICENSE.txt file for the text of
-// the license.
-//-----------------------------------------------------------------------------
-// ISO14443 CRC calculation code.
-//-----------------------------------------------------------------------------
-
-#include "iso14443crc.h"
-
-
-uint16_t UpdateCrc14443(uint8_t b, uint16_t *crc) {
-    b = (b ^ (uint8_t)((*crc) & 0x00FF));
-    b = (b ^ (b << 4));
-    *crc = (*crc >> 8) ^ ((uint16_t) b << 8) ^ ((uint16_t) b << 3) ^ ((uint16_t) b >> 4);
-    return (*crc);
-}
-
-void ComputeCrc14443(uint16_t CrcType, const uint8_t *data, int length,
-                     uint8_t *TransmitFirst, uint8_t *TransmitSecond) {
-    uint8_t b;
-    uint16_t crc = CrcType;
-
-    do {
-        b = *data++;
-        UpdateCrc14443(b, &crc);
-    } while (--length);
-
-    if (CrcType == CRC_14443_B)
-        crc = ~crc;                /* ISO/IEC 13239 (formerly ISO/IEC 3309) */
-
-    *TransmitFirst = (uint8_t)(crc & 0xFF);
-    *TransmitSecond = (uint8_t)((crc >> 8) & 0xFF);
-    return;
-}
-
-bool CheckCrc14443(uint16_t CrcType, const uint8_t *data, int length) {
-    if (length < 3) return false;
-    uint8_t b1, b2;
-    ComputeCrc14443(CrcType, data, length - 2, &b1, &b2);
-    if ((b1 == data[length - 2]) && (b2 == data[length - 1]))
-        return true;
-    return false;
-}
diff --git a/common/iso14443crc.h b/common/iso14443crc.h
deleted file mode 100644
index 36c4be2f6..000000000
--- a/common/iso14443crc.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//-----------------------------------------------------------------------------
-// This code is licensed to you under the terms of the GNU GPL, version 2 or,
-// at your option, any later version. See the LICENSE.txt file for the text of
-// the license.
-//-----------------------------------------------------------------------------
-// ISO14443 CRC calculation code.
-//-----------------------------------------------------------------------------
-
-#ifndef __ISO14443CRC_H
-#define __ISO14443CRC_H
-#include "common.h"
-
-//-----------------------------------------------------------------------------
-// Routines to compute the CRCs (two different flavours, just for confusion)
-// required for ISO 14443, swiped directly from the spec.
-
-uint16_t UpdateCrc14443(uint8_t b, uint16_t *crc);
-
-#endif

From 28021ec17b5cc69bfc3a55f7512c409b942fa0fd Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 9 Apr 2019 16:23:55 +0200
Subject: [PATCH 1126/1938] chg: optimizations for ask/bi.

---
 common/lfdemod.c | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/common/lfdemod.c b/common/lfdemod.c
index abf7d82fe..35a3385d3 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -458,11 +458,14 @@ bool DetectCleanAskWave(uint8_t *dest, size_t size, uint8_t high, uint8_t low) {
 
         if (dest[i] > low && dest[i] < high)
             allArePeaks = false;
-        else
+        else {
             cntPeaks++;
+            //if (g_debugMode == 2) prnt("DEBUG DetectCleanAskWave: peaks (200) %u", cntPeaks);
+            if (cntPeaks > 200) return true;
+        }
     }
 
-    if (!allArePeaks) {
+    if (allArePeaks == false) {
         if (g_debugMode == 2) prnt("DEBUG DetectCleanAskWave: peaks (200) %u", cntPeaks);
         if (cntPeaks > 200) return true;
     }
@@ -1410,15 +1413,22 @@ int manrawdecode(uint8_t *bits, size_t *size, uint8_t invert, uint8_t *alignPos)
     //find correct start position [alignment]
     for (k = 0; k < 2; ++k) {
         for (i = k; i < *size - 1; i += 2) {
+          
             if (bits[i] == bits[i + 1])
                 errCnt++;
+            
+            if ( errCnt > 50) 
+                break;
         }
+        
         if (bestErr > errCnt) {
             bestErr = errCnt;
             bestRun = k;
+            if (g_debugMode == 2) prnt("DEBUG manrawdecode: bestErr %d | bestRun %u", bestErr, bestRun);
         }
         errCnt = 0;
     }
+    
     *alignPos = bestRun;
     //decode
     for (i = bestRun; i < *size - 1; i += 2) {
@@ -1456,8 +1466,10 @@ int cleanAskRawDemod(uint8_t *bits, size_t *size, int clk, int invert, int high,
         } else { //transition
             if ((bits[i] >= high && !waveHigh) || (bits[i] <= low && waveHigh)) {
 
-                // 32-8-1 = 23
-                // 32+8+1 = 41
+                // 8  ::   8-2-1 =  5   8+2+1 = 11
+                // 16 ::  16-4-1 = 11  16+4+1 = 21 
+                // 32 ::  32-8-1 = 23  32+8+1 = 41
+                
                 if (smplCnt > clk - cl_4 - 1) { //full clock
 
                     if (smplCnt > clk + cl_4 + 1) { //too many samples
@@ -1504,6 +1516,12 @@ int cleanAskRawDemod(uint8_t *bits, size_t *size, int clk, int invert, int high,
         }
     }
     *size = bitCnt;
+
+    if ( *startIdx < 0 )
+        *startIdx = 0;
+    
+    if (g_debugMode == 2) prnt("DEBUG ASK: cleanAskRawDemod Startidx %u ", *startIdx);
+   
     return errCnt;
 }
 

From 87660df8f2ba5481bd8daca9321ad06e5f6fe6f2 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 9 Apr 2019 17:14:47 +0200
Subject: [PATCH 1127/1938] fix: 'hf mf hardnested' - not verify key when
 reading nonce file

---
 client/cmdhfmf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 4706017cb..dc2dee7b7 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -1471,7 +1471,7 @@ int CmdHF14AMfNestedHard(const char *Cmd) {
         cmdp++;
     }
 
-    if (!know_target_key) {
+    if (!know_target_key && nonce_file_read == false) {
         uint64_t key64 = 0;
         // check if we can authenticate to sector
         int res = mfCheckKeys(blockNo, keyType, true, 1, key, &key64);

From 258332894b6e65a39b7e5e2d69ba95c3a7d90b19 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 9 Apr 2019 17:49:02 +0200
Subject: [PATCH 1128/1938] hardnested: get rid of shift by negative value

---
 client/cmdhfmfhard.c                  | 5 +++--
 client/hardnested/hardnested_tables.c | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/client/cmdhfmfhard.c b/client/cmdhfmfhard.c
index 99afc6b01..787a8f8c8 100644
--- a/client/cmdhfmfhard.c
+++ b/client/cmdhfmfhard.c
@@ -367,9 +367,10 @@ static uint16_t PartialSumProperty(uint32_t state, odd_even_t odd_even) {
         uint32_t st = state;
         uint16_t part_sum = 0;
         if (odd_even == ODD_STATE) {
-            for (uint16_t i = 0; i < 5; i++) {
-                part_sum ^= filter(st);
+            part_sum ^= filter(st);
+            for (uint16_t i = 0; i < 4; i++) {
                 st = (st << 1) | ((j >> (3 - i)) & 0x01) ;
+                part_sum ^= filter(st);
             }
             part_sum ^= 1; // XOR 1 cancelled out for the other 8 bits
         } else {
diff --git a/client/hardnested/hardnested_tables.c b/client/hardnested/hardnested_tables.c
index e1bc68549..c2602bdb7 100644
--- a/client/hardnested/hardnested_tables.c
+++ b/client/hardnested/hardnested_tables.c
@@ -44,9 +44,10 @@ static uint16_t PartialSumProperty(uint32_t state, odd_even_t odd_even) {
         uint32_t st = state;
         uint16_t part_sum = 0;
         if (odd_even == ODD_STATE) {
+            part_sum ^= filter(st);
             for (uint16_t i = 0; i < 4; i++) {
-                part_sum ^= filter(st);
                 st = (st << 1) | ((j >> (3 - i)) & 0x01) ;
+                part_sum ^= filter(st);
             }
             part_sum ^= 1; // XOR 1 cancelled out for the other 8 bits
         } else {

From af54eb5138b10dcba83069b4aaa0a4162eb55035 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 9 Apr 2019 18:06:19 +0200
Subject: [PATCH 1129/1938] unused

---
 armsrc/Standalone/hf_colin.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/armsrc/Standalone/hf_colin.c b/armsrc/Standalone/hf_colin.c
index d477fe560..d8c1063e3 100644
--- a/armsrc/Standalone/hf_colin.c
+++ b/armsrc/Standalone/hf_colin.c
@@ -838,7 +838,7 @@ void e_MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *dat
         uint64_t ui64Key = emlGetKey(s, keyType);
         if (s == 0) {
             if (isOK && mifare_classic_auth(pcs, cjcuid, FirstBlockOfSector(s), keyType, ui64Key, AUTH_FIRST)) {
-                isOK = false;
+
                 if (MF_DBGLEVEL >= 1)
                     DbprintfEx(FLAG_NOLOG, "Sector[%2d]. Auth error", s);
                 break;
@@ -880,7 +880,6 @@ void e_MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *dat
             DbprintfEx(FLAG_NOLOG, "Halt error");
     };
 
-    //  ----------------------------- crypto1 destroy
     crypto1_destroy(pcs);
 
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);

From e6041f48ce9c3c885909228dd427931f0623a636 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 9 Apr 2019 18:07:47 +0200
Subject: [PATCH 1130/1938] unused

---
 armsrc/iclass.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/armsrc/iclass.c b/armsrc/iclass.c
index eb7226bb8..87cf97475 100644
--- a/armsrc/iclass.c
+++ b/armsrc/iclass.c
@@ -655,7 +655,6 @@ static RAMFUNC int ManchesterDecoding_iclass(uint32_t v) {
                     return false;
                 }
             }
-            error = 0;
         }
         return false;
     }

From 5cc7f4eb86dbb4adfbfc0b0dd03bfde9735af8f9 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 9 Apr 2019 18:10:24 +0200
Subject: [PATCH 1131/1938] unused

---
 armsrc/iclass.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/armsrc/iclass.c b/armsrc/iclass.c
index 87cf97475..61961a3da 100644
--- a/armsrc/iclass.c
+++ b/armsrc/iclass.c
@@ -994,7 +994,8 @@ static bool GetIClassCommandFromReader(uint8_t *received, int *len, int maxLen)
     FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_TAGSIM_LISTEN);
     // clear RXRDY:
     uint8_t b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
-
+    (void)b;
+            
     while (!BUTTON_PRESS()) {
         WDT_HIT();
 
@@ -1797,7 +1798,8 @@ static int GetIClassAnswer(uint8_t *receivedResponse, int maxLen, int *samples,
 
     // clear RXRDY:
     uint8_t b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
-
+    (void)b;
+            
     while (!BUTTON_PRESS()) {
         WDT_HIT();
 

From 247245121c9e1d7ca1ca2896c51b2f03483d4fdc Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 9 Apr 2019 18:13:51 +0200
Subject: [PATCH 1132/1938] unused

---
 armsrc/iso14443b.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/armsrc/iso14443b.c b/armsrc/iso14443b.c
index 5d988459b..2fa9b54b4 100644
--- a/armsrc/iso14443b.c
+++ b/armsrc/iso14443b.c
@@ -441,7 +441,7 @@ static int GetIso14443bCommandFromReader(uint8_t *received, uint16_t *len) {
 
     StartCountSspClk();
 
-    volatile uint8_t b = 0;
+    volatile uint8_t b;
 
     // clear receiving shift register and holding register
     // What does this loop do? Is it TR1?
@@ -945,8 +945,8 @@ static RAMFUNC int Handle14443bTagSamplesDemod(int ci, int cq) {
  *  quiet: set to 'TRUE' to disable debug output
  */
 static void GetTagSamplesFor14443bDemod() {
-    bool gotFrame = false, finished = false;
-    int lastRxCounter = ISO14443B_DMA_BUFFER_SIZE;
+    bool gotFrame, finished = false;
+//    int lastRxCounter = ISO14443B_DMA_BUFFER_SIZE;
     int ci = 0, cq = 0;
     uint32_t time_0 = 0, time_stop = 0;
 
@@ -981,12 +981,12 @@ static void GetTagSamplesFor14443bDemod() {
         ci = upTo[0];
         cq = upTo[1];
         upTo += 2;
-        lastRxCounter -= 2;
+//        lastRxCounter -= 2;
 
         // restart DMA buffer to receive again.
         if (upTo >= dmaBuf + ISO14443B_DMA_BUFFER_SIZE) {
             upTo = dmaBuf;
-            lastRxCounter = ISO14443B_DMA_BUFFER_SIZE;
+//            lastRxCounter = ISO14443B_DMA_BUFFER_SIZE;
             AT91C_BASE_PDC_SSC->PDC_RNPR = (uint32_t) upTo;
             AT91C_BASE_PDC_SSC->PDC_RNCR = ISO14443B_DMA_BUFFER_SIZE;
         }
@@ -1462,8 +1462,8 @@ static void iso1444b_setup_sniff(void) {
  */
 void RAMFUNC SniffIso14443b(void) {
 
-    uint32_t time_0 = 0, time_start = 0, time_stop = 0;
-    int ci = 0, cq = 0;
+    uint32_t time_0 = 0, time_start = 0, time_stop;
+    int ci, cq;
 
     // We won't start recording the frames that we acquire until we trigger;
     // a good trigger condition to get started is probably when we see a
@@ -1572,7 +1572,7 @@ void SendRawCommand14443B_Ex(UsbCommand *c) {
     size_t len = c->arg[1] & 0xffff;
     uint32_t timeout = c->arg[2];
     uint8_t *cmd = c->d.asBytes;
-    uint8_t status = 0;
+    uint8_t status;
     uint32_t sendlen = sizeof(iso14b_card_select_t);
     uint8_t buf[USB_CMD_DATA_SIZE] = {0x00};
 

From ff194eb861a44e11cbe10fc10e555ed937938032 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 9 Apr 2019 20:02:33 +0200
Subject: [PATCH 1133/1938] CmdHF15Write: make sure truncated string is
 null-terminated

---
 client/cmdhf15.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index 51f7a0654..086039d13 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -1238,7 +1238,7 @@ int CmdHF15Write(const char *Cmd) {
     UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}}; // len,speed,recv?
     uint8_t *req = c.d.asBytes;
     int reqlen = 0, pagenum, temp;
-    char cmdbuf[100];
+    char cmdbuf[100] = {0};
     char *cmd = cmdbuf;
     char *cmd2;
 

From 2f33682035877819fad0af6b10ac9ba557d29f5c Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 9 Apr 2019 20:05:27 +0200
Subject: [PATCH 1134/1938] use sizeof

---
 client/cmdhf15.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index 086039d13..faf77646a 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -1242,7 +1242,7 @@ int CmdHF15Write(const char *Cmd) {
     char *cmd = cmdbuf;
     char *cmd2;
 
-    strncpy(cmd, Cmd, 99);
+    strncpy(cmd, Cmd, sizeof(cmdbuf) - 1);
 
     if (!prepareHF15Cmd(&cmd, &c, ISO15_CMD_WRITE))
         return 0;

From df551546496549379ab90fb88376467db099ee32 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 9 Apr 2019 20:08:35 +0200
Subject: [PATCH 1135/1938] more

---
 client/cmdhf15.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index faf77646a..e18f4ac72 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -517,11 +517,11 @@ int CmdHF15Info(const char *Cmd) {
     uint8_t *recv;
     UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}}; // len,speed,recv?
     uint8_t *req = c.d.asBytes;
-    char cmdbuf[100];
+    char cmdbuf[100] = {0};
     char *cmd = cmdbuf;
     memset(cmdbuf, 0, sizeof(cmdbuf));
 
-    strncpy(cmd, Cmd, 99);
+    strncpy(cmd, Cmd, sizeof(cmdbuf) - 1);
 
     if (!prepareHF15Cmd(&cmd, &c, ISO15_CMD_SYSINFO))
         return 0;
@@ -1082,9 +1082,9 @@ int CmdHF15Readmulti(const char *Cmd) {
     uint8_t *req = c.d.asBytes;
     int reqlen = 0;
     uint8_t pagenum, pagecount;
-    char cmdbuf[100];
+    char cmdbuf[100] = {0};
     char *cmd = cmdbuf;
-    strncpy(cmd, Cmd, 99);
+    strncpy(cmd, Cmd, sizeof(cmdbuf) - 1);
 
     if (!prepareHF15Cmd(&cmd, &c, ISO15_CMD_READMULTI))
         return 0;
@@ -1169,9 +1169,9 @@ int CmdHF15Read(const char *Cmd) {
     UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}};
     uint8_t *req = c.d.asBytes;
     int reqlen = 0, blocknum;
-    char cmdbuf[100];
+    char cmdbuf[100] = {0};
     char *cmd = cmdbuf;
-    strncpy(cmd, Cmd, 99);
+    strncpy(cmd, Cmd, sizeof(cmdbuf) - 1);
 
     if (!prepareHF15Cmd(&cmd, &c, ISO15_CMD_READ))
         return 0;

From a561370f8dd6fe697da6d13b4086a2568228fa2c Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 9 Apr 2019 20:15:08 +0200
Subject: [PATCH 1136/1938] more strncpy fix

---
 client/cmdhfmf.c         | 2 +-
 client/crypto/asn1dump.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index dc2dee7b7..e78c07c76 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -1336,7 +1336,7 @@ int CmdHF14AMfNestedHard(const char *Cmd) {
     uint8_t key[6] = {0, 0, 0, 0, 0, 0};
     uint8_t trgkey[6] = {0, 0, 0, 0, 0, 0};
     uint8_t cmdp = 0;
-    char filename[FILE_PATH_SIZE], *fptr;
+    char filename[FILE_PATH_SIZE] = {0}, *fptr;
     char szTemp[FILE_PATH_SIZE - 20];
     char ctmp;
 
diff --git a/client/crypto/asn1dump.c b/client/crypto/asn1dump.c
index a4b491a84..8453d0f13 100644
--- a/client/crypto/asn1dump.c
+++ b/client/crypto/asn1dump.c
@@ -238,7 +238,7 @@ static char *asn1_oid_description(const char *oid, bool with_group_desc) {
     memset(res, 0x00, sizeof(res));
 
     size_t len = strlen(get_my_executable_directory());
-    if (len > 300) len = 299;
+    if (len >= 300) len = 299;
 
     strncpy(fname, get_my_executable_directory(), len);
     strcat(fname, "crypto/oids.json");

From 6bba17b1e7234951741356cdd33cebeacd4f7f97 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 9 Apr 2019 20:36:06 +0200
Subject: [PATCH 1137/1938] unused

---
 armsrc/iso15693.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/armsrc/iso15693.c b/armsrc/iso15693.c
index 998c43520..dd94514af 100644
--- a/armsrc/iso15693.c
+++ b/armsrc/iso15693.c
@@ -388,7 +388,7 @@ static int GetIso15693AnswerFromTag(uint8_t *received, int *elapsed) {
     uint32_t time_0 = GetCountSspClk();
     uint32_t time_stop = 0;
     bool getNext = false;
-    int counter = 0, ci = 0, cq = 0;
+    int counter = 0, ci, cq = 0;
     uint8_t *buf = BigBuf_malloc(SIGNAL_BUFF_SIZE);
 
     if (elapsed) *elapsed = 0;
@@ -438,7 +438,7 @@ static int GetIso15693AnswerFromTag(uint8_t *received, int *elapsed) {
 static int GetIso15693AnswerFromSniff(uint8_t *received, int *samples, int *elapsed) {
 
     bool getNext = false;
-    int counter = 0, ci = 0, cq = 0;
+    int counter = 0, ci, cq = 0;
     uint32_t time_0 = 0, time_stop = 0;
     uint8_t *buf = BigBuf_get_addr();
 
@@ -485,7 +485,7 @@ static int GetIso15693AnswerFromSniff(uint8_t *received, int *samples, int *elap
 //-----------------------------------------------------------------------------
 void AcquireRawAdcSamplesIso15693(void) {
     int c = 0, getNext = false;
-    int ci = 0, cq = 0;
+    int ci, cq = 0;
 
     FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
     SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
@@ -552,7 +552,7 @@ void AcquireRawAdcSamplesIso15693(void) {
 void RecordRawAdcSamplesIso15693(void) {
 
     int c = 0, getNext = false;
-    int ci = 0, cq = 0;
+    int ci, cq = 0;
 
     Iso15693InitReader();
 
@@ -875,8 +875,8 @@ void SimTagIso15693(uint32_t parameter, uint8_t *uid) {
 
     LED_A_ON();
 
-    uint32_t time_start = 0;
-    int ans = 0, samples = 0, tsamples = 0;
+    uint32_t time_start;
+    int samples = 0, tsamples = 0;
     int wait = 0, elapsed = 0;
 
     Dbprintf("ISO-15963 Simulating uid: %02X%02X%02X%02X%02X%02X%02X%02X", uid[0], uid[1], uid[2], uid[3], uid[4], uid[5], uid[6], uid[7]);
@@ -895,7 +895,7 @@ void SimTagIso15693(uint32_t parameter, uint8_t *uid) {
         WDT_HIT();
 
         // Listen to reader
-        ans = GetIso15693AnswerFromSniff(buf, &samples, &elapsed) ;
+        int ans = GetIso15693AnswerFromSniff(buf, &samples, &elapsed) ;
 
         // we should do a better check than this
         if (ans >= 1) {

From 1c9507b6d81419704ae4a61ee26412d2d6b39d9b Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 9 Apr 2019 20:37:35 +0200
Subject: [PATCH 1138/1938] unused

---
 armsrc/lfsampling.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/armsrc/lfsampling.c b/armsrc/lfsampling.c
index b20f6766b..20473f3e6 100644
--- a/armsrc/lfsampling.c
+++ b/armsrc/lfsampling.c
@@ -129,7 +129,7 @@ uint32_t DoAcquisition(uint8_t decimation, uint32_t bits_per_sample, bool averag
     // use a bit stream to handle the output
     BitstreamOut data = { dest, 0, 0};
     int sample_counter = 0;
-    uint8_t sample = 0;
+    uint8_t sample;
 
     // if we want to do averaging
     uint32_t sample_sum = 0 ;
@@ -277,7 +277,7 @@ void doT55x7Acquisition(size_t sample_size) {
     if (bufsize > sample_size)
         bufsize = sample_size;
 
-    uint8_t curSample = 0, lastSample = 0;
+    uint8_t curSample, lastSample = 0;
     uint16_t i = 0, skipCnt = 0;
     bool startFound = false;
     bool highFound = false;
@@ -344,7 +344,7 @@ void doCotagAcquisition(size_t sample_size) {
         bufsize = sample_size;
 
     dest[0] = 0;
-    uint8_t sample = 0, firsthigh = 0, firstlow = 0;
+    uint8_t sample, firsthigh = 0, firstlow = 0;
     uint16_t i = 0;
     uint16_t noise_counter = 0;
 
@@ -393,7 +393,7 @@ uint32_t doCotagAcquisitionManchester() {
         bufsize = COTAG_BITS;
 
     dest[0] = 0;
-    uint8_t sample = 0, firsthigh = 0, firstlow = 0;
+    uint8_t sample, firsthigh = 0, firstlow = 0;
     uint16_t sample_counter = 0, period = 0;
     uint8_t curr = 0, prev = 0;
     uint16_t noise_counter = 0;

From 4d99bf7fabbfb7174c1eea426b241fcd9507d1ad Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 9 Apr 2019 20:39:38 +0200
Subject: [PATCH 1139/1938] unused

---
 armsrc/mifarecmd.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index 56049a9cd..ccf5be9e2 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -1644,10 +1644,10 @@ void MifareEMemGet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)
 //
 //-----------------------------------------------------------------------------
 void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain) {
+    uint64_t ui64Key;
+    uint32_t cuid = 0;
     uint8_t numSectors = arg0;
     uint8_t keyType = arg1;
-    uint64_t ui64Key = 0;
-    uint32_t cuid = 0;
     struct Crypto1State mpcs = {0, 0};
     struct Crypto1State *pcs;
     pcs = &mpcs;
@@ -1676,7 +1676,6 @@ void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
         ui64Key = emlGetKey(sectorNo, keyType);
         if (sectorNo == 0) {
             if (isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_FIRST)) {
-                isOK = false;
                 if (MF_DBGLEVEL >= 1) Dbprintf("Sector[%2d]. Auth error", sectorNo);
                 break;
             }
@@ -2002,7 +2001,7 @@ void MifareSetMod(uint8_t mod, uint8_t *key) {
     uint32_t cuid = 0;
     struct Crypto1State mpcs = {0, 0};
     struct Crypto1State *pcs = &mpcs;
-    int respLen = 0;
+    int respLen;
     uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0};
     uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0};
 

From 9c634ce605d8778771284cae160eda0c7bd57acf Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 9 Apr 2019 20:41:01 +0200
Subject: [PATCH 1140/1938] unused

---
 armsrc/mifaresniff.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/armsrc/mifaresniff.c b/armsrc/mifaresniff.c
index 317d67547..849d2693b 100644
--- a/armsrc/mifaresniff.c
+++ b/armsrc/mifaresniff.c
@@ -56,8 +56,7 @@ void RAMFUNC SniffMifare(uint8_t param) {
     uint8_t *dmaBuf = BigBuf_malloc(DMA_BUFFER_SIZE);
     uint8_t *data = dmaBuf;
     uint8_t previous_data = 0;
-    int maxDataLen = 0;
-    int dataLen = 0;
+    int dataLen, maxDataLen = 0;
     bool ReaderIsActive = false;
     bool TagIsActive = false;
 
@@ -310,8 +309,7 @@ bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint8_t *parity, ui
 */
 
 void RAMFUNC MfSniffSend() {
-    uint16_t tracelen = BigBuf_get_traceLen();
-    uint16_t chunksize = 0;
+    uint16_t chunksize, tracelen = BigBuf_get_traceLen();
     int packlen = tracelen; // total number of bytes to send
     uint8_t *data = BigBuf_get_addr();
 

From 8c4f8eaecaac1fe22549af1952382fe654fdbc48 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 9 Apr 2019 20:43:09 +0200
Subject: [PATCH 1141/1938] unused

---
 armsrc/mifareutil.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/armsrc/mifareutil.c b/armsrc/mifareutil.c
index 233b143fe..34266cd41 100644
--- a/armsrc/mifareutil.c
+++ b/armsrc/mifareutil.c
@@ -14,13 +14,11 @@ int MF_DBGLEVEL = MF_DBG_ERROR;
 
 // crypto1 helpers
 void mf_crypto1_decryptEx(struct Crypto1State *pcs, uint8_t *data_in, int len, uint8_t *data_out) {
-    uint8_t bt = 0;
-    int i;
-
     if (len != 1) {
-        for (i = 0; i < len; i++)
+        for (int i = 0; i < len; i++)
             data_out[i] = crypto1_byte(pcs, 0x00, 0) ^ data_in[i];
     } else {
+        uint8_t bt = 0;        
         bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data_in[0], 0)) << 0;
         bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data_in[0], 1)) << 1;
         bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data_in[0], 2)) << 2;
@@ -39,12 +37,11 @@ void mf_crypto1_encrypt(struct Crypto1State *pcs, uint8_t *data, uint16_t len, u
 }
 
 void mf_crypto1_encryptEx(struct Crypto1State *pcs, uint8_t *data_in, uint8_t *keystream, uint8_t *data_out, uint16_t len, uint8_t *par) {
-    uint8_t bt = 0;
     int i;
     par[0] = 0;
 
     for (i = 0; i < len; i++) {
-        bt = data_in[i];
+        uint8_t bt = data_in[i];
         data_out[i] = crypto1_byte(pcs, keystream ? keystream[i] : 0x00, 0) ^ data_in[i];
         if ((i & 0x0007) == 0)
             par[ i >> 3 ] = 0;
@@ -78,7 +75,7 @@ int mifare_sendcmd(uint8_t cmd, uint8_t *data, uint8_t data_size, uint8_t *answe
 
 // send 2 byte commands
 int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t data, uint8_t *answer, uint8_t *answer_parity, uint32_t *timing) {
-    uint16_t pos, res;
+    uint16_t pos;
     uint8_t dcmd[4] = {cmd, data, 0x00, 0x00};
     uint8_t ecmd[4] = {0x00, 0x00, 0x00, 0x00};
     uint8_t par[1] = {0x00}; // 1 Byte parity is enough here
@@ -102,7 +99,7 @@ int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd,
 
     if (crypted == CRYPT_ALL) {
         if (len == 1) {
-            res = 0;
+            uint16_t res = 0;
             res |= (crypto1_bit(pcs, 0, 0) ^ BIT(answer[0], 0)) << 0;
             res |= (crypto1_bit(pcs, 0, 0) ^ BIT(answer[0], 1)) << 1;
             res |= (crypto1_bit(pcs, 0, 0) ^ BIT(answer[0], 2)) << 2;

From 2ebf940bf09a333bc16b77d4f19e4ed2bff4d3fa Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 9 Apr 2019 21:25:11 +0200
Subject: [PATCH 1142/1938] PrintAndLogEx: use const on char *fmt

---
 client/ui.c | 2 +-
 client/ui.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/ui.c b/client/ui.c
index 216fbccff..1e5c145be 100644
--- a/client/ui.c
+++ b/client/ui.c
@@ -45,7 +45,7 @@ void PrintAndLogOptions(char *str[][2], size_t size, size_t space) {
     }
     PrintAndLogEx(NORMAL, "%s", buff);
 }
-void PrintAndLogEx(logLevel_t level, char *fmt, ...) {
+void PrintAndLogEx(logLevel_t level, const char *fmt, ...) {
 
     // skip debug messages if client debugging is turned off i.e. 'DATA SETDEBUG 0'
     if (g_debugMode == 0 && level == DEBUG)
diff --git a/client/ui.h b/client/ui.h
index cace7e6fd..774579725 100644
--- a/client/ui.h
+++ b/client/ui.h
@@ -35,7 +35,7 @@ void ShowGraphWindow(void);
 void RepaintGraphWindow(void);
 void PrintAndLog(char *fmt, ...);
 void PrintAndLogOptions(char *str[][2], size_t size, size_t space);
-void PrintAndLogEx(logLevel_t level, char *fmt, ...);
+void PrintAndLogEx(logLevel_t level, const char *fmt, ...);
 void SetLogFilename(char *fn);
 void SetFlushAfterWrite(bool value);
 

From 39827a6d5d87f64d3c4bbcedb3ee814bf05633ac Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 9 Apr 2019 21:35:06 +0200
Subject: [PATCH 1143/1938] unused

---
 common/i2c.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/common/i2c.c b/common/i2c.c
index ad0f8964c..4ff9ecf14 100644
--- a/common/i2c.c
+++ b/common/i2c.c
@@ -759,9 +759,7 @@ void SmartCardUpgrade(uint64_t arg0) {
     I2C_Reset_EnterBootloader();
 
     bool isOK = true;
-    int16_t res = 0;
-    uint16_t length = arg0;
-    uint16_t pos = 0;
+    uint16_t length = arg0, pos = 0;
     uint8_t *fwdata = BigBuf_get_addr();
     uint8_t *verfiydata = BigBuf_malloc(I2C_BLOCK_SIZE);
 
@@ -775,7 +773,7 @@ void SmartCardUpgrade(uint64_t arg0) {
         size_t size = MIN(I2C_BLOCK_SIZE, length);
 
         // write
-        res = I2C_WriteFW(fwdata + pos, size, msb, lsb, I2C_DEVICE_ADDRESS_BOOT);
+        int16_t res = I2C_WriteFW(fwdata + pos, size, msb, lsb, I2C_DEVICE_ADDRESS_BOOT);
         if (!res) {
             DbpString("Writing failed");
             isOK = false;

From 3f2d02b978f523a78f789190fda5c370c8268b8f Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 9 Apr 2019 21:36:14 +0200
Subject: [PATCH 1144/1938] unused

---
 client/reveng/cli.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/reveng/cli.c b/client/reveng/cli.c
index 6ecdcecab..b8de74961 100644
--- a/client/reveng/cli.c
+++ b/client/reveng/cli.c
@@ -536,7 +536,7 @@ static poly_t
 rdpoly(const char *name, int flags, int bperhx) {
     /* read poly from file in chunks and report errors */
 
-    poly_t apoly = PZERO, chunk = PZERO;
+    poly_t apoly = PZERO, chunk;
     FILE *input;
 
     input = oread(name);

From c19b5977d4eca441d0c612946f2176eb20c68c23 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 9 Apr 2019 21:36:52 +0200
Subject: [PATCH 1145/1938] unused

---
 client/mifare/ndef.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/mifare/ndef.c b/client/mifare/ndef.c
index 12f89b53e..9caee1d88 100644
--- a/client/mifare/ndef.c
+++ b/client/mifare/ndef.c
@@ -208,7 +208,6 @@ int ndefDecodeSig(uint8_t *sig, size_t siglen) {
         size_t inturilen = (sig[indx] << 8) + sig[indx + 1];
         indx += 2;
         PrintAndLogEx(NORMAL, "\tcertificate uri [%d]: %.*s", inturilen, inturilen, &sig[indx]);
-        indx += inturilen;
     }
 
     return 0;

From cf21db6f384f52f398748a18070c296587c53af3 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 9 Apr 2019 21:38:04 +0200
Subject: [PATCH 1146/1938] unused

---
 client/mifare/mifarehost.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/mifare/mifarehost.c b/client/mifare/mifarehost.c
index 181d41e87..5b1fa7300 100644
--- a/client/mifare/mifarehost.c
+++ b/client/mifare/mifarehost.c
@@ -221,8 +221,9 @@ int mfKeyBrute(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint64_t *resultk
 #define KEYS_IN_BLOCK 85
 #define KEYBLOCK_SIZE 510
 #define CANDIDATE_SIZE 0xFFFF * 6
+
+    uint64_t key64;
     uint8_t found = false;
-    uint64_t key64 = 0;
     uint8_t candidates[CANDIDATE_SIZE] = {0x00};
     uint8_t keyBlock[KEYBLOCK_SIZE] = {0x00};
 

From 9c74a96c9b8f66cbbf6f34b7263c0c75071c78e5 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 9 Apr 2019 21:40:25 +0200
Subject: [PATCH 1147/1938] unused

---
 client/loclass/cipherutils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/loclass/cipherutils.c b/client/loclass/cipherutils.c
index 9e7a23bac..d48863f98 100644
--- a/client/loclass/cipherutils.c
+++ b/client/loclass/cipherutils.c
@@ -150,7 +150,7 @@ void printarr(char *name, uint8_t *arr, int len) {
     for (i = 0; i < len; i++) {
         cx += snprintf(output + cx, outsize - cx, "0x%02x,", *(arr + i)); //5 bytes per byte
     }
-    cx += snprintf(output + cx, outsize - cx, "};");
+    snprintf(output + cx, outsize - cx, "};");
     PrintAndLogDevice(NORMAL, output);
     free(output);
 }

From 28ca3e8c22784c9df27031cee294ff92fee9d5d3 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 9 Apr 2019 22:42:23 +0200
Subject: [PATCH 1148/1938] on prototypes, void means sth

---
 client/cliparser/cliparser.h              |  2 +-
 client/cmddata.h                          |  2 +-
 client/cmdhf.h                            |  4 ++--
 client/cmdhflist.h                        |  2 +-
 client/cmdlfpcf7931.h                     | 10 +++++-----
 client/cmdmain.h                          |  2 +-
 client/comms.h                            |  4 ++--
 client/graph.h                            |  2 +-
 client/hardnested/hardnested_bf_core.h    |  2 +-
 client/hardnested/hardnested_bruteforce.h |  2 +-
 client/loclass/cipher.h                   |  2 +-
 client/loclass/cipherutils.h              |  2 +-
 client/loclass/elite_crack.h              |  2 +-
 client/loclass/hash1_brute.h              |  2 +-
 client/util_darwin.h                      |  6 +++---
 client/util_posix.h                       |  2 +-
 16 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/client/cliparser/cliparser.h b/client/cliparser/cliparser.h
index d1fa19bce..a7c8480f4 100644
--- a/client/cliparser/cliparser.h
+++ b/client/cliparser/cliparser.h
@@ -35,7 +35,7 @@ int CLIParserInit(char *vprogramName, char *vprogramHint, char *vprogramHelp);
 int CLIParserParseString(const char *str, void *vargtable[], size_t vargtableLen, bool allowEmptyExec);
 int CLIParserParseStringEx(const char *str, void *vargtable[], size_t vargtableLen, bool allowEmptyExec, bool clueData);
 int CLIParserParseArg(int argc, char **argv, void *vargtable[], size_t vargtableLen, bool allowEmptyExec);
-void CLIParserFree();
+void CLIParserFree(void);
 
 int CLIParamHexToBuf(struct arg_str *argstr, uint8_t *data, int maxdatalen, int *datalen);
 int CLIParamStrToBuf(struct arg_str *argstr, uint8_t *data, int maxdatalen, int *datalen);
diff --git a/client/cmddata.h b/client/cmddata.h
index cca722ed4..ce1bfd16a 100644
--- a/client/cmddata.h
+++ b/client/cmddata.h
@@ -32,7 +32,7 @@
 #include "loclass/cipherutils.h" // for decimating samples in getsamples
 #include "cmdlfem4x.h" // askem410xdecode
 
-command_t *CmdDataCommands();
+command_t *CmdDataCommands(void);
 
 int CmdData(const char *Cmd);
 void printDemodBuff(void);
diff --git a/client/cmdhf.h b/client/cmdhf.h
index 3237e1df6..9db6795ac 100644
--- a/client/cmdhf.h
+++ b/client/cmdhf.h
@@ -38,6 +38,6 @@ int CmdHFTune(const char *Cmd);
 int CmdHFSearch(const char *Cmd);
 int CmdHFSniff(const char *Cmd);
 
-int usage_hf_search();
-int usage_hf_sniff();
+int usage_hf_search(void);
+int usage_hf_sniff(void);
 #endif
diff --git a/client/cmdhflist.h b/client/cmdhflist.h
index 35a5493ff..ddc0ab00c 100644
--- a/client/cmdhflist.h
+++ b/client/cmdhflist.h
@@ -52,7 +52,7 @@ typedef struct {
     uint32_t ks3;       // at ^ at_enc
 } TAuthData;
 
-void ClearAuthData();
+void ClearAuthData(void);
 
 uint8_t iso14443A_CRC_check(bool isResponse, uint8_t *d, uint8_t n);
 uint8_t iso14443B_CRC_check(uint8_t *d, uint8_t n);
diff --git a/client/cmdlfpcf7931.h b/client/cmdlfpcf7931.h
index da31877eb..db7c0c8fa 100644
--- a/client/cmdlfpcf7931.h
+++ b/client/cmdlfpcf7931.h
@@ -19,12 +19,12 @@ struct pcf7931_config {
     int16_t OffsetPosition;
 };
 
-int pcf7931_resetConfig();
-int pcf7931_printConfig();
+int pcf7931_resetConfig(void);
+int pcf7931_printConfig(void);
 
-int usage_pcf7931_read();
-int usage_pcf7931_write();
-int usage_pcf7931_config();
+int usage_pcf7931_read(void);
+int usage_pcf7931_write(void);
+int usage_pcf7931_config(void);
 
 int CmdLFPCF7931(const char *Cmd);
 
diff --git a/client/cmdmain.h b/client/cmdmain.h
index c729f8d77..8a43ad6b8 100644
--- a/client/cmdmain.h
+++ b/client/cmdmain.h
@@ -42,6 +42,6 @@
 #endif
 
 int CommandReceived(char *Cmd);
-command_t *getTopLevelCommandTable();
+command_t *getTopLevelCommandTable(void);
 
 #endif
diff --git a/client/comms.h b/client/comms.h
index b8e33beee..483462ac3 100644
--- a/client/comms.h
+++ b/client/comms.h
@@ -48,11 +48,11 @@ typedef struct {
 bool dl_it(uint8_t *dest, uint32_t bytes, uint32_t start_index, UsbCommand *response, size_t ms_timeout, bool show_warning, uint32_t rec_cmd);
 
 void SetOffline(bool value);
-bool IsOffline();
+bool IsOffline(void);
 
 void *uart_receiver(void *targ);
 void SendCommand(UsbCommand *c);
-void clearCommandBuffer();
+void clearCommandBuffer(void);
 
 #define FLASHMODE_SPEED 460800
 bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode, uint32_t speed);
diff --git a/client/graph.h b/client/graph.h
index 05750ab16..98acec8dd 100644
--- a/client/graph.h
+++ b/client/graph.h
@@ -30,7 +30,7 @@ bool fskClocks(uint8_t *fc1, uint8_t *fc2, uint8_t *rf1, int *firstClockEdge);
 void setGraphBuf(uint8_t *buff, size_t size);
 void save_restoreGB(uint8_t saveOpt);
 
-bool HasGraphData();
+bool HasGraphData(void);
 
 // Max graph trace len: 40000 (bigbuf) * 8 (at 1 bit per sample)
 #ifndef MAX_GRAPH_TRACE_LEN
diff --git a/client/hardnested/hardnested_bf_core.h b/client/hardnested/hardnested_bf_core.h
index 872fa2d08..9dc10961a 100644
--- a/client/hardnested/hardnested_bf_core.h
+++ b/client/hardnested/hardnested_bf_core.h
@@ -62,7 +62,7 @@ typedef enum {
     SIMD_NONE,
 } SIMDExecInstr;
 void SetSIMDInstr(SIMDExecInstr instr);
-SIMDExecInstr GetSIMDInstrAuto();
+SIMDExecInstr GetSIMDInstrAuto(void);
 
 const uint64_t crack_states_bitsliced(uint32_t cuid, uint8_t *best_first_bytes, statelist_t *p, uint32_t *keys_found, uint64_t *num_keys_tested, uint32_t nonces_to_bruteforce, uint8_t *bf_test_nonce_2nd_byte, noncelist_t *nonces);
 void bitslice_test_nonces(uint32_t nonces_to_bruteforce, uint32_t *bf_test_nonce, uint8_t *bf_test_nonce_par);
diff --git a/client/hardnested/hardnested_bruteforce.h b/client/hardnested/hardnested_bruteforce.h
index 180e537d8..708d48b84 100644
--- a/client/hardnested/hardnested_bruteforce.h
+++ b/client/hardnested/hardnested_bruteforce.h
@@ -29,7 +29,7 @@ typedef struct {
 
 void prepare_bf_test_nonces(noncelist_t *nonces, uint8_t best_first_byte);
 bool brute_force_bs(float *bf_rate, statelist_t *candidates, uint32_t cuid, uint32_t num_acquired_nonces, uint64_t maximum_states, noncelist_t *nonces, uint8_t *best_first_bytes, uint64_t *found_key);
-float brute_force_benchmark();
+float brute_force_benchmark(void);
 uint8_t trailing_zeros(uint8_t byte);
 bool verify_key(uint32_t cuid, noncelist_t *nonces, uint8_t *best_first_bytes, uint32_t odd, uint32_t even);
 
diff --git a/client/loclass/cipher.h b/client/loclass/cipher.h
index ddf5fecf7..b79dc47cd 100644
--- a/client/loclass/cipher.h
+++ b/client/loclass/cipher.h
@@ -44,7 +44,7 @@ void doMAC(uint8_t *cc_nr_p, uint8_t *div_key_p, uint8_t mac[4]);
 void doMAC_N(uint8_t *address_data_p, uint8_t address_data_size, uint8_t *div_key_p, uint8_t mac[4]);
 
 #ifndef ON_DEVICE
-int testMAC();
+int testMAC(void);
 #endif
 
 #endif // CIPHER_H
diff --git a/client/loclass/cipherutils.h b/client/loclass/cipherutils.h
index 62afd6729..161e09e48 100644
--- a/client/loclass/cipherutils.h
+++ b/client/loclass/cipherutils.h
@@ -60,7 +60,7 @@ void pushBit(BitstreamOut *stream, bool bit);
 int bitsLeft(BitstreamIn *stream);
 #ifndef ON_DEVICE
 int testCipherUtils(void);
-int testMAC();
+int testMAC(void);
 #endif
 void push6bits(BitstreamOut *stream, uint8_t bits);
 void EncryptDES(bool key[56], bool outBlk[64], bool inBlk[64], int verbose) ;
diff --git a/client/loclass/elite_crack.h b/client/loclass/elite_crack.h
index 2353fdbac..819d3de47 100644
--- a/client/loclass/elite_crack.h
+++ b/client/loclass/elite_crack.h
@@ -124,7 +124,7 @@ int calculateMasterKey(uint8_t first16bytes[], uint64_t master_key[]);
  * @brief Test function
  * @return
  */
-int testElite();
+int testElite(void);
 
 /**
       Here are some pretty optimal values that can be used to recover necessary data in only
diff --git a/client/loclass/hash1_brute.h b/client/loclass/hash1_brute.h
index b26ad96d1..685a2c479 100644
--- a/client/loclass/hash1_brute.h
+++ b/client/loclass/hash1_brute.h
@@ -1,5 +1,5 @@
 #ifndef HASH1_BRUTE_H
 #define HASH1_BRUTE_H
-void brute_hash1();
+void brute_hash1(void);
 
 #endif // HASH1_BRUTE_H
diff --git a/client/util_darwin.h b/client/util_darwin.h
index d89b681f2..709680cdc 100644
--- a/client/util_darwin.h
+++ b/client/util_darwin.h
@@ -12,8 +12,8 @@
 #define UTIL_DARWIN_H__
 
 void disableAppNap(const char *reason);
-void enableAppNap();
-void makeUnfocusable();
-void makeFocusable();
+void enableAppNap(void);
+void makeUnfocusable(void);
+void makeFocusable(void);
 
 #endif
diff --git a/client/util_posix.h b/client/util_posix.h
index d4fecc723..a0a8c8638 100644
--- a/client/util_posix.h
+++ b/client/util_posix.h
@@ -21,6 +21,6 @@
 extern void msleep(uint32_t n); // sleep n milliseconds
 #endif // _WIN32
 
-extern uint64_t msclock();      // a milliseconds clock
+extern uint64_t msclock(void);      // a milliseconds clock
 
 #endif

From 55ac61e14593e0ceadb5c8d4f70c8b2ff5867563 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 9 Apr 2019 22:43:29 +0200
Subject: [PATCH 1149/1938] remove redundant buffer init

---
 client/cmdhf15.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index e18f4ac72..2b9751c33 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -519,7 +519,6 @@ int CmdHF15Info(const char *Cmd) {
     uint8_t *req = c.d.asBytes;
     char cmdbuf[100] = {0};
     char *cmd = cmdbuf;
-    memset(cmdbuf, 0, sizeof(cmdbuf));
 
     strncpy(cmd, Cmd, sizeof(cmdbuf) - 1);
 

From 6d0ee581fdadf99f6f0657cc4e447fdeddce7e25 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 9 Apr 2019 22:50:04 +0200
Subject: [PATCH 1150/1938] ease hardnested_tables compilation, in case we
 figure out what to do with it some day

---
 client/hardnested/hardnested_tables.c | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/client/hardnested/hardnested_tables.c b/client/hardnested/hardnested_tables.c
index c2602bdb7..912ad5cc4 100644
--- a/client/hardnested/hardnested_tables.c
+++ b/client/hardnested/hardnested_tables.c
@@ -19,9 +19,15 @@
 //
 //-----------------------------------------------------------------------------
 
+// To compile it:
+// gcc -I ../../common -o hardnested_tables hardnested_tables.c
+
 #include <inttypes.h>
 #include <stdbool.h>
 #include <stdlib.h>
+#ifndef __APPLE__
+#include <malloc.h>
+#endif
 #include <string.h>
 #include <stdio.h>
 #include <time.h>
@@ -65,8 +71,23 @@ static uint16_t PartialSumProperty(uint32_t state, odd_even_t odd_even) {
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // bitarray functions
 
-#define malloc_bitarray(x) __builtin_assume_aligned(_aligned_malloc(x, __BIGGEST_ALIGNMENT__), __BIGGEST_ALIGNMENT__)
+#if defined (_WIN32)
+#define malloc_bitarray(x) __builtin_assume_aligned(_aligned_malloc((x), __BIGGEST_ALIGNMENT__), __BIGGEST_ALIGNMENT__)
 #define free_bitarray(x) _aligned_free(x)
+#elif defined (__APPLE__)
+static void *malloc_bitarray(size_t x) {
+    char *allocated_memory;
+    if (posix_memalign((void **)&allocated_memory, __BIGGEST_ALIGNMENT__, x)) {
+        return NULL;
+    } else {
+        return __builtin_assume_aligned(allocated_memory, __BIGGEST_ALIGNMENT__);
+    }
+}
+#define free_bitarray(x) free(x)
+#else
+#define malloc_bitarray(x) memalign(__BIGGEST_ALIGNMENT__, (x))
+#define free_bitarray(x) free(x)
+#endif
 
 static inline void clear_bitarray24(uint32_t *bitarray) {
     memset(bitarray, 0x00, sizeof(uint32_t) * (1 << 19));

From 249352a1e74a8d68675d4feee7850552beb5ec82 Mon Sep 17 00:00:00 2001
From: Eloff <eloff@mail.ru>
Date: Tue, 9 Apr 2019 23:07:17 +0300
Subject: [PATCH 1151/1938] 'hf mf sim' + 'hf 14a sim' now back to stable

---
 armsrc/iso14443a.c | 115 +++++++++++++++++----------------------------
 armsrc/iso14443a.h |   5 +-
 armsrc/mifaresim.c |  84 ++++++++++++++++++---------------
 armsrc/mifaresim.h |   9 ----
 4 files changed, 91 insertions(+), 122 deletions(-)

diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index a3a94eed6..98ed1a1da 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -19,7 +19,6 @@ int rsamples = 0;
 uint8_t trigger = 0;
 // the block number for the ISO14443-4 PCB
 static uint8_t iso14_pcb_blocknum = 0;
-static uint8_t *free_buffer_pointer;
 
 //
 // ISO14443 timing:
@@ -740,34 +739,6 @@ static void Code4bitAnswerAsTag(uint8_t cmd) {
     ToSendMax++;
 }
 
-static uint8_t *LastReaderTraceTime = NULL;
-
-void EmLogTraceReader(void) {
-    // remember last reader trace start to fix timing info later
-    LastReaderTraceTime = BigBuf_get_addr() + BigBuf_get_traceLen();
-    LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
-}
-
-static void FixLastReaderTraceTime(uint32_t tag_StartTime) {
-    uint32_t reader_EndTime = Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG;
-    uint32_t reader_StartTime = Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG;
-    uint16_t reader_modlen = reader_EndTime - reader_StartTime;
-    uint16_t approx_fdt = tag_StartTime - reader_EndTime;
-    uint16_t exact_fdt = (approx_fdt - 20 + 32) / 64 * 64 + 20;
-    reader_StartTime = tag_StartTime - exact_fdt - reader_modlen;
-    LastReaderTraceTime[0] = (reader_StartTime >> 0) & 0xff;
-    LastReaderTraceTime[1] = (reader_StartTime >> 8) & 0xff;
-    LastReaderTraceTime[2] = (reader_StartTime >> 16) & 0xff;
-    LastReaderTraceTime[3] = (reader_StartTime >> 24) & 0xff;
-}
-
-static void EmLogTraceTag(uint8_t *tag_data, uint16_t tag_len, uint8_t *tag_Parity, uint32_t ProxToAirDuration) {
-    uint32_t tag_StartTime = LastTimeProxToAirStart * 16 + DELAY_ARM2AIR_AS_TAG;
-    uint32_t tag_EndTime = (LastTimeProxToAirStart + ProxToAirDuration) * 16 + DELAY_ARM2AIR_AS_TAG;
-    LogTrace(tag_data, tag_len, tag_StartTime, tag_EndTime, tag_Parity, false);
-    FixLastReaderTraceTime(tag_StartTime);
-}
-
 //-----------------------------------------------------------------------------
 // Wait for commands from reader
 // stop when button is pressed
@@ -793,7 +764,6 @@ static int GetIso14443aCommandFromReader(uint8_t *received, uint8_t *par, int *l
             b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
             if (MillerDecoding(b, 0)) {
                 *len = Uart.len;
-                EmLogTraceReader();
                 return true;
             }
         }
@@ -831,14 +801,6 @@ static bool prepare_tag_modulation(tag_response_info_t *response_info, size_t ma
     return true;
 }
 
-// "precompile" responses. There are 7 predefined responses with a total of 28 bytes data to transmit.
-// Coded responses need one byte per bit to transfer (data, parity, start, stop, correction)
-// 28 * 8 data bits, 28 * 1 parity bits, 7 start bits, 7 stop bits, 7 correction bits
-// -> need 273 bytes buffer
-// 44 * 8 data bits, 44 * 1 parity bits, 9 start bits, 9 stop bits, 9 correction bits --370
-// 47 * 8 data bits, 47 * 1 parity bits, 10 start bits, 10 stop bits, 10 correction bits
-#define ALLOCATED_TAG_MODULATION_BUFFER_SIZE 453
-
 bool prepare_allocated_tag_modulation(tag_response_info_t *response_info, uint8_t **buffer, size_t *max_buffer_size) {
 
     // Retrieve and store the current buffer index
@@ -1013,7 +975,7 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
     // Prepare CHK_TEARING
     // uint8_t response9[] =  {0xBD,0x90,0x3f};
 
-#define TAG_RESPONSE_COUNT 10
+#define TAG_RESPONSE_COUNT 8
     tag_response_info_t responses[TAG_RESPONSE_COUNT] = {
         { .response = response1,  .response_n = sizeof(response1)  },  // Answer to request - respond with card type
         { .response = response2,  .response_n = sizeof(response2)  },  // Anticollision cascade1 - respond with uid
@@ -1028,6 +990,13 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
     // { .response = response7_NTAG, .response_n = sizeof(response7_NTAG)}, // EV1/NTAG GET_VERSION response
     // { .response = response9,      .response_n = sizeof(response9)     }  // EV1/NTAG CHK_TEAR response
 
+    // "precompile" responses. There are 8 predefined responses with a total of 32 bytes data to transmit.
+    // Coded responses need one byte per bit to transfer (data, parity, start, stop, correction)
+    // 32 * 8 data bits, 32 * 1 parity bits, 8 start bits, 8 stop bits, 8 correction bits
+    // -> need 312 bytes buffer
+    // 42 * 8 data bits, 42 * 1 parity bits, 9 start bits, 9 stop bits, 9 correction bits --405
+    // 45 * 8 data bits, 45 * 1 parity bits, 10 start bits, 10 stop bits, 10 correction bits --435
+#define ALLOCATED_TAG_MODULATION_BUFFER_SIZE 453
 
     // Allocate 512 bytes for the dynamic modulation, created when the reader queries for it
     // Such a response is less time critical, so we can prepare them on the fly
@@ -1042,23 +1011,29 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
         .modulation_n = 0
     };
 
-    // We need to listen to the high-frequency, peak-detected path.
-    iso14443a_setup(FPGA_HF_ISO14443A_TAGSIM_LISTEN);
-
+    // free eventually allocated BigBuf memory but keep Emulator Memory
     BigBuf_free_keep_EM();
-    clear_trace();
-    set_tracing(true);
 
     // allocate buffers:
     uint8_t *receivedCmd = BigBuf_malloc(MAX_FRAME_SIZE);
     uint8_t *receivedCmdPar = BigBuf_malloc(MAX_PARITY_SIZE);
-    //free_buffer_pointer = BigBuf_malloc(ALLOCATED_TAG_MODULATION_BUFFER_SIZE);
+    uint8_t *free_buffer = BigBuf_malloc(ALLOCATED_TAG_MODULATION_BUFFER_SIZE);
+    // modulation buffer pointer and current buffer free space size
+    uint8_t *free_buffer_pointer = free_buffer;
     size_t free_buffer_size = ALLOCATED_TAG_MODULATION_BUFFER_SIZE;
 
     // Prepare the responses of the anticollision phase
     // there will be not enough time to do this at the moment the reader sends it REQA
-    for (size_t i = 0; i < TAG_RESPONSE_COUNT; i++)
-        prepare_allocated_tag_modulation(&responses[i], &free_buffer_pointer, &free_buffer_size);
+    for (size_t i = 0; i < TAG_RESPONSE_COUNT; i++) {
+        if (prepare_allocated_tag_modulation(&responses[i], &free_buffer_pointer, &free_buffer_size) == false) {
+            BigBuf_free_keep_EM();
+            Dbprintf("Not enough modulation buffer size, exit after %d elements", i);
+            return;
+        }
+    }
+
+    // We need to listen to the high-frequency, peak-detected path.
+    iso14443a_setup(FPGA_HF_ISO14443A_TAGSIM_LISTEN);
 
     int len = 0;
 
@@ -1072,6 +1047,8 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
     int cmdsRecvd = 0;
     tag_response_info_t *p_response;
 
+    clear_trace();
+    set_tracing(true);
     LED_A_ON();
     for (;;) {
         WDT_HIT();
@@ -1409,27 +1386,14 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
         cmdsRecvd++;
 
         if (p_response != NULL) {
-            EmSendCmd14443aRaw(p_response->modulation, p_response->modulation_n);
-            // do the tracing for the previous reader request and this tag answer:
-            uint8_t par[MAX_PARITY_SIZE] = {0x00};
-            GetParity(p_response->response, p_response->response_n, par);
-
-            EmLogTrace(Uart.output,
-                       Uart.len,
-                       Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG,
-                       Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG,
-                       Uart.parity,
-                       p_response->response,
-                       p_response->response_n,
-                       LastTimeProxToAirStart * 16 + DELAY_ARM2AIR_AS_TAG,
-                       (LastTimeProxToAirStart + p_response->ProxToAirDuration) * 16 + DELAY_ARM2AIR_AS_TAG,
-                       par);
+            EmSendPrecompiledCmd(p_response);
         }
     }
 
     cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
     switch_off();
 
+    set_tracing(false);
     BigBuf_free_keep_EM();
 
     if (MF_DBGLEVEL >= 4) {
@@ -1663,7 +1627,6 @@ int EmGetCmd(uint8_t *received, uint16_t *len, uint8_t *par) {
             b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
             if (MillerDecoding(b, 0)) {
                 *len = Uart.len;
-                EmLogTraceReader();
                 return 0;
             }
         }
@@ -1782,17 +1745,27 @@ int EmSendCmdEx(uint8_t *resp, uint16_t respLen, bool collision) {
     return EmSendCmdParEx(resp, respLen, par, collision);
 }
 
-int EmSendPrecompiledCmd(tag_response_info_t *response_info) {
-    int ret = EmSendCmd14443aRaw(response_info->modulation, response_info->modulation_n);
-
+int EmSendPrecompiledCmd(tag_response_info_t *p_response) {
+    int ret = EmSendCmd14443aRaw(p_response->modulation, p_response->modulation_n);
     // do the tracing for the previous reader request and this tag answer:
-    EmLogTraceTag(response_info->response, response_info->response_n,
-                  &(response_info->par), response_info->ProxToAirDuration);
+    uint8_t par[MAX_PARITY_SIZE] = {0x00};
+    GetParity(p_response->response, p_response->response_n, par);
+
+    EmLogTrace(Uart.output,
+               Uart.len,
+               Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG,
+               Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG,
+               Uart.parity,
+               p_response->response,
+               p_response->response_n,
+               LastTimeProxToAirStart * 16 + DELAY_ARM2AIR_AS_TAG,
+               (LastTimeProxToAirStart + p_response->ProxToAirDuration) * 16 + DELAY_ARM2AIR_AS_TAG,
+               par);
 
     if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
-        Dbprintf("response_info->response %02X", response_info->response);
-        Dbprintf("response_info->response_n %02X", response_info->response_n);
-        Dbprintf("response_info->par %02X", &(response_info->par));
+        Dbprintf("response_info->response %02X", p_response->response);
+        Dbprintf("response_info->response_n %02X", p_response->response_n);
+        Dbprintf("response_info->par %02X", &(p_response->par));
     }
 
     return ret;
diff --git a/armsrc/iso14443a.h b/armsrc/iso14443a.h
index ae3491825..f2a1c6120 100644
--- a/armsrc/iso14443a.h
+++ b/armsrc/iso14443a.h
@@ -133,7 +133,6 @@ int iso14443a_select_card(uint8_t *uid_ptr, iso14a_card_select_t *p_card, uint32
 int iso14443a_fast_select_card(uint8_t *uid_ptr, uint8_t num_cascades);
 void iso14a_set_trigger(bool enable);
 
-int EmSendPrecompiledCmd(tag_response_info_t *response_info);
 int EmSendCmd14443aRaw(uint8_t *resp, uint16_t respLen);
 int EmSend4bit(uint8_t resp);
 int EmSendCmd(uint8_t *resp, uint16_t respLen);
@@ -141,9 +140,7 @@ int EmSendCmdEx(uint8_t *resp, uint16_t respLen, bool collision);
 int EmGetCmd(uint8_t *received, uint16_t *len, uint8_t *par);
 int EmSendCmdPar(uint8_t *resp, uint16_t respLen, uint8_t *par);
 int EmSendCmdParEx(uint8_t *resp, uint16_t respLen, uint8_t *par, bool collision);
-int EmSendPrecompiledCmd(tag_response_info_t *response_info);
-
-void EmLogTraceReader(void);
+int EmSendPrecompiledCmd(tag_response_info_t *p_response);
 
 bool prepare_allocated_tag_modulation(tag_response_info_t *response_info, uint8_t **buffer, size_t *max_buffer_size);
 
diff --git a/armsrc/mifaresim.c b/armsrc/mifaresim.c
index 9cfb238f6..67d97acf4 100644
--- a/armsrc/mifaresim.c
+++ b/armsrc/mifaresim.c
@@ -1,4 +1,4 @@
-//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 // Merlok - June 2011, 2012
 // Gerhard de Koning Gans - May 2008
 // Hagen Fritsch - June 2010
@@ -152,7 +152,7 @@ static bool IsAccessAllowed(uint8_t blockNo, uint8_t keytype, uint8_t action) {
     }
 }
 
-static void MifareSimInit(uint16_t flags, uint8_t *datain, tag_response_info_t **responses, uint32_t *cuid, uint8_t *uid_len) {
+static bool MifareSimInit(uint16_t flags, uint8_t *datain, tag_response_info_t **responses, uint32_t *cuid, uint8_t *uid_len) {
 
     // SPEC: https://www.nxp.com/docs/en/application-note/AN10833.pdf
     // ATQA
@@ -323,8 +323,9 @@ static void MifareSimInit(uint16_t flags, uint8_t *datain, tag_response_info_t *
             break;
     }
 
+#define TAG_RESPONSE_COUNT 9
     static tag_response_info_t responses_init[TAG_RESPONSE_COUNT] = {
-        { .response = rATQA,     .response_n = sizeof(rATQA)     },		  // Answer to request - respond with card type
+        { .response = rATQA,     .response_n = sizeof(rATQA)     },		// Answer to request - respond with card type
         { .response = rUIDBCC1,  .response_n = sizeof(rUIDBCC1)  },	  	// Anticollision cascade1 - respond with first part of uid
         { .response = rUIDBCC2,  .response_n = sizeof(rUIDBCC2)  },		  // Anticollision cascade2 - respond with 2nd part of uid
         { .response = rUIDBCC3,  .response_n = sizeof(rUIDBCC3)  },		  // Anticollision cascade3 - respond with 3th part of uid
@@ -335,15 +336,23 @@ static void MifareSimInit(uint16_t flags, uint8_t *datain, tag_response_info_t *
         { .response = rSAK1,     .response_n = sizeof(rSAK1)     }		  // Acknowledge select - Need another cascades
     };
 
-    // Prepare ("precompile") the responses of the anticollision phase. There will be not enough time to do this at the moment the reader sends its REQA or SELECT
-    // There are 7 predefined responses with a total of 18 bytes data to transmit. Coded responses need one byte per bit to transfer (data, parity, start, stop, correction)
-    // 18 * 8 data bits, 18 * 1 parity bits, 5 start bits, 5 stop bits, 5 correction bits  ->   need 177 bytes buffer
+    // Prepare ("precompile") the responses of the anticollision phase.
+    // There will be not enough time to do this at the moment the reader sends its REQA or SELECT
+    // There are 9 predefined responses with a total of 32 bytes data to transmit.
+    // Coded responses need one byte per bit to transfer (data, parity, start, stop, correction)
+    // 32 * 8 data bits, 32 * 1 parity bits, 9 start bits, 9 stop bits, 9 correction bits  ->   need 315 bytes buffer
+#define ALLOCATED_TAG_MODULATION_BUFFER_SIZE 512
 
-    uint8_t *free_buffer_pointer = BigBuf_malloc(ALLOCATED_TAG_MODULATION_BUFFER_SIZE);
+    uint8_t *free_buffer = BigBuf_malloc(ALLOCATED_TAG_MODULATION_BUFFER_SIZE);
+    // modulation buffer pointer and current buffer free space size
+    uint8_t *free_buffer_pointer = free_buffer;
     size_t free_buffer_size = ALLOCATED_TAG_MODULATION_BUFFER_SIZE;
 
     for (size_t i = 0; i < TAG_RESPONSE_COUNT; i++) {
-        prepare_allocated_tag_modulation(&responses_init[i], &free_buffer_pointer, &free_buffer_size);
+        if (prepare_allocated_tag_modulation(&responses_init[i], &free_buffer_pointer, &free_buffer_size) == false) {
+            Dbprintf("Not enough modulation buffer size, exit after %d elements", i);
+            return false;
+        }
     }
 
     *responses = responses_init;
@@ -359,6 +368,7 @@ static void MifareSimInit(uint16_t flags, uint8_t *datain, tag_response_info_t *
 #define SAK_4    7
 #define SAK1     8
 
+    return true;
 }
 
 static bool HasValidCRC(uint8_t *receivedCmd, uint16_t receivedCmd_len) {
@@ -459,13 +469,17 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
         Dbprintf("Mifare 4K");
     }
 
-    MifareSimInit(flags, datain, &responses, &cuid, &uid_len);
+    // free eventually allocated BigBuf memory but keep Emulator Memory
+    BigBuf_free_keep_EM();
+
+    if (MifareSimInit(flags, datain, &responses, &cuid, &uid_len) == false) {
+        BigBuf_free_keep_EM();
+        return;
+    }
 
     // We need to listen to the high-frequency, peak-detected path.
     iso14443a_setup(FPGA_HF_ISO14443A_TAGSIM_LISTEN);
 
-    // free eventually allocated BigBuf memory but keep Emulator Memory
-    BigBuf_free_keep_EM();
     // clear trace
     clear_trace();
     set_tracing(true);
@@ -742,13 +756,6 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
 
                 if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("[MFEMUL_WORK] Enter in case");
 
-                if (receivedCmd_len != 4) {
-                    LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
-                    mf_crypto1_decryptEx(pcs, receivedCmd, receivedCmd_len, receivedCmd_dec);
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] All commands must have exactly 4 bytes: receivedCmd_len=%d - Cmd: %02X", receivedCmd_len, receivedCmd_dec);
-                    break;
-                }
-
                 if (receivedCmd_len == 0) {
                     if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] NO CMD received");
                     break;
@@ -824,8 +831,8 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                     }
 
                     cardSTATE = MFEMUL_AUTH1;
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] cardSTATE = MFEMUL_AUTH1 - rAUTH_AT: %02X", rAUTH_AT);
-                    continue;
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] cardSTATE = MFEMUL_AUTH1 - rAUTH_NT: %02X", rAUTH_NT);
+                    break;
                 }
 
                 // rule 13 of 7.5.3. in ISO 14443-4. chaining shall be continued
@@ -841,25 +848,26 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                     break;
                 }
 
-                //if (!encrypted_data) { // all other commands must be encrypted (authenticated)
-                //     if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Commands must be encrypted (authenticated)");
-                //     break;
-                //}
-
                 // case MFEMUL_WORK => if Cmd is Read, Write, Inc, Dec, Restore, Transfert
-                if (receivedCmd_dec[0] == ISO14443A_CMD_READBLOCK
+                if (receivedCmd_len == 4 && (receivedCmd_dec[0] == ISO14443A_CMD_READBLOCK
                         || receivedCmd_dec[0] == ISO14443A_CMD_WRITEBLOCK
                         || receivedCmd_dec[0] == MIFARE_CMD_INC
                         || receivedCmd_dec[0] == MIFARE_CMD_DEC
                         || receivedCmd_dec[0] == MIFARE_CMD_RESTORE
-                        || receivedCmd_dec[0] == MIFARE_CMD_TRANSFER) {
+                        || receivedCmd_dec[0] == MIFARE_CMD_TRANSFER)) {
+                    // all other commands must be encrypted (authenticated)
+                    if (!encrypted_data) {
+                        EmSend4bit(CARD_NACK_NA);
+                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] Commands must be encrypted (authenticated)");
+                        break;
+                    }
                     // Check if Block num is not too far
                     if (receivedCmd_dec[1] > MIFARE_4K_MAXBLOCK) {
                         EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
                         if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("[MFEMUL_WORK] Reader tried to operate (0x%02x) on out of range block: %d (0x%02x), nacking", receivedCmd_dec[0], receivedCmd_dec[1], receivedCmd_dec[1]);
                         break;
                     }
-                    if (receivedCmd_dec[1] / 4 != cardAUTHSC) {
+                    if (MifareBlockToSector(receivedCmd_dec[1]) != cardAUTHSC) {
                         EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
                         if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("[MFEMUL_WORK] Reader tried to operate (0x%02x) on block (0x%02x) not authenticated for (0x%02x), nacking", receivedCmd_dec[0], receivedCmd_dec[1], cardAUTHSC);
                         break;
@@ -867,7 +875,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                 }
 
                 // case MFEMUL_WORK => CMD READ block
-                if (receivedCmd_dec[0] == ISO14443A_CMD_READBLOCK) {
+                if (receivedCmd_len == 4 && receivedCmd_dec[0] == ISO14443A_CMD_READBLOCK) {
                     blockNo = receivedCmd_dec[1];
                     if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] Reader reading block %d (0x%02x)", blockNo, blockNo);
                     emlGetMem(response, blockNo, 1);
@@ -933,7 +941,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                 } // End receivedCmd_dec[0] == ISO14443A_CMD_READBLOCK
 
                 // case MFEMUL_WORK => CMD WRITEBLOCK
-                if (receivedCmd_dec[0] == ISO14443A_CMD_WRITEBLOCK) {
+                if (receivedCmd_len == 4 && receivedCmd_dec[0] == ISO14443A_CMD_WRITEBLOCK) {
                     blockNo = receivedCmd_dec[1];
                     if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] RECV 0xA0 write block %d (%02x)", blockNo, blockNo);
                     EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_ACK));
@@ -944,7 +952,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                 }
 
                 // case MFEMUL_WORK => CMD INC/DEC/REST
-                if (receivedCmd_dec[0] == MIFARE_CMD_INC || receivedCmd_dec[0] == MIFARE_CMD_DEC || receivedCmd_dec[0] == MIFARE_CMD_RESTORE) {
+                if (receivedCmd_len == 4 && (receivedCmd_dec[0] == MIFARE_CMD_INC || receivedCmd_dec[0] == MIFARE_CMD_DEC || receivedCmd_dec[0] == MIFARE_CMD_RESTORE)) {
                     blockNo = receivedCmd_dec[1];
                     if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] RECV 0x%02x inc(0xC1)/dec(0xC0)/restore(0xC2) block %d (%02x)", receivedCmd_dec[0], blockNo, blockNo);
                     if (emlCheckValBl(blockNo)) {
@@ -978,7 +986,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
 
 
                 // case MFEMUL_WORK => CMD TRANSFER
-                if (receivedCmd_dec[0] == MIFARE_CMD_TRANSFER) {
+                if (receivedCmd_len == 4 && receivedCmd_dec[0] == MIFARE_CMD_TRANSFER) {
                     blockNo = receivedCmd_dec[1];
                     if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] RECV 0x%02x transfer block %d (%02x)", receivedCmd_dec[0], blockNo, blockNo);
                     if (emlSetValBl(cardINTREG, cardINTBLOCK, receivedCmd_dec[1]))
@@ -989,17 +997,18 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                 }
 
                 // case MFEMUL_WORK => CMD HALT
-                if (receivedCmd_dec[0] == ISO14443A_CMD_HALT && receivedCmd[1] == 0x00) {
+                if (receivedCmd_len > 1 && receivedCmd_dec[0] == ISO14443A_CMD_HALT && receivedCmd_dec[1] == 0x00) {
                     LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
                     LED_B_OFF();
                     LED_C_OFF();
                     cardSTATE = MFEMUL_HALTED;
+                    cardAUTHKEY = AUTHKEYNONE;
                     if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("[MFEMUL_WORK] cardSTATE = MFEMUL_HALTED");
                     break;
                 }
 
                 // case MFEMUL_WORK => CMD RATS
-                if (receivedCmd[0] == ISO14443A_CMD_RATS) {
+                if (receivedCmd_dec[0] == ISO14443A_CMD_RATS) {
                     EmSend4bit(encrypted_data ? mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA) : CARD_NACK_NA);
                     if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("[MFEMUL_WORK] RCV RATS => NACK");
                     break;
@@ -1015,7 +1024,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
             case MFEMUL_AUTH1: {
                 if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("[MFEMUL_AUTH1] Enter case");
 
-                if (receivedCmd_len != 4) {
+                if (receivedCmd_len != 8) {
                     cardSTATE_TO_IDLE();
                     LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
                     if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("MFEMUL_AUTH1: receivedCmd_len != 8 (%d) => cardSTATE_TO_IDLE())", receivedCmd_len);
@@ -1101,8 +1110,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                                 );
                     }
                     cardAUTHKEY = AUTHKEYNONE;	// not authenticated
-                    // LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
-                    EmSend4bit(CARD_NACK_NA);
+                    EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
                     cardSTATE_TO_IDLE();
                     break;
                 }
@@ -1261,5 +1269,5 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     LEDsoff();
     set_tracing(false);
-
+    BigBuf_free_keep_EM();
 }
diff --git a/armsrc/mifaresim.h b/armsrc/mifaresim.h
index cbd5a4108..7f92815d5 100644
--- a/armsrc/mifaresim.h
+++ b/armsrc/mifaresim.h
@@ -36,13 +36,4 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
 #define AUTHKEYB                 1
 #define AUTHKEYNONE              0xff
 
-#define TAG_RESPONSE_COUNT 9								// number of precompiled responses
-
-// Prepare ("precompile") the responses of the anticollision phase.
-// There will be not enough time to do this at the moment the reader sends its REQA or SELECT
-// There are 7 predefined responses with a total of 18 bytes data to transmit.
-// Coded responses need one byte per bit to transfer (data, parity, start, stop, correction)
-// 18 * 8 data bits, 18 * 1 parity bits, 5 start bits, 5 stop bits, 5 correction bits  ->   need 177 bytes buffer
-#define ALLOCATED_TAG_MODULATION_BUFFER_SIZE 512	// number of bytes required for precompiled response
-
 #endif

From 6c1b8f809e996962216bdb406b0589bb60d32e34 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 10 Apr 2019 08:42:00 +0200
Subject: [PATCH 1152/1938] chg: update armside debug to fit with offical repo.

---
 armsrc/mifarecmd.c  |  4 ++--
 armsrc/mifaresim.c  |  5 +++--
 armsrc/mifareutil.c |  2 +-
 armsrc/mifareutil.h |  7 -------
 include/common.h    | 10 +++++-----
 5 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index ccf5be9e2..853721840 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -1809,7 +1809,7 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain) {
             if (!is1b) {
                 ReaderTransmit(wupC2, sizeof(wupC2), NULL);
                 if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
-                    if (MF_DBGLEVEL >= MF_DBG_ALL) Dbprintf("Assuming Magic Gen 1B tag. [wupC2 failed]");
+                    if (MF_DBGLEVEL >= MF_DBG_INFO) Dbprintf("Assuming Magic Gen 1B tag. [wupC2 failed]");
                     is1b = true;
                     continue;
                 }
@@ -1887,7 +1887,7 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain) {
             if (!is1b)  {
                 ReaderTransmit(wupC2, sizeof(wupC2), NULL);
                 if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
-                    if (MF_DBGLEVEL >= MF_DBG_ALL) Dbprintf("Assuming Magic Gen 1B tag. [wupC2 failed]");
+                    if (MF_DBGLEVEL >= MF_DBG_INFO) Dbprintf("Assuming Magic Gen 1B tag. [wupC2 failed]");
                     is1b = true;
                     continue;
                 }
diff --git a/armsrc/mifaresim.c b/armsrc/mifaresim.c
index 67d97acf4..7cb7b1860 100644
--- a/armsrc/mifaresim.c
+++ b/armsrc/mifaresim.c
@@ -13,9 +13,10 @@
 // Verbose Mode:
 // MF_DBG_NONE          0
 // MF_DBG_ERROR         1
-// MF_DBG_ALL           2
+// MF_DBG_INFO          2
+// MF_DBG_DEBUG         3
 // MF_DBG_EXTENDED      4
-//
+
 //  /!\ Printing Debug message is disrupting emulation, 
 //  Only use with caution during debugging 
 
diff --git a/armsrc/mifareutil.c b/armsrc/mifareutil.c
index 34266cd41..94ea29b03 100644
--- a/armsrc/mifareutil.c
+++ b/armsrc/mifareutil.c
@@ -216,7 +216,7 @@ int mifare_classic_readblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blo
     memcpy(bt, receivedAnswer + 16, 2);
     AddCrc14A(receivedAnswer, 16);
     if (bt[0] != receivedAnswer[16] || bt[1] != receivedAnswer[17]) {
-        if (MF_DBGLEVEL >= MF_DBG_ALL) Dbprintf("Cmd CRC response error.");
+        if (MF_DBGLEVEL >= MF_DBG_INFO) Dbprintf("Cmd CRC response error.");
         return 3;
     }
 
diff --git a/armsrc/mifareutil.h b/armsrc/mifareutil.h
index 38494ceb0..46f6fa81a 100644
--- a/armsrc/mifareutil.h
+++ b/armsrc/mifareutil.h
@@ -34,13 +34,6 @@
 // reader voltage field detector
 #define MF_MINFIELDV      4000
 
-// debug
-// 0 - no debug messages 1 - error messages 2 - all messages 4 - extended debug mode
-#define MF_DBG_NONE          0
-#define MF_DBG_ERROR         1
-#define MF_DBG_ALL           2
-#define MF_DBG_EXTENDED      4
-
 // Mifare 4k/2k/1k/mini Max Block / Max Sector
 #define MIFARE_4K_MAXBLOCK 256
 #define MIFARE_2K_MAXBLOCK 128
diff --git a/include/common.h b/include/common.h
index 8bf8ab702..87f059179 100644
--- a/include/common.h
+++ b/include/common.h
@@ -23,11 +23,11 @@ extern "C" {
 typedef unsigned char byte_t;
 
 // debug
-// 0 - no debug messages 1 - error messages 2 - all messages 4 - extended debug mode
-#define MF_DBG_NONE          0
-#define MF_DBG_ERROR         1
-#define MF_DBG_ALL           2
-#define MF_DBG_EXTENDED      4
+#define MF_DBG_NONE          0 // no messages 
+#define MF_DBG_ERROR         1 // errors only
+#define MF_DBG_INFO          2 // errors + info messages
+#define MF_DBG_DEBUG         3 // errors + info + debug messages
+#define MF_DBG_EXTENDED      4 // errors + info + debug + breaking debug messages
 extern int MF_DBGLEVEL;
 
 // Flashmem spi baudrate

From 1809d6c83959126c6a97671b01d47586950f645d Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 10 Apr 2019 08:52:45 +0200
Subject: [PATCH 1153/1938] unused

---
 client/cmdlfnexwatch.c | 2 +-
 client/cmdlft55xx.c    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/cmdlfnexwatch.c b/client/cmdlfnexwatch.c
index ffe3bd785..3f68ae818 100644
--- a/client/cmdlfnexwatch.c
+++ b/client/cmdlfnexwatch.c
@@ -60,7 +60,7 @@ int CmdNexWatchDemod(const char *Cmd) {
     setDemodBuff(DemodBuffer, size, idx + 4);
     setClockGrid(g_DemodClock, g_DemodStartIdx + ((idx + 4)*g_DemodClock));
 
-    idx = 8 + 32; // 8 = preamble, 32 = reserved bits (always 0)
+//    idx = 8 + 32; // 8 = preamble, 32 = reserved bits (always 0)
 
     //get ID
     uint32_t ID = 0;
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 465c99173..96a0bb78c 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -912,7 +912,7 @@ bool testBitRate(uint8_t readRate, uint8_t clk) {
 bool test(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk, bool *Q5) {
 
     if (DemodBufferLen < 64) return false;
-    uint8_t si = 0;
+    uint8_t si;
     for (uint8_t idx = 28; idx < 64; idx++) {
         si = idx;
         if (PackBits(si, 28, DemodBuffer) == 0x00) continue;

From d5dc1156e192f77a3ab572d6b4c228e458879c71 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 10 Apr 2019 08:54:33 +0200
Subject: [PATCH 1154/1938] unused

---
 client/cmdlfhid.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c
index 9dbb721cd..d46abe60e 100644
--- a/client/cmdlfhid.c
+++ b/client/cmdlfhid.c
@@ -453,11 +453,8 @@ void calcWiegand(uint8_t fmtlen, uint16_t fc, uint64_t cardno, uint8_t *bits) {
 int CmdHIDWiegand(const char *Cmd) {
     uint32_t oem = 0, fc = 0;
     uint64_t cardnum = 0;
-    uint64_t blocks = 0, wiegand = 0;
-
-    uint8_t bits[BITS];
+    uint8_t bits[BITS] = {0};
     uint8_t *bs = bits;
-    memset(bs, 0, sizeof(bits));
 
     uint8_t ctmp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) < 3 || ctmp == 'h') return usage_lf_hid_wiegand();
@@ -474,11 +471,11 @@ int CmdHIDWiegand(const char *Cmd) {
         memset(bits, 0x00, sizeof(bits));
         calcWiegand(fmtlen[i], fc, cardnum, bs);
         PrintAndLogEx(NORMAL, "ice:: %s \n", sprint_bin(bs, fmtlen[i]));
-        wiegand = (uint64_t)bytebits_to_byte(bs, 32) << 32 | bytebits_to_byte(bs + 32, 32);
+        uint64_t wiegand = (uint64_t)bytebits_to_byte(bs, 32) << 32 | bytebits_to_byte(bs + 32, 32);
 
         addHIDMarker(fmtlen[i], bs);
         PrintAndLogEx(NORMAL, "ice:: %s\n", sprint_bin(bs, BITS));
-        blocks = (uint64_t)bytebits_to_byte(bs + 32, 32) << 32 | bytebits_to_byte(bs + 64, 32);
+        uint64_t blocks = (uint64_t)bytebits_to_byte(bs + 32, 32) << 32 | bytebits_to_byte(bs + 64, 32);
         uint8_t shifts = 64 - fmtlen[i];
         wiegand >>= shifts;
 

From 0a43c80dff210631366c95b111af77e178fe17f6 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 10 Apr 2019 08:55:29 +0200
Subject: [PATCH 1155/1938] unused

---
 client/cmdlf.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/cmdlf.c b/client/cmdlf.c
index 1246b5f04..186184d78 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -194,7 +194,7 @@ int CmdFlexdemod(const char *Cmd) {
 #ifndef LONG_WAIT
 #define LONG_WAIT 100
 #endif
-    int i, j, start, bit, sum, phase = 0;
+    int i, j, start, bit, sum;
 
     int data[GraphTraceLen];
     memcpy(data, GraphBuffer, GraphTraceLen);
@@ -252,7 +252,7 @@ int CmdFlexdemod(const char *Cmd) {
     i = 0;
     for (bit = 0; bit < 64; bit++) {
 
-        phase = (bits[bit] == 0) ? 0 : 1;
+        int phase = (bits[bit] == 0) ? 0 : 1;
 
         for (j = 0; j < 32; j++) {
             GraphBuffer[i++] = phase;

From 84233a8f8522aadea571566c7a68a9b23dfe059b Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 10 Apr 2019 08:57:23 +0200
Subject: [PATCH 1156/1938] unused

---
 client/cmdhfmfdes.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/client/cmdhfmfdes.c b/client/cmdhfmfdes.c
index e0c4245bc..af2da2489 100644
--- a/client/cmdhfmfdes.c
+++ b/client/cmdhfmfdes.c
@@ -398,9 +398,9 @@ void GetKeySettings(uint8_t *aid) {
         int numOfKeys;
 
         isOK  = resp.arg[0] & 0xff;
-        if (!isOK) {
+        if (isOK == false) {
             PrintAndLogEx(WARNING, "   Can't read Application Master key version. Trying all keys");
-            numOfKeys = MAX_NUM_KEYS;
+            //numOfKeys = MAX_NUM_KEYS;
         } else {
             numOfKeys = resp.d.asBytes[4];
             PrintAndLogEx(NORMAL, "");
@@ -411,6 +411,7 @@ void GetKeySettings(uint8_t *aid) {
 
         // LOOP over numOfKeys that we got before.
         // From 0x01 to numOfKeys.  We already got 0x00. (AMK)
+        // TODO (iceman)
         for (int i = 0x01; i <= 0x0f; ++i) {
 
         }

From 9c78f4d6d07971852b8a3a26218d6d482e763c11 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 10 Apr 2019 08:58:08 +0200
Subject: [PATCH 1157/1938] unused

---
 client/cmdhfmfdes.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdhfmfdes.c b/client/cmdhfmfdes.c
index af2da2489..801e07ced 100644
--- a/client/cmdhfmfdes.c
+++ b/client/cmdhfmfdes.c
@@ -255,7 +255,7 @@ void GetKeySettings(uint8_t *aid) {
     char messStr[512] = {0x00};
     char *str = messStr;
     uint8_t isOK = 0;
-    uint32_t options = NONE;
+    uint32_t options;
     UsbCommand c = {CMD_MIFARE_DESFIRE};
     UsbCommand resp;
 

From 2b582c9bd0ff32dce5545481122f7050d7def5dc Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 10 Apr 2019 09:00:38 +0200
Subject: [PATCH 1158/1938] unused

---
 client/cmdhflegic.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index 85920e813..13f961e82 100644
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -456,7 +456,7 @@ int CmdLegicInfo(const char *Cmd) {
         PrintAndLogEx(NORMAL, "\nrow  | data");
         PrintAndLogEx(NORMAL, "-----+------------------------------------------------");
         print_hex_break(data + i, remain_seg_payload_len, 16);
-        i += remain_seg_payload_len;
+//        i += remain_seg_payload_len;
 
         PrintAndLogEx(NORMAL, "-----+------------------------------------------------\n");
     }
@@ -820,12 +820,11 @@ void legic_chk_iv(uint32_t *iv) {
     }
 }
 void legic_seteml(uint8_t *src, uint32_t offset, uint32_t numofbytes) {
-    size_t len = 0;
 
     UsbCommand c = {CMD_LEGIC_ESET, {0, 0, 0}};
     for (size_t i = offset; i < numofbytes; i += USB_CMD_DATA_SIZE) {
 
-        len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);
+        size_t len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);
         c.arg[0] = i; // offset
         c.arg[1] = len; // number of bytes
         memcpy(c.d.asBytes, src + i, len);
@@ -1053,12 +1052,11 @@ int CmdLegicRestore(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "Restoring to card");
 
     // transfer to device
-    size_t len = 0;
     UsbCommand c = {CMD_WRITER_LEGIC_RF, {0, 0, 0x55}};
     UsbCommand resp;
     for (size_t i = 7; i < numofbytes; i += USB_CMD_DATA_SIZE) {
 
-        len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);
+        size_t len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);
         c.arg[0] = i; // offset
         c.arg[1] = len; // number of bytes
         memcpy(c.d.asBytes, data + i, len);
@@ -1247,14 +1245,13 @@ int CmdLegicWipe(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "Erasing");
 
     // transfer to device
-    size_t len = 0;
     UsbCommand c = {CMD_WRITER_LEGIC_RF, {0, 0, 0x55}};
     UsbCommand resp;
     for (size_t i = 7; i < card.cardsize; i += USB_CMD_DATA_SIZE) {
 
         printf(".");
         fflush(stdout);
-        len = MIN((card.cardsize - i), USB_CMD_DATA_SIZE);
+        size_t len = MIN((card.cardsize - i), USB_CMD_DATA_SIZE);
         c.arg[0] = i; // offset
         c.arg[1] = len; // number of bytes
         memcpy(c.d.asBytes, data + i, len);

From e8b75582be288c9c7b790aef61e71cf8ccca8ff3 Mon Sep 17 00:00:00 2001
From: "osboxes.org" <iceman@iuse.se>
Date: Wed, 10 Apr 2019 09:32:07 +0200
Subject: [PATCH 1159/1938] style

---
 armsrc/fpgaloader.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/armsrc/fpgaloader.c b/armsrc/fpgaloader.c
index 63957067f..b70bad2e4 100644
--- a/armsrc/fpgaloader.c
+++ b/armsrc/fpgaloader.c
@@ -230,9 +230,9 @@ static bool reset_fpga_stream(int bitstream_version, z_streamp compressed_fpga_s
     compressed_fpga_stream->zfree = &fpga_inflate_free;
 
     int res = inflateInit2(compressed_fpga_stream, 0);
-    if ( res < 0 )
+    if (res < 0)
         return false;
-    
+
     fpga_image_ptr = output_buffer;
 
     for (uint16_t i = 0; i < FPGA_BITSTREAM_FIXED_HEADER_SIZE; i++)

From 98b1172098d571c816618c75e25278f670ab4722 Mon Sep 17 00:00:00 2001
From: "osboxes.org" <iceman@iuse.se>
Date: Wed, 10 Apr 2019 09:32:40 +0200
Subject: [PATCH 1160/1938] style

---
 armsrc/start.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/armsrc/start.c b/armsrc/start.c
index 0b48fc601..94eb429ac 100644
--- a/armsrc/start.c
+++ b/armsrc/start.c
@@ -49,7 +49,7 @@ static void uncompress_data_section(void) {
 
     // initialize zlib for inflate
     int res = inflateInit2(&data_section, 15);
-    if ( res < 0 )
+    if (res < 0)
         return;
 
     // uncompress data segment to RAM

From 05648163c1233142b2bb82118386195f80a8ba4a Mon Sep 17 00:00:00 2001
From: "osboxes.org" <iceman@iuse.se>
Date: Wed, 10 Apr 2019 09:32:49 +0200
Subject: [PATCH 1161/1938] style

---
 armsrc/mifaresim.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/armsrc/mifaresim.c b/armsrc/mifaresim.c
index 7cb7b1860..4f32f6b53 100644
--- a/armsrc/mifaresim.c
+++ b/armsrc/mifaresim.c
@@ -17,8 +17,8 @@
 // MF_DBG_DEBUG         3
 // MF_DBG_EXTENDED      4
 
-//  /!\ Printing Debug message is disrupting emulation, 
-//  Only use with caution during debugging 
+//  /!\ Printing Debug message is disrupting emulation,
+//  Only use with caution during debugging
 
 
 #include "iso14443a.h"
@@ -667,7 +667,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                             switch (MifareCardType) {
                                 case 0: // Mifare Mini
                                     EmSendPrecompiledCmd(&responses[SAK_MINI]);
-                                    break; 
+                                    break;
                                 case 1: // Mifare 1K
                                     EmSendPrecompiledCmd(&responses[SAK_1]);
                                     break;
@@ -851,11 +851,11 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
 
                 // case MFEMUL_WORK => if Cmd is Read, Write, Inc, Dec, Restore, Transfert
                 if (receivedCmd_len == 4 && (receivedCmd_dec[0] == ISO14443A_CMD_READBLOCK
-                        || receivedCmd_dec[0] == ISO14443A_CMD_WRITEBLOCK
-                        || receivedCmd_dec[0] == MIFARE_CMD_INC
-                        || receivedCmd_dec[0] == MIFARE_CMD_DEC
-                        || receivedCmd_dec[0] == MIFARE_CMD_RESTORE
-                        || receivedCmd_dec[0] == MIFARE_CMD_TRANSFER)) {
+                                             || receivedCmd_dec[0] == ISO14443A_CMD_WRITEBLOCK
+                                             || receivedCmd_dec[0] == MIFARE_CMD_INC
+                                             || receivedCmd_dec[0] == MIFARE_CMD_DEC
+                                             || receivedCmd_dec[0] == MIFARE_CMD_RESTORE
+                                             || receivedCmd_dec[0] == MIFARE_CMD_TRANSFER)) {
                     // all other commands must be encrypted (authenticated)
                     if (!encrypted_data) {
                         EmSend4bit(CARD_NACK_NA);

From 260ad9b7ae762d87712100b3835ac83478253f1b Mon Sep 17 00:00:00 2001
From: "osboxes.org" <iceman@iuse.se>
Date: Wed, 10 Apr 2019 09:32:55 +0200
Subject: [PATCH 1162/1938] style

---
 armsrc/string.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/armsrc/string.c b/armsrc/string.c
index e8caff26e..517c59e0a 100644
--- a/armsrc/string.c
+++ b/armsrc/string.c
@@ -52,7 +52,7 @@ int strlen(const char *str) {
     const char *p;
     for (p = str; *p != '\0'; ++p) {
     }
-    return p-str;
+    return p - str;
 }
 
 char *strncat(char *dest, const char *src, unsigned int n) {

From ad522439810a9f8507ea1adfb496581e12beafb4 Mon Sep 17 00:00:00 2001
From: "osboxes.org" <iceman@iuse.se>
Date: Wed, 10 Apr 2019 09:36:23 +0200
Subject: [PATCH 1163/1938] style

---
 client/cmddata.c       |  4 ++--
 client/cmdhfmf.c       |  2 +-
 client/fpga_compress.c |  4 ++--
 common/lfdemod.c       | 22 +++++++++++-----------
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/client/cmddata.c b/client/cmddata.c
index b00de9adb..bbff0dc88 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -1584,7 +1584,7 @@ int CmdTuneSamples(const char *Cmd) {
         GraphBuffer[i] = resp.d.asBytes[i] - 128;
         test1 += resp.d.asBytes[i];
     }
-    
+
     if (test1 > 0) {
         PrintAndLogEx(SUCCESS, "\nDisplaying LF tuning graph. Divisor 89 is 134khz, 95 is 125khz.\n\n");
         GraphTraceLen = 256;
@@ -1979,7 +1979,7 @@ int FSKToNRZ(int *data, int *dataLen, int clk, int LowToneFC, int HighToneFC) {
     // currently only know fsk modulations with field clocks < 10 samples and > 4 samples. filter out to remove false positives (and possibly destroying ask/psk modulated waves...)
     if (ans == 0 || clk == 0 || LowToneFC == 0 || HighToneFC == 0 || LowToneFC > 10 || HighToneFC < 4) {
         if (g_debugMode > 1) {
-            PrintAndLogEx(NORMAL,"DEBUG FSKtoNRZ: no fsk clocks found");
+            PrintAndLogEx(NORMAL, "DEBUG FSKtoNRZ: no fsk clocks found");
         }
         return 0;
     }
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index e78c07c76..2a768862a 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -1734,7 +1734,7 @@ out:
 
         if (transferToEml) {
             uint8_t block[16] = {0x00};
-            for ( i = 0; i < sectorsCnt; ++i) {
+            for (i = 0; i < sectorsCnt; ++i) {
                 mfEmlGetMem(block, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
                 if (e_sector[i].foundKey[0])
                     num_to_bytes(e_sector[i].Key[0], 6, block);
diff --git a/client/fpga_compress.c b/client/fpga_compress.c
index 4b0350c06..4cb45616b 100644
--- a/client/fpga_compress.c
+++ b/client/fpga_compress.c
@@ -206,9 +206,9 @@ int zlib_decompress(FILE *infile, FILE *outfile) {
     compressed_fpga_stream.opaque = Z_NULL;
 
     ret = inflateInit2(&compressed_fpga_stream, 0);
-    if ( ret < 0 )
+    if (ret < 0)
         return (EXIT_FAILURE);
-    
+
     do {
         if (compressed_fpga_stream.avail_in == 0) {
             compressed_fpga_stream.next_in = inbuf;
diff --git a/common/lfdemod.c b/common/lfdemod.c
index 35a3385d3..81a8bb545 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -1413,14 +1413,14 @@ int manrawdecode(uint8_t *bits, size_t *size, uint8_t invert, uint8_t *alignPos)
     //find correct start position [alignment]
     for (k = 0; k < 2; ++k) {
         for (i = k; i < *size - 1; i += 2) {
-          
+
             if (bits[i] == bits[i + 1])
                 errCnt++;
-            
-            if ( errCnt > 50) 
+
+            if (errCnt > 50)
                 break;
         }
-        
+
         if (bestErr > errCnt) {
             bestErr = errCnt;
             bestRun = k;
@@ -1428,7 +1428,7 @@ int manrawdecode(uint8_t *bits, size_t *size, uint8_t invert, uint8_t *alignPos)
         }
         errCnt = 0;
     }
-    
+
     *alignPos = bestRun;
     //decode
     for (i = bestRun; i < *size - 1; i += 2) {
@@ -1467,9 +1467,9 @@ int cleanAskRawDemod(uint8_t *bits, size_t *size, int clk, int invert, int high,
             if ((bits[i] >= high && !waveHigh) || (bits[i] <= low && waveHigh)) {
 
                 // 8  ::   8-2-1 =  5   8+2+1 = 11
-                // 16 ::  16-4-1 = 11  16+4+1 = 21 
+                // 16 ::  16-4-1 = 11  16+4+1 = 21
                 // 32 ::  32-8-1 = 23  32+8+1 = 41
-                
+
                 if (smplCnt > clk - cl_4 - 1) { //full clock
 
                     if (smplCnt > clk + cl_4 + 1) { //too many samples
@@ -1517,11 +1517,11 @@ int cleanAskRawDemod(uint8_t *bits, size_t *size, int clk, int invert, int high,
     }
     *size = bitCnt;
 
-    if ( *startIdx < 0 )
+    if (*startIdx < 0)
         *startIdx = 0;
-    
+
     if (g_debugMode == 2) prnt("DEBUG ASK: cleanAskRawDemod Startidx %u ", *startIdx);
-   
+
     return errCnt;
 }
 
@@ -1912,7 +1912,7 @@ int pskRawDemod_ext(uint8_t *dest, size_t *size, int *clock, int *invert, int *s
         prnt("DEBUG PSK: firstFullWave: %u, waveLen: %u, startIdx %i", firstFullWave, fullWaveLen, *startIdx);
         prnt("DEBUG PSK: clk: %d, lastClkBit: %u, fc: %u", *clock, lastClkBit, fc);
     }
-    
+
     waveStart = 0;
     dest[numBits++] = curPhase; //set first read bit
     for (i = firstFullWave + fullWaveLen - 1; i < *size - 3; i++) {

From 827cd721fef425fee39b411f4673a4a5585ac7e6 Mon Sep 17 00:00:00 2001
From: "osboxes.org" <iceman@iuse.se>
Date: Wed, 10 Apr 2019 09:37:46 +0200
Subject: [PATCH 1164/1938] style

---
 client/emv/emvcore.c | 88 ++++++++++++++++++++++----------------------
 client/emv/emvcore.h |  4 +-
 2 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/client/emv/emvcore.c b/client/emv/emvcore.c
index d30c307d4..086c72674 100644
--- a/client/emv/emvcore.c
+++ b/client/emv/emvcore.c
@@ -66,7 +66,7 @@ static const TAIDList AIDlist [] = {
     { CV_MASTERCARD, "A0000000046000" },         // Cirrus
     { CV_MASTERCARD, "A0000000048002" },         // SecureCode Auth EMV-CAP
     { CV_MASTERCARD, "A0000000049999" },         // MasterCard PayPass
-	{ CV_MASTERCARD, "B012345678" },             // Maestro TEST Used for development
+    { CV_MASTERCARD, "B012345678" },             // Maestro TEST Used for development
     // American Express
     { CV_AMERICANEXPRESS, "A000000025" },
     { CV_AMERICANEXPRESS, "A0000000250000" },
@@ -83,41 +83,41 @@ static const TAIDList AIDlist [] = {
     // JCB CO., LTD.
     { CV_JCB, "A00000006510" },                  // JCB
     { CV_JCB, "A0000000651010" },                // JCB J Smart Credit
-	// Switch Card Services Ltd.
-	{ CV_SWITCH, "A0000000050001" },             // Maestro UK
-	{ CV_SWITCH, "A0000000050002" },             // Solo
-	// Diners Club International Ltd.
-	{ CV_DINERS, "A0000001523010" },             // Discover, Pulse D Pas Discover Card
-	{ CV_DINERS, "A0000001524010" },             // Discover, Discover Debit Common Card
+    // Switch Card Services Ltd.
+    { CV_SWITCH, "A0000000050001" },             // Maestro UK
+    { CV_SWITCH, "A0000000050002" },             // Solo
+    // Diners Club International Ltd.
+    { CV_DINERS, "A0000001523010" },             // Discover, Pulse D Pas Discover Card
+    { CV_DINERS, "A0000001524010" },             // Discover, Discover Debit Common Card
     // Other
-	{ CV_OTHER, "A00000002401" },                // Midland Bank Plc - Self Service
-	{ CV_OTHER, "A0000000291010" },              // LINK Interchange Network Ltd - Link / American Express
-	{ CV_OTHER, "A00000006900" },                // Société Européenne de Monnaie Electronique SEME - Moneo
-	{ CV_OTHER, "A000000077010000021000000000003B" },  // Oberthur Technologies France - Visa AEPN
-	{ CV_OTHER, "A0000001211010" },              // PBS Danmark A/S - Denmark - Dankort (VISA GEM Vision) - Danish domestic debit card
-	{ CV_OTHER, "A0000001410001" },              // Associazione Bancaria Italiana - Italy - PagoBANCOMAT - CoGeBan Consorzio BANCOMAT (Italian domestic debit card)
-	{ CV_OTHER, "A0000001544442" },              // Banricompras Debito - Banrisul - Banco do Estado do Rio Grande do SUL - S.A.
-	{ CV_OTHER, "A000000172950001" },            // Financial Information Service Co. Ltd. - Taiwan - BAROC Financial Application Taiwan- The Bankers Association of the Republic of China
-	{ CV_OTHER, "A0000001850002" },              // Post Office Limited - United Kingdom - UK Post Office Account card
-	{ CV_OTHER, "A0000002281010" },              // Saudi Arabian Monetary Agency (SAMA) - Kingdom of Saudi Arabia - SPAN (M/Chip) - SPAN2 (Saudi Payments Network) - Saudi Arabia domestic credit/debit card (Saudi Arabia Monetary Agency)
-	{ CV_OTHER, "A0000002282010" },              // Saudi Arabian Monetary Agency (SAMA) - Kingdom of Saudi Arabia - SPAN (VIS) - SPAN2 (Saudi Payments Network) - Saudi Arabia domestic credit/debit card (Saudi Arabia Monetary Agency)
-	{ CV_OTHER, "A0000002771010" },              // Interac Association - Canada - INTERAC - Canadian domestic credit/debit card
-	{ CV_OTHER, "A00000031510100528" },          // Currence Holding/PIN BV - The Netherlands- Currence PuC
-	{ CV_OTHER, "A0000003156020" },              // Currence Holding/PIN BV - The Netherlands - Chipknip
-	{ CV_OTHER, "A0000003591010028001" },        // Euro Alliance of Payment Schemes s.c.r.l. (EAPS) - Belgium - Girocard EAPS - ZKA (Germany)
-	{ CV_OTHER, "A0000003710001" },              // Verve - Nigeria - InterSwitch Verve Card - Nigerian local switch company
-	{ CV_OTHER, "A0000004540010" },              // eTranzact - Nigeria - Etranzact Genesis Card - Nigerian local switch company
-	{ CV_OTHER, "A0000004540011" },              // eTranzact - Nigeria - Etranzact Genesis Card 2 - Nigerian local switch company
-	{ CV_OTHER, "A0000004766C" },                // Google - United States - GOOGLE_PAYMENT_AID
-	{ CV_OTHER, "A0000005241010" },              // RuPay - India - RuPay - RuPay (India)
-	{ CV_OTHER, "A0000006723010" },              // TROY - Turkey - TROY chip credit card - Turkey's Payment Method
-	{ CV_OTHER, "A0000006723020" },              // TROY - Turkey - TROY chip debit card - Turkey's Payment Method
-	{ CV_OTHER, "A0000007705850" },              // Indian Oil Corporation Limited - India - XTRAPOWER Fleet Card Program - Indian Oil’s Pre Paid Program
-	{ CV_OTHER, "D27600002545500100" },          // ZKA - Germany - Girocard - ZKA Girocard (Geldkarte) (Germany)
-	{ CV_OTHER, "D4100000030001" },              // KS X 6923/6924 (T-Money, South Korea and Snapper+, Wellington, New Zealand)
-	{ CV_OTHER, "D5280050218002" },              // The Netherlands - ? - (Netherlands)
+    { CV_OTHER, "A00000002401" },                // Midland Bank Plc - Self Service
+    { CV_OTHER, "A0000000291010" },              // LINK Interchange Network Ltd - Link / American Express
+    { CV_OTHER, "A00000006900" },                // Société Européenne de Monnaie Electronique SEME - Moneo
+    { CV_OTHER, "A000000077010000021000000000003B" },  // Oberthur Technologies France - Visa AEPN
+    { CV_OTHER, "A0000001211010" },              // PBS Danmark A/S - Denmark - Dankort (VISA GEM Vision) - Danish domestic debit card
+    { CV_OTHER, "A0000001410001" },              // Associazione Bancaria Italiana - Italy - PagoBANCOMAT - CoGeBan Consorzio BANCOMAT (Italian domestic debit card)
+    { CV_OTHER, "A0000001544442" },              // Banricompras Debito - Banrisul - Banco do Estado do Rio Grande do SUL - S.A.
+    { CV_OTHER, "A000000172950001" },            // Financial Information Service Co. Ltd. - Taiwan - BAROC Financial Application Taiwan- The Bankers Association of the Republic of China
+    { CV_OTHER, "A0000001850002" },              // Post Office Limited - United Kingdom - UK Post Office Account card
+    { CV_OTHER, "A0000002281010" },              // Saudi Arabian Monetary Agency (SAMA) - Kingdom of Saudi Arabia - SPAN (M/Chip) - SPAN2 (Saudi Payments Network) - Saudi Arabia domestic credit/debit card (Saudi Arabia Monetary Agency)
+    { CV_OTHER, "A0000002282010" },              // Saudi Arabian Monetary Agency (SAMA) - Kingdom of Saudi Arabia - SPAN (VIS) - SPAN2 (Saudi Payments Network) - Saudi Arabia domestic credit/debit card (Saudi Arabia Monetary Agency)
+    { CV_OTHER, "A0000002771010" },              // Interac Association - Canada - INTERAC - Canadian domestic credit/debit card
+    { CV_OTHER, "A00000031510100528" },          // Currence Holding/PIN BV - The Netherlands- Currence PuC
+    { CV_OTHER, "A0000003156020" },              // Currence Holding/PIN BV - The Netherlands - Chipknip
+    { CV_OTHER, "A0000003591010028001" },        // Euro Alliance of Payment Schemes s.c.r.l. (EAPS) - Belgium - Girocard EAPS - ZKA (Germany)
+    { CV_OTHER, "A0000003710001" },              // Verve - Nigeria - InterSwitch Verve Card - Nigerian local switch company
+    { CV_OTHER, "A0000004540010" },              // eTranzact - Nigeria - Etranzact Genesis Card - Nigerian local switch company
+    { CV_OTHER, "A0000004540011" },              // eTranzact - Nigeria - Etranzact Genesis Card 2 - Nigerian local switch company
+    { CV_OTHER, "A0000004766C" },                // Google - United States - GOOGLE_PAYMENT_AID
+    { CV_OTHER, "A0000005241010" },              // RuPay - India - RuPay - RuPay (India)
+    { CV_OTHER, "A0000006723010" },              // TROY - Turkey - TROY chip credit card - Turkey's Payment Method
+    { CV_OTHER, "A0000006723020" },              // TROY - Turkey - TROY chip debit card - Turkey's Payment Method
+    { CV_OTHER, "A0000007705850" },              // Indian Oil Corporation Limited - India - XTRAPOWER Fleet Card Program - Indian Oil’s Pre Paid Program
+    { CV_OTHER, "D27600002545500100" },          // ZKA - Germany - Girocard - ZKA Girocard (Geldkarte) (Germany)
+    { CV_OTHER, "D4100000030001" },              // KS X 6923/6924 (T-Money, South Korea and Snapper+, Wellington, New Zealand)
+    { CV_OTHER, "D5280050218002" },              // The Netherlands - ? - (Netherlands)
     { CV_OTHER, "D5780000021010" },              // Bankaxept    Norway  Bankaxept   Norwegian domestic debit card
-	{ CV_OTHER, "F0000000030001" },              // BRADESCO - Brazilian Bank Banco Bradesco    
+    { CV_OTHER, "F0000000030001" },              // BRADESCO - Brazilian Bank Banco Bradesco
 };
 static const size_t AIDlistLen = sizeof(AIDlist) / sizeof(TAIDList);
 
@@ -434,8 +434,8 @@ int EMVSearchPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldO
     int res;
     bool fileFound = false;
 
-	char *PSE_or_PPSE = PSENum == 1 ? "PSE" : "PPSE";
-	
+    char *PSE_or_PPSE = PSENum == 1 ? "PSE" : "PPSE";
+
     // select PPSE
     res = EMVSelectPSE(channel, ActivateField, true, PSENum, data, sizeof(data), &datalen, &sw);
 
@@ -485,7 +485,7 @@ int EMVSearchPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldO
                         if (tsfi) {
                             struct tlvdb *tsfitmp = tlvdb_find_path(tsfi, (tlv_tag_t[]) {0x70, 0x61, 0x00});
                             if (!tsfitmp) {
-								PrintAndLogEx(FAILED, "SFI 0x%02d doesn't have any records.", sfidatalen[ui]);
+                                PrintAndLogEx(FAILED, "SFI 0x%02d doesn't have any records.", sfidatalen[ui]);
                                 continue;
                             }
                             res = EMVCheckAID(channel, decodeTLV, tsfitmp, tlv);
@@ -505,14 +505,14 @@ int EMVSearchPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldO
             }
 
             if (!fileFound)
-				PrintAndLogEx(FAILED, "PPSE doesn't have any records.");
+                PrintAndLogEx(FAILED, "PPSE doesn't have any records.");
 
             tlvdb_free(t);
         } else {
-			PrintAndLogEx(WARNING, "%s ERROR: Can't get TLV from response.", PSE_or_PPSE);
+            PrintAndLogEx(WARNING, "%s ERROR: Can't get TLV from response.", PSE_or_PPSE);
         }
     } else {
-		PrintAndLogEx(WARNING, "%s ERROR: Can't select PPSE AID. Error: %d", PSE_or_PPSE, res);
+        PrintAndLogEx(WARNING, "%s ERROR: Can't select PPSE AID. Error: %d", PSE_or_PPSE, res);
     }
 
     if (!LeaveFieldON)
@@ -831,7 +831,7 @@ int trDDA(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlv) {
             return 4;
         }
 
-		PrintAndLogEx(NORMAL, "\n* Calc DDOL");
+        PrintAndLogEx(NORMAL, "\n* Calc DDOL");
         const struct tlv *ddol_tlv = tlvdb_get(tlv, 0x9f49, NULL);
         if (!ddol_tlv) {
             ddol_tlv = &default_ddol_tlv;
@@ -849,7 +849,7 @@ int trDDA(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlv) {
 
         PrintAndLogEx(NORMAL, "DDOL data[%d]: %s", ddol_data_tlv->len, sprint_hex(ddol_data_tlv->value, ddol_data_tlv->len));
 
-		PrintAndLogEx(NORMAL, "\n* Internal Authenticate");
+        PrintAndLogEx(NORMAL, "\n* Internal Authenticate");
         int res = EMVInternalAuthenticate(channel, true, (uint8_t *)ddol_data_tlv->value, ddol_data_tlv->len, buf, sizeof(buf), &len, &sw, NULL);
         if (res) {
             PrintAndLogEx(WARNING, "Internal Authenticate error(%d): %4x. Exit...", res, sw);
@@ -876,7 +876,7 @@ int trDDA(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlv) {
                 tlvdb_free(t80);
 
                 if (decodeTLV) {
-					PrintAndLogEx(NORMAL, "* * Decode response format 1:");
+                    PrintAndLogEx(NORMAL, "* * Decode response format 1:");
                     TLVPrintFromTLV(dda_db);
                 }
             }
@@ -967,7 +967,7 @@ int trCDA(struct tlvdb *tlv, struct tlvdb *ac_tlv, struct tlv *pdol_data_tlv, st
 
     struct emv_pk *icc_pk = emv_pki_recover_icc_cert(issuer_pk, tlv, sda_tlv);
     if (!icc_pk) {
-		PrintAndLogEx(WARNING, "Error: ICC certificate not found. Exit.");
+        PrintAndLogEx(WARNING, "Error: ICC certificate not found. Exit.");
         emv_pk_free(pk);
         emv_pk_free(issuer_pk);
         return 2;
diff --git a/client/emv/emvcore.h b/client/emv/emvcore.h
index 25adc2b85..94d929f06 100644
--- a/client/emv/emvcore.h
+++ b/client/emv/emvcore.h
@@ -61,8 +61,8 @@ enum CardPSVendor {
     CV_AMERICANEXPRESS,
     CV_JCB,
     CV_CB,
-	CV_SWITCH,
-	CV_DINERS,
+    CV_SWITCH,
+    CV_DINERS,
     CV_OTHER,
 };
 enum CardPSVendor GetCardPSVendor(uint8_t *AID, size_t AIDlen);

From ba45da1c2883818fddac2a198ef45dc893674a17 Mon Sep 17 00:00:00 2001
From: "osboxes.org" <iceman@iuse.se>
Date: Wed, 10 Apr 2019 09:38:33 +0200
Subject: [PATCH 1165/1938] style

---
 client/cmdhfepa.c     |  6 +++---
 client/cmdhfmfhard.c  | 36 ++++++++++++++++++------------------
 client/cmdlfpyramid.c | 14 +++++++-------
 3 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/client/cmdhfepa.c b/client/cmdhfepa.c
index ecd185783..b5f60c403 100644
--- a/client/cmdhfepa.c
+++ b/client/cmdhfepa.c
@@ -81,11 +81,11 @@ int CmdHFEPAPACEReplay(const char *Cmd) {
         while (Cmd[skip] != ' ' && Cmd[skip] != '\0') {
             // convert
             scan_return = sscanf(Cmd + skip,
-                                "%2X%n",
+                                 "%2X%n",
                                  (unsigned int *)(apdus[i] + apdu_lengths[i]),
                                  &skip_add
-                                 );
-                                 
+                                );
+
             if (scan_return < 1) {
                 PrintAndLogEx(NORMAL, (char *)usage_msg);
                 PrintAndLogEx(WARNING, "Not enough APDUs! Try again!");
diff --git a/client/cmdhfmfhard.c b/client/cmdhfmfhard.c
index 787a8f8c8..683879fec 100644
--- a/client/cmdhfmfhard.c
+++ b/client/cmdhfmfhard.c
@@ -1664,7 +1664,7 @@ static bool all_bitflips_match(uint8_t byte, uint32_t state, odd_even_t odd_even
         bool found_match = false;
         for (uint8_t remaining_bits = 0; remaining_bits <= (~mask & 0xff); remaining_bits++) {
             if (remaining_bits_match(num_common, bytes_diff, state, (state & mask) | remaining_bits, odd_even)) {
-                
+
 #ifdef DEBUG_KEY_ELIMINATION
                 if (bitflips_match(byte2, (state & mask) | remaining_bits, odd_even, true)) {
 #else
@@ -1675,9 +1675,9 @@ static bool all_bitflips_match(uint8_t byte, uint32_t state, odd_even_t odd_even
                 }
             }
         }
-        
+
         if (!found_match) {
-            
+
 #ifdef DEBUG_KEY_ELIMINATION
             if (known_target_key != -1 && state == test_state[odd_even]) {
                 PrintAndLogEx(NORMAL, "all_bitflips_match() 1st Byte: %s test state (0x%06x): Eliminated. Bytes = %02x, %02x, Common Bits = %d\n",
@@ -2084,10 +2084,10 @@ static uint16_t SumProperty(struct Crypto1State *s) {
 }
 
 static void Tests() {
-    
+
     if (known_target_key == -1)
         return;
-    
+
     for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
         uint32_t *bitset = nonces[best_first_bytes[0]].states_bitarray[odd_even];
         if (!test_bit24(bitset, test_state[odd_even])) {
@@ -2106,10 +2106,10 @@ static void Tests() {
 }
 
 static void Tests2(void) {
-    
+
     if (known_target_key == -1)
         return;
-    
+
     for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
         uint32_t *bitset = nonces[best_first_byte_smallest_bitarray].states_bitarray[odd_even];
         if (!test_bit24(bitset, test_state[odd_even])) {
@@ -2118,7 +2118,7 @@ static void Tests2(void) {
                           best_first_byte_smallest_bitarray);
         }
     }
-    
+
     for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
         uint32_t *bitset = all_bitflips_bitarray[odd_even];
         if (!test_bit24(bitset, test_state[odd_even])) {
@@ -2167,7 +2167,7 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc
             hardnested_print_progress(0, progress_text, (float)(1LL << 47), 0);
             sprintf(progress_text, "Starting Test #%" PRIu32 " ...", i + 1);
             hardnested_print_progress(0, progress_text, (float)(1LL << 47), 0);
-            
+
             if (trgkey != NULL) {
                 known_target_key = bytes_to_num(trgkey, 6);
             } else {
@@ -2250,17 +2250,17 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc
             }
 #ifdef DEBUG_KEY_ELIMINATION
             fprintf(fstats, "%1.1f;%1.0f;%c;%s\n",
-                log(num_keys_tested) / log(2.0),
-                (float)num_keys_tested / brute_force_per_second,
-                key_found ? 'Y' : 'N',
-                failstr
-                );
+                    log(num_keys_tested) / log(2.0),
+                    (float)num_keys_tested / brute_force_per_second,
+                    key_found ? 'Y' : 'N',
+                    failstr
+                   );
 #else
             fprintf(fstats, "%1.0f;%d\n",
-                log(num_keys_tested) / log(2.0),
-                (float)num_keys_tested / brute_force_per_second,
-                key_found
-                );
+                    log(num_keys_tested) / log(2.0),
+                    (float)num_keys_tested / brute_force_per_second,
+                    key_found
+                   );
 #endif
 
             free_nonces_memory();
diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c
index 92e7809b2..27c80e7f3 100644
--- a/client/cmdlfpyramid.c
+++ b/client/cmdlfpyramid.c
@@ -222,13 +222,13 @@ int CmdPyramidDemod(const char *Cmd) {
         fc = bytebits_to_byte(bits + 53, 10);
         cardnum = bytebits_to_byte(bits + 63, 32);
         PrintAndLogEx(SUCCESS, "Pyramid ID Found - BitLength: %d, FC: %d, Card: %d - Raw: %08x%08x%08x%08x", fmtLen, fc, cardnum, rawHi3, rawHi2, rawHi, rawLo);
-/*        
-    } else if (fmtLen > 32) {
-        cardnum = bytebits_to_byte(bits + 81, 16);
-        //code1 = bytebits_to_byte(bits+(size-fmtLen),fmtLen-32);
-        //code2 = bytebits_to_byte(bits+(size-32),32);
-        PrintAndLogEx(SUCCESS, "Pyramid ID Found - BitLength: %d -unknown BitLength- (%d), Raw: %08x%08x%08x%08x", fmtLen, cardnum, rawHi3, rawHi2, rawHi, rawLo);
-        */
+        /*
+            } else if (fmtLen > 32) {
+                cardnum = bytebits_to_byte(bits + 81, 16);
+                //code1 = bytebits_to_byte(bits+(size-fmtLen),fmtLen-32);
+                //code2 = bytebits_to_byte(bits+(size-32),32);
+                PrintAndLogEx(SUCCESS, "Pyramid ID Found - BitLength: %d -unknown BitLength- (%d), Raw: %08x%08x%08x%08x", fmtLen, cardnum, rawHi3, rawHi2, rawHi, rawLo);
+                */
     } else {
         cardnum = bytebits_to_byte(bits + 81, 16);
         //code1 = bytebits_to_byte(bits+(size-fmtLen),fmtLen);

From ffd2c9258426fc2f153e5f69945c88a096d09b4e Mon Sep 17 00:00:00 2001
From: "osboxes.org" <iceman@iuse.se>
Date: Wed, 10 Apr 2019 09:46:01 +0200
Subject: [PATCH 1166/1938] style

---
 armsrc/iclass.c              | 4 ++--
 armsrc/mifareutil.c          | 2 +-
 client/cliparser/argtable3.c | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/armsrc/iclass.c b/armsrc/iclass.c
index 61961a3da..c77cf4d85 100644
--- a/armsrc/iclass.c
+++ b/armsrc/iclass.c
@@ -995,7 +995,7 @@ static bool GetIClassCommandFromReader(uint8_t *received, int *len, int maxLen)
     // clear RXRDY:
     uint8_t b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
     (void)b;
-            
+
     while (!BUTTON_PRESS()) {
         WDT_HIT();
 
@@ -1799,7 +1799,7 @@ static int GetIClassAnswer(uint8_t *receivedResponse, int maxLen, int *samples,
     // clear RXRDY:
     uint8_t b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
     (void)b;
-            
+
     while (!BUTTON_PRESS()) {
         WDT_HIT();
 
diff --git a/armsrc/mifareutil.c b/armsrc/mifareutil.c
index 94ea29b03..1de6d95f8 100644
--- a/armsrc/mifareutil.c
+++ b/armsrc/mifareutil.c
@@ -18,7 +18,7 @@ void mf_crypto1_decryptEx(struct Crypto1State *pcs, uint8_t *data_in, int len, u
         for (int i = 0; i < len; i++)
             data_out[i] = crypto1_byte(pcs, 0x00, 0) ^ data_in[i];
     } else {
-        uint8_t bt = 0;        
+        uint8_t bt = 0;
         bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data_in[0], 0)) << 0;
         bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data_in[0], 1)) << 1;
         bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data_in[0], 2)) << 2;
diff --git a/client/cliparser/argtable3.c b/client/cliparser/argtable3.c
index e1bedbb4f..1d5c2d055 100644
--- a/client/cliparser/argtable3.c
+++ b/client/cliparser/argtable3.c
@@ -2963,16 +2963,16 @@ static int trex_class(TRex *exp) {
             if (*exp->_p++ == ']') {
                 trex_error(exp, _SC("unfinished range"));
             }
-            
+
             r = trex_newnode(exp, OP_RANGE);
             if (first > *exp->_p) {
                 trex_error(exp, _SC("invalid range"));
             }
-            
+
             if (exp->_nodes[first].type == OP_CCLASS) {
                 trex_error(exp, _SC("cannot use character classes in ranges"));
             }
-            
+
             exp->_nodes[r].left = exp->_nodes[first].type;
             t = trex_escapechar(exp);
             exp->_nodes[r].right = t;
@@ -4548,7 +4548,7 @@ void arg_print_formatted(FILE *fp,
     const unsigned colwidth = (rmargin - lmargin) + 1;
 
     /* Someone doesn't like us... */
-    if (line_end == line_start) { 
+    if (line_end == line_start) {
         fprintf(fp, "%s\n", text);
     }
 

From acf3920394e435ed4ee8d9fba390803e3d8702c0 Mon Sep 17 00:00:00 2001
From: "osboxes.org" <iceman@iuse.se>
Date: Wed, 10 Apr 2019 09:47:36 +0200
Subject: [PATCH 1167/1938] style

---
 client/cmdhf14a.c       | 2 +-
 client/cmdhfmfdesfire.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 75f30f6f8..a8fe2e40b 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -260,7 +260,7 @@ int Hf14443_4aGetCardData(iso14a_card_select_t *card) {
         PrintAndLogEx(NORMAL, "E-> Error ATS length(%d) : %s", card->ats_len, sprint_hex(card->ats, card->ats_len));
         return 1;
     }
-    
+
     PrintAndLogEx(NORMAL, " ATS: %s", sprint_hex(card->ats, card->ats_len));
     return 0;
 }
diff --git a/client/cmdhfmfdesfire.h b/client/cmdhfmfdesfire.h
index 6ba79c5a2..4b554585f 100644
--- a/client/cmdhfmfdesfire.h
+++ b/client/cmdhfmfdesfire.h
@@ -10,4 +10,4 @@ int CmdHF14AMfDESAuth(const char *Cmd);
 int CmdHFMFDesfire(const char *Cmd);
 int CmdHelp(const char *Cmd);
 
-#endif
\ No newline at end of file
+#endif

From 598d016477689ba36e60ad47c33e19bd8bd062d3 Mon Sep 17 00:00:00 2001
From: "osboxes.org" <iceman@iuse.se>
Date: Wed, 10 Apr 2019 09:47:46 +0200
Subject: [PATCH 1168/1938] style

---
 client/cmdhfmfu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index ea4b1b49b..38aa06d9d 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -1863,7 +1863,7 @@ int CmdHF14AMfUDump(const char *Cmd) {
         PrintAndLogEx(WARNING, "Command execute time-out");
         return 1;
     }
-    
+
     if (resp.arg[0] != 1) {
         PrintAndLogEx(WARNING, "Failed dumping card");
         return 1;

From e703dcb8adea7fec16914f71be6509edb1ab203e Mon Sep 17 00:00:00 2001
From: "osboxes.org" <iceman@iuse.se>
Date: Wed, 10 Apr 2019 09:49:42 +0200
Subject: [PATCH 1169/1938] style

---
 client/crypto/libpcrypto.c | 6 +++---
 client/graph.c             | 4 ++--
 include/common.h           | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/crypto/libpcrypto.c b/client/crypto/libpcrypto.c
index 0def5b2f7..7ea667e7e 100644
--- a/client/crypto/libpcrypto.c
+++ b/client/crypto/libpcrypto.c
@@ -382,13 +382,13 @@ int ecdsa_nist_test(bool verbose) {
         res = 1;
         goto exit;
     }
-    
+
     if (verbose) {
         printf("passed\n");
         printf("  ECDSA binary signature create/check test: ");
     }
-    
-    // random ecdsa test   
+
+    // random ecdsa test
     uint8_t key_d[32] = {0};
     uint8_t key_xy[32 * 2 + 2] = {0};
     memset(signature, 0x00, sizeof(signature));
diff --git a/client/graph.c b/client/graph.c
index 4d77ef2b3..677ab0846 100644
--- a/client/graph.c
+++ b/client/graph.c
@@ -174,7 +174,7 @@ int GetPskClock(const char *str, bool printAns) {
     // Only print this message if we're not looping something
     if (printAns)
         PrintAndLogEx(SUCCESS, "Auto-detected clock rate: %d", clock1);
-    
+
     return clock1;
 }
 
@@ -200,7 +200,7 @@ int GetNrzClock(const char *str, bool printAns) {
     // Only print this message if we're not looping something
     if (printAns)
         PrintAndLogEx(SUCCESS, "Auto-detected clock rate: %d", clock1);
-    
+
     return clock1;
 }
 //by marshmellow
diff --git a/include/common.h b/include/common.h
index 87f059179..76ebccbf0 100644
--- a/include/common.h
+++ b/include/common.h
@@ -23,7 +23,7 @@ extern "C" {
 typedef unsigned char byte_t;
 
 // debug
-#define MF_DBG_NONE          0 // no messages 
+#define MF_DBG_NONE          0 // no messages
 #define MF_DBG_ERROR         1 // errors only
 #define MF_DBG_INFO          2 // errors + info messages
 #define MF_DBG_DEBUG         3 // errors + info + debug messages

From 7f76fea21a7434aabf633c9b6cc28c8a576a1d30 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 10 Apr 2019 10:21:42 +0200
Subject: [PATCH 1170/1938] good const, bad const, fixing
 -Wincompatible-pointer-types-discards-qualifiers

---
 client/cliparser/argtable3.c           | 12 +++++-----
 client/cliparser/cliparser.c           |  8 +++----
 client/cliparser/cliparser.h           |  2 +-
 client/cliparser/getopt.h              |  2 +-
 client/cmdhf14a.c                      |  4 ++--
 client/cmdhf14a.h                      |  4 ++--
 client/cmdhf15.c                       | 10 ++++----
 client/cmdhffido.c                     |  2 +-
 client/cmdhfmfdes.c                    |  2 +-
 client/cmdhfmfhard.c                   |  2 +-
 client/cmdhfmfhard.h                   |  2 +-
 client/cmdlfti.c                       |  2 +-
 client/cmdparser.c                     |  2 +-
 client/cmdscript.c                     |  4 ++--
 client/cmdtrace.c                      |  2 +-
 client/crypto/asn1dump.c               |  2 +-
 client/crypto/asn1utils.c              |  2 +-
 client/crypto/asn1utils.h              |  2 +-
 client/crypto/libpcrypto.c             |  6 ++---
 client/emv/apduinfo.c                  |  2 +-
 client/emv/apduinfo.h                  |  2 +-
 client/emv/cmdemv.c                    |  2 +-
 client/emv/emv_tags.c                  |  6 ++---
 client/emv/emv_tags.h                  |  2 +-
 client/emv/emvcore.c                   |  4 ++--
 client/emv/emvcore.h                   |  2 +-
 client/emv/emvjson.c                   | 32 +++++++++++++-------------
 client/emv/emvjson.h                   | 28 +++++++++++-----------
 client/fido/cbortools.c                |  4 ++--
 client/fido/cbortools.h                |  2 +-
 client/fido/cose.c                     | 10 ++++----
 client/fido/fidocore.c                 | 10 ++++----
 client/fido/fidocore.h                 |  4 ++--
 client/hardnested/hardnested_bf_core.c |  8 +++----
 client/hardnested/hardnested_bf_core.h |  2 +-
 client/loclass/cipherutils.c           |  6 ++---
 client/loclass/cipherutils.h           |  6 ++---
 client/loclass/ikeys.c                 |  4 ++--
 client/mifare/mifare4.c                |  2 +-
 client/mifare/mifare4.h                |  4 ++--
 client/ui.c                            |  8 +++----
 client/ui.h                            |  4 ++--
 client/util.c                          | 10 ++++----
 client/util.h                          | 10 ++++----
 uart/uart_posix.c                      |  2 +-
 45 files changed, 124 insertions(+), 124 deletions(-)

diff --git a/client/cliparser/argtable3.c b/client/cliparser/argtable3.c
index 1d5c2d055..019603f50 100644
--- a/client/cliparser/argtable3.c
+++ b/client/cliparser/argtable3.c
@@ -236,7 +236,7 @@ int opterr = 1;         /* if error message should be printed */
 int optind = 1;         /* index into parent argv vector */
 int optopt = '?';       /* character checked for validity */
 int optreset;           /* reset getopt */
-char *optarg;           /* argument associated with option */
+const char *optarg;     /* argument associated with option */
 #endif
 
 #define PRINT_ERROR     ((opterr) && (*options != ':'))
@@ -259,7 +259,7 @@ static int parse_long_options(char *const *, const char *,
 static int gcd(int, int);
 static void permute_args(int, int, int, char *const *);
 
-static char *place = EMSG; /* option letter processing */
+static const char *place = EMSG; /* option letter processing */
 
 /* XXX: set optreset to 1 rather than these two */
 static int nonopt_start = -1; /* first non option argument (for permute) */
@@ -377,7 +377,7 @@ permute_args(int panonopt_start, int panonopt_end, int opt_end,
 static int
 parse_long_options(char *const *nargv, const char *options,
                    const struct option *long_options, int *idx, int short_too) {
-    char *current_argv, *has_equal;
+    const char *current_argv, *has_equal;
     size_t current_argv_len;
     int i, match;
 
@@ -4325,9 +4325,9 @@ void arg_print_option(FILE *fp,
 static
 void arg_print_gnuswitch(FILE *fp, struct arg_hdr * *table) {
     int tabindex;
-    char *format1 = " -%c";
-    char *format2 = " [-%c";
-    char *suffix = "";
+    const char *format1 = " -%c";
+    const char *format2 = " [-%c";
+    const char *suffix = "";
 
     /* print all mandatory switches that are without argument values */
     for (tabindex = 0;
diff --git a/client/cliparser/cliparser.c b/client/cliparser/cliparser.c
index 6bba6f58b..ae2124085 100644
--- a/client/cliparser/cliparser.c
+++ b/client/cliparser/cliparser.c
@@ -14,12 +14,12 @@
 
 void **argtable = NULL;
 size_t argtableLen = 0;
-char *programName = NULL;
-char *programHint = NULL;
-char *programHelp = NULL;
+const char *programName = NULL;
+const char *programHint = NULL;
+const char *programHelp = NULL;
 char buf[500] = {0};
 
-int CLIParserInit(char *vprogramName, char *vprogramHint, char *vprogramHelp) {
+int CLIParserInit(const char *vprogramName, const char *vprogramHint, const char *vprogramHelp) {
     argtable = NULL;
     argtableLen = 0;
     programName = vprogramName;
diff --git a/client/cliparser/cliparser.h b/client/cliparser/cliparser.h
index a7c8480f4..44d9cc12c 100644
--- a/client/cliparser/cliparser.h
+++ b/client/cliparser/cliparser.h
@@ -31,7 +31,7 @@
 #define CLIGetHexWithReturn(paramnum, data, datalen) if (CLIParamHexToBuf(arg_get_str(paramnum), data, sizeof(data), datalen)) {CLIParserFree();return 1;}
 #define CLIGetStrWithReturn(paramnum, data, datalen) if (CLIParamStrToBuf(arg_get_str(paramnum), data, sizeof(data), datalen)) {CLIParserFree();return 1;}
 
-int CLIParserInit(char *vprogramName, char *vprogramHint, char *vprogramHelp);
+int CLIParserInit(const char *vprogramName, const char *vprogramHint, const char *vprogramHelp);
 int CLIParserParseString(const char *str, void *vargtable[], size_t vargtableLen, bool allowEmptyExec);
 int CLIParserParseStringEx(const char *str, void *vargtable[], size_t vargtableLen, bool allowEmptyExec, bool clueData);
 int CLIParserParseArg(int argc, char **argv, void *vargtable[], size_t vargtableLen, bool allowEmptyExec);
diff --git a/client/cliparser/getopt.h b/client/cliparser/getopt.h
index 308acf3ce..bf645feb5 100644
--- a/client/cliparser/getopt.h
+++ b/client/cliparser/getopt.h
@@ -68,7 +68,7 @@ int getopt_long_only(int, char *const *, const char *,
 #define _GETOPT_DECLARED
 int getopt(int, char *const [], const char *);
 
-extern char *optarg; /* getopt(3) external variables */
+extern const char *optarg; /* getopt(3) external variables */
 extern int optind, opterr, optopt;
 #endif
 #ifndef _OPTRESET_DECLARED
diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index a8fe2e40b..ede90f7fb 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -136,7 +136,7 @@ static const manufactureName manufactureMapping[] = {
 // get a product description based on the UID
 //  uid[8] tag uid
 // returns description of the best match
-char *getTagInfo(uint8_t uid) {
+const char *getTagInfo(uint8_t uid) {
 
     int i;
     int len = sizeof(manufactureMapping) / sizeof(manufactureName);
@@ -566,7 +566,7 @@ int CmdHF14AInfo(const char *Cmd) {
             pos++;
         }
         if (card.ats[0] > pos && card.ats[0] <  card.ats_len - 2) {
-            char *tip = "";
+            const char *tip = "";
             if (card.ats[0] - pos >= 7) {
                 if (memcmp(card.ats + pos, "\xC1\x05\x2F\x2F\x01\xBC\xD6", 7) == 0) {
                     tip = "-> MIFARE Plus X 2K or 4K";
diff --git a/client/cmdhf14a.h b/client/cmdhf14a.h
index 263bb7e9f..cababc217 100644
--- a/client/cmdhf14a.h
+++ b/client/cmdhf14a.h
@@ -35,7 +35,7 @@
 // structure and database for uid -> tagtype lookups
 typedef struct {
     uint8_t uid;
-    char *desc;
+    const char *desc;
 } manufactureName;
 
 int CmdHF14A(const char *Cmd);
@@ -48,7 +48,7 @@ int CmdHF14ACmdRaw(const char *Cmd);
 int CmdHF14ACUIDs(const char *Cmd);
 int CmdHF14AAntiFuzz(const char *Cmd);
 
-char *getTagInfo(uint8_t uid);
+const char *getTagInfo(uint8_t uid);
 int Hf14443_4aGetCardData(iso14a_card_select_t *card);
 int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen);
 int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen);
diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index 2b9751c33..bc03b0883 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -46,7 +46,7 @@
 typedef struct {
     uint64_t uid;
     int mask; // how many MSB bits used
-    char *desc;
+    const char *desc;
 } productName;
 
 const productName uidmapping[] = {
@@ -235,7 +235,7 @@ int getUID(uint8_t *buf) {
 // get a product description based on the UID
 // uid[8] tag uid
 // returns description of the best match
-static char *getTagInfo_15(uint8_t *uid) {
+static const char *getTagInfo_15(uint8_t *uid) {
     uint64_t myuid, mask;
     int i = 0, best = -1;
     memcpy(&myuid, uid, sizeof(uint64_t));
@@ -259,7 +259,7 @@ static char *getTagInfo_15(uint8_t *uid) {
 }
 
 // return a clear-text message to an errorcode
-static char *TagErrorStr(uint8_t error) {
+static const char *TagErrorStr(uint8_t error) {
     switch (error) {
         case 0x01:
             return "The command is not supported";
@@ -350,7 +350,7 @@ int usage_15_dump(void) {
     return 0;
 }
 int usage_15_restore(void) {
-    char *options[][2] = {
+    const char *options[][2] = {
         {"h", "this help"},
         {"-2", "use slower '1 out of 256' mode"},
         {"-o", "set OPTION Flag (needed for TI)"},
@@ -364,7 +364,7 @@ int usage_15_restore(void) {
     return 0;
 }
 int usage_15_raw(void) {
-    char *options[][2] = {
+    const char *options[][2] = {
         {"-r", "do not read response" },
         {"-2", "use slower '1 out of 256' mode" },
         {"-c", "calculate and append CRC" },
diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index 496ae5427..cb9694584 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -621,7 +621,7 @@ void CheckSlash(char *fileName) {
         strcat(fileName, "/");
 }
 
-int GetExistsFileNameJson(char *prefixDir, char *reqestedFileName, char *fileName) {
+int GetExistsFileNameJson(const char *prefixDir, const char *reqestedFileName, char *fileName) {
     fileName[0] = 0x00;
     strcpy(fileName, get_my_executable_directory());
     CheckSlash(fileName);
diff --git a/client/cmdhfmfdes.c b/client/cmdhfmfdes.c
index 801e07ced..1294f98c7 100644
--- a/client/cmdhfmfdes.c
+++ b/client/cmdhfmfdes.c
@@ -253,7 +253,7 @@ char *GetVersionStr(uint8_t major, uint8_t minor) {
 void GetKeySettings(uint8_t *aid) {
 
     char messStr[512] = {0x00};
-    char *str = messStr;
+    const char *str = messStr;
     uint8_t isOK = 0;
     uint32_t options;
     UsbCommand c = {CMD_MIFARE_DESFIRE};
diff --git a/client/cmdhfmfhard.c b/client/cmdhfmfhard.c
index 683879fec..dae915700 100644
--- a/client/cmdhfmfhard.c
+++ b/client/cmdhfmfhard.c
@@ -109,7 +109,7 @@ static void print_progress_header(void) {
 }
 
 
-void hardnested_print_progress(uint32_t nonces, char *activity, float brute_force, uint64_t min_diff_print_time) {
+void hardnested_print_progress(uint32_t nonces, const char *activity, float brute_force, uint64_t min_diff_print_time) {
     static uint64_t last_print_time = 0;
     if (msclock() - last_print_time > min_diff_print_time) {
         last_print_time = msclock();
diff --git a/client/cmdhfmfhard.h b/client/cmdhfmfhard.h
index 7d3e4fa0b..2f20986e2 100644
--- a/client/cmdhfmfhard.h
+++ b/client/cmdhfmfhard.h
@@ -42,7 +42,7 @@ typedef struct noncelist {
 } noncelist_t;
 
 int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t *trgkey, bool nonce_file_read, bool nonce_file_write, bool slow, int tests, uint64_t *foundkey, char *filename);
-void hardnested_print_progress(uint32_t nonces, char *activity, float brute_force, uint64_t min_diff_print_time);
+void hardnested_print_progress(uint32_t nonces, const char *activity, float brute_force, uint64_t min_diff_print_time);
 
 #endif
 
diff --git a/client/cmdlfti.c b/client/cmdlfti.c
index db87a2d14..223629786 100644
--- a/client/cmdlfti.c
+++ b/client/cmdlfti.c
@@ -251,7 +251,7 @@ int CmdTIDemod(const char *Cmd) {
 
         //crc =  crc16_ccitt(message, sizeof(message);
 
-        char *crcStr = (crc == (shift2 & 0xFFFF)) ? _GREEN_("Passed") : _RED_("Failed");
+        const char *crcStr = (crc == (shift2 & 0xFFFF)) ? _GREEN_("Passed") : _RED_("Failed");
 
         PrintAndLogEx(INFO, "Tag data = %08X%08X  [Crc %04X %s]", shift1, shift0, crc, crcStr);
 
diff --git a/client/cmdparser.c b/client/cmdparser.c
index a819cedcf..5ff0c9255 100644
--- a/client/cmdparser.c
+++ b/client/cmdparser.c
@@ -93,7 +93,7 @@ void dumpCommandsRecursive(const command_t cmds[], int markdown) {
     }
 
     while (cmds[i].Name) {
-        char *cmd_offline = "N";
+        const char *cmd_offline = "N";
         if (cmds[i].Help[0] == '{' && ++i) continue;
 
         if (cmds[i].Offline)
diff --git a/client/cmdscript.c b/client/cmdscript.c
index e1a21ffc4..d71a9285b 100644
--- a/client/cmdscript.c
+++ b/client/cmdscript.c
@@ -56,7 +56,7 @@ int str_ends_with(const char *str, const char *suffix) {
 /**
  * Utility to check the ending of a string (used to check file suffix)
  */
-bool endsWith(char *base, char *str) {
+bool endsWith(const char *base, const char *str) {
     int blen = strlen(base);
     int slen = strlen(str);
     return (blen >= slen) && (0 == strcmp(base + blen - slen, str));
@@ -125,7 +125,7 @@ int CmdScriptRun(const char *Cmd) {
     int arg_len = 0;
     sscanf(Cmd, "%127s%n %255[^\n\r]%n", script_name, &name_len, arguments, &arg_len);
 
-    char *suffix = "";
+    const char *suffix = "";
     if (!endsWith(script_name, ".lua")) {
         suffix = ".lua";
     }
diff --git a/client/cmdtrace.c b/client/cmdtrace.c
index bb98e6919..1f10ab214 100644
--- a/client/cmdtrace.c
+++ b/client/cmdtrace.c
@@ -221,7 +221,7 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
     }
 
     // Draw the CRC column
-    char *crc = (crcStatus == 0 ? "!crc" : (crcStatus == 1 ? " ok " : "    "));
+    const char *crc = (crcStatus == 0 ? "!crc" : (crcStatus == 1 ? " ok " : "    "));
 
     EndOfTransmissionTimestamp = timestamp + duration;
 
diff --git a/client/crypto/asn1dump.c b/client/crypto/asn1dump.c
index 8453d0f13..47fe791d4 100644
--- a/client/crypto/asn1dump.c
+++ b/client/crypto/asn1dump.c
@@ -41,7 +41,7 @@ enum asn1_tag_t {
 
 struct asn1_tag {
     tlv_tag_t tag;
-    char *name;
+    const char *name;
     enum asn1_tag_t type;
     const void *data;
 };
diff --git a/client/crypto/asn1utils.c b/client/crypto/asn1utils.c
index 87fdd8c9d..c82f4aac8 100644
--- a/client/crypto/asn1utils.c
+++ b/client/crypto/asn1utils.c
@@ -71,7 +71,7 @@ static bool print_cb(void *data, const struct tlv *tlv, int level, bool is_leaf)
     return true;
 }
 
-int asn1_print(uint8_t *asn1buf, size_t asn1buflen, char *indent) {
+int asn1_print(uint8_t *asn1buf, size_t asn1buflen, const char *indent) {
 
     struct tlvdb *t = tlvdb_parse_multi(asn1buf, asn1buflen);
     if (t) {
diff --git a/client/crypto/asn1utils.h b/client/crypto/asn1utils.h
index 60c94e34a..029741bc6 100644
--- a/client/crypto/asn1utils.h
+++ b/client/crypto/asn1utils.h
@@ -15,7 +15,7 @@
 #include <stdbool.h>
 #include <stddef.h>
 
-int asn1_print(uint8_t *asn1buf, size_t asn1buflen, char *indent);
+int asn1_print(uint8_t *asn1buf, size_t asn1buflen, const char *indent);
 int ecdsa_asn1_get_signature(uint8_t *signature, size_t signaturelen, uint8_t *rval, uint8_t *sval);
 
 #endif /* asn1utils.h */
diff --git a/client/crypto/libpcrypto.c b/client/crypto/libpcrypto.c
index 7ea667e7e..f1f6e782d 100644
--- a/client/crypto/libpcrypto.c
+++ b/client/crypto/libpcrypto.c
@@ -121,7 +121,7 @@ int sha512hash(uint8_t *input, int length, uint8_t *hash) {
     return 0;
 }
 
-int ecdsa_init_str(mbedtls_ecdsa_context *ctx, char *key_d, char *key_x, char *key_y) {
+int ecdsa_init_str(mbedtls_ecdsa_context *ctx, const char *key_d, const char *key_x, const char *key_y) {
     if (!ctx)
         return 1;
 
@@ -279,7 +279,7 @@ exit:
     return res;
 }
 
-int ecdsa_signature_create_test(char *key_d, char *key_x, char *key_y, char *random, uint8_t *input, int length, uint8_t *signature, size_t *signaturelen) {
+int ecdsa_signature_create_test(const char *key_d, const char *key_x, const char *key_y, const char *random, uint8_t *input, int length, uint8_t *signature, size_t *signaturelen) {
     int res;
     *signaturelen = 0;
 
@@ -299,7 +299,7 @@ int ecdsa_signature_create_test(char *key_d, char *key_x, char *key_y, char *ran
     return res;
 }
 
-int ecdsa_signature_verify_keystr(char *key_x, char *key_y, uint8_t *input, int length, uint8_t *signature, size_t signaturelen) {
+int ecdsa_signature_verify_keystr(const char *key_x, const char *key_y, uint8_t *input, int length, uint8_t *signature, size_t signaturelen) {
     int res;
     uint8_t shahash[32] = {0};
     res = sha256hash(input, length, shahash);
diff --git a/client/emv/apduinfo.c b/client/emv/apduinfo.c
index 23da3e1a2..8d0d3bf89 100644
--- a/client/emv/apduinfo.c
+++ b/client/emv/apduinfo.c
@@ -277,7 +277,7 @@ int CodeCmp(const char *code1, const char *code2) {
     return -1;
 }
 
-const APDUCode *const GetAPDUCode(uint8_t sw1, uint8_t sw2) {
+const APDUCode * GetAPDUCode(uint8_t sw1, uint8_t sw2) {
     char buf[6] = {0};
     int res;
     int mineq = APDUCodeTableLen;
diff --git a/client/emv/apduinfo.h b/client/emv/apduinfo.h
index d7811dbc6..317d661ff 100644
--- a/client/emv/apduinfo.h
+++ b/client/emv/apduinfo.h
@@ -28,7 +28,7 @@ typedef struct {
     const char *Description;
 } APDUCode;
 
-const APDUCode *const GetAPDUCode(uint8_t sw1, uint8_t sw2);
+const APDUCode *GetAPDUCode(uint8_t sw1, uint8_t sw2);
 const char *GetAPDUCodeDescription(uint8_t sw1, uint8_t sw2);
 
 #endif
diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index b5edfa81c..8e3b1ff83 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -652,7 +652,7 @@ void InitTransactionParameters(struct tlvdb *tlvRoot, bool paramLoadJSON, enum T
     }
 
     //9F66:(Terminal Transaction Qualifiers (TTQ)) len:4
-    char *qVSDC = "\x26\x00\x00\x00";
+    const char *qVSDC = "\x26\x00\x00\x00";
     if (GenACGPO) {
         qVSDC = "\x26\x80\x00\x00";
     }
diff --git a/client/emv/emv_tags.c b/client/emv/emv_tags.c
index f51442183..2ebe78009 100644
--- a/client/emv/emv_tags.c
+++ b/client/emv/emv_tags.c
@@ -42,7 +42,7 @@ enum emv_tag_t {
 
 struct emv_tag {
     tlv_tag_t tag;
-    char *name;
+    const char *name;
     enum emv_tag_t type;
     const void *data;
 };
@@ -819,8 +819,8 @@ bool emv_tag_dump(const struct tlv *tlv, FILE *f, int level) {
     return true;
 }
 
-char *emv_get_tag_name(const struct tlv *tlv) {
-    static char *defstr = "";
+const char *emv_get_tag_name(const struct tlv *tlv) {
+    static const char *defstr = "";
 
     if (!tlv)
         return defstr;
diff --git a/client/emv/emv_tags.h b/client/emv/emv_tags.h
index f7d9a8476..51905e75e 100644
--- a/client/emv/emv_tags.h
+++ b/client/emv/emv_tags.h
@@ -35,6 +35,6 @@
 # define EMVCID_REASON_MASK  0x07
 
 bool emv_tag_dump(const struct tlv *tlv, FILE *f, int level);
-char *emv_get_tag_name(const struct tlv *tlv);
+const char *emv_get_tag_name(const struct tlv *tlv);
 
 #endif
diff --git a/client/emv/emvcore.c b/client/emv/emvcore.c
index 086c72674..7e0174baa 100644
--- a/client/emv/emvcore.c
+++ b/client/emv/emvcore.c
@@ -20,7 +20,7 @@ static const char *PSElist [] = {
 };
 //static const size_t PSElistLen = sizeof(PSElist)/sizeof(char*);
 
-char *TransactionTypeStr[] = {
+const char *TransactionTypeStr[] = {
     "MSD",
     "VSDC",
     "qVCDCMCHIP",
@@ -434,7 +434,7 @@ int EMVSearchPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldO
     int res;
     bool fileFound = false;
 
-    char *PSE_or_PPSE = PSENum == 1 ? "PSE" : "PPSE";
+    const char *PSE_or_PPSE = PSENum == 1 ? "PSE" : "PPSE";
 
     // select PPSE
     res = EMVSelectPSE(channel, ActivateField, true, PSENum, data, sizeof(data), &datalen, &sw);
diff --git a/client/emv/emvcore.h b/client/emv/emvcore.h
index 94d929f06..219c3f9b5 100644
--- a/client/emv/emvcore.h
+++ b/client/emv/emvcore.h
@@ -43,7 +43,7 @@ enum TransactionType {
     TT_QVSDCMCHIP,
     TT_CDA,
 };
-extern char *TransactionTypeStr[];
+extern const char *TransactionTypeStr[];
 
 typedef struct {
     uint8_t CLA;
diff --git a/client/emv/emvjson.c b/client/emv/emvjson.c
index 717f806d9..dadff33fc 100644
--- a/client/emv/emvjson.c
+++ b/client/emv/emvjson.c
@@ -60,7 +60,7 @@ static const ApplicationDataElm ApplicationData[] = {
 };
 int ApplicationDataLen = sizeof(ApplicationData) / sizeof(ApplicationDataElm);
 
-char *GetApplicationDataName(tlv_tag_t tag) {
+const char *GetApplicationDataName(tlv_tag_t tag) {
     for (int i = 0; i < ApplicationDataLen; i++)
         if (ApplicationData[i].Tag == tag)
             return ApplicationData[i].Name;
@@ -68,7 +68,7 @@ char *GetApplicationDataName(tlv_tag_t tag) {
     return NULL;
 }
 
-int JsonSaveJsonObject(json_t *root, char *path, json_t *value) {
+int JsonSaveJsonObject(json_t *root, const char *path, json_t *value) {
     json_error_t error;
 
     if (strlen(path) < 1)
@@ -86,15 +86,15 @@ int JsonSaveJsonObject(json_t *root, char *path, json_t *value) {
     }
 }
 
-int JsonSaveInt(json_t *root, char *path, int value) {
+int JsonSaveInt(json_t *root, const char *path, int value) {
     return JsonSaveJsonObject(root, path, json_integer(value));
 }
 
-int JsonSaveStr(json_t *root, char *path, char *value) {
+int JsonSaveStr(json_t *root, const char *path, const char *value) {
     return JsonSaveJsonObject(root, path, json_string(value));
 };
 
-int JsonSaveBufAsHexCompact(json_t *elm, char *path, uint8_t *data, size_t datalen) {
+int JsonSaveBufAsHexCompact(json_t *elm, const char *path, uint8_t *data, size_t datalen) {
     char *msg = sprint_hex_inrow(data, datalen);
     if (msg && strlen(msg) && msg[strlen(msg) - 1] == ' ')
         msg[strlen(msg) - 1] = '\0';
@@ -102,7 +102,7 @@ int JsonSaveBufAsHexCompact(json_t *elm, char *path, uint8_t *data, size_t datal
     return JsonSaveStr(elm, path, msg);
 }
 
-int JsonSaveBufAsHex(json_t *elm, char *path, uint8_t *data, size_t datalen) {
+int JsonSaveBufAsHex(json_t *elm, const char *path, uint8_t *data, size_t datalen) {
     char *msg = sprint_hex(data, datalen);
     if (msg && strlen(msg) && msg[strlen(msg) - 1] == ' ')
         msg[strlen(msg) - 1] = '\0';
@@ -110,7 +110,7 @@ int JsonSaveBufAsHex(json_t *elm, char *path, uint8_t *data, size_t datalen) {
     return JsonSaveStr(elm, path, msg);
 }
 
-int JsonSaveHex(json_t *elm, char *path, uint64_t data, int datalen) {
+int JsonSaveHex(json_t *elm, const char *path, uint64_t data, int datalen) {
     uint8_t bdata[8] = {0};
     int len = 0;
     if (!datalen) {
@@ -130,7 +130,7 @@ int JsonSaveHex(json_t *elm, char *path, uint64_t data, int datalen) {
     return JsonSaveBufAsHex(elm, path, bdata, len);
 }
 
-int JsonSaveTLVValue(json_t *root, char *path, struct tlvdb *tlvdbelm) {
+int JsonSaveTLVValue(json_t *root, const char *path, struct tlvdb *tlvdbelm) {
     const struct tlv *tlvelm = tlvdb_get_tlv(tlvdbelm);
     if (tlvelm)
         return JsonSaveBufAsHex(root, path, (uint8_t *)tlvelm->value, tlvelm->len);
@@ -138,7 +138,7 @@ int JsonSaveTLVValue(json_t *root, char *path, struct tlvdb *tlvdbelm) {
         return 1;
 }
 
-int JsonSaveTLVElm(json_t *elm, char *path, struct tlv *tlvelm, bool saveName, bool saveValue, bool saveAppDataLink) {
+int JsonSaveTLVElm(json_t *elm, const char *path, struct tlv *tlvelm, bool saveName, bool saveValue, bool saveAppDataLink) {
     json_error_t error;
 
     if (strlen(path) < 1 || !tlvelm)
@@ -164,11 +164,11 @@ int JsonSaveTLVElm(json_t *elm, char *path, struct tlv *tlvelm, bool saveName, b
         }
 
         if (saveAppDataLink) {
-            char *AppDataName = GetApplicationDataName(tlvelm->tag);
+            const char *AppDataName = GetApplicationDataName(tlvelm->tag);
             if (AppDataName)
                 JsonSaveStr(obj, "appdata", AppDataName);
         } else {
-            char *name = emv_get_tag_name(tlvelm);
+            const char *name = emv_get_tag_name(tlvelm);
             if (saveName && name && strlen(name) > 0 && strncmp(name, "Unknown", 7))
                 JsonSaveStr(obj, "name", emv_get_tag_name(tlvelm));
             JsonSaveHex(obj, "tag", tlvelm->tag, 0);
@@ -182,15 +182,15 @@ int JsonSaveTLVElm(json_t *elm, char *path, struct tlv *tlvelm, bool saveName, b
     return 0;
 }
 
-int JsonSaveTLVTreeElm(json_t *elm, char *path, struct tlvdb *tlvdbelm, bool saveName, bool saveValue, bool saveAppDataLink) {
+int JsonSaveTLVTreeElm(json_t *elm, const char *path, struct tlvdb *tlvdbelm, bool saveName, bool saveValue, bool saveAppDataLink) {
     return JsonSaveTLVElm(elm, path, (struct tlv *)tlvdb_get_tlv(tlvdbelm), saveName, saveValue, saveAppDataLink);
 }
 
-int JsonSaveTLVTree(json_t *root, json_t *elm, char *path, struct tlvdb *tlvdbelm) {
+int JsonSaveTLVTree(json_t *root, json_t *elm, const char *path, struct tlvdb *tlvdbelm) {
     struct tlvdb *tlvp = tlvdbelm;
     while (tlvp) {
         const struct tlv *tlvpelm = tlvdb_get_tlv(tlvp);
-        char *AppDataName = NULL;
+        const char *AppDataName = NULL;
         if (tlvpelm)
             AppDataName = GetApplicationDataName(tlvpelm->tag);
 
@@ -265,7 +265,7 @@ bool HexToBuffer(const char *errormsg, const char *hexvalue, uint8_t *buffer, si
     return true;
 }
 
-int JsonLoadStr(json_t *root, char *path, char *value) {
+int JsonLoadStr(json_t *root, const char *path, char *value) {
     if (!value)
         return 1;
 
@@ -282,7 +282,7 @@ int JsonLoadStr(json_t *root, char *path, char *value) {
     return 0;
 }
 
-int JsonLoadBufAsHex(json_t *elm, char *path, uint8_t *data, size_t maxbufferlen, size_t *datalen) {
+int JsonLoadBufAsHex(json_t *elm, const char *path, uint8_t *data, size_t maxbufferlen, size_t *datalen) {
     if (datalen)
         *datalen = 0;
 
diff --git a/client/emv/emvjson.h b/client/emv/emvjson.h
index 23cfba545..6bcf8243d 100644
--- a/client/emv/emvjson.h
+++ b/client/emv/emvjson.h
@@ -15,26 +15,26 @@
 
 typedef struct {
     tlv_tag_t Tag;
-    char *Name;
+    const char *Name;
 } ApplicationDataElm;
 
-char *GetApplicationDataName(tlv_tag_t tag);
+const char *GetApplicationDataName(tlv_tag_t tag);
 
-int JsonSaveJsonObject(json_t *root, char *path, json_t *value);
-int JsonSaveStr(json_t *root, char *path, char *value);
-int JsonSaveInt(json_t *root, char *path, int value);
-int JsonSaveBufAsHexCompact(json_t *elm, char *path, uint8_t *data, size_t datalen);
-int JsonSaveBufAsHex(json_t *elm, char *path, uint8_t *data, size_t datalen);
-int JsonSaveHex(json_t *elm, char *path, uint64_t data, int datalen);
+int JsonSaveJsonObject(json_t *root, const char *path, json_t *value);
+int JsonSaveStr(json_t *root, const char *path, const char *value);
+int JsonSaveInt(json_t *root, const char *path, int value);
+int JsonSaveBufAsHexCompact(json_t *elm, const char *path, uint8_t *data, size_t datalen);
+int JsonSaveBufAsHex(json_t *elm, const char *path, uint8_t *data, size_t datalen);
+int JsonSaveHex(json_t *elm, const char *path, uint64_t data, int datalen);
 
-int JsonSaveTLVValue(json_t *root, char *path, struct tlvdb *tlvdbelm);
-int JsonSaveTLVElm(json_t *elm, char *path, struct tlv *tlvelm, bool saveName, bool saveValue, bool saveAppDataLink);
-int JsonSaveTLVTreeElm(json_t *elm, char *path, struct tlvdb *tlvdbelm, bool saveName, bool saveValue, bool saveAppDataLink);
+int JsonSaveTLVValue(json_t *root, const char *path, struct tlvdb *tlvdbelm);
+int JsonSaveTLVElm(json_t *elm, const char *path, struct tlv *tlvelm, bool saveName, bool saveValue, bool saveAppDataLink);
+int JsonSaveTLVTreeElm(json_t *elm, const char *path, struct tlvdb *tlvdbelm, bool saveName, bool saveValue, bool saveAppDataLink);
 
-int JsonSaveTLVTree(json_t *root, json_t *elm, char *path, struct tlvdb *tlvdbelm);
+int JsonSaveTLVTree(json_t *root, json_t *elm, const char *path, struct tlvdb *tlvdbelm);
 
-int JsonLoadStr(json_t *root, char *path, char *value);
-int JsonLoadBufAsHex(json_t *elm, char *path, uint8_t *data, size_t maxbufferlen, size_t *datalen);
+int JsonLoadStr(json_t *root, const char *path, char *value);
+int JsonLoadBufAsHex(json_t *elm, const char *path, uint8_t *data, size_t maxbufferlen, size_t *datalen);
 
 bool ParamLoadFromJson(struct tlvdb *tlv);
 
diff --git a/client/fido/cbortools.c b/client/fido/cbortools.c
index b12571538..78055cc9e 100644
--- a/client/fido/cbortools.c
+++ b/client/fido/cbortools.c
@@ -161,7 +161,7 @@ static CborError dumprecursive(uint8_t cmdCode, bool isResponse, CborValue *it,
                 if (cmdCode > 0 && nestingLevel == 1 && isMapType && !(elmCount % 2)) {
                     int64_t val;
                     cbor_value_get_int64(it, &val);
-                    char *desc = fido2GetCmdMemberDescription(cmdCode, isResponse, val);
+                    const char *desc = fido2GetCmdMemberDescription(cmdCode, isResponse, val);
                     if (desc)
                         printf(" (%s)", desc);
                 }
@@ -459,7 +459,7 @@ CborError CborGetStringValueBuf(CborValue *elm) {
     return CborGetStringValue(elm, stringBuf, sizeof(stringBuf), NULL);
 };
 
-int CBOREncodeElm(json_t *root, char *rootElmId, CborEncoder *encoder) {
+int CBOREncodeElm(json_t *root, const char *rootElmId, CborEncoder *encoder) {
     json_t *elm = NULL;
     if (rootElmId && strlen(rootElmId) && rootElmId[0] == '$')
         elm = json_path_get(root, rootElmId);
diff --git a/client/fido/cbortools.h b/client/fido/cbortools.h
index d42506658..99b3536c1 100644
--- a/client/fido/cbortools.h
+++ b/client/fido/cbortools.h
@@ -32,7 +32,7 @@ CborError CborGetArrayStringValue(CborValue *elm, char *data, size_t maxdatalen,
 CborError CborGetStringValue(CborValue *elm, char *data, size_t maxdatalen, size_t *datalen);
 CborError CborGetStringValueBuf(CborValue *elm);
 
-int CBOREncodeElm(json_t *root, char *rootElmId, CborEncoder *encoder);
+int CBOREncodeElm(json_t *root, const char *rootElmId, CborEncoder *encoder);
 CborError CBOREncodeClientDataHash(json_t *root, CborEncoder *encoder);
 
 #endif /* __CBORTOOLS_H__ */
diff --git a/client/fido/cose.c b/client/fido/cose.c
index 48fa6d4d1..134c29772 100644
--- a/client/fido/cose.c
+++ b/client/fido/cose.c
@@ -19,15 +19,15 @@ static const char COSEEmptyStr[] = "";
 
 typedef struct {
     int Value;
-    char *Name;
-    char *Description;
+    const char *Name;
+    const char *Description;
 } COSEValueNameDesc_t;
 
 typedef struct {
     int Value;
-    char *Type;
-    char *Name;
-    char *Description;
+    const char *Type;
+    const char *Name;
+    const char *Description;
 } COSEValueTypeNameDesc_t;
 
 // kty - Key Type Values
diff --git a/client/fido/fidocore.c b/client/fido/fidocore.c
index 2b0aa7b94..915617244 100644
--- a/client/fido/fidocore.c
+++ b/client/fido/fidocore.c
@@ -25,8 +25,8 @@
 
 typedef struct {
     uint8_t ErrorCode;
-    char *ShortDescription;
-    char *Description;
+    const char *ShortDescription;
+    const char *Description;
 } fido2Error_t;
 
 fido2Error_t fido2Errors[] = {
@@ -84,7 +84,7 @@ typedef struct {
     fido2Commands Command;
     fido2PacketType PckType;
     int MemberNumber;
-    char *Description;
+    const char *Description;
 } fido2Desc_t;
 
 fido2Desc_t fido2CmdGetInfoRespDesc[] = {
@@ -149,7 +149,7 @@ fido2Desc_t fido2CmdGetInfoRespDesc[] = {
     {fido2COSEKey,              ptResponse,   -4, "d - private key"},
 };
 
-char *fido2GetCmdErrorDescription(uint8_t errorCode) {
+const char *fido2GetCmdErrorDescription(uint8_t errorCode) {
     for (int i = 0; i < sizeof(fido2Errors) / sizeof(fido2Error_t); i++)
         if (fido2Errors[i].ErrorCode == errorCode)
             return fido2Errors[i].Description;
@@ -157,7 +157,7 @@ char *fido2GetCmdErrorDescription(uint8_t errorCode) {
     return fido2Errors[0].Description;
 }
 
-char *fido2GetCmdMemberDescription(uint8_t cmdCode, bool isResponse, int memberNum) {
+const char *fido2GetCmdMemberDescription(uint8_t cmdCode, bool isResponse, int memberNum) {
     for (int i = 0; i < sizeof(fido2CmdGetInfoRespDesc) / sizeof(fido2Desc_t); i++)
         if (fido2CmdGetInfoRespDesc[i].Command == cmdCode &&
                 fido2CmdGetInfoRespDesc[i].PckType == (isResponse ? ptResponse : ptQuery) &&
diff --git a/client/fido/fidocore.h b/client/fido/fidocore.h
index 676dd2646..d54dc5b88 100644
--- a/client/fido/fidocore.h
+++ b/client/fido/fidocore.h
@@ -45,8 +45,8 @@ int FIDO2GetAssertion(uint8_t *params, uint8_t paramslen, uint8_t *Result, size_
 
 int FIDOCheckDERAndGetKey(uint8_t *der, size_t derLen, bool verbose, uint8_t *publicKey, size_t publicKeyMaxLen);
 
-char *fido2GetCmdMemberDescription(uint8_t cmdCode, bool isResponse, int memberNum);
-char *fido2GetCmdErrorDescription(uint8_t errorCode);
+const char *fido2GetCmdMemberDescription(uint8_t cmdCode, bool isResponse, int memberNum);
+const char *fido2GetCmdErrorDescription(uint8_t errorCode);
 
 bool CheckrpIdHash(json_t *json, uint8_t *hash);
 int FIDO2CreateMakeCredentionalReq(json_t *root, uint8_t *data, size_t maxdatalen, size_t *datalen);
diff --git a/client/hardnested/hardnested_bf_core.c b/client/hardnested/hardnested_bf_core.c
index c180b353a..494e13328 100644
--- a/client/hardnested/hardnested_bf_core.c
+++ b/client/hardnested/hardnested_bf_core.c
@@ -123,7 +123,7 @@ typedef union {
 #endif
 
 // typedefs and declaration of functions:
-typedef const uint64_t crack_states_bitsliced_t(uint32_t, uint8_t *, statelist_t *, uint32_t *, uint64_t *, uint32_t, uint8_t *, noncelist_t *);
+typedef uint64_t crack_states_bitsliced_t(uint32_t, uint8_t *, statelist_t *, uint32_t *, uint64_t *, uint32_t, uint8_t *, noncelist_t *);
 crack_states_bitsliced_t crack_states_bitsliced_AVX512;
 crack_states_bitsliced_t crack_states_bitsliced_AVX2;
 crack_states_bitsliced_t crack_states_bitsliced_AVX;
@@ -205,7 +205,7 @@ void BITSLICE_TEST_NONCES(uint32_t nonces_to_bruteforce, uint32_t *bf_test_nonce
 }
 
 
-const uint64_t CRACK_STATES_BITSLICED(uint32_t cuid, uint8_t *best_first_bytes, statelist_t *p, uint32_t *keys_found, uint64_t *num_keys_tested, uint32_t nonces_to_bruteforce, uint8_t *bf_test_nonce_2nd_byte, noncelist_t *nonces) {
+uint64_t CRACK_STATES_BITSLICED(uint32_t cuid, uint8_t *best_first_bytes, statelist_t *p, uint32_t *keys_found, uint64_t *num_keys_tested, uint32_t nonces_to_bruteforce, uint8_t *bf_test_nonce_2nd_byte, noncelist_t *nonces) {
 
     // Unlike aczid's implementation this doesn't roll back at all when performing bitsliced bruteforce.
     // We know that the best first byte is already shifted in. Testing with the remaining three bytes of
@@ -586,7 +586,7 @@ SIMDExecInstr GetSIMDInstrAuto() {
 }
 
 // determine the available instruction set at runtime and call the correct function
-const uint64_t crack_states_bitsliced_dispatch(uint32_t cuid, uint8_t *best_first_bytes, statelist_t *p, uint32_t *keys_found, uint64_t *num_keys_tested, uint32_t nonces_to_bruteforce, uint8_t *bf_test_nonce_2nd_byte, noncelist_t *nonces) {
+uint64_t crack_states_bitsliced_dispatch(uint32_t cuid, uint8_t *best_first_bytes, statelist_t *p, uint32_t *keys_found, uint64_t *num_keys_tested, uint32_t nonces_to_bruteforce, uint8_t *bf_test_nonce_2nd_byte, noncelist_t *nonces) {
     switch (GetSIMDInstrAuto()) {
 #if defined (__i386__) || defined (__x86_64__)
 #if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
@@ -651,7 +651,7 @@ void bitslice_test_nonces_dispatch(uint32_t nonces_to_bruteforce, uint32_t *bf_t
 }
 
 // Entries to dispatched function calls
-const uint64_t crack_states_bitsliced(uint32_t cuid, uint8_t *best_first_bytes, statelist_t *p, uint32_t *keys_found, uint64_t *num_keys_tested, uint32_t nonces_to_bruteforce, uint8_t *bf_test_nonce_2nd_byte, noncelist_t *nonces) {
+uint64_t crack_states_bitsliced(uint32_t cuid, uint8_t *best_first_bytes, statelist_t *p, uint32_t *keys_found, uint64_t *num_keys_tested, uint32_t nonces_to_bruteforce, uint8_t *bf_test_nonce_2nd_byte, noncelist_t *nonces) {
     return (*crack_states_bitsliced_function_p)(cuid, best_first_bytes, p, keys_found, num_keys_tested, nonces_to_bruteforce, bf_test_nonce_2nd_byte, nonces);
 }
 
diff --git a/client/hardnested/hardnested_bf_core.h b/client/hardnested/hardnested_bf_core.h
index 9dc10961a..00b20b786 100644
--- a/client/hardnested/hardnested_bf_core.h
+++ b/client/hardnested/hardnested_bf_core.h
@@ -64,7 +64,7 @@ typedef enum {
 void SetSIMDInstr(SIMDExecInstr instr);
 SIMDExecInstr GetSIMDInstrAuto(void);
 
-const uint64_t crack_states_bitsliced(uint32_t cuid, uint8_t *best_first_bytes, statelist_t *p, uint32_t *keys_found, uint64_t *num_keys_tested, uint32_t nonces_to_bruteforce, uint8_t *bf_test_nonce_2nd_byte, noncelist_t *nonces);
+uint64_t crack_states_bitsliced(uint32_t cuid, uint8_t *best_first_bytes, statelist_t *p, uint32_t *keys_found, uint64_t *num_keys_tested, uint32_t nonces_to_bruteforce, uint8_t *bf_test_nonce_2nd_byte, noncelist_t *nonces);
 void bitslice_test_nonces(uint32_t nonces_to_bruteforce, uint32_t *bf_test_nonce, uint8_t *bf_test_nonce_par);
 
 #endif
diff --git a/client/loclass/cipherutils.c b/client/loclass/cipherutils.c
index d48863f98..bb457e371 100644
--- a/client/loclass/cipherutils.c
+++ b/client/loclass/cipherutils.c
@@ -142,7 +142,7 @@ void reverse_arraycopy(uint8_t *arr, uint8_t *dest, size_t len) {
     }
 }
 
-void printarr(char *name, uint8_t *arr, int len) {
+void printarr(const char *name, uint8_t *arr, int len) {
     int cx, i;
     size_t outsize = 40 + strlen(name) + len * 5;
     char *output = calloc(outsize, sizeof(char));
@@ -155,7 +155,7 @@ void printarr(char *name, uint8_t *arr, int len) {
     free(output);
 }
 
-void printvar(char *name, uint8_t *arr, int len) {
+void printvar(const char *name, uint8_t *arr, int len) {
     int cx, i;
     size_t outsize = 40 + strlen(name) + len * 2;
     char *output = calloc(outsize, sizeof(char));
@@ -168,7 +168,7 @@ void printvar(char *name, uint8_t *arr, int len) {
     free(output);
 }
 
-void printarr_human_readable(char *title, uint8_t *arr, int len) {
+void printarr_human_readable(const char *title, uint8_t *arr, int len) {
     int cx, i;
     size_t outsize = 100 + strlen(title) + len * 4;
     char *output = calloc(outsize, sizeof(char));
diff --git a/client/loclass/cipherutils.h b/client/loclass/cipherutils.h
index 161e09e48..70438d33b 100644
--- a/client/loclass/cipherutils.h
+++ b/client/loclass/cipherutils.h
@@ -69,7 +69,7 @@ uint64_t x_bytes_to_num(uint8_t *src, size_t len);
 uint8_t reversebytes(uint8_t b);
 void reverse_arraybytes(uint8_t *arr, size_t len);
 void reverse_arraycopy(uint8_t *arr, uint8_t *dest, size_t len);
-void printarr(char *name, uint8_t *arr, int len);
-void printvar(char *name, uint8_t *arr, int len);
-void printarr_human_readable(char *title, uint8_t *arr, int len);
+void printarr(const char *name, uint8_t *arr, int len);
+void printvar(const char *name, uint8_t *arr, int len);
+void printarr_human_readable(const char *title, uint8_t *arr, int len);
 #endif // CIPHERUTILS_H
diff --git a/client/loclass/ikeys.c b/client/loclass/ikeys.c
index d7c965421..43959b421 100644
--- a/client/loclass/ikeys.c
+++ b/client/loclass/ikeys.c
@@ -221,7 +221,7 @@ void printbegin() {
     PrintAndLogDevice(NORMAL, "          | x| y|z0|z1|z2|z3|z4|z5|z6|z7|");
 }
 
-void printState(char *desc, uint64_t c) {
+void printState(const char *desc, uint64_t c) {
     if (debug_print < 2)
         return;
 
@@ -569,7 +569,7 @@ int testKeyDiversificationWithMasterkeyTestcases() {
     return error;
 }
 
-void print64bits(char *name, uint64_t val) {
+void print64bits(const char *name, uint64_t val) {
     printf("%s%08x%08x\n", name, (uint32_t)(val >> 32), (uint32_t)(val & 0xFFFFFFFF));
 }
 
diff --git a/client/mifare/mifare4.c b/client/mifare/mifare4.c
index f3189f37f..757865564 100644
--- a/client/mifare/mifare4.c
+++ b/client/mifare/mifare4.c
@@ -72,7 +72,7 @@ AccessConditions_t MFAccessConditionsTrailer[] = {
     {0x07, "rdCbyAB"}
 };
 
-char *mfGetAccessConditionsDesc(uint8_t blockn, uint8_t *data) {
+const char *mfGetAccessConditionsDesc(uint8_t blockn, uint8_t *data) {
     static char StaticNone[] = "none";
 
     uint8_t data1 = ((data[1] >> 4) & 0x0f) >> blockn;
diff --git a/client/mifare/mifare4.h b/client/mifare/mifare4.h
index d403bdd94..330c6d9f9 100644
--- a/client/mifare/mifare4.h
+++ b/client/mifare/mifare4.h
@@ -40,7 +40,7 @@ typedef enum {
 
 typedef struct {
     uint8_t cond;
-    char *description;
+    const char *description;
 } AccessConditions_t;
 
 void mfpSetVerboseMode(bool verbose);
@@ -55,7 +55,7 @@ int MFPReadBlock(mf4Session *session, bool plain, uint8_t blockNum, uint8_t bloc
 int MFPWriteBlock(mf4Session *session, uint8_t blockNum, uint8_t *data, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen, uint8_t *mac);
 int mfpReadSector(uint8_t sectorNo, uint8_t keyType, uint8_t *key, uint8_t *dataout, bool verbose);
 
-char *mfGetAccessConditionsDesc(uint8_t blockn, uint8_t *data);
+const char *mfGetAccessConditionsDesc(uint8_t blockn, uint8_t *data);
 
 uint8_t mfNumBlocksPerSector(uint8_t sectorNo);
 uint8_t mfFirstBlockOfSector(uint8_t sectorNo);
diff --git a/client/ui.c b/client/ui.c
index 1e5c145be..d22790b9a 100644
--- a/client/ui.c
+++ b/client/ui.c
@@ -19,11 +19,11 @@ bool GridLocked = false;
 bool showDemod = true;
 
 pthread_mutex_t print_lock = PTHREAD_MUTEX_INITIALIZER;
-static char *logfilename = "proxmark3.log";
+static const char *logfilename = "proxmark3.log";
 
 float complex cexpf(float complex Z);
 
-void PrintAndLogOptions(char *str[][2], size_t size, size_t space) {
+void PrintAndLogOptions(const char *str[][2], size_t size, size_t space) {
     char buff[2000] = "Options:\n";
     char format[2000] = "";
     size_t counts[2] = {0, 0};
@@ -56,7 +56,7 @@ void PrintAndLogEx(logLevel_t level, const char *fmt, ...) {
     char buffer2[MAX_PRINT_BUFFER + 20] = {0};
     char *token = NULL;
     //   {NORMAL, SUCCESS, INFO, FAILED, WARNING, ERR, DEBUG}
-    static char *prefixes[7] = { "", "[+] ", "[=] ", "[-] ", "[!] ", "[!!] ", "[#] "};
+    static const char *prefixes[7] = { "", "[+] ", "[=] ", "[-] ", "[!] ", "[!!] ", "[#] "};
 
     switch (level) {
         case ERR:
@@ -118,7 +118,7 @@ void PrintAndLogEx(logLevel_t level, const char *fmt, ...) {
     }
 }
 
-void PrintAndLog(char *fmt, ...) {
+void PrintAndLog(const char *fmt, ...) {
     char *saved_line;
     int saved_point;
     va_list argptr, argptr2;
diff --git a/client/ui.h b/client/ui.h
index 774579725..14af52fcb 100644
--- a/client/ui.h
+++ b/client/ui.h
@@ -33,8 +33,8 @@ void ShowGui(void);
 void HideGraphWindow(void);
 void ShowGraphWindow(void);
 void RepaintGraphWindow(void);
-void PrintAndLog(char *fmt, ...);
-void PrintAndLogOptions(char *str[][2], size_t size, size_t space);
+void PrintAndLog(const char *fmt, ...);
+void PrintAndLogOptions(const char *str[][2], size_t size, size_t space);
 void PrintAndLogEx(logLevel_t level, const char *fmt, ...);
 void SetLogFilename(char *fn);
 void SetFlushAfterWrite(bool value);
diff --git a/client/util.c b/client/util.c
index f69138947..f64e9f342 100644
--- a/client/util.c
+++ b/client/util.c
@@ -58,7 +58,7 @@ int ukbhit(void) {
 // log files functions
 
 // open, appped and close logfile
-void AddLogLine(char *fn, char *data, char *c) {
+void AddLogLine(const char *fn, const char *data, const char *c) {
     FILE *f = NULL;
     char filename[FILE_PATH_SIZE] = {0x00};
     int len = 0;
@@ -80,18 +80,18 @@ void AddLogLine(char *fn, char *data, char *c) {
     fclose(f);
 }
 
-void AddLogHex(char *fn, char *extData, const uint8_t *data, const size_t len) {
+void AddLogHex(const char *fn, const char *extData, const uint8_t *data, const size_t len) {
     AddLogLine(fn, extData, sprint_hex(data, len));
 }
 
-void AddLogUint64(char *fn, char *data, const uint64_t value) {
+void AddLogUint64(const char *fn, const char *data, const uint64_t value) {
     char buf[20] = {0};
     memset(buf, 0x00, sizeof(buf));
     sprintf(buf, "%016" PRIx64 "", value);
     AddLogLine(fn, data, buf);
 }
 
-void AddLogCurrentDT(char *fn) {
+void AddLogCurrentDT(const char *fn) {
     char buf[20];
     memset(buf, 0x00, sizeof(buf));
     struct tm *curTime;
@@ -106,7 +106,7 @@ void AddLogCurrentDT(char *fn) {
 // param *uid  -  pointer to uid byte array
 // param *ext  -  ".log"
 // param uidlen - length of uid array.
-void FillFileNameByUID(char *filenamePrefix, uint8_t *uid, const char *ext, int uidlen) {
+void FillFileNameByUID(char *filenamePrefix, const uint8_t *uid, const char *ext, const int uidlen) {
     if (filenamePrefix == NULL || uid == NULL || ext == NULL) {
         printf("[!] error parameter is NULL\n");
         return;
diff --git a/client/util.h b/client/util.h
index dcd702fb0..5d6643c73 100644
--- a/client/util.h
+++ b/client/util.h
@@ -189,11 +189,11 @@
 uint8_t g_debugMode;
 
 int ukbhit(void);
-void AddLogLine(char *fn, char *data, char *c);
-void AddLogHex(char *fn, char *extData, const uint8_t *data, const size_t len);
-void AddLogUint64(char *fn, char *data, const uint64_t value);
-void AddLogCurrentDT(char *fn);
-void FillFileNameByUID(char *filenamePrefix, uint8_t *uid, const char *ext, int uidlen);
+void AddLogLine(const char *fn, const char *data, const char *c);
+void AddLogHex(const char *fn, const char *extData, const uint8_t *data, const size_t len);
+void AddLogUint64(const char *fn, const char *data, const uint64_t value);
+void AddLogCurrentDT(const char *fn);
+void FillFileNameByUID(char *filenamePrefix, const uint8_t *uid, const char *ext, const int uidlen);
 
 // fill buffer from structure [{uint8_t data, size_t length},...]
 int FillBuffer(uint8_t *data, size_t maxDataLength, size_t *dataLength, ...);
diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index fc5eced7f..2c1dc1b3b 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -90,7 +90,7 @@ serial_port uart_open(const char *pcPortName, uint32_t speed) {
         timeout.tv_usec = 300000;  // 300 000 micro seconds
 
         char *colon = strrchr(addrstr, ':');
-        char *portstr;
+        const char *portstr;
         if (colon) {
             portstr = colon + 1;
             *colon = '\0';

From c10e47f8a9027f1814dd759154fc1b81e4fbf1f7 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 10 Apr 2019 10:35:03 +0200
Subject: [PATCH 1171/1938] More void, fixing "function declaration is not a
 prototype" [-Wstrict-prototypes]

---
 common/usb_cdc.h     | 12 ++++++------
 include/legic_prng.h |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/usb_cdc.h b/common/usb_cdc.h
index 3b95a11c1..a74e3d8c1 100644
--- a/common/usb_cdc.h
+++ b/common/usb_cdc.h
@@ -41,11 +41,11 @@
 #include "proxmark3.h" // USB_CONNECT()
 #include "common.h"
 
-void usb_disable();
-void usb_enable();
-bool usb_check();
-bool usb_poll();
-bool usb_poll_validate_length();
+void usb_disable(void);
+void usb_enable(void);
+bool usb_check(void);
+bool usb_poll(void);
+bool usb_poll_validate_length(void);
 uint32_t usb_read(uint8_t *data, size_t len);
 uint32_t usb_write(const uint8_t *data, const size_t len);
 
@@ -57,7 +57,7 @@ int GetUSBconfigured(void);
 void AT91F_USB_SendData(AT91PS_UDP pUdp, const char *pData, uint32_t length);
 void AT91F_USB_SendZlp(AT91PS_UDP pUdp);
 void AT91F_USB_SendStall(AT91PS_UDP pUdp);
-void AT91F_CDC_Enumerate();
+void AT91F_CDC_Enumerate(void);
 
 #endif // _USB_CDC_H_
 
diff --git a/include/legic_prng.h b/include/legic_prng.h
index 8f37e04a1..c34455c4c 100644
--- a/include/legic_prng.h
+++ b/include/legic_prng.h
@@ -12,7 +12,7 @@
 #include <stdint.h>
 void legic_prng_init(uint8_t iv);
 void legic_prng_forward(int count);
-uint8_t legic_prng_get_bit();
+uint8_t legic_prng_get_bit(void);
 uint32_t legic_prng_get_bits(uint8_t len);
 #endif
 

From cc0454d5d2084027df5129557619eb15dfd3db5b Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 10 Apr 2019 12:23:40 +0200
Subject: [PATCH 1172/1938] tag unused Cmd [-Wunused-parameter]

---
 client/cmdanalyse.c     |  2 ++
 client/cmddata.c        | 10 +++++++++
 client/cmdflashmem.c    |  1 +
 client/cmdhf.c          |  2 ++
 client/cmdhf14a.c       |  1 +
 client/cmdhf14b.c       |  3 +++
 client/cmdhf15.c        |  3 +++
 client/cmdhfepa.c       |  1 +
 client/cmdhffelica.c    |  2 ++
 client/cmdhffido.c      |  1 +
 client/cmdhficlass.c    |  3 +++
 client/cmdhflegic.c     |  2 ++
 client/cmdhfmf.c        |  2 ++
 client/cmdhfmfdes.c     |  3 +++
 client/cmdhfmfp.c       |  1 +
 client/cmdhfmfu.c       |  1 +
 client/cmdhftopaz.c     |  4 ++++
 client/cmdhw.c          |  5 +++++
 client/cmdlf.c          |  3 +++
 client/cmdlfawid.c      |  2 ++
 client/cmdlfcotag.c     |  2 ++
 client/cmdlfem4x.c      |  2 ++
 client/cmdlffdx.c       |  3 +++
 client/cmdlfguard.c     |  2 ++
 client/cmdlfhid.c       |  2 ++
 client/cmdlfhitag.c     |  2 ++
 client/cmdlfindala.c    |  1 +
 client/cmdlfio.c        |  2 ++
 client/cmdlfjablotron.c |  2 ++
 client/cmdlfkeri.c      |  2 ++
 client/cmdlfnedap.c     |  2 ++
 client/cmdlfnexwatch.c  |  2 ++
 client/cmdlfnoralsy.c   |  2 ++
 client/cmdlfparadox.c   |  2 ++
 client/cmdlfpcf7931.c   |  1 +
 client/cmdlfpresco.c    |  2 ++
 client/cmdlfpyramid.c   |  2 ++
 client/cmdlfsecurakey.c |  2 ++
 client/cmdlft55xx.c     |  3 +++
 client/cmdlfti.c        |  3 +++
 client/cmdlfviking.c    |  1 +
 client/cmdlfvisa2000.c  |  2 ++
 client/cmdmain.c        |  2 ++
 client/cmdscript.c      |  2 ++
 client/cmdsmartcard.c   |  2 ++
 client/cmdtrace.c       |  1 +
 client/emv/cmdemv.c     | 48 +++++++++++++++++++++--------------------
 client/emv/cmdemv.h     |  8 +++----
 48 files changed, 132 insertions(+), 27 deletions(-)

diff --git a/client/cmdanalyse.c b/client/cmdanalyse.c
index c04ca2a3b..3cb6c5b47 100644
--- a/client/cmdanalyse.c
+++ b/client/cmdanalyse.c
@@ -426,6 +426,7 @@ int CmdAnalyseCHKSUM(const char *Cmd) {
 }
 
 int CmdAnalyseDates(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     // look for datestamps in a given array of bytes
     PrintAndLogEx(NORMAL, "To be implemented. Feel free to contribute!");
     return 0;
@@ -922,6 +923,7 @@ int CmdAnalyse(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmddata.c b/client/cmddata.c
index bbff0dc88..ac9e3aebc 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -843,6 +843,7 @@ int CmdAutoCorr(const char *Cmd) {
 }
 
 int CmdBitsamples(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     int cnt = 0;
     uint8_t got[12288];
 
@@ -876,6 +877,7 @@ int CmdBuffClear(const char *Cmd) {
 }
 
 int CmdDec(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     for (int i = 0; i < (GraphTraceLen / 2); ++i)
         GraphBuffer[i] = GraphBuffer[i * 2];
     GraphTraceLen /= 2;
@@ -1140,6 +1142,7 @@ int PSKDemod(const char *Cmd, bool verbose) {
 }
 
 int CmdIdteckDemod(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
 
     if (!PSKDemod("", false)) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - Idteck PSKDemod failed");
@@ -1400,12 +1403,14 @@ int CmdHexsamples(const char *Cmd) {
 }
 
 int CmdHide(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     HideGraphWindow();
     return 0;
 }
 
 //zero mean GraphBuffer
 int CmdHpf(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     uint8_t bits[GraphTraceLen];
     size_t size = getFromGraphBuf(bits);
     removeSignalOffset(bits, size);
@@ -1499,6 +1504,7 @@ int CmdSamples(const char *Cmd) {
 }
 
 int CmdTuneSamples(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
 #define NON_VOLTAGE     1000
 #define LF_UNUSABLE_V   2000
 #define LF_MARGINAL_V   10000
@@ -1684,6 +1690,7 @@ int CmdMtrim(const char *Cmd) {
 }
 
 int CmdNorm(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     int i;
     int max = INT_MIN, min = INT_MAX;
 
@@ -1710,6 +1717,7 @@ int CmdNorm(const char *Cmd) {
 }
 
 int CmdPlot(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     ShowGraphWindow();
     return 0;
 }
@@ -1797,6 +1805,7 @@ int CmdDirectionalThreshold(const char *Cmd) {
 }
 
 int CmdZerocrossings(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     // Zero-crossings aren't meaningful unless the signal is zero-mean.
     CmdHpf("");
 
@@ -2129,6 +2138,7 @@ int CmdData(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdflashmem.c b/client/cmdflashmem.c
index 2a9709ef0..33804c1f0 100644
--- a/client/cmdflashmem.c
+++ b/client/cmdflashmem.c
@@ -613,6 +613,7 @@ int CmdFlashMem(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdhf.c b/client/cmdhf.c
index 8368160f8..fd61925a5 100644
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -88,6 +88,7 @@ int CmdHFSearch(const char *Cmd) {
 }
 
 int CmdHFTune(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     PrintAndLogEx(SUCCESS, "Measuring HF antenna, press button to exit");
     UsbCommand c = {CMD_MEASURE_ANTENNA_TUNING_HF};
     clearCommandBuffer();
@@ -137,6 +138,7 @@ int CmdHF(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index ede90f7fb..757a9820e 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -221,6 +221,7 @@ int usage_hf_14a_info(void) {
 }
 
 int CmdHF14AList(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     //PrintAndLogEx(NORMAL, "Deprecated command, use 'hf list 14a' instead");
     CmdTraceList("14a");
     return 0;
diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c
index 9d542f228..7405db431 100644
--- a/client/cmdhf14b.c
+++ b/client/cmdhf14b.c
@@ -122,6 +122,7 @@ static int switch_off_field_14b(void) {
 }
 
 int CmdHF14BList(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdTraceList("14b");
     return 0;
 }
@@ -1072,6 +1073,7 @@ uint32_t srix4kGetMagicbytes(uint64_t uid, uint32_t block6, uint32_t block18, ui
     return result;
 }
 int srix4kValid(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
 
     uint64_t uid = 0xD00202501A4532F9;
     uint32_t block6 = 0xFFFFFFFF;
@@ -1150,6 +1152,7 @@ int CmdHF14B(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index bc03b0883..1b3baa000 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -601,6 +601,7 @@ int CmdHF15Record(const char *Cmd) {
 
 // used with 'hf search'
 int HF15Reader(const char *Cmd, bool verbose) {
+    (void)Cmd; // Cmd is not used so far
     uint8_t uid[8] = {0, 0, 0, 0, 0, 0, 0, 0};
     if (!getUID(uid)) {
         if (verbose) PrintAndLogEx(WARNING, "No tag found.");
@@ -901,6 +902,7 @@ int CmdHF15Restore(const char *Cmd) {
 }
 
 int CmdHF15List(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     //PrintAndLogEx(WARNING, "Deprecated command, use 'hf list 15' instead");
     CmdTraceList("15");
     return 0;
@@ -1328,6 +1330,7 @@ int CmdHF15(const char *Cmd) {
 }
 
 int CmdHF15Help(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable15);
     return 0;
 }
diff --git a/client/cmdhfepa.c b/client/cmdhfepa.c
index b5f60c403..3bb58072d 100644
--- a/client/cmdhfepa.c
+++ b/client/cmdhfepa.c
@@ -171,6 +171,7 @@ static command_t CommandTable[] = {
 };
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdhffelica.c b/client/cmdhffelica.c
index 39dbdbc9b..3f2e36971 100644
--- a/client/cmdhffelica.c
+++ b/client/cmdhffelica.c
@@ -65,6 +65,7 @@ int usage_hf_felica_raw(void) {
 }
 
 int CmdHFFelicaList(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     //PrintAndLogEx(NORMAL, "Deprecated command, use 'hf list felica' instead");
     CmdTraceList("felica");
     return 0;
@@ -606,6 +607,7 @@ int CmdHFFelica(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index cb9694584..045eacf71 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -919,6 +919,7 @@ int CmdHFFido(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index 5688fb8e1..6a2663d7f 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -271,6 +271,7 @@ int xorbits_8(uint8_t val) {
 }
 
 int CmdHFiClassList(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     //PrintAndLogEx(NORMAL, "Deprecated command, use 'hf list iclass' instead");
     CmdTraceList("iclass");
     return 0;
@@ -510,6 +511,7 @@ int CmdHFiClassSim(const char *Cmd) {
 }
 
 int HFiClassReader(const char *Cmd, bool loop, bool verbose) {
+    (void)Cmd; // Cmd is not used so far
     bool tagFound = false;
 
     uint32_t flags = FLAG_ICLASS_READER_CSN | FLAG_ICLASS_READER_CC |  FLAG_ICLASS_READER_AIA |
@@ -2516,6 +2518,7 @@ int CmdHFiClass(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index 13f961e82..161c9e795 100644
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -1284,6 +1284,7 @@ int CmdLegicWipe(const char *Cmd) {
 }
 
 int CmdLegicList(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdTraceList("legic");
     return 0;
 }
@@ -1312,6 +1313,7 @@ int CmdHFLegic(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 2a768862a..8855284f2 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -3519,6 +3519,7 @@ int CmdHFMFNDEF(const char *Cmd) {
 }
 
 int CmdHF14AMfList(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdTraceList("mf");
     return 0;
 }
@@ -3575,6 +3576,7 @@ int CmdHFMF(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdhfmfdes.c b/client/cmdhfmfdes.c
index 1294f98c7..db70477db 100644
--- a/client/cmdhfmfdes.c
+++ b/client/cmdhfmfdes.c
@@ -115,6 +115,7 @@ int CmdHF14ADesRb(const char *Cmd) {
 }
 
 int CmdHF14ADesInfo(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
 
     UsbCommand c = {CMD_MIFARE_DESFIRE_INFO};
     SendCommand(&c);
@@ -421,6 +422,7 @@ void GetKeySettings(uint8_t *aid) {
 }
 
 int CmdHF14ADesEnumApplications(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
 
     uint8_t isOK = 0x00;
     uint8_t aid[3];
@@ -657,6 +659,7 @@ int CmdHFMFDes(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdhfmfp.c b/client/cmdhfmfp.c
index 942000755..a327fb91f 100644
--- a/client/cmdhfmfp.c
+++ b/client/cmdhfmfp.c
@@ -861,6 +861,7 @@ int CmdHFMFP(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index 38aa06d9d..41cdc1b69 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -2670,6 +2670,7 @@ int CmdHFMFUltra(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdhftopaz.c b/client/cmdhftopaz.c
index 398feec6c..255451340 100644
--- a/client/cmdhftopaz.c
+++ b/client/cmdhftopaz.c
@@ -488,16 +488,19 @@ int CmdHFTopazReader(const char *Cmd) {
 }
 
 int CmdHFTopazSim(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     PrintAndLogEx(NORMAL, "not yet implemented");
     return 0;
 }
 
 int CmdHFTopazCmdRaw(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     PrintAndLogEx(NORMAL, "not yet implemented. Use hf 14 raw with option -T.");
     return 0;
 }
 
 int CmdHFTopazList(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdTraceList("topaz");
     return 0;
 }
@@ -521,6 +524,7 @@ int CmdHFTopaz(const char *Cmd) {
 }
 
 static int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdhw.c b/client/cmdhw.c
index 4f17c682a..c02c6e45f 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -325,6 +325,7 @@ int CmdDetectReader(const char *Cmd) {
 
 // ## FPGA Control
 int CmdFPGAOff(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     UsbCommand c = {CMD_FPGA_MAJOR_MODE_OFF};
     clearCommandBuffer();
     SendCommand(&c);
@@ -361,6 +362,7 @@ int CmdReadmem(const char *Cmd) {
 }
 
 int CmdReset(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     UsbCommand c = {CMD_HARDWARE_RESET};
     clearCommandBuffer();
     SendCommand(&c);
@@ -451,6 +453,7 @@ int CmdVersion(const char *Cmd) {
 }
 
 int CmdStatus(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     clearCommandBuffer();
     UsbCommand c = {CMD_STATUS};
     SendCommand(&c);
@@ -460,6 +463,7 @@ int CmdStatus(const char *Cmd) {
 }
 
 int CmdPing(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     clearCommandBuffer();
     UsbCommand resp;
     UsbCommand c = {CMD_PING};
@@ -497,6 +501,7 @@ int CmdHW(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlf.c b/client/cmdlf.c
index 186184d78..6e40518ae 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -187,6 +187,7 @@ int CmdLFCommandRead(const char *Cmd) {
 }
 
 int CmdFlexdemod(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
 
     if (GraphTraceLen < 0)
         return 0;
@@ -737,6 +738,7 @@ int CmdLFpskSim(const char *Cmd) {
 }
 
 int CmdLFSimBidir(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     // Set ADC to twice the carrier for a slight supersampling
     // HACK: not implemented in ARMSRC.
     PrintAndLogEx(INFO, "Not implemented yet.");
@@ -1013,6 +1015,7 @@ int CmdLF(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c
index 72bd48a07..7a570368c 100644
--- a/client/cmdlfawid.c
+++ b/client/cmdlfawid.c
@@ -240,6 +240,7 @@ int CmdAWIDRead_device(const char *Cmd) {
 //AWID Prox demod - FSK2a RF/50 with preamble of 00000001  (always a 96 bit data stream)
 //print full AWID Prox ID and some bit format details if found
 int CmdAWIDDemod(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
     size_t size = getFromGraphBuf(bits);
     if (size == 0) {
@@ -573,6 +574,7 @@ int CmdLFAWID(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfcotag.c b/client/cmdlfcotag.c
index 53b0d0451..1aa238598 100644
--- a/client/cmdlfcotag.c
+++ b/client/cmdlfcotag.c
@@ -28,6 +28,7 @@ int usage_lf_cotag_read(void) {
 // COTAG demod should be able to use GraphBuffer,
 // when data load samples
 int CmdCOTAGDemod(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
 
     uint8_t bits[COTAG_BITS] = {0};
     size_t bitlen = COTAG_BITS;
@@ -116,6 +117,7 @@ int CmdLFCOTAG(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 188e2f507..b868cf09c 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -579,6 +579,7 @@ int CmdEM410xBrute(const char *Cmd) {
  *  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) {
+    (void)Cmd; // Cmd is not used so far
     do {
         if (ukbhit()) {
             int gc = getchar();
@@ -1507,6 +1508,7 @@ int CmdLFEM4X(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlffdx.c b/client/cmdlffdx.c
index 4fdaf133a..98ffadafc 100644
--- a/client/cmdlffdx.c
+++ b/client/cmdlffdx.c
@@ -158,6 +158,7 @@ int getFDXBits(uint64_t national_id, uint16_t country, uint8_t isanimal, uint8_t
 -- sample: 985121004515220  [ 37FF65B88EF94 ]
 */
 int CmdFDXBdemodBI(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
 
     int clk = 32;
     int invert = 1, errCnt = 0, offset = 0, maxErr = 100;
@@ -233,6 +234,7 @@ int CmdFDXBdemodBI(const char *Cmd) {
 //see ASKDemod for what args are accepted
 //almost the same demod as cmddata.c/CmdFDXBdemodBI
 int CmdFdxDemod(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
 
     //Differential Biphase / di-phase (inverted biphase)
     //get binary from ask wave
@@ -404,6 +406,7 @@ int CmdLFFdx(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfguard.c b/client/cmdlfguard.c
index e4776935e..d80368496 100644
--- a/client/cmdlfguard.c
+++ b/client/cmdlfguard.c
@@ -173,6 +173,7 @@ int detectGProxII(uint8_t *bits, size_t *size) {
 // but will leave the GraphBuffer intact.
 //if successful it will push askraw data back to demod buffer ready for emulation
 int CmdGuardDemod(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
 
     //Differential Biphase
     //get binary from ask wave
@@ -362,6 +363,7 @@ int CmdLFGuard(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c
index d46abe60e..a3138fff5 100644
--- a/client/cmdlfhid.c
+++ b/client/cmdlfhid.c
@@ -125,6 +125,7 @@ static bool sendTry(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint32_t delay, ui
 //HID Prox demod - FSK RF/50 with preamble of 00011101 (then manchester encoded)
 //print full HID Prox ID and some bit format details if found
 int CmdHIDDemod(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     //raw fsk demod no manchester decoding no start bit finding just get binary from wave
     uint32_t hi2 = 0, hi = 0, lo = 0;
 
@@ -599,6 +600,7 @@ int CmdLFHID(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index 166787ba4..870ae2d59 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -119,6 +119,7 @@ int usage_hitag_checkchallenges(void) {
 }
 
 int CmdLFHitagList(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdTraceList("hitag");
     return 0;
 
@@ -706,6 +707,7 @@ int CmdLFHitag(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfindala.c b/client/cmdlfindala.c
index 257e85894..d4fde6a5e 100644
--- a/client/cmdlfindala.c
+++ b/client/cmdlfindala.c
@@ -596,6 +596,7 @@ int CmdLFINDALA(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfio.c b/client/cmdlfio.c
index ae18ec4f7..bd5ac0ae2 100644
--- a/client/cmdlfio.c
+++ b/client/cmdlfio.c
@@ -81,6 +81,7 @@ int CmdIOProxRead_device(const char *Cmd) {
 //IO-Prox demod - FSK RF/64 with preamble of 000000001
 //print ioprox ID and some format details
 int CmdIOProxDemod(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     int retval = 0;
     int idx = 0;
     uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
@@ -347,6 +348,7 @@ int CmdLFIO(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfjablotron.c b/client/cmdlfjablotron.c
index 08312db4b..1c4d0b683 100644
--- a/client/cmdlfjablotron.c
+++ b/client/cmdlfjablotron.c
@@ -92,6 +92,7 @@ static uint64_t getJablontronCardId(uint64_t rawcode) {
 
 //see ASKDemod for what args are accepted
 int CmdJablotronDemod(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
 
     //Differential Biphase / di-phase (inverted biphase)
     //get binary from ask wave
@@ -245,6 +246,7 @@ int CmdLFJablotron(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfkeri.c b/client/cmdlfkeri.c
index c3df3e7be..619ec9bfb 100644
--- a/client/cmdlfkeri.c
+++ b/client/cmdlfkeri.c
@@ -64,6 +64,7 @@ int detectKeri(uint8_t *dest, size_t *size, bool *invert) {
 }
 
 int CmdKeriDemod(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
 
     if (!PSKDemod("", false)) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - KERI: PSK1 Demod failed");
@@ -237,6 +238,7 @@ int CmdLFKeri(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfnedap.c b/client/cmdlfnedap.c
index e03401e84..8d314df71 100644
--- a/client/cmdlfnedap.c
+++ b/client/cmdlfnedap.c
@@ -113,6 +113,7 @@ int GetNedapBits(uint32_t cn, uint8_t *nedapBits) {
 //print NEDAP Prox ID, encoding, encrypted ID,
 
 int CmdLFNedapDemod(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     //raw ask demod no start bit finding just get binary from wave
     if (!ASKbiphaseDemod("0 64 1 0", false)) {
         if (g_debugMode) PrintAndLogEx(DEBUG, "DEBUG: Error - Nedap ASKbiphaseDemod failed");
@@ -388,6 +389,7 @@ int CmdLFNedap(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfnexwatch.c b/client/cmdlfnexwatch.c
index 3f68ae818..6ce78b3f3 100644
--- a/client/cmdlfnexwatch.c
+++ b/client/cmdlfnexwatch.c
@@ -32,6 +32,7 @@ int detectNexWatch(uint8_t *dest, size_t *size, bool *invert) {
 }
 
 int CmdNexWatchDemod(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
 
     if (!PSKDemod("", false)) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - NexWatch can't demod signal");
@@ -106,6 +107,7 @@ int CmdLFNEXWATCH(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfnoralsy.c b/client/cmdlfnoralsy.c
index e2c4a5c90..1745d5912 100644
--- a/client/cmdlfnoralsy.c
+++ b/client/cmdlfnoralsy.c
@@ -101,6 +101,7 @@ int detectNoralsy(uint8_t *dest, size_t *size) {
 
 //see ASKDemod for what args are accepted
 int CmdNoralsyDemod(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
 
     //ASK / Manchester
     bool st = true;
@@ -272,6 +273,7 @@ int CmdLFNoralsy(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfparadox.c b/client/cmdlfparadox.c
index 5cca09b4e..3a2979990 100644
--- a/client/cmdlfparadox.c
+++ b/client/cmdlfparadox.c
@@ -78,6 +78,7 @@ int detectParadox(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint
 //Paradox Prox demod - FSK2a RF/50 with preamble of 00001111 (then manchester encoded)
 //print full Paradox Prox ID and some bit format details if found
 int CmdParadoxDemod(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     //raw fsk demod no manchester decoding no start bit finding just get binary from wave
     uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
     size_t size = getFromGraphBuf(bits);
@@ -199,6 +200,7 @@ int CmdLFParadox(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfpcf7931.c b/client/cmdlfpcf7931.c
index 06d239372..badc0f4e9 100644
--- a/client/cmdlfpcf7931.c
+++ b/client/cmdlfpcf7931.c
@@ -172,6 +172,7 @@ int CmdLFPCF7931(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfpresco.c b/client/cmdlfpresco.c
index cff86c88b..16366578e 100644
--- a/client/cmdlfpresco.c
+++ b/client/cmdlfpresco.c
@@ -126,6 +126,7 @@ int GetPrescoBits(uint32_t fullcode, uint8_t *prescoBits) {
 
 //see ASKDemod for what args are accepted
 int CmdPrescoDemod(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     bool st = true;
     if (!ASKDemod_ext("32 0 0 0 0 a", false, false, 1, &st)) {
         PrintAndLogEx(DEBUG, "DEBUG: Error Presco ASKDemod failed");
@@ -257,6 +258,7 @@ int CmdLFPresco(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c
index 27c80e7f3..3c60c5d83 100644
--- a/client/cmdlfpyramid.c
+++ b/client/cmdlfpyramid.c
@@ -106,6 +106,7 @@ int GetPyramidBits(uint32_t fc, uint32_t cn, uint8_t *pyramidBits) {
 //Pyramid Prox demod - FSK RF/50 with preamble of 0000000000000001  (always a 128 bit data stream)
 //print full Farpointe Data/Pyramid Prox ID and some bit format details if found
 int CmdPyramidDemod(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     //raw fsk demod no manchester decoding no start bit finding just get binary from wave
     uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
     size_t size = getFromGraphBuf(bits);
@@ -356,6 +357,7 @@ int CmdLFPyramid(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfsecurakey.c b/client/cmdlfsecurakey.c
index 1f14f8083..e5597efce 100644
--- a/client/cmdlfsecurakey.c
+++ b/client/cmdlfsecurakey.c
@@ -26,6 +26,7 @@ int detectSecurakey(uint8_t *dest, size_t *size) {
 
 //see ASKDemod for what args are accepted
 int CmdSecurakeyDemod(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
 
     //ASK / Manchester
     bool st = false;
@@ -127,6 +128,7 @@ int CmdLFSecurakey(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 96a0bb78c..26cd6a784 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -960,6 +960,7 @@ bool test(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk, bool *Q5)
 }
 
 int special(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
 
     uint8_t bits[32] = {0x00};
 
@@ -1761,6 +1762,7 @@ void t55x7_create_config_block(int tagtype) {
 }
 
 int CmdResetRead(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     UsbCommand c = {CMD_T55XX_RESET_READ, {0, 0, 0}};
     clearCommandBuffer();
     SendCommand(&c);
@@ -2320,6 +2322,7 @@ int CmdLFT55XX(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfti.c b/client/cmdlfti.c
index 223629786..129f8d69b 100644
--- a/client/cmdlfti.c
+++ b/client/cmdlfti.c
@@ -22,6 +22,7 @@
 static int CmdHelp(const char *Cmd);
 
 int CmdTIDemod(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     /* MATLAB as follows:
       f_s = 2000000;  % sampling frequency
       f_l = 123200;   % low FSK tone
@@ -273,6 +274,7 @@ out:
 
 // read a TI tag and return its ID
 int CmdTIRead(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     UsbCommand c = {CMD_READ_TI_TYPE};
     clearCommandBuffer();
     SendCommand(&c);
@@ -312,6 +314,7 @@ int CmdLFTI(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfviking.c b/client/cmdlfviking.c
index 49b4ccf2f..1a7c7301f 100644
--- a/client/cmdlfviking.c
+++ b/client/cmdlfviking.c
@@ -174,6 +174,7 @@ int CmdLFViking(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfvisa2000.c b/client/cmdlfvisa2000.c
index 3dcc7cf04..ad5f1157b 100644
--- a/client/cmdlfvisa2000.c
+++ b/client/cmdlfvisa2000.c
@@ -95,6 +95,7 @@ int detectVisa2k(uint8_t *dest, size_t *size) {
 **/
 //see ASKDemod for what args are accepted
 int CmdVisa2kDemod(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
 
     save_restoreGB(GRAPH_SAVE);
 
@@ -238,6 +239,7 @@ int CmdLFVisa2k(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdmain.c b/client/cmdmain.c
index 5bbd689e1..b3f19af5c 100644
--- a/client/cmdmain.c
+++ b/client/cmdmain.c
@@ -55,11 +55,13 @@ int CmdRem(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
 
 int CmdQuit(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     return 99;
 }
 
diff --git a/client/cmdscript.c b/client/cmdscript.c
index d71a9285b..3ffe064e4 100644
--- a/client/cmdscript.c
+++ b/client/cmdscript.c
@@ -68,6 +68,7 @@ bool endsWith(const char *base, const char *str) {
 * ending with .lua
 */
 int CmdScriptList(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
 
     char const *exedir = get_my_executable_directory();
     if (exedir == NULL)
@@ -191,6 +192,7 @@ int CmdScript(const char *Cmd) {
  * @return
  */
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     PrintAndLogEx(NORMAL, "This is a feature to run Lua-scripts. You can place lua-scripts within the scripts/-folder. ");
     return 0;
 }
diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index 56352b2fd..e02a0120c 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -938,6 +938,7 @@ int CmdSmartSetClock(const char *Cmd) {
 }
 
 int CmdSmartList(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdTraceList("7816");
     return 0;
 }
@@ -1235,6 +1236,7 @@ int CmdSmartcard(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdtrace.c b/client/cmdtrace.c
index 1f10ab214..8a2440c90 100644
--- a/client/cmdtrace.c
+++ b/client/cmdtrace.c
@@ -722,6 +722,7 @@ int CmdTrace(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index 8e3b1ff83..81cf63063 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -54,7 +54,7 @@ void PrintChannel(EMVCommandChannel channel) {
     }
 }
 
-int CmdEMVSelect(const char *cmd) {
+int CmdEMVSelect(const char *Cmd) {
     uint8_t data[APDU_AID_LEN] = {0};
     int datalen = 0;
 
@@ -72,7 +72,7 @@ int CmdEMVSelect(const char *cmd) {
         arg_strx0(NULL,  NULL,     "<HEX applet AID>", NULL),
         arg_param_end
     };
-    CLIExecWithReturn(cmd, argtable, true);
+    CLIExecWithReturn(Cmd, argtable, true);
 
     bool activateField = arg_get_lit(1);
     bool leaveSignalON = arg_get_lit(2);
@@ -105,7 +105,7 @@ int CmdEMVSelect(const char *cmd) {
     return 0;
 }
 
-int CmdEMVSearch(const char *cmd) {
+int CmdEMVSearch(const char *Cmd) {
 
     CLIParserInit("emv search",
                   "Tries to select all applets from applet list:\n",
@@ -120,7 +120,7 @@ int CmdEMVSearch(const char *cmd) {
         arg_lit0("wW",  "wired",   "Send data via contact (iso7816) interface. Contactless interface set by default."),
         arg_param_end
     };
-    CLIExecWithReturn(cmd, argtable, true);
+    CLIExecWithReturn(Cmd, argtable, true);
 
     bool activateField = arg_get_lit(1);
     bool leaveSignalON = arg_get_lit(2);
@@ -155,7 +155,7 @@ int CmdEMVSearch(const char *cmd) {
     return 0;
 }
 
-int CmdEMVPPSE(const char *cmd) {
+int CmdEMVPPSE(const char *Cmd) {
 
     CLIParserInit("emv pse",
                   "Executes PSE/PPSE select command. It returns list of applet on the card:\n",
@@ -172,7 +172,7 @@ int CmdEMVPPSE(const char *cmd) {
         arg_lit0("wW",  "wired",   "Send data via contact (iso7816) interface. Contactless interface set by default."),
         arg_param_end
     };
-    CLIExecWithReturn(cmd, argtable, true);
+    CLIExecWithReturn(Cmd, argtable, true);
 
     bool activateField = arg_get_lit(1);
     bool leaveSignalON = arg_get_lit(2);
@@ -210,7 +210,7 @@ int CmdEMVPPSE(const char *cmd) {
     return 0;
 }
 
-int CmdEMVGPO(const char *cmd) {
+int CmdEMVGPO(const char *Cmd) {
     uint8_t data[APDU_RES_LEN] = {0};
     int datalen = 0;
 
@@ -231,7 +231,7 @@ int CmdEMVGPO(const char *cmd) {
         arg_strx0(NULL,  NULL,     "<HEX PDOLdata/PDOL>", NULL),
         arg_param_end
     };
-    CLIExecWithReturn(cmd, argtable, true);
+    CLIExecWithReturn(Cmd, argtable, true);
 
     bool leaveSignalON = arg_get_lit(1);
     bool paramsLoadFromFile = arg_get_lit(2);
@@ -317,7 +317,7 @@ int CmdEMVGPO(const char *cmd) {
     return 0;
 }
 
-int CmdEMVReadRecord(const char *cmd) {
+int CmdEMVReadRecord(const char *Cmd) {
     uint8_t data[APDU_RES_LEN] = {0};
     int datalen = 0;
 
@@ -334,7 +334,7 @@ int CmdEMVReadRecord(const char *cmd) {
         arg_strx1(NULL,  NULL,     "<SFI 1byte HEX><SFIrecord 1byte HEX>", NULL),
         arg_param_end
     };
-    CLIExecWithReturn(cmd, argtable, true);
+    CLIExecWithReturn(Cmd, argtable, true);
 
     bool leaveSignalON = arg_get_lit(1);
     bool APDULogging = arg_get_lit(2);
@@ -372,7 +372,7 @@ int CmdEMVReadRecord(const char *cmd) {
     return 0;
 }
 
-int CmdEMVAC(const char *cmd) {
+int CmdEMVAC(const char *Cmd) {
     uint8_t data[APDU_RES_LEN] = {0};
     int datalen = 0;
 
@@ -396,7 +396,7 @@ int CmdEMVAC(const char *cmd) {
         arg_strx1(NULL,  NULL,      "<HEX CDOLdata/CDOL>", NULL),
         arg_param_end
     };
-    CLIExecWithReturn(cmd, argtable, false);
+    CLIExecWithReturn(Cmd, argtable, false);
 
     bool leaveSignalON = arg_get_lit(1);
     bool trTypeCDA = arg_get_lit(2);
@@ -493,7 +493,7 @@ int CmdEMVAC(const char *cmd) {
     return 0;
 }
 
-int CmdEMVGenerateChallenge(const char *cmd) {
+int CmdEMVGenerateChallenge(const char *Cmd) {
 
     CLIParserInit("emv challenge",
                   "Executes Generate Challenge command. It returns 4 or 8-byte random number from card.\nNeeds a EMV applet to be selected and GPO to be executed.",
@@ -506,7 +506,7 @@ int CmdEMVGenerateChallenge(const char *cmd) {
         arg_lit0("wW",  "wired",   "Send data via contact (iso7816) interface. Contactless interface set by default."),
         arg_param_end
     };
-    CLIExecWithReturn(cmd, argtable, true);
+    CLIExecWithReturn(Cmd, argtable, true);
 
     bool leaveSignalON = arg_get_lit(1);
     bool APDULogging = arg_get_lit(2);
@@ -538,7 +538,7 @@ int CmdEMVGenerateChallenge(const char *cmd) {
     return 0;
 }
 
-int CmdEMVInternalAuthenticate(const char *cmd) {
+int CmdEMVInternalAuthenticate(const char *Cmd) {
     uint8_t data[APDU_RES_LEN] = {0};
     int datalen = 0;
 
@@ -562,7 +562,7 @@ int CmdEMVInternalAuthenticate(const char *cmd) {
         arg_strx1(NULL,  NULL,     "<HEX DDOLdata/DDOL>", NULL),
         arg_param_end
     };
-    CLIExecWithReturn(cmd, argtable, false);
+    CLIExecWithReturn(Cmd, argtable, false);
 
     bool leaveSignalON = arg_get_lit(1);
     bool paramsLoadFromFile = arg_get_lit(2);
@@ -749,7 +749,7 @@ void ProcessACResponseFormat1(struct tlvdb *tlvRoot, uint8_t *buf, size_t len, b
     }
 }
 
-int CmdEMVExec(const char *cmd) {
+int CmdEMVExec(const char *Cmd) {
     uint8_t buf[APDU_RES_LEN] = {0};
     size_t len = 0;
     uint16_t sw = 0;
@@ -785,7 +785,7 @@ int CmdEMVExec(const char *cmd) {
         arg_lit0("wW",  "wired",   "Send data via contact (iso7816) interface. Contactless interface set by default."),
         arg_param_end
     };
-    CLIExecWithReturn(cmd, argtable, true);
+    CLIExecWithReturn(Cmd, argtable, true);
 
     bool activateField = arg_get_lit(1);
     bool showAPDU = arg_get_lit(2);
@@ -1346,7 +1346,7 @@ int CmdEMVExec(const char *cmd) {
     return 0;
 }
 
-int CmdEMVScan(const char *cmd) {
+int CmdEMVScan(const char *Cmd) {
     uint8_t AID[APDU_AID_LEN] = {0};
     size_t AIDlen = 0;
     uint8_t buf[APDU_RES_LEN] = {0};
@@ -1378,7 +1378,7 @@ int CmdEMVScan(const char *cmd) {
         arg_str1(NULL,  NULL,       "output.json", "JSON output file name"),
         arg_param_end
     };
-    CLIExecWithReturn(cmd, argtable, true);
+    CLIExecWithReturn(Cmd, argtable, true);
 
     bool showAPDU = arg_get_lit(1);
     bool decodeTLV = arg_get_lit(2);
@@ -1701,14 +1701,16 @@ int CmdEMVScan(const char *cmd) {
 }
 
 int CmdEMVList(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     return CmdTraceList("7816");
 }
 
-int CmdEMVTest(const char *cmd) {
+int CmdEMVTest(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     return ExecuteCryptoTests(true);
 }
 
-int CmdEMVRoca(const char *cmd) {
+int CmdEMVRoca(const char *Cmd) {
     uint8_t AID[APDU_AID_LEN] = {0};
     size_t AIDlen = 0;
     uint8_t buf[APDU_RES_LEN] = {0};
@@ -1729,7 +1731,7 @@ int CmdEMVRoca(const char *cmd) {
         arg_lit0("wW",  "wired",   "Send data via contact (iso7816) interface. Contactless interface set by default."),
         arg_param_end
     };
-    CLIExecWithReturn(cmd, argtable, true);
+    CLIExecWithReturn(Cmd, argtable, true);
 
     EMVCommandChannel channel = ECC_CONTACTLESS;
     if (arg_get_lit(1))
diff --git a/client/emv/cmdemv.h b/client/emv/cmdemv.h
index 739909215..4d2b99471 100644
--- a/client/emv/cmdemv.h
+++ b/client/emv/cmdemv.h
@@ -29,10 +29,10 @@
 
 int CmdEMV(const char *Cmd);
 
-int CmdEMVSelect(const char *cmd);
-int CmdEMVSearch(const char *cmd);
-int CmdEMVPPSE(const char *cmd);
-int CmdEMVExec(const char *cmd);
+int CmdEMVSelect(const char *Cmd);
+int CmdEMVSearch(const char *Cmd);
+int CmdEMVPPSE(const char *Cmd);
+int CmdEMVExec(const char *Cmd);
 int CmdEMVGetrng(const char *Cmd);
 int CmdEMVList(const char *Cmd);
 int CmdEMVRoca(const char *Cmd);

From 3d6d58aae5688d58a4b42e8fcb6b167dbec35c0c Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 10 Apr 2019 13:06:05 +0200
Subject: [PATCH 1173/1938] internal help fcts -> static

---
 client/cmdanalyse.c     |  10 +-
 client/cmdanalyse.h     |   7 -
 client/cmddata.c        |  36 ++--
 client/cmdflashmem.c    |  12 +-
 client/cmdhf.c          |   4 +-
 client/cmdhf.h          |   2 -
 client/cmdhf14a.c       |  10 +-
 client/cmdhf14a.h       |   4 -
 client/cmdhf14b.c       |  16 +-
 client/cmdhf14b.h       |   8 -
 client/cmdhf15.c        |  26 +--
 client/cmdhf15.h        |  16 --
 client/cmdhffelica.c    |  10 +-
 client/cmdhffelica.h    |   4 -
 client/cmdhficlass.c    |  36 ++--
 client/cmdhflegic.c     |  22 +--
 client/cmdhflegic.h     |  10 --
 client/cmdhfmf.c        |  54 +++---
 client/cmdhfmfu.c       | 366 ++++++++++++++++++++--------------------
 client/cmdhfmfu.h       |  12 --
 client/cmdlf.c          |  16 +-
 client/cmdlf.h          |   8 -
 client/cmdlfawid.c      |   8 +-
 client/cmdlfawid.h      |   5 -
 client/cmdlfcotag.c     |   2 +-
 client/cmdlfcotag.h     |   1 -
 client/cmdlfem4x.c      |  26 +--
 client/cmdlfem4x.h      |  15 --
 client/cmdlffdx.c       |   4 +-
 client/cmdlffdx.h       |   4 -
 client/cmdlfguard.c     |   4 +-
 client/cmdlfguard.h     |   2 -
 client/cmdlfhid.c       |  10 +-
 client/cmdlfhid.h       |   6 -
 client/cmdlfhitag.c     |  14 +-
 client/cmdlfindala.c    |   6 +-
 client/cmdlfindala.h    |   3 -
 client/cmdlfio.c        |   6 +-
 client/cmdlfio.h        |   3 -
 client/cmdlfjablotron.c |   4 +-
 client/cmdlfjablotron.h |   5 -
 client/cmdlfkeri.c      |   4 +-
 client/cmdlfkeri.h      |   2 -
 client/cmdlfnedap.c     |   4 +-
 client/cmdlfnedap.h     |   3 -
 client/cmdlfnoralsy.c   |   4 +-
 client/cmdlfnoralsy.h   |   4 -
 client/cmdlfparadox.c   |   2 +-
 client/cmdlfpcf7931.c   |   6 +-
 client/cmdlfpcf7931.h   |   4 -
 client/cmdlfpresco.c    |   4 +-
 client/cmdlfpresco.h    |   2 -
 client/cmdlfpyramid.c   |   4 +-
 client/cmdlfpyramid.h   |   3 -
 client/cmdlft55xx.c     |  28 +--
 client/cmdlfviking.c    |   4 +-
 client/cmdlfviking.h    |   2 -
 client/cmdlfvisa2000.c  |   4 +-
 client/cmdlfvisa2000.h  |   4 -
 client/cmdsmartcard.c   |  12 +-
 client/cmdsmartcard.h   |   4 -
 client/cmdtrace.c       |   6 +-
 client/cmdtrace.h       |   4 -
 63 files changed, 392 insertions(+), 539 deletions(-)

diff --git a/client/cmdanalyse.c b/client/cmdanalyse.c
index 3cb6c5b47..9ba84636e 100644
--- a/client/cmdanalyse.c
+++ b/client/cmdanalyse.c
@@ -11,7 +11,7 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_analyse_lcr(void) {
+static int usage_analyse_lcr(void) {
     PrintAndLogEx(NORMAL, "Specifying the bytes of a UID with a known LRC will find the last byte value");
     PrintAndLogEx(NORMAL, "needed to generate that LRC with a rolling XOR. All bytes should be specified in HEX.");
     PrintAndLogEx(NORMAL, "");
@@ -25,7 +25,7 @@ int usage_analyse_lcr(void) {
     PrintAndLogEx(NORMAL, "expected output: Target (BA) requires final LRC XOR byte value: 5A");
     return 0;
 }
-int usage_analyse_checksum(void) {
+static int usage_analyse_checksum(void) {
     PrintAndLogEx(NORMAL, "The bytes will be added with eachother and than limited with the applied mask");
     PrintAndLogEx(NORMAL, "Finally compute ones' complement of the least significant bytes");
     PrintAndLogEx(NORMAL, "");
@@ -41,7 +41,7 @@ int usage_analyse_checksum(void) {
     PrintAndLogEx(NORMAL, "expected output: 0x61");
     return 0;
 }
-int usage_analyse_crc(void) {
+static int usage_analyse_crc(void) {
     PrintAndLogEx(NORMAL, "A stub method to test different crc implementations inside the PM3 sourcecode. Just because you figured out the poly, doesn't mean you get the desired output");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  analyse crc [h] <bytes>");
@@ -53,7 +53,7 @@ int usage_analyse_crc(void) {
     PrintAndLogEx(NORMAL, "      analyse crc 137AF00A0A0D");
     return 0;
 }
-int usage_analyse_nuid(void) {
+static int usage_analyse_nuid(void) {
     PrintAndLogEx(NORMAL, "Generate 4byte NUID from 7byte UID");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  analyse hid [h] <bytes>");
@@ -65,7 +65,7 @@ int usage_analyse_nuid(void) {
     PrintAndLogEx(NORMAL, "      analyse nuid 11223344556677");
     return 0;
 }
-int usage_analyse_a(void) {
+static int usage_analyse_a(void) {
     PrintAndLogEx(NORMAL, "Iceman's personal garbage test command");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  analyse a [h] d <bytes>");
diff --git a/client/cmdanalyse.h b/client/cmdanalyse.h
index 131fe0d11..4c5c486e6 100644
--- a/client/cmdanalyse.h
+++ b/client/cmdanalyse.h
@@ -26,13 +26,6 @@
 #include "mifare/mfkey.h" // nonce2key
 #include "util_posix.h"   // msclock
 
-
-int usage_analyse_lcr(void);
-int usage_analyse_checksum(void);
-int usage_analyse_crc(void);
-int usage_analyse_hid(void);
-int usage_analyse_nuid(void);
-
 int CmdAnalyse(const char *Cmd);
 int CmdAnalyseLCR(const char *Cmd);
 int CmdAnalyseCHKSUM(const char *Cmd);
diff --git a/client/cmddata.c b/client/cmddata.c
index ac9e3aebc..9beb7f6e2 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -17,7 +17,7 @@ int g_DemodClock = 0;
 
 static int CmdHelp(const char *Cmd);
 
-int usage_data_printdemodbuf(void) {
+static int usage_data_printdemodbuf(void) {
     PrintAndLogEx(NORMAL, "Usage: data printdemodbuffer x o <offset> l <length>");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       h          This help");
@@ -26,7 +26,7 @@ int usage_data_printdemodbuf(void) {
     PrintAndLogEx(NORMAL, "       l <length> enter length to print in # of bits or hex characters respectively");
     return 0;
 }
-int usage_data_manrawdecode(void) {
+static int usage_data_manrawdecode(void) {
     PrintAndLogEx(NORMAL, "Usage:  data manrawdecode [invert] [maxErr]");
     PrintAndLogEx(NORMAL, "     Takes 10 and 01 and converts to 0 and 1 respectively");
     PrintAndLogEx(NORMAL, "     --must have binary sequence in demodbuffer (run data askrawdemod first)");
@@ -36,7 +36,7 @@ int usage_data_manrawdecode(void) {
     PrintAndLogEx(NORMAL, "   Example: data manrawdecode   = decode manchester bitstream from the demodbuffer");
     return 0;
 }
-int usage_data_biphaserawdecode(void) {
+static int usage_data_biphaserawdecode(void) {
     PrintAndLogEx(NORMAL, "Usage:  data biphaserawdecode [offset] [invert] [maxErr]");
     PrintAndLogEx(NORMAL, "     Converts 10 or 01 to 1 and 11 or 00 to 0");
     PrintAndLogEx(NORMAL, "     --must have binary sequence in demodbuffer (run data askrawdemod first)");
@@ -50,7 +50,7 @@ int usage_data_biphaserawdecode(void) {
     PrintAndLogEx(NORMAL, "   Example: data biphaserawdecode 1 1 = decode biphase bitstream from the demodbuffer, set offset, and invert output");
     return 0;
 }
-int usage_data_rawdemod(void) {
+static int usage_data_rawdemod(void) {
     PrintAndLogEx(NORMAL, "Usage:  data rawdemod [modulation] <help>|<options>");
     PrintAndLogEx(NORMAL, "   [modulation] as 2 char, 'ab' for ask/biphase, 'am' for ask/manchester, 'ar' for ask/raw, 'fs' for fsk, ...");
     PrintAndLogEx(NORMAL, "         'nr' for nrz/direct, 'p1' for psk1, 'p2' for psk2");
@@ -67,7 +67,7 @@ int usage_data_rawdemod(void) {
     PrintAndLogEx(NORMAL, "          : data rawdemod p2           = demod GraphBuffer using: psk2 - autodetect");
     return 0;
 }
-int usage_data_rawdemod_am(void) {
+static int usage_data_rawdemod_am(void) {
     PrintAndLogEx(NORMAL, "Usage:  data rawdemod am <s> [clock] <invert> [maxError] [maxLen] [amplify]");
     PrintAndLogEx(NORMAL, "     ['s'] optional, check for Sequence Terminator");
     PrintAndLogEx(NORMAL, "     [set clock as integer] optional, if not set, autodetect");
@@ -83,7 +83,7 @@ int usage_data_rawdemod_am(void) {
     PrintAndLogEx(NORMAL, "          : data rawdemod am 64 1 0 = demod an ask/manchester tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors");
     return 0;
 }
-int usage_data_rawdemod_ab(void) {
+static int usage_data_rawdemod_ab(void) {
     PrintAndLogEx(NORMAL, "Usage:  data rawdemod ab [offset] [clock] <invert> [maxError] [maxLen] <amplify>");
     PrintAndLogEx(NORMAL, "     [offset], offset to begin biphase, default=0");
     PrintAndLogEx(NORMAL, "     [set clock as integer] optional, if not set, autodetect");
@@ -106,7 +106,7 @@ int usage_data_rawdemod_ab(void) {
     PrintAndLogEx(NORMAL, "          : data rawdemod ab 0 64 1 0 0 a = demod an ask/biph tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors, and amp");
     return 0;
 }
-int usage_data_rawdemod_ar(void) {
+static int usage_data_rawdemod_ar(void) {
     PrintAndLogEx(NORMAL, "Usage:  data rawdemod ar [clock] <invert> [maxError] [maxLen] [amplify]");
     PrintAndLogEx(NORMAL, "     [set clock as integer] optional, if not set, autodetect");
     PrintAndLogEx(NORMAL, "     <invert>, 1 to invert output");
@@ -123,7 +123,7 @@ int usage_data_rawdemod_ar(void) {
     PrintAndLogEx(NORMAL, "          : data rawdemod ar 64 1 0 0 a = demod an ask tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors, and amp");
     return 0;
 }
-int usage_data_rawdemod_fs(void) {
+static int usage_data_rawdemod_fs(void) {
     PrintAndLogEx(NORMAL, "Usage:  data rawdemod fs [clock] <invert> [fchigh] [fclow]");
     PrintAndLogEx(NORMAL, "     [set clock as integer] optional, omit for autodetect.");
     PrintAndLogEx(NORMAL, "     <invert>, 1 for invert output, can be used even if the clock is omitted");
@@ -139,7 +139,7 @@ int usage_data_rawdemod_fs(void) {
     PrintAndLogEx(NORMAL, "          : data rawdemod fs 50 1 10 8 = demod an fsk2a RF/50 tag from GraphBuffer");
     return 0;
 }
-int usage_data_rawdemod_nr(void) {
+static int usage_data_rawdemod_nr(void) {
     PrintAndLogEx(NORMAL, "Usage:  data rawdemod nr [clock] <0|1> [maxError]");
     PrintAndLogEx(NORMAL, "     [set clock as integer] optional, if not set, autodetect.");
     PrintAndLogEx(NORMAL, "     <invert>, 1 for invert output");
@@ -152,7 +152,7 @@ int usage_data_rawdemod_nr(void) {
     PrintAndLogEx(NORMAL, "          : data rawdemod nr 64 1 0 = demod a nrz/direct tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors");
     return 0;
 }
-int usage_data_rawdemod_p1(void) {
+static int usage_data_rawdemod_p1(void) {
     PrintAndLogEx(NORMAL, "Usage:  data rawdemod p1 [clock] <0|1> [maxError]");
     PrintAndLogEx(NORMAL, "     [set clock as integer] optional, if not set, autodetect.");
     PrintAndLogEx(NORMAL, "     <invert>, 1 for invert output");
@@ -165,7 +165,7 @@ int usage_data_rawdemod_p1(void) {
     PrintAndLogEx(NORMAL, "          : data rawdemod p1 64 1 0 = demod a psk1 tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors");
     return 0;
 }
-int usage_data_rawdemod_p2(void) {
+static int usage_data_rawdemod_p2(void) {
     PrintAndLogEx(NORMAL, "Usage:  data rawdemod p2 [clock] <0|1> [maxError]");
     PrintAndLogEx(NORMAL, "     [set clock as integer] optional, if not set, autodetect.");
     PrintAndLogEx(NORMAL, "     <invert>, 1 for invert output");
@@ -178,7 +178,7 @@ int usage_data_rawdemod_p2(void) {
     PrintAndLogEx(NORMAL, "          : data rawdemod p2 64 1 0  = demod a psk2 tag from GraphBuffer using a clock of RF/64, inverting output and allowing 0 demod errors");
     return 0;
 }
-int usage_data_autocorr(void) {
+static int usage_data_autocorr(void) {
     PrintAndLogEx(NORMAL, "Autocorrelate is used to detect repeating sequences. We use it as detection of length in bits a message inside the signal is");
     PrintAndLogEx(NORMAL, "Usage: data autocorr w <window> [g]");
     PrintAndLogEx(NORMAL, "Options:");
@@ -187,7 +187,7 @@ int usage_data_autocorr(void) {
     PrintAndLogEx(NORMAL, "       g              save back to GraphBuffer (overwrite)");
     return 0;
 }
-int usage_data_undecimate(void) {
+static int usage_data_undecimate(void) {
     PrintAndLogEx(NORMAL, "Usage: data undec [factor]");
     PrintAndLogEx(NORMAL, "This function performs un-decimation, by repeating each sample N times");
     PrintAndLogEx(NORMAL, "Options:");
@@ -196,7 +196,7 @@ int usage_data_undecimate(void) {
     PrintAndLogEx(NORMAL, "Example: 'data undec 3'");
     return 0;
 }
-int usage_data_detectclock(void) {
+static int usage_data_detectclock(void) {
     PrintAndLogEx(NORMAL, "Usage:  data detectclock [modulation] <clock>");
     PrintAndLogEx(NORMAL, "     [modulation as char], specify the modulation type you want to detect the clock of");
     PrintAndLogEx(NORMAL, "     <clock>             , specify the clock (optional - to get best start position only)");
@@ -208,24 +208,24 @@ int usage_data_detectclock(void) {
     PrintAndLogEx(NORMAL, "            data detectclock n    = detect the clock of an nrz/direct modulated wave in the GraphBuffer");
     return 0;
 }
-int usage_data_hex2bin(void) {
+static int usage_data_hex2bin(void) {
     PrintAndLogEx(NORMAL, "Usage: data hex2bin <hex_digits>");
     PrintAndLogEx(NORMAL, "       This function will ignore all non-hexadecimal characters (but stop reading on whitespace)");
     return 0;
 }
-int usage_data_bin2hex(void) {
+static int usage_data_bin2hex(void) {
     PrintAndLogEx(NORMAL, "Usage: data bin2hex <binary_digits>");
     PrintAndLogEx(NORMAL, "       This function will ignore all characters not 1 or 0 (but stop reading on whitespace)");
     return 0;
 }
-int usage_data_buffclear(void) {
+static int usage_data_buffclear(void) {
     PrintAndLogEx(NORMAL, "This function clears the bigbuff on deviceside");
     PrintAndLogEx(NORMAL, "Usage: data buffclear [h]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       h              This help");
     return 0;
 }
-int usage_data_fsktonrz() {
+static int usage_data_fsktonrz() {
     PrintAndLogEx(NORMAL, "Usage: data fsktonrz c <clock> l <fc_low> f <fc_high>");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       h            This help");
diff --git a/client/cmdflashmem.c b/client/cmdflashmem.c
index 33804c1f0..311d07ed3 100644
--- a/client/cmdflashmem.c
+++ b/client/cmdflashmem.c
@@ -26,7 +26,7 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_flashmem_spibaud(void) {
+static int usage_flashmem_spibaud(void) {
     PrintAndLogEx(NORMAL, "Usage:  mem spibaud [h] <baudrate>");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "           h    this help");
@@ -40,7 +40,7 @@ int usage_flashmem_spibaud(void) {
     return 0;
 }
 
-int usage_flashmem_read(void) {
+static int usage_flashmem_read(void) {
     PrintAndLogEx(NORMAL, "Read flash memory on device");
     PrintAndLogEx(NORMAL, "Usage:  mem read o <offset> l <len>");
     PrintAndLogEx(NORMAL, "  o <offset>    :      offset in memory");
@@ -51,7 +51,7 @@ int usage_flashmem_read(void) {
     PrintAndLogEx(NORMAL, "        mem read o 1024 l 10"); // read 10 bytes starting at offset 1024
     return 0;
 }
-int usage_flashmem_load(void) {
+static int usage_flashmem_load(void) {
     PrintAndLogEx(NORMAL, "Loads binary file into flash memory on device");
     PrintAndLogEx(NORMAL, "Usage:  mem load o <offset> f <file name> m t i");
     PrintAndLogEx(NORMAL, "  o <offset>    :      offset in memory");
@@ -68,7 +68,7 @@ int usage_flashmem_load(void) {
     PrintAndLogEx(NORMAL, "        mem load f default_iclass_keys i");
     return 0;
 }
-int usage_flashmem_save(void) {
+static int usage_flashmem_save(void) {
     PrintAndLogEx(NORMAL, "Saves flash memory on device into the file");
     PrintAndLogEx(NORMAL, " Usage:  mem save o <offset> l <length> f <file name>");
     PrintAndLogEx(NORMAL, "  o <offset>    :      offset in memory");
@@ -81,7 +81,7 @@ int usage_flashmem_save(void) {
     PrintAndLogEx(NORMAL, "        mem save f myfile o 1024 l 4096");   // downlowd 4096 bytes from offset 1024 to file myfile
     return 0;
 }
-int usage_flashmem_wipe(void) {
+static int usage_flashmem_wipe(void) {
 
     PrintAndLogEx(WARNING, "[OBS] use with caution.");
     PrintAndLogEx(NORMAL, "Wipe flash memory on device, which fills memory with 0xFF\n");
@@ -95,7 +95,7 @@ int usage_flashmem_wipe(void) {
     PrintAndLogEx(NORMAL, "        mem wipe p 0");  // wipes first page.
     return 0;
 }
-int usage_flashmem_info(void) {
+static int usage_flashmem_info(void) {
     PrintAndLogEx(NORMAL, "Collect signature and verify it from flash memory\n");
     PrintAndLogEx(NORMAL, " Usage:  mem info [h|s|w]");
     PrintAndLogEx(NORMAL, "  s    :      create a signature");
diff --git a/client/cmdhf.c b/client/cmdhf.c
index fd61925a5..d7a3ccce3 100644
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -12,7 +12,7 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_hf_search() {
+static int usage_hf_search() {
     PrintAndLogEx(NORMAL, "Usage: hf search");
     PrintAndLogEx(NORMAL, "Will try to find a HF read out of the unknown tag. Stops when found.");
     PrintAndLogEx(NORMAL, "Options:");
@@ -20,7 +20,7 @@ int usage_hf_search() {
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
-int usage_hf_sniff() {
+static int usage_hf_sniff() {
     PrintAndLogEx(NORMAL, "The high frequence sniffer will assign all available memory on device for sniffed data");
     PrintAndLogEx(NORMAL, "Use " _YELLOW_("'data samples'")" command to download from device,  and " _YELLOW_("'data plot'")" to look at it");
     PrintAndLogEx(NORMAL, "Press button to quit the sniffing.\n");
diff --git a/client/cmdhf.h b/client/cmdhf.h
index 9db6795ac..4540caf3d 100644
--- a/client/cmdhf.h
+++ b/client/cmdhf.h
@@ -38,6 +38,4 @@ int CmdHFTune(const char *Cmd);
 int CmdHFSearch(const char *Cmd);
 int CmdHFSniff(const char *Cmd);
 
-int usage_hf_search(void);
-int usage_hf_sniff(void);
 #endif
diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 757a9820e..570ecec83 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -153,7 +153,7 @@ const char *getTagInfo(uint8_t uid) {
 static uint16_t frameLength = 0;
 uint16_t atsFSC[] = {16, 24, 32, 40, 48, 64, 96, 128, 256};
 
-int usage_hf_14a_sim(void) {
+static int usage_hf_14a_sim(void) {
 //  PrintAndLogEx(NORMAL, "\n Emulating ISO/IEC 14443 type A tag with 4,7 or 10 byte UID\n");
     PrintAndLogEx(NORMAL, "\n Emulating ISO/IEC 14443 type A tag with 4,7 byte UID\n");
     PrintAndLogEx(NORMAL, "Usage: hf 14a sim [h] t <type> u <uid> [x] [e] [v]");
@@ -180,7 +180,7 @@ int usage_hf_14a_sim(void) {
 //  PrintAndLogEx(NORMAL, "          hf 14a sim t 1 u 11223445566778899AA\n");
     return 0;
 }
-int usage_hf_14a_sniff(void) {
+static int usage_hf_14a_sniff(void) {
     PrintAndLogEx(NORMAL, "It get data from the field and saves it into command buffer.");
     PrintAndLogEx(NORMAL, "Buffer accessible from command 'hf list 14a'");
     PrintAndLogEx(NORMAL, "Usage:  hf 14a sniff [c][r]");
@@ -190,7 +190,7 @@ int usage_hf_14a_sniff(void) {
     PrintAndLogEx(NORMAL, "        hf 14a sniff c r");
     return 0;
 }
-int usage_hf_14a_raw(void) {
+static int usage_hf_14a_raw(void) {
     PrintAndLogEx(NORMAL, "Usage: hf 14a raw [-h] [-r] [-c] [-p] [-a] [-T] [-t] <milliseconds> [-b] <number of bits>  <0A 0B 0C ... hex>");
     PrintAndLogEx(NORMAL, "       -h    this help");
     PrintAndLogEx(NORMAL, "       -r    do not read response");
@@ -204,7 +204,7 @@ int usage_hf_14a_raw(void) {
     PrintAndLogEx(NORMAL, "       -3    ISO14443-3 select only (skip RATS)");
     return 0;
 }
-int usage_hf_14a_reader(void) {
+static int usage_hf_14a_reader(void) {
     PrintAndLogEx(NORMAL, "Usage: hf 14a reader [k|s|x] [3]");
     PrintAndLogEx(NORMAL, "       k    keep the field active after command executed");
     PrintAndLogEx(NORMAL, "       s    silent (no messages)");
@@ -212,7 +212,7 @@ int usage_hf_14a_reader(void) {
     PrintAndLogEx(NORMAL, "       3    ISO14443-3 select only (skip RATS)");
     return 0;
 }
-int usage_hf_14a_info(void) {
+static int usage_hf_14a_info(void) {
     PrintAndLogEx(NORMAL, "This command makes more extensive tests against a ISO14443a tag in order to collect information");
     PrintAndLogEx(NORMAL, "Usage: hf 14a info [h|s]");
     PrintAndLogEx(NORMAL, "       s    silent (no messages)");
diff --git a/client/cmdhf14a.h b/client/cmdhf14a.h
index cababc217..ad0860bf1 100644
--- a/client/cmdhf14a.h
+++ b/client/cmdhf14a.h
@@ -53,8 +53,4 @@ int Hf14443_4aGetCardData(iso14a_card_select_t *card);
 int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen);
 int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen);
 
-int usage_hf_14a_sim(void);
-int usage_hf_14a_sniff(void);
-int usage_hf_14a_raw(void);
-int usage_hf_14a_antifuzz(void);
 #endif
diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c
index 7405db431..60722b849 100644
--- a/client/cmdhf14b.c
+++ b/client/cmdhf14b.c
@@ -14,7 +14,7 @@
 #define TIMEOUT 2000
 static int CmdHelp(const char *Cmd);
 
-int usage_hf_14b_info(void) {
+static int usage_hf_14b_info(void) {
     PrintAndLogEx(NORMAL, "Usage: hf 14b info [h] [s]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       h    this help");
@@ -23,7 +23,7 @@ int usage_hf_14b_info(void) {
     PrintAndLogEx(NORMAL, "       hf 14b info");
     return 0;
 }
-int usage_hf_14b_reader(void) {
+static int usage_hf_14b_reader(void) {
     PrintAndLogEx(NORMAL, "Usage: hf 14b reader [h] [s]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       h    this help");
@@ -32,7 +32,7 @@ int usage_hf_14b_reader(void) {
     PrintAndLogEx(NORMAL, "       hf 14b reader");
     return 0;
 }
-int usage_hf_14b_raw(void) {
+static int usage_hf_14b_raw(void) {
     PrintAndLogEx(NORMAL, "Usage: hf 14b raw [-h] [-r] [-c] [-p] [-s / -ss] [-t] <0A 0B 0C ... hex>");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       -h    this help");
@@ -46,7 +46,7 @@ int usage_hf_14b_raw(void) {
     PrintAndLogEx(NORMAL, "       hf 14b raw -s -c -p 0200a40400");
     return 0;
 }
-int usage_hf_14b_sniff(void) {
+static int usage_hf_14b_sniff(void) {
     PrintAndLogEx(NORMAL, "It get data from the field and saves it into command buffer.");
     PrintAndLogEx(NORMAL, "Buffer accessible from command 'hf list 14b'");
     PrintAndLogEx(NORMAL, "Usage: hf 14b sniff [h]");
@@ -56,7 +56,7 @@ int usage_hf_14b_sniff(void) {
     PrintAndLogEx(NORMAL, "       hf 14b sniff");
     return 0;
 }
-int usage_hf_14b_sim(void) {
+static int usage_hf_14b_sim(void) {
     PrintAndLogEx(NORMAL, "Emulating ISO/IEC 14443 type B tag with 4 UID / PUPI");
     PrintAndLogEx(NORMAL, "Usage: hf 14b sim [h] u <uid>");
     PrintAndLogEx(NORMAL, "Options:");
@@ -67,7 +67,7 @@ int usage_hf_14b_sim(void) {
     PrintAndLogEx(NORMAL, "       hf 14b sim u 11223344");
     return 0;
 }
-int usage_hf_14b_read_srx(void) {
+static int usage_hf_14b_read_srx(void) {
     PrintAndLogEx(NORMAL, "Usage:  hf 14b sriread [h] <1|2>");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       h        this help");
@@ -77,7 +77,7 @@ int usage_hf_14b_read_srx(void) {
     PrintAndLogEx(NORMAL, "       hf 14b sriread 2");
     return 0;
 }
-int usage_hf_14b_write_srx(void) {
+static int usage_hf_14b_write_srx(void) {
     PrintAndLogEx(NORMAL, "Usage:  hf 14b [h] sriwrite <1|2> <BLOCK> <DATA>");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       h        this help");
@@ -91,7 +91,7 @@ int usage_hf_14b_write_srx(void) {
     PrintAndLogEx(NORMAL, "       hf 14b sriwrite 2 FF 11223344");
     return 0;
 }
-int usage_hf_14b_dump(void) {
+static int usage_hf_14b_dump(void) {
     PrintAndLogEx(NORMAL, "This command dumps the contents of a ISO-14443-B tag and save it to file\n"
                   "\n"
                   "Usage: hf 14b dump [h] [card memory] <f filname> \n"
diff --git a/client/cmdhf14b.h b/client/cmdhf14b.h
index f2d78778c..675e7d947 100644
--- a/client/cmdhf14b.h
+++ b/client/cmdhf14b.h
@@ -29,14 +29,6 @@
 #include "mifare.h"     // structs/enum for ISO14B
 #include "protocols.h"  // definitions of ISO14B protocol
 
-int usage_hf_14b_info(void);
-int usage_hf_14b_reader(void);
-int usage_hf_14b_raw(void);
-int usage_hf_14b_sniff(void);
-int usage_hf_14b_sim(void);
-int usage_hf_14b_read_srx(void);
-int usage_hf_14b_write_srx(void);
-
 int CmdHF14B(const char *Cmd);
 int CmdHF14BList(const char *Cmd);
 int CmdHF14BInfo(const char *Cmd);
diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index 1b3baa000..649fb8dc6 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -284,17 +284,17 @@ static const char *TagErrorStr(uint8_t error) {
     }
 }
 
-int usage_15_demod(void) {
+static int usage_15_demod(void) {
     PrintAndLogEx(NORMAL, "Tries to demodulate / decode ISO15693, from downloaded samples.\n"
                   "Gather samples with 'hf 15 read' / 'hf 15 record'");
     return 0;
 }
-int usage_15_samples(void) {
+static int usage_15_samples(void) {
     PrintAndLogEx(NORMAL, "Acquire samples as Reader (enables carrier, send inquiry\n"
                   "and download it to graphbuffer.  Try 'hf 15 demod'  to try to demodulate/decode signal");
     return 0;
 }
-int usage_15_info(void) {
+static int usage_15_info(void) {
     PrintAndLogEx(NORMAL, "Uses the optional command 'get_systeminfo' 0x2B to try and extract information\n"
                   "command may fail, depending on tag.\n"
                   "defaults to '1 out of 4' mode\n"
@@ -310,11 +310,11 @@ int usage_15_info(void) {
                   "\thf 15 info u");
     return 0;
 }
-int usage_15_record(void) {
+static int usage_15_record(void) {
     PrintAndLogEx(NORMAL, "Record activity without enableing carrier");
     return 0;
 }
-int usage_15_reader(void) {
+static int usage_15_reader(void) {
     PrintAndLogEx(NORMAL, "This command identifies a ISO 15693 tag\n"
                   "\n"
                   "Usage: hf 15 reader [h]\n"
@@ -325,18 +325,18 @@ int usage_15_reader(void) {
                   "\thf 15 reader");
     return 0;
 }
-int usage_15_sim(void) {
+static int usage_15_sim(void) {
     PrintAndLogEx(NORMAL, "Usage:  hf 15 sim <UID>\n"
                   "\n"
                   "Example:\n"
                   "\thf 15 sim E016240000000000");
     return 0;
 }
-int usage_15_findafi(void) {
+static int usage_15_findafi(void) {
     PrintAndLogEx(NORMAL, "'hf 15 finafi' This command needs a helptext. Feel free to add one!");
     return 0;
 }
-int usage_15_dump(void) {
+static int usage_15_dump(void) {
     PrintAndLogEx(NORMAL, "This command dumps the contents of a ISO-15693 tag and save it to file\n"
                   "\n"
                   "Usage: hf 15 dump [h] <f filname> \n"
@@ -349,7 +349,7 @@ int usage_15_dump(void) {
                   "\thf 15 dump f mydump");
     return 0;
 }
-int usage_15_restore(void) {
+static int usage_15_restore(void) {
     const char *options[][2] = {
         {"h", "this help"},
         {"-2", "use slower '1 out of 256' mode"},
@@ -363,7 +363,7 @@ int usage_15_restore(void) {
     PrintAndLogOptions(options, 7, 3);
     return 0;
 }
-int usage_15_raw(void) {
+static int usage_15_raw(void) {
     const char *options[][2] = {
         {"-r", "do not read response" },
         {"-2", "use slower '1 out of 256' mode" },
@@ -374,7 +374,7 @@ int usage_15_raw(void) {
     PrintAndLogOptions(options, 4, 3);
     return 0;
 }
-int usage_15_read(void) {
+static int usage_15_read(void) {
     PrintAndLogEx(NORMAL, "Usage:  hf 15 read    [options] <uid|s|u|*> <page#>\n"
                   "Options:\n"
                   "\t-2        use slower '1 out of 256' mode\n"
@@ -385,7 +385,7 @@ int usage_15_read(void) {
                   "\tpage#:        page number 0-255");
     return 0;
 }
-int usage_15_write(void) {
+static int usage_15_write(void) {
     PrintAndLogEx(NORMAL, "Usage:  hf 15 write    [options] <uid|s|u|*> <page#> <hexdata>\n"
                   "Options:\n"
                   "\t-2        use slower '1 out of 256' mode\n"
@@ -398,7 +398,7 @@ int usage_15_write(void) {
                   "\thexdata:      data to be written eg AA BB CC DD");
     return 0;
 }
-int usage_15_readmulti(void) {
+static int usage_15_readmulti(void) {
     PrintAndLogEx(NORMAL, "Usage:  hf 15 readmulti  [options] <uid|s|u|*> <start#> <count#>\n"
                   "Options:\n"
                   "\t-2        use slower '1 out of 256' mode\n"
diff --git a/client/cmdhf15.h b/client/cmdhf15.h
index 5a3753100..e9ae7939b 100644
--- a/client/cmdhf15.h
+++ b/client/cmdhf15.h
@@ -45,21 +45,5 @@ int CmdHF15Write(const char *Cmd);
 
 int CmdHF15Help(const char *Cmd);
 
-// usages
-int usage_15_demod(void);
-int usage_15_samples(void);
-int usage_15_info(void);
-int usage_15_record(void);
-int usage_15_reader(void);
-int usage_15_sim(void);
-int usage_15_findafi(void);
-int usage_15_dump(void);
-int usage_15_restore(void);
-int usage_15_raw(void);
-
-int usage_15_read(void);
-int usage_15_write(void);
-int usage_15_readmulti(void);
-
 int prepareHF15Cmd(char **cmd, UsbCommand *c, uint8_t iso15cmd);
 #endif
diff --git a/client/cmdhffelica.c b/client/cmdhffelica.c
index 3f2e36971..d641e39e0 100644
--- a/client/cmdhffelica.c
+++ b/client/cmdhffelica.c
@@ -11,7 +11,7 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_hf_felica_sim(void) {
+static int usage_hf_felica_sim(void) {
     PrintAndLogEx(NORMAL, "\n Emulating ISO/18092 FeliCa tag \n");
     PrintAndLogEx(NORMAL, "Usage: hf felica sim [h] t <type> [v]");
     PrintAndLogEx(NORMAL, "Options:");
@@ -23,7 +23,7 @@ int usage_hf_felica_sim(void) {
     PrintAndLogEx(NORMAL, "          hf felica sim t 1 ");
     return 0;
 }
-int usage_hf_felica_sniff(void) {
+static int usage_hf_felica_sniff(void) {
     PrintAndLogEx(NORMAL, "It get data from the field and saves it into command buffer.");
     PrintAndLogEx(NORMAL, "Buffer accessible from command 'hf list felica'");
     PrintAndLogEx(NORMAL, "Usage:  hf felica sniff <s > <t>");
@@ -33,7 +33,7 @@ int usage_hf_felica_sniff(void) {
     PrintAndLogEx(NORMAL, "          hf felica sniff s 1000");
     return 0;
 }
-int usage_hf_felica_simlite(void) {
+static int usage_hf_felica_simlite(void) {
     PrintAndLogEx(NORMAL, "\n Emulating ISO/18092 FeliCa Lite tag \n");
     PrintAndLogEx(NORMAL, "Usage: hf felica litesim [h] u <uid>");
     PrintAndLogEx(NORMAL, "Options:");
@@ -43,7 +43,7 @@ int usage_hf_felica_simlite(void) {
     PrintAndLogEx(NORMAL, "          hf felica litesim 11223344556677");
     return 0;
 }
-int usage_hf_felica_dumplite(void) {
+static int usage_hf_felica_dumplite(void) {
     PrintAndLogEx(NORMAL, "\n Dump ISO/18092 FeliCa Lite tag \n");
     PrintAndLogEx(NORMAL, "press button to abort run, otherwise it will loop for 200sec.");
     PrintAndLogEx(NORMAL, "Usage: hf felica litedump [h]");
@@ -53,7 +53,7 @@ int usage_hf_felica_dumplite(void) {
     PrintAndLogEx(NORMAL, "          hf felica litedump");
     return 0;
 }
-int usage_hf_felica_raw(void) {
+static int usage_hf_felica_raw(void) {
     PrintAndLogEx(NORMAL, "Usage: hf felica raw [-h] [-r] [-c] [-p] [-a] <0A 0B 0C ... hex>");
     PrintAndLogEx(NORMAL, "       -h    this help");
     PrintAndLogEx(NORMAL, "       -r    do not read response");
diff --git a/client/cmdhffelica.h b/client/cmdhffelica.h
index 9dfd78b0b..0b22762e0 100644
--- a/client/cmdhffelica.h
+++ b/client/cmdhffelica.h
@@ -32,10 +32,6 @@ int CmdHFFelicaSim(const char *Cmd);
 int CmdHFFelicaSniff(const char *Cmd);
 int CmdHFFelicaCmdRaw(const char *Cmd);
 
-int usage_hf_felica_sim(void);
-int usage_hf_felica_sniff(void);
-int usage_hf_fFelica_raw(void);
-
 void waitCmdFelica(uint8_t iSelect);
 
 //temp
diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index 6a2663d7f..f92bfb78d 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -29,7 +29,7 @@ static uint8_t iClass_Key_Table[ICLASS_KEYS_MAX][8] = {
     { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }
 };
 
-int usage_hf_iclass_sim(void) {
+static int usage_hf_iclass_sim(void) {
     PrintAndLogEx(NORMAL, "Usage:  hf iclass sim <option> [CSN]");
     PrintAndLogEx(NORMAL, "        options");
     PrintAndLogEx(NORMAL, "                0 <CSN> simulate the given CSN");
@@ -45,14 +45,14 @@ int usage_hf_iclass_sim(void) {
     PrintAndLogEx(NORMAL, "        hf iclass sim 4");
     return 0;
 }
-int usage_hf_iclass_eload(void) {
+static int usage_hf_iclass_eload(void) {
     PrintAndLogEx(NORMAL, "Loads iclass tag-dump into emulator memory on device");
     PrintAndLogEx(NORMAL, "Usage:  hf iclass eload f <filename>");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "        hf iclass eload f iclass_tagdump-aa162d30f8ff12f1.bin");
     return 0;
 }
-int usage_hf_iclass_decrypt(void) {
+static int usage_hf_iclass_decrypt(void) {
     PrintAndLogEx(NORMAL, "This is simple implementation, it tries to decrypt every block after block 6.");
     PrintAndLogEx(NORMAL, "Correct behaviour would be to decrypt only the application areas where the key is valid,");
     PrintAndLogEx(NORMAL, "which is defined by the configuration block.");
@@ -65,7 +65,7 @@ int usage_hf_iclass_decrypt(void) {
     PrintAndLogEx(NORMAL, "S       hf iclass decrypt f tagdump_12312342343.bin");
     return 0;
 }
-int usage_hf_iclass_encrypt(void) {
+static int usage_hf_iclass_encrypt(void) {
     PrintAndLogEx(NORMAL, "OBS! In order to use this function, the file 'iclass_decryptionkey.bin' must reside");
     PrintAndLogEx(NORMAL, "in the working directory. The file should be 16 bytes binary data");
     PrintAndLogEx(NORMAL, "");
@@ -76,7 +76,7 @@ int usage_hf_iclass_encrypt(void) {
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
-int usage_hf_iclass_dump(void) {
+static int usage_hf_iclass_dump(void) {
     PrintAndLogEx(NORMAL, "Usage:  hf iclass dump f <fileName> k <key> c <creditkey> [e|r|v]\n");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "  f <filename> : specify a filename to save dump to");
@@ -92,7 +92,7 @@ int usage_hf_iclass_dump(void) {
     PrintAndLogEx(NORMAL, "        hf iclass dump k AAAAAAAAAAAAAAAA e");
     return 0;
 }
-int usage_hf_iclass_clone(void) {
+static int usage_hf_iclass_clone(void) {
     PrintAndLogEx(NORMAL, "Usage:  hf iclass clone f <tagfile.bin> b <first block> l <last block> k <KEY> c e|r");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "  f <filename>: specify a filename to clone from");
@@ -108,7 +108,7 @@ int usage_hf_iclass_clone(void) {
     PrintAndLogEx(NORMAL, "       hf iclass clone f iclass_tagdump-121345.bin b 06 l 19 k 0 e");
     return 0;
 }
-int usage_hf_iclass_writeblock(void) {
+static int usage_hf_iclass_writeblock(void) {
     PrintAndLogEx(NORMAL, "Usage:  hf iclass writeblk b <block> d <data> k <key> [c|e|r|v]\n");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "  b <Block> : The block number as 2 hex symbols");
@@ -123,7 +123,7 @@ int usage_hf_iclass_writeblock(void) {
     PrintAndLogEx(NORMAL, "        hf iclass writeblk b 1B d AAAAAAAAAAAAAAAA k 001122334455667B c");
     return 0;
 }
-int usage_hf_iclass_readblock(void) {
+static int usage_hf_iclass_readblock(void) {
     PrintAndLogEx(NORMAL, "Usage:  hf iclass readblk b <block> k <key> [c|e|r|v]\n");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "  b <block> : The block number as 2 hex symbols");
@@ -138,11 +138,11 @@ int usage_hf_iclass_readblock(void) {
     PrintAndLogEx(NORMAL, "        hf iclass readblk b 0A k 0");
     return 0;
 }
-int usage_hf_iclass_readtagfile() {
+static int usage_hf_iclass_readtagfile() {
     PrintAndLogEx(NORMAL, "Usage: hf iclass readtagfile <filename> [startblock] [endblock]");
     return 0;
 }
-int usage_hf_iclass_calc_newkey(void) {
+static int usage_hf_iclass_calc_newkey(void) {
     PrintAndLogEx(NORMAL, "Calculate new key for updating\n");
     PrintAndLogEx(NORMAL, "Usage:  hf iclass calc_newkey o <Old key> n <New key> s [csn] e");
     PrintAndLogEx(NORMAL, "Options:");
@@ -158,7 +158,7 @@ int usage_hf_iclass_calc_newkey(void) {
     PrintAndLogEx(NORMAL, "\nNOTE: * = required\n");
     return 0;
 }
-int usage_hf_iclass_managekeys(void) {
+static int usage_hf_iclass_managekeys(void) {
     PrintAndLogEx(NORMAL, "HELP :  Manage iClass Keys in client memory:\n");
     PrintAndLogEx(NORMAL, "Usage:  hf iclass managekeys n [keynbr] k [key] f [filename] s l p\n");
     PrintAndLogEx(NORMAL, "Options:");
@@ -175,7 +175,7 @@ int usage_hf_iclass_managekeys(void) {
     PrintAndLogEx(NORMAL, " print keys   : hf iclass managekeys p\n");
     return 0;
 }
-int usage_hf_iclass_reader(void) {
+static int usage_hf_iclass_reader(void) {
     PrintAndLogEx(NORMAL, "Act as a Iclass reader.  Look for iClass tags until a key or the pm3 button is pressed\n");
     PrintAndLogEx(NORMAL, "Usage:  hf iclass reader [h] [1]\n");
     PrintAndLogEx(NORMAL, "Options:");
@@ -185,7 +185,7 @@ int usage_hf_iclass_reader(void) {
     PrintAndLogEx(NORMAL, "        hf iclass reader 1");
     return 0;
 }
-int usage_hf_iclass_replay(void) {
+static int usage_hf_iclass_replay(void) {
     PrintAndLogEx(NORMAL, "Replay a collected mac message");
     PrintAndLogEx(NORMAL, "Usage:  hf iclass replay [h] <mac>");
     PrintAndLogEx(NORMAL, "Options:");
@@ -195,14 +195,14 @@ int usage_hf_iclass_replay(void) {
     PrintAndLogEx(NORMAL, "        hf iclass replay 00112233");
     return 0;
 }
-int usage_hf_iclass_sniff(void) {
+static int usage_hf_iclass_sniff(void) {
     PrintAndLogEx(NORMAL, "Sniff the communication between reader and tag");
     PrintAndLogEx(NORMAL, "Usage:  hf iclass sniff [h]");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "         hf iclass sniff");
     return 0;
 }
-int usage_hf_iclass_loclass(void) {
+static int usage_hf_iclass_loclass(void) {
     PrintAndLogEx(NORMAL, "Usage: hf iclass loclass [options]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "h             Show this help");
@@ -217,7 +217,7 @@ int usage_hf_iclass_loclass(void) {
     PrintAndLogEx(NORMAL, "                  ... totalling N*24 bytes");
     return 0;
 }
-int usage_hf_iclass_chk(void) {
+static int usage_hf_iclass_chk(void) {
     PrintAndLogEx(NORMAL, "Checkkeys loads a dictionary text file with 8byte hex keys to test authenticating against a iClass tag");
     PrintAndLogEx(NORMAL, "Usage: hf iclass chk [h|e|r] [f  (*.dic)]");
     PrintAndLogEx(NORMAL, "Options:");
@@ -231,7 +231,7 @@ int usage_hf_iclass_chk(void) {
     PrintAndLogEx(NORMAL, "         hf iclass chk f default_iclass_keys.dic e");
     return 0;
 }
-int usage_hf_iclass_lookup(void) {
+static int usage_hf_iclass_lookup(void) {
     PrintAndLogEx(NORMAL, "Lookup keys takes some sniffed trace data and tries to verify what key was used against a dictionary file");
     PrintAndLogEx(NORMAL, "Usage: hf iclass lookup [h|e|r] [f  (*.dic)] [u <csn>] [p <epurse>] [m <macs>]");
     PrintAndLogEx(NORMAL, "Options:");
@@ -247,7 +247,7 @@ int usage_hf_iclass_lookup(void) {
     PrintAndLogEx(NORMAL, "        hf iclass lookup u 9655a400f8ff12e0 p f0ffffffffffffff m 0000000089cb984b f default_iclass_keys.dic e");
     return 0;
 }
-int usage_hf_iclass_permutekey(void) {
+static int usage_hf_iclass_permutekey(void) {
     PrintAndLogEx(NORMAL, "Permute function from 'heart of darkness' paper.");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  hf iclass permute [h] <r|f> <bytes>");
diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index 161c9e795..8f3925022 100644
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -13,7 +13,7 @@ static int CmdHelp(const char *Cmd);
 
 #define MAX_LENGTH 1024
 
-int usage_legic_calccrc(void) {
+static int usage_legic_calccrc(void) {
     PrintAndLogEx(NORMAL, "Calculates the legic crc8/crc16 on the given data.");
     PrintAndLogEx(NORMAL, "There must be an even number of hexsymbols as input.");
     PrintAndLogEx(NORMAL, "Usage:  hf legic crc [h] d <data> u <uidcrc> c <8|16>");
@@ -28,7 +28,7 @@ int usage_legic_calccrc(void) {
     PrintAndLogEx(NORMAL, "      hf legic crc d deadbeef1122 u 9A c 16");
     return 0;
 }
-int usage_legic_rdmem(void) {
+static int usage_legic_rdmem(void) {
     PrintAndLogEx(NORMAL, "Read data from a legic tag.");
     PrintAndLogEx(NORMAL, "Usage:  hf legic rdmem [h] <offset> <length> <IV>");
     PrintAndLogEx(NORMAL, "Options:");
@@ -43,7 +43,7 @@ int usage_legic_rdmem(void) {
     PrintAndLogEx(NORMAL, "      hf legic rdmem 0 100 55    - reads 0x100 bytes with IV 0x55");
     return 0;
 }
-int usage_legic_sim(void) {
+static int usage_legic_sim(void) {
     PrintAndLogEx(NORMAL, "Simulates a LEGIC Prime tag. MIM22, MIM256, MIM1024 types can be emulated");
     PrintAndLogEx(NORMAL, "Use ELOAD/ESAVE to upload a dump into emulator memory");
     PrintAndLogEx(NORMAL, "Usage:  hf legic sim [h] <tagtype>");
@@ -57,7 +57,7 @@ int usage_legic_sim(void) {
     PrintAndLogEx(NORMAL, "      hf legic sim 2");
     return 0;
 }
-int usage_legic_write(void) {
+static int usage_legic_write(void) {
     PrintAndLogEx(NORMAL, "Write data to a LEGIC Prime tag. It autodetects tagsize to make sure size");
     PrintAndLogEx(NORMAL, "Usage:  hf legic write [h] o <offset> d <data (hex symbols)>");
     PrintAndLogEx(NORMAL, "Options:");
@@ -70,7 +70,7 @@ int usage_legic_write(void) {
     PrintAndLogEx(NORMAL, "      hf legic write o 10 d 11223344    - Write 0x11223344 starting from offset 0x10");
     return 0;
 }
-int usage_legic_reader(void) {
+static int usage_legic_reader(void) {
     PrintAndLogEx(NORMAL, "Read UID and type information from a legic tag.");
     PrintAndLogEx(NORMAL, "Usage:  hf legic reader [h]");
     PrintAndLogEx(NORMAL, "Options:");
@@ -80,7 +80,7 @@ int usage_legic_reader(void) {
     PrintAndLogEx(NORMAL, "      hf legic reader");
     return 0;
 }
-int usage_legic_info(void) {
+static int usage_legic_info(void) {
     PrintAndLogEx(NORMAL, "Reads information from a legic prime tag.");
     PrintAndLogEx(NORMAL, "Shows systemarea, user areas etc");
     PrintAndLogEx(NORMAL, "Usage:  hf legic info [h]");
@@ -91,7 +91,7 @@ int usage_legic_info(void) {
     PrintAndLogEx(NORMAL, "      hf legic info");
     return 0;
 }
-int usage_legic_dump(void) {
+static int usage_legic_dump(void) {
     PrintAndLogEx(NORMAL, "Reads all pages from LEGIC Prime MIM22, MIM256, MIM1024");
     PrintAndLogEx(NORMAL, "and saves binary dump into the file `filename.bin` or `cardUID.bin`");
     PrintAndLogEx(NORMAL, "It autodetects card type.\n");
@@ -105,7 +105,7 @@ int usage_legic_dump(void) {
     PrintAndLogEx(NORMAL, "      hf legic dump o myfile");
     return 0;
 }
-int usage_legic_restore(void) {
+static int usage_legic_restore(void) {
     PrintAndLogEx(NORMAL, "Reads binary file and it autodetects card type and verifies that the file has the same size");
     PrintAndLogEx(NORMAL, "Then write the data back to card. All bytes except the first 7bytes [UID(4) MCC(1) DCF(2)]\n");
     PrintAndLogEx(NORMAL, "Usage:   hf legic restore [h] i <filename w/o .bin>");
@@ -117,7 +117,7 @@ int usage_legic_restore(void) {
     PrintAndLogEx(NORMAL, "      hf legic restore i myfile");
     return 0;
 }
-int usage_legic_eload(void) {
+static int usage_legic_eload(void) {
     PrintAndLogEx(NORMAL, "It loads binary dump from the file `filename.bin`");
     PrintAndLogEx(NORMAL, "Usage:  hf legic eload [h] [card memory] <file name w/o `.bin`>");
     PrintAndLogEx(NORMAL, "Options:");
@@ -131,7 +131,7 @@ int usage_legic_eload(void) {
     PrintAndLogEx(NORMAL, "      hf legic eload 2 myfile");
     return 0;
 }
-int usage_legic_esave(void) {
+static int usage_legic_esave(void) {
     PrintAndLogEx(NORMAL, "It saves binary dump into the file `filename.bin` or `cardID.bin`");
     PrintAndLogEx(NORMAL, " Usage:  hf legic esave [h] [card memory] [file name w/o `.bin`]");
     PrintAndLogEx(NORMAL, "Options:");
@@ -145,7 +145,7 @@ int usage_legic_esave(void) {
     PrintAndLogEx(NORMAL, "      hf legic esave 2 myfile");
     return 0;
 }
-int usage_legic_wipe(void) {
+static int usage_legic_wipe(void) {
     PrintAndLogEx(NORMAL, "Fills a legic tag memory with zeros. From byte7 and to the end.");
     PrintAndLogEx(NORMAL, " Usage:  hf legic wipe [h]");
     PrintAndLogEx(NORMAL, "Options:");
diff --git a/client/cmdhflegic.h b/client/cmdhflegic.h
index 9bd8d98ac..b2cbbb4fb 100644
--- a/client/cmdhflegic.h
+++ b/client/cmdhflegic.h
@@ -47,14 +47,4 @@ void legic_chk_iv(uint32_t *iv);
 void legic_seteml(uint8_t *src, uint32_t offset, uint32_t numofbytes);
 int legic_read_mem(uint32_t offset, uint32_t len, uint32_t iv, uint8_t *out, uint16_t *outlen);
 
-int usage_legic_calccrc(void);
-int usage_legic_load(void);
-int usage_legic_rdmem(void);
-int usage_legic_sim(void);
-int usage_legic_write(void);
-int usage_legic_reader(void);
-int usage_legic_info(void);
-int usage_legic_dump(void);
-int usage_legic_restore(void);
-int usage_legic_wipe(void);
 #endif
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 8855284f2..c2727870a 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -28,7 +28,7 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_hf14_ice(void) {
+static int usage_hf14_ice(void) {
     PrintAndLogEx(NORMAL, "Usage:   hf mf ice [l] <limit> [f] <name>");
     PrintAndLogEx(NORMAL, "  h            this help");
     PrintAndLogEx(NORMAL, "  l <limit>    nonces to be collected");
@@ -40,7 +40,7 @@ int usage_hf14_ice(void) {
     return 0;
 }
 
-int usage_hf14_dump(void) {
+static int usage_hf14_dump(void) {
     PrintAndLogEx(NORMAL, "Usage:   hf mf dump [card memory] k <name> f <name>");
     PrintAndLogEx(NORMAL, "  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");
     PrintAndLogEx(NORMAL, "  k <name>     : key filename, if no <name> given, UID will be used as filename");
@@ -52,7 +52,7 @@ int usage_hf14_dump(void) {
     return 0;
 }
 
-int usage_hf14_mifare(void) {
+static int usage_hf14_mifare(void) {
     PrintAndLogEx(NORMAL, "Usage:  hf mf darkside [h] <block number> <A|B>");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "      h               this help");
@@ -64,7 +64,7 @@ int usage_hf14_mifare(void) {
     PrintAndLogEx(NORMAL, "           hf mf darkside 16 B");
     return 0;
 }
-int usage_hf14_mf1ksim(void) {
+static int usage_hf14_mf1ksim(void) {
     PrintAndLogEx(NORMAL, "Usage:  hf mf sim [h] u <uid> n <numreads> [i] [x] [e] [v]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "      h    this help");
@@ -85,7 +85,7 @@ int usage_hf14_mf1ksim(void) {
     PrintAndLogEx(NORMAL, "           hf mf sim u 11223344 i x");
     return 0;
 }
-int usage_hf14_dbg(void) {
+static int usage_hf14_dbg(void) {
     PrintAndLogEx(NORMAL, "Usage:  hf mf dbg [h] <debug level>");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "           h    this help");
@@ -100,7 +100,7 @@ int usage_hf14_dbg(void) {
     PrintAndLogEx(NORMAL, "           hf mf dbg 3");
     return 0;
 }
-int usage_hf14_sniff(void) {
+static int usage_hf14_sniff(void) {
     PrintAndLogEx(NORMAL, "It continuously gets data from the field and saves it to: log, emulator, emulator file.");
     PrintAndLogEx(NORMAL, "Usage:  hf mf sniff [h] [l] [d] [f]");
     PrintAndLogEx(NORMAL, "Options:");
@@ -113,7 +113,7 @@ int usage_hf14_sniff(void) {
     PrintAndLogEx(NORMAL, "           hf mf sniff l d f");
     return 0;
 }
-int usage_hf14_nested(void) {
+static int usage_hf14_nested(void) {
     PrintAndLogEx(NORMAL, "Usage:");
     PrintAndLogEx(NORMAL, " all sectors:  hf mf nested  <card memory> <block number> <key A/B> <key (12 hex symbols)> [t,d]");
     PrintAndLogEx(NORMAL, " one sector:   hf mf nested  o <block number> <key A/B> <key (12 hex symbols)>");
@@ -131,7 +131,7 @@ int usage_hf14_nested(void) {
     PrintAndLogEx(NORMAL, "      hf mf nested o 0 A FFFFFFFFFFFF 4 A");
     return 0;
 }
-int usage_hf14_hardnested(void) {
+static int usage_hf14_hardnested(void) {
     PrintAndLogEx(NORMAL, "Usage:");
     PrintAndLogEx(NORMAL, "      hf mf hardnested <block number> <key A|B> <key (12 hex symbols)>");
     PrintAndLogEx(NORMAL, "                       <target block number> <target key A|B> [known target key (12 hex symbols)] [w] [s]");
@@ -164,7 +164,7 @@ int usage_hf14_hardnested(void) {
     PrintAndLogEx(NORMAL, "      hf mf hardnested 0 A A0A1A2A3A4A5 4 A FFFFFFFFFFFF");
     return 0;
 }
-int usage_hf14_chk(void) {
+static int usage_hf14_chk(void) {
     PrintAndLogEx(NORMAL, "Usage:  hf mf chk [h] <block number>|<*card memory> <key type (A/B/?)> [t|d] [<key (12 hex symbols)>] [<dic (*.dic)>]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "      h    this help");
@@ -182,7 +182,7 @@ int usage_hf14_chk(void) {
     PrintAndLogEx(NORMAL, "      hf mf chk *1 ? d                        -- target all blocks, all keys, 1K, write to file");
     return 0;
 }
-int usage_hf14_chk_fast(void) {
+static int usage_hf14_chk_fast(void) {
     PrintAndLogEx(NORMAL, "This is a improved checkkeys method speedwise. It checks Mifare Classic tags sector keys against a dictionary file with keys");
     PrintAndLogEx(NORMAL, "Usage:  hf mf fchk [h] <card memory> [t|d|f] [<key (12 hex symbols)>] [<dic (*.dic)>]");
     PrintAndLogEx(NORMAL, "Options:");
@@ -205,7 +205,7 @@ int usage_hf14_chk_fast(void) {
 #endif
     return 0;
 }
-int usage_hf14_keybrute(void) {
+static int usage_hf14_keybrute(void) {
     PrintAndLogEx(NORMAL, "J_Run's 2nd phase of multiple sector nested authentication key recovery");
     PrintAndLogEx(NORMAL, "You have a known 4 last bytes of a key recovered with mf_nonce_brute tool.");
     PrintAndLogEx(NORMAL, "First 2 bytes of key will be bruteforced");
@@ -222,7 +222,7 @@ int usage_hf14_keybrute(void) {
     PrintAndLogEx(NORMAL, "           hf mf keybrute 1 A 000011223344");
     return 0;
 }
-int usage_hf14_restore(void) {
+static int usage_hf14_restore(void) {
     PrintAndLogEx(NORMAL, "Usage:   hf mf restore [card memory] u <UID> k <name> f <name>");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");
@@ -237,7 +237,7 @@ int usage_hf14_restore(void) {
     PrintAndLogEx(NORMAL, "         hf mf restore 4                          -- read the UID from tag with 4K memory first, then restore from hf-mf-<UID>-key.bin and and hf-mf-<UID>-data.bin");
     return 0;
 }
-int usage_hf14_decryptbytes(void) {
+static int usage_hf14_decryptbytes(void) {
     PrintAndLogEx(NORMAL, "Decrypt Crypto-1 encrypted bytes given some known state of crypto. See tracelog to gather needed values\n");
     PrintAndLogEx(NORMAL, "Usage:   hf mf decrypt [h] <nt> <ar_enc> <at_enc> <data>");
     PrintAndLogEx(NORMAL, "Options:");
@@ -252,24 +252,24 @@ int usage_hf14_decryptbytes(void) {
     return 0;
 }
 
-int usage_hf14_eget(void) {
+static int usage_hf14_eget(void) {
     PrintAndLogEx(NORMAL, "Usage:  hf mf eget <block number>");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "        hf mf eget 0 ");
     return 0;
 }
-int usage_hf14_eclr(void) {
+static int usage_hf14_eclr(void) {
     PrintAndLogEx(NORMAL, "It set card emulator memory to empty data blocks and key A/B FFFFFFFFFFFF \n");
     PrintAndLogEx(NORMAL, "Usage:  hf mf eclr");
     return 0;
 }
-int usage_hf14_eset(void) {
+static int usage_hf14_eset(void) {
     PrintAndLogEx(NORMAL, "Usage:  hf mf eset <block number> <block data (32 hex symbols)>");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "        hf mf eset 1 000102030405060708090a0b0c0d0e0f ");
     return 0;
 }
-int usage_hf14_eload(void) {
+static int usage_hf14_eload(void) {
     PrintAndLogEx(NORMAL, "It loads emul dump from the file `filename.eml`");
     PrintAndLogEx(NORMAL, "Usage:  hf mf eload [card memory] <file name w/o `.eml`> [numblocks]");
     PrintAndLogEx(NORMAL, "  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K, u = UL");
@@ -279,7 +279,7 @@ int usage_hf14_eload(void) {
     PrintAndLogEx(NORMAL, "        hf mf eload 4 filename");
     return 0;
 }
-int usage_hf14_esave(void) {
+static int usage_hf14_esave(void) {
     PrintAndLogEx(NORMAL, "It saves emul dump into the file `filename.eml` or `cardID.eml`");
     PrintAndLogEx(NORMAL, " Usage:  hf mf esave [card memory] [file name w/o `.eml`]");
     PrintAndLogEx(NORMAL, "  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");
@@ -290,7 +290,7 @@ int usage_hf14_esave(void) {
     PrintAndLogEx(NORMAL, "        hf mf esave 4 filename");
     return 0;
 }
-int usage_hf14_ecfill(void) {
+static int usage_hf14_ecfill(void) {
     PrintAndLogEx(NORMAL, "Read card and transfer its data to emulator memory.");
     PrintAndLogEx(NORMAL, "Keys must be laid in the emulator memory. \n");
     PrintAndLogEx(NORMAL, "Usage:  hf mf ecfill <key A/B> [card memory]");
@@ -301,7 +301,7 @@ int usage_hf14_ecfill(void) {
     PrintAndLogEx(NORMAL, "        hf mf ecfill A 4");
     return 0;
 }
-int usage_hf14_ekeyprn(void) {
+static int usage_hf14_ekeyprn(void) {
     PrintAndLogEx(NORMAL, "It prints the keys loaded in the emulator memory");
     PrintAndLogEx(NORMAL, "Usage:  hf mf ekeyprn [card memory]");
     PrintAndLogEx(NORMAL, "  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");
@@ -311,7 +311,7 @@ int usage_hf14_ekeyprn(void) {
     return 0;
 }
 
-int usage_hf14_csetuid(void) {
+static int usage_hf14_csetuid(void) {
     PrintAndLogEx(NORMAL, "Set UID, ATQA, and SAK for magic Chinese card. Only works with magic cards");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  hf mf csetuid [h] <UID 8 hex symbols> [ATQA 4 hex symbols] [SAK 2 hex symbols] [w]");
@@ -326,7 +326,7 @@ int usage_hf14_csetuid(void) {
     PrintAndLogEx(NORMAL, "      hf mf csetuid 01020304 0004 08 w");
     return 0;
 }
-int usage_hf14_csetblk(void) {
+static int usage_hf14_csetblk(void) {
     PrintAndLogEx(NORMAL, "Set block data for magic Chinese card. Only works with magic cards");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  hf mf csetblk [h] <block number> <block data (32 hex symbols)> [w]");
@@ -340,7 +340,7 @@ int usage_hf14_csetblk(void) {
     PrintAndLogEx(NORMAL, "       hf mf csetblk 1 01020304050607080910111213141516 w");
     return 0;
 }
-int usage_hf14_cload(void) {
+static int usage_hf14_cload(void) {
     PrintAndLogEx(NORMAL, "It loads magic Chinese card from the file `filename.eml`");
     PrintAndLogEx(NORMAL, "or from emulator memory");
     PrintAndLogEx(NORMAL, "");
@@ -356,7 +356,7 @@ int usage_hf14_cload(void) {
     PrintAndLogEx(NORMAL, "       hf mf cload e");
     return 0;
 }
-int usage_hf14_cgetblk(void) {
+static int usage_hf14_cgetblk(void) {
     PrintAndLogEx(NORMAL, "Get block data from magic Chinese card. Only works with magic cards\n");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  hf mf cgetblk [h] <block number>");
@@ -367,7 +367,7 @@ int usage_hf14_cgetblk(void) {
     PrintAndLogEx(NORMAL, "      hf mf cgetblk 1");
     return 0;
 }
-int usage_hf14_cgetsc(void) {
+static int usage_hf14_cgetsc(void) {
     PrintAndLogEx(NORMAL, "Get sector data from magic Chinese card. Only works with magic cards\n");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  hf mf cgetsc [h] <sector number>");
@@ -378,7 +378,7 @@ int usage_hf14_cgetsc(void) {
     PrintAndLogEx(NORMAL, "      hf mf cgetsc 0");
     return 0;
 }
-int usage_hf14_csave(void) {
+static int usage_hf14_csave(void) {
     PrintAndLogEx(NORMAL, "It saves `magic Chinese` card dump into the file `filename.eml` or `cardID.eml`");
     PrintAndLogEx(NORMAL, "or into emulator memory");
     PrintAndLogEx(NORMAL, "");
@@ -396,7 +396,7 @@ int usage_hf14_csave(void) {
     PrintAndLogEx(NORMAL, "       hf mf csave 4 o filename");
     return 0;
 }
-int usage_hf14_nack(void) {
+static int usage_hf14_nack(void) {
     PrintAndLogEx(NORMAL, "Test a mifare classic based card for the NACK bug.");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  hf mf nack [h] [v]");
diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index 41cdc1b69..6af87bd69 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -26,6 +26,189 @@
 
 static int CmdHelp(const char *Cmd);
 
+static int usage_hf_mfu_info(void) {
+    PrintAndLogEx(NORMAL, "It gathers information about the tag and tries to detect what kind it is.");
+    PrintAndLogEx(NORMAL, "Sometimes the tags are locked down, and you may need a key to be able to read the information");
+    PrintAndLogEx(NORMAL, "The following tags can be identified:\n");
+    PrintAndLogEx(NORMAL, "Ultralight, Ultralight-C, Ultralight EV1, NTAG 203, NTAG 210,");
+    PrintAndLogEx(NORMAL, "NTAG 212, NTAG 213, NTAG 215, NTAG 216, NTAG I2C 1K & 2K");
+    PrintAndLogEx(NORMAL, "my-d, my-d NFC, my-d move, my-d move NFC\n");
+    PrintAndLogEx(NORMAL, "Usage:  hf mfu info k <key> l");
+    PrintAndLogEx(NORMAL, "  Options : ");
+    PrintAndLogEx(NORMAL, "  k <key> : (optional) key for authentication [UL-C 16bytes, EV1/NTAG 4bytes]");
+    PrintAndLogEx(NORMAL, "  l       : (optional) swap entered key's endianness");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "       hf mfu info");
+    PrintAndLogEx(NORMAL, "       hf mfu info k 00112233445566778899AABBCCDDEEFF");
+    PrintAndLogEx(NORMAL, "       hf mfu info k AABBCCDD");
+    return 0;
+}
+
+static int usage_hf_mfu_dump(void) {
+    PrintAndLogEx(NORMAL, "Reads all pages from Ultralight, Ultralight-C, Ultralight EV1");
+    PrintAndLogEx(NORMAL, "NTAG 203, NTAG 210, NTAG 212, NTAG 213, NTAG 215, NTAG 216");
+    PrintAndLogEx(NORMAL, "and saves binary dump into the file `filename.bin` or `cardUID.bin`");
+    PrintAndLogEx(NORMAL, "It autodetects card type.\n");
+    PrintAndLogEx(NORMAL, "Usage:  hf mfu dump k <key> l f <filename w/o .bin> p <page#> q <#pages>");
+    PrintAndLogEx(NORMAL, "  Options :");
+    PrintAndLogEx(NORMAL, "  k <key> : (optional) key for authentication [UL-C 16bytes, EV1/NTAG 4bytes]");
+    PrintAndLogEx(NORMAL, "  l       : (optional) swap entered key's endianness");
+    PrintAndLogEx(NORMAL, "  f <FN > : filename w/o .bin to save the dump as");
+    PrintAndLogEx(NORMAL, "  p <Pg > : starting Page number to manually set a page to start the dump at");
+    PrintAndLogEx(NORMAL, "  q <qty> : number of Pages to manually set how many pages to dump");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "       hf mfu dump");
+    PrintAndLogEx(NORMAL, "       hf mfu dump n myfile");
+    PrintAndLogEx(NORMAL, "       hf mfu dump k 00112233445566778899AABBCCDDEEFF");
+    PrintAndLogEx(NORMAL, "       hf mfu dump k AABBCCDD\n");
+    return 0;
+}
+
+static int usage_hf_mfu_restore(void) {
+    PrintAndLogEx(NORMAL, "Restore dumpfile onto card.");
+    PrintAndLogEx(NORMAL, "Usage:  hf mfu restore [h] [l] [s] k <key> n <filename w/o .bin> ");
+    PrintAndLogEx(NORMAL, "  Options :");
+    PrintAndLogEx(NORMAL, "  k <key> : (optional) key for authentication [UL-C 16bytes, EV1/NTAG 4bytes]");
+    PrintAndLogEx(NORMAL, "  l       : (optional) swap entered key's endianness");
+    PrintAndLogEx(NORMAL, "  s       : (optional) enable special write UID -MAGIC TAG ONLY-");
+    PrintAndLogEx(NORMAL, "  e       : (optional) enable special write version/signature -MAGIC NTAG 21* ONLY-");
+    PrintAndLogEx(NORMAL, "  r       : (optional) use the password found in dumpfile to configure tag. requires 'e' parameter to work");
+    PrintAndLogEx(NORMAL, "  f <FN>  : filename w/o .bin to restore");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "       hf mfu restore s f myfile");
+    PrintAndLogEx(NORMAL, "       hf mfu restore k AABBCCDD s f myfile\n");
+    PrintAndLogEx(NORMAL, "       hf mfu restore k AABBCCDD s e r f myfile\n");
+    return 0;
+}
+
+static int usage_hf_mfu_rdbl(void) {
+    PrintAndLogEx(NORMAL, "Read a block and print. It autodetects card type.\n");
+    PrintAndLogEx(NORMAL, "Usage:  hf mfu rdbl b <block number> k <key> l\n");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "  b <no>  : block to read");
+    PrintAndLogEx(NORMAL, "  k <key> : (optional) key for authentication [UL-C 16bytes, EV1/NTAG 4bytes]");
+    PrintAndLogEx(NORMAL, "  l       : (optional) swap entered key's endianness");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "       hf mfu rdbl b 0");
+    PrintAndLogEx(NORMAL, "       hf mfu rdbl b 0 k 00112233445566778899AABBCCDDEEFF");
+    PrintAndLogEx(NORMAL, "       hf mfu rdbl b 0 k AABBCCDD\n");
+    return 0;
+}
+
+static int usage_hf_mfu_wrbl(void) {
+    PrintAndLogEx(NORMAL, "Write a block. It autodetects card type.\n");
+    PrintAndLogEx(NORMAL, "Usage:  hf mfu wrbl b <block number> d <data> k <key> l\n");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "  b <no>   : block to write");
+    PrintAndLogEx(NORMAL, "  d <data> : block data - (8 hex symbols)");
+    PrintAndLogEx(NORMAL, "  k <key>  : (optional) key for authentication [UL-C 16bytes, EV1/NTAG 4bytes]");
+    PrintAndLogEx(NORMAL, "  l        : (optional) swap entered key's endianness");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "        hf mfu wrbl b 0 d 01234567");
+    PrintAndLogEx(NORMAL, "        hf mfu wrbl b 0 d 01234567 k AABBCCDD\n");
+    return 0;
+}
+
+static int usage_hf_mfu_eload(void) {
+    PrintAndLogEx(NORMAL, "It loads emul dump from the file `filename.eml`");
+    PrintAndLogEx(NORMAL, "Hint: See script dumptoemul-mfu.lua to convert the .bin to the eml");
+    PrintAndLogEx(NORMAL, "Usage:  hf mfu eload u <file name w/o `.eml`> [numblocks]");
+    PrintAndLogEx(NORMAL, "  Options:");
+    PrintAndLogEx(NORMAL, "    h          : this help");
+    PrintAndLogEx(NORMAL, "    u          : UL (required)");
+    PrintAndLogEx(NORMAL, "    [filename] : without `.eml` (required)");
+    PrintAndLogEx(NORMAL, "    numblocks  : number of blocks to load from eml file (optional)");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "  sample: hf mfu eload u filename");
+    PrintAndLogEx(NORMAL, "          hf mfu eload u filename 57");
+    return 0;
+}
+
+static int usage_hf_mfu_sim(void) {
+    PrintAndLogEx(NORMAL, "\nEmulating Ultralight tag from emulator memory\n");
+    PrintAndLogEx(NORMAL, "\nBe sure to load the emulator memory first!\n");
+    PrintAndLogEx(NORMAL, "Usage: hf mfu sim t 7 u <uid>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "    h       : this help");
+    PrintAndLogEx(NORMAL, "    t 7     : 7 = NTAG or Ultralight sim (required)");
+    PrintAndLogEx(NORMAL, "    u <uid> : 4 or 7 byte UID (optional)");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "        hf mfu sim t 7");
+    PrintAndLogEx(NORMAL, "        hf mfu sim t 7 u 1122344556677\n");
+
+    return 0;
+}
+
+static int usage_hf_mfu_ucauth(void) {
+    PrintAndLogEx(NORMAL, "Usage:  hf mfu cauth k <key number>");
+    PrintAndLogEx(NORMAL, "      0 (default): 3DES standard key");
+    PrintAndLogEx(NORMAL, "      1 : all 0x00 key");
+    PrintAndLogEx(NORMAL, "      2 : 0x00-0x0F key");
+    PrintAndLogEx(NORMAL, "      3 : nfc key");
+    PrintAndLogEx(NORMAL, "      4 : all 0x01 key");
+    PrintAndLogEx(NORMAL, "      5 : all 0xff key");
+    PrintAndLogEx(NORMAL, "      6 : 0x00-0xFF key");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "       hf mfu cauth k");
+    PrintAndLogEx(NORMAL, "       hf mfu cauth k 3");
+    return 0;
+}
+
+static int usage_hf_mfu_ucsetpwd(void) {
+    PrintAndLogEx(NORMAL, "Usage:  hf mfu setpwd <password (32 hex symbols)>");
+    PrintAndLogEx(NORMAL, "       [password] - (32 hex symbols)");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "         hf mfu setpwd 000102030405060708090a0b0c0d0e0f");
+    PrintAndLogEx(NORMAL, "");
+    return 0;
+}
+
+static int usage_hf_mfu_ucsetuid(void) {
+    PrintAndLogEx(NORMAL, "Usage:  hf mfu setuid <uid (14 hex symbols)>");
+    PrintAndLogEx(NORMAL, "       [uid] - (14 hex symbols)");
+    PrintAndLogEx(NORMAL, "\nThis only works for Magic Ultralight tags.");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "         hf mfu setuid 11223344556677");
+    PrintAndLogEx(NORMAL, "");
+    return 0;
+}
+
+static int usage_hf_mfu_gendiverse(void) {
+    PrintAndLogEx(NORMAL, "Usage:  hf mfu gen [h] [r] <uid (8 hex symbols)>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "    h       : this help");
+    PrintAndLogEx(NORMAL, "    r       : read uid from tag");
+    PrintAndLogEx(NORMAL, "    <uid>   : 4 byte UID (optional)");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "        hf mfu gen r");
+    PrintAndLogEx(NORMAL, "        hf mfu gen 11223344");
+    PrintAndLogEx(NORMAL, "");
+    return 0;
+}
+
+static int usage_hf_mfu_pwdgen(void) {
+    PrintAndLogEx(NORMAL, "Usage:  hf mfu pwdgen [h|t] [r] <uid (14 hex symbols)>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "    h       : this help");
+    PrintAndLogEx(NORMAL, "    t       : selftest");
+    PrintAndLogEx(NORMAL, "    r       : read uid from tag");
+    PrintAndLogEx(NORMAL, "    <uid>   : 7 byte UID (optional)");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "        hf mfu pwdgen r");
+    PrintAndLogEx(NORMAL, "        hf mfu pwdgen 11223344556677");
+    PrintAndLogEx(NORMAL, "        hf mfu pwdgen t");
+    PrintAndLogEx(NORMAL, "");
+    return 0;
+}
+
 #define PUBLIC_ECDA_KEYLEN 33
 uint8_t public_ecda_key[PUBLIC_ECDA_KEYLEN] = {
     0x04, 0x49, 0x4e, 0x1a, 0x38, 0x6d, 0x3d, 0x3c,
@@ -1426,189 +1609,6 @@ int CmdHF14AMfURdBl(const char *Cmd) {
     return 0;
 }
 
-int usage_hf_mfu_info(void) {
-    PrintAndLogEx(NORMAL, "It gathers information about the tag and tries to detect what kind it is.");
-    PrintAndLogEx(NORMAL, "Sometimes the tags are locked down, and you may need a key to be able to read the information");
-    PrintAndLogEx(NORMAL, "The following tags can be identified:\n");
-    PrintAndLogEx(NORMAL, "Ultralight, Ultralight-C, Ultralight EV1, NTAG 203, NTAG 210,");
-    PrintAndLogEx(NORMAL, "NTAG 212, NTAG 213, NTAG 215, NTAG 216, NTAG I2C 1K & 2K");
-    PrintAndLogEx(NORMAL, "my-d, my-d NFC, my-d move, my-d move NFC\n");
-    PrintAndLogEx(NORMAL, "Usage:  hf mfu info k <key> l");
-    PrintAndLogEx(NORMAL, "  Options : ");
-    PrintAndLogEx(NORMAL, "  k <key> : (optional) key for authentication [UL-C 16bytes, EV1/NTAG 4bytes]");
-    PrintAndLogEx(NORMAL, "  l       : (optional) swap entered key's endianness");
-    PrintAndLogEx(NORMAL, "");
-    PrintAndLogEx(NORMAL, "Examples:");
-    PrintAndLogEx(NORMAL, "       hf mfu info");
-    PrintAndLogEx(NORMAL, "       hf mfu info k 00112233445566778899AABBCCDDEEFF");
-    PrintAndLogEx(NORMAL, "       hf mfu info k AABBCCDD");
-    return 0;
-}
-
-int usage_hf_mfu_dump(void) {
-    PrintAndLogEx(NORMAL, "Reads all pages from Ultralight, Ultralight-C, Ultralight EV1");
-    PrintAndLogEx(NORMAL, "NTAG 203, NTAG 210, NTAG 212, NTAG 213, NTAG 215, NTAG 216");
-    PrintAndLogEx(NORMAL, "and saves binary dump into the file `filename.bin` or `cardUID.bin`");
-    PrintAndLogEx(NORMAL, "It autodetects card type.\n");
-    PrintAndLogEx(NORMAL, "Usage:  hf mfu dump k <key> l f <filename w/o .bin> p <page#> q <#pages>");
-    PrintAndLogEx(NORMAL, "  Options :");
-    PrintAndLogEx(NORMAL, "  k <key> : (optional) key for authentication [UL-C 16bytes, EV1/NTAG 4bytes]");
-    PrintAndLogEx(NORMAL, "  l       : (optional) swap entered key's endianness");
-    PrintAndLogEx(NORMAL, "  f <FN > : filename w/o .bin to save the dump as");
-    PrintAndLogEx(NORMAL, "  p <Pg > : starting Page number to manually set a page to start the dump at");
-    PrintAndLogEx(NORMAL, "  q <qty> : number of Pages to manually set how many pages to dump");
-    PrintAndLogEx(NORMAL, "");
-    PrintAndLogEx(NORMAL, "Examples:");
-    PrintAndLogEx(NORMAL, "       hf mfu dump");
-    PrintAndLogEx(NORMAL, "       hf mfu dump n myfile");
-    PrintAndLogEx(NORMAL, "       hf mfu dump k 00112233445566778899AABBCCDDEEFF");
-    PrintAndLogEx(NORMAL, "       hf mfu dump k AABBCCDD\n");
-    return 0;
-}
-
-int usage_hf_mfu_restore(void) {
-    PrintAndLogEx(NORMAL, "Restore dumpfile onto card.");
-    PrintAndLogEx(NORMAL, "Usage:  hf mfu restore [h] [l] [s] k <key> n <filename w/o .bin> ");
-    PrintAndLogEx(NORMAL, "  Options :");
-    PrintAndLogEx(NORMAL, "  k <key> : (optional) key for authentication [UL-C 16bytes, EV1/NTAG 4bytes]");
-    PrintAndLogEx(NORMAL, "  l       : (optional) swap entered key's endianness");
-    PrintAndLogEx(NORMAL, "  s       : (optional) enable special write UID -MAGIC TAG ONLY-");
-    PrintAndLogEx(NORMAL, "  e       : (optional) enable special write version/signature -MAGIC NTAG 21* ONLY-");
-    PrintAndLogEx(NORMAL, "  r       : (optional) use the password found in dumpfile to configure tag. requires 'e' parameter to work");
-    PrintAndLogEx(NORMAL, "  f <FN>  : filename w/o .bin to restore");
-    PrintAndLogEx(NORMAL, "");
-    PrintAndLogEx(NORMAL, "Examples:");
-    PrintAndLogEx(NORMAL, "       hf mfu restore s f myfile");
-    PrintAndLogEx(NORMAL, "       hf mfu restore k AABBCCDD s f myfile\n");
-    PrintAndLogEx(NORMAL, "       hf mfu restore k AABBCCDD s e r f myfile\n");
-    return 0;
-}
-
-int usage_hf_mfu_rdbl(void) {
-    PrintAndLogEx(NORMAL, "Read a block and print. It autodetects card type.\n");
-    PrintAndLogEx(NORMAL, "Usage:  hf mfu rdbl b <block number> k <key> l\n");
-    PrintAndLogEx(NORMAL, "Options:");
-    PrintAndLogEx(NORMAL, "  b <no>  : block to read");
-    PrintAndLogEx(NORMAL, "  k <key> : (optional) key for authentication [UL-C 16bytes, EV1/NTAG 4bytes]");
-    PrintAndLogEx(NORMAL, "  l       : (optional) swap entered key's endianness");
-    PrintAndLogEx(NORMAL, "");
-    PrintAndLogEx(NORMAL, "Examples:");
-    PrintAndLogEx(NORMAL, "       hf mfu rdbl b 0");
-    PrintAndLogEx(NORMAL, "       hf mfu rdbl b 0 k 00112233445566778899AABBCCDDEEFF");
-    PrintAndLogEx(NORMAL, "       hf mfu rdbl b 0 k AABBCCDD\n");
-    return 0;
-}
-
-int usage_hf_mfu_wrbl(void) {
-    PrintAndLogEx(NORMAL, "Write a block. It autodetects card type.\n");
-    PrintAndLogEx(NORMAL, "Usage:  hf mfu wrbl b <block number> d <data> k <key> l\n");
-    PrintAndLogEx(NORMAL, "Options:");
-    PrintAndLogEx(NORMAL, "  b <no>   : block to write");
-    PrintAndLogEx(NORMAL, "  d <data> : block data - (8 hex symbols)");
-    PrintAndLogEx(NORMAL, "  k <key>  : (optional) key for authentication [UL-C 16bytes, EV1/NTAG 4bytes]");
-    PrintAndLogEx(NORMAL, "  l        : (optional) swap entered key's endianness");
-    PrintAndLogEx(NORMAL, "");
-    PrintAndLogEx(NORMAL, "Examples:");
-    PrintAndLogEx(NORMAL, "        hf mfu wrbl b 0 d 01234567");
-    PrintAndLogEx(NORMAL, "        hf mfu wrbl b 0 d 01234567 k AABBCCDD\n");
-    return 0;
-}
-
-int usage_hf_mfu_eload(void) {
-    PrintAndLogEx(NORMAL, "It loads emul dump from the file `filename.eml`");
-    PrintAndLogEx(NORMAL, "Hint: See script dumptoemul-mfu.lua to convert the .bin to the eml");
-    PrintAndLogEx(NORMAL, "Usage:  hf mfu eload u <file name w/o `.eml`> [numblocks]");
-    PrintAndLogEx(NORMAL, "  Options:");
-    PrintAndLogEx(NORMAL, "    h          : this help");
-    PrintAndLogEx(NORMAL, "    u          : UL (required)");
-    PrintAndLogEx(NORMAL, "    [filename] : without `.eml` (required)");
-    PrintAndLogEx(NORMAL, "    numblocks  : number of blocks to load from eml file (optional)");
-    PrintAndLogEx(NORMAL, "");
-    PrintAndLogEx(NORMAL, "  sample: hf mfu eload u filename");
-    PrintAndLogEx(NORMAL, "          hf mfu eload u filename 57");
-    return 0;
-}
-
-int usage_hf_mfu_sim(void) {
-    PrintAndLogEx(NORMAL, "\nEmulating Ultralight tag from emulator memory\n");
-    PrintAndLogEx(NORMAL, "\nBe sure to load the emulator memory first!\n");
-    PrintAndLogEx(NORMAL, "Usage: hf mfu sim t 7 u <uid>");
-    PrintAndLogEx(NORMAL, "Options:");
-    PrintAndLogEx(NORMAL, "    h       : this help");
-    PrintAndLogEx(NORMAL, "    t 7     : 7 = NTAG or Ultralight sim (required)");
-    PrintAndLogEx(NORMAL, "    u <uid> : 4 or 7 byte UID (optional)");
-    PrintAndLogEx(NORMAL, "");
-    PrintAndLogEx(NORMAL, "Examples:");
-    PrintAndLogEx(NORMAL, "        hf mfu sim t 7");
-    PrintAndLogEx(NORMAL, "        hf mfu sim t 7 u 1122344556677\n");
-
-    return 0;
-}
-
-int usage_hf_mfu_ucauth(void) {
-    PrintAndLogEx(NORMAL, "Usage:  hf mfu cauth k <key number>");
-    PrintAndLogEx(NORMAL, "      0 (default): 3DES standard key");
-    PrintAndLogEx(NORMAL, "      1 : all 0x00 key");
-    PrintAndLogEx(NORMAL, "      2 : 0x00-0x0F key");
-    PrintAndLogEx(NORMAL, "      3 : nfc key");
-    PrintAndLogEx(NORMAL, "      4 : all 0x01 key");
-    PrintAndLogEx(NORMAL, "      5 : all 0xff key");
-    PrintAndLogEx(NORMAL, "      6 : 0x00-0xFF key");
-    PrintAndLogEx(NORMAL, "Examples:");
-    PrintAndLogEx(NORMAL, "       hf mfu cauth k");
-    PrintAndLogEx(NORMAL, "       hf mfu cauth k 3");
-    return 0;
-}
-
-int usage_hf_mfu_ucsetpwd(void) {
-    PrintAndLogEx(NORMAL, "Usage:  hf mfu setpwd <password (32 hex symbols)>");
-    PrintAndLogEx(NORMAL, "       [password] - (32 hex symbols)");
-    PrintAndLogEx(NORMAL, "");
-    PrintAndLogEx(NORMAL, "Examples:");
-    PrintAndLogEx(NORMAL, "         hf mfu setpwd 000102030405060708090a0b0c0d0e0f");
-    PrintAndLogEx(NORMAL, "");
-    return 0;
-}
-
-int usage_hf_mfu_ucsetuid(void) {
-    PrintAndLogEx(NORMAL, "Usage:  hf mfu setuid <uid (14 hex symbols)>");
-    PrintAndLogEx(NORMAL, "       [uid] - (14 hex symbols)");
-    PrintAndLogEx(NORMAL, "\nThis only works for Magic Ultralight tags.");
-    PrintAndLogEx(NORMAL, "");
-    PrintAndLogEx(NORMAL, "Examples:");
-    PrintAndLogEx(NORMAL, "         hf mfu setuid 11223344556677");
-    PrintAndLogEx(NORMAL, "");
-    return 0;
-}
-
-int usage_hf_mfu_gendiverse(void) {
-    PrintAndLogEx(NORMAL, "Usage:  hf mfu gen [h] [r] <uid (8 hex symbols)>");
-    PrintAndLogEx(NORMAL, "Options:");
-    PrintAndLogEx(NORMAL, "    h       : this help");
-    PrintAndLogEx(NORMAL, "    r       : read uid from tag");
-    PrintAndLogEx(NORMAL, "    <uid>   : 4 byte UID (optional)");
-    PrintAndLogEx(NORMAL, "Examples:");
-    PrintAndLogEx(NORMAL, "        hf mfu gen r");
-    PrintAndLogEx(NORMAL, "        hf mfu gen 11223344");
-    PrintAndLogEx(NORMAL, "");
-    return 0;
-}
-
-int usage_hf_mfu_pwdgen(void) {
-    PrintAndLogEx(NORMAL, "Usage:  hf mfu pwdgen [h|t] [r] <uid (14 hex symbols)>");
-    PrintAndLogEx(NORMAL, "Options:");
-    PrintAndLogEx(NORMAL, "    h       : this help");
-    PrintAndLogEx(NORMAL, "    t       : selftest");
-    PrintAndLogEx(NORMAL, "    r       : read uid from tag");
-    PrintAndLogEx(NORMAL, "    <uid>   : 7 byte UID (optional)");
-    PrintAndLogEx(NORMAL, "Examples:");
-    PrintAndLogEx(NORMAL, "        hf mfu pwdgen r");
-    PrintAndLogEx(NORMAL, "        hf mfu pwdgen 11223344556677");
-    PrintAndLogEx(NORMAL, "        hf mfu pwdgen t");
-    PrintAndLogEx(NORMAL, "");
-    return 0;
-}
-
 void printMFUdump(mfu_dump_t *card) {
     printMFUdumpEx(card, 255, 0);
 }
diff --git a/client/cmdhfmfu.h b/client/cmdhfmfu.h
index 28f79d086..a142fb740 100644
--- a/client/cmdhfmfu.h
+++ b/client/cmdhfmfu.h
@@ -48,18 +48,6 @@ int ul_print_type(uint32_t tagtype, uint8_t spaces);
 void printMFUdump(mfu_dump_t *card);
 void printMFUdumpEx(mfu_dump_t *card, uint16_t pages, uint8_t startpage);
 
-int usage_hf_mfu_info(void);
-int usage_hf_mfu_dump(void);
-int usage_hf_mfu_rdbl(void);
-int usage_hf_mfu_wrbl(void);
-int usage_hf_mfu_eload(void);
-int usage_hf_mfu_sim(void);
-int usage_hf_mfu_ucauth(void);
-int usage_hf_mfu_ucsetpwd(void);
-int usage_hf_mfu_ucsetuid(void);
-int usage_hf_mfu_gendiverse(void);
-int usage_hf_mfu_pwdgen(void);
-
 int CmdHFMFUltra(const char *Cmd);
 
 uint32_t ul_ev1_pwdgenA(uint8_t *uid);
diff --git a/client/cmdlf.c b/client/cmdlf.c
index 6e40518ae..39efd9b33 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -13,7 +13,7 @@ bool g_lf_threshold_set = false;
 
 static int CmdHelp(const char *Cmd);
 
-int usage_lf_cmdread(void) {
+static int usage_lf_cmdread(void) {
     PrintAndLogEx(NORMAL, "Usage: lf cmdread d <delay period> z <zero period> o <one period> c <cmdbytes>");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       h             This help");
@@ -28,7 +28,7 @@ int usage_lf_cmdread(void) {
     PrintAndLogEx(NORMAL, "      lf cmdread d 80 z 100 o 200 c 11000");
     return 0;
 }
-int usage_lf_read(void) {
+static int usage_lf_read(void) {
     PrintAndLogEx(NORMAL, "Usage: lf read [h] [s] [d numofsamples]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       h            This help");
@@ -41,7 +41,7 @@ int usage_lf_read(void) {
     PrintAndLogEx(NORMAL, "         lf read s");
     return 0;
 }
-int usage_lf_sniff(void) {
+static int usage_lf_sniff(void) {
     PrintAndLogEx(NORMAL, "Sniff low frequence signal.");
     PrintAndLogEx(NORMAL, "Use " _YELLOW_("'lf config'")" to set parameters.");
     PrintAndLogEx(NORMAL, "Use " _YELLOW_("'data samples'")" command to download from device,  and " _YELLOW_("'data plot'")" to look at it");
@@ -51,7 +51,7 @@ int usage_lf_sniff(void) {
     PrintAndLogEx(NORMAL, "      h         This help");
     return 0;
 }
-int usage_lf_config(void) {
+static int usage_lf_config(void) {
     PrintAndLogEx(NORMAL, "Usage: lf config [h] [H|<divisor>] [b <bps>] [d <decim>] [a 0|1]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       h             This help");
@@ -74,7 +74,7 @@ int usage_lf_config(void) {
     PrintAndLogEx(NORMAL, "                    Performs a sniff (no active field)");
     return 0;
 }
-int usage_lf_simfsk(void) {
+static int usage_lf_simfsk(void) {
     PrintAndLogEx(NORMAL, "Usage: lf simfsk [h] [c <clock>] [H <fcHigh>] [L <fcLow>] [d <hexdata>]");
     PrintAndLogEx(NORMAL, "there are about four FSK modulations to know of.");
     PrintAndLogEx(NORMAL, "FSK1  -  where fc/8 = high  and fc/5 = low");
@@ -99,7 +99,7 @@ int usage_lf_simfsk(void) {
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
-int usage_lf_simask(void) {
+static int usage_lf_simask(void) {
     PrintAndLogEx(NORMAL, "Usage: lf simask [c <clock>] [i] [b|m|r] [s] [d <raw hex to sim>]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       h              This help");
@@ -112,7 +112,7 @@ int usage_lf_simask(void) {
     PrintAndLogEx(NORMAL, "       d <hexdata>    Data to sim as hex - omit to sim from DemodBuffer");
     return 0;
 }
-int usage_lf_simpsk(void) {
+static int usage_lf_simpsk(void) {
     PrintAndLogEx(NORMAL, "Usage: lf simpsk [1|2|3] [c <clock>] [i] [r <carrier>] [d <raw hex to sim>]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       h              This help");
@@ -125,7 +125,7 @@ int usage_lf_simpsk(void) {
     PrintAndLogEx(NORMAL, "       d <hexdata>    Data to sim as hex - omit to sim from DemodBuffer");
     return 0;
 }
-int usage_lf_find(void) {
+static int usage_lf_find(void) {
     PrintAndLogEx(NORMAL, "Usage:  lf search [h] <0|1> [u]");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Options:");
diff --git a/client/cmdlf.h b/client/cmdlf.h
index bf914d21a..0f0466204 100644
--- a/client/cmdlf.h
+++ b/client/cmdlf.h
@@ -71,12 +71,4 @@ int CmdLFfind(const char *Cmd);
 
 bool lf_read(bool silent, uint32_t samples);
 
-// usages helptext
-int usage_lf_cmdread(void);
-int usage_lf_read(void);
-int usage_lf_sniff(void);
-int usage_lf_config(void);
-int usage_lf_simfsk(void);
-int usage_lf_simask(void);
-int usage_lf_simpsk(void);
 #endif
diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c
index 7a570368c..d039106d6 100644
--- a/client/cmdlfawid.c
+++ b/client/cmdlfawid.c
@@ -14,7 +14,7 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_lf_awid_read(void) {
+static int usage_lf_awid_read(void) {
     PrintAndLogEx(NORMAL, "Enables AWID compatible reader mode printing details of scanned AWID26 or AWID50 tags.");
     PrintAndLogEx(NORMAL, "By default, values are printed and logged until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "If the [1] option is provided, reader mode is exited after reading a single AWID card.");
@@ -30,7 +30,7 @@ int usage_lf_awid_read(void) {
     return 0;
 }
 
-int usage_lf_awid_sim(void) {
+static int usage_lf_awid_sim(void) {
     PrintAndLogEx(NORMAL, "Enables simulation of AWID card with specified facility-code and card number.");
     PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "");
@@ -47,7 +47,7 @@ int usage_lf_awid_sim(void) {
     return 0;
 }
 
-int usage_lf_awid_clone(void) {
+static int usage_lf_awid_clone(void) {
     PrintAndLogEx(NORMAL, "Enables cloning of AWID card with specified facility-code and card number onto T55x7.");
     PrintAndLogEx(NORMAL, "The T55x7 must be on the antenna when issuing this command.  T55x7 blocks are calculated and printed in the process.");
     PrintAndLogEx(NORMAL, "");
@@ -65,7 +65,7 @@ int usage_lf_awid_clone(void) {
     return 0;
 }
 
-int usage_lf_awid_brute(void) {
+static int usage_lf_awid_brute(void) {
     PrintAndLogEx(NORMAL, "Enables bruteforce of AWID reader with specified facility-code.");
     PrintAndLogEx(NORMAL, "This is a attack against reader. if cardnumber is given, it starts with it and goes up / down one step");
     PrintAndLogEx(NORMAL, "if cardnumber is not given, it starts with 1 and goes up to 65535");
diff --git a/client/cmdlfawid.h b/client/cmdlfawid.h
index e971225e2..85d23ec3b 100644
--- a/client/cmdlfawid.h
+++ b/client/cmdlfawid.h
@@ -32,9 +32,4 @@ int CmdAWIDClone(const char *Cmd);
 int CmdAWIDBrute(const char *Cmd);
 int getAWIDBits(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint8_t *bits);
 
-int usage_lf_awid_read(void);
-int usage_lf_awid_sim(void);
-int usage_lf_awid_clone(void);
-int usage_lf_awid_brute(void);
-
 #endif
diff --git a/client/cmdlfcotag.c b/client/cmdlfcotag.c
index 1aa238598..ebe6fe1e0 100644
--- a/client/cmdlfcotag.c
+++ b/client/cmdlfcotag.c
@@ -11,7 +11,7 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_lf_cotag_read(void) {
+static int usage_lf_cotag_read(void) {
     PrintAndLogEx(NORMAL, "Usage: lf COTAG read [h] <signaldata>");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "      h          : This help");
diff --git a/client/cmdlfcotag.h b/client/cmdlfcotag.h
index 7b0922019..179048c68 100644
--- a/client/cmdlfcotag.h
+++ b/client/cmdlfcotag.h
@@ -27,5 +27,4 @@ int CmdLFCOTAG(const char *Cmd);
 int CmdCOTAGRead(const char *Cmd);
 int CmdCOTAGDemod(const char *Cmd);
 
-int usage_lf_cotag_read(void);
 #endif
diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index b868cf09c..ecd2538fb 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -15,7 +15,7 @@ uint64_t g_em410xid = 0;
 static int CmdHelp(const char *Cmd);
 
 //////////////// 410x commands
-int usage_lf_em410x_demod(void) {
+static int usage_lf_em410x_demod(void) {
     PrintAndLogEx(NORMAL, "Usage:  lf em 410x_demod [h] [clock] <0|1> [maxError]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "     h                   - this help");
@@ -31,7 +31,7 @@ int usage_lf_em410x_demod(void) {
     PrintAndLogEx(NORMAL, "           lf em 410x_demod 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;
 }
-int usage_lf_em410x_write(void) {
+static int usage_lf_em410x_write(void) {
     PrintAndLogEx(NORMAL, "Writes EM410x ID to a T55x7 / T5555 (Q5) tag");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  lf em 410x_write [h] <id> <card> [clock]");
@@ -44,7 +44,7 @@ int usage_lf_em410x_write(void) {
     PrintAndLogEx(NORMAL, "      lf em 410x_write 0F0368568B 1       = write ID to t55x7 card");
     return 0;
 }
-int usage_lf_em410x_ws(void) {
+static int usage_lf_em410x_ws(void) {
     PrintAndLogEx(NORMAL, "Watch 'nd Spoof, activates reader, waits until a EM410x tag gets presented then it starts simulating the found UID");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  lf em 410x_spoof [h]");
@@ -54,7 +54,7 @@ int usage_lf_em410x_ws(void) {
     PrintAndLogEx(NORMAL, "      lf em 410x_spoof");
     return 0;
 }
-int usage_lf_em410x_clone(void) {
+static int usage_lf_em410x_clone(void) {
     PrintAndLogEx(NORMAL, "Simulating EM410x tag");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  lf em 410x_clone [h] <uid> <clock>");
@@ -67,7 +67,7 @@ int usage_lf_em410x_clone(void) {
     PrintAndLogEx(NORMAL, "      lf em 410x_clone 0F0368568B 32");
     return 0;
 }
-int usage_lf_em410x_sim(void) {
+static int usage_lf_em410x_sim(void) {
     PrintAndLogEx(NORMAL, "Simulating EM410x tag");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  lf em 410x_sim [h] <uid> <clock>");
@@ -80,7 +80,7 @@ int usage_lf_em410x_sim(void) {
     PrintAndLogEx(NORMAL, "      lf em 410x_sim 0F0368568B 32");
     return 0;
 }
-int usage_lf_em410x_brute(void) {
+static int usage_lf_em410x_brute(void) {
     PrintAndLogEx(NORMAL, "Bruteforcing by emulating EM410x tag");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  lf em 410x_brute [h] ids.txt [d 2000] [c clock]");
@@ -98,7 +98,7 @@ int usage_lf_em410x_brute(void) {
 }
 
 //////////////// 4050 / 4450 commands
-int usage_lf_em4x50_dump(void) {
+static int usage_lf_em4x50_dump(void) {
     PrintAndLogEx(NORMAL, "Dump EM4x50/EM4x69.  Tag must be on antenna. ");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  lf em 4x50_dump [h] <pwd>");
@@ -110,7 +110,7 @@ int usage_lf_em4x50_dump(void) {
     PrintAndLogEx(NORMAL, "      lf em 4x50_dump 11223344");
     return 0;
 }
-int usage_lf_em4x50_read(void) {
+static int usage_lf_em4x50_read(void) {
     PrintAndLogEx(NORMAL, "Read EM 4x50/EM4x69.  Tag must be on antenna. ");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  lf em 4x50_read [h] <address> <pwd>");
@@ -123,7 +123,7 @@ int usage_lf_em4x50_read(void) {
     PrintAndLogEx(NORMAL, "      lf em 4x50_read 1 11223344");
     return 0;
 }
-int usage_lf_em4x50_write(void) {
+static int usage_lf_em4x50_write(void) {
     PrintAndLogEx(NORMAL, "Write EM 4x50/4x69.  Tag must be on antenna. ");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  lf em 4x50_write [h] <address> <data> <pwd>");
@@ -139,7 +139,7 @@ int usage_lf_em4x50_write(void) {
 }
 
 //////////////// 4205 / 4305 commands
-int usage_lf_em4x05_dump(void) {
+static int usage_lf_em4x05_dump(void) {
     PrintAndLogEx(NORMAL, "Dump EM4x05/EM4x69.  Tag must be on antenna. ");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  lf em 4x05_dump [h] <pwd>");
@@ -151,7 +151,7 @@ int usage_lf_em4x05_dump(void) {
     PrintAndLogEx(NORMAL, "      lf em 4x05_dump 11223344");
     return 0;
 }
-int usage_lf_em4x05_read(void) {
+static int usage_lf_em4x05_read(void) {
     PrintAndLogEx(NORMAL, "Read EM4x05/EM4x69.  Tag must be on antenna. ");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  lf em 4x05_read [h] <address> <pwd>");
@@ -164,7 +164,7 @@ int usage_lf_em4x05_read(void) {
     PrintAndLogEx(NORMAL, "      lf em 4x05_read 1 11223344");
     return 0;
 }
-int usage_lf_em4x05_write(void) {
+static int usage_lf_em4x05_write(void) {
     PrintAndLogEx(NORMAL, "Write EM4x05/4x69.  Tag must be on antenna. ");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  lf em 4x05_write [h] <address> <data> <pwd>");
@@ -178,7 +178,7 @@ int usage_lf_em4x05_write(void) {
     PrintAndLogEx(NORMAL, "      lf em 4x05_write 1 deadc0de 11223344");
     return 0;
 }
-int usage_lf_em4x05_info(void) {
+static int usage_lf_em4x05_info(void) {
     PrintAndLogEx(NORMAL, "Tag information EM4205/4305/4469//4569 tags.  Tag must be on antenna.");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  lf em 4x05_info [h] <pwd>");
diff --git a/client/cmdlfem4x.h b/client/cmdlfem4x.h
index 383b9fa57..b4182f4ab 100644
--- a/client/cmdlfem4x.h
+++ b/client/cmdlfem4x.h
@@ -49,19 +49,4 @@ void printEM410x(uint32_t hi, uint64_t id);
 int AskEm410xDecode(bool verbose, uint32_t *hi, uint64_t *lo);
 int AskEm410xDemod(const char *Cmd, uint32_t *hi, uint64_t *lo, bool verbose);
 
-int usage_lf_em410x_sim(void);
-int usage_lf_em410x_ws(void);
-int usage_lf_em410x_clone(void);
-int usage_lf_em410x_sim(void);
-int usage_lf_em410x_brute(void);
-
-int usage_lf_em4x50_dump(void);
-int usage_lf_em4x50_read(void);
-int usage_lf_em4x50_write(void);
-
-int usage_lf_em4x05_dump(void);
-int usage_lf_em4x05_read(void);
-int usage_lf_em4x05_write(void);
-int usage_lf_em4x05_info(void);
-
 #endif
diff --git a/client/cmdlffdx.c b/client/cmdlffdx.c
index 98ffadafc..dabe9c7ed 100644
--- a/client/cmdlffdx.c
+++ b/client/cmdlffdx.c
@@ -31,7 +31,7 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_lf_fdx_clone(void) {
+static int usage_lf_fdx_clone(void) {
     PrintAndLogEx(NORMAL, "Clone a FDX-B animal tag to a T55x7 tag.");
     PrintAndLogEx(NORMAL, "Usage: lf fdx clone [h] <country id> <animal id> <Q5>");
     PrintAndLogEx(NORMAL, "Options:");
@@ -49,7 +49,7 @@ int usage_lf_fdx_clone(void) {
     return 0;
 }
 
-int usage_lf_fdx_sim(void) {
+static int usage_lf_fdx_sim(void) {
     PrintAndLogEx(NORMAL, "Enables simulation of FDX-B animal tag");
     PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "");
diff --git a/client/cmdlffdx.h b/client/cmdlffdx.h
index 1bc2428fc..85787f3a8 100644
--- a/client/cmdlffdx.h
+++ b/client/cmdlffdx.h
@@ -27,9 +27,5 @@ int CmdFdxDemod(const char *Cmd);
 
 int getFDXBits(uint64_t national_id, uint16_t country, uint8_t isanimal, uint8_t isextended, uint32_t extended, uint8_t *bits);
 
-int usage_lf_fdx_clone(void);
-int usage_lf_fdx_sim(void);
-int usage_lf_fdx_read(void);
-int usage_lf_fdx_demod(void);
 #endif
 
diff --git a/client/cmdlfguard.c b/client/cmdlfguard.c
index d80368496..a77a7d50f 100644
--- a/client/cmdlfguard.c
+++ b/client/cmdlfguard.c
@@ -11,7 +11,7 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_lf_guard_clone(void) {
+static int usage_lf_guard_clone(void) {
     PrintAndLogEx(NORMAL, "clone a Guardall tag to a T55x7 tag.");
     PrintAndLogEx(NORMAL, "The facility-code is 8-bit and the card number is 16-bit.  Larger values are truncated. ");
     PrintAndLogEx(NORMAL, "Currently work only on 26bit");
@@ -27,7 +27,7 @@ int usage_lf_guard_clone(void) {
     return 0;
 }
 
-int usage_lf_guard_sim(void) {
+static int usage_lf_guard_sim(void) {
     PrintAndLogEx(NORMAL, "Enables simulation of Guardall card with specified card number.");
     PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "The facility-code is 8-bit and the card number is 16-bit.  Larger values are truncated.");
diff --git a/client/cmdlfguard.h b/client/cmdlfguard.h
index 749307bea..8e8d2663d 100644
--- a/client/cmdlfguard.h
+++ b/client/cmdlfguard.h
@@ -28,6 +28,4 @@ int CmdGuardRead(const char *Cmd);
 int CmdGuardClone(const char *Cmd);
 int CmdGuardSim(const char *Cmd);
 
-int usage_lf_guard_clone(void);
-int usage_lf_quard_sim(void);
 #endif
diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c
index a3138fff5..cdd9b68cc 100644
--- a/client/cmdlfhid.c
+++ b/client/cmdlfhid.c
@@ -16,7 +16,7 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_lf_hid_read(void) {
+static int usage_lf_hid_read(void) {
     PrintAndLogEx(NORMAL, "Enables HID compatible reader mode printing details.");
     PrintAndLogEx(NORMAL, "By default, values are printed and logged until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "If the [1] option is provided, reader mode is exited after reading a single HID card.");
@@ -31,7 +31,7 @@ int usage_lf_hid_read(void) {
     PrintAndLogEx(NORMAL, "       lf hid read 1");
     return 0;
 }
-int usage_lf_hid_wiegand(void) {
+static int usage_lf_hid_wiegand(void) {
     PrintAndLogEx(NORMAL, "This command converts facility code/card number to Wiegand code");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage: lf hid wiegand [h] [OEM] [FC] [CN]");
@@ -44,7 +44,7 @@ int usage_lf_hid_wiegand(void) {
     PrintAndLogEx(NORMAL, "      lf hid wiegand 0 101 2001");
     return 0;
 }
-int usage_lf_hid_sim(void) {
+static int usage_lf_hid_sim(void) {
     PrintAndLogEx(NORMAL, "Enables simulation of HID card with card number.");
     PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "");
@@ -56,7 +56,7 @@ int usage_lf_hid_sim(void) {
     PrintAndLogEx(NORMAL, "      lf hid sim 2006ec0c86");
     return 0;
 }
-int usage_lf_hid_clone(void) {
+static int usage_lf_hid_clone(void) {
     PrintAndLogEx(NORMAL, "Clone HID to T55x7.  Tag must be on antenna. ");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  lf hid clone [h] [ID] <L>");
@@ -69,7 +69,7 @@ int usage_lf_hid_clone(void) {
     PrintAndLogEx(NORMAL, "      lf hid clone 2006ec0c86 L");
     return 0;
 }
-int usage_lf_hid_brute(void) {
+static int usage_lf_hid_brute(void) {
     PrintAndLogEx(NORMAL, "Enables bruteforce of HID readers with specified facility code.");
     PrintAndLogEx(NORMAL, "This is a attack against reader. if cardnumber is given, it starts with it and goes up / down one step");
     PrintAndLogEx(NORMAL, "if cardnumber is not given, it starts with 1 and goes up to 65535");
diff --git a/client/cmdlfhid.h b/client/cmdlfhid.h
index 422658822..715de60ce 100644
--- a/client/cmdlfhid.h
+++ b/client/cmdlfhid.h
@@ -32,12 +32,6 @@ int CmdHIDClone(const char *Cmd);
 int CmdHIDWiegand(const char *Cmd);
 int CmdHIDBrute(const char *Cmd);
 
-int usage_lf_hid_read(void);
-int usage_lf_hid_wiegand(void);
-int usage_lf_hid_sim(void);
-int usage_lf_hid_clone(void);
-int usage_lf_hid_brute(void);
-
 //void calc26(uint16_t fc, uint32_t cardno, uint8_t *out);
 void calcWiegand(uint8_t fmtlen, uint16_t fc, uint64_t cardno, uint8_t *bits);
 #endif
diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index 870ae2d59..201316010 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -28,7 +28,7 @@ static int CmdHelp(const char *Cmd);
 size_t nbytes(size_t nbits) {
     return (nbits / 8) + ((nbits % 8) > 0);
 }
-int usage_hitag_sniff(void) {
+static int usage_hitag_sniff(void) {
     PrintAndLogEx(NORMAL, "Sniff traffic between Hitag reader and tag. Use " _YELLOW_("`lf hitag list`")" to view collected data.");
     PrintAndLogEx(NORMAL, "Usage:   lf hitag sniff [h] ");
     PrintAndLogEx(NORMAL, "Options:");
@@ -39,7 +39,7 @@ int usage_hitag_sniff(void) {
     PrintAndLogEx(NORMAL, "         lf hitag sniff");
     return 0;
 }
-int usage_hitag_sim(void) {
+static int usage_hitag_sim(void) {
     PrintAndLogEx(NORMAL, "Simulate " _YELLOW_("Hitag2 / HitagS")" transponder");
     PrintAndLogEx(NORMAL, "Usage:   lf hitag sim [h] [2|s] e|j|b <filename w/o extension>");
     PrintAndLogEx(NORMAL, "Options:");
@@ -53,7 +53,7 @@ int usage_hitag_sim(void) {
     PrintAndLogEx(NORMAL, "         lf hitag sim 2 b lf-hitag-dump");
     return 0;
 }
-int usage_hitag_info(void) {
+static int usage_hitag_info(void) {
     PrintAndLogEx(NORMAL, "Usage:   lf hitag info [h] p <pwd>");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       h          This help");
@@ -62,7 +62,7 @@ int usage_hitag_info(void) {
     PrintAndLogEx(NORMAL, "         lf hitag info");
     return 0;
 }
-int usage_hitag_dump(void) {
+static int usage_hitag_dump(void) {
     PrintAndLogEx(NORMAL, "Usage:   lf hitag dump [h] p <pwd> f <name>");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       h          This help");
@@ -74,7 +74,7 @@ int usage_hitag_dump(void) {
     PrintAndLogEx(NORMAL, "         lf hitag dump p 4D494B52 f mydump");
     return 0;
 }
-int usage_hitag_reader(void) {
+static int usage_hitag_reader(void) {
     PrintAndLogEx(NORMAL, "Hitag reader functions");
     PrintAndLogEx(NORMAL, "Usage: lf hitag reader [h] <reader function #>");
     PrintAndLogEx(NORMAL, "Options:");
@@ -91,7 +91,7 @@ int usage_hitag_reader(void) {
     PrintAndLogEx(NORMAL, "      26               Just read UID");
     return 0;
 }
-int usage_hitag_writer(void) {
+static int usage_hitag_writer(void) {
     PrintAndLogEx(NORMAL, "Hitag writer functions");
     PrintAndLogEx(NORMAL, "Usage: lf hitag write [h] <reader function #>");
     PrintAndLogEx(NORMAL, "Options:");
@@ -104,7 +104,7 @@ int usage_hitag_writer(void) {
     PrintAndLogEx(NORMAL, "      24  <key> (set to 0 if no authentication is needed) <page> <byte0...byte3> write page on a Hitag2 tag");
     return 0;
 }
-int usage_hitag_checkchallenges(void) {
+static int usage_hitag_checkchallenges(void) {
     PrintAndLogEx(NORMAL, "Check challenges, load a file with save hitag crypto challenges and test them all.");
     PrintAndLogEx(NORMAL, "The file should be 8 * 60 bytes long,  the file extension defaults to " _YELLOW_("`.cc`"));
     PrintAndLogEx(NORMAL, "");
diff --git a/client/cmdlfindala.c b/client/cmdlfindala.c
index d4fde6a5e..394b5ed72 100644
--- a/client/cmdlfindala.c
+++ b/client/cmdlfindala.c
@@ -18,7 +18,7 @@ static uint8_t preamble224[] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 // standard 64 bit indala formats including 26 bit 40134 format
 static uint8_t preamble64[] =  {1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1};
 
-int usage_lf_indala_demod(void) {
+static int usage_lf_indala_demod(void) {
     PrintAndLogEx(NORMAL, "Enables Indala compatible reader mode printing details of scanned tags.");
     PrintAndLogEx(NORMAL, "By default, values are printed and logged until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "");
@@ -31,7 +31,7 @@ int usage_lf_indala_demod(void) {
     return 0;
 }
 
-int usage_lf_indala_sim(void) {
+static int usage_lf_indala_sim(void) {
     PrintAndLogEx(NORMAL, "Enables simulation of Indala card with specified uid.");
     PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "");
@@ -45,7 +45,7 @@ int usage_lf_indala_sim(void) {
     return 0;
 }
 
-int usage_lf_indala_clone(void) {
+static int usage_lf_indala_clone(void) {
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  lf indala clone [h]<l> <uid> [Q5]");
diff --git a/client/cmdlfindala.h b/client/cmdlfindala.h
index 7bfdd1eae..b107efdc7 100644
--- a/client/cmdlfindala.h
+++ b/client/cmdlfindala.h
@@ -35,7 +35,4 @@ int detectIndala26(uint8_t *bitStream, size_t *size, uint8_t *invert);
 int detectIndala64(uint8_t *bitStream, size_t *size, uint8_t *invert);
 int detectIndala224(uint8_t *bitStream, size_t *size, uint8_t *invert);
 
-int usage_lf_indala_demod(void);
-int usage_lf_indala_clone(void);
-int usage_lf_indala_sim(void);
 #endif
diff --git a/client/cmdlfio.c b/client/cmdlfio.c
index bd5ac0ae2..d99cc818e 100644
--- a/client/cmdlfio.c
+++ b/client/cmdlfio.c
@@ -12,7 +12,7 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_lf_io_read(void) {
+static int usage_lf_io_read(void) {
     PrintAndLogEx(NORMAL, "Enables IOProx compatible reader mode printing details of scanned tags.");
     PrintAndLogEx(NORMAL, "By default, values are printed and logged until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "If the [1] option is provided, reader mode is exited after reading a single card.");
@@ -28,7 +28,7 @@ int usage_lf_io_read(void) {
     return 0;
 }
 
-int usage_lf_io_sim(void) {
+static int usage_lf_io_sim(void) {
     PrintAndLogEx(NORMAL, "Enables simulation of IOProx card with specified facility-code and card number.");
     PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "");
@@ -44,7 +44,7 @@ int usage_lf_io_sim(void) {
     return 0;
 }
 
-int usage_lf_io_clone(void) {
+static int usage_lf_io_clone(void) {
     PrintAndLogEx(NORMAL, "Enables cloning of IOProx card with specified facility-code and card number onto T55x7.");
     PrintAndLogEx(NORMAL, "The T55x7 must be on the antenna when issuing this command.  T55x7 blocks are calculated and printed in the process.");
     PrintAndLogEx(NORMAL, "");
diff --git a/client/cmdlfio.h b/client/cmdlfio.h
index 5066fee87..ecb442ff7 100644
--- a/client/cmdlfio.h
+++ b/client/cmdlfio.h
@@ -24,7 +24,4 @@ int CmdIOProxClone(const char *Cmd);
 
 int getIOProxBits(uint8_t version, uint8_t fc, uint16_t cn, uint8_t *bits);
 
-int usage_lf_io_read(void);
-int usage_lf_io_clone(void);
-int usage_lf_io_sim(void);
 #endif
diff --git a/client/cmdlfjablotron.c b/client/cmdlfjablotron.c
index 1c4d0b683..4a489a5f3 100644
--- a/client/cmdlfjablotron.c
+++ b/client/cmdlfjablotron.c
@@ -12,7 +12,7 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_lf_jablotron_clone(void) {
+static int usage_lf_jablotron_clone(void) {
     PrintAndLogEx(NORMAL, "clone a Jablotron tag to a T55x7 tag.");
     PrintAndLogEx(NORMAL, "Usage: lf jablotron clone [h] <card ID> <Q5>");
     PrintAndLogEx(NORMAL, "Options:");
@@ -25,7 +25,7 @@ int usage_lf_jablotron_clone(void) {
     return 0;
 }
 
-int usage_lf_jablotron_sim(void) {
+static int usage_lf_jablotron_sim(void) {
     PrintAndLogEx(NORMAL, "Enables simulation of jablotron card with specified card number.");
     PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "");
diff --git a/client/cmdlfjablotron.h b/client/cmdlfjablotron.h
index 5079a6f76..c46e6fc31 100644
--- a/client/cmdlfjablotron.h
+++ b/client/cmdlfjablotron.h
@@ -32,10 +32,5 @@ int CmdJablotronSim(const char *Cmd);
 int detectJablotron(uint8_t *bits, size_t *size);
 int getJablotronBits(uint64_t fullcode, uint8_t *bits);
 
-//int usage_lf_jablotron_demod(void);
-//int usage_lf_jablotron_read(void);
-int usage_lf_jablotron_clone(void);
-int usage_lf_jablotron_sim(void);
-
 #endif
 
diff --git a/client/cmdlfkeri.c b/client/cmdlfkeri.c
index 619ec9bfb..bdbc67c5d 100644
--- a/client/cmdlfkeri.c
+++ b/client/cmdlfkeri.c
@@ -11,7 +11,7 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_lf_keri_clone(void) {
+static int usage_lf_keri_clone(void) {
     PrintAndLogEx(NORMAL, "clone a KERI tag to a T55x7 tag.");
     PrintAndLogEx(NORMAL, "Usage: lf keri clone [h] <id> <Q5>");
     PrintAndLogEx(NORMAL, "Options:");
@@ -24,7 +24,7 @@ int usage_lf_keri_clone(void) {
     return 0;
 }
 
-int usage_lf_keri_sim(void) {
+static int usage_lf_keri_sim(void) {
     PrintAndLogEx(NORMAL, "Enables simulation of KERI card with specified card number.");
     PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "");
diff --git a/client/cmdlfkeri.h b/client/cmdlfkeri.h
index b2e1c89ad..bab4c47b0 100644
--- a/client/cmdlfkeri.h
+++ b/client/cmdlfkeri.h
@@ -30,7 +30,5 @@ int CmdKeriSim(const char *Cmd);
 
 int detectKeri(uint8_t *dest, size_t *size, bool *invert);
 
-int usage_lf_keri_clone(void);
-int usage_lf_keri_sim(void);
 #endif
 
diff --git a/client/cmdlfnedap.c b/client/cmdlfnedap.c
index 8d314df71..41d671d4a 100644
--- a/client/cmdlfnedap.c
+++ b/client/cmdlfnedap.c
@@ -10,7 +10,7 @@
 #include "cmdlfnedap.h"
 static int CmdHelp(const char *Cmd);
 
-int usage_lf_nedap_clone(void) {
+static int usage_lf_nedap_clone(void) {
     PrintAndLogEx(NORMAL, "clone a NEDAP tag to a T55x7 tag.");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage: lf nedap clone [h] <Card-Number>");
@@ -24,7 +24,7 @@ int usage_lf_nedap_clone(void) {
     return 0;
 }
 
-int usage_lf_nedap_sim(void) {
+static int usage_lf_nedap_sim(void) {
     PrintAndLogEx(NORMAL, "Enables simulation of NEDAP card with specified card number.");
     PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "");
diff --git a/client/cmdlfnedap.h b/client/cmdlfnedap.h
index 6cacfd638..e0cf9e0c0 100644
--- a/client/cmdlfnedap.h
+++ b/client/cmdlfnedap.h
@@ -31,8 +31,5 @@ int CmdLFNedapChk(const char *Cmd);
 
 int detectNedap(uint8_t *dest, size_t *size);
 
-int usage_lf_nedap_read(void);
-//int usage_lf_nedap_clone(void);
-int usage_lf_nedap_sim(void);
 #endif
 
diff --git a/client/cmdlfnoralsy.c b/client/cmdlfnoralsy.c
index 1745d5912..a882c57ed 100644
--- a/client/cmdlfnoralsy.c
+++ b/client/cmdlfnoralsy.c
@@ -11,7 +11,7 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_lf_noralsy_clone(void) {
+static int usage_lf_noralsy_clone(void) {
     PrintAndLogEx(NORMAL, "clone a Noralsy tag to a T55x7 tag.");
     PrintAndLogEx(NORMAL, "Usage: lf noralsy clone [h] <card id> <year> <Q5>");
     PrintAndLogEx(NORMAL, "Options:");
@@ -25,7 +25,7 @@ int usage_lf_noralsy_clone(void) {
     return 0;
 }
 
-int usage_lf_noralsy_sim(void) {
+static int usage_lf_noralsy_sim(void) {
     PrintAndLogEx(NORMAL, "Enables simulation of Noralsy card with specified card number.");
     PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "");
diff --git a/client/cmdlfnoralsy.h b/client/cmdlfnoralsy.h
index c9986d0ea..622dfbbf1 100644
--- a/client/cmdlfnoralsy.h
+++ b/client/cmdlfnoralsy.h
@@ -30,9 +30,5 @@ int CmdNoralsySim(const char *Cmd);
 
 int getnoralsyBits(uint32_t id, uint16_t year, uint8_t *bits);
 
-int usage_lf_noralsy_clone(void);
-int usage_lf_noralsy_sim(void);
-//int usage_lf_noralsy_read(void);
-//int usage_lf_noralsy_demod(void);
 #endif
 
diff --git a/client/cmdlfparadox.c b/client/cmdlfparadox.c
index 3a2979990..0776ffae6 100644
--- a/client/cmdlfparadox.c
+++ b/client/cmdlfparadox.c
@@ -21,7 +21,7 @@
 #include "lfdemod.h"
 static int CmdHelp(const char *Cmd);
 
-int usage_lf_paradox_sim(void) {
+static int usage_lf_paradox_sim(void) {
     PrintAndLogEx(NORMAL, "Enables simulation of Paradox card with specified card number.");
     PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "The facility-code is 8-bit and the card number is 16-bit.  Larger values are truncated.");
diff --git a/client/cmdlfpcf7931.c b/client/cmdlfpcf7931.c
index badc0f4e9..68ecfc8e8 100644
--- a/client/cmdlfpcf7931.c
+++ b/client/cmdlfpcf7931.c
@@ -51,7 +51,7 @@ int pcf7931_printConfig() {
     return 0;
 }
 
-int usage_pcf7931_read() {
+static int usage_pcf7931_read() {
     PrintAndLogEx(NORMAL, "Usage: lf pcf7931 read [h] ");
     PrintAndLogEx(NORMAL, "This command tries to read a PCF7931 tag.");
     PrintAndLogEx(NORMAL, "Options:");
@@ -61,7 +61,7 @@ int usage_pcf7931_read() {
     return 0;
 }
 
-int usage_pcf7931_write() {
+static int usage_pcf7931_write() {
     PrintAndLogEx(NORMAL, "Usage: lf pcf7931 write [h] <block address> <byte address> <data>");
     PrintAndLogEx(NORMAL, "This command tries to write a PCF7931 tag.");
     PrintAndLogEx(NORMAL, "Options:");
@@ -74,7 +74,7 @@ int usage_pcf7931_write() {
     return 0;
 }
 
-int usage_pcf7931_config() {
+static int usage_pcf7931_config() {
     PrintAndLogEx(NORMAL, "Usage: lf pcf7931 config [h] [r] <pwd> <delay> <offset width> <offset position>");
     PrintAndLogEx(NORMAL, "This command tries to set the configuration used with PCF7931 commands");
     PrintAndLogEx(NORMAL, "The time offsets could be useful to correct slew rate generated by the antenna");
diff --git a/client/cmdlfpcf7931.h b/client/cmdlfpcf7931.h
index db7c0c8fa..6489ebecf 100644
--- a/client/cmdlfpcf7931.h
+++ b/client/cmdlfpcf7931.h
@@ -22,10 +22,6 @@ struct pcf7931_config {
 int pcf7931_resetConfig(void);
 int pcf7931_printConfig(void);
 
-int usage_pcf7931_read(void);
-int usage_pcf7931_write(void);
-int usage_pcf7931_config(void);
-
 int CmdLFPCF7931(const char *Cmd);
 
 int CmdLFPCF7931Read(const char *Cmd);
diff --git a/client/cmdlfpresco.c b/client/cmdlfpresco.c
index 16366578e..5bb7beb27 100644
--- a/client/cmdlfpresco.c
+++ b/client/cmdlfpresco.c
@@ -10,7 +10,7 @@
 #include "cmdlfpresco.h"
 static int CmdHelp(const char *Cmd);
 
-int usage_lf_presco_clone(void) {
+static int usage_lf_presco_clone(void) {
     PrintAndLogEx(NORMAL, "clone a Presco tag to a T55x7 tag.");
     PrintAndLogEx(NORMAL, "Usage: lf presco clone [h] d <Card-ID> c <hex-ID> <Q5>");
     PrintAndLogEx(NORMAL, "Options:");
@@ -24,7 +24,7 @@ int usage_lf_presco_clone(void) {
     return 0;
 }
 
-int usage_lf_presco_sim(void) {
+static int usage_lf_presco_sim(void) {
     PrintAndLogEx(NORMAL, "Enables simulation of presco card with specified card number.");
     PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "Per presco format, the card number is 9 digit number and can contain *# chars. Larger values are truncated.");
diff --git a/client/cmdlfpresco.h b/client/cmdlfpresco.h
index 9c84f75b6..fec6fc620 100644
--- a/client/cmdlfpresco.h
+++ b/client/cmdlfpresco.h
@@ -30,7 +30,5 @@ int CmdPrescoSim(const char *Cmd);
 int detectPresco(uint8_t *dest, size_t *size);
 int GetWiegandFromPresco(const char *Cmd, uint32_t *sitecode, uint32_t *usercode, uint32_t *fullcode, bool *Q5);
 
-int usage_lf_presco_clone(void);
-int usage_lf_presco_sim(void);
 #endif
 
diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c
index 3c60c5d83..d60366430 100644
--- a/client/cmdlfpyramid.c
+++ b/client/cmdlfpyramid.c
@@ -11,7 +11,7 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_lf_pyramid_clone(void) {
+static int usage_lf_pyramid_clone(void) {
     PrintAndLogEx(NORMAL, "clone a Farpointe/Pyramid tag to a T55x7 tag.");
     PrintAndLogEx(NORMAL, "The facility-code is 8-bit and the card number is 16-bit.  Larger values are truncated. ");
     PrintAndLogEx(NORMAL, "Currently only works on 26bit");
@@ -28,7 +28,7 @@ int usage_lf_pyramid_clone(void) {
     return 0;
 }
 
-int usage_lf_pyramid_sim(void) {
+static int usage_lf_pyramid_sim(void) {
     PrintAndLogEx(NORMAL, "Enables simulation of Farpointe/Pyramid card with specified card number.");
     PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "The facility-code is 8-bit and the card number is 16-bit.  Larger values are truncated.");
diff --git a/client/cmdlfpyramid.h b/client/cmdlfpyramid.h
index fe2b62ef9..bb22310b2 100644
--- a/client/cmdlfpyramid.h
+++ b/client/cmdlfpyramid.h
@@ -29,8 +29,5 @@ int CmdPyramidClone(const char *Cmd);
 int CmdPyramidSim(const char *Cmd);
 
 int detectPyramid(uint8_t *dest, size_t *size, int *waveStartIdx);
-
-int usage_lf_pyramid_clone(void);
-int usage_lf_pyramid_sim(void);
 #endif
 
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 26cd6a784..bd23716ce 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -18,7 +18,7 @@ void Set_t55xx_Config(t55xx_conf_block_t conf) {
     config = conf;
 }
 
-int usage_t55xx_config() {
+static int usage_t55xx_config() {
     PrintAndLogEx(NORMAL, "Usage: lf t55xx config [d <demodulation>] [i [0/1]] [o <offset>] [Q5 [0/1]] [ST [0/1]]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       h                                - This help");
@@ -36,7 +36,7 @@ int usage_t55xx_config() {
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
-int usage_t55xx_read() {
+static int usage_t55xx_read() {
     PrintAndLogEx(NORMAL, "Usage:  lf t55xx read [b <block>] [p <password>] <override_safety> <page1>");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "     b <block>    - block number to read. Between 0-7");
@@ -54,7 +54,7 @@ int usage_t55xx_read() {
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
-int usage_t55xx_write() {
+static int usage_t55xx_write() {
     PrintAndLogEx(NORMAL, "Usage:  lf t55xx write [b <block>] [d <data>] [p <password>] [1] [t]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "     b <block>    - block number to write. Between 0-7");
@@ -69,7 +69,7 @@ int usage_t55xx_write() {
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
-int usage_t55xx_trace() {
+static int usage_t55xx_trace() {
     PrintAndLogEx(NORMAL, "Usage:  lf t55xx trace [1]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "     1            - if set, use Graphbuffer otherwise read data from tag.");
@@ -80,7 +80,7 @@ int usage_t55xx_trace() {
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
-int usage_t55xx_info() {
+static int usage_t55xx_info() {
     PrintAndLogEx(NORMAL, "Usage:  lf t55xx info [1] [d <data> [q]]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "     (default)    - read data from tag.");
@@ -97,7 +97,7 @@ int usage_t55xx_info() {
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
-int usage_t55xx_dump() {
+static int usage_t55xx_dump() {
     PrintAndLogEx(NORMAL, "Usage:  lf t55xx dump <password> [o]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "     <password>   - OPTIONAL password 4bytes (8 hex symbols)");
@@ -109,7 +109,7 @@ int usage_t55xx_dump() {
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
-int usage_t55xx_detect() {
+static int usage_t55xx_detect() {
     PrintAndLogEx(NORMAL, "Usage:  lf t55xx detect [1] [p <password>]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "     1            - if set, use Graphbuffer otherwise read data from tag.");
@@ -122,7 +122,7 @@ int usage_t55xx_detect() {
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
-int usage_t55xx_detectP1() {
+static int usage_t55xx_detectP1() {
     PrintAndLogEx(NORMAL, "Command: Detect Page 1 of a t55xx chip");
     PrintAndLogEx(NORMAL, "Usage:  lf t55xx p1detect [1] [p <password>]");
     PrintAndLogEx(NORMAL, "Options:");
@@ -136,7 +136,7 @@ int usage_t55xx_detectP1() {
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
-int usage_t55xx_wakup() {
+static int usage_t55xx_wakup() {
     PrintAndLogEx(NORMAL, "Usage:  lf t55xx wakeup [h] p <password>");
     PrintAndLogEx(NORMAL, "This commands send the Answer-On-Request command and leaves the readerfield ON afterwards.");
     PrintAndLogEx(NORMAL, "Options:");
@@ -147,7 +147,7 @@ int usage_t55xx_wakup() {
     PrintAndLogEx(NORMAL, "      lf t55xx wakeup p 11223344  - send wakeup password");
     return 0;
 }
-int usage_t55xx_chk() {
+static int usage_t55xx_chk() {
     PrintAndLogEx(NORMAL, "This command uses a dictionary attack");
     PrintAndLogEx(NORMAL, "press " _YELLOW_("'enter'") " to cancel the command");
     PrintAndLogEx(NORMAL, "WARNING: this may brick non-password protected chips!");
@@ -164,7 +164,7 @@ int usage_t55xx_chk() {
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
-int usage_t55xx_bruteforce() {
+static int usage_t55xx_bruteforce() {
     PrintAndLogEx(NORMAL, "This command uses bruteforce to scan a number range");
     PrintAndLogEx(NORMAL, "press " _YELLOW_("'enter'") " to cancel the command");
     PrintAndLogEx(NORMAL, "WARNING: this may brick non-password protected chips!");
@@ -181,7 +181,7 @@ int usage_t55xx_bruteforce() {
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
-int usage_t55xx_recoverpw() {
+static int usage_t55xx_recoverpw() {
     PrintAndLogEx(NORMAL, "This command uses a few tricks to try to recover mangled password");
     PrintAndLogEx(NORMAL, "press " _YELLOW_("'enter'") " to cancel the command");
     PrintAndLogEx(NORMAL, "WARNING: this may brick non-password protected chips!");
@@ -199,7 +199,7 @@ int usage_t55xx_recoverpw() {
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
-int usage_t55xx_wipe() {
+static int usage_t55xx_wipe() {
     PrintAndLogEx(NORMAL, "Usage:  lf t55xx wipe [h] [Q5]");
     PrintAndLogEx(NORMAL, "This commands wipes a tag, fills blocks 1-7 with zeros and a default configuration block");
     PrintAndLogEx(NORMAL, "Options:");
@@ -211,7 +211,7 @@ int usage_t55xx_wipe() {
     PrintAndLogEx(NORMAL, "      lf t55xx wipe Q5 -  wipes a t5555 Q5 tag, config block 0x6001F004");
     return 0;
 }
-int usage_lf_deviceconfig() {
+static int usage_lf_deviceconfig() {
     PrintAndLogEx(NORMAL, "Sets t55x7 timings for direkt commands. The timings are set here in Field Clocks (FC), \nwhich is converted to (US) on device");
     PrintAndLogEx(NORMAL, "Usage: lf t55xx deviceconfig a <gap> b <gap> c <gap> d <gap> e <gap> p");
     PrintAndLogEx(NORMAL, "Options:");
diff --git a/client/cmdlfviking.c b/client/cmdlfviking.c
index 1a7c7301f..b4ddcab67 100644
--- a/client/cmdlfviking.c
+++ b/client/cmdlfviking.c
@@ -11,7 +11,7 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_lf_viking_clone(void) {
+static int usage_lf_viking_clone(void) {
     PrintAndLogEx(NORMAL, "clone a Viking AM tag to a T55x7 tag.");
     PrintAndLogEx(NORMAL, "Usage: lf viking clone <Card ID - 8 hex digits> <Q5>");
     PrintAndLogEx(NORMAL, "Options:");
@@ -23,7 +23,7 @@ int usage_lf_viking_clone(void) {
     return 0;
 }
 
-int usage_lf_viking_sim(void) {
+static int usage_lf_viking_sim(void) {
     PrintAndLogEx(NORMAL, "Enables simulation of viking card with specified card number.");
     PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "Per viking format, the card number is 8 digit hex number.  Larger values are truncated.");
diff --git a/client/cmdlfviking.h b/client/cmdlfviking.h
index 96b4e9ac4..1ee7b6511 100644
--- a/client/cmdlfviking.h
+++ b/client/cmdlfviking.h
@@ -30,7 +30,5 @@ int CmdVikingSim(const char *Cmd);
 
 int detectViking(uint8_t *dest, size_t *size);
 
-int usage_lf_viking_clone(void);
-int usage_lf_viking_sim(void);
 #endif
 
diff --git a/client/cmdlfvisa2000.c b/client/cmdlfvisa2000.c
index ad5f1157b..fb08cd7ae 100644
--- a/client/cmdlfvisa2000.c
+++ b/client/cmdlfvisa2000.c
@@ -15,7 +15,7 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_lf_visa2k_clone(void) {
+static int usage_lf_visa2k_clone(void) {
     PrintAndLogEx(NORMAL, "clone a Visa2000 tag to a T55x7 tag.");
     PrintAndLogEx(NORMAL, "Usage: lf visa2000 clone [h] <card ID> <Q5>");
     PrintAndLogEx(NORMAL, "Options:");
@@ -28,7 +28,7 @@ int usage_lf_visa2k_clone(void) {
     return 0;
 }
 
-int usage_lf_visa2k_sim(void) {
+static int usage_lf_visa2k_sim(void) {
     PrintAndLogEx(NORMAL, "Enables simulation of visa2k card with specified card number.");
     PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "");
diff --git a/client/cmdlfvisa2000.h b/client/cmdlfvisa2000.h
index cb0b102de..36fef841e 100644
--- a/client/cmdlfvisa2000.h
+++ b/client/cmdlfvisa2000.h
@@ -31,9 +31,5 @@ int CmdVisa2kSim(const char *Cmd);
 int getvisa2kBits(uint64_t fullcode, uint8_t *bits);
 int detectVisa2k(uint8_t *dest, size_t *size);
 
-int usage_lf_visa2k_clone(void);
-int usage_lf_visa2k_sim(void);
-//int usage_lf_visa2k_read(void);
-//int usage_lf_visa2k_demod(void);
 #endif
 
diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index e02a0120c..fa39abe75 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -12,7 +12,7 @@
 
 static int CmdHelp(const char *Cmd);
 
-int usage_sm_raw(void) {
+static int usage_sm_raw(void) {
     PrintAndLogEx(NORMAL, "Usage: sc raw [h|r|c] d <0A 0B 0C ... hex>");
     PrintAndLogEx(NORMAL, "       h          :  this help");
     PrintAndLogEx(NORMAL, "       r          :  do not read response");
@@ -30,7 +30,7 @@ int usage_sm_raw(void) {
 
     return 0;
 }
-int usage_sm_reader(void) {
+static int usage_sm_reader(void) {
     PrintAndLogEx(NORMAL, "Usage: sc reader [h|s]");
     PrintAndLogEx(NORMAL, "       h          :  this help");
     PrintAndLogEx(NORMAL, "       s          :  silent (no messages)");
@@ -39,7 +39,7 @@ int usage_sm_reader(void) {
     PrintAndLogEx(NORMAL, "        sc reader");
     return 0;
 }
-int usage_sm_info(void) {
+static int usage_sm_info(void) {
     PrintAndLogEx(NORMAL, "Usage: s info [h|s]");
     PrintAndLogEx(NORMAL, "       h          :  this help");
     PrintAndLogEx(NORMAL, "       s          :  silent (no messages)");
@@ -48,7 +48,7 @@ int usage_sm_info(void) {
     PrintAndLogEx(NORMAL, "        sc info");
     return 0;
 }
-int usage_sm_upgrade(void) {
+static int usage_sm_upgrade(void) {
     PrintAndLogEx(NORMAL, "Upgrade RDV4.0 Sim module firmware");
     PrintAndLogEx(NORMAL, "Usage:  sc upgrade f <file name>");
     PrintAndLogEx(NORMAL, "       h               :  this help");
@@ -58,7 +58,7 @@ int usage_sm_upgrade(void) {
     PrintAndLogEx(NORMAL, "        sc upgrade f ../tools/simmodule/SIM011.BIN");
     return 0;
 }
-int usage_sm_setclock(void) {
+static int usage_sm_setclock(void) {
     PrintAndLogEx(NORMAL, "Usage: sc setclock [h] c <clockspeed>");
     PrintAndLogEx(NORMAL, "       h          :  this help");
     PrintAndLogEx(NORMAL, "       c <>       :  clockspeed (0 = 16mhz, 1=8mhz, 2=4mhz) ");
@@ -67,7 +67,7 @@ int usage_sm_setclock(void) {
     PrintAndLogEx(NORMAL, "        sc setclock c 2");
     return 0;
 }
-int usage_sm_brute(void) {
+static int usage_sm_brute(void) {
     PrintAndLogEx(NORMAL, "Tries to bruteforce SFI, using a known list of AID's ");
     PrintAndLogEx(NORMAL, "Usage: sc brute [h]");
     PrintAndLogEx(NORMAL, "       h          :  this help");
diff --git a/client/cmdsmartcard.h b/client/cmdsmartcard.h
index 1e94499af..54b832608 100644
--- a/client/cmdsmartcard.h
+++ b/client/cmdsmartcard.h
@@ -37,8 +37,4 @@ int CmdSmartReader(const char *Cmd);
 bool smart_select(bool silent, smart_card_atr_t *atr);
 int ExchangeAPDUSC(uint8_t *datain, int datainlen, bool activateCard, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen);
 
-int usage_sm_raw(void);
-int usage_sm_reader(void);
-int usage_sm_info(void);
-int usage_sm_upgrade(void);
 #endif
diff --git a/client/cmdtrace.c b/client/cmdtrace.c
index 8a2440c90..c6b9b5a23 100644
--- a/client/cmdtrace.c
+++ b/client/cmdtrace.c
@@ -15,7 +15,7 @@ static int CmdHelp(const char *Cmd);
 static uint8_t *trace;
 long traceLen = 0;
 
-int usage_trace_list() {
+static int usage_trace_list() {
     PrintAndLogEx(NORMAL, "List protocol data in trace buffer.");
     PrintAndLogEx(NORMAL, "Usage:  trace list <protocol> [f][c| <0|1>");
     PrintAndLogEx(NORMAL, "    f      - show frame delay times as well");
@@ -43,14 +43,14 @@ int usage_trace_list() {
     PrintAndLogEx(NORMAL, "        trace list iclass");
     return 0;
 }
-int usage_trace_load() {
+static int usage_trace_load() {
     PrintAndLogEx(NORMAL, "Load protocol data from file to trace buffer.");
     PrintAndLogEx(NORMAL, "Usage:  trace load <filename>");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "        trace load mytracefile.bin");
     return 0;
 }
-int usage_trace_save() {
+static int usage_trace_save() {
     PrintAndLogEx(NORMAL, "Save protocol data from trace buffer to file.");
     PrintAndLogEx(NORMAL, "Usage:  trace save <filename>");
     PrintAndLogEx(NORMAL, "Examples:");
diff --git a/client/cmdtrace.h b/client/cmdtrace.h
index 0191bf0e1..64e62cdd0 100644
--- a/client/cmdtrace.h
+++ b/client/cmdtrace.h
@@ -33,8 +33,4 @@ int CmdTraceList(const char *Cmd);
 int CmdTraceLoad(const char *Cmd);
 int CmdTraceSave(const char *Cmd);
 
-// usages helptext
-int usage_trace_list(void);
-int usage_trace_load(void);
-int usage_trace_save(void);
 #endif

From 0ce9e37fb746e37f3a12e55b2130f9ebe8e22484 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 10 Apr 2019 13:17:31 +0200
Subject: [PATCH 1174/1938] Remove duplicate helptext

---
 client/cmdlfem4x.c | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index ecd2538fb..b00d326d9 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -54,19 +54,6 @@ static int usage_lf_em410x_ws(void) {
     PrintAndLogEx(NORMAL, "      lf em 410x_spoof");
     return 0;
 }
-static int usage_lf_em410x_clone(void) {
-    PrintAndLogEx(NORMAL, "Simulating EM410x tag");
-    PrintAndLogEx(NORMAL, "");
-    PrintAndLogEx(NORMAL, "Usage:  lf em 410x_clone [h] <uid> <clock>");
-    PrintAndLogEx(NORMAL, "Options:");
-    PrintAndLogEx(NORMAL, "       h         - this help");
-    PrintAndLogEx(NORMAL, "       uid       - uid (10 HEX symbols)");
-    PrintAndLogEx(NORMAL, "       clock     - clock (32|64) (optional)");
-    PrintAndLogEx(NORMAL, "Examples:");
-    PrintAndLogEx(NORMAL, "      lf em 410x_clone 0F0368568B");
-    PrintAndLogEx(NORMAL, "      lf em 410x_clone 0F0368568B 32");
-    return 0;
-}
 static int usage_lf_em410x_sim(void) {
     PrintAndLogEx(NORMAL, "Simulating EM410x tag");
     PrintAndLogEx(NORMAL, "");

From 2c68edfad469460144f60fd61c9207f2920fdec7 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 10 Apr 2019 13:31:09 +0200
Subject: [PATCH 1175/1938] fix indala clone/demod helptext

---
 client/cmdlfindala.c | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/client/cmdlfindala.c b/client/cmdlfindala.c
index 394b5ed72..e40d89830 100644
--- a/client/cmdlfindala.c
+++ b/client/cmdlfindala.c
@@ -45,22 +45,6 @@ static int usage_lf_indala_sim(void) {
     return 0;
 }
 
-static int usage_lf_indala_clone(void) {
-    PrintAndLogEx(NORMAL, "");
-    PrintAndLogEx(NORMAL, "");
-    PrintAndLogEx(NORMAL, "Usage:  lf indala clone [h]<l> <uid> [Q5]");
-    PrintAndLogEx(NORMAL, "Options:");
-    PrintAndLogEx(NORMAL, "            h :  This help");
-    PrintAndLogEx(NORMAL, "            l :  long uid 64/224");
-    PrintAndLogEx(NORMAL, "        <uid> :  UID");
-    PrintAndLogEx(NORMAL, "           Q5 :  optional - clone to Q5 (T5555) instead of T55x7 chip");
-    PrintAndLogEx(NORMAL, "");
-    PrintAndLogEx(NORMAL, "Examples:");
-    PrintAndLogEx(NORMAL, "       lf indala clone 112233      -- 64");
-    PrintAndLogEx(NORMAL, "       lf indala clone l 112233    -- long 224");
-    return 0;
-}
-
 // redesigned by marshmellow adjusted from existing decode functions
 // indala id decoding
 int detectIndala(uint8_t *dest, size_t *size, uint8_t *invert) {
@@ -181,6 +165,10 @@ int CmdIndalaRead(const char *Cmd) {
 // by marshmellow
 // optional arguments - same as PSKDemod (clock & invert & maxerr)
 int CmdIndalaDemod(const char *Cmd) {
+
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_indala_demod();
+    
     int ans;
     if (strlen(Cmd) > 0)
         ans = PSKDemod(Cmd, true);

From 097835e684393d4a5c3a64dadfe18a626e87673e Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 10 Apr 2019 13:32:35 +0200
Subject: [PATCH 1176/1938] fix nedap clone helptext.  all waiting for the
 nedap clone cmd ...

---
 client/cmdlfnedap.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/cmdlfnedap.c b/client/cmdlfnedap.c
index 41d671d4a..521fa4117 100644
--- a/client/cmdlfnedap.c
+++ b/client/cmdlfnedap.c
@@ -10,6 +10,7 @@
 #include "cmdlfnedap.h"
 static int CmdHelp(const char *Cmd);
 
+/*
 static int usage_lf_nedap_clone(void) {
     PrintAndLogEx(NORMAL, "clone a NEDAP tag to a T55x7 tag.");
     PrintAndLogEx(NORMAL, "");
@@ -23,6 +24,7 @@ static int usage_lf_nedap_clone(void) {
     PrintAndLogEx(NORMAL, "       lf nedap clone 112233");
     return 0;
 }
+*/
 
 static int usage_lf_nedap_sim(void) {
     PrintAndLogEx(NORMAL, "Enables simulation of NEDAP card with specified card number.");

From af3397bd192b0996dc1d53d23d79949914cd187a Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 10 Apr 2019 13:46:51 +0200
Subject: [PATCH 1177/1938] chg: 'lf indala demod' - textual

---
 client/cmdlfindala.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/client/cmdlfindala.c b/client/cmdlfindala.c
index e40d89830..43dbc5264 100644
--- a/client/cmdlfindala.c
+++ b/client/cmdlfindala.c
@@ -19,15 +19,20 @@ static uint8_t preamble224[] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 static uint8_t preamble64[] =  {1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1};
 
 static int usage_lf_indala_demod(void) {
-    PrintAndLogEx(NORMAL, "Enables Indala compatible reader mode printing details of scanned tags.");
-    PrintAndLogEx(NORMAL, "By default, values are printed and logged until the button is pressed or another USB command is issued.");
+    PrintAndLogEx(NORMAL, "Tries to psk demodulate the graphbuffer as Indala ");
     PrintAndLogEx(NORMAL, "");
-    PrintAndLogEx(NORMAL, "Usage:  lf indala demod [h]");
+    PrintAndLogEx(NORMAL, "Usage:  lf indala demod [h] <clock> <0|1> <maxerror>");
     PrintAndLogEx(NORMAL, "Options:");
-    PrintAndLogEx(NORMAL, "      h :  This help");
+    PrintAndLogEx(NORMAL, "      h        :  This help");
+    PrintAndLogEx(NORMAL, "      clock    :  Set clock (as integer) optional, if not set, autodetect.");
+    PrintAndLogEx(NORMAL, "      invert   :  1 for invert output");
+    PrintAndLogEx(NORMAL, "      maxerror :  Set maximum allowed errors, default = 100.");   
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "        lf indala demod");
+    PrintAndLogEx(NORMAL, "        lf indala demod 32       = demod a Indala tag from GraphBuffer using a clock of RF/32");
+    PrintAndLogEx(NORMAL, "        lf indala demod 32 1     = demod a Indala tag from GraphBuffer using a clock of RF/32 and inverting data");    
+    PrintAndLogEx(NORMAL, "        lf indala demod 64 1 0   = demod a Indala tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors");    
     return 0;
 }
 
@@ -167,7 +172,7 @@ int CmdIndalaRead(const char *Cmd) {
 int CmdIndalaDemod(const char *Cmd) {
 
     char cmdp = tolower(param_getchar(Cmd, 0));
-    if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_indala_demod();
+    if (cmdp == 'h') return usage_lf_indala_demod();
     
     int ans;
     if (strlen(Cmd) > 0)

From 0ab6de64d4c494d258c12f3b68e1abe1cf15df71 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 10 Apr 2019 13:59:00 +0200
Subject: [PATCH 1178/1938] structs: initializes explicitely all fields, so we
 can detect when we really forgot one [-Wmissing-field-initializers]

---
 client/cmdanalyse.c        |  2 +-
 client/cmddata.c           |  4 ++--
 client/cmdflashmem.c       | 12 ++++++------
 client/cmdhf.c             |  2 +-
 client/cmdhf14a.c          | 28 ++++++++++++++--------------
 client/cmdhf14b.c          | 26 +++++++++++++-------------
 client/cmdhf15.c           | 22 +++++++++++-----------
 client/cmdhfepa.c          |  2 +-
 client/cmdhffelica.c       | 12 ++++++------
 client/cmdhficlass.c       | 30 +++++++++++++++---------------
 client/cmdhflegic.c        | 16 ++++++++--------
 client/cmdhfmf.c           | 38 +++++++++++++++++++-------------------
 client/cmdhfmfdes.c        |  8 ++++----
 client/cmdhfmfhard.c       |  4 ++--
 client/cmdhfmfp.c          |  2 +-
 client/cmdhfmfu.c          | 20 ++++++++++----------
 client/cmdhftopaz.c        |  6 +++---
 client/cmdhw.c             |  8 ++++----
 client/cmdlf.c             | 18 +++++++++---------
 client/cmdlfawid.c         | 10 +++++-----
 client/cmdlfcotag.c        |  2 +-
 client/cmdlfem4x.c         |  8 ++++----
 client/cmdlffdx.c          |  4 ++--
 client/cmdlfguard.c        |  4 ++--
 client/cmdlfhid.c          |  8 ++++----
 client/cmdlfhitag.c        |  8 ++++----
 client/cmdlfindala.c       |  4 ++--
 client/cmdlfio.c           |  8 ++++----
 client/cmdlfjablotron.c    |  4 ++--
 client/cmdlfkeri.c         |  4 ++--
 client/cmdlfnedap.c        |  4 ++--
 client/cmdlfnoralsy.c      |  4 ++--
 client/cmdlfparadox.c      |  2 +-
 client/cmdlfpcf7931.c      |  2 +-
 client/cmdlfpresco.c       |  4 ++--
 client/cmdlfpyramid.c      |  4 ++--
 client/cmdlft55xx.c        |  8 ++++----
 client/cmdlfviking.c       |  4 ++--
 client/cmdlfvisa2000.c     |  4 ++--
 client/cmdsmartcard.c      | 28 ++++++++++++++--------------
 client/comms.c             |  8 ++++----
 client/mifare/mifarehost.c | 24 ++++++++++++------------
 client/scripting.c         |  2 +-
 43 files changed, 211 insertions(+), 211 deletions(-)

diff --git a/client/cmdanalyse.c b/client/cmdanalyse.c
index 9ba84636e..46e19fb98 100644
--- a/client/cmdanalyse.c
+++ b/client/cmdanalyse.c
@@ -515,7 +515,7 @@ int CmdAnalyseA(const char *Cmd) {
     if (errors || cmdp == 0) return usage_analyse_a();
 
 
-    UsbCommand c = {CMD_FPC_SEND, {0, 0, 0}};
+    UsbCommand c = {CMD_FPC_SEND, {0, 0, 0}, {{0}}};
     memcpy(c.d.asBytes, data, USB_CMD_DATA_SIZE);
     clearCommandBuffer();
     SendCommand(&c);
diff --git a/client/cmddata.c b/client/cmddata.c
index 9beb7f6e2..795cc060d 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -869,7 +869,7 @@ int CmdBuffClear(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_data_buffclear();
 
-    UsbCommand c = {CMD_BUFF_CLEAR, {0, 0, 0}};
+    UsbCommand c = {CMD_BUFF_CLEAR, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     ClearGraph(true);
@@ -1521,7 +1521,7 @@ int CmdTuneSamples(const char *Cmd) {
     int timeout = 0;
     PrintAndLogEx(INFO, "\nmeasuring antenna characteristics, please wait...");
 
-    UsbCommand c = {CMD_MEASURE_ANTENNA_TUNING, {0, 0, 0}};
+    UsbCommand c = {CMD_MEASURE_ANTENNA_TUNING, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
diff --git a/client/cmdflashmem.c b/client/cmdflashmem.c
index 311d07ed3..2c565d9e9 100644
--- a/client/cmdflashmem.c
+++ b/client/cmdflashmem.c
@@ -140,7 +140,7 @@ int CmdFlashMemRead(const char *Cmd) {
         return 1;
     }
 
-    UsbCommand c = {CMD_FLASHMEM_READ, {start_index, len, 0}};
+    UsbCommand c = {CMD_FLASHMEM_READ, {start_index, len, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -153,7 +153,7 @@ int CmdFlashmemSpiBaudrate(const char *Cmd) {
     uint32_t baudrate = param_get32ex(Cmd, 0, 0, 10);
     baudrate = baudrate * 1000000;
     if (baudrate != FLASH_BAUD && baudrate != FLASH_MINBAUD) return usage_flashmem_spibaud();
-    UsbCommand c = {CMD_FLASHMEM_SET_SPIBAUDRATE, {baudrate, 0, 0}};
+    UsbCommand c = {CMD_FLASHMEM_SET_SPIBAUDRATE, {baudrate, 0, 0}, {{0}}};
     SendCommand(&c);
     return 0;
 }
@@ -275,7 +275,7 @@ int CmdFlashMemLoad(const char *Cmd) {
     while (bytes_remaining > 0) {
         uint32_t bytes_in_packet = MIN(FLASH_MEM_BLOCK_SIZE, bytes_remaining);
 
-        UsbCommand c = {CMD_FLASHMEM_WRITE, {start_index + bytes_sent, bytes_in_packet, 0}};
+        UsbCommand c = {CMD_FLASHMEM_WRITE, {start_index + bytes_sent, bytes_in_packet, 0}, {{0}}};
 
         memcpy(c.d.asBytes, data + bytes_sent, bytes_in_packet);
         clearCommandBuffer();
@@ -390,7 +390,7 @@ int CmdFlashMemWipe(const char *Cmd) {
     //Validations
     if (errors || cmdp == 0) return usage_flashmem_wipe();
 
-    UsbCommand c = {CMD_FLASHMEM_WIPE, {page, initalwipe, 0}};
+    UsbCommand c = {CMD_FLASHMEM_WIPE, {page, initalwipe, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
@@ -436,7 +436,7 @@ int CmdFlashMemInfo(const char *Cmd) {
     //Validations
     if (errors) return usage_flashmem_info();
 
-    UsbCommand c = {CMD_FLASHMEM_INFO, {0, 0, 0}};
+    UsbCommand c = {CMD_FLASHMEM_INFO, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
@@ -565,7 +565,7 @@ int CmdFlashMemInfo(const char *Cmd) {
 
         if (shall_write) {
             // save to mem
-            c = (UsbCommand) {CMD_FLASHMEM_WRITE, {FLASH_MEM_SIGNATURE_OFFSET, FLASH_MEM_SIGNATURE_LEN, 0}};
+            c = (UsbCommand) {CMD_FLASHMEM_WRITE, {FLASH_MEM_SIGNATURE_OFFSET, FLASH_MEM_SIGNATURE_LEN, 0}, {{0}}};
             memcpy(c.d.asBytes, sign, sizeof(sign));
             clearCommandBuffer();
             SendCommand(&c);
diff --git a/client/cmdhf.c b/client/cmdhf.c
index d7a3ccce3..7d1fa2668 100644
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -103,7 +103,7 @@ int CmdHFSniff(const char *Cmd) {
     int skippairs =  param_get32ex(Cmd, 0, 0, 10);
     int skiptriggers =  param_get32ex(Cmd, 1, 0, 10);
 
-    UsbCommand c = {CMD_HF_SNIFFER, {skippairs, skiptriggers, 0}};
+    UsbCommand c = {CMD_HF_SNIFFER, {skippairs, skiptriggers, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 570ecec83..c7790f65b 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -228,7 +228,7 @@ int CmdHF14AList(const char *Cmd) {
 }
 
 int Hf14443_4aGetCardData(iso14a_card_select_t *card) {
-    UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT, 0, 0}};
+    UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT, 0, 0}, {{0}}};
     SendCommand(&c);
 
     UsbCommand resp;
@@ -298,7 +298,7 @@ int CmdHF14AReader(const char *Cmd) {
     if (!disconnectAfter)
         cm |= ISO14A_NO_DISCONNECT;
 
-    UsbCommand c = {CMD_READER_ISO_14443a, {cm, 0, 0}};
+    UsbCommand c = {CMD_READER_ISO_14443a, {cm, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
 
@@ -361,7 +361,7 @@ int CmdHF14AInfo(const char *Cmd) {
     bool silent = (Cmd[0] == 's' || Cmd[0] ==  'S');
     bool do_nack_test = (Cmd[0] == 'n' || Cmd[0] ==  'N');
 
-    UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};
+    UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
@@ -679,7 +679,7 @@ int CmdHF14ACUIDs(const char *Cmd) {
         }
 
         // execute anticollision procedure
-        UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0}};
+        UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0}, {{0}}};
         SendCommand(&c);
 
         UsbCommand resp;
@@ -778,7 +778,7 @@ int CmdHF14ASim(const char *Cmd) {
     if (useUIDfromEML)
         flags |= FLAG_UID_IN_EMUL;
 
-    UsbCommand c = {CMD_SIMULATE_TAG_ISO_14443a, { tagtype, flags, 0 }};
+    UsbCommand c = {CMD_SIMULATE_TAG_ISO_14443a, { tagtype, flags, 0 }, {{0}}};
     memcpy(c.d.asBytes, uid, uidlen >> 1);
     clearCommandBuffer();
     SendCommand(&c);
@@ -807,7 +807,7 @@ int CmdHF14ASniff(const char *Cmd) {
         if (ctmp == 'c') param |= 0x01;
         if (ctmp == 'r') param |= 0x02;
     }
-    UsbCommand c = {CMD_SNIFF_ISO_14443a, {param, 0, 0}};
+    UsbCommand c = {CMD_SNIFF_ISO_14443a, {param, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -823,7 +823,7 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
         UsbCommand resp;
 
         // Anticollision + SELECT card
-        UsbCommand ca = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};
+        UsbCommand ca = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}, {{0}}};
         SendCommand(&ca);
         if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
             PrintAndLogEx(ERR, "Proxmark connection timeout.");
@@ -843,7 +843,7 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
 
         if (resp.arg[0] == 2) { // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
             // get ATS
-            UsbCommand cr = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT, 2, 0}};
+            UsbCommand cr = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT, 2, 0}, {{0}}};
             uint8_t rats[] = { 0xE0, 0x80 }; // FSDI=8 (FSD=256), CID=0
             memcpy(cr.d.asBytes, rats, 2);
             SendCommand(&cr);
@@ -862,7 +862,7 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
     if (leaveSignalON)
         cmdc |= ISO14A_NO_DISCONNECT;
 
-    UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_APPEND_CRC | cmdc, (datainlen & 0xFFFF) + 2, 0}};
+    UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_APPEND_CRC | cmdc, (datainlen & 0xFFFF) + 2, 0}, {{0}}};
     uint8_t header[] = { 0x0a | responseNum, 0x00};
     responseNum ^= 1;
     memcpy(c.d.asBytes, header, 2);
@@ -922,7 +922,7 @@ int SelectCard14443_4(bool disconnect, iso14a_card_select_t *card) {
     DropField();
 
     // Anticollision + SELECT card
-    UsbCommand ca = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};
+    UsbCommand ca = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}, {{0}}};
     SendCommand(&ca);
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         PrintAndLogEx(ERR, "Proxmark connection timeout.");
@@ -942,7 +942,7 @@ int SelectCard14443_4(bool disconnect, iso14a_card_select_t *card) {
 
     if (resp.arg[0] == 2) { // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
         // get ATS
-        UsbCommand cr = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT, 2, 0}};
+        UsbCommand cr = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT, 2, 0}, {{0}}};
         uint8_t rats[] = { 0xE0, 0x80 }; // FSDI=8 (FSD=256), CID=0
         memcpy(cr.d.asBytes, rats, 2);
         SendCommand(&cr);
@@ -999,7 +999,7 @@ int CmdExchangeAPDU(bool chainingin, uint8_t *datain, int datainlen, bool activa
     // https://stackoverflow.com/questions/32994936/safe-max-java-card-apdu-data-command-and-respond-size
     // here length USB_CMD_DATA_SIZE=512
     // timeout must be authomatically set by "get ATS"
-    UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_APDU | ISO14A_NO_DISCONNECT | cmdc, (datainlen & 0xFFFF), 0}};
+    UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_APDU | ISO14A_NO_DISCONNECT | cmdc, (datainlen & 0xFFFF), 0}, {{0}}};
 
     if (datain)
         memcpy(c.d.asBytes, datain, datainlen);
@@ -1186,7 +1186,7 @@ int CmdHF14AAPDU(const char *Cmd) {
 }
 
 int CmdHF14ACmdRaw(const char *Cmd) {
-    UsbCommand c = {CMD_READER_ISO_14443a, {0, 0, 0}};
+    UsbCommand c = {CMD_READER_ISO_14443a, {0, 0, 0}, {{0}}};
     bool reply = 1;
     bool crc = false;
     bool power = false;
@@ -1392,7 +1392,7 @@ int CmdHF14AAntiFuzz(const char *Cmd) {
         arg0 = FLAG_10B_UID_IN_DATA;
 
     CLIParserFree();
-    UsbCommand c = {CMD_ANTIFUZZ_ISO_14443a, {arg0, 0, 0}};
+    UsbCommand c = {CMD_ANTIFUZZ_ISO_14443a, {arg0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c
index 60722b849..d094fcbf7 100644
--- a/client/cmdhf14b.c
+++ b/client/cmdhf14b.c
@@ -108,14 +108,14 @@ static int usage_hf_14b_dump(void) {
 
 /*
 static void switch_on_field_14b(void) {
-    UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT, 0, 0}};
+    UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
 }
 */
 
 static int switch_off_field_14b(void) {
-    UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_DISCONNECT, 0, 0}};
+    UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_DISCONNECT, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -136,7 +136,7 @@ int CmdHF14BSim(const char *Cmd) {
         pupi = param_get32ex(Cmd, 1, 0, 16);
     }
 
-    UsbCommand c = {CMD_SIMULATE_TAG_ISO_14443B, {pupi, 0, 0}};
+    UsbCommand c = {CMD_SIMULATE_TAG_ISO_14443B, {pupi, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -147,7 +147,7 @@ int CmdHF14BSniff(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_hf_14b_sniff();
 
-    UsbCommand c = {CMD_SNIFF_ISO_14443B, {0, 0, 0}};
+    UsbCommand c = {CMD_SNIFF_ISO_14443B, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -242,7 +242,7 @@ int CmdHF14BCmdRaw(const char *Cmd) {
     // Max buffer is USB_CMD_DATA_SIZE
     datalen = (datalen > USB_CMD_DATA_SIZE) ? USB_CMD_DATA_SIZE : datalen;
 
-    UsbCommand c = {CMD_ISO_14443B_COMMAND, {flags, datalen, time_wait}};
+    UsbCommand c = {CMD_ISO_14443B_COMMAND, {flags, datalen, time_wait}, {{0}}};
     memcpy(c.d.asBytes, data, datalen);
     clearCommandBuffer();
     SendCommand(&c);
@@ -267,7 +267,7 @@ static bool get_14b_UID(iso14b_card_select_t *card) {
 
     int8_t retry = 3;
     UsbCommand resp;
-    UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_SR | ISO14B_DISCONNECT, 0, 0}};
+    UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_SR | ISO14B_DISCONNECT, 0, 0}, {{0}}};
 
     // test for 14b SR
     while (retry--) {
@@ -473,7 +473,7 @@ bool HF14B_Std_Info(bool verbose) {
     bool isSuccess = false;
 
     // 14b get and print UID only (general info)
-    UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_STD | ISO14B_DISCONNECT, 0, 0}};
+    UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_STD | ISO14B_DISCONNECT, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
@@ -514,7 +514,7 @@ bool HF14B_Std_Info(bool verbose) {
 // SRx get and print full info (needs more info...)
 bool HF14B_ST_Info(bool verbose) {
 
-    UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_SR | ISO14B_DISCONNECT, 0, 0}};
+    UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_SR | ISO14B_DISCONNECT, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
@@ -586,7 +586,7 @@ bool HF14B_ST_Reader(bool verbose) {
     bool isSuccess = false;
 
     // SRx get and print general info about SRx chip from UID
-    UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_SR | ISO14B_DISCONNECT, 0, 0}};
+    UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_SR | ISO14B_DISCONNECT, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
@@ -626,7 +626,7 @@ bool HF14B_Std_Reader(bool verbose) {
     bool isSuccess = false;
 
     // 14b get and print UID only (general info)
-    UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_STD | ISO14B_DISCONNECT, 0, 0}};
+    UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_STD | ISO14B_DISCONNECT, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
@@ -671,7 +671,7 @@ bool HF14B_Other_Reader() {
     // // 14b get and print UID only (general info)
     // uint32_t flags = ISO14B_CONNECT | ISO14B_SELECT_STD | ISO14B_RAW | ISO14B_APPEND_CRC;
 
-    // UsbCommand c = {CMD_ISO_14443B_COMMAND, {flags, datalen, 0}};
+    // UsbCommand c = {CMD_ISO_14443B_COMMAND, {flags, datalen, 0}, {{0}}};
     // memcpy(c.d.asBytes, data, datalen);
 
     // clearCommandBuffer();
@@ -758,7 +758,7 @@ int CmdHF14BReadSri(const char *Cmd) {
     uint8_t tagtype = param_get8(Cmd, 0);
     uint8_t blocks = (tagtype == 1) ? 0x7F : 0x0F;
 
-    UsbCommand c = {CMD_READ_SRI_TAG, {blocks, 0, 0}};
+    UsbCommand c = {CMD_READ_SRI_TAG, {blocks, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -898,7 +898,7 @@ int CmdHF14BDump(const char *Cmd) {
     uint8_t *recv = NULL;
 
     UsbCommand resp;
-    UsbCommand c = {CMD_ISO_14443B_COMMAND, { ISO14B_CONNECT | ISO14B_SELECT_SR, 0, 0}};
+    UsbCommand c = {CMD_ISO_14443B_COMMAND, { ISO14B_CONNECT | ISO14B_SELECT_SR, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
 
diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index 649fb8dc6..9a1cc13e8 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -199,7 +199,7 @@ const productName uidmapping[] = {
 int getUID(uint8_t *buf) {
 
     UsbCommand resp;
-    UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}}; // len,speed,recv?
+    UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}}; // len,speed,recv?
 
     c.d.asBytes[0] = ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | ISO15_REQ_INVENTORY | ISO15_REQINV_SLOT1;
     c.d.asBytes[1] = ISO15_CMD_INVENTORY;
@@ -496,7 +496,7 @@ int CmdHF15Samples(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_15_samples();
 
-    UsbCommand c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_15693, {0, 0, 0}};
+    UsbCommand c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_15693, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
 
@@ -515,7 +515,7 @@ int CmdHF15Info(const char *Cmd) {
 
     UsbCommand resp;
     uint8_t *recv;
-    UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}}; // len,speed,recv?
+    UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}}; // len,speed,recv?
     uint8_t *req = c.d.asBytes;
     char cmdbuf[100] = {0};
     char *cmd = cmdbuf;
@@ -593,7 +593,7 @@ int CmdHF15Record(const char *Cmd) {
     char cmdp =  tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_15_record();
 
-    UsbCommand c = {CMD_RECORD_RAW_ADC_SAMPLES_ISO_15693, {0, 0, 0}};
+    UsbCommand c = {CMD_RECORD_RAW_ADC_SAMPLES_ISO_15693, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -635,7 +635,7 @@ int CmdHF15Sim(const char *Cmd) {
 
     PrintAndLogEx(SUCCESS, "Starting simulating UID %s", sprint_hex(uid, sizeof(uid)));
 
-    UsbCommand c = {CMD_SIMTAG_ISO_15693, {0, 0, 0}};
+    UsbCommand c = {CMD_SIMTAG_ISO_15693, {0, 0, 0}, {{0}}};
     memcpy(c.d.asBytes, uid, 8);
     clearCommandBuffer();
     SendCommand(&c);
@@ -651,7 +651,7 @@ int CmdHF15Afi(const char *Cmd) {
 
     PrintAndLogEx(SUCCESS, "press pm3-button to cancel");
 
-    UsbCommand c = {CMD_ISO_15693_FIND_AFI, {strtol(Cmd, NULL, 0), 0, 0}};
+    UsbCommand c = {CMD_ISO_15693_FIND_AFI, {strtol(Cmd, NULL, 0), 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -717,7 +717,7 @@ int CmdHF15Dump(const char *Cmd) {
     memset(data, 0, sizeof(data));
 
     UsbCommand resp;
-    UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}}; // len,speed,recv?
+    UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}}; // len,speed,recv?
     uint8_t *req = c.d.asBytes;
     req[0] = ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | ISO15_REQ_NONINVENTORY | ISO15_REQ_ADDRESS;
     req[1] = ISO15_CMD_READ;
@@ -914,7 +914,7 @@ int CmdHF15Raw(const char *Cmd) {
     if (strlen(Cmd) < 3 || cmdp == 'h' || cmdp == 'H') return usage_15_raw();
 
     UsbCommand resp;
-    UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}}; // len,speed,recv?
+    UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}}; // len,speed,recv?
     int reply = 1, fast = 1, i = 0;
     bool crc = false;
     char buf[5] = "";
@@ -1079,7 +1079,7 @@ int CmdHF15Readmulti(const char *Cmd) {
 
     UsbCommand resp;
     uint8_t *recv;
-    UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}}; // len,speed,recv?
+    UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}}; // len,speed,recv?
     uint8_t *req = c.d.asBytes;
     int reqlen = 0;
     uint8_t pagenum, pagecount;
@@ -1167,7 +1167,7 @@ int CmdHF15Read(const char *Cmd) {
     // arg0 (datalen,  cmd len?  .arg0 == crc?)
     // arg1 (speed == 0 == 1 of 256,  == 1 == 1 of 4 )
     // arg2 (recv == 1 == expect a response)
-    UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}};
+    UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}};
     uint8_t *req = c.d.asBytes;
     int reqlen = 0, blocknum;
     char cmdbuf[100] = {0};
@@ -1236,7 +1236,7 @@ int CmdHF15Write(const char *Cmd) {
 
     UsbCommand resp;
     uint8_t *recv;
-    UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}}; // len,speed,recv?
+    UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}}; // len,speed,recv?
     uint8_t *req = c.d.asBytes;
     int reqlen = 0, pagenum, temp;
     char cmdbuf[100] = {0};
diff --git a/client/cmdhfepa.c b/client/cmdhfepa.c
index 3bb58072d..1367ab3b8 100644
--- a/client/cmdhfepa.c
+++ b/client/cmdhfepa.c
@@ -31,7 +31,7 @@ int CmdHFEPACollectPACENonces(const char *Cmd) {
     // repeat n times
     for (uint32_t i = 0; i < n; i++) {
         // execute PACE
-        UsbCommand c = {CMD_EPA_PACE_COLLECT_NONCE, {(int)m, 0, 0}};
+        UsbCommand c = {CMD_EPA_PACE_COLLECT_NONCE, {(int)m, 0, 0}, {{0}}};
         clearCommandBuffer();
         SendCommand(&c);
         UsbCommand resp;
diff --git a/client/cmdhffelica.c b/client/cmdhffelica.c
index d641e39e0..cdbffcf38 100644
--- a/client/cmdhffelica.c
+++ b/client/cmdhffelica.c
@@ -73,8 +73,8 @@ int CmdHFFelicaList(const char *Cmd) {
 
 int CmdHFFelicaReader(const char *Cmd) {
     bool silent = (Cmd[0] == 's' || Cmd[0] ==  'S');
-    //UsbCommand cDisconnect = {CMD_FELICA_COMMAND, {0,0,0}};
-    UsbCommand c = {CMD_FELICA_COMMAND, {FELICA_CONNECT, 0, 0}};
+    //UsbCommand cDisconnect = {CMD_FELICA_COMMAND, {0,0,0}, {{0}}};
+    UsbCommand c = {CMD_FELICA_COMMAND, {FELICA_CONNECT, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
@@ -173,7 +173,7 @@ int CmdHFFelicaSim(const char *Cmd) {
     //Validations
     if (errors || cmdp == 0) return usage_hf_felica_sim();
 
-    UsbCommand c = {CMD_FELICA_SIMULATE_TAG, { tagtype, flags, 0 }};
+    UsbCommand c = {CMD_FELICA_SIMULATE_TAG, { tagtype, flags, 0 }, {{0}}};
     memcpy(c.d.asBytes, uid, uidlen >> 1);
     clearCommandBuffer();
     SendCommand(&c);
@@ -219,7 +219,7 @@ int CmdHFFelicaSniff(const char *Cmd) {
     //Validations
     if (errors || cmdp == 0) return usage_hf_felica_sniff();
 
-    UsbCommand c = {CMD_FELICA_SNIFF, {samples2skip, triggers2skip, 0}};
+    UsbCommand c = {CMD_FELICA_SNIFF, {samples2skip, triggers2skip, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -397,7 +397,7 @@ int CmdHFFelicaDumpLite(const char *Cmd) {
 
     PrintAndLogEx(SUCCESS, "FeliCa lite - dump started");
     PrintAndLogEx(SUCCESS, "press pm3-button to cancel");
-    UsbCommand c = {CMD_FELICA_LITE_DUMP, {0, 0, 0}};
+    UsbCommand c = {CMD_FELICA_LITE_DUMP, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
@@ -457,7 +457,7 @@ int CmdHFFelicaDumpLite(const char *Cmd) {
 }
 
 int CmdHFFelicaCmdRaw(const char *Cmd) {
-    UsbCommand c = {CMD_FELICA_COMMAND, {0, 0, 0}};
+    UsbCommand c = {CMD_FELICA_COMMAND, {0, 0, 0}, {{0}}};
     bool reply = 1;
     bool crc = false;
     bool power = false;
diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index f92bfb78d..000ebf0ca 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -379,7 +379,7 @@ int CmdHFiClassSim(const char *Cmd) {
         case 2: {
             PrintAndLogEx(INFO, "Starting iCLASS sim 2 attack (elite mode)");
             PrintAndLogEx(INFO, "press keyboard to cancel");
-            UsbCommand c = {CMD_SIMULATE_TAG_ICLASS, {simType, NUM_CSNS}};
+            UsbCommand c = {CMD_SIMULATE_TAG_ICLASS, {simType, NUM_CSNS}, {{0}}};
             UsbCommand resp = {0};
             memcpy(c.d.asBytes, csns, 8 * NUM_CSNS);
             clearCommandBuffer();
@@ -432,7 +432,7 @@ int CmdHFiClassSim(const char *Cmd) {
             // reader in key roll mode,  when it has two keys it alternates when trying to verify.
             PrintAndLogEx(INFO, "Starting iCLASS sim 4 attack (elite mode, reader in key roll mode)");
             PrintAndLogEx(INFO, "press keyboard to cancel");
-            UsbCommand c = {CMD_SIMULATE_TAG_ICLASS, {simType, NUM_CSNS}};
+            UsbCommand c = {CMD_SIMULATE_TAG_ICLASS, {simType, NUM_CSNS}, {{0}}};
             UsbCommand resp = {0};
             memcpy(c.d.asBytes, csns, 8 * NUM_CSNS);
             clearCommandBuffer();
@@ -500,7 +500,7 @@ int CmdHFiClassSim(const char *Cmd) {
         case 1:
         case 3:
         default: {
-            UsbCommand c = {CMD_SIMULATE_TAG_ICLASS, {simType, numberOfCSNs}};
+            UsbCommand c = {CMD_SIMULATE_TAG_ICLASS, {simType, numberOfCSNs}, {{0}}};
             memcpy(c.d.asBytes, CSN, 8);
             clearCommandBuffer();
             SendCommand(&c);
@@ -518,7 +518,7 @@ int HFiClassReader(const char *Cmd, bool loop, bool verbose) {
                      FLAG_ICLASS_READER_CONF | FLAG_ICLASS_READER_ONLY_ONCE |
                      FLAG_ICLASS_READER_ONE_TRY;
 
-    UsbCommand c = {CMD_READER_ICLASS, {flags, 0, 0}};
+    UsbCommand c = {CMD_READER_ICLASS, {flags, 0, 0}, {{0}}};
     // loop in client not device - else on windows have a communication error
     UsbCommand resp;
     while (!ukbhit()) {
@@ -597,7 +597,7 @@ int CmdHFiClassReader_Replay(const char *Cmd) {
         return 1;
     }
 
-    UsbCommand c = {CMD_READER_ICLASS_REPLAY, {readerType}};
+    UsbCommand c = {CMD_READER_ICLASS_REPLAY, {readerType}, {{0}}};
     memcpy(c.d.asBytes, MAC, 4);
     clearCommandBuffer();
     SendCommand(&c);
@@ -605,7 +605,7 @@ int CmdHFiClassReader_Replay(const char *Cmd) {
 }
 
 int iclassEmlSetMem(uint8_t *data, int blockNum, int blocksCount) {
-    UsbCommand c = {CMD_MIFARE_EML_MEMSET, {blockNum, blocksCount, 0}};
+    UsbCommand c = {CMD_MIFARE_EML_MEMSET, {blockNum, blocksCount, 0}, {{0}}};
     memcpy(c.d.asBytes, data, blocksCount * 16);
     clearCommandBuffer();
     SendCommand(&c);
@@ -668,7 +668,7 @@ int CmdHFiClassELoad(const char *Cmd) {
 
     while (bytes_remaining > 0) {
         uint32_t bytes_in_packet = MIN(USB_CMD_DATA_SIZE, bytes_remaining);
-        UsbCommand c = {CMD_ICLASS_EML_MEMSET, {bytes_sent, bytes_in_packet, 0}};
+        UsbCommand c = {CMD_ICLASS_EML_MEMSET, {bytes_sent, bytes_in_packet, 0}, {{0}}};
         memcpy(c.d.asBytes, dump + bytes_sent, bytes_in_packet);
         clearCommandBuffer();
         SendCommand(&c);
@@ -833,7 +833,7 @@ void Calc_wb_mac(uint8_t blockno, uint8_t *data, uint8_t *div_key, uint8_t MAC[4
 
 static bool select_only(uint8_t *CSN, uint8_t *CCNR, bool use_credit_key, bool verbose) {
     UsbCommand resp;
-    UsbCommand c = {CMD_READER_ICLASS, {0}};
+    UsbCommand c = {CMD_READER_ICLASS, {0}, {{0}}};
     c.arg[0] = FLAG_ICLASS_READER_ONLY_ONCE | FLAG_ICLASS_READER_CC | FLAG_ICLASS_READER_ONE_TRY;
 
     if (use_credit_key)
@@ -884,7 +884,7 @@ static bool select_and_auth(uint8_t *KEY, uint8_t *MAC, uint8_t *div_key, bool u
 
     doMAC(CCNR, div_key, MAC);
     UsbCommand resp;
-    UsbCommand d = {CMD_ICLASS_AUTHENTICATION, {0, 0, 0}};
+    UsbCommand d = {CMD_ICLASS_AUTHENTICATION, {0, 0, 0}, {{0}}};
     memcpy(d.d.asBytes, MAC, 4);
     clearCommandBuffer();
     SendCommand(&d);
@@ -1004,7 +1004,7 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
                      FLAG_ICLASS_READER_ONE_TRY;
 
     //get config and first 3 blocks
-    UsbCommand c = {CMD_READER_ICLASS, {flags, 0, 0}};
+    UsbCommand c = {CMD_READER_ICLASS, {flags, 0, 0}, {{0}}};
     UsbCommand resp;
     uint8_t tag_data[255 * 8];
 
@@ -1046,7 +1046,7 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
     }
 
     // begin dump
-    UsbCommand w = {CMD_ICLASS_DUMP, {blockno, numblks - blockno + 1}};
+    UsbCommand w = {CMD_ICLASS_DUMP, {blockno, numblks - blockno + 1}, {{0}}};
     clearCommandBuffer();
     SendCommand(&w);
     while (true) {
@@ -1165,7 +1165,7 @@ static int WriteBlock(uint8_t blockno, uint8_t *bldata, uint8_t *KEY, bool use_c
     UsbCommand resp;
 
     Calc_wb_mac(blockno, bldata, div_key, MAC);
-    UsbCommand w = {CMD_ICLASS_WRITEBLOCK, {blockno}};
+    UsbCommand w = {CMD_ICLASS_WRITEBLOCK, {blockno}, {{0}}};
     memcpy(w.d.asBytes, bldata, 8);
     memcpy(w.d.asBytes + 8, MAC, 4);
 
@@ -1386,7 +1386,7 @@ int CmdHFiClassCloneTag(const char *Cmd) {
         return 0;
     }
 
-    UsbCommand w = {CMD_ICLASS_CLONE, {startblock, endblock}};
+    UsbCommand w = {CMD_ICLASS_CLONE, {startblock, endblock}, {{0}}};
     uint8_t *ptr;
     // calculate all mac for every the block we will write
     for (i = startblock; i <= endblock; i++) {
@@ -1433,7 +1433,7 @@ static int ReadBlock(uint8_t *KEY, uint8_t blockno, uint8_t keyType, bool elite,
     }
 
     UsbCommand resp;
-    UsbCommand c = {CMD_ICLASS_READBLOCK, {blockno}};
+    UsbCommand c = {CMD_ICLASS_READBLOCK, {blockno}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 4500)) {
@@ -2042,7 +2042,7 @@ int CmdHFiClassCheckKeys(const char *Cmd) {
         if (keys == keycnt - i)
             lastChunk = true;
 
-        UsbCommand c = {CMD_ICLASS_CHECK_KEYS, { (lastChunk << 8), keys, 0}};
+        UsbCommand c = {CMD_ICLASS_CHECK_KEYS, { (lastChunk << 8), keys, 0}, {{0}}};
 
         // bit 16
         //   - 1 indicates credit key
diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index 8f3925022..140123b53 100644
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -508,7 +508,7 @@ int CmdLegicRfSim(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) == 0 || cmdp == 'h') return usage_legic_sim();
 
-    UsbCommand c = {CMD_SIMULATE_TAG_LEGIC_RF, {1}};
+    UsbCommand c = {CMD_SIMULATE_TAG_LEGIC_RF, {1}, {{0}}};
     sscanf(Cmd, " %" SCNi64, &c.arg[0]);
     clearCommandBuffer();
     SendCommand(&c);
@@ -626,7 +626,7 @@ int CmdLegicRfWrite(const char *Cmd) {
 
     PrintAndLogEx(SUCCESS, "Writing to tag");
 
-    UsbCommand c = {CMD_WRITER_LEGIC_RF, {offset, len, IV}};
+    UsbCommand c = {CMD_WRITER_LEGIC_RF, {offset, len, IV}, {{0}}};
     memcpy(c.d.asBytes, data, len);
     UsbCommand resp;
     clearCommandBuffer();
@@ -740,7 +740,7 @@ int legic_read_mem(uint32_t offset, uint32_t len, uint32_t iv, uint8_t *out, uin
 
     legic_chk_iv(&iv);
 
-    UsbCommand c = {CMD_READER_LEGIC_RF, {offset, len, iv}};
+    UsbCommand c = {CMD_READER_LEGIC_RF, {offset, len, iv}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
@@ -794,7 +794,7 @@ int legic_get_type(legic_card_select_t *card) {
 
     if (card == NULL) return 1;
 
-    UsbCommand c = {CMD_LEGIC_INFO, {0, 0, 0}};
+    UsbCommand c = {CMD_LEGIC_INFO, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
@@ -821,7 +821,7 @@ void legic_chk_iv(uint32_t *iv) {
 }
 void legic_seteml(uint8_t *src, uint32_t offset, uint32_t numofbytes) {
 
-    UsbCommand c = {CMD_LEGIC_ESET, {0, 0, 0}};
+    UsbCommand c = {CMD_LEGIC_ESET, {0, 0, 0}, {{0}}};
     for (size_t i = offset; i < numofbytes; i += USB_CMD_DATA_SIZE) {
 
         size_t len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);
@@ -903,7 +903,7 @@ int CmdLegicDump(const char *Cmd) {
     legic_print_type(dumplen, 0);
     PrintAndLogEx(SUCCESS, "Reading tag memory %d b...", dumplen);
 
-    UsbCommand c = {CMD_READER_LEGIC_RF, {0x00, dumplen, 0x55}};
+    UsbCommand c = {CMD_READER_LEGIC_RF, {0x00, dumplen, 0x55}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
@@ -1052,7 +1052,7 @@ int CmdLegicRestore(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "Restoring to card");
 
     // transfer to device
-    UsbCommand c = {CMD_WRITER_LEGIC_RF, {0, 0, 0x55}};
+    UsbCommand c = {CMD_WRITER_LEGIC_RF, {0, 0, 0x55}, {{0}}};
     UsbCommand resp;
     for (size_t i = 7; i < numofbytes; i += USB_CMD_DATA_SIZE) {
 
@@ -1245,7 +1245,7 @@ int CmdLegicWipe(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "Erasing");
 
     // transfer to device
-    UsbCommand c = {CMD_WRITER_LEGIC_RF, {0, 0, 0x55}};
+    UsbCommand c = {CMD_WRITER_LEGIC_RF, {0, 0, 0x55}, {{0}}};
     UsbCommand resp;
     for (size_t i = 7; i < card.cardsize; i += USB_CMD_DATA_SIZE) {
 
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index c2727870a..39f8c2e73 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -409,7 +409,7 @@ static int usage_hf14_nack(void) {
 }
 
 int GetHFMF14AUID(uint8_t *uid, int *uidlen) {
-    UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT, 0, 0}};
+    UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
@@ -520,7 +520,7 @@ int CmdHF14AMfWrBl(const char *Cmd) {
     PrintAndLogEx(NORMAL, "--block no:%d, key type:%c, key:%s", blockNo, keyType ? 'B' : 'A', sprint_hex(key, 6));
     PrintAndLogEx(NORMAL, "--data: %s", sprint_hex(bldata, 16));
 
-    UsbCommand c = {CMD_MIFARE_WRITEBL, {blockNo, keyType, 0}};
+    UsbCommand c = {CMD_MIFARE_WRITEBL, {blockNo, keyType, 0}, {{0}}};
     memcpy(c.d.asBytes, key, 6);
     memcpy(c.d.asBytes + 10, bldata, 16);
     clearCommandBuffer();
@@ -566,7 +566,7 @@ int CmdHF14AMfRdBl(const char *Cmd) {
     }
     PrintAndLogEx(NORMAL, "--block no:%d, key type:%c, key:%s ", blockNo, keyType ? 'B' : 'A', sprint_hex(key, 6));
 
-    UsbCommand c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}};
+    UsbCommand c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}, {{0}}};
     memcpy(c.d.asBytes, key, 6);
     clearCommandBuffer();
     SendCommand(&c);
@@ -638,7 +638,7 @@ int CmdHF14AMfRdSc(const char *Cmd) {
     }
     PrintAndLogEx(NORMAL, "--sector no:%d key type:%c key:%s ", sectorNo, keyType ? 'B' : 'A', sprint_hex(key, 6));
 
-    UsbCommand c = {CMD_MIFARE_READSC, {sectorNo, keyType, 0}};
+    UsbCommand c = {CMD_MIFARE_READSC, {sectorNo, keyType, 0}, {{0}}};
     memcpy(c.d.asBytes, key, 6);
     clearCommandBuffer();
     SendCommand(&c);
@@ -803,7 +803,7 @@ int CmdHF14AMfDump(const char *Cmd) {
     for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
         for (tries = 0; tries < MIFARE_SECTOR_RETRY; tries++) {
 
-            UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 0, 0}};
+            UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 0, 0}, {{0}}};
             memcpy(c.d.asBytes, keyA[sectorNo], 6);
             clearCommandBuffer();
             SendCommand(&c);
@@ -840,7 +840,7 @@ int CmdHF14AMfDump(const char *Cmd) {
 
             for (tries = 0; tries < MIFARE_SECTOR_RETRY; tries++) {
                 if (blockNo == NumBlocksPerSector(sectorNo) - 1) { // sector trailer. At least the Access Conditions can always be read with key A.
-                    UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}};
+                    UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}, {{0}}};
                     memcpy(c.d.asBytes, keyA[sectorNo], 6);
                     clearCommandBuffer();
                     SendCommand(&c);
@@ -848,7 +848,7 @@ int CmdHF14AMfDump(const char *Cmd) {
                 } else {                                           // data block. Check if it can be read with key A or key B
                     uint8_t data_area = (sectorNo < 32) ? blockNo : blockNo / 5;
                     if ((rights[sectorNo][data_area] == 0x03) || (rights[sectorNo][data_area] == 0x05)) { // only key B would work
-                        UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 1, 0}};
+                        UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 1, 0}, {{0}}};
                         memcpy(c.d.asBytes, keyB[sectorNo], 6);
                         SendCommand(&c);
                         received = WaitForResponseTimeout(CMD_ACK, &resp, 1500);
@@ -857,7 +857,7 @@ int CmdHF14AMfDump(const char *Cmd) {
                         PrintAndLogEx(WARNING, "access rights do not allow reading of sector %2d block %3d", sectorNo, blockNo);
                         tries = MIFARE_SECTOR_RETRY;
                     } else {                                                                              // key A would work
-                        UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}};
+                        UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}, {{0}}};
                         memcpy(c.d.asBytes, keyA[sectorNo], 6);
                         clearCommandBuffer();
                         SendCommand(&c);
@@ -1019,7 +1019,7 @@ int CmdHF14AMfRestore(const char *Cmd) {
 
     for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
         for (blockNo = 0; blockNo < NumBlocksPerSector(sectorNo); blockNo++) {
-            UsbCommand c = {CMD_MIFARE_WRITEBL, {FirstBlockOfSector(sectorNo) + blockNo, keyType, 0}};
+            UsbCommand c = {CMD_MIFARE_WRITEBL, {FirstBlockOfSector(sectorNo) + blockNo, keyType, 0}, {{0}}};
             memcpy(c.d.asBytes, key, 6);
             bytes_read = fread(bldata, 1, 16, fdump);
             if (bytes_read != 16) {
@@ -1251,7 +1251,7 @@ int CmdHF14AMfNested(const char *Cmd) {
 
                 PrintAndLogEx(SUCCESS, "reading block %d", sectrail);
 
-                UsbCommand c = {CMD_MIFARE_READBL, {sectrail, 0, 0}};
+                UsbCommand c = {CMD_MIFARE_READBL, {sectrail, 0, 0}, {{0}}};
                 num_to_bytes(e_sector[i].Key[0], 6, c.d.asBytes); // KEY A
                 clearCommandBuffer();
                 SendCommand(&c);
@@ -1993,7 +1993,7 @@ int CmdHF14AMfChk(const char *Cmd) {
 
                 PrintAndLogEx(NORMAL, "Reading block %d", sectrail);
 
-                UsbCommand c = {CMD_MIFARE_READBL, {sectrail, 0, 0}};
+                UsbCommand c = {CMD_MIFARE_READBL, {sectrail, 0, 0}, {{0}}};
                 num_to_bytes(e_sector[i].Key[0], 6, c.d.asBytes); // KEY A
                 clearCommandBuffer();
                 SendCommand(&c);
@@ -2223,7 +2223,7 @@ int CmdHF14AMf1kSim(const char *Cmd) {
                   , flags
                   , flags);
 
-    UsbCommand c = {CMD_SIMULATE_MIFARE_CARD, {flags, exitAfterNReads, 0}};
+    UsbCommand c = {CMD_SIMULATE_MIFARE_CARD, {flags, exitAfterNReads, 0}, {{0}}};
     memcpy(c.d.asBytes, uid, sizeof(uid));
     clearCommandBuffer();
     SendCommand(&c);
@@ -2283,7 +2283,7 @@ int CmdHF14AMfSniff(const char *Cmd) {
     PrintAndLogEx(NORMAL, "Press the key on pc keyboard to abort the client.\n");
     PrintAndLogEx(NORMAL, "-------------------------------------------------------------------------\n");
 
-    UsbCommand c = {CMD_MIFARE_SNIFFER, {0, 0, 0}};
+    UsbCommand c = {CMD_MIFARE_SNIFFER, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
 
@@ -2414,7 +2414,7 @@ int CmdHF14AMfDbg(const char *Cmd) {
     uint8_t dbgMode = param_get8ex(Cmd, 0, 0, 10);
     if (dbgMode > 4) return usage_hf14_dbg();
 
-    UsbCommand c = {CMD_MIFARE_SET_DBGMODE, {dbgMode, 0, 0}};
+    UsbCommand c = {CMD_MIFARE_SET_DBGMODE, {dbgMode, 0, 0}, {{0}}};
     SendCommand(&c);
     return 0;
 }
@@ -2500,7 +2500,7 @@ int CmdHF14AMfEClear(const char *Cmd) {
     char c = tolower(param_getchar(Cmd, 0));
     if (c == 'h') return usage_hf14_eclr();
 
-    UsbCommand cmd = {CMD_MIFARE_EML_MEMCLR, {0, 0, 0}};
+    UsbCommand cmd = {CMD_MIFARE_EML_MEMCLR, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&cmd);
     return 0;
@@ -2685,7 +2685,7 @@ int CmdHF14AMfECFill(const char *Cmd) {
     numSectors = NumOfSectors(c);
 
     PrintAndLogEx(NORMAL, "--params: numSectors: %d, keyType: %c\n", numSectors, (keyType == 0) ? 'A' : 'B');
-    UsbCommand cmd = {CMD_MIFARE_EML_CARDLOAD, {numSectors, keyType, 0}};
+    UsbCommand cmd = {CMD_MIFARE_EML_CARDLOAD, {numSectors, keyType, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&cmd);
     return 0;
@@ -3147,7 +3147,7 @@ int CmdHf14AMfSetMod(const char *Cmd) {
         return 1;
     }
 
-    UsbCommand c = {CMD_MIFARE_SETMOD, {mod, 0, 0}};
+    UsbCommand c = {CMD_MIFARE_SETMOD, {mod, 0, 0}, {{0}}};
     memcpy(c.d.asBytes, key, 6);
     clearCommandBuffer();
     SendCommand(&c);
@@ -3248,7 +3248,7 @@ int CmdHF14AMfice(const char *Cmd) {
         flags = 0;
         flags |= initialize ? 0x0001 : 0;
         flags |= slow ? 0x0002 : 0;
-        UsbCommand c = {CMD_MIFARE_ACQUIRE_NONCES, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, flags}};
+        UsbCommand c = {CMD_MIFARE_ACQUIRE_NONCES, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, flags}, {{0}}};
         clearCommandBuffer();
         SendCommand(&c);
 
@@ -3281,7 +3281,7 @@ out:
         fclose(fnonces);
     }
 
-    UsbCommand c = {CMD_MIFARE_ACQUIRE_NONCES, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, 4}};
+    UsbCommand c = {CMD_MIFARE_ACQUIRE_NONCES, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, 4}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
diff --git a/client/cmdhfmfdes.c b/client/cmdhfmfdes.c
index db70477db..18e4b840a 100644
--- a/client/cmdhfmfdes.c
+++ b/client/cmdhfmfdes.c
@@ -51,7 +51,7 @@ int CmdHF14ADesWb(const char *Cmd) {
         PrintAndLogEx(NORMAL, "--block no:%02x key type:%02x key:%s", blockNo, keyType, sprint_hex(key, 6));
         PrintAndLogEx(NORMAL, "--data: %s", sprint_hex(bldata, 16));
 
-      UsbCommand c = {CMD_MIFARE_WRITEBL, {blockNo, keyType, 0}};
+      UsbCommand c = {CMD_MIFARE_WRITEBL, {blockNo, keyType, 0}, {{0}}};
         memcpy(c.d.asBytes, key, 6);
         memcpy(c.d.asBytes + 10, bldata, 16);
       SendCommand(&c);
@@ -94,7 +94,7 @@ int CmdHF14ADesRb(const char *Cmd) {
     // }
     // PrintAndLogEx(NORMAL, "--block no:%02x key type:%02x key:%s ", blockNo, keyType, sprint_hex(key, 6));
 
-    // UsbCommand c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}};
+    // UsbCommand c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}, {{0}}};
     // memcpy(c.d.asBytes, key, 6);
     // SendCommand(&c);
 
@@ -428,7 +428,7 @@ int CmdHF14ADesEnumApplications(const char *Cmd) {
     uint8_t aid[3];
     uint32_t options = (INIT | DISCONNECT);
 
-    UsbCommand c = {CMD_MIFARE_DESFIRE, {options, 0x01 }};
+    UsbCommand c = {CMD_MIFARE_DESFIRE, {options, 0x01 }, {{0}}};
     c.d.asBytes[0] = GET_APPLICATION_IDS;  //0x6a
 
     SendCommand(&c);
@@ -612,7 +612,7 @@ int CmdHF14ADesAuth(const char *Cmd) {
         return 1;
     }
     // algo, nyckell�ngd,
-    UsbCommand c = {CMD_MIFARE_DESFIRE_AUTH1, { cmdAuthMode, cmdAuthAlgo, cmdKeyNo }};
+    UsbCommand c = {CMD_MIFARE_DESFIRE_AUTH1, { cmdAuthMode, cmdAuthAlgo, cmdKeyNo }, {{0}}};
 
     c.d.asBytes[0] = keylength;
     memcpy(c.d.asBytes + 1, key, keylength);
diff --git a/client/cmdhfmfhard.c b/client/cmdhfmfhard.c
index dae915700..05cc87748 100644
--- a/client/cmdhfmfhard.c
+++ b/client/cmdhfmfhard.c
@@ -1383,7 +1383,7 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
         flags |= initialize ? 0x0001 : 0;
         flags |= slow ? 0x0002 : 0;
         flags |= field_off ? 0x0004 : 0;
-        UsbCommand c = {CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, flags}};
+        UsbCommand c = {CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, flags}, {{0}}};
         memcpy(c.d.asBytes, key, 6);
 
         clearCommandBuffer();
@@ -1394,7 +1394,7 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
         if (initialize) {
             if (!WaitForResponseTimeout(CMD_ACK, &resp, 3000)) {
                 //strange second call (iceman)
-                UsbCommand c1 = {CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, 4}};
+                UsbCommand c1 = {CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, 4}, {{0}}};
                 clearCommandBuffer();
                 SendCommand(&c1);
                 return 1;
diff --git a/client/cmdhfmfp.c b/client/cmdhfmfp.c
index a327fb91f..9425a3161 100644
--- a/client/cmdhfmfp.c
+++ b/client/cmdhfmfp.c
@@ -42,7 +42,7 @@ int CmdHFMFPInfo(const char *cmd) {
     CmdHF14AInfo("");
 
     // Mifare Plus info
-    UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};
+    UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}, {{0}}};
     SendCommand(&c);
 
     UsbCommand resp;
diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index 6af87bd69..4cdefa2ff 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -458,13 +458,13 @@ char *getUlev1CardSizeStr(uint8_t fsize) {
 }
 
 static void ul_switch_on_field(void) {
-    UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT | ISO14A_NO_RATS, 0, 0}};
+    UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT | ISO14A_NO_RATS, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
 }
 
 static int ul_send_cmd_raw(uint8_t *cmd, uint8_t cmdlen, uint8_t *response, uint16_t responseLength) {
-    UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_NO_DISCONNECT | ISO14A_APPEND_CRC | ISO14A_NO_RATS, cmdlen, 0}};
+    UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_NO_DISCONNECT | ISO14A_APPEND_CRC | ISO14A_NO_RATS, cmdlen, 0}, {{0}}};
     memcpy(c.d.asBytes, cmd, cmdlen);
     clearCommandBuffer();
     SendCommand(&c);
@@ -533,7 +533,7 @@ static int ulc_requestAuthentication(uint8_t *nonce, uint16_t nonceLength) {
 
 static int ulc_authentication(uint8_t *key, bool switch_off_field) {
 
-    UsbCommand c = {CMD_MIFAREUC_AUTH, {switch_off_field}};
+    UsbCommand c = {CMD_MIFAREUC_AUTH, {switch_off_field}, {{0}}};
     memcpy(c.d.asBytes, key, 16);
     clearCommandBuffer();
     SendCommand(&c);
@@ -621,7 +621,7 @@ static int ul_fudan_check(void) {
     if (!ul_select(&card))
         return UL_ERROR;
 
-    UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_NO_DISCONNECT | ISO14A_NO_RATS, 4, 0}};
+    UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_NO_DISCONNECT | ISO14A_NO_RATS, 4, 0}, {{0}}};
 
     uint8_t cmd[4] = {0x30, 0x00, 0x02, 0xa7}; //wrong crc on purpose  should be 0xa8
     memcpy(c.d.asBytes, cmd, 4);
@@ -1475,7 +1475,7 @@ int CmdHF14AMfUWrBl(const char *Cmd) {
         PrintAndLogEx(NORMAL, "Block: %0d (0x%02X) [ %s]", blockNo, blockNo, sprint_hex(blockdata, 4));
 
     //Send write Block
-    UsbCommand c = {CMD_MIFAREU_WRITEBL, {blockNo}};
+    UsbCommand c = {CMD_MIFAREU_WRITEBL, {blockNo}, {{0}}};
     memcpy(c.d.asBytes, blockdata, 4);
 
     if (hasAuthKey) {
@@ -1581,7 +1581,7 @@ int CmdHF14AMfURdBl(const char *Cmd) {
     if (swapEndian && hasPwdKey)  authKeyPtr = SwapEndian64(authenticationkey, 4, 4);
 
     //Read Block
-    UsbCommand c = {CMD_MIFAREU_READBL, {blockNo}};
+    UsbCommand c = {CMD_MIFAREU_READBL, {blockNo}, {{0}}};
     if (hasAuthKey) {
         c.arg[1] = 1;
         memcpy(c.d.asBytes, authKeyPtr, 16);
@@ -1846,7 +1846,7 @@ int CmdHF14AMfUDump(const char *Cmd) {
     }
     ul_print_type(tagtype, 0);
     PrintAndLogEx(SUCCESS, "Reading tag memory...");
-    UsbCommand c = {CMD_MIFAREU_READCARD, {startPage, pages}};
+    UsbCommand c = {CMD_MIFAREU_READCARD, {startPage, pages}, {{0}}};
     if (hasAuthKey) {
         if (tagtype & UL_C)
             c.arg[2] = 1; //UL_C auth
@@ -2010,7 +2010,7 @@ int CmdHF14AMfURestore(const char *Cmd) {
     bool read_key = false;
     size_t filelen = 0;
     FILE *f;
-    UsbCommand c = {CMD_MIFAREU_WRITEBL, {0, 0, 0}};
+    UsbCommand c = {CMD_MIFAREU_WRITEBL, {0, 0, 0}, {{0}}};
 
     memset(authkey, 0x00, sizeof(authkey));
 
@@ -2487,7 +2487,7 @@ int CmdHF14AMfuGenDiverseKeys(const char *Cmd) {
 
     if (cmdp == 'r') {
         // read uid from tag
-        UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0}};
+        UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0}, {{0}}};
         clearCommandBuffer();
         SendCommand(&c);
         UsbCommand resp;
@@ -2602,7 +2602,7 @@ int CmdHF14AMfuPwdGen(const char *Cmd) {
 
     if (cmdp == 'r') {
         // read uid from tag
-        UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0}};
+        UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0}, {{0}}};
         clearCommandBuffer();
         SendCommand(&c);
         UsbCommand resp;
diff --git a/client/cmdhftopaz.c b/client/cmdhftopaz.c
index 255451340..948c7c191 100644
--- a/client/cmdhftopaz.c
+++ b/client/cmdhftopaz.c
@@ -31,18 +31,18 @@ static struct {
 } topaz_tag;
 
 static void topaz_switch_on_field(void) {
-    UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_SELECT | ISO14A_NO_DISCONNECT | ISO14A_TOPAZMODE | ISO14A_NO_RATS, 0, 0}};
+    UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_SELECT | ISO14A_NO_DISCONNECT | ISO14A_TOPAZMODE | ISO14A_NO_RATS, 0, 0}, {{0}}};
     SendCommand(&c);
 }
 
 static void topaz_switch_off_field(void) {
-    UsbCommand c = {CMD_READER_ISO_14443a, {0, 0, 0}};
+    UsbCommand c = {CMD_READER_ISO_14443a, {0, 0, 0}, {{0}}};
     SendCommand(&c);
 }
 
 // send a raw topaz command, returns the length of the response (0 in case of error)
 static int topaz_send_cmd_raw(uint8_t *cmd, uint8_t len, uint8_t *response) {
-    UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_NO_DISCONNECT | ISO14A_TOPAZMODE | ISO14A_NO_RATS, len, 0}};
+    UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_NO_DISCONNECT | ISO14A_TOPAZMODE | ISO14A_NO_RATS, len, 0}, {{0}}};
     memcpy(c.d.asBytes, cmd, len);
     SendCommand(&c);
 
diff --git a/client/cmdhw.c b/client/cmdhw.c
index c02c6e45f..bbe254fb5 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -347,7 +347,7 @@ int CmdLCD(const char *Cmd) {
 }
 
 int CmdLCDReset(const char *Cmd) {
-    UsbCommand c = {CMD_LCD_RESET, {strtol(Cmd, NULL, 0), 0, 0}};
+    UsbCommand c = {CMD_LCD_RESET, {strtol(Cmd, NULL, 0), 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -355,7 +355,7 @@ int CmdLCDReset(const char *Cmd) {
 #endif
 
 int CmdReadmem(const char *Cmd) {
-    UsbCommand c = {CMD_READ_MEM, {strtol(Cmd, NULL, 0), 0, 0}};
+    UsbCommand c = {CMD_READ_MEM, {strtol(Cmd, NULL, 0), 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -374,7 +374,7 @@ int CmdReset(const char *Cmd) {
  * 600kHz.
  */
 int CmdSetDivisor(const char *Cmd) {
-    UsbCommand c = {CMD_SET_LF_DIVISOR, {strtol(Cmd, NULL, 0), 0, 0}};
+    UsbCommand c = {CMD_SET_LF_DIVISOR, {strtol(Cmd, NULL, 0), 0, 0}, {{0}}};
 
     if (c.arg[0] < 19 || c.arg[0] > 255) {
         PrintAndLogEx(NORMAL, "divisor must be between 19 and 255");
@@ -415,7 +415,7 @@ int CmdVersion(const char *Cmd) {
     if (silent)
         return 0;
 
-    UsbCommand c = {CMD_VERSION, {0, 0, 0}};
+    UsbCommand c = {CMD_VERSION, {0, 0, 0}, {{0}}};
     UsbCommand resp;
     clearCommandBuffer();
     SendCommand(&c);
diff --git a/client/cmdlf.c b/client/cmdlf.c
index 39efd9b33..71863cec3 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -144,7 +144,7 @@ static int usage_lf_find(void) {
 /* send a LF command before reading */
 int CmdLFCommandRead(const char *Cmd) {
 
-    UsbCommand c = {CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K, {0, 0, 0}};
+    UsbCommand c = {CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K, {0, 0, 0}, {{0}}};
     bool errors = false;
 
     uint8_t cmdp = 0;
@@ -334,7 +334,7 @@ int CmdLFSetConfig(const char *Cmd) {
 
 bool lf_read(bool silent, uint32_t samples) {
     if (IsOffline()) return false;
-    UsbCommand c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_125K, {silent, samples, 0}};
+    UsbCommand c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_125K, {silent, samples, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
 
@@ -390,7 +390,7 @@ int CmdLFSniff(const char *Cmd) {
     uint8_t cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_lf_sniff();
 
-    UsbCommand c = {CMD_LF_SNIFF_RAW_ADC_SAMPLES, {0, 0, 0}};
+    UsbCommand c = {CMD_LF_SNIFF_RAW_ADC_SAMPLES, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     WaitForResponse(CMD_ACK, NULL);
@@ -423,7 +423,7 @@ int CmdLFSim(const char *Cmd) {
 
     //can send only 512 bits at a time (1 byte sent per bit...)
     for (uint16_t i = 0; i < GraphTraceLen; i += USB_CMD_DATA_SIZE) {
-        UsbCommand c = {CMD_UPLOAD_SIM_SAMPLES_125K, {i, FPGA_LF, 0}};
+        UsbCommand c = {CMD_UPLOAD_SIM_SAMPLES_125K, {i, FPGA_LF, 0}, {{0}}};
 
         for (uint16_t j = 0; j < USB_CMD_DATA_SIZE; j++)
             c.d.asBytes[j] = GraphBuffer[i + j];
@@ -437,7 +437,7 @@ int CmdLFSim(const char *Cmd) {
 
     PrintAndLogEx(NORMAL, "Simulating");
 
-    UsbCommand c = {CMD_SIMULATE_TAG_125K, {GraphTraceLen, gap, 0}};
+    UsbCommand c = {CMD_SIMULATE_TAG_125K, {GraphTraceLen, gap, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -526,7 +526,7 @@ int CmdLFfskSim(const char *Cmd) {
         PrintAndLogEx(NORMAL, "DemodBuffer too long for current implementation - length: %d - max: %d", size, USB_CMD_DATA_SIZE);
         size = USB_CMD_DATA_SIZE;
     }
-    UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}};
+    UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}, {{0}}};
 
     memcpy(c.d.asBytes, DemodBuffer, size);
     clearCommandBuffer();
@@ -622,7 +622,7 @@ int CmdLFaskSim(const char *Cmd) {
     arg1 = clk << 8 | encoding;
     arg2 = invert << 8 | separator;
 
-    UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};
+    UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
     memcpy(c.d.asBytes, DemodBuffer, size);
     clearCommandBuffer();
     SendCommand(&c);
@@ -729,7 +729,7 @@ int CmdLFpskSim(const char *Cmd) {
         PrintAndLogEx(NORMAL, "DemodBuffer too long for current implementation - length: %d - max: %d", size, USB_CMD_DATA_SIZE);
         size = USB_CMD_DATA_SIZE;
     }
-    UsbCommand c = {CMD_PSK_SIM_TAG, {arg1, arg2, size}};
+    UsbCommand c = {CMD_PSK_SIM_TAG, {arg1, arg2, size}, {{0}}};
     PrintAndLogEx(DEBUG, "DEBUG: Sending DemodBuffer Length: %d", size);
     memcpy(c.d.asBytes, DemodBuffer, size);
     clearCommandBuffer();
@@ -742,7 +742,7 @@ int CmdLFSimBidir(const char *Cmd) {
     // Set ADC to twice the carrier for a slight supersampling
     // HACK: not implemented in ARMSRC.
     PrintAndLogEx(INFO, "Not implemented yet.");
-    UsbCommand c = {CMD_LF_SIMULATE_BIDIR, {47, 384, 0}};
+    UsbCommand c = {CMD_LF_SIMULATE_BIDIR, {47, 384, 0}, {{0}}};
     SendCommand(&c);
     return 0;
 }
diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c
index d039106d6..74dc2e302 100644
--- a/client/cmdlfawid.c
+++ b/client/cmdlfawid.c
@@ -87,7 +87,7 @@ static int usage_lf_awid_brute(void) {
 }
 
 static bool sendPing(void) {
-    UsbCommand ping = {CMD_PING, {1, 2, 3}};
+    UsbCommand ping = {CMD_PING, {1, 2, 3}, {{0}}};
     SendCommand(&ping);
     SendCommand(&ping);
     SendCommand(&ping);
@@ -112,7 +112,7 @@ static bool sendTry(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint32_t delay, ui
     uint64_t arg1 = (high << 8) + low;
     uint64_t arg2 = (invert << 8) + clk;
 
-    UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, bs_len}};
+    UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, bs_len}, {{0}}};
     memcpy(c.d.asBytes, bits, bs_len);
     clearCommandBuffer();
     SendCommand(&c);
@@ -230,7 +230,7 @@ int CmdAWIDRead_device(const char *Cmd) {
 
     if (Cmd[0] == 'h' || Cmd[0] == 'H') return usage_lf_awid_read();
     uint8_t findone = (Cmd[0] == '1') ? 1 : 0;
-    UsbCommand c = {CMD_AWID_DEMOD_FSK, {findone, 0, 0}};
+    UsbCommand c = {CMD_AWID_DEMOD_FSK, {findone, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -403,7 +403,7 @@ int CmdAWIDSim(const char *Cmd) {
     // arg1 --- fcHigh<<8 + fcLow
     // arg2 --- Inversion and clk setting
     // 96   --- Bitstream length: 96-bits == 12 bytes
-    UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}};
+    UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}, {{0}}};
     memcpy(c.d.asBytes, bits, size);
     clearCommandBuffer();
     SendCommand(&c);
@@ -446,7 +446,7 @@ int CmdAWIDClone(const char *Cmd) {
     print_blocks(blocks, 4);
 
     UsbCommand resp;
-    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}};
+    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
 
     for (uint8_t i = 0; i < 4; i++) {
         c.arg[0] = blocks[i];
diff --git a/client/cmdlfcotag.c b/client/cmdlfcotag.c
index ebe6fe1e0..838384e73 100644
--- a/client/cmdlfcotag.c
+++ b/client/cmdlfcotag.c
@@ -74,7 +74,7 @@ int CmdCOTAGRead(const char *Cmd) {
     uint32_t rawsignal = 1;
     sscanf(Cmd, "%u", &rawsignal);
 
-    UsbCommand c = {CMD_COTAG, {rawsignal, 0, 0}};
+    UsbCommand c = {CMD_COTAG, {rawsignal, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     if (!WaitForResponseTimeout(CMD_ACK, NULL, 7000)) {
diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index b00d326d9..55993e211 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -395,7 +395,7 @@ int CmdEM410xRead(const char *Cmd) {
 int CmdEM410xRead_device(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     uint8_t findone = (cmdp == '1') ? 1 : 0;
-    UsbCommand c = {CMD_EM410X_DEMOD, {findone, 0, 0}};
+    UsbCommand c = {CMD_EM410X_DEMOD, {findone, 0, 0}, {{0}}};
     SendCommand(&c);
     return 0;
 }
@@ -648,7 +648,7 @@ int CmdEM410xWrite(const char *Cmd) {
         return 0;
     }
 
-    UsbCommand c = {CMD_EM410X_WRITE_TAG, {card, (uint32_t)(id >> 32), (uint32_t)id}};
+    UsbCommand c = {CMD_EM410X_WRITE_TAG, {card, (uint32_t)(id >> 32), (uint32_t)id}, {{0}}};
     SendCommand(&c);
     return 0;
 }
@@ -1128,7 +1128,7 @@ bool demodEM4x05resp(uint32_t *word) {
 
 //////////////// 4205 / 4305 commands
 int EM4x05ReadWord_ext(uint8_t addr, uint32_t pwd, bool usePwd, uint32_t *word) {
-    UsbCommand c = {CMD_EM4X_READ_WORD, {addr, pwd, usePwd}};
+    UsbCommand c = {CMD_EM4X_READ_WORD, {addr, pwd, usePwd}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
@@ -1231,7 +1231,7 @@ int CmdEM4x05Write(const char *Cmd) {
 
     uint16_t flag = (addr << 8) | (usePwd);
 
-    UsbCommand c = {CMD_EM4X_WRITE_WORD, {flag, data, pwd}};
+    UsbCommand c = {CMD_EM4X_WRITE_WORD, {flag, data, pwd}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
diff --git a/client/cmdlffdx.c b/client/cmdlffdx.c
index dabe9c7ed..024b79f1e 100644
--- a/client/cmdlffdx.c
+++ b/client/cmdlffdx.c
@@ -345,7 +345,7 @@ int CmdFdxClone(const char *Cmd) {
     print_blocks(blocks, 5);
 
     UsbCommand resp;
-    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}};
+    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
 
     for (int i = 4; i >= 0; --i) {
         c.arg[0] = blocks[i];
@@ -381,7 +381,7 @@ int CmdFdxSim(const char *Cmd) {
 
     PrintAndLogEx(SUCCESS, "Simulating FDX-B animal ID: %04u-%"PRIu64, countryid, animalid);
 
-    UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};
+    UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
 
     //getFDXBits(uint64_t national_id, uint16_t country, uint8_t isanimal, uint8_t isextended, uint32_t extended, uint8_t *bits)
     getFDXBits(animalid, countryid, 1, 0, 0, c.d.asBytes);
diff --git a/client/cmdlfguard.c b/client/cmdlfguard.c
index a77a7d50f..33bcef7f4 100644
--- a/client/cmdlfguard.c
+++ b/client/cmdlfguard.c
@@ -295,7 +295,7 @@ int CmdGuardClone(const char *Cmd) {
     print_blocks(blocks, 4);
 
     UsbCommand resp;
-    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}};
+    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
 
     for (i = 0; i < 4; ++i) {
         c.arg[0] = blocks[i];
@@ -340,7 +340,7 @@ int CmdGuardSim(const char *Cmd) {
     arg1 = (clock1 << 8) | encoding;
     arg2 = (invert << 8) | separator;
 
-    UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};
+    UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
     memcpy(c.d.asBytes, bs, size);
     clearCommandBuffer();
     SendCommand(&c);
diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c
index cdd9b68cc..7c3b20266 100644
--- a/client/cmdlfhid.c
+++ b/client/cmdlfhid.c
@@ -92,7 +92,7 @@ static int usage_lf_hid_brute(void) {
 
 // sending three times.  Didn't seem to break the previous sim?
 static bool sendPing(void) {
-    UsbCommand ping = {CMD_PING, {1, 2, 3}};
+    UsbCommand ping = {CMD_PING, {1, 2, 3}, {{0}}};
     SendCommand(&ping);
     SendCommand(&ping);
     SendCommand(&ping);
@@ -112,7 +112,7 @@ static bool sendTry(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint32_t delay, ui
 
     uint64_t arg1 = bytebits_to_byte(bits, 32);
     uint64_t arg2 = bytebits_to_byte(bits + 32, 32);
-    UsbCommand c = {CMD_HID_SIM_TAG, {arg1, arg2, 0}};
+    UsbCommand c = {CMD_HID_SIM_TAG, {arg1, arg2, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
 
@@ -234,7 +234,7 @@ int CmdHIDRead_device(const char *Cmd) {
 
     if (Cmd[0] == 'h' || Cmd[0] == 'H') return usage_lf_hid_read();
     uint8_t findone = (Cmd[0] == '1') ? 1 : 0;
-    UsbCommand c = {CMD_HID_DEMOD_FSK, {findone, 0, 0}};
+    UsbCommand c = {CMD_HID_DEMOD_FSK, {findone, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -255,7 +255,7 @@ int CmdHIDSim(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "Simulating HID tag with ID %x%08x", hi, lo);
     PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation");
 
-    UsbCommand c = {CMD_HID_SIM_TAG, {hi, lo, 0}};
+    UsbCommand c = {CMD_HID_SIM_TAG, {hi, lo, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index 201316010..2381152a5 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -256,7 +256,7 @@ int CmdLFHitagSniff(const char *Cmd) {
     char ctmp = tolower(param_getchar(Cmd, 0));
     if (ctmp == 'h') return usage_hitag_sniff();
 
-    UsbCommand c = {CMD_SNIFF_HITAG, {0, 0, 0}};
+    UsbCommand c = {CMD_SNIFF_HITAG, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -273,7 +273,7 @@ int CmdLFHitagSim(const char *Cmd) {
     int res = 0;
     char filename[FILE_PATH_SIZE] = { 0x00 };
 
-    UsbCommand c = {CMD_SIMULATE_HITAG, {0, 0, 0}};
+    UsbCommand c = {CMD_SIMULATE_HITAG, {0, 0, 0}, {{0}}};
 
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
@@ -590,7 +590,7 @@ int CmdLFHitagReader(const char *Cmd) {
 
 int CmdLFHitagCheckChallenges(const char *Cmd) {
 
-    UsbCommand c = { CMD_TEST_HITAGS_TRACES, {0, 0, 0}};
+    UsbCommand c = { CMD_TEST_HITAGS_TRACES, {0, 0, 0}, {{0}}};
     char filename[FILE_PATH_SIZE] = { 0x00 };
     size_t datalen = 0;
     int res = 0;
@@ -639,7 +639,7 @@ int CmdLFHitagCheckChallenges(const char *Cmd) {
 }
 
 int CmdLFHitagWriter(const char *Cmd) {
-    UsbCommand c = { CMD_WR_HITAG_S, {0, 0, 0}};
+    UsbCommand c = { CMD_WR_HITAG_S, {0, 0, 0}, {{0}}};
     hitag_data *htd = (hitag_data *)c.d.asBytes;
     hitag_function htf = param_get32ex(Cmd, 0, 0, 10);
 
diff --git a/client/cmdlfindala.c b/client/cmdlfindala.c
index 43dbc5264..727184406 100644
--- a/client/cmdlfindala.c
+++ b/client/cmdlfindala.c
@@ -514,7 +514,7 @@ int CmdIndalaSim(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "Simulating Indala UID: %s",  sprint_hex(hexuid, len));
     PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation or run another command");
 
-    UsbCommand c = {CMD_PSK_SIM_TAG, {arg1, arg2, size}};
+    UsbCommand c = {CMD_PSK_SIM_TAG, {arg1, arg2, size}, {{0}}};
     memcpy(c.d.asBytes, bits, size);
     clearCommandBuffer();
     SendCommand(&c);
@@ -548,7 +548,7 @@ int CmdIndalaClone(const char *Cmd) {
     CLIGetHexWithReturn(2, data, &datalen);
     CLIParserFree();
 
-    UsbCommand c = {0, {0, 0, 0}};
+    UsbCommand c = {0, {0, 0, 0}, {{0}}};
 
     if (isLongUid) {
         PrintAndLogEx(INFO, "Preparing to clone Indala 224bit tag with RawID %s", sprint_hex(data, datalen));
diff --git a/client/cmdlfio.c b/client/cmdlfio.c
index d99cc818e..9db05ef99 100644
--- a/client/cmdlfio.c
+++ b/client/cmdlfio.c
@@ -71,7 +71,7 @@ int CmdIOProxRead(const char *Cmd) {
 int CmdIOProxRead_device(const char *Cmd) {
     if (Cmd[0] == 'h' || Cmd[0] == 'H') return usage_lf_io_read();
     int findone = (Cmd[0] == '1') ? 1 : 0;
-    UsbCommand c = {CMD_IO_DEMOD_FSK, {findone, 0, 0}};
+    UsbCommand c = {CMD_IO_DEMOD_FSK, {findone, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -282,7 +282,7 @@ int CmdIOProxSim(const char *Cmd) {
     // arg1 --- fcHigh<<8 + fcLow
     // arg2 --- Invert and clk setting
     // size --- 64 bits == 8 bytes
-    UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}};
+    UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}, {{0}}};
     memcpy(c.d.asBytes, bits, size);
     clearCommandBuffer();
     SendCommand(&c);
@@ -325,8 +325,8 @@ int CmdIOProxClone(const char *Cmd) {
     PrintAndLogEx(INFO, "Preparing to clone IOProx to T55x7 with Version: %u FC: %u, CN: %u", version, fc, cn);
     print_blocks(blocks, 3);
 
-    //UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
-    UsbCommand c = {CMD_IO_CLONE_TAG, {blocks[1], blocks[2], 0}};
+    //UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}, {{0}}};
+    UsbCommand c = {CMD_IO_CLONE_TAG, {blocks[1], blocks[2], 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
diff --git a/client/cmdlfjablotron.c b/client/cmdlfjablotron.c
index 4a489a5f3..621ff323b 100644
--- a/client/cmdlfjablotron.c
+++ b/client/cmdlfjablotron.c
@@ -186,7 +186,7 @@ int CmdJablotronClone(const char *Cmd) {
     print_blocks(blocks, 3);
 
     UsbCommand resp;
-    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}};
+    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
 
     for (uint8_t i = 0; i < 3; i++) {
         c.arg[0] = blocks[i];
@@ -223,7 +223,7 @@ int CmdJablotronSim(const char *Cmd) {
 
     PrintAndLogEx(SUCCESS, "Simulating Jablotron - FullCode: %"PRIx64, fullcode);
 
-    UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};
+    UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
     getJablotronBits(fullcode, c.d.asBytes);
     clearCommandBuffer();
     SendCommand(&c);
diff --git a/client/cmdlfkeri.c b/client/cmdlfkeri.c
index bdbc67c5d..e4516e127 100644
--- a/client/cmdlfkeri.c
+++ b/client/cmdlfkeri.c
@@ -172,7 +172,7 @@ int CmdKeriClone(const char *Cmd) {
 
 
     UsbCommand resp;
-    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}};
+    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
 
 
     for (uint8_t i = 0; i < 3; i++) {
@@ -214,7 +214,7 @@ int CmdKeriSim(const char *Cmd) {
 
     PrintAndLogEx(SUCCESS, "Simulating KERI - Internal Id: %u", internalid);
 
-    UsbCommand c = {CMD_PSK_SIM_TAG, {arg1, arg2, size}};
+    UsbCommand c = {CMD_PSK_SIM_TAG, {arg1, arg2, size}, {{0}}};
     memcpy(c.d.asBytes, bits, size);
     clearCommandBuffer();
     SendCommand(&c);
diff --git a/client/cmdlfnedap.c b/client/cmdlfnedap.c
index 521fa4117..994d44b9e 100644
--- a/client/cmdlfnedap.c
+++ b/client/cmdlfnedap.c
@@ -275,7 +275,7 @@ int CmdLFNedapClone(const char *Cmd) {
     print_blocks(blocks, 5);
 
     UsbCommand resp;
-    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
+    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}, {{0}}};
 
     for (uint8_t i = 0; i<5; ++i ) {
         c.arg[0] = blocks[i];
@@ -320,7 +320,7 @@ int CmdLFNedapSim(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "bin  %s", sprint_bin_break(bs, 128, 32));
     PrintAndLogEx(SUCCESS, "Simulating Nedap - CardNumber: %u", cardnumber);
 
-    UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};
+    UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
     memcpy(c.d.asBytes, bs, size);
     clearCommandBuffer();
     SendCommand(&c);
diff --git a/client/cmdlfnoralsy.c b/client/cmdlfnoralsy.c
index a882c57ed..d306538da 100644
--- a/client/cmdlfnoralsy.c
+++ b/client/cmdlfnoralsy.c
@@ -207,7 +207,7 @@ int CmdNoralsyClone(const char *Cmd) {
     print_blocks(blocks, 4);
 
     UsbCommand resp;
-    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}};
+    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
 
     for (uint8_t i = 0; i < 4; i++) {
         c.arg[0] = blocks[i];
@@ -250,7 +250,7 @@ int CmdNoralsySim(const char *Cmd) {
 
     PrintAndLogEx(SUCCESS, "Simulating Noralsy - CardId: %u", id);
 
-    UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};
+    UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
     memcpy(c.d.asBytes, bs, size);
     clearCommandBuffer();
     SendCommand(&c);
diff --git a/client/cmdlfparadox.c b/client/cmdlfparadox.c
index 0776ffae6..ea247ecfa 100644
--- a/client/cmdlfparadox.c
+++ b/client/cmdlfparadox.c
@@ -175,7 +175,7 @@ int CmdParadoxSim(const char *Cmd) {
 
     PrintAndLogEx(NORMAL, "Simulating Paradox - Facility Code: %u, CardNumber: %u", facilitycode, cardnumber);
 
-    UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}};
+    UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}, {{0}}};
     memcpy(c.d.asBytes, bs, size);
     clearCommandBuffer();
     SendCommand(&c);
diff --git a/client/cmdlfpcf7931.c b/client/cmdlfpcf7931.c
index 68ecfc8e8..0cca54209 100644
--- a/client/cmdlfpcf7931.c
+++ b/client/cmdlfpcf7931.c
@@ -100,7 +100,7 @@ int CmdLFPCF7931Read(const char *Cmd) {
     if (ctmp == 'H' || ctmp == 'h') return usage_pcf7931_read();
 
     UsbCommand resp;
-    UsbCommand c = {CMD_PCF7931_READ, {0, 0, 0}};
+    UsbCommand c = {CMD_PCF7931_READ, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
diff --git a/client/cmdlfpresco.c b/client/cmdlfpresco.c
index 5bb7beb27..77a217bf7 100644
--- a/client/cmdlfpresco.c
+++ b/client/cmdlfpresco.c
@@ -205,7 +205,7 @@ int CmdPrescoClone(const char *Cmd) {
     print_blocks(blocks, 5);
 
     UsbCommand resp;
-    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}};
+    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
 
     for (uint8_t i = 0; i < 5; i++) {
         c.arg[0] = blocks[i];
@@ -236,7 +236,7 @@ int CmdPrescoSim(const char *Cmd) {
 
     PrintAndLogEx(SUCCESS, "Simulating Presco - SiteCode: %u, UserCode: %u, FullCode: %08X", sitecode, usercode, fullcode);
 
-    UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};
+    UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
     GetPrescoBits(fullcode, c.d.asBytes);
     clearCommandBuffer();
     SendCommand(&c);
diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c
index d60366430..6a8152f9a 100644
--- a/client/cmdlfpyramid.c
+++ b/client/cmdlfpyramid.c
@@ -290,7 +290,7 @@ int CmdPyramidClone(const char *Cmd) {
     print_blocks(blocks, 5);
 
     UsbCommand resp;
-    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}};
+    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
 
     for (uint8_t i = 0; i < 5; ++i) {
         c.arg[0] = blocks[i];
@@ -334,7 +334,7 @@ int CmdPyramidSim(const char *Cmd) {
 
     PrintAndLogEx(SUCCESS, "Simulating Farpointe/Pyramid - Facility Code: %u, CardNumber: %u", facilitycode, cardnumber);
 
-    UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}};
+    UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}, {{0}}};
     memcpy(c.d.asBytes, bs, size);
     clearCommandBuffer();
     SendCommand(&c);
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index bd23716ce..3b001bed4 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1012,7 +1012,7 @@ int CmdT55xxWakeUp(const char *Cmd) {
     }
     if (errors) return usage_t55xx_wakup();
 
-    UsbCommand c = {CMD_T55XX_WAKEUP, {password, 0, 0}};
+    UsbCommand c = {CMD_T55XX_WAKEUP, {password, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     PrintAndLogEx(SUCCESS, "Wake up command sent. Try read now");
@@ -1068,7 +1068,7 @@ int CmdT55xxWriteBlock(const char *Cmd) {
         return 0;
     }
 
-    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {data, block, 0}};
+    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {data, block, 0}, {{0}}};
     UsbCommand resp;
     c.d.asBytes[0] = (page1) ? 0x2 : 0;
     c.d.asBytes[0] |= (testMode) ? 0x4 : 0;
@@ -1503,7 +1503,7 @@ bool AquireData(uint8_t page, uint8_t block, bool pwdmode, uint32_t password) {
     // arg1: which block to read
     // arg2: password
     uint8_t arg0 = (page << 1 | (pwdmode));
-    UsbCommand c = {CMD_T55XX_READ_BLOCK, {arg0, block, password}};
+    UsbCommand c = {CMD_T55XX_READ_BLOCK, {arg0, block, password}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     if (!WaitForResponseTimeout(CMD_ACK, NULL, 2500)) {
@@ -1763,7 +1763,7 @@ void t55x7_create_config_block(int tagtype) {
 
 int CmdResetRead(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
-    UsbCommand c = {CMD_T55XX_RESET_READ, {0, 0, 0}};
+    UsbCommand c = {CMD_T55XX_RESET_READ, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     if (!WaitForResponseTimeout(CMD_ACK, NULL, 2500)) {
diff --git a/client/cmdlfviking.c b/client/cmdlfviking.c
index b4ddcab67..2f4dea8eb 100644
--- a/client/cmdlfviking.c
+++ b/client/cmdlfviking.c
@@ -120,7 +120,7 @@ int CmdVikingClone(const char *Cmd) {
 
     PrintAndLogEx(INFO, "Preparing to clone Viking tag - ID: %08X, Raw: %08X%08X", id, (uint32_t)(rawID >> 32), (uint32_t)(rawID & 0xFFFFFFFF));
 
-    UsbCommand c = {CMD_VIKING_CLONE_TAG, {rawID >> 32, rawID & 0xFFFFFFFF, Q5}};
+    UsbCommand c = {CMD_VIKING_CLONE_TAG, {rawID >> 32, rawID & 0xFFFFFFFF, Q5}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
@@ -151,7 +151,7 @@ int CmdVikingSim(const char *Cmd) {
 
     PrintAndLogEx(SUCCESS, "Simulating Viking - ID: %08X, Raw: %08X%08X", id, (uint32_t)(rawID >> 32), (uint32_t)(rawID & 0xFFFFFFFF));
 
-    UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};
+    UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
     num_to_bytebits(rawID, size, c.d.asBytes);
     clearCommandBuffer();
     SendCommand(&c);
diff --git a/client/cmdlfvisa2000.c b/client/cmdlfvisa2000.c
index fb08cd7ae..9dfad9a40 100644
--- a/client/cmdlfvisa2000.c
+++ b/client/cmdlfvisa2000.c
@@ -180,7 +180,7 @@ int CmdVisa2kClone(const char *Cmd) {
     print_blocks(blocks, 4);
 
     UsbCommand resp;
-    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}};
+    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
 
     for (uint8_t i = 0; i < 4; i++) {
         c.arg[0] = blocks[i];
@@ -211,7 +211,7 @@ int CmdVisa2kSim(const char *Cmd) {
 
     PrintAndLogEx(SUCCESS, "Simulating Visa2000 - CardId: %u", id);
 
-    UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};
+    UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
 
     uint32_t blocks[3] = { BL0CK1, id, (visa_parity(id) << 4) | visa_chksum(id) };
 
diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index fa39abe75..c424d6684 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -312,7 +312,7 @@ bool smart_select(bool silent, smart_card_atr_t *atr) {
     if (atr)
         memset(atr, 0, sizeof(smart_card_atr_t));
 
-    UsbCommand c = {CMD_SMART_ATR, {0, 0, 0}};
+    UsbCommand c = {CMD_SMART_ATR, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
@@ -378,7 +378,7 @@ static int smart_responseEx(uint8_t *data, bool silent) {
         int len = data[datalen - 1];
         if (!silent) PrintAndLogEx(INFO, "Requesting 0x%02X bytes response", len);
         uint8_t getstatus[] = {0x00, ISO7816_GET_RESPONSE, 0x00, 0x00, len};
-        UsbCommand cStatus = {CMD_SMART_RAW, {SC_RAW, sizeof(getstatus), 0}};
+        UsbCommand cStatus = {CMD_SMART_RAW, {SC_RAW, sizeof(getstatus), 0}, {{0}}};
         memcpy(cStatus.d.asBytes, getstatus, sizeof(getstatus));
         clearCommandBuffer();
         SendCommand(&cStatus);
@@ -485,7 +485,7 @@ int CmdSmartRaw(const char *Cmd) {
 
     // arg0 = RFU flags
     // arg1 = length
-    UsbCommand c = {CMD_SMART_RAW, {0, hexlen, 0}};
+    UsbCommand c = {CMD_SMART_RAW, {0, hexlen, 0}, {{0}}};
 
     if (active || active_select) {
         c.arg[0] |= SC_CONNECT;
@@ -544,7 +544,7 @@ int ExchangeAPDUSC(uint8_t *datain, int datainlen, bool activateCard, bool leave
 
     PrintAndLogEx(DEBUG, "APDU SC");
 
-    UsbCommand c = {CMD_SMART_RAW, {SC_RAW_T0, datainlen, 0}};
+    UsbCommand c = {CMD_SMART_RAW, {SC_RAW_T0, datainlen, 0}, {{0}}};
     if (activateCard) {
         c.arg[0] |= SC_SELECT | SC_CONNECT;
     }
@@ -560,7 +560,7 @@ int ExchangeAPDUSC(uint8_t *datain, int datainlen, bool activateCard, bool leave
 
     // retry
     if (len > 1 && dataout[len - 2] == 0x6c && datainlen > 4) {
-        UsbCommand c2 = {CMD_SMART_RAW, {SC_RAW_T0, datainlen, 0}};
+        UsbCommand c2 = {CMD_SMART_RAW, {SC_RAW_T0, datainlen, 0}, {{0}}};
         memcpy(c2.d.asBytes, datain, 5);
 
         // transfer length via T=0
@@ -723,7 +723,7 @@ int CmdSmartUpgrade(const char *Cmd) {
 
     while (bytes_remaining > 0) {
         uint32_t bytes_in_packet = MIN(USB_CMD_DATA_SIZE, bytes_remaining);
-        UsbCommand c = {CMD_SMART_UPLOAD, {index + bytes_sent, bytes_in_packet, 0}};
+        UsbCommand c = {CMD_SMART_UPLOAD, {index + bytes_sent, bytes_in_packet, 0}, {{0}}};
 
         // Fill usb bytes with 0xFF
         memset(c.d.asBytes, 0xFF, USB_CMD_DATA_SIZE);
@@ -746,7 +746,7 @@ int CmdSmartUpgrade(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "Sim module firmware updating,  don\'t turn off your PM3!");
 
     // trigger the firmware upgrade
-    UsbCommand c = {CMD_SMART_UPGRADE, {firmware_size, 0, 0}};
+    UsbCommand c = {CMD_SMART_UPGRADE, {firmware_size, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
@@ -785,7 +785,7 @@ int CmdSmartInfo(const char *Cmd) {
     //Validations
     if (errors) return usage_sm_info();
 
-    UsbCommand c = {CMD_SMART_ATR, {0, 0, 0}};
+    UsbCommand c = {CMD_SMART_ATR, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
@@ -860,7 +860,7 @@ int CmdSmartReader(const char *Cmd) {
     //Validations
     if (errors) return usage_sm_reader();
 
-    UsbCommand c = {CMD_SMART_ATR, {0, 0, 0}};
+    UsbCommand c = {CMD_SMART_ATR, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
@@ -906,7 +906,7 @@ int CmdSmartSetClock(const char *Cmd) {
     //Validations
     if (errors || cmdp == 0) return usage_sm_setclock();
 
-    UsbCommand c = {CMD_SMART_SETCLOCK, {clock1, 0, 0}};
+    UsbCommand c = {CMD_SMART_SETCLOCK, {clock1, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
@@ -958,7 +958,7 @@ static void smart_brute_prim() {
 
     PrintAndLogEx(INFO, "Reading primitives");
 
-    UsbCommand c = {CMD_SMART_RAW, {SC_RAW_T0, 5, 0}};
+    UsbCommand c = {CMD_SMART_RAW, {SC_RAW_T0, 5, 0}, {{0}}};
 
     for (int i = 0; i < sizeof(get_card_data); i += 5) {
 
@@ -988,7 +988,7 @@ static int smart_brute_sfi(bool decodeTLV) {
     int len;
     // READ RECORD
     uint8_t READ_RECORD[] = {0x00, 0xB2, 0x00, 0x00, 0x00};
-    UsbCommand c = {CMD_SMART_RAW, {SC_RAW_T0, sizeof(READ_RECORD), 0}};
+    UsbCommand c = {CMD_SMART_RAW, {SC_RAW_T0, sizeof(READ_RECORD), 0}, {{0}}};
 
     PrintAndLogEx(INFO, "Start SFI brute forcing");
 
@@ -1055,7 +1055,7 @@ static void smart_brute_options(bool decodeTLV) {
     uint8_t GET_PROCESSING_OPTIONS[] = {0x80, 0xA8, 0x00, 0x00, 0x02, 0x83, 0x00, 0x00};
 
     // Get processing options command
-    UsbCommand c = {CMD_SMART_RAW, {SC_RAW_T0, sizeof(GET_PROCESSING_OPTIONS), 0}};
+    UsbCommand c = {CMD_SMART_RAW, {SC_RAW_T0, sizeof(GET_PROCESSING_OPTIONS), 0}, {{0}}};
     memcpy(c.d.asBytes, GET_PROCESSING_OPTIONS, sizeof(GET_PROCESSING_OPTIONS));
     clearCommandBuffer();
     SendCommand(&c);
@@ -1112,7 +1112,7 @@ int CmdSmartBruteforceSFI(const char *Cmd) {
 //  uint8_t VERIFY[] = {0x00, 0x20, 0x00, 0x80};
 
     // Select AID command
-    UsbCommand cAid = {CMD_SMART_RAW, {SC_RAW_T0, 0, 0}};
+    UsbCommand cAid = {CMD_SMART_RAW, {SC_RAW_T0, 0, 0}, {{0}}};
 
     PrintAndLogEx(INFO, "Importing AID list");
     json_t *root = NULL;
diff --git a/client/comms.c b/client/comms.c
index 70da8fe9d..cf8aac7f0 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -449,22 +449,22 @@ bool GetFromDevice(DeviceMemType_t memtype, uint8_t *dest, uint32_t bytes, uint3
 
     switch (memtype) {
         case BIG_BUF: {
-            UsbCommand c = {CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K, {start_index, bytes, 0}};
+            UsbCommand c = {CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K, {start_index, bytes, 0}, {{0}}};
             SendCommand(&c);
             return dl_it(dest, bytes, start_index, response, ms_timeout, show_warning, CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K);
         }
         case BIG_BUF_EML: {
-            UsbCommand c = {CMD_DOWNLOAD_EML_BIGBUF, {start_index, bytes, 0}};
+            UsbCommand c = {CMD_DOWNLOAD_EML_BIGBUF, {start_index, bytes, 0}, {{0}}};
             SendCommand(&c);
             return dl_it(dest, bytes, start_index, response, ms_timeout, show_warning, CMD_DOWNLOADED_EML_BIGBUF);
         }
         case FLASH_MEM: {
-            UsbCommand c = {CMD_FLASHMEM_DOWNLOAD, {start_index, bytes, 0}};
+            UsbCommand c = {CMD_FLASHMEM_DOWNLOAD, {start_index, bytes, 0}, {{0}}};
             SendCommand(&c);
             return dl_it(dest, bytes, start_index, response, ms_timeout, show_warning, CMD_FLASHMEM_DOWNLOADED);
         }
         case SIM_MEM: {
-            //UsbCommand c = {CMD_DOWNLOAD_SIM_MEM, {start_index, bytes, 0}};
+            //UsbCommand c = {CMD_DOWNLOAD_SIM_MEM, {start_index, bytes, 0}, {{0}}};
             //SendCommand(&c);
             //return dl_it(dest, bytes, start_index, response, ms_timeout, show_warning, CMD_DOWNLOADED_SIMMEM);
             return false;
diff --git a/client/mifare/mifarehost.c b/client/mifare/mifarehost.c
index 5b1fa7300..b02c3e883 100644
--- a/client/mifare/mifarehost.c
+++ b/client/mifare/mifarehost.c
@@ -16,7 +16,7 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
     uint64_t par_list = 0, ks_list = 0;
     uint64_t *keylist = NULL, *last_keylist = NULL;
 
-    UsbCommand c = {CMD_READER_MIFARE, {true, blockno, key_type}};
+    UsbCommand c = {CMD_READER_MIFARE, {true, blockno, key_type}, {{0}}};
 
     // message
     PrintAndLogEx(NORMAL, "--------------------------------------------------------------------------------\n");
@@ -123,7 +123,7 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
 }
 int mfCheckKeys(uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t keycnt, uint8_t *keyBlock, uint64_t *key) {
     *key = -1;
-    UsbCommand c = {CMD_MIFARE_CHKKEYS, { (blockNo | (keyType << 8)), clear_trace, keycnt}};
+    UsbCommand c = {CMD_MIFARE_CHKKEYS, { (blockNo | (keyType << 8)), clear_trace, keycnt}, {{0}}};
     memcpy(c.d.asBytes, keyBlock, 6 * keycnt);
     clearCommandBuffer();
     SendCommand(&c);
@@ -145,7 +145,7 @@ int mfCheckKeys_fast(uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk,
     uint32_t timeout = 0;
 
     // send keychunk
-    UsbCommand c = {CMD_MIFARE_CHKKEYS_FAST, { (sectorsCnt | (firstChunk << 8) | (lastChunk << 12)), ((use_flashmemory << 8) | strategy), size}};
+    UsbCommand c = {CMD_MIFARE_CHKKEYS_FAST, { (sectorsCnt | (firstChunk << 8) | (lastChunk << 12)), ((use_flashmemory << 8) | strategy), size}, {{0}}};
     memcpy(c.d.asBytes, keyBlock, 6 * size);
     clearCommandBuffer();
     SendCommand(&c);
@@ -297,7 +297,7 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo,
     StateList_t statelists[2];
     struct Crypto1State *p1, *p2, *p3, *p4;
 
-    UsbCommand c = {CMD_MIFARE_NESTED, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, calibrate}};
+    UsbCommand c = {CMD_MIFARE_NESTED, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, calibrate}, {{0}}};
     memcpy(c.d.asBytes, key, 6);
     clearCommandBuffer();
     SendCommand(&c);
@@ -419,7 +419,7 @@ out:
 // MIFARE
 int mfReadSector(uint8_t sectorNo, uint8_t keyType, uint8_t *key, uint8_t *data) {
 
-    UsbCommand c = {CMD_MIFARE_READSC, {sectorNo, keyType, 0}};
+    UsbCommand c = {CMD_MIFARE_READSC, {sectorNo, keyType, 0}, {{0}}};
     memcpy(c.d.asBytes, key, 6);
     clearCommandBuffer();
     SendCommand(&c);
@@ -444,7 +444,7 @@ int mfReadSector(uint8_t sectorNo, uint8_t keyType, uint8_t *key, uint8_t *data)
 
 // EMULATOR
 int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount) {
-    UsbCommand c = {CMD_MIFARE_EML_MEMGET, {blockNum, blocksCount, 0}};
+    UsbCommand c = {CMD_MIFARE_EML_MEMGET, {blockNum, blocksCount, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
@@ -458,7 +458,7 @@ int mfEmlSetMem(uint8_t *data, int blockNum, int blocksCount) {
 }
 
 int mfEmlSetMem_xt(uint8_t *data, int blockNum, int blocksCount, int blockBtWidth) {
-    UsbCommand c = {CMD_MIFARE_EML_MEMSET, {blockNum, blocksCount, blockBtWidth}};
+    UsbCommand c = {CMD_MIFARE_EML_MEMSET, {blockNum, blocksCount, blockBtWidth}, {{0}}};
     memcpy(c.d.asBytes, data, blocksCount * blockBtWidth);
     clearCommandBuffer();
     SendCommand(&c);
@@ -501,7 +501,7 @@ int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, uint8_
 
 int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, uint8_t params) {
 
-    UsbCommand c = {CMD_MIFARE_CSETBLOCK, {params, blockNo, 0}};
+    UsbCommand c = {CMD_MIFARE_CSETBLOCK, {params, blockNo, 0}, {{0}}};
     memcpy(c.d.asBytes, data, 16);
     clearCommandBuffer();
     SendCommand(&c);
@@ -520,7 +520,7 @@ int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, uint8_t params) {
 }
 
 int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params) {
-    UsbCommand c = {CMD_MIFARE_CGETBLOCK, {params, blockNo, 0}};
+    UsbCommand c = {CMD_MIFARE_CGETBLOCK, {params, blockNo, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
@@ -873,7 +873,7 @@ int detect_classic_prng(void) {
     uint8_t cmd[] = {MIFARE_AUTH_KEYA, 0x00};
     uint32_t flags = ISO14A_CONNECT | ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_RATS;
 
-    UsbCommand c = {CMD_READER_ISO_14443a, {flags, sizeof(cmd), 0}};
+    UsbCommand c = {CMD_READER_ISO_14443a, {flags, sizeof(cmd), 0}, {{0}}};
     memcpy(c.d.asBytes, cmd, sizeof(cmd));
 
     clearCommandBuffer();
@@ -913,7 +913,7 @@ returns:
 */
 int detect_classic_nackbug(bool verbose) {
 
-    UsbCommand c = {CMD_MIFARE_NACK_DETECT, {0, 0, 0}};
+    UsbCommand c = {CMD_MIFARE_NACK_DETECT, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
@@ -999,7 +999,7 @@ void detect_classic_magic(void) {
 
     uint8_t isGeneration = 0;
     UsbCommand resp;
-    UsbCommand c = {CMD_MIFARE_CIDENT, {0, 0, 0}};
+    UsbCommand c = {CMD_MIFARE_CIDENT, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500))
diff --git a/client/scripting.c b/client/scripting.c
index ed692c728..795e94711 100644
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -262,7 +262,7 @@ static int l_foobar(lua_State *L) {
     printf("Arguments discarded, stack now contains %d elements", lua_gettop(L));
 
     // todo: this is not used, where was it intended for?
-    // UsbCommand response =  {CMD_MIFARE_READBL, {1337, 1338, 1339}};
+    // UsbCommand response =  {CMD_MIFARE_READBL, {1337, 1338, 1339}, {{0}}};
 
     printf("Now returning a uint64_t as a string");
     uint64_t x = 0xDEADC0DE;

From 919cfb584113f98c9a8adcfa842b03bf16c79054 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 10 Apr 2019 15:00:55 +0200
Subject: [PATCH 1179/1938] more [-Wmissing-field-initializers]

---
 client/cmdhf.c        |  2 +-
 client/cmdhffelica.c  |  2 +-
 client/cmdhficlass.c  |  6 +++---
 client/cmdhfmfdes.c   |  4 ++--
 client/cmdhfmfu.c     |  4 ++--
 client/cmdhw.c        | 14 +++++++-------
 client/cmdlf.c        |  2 +-
 client/cmdlfhid.c     |  2 +-
 client/cmdlfhitag.c   |  4 ++--
 client/cmdlfpcf7931.c |  2 +-
 client/cmdlft55xx.c   |  4 ++--
 11 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/client/cmdhf.c b/client/cmdhf.c
index 7d1fa2668..4c9579f1f 100644
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -90,7 +90,7 @@ int CmdHFSearch(const char *Cmd) {
 int CmdHFTune(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     PrintAndLogEx(SUCCESS, "Measuring HF antenna, press button to exit");
-    UsbCommand c = {CMD_MEASURE_ANTENNA_TUNING_HF};
+    UsbCommand c = {CMD_MEASURE_ANTENNA_TUNING_HF, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
diff --git a/client/cmdhffelica.c b/client/cmdhffelica.c
index cdbffcf38..7597f6bfe 100644
--- a/client/cmdhffelica.c
+++ b/client/cmdhffelica.c
@@ -233,7 +233,7 @@ int CmdHFFelicaSimLite(const char *Cmd) {
     if (!uid)
         return usage_hf_felica_simlite();
 
-    UsbCommand c = {CMD_FELICA_LITE_SIM, {uid, 0, 0} };
+    UsbCommand c = {CMD_FELICA_LITE_SIM, {uid, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index 000ebf0ca..902f635b2 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -280,7 +280,7 @@ int CmdHFiClassList(const char *Cmd) {
 int CmdHFiClassSniff(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_hf_iclass_sniff();
-    UsbCommand c = {CMD_SNIFF_ICLASS};
+    UsbCommand c = {CMD_SNIFF_ICLASS, {0, 0, 0}, {{0}}};
     SendCommand(&c);
     return 0;
 }
@@ -380,7 +380,7 @@ int CmdHFiClassSim(const char *Cmd) {
             PrintAndLogEx(INFO, "Starting iCLASS sim 2 attack (elite mode)");
             PrintAndLogEx(INFO, "press keyboard to cancel");
             UsbCommand c = {CMD_SIMULATE_TAG_ICLASS, {simType, NUM_CSNS}, {{0}}};
-            UsbCommand resp = {0};
+            UsbCommand resp;
             memcpy(c.d.asBytes, csns, 8 * NUM_CSNS);
             clearCommandBuffer();
             SendCommand(&c);
@@ -433,7 +433,7 @@ int CmdHFiClassSim(const char *Cmd) {
             PrintAndLogEx(INFO, "Starting iCLASS sim 4 attack (elite mode, reader in key roll mode)");
             PrintAndLogEx(INFO, "press keyboard to cancel");
             UsbCommand c = {CMD_SIMULATE_TAG_ICLASS, {simType, NUM_CSNS}, {{0}}};
-            UsbCommand resp = {0};
+            UsbCommand resp;
             memcpy(c.d.asBytes, csns, 8 * NUM_CSNS);
             clearCommandBuffer();
             SendCommand(&c);
diff --git a/client/cmdhfmfdes.c b/client/cmdhfmfdes.c
index 18e4b840a..d967cca39 100644
--- a/client/cmdhfmfdes.c
+++ b/client/cmdhfmfdes.c
@@ -117,7 +117,7 @@ int CmdHF14ADesRb(const char *Cmd) {
 int CmdHF14ADesInfo(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
 
-    UsbCommand c = {CMD_MIFARE_DESFIRE_INFO};
+    UsbCommand c = {CMD_MIFARE_DESFIRE_INFO, {0, 0, 0}, {{0}}};
     SendCommand(&c);
     UsbCommand resp;
 
@@ -257,7 +257,7 @@ void GetKeySettings(uint8_t *aid) {
     const char *str = messStr;
     uint8_t isOK = 0;
     uint32_t options;
-    UsbCommand c = {CMD_MIFARE_DESFIRE};
+    UsbCommand c = {CMD_MIFARE_DESFIRE, {0, 0, 0}, {{0}}};
     UsbCommand resp;
 
     //memset(messStr, 0x00, 512);
diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index 4cdefa2ff..c648d954a 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -2387,7 +2387,7 @@ int CmdHF14AMfucSetPwd(const char *Cmd) {
         return 1;
     }
 
-    UsbCommand c = {CMD_MIFAREUC_SETPWD};
+    UsbCommand c = {CMD_MIFAREUC_SETPWD, {0, 0, 0}, {{0}}};
     memcpy(c.d.asBytes, pwd, 16);
     clearCommandBuffer();
     SendCommand(&c);
@@ -2412,7 +2412,7 @@ int CmdHF14AMfucSetPwd(const char *Cmd) {
 //
 int CmdHF14AMfucSetUid(const char *Cmd) {
 
-    UsbCommand c = {CMD_MIFAREU_READBL};
+    UsbCommand c = {CMD_MIFAREU_READBL, {0, 0, 0}, {{0}}};
     UsbCommand resp;
     uint8_t uid[7] = {0x00};
     char cmdp = tolower(param_getchar(Cmd, 0));
diff --git a/client/cmdhw.c b/client/cmdhw.c
index bbe254fb5..e5d050eb0 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -308,7 +308,7 @@ static void lookupChipID(uint32_t iChipID, uint32_t mem_used) {
 }
 
 int CmdDetectReader(const char *Cmd) {
-    UsbCommand c = {CMD_LISTEN_READER_FIELD};
+    UsbCommand c = {CMD_LISTEN_READER_FIELD, {0, 0, 0}, {{0}}};
     // 'l' means LF - 125/134 kHz
     if (*Cmd == 'l') {
         c.arg[0] = 1;
@@ -326,7 +326,7 @@ int CmdDetectReader(const char *Cmd) {
 // ## FPGA Control
 int CmdFPGAOff(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
-    UsbCommand c = {CMD_FPGA_MAJOR_MODE_OFF};
+    UsbCommand c = {CMD_FPGA_MAJOR_MODE_OFF, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -336,7 +336,7 @@ int CmdFPGAOff(const char *Cmd) {
 int CmdLCD(const char *Cmd) {
     int i, j;
 
-    UsbCommand c = {CMD_LCD};
+    UsbCommand c = {CMD_LCD, {0, 0, 0}, {{0}}};
     sscanf(Cmd, "%x %d", &i, &j);
     while (j--) {
         c.arg[0] = i & 0x1ff;
@@ -363,7 +363,7 @@ int CmdReadmem(const char *Cmd) {
 
 int CmdReset(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
-    UsbCommand c = {CMD_HARDWARE_RESET};
+    UsbCommand c = {CMD_HARDWARE_RESET, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -394,7 +394,7 @@ int CmdSetMux(const char *Cmd) {
         return 1;
     }
 
-    UsbCommand c = {CMD_SET_ADC_MUX};
+    UsbCommand c = {CMD_SET_ADC_MUX, {0, 0, 0}, {{0}}};
 
     if (strcmp(Cmd, "lopkd") == 0)      c.arg[0] = 0;
     else if (strcmp(Cmd, "loraw") == 0) c.arg[0] = 1;
@@ -455,7 +455,7 @@ int CmdVersion(const char *Cmd) {
 int CmdStatus(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     clearCommandBuffer();
-    UsbCommand c = {CMD_STATUS};
+    UsbCommand c = {CMD_STATUS, {0, 0, 0}, {{0}}};
     SendCommand(&c);
     if (!WaitForResponseTimeout(CMD_ACK, &c, 1900))
         PrintAndLogEx(NORMAL, "Status command failed. USB Speed Test timed out");
@@ -466,7 +466,7 @@ int CmdPing(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     clearCommandBuffer();
     UsbCommand resp;
-    UsbCommand c = {CMD_PING};
+    UsbCommand c = {CMD_PING, {0, 0, 0}, {{0}}};
     SendCommand(&c);
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1000))
         PrintAndLogEx(NORMAL, "Ping successful");
diff --git a/client/cmdlf.c b/client/cmdlf.c
index 71863cec3..df189fc2d 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -325,7 +325,7 @@ int CmdLFSetConfig(const char *Cmd) {
 
     sample_config config = { decimation, bps, averaging, divisor, trigger_threshold };
 
-    UsbCommand c = {CMD_SET_LF_SAMPLING_CONFIG, {0, 0, 0} };
+    UsbCommand c = {CMD_SET_LF_SAMPLING_CONFIG, {0, 0, 0}, {{0}}};
     memcpy(c.d.asBytes, &config, sizeof(sample_config));
     clearCommandBuffer();
     SendCommand(&c);
diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c
index 7c3b20266..26e557479 100644
--- a/client/cmdlfhid.c
+++ b/client/cmdlfhid.c
@@ -265,7 +265,7 @@ int CmdHIDClone(const char *Cmd) {
 
     uint32_t hi2 = 0, hi = 0, lo = 0;
     uint32_t n = 0, i = 0;
-    UsbCommand c = {CMD_HID_CLONE_TAG};
+    UsbCommand c = {CMD_HID_CLONE_TAG, {0, 0, 0}, {{0}}};
 
     uint8_t ctmp = param_getchar(Cmd, 0);
     if (strlen(Cmd) == 0 || ctmp == 'H' || ctmp == 'h') return usage_lf_hid_clone();
diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index 2381152a5..dfbbd3fa3 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -454,7 +454,7 @@ static void printHitagConfiguration(uint8_t config) {
 
 static bool getHitagUid(uint32_t *uid) {
 
-    UsbCommand c = {CMD_READER_HITAG, {RHT2F_UID_ONLY, 0, 0} };
+    UsbCommand c = {CMD_READER_HITAG, {RHT2F_UID_ONLY, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbCommand resp;
@@ -509,7 +509,7 @@ int CmdLFHitagInfo(const char *Cmd) {
 //
 int CmdLFHitagReader(const char *Cmd) {
 
-    UsbCommand c = {CMD_READER_HITAG, {0, 0, 0} };
+    UsbCommand c = {CMD_READER_HITAG, {0, 0, 0}, {{0}}};
     hitag_data *htd = (hitag_data *)c.d.asBytes;
     hitag_function htf = param_get32ex(Cmd, 0, 0, 10);
 
diff --git a/client/cmdlfpcf7931.c b/client/cmdlfpcf7931.c
index 0cca54209..774c9a642 100644
--- a/client/cmdlfpcf7931.c
+++ b/client/cmdlfpcf7931.c
@@ -145,7 +145,7 @@ int CmdLFPCF7931Write(const char *Cmd) {
     PrintAndLogEx(NORMAL, "          pos: %d", bytepos);
     PrintAndLogEx(NORMAL, "         data: 0x%02X", data);
 
-    UsbCommand c = {CMD_PCF7931_WRITE, { block, bytepos, data} };
+    UsbCommand c = {CMD_PCF7931_WRITE, { block, bytepos, data}, {{0}}};
     memcpy(c.d.asDwords, configPcf.Pwd, sizeof(configPcf.Pwd));
     c.d.asDwords[7] = (configPcf.OffsetWidth + 128);
     c.d.asDwords[8] = (configPcf.OffsetPosition + 128);
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 3b001bed4..5ea1d6a34 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1844,7 +1844,7 @@ int CmdT55xxChkPwds(const char *Cmd) {
     uint64_t t1 = msclock();
 
     if (cmdp == 'm') {
-        UsbCommand c = {CMD_T55XX_CHKPWDS, {0, 0, 0} };
+        UsbCommand c = {CMD_T55XX_CHKPWDS, {0, 0, 0}, {{0}}};
         clearCommandBuffer();
         SendCommand(&c);
         UsbCommand resp;
@@ -2287,7 +2287,7 @@ int CmdT55xxSetDeviceConfig(const char *Cmd) {
 
     t55xx_config conf = { startgap * 8, writegap * 8, write0 * 8, write1 * 8, readgap * 8 };
 
-    UsbCommand c = {CMD_SET_LF_T55XX_CONFIG, {shall_persist, 0, 0} };
+    UsbCommand c = {CMD_SET_LF_T55XX_CONFIG, {shall_persist, 0, 0}, {{0}}};
     memcpy(c.d.asBytes, &conf, sizeof(t55xx_config));
     clearCommandBuffer();
     SendCommand(&c);

From 34aa860fbd15c3a9ce57cd26bdf8cbf14e138734 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 10 Apr 2019 22:20:45 +0200
Subject: [PATCH 1180/1938] more [-Wmissing-field-initializers]

---
 client/util.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/util.h b/client/util.h
index 5d6643c73..2fb0d5ce8 100644
--- a/client/util.h
+++ b/client/util.h
@@ -174,7 +174,7 @@
 
 #ifndef DropField
 #define DropField() { \
-        UsbCommand c_drop = {CMD_READER_ISO_14443a, {0,0,0}}; clearCommandBuffer(); SendCommand(&c_drop); \
+        UsbCommand c_drop = {CMD_READER_ISO_14443a, {0,0,0}, {{0}}}; clearCommandBuffer(); SendCommand(&c_drop); \
     }
 #endif
 

From 0fe323de80b10d66ef597a2b474fdd84130512b0 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 10 Apr 2019 22:32:20 +0200
Subject: [PATCH 1181/1938] asn1_tag: remove unused field and initialize the
 others [-Wmissing-field-initializers]

---
 client/crypto/asn1dump.c | 72 ++++++++++++++++++++--------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/client/crypto/asn1dump.c b/client/crypto/asn1dump.c
index 47fe791d4..90f11e4ba 100644
--- a/client/crypto/asn1dump.c
+++ b/client/crypto/asn1dump.c
@@ -43,48 +43,48 @@ struct asn1_tag {
     tlv_tag_t tag;
     const char *name;
     enum asn1_tag_t type;
-    const void *data;
+//    const void *data;
 };
 
 static const struct asn1_tag asn1_tags[] = {
     // internal
-    { 0x00, "Unknown ???" },
+    { 0x00, "Unknown ???",       ASN1_TAG_GENERIC     },
 
     // ASN.1
-    { 0x01, "BOOLEAN", ASN1_TAG_BOOLEAN },
-    { 0x02, "INTEGER", ASN1_TAG_INTEGER },
-    { 0x03, "BIT STRING" },
-    { 0x04, "OCTET STRING", ASN1_TAG_OCTET_STRING},
-    { 0x05, "NULL" },
-    { 0x06, "OBJECT IDENTIFIER", ASN1_TAG_OBJECT_ID },
-    { 0x07, "OBJECT DESCRIPTOR" },
-    { 0x08, "EXTERNAL" },
-    { 0x09, "REAL" },
-    { 0x0A, "ENUMERATED" },
-    { 0x0B, "EMBEDDED_PDV" },
-    { 0x0C, "UTF8String", ASN1_TAG_STRING },
-    { 0x10, "SEQUENCE" },
-    { 0x11, "SET" },
-    { 0x12, "NumericString", ASN1_TAG_STRING },
-    { 0x13, "PrintableString", ASN1_TAG_STRING },
-    { 0x14, "T61String" },
-    { 0x15, "VideotexString" },
-    { 0x16, "IA5String" },
-    { 0x17, "UTCTime", ASN1_TAG_UTC_TIME },
-    { 0x18, "GeneralizedTime", ASN1_TAG_STR_TIME },
-    { 0x19, "GraphicString" },
-    { 0x1A, "VisibleString", ASN1_TAG_STRING },
-    { 0x1B, "GeneralString", ASN1_TAG_STRING },
-    { 0x1C, "UniversalString", ASN1_TAG_STRING },
-    { 0x1E, "BMPString" },
-    { 0x30, "SEQUENCE" },
-    { 0x31, "SET" },
-    { 0xa0, "[0]" },
-    { 0xa1, "[1]" },
-    { 0xa2, "[2]" },
-    { 0xa3, "[3]" },
-    { 0xa4, "[4]" },
-    { 0xa5, "[5]" },
+    { 0x01, "BOOLEAN",           ASN1_TAG_BOLEAN       },
+    { 0x02, "INTEGER",           ASN1_TAG_INTEGER      },
+    { 0x03, "BIT STRING",        ASN1_TAG_GENERIC      },
+    { 0x04, "OCTET STRING",      ASN1_TAG_OCTET_STRING },
+    { 0x05, "NULL",              ASN1_TAG_GENERIC      },
+    { 0x06, "OBJECT IDENTIFIER", ASN1_TAG_OBJECT_ID    },
+    { 0x07, "OBJECT DESCRIPTOR", ASN1_TAG_GENERIC      },
+    { 0x08, "EXTERNAL",          ASN1_TAG_GENERIC      },
+    { 0x09, "REAL",              ASN1_TAG_GENERIC      },
+    { 0x0A, "ENUMERATED",        ASN1_TAG_GENERIC      },
+    { 0x0B, "EMBEDDED_PDV",      ASN1_TAG_GENERIC      },
+    { 0x0C, "UTF8String",        ASN1_TAG_STRING       },
+    { 0x10, "SEQUENCE",          ASN1_TAG_GENERIC      },
+    { 0x11, "SET",               ASN1_TAG_GENERIC      },
+    { 0x12, "NumericString",     ASN1_TAG_STRING       },
+    { 0x13, "PrintableString",   ASN1_TAG_STRING       },
+    { 0x14, "T61String",         ASN1_TAG_GENERIC      },
+    { 0x15, "VideotexString",    ASN1_TAG_GENERIC      },
+    { 0x16, "IA5String",         ASN1_TAG_GENERIC      },
+    { 0x17, "UTCTime",           ASN1_TAG_UTC_TIME     },
+    { 0x18, "GeneralizedTime",   ASN1_TAG_STR_TIME     },
+    { 0x19, "GraphicString",     ASN1_TAG_GENERIC      },
+    { 0x1A, "VisibleString",     ASN1_TAG_STRING       },
+    { 0x1B, "GeneralString",     ASN1_TAG_STRING       },
+    { 0x1C, "UniversalString",   ASN1_TAG_STRING       },
+    { 0x1E, "BMPString",         ASN1_TAG_GENERIC      },
+    { 0x30, "SEQUENCE",          ASN1_TAG_GENERIC      },
+    { 0x31, "SET",               ASN1_TAG_GENERIC      },
+    { 0xa0, "[0]",               ASN1_TAG_GENERIC      },
+    { 0xa1, "[1]",               ASN1_TAG_GENERIC      },
+    { 0xa2, "[2]",               ASN1_TAG_GENERIC      },
+    { 0xa3, "[3]",               ASN1_TAG_GENERIC      },
+    { 0xa4, "[4]",               ASN1_TAG_GENERIC      },
+    { 0xa5, "[5]",               ASN1_TAG_GENERIC      },
 };
 
 static int asn1_sort_tag(tlv_tag_t tag) {

From 3cd047be5dd90eb1de114c3a9011094d15999d31 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 10 Apr 2019 22:47:18 +0200
Subject: [PATCH 1182/1938] oops typo

---
 client/crypto/asn1dump.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/crypto/asn1dump.c b/client/crypto/asn1dump.c
index 90f11e4ba..2fd99ac40 100644
--- a/client/crypto/asn1dump.c
+++ b/client/crypto/asn1dump.c
@@ -48,10 +48,10 @@ struct asn1_tag {
 
 static const struct asn1_tag asn1_tags[] = {
     // internal
-    { 0x00, "Unknown ???",       ASN1_TAG_GENERIC     },
+    { 0x00, "Unknown ???",       ASN1_TAG_GENERIC      },
 
     // ASN.1
-    { 0x01, "BOOLEAN",           ASN1_TAG_BOLEAN       },
+    { 0x01, "BOOLEAN",           ASN1_TAG_BOOLEAN      },
     { 0x02, "INTEGER",           ASN1_TAG_INTEGER      },
     { 0x03, "BIT STRING",        ASN1_TAG_GENERIC      },
     { 0x04, "OCTET STRING",      ASN1_TAG_OCTET_STRING },

From 6416de1a38ae6358e6c60a48b3f8d768f56791b5 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 10 Apr 2019 23:13:00 +0200
Subject: [PATCH 1183/1938] emv_tags  [-Wmissing-field-initializers]

---
 client/emv/emv_tags.c | 469 +++++++++++++++++++++---------------------
 1 file changed, 234 insertions(+), 235 deletions(-)

diff --git a/client/emv/emv_tags.c b/client/emv/emv_tags.c
index 2ebe78009..9ef049221 100644
--- a/client/emv/emv_tags.c
+++ b/client/emv/emv_tags.c
@@ -175,255 +175,254 @@ static const struct emv_tag_bit EMV_CVR[] = {
 // http://dexterous-programmer.blogspot.in/2012/05/emv-tags.html
 static const struct emv_tag emv_tags[] = {
     // internal
-    { 0x00, "Unknown ???" },
-    { 0x01, "", EMV_TAG_STRING },   // string for headers
-    { 0x02, "Raw data" },   // data
-    { 0x06, "Object Identifier (OID)" },
-    { 0x20, "Cardholder Verification Results (CVR)", EMV_TAG_CVR },   // not standard!
-    { 0x21, "Input list for Offline Data Authentication" },   // not standard! data for "Offline Data Authentication" come from "read records" command. (EMV book3 10.3)
+    { 0x00,     "Unknown ???",                                                 EMV_TAG_GENERIC,  NULL },
+    { 0x01,     "",                                                            EMV_TAG_STRING,   NULL }, // string for headers
+    { 0x02,     "Raw data",                                                    EMV_TAG_GENERIC,  NULL }, // data
+    { 0x06,     "Object Identifier (OID)",                                     EMV_TAG_GENERIC,  NULL },
+    { 0x20,     "Cardholder Verification Results (CVR)",                       EMV_TAG_CVR,      NULL }, // not standard!
+    { 0x21,     "Input list for Offline Data Authentication",                  EMV_TAG_GENERIC,  NULL }, // not standard! data for "Offline Data Authentication" come from "read records" command. (EMV book3 10.3)
 
     // EMV
-    { 0x41, "Country code and national data" },
-    { 0x42, "Issuer Identification Number (IIN)" },
-    { 0x4f, "Application Dedicated File (ADF) Name" },
-    { 0x50, "Application Label", EMV_TAG_STRING },
-    { 0x51, "File reference data element" },
-    { 0x52, "Command APDU" },
-    { 0x53, "Discretionary data (or template)" },
-    { 0x56, "Track 1 Data" },
-    { 0x57, "Track 2 Equivalent Data" },
-    { 0x5a, "Application Primary Account Number (PAN)" },
-    { 0x5f20, "Cardholder Name", EMV_TAG_STRING },
-    { 0x5f24, "Application Expiration Date", EMV_TAG_YYMMDD },
-    { 0x5f25, "Application Effective Date", EMV_TAG_YYMMDD },
-    { 0x5f28, "Issuer Country Code", EMV_TAG_NUMERIC },
-    { 0x5f2a, "Transaction Currency Code", EMV_TAG_NUMERIC },
-    { 0x5f2d, "Language Preference", EMV_TAG_STRING },
-    { 0x5f30, "Service Code", EMV_TAG_NUMERIC },
-    { 0x5f34, "Application Primary Account Number (PAN) Sequence Number", EMV_TAG_NUMERIC },
-    { 0x5f36, "Transaction Currency Exponent",  EMV_TAG_NUMERIC },
-    { 0x5f50, "Issuer URL", EMV_TAG_STRING },
-    { 0x5f53, "International Bank Account Number (IBAN)" },
-    { 0x5f54, "Bank Identifier Code (BIC)" },
-    { 0x5f55, "Issuer Country Code (alpha2 format)", EMV_TAG_STRING },
-    { 0x5f56, "Issuer Country Code (alpha3 format)", EMV_TAG_STRING },
+    { 0x41,     "Country code and national data",                              EMV_TAG_GENERIC,  NULL },
+    { 0x42,     "Issuer Identification Number (IIN)",                          EMV_TAG_GENERIC,  NULL },
+    { 0x4f,     "Application Dedicated File (ADF) Name",                       EMV_TAG_GENERIC,  NULL },
+    { 0x50,     "Application Label",                                           EMV_TAG_STRING,   NULL },
+    { 0x51,     "File reference data element",                                 EMV_TAG_GENERIC,  NULL },
+    { 0x52,     "Command APDU",                                                EMV_TAG_GENERIC,  NULL },
+    { 0x53,     "Discretionary data (or template)",                            EMV_TAG_GENERIC,  NULL },
+    { 0x56,     "Track 1 Data",                                                EMV_TAG_GENERIC,  NULL },
+    { 0x57,     "Track 2 Equivalent Data",                                     EMV_TAG_GENERIC,  NULL },
+    { 0x5a,     "Application Primary Account Number (PAN)",                    EMV_TAG_GENERIC,  NULL },
+    { 0x5f20,   "Cardholder Name",                                             EMV_TAG_STRING,   NULL },
+    { 0x5f24,   "Application Expiration Date",                                 EMV_TAG_YYMMDD,   NULL },
+    { 0x5f25,   "Application Effective Date",                                  EMV_TAG_YYMMDD,   NULL },
+    { 0x5f28,   "Issuer Country Code",                                         EMV_TAG_NUMERIC,  NULL },
+    { 0x5f2a,   "Transaction Currency Code",                                   EMV_TAG_NUMERIC,  NULL },
+    { 0x5f2d,   "Language Preference",                                         EMV_TAG_STRING,   NULL },
+    { 0x5f30,   "Service Code",                                                EMV_TAG_NUMERIC,  NULL },
+    { 0x5f34,   "Application Primary Account Number (PAN) Sequence Number",    EMV_TAG_NUMERIC,  NULL },
+    { 0x5f36,   "Transaction Currency Exponent",                               EMV_TAG_NUMERIC,  NULL },
+    { 0x5f50,   "Issuer URL",                                                  EMV_TAG_STRING,   NULL },
+    { 0x5f53,   "International Bank Account Number (IBAN)",                    EMV_TAG_GENERIC,  NULL },
+    { 0x5f54,   "Bank Identifier Code (BIC)",                                  EMV_TAG_GENERIC,  NULL },
+    { 0x5f55,   "Issuer Country Code (alpha2 format)",                         EMV_TAG_STRING,   NULL },
+    { 0x5f56,   "Issuer Country Code (alpha3 format)",                         EMV_TAG_STRING,   NULL },
 
-    { 0x61, "Application Template" },
-    { 0x6f, "File Control Information (FCI) Template" },
-    { 0x70, "READ RECORD Response Message Template" },
-    { 0x71, "Issues Script Template 1" },
-    { 0x72, "Issues Script Template 2" },
-    { 0x73, "Directory Discretionary Template" },
-    { 0x77, "Response Message Template Format 2" },
-    { 0x80, "Response Message Template Format 1" },
-    { 0x81, "Amount, Authorised (Binary)" },
-    { 0x82, "Application Interchange Profile", EMV_TAG_BITMASK, &EMV_AIP },
-    { 0x83, "Command Template" },
-    { 0x84, "Dedicated File (DF) Name" },
-    { 0x86, "Issuer Script Command" },
-    { 0x87, "Application Priority Indicator" },
-    { 0x88, "Short File Identifier (SFI)" },
-    { 0x89, "Authorisation Code" },
-    { 0x8a, "Authorisation Response Code" },
-    { 0x8c, "Card Risk Management Data Object List 1 (CDOL1)", EMV_TAG_DOL },
-    { 0x8d, "Card Risk Management Data Object List 2 (CDOL2)", EMV_TAG_DOL },
-    { 0x8e, "Cardholder Verification Method (CVM) List", EMV_TAG_CVM_LIST },
-    { 0x8f, "Certification Authority Public Key Index" },
-    { 0x90, "Issuer Public Key Certificate" },
-    { 0x91, "Issuer Authentication Data" },
-    { 0x92, "Issuer Public Key Remainder" },
-    { 0x93, "Signed Static Application Data" },
-    { 0x94, "Application File Locator (AFL)", EMV_TAG_AFL },
-    { 0x95, "Terminal Verification Results" },
-    { 0x97, "Transaction Certificate Data Object List (TDOL)" },
-    { 0x98, "Transaction Certificate (TC) Hash Value" },
-    { 0x99, "Transaction Personal Identification Number (PIN) Data" },
-    { 0x9a, "Transaction Date", EMV_TAG_YYMMDD },
-    { 0x9b, "Transaction Status Information" },
-    { 0x9c, "Transaction Type", EMV_TAG_NUMERIC },
-    { 0x9d, "Directory Definition File (DDF) Name" },
+    { 0x61,     "Application Template",                                        EMV_TAG_GENERIC,  NULL },
+    { 0x6f,     "File Control Information (FCI) Template",                     EMV_TAG_GENERIC,  NULL },
+    { 0x70,     "READ RECORD Response Message Template",                       EMV_TAG_GENERIC,  NULL },
+    { 0x71,     "Issues Script Template 1",                                    EMV_TAG_GENERIC,  NULL },
+    { 0x72,     "Issues Script Template 2",                                    EMV_TAG_GENERIC,  NULL },
+    { 0x73,     "Directory Discretionary Template",                            EMV_TAG_GENERIC,  NULL },
+    { 0x77,     "Response Message Template Format 2",                          EMV_TAG_GENERIC,  NULL },
+    { 0x80,     "Response Message Template Format 1",                          EMV_TAG_GENERIC,  NULL },
+    { 0x81,     "Amount, Authorised (Binary)",                                 EMV_TAG_GENERIC,  NULL },
+    { 0x82,     "Application Interchange Profile",                             EMV_TAG_BITMASK,  &EMV_AIP },
+    { 0x83,     "Command Template",                                            EMV_TAG_GENERIC,  NULL },
+    { 0x84,     "Dedicated File (DF) Name",                                    EMV_TAG_GENERIC,  NULL },
+    { 0x86,     "Issuer Script Command",                                       EMV_TAG_GENERIC,  NULL },
+    { 0x87,     "Application Priority Indicator",                              EMV_TAG_GENERIC,  NULL },
+    { 0x88,     "Short File Identifier (SFI)",                                 EMV_TAG_GENERIC,  NULL },
+    { 0x89,     "Authorisation Code",                                          EMV_TAG_GENERIC,  NULL },
+    { 0x8a,     "Authorisation Response Code",                                 EMV_TAG_GENERIC,  NULL },
+    { 0x8c,     "Card Risk Management Data Object List 1 (CDOL1)",             EMV_TAG_DOL,      NULL },
+    { 0x8d,     "Card Risk Management Data Object List 2 (CDOL2)",             EMV_TAG_DOL,      NULL },
+    { 0x8e,     "Cardholder Verification Method (CVM) List",                   EMV_TAG_CVM_LIST, NULL },
+    { 0x8f,     "Certification Authority Public Key Index",                    EMV_TAG_GENERIC,  NULL },
+    { 0x90,     "Issuer Public Key Certificate",                               EMV_TAG_GENERIC,  NULL },
+    { 0x91,     "Issuer Authentication Data",                                  EMV_TAG_GENERIC,  NULL },
+    { 0x92,     "Issuer Public Key Remainder",                                 EMV_TAG_GENERIC,  NULL },
+    { 0x93,     "Signed Static Application Data",                              EMV_TAG_GENERIC,  NULL },
+    { 0x94,     "Application File Locator (AFL)",                              EMV_TAG_AFL,      NULL },
+    { 0x95,     "Terminal Verification Results",                               EMV_TAG_GENERIC,  NULL },
+    { 0x97,     "Transaction Certificate Data Object List (TDOL)",             EMV_TAG_GENERIC,  NULL },
+    { 0x98,     "Transaction Certificate (TC) Hash Value",                     EMV_TAG_GENERIC,  NULL },
+    { 0x99,     "Transaction Personal Identification Number (PIN) Data",       EMV_TAG_GENERIC,  NULL },
+    { 0x9a,     "Transaction Date",                                            EMV_TAG_YYMMDD,   NULL },
+    { 0x9b,     "Transaction Status Information",                              EMV_TAG_GENERIC,  NULL },
+    { 0x9c,     "Transaction Type",                                            EMV_TAG_NUMERIC,  NULL },
+    { 0x9d,     "Directory Definition File (DDF) Name",                        EMV_TAG_GENERIC,  NULL },
 
-    { 0x9f01, "Acquirer Identifier", EMV_TAG_NUMERIC },
-    { 0x9f02, "Amount, Authorised (Numeric)", EMV_TAG_NUMERIC },
-    { 0x9f03, "Amount, Other (Numeric)", EMV_TAG_NUMERIC },
-    { 0x9f04, "Amount, Other (Binary)", EMV_TAG_NUMERIC },
-    { 0x9f05, "Application Discretionary Data" },
-    { 0x9f06, "Application Identifier (AID), Terminal. ISO 7816-5" },
-    { 0x9f07, "Application Usage Control", EMV_TAG_BITMASK, &EMV_AUC },
-    { 0x9f08, "Application Version Number" },
-    { 0x9f09, "Application Version Number - terminal" },
-    { 0x9f0a, "Application Selection Registered Proprietary Data" }, // https://blog.ul-ts.com/posts/electronic-card-identifier-one-more-step-for-mif-compliance/
-    { 0x9f0b, "Cardholder Name Extended", EMV_TAG_STRING },
-    { 0x9f0d, "Issuer Action Code - Default", EMV_TAG_BITMASK, &EMV_TVR },
-    { 0x9f0e, "Issuer Action Code - Denial", EMV_TAG_BITMASK, &EMV_TVR },
-    { 0x9f0f, "Issuer Action Code - Online", EMV_TAG_BITMASK, &EMV_TVR },
-    { 0x9f10, "Issuer Application Data" },
-    { 0x9f11, "Issuer Code Table Index", EMV_TAG_NUMERIC },
-    { 0x9f12, "Application Preferred Name", EMV_TAG_STRING },
-    { 0x9f13, "Last Online Application Transaction Counter (ATC) Register" },
-    { 0x9f14, "Lower Consecutive Offline Limit" },
-    { 0x9f15, "Merchant Category Code", EMV_TAG_NUMERIC },
-    { 0x9f16, "Merchant Identifier", EMV_TAG_STRING },
-    { 0x9f17, "Personal Identification Number (PIN) Try Counter" },
-    { 0x9f18, "Issuer Script Identifier" },
-    { 0x9f1a, "Terminal Country Code" },
-    { 0x9f1b, "Terminal Floor Limit" },
-    { 0x9f1c, "Terminal Identification", EMV_TAG_STRING },
-    { 0x9f1d, "Terminal Risk Management Data" },
-    { 0x9f1e, "Interface Device (IFD) Serial Number", EMV_TAG_STRING },
-    { 0x9f1f, "Track 1 Discretionary Data", EMV_TAG_STRING },
-    { 0x9f20, "Track 2 Discretionary Data", EMV_TAG_STRING },
-    { 0x9f21, "Transaction Time" },
-    { 0x9f22, "Certification Authority Public Key Index - Terminal" },
-    { 0x9f23, "Upper Consecutive Offline Limit" },
-    { 0x9f26, "Application Cryptogram" },
-    { 0x9f27, "Cryptogram Information Data", EMV_TAG_CID },
-    { 0x9f2a, "Kernel Identifier" },
-    { 0x9f2d, "ICC PIN Encipherment Public Key Certificate" },
-    { 0x9f2e, "ICC PIN Encipherment Public Key Exponent" },
-    { 0x9f2f, "ICC PIN Encipherment Public Key Remainder" },
-    { 0x9f32, "Issuer Public Key Exponent" },
-    { 0x9f33, "Terminal Capabilities" },
-    { 0x9f34, "Cardholder Verification Method (CVM) Results" },
-    { 0x9f35, "Terminal Type" },
-    { 0x9f36, "Application Transaction Counter (ATC)" },
-    { 0x9f37, "Unpredictable Number" },
-    { 0x9f38, "Processing Options Data Object List (PDOL)", EMV_TAG_DOL },
-    { 0x9f39, "Point-of-Service (POS) Entry Mode", EMV_TAG_NUMERIC },
-    { 0x9f3a, "Amount, Reference Currency" },
-    { 0x9f3b, "Application Reference Currency", EMV_TAG_NUMERIC },
-    { 0x9f3c, "Transaction Reference Currency Code", EMV_TAG_NUMERIC },
-    { 0x9f3d, "Transaction Reference Currency Exponent", EMV_TAG_NUMERIC },
-    { 0x9f40, "Additional Terminal Capabilities" },
-    { 0x9f41, "Transaction Sequence Counter", EMV_TAG_NUMERIC },
-    { 0x9f42, "Application Currency Code", EMV_TAG_NUMERIC },
-    { 0x9f43, "Application Reference Currency Exponent", EMV_TAG_NUMERIC },
-    { 0x9f44, "Application Currency Exponent", EMV_TAG_NUMERIC },
-    { 0x9f45, "Data Authentication Code" },
-    { 0x9f46, "ICC Public Key Certificate" },
-    { 0x9f47, "ICC Public Key Exponent" },
-    { 0x9f48, "ICC Public Key Remainder" },
-    { 0x9f49, "Dynamic Data Authentication Data Object List (DDOL)", EMV_TAG_DOL },
-    { 0x9f4a, "Static Data Authentication Tag List" },
-    { 0x9f4b, "Signed Dynamic Application Data" },
-    { 0x9f4c, "ICC Dynamic Number" },
-    { 0x9f4d, "Log Entry" },
-    { 0x9f4e, "Merchant Name and Location", EMV_TAG_STRING },
-    { 0x9f4f, "Log Format", EMV_TAG_DOL },
+    { 0x9f01,   "Acquirer Identifier",                                         EMV_TAG_NUMERIC,  NULL },
+    { 0x9f02,   "Amount, Authorised (Numeric)",                                EMV_TAG_NUMERIC,  NULL },
+    { 0x9f03,   "Amount, Other (Numeric)",                                     EMV_TAG_NUMERIC,  NULL },
+    { 0x9f04,   "Amount, Other (Binary)",                                      EMV_TAG_NUMERIC,  NULL },
+    { 0x9f05,   "Application Discretionary Data",                              EMV_TAG_GENERIC,  NULL },
+    { 0x9f07,   "Application Usage Control",                                   EMV_TAG_BITMASK,  &EMV_AUC },
+    { 0x9f08,   "Application Version Number",                                  EMV_TAG_GENERIC,  NULL },
+    { 0x9f09,   "Application Version Number - terminal",                       EMV_TAG_GENERIC,  NULL },
+    { 0x9f0a,   "Application Selection Registered Proprietary Data",           EMV_TAG_GENERIC,  NULL }, // https://blog.ul-ts.com/posts/electronic-card-identifier-one-more-step-for-mif-compliance/
+    { 0x9f0b,   "Cardholder Name Extended",                                    EMV_TAG_STRING,   NULL },
+    { 0x9f0d,   "Issuer Action Code - Default",                                EMV_TAG_BITMASK,  &EMV_TVR },
+    { 0x9f0e,   "Issuer Action Code - Denial",                                 EMV_TAG_BITMASK,  &EMV_TVR },
+    { 0x9f0f,   "Issuer Action Code - Online",                                 EMV_TAG_BITMASK,  &EMV_TVR },
+    { 0x9f10,   "Issuer Application Data",                                     EMV_TAG_GENERIC,  NULL },
+    { 0x9f11,   "Issuer Code Table Index",                                     EMV_TAG_NUMERIC,  NULL },
+    { 0x9f12,   "Application Preferred Name",                                  EMV_TAG_STRING,   NULL },
+    { 0x9f13,   "Last Online Application Transaction Counter (ATC) Register",  EMV_TAG_GENERIC,  NULL },
+    { 0x9f14,   "Lower Consecutive Offline Limit",                             EMV_TAG_GENERIC,  NULL },
+    { 0x9f15,   "Merchant Category Code",                                      EMV_TAG_NUMERIC,  NULL },
+    { 0x9f16,   "Merchant Identifier",                                         EMV_TAG_STRING,   NULL },
+    { 0x9f17,   "Personal Identification Number (PIN) Try Counter",            EMV_TAG_GENERIC,  NULL },
+    { 0x9f18,   "Issuer Script Identifier",                                    EMV_TAG_GENERIC,  NULL },
+    { 0x9f1a,   "Terminal Country Code",                                       EMV_TAG_GENERIC,  NULL },
+    { 0x9f1b,   "Terminal Floor Limit",                                        EMV_TAG_GENERIC,  NULL },
+    { 0x9f1c,   "Terminal Identification",                                     EMV_TAG_STRING,   NULL },
+    { 0x9f1d,   "Terminal Risk Management Data",                               EMV_TAG_GENERIC,  NULL },
+    { 0x9f1e,   "Interface Device (IFD) Serial Number",                        EMV_TAG_STRING,   NULL },
+    { 0x9f1f,   "Track 1 Discretionary Data",                                  EMV_TAG_STRING,   NULL },
+    { 0x9f20,   "Track 2 Discretionary Data",                                  EMV_TAG_STRING,   NULL },
+    { 0x9f21,   "Transaction Time",                                            EMV_TAG_GENERIC,  NULL },
+    { 0x9f22,   "Certification Authority Public Key Index - Terminal",         EMV_TAG_GENERIC,  NULL },
+    { 0x9f23,   "Upper Consecutive Offline Limit",                             EMV_TAG_GENERIC,  NULL },
+    { 0x9f26,   "Application Cryptogram",                                      EMV_TAG_GENERIC,  NULL },
+    { 0x9f27,   "Cryptogram Information Data",                                 EMV_TAG_CID,      NULL },
+    { 0x9f2a,   "Kernel Identifier",                                           EMV_TAG_GENERIC,  NULL },
+    { 0x9f2d,   "ICC PIN Encipherment Public Key Certificate",                 EMV_TAG_GENERIC,  NULL },
+    { 0x9f2e,   "ICC PIN Encipherment Public Key Exponent",                    EMV_TAG_GENERIC,  NULL },
+    { 0x9f2f,   "ICC PIN Encipherment Public Key Remainder",                   EMV_TAG_GENERIC,  NULL },
+    { 0x9f32,   "Issuer Public Key Exponent",                                  EMV_TAG_GENERIC,  NULL },
+    { 0x9f33,   "Terminal Capabilities",                                       EMV_TAG_GENERIC,  NULL },
+    { 0x9f34,   "Cardholder Verification Method (CVM) Results",                EMV_TAG_GENERIC,  NULL },
+    { 0x9f35,   "Terminal Type",                                               EMV_TAG_GENERIC,  NULL },
+    { 0x9f36,   "Application Transaction Counter (ATC)",                       EMV_TAG_GENERIC,  NULL },
+    { 0x9f37,   "Unpredictable Number",                                        EMV_TAG_GENERIC,  NULL },
+    { 0x9f38,   "Processing Options Data Object List (PDOL)",                  EMV_TAG_DOL,      NULL },
+    { 0x9f39,   "Point-of-Service (POS) Entry Mode",                           EMV_TAG_NUMERIC,  NULL },
+    { 0x9f3a,   "Amount, Reference Currency",                                  EMV_TAG_GENERIC,  NULL },
+    { 0x9f3b,   "Application Reference Currency",                              EMV_TAG_NUMERIC,  NULL },
+    { 0x9f3c,   "Transaction Reference Currency Code",                         EMV_TAG_NUMERIC,  NULL },
+    { 0x9f3d,   "Transaction Reference Currency Exponent",                     EMV_TAG_NUMERIC,  NULL },
+    { 0x9f40,   "Additional Terminal Capabilities",                            EMV_TAG_GENERIC,  NULL },
+    { 0x9f41,   "Transaction Sequence Counter",                                EMV_TAG_NUMERIC,  NULL },
+    { 0x9f42,   "Application Currency Code",                                   EMV_TAG_NUMERIC,  NULL },
+    { 0x9f43,   "Application Reference Currency Exponent",                     EMV_TAG_NUMERIC,  NULL },
+    { 0x9f44,   "Application Currency Exponent",                               EMV_TAG_NUMERIC,  NULL },
+    { 0x9f45,   "Data Authentication Code",                                    EMV_TAG_GENERIC,  NULL },
+    { 0x9f46,   "ICC Public Key Certificate",                                  EMV_TAG_GENERIC,  NULL },
+    { 0x9f47,   "ICC Public Key Exponent",                                     EMV_TAG_GENERIC,  NULL },
+    { 0x9f48,   "ICC Public Key Remainder",                                    EMV_TAG_GENERIC,  NULL },
+    { 0x9f49,   "Dynamic Data Authentication Data Object List (DDOL)",         EMV_TAG_DOL,      NULL },
+    { 0x9f4a,   "Static Data Authentication Tag List",                         EMV_TAG_GENERIC,  NULL },
+    { 0x9f4b,   "Signed Dynamic Application Data",                             EMV_TAG_GENERIC,  NULL },
+    { 0x9f4c,   "ICC Dynamic Number",                                          EMV_TAG_GENERIC,  NULL },
+    { 0x9f4d,   "Log Entry",                                                   EMV_TAG_GENERIC,  NULL },
+    { 0x9f4e,   "Merchant Name and Location",                                  EMV_TAG_STRING,   NULL },
+    { 0x9f4f,   "Log Format",                                                  EMV_TAG_DOL,      NULL },
 
-    { 0x9f50, "Offline Accumulator Balance" },
-    { 0x9f51, "Application Currency Code" },
-    { 0x9f51, "DRDOL" },
+    { 0x9f50,   "Offline Accumulator Balance",                                 EMV_TAG_GENERIC,  NULL },
+    { 0x9f51,   "Application Currency Code",                                   EMV_TAG_GENERIC,  NULL },
+    { 0x9f51,   "DRDOL",                                                       EMV_TAG_GENERIC,  NULL },
 
-    { 0x9f52, "Application Default Action (ADA)" },
-    { 0x9f52, "Terminal Compatibility Indicator" },
+    { 0x9f52,   "Application Default Action (ADA)",                            EMV_TAG_GENERIC,  NULL },
+    { 0x9f52,   "Terminal Compatibility Indicator",                            EMV_TAG_GENERIC,  NULL },
 
-    { 0x9f53, "Transaction Category Code" },
-    { 0x9f54, "DS ODS Card" },
+    { 0x9f53,   "Transaction Category Code",                                   EMV_TAG_GENERIC,  NULL },
+    { 0x9f54,   "DS ODS Card",                                                 EMV_TAG_GENERIC,  NULL },
 
-    { 0x9f55, "Mobile Support Indicator" },
-    { 0x9f55, "Issuer Authentication Flags" },
+    { 0x9f55,   "Mobile Support Indicator",                                    EMV_TAG_GENERIC,  NULL },
+    { 0x9f55,   "Issuer Authentication Flags",                                 EMV_TAG_GENERIC,  NULL },
 
-    { 0x9f56, "Issuer Authentication Indicator" },
-    { 0x9f57, "Issuer Country Code" },
-    { 0x9f58, "Consecutive Transaction Counter Limit (CTCL)" },
-    { 0x9f59, "Consecutive Transaction Counter Upper Limit (CTCUL)" },
-    { 0x9f5A, "Application Program Identifier" },
-    { 0x9f5b, "Issuer Script Results" },
-    { 0x9f5c, "Cumulative Total Transaction Amount Upper Limit (CTTAUL)" },
-    { 0x9f5d, "Application Capabilities Information" },
-    { 0x9f5e, "Data Storage Identifier" },
-    { 0x9f5f, "DS Slot Availability" },
+    { 0x9f56,   "Issuer Authentication Indicator",                             EMV_TAG_GENERIC,  NULL },
+    { 0x9f57,   "Issuer Country Code",                                         EMV_TAG_GENERIC,  NULL },
+    { 0x9f58,   "Consecutive Transaction Counter Limit (CTCL)",                EMV_TAG_GENERIC,  NULL },
+    { 0x9f59,   "Consecutive Transaction Counter Upper Limit (CTCUL)",         EMV_TAG_GENERIC,  NULL },
+    { 0x9f5A,   "Application Program Identifier",                              EMV_TAG_GENERIC,  NULL },
+    { 0x9f5b,   "Issuer Script Results",                                       EMV_TAG_GENERIC,  NULL },
+    { 0x9f5c,   "Cumulative Total Transaction Amount Upper Limit (CTTAUL)",    EMV_TAG_GENERIC,  NULL },
+    { 0x9f5d,   "Application Capabilities Information",                        EMV_TAG_GENERIC,  NULL },
+    { 0x9f5e,   "Data Storage Identifier",                                     EMV_TAG_GENERIC,  NULL },
+    { 0x9f5f,   "DS Slot Availability",                                        EMV_TAG_GENERIC,  NULL },
 
-    { 0x9f60, "CVC3 (Track1)" },
-    { 0x9f61, "CVC3 (Track2)" },
-    { 0x9f62, "PCVC3 (Track1)" },
-    { 0x9f63, "PUNATC (Track1)" },
-    { 0x9f64, "NATC (Track1)" },
-    { 0x9f65, "PCVC3 (Track2)" },
-    { 0x9f66, "PUNATC (Track2) / Terminal Transaction Qualifiers (TTQ)", EMV_TAG_BITMASK, &EMV_TTQ },
-    { 0x9f67, "NATC (Track2) / MSD Offset" },
-    { 0x9f68, "Cardholder verification method list (PayPass)" },
-    { 0x9f69, "Card Authentication Related Data (UDOL)" },
-    { 0x9f6a, "Unpredictable Number", EMV_TAG_NUMERIC },
-    { 0x9f6b, "Track 2 Data" },
-    { 0x9f6c, "Card Transaction Qualifiers (CTQ)", EMV_TAG_BITMASK, &EMV_CTQ },
-    { 0x9f6d, "Mag-stripe Application Version Number (Reader)" },
-    { 0x9f6e, "Form Factor Indicator" },
-    { 0x9f6f, "DS Slot Management Control" },
+    { 0x9f60,   "CVC3 (Track1)",                                               EMV_TAG_GENERIC,  NULL },
+    { 0x9f61,   "CVC3 (Track2)",                                               EMV_TAG_GENERIC,  NULL },
+    { 0x9f62,   "PCVC3 (Track1)",                                              EMV_TAG_GENERIC,  NULL },
+    { 0x9f63,   "PUNATC (Track1)",                                             EMV_TAG_GENERIC,  NULL },
+    { 0x9f64,   "NATC (Track1)",                                               EMV_TAG_GENERIC,  NULL },
+    { 0x9f65,   "PCVC3 (Track2)",                                              EMV_TAG_GENERIC,  NULL },
+    { 0x9f66,   "PUNATC (Track2) / Terminal Transaction Qualifiers (TTQ)",     EMV_TAG_BITMASK,  &EMV_TTQ },
+    { 0x9f67,   "NATC (Track2) / MSD Offset",                                  EMV_TAG_GENERIC,  NULL },
+    { 0x9f68,   "Cardholder verification method list (PayPass)",               EMV_TAG_GENERIC,  NULL },
+    { 0x9f69,   "Card Authentication Related Data (UDOL)",                     EMV_TAG_GENERIC,  NULL },
+    { 0x9f6a,   "Unpredictable Number",                                        EMV_TAG_NUMERIC,  NULL },
+    { 0x9f6b,   "Track 2 Data",                                                EMV_TAG_GENERIC,  NULL },
+    { 0x9f6c,   "Card Transaction Qualifiers (CTQ)",                           EMV_TAG_BITMASK,  &EMV_CTQ },
+    { 0x9f6d,   "Mag-stripe Application Version Number (Reader)",              EMV_TAG_GENERIC,  NULL },
+    { 0x9f6e,   "Form Factor Indicator",                                       EMV_TAG_GENERIC,  NULL },
+    { 0x9f6f,   "DS Slot Management Control",                                  EMV_TAG_GENERIC,  NULL },
 
-    { 0x9f70, "Protected Data Envelope 1" },
-    { 0x9f71, "Protected Data Envelope 2" },
-    { 0x9f72, "Protected Data Envelope 3" },
-    { 0x9f73, "Protected Data Envelope 4" },
-    { 0x9f74, "Protected Data Envelope 5" },
-    { 0x9f75, "Unprotected Data Envelope 1" },
-    { 0x9f76, "Unprotected Data Envelope 2" },
-    { 0x9f77, "Unprotected Data Envelope 3" },
-    { 0x9f78, "Unprotected Data Envelope 4" },
-    { 0x9f79, "Unprotected Data Envelope 5" },
-    { 0x9f7c, "Merchant Custom Data / Customer Exclusive Data (CED)" },
-    { 0x9f7d, "DS Summary 1" },
-    { 0x9f7f, "DS Unpredictable Number" },
+    { 0x9f70,   "Protected Data Envelope 1",                                   EMV_TAG_GENERIC,  NULL },
+    { 0x9f71,   "Protected Data Envelope 2",                                   EMV_TAG_GENERIC,  NULL },
+    { 0x9f72,   "Protected Data Envelope 3",                                   EMV_TAG_GENERIC,  NULL },
+    { 0x9f73,   "Protected Data Envelope 4",                                   EMV_TAG_GENERIC,  NULL },
+    { 0x9f74,   "Protected Data Envelope 5",                                   EMV_TAG_GENERIC,  NULL },
+    { 0x9f75,   "Unprotected Data Envelope 1",                                 EMV_TAG_GENERIC,  NULL },
+    { 0x9f76,   "Unprotected Data Envelope 2",                                 EMV_TAG_GENERIC,  NULL },
+    { 0x9f77,   "Unprotected Data Envelope 3",                                 EMV_TAG_GENERIC,  NULL },
+    { 0x9f78,   "Unprotected Data Envelope 4",                                 EMV_TAG_GENERIC,  NULL },
+    { 0x9f79,   "Unprotected Data Envelope 5",                                 EMV_TAG_GENERIC,  NULL },
+    { 0x9f7c,   "Merchant Custom Data / Customer Exclusive Data (CED)",        EMV_TAG_GENERIC,  NULL },
+    { 0x9f7d,   "DS Summary 1",                                                EMV_TAG_GENERIC,  NULL },
+    { 0x9f7f,   "DS Unpredictable Number",                                     EMV_TAG_GENERIC,  NULL },
 
-    { 0xa5, "File Control Information (FCI) Proprietary Template" },
-    { 0xbf0c, "File Control Information (FCI) Issuer Discretionary Data" },
-    { 0xdf20, "Issuer Proprietary Bitmap (IPB)" },
-    { 0xdf4b, "POS Cardholder Interaction Information" },
-    { 0xdf60, "VISA Log Entry" },
-    { 0xdf61, "DS Digest H" },
-    { 0xdf62, "DS ODS Info" },
-    { 0xdf63, "DS ODS Term" },
+    { 0xa5,     "File Control Information (FCI) Proprietary Template",         EMV_TAG_GENERIC,  NULL },
+    { 0xbf0c,   "File Control Information (FCI) Issuer Discretionary Data",    EMV_TAG_GENERIC,  NULL },
+    { 0xdf20,   "Issuer Proprietary Bitmap (IPB)",                             EMV_TAG_GENERIC,  NULL },
+    { 0xdf4b,   "POS Cardholder Interaction Information",                      EMV_TAG_GENERIC,  NULL },
+    { 0xdf60,   "VISA Log Entry",                                              EMV_TAG_GENERIC,  NULL },
+    { 0xdf61,   "DS Digest H",                                                 EMV_TAG_GENERIC,  NULL },
+    { 0xdf62,   "DS ODS Info",                                                 EMV_TAG_GENERIC,  NULL },
+    { 0xdf63,   "DS ODS Term",                                                 EMV_TAG_GENERIC,  NULL },
 
-    { 0xdf8104, "Balance Read Before Gen AC" },
-    { 0xdf8105, "Balance Read After Gen AC" },
-    { 0xdf8106, "Data Needed" },
-    { 0xdf8107, "CDOL1 Related Data" },
-    { 0xdf8108, "DS AC Type" },
-    { 0xdf8109, "DS Input (Term)" },
-    { 0xdf810a, "DS ODS Info For Reader" },
-    { 0xdf810b, "DS Summary Status" },
-    { 0xdf810c, "Kernel ID" },
-    { 0xdf810d, "DSVN Term" },
-    { 0xdf810e, "Post-Gen AC Put Data Status" },
-    { 0xdf810f, "Pre-Gen AC Put Data Status" },
-    { 0xdf8110, "Proceed To First Write Flag" },
-    { 0xdf8111, "PDOL Related Data" },
-    { 0xdf8112, "Tags To Read" },
-    { 0xdf8113, "DRDOL Related Data" },
-    { 0xdf8114, "Reference Control Parameter" },
-    { 0xdf8115, "Error Indication" },
-    { 0xdf8116, "User Interface Request Data" },
-    { 0xdf8117, "Card Data Input Capability" },
-    { 0xdf8118, "CVM Capability - CVM Required" },
-    { 0xdf8119, "CVM Capability - No CVM Required" },
-    { 0xdf811a, "Default UDOL" },
-    { 0xdf811b, "Kernel Configuration" },
-    { 0xdf811c, "Max Lifetime of Torn Transaction Log Record" },
-    { 0xdf811d, "Max Number of Torn Transaction Log Records" },
-    { 0xdf811e, "Mag-stripe CVM Capability – CVM Required" },
-    { 0xdf811f, "Security Capability" },
-    { 0xdf8120, "Terminal Action Code – Default" },
-    { 0xdf8121, "Terminal Action Code – Denial" },
-    { 0xdf8122, "Terminal Action Code – Online" },
-    { 0xdf8123, "Reader Contactless Floor Limit" },
-    { 0xdf8124, "Reader Contactless Transaction Limit (No On-device CVM)" },
-    { 0xdf8125, "Reader Contactless Transaction Limit (On-device CVM)" },
-    { 0xdf8126, "Reader CVM Required Limit" },
-    { 0xdf8127, "TIME_OUT_VALUE" },
-    { 0xdf8128, "IDS Status" },
-    { 0xdf8129, "Outcome Parameter Set" },
-    { 0xdf812a, "DD Card (Track1)" },
-    { 0xdf812b, "DD Card (Track2)" },
-    { 0xdf812c, "Mag-stripe CVM Capability – No CVM Required" },
-    { 0xdf812d, "Message Hold Time" },
+    { 0xdf8104, "Balance Read Before Gen AC",                                  EMV_TAG_GENERIC,  NULL },
+    { 0xdf8105, "Balance Read After Gen AC",                                   EMV_TAG_GENERIC,  NULL },
+    { 0xdf8106, "Data Needed",                                                 EMV_TAG_GENERIC,  NULL },
+    { 0xdf8107, "CDOL1 Related Data",                                          EMV_TAG_GENERIC,  NULL },
+    { 0xdf8108, "DS AC Type",                                                  EMV_TAG_GENERIC,  NULL },
+    { 0xdf8109, "DS Input (Term)",                                             EMV_TAG_GENERIC,  NULL },
+    { 0xdf810a, "DS ODS Info For Reader",                                      EMV_TAG_GENERIC,  NULL },
+    { 0xdf810b, "DS Summary Status",                                           EMV_TAG_GENERIC,  NULL },
+    { 0xdf810c, "Kernel ID",                                                   EMV_TAG_GENERIC,  NULL },
+    { 0xdf810d, "DSVN Term",                                                   EMV_TAG_GENERIC,  NULL },
+    { 0xdf810e, "Post-Gen AC Put Data Status",                                 EMV_TAG_GENERIC,  NULL },
+    { 0xdf810f, "Pre-Gen AC Put Data Status",                                  EMV_TAG_GENERIC,  NULL },
+    { 0xdf8110, "Proceed To First Write Flag",                                 EMV_TAG_GENERIC,  NULL },
+    { 0xdf8111, "PDOL Related Data",                                           EMV_TAG_GENERIC,  NULL },
+    { 0xdf8112, "Tags To Read",                                                EMV_TAG_GENERIC,  NULL },
+    { 0xdf8113, "DRDOL Related Data",                                          EMV_TAG_GENERIC,  NULL },
+    { 0xdf8114, "Reference Control Parameter",                                 EMV_TAG_GENERIC,  NULL },
+    { 0xdf8115, "Error Indication",                                            EMV_TAG_GENERIC,  NULL },
+    { 0xdf8116, "User Interface Request Data",                                 EMV_TAG_GENERIC,  NULL },
+    { 0xdf8117, "Card Data Input Capability",                                  EMV_TAG_GENERIC,  NULL },
+    { 0xdf8118, "CVM Capability - CVM Required",                               EMV_TAG_GENERIC,  NULL },
+    { 0xdf8119, "CVM Capability - No CVM Required",                            EMV_TAG_GENERIC,  NULL },
+    { 0xdf811a, "Default UDOL",                                                EMV_TAG_GENERIC,  NULL },
+    { 0xdf811b, "Kernel Configuration",                                        EMV_TAG_GENERIC,  NULL },
+    { 0xdf811c, "Max Lifetime of Torn Transaction Log Record",                 EMV_TAG_GENERIC,  NULL },
+    { 0xdf811d, "Max Number of Torn Transaction Log Records",                  EMV_TAG_GENERIC,  NULL },
+    { 0xdf811e, "Mag-stripe CVM Capability – CVM Required",                    EMV_TAG_GENERIC,  NULL },
+    { 0xdf811f, "Security Capability",                                         EMV_TAG_GENERIC,  NULL },
+    { 0xdf8120, "Terminal Action Code – Default",                              EMV_TAG_GENERIC,  NULL },
+    { 0xdf8121, "Terminal Action Code – Denial",                               EMV_TAG_GENERIC,  NULL },
+    { 0xdf8122, "Terminal Action Code – Online",                               EMV_TAG_GENERIC,  NULL },
+    { 0xdf8123, "Reader Contactless Floor Limit",                              EMV_TAG_GENERIC,  NULL },
+    { 0xdf8124, "Reader Contactless Transaction Limit (No On-device CVM)",     EMV_TAG_GENERIC,  NULL },
+    { 0xdf8125, "Reader Contactless Transaction Limit (On-device CVM)",        EMV_TAG_GENERIC,  NULL },
+    { 0xdf8126, "Reader CVM Required Limit",                                   EMV_TAG_GENERIC,  NULL },
+    { 0xdf8127, "TIME_OUT_VALUE",                                              EMV_TAG_GENERIC,  NULL },
+    { 0xdf8128, "IDS Status",                                                  EMV_TAG_GENERIC,  NULL },
+    { 0xdf8129, "Outcome Parameter Set",                                       EMV_TAG_GENERIC,  NULL },
+    { 0xdf812a, "DD Card (Track1)",                                            EMV_TAG_GENERIC,  NULL },
+    { 0xdf812b, "DD Card (Track2)",                                            EMV_TAG_GENERIC,  NULL },
+    { 0xdf812c, "Mag-stripe CVM Capability – No CVM Required",                 EMV_TAG_GENERIC,  NULL },
+    { 0xdf812d, "Message Hold Time",                                           EMV_TAG_GENERIC,  NULL },
 
-    { 0xff8101, "Torn Record" },
-    { 0xff8102, "Tags To Write Before Gen AC" },
-    { 0xff8103, "Tags To Write After Gen AC" },
-    { 0xff8104, "Data To Send" },
-    { 0xff8105, "Data Record" },
-    { 0xff8106, "Discretionary Data" },
+    { 0xff8101, "Torn Record",                                                 EMV_TAG_GENERIC,  NULL },
+    { 0xff8102, "Tags To Write Before Gen AC",                                 EMV_TAG_GENERIC,  NULL },
+    { 0xff8103, "Tags To Write After Gen AC",                                  EMV_TAG_GENERIC,  NULL },
+    { 0xff8104, "Data To Send",                                                EMV_TAG_GENERIC,  NULL },
+    { 0xff8105, "Data Record",                                                 EMV_TAG_GENERIC,  NULL },
+    { 0xff8106, "Discretionary Data",                                          EMV_TAG_GENERIC,  NULL },
 };
 
 static int emv_sort_tag(tlv_tag_t tag) {

From 35e97ba96a20a3d99151abf4dcbf1a9e81647e45 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 11 Apr 2019 00:10:21 +0200
Subject: [PATCH 1184/1938] static

---
 client/cmdcrc.c                        |  4 ++--
 client/cmdlfhitag.c                    |  4 +++-
 client/cmdlfindala.c                   |  2 +-
 client/cmdlfnedap.c                    |  2 +-
 client/cmdlfnoralsy.c                  |  2 +-
 client/cmdlfpyramid.c                  |  2 +-
 client/cmdlfsecurakey.c                |  2 +-
 client/cmdlft55xx.h                    |  1 +
 client/cmdlfviking.c                   |  2 +-
 client/cmdscript.c                     |  4 ++--
 client/cmdsmartcard.c                  |  8 ++++----
 client/cmdtrace.c                      | 10 +++++-----
 client/hardnested/hardnested_bf_core.c |  2 +-
 client/pm3_bitlib.c                    |  1 +
 client/scripting.c                     |  2 +-
 common/protocols.c                     | 10 +++++-----
 16 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/client/cmdcrc.c b/client/cmdcrc.c
index 7b1819c0e..dd14dcb50 100644
--- a/client/cmdcrc.c
+++ b/client/cmdcrc.c
@@ -11,7 +11,7 @@
 
 #define MAX_ARGS 20
 
-int split(char *str, char *arr[MAX_ARGS]) {
+static int split(char *str, char *arr[MAX_ARGS]) {
     int beginIndex = 0;
     int endIndex;
     int maxWords = MAX_ARGS;
@@ -389,7 +389,7 @@ int CmdrevengTestC(const char *Cmd) {
 }
 
 //returns a calloced string (needs to be freed)
-char *SwapEndianStr(const char *inStr, const size_t len, const uint8_t blockSize) {
+static char *SwapEndianStr(const char *inStr, const size_t len, const uint8_t blockSize) {
     char *tmp = calloc(len + 1, sizeof(char));
     for (uint8_t block = 0; block < (uint8_t)(len / blockSize); block++) {
         for (size_t i = 0; i < blockSize; i += 2) {
diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index dfbbd3fa3..f627b4733 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -25,9 +25,11 @@
 
 static int CmdHelp(const char *Cmd);
 
-size_t nbytes(size_t nbits) {
+/*
+static size_t nbytes(size_t nbits) {
     return (nbits / 8) + ((nbits % 8) > 0);
 }
+*/
 static int usage_hitag_sniff(void) {
     PrintAndLogEx(NORMAL, "Sniff traffic between Hitag reader and tag. Use " _YELLOW_("`lf hitag list`")" to view collected data.");
     PrintAndLogEx(NORMAL, "Usage:   lf hitag sniff [h] ");
diff --git a/client/cmdlfindala.c b/client/cmdlfindala.c
index 727184406..5bcf52eb0 100644
--- a/client/cmdlfindala.c
+++ b/client/cmdlfindala.c
@@ -52,7 +52,7 @@ static int usage_lf_indala_sim(void) {
 
 // redesigned by marshmellow adjusted from existing decode functions
 // indala id decoding
-int detectIndala(uint8_t *dest, size_t *size, uint8_t *invert) {
+static int detectIndala(uint8_t *dest, size_t *size, uint8_t *invert) {
 
     uint8_t preamble64_i[]  = {0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0};
     uint8_t preamble224_i[] = {0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0};
diff --git a/client/cmdlfnedap.c b/client/cmdlfnedap.c
index 994d44b9e..9758615f8 100644
--- a/client/cmdlfnedap.c
+++ b/client/cmdlfnedap.c
@@ -53,7 +53,7 @@ int detectNedap(uint8_t *dest, size_t *size) {
     return (int) startIdx;
 }
 
-int GetNedapBits(uint32_t cn, uint8_t *nedapBits) {
+static int GetNedapBits(uint32_t cn, uint8_t *nedapBits) {
 
     uint8_t pre[128];
     memset(pre, 0x00, sizeof(pre));
diff --git a/client/cmdlfnoralsy.c b/client/cmdlfnoralsy.c
index d306538da..78727e23c 100644
--- a/client/cmdlfnoralsy.c
+++ b/client/cmdlfnoralsy.c
@@ -76,7 +76,7 @@ int getnoralsyBits(uint32_t id, uint16_t year, uint8_t *bits) {
 
 // by iceman
 // find Noralsy preamble in already demoded data
-int detectNoralsy(uint8_t *dest, size_t *size) {
+static int detectNoralsy(uint8_t *dest, size_t *size) {
     if (*size < 96) return -1; //make sure buffer has data
     size_t startIdx = 0;
     uint8_t preamble[] = {1, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0};
diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c
index 6a8152f9a..03e900bf6 100644
--- a/client/cmdlfpyramid.c
+++ b/client/cmdlfpyramid.c
@@ -72,7 +72,7 @@ int detectPyramid(uint8_t *dest, size_t *size, int *waveStartIdx) {
 }
 
 // Works for 26bits.
-int GetPyramidBits(uint32_t fc, uint32_t cn, uint8_t *pyramidBits) {
+static int GetPyramidBits(uint32_t fc, uint32_t cn, uint8_t *pyramidBits) {
 
     uint8_t pre[128];
     memset(pre, 0x00, sizeof(pre));
diff --git a/client/cmdlfsecurakey.c b/client/cmdlfsecurakey.c
index e5597efce..a3679daaf 100644
--- a/client/cmdlfsecurakey.c
+++ b/client/cmdlfsecurakey.c
@@ -13,7 +13,7 @@ static int CmdHelp(const char *Cmd);
 
 // by marshmellow
 // find Securakey preamble in already demoded data
-int detectSecurakey(uint8_t *dest, size_t *size) {
+static int detectSecurakey(uint8_t *dest, size_t *size) {
     if (*size < 96) return -1; //make sure buffer has data
     size_t startIdx = 0;
     uint8_t preamble[] = {0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1};
diff --git a/client/cmdlft55xx.h b/client/cmdlft55xx.h
index 71526b997..a38b5725f 100644
--- a/client/cmdlft55xx.h
+++ b/client/cmdlft55xx.h
@@ -138,6 +138,7 @@ t55xx_conf_block_t Get_t55xx_Config(void);
 void Set_t55xx_Config(t55xx_conf_block_t conf);
 
 int CmdLFT55XX(const char *Cmd);
+
 int CmdT55xxChk(const char *Cmd);
 int CmdT55xxBruteForce(const char *Cmd);
 int CmdT55xxSetConfig(const char *Cmd);
diff --git a/client/cmdlfviking.c b/client/cmdlfviking.c
index 2f4dea8eb..df23091ed 100644
--- a/client/cmdlfviking.c
+++ b/client/cmdlfviking.c
@@ -38,7 +38,7 @@ static int usage_lf_viking_sim(void) {
 }
 
 // calc checksum
-uint64_t getVikingBits(uint32_t id) {
+static uint64_t getVikingBits(uint32_t id) {
     uint8_t checksum = ((id >> 24) & 0xFF) ^ ((id >> 16) & 0xFF) ^ ((id >> 8) & 0xFF) ^ (id & 0xFF) ^ 0xF2 ^ 0xA8;
     uint64_t ret = (uint64_t)0xF2 << 56;
     ret |= (uint64_t)id << 8;
diff --git a/client/cmdscript.c b/client/cmdscript.c
index 3ffe064e4..b4e2f4bf2 100644
--- a/client/cmdscript.c
+++ b/client/cmdscript.c
@@ -39,7 +39,7 @@
 
 static int CmdHelp(const char *Cmd);
 
-int str_ends_with(const char *str, const char *suffix) {
+static int str_ends_with(const char *str, const char *suffix) {
 
     if (str == NULL || suffix == NULL)
         return 0;
@@ -56,7 +56,7 @@ int str_ends_with(const char *str, const char *suffix) {
 /**
  * Utility to check the ending of a string (used to check file suffix)
  */
-bool endsWith(const char *base, const char *str) {
+static bool endsWith(const char *base, const char *str) {
     int blen = strlen(base);
     int slen = strlen(str);
     return (blen >= slen) && (0 == strcmp(base + blen - slen, str));
diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index c424d6684..c0a41d786 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -109,7 +109,7 @@ out:
     return retval;
 }
 
-uint8_t GetATRTA1(uint8_t *atr, size_t atrlen) {
+static uint8_t GetATRTA1(uint8_t *atr, size_t atrlen) {
     if (atrlen > 2) {
         uint8_t T0 = atr[1];
         if (T0 & 0x10)
@@ -176,17 +176,17 @@ float FArray[] = {
     0     // b1111 RFU
 };
 
-int GetATRDi(uint8_t *atr, size_t atrlen) {
+static int GetATRDi(uint8_t *atr, size_t atrlen) {
     uint8_t TA1 = GetATRTA1(atr, atrlen);
     return DiArray[TA1 & 0x0F];  // The 4 low-order bits of TA1 (4th MSbit to 1st LSbit) encode Di
 }
 
-int GetATRFi(uint8_t *atr, size_t atrlen) {
+static int GetATRFi(uint8_t *atr, size_t atrlen) {
     uint8_t TA1 = GetATRTA1(atr, atrlen);
     return FiArray[TA1 >> 4];  // The 4 high-order bits of TA1 (8th MSbit to 5th LSbit) encode fmax and Fi
 }
 
-float GetATRF(uint8_t *atr, size_t atrlen) {
+static float GetATRF(uint8_t *atr, size_t atrlen) {
     uint8_t TA1 = GetATRTA1(atr, atrlen);
     return FArray[TA1 >> 4];  // The 4 high-order bits of TA1 (8th MSbit to 5th LSbit) encode fmax and Fi
 }
diff --git a/client/cmdtrace.c b/client/cmdtrace.c
index c6b9b5a23..5829c4e2f 100644
--- a/client/cmdtrace.c
+++ b/client/cmdtrace.c
@@ -58,16 +58,16 @@ static int usage_trace_save() {
     return 0;
 }
 
-bool is_last_record(uint16_t tracepos, uint8_t *trace, uint16_t traceLen) {
+static bool is_last_record(uint16_t tracepos, uint8_t *trace, uint16_t traceLen) {
     return (tracepos + sizeof(uint32_t) + sizeof(uint16_t) + sizeof(uint16_t) >= traceLen);
 }
 
-bool next_record_is_response(uint16_t tracepos, uint8_t *trace) {
+static bool next_record_is_response(uint16_t tracepos, uint8_t *trace) {
     uint16_t next_records_datalen = *((uint16_t *)(trace + tracepos + sizeof(uint32_t) + sizeof(uint16_t)));
     return ((next_records_datalen & 0x8000) == 0x8000);
 }
 
-bool merge_topaz_reader_frames(uint32_t timestamp, uint32_t *duration, uint16_t *tracepos, uint16_t traceLen,
+static bool merge_topaz_reader_frames(uint32_t timestamp, uint32_t *duration, uint16_t *tracepos, uint16_t traceLen,
                                uint8_t *trace, uint8_t *frame, uint8_t *topaz_reader_command, uint16_t *data_len) {
 
 #define MAX_TOPAZ_READER_CMD_LEN 16
@@ -105,7 +105,7 @@ bool merge_topaz_reader_frames(uint32_t timestamp, uint32_t *duration, uint16_t
     return true;
 }
 
-uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, uint8_t protocol, bool showWaitCycles, bool markCRCBytes) {
+static uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, uint8_t protocol, bool showWaitCycles, bool markCRCBytes) {
     // sanity check
     if (tracepos + sizeof(uint32_t) + sizeof(uint16_t) + sizeof(uint16_t) > traceLen) return traceLen;
 
@@ -307,7 +307,7 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
     return tracepos;
 }
 
-void printFelica(uint16_t traceLen, uint8_t *trace) {
+static void printFelica(uint16_t traceLen, uint8_t *trace) {
 
     PrintAndLogEx(NORMAL, "ISO18092 / FeliCa - Timings are not as accurate");
     PrintAndLogEx(NORMAL, "    Gap | Src | Data                            | CRC      | Annotation        |");
diff --git a/client/hardnested/hardnested_bf_core.c b/client/hardnested/hardnested_bf_core.c
index 494e13328..da9e19db4 100644
--- a/client/hardnested/hardnested_bf_core.c
+++ b/client/hardnested/hardnested_bf_core.c
@@ -555,7 +555,7 @@ void SetSIMDInstr(SIMDExecInstr instr) {
     bitslice_test_nonces_function_p = &bitslice_test_nonces_dispatch;
 }
 
-SIMDExecInstr GetSIMDInstr() {
+static SIMDExecInstr GetSIMDInstr() {
     SIMDExecInstr instr = SIMD_NONE;
 
 #if defined (__i386__) || defined (__x86_64__)
diff --git a/client/pm3_bitlib.c b/client/pm3_bitlib.c
index 9cb89082f..15fdbd5d0 100644
--- a/client/pm3_bitlib.c
+++ b/client/pm3_bitlib.c
@@ -7,6 +7,7 @@
 #include <limits.h>
 
 #include "pm3_bit_limits.h"
+#include "pm3_bitlib.h"
 
 
 /* FIXME: Assumes lua_Integer is ptrdiff_t */
diff --git a/client/scripting.c b/client/scripting.c
index 795e94711..fb00022d5 100644
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -847,7 +847,7 @@ static int l_T55xx_detect(lua_State *L) {
  * @param path
  * @return
  */
-int setLuaPath(lua_State *L, const char *path) {
+static int setLuaPath(lua_State *L, const char *path) {
     lua_getglobal(L, "package");
     lua_getfield(L, -1, "path");   // get field "path" from table at top of stack (-1)
     const char *cur_path = lua_tostring(L, -1);   // grab path string from top of stack
diff --git a/common/protocols.c b/common/protocols.c
index 188980ee5..809c31704 100644
--- a/common/protocols.c
+++ b/common/protocols.c
@@ -28,15 +28,15 @@ uint32_t GetT55xxClockBit(uint32_t clock) {
 #include "ui.h"
 #define PrintAndLogDevice(level, format, args...)  PrintAndLogEx(level, format , ## args)
 
-uint8_t isset(uint8_t val, uint8_t mask) {
+static uint8_t isset(uint8_t val, uint8_t mask) {
     return (val & mask);
 }
 
-uint8_t notset(uint8_t val, uint8_t mask) {
+static uint8_t notset(uint8_t val, uint8_t mask) {
     return !(val & mask);
 }
 
-void fuse_config(const picopass_hdr *hdr) {
+static void fuse_config(const picopass_hdr *hdr) {
     uint8_t fuses = hdr->conf.fuses;
 
     if (isset(fuses, FUSE_FPERS))
@@ -100,7 +100,7 @@ void getMemConfig(uint8_t mem_cfg, uint8_t chip_cfg, uint8_t *max_blk, uint8_t *
     }
 }
 
-void mem_app_config(const picopass_hdr *hdr) {
+static void mem_app_config(const picopass_hdr *hdr) {
     uint8_t mem = hdr->conf.mem_config;
     uint8_t chip = hdr->conf.chip_config;
     uint8_t applimit = hdr->conf.app_limit;
@@ -136,7 +136,7 @@ void mem_app_config(const picopass_hdr *hdr) {
         PrintAndLogDevice(NORMAL, "\tCredit - Kc");
     }
 }
-void print_picopass_info(const picopass_hdr *hdr) {
+static void print_picopass_info(const picopass_hdr *hdr) {
     fuse_config(hdr);
     mem_app_config(hdr);
 }

From 2879599ac4e7f73d047e058abb91d69fc4999776 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 11 Apr 2019 01:16:25 +0200
Subject: [PATCH 1185/1938] #ifndef on all header files

---
 client/cliparser/cliparser.h       | 3 +++
 client/emv/test/cda_test.h         | 3 +++
 client/emv/test/crypto_test.h      | 3 +++
 client/emv/test/cryptotest.h       | 3 +++
 client/emv/test/dda_test.h         | 3 +++
 client/emv/test/sda_test.h         | 3 +++
 client/jansson/lookup3.h           | 4 ++++
 client/pm3_bit_limits.h            | 3 +++
 client/proxgui.h                   | 4 ++++
 client/reveng/getopt.h             | 5 +++++
 client/tinycbor/tinycbor-version.h | 3 +++
 11 files changed, 37 insertions(+)

diff --git a/client/cliparser/cliparser.h b/client/cliparser/cliparser.h
index 44d9cc12c..66a800f61 100644
--- a/client/cliparser/cliparser.h
+++ b/client/cliparser/cliparser.h
@@ -8,6 +8,8 @@
 // Command line parser core commands
 //-----------------------------------------------------------------------------
 
+#ifndef __CLIPARSER_H
+#define __CLIPARSER_H
 #include "argtable3.h"
 #include "util.h"
 #include <stdbool.h>
@@ -39,3 +41,4 @@ void CLIParserFree(void);
 
 int CLIParamHexToBuf(struct arg_str *argstr, uint8_t *data, int maxdatalen, int *datalen);
 int CLIParamStrToBuf(struct arg_str *argstr, uint8_t *data, int maxdatalen, int *datalen);
+#endif
diff --git a/client/emv/test/cda_test.h b/client/emv/test/cda_test.h
index e535c2eee..1c326e908 100644
--- a/client/emv/test/cda_test.h
+++ b/client/emv/test/cda_test.h
@@ -13,6 +13,9 @@
  * Lesser General Public License for more details.
  */
 
+#ifndef __CDA_TEST_H
+#define __CDA_TEST_H
 #include <stdbool.h>
 
 int exec_cda_test(bool verbose);
+#endif
diff --git a/client/emv/test/crypto_test.h b/client/emv/test/crypto_test.h
index afc8a1515..024a950d5 100644
--- a/client/emv/test/crypto_test.h
+++ b/client/emv/test/crypto_test.h
@@ -13,6 +13,9 @@
  * Lesser General Public License for more details.
  */
 
+#ifndef __CRYPTO_TEST_H
+#define __CRYPTO_TEST_H
 #include <stdbool.h>
 
 int exec_crypto_test(bool verbose);
+#endif
diff --git a/client/emv/test/cryptotest.h b/client/emv/test/cryptotest.h
index 671de244e..74a317e4e 100644
--- a/client/emv/test/cryptotest.h
+++ b/client/emv/test/cryptotest.h
@@ -8,6 +8,9 @@
 // Crypto algorithms testing
 //-----------------------------------------------------------------------------
 
+#ifndef __CRYPTOTEST_H
+#define __CRYPTOTEST_H
 #include <stdbool.h>
 
 int ExecuteCryptoTests(bool verbose);
+#endif
diff --git a/client/emv/test/dda_test.h b/client/emv/test/dda_test.h
index 34381938a..a5c1999a1 100644
--- a/client/emv/test/dda_test.h
+++ b/client/emv/test/dda_test.h
@@ -13,6 +13,9 @@
  * Lesser General Public License for more details.
  */
 
+#ifndef __DDA_TEST_H
+#define __DDA_TEST_H
 #include <stdbool.h>
 
 int exec_dda_test(bool verbose);
+#endif
diff --git a/client/emv/test/sda_test.h b/client/emv/test/sda_test.h
index 696a17f9b..a7b45fbf0 100644
--- a/client/emv/test/sda_test.h
+++ b/client/emv/test/sda_test.h
@@ -13,4 +13,7 @@
  * Lesser General Public License for more details.
  */
 
+#ifndef __SDA_TEST_H
+#define __SDA_TEST_H
 int exec_sda_test(bool verbose);
+#endif
diff --git a/client/jansson/lookup3.h b/client/jansson/lookup3.h
index 45f477480..265e3f7db 100644
--- a/client/jansson/lookup3.h
+++ b/client/jansson/lookup3.h
@@ -34,6 +34,9 @@ on 1 byte), but shoehorning those bytes into integers efficiently is messy.
 -------------------------------------------------------------------------------
 */
 
+#ifndef LOOKUP3_H
+#define LOOKUP3_H
+
 #include <stdlib.h>
 
 #ifdef HAVE_CONFIG_H
@@ -454,3 +457,4 @@ static uint32_t hashlittle(const void *key, size_t length, uint32_t initval) {
     final(a, b, c);
     return c;
 }
+#endif
diff --git a/client/pm3_bit_limits.h b/client/pm3_bit_limits.h
index 943b2fd7e..9bf06e16e 100644
--- a/client/pm3_bit_limits.h
+++ b/client/pm3_bit_limits.h
@@ -1,4 +1,7 @@
+#ifndef __BITLIB_LIMITS_H
+#define __BITLIB_LIMITS_H
 #define BITLIB_FLOAT_BITS 53
 #define BITLIB_FLOAT_MAX  0xfffffffffffffL
 #define BITLIB_FLOAT_MIN  (-0x10000000000000L)
 #define BITLIB_FLOAT_UMAX 0x1fffffffffffffUL
+#endif
diff --git a/client/proxgui.h b/client/proxgui.h
index 0d43e7823..613f793d1 100644
--- a/client/proxgui.h
+++ b/client/proxgui.h
@@ -8,6 +8,9 @@
 // GUI functions
 //-----------------------------------------------------------------------------
 
+#ifndef __PROXGUI_H
+#define __PROXGUI_H
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -53,3 +56,4 @@ extern uint8_t g_debugMode;
 #ifdef __cplusplus
 }
 #endif
+#endif
diff --git a/client/reveng/getopt.h b/client/reveng/getopt.h
index bf66d9b13..c4b77d31e 100644
--- a/client/reveng/getopt.h
+++ b/client/reveng/getopt.h
@@ -20,6 +20,11 @@
     Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
+#ifndef __GETOPT_H
+#define __GETOPT_H
+
 extern char *optarg;
 extern int optind, opterr, optopt, pos;
 int getopt(int argc, char *argv[], const char *optstring);
+
+#endif
diff --git a/client/tinycbor/tinycbor-version.h b/client/tinycbor/tinycbor-version.h
index 29967d025..e1865cee3 100644
--- a/client/tinycbor/tinycbor-version.h
+++ b/client/tinycbor/tinycbor-version.h
@@ -1,3 +1,6 @@
+#ifndef __TINYCBOR_VERSION_H
+#define __TINYCBOR_VERSION_H
 #define TINYCBOR_VERSION_MAJOR      0
 #define TINYCBOR_VERSION_MINOR      5
 #define TINYCBOR_VERSION_PATCH      3
+#endif

From 8d479e3a6866f42baa6c476b59a49883e7c0a1b9 Mon Sep 17 00:00:00 2001
From: David Beauchamp <david@davidbeauchamp.com>
Date: Wed, 10 Apr 2019 20:34:42 -0400
Subject: [PATCH 1186/1938] Add 36bit HID format, extend calcWiegand() to
 include oem bits

---
 client/cmdlfhid.c | 32 +++++++++++++++++++++++++++-----
 client/cmdlfhid.h |  2 +-
 client/util.c     |  9 +++++++++
 client/util.h     |  1 +
 4 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c
index 26e557479..d07550c20 100644
--- a/client/cmdlfhid.c
+++ b/client/cmdlfhid.c
@@ -108,7 +108,7 @@ static bool sendTry(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint32_t delay, ui
     if (verbose)
         PrintAndLogEx(INFO, "Trying FC: %u; CN: %u", fc, cn);
 
-    calcWiegand(fmtlen, fc, cn, bits);
+    calcWiegand(fmtlen, fc, cn, bits, 0);
 
     uint64_t arg1 = bytebits_to_byte(bits, 32);
     uint64_t arg2 = bytebits_to_byte(bits + 32, 32);
@@ -171,6 +171,7 @@ int CmdHIDDemod(const char *Cmd) {
         uint32_t cc = 0;
         uint32_t fc = 0;
         uint32_t cardnum = 0;
+        uint8_t oem = 0;
         if (((hi >> 5) & 1) == 1) {//if bit 38 is set then < 37 bit format is used
             uint32_t lo2 = 0;
             lo2 = (((hi & 31) << 12) | (lo >> 20)); //get bits 21-37 to check for format len bit
@@ -199,6 +200,11 @@ int CmdHIDDemod(const char *Cmd) {
                 cardnum = (lo >> 1) & 0xFFFFF;
                 fc = ((hi & 1) << 11) | (lo >> 21);
             }
+            if(fmtLen==36){
+                oem = (lo >> 1) & 0x3;
+                cardnum = (lo >> 3) & 0xFFFF;
+                fc = (hi & 0x7) << 13 | ((lo >> 19) & 0xFFFF);
+            }
         } else { //if bit 38 is not set then 37 bit format is used
             fmtLen = 37;
             fc = 0;
@@ -211,7 +217,8 @@ int CmdHIDDemod(const char *Cmd) {
         if (fmtLen == 32 && (lo & 0x40000000)) { //if 32 bit and Kastle bit set
             PrintAndLogEx(SUCCESS, "HID Prox TAG (Kastle format) ID: %08x (%u) - Format Len: 32bit - CC: %u - FC: %u - Card: %u", lo, (lo >> 1) & 0xFFFF, cc, fc, cardnum);
         } else {
-            PrintAndLogEx(SUCCESS, "HID Prox TAG ID: %x%08x (%u) - Format Len: %ubit - FC: %u - Card: %u", hi, lo, (lo >> 1) & 0xFFFF, fmtLen, fc, cardnum);
+            PrintAndLogEx(NORMAL, "HID Prox TAG ID: %x%08x (%u) - Format Len: %ubit - OEM: %03u - FC: %u - Card: %u",
+                                  hi, lo, cardnum, fmtLen, oem, fc, cardnum);
         }
     }
 
@@ -398,6 +405,18 @@ static void calc34(uint16_t fc, uint32_t cardno, uint8_t *out) {
 // *lo = ((cardno & 0xFFFFF) << 1) | fc << 21;
 // *hi = (1 << 5) | ((fc >> 11) & 1);
 // }
+static void calc36(uint8_t oem, uint16_t fc, uint32_t cardno, uint8_t *out){
+    // FC     1  - 16  - 16 bit
+    // cardno 17 - 33  - 16 bit
+    // oem    34 - 35  -  2 bit
+    // Odd  Parity  0th bit  1-18
+    // Even Parity 36th bit 19-35
+    uint8_t wiegand[34];
+    num_to_bytebits(fc, 16, wiegand);
+    num_to_bytebits(cardno & 0xFFFF, 16, wiegand + 16);
+    num_to_bytebits(oem, 2, wiegand + 32);
+    wiegand_add_parity_swapped(out, wiegand, sizeof(wiegand));
+}
 static void calc37S(uint16_t fc, uint32_t cardno, uint8_t *out) {
     // FC 2 - 17   - 16 bit
     // cardno 18 - 36  - 19 bit
@@ -426,7 +445,7 @@ static void calc37H(uint64_t cardno, uint8_t *out) {
 // *hi = (cardno >> 31);
 // }
 
-void calcWiegand(uint8_t fmtlen, uint16_t fc, uint64_t cardno, uint8_t *bits) {
+void calcWiegand(uint8_t fmtlen, uint16_t fc, uint64_t cardno, uint8_t *bits, uint8_t oem) {
     uint32_t cn32 = (cardno & 0xFFFFFFFF);
     switch (fmtlen) {
         case 26:
@@ -437,6 +456,9 @@ void calcWiegand(uint8_t fmtlen, uint16_t fc, uint64_t cardno, uint8_t *bits) {
             calc34(fc, cn32, bits);
             break;
         // case 35 : calc35(fc, cn32, bits); break;
+        case 36:
+            calc36(oem, fc, cn32, bits);
+            break;
         case 37:
             calc37S(fc, cn32, bits);
             break;
@@ -464,13 +486,13 @@ int CmdHIDWiegand(const char *Cmd) {
     fc = param_get32ex(Cmd, 1, 0, 10);
     cardnum = param_get64ex(Cmd, 2, 0, 10);
 
-    uint8_t fmtlen[] = {26, 33, 34, 35, 37, 38, 40};
+    uint8_t fmtlen[] = {26, 33, 34, 35, 36, 37, 38, 40};
 
     PrintAndLogEx(NORMAL, "HID | OEM | FC   | CN      |  Wiegand  |  HID Formatted");
     PrintAndLogEx(NORMAL, "----+-----+------+---------+-----------+--------------------");
     for (uint8_t i = 0; i < sizeof(fmtlen); i++) {
         memset(bits, 0x00, sizeof(bits));
-        calcWiegand(fmtlen[i], fc, cardnum, bs);
+        calcWiegand(fmtlen[i], fc, cardnum, bs, oem);
         PrintAndLogEx(NORMAL, "ice:: %s \n", sprint_bin(bs, fmtlen[i]));
         uint64_t wiegand = (uint64_t)bytebits_to_byte(bs, 32) << 32 | bytebits_to_byte(bs + 32, 32);
 
diff --git a/client/cmdlfhid.h b/client/cmdlfhid.h
index 715de60ce..f7d3802f0 100644
--- a/client/cmdlfhid.h
+++ b/client/cmdlfhid.h
@@ -33,5 +33,5 @@ int CmdHIDWiegand(const char *Cmd);
 int CmdHIDBrute(const char *Cmd);
 
 //void calc26(uint16_t fc, uint32_t cardno, uint8_t *out);
-void calcWiegand(uint8_t fmtlen, uint16_t fc, uint64_t cardno, uint8_t *bits);
+void calcWiegand(uint8_t fmtlen, uint16_t fc, uint64_t cardno, uint8_t *bits, uint8_t oem);
 #endif
diff --git a/client/util.c b/client/util.c
index f64e9f342..edcd93bb2 100644
--- a/client/util.c
+++ b/client/util.c
@@ -751,6 +751,15 @@ void wiegand_add_parity(uint8_t *target, uint8_t *source, uint8_t length) {
     *(target) = GetParity(source + length / 2, ODD, length / 2);
 }
 
+// add HID parity to binary array: ODD prefix for 1st half of ID, EVEN suffix for 2nd half
+void wiegand_add_parity_swapped(uint8_t *target, uint8_t *source, uint8_t length)
+{
+    *(target++)= GetParity(source, ODD, length / 2);
+    memcpy(target, source, length);
+    target += length;
+    *(target)= GetParity(source + length / 2, EVEN, length / 2);
+}
+
 // xor two arrays together for len items.  The dst array contains the new xored values.
 void xor(unsigned char *dst, unsigned char *src, size_t len) {
     for (; len > 0; len--, dst++, src++)
diff --git a/client/util.h b/client/util.h
index 5d6643c73..5ee0ae472 100644
--- a/client/util.h
+++ b/client/util.h
@@ -245,6 +245,7 @@ int binarraytohex(char *target, const size_t targetlen, char *source, size_t src
 void binarraytobinstring(char *target,  char *source, int length);
 uint8_t GetParity(uint8_t *bits, uint8_t type, int length);
 void wiegand_add_parity(uint8_t *target, uint8_t *source, uint8_t length);
+void wiegand_add_parity_swapped(uint8_t *target, uint8_t *source, uint8_t length);
 
 void xor(unsigned char *dst, unsigned char *src, size_t len);
 int32_t le24toh(uint8_t data[3]);

From 5317fa02776d41f93ae53d488b717d4c8660091d Mon Sep 17 00:00:00 2001
From: David Beauchamp <david@davidbeauchamp.com>
Date: Wed, 10 Apr 2019 20:44:21 -0400
Subject: [PATCH 1187/1938] Restore log level

---
 client/cmdlfhid.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c
index d07550c20..91bd785b3 100644
--- a/client/cmdlfhid.c
+++ b/client/cmdlfhid.c
@@ -217,7 +217,7 @@ int CmdHIDDemod(const char *Cmd) {
         if (fmtLen == 32 && (lo & 0x40000000)) { //if 32 bit and Kastle bit set
             PrintAndLogEx(SUCCESS, "HID Prox TAG (Kastle format) ID: %08x (%u) - Format Len: 32bit - CC: %u - FC: %u - Card: %u", lo, (lo >> 1) & 0xFFFF, cc, fc, cardnum);
         } else {
-            PrintAndLogEx(NORMAL, "HID Prox TAG ID: %x%08x (%u) - Format Len: %ubit - OEM: %03u - FC: %u - Card: %u",
+            PrintAndLogEx(SUCCESS, "HID Prox TAG ID: %x%08x (%u) - Format Len: %ubit - OEM: %03u - FC: %u - Card: %u",
                                   hi, lo, cardnum, fmtLen, oem, fc, cardnum);
         }
     }

From 7547952a4d8f256cb66171c555f03b42c77858fc Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 11 Apr 2019 07:40:50 +0200
Subject: [PATCH 1188/1938] style

---
 client/cmdlfhid.c     | 6 +++---
 client/cmdtrace.c     | 2 +-
 client/emv/apduinfo.c | 2 +-
 client/util.c         | 7 +++----
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c
index 91bd785b3..c07fc2c1f 100644
--- a/client/cmdlfhid.c
+++ b/client/cmdlfhid.c
@@ -200,7 +200,7 @@ int CmdHIDDemod(const char *Cmd) {
                 cardnum = (lo >> 1) & 0xFFFFF;
                 fc = ((hi & 1) << 11) | (lo >> 21);
             }
-            if(fmtLen==36){
+            if (fmtLen == 36) {
                 oem = (lo >> 1) & 0x3;
                 cardnum = (lo >> 3) & 0xFFFF;
                 fc = (hi & 0x7) << 13 | ((lo >> 19) & 0xFFFF);
@@ -218,7 +218,7 @@ int CmdHIDDemod(const char *Cmd) {
             PrintAndLogEx(SUCCESS, "HID Prox TAG (Kastle format) ID: %08x (%u) - Format Len: 32bit - CC: %u - FC: %u - Card: %u", lo, (lo >> 1) & 0xFFFF, cc, fc, cardnum);
         } else {
             PrintAndLogEx(SUCCESS, "HID Prox TAG ID: %x%08x (%u) - Format Len: %ubit - OEM: %03u - FC: %u - Card: %u",
-                                  hi, lo, cardnum, fmtLen, oem, fc, cardnum);
+                          hi, lo, cardnum, fmtLen, oem, fc, cardnum);
         }
     }
 
@@ -405,7 +405,7 @@ static void calc34(uint16_t fc, uint32_t cardno, uint8_t *out) {
 // *lo = ((cardno & 0xFFFFF) << 1) | fc << 21;
 // *hi = (1 << 5) | ((fc >> 11) & 1);
 // }
-static void calc36(uint8_t oem, uint16_t fc, uint32_t cardno, uint8_t *out){
+static void calc36(uint8_t oem, uint16_t fc, uint32_t cardno, uint8_t *out) {
     // FC     1  - 16  - 16 bit
     // cardno 17 - 33  - 16 bit
     // oem    34 - 35  -  2 bit
diff --git a/client/cmdtrace.c b/client/cmdtrace.c
index 5829c4e2f..df12ac420 100644
--- a/client/cmdtrace.c
+++ b/client/cmdtrace.c
@@ -68,7 +68,7 @@ static bool next_record_is_response(uint16_t tracepos, uint8_t *trace) {
 }
 
 static bool merge_topaz_reader_frames(uint32_t timestamp, uint32_t *duration, uint16_t *tracepos, uint16_t traceLen,
-                               uint8_t *trace, uint8_t *frame, uint8_t *topaz_reader_command, uint16_t *data_len) {
+                                      uint8_t *trace, uint8_t *frame, uint8_t *topaz_reader_command, uint16_t *data_len) {
 
 #define MAX_TOPAZ_READER_CMD_LEN 16
 
diff --git a/client/emv/apduinfo.c b/client/emv/apduinfo.c
index 8d0d3bf89..c497eb4f8 100644
--- a/client/emv/apduinfo.c
+++ b/client/emv/apduinfo.c
@@ -277,7 +277,7 @@ int CodeCmp(const char *code1, const char *code2) {
     return -1;
 }
 
-const APDUCode * GetAPDUCode(uint8_t sw1, uint8_t sw2) {
+const APDUCode *GetAPDUCode(uint8_t sw1, uint8_t sw2) {
     char buf[6] = {0};
     int res;
     int mineq = APDUCodeTableLen;
diff --git a/client/util.c b/client/util.c
index edcd93bb2..7febdac9f 100644
--- a/client/util.c
+++ b/client/util.c
@@ -752,12 +752,11 @@ void wiegand_add_parity(uint8_t *target, uint8_t *source, uint8_t length) {
 }
 
 // add HID parity to binary array: ODD prefix for 1st half of ID, EVEN suffix for 2nd half
-void wiegand_add_parity_swapped(uint8_t *target, uint8_t *source, uint8_t length)
-{
-    *(target++)= GetParity(source, ODD, length / 2);
+void wiegand_add_parity_swapped(uint8_t *target, uint8_t *source, uint8_t length) {
+    *(target++) = GetParity(source, ODD, length / 2);
     memcpy(target, source, length);
     target += length;
-    *(target)= GetParity(source + length / 2, EVEN, length / 2);
+    *(target) = GetParity(source + length / 2, EVEN, length / 2);
 }
 
 // xor two arrays together for len items.  The dst array contains the new xored values.

From fb8d7c3efada0596fcd0f4b8f379bada62d44252 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 11 Apr 2019 17:18:17 +0200
Subject: [PATCH 1189/1938] textual

---
 client/cmdhf14a.c    | 2 +-
 client/cmdhf14b.c    | 2 +-
 client/cmdhf15.c     | 2 +-
 client/cmdhffelica.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index c7790f65b..b5c13f4f2 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -1431,7 +1431,7 @@ int CmdHF14AChaining(const char *Cmd) {
 
 static command_t CommandTable[] = {
     {"help",        CmdHelp,              1, "This help"},
-    {"list",        CmdHF14AList,         0, "[Deprecated] List ISO 14443-a history"},
+    {"list",        CmdHF14AList,         0, "List ISO 14443-a history"},
     {"info",        CmdHF14AInfo,         0, "Tag information"},
     {"reader",      CmdHF14AReader,       0, "Act like an ISO14443-a reader"},
     {"cuids",       CmdHF14ACUIDs,        0, "<n> Collect n>0 ISO14443-a UIDs in one go"},
diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c
index d094fcbf7..222d7efdc 100644
--- a/client/cmdhf14b.c
+++ b/client/cmdhf14b.c
@@ -1134,7 +1134,7 @@ static command_t CommandTable[] = {
     {"help",        CmdHelp,        1, "This help"},
     {"dump",        CmdHF14BDump,   0, "Read all memory pages of an ISO14443-B tag, save to file"},
     {"info",        CmdHF14Binfo,   0, "Tag information"},
-    {"list",        CmdHF14BList,   0, "[Deprecated] List ISO 14443B history"},
+    {"list",        CmdHF14BList,   0, "List ISO 14443B history"},
     {"raw",         CmdHF14BCmdRaw, 0, "Send raw hex data to tag"},
     {"reader",      CmdHF14BReader, 0, "Act as a 14443B reader to identify a tag"},
     {"sim",         CmdHF14BSim,    0, "Fake ISO 14443B tag"},
diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index 9a1cc13e8..baddb6893 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -1310,7 +1310,7 @@ static command_t CommandTable15[] = {
     {"dump",        CmdHF15Dump,        0, "Read all memory pages of an ISO15693 tag, save to file"},
     {"findafi",     CmdHF15Afi,         0, "Brute force AFI of an ISO15693 tag"},
     {"info",        CmdHF15Info,        0, "Tag information"},
-    {"list",        CmdHF15List,        0, "[Deprecated] List ISO15693 history"},
+    {"list",        CmdHF15List,        0, "List ISO15693 history"},
     {"raw",         CmdHF15Raw,         0, "Send raw hex data to tag"},
     {"reader",      CmdHF15Reader,      0, "Act like an ISO15693 reader"},
     {"record",      CmdHF15Record,      0, "Record Samples (ISO15693)"},
diff --git a/client/cmdhffelica.c b/client/cmdhffelica.c
index 7597f6bfe..9dfcd5580 100644
--- a/client/cmdhffelica.c
+++ b/client/cmdhffelica.c
@@ -589,7 +589,7 @@ void waitCmdFelica(uint8_t iSelect) {
 
 static command_t CommandTable[] = {
     {"help",      CmdHelp,              1, "This help"},
-    {"list",      CmdHFFelicaList,      0, "[Deprecated] List ISO 18092/FeliCa history"},
+    {"list",      CmdHFFelicaList,      0, "List ISO 18092/FeliCa history"},
     {"reader",    CmdHFFelicaReader,    0, "Act like an ISO18092/FeliCa reader"},
     {"sim",       CmdHFFelicaSim,       0, "<UID> -- Simulate ISO 18092/FeliCa tag"},
     {"sniff",     CmdHFFelicaSniff,     0, "sniff ISO 18092/Felica traffic"},

From a872f04c1eff1bf12c69afee5035c4177d45a857 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 11 Apr 2019 17:19:48 +0200
Subject: [PATCH 1190/1938] textual

---
 client/cmdhficlass.c | 2 +-
 client/cmdhflegic.c  | 2 +-
 client/cmdhfmf.c     | 2 +-
 client/cmdhftopaz.c  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index 902f635b2..57ff3b05c 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -2496,7 +2496,7 @@ static command_t CommandTable[] = {
     {"dump",        CmdHFiClassReader_Dump,     0, "[options..] Authenticate and Dump iClass tag's AA1"},
     {"eload",       CmdHFiClassELoad,           0, "[f <fname>] (experimental) Load data into iClass emulator memory"},
     {"encryptblk",  CmdHFiClassEncryptBlk,      1, "<BlockData> Encrypt given block data"},
-    {"list",        CmdHFiClassList,            0, "            (Deprecated) List iClass history"},
+    {"list",        CmdHFiClassList,            0, "            List iClass history"},
     {"loclass",     CmdHFiClass_loclass,        1, "[options..] Use loclass to perform bruteforce of reader attack dump"},
     {"lookup",      CmdHFiClassLookUp,          1, "[options..] Uses authentication trace to check for key in dictionary file"},
     {"managekeys",  CmdHFiClassManageKeys,      1, "[options..] Manage the keys to use with iClass"},
diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index 140123b53..d4f1a4d3c 100644
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -1301,7 +1301,7 @@ static command_t CommandTable[] =  {
     {"crc",     CmdLegicCalcCrc,  1, "Calculate Legic CRC over given bytes"},
     {"eload",   CmdLegicELoad,    1, "Load binary dump to emulator memory"},
     {"esave",   CmdLegicESave,    1, "Save emulator memory to binary file"},
-    {"list",    CmdLegicList,     1, "[Deprecated] List LEGIC history"},
+    {"list",    CmdLegicList,     1, "List LEGIC history"},
     {"wipe",    CmdLegicWipe,     1, "Wipe a LEGIC Prime tag"},
     {NULL, NULL, 0, NULL}
 };
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 39f8c2e73..07586881e 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -3526,7 +3526,7 @@ int CmdHF14AMfList(const char *Cmd) {
 
 static command_t CommandTable[] = {
     {"help",        CmdHelp,                1, "This help"},
-    {"list",        CmdHF14AMfList,         0, "[Deprecated] List ISO 14443-a / Mifare history"},
+    {"list",        CmdHF14AMfList,         0, "List Mifare history"},
     {"darkside",    CmdHF14AMfDarkside,     0, "Darkside attack. read parity error messages."},
     {"nested",      CmdHF14AMfNested,       0, "Nested attack. Test nested authentication"},
     {"hardnested",  CmdHF14AMfNestedHard,   0, "Nested attack for hardened Mifare cards"},
diff --git a/client/cmdhftopaz.c b/client/cmdhftopaz.c
index 948c7c191..64cf09647 100644
--- a/client/cmdhftopaz.c
+++ b/client/cmdhftopaz.c
@@ -513,7 +513,7 @@ static command_t CommandTable[] = {
     {"sim",     CmdHFTopazSim,      0, "<UID> -- Simulate Topaz tag"},
     {"sniff",   CmdHF14ASniff,      0, "Sniff Topaz reader-tag communication"},
     {"raw",     CmdHFTopazCmdRaw,   0, "Send raw hex data to tag"},
-    {"list",    CmdHFTopazList,     0, "[Deprecated] List Topaz history"},
+    {"list",    CmdHFTopazList,     0, "List Topaz history"},
     {NULL,      NULL,               0, NULL}
 };
 

From 6609db82abde95907f88c2a033b6c9d7048905e6 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 11 Apr 2019 17:20:08 +0200
Subject: [PATCH 1191/1938] textual

---
 client/emv/cmdemv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index 81cf63063..993aee37b 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -1961,7 +1961,7 @@ static command_t CommandTable[] =  {
     {"sim",         CmdEmvSim,                      0, "simulate EMV tag"},
     {"clone",       CmdEmvClone,                    0, "clone an EMV tag"},
     */
-    {"list",        CmdEMVList,                     0, "[Deprecated] List ISO7816 history"},
+    {"list",        CmdEMVList,                     0, "List ISO7816 history"},
     {"roca",        CmdEMVRoca,                     0, "Extract public keys and run ROCA test"},
     {NULL, NULL, 0, NULL}
 };

From 20393d71a848ae4402eaf0c2eeded6bf2cbf517b Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 11 Apr 2019 19:43:48 +0200
Subject: [PATCH 1192/1938] hardnested_tables: add C99 flag in suggested
 compilation

---
 client/hardnested/hardnested_tables.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/hardnested/hardnested_tables.c b/client/hardnested/hardnested_tables.c
index 912ad5cc4..91e3b3cd3 100644
--- a/client/hardnested/hardnested_tables.c
+++ b/client/hardnested/hardnested_tables.c
@@ -20,7 +20,7 @@
 //-----------------------------------------------------------------------------
 
 // To compile it:
-// gcc -I ../../common -o hardnested_tables hardnested_tables.c
+// gcc -std=c99 -I ../../common -o hardnested_tables hardnested_tables.c
 
 #include <inttypes.h>
 #include <stdbool.h>

From 172748a82ca006d75403cf69d4b567fd99e67e7e Mon Sep 17 00:00:00 2001
From: Eloff <eloff@mail.ru>
Date: Fri, 12 Apr 2019 00:10:52 +0300
Subject: [PATCH 1193/1938] BugFix.'mifaresim.c' used wrong Uart reference

---
 armsrc/mifaresim.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/armsrc/mifaresim.c b/armsrc/mifaresim.c
index 4f32f6b53..fb89b2909 100644
--- a/armsrc/mifaresim.c
+++ b/armsrc/mifaresim.c
@@ -34,8 +34,6 @@
 #include "protocols.h"
 #include "apps.h"
 
-static tUart Uart;
-
 uint8_t MifareCardType;
 
 static bool IsTrailerAccessAllowed(uint8_t blockNo, uint8_t keytype, uint8_t action) {
@@ -453,6 +451,8 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
     uint8_t rAUTH_NT_keystream[4];
     uint32_t nonce = 0;
 
+    tUart *uart = GetUart(); 
+
     if ((flags & FLAG_MF_MINI) == FLAG_MF_MINI) {
         MifareCardType = 0;
         Dbprintf("Mifare Mini");
@@ -544,7 +544,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
             case MFEMUL_HALTED:
                 if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("MFEMUL_HALTED");
             case MFEMUL_IDLE: {
-                LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                LogTrace(uart->output, uart->len, uart->startTime * 16 - DELAY_AIR2ARM_AS_TAG, uart->endTime * 16 - DELAY_AIR2ARM_AS_TAG, uart->parity, true);
                 if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("MFEMUL_IDLE");
                 break;
             }
@@ -709,7 +709,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
 
             case MFEMUL_SELECT3: {
                 if (!uid_len) {
-                    LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                    LogTrace(uart->output, uart->len, uart->startTime * 16 - DELAY_AIR2ARM_AS_TAG, uart->endTime * 16 - DELAY_AIR2ARM_AS_TAG, uart->parity, true);
                     break;
                 }
                 if (receivedCmd_len == 2 && (receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_3 && receivedCmd[1] == 0x20)) {
@@ -999,7 +999,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
 
                 // case MFEMUL_WORK => CMD HALT
                 if (receivedCmd_len > 1 && receivedCmd_dec[0] == ISO14443A_CMD_HALT && receivedCmd_dec[1] == 0x00) {
-                    LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                    LogTrace(uart->output, uart->len, uart->startTime * 16 - DELAY_AIR2ARM_AS_TAG, uart->endTime * 16 - DELAY_AIR2ARM_AS_TAG, uart->parity, true);
                     LED_B_OFF();
                     LED_C_OFF();
                     cardSTATE = MFEMUL_HALTED;
@@ -1027,7 +1027,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
 
                 if (receivedCmd_len != 8) {
                     cardSTATE_TO_IDLE();
-                    LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                    LogTrace(uart->output, uart->len, uart->startTime * 16 - DELAY_AIR2ARM_AS_TAG, uart->endTime * 16 - DELAY_AIR2ARM_AS_TAG, uart->parity, true);
                     if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("MFEMUL_AUTH1: receivedCmd_len != 8 (%d) => cardSTATE_TO_IDLE())", receivedCmd_len);
                     break;
                 }
@@ -1164,7 +1164,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                 }
                 cardSTATE_TO_IDLE();
                 if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WRITEBL2] cardSTATE = MFEMUL_IDLE");
-                LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                LogTrace(uart->output, uart->len, uart->startTime * 16 - DELAY_AIR2ARM_AS_TAG, uart->endTime * 16 - DELAY_AIR2ARM_AS_TAG, uart->parity, true);
                 break;
             }
 
@@ -1177,7 +1177,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                         cardSTATE_TO_IDLE();
                         break;
                     }
-                    LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                    LogTrace(uart->output, uart->len, uart->startTime * 16 - DELAY_AIR2ARM_AS_TAG, uart->endTime * 16 - DELAY_AIR2ARM_AS_TAG, uart->parity, true);
                     cardINTREG = cardINTREG + ans;
 
                     cardSTATE = MFEMUL_WORK;
@@ -1197,7 +1197,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                         break;
                     }
                 }
-                LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                LogTrace(uart->output, uart->len, uart->startTime * 16 - DELAY_AIR2ARM_AS_TAG, uart->endTime * 16 - DELAY_AIR2ARM_AS_TAG, uart->parity, true);
                 cardINTREG = cardINTREG - ans;
                 cardSTATE = MFEMUL_WORK;
                 if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_INTREG_DEC] cardSTATE = MFEMUL_WORK");
@@ -1212,7 +1212,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                     cardSTATE_TO_IDLE();
                     break;
                 }
-                LogTrace(Uart.output, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+                LogTrace(uart->output, uart->len, uart->startTime * 16 - DELAY_AIR2ARM_AS_TAG, uart->endTime * 16 - DELAY_AIR2ARM_AS_TAG, uart->parity, true);
                 cardSTATE = MFEMUL_WORK;
                 if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_INTREG_REST] cardSTATE = MFEMUL_WORK");
                 break;

From 15f2fb4010343b511a4aafe8f1a3353116eef9b7 Mon Sep 17 00:00:00 2001
From: Eloff <eloff@mail.ru>
Date: Fri, 12 Apr 2019 00:35:02 +0300
Subject: [PATCH 1194/1938] duplicate method

---
 armsrc/mifaresim.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/armsrc/mifaresim.c b/armsrc/mifaresim.c
index fb89b2909..3b7e91687 100644
--- a/armsrc/mifaresim.c
+++ b/armsrc/mifaresim.c
@@ -370,12 +370,6 @@ static bool MifareSimInit(uint16_t flags, uint8_t *datain, tag_response_info_t *
     return true;
 }
 
-static bool HasValidCRC(uint8_t *receivedCmd, uint16_t receivedCmd_len) {
-    uint8_t CRC_byte_1, CRC_byte_2;
-    compute_crc(CRC_14443_A, receivedCmd, receivedCmd_len - 2, &CRC_byte_1, &CRC_byte_2);
-    return (receivedCmd[receivedCmd_len - 2] == CRC_byte_1 && receivedCmd[receivedCmd_len - 1] == CRC_byte_2);
-}
-
 
 /**
 *MIFARE 1K simulate.
@@ -772,7 +766,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                     memcpy(receivedCmd_dec, receivedCmd, receivedCmd_len);
                 }
 
-                if (!HasValidCRC(receivedCmd_dec, receivedCmd_len)) { // all commands must have a valid CRC
+                if (!CheckCrc14A(receivedCmd_dec, receivedCmd_len)) { // all commands must have a valid CRC
                     EmSend4bit(encrypted_data ? mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA) : CARD_NACK_NA);
                     if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] All commands must have a valid CRC %02X (%d)", receivedCmd_dec, receivedCmd_len);
                     break;
@@ -1138,7 +1132,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
             case MFEMUL_WRITEBL2: {
                 if (receivedCmd_len == MAX_MIFARE_FRAME_SIZE) {
                     mf_crypto1_decryptEx(pcs, receivedCmd, receivedCmd_len, receivedCmd_dec);
-                    if (HasValidCRC(receivedCmd_dec, receivedCmd_len)) {
+                    if (CheckCrc14A(receivedCmd_dec, receivedCmd_len)) {
                         if (IsSectorTrailer(cardWRBL)) {
                             emlGetMem(response, cardWRBL, 1);
                             if (!IsAccessAllowed(cardWRBL, cardAUTHKEY, AC_KEYA_WRITE)) {

From 7d48ad19f960c8675b83d6c6d5508f443a801fdd Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 12 Apr 2019 00:38:54 +0200
Subject: [PATCH 1195/1938] Rework Cmd exposed API, use more static and fix
 [-Wmissing-prototypes], ongoing...

---
 client/cmdanalyse.c     |  32 ++---
 client/cmdanalyse.h     |   8 --
 client/cmdcrc.c         |  47 +++----
 client/cmdcrc.h         |   1 -
 client/cmdflashmem.c    |  24 ++--
 client/cmdflashmem.h    |   5 -
 client/cmdlf.c          |  30 ++---
 client/cmdlfjablotron.c |  66 +++++-----
 client/cmdlfjablotron.h |   6 +-
 client/cmdlfkeri.c      |  57 ++++----
 client/cmdlfkeri.h      |   5 +-
 client/cmdlfnedap.c     | 152 +++++++++++-----------
 client/cmdlfnedap.h     |   7 +-
 client/cmdlfnexwatch.c  |  43 +++---
 client/cmdlfnexwatch.h  |   3 +-
 client/cmdlfnoralsy.c   | 109 ++++++++--------
 client/cmdlfnoralsy.h   |   6 +-
 client/cmdlfpac.c       |  31 +++--
 client/cmdlfpac.h       |   3 +-
 client/cmdlfparadox.c   |  79 +++++------
 client/cmdlfparadox.h   |   6 +-
 client/cmdlfpcf7931.h   |   4 -
 client/cmdlfpresco.c    | 281 ++++++++++++++++++++--------------------
 client/cmdlfpresco.h    |   8 +-
 client/cmdlfpyramid.c   | 123 +++++++++---------
 client/cmdlfpyramid.h   |   6 +-
 client/cmdlfsecurakey.c |  31 +++--
 client/cmdlfsecurakey.h |   7 +-
 client/cmdlft55xx.h     |  11 --
 client/cmdlfti.c        |   5 +
 client/cmdlfti.h        |   5 +-
 client/cmdlfviking.c    |  69 +++++-----
 client/cmdlfviking.h    |   7 +-
 client/cmdlfvisa2000.c  |  31 +++--
 client/cmdlfvisa2000.h  |   6 +-
 client/cmdmain.c        |  58 ++++-----
 client/cmdscript.c      |  27 ++--
 client/cmdscript.h      |   2 -
 client/cmdsmartcard.c   | 163 +++++++++++------------
 client/cmdsmartcard.h   |   5 -
 client/cmdtrace.c       | 165 +++++++++++------------
 client/cmdtrace.h       |   3 -
 42 files changed, 865 insertions(+), 872 deletions(-)

diff --git a/client/cmdanalyse.c b/client/cmdanalyse.c
index 46e19fb98..b9e4931d1 100644
--- a/client/cmdanalyse.c
+++ b/client/cmdanalyse.c
@@ -220,7 +220,7 @@ static uint16_t calcBSDchecksum4(uint8_t *bytes, uint8_t len, uint32_t mask) {
 }
 
 // measuring LFSR maximum length
-int CmdAnalyseLfsr(const char *Cmd) {
+static int CmdAnalyseLfsr(const char *Cmd) {
 
     uint16_t start_state = 0;  /* Any nonzero start state will work. */
     uint16_t lfsr = start_state;
@@ -242,7 +242,7 @@ int CmdAnalyseLfsr(const char *Cmd) {
     }
     return 0;
 }
-int CmdAnalyseLCR(const char *Cmd) {
+static int CmdAnalyseLCR(const char *Cmd) {
     uint8_t data[50];
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) == 0 || cmdp == 'h') return usage_analyse_lcr();
@@ -263,7 +263,7 @@ int CmdAnalyseLCR(const char *Cmd) {
     PrintAndLogEx(NORMAL, "Target [%02X] requires final LRC XOR byte value: 0x%02X", data[len - 1], finalXor);
     return 0;
 }
-int CmdAnalyseCRC(const char *Cmd) {
+static int CmdAnalyseCRC(const char *Cmd) {
 
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) == 0 || cmdp == 'h') return usage_analyse_crc();
@@ -359,7 +359,7 @@ int CmdAnalyseCRC(const char *Cmd) {
     free(data);
     return 0;
 }
-int CmdAnalyseCHKSUM(const char *Cmd) {
+static int CmdAnalyseCHKSUM(const char *Cmd) {
 
     uint8_t data[50];
     uint8_t cmdp = 0;
@@ -425,13 +425,13 @@ int CmdAnalyseCHKSUM(const char *Cmd) {
     return 0;
 }
 
-int CmdAnalyseDates(const char *Cmd) {
+static int CmdAnalyseDates(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     // look for datestamps in a given array of bytes
     PrintAndLogEx(NORMAL, "To be implemented. Feel free to contribute!");
     return 0;
 }
-int CmdAnalyseTEASelfTest(const char *Cmd) {
+static int CmdAnalyseTEASelfTest(const char *Cmd) {
 
     uint8_t v[8], v_le[8];
     memset(v, 0x00, sizeof(v));
@@ -466,7 +466,7 @@ int CmdAnalyseTEASelfTest(const char *Cmd) {
     return 0;
 }
 
-char *pb(uint32_t b) {
+static char *pb(uint32_t b) {
     static char buf1[33] = {0};
     static char buf2[33] = {0};
     static char *s;
@@ -486,7 +486,7 @@ char *pb(uint32_t b) {
     return s;
 }
 
-int CmdAnalyseA(const char *Cmd) {
+static int CmdAnalyseA(const char *Cmd) {
 
     int hexlen = 0;
     uint8_t cmdp = 0;
@@ -852,7 +852,7 @@ int CmdAnalyseA(const char *Cmd) {
     return 0;
 }
 
-void generate4bNUID(uint8_t *uid, uint8_t *nuid) {
+static void generate4bNUID(uint8_t *uid, uint8_t *nuid) {
     uint16_t crc;
     uint8_t b1, b2;
 
@@ -866,7 +866,7 @@ void generate4bNUID(uint8_t *uid, uint8_t *nuid) {
     nuid[3] = crc & 0xFF;
 }
 
-int CmdAnalyseNuid(const char *Cmd) {
+static int CmdAnalyseNuid(const char *Cmd) {
     uint8_t nuid[4] = {0};
     uint8_t uid[7] = {0};
     int len = 0;
@@ -916,14 +916,14 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
+static int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
+    CmdsHelp(CommandTable);
+    return 0;
+}
+
 int CmdAnalyse(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
-
-int CmdHelp(const char *Cmd) {
-    (void)Cmd; // Cmd is not used so far
-    CmdsHelp(CommandTable);
-    return 0;
-}
diff --git a/client/cmdanalyse.h b/client/cmdanalyse.h
index 4c5c486e6..20dc58a7e 100644
--- a/client/cmdanalyse.h
+++ b/client/cmdanalyse.h
@@ -27,12 +27,4 @@
 #include "util_posix.h"   // msclock
 
 int CmdAnalyse(const char *Cmd);
-int CmdAnalyseLCR(const char *Cmd);
-int CmdAnalyseCHKSUM(const char *Cmd);
-int CmdAnalyseDates(const char *Cmd);
-int CmdAnalyseCRC(const char *Cmd);
-int CmdAnalyseTEASelfTest(const char *Cmd);
-int CmdAnalyseLfsr(const char *Cmd);
-int CmdAnalyseHid(const char *Cmd);
-int CmdAnalyseNuid(const char *Cmd);
 #endif
diff --git a/client/cmdcrc.c b/client/cmdcrc.c
index dd14dcb50..7ec34e2cd 100644
--- a/client/cmdcrc.c
+++ b/client/cmdcrc.c
@@ -39,25 +39,6 @@ static int split(char *str, char *arr[MAX_ARGS]) {
     return wordCnt;
 }
 
-int CmdCrc(const char *Cmd) {
-    char name[] = {"reveng "};
-    char Cmd2[100 + 7];
-    memcpy(Cmd2, name, 7);
-    memcpy(Cmd2 + 7, Cmd, 100);
-    char *argv[MAX_ARGS];
-    int argc = split(Cmd2, argv);
-
-    if (argc == 3 && memcmp(argv[1], "-g", 2) == 0) {
-        CmdrevengSearch(argv[2]);
-    } else {
-        reveng_main(argc, argv);
-    }
-    for (int i = 0; i < argc; ++i) {
-        free(argv[i]);
-    }
-    return 0;
-}
-
 //returns array of model names and the count of models returning
 //  as well as a width array for the width of each model
 int GetModels(char *Models[], int *count, uint8_t *width) {
@@ -364,9 +345,9 @@ int RunModel(char *inModel, char *inHexStr, bool reverse, char endian, char *res
     pfree(&apoly);
     return 1;
 }
-
+/*
 //test call to RunModel
-int CmdrevengTestC(const char *Cmd) {
+static int CmdrevengTestC(const char *Cmd) {
     int cmdp = 0;
     char inModel[30] = {0x00};
     char inHexStr[30] = {0x00};
@@ -387,7 +368,7 @@ int CmdrevengTestC(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "result: %s", result);
     return 1;
 }
-
+*/
 //returns a calloced string (needs to be freed)
 static char *SwapEndianStr(const char *inStr, const size_t len, const uint8_t blockSize) {
     char *tmp = calloc(len + 1, sizeof(char));
@@ -401,7 +382,7 @@ static char *SwapEndianStr(const char *inStr, const size_t len, const uint8_t bl
 }
 
 // takes hex string in and searches for a matching result (hex string must include checksum)
-int CmdrevengSearch(const char *Cmd) {
+static int CmdrevengSearch(const char *Cmd) {
 
 #define NMODELS 106
 
@@ -486,3 +467,23 @@ int CmdrevengSearch(const char *Cmd) {
     if (!found) PrintAndLogEx(FAILED, "\nno matches found\n");
     return 1;
 }
+
+int CmdCrc(const char *Cmd) {
+    char name[] = {"reveng "};
+    char Cmd2[100 + 7];
+    memcpy(Cmd2, name, 7);
+    memcpy(Cmd2 + 7, Cmd, 100);
+    char *argv[MAX_ARGS];
+    int argc = split(Cmd2, argv);
+
+    if (argc == 3 && memcmp(argv[1], "-g", 2) == 0) {
+        CmdrevengSearch(argv[2]);
+    } else {
+        reveng_main(argc, argv);
+    }
+    for (int i = 0; i < argc; ++i) {
+        free(argv[i]);
+    }
+    return 0;
+}
+
diff --git a/client/cmdcrc.h b/client/cmdcrc.h
index f52727c2c..e45c004f5 100644
--- a/client/cmdcrc.h
+++ b/client/cmdcrc.h
@@ -30,7 +30,6 @@
 
 int CmdCrc(const char *Cmd);
 
-int CmdrevengSearch(const char *Cmd);
 int GetModels(char *Models[], int *count, uint8_t *width);
 int RunModel(char *inModel, char *inHexStr, bool reverse, char endian, char *result);
 #endif
diff --git a/client/cmdflashmem.c b/client/cmdflashmem.c
index 2c565d9e9..2f89fc9b4 100644
--- a/client/cmdflashmem.c
+++ b/client/cmdflashmem.c
@@ -107,7 +107,7 @@ static int usage_flashmem_info(void) {
     return 0;
 }
 
-int CmdFlashMemRead(const char *Cmd) {
+static int CmdFlashMemRead(const char *Cmd) {
 
     uint8_t cmdp = 0;
     bool errors = false;
@@ -146,7 +146,7 @@ int CmdFlashMemRead(const char *Cmd) {
     return 0;
 }
 
-int CmdFlashmemSpiBaudrate(const char *Cmd) {
+static int CmdFlashmemSpiBaudrate(const char *Cmd) {
 
     char ctmp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) < 1 || ctmp == 'h') return usage_flashmem_spibaud();
@@ -158,7 +158,7 @@ int CmdFlashmemSpiBaudrate(const char *Cmd) {
     return 0;
 }
 
-int CmdFlashMemLoad(const char *Cmd) {
+static int CmdFlashMemLoad(const char *Cmd) {
 
     uint32_t start_index = 0;
     char filename[FILE_PATH_SIZE] = {0};
@@ -301,7 +301,7 @@ int CmdFlashMemLoad(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "Wrote %u bytes to offset %u", datalen, start_index);
     return 0;
 }
-int CmdFlashMemSave(const char *Cmd) {
+static int CmdFlashMemSave(const char *Cmd) {
 
     char filename[FILE_PATH_SIZE] = {0};
     uint8_t cmdp = 0;
@@ -357,7 +357,7 @@ int CmdFlashMemSave(const char *Cmd) {
     free(dump);
     return 0;
 }
-int CmdFlashMemWipe(const char *Cmd) {
+static int CmdFlashMemWipe(const char *Cmd) {
 
     uint8_t cmdp = 0;
     bool errors = false;
@@ -406,7 +406,7 @@ int CmdFlashMemWipe(const char *Cmd) {
 
     return 0;
 }
-int CmdFlashMemInfo(const char *Cmd) {
+static int CmdFlashMemInfo(const char *Cmd) {
 
     uint8_t sha_hash[20] = {0};
     mbedtls_rsa_context rsa;
@@ -606,16 +606,16 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
+static int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
+    CmdsHelp(CommandTable);
+    return 0;
+}
+
 int CmdFlashMem(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
-    (void)Cmd; // Cmd is not used so far
-    CmdsHelp(CommandTable);
-    return 0;
-}
-
 #endif
diff --git a/client/cmdflashmem.h b/client/cmdflashmem.h
index 1cf06c1bc..c58de661d 100644
--- a/client/cmdflashmem.h
+++ b/client/cmdflashmem.h
@@ -35,11 +35,6 @@ typedef enum {
 
 int CmdFlashMem(const char *Cmd);
 
-int CmdFlashMemRead(const char *Cmd);
-int CmdFlashMemLoad(const char *Cmd);
-int CmdFlashMemSave(const char *Cmd);
-int CmdFlashMemWipe(const char *Cmd);
-int CmdFlashMemInfo(const char *Cmd);
 #endif
 
 #endif
diff --git a/client/cmdlf.c b/client/cmdlf.c
index df189fc2d..f00525bee 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -898,7 +898,7 @@ int CmdLFfind(const char *Cmd) {
 
     if (CmdHIDDemod(""))        { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("HID Prox ID") " found!"); goto out;}
     if (CmdAWIDDemod(""))       { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("AWID ID") " found!"); goto out;}
-    if (CmdParadoxDemod(""))    { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Paradox ID") " found!"); goto out;}
+    if (demodParadox())         { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Paradox ID") " found!"); goto out;}
 
     if (CmdEM410xDemod(""))     { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("EM410x ID") " found!"); goto out;}
     if (CmdFdxDemod(""))        { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("FDX-B ID") " found!"); goto out;}
@@ -906,21 +906,21 @@ int CmdLFfind(const char *Cmd) {
     if (CmdIdteckDemod(""))     { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Idteck ID") " found!"); goto out;}
     if (CmdIndalaDemod(""))     { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Indala ID") " found!");  goto out;}
     if (CmdIOProxDemod(""))     { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("IO Prox ID") " found!"); goto out;}
-    if (CmdJablotronDemod(""))  { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Jablotron ID") " found!"); goto out;}
-    if (CmdLFNedapDemod(""))    { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("NEDAP ID") " found!"); goto out;}
-    if (CmdNexWatchDemod(""))   { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("NexWatch ID") " found!"); goto out;}
-    if (CmdNoralsyDemod(""))    { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Noralsy ID") " found!"); goto out;}
-    if (CmdKeriDemod(""))       { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("KERI ID") " found!"); goto out;}
-    if (CmdPacDemod(""))        { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("PAC/Stanley ID") " found!"); goto out;}
+    if (demodJablotron())       { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Jablotron ID") " found!"); goto out;}
+    if (demodNedap())           { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("NEDAP ID") " found!"); goto out;}
+    if (demodNexWatch())        { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("NexWatch ID") " found!"); goto out;}
+    if (demodNoralsy())         { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Noralsy ID") " found!"); goto out;}
+    if (demodKeri())            { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("KERI ID") " found!"); goto out;}
+    if (demodPac())             { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("PAC/Stanley ID") " found!"); goto out;}
 
-    if (CmdPrescoDemod(""))     { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Presco ID") " found!"); goto out;}
-    if (CmdPyramidDemod(""))    { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Pyramid ID") " found!"); goto out;}
-    if (CmdSecurakeyDemod(""))  { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Securakey ID") " found!"); goto out;}
-    if (CmdVikingDemod(""))     { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Viking ID") " found!"); goto out;}
-    if (CmdVisa2kDemod(""))     { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Visa2000 ID") " found!"); goto out;}
-    if (CmdTIDemod(""))         { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Texas Instrument ID") " found!"); goto out;}
-    //if (CmdFermaxDemod(""))     { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Fermax ID") " found!"); goto out;}
-    //if (CmdFlexDemod(""))       { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Flex ID") " found!"); goto out;}
+    if (demodPresco())          { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Presco ID") " found!"); goto out;}
+    if (demodPyramid())         { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Pyramid ID") " found!"); goto out;}
+    if (demodSecurakey())       { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Securakey ID") " found!"); goto out;}
+    if (demodViking())          { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Viking ID") " found!"); goto out;}
+    if (demodVisa2k())          { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Visa2000 ID") " found!"); goto out;}
+    if (demodTI())              { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Texas Instrument ID") " found!"); goto out;}
+    //if (demodFermax())          { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Fermax ID") " found!"); goto out;}
+    //if (demodFlex())            { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Flex ID") " found!"); goto out;}
 
     PrintAndLogEx(FAILED, _RED_("No known 125/134 KHz tags found!"));
 
diff --git a/client/cmdlfjablotron.c b/client/cmdlfjablotron.c
index 621ff323b..f253e4866 100644
--- a/client/cmdlfjablotron.c
+++ b/client/cmdlfjablotron.c
@@ -48,37 +48,6 @@ static uint8_t jablontron_chksum(uint8_t *bits) {
     return chksum;
 }
 
-int getJablotronBits(uint64_t fullcode, uint8_t *bits) {
-    //preamp
-    num_to_bytebits(0xFFFF, 16, bits);
-
-    //fullcode
-    num_to_bytebits(fullcode, 40, bits + 16);
-
-    //chksum byte
-    uint8_t chksum = jablontron_chksum(bits);
-    num_to_bytebits(chksum, 8, bits + 56);
-    return 1;
-}
-
-// ASK/Diphase fc/64 (inverted Biphase)
-// Note: this is not a demod, this is only a detection
-// the parameter *bits needs to be demoded before call
-// 0xFFFF preamble, 64bits
-int detectJablotron(uint8_t *bits, size_t *size) {
-    if (*size < 64 * 2) return -1; //make sure buffer has enough data
-    size_t startIdx = 0;
-    uint8_t preamble[] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0};
-    if (preambleSearch(bits, preamble, sizeof(preamble), size, &startIdx) == 0)
-        return -2; //preamble not found
-    if (*size != 64) return -3; // wrong demoded size
-
-    uint8_t checkchksum = jablontron_chksum(bits + startIdx);
-    uint8_t crc = bytebits_to_byte(bits + startIdx + 56, 8);
-    if (checkchksum != crc) return -5;
-    return (int)startIdx;
-}
-
 static uint64_t getJablontronCardId(uint64_t rawcode) {
     uint64_t id = 0;
     uint8_t bytes[] = {0, 0, 0, 0, 0};
@@ -250,3 +219,38 @@ int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
+
+int getJablotronBits(uint64_t fullcode, uint8_t *bits) {
+    //preamp
+    num_to_bytebits(0xFFFF, 16, bits);
+
+    //fullcode
+    num_to_bytebits(fullcode, 40, bits + 16);
+
+    //chksum byte
+    uint8_t chksum = jablontron_chksum(bits);
+    num_to_bytebits(chksum, 8, bits + 56);
+    return 1;
+}
+
+// ASK/Diphase fc/64 (inverted Biphase)
+// Note: this is not a demod, this is only a detection
+// the parameter *bits needs to be demoded before call
+// 0xFFFF preamble, 64bits
+int detectJablotron(uint8_t *bits, size_t *size) {
+    if (*size < 64 * 2) return -1; //make sure buffer has enough data
+    size_t startIdx = 0;
+    uint8_t preamble[] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0};
+    if (preambleSearch(bits, preamble, sizeof(preamble), size, &startIdx) == 0)
+        return -2; //preamble not found
+    if (*size != 64) return -3; // wrong demoded size
+
+    uint8_t checkchksum = jablontron_chksum(bits + startIdx);
+    uint8_t crc = bytebits_to_byte(bits + startIdx + 56, 8);
+    if (checkchksum != crc) return -5;
+    return (int)startIdx;
+}
+
+int demodJablotron(void) {
+    return CmdJablotronDemod("");
+}
diff --git a/client/cmdlfjablotron.h b/client/cmdlfjablotron.h
index c46e6fc31..ae6186496 100644
--- a/client/cmdlfjablotron.h
+++ b/client/cmdlfjablotron.h
@@ -24,11 +24,7 @@
 
 int CmdLFJablotron(const char *Cmd);
 
-int CmdJablotronDemod(const char *Cmd);
-int CmdJablotronRead(const char *Cmd);
-int CmdJablotronClone(const char *Cmd);
-int CmdJablotronSim(const char *Cmd);
-
+int demodJablotron(void);
 int detectJablotron(uint8_t *bits, size_t *size);
 int getJablotronBits(uint64_t fullcode, uint8_t *bits);
 
diff --git a/client/cmdlfkeri.c b/client/cmdlfkeri.c
index e4516e127..a7cd873db 100644
--- a/client/cmdlfkeri.c
+++ b/client/cmdlfkeri.c
@@ -38,32 +38,7 @@ static int usage_lf_keri_sim(void) {
     return 0;
 }
 
-// find KERI preamble in already demoded data
-int detectKeri(uint8_t *dest, size_t *size, bool *invert) {
-
-    uint8_t preamble[] = {1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1};
-    uint8_t preamble_i[] = {0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0};
-
-    // sanity check.
-    if (*size < sizeof(preamble) + 100) return -1;
-
-    size_t startIdx = 0;
-
-    if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx)) {
-
-        // if didn't find preamble try again inverting
-        if (!preambleSearch(DemodBuffer, preamble_i, sizeof(preamble_i), size, &startIdx))
-            return -2;
-
-        *invert ^= 1;
-    }
-
-    if (*size != 64) return -3; //wrong demoded size
-
-    return (int)startIdx;
-}
-
-int CmdKeriDemod(const char *Cmd) {
+static int CmdKeriDemod(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
 
     if (!PSKDemod("", false)) {
@@ -242,3 +217,33 @@ int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
+
+// find KERI preamble in already demoded data
+int detectKeri(uint8_t *dest, size_t *size, bool *invert) {
+
+    uint8_t preamble[] = {1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1};
+    uint8_t preamble_i[] = {0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0};
+
+    // sanity check.
+    if (*size < sizeof(preamble) + 100) return -1;
+
+    size_t startIdx = 0;
+
+    if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx)) {
+
+        // if didn't find preamble try again inverting
+        if (!preambleSearch(DemodBuffer, preamble_i, sizeof(preamble_i), size, &startIdx))
+            return -2;
+
+        *invert ^= 1;
+    }
+
+    if (*size != 64) return -3; //wrong demoded size
+
+    return (int)startIdx;
+}
+
+int demodKeri(void) {
+    return CmdKeriDemod("");
+}
+
diff --git a/client/cmdlfkeri.h b/client/cmdlfkeri.h
index bab4c47b0..78b087834 100644
--- a/client/cmdlfkeri.h
+++ b/client/cmdlfkeri.h
@@ -23,11 +23,8 @@
 #include "lfdemod.h"    // preamble test
 
 int CmdLFKeri(const char *Cmd);
-int CmdKeriRead(const char *Cmd);
-int CmdKeriDemod(const char *Cmd);
-int CmdKeriClone(const char *Cmd);
-int CmdKeriSim(const char *Cmd);
 
+int demodKeri(void);
 int detectKeri(uint8_t *dest, size_t *size, bool *invert);
 
 #endif
diff --git a/client/cmdlfnedap.c b/client/cmdlfnedap.c
index 9758615f8..18e142be0 100644
--- a/client/cmdlfnedap.c
+++ b/client/cmdlfnedap.c
@@ -40,80 +40,8 @@ static int usage_lf_nedap_sim(void) {
     return 0;
 }
 
-// find nedap preamble in already demoded data
-int detectNedap(uint8_t *dest, size_t *size) {
-    //make sure buffer has data
-    if (*size < 128) return -3;
-
-    size_t startIdx = 0;
-    //uint8_t preamble[] = {1,1,1,1,1,1,1,1,1,0,0,0,1};
-    uint8_t preamble[] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 0};
-    if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
-        return -4; //preamble not found
-    return (int) startIdx;
-}
-
-static int GetNedapBits(uint32_t cn, uint8_t *nedapBits) {
-
-    uint8_t pre[128];
-    memset(pre, 0x00, sizeof(pre));
-
-    // preamble  1111 1111 10 = 0xFF8
-    num_to_bytebits(0xFF8, 12, pre);
-
-    // fixed tagtype code?  0010 1101 = 0x2D
-    num_to_bytebits(0x2D, 8, pre + 10);
-
-    // 46 encrypted bits - UNKNOWN ALGO
-    //    -- 16 bits checksum. Should be 4x4 checksum,  based on UID and 2 constant values.
-    //    -- 30 bits undocumented?
-    //num_to_bytebits(cn, 46, pre+18);
-
-    //----from this part, the UID in clear text, with a 1bit ZERO as separator between bytes.
-    pre[64] = 0;
-    pre[73] = 0;
-    pre[82] = 0;
-    pre[91] = 0;
-    pre[100] = 0;
-    pre[109] = 0;
-    pre[118] = 0;
-
-    // cardnumber (uid)
-    num_to_bytebits((cn >>  0) & 0xFF, 8, pre + 65);
-    num_to_bytebits((cn >>  8) & 0xFF, 8, pre + 74);
-    num_to_bytebits((cn >> 16) & 0xFF, 8, pre + 83);
-
-    // two ?
-    num_to_bytebits(0, 8, pre + 92);
-    num_to_bytebits(0, 8, pre + 101);
-
-    // chksum
-    num_to_bytebits((0 >> 0) & 0xFF, 8, pre + 110);
-    num_to_bytebits((0 >> 8) & 0xFF, 8, pre + 119);
-
-
-    // add paritybits (bitsource, dest, sourcelen, paritylen, parityType (odd, even,)
-    addParity(pre, pre + 64, 64, 8, 1);
-    addParity(pre + 64, pre + 64, 64, 8, 1);
-
-    pre[63] = GetParity(DemodBuffer, EVEN, 63);
-    pre[127] = GetParity(DemodBuffer + 64, EVEN, 63);
-
-    memcpy(nedapBits, pre, 128);
-
-    // 1111111110001011010000010110100011001001000010110101001101011001000110011010010000000000100001110001001000000001000101011100111
-    return 1;
-}
-/*
- - UID: 001630
- - i: 4071
- - Checksum2 BE21
-*/
-//GetParity( uint8_t *bits, uint8_t type, int length)
-
 //NEDAP demod - ASK/Biphase (or Diphase),  RF/64 with preamble of 1111111110  (always a 128 bit data stream)
 //print NEDAP Prox ID, encoding, encrypted ID,
-
 int CmdLFNedapDemod(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     //raw ask demod no start bit finding just get binary from wave
@@ -253,7 +181,7 @@ int CmdLFNedapClone(const char *Cmd) {
 
     cardnumber = (cn & 0x00FFFFFF);
 
-    if ( !GetNedapBits(cardnumber, bits)) {
+    if ( !getNedapBits(cardnumber, bits)) {
         PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
         return 1;
     }
@@ -312,7 +240,7 @@ int CmdLFNedapSim(const char *Cmd) {
     arg1 = clk << 8 | encoding;
     arg2 = invert << 8 | separator;
 
-    if (!GetNedapBits(cardnumber, bs)) {
+    if (!getNedapBits(cardnumber, bs)) {
         PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
         return 1;
     }
@@ -395,3 +323,79 @@ int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
+
+// find nedap preamble in already demoded data
+int detectNedap(uint8_t *dest, size_t *size) {
+    //make sure buffer has data
+    if (*size < 128) return -3;
+
+    size_t startIdx = 0;
+    //uint8_t preamble[] = {1,1,1,1,1,1,1,1,1,0,0,0,1};
+    uint8_t preamble[] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 0};
+    if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
+        return -4; //preamble not found
+    return (int) startIdx;
+}
+
+int getNedapBits(uint32_t cn, uint8_t *nedapBits) {
+
+    uint8_t pre[128];
+    memset(pre, 0x00, sizeof(pre));
+
+    // preamble  1111 1111 10 = 0xFF8
+    num_to_bytebits(0xFF8, 12, pre);
+
+    // fixed tagtype code?  0010 1101 = 0x2D
+    num_to_bytebits(0x2D, 8, pre + 10);
+
+    // 46 encrypted bits - UNKNOWN ALGO
+    //    -- 16 bits checksum. Should be 4x4 checksum,  based on UID and 2 constant values.
+    //    -- 30 bits undocumented?
+    //num_to_bytebits(cn, 46, pre+18);
+
+    //----from this part, the UID in clear text, with a 1bit ZERO as separator between bytes.
+    pre[64] = 0;
+    pre[73] = 0;
+    pre[82] = 0;
+    pre[91] = 0;
+    pre[100] = 0;
+    pre[109] = 0;
+    pre[118] = 0;
+
+    // cardnumber (uid)
+    num_to_bytebits((cn >>  0) & 0xFF, 8, pre + 65);
+    num_to_bytebits((cn >>  8) & 0xFF, 8, pre + 74);
+    num_to_bytebits((cn >> 16) & 0xFF, 8, pre + 83);
+
+    // two ?
+    num_to_bytebits(0, 8, pre + 92);
+    num_to_bytebits(0, 8, pre + 101);
+
+    // chksum
+    num_to_bytebits((0 >> 0) & 0xFF, 8, pre + 110);
+    num_to_bytebits((0 >> 8) & 0xFF, 8, pre + 119);
+
+
+    // add paritybits (bitsource, dest, sourcelen, paritylen, parityType (odd, even,)
+    addParity(pre, pre + 64, 64, 8, 1);
+    addParity(pre + 64, pre + 64, 64, 8, 1);
+
+    pre[63] = GetParity(DemodBuffer, EVEN, 63);
+    pre[127] = GetParity(DemodBuffer + 64, EVEN, 63);
+
+    memcpy(nedapBits, pre, 128);
+
+    // 1111111110001011010000010110100011001001000010110101001101011001000110011010010000000000100001110001001000000001000101011100111
+    return 1;
+}
+/*
+ - UID: 001630
+ - i: 4071
+ - Checksum2 BE21
+*/
+//GetParity( uint8_t *bits, uint8_t type, int length)
+
+int demodNedap(void) {
+    return CmdLFNedapDemod("");
+}
+
diff --git a/client/cmdlfnedap.h b/client/cmdlfnedap.h
index e0cf9e0c0..8ba7c9908 100644
--- a/client/cmdlfnedap.h
+++ b/client/cmdlfnedap.h
@@ -23,13 +23,10 @@
 #include "crc.h"
 
 int CmdLFNedap(const char *Cmd);
-int CmdLFNedapDemod(const char *Cmd);
-int CmdLFNedapRead(const char *Cmd);
-//int CmdLFNedapClone(const char *Cmd);
-int CmdLFNedapSim(const char *Cmd);
-int CmdLFNedapChk(const char *Cmd);
 
+int demodNedap(void);
 int detectNedap(uint8_t *dest, size_t *size);
+int getNedapBits(uint32_t cn, uint8_t *nedapBits);
 
 #endif
 
diff --git a/client/cmdlfnexwatch.c b/client/cmdlfnexwatch.c
index 6ce78b3f3..a228872ff 100644
--- a/client/cmdlfnexwatch.c
+++ b/client/cmdlfnexwatch.c
@@ -12,25 +12,6 @@
 
 static int CmdHelp(const char *Cmd);
 
-int detectNexWatch(uint8_t *dest, size_t *size, bool *invert) {
-
-    uint8_t preamble[28]   = {0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-    uint8_t preamble_i[28] = {1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
-    // sanity check.
-    if (*size < sizeof(preamble) + 100) return -1;
-
-    size_t startIdx = 0;
-
-    if (!preambleSearch(DemodBuffer, preamble, sizeof(preamble), size, &startIdx)) {
-        // if didn't find preamble try again inverting
-        if (!preambleSearch(DemodBuffer, preamble_i, sizeof(preamble_i), size, &startIdx)) return -4;
-        *invert ^= 1;
-    }
-
-    // size tests?
-    return (int) startIdx;
-}
-
 int CmdNexWatchDemod(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
 
@@ -111,3 +92,27 @@ int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
+
+int detectNexWatch(uint8_t *dest, size_t *size, bool *invert) {
+
+    uint8_t preamble[28]   = {0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+    uint8_t preamble_i[28] = {1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
+    // sanity check.
+    if (*size < sizeof(preamble) + 100) return -1;
+
+    size_t startIdx = 0;
+
+    if (!preambleSearch(DemodBuffer, preamble, sizeof(preamble), size, &startIdx)) {
+        // if didn't find preamble try again inverting
+        if (!preambleSearch(DemodBuffer, preamble_i, sizeof(preamble_i), size, &startIdx)) return -4;
+        *invert ^= 1;
+    }
+
+    // size tests?
+    return (int) startIdx;
+}
+
+int demodNexWatch(void) {
+    return CmdNexWatchDemod("");
+}
+
diff --git a/client/cmdlfnexwatch.h b/client/cmdlfnexwatch.h
index 7b08c1294..4a70761a4 100644
--- a/client/cmdlfnexwatch.h
+++ b/client/cmdlfnexwatch.h
@@ -23,8 +23,7 @@
 #include "lfdemod.h"
 
 int CmdLFNEXWATCH(const char *Cmd);
-int CmdNexWatchDemod(const char *Cmd);
-int CmdNexWatchRead(const char *Cmd);
 
+int demodNexWatch(void);
 int detectNexWatch(uint8_t *dest, size_t *size, bool *invert);
 #endif
diff --git a/client/cmdlfnoralsy.c b/client/cmdlfnoralsy.c
index 78727e23c..59cc4d70a 100644
--- a/client/cmdlfnoralsy.c
+++ b/client/cmdlfnoralsy.c
@@ -46,58 +46,6 @@ static uint8_t noralsy_chksum(uint8_t *bits, uint8_t len) {
         sum ^= bytebits_to_byte(bits + i, 4);
     return sum & 0x0F ;
 }
-int getnoralsyBits(uint32_t id, uint16_t year, uint8_t *bits) {
-    //preamp
-    num_to_bytebits(0xBB0214FF, 32, bits);  // --> Have seen 0xBB0214FF / 0xBB0314FF  UNKNOWN
-
-    //convert ID into BCD-format
-    id = DEC2BCD(id);
-    year = DEC2BCD(year);
-    year &= 0xFF;
-
-    uint16_t sub1 = (id & 0xFFF0000) >> 16;
-    uint8_t sub2 = (id & 0x000FF00) >> 8;
-    uint8_t sub3 = (id & 0x00000FF);
-
-    num_to_bytebits(sub1, 12, bits + 32);
-    num_to_bytebits(year, 8, bits + 44);
-    num_to_bytebits(0, 4, bits + 52); // --> UNKNOWN. Flag?
-
-    num_to_bytebits(sub2, 8, bits + 56);
-    num_to_bytebits(sub3, 8, bits + 64);
-
-    //chksum byte
-    uint8_t chksum = noralsy_chksum(bits + 32, 40);
-    num_to_bytebits(chksum, 4, bits + 72);
-    chksum = noralsy_chksum(bits, 76);
-    num_to_bytebits(chksum, 4, bits + 76);
-    return 1;
-}
-
-// by iceman
-// find Noralsy preamble in already demoded data
-static int detectNoralsy(uint8_t *dest, size_t *size) {
-    if (*size < 96) return -1; //make sure buffer has data
-    size_t startIdx = 0;
-    uint8_t preamble[] = {1, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0};
-    if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
-        return -2; //preamble not found
-    if (*size != 96) return -3; //wrong demoded size
-    //return start position
-    return (int)startIdx;
-}
-/*
-*
-* 2520116 | BB0214FF2529900116360000 | 10111011 00000011 00010100 11111111 00100101 00101001 10010000 00000001 00010110 00110110 00000000 00000000
-*           aaa*aaaaiiiYY*iiiicc----                ****                   iiiiiiii iiiiYYYY YYYY**** iiiiiiii iiiiiiii cccccccc
-*
-* a = fixed value BB0*14FF
-* i = printed id, BCD-format
-* Y = year
-* c = checksum
-* * = unknown
-*
-**/
 
 //see ASKDemod for what args are accepted
 int CmdNoralsyDemod(const char *Cmd) {
@@ -277,3 +225,60 @@ int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
+
+int getnoralsyBits(uint32_t id, uint16_t year, uint8_t *bits) {
+    //preamp
+    num_to_bytebits(0xBB0214FF, 32, bits);  // --> Have seen 0xBB0214FF / 0xBB0314FF  UNKNOWN
+
+    //convert ID into BCD-format
+    id = DEC2BCD(id);
+    year = DEC2BCD(year);
+    year &= 0xFF;
+
+    uint16_t sub1 = (id & 0xFFF0000) >> 16;
+    uint8_t sub2 = (id & 0x000FF00) >> 8;
+    uint8_t sub3 = (id & 0x00000FF);
+
+    num_to_bytebits(sub1, 12, bits + 32);
+    num_to_bytebits(year, 8, bits + 44);
+    num_to_bytebits(0, 4, bits + 52); // --> UNKNOWN. Flag?
+
+    num_to_bytebits(sub2, 8, bits + 56);
+    num_to_bytebits(sub3, 8, bits + 64);
+
+    //chksum byte
+    uint8_t chksum = noralsy_chksum(bits + 32, 40);
+    num_to_bytebits(chksum, 4, bits + 72);
+    chksum = noralsy_chksum(bits, 76);
+    num_to_bytebits(chksum, 4, bits + 76);
+    return 1;
+}
+
+// by iceman
+// find Noralsy preamble in already demoded data
+int detectNoralsy(uint8_t *dest, size_t *size) {
+    if (*size < 96) return -1; //make sure buffer has data
+    size_t startIdx = 0;
+    uint8_t preamble[] = {1, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0};
+    if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
+        return -2; //preamble not found
+    if (*size != 96) return -3; //wrong demoded size
+    //return start position
+    return (int)startIdx;
+}
+/*
+*
+* 2520116 | BB0214FF2529900116360000 | 10111011 00000011 00010100 11111111 00100101 00101001 10010000 00000001 00010110 00110110 00000000 00000000
+*           aaa*aaaaiiiYY*iiiicc----                ****                   iiiiiiii iiiiYYYY YYYY**** iiiiiiii iiiiiiii cccccccc
+*
+* a = fixed value BB0*14FF
+* i = printed id, BCD-format
+* Y = year
+* c = checksum
+* * = unknown
+*
+**/
+
+int demodNoralsy(void) {
+    return CmdNoralsyDemod("");
+}
diff --git a/client/cmdlfnoralsy.h b/client/cmdlfnoralsy.h
index 622dfbbf1..b5a5cd914 100644
--- a/client/cmdlfnoralsy.h
+++ b/client/cmdlfnoralsy.h
@@ -23,11 +23,9 @@
 #include "lfdemod.h"    // parityTest
 
 int CmdLFNoralsy(const char *Cmd);
-int CmdNoralsyDemod(const char *Cmd);
-int CmdNoralsyRead(const char *Cmd);
-int CmdNoralsyClone(const char *Cmd);
-int CmdNoralsySim(const char *Cmd);
 
+int demodNoralsy(void);
+int detectNoralsy(uint8_t *dest, size_t *size);
 int getnoralsyBits(uint32_t id, uint16_t year, uint8_t *bits);
 
 #endif
diff --git a/client/cmdlfpac.c b/client/cmdlfpac.c
index 7c7742d95..36abe19b8 100644
--- a/client/cmdlfpac.c
+++ b/client/cmdlfpac.c
@@ -11,19 +11,6 @@
 
 static int CmdHelp(const char *Cmd);
 
-// by marshmellow
-// find PAC preamble in already demoded data
-int detectPac(uint8_t *dest, size_t *size) {
-    if (*size < 128) return -1; //make sure buffer has data
-    size_t startIdx = 0;
-    uint8_t preamble[] = {1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0};
-    if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
-        return -2; //preamble not found
-    if (*size != 128) return -3; //wrong demoded size
-    //return start position
-    return (int)startIdx;
-}
-
 //see NRZDemod for what args are accepted
 int CmdPacDemod(const char *Cmd) {
 
@@ -86,3 +73,21 @@ int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
+
+// by marshmellow
+// find PAC preamble in already demoded data
+int detectPac(uint8_t *dest, size_t *size) {
+    if (*size < 128) return -1; //make sure buffer has data
+    size_t startIdx = 0;
+    uint8_t preamble[] = {1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0};
+    if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
+        return -2; //preamble not found
+    if (*size != 128) return -3; //wrong demoded size
+    //return start position
+    return (int)startIdx;
+}
+
+int demodPac(void) {
+    return CmdPacDemod("");
+}
+
diff --git a/client/cmdlfpac.h b/client/cmdlfpac.h
index 54b2b3366..f076121cd 100644
--- a/client/cmdlfpac.h
+++ b/client/cmdlfpac.h
@@ -22,9 +22,8 @@
 #include "lfdemod.h"    // preamble test
 
 int CmdLFPac(const char *Cmd);
-int CmdPacRead(const char *Cmd);
-int CmdPacDemod(const char *Cmd);
 
+int demodPac(void);
 int detectPac(uint8_t *dest, size_t *size);
 #endif
 
diff --git a/client/cmdlfparadox.c b/client/cmdlfparadox.c
index ea247ecfa..72a0956fe 100644
--- a/client/cmdlfparadox.c
+++ b/client/cmdlfparadox.c
@@ -37,43 +37,6 @@ static int usage_lf_paradox_sim(void) {
     return 0;
 }
 
-// loop to get raw paradox waveform then FSK demodulate the TAG ID from it
-int detectParadox(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32_t *lo, int *waveStartIdx) {
-    //make sure buffer has data
-    if (*size < 96 * 50) return -1;
-
-    if (getSignalProperties()->isnoise) return -2;
-
-    // FSK demodulator
-    *size = fskdemod(dest, *size, 50, 1, 10, 8, waveStartIdx); // paradox fsk2a
-
-    //did we get a good demod?
-    if (*size < 96) return -3;
-
-    // 00001111 bit pattern represent start of frame, 01 pattern represents a 0 and 10 represents a 1
-    size_t startIdx = 0;
-    uint8_t preamble[] = {0, 0, 0, 0, 1, 1, 1, 1};
-    if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
-        return -4; //preamble not found
-
-    size_t numStart = startIdx + sizeof(preamble);
-    // final loop, go over previously decoded FSK data and manchester decode into usable tag ID
-    for (size_t idx = numStart; (idx - numStart) < *size - sizeof(preamble); idx += 2) {
-        if (dest[idx] == dest[idx + 1])
-            return -5; //not manchester data
-
-        *hi2 = (*hi2 << 1) | (*hi >> 31);
-        *hi = (*hi << 1) | (*lo >> 31);
-        //Then, shift in a 0 or one into low
-        *lo <<= 1;
-        if (dest[idx] && !dest[idx + 1]) // 1 0
-            *lo |= 1;
-        else // 0 1
-            *lo |= 0;
-    }
-    return (int)startIdx;
-}
-
 //by marshmellow
 //Paradox Prox demod - FSK2a RF/50 with preamble of 00001111 (then manchester encoded)
 //print full Paradox Prox ID and some bit format details if found
@@ -204,3 +167,45 @@ int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
+
+// loop to get raw paradox waveform then FSK demodulate the TAG ID from it
+int detectParadox(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32_t *lo, int *waveStartIdx) {
+    //make sure buffer has data
+    if (*size < 96 * 50) return -1;
+
+    if (getSignalProperties()->isnoise) return -2;
+
+    // FSK demodulator
+    *size = fskdemod(dest, *size, 50, 1, 10, 8, waveStartIdx); // paradox fsk2a
+
+    //did we get a good demod?
+    if (*size < 96) return -3;
+
+    // 00001111 bit pattern represent start of frame, 01 pattern represents a 0 and 10 represents a 1
+    size_t startIdx = 0;
+    uint8_t preamble[] = {0, 0, 0, 0, 1, 1, 1, 1};
+    if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
+        return -4; //preamble not found
+
+    size_t numStart = startIdx + sizeof(preamble);
+    // final loop, go over previously decoded FSK data and manchester decode into usable tag ID
+    for (size_t idx = numStart; (idx - numStart) < *size - sizeof(preamble); idx += 2) {
+        if (dest[idx] == dest[idx + 1])
+            return -5; //not manchester data
+
+        *hi2 = (*hi2 << 1) | (*hi >> 31);
+        *hi = (*hi << 1) | (*lo >> 31);
+        //Then, shift in a 0 or one into low
+        *lo <<= 1;
+        if (dest[idx] && !dest[idx + 1]) // 1 0
+            *lo |= 1;
+        else // 0 1
+            *lo |= 0;
+    }
+    return (int)startIdx;
+}
+
+int demodParadox(void) {
+    return CmdParadoxDemod("");
+}
+
diff --git a/client/cmdlfparadox.h b/client/cmdlfparadox.h
index 1b6211716..f7f4a4ffe 100644
--- a/client/cmdlfparadox.h
+++ b/client/cmdlfparadox.h
@@ -9,11 +9,7 @@
 #ifndef CMDLFPARADOX_H__
 #define CMDLFPARADOX_H__
 int CmdLFParadox(const char *Cmd);
-int CmdParadoxDemod(const char *Cmd);
-int CmdParadoxRead(const char *Cmd);
-
-//int CmdParadoxClone(const char *Cmd);
-int CmdParadoxSim(const char *Cmd);
 
+int demodParadox(void);
 int detectParadox(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32_t *lo, int *waveStartIdx);
 #endif
diff --git a/client/cmdlfpcf7931.h b/client/cmdlfpcf7931.h
index 6489ebecf..419386956 100644
--- a/client/cmdlfpcf7931.h
+++ b/client/cmdlfpcf7931.h
@@ -24,8 +24,4 @@ int pcf7931_printConfig(void);
 
 int CmdLFPCF7931(const char *Cmd);
 
-int CmdLFPCF7931Read(const char *Cmd);
-int CmdLFPCF7931Write(const char *Cmd);
-int CmdLFPCF7931Config(const char *Cmd);
-
 #endif
diff --git a/client/cmdlfpresco.c b/client/cmdlfpresco.c
index 77a217bf7..8931b31d7 100644
--- a/client/cmdlfpresco.c
+++ b/client/cmdlfpresco.c
@@ -40,6 +40,145 @@ static int usage_lf_presco_sim(void) {
     return 0;
 }
 
+//see ASKDemod for what args are accepted
+int CmdPrescoDemod(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
+    bool st = true;
+    if (!ASKDemod_ext("32 0 0 0 0 a", false, false, 1, &st)) {
+        PrintAndLogEx(DEBUG, "DEBUG: Error Presco ASKDemod failed");
+        return 0;
+    }
+    size_t size = DemodBufferLen;
+    int ans = detectPresco(DemodBuffer, &size);
+    if (ans < 0) {
+        if (ans == -1)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - Presco: too few bits found");
+        else if (ans == -2)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - Presco: preamble not found");
+        else if (ans == -3)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - Presco: Size not correct: %d", size);
+        else
+            PrintAndLogEx(DEBUG, "DEBUG: Error - Presco: ans: %d", ans);
+        return 0;
+    }
+    setDemodBuff(DemodBuffer, 128, ans);
+    setClockGrid(g_DemodClock, g_DemodStartIdx + (ans * g_DemodClock));
+
+    //got a good demod
+    uint32_t raw1 = bytebits_to_byte(DemodBuffer, 32);
+    uint32_t raw2 = bytebits_to_byte(DemodBuffer + 32, 32);
+    uint32_t raw3 = bytebits_to_byte(DemodBuffer + 64, 32);
+    uint32_t raw4 = bytebits_to_byte(DemodBuffer + 96, 32);
+    uint32_t cardid = raw4;
+    PrintAndLogEx(SUCCESS, "Presco Tag Found: Card ID %08X, Raw: %08X%08X%08X%08X", cardid, raw1, raw2, raw3, raw4);
+
+    uint32_t sitecode = 0, usercode = 0, fullcode = 0;
+    bool Q5 = false;
+    char cmd[12] = {0};
+    sprintf(cmd, "H %08X", cardid);
+    getWiegandFromPresco(cmd, &sitecode, &usercode, &fullcode, &Q5);
+    PrintAndLogEx(SUCCESS, "SiteCode %u, UserCode %u, FullCode, %08X", sitecode, usercode, fullcode);
+    return 1;
+}
+
+//see ASKDemod for what args are accepted
+int CmdPrescoRead(const char *Cmd) {
+    // Presco Number: 123456789 --> Sitecode 30 | usercode 8665
+    lf_read(true, 12000);
+    return CmdPrescoDemod(Cmd);
+}
+
+// takes base 12 ID converts to hex
+// Or takes 8 digit hex ID
+int CmdPrescoClone(const char *Cmd) {
+
+    bool Q5 = false;
+    uint32_t sitecode = 0, usercode = 0, fullcode = 0;
+    uint32_t blocks[5] = {T55x7_MODULATION_MANCHESTER | T55x7_BITRATE_RF_32 | 4 << T55x7_MAXBLOCK_SHIFT | T55x7_ST_TERMINATOR, 0, 0, 0, 0};
+
+    // get wiegand from printed number.
+    if (getWiegandFromPresco(Cmd, &sitecode, &usercode, &fullcode, &Q5) == -1) return usage_lf_presco_clone();
+
+    if (Q5)
+        blocks[0] = T5555_MODULATION_MANCHESTER | T5555_SET_BITRATE(32) | 4 << T5555_MAXBLOCK_SHIFT | T5555_ST_TERMINATOR;
+
+    if ((sitecode & 0xFF) != sitecode) {
+        sitecode &= 0xFF;
+        PrintAndLogEx(INFO, "Facility-Code Truncated to 8-bits (Presco): %u", sitecode);
+    }
+
+    if ((usercode & 0xFFFF) != usercode) {
+        usercode &= 0xFFFF;
+        PrintAndLogEx(INFO, "Card Number Truncated to 16-bits (Presco): %u", usercode);
+    }
+
+    blocks[1] = 0x10D00000; //preamble
+    blocks[2] = 0x00000000;
+    blocks[3] = 0x00000000;
+    blocks[4] = fullcode;
+
+    PrintAndLogEx(INFO, "Preparing to clone Presco to T55x7 with SiteCode: %u, UserCode: %u, FullCode: %08x", sitecode, usercode, fullcode);
+    print_blocks(blocks, 5);
+
+    UsbCommand resp;
+    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
+
+    for (uint8_t i = 0; i < 5; i++) {
+        c.arg[0] = blocks[i];
+        c.arg[1] = i;
+        clearCommandBuffer();
+        SendCommand(&c);
+        if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
+            PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
+            return -1;
+        }
+    }
+    return 0;
+}
+
+// takes base 12 ID converts to hex
+// Or takes 8 digit hex ID
+int CmdPrescoSim(const char *Cmd) {
+    uint32_t sitecode = 0, usercode = 0, fullcode = 0;
+    bool Q5 = false;
+    // get wiegand from printed number.
+    if (getWiegandFromPresco(Cmd, &sitecode, &usercode, &fullcode, &Q5) == -1) return usage_lf_presco_sim();
+
+    uint8_t clk = 32, encoding = 1, separator = 1, invert = 0;
+    uint16_t arg1, arg2;
+    size_t size = 128;
+    arg1 = clk << 8 | encoding;
+    arg2 = invert << 8 | separator;
+
+    PrintAndLogEx(SUCCESS, "Simulating Presco - SiteCode: %u, UserCode: %u, FullCode: %08X", sitecode, usercode, fullcode);
+
+    UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
+    getPrescoBits(fullcode, c.d.asBytes);
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
+}
+
+static command_t CommandTable[] = {
+    {"help",    CmdHelp,        1, "This help"},
+    {"read",    CmdPrescoRead,  0, "Attempt to read and Extract tag data"},
+    {"clone",   CmdPrescoClone, 0, "clone presco tag"},
+    {"sim",     CmdPrescoSim,   0, "simulate presco tag"},
+    {NULL, NULL, 0, NULL}
+};
+
+int CmdLFPresco(const char *Cmd) {
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
+    return 0;
+}
+
+int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
+    CmdsHelp(CommandTable);
+    return 0;
+}
+
 // find presco preamble 0x10D in already demoded data
 int detectPresco(uint8_t *dest, size_t *size) {
     if (*size < 128 * 2) return -1; //make sure buffer has data
@@ -53,7 +192,7 @@ int detectPresco(uint8_t *dest, size_t *size) {
 }
 
 // convert base 12 ID to sitecode & usercode & 8 bit other unknown code
-int GetWiegandFromPresco(const char *Cmd, uint32_t *sitecode, uint32_t *usercode, uint32_t *fullcode, bool *Q5) {
+int getWiegandFromPresco(const char *Cmd, uint32_t *sitecode, uint32_t *usercode, uint32_t *fullcode, bool *Q5) {
 
     uint8_t val = 0;
     bool hex = false, errors = false;
@@ -116,7 +255,7 @@ int GetWiegandFromPresco(const char *Cmd, uint32_t *sitecode, uint32_t *usercode
 }
 
 // calc not certain - intended to get bitstream for programming / sim
-int GetPrescoBits(uint32_t fullcode, uint8_t *prescoBits) {
+int getPrescoBits(uint32_t fullcode, uint8_t *prescoBits) {
     num_to_bytebits(0x10D00000, 32, prescoBits);
     num_to_bytebits(0x00000000, 32, prescoBits + 32);
     num_to_bytebits(0x00000000, 32, prescoBits + 64);
@@ -124,141 +263,7 @@ int GetPrescoBits(uint32_t fullcode, uint8_t *prescoBits) {
     return 1;
 }
 
-//see ASKDemod for what args are accepted
-int CmdPrescoDemod(const char *Cmd) {
-    (void)Cmd; // Cmd is not used so far
-    bool st = true;
-    if (!ASKDemod_ext("32 0 0 0 0 a", false, false, 1, &st)) {
-        PrintAndLogEx(DEBUG, "DEBUG: Error Presco ASKDemod failed");
-        return 0;
-    }
-    size_t size = DemodBufferLen;
-    int ans = detectPresco(DemodBuffer, &size);
-    if (ans < 0) {
-        if (ans == -1)
-            PrintAndLogEx(DEBUG, "DEBUG: Error - Presco: too few bits found");
-        else if (ans == -2)
-            PrintAndLogEx(DEBUG, "DEBUG: Error - Presco: preamble not found");
-        else if (ans == -3)
-            PrintAndLogEx(DEBUG, "DEBUG: Error - Presco: Size not correct: %d", size);
-        else
-            PrintAndLogEx(DEBUG, "DEBUG: Error - Presco: ans: %d", ans);
-        return 0;
-    }
-    setDemodBuff(DemodBuffer, 128, ans);
-    setClockGrid(g_DemodClock, g_DemodStartIdx + (ans * g_DemodClock));
-
-    //got a good demod
-    uint32_t raw1 = bytebits_to_byte(DemodBuffer, 32);
-    uint32_t raw2 = bytebits_to_byte(DemodBuffer + 32, 32);
-    uint32_t raw3 = bytebits_to_byte(DemodBuffer + 64, 32);
-    uint32_t raw4 = bytebits_to_byte(DemodBuffer + 96, 32);
-    uint32_t cardid = raw4;
-    PrintAndLogEx(SUCCESS, "Presco Tag Found: Card ID %08X, Raw: %08X%08X%08X%08X", cardid, raw1, raw2, raw3, raw4);
-
-    uint32_t sitecode = 0, usercode = 0, fullcode = 0;
-    bool Q5 = false;
-    char cmd[12] = {0};
-    sprintf(cmd, "H %08X", cardid);
-    GetWiegandFromPresco(cmd, &sitecode, &usercode, &fullcode, &Q5);
-    PrintAndLogEx(SUCCESS, "SiteCode %u, UserCode %u, FullCode, %08X", sitecode, usercode, fullcode);
-    return 1;
+int demodPresco(void) {
+    return CmdPrescoDemod("");
 }
 
-//see ASKDemod for what args are accepted
-int CmdPrescoRead(const char *Cmd) {
-    // Presco Number: 123456789 --> Sitecode 30 | usercode 8665
-    lf_read(true, 12000);
-    return CmdPrescoDemod(Cmd);
-}
-
-// takes base 12 ID converts to hex
-// Or takes 8 digit hex ID
-int CmdPrescoClone(const char *Cmd) {
-
-    bool Q5 = false;
-    uint32_t sitecode = 0, usercode = 0, fullcode = 0;
-    uint32_t blocks[5] = {T55x7_MODULATION_MANCHESTER | T55x7_BITRATE_RF_32 | 4 << T55x7_MAXBLOCK_SHIFT | T55x7_ST_TERMINATOR, 0, 0, 0, 0};
-
-    // get wiegand from printed number.
-    if (GetWiegandFromPresco(Cmd, &sitecode, &usercode, &fullcode, &Q5) == -1) return usage_lf_presco_clone();
-
-    if (Q5)
-        blocks[0] = T5555_MODULATION_MANCHESTER | T5555_SET_BITRATE(32) | 4 << T5555_MAXBLOCK_SHIFT | T5555_ST_TERMINATOR;
-
-    if ((sitecode & 0xFF) != sitecode) {
-        sitecode &= 0xFF;
-        PrintAndLogEx(INFO, "Facility-Code Truncated to 8-bits (Presco): %u", sitecode);
-    }
-
-    if ((usercode & 0xFFFF) != usercode) {
-        usercode &= 0xFFFF;
-        PrintAndLogEx(INFO, "Card Number Truncated to 16-bits (Presco): %u", usercode);
-    }
-
-    blocks[1] = 0x10D00000; //preamble
-    blocks[2] = 0x00000000;
-    blocks[3] = 0x00000000;
-    blocks[4] = fullcode;
-
-    PrintAndLogEx(INFO, "Preparing to clone Presco to T55x7 with SiteCode: %u, UserCode: %u, FullCode: %08x", sitecode, usercode, fullcode);
-    print_blocks(blocks, 5);
-
-    UsbCommand resp;
-    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
-
-    for (uint8_t i = 0; i < 5; i++) {
-        c.arg[0] = blocks[i];
-        c.arg[1] = i;
-        clearCommandBuffer();
-        SendCommand(&c);
-        if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
-            PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
-            return -1;
-        }
-    }
-    return 0;
-}
-
-// takes base 12 ID converts to hex
-// Or takes 8 digit hex ID
-int CmdPrescoSim(const char *Cmd) {
-    uint32_t sitecode = 0, usercode = 0, fullcode = 0;
-    bool Q5 = false;
-    // get wiegand from printed number.
-    if (GetWiegandFromPresco(Cmd, &sitecode, &usercode, &fullcode, &Q5) == -1) return usage_lf_presco_sim();
-
-    uint8_t clk = 32, encoding = 1, separator = 1, invert = 0;
-    uint16_t arg1, arg2;
-    size_t size = 128;
-    arg1 = clk << 8 | encoding;
-    arg2 = invert << 8 | separator;
-
-    PrintAndLogEx(SUCCESS, "Simulating Presco - SiteCode: %u, UserCode: %u, FullCode: %08X", sitecode, usercode, fullcode);
-
-    UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
-    GetPrescoBits(fullcode, c.d.asBytes);
-    clearCommandBuffer();
-    SendCommand(&c);
-    return 0;
-}
-
-static command_t CommandTable[] = {
-    {"help",    CmdHelp,        1, "This help"},
-    {"read",    CmdPrescoRead,  0, "Attempt to read and Extract tag data"},
-    {"clone",   CmdPrescoClone, 0, "clone presco tag"},
-    {"sim",     CmdPrescoSim,   0, "simulate presco tag"},
-    {NULL, NULL, 0, NULL}
-};
-
-int CmdLFPresco(const char *Cmd) {
-    clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
-}
-
-int CmdHelp(const char *Cmd) {
-    (void)Cmd; // Cmd is not used so far
-    CmdsHelp(CommandTable);
-    return 0;
-}
diff --git a/client/cmdlfpresco.h b/client/cmdlfpresco.h
index fec6fc620..1f101a13c 100644
--- a/client/cmdlfpresco.h
+++ b/client/cmdlfpresco.h
@@ -22,13 +22,11 @@
 #include "lfdemod.h"    // parityTest
 
 int CmdLFPresco(const char *Cmd);
-int CmdPrescoRead(const char *Cmd);
-int CmdPrescoDemod(const char *Cmd);
-int CmdPrescoClone(const char *Cmd);
-int CmdPrescoSim(const char *Cmd);
 
+int demodPresco(void);
 int detectPresco(uint8_t *dest, size_t *size);
-int GetWiegandFromPresco(const char *Cmd, uint32_t *sitecode, uint32_t *usercode, uint32_t *fullcode, bool *Q5);
+int getPrescoBits(uint32_t fullcode, uint8_t *prescoBits);
+int getWiegandFromPresco(const char *Cmd, uint32_t *sitecode, uint32_t *usercode, uint32_t *fullcode, bool *Q5);
 
 #endif
 
diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c
index 03e900bf6..44cbdeded 100644
--- a/client/cmdlfpyramid.c
+++ b/client/cmdlfpyramid.c
@@ -45,63 +45,6 @@ static int usage_lf_pyramid_sim(void) {
     return 0;
 }
 
-// by marshmellow
-// FSK Demod then try to locate a Farpointe Data (pyramid) ID
-int detectPyramid(uint8_t *dest, size_t *size, int *waveStartIdx) {
-    //make sure buffer has data
-    if (*size < 128 * 50) return -1;
-
-    //test samples are not just noise
-    if (getSignalProperties()->isnoise) return -2;
-
-    // FSK demodulator RF/50 FSK 10,8
-    *size = fskdemod(dest, *size, 50, 1, 10, 8, waveStartIdx);  // pyramid fsk2
-
-    //did we get a good demod?
-    if (*size < 128) return -3;
-
-    size_t startIdx = 0;
-    uint8_t preamble[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1};
-    if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
-        return -4; //preamble not found
-
-    // wrong size?  (between to preambles)
-    if (*size != 128) return -5;
-
-    return (int)startIdx;
-}
-
-// Works for 26bits.
-static int GetPyramidBits(uint32_t fc, uint32_t cn, uint8_t *pyramidBits) {
-
-    uint8_t pre[128];
-    memset(pre, 0x00, sizeof(pre));
-
-    // format start bit
-    pre[79] = 1;
-
-    // Get 26 wiegand from FacilityCode, CardNumber
-    uint8_t wiegand[24];
-    memset(wiegand, 0x00, sizeof(wiegand));
-    num_to_bytebits(fc, 8, wiegand);
-    num_to_bytebits(cn, 16, wiegand + 8);
-
-    // add wiegand parity bits (dest, source, len)
-    wiegand_add_parity(pre + 80, wiegand, 24);
-
-    // add paritybits (bitsource, dest, sourcelen, paritylen, parityType (odd, even,)
-    addParity(pre + 8, pyramidBits + 8, 102, 8, 1);
-
-    // add checksum
-    uint8_t csBuff[13];
-    for (uint8_t i = 0; i < 13; i++)
-        csBuff[i] = bytebits_to_byte(pyramidBits + 16 + (i * 8), 8);
-
-    uint32_t crc = CRC8Maxim(csBuff, 13);
-    num_to_bytebits(crc, 8, pyramidBits + 120);
-    return 1;
-}
-
 //by marshmellow
 //Pyramid Prox demod - FSK RF/50 with preamble of 0000000000000001  (always a 128 bit data stream)
 //print full Farpointe Data/Pyramid Prox ID and some bit format details if found
@@ -269,7 +212,7 @@ int CmdPyramidClone(const char *Cmd) {
     facilitycode = (fc & 0x000000FF);
     cardnumber = (cn & 0x0000FFFF);
 
-    if (!GetPyramidBits(facilitycode, cardnumber, bs)) {
+    if (!getPyramidBits(facilitycode, cardnumber, bs)) {
         PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
         return 1;
     }
@@ -327,7 +270,7 @@ int CmdPyramidSim(const char *Cmd) {
     facilitycode = (fc & 0x000000FF);
     cardnumber = (cn & 0x0000FFFF);
 
-    if (!GetPyramidBits(facilitycode, cardnumber, bs)) {
+    if (!getPyramidBits(facilitycode, cardnumber, bs)) {
         PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
         return 1;
     }
@@ -361,3 +304,65 @@ int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
+
+// Works for 26bits.
+int getPyramidBits(uint32_t fc, uint32_t cn, uint8_t *pyramidBits) {
+
+    uint8_t pre[128];
+    memset(pre, 0x00, sizeof(pre));
+
+    // format start bit
+    pre[79] = 1;
+
+    // Get 26 wiegand from FacilityCode, CardNumber
+    uint8_t wiegand[24];
+    memset(wiegand, 0x00, sizeof(wiegand));
+    num_to_bytebits(fc, 8, wiegand);
+    num_to_bytebits(cn, 16, wiegand + 8);
+
+    // add wiegand parity bits (dest, source, len)
+    wiegand_add_parity(pre + 80, wiegand, 24);
+
+    // add paritybits (bitsource, dest, sourcelen, paritylen, parityType (odd, even,)
+    addParity(pre + 8, pyramidBits + 8, 102, 8, 1);
+
+    // add checksum
+    uint8_t csBuff[13];
+    for (uint8_t i = 0; i < 13; i++)
+        csBuff[i] = bytebits_to_byte(pyramidBits + 16 + (i * 8), 8);
+
+    uint32_t crc = CRC8Maxim(csBuff, 13);
+    num_to_bytebits(crc, 8, pyramidBits + 120);
+    return 1;
+}
+
+int demodPyramid(void) {
+    return CmdPyramidDemod("");
+}
+
+// by marshmellow
+// FSK Demod then try to locate a Farpointe Data (pyramid) ID
+int detectPyramid(uint8_t *dest, size_t *size, int *waveStartIdx) {
+    //make sure buffer has data
+    if (*size < 128 * 50) return -1;
+
+    //test samples are not just noise
+    if (getSignalProperties()->isnoise) return -2;
+
+    // FSK demodulator RF/50 FSK 10,8
+    *size = fskdemod(dest, *size, 50, 1, 10, 8, waveStartIdx);  // pyramid fsk2
+
+    //did we get a good demod?
+    if (*size < 128) return -3;
+
+    size_t startIdx = 0;
+    uint8_t preamble[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1};
+    if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
+        return -4; //preamble not found
+
+    // wrong size?  (between to preambles)
+    if (*size != 128) return -5;
+
+    return (int)startIdx;
+}
+
diff --git a/client/cmdlfpyramid.h b/client/cmdlfpyramid.h
index bb22310b2..009bec3ce 100644
--- a/client/cmdlfpyramid.h
+++ b/client/cmdlfpyramid.h
@@ -23,11 +23,9 @@
 #include "crc.h"
 
 int CmdLFPyramid(const char *Cmd);
-int CmdPyramidDemod(const char *Cmd);
-int CmdPyramidRead(const char *Cmd);
-int CmdPyramidClone(const char *Cmd);
-int CmdPyramidSim(const char *Cmd);
 
+int demodPyramid(void);
 int detectPyramid(uint8_t *dest, size_t *size, int *waveStartIdx);
+int getPyramidBits(uint32_t fc, uint32_t cn, uint8_t *pyramidBits);
 #endif
 
diff --git a/client/cmdlfsecurakey.c b/client/cmdlfsecurakey.c
index a3679daaf..fab8d425b 100644
--- a/client/cmdlfsecurakey.c
+++ b/client/cmdlfsecurakey.c
@@ -11,19 +11,6 @@
 
 static int CmdHelp(const char *Cmd);
 
-// by marshmellow
-// find Securakey preamble in already demoded data
-static int detectSecurakey(uint8_t *dest, size_t *size) {
-    if (*size < 96) return -1; //make sure buffer has data
-    size_t startIdx = 0;
-    uint8_t preamble[] = {0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1};
-    if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
-        return -2; //preamble not found
-    if (*size != 96) return -3; //wrong demoded size
-    //return start position
-    return (int)startIdx;
-}
-
 //see ASKDemod for what args are accepted
 int CmdSecurakeyDemod(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
@@ -132,3 +119,21 @@ int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
+
+// by marshmellow
+// find Securakey preamble in already demoded data
+int detectSecurakey(uint8_t *dest, size_t *size) {
+    if (*size < 96) return -1; //make sure buffer has data
+    size_t startIdx = 0;
+    uint8_t preamble[] = {0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1};
+    if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
+        return -2; //preamble not found
+    if (*size != 96) return -3; //wrong demoded size
+    //return start position
+    return (int)startIdx;
+}
+
+int demodSecurakey(void) {
+    return CmdSecurakeyDemod("");
+}
+
diff --git a/client/cmdlfsecurakey.h b/client/cmdlfsecurakey.h
index bdeae02b7..6a84d2046 100644
--- a/client/cmdlfsecurakey.h
+++ b/client/cmdlfsecurakey.h
@@ -25,10 +25,9 @@
 #include "parity.h"     // for wiegand parity test
 
 int CmdLFSecurakey(const char *Cmd);
-//int CmdSecurakeyClone(const char *Cmd);
-//int CmdSecurakeySim(const char *Cmd);
-int CmdSecurakeyRead(const char *Cmd);
-int CmdSecurakeyDemod(const char *Cmd);
+
+int demodSecurakey(void);
+int detectSecurakey(uint8_t *dest, size_t *size);
 
 #endif
 
diff --git a/client/cmdlft55xx.h b/client/cmdlft55xx.h
index a38b5725f..56fc942fd 100644
--- a/client/cmdlft55xx.h
+++ b/client/cmdlft55xx.h
@@ -139,17 +139,6 @@ void Set_t55xx_Config(t55xx_conf_block_t conf);
 
 int CmdLFT55XX(const char *Cmd);
 
-int CmdT55xxChk(const char *Cmd);
-int CmdT55xxBruteForce(const char *Cmd);
-int CmdT55xxSetConfig(const char *Cmd);
-int CmdT55xxReadBlock(const char *Cmd);
-int CmdT55xxWriteBlock(const char *Cmd);
-int CmdT55xxReadTrace(const char *Cmd);
-int CmdT55xxInfo(const char *Cmd);
-int CmdT55xxDetect(const char *Cmd);
-int CmdResetRead(const char *Cmd);
-int CmdT55xxWipe(const char *Cmd);
-
 char *GetPskCfStr(uint32_t id, bool q5);
 char *GetBitRateStr(uint32_t id, bool xmode);
 char *GetSaferStr(uint32_t id);
diff --git a/client/cmdlfti.c b/client/cmdlfti.c
index 129f8d69b..3c4309266 100644
--- a/client/cmdlfti.c
+++ b/client/cmdlfti.c
@@ -318,3 +318,8 @@ int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
+
+int demodTI(void) {
+    return CmdTIDemod("");
+}
+
diff --git a/client/cmdlfti.h b/client/cmdlfti.h
index e4bbc3a0d..bb4922f78 100644
--- a/client/cmdlfti.h
+++ b/client/cmdlfti.h
@@ -13,8 +13,5 @@
 
 int CmdLFTI(const char *Cmd);
 
-int CmdTIDemod(const char *Cmd);
-int CmdTIRead(const char *Cmd);
-int CmdTIWrite(const char *Cmd);
-
+int demodTI(void);
 #endif
diff --git a/client/cmdlfviking.c b/client/cmdlfviking.c
index df23091ed..48ed3148a 100644
--- a/client/cmdlfviking.c
+++ b/client/cmdlfviking.c
@@ -37,38 +37,6 @@ static int usage_lf_viking_sim(void) {
     return 0;
 }
 
-// calc checksum
-static uint64_t getVikingBits(uint32_t id) {
-    uint8_t checksum = ((id >> 24) & 0xFF) ^ ((id >> 16) & 0xFF) ^ ((id >> 8) & 0xFF) ^ (id & 0xFF) ^ 0xF2 ^ 0xA8;
-    uint64_t ret = (uint64_t)0xF2 << 56;
-    ret |= (uint64_t)id << 8;
-    ret |= checksum;
-    return ret;
-}
-// by marshmellow
-// find viking preamble 0xF200 in already demoded data
-int detectViking(uint8_t *dest, size_t *size) {
-    //make sure buffer has data
-    if (*size < 64 * 2) return -2;
-    size_t startIdx = 0;
-    uint8_t preamble[] = {1, 1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-    if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
-        return -4; //preamble not found
-
-    uint32_t checkCalc = bytebits_to_byte(dest + startIdx, 8) ^
-                         bytebits_to_byte(dest + startIdx + 8, 8) ^
-                         bytebits_to_byte(dest + startIdx + 16, 8) ^
-                         bytebits_to_byte(dest + startIdx + 24, 8) ^
-                         bytebits_to_byte(dest + startIdx + 32, 8) ^
-                         bytebits_to_byte(dest + startIdx + 40, 8) ^
-                         bytebits_to_byte(dest + startIdx + 48, 8) ^
-                         bytebits_to_byte(dest + startIdx + 56, 8);
-    if (checkCalc != 0xA8) return -5;
-    if (*size != 64) return -6;
-    //return start position
-    return (int)startIdx;
-}
-
 //by marshmellow
 //see ASKDemod for what args are accepted
 int CmdVikingDemod(const char *Cmd) {
@@ -178,3 +146,40 @@ int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
+
+// calc checksum
+uint64_t getVikingBits(uint32_t id) {
+    uint8_t checksum = ((id >> 24) & 0xFF) ^ ((id >> 16) & 0xFF) ^ ((id >> 8) & 0xFF) ^ (id & 0xFF) ^ 0xF2 ^ 0xA8;
+    uint64_t ret = (uint64_t)0xF2 << 56;
+    ret |= (uint64_t)id << 8;
+    ret |= checksum;
+    return ret;
+}
+// by marshmellow
+// find viking preamble 0xF200 in already demoded data
+int detectViking(uint8_t *dest, size_t *size) {
+    //make sure buffer has data
+    if (*size < 64 * 2) return -2;
+    size_t startIdx = 0;
+    uint8_t preamble[] = {1, 1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+    if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
+        return -4; //preamble not found
+
+    uint32_t checkCalc = bytebits_to_byte(dest + startIdx, 8) ^
+                         bytebits_to_byte(dest + startIdx + 8, 8) ^
+                         bytebits_to_byte(dest + startIdx + 16, 8) ^
+                         bytebits_to_byte(dest + startIdx + 24, 8) ^
+                         bytebits_to_byte(dest + startIdx + 32, 8) ^
+                         bytebits_to_byte(dest + startIdx + 40, 8) ^
+                         bytebits_to_byte(dest + startIdx + 48, 8) ^
+                         bytebits_to_byte(dest + startIdx + 56, 8);
+    if (checkCalc != 0xA8) return -5;
+    if (*size != 64) return -6;
+    //return start position
+    return (int)startIdx;
+}
+
+int demodViking(void) {
+    return CmdVikingDemod("");
+}
+
diff --git a/client/cmdlfviking.h b/client/cmdlfviking.h
index 1ee7b6511..2baea6364 100644
--- a/client/cmdlfviking.h
+++ b/client/cmdlfviking.h
@@ -23,12 +23,9 @@
 
 int CmdLFViking(const char *Cmd);
 
-int CmdVikingDemod(const char *Cmd);
-int CmdVikingRead(const char *Cmd);
-int CmdVikingClone(const char *Cmd);
-int CmdVikingSim(const char *Cmd);
-
+int demodViking(void);
 int detectViking(uint8_t *dest, size_t *size);
+uint64_t getVikingBits(uint32_t id);
 
 #endif
 
diff --git a/client/cmdlfvisa2000.c b/client/cmdlfvisa2000.c
index 9dfad9a40..b808a1042 100644
--- a/client/cmdlfvisa2000.c
+++ b/client/cmdlfvisa2000.c
@@ -69,19 +69,6 @@ static uint8_t visa_parity(uint32_t id) {
     return par;
 }
 
-// by iceman
-// find Visa2000 preamble in already demoded data
-int detectVisa2k(uint8_t *dest, size_t *size) {
-    if (*size < 96) return -1; //make sure buffer has data
-    size_t startIdx = 0;
-    uint8_t preamble[] = {0, 1, 0, 1, 0, 1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 0};
-    if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
-        return -2; //preamble not found
-    if (*size != 96) return -3; //wrong demoded size
-    //return start position
-    return (int)startIdx;
-}
-
 /**
 *
 * 56495332 00096ebd 00000077 —> tag id 618173
@@ -243,3 +230,21 @@ int CmdHelp(const char *Cmd) {
     CmdsHelp(CommandTable);
     return 0;
 }
+
+// by iceman
+// find Visa2000 preamble in already demoded data
+int detectVisa2k(uint8_t *dest, size_t *size) {
+    if (*size < 96) return -1; //make sure buffer has data
+    size_t startIdx = 0;
+    uint8_t preamble[] = {0, 1, 0, 1, 0, 1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 0};
+    if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
+        return -2; //preamble not found
+    if (*size != 96) return -3; //wrong demoded size
+    //return start position
+    return (int)startIdx;
+}
+
+int demodVisa2k(void) {
+    return CmdVisa2kDemod("");
+}
+
diff --git a/client/cmdlfvisa2000.h b/client/cmdlfvisa2000.h
index 36fef841e..15d626f6c 100644
--- a/client/cmdlfvisa2000.h
+++ b/client/cmdlfvisa2000.h
@@ -23,12 +23,8 @@
 #include "lfdemod.h"    // parityTest
 int CmdLFVisa2k(const char *Cmd);
 
-int CmdVisa2kDemod(const char *Cmd);
-int CmdVisa2kRead(const char *Cmd);
-int CmdVisa2kClone(const char *Cmd);
-int CmdVisa2kSim(const char *Cmd);
-
 int getvisa2kBits(uint64_t fullcode, uint8_t *bits);
+int demodVisa2k(void);
 int detectVisa2k(uint8_t *dest, size_t *size);
 
 #endif
diff --git a/client/cmdmain.c b/client/cmdmain.c
index b3f19af5c..9a1fb7108 100644
--- a/client/cmdmain.c
+++ b/client/cmdmain.c
@@ -11,9 +11,28 @@
 #include "cmdmain.h"
 
 static int CmdHelp(const char *Cmd);
-static int CmdQuit(const char *Cmd);
-static int CmdRev(const char *Cmd);
-static int CmdRem(const char *Cmd);
+
+static int CmdRem(const char *Cmd) {
+    char buf[22];
+
+    memset(buf, 0x00, sizeof(buf));
+    struct tm *curTime;
+    time_t now = time(0);
+    curTime = gmtime(&now);
+    strftime(buf, sizeof(buf), "%Y-%m-%dT%H:%M:%SZ", curTime);  // ISO8601
+    PrintAndLogEx(NORMAL, "%s remark: %s", buf, Cmd);
+    return 0;
+}
+
+static int CmdQuit(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
+    return 99;
+}
+
+static int CmdRev(const char *Cmd) {
+    CmdCrc(Cmd);
+    return 0;
+}
 
 static command_t CommandTable[] = {
     {"help",    CmdHelp,      1, "This help. Use '<command> help' for details of a particular command."},
@@ -38,38 +57,12 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-command_t *getTopLevelCommandTable() {
-    return CommandTable;
-}
-
-int CmdRem(const char *Cmd) {
-    char buf[22];
-
-    memset(buf, 0x00, sizeof(buf));
-    struct tm *curTime;
-    time_t now = time(0);
-    curTime = gmtime(&now);
-    strftime(buf, sizeof(buf), "%Y-%m-%dT%H:%M:%SZ", curTime);  // ISO8601
-    PrintAndLogEx(NORMAL, "%s remark: %s", buf, Cmd);
-    return 0;
-}
-
-int CmdHelp(const char *Cmd) {
+static int CmdHelp(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
 
-int CmdQuit(const char *Cmd) {
-    (void)Cmd; // Cmd is not used so far
-    return 99;
-}
-
-int CmdRev(const char *Cmd) {
-    CmdCrc(Cmd);
-    return 0;
-}
-
 //-----------------------------------------------------------------------------
 // Entry point into our code: called whenever the user types a command and
 // then presses Enter, which the full command line that they typed.
@@ -77,3 +70,8 @@ int CmdRev(const char *Cmd) {
 int CommandReceived(char *Cmd) {
     return CmdsParse(CommandTable, Cmd);
 }
+
+command_t *getTopLevelCommandTable() {
+    return CommandTable;
+}
+
diff --git a/client/cmdscript.c b/client/cmdscript.c
index b4e2f4bf2..bcaf581bf 100644
--- a/client/cmdscript.c
+++ b/client/cmdscript.c
@@ -67,7 +67,7 @@ static bool endsWith(const char *base, const char *str) {
 * generate a file listing of the script-directory for files
 * ending with .lua
 */
-int CmdScriptList(const char *Cmd) {
+static int CmdScriptList(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
 
     char const *exedir = get_my_executable_directory();
@@ -102,7 +102,7 @@ int CmdScriptList(const char *Cmd) {
  * @param argv
  * @return
  */
-int CmdScriptRun(const char *Cmd) {
+static int CmdScriptRun(const char *Cmd) {
     // create new Lua state
     lua_State *lua_state;
     lua_state = luaL_newstate();
@@ -173,6 +173,18 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
+/**
+ * Shows some basic help
+ * @brief CmdHelp
+ * @param Cmd
+ * @return
+ */
+static int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
+    PrintAndLogEx(NORMAL, "This is a feature to run Lua-scripts. You can place lua-scripts within the scripts/-folder. ");
+    return 0;
+}
+
 /**
  * Finds a matching script-file
  * @brief CmdScript
@@ -185,14 +197,3 @@ int CmdScript(const char *Cmd) {
     return 0;
 }
 
-/**
- * Shows some basic help
- * @brief CmdHelp
- * @param Cmd
- * @return
- */
-int CmdHelp(const char *Cmd) {
-    (void)Cmd; // Cmd is not used so far
-    PrintAndLogEx(NORMAL, "This is a feature to run Lua-scripts. You can place lua-scripts within the scripts/-folder. ");
-    return 0;
-}
diff --git a/client/cmdscript.h b/client/cmdscript.h
index 55d735c0a..866b09e99 100644
--- a/client/cmdscript.h
+++ b/client/cmdscript.h
@@ -13,6 +13,4 @@
 
 int CmdScript(const char *Cmd);
 
-int CmdScriptList(const char *Cmd);
-int CmdScriptRun(const char *Cmd);
 #endif
diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index c0a41d786..a483e424f 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -308,37 +308,6 @@ static int PrintATR(uint8_t *atr, size_t atrlen) {
     return 0;
 }
 
-bool smart_select(bool silent, smart_card_atr_t *atr) {
-    if (atr)
-        memset(atr, 0, sizeof(smart_card_atr_t));
-
-    UsbCommand c = {CMD_SMART_ATR, {0, 0, 0}, {{0}}};
-    clearCommandBuffer();
-    SendCommand(&c);
-    UsbCommand resp;
-    if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
-        if (!silent) PrintAndLogEx(WARNING, "smart card select failed");
-        return false;
-    }
-
-    uint8_t isok = resp.arg[0] & 0xFF;
-    if (!isok) {
-        if (!silent) PrintAndLogEx(WARNING, "smart card select failed");
-        return false;
-    }
-
-    smart_card_atr_t card;
-    memcpy(&card, (smart_card_atr_t *)resp.d.asBytes, sizeof(smart_card_atr_t));
-
-    if (atr)
-        memcpy(atr, &card, sizeof(smart_card_atr_t));
-
-    if (!silent)
-        PrintAndLogEx(INFO, "ISO7816-3 ATR : %s", sprint_hex(card.atr, card.atr_len));
-
-    return true;
-}
-
 static int smart_wait(uint8_t *data, bool silent) {
     UsbCommand resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
@@ -420,7 +389,7 @@ static int smart_response(uint8_t *data) {
     return smart_responseEx(data, false);
 }
 
-int CmdSmartRaw(const char *Cmd) {
+static int CmdSmartRaw(const char *Cmd) {
 
     int hexlen = 0;
     bool active = false;
@@ -536,47 +505,7 @@ int CmdSmartRaw(const char *Cmd) {
     return 0;
 }
 
-int ExchangeAPDUSC(uint8_t *datain, int datainlen, bool activateCard, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
-    *dataoutlen = 0;
-
-    if (activateCard)
-        smart_select(false, NULL);
-
-    PrintAndLogEx(DEBUG, "APDU SC");
-
-    UsbCommand c = {CMD_SMART_RAW, {SC_RAW_T0, datainlen, 0}, {{0}}};
-    if (activateCard) {
-        c.arg[0] |= SC_SELECT | SC_CONNECT;
-    }
-    memcpy(c.d.asBytes, datain, datainlen);
-    clearCommandBuffer();
-    SendCommand(&c);
-
-    int len = smart_responseEx(dataout, true);
-
-    if (len < 0) {
-        return 1;
-    }
-
-    // retry
-    if (len > 1 && dataout[len - 2] == 0x6c && datainlen > 4) {
-        UsbCommand c2 = {CMD_SMART_RAW, {SC_RAW_T0, datainlen, 0}, {{0}}};
-        memcpy(c2.d.asBytes, datain, 5);
-
-        // transfer length via T=0
-        c2.d.asBytes[4] = dataout[len - 1];
-
-        clearCommandBuffer();
-        SendCommand(&c2);
-
-        len = smart_responseEx(dataout, true);
-    }
-
-    *dataoutlen = len;
-    return 0;
-}
-
-int CmdSmartUpgrade(const char *Cmd) {
+static int CmdSmartUpgrade(const char *Cmd) {
 
     PrintAndLogEx(WARNING, "WARNING - Sim module firmware upgrade.");
     PrintAndLogEx(WARNING, "A dangerous command, do wrong and you could brick the sim module");
@@ -763,7 +692,7 @@ int CmdSmartUpgrade(const char *Cmd) {
     return 0;
 }
 
-int CmdSmartInfo(const char *Cmd) {
+static int CmdSmartInfo(const char *Cmd) {
     uint8_t cmdp = 0;
     bool errors = false, silent = false;
 
@@ -838,7 +767,7 @@ int CmdSmartInfo(const char *Cmd) {
     return 0;
 }
 
-int CmdSmartReader(const char *Cmd) {
+static int CmdSmartReader(const char *Cmd) {
     uint8_t cmdp = 0;
     bool errors = false, silent = false;
 
@@ -881,7 +810,7 @@ int CmdSmartReader(const char *Cmd) {
     return 0;
 }
 
-int CmdSmartSetClock(const char *Cmd) {
+static int CmdSmartSetClock(const char *Cmd) {
     uint8_t cmdp = 0;
     bool errors = false;
     uint8_t clock1 = 0;
@@ -937,7 +866,7 @@ int CmdSmartSetClock(const char *Cmd) {
     return 0;
 }
 
-int CmdSmartList(const char *Cmd) {
+static int CmdSmartList(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     CmdTraceList("7816");
     return 0;
@@ -1073,7 +1002,7 @@ static void smart_brute_options(bool decodeTLV) {
     free(buf);
 }
 
-int CmdSmartBruteforceSFI(const char *Cmd) {
+static int CmdSmartBruteforceSFI(const char *Cmd) {
 
     uint8_t cmdp = 0;
     bool errors = false, decodeTLV = false; //, useT0 = false;
@@ -1229,14 +1158,86 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
+static int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
+    CmdsHelp(CommandTable);
+    return 0;
+}
+
 int CmdSmartcard(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
-    (void)Cmd; // Cmd is not used so far
-    CmdsHelp(CommandTable);
+int ExchangeAPDUSC(uint8_t *datain, int datainlen, bool activateCard, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
+    *dataoutlen = 0;
+
+    if (activateCard)
+        smart_select(false, NULL);
+
+    PrintAndLogEx(DEBUG, "APDU SC");
+
+    UsbCommand c = {CMD_SMART_RAW, {SC_RAW_T0, datainlen, 0}, {{0}}};
+    if (activateCard) {
+        c.arg[0] |= SC_SELECT | SC_CONNECT;
+    }
+    memcpy(c.d.asBytes, datain, datainlen);
+    clearCommandBuffer();
+    SendCommand(&c);
+
+    int len = smart_responseEx(dataout, true);
+
+    if (len < 0) {
+        return 1;
+    }
+
+    // retry
+    if (len > 1 && dataout[len - 2] == 0x6c && datainlen > 4) {
+        UsbCommand c2 = {CMD_SMART_RAW, {SC_RAW_T0, datainlen, 0}, {{0}}};
+        memcpy(c2.d.asBytes, datain, 5);
+
+        // transfer length via T=0
+        c2.d.asBytes[4] = dataout[len - 1];
+
+        clearCommandBuffer();
+        SendCommand(&c2);
+
+        len = smart_responseEx(dataout, true);
+    }
+
+    *dataoutlen = len;
     return 0;
 }
+
+bool smart_select(bool silent, smart_card_atr_t *atr) {
+    if (atr)
+        memset(atr, 0, sizeof(smart_card_atr_t));
+
+    UsbCommand c = {CMD_SMART_ATR, {0, 0, 0}, {{0}}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    UsbCommand resp;
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
+        if (!silent) PrintAndLogEx(WARNING, "smart card select failed");
+        return false;
+    }
+
+    uint8_t isok = resp.arg[0] & 0xFF;
+    if (!isok) {
+        if (!silent) PrintAndLogEx(WARNING, "smart card select failed");
+        return false;
+    }
+
+    smart_card_atr_t card;
+    memcpy(&card, (smart_card_atr_t *)resp.d.asBytes, sizeof(smart_card_atr_t));
+
+    if (atr)
+        memcpy(atr, &card, sizeof(smart_card_atr_t));
+
+    if (!silent)
+        PrintAndLogEx(INFO, "ISO7816-3 ATR : %s", sprint_hex(card.atr, card.atr_len));
+
+    return true;
+}
+
diff --git a/client/cmdsmartcard.h b/client/cmdsmartcard.h
index 54b832608..9032ab265 100644
--- a/client/cmdsmartcard.h
+++ b/client/cmdsmartcard.h
@@ -29,11 +29,6 @@
 
 int CmdSmartcard(const char *Cmd);
 
-int CmdSmartRaw(const char *Cmd);
-int CmdSmartUpgrade(const char *Cmd);
-int CmdSmartInfo(const char *Cmd);
-int CmdSmartReader(const char *Cmd);
-
 bool smart_select(bool silent, smart_card_atr_t *atr);
 int ExchangeAPDUSC(uint8_t *datain, int datainlen, bool activateCard, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen);
 
diff --git a/client/cmdtrace.c b/client/cmdtrace.c
index df12ac420..a84daf646 100644
--- a/client/cmdtrace.c
+++ b/client/cmdtrace.c
@@ -507,6 +507,89 @@ static int SanityOfflineCheck( bool useTraceBuffer ){
 }
 */
 
+static int CmdTraceLoad(const char *Cmd) {
+
+    FILE *f = NULL;
+    char filename[FILE_PATH_SIZE];
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) < 1 || cmdp == 'h') return usage_trace_load();
+
+    param_getstr(Cmd, 0, filename, sizeof(filename));
+
+    if ((f = fopen(filename, "rb")) == NULL) {
+        PrintAndLogEx(FAILED, "Could not open file %s", filename);
+        return 0;
+    }
+
+    // get filesize in order to malloc memory
+    fseek(f, 0, SEEK_END);
+    long fsize = ftell(f);
+    fseek(f, 0, SEEK_SET);
+
+    if (fsize < 0) {
+        PrintAndLogEx(FAILED, "error, when getting filesize");
+        fclose(f);
+        return 3;
+    }
+    if (fsize < 4) {
+        PrintAndLogEx(FAILED, "error, file is too small");
+        fclose(f);
+        return 4;
+    }
+
+    if (trace)
+        free(trace);
+
+    trace = calloc(fsize, sizeof(uint8_t));
+    if (!trace) {
+        PrintAndLogEx(FAILED, "Cannot allocate memory for trace");
+        fclose(f);
+        return 2;
+    }
+
+    size_t bytes_read = fread(trace, 1, fsize, f);
+    traceLen = bytes_read;
+    fclose(f);
+    PrintAndLogEx(SUCCESS, "Recorded Activity (TraceLen = %d bytes) loaded from file %s", traceLen, filename);
+    return 0;
+}
+
+static int CmdTraceSave(const char *Cmd) {
+
+    if (traceLen == 0) {
+        PrintAndLogEx(WARNING, "trace is empty, nothing to save");
+        return 0;
+    }
+
+    char filename[FILE_PATH_SIZE];
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) < 1 || cmdp == 'h') return usage_trace_save();
+
+    param_getstr(Cmd, 0, filename, sizeof(filename));
+    saveFile(filename, "bin", trace, traceLen);
+    return 0;
+}
+
+static command_t CommandTable[] = {
+    {"help",    CmdHelp,          1, "This help"},
+    {"list",    CmdTraceList,     1, "List protocol data in trace buffer"},
+    {"load",    CmdTraceLoad,     1, "Load trace from file"},
+    {"save",    CmdTraceSave,     1, "Save trace buffer to file"},
+    {NULL, NULL, 0, NULL}
+};
+
+static int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
+    CmdsHelp(CommandTable);
+    return 0;
+}
+
+int CmdTrace(const char *Cmd) {
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
+    return 0;
+}
+
 int CmdTraceList(const char *Cmd) {
 
     clearCommandBuffer();
@@ -644,85 +727,3 @@ int CmdTraceList(const char *Cmd) {
     return 0;
 }
 
-int CmdTraceLoad(const char *Cmd) {
-
-    FILE *f = NULL;
-    char filename[FILE_PATH_SIZE];
-    char cmdp = tolower(param_getchar(Cmd, 0));
-    if (strlen(Cmd) < 1 || cmdp == 'h') return usage_trace_load();
-
-    param_getstr(Cmd, 0, filename, sizeof(filename));
-
-    if ((f = fopen(filename, "rb")) == NULL) {
-        PrintAndLogEx(FAILED, "Could not open file %s", filename);
-        return 0;
-    }
-
-    // get filesize in order to malloc memory
-    fseek(f, 0, SEEK_END);
-    long fsize = ftell(f);
-    fseek(f, 0, SEEK_SET);
-
-    if (fsize < 0) {
-        PrintAndLogEx(FAILED, "error, when getting filesize");
-        fclose(f);
-        return 3;
-    }
-    if (fsize < 4) {
-        PrintAndLogEx(FAILED, "error, file is too small");
-        fclose(f);
-        return 4;
-    }
-
-    if (trace)
-        free(trace);
-
-    trace = calloc(fsize, sizeof(uint8_t));
-    if (!trace) {
-        PrintAndLogEx(FAILED, "Cannot allocate memory for trace");
-        fclose(f);
-        return 2;
-    }
-
-    size_t bytes_read = fread(trace, 1, fsize, f);
-    traceLen = bytes_read;
-    fclose(f);
-    PrintAndLogEx(SUCCESS, "Recorded Activity (TraceLen = %d bytes) loaded from file %s", traceLen, filename);
-    return 0;
-}
-
-int CmdTraceSave(const char *Cmd) {
-
-    if (traceLen == 0) {
-        PrintAndLogEx(WARNING, "trace is empty, nothing to save");
-        return 0;
-    }
-
-    char filename[FILE_PATH_SIZE];
-    char cmdp = tolower(param_getchar(Cmd, 0));
-    if (strlen(Cmd) < 1 || cmdp == 'h') return usage_trace_save();
-
-    param_getstr(Cmd, 0, filename, sizeof(filename));
-    saveFile(filename, "bin", trace, traceLen);
-    return 0;
-}
-
-static command_t CommandTable[] = {
-    {"help",    CmdHelp,          1, "This help"},
-    {"list",    CmdTraceList,     1, "List protocol data in trace buffer"},
-    {"load",    CmdTraceLoad,     1, "Load trace from file"},
-    {"save",    CmdTraceSave,     1, "Save trace buffer to file"},
-    {NULL, NULL, 0, NULL}
-};
-
-int CmdTrace(const char *Cmd) {
-    clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
-}
-
-int CmdHelp(const char *Cmd) {
-    (void)Cmd; // Cmd is not used so far
-    CmdsHelp(CommandTable);
-    return 0;
-}
diff --git a/client/cmdtrace.h b/client/cmdtrace.h
index 64e62cdd0..2f0125664 100644
--- a/client/cmdtrace.h
+++ b/client/cmdtrace.h
@@ -28,9 +28,6 @@
 #include "loclass/fileutils.h"  // for saveFile
 
 int CmdTrace(const char *Cmd);
-
 int CmdTraceList(const char *Cmd);
-int CmdTraceLoad(const char *Cmd);
-int CmdTraceSave(const char *Cmd);
 
 #endif

From f6a6ec844769337cdb04be65a05e8d705c0b33ae Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 12 Apr 2019 01:55:25 +0200
Subject: [PATCH 1196/1938] Rework Cmd exposed API, use more static and fix
 [-Wmissing-prototypes], ongoing...

---
 client/cmddata.c     |   7 +-
 client/cmddata.h     |   3 +-
 client/cmdlf.c       |  20 +-
 client/cmdlfawid.c   | 149 +++++++-------
 client/cmdlfawid.h   |   7 +-
 client/cmdlfcotag.c  |  20 +-
 client/cmdlfcotag.h  |   5 +-
 client/cmdlfem4x.c   |  58 +++---
 client/cmdlfem4x.h   |  16 +-
 client/cmdlffdx.c    | 154 +++++++-------
 client/cmdlffdx.h    |   7 +-
 client/cmdlfguard.c  | 463 ++++++++++++++++++++++---------------------
 client/cmdlfguard.h  |   8 +-
 client/cmdlfhid.c    |  33 +--
 client/cmdlfhid.h    |   7 +-
 client/cmdlfhitag.c  |  32 +--
 client/cmdlfhitag.h  |   9 +-
 client/cmdlfindala.c | 252 +++++++++++------------
 client/cmdlfindala.h |   8 +-
 client/cmdlfio.c     | 243 ++++++++++++-----------
 client/cmdlfio.h     |   5 +-
 21 files changed, 760 insertions(+), 746 deletions(-)

diff --git a/client/cmddata.c b/client/cmddata.c
index 795cc060d..67e711293 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -1141,7 +1141,7 @@ int PSKDemod(const char *Cmd, bool verbose) {
     return 1;
 }
 
-int CmdIdteckDemod(const char *Cmd) {
+static int CmdIdteckDemod(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
 
     if (!PSKDemod("", false)) {
@@ -1202,6 +1202,11 @@ int CmdIdteckDemod(const char *Cmd) {
     return 1;
 }
 
+int demodIdteck(void) {
+    return CmdIdteckDemod("");
+}
+
+
 // by marshmellow
 // takes 3 arguments - clock, invert, maxErr as integers
 // attempts to demodulate nrz only
diff --git a/client/cmddata.h b/client/cmddata.h
index ce1bfd16a..94b537d65 100644
--- a/client/cmddata.h
+++ b/client/cmddata.h
@@ -54,7 +54,6 @@ int CmdDetectClockRate(const char *Cmd);
 int CmdFSKrawdemod(const char *Cmd);
 int CmdPSK1rawDemod(const char *Cmd);
 int CmdPSK2rawDemod(const char *Cmd);
-int CmdIdteckDemod(const char *Cmd);
 int CmdGrid(const char *Cmd);
 int CmdGetBitStream(const char *Cmd);
 int CmdHexsamples(const char *Cmd);
@@ -88,6 +87,8 @@ int AskEdgeDetect(const int *in, int *out, int len, int threshold);
 
 int CmdDataIIR(const char *Cmd);
 
+int demodIdteck(void);
+
 #define MAX_DEMOD_BUF_LEN (1024*128)
 #define BIGBUF_SIZE 40000
 extern uint8_t DemodBuffer[MAX_DEMOD_BUF_LEN];
diff --git a/client/cmdlf.c b/client/cmdlf.c
index f00525bee..f0a75cd58 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -886,8 +886,8 @@ int CmdLFfind(const char *Cmd) {
         // The improved noise detection will find Cotag.
         if (getSignalProperties()->isnoise) {
 
-            if (CmdLFHitagReader("26") == 0) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Hitag") " found!"); return 1;}
-            if (CmdCOTAGRead("") > 0) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("COTAG ID") " found!"); return 1;}
+            if (readHitagUid()) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Hitag") " found!"); return 1;}
+            if (readCOTAGUid()) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("COTAG ID") " found!"); return 1;}
 
             PrintAndLogEx(FAILED, "\n" _YELLOW_("No data found!") " - Signal looks like noise. Maybe not an LF tag?");
             return 0;
@@ -896,16 +896,16 @@ int CmdLFfind(const char *Cmd) {
 
     if (EM4x50Read("", false))  { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("EM4x50 ID") " found!"); return 1;}
 
-    if (CmdHIDDemod(""))        { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("HID Prox ID") " found!"); goto out;}
-    if (CmdAWIDDemod(""))       { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("AWID ID") " found!"); goto out;}
+    if (demodHID())             { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("HID Prox ID") " found!"); goto out;}
+    if (demodAWID())            { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("AWID ID") " found!"); goto out;}
     if (demodParadox())         { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Paradox ID") " found!"); goto out;}
 
-    if (CmdEM410xDemod(""))     { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("EM410x ID") " found!"); goto out;}
-    if (CmdFdxDemod(""))        { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("FDX-B ID") " found!"); goto out;}
-    if (CmdGuardDemod(""))      { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Guardall G-Prox II ID") " found!"); goto out; }
-    if (CmdIdteckDemod(""))     { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Idteck ID") " found!"); goto out;}
-    if (CmdIndalaDemod(""))     { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Indala ID") " found!");  goto out;}
-    if (CmdIOProxDemod(""))     { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("IO Prox ID") " found!"); goto out;}
+    if (demodEM410x())          { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("EM410x ID") " found!"); goto out;}
+    if (demodFDX())             { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("FDX-B ID") " found!"); goto out;}
+    if (demodGuard())           { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Guardall G-Prox II ID") " found!"); goto out; }
+    if (demodIdteck())          { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Idteck ID") " found!"); goto out;}
+    if (demodIndala())          { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Indala ID") " found!");  goto out;}
+    if (demodIOProx())          { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("IO Prox ID") " found!"); goto out;}
     if (demodJablotron())       { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Jablotron ID") " found!"); goto out;}
     if (demodNedap())           { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("NEDAP ID") " found!"); goto out;}
     if (demodNexWatch())        { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("NexWatch ID") " found!"); goto out;}
diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c
index 74dc2e302..b8f42448b 100644
--- a/client/cmdlfawid.c
+++ b/client/cmdlfawid.c
@@ -13,7 +13,7 @@
 #include "cmdlfawid.h"  // AWID function declarations
 
 static int CmdHelp(const char *Cmd);
-
+/*
 static int usage_lf_awid_read(void) {
     PrintAndLogEx(NORMAL, "Enables AWID compatible reader mode printing details of scanned AWID26 or AWID50 tags.");
     PrintAndLogEx(NORMAL, "By default, values are printed and logged until the button is pressed or another USB command is issued.");
@@ -29,7 +29,7 @@ static int usage_lf_awid_read(void) {
     PrintAndLogEx(NORMAL, "       lf awid read 1");
     return 0;
 }
-
+*/
 static int usage_lf_awid_sim(void) {
     PrintAndLogEx(NORMAL, "Enables simulation of AWID card with specified facility-code and card number.");
     PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
@@ -122,60 +122,6 @@ static bool sendTry(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint32_t delay, ui
     return true;
 }
 
-//refactored by marshmellow
-int getAWIDBits(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint8_t *bits) {
-
-    // the return bits, preamble 0000 0001
-    bits[7] = 1;
-
-    uint8_t pre[66];
-    memset(pre, 0, sizeof(pre));
-
-    // add formatlength
-    num_to_bytebits(fmtlen, 8, pre);
-
-    // add facilitycode, cardnumber and wiegand parity bits
-    switch (fmtlen) {
-        case 26: {
-            uint8_t wiegand[24];
-            num_to_bytebits(fc, 8, wiegand);
-            num_to_bytebits(cn, 16, wiegand + 8);
-            wiegand_add_parity(pre + 8, wiegand,  sizeof(wiegand));
-            break;
-        }
-        case 34: {
-            uint8_t wiegand[32];
-            num_to_bytebits(fc, 8, wiegand);
-            num_to_bytebits(cn, 24, wiegand + 8);
-            wiegand_add_parity(pre + 8, wiegand,  sizeof(wiegand));
-            break;
-        }
-        case 37: {
-            uint8_t wiegand[31];
-            num_to_bytebits(fc, 13, wiegand);
-            num_to_bytebits(cn, 18, wiegand + 13);
-            wiegand_add_parity(pre + 8, wiegand,  sizeof(wiegand));
-            break;
-        }
-        case 50: {
-            uint8_t wiegand[48];
-            num_to_bytebits(fc, 16, wiegand);
-            num_to_bytebits(cn, 32, wiegand + 16);
-            wiegand_add_parity(pre + 8, wiegand, sizeof(wiegand));
-            break;
-        }
-    }
-
-    // add AWID 4bit parity
-    size_t bitLen = addParity(pre, bits + 8, 66, 4, 1);
-
-    if (bitLen != 88) return 0;
-
-    PrintAndLogEx(SUCCESS, "awid raw bits:\n %s \n", sprint_bin(bits, bitLen));
-
-    return 1;
-}
-
 static void verify_values(uint8_t *fmtlen, uint32_t *fc, uint32_t *cn) {
     switch (*fmtlen) {
         case 50:
@@ -218,15 +164,10 @@ static void verify_values(uint8_t *fmtlen, uint32_t *fc, uint32_t *cn) {
             break;
     }
 }
-
-// this read is the "normal" read,  which download lf signal and tries to demod here.
-int CmdAWIDRead(const char *Cmd) {
-    lf_read(true, 12000);
-    return CmdAWIDDemod(Cmd);
-}
+/*
 // this read loops on device side.
 // uses the demod in lfops.c
-int CmdAWIDRead_device(const char *Cmd) {
+static int CmdAWIDRead_device(const char *Cmd) {
 
     if (Cmd[0] == 'h' || Cmd[0] == 'H') return usage_lf_awid_read();
     uint8_t findone = (Cmd[0] == '1') ? 1 : 0;
@@ -235,11 +176,11 @@ int CmdAWIDRead_device(const char *Cmd) {
     SendCommand(&c);
     return 0;
 }
-
+*/
 //by marshmellow
 //AWID Prox demod - FSK2a RF/50 with preamble of 00000001  (always a 96 bit data stream)
 //print full AWID Prox ID and some bit format details if found
-int CmdAWIDDemod(const char *Cmd) {
+static int CmdAWIDDemod(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
     size_t size = getFromGraphBuf(bits);
@@ -370,7 +311,13 @@ int CmdAWIDDemod(const char *Cmd) {
     return 1;
 }
 
-int CmdAWIDSim(const char *Cmd) {
+// this read is the "normal" read,  which download lf signal and tries to demod here.
+static int CmdAWIDRead(const char *Cmd) {
+    lf_read(true, 12000);
+    return CmdAWIDDemod(Cmd);
+}
+
+static int CmdAWIDSim(const char *Cmd) {
     uint32_t fc = 0, cn = 0;
     uint8_t fmtlen = 0;
     uint8_t bits[96];
@@ -410,7 +357,7 @@ int CmdAWIDSim(const char *Cmd) {
     return 0;
 }
 
-int CmdAWIDClone(const char *Cmd) {
+static int CmdAWIDClone(const char *Cmd) {
     uint32_t blocks[4] = {T55x7_MODULATION_FSK2a | T55x7_BITRATE_RF_50 | 3 << T55x7_MAXBLOCK_SHIFT, 0, 0, 0};
     uint32_t fc = 0, cn = 0;
     uint8_t fmtlen = 0;
@@ -461,7 +408,7 @@ int CmdAWIDClone(const char *Cmd) {
     return 0;
 }
 
-int CmdAWIDBrute(const char *Cmd) {
+static int CmdAWIDBrute(const char *Cmd) {
 
     bool errors = false, verbose = false;
     uint32_t fc = 0, cn = 0, delay = 1000;
@@ -567,14 +514,72 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
+static int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
+    CmdsHelp(CommandTable);
+    return 0;
+}
+
 int CmdLFAWID(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
-    (void)Cmd; // Cmd is not used so far
-    CmdsHelp(CommandTable);
-    return 0;
+//refactored by marshmellow
+int getAWIDBits(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint8_t *bits) {
+
+    // the return bits, preamble 0000 0001
+    bits[7] = 1;
+
+    uint8_t pre[66];
+    memset(pre, 0, sizeof(pre));
+
+    // add formatlength
+    num_to_bytebits(fmtlen, 8, pre);
+
+    // add facilitycode, cardnumber and wiegand parity bits
+    switch (fmtlen) {
+        case 26: {
+            uint8_t wiegand[24];
+            num_to_bytebits(fc, 8, wiegand);
+            num_to_bytebits(cn, 16, wiegand + 8);
+            wiegand_add_parity(pre + 8, wiegand,  sizeof(wiegand));
+            break;
+        }
+        case 34: {
+            uint8_t wiegand[32];
+            num_to_bytebits(fc, 8, wiegand);
+            num_to_bytebits(cn, 24, wiegand + 8);
+            wiegand_add_parity(pre + 8, wiegand,  sizeof(wiegand));
+            break;
+        }
+        case 37: {
+            uint8_t wiegand[31];
+            num_to_bytebits(fc, 13, wiegand);
+            num_to_bytebits(cn, 18, wiegand + 13);
+            wiegand_add_parity(pre + 8, wiegand,  sizeof(wiegand));
+            break;
+        }
+        case 50: {
+            uint8_t wiegand[48];
+            num_to_bytebits(fc, 16, wiegand);
+            num_to_bytebits(cn, 32, wiegand + 16);
+            wiegand_add_parity(pre + 8, wiegand, sizeof(wiegand));
+            break;
+        }
+    }
+
+    // add AWID 4bit parity
+    size_t bitLen = addParity(pre, bits + 8, 66, 4, 1);
+
+    if (bitLen != 88) return 0;
+
+    PrintAndLogEx(SUCCESS, "awid raw bits:\n %s \n", sprint_bin(bits, bitLen));
+
+    return 1;
+}
+
+int demodAWID(void) {
+    return CmdAWIDDemod("");
 }
diff --git a/client/cmdlfawid.h b/client/cmdlfawid.h
index 85d23ec3b..e51e986a6 100644
--- a/client/cmdlfawid.h
+++ b/client/cmdlfawid.h
@@ -25,11 +25,8 @@
 
 
 int CmdLFAWID(const char *Cmd);
-int CmdAWIDDemod(const char *Cmd);
-int CmdAWIDRead(const char *Cmd);
-int CmdAWIDSim(const char *Cmd);
-int CmdAWIDClone(const char *Cmd);
-int CmdAWIDBrute(const char *Cmd);
+
+int demodAWID(void);
 int getAWIDBits(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint8_t *bits);
 
 #endif
diff --git a/client/cmdlfcotag.c b/client/cmdlfcotag.c
index 838384e73..5ccdbfb68 100644
--- a/client/cmdlfcotag.c
+++ b/client/cmdlfcotag.c
@@ -27,7 +27,7 @@ static int usage_lf_cotag_read(void) {
 
 // COTAG demod should be able to use GraphBuffer,
 // when data load samples
-int CmdCOTAGDemod(const char *Cmd) {
+static int CmdCOTAGDemod(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
 
     uint8_t bits[COTAG_BITS] = {0};
@@ -67,7 +67,7 @@ int CmdCOTAGDemod(const char *Cmd) {
 // 0 = HIGH/LOW signal - maxlength bigbuff
 // 1 = translation for HI/LO into bytes with manchester 0,1 - length 300
 // 2 = raw signal -  maxlength bigbuff
-int CmdCOTAGRead(const char *Cmd) {
+static int CmdCOTAGRead(const char *Cmd) {
 
     if (Cmd[0] == 'h' || Cmd[0] == 'H') return usage_lf_cotag_read();
 
@@ -110,14 +110,22 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
+static int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
+    CmdsHelp(CommandTable);
+    return 0;
+}
+
 int CmdLFCOTAG(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
-    (void)Cmd; // Cmd is not used so far
-    CmdsHelp(CommandTable);
-    return 0;
+int demodCOTAG(void) {
+    return CmdCOTAGDemod("");
+}
+
+int readCOTAGUid(void) {
+    return CmdCOTAGRead > 0;
 }
diff --git a/client/cmdlfcotag.h b/client/cmdlfcotag.h
index 179048c68..e4b12235d 100644
--- a/client/cmdlfcotag.h
+++ b/client/cmdlfcotag.h
@@ -24,7 +24,6 @@
 #endif
 
 int CmdLFCOTAG(const char *Cmd);
-int CmdCOTAGRead(const char *Cmd);
-int CmdCOTAGDemod(const char *Cmd);
-
+int demodCOTAG(void);
+int readCOTAGUid(void);
 #endif
diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 55993e211..773fff29a 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -188,7 +188,7 @@ static int usage_lf_em4x05_info(void) {
  */
 
 // Construct the graph for emulating an EM410X tag
-void ConstructEM410xEmulGraph(const char *uid, const  uint8_t clock) {
+static void ConstructEM410xEmulGraph(const char *uid, const  uint8_t clock) {
 
     int i, j, binary[4], parity[4];
     uint32_t n;
@@ -383,28 +383,22 @@ int AskEm410xDemod(const char *Cmd, uint32_t *hi, uint64_t *lo, bool verbose) {
     if (!ASKDemod_ext(Cmd, false, false, 1, &st)) return 0;
     return AskEm410xDecode(verbose, hi, lo);
 }
-
-// this read is the "normal" read,  which download lf signal and tries to demod here.
-int CmdEM410xRead(const char *Cmd) {
-    lf_read(true, 8192);
-    return CmdEM410xDemod(Cmd);
-}
-
+/*
 // this read loops on device side.
 // uses the demod in lfops.c
-int CmdEM410xRead_device(const char *Cmd) {
+static int CmdEM410xRead_device(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     uint8_t findone = (cmdp == '1') ? 1 : 0;
     UsbCommand c = {CMD_EM410X_DEMOD, {findone, 0, 0}, {{0}}};
     SendCommand(&c);
     return 0;
 }
-
+*/
 //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 CmdEM410xDemod(const char *Cmd) {
+static int CmdEM410xDemod(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) > 10 || cmdp == 'h') return usage_lf_em410x_demod();
 
@@ -417,8 +411,14 @@ int CmdEM410xDemod(const char *Cmd) {
     return 1;
 }
 
+// this read is the "normal" read,  which download lf signal and tries to demod here.
+static int CmdEM410xRead(const char *Cmd) {
+    lf_read(true, 8192);
+    return CmdEM410xDemod(Cmd);
+}
+
 // emulate an EM410X tag
-int CmdEM410xSim(const char *Cmd) {
+static int CmdEM410xSim(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_lf_em410x_sim();
 
@@ -443,7 +443,7 @@ int CmdEM410xSim(const char *Cmd) {
     return 0;
 }
 
-int CmdEM410xBrute(const char *Cmd) {
+static int CmdEM410xBrute(const char *Cmd) {
     char filename[FILE_PATH_SIZE] = {0};
     FILE *f = NULL;
     char buf[11];
@@ -565,7 +565,7 @@ int CmdEM410xBrute(const char *Cmd) {
  *
  *  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) {
+static int CmdEM410xWatch(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     do {
         if (ukbhit()) {
@@ -581,7 +581,7 @@ int CmdEM410xWatch(const char *Cmd) {
 }
 
 //currently only supports manchester modulations
-int CmdEM410xWatchnSpoof(const char *Cmd) {
+static int CmdEM410xWatchnSpoof(const char *Cmd) {
 
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_lf_em410x_ws();
@@ -593,7 +593,7 @@ int CmdEM410xWatchnSpoof(const char *Cmd) {
     return 0;
 }
 
-int CmdEM410xWrite(const char *Cmd) {
+static int CmdEM410xWrite(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 0x00 || cmdp == 'h') return usage_lf_em410x_write();
 
@@ -956,18 +956,18 @@ int EM4x50Read(const char *Cmd, bool verbose) {
     return (int)AllPTest;
 }
 
-int CmdEM4x50Read(const char *Cmd) {
+static int CmdEM4x50Read(const char *Cmd) {
     uint8_t ctmp = tolower(param_getchar(Cmd, 0));
     if (ctmp == 'h') return usage_lf_em4x50_read();
     return EM4x50Read(Cmd, true);
 }
-int CmdEM4x50Write(const char *Cmd) {
+static int CmdEM4x50Write(const char *Cmd) {
     uint8_t ctmp = tolower(param_getchar(Cmd, 0));
     if (ctmp == 'h') return usage_lf_em4x50_write();
     PrintAndLogEx(NORMAL, "no implemented yet");
     return 0;
 }
-int CmdEM4x50Dump(const char *Cmd) {
+static int CmdEM4x50Dump(const char *Cmd) {
     uint8_t ctmp = tolower(param_getchar(Cmd, 0));
     if (ctmp == 'h') return usage_lf_em4x50_dump();
     PrintAndLogEx(NORMAL, "no implemented yet");
@@ -1143,7 +1143,7 @@ int EM4x05ReadWord_ext(uint8_t addr, uint32_t pwd, bool usePwd, uint32_t *word)
     return demodEM4x05resp(word);
 }
 
-int CmdEM4x05Dump(const char *Cmd) {
+static int CmdEM4x05Dump(const char *Cmd) {
     uint8_t addr = 0;
     uint32_t pwd = 0;
     bool usePwd = false;
@@ -1176,7 +1176,7 @@ int CmdEM4x05Dump(const char *Cmd) {
     return success;
 }
 
-int CmdEM4x05Read(const char *Cmd) {
+static int CmdEM4x05Read(const char *Cmd) {
     uint8_t addr;
     uint32_t pwd;
     bool usePwd = false;
@@ -1206,7 +1206,7 @@ int CmdEM4x05Read(const char *Cmd) {
     return isOk;
 }
 
-int CmdEM4x05Write(const char *Cmd) {
+static int CmdEM4x05Write(const char *Cmd) {
     uint8_t ctmp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) == 0 || ctmp == 'h') return usage_lf_em4x05_write();
 
@@ -1419,7 +1419,7 @@ bool EM4x05IsBlock0(uint32_t *word) {
     return (res > 0) ? true : false;
 }
 
-int CmdEM4x05Info(const char *Cmd) {
+static int CmdEM4x05Info(const char *Cmd) {
 #define EM_SERIAL_BLOCK 1
 #define EM_CONFIG_BLOCK 4
 #define EM_PROT1_BLOCK 14
@@ -1488,14 +1488,18 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
+static int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
+    CmdsHelp(CommandTable);
+    return 0;
+}
+
 int CmdLFEM4X(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
-    (void)Cmd; // Cmd is not used so far
-    CmdsHelp(CommandTable);
-    return 0;
+int demodEM410x(void) {
+    return CmdEM410xDemod("");
 }
diff --git a/client/cmdlfem4x.h b/client/cmdlfem4x.h
index b4182f4ab..12f27c2c7 100644
--- a/client/cmdlfem4x.h
+++ b/client/cmdlfem4x.h
@@ -27,21 +27,7 @@
 
 int CmdLFEM4X(const char *Cmd);
 
-int CmdEM410xDemod(const char *Cmd);
-int CmdEM410xRead(const char *Cmd);
-int CmdEM410xSim(const char *Cmd);
-int CmdEM410xBrute(const char *Cmd);
-int CmdEM410xWatch(const char *Cmd);
-int CmdEM410xWatchnSpoof(const char *Cmd);
-int CmdEM410xWrite(const char *Cmd);
-int CmdEM4x05Dump(const char *Cmd);
-int CmdEM4x05Info(const char *Cmd);
-int CmdEM4x05Read(const char *Cmd);
-int CmdEM4x05Write(const char *Cmd);
-int CmdEM4x50Read(const char *Cmd);
-int CmdEM4x50Write(const char *Cmd);
-int CmdEM4x50Dump(const char *Cmd);
-
+int demodEM410x(void);
 int EM4x50Read(const char *Cmd, bool verbose);
 bool EM4x05IsBlock0(uint32_t *word);
 
diff --git a/client/cmdlffdx.c b/client/cmdlffdx.c
index 024b79f1e..510c38e4a 100644
--- a/client/cmdlffdx.c
+++ b/client/cmdlffdx.c
@@ -64,20 +64,6 @@ static int usage_lf_fdx_sim(void) {
     return 0;
 }
 
-// Ask/Biphase Demod then try to locate an ISO 11784/85 ID
-// BitStream must contain previously askrawdemod and biphasedemoded data
-int detectFDXB(uint8_t *dest, size_t *size) {
-    //make sure buffer has enough data
-    if (*size < 128 * 2) return -1;
-    size_t startIdx = 0;
-    uint8_t preamble[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1};
-    if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
-        return -2; //preamble not found
-    if (*size != 128) return -3; //wrong demoded size
-    //return start position
-    return (int)startIdx;
-}
-
 // clearing the topbit needed for the preambl detection.
 static void verify_values(uint32_t countryid, uint64_t animalid) {
     if ((animalid & 0x3FFFFFFFFF) != animalid) {
@@ -90,56 +76,6 @@ static void verify_values(uint32_t countryid, uint64_t animalid) {
     }
 }
 
-int getFDXBits(uint64_t national_id, uint16_t country, uint8_t isanimal, uint8_t isextended, uint32_t extended, uint8_t *bits) {
-
-    // add preamble ten 0x00 and one 0x01
-    memset(bits, 0x00, 10);
-    bits[10] = 1;
-
-    // 128bits
-    // every 9th bit is 0x01, but we can just fill the rest with 0x01 and overwrite
-    memset(bits, 0x01, 128);
-
-    // add preamble ten 0x00 and one 0x01
-    memset(bits, 0x00, 10);
-
-    // add reserved
-    num_to_bytebitsLSBF(0x00, 7, bits + 66);
-    num_to_bytebitsLSBF(0x00 >> 7, 7, bits + 74);
-
-    // add animal flag - OK
-    bits[65] = isanimal;
-
-    // add extended flag - OK
-    bits[81] = isextended;
-
-    // add national code 40bits - OK
-    num_to_bytebitsLSBF(national_id >> 0, 8, bits + 11);
-    num_to_bytebitsLSBF(national_id >> 8, 8, bits + 20);
-    num_to_bytebitsLSBF(national_id >> 16, 8, bits + 29);
-    num_to_bytebitsLSBF(national_id >> 24, 8, bits + 38);
-    num_to_bytebitsLSBF(national_id >> 32, 6, bits + 47);
-
-    // add country code - OK
-    num_to_bytebitsLSBF(country >> 0, 2, bits + 53);
-    num_to_bytebitsLSBF(country >> 2, 8, bits + 56);
-
-    // add crc-16 - OK
-    uint8_t raw[8];
-    for (uint8_t i = 0; i < 8; ++i)
-        raw[i] = bytebits_to_byte(bits + 11 + i * 9, 8);
-
-    uint16_t crc = crc16_kermit(raw, 8);
-    num_to_bytebitsLSBF(crc >> 0, 8, bits + 83);
-    num_to_bytebitsLSBF(crc >> 8, 8, bits + 92);
-
-    // extended data - OK
-    num_to_bytebitsLSBF(extended >> 0, 8, bits + 101);
-    num_to_bytebitsLSBF(extended >> 8, 8, bits + 110);
-    num_to_bytebitsLSBF(extended >> 16, 8, bits + 119);
-    return 1;
-}
-
 // FDX-B ISO11784/85 demod  (aka animal tag)  BIPHASE, inverted, rf/32,  with preamble of 00000000001 (128bits)
 // 8 databits + 1 parity (1)
 // CIITT 16 chksum
@@ -157,7 +93,8 @@ int getFDXBits(uint64_t national_id, uint16_t country, uint8_t isanimal, uint8_t
 
 -- sample: 985121004515220  [ 37FF65B88EF94 ]
 */
-int CmdFDXBdemodBI(const char *Cmd) {
+/*
+static int CmdFDXBdemodBI(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
 
     int clk = 32;
@@ -229,11 +166,11 @@ int CmdFDXBdemodBI(const char *Cmd) {
     }
     return 1;
 }
-
+*/
 
 //see ASKDemod for what args are accepted
 //almost the same demod as cmddata.c/CmdFDXBdemodBI
-int CmdFdxDemod(const char *Cmd) {
+static int CmdFdxDemod(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
 
     //Differential Biphase / di-phase (inverted biphase)
@@ -303,12 +240,12 @@ int CmdFdxDemod(const char *Cmd) {
     return 1;
 }
 
-int CmdFdxRead(const char *Cmd) {
+static int CmdFdxRead(const char *Cmd) {
     lf_read(true, 10000);
     return CmdFdxDemod(Cmd);
 }
 
-int CmdFdxClone(const char *Cmd) {
+static int CmdFdxClone(const char *Cmd) {
 
     uint32_t countryid = 0;
     uint64_t animalid = 0;
@@ -360,7 +297,7 @@ int CmdFdxClone(const char *Cmd) {
     return 0;
 }
 
-int CmdFdxSim(const char *Cmd) {
+static int CmdFdxSim(const char *Cmd) {
     uint32_t countryid = 0;
     uint64_t animalid = 0;
 
@@ -399,14 +336,83 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
+static int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
+    CmdsHelp(CommandTable);
+    return 0;
+}
+
 int CmdLFFdx(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
-    (void)Cmd; // Cmd is not used so far
-    CmdsHelp(CommandTable);
-    return 0;
+// Ask/Biphase Demod then try to locate an ISO 11784/85 ID
+// BitStream must contain previously askrawdemod and biphasedemoded data
+int detectFDXB(uint8_t *dest, size_t *size) {
+    //make sure buffer has enough data
+    if (*size < 128 * 2) return -1;
+    size_t startIdx = 0;
+    uint8_t preamble[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1};
+    if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
+        return -2; //preamble not found
+    if (*size != 128) return -3; //wrong demoded size
+    //return start position
+    return (int)startIdx;
 }
+
+int demodFDX(void) {
+    return CmdFdxDemod("");
+}
+
+int getFDXBits(uint64_t national_id, uint16_t country, uint8_t isanimal, uint8_t isextended, uint32_t extended, uint8_t *bits) {
+
+    // add preamble ten 0x00 and one 0x01
+    memset(bits, 0x00, 10);
+    bits[10] = 1;
+
+    // 128bits
+    // every 9th bit is 0x01, but we can just fill the rest with 0x01 and overwrite
+    memset(bits, 0x01, 128);
+
+    // add preamble ten 0x00 and one 0x01
+    memset(bits, 0x00, 10);
+
+    // add reserved
+    num_to_bytebitsLSBF(0x00, 7, bits + 66);
+    num_to_bytebitsLSBF(0x00 >> 7, 7, bits + 74);
+
+    // add animal flag - OK
+    bits[65] = isanimal;
+
+    // add extended flag - OK
+    bits[81] = isextended;
+
+    // add national code 40bits - OK
+    num_to_bytebitsLSBF(national_id >> 0, 8, bits + 11);
+    num_to_bytebitsLSBF(national_id >> 8, 8, bits + 20);
+    num_to_bytebitsLSBF(national_id >> 16, 8, bits + 29);
+    num_to_bytebitsLSBF(national_id >> 24, 8, bits + 38);
+    num_to_bytebitsLSBF(national_id >> 32, 6, bits + 47);
+
+    // add country code - OK
+    num_to_bytebitsLSBF(country >> 0, 2, bits + 53);
+    num_to_bytebitsLSBF(country >> 2, 8, bits + 56);
+
+    // add crc-16 - OK
+    uint8_t raw[8];
+    for (uint8_t i = 0; i < 8; ++i)
+        raw[i] = bytebits_to_byte(bits + 11 + i * 9, 8);
+
+    uint16_t crc = crc16_kermit(raw, 8);
+    num_to_bytebitsLSBF(crc >> 0, 8, bits + 83);
+    num_to_bytebitsLSBF(crc >> 8, 8, bits + 92);
+
+    // extended data - OK
+    num_to_bytebitsLSBF(extended >> 0, 8, bits + 101);
+    num_to_bytebitsLSBF(extended >> 8, 8, bits + 110);
+    num_to_bytebitsLSBF(extended >> 16, 8, bits + 119);
+    return 1;
+}
+
diff --git a/client/cmdlffdx.h b/client/cmdlffdx.h
index 85787f3a8..5e6c5ab48 100644
--- a/client/cmdlffdx.h
+++ b/client/cmdlffdx.h
@@ -20,11 +20,8 @@
 #include "lfdemod.h"    // parityTest
 
 int CmdLFFdx(const char *Cmd);
-int CmdFdxClone(const char *Cmd);
-int CmdFdxSim(const char *Cmd);
-int CmdFdxRead(const char *Cmd);
-int CmdFdxDemod(const char *Cmd);
-
+int detectFDXB(uint8_t *dest, size_t *size);
+int demodFDX(void);
 int getFDXBits(uint64_t national_id, uint16_t country, uint8_t isanimal, uint8_t isextended, uint32_t extended, uint8_t *bits);
 
 #endif
diff --git a/client/cmdlfguard.c b/client/cmdlfguard.c
index 33bcef7f4..3fb84a639 100644
--- a/client/cmdlfguard.c
+++ b/client/cmdlfguard.c
@@ -44,8 +44,241 @@ static int usage_lf_guard_sim(void) {
     return 0;
 }
 
+//by marshmellow
+//attempts to demodulate and identify a G_Prox_II verex/chubb card
+//WARNING: if it fails during some points it will destroy the DemodBuffer data
+// but will leave the GraphBuffer intact.
+//if successful it will push askraw data back to demod buffer ready for emulation
+static int CmdGuardDemod(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
+
+    //Differential Biphase
+    //get binary from ask wave
+    if (!ASKbiphaseDemod("0 64 0 0", false)) {
+        PrintAndLogEx(DEBUG, "DEBUG: Error - gProxII ASKbiphaseDemod failed");
+        return 0;
+    }
+
+    size_t size = DemodBufferLen;
+
+    int preambleIndex = detectGProxII(DemodBuffer, &size);
+    if (preambleIndex < 0) {
+
+        if (preambleIndex == -1)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - gProxII too few bits found");
+        else if (preambleIndex == -2)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - gProxII preamble not found");
+        else if (preambleIndex == -3)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - gProxII size not correct: %d", size);
+        else if (preambleIndex == -5)
+            PrintAndLogEx(DEBUG, "DEBUG: Error - gProxII wrong spacerbits");
+        else
+            PrintAndLogEx(DEBUG, "DEBUG: Error - gProxII ans: %d", preambleIndex);
+        return 0;
+    }
+
+    //got a good demod of 96 bits
+    uint8_t ByteStream[8] = {0x00};
+    uint8_t xorKey = 0;
+    size_t startIdx = preambleIndex + 6; //start after 6 bit preamble
+
+    uint8_t bits_no_spacer[90];
+    //so as to not mess with raw DemodBuffer copy to a new sample array
+    memcpy(bits_no_spacer, DemodBuffer + startIdx, 90);
+    // remove the 18 (90/5=18) parity bits (down to 72 bits (96-6-18=72))
+    size_t len = removeParity(bits_no_spacer, 0, 5, 3, 90); //source, startloc, paritylen, ptype, length_to_run
+    if (len != 72) {
+        PrintAndLogEx(DEBUG, "DEBUG: Error - gProxII spacer removal did not produce 72 bits: %u, start: %u", len, startIdx);
+        return 0;
+    }
+    // get key and then get all 8 bytes of payload decoded
+    xorKey = (uint8_t)bytebits_to_byteLSBF(bits_no_spacer, 8);
+    for (size_t idx = 0; idx < 8; idx++) {
+        ByteStream[idx] = ((uint8_t)bytebits_to_byteLSBF(bits_no_spacer + 8 + (idx * 8), 8)) ^ xorKey;
+        PrintAndLogEx(DEBUG, "DEBUG: gProxII byte %u after xor: %02x", (unsigned int)idx, ByteStream[idx]);
+    }
+
+    setDemodBuff(DemodBuffer, 96, preambleIndex);
+    setClockGrid(g_DemodClock, g_DemodStartIdx + (preambleIndex * g_DemodClock));
+
+    //ByteStream contains 8 Bytes (64 bits) of decrypted raw tag data
+    uint8_t fmtLen = ByteStream[0] >> 2;
+    uint32_t FC = 0;
+    uint32_t Card = 0;
+    //get raw 96 bits to print
+    uint32_t raw1 = bytebits_to_byte(DemodBuffer, 32);
+    uint32_t raw2 = bytebits_to_byte(DemodBuffer + 32, 32);
+    uint32_t raw3 = bytebits_to_byte(DemodBuffer + 64, 32);
+    bool unknown = false;
+    switch (fmtLen) {
+        case 36:
+            FC = ((ByteStream[3] & 0x7F) << 7) | (ByteStream[4] >> 1);
+            Card = ((ByteStream[4] & 1) << 19) | (ByteStream[5] << 11) | (ByteStream[6] << 3) | (ByteStream[7] >> 5);
+            break;
+        case 26:
+            FC = ((ByteStream[3] & 0x7F) << 1) | (ByteStream[4] >> 7);
+            Card = ((ByteStream[4] & 0x7F) << 9) | (ByteStream[5] << 1) | (ByteStream[6] >> 7);
+            break;
+        default :
+            unknown = true;
+            break;
+    }
+    if (!unknown)
+        PrintAndLogEx(SUCCESS, "G-Prox-II Found: Format Len: %ubit - FC: %u - Card: %u, Raw: %08x%08x%08x", fmtLen, FC, Card, raw1, raw2, raw3);
+    else
+        PrintAndLogEx(SUCCESS, "Unknown G-Prox-II Fmt Found: Format Len: %u, Raw: %08x%08x%08x", fmtLen, raw1, raw2, raw3);
+
+    return 1;
+}
+
+static int CmdGuardRead(const char *Cmd) {
+    lf_read(true, 10000);
+    return CmdGuardDemod(Cmd);
+}
+
+static int CmdGuardClone(const char *Cmd) {
+
+    char cmdp = param_getchar(Cmd, 0);
+    if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_guard_clone();
+
+    uint32_t facilitycode = 0, cardnumber = 0, fc = 0, cn = 0, fmtlen = 0;
+    uint8_t i;
+    uint8_t bs[96];
+    memset(bs, 0x00, sizeof(bs));
+
+    //GuardProxII - compat mode, ASK/Biphase,  data rate 64, 3 data blocks
+    uint32_t blocks[4] = {T55x7_MODULATION_BIPHASE | T55x7_BITRATE_RF_64 | 3 << T55x7_MAXBLOCK_SHIFT, 0, 0, 0};
+
+    if (sscanf(Cmd, "%u %u %u", &fmtlen, &fc, &cn) != 3) return usage_lf_guard_clone();
+
+    fmtlen &= 0x7f;
+    facilitycode = (fc & 0x000000FF);
+    cardnumber = (cn & 0x0000FFFF);
+
+    if (!getGuardBits(fmtlen, facilitycode, cardnumber, bs)) {
+        PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
+        return 1;
+    }
+
+    // Q5
+    if (param_getchar(Cmd, 3) == 'Q' || param_getchar(Cmd, 3) == 'q')
+        blocks[0] = T5555_MODULATION_FSK2 | T5555_SET_BITRATE(50) | 3 << T5555_MAXBLOCK_SHIFT;
+
+    blocks[1] = bytebits_to_byte(bs, 32);
+    blocks[2] = bytebits_to_byte(bs + 32, 32);
+    blocks[3] = bytebits_to_byte(bs + 64, 32);
+
+    PrintAndLogEx(INFO, "Preparing to clone Guardall to T55x7 with Facility Code: %u, Card Number: %u", facilitycode, cardnumber);
+    print_blocks(blocks, 4);
+
+    UsbCommand resp;
+    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
+
+    for (i = 0; i < 4; ++i) {
+        c.arg[0] = blocks[i];
+        c.arg[1] = i;
+        clearCommandBuffer();
+        SendCommand(&c);
+        if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
+            PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
+            return -1;
+        }
+    }
+    return 0;
+}
+
+static int CmdGuardSim(const char *Cmd) {
+
+    // Guard uses:  clk: 64, invert: 0, encoding: 2 (ASK Biphase)
+    uint8_t clock1 = 64, encoding = 2, separator = 0, invert = 0;
+    uint32_t facilitycode = 0, cardnumber = 0, fc = 0, cn = 0, fmtlen = 0;
+
+    char cmdp = param_getchar(Cmd, 0);
+    if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_guard_sim();
+
+    if (sscanf(Cmd, "%u %u %u", &fmtlen, &fc, &cn) != 3) return usage_lf_guard_sim();
+
+    uint8_t bs[96];
+    size_t size = sizeof(bs);
+    memset(bs, 0x00, size);
+
+    fmtlen &= 0x7F;
+    facilitycode = (fc & 0x000000FF);
+    cardnumber = (cn & 0x0000FFFF);
+
+    if (!getGuardBits(fmtlen, facilitycode, cardnumber, bs)) {
+        PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
+        return 1;
+    }
+
+    PrintAndLogEx(SUCCESS, "Simulating Guardall - Facility Code: %u, CardNumber: %u", facilitycode, cardnumber);
+
+    uint64_t arg1, arg2;
+    arg1 = (clock1 << 8) | encoding;
+    arg2 = (invert << 8) | separator;
+
+    UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
+    memcpy(c.d.asBytes, bs, size);
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
+}
+
+static command_t CommandTable[] = {
+    {"help",    CmdHelp,        1, "this help"},
+    {"demod",   CmdGuardDemod,  1, "demodulate a G Prox II tag from the GraphBuffer"},
+    {"read",    CmdGuardRead,   0, "attempt to read and extract tag data from the antenna"},
+    {"clone",   CmdGuardClone,  0, "clone Guardall tag"},
+    {"sim",     CmdGuardSim,    0, "simulate Guardall tag"},
+    {NULL, NULL, 0, NULL}
+};
+
+static int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
+    CmdsHelp(CommandTable);
+    return 0;
+}
+
+int CmdLFGuard(const char *Cmd) {
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
+    return 0;
+}
+
+// by marshmellow
+// demod gProxIIDemod
+// error returns as -x
+// success returns start position in bitstream
+// Bitstream must contain previously askrawdemod and biphasedemoded data
+int detectGProxII(uint8_t *bits, size_t *size) {
+
+    size_t startIdx = 0;
+    uint8_t preamble[] = {1, 1, 1, 1, 1, 0};
+
+    // sanity check
+    if (*size < sizeof(preamble)) return -1;
+
+    if (!preambleSearch(bits, preamble, sizeof(preamble), size, &startIdx))
+        return -2; //preamble not found
+
+    //gProxII should be 96 bits
+    if (*size != 96) return -3;
+
+    //check first 6 spacer bits to verify format
+    if (!bits[startIdx + 5] && !bits[startIdx + 10] && !bits[startIdx + 15] && !bits[startIdx + 20] && !bits[startIdx + 25] && !bits[startIdx + 30]) {
+        //confirmed proper separator bits found
+        //return start position
+        return (int) startIdx;
+    }
+    return -5; //spacer bits not found - not a valid gproxII
+}
+
+int demodGuard(void) {
+    return CmdGuardDemod("");
+}
+
 // Works for 26bits.
-int GetGuardBits(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint8_t *guardBits) {
+int getGuardBits(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint8_t *guardBits) {
 
     uint8_t xorKey = 0x66;
     uint8_t i;
@@ -139,231 +372,3 @@ int GetGuardBits(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint8_t *guardBits) {
     return 1;
 }
 
-// by marshmellow
-// demod gProxIIDemod
-// error returns as -x
-// success returns start position in bitstream
-// Bitstream must contain previously askrawdemod and biphasedemoded data
-int detectGProxII(uint8_t *bits, size_t *size) {
-
-    size_t startIdx = 0;
-    uint8_t preamble[] = {1, 1, 1, 1, 1, 0};
-
-    // sanity check
-    if (*size < sizeof(preamble)) return -1;
-
-    if (!preambleSearch(bits, preamble, sizeof(preamble), size, &startIdx))
-        return -2; //preamble not found
-
-    //gProxII should be 96 bits
-    if (*size != 96) return -3;
-
-    //check first 6 spacer bits to verify format
-    if (!bits[startIdx + 5] && !bits[startIdx + 10] && !bits[startIdx + 15] && !bits[startIdx + 20] && !bits[startIdx + 25] && !bits[startIdx + 30]) {
-        //confirmed proper separator bits found
-        //return start position
-        return (int) startIdx;
-    }
-    return -5; //spacer bits not found - not a valid gproxII
-}
-
-//by marshmellow
-//attempts to demodulate and identify a G_Prox_II verex/chubb card
-//WARNING: if it fails during some points it will destroy the DemodBuffer data
-// but will leave the GraphBuffer intact.
-//if successful it will push askraw data back to demod buffer ready for emulation
-int CmdGuardDemod(const char *Cmd) {
-    (void)Cmd; // Cmd is not used so far
-
-    //Differential Biphase
-    //get binary from ask wave
-    if (!ASKbiphaseDemod("0 64 0 0", false)) {
-        PrintAndLogEx(DEBUG, "DEBUG: Error - gProxII ASKbiphaseDemod failed");
-        return 0;
-    }
-
-    size_t size = DemodBufferLen;
-
-    int preambleIndex = detectGProxII(DemodBuffer, &size);
-    if (preambleIndex < 0) {
-
-        if (preambleIndex == -1)
-            PrintAndLogEx(DEBUG, "DEBUG: Error - gProxII too few bits found");
-        else if (preambleIndex == -2)
-            PrintAndLogEx(DEBUG, "DEBUG: Error - gProxII preamble not found");
-        else if (preambleIndex == -3)
-            PrintAndLogEx(DEBUG, "DEBUG: Error - gProxII size not correct: %d", size);
-        else if (preambleIndex == -5)
-            PrintAndLogEx(DEBUG, "DEBUG: Error - gProxII wrong spacerbits");
-        else
-            PrintAndLogEx(DEBUG, "DEBUG: Error - gProxII ans: %d", preambleIndex);
-        return 0;
-    }
-
-    //got a good demod of 96 bits
-    uint8_t ByteStream[8] = {0x00};
-    uint8_t xorKey = 0;
-    size_t startIdx = preambleIndex + 6; //start after 6 bit preamble
-
-    uint8_t bits_no_spacer[90];
-    //so as to not mess with raw DemodBuffer copy to a new sample array
-    memcpy(bits_no_spacer, DemodBuffer + startIdx, 90);
-    // remove the 18 (90/5=18) parity bits (down to 72 bits (96-6-18=72))
-    size_t len = removeParity(bits_no_spacer, 0, 5, 3, 90); //source, startloc, paritylen, ptype, length_to_run
-    if (len != 72) {
-        PrintAndLogEx(DEBUG, "DEBUG: Error - gProxII spacer removal did not produce 72 bits: %u, start: %u", len, startIdx);
-        return 0;
-    }
-    // get key and then get all 8 bytes of payload decoded
-    xorKey = (uint8_t)bytebits_to_byteLSBF(bits_no_spacer, 8);
-    for (size_t idx = 0; idx < 8; idx++) {
-        ByteStream[idx] = ((uint8_t)bytebits_to_byteLSBF(bits_no_spacer + 8 + (idx * 8), 8)) ^ xorKey;
-        PrintAndLogEx(DEBUG, "DEBUG: gProxII byte %u after xor: %02x", (unsigned int)idx, ByteStream[idx]);
-    }
-
-    setDemodBuff(DemodBuffer, 96, preambleIndex);
-    setClockGrid(g_DemodClock, g_DemodStartIdx + (preambleIndex * g_DemodClock));
-
-    //ByteStream contains 8 Bytes (64 bits) of decrypted raw tag data
-    uint8_t fmtLen = ByteStream[0] >> 2;
-    uint32_t FC = 0;
-    uint32_t Card = 0;
-    //get raw 96 bits to print
-    uint32_t raw1 = bytebits_to_byte(DemodBuffer, 32);
-    uint32_t raw2 = bytebits_to_byte(DemodBuffer + 32, 32);
-    uint32_t raw3 = bytebits_to_byte(DemodBuffer + 64, 32);
-    bool unknown = false;
-    switch (fmtLen) {
-        case 36:
-            FC = ((ByteStream[3] & 0x7F) << 7) | (ByteStream[4] >> 1);
-            Card = ((ByteStream[4] & 1) << 19) | (ByteStream[5] << 11) | (ByteStream[6] << 3) | (ByteStream[7] >> 5);
-            break;
-        case 26:
-            FC = ((ByteStream[3] & 0x7F) << 1) | (ByteStream[4] >> 7);
-            Card = ((ByteStream[4] & 0x7F) << 9) | (ByteStream[5] << 1) | (ByteStream[6] >> 7);
-            break;
-        default :
-            unknown = true;
-            break;
-    }
-    if (!unknown)
-        PrintAndLogEx(SUCCESS, "G-Prox-II Found: Format Len: %ubit - FC: %u - Card: %u, Raw: %08x%08x%08x", fmtLen, FC, Card, raw1, raw2, raw3);
-    else
-        PrintAndLogEx(SUCCESS, "Unknown G-Prox-II Fmt Found: Format Len: %u, Raw: %08x%08x%08x", fmtLen, raw1, raw2, raw3);
-
-    return 1;
-}
-
-int CmdGuardRead(const char *Cmd) {
-    lf_read(true, 10000);
-    return CmdGuardDemod(Cmd);
-}
-
-int CmdGuardClone(const char *Cmd) {
-
-    char cmdp = param_getchar(Cmd, 0);
-    if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_guard_clone();
-
-    uint32_t facilitycode = 0, cardnumber = 0, fc = 0, cn = 0, fmtlen = 0;
-    uint8_t i;
-    uint8_t bs[96];
-    memset(bs, 0x00, sizeof(bs));
-
-    //GuardProxII - compat mode, ASK/Biphase,  data rate 64, 3 data blocks
-    uint32_t blocks[4] = {T55x7_MODULATION_BIPHASE | T55x7_BITRATE_RF_64 | 3 << T55x7_MAXBLOCK_SHIFT, 0, 0, 0};
-
-    if (sscanf(Cmd, "%u %u %u", &fmtlen, &fc, &cn) != 3) return usage_lf_guard_clone();
-
-    fmtlen &= 0x7f;
-    facilitycode = (fc & 0x000000FF);
-    cardnumber = (cn & 0x0000FFFF);
-
-    if (!GetGuardBits(fmtlen, facilitycode, cardnumber, bs)) {
-        PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
-        return 1;
-    }
-
-    // Q5
-    if (param_getchar(Cmd, 3) == 'Q' || param_getchar(Cmd, 3) == 'q')
-        blocks[0] = T5555_MODULATION_FSK2 | T5555_SET_BITRATE(50) | 3 << T5555_MAXBLOCK_SHIFT;
-
-    blocks[1] = bytebits_to_byte(bs, 32);
-    blocks[2] = bytebits_to_byte(bs + 32, 32);
-    blocks[3] = bytebits_to_byte(bs + 64, 32);
-
-    PrintAndLogEx(INFO, "Preparing to clone Guardall to T55x7 with Facility Code: %u, Card Number: %u", facilitycode, cardnumber);
-    print_blocks(blocks, 4);
-
-    UsbCommand resp;
-    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
-
-    for (i = 0; i < 4; ++i) {
-        c.arg[0] = blocks[i];
-        c.arg[1] = i;
-        clearCommandBuffer();
-        SendCommand(&c);
-        if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
-            PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
-            return -1;
-        }
-    }
-    return 0;
-}
-
-int CmdGuardSim(const char *Cmd) {
-
-    // Guard uses:  clk: 64, invert: 0, encoding: 2 (ASK Biphase)
-    uint8_t clock1 = 64, encoding = 2, separator = 0, invert = 0;
-    uint32_t facilitycode = 0, cardnumber = 0, fc = 0, cn = 0, fmtlen = 0;
-
-    char cmdp = param_getchar(Cmd, 0);
-    if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_guard_sim();
-
-    if (sscanf(Cmd, "%u %u %u", &fmtlen, &fc, &cn) != 3) return usage_lf_guard_sim();
-
-    uint8_t bs[96];
-    size_t size = sizeof(bs);
-    memset(bs, 0x00, size);
-
-    fmtlen &= 0x7F;
-    facilitycode = (fc & 0x000000FF);
-    cardnumber = (cn & 0x0000FFFF);
-
-    if (!GetGuardBits(fmtlen, facilitycode, cardnumber, bs)) {
-        PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
-        return 1;
-    }
-
-    PrintAndLogEx(SUCCESS, "Simulating Guardall - Facility Code: %u, CardNumber: %u", facilitycode, cardnumber);
-
-    uint64_t arg1, arg2;
-    arg1 = (clock1 << 8) | encoding;
-    arg2 = (invert << 8) | separator;
-
-    UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
-    memcpy(c.d.asBytes, bs, size);
-    clearCommandBuffer();
-    SendCommand(&c);
-    return 0;
-}
-
-static command_t CommandTable[] = {
-    {"help",    CmdHelp,        1, "this help"},
-    {"demod",   CmdGuardDemod,  1, "demodulate a G Prox II tag from the GraphBuffer"},
-    {"read",    CmdGuardRead,   0, "attempt to read and extract tag data from the antenna"},
-    {"clone",   CmdGuardClone,  0, "clone Guardall tag"},
-    {"sim",     CmdGuardSim,    0, "simulate Guardall tag"},
-    {NULL, NULL, 0, NULL}
-};
-
-int CmdLFGuard(const char *Cmd) {
-    clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
-}
-
-int CmdHelp(const char *Cmd) {
-    (void)Cmd; // Cmd is not used so far
-    CmdsHelp(CommandTable);
-    return 0;
-}
diff --git a/client/cmdlfguard.h b/client/cmdlfguard.h
index 8e8d2663d..c6725ed07 100644
--- a/client/cmdlfguard.h
+++ b/client/cmdlfguard.h
@@ -23,9 +23,7 @@
 #include "crc.h"
 
 int CmdLFGuard(const char *Cmd);
-int CmdGuardDemod(const char *Cmd);
-int CmdGuardRead(const char *Cmd);
-int CmdGuardClone(const char *Cmd);
-int CmdGuardSim(const char *Cmd);
-
+int detectGProxII(uint8_t *bits, size_t *size);
+int demodGuard(void);
+int getGuardBits(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint8_t *guardBits);
 #endif
diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c
index c07fc2c1f..0eb76a8bf 100644
--- a/client/cmdlfhid.c
+++ b/client/cmdlfhid.c
@@ -15,7 +15,7 @@
 #endif
 
 static int CmdHelp(const char *Cmd);
-
+/*
 static int usage_lf_hid_read(void) {
     PrintAndLogEx(NORMAL, "Enables HID compatible reader mode printing details.");
     PrintAndLogEx(NORMAL, "By default, values are printed and logged until the button is pressed or another USB command is issued.");
@@ -31,6 +31,7 @@ static int usage_lf_hid_read(void) {
     PrintAndLogEx(NORMAL, "       lf hid read 1");
     return 0;
 }
+*/
 static int usage_lf_hid_wiegand(void) {
     PrintAndLogEx(NORMAL, "This command converts facility code/card number to Wiegand code");
     PrintAndLogEx(NORMAL, "");
@@ -124,7 +125,7 @@ static bool sendTry(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint32_t delay, ui
 //by marshmellow (based on existing demod + holiman's refactor)
 //HID Prox demod - FSK RF/50 with preamble of 00011101 (then manchester encoded)
 //print full HID Prox ID and some bit format details if found
-int CmdHIDDemod(const char *Cmd) {
+static int CmdHIDDemod(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     //raw fsk demod no manchester decoding no start bit finding just get binary from wave
     uint32_t hi2 = 0, hi = 0, lo = 0;
@@ -230,14 +231,14 @@ int CmdHIDDemod(const char *Cmd) {
 }
 
 // this read is the "normal" read,  which download lf signal and tries to demod here.
-int CmdHIDRead(const char *Cmd) {
+static int CmdHIDRead(const char *Cmd) {
     lf_read(true, 12000);
     return CmdHIDDemod(Cmd);
 }
-
+/*
 // this read loops on device side.
 // uses the demod in lfops.c
-int CmdHIDRead_device(const char *Cmd) {
+static int CmdHIDRead_device(const char *Cmd) {
 
     if (Cmd[0] == 'h' || Cmd[0] == 'H') return usage_lf_hid_read();
     uint8_t findone = (Cmd[0] == '1') ? 1 : 0;
@@ -246,8 +247,8 @@ int CmdHIDRead_device(const char *Cmd) {
     SendCommand(&c);
     return 0;
 }
-
-int CmdHIDSim(const char *Cmd) {
+*/
+static int CmdHIDSim(const char *Cmd) {
     uint32_t hi = 0, lo = 0;
     uint32_t n = 0, i = 0;
 
@@ -268,7 +269,7 @@ int CmdHIDSim(const char *Cmd) {
     return 0;
 }
 
-int CmdHIDClone(const char *Cmd) {
+static int CmdHIDClone(const char *Cmd) {
 
     uint32_t hi2 = 0, hi = 0, lo = 0;
     uint32_t n = 0, i = 0;
@@ -473,7 +474,7 @@ void calcWiegand(uint8_t fmtlen, uint16_t fc, uint64_t cardno, uint8_t *bits, ui
     }
 }
 
-int CmdHIDWiegand(const char *Cmd) {
+static int CmdHIDWiegand(const char *Cmd) {
     uint32_t oem = 0, fc = 0;
     uint64_t cardnum = 0;
     uint8_t bits[BITS] = {0};
@@ -515,7 +516,7 @@ int CmdHIDWiegand(const char *Cmd) {
     return 0;
 }
 
-int CmdHIDBrute(const char *Cmd) {
+static int CmdHIDBrute(const char *Cmd) {
 
     bool errors = false, verbose = false;
     uint32_t fc = 0, cn = 0, delay = 1000;
@@ -615,14 +616,18 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
+static int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
+    CmdsHelp(CommandTable);
+    return 0;
+}
+
 int CmdLFHID(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
-    (void)Cmd; // Cmd is not used so far
-    CmdsHelp(CommandTable);
-    return 0;
+int demodHID(void) {
+    return CmdHIDDemod("");
 }
diff --git a/client/cmdlfhid.h b/client/cmdlfhid.h
index f7d3802f0..8270b6469 100644
--- a/client/cmdlfhid.h
+++ b/client/cmdlfhid.h
@@ -25,13 +25,8 @@
 #include "lfdemod.h"
 
 int CmdLFHID(const char *Cmd);
-int CmdHIDDemod(const char *Cmd);
-int CmdHIDRead(const char *Cmd);
-int CmdHIDSim(const char *Cmd);
-int CmdHIDClone(const char *Cmd);
-int CmdHIDWiegand(const char *Cmd);
-int CmdHIDBrute(const char *Cmd);
 
+int demodHID(void);
 //void calc26(uint16_t fc, uint32_t cardno, uint8_t *out);
 void calcWiegand(uint8_t fmtlen, uint16_t fc, uint64_t cardno, uint8_t *bits, uint8_t oem);
 #endif
diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index f627b4733..3212f4454 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -64,6 +64,7 @@ static int usage_hitag_info(void) {
     PrintAndLogEx(NORMAL, "         lf hitag info");
     return 0;
 }
+/*
 static int usage_hitag_dump(void) {
     PrintAndLogEx(NORMAL, "Usage:   lf hitag dump [h] p <pwd> f <name>");
     PrintAndLogEx(NORMAL, "Options:");
@@ -76,6 +77,7 @@ static int usage_hitag_dump(void) {
     PrintAndLogEx(NORMAL, "         lf hitag dump p 4D494B52 f mydump");
     return 0;
 }
+*/
 static int usage_hitag_reader(void) {
     PrintAndLogEx(NORMAL, "Hitag reader functions");
     PrintAndLogEx(NORMAL, "Usage: lf hitag reader [h] <reader function #>");
@@ -120,7 +122,7 @@ static int usage_hitag_checkchallenges(void) {
     return 0;
 }
 
-int CmdLFHitagList(const char *Cmd) {
+static int CmdLFHitagList(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     CmdTraceList("hitag");
     return 0;
@@ -253,7 +255,7 @@ int CmdLFHitagList(const char *Cmd) {
     */
 }
 
-int CmdLFHitagSniff(const char *Cmd) {
+static int CmdLFHitagSniff(const char *Cmd) {
 
     char ctmp = tolower(param_getchar(Cmd, 0));
     if (ctmp == 'h') return usage_hitag_sniff();
@@ -264,7 +266,7 @@ int CmdLFHitagSniff(const char *Cmd) {
     return 0;
 }
 
-int CmdLFHitagSim(const char *Cmd) {
+static int CmdLFHitagSim(const char *Cmd) {
 
     bool errors = false;
     bool tag_mem_supplied = false;
@@ -476,7 +478,7 @@ static bool getHitagUid(uint32_t *uid) {
     return true;
 }
 
-int CmdLFHitagInfo(const char *Cmd) {
+static int CmdLFHitagInfo(const char *Cmd) {
     PrintAndLogEx(INFO, "Hitag2 tag information ");
     PrintAndLogEx(INFO, "To be done!");
     PrintAndLogEx(INFO, "------------------------------------");
@@ -509,7 +511,7 @@ int CmdLFHitagInfo(const char *Cmd) {
 // TODO: iceman
 // Hitag2 reader,  problem is that this command mixes up stuff.  So 26 give uid.  21 etc will also give you a memory dump !?
 //
-int CmdLFHitagReader(const char *Cmd) {
+static int CmdLFHitagReader(const char *Cmd) {
 
     UsbCommand c = {CMD_READER_HITAG, {0, 0, 0}, {{0}}};
     hitag_data *htd = (hitag_data *)c.d.asBytes;
@@ -590,7 +592,7 @@ int CmdLFHitagReader(const char *Cmd) {
     return 0;
 }
 
-int CmdLFHitagCheckChallenges(const char *Cmd) {
+static int CmdLFHitagCheckChallenges(const char *Cmd) {
 
     UsbCommand c = { CMD_TEST_HITAGS_TRACES, {0, 0, 0}, {{0}}};
     char filename[FILE_PATH_SIZE] = { 0x00 };
@@ -640,7 +642,7 @@ int CmdLFHitagCheckChallenges(const char *Cmd) {
     return 0;
 }
 
-int CmdLFHitagWriter(const char *Cmd) {
+static int CmdLFHitagWriter(const char *Cmd) {
     UsbCommand c = { CMD_WR_HITAG_S, {0, 0, 0}, {{0}}};
     hitag_data *htd = (hitag_data *)c.d.asBytes;
     hitag_function htf = param_get32ex(Cmd, 0, 0, 10);
@@ -681,7 +683,8 @@ int CmdLFHitagWriter(const char *Cmd) {
     return 0;
 }
 
-int CmdLFHitagDump(const char *Cmd) {
+/*
+static int CmdLFHitagDump(const char *Cmd) {
     PrintAndLogEx(INFO, "Dumping of tag memory");
     PrintAndLogEx(INFO, "To be done!");
 
@@ -689,6 +692,7 @@ int CmdLFHitagDump(const char *Cmd) {
     if (ctmp == 'h') return usage_hitag_dump();
     return 0;
 }
+*/
 
 static command_t CommandTable[] = {
     {"help",     CmdHelp,                   1, "This help" },
@@ -702,14 +706,18 @@ static command_t CommandTable[] = {
     { NULL, NULL, 0, NULL }
 };
 
+static int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
+    CmdsHelp(CommandTable);
+    return 0;
+}
+
 int CmdLFHitag(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
-    (void)Cmd; // Cmd is not used so far
-    CmdsHelp(CommandTable);
-    return 0;
+int readHitagUid(void) {
+    return CmdLFHitagReader("26") == 0;
 }
diff --git a/client/cmdlfhitag.h b/client/cmdlfhitag.h
index 650e5d892..264a245a1 100644
--- a/client/cmdlfhitag.h
+++ b/client/cmdlfhitag.h
@@ -13,13 +13,6 @@
 
 int CmdLFHitag(const char *Cmd);
 
-int CmdLFHitagList(const char *Cmd);
-int CmdLFHitagSniff(const char *Cmd);
-int CmdLFHitagSim(const char *Cmd);
-int CmdLFHitagInfo(const char *Cmd);
-int CmdLFHitagReader(const char *Cmd);
-int CmdLFHitagCheckChallenges(const char *Cmd);
-int CmdLFHitagWriter(const char *Cmd);
-int CmdLFHitagDump(const char *Cmd);
+int readHitagUid(void);
 
 #endif
diff --git a/client/cmdlfindala.c b/client/cmdlfindala.c
index 5bcf52eb0..be850d43f 100644
--- a/client/cmdlfindala.c
+++ b/client/cmdlfindala.c
@@ -50,126 +50,10 @@ static int usage_lf_indala_sim(void) {
     return 0;
 }
 
-// redesigned by marshmellow adjusted from existing decode functions
-// indala id decoding
-static int detectIndala(uint8_t *dest, size_t *size, uint8_t *invert) {
-
-    uint8_t preamble64_i[]  = {0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0};
-    uint8_t preamble224_i[] = {0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0};
-
-    size_t idx = 0;
-    size_t found_size = *size;
-
-    // PSK1
-    bool res = preambleSearch(dest, preamble64, sizeof(preamble64), &found_size, &idx);
-    if (res) {
-        PrintAndLogEx(DEBUG, "DEBUG: detectindala PSK1 found 64");
-        goto out;
-    }
-    idx = 0;
-    found_size = *size;
-    res = preambleSearch(dest, preamble64_i, sizeof(preamble64_i), &found_size, &idx);
-    if (res) {
-        PrintAndLogEx(DEBUG, "DEBUG: detectindala PSK1 found 64 inverted preamble");
-        goto inv;
-    }
-
-    /*
-    idx = 0;
-    found_size = *size;
-    res = preambleSearch(dest, preamble224, sizeof(preamble224), &found_size, &idx);
-    if ( res ) {
-        PrintAndLogEx(DEBUG, "DEBUG: detectindala PSK1 found 224");
-        goto out;
-    }
-
-    idx = 0;
-    found_size = *size;
-    res = preambleSearch(dest, preamble224_i, sizeof(preamble224_i), &found_size, &idx);
-    if ( res ) {
-        PrintAndLogEx(DEBUG, "DEBUG: detectindala PSK1 found 224 inverted preamble");
-        goto inv;
-    }
-    */
-
-    // PSK2
-    psk1TOpsk2(dest, *size);
-    PrintAndLogEx(DEBUG, "DEBUG: detectindala Converting PSK1 -> PSK2");
-
-    idx = 0;
-    found_size = *size;
-    res = preambleSearch(dest, preamble64, sizeof(preamble64), &found_size, &idx);
-    if (res) {
-        PrintAndLogEx(DEBUG, "DEBUG: detectindala PSK2 found 64 preamble");
-        goto out;
-    }
-
-    idx = 0;
-    found_size = *size;
-    res = preambleSearch(dest, preamble224, sizeof(preamble224), &found_size, &idx);
-    if (res) {
-        PrintAndLogEx(DEBUG, "DEBUG: detectindala PSK2 found 224 preamble");
-        goto out;
-    }
-
-    idx = 0;
-    found_size = *size;
-    res = preambleSearch(dest, preamble64_i, sizeof(preamble64_i), &found_size, &idx);
-    if (res) {
-        PrintAndLogEx(DEBUG, "DEBUG: detectindala PSK2 found 64 inverted preamble");
-        goto inv;
-    }
-
-    idx = 0;
-    found_size = *size;
-    res = preambleSearch(dest, preamble224_i, sizeof(preamble224_i), &found_size, &idx);
-    if (res) {
-        PrintAndLogEx(DEBUG, "DEBUG: detectindala PSK2 found 224 inverted preamble");
-        goto inv;
-    }
-
-inv:
-    if (res == 0) {
-        return -4;
-    }
-
-    *invert ^= 1;
-
-    if (*invert && idx > 0) {
-        for (size_t i = idx - 1; i < found_size + idx + 2; i++) {
-            dest[i] ^= 1;
-        }
-    }
-
-    PrintAndLogEx(DEBUG, "DEBUG: Warning - Indala had to invert bits");
-
-out:
-
-    *size = found_size;
-
-    //PrintAndLogEx(INFO, "DEBUG: detectindala RES = %d | %d | %d", res, found_size, idx);
-
-    if (found_size != 224 && found_size != 64) {
-        PrintAndLogEx(INFO, "DEBUG: detectindala | %d", found_size);
-        return -5;
-    }
-
-    // 224 formats are typically PSK2 (afaik 2017 Marshmellow)
-    // note loses 1 bit at beginning of transformation...
-    return (int) idx;
-
-}
-
-// this read is the "normal" read,  which download lf signal and tries to demod here.
-int CmdIndalaRead(const char *Cmd) {
-    lf_read(true, 30000);
-    return CmdIndalaDemod(Cmd);
-}
-
 // Indala 26 bit decode
 // by marshmellow
 // optional arguments - same as PSKDemod (clock & invert & maxerr)
-int CmdIndalaDemod(const char *Cmd) {
+static int CmdIndalaDemod(const char *Cmd) {
 
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_lf_indala_demod();
@@ -283,7 +167,7 @@ int CmdIndalaDemod(const char *Cmd) {
 // returns false positives more often - but runs against more sets of samples
 // poor psk signal can be difficult to demod this approach might succeed when the other fails
 // but the other appears to currently be more accurate than this approach most of the time.
-int CmdIndalaDemodAlt(const char *Cmd) {
+static int CmdIndalaDemodAlt(const char *Cmd) {
     // Usage: recover 64bit UID by default, specify "224" as arg to recover a 224bit UID
     int state = -1;
     int count = 0;
@@ -477,7 +361,13 @@ int CmdIndalaDemodAlt(const char *Cmd) {
     return 1;
 }
 
-int CmdIndalaSim(const char *Cmd) {
+// this read is the "normal" read,  which download lf signal and tries to demod here.
+static int CmdIndalaRead(const char *Cmd) {
+    lf_read(true, 30000);
+    return CmdIndalaDemod(Cmd);
+}
+
+static int CmdIndalaSim(const char *Cmd) {
 
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_indala_sim();
@@ -522,7 +412,7 @@ int CmdIndalaSim(const char *Cmd) {
 }
 
 // iceman - needs refactoring
-int CmdIndalaClone(const char *Cmd) {
+static int CmdIndalaClone(const char *Cmd) {
 
     bool isLongUid = false;
     uint8_t data[7 * 4];
@@ -582,14 +472,128 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
+static int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
+    CmdsHelp(CommandTable);
+    return 0;
+}
+
 int CmdLFINDALA(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
-    (void)Cmd; // Cmd is not used so far
-    CmdsHelp(CommandTable);
-    return 0;
+// redesigned by marshmellow adjusted from existing decode functions
+// indala id decoding
+int detectIndala(uint8_t *dest, size_t *size, uint8_t *invert) {
+
+    uint8_t preamble64_i[]  = {0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0};
+    uint8_t preamble224_i[] = {0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0};
+
+    size_t idx = 0;
+    size_t found_size = *size;
+
+    // PSK1
+    bool res = preambleSearch(dest, preamble64, sizeof(preamble64), &found_size, &idx);
+    if (res) {
+        PrintAndLogEx(DEBUG, "DEBUG: detectindala PSK1 found 64");
+        goto out;
+    }
+    idx = 0;
+    found_size = *size;
+    res = preambleSearch(dest, preamble64_i, sizeof(preamble64_i), &found_size, &idx);
+    if (res) {
+        PrintAndLogEx(DEBUG, "DEBUG: detectindala PSK1 found 64 inverted preamble");
+        goto inv;
+    }
+
+    /*
+    idx = 0;
+    found_size = *size;
+    res = preambleSearch(dest, preamble224, sizeof(preamble224), &found_size, &idx);
+    if ( res ) {
+        PrintAndLogEx(DEBUG, "DEBUG: detectindala PSK1 found 224");
+        goto out;
+    }
+
+    idx = 0;
+    found_size = *size;
+    res = preambleSearch(dest, preamble224_i, sizeof(preamble224_i), &found_size, &idx);
+    if ( res ) {
+        PrintAndLogEx(DEBUG, "DEBUG: detectindala PSK1 found 224 inverted preamble");
+        goto inv;
+    }
+    */
+
+    // PSK2
+    psk1TOpsk2(dest, *size);
+    PrintAndLogEx(DEBUG, "DEBUG: detectindala Converting PSK1 -> PSK2");
+
+    idx = 0;
+    found_size = *size;
+    res = preambleSearch(dest, preamble64, sizeof(preamble64), &found_size, &idx);
+    if (res) {
+        PrintAndLogEx(DEBUG, "DEBUG: detectindala PSK2 found 64 preamble");
+        goto out;
+    }
+
+    idx = 0;
+    found_size = *size;
+    res = preambleSearch(dest, preamble224, sizeof(preamble224), &found_size, &idx);
+    if (res) {
+        PrintAndLogEx(DEBUG, "DEBUG: detectindala PSK2 found 224 preamble");
+        goto out;
+    }
+
+    idx = 0;
+    found_size = *size;
+    res = preambleSearch(dest, preamble64_i, sizeof(preamble64_i), &found_size, &idx);
+    if (res) {
+        PrintAndLogEx(DEBUG, "DEBUG: detectindala PSK2 found 64 inverted preamble");
+        goto inv;
+    }
+
+    idx = 0;
+    found_size = *size;
+    res = preambleSearch(dest, preamble224_i, sizeof(preamble224_i), &found_size, &idx);
+    if (res) {
+        PrintAndLogEx(DEBUG, "DEBUG: detectindala PSK2 found 224 inverted preamble");
+        goto inv;
+    }
+
+inv:
+    if (res == 0) {
+        return -4;
+    }
+
+    *invert ^= 1;
+
+    if (*invert && idx > 0) {
+        for (size_t i = idx - 1; i < found_size + idx + 2; i++) {
+            dest[i] ^= 1;
+        }
+    }
+
+    PrintAndLogEx(DEBUG, "DEBUG: Warning - Indala had to invert bits");
+
+out:
+
+    *size = found_size;
+
+    //PrintAndLogEx(INFO, "DEBUG: detectindala RES = %d | %d | %d", res, found_size, idx);
+
+    if (found_size != 224 && found_size != 64) {
+        PrintAndLogEx(INFO, "DEBUG: detectindala | %d", found_size);
+        return -5;
+    }
+
+    // 224 formats are typically PSK2 (afaik 2017 Marshmellow)
+    // note loses 1 bit at beginning of transformation...
+    return (int) idx;
+
+}
+
+int demodIndala(void) {
+    return CmdIndalaDemod("");
 }
diff --git a/client/cmdlfindala.h b/client/cmdlfindala.h
index b107efdc7..1de894bf7 100644
--- a/client/cmdlfindala.h
+++ b/client/cmdlfindala.h
@@ -25,14 +25,10 @@
 
 int CmdLFINDALA(const char *Cmd);
 
-int CmdIndalaDemod(const char *Cmd);
-int CmdIndalaDemodAlt(const char *Cmd);
-int CmdIndalaRead(const char *Cmd);
-int CmdIndalaClone(const char *Cmd);
-int CmdIndalaSim(const char *Cmd);
-
+int detectIndala(uint8_t *dest, size_t *size, uint8_t *invert);
 int detectIndala26(uint8_t *bitStream, size_t *size, uint8_t *invert);
 int detectIndala64(uint8_t *bitStream, size_t *size, uint8_t *invert);
 int detectIndala224(uint8_t *bitStream, size_t *size, uint8_t *invert);
+int demodIndala(void);
 
 #endif
diff --git a/client/cmdlfio.c b/client/cmdlfio.c
index 9db05ef99..92f954511 100644
--- a/client/cmdlfio.c
+++ b/client/cmdlfio.c
@@ -11,7 +11,7 @@
 #include "cmdlfio.h"
 
 static int CmdHelp(const char *Cmd);
-
+/*
 static int usage_lf_io_read(void) {
     PrintAndLogEx(NORMAL, "Enables IOProx compatible reader mode printing details of scanned tags.");
     PrintAndLogEx(NORMAL, "By default, values are printed and logged until the button is pressed or another USB command is issued.");
@@ -27,7 +27,7 @@ static int usage_lf_io_read(void) {
     PrintAndLogEx(NORMAL, "        lf io read 1");
     return 0;
 }
-
+*/
 static int usage_lf_io_sim(void) {
     PrintAndLogEx(NORMAL, "Enables simulation of IOProx card with specified facility-code and card number.");
     PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
@@ -60,15 +60,10 @@ static int usage_lf_io_clone(void) {
     PrintAndLogEx(NORMAL, "       lf io clone 26 101 1337");
     return 0;
 }
-
-// this read is the "normal" read,  which download lf signal and tries to demod here.
-int CmdIOProxRead(const char *Cmd) {
-    lf_read(true, 12000);
-    return CmdIOProxDemod(Cmd);
-}
+/*
 // this read loops on device side.
 // uses the demod in lfops.c
-int CmdIOProxRead_device(const char *Cmd) {
+static int CmdIOProxRead_device(const char *Cmd) {
     if (Cmd[0] == 'h' || Cmd[0] == 'H') return usage_lf_io_read();
     int findone = (Cmd[0] == '1') ? 1 : 0;
     UsbCommand c = {CMD_IO_DEMOD_FSK, {findone, 0, 0}, {{0}}};
@@ -76,11 +71,11 @@ int CmdIOProxRead_device(const char *Cmd) {
     SendCommand(&c);
     return 0;
 }
-
+*/
 //by marshmellow
 //IO-Prox demod - FSK RF/64 with preamble of 000000001
 //print ioprox ID and some format details
-int CmdIOProxDemod(const char *Cmd) {
+static int CmdIOProxDemod(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     int retval = 0;
     int idx = 0;
@@ -177,6 +172,124 @@ int CmdIOProxDemod(const char *Cmd) {
     return retval;
 }
 
+// this read is the "normal" read,  which download lf signal and tries to demod here.
+static int CmdIOProxRead(const char *Cmd) {
+    lf_read(true, 12000);
+    return CmdIOProxDemod(Cmd);
+}
+static int CmdIOProxSim(const char *Cmd) {
+    uint16_t cn = 0;
+    uint8_t version = 0, fc = 0;
+    uint8_t bits[64];
+    size_t size = sizeof(bits);
+    memset(bits, 0x00, size);
+
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_io_sim();
+
+    version = param_get8(Cmd, 0);
+    fc = param_get8(Cmd, 1);
+    cn = param_get32ex(Cmd, 2, 0, 10);
+
+    if (!version || !fc || !cn) return usage_lf_io_sim();
+
+    if ((cn & 0xFFFF) != cn) {
+        cn &= 0xFFFF;
+        PrintAndLogEx(INFO, "Card Number Truncated to 16-bits (IOProx): %u", cn);
+    }
+
+    // clock 64, FSK2a fcHIGH 10 | fcLOW 8
+    uint8_t clk = 64, invert = 1, high = 10, low = 8;
+    uint16_t arg1, arg2;
+    arg1 = high << 8 | low;
+    arg2 = invert << 8 | clk;
+
+    PrintAndLogEx(SUCCESS, "Simulating IOProx version: %u FC: %u; CN: %u\n", version, fc, cn);
+    PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation or run another command");
+
+    if (!getIOProxBits(version, fc, cn, bits)) {
+        PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
+        return 1;
+    }
+    // IOProx uses: fcHigh: 10, fcLow: 8, clk: 64, invert: 1
+    // arg1 --- fcHigh<<8 + fcLow
+    // arg2 --- Invert and clk setting
+    // size --- 64 bits == 8 bytes
+    UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}, {{0}}};
+    memcpy(c.d.asBytes, bits, size);
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
+}
+
+static int CmdIOProxClone(const char *Cmd) {
+
+    uint32_t blocks[3] = {T55x7_MODULATION_FSK2a | T55x7_BITRATE_RF_64 | 2 << T55x7_MAXBLOCK_SHIFT, 0, 0};
+    uint16_t cn = 0;
+    uint8_t version = 0, fc = 0;
+    uint8_t bits[64];
+    memset(bits, 0, sizeof(bits));
+
+    char cmdp = param_getchar(Cmd, 0);
+    if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_io_clone();
+
+    version = param_get8(Cmd, 0);
+    fc = param_get8(Cmd, 1);
+    cn = param_get32ex(Cmd, 2, 0, 10);
+
+    if (!version || !fc || !cn) return usage_lf_io_clone();
+
+    if ((cn & 0xFFFF) != cn) {
+        cn &= 0xFFFF;
+        PrintAndLogEx(INFO, "Card Number Truncated to 16-bits (IOProx): %u", cn);
+    }
+
+    if (!getIOProxBits(version, fc, cn, bits)) {
+        PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
+        return 1;
+    }
+
+    if (param_getchar(Cmd, 3) == 'Q' || param_getchar(Cmd, 3) == 'q')
+        blocks[0] = T5555_MODULATION_FSK2 | T5555_INVERT_OUTPUT | T5555_SET_BITRATE(64) | 2 << T5555_MAXBLOCK_SHIFT;
+
+    blocks[1] = bytebits_to_byte(bits, 32);
+    blocks[2] = bytebits_to_byte(bits + 32, 32);
+
+    PrintAndLogEx(INFO, "Preparing to clone IOProx to T55x7 with Version: %u FC: %u, CN: %u", version, fc, cn);
+    print_blocks(blocks, 3);
+
+    //UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}, {{0}}};
+    UsbCommand c = {CMD_IO_CLONE_TAG, {blocks[1], blocks[2], 0}, {{0}}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    return 0;
+}
+
+static command_t CommandTable[] = {
+    {"help",    CmdHelp,        1, "this help"},
+    {"demod",   CmdIOProxDemod, 1, "demodulate an IOProx tag from the GraphBuffer"},
+    {"read",    CmdIOProxRead,  1, "attempt to read and extract tag data"},
+    {"clone",   CmdIOProxClone, 0, "clone IOProx to T55x7"},
+    {"sim",     CmdIOProxSim,   0, "simulate IOProx tag"},
+    {NULL, NULL, 0, NULL}
+};
+
+static int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
+    CmdsHelp(CommandTable);
+    return 0;
+}
+
+int CmdLFIO(const char *Cmd) {
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
+    return 0;
+}
+
+int demodIOProx(void) {
+    return CmdIOProxDemod("");
+}
+
 //Index map
 //0           10          20          30          40          50          60
 //|           |           |           |           |           |           |
@@ -244,111 +357,3 @@ int getIOProxBits(uint8_t version, uint8_t fc, uint16_t cn, uint8_t *bits) {
     return 1;
 }
 
-int CmdIOProxSim(const char *Cmd) {
-    uint16_t cn = 0;
-    uint8_t version = 0, fc = 0;
-    uint8_t bits[64];
-    size_t size = sizeof(bits);
-    memset(bits, 0x00, size);
-
-    char cmdp = tolower(param_getchar(Cmd, 0));
-    if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_io_sim();
-
-    version = param_get8(Cmd, 0);
-    fc = param_get8(Cmd, 1);
-    cn = param_get32ex(Cmd, 2, 0, 10);
-
-    if (!version || !fc || !cn) return usage_lf_io_sim();
-
-    if ((cn & 0xFFFF) != cn) {
-        cn &= 0xFFFF;
-        PrintAndLogEx(INFO, "Card Number Truncated to 16-bits (IOProx): %u", cn);
-    }
-
-    // clock 64, FSK2a fcHIGH 10 | fcLOW 8
-    uint8_t clk = 64, invert = 1, high = 10, low = 8;
-    uint16_t arg1, arg2;
-    arg1 = high << 8 | low;
-    arg2 = invert << 8 | clk;
-
-    PrintAndLogEx(SUCCESS, "Simulating IOProx version: %u FC: %u; CN: %u\n", version, fc, cn);
-    PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation or run another command");
-
-    if (!getIOProxBits(version, fc, cn, bits)) {
-        PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
-        return 1;
-    }
-    // IOProx uses: fcHigh: 10, fcLow: 8, clk: 64, invert: 1
-    // arg1 --- fcHigh<<8 + fcLow
-    // arg2 --- Invert and clk setting
-    // size --- 64 bits == 8 bytes
-    UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}, {{0}}};
-    memcpy(c.d.asBytes, bits, size);
-    clearCommandBuffer();
-    SendCommand(&c);
-    return 0;
-}
-
-int CmdIOProxClone(const char *Cmd) {
-
-    uint32_t blocks[3] = {T55x7_MODULATION_FSK2a | T55x7_BITRATE_RF_64 | 2 << T55x7_MAXBLOCK_SHIFT, 0, 0};
-    uint16_t cn = 0;
-    uint8_t version = 0, fc = 0;
-    uint8_t bits[64];
-    memset(bits, 0, sizeof(bits));
-
-    char cmdp = param_getchar(Cmd, 0);
-    if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_io_clone();
-
-    version = param_get8(Cmd, 0);
-    fc = param_get8(Cmd, 1);
-    cn = param_get32ex(Cmd, 2, 0, 10);
-
-    if (!version || !fc || !cn) return usage_lf_io_clone();
-
-    if ((cn & 0xFFFF) != cn) {
-        cn &= 0xFFFF;
-        PrintAndLogEx(INFO, "Card Number Truncated to 16-bits (IOProx): %u", cn);
-    }
-
-    if (!getIOProxBits(version, fc, cn, bits)) {
-        PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
-        return 1;
-    }
-
-    if (param_getchar(Cmd, 3) == 'Q' || param_getchar(Cmd, 3) == 'q')
-        blocks[0] = T5555_MODULATION_FSK2 | T5555_INVERT_OUTPUT | T5555_SET_BITRATE(64) | 2 << T5555_MAXBLOCK_SHIFT;
-
-    blocks[1] = bytebits_to_byte(bits, 32);
-    blocks[2] = bytebits_to_byte(bits + 32, 32);
-
-    PrintAndLogEx(INFO, "Preparing to clone IOProx to T55x7 with Version: %u FC: %u, CN: %u", version, fc, cn);
-    print_blocks(blocks, 3);
-
-    //UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}, {{0}}};
-    UsbCommand c = {CMD_IO_CLONE_TAG, {blocks[1], blocks[2], 0}, {{0}}};
-    clearCommandBuffer();
-    SendCommand(&c);
-    return 0;
-}
-
-static command_t CommandTable[] = {
-    {"help",    CmdHelp,        1, "this help"},
-    {"demod",   CmdIOProxDemod, 1, "demodulate an IOProx tag from the GraphBuffer"},
-    {"read",    CmdIOProxRead,  1, "attempt to read and extract tag data"},
-    {"clone",   CmdIOProxClone, 0, "clone IOProx to T55x7"},
-    {"sim",     CmdIOProxSim,   0, "simulate IOProx tag"},
-    {NULL, NULL, 0, NULL}
-};
-
-int CmdLFIO(const char *Cmd) {
-    clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
-}
-
-int CmdHelp(const char *Cmd) {
-    (void)Cmd; // Cmd is not used so far
-    CmdsHelp(CommandTable);
-    return 0;
-}
diff --git a/client/cmdlfio.h b/client/cmdlfio.h
index ecb442ff7..39abbc767 100644
--- a/client/cmdlfio.h
+++ b/client/cmdlfio.h
@@ -17,11 +17,8 @@
 #include "cmddata.h"
 
 int CmdLFIO(const char *Cmd);
-int CmdIOProxDemod(const char *Cmd);
-int CmdIOProxRead(const char *Cmd);
-int CmdIOProxSim(const char *Cmd);
-int CmdIOProxClone(const char *Cmd);
 
+int demodIOProx(void);
 int getIOProxBits(uint8_t version, uint8_t fc, uint16_t cn, uint8_t *bits);
 
 #endif

From 8aa5b42cdfd3121987540999b82c93cfb53338ab Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 12 Apr 2019 02:07:11 +0200
Subject: [PATCH 1197/1938] Rework Cmd exposed API, use more static and fix
 [-Wmissing-prototypes], ongoing...

---
 client/cmdlfjablotron.c | 20 +++++++++----------
 client/cmdlfkeri.c      | 18 ++++++++---------
 client/cmdlfnexwatch.c  | 16 +++++++--------
 client/cmdlfnoralsy.c   | 20 +++++++++----------
 client/cmdlfpac.c       | 14 +++++++-------
 client/cmdlfparadox.c   | 18 ++++++++---------
 client/cmdlfpcf7931.c   | 17 ++++++++--------
 client/cmdlfpresco.c    | 20 +++++++++----------
 client/cmdlfpyramid.c   |  8 ++++----
 client/cmdlfsecurakey.c | 16 +++++++--------
 client/cmdlft55xx.c     | 43 +++++++++++++++++++++--------------------
 client/cmdlfti.c        | 18 ++++++++---------
 client/cmdlfviking.c    | 20 +++++++++----------
 client/cmdlfvisa2000.c  | 20 +++++++++----------
 14 files changed, 135 insertions(+), 133 deletions(-)

diff --git a/client/cmdlfjablotron.c b/client/cmdlfjablotron.c
index f253e4866..420ab4d29 100644
--- a/client/cmdlfjablotron.c
+++ b/client/cmdlfjablotron.c
@@ -60,7 +60,7 @@ static uint64_t getJablontronCardId(uint64_t rawcode) {
 }
 
 //see ASKDemod for what args are accepted
-int CmdJablotronDemod(const char *Cmd) {
+static int CmdJablotronDemod(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
 
     //Differential Biphase / di-phase (inverted biphase)
@@ -115,12 +115,12 @@ int CmdJablotronDemod(const char *Cmd) {
     return 1;
 }
 
-int CmdJablotronRead(const char *Cmd) {
+static int CmdJablotronRead(const char *Cmd) {
     lf_read(true, 10000);
     return CmdJablotronDemod(Cmd);
 }
 
-int CmdJablotronClone(const char *Cmd) {
+static int CmdJablotronClone(const char *Cmd) {
 
     uint64_t fullcode = 0;
     uint32_t blocks[3] = {T55x7_MODULATION_DIPHASE | T55x7_BITRATE_RF_64 | 2 << T55x7_MAXBLOCK_SHIFT, 0, 0};
@@ -170,7 +170,7 @@ int CmdJablotronClone(const char *Cmd) {
     return 0;
 }
 
-int CmdJablotronSim(const char *Cmd) {
+static int CmdJablotronSim(const char *Cmd) {
     uint64_t fullcode = 0;
 
     char cmdp = tolower(param_getchar(Cmd, 0));
@@ -208,15 +208,15 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFJablotron(const char *Cmd) {
-    clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
+static int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
+    CmdsHelp(CommandTable);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
-    (void)Cmd; // Cmd is not used so far
-    CmdsHelp(CommandTable);
+int CmdLFJablotron(const char *Cmd) {
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
diff --git a/client/cmdlfkeri.c b/client/cmdlfkeri.c
index a7cd873db..7b4f726d6 100644
--- a/client/cmdlfkeri.c
+++ b/client/cmdlfkeri.c
@@ -98,12 +98,12 @@ static int CmdKeriDemod(const char *Cmd) {
     return 1;
 }
 
-int CmdKeriRead(const char *Cmd) {
+static int CmdKeriRead(const char *Cmd) {
     lf_read(true, 10000);
     return CmdKeriDemod(Cmd);
 }
 
-int CmdKeriClone(const char *Cmd) {
+static int CmdKeriClone(const char *Cmd) {
 
     uint32_t internalid = 0;
     uint32_t blocks[3] = {
@@ -164,7 +164,7 @@ int CmdKeriClone(const char *Cmd) {
     return 0;
 }
 
-int CmdKeriSim(const char *Cmd) {
+static int CmdKeriSim(const char *Cmd) {
 
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_keri_sim();
@@ -206,15 +206,15 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFKeri(const char *Cmd) {
-    clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
+static int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
+    CmdsHelp(CommandTable);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
-    (void)Cmd; // Cmd is not used so far
-    CmdsHelp(CommandTable);
+int CmdLFKeri(const char *Cmd) {
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
diff --git a/client/cmdlfnexwatch.c b/client/cmdlfnexwatch.c
index a228872ff..67536d06e 100644
--- a/client/cmdlfnexwatch.c
+++ b/client/cmdlfnexwatch.c
@@ -12,7 +12,7 @@
 
 static int CmdHelp(const char *Cmd);
 
-int CmdNexWatchDemod(const char *Cmd) {
+static int CmdNexWatchDemod(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
 
     if (!PSKDemod("", false)) {
@@ -69,7 +69,7 @@ int CmdNexWatchDemod(const char *Cmd) {
 
 //by marshmellow
 //see ASKDemod for what args are accepted
-int CmdNexWatchRead(const char *Cmd) {
+static int CmdNexWatchRead(const char *Cmd) {
     lf_read(true, 10000);
     return CmdNexWatchDemod(Cmd);
 }
@@ -81,15 +81,15 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFNEXWATCH(const char *Cmd) {
-    clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
+static int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
+    CmdsHelp(CommandTable);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
-    (void)Cmd; // Cmd is not used so far
-    CmdsHelp(CommandTable);
+int CmdLFNEXWATCH(const char *Cmd) {
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
diff --git a/client/cmdlfnoralsy.c b/client/cmdlfnoralsy.c
index 59cc4d70a..db906c65c 100644
--- a/client/cmdlfnoralsy.c
+++ b/client/cmdlfnoralsy.c
@@ -48,7 +48,7 @@ static uint8_t noralsy_chksum(uint8_t *bits, uint8_t len) {
 }
 
 //see ASKDemod for what args are accepted
-int CmdNoralsyDemod(const char *Cmd) {
+static int CmdNoralsyDemod(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
 
     //ASK / Manchester
@@ -118,12 +118,12 @@ int CmdNoralsyDemod(const char *Cmd) {
     return 1;
 }
 
-int CmdNoralsyRead(const char *Cmd) {
+static int CmdNoralsyRead(const char *Cmd) {
     lf_read(true, 8000);
     return CmdNoralsyDemod(Cmd);
 }
 
-int CmdNoralsyClone(const char *Cmd) {
+static int CmdNoralsyClone(const char *Cmd) {
 
     uint16_t year = 0;
     uint32_t id = 0;
@@ -170,7 +170,7 @@ int CmdNoralsyClone(const char *Cmd) {
     return 0;
 }
 
-int CmdNoralsySim(const char *Cmd) {
+static int CmdNoralsySim(const char *Cmd) {
 
     uint8_t bits[96];
     uint8_t *bs = bits;
@@ -214,15 +214,15 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFNoralsy(const char *Cmd) {
-    clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
+static int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
+    CmdsHelp(CommandTable);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
-    (void)Cmd; // Cmd is not used so far
-    CmdsHelp(CommandTable);
+int CmdLFNoralsy(const char *Cmd) {
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
diff --git a/client/cmdlfpac.c b/client/cmdlfpac.c
index 36abe19b8..8bbda25b5 100644
--- a/client/cmdlfpac.c
+++ b/client/cmdlfpac.c
@@ -12,7 +12,7 @@
 static int CmdHelp(const char *Cmd);
 
 //see NRZDemod for what args are accepted
-int CmdPacDemod(const char *Cmd) {
+static int CmdPacDemod(const char *Cmd) {
 
     //NRZ
     if (!NRZrawDemod(Cmd, false)) {
@@ -51,7 +51,7 @@ int CmdPacDemod(const char *Cmd) {
     return 1;
 }
 
-int CmdPacRead(const char *Cmd) {
+static int CmdPacRead(const char *Cmd) {
     lf_read(true, 4096 * 2 + 20);
     return CmdPacDemod(Cmd);
 }
@@ -63,14 +63,14 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFPac(const char *Cmd) {
-    clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
+static int CmdHelp(const char *Cmd) {
+    CmdsHelp(CommandTable);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
-    CmdsHelp(CommandTable);
+int CmdLFPac(const char *Cmd) {
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
diff --git a/client/cmdlfparadox.c b/client/cmdlfparadox.c
index 72a0956fe..3b7f97373 100644
--- a/client/cmdlfparadox.c
+++ b/client/cmdlfparadox.c
@@ -40,7 +40,7 @@ static int usage_lf_paradox_sim(void) {
 //by marshmellow
 //Paradox Prox demod - FSK2a RF/50 with preamble of 00001111 (then manchester encoded)
 //print full Paradox Prox ID and some bit format details if found
-int CmdParadoxDemod(const char *Cmd) {
+static int CmdParadoxDemod(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     //raw fsk demod no manchester decoding no start bit finding just get binary from wave
     uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
@@ -104,12 +104,12 @@ int CmdParadoxDemod(const char *Cmd) {
 }
 //by marshmellow
 //see ASKDemod for what args are accepted
-int CmdParadoxRead(const char *Cmd) {
+static int CmdParadoxRead(const char *Cmd) {
     lf_read(true, 10000);
     return CmdParadoxDemod(Cmd);
 }
 
-int CmdParadoxSim(const char *Cmd) {
+static int CmdParadoxSim(const char *Cmd) {
 
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_paradox_sim();
@@ -156,15 +156,15 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFParadox(const char *Cmd) {
-    clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
+static int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
+    CmdsHelp(CommandTable);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
-    (void)Cmd; // Cmd is not used so far
-    CmdsHelp(CommandTable);
+int CmdLFParadox(const char *Cmd) {
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
diff --git a/client/cmdlfpcf7931.c b/client/cmdlfpcf7931.c
index 774c9a642..283aa269e 100644
--- a/client/cmdlfpcf7931.c
+++ b/client/cmdlfpcf7931.c
@@ -94,7 +94,7 @@ static int usage_pcf7931_config() {
     return 0;
 }
 
-int CmdLFPCF7931Read(const char *Cmd) {
+static int CmdLFPCF7931Read(const char *Cmd) {
 
     uint8_t ctmp = param_getchar(Cmd, 0);
     if (ctmp == 'H' || ctmp == 'h') return usage_pcf7931_read();
@@ -110,7 +110,7 @@ int CmdLFPCF7931Read(const char *Cmd) {
     return 0;
 }
 
-int CmdLFPCF7931Config(const char *Cmd) {
+static int CmdLFPCF7931Config(const char *Cmd) {
 
     uint8_t ctmp = param_getchar(Cmd, 0);
     if (ctmp == 0) return pcf7931_printConfig();
@@ -127,7 +127,7 @@ int CmdLFPCF7931Config(const char *Cmd) {
     return 0;
 }
 
-int CmdLFPCF7931Write(const char *Cmd) {
+static int CmdLFPCF7931Write(const char *Cmd) {
 
     uint8_t ctmp = param_getchar(Cmd, 0);
     if (strlen(Cmd) < 1 || ctmp == 'h' || ctmp == 'H') return usage_pcf7931_write();
@@ -165,14 +165,15 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
+static int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
+    CmdsHelp(CommandTable);
+    return 0;
+}
+
 int CmdLFPCF7931(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
-    (void)Cmd; // Cmd is not used so far
-    CmdsHelp(CommandTable);
-    return 0;
-}
diff --git a/client/cmdlfpresco.c b/client/cmdlfpresco.c
index 8931b31d7..2d24ba60e 100644
--- a/client/cmdlfpresco.c
+++ b/client/cmdlfpresco.c
@@ -41,7 +41,7 @@ static int usage_lf_presco_sim(void) {
 }
 
 //see ASKDemod for what args are accepted
-int CmdPrescoDemod(const char *Cmd) {
+static int CmdPrescoDemod(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     bool st = true;
     if (!ASKDemod_ext("32 0 0 0 0 a", false, false, 1, &st)) {
@@ -82,7 +82,7 @@ int CmdPrescoDemod(const char *Cmd) {
 }
 
 //see ASKDemod for what args are accepted
-int CmdPrescoRead(const char *Cmd) {
+static int CmdPrescoRead(const char *Cmd) {
     // Presco Number: 123456789 --> Sitecode 30 | usercode 8665
     lf_read(true, 12000);
     return CmdPrescoDemod(Cmd);
@@ -90,7 +90,7 @@ int CmdPrescoRead(const char *Cmd) {
 
 // takes base 12 ID converts to hex
 // Or takes 8 digit hex ID
-int CmdPrescoClone(const char *Cmd) {
+static int CmdPrescoClone(const char *Cmd) {
 
     bool Q5 = false;
     uint32_t sitecode = 0, usercode = 0, fullcode = 0;
@@ -138,7 +138,7 @@ int CmdPrescoClone(const char *Cmd) {
 
 // takes base 12 ID converts to hex
 // Or takes 8 digit hex ID
-int CmdPrescoSim(const char *Cmd) {
+static int CmdPrescoSim(const char *Cmd) {
     uint32_t sitecode = 0, usercode = 0, fullcode = 0;
     bool Q5 = false;
     // get wiegand from printed number.
@@ -167,15 +167,15 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFPresco(const char *Cmd) {
-    clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
+static int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
+    CmdsHelp(CommandTable);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
-    (void)Cmd; // Cmd is not used so far
-    CmdsHelp(CommandTable);
+int CmdLFPresco(const char *Cmd) {
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c
index 44cbdeded..135b35650 100644
--- a/client/cmdlfpyramid.c
+++ b/client/cmdlfpyramid.c
@@ -48,7 +48,7 @@ static int usage_lf_pyramid_sim(void) {
 //by marshmellow
 //Pyramid Prox demod - FSK RF/50 with preamble of 0000000000000001  (always a 128 bit data stream)
 //print full Farpointe Data/Pyramid Prox ID and some bit format details if found
-int CmdPyramidDemod(const char *Cmd) {
+static int CmdPyramidDemod(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     //raw fsk demod no manchester decoding no start bit finding just get binary from wave
     uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
@@ -192,12 +192,12 @@ int CmdPyramidDemod(const char *Cmd) {
     return 1;
 }
 
-int CmdPyramidRead(const char *Cmd) {
+static int CmdPyramidRead(const char *Cmd) {
     lf_read(true, 15000);
     return CmdPyramidDemod(Cmd);
 }
 
-int CmdPyramidClone(const char *Cmd) {
+static int CmdPyramidClone(const char *Cmd) {
 
     char cmdp = param_getchar(Cmd, 0);
     if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_pyramid_clone();
@@ -248,7 +248,7 @@ int CmdPyramidClone(const char *Cmd) {
     return 0;
 }
 
-int CmdPyramidSim(const char *Cmd) {
+static int CmdPyramidSim(const char *Cmd) {
 
     char cmdp = param_getchar(Cmd, 0);
     if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_pyramid_sim();
diff --git a/client/cmdlfsecurakey.c b/client/cmdlfsecurakey.c
index fab8d425b..ab5079dd5 100644
--- a/client/cmdlfsecurakey.c
+++ b/client/cmdlfsecurakey.c
@@ -12,7 +12,7 @@
 static int CmdHelp(const char *Cmd);
 
 //see ASKDemod for what args are accepted
-int CmdSecurakeyDemod(const char *Cmd) {
+static int CmdSecurakeyDemod(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
 
     //ASK / Manchester
@@ -94,7 +94,7 @@ int CmdSecurakeyDemod(const char *Cmd) {
     return 1;
 }
 
-int CmdSecurakeyRead(const char *Cmd) {
+static int CmdSecurakeyRead(const char *Cmd) {
     lf_read(true, 8000);
     return CmdSecurakeyDemod(Cmd);
 }
@@ -108,15 +108,15 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFSecurakey(const char *Cmd) {
-    clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
+static int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
+    CmdsHelp(CommandTable);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
-    (void)Cmd; // Cmd is not used so far
-    CmdsHelp(CommandTable);
+int CmdLFSecurakey(const char *Cmd) {
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 5ea1d6a34..77b520215 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -230,7 +230,7 @@ static int usage_lf_deviceconfig() {
     return 0;
 }
 
-int CmdHelp(const char *Cmd);
+static int CmdHelp(const char *Cmd);
 
 void printT5xxHeader(uint8_t page) {
     PrintAndLogEx(NORMAL, "Reading Page %d:", page);
@@ -238,7 +238,7 @@ void printT5xxHeader(uint8_t page) {
     PrintAndLogEx(NORMAL, "----+----------+----------------------------------+-------");
 }
 
-int CmdT55xxSetConfig(const char *Cmd) {
+static int CmdT55xxSetConfig(const char *Cmd) {
 
     uint8_t offset = 0, bitRate = 0;
     char modulation[6] = {0x00};
@@ -381,7 +381,7 @@ int T55xxReadBlock(uint8_t block, bool page1, bool usepwd, bool override, uint32
     return 1;
 }
 
-int CmdT55xxReadBlock(const char *Cmd) {
+static int CmdT55xxReadBlock(const char *Cmd) {
     uint8_t block = REGULAR_READ_MODE_BLOCK;
     uint32_t password = 0; //default to blank Block 7
     bool usepwd = false;
@@ -506,7 +506,7 @@ static int SanityOfflineCheck(bool useGraphBuffer) {
     return 1;
 }
 
-int CmdT55xxDetect(const char *Cmd) {
+static int CmdT55xxDetect(const char *Cmd) {
     bool errors = false;
     bool useGB = false, usepwd = false;
     uint32_t password = 0;
@@ -991,7 +991,7 @@ int printConfiguration(t55xx_conf_block_t b) {
     return 0;
 }
 
-int CmdT55xxWakeUp(const char *Cmd) {
+static int CmdT55xxWakeUp(const char *Cmd) {
     uint32_t password = 0;
     uint8_t cmdp = 0;
     bool errors = false;
@@ -1019,7 +1019,7 @@ int CmdT55xxWakeUp(const char *Cmd) {
     return 0;
 }
 
-int CmdT55xxWriteBlock(const char *Cmd) {
+static int CmdT55xxWriteBlock(const char *Cmd) {
     uint8_t block = 0xFF; //default to invalid block
     uint32_t data = 0; //default to blank Block
     uint32_t password = 0; //default to blank Block 7
@@ -1093,7 +1093,7 @@ int CmdT55xxWriteBlock(const char *Cmd) {
     return 1;
 }
 
-int CmdT55xxReadTrace(const char *Cmd) {
+static int CmdT55xxReadTrace(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) > 1 || cmdp == 'h') return usage_t55xx_trace();
 
@@ -1333,7 +1333,7 @@ static void printT5x7KnownBlock0(uint32_t b0) {
         PrintAndLogEx(NORMAL, "\n Config block match        : " _YELLOW_("%s"), s);
 }
 
-int CmdT55xxInfo(const char *Cmd) {
+static int CmdT55xxInfo(const char *Cmd) {
     /*
         Page 0 Block 0 Configuration data.
         Normal mode
@@ -1471,7 +1471,7 @@ int CmdT55xxInfo(const char *Cmd) {
     return 0;
 }
 
-int CmdT55xxDump(const char *Cmd) {
+static int CmdT55xxDump(const char *Cmd) {
 
     uint32_t password = 0;
     bool override = false;
@@ -1761,7 +1761,7 @@ void t55x7_create_config_block(int tagtype) {
     PrintAndLogEx(NORMAL, buf);
 }
 
-int CmdResetRead(const char *Cmd) {
+static int CmdResetRead(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     UsbCommand c = {CMD_T55XX_RESET_READ, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
@@ -1780,7 +1780,7 @@ int CmdResetRead(const char *Cmd) {
     return 1;
 }
 
-int CmdT55xxWipe(const char *Cmd) {
+static int CmdT55xxWipe(const char *Cmd) {
     char writeData[20] = {0};
     char *ptrData = writeData;
     char cmdp = tolower(param_getchar(Cmd, 0));
@@ -1821,7 +1821,7 @@ bool IsCancelled(void) {
 }
 
 // load a default pwd file.
-int CmdT55xxChkPwds(const char *Cmd) {
+static int CmdT55xxChkPwds(const char *Cmd) {
 
     char filename[FILE_PATH_SIZE] = {0};
     bool found = false;
@@ -1943,7 +1943,7 @@ out:
 }
 
 // Bruteforce - incremental password range search
-int CmdT55xxBruteForce(const char *Cmd) {
+static int CmdT55xxBruteForce(const char *Cmd) {
 
     uint32_t start_password = 0x00000000; //start password
     uint32_t end_password   = 0xFFFFFFFF; //end   password
@@ -2009,7 +2009,7 @@ int tryOnePassword(uint32_t password) {
         return 0;
 }
 
-int CmdT55xxRecoverPW(const char *Cmd) {
+static int CmdT55xxRecoverPW(const char *Cmd) {
     int bit = 0;
     uint32_t orig_password = 0x0;
     uint32_t curr_password = 0x0;
@@ -2204,7 +2204,7 @@ bool tryDetectP1(bool getData) {
     return false;
 }
 //  does this need to be a callable command?
-int CmdT55xxDetectPage1(const char *Cmd) {
+static int CmdT55xxDetectPage1(const char *Cmd) {
     bool errors = false;
     bool useGB = false;
     bool usepwd = false;
@@ -2242,7 +2242,7 @@ int CmdT55xxDetectPage1(const char *Cmd) {
     return success;
 }
 
-int CmdT55xxSetDeviceConfig(const char *Cmd) {
+static int CmdT55xxSetDeviceConfig(const char *Cmd) {
     uint8_t startgap = 0, writegap = 0;
     uint8_t write0 = 0, write1 = 0, readgap = 0;
     bool errors = false, shall_persist = false;
@@ -2315,14 +2315,15 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
+static int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
+    CmdsHelp(CommandTable);
+    return 0;
+}
+
 int CmdLFT55XX(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
-    (void)Cmd; // Cmd is not used so far
-    CmdsHelp(CommandTable);
-    return 0;
-}
diff --git a/client/cmdlfti.c b/client/cmdlfti.c
index 3c4309266..d43f87e50 100644
--- a/client/cmdlfti.c
+++ b/client/cmdlfti.c
@@ -21,7 +21,7 @@
 
 static int CmdHelp(const char *Cmd);
 
-int CmdTIDemod(const char *Cmd) {
+static int CmdTIDemod(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     /* MATLAB as follows:
       f_s = 2000000;  % sampling frequency
@@ -273,7 +273,7 @@ out:
 }
 
 // read a TI tag and return its ID
-int CmdTIRead(const char *Cmd) {
+static int CmdTIRead(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     UsbCommand c = {CMD_READ_TI_TYPE};
     clearCommandBuffer();
@@ -282,7 +282,7 @@ int CmdTIRead(const char *Cmd) {
 }
 
 // write new data to a r/w TI tag
-int CmdTIWrite(const char *Cmd) {
+static int CmdTIWrite(const char *Cmd) {
     int res = 0;
     UsbCommand c = {CMD_WRITE_TI_TYPE};
     res = sscanf(Cmd, "%012" SCNx64 " %012" SCNx64 " %012" SCNx64 "", &c.arg[0], &c.arg[1], &c.arg[2]);
@@ -307,15 +307,15 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFTI(const char *Cmd) {
-    clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
+static int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
+    CmdsHelp(CommandTable);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
-    (void)Cmd; // Cmd is not used so far
-    CmdsHelp(CommandTable);
+int CmdLFTI(const char *Cmd) {
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
diff --git a/client/cmdlfviking.c b/client/cmdlfviking.c
index 48ed3148a..21c175afe 100644
--- a/client/cmdlfviking.c
+++ b/client/cmdlfviking.c
@@ -39,7 +39,7 @@ static int usage_lf_viking_sim(void) {
 
 //by marshmellow
 //see ASKDemod for what args are accepted
-int CmdVikingDemod(const char *Cmd) {
+static int CmdVikingDemod(const char *Cmd) {
     if (!ASKDemod(Cmd, false, false, 1)) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - Viking ASKDemod failed");
         return 0;
@@ -65,12 +65,12 @@ int CmdVikingDemod(const char *Cmd) {
 
 //by marshmellow
 //see ASKDemod for what args are accepted
-int CmdVikingRead(const char *Cmd) {
+static int CmdVikingRead(const char *Cmd) {
     lf_read(true, 10000);
     return CmdVikingDemod(Cmd);
 }
 
-int CmdVikingClone(const char *Cmd) {
+static int CmdVikingClone(const char *Cmd) {
     uint32_t id = 0;
     uint64_t rawID = 0;
     bool Q5 = false;
@@ -99,7 +99,7 @@ int CmdVikingClone(const char *Cmd) {
     return 0;
 }
 
-int CmdVikingSim(const char *Cmd) {
+static int CmdVikingSim(const char *Cmd) {
     uint32_t id = 0;
     uint64_t rawID = 0;
     uint8_t clk = 32, encoding = 1, separator = 0, invert = 0;
@@ -135,15 +135,15 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFViking(const char *Cmd) {
-    clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
+static int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
+    CmdsHelp(CommandTable);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
-    (void)Cmd; // Cmd is not used so far
-    CmdsHelp(CommandTable);
+int CmdLFViking(const char *Cmd) {
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
diff --git a/client/cmdlfvisa2000.c b/client/cmdlfvisa2000.c
index b808a1042..00882b732 100644
--- a/client/cmdlfvisa2000.c
+++ b/client/cmdlfvisa2000.c
@@ -81,7 +81,7 @@ static uint8_t visa_parity(uint32_t id) {
 *
 **/
 //see ASKDemod for what args are accepted
-int CmdVisa2kDemod(const char *Cmd) {
+static int CmdVisa2kDemod(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
 
     save_restoreGB(GRAPH_SAVE);
@@ -141,12 +141,12 @@ int CmdVisa2kDemod(const char *Cmd) {
 }
 
 // 64*96*2=12288 samples just in case we just missed the first preamble we can still catch 2 of them
-int CmdVisa2kRead(const char *Cmd) {
+static int CmdVisa2kRead(const char *Cmd) {
     lf_read(true, 20000);
     return CmdVisa2kDemod(Cmd);
 }
 
-int CmdVisa2kClone(const char *Cmd) {
+static int CmdVisa2kClone(const char *Cmd) {
 
     uint64_t id = 0;
     uint32_t blocks[4] = {T55x7_MODULATION_MANCHESTER | T55x7_BITRATE_RF_64 | T55x7_ST_TERMINATOR | 3 << T55x7_MAXBLOCK_SHIFT, BL0CK1, 0};
@@ -182,7 +182,7 @@ int CmdVisa2kClone(const char *Cmd) {
     return 0;
 }
 
-int CmdVisa2kSim(const char *Cmd) {
+static int CmdVisa2kSim(const char *Cmd) {
 
     uint32_t id = 0;
     char cmdp = param_getchar(Cmd, 0);
@@ -219,15 +219,15 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFVisa2k(const char *Cmd) {
-    clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
+static int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
+    CmdsHelp(CommandTable);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
-    (void)Cmd; // Cmd is not used so far
-    CmdsHelp(CommandTable);
+int CmdLFVisa2k(const char *Cmd) {
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
     return 0;
 }
 

From d8ab476022779528d27f9a0799ae53ed4def9dda Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 12 Apr 2019 10:20:53 +0200
Subject: [PATCH 1198/1938] fix: 'hf legic info' - unsegmented card now uses
 card size to calc remaining length.  Also made the output at bit more clear
 and colorful

---
 client/cmdhflegic.c | 118 +++++++++++++++++++++++++-------------------
 1 file changed, 67 insertions(+), 51 deletions(-)

diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index d4f1a4d3c..15cd6a9fe 100644
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -180,7 +180,7 @@ int CmdLegicInfo(const char *Cmd) {
         return 1;
     }
 
-    PrintAndLogEx(SUCCESS, "Reading tag memory %d b...", card.cardsize);
+    PrintAndLogEx(SUCCESS, "Reading full tag memory of %d bytes...", card.cardsize);
 
     // allocate receiver buffer
     uint8_t *data = calloc(card.cardsize, sizeof(uint8_t));
@@ -200,7 +200,7 @@ int CmdLegicInfo(const char *Cmd) {
     crc = data[4];
     uint32_t calc_crc =  CRC8Legic(data, 4);
 
-    PrintAndLogEx(NORMAL, "\nCDF: System Area");
+    PrintAndLogEx(NORMAL, _YELLOW_("CDF: System Area") );
     PrintAndLogEx(NORMAL, "------------------------------------------------------");
     PrintAndLogEx(NORMAL, "MCD: %02x, MSN: %02x %02x %02x, MCC: %02x %s",
                   data[0],
@@ -208,7 +208,7 @@ int CmdLegicInfo(const char *Cmd) {
                   data[2],
                   data[3],
                   data[4],
-                  (calc_crc == crc) ? "OK" : "Fail"
+                  (calc_crc == crc) ? _GREEN_("OK") : _RED_("Fail")
                  );
 
     // MCD = Manufacturer ID (should be list meaning something?)
@@ -271,7 +271,7 @@ int CmdLegicInfo(const char *Cmd) {
             strncpy(token_type, "IM", sizeof(token_type) - 1);
         }
 
-        PrintAndLogEx(NORMAL, "DCF: %d (%02x %02x), Token Type=%s (OLE=%01u)",
+        PrintAndLogEx(NORMAL, "DCF: %d (%02x %02x), Token Type = %s (OLE = %01u)",
                       dcf,
                       data[5],
                       data[6],
@@ -284,7 +284,7 @@ int CmdLegicInfo(const char *Cmd) {
     if (dcf != 0xFFFF) {
 
         if (bIsSegmented) {
-            PrintAndLogEx(NORMAL, "WRP=%02u, WRC=%01u, RD=%01u, SSC=%02x",
+            PrintAndLogEx(NORMAL, "WRP = %02u, WRC = %01u, RD = %01u, SSC = %02X",
                           data[7] & 0x0f,
                           (data[7] & 0x70) >> 4,
                           (data[7] & 0x80) >> 7,
@@ -303,7 +303,8 @@ int CmdLegicInfo(const char *Cmd) {
             }
         }
     }
-
+    PrintAndLogEx(NORMAL, "------------------------------------------------------");
+        
     uint8_t segCrcBytes[8] = {0, 0, 0, 0, 0, 0, 0, 0};
     uint32_t segCalcCRC = 0;
     uint32_t segCRC = 0;
@@ -312,7 +313,7 @@ int CmdLegicInfo(const char *Cmd) {
     if (dcf > 60000)
         goto out;
 
-    PrintAndLogEx(NORMAL, "\nADF: User Area");
+    PrintAndLogEx(NORMAL, _YELLOW_("\nADF: User Area") );
     PrintAndLogEx(NORMAL, "------------------------------------------------------");
 
     if (bIsSegmented) {
@@ -345,27 +346,31 @@ int CmdLegicInfo(const char *Cmd) {
             segCalcCRC = CRC8Legic(segCrcBytes, 8);
             segCRC = data[i + 4] ^ crc;
 
-            PrintAndLogEx(NORMAL, "Segment %02u \nraw header | 0x%02X 0x%02X 0x%02X 0x%02X \nSegment len: %u,  Flag: 0x%X (valid:%01u, last:%01u), WRP: %02u, WRC: %02u, RD: %01u, CRC: 0x%02X (%s)",
-                          segmentNum,
-                          data[i] ^ crc,
-                          data[i + 1] ^ crc,
-                          data[i + 2] ^ crc,
-                          data[i + 3] ^ crc,
-                          segment_len,
-                          segment_flag,
-                          (segment_flag & 0x4) >> 2,
-                          (segment_flag & 0x8) >> 3,
-                          wrp,
-                          wrc,
-                          ((data[i + 3]^crc) & 0x80) >> 7,
-                          segCRC,
-                          (segCRC == segCalcCRC) ? "OK" : "fail"
-                         );
+            PrintAndLogEx(NORMAL, "Segment     | %02u ", segmentNum);
+            PrintAndLogEx(NORMAL, "raw header  | 0x%02X 0x%02X 0x%02X 0x%02X",
+                    data[i] ^ crc,
+                    data[i + 1] ^ crc,
+                    data[i + 2] ^ crc,
+                    data[i + 3] ^ crc
+                    );
+            PrintAndLogEx(NORMAL, "Segment len | %u,  Flag: 0x%X (valid:%01u, last:%01u)",
+                    segment_len,
+                    segment_flag,
+                    (segment_flag & 0x4) >> 2,
+                    (segment_flag & 0x8) >> 3
+                    );
+            PrintAndLogEx(NORMAL, "            | WRP: %02u, WRC: %02u, RD: %01u, CRC: 0x%02X (%s)",
+                    wrp,
+                    wrc,
+                    ((data[i + 3] ^ crc) & 0x80) >> 7,
+                    segCRC,
+                    (segCRC == segCalcCRC) ? _GREEN_("OK") : _RED_("Fail")
+                    );
 
             i += 5;
 
             if (hasWRC) {
-                PrintAndLogEx(NORMAL, "WRC protected area:   (I %d | K %d| WRC %d)", i, k, wrc);
+                PrintAndLogEx(NORMAL, "\nWRC protected area:   (I %d | K %d| WRC %d)", i, k, wrc);
                 PrintAndLogEx(NORMAL, "\nrow  | data");
                 PrintAndLogEx(NORMAL, "-----+------------------------------------------------");
 
@@ -373,7 +378,7 @@ int CmdLegicInfo(const char *Cmd) {
                     data[k] ^= crc;
 
                 print_hex_break(data + i, wrc, 16);
-
+                PrintAndLogEx(NORMAL, "-----+------------------------------------------------\n");
                 i += wrc;
             }
 
@@ -386,27 +391,30 @@ int CmdLegicInfo(const char *Cmd) {
                     data[k] ^= crc;
 
                 print_hex_break(data + i, wrp_len, 16);
-
+                PrintAndLogEx(NORMAL, "-----+------------------------------------------------\n");
                 i += wrp_len;
 
                 // does this one work? (Answer: Only if KGH/BGH is used with BCD encoded card number! So maybe this will show just garbage...)
-                if (wrp_len == 8)
-                    PrintAndLogEx(NORMAL, "Card ID: %2X%02X%02X", data[i - 4]^crc, data[i - 3]^crc, data[i - 2]^crc);
+                if (wrp_len == 8) {
+                    PrintAndLogEx(NORMAL, "Card ID: " _YELLOW_("%2X%02X%02X"),
+                        data[i - 4] ^ crc,
+                        data[i - 3] ^ crc,
+                        data[i - 2] ^ crc
+                        );
+                }
             }
+            if (remain_seg_payload_len > 0 ) {
+                PrintAndLogEx(NORMAL, "Remaining segment payload:  (I %d | K %d | Remain LEN %d)", i, k, remain_seg_payload_len);
+                PrintAndLogEx(NORMAL, "\nrow  | data");
+                PrintAndLogEx(NORMAL, "-----+------------------------------------------------");
 
-            PrintAndLogEx(NORMAL, "Remaining segment payload:  (I %d | K %d | Remain LEN %d)", i, k, remain_seg_payload_len);
-            PrintAndLogEx(NORMAL, "\nrow  | data");
-            PrintAndLogEx(NORMAL, "-----+------------------------------------------------");
-
-            for (k = i; k < (i + remain_seg_payload_len); ++k)
-                data[k] ^= crc;
-
-            print_hex_break(data + i, remain_seg_payload_len, 16);
-
-            i += remain_seg_payload_len;
-
-            PrintAndLogEx(NORMAL, "-----+------------------------------------------------\n");
+                for (k = i; k < (i + remain_seg_payload_len); ++k)
+                    data[k] ^= crc;
 
+                print_hex_break(data + i, remain_seg_payload_len, 16);
+                PrintAndLogEx(NORMAL, "-----+------------------------------------------------\n");
+                i += remain_seg_payload_len;
+            }
             // end with last segment
             if (segment_flag & 0x8)
                 goto out;
@@ -424,7 +432,7 @@ int CmdLegicInfo(const char *Cmd) {
         bool hasWRC = (wrc > 0);
         bool hasWRP = (wrp > wrc);
         int wrp_len = (wrp - wrc);
-        int remain_seg_payload_len = (1024 - 22 - wrp); // Any chance to get physical card size here!?
+        int remain_seg_payload_len = (card.cardsize - 22 - wrp);
 
         PrintAndLogEx(NORMAL, "Unsegmented card - WRP: %02u, WRC: %02u, RD: %01u",
                       wrp,
@@ -437,6 +445,7 @@ int CmdLegicInfo(const char *Cmd) {
             PrintAndLogEx(NORMAL, "\nrow  | data");
             PrintAndLogEx(NORMAL, "-----+------------------------------------------------");
             print_hex_break(data + i, wrc, 16);
+            PrintAndLogEx(NORMAL, "-----+------------------------------------------------\n");            
             i += wrc;
         }
 
@@ -445,20 +454,27 @@ int CmdLegicInfo(const char *Cmd) {
             PrintAndLogEx(NORMAL, "\nrow  | data");
             PrintAndLogEx(NORMAL, "-----+------------------------------------------------");
             print_hex_break(data + i, wrp_len, 16);
+            PrintAndLogEx(NORMAL, "-----+------------------------------------------------\n");
             i += wrp_len;
 
-            // does this one work? (Answer: Only if KGH/BGH is used with BCD encoded card number! So maybe this will show just garbage...)
-            if (wrp_len == 8)
-                PrintAndLogEx(NORMAL, "Card ID: %2X%02X%02X", data[i - 4], data[i - 3], data[i - 2]);
+            // Q: does this one work?
+            // A: Only if KGH/BGH is used with BCD encoded card number. Maybe this will show just garbage
+            if (wrp_len == 8) {
+                PrintAndLogEx(NORMAL, "Card ID: " _YELLOW_("%2X%02X%02X"),
+                    data[i - 4],
+                    data[i - 3],
+                    data[i - 2]
+                    );
+            }
         }
 
-        PrintAndLogEx(NORMAL, "Remaining segment payload:  (I %d | Remain LEN %d)", i, remain_seg_payload_len);
-        PrintAndLogEx(NORMAL, "\nrow  | data");
-        PrintAndLogEx(NORMAL, "-----+------------------------------------------------");
-        print_hex_break(data + i, remain_seg_payload_len, 16);
-//        i += remain_seg_payload_len;
-
-        PrintAndLogEx(NORMAL, "-----+------------------------------------------------\n");
+        if ( i > 0 ) {
+            PrintAndLogEx(NORMAL, "Remaining segment payload:  (I %d | Remain LEN %d)", i, remain_seg_payload_len);
+            PrintAndLogEx(NORMAL, "\nrow  | data");
+            PrintAndLogEx(NORMAL, "-----+------------------------------------------------");
+            print_hex_break(data + i, remain_seg_payload_len, 16);
+            PrintAndLogEx(NORMAL, "-----+------------------------------------------------\n");            
+        }
     }
 
 out:

From e7f4f615c044fdf2859b9a6fc9b552bdcebee8a8 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 12 Apr 2019 10:55:09 +0200
Subject: [PATCH 1199/1938] unified text

---
 client/cmdhf14a.c            | 2 +-
 client/cmdhflegic.c          | 4 ++--
 client/cmdlfem4x.c           | 6 +++---
 client/cmdlffdx.c            | 4 ++--
 client/cmdlfhitag.c          | 8 ++++----
 client/cmdlfjablotron.c      | 2 +-
 client/cmdlfpyramid.c        | 2 +-
 client/cmdlfti.c             | 2 +-
 client/emv/emv_roca.c        | 4 ++--
 client/emv/test/cryptotest.c | 2 +-
 10 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index b5c13f4f2..1d4240fc7 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -649,7 +649,7 @@ int CmdHF14AInfo(const char *Cmd) {
         else if (res == 0)
             PrintAndLogEx(SUCCESS, "Prng detection: " _YELLOW_("HARD"));
         else
-            PrintAndLogEx(FAILED, "prng detection:  " _RED_("failed"));
+            PrintAndLogEx(FAILED, "prng detection:  " _RED_("Fail"));
 
         if (do_nack_test)
             detect_classic_nackbug(silent);
diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index 15cd6a9fe..9760b3e1a 100644
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -252,7 +252,7 @@ int CmdLegicInfo(const char *Cmd) {
             stamp_len = 0xfc - data[6];
         }
 
-        PrintAndLogEx(NORMAL, "DCF: %d (%02x %02x), Token Type=%s (OLE=%01u), OL=%02u, FL=%02u",
+        PrintAndLogEx(NORMAL, "DCF: %d (%02x %02x), Token Type=" _YELLOW_("%s") " (OLE=%01u), OL=%02u, FL=%02u",
                       dcf,
                       data[5],
                       data[6],
@@ -468,7 +468,7 @@ int CmdLegicInfo(const char *Cmd) {
             }
         }
 
-        if ( i > 0 ) {
+        if ( remain_seg_payload_len > 0 ) {
             PrintAndLogEx(NORMAL, "Remaining segment payload:  (I %d | Remain LEN %d)", i, remain_seg_payload_len);
             PrintAndLogEx(NORMAL, "\nrow  | data");
             PrintAndLogEx(NORMAL, "-----+------------------------------------------------");
diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 773fff29a..95ef6ca82 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -745,7 +745,7 @@ uint32_t OutputEM4x50_Block(uint8_t *BitStream, size_t size, bool verbose, bool
                          );
         }
 
-        PrintAndLogEx(SUCCESS, "Parity checks | %s", (pTest) ? _GREEN_("Passed") : _RED_("Failed"));
+        PrintAndLogEx(SUCCESS, "Parity checks | %s", (pTest) ? _GREEN_("Passed") : _RED_("Fail"));
     }
     return code;
 }
@@ -944,7 +944,7 @@ int EM4x50Read(const char *Cmd, bool verbose) {
             PrintAndLogEx(NORMAL, "Block %d: %08x", block, Code[block]);
         }
 
-        PrintAndLogEx(NORMAL, "Parities checks | %s", (AllPTest) ? _GREEN_("Passed") : _RED_("Failed"));
+        PrintAndLogEx(NORMAL, "Parities checks | %s", (AllPTest) ? _GREEN_("Passed") : _RED_("Fail"));
 
         if (AllPTest == 0) {
             PrintAndLogEx(NORMAL, "Try cleaning the read samples with " _YELLOW_("'data askedge'"));
@@ -1202,7 +1202,7 @@ static int CmdEM4x05Read(const char *Cmd) {
     if (isOk)
         PrintAndLogEx(NORMAL, "Address %02d | %08X - %s", addr, word, (addr > 13) ? "Lock" : "");
     else
-        PrintAndLogEx(NORMAL, "Read Address %02d | " _RED_("failed"), addr);
+        PrintAndLogEx(NORMAL, "Read Address %02d | " _RED_("Fail"), addr);
     return isOk;
 }
 
diff --git a/client/cmdlffdx.c b/client/cmdlffdx.c
index 510c38e4a..027f12895 100644
--- a/client/cmdlffdx.c
+++ b/client/cmdlffdx.c
@@ -157,7 +157,7 @@ static int CmdFDXBdemodBI(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "Reserved/RFU:      %u", reservedCode);
     PrintAndLogEx(SUCCESS, "Animal Tag:        %s", animalBit ? _YELLOW_("True") : "False");
     PrintAndLogEx(SUCCESS, "Has extended data: %s [0x%X]", dataBlockBit ? _YELLOW_("True") : "False", extended);
-    PrintAndLogEx(SUCCESS, "CRC:           0x%04X - [%04X] - %s", crc_16, calcCrc, (calcCrc == crc_16) ? _GREEN_("Passed") : "Failed");
+    PrintAndLogEx(SUCCESS, "CRC:           0x%04X - [%04X] - %s", crc_16, calcCrc, (calcCrc == crc_16) ? _GREEN_("Passed") : _RED_("Fail") );
 
     if (g_debugMode) {
         PrintAndLogEx(DEBUG, "Start marker %d;   Size %d", preambleIndex, size);
@@ -226,7 +226,7 @@ static int CmdFdxDemod(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "Reserved/RFU       %u (0x04%X)", reservedCode,  reservedCode);
     PrintAndLogEx(SUCCESS, "Animal Tag         %s", animalBit ? _YELLOW_("True") : "False");
     PrintAndLogEx(SUCCESS, "Has extended data  %s [0x%X]", dataBlockBit ? _YELLOW_("True") : "False", extended);
-    PrintAndLogEx(SUCCESS, "CRC-16             0x%04X - 0x%04X [%s]", crc_16, calcCrc, (calcCrc == crc_16) ? _GREEN_("Ok") : "Failed");
+    PrintAndLogEx(SUCCESS, "CRC-16             0x%04X - 0x%04X [%s]", crc_16, calcCrc, (calcCrc == crc_16) ? _GREEN_("Ok") : _RED_("Fail") );
 
     if (g_debugMode) {
         PrintAndLogEx(DEBUG, "Start marker %d;   Size %d", preambleIndex, size);
diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index 3212f4454..d8f029d05 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -414,7 +414,7 @@ static void printHitagConfiguration(uint8_t config) {
     if (config & 0x10) {
         strcat(msg + strlen(msg), "read only");
     } else  {
-        strcat(msg + strlen(msg), _GREEN_("read write"));
+        strcat(msg + strlen(msg), _GREEN_("RW"));
     }
     PrintAndLogEx(SUCCESS, "%s", msg);
     memset(msg, 0, sizeof(msg));
@@ -424,7 +424,7 @@ static void printHitagConfiguration(uint8_t config) {
     if (config & 0x20) {
         strcat(msg + strlen(msg), "read only");
     } else  {
-        strcat(msg + strlen(msg), _GREEN_("read write"));
+        strcat(msg + strlen(msg), _GREEN_("RW"));
     }
     PrintAndLogEx(SUCCESS, "%s", msg);
     memset(msg, 0, sizeof(msg));
@@ -434,7 +434,7 @@ static void printHitagConfiguration(uint8_t config) {
     if (config & 0x40) {
         strcat(msg + strlen(msg), "read only. Configuration byte and password tag " _RED_("FIXED / IRREVERSIBLE"));
     } else  {
-        strcat(msg + strlen(msg), _GREEN_("read write"));
+        strcat(msg + strlen(msg), _GREEN_("RW"));
     }
     PrintAndLogEx(SUCCESS, "%s", msg);
     memset(msg, 0, sizeof(msg));
@@ -450,7 +450,7 @@ static void printHitagConfiguration(uint8_t config) {
             strcat(msg + strlen(msg), "read only");
         }
     } else  {
-        strcat(msg, "Page 1,2    : " _GREEN_("read write"));
+        strcat(msg, "Page 1,2    : " _GREEN_("RW"));
     }
     PrintAndLogEx(SUCCESS, "%s", msg);
     PrintAndLogEx(INFO, "------------------------------------");
diff --git a/client/cmdlfjablotron.c b/client/cmdlfjablotron.c
index 420ab4d29..7a09c75ff 100644
--- a/client/cmdlfjablotron.c
+++ b/client/cmdlfjablotron.c
@@ -102,7 +102,7 @@ static int CmdJablotronDemod(const char *Cmd) {
     uint8_t chksum = raw2 & 0xFF;
     PrintAndLogEx(INFO, "Checksum: %02X [%s]",
                   chksum,
-                  (chksum == jablontron_chksum(DemodBuffer)) ? _GREEN_("OK") : _RED_("FAIL")
+                  (chksum == jablontron_chksum(DemodBuffer)) ? _GREEN_("OK") : _RED_("Fail")
                  );
 
     id = DEC2BCD(id);
diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c
index 135b35650..6f46700d6 100644
--- a/client/cmdlfpyramid.c
+++ b/client/cmdlfpyramid.c
@@ -182,7 +182,7 @@ static int CmdPyramidDemod(const char *Cmd) {
     PrintAndLogEx(DEBUG, "DEBUG: Pyramid: checksum : 0x%02X - %02X - %s"
                   , checksum
                   , checkCS
-                  , (checksum == checkCS) ? _GREEN_("Passed") : _RED_("Failed")
+                  , (checksum == checkCS) ? _GREEN_("Passed") : _RED_("Fail")
                  );
 
     PrintAndLogEx(DEBUG, "DEBUG: Pyramid: idx: %d, Len: %d, Printing Demod Buffer:", idx, 128);
diff --git a/client/cmdlfti.c b/client/cmdlfti.c
index d43f87e50..fc468dde0 100644
--- a/client/cmdlfti.c
+++ b/client/cmdlfti.c
@@ -252,7 +252,7 @@ static int CmdTIDemod(const char *Cmd) {
 
         //crc =  crc16_ccitt(message, sizeof(message);
 
-        const char *crcStr = (crc == (shift2 & 0xFFFF)) ? _GREEN_("Passed") : _RED_("Failed");
+        const char *crcStr = (crc == (shift2 & 0xFFFF)) ? _GREEN_("Passed") : _RED_("Fail");
 
         PrintAndLogEx(INFO, "Tag data = %08X%08X  [Crc %04X %s]", shift1, shift0, crc, crcStr);
 
diff --git a/client/emv/emv_roca.c b/client/emv/emv_roca.c
index c0d0d419d..df43db4ee 100644
--- a/client/emv/emv_roca.c
+++ b/client/emv/emv_roca.c
@@ -154,7 +154,7 @@ int roca_self_test(void) {
         PrintAndLogEx(SUCCESS, "Weak modulus [ %s]", _GREEN_("PASS"));
     } else {
         ret++;
-        PrintAndLogEx(FAILED, "Weak modulus [ %s]", _RED_("FAIL"));
+        PrintAndLogEx(FAILED, "Weak modulus [ %s]", _RED_("Fail"));
     }
 
     // negative
@@ -165,7 +165,7 @@ int roca_self_test(void) {
 
     if (emv_rocacheck(keyn, 64, false)) {
         ret++;
-        PrintAndLogEx(FAILED, "Strong modulus [ %s]", _RED_("FAIL"));
+        PrintAndLogEx(FAILED, "Strong modulus [ %s]", _RED_("Fail"));
     } else {
         PrintAndLogEx(SUCCESS, "Strong modulus [ %s]", _GREEN_("PASS"));
     }
diff --git a/client/emv/test/cryptotest.c b/client/emv/test/cryptotest.c
index 4bb49f039..29c4fdaa3 100644
--- a/client/emv/test/cryptotest.c
+++ b/client/emv/test/cryptotest.c
@@ -97,7 +97,7 @@ int ExecuteCryptoTests(bool verbose) {
     PrintAndLogEx(NORMAL, "\n--------------------------");
 
     if (TestFail)
-        PrintAndLogEx(FAILED, "\tTest(s) [ %s ]", _RED_("FAIL"));
+        PrintAndLogEx(FAILED, "\tTest(s) [ %s ]", _RED_("Fail"));
     else
         PrintAndLogEx(SUCCESS, "\tTest(s) [ %s ]", _GREEN_("OK"));
 

From 1cb2ae889ced71d009de0721bca901bb9a621efa Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 12 Apr 2019 13:43:36 +0200
Subject: [PATCH 1200/1938] Avoid Coverity BAD_COMPARE, but honestly I don't
 get it at all...

int readCOTAGUid(void) {
>>>     CID 337768:  Incorrect expression  (BAD_COMPARE)
>>>     This implicit conversion to a function pointer is suspicious: "CmdCOTAGRead > NULL".
130         return CmdCOTAGRead > 0;

This is just an int compared to zero, why it thinks it's a null pointer??
---
 client/cmdlfcotag.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdlfcotag.c b/client/cmdlfcotag.c
index 5ccdbfb68..eef243394 100644
--- a/client/cmdlfcotag.c
+++ b/client/cmdlfcotag.c
@@ -127,5 +127,5 @@ int demodCOTAG(void) {
 }
 
 int readCOTAGUid(void) {
-    return CmdCOTAGRead > 0;
+    return CmdCOTAGRead == 1;
 }

From 65305f361f156aef5b2950bf8ef6d431025ee2c7 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 12 Apr 2019 15:12:01 +0200
Subject: [PATCH 1201/1938] no comment :(

---
 client/cmdlfcotag.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdlfcotag.c b/client/cmdlfcotag.c
index eef243394..5709ae92f 100644
--- a/client/cmdlfcotag.c
+++ b/client/cmdlfcotag.c
@@ -127,5 +127,5 @@ int demodCOTAG(void) {
 }
 
 int readCOTAGUid(void) {
-    return CmdCOTAGRead == 1;
+    return CmdCOTAGRead("") > 0;
 }

From 05374fce0755130c898db9746248eb6b2aa6b0b7 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 12 Apr 2019 18:41:14 +0200
Subject: [PATCH 1202/1938] Rework Cmd exposed API, use more static and fix
 [-Wmissing-prototypes]

---
 client/cmdhf.c          |  26 +-
 client/cmdhf14a.c       | 624 +++++++++++++++--------------
 client/cmdhf14a.h       |  11 +-
 client/cmdhf14b.c       | 171 ++++----
 client/cmdhf14b.h       |  19 +-
 client/cmdhf15.c        | 864 ++++++++++++++++++++--------------------
 client/cmdhf15.h        |  18 +-
 client/cmdhfepa.c       |   6 +-
 client/cmdhfepa.h       |   2 -
 client/cmdhffelica.c    | 154 +++----
 client/cmdhffelica.h    |  12 +-
 client/cmdhffido.c      |  12 +-
 client/cmdhficlass.c    | 180 ++++-----
 client/cmdhficlass.h    |  25 +-
 client/cmdhflegic.c     |  71 ++--
 client/cmdhflegic.h     |  16 +-
 client/cmdhfmf.c        |  85 ++--
 client/cmdhfmf.h        |  36 +-
 client/cmdhfmfdes.c     |  45 +--
 client/cmdhfmfdes.h     |  13 +-
 client/cmdhfmfdesfire.c |  14 +-
 client/cmdhfmfdesfire.h |   2 -
 client/cmdhfmfp.c       |  33 +-
 client/cmdhfmfu.c       |  49 +--
 client/cmdhfmfu.h       |  17 -
 client/cmdhftopaz.c     |  22 +-
 client/cmdhftopaz.h     |   5 +-
 client/cmdlfnedap.c     |  22 +-
 client/emv/cmdemv.c     |  35 +-
 client/emv/cmdemv.h     |   8 -
 30 files changed, 1230 insertions(+), 1367 deletions(-)

diff --git a/client/cmdhf.c b/client/cmdhf.c
index 4c9579f1f..f984a3ff0 100644
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -43,36 +43,30 @@ int CmdHFSearch(const char *Cmd) {
 
     PrintAndLogEx(INFO, "Checking for known tags...\n");
 
-    int ans = CmdHF14AInfo("s");
-    if (ans > 0) {
+    if (infoHF14A(false, false) > 0) {
         PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("ISO14443-A tag") " found\n");
-        return ans;
+        return 1;
     }
-    ans = HF15Reader("", false);
-    if (ans) {
+    if (readHF15Uid(false) == 1) {
         PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("ISO15693 tag") " found\n");
-        return ans;
+        return 1;
     }
-    ans = HFLegicReader("", false);
-    if (ans == 0) {
+    if (readLegicUid(false) == 0) {
         PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("LEGIC tag") " found\n");
         return 1;
     }
-    ans = CmdHFTopazReader("s");
-    if (ans == 0) {
+    if (readTopazUid() == 0) {
         PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Topaz tag") " found\n");
         return 1;
     }
     // 14b and iclass is the longest test (put last)
-    ans = HF14BReader(false); //CmdHF14BReader("s");
-    if (ans) {
+    if (readHF14B(false) == 1) {
         PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("ISO14443-B tag") " found\n");
-        return ans;
+        return 1;
     }
-    ans = HFiClassReader("", false, false);
-    if (ans) {
+    if (readIclass(false, false) == 1) {
         PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("iClass tag / PicoPass tag") " found\n");
-        return ans;
+        return 1;
     }
 
     /*
diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 1d4240fc7..7e6fc3d0c 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -220,7 +220,7 @@ static int usage_hf_14a_info(void) {
     return 0;
 }
 
-int CmdHF14AList(const char *Cmd) {
+static int CmdHF14AList(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     //PrintAndLogEx(NORMAL, "Deprecated command, use 'hf list 14a' instead");
     CmdTraceList("14a");
@@ -266,7 +266,7 @@ int Hf14443_4aGetCardData(iso14a_card_select_t *card) {
     return 0;
 }
 
-int CmdHF14AReader(const char *Cmd) {
+static int CmdHF14AReader(const char *Cmd) {
 
     uint32_t cm = ISO14A_CONNECT;
     bool disconnectAfter = true, silent = false;
@@ -354,312 +354,18 @@ int CmdHF14AReader(const char *Cmd) {
     return 0;
 }
 
-int CmdHF14AInfo(const char *Cmd) {
+static int CmdHF14AInfo(const char *Cmd) {
 
     if (Cmd[0] == 'h' || Cmd[0] ==  'H') return usage_hf_14a_info();
 
-    bool silent = (Cmd[0] == 's' || Cmd[0] ==  'S');
+    bool verbose = !(Cmd[0] == 's' || Cmd[0] ==  'S');
     bool do_nack_test = (Cmd[0] == 'n' || Cmd[0] ==  'N');
-
-    UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}, {{0}}};
-    clearCommandBuffer();
-    SendCommand(&c);
-    UsbCommand resp;
-    if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
-        if (!silent) PrintAndLogEx(WARNING, "iso14443a card select failed");
-        DropField();
-        return 0;
-    }
-
-    iso14a_card_select_t card;
-    memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
-
-    /*
-        0: couldn't read
-        1: OK, with ATS
-        2: OK, no ATS
-        3: proprietary Anticollision
-    */
-    uint64_t select_status = resp.arg[0];
-
-    if (select_status == 0) {
-        if (!silent) PrintAndLogEx(WARNING, "iso14443a card select failed");
-        DropField();
-        return 0;
-    }
-
-    if (select_status == 3) {
-        PrintAndLogEx(NORMAL, "Card doesn't support standard iso14443-3 anticollision");
-        PrintAndLogEx(NORMAL, "ATQA : %02x %02x", card.atqa[1], card.atqa[0]);
-        DropField();
-        return select_status;
-    }
-
-    PrintAndLogEx(NORMAL, " UID : %s", sprint_hex(card.uid, card.uidlen));
-    PrintAndLogEx(NORMAL, "ATQA : %02x %02x", card.atqa[1], card.atqa[0]);
-    PrintAndLogEx(NORMAL, " SAK : %02x [%" PRIu64 "]", card.sak, resp.arg[0]);
-
-    bool isMifareClassic = true;
-    switch (card.sak) {
-        case 0x00:
-            isMifareClassic = false;
-
-            // ******** is card of the MFU type (UL/ULC/NTAG/ etc etc)
-            DropField();
-
-            uint32_t tagT = GetHF14AMfU_Type();
-            if (tagT != UL_ERROR)
-                ul_print_type(tagT, 0);
-            else
-                PrintAndLogEx(NORMAL, "TYPE: Possible AZTEK (iso14443a compliant)");
-
-            // reconnect for further tests
-            c.arg[0] = ISO14A_CONNECT | ISO14A_NO_DISCONNECT;
-            c.arg[1] = 0;
-            c.arg[2] = 0;
-            clearCommandBuffer();
-            SendCommand(&c);
-            WaitForResponse(CMD_ACK, &resp);
-
-            memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
-
-            select_status = resp.arg[0]; // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS
-
-            if (select_status == 0) {
-                DropField();
-                return 0;
-            }
-            break;
-        case 0x01:
-            PrintAndLogEx(NORMAL, "TYPE : NXP TNP3xxx Activision Game Appliance");
-            break;
-        case 0x04:
-            PrintAndLogEx(NORMAL, "TYPE : NXP MIFARE (various !DESFire !DESFire EV1)");
-            isMifareClassic = false;
-            break;
-        case 0x08:
-            PrintAndLogEx(NORMAL, "TYPE : NXP MIFARE CLASSIC 1k | Plus 2k SL1 | 1k Ev1");
-            break;
-        case 0x09:
-            PrintAndLogEx(NORMAL, "TYPE : NXP MIFARE Mini 0.3k");
-            break;
-        case 0x0A:
-            PrintAndLogEx(NORMAL, "TYPE : FM11RF005SH (Shanghai Metro)");
-            break;
-        case 0x10:
-            PrintAndLogEx(NORMAL, "TYPE : NXP MIFARE Plus 2k SL2");
-            break;
-        case 0x11:
-            PrintAndLogEx(NORMAL, "TYPE : NXP MIFARE Plus 4k SL2");
-            break;
-        case 0x18:
-            PrintAndLogEx(NORMAL, "TYPE : NXP MIFARE Classic 4k | Plus 4k SL1 | 4k Ev1");
-            break;
-        case 0x20:
-            PrintAndLogEx(NORMAL, "TYPE : NXP MIFARE DESFire 4k | DESFire EV1 2k/4k/8k | Plus 2k/4k SL3 | JCOP 31/41");
-            isMifareClassic = false;
-            break;
-        case 0x24:
-            PrintAndLogEx(NORMAL, "TYPE : NXP MIFARE DESFire | DESFire EV1");
-            isMifareClassic = false;
-            break;
-        case 0x28:
-            PrintAndLogEx(NORMAL, "TYPE : JCOP31 or JCOP41 v2.3.1");
-            break;
-        case 0x38:
-            PrintAndLogEx(NORMAL, "TYPE : Nokia 6212 or 6131 MIFARE CLASSIC 4K");
-            break;
-        case 0x88:
-            PrintAndLogEx(NORMAL, "TYPE : Infineon MIFARE CLASSIC 1K");
-            break;
-        case 0x98:
-            PrintAndLogEx(NORMAL, "TYPE : Gemplus MPCOS");
-            break;
-        default:
-            ;
-    }
-
-    // Double & triple sized UID, can be mapped to a manufacturer.
-    if (card.uidlen > 4) {
-        PrintAndLogEx(NORMAL, "MANUFACTURER : %s", getTagInfo(card.uid[0]));
-    }
-
-    // try to request ATS even if tag claims not to support it
-    if (select_status == 2) {
-        uint8_t rats[] = { 0xE0, 0x80 }; // FSDI=8 (FSD=256), CID=0
-        c.arg[0] = ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT;
-        c.arg[1] = 2;
-        c.arg[2] = 0;
-        memcpy(c.d.asBytes, rats, 2);
-        clearCommandBuffer();
-        SendCommand(&c);
-        WaitForResponse(CMD_ACK, &resp);
-
-        memcpy(card.ats, resp.d.asBytes, resp.arg[0]);
-        card.ats_len = resp.arg[0]; // note: ats_len includes CRC Bytes
-    }
-
-    if (card.ats_len >= 3) {        // a valid ATS consists of at least the length byte (TL) and 2 CRC bytes
-        bool ta1 = 0, tb1 = 0, tc1 = 0;
-        int pos;
-
-        if (select_status == 2) {
-            PrintAndLogEx(NORMAL, "SAK incorrectly claims that card doesn't support RATS");
-        }
-        PrintAndLogEx(NORMAL, " ATS : %s", sprint_hex(card.ats, card.ats_len));
-        PrintAndLogEx(NORMAL, "       -  TL : length is %d bytes", card.ats[0]);
-        if (card.ats[0] != card.ats_len - 2) {
-            PrintAndLogEx(NORMAL, "ATS may be corrupted. Length of ATS (%d bytes incl. 2 Bytes CRC) doesn't match TL", card.ats_len);
-        }
-
-        if (card.ats[0] > 1) { // there is a format byte (T0)
-            ta1 = (card.ats[1] & 0x10) == 0x10;
-            tb1 = (card.ats[1] & 0x20) == 0x20;
-            tc1 = (card.ats[1] & 0x40) == 0x40;
-            int16_t fsci = card.ats[1] & 0x0f;
-
-            PrintAndLogEx(NORMAL, "       -  T0 : TA1 is%s present, TB1 is%s present, "
-                          "TC1 is%s present, FSCI is %d (FSC = %ld)",
-                          (ta1 ? "" : " NOT"),
-                          (tb1 ? "" : " NOT"),
-                          (tc1 ? "" : " NOT"),
-                          fsci,
-                          fsci < sizeof(atsFSC) / sizeof(atsFSC[0]) ? atsFSC[fsci] : -1
-                         );
-        }
-        pos = 2;
-        if (ta1) {
-            char dr[16], ds[16];
-            dr[0] = ds[0] = '\0';
-            if (card.ats[pos] & 0x10) strcat(ds, "2, ");
-            if (card.ats[pos] & 0x20) strcat(ds, "4, ");
-            if (card.ats[pos] & 0x40) strcat(ds, "8, ");
-            if (card.ats[pos] & 0x01) strcat(dr, "2, ");
-            if (card.ats[pos] & 0x02) strcat(dr, "4, ");
-            if (card.ats[pos] & 0x04) strcat(dr, "8, ");
-            if (strlen(ds) != 0) ds[strlen(ds) - 2] = '\0';
-            if (strlen(dr) != 0) dr[strlen(dr) - 2] = '\0';
-            PrintAndLogEx(NORMAL, "       - TA1 : different divisors are%s supported, "
-                          "DR: [%s], DS: [%s]",
-                          ((card.ats[pos] & 0x80) ? " NOT" : ""),
-                          dr,
-                          ds
-                         );
-
-            pos++;
-        }
-        if (tb1) {
-            uint32_t sfgi = card.ats[pos] & 0x0F;
-            uint32_t fwi = card.ats[pos] >> 4;
-            PrintAndLogEx(NORMAL, "       - TB1 : SFGI = %d (SFGT = %s%ld/fc), FWI = %d (FWT = %ld/fc)",
-                          (sfgi),
-                          sfgi ? "" : "(not needed) ",
-                          sfgi ? (1 << 12) << sfgi : 0,
-                          fwi,
-                          (1 << 12) << fwi
-                         );
-            pos++;
-        }
-        if (tc1) {
-            PrintAndLogEx(NORMAL, "       - TC1 : NAD is%s supported, CID is%s supported",
-                          (card.ats[pos] & 0x01) ? "" : " NOT",
-                          (card.ats[pos] & 0x02) ? "" : " NOT");
-            pos++;
-        }
-        if (card.ats[0] > pos && card.ats[0] <  card.ats_len - 2) {
-            const char *tip = "";
-            if (card.ats[0] - pos >= 7) {
-                if (memcmp(card.ats + pos, "\xC1\x05\x2F\x2F\x01\xBC\xD6", 7) == 0) {
-                    tip = "-> MIFARE Plus X 2K or 4K";
-                } else if (memcmp(card.ats + pos, "\xC1\x05\x2F\x2F\x00\x35\xC7", 7) == 0) {
-                    tip = "-> MIFARE Plus S 2K or 4K";
-                }
-            }
-            PrintAndLogEx(NORMAL, "       -  HB : %s%s", sprint_hex(card.ats + pos, card.ats[0] - pos), tip);
-            if (card.ats[pos] == 0xC1) {
-                PrintAndLogEx(NORMAL, "               c1 -> Mifare or (multiple) virtual cards of various type");
-                PrintAndLogEx(NORMAL, "                  %02x -> Length is %d bytes", card.ats[pos + 1], card.ats[pos + 1]);
-                switch (card.ats[pos + 2] & 0xf0) {
-                    case 0x10:
-                        PrintAndLogEx(NORMAL, "                     1x -> MIFARE DESFire");
-                        break;
-                    case 0x20:
-                        PrintAndLogEx(NORMAL, "                     2x -> MIFARE Plus");
-                        break;
-                }
-                switch (card.ats[pos + 2] & 0x0f) {
-                    case 0x00:
-                        PrintAndLogEx(NORMAL, "                     x0 -> <1 kByte");
-                        break;
-                    case 0x01:
-                        PrintAndLogEx(NORMAL, "                     x1 -> 1 kByte");
-                        break;
-                    case 0x02:
-                        PrintAndLogEx(NORMAL, "                     x2 -> 2 kByte");
-                        break;
-                    case 0x03:
-                        PrintAndLogEx(NORMAL, "                     x3 -> 4 kByte");
-                        break;
-                    case 0x04:
-                        PrintAndLogEx(NORMAL, "                     x4 -> 8 kByte");
-                        break;
-                }
-                switch (card.ats[pos + 3] & 0xf0) {
-                    case 0x00:
-                        PrintAndLogEx(NORMAL, "                        0x -> Engineering sample");
-                        break;
-                    case 0x20:
-                        PrintAndLogEx(NORMAL, "                        2x -> Released");
-                        break;
-                }
-                switch (card.ats[pos + 3] & 0x0f) {
-                    case 0x00:
-                        PrintAndLogEx(NORMAL, "                        x0 -> Generation 1");
-                        break;
-                    case 0x01:
-                        PrintAndLogEx(NORMAL, "                        x1 -> Generation 2");
-                        break;
-                    case 0x02:
-                        PrintAndLogEx(NORMAL, "                        x2 -> Generation 3");
-                        break;
-                }
-                switch (card.ats[pos + 4] & 0x0f) {
-                    case 0x00:
-                        PrintAndLogEx(NORMAL, "                           x0 -> Only VCSL supported");
-                        break;
-                    case 0x01:
-                        PrintAndLogEx(NORMAL, "                           x1 -> VCS, VCSL, and SVC supported");
-                        break;
-                    case 0x0E:
-                        PrintAndLogEx(NORMAL, "                           xE -> no VCS command supported");
-                        break;
-                }
-            }
-        }
-    } else {
-        PrintAndLogEx(INFO, "proprietary non iso14443-4 card found, RATS not supported");
-    }
-
-    detect_classic_magic();
-
-    if (isMifareClassic) {
-        int res = detect_classic_prng();
-        if (res == 1)
-            PrintAndLogEx(SUCCESS, "Prng detection: " _GREEN_("WEAK"));
-        else if (res == 0)
-            PrintAndLogEx(SUCCESS, "Prng detection: " _YELLOW_("HARD"));
-        else
-            PrintAndLogEx(FAILED, "prng detection:  " _RED_("Fail"));
-
-        if (do_nack_test)
-            detect_classic_nackbug(silent);
-    }
-
-    return select_status;
+    infoHF14A(verbose, do_nack_test);
+    return 0;
 }
 
 // Collect ISO14443 Type A UIDs
-int CmdHF14ACUIDs(const char *Cmd) {
+static int CmdHF14ACUIDs(const char *Cmd) {
     // requested number of UIDs
     int n = atoi(Cmd);
     // collect at least 1 (e.g. if no parameter was given)
@@ -701,7 +407,6 @@ int CmdHF14ACUIDs(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "end: %" PRIu64 " seconds", (msclock() - t1) / 1000);
     return 1;
 }
-
 // ## simulate iso14443a tag
 int CmdHF14ASim(const char *Cmd) {
     bool errors = false;
@@ -981,7 +686,7 @@ int SelectCard14443_4(bool disconnect, iso14a_card_select_t *card) {
     return 0;
 }
 
-int CmdExchangeAPDU(bool chainingin, uint8_t *datain, int datainlen, bool activateField, uint8_t *dataout, int maxdataoutlen, int *dataoutlen, bool *chainingout) {
+static int CmdExchangeAPDU(bool chainingin, uint8_t *datain, int datainlen, bool activateField, uint8_t *dataout, int maxdataoutlen, int *dataoutlen, bool *chainingout) {
     *chainingout = false;
 
     if (activateField) {
@@ -1138,7 +843,7 @@ int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool lea
 }
 
 // ISO14443-4. 7. Half-duplex block transmission protocol
-int CmdHF14AAPDU(const char *Cmd) {
+static int CmdHF14AAPDU(const char *Cmd) {
     uint8_t data[USB_CMD_DATA_SIZE];
     int datalen = 0;
     bool activateField = false;
@@ -1185,7 +890,7 @@ int CmdHF14AAPDU(const char *Cmd) {
     return 0;
 }
 
-int CmdHF14ACmdRaw(const char *Cmd) {
+static int CmdHF14ACmdRaw(const char *Cmd) {
     UsbCommand c = {CMD_READER_ISO_14443a, {0, 0, 0}, {{0}}};
     bool reply = 1;
     bool crc = false;
@@ -1369,7 +1074,7 @@ static int waitCmd(uint8_t iSelect) {
     return 0;
 }
 
-int CmdHF14AAntiFuzz(const char *Cmd) {
+static int CmdHF14AAntiFuzz(const char *Cmd) {
 
     CLIParserInit("hf 14a antifuzz",
                   "Tries to fuzz the ISO14443a anticollision phase",
@@ -1398,7 +1103,7 @@ int CmdHF14AAntiFuzz(const char *Cmd) {
     return 0;
 }
 
-int CmdHF14AChaining(const char *Cmd) {
+static int CmdHF14AChaining(const char *Cmd) {
 
     CLIParserInit("hf 14a chaining",
                   "Enable/Disable ISO14443a input chaining. Maximum input length goes from ATS.",
@@ -1444,13 +1149,312 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
+static int CmdHelp(const char *Cmd) {
+    CmdsHelp(CommandTable);
+    return 0;
+}
+
 int CmdHF14A(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
-    CmdsHelp(CommandTable);
-    return 0;
+int infoHF14A(bool verbose, bool do_nack_test) {
+    UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}, {{0}}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    UsbCommand resp;
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
+        if (verbose) PrintAndLogEx(WARNING, "iso14443a card select failed");
+        DropField();
+        return 0;
+    }
+
+    iso14a_card_select_t card;
+    memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
+
+    /*
+        0: couldn't read
+        1: OK, with ATS
+        2: OK, no ATS
+        3: proprietary Anticollision
+    */
+    uint64_t select_status = resp.arg[0];
+
+    if (select_status == 0) {
+        if (verbose) PrintAndLogEx(WARNING, "iso14443a card select failed");
+        DropField();
+        return select_status;
+    }
+
+    if (select_status == 3) {
+        PrintAndLogEx(NORMAL, "Card doesn't support standard iso14443-3 anticollision");
+        PrintAndLogEx(NORMAL, "ATQA : %02x %02x", card.atqa[1], card.atqa[0]);
+        DropField();
+        return select_status;
+    }
+
+    PrintAndLogEx(NORMAL, " UID : %s", sprint_hex(card.uid, card.uidlen));
+    PrintAndLogEx(NORMAL, "ATQA : %02x %02x", card.atqa[1], card.atqa[0]);
+    PrintAndLogEx(NORMAL, " SAK : %02x [%" PRIu64 "]", card.sak, resp.arg[0]);
+
+    bool isMifareClassic = true;
+    switch (card.sak) {
+        case 0x00:
+            isMifareClassic = false;
+
+            // ******** is card of the MFU type (UL/ULC/NTAG/ etc etc)
+            DropField();
+
+            uint32_t tagT = GetHF14AMfU_Type();
+            if (tagT != UL_ERROR)
+                ul_print_type(tagT, 0);
+            else
+                PrintAndLogEx(NORMAL, "TYPE: Possible AZTEK (iso14443a compliant)");
+
+            // reconnect for further tests
+            c.arg[0] = ISO14A_CONNECT | ISO14A_NO_DISCONNECT;
+            c.arg[1] = 0;
+            c.arg[2] = 0;
+            clearCommandBuffer();
+            SendCommand(&c);
+            WaitForResponse(CMD_ACK, &resp);
+
+            memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
+
+            select_status = resp.arg[0]; // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS
+
+            if (select_status == 0) {
+                DropField();
+                return select_status;
+            }
+            break;
+        case 0x01:
+            PrintAndLogEx(NORMAL, "TYPE : NXP TNP3xxx Activision Game Appliance");
+            break;
+        case 0x04:
+            PrintAndLogEx(NORMAL, "TYPE : NXP MIFARE (various !DESFire !DESFire EV1)");
+            isMifareClassic = false;
+            break;
+        case 0x08:
+            PrintAndLogEx(NORMAL, "TYPE : NXP MIFARE CLASSIC 1k | Plus 2k SL1 | 1k Ev1");
+            break;
+        case 0x09:
+            PrintAndLogEx(NORMAL, "TYPE : NXP MIFARE Mini 0.3k");
+            break;
+        case 0x0A:
+            PrintAndLogEx(NORMAL, "TYPE : FM11RF005SH (Shanghai Metro)");
+            break;
+        case 0x10:
+            PrintAndLogEx(NORMAL, "TYPE : NXP MIFARE Plus 2k SL2");
+            break;
+        case 0x11:
+            PrintAndLogEx(NORMAL, "TYPE : NXP MIFARE Plus 4k SL2");
+            break;
+        case 0x18:
+            PrintAndLogEx(NORMAL, "TYPE : NXP MIFARE Classic 4k | Plus 4k SL1 | 4k Ev1");
+            break;
+        case 0x20:
+            PrintAndLogEx(NORMAL, "TYPE : NXP MIFARE DESFire 4k | DESFire EV1 2k/4k/8k | Plus 2k/4k SL3 | JCOP 31/41");
+            isMifareClassic = false;
+            break;
+        case 0x24:
+            PrintAndLogEx(NORMAL, "TYPE : NXP MIFARE DESFire | DESFire EV1");
+            isMifareClassic = false;
+            break;
+        case 0x28:
+            PrintAndLogEx(NORMAL, "TYPE : JCOP31 or JCOP41 v2.3.1");
+            break;
+        case 0x38:
+            PrintAndLogEx(NORMAL, "TYPE : Nokia 6212 or 6131 MIFARE CLASSIC 4K");
+            break;
+        case 0x88:
+            PrintAndLogEx(NORMAL, "TYPE : Infineon MIFARE CLASSIC 1K");
+            break;
+        case 0x98:
+            PrintAndLogEx(NORMAL, "TYPE : Gemplus MPCOS");
+            break;
+        default:
+            ;
+    }
+
+    // Double & triple sized UID, can be mapped to a manufacturer.
+    if (card.uidlen > 4) {
+        PrintAndLogEx(NORMAL, "MANUFACTURER : %s", getTagInfo(card.uid[0]));
+    }
+
+    // try to request ATS even if tag claims not to support it
+    if (select_status == 2) {
+        uint8_t rats[] = { 0xE0, 0x80 }; // FSDI=8 (FSD=256), CID=0
+        c.arg[0] = ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT;
+        c.arg[1] = 2;
+        c.arg[2] = 0;
+        memcpy(c.d.asBytes, rats, 2);
+        clearCommandBuffer();
+        SendCommand(&c);
+        WaitForResponse(CMD_ACK, &resp);
+
+        memcpy(card.ats, resp.d.asBytes, resp.arg[0]);
+        card.ats_len = resp.arg[0]; // note: ats_len includes CRC Bytes
+    }
+
+    if (card.ats_len >= 3) {        // a valid ATS consists of at least the length byte (TL) and 2 CRC bytes
+        bool ta1 = 0, tb1 = 0, tc1 = 0;
+        int pos;
+
+        if (select_status == 2) {
+            PrintAndLogEx(NORMAL, "SAK incorrectly claims that card doesn't support RATS");
+        }
+        PrintAndLogEx(NORMAL, " ATS : %s", sprint_hex(card.ats, card.ats_len));
+        PrintAndLogEx(NORMAL, "       -  TL : length is %d bytes", card.ats[0]);
+        if (card.ats[0] != card.ats_len - 2) {
+            PrintAndLogEx(NORMAL, "ATS may be corrupted. Length of ATS (%d bytes incl. 2 Bytes CRC) doesn't match TL", card.ats_len);
+        }
+
+        if (card.ats[0] > 1) { // there is a format byte (T0)
+            ta1 = (card.ats[1] & 0x10) == 0x10;
+            tb1 = (card.ats[1] & 0x20) == 0x20;
+            tc1 = (card.ats[1] & 0x40) == 0x40;
+            int16_t fsci = card.ats[1] & 0x0f;
+
+            PrintAndLogEx(NORMAL, "       -  T0 : TA1 is%s present, TB1 is%s present, "
+                          "TC1 is%s present, FSCI is %d (FSC = %ld)",
+                          (ta1 ? "" : " NOT"),
+                          (tb1 ? "" : " NOT"),
+                          (tc1 ? "" : " NOT"),
+                          fsci,
+                          fsci < sizeof(atsFSC) / sizeof(atsFSC[0]) ? atsFSC[fsci] : -1
+                         );
+        }
+        pos = 2;
+        if (ta1) {
+            char dr[16], ds[16];
+            dr[0] = ds[0] = '\0';
+            if (card.ats[pos] & 0x10) strcat(ds, "2, ");
+            if (card.ats[pos] & 0x20) strcat(ds, "4, ");
+            if (card.ats[pos] & 0x40) strcat(ds, "8, ");
+            if (card.ats[pos] & 0x01) strcat(dr, "2, ");
+            if (card.ats[pos] & 0x02) strcat(dr, "4, ");
+            if (card.ats[pos] & 0x04) strcat(dr, "8, ");
+            if (strlen(ds) != 0) ds[strlen(ds) - 2] = '\0';
+            if (strlen(dr) != 0) dr[strlen(dr) - 2] = '\0';
+            PrintAndLogEx(NORMAL, "       - TA1 : different divisors are%s supported, "
+                          "DR: [%s], DS: [%s]",
+                          ((card.ats[pos] & 0x80) ? " NOT" : ""),
+                          dr,
+                          ds
+                         );
+
+            pos++;
+        }
+        if (tb1) {
+            uint32_t sfgi = card.ats[pos] & 0x0F;
+            uint32_t fwi = card.ats[pos] >> 4;
+            PrintAndLogEx(NORMAL, "       - TB1 : SFGI = %d (SFGT = %s%ld/fc), FWI = %d (FWT = %ld/fc)",
+                          (sfgi),
+                          sfgi ? "" : "(not needed) ",
+                          sfgi ? (1 << 12) << sfgi : 0,
+                          fwi,
+                          (1 << 12) << fwi
+                         );
+            pos++;
+        }
+        if (tc1) {
+            PrintAndLogEx(NORMAL, "       - TC1 : NAD is%s supported, CID is%s supported",
+                          (card.ats[pos] & 0x01) ? "" : " NOT",
+                          (card.ats[pos] & 0x02) ? "" : " NOT");
+            pos++;
+        }
+        if (card.ats[0] > pos && card.ats[0] <  card.ats_len - 2) {
+            const char *tip = "";
+            if (card.ats[0] - pos >= 7) {
+                if (memcmp(card.ats + pos, "\xC1\x05\x2F\x2F\x01\xBC\xD6", 7) == 0) {
+                    tip = "-> MIFARE Plus X 2K or 4K";
+                } else if (memcmp(card.ats + pos, "\xC1\x05\x2F\x2F\x00\x35\xC7", 7) == 0) {
+                    tip = "-> MIFARE Plus S 2K or 4K";
+                }
+            }
+            PrintAndLogEx(NORMAL, "       -  HB : %s%s", sprint_hex(card.ats + pos, card.ats[0] - pos), tip);
+            if (card.ats[pos] == 0xC1) {
+                PrintAndLogEx(NORMAL, "               c1 -> Mifare or (multiple) virtual cards of various type");
+                PrintAndLogEx(NORMAL, "                  %02x -> Length is %d bytes", card.ats[pos + 1], card.ats[pos + 1]);
+                switch (card.ats[pos + 2] & 0xf0) {
+                    case 0x10:
+                        PrintAndLogEx(NORMAL, "                     1x -> MIFARE DESFire");
+                        break;
+                    case 0x20:
+                        PrintAndLogEx(NORMAL, "                     2x -> MIFARE Plus");
+                        break;
+                }
+                switch (card.ats[pos + 2] & 0x0f) {
+                    case 0x00:
+                        PrintAndLogEx(NORMAL, "                     x0 -> <1 kByte");
+                        break;
+                    case 0x01:
+                        PrintAndLogEx(NORMAL, "                     x1 -> 1 kByte");
+                        break;
+                    case 0x02:
+                        PrintAndLogEx(NORMAL, "                     x2 -> 2 kByte");
+                        break;
+                    case 0x03:
+                        PrintAndLogEx(NORMAL, "                     x3 -> 4 kByte");
+                        break;
+                    case 0x04:
+                        PrintAndLogEx(NORMAL, "                     x4 -> 8 kByte");
+                        break;
+                }
+                switch (card.ats[pos + 3] & 0xf0) {
+                    case 0x00:
+                        PrintAndLogEx(NORMAL, "                        0x -> Engineering sample");
+                        break;
+                    case 0x20:
+                        PrintAndLogEx(NORMAL, "                        2x -> Released");
+                        break;
+                }
+                switch (card.ats[pos + 3] & 0x0f) {
+                    case 0x00:
+                        PrintAndLogEx(NORMAL, "                        x0 -> Generation 1");
+                        break;
+                    case 0x01:
+                        PrintAndLogEx(NORMAL, "                        x1 -> Generation 2");
+                        break;
+                    case 0x02:
+                        PrintAndLogEx(NORMAL, "                        x2 -> Generation 3");
+                        break;
+                }
+                switch (card.ats[pos + 4] & 0x0f) {
+                    case 0x00:
+                        PrintAndLogEx(NORMAL, "                           x0 -> Only VCSL supported");
+                        break;
+                    case 0x01:
+                        PrintAndLogEx(NORMAL, "                           x1 -> VCS, VCSL, and SVC supported");
+                        break;
+                    case 0x0E:
+                        PrintAndLogEx(NORMAL, "                           xE -> no VCS command supported");
+                        break;
+                }
+            }
+        }
+    } else {
+        PrintAndLogEx(INFO, "proprietary non iso14443-4 card found, RATS not supported");
+    }
+
+    detect_classic_magic();
+
+    if (isMifareClassic) {
+        int res = detect_classic_prng();
+        if (res == 1)
+            PrintAndLogEx(SUCCESS, "Prng detection: " _GREEN_("WEAK"));
+        else if (res == 0)
+            PrintAndLogEx(SUCCESS, "Prng detection: " _YELLOW_("HARD"));
+        else
+            PrintAndLogEx(FAILED, "prng detection:  " _RED_("Fail"));
+
+        if (do_nack_test)
+            detect_classic_nackbug(!verbose);
+    }
+
+    return select_status;
 }
+
diff --git a/client/cmdhf14a.h b/client/cmdhf14a.h
index ad0860bf1..d5626d995 100644
--- a/client/cmdhf14a.h
+++ b/client/cmdhf14a.h
@@ -39,15 +39,10 @@ typedef struct {
 } manufactureName;
 
 int CmdHF14A(const char *Cmd);
-int CmdHF14AList(const char *Cmd);
-int CmdHF14AReader(const char *Cmd);
-int CmdHF14AInfo(const char *Cmd);
-int CmdHF14ASim(const char *Cmd);
-int CmdHF14ASniff(const char *Cmd);
-int CmdHF14ACmdRaw(const char *Cmd);
-int CmdHF14ACUIDs(const char *Cmd);
-int CmdHF14AAntiFuzz(const char *Cmd);
+int CmdHF14ASniff(const char *Cmd); // used by hf topaz sniff
+int CmdHF14ASim(const char *Cmd);   // used by hf mfu sim
 
+int infoHF14A(bool verbose, bool do_nack_test);
 const char *getTagInfo(uint8_t uid);
 int Hf14443_4aGetCardData(iso14a_card_select_t *card);
 int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen);
diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c
index 222d7efdc..4813433c9 100644
--- a/client/cmdhf14b.c
+++ b/client/cmdhf14b.c
@@ -121,13 +121,52 @@ static int switch_off_field_14b(void) {
     return 0;
 }
 
-int CmdHF14BList(const char *Cmd) {
+static bool waitCmd14b(bool verbose) {
+
+    bool crc = false;
+    uint8_t data[USB_CMD_DATA_SIZE] = {0x00};
+    uint8_t status = 0;
+    uint16_t len = 0;
+    UsbCommand resp;
+
+    if (WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
+
+        status = (resp.arg[0] & 0xFF);
+        if (status > 0) return false;
+
+        len = (resp.arg[1] & 0xFFFF);
+
+        memcpy(data, resp.d.asBytes, len);
+
+        if (verbose) {
+            if (len >= 3) {
+                crc = check_crc(CRC_14443_B, data, len);
+
+                PrintAndLogEx(NORMAL, "[LEN %u] %s[%02X %02X] %s",
+                              len,
+                              sprint_hex(data, len - 2),
+                              data[len - 2],
+                              data[len - 1],
+                              (crc) ? "OK" : "FAIL"
+                             );
+            } else {
+                PrintAndLogEx(NORMAL, "[LEN %u] %s", len, sprint_hex(data, len));
+            }
+        }
+        return true;
+    } else {
+        PrintAndLogEx(WARNING, "command execution timeout");
+        return false;
+    }
+}
+
+static int CmdHF14BList(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     CmdTraceList("14b");
     return 0;
 }
 
-int CmdHF14BSim(const char *Cmd) {
+static int CmdHF14BSim(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_hf_14b_sim();
 
@@ -142,7 +181,7 @@ int CmdHF14BSim(const char *Cmd) {
     return 0;
 }
 
-int CmdHF14BSniff(const char *Cmd) {
+static int CmdHF14BSniff(const char *Cmd) {
 
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_hf_14b_sniff();
@@ -153,7 +192,7 @@ int CmdHF14BSniff(const char *Cmd) {
     return 0;
 }
 
-int CmdHF14BCmdRaw(const char *Cmd) {
+static int CmdHF14BCmdRaw(const char *Cmd) {
     bool reply = true, power = false, select = false, hasTimeout = false;
     char buf[5] = "";
     int i = 0;
@@ -557,28 +596,13 @@ bool HF14B_ST_Info(bool verbose) {
     return true;
 }
 
-// get and print all info known about any known 14b tag
-bool HF14BInfo(bool verbose) {
-
-    // try std 14b (atqb)
-    if (HF14B_Std_Info(verbose)) return true;
-
-    // try ST 14b
-    if (HF14B_ST_Info(verbose)) return true;
-
-    // try unknown 14b read commands (to be identified later)
-    //   could be read of calypso, CEPAS, moneo, or pico pass.
-    if (verbose) PrintAndLogEx(FAILED, "no 14443-B tag found");
-    return false;
-}
-
 // menu command to get and print all info known about any known 14b tag
-int CmdHF14Binfo(const char *Cmd) {
+static int CmdHF14Binfo(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_hf_14b_info();
 
     bool verbose = !(cmdp == 's');
-    return HF14BInfo(verbose);
+    return infoHF14B(verbose);
 }
 
 bool HF14B_ST_Reader(bool verbose) {
@@ -721,37 +745,20 @@ bool HF14B_Other_Reader() {
     return false;
 }
 
-// get and print general info about all known 14b chips
-bool HF14BReader(bool verbose) {
-
-    // try std 14b (atqb)
-    if (HF14B_Std_Reader(verbose)) return true;
-
-    // try ST Microelectronics 14b
-    if (HF14B_ST_Reader(verbose)) return true;
-
-    // try unknown 14b read commands (to be identified later)
-    // could be read of calypso, CEPAS, moneo, or pico pass.
-    if (HF14B_Other_Reader()) return true;
-
-    if (verbose) PrintAndLogEx(FAILED, "no 14443-B tag found");
-    return false;
-}
-
 // menu command to get and print general info about all known 14b chips
-int CmdHF14BReader(const char *Cmd) {
+static int CmdHF14BReader(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_hf_14b_reader();
 
     bool verbose = !(cmdp == 's');
-    return HF14BReader(verbose);
+    return readHF14B(verbose);
 }
 
 /* New command to read the contents of a SRI512|SRIX4K tag
  * SRI* tags are ISO14443-B modulated memory tags,
  * this command just dumps the contents of the memory/
  */
-int CmdHF14BReadSri(const char *Cmd) {
+static int CmdHF14BReadSri(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) < 1 || cmdp == 'h') return usage_hf_14b_read_srx();
 
@@ -764,7 +771,7 @@ int CmdHF14BReadSri(const char *Cmd) {
     return 0;
 }
 // New command to write a SRI512/SRIX4K tag.
-int CmdHF14BWriteSri(const char *Cmd) {
+static int CmdHF14BWriteSri(const char *Cmd) {
     /*
      * For SRIX4K  blocks 00 - 7F
      * hf 14b raw -c -p 09 $srix4kwblock $srix4kwdata
@@ -831,7 +838,7 @@ int CmdHF14BWriteSri(const char *Cmd) {
 }
 
 // need to write to file
-int CmdHF14BDump(const char *Cmd) {
+static int CmdHF14BDump(const char *Cmd) {
 
     uint8_t fileNameLen = 0;
     char filename[FILE_PATH_SIZE] = {0};
@@ -1091,45 +1098,6 @@ int srix4kValid(const char *Cmd) {
     return 0;
 }
 
-bool waitCmd14b(bool verbose) {
-
-    bool crc = false;
-    uint8_t data[USB_CMD_DATA_SIZE] = {0x00};
-    uint8_t status = 0;
-    uint16_t len = 0;
-    UsbCommand resp;
-
-    if (WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
-
-        status = (resp.arg[0] & 0xFF);
-        if (status > 0) return false;
-
-        len = (resp.arg[1] & 0xFFFF);
-
-        memcpy(data, resp.d.asBytes, len);
-
-        if (verbose) {
-            if (len >= 3) {
-                crc = check_crc(CRC_14443_B, data, len);
-
-                PrintAndLogEx(NORMAL, "[LEN %u] %s[%02X %02X] %s",
-                              len,
-                              sprint_hex(data, len - 2),
-                              data[len - 2],
-                              data[len - 1],
-                              (crc) ? "OK" : "FAIL"
-                             );
-            } else {
-                PrintAndLogEx(NORMAL, "[LEN %u] %s", len, sprint_hex(data, len));
-            }
-        }
-        return true;
-    } else {
-        PrintAndLogEx(WARNING, "command execution timeout");
-        return false;
-    }
-}
-
 static command_t CommandTable[] = {
     {"help",        CmdHelp,        1, "This help"},
     {"dump",        CmdHF14BDump,   0, "Read all memory pages of an ISO14443-B tag, save to file"},
@@ -1145,14 +1113,47 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
+static int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
+    CmdsHelp(CommandTable);
+    return 0;
+}
+
 int CmdHF14B(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
-    (void)Cmd; // Cmd is not used so far
-    CmdsHelp(CommandTable);
+// get and print all info known about any known 14b tag
+int infoHF14B(bool verbose) {
+
+    // try std 14b (atqb)
+    if (HF14B_Std_Info(verbose)) return 1;
+
+    // try ST 14b
+    if (HF14B_ST_Info(verbose)) return 1;
+
+    // try unknown 14b read commands (to be identified later)
+    //   could be read of calypso, CEPAS, moneo, or pico pass.
+    if (verbose) PrintAndLogEx(FAILED, "no 14443-B tag found");
     return 0;
 }
+
+// get and print general info about all known 14b chips
+int readHF14B(bool verbose) {
+
+    // try std 14b (atqb)
+    if (HF14B_Std_Reader(verbose)) return 1;
+
+    // try ST Microelectronics 14b
+    if (HF14B_ST_Reader(verbose)) return 1;
+
+    // try unknown 14b read commands (to be identified later)
+    // could be read of calypso, CEPAS, moneo, or pico pass.
+    if (HF14B_Other_Reader()) return 1;
+
+    if (verbose) PrintAndLogEx(FAILED, "no 14443-B tag found");
+    return 0;
+}
+
diff --git a/client/cmdhf14b.h b/client/cmdhf14b.h
index 675e7d947..2180e2088 100644
--- a/client/cmdhf14b.h
+++ b/client/cmdhf14b.h
@@ -30,22 +30,7 @@
 #include "protocols.h"  // definitions of ISO14B protocol
 
 int CmdHF14B(const char *Cmd);
-int CmdHF14BList(const char *Cmd);
-int CmdHF14BInfo(const char *Cmd);
-int CmdHF14BSim(const char *Cmd);
-int CmdHF14BSniff(const char *Cmd);
-int CmdHF14BWrite(const char *cmd);
-int CmdHF14BReader(const char *Cmd);
 
-int CmdHF14BDump(const char *Cmd);
-
-bool HF14BInfo(bool verbose);
-bool HF14BReader(bool verbose);
-int CmdHF14BCmdRaw(const char *Cmd);
-
-// SRi  ST Microelectronics read/write
-int CmdHF14BReadSri(const char *Cmd);
-int CmdHF14BWriteSri(const char *Cmd);
-
-bool waitCmd14b(bool verbose);
+int infoHF14B(bool verbose);
+int readHF14B(bool verbose);
 #endif
diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index baddb6893..e28c43984 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -284,6 +284,8 @@ static const char *TagErrorStr(uint8_t error) {
     }
 }
 
+static int CmdHF15Help(const char *Cmd);
+
 static int usage_15_demod(void) {
     PrintAndLogEx(NORMAL, "Tries to demodulate / decode ISO15693, from downloaded samples.\n"
                   "Gather samples with 'hf 15 read' / 'hf 15 record'");
@@ -410,9 +412,88 @@ static int usage_15_readmulti(void) {
                   "\tcount#:       number of pages");
     return 0;
 }
+
+/**
+ * parses common HF 15 CMD parameters and prepares some data structures
+ * Parameters:
+ *  **cmd   command line
+ */
+static int prepareHF15Cmd(char **cmd, UsbCommand *c, uint8_t iso15cmd) {
+    int temp;
+    uint8_t *req = c->d.asBytes;
+    uint8_t uid[8] = {0x00};
+    uint32_t reqlen = 0;
+
+    // strip
+    while (**cmd == ' ' || **cmd == '\t')(*cmd)++;
+
+    if (strstr(*cmd, "-2") == *cmd) {
+        c->arg[1] = 0; // use 1of256
+        (*cmd) += 2;
+    }
+
+    // strip
+    while (**cmd == ' ' || **cmd == '\t')(*cmd)++;
+
+    if (strstr(*cmd, "-o") == *cmd) {
+        req[reqlen] = ISO15_REQ_OPTION;
+        (*cmd) += 2;
+    }
+
+    // strip
+    while (**cmd == ' ' || **cmd == '\t')(*cmd)++;
+
+    switch (**cmd) {
+        case 0:
+            PrintAndLogEx(WARNING, "missing addr");
+            return 0;
+            break;
+        case 'u':
+        case 'U':
+            // unaddressed mode may not be supported by all vendors
+            req[reqlen++] |= ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | ISO15_REQ_NONINVENTORY;
+            req[reqlen++] = iso15cmd;
+            break;
+        case '*':
+            // we scan for the UID ourself
+            req[reqlen++] |= ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | ISO15_REQ_NONINVENTORY | ISO15_REQ_ADDRESS;
+            req[reqlen++] = iso15cmd;
+
+            if (!getUID(uid)) {
+                PrintAndLogEx(WARNING, "No tag found");
+                return 0;
+            }
+            memcpy(&req[reqlen], uid, sizeof(uid));
+            PrintAndLogEx(NORMAL, "Detected UID %s", sprintUID(NULL, uid));
+            reqlen += sizeof(uid);
+            break;
+        default:
+            req[reqlen++] |= ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | ISO15_REQ_NONINVENTORY | ISO15_REQ_ADDRESS;
+            req[reqlen++] = iso15cmd;
+
+            // parse UID
+            for (int i = 0; i < 8 && (*cmd)[i * 2] && (*cmd)[i * 2 + 1]; i++) {
+                sscanf((char[]) {(*cmd)[i * 2], (*cmd)[i * 2 + 1], 0}, "%X", &temp);
+                uid[7 - i] = temp & 0xff;
+            }
+
+            PrintAndLogEx(NORMAL, "Using UID %s", sprintUID(NULL, uid));
+            memcpy(&req[reqlen], uid, sizeof(uid));
+            reqlen +=  sizeof(uid);
+            break;
+    }
+    // skip to next space
+    while (**cmd != ' ' && **cmd != '\t')(*cmd)++;
+    // skip over the space
+    while (**cmd == ' ' || **cmd == '\t')(*cmd)++;
+
+    c->arg[0] = reqlen;
+    return 1;
+}
+
 // Mode 3
 //helptext
-int CmdHF15Demod(const char *Cmd) {
+static int CmdHF15Demod(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_15_demod();
 
@@ -492,7 +573,7 @@ int CmdHF15Demod(const char *Cmd) {
 
 // * Acquire Samples as Reader (enables carrier, sends inquiry)
 //helptext
-int CmdHF15Samples(const char *Cmd) {
+static int CmdHF15Samples(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_15_samples();
 
@@ -508,7 +589,7 @@ int CmdHF15Samples(const char *Cmd) {
  * Commandline handling: HF15 CMD SYSINFO
  * get system information from tag/VICC
  */
-int CmdHF15Info(const char *Cmd) {
+static int CmdHF15Info(const char *Cmd) {
 
     char cmdp = param_getchar(Cmd, 0);
     if (strlen(Cmd) < 1 || cmdp == 'h' || cmdp == 'H') return usage_15_info();
@@ -589,7 +670,7 @@ int CmdHF15Info(const char *Cmd) {
 
 // Record Activity without enabeling carrier
 //helptext
-int CmdHF15Record(const char *Cmd) {
+static int CmdHF15Record(const char *Cmd) {
     char cmdp =  tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_15_record();
 
@@ -599,31 +680,17 @@ int CmdHF15Record(const char *Cmd) {
     return 0;
 }
 
-// used with 'hf search'
-int HF15Reader(const char *Cmd, bool verbose) {
-    (void)Cmd; // Cmd is not used so far
-    uint8_t uid[8] = {0, 0, 0, 0, 0, 0, 0, 0};
-    if (!getUID(uid)) {
-        if (verbose) PrintAndLogEx(WARNING, "No tag found.");
-        return 0;
-    }
-
-    PrintAndLogEx(NORMAL, " UID  : %s", sprintUID(NULL, uid));
-    PrintAndLogEx(NORMAL, " TYPE : %s", getTagInfo_15(uid));
-    return 1;
-}
-
-int CmdHF15Reader(const char *Cmd) {
+static int CmdHF15Reader(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_15_reader();
 
-    HF15Reader(Cmd, true);
+    readHF15Uid(true);
     return 0;
 }
 
 // Simulation is still not working very good
 // helptext
-int CmdHF15Sim(const char *Cmd) {
+static int CmdHF15Sim(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) < 1 || cmdp == 'h') return usage_15_sim();
 
@@ -645,7 +712,7 @@ int CmdHF15Sim(const char *Cmd) {
 // finds the AFI (Application Family Idendifier) of a card, by trying all values
 // (There is no standard way of reading the AFI, allthough some tags support this)
 // helptext
-int CmdHF15Afi(const char *Cmd) {
+static int CmdHF15Afi(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_15_findafi();
 
@@ -664,7 +731,7 @@ typedef struct {
 
 // Reads all memory pages
 // need to write to file
-int CmdHF15Dump(const char *Cmd) {
+static int CmdHF15Dump(const char *Cmd) {
 
     uint8_t fileNameLen = 0;
     char filename[FILE_PATH_SIZE] = {0};
@@ -780,7 +847,332 @@ int CmdHF15Dump(const char *Cmd) {
     return 0;
 }
 
-int CmdHF15Restore(const char *Cmd) {
+static int CmdHF15List(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
+    //PrintAndLogEx(WARNING, "Deprecated command, use 'hf list 15' instead");
+    CmdTraceList("15");
+    return 0;
+}
+
+static int CmdHF15Raw(const char *Cmd) {
+
+    char cmdp = param_getchar(Cmd, 0);
+    if (strlen(Cmd) < 3 || cmdp == 'h' || cmdp == 'H') return usage_15_raw();
+
+    UsbCommand resp;
+    UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}}; // len,speed,recv?
+    int reply = 1, fast = 1, i = 0;
+    bool crc = false;
+    char buf[5] = "";
+    uint8_t data[100];
+    uint32_t datalen = 0, temp;
+
+    // strip
+    while (*Cmd == ' ' || *Cmd == '\t') Cmd++;
+
+    while (Cmd[i] != '\0') {
+        if (Cmd[i] == ' ' || Cmd[i] == '\t') { i++; continue; }
+        if (Cmd[i] == '-') {
+            switch (Cmd[i + 1]) {
+                case 'r':
+                case 'R':
+                    reply = 0;
+                    break;
+                case '2':
+                    fast = 0;
+                    break;
+                case 'c':
+                case 'C':
+                    crc = true;
+                    break;
+                default:
+                    PrintAndLogEx(WARNING, "Invalid option");
+                    return 0;
+            }
+            i += 2;
+            continue;
+        }
+        if ((Cmd[i] >= '0' && Cmd[i] <= '9') ||
+                (Cmd[i] >= 'a' && Cmd[i] <= 'f') ||
+                (Cmd[i] >= 'A' && Cmd[i] <= 'F')) {
+            buf[strlen(buf) + 1] = 0;
+            buf[strlen(buf)] = Cmd[i];
+            i++;
+
+            if (strlen(buf) >= 2) {
+                sscanf(buf, "%x", &temp);
+                data[datalen] = (uint8_t)(temp & 0xff);
+                datalen++;
+                *buf = 0;
+            }
+            continue;
+        }
+        PrintAndLogEx(WARNING, "Invalid char on input");
+        return 0;
+    }
+
+    if (crc) {
+        AddCrc15(data, datalen);
+        datalen += 2;
+    }
+
+    c.arg[0] = datalen;
+    c.arg[1] = fast;
+    c.arg[2] = reply;
+    memcpy(c.d.asBytes, data, datalen);
+
+    clearCommandBuffer();
+    SendCommand(&c);
+
+    if (reply) {
+        if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
+            uint8_t len = resp.arg[0];
+            PrintAndLogEx(NORMAL, "received %i octets", len);
+            PrintAndLogEx(NORMAL, "%s", sprint_hex(resp.d.asBytes, len));
+        } else {
+            PrintAndLogEx(WARNING, "timeout while waiting for reply.");
+        }
+    }
+    return 0;
+}
+
+/**
+ * Commandline handling: HF15 CMD READMULTI
+ * Read multiple blocks at once (not all tags support this)
+ */
+static int CmdHF15Readmulti(const char *Cmd) {
+
+    char cmdp = param_getchar(Cmd, 0);
+    if (strlen(Cmd) < 3 || cmdp == 'h' || cmdp == 'H') return usage_15_readmulti();
+
+    UsbCommand resp;
+    uint8_t *recv;
+    UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}}; // len,speed,recv?
+    uint8_t *req = c.d.asBytes;
+    int reqlen = 0;
+    uint8_t pagenum, pagecount;
+    char cmdbuf[100] = {0};
+    char *cmd = cmdbuf;
+    strncpy(cmd, Cmd, sizeof(cmdbuf) - 1);
+
+    if (!prepareHF15Cmd(&cmd, &c, ISO15_CMD_READMULTI))
+        return 0;
+
+    // add OPTION flag, in order to get lock-info
+    req[0] |= ISO15_REQ_OPTION;
+
+    reqlen = c.arg[0];
+
+    // decimal
+    pagenum = param_get8ex(cmd, 0, 0, 10);
+    pagecount = param_get8ex(cmd, 1, 0, 10);
+
+    //PrintAndLogEx(NORMAL, "ice %d %d\n", pagenum, pagecount);
+
+    // 0 means 1 page,
+    // 1 means 2 pages, ...
+    if (pagecount > 0) pagecount--;
+
+    req[reqlen++] = pagenum;
+    req[reqlen++] = pagecount;
+    AddCrc15(req, reqlen);
+    c.arg[0] = reqlen + 2;
+
+    clearCommandBuffer();
+    SendCommand(&c);
+
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
+        PrintAndLogEx(FAILED, "iso15693 card select failed");
+        return 1;
+    }
+
+    uint32_t status = resp.arg[0];
+    if (status < 2) {
+        PrintAndLogEx(FAILED, "iso15693 card select failed");
+        return 1;
+    }
+
+    recv = resp.d.asBytes;
+
+    if (!CheckCrc15(recv, status)) {
+        PrintAndLogEx(FAILED, "CRC failed");
+        return 2;
+    }
+
+    if (recv[0] & ISO15_RES_ERROR) {
+        PrintAndLogEx(FAILED, "iso15693 card returned error %i: %s", recv[0], TagErrorStr(recv[0]));
+        return 3;
+    }
+
+    int start = 1;  // skip status byte
+    int stop = (pagecount + 1) * 5;
+    int currblock = pagenum;
+    // print response
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "block#   | data         |lck| ascii");
+    PrintAndLogEx(NORMAL, "---------+--------------+---+----------");
+    for (int i = start; i < stop; i += 5) {
+        PrintAndLogEx(NORMAL, "%3d/0x%02X | %s | %d | %s", currblock, currblock, sprint_hex(recv + i + 1, 4), recv[i], sprint_ascii(recv + i + 1, 4));
+        currblock++;
+    }
+
+    return 0;
+}
+
+/**
+ * Commandline handling: HF15 CMD READ
+ * Reads a single Block
+ */
+static int CmdHF15Read(const char *Cmd) {
+
+    char cmdp = param_getchar(Cmd, 0);
+    if (strlen(Cmd) < 3 || cmdp == 'h' || cmdp == 'H')  return usage_15_read();
+
+    UsbCommand resp;
+    uint8_t *recv;
+
+    // UsbCommand arg: len, speed, recv?
+    // arg0 (datalen,  cmd len?  .arg0 == crc?)
+    // arg1 (speed == 0 == 1 of 256,  == 1 == 1 of 4 )
+    // arg2 (recv == 1 == expect a response)
+    UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}};
+    uint8_t *req = c.d.asBytes;
+    int reqlen = 0, blocknum;
+    char cmdbuf[100] = {0};
+    char *cmd = cmdbuf;
+    strncpy(cmd, Cmd, sizeof(cmdbuf) - 1);
+
+    if (!prepareHF15Cmd(&cmd, &c, ISO15_CMD_READ))
+        return 0;
+
+    // add OPTION flag, in order to get lock-info
+    req[0] |= ISO15_REQ_OPTION;
+
+    reqlen = c.arg[0];
+
+    blocknum = strtol(cmd, NULL, 0);
+
+    req[reqlen++] = (uint8_t)blocknum;
+
+    AddCrc15(req, reqlen);
+
+    c.arg[0] = reqlen + 2;
+
+    clearCommandBuffer();
+    SendCommand(&c);
+
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
+        PrintAndLogEx(NORMAL, "iso15693 card select failed");
+        return 1;
+    }
+
+    uint32_t status = resp.arg[0];
+    if (status < 2) {
+        PrintAndLogEx(NORMAL, "iso15693 card select failed");
+        return 1;
+    }
+
+    recv = resp.d.asBytes;
+
+    if (!CheckCrc15(recv, status)) {
+        PrintAndLogEx(NORMAL, "CRC failed");
+        return 2;
+    }
+
+    if (recv[0] & ISO15_RES_ERROR) {
+        PrintAndLogEx(WARNING, "iso15693 card returned error %i: %s", recv[0], TagErrorStr(recv[0]));
+        return 3;
+    }
+
+    // print response
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "block #%3d  |lck| ascii", blocknum);
+    PrintAndLogEx(NORMAL, "------------+---+------");
+    PrintAndLogEx(NORMAL, "%s| %d | %s", sprint_hex(recv + 2, status - 4), recv[1], sprint_ascii(recv + 2, status - 4));
+    PrintAndLogEx(NORMAL, "");
+    return 0;
+}
+
+/**
+ * Commandline handling: HF15 CMD WRITE
+ * Writes a single Block - might run into timeout, even when successful
+ */
+static int CmdHF15Write(const char *Cmd) {
+
+    char cmdp = param_getchar(Cmd, 0);
+    if (strlen(Cmd) < 3 || cmdp == 'h' || cmdp == 'H') return usage_15_write();
+
+    UsbCommand resp;
+    uint8_t *recv;
+    UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}}; // len,speed,recv?
+    uint8_t *req = c.d.asBytes;
+    int reqlen = 0, pagenum, temp;
+    char cmdbuf[100] = {0};
+    char *cmd = cmdbuf;
+    char *cmd2;
+
+    strncpy(cmd, Cmd, sizeof(cmdbuf) - 1);
+
+    if (!prepareHF15Cmd(&cmd, &c, ISO15_CMD_WRITE))
+        return 0;
+
+    reqlen = c.arg[0];
+
+    // *cmd -> page num ; *cmd2 -> data
+    cmd2 = cmd;
+    while (*cmd2 != ' ' && *cmd2 != '\t' && *cmd2) cmd2++;
+    *cmd2 = 0;
+    cmd2++;
+
+    pagenum = strtol(cmd, NULL, 0);
+
+    req[reqlen++] = (uint8_t)pagenum;
+
+    while (cmd2[0] && cmd2[1]) { // hexdata, read by 2 hexchars
+        if (*cmd2 == ' ') {
+            cmd2++;
+            continue;
+        }
+        sscanf((char[]) {cmd2[0], cmd2[1], 0}, "%X", &temp);
+        req[reqlen++] = temp & 0xff;
+        cmd2 += 2;
+    }
+    AddCrc15(req, reqlen);
+    c.arg[0] = reqlen + 2;
+
+    PrintAndLogEx(NORMAL, "iso15693 writing to page %02d (0x%02X) | data ", pagenum, pagenum);
+
+    clearCommandBuffer();
+    SendCommand(&c);
+
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
+        PrintAndLogEx(FAILED, "iso15693 card timeout, data may be written anyway");
+        return 1;
+    }
+
+    uint32_t status = resp.arg[0];
+    if (status < 2) {
+        PrintAndLogEx(FAILED, "iso15693 card select failed");
+        return 1;
+    }
+
+    recv = resp.d.asBytes;
+
+    if (!CheckCrc15(recv, status)) {
+        PrintAndLogEx(FAILED, "CRC failed");
+        return 2;
+    }
+
+    if (recv[0] & ISO15_RES_ERROR) {
+        PrintAndLogEx(NORMAL, "iso15693 card returned error %i: %s", recv[0], TagErrorStr(recv[0]));
+        return 3;
+    }
+
+    PrintAndLogEx(NORMAL, "OK");
+    return 0;
+}
+
+static int CmdHF15Restore(const char *Cmd) {
     FILE *f;
 
     uint8_t uid[8] = {0x00};
@@ -901,409 +1293,6 @@ int CmdHF15Restore(const char *Cmd) {
     return 0;
 }
 
-int CmdHF15List(const char *Cmd) {
-    (void)Cmd; // Cmd is not used so far
-    //PrintAndLogEx(WARNING, "Deprecated command, use 'hf list 15' instead");
-    CmdTraceList("15");
-    return 0;
-}
-
-int CmdHF15Raw(const char *Cmd) {
-
-    char cmdp = param_getchar(Cmd, 0);
-    if (strlen(Cmd) < 3 || cmdp == 'h' || cmdp == 'H') return usage_15_raw();
-
-    UsbCommand resp;
-    UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}}; // len,speed,recv?
-    int reply = 1, fast = 1, i = 0;
-    bool crc = false;
-    char buf[5] = "";
-    uint8_t data[100];
-    uint32_t datalen = 0, temp;
-
-    // strip
-    while (*Cmd == ' ' || *Cmd == '\t') Cmd++;
-
-    while (Cmd[i] != '\0') {
-        if (Cmd[i] == ' ' || Cmd[i] == '\t') { i++; continue; }
-        if (Cmd[i] == '-') {
-            switch (Cmd[i + 1]) {
-                case 'r':
-                case 'R':
-                    reply = 0;
-                    break;
-                case '2':
-                    fast = 0;
-                    break;
-                case 'c':
-                case 'C':
-                    crc = true;
-                    break;
-                default:
-                    PrintAndLogEx(WARNING, "Invalid option");
-                    return 0;
-            }
-            i += 2;
-            continue;
-        }
-        if ((Cmd[i] >= '0' && Cmd[i] <= '9') ||
-                (Cmd[i] >= 'a' && Cmd[i] <= 'f') ||
-                (Cmd[i] >= 'A' && Cmd[i] <= 'F')) {
-            buf[strlen(buf) + 1] = 0;
-            buf[strlen(buf)] = Cmd[i];
-            i++;
-
-            if (strlen(buf) >= 2) {
-                sscanf(buf, "%x", &temp);
-                data[datalen] = (uint8_t)(temp & 0xff);
-                datalen++;
-                *buf = 0;
-            }
-            continue;
-        }
-        PrintAndLogEx(WARNING, "Invalid char on input");
-        return 0;
-    }
-
-    if (crc) {
-        AddCrc15(data, datalen);
-        datalen += 2;
-    }
-
-    c.arg[0] = datalen;
-    c.arg[1] = fast;
-    c.arg[2] = reply;
-    memcpy(c.d.asBytes, data, datalen);
-
-    clearCommandBuffer();
-    SendCommand(&c);
-
-    if (reply) {
-        if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
-            uint8_t len = resp.arg[0];
-            PrintAndLogEx(NORMAL, "received %i octets", len);
-            PrintAndLogEx(NORMAL, "%s", sprint_hex(resp.d.asBytes, len));
-        } else {
-            PrintAndLogEx(WARNING, "timeout while waiting for reply.");
-        }
-    }
-    return 0;
-}
-
-/**
- * parses common HF 15 CMD parameters and prepares some data structures
- * Parameters:
- *  **cmd   command line
- */
-int prepareHF15Cmd(char **cmd, UsbCommand *c, uint8_t iso15cmd) {
-    int temp;
-    uint8_t *req = c->d.asBytes;
-    uint8_t uid[8] = {0x00};
-    uint32_t reqlen = 0;
-
-    // strip
-    while (**cmd == ' ' || **cmd == '\t')(*cmd)++;
-
-    if (strstr(*cmd, "-2") == *cmd) {
-        c->arg[1] = 0; // use 1of256
-        (*cmd) += 2;
-    }
-
-    // strip
-    while (**cmd == ' ' || **cmd == '\t')(*cmd)++;
-
-    if (strstr(*cmd, "-o") == *cmd) {
-        req[reqlen] = ISO15_REQ_OPTION;
-        (*cmd) += 2;
-    }
-
-    // strip
-    while (**cmd == ' ' || **cmd == '\t')(*cmd)++;
-
-    switch (**cmd) {
-        case 0:
-            PrintAndLogEx(WARNING, "missing addr");
-            return 0;
-            break;
-        case 'u':
-        case 'U':
-            // unaddressed mode may not be supported by all vendors
-            req[reqlen++] |= ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | ISO15_REQ_NONINVENTORY;
-            req[reqlen++] = iso15cmd;
-            break;
-        case '*':
-            // we scan for the UID ourself
-            req[reqlen++] |= ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | ISO15_REQ_NONINVENTORY | ISO15_REQ_ADDRESS;
-            req[reqlen++] = iso15cmd;
-
-            if (!getUID(uid)) {
-                PrintAndLogEx(WARNING, "No tag found");
-                return 0;
-            }
-            memcpy(&req[reqlen], uid, sizeof(uid));
-            PrintAndLogEx(NORMAL, "Detected UID %s", sprintUID(NULL, uid));
-            reqlen += sizeof(uid);
-            break;
-        default:
-            req[reqlen++] |= ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | ISO15_REQ_NONINVENTORY | ISO15_REQ_ADDRESS;
-            req[reqlen++] = iso15cmd;
-
-            // parse UID
-            for (int i = 0; i < 8 && (*cmd)[i * 2] && (*cmd)[i * 2 + 1]; i++) {
-                sscanf((char[]) {(*cmd)[i * 2], (*cmd)[i * 2 + 1], 0}, "%X", &temp);
-                uid[7 - i] = temp & 0xff;
-            }
-
-            PrintAndLogEx(NORMAL, "Using UID %s", sprintUID(NULL, uid));
-            memcpy(&req[reqlen], uid, sizeof(uid));
-            reqlen +=  sizeof(uid);
-            break;
-    }
-    // skip to next space
-    while (**cmd != ' ' && **cmd != '\t')(*cmd)++;
-    // skip over the space
-    while (**cmd == ' ' || **cmd == '\t')(*cmd)++;
-
-    c->arg[0] = reqlen;
-    return 1;
-}
-
-/**
- * Commandline handling: HF15 CMD READMULTI
- * Read multiple blocks at once (not all tags support this)
- */
-int CmdHF15Readmulti(const char *Cmd) {
-
-    char cmdp = param_getchar(Cmd, 0);
-    if (strlen(Cmd) < 3 || cmdp == 'h' || cmdp == 'H') return usage_15_readmulti();
-
-    UsbCommand resp;
-    uint8_t *recv;
-    UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}}; // len,speed,recv?
-    uint8_t *req = c.d.asBytes;
-    int reqlen = 0;
-    uint8_t pagenum, pagecount;
-    char cmdbuf[100] = {0};
-    char *cmd = cmdbuf;
-    strncpy(cmd, Cmd, sizeof(cmdbuf) - 1);
-
-    if (!prepareHF15Cmd(&cmd, &c, ISO15_CMD_READMULTI))
-        return 0;
-
-    // add OPTION flag, in order to get lock-info
-    req[0] |= ISO15_REQ_OPTION;
-
-    reqlen = c.arg[0];
-
-    // decimal
-    pagenum = param_get8ex(cmd, 0, 0, 10);
-    pagecount = param_get8ex(cmd, 1, 0, 10);
-
-    //PrintAndLogEx(NORMAL, "ice %d %d\n", pagenum, pagecount);
-
-    // 0 means 1 page,
-    // 1 means 2 pages, ...
-    if (pagecount > 0) pagecount--;
-
-    req[reqlen++] = pagenum;
-    req[reqlen++] = pagecount;
-    AddCrc15(req, reqlen);
-    c.arg[0] = reqlen + 2;
-
-    clearCommandBuffer();
-    SendCommand(&c);
-
-    if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
-        PrintAndLogEx(FAILED, "iso15693 card select failed");
-        return 1;
-    }
-
-    uint32_t status = resp.arg[0];
-    if (status < 2) {
-        PrintAndLogEx(FAILED, "iso15693 card select failed");
-        return 1;
-    }
-
-    recv = resp.d.asBytes;
-
-    if (!CheckCrc15(recv, status)) {
-        PrintAndLogEx(FAILED, "CRC failed");
-        return 2;
-    }
-
-    if (recv[0] & ISO15_RES_ERROR) {
-        PrintAndLogEx(FAILED, "iso15693 card returned error %i: %s", recv[0], TagErrorStr(recv[0]));
-        return 3;
-    }
-
-    int start = 1;  // skip status byte
-    int stop = (pagecount + 1) * 5;
-    int currblock = pagenum;
-    // print response
-    PrintAndLogEx(NORMAL, "");
-    PrintAndLogEx(NORMAL, "block#   | data         |lck| ascii");
-    PrintAndLogEx(NORMAL, "---------+--------------+---+----------");
-    for (int i = start; i < stop; i += 5) {
-        PrintAndLogEx(NORMAL, "%3d/0x%02X | %s | %d | %s", currblock, currblock, sprint_hex(recv + i + 1, 4), recv[i], sprint_ascii(recv + i + 1, 4));
-        currblock++;
-    }
-
-    return 0;
-}
-
-/**
- * Commandline handling: HF15 CMD READ
- * Reads a single Block
- */
-int CmdHF15Read(const char *Cmd) {
-
-    char cmdp = param_getchar(Cmd, 0);
-    if (strlen(Cmd) < 3 || cmdp == 'h' || cmdp == 'H')  return usage_15_read();
-
-    UsbCommand resp;
-    uint8_t *recv;
-
-    // UsbCommand arg: len, speed, recv?
-    // arg0 (datalen,  cmd len?  .arg0 == crc?)
-    // arg1 (speed == 0 == 1 of 256,  == 1 == 1 of 4 )
-    // arg2 (recv == 1 == expect a response)
-    UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}};
-    uint8_t *req = c.d.asBytes;
-    int reqlen = 0, blocknum;
-    char cmdbuf[100] = {0};
-    char *cmd = cmdbuf;
-    strncpy(cmd, Cmd, sizeof(cmdbuf) - 1);
-
-    if (!prepareHF15Cmd(&cmd, &c, ISO15_CMD_READ))
-        return 0;
-
-    // add OPTION flag, in order to get lock-info
-    req[0] |= ISO15_REQ_OPTION;
-
-    reqlen = c.arg[0];
-
-    blocknum = strtol(cmd, NULL, 0);
-
-    req[reqlen++] = (uint8_t)blocknum;
-
-    AddCrc15(req, reqlen);
-
-    c.arg[0] = reqlen + 2;
-
-    clearCommandBuffer();
-    SendCommand(&c);
-
-    if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
-        PrintAndLogEx(NORMAL, "iso15693 card select failed");
-        return 1;
-    }
-
-    uint32_t status = resp.arg[0];
-    if (status < 2) {
-        PrintAndLogEx(NORMAL, "iso15693 card select failed");
-        return 1;
-    }
-
-    recv = resp.d.asBytes;
-
-    if (!CheckCrc15(recv, status)) {
-        PrintAndLogEx(NORMAL, "CRC failed");
-        return 2;
-    }
-
-    if (recv[0] & ISO15_RES_ERROR) {
-        PrintAndLogEx(WARNING, "iso15693 card returned error %i: %s", recv[0], TagErrorStr(recv[0]));
-        return 3;
-    }
-
-    // print response
-    PrintAndLogEx(NORMAL, "");
-    PrintAndLogEx(NORMAL, "block #%3d  |lck| ascii", blocknum);
-    PrintAndLogEx(NORMAL, "------------+---+------");
-    PrintAndLogEx(NORMAL, "%s| %d | %s", sprint_hex(recv + 2, status - 4), recv[1], sprint_ascii(recv + 2, status - 4));
-    PrintAndLogEx(NORMAL, "");
-    return 0;
-}
-
-/**
- * Commandline handling: HF15 CMD WRITE
- * Writes a single Block - might run into timeout, even when successful
- */
-int CmdHF15Write(const char *Cmd) {
-
-    char cmdp = param_getchar(Cmd, 0);
-    if (strlen(Cmd) < 3 || cmdp == 'h' || cmdp == 'H') return usage_15_write();
-
-    UsbCommand resp;
-    uint8_t *recv;
-    UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}}; // len,speed,recv?
-    uint8_t *req = c.d.asBytes;
-    int reqlen = 0, pagenum, temp;
-    char cmdbuf[100] = {0};
-    char *cmd = cmdbuf;
-    char *cmd2;
-
-    strncpy(cmd, Cmd, sizeof(cmdbuf) - 1);
-
-    if (!prepareHF15Cmd(&cmd, &c, ISO15_CMD_WRITE))
-        return 0;
-
-    reqlen = c.arg[0];
-
-    // *cmd -> page num ; *cmd2 -> data
-    cmd2 = cmd;
-    while (*cmd2 != ' ' && *cmd2 != '\t' && *cmd2) cmd2++;
-    *cmd2 = 0;
-    cmd2++;
-
-    pagenum = strtol(cmd, NULL, 0);
-
-    req[reqlen++] = (uint8_t)pagenum;
-
-    while (cmd2[0] && cmd2[1]) { // hexdata, read by 2 hexchars
-        if (*cmd2 == ' ') {
-            cmd2++;
-            continue;
-        }
-        sscanf((char[]) {cmd2[0], cmd2[1], 0}, "%X", &temp);
-        req[reqlen++] = temp & 0xff;
-        cmd2 += 2;
-    }
-    AddCrc15(req, reqlen);
-    c.arg[0] = reqlen + 2;
-
-    PrintAndLogEx(NORMAL, "iso15693 writing to page %02d (0x%02X) | data ", pagenum, pagenum);
-
-    clearCommandBuffer();
-    SendCommand(&c);
-
-    if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
-        PrintAndLogEx(FAILED, "iso15693 card timeout, data may be written anyway");
-        return 1;
-    }
-
-    uint32_t status = resp.arg[0];
-    if (status < 2) {
-        PrintAndLogEx(FAILED, "iso15693 card select failed");
-        return 1;
-    }
-
-    recv = resp.d.asBytes;
-
-    if (!CheckCrc15(recv, status)) {
-        PrintAndLogEx(FAILED, "CRC failed");
-        return 2;
-    }
-
-    if (recv[0] & ISO15_RES_ERROR) {
-        PrintAndLogEx(NORMAL, "iso15693 card returned error %i: %s", recv[0], TagErrorStr(recv[0]));
-        return 3;
-    }
-
-    PrintAndLogEx(NORMAL, "OK");
-    return 0;
-}
-
 static command_t CommandTable15[] = {
     {"help",        CmdHF15Help,        1, "This help"},
     {"demod",       CmdHF15Demod,       1, "Demodulate ISO15693 from tag"},
@@ -1323,14 +1312,27 @@ static command_t CommandTable15[] = {
     {NULL, NULL, 0, NULL}
 };
 
+static int CmdHF15Help(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
+    CmdsHelp(CommandTable15);
+    return 0;
+}
+
 int CmdHF15(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable15, Cmd);
     return 0;
 }
 
-int CmdHF15Help(const char *Cmd) {
-    (void)Cmd; // Cmd is not used so far
-    CmdsHelp(CommandTable15);
-    return 0;
+// used with 'hf search'
+int readHF15Uid(bool verbose) {
+    uint8_t uid[8] = {0, 0, 0, 0, 0, 0, 0, 0};
+    if (!getUID(uid)) {
+        if (verbose) PrintAndLogEx(WARNING, "No tag found.");
+        return 0;
+    }
+
+    PrintAndLogEx(NORMAL, " UID  : %s", sprintUID(NULL, uid));
+    PrintAndLogEx(NORMAL, " TYPE : %s", getTagInfo_15(uid));
+    return 1;
 }
diff --git a/client/cmdhf15.h b/client/cmdhf15.h
index e9ae7939b..049e9f68f 100644
--- a/client/cmdhf15.h
+++ b/client/cmdhf15.h
@@ -28,22 +28,6 @@
 
 int CmdHF15(const char *Cmd);
 
-int HF15Reader(const char *Cmd, bool verbose);
+int readHF15Uid(bool verbose);
 
-int CmdHF15Demod(const char *Cmd);
-int CmdHF15Samples(const char *Cmd);
-int CmdHF15Info(const char *Cmd);
-int CmdHF15Record(const char *Cmd);
-int CmdHF15Reader(const char *Cmd);
-int CmdHF15Sim(const char *Cmd);
-int CmdHF15Afi(const char *Cmd);
-int CmdHF15Dump(const char *Cmd);
-int CmdHF15Raw(const char *Cmd);
-int CmdHF15Readmulti(const char *Cmd);
-int CmdHF15Read(const char *Cmd);
-int CmdHF15Write(const char *Cmd);
-
-int CmdHF15Help(const char *Cmd);
-
-int prepareHF15Cmd(char **cmd, UsbCommand *c, uint8_t iso15cmd);
 #endif
diff --git a/client/cmdhfepa.c b/client/cmdhfepa.c
index 1367ab3b8..dd12f3bf4 100644
--- a/client/cmdhfepa.c
+++ b/client/cmdhfepa.c
@@ -12,7 +12,7 @@
 static int CmdHelp(const char *Cmd);
 
 // Perform (part of) the PACE protocol
-int CmdHFEPACollectPACENonces(const char *Cmd) {
+static int CmdHFEPACollectPACENonces(const char *Cmd) {
     // requested nonce size
     uint32_t m = 0;
     // requested number of Nonces
@@ -59,7 +59,7 @@ int CmdHFEPACollectPACENonces(const char *Cmd) {
 }
 
 // perform the PACE protocol by replaying APDUs
-int CmdHFEPAPACEReplay(const char *Cmd) {
+static int CmdHFEPAPACEReplay(const char *Cmd) {
     // the 4 APDUs which are replayed + their lengths
     uint8_t msesa_apdu[41] = {0}, gn_apdu[8] = {0}, map_apdu[75] = {0};
     uint8_t pka_apdu[75] = {0}, ma_apdu[18] = {0}, apdu_lengths[5] = {0};
@@ -170,7 +170,7 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdHelp(const char *Cmd) {
+static int CmdHelp(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
diff --git a/client/cmdhfepa.h b/client/cmdhfepa.h
index c526c6eb0..c08fa8ea0 100644
--- a/client/cmdhfepa.h
+++ b/client/cmdhfepa.h
@@ -26,7 +26,5 @@
 
 
 int CmdHFEPA(const char *Cmd);
-int CmdHFEPACollectPACENonces(const char *Cmd);
-int CmdHFEPAPACEReplay(const char *Cmd);
 
 #endif // CMDHFEPA_H__
diff --git a/client/cmdhffelica.c b/client/cmdhffelica.c
index 9dfcd5580..1b17cb37d 100644
--- a/client/cmdhffelica.c
+++ b/client/cmdhffelica.c
@@ -64,66 +64,21 @@ static int usage_hf_felica_raw(void) {
     return 0;
 }
 
-int CmdHFFelicaList(const char *Cmd) {
+static int CmdHFFelicaList(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     //PrintAndLogEx(NORMAL, "Deprecated command, use 'hf list felica' instead");
     CmdTraceList("felica");
     return 0;
 }
 
-int CmdHFFelicaReader(const char *Cmd) {
-    bool silent = (Cmd[0] == 's' || Cmd[0] ==  'S');
-    //UsbCommand cDisconnect = {CMD_FELICA_COMMAND, {0,0,0}, {{0}}};
-    UsbCommand c = {CMD_FELICA_COMMAND, {FELICA_CONNECT, 0, 0}, {{0}}};
-    clearCommandBuffer();
-    SendCommand(&c);
-    UsbCommand resp;
-    if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
-        if (!silent) PrintAndLogEx(WARNING, "FeliCa card select failed");
-        //SendCommand(&cDisconnect);
-        return 0;
-    }
-
-    felica_card_select_t card;
-    memcpy(&card, (felica_card_select_t *)resp.d.asBytes, sizeof(felica_card_select_t));
-    uint64_t status = resp.arg[0];
-
-    switch (status) {
-        case 1: {
-            if (!silent)
-                PrintAndLogEx(WARNING, "card timeout");
-            break;
-        }
-        case 2: {
-            if (!silent)
-                PrintAndLogEx(WARNING, "card answered wrong");
-            break;
-        }
-        case 3: {
-            if (!silent)
-                PrintAndLogEx(WARNING, "CRC check failed");
-            break;
-        }
-        case 0: {
-            PrintAndLogEx(SUCCESS, "FeliCa tag info");
-
-            PrintAndLogEx(NORMAL, "IDm  %s", sprint_hex(card.IDm, sizeof(card.IDm)));
-            PrintAndLogEx(NORMAL, "  - CODE    %s", sprint_hex(card.code, sizeof(card.code)));
-            PrintAndLogEx(NORMAL, "  - NFCID2  %s", sprint_hex(card.uid, sizeof(card.uid)));
-
-            PrintAndLogEx(NORMAL, "Parameter (PAD) | %s", sprint_hex(card.PMm, sizeof(card.PMm)));
-            PrintAndLogEx(NORMAL, "  - IC CODE %s", sprint_hex(card.iccode, sizeof(card.iccode)));
-            PrintAndLogEx(NORMAL, "  - MRT     %s", sprint_hex(card.mrt, sizeof(card.mrt)));
-
-            PrintAndLogEx(NORMAL, "SERVICE CODE %s", sprint_hex(card.servicecode, sizeof(card.servicecode)));
-            break;
-        }
-    }
-    return status;
+static int CmdHFFelicaReader(const char *Cmd) {
+    bool verbose = !(Cmd[0] == 's' || Cmd[0] ==  'S');
+    readFelicaUid(verbose);
+    return 0;
 }
 
 // simulate iso18092 / FeliCa tag
-int CmdHFFelicaSim(const char *Cmd) {
+static int CmdHFFelicaSim(const char *Cmd) {
     bool errors = false;
     uint8_t flags = 0;
     uint8_t tagtype = 1;
@@ -188,7 +143,7 @@ int CmdHFFelicaSim(const char *Cmd) {
     return 0;
 }
 
-int CmdHFFelicaSniff(const char *Cmd) {
+static int CmdHFFelicaSniff(const char *Cmd) {
 
     uint8_t cmdp = 0;
     uint64_t samples2skip = 0;
@@ -226,7 +181,7 @@ int CmdHFFelicaSniff(const char *Cmd) {
 }
 
 // uid  hex
-int CmdHFFelicaSimLite(const char *Cmd) {
+static int CmdHFFelicaSimLite(const char *Cmd) {
 
     uint64_t uid = param_get64ex(Cmd, 0, 0, 16);
 
@@ -390,7 +345,7 @@ uint16_t PrintFliteBlock(uint16_t tracepos, uint8_t *trace, uint16_t tracelen) {
     return tracepos + 19;
 }
 
-int CmdHFFelicaDumpLite(const char *Cmd) {
+static int CmdHFFelicaDumpLite(const char *Cmd) {
 
     char ctmp = tolower(param_getchar(Cmd, 0));
     if (ctmp == 'h') return usage_hf_felica_dumplite();
@@ -456,7 +411,22 @@ int CmdHFFelicaDumpLite(const char *Cmd) {
     return 0;
 }
 
-int CmdHFFelicaCmdRaw(const char *Cmd) {
+static void waitCmdFelica(uint8_t iSelect) {
+    UsbCommand resp;
+    uint16_t len = 0;
+
+    if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
+        len = iSelect ? (resp.arg[1] & 0xffff) : (resp.arg[0]  & 0xffff);
+        PrintAndLogEx(NORMAL, "received %i octets", len);
+        if (!len)
+            return;
+        PrintAndLogEx(NORMAL, "%s", sprint_hex(resp.d.asBytes, len));
+    } else {
+        PrintAndLogEx(WARNING, "timeout while waiting for reply.");
+    }
+}
+
+static int CmdHFFelicaCmdRaw(const char *Cmd) {
     UsbCommand c = {CMD_FELICA_COMMAND, {0, 0, 0}, {{0}}};
     bool reply = 1;
     bool crc = false;
@@ -572,21 +542,6 @@ int CmdHFFelicaCmdRaw(const char *Cmd) {
     return 0;
 }
 
-void waitCmdFelica(uint8_t iSelect) {
-    UsbCommand resp;
-    uint16_t len = 0;
-
-    if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
-        len = iSelect ? (resp.arg[1] & 0xffff) : (resp.arg[0]  & 0xffff);
-        PrintAndLogEx(NORMAL, "received %i octets", len);
-        if (!len)
-            return;
-        PrintAndLogEx(NORMAL, "%s", sprint_hex(resp.d.asBytes, len));
-    } else {
-        PrintAndLogEx(WARNING, "timeout while waiting for reply.");
-    }
-}
-
 static command_t CommandTable[] = {
     {"help",      CmdHelp,              1, "This help"},
     {"list",      CmdHFFelicaList,      0, "List ISO 18092/FeliCa history"},
@@ -600,14 +555,65 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
+static int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
+    CmdsHelp(CommandTable);
+    return 0;
+}
+
 int CmdHFFelica(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
-    (void)Cmd; // Cmd is not used so far
-    CmdsHelp(CommandTable);
-    return 0;
+int readFelicaUid(bool verbose) {
+
+    //UsbCommand cDisconnect = {CMD_FELICA_COMMAND, {0,0,0}, {{0}}};
+    UsbCommand c = {CMD_FELICA_COMMAND, {FELICA_CONNECT, 0, 0}, {{0}}};
+    clearCommandBuffer();
+    SendCommand(&c);
+    UsbCommand resp;
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
+        if (verbose) PrintAndLogEx(WARNING, "FeliCa card select failed");
+        //SendCommand(&cDisconnect);
+        return 0;
+    }
+
+    felica_card_select_t card;
+    memcpy(&card, (felica_card_select_t *)resp.d.asBytes, sizeof(felica_card_select_t));
+    uint64_t status = resp.arg[0];
+
+    switch (status) {
+        case 1: {
+            if (verbose)
+                PrintAndLogEx(WARNING, "card timeout");
+            break;
+        }
+        case 2: {
+            if (verbose)
+                PrintAndLogEx(WARNING, "card answered wrong");
+            break;
+        }
+        case 3: {
+            if (verbose)
+                PrintAndLogEx(WARNING, "CRC check failed");
+            break;
+        }
+        case 0: {
+            PrintAndLogEx(SUCCESS, "FeliCa tag info");
+
+            PrintAndLogEx(NORMAL, "IDm  %s", sprint_hex(card.IDm, sizeof(card.IDm)));
+            PrintAndLogEx(NORMAL, "  - CODE    %s", sprint_hex(card.code, sizeof(card.code)));
+            PrintAndLogEx(NORMAL, "  - NFCID2  %s", sprint_hex(card.uid, sizeof(card.uid)));
+
+            PrintAndLogEx(NORMAL, "Parameter (PAD) | %s", sprint_hex(card.PMm, sizeof(card.PMm)));
+            PrintAndLogEx(NORMAL, "  - IC CODE %s", sprint_hex(card.iccode, sizeof(card.iccode)));
+            PrintAndLogEx(NORMAL, "  - MRT     %s", sprint_hex(card.mrt, sizeof(card.mrt)));
+
+            PrintAndLogEx(NORMAL, "SERVICE CODE %s", sprint_hex(card.servicecode, sizeof(card.servicecode)));
+            break;
+        }
+    }
+    return status;
 }
diff --git a/client/cmdhffelica.h b/client/cmdhffelica.h
index 0b22762e0..b495b80ec 100644
--- a/client/cmdhffelica.h
+++ b/client/cmdhffelica.h
@@ -26,16 +26,6 @@
 #include "mifare.h"     // felica_card_select_t struct
 
 int CmdHFFelica(const char *Cmd);
-int CmdHFFelicaList(const char *Cmd);
-int CmdHFFelicaReader(const char *Cmd);
-int CmdHFFelicaSim(const char *Cmd);
-int CmdHFFelicaSniff(const char *Cmd);
-int CmdHFFelicaCmdRaw(const char *Cmd);
-
-void waitCmdFelica(uint8_t iSelect);
-
-//temp
-int CmdHFFelicaSimLite(const char *Cmd);
-int CmdHFFelicaDumpLite(const char *Cmd);
 
+int readFelicaUid(bool verbose);
 #endif
diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index 045eacf71..47e3b6778 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -49,13 +49,13 @@
 
 static int CmdHelp(const char *Cmd);
 
-int CmdHFFidoInfo(const char *cmd) {
+static int CmdHFFidoInfo(const char *cmd) {
 
     if (cmd && strlen(cmd) > 0)
         PrintAndLog("WARNING: command don't have any parameters.\n");
 
     // info about 14a part
-    CmdHF14AInfo("");
+    infoHF14A(false, false);
 
     // FIDO info
     PrintAndLog("--------------------------------------------");
@@ -168,7 +168,7 @@ json_t *OpenJson(int paramnum, char *fname, void *argtable[], bool *err) {
     return root;
 }
 
-int CmdHFFidoRegister(const char *cmd) {
+static int CmdHFFidoRegister(const char *cmd) {
     uint8_t data[64] = {0};
     int chlen = 0;
     uint8_t cdata[250] = {0};
@@ -397,7 +397,7 @@ int CmdHFFidoRegister(const char *cmd) {
     return 0;
 };
 
-int CmdHFFidoAuthenticate(const char *cmd) {
+static int CmdHFFidoAuthenticate(const char *cmd) {
     uint8_t data[512] = {0};
     uint8_t hdata[250] = {0};
     bool public_key_loaded = false;
@@ -648,7 +648,7 @@ int GetExistsFileNameJson(const char *prefixDir, const char *reqestedFileName, c
     return 0;
 }
 
-int CmdHFFido2MakeCredential(const char *cmd) {
+static int CmdHFFido2MakeCredential(const char *cmd) {
     json_error_t error;
     json_t *root = NULL;
     char fname[300] = {0};
@@ -775,7 +775,7 @@ int CmdHFFido2MakeCredential(const char *cmd) {
     return 0;
 };
 
-int CmdHFFido2GetAssertion(const char *cmd) {
+static int CmdHFFido2GetAssertion(const char *cmd) {
     json_error_t error;
     json_t *root = NULL;
     char fname[300] = {0};
diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index 57ff3b05c..49c74ab6b 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -270,14 +270,14 @@ int xorbits_8(uint8_t val) {
     return res & 1;
 }
 
-int CmdHFiClassList(const char *Cmd) {
+static int CmdHFiClassList(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     //PrintAndLogEx(NORMAL, "Deprecated command, use 'hf list iclass' instead");
     CmdTraceList("iclass");
     return 0;
 }
 
-int CmdHFiClassSniff(const char *Cmd) {
+static int CmdHFiClassSniff(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_hf_iclass_sniff();
     UsbCommand c = {CMD_SNIFF_ICLASS, {0, 0, 0}, {{0}}};
@@ -285,7 +285,7 @@ int CmdHFiClassSniff(const char *Cmd) {
     return 0;
 }
 
-int CmdHFiClassSim(const char *Cmd) {
+static int CmdHFiClassSim(const char *Cmd) {
 
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) < 1 || cmdp == 'h') return usage_hf_iclass_sim();
@@ -510,81 +510,14 @@ int CmdHFiClassSim(const char *Cmd) {
     return 0;
 }
 
-int HFiClassReader(const char *Cmd, bool loop, bool verbose) {
-    (void)Cmd; // Cmd is not used so far
-    bool tagFound = false;
-
-    uint32_t flags = FLAG_ICLASS_READER_CSN | FLAG_ICLASS_READER_CC |  FLAG_ICLASS_READER_AIA |
-                     FLAG_ICLASS_READER_CONF | FLAG_ICLASS_READER_ONLY_ONCE |
-                     FLAG_ICLASS_READER_ONE_TRY;
-
-    UsbCommand c = {CMD_READER_ICLASS, {flags, 0, 0}, {{0}}};
-    // loop in client not device - else on windows have a communication error
-    UsbCommand resp;
-    while (!ukbhit()) {
-
-        clearCommandBuffer();
-        SendCommand(&c);
-        if (WaitForResponseTimeout(CMD_ACK, &resp, 4500)) {
-            uint8_t readStatus = resp.arg[0] & 0xff;
-            uint8_t *data = resp.d.asBytes;
-
-            if (verbose) PrintAndLogEx(NORMAL, "Readstatus:%02x", readStatus);
-            // no tag found or button pressed
-            if ((readStatus == 0 && !loop) || readStatus == 0xFF) {
-                // abort
-                if (verbose) {
-                    PrintAndLogEx(FAILED, "Quitting...");
-                    DropField();
-                    return 0;
-                }
-            }
-            if (readStatus & FLAG_ICLASS_READER_CSN) {
-                PrintAndLogEx(NORMAL, "   CSN: %s", sprint_hex(data, 8));
-                tagFound = true;
-            }
-            if (readStatus & FLAG_ICLASS_READER_CC) {
-                PrintAndLogEx(NORMAL, "    CC: %s", sprint_hex(data + 16, 8));
-            }
-            if (readStatus & FLAG_ICLASS_READER_CONF) {
-                printIclassDumpInfo(data);
-            }
-            if (readStatus & FLAG_ICLASS_READER_AIA) {
-                bool legacy = (memcmp((uint8_t *)(data + 8 * 5), "\xff\xff\xff\xff\xff\xff\xff\xff", 8) == 0);
-
-                bool se_enabled = (memcmp((uint8_t *)(data + 8 * 5), "\xff\xff\xff\x00\x06\xff\xff\xff", 8) == 0);
-
-                PrintAndLogEx(NORMAL, " App IA: %s", sprint_hex(data + 8 * 5, 8));
-                if (legacy)
-                    PrintAndLogEx(SUCCESS, "      : Possible iClass (legacy credential tag)");
-                else if (se_enabled)
-                    PrintAndLogEx(SUCCESS, "      : Possible iClass (SE credential tag)");
-                else
-                    PrintAndLogEx(WARNING, "      : Possible iClass (NOT legacy tag)");
-            }
-
-            if (tagFound && !loop) {
-                DropField();
-                return 1;
-            }
-        } else {
-            if (verbose)
-                PrintAndLogEx(WARNING, "command execute timeout");
-        }
-        if (!loop) break;
-    }
-    DropField();
-    return 0;
-}
-
-int CmdHFiClassReader(const char *Cmd) {
+static int CmdHFiClassReader(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_hf_iclass_reader();
     bool findone = (cmdp == '1') ? false : true;
-    return HFiClassReader(Cmd, findone, true);
+    return readIclass(findone, true);
 }
 
-int CmdHFiClassReader_Replay(const char *Cmd) {
+static int CmdHFiClassReader_Replay(const char *Cmd) {
 
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) < 1 || cmdp == 'h') return usage_hf_iclass_replay();
@@ -612,7 +545,7 @@ int iclassEmlSetMem(uint8_t *data, int blockNum, int blocksCount) {
     return 0;
 }
 
-int CmdHFiClassELoad(const char *Cmd) {
+static int CmdHFiClassELoad(const char *Cmd) {
 
     char ctmp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) < 1 || ctmp == 'h') return usage_hf_iclass_eload();
@@ -704,7 +637,7 @@ static int readKeyfile(const char *filename, size_t len, uint8_t *buffer) {
     return 0;
 }
 
-int CmdHFiClassDecrypt(const char *Cmd) {
+static int CmdHFiClassDecrypt(const char *Cmd) {
 
     char opt = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) < 1 || opt == 'h') return usage_hf_iclass_decrypt();
@@ -808,7 +741,7 @@ static int iClassEncryptBlkData(uint8_t *blkData) {
     return 1;
 }
 
-int CmdHFiClassEncryptBlk(const char *Cmd) {
+static int CmdHFiClassEncryptBlk(const char *Cmd) {
     uint8_t blkData[8] = {0};
     char opt = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) < 1 || opt == 'h') return usage_hf_iclass_encrypt();
@@ -900,7 +833,7 @@ static bool select_and_auth(uint8_t *KEY, uint8_t *MAC, uint8_t *div_key, bool u
     return true;
 }
 
-int CmdHFiClassReader_Dump(const char *Cmd) {
+static int CmdHFiClassReader_Dump(const char *Cmd) {
 
     uint8_t MAC[4] = {0x00, 0x00, 0x00, 0x00};
     uint8_t div_key[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
@@ -1183,7 +1116,7 @@ static int WriteBlock(uint8_t blockno, uint8_t *bldata, uint8_t *KEY, bool use_c
     return isOK;
 }
 
-int CmdHFiClass_WriteBlock(const char *Cmd) {
+static int CmdHFiClass_WriteBlock(const char *Cmd) {
     uint8_t blockno = 0;
     uint8_t bldata[8] = {0, 0, 0, 0, 0, 0, 0, 0};
     uint8_t KEY[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
@@ -1261,7 +1194,7 @@ int CmdHFiClass_WriteBlock(const char *Cmd) {
     return ans;
 }
 
-int CmdHFiClassCloneTag(const char *Cmd) {
+static int CmdHFiClassCloneTag(const char *Cmd) {
     char filename[FILE_PATH_SIZE] = { 0x00 };
     char tempStr[50] = {0};
     uint8_t KEY[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
@@ -1451,7 +1384,7 @@ static int ReadBlock(uint8_t *KEY, uint8_t blockno, uint8_t keyType, bool elite,
     return 1;
 }
 
-int CmdHFiClass_ReadBlock(const char *Cmd) {
+static int CmdHFiClass_ReadBlock(const char *Cmd) {
     uint8_t blockno = 0;
     uint8_t keyType = 0x88; //debit key
     uint8_t KEY[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
@@ -1523,7 +1456,7 @@ int CmdHFiClass_ReadBlock(const char *Cmd) {
     return ReadBlock(KEY, blockno, keyType, elite, rawkey, verbose, auth);
 }
 
-int CmdHFiClass_loclass(const char *Cmd) {
+static int CmdHFiClass_loclass(const char *Cmd) {
     char opt = tolower(param_getchar(Cmd, 0));
 
     if (strlen(Cmd) < 1 || opt == 'h')
@@ -1582,7 +1515,7 @@ void printIclassDumpContents(uint8_t *iclass_dump, uint8_t startblock, uint8_t e
     PrintAndLogEx(NORMAL, "------+--+-------------------------+\n");
 }
 
-int CmdHFiClassReadTagFile(const char *Cmd) {
+static int CmdHFiClassReadTagFile(const char *Cmd) {
     int startblock = 0;
     int endblock = 0;
     char tempnum[5];
@@ -1674,7 +1607,7 @@ static void HFiClassCalcNewKey(uint8_t *CSN, uint8_t *OLDKEY, uint8_t *NEWKEY, u
     }
 }
 
-int CmdHFiClassCalcNewKey(const char *Cmd) {
+static int CmdHFiClassCalcNewKey(const char *Cmd) {
     uint8_t OLDKEY[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
     uint8_t NEWKEY[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
     uint8_t xor_div_key[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
@@ -1821,7 +1754,7 @@ static int printKeys(void) {
     return 0;
 }
 
-int CmdHFiClassManageKeys(const char *Cmd) {
+static int CmdHFiClassManageKeys(const char *Cmd) {
     uint8_t keyNbr = 0;
     uint8_t dataLen = 0;
     uint8_t KEY[8] = {0};
@@ -1911,7 +1844,7 @@ int CmdHFiClassManageKeys(const char *Cmd) {
     return 0;
 }
 
-int CmdHFiClassCheckKeys(const char *Cmd) {
+static int CmdHFiClassCheckKeys(const char *Cmd) {
 
     // empty string
     if (strlen(Cmd) == 0) return usage_hf_iclass_chk();
@@ -2132,7 +2065,7 @@ static int cmp_uint32(const void *a, const void *b) {
 
 // this method tries to identify in which configuration mode a iClass / iClass SE reader is in.
 // Standard or Elite / HighSecurity mode.  It uses a default key dictionary list in order to work.
-int CmdHFiClassLookUp(const char *Cmd) {
+static int CmdHFiClassLookUp(const char *Cmd) {
 
     uint8_t CSN[8];
     uint8_t EPURSE[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
@@ -2455,7 +2388,7 @@ static void generate(uint8_t *data, uint8_t len) {
     free(pkey);
 }
 
-int CmdHFiClassPermuteKey(const char *Cmd) {
+static int CmdHFiClassPermuteKey(const char *Cmd) {
 
     uint8_t key[8] = {0};
     uint8_t key_std_format[8] = {0};
@@ -2511,14 +2444,81 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
+static int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
+    CmdsHelp(CommandTable);
+    return 0;
+}
+
 int CmdHFiClass(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
-    (void)Cmd; // Cmd is not used so far
-    CmdsHelp(CommandTable);
+int readIclass(bool loop, bool verbose) {
+    bool tagFound = false;
+
+    uint32_t flags = FLAG_ICLASS_READER_CSN | FLAG_ICLASS_READER_CC |  FLAG_ICLASS_READER_AIA |
+                     FLAG_ICLASS_READER_CONF | FLAG_ICLASS_READER_ONLY_ONCE |
+                     FLAG_ICLASS_READER_ONE_TRY;
+
+    UsbCommand c = {CMD_READER_ICLASS, {flags, 0, 0}, {{0}}};
+    // loop in client not device - else on windows have a communication error
+    UsbCommand resp;
+    while (!ukbhit()) {
+
+        clearCommandBuffer();
+        SendCommand(&c);
+        if (WaitForResponseTimeout(CMD_ACK, &resp, 4500)) {
+            uint8_t readStatus = resp.arg[0] & 0xff;
+            uint8_t *data = resp.d.asBytes;
+
+            if (verbose) PrintAndLogEx(NORMAL, "Readstatus:%02x", readStatus);
+            // no tag found or button pressed
+            if ((readStatus == 0 && !loop) || readStatus == 0xFF) {
+                // abort
+                if (verbose) {
+                    PrintAndLogEx(FAILED, "Quitting...");
+                    DropField();
+                    return 0;
+                }
+            }
+            if (readStatus & FLAG_ICLASS_READER_CSN) {
+                PrintAndLogEx(NORMAL, "   CSN: %s", sprint_hex(data, 8));
+                tagFound = true;
+            }
+            if (readStatus & FLAG_ICLASS_READER_CC) {
+                PrintAndLogEx(NORMAL, "    CC: %s", sprint_hex(data + 16, 8));
+            }
+            if (readStatus & FLAG_ICLASS_READER_CONF) {
+                printIclassDumpInfo(data);
+            }
+            if (readStatus & FLAG_ICLASS_READER_AIA) {
+                bool legacy = (memcmp((uint8_t *)(data + 8 * 5), "\xff\xff\xff\xff\xff\xff\xff\xff", 8) == 0);
+
+                bool se_enabled = (memcmp((uint8_t *)(data + 8 * 5), "\xff\xff\xff\x00\x06\xff\xff\xff", 8) == 0);
+
+                PrintAndLogEx(NORMAL, " App IA: %s", sprint_hex(data + 8 * 5, 8));
+                if (legacy)
+                    PrintAndLogEx(SUCCESS, "      : Possible iClass (legacy credential tag)");
+                else if (se_enabled)
+                    PrintAndLogEx(SUCCESS, "      : Possible iClass (SE credential tag)");
+                else
+                    PrintAndLogEx(WARNING, "      : Possible iClass (NOT legacy tag)");
+            }
+
+            if (tagFound && !loop) {
+                DropField();
+                return 1;
+            }
+        } else {
+            if (verbose)
+                PrintAndLogEx(WARNING, "command execute timeout");
+        }
+        if (!loop) break;
+    }
+    DropField();
     return 0;
 }
+
diff --git a/client/cmdhficlass.h b/client/cmdhficlass.h
index 616a7d312..0ae5a97cd 100644
--- a/client/cmdhficlass.h
+++ b/client/cmdhficlass.h
@@ -52,30 +52,7 @@ typedef struct iclass_prekey {
 
 int CmdHFiClass(const char *Cmd);
 
-int CmdHFiClassCalcNewKey(const char *Cmd);
-int CmdHFiClassCloneTag(const char *Cmd);
-int CmdHFiClassDecrypt(const char *Cmd);
-int CmdHFiClassEncryptBlk(const char *Cmd);
-int CmdHFiClassELoad(const char *Cmd);
-int CmdHFiClassList(const char *Cmd);
-int HFiClassReader(const char *Cmd, bool loop, bool verbose);
-int CmdHFiClassReader(const char *Cmd);
-int CmdHFiClassReader_Dump(const char *Cmd);
-int CmdHFiClassReader_Replay(const char *Cmd);
-int CmdHFiClassReadKeyFile(const char *filename);
-int CmdHFiClassReadTagFile(const char *Cmd);
-int CmdHFiClass_ReadBlock(const char *Cmd);
-int CmdHFiClass_TestMac(const char *Cmd);
-int CmdHFiClassManageKeys(const char *Cmd);
-int CmdHFiClass_loclass(const char *Cmd);
-int CmdHFiClassSniff(const char *Cmd);
-int CmdHFiClassSim(const char *Cmd);
-int CmdHFiClassWriteKeyFile(const char *Cmd);
-int CmdHFiClass_WriteBlock(const char *Cmd);
-int CmdHFiClassCheckKeys(const char *Cmd);
-int CmdHFiClassLookUp(const char *Cmd);
-int CmdHFiClassPermuteKey(const char *Cmd);
-
+int readIclass(bool loop, bool verbose);
 void printIclassDumpContents(uint8_t *iclass_dump, uint8_t startblock, uint8_t endblock, size_t filesize);
 void HFiClassCalcDivKey(uint8_t *CSN, uint8_t *KEY, uint8_t *div_key, bool elite);
 
diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index 9760b3e1a..238f81641 100644
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -160,7 +160,7 @@ static int usage_legic_wipe(void) {
  *  This is based on information given in the talk held
  *  by Henryk Ploetz and Karsten Nohl at 26c3
  */
-int CmdLegicInfo(const char *Cmd) {
+static int CmdLegicInfo(const char *Cmd) {
 
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_legic_info();
@@ -485,7 +485,7 @@ out:
 // params:
 // offset in data memory
 // number of bytes to read
-int CmdLegicRdmem(const char *Cmd) {
+static int CmdLegicRdmem(const char *Cmd) {
 
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_legic_rdmem();
@@ -519,7 +519,7 @@ int CmdLegicRdmem(const char *Cmd) {
     return status;
 }
 
-int CmdLegicRfSim(const char *Cmd) {
+static int CmdLegicRfSim(const char *Cmd) {
 
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) == 0 || cmdp == 'h') return usage_legic_sim();
@@ -531,7 +531,7 @@ int CmdLegicRfSim(const char *Cmd) {
     return 0;
 }
 
-int CmdLegicRfWrite(const char *Cmd) {
+static int CmdLegicRfWrite(const char *Cmd) {
 
     uint8_t *data = NULL;
     uint8_t cmdp = 0;
@@ -670,7 +670,7 @@ int CmdLegicRfWrite(const char *Cmd) {
     return 0;
 }
 
-int CmdLegicCalcCrc(const char *Cmd) {
+static int CmdLegicCalcCrc(const char *Cmd) {
 
     uint8_t *data = NULL;
     uint8_t cmdp = 0, uidcrc = 0, type = 0;
@@ -849,33 +849,14 @@ void legic_seteml(uint8_t *src, uint32_t offset, uint32_t numofbytes) {
     }
 }
 
-int HFLegicReader(const char *Cmd, bool verbose) {
-
+static int CmdLegicReader(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_legic_reader();
 
-    legic_card_select_t card;
-    switch (legic_get_type(&card)) {
-        case 1:
-            return 2;
-        case 2:
-            if (verbose) PrintAndLogEx(WARNING, "command execution time out");
-            return 1;
-        case 3:
-            if (verbose) PrintAndLogEx(WARNING, "legic card select failed");
-            return 2;
-        default:
-            break;
-    }
-    PrintAndLogEx(SUCCESS, " UID : %s", sprint_hex(card.uid, sizeof(card.uid)));
-    legic_print_type(card.cardsize, 0);
-    return 0;
-}
-int CmdLegicReader(const char *Cmd) {
-    return HFLegicReader(Cmd, true);
+    return readLegicUid(true);
 }
 
-int CmdLegicDump(const char *Cmd) {
+static int CmdLegicDump(const char *Cmd) {
 
     FILE *f;
     char filename[FILE_PATH_SIZE] = {0x00};
@@ -980,7 +961,7 @@ int CmdLegicDump(const char *Cmd) {
     return 0;
 }
 
-int CmdLegicRestore(const char *Cmd) {
+static int CmdLegicRestore(const char *Cmd) {
 
     FILE *f;
     char filename[FILE_PATH_SIZE] = {0x00};
@@ -1106,7 +1087,7 @@ int CmdLegicRestore(const char *Cmd) {
     return 0;
 }
 
-int CmdLegicELoad(const char *Cmd) {
+static int CmdLegicELoad(const char *Cmd) {
     FILE *f;
     char filename[FILE_PATH_SIZE];
     char *fnameptr = filename;
@@ -1176,7 +1157,7 @@ int CmdLegicELoad(const char *Cmd) {
     return 0;
 }
 
-int CmdLegicESave(const char *Cmd) {
+static int CmdLegicESave(const char *Cmd) {
 
     char filename[FILE_PATH_SIZE];
     char *fnameptr = filename;
@@ -1236,7 +1217,7 @@ int CmdLegicESave(const char *Cmd) {
     return 0;
 }
 
-int CmdLegicWipe(const char *Cmd) {
+static int CmdLegicWipe(const char *Cmd) {
 
     char cmdp = tolower(param_getchar(Cmd, 0));
 
@@ -1299,7 +1280,7 @@ int CmdLegicWipe(const char *Cmd) {
     return 0;
 }
 
-int CmdLegicList(const char *Cmd) {
+static int CmdLegicList(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     CmdTraceList("legic");
     return 0;
@@ -1322,14 +1303,34 @@ static command_t CommandTable[] =  {
     {NULL, NULL, 0, NULL}
 };
 
+static int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
+    CmdsHelp(CommandTable);
+    return 0;
+}
+
 int CmdHFLegic(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
-    (void)Cmd; // Cmd is not used so far
-    CmdsHelp(CommandTable);
+int readLegicUid(bool verbose) {
+
+    legic_card_select_t card;
+    switch (legic_get_type(&card)) {
+        case 1:
+            return 2;
+        case 2:
+            if (verbose) PrintAndLogEx(WARNING, "command execution time out");
+            return 1;
+        case 3:
+            if (verbose) PrintAndLogEx(WARNING, "legic card select failed");
+            return 2;
+        default:
+            break;
+    }
+    PrintAndLogEx(SUCCESS, " UID : %s", sprint_hex(card.uid, sizeof(card.uid)));
+    legic_print_type(card.cardsize, 0);
     return 0;
 }
diff --git a/client/cmdhflegic.h b/client/cmdhflegic.h
index b2cbbb4fb..b922420ec 100644
--- a/client/cmdhflegic.h
+++ b/client/cmdhflegic.h
@@ -26,21 +26,7 @@
 
 int CmdHFLegic(const char *Cmd);
 
-int CmdLegicInfo(const char *Cmd);
-int CmdLegicRdmem(const char *Cmd);
-int CmdLegicLoad(const char *Cmd);
-int CmdLegicRfSim(const char *Cmd);
-int CmdLegicRfWrite(const char *Cmd);
-int CmdLegicCalcCrc(const char *Cmd);
-int CmdLegicDump(const char *Cmd);
-int CmdLegicRestore(const char *Cmd);
-int CmdLegicReader(const char *Cmd);
-int CmdLegicELoad(const char *Cmd);
-int CmdLegicESave(const char *Cmd);
-int CmdLegicList(const char *Cmd);
-int CmdLegicWipe(const char *Cmd);
-
-int HFLegicReader(const char *Cmd, bool verbose);
+int readLegicUid(bool verbose);
 int legic_print_type(uint32_t tagtype, uint8_t spaces);
 int legic_get_type(legic_card_select_t *card);
 void legic_chk_iv(uint32_t *iv);
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 07586881e..542f623cc 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -100,7 +100,8 @@ static int usage_hf14_dbg(void) {
     PrintAndLogEx(NORMAL, "           hf mf dbg 3");
     return 0;
 }
-static int usage_hf14_sniff(void) {
+/*
+ * static int usage_hf14_sniff(void) {
     PrintAndLogEx(NORMAL, "It continuously gets data from the field and saves it to: log, emulator, emulator file.");
     PrintAndLogEx(NORMAL, "Usage:  hf mf sniff [h] [l] [d] [f]");
     PrintAndLogEx(NORMAL, "Options:");
@@ -113,6 +114,7 @@ static int usage_hf14_sniff(void) {
     PrintAndLogEx(NORMAL, "           hf mf sniff l d f");
     return 0;
 }
+*/
 static int usage_hf14_nested(void) {
     PrintAndLogEx(NORMAL, "Usage:");
     PrintAndLogEx(NORMAL, " all sectors:  hf mf nested  <card memory> <block number> <key A/B> <key (12 hex symbols)> [t,d]");
@@ -443,7 +445,7 @@ char *GenerateFilename(const char *prefix, const char *suffix) {
     return fptr;
 }
 
-int CmdHF14AMfDarkside(const char *Cmd) {
+static int CmdHF14AMfDarkside(const char *Cmd) {
     uint8_t blockno = 0, key_type = MIFARE_AUTH_KEYA;
     uint64_t key = 0;
 
@@ -483,7 +485,7 @@ int CmdHF14AMfDarkside(const char *Cmd) {
     return 0;
 }
 
-int CmdHF14AMfWrBl(const char *Cmd) {
+static int CmdHF14AMfWrBl(const char *Cmd) {
     uint8_t blockNo = 0;
     uint8_t keyType = 0;
     uint8_t key[6] = {0, 0, 0, 0, 0, 0};
@@ -537,7 +539,7 @@ int CmdHF14AMfWrBl(const char *Cmd) {
     return 0;
 }
 
-int CmdHF14AMfRdBl(const char *Cmd) {
+static int CmdHF14AMfRdBl(const char *Cmd) {
     uint8_t blockNo = 0;
     uint8_t keyType = 0;
     uint8_t key[6] = {0, 0, 0, 0, 0, 0};
@@ -601,7 +603,7 @@ int CmdHF14AMfRdBl(const char *Cmd) {
     return 0;
 }
 
-int CmdHF14AMfRdSc(const char *Cmd) {
+static int CmdHF14AMfRdSc(const char *Cmd) {
     int i;
     uint8_t sectorNo = 0;
     uint8_t keyType = 0;
@@ -717,7 +719,7 @@ uint8_t NumBlocksPerSector(uint8_t sectorNo) {
     }
 }
 
-int CmdHF14AMfDump(const char *Cmd) {
+static int CmdHF14AMfDump(const char *Cmd) {
 
     uint8_t sectorNo, blockNo;
     uint8_t keyA[40][6];
@@ -923,7 +925,7 @@ int CmdHF14AMfDump(const char *Cmd) {
     return 0;
 }
 
-int CmdHF14AMfRestore(const char *Cmd) {
+static int CmdHF14AMfRestore(const char *Cmd) {
     uint8_t sectorNo, blockNo;
     uint8_t keyType = 0;
     uint8_t key[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
@@ -1064,7 +1066,7 @@ int CmdHF14AMfRestore(const char *Cmd) {
     return 0;
 }
 
-int CmdHF14AMfNested(const char *Cmd) {
+static int CmdHF14AMfNested(const char *Cmd) {
     int i, res, iterations;
     sector_t *e_sector = NULL;
     uint8_t blockNo = 0;
@@ -1328,7 +1330,7 @@ int CmdHF14AMfNested(const char *Cmd) {
     return 0;
 }
 
-int CmdHF14AMfNestedHard(const char *Cmd) {
+static int CmdHF14AMfNestedHard(const char *Cmd) {
     uint8_t blockNo = 0;
     uint8_t keyType = 0;
     uint8_t trgBlockNo = 0;
@@ -1529,7 +1531,7 @@ void shuffle(uint8_t *array, uint16_t len) {
     }
 }
 
-int CmdHF14AMfChk_fast(const char *Cmd) {
+static int CmdHF14AMfChk_fast(const char *Cmd) {
 
     char ctmp = 0x00;
     ctmp = tolower(param_getchar(Cmd, 0));
@@ -1780,7 +1782,7 @@ out:
     return 0;
 }
 
-int CmdHF14AMfChk(const char *Cmd) {
+static int CmdHF14AMfChk(const char *Cmd) {
 
     char ctmp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) < 3 || ctmp == 'h') return usage_hf14_chk();
@@ -2132,7 +2134,7 @@ void readerAttack(nonces_t data, bool setEmulatorMem, bool verbose) {
     }
 }
 
-int CmdHF14AMf1kSim(const char *Cmd) {
+static int CmdHF14AMf1kSim(const char *Cmd) {
 
     uint8_t uid[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
     uint8_t exitAfterNReads = 0;
@@ -2244,8 +2246,8 @@ int CmdHF14AMf1kSim(const char *Cmd) {
     }
     return 0;
 }
-
-int CmdHF14AMfSniff(const char *Cmd) {
+/*
+static int CmdHF14AMfSniff(const char *Cmd) {
     bool wantLogToFile = false;
     bool wantDecrypt = false;
     //bool wantSaveToEml = false; TODO
@@ -2405,7 +2407,7 @@ int CmdHF14AMfSniff(const char *Cmd) {
     free(buf);
     return 0;
 }
-
+*/
 int CmdHF14AMfDbg(const char *Cmd) {
 
     char ctmp = tolower(param_getchar(Cmd, 0));
@@ -2419,7 +2421,7 @@ int CmdHF14AMfDbg(const char *Cmd) {
     return 0;
 }
 
-int CmdHF14AMfKeyBrute(const char *Cmd) {
+static int CmdHF14AMfKeyBrute(const char *Cmd) {
 
     uint8_t blockNo = 0, keytype = 0;
     uint8_t key[6] = {0, 0, 0, 0, 0, 0};
@@ -2478,7 +2480,7 @@ void printKeyTable(uint8_t sectorscnt, sector_t *e_sector) {
 }
 
 // EMULATOR COMMANDS
-int CmdHF14AMfEGet(const char *Cmd) {
+static int CmdHF14AMfEGet(const char *Cmd) {
     uint8_t blockNo = 0;
     uint8_t data[16] = {0x00};
     char c = tolower(param_getchar(Cmd, 0));
@@ -2496,7 +2498,7 @@ int CmdHF14AMfEGet(const char *Cmd) {
     return 0;
 }
 
-int CmdHF14AMfEClear(const char *Cmd) {
+static int CmdHF14AMfEClear(const char *Cmd) {
     char c = tolower(param_getchar(Cmd, 0));
     if (c == 'h') return usage_hf14_eclr();
 
@@ -2506,7 +2508,7 @@ int CmdHF14AMfEClear(const char *Cmd) {
     return 0;
 }
 
-int CmdHF14AMfESet(const char *Cmd) {
+static int CmdHF14AMfESet(const char *Cmd) {
     char c = tolower(param_getchar(Cmd, 0));
     uint8_t memBlock[16];
     uint8_t blockNo = 0;
@@ -2620,7 +2622,7 @@ int CmdHF14AMfELoad(const char *Cmd) {
     return 0;
 }
 
-int CmdHF14AMfESave(const char *Cmd) {
+static int CmdHF14AMfESave(const char *Cmd) {
 
     char filename[FILE_PATH_SIZE];
     char *fnameptr = filename;
@@ -2666,7 +2668,7 @@ int CmdHF14AMfESave(const char *Cmd) {
     return 0;
 }
 
-int CmdHF14AMfECFill(const char *Cmd) {
+static int CmdHF14AMfECFill(const char *Cmd) {
     uint8_t keyType = 0;
     uint8_t numSectors = 16;
     char c = tolower(param_getchar(Cmd, 0));
@@ -2691,7 +2693,7 @@ int CmdHF14AMfECFill(const char *Cmd) {
     return 0;
 }
 
-int CmdHF14AMfEKeyPrn(const char *Cmd) {
+static int CmdHF14AMfEKeyPrn(const char *Cmd) {
     int i;
     uint8_t numSectors;
     uint8_t data[16];
@@ -2720,7 +2722,7 @@ int CmdHF14AMfEKeyPrn(const char *Cmd) {
 }
 
 // CHINESE MAGIC COMMANDS
-int CmdHF14AMfCSetUID(const char *Cmd) {
+static int CmdHF14AMfCSetUID(const char *Cmd) {
     uint8_t wipeCard = 0;
     uint8_t uid[8] = {0x00};
     uint8_t oldUid[8] = {0x00};
@@ -2780,7 +2782,7 @@ int CmdHF14AMfCSetUID(const char *Cmd) {
     return 0;
 }
 
-int CmdHF14AMfCSetBlk(const char *Cmd) {
+static int CmdHF14AMfCSetBlk(const char *Cmd) {
     uint8_t block[16] = {0x00};
     uint8_t blockNo = 0;
     uint8_t params = MAGIC_SINGLE;
@@ -2807,7 +2809,7 @@ int CmdHF14AMfCSetBlk(const char *Cmd) {
     return 0;
 }
 
-int CmdHF14AMfCLoad(const char *Cmd) {
+static int CmdHF14AMfCLoad(const char *Cmd) {
 
     uint8_t buf8[16] = {0x00};
     uint8_t fillFromEmulator = 0;
@@ -2922,7 +2924,7 @@ int CmdHF14AMfCLoad(const char *Cmd) {
     return 0;
 }
 
-int CmdHF14AMfCGetBlk(const char *Cmd) {
+static int CmdHF14AMfCGetBlk(const char *Cmd) {
     uint8_t data[16] = {0};
     uint8_t blockNo = 0;
     int res;
@@ -2959,7 +2961,7 @@ int CmdHF14AMfCGetBlk(const char *Cmd) {
     return 0;
 }
 
-int CmdHF14AMfCGetSc(const char *Cmd) {
+static int CmdHF14AMfCGetSc(const char *Cmd) {
     uint8_t data[16] = {0};
     uint8_t sector = 0;
     int i, res, flags;
@@ -2998,7 +3000,7 @@ int CmdHF14AMfCGetSc(const char *Cmd) {
     return 0;
 }
 
-int CmdHF14AMfCSave(const char *Cmd) {
+static int CmdHF14AMfCSave(const char *Cmd) {
 
     char filename[FILE_PATH_SIZE];
     char *fnameptr = filename;
@@ -3101,7 +3103,7 @@ int CmdHF14AMfCSave(const char *Cmd) {
 }
 
 //needs nt, ar, at, Data to decrypt
-int CmdHf14AMfDecryptBytes(const char *Cmd) {
+static int CmdHf14AMfDecryptBytes(const char *Cmd) {
 
     char ctmp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) < 1 || ctmp == 'h') return usage_hf14_decryptbytes();
@@ -3128,7 +3130,7 @@ int CmdHf14AMfDecryptBytes(const char *Cmd) {
     return 0;
 }
 
-int CmdHf14AMfSetMod(const char *Cmd) {
+static int CmdHf14AMfSetMod(const char *Cmd) {
     uint8_t key[6] = {0, 0, 0, 0, 0, 0};
     uint8_t mod = 2;
 
@@ -3165,7 +3167,7 @@ int CmdHf14AMfSetMod(const char *Cmd) {
 }
 
 // Mifare NACK bug detection
-int CmdHf14AMfNack(const char *Cmd) {
+static int CmdHf14AMfNack(const char *Cmd) {
 
     bool verbose = false;
     char ctmp = tolower(param_getchar(Cmd, 0));
@@ -3179,7 +3181,7 @@ int CmdHf14AMfNack(const char *Cmd) {
     return 0;
 }
 
-int CmdHF14AMfice(const char *Cmd) {
+static int CmdHF14AMfice(const char *Cmd) {
 
     uint8_t blockNo = 0;
     uint8_t keyType = 0;
@@ -3287,7 +3289,7 @@ out:
     return 0;
 }
 
-int CmdHF14AMfAuth4(const char *Cmd) {
+static int CmdHF14AMfAuth4(const char *Cmd) {
     uint8_t keyn[20] = {0};
     int keynlen = 0;
     uint8_t key[16] = {0};
@@ -3324,7 +3326,7 @@ int CmdHF14AMfAuth4(const char *Cmd) {
 }
 
 // https://www.nxp.com/docs/en/application-note/AN10787.pdf
-int CmdHF14AMfMAD(const char *Cmd) {
+static int CmdHF14AMfMAD(const char *Cmd) {
 
     CLIParserInit("hf mf mad",
                   "Checks and prints Mifare Application Directory (MAD)",
@@ -3414,7 +3416,7 @@ int CmdHF14AMfMAD(const char *Cmd) {
     return 0;
 }
 
-int CmdHFMFNDEF(const char *Cmd) {
+static int CmdHFMFNDEF(const char *Cmd) {
 
     CLIParserInit("hf mf ndef",
                   "Prints NFC Data Exchange Format (NDEF)",
@@ -3518,7 +3520,7 @@ int CmdHFMFNDEF(const char *Cmd) {
     return 0;
 }
 
-int CmdHF14AMfList(const char *Cmd) {
+static int CmdHF14AMfList(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     CmdTraceList("mf");
     return 0;
@@ -3569,14 +3571,15 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
+static int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
+    CmdsHelp(CommandTable);
+    return 0;
+}
+
 int CmdHFMF(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
-    (void)Cmd; // Cmd is not used so far
-    CmdsHelp(CommandTable);
-    return 0;
-}
diff --git a/client/cmdhfmf.h b/client/cmdhfmf.h
index 6de87291f..8b7e68a40 100644
--- a/client/cmdhfmf.h
+++ b/client/cmdhfmf.h
@@ -33,40 +33,8 @@
 #include "hardnested/hardnested_bf_core.h" // SetSIMDInstr
 
 int CmdHFMF(const char *Cmd);
-
-int CmdHF14AMfList(const char *Cmd);
-int CmdHF14AMfDbg(const char *Cmd);
-int CmdHF14AMfRdBl(const char *Cmd);
-int CmdHF14AMfURdBl(const char *Cmd);
-int CmdHF14AMfRdSc(const char *Cmd);
-int CmdHF14SMfURdCard(const char *Cmd);
-int CmdHF14AMfDump(const char *Cmd);
-int CmdHF14AMfRestore(const char *Cmd);
-int CmdHF14AMfWrBl(const char *Cmd);
-int CmdHF14AMfUWrBl(const char *Cmd);
-int CmdHF14AMfChk(const char *Cmd);
-int CmdHF14AMfDarkside(const char *Cmd);
-int CmdHF14AMfNested(const char *Cmd);
-int CmdHF14AMfNestedHard(const char *Cmd);
-//int CmdHF14AMfSniff(const char* Cmd);
-int CmdHF14AMf1kSim(const char *Cmd);
-int CmdHF14AMfKeyBrute(const char *Cmd);
-int CmdHF14AMfEClear(const char *Cmd);
-int CmdHF14AMfEGet(const char *Cmd);
-int CmdHF14AMfESet(const char *Cmd);
-int CmdHF14AMfELoad(const char *Cmd);
-int CmdHF14AMfESave(const char *Cmd);
-int CmdHF14AMfECFill(const char *Cmd);
-int CmdHF14AMfEKeyPrn(const char *Cmd);
-int CmdHF14AMfCSetUID(const char *Cmd);
-int CmdHF14AMfCSetBlk(const char *Cmd);
-int CmdHF14AMfCGetBlk(const char *Cmd);
-int CmdHF14AMfCGetSc(const char *Cmd);
-int CmdHF14AMfCLoad(const char *Cmd);
-int CmdHF14AMfCSave(const char *Cmd);
-int CmdHf14MfDecryptBytes(const char *Cmd);
-int CmdHf14AMfSetMod(const char *Cmd);
-int CmdHf14AMfNack(const char *Cmd);
+int CmdHF14AMfELoad(const char *Cmd); // used by cmd hf mfu eload
+int CmdHF14AMfDbg(const char *Cmd);   // used by cmd hf mfu dbg
 
 void showSectorTable(void);
 void readerAttack(nonces_t data, bool setEmulatorMem, bool verbose);
diff --git a/client/cmdhfmfdes.c b/client/cmdhfmfdes.c
index d967cca39..272e017a5 100644
--- a/client/cmdhfmfdes.c
+++ b/client/cmdhfmfdes.c
@@ -19,7 +19,7 @@ uint8_t key_picc_data[16] = { 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x
 
 static int CmdHelp(const char *Cmd);
 
-int CmdHF14ADesWb(const char *Cmd) {
+static int CmdHF14ADesWb(const char *Cmd) {
     /*  uint8_t blockNo = 0;
         uint8_t keyType = 0;
         uint8_t key[6] = {0, 0, 0, 0, 0, 0};
@@ -67,7 +67,7 @@ int CmdHF14ADesWb(const char *Cmd) {
     return 0;
 }
 
-int CmdHF14ADesRb(const char *Cmd) {
+static int CmdHF14ADesRb(const char *Cmd) {
     // uint8_t blockNo = 0;
     // uint8_t keyType = 0;
     // uint8_t key[6] = {0, 0, 0, 0, 0, 0};
@@ -114,7 +114,7 @@ int CmdHF14ADesRb(const char *Cmd) {
     return 0;
 }
 
-int CmdHF14ADesInfo(const char *Cmd) {
+static int CmdHF14ADesInfo(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
 
     UsbCommand c = {CMD_MIFARE_DESFIRE_INFO, {0, 0, 0}, {{0}}};
@@ -152,21 +152,21 @@ int CmdHF14ADesInfo(const char *Cmd) {
     PrintAndLogEx(NORMAL, "      Vendor Id      : %s", getTagInfo(resp.d.asBytes[7]));
     PrintAndLogEx(NORMAL, "      Type           : 0x%02X", resp.d.asBytes[8]);
     PrintAndLogEx(NORMAL, "      Subtype        : 0x%02X", resp.d.asBytes[9]);
-    PrintAndLogEx(NORMAL, "      Version        : %s", GetVersionStr(resp.d.asBytes[10], resp.d.asBytes[11]));
-    PrintAndLogEx(NORMAL, "      Storage size   : %s", GetCardSizeStr(resp.d.asBytes[12]));
-    PrintAndLogEx(NORMAL, "      Protocol       : %s", GetProtocolStr(resp.d.asBytes[13]));
+    PrintAndLogEx(NORMAL, "      Version        : %s", getVersionStr(resp.d.asBytes[10], resp.d.asBytes[11]));
+    PrintAndLogEx(NORMAL, "      Storage size   : %s", getCardSizeStr(resp.d.asBytes[12]));
+    PrintAndLogEx(NORMAL, "      Protocol       : %s", getProtocolStr(resp.d.asBytes[13]));
     PrintAndLogEx(NORMAL, "  -----------------------------------------------------------");
     PrintAndLogEx(NORMAL, "  Software Information");
     PrintAndLogEx(NORMAL, "      Vendor Id      : %s", getTagInfo(resp.d.asBytes[14]));
     PrintAndLogEx(NORMAL, "      Type           : 0x%02X", resp.d.asBytes[15]);
     PrintAndLogEx(NORMAL, "      Subtype        : 0x%02X", resp.d.asBytes[16]);
     PrintAndLogEx(NORMAL, "      Version        : %d.%d", resp.d.asBytes[17], resp.d.asBytes[18]);
-    PrintAndLogEx(NORMAL, "      storage size   : %s", GetCardSizeStr(resp.d.asBytes[19]));
-    PrintAndLogEx(NORMAL, "      Protocol       : %s", GetProtocolStr(resp.d.asBytes[20]));
+    PrintAndLogEx(NORMAL, "      storage size   : %s", getCardSizeStr(resp.d.asBytes[19]));
+    PrintAndLogEx(NORMAL, "      Protocol       : %s", getProtocolStr(resp.d.asBytes[20]));
     PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
 
     // Master Key settings
-    GetKeySettings(NULL);
+    getKeySettings(NULL);
 
     // Free memory on card
     c.cmd = CMD_MIFARE_DESFIRE;
@@ -207,7 +207,7 @@ int CmdHF14ADesInfo(const char *Cmd) {
     and set to '1' if the storage size is between 2^n and 2^(n+1).
     For this version of DESFire the 7 MSBits are set to 0x0C (2^12 = 4096) and the LSBit is '0'.
 */
-char *GetCardSizeStr(uint8_t fsize) {
+char *getCardSizeStr(uint8_t fsize) {
 
     static char buf[30] = {0x00};
     char *retStr = buf;
@@ -223,7 +223,7 @@ char *GetCardSizeStr(uint8_t fsize) {
     return buf;
 }
 
-char *GetProtocolStr(uint8_t id) {
+char *getProtocolStr(uint8_t id) {
 
     static char buf[30] = {0x00};
     char *retStr = buf;
@@ -235,7 +235,7 @@ char *GetProtocolStr(uint8_t id) {
     return buf;
 }
 
-char *GetVersionStr(uint8_t major, uint8_t minor) {
+char *getVersionStr(uint8_t major, uint8_t minor) {
 
     static char buf[30] = {0x00};
     char *retStr = buf;
@@ -251,7 +251,7 @@ char *GetVersionStr(uint8_t major, uint8_t minor) {
     return buf;
 }
 
-void GetKeySettings(uint8_t *aid) {
+void getKeySettings(uint8_t *aid) {
 
     char messStr[512] = {0x00};
     const char *str = messStr;
@@ -421,7 +421,7 @@ void GetKeySettings(uint8_t *aid) {
     }
 }
 
-int CmdHF14ADesEnumApplications(const char *Cmd) {
+static int CmdHF14ADesEnumApplications(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
 
     uint8_t isOK = 0x00;
@@ -459,7 +459,7 @@ int CmdHF14ADesEnumApplications(const char *Cmd) {
         aid[0] = resp.d.asBytes[i];
         aid[1] = resp.d.asBytes[i + 1];
         aid[2] = resp.d.asBytes[i + 2];
-        GetKeySettings(aid);
+        getKeySettings(aid);
 
         // Select Application
         c.arg[CMDPOS] = INIT;
@@ -533,7 +533,7 @@ int CmdHF14ADesEnumApplications(const char *Cmd) {
 // MIAFRE DesFire Authentication
 //
 #define BUFSIZE 256
-int CmdHF14ADesAuth(const char *Cmd) {
+static int CmdHF14ADesAuth(const char *Cmd) {
 
     // NR  DESC     KEYLENGHT
     // ------------------------
@@ -651,6 +651,12 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
+static int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
+    CmdsHelp(CommandTable);
+    return 0;
+}
+
 int CmdHFMFDes(const char *Cmd) {
     // flush
     clearCommandBuffer();
@@ -658,10 +664,3 @@ int CmdHFMFDes(const char *Cmd) {
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
-    (void)Cmd; // Cmd is not used so far
-    CmdsHelp(CommandTable);
-    return 0;
-}
-
-
diff --git a/client/cmdhfmfdes.h b/client/cmdhfmfdes.h
index dff5294a5..70e61e757 100644
--- a/client/cmdhfmfdes.h
+++ b/client/cmdhfmfdes.h
@@ -25,16 +25,11 @@
 #include "mbedtls/des.h"
 
 int CmdHFMFDes(const char *Cmd);
-int CmdHF14ADesAuth(const char *Cmd);
-int CmdHF14ADesRb(const char *Cmd);
-int CmdHF14ADesWb(const char *Cmd);
-int CmdHF14ADesInfo(const char *Cmd);
-int CmdHF14ADesEnumApplications(const char *Cmd);
 
-char *GetCardSizeStr(uint8_t fsize);
-char *GetProtocolStr(uint8_t id);
-char *GetVersionStr(uint8_t major, uint8_t minor);
-void GetKeySettings(uint8_t *aid);
+char *getCardSizeStr(uint8_t fsize);
+char *getProtocolStr(uint8_t id);
+char *getVersionStr(uint8_t major, uint8_t minor);
+void getKeySettings(uint8_t *aid);
 
 // Command options for Desfire behavior.
 enum  {
diff --git a/client/cmdhfmfdesfire.c b/client/cmdhfmfdesfire.c
index cb8259da1..b55460fa8 100644
--- a/client/cmdhfmfdesfire.c
+++ b/client/cmdhfmfdesfire.c
@@ -26,7 +26,7 @@ static int CmdHelp(const char *Cmd);
 //n'r=rol(r5)
 //verify n'r=nr
 
-int CmdHF14AMfDESAuth(const char *Cmd) {
+static int CmdHF14AMfDESAuth(const char *Cmd) {
 
     uint8_t blockNo = 0;
     //keyNo=0;
@@ -119,7 +119,7 @@ int CmdHF14AMfDESAuth(const char *Cmd) {
 // Card 2 Reader : 02AF, 16 Bytes(b0), CRC1 CRC2
 // Reader 2 Card : 03AF, 16 Bytes(b1),16Bytes(b2) CRC1 CRC2
 // Card 2 Reader : 0300, 16 bytes(b3), CRC1 CRC2 ; success
-int CmdHF14AMfAESAuth(const char *Cmd) {
+static int CmdHF14AMfAESAuth(const char *Cmd) {
 
     uint8_t blockNo = 0;
     //keyNo=0;
@@ -233,14 +233,14 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
+static int CmdHelp(const char *Cmd) {
+    CmdsHelp(CommandTable);
+    return 0;
+}
+
 int CmdHFMFDesfire(const char *Cmd) {
     // flush
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
-
-int CmdHelp(const char *Cmd) {
-    CmdsHelp(CommandTable);
-    return 0;
-}
diff --git a/client/cmdhfmfdesfire.h b/client/cmdhfmfdesfire.h
index 4b554585f..bfa653dc3 100644
--- a/client/cmdhfmfdesfire.h
+++ b/client/cmdhfmfdesfire.h
@@ -6,8 +6,6 @@
 #include "mbedtls/des.h"
 #include "mbedtls/aes.h"
 
-int CmdHF14AMfDESAuth(const char *Cmd);
 int CmdHFMFDesfire(const char *Cmd);
-int CmdHelp(const char *Cmd);
 
 #endif
diff --git a/client/cmdhfmfp.c b/client/cmdhfmfp.c
index 9425a3161..554d3ab89 100644
--- a/client/cmdhfmfp.c
+++ b/client/cmdhfmfp.c
@@ -33,13 +33,13 @@ static const uint8_t DefaultKey[16] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
 
 static int CmdHelp(const char *Cmd);
 
-int CmdHFMFPInfo(const char *cmd) {
+static int CmdHFMFPInfo(const char *cmd) {
 
     if (cmd && strlen(cmd) > 0)
         PrintAndLogEx(WARNING, "command don't have any parameters.\n");
 
     // info about 14a part
-    CmdHF14AInfo("");
+    infoHF14A(false, false);
 
     // Mifare Plus info
     UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}, {{0}}};
@@ -112,7 +112,7 @@ int CmdHFMFPInfo(const char *cmd) {
     return 0;
 }
 
-int CmdHFMFPWritePerso(const char *cmd) {
+static int CmdHFMFPWritePerso(const char *cmd) {
     uint8_t keyNum[64] = {0};
     int keyNumLen = 0;
     uint8_t key[64] = {0};
@@ -178,7 +178,7 @@ int CmdHFMFPWritePerso(const char *cmd) {
 
 uint16_t CardAddresses[] = {0x9000, 0x9001, 0x9002, 0x9003, 0x9004, 0xA000, 0xA001, 0xA080, 0xA081, 0xC000, 0xC001};
 
-int CmdHFMFPInitPerso(const char *cmd) {
+static int CmdHFMFPInitPerso(const char *cmd) {
     int res;
     uint8_t key[256] = {0};
     int keyLen = 0;
@@ -252,7 +252,7 @@ int CmdHFMFPInitPerso(const char *cmd) {
     return 0;
 }
 
-int CmdHFMFPCommitPerso(const char *cmd) {
+static int CmdHFMFPCommitPerso(const char *cmd) {
     CLIParserInit("hf mfp commitp",
                   "Executes Commit Perso command. Can be used in SL0 mode only.",
                   "Usage:\n\thf mfp commitp ->  \n");
@@ -293,7 +293,7 @@ int CmdHFMFPCommitPerso(const char *cmd) {
     return 0;
 }
 
-int CmdHFMFPAuth(const char *cmd) {
+static int CmdHFMFPAuth(const char *cmd) {
     uint8_t keyn[250] = {0};
     int keynlen = 0;
     uint8_t key[250] = {0};
@@ -331,7 +331,7 @@ int CmdHFMFPAuth(const char *cmd) {
     return MifareAuth4(NULL, keyn, key, true, false, verbose);
 }
 
-int CmdHFMFPRdbl(const char *cmd) {
+static int CmdHFMFPRdbl(const char *cmd) {
     uint8_t keyn[2] = {0};
     uint8_t key[250] = {0};
     int keylen = 0;
@@ -443,7 +443,7 @@ int CmdHFMFPRdbl(const char *cmd) {
     return 0;
 }
 
-int CmdHFMFPRdsc(const char *cmd) {
+static int CmdHFMFPRdsc(const char *cmd) {
     uint8_t keyn[2] = {0};
     uint8_t key[250] = {0};
     int keylen = 0;
@@ -539,7 +539,7 @@ int CmdHFMFPRdsc(const char *cmd) {
     return 0;
 }
 
-int CmdHFMFPWrbl(const char *cmd) {
+static int CmdHFMFPWrbl(const char *cmd) {
     uint8_t keyn[2] = {0};
     uint8_t key[250] = {0};
     int keylen = 0;
@@ -641,7 +641,7 @@ int CmdHFMFPWrbl(const char *cmd) {
     return 0;
 }
 
-int CmdHFMFPMAD(const char *cmd) {
+static int CmdHFMFPMAD(const char *cmd) {
 
     CLIParserInit("hf mfp mad",
                   "Checks and prints Mifare Application Directory (MAD)",
@@ -735,7 +735,7 @@ int CmdHFMFPMAD(const char *cmd) {
     return 0;
 }
 
-int CmdHFMFPNDEF(const char *cmd) {
+static int CmdHFMFPNDEF(const char *cmd) {
 
     CLIParserInit("hf mfp ndef",
                   "Prints NFC Data Exchange Format (NDEF)",
@@ -854,14 +854,15 @@ static command_t CommandTable[] = {
     {NULL,               NULL,                    0, NULL}
 };
 
+static int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
+    CmdsHelp(CommandTable);
+    return 0;
+}
+
 int CmdHFMFP(const char *Cmd) {
     (void)WaitForResponseTimeout(CMD_ACK, NULL, 100);
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
-    (void)Cmd; // Cmd is not used so far
-    CmdsHelp(CommandTable);
-    return 0;
-}
diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index c648d954a..948b2e5f1 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -1117,7 +1117,7 @@ uint32_t GetHF14AMfU_Type(void) {
 //
 //  extended tag information
 //
-int CmdHF14AMfUInfo(const char *Cmd) {
+static int CmdHF14AMfUInfo(const char *Cmd) {
 
     uint8_t authlim = 0xff;
     uint8_t data[16] = {0x00};
@@ -1223,7 +1223,7 @@ int CmdHF14AMfUInfo(const char *Cmd) {
             // if we called info with key, just return
             if (hasAuthKey) return 1;
 
-            // also try to diversify default keys..  look into CmdHF14AMfuGenDiverseKeys
+            // also try to diversify default keys..  look into CmdHF14AMfGenDiverseKeys
             PrintAndLogEx(INFO, "Trying some default 3des keys");
             for (uint8_t i = 0; i < KEYS_3DES_COUNT; ++i) {
                 key = default_3des_keys[i];
@@ -1380,7 +1380,7 @@ out:
 //
 //  Write Single Block
 //
-int CmdHF14AMfUWrBl(const char *Cmd) {
+static int CmdHF14AMfUWrBl(const char *Cmd) {
 
     int blockNo = -1;
     bool errors = false;
@@ -1501,7 +1501,7 @@ int CmdHF14AMfUWrBl(const char *Cmd) {
 //
 //  Read Single Block
 //
-int CmdHF14AMfURdBl(const char *Cmd) {
+static int CmdHF14AMfURdBl(const char *Cmd) {
 
     int blockNo = -1;
     bool errors = false;
@@ -1759,7 +1759,7 @@ void printMFUdumpEx(mfu_dump_t *card, uint16_t pages, uint8_t startpage) {
 //
 //  Mifare Ultralight / Ultralight-C / Ultralight-EV1
 //  Read and Dump Card Contents,  using auto detection of tag size.
-int CmdHF14AMfUDump(const char *Cmd) {
+static int CmdHF14AMfUDump(const char *Cmd) {
 
     uint8_t fileNameLen = 0;
     char filename[FILE_PATH_SIZE] = {0x00};
@@ -1995,7 +1995,7 @@ static void wait4response(uint8_t b) {
 //
 //  Restore dump file onto tag
 //
-int CmdHF14AMfURestore(const char *Cmd) {
+static int CmdHF14AMfURestore(const char *Cmd) {
 
     char tempStr[50] = {0};
     char filename[FILE_PATH_SIZE] = {0};
@@ -2227,7 +2227,7 @@ int CmdHF14AMfURestore(const char *Cmd) {
 //
 //  Load emulator with dump file
 //
-int CmdHF14AMfUeLoad(const char *Cmd) {
+static int CmdHF14AMfUeLoad(const char *Cmd) {
     char c = tolower(param_getchar(Cmd, 0));
     if (c == 'h' || c == 0x00) return usage_hf_mfu_eload();
     return CmdHF14AMfELoad(Cmd);
@@ -2235,7 +2235,7 @@ int CmdHF14AMfUeLoad(const char *Cmd) {
 //
 //  Simulate tag
 //
-int CmdHF14AMfUSim(const char *Cmd) {
+static int CmdHF14AMfUSim(const char *Cmd) {
     char c = tolower(param_getchar(Cmd, 0));
     if (c == 'h' || c == 0x00) return usage_hf_mfu_sim();
     return CmdHF14ASim(Cmd);
@@ -2248,7 +2248,7 @@ int CmdHF14AMfUSim(const char *Cmd) {
 //
 // Ultralight C Authentication Demo {currently uses hard-coded key}
 //
-int CmdHF14AMfucAuth(const char *Cmd) {
+static int CmdHF14AMfUCAuth(const char *Cmd) {
 
     uint8_t keyNo = 3;
     bool errors = false;
@@ -2280,7 +2280,7 @@ A test function to validate that the polarssl-function works the same
 was as the openssl-implementation.
 Commented out, since it requires openssl
 
-int CmdTestDES(const char * cmd)
+static int CmdTestDES(const char * cmd)
 {
     uint8_t key[16] = {0x00};
 
@@ -2375,7 +2375,7 @@ int CmdTestDES(const char * cmd)
 //
 // Mifare Ultralight C - Set password
 //
-int CmdHF14AMfucSetPwd(const char *Cmd) {
+static int CmdHF14AMfUCSetPwd(const char *Cmd) {
 
     uint8_t pwd[16] = {0x00};
     char cmdp = tolower(param_getchar(Cmd, 0));
@@ -2410,7 +2410,7 @@ int CmdHF14AMfucSetPwd(const char *Cmd) {
 //
 // Magic UL / UL-C tags  - Set UID
 //
-int CmdHF14AMfucSetUid(const char *Cmd) {
+static int CmdHF14AMfUCSetUid(const char *Cmd) {
 
     UsbCommand c = {CMD_MIFAREU_READBL, {0, 0, 0}, {{0}}};
     UsbCommand resp;
@@ -2479,7 +2479,7 @@ int CmdHF14AMfucSetUid(const char *Cmd) {
     return 0;
 }
 
-int CmdHF14AMfuGenDiverseKeys(const char *Cmd) {
+static int CmdHF14AMfUGenDiverseKeys(const char *Cmd) {
 
     uint8_t uid[4];
     char cmdp = tolower(param_getchar(Cmd, 0));
@@ -2592,7 +2592,7 @@ int CmdHF14AMfuGenDiverseKeys(const char *Cmd) {
     return 0;
 }
 
-int CmdHF14AMfuPwdGen(const char *Cmd) {
+static int CmdHF14AMfUPwdGen(const char *Cmd) {
 
     uint8_t uid[7] = {0x00};
     char cmdp = tolower(param_getchar(Cmd, 0));
@@ -2654,23 +2654,24 @@ static command_t CommandTable[] = {
     {"eload",   CmdHF14AMfUeLoad,   0, "load Ultralight .eml dump file into emulator memory"},
     {"rdbl",    CmdHF14AMfURdBl,    0, "Read block"},
     {"wrbl",    CmdHF14AMfUWrBl,    0, "Write block"},
-    {"cauth",   CmdHF14AMfucAuth,   0, "Authentication    - Ultralight C"},
-    {"setpwd",  CmdHF14AMfucSetPwd, 0, "Set 3des password - Ultralight-C"},
-    {"setuid",  CmdHF14AMfucSetUid, 0, "Set UID - MAGIC tags only"},
+    {"cauth",   CmdHF14AMfUCAuth,   0, "Authentication    - Ultralight C"},
+    {"setpwd",  CmdHF14AMfUCSetPwd, 0, "Set 3des password - Ultralight-C"},
+    {"setuid",  CmdHF14AMfUCSetUid, 0, "Set UID - MAGIC tags only"},
     {"sim",     CmdHF14AMfUSim,     0, "Simulate Ultralight from emulator memory"},
-    {"gen",     CmdHF14AMfuGenDiverseKeys, 1, "Generate 3des mifare diversified keys"},
-    {"pwdgen",  CmdHF14AMfuPwdGen,  1, "Generate pwd from known algos"},
+    {"gen",     CmdHF14AMfUGenDiverseKeys, 1, "Generate 3des mifare diversified keys"},
+    {"pwdgen",  CmdHF14AMfUPwdGen,  1, "Generate pwd from known algos"},
     {NULL, NULL, 0, NULL}
 };
 
+static int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
+    CmdsHelp(CommandTable);
+    return 0;
+}
+
 int CmdHFMFUltra(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
-    (void)Cmd; // Cmd is not used so far
-    CmdsHelp(CommandTable);
-    return 0;
-}
diff --git a/client/cmdhfmfu.h b/client/cmdhfmfu.h
index a142fb740..444a55ea6 100644
--- a/client/cmdhfmfu.h
+++ b/client/cmdhfmfu.h
@@ -25,23 +25,6 @@ typedef struct {
     uint8_t data[1024];
 } mfu_dump_t;
 
-int CmdHF14AMfUWrBl(const char *Cmd);
-int CmdHF14AMfURdBl(const char *Cmd);
-
-//Crypto Cards
-int CmdHF14AMfucAuth(const char *Cmd);
-int CmdHF14AMfucSetPwd(const char *Cmd);
-int CmdHF14AMfucSetUid(const char *Cmd);
-int CmdHF14AMfuGenDiverseKeys(const char *Cmd);
-int CmdHF14AMfuPwdGen(const char *Cmd);
-
-//general stuff
-int CmdHF14AMfUDump(const char *Cmd);
-int CmdHF14AMfURestore(const char *Cmd);
-int CmdHF14AMfUInfo(const char *Cmd);
-int CmdHF14AMfUeLoad(const char *Cmd);
-int CmdHF14AMfUSim(const char *Cmd);
-
 uint32_t GetHF14AMfU_Type(void);
 int ul_print_type(uint32_t tagtype, uint8_t spaces);
 
diff --git a/client/cmdhftopaz.c b/client/cmdhftopaz.c
index 64cf09647..f3e9889bb 100644
--- a/client/cmdhftopaz.c
+++ b/client/cmdhftopaz.c
@@ -371,7 +371,7 @@ static void topaz_print_NDEF(uint8_t *data) {
 }
 
 // read a Topaz tag and print some useful information
-int CmdHFTopazReader(const char *Cmd) {
+static int CmdHFTopazReader(const char *Cmd) {
     int status;
     uint8_t atqa[2];
     uint8_t rid_response[8];
@@ -487,19 +487,19 @@ int CmdHFTopazReader(const char *Cmd) {
     return 0;
 }
 
-int CmdHFTopazSim(const char *Cmd) {
+static int CmdHFTopazSim(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     PrintAndLogEx(NORMAL, "not yet implemented");
     return 0;
 }
 
-int CmdHFTopazCmdRaw(const char *Cmd) {
+static int CmdHFTopazCmdRaw(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     PrintAndLogEx(NORMAL, "not yet implemented. Use hf 14 raw with option -T.");
     return 0;
 }
 
-int CmdHFTopazList(const char *Cmd) {
+static int CmdHFTopazList(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     CmdTraceList("topaz");
     return 0;
@@ -517,16 +517,18 @@ static command_t CommandTable[] = {
     {NULL,      NULL,               0, NULL}
 };
 
-int CmdHFTopaz(const char *Cmd) {
-    clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
-}
-
 static int CmdHelp(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
 
+int CmdHFTopaz(const char *Cmd) {
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
+    return 0;
+}
 
+int readTopazUid(void) {
+    return CmdHFTopazReader("s");
+}
diff --git a/client/cmdhftopaz.h b/client/cmdhftopaz.h
index 551031778..ed0b37a08 100644
--- a/client/cmdhftopaz.h
+++ b/client/cmdhftopaz.h
@@ -26,9 +26,6 @@
 #include "cmdhf.h"
 
 int CmdHFTopaz(const char *Cmd);
-int CmdHFTopazReader(const char *Cmd);
-int CmdHFTopazSim(const char *Cmd);
-int CmdHFTopazCmdRaw(const char *Cmd);
-int CmdHFTopazList(const char *Cmd);
 
+int readTopazUid(void);
 #endif
diff --git a/client/cmdlfnedap.c b/client/cmdlfnedap.c
index 18e142be0..c6fd07b62 100644
--- a/client/cmdlfnedap.c
+++ b/client/cmdlfnedap.c
@@ -42,7 +42,7 @@ static int usage_lf_nedap_sim(void) {
 
 //NEDAP demod - ASK/Biphase (or Diphase),  RF/64 with preamble of 1111111110  (always a 128 bit data stream)
 //print NEDAP Prox ID, encoding, encrypted ID,
-int CmdLFNedapDemod(const char *Cmd) {
+static int CmdLFNedapDemod(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     //raw ask demod no start bit finding just get binary from wave
     if (!ASKbiphaseDemod("0 64 1 0", false)) {
@@ -162,12 +162,12 @@ lf t55xx wr b 4 d 4c0003ff
 
 */
 
-int CmdLFNedapRead(const char *Cmd) {
+static int CmdLFNedapRead(const char *Cmd) {
     lf_read(true, 12000);
     return CmdLFNedapDemod(Cmd);
 }
 /*
-int CmdLFNedapClone(const char *Cmd) {
+static int CmdLFNedapClone(const char *Cmd) {
 
     char cmdp = param_getchar(Cmd, 0);
     if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_nedap_clone();
@@ -219,7 +219,7 @@ int CmdLFNedapClone(const char *Cmd) {
 }
 */
 
-int CmdLFNedapSim(const char *Cmd) {
+static int CmdLFNedapSim(const char *Cmd) {
 
     uint32_t cardnumber = 0, cn = 0;
 
@@ -255,7 +255,7 @@ int CmdLFNedapSim(const char *Cmd) {
     return 0;
 }
 
-int CmdLFNedapChk(const char *Cmd) {
+static int CmdLFNedapChk(const char *Cmd) {
     //301600714021BE
     uint8_t data[256] = { 0x30, 0x16, 0x00, 0x71, 0x40, 0x21, 0xBE};
     int len = 0;
@@ -312,15 +312,15 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
-int CmdLFNedap(const char *Cmd) {
-    clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
+static int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
+    CmdsHelp(CommandTable);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
-    (void)Cmd; // Cmd is not used so far
-    CmdsHelp(CommandTable);
+int CmdLFNedap(const char *Cmd) {
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index 993aee37b..d8c7b6c54 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -54,7 +54,7 @@ void PrintChannel(EMVCommandChannel channel) {
     }
 }
 
-int CmdEMVSelect(const char *Cmd) {
+static int CmdEMVSelect(const char *Cmd) {
     uint8_t data[APDU_AID_LEN] = {0};
     int datalen = 0;
 
@@ -105,7 +105,7 @@ int CmdEMVSelect(const char *Cmd) {
     return 0;
 }
 
-int CmdEMVSearch(const char *Cmd) {
+static int CmdEMVSearch(const char *Cmd) {
 
     CLIParserInit("emv search",
                   "Tries to select all applets from applet list:\n",
@@ -155,7 +155,7 @@ int CmdEMVSearch(const char *Cmd) {
     return 0;
 }
 
-int CmdEMVPPSE(const char *Cmd) {
+static int CmdEMVPPSE(const char *Cmd) {
 
     CLIParserInit("emv pse",
                   "Executes PSE/PPSE select command. It returns list of applet on the card:\n",
@@ -210,7 +210,7 @@ int CmdEMVPPSE(const char *Cmd) {
     return 0;
 }
 
-int CmdEMVGPO(const char *Cmd) {
+static int CmdEMVGPO(const char *Cmd) {
     uint8_t data[APDU_RES_LEN] = {0};
     int datalen = 0;
 
@@ -317,7 +317,7 @@ int CmdEMVGPO(const char *Cmd) {
     return 0;
 }
 
-int CmdEMVReadRecord(const char *Cmd) {
+static int CmdEMVReadRecord(const char *Cmd) {
     uint8_t data[APDU_RES_LEN] = {0};
     int datalen = 0;
 
@@ -372,7 +372,7 @@ int CmdEMVReadRecord(const char *Cmd) {
     return 0;
 }
 
-int CmdEMVAC(const char *Cmd) {
+static int CmdEMVAC(const char *Cmd) {
     uint8_t data[APDU_RES_LEN] = {0};
     int datalen = 0;
 
@@ -493,7 +493,7 @@ int CmdEMVAC(const char *Cmd) {
     return 0;
 }
 
-int CmdEMVGenerateChallenge(const char *Cmd) {
+static int CmdEMVGenerateChallenge(const char *Cmd) {
 
     CLIParserInit("emv challenge",
                   "Executes Generate Challenge command. It returns 4 or 8-byte random number from card.\nNeeds a EMV applet to be selected and GPO to be executed.",
@@ -538,7 +538,7 @@ int CmdEMVGenerateChallenge(const char *Cmd) {
     return 0;
 }
 
-int CmdEMVInternalAuthenticate(const char *Cmd) {
+static int CmdEMVInternalAuthenticate(const char *Cmd) {
     uint8_t data[APDU_RES_LEN] = {0};
     int datalen = 0;
 
@@ -749,7 +749,7 @@ void ProcessACResponseFormat1(struct tlvdb *tlvRoot, uint8_t *buf, size_t len, b
     }
 }
 
-int CmdEMVExec(const char *Cmd) {
+static int CmdEMVExec(const char *Cmd) {
     uint8_t buf[APDU_RES_LEN] = {0};
     size_t len = 0;
     uint16_t sw = 0;
@@ -1346,7 +1346,7 @@ int CmdEMVExec(const char *Cmd) {
     return 0;
 }
 
-int CmdEMVScan(const char *Cmd) {
+static int CmdEMVScan(const char *Cmd) {
     uint8_t AID[APDU_AID_LEN] = {0};
     size_t AIDlen = 0;
     uint8_t buf[APDU_RES_LEN] = {0};
@@ -1700,17 +1700,17 @@ int CmdEMVScan(const char *Cmd) {
     return 0;
 }
 
-int CmdEMVList(const char *Cmd) {
+static int CmdEMVList(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     return CmdTraceList("7816");
 }
 
-int CmdEMVTest(const char *Cmd) {
+static int CmdEMVTest(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     return ExecuteCryptoTests(true);
 }
 
-int CmdEMVRoca(const char *Cmd) {
+static int CmdEMVRoca(const char *Cmd) {
     uint8_t AID[APDU_AID_LEN] = {0};
     size_t AIDlen = 0;
     uint8_t buf[APDU_RES_LEN] = {0};
@@ -1966,13 +1966,14 @@ static command_t CommandTable[] =  {
     {NULL, NULL, 0, NULL}
 };
 
+static int CmdHelp(const char *Cmd) {
+    CmdsHelp(CommandTable);
+    return 0;
+}
+
 int CmdEMV(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
-    CmdsHelp(CommandTable);
-    return 0;
-}
diff --git a/client/emv/cmdemv.h b/client/emv/cmdemv.h
index 4d2b99471..8cdcdf990 100644
--- a/client/emv/cmdemv.h
+++ b/client/emv/cmdemv.h
@@ -29,12 +29,4 @@
 
 int CmdEMV(const char *Cmd);
 
-int CmdEMVSelect(const char *Cmd);
-int CmdEMVSearch(const char *Cmd);
-int CmdEMVPPSE(const char *Cmd);
-int CmdEMVExec(const char *Cmd);
-int CmdEMVGetrng(const char *Cmd);
-int CmdEMVList(const char *Cmd);
-int CmdEMVRoca(const char *Cmd);
-
 #endif

From 4f326550044a6a84c4601528c4f951ebdd4c7fce Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 13 Apr 2019 00:25:43 +0200
Subject: [PATCH 1203/1938] use more static and fix [-Wmissing-prototypes],
 ongoing...

---
 client/cmddata.c              | 79 +++++++++++++++++++----------------
 client/cmddata.h              | 51 +++++++++++-----------
 client/comms.c                |  2 +-
 client/crypto/libpcrypto.c    |  8 ++--
 client/emv/apduinfo.c         |  2 +-
 client/emv/cmdemv.c           | 10 ++---
 client/emv/emv_roca.c         | 13 +++---
 client/emv/emvcore.c          |  6 +--
 client/emv/emvjson.c          |  2 +-
 client/emv/test/crypto_test.c |  1 +
 client/emv/test/sda_test.c    |  1 +
 client/fido/cbortools.c       |  4 +-
 client/fido/cose.c            |  2 +-
 client/fido/fidocore.c        |  2 +-
 client/loclass/cipher.c       | 17 ++++----
 client/loclass/cipherutils.c  |  9 ++--
 client/loclass/elite_crack.c  | 17 ++++----
 client/loclass/hash1_brute.c  |  7 ++--
 client/loclass/ikeys.c        | 36 ++++++++--------
 client/mifare/mad.c           |  4 +-
 client/mifare/mifare4.c       | 10 ++---
 client/mifare/mifarehost.c    |  4 +-
 client/util.c                 | 14 +++----
 client/util.h                 |  1 +
 common/lfdemod.c              | 16 +++----
 25 files changed, 167 insertions(+), 151 deletions(-)

diff --git a/client/cmddata.c b/client/cmddata.c
index 67e711293..c568315c9 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -262,33 +262,37 @@ bool getDemodBuff(uint8_t *buff, size_t *size) {
 
 // include <math.h>
 // Root mean square
-double rms(double *v, size_t n) {
+/*
+static double rms(double *v, size_t n) {
     double sum = 0.0;
     for (size_t i = 0; i < n; i++)
         sum += v[i] * v[i];
     return sqrt(sum / n);
 }
-int cmp_int(const void *a, const void *b) {
+
+static int cmp_int(const void *a, const void *b) {
     if (*(const int *)a < * (const int *)b)
         return -1;
     else
         return *(const int *)a > *(const int *)b;
 }
-int cmp_uint8(const void *a, const void *b) {
+static int cmp_uint8(const void *a, const void *b) {
     if (*(const uint8_t *)a < * (const uint8_t *)b)
         return -1;
     else
         return *(const uint8_t *)a > *(const uint8_t *)b;
 }
 // Median of a array of values
-double median_int(int *src, size_t size) {
+
+static double median_int(int *src, size_t size) {
     qsort(src, size, sizeof(int), cmp_int);
     return 0.5 * (src[size / 2] + src[(size - 1) / 2]);
 }
-double median_uint8(uint8_t *src, size_t size) {
+static double median_uint8(uint8_t *src, size_t size) {
     qsort(src, size, sizeof(uint8_t), cmp_uint8);
     return 0.5 * (src[size / 2] + src[(size - 1) / 2]);
 }
+*/
 // function to compute mean for a series
 static double compute_mean(const int *data, size_t n) {
     double mean = 0.0;
@@ -358,7 +362,7 @@ void save_restoreDB(uint8_t saveOpt) {
     }
 }
 
-int CmdSetDebugMode(const char *Cmd) {
+static int CmdSetDebugMode(const char *Cmd) {
     int demod = 0;
     sscanf(Cmd, "%i", &demod);
     g_debugMode = (uint8_t)demod;
@@ -550,7 +554,7 @@ int ASKDemod(const char *Cmd, bool verbose, bool emSearch, uint8_t askType) {
 //takes 5 arguments - clock, invert, maxErr, maxLen as integers and amplify as char == 'a'
 //attempts to demodulate ask while decoding manchester
 //prints binary found and saves in graphbuffer for further commands
-int Cmdaskmandemod(const char *Cmd) {
+static int Cmdaskmandemod(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) > 45 || cmdp == 'h') return usage_data_rawdemod_am();
 
@@ -705,7 +709,7 @@ int ASKbiphaseDemod(const char *Cmd, bool verbose) {
     return 1;
 }
 //by marshmellow - see ASKbiphaseDemod
-int Cmdaskbiphdemod(const char *Cmd) {
+static int Cmdaskbiphdemod(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) > 25 || cmdp == 'h') return usage_data_rawdemod_ab();
 
@@ -713,7 +717,7 @@ int Cmdaskbiphdemod(const char *Cmd) {
 }
 
 //by marshmellow - see ASKDemod
-int Cmdaskrawdemod(const char *Cmd) {
+static int Cmdaskrawdemod(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) > 25 || cmdp == 'h') return usage_data_rawdemod_ar();
 
@@ -954,7 +958,7 @@ int AskEdgeDetect(const int *in, int *out, int len, int threshold) {
 //use large jumps in read samples to identify edges of waves and then amplify that wave to max
 //similar to dirtheshold, threshold commands
 //takes a threshold length which is the measured length between two samples then determines an edge
-int CmdAskEdgeDetect(const char *Cmd) {
+static int CmdAskEdgeDetect(const char *Cmd) {
     int thresLen = 25;
     int ans = 0;
     sscanf(Cmd, "%i", &thresLen);
@@ -967,7 +971,7 @@ int CmdAskEdgeDetect(const char *Cmd) {
 /* Print our clock rate */
 // uses data from graphbuffer
 // adjusted to take char parameter for type of modulation to find the clock - by marshmellow.
-int CmdDetectClockRate(const char *Cmd) {
+static int CmdDetectClockRate(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) > 6 || strlen(Cmd) == 0 || cmdp == 'h')
         return usage_data_detectclock();
@@ -994,7 +998,7 @@ int CmdDetectClockRate(const char *Cmd) {
     return clock1;
 }
 
-char *GetFSKType(uint8_t fchigh, uint8_t fclow, uint8_t invert) {
+static char *GetFSKType(uint8_t fchigh, uint8_t fclow, uint8_t invert) {
     static char fType[8];
     memset(fType, 0x00, 8);
     char *fskType = fType;
@@ -1088,7 +1092,7 @@ int FSKrawDemod(const char *Cmd, bool verbose) {
 //fsk raw demod and print binary
 //takes 4 arguments - Clock, invert, fchigh, fclow
 //defaults: clock = 50, invert=1, fchigh=10, fclow=8 (RF/10 RF/8 (fsk2a))
-int CmdFSKrawdemod(const char *Cmd) {
+static int CmdFSKrawdemod(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) > 20 || cmdp == 'h') return usage_data_rawdemod_fs();
 
@@ -1258,7 +1262,7 @@ int NRZrawDemod(const char *Cmd, bool verbose) {
     return 1;
 }
 
-int CmdNRZrawDemod(const char *Cmd) {
+static int CmdNRZrawDemod(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) > 16 || cmdp == 'h') return usage_data_rawdemod_nr();
 
@@ -1287,7 +1291,7 @@ int CmdPSK1rawDemod(const char *Cmd) {
 
 // by marshmellow
 // takes same args as cmdpsk1rawdemod
-int CmdPSK2rawDemod(const char *Cmd) {
+static int CmdPSK2rawDemod(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) > 16 || cmdp == 'h') return usage_data_rawdemod_p2();
 
@@ -1304,7 +1308,7 @@ int CmdPSK2rawDemod(const char *Cmd) {
 }
 
 // by marshmellow - combines all raw demod functions into one menu command
-int CmdRawDemod(const char *Cmd) {
+static int CmdRawDemod(const char *Cmd) {
     int ans = 0;
 
     if (strlen(Cmd) > 35 || strlen(Cmd) < 2)
@@ -1359,13 +1363,13 @@ int CmdGrid(const char *Cmd) {
     return 0;
 }
 
-int CmdSetGraphMarkers(const char *Cmd) {
+static int CmdSetGraphMarkers(const char *Cmd) {
     sscanf(Cmd, "%i %i", &CursorCPos, &CursorDPos);
     RepaintGraphWindow();
     return 0;
 }
 
-int CmdHexsamples(const char *Cmd) {
+static int CmdHexsamples(const char *Cmd) {
     int i, j, requested = 0, offset = 0;
     char string_buf[25];
     char *string_ptr = string_buf;
@@ -1503,7 +1507,7 @@ int getSamples(int n, bool silent) {
     return 0;
 }
 
-int CmdSamples(const char *Cmd) {
+static int CmdSamples(const char *Cmd) {
     int n = strtol(Cmd, NULL, 0);
     return getSamples(n, false);
 }
@@ -1609,7 +1613,7 @@ int CmdTuneSamples(const char *Cmd) {
     return 0;
 }
 
-int CmdLoad(const char *Cmd) {
+static int CmdLoad(const char *Cmd) {
     char filename[FILE_PATH_SIZE] = {0x00};
     int len = 0;
 
@@ -1665,7 +1669,7 @@ int CmdLtrim(const char *Cmd) {
 }
 
 // trim graph from the beginning
-int CmdRtrim(const char *Cmd) {
+static int CmdRtrim(const char *Cmd) {
 
     int ds = atoi(Cmd);
 
@@ -1678,7 +1682,7 @@ int CmdRtrim(const char *Cmd) {
 }
 
 // trim graph (middle) piece
-int CmdMtrim(const char *Cmd) {
+static int CmdMtrim(const char *Cmd) {
     int start = 0, stop = 0;
     sscanf(Cmd, "%i %i", &start, &stop);
 
@@ -1727,7 +1731,7 @@ int CmdPlot(const char *Cmd) {
     return 0;
 }
 
-int CmdSave(const char *Cmd) {
+static int CmdSave(const char *Cmd) {
 
     int len = 0;
     char filename[FILE_PATH_SIZE] = {0x00};
@@ -1752,7 +1756,7 @@ int CmdSave(const char *Cmd) {
     return 0;
 }
 
-int CmdScale(const char *Cmd) {
+static int CmdScale(const char *Cmd) {
     CursorScaleFactor = atoi(Cmd);
     if (CursorScaleFactor == 0) {
         PrintAndLogEx(FAILED, "bad, can't have zero scale");
@@ -1791,7 +1795,7 @@ int directionalThreshold(const int *in, int *out, size_t len, int8_t up, int8_t
     return 0;
 }
 
-int CmdDirectionalThreshold(const char *Cmd) {
+static int CmdDirectionalThreshold(const char *Cmd) {
     int8_t up = param_get8(Cmd, 0);
     int8_t down = param_get8(Cmd, 1);
 
@@ -1809,7 +1813,7 @@ int CmdDirectionalThreshold(const char *Cmd) {
     return 0;
 }
 
-int CmdZerocrossings(const char *Cmd) {
+static int CmdZerocrossings(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     // Zero-crossings aren't meaningful unless the signal is zero-mean.
     CmdHpf("");
@@ -1846,7 +1850,7 @@ int CmdZerocrossings(const char *Cmd) {
  * @param Cmd
  * @return
  */
-int Cmdbin2hex(const char *Cmd) {
+static int Cmdbin2hex(const char *Cmd) {
     int bg = 0, en = 0;
     if (param_getptr(Cmd, &bg, &en, 0))
         return usage_data_bin2hex();
@@ -1876,7 +1880,7 @@ int Cmdbin2hex(const char *Cmd) {
     return 0;
 }
 
-int Cmdhex2bin(const char *Cmd) {
+static int Cmdhex2bin(const char *Cmd) {
     int bg = 0, en = 0;
     if (param_getptr(Cmd, &bg, &en, 0)) return usage_data_hex2bin();
 
@@ -1918,7 +1922,7 @@ static const int HighTone[] = {
 1,  1,  1,  1,     -1, -1, -1, -1, -1, // note one extra -1 to padd due to 50/8 remainder
 };
 */
-void GetHiLoTone(int *LowTone, int *HighTone, int clk, int LowToneFC, int HighToneFC) {
+static void GetHiLoTone(int *LowTone, int *HighTone, int clk, int LowToneFC, int HighToneFC) {
     int i, j = 0;
     int Left_Modifier = ((clk % LowToneFC) % 2) + ((clk % LowToneFC) / 2);
     int Right_Modifier = (clk % LowToneFC) / 2;
@@ -1981,7 +1985,7 @@ void GetHiLoTone(int *LowTone, int *HighTone, int clk, int LowToneFC, int HighTo
 
 //old CmdFSKdemod adapted by marshmellow
 //converts FSK to clear NRZ style wave.  (or demodulates)
-int FSKToNRZ(int *data, int *dataLen, int clk, int LowToneFC, int HighToneFC) {
+static int FSKToNRZ(int *data, int *dataLen, int clk, int LowToneFC, int HighToneFC) {
     uint8_t ans = 0;
     if (clk == 0 || LowToneFC == 0 || HighToneFC == 0) {
         int firstClockEdge = 0;
@@ -2042,7 +2046,7 @@ int FSKToNRZ(int *data, int *dataLen, int clk, int LowToneFC, int HighToneFC) {
     return 0;
 }
 
-int CmdFSKToNRZ(const char *Cmd) {
+static int CmdFSKToNRZ(const char *Cmd) {
     // take clk, fc_low, fc_high
     //   blank = auto;
     bool errors = false;
@@ -2082,7 +2086,7 @@ int CmdFSKToNRZ(const char *Cmd) {
     return ans;
 }
 
-int CmdDataIIR(const char *Cmd) {
+static int CmdDataIIR(const char *Cmd) {
     uint8_t k = param_get8(Cmd, 0);
     //iceIIR_Butterworth(GraphBuffer, GraphTraceLen);
     iceSimple_Filter(GraphBuffer, GraphTraceLen, k);
@@ -2136,14 +2140,15 @@ static command_t CommandTable[] = {
     {NULL, NULL, 0, NULL}
 };
 
+static int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
+    CmdsHelp(CommandTable);
+    return 0;
+}
+
 int CmdData(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }
 
-int CmdHelp(const char *Cmd) {
-    (void)Cmd; // Cmd is not used so far
-    CmdsHelp(CommandTable);
-    return 0;
-}
diff --git a/client/cmddata.h b/client/cmddata.h
index 94b537d65..702775598 100644
--- a/client/cmddata.h
+++ b/client/cmddata.h
@@ -32,18 +32,12 @@
 #include "loclass/cipherutils.h" // for decimating samples in getsamples
 #include "cmdlfem4x.h" // askem410xdecode
 
-command_t *CmdDataCommands(void);
-
 int CmdData(const char *Cmd);
-void printDemodBuff(void);
-void setDemodBuff(uint8_t *buff, size_t size, size_t start_idx);
-bool getDemodBuff(uint8_t *buff, size_t *size);
-void save_restoreDB(uint8_t saveOpt);// option '1' to save DemodBuffer any other to restore
-int CmdPrintDemodBuff(const char *Cmd);
 
+// Still quite work to do here to provide proper functions for internal usage...
+/*
 int Cmdaskrawdemod(const char *Cmd);
 int Cmdaskmandemod(const char *Cmd);
-int AutoCorrelate(const int *in, int *out, size_t len, int window, bool SaveGrph, bool verbose);
 int CmdAskEdgeDetect(const char *Cmd);
 int CmdAutoCorr(const char *Cmd);
 int CmdBiphaseDecodeRaw(const char *Cmd);
@@ -52,41 +46,48 @@ int CmdBuffClear(const char *Cmd);
 int CmdDec(const char *Cmd);
 int CmdDetectClockRate(const char *Cmd);
 int CmdFSKrawdemod(const char *Cmd);
-int CmdPSK1rawDemod(const char *Cmd);
 int CmdPSK2rawDemod(const char *Cmd);
-int CmdGrid(const char *Cmd);
-int CmdGetBitStream(const char *Cmd);
 int CmdHexsamples(const char *Cmd);
 int CmdHide(const char *Cmd);
-int CmdHpf(const char *Cmd);
 int CmdLoad(const char *Cmd);
-int CmdLtrim(const char *Cmd);
 int CmdRtrim(const char *Cmd);
 int Cmdmandecoderaw(const char *Cmd);
-int CmdNorm(const char *Cmd);
 int CmdNRZrawDemod(const char *Cmd);
-int CmdPlot(const char *Cmd);
 int CmdPrintDemodBuff(const char *Cmd);
 int CmdRawDemod(const char *Cmd);
 int CmdSamples(const char *Cmd);
-int CmdTuneSamples(const char *Cmd);
 int CmdSave(const char *Cmd);
 int CmdScale(const char *Cmd);
 int CmdDirectionalThreshold(const char *Cmd);
 int CmdZerocrossings(const char *Cmd);
-int ASKbiphaseDemod(const char *Cmd, bool verbose);
-int ASKDemod(const char *Cmd, bool verbose, bool emSearch, uint8_t askType);
-int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType, bool *stCheck);
-int FSKrawDemod(const char *Cmd, bool verbose);
-int PSKDemod(const char *Cmd, bool verbose);
-int NRZrawDemod(const char *Cmd, bool verbose);
+int CmdDataIIR(const char *Cmd);
+*/
+int CmdPrintDemodBuff(const char *Cmd);                                                         // used by cmd lf keri, lf nexwatch
+int CmdPSK1rawDemod(const char *Cmd);                                                           // used by cmd lf
+int CmdGetBitStream(const char *Cmd);                                                           // used by cmd lf
+int CmdGrid(const char *Cmd);                                                                   // used by cmd lf cotag
+int CmdHpf(const char *Cmd);                                                                    // used by cmd lf data (!)
+int CmdLtrim(const char *Cmd);                                                                  // used by cmd lf em4x, lf t55xx
+int CmdNorm(const char *Cmd);                                                                   // used by cmd lf data (!)
+int CmdPlot(const char *Cmd);                                                                   // used by cmd lf cotag
+int CmdTuneSamples(const char *Cmd);                                                            // used by cmd lf hw
+int ASKbiphaseDemod(const char *Cmd, bool verbose);                                             // used by cmd lf em4x, lf fdx, lf guard, lf jablotron, lf nedap, lf t55xx
+int ASKDemod(const char *Cmd, bool verbose, bool emSearch, uint8_t askType);                    // used by cmd lf em4x, lf t55xx, lf viking
+int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType, bool *stCheck); // used by cmd lf, lf em4x, lf noralsy, le presco, lf securekey, lf t55xx, lf visa2k
+int FSKrawDemod(const char *Cmd, bool verbose);                                                 // used by cmd lf, lf em4x, lf t55xx
+int PSKDemod(const char *Cmd, bool verbose);                                                    // used by cmd lf em4x, lf indala, lf keri, lf nexwatch, lf t55xx
+int NRZrawDemod(const char *Cmd, bool verbose);                                                 // used by cmd lf pac, lf t55xx
+
+
+void printDemodBuff(void);
+void setDemodBuff(uint8_t *buff, size_t size, size_t start_idx);
+bool getDemodBuff(uint8_t *buff, size_t *size);
+void save_restoreDB(uint8_t saveOpt);// option '1' to save DemodBuffer any other to restore
+int AutoCorrelate(const int *in, int *out, size_t len, int window, bool SaveGrph, bool verbose);
 int getSamples(int n, bool silent);
 void setClockGrid(int clk, int offset);
 int directionalThreshold(const int *in, int *out, size_t len, int8_t up, int8_t down);
 int AskEdgeDetect(const int *in, int *out, int len, int threshold);
-
-int CmdDataIIR(const char *Cmd);
-
 int demodIdteck(void);
 
 #define MAX_DEMOD_BUF_LEN (1024*128)
diff --git a/client/comms.c b/client/comms.c
index cf8aac7f0..afa79c38c 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -218,7 +218,7 @@ bool hookUpPM3() {
 }
 */
 
-void
+static void
 #ifdef __has_attribute
 #if __has_attribute(force_align_arg_pointer)
 __attribute__((force_align_arg_pointer))
diff --git a/client/crypto/libpcrypto.c b/client/crypto/libpcrypto.c
index f1f6e782d..775080c42 100644
--- a/client/crypto/libpcrypto.c
+++ b/client/crypto/libpcrypto.c
@@ -121,7 +121,7 @@ int sha512hash(uint8_t *input, int length, uint8_t *hash) {
     return 0;
 }
 
-int ecdsa_init_str(mbedtls_ecdsa_context *ctx, const char *key_d, const char *key_x, const char *key_y) {
+static int ecdsa_init_str(mbedtls_ecdsa_context *ctx, const char *key_d, const char *key_x, const char *key_y) {
     if (!ctx)
         return 1;
 
@@ -147,7 +147,7 @@ int ecdsa_init_str(mbedtls_ecdsa_context *ctx, const char *key_d, const char *ke
     return 0;
 }
 
-int ecdsa_init(mbedtls_ecdsa_context *ctx, uint8_t *key_d, uint8_t *key_xy) {
+static int ecdsa_init(mbedtls_ecdsa_context *ctx, uint8_t *key_d, uint8_t *key_xy) {
     if (!ctx)
         return 1;
 
@@ -279,7 +279,7 @@ exit:
     return res;
 }
 
-int ecdsa_signature_create_test(const char *key_d, const char *key_x, const char *key_y, const char *random, uint8_t *input, int length, uint8_t *signature, size_t *signaturelen) {
+static int ecdsa_signature_create_test(const char *key_d, const char *key_x, const char *key_y, const char *random, uint8_t *input, int length, uint8_t *signature, size_t *signaturelen) {
     int res;
     *signaturelen = 0;
 
@@ -299,7 +299,7 @@ int ecdsa_signature_create_test(const char *key_d, const char *key_x, const char
     return res;
 }
 
-int ecdsa_signature_verify_keystr(const char *key_x, const char *key_y, uint8_t *input, int length, uint8_t *signature, size_t signaturelen) {
+static int ecdsa_signature_verify_keystr(const char *key_x, const char *key_y, uint8_t *input, int length, uint8_t *signature, size_t signaturelen) {
     int res;
     uint8_t shahash[32] = {0};
     res = sha256hash(input, length, shahash);
diff --git a/client/emv/apduinfo.c b/client/emv/apduinfo.c
index c497eb4f8..27e48156c 100644
--- a/client/emv/apduinfo.c
+++ b/client/emv/apduinfo.c
@@ -259,7 +259,7 @@ const APDUCode APDUCodeTable[] = {
 };
 const size_t APDUCodeTableLen = sizeof(APDUCodeTable) / sizeof(APDUCode);
 
-int CodeCmp(const char *code1, const char *code2) {
+static int CodeCmp(const char *code1, const char *code2) {
     int xsymb = 0;
     int cmp = 0;
     for (int i = 0; i < 4; i++) {
diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index d8c7b6c54..df2a1a22e 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -20,7 +20,7 @@
 static int CmdHelp(const char *Cmd);
 
 #define TLV_ADD(tag, value)( tlvdb_change_or_add_node(tlvRoot, tag, sizeof(value) - 1, (const unsigned char *)value) )
-void ParamLoadDefaults(struct tlvdb *tlvRoot) {
+static void ParamLoadDefaults(struct tlvdb *tlvRoot) {
     //9F02:(Amount, authorized (Numeric)) len:6
     TLV_ADD(0x9F02, "\x00\x00\x00\x00\x01\x00");
     //9F1A:(Terminal Country Code) len:2
@@ -43,7 +43,7 @@ void ParamLoadDefaults(struct tlvdb *tlvRoot) {
     TLV_ADD(0x95,   "\x00\x00\x00\x00\x00");
 }
 
-void PrintChannel(EMVCommandChannel channel) {
+static void PrintChannel(EMVCommandChannel channel) {
     switch (channel) {
         case ECC_CONTACTLESS:
             PrintAndLogEx(INFO, "Channel: CONTACTLESS");
@@ -642,7 +642,7 @@ static int CmdEMVInternalAuthenticate(const char *Cmd) {
 
 #define dreturn(n) {free(pdol_data_tlv); tlvdb_free(tlvSelect); tlvdb_free(tlvRoot); DropFieldEx( channel ); return n;}
 
-void InitTransactionParameters(struct tlvdb *tlvRoot, bool paramLoadJSON, enum TransactionType TrType, bool GenACGPO) {
+static void InitTransactionParameters(struct tlvdb *tlvRoot, bool paramLoadJSON, enum TransactionType TrType, bool GenACGPO) {
 
     ParamLoadDefaults(tlvRoot);
 
@@ -675,7 +675,7 @@ void InitTransactionParameters(struct tlvdb *tlvRoot, bool paramLoadJSON, enum T
     }
 }
 
-void ProcessGPOResponseFormat1(struct tlvdb *tlvRoot, uint8_t *buf, size_t len, bool decodeTLV) {
+static void ProcessGPOResponseFormat1(struct tlvdb *tlvRoot, uint8_t *buf, size_t len, bool decodeTLV) {
     if (buf[0] == 0x80) {
         if (decodeTLV) {
             PrintAndLog("GPO response format1:");
@@ -705,7 +705,7 @@ void ProcessGPOResponseFormat1(struct tlvdb *tlvRoot, uint8_t *buf, size_t len,
     }
 }
 
-void ProcessACResponseFormat1(struct tlvdb *tlvRoot, uint8_t *buf, size_t len, bool decodeTLV) {
+static void ProcessACResponseFormat1(struct tlvdb *tlvRoot, uint8_t *buf, size_t len, bool decodeTLV) {
     if (buf[0] == 0x80) {
         if (decodeTLV) {
             PrintAndLog("GPO response format1:");
diff --git a/client/emv/emv_roca.c b/client/emv/emv_roca.c
index df43db4ee..a189fdd70 100644
--- a/client/emv/emv_roca.c
+++ b/client/emv/emv_roca.c
@@ -29,7 +29,7 @@ static uint8_t g_primes[ROCA_PRINTS_LENGTH] = {
 
 mbedtls_mpi g_prints[ROCA_PRINTS_LENGTH];
 
-void rocacheck_init(void) {
+static void rocacheck_init(void) {
 
     for (int i = 0; i < ROCA_PRINTS_LENGTH; i++)
         mbedtls_mpi_init(&g_prints[i]);
@@ -53,12 +53,12 @@ void rocacheck_init(void) {
     mbedtls_mpi_read_string(&g_prints[16], 10, "126304807362733370595828809000324029340048915994");
 }
 
-void rocacheck_cleanup(void) {
+static void rocacheck_cleanup(void) {
     for (int i = 0; i < ROCA_PRINTS_LENGTH; i++)
         mbedtls_mpi_free(&g_prints[i]);
 }
 
-int bitand_is_zero(mbedtls_mpi *a, mbedtls_mpi *b) {
+static int bitand_is_zero(mbedtls_mpi *a, mbedtls_mpi *b) {
 
     for (int i = 0; i < mbedtls_mpi_bitlen(a); i++) {
 
@@ -69,7 +69,7 @@ int bitand_is_zero(mbedtls_mpi *a, mbedtls_mpi *b) {
 }
 
 
-mbedtls_mpi_uint mpi_get_uint(const mbedtls_mpi *X) {
+static mbedtls_mpi_uint mpi_get_uint(const mbedtls_mpi *X) {
 
     if (X->n == 1 && X->s > 0) {
         return X->p[0];
@@ -78,7 +78,8 @@ mbedtls_mpi_uint mpi_get_uint(const mbedtls_mpi *X) {
     return 0;
 }
 
-void print_mpi(const char *msg, int radix, const mbedtls_mpi *X) {
+/*
+static void print_mpi(const char *msg, int radix, const mbedtls_mpi *X) {
 
     char Xchar[400] = {0};
     size_t len = 0;
@@ -86,7 +87,7 @@ void print_mpi(const char *msg, int radix, const mbedtls_mpi *X) {
     mbedtls_mpi_write_string(X, radix, Xchar, sizeof(Xchar), &len);
     printf("%s[%zu] %s\n", msg, len, Xchar);
 }
-
+*/
 bool emv_rocacheck(const unsigned char *buf, size_t buflen, bool verbose) {
 
     mbedtls_mpi t_modulus;
diff --git a/client/emv/emvcore.c b/client/emv/emvcore.c
index 7e0174baa..70cfec82a 100644
--- a/client/emv/emvcore.c
+++ b/client/emv/emvcore.c
@@ -263,7 +263,7 @@ struct tlvdb *GetdCVVRawFromTrack2(const struct tlv *track2) {
     return tlvdb_fixed(0x02, dCVVlen, dCVV);
 }
 
-int EMVExchangeEx(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, sAPDU apdu, bool IncludeLe, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
+static int EMVExchangeEx(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, sAPDU apdu, bool IncludeLe, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
     uint8_t data[APDU_RES_LEN] = {0};
 
     *ResultLen = 0;
@@ -366,7 +366,7 @@ int EMVSelectPSE(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldO
     return res;
 }
 
-int EMVSelectWithRetry(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, uint8_t *AID, size_t AIDLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
+static int EMVSelectWithRetry(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, uint8_t *AID, size_t AIDLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
     int retrycnt = 0;
     int res = 0;
     do {
@@ -393,7 +393,7 @@ int EMVSelectWithRetry(EMVCommandChannel channel, bool ActivateField, bool Leave
     return res;
 }
 
-int EMVCheckAID(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlvdbelm, struct tlvdb *tlv) {
+static int EMVCheckAID(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlvdbelm, struct tlvdb *tlv) {
     uint8_t data[APDU_RES_LEN] = {0};
     size_t datalen = 0;
     int res = 0;
diff --git a/client/emv/emvjson.c b/client/emv/emvjson.c
index dadff33fc..59de9d37e 100644
--- a/client/emv/emvjson.c
+++ b/client/emv/emvjson.c
@@ -239,7 +239,7 @@ int JsonSaveTLVTree(json_t *root, json_t *elm, const char *path, struct tlvdb *t
     return 0;
 }
 
-bool HexToBuffer(const char *errormsg, const char *hexvalue, uint8_t *buffer, size_t maxbufferlen, size_t *bufferlen) {
+static bool HexToBuffer(const char *errormsg, const char *hexvalue, uint8_t *buffer, size_t maxbufferlen, size_t *bufferlen) {
     int buflen = 0;
 
     switch (param_gethex_to_eol(hexvalue, 0, buffer, maxbufferlen, &buflen)) {
diff --git a/client/emv/test/crypto_test.c b/client/emv/test/crypto_test.c
index 21e924858..4220515df 100644
--- a/client/emv/test/crypto_test.c
+++ b/client/emv/test/crypto_test.c
@@ -24,6 +24,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <inttypes.h>
+#include "crypto_test.h"
 
 static int test_genkey(unsigned int keylength, unsigned char *msg, size_t msg_len, bool verbose) {
     int ret = 1;
diff --git a/client/emv/test/sda_test.c b/client/emv/test/sda_test.c
index 1f43d30b2..86f201e58 100644
--- a/client/emv/test/sda_test.c
+++ b/client/emv/test/sda_test.c
@@ -26,6 +26,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include "sda_test.h"
 
 struct emv_pk vsdc_01 = {
     .rid = { 0xa0, 0x00, 0x00, 0x00, 0x03, },
diff --git a/client/fido/cbortools.c b/client/fido/cbortools.c
index 78055cc9e..1864ac7c3 100644
--- a/client/fido/cbortools.c
+++ b/client/fido/cbortools.c
@@ -184,7 +184,7 @@ static CborError dumprecursive(uint8_t cmdCode, bool isResponse, CborValue *it,
     return CborNoError;
 }
 
-int TinyCborInit(uint8_t *data, size_t length, CborValue *cb) {
+static int TinyCborInit(uint8_t *data, size_t length, CborValue *cb) {
     CborParser parser;
     CborError err = cbor_parser_init(data, length, 0, &parser, cb);
     if (err)
@@ -216,7 +216,7 @@ int TinyCborPrintFIDOPackage(uint8_t cmdCode, bool isResponse, uint8_t *data, si
     return 0;
 }
 
-int JsonObjElmCount(json_t *elm) {
+static int JsonObjElmCount(json_t *elm) {
     int res = 0;
     const char *key;
     json_t *value;
diff --git a/client/fido/cose.c b/client/fido/cose.c
index 134c29772..3201d6615 100644
--- a/client/fido/cose.c
+++ b/client/fido/cose.c
@@ -38,7 +38,7 @@ COSEValueNameDesc_t COSEKeyTypeValueDesc[] = {
     {4, "Symmetric", "Symmetric Key"},
 };
 
-COSEValueNameDesc_t *GetCOSEktyElm(int id) {
+static COSEValueNameDesc_t *GetCOSEktyElm(int id) {
     for (int i = 0; i < ARRAYLEN(COSEKeyTypeValueDesc); i++)
         if (COSEKeyTypeValueDesc[i].Value == id)
             return &COSEKeyTypeValueDesc[i];
diff --git a/client/fido/fidocore.c b/client/fido/fidocore.c
index 915617244..a688d9a9a 100644
--- a/client/fido/fidocore.c
+++ b/client/fido/fidocore.c
@@ -355,7 +355,7 @@ bool CheckrpIdHash(json_t *json, uint8_t *hash) {
 }
 
 // check ANSI X9.62 format ECDSA signature (on P-256)
-int FIDO2CheckSignature(json_t *root, uint8_t *publickey, uint8_t *sign, size_t signLen, uint8_t *authData, size_t authDataLen, bool verbose) {
+static int FIDO2CheckSignature(json_t *root, uint8_t *publickey, uint8_t *sign, size_t signLen, uint8_t *authData, size_t authDataLen, bool verbose) {
     int res;
     uint8_t rval[300] = {0};
     uint8_t sval[300] = {0};
diff --git a/client/loclass/cipher.c b/client/loclass/cipher.c
index 2fe178829..331e0b44e 100644
--- a/client/loclass/cipher.c
+++ b/client/loclass/cipher.c
@@ -67,7 +67,7 @@ typedef struct {
 *  is defined as
 *  T (x 0 x 1 . . . . . . x 15 ) = x 0 ⊕ x 1 ⊕ x 5 ⊕ x 7 ⊕ x 10 ⊕ x 11 ⊕ x 14 ⊕ x 15 .
 **/
-bool T(State state) {
+static bool T(State state) {
     bool x0 = state.t & 0x8000;
     bool x1 = state.t & 0x4000;
     bool x5 = state.t & 0x0400;
@@ -82,7 +82,7 @@ bool T(State state) {
 *  Similarly, the feedback function for the bottom register B : F 8/2 → F 2 is defined as
 *  B(x 0 x 1 . . . x 7 ) = x 1 ⊕ x 2 ⊕ x 3 ⊕ x 7 .
 **/
-bool B(State state) {
+static bool B(State state) {
     bool x1 = state.b & 0x40;
     bool x2 = state.b & 0x20;
     bool x3 = state.b & 0x10;
@@ -98,7 +98,7 @@ bool B(State state) {
 *  z 1 = (r 0 ∨ r 2 ) ⊕ (r 5 ∨ r 7 ) ⊕ r 1 ⊕ r 6 ⊕ x ⊕ y
 *  z 2 = (r 3 ∧ r 5 ) ⊕ (r 4 ∧ r 6 ) ⊕ r 7 ⊕ x
 **/
-uint8_t _select(bool x, bool y, uint8_t r) {
+static uint8_t _select(bool x, bool y, uint8_t r) {
     bool r0 = r >> 7 & 0x1;
     bool r1 = r >> 6 & 0x1;
     bool r2 = r >> 5 & 0x1;
@@ -134,7 +134,7 @@ uint8_t _select(bool x, bool y, uint8_t r) {
 * @param s - state
 * @param k - array containing 8 bytes
 **/
-State successor(uint8_t *k, State s, bool y) {
+static State successor(uint8_t *k, State s, bool y) {
     bool r0 = s.r >> 7 & 0x1;
     bool r4 = s.r >> 3 & 0x1;
     bool r7 = s.r & 0x1;
@@ -160,7 +160,7 @@ State successor(uint8_t *k, State s, bool y) {
 *  to multiple bit input x ∈ F n 2 which we define as
 * @param k - array containing 8 bytes
 **/
-State suc(uint8_t *k, State s, BitstreamIn *bitstream) {
+static State suc(uint8_t *k, State s, BitstreamIn *bitstream) {
     if (bitsLeft(bitstream) == 0) {
         return s;
     }
@@ -176,7 +176,7 @@ State suc(uint8_t *k, State s, BitstreamIn *bitstream) {
 *  output(k, s, x 0 . . . x n ) = output(s) · output(k, s ′ , x 1 . . . x n )
 *  where s ′ = suc(k, s, x 0 ).
 **/
-void output(uint8_t *k, State s, BitstreamIn *in,  BitstreamOut *out) {
+static void output(uint8_t *k, State s, BitstreamIn *in,  BitstreamOut *out) {
     if (bitsLeft(in) == 0) {
         return;
     }
@@ -192,7 +192,7 @@ void output(uint8_t *k, State s, BitstreamIn *in,  BitstreamOut *out) {
 * key k ∈ (F 82 ) 8 and outputs the initial cipher state s =< l, r, t, b >
 **/
 
-State init(uint8_t *k) {
+static State init(uint8_t *k) {
     State s = {
         ((k[0] ^ 0x4c) + 0xEC) & 0xFF,// l
         ((k[0] ^ 0x4c) + 0x21) & 0xFF,// r
@@ -201,7 +201,8 @@ State init(uint8_t *k) {
     };
     return s;
 }
-void MAC(uint8_t *k, BitstreamIn input, BitstreamOut out) {
+
+static void MAC(uint8_t *k, BitstreamIn input, BitstreamOut out) {
     uint8_t zeroes_32[] = {0, 0, 0, 0};
     BitstreamIn input_32_zeroes = {zeroes_32, sizeof(zeroes_32) * 8, 0};
     State initState = suc(k, init(k), &input);
diff --git a/client/loclass/cipherutils.c b/client/loclass/cipherutils.c
index bb457e371..c829574e9 100644
--- a/client/loclass/cipherutils.c
+++ b/client/loclass/cipherutils.c
@@ -104,10 +104,11 @@ int bitsLeft(BitstreamIn *stream) {
  * @param stream
  * @return Number of bits stored in stream
  */
-int numBits(BitstreamOut *stream) {
+/*
+static int numBits(BitstreamOut *stream) {
     return stream->numbits;
 }
-
+*/
 void x_num_to_bytes(uint64_t n, size_t len, uint8_t *dest) {
     while (len--) {
         dest[len] = (uint8_t) n;
@@ -187,7 +188,7 @@ void printarr_human_readable(const char *title, uint8_t *arr, int len) {
 //-----------------------------
 
 #ifndef ON_DEVICE
-int testBitStream() {
+static int testBitStream() {
     uint8_t input [] = {0xDE, 0xAD, 0xBE, 0xEF, 0xDE, 0xAD, 0xBE, 0xEF};
     uint8_t output [] = {0, 0, 0, 0, 0, 0, 0, 0};
     BitstreamIn in = { input, sizeof(input) * 8, 0};
@@ -212,7 +213,7 @@ int testBitStream() {
     return 0;
 }
 
-int testReversedBitstream() {
+static int testReversedBitstream() {
     uint8_t input [] = {0xDE, 0xAD, 0xBE, 0xEF, 0xDE, 0xAD, 0xBE, 0xEF};
     uint8_t reverse [] = {0, 0, 0, 0, 0, 0, 0, 0};
     uint8_t output [] = {0, 0, 0, 0, 0, 0, 0, 0};
diff --git a/client/loclass/elite_crack.c b/client/loclass/elite_crack.c
index 5a280e7c1..7df30c696 100644
--- a/client/loclass/elite_crack.c
+++ b/client/loclass/elite_crack.c
@@ -162,7 +162,7 @@ Definition 14. Define the rotate key function rk : (F 82 ) 8 × N → (F 82 ) 8
 rk(x [0] . . . x [7] , 0) = x [0] . . . x [7]
 rk(x [0] . . . x [7] , n + 1) = rk(rl(x [0] ) . . . rl(x [7] ), n)
 **/
-void rk(uint8_t *key, uint8_t n, uint8_t *outp_key) {
+static void rk(uint8_t *key, uint8_t n, uint8_t *outp_key) {
     memcpy(outp_key, key, 8);
     uint8_t j;
     while (n-- > 0) {
@@ -175,14 +175,14 @@ void rk(uint8_t *key, uint8_t n, uint8_t *outp_key) {
 static mbedtls_des_context ctx_enc;
 static mbedtls_des_context ctx_dec;
 
-void desdecrypt_iclass(uint8_t *iclass_key, uint8_t *input, uint8_t *output) {
+static void desdecrypt_iclass(uint8_t *iclass_key, uint8_t *input, uint8_t *output) {
     uint8_t key_std_format[8] = {0};
     permutekey_rev(iclass_key, key_std_format);
     mbedtls_des_setkey_dec(&ctx_dec, key_std_format);
     mbedtls_des_crypt_ecb(&ctx_dec, input, output);
 }
 
-void desencrypt_iclass(uint8_t *iclass_key, uint8_t *input, uint8_t *output) {
+static void desencrypt_iclass(uint8_t *iclass_key, uint8_t *input, uint8_t *output) {
     uint8_t key_std_format[8] = {0};
     permutekey_rev(iclass_key, key_std_format);
     mbedtls_des_setkey_enc(&ctx_enc, key_std_format);
@@ -266,7 +266,8 @@ void hash2(uint8_t *key64, uint8_t *outp_keytable) {
  * @param i the number to read. Should be less than 127, or something is wrong...
  * @return
  */
-int _readFromDump(uint8_t dump[], dumpdata *item, uint8_t i) {
+/*
+static int _readFromDump(uint8_t dump[], dumpdata *item, uint8_t i) {
     size_t itemsize = sizeof(dumpdata);
     memcpy(item, dump + i * itemsize, itemsize);
 
@@ -277,7 +278,7 @@ int _readFromDump(uint8_t dump[], dumpdata *item, uint8_t i) {
     }
     return 0;
 }
-
+*/
 //static uint32_t startvalue = 0;
 /**
  * @brief Performs brute force attack against a dump-data item, containing csn, cc_nr and mac.
@@ -580,7 +581,7 @@ int bruteforceFileNoKeys(const char *filename) {
 // ----------------------------------------------------------------------------
 // TEST CODE BELOW
 // ----------------------------------------------------------------------------
-int _testBruteforce() {
+static int _testBruteforce() {
     int errors = 0;
     if (true) {
         // First test
@@ -617,7 +618,7 @@ int _testBruteforce() {
     return errors;
 }
 
-int _test_iclass_key_permutation() {
+static int _test_iclass_key_permutation() {
     uint8_t testcase[8] = {0x6c, 0x8d, 0x44, 0xf9, 0x2a, 0x2d, 0x01, 0xbf};
     uint8_t testcase_output[8] = {0};
     uint8_t testcase_output_correct[8] = {0x8a, 0x0d, 0xb9, 0x88, 0xbb, 0xa7, 0x90, 0xea};
@@ -643,7 +644,7 @@ int _test_iclass_key_permutation() {
     return 0;
 }
 
-int _testHash1() {
+static int _testHash1() {
     uint8_t expected[8] = {0x7E, 0x72, 0x2F, 0x40, 0x2D, 0x02, 0x51, 0x42};
     uint8_t csn[8] = {0x01, 0x02, 0x03, 0x04, 0xF7, 0xFF, 0x12, 0xE0};
     uint8_t k[8] = {0};
diff --git a/client/loclass/hash1_brute.c b/client/loclass/hash1_brute.c
index 6007e1b9f..fb08da756 100644
--- a/client/loclass/hash1_brute.c
+++ b/client/loclass/hash1_brute.c
@@ -7,7 +7,8 @@
 #include <ctype.h>
 #include "elite_crack.h"
 
-void calc_score(uint8_t *csn, uint8_t *k) {
+/*
+static void calc_score(uint8_t *csn, uint8_t *k) {
     uint8_t score = 0 ;
     uint8_t i;
     uint8_t goodvals[16] = {0};
@@ -53,7 +54,7 @@ void calc_score(uint8_t *csn, uint8_t *k) {
     }
 }
 
-void brute_hash1(void) {
+static void brute_hash1(void) {
     uint16_t a, b, c, d;
     uint8_t csn[8] = {0, 0, 0, 0, 0xf7, 0xff, 0x12, 0xe0};
     uint8_t k[8] = {0, 0, 0, 0, 0, 0, 0, 0};
@@ -81,4 +82,4 @@ void brute_hash1(void) {
                 }
     }
 }
-
+*/
diff --git a/client/loclass/ikeys.c b/client/loclass/ikeys.c
index 43959b421..e3128e47b 100644
--- a/client/loclass/ikeys.c
+++ b/client/loclass/ikeys.c
@@ -85,7 +85,7 @@ static int debug_print = 0;
  * @param n bitnumber
  * @return
  */
-uint8_t getSixBitByte(uint64_t c, int n) {
+static uint8_t getSixBitByte(uint64_t c, int n) {
     return (c >> (42 - 6 * n)) & 0x3F;
 }
 
@@ -95,7 +95,7 @@ uint8_t getSixBitByte(uint64_t c, int n) {
  * @param z the value to place there
  * @param n bitnumber.
  */
-void pushbackSixBitByte(uint64_t *c, uint8_t z, int n) {
+static void pushbackSixBitByte(uint64_t *c, uint8_t z, int n) {
     //0x XXXX YYYY ZZZZ ZZZZ ZZZZ
     //             ^z0         ^z7
     //z0:  1111 1100 0000 0000
@@ -120,7 +120,7 @@ void pushbackSixBitByte(uint64_t *c, uint8_t z, int n) {
  * @param c
  * @return
  */
-uint64_t swapZvalues(uint64_t c) {
+static uint64_t swapZvalues(uint64_t c) {
     uint64_t newz = 0;
     pushbackSixBitByte(&newz, getSixBitByte(c, 0), 7);
     pushbackSixBitByte(&newz, getSixBitByte(c, 1), 6);
@@ -137,7 +137,7 @@ uint64_t swapZvalues(uint64_t c) {
 /**
 * @return 4 six-bit bytes chunked into a uint64_t,as 00..00a0a1a2a3
 */
-uint64_t ck(int i, int j, uint64_t z) {
+static uint64_t ck(int i, int j, uint64_t z) {
     if (i == 1 && j == -1) {
         // ck(1, −1, z [0] . . . z [3] ) = z [0] . . . z [3]
         return z;
@@ -179,7 +179,7 @@ uint64_t ck(int i, int j, uint64_t z) {
     otherwise.
 **/
 
-uint64_t check(uint64_t z) {
+static uint64_t check(uint64_t z) {
     //These 64 bits are divided as c = x, y, z [0] , . . . , z [7]
 
     // ck(3, 2, z [0] . . . z [3] )
@@ -197,7 +197,7 @@ uint64_t check(uint64_t z) {
 
 }
 
-void permute(BitstreamIn *p_in, uint64_t z, int l, int r, BitstreamOut *out) {
+static void permute(BitstreamIn *p_in, uint64_t z, int l, int r, BitstreamOut *out) {
     if (bitsLeft(p_in) == 0)
         return;
 
@@ -214,14 +214,14 @@ void permute(BitstreamIn *p_in, uint64_t z, int l, int r, BitstreamOut *out) {
         permute(p_in, z, l, r + 1, out);
     }
 }
-void printbegin() {
+static void printbegin() {
     if (debug_print < 2)
         return;
 
     PrintAndLogDevice(NORMAL, "          | x| y|z0|z1|z2|z3|z4|z5|z6|z7|");
 }
 
-void printState(const char *desc, uint64_t c) {
+static void printState(const char *desc, uint64_t c) {
     if (debug_print < 2)
         return;
 
@@ -366,8 +366,8 @@ void diversifyKey(uint8_t csn[8], uint8_t key[8], uint8_t div_key[8]) {
 
     hash0(crypt_csn, div_key);
 }
-
-void testPermute() {
+/*
+static void testPermute() {
     uint64_t x = 0;
     pushbackSixBitByte(&x, 0x00, 0);
     pushbackSixBitByte(&x, 0x01, 1);
@@ -411,7 +411,7 @@ void testPermute() {
                      };
     printarr("permuted", res, 8);
 }
-
+*/
 // These testcases are
 // { UID , TEMP_KEY, DIV_KEY} using the specific key
 typedef struct {
@@ -420,7 +420,7 @@ typedef struct {
     uint8_t div_key[8];
 } Testcase;
 
-int testDES(Testcase testcase, mbedtls_des_context ctx_enc, mbedtls_des_context ctx_dec) {
+static int testDES(Testcase testcase, mbedtls_des_context ctx_enc, mbedtls_des_context ctx_dec) {
     uint8_t des_encrypted_csn[8] = {0};
     uint8_t decrypted[8] = {0};
     uint8_t div_key[8] = {0};
@@ -456,7 +456,7 @@ int testDES(Testcase testcase, mbedtls_des_context ctx_enc, mbedtls_des_context
     }
     return retval;
 }
-bool des_getParityBitFromKey(uint8_t key) {
+static bool des_getParityBitFromKey(uint8_t key) {
     // The top 7 bits is used
     bool parity = ((key & 0x80) >> 7)
                   ^ ((key & 0x40) >> 6) ^ ((key & 0x20) >> 5)
@@ -465,7 +465,7 @@ bool des_getParityBitFromKey(uint8_t key) {
     return !parity;
 }
 
-void des_checkParity(uint8_t *key) {
+static void des_checkParity(uint8_t *key) {
     int i;
     int fails = 0;
     for (i = 0; i < 8; i++) {
@@ -553,7 +553,7 @@ Testcase testcases[] = {
     {{0}, {0}, {0}}
 };
 
-int testKeyDiversificationWithMasterkeyTestcases() {
+static int testKeyDiversificationWithMasterkeyTestcases() {
     int i, error = 0;
     uint8_t empty[8] = {0};
 
@@ -569,11 +569,11 @@ int testKeyDiversificationWithMasterkeyTestcases() {
     return error;
 }
 
-void print64bits(const char *name, uint64_t val) {
+static void print64bits(const char *name, uint64_t val) {
     printf("%s%08x%08x\n", name, (uint32_t)(val >> 32), (uint32_t)(val & 0xFFFFFFFF));
 }
 
-uint64_t testCryptedCSN(uint64_t crypted_csn, uint64_t expected) {
+static uint64_t testCryptedCSN(uint64_t crypted_csn, uint64_t expected) {
     int retval = 0;
     uint8_t result[8] = {0};
     if (debug_print) PrintAndLogDevice(DEBUG, "debug_print %d", debug_print);
@@ -626,7 +626,7 @@ int testDES2(uint64_t csn, uint64_t expected) {
  * @brief doTestsWithKnownInputs
  * @return
  */
-int doTestsWithKnownInputs() {
+static int doTestsWithKnownInputs() {
     // KSel from http://www.proxmark.org/forum/viewtopic.php?pid=10977#p10977
     int errors = 0;
     PrintAndLogDevice(SUCCESS, "Testing DES encryption");
diff --git a/client/mifare/mad.c b/client/mifare/mad.c
index 4c3d21022..47b7cb70a 100644
--- a/client/mifare/mad.c
+++ b/client/mifare/mad.c
@@ -107,7 +107,7 @@ static const char *GetAIDDescription(uint16_t AID) {
     return unknownAID;
 }
 
-int madCRCCheck(uint8_t *sector, bool verbose, int MADver) {
+static int madCRCCheck(uint8_t *sector, bool verbose, int MADver) {
     if (MADver == 1) {
         uint8_t crc = CRC8Mad(&sector[16 + 1], 15 + 16);
         if (crc != sector[16]) {
@@ -125,7 +125,7 @@ int madCRCCheck(uint8_t *sector, bool verbose, int MADver) {
     return 0;
 }
 
-uint16_t madGetAID(uint8_t *sector, int MADver, int sectorNo) {
+static uint16_t madGetAID(uint8_t *sector, int MADver, int sectorNo) {
     if (MADver == 1)
         return (sector[16 + 2 + (sectorNo - 1) * 2] << 8) + (sector[16 + 2 + (sectorNo - 1) * 2 + 1]);
     else
diff --git a/client/mifare/mifare4.c b/client/mifare/mifare4.c
index 757865564..b172e5131 100644
--- a/client/mifare/mifare4.c
+++ b/client/mifare/mifare4.c
@@ -95,8 +95,8 @@ const char *mfGetAccessConditionsDesc(uint8_t blockn, uint8_t *data) {
 
     return StaticNone;
 };
-
-int CalculateEncIVCommand(mf4Session *session, uint8_t *iv, bool verbose) {
+/*
+static int CalculateEncIVCommand(mf4Session *session, uint8_t *iv, bool verbose) {
     memcpy(&iv[0], session->TI, 4);
     memcpy(&iv[4], &session->R_Ctr, 2);
     memcpy(&iv[6], &session->W_Ctr, 2);
@@ -108,7 +108,7 @@ int CalculateEncIVCommand(mf4Session *session, uint8_t *iv, bool verbose) {
     return 0;
 }
 
-int CalculateEncIVResponse(mf4Session *session, uint8_t *iv, bool verbose) {
+static int CalculateEncIVResponse(mf4Session *session, uint8_t *iv, bool verbose) {
     memcpy(&iv[0], &session->R_Ctr, 2);
     memcpy(&iv[2], &session->W_Ctr, 2);
     memcpy(&iv[4], &session->R_Ctr, 2);
@@ -119,7 +119,7 @@ int CalculateEncIVResponse(mf4Session *session, uint8_t *iv, bool verbose) {
 
     return 0;
 }
-
+*/
 
 int CalculateMAC(mf4Session *session, MACType_t mtype, uint8_t blockNum, uint8_t blockCount, uint8_t *data, int datalen, uint8_t *mac, bool verbose) {
     if (!session || !session->Authenticated || !mac || !data || !datalen || datalen < 1)
@@ -308,7 +308,7 @@ int MifareAuth4(mf4Session *session, uint8_t *keyn, uint8_t *key, bool activateF
     return 0;
 }
 
-int intExchangeRAW14aPlus(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
+static int intExchangeRAW14aPlus(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
     if (VerboseMode)
         PrintAndLogEx(INFO, ">>> %s", sprint_hex(datain, datainlen));
 
diff --git a/client/mifare/mifarehost.c b/client/mifare/mifarehost.c
index b02c3e883..0b2a49048 100644
--- a/client/mifare/mifarehost.c
+++ b/client/mifare/mifarehost.c
@@ -263,14 +263,14 @@ int mfKeyBrute(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint64_t *resultk
 }
 
 // Compare 16 Bits out of cryptostate
-int Compare16Bits(const void *a, const void *b) {
+static int Compare16Bits(const void *a, const void *b) {
     if ((*(uint64_t *)b & 0x00ff000000ff0000) == (*(uint64_t *)a & 0x00ff000000ff0000)) return 0;
     if ((*(uint64_t *)b & 0x00ff000000ff0000) > (*(uint64_t *)a & 0x00ff000000ff0000)) return 1;
     return -1;
 }
 
 // wrapper function for multi-threaded lfsr_recovery32
-void
+static void
 #ifdef __has_attribute
 #if __has_attribute(force_align_arg_pointer)
 __attribute__((force_align_arg_pointer))
diff --git a/client/util.c b/client/util.c
index 7febdac9f..9f600f85a 100644
--- a/client/util.c
+++ b/client/util.c
@@ -852,7 +852,7 @@ uint64_t HornerScheme(uint64_t num, uint64_t divider, uint64_t factor) {
 }
 
 // determine number of logical CPU cores (use for multithreaded functions)
-extern int num_CPUs(void) {
+int num_CPUs(void) {
 #if defined(_WIN32)
 #include <sysinfoapi.h>
     SYSTEM_INFO sysinfo;
@@ -866,16 +866,16 @@ extern int num_CPUs(void) {
 #endif
 }
 
-extern void str_lower(char *s) {
+void str_lower(char *s) {
     for (int i = 0; i < strlen(s); i++)
         s[i] = tolower(s[i]);
 }
-extern bool str_startswith(const char *s,  const char *pre) {
+bool str_startswith(const char *s,  const char *pre) {
     return strncmp(pre, s, strlen(pre)) == 0;
 }
 
 // Replace unprintable characters with a dot in char buffer
-extern void clean_ascii(unsigned char *buf, size_t len) {
+void clean_ascii(unsigned char *buf, size_t len) {
     for (size_t i = 0; i < len; i++) {
         if (!isprint(buf[i]))
             buf[i] = '.';
@@ -883,20 +883,20 @@ extern void clean_ascii(unsigned char *buf, size_t len) {
 }
 
 // replace \r \n to \0
-extern void strcleanrn(char *buf, size_t len) {
+void strcleanrn(char *buf, size_t len) {
     strcreplace(buf, len, '\n', '\0');
     strcreplace(buf, len, '\r', '\0');
 }
 
 // replace char in buffer
-extern void strcreplace(char *buf, size_t len, char from, char to) {
+void strcreplace(char *buf, size_t len, char from, char to) {
     for (size_t i = 0; i < len; i++) {
         if (buf[i] == from)
             buf[i] = to;
     }
 }
 
-extern char *strmcopy(char *buf) {
+char *strmcopy(char *buf) {
     char *str = (char *) calloc(strlen(buf) + 1, sizeof(uint8_t));
     if (str != NULL) {
         memset(str, 0, strlen(buf) + 1);
diff --git a/client/util.h b/client/util.h
index 978dcde81..5e60868bb 100644
--- a/client/util.h
+++ b/client/util.h
@@ -261,6 +261,7 @@ int num_CPUs(void); // number of logical CPUs
 
 void str_lower(char *s); // converts string to lower case
 bool str_startswith(const char *s,  const char *pre);  // check for prefix in string
+void clean_ascii(unsigned char *buf, size_t len);
 void strcleanrn(char *buf, size_t len);
 void strcreplace(char *buf, size_t len, char from, char to);
 char *strmcopy(char *buf);
diff --git a/common/lfdemod.c b/common/lfdemod.c
index 81a8bb545..107a82f2b 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -286,7 +286,7 @@ bool preambleSearchEx(uint8_t *bits, uint8_t *preamble, size_t pLen, size_t *siz
 }
 
 // find start of modulating data (for fsk and psk) in case of beginning noise or slow chip startup.
-size_t findModStart(uint8_t *src, size_t size, uint8_t expWaveSize) {
+static size_t findModStart(uint8_t *src, size_t size, uint8_t expWaveSize) {
     size_t i = 0;
     size_t waveSizeCnt = 0;
     uint8_t thresholdCnt = 0;
@@ -311,7 +311,7 @@ size_t findModStart(uint8_t *src, size_t size, uint8_t expWaveSize) {
     return i;
 }
 
-int getClosestClock(int testclk) {
+static int getClosestClock(int testclk) {
     uint16_t clocks[] = {8, 16, 32, 40, 50, 64, 100, 128, 256, 384};
     uint8_t limit[]  = {1,  2,  4,  4,  5,  8,   8,   8,   8,   8};
 
@@ -1175,7 +1175,7 @@ uint8_t detectFSKClk(uint8_t *bits, size_t size, uint8_t fcHigh, uint8_t fcLow,
 
 
 // look for Sequence Terminator - should be pulses of clk*(1 or 2), clk*2, clk*(1.5 or 2), by idx we mean graph position index...
-bool findST(int *stStopLoc, int *stStartIdx, int lowToLowWaveLen[], int highToLowWaveLen[], int clk, int tol, int buffSize, size_t *i) {
+static bool findST(int *stStopLoc, int *stStartIdx, int lowToLowWaveLen[], int highToLowWaveLen[], int clk, int tol, int buffSize, size_t *i) {
     if (buffSize < *i + 4) return false;
 
     for (; *i < buffSize - 4; *i += 1) {
@@ -1322,7 +1322,8 @@ bool DetectST(uint8_t *buffer, size_t *size, int *foundclock, size_t *ststart, s
 //check for phase errors - should never have half a 1 or 0 by itself and should never exceed 1111 or 0000 in a row
 //decodes miller encoded binary
 //NOTE  askrawdemod will NOT demod miller encoded ask unless the clock is manually set to 1/2 what it is detected as!
-int millerRawDecode(uint8_t *bits, size_t *size, int invert) {
+/*
+static int millerRawDecode(uint8_t *bits, size_t *size, int invert) {
     if (*size < 16) return -1;
 
     uint16_t MaxBits = 512, errCnt = 0;
@@ -1355,6 +1356,7 @@ int millerRawDecode(uint8_t *bits, size_t *size, int invert) {
     *size = bitCnt;
     return errCnt;
 }
+*/
 
 //by marshmellow
 //take 01 or 10 = 1 and 11 or 00 = 0
@@ -1448,7 +1450,7 @@ int manrawdecode(uint8_t *bits, size_t *size, uint8_t invert, uint8_t *alignPos)
 //by marshmellow
 //demodulates strong heavily clipped samples
 //RETURN: num of errors.  if 0, is ok.
-int cleanAskRawDemod(uint8_t *bits, size_t *size, int clk, int invert, int high, int low, int *startIdx) {
+static int cleanAskRawDemod(uint8_t *bits, size_t *size, int clk, int invert, int high, int low, int *startIdx) {
     *startIdx = 0;
     size_t bitCnt = 0, smplCnt = 1, errCnt = 0, pos = 0;
     uint8_t cl_4 = clk / 4;
@@ -1675,7 +1677,7 @@ int nrzRawDemod(uint8_t *dest, size_t *size, int *clk, int *invert, int *startId
 }
 
 //translate wave to 11111100000 (1 for each short wave [higher freq] 0 for each long wave [lower freq])
-size_t fsk_wave_demod(uint8_t *dest, size_t size, uint8_t fchigh, uint8_t fclow, int *startIdx) {
+static size_t fsk_wave_demod(uint8_t *dest, size_t size, uint8_t fchigh, uint8_t fclow, int *startIdx) {
 
     if (size < 1024) return 0;   // not enough samples
 
@@ -1770,7 +1772,7 @@ size_t fsk_wave_demod(uint8_t *dest, size_t size, uint8_t fchigh, uint8_t fclow,
 
 //translate 11111100000 to 10
 //rfLen = clock, fchigh = larger field clock, fclow = smaller field clock
-size_t aggregate_bits(uint8_t *dest, size_t size, uint8_t clk, uint8_t invert, uint8_t fchigh, uint8_t fclow, int *startIdx) {
+static size_t aggregate_bits(uint8_t *dest, size_t size, uint8_t clk, uint8_t invert, uint8_t fchigh, uint8_t fclow, int *startIdx) {
 
     uint8_t lastval = dest[0];
     size_t i = 0;

From 6803e6d1c0b87dfcedd3dbc23201ef7e420a1779 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 13 Apr 2019 01:43:22 +0200
Subject: [PATCH 1204/1938] style

---
 armsrc/iso14443a.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 98ed1a1da..6e2ac1e85 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -756,6 +756,7 @@ static int GetIso14443aCommandFromReader(uint8_t *received, uint8_t *par, int *l
 
     // clear RXRDY:
     uint8_t b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
+    (void)b;
 
     while (!BUTTON_PRESS()) {
         WDT_HIT();
@@ -908,6 +909,7 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
             response1[1] = 0x00;
             sak = 0x0A;
         }
+        break;
         default: {
             Dbprintf("Error: unkown tagtype (%d)", tagType);
             return;
@@ -1410,8 +1412,7 @@ void PrepareDelayedTransfer(uint16_t delay) {
     delay &= 0x07;
     if (!delay) return;
 
-    uint8_t bitmask = 0;
-    uint8_t bits_to_shift = 0;
+    uint8_t bitmask = 0, bits_to_shift;
     uint8_t bits_shifted = 0;
     uint16_t i = 0;
 
@@ -1551,7 +1552,6 @@ void CodeIso14443aBitsAsReaderPar(const uint8_t *cmd, uint16_t bits, const uint8
     } else {
         // Sequence Y
         ToSend[++ToSendMax] = SEC_Y;
-        last = 0;
     }
     ToSend[++ToSendMax] = SEC_Y;
 
@@ -1574,7 +1574,7 @@ void CodeIso14443aAsReaderPar(const uint8_t *cmd, uint16_t len, const uint8_t *p
 int EmGetCmd(uint8_t *received, uint16_t *len, uint8_t *par) {
     *len = 0;
 
-    uint32_t timer = 0, vtime = 0;
+    uint32_t timer = 0, vtime;
     int analogCnt = 0;
     int analogAVG = 0;
 
@@ -1599,6 +1599,7 @@ int EmGetCmd(uint8_t *received, uint16_t *len, uint8_t *par) {
 
     // Clear RXRDY:
     uint8_t b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
+    (void)b;
 
     for (;;) {
         WDT_HIT();
@@ -1811,6 +1812,7 @@ static int GetIso14443aAnswerFromTag(uint8_t *receivedResponse, uint8_t *receive
 
     // clear RXRDY:
     uint8_t b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
+    (void)b;
 
     uint32_t timeout = iso14a_get_timeout();
     for (;;) {
@@ -2354,7 +2356,7 @@ void ReaderIso14443a(UsbCommand *c) {
     size_t lenbits = c->arg[1] >> 16;
     uint32_t timeout = c->arg[2];
     uint8_t *cmd = c->d.asBytes;
-    uint32_t arg0 = 0;
+    uint32_t arg0;
     uint8_t buf[USB_CMD_DATA_SIZE] = {0x00};
     uint8_t par[MAX_PARITY_SIZE] = {0x00};
 

From 618e31e9204b8ebce8cda926b08afb157395809a Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 13 Apr 2019 01:46:10 +0200
Subject: [PATCH 1205/1938] style

---
 client/cmdhf14a.c |  3 +--
 client/cmdhf14b.c | 10 +++-------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 7e6fc3d0c..73de14f03 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -1048,10 +1048,9 @@ static int CmdHF14ACmdRaw(const char *Cmd) {
 
 static int waitCmd(uint8_t iSelect) {
     UsbCommand resp;
-    uint16_t len = 0;
 
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-        len = (resp.arg[0] & 0xFFFF);
+        uint16_t len = (resp.arg[0] & 0xFFFF);
         if (iSelect) {
             len = (resp.arg[1] & 0xFFFF);
             if (len) {
diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c
index 4813433c9..74cfe9a99 100644
--- a/client/cmdhf14b.c
+++ b/client/cmdhf14b.c
@@ -123,24 +123,20 @@ static int switch_off_field_14b(void) {
 
 static bool waitCmd14b(bool verbose) {
 
-    bool crc = false;
     uint8_t data[USB_CMD_DATA_SIZE] = {0x00};
-    uint8_t status = 0;
-    uint16_t len = 0;
     UsbCommand resp;
 
     if (WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
 
-        status = (resp.arg[0] & 0xFF);
-        if (status > 0) return false;
+        if ((resp.arg[0] & 0xFF) > 0) return false;
 
-        len = (resp.arg[1] & 0xFFFF);
+        uint16_t len = (resp.arg[1] & 0xFFFF);
 
         memcpy(data, resp.d.asBytes, len);
 
         if (verbose) {
             if (len >= 3) {
-                crc = check_crc(CRC_14443_B, data, len);
+                bool crc = check_crc(CRC_14443_B, data, len);
 
                 PrintAndLogEx(NORMAL, "[LEN %u] %s[%02X %02X] %s",
                               len,

From ef46e3af29cd353516fde97a03ec34b8c091b9f9 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 13 Apr 2019 01:47:10 +0200
Subject: [PATCH 1206/1938] style

---
 client/cmdhffelica.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/client/cmdhffelica.c b/client/cmdhffelica.c
index 1b17cb37d..525ee7c17 100644
--- a/client/cmdhffelica.c
+++ b/client/cmdhffelica.c
@@ -413,10 +413,9 @@ static int CmdHFFelicaDumpLite(const char *Cmd) {
 
 static void waitCmdFelica(uint8_t iSelect) {
     UsbCommand resp;
-    uint16_t len = 0;
 
     if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
-        len = iSelect ? (resp.arg[1] & 0xffff) : (resp.arg[0]  & 0xffff);
+        uint16_t len = iSelect ? (resp.arg[1] & 0xffff) : (resp.arg[0]  & 0xffff);
         PrintAndLogEx(NORMAL, "received %i octets", len);
         if (!len)
             return;

From 4cadd8c2eea4e64c102b8dd9343641dc22fd2509 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 13 Apr 2019 02:04:40 +0200
Subject: [PATCH 1207/1938] style

---
 client/jansson/path.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/jansson/path.c b/client/jansson/path.c
index ae44a09b2..943338f42 100644
--- a/client/jansson/path.c
+++ b/client/jansson/path.c
@@ -110,7 +110,7 @@ int json_path_set_new(json_t *json, const char *path, json_t *value, size_t flag
             if (expect == path_delims) {
                 break;
             } else {
-                jsonp_error_set(error, -1, -1, peek - buf, json_error_invalid_format, "missing ']'?");
+                jsonp_error_set(error, -1, -1, buf, json_error_invalid_format, "missing ']'?");
                 goto fail;
             }
         }
@@ -182,7 +182,7 @@ int json_path_set_new(json_t *json, const char *path, json_t *value, size_t flag
         json_array_set(parent, index_saved, value);
         cursor = json_array_get(parent, index_saved);
     } else {
-        jsonp_error_set(error, -1, -1, peek - buf, json_error_item_not_found, "invalid path");
+        jsonp_error_set(error, -1, -1, (peek) ? peek - buf : buf, json_error_item_not_found, "invalid path");
         goto fail;
     }
 

From f8a533af5d47a0bf541112dbe1c8c4f4dd8ac624 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 13 Apr 2019 02:09:23 +0200
Subject: [PATCH 1208/1938] style

---
 client/jansson/path.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/jansson/path.c b/client/jansson/path.c
index 943338f42..bafea59ba 100644
--- a/client/jansson/path.c
+++ b/client/jansson/path.c
@@ -110,7 +110,7 @@ int json_path_set_new(json_t *json, const char *path, json_t *value, size_t flag
             if (expect == path_delims) {
                 break;
             } else {
-                jsonp_error_set(error, -1, -1, buf, json_error_invalid_format, "missing ']'?");
+                jsonp_error_set(error, -1, -1, last_peek - buf, json_error_invalid_format, "missing ']'?");
                 goto fail;
             }
         }
@@ -182,7 +182,7 @@ int json_path_set_new(json_t *json, const char *path, json_t *value, size_t flag
         json_array_set(parent, index_saved, value);
         cursor = json_array_get(parent, index_saved);
     } else {
-        jsonp_error_set(error, -1, -1, (peek) ? peek - buf : buf, json_error_item_not_found, "invalid path");
+        jsonp_error_set(error, -1, -1, last_peek - buf, json_error_item_not_found, "invalid path");
         goto fail;
     }
 

From 85b44630008417e8a866593e0cd66885f797e892 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 13 Apr 2019 02:10:44 +0200
Subject: [PATCH 1209/1938] style

---
 client/jansson/path.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/jansson/path.c b/client/jansson/path.c
index bafea59ba..f9c3a9117 100644
--- a/client/jansson/path.c
+++ b/client/jansson/path.c
@@ -182,7 +182,7 @@ int json_path_set_new(json_t *json, const char *path, json_t *value, size_t flag
         json_array_set(parent, index_saved, value);
         cursor = json_array_get(parent, index_saved);
     } else {
-        jsonp_error_set(error, -1, -1, last_peek - buf, json_error_item_not_found, "invalid path");
+        jsonp_error_set(error, -1, -1, 0, json_error_item_not_found, "invalid path");
         goto fail;
     }
 

From a27348c592ec464bbcd872e13061a7fa6c33734c Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 13 Apr 2019 02:13:23 +0200
Subject: [PATCH 1210/1938] replaced with threadsafe strtok_r call

---
 client/ui.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/ui.c b/client/ui.c
index d22790b9a..07d84aa1d 100644
--- a/client/ui.c
+++ b/client/ui.c
@@ -98,7 +98,7 @@ void PrintAndLogEx(logLevel_t level, const char *fmt, ...) {
         if (buffer[0] == '\n')
             PrintAndLog("");
 
-        token = strtok(buffer, delim);
+        token = strtok_r(buffer, delim);
 
         while (token != NULL) {
 
@@ -109,7 +109,7 @@ void PrintAndLogEx(logLevel_t level, const char *fmt, ...) {
             else
                 snprintf(buffer2 + size, sizeof(buffer2) - size, "\n");
 
-            token = strtok(NULL, delim);
+            token = strtok_r(NULL, delim);
         }
         PrintAndLog("%s", buffer2);
     } else {

From f05566c8349ed8628aa82170f7d0b90ce0295421 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 13 Apr 2019 02:16:22 +0200
Subject: [PATCH 1211/1938] missing pointers..

---
 client/ui.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/client/ui.c b/client/ui.c
index 07d84aa1d..4dbace3c8 100644
--- a/client/ui.c
+++ b/client/ui.c
@@ -55,6 +55,7 @@ void PrintAndLogEx(logLevel_t level, const char *fmt, ...) {
     char buffer[MAX_PRINT_BUFFER] = {0};
     char buffer2[MAX_PRINT_BUFFER + 20] = {0};
     char *token = NULL;
+    char *tmp_ptr = NULL;
     //   {NORMAL, SUCCESS, INFO, FAILED, WARNING, ERR, DEBUG}
     static const char *prefixes[7] = { "", "[+] ", "[=] ", "[-] ", "[!] ", "[!!] ", "[#] "};
 
@@ -98,7 +99,7 @@ void PrintAndLogEx(logLevel_t level, const char *fmt, ...) {
         if (buffer[0] == '\n')
             PrintAndLog("");
 
-        token = strtok_r(buffer, delim);
+        token = strtok_r(buffer, delim, &tmp_ptr);
 
         while (token != NULL) {
 
@@ -109,7 +110,7 @@ void PrintAndLogEx(logLevel_t level, const char *fmt, ...) {
             else
                 snprintf(buffer2 + size, sizeof(buffer2) - size, "\n");
 
-            token = strtok_r(NULL, delim);
+            token = strtok_r(NULL, delim, &tmp_ptr);
         }
         PrintAndLog("%s", buffer2);
     } else {

From ecf282a54cb578055a86e6b8e768b6dc8d96ffd9 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 13 Apr 2019 02:18:49 +0200
Subject: [PATCH 1212/1938] missing include

---
 client/ui.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/ui.h b/client/ui.h
index 14af52fcb..ca235c11f 100644
--- a/client/ui.h
+++ b/client/ui.h
@@ -17,6 +17,7 @@
 #include <stdio.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include <string.h>
 #include <readline/readline.h>
 #include <pthread.h>
 #include <math.h>

From 48e1a7648e606221d967c76d5b77efcc7129347e Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 13 Apr 2019 02:30:00 +0200
Subject: [PATCH 1213/1938] posix 2001

---
 client/ui.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/client/ui.h b/client/ui.h
index ca235c11f..f08c704bb 100644
--- a/client/ui.h
+++ b/client/ui.h
@@ -11,6 +11,13 @@
 #ifndef UI_H__
 #define UI_H__
 
+/* Ensure gmtime_r, strtok_r is available even with -std=c99; must be included before
+ */
+#if !defined(_WIN32)
+#define _POSIX_C_SOURCE 200112L
+#endif
+
+
 #define _USE_MATH_DEFINES
 #include <stdarg.h>
 #include <stdlib.h>

From 361cd83fcee3ab90ba3484f86f1df241cc6f3139 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 13 Apr 2019 02:41:46 +0200
Subject: [PATCH 1214/1938] gmtime_r

---
 client/cmdmain.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/client/cmdmain.c b/client/cmdmain.c
index 9a1fb7108..e74425f51 100644
--- a/client/cmdmain.c
+++ b/client/cmdmain.c
@@ -8,6 +8,13 @@
 //-----------------------------------------------------------------------------
 // Main command parser entry point
 //-----------------------------------------------------------------------------
+
+
+/* Ensure gmtime_r is available even with -std=c99; must be included before
+ */
+#if !defined(_WIN32)
+#define _POSIX_C_SOURCE 200112L
+#endif
 #include "cmdmain.h"
 
 static int CmdHelp(const char *Cmd);
@@ -16,9 +23,9 @@ static int CmdRem(const char *Cmd) {
     char buf[22];
 
     memset(buf, 0x00, sizeof(buf));
-    struct tm *curTime;
+    struct tm *curTime = NULL;
     time_t now = time(0);
-    curTime = gmtime(&now);
+    gmtime_r(&now, curTime);
     strftime(buf, sizeof(buf), "%Y-%m-%dT%H:%M:%SZ", curTime);  // ISO8601
     PrintAndLogEx(NORMAL, "%s remark: %s", buf, Cmd);
     return 0;

From 1cb83e78a5f0333f9837cae00dab297e7d530213 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 13 Apr 2019 02:45:53 +0200
Subject: [PATCH 1215/1938] localtime, gmtime replaced

---
 client/cmdlft55xx.c | 13 ++++++++++---
 client/cmdmain.c    |  3 +--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 77b520215..6c4f0b03e 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -6,6 +6,12 @@
 //-----------------------------------------------------------------------------
 // Low frequency T55xx commands
 //-----------------------------------------------------------------------------
+/* Ensure localtime_r is available even with -std=c99; must be included before
+ */
+#if !defined(_WIN32)
+#define _POSIX_C_SOURCE 200112L
+#endif
+
 #include "cmdlft55xx.h"
 
 // Default configuration
@@ -1199,9 +1205,10 @@ static int CmdT55xxReadTrace(const char *Cmd) {
         si += 5;
         data.dw      = PackBits(si, 15, DemodBuffer);
 
-        time_t t = time(NULL);
-        struct tm tm = *localtime(&t);
-        if (data.year > tm.tm_year - 110)
+        struct tm *t = NULL;
+        time_t now = time(NULL);        
+        localtime_r(&now, t);
+        if (data.year > t.tm_year - 110)
             data.year += 2000;
         else
             data.year += 2010;
diff --git a/client/cmdmain.c b/client/cmdmain.c
index e74425f51..615ec72e2 100644
--- a/client/cmdmain.c
+++ b/client/cmdmain.c
@@ -9,7 +9,6 @@
 // Main command parser entry point
 //-----------------------------------------------------------------------------
 
-
 /* Ensure gmtime_r is available even with -std=c99; must be included before
  */
 #if !defined(_WIN32)
@@ -24,7 +23,7 @@ static int CmdRem(const char *Cmd) {
 
     memset(buf, 0x00, sizeof(buf));
     struct tm *curTime = NULL;
-    time_t now = time(0);
+    time_t now = time(NULL);
     gmtime_r(&now, curTime);
     strftime(buf, sizeof(buf), "%Y-%m-%dT%H:%M:%SZ", curTime);  // ISO8601
     PrintAndLogEx(NORMAL, "%s remark: %s", buf, Cmd);

From 0a8c303685c69c8c57be237305eeb253579eb6a2 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 13 Apr 2019 02:49:15 +0200
Subject: [PATCH 1216/1938] move defines

---
 client/ui.c | 6 ++++++
 client/ui.h | 7 -------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/client/ui.c b/client/ui.c
index 4dbace3c8..4167625da 100644
--- a/client/ui.c
+++ b/client/ui.c
@@ -9,6 +9,12 @@
 // UI utilities
 //-----------------------------------------------------------------------------
 
+/* Ensure strtok_r is available even with -std=c99; must be included before
+ */
+#if !defined(_WIN32)
+#define _POSIX_C_SOURCE 200112L
+#endif
+
 #include "ui.h"
 
 double CursorScaleFactor = 1;
diff --git a/client/ui.h b/client/ui.h
index f08c704bb..ca235c11f 100644
--- a/client/ui.h
+++ b/client/ui.h
@@ -11,13 +11,6 @@
 #ifndef UI_H__
 #define UI_H__
 
-/* Ensure gmtime_r, strtok_r is available even with -std=c99; must be included before
- */
-#if !defined(_WIN32)
-#define _POSIX_C_SOURCE 200112L
-#endif
-
-
 #define _USE_MATH_DEFINES
 #include <stdarg.h>
 #include <stdlib.h>

From 22f844018330725a8559ba61541500b15aa5eaa8 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 13 Apr 2019 02:51:33 +0200
Subject: [PATCH 1217/1938] struct

---
 client/cmdlft55xx.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 6c4f0b03e..82dc68c8a 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1205,10 +1205,10 @@ static int CmdT55xxReadTrace(const char *Cmd) {
         si += 5;
         data.dw      = PackBits(si, 15, DemodBuffer);
 
-        struct tm *t = NULL;
+        struct tm *tm = NULL;
         time_t now = time(NULL);        
-        localtime_r(&now, t);
-        if (data.year > t.tm_year - 110)
+        localtime_r(&now, tm);
+        if (data.year > tm->tm_year - 110)
             data.year += 2000;
         else
             data.year += 2010;

From dae0016bb27ae70922a89d1a44b866f9229a3c1c Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 13 Apr 2019 03:01:31 +0200
Subject: [PATCH 1218/1938] times times times

---
 client/cmdlft55xx.c | 17 +++++++++++------
 client/cmdmain.c    | 17 +++++++++--------
 client/util.c       | 21 +++++++++++++++------
 3 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 82dc68c8a..a5a262cce 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -6,8 +6,8 @@
 //-----------------------------------------------------------------------------
 // Low frequency T55xx commands
 //-----------------------------------------------------------------------------
-/* Ensure localtime_r is available even with -std=c99; must be included before
- */
+
+// ensure localtime_r is available even with -std=c99; must be included before
 #if !defined(_WIN32)
 #define _POSIX_C_SOURCE 200112L
 #endif
@@ -1205,10 +1205,15 @@ static int CmdT55xxReadTrace(const char *Cmd) {
         si += 5;
         data.dw      = PackBits(si, 15, DemodBuffer);
 
-        struct tm *tm = NULL;
-        time_t now = time(NULL);        
-        localtime_r(&now, tm);
-        if (data.year > tm->tm_year - 110)
+        struct tm *ct, tm_buf;
+        time_t now = time(NULL);
+#if defined(_WIN32)
+        ct = localtime_s(&tm_buf, &now) == 0 ? &tm_buf : NULL;
+#else
+        ct = localtime_r(&now, &tm_buf);
+#endif        
+        
+        if (data.year > ct->tm_year - 110)
             data.year += 2000;
         else
             data.year += 2010;
diff --git a/client/cmdmain.c b/client/cmdmain.c
index 615ec72e2..db91b9c19 100644
--- a/client/cmdmain.c
+++ b/client/cmdmain.c
@@ -9,8 +9,7 @@
 // Main command parser entry point
 //-----------------------------------------------------------------------------
 
-/* Ensure gmtime_r is available even with -std=c99; must be included before
- */
+// ensure gmtime_r is available even with -std=c99; must be included before
 #if !defined(_WIN32)
 #define _POSIX_C_SOURCE 200112L
 #endif
@@ -19,13 +18,15 @@
 static int CmdHelp(const char *Cmd);
 
 static int CmdRem(const char *Cmd) {
-    char buf[22];
-
-    memset(buf, 0x00, sizeof(buf));
-    struct tm *curTime = NULL;
+    char buf[22] = {0};
+    struct tm *ct, tm_buf;
     time_t now = time(NULL);
-    gmtime_r(&now, curTime);
-    strftime(buf, sizeof(buf), "%Y-%m-%dT%H:%M:%SZ", curTime);  // ISO8601
+#if defined(_WIN32)
+    ct = gmtime_s(&tm_buf, &now) == 0 ? &tm_buf : NULL;
+#else
+    ct = gmtime_r(&now, &tm_buf);
+#endif
+    strftime(buf, sizeof(buf), "%Y-%m-%dT%H:%M:%SZ", ct);  // ISO8601
     PrintAndLogEx(NORMAL, "%s remark: %s", buf, Cmd);
     return 0;
 }
diff --git a/client/util.c b/client/util.c
index 9f600f85a..a71f79ffd 100644
--- a/client/util.c
+++ b/client/util.c
@@ -7,6 +7,12 @@
 //-----------------------------------------------------------------------------
 // utilities
 //-----------------------------------------------------------------------------
+
+// ensure gmtime_r is available even with -std=c99; must be included before
+ #if !defined(_WIN32)
+#define _POSIX_C_SOURCE 200112L
+#endif
+
 #include "util.h"
 
 #define UTIL_BUFFER_SIZE_SPRINT 4097
@@ -92,12 +98,15 @@ void AddLogUint64(const char *fn, const char *data, const uint64_t value) {
 }
 
 void AddLogCurrentDT(const char *fn) {
-    char buf[20];
-    memset(buf, 0x00, sizeof(buf));
-    struct tm *curTime;
-    time_t now = time(0);
-    curTime = gmtime(&now);
-    strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", curTime);
+    char buf[20] = {0};
+    struct tm *ct, tm_buf;
+    time_t now = time(NULL);
+#if defined(_WIN32)
+    ct = gmtime_s(&tm_buf, &now) == 0 ? &tm_buf : NULL;
+#else
+    ct = gmtime_r(&now, &tm_buf);
+#endif
+    strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", ct);
     AddLogLine(fn, "\nanticollision: ", buf);
 }
 

From e20a47478f19b216a6d9616f6938d05b7dd33354 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 13 Apr 2019 03:07:53 +0200
Subject: [PATCH 1219/1938] comment away my playground

---
 client/cmdanalyse.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/client/cmdanalyse.c b/client/cmdanalyse.c
index b9e4931d1..7196134b1 100644
--- a/client/cmdanalyse.c
+++ b/client/cmdanalyse.c
@@ -466,6 +466,7 @@ static int CmdAnalyseTEASelfTest(const char *Cmd) {
     return 0;
 }
 
+/*
 static char *pb(uint32_t b) {
     static char buf1[33] = {0};
     static char buf2[33] = {0};
@@ -485,6 +486,7 @@ static char *pb(uint32_t b) {
     }
     return s;
 }
+*/
 
 static int CmdAnalyseA(const char *Cmd) {
 
@@ -526,7 +528,7 @@ static int CmdAnalyseA(const char *Cmd) {
     }
     PrintAndLogEx(NORMAL, "got ack.  Status %d", resp.arg[0]);
     return 0;
-
+/*
     PrintAndLogEx(NORMAL, "-- " _BLUE_("its my message") "\n");
     PrintAndLogEx(NORMAL, "-- " _RED_("its my message") "\n");
     PrintAndLogEx(NORMAL, "-- " _YELLOW_("its my message") "\n");
@@ -555,13 +557,14 @@ static int CmdAnalyseA(const char *Cmd) {
     n1 = (n1 << 4) | (rev & (uint8_t)(~(0xFF << 4)));
 
     PrintAndLogEx(NORMAL, "rev %02X | %02X %s | %02X %s |\n", rev, n0, pb(n0), n1, pb(n1));
-
+*/
     /*
     hex(0xb24d shr 0) 0xB24D 0b1011001001001101
     hex(0xb24d shr 1) 0x5926
     hex(0xb24d shr 2) 0x2C93
     */
 
+/*    
     for (int i = 0; i < 16; i++) {
         PrintAndLogEx(NORMAL, " (shiftReg >> %d) & 0xFFFF ==  %08x ---", i, ((shiftReg >> i) & 0xFFFF));
 
@@ -585,12 +588,12 @@ static int CmdAnalyseA(const char *Cmd) {
     uint8_t p1 = (rev & (uint8_t)(~(0xFF << byte_offset)));
     PrintAndLogEx(NORMAL, "Offset  %u  | leftovers  %02x  %s \n", byte_offset, p1, pb(p1));
 
-
+*/
 
     /*
     pm3 --> da hex2bin 4db2     0100110110110010
     */
-    return 0;
+    //return 0;
     /*
         // split byte into two parts.
         uint8_t offset = 3, n0 = 0, n1 = 0;
@@ -618,6 +621,7 @@ static int CmdAnalyseA(const char *Cmd) {
         */
 //    return 0;
 
+/*
     // 14443-A
     uint8_t u14_c[] = {0x09, 0x78, 0x00, 0x92, 0x02, 0x54, 0x13, 0x02, 0x04, 0x2d, 0xe8 }; // atqs w crc
     uint8_t u14_w[] = {0x09, 0x78, 0x00, 0x92, 0x02, 0x54, 0x13, 0x02, 0x04, 0x2d, 0xe7 }; // atqs w crc
@@ -649,6 +653,7 @@ static int CmdAnalyseA(const char *Cmd) {
     PrintAndLogEx(NORMAL, "\n\n");
 
     return 0;
+    */
     /*
     bool term = !isatty(STDIN_FILENO);
     if (!term) {
@@ -692,6 +697,7 @@ static int CmdAnalyseA(const char *Cmd) {
     uid(3e172b29) nt(039b7bd2) ks(0c0e0f0505080800) nr(00000001)
     uid(3e172b29) nt(039b7bd2) ks(0e06090d03000b0f) nr(00000002)
     */
+/*    
     uint64_t *keylistA = NULL, *keylistB = NULL;
     uint32_t keycountA = 0, keycountB = 0;
 //  uint64_t d1[] = {0x3e172b29, 0x039b7bd2, 0x0000001, 0, 0x0c0e0f0505080800};
@@ -721,7 +727,7 @@ static int CmdAnalyseA(const char *Cmd) {
 
     free(keylistA);
     free(keylistB);
-
+*/
 //  qsort(keylist, keycount, sizeof(*keylist), compare_uint64);
 //  keycount = intersection(last_keylist, keylist);
 
@@ -849,7 +855,7 @@ static int CmdAnalyseA(const char *Cmd) {
         );
     }
     */
-    return 0;
+//    return 0;
 }
 
 static void generate4bNUID(uint8_t *uid, uint8_t *nuid) {

From 4ab2212346e6ad23b0c7d3f35a250bbbeb26097e Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 13 Apr 2019 08:50:05 +0200
Subject: [PATCH 1220/1938] style

---
 armsrc/lfops.c   |  2 +-
 common/lfdemod.c | 30 ++++++++++++++----------------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index cfb93b7d2..613e786c2 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -165,7 +165,7 @@ void ModThenAcquireRawAdcSamples125k(uint32_t delay_off, uint32_t period_0, uint
     // clear read buffer
     BigBuf_Clear_keep_EM();
 
-    LFSetupFPGAForADC(sc->divisor, 1);
+    LFSetupFPGAForADC(sc->divisor, true);
 
     // little more time for the tag to fully power up
     WaitMS(200);
diff --git a/common/lfdemod.c b/common/lfdemod.c
index 107a82f2b..9ff28f4d5 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -376,7 +376,7 @@ bool loadWaveCounters(uint8_t *samples, size_t size, int lowToLowWaveLen[], int
 size_t pskFindFirstPhaseShift(uint8_t *samples, size_t size, uint8_t *curPhase, size_t waveStart, uint16_t fc, uint16_t *fullWaveLen) {
     uint16_t loopCnt = (size + 3 < 4096) ? size : 4096; //don't need to loop through entire array...
 
-    uint16_t avgWaveVal = 0, lastAvgWaveVal = 0;
+    uint16_t avgWaveVal = 0, lastAvgWaveVal;
     size_t i = waveStart, waveEnd, waveLenCnt, firstFullWave;
     for (; i < loopCnt; i++) {
         // find peak // was "samples[i] + fc" but why?  must have been used to weed out some wave error... removed..
@@ -417,9 +417,8 @@ void askAmp(uint8_t *bits, size_t size) {
 // iceman, simplify this
 uint32_t manchesterEncode2Bytes(uint16_t datain) {
     uint32_t output = 0;
-    uint8_t curBit = 0;
     for (uint8_t i = 0; i < 16; i++) {
-        curBit = (datain >> (15 - i) & 1);
+        uint8_t curBit = (datain >> (15 - i) & 1);
         output |= (1 << (((15 - i) * 2) + curBit));
     }
     return output;
@@ -482,7 +481,6 @@ bool DetectCleanAskWave(uint8_t *dest, size_t size, uint8_t high, uint8_t low) {
 // to help detect clocks on heavily clipped samples
 // based on count of low to low
 int DetectStrongAskClock(uint8_t *dest, size_t size, int high, int low, int *clock) {
-    size_t startwave;
     size_t i = 100;
     size_t minClk = 512;
     uint16_t shortestWaveIdx = 0;
@@ -511,7 +509,7 @@ int DetectStrongAskClock(uint8_t *dest, size_t size, int high, int low, int *clo
     // loop through all samples (well, we don't want to go out-of-bounds)
     while (i < size - 512) {
         // measure from low to low
-        startwave = i;
+        size_t startwave = i;
 
         getNextHigh(dest, size, high, &i);
         getNextLow(dest, size, low, &i);
@@ -623,11 +621,11 @@ int DetectASKClock(uint8_t *dest, size_t size, int *clock, int maxErr) {
     if (*clock > 0)
         clk[0] = *clock;
 
-    uint8_t clkCnt, tol = 0;
+    uint8_t clkCnt, tol;
     size_t j = 0;
     uint16_t bestErr[] = {1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000};
     uint8_t bestStart[] = {0, 0, 0, 0, 0, 0, 0, 0, 0};
-    size_t errCnt = 0, arrLoc, loopEnd;
+    size_t errCnt, arrLoc, loopEnd;
 
     if (found_clk) {
         clkCnt = found_clk;
@@ -987,10 +985,10 @@ int DetectPSKClock(uint8_t *dest, size_t size, int clock, size_t *firstPhaseShif
     if (*fc != 2 && *fc != 4 && *fc != 8) return 0;
 
 
-    size_t waveStart, waveEnd, firstFullWave = 0, lastClkBit;
+    size_t waveEnd, firstFullWave = 0;
 
-    uint8_t clkCnt, tol;
-    uint16_t peakcnt, errCnt, waveLenCnt, fullWaveLen = 0;
+    uint8_t clkCnt;
+    uint16_t waveLenCnt, fullWaveLen = 0;
     uint16_t bestErr[] = {1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000};
     uint16_t peaksdet[] = {0, 0, 0, 0, 0, 0, 0, 0, 0};
 
@@ -1010,11 +1008,11 @@ int DetectPSKClock(uint8_t *dest, size_t size, int clock, size_t *firstPhaseShif
 
     //test each valid clock from greatest to smallest to see which lines up
     for (clkCnt = 7; clkCnt >= 1 ; clkCnt--) {
-        tol = *fc / 2;
-        lastClkBit = firstFullWave; //set end of wave as clock align
-        waveStart = 0;
-        errCnt = 0;
-        peakcnt = 0;
+        uint8_t tol = *fc / 2;
+        size_t lastClkBit = firstFullWave; //set end of wave as clock align
+        size_t waveStart = 0;
+        uint16_t errCnt = 0;
+        uint16_t peakcnt = 0;
         if (g_debugMode == 2) prnt("DEBUG PSK: clk: %d, lastClkBit: %d", clk[clkCnt], lastClkBit);
 
         for (i = firstFullWave + fullWaveLen - 1; i < loopCnt - 2; i++) {
@@ -1565,7 +1563,7 @@ int askdemod_ext(uint8_t *bits, size_t *size, int *clk, int *invert, int maxErr,
     // if clean clipped waves detected run alternate demod
     if (DetectCleanAskWave(bits, *size, high, low)) {
 
-        if (g_debugMode == 2) prnt("DEBUG ASK: Clean Wave Detected - using clean wave demod");
+        if (g_debugMode == 2) prnt("DEBUG: (askdemod_ext) Clean wave detected");
 
         errCnt = cleanAskRawDemod(bits, size, *clk, *invert, high, low, startIdx);
 

From 4572acc1ebee06fe992b4ae47d4f7b6d8c8b1e1f Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 13 Apr 2019 13:34:02 +0200
Subject: [PATCH 1221/1938] cleaning out the helptext mingw got some bad
 asciiarts

---
 client/proxmark3.c | 90 ++++++++++++++++++++++++++++------------------
 1 file changed, 55 insertions(+), 35 deletions(-)

diff --git a/client/proxmark3.c b/client/proxmark3.c
index 50180a79c..2947075cb 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -28,21 +28,28 @@
 #include "whereami.h"
 #include "comms.h"
 
-#if defined(__linux__) || (__APPLE__)
 static void showBanner(void) {
     printf("\n\n");
+#if defined(__linux__) || (__APPLE__)
     printf("\e[34m██████╗ ███╗   ███╗ ████╗\e[0m     ...iceman fork\n");
     printf("\e[34m██╔══██╗████╗ ████║   ══█║\e[0m      ...dedicated to \e[34mRDV40\e[0m\n");
     printf("\e[34m██████╔╝██╔████╔██║ ████╔╝\e[0m\n");
     printf("\e[34m██╔═══╝ ██║╚██╔╝██║   ══█║\e[0m    iceman@icesql.net\n");
-    printf("\e[34m██║     ██║ ╚═╝ ██║ ████╔╝\e[0m  https://github.com/iceman1001/proxmark3\n");
-    printf("\e[34m╚═╝     ╚═╝     ╚═╝ ╚═══╝\e[0m pre v4.0\n");
-    printf("\nKeep iceman fork alive with a donation!           https://paypal.me/iceman1001/");
-    printf("\nMONERO: 43mNJLpgBVaTvyZmX9ajcohpvVkaRy1kbZPm8tqAb7itZgfuYecgkRF36rXrKFUkwEGeZedPsASRxgv4HPBHvJwyJdyvQuP");
+    printf("\e[34m██║     ██║ ╚═╝ ██║ ████╔╝\e[0m   https://github.com/rfidresearchgroup/proxmark3/\n");
+    printf("\e[34m╚═╝     ╚═╝     ╚═╝ ╚═══╝\e[0m pre-release v4.0\n");
+#else
+    printf("======. ===.   ===. ====.     ...iceman fork\n");
+    printf("==...==.====. ====.   ..=.      ...dedicated to RDV40\n");
+    printf("======..==.====.==. ====..\n");
+    printf("==..... ==..==..==.   ..=.    iceman@icesql.net\n");
+    printf("==.     ==. ... ==. ====..   https://github.com/rfidresearchgroup/proxmark3/\n");
+    printf("...     ...     ... .....  pre-release v4.0\n");
+#endif
+    printf("\nSupport iceman on patreon,   https://www.patreon.com/iceman1001/");
+//    printf("\nMonero: 43mNJLpgBVaTvyZmX9ajcohpvVkaRy1kbZPm8tqAb7itZgfuYecgkRF36rXrKFUkwEGeZedPsASRxgv4HPBHvJwyJdyvQuP");
     printf("\n\n\n");
     fflush(stdout);
 }
-#endif
 
 void
 #ifdef __has_attribute
@@ -216,37 +223,43 @@ const char *get_my_executable_directory(void) {
 
 static void set_my_executable_path(void) {
     int path_length = wai_getExecutablePath(NULL, 0, NULL);
-    if (path_length != -1) {
-        my_executable_path = (char *)calloc(path_length + 1, sizeof(uint8_t));
-        int dirname_length = 0;
-        if (wai_getExecutablePath(my_executable_path, path_length, &dirname_length) != -1) {
-            my_executable_path[path_length] = '\0';
-            my_executable_directory = (char *)calloc(dirname_length + 2, sizeof(uint8_t));
-            strncpy(my_executable_directory, my_executable_path, dirname_length + 1);
-            my_executable_directory[dirname_length + 1] = '\0';
-        }
+    if (path_length == -1) 
+        return;
+        
+    my_executable_path = (char *)calloc(path_length + 1, sizeof(uint8_t));
+    int dirname_length = 0;
+    if (wai_getExecutablePath(my_executable_path, path_length, &dirname_length) != -1) {
+        my_executable_path[path_length] = '\0';
+        my_executable_directory = (char *)calloc(dirname_length + 2, sizeof(uint8_t));
+        strncpy(my_executable_directory, my_executable_path, dirname_length + 1);
+        my_executable_directory[dirname_length + 1] = '\0';
     }
 }
 
 static void show_help(bool showFullHelp, char *command_line) {
-    PrintAndLogEx(NORMAL, "syntax: %s <port> [-h | -help | -m | -f | -flush | -w | -wait | -c | -command | -l | -lua] [cmd_script_file_name] [command][lua_script_name]\n", command_line);
-    PrintAndLogEx(NORMAL, "\texample:'%s "SERIAL_PORT_H"'\n\n", command_line);
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "syntax: %s <port> [ -h -m -f -w ] [-c <command>] [-l <lua_script_file>] [<cmd_script_file_name]\n", command_line);
 
     if (showFullHelp) {
-        PrintAndLogEx(NORMAL, "help: <-h|-help> Dump all interactive command's help at once.\n");
-        PrintAndLogEx(NORMAL, "\t%s  -h\n\n", command_line);
-        PrintAndLogEx(NORMAL, "markdown: <-m> Dump all interactive help at once in markdown syntax\n");
-        PrintAndLogEx(NORMAL, "\t%s -m\n\n", command_line);
-        PrintAndLogEx(NORMAL, "flush: <-f|-flush> Output will be flushed after every print.\n");
-        PrintAndLogEx(NORMAL, "\t%s -f\n\n", command_line);
-        PrintAndLogEx(NORMAL, "wait: <-w|-wait> 20sec waiting the serial port to appear in the OS\n");
-        PrintAndLogEx(NORMAL, "\t%s "SERIAL_PORT_H" -w\n\n", command_line);
-        PrintAndLogEx(NORMAL, "script: A script file with one proxmark3 command per line.\n\n");
-        PrintAndLogEx(NORMAL, "command: <-c|-command> Execute one proxmark3 command.\n");
-        PrintAndLogEx(NORMAL, "\t%s "SERIAL_PORT_H" -c \"hf mf chk 1* ?\"\n", command_line);
-        PrintAndLogEx(NORMAL, "\t%s "SERIAL_PORT_H" -command \"hf mf nested 1 *\"\n\n", command_line);
-        PrintAndLogEx(NORMAL, "lua: <-l|-lua> Execute lua script.\n");
-        PrintAndLogEx(NORMAL, "\t%s "SERIAL_PORT_H" -l hf_read\n\n", command_line);
+        PrintAndLogEx(NORMAL, "options:");
+        PrintAndLogEx(NORMAL, "      -h                    dump all interactive command's help at once");
+        PrintAndLogEx(NORMAL, "      -m                    dump all interactive help at once in markdown syntax");
+        PrintAndLogEx(NORMAL, "      -f                    output will be flushed after every print");
+        PrintAndLogEx(NORMAL, "      -w                    20sec waiting the serial port to appear in the OS");
+        PrintAndLogEx(NORMAL, "      -c <command>          execute one proxmark3 command.");
+        PrintAndLogEx(NORMAL, "      -l <lua script file>  execute lua script.");
+        PrintAndLogEx(NORMAL, "      <cmd_script_file>     script file with one proxmark3 command per line");
+        PrintAndLogEx(NORMAL, "\nsamples:");
+        PrintAndLogEx(NORMAL, "      %s -h\n", command_line);
+        PrintAndLogEx(NORMAL, "      %s -m\n", command_line);
+        PrintAndLogEx(NORMAL, "      %s "SERIAL_PORT_H" -f             -- flush output everytime\n", command_line);
+        PrintAndLogEx(NORMAL, "      %s "SERIAL_PORT_H" -w             -- wait for serial port\n", command_line);
+        PrintAndLogEx(NORMAL, "\n  how to run proxmark3 client\n");
+        PrintAndLogEx(NORMAL, "      %s "SERIAL_PORT_H"                -- runs the pm3 client\n", command_line);
+        PrintAndLogEx(NORMAL, "\n  how to execute different commands from terminal\n");
+        PrintAndLogEx(NORMAL, "      %s "SERIAL_PORT_H" -c \"hf mf chk 1* ?\"   -- execute cmd and quit client\n", command_line);
+        PrintAndLogEx(NORMAL, "      %s "SERIAL_PORT_H" -l hf_read            -- execute lua script " _YELLOW_("`hf_read`")"and quit client\n", command_line);
+        PrintAndLogEx(NORMAL, "      %s "SERIAL_PORT_H" mycmds.txt            -- execute each pm3 cmd in file and quit client\n", command_line);
     }
 }
 
@@ -271,7 +284,17 @@ int main(int argc, char *argv[]) {
 #endif
 
     if (argc < 2) {
+
+#if defined(_WIN32)
+        for (int m = strlen(argv[0]); m > 0; m--) {
+            if ( argv[0][m] == '\\' ) {
+                show_help(true, argv[0] + (++m) );
+                break;
+            }
+        }
+#else
         show_help(true, argv[0]);
+#endif
         return 1;
     }
 
@@ -380,13 +403,10 @@ int main(int argc, char *argv[]) {
         return 2;
     }
 
-#if defined(__linux__) || (__APPLE__)
-// ascii art doesn't work well on mingw :(
-
+    // ascii art
     bool stdinOnPipe = !isatty(STDIN_FILENO);
     if (!executeCommand && !script_cmds_file && !stdinOnPipe)
         showBanner();
-#endif
 
     // set global variables
     set_my_executable_path();

From 5c55664fc5d776d531002f9bf90d9461cfb36759 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 13 Apr 2019 21:54:04 +0200
Subject: [PATCH 1222/1938] use more static and fix [-Wmissing-prototypes]

---
 client/Makefile              |   1 -
 client/cmddata.c             |  22 +++---
 client/cmdhf14a.c            |   2 +-
 client/cmdhf14b.c            | 117 ++++++++++++++---------------
 client/cmdhf15.c             |   2 +-
 client/cmdhffelica.c         |   2 +-
 client/cmdhffido.c           |   6 +-
 client/cmdhficlass.c         |  12 +--
 client/cmdhfmf.c             |  21 ++++--
 client/cmdhfmfhard.c         |   2 +-
 client/cmdhfmfu.c            |  10 +--
 client/cmdhw.c               | 138 ++++++++++++++++++-----------------
 client/cmdhw.h               |  13 +---
 client/cmdlf.c               |   2 +-
 client/cmdlfem4x.c           |  33 +++++----
 client/cmdlft55xx.c          |  28 +++----
 client/emv/test/cda_test.c   |   1 +
 client/fido/cose.c           |   4 +-
 client/loclass/hash1_brute.c |   4 +-
 client/loclass/ikeys.c       |   2 +-
 client/mifare/ndef.c         |  14 ++--
 client/proxmark3.c           |   4 +-
 common/lfdemod.h             |   1 +
 23 files changed, 223 insertions(+), 218 deletions(-)

diff --git a/client/Makefile b/client/Makefile
index bcd443219..2f7467fab 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -137,7 +137,6 @@ CMDSRCS =	crapto1/crapto1.c \
 			loclass/cipher.c \
 			loclass/cipherutils.c \
 			loclass/ikeys.c \
-			loclass/hash1_brute.c \
 			loclass/elite_crack.c \
 			loclass/fileutils.c \
 			whereami.c \
diff --git a/client/cmddata.c b/client/cmddata.c
index c568315c9..d971d0fba 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -570,7 +570,7 @@ static int Cmdaskmandemod(const char *Cmd) {
 //by marshmellow
 //manchester decode
 //stricktly take 10 and 01 and convert to 0 and 1
-int Cmdmandecoderaw(const char *Cmd) {
+static int Cmdmandecoderaw(const char *Cmd) {
     size_t size = 0;
     int high = 0, low = 0;
     int i = 0, errCnt = 0, invert = 0, maxErr = 20;
@@ -628,7 +628,7 @@ int Cmdmandecoderaw(const char *Cmd) {
  * param invert invert output
  * param masxErr maximum tolerated errors
  */
-int CmdBiphaseDecodeRaw(const char *Cmd) {
+static int CmdBiphaseDecodeRaw(const char *Cmd) {
     size_t size = 0;
     int offset = 0, invert = 0, maxErr = 20, errCnt = 0;
     char cmdp = tolower(param_getchar(Cmd, 0));
@@ -811,7 +811,7 @@ int AutoCorrelate(const int *in, int *out, size_t len, int window, bool SaveGrph
     return retval;
 }
 
-int CmdAutoCorr(const char *Cmd) {
+static int CmdAutoCorr(const char *Cmd) {
 
     uint32_t window = 4000;
     uint8_t cmdp = 0;
@@ -846,7 +846,7 @@ int CmdAutoCorr(const char *Cmd) {
     return AutoCorrelate(GraphBuffer, GraphBuffer, GraphTraceLen, window, updateGrph, true);
 }
 
-int CmdBitsamples(const char *Cmd) {
+static int CmdBitsamples(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     int cnt = 0;
     uint8_t got[12288];
@@ -869,7 +869,7 @@ int CmdBitsamples(const char *Cmd) {
     return 0;
 }
 
-int CmdBuffClear(const char *Cmd) {
+static int CmdBuffClear(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_data_buffclear();
 
@@ -880,7 +880,7 @@ int CmdBuffClear(const char *Cmd) {
     return 0;
 }
 
-int CmdDec(const char *Cmd) {
+static int CmdDec(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     for (int i = 0; i < (GraphTraceLen / 2); ++i)
         GraphBuffer[i] = GraphBuffer[i * 2];
@@ -896,7 +896,7 @@ int CmdDec(const char *Cmd) {
  * @param Cmd
  * @return
  */
-int CmdUndec(const char *Cmd) {
+static int CmdUndec(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_data_undecimate();
 
@@ -921,7 +921,7 @@ int CmdUndec(const char *Cmd) {
 
 //by marshmellow
 //shift graph zero up or down based on input + or -
-int CmdGraphShiftZero(const char *Cmd) {
+static int CmdGraphShiftZero(const char *Cmd) {
     int shift = 0, shiftedVal;
     //set options from parameters entered with the command
     sscanf(Cmd, "%i", &shift);
@@ -1411,7 +1411,7 @@ static int CmdHexsamples(const char *Cmd) {
     return 0;
 }
 
-int CmdHide(const char *Cmd) {
+static int CmdHide(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     HideGraphWindow();
     return 0;
@@ -1432,13 +1432,13 @@ int CmdHpf(const char *Cmd) {
     return 0;
 }
 
-bool _headBit(BitstreamOut *stream) {
+static bool _headBit(BitstreamOut *stream) {
     int bytepos = stream->position >> 3; // divide by 8
     int bitpos = (stream->position++) & 7; // mask out 00000111
     return (*(stream->buffer + bytepos) >> (7 - bitpos)) & 1;
 }
 
-uint8_t getByte(uint8_t bits_per_sample, BitstreamOut *b) {
+static uint8_t getByte(uint8_t bits_per_sample, BitstreamOut *b) {
     uint8_t val = 0;
     for (int i = 0 ; i < bits_per_sample; i++)
         val |= (_headBit(b) << (7 - i));
diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 73de14f03..ab0c358ae 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -616,7 +616,7 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
     return 0;
 }
 
-int SelectCard14443_4(bool disconnect, iso14a_card_select_t *card) {
+static int SelectCard14443_4(bool disconnect, iso14a_card_select_t *card) {
     UsbCommand resp;
 
     frameLength = 0;
diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c
index 74cfe9a99..b1aa78e64 100644
--- a/client/cmdhf14b.c
+++ b/client/cmdhf14b.c
@@ -395,7 +395,7 @@ static void print_atqb_resp(uint8_t *data, uint8_t cid) {
 }
 
 // get SRx chip model (from UID) // from ST Microelectronics
-char *get_ST_Chip_Model(uint8_t data) {
+static char *get_ST_Chip_Model(uint8_t data) {
     static char model[20];
     char *retStr = model;
     memset(model, 0, sizeof(model));
@@ -430,51 +430,52 @@ char *get_ST_Chip_Model(uint8_t data) {
 }
 
 // REMAKE:
-int print_ST_Lock_info(uint8_t model) {
+/*
+static int print_ST_Lock_info(uint8_t model) {
 
-    // PrintAndLogEx(NORMAL, "Chip Write Protection Bits:");
-    // // now interpret the data
-    // switch (model){
-    // case 0x0: //fall through (SRIX4K special)
-    // case 0x3: //fall through (SRIx4K)
-    // case 0x7: //             (SRI4K)
-    // //only need data[3]
-    // blk1 = 9;
-    // PrintAndLogEx(NORMAL, "   raw: %s", sprint_bin(data+3, 1));
-    // PrintAndLogEx(NORMAL, " 07/08:%slocked", (data[3] & 1) ? " not " : " " );
-    // for (uint8_t i = 1; i<8; i++){
-    // PrintAndLogEx(NORMAL, "    %02u:%slocked", blk1, (data[3] & (1 << i)) ? " not " : " " );
-    // blk1++;
-    // }
-    // break;
-    // case 0x4: //fall through (SRIX512)
-    // case 0x6: //fall through (SRI512)
-    // case 0xC: //             (SRT512)
-    // //need data[2] and data[3]
-    // blk1 = 0;
-    // PrintAndLogEx(NORMAL, "   raw: %s", sprint_bin(data+2, 2));
-    // for (uint8_t b=2; b<4; b++){
-    // for (uint8_t i=0; i<8; i++){
-    // PrintAndLogEx(NORMAL, "    %02u:%slocked", blk1, (data[b] & (1 << i)) ? " not " : " " );
-    // blk1++;
-    // }
-    // }
-    // break;
-    // case 0x2: //             (SR176)
-    // //need data[2]
-    // blk1 = 0;
-    // PrintAndLogEx(NORMAL, "   raw: %s", sprint_bin(data+2, 1));
-    // for (uint8_t i = 0; i<8; i++){
-    // PrintAndLogEx(NORMAL, " %02u/%02u:%slocked", blk1, blk1+1, (data[2] & (1 << i)) ? " " : " not " );
-    // blk1+=2;
-    // }
-    // break;
-    // default:
-    // return rawClose();
-    // }
+    PrintAndLogEx(NORMAL, "Chip Write Protection Bits:");
+    // now interpret the data
+    switch (model){
+    case 0x0: //fall through (SRIX4K special)
+    case 0x3: //fall through (SRIx4K)
+    case 0x7: //             (SRI4K)
+    //only need data[3]
+    blk1 = 9;
+    PrintAndLogEx(NORMAL, "   raw: %s", sprint_bin(data+3, 1));
+    PrintAndLogEx(NORMAL, " 07/08:%slocked", (data[3] & 1) ? " not " : " " );
+    for (uint8_t i = 1; i<8; i++){
+    PrintAndLogEx(NORMAL, "    %02u:%slocked", blk1, (data[3] & (1 << i)) ? " not " : " " );
+    blk1++;
+    }
+    break;
+    case 0x4: //fall through (SRIX512)
+    case 0x6: //fall through (SRI512)
+    case 0xC: //             (SRT512)
+    //need data[2] and data[3]
+    blk1 = 0;
+    PrintAndLogEx(NORMAL, "   raw: %s", sprint_bin(data+2, 2));
+    for (uint8_t b=2; b<4; b++){
+    for (uint8_t i=0; i<8; i++){
+    PrintAndLogEx(NORMAL, "    %02u:%slocked", blk1, (data[b] & (1 << i)) ? " not " : " " );
+    blk1++;
+    }
+    }
+    break;
+    case 0x2: //             (SR176)
+    //need data[2]
+    blk1 = 0;
+    PrintAndLogEx(NORMAL, "   raw: %s", sprint_bin(data+2, 1));
+    for (uint8_t i = 0; i<8; i++){
+    PrintAndLogEx(NORMAL, " %02u/%02u:%slocked", blk1, blk1+1, (data[2] & (1 << i)) ? " " : " not " );
+    blk1+=2;
+    }
+    break;
+    default:
+    return rawClose();
+    }
     return 1;
 }
-
+*/
 // print UID info from SRx chips (ST Microelectronics)
 static void print_st_general_info(uint8_t *data, uint8_t len) {
     //uid = first 8 bytes in data
@@ -503,7 +504,7 @@ static void print_st_general_info(uint8_t *data, uint8_t len) {
 //a2 = ?  (resp 02 [6a d3])
 
 // 14b get and print Full Info (as much as we know)
-bool HF14B_Std_Info(bool verbose) {
+static bool HF14B_Std_Info(bool verbose) {
 
     bool isSuccess = false;
 
@@ -547,7 +548,7 @@ bool HF14B_Std_Info(bool verbose) {
 }
 
 // SRx get and print full info (needs more info...)
-bool HF14B_ST_Info(bool verbose) {
+static bool HF14B_ST_Info(bool verbose) {
 
     UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_SR | ISO14B_DISCONNECT, 0, 0}, {{0}}};
     clearCommandBuffer();
@@ -601,7 +602,7 @@ static int CmdHF14Binfo(const char *Cmd) {
     return infoHF14B(verbose);
 }
 
-bool HF14B_ST_Reader(bool verbose) {
+static bool HF14B_ST_Reader(bool verbose) {
 
     bool isSuccess = false;
 
@@ -641,7 +642,7 @@ bool HF14B_ST_Reader(bool verbose) {
     return isSuccess;
 }
 
-bool HF14B_Std_Reader(bool verbose) {
+static bool HF14B_Std_Reader(bool verbose) {
 
     bool isSuccess = false;
 
@@ -683,7 +684,7 @@ bool HF14B_Std_Reader(bool verbose) {
 }
 
 // test for other 14b type tags (mimic another reader - don't have tags to identify)
-bool HF14B_Other_Reader() {
+static bool HF14B_Other_Reader() {
 
     // uint8_t data[] = {0x00, 0x0b, 0x3f, 0x80};
     // uint8_t datalen = 4;
@@ -989,14 +990,13 @@ static int CmdHF14BDump(const char *Cmd) {
 out:
     return switch_off_field_14b();
 }
+/*
 
-uint32_t srix4kEncode(uint32_t value) {
-    /*
+static uint32_t srix4kEncode(uint32_t value) {
     // vv = value
     // pp = position
     //                vv vv vv pp
-    4 bytes         : 00 1A 20 01
-    */
+    // 4 bytes      : 00 1A 20 01
     // only the lower crumbs.
     uint8_t block = (value & 0xFF);
     uint8_t i = 0;
@@ -1046,7 +1046,8 @@ uint32_t srix4kEncode(uint32_t value) {
     PrintAndLogEx(NORMAL, "ICE encoded | %08X -> %08X", value, encvalue);
     return encvalue;
 }
-uint32_t srix4kDecode(uint32_t value) {
+
+static uint32_t srix4kDecode(uint32_t value) {
     switch (value) {
         case 0xC04F42C5:
             return 0x003139;
@@ -1057,13 +1058,14 @@ uint32_t srix4kDecode(uint32_t value) {
     }
     return 0;
 }
-uint32_t srix4kDecodeCounter(uint32_t num) {
+
+static uint32_t srix4kDecodeCounter(uint32_t num) {
     uint32_t value = ~num;
     ++value;
     return value;
 }
 
-uint32_t srix4kGetMagicbytes(uint64_t uid, uint32_t block6, uint32_t block18, uint32_t block19) {
+static uint32_t srix4kGetMagicbytes(uint64_t uid, uint32_t block6, uint32_t block18, uint32_t block19) {
 #define MASK 0xFFFFFFFF;
     uint32_t uid32 = uid & MASK;
     uint32_t counter = srix4kDecodeCounter(block6);
@@ -1075,7 +1077,8 @@ uint32_t srix4kGetMagicbytes(uint64_t uid, uint32_t block6, uint32_t block18, ui
     PrintAndLogEx(SUCCESS, "Magic bytes | %08X", result);
     return result;
 }
-int srix4kValid(const char *Cmd) {
+
+static int srix4kValid(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
 
     uint64_t uid = 0xD00202501A4532F9;
@@ -1093,7 +1096,7 @@ int srix4kValid(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "BLOCK 21 |  %08X -> %08X (no XOR)", block21, magic ^ block21);
     return 0;
 }
-
+*/
 static command_t CommandTable[] = {
     {"help",        CmdHelp,        1, "This help"},
     {"dump",        CmdHF14BDump,   0, "Read all memory pages of an ISO14443-B tag, save to file"},
diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index e28c43984..496ea3073 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -196,7 +196,7 @@ const productName uidmapping[] = {
 // fast method to just read the UID of a tag (collission detection not supported)
 //  *buf should be large enough to fit the 64bit uid
 // returns 1 if suceeded
-int getUID(uint8_t *buf) {
+static int getUID(uint8_t *buf) {
 
     UsbCommand resp;
     UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}}; // len,speed,recv?
diff --git a/client/cmdhffelica.c b/client/cmdhffelica.c
index 525ee7c17..ae095116a 100644
--- a/client/cmdhffelica.c
+++ b/client/cmdhffelica.c
@@ -198,7 +198,7 @@ static void printSep() {
     PrintAndLogEx(NORMAL, "------------------------------------------------------------------------------------");
 }
 
-uint16_t PrintFliteBlock(uint16_t tracepos, uint8_t *trace, uint16_t tracelen) {
+static uint16_t PrintFliteBlock(uint16_t tracepos, uint8_t *trace, uint16_t tracelen) {
     if (tracepos + 19 >= tracelen)
         return tracelen;
 
diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index 47e3b6778..c2f02ef0e 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -124,7 +124,7 @@ static int CmdHFFidoInfo(const char *cmd) {
     return 0;
 }
 
-json_t *OpenJson(int paramnum, char *fname, void *argtable[], bool *err) {
+static json_t *OpenJson(int paramnum, char *fname, void *argtable[], bool *err) {
     json_t *root = NULL;
     json_error_t error;
     *err = false;
@@ -615,13 +615,13 @@ static int CmdHFFidoAuthenticate(const char *cmd) {
     return 0;
 };
 
-void CheckSlash(char *fileName) {
+static void CheckSlash(char *fileName) {
     if ((fileName[strlen(fileName) - 1] != '/') &&
             (fileName[strlen(fileName) - 1] != '\\'))
         strcat(fileName, "/");
 }
 
-int GetExistsFileNameJson(const char *prefixDir, const char *reqestedFileName, char *fileName) {
+static int GetExistsFileNameJson(const char *prefixDir, const char *reqestedFileName, char *fileName) {
     fileName[0] = 0x00;
     strcpy(fileName, get_my_executable_directory());
     CheckSlash(fileName);
diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index 49c74ab6b..4696ed4c6 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -262,14 +262,15 @@ static int usage_hf_iclass_permutekey(void) {
     return 0;
 }
 
-int xorbits_8(uint8_t val) {
+/*
+static int xorbits_8(uint8_t val) {
     uint8_t res = val ^ (val >> 1); //1st pass
     res = res ^ (res >> 1);         // 2nd pass
     res = res ^ (res >> 2);         // 3rd pass
     res = res ^ (res >> 4);         // 4th pass
     return res & 1;
 }
-
+*/
 static int CmdHFiClassList(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     //PrintAndLogEx(NORMAL, "Deprecated command, use 'hf list iclass' instead");
@@ -537,14 +538,15 @@ static int CmdHFiClassReader_Replay(const char *Cmd) {
     return 0;
 }
 
-int iclassEmlSetMem(uint8_t *data, int blockNum, int blocksCount) {
+/*
+static int iclassEmlSetMem(uint8_t *data, int blockNum, int blocksCount) {
     UsbCommand c = {CMD_MIFARE_EML_MEMSET, {blockNum, blocksCount, 0}, {{0}}};
     memcpy(c.d.asBytes, data, blocksCount * 16);
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
 }
-
+*/
 static int CmdHFiClassELoad(const char *Cmd) {
 
     char ctmp = tolower(param_getchar(Cmd, 0));
@@ -757,7 +759,7 @@ static int CmdHFiClassEncryptBlk(const char *Cmd) {
     return 1;
 }
 
-void Calc_wb_mac(uint8_t blockno, uint8_t *data, uint8_t *div_key, uint8_t MAC[4]) {
+static void Calc_wb_mac(uint8_t blockno, uint8_t *data, uint8_t *div_key, uint8_t MAC[4]) {
     uint8_t wb[9];
     wb[0] = blockno;
     memcpy(wb + 1, data, 8);
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 542f623cc..67e56e8e2 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -410,7 +410,7 @@ static int usage_hf14_nack(void) {
     return 0;
 }
 
-int GetHFMF14AUID(uint8_t *uid, int *uidlen) {
+static int GetHFMF14AUID(uint8_t *uid, int *uidlen) {
     UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
@@ -428,7 +428,7 @@ int GetHFMF14AUID(uint8_t *uid, int *uidlen) {
     return 1;
 }
 
-char *GenerateFilename(const char *prefix, const char *suffix) {
+static char *GenerateFilename(const char *prefix, const char *suffix) {
     uint8_t uid[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
     int uidlen = 0;
     char *fptr = calloc(sizeof(char) * (strlen(prefix) + strlen(suffix)) + sizeof(uid) * 2 + 1,  sizeof(uint8_t));
@@ -674,7 +674,7 @@ static int CmdHF14AMfRdSc(const char *Cmd) {
     return 0;
 }
 
-uint16_t NumOfBlocks(char card) {
+static uint16_t NumOfBlocks(char card) {
     switch (card) {
         case '0' :
             return MIFARE_MINI_MAXBLOCK;
@@ -688,7 +688,8 @@ uint16_t NumOfBlocks(char card) {
             return MIFARE_1K_MAXBLOCK;
     }
 }
-uint8_t NumOfSectors(char card) {
+
+static uint8_t NumOfSectors(char card) {
     switch (card) {
         case '0' :
             return MIFARE_MINI_MAXSECTOR;
@@ -703,7 +704,7 @@ uint8_t NumOfSectors(char card) {
     }
 }
 
-uint8_t FirstBlockOfSector(uint8_t sectorNo) {
+static uint8_t FirstBlockOfSector(uint8_t sectorNo) {
     if (sectorNo < 32) {
         return sectorNo * 4;
     } else {
@@ -711,7 +712,7 @@ uint8_t FirstBlockOfSector(uint8_t sectorNo) {
     }
 }
 
-uint8_t NumBlocksPerSector(uint8_t sectorNo) {
+static uint8_t NumBlocksPerSector(uint8_t sectorNo) {
     if (sectorNo < 32) {
         return 4;
     } else {
@@ -1512,12 +1513,15 @@ static int CmdHF14AMfNestedHard(const char *Cmd) {
     return 0;
 }
 
-int randInRange(int min, int max) {
+/*
+static int randInRange(int min, int max) {
     return min + (int)(rand() / (double)(RAND_MAX) * (max - min + 1));
 }
+*/
 
 //Fisher–Yates shuffle
-void shuffle(uint8_t *array, uint16_t len) {
+/*
+static void shuffle(uint8_t *array, uint16_t len) {
     uint8_t tmp[6];
     uint16_t x;
     time_t t;
@@ -1530,6 +1534,7 @@ void shuffle(uint8_t *array, uint16_t len) {
         memcpy(array + len, tmp, 6);
     }
 }
+*/
 
 static int CmdHF14AMfChk_fast(const char *Cmd) {
 
diff --git a/client/cmdhfmfhard.c b/client/cmdhfmfhard.c
index 05cc87748..faca31419 100644
--- a/client/cmdhfmfhard.c
+++ b/client/cmdhfmfhard.c
@@ -1091,7 +1091,7 @@ static int read_nonce_file(char *filename) {
 }
 
 
-noncelistentry_t *SearchFor2ndByte(uint8_t b1, uint8_t b2) {
+static noncelistentry_t *SearchFor2ndByte(uint8_t b1, uint8_t b2) {
     noncelistentry_t *p = nonces[b1].first;
     while (p != NULL) {
         if ((p->nonce_enc >> 16 & 0xff) == b2) {
diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index 948b2e5f1..38b01bd71 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -260,7 +260,7 @@ const uint32_t c_D[] = {
     0x5728B869, 0x30726D5A
 };
 
-void transform_D(uint8_t *ru) {
+static void transform_D(uint8_t *ru) {
     //Transform
     uint8_t i;
     uint8_t p = 0;
@@ -315,7 +315,7 @@ uint32_t ul_ev1_pwdgenA(uint8_t *uid) {
 }
 
 // Certain pwd generation algo nickname B. (very simple)
-uint32_t ul_ev1_pwdgenB(uint8_t *uid) {
+static uint32_t ul_ev1_pwdgenB(uint8_t *uid) {
 
     uint8_t pwd[] = {0x00, 0x00, 0x00, 0x00};
 
@@ -394,7 +394,7 @@ uint16_t ul_ev1_packgenD(uint8_t *uid) {
     return BSWAP_16(p & 0xFFFF);
 }
 
-int ul_ev1_pwdgen_selftest() {
+static int ul_ev1_pwdgen_selftest() {
 
     uint8_t uid1[] = {0x04, 0x11, 0x12, 0x11, 0x12, 0x11, 0x10};
     uint32_t pwd1 = ul_ev1_pwdgenA(uid1);
@@ -416,7 +416,7 @@ int ul_ev1_pwdgen_selftest() {
 
 //------------------------------------
 // get version nxp product type
-char *getProductTypeStr(uint8_t id) {
+static char *getProductTypeStr(uint8_t id) {
 
     static char buf[20];
     char *retStr = buf;
@@ -440,7 +440,7 @@ char *getProductTypeStr(uint8_t id) {
   the LSBit is set to '0' if the size is exactly 2^n
   and set to '1' if the storage size is between 2^n and 2^(n+1).
 */
-char *getUlev1CardSizeStr(uint8_t fsize) {
+static char *getUlev1CardSizeStr(uint8_t fsize) {
 
     static char buf[40];
     char *retStr = buf;
diff --git a/client/cmdhw.c b/client/cmdhw.c
index e5d050eb0..d1ba4274e 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -307,7 +307,7 @@ static void lookupChipID(uint32_t iChipID, uint32_t mem_used) {
     PrintAndLogEx(NORMAL, "  --= Nonvolatile Program Memory Type: %s", asBuff);
 }
 
-int CmdDetectReader(const char *Cmd) {
+static int CmdDetectReader(const char *Cmd) {
     UsbCommand c = {CMD_LISTEN_READER_FIELD, {0, 0, 0}, {{0}}};
     // 'l' means LF - 125/134 kHz
     if (*Cmd == 'l') {
@@ -324,7 +324,7 @@ int CmdDetectReader(const char *Cmd) {
 }
 
 // ## FPGA Control
-int CmdFPGAOff(const char *Cmd) {
+static int CmdFPGAOff(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     UsbCommand c = {CMD_FPGA_MAJOR_MODE_OFF, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
@@ -333,7 +333,7 @@ int CmdFPGAOff(const char *Cmd) {
 }
 
 #ifdef WITH_LCD
-int CmdLCD(const char *Cmd) {
+static int CmdLCD(const char *Cmd) {
     int i, j;
 
     UsbCommand c = {CMD_LCD, {0, 0, 0}, {{0}}};
@@ -346,7 +346,7 @@ int CmdLCD(const char *Cmd) {
     return 0;
 }
 
-int CmdLCDReset(const char *Cmd) {
+static int CmdLCDReset(const char *Cmd) {
     UsbCommand c = {CMD_LCD_RESET, {strtol(Cmd, NULL, 0), 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
@@ -354,14 +354,14 @@ int CmdLCDReset(const char *Cmd) {
 }
 #endif
 
-int CmdReadmem(const char *Cmd) {
+static int CmdReadmem(const char *Cmd) {
     UsbCommand c = {CMD_READ_MEM, {strtol(Cmd, NULL, 0), 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
 }
 
-int CmdReset(const char *Cmd) {
+static int CmdReset(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     UsbCommand c = {CMD_HARDWARE_RESET, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
@@ -373,7 +373,7 @@ int CmdReset(const char *Cmd) {
  * Sets the divisor for LF frequency clock: lets the user choose any LF frequency below
  * 600kHz.
  */
-int CmdSetDivisor(const char *Cmd) {
+static int CmdSetDivisor(const char *Cmd) {
     UsbCommand c = {CMD_SET_LF_DIVISOR, {strtol(Cmd, NULL, 0), 0, 0}, {{0}}};
 
     if (c.arg[0] < 19 || c.arg[0] > 255) {
@@ -387,7 +387,7 @@ int CmdSetDivisor(const char *Cmd) {
     return 0;
 }
 
-int CmdSetMux(const char *Cmd) {
+static int CmdSetMux(const char *Cmd) {
 
     if (strlen(Cmd) < 5) {
         PrintAndLogEx(NORMAL, "expected:  lopkd | loraw | hipkd | hiraw");
@@ -405,16 +405,73 @@ int CmdSetMux(const char *Cmd) {
     return 0;
 }
 
-int CmdTune(const char *Cmd) {
+static int CmdTune(const char *Cmd) {
     return CmdTuneSamples(Cmd);
 }
 
-int CmdVersion(const char *Cmd) {
+static int CmdVersion(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
+    pm3_version(true);
+    return 0;
+}
 
-    bool silent = (Cmd[0] == 's' || Cmd[0] ==  'S');
-    if (silent)
-        return 0;
+static int CmdStatus(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
+    clearCommandBuffer();
+    UsbCommand c = {CMD_STATUS, {0, 0, 0}, {{0}}};
+    SendCommand(&c);
+    if (!WaitForResponseTimeout(CMD_ACK, &c, 1900))
+        PrintAndLogEx(NORMAL, "Status command failed. USB Speed Test timed out");
+    return 0;
+}
 
+static int CmdPing(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
+    clearCommandBuffer();
+    UsbCommand resp;
+    UsbCommand c = {CMD_PING, {0, 0, 0}, {{0}}};
+    SendCommand(&c);
+    if (WaitForResponseTimeout(CMD_ACK, &resp, 1000))
+        PrintAndLogEx(NORMAL, "Ping successful");
+    else
+        PrintAndLogEx(NORMAL, "Ping failed");
+    return 0;
+}
+
+static command_t CommandTable[] = {
+    {"help",          CmdHelp,        1, "This help"},
+    {"detectreader",  CmdDetectReader, 0, "['l'|'h'] -- Detect external reader field (option 'l' or 'h' to limit to LF or HF)"},
+    {"fpgaoff",       CmdFPGAOff,     0, "Set FPGA off"},
+#ifdef WITH_LCD
+    {"lcd",           CmdLCD,         0, "<HEX command> <count> -- Send command/data to LCD"},
+    {"lcdreset",      CmdLCDReset,    0, "Hardware reset LCD"},
+#endif
+    {"readmem",       CmdReadmem,     0, "[address] -- Read memory at decimal address from flash"},
+    {"reset",         CmdReset,       0, "Reset the Proxmark3"},
+    {"setlfdivisor",  CmdSetDivisor,  0, "<19 - 255> -- Drive LF antenna at 12Mhz/(divisor+1)"},
+    {"setmux",        CmdSetMux,      0, "<loraw|hiraw|lopkd|hipkd> -- Set the ADC mux to a specific value"},
+    {"tune",          CmdTune,        0, "Measure antenna tuning"},
+    {"version",       CmdVersion,     0, "Show version information about the connected Proxmark"},
+    {"status",        CmdStatus,      0, "Show runtime status information about the connected Proxmark"},
+    {"ping",          CmdPing,        0, "Test if the pm3 is responsive"},
+    {NULL, NULL, 0, NULL}
+};
+
+static int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
+    CmdsHelp(CommandTable);
+    return 0;
+}
+
+int CmdHW(const char *Cmd) {
+    clearCommandBuffer();
+    CmdsParse(CommandTable, Cmd);
+    return 0;
+}
+
+void pm3_version(bool verbose) {
+    if (!verbose)
+        return;
     UsbCommand c = {CMD_VERSION, {0, 0, 0}, {{0}}};
     UsbCommand resp;
     clearCommandBuffer();
@@ -449,59 +506,4 @@ int CmdVersion(const char *Cmd) {
         lookupChipID(resp.arg[0], resp.arg[1]);
     }
     PrintAndLogEx(NORMAL, "\n");
-    return 0;
-}
-
-int CmdStatus(const char *Cmd) {
-    (void)Cmd; // Cmd is not used so far
-    clearCommandBuffer();
-    UsbCommand c = {CMD_STATUS, {0, 0, 0}, {{0}}};
-    SendCommand(&c);
-    if (!WaitForResponseTimeout(CMD_ACK, &c, 1900))
-        PrintAndLogEx(NORMAL, "Status command failed. USB Speed Test timed out");
-    return 0;
-}
-
-int CmdPing(const char *Cmd) {
-    (void)Cmd; // Cmd is not used so far
-    clearCommandBuffer();
-    UsbCommand resp;
-    UsbCommand c = {CMD_PING, {0, 0, 0}, {{0}}};
-    SendCommand(&c);
-    if (WaitForResponseTimeout(CMD_ACK, &resp, 1000))
-        PrintAndLogEx(NORMAL, "Ping successful");
-    else
-        PrintAndLogEx(NORMAL, "Ping failed");
-    return 0;
-}
-
-static command_t CommandTable[] = {
-    {"help",          CmdHelp,        1, "This help"},
-    {"detectreader",  CmdDetectReader, 0, "['l'|'h'] -- Detect external reader field (option 'l' or 'h' to limit to LF or HF)"},
-    {"fpgaoff",       CmdFPGAOff,     0, "Set FPGA off"},
-#ifdef WITH_LCD
-    {"lcd",           CmdLCD,         0, "<HEX command> <count> -- Send command/data to LCD"},
-    {"lcdreset",      CmdLCDReset,    0, "Hardware reset LCD"},
-#endif
-    {"readmem",       CmdReadmem,     0, "[address] -- Read memory at decimal address from flash"},
-    {"reset",         CmdReset,       0, "Reset the Proxmark3"},
-    {"setlfdivisor",  CmdSetDivisor,  0, "<19 - 255> -- Drive LF antenna at 12Mhz/(divisor+1)"},
-    {"setmux",        CmdSetMux,      0, "<loraw|hiraw|lopkd|hipkd> -- Set the ADC mux to a specific value"},
-    {"tune",          CmdTune,        0, "Measure antenna tuning"},
-    {"version",       CmdVersion,     0, "Show version information about the connected Proxmark"},
-    {"status",        CmdStatus,      0, "Show runtime status information about the connected Proxmark"},
-    {"ping",          CmdPing,        0, "Test if the pm3 is responsive"},
-    {NULL, NULL, 0, NULL}
-};
-
-int CmdHW(const char *Cmd) {
-    clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
-}
-
-int CmdHelp(const char *Cmd) {
-    (void)Cmd; // Cmd is not used so far
-    CmdsHelp(CommandTable);
-    return 0;
 }
diff --git a/client/cmdhw.h b/client/cmdhw.h
index 85ccea647..a1a3a4b8f 100644
--- a/client/cmdhw.h
+++ b/client/cmdhw.h
@@ -13,15 +13,6 @@
 
 int CmdHW(const char *Cmd);
 
-int CmdDetectReader(const char *Cmd);
-int CmdFPGAOff(const char *Cmd);
-int CmdLCD(const char *Cmd);
-int CmdLCDReset(const char *Cmd);
-int CmdReadmem(const char *Cmd);
-int CmdReset(const char *Cmd);
-int CmdSetDivisor(const char *Cmd);
-int CmdSetMux(const char *Cmd);
-int CmdTune(const char *Cmd);
-int CmdVersion(const char *Cmd);
-int CmdPing(const char *Cmd);
+void pm3_version(bool verbose);
+
 #endif
diff --git a/client/cmdlf.c b/client/cmdlf.c
index f0a75cd58..9dfa16640 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -821,7 +821,7 @@ int CmdVchDemod(const char *Cmd) {
 }
 
 //by marshmellow
-bool CheckChipType(bool getDeviceData) {
+static bool CheckChipType(bool getDeviceData) {
 
     bool retval = false;
 
diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 95ef6ca82..5d22cb8ad 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -654,7 +654,7 @@ static int CmdEM410xWrite(const char *Cmd) {
 }
 
 //**************** Start of EM4x50 Code ************************
-bool EM_EndParityTest(uint8_t *bs, size_t size, uint8_t rows, uint8_t cols, uint8_t pType) {
+static bool EM_EndParityTest(uint8_t *bs, size_t size, uint8_t rows, uint8_t cols, uint8_t pType) {
     if (rows * cols > size) return false;
     uint8_t colP = 0;
     //assume last col is a parity and do not test
@@ -667,7 +667,7 @@ bool EM_EndParityTest(uint8_t *bs, size_t size, uint8_t rows, uint8_t cols, uint
     return true;
 }
 
-bool EM_ByteParityTest(uint8_t *bs, size_t size, uint8_t rows, uint8_t cols, uint8_t pType) {
+static bool EM_ByteParityTest(uint8_t *bs, size_t size, uint8_t rows, uint8_t cols, uint8_t pType) {
     if (rows * cols > size) return false;
 
     uint8_t rowP = 0;
@@ -691,7 +691,7 @@ bool EM_ByteParityTest(uint8_t *bs, size_t size, uint8_t rows, uint8_t cols, uin
 //c012345678| 0
 //            |- must be zero
 
-bool EMwordparitytest(uint8_t *bits) {
+static bool EMwordparitytest(uint8_t *bits) {
 
     // last row/col parity must be 0
     if (bits[44] != 0) return false;
@@ -720,7 +720,7 @@ bool EMwordparitytest(uint8_t *bits) {
 
 //////////////// 4050 / 4450 commands
 
-uint32_t OutputEM4x50_Block(uint8_t *BitStream, size_t size, bool verbose, bool pTest) {
+static uint32_t OutputEM4x50_Block(uint8_t *BitStream, size_t size, bool verbose, bool pTest) {
     if (size < 45) return 0;
 
     uint32_t code = bytebits_to_byte(BitStream, 8);
@@ -976,7 +976,7 @@ static int CmdEM4x50Dump(const char *Cmd) {
 
 #define EM_PREAMBLE_LEN 6
 // download samples from device and copy to Graphbuffer
-bool downloadSamplesEM() {
+static bool downloadSamplesEM() {
 
     // 8 bit preamble + 32 bit word response (max clock (128) * 40bits = 5120 samples)
     uint8_t got[6000];
@@ -997,7 +997,7 @@ bool downloadSamplesEM() {
 }
 
 // em_demod
-bool doPreambleSearch(size_t *startIdx) {
+static bool doPreambleSearch(size_t *startIdx) {
 
     // sanity check
     if (DemodBufferLen < EM_PREAMBLE_LEN) {
@@ -1018,7 +1018,7 @@ bool doPreambleSearch(size_t *startIdx) {
     return true;
 }
 
-bool detectFSK() {
+static bool detectFSK() {
     // detect fsk clock
     if (!GetFskClock("", false)) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - EM: FSK clock failed");
@@ -1033,7 +1033,7 @@ bool detectFSK() {
     return true;
 }
 // PSK clocks should be easy to detect ( but difficult to demod a non-repeating pattern... )
-bool detectPSK() {
+static bool detectPSK() {
     int ans = GetPskClock("", false);
     if (ans <= 0) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - EM: PSK clock failed");
@@ -1057,7 +1057,7 @@ bool detectPSK() {
     return true;
 }
 // try manchester - NOTE: ST only applies to T55x7 tags.
-bool detectASK_MAN() {
+static bool detectASK_MAN() {
     bool stcheck = false;
     if (!ASKDemod_ext("0 0 0", false, false, 1, &stcheck)) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - EM: ASK/Manchester Demod failed");
@@ -1065,7 +1065,8 @@ bool detectASK_MAN() {
     }
     return true;
 }
-bool detectASK_BI() {
+
+static bool detectASK_BI() {
     int ans = ASKbiphaseDemod("0 0 1", false);
     if (!ans) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - EM: ASK/biphase normal demod failed");
@@ -1080,7 +1081,7 @@ bool detectASK_BI() {
 }
 
 // param: idx - start index in demoded data.
-bool setDemodBufferEM(uint32_t *word, size_t idx) {
+static bool setDemodBufferEM(uint32_t *word, size_t idx) {
 
     //test for even parity bits.
     uint8_t parity[45] = {0};
@@ -1103,7 +1104,7 @@ bool setDemodBufferEM(uint32_t *word, size_t idx) {
 // 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...
-bool demodEM4x05resp(uint32_t *word) {
+static bool demodEM4x05resp(uint32_t *word) {
     size_t idx = 0;
     *word = 0;
     if (detectASK_MAN() && doPreambleSearch(&idx))
@@ -1127,7 +1128,7 @@ bool demodEM4x05resp(uint32_t *word) {
 }
 
 //////////////// 4205 / 4305 commands
-int EM4x05ReadWord_ext(uint8_t addr, uint32_t pwd, bool usePwd, uint32_t *word) {
+static int EM4x05ReadWord_ext(uint8_t addr, uint32_t pwd, bool usePwd, uint32_t *word) {
     UsbCommand c = {CMD_EM4X_READ_WORD, {addr, pwd, usePwd}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
@@ -1253,7 +1254,7 @@ static int CmdEM4x05Write(const char *Cmd) {
     return isOk;
 }
 
-void printEM4x05config(uint32_t wordData) {
+static void printEM4x05config(uint32_t wordData) {
     uint16_t datarate = (((wordData & 0x3F) + 1) * 2);
     uint8_t encoder = ((wordData >> 6) & 0xF);
     char enc[14];
@@ -1357,7 +1358,7 @@ void printEM4x05config(uint32_t wordData) {
     PrintAndLogEx(NORMAL, "    Pigeon:   %u | Pigeon Mode is %s\n", pigeon, pigeon ? "Enabled" : "Disabled");
 }
 
-void printEM4x05info(uint32_t block0, uint32_t serial) {
+static void printEM4x05info(uint32_t block0, uint32_t serial) {
 
     uint8_t chipType = (block0 >> 1) & 0xF;
     uint8_t cap = (block0 >> 5) & 3;
@@ -1405,7 +1406,7 @@ void printEM4x05info(uint32_t block0, uint32_t serial) {
         PrintAndLogEx(NORMAL, "\n  Serial #: %08X\n", serial);
 }
 
-void printEM4x05ProtectionBits(uint32_t word) {
+static void printEM4x05ProtectionBits(uint32_t word) {
     for (uint8_t i = 0; i < 15; i++) {
         PrintAndLogEx(NORMAL, "      Word:  %02u | %s", i, (((1 << i) & word) || i < 2) ? "Is Write Locked" : "Is Not Write Locked");
         if (i == 14)
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index a5a262cce..cbfd71dad 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -496,7 +496,7 @@ bool DecodeT55xxBlock(void) {
     return (bool) ans;
 }
 
-bool DecodeT5555TraceBlock(void) {
+static bool DecodeT5555TraceBlock(void) {
     DemodBufferLen = 0x00;
 
     // According to datasheet. Always: RF/64, not inverted, Manchester
@@ -792,7 +792,7 @@ void printT55xxBlock(uint8_t blockNum) {
     PrintAndLogEx(NORMAL, " %02d | %08X | %s | %s", blockNum, blockData, sprint_bin(DemodBuffer + config.offset, 32), sprint_ascii(bytes, 4));
 }
 
-bool testModulation(uint8_t mode, uint8_t modread) {
+static bool testModulation(uint8_t mode, uint8_t modread) {
     switch (mode) {
         case DEMOD_FSK:
             if (modread >= DEMOD_FSK1 && modread <= DEMOD_FSK2a) return true;
@@ -824,7 +824,7 @@ bool testModulation(uint8_t mode, uint8_t modread) {
     return false;
 }
 
-bool testQ5Modulation(uint8_t mode, uint8_t modread) {
+static bool testQ5Modulation(uint8_t mode, uint8_t modread) {
     switch (mode) {
         case DEMOD_FSK:
             if (modread >= 4 && modread <= 5) return true;
@@ -853,7 +853,7 @@ bool testQ5Modulation(uint8_t mode, uint8_t modread) {
     return false;
 }
 
-int convertQ5bitRate(uint8_t bitRateRead) {
+static int convertQ5bitRate(uint8_t bitRateRead) {
     uint8_t expected[] = {8, 16, 32, 40, 50, 64, 100, 128};
     for (int i = 0; i < 8; i++)
         if (expected[i] == bitRateRead)
@@ -862,7 +862,7 @@ int convertQ5bitRate(uint8_t bitRateRead) {
     return -1;
 }
 
-bool testQ5(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk) {
+static bool testQ5(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk) {
 
     if (DemodBufferLen < 64) return false;
 
@@ -907,7 +907,7 @@ bool testQ5(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk) {
     return false;
 }
 
-bool testBitRate(uint8_t readRate, uint8_t clk) {
+static bool testBitRate(uint8_t readRate, uint8_t clk) {
     uint8_t expected[] = {8, 16, 32, 40, 50, 64, 100, 128};
     if (expected[readRate] == clk)
         return true;
@@ -1746,14 +1746,13 @@ char *GetSelectedModulationStr(uint8_t id) {
     return buf;
 }
 
-void t55x7_create_config_block(int tagtype) {
+/*
+static void t55x7_create_config_block(int tagtype) {
 
-    /*
-     T55X7_DEFAULT_CONFIG_BLOCK, T55X7_RAW_CONFIG_BLOCK
-     T55X7_EM_UNIQUE_CONFIG_BLOCK, T55X7_FDXB_CONFIG_BLOCK,
-     T55X7_FDXB_CONFIG_BLOCK, T55X7_HID_26_CONFIG_BLOCK, T55X7_INDALA_64_CONFIG_BLOCK, T55X7_INDALA_224_CONFIG_BLOCK
-     T55X7_GUARDPROXII_CONFIG_BLOCK, T55X7_VIKING_CONFIG_BLOCK, T55X7_NORALYS_CONFIG_BLOCK, T55X7_IOPROX_CONFIG_BLOCK
-    */
+    // T55X7_DEFAULT_CONFIG_BLOCK, T55X7_RAW_CONFIG_BLOCK
+    // T55X7_EM_UNIQUE_CONFIG_BLOCK, T55X7_FDXB_CONFIG_BLOCK,
+    // T55X7_FDXB_CONFIG_BLOCK, T55X7_HID_26_CONFIG_BLOCK, T55X7_INDALA_64_CONFIG_BLOCK, T55X7_INDALA_224_CONFIG_BLOCK
+    // T55X7_GUARDPROXII_CONFIG_BLOCK, T55X7_VIKING_CONFIG_BLOCK, T55X7_NORALYS_CONFIG_BLOCK, T55X7_IOPROX_CONFIG_BLOCK
     static char buf[60];
     char *retStr = buf;
 
@@ -1772,6 +1771,7 @@ void t55x7_create_config_block(int tagtype) {
     }
     PrintAndLogEx(NORMAL, buf);
 }
+*/
 
 static int CmdResetRead(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
@@ -1822,7 +1822,7 @@ static int CmdT55xxWipe(const char *Cmd) {
     return 0;
 }
 
-bool IsCancelled(void) {
+static bool IsCancelled(void) {
     if (ukbhit()) {
         int gc = getchar();
         (void)gc;
diff --git a/client/emv/test/cda_test.c b/client/emv/test/cda_test.c
index 9627ba972..38f756073 100644
--- a/client/emv/test/cda_test.c
+++ b/client/emv/test/cda_test.c
@@ -26,6 +26,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include "cda_test.h"
 
 struct emv_pk c_mchip_05 = {
     .rid = { 0xa0, 0x00, 0x00, 0x00, 0x04, },
diff --git a/client/fido/cose.c b/client/fido/cose.c
index 3201d6615..505d8e2d0 100644
--- a/client/fido/cose.c
+++ b/client/fido/cose.c
@@ -63,7 +63,7 @@ COSEValueTypeNameDesc_t COSECurvesDesc[] = {
     {7, "OKP", "Ed448",    "Ed448 for use w/ EdDSA only"},
 };
 
-COSEValueTypeNameDesc_t *GetCOSECurveElm(int id) {
+static COSEValueTypeNameDesc_t *GetCOSECurveElm(int id) {
     for (int i = 0; i < ARRAYLEN(COSECurvesDesc); i++)
         if (COSECurvesDesc[i].Value == id)
             return &COSECurvesDesc[i];
@@ -135,7 +135,7 @@ COSEValueNameDesc_t COSEAlg[] = {
     {33,        "AES-CCM-64-128-256",       "AES-CCM mode 256-bit key, 128-bit tag, 7-byte nonce"}
 };
 
-COSEValueNameDesc_t *GetCOSEAlgElm(int id) {
+static COSEValueNameDesc_t *GetCOSEAlgElm(int id) {
     for (int i = 0; i < ARRAYLEN(COSEAlg); i++)
         if (COSEAlg[i].Value == id)
             return &COSEAlg[i];
diff --git a/client/loclass/hash1_brute.c b/client/loclass/hash1_brute.c
index fb08da756..29430a2a6 100644
--- a/client/loclass/hash1_brute.c
+++ b/client/loclass/hash1_brute.c
@@ -7,7 +7,7 @@
 #include <ctype.h>
 #include "elite_crack.h"
 
-/*
+
 static void calc_score(uint8_t *csn, uint8_t *k) {
     uint8_t score = 0 ;
     uint8_t i;
@@ -82,4 +82,4 @@ static void brute_hash1(void) {
                 }
     }
 }
-*/
+
diff --git a/client/loclass/ikeys.c b/client/loclass/ikeys.c
index e3128e47b..0c0235b31 100644
--- a/client/loclass/ikeys.c
+++ b/client/loclass/ikeys.c
@@ -600,7 +600,7 @@ static uint64_t testCryptedCSN(uint64_t crypted_csn, uint64_t expected) {
     return retval;
 }
 
-int testDES2(uint64_t csn, uint64_t expected) {
+static int testDES2(uint64_t csn, uint64_t expected) {
     uint8_t result[8] = {0};
     uint8_t input[8] = {0};
 
diff --git a/client/mifare/ndef.c b/client/mifare/ndef.c
index 9caee1d88..3e0f46f71 100644
--- a/client/mifare/ndef.c
+++ b/client/mifare/ndef.c
@@ -80,7 +80,7 @@ static const char *URI_s[] = {
     "urn:nfc:"                    // 0x23
 };
 
-uint16_t ndefTLVGetLength(uint8_t *data, size_t *indx) {
+static uint16_t ndefTLVGetLength(uint8_t *data, size_t *indx) {
     uint16_t len = 0;
     if (data[0] == 0xff) {
         len = (data[1] << 8) + data[2];
@@ -93,7 +93,7 @@ uint16_t ndefTLVGetLength(uint8_t *data, size_t *indx) {
     return len;
 }
 
-int ndefDecodeHeader(uint8_t *data, size_t datalen, NDEFHeader_t *header) {
+static int ndefDecodeHeader(uint8_t *data, size_t datalen, NDEFHeader_t *header) {
     header->Type = NULL;
     header->Payload = NULL;
     header->ID = NULL;
@@ -129,7 +129,7 @@ int ndefDecodeHeader(uint8_t *data, size_t datalen, NDEFHeader_t *header) {
     return 0;
 }
 
-int ndefPrintHeader(NDEFHeader_t *header) {
+static int ndefPrintHeader(NDEFHeader_t *header) {
     PrintAndLogEx(INFO, "Header:");
 
     PrintAndLogEx(NORMAL, "\tMessage Begin:    %s", STRBOOL(header->MessageBegin));
@@ -148,7 +148,7 @@ int ndefPrintHeader(NDEFHeader_t *header) {
     return 0;
 }
 
-int ndefDecodeSig(uint8_t *sig, size_t siglen) {
+static int ndefDecodeSig(uint8_t *sig, size_t siglen) {
     size_t indx = 0;
     PrintAndLogEx(NORMAL, "\tsignature version: 0x%02x", sig[0]);
     if (sig[0] != 0x01) {
@@ -213,7 +213,7 @@ int ndefDecodeSig(uint8_t *sig, size_t siglen) {
     return 0;
 };
 
-int ndefDecodePayload(NDEFHeader_t *ndef) {
+static int ndefDecodePayload(NDEFHeader_t *ndef) {
 
     switch (ndef->TypeNameFormat) {
         case tnfWellKnownRecord:
@@ -244,7 +244,7 @@ int ndefDecodePayload(NDEFHeader_t *ndef) {
     return 0;
 }
 
-int ndefRecordDecodeAndPrint(uint8_t *ndefRecord, size_t ndefRecordLen) {
+static int ndefRecordDecodeAndPrint(uint8_t *ndefRecord, size_t ndefRecordLen) {
     NDEFHeader_t NDEFHeader = {0};
     int res = ndefDecodeHeader(ndefRecord, ndefRecordLen, &NDEFHeader);
     if (res)
@@ -270,7 +270,7 @@ int ndefRecordDecodeAndPrint(uint8_t *ndefRecord, size_t ndefRecordLen) {
     return 0;
 }
 
-int ndefRecordsDecodeAndPrint(uint8_t *ndefRecord, size_t ndefRecordLen) {
+static int ndefRecordsDecodeAndPrint(uint8_t *ndefRecord, size_t ndefRecordLen) {
     bool firstRec = true;
     size_t len = 0;
 
diff --git a/client/proxmark3.c b/client/proxmark3.c
index 2947075cb..2794099c6 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -71,9 +71,9 @@ main_loop(char *script_cmds_file, char *script_cmd, bool usb_present) {
         SetOffline(false);
         // cache Version information now:
         if (execCommand || script_cmds_file || stdinOnPipe)
-            CmdVersion("s");
+            pm3_version(false);
         else
-            CmdVersion("");
+            pm3_version(true);
     } else {
         SetOffline(true);
     }
diff --git a/common/lfdemod.h b/common/lfdemod.h
index 32421dea0..75f18f3c6 100644
--- a/common/lfdemod.h
+++ b/common/lfdemod.h
@@ -60,6 +60,7 @@ uint8_t  detectFSKClk(uint8_t *bits, size_t size, uint8_t fcHigh, uint8_t fcLow,
 int      DetectNRZClock(uint8_t *dest, size_t size, int clock, size_t *clockStartIdx);
 int      DetectPSKClock(uint8_t *dest, size_t size, int clock, size_t *firstPhaseShift, uint8_t *curPhase, uint8_t *fc);
 int      DetectStrongAskClock(uint8_t *dest, size_t size, int high, int low, int *clock);
+int      DetectStrongNRZClk(uint8_t *dest, size_t size, int peak, int low, bool *strong);
 bool     DetectST(uint8_t *buffer, size_t *size, int *foundclock, size_t *ststart, size_t *stend);
 size_t   fskdemod(uint8_t *dest, size_t size, uint8_t rfLen, uint8_t invert, uint8_t fchigh, uint8_t fclow, int *start_idx);
 //void     getHiLo(uint8_t *bits, size_t size, int *high, int *low, uint8_t fuzzHi, uint8_t fuzzLo);

From b6ee94ec8ec0bd6849fdd8b6069a81f78acd188b Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 13 Apr 2019 22:07:58 +0200
Subject: [PATCH 1223/1938] style

---
 client/cmdhf14a.c   |  1 +
 client/cmdhfmfdes.c | 81 ++++++++++++++++++++++-----------------------
 client/cmdlfpac.c   |  1 +
 client/emv/cmdemv.c |  1 +
 4 files changed, 43 insertions(+), 41 deletions(-)

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index ab0c358ae..c03a39ca0 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -1149,6 +1149,7 @@ static command_t CommandTable[] = {
 };
 
 static int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdhfmfdes.c b/client/cmdhfmfdes.c
index 272e017a5..0884c7a1b 100644
--- a/client/cmdhfmfdes.c
+++ b/client/cmdhfmfdes.c
@@ -18,9 +18,9 @@ uint8_t key_defa_data[16] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x
 uint8_t key_picc_data[16] = { 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f };
 
 static int CmdHelp(const char *Cmd);
-
+/*
 static int CmdHF14ADesWb(const char *Cmd) {
-    /*  uint8_t blockNo = 0;
+        uint8_t blockNo = 0;
         uint8_t keyType = 0;
         uint8_t key[6] = {0, 0, 0, 0, 0, 0};
         uint8_t bldata[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
@@ -63,57 +63,56 @@ static int CmdHF14ADesWb(const char *Cmd) {
         } else {
             PrintAndLogEx(NORMAL, "Command execute timeout");
         }
-     */
     return 0;
 }
 
 static int CmdHF14ADesRb(const char *Cmd) {
-    // uint8_t blockNo = 0;
-    // uint8_t keyType = 0;
-    // uint8_t key[6] = {0, 0, 0, 0, 0, 0};
+    uint8_t blockNo = 0;
+    uint8_t keyType = 0;
+    uint8_t key[6] = {0, 0, 0, 0, 0, 0};
 
-    // char cmdp = 0x00;
+    char cmdp = 0x00;
 
 
-    // if (strlen(Cmd)<3) {
-    // PrintAndLogEx(NORMAL, "Usage:  hf mf rdbl    <block number> <key A/B> <key (12 hex symbols)>");
-    // PrintAndLogEx(NORMAL, "        sample: hf mf rdbl 0 A FFFFFFFFFFFF ");
-    // return 0;
-    // }
+    if (strlen(Cmd)<3) {
+    PrintAndLogEx(NORMAL, "Usage:  hf mf rdbl    <block number> <key A/B> <key (12 hex symbols)>");
+    PrintAndLogEx(NORMAL, "        sample: hf mf rdbl 0 A FFFFFFFFFFFF ");
+    return 0;
+    }
 
-    // blockNo = param_get8(Cmd, 0);
-    // cmdp = param_getchar(Cmd, 1);
-    // if (cmdp == 0x00) {
-    // PrintAndLogEx(NORMAL, "Key type must be A or B");
-    // return 1;
-    // }
-    // if (cmdp != 'A' && cmdp != 'a') keyType = 1;
-    // if (param_gethex(Cmd, 2, key, 12)) {
-    // PrintAndLogEx(NORMAL, "Key must include 12 HEX symbols");
-    // return 1;
-    // }
-    // PrintAndLogEx(NORMAL, "--block no:%02x key type:%02x key:%s ", blockNo, keyType, sprint_hex(key, 6));
+    blockNo = param_get8(Cmd, 0);
+    cmdp = param_getchar(Cmd, 1);
+    if (cmdp == 0x00) {
+    PrintAndLogEx(NORMAL, "Key type must be A or B");
+    return 1;
+    }
+    if (cmdp != 'A' && cmdp != 'a') keyType = 1;
+    if (param_gethex(Cmd, 2, key, 12)) {
+    PrintAndLogEx(NORMAL, "Key must include 12 HEX symbols");
+    return 1;
+    }
+    PrintAndLogEx(NORMAL, "--block no:%02x key type:%02x key:%s ", blockNo, keyType, sprint_hex(key, 6));
 
-    // UsbCommand c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}, {{0}}};
-    // memcpy(c.d.asBytes, key, 6);
-    // SendCommand(&c);
+    UsbCommand c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}, {{0}}};
+    memcpy(c.d.asBytes, key, 6);
+    SendCommand(&c);
 
-    // UsbCommand resp;
-    // if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
-    // uint8_t                isOK  = resp.arg[0] & 0xff;
-    // uint8_t              * data  = resp.d.asBytes;
+    UsbCommand resp;
+    if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
+    uint8_t                isOK  = resp.arg[0] & 0xff;
+    uint8_t              * data  = resp.d.asBytes;
 
-    // if (isOK)
-    // PrintAndLogEx(NORMAL, "isOk:%02x data:%s", isOK, sprint_hex(data, 16));
-    // else
-    // PrintAndLogEx(NORMAL, "isOk:%02x", isOK);
-    // } else {
-    // PrintAndLogEx(NORMAL, "Command execute timeout");
-    // }
+    if (isOK)
+    PrintAndLogEx(NORMAL, "isOk:%02x data:%s", isOK, sprint_hex(data, 16));
+    else
+    PrintAndLogEx(NORMAL, "isOk:%02x", isOK);
+    } else {
+    PrintAndLogEx(NORMAL, "Command execute timeout");
+    }
 
     return 0;
 }
-
+*/
 static int CmdHF14ADesInfo(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
 
@@ -646,8 +645,8 @@ static command_t CommandTable[] = {
     {"info",    CmdHF14ADesInfo,            0, "Tag information"},
     {"enum",    CmdHF14ADesEnumApplications, 0, "Tries enumerate all applications"},
     {"auth",    CmdHF14ADesAuth,            0, "Tries a MIFARE DesFire Authentication"},
-    {"rdbl",    CmdHF14ADesRb,              0, "Read MIFARE DesFire block"},
-    {"wrbl",    CmdHF14ADesWb,              0, "write MIFARE DesFire block"},
+//    {"rdbl",    CmdHF14ADesRb,              0, "Read MIFARE DesFire block"},
+//    {"wrbl",    CmdHF14ADesWb,              0, "write MIFARE DesFire block"},
     {NULL, NULL, 0, NULL}
 };
 
diff --git a/client/cmdlfpac.c b/client/cmdlfpac.c
index 8bbda25b5..5aa1edd45 100644
--- a/client/cmdlfpac.c
+++ b/client/cmdlfpac.c
@@ -64,6 +64,7 @@ static command_t CommandTable[] = {
 };
 
 static int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index df2a1a22e..be1b28103 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -1967,6 +1967,7 @@ static command_t CommandTable[] =  {
 };
 
 static int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }

From ce606b51fca1dca54ade18938ab9da6aa50b486d Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 13 Apr 2019 22:46:08 +0200
Subject: [PATCH 1224/1938] Handle explicitly enum vals in switch
 [-Wswitch-enum]

---
 client/cmdflashmem.c |  3 +--
 client/cmdhflist.c   | 16 +++++++++++++---
 client/cmdlfhitag.c  | 14 ++++++++++----
 client/mifare/ndef.c |  6 +++++-
 client/ui.c          |  3 ++-
 common/crc16.c       | 18 ++++++++++++------
 6 files changed, 43 insertions(+), 17 deletions(-)

diff --git a/client/cmdflashmem.c b/client/cmdflashmem.c
index 2f89fc9b4..28f0d6853 100644
--- a/client/cmdflashmem.c
+++ b/client/cmdflashmem.c
@@ -243,8 +243,7 @@ static int CmdFlashMemLoad(const char *Cmd) {
             data[1] = (keycount >> 8) & 0xFF;
             datalen += 2;
             break;
-        default:
-
+        case DICTIONARY_NONE:
             res = loadFile(filename, "bin", data, FLASH_MEM_MAX_SIZE, &datalen);
             //int res = loadFileEML( filename, "eml", data, &datalen);
             if (res) {
diff --git a/client/cmdhflist.c b/client/cmdhflist.c
index 592720ac1..fa8fd8857 100644
--- a/client/cmdhflist.c
+++ b/client/cmdhflist.c
@@ -53,9 +53,15 @@ uint8_t mifare_CRC_check(bool isResponse, uint8_t *data, uint8_t len) {
         case masNone:
         case masError:
             return iso14443A_CRC_check(isResponse, data, len);
-        default:
-            return 2;
+        case masNt:
+        case masNrAr:
+        case masAt:
+        case masAuthComplete:
+        case masFirstData:
+        case masData:
+            break;
     }
+    return 2;
 }
 
 /**
@@ -1024,7 +1030,11 @@ void annotateMifare(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize, uint8
                 MifareAuthState = masError;
             }
             break;
-        default:
+        case masNone:
+        case masError:
+        case masAuthComplete:
+        case masFirstData:
+        case masData:
             break;
     }
 
diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index d8f029d05..e7eaea6dd 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -550,9 +550,10 @@ static int CmdLFHitagReader(const char *Cmd) {
             // No additional parameters needed
             break;
         }
-        default: {
+        case WHTSF_CHALLENGE:
+        case WHTSF_KEY:
+        case WHT2F_CRYPTO:
             return usage_hitag_reader();
-        }
     }
 
     c.arg[0] = htf;
@@ -661,9 +662,14 @@ static int CmdLFHitagWriter(const char *Cmd) {
             num_to_bytes(param_get32ex(Cmd, 3, 0, 16), 4, htd->crypto.data);
             break;
         }
-        default: {
+        case RHTSF_CHALLENGE:
+        case RHTSF_KEY:
+        case RHT2F_PASSWORD:
+        case RHT2F_AUTHENTICATE:
+        case RHT2F_CRYPTO:
+        case RHT2F_TEST_AUTH_ATTEMPTS:
+        case RHT2F_UID_ONLY:
             return usage_hitag_writer();
-        }
     }
 
     c.arg[0] = htf;
diff --git a/client/mifare/ndef.c b/client/mifare/ndef.c
index 3e0f46f71..d44991c0e 100644
--- a/client/mifare/ndef.c
+++ b/client/mifare/ndef.c
@@ -238,7 +238,11 @@ static int ndefDecodePayload(NDEFHeader_t *ndef) {
             PrintAndLogEx(NORMAL, "\ttype:    %.*s", ndef->TypeLen, ndef->Type);
             PrintAndLogEx(NORMAL, "\tpayload: %.*s", ndef->PayloadLen, ndef->Payload);
             break;
-        default:
+        case tnfEmptyRecord:
+        case tnfMIMEMediaRecord:
+        case tnfExternalRecord:
+        case tnfUnchangedRecord:
+        case tnfUnknownRecord:
             break;
     }
     return 0;
diff --git a/client/ui.c b/client/ui.c
index 4167625da..c72b46806 100644
--- a/client/ui.c
+++ b/client/ui.c
@@ -81,7 +81,8 @@ void PrintAndLogEx(logLevel_t level, const char *fmt, ...) {
         case WARNING:
             strncpy(prefix, _CYAN_("[!]"), sizeof(prefix) - 1);
             break;
-        default:
+        case NORMAL:
+        case INFO:
             strncpy(prefix, prefixes[level], sizeof(prefix) - 1);
             break;
     }
diff --git a/common/crc16.c b/common/crc16.c
index 89afdf02c..917de3595 100644
--- a/common/crc16.c
+++ b/common/crc16.c
@@ -42,7 +42,7 @@ void init_table(CrcType_t crctype) {
         case CRC_KERMIT:
             generate_table(CRC16_POLY_CCITT, true);
             break;
-        default:
+        case CRC_NONE:
             crc_table_init = false;
             current_crc_type = CRC_NONE;
             break;
@@ -178,15 +178,17 @@ void compute_crc(CrcType_t ct, const uint8_t *d, size_t n, uint8_t *first, uint8
         case CRC_FELICA:
             crc = crc16_xmodem(d, n);
             break;
-        //case CRC_LEGIC:
         case CRC_CCITT:
             crc = crc16_ccitt(d, n);
             break;
         case CRC_KERMIT:
             crc = crc16_kermit(d, n);
             break;
-        default:
-            break;
+        case CRC_LEGIC:
+            // TODO
+            return;
+        case CRC_NONE:
+            return;
     }
     *first = (crc & 0xFF);
     *second = ((crc >> 8) & 0xFF);
@@ -207,11 +209,13 @@ uint16_t Crc16ex(CrcType_t ct, const uint8_t *d, size_t n) {
             return crc16_iclass(d, n);
         case CRC_FELICA:
             return crc16_xmodem(d, n);
-        //case CRC_LEGIC:
         case CRC_CCITT:
             return crc16_ccitt(d, n);
         case CRC_KERMIT:
             return crc16_kermit(d, n);
+        case CRC_LEGIC:
+            // TODO
+            return 0;
         default:
             break;
     }
@@ -245,9 +249,11 @@ bool check_crc(CrcType_t ct, const uint8_t *d, size_t n) {
             return (crc16_iclass(d, n) == 0);
         case CRC_FELICA:
             return (crc16_xmodem(d, n) == 0);
-        //case CRC_LEGIC:
         case CRC_CCITT:
             return (crc16_ccitt(d, n) == 0);
+        case CRC_LEGIC:
+            // TODO
+            return false;
         default:
             break;
     }

From 97676d3210dcb50c05ad6b870ebbe33fd8a37c84 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 13 Apr 2019 23:38:34 +0200
Subject: [PATCH 1225/1938] comparison of integers of different signs
 [-Wsign-compare]

---
 client/cmddata.c           | 13 ++++++-------
 client/crypto/asn1dump.c   |  6 +++---
 client/fido/fidocore.c     |  4 ++--
 client/graph.c             | 14 +++++++-------
 client/graph.h             |  4 ++--
 client/loclass/fileutils.c | 29 ++++++++++++++---------------
 client/mifare/mfkey.c      |  4 ++--
 client/mifare/mifarehost.c | 12 ++++++------
 client/proxgui.h           |  5 +++--
 client/proxguiqt.cpp       | 15 ++++++++-------
 client/proxguiqt.h         | 12 ++++++------
 client/proxmark3.c         |  2 +-
 client/ui.c                | 19 +++++++++----------
 client/ui.h                |  3 ++-
 client/util.c              | 21 ++++++++++-----------
 common/crc.c               |  6 +++---
 uart/uart_posix.c          |  2 +-
 17 files changed, 85 insertions(+), 86 deletions(-)

diff --git a/client/cmddata.c b/client/cmddata.c
index d971d0fba..9b637894d 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -1985,7 +1985,7 @@ static void GetHiLoTone(int *LowTone, int *HighTone, int clk, int LowToneFC, int
 
 //old CmdFSKdemod adapted by marshmellow
 //converts FSK to clear NRZ style wave.  (or demodulates)
-static int FSKToNRZ(int *data, int *dataLen, int clk, int LowToneFC, int HighToneFC) {
+static int FSKToNRZ(int *data, size_t *dataLen, int clk, int LowToneFC, int HighToneFC) {
     uint8_t ans = 0;
     if (clk == 0 || LowToneFC == 0 || HighToneFC == 0) {
         int firstClockEdge = 0;
@@ -2002,17 +2002,16 @@ static int FSKToNRZ(int *data, int *dataLen, int clk, int LowToneFC, int HighTon
         return 0;
     }
 
-    int i, j;
     int LowTone[clk];
     int HighTone[clk];
     GetHiLoTone(LowTone, HighTone, clk, LowToneFC, HighToneFC);
 
     // loop through ([all samples] - clk)
-    for (i = 0; i < *dataLen - clk; ++i) {
+    for (size_t i = 0; i < *dataLen - clk; ++i) {
         int lowSum = 0, highSum = 0;
 
         // sum all samples together starting from this sample for [clk] samples for each tone (multiply tone value with sample data)
-        for (j = 0; j < clk; ++j) {
+        for (size_t j = 0; j < clk; ++j) {
             lowSum += LowTone[j] * data[i + j];
             highSum += HighTone[j] * data[i + j];
         }
@@ -2026,14 +2025,14 @@ static int FSKToNRZ(int *data, int *dataLen, int clk, int LowToneFC, int HighTon
     // now we have the abs( [average sample value per clk] * 100 ) for each tone
     //   loop through again [all samples] - clk - 16
     //                  note why 16???  is 16 the largest FC? changed to LowToneFC as that should be the > fc
-    for (i = 0; i < *dataLen - clk - LowToneFC; ++i) {
+    for (size_t i = 0; i < *dataLen - clk - LowToneFC; ++i) {
         int lowTot = 0, highTot = 0;
 
         // sum a field clock width of abs( [average sample values per clk] * 100) for each tone
-        for (j = 0; j < LowToneFC; ++j) {  //10 for fsk2
+        for (size_t j = 0; j < LowToneFC; ++j) {  //10 for fsk2
             lowTot += (data[i + j] & 0xffff);
         }
-        for (j = 0; j < HighToneFC; j++) {  //8 for fsk2
+        for (size_t j = 0; j < HighToneFC; j++) {  //8 for fsk2
             highTot += (data[i + j] >> 16);
         }
 
diff --git a/client/crypto/asn1dump.c b/client/crypto/asn1dump.c
index 2fd99ac40..e197749a0 100644
--- a/client/crypto/asn1dump.c
+++ b/client/crypto/asn1dump.c
@@ -165,7 +165,7 @@ static void asn1_tag_dump_string(const struct tlv *tlv, const struct asn1_tag *t
 
 static void asn1_tag_dump_octet_string(const struct tlv *tlv, const struct asn1_tag *tag, FILE *f, int level, bool *needdump) {
     *needdump = false;
-    for (int i = 0; i < tlv->len; i++)
+    for (size_t i = 0; i < tlv->len; i++)
         if (!isspace(tlv->value[i]) && !isprint(tlv->value[i])) {
             *needdump = true;
             break;
@@ -181,7 +181,7 @@ static void asn1_tag_dump_octet_string(const struct tlv *tlv, const struct asn1_
 
 static unsigned long asn1_value_integer(const struct tlv *tlv, unsigned start, unsigned end) {
     unsigned long ret = 0;
-    int i;
+    unsigned i;
 
     if (end > tlv->len * 2)
         return ret;
@@ -222,7 +222,7 @@ static void asn1_tag_dump_integer(const struct tlv *tlv, const struct asn1_tag *
     PRINT_INDENT(level);
     if (tlv->len == 4) {
         int32_t val = 0;
-        for (int i = 0; i < tlv->len; i++)
+        for (size_t i = 0; i < tlv->len; i++)
             val = (val << 8) + tlv->value[i];
         fprintf(f, "\tvalue4b: %d\n", val);
         return;
diff --git a/client/fido/fidocore.c b/client/fido/fidocore.c
index a688d9a9a..a10e6291e 100644
--- a/client/fido/fidocore.c
+++ b/client/fido/fidocore.c
@@ -150,7 +150,7 @@ fido2Desc_t fido2CmdGetInfoRespDesc[] = {
 };
 
 const char *fido2GetCmdErrorDescription(uint8_t errorCode) {
-    for (int i = 0; i < sizeof(fido2Errors) / sizeof(fido2Error_t); i++)
+    for (size_t i = 0; i < sizeof(fido2Errors) / sizeof(fido2Error_t); i++)
         if (fido2Errors[i].ErrorCode == errorCode)
             return fido2Errors[i].Description;
 
@@ -158,7 +158,7 @@ const char *fido2GetCmdErrorDescription(uint8_t errorCode) {
 }
 
 const char *fido2GetCmdMemberDescription(uint8_t cmdCode, bool isResponse, int memberNum) {
-    for (int i = 0; i < sizeof(fido2CmdGetInfoRespDesc) / sizeof(fido2Desc_t); i++)
+    for (size_t i = 0; i < sizeof(fido2CmdGetInfoRespDesc) / sizeof(fido2Desc_t); i++)
         if (fido2CmdGetInfoRespDesc[i].Command == cmdCode &&
                 fido2CmdGetInfoRespDesc[i].PckType == (isResponse ? ptResponse : ptQuery) &&
                 fido2CmdGetInfoRespDesc[i].MemberNumber == memberNum)
diff --git a/client/graph.c b/client/graph.c
index 677ab0846..d2a816125 100644
--- a/client/graph.c
+++ b/client/graph.c
@@ -10,7 +10,7 @@
 #include "graph.h"
 
 int GraphBuffer[MAX_GRAPH_TRACE_LEN];
-int GraphTraceLen;
+size_t GraphTraceLen;
 int s_Buff[MAX_GRAPH_TRACE_LEN];
 
 /* write a manchester bit to the graph
@@ -30,8 +30,8 @@ void AppendGraph(bool redraw, int clock, int bit) {
 }
 
 // clear out our graph window
-int ClearGraph(bool redraw) {
-    int gtl = GraphTraceLen;
+size_t ClearGraph(bool redraw) {
+    size_t gtl = GraphTraceLen;
     memset(GraphBuffer, 0x00, GraphTraceLen);
     GraphTraceLen = 0;
     if (redraw)
@@ -41,7 +41,7 @@ int ClearGraph(bool redraw) {
 // option '1' to save GraphBuffer any other to restore
 void save_restoreGB(uint8_t saveOpt) {
     static int SavedGB[MAX_GRAPH_TRACE_LEN];
-    static int SavedGBlen = 0;
+    static size_t SavedGBlen = 0;
     static bool GB_Saved = false;
     static int SavedGridOffsetAdj = 0;
 
@@ -67,7 +67,7 @@ void setGraphBuf(uint8_t *buff, size_t size) {
     if (size > MAX_GRAPH_TRACE_LEN)
         size = MAX_GRAPH_TRACE_LEN;
 
-    for (uint32_t i = 0; i < size; ++i)
+    for (size_t i = 0; i < size; ++i)
         GraphBuffer[i] = buff[i] - 128;
 
     GraphTraceLen = size;
@@ -77,7 +77,7 @@ void setGraphBuf(uint8_t *buff, size_t size) {
 
 size_t getFromGraphBuf(uint8_t *buff) {
     if (buff == NULL) return 0;
-    uint32_t i;
+    size_t i;
     for (i = 0; i < GraphTraceLen; ++i) {
         //trim
         if (GraphBuffer[i] > 127) GraphBuffer[i] = 127;
@@ -89,7 +89,7 @@ size_t getFromGraphBuf(uint8_t *buff) {
 
 // A simple test to see if there is any data inside Graphbuffer.
 bool HasGraphData() {
-    if (GraphTraceLen <= 0) {
+    if (GraphTraceLen == 0) {
         PrintAndLogEx(NORMAL, "No data available, try reading something first");
         return false;
     }
diff --git a/client/graph.h b/client/graph.h
index 98acec8dd..accd64de8 100644
--- a/client/graph.h
+++ b/client/graph.h
@@ -19,7 +19,7 @@
 #include "cmddata.h" //for g_debugmode
 
 void AppendGraph(bool redraw, int clock, int bit);
-int ClearGraph(bool redraw);
+size_t ClearGraph(bool redraw);
 size_t getFromGraphBuf(uint8_t *buff);
 int GetAskClock(const char *str, bool printAns);
 int GetPskClock(const char *str, bool printAns);
@@ -40,7 +40,7 @@ bool HasGraphData(void);
 #define GRAPH_RESTORE 0
 
 extern int GraphBuffer[MAX_GRAPH_TRACE_LEN];
-extern int GraphTraceLen;
+extern size_t GraphTraceLen;
 extern int s_Buff[MAX_GRAPH_TRACE_LEN];
 
 #endif
diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index d85adc0c8..72d3e26af 100644
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -92,7 +92,6 @@ int saveFileEML(const char *preferredName, const char *suffix, uint8_t *data, si
     int retval = 0;
     int blocks = datalen / blocksize;
     uint16_t currblock = 1;
-    int i, j;
     int size = sizeof(char) * (strlen(preferredName) + strlen(suffix) + 10);
     char *fileName = calloc(size, sizeof(char));
     int num = 1;
@@ -112,7 +111,7 @@ int saveFileEML(const char *preferredName, const char *suffix, uint8_t *data, si
         goto out;
     }
 
-    for (i = 0; i < datalen; i++) {
+    for (size_t i = 0; i < datalen; i++) {
         fprintf(f, "%02X", data[i]);
 
         // no extra line in the end
@@ -124,7 +123,7 @@ int saveFileEML(const char *preferredName, const char *suffix, uint8_t *data, si
     // left overs
     if (datalen % blocksize != 0) {
         int index = blocks * blocksize;
-        for (j = 0; j < datalen % blocksize; j++) {
+        for (size_t j = 0; j < datalen % blocksize; j++) {
             fprintf(f, "%02X", data[index + j]);
         }
     }
@@ -162,9 +161,9 @@ int saveFileJSON(const char *preferredName, const char *suffix, JSONFileType fty
         }
         case jsfCardMemory: {
             JsonSaveStr(root, "FileType", "mfcard");
-            for (int i = 0; i < (datalen / 16); i++) {
+            for (size_t i = 0; i < (datalen / 16); i++) {
                 char path[PATH_MAX_LENGTH] = {0};
-                sprintf(path, "$.blocks.%d", i);
+                sprintf(path, "$.blocks.%zu", i);
                 JsonSaveBufAsHexCompact(root, path, &data[i * 16], 16);
 
                 if (i == 0) {
@@ -188,19 +187,19 @@ int saveFileJSON(const char *preferredName, const char *suffix, JSONFileType fty
                     JsonSaveBufAsHexCompact(root, path, &data[i * 16 + 6], 4);
 
                     memset(path, 0x00, sizeof(path));
-                    sprintf(path, "$.SectorKeys.%d.AccessConditionsText.block%d", mfSectorNum(i), i - 3);
+                    sprintf(path, "$.SectorKeys.%d.AccessConditionsText.block%zu", mfSectorNum(i), i - 3);
                     JsonSaveStr(root, path, mfGetAccessConditionsDesc(0, adata));
 
                     memset(path, 0x00, sizeof(path));
-                    sprintf(path, "$.SectorKeys.%d.AccessConditionsText.block%d", mfSectorNum(i), i - 2);
+                    sprintf(path, "$.SectorKeys.%d.AccessConditionsText.block%zu", mfSectorNum(i), i - 2);
                     JsonSaveStr(root, path, mfGetAccessConditionsDesc(1, adata));
 
                     memset(path, 0x00, sizeof(path));
-                    sprintf(path, "$.SectorKeys.%d.AccessConditionsText.block%d", mfSectorNum(i), i - 1);
+                    sprintf(path, "$.SectorKeys.%d.AccessConditionsText.block%zu", mfSectorNum(i), i - 1);
                     JsonSaveStr(root, path, mfGetAccessConditionsDesc(2, adata));
 
                     memset(path, 0x00, sizeof(path));
-                    sprintf(path, "$.SectorKeys.%d.AccessConditionsText.block%d", mfSectorNum(i), i);
+                    sprintf(path, "$.SectorKeys.%d.AccessConditionsText.block%zu", mfSectorNum(i), i);
                     JsonSaveStr(root, path, mfGetAccessConditionsDesc(3, adata));
 
                     memset(path, 0x00, sizeof(path));
@@ -231,9 +230,9 @@ int saveFileJSON(const char *preferredName, const char *suffix, JSONFileType fty
             // size of header 48b
             size_t len = (datalen - DUMP_PREFIX_LENGTH) / 4;
 
-            for (int i = 0; i < len; i++) {
+            for (size_t i = 0; i < len; i++) {
                 char path[PATH_MAX_LENGTH] = {0};
-                sprintf(path, "$.blocks.%d", i);
+                sprintf(path, "$.blocks.%zu", i);
                 JsonSaveBufAsHexCompact(root, path, tmp->data + (i * 4), 4);
             }
             break;
@@ -245,9 +244,9 @@ int saveFileJSON(const char *preferredName, const char *suffix, JSONFileType fty
 
             JsonSaveBufAsHexCompact(root, "$.Card.UID", uid, sizeof(uid));
 
-            for (int i = 0; i < (datalen / 4); i++) {
+            for (size_t i = 0; i < (datalen / 4); i++) {
                 char path[PATH_MAX_LENGTH] = {0};
-                sprintf(path, "$.blocks.%d", i);
+                sprintf(path, "$.blocks.%zu", i);
                 JsonSaveBufAsHexCompact(root, path, data + (i * 4), 4);
             }
             break;
@@ -470,14 +469,14 @@ int loadFileJSON(const char *preferredName, const char *suffix, void *data, size
 
     if (!strcmp(ctype, "hitag")) {
         size_t sptr = 0;
-        for (int i = 0; i < (maxdatalen / 4); i++) {
+        for (size_t i = 0; i < (maxdatalen / 4); i++) {
             if (sptr + 4 > maxdatalen) {
                 retval = 5;
                 goto out;
             }
 
             char path[30] = {0};
-            sprintf(path, "$.blocks.%d", i);
+            sprintf(path, "$.blocks.%zu", i);
 
             size_t len = 0;
             JsonLoadBufAsHex(root, path, &udata[sptr], 4, &len);
diff --git a/client/mifare/mfkey.c b/client/mifare/mfkey.c
index b55c7e3c7..3ce2975b9 100644
--- a/client/mifare/mfkey.c
+++ b/client/mifare/mfkey.c
@@ -27,7 +27,7 @@ uint32_t intersection(uint64_t *listA, uint64_t *listB) {
     p1 = p3 = listA;
     p2 = listB;
 
-    while (*p1 != -1 && *p2 != -1) {
+    while (*p1 != UINT64_C(-1) && *p2 != UINT64_C(-1)) {
         if (compare_uint64(p1, p2) == 0) {
             *p3++ = *p1++;
             p2++;
@@ -36,7 +36,7 @@ uint32_t intersection(uint64_t *listA, uint64_t *listB) {
             while (compare_uint64(p1, p2) > 0) ++p2;
         }
     }
-    *p3 = -1;
+    *p3 = UINT64_C(-1);
     return p3 - listA;
 }
 
diff --git a/client/mifare/mifarehost.c b/client/mifare/mifarehost.c
index 0b2a49048..b7842dda0 100644
--- a/client/mifare/mifarehost.c
+++ b/client/mifare/mifarehost.c
@@ -89,13 +89,13 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
 
         PrintAndLogEx(SUCCESS, "found %u candidate key%s\n", keycount, (keycount > 1) ? "s." : ".");
 
-        *key = -1;
+        *key = UINT64_C(-1);
         uint8_t keyBlock[USB_CMD_DATA_SIZE];
-        int max_keys = USB_CMD_DATA_SIZE / 6;
-        for (int i = 0; i < keycount; i += max_keys) {
+        uint32_t max_keys = USB_CMD_DATA_SIZE / 6;
+        for (uint32_t i = 0; i < keycount; i += max_keys) {
 
-            int size = keycount - i > max_keys ? max_keys : keycount - i;
-            for (int j = 0; j < size; j++) {
+            uint32_t size = keycount - i > max_keys ? max_keys : keycount - i;
+            for (uint32_t j = 0; j < size; j++) {
                 if (par_list == 0) {
                     num_to_bytes(last_keylist[i * max_keys + j], 6, keyBlock + (j * 6));
                 } else {
@@ -108,7 +108,7 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
             }
         }
 
-        if (*key != -1) {
+        if (*key != UINT64_C(-1)) {
             break;
         } else {
             PrintAndLogEx(FAILED, "all candidate keys failed. Restarting darkside attack");
diff --git a/client/proxgui.h b/client/proxgui.h
index 613f793d1..2c0cf0601 100644
--- a/client/proxgui.h
+++ b/client/proxgui.h
@@ -28,11 +28,12 @@ void ExitGraphics(void);
 #define MAX_GRAPH_TRACE_LEN (40000 * 8)
 #endif
 extern int GraphBuffer[MAX_GRAPH_TRACE_LEN];
-extern int GraphTraceLen;
+extern size_t GraphTraceLen;
 extern int s_Buff[MAX_GRAPH_TRACE_LEN];
 
 extern double CursorScaleFactor;
-extern int PlotGridX, PlotGridY, PlotGridXdefault, PlotGridYdefault, CursorCPos, CursorDPos, GridOffset;
+extern int PlotGridX, PlotGridY, PlotGridXdefault, PlotGridYdefault, GridOffset;
+extern uint32_t CursorCPos, CursorDPos;
 extern int CommandFinished;
 extern int offline;
 extern bool GridLocked;
diff --git a/client/proxguiqt.cpp b/client/proxguiqt.cpp
index 102b006ce..2cf2d0200 100644
--- a/client/proxguiqt.cpp
+++ b/client/proxguiqt.cpp
@@ -33,7 +33,7 @@ extern "C" {
 
 bool g_useOverlays = false;
 int g_absVMax = 0;
-int startMax;
+uint32_t startMax;
 int PageWidth;
 int unlockStart = 0;
 
@@ -274,7 +274,7 @@ QColor Plot::getColor(int graphNum) {
     }
 }
 
-void Plot::setMaxAndStart(int *buffer, int len, QRect plotRect) {
+void Plot::setMaxAndStart(int *buffer, size_t len, QRect plotRect) {
     if (len == 0) return;
     startMax = (len - (int)((plotRect.right() - plotRect.left() - 40) / GraphPixelsPerPoint));
     if (startMax < 0) {
@@ -285,7 +285,7 @@ void Plot::setMaxAndStart(int *buffer, int len, QRect plotRect) {
     }
     if (GraphStart > len) return;
     int vMin = INT_MAX, vMax = INT_MIN, v = 0;
-    int sample_index = GraphStart ;
+    uint32_t sample_index = GraphStart ;
     for (; sample_index < len && xCoordOf(sample_index, plotRect) < plotRect.right() ; sample_index++) {
 
         v = buffer[sample_index];
@@ -299,7 +299,7 @@ void Plot::setMaxAndStart(int *buffer, int len, QRect plotRect) {
     g_absVMax = (int)(g_absVMax * 1.25 + 1);
 }
 
-void Plot::PlotDemod(uint8_t *buffer, size_t len, QRect plotRect, QRect annotationRect, QPainter *painter, int graphNum, int plotOffset) {
+void Plot::PlotDemod(uint8_t *buffer, size_t len, QRect plotRect, QRect annotationRect, QPainter *painter, int graphNum, uint32_t plotOffset) {
     if (len == 0 || PlotGridX <= 0) return;
     //clock_t begin = clock();
     QPainterPath penPath;
@@ -354,11 +354,12 @@ void Plot::PlotDemod(uint8_t *buffer, size_t len, QRect plotRect, QRect annotati
     painter->drawPath(penPath);
 }
 
-void Plot::PlotGraph(int *buffer, int len, QRect plotRect, QRect annotationRect, QPainter *painter, int graphNum) {
+void Plot::PlotGraph(int *buffer, size_t len, QRect plotRect, QRect annotationRect, QPainter *painter, int graphNum) {
     if (len == 0) return;
     // clock_t begin = clock();
     QPainterPath penPath;
-    int vMin = INT_MAX, vMax = INT_MIN, vMean = 0, v = 0, i = 0;
+    int vMin = INT_MAX, vMax = INT_MIN, vMean = 0, v = 0;
+    uint32_t i = 0;
     int x = xCoordOf(GraphStart, plotRect);
     int y = yCoordOf(buffer[GraphStart], plotRect, g_absVMax);
     penPath.moveTo(x, y);
@@ -416,7 +417,7 @@ void Plot::PlotGraph(int *buffer, int len, QRect plotRect, QRect annotationRect,
     //Graph annotations
     painter->drawPath(penPath);
     char str[200];
-    sprintf(str, "max=%d  min=%d  mean=%d  n=%d/%d  CursorAVal=[%d]  CursorBVal=[%d]",
+    sprintf(str, "max=%d  min=%d  mean=%d  n=%d/%zu  CursorAVal=[%d]  CursorBVal=[%d]",
             vMax, vMin, vMean, i, len, buffer[CursorAPos], buffer[CursorBPos]);
     painter->drawText(20, annotationRect.bottom() - 23 - 20 * graphNum, str);
 
diff --git a/client/proxguiqt.h b/client/proxguiqt.h
index fd6e00f13..6d92c22e7 100644
--- a/client/proxguiqt.h
+++ b/client/proxguiqt.h
@@ -31,17 +31,17 @@ class ProxWidget;
 class Plot: public QWidget {
   private:
     QWidget *master;
-    int GraphStart;
+    uint32_t GraphStart;
     double GraphPixelsPerPoint;
-    int CursorAPos;
-    int CursorBPos;
-    void PlotGraph(int *buffer, int len, QRect r, QRect r2, QPainter *painter, int graphNum);
-    void PlotDemod(uint8_t *buffer, size_t len, QRect r, QRect r2, QPainter *painter, int graphNum, int plotOffset);
+    uint32_t CursorAPos;
+    uint32_t CursorBPos;
+    void PlotGraph(int *buffer, size_t len, QRect r, QRect r2, QPainter *painter, int graphNum);
+    void PlotDemod(uint8_t *buffer, size_t len, QRect r, QRect r2, QPainter *painter, int graphNum, uint32_t plotOffset);
     void plotGridLines(QPainter *painter, QRect r);
     int xCoordOf(int i, QRect r);
     int yCoordOf(int v, QRect r, int maxVal);
     int valueOf_yCoord(int y, QRect r, int maxVal);
-    void setMaxAndStart(int *buffer, int len, QRect plotRect);
+    void setMaxAndStart(int *buffer, size_t len, QRect plotRect);
     QColor getColor(int graphNum);
 
   public:
diff --git a/client/proxmark3.c b/client/proxmark3.c
index 2794099c6..600d975e3 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -298,7 +298,7 @@ int main(int argc, char *argv[]) {
         return 1;
     }
 
-    uint32_t i = 1;
+    int i = 1;
     port = argv[i++];
     for (; i < argc; i++) {
 
diff --git a/client/ui.c b/client/ui.c
index c72b46806..2725fe093 100644
--- a/client/ui.c
+++ b/client/ui.c
@@ -18,7 +18,8 @@
 #include "ui.h"
 
 double CursorScaleFactor = 1;
-int PlotGridX = 0, PlotGridY = 0, PlotGridXdefault = 64, PlotGridYdefault = 64, CursorCPos = 0, CursorDPos = 0;
+int PlotGridX = 0, PlotGridY = 0, PlotGridXdefault = 64, PlotGridYdefault = 64;
+uint32_t CursorCPos = 0, CursorDPos = 0;
 bool flushAfterWrite = 0;
 int GridOffset = 0;
 bool GridLocked = false;
@@ -33,13 +34,13 @@ void PrintAndLogOptions(const char *str[][2], size_t size, size_t space) {
     char buff[2000] = "Options:\n";
     char format[2000] = "";
     size_t counts[2] = {0, 0};
-    for (int i = 0; i < size; i++)
-        for (int j = 0 ; j < 2 ; j++)
+    for (size_t i = 0; i < size; i++)
+        for (size_t j = 0 ; j < 2 ; j++)
             if (counts[j] < strlen(str[i][j])) {
                 counts[j] = strlen(str[i][j]);
             }
-    for (int i = 0; i < size; i++) {
-        for (int j = 0; j < 2; j++) {
+    for (size_t i = 0; i < size; i++) {
+        for (size_t j = 0; j < 2; j++) {
             if (j == 0)
                 snprintf(format, sizeof(format), "%%%zus%%%zus", space, counts[j]);
             else
@@ -203,8 +204,6 @@ void SetFlushAfterWrite(bool value) {
 
 void iceIIR_Butterworth(int *data, const size_t len) {
 
-    int i, j;
-
     int *output = (int *) calloc(sizeof(int) * len, sizeof(uint8_t));
     if (!output) return;
 
@@ -219,7 +218,7 @@ void iceIIR_Butterworth(int *data, const size_t len) {
     float b[3] = {0.003621681514929,  0.007243363029857, 0.003621681514929};
     float a[3] = {1.000000000000000, -1.822694925196308, 0.837181651256023};
 
-    for (i = 0; i < adjustedLen; ++i) {
+    for (size_t i = 0; i < adjustedLen; ++i) {
 
         float sample = data[i];          // input sample read from array
         float complex x_prime  = 1.0f;   // save sample for estimating frequency
@@ -246,7 +245,7 @@ void iceIIR_Butterworth(int *data, const size_t len) {
 
     // show data
     //memcpy(data, output, adjustedLen);
-    for (j = 0; j < adjustedLen; ++j)
+    for (size_t j = 0; j < adjustedLen; ++j)
         data[j] = output[j];
 
     free(output);
@@ -260,7 +259,7 @@ void iceSimple_Filter(int *data, const size_t len, uint8_t k) {
     int32_t filter_reg = 0;
     int8_t shift = (k <= 8) ? k : FILTER_SHIFT;
 
-    for (int i = 0; i < len; ++i) {
+    for (size_t i = 0; i < len; ++i) {
         // Update filter with current sample
         filter_reg = filter_reg - (filter_reg >> shift) + data[i];
 
diff --git a/client/ui.h b/client/ui.h
index ca235c11f..574881918 100644
--- a/client/ui.h
+++ b/client/ui.h
@@ -41,7 +41,8 @@ void SetLogFilename(char *fn);
 void SetFlushAfterWrite(bool value);
 
 extern double CursorScaleFactor;
-extern int PlotGridX, PlotGridY, PlotGridXdefault, PlotGridYdefault, CursorCPos, CursorDPos, GridOffset;
+extern int PlotGridX, PlotGridY, PlotGridXdefault, PlotGridYdefault, GridOffset;
+extern uint32_t CursorCPos, CursorDPos;
 extern bool GridLocked;
 extern bool showDemod;
 
diff --git a/client/util.c b/client/util.c
index a71f79ffd..05e9d700c 100644
--- a/client/util.c
+++ b/client/util.c
@@ -160,7 +160,7 @@ int FillBuffer(uint8_t *data, size_t maxDataLength, size_t *dataLength, ...) {
 }
 
 bool CheckStringIsHEXValue(const char *value) {
-    for (int i = 0; i < strlen(value); i++)
+    for (size_t i = 0; i < strlen(value); i++)
         if (!isxdigit(value[i]))
             return false;
 
@@ -177,17 +177,17 @@ void hex_to_buffer(const uint8_t *buf, const uint8_t *hex_data, const size_t hex
     size_t i;
     memset(tmp, 0x00, hex_max_len);
 
-    int maxLen = (hex_len > hex_max_len) ? hex_max_len : hex_len;
+    size_t maxLen = (hex_len > hex_max_len) ? hex_max_len : hex_len;
 
     for (i = 0; i < maxLen; ++i, tmp += 2 + spaces_between) {
         sprintf(tmp, (uppercase) ? "%02X" : "%02x", (unsigned int) hex_data[i]);
 
-        for (int j = 0; j < spaces_between; j++)
+        for (size_t j = 0; j < spaces_between; j++)
             sprintf(tmp + 2 + j, " ");
     }
 
     i *= (2 + spaces_between);
-    int minStrLen = min_str_len > i ? min_str_len : 0;
+    size_t minStrLen = min_str_len > i ? min_str_len : 0;
     if (minStrLen > hex_max_len)
         minStrLen = hex_max_len;
     for (; i < minStrLen; i++, tmp += 1)
@@ -198,8 +198,7 @@ void hex_to_buffer(const uint8_t *buf, const uint8_t *hex_data, const size_t hex
 
 // printing and converting functions
 void print_hex(const uint8_t *data, const size_t len) {
-    size_t i;
-    for (i = 0; i < len; i++)
+    for (size_t i = 0; i < len; i++)
         printf("%02x ", data[i]);
     printf("\n");
 }
@@ -207,7 +206,7 @@ void print_hex(const uint8_t *data, const size_t len) {
 void print_hex_break(const uint8_t *data, const size_t len, uint8_t breaks) {
     int rownum = 0;
     printf("[%02d] | ", rownum);
-    for (int i = 0; i < len; ++i) {
+    for (size_t i = 0; i < len; ++i) {
 
         printf("%02X ", data[i]);
 
@@ -246,7 +245,7 @@ char *sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t brea
     // make sure we don't go beyond our char array memory
     size_t in_index = 0, out_index = 0;
 
-    int rowlen = (len > MAX_BIN_BREAK_LENGTH) ? MAX_BIN_BREAK_LENGTH : len;
+    size_t rowlen = (len > MAX_BIN_BREAK_LENGTH) ? MAX_BIN_BREAK_LENGTH : len;
 
     if (breaks > 0 && len % breaks != 0)
         rowlen = (len + (len / breaks) > MAX_BIN_BREAK_LENGTH) ? MAX_BIN_BREAK_LENGTH : len + (len / breaks);
@@ -351,7 +350,7 @@ char *sprint_ascii_ex(const uint8_t *data, const size_t len, const size_t min_st
         ++i;
     }
 
-    int m = min_str_len > i ? min_str_len : 0;
+    size_t m = min_str_len > i ? min_str_len : 0;
     for (; i < m; ++i)
         tmp[i] = ' ';
 
@@ -399,7 +398,7 @@ void num_to_bytebits(uint64_t n, size_t len, uint8_t *dest) {
 
 //least significant bit first
 void num_to_bytebitsLSBF(uint64_t n, size_t len, uint8_t *dest) {
-    for (int i = 0 ; i < len ; ++i) {
+    for (size_t i = 0 ; i < len ; ++i) {
         dest[i] =  n & 1;
         n >>= 1;
     }
@@ -876,7 +875,7 @@ int num_CPUs(void) {
 }
 
 void str_lower(char *s) {
-    for (int i = 0; i < strlen(s); i++)
+    for (size_t i = 0; i < strlen(s); i++)
         s[i] = tolower(s[i]);
 }
 bool str_startswith(const char *s,  const char *pre) {
diff --git a/common/crc.c b/common/crc.c
index c3bd90064..e197c0eee 100644
--- a/common/crc.c
+++ b/common/crc.c
@@ -94,7 +94,7 @@ static void print_crc(crc_t *crc) {
 uint32_t CRC8Maxim(uint8_t *buff, size_t size) {
     crc_t crc;
     crc_init_ref(&crc, 8, 0x31, 0, 0, true, true);
-    for (int i = 0; i < size; ++i)
+    for (size_t i = 0; i < size; ++i)
         crc_update2(&crc, buff[i], 8);
     return crc_finish(&crc);
 }
@@ -102,7 +102,7 @@ uint32_t CRC8Maxim(uint8_t *buff, size_t size) {
 uint32_t CRC8Mad(uint8_t *buff, size_t size) {
     crc_t crc;
     crc_init_ref(&crc, 8, 0x1d, 0xc7, 0, false, false);
-    for (int i = 0; i < size; ++i)
+    for (size_t i = 0; i < size; ++i)
         crc_update2(&crc, buff[i], 8);
     return crc_finish(&crc);
 }
@@ -120,7 +120,7 @@ uint32_t CRC4Legic(uint8_t *buff, size_t size) {
 uint32_t CRC8Legic(uint8_t *buff, size_t size) {
     crc_t crc;
     crc_init_ref(&crc, 8, 0x63, 0x55, 0, true, true);
-    for (int i = 0; i < size; ++i)
+    for (size_t i = 0; i < size; ++i)
         crc_update2(&crc, buff[i], 8);
     return reflect8(crc_finish(&crc));
 }
diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index 2c1dc1b3b..8ea8aa619 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -231,7 +231,7 @@ void uart_close(const serial_port sp) {
 }
 
 bool uart_receive(const serial_port sp, uint8_t *pbtRx, size_t pszMaxRxLen, size_t *pszRxLen) {
-    int byteCount;
+    size_t byteCount;
     fd_set rfds;
     struct timeval tv;
 

From 993728072aab8546113eb630e7d166c90458907e Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 13 Apr 2019 23:55:58 +0200
Subject: [PATCH 1226/1938] comparison of integers of different signs
 [-Wsign-compare]

---
 client/cmddata.c   | 23 ++++++++++++-----------
 client/cmddata.h   |  2 +-
 client/fido/cose.c |  6 +++---
 client/proxgui.h   |  2 +-
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/client/cmddata.c b/client/cmddata.c
index 9b637894d..a13cb3d8a 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -457,12 +457,12 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
     int invert = 0;
     int clk = 0;
     int maxErr = 100;
-    int maxLen = 0;
+    size_t maxLen = 0;
     uint8_t askamp = 0;
     char amp = tolower(param_getchar(Cmd, 0));
     uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
 
-    sscanf(Cmd, "%i %i %i %i %c", &clk, &invert, &maxErr, &maxLen, &amp);
+    sscanf(Cmd, "%i %i %i %zu %c", &clk, &invert, &maxErr, &maxLen, &amp);
 
     if (!maxLen) maxLen = BIGBUF_SIZE;
 
@@ -573,7 +573,8 @@ static int Cmdaskmandemod(const char *Cmd) {
 static int Cmdmandecoderaw(const char *Cmd) {
     size_t size = 0;
     int high = 0, low = 0;
-    int i = 0, errCnt = 0, invert = 0, maxErr = 20;
+    size_t i = 0;
+    int errCnt = 0, invert = 0, maxErr = 20;
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) > 5 || cmdp == 'h') return usage_data_manrawdecode();
 
@@ -724,7 +725,7 @@ static int Cmdaskrawdemod(const char *Cmd) {
     return ASKDemod(Cmd, true, false, 0);
 }
 
-int AutoCorrelate(const int *in, int *out, size_t len, int window, bool SaveGrph, bool verbose) {
+int AutoCorrelate(const int *in, int *out, size_t len, size_t window, bool SaveGrph, bool verbose) {
     // sanity check
     if (window > len) window = len;
 
@@ -744,7 +745,7 @@ int AutoCorrelate(const int *in, int *out, size_t len, int window, bool SaveGrph
 
     static int CorrelBuffer[MAX_GRAPH_TRACE_LEN];
 
-    for (int i = 0; i < len - window; ++i) {
+    for (size_t i = 0; i < len - window; ++i) {
 
         for (size_t j = 0; j < (len - i); j++) {
             autocv += (in[j] - mean) * (in[j + i] - mean);
@@ -766,14 +767,14 @@ int AutoCorrelate(const int *in, int *out, size_t len, int window, bool SaveGrph
     //
     int hi = 0, idx = 0;
     int distance = 0, hi_1 = 0, idx_1 = 0;
-    for (int i = 0; i <= len; ++i) {
+    for (size_t i = 0; i <= len; ++i) {
         if (CorrelBuffer[i] > hi) {
             hi = CorrelBuffer[i];
             idx = i;
         }
     }
 
-    for (int i = idx + 1; i <= window; ++i) {
+    for (size_t i = idx + 1; i <= window; ++i) {
         if (CorrelBuffer[i] > hi_1) {
             hi_1 = CorrelBuffer[i];
             idx_1 = i;
@@ -856,8 +857,8 @@ static int CmdBitsamples(const char *Cmd) {
         return false;
     }
 
-    for (int j = 0; j < sizeof(got); j++) {
-        for (int k = 0; k < 8; k++) {
+    for (size_t j = 0; j < sizeof(got); j++) {
+        for (uint8_t k = 0; k < 8; k++) {
             if (got[j] & (1 << (7 - k)))
                 GraphBuffer[cnt++] = 1;
             else
@@ -882,7 +883,7 @@ static int CmdBuffClear(const char *Cmd) {
 
 static int CmdDec(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
-    for (int i = 0; i < (GraphTraceLen / 2); ++i)
+    for (size_t i = 0; i < (GraphTraceLen / 2); ++i)
         GraphBuffer[i] = GraphBuffer[i * 2];
     GraphTraceLen /= 2;
     PrintAndLogEx(NORMAL, "decimated by 2");
@@ -926,7 +927,7 @@ static int CmdGraphShiftZero(const char *Cmd) {
     //set options from parameters entered with the command
     sscanf(Cmd, "%i", &shift);
 
-    for (int i = 0; i < GraphTraceLen; i++) {
+    for (size_t i = 0; i < GraphTraceLen; i++) {
         if (i + shift >= GraphTraceLen)
             shiftedVal = GraphBuffer[i];
         else
diff --git a/client/cmddata.h b/client/cmddata.h
index 702775598..806e4cb72 100644
--- a/client/cmddata.h
+++ b/client/cmddata.h
@@ -83,7 +83,7 @@ void printDemodBuff(void);
 void setDemodBuff(uint8_t *buff, size_t size, size_t start_idx);
 bool getDemodBuff(uint8_t *buff, size_t *size);
 void save_restoreDB(uint8_t saveOpt);// option '1' to save DemodBuffer any other to restore
-int AutoCorrelate(const int *in, int *out, size_t len, int window, bool SaveGrph, bool verbose);
+int AutoCorrelate(const int *in, int *out, size_t len, size_t window, bool SaveGrph, bool verbose);
 int getSamples(int n, bool silent);
 void setClockGrid(int clk, int offset);
 int directionalThreshold(const int *in, int *out, size_t len, int8_t up, int8_t down);
diff --git a/client/fido/cose.c b/client/fido/cose.c
index 505d8e2d0..a3fc9755c 100644
--- a/client/fido/cose.c
+++ b/client/fido/cose.c
@@ -39,7 +39,7 @@ COSEValueNameDesc_t COSEKeyTypeValueDesc[] = {
 };
 
 static COSEValueNameDesc_t *GetCOSEktyElm(int id) {
-    for (int i = 0; i < ARRAYLEN(COSEKeyTypeValueDesc); i++)
+    for (size_t i = 0; i < ARRAYLEN(COSEKeyTypeValueDesc); i++)
         if (COSEKeyTypeValueDesc[i].Value == id)
             return &COSEKeyTypeValueDesc[i];
     return NULL;
@@ -64,7 +64,7 @@ COSEValueTypeNameDesc_t COSECurvesDesc[] = {
 };
 
 static COSEValueTypeNameDesc_t *GetCOSECurveElm(int id) {
-    for (int i = 0; i < ARRAYLEN(COSECurvesDesc); i++)
+    for (size_t i = 0; i < ARRAYLEN(COSECurvesDesc); i++)
         if (COSECurvesDesc[i].Value == id)
             return &COSECurvesDesc[i];
     return NULL;
@@ -136,7 +136,7 @@ COSEValueNameDesc_t COSEAlg[] = {
 };
 
 static COSEValueNameDesc_t *GetCOSEAlgElm(int id) {
-    for (int i = 0; i < ARRAYLEN(COSEAlg); i++)
+    for (size_t i = 0; i < ARRAYLEN(COSEAlg); i++)
         if (COSEAlg[i].Value == id)
             return &COSEAlg[i];
     return NULL;
diff --git a/client/proxgui.h b/client/proxgui.h
index 2c0cf0601..2c573f023 100644
--- a/client/proxgui.h
+++ b/client/proxgui.h
@@ -41,7 +41,7 @@ extern bool GridLocked;
 //Operations defined in data_operations
 //int autoCorr(const int* in, int *out, size_t len, int window);
 int AskEdgeDetect(const int *in, int *out, int len, int threshold);
-int AutoCorrelate(const int *in, int *out, size_t len, int window, bool SaveGrph, bool verbose);
+int AutoCorrelate(const int *in, int *out, size_t len, size_t window, bool SaveGrph, bool verbose);
 int directionalThreshold(const int *in, int *out, size_t len, int8_t up, int8_t down);
 void save_restoreGB(uint8_t saveOpt);
 

From 15f0fef55523180f1aba8d3e988671447fbf1f0a Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 13 Apr 2019 23:57:26 +0200
Subject: [PATCH 1227/1938] Fix data shiftgraphzero corrupting end of
 GraphBuffer

---
 client/cmddata.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/client/cmddata.c b/client/cmddata.c
index a13cb3d8a..aa56debd2 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -928,10 +928,7 @@ static int CmdGraphShiftZero(const char *Cmd) {
     sscanf(Cmd, "%i", &shift);
 
     for (size_t i = 0; i < GraphTraceLen; i++) {
-        if (i + shift >= GraphTraceLen)
-            shiftedVal = GraphBuffer[i];
-        else
-            shiftedVal = GraphBuffer[i] + shift;
+        shiftedVal = GraphBuffer[i] + shift;
 
         if (shiftedVal > 127)
             shiftedVal = 127;

From 392a8f7bba7a9338e16d96b6c6af45c68768f3d0 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 14 Apr 2019 00:16:26 +0200
Subject: [PATCH 1228/1938] update changelog

---
 CHANGELOG.md | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef081137b..82ff79424 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,8 +3,18 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [unreleased][unreleased]
- - 'hf mf sim' - bugs fix, refactoring (@mceloff)
- - Mifare Ultralight/NTAG simulation. Add WRITE and COMPATIBLE_WRITE support (@mceloff)
+ - Fix 'data shiftgraphzero' corrupting end of GraphBuffer (@doegox)
+ - Fix 'hf legic info' - unsegmented card now uses card size to calc remaining length (@iceman)
+ - Add 36bit HID format, extend calcWiegand() to include oem bits ((@davidbeauchamp)
+ - Fix 'hf mf hardnested' - not verify key when reading nonce file (@iceman)
+ - Change optimizations for ask/bi (@iceman)
+ - Fix 'hf mf sim' - bugs fix, refactoring (@mceloff)
+ - Add WRITE and COMPATIBLE_WRITE support to Mifare Ultralight/NTAG simulation (@mceloff)
+ - Change installation instructions and add video links (@5w0rdfish)
+ - Change 'hf mf sim' to support more types (@vratiskol)
+ - Change better strong wave detection for biphase (@iceman)
+ - Add 'script run test_t55x7' (@iceman)
+ - Add new lua scripting support for some t55xx commands (@iceman)
  - *WIP* Add FPC usart with pm3 client: WITH_FPC_HOST. (@doegox)
  - Add '-b baudrate' option to the pm3 client. (@doegox)
  - Change 'lf t55xx info': tell if known configuration block0. (@iceman)

From 8d94d2d67fdb7ccc7ac984d08beee8b10f4d7603 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 14 Apr 2019 00:45:27 +0200
Subject: [PATCH 1229/1938] comparison of integers of different signs
 [-Wsign-compare]

---
 client/cmddata.c | 42 ++++++++++++++++++++++--------------------
 client/cmddata.h |  4 ++--
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/client/cmddata.c b/client/cmddata.c
index aa56debd2..0112565a7 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -1326,7 +1326,7 @@ static int CmdRawDemod(const char *Cmd) {
     return ans;
 }
 
-void setClockGrid(int clk, int offset) {
+void setClockGrid(uint32_t clk, int offset) {
     g_DemodStartIdx = offset;
     g_DemodClock = clk;
     if (clk == 0 && offset == 0)
@@ -1368,12 +1368,13 @@ static int CmdSetGraphMarkers(const char *Cmd) {
 }
 
 static int CmdHexsamples(const char *Cmd) {
-    int i, j, requested = 0, offset = 0;
+    uint32_t requested = 0;
+    uint32_t offset = 0;
     char string_buf[25];
     char *string_ptr = string_buf;
     uint8_t got[BIGBUF_SIZE];
 
-    sscanf(Cmd, "%i %i", &requested, &offset);
+    sscanf(Cmd, "%u %u", &requested, &offset);
 
     /* if no args send something */
     if (requested == 0)
@@ -1389,8 +1390,8 @@ static int CmdHexsamples(const char *Cmd) {
         return false;
     }
 
-    i = 0;
-    for (j = 0; j < requested; j++) {
+    uint8_t i = 0;
+    for (uint32_t j = 0; j < requested; j++) {
         i++;
         string_ptr += sprintf(string_ptr, "%02x ", got[j]);
         if (i == 8) {
@@ -1444,7 +1445,7 @@ static uint8_t getByte(uint8_t bits_per_sample, BitstreamOut *b) {
     return val;
 }
 
-int getSamples(int n, bool silent) {
+int getSamples(uint32_t n, bool silent) {
     //If we get all but the last byte in bigbuf,
     // we don't have to worry about remaining trash
     // in the last byte in case the bits-per-sample
@@ -1654,11 +1655,13 @@ static int CmdLoad(const char *Cmd) {
 
 // trim graph from the end
 int CmdLtrim(const char *Cmd) {
-    // sanitycheck
-    if (GraphTraceLen <= 0) return 1;
 
-    int ds = atoi(Cmd);
-    for (int i = ds; i < GraphTraceLen; ++i)
+    uint32_t ds = strtoul(Cmd, NULL, 10);
+
+    // sanitycheck
+    if (GraphTraceLen <= ds) return 1;
+
+    for (uint32_t i = ds; i < GraphTraceLen; ++i)
         GraphBuffer[i - ds] = GraphBuffer[i];
 
     GraphTraceLen -= ds;
@@ -1669,7 +1672,7 @@ int CmdLtrim(const char *Cmd) {
 // trim graph from the beginning
 static int CmdRtrim(const char *Cmd) {
 
-    int ds = atoi(Cmd);
+    uint32_t ds = strtoul(Cmd, NULL, 10);
 
     // sanitycheck
     if (GraphTraceLen <= ds) return 1;
@@ -1681,8 +1684,8 @@ static int CmdRtrim(const char *Cmd) {
 
 // trim graph (middle) piece
 static int CmdMtrim(const char *Cmd) {
-    int start = 0, stop = 0;
-    sscanf(Cmd, "%i %i", &start, &stop);
+    uint32_t start = 0, stop = 0;
+    sscanf(Cmd, "%u %u", &start, &stop);
 
     if (start > GraphTraceLen || stop > GraphTraceLen || start > stop) return 1;
 
@@ -1690,7 +1693,7 @@ static int CmdMtrim(const char *Cmd) {
     start++;
 
     GraphTraceLen = stop - start;
-    for (int i = 0; i < GraphTraceLen; i++)
+    for (uint32_t i = 0; i < GraphTraceLen; i++)
         GraphBuffer[i] = GraphBuffer[start + i];
 
     return 0;
@@ -1698,17 +1701,16 @@ static int CmdMtrim(const char *Cmd) {
 
 int CmdNorm(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
-    int i;
     int max = INT_MIN, min = INT_MAX;
 
     // Find local min, max
-    for (i = 10; i < GraphTraceLen; ++i) {
+    for (uint32_t i = 10; i < GraphTraceLen; ++i) {
         if (GraphBuffer[i] > max) max = GraphBuffer[i];
         if (GraphBuffer[i] < min) min = GraphBuffer[i];
     }
 
     if (max != min) {
-        for (i = 0; i < GraphTraceLen; ++i) {
+        for (uint32_t i = 0; i < GraphTraceLen; ++i) {
             GraphBuffer[i] = ((long)(GraphBuffer[i] - ((max + min) / 2)) * 256) / (max - min);
             //marshmelow: adjusted *1000 to *256 to make +/- 128 so demod commands still work
         }
@@ -1744,7 +1746,7 @@ static int CmdSave(const char *Cmd) {
         return 0;
     }
 
-    for (int i = 0; i < GraphTraceLen; i++)
+    for (uint32_t i = 0; i < GraphTraceLen; i++)
         fprintf(f, "%d\n", GraphBuffer[i]);
 
     if (f)
@@ -1818,7 +1820,7 @@ static int CmdZerocrossings(const char *Cmd) {
 
     int sign = 1, zc = 0, lastZc = 0;
 
-    for (int i = 0; i < GraphTraceLen; ++i) {
+    for (uint32_t i = 0; i < GraphTraceLen; ++i) {
         if (GraphBuffer[i] * sign >= 0) {
             // No change in sign, reproduce the previous sample count.
             zc++;
@@ -1983,7 +1985,7 @@ static void GetHiLoTone(int *LowTone, int *HighTone, int clk, int LowToneFC, int
 
 //old CmdFSKdemod adapted by marshmellow
 //converts FSK to clear NRZ style wave.  (or demodulates)
-static int FSKToNRZ(int *data, size_t *dataLen, int clk, int LowToneFC, int HighToneFC) {
+static int FSKToNRZ(int *data, size_t *dataLen, uint8_t clk, uint8_t LowToneFC, uint8_t HighToneFC) {
     uint8_t ans = 0;
     if (clk == 0 || LowToneFC == 0 || HighToneFC == 0) {
         int firstClockEdge = 0;
diff --git a/client/cmddata.h b/client/cmddata.h
index 806e4cb72..583af4dd1 100644
--- a/client/cmddata.h
+++ b/client/cmddata.h
@@ -84,8 +84,8 @@ void setDemodBuff(uint8_t *buff, size_t size, size_t start_idx);
 bool getDemodBuff(uint8_t *buff, size_t *size);
 void save_restoreDB(uint8_t saveOpt);// option '1' to save DemodBuffer any other to restore
 int AutoCorrelate(const int *in, int *out, size_t len, size_t window, bool SaveGrph, bool verbose);
-int getSamples(int n, bool silent);
-void setClockGrid(int clk, int offset);
+int getSamples(uint32_t n, bool silent);
+void setClockGrid(uint32_t clk, int offset);
 int directionalThreshold(const int *in, int *out, size_t len, int8_t up, int8_t down);
 int AskEdgeDetect(const int *in, int *out, int len, int threshold);
 int demodIdteck(void);

From 0a9d2ca03df44bc63b32b2f2df632d292996aa9d Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 14 Apr 2019 07:41:25 +0200
Subject: [PATCH 1230/1938] lets see if cexpf can be removed now.

---
 client/ui.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/client/ui.c b/client/ui.c
index 2725fe093..fb976c56b 100644
--- a/client/ui.c
+++ b/client/ui.c
@@ -28,7 +28,15 @@ bool showDemod = true;
 pthread_mutex_t print_lock = PTHREAD_MUTEX_INITIALIZER;
 static const char *logfilename = "proxmark3.log";
 
-float complex cexpf(float complex Z);
+/*
+static float complex cexpf(float complex Z) {
+    float complex  Res;
+    double rho = exp(__real__ Z);
+    __real__ Res = rho * cosf(__imag__ Z);
+    __imag__ Res = rho * sinf(__imag__ Z);
+    return Res;
+}
+*/
 
 void PrintAndLogOptions(const char *str[][2], size_t size, size_t space) {
     char buff[2000] = "Options:\n";
@@ -268,10 +276,4 @@ void iceSimple_Filter(int *data, const size_t len, uint8_t k) {
     }
 }
 
-float complex cexpf(float complex Z) {
-    float complex  Res;
-    double rho = exp(__real__ Z);
-    __real__ Res = rho * cosf(__imag__ Z);
-    __imag__ Res = rho * sinf(__imag__ Z);
-    return Res;
-}
+

From 4763eb417a116e554c420a2cc9541d457226c9fb Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 14 Apr 2019 11:05:32 +0200
Subject: [PATCH 1231/1938] fix coverity warnings

---
 client/cmdlf.c       |  3 ---
 client/proxguiqt.cpp | 11 +++++------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/client/cmdlf.c b/client/cmdlf.c
index 9dfa16640..3243d60af 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -189,9 +189,6 @@ int CmdLFCommandRead(const char *Cmd) {
 int CmdFlexdemod(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
 
-    if (GraphTraceLen < 0)
-        return 0;
-
 #ifndef LONG_WAIT
 #define LONG_WAIT 100
 #endif
diff --git a/client/proxguiqt.cpp b/client/proxguiqt.cpp
index 2cf2d0200..e2ef546f6 100644
--- a/client/proxguiqt.cpp
+++ b/client/proxguiqt.cpp
@@ -276,9 +276,11 @@ QColor Plot::getColor(int graphNum) {
 
 void Plot::setMaxAndStart(int *buffer, size_t len, QRect plotRect) {
     if (len == 0) return;
-    startMax = (len - (int)((plotRect.right() - plotRect.left() - 40) / GraphPixelsPerPoint));
-    if (startMax < 0) {
-        startMax = 0;
+    startMax = 0;
+    if (plotRect.right() >= plotRect.left() + 40) {
+        uint32_t t = (plotRect.right() - plotRect.left() - 40) / GraphPixelsPerPoint;
+        if (len >= t)
+            startMax = len - t;
     }
     if (GraphStart > startMax) {
         GraphStart = startMax;
@@ -470,9 +472,6 @@ void Plot::paintEvent(QPaintEvent *event) {
 
     painter.setFont(QFont("Courier New", 10));
 
-    if (GraphStart < 0)
-        GraphStart = 0;
-
     if (CursorAPos > GraphTraceLen)
         CursorAPos = 0;
     if (CursorBPos > GraphTraceLen)

From e44fcb52d6bc09051ff24d6e344c275bbcdd7d5c Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 14 Apr 2019 11:07:35 +0200
Subject: [PATCH 1232/1938] fix: usart needs those pins. (@ryan)

---
 armsrc/fpgaloader.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/armsrc/fpgaloader.c b/armsrc/fpgaloader.c
index b70bad2e4..2474d7026 100644
--- a/armsrc/fpgaloader.c
+++ b/armsrc/fpgaloader.c
@@ -449,6 +449,9 @@ void FpgaWriteConfWord(uint8_t v) {
 // the samples from the ADC always flow through the FPGA.
 //-----------------------------------------------------------------------------
 void SetAdcMuxFor(uint32_t whichGpio) {
+
+#ifndef WITH_FPC
+    // When compiled without FPC support
     AT91C_BASE_PIOA->PIO_OER =
         GPIO_MUXSEL_HIPKD |
         GPIO_MUXSEL_LOPKD |
@@ -463,9 +466,15 @@ void SetAdcMuxFor(uint32_t whichGpio) {
 
     LOW(GPIO_MUXSEL_HIPKD);
     LOW(GPIO_MUXSEL_LOPKD);
-#ifndef WITH_FPC
     LOW(GPIO_MUXSEL_HIRAW);
     LOW(GPIO_MUXSEL_LORAW);
+        
+#else
+    // FPC serial uses HIRAW/LOWRAW pins, so they are excluded here.
+    AT91C_BASE_PIOA->PIO_OER = GPIO_MUXSEL_HIPKD | GPIO_MUXSEL_LOPKD;
+    AT91C_BASE_PIOA->PIO_PER = GPIO_MUXSEL_HIPKD | GPIO_MUXSEL_LOPKD;
+    LOW(GPIO_MUXSEL_HIPKD);
+    LOW(GPIO_MUXSEL_LOPKD);
 #endif
 
     HIGH(whichGpio);

From fc0a62de18c2bb58c7b2f0293c5949c913774af8 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 14 Apr 2019 11:08:44 +0200
Subject: [PATCH 1233/1938] Fix: USART - better RX/TX with one dma bank and
 wait loops (@ryan)

---
 common/usart.c | 70 +++++++++++++++++++++++++++++++++++++++++++++-----
 common/usart.h |  5 ++++
 2 files changed, 69 insertions(+), 6 deletions(-)

diff --git a/common/usart.c b/common/usart.c
index 8680d500a..cd657a2b1 100644
--- a/common/usart.c
+++ b/common/usart.c
@@ -42,7 +42,7 @@ void usart_close(void) {
 
 static uint8_t us_inbuf[sizeof(UsbCommand)];
 static uint8_t us_outbuf[sizeof(UsbCommand)];
-
+/*
 // transfer from client to device
 inline int16_t usart_readbuffer(uint8_t *data) {
     uint32_t rcr = pUS1->US_RCR;
@@ -58,6 +58,38 @@ inline int16_t usart_readbuffer(uint8_t *data) {
         return 0;
     }
 }
+*/
+
+uint8_t check = 0;
+inline int16_t usart_readbuffer(uint8_t *data) {
+	// Check if the first PDC bank is free
+    if (pUS1->US_RCR == 0) {
+        pUS1->US_RPR = (uint32_t)data;
+        pUS1->US_RCR = sizeof(UsbCommand);
+		pUS1->US_PTCR = AT91C_PDC_RXTEN | AT91C_PDC_TXTEN;
+		check = 0;
+        return 2;
+    } else {
+        return 0;
+    }
+}
+
+void usart_readcheck(uint8_t *data,size_t len) {
+	if (pUS1->US_RCR<len){
+		if (check == 0){
+			StartCountUS();
+			check = 1;
+		}
+		//300ms
+		if (GetCountUS() > 300000){ 
+			pUS1->US_RPR = (uint32_t)data;
+        	pUS1->US_RCR = len;
+			check = 0;
+		}
+	} else {
+		check = 0;
+	}
+}
 
 inline bool usart_dataavailable(void) {
     return pUS1->US_RCR < sizeof(us_inbuf);
@@ -66,14 +98,14 @@ inline bool usart_dataavailable(void) {
 inline int16_t usart_readcommand(uint8_t *data) {
     if (pUS1->US_RCR == 0)
         return usart_readbuffer(data);
-    else
+
         return 0;
 }
 
 inline bool usart_commandavailable(void) {
-    return pUS1->US_RCR == 0;
+    return (pUS1->US_RCR == 0);
 }
-
+/*
 // transfer from device to client
 inline int16_t usart_writebuffer(uint8_t *data, size_t len) {
 
@@ -90,6 +122,31 @@ inline int16_t usart_writebuffer(uint8_t *data, size_t len) {
         return 0;
     }
 }
+*/
+
+// transfer from device to client
+inline int16_t usart_writebuffer(uint8_t *data, size_t len) {
+	
+	while (pUS1->US_TCR && pUS1->US_TNCR) {};
+    
+    // Check if the first PDC bank is free
+    if (pUS1->US_TCR == 0) {
+		memcpy(us_outbuf, data, len);
+		pUS1->US_TPR = (uint32_t)us_outbuf;
+        pUS1->US_TCR = sizeof(us_outbuf);
+		pUS1->US_PTCR = AT91C_PDC_TXTEN | AT91C_PDC_RXTEN;
+    }
+    // Check if the second PDC bank is free
+    else if (pUS1->US_TNCR == 0) {
+		memcpy(us_outbuf, data, len);
+        pUS1->US_TNPR = (uint32_t)us_outbuf;
+        pUS1->US_TNCR = sizeof(us_outbuf);
+		pUS1->US_PTCR = AT91C_PDC_TXTEN | AT91C_PDC_RXTEN;
+    } 
+	//wait until finishing transfer 
+	while (pUS1->US_TCR && pUS1->US_TNCR) {};
+	return 0;
+}
 
 
 void usart_init(void) {
@@ -141,11 +198,12 @@ void usart_init(void) {
     pUS1->US_RNPR = (uint32_t)0;
     pUS1->US_RNCR = 0;
 
-
     // re-enable receiver / transmitter
     pUS1->US_CR = (AT91C_US_RXEN | AT91C_US_TXEN);
+    
     // ready to receive
     pUS1->US_RPR = (uint32_t)us_inbuf;
-    pUS1->US_RCR = sizeof(us_inbuf);
+	pUS1->US_RCR = 0;
+	pUS1->US_RNCR = 0;
     pUS1->US_PTCR = AT91C_PDC_RXTEN;
 }
diff --git a/common/usart.h b/common/usart.h
index f98424841..f01968055 100644
--- a/common/usart.h
+++ b/common/usart.h
@@ -3,6 +3,9 @@
 
 #include <stddef.h>
 #include "proxmark3.h"
+#include "../armsrc/ticks.h"  // startcountus
+
+#define AT91_BAUD_RATE 115200
 
 void usart_init(void);
 void usart_close(void);
@@ -11,5 +14,7 @@ int16_t usart_readbuffer(uint8_t *data);
 int16_t usart_writebuffer(uint8_t *data, size_t len);
 bool usart_dataavailable(void);
 int16_t usart_readcommand(uint8_t *data);
+void usart_readcheck(uint8_t *data,size_t len);
+
 bool usart_commandavailable(void);
 #endif

From dd404a67a10345d98caeb65b9d133a9f42ac0568 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 14 Apr 2019 11:09:31 +0200
Subject: [PATCH 1234/1938] Fix: USART - default speeds is lower (@ryan)

---
 client/proxmark3.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/client/proxmark3.c b/client/proxmark3.c
index 600d975e3..ffb8b295f 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -364,8 +364,13 @@ int main(int argc, char *argv[]) {
         }
     }
 
+    // default speed for USB 460800,  USART(FPC serial) 115200 baud
     if (speed == 0)
+#ifdef WITH_FPC
+        speed = 115200;
+#else
         speed = 460800;
+#endif
 
     // If the user passed the filename of the 'script' to execute, get it from last parameter
     if (lastarg) {

From 664434dfbac618d777306daa0719bf76992bcd43 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 14 Apr 2019 11:10:16 +0200
Subject: [PATCH 1235/1938] Fix: USART calls rx/tx

---
 armsrc/appmain.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index fd0d4cafc..223bd2155 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1136,7 +1136,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
             uint8_t my_rx[sizeof(UsbCommand)];
             while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
                 LED_B_INV();
-                if (usart_readbuffer(my_rx, sizeof(UsbCommand)) ) {
+                if (usart_readbuffer(my_rx) ) {
                     //UsbPacketReceived(my_rx, sizeof(my_rx));
 
                     UsbCommand *my = (UsbCommand *)my_rx;
@@ -1565,10 +1565,11 @@ void  __attribute__((noreturn)) AppMain(void) {
         }
 #ifdef WITH_FPC_HOST
         // Check if there is a FPC packet available
-        if (usart_readcommand(rx) > 0) {
+        if (usart_readbuffer(rx)) {
             reply_via_fpc = 1;
             UsbPacketReceived(rx, sizeof(rx));
         }
+		usart_readcheck(rx, sizeof(rx));
 #endif
 
         // Press button for one second to enter a possible standalone mode

From ab6d36fc8cd43217d3c4420527e78b6706265b7e Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 14 Apr 2019 11:11:08 +0200
Subject: [PATCH 1236/1938] textual

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 82ff79424..71f61eaf3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [unreleased][unreleased]
+ - Fix serial of FPC. (@ryan)
  - Fix 'data shiftgraphzero' corrupting end of GraphBuffer (@doegox)
  - Fix 'hf legic info' - unsegmented card now uses card size to calc remaining length (@iceman)
  - Add 36bit HID format, extend calcWiegand() to include oem bits ((@davidbeauchamp)

From 61a42df4f63e737ec73c9aab390e4731cdac0dd0 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 14 Apr 2019 11:11:42 +0200
Subject: [PATCH 1237/1938] textual

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 82ff79424..71f61eaf3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [unreleased][unreleased]
+ - Fix serial of FPC. (@ryan)
  - Fix 'data shiftgraphzero' corrupting end of GraphBuffer (@doegox)
  - Fix 'hf legic info' - unsegmented card now uses card size to calc remaining length (@iceman)
  - Add 36bit HID format, extend calcWiegand() to include oem bits ((@davidbeauchamp)

From e9db49be1e9d8ff3946ffabc6ac260146005faca Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 14 Apr 2019 11:13:31 +0200
Subject: [PATCH 1238/1938] chg: 'data rawdemod'  - enhanced command params

---
 client/cmddata.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/cmddata.c b/client/cmddata.c
index 0112565a7..1a38fc00f 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -1314,12 +1314,12 @@ static int CmdRawDemod(const char *Cmd) {
 
     str_lower((char *)Cmd);
 
-    if (str_startswith(Cmd, "fs"))     ans = CmdFSKrawdemod(Cmd + 2);
+	if (str_startswith(Cmd, "fs") || Cmd[0] == 'f' ) ans = CmdFSKrawdemod(Cmd+2);
     else if (str_startswith(Cmd, "ab")) ans = Cmdaskbiphdemod(Cmd + 2);
     else if (str_startswith(Cmd, "am")) ans = Cmdaskmandemod(Cmd + 2);
     else if (str_startswith(Cmd, "ar")) ans = Cmdaskrawdemod(Cmd + 2);
-    else if (str_startswith(Cmd, "nr")) ans = CmdNRZrawDemod(Cmd + 2);
-    else if (str_startswith(Cmd, "p1")) ans = CmdPSK1rawDemod(Cmd + 2);
+	else if (str_startswith(Cmd, "nr") || Cmd[0] == 'n') ans = CmdNRZrawDemod(Cmd+2);
+    else if (str_startswith(Cmd, "p1") || Cmd[0] == 'p') ans = CmdPSK1rawDemod(Cmd + 2);
     else if (str_startswith(Cmd, "p2")) ans = CmdPSK2rawDemod(Cmd + 2);
     else PrintAndLogEx(WARNING, "Unknown modulation entered - see help ('h') for parameter structure");
 

From b50fe594dac1aa1dc82ea95f0c40203917398991 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 14 Apr 2019 11:17:59 +0200
Subject: [PATCH 1239/1938] chg:  moved include..

---
 common/usart.c | 2 +-
 common/usart.h | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/common/usart.c b/common/usart.c
index cd657a2b1..d04ff7d4b 100644
--- a/common/usart.c
+++ b/common/usart.c
@@ -10,7 +10,7 @@
 //-----------------------------------------------------------------------------
 #include "usart.h"
 #include "string.h"
-#include "apps.h"  // for Dbprintf
+#include "../armsrc/ticks.h"  // startcountus
 
 #define AT91_BAUD_RATE 115200
 
diff --git a/common/usart.h b/common/usart.h
index f01968055..aed86db45 100644
--- a/common/usart.h
+++ b/common/usart.h
@@ -3,7 +3,6 @@
 
 #include <stddef.h>
 #include "proxmark3.h"
-#include "../armsrc/ticks.h"  // startcountus
 
 #define AT91_BAUD_RATE 115200
 

From d28fac3ef0cc812204a080638670bb6261baa662 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 14 Apr 2019 11:43:05 +0200
Subject: [PATCH 1240/1938] style

---
 armsrc/appmain.c    |   2 +-
 client/cmdanalyse.c | 200 ++++++++++++++++++++++----------------------
 client/cmddata.c    |   4 +-
 client/cmdhflegic.c |  62 +++++++-------
 client/cmdlffdx.c   |   2 +-
 client/proxmark3.c  |   8 +-
 client/util.c       |   2 +-
 common/usart.c      |  68 +++++++--------
 common/usart.h      |   2 +-
 9 files changed, 175 insertions(+), 175 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 223bd2155..2c16d8f56 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1569,7 +1569,7 @@ void  __attribute__((noreturn)) AppMain(void) {
             reply_via_fpc = 1;
             UsbPacketReceived(rx, sizeof(rx));
         }
-		usart_readcheck(rx, sizeof(rx));
+        usart_readcheck(rx, sizeof(rx));
 #endif
 
         // Press button for one second to enter a possible standalone mode
diff --git a/client/cmdanalyse.c b/client/cmdanalyse.c
index 7196134b1..2f669d7e5 100644
--- a/client/cmdanalyse.c
+++ b/client/cmdanalyse.c
@@ -528,67 +528,67 @@ static int CmdAnalyseA(const char *Cmd) {
     }
     PrintAndLogEx(NORMAL, "got ack.  Status %d", resp.arg[0]);
     return 0;
-/*
-    PrintAndLogEx(NORMAL, "-- " _BLUE_("its my message") "\n");
-    PrintAndLogEx(NORMAL, "-- " _RED_("its my message") "\n");
-    PrintAndLogEx(NORMAL, "-- " _YELLOW_("its my message") "\n");
-    PrintAndLogEx(NORMAL, "-- " _GREEN_("its my message") "\n");
+    /*
+        PrintAndLogEx(NORMAL, "-- " _BLUE_("its my message") "\n");
+        PrintAndLogEx(NORMAL, "-- " _RED_("its my message") "\n");
+        PrintAndLogEx(NORMAL, "-- " _YELLOW_("its my message") "\n");
+        PrintAndLogEx(NORMAL, "-- " _GREEN_("its my message") "\n");
 
-    //uint8_t syncBit = 99;
-    // The start bit is one ore more Sequence Y followed by a Sequence Z (... 11111111 00x11111). We need to distinguish from
-    // Sequence X followed by Sequence Y followed by Sequence Z     (111100x1 11111111 00x11111)
-    // we therefore look for a ...xx1111 11111111 00x11111xxxxxx... pattern
-    // (12 '1's followed by 2 '0's, eventually followed by another '0', followed by 5 '1's)
-# define SYNC_16BIT 0xB24D
-    uint32_t shiftReg = param_get32ex(Cmd, 0, 0xb24d, 16);
-    uint8_t bt = param_get8ex(Cmd, 1, 0xBB, 16);
-    uint8_t byte_offset = 99;
-    // reverse byte
-    uint8_t rev =  reflect8(bt);
-    PrintAndLogEx(NORMAL, "input  %02x | %02x \n", bt, rev);
-    // add byte to shift register
-    shiftReg = shiftReg << 8 | rev;
+        //uint8_t syncBit = 99;
+        // The start bit is one ore more Sequence Y followed by a Sequence Z (... 11111111 00x11111). We need to distinguish from
+        // Sequence X followed by Sequence Y followed by Sequence Z     (111100x1 11111111 00x11111)
+        // we therefore look for a ...xx1111 11111111 00x11111xxxxxx... pattern
+        // (12 '1's followed by 2 '0's, eventually followed by another '0', followed by 5 '1's)
+    # define SYNC_16BIT 0xB24D
+        uint32_t shiftReg = param_get32ex(Cmd, 0, 0xb24d, 16);
+        uint8_t bt = param_get8ex(Cmd, 1, 0xBB, 16);
+        uint8_t byte_offset = 99;
+        // reverse byte
+        uint8_t rev =  reflect8(bt);
+        PrintAndLogEx(NORMAL, "input  %02x | %02x \n", bt, rev);
+        // add byte to shift register
+        shiftReg = shiftReg << 8 | rev;
 
-    PrintAndLogEx(NORMAL, "shiftreg after %08x | pattern %08x \n", shiftReg, SYNC_16BIT);
+        PrintAndLogEx(NORMAL, "shiftreg after %08x | pattern %08x \n", shiftReg, SYNC_16BIT);
 
-    uint8_t n0 = 0, n1 = 0;
+        uint8_t n0 = 0, n1 = 0;
 
-    n0 = (rev & (uint8_t)(~(0xFF >> (8 - 4)))) >> 4;
-    n1 = (n1 << 4) | (rev & (uint8_t)(~(0xFF << 4)));
+        n0 = (rev & (uint8_t)(~(0xFF >> (8 - 4)))) >> 4;
+        n1 = (n1 << 4) | (rev & (uint8_t)(~(0xFF << 4)));
 
-    PrintAndLogEx(NORMAL, "rev %02X | %02X %s | %02X %s |\n", rev, n0, pb(n0), n1, pb(n1));
-*/
+        PrintAndLogEx(NORMAL, "rev %02X | %02X %s | %02X %s |\n", rev, n0, pb(n0), n1, pb(n1));
+    */
     /*
     hex(0xb24d shr 0) 0xB24D 0b1011001001001101
     hex(0xb24d shr 1) 0x5926
     hex(0xb24d shr 2) 0x2C93
     */
 
-/*    
-    for (int i = 0; i < 16; i++) {
-        PrintAndLogEx(NORMAL, " (shiftReg >> %d) & 0xFFFF ==  %08x ---", i, ((shiftReg >> i) & 0xFFFF));
+    /*
+        for (int i = 0; i < 16; i++) {
+            PrintAndLogEx(NORMAL, " (shiftReg >> %d) & 0xFFFF ==  %08x ---", i, ((shiftReg >> i) & 0xFFFF));
 
-        // kolla om SYNC_PATTERN finns.
-        if (((shiftReg >> 7) & 0xFFFF) == SYNC_16BIT) byte_offset = 7;
-        else if (((shiftReg >> 6) & 0xFFFF) == SYNC_16BIT) byte_offset = 6;
-        else if (((shiftReg >> 5) & 0xFFFF) == SYNC_16BIT) byte_offset = 5;
-        else if (((shiftReg >> 4) & 0xFFFF) == SYNC_16BIT) byte_offset = 4;
-        else if (((shiftReg >> 3) & 0xFFFF) == SYNC_16BIT) byte_offset = 3;
-        else if (((shiftReg >> 2) & 0xFFFF) == SYNC_16BIT) byte_offset = 2;
-        else if (((shiftReg >> 1) & 0xFFFF) == SYNC_16BIT) byte_offset = 1;
-        else if (((shiftReg >> 0) & 0xFFFF) == SYNC_16BIT) byte_offset = 0;
+            // kolla om SYNC_PATTERN finns.
+            if (((shiftReg >> 7) & 0xFFFF) == SYNC_16BIT) byte_offset = 7;
+            else if (((shiftReg >> 6) & 0xFFFF) == SYNC_16BIT) byte_offset = 6;
+            else if (((shiftReg >> 5) & 0xFFFF) == SYNC_16BIT) byte_offset = 5;
+            else if (((shiftReg >> 4) & 0xFFFF) == SYNC_16BIT) byte_offset = 4;
+            else if (((shiftReg >> 3) & 0xFFFF) == SYNC_16BIT) byte_offset = 3;
+            else if (((shiftReg >> 2) & 0xFFFF) == SYNC_16BIT) byte_offset = 2;
+            else if (((shiftReg >> 1) & 0xFFFF) == SYNC_16BIT) byte_offset = 1;
+            else if (((shiftReg >> 0) & 0xFFFF) == SYNC_16BIT) byte_offset = 0;
 
-        PrintAndLogEx(NORMAL, "Offset  %u \n", byte_offset);
-        if (byte_offset != 99)
-            break;
+            PrintAndLogEx(NORMAL, "Offset  %u \n", byte_offset);
+            if (byte_offset != 99)
+                break;
 
-        shiftReg >>= 1;
-    }
+            shiftReg >>= 1;
+        }
 
-    uint8_t p1 = (rev & (uint8_t)(~(0xFF << byte_offset)));
-    PrintAndLogEx(NORMAL, "Offset  %u  | leftovers  %02x  %s \n", byte_offset, p1, pb(p1));
+        uint8_t p1 = (rev & (uint8_t)(~(0xFF << byte_offset)));
+        PrintAndLogEx(NORMAL, "Offset  %u  | leftovers  %02x  %s \n", byte_offset, p1, pb(p1));
 
-*/
+    */
 
     /*
     pm3 --> da hex2bin 4db2     0100110110110010
@@ -621,39 +621,39 @@ static int CmdAnalyseA(const char *Cmd) {
         */
 //    return 0;
 
-/*
-    // 14443-A
-    uint8_t u14_c[] = {0x09, 0x78, 0x00, 0x92, 0x02, 0x54, 0x13, 0x02, 0x04, 0x2d, 0xe8 }; // atqs w crc
-    uint8_t u14_w[] = {0x09, 0x78, 0x00, 0x92, 0x02, 0x54, 0x13, 0x02, 0x04, 0x2d, 0xe7 }; // atqs w crc
-    PrintAndLogEx(FAILED, "14a check wrong crc      | %s\n", (check_crc(CRC_14443_A, u14_w, sizeof(u14_w))) ? "YES" : "NO");
-    PrintAndLogEx(SUCCESS, "14a check correct crc    | %s\n", (check_crc(CRC_14443_A, u14_c, sizeof(u14_c))) ? "YES" : "NO");
+    /*
+        // 14443-A
+        uint8_t u14_c[] = {0x09, 0x78, 0x00, 0x92, 0x02, 0x54, 0x13, 0x02, 0x04, 0x2d, 0xe8 }; // atqs w crc
+        uint8_t u14_w[] = {0x09, 0x78, 0x00, 0x92, 0x02, 0x54, 0x13, 0x02, 0x04, 0x2d, 0xe7 }; // atqs w crc
+        PrintAndLogEx(FAILED, "14a check wrong crc      | %s\n", (check_crc(CRC_14443_A, u14_w, sizeof(u14_w))) ? "YES" : "NO");
+        PrintAndLogEx(SUCCESS, "14a check correct crc    | %s\n", (check_crc(CRC_14443_A, u14_c, sizeof(u14_c))) ? "YES" : "NO");
 
-    // 14443-B
-    uint8_t u14b[] = {0x05, 0x00, 0x08, 0x39, 0x73};
-    PrintAndLogEx(NORMAL, "14b check crc            | %s\n", (check_crc(CRC_14443_B, u14b, sizeof(u14b))) ? "YES" : "NO");
+        // 14443-B
+        uint8_t u14b[] = {0x05, 0x00, 0x08, 0x39, 0x73};
+        PrintAndLogEx(NORMAL, "14b check crc            | %s\n", (check_crc(CRC_14443_B, u14b, sizeof(u14b))) ? "YES" : "NO");
 
-    // 15693 test
-    uint8_t u15_c[] = {0x05, 0x00, 0x08, 0x39, 0x73}; // correct
-    uint8_t u15_w[] = {0x05, 0x00, 0x08, 0x39, 0x72}; // wrong
-    PrintAndLogEx(FAILED, "15 check wrong crc       | %s\n", (check_crc(CRC_15693, u15_w, sizeof(u15_w))) ? "YES" : "NO");
-    PrintAndLogEx(SUCCESS, "15 check correct crc     | %s\n", (check_crc(CRC_15693, u15_c, sizeof(u15_c))) ? "YES" : "NO");
+        // 15693 test
+        uint8_t u15_c[] = {0x05, 0x00, 0x08, 0x39, 0x73}; // correct
+        uint8_t u15_w[] = {0x05, 0x00, 0x08, 0x39, 0x72}; // wrong
+        PrintAndLogEx(FAILED, "15 check wrong crc       | %s\n", (check_crc(CRC_15693, u15_w, sizeof(u15_w))) ? "YES" : "NO");
+        PrintAndLogEx(SUCCESS, "15 check correct crc     | %s\n", (check_crc(CRC_15693, u15_c, sizeof(u15_c))) ? "YES" : "NO");
 
-    // iCLASS test - wrong crc , swapped bytes.
-    uint8_t iclass_w[] = { 0x40, 0xe1, 0xe1, 0xff, 0xfe, 0x5f, 0x02, 0x3c, 0x01, 0x43};
-    uint8_t iclass_c[] = { 0x40, 0xe1, 0xe1, 0xff, 0xfe, 0x5f, 0x02, 0x3c, 0x43, 0x01};
-    PrintAndLogEx(FAILED, "iCLASS check wrong crc   | %s\n", (check_crc(CRC_ICLASS, iclass_w, sizeof(iclass_w))) ? "YES" : "NO");
-    PrintAndLogEx(SUCCESS, "iCLASS check correct crc | %s\n", (check_crc(CRC_ICLASS, iclass_c, sizeof(iclass_c))) ? "YES" : "NO");
+        // iCLASS test - wrong crc , swapped bytes.
+        uint8_t iclass_w[] = { 0x40, 0xe1, 0xe1, 0xff, 0xfe, 0x5f, 0x02, 0x3c, 0x01, 0x43};
+        uint8_t iclass_c[] = { 0x40, 0xe1, 0xe1, 0xff, 0xfe, 0x5f, 0x02, 0x3c, 0x43, 0x01};
+        PrintAndLogEx(FAILED, "iCLASS check wrong crc   | %s\n", (check_crc(CRC_ICLASS, iclass_w, sizeof(iclass_w))) ? "YES" : "NO");
+        PrintAndLogEx(SUCCESS, "iCLASS check correct crc | %s\n", (check_crc(CRC_ICLASS, iclass_c, sizeof(iclass_c))) ? "YES" : "NO");
 
-    // FeliCa test
-    uint8_t felica_w[] = {0x12, 0x01, 0x01, 0x2e, 0x3d, 0x17, 0x26, 0x47, 0x80, 0x95, 0x00, 0xf1, 0x00, 0x00, 0x00, 0x01, 0x43, 0x00, 0xb3, 0x7e};
-    uint8_t felica_c[] = {0x12, 0x01, 0x01, 0x2e, 0x3d, 0x17, 0x26, 0x47, 0x80, 0x95, 0x00, 0xf1, 0x00, 0x00, 0x00, 0x01, 0x43, 0x00, 0xb3, 0x7f};
-    PrintAndLogEx(FAILED, "FeliCa check wrong crc   | %s\n", (check_crc(CRC_FELICA, felica_w, sizeof(felica_w))) ? "YES" : "NO");
-    PrintAndLogEx(SUCCESS, "FeliCa check correct crc | %s\n", (check_crc(CRC_FELICA, felica_c, sizeof(felica_c))) ? "YES" : "NO");
+        // FeliCa test
+        uint8_t felica_w[] = {0x12, 0x01, 0x01, 0x2e, 0x3d, 0x17, 0x26, 0x47, 0x80, 0x95, 0x00, 0xf1, 0x00, 0x00, 0x00, 0x01, 0x43, 0x00, 0xb3, 0x7e};
+        uint8_t felica_c[] = {0x12, 0x01, 0x01, 0x2e, 0x3d, 0x17, 0x26, 0x47, 0x80, 0x95, 0x00, 0xf1, 0x00, 0x00, 0x00, 0x01, 0x43, 0x00, 0xb3, 0x7f};
+        PrintAndLogEx(FAILED, "FeliCa check wrong crc   | %s\n", (check_crc(CRC_FELICA, felica_w, sizeof(felica_w))) ? "YES" : "NO");
+        PrintAndLogEx(SUCCESS, "FeliCa check correct crc | %s\n", (check_crc(CRC_FELICA, felica_c, sizeof(felica_c))) ? "YES" : "NO");
 
-    PrintAndLogEx(NORMAL, "\n\n");
+        PrintAndLogEx(NORMAL, "\n\n");
 
-    return 0;
-    */
+        return 0;
+        */
     /*
     bool term = !isatty(STDIN_FILENO);
     if (!term) {
@@ -697,37 +697,37 @@ static int CmdAnalyseA(const char *Cmd) {
     uid(3e172b29) nt(039b7bd2) ks(0c0e0f0505080800) nr(00000001)
     uid(3e172b29) nt(039b7bd2) ks(0e06090d03000b0f) nr(00000002)
     */
-/*    
-    uint64_t *keylistA = NULL, *keylistB = NULL;
-    uint32_t keycountA = 0, keycountB = 0;
-//  uint64_t d1[] = {0x3e172b29, 0x039b7bd2, 0x0000001, 0, 0x0c0e0f0505080800};
-//  uint64_t d2[] = {0x3e172b29, 0x039b7bd2, 0x0000002, 0, 0x0e06090d03000b0f};
-    uint64_t d1[] = {0x6e442129, 0x8f699195, 0x0000001, 0, 0x090d0b0305020f02};
-    uint64_t d2[] = {0x6e442129, 0x8f699195, 0x0000004, 0, 0x00040f0f0305030e};
+    /*
+        uint64_t *keylistA = NULL, *keylistB = NULL;
+        uint32_t keycountA = 0, keycountB = 0;
+    //  uint64_t d1[] = {0x3e172b29, 0x039b7bd2, 0x0000001, 0, 0x0c0e0f0505080800};
+    //  uint64_t d2[] = {0x3e172b29, 0x039b7bd2, 0x0000002, 0, 0x0e06090d03000b0f};
+        uint64_t d1[] = {0x6e442129, 0x8f699195, 0x0000001, 0, 0x090d0b0305020f02};
+        uint64_t d2[] = {0x6e442129, 0x8f699195, 0x0000004, 0, 0x00040f0f0305030e};
 
-    keycountA = nonce2key(d1[0], d1[1], d1[2], 0, d1[3], d1[4], &keylistA);
-    keycountB = nonce2key(d2[0], d2[1], d2[2], 0, d2[3], d2[4], &keylistB);
+        keycountA = nonce2key(d1[0], d1[1], d1[2], 0, d1[3], d1[4], &keylistA);
+        keycountB = nonce2key(d2[0], d2[1], d2[2], 0, d2[3], d2[4], &keylistB);
 
-    switch (keycountA) {
-        case 0:
-            PrintAndLogEx(FAILED, "Key test A failed\n");
-            break;
-        case 1:
-            PrintAndLogEx(SUCCESS, "KEY A | %012" PRIX64 " ", keylistA[0]);
-            break;
-    }
-    switch (keycountB) {
-        case 0:
-            PrintAndLogEx(FAILED, "Key test B failed\n");
-            break;
-        case 1:
-            PrintAndLogEx(SUCCESS, "KEY B | %012" PRIX64 " ", keylistB[0]);
-            break;
-    }
+        switch (keycountA) {
+            case 0:
+                PrintAndLogEx(FAILED, "Key test A failed\n");
+                break;
+            case 1:
+                PrintAndLogEx(SUCCESS, "KEY A | %012" PRIX64 " ", keylistA[0]);
+                break;
+        }
+        switch (keycountB) {
+            case 0:
+                PrintAndLogEx(FAILED, "Key test B failed\n");
+                break;
+            case 1:
+                PrintAndLogEx(SUCCESS, "KEY B | %012" PRIX64 " ", keylistB[0]);
+                break;
+        }
 
-    free(keylistA);
-    free(keylistB);
-*/
+        free(keylistA);
+        free(keylistB);
+    */
 //  qsort(keylist, keycount, sizeof(*keylist), compare_uint64);
 //  keycount = intersection(last_keylist, keylist);
 
diff --git a/client/cmddata.c b/client/cmddata.c
index 1a38fc00f..e8c33c70c 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -1314,11 +1314,11 @@ static int CmdRawDemod(const char *Cmd) {
 
     str_lower((char *)Cmd);
 
-	if (str_startswith(Cmd, "fs") || Cmd[0] == 'f' ) ans = CmdFSKrawdemod(Cmd+2);
+    if (str_startswith(Cmd, "fs") || Cmd[0] == 'f') ans = CmdFSKrawdemod(Cmd + 2);
     else if (str_startswith(Cmd, "ab")) ans = Cmdaskbiphdemod(Cmd + 2);
     else if (str_startswith(Cmd, "am")) ans = Cmdaskmandemod(Cmd + 2);
     else if (str_startswith(Cmd, "ar")) ans = Cmdaskrawdemod(Cmd + 2);
-	else if (str_startswith(Cmd, "nr") || Cmd[0] == 'n') ans = CmdNRZrawDemod(Cmd+2);
+    else if (str_startswith(Cmd, "nr") || Cmd[0] == 'n') ans = CmdNRZrawDemod(Cmd + 2);
     else if (str_startswith(Cmd, "p1") || Cmd[0] == 'p') ans = CmdPSK1rawDemod(Cmd + 2);
     else if (str_startswith(Cmd, "p2")) ans = CmdPSK2rawDemod(Cmd + 2);
     else PrintAndLogEx(WARNING, "Unknown modulation entered - see help ('h') for parameter structure");
diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index 238f81641..0da3daaaa 100644
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -200,7 +200,7 @@ static int CmdLegicInfo(const char *Cmd) {
     crc = data[4];
     uint32_t calc_crc =  CRC8Legic(data, 4);
 
-    PrintAndLogEx(NORMAL, _YELLOW_("CDF: System Area") );
+    PrintAndLogEx(NORMAL, _YELLOW_("CDF: System Area"));
     PrintAndLogEx(NORMAL, "------------------------------------------------------");
     PrintAndLogEx(NORMAL, "MCD: %02x, MSN: %02x %02x %02x, MCC: %02x %s",
                   data[0],
@@ -304,7 +304,7 @@ static int CmdLegicInfo(const char *Cmd) {
         }
     }
     PrintAndLogEx(NORMAL, "------------------------------------------------------");
-        
+
     uint8_t segCrcBytes[8] = {0, 0, 0, 0, 0, 0, 0, 0};
     uint32_t segCalcCRC = 0;
     uint32_t segCRC = 0;
@@ -313,7 +313,7 @@ static int CmdLegicInfo(const char *Cmd) {
     if (dcf > 60000)
         goto out;
 
-    PrintAndLogEx(NORMAL, _YELLOW_("\nADF: User Area") );
+    PrintAndLogEx(NORMAL, _YELLOW_("\nADF: User Area"));
     PrintAndLogEx(NORMAL, "------------------------------------------------------");
 
     if (bIsSegmented) {
@@ -348,24 +348,24 @@ static int CmdLegicInfo(const char *Cmd) {
 
             PrintAndLogEx(NORMAL, "Segment     | %02u ", segmentNum);
             PrintAndLogEx(NORMAL, "raw header  | 0x%02X 0x%02X 0x%02X 0x%02X",
-                    data[i] ^ crc,
-                    data[i + 1] ^ crc,
-                    data[i + 2] ^ crc,
-                    data[i + 3] ^ crc
-                    );
+                          data[i] ^ crc,
+                          data[i + 1] ^ crc,
+                          data[i + 2] ^ crc,
+                          data[i + 3] ^ crc
+                         );
             PrintAndLogEx(NORMAL, "Segment len | %u,  Flag: 0x%X (valid:%01u, last:%01u)",
-                    segment_len,
-                    segment_flag,
-                    (segment_flag & 0x4) >> 2,
-                    (segment_flag & 0x8) >> 3
-                    );
+                          segment_len,
+                          segment_flag,
+                          (segment_flag & 0x4) >> 2,
+                          (segment_flag & 0x8) >> 3
+                         );
             PrintAndLogEx(NORMAL, "            | WRP: %02u, WRC: %02u, RD: %01u, CRC: 0x%02X (%s)",
-                    wrp,
-                    wrc,
-                    ((data[i + 3] ^ crc) & 0x80) >> 7,
-                    segCRC,
-                    (segCRC == segCalcCRC) ? _GREEN_("OK") : _RED_("Fail")
-                    );
+                          wrp,
+                          wrc,
+                          ((data[i + 3] ^ crc) & 0x80) >> 7,
+                          segCRC,
+                          (segCRC == segCalcCRC) ? _GREEN_("OK") : _RED_("Fail")
+                         );
 
             i += 5;
 
@@ -397,13 +397,13 @@ static int CmdLegicInfo(const char *Cmd) {
                 // does this one work? (Answer: Only if KGH/BGH is used with BCD encoded card number! So maybe this will show just garbage...)
                 if (wrp_len == 8) {
                     PrintAndLogEx(NORMAL, "Card ID: " _YELLOW_("%2X%02X%02X"),
-                        data[i - 4] ^ crc,
-                        data[i - 3] ^ crc,
-                        data[i - 2] ^ crc
-                        );
+                                  data[i - 4] ^ crc,
+                                  data[i - 3] ^ crc,
+                                  data[i - 2] ^ crc
+                                 );
                 }
             }
-            if (remain_seg_payload_len > 0 ) {
+            if (remain_seg_payload_len > 0) {
                 PrintAndLogEx(NORMAL, "Remaining segment payload:  (I %d | K %d | Remain LEN %d)", i, k, remain_seg_payload_len);
                 PrintAndLogEx(NORMAL, "\nrow  | data");
                 PrintAndLogEx(NORMAL, "-----+------------------------------------------------");
@@ -445,7 +445,7 @@ static int CmdLegicInfo(const char *Cmd) {
             PrintAndLogEx(NORMAL, "\nrow  | data");
             PrintAndLogEx(NORMAL, "-----+------------------------------------------------");
             print_hex_break(data + i, wrc, 16);
-            PrintAndLogEx(NORMAL, "-----+------------------------------------------------\n");            
+            PrintAndLogEx(NORMAL, "-----+------------------------------------------------\n");
             i += wrc;
         }
 
@@ -461,19 +461,19 @@ static int CmdLegicInfo(const char *Cmd) {
             // A: Only if KGH/BGH is used with BCD encoded card number. Maybe this will show just garbage
             if (wrp_len == 8) {
                 PrintAndLogEx(NORMAL, "Card ID: " _YELLOW_("%2X%02X%02X"),
-                    data[i - 4],
-                    data[i - 3],
-                    data[i - 2]
-                    );
+                              data[i - 4],
+                              data[i - 3],
+                              data[i - 2]
+                             );
             }
         }
 
-        if ( remain_seg_payload_len > 0 ) {
+        if (remain_seg_payload_len > 0) {
             PrintAndLogEx(NORMAL, "Remaining segment payload:  (I %d | Remain LEN %d)", i, remain_seg_payload_len);
             PrintAndLogEx(NORMAL, "\nrow  | data");
             PrintAndLogEx(NORMAL, "-----+------------------------------------------------");
             print_hex_break(data + i, remain_seg_payload_len, 16);
-            PrintAndLogEx(NORMAL, "-----+------------------------------------------------\n");            
+            PrintAndLogEx(NORMAL, "-----+------------------------------------------------\n");
         }
     }
 
diff --git a/client/cmdlffdx.c b/client/cmdlffdx.c
index 027f12895..e09caca9d 100644
--- a/client/cmdlffdx.c
+++ b/client/cmdlffdx.c
@@ -226,7 +226,7 @@ static int CmdFdxDemod(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "Reserved/RFU       %u (0x04%X)", reservedCode,  reservedCode);
     PrintAndLogEx(SUCCESS, "Animal Tag         %s", animalBit ? _YELLOW_("True") : "False");
     PrintAndLogEx(SUCCESS, "Has extended data  %s [0x%X]", dataBlockBit ? _YELLOW_("True") : "False", extended);
-    PrintAndLogEx(SUCCESS, "CRC-16             0x%04X - 0x%04X [%s]", crc_16, calcCrc, (calcCrc == crc_16) ? _GREEN_("Ok") : _RED_("Fail") );
+    PrintAndLogEx(SUCCESS, "CRC-16             0x%04X - 0x%04X [%s]", crc_16, calcCrc, (calcCrc == crc_16) ? _GREEN_("Ok") : _RED_("Fail"));
 
     if (g_debugMode) {
         PrintAndLogEx(DEBUG, "Start marker %d;   Size %d", preambleIndex, size);
diff --git a/client/proxmark3.c b/client/proxmark3.c
index ffb8b295f..aed464d50 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -223,9 +223,9 @@ const char *get_my_executable_directory(void) {
 
 static void set_my_executable_path(void) {
     int path_length = wai_getExecutablePath(NULL, 0, NULL);
-    if (path_length == -1) 
+    if (path_length == -1)
         return;
-        
+
     my_executable_path = (char *)calloc(path_length + 1, sizeof(uint8_t));
     int dirname_length = 0;
     if (wai_getExecutablePath(my_executable_path, path_length, &dirname_length) != -1) {
@@ -287,8 +287,8 @@ int main(int argc, char *argv[]) {
 
 #if defined(_WIN32)
         for (int m = strlen(argv[0]); m > 0; m--) {
-            if ( argv[0][m] == '\\' ) {
-                show_help(true, argv[0] + (++m) );
+            if (argv[0][m] == '\\') {
+                show_help(true, argv[0] + (++m));
                 break;
             }
         }
diff --git a/client/util.c b/client/util.c
index 05e9d700c..b14023067 100644
--- a/client/util.c
+++ b/client/util.c
@@ -9,7 +9,7 @@
 //-----------------------------------------------------------------------------
 
 // ensure gmtime_r is available even with -std=c99; must be included before
- #if !defined(_WIN32)
+#if !defined(_WIN32)
 #define _POSIX_C_SOURCE 200112L
 #endif
 
diff --git a/common/usart.c b/common/usart.c
index d04ff7d4b..1a46b93c4 100644
--- a/common/usart.c
+++ b/common/usart.c
@@ -62,33 +62,33 @@ inline int16_t usart_readbuffer(uint8_t *data) {
 
 uint8_t check = 0;
 inline int16_t usart_readbuffer(uint8_t *data) {
-	// Check if the first PDC bank is free
+    // Check if the first PDC bank is free
     if (pUS1->US_RCR == 0) {
         pUS1->US_RPR = (uint32_t)data;
         pUS1->US_RCR = sizeof(UsbCommand);
-		pUS1->US_PTCR = AT91C_PDC_RXTEN | AT91C_PDC_TXTEN;
-		check = 0;
+        pUS1->US_PTCR = AT91C_PDC_RXTEN | AT91C_PDC_TXTEN;
+        check = 0;
         return 2;
     } else {
         return 0;
     }
 }
 
-void usart_readcheck(uint8_t *data,size_t len) {
-	if (pUS1->US_RCR<len){
-		if (check == 0){
-			StartCountUS();
-			check = 1;
-		}
-		//300ms
-		if (GetCountUS() > 300000){ 
-			pUS1->US_RPR = (uint32_t)data;
-        	pUS1->US_RCR = len;
-			check = 0;
-		}
-	} else {
-		check = 0;
-	}
+void usart_readcheck(uint8_t *data, size_t len) {
+    if (pUS1->US_RCR < len) {
+        if (check == 0) {
+            StartCountUS();
+            check = 1;
+        }
+        //300ms
+        if (GetCountUS() > 300000) {
+            pUS1->US_RPR = (uint32_t)data;
+            pUS1->US_RCR = len;
+            check = 0;
+        }
+    } else {
+        check = 0;
+    }
 }
 
 inline bool usart_dataavailable(void) {
@@ -99,7 +99,7 @@ inline int16_t usart_readcommand(uint8_t *data) {
     if (pUS1->US_RCR == 0)
         return usart_readbuffer(data);
 
-        return 0;
+    return 0;
 }
 
 inline bool usart_commandavailable(void) {
@@ -126,26 +126,26 @@ inline int16_t usart_writebuffer(uint8_t *data, size_t len) {
 
 // transfer from device to client
 inline int16_t usart_writebuffer(uint8_t *data, size_t len) {
-	
-	while (pUS1->US_TCR && pUS1->US_TNCR) {};
-    
+
+    while (pUS1->US_TCR && pUS1->US_TNCR) {};
+
     // Check if the first PDC bank is free
     if (pUS1->US_TCR == 0) {
-		memcpy(us_outbuf, data, len);
-		pUS1->US_TPR = (uint32_t)us_outbuf;
+        memcpy(us_outbuf, data, len);
+        pUS1->US_TPR = (uint32_t)us_outbuf;
         pUS1->US_TCR = sizeof(us_outbuf);
-		pUS1->US_PTCR = AT91C_PDC_TXTEN | AT91C_PDC_RXTEN;
+        pUS1->US_PTCR = AT91C_PDC_TXTEN | AT91C_PDC_RXTEN;
     }
     // Check if the second PDC bank is free
     else if (pUS1->US_TNCR == 0) {
-		memcpy(us_outbuf, data, len);
+        memcpy(us_outbuf, data, len);
         pUS1->US_TNPR = (uint32_t)us_outbuf;
         pUS1->US_TNCR = sizeof(us_outbuf);
-		pUS1->US_PTCR = AT91C_PDC_TXTEN | AT91C_PDC_RXTEN;
-    } 
-	//wait until finishing transfer 
-	while (pUS1->US_TCR && pUS1->US_TNCR) {};
-	return 0;
+        pUS1->US_PTCR = AT91C_PDC_TXTEN | AT91C_PDC_RXTEN;
+    }
+    //wait until finishing transfer
+    while (pUS1->US_TCR && pUS1->US_TNCR) {};
+    return 0;
 }
 
 
@@ -200,10 +200,10 @@ void usart_init(void) {
 
     // re-enable receiver / transmitter
     pUS1->US_CR = (AT91C_US_RXEN | AT91C_US_TXEN);
-    
+
     // ready to receive
     pUS1->US_RPR = (uint32_t)us_inbuf;
-	pUS1->US_RCR = 0;
-	pUS1->US_RNCR = 0;
+    pUS1->US_RCR = 0;
+    pUS1->US_RNCR = 0;
     pUS1->US_PTCR = AT91C_PDC_RXTEN;
 }
diff --git a/common/usart.h b/common/usart.h
index aed86db45..9200d8731 100644
--- a/common/usart.h
+++ b/common/usart.h
@@ -13,7 +13,7 @@ int16_t usart_readbuffer(uint8_t *data);
 int16_t usart_writebuffer(uint8_t *data, size_t len);
 bool usart_dataavailable(void);
 int16_t usart_readcommand(uint8_t *data);
-void usart_readcheck(uint8_t *data,size_t len);
+void usart_readcheck(uint8_t *data, size_t len);
 
 bool usart_commandavailable(void);
 #endif

From e708d863065a524ec0d7fffe11cae6487d20b82c Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 14 Apr 2019 12:54:13 +0200
Subject: [PATCH 1241/1938] Rework command line options

---
 client/comms.c     |   4 +-
 client/proxmark3.c | 205 ++++++++++++++++++++++++++++-----------------
 2 files changed, 129 insertions(+), 80 deletions(-)

diff --git a/client/comms.c b/client/comms.c
index afa79c38c..a2bf8deed 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -318,12 +318,12 @@ bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode,
 
     // check result of uart opening
     if (sp == INVALID_SERIAL_PORT) {
-        PrintAndLogEx(WARNING, _RED_("ERROR:") "invalid serial port");
+        PrintAndLogEx(WARNING, _RED_("ERROR:") "invalid serial port " _YELLOW_("%s"), portname);
         sp = NULL;
         serial_port_name = NULL;
         return false;
     } else if (sp == CLAIMED_SERIAL_PORT) {
-        PrintAndLogEx(WARNING, _RED_("ERROR:") "serial port is claimed by another process");
+        PrintAndLogEx(WARNING, _RED_("ERROR:") "serial port " _YELLOW_("%s") " is claimed by another process", portname);
         sp = NULL;
         serial_port_name = NULL;
         return false;
diff --git a/client/proxmark3.c b/client/proxmark3.c
index aed464d50..1fc60ef10 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -83,6 +83,8 @@ main_loop(char *script_cmds_file, char *script_cmd, bool usb_present) {
         sf = fopen(script_cmds_file, "r");
         if (sf)
             PrintAndLogEx(SUCCESS, "executing commands from file: %s\n", script_cmds_file);
+        else
+            PrintAndLogEx(ERR, "could not open %s...", script_cmds_file);
     }
 
     read_history(".history");
@@ -237,18 +239,23 @@ static void set_my_executable_path(void) {
 }
 
 static void show_help(bool showFullHelp, char *command_line) {
+
     PrintAndLogEx(NORMAL, "");
-    PrintAndLogEx(NORMAL, "syntax: %s <port> [ -h -m -f -w ] [-c <command>] [-l <lua_script_file>] [<cmd_script_file_name]\n", command_line);
+    PrintAndLogEx(NORMAL, "syntax: %s [-h|-t|-m]\n", command_line);
+    PrintAndLogEx(NORMAL, "        %s [[-p] <port>] [-b] [-w] [-f] [-c <command>]|[-l <lua_script_file>]|[-s <cmd_script_file>]\n", command_line);
 
     if (showFullHelp) {
         PrintAndLogEx(NORMAL, "options:");
-        PrintAndLogEx(NORMAL, "      -h                    dump all interactive command's help at once");
-        PrintAndLogEx(NORMAL, "      -m                    dump all interactive help at once in markdown syntax");
-        PrintAndLogEx(NORMAL, "      -f                    output will be flushed after every print");
-        PrintAndLogEx(NORMAL, "      -w                    20sec waiting the serial port to appear in the OS");
-        PrintAndLogEx(NORMAL, "      -c <command>          execute one proxmark3 command.");
-        PrintAndLogEx(NORMAL, "      -l <lua script file>  execute lua script.");
-        PrintAndLogEx(NORMAL, "      <cmd_script_file>     script file with one proxmark3 command per line");
+        PrintAndLogEx(NORMAL, "      -h/--help                           this help");
+        PrintAndLogEx(NORMAL, "      -t/--text                           dump all interactive command's help at once");
+        PrintAndLogEx(NORMAL, "      -m/--markdown                       dump all interactive help at once in markdown syntax");
+        PrintAndLogEx(NORMAL, "      -p/--port                           serial port to connect to");
+        PrintAndLogEx(NORMAL, "      -b/--baud                           serial port speed");
+        PrintAndLogEx(NORMAL, "      -w/--wait                           20sec waiting the serial port to appear in the OS");
+        PrintAndLogEx(NORMAL, "      -f/--flush                          output will be flushed after every print");
+        PrintAndLogEx(NORMAL, "      -c/--command <command>              execute one proxmark3 command.");
+        PrintAndLogEx(NORMAL, "      -l/--lua <lua script file>          execute lua script.");
+        PrintAndLogEx(NORMAL, "      -s/--script-file <cmd_script_file>  script file with one proxmark3 command per line");
         PrintAndLogEx(NORMAL, "\nsamples:");
         PrintAndLogEx(NORMAL, "      %s -h\n", command_line);
         PrintAndLogEx(NORMAL, "      %s -m\n", command_line);
@@ -256,10 +263,11 @@ static void show_help(bool showFullHelp, char *command_line) {
         PrintAndLogEx(NORMAL, "      %s "SERIAL_PORT_H" -w             -- wait for serial port\n", command_line);
         PrintAndLogEx(NORMAL, "\n  how to run proxmark3 client\n");
         PrintAndLogEx(NORMAL, "      %s "SERIAL_PORT_H"                -- runs the pm3 client\n", command_line);
+        PrintAndLogEx(NORMAL, "      %s                             -- runs the pm3 client in OFFLINE mode\n", command_line);
         PrintAndLogEx(NORMAL, "\n  how to execute different commands from terminal\n");
         PrintAndLogEx(NORMAL, "      %s "SERIAL_PORT_H" -c \"hf mf chk 1* ?\"   -- execute cmd and quit client\n", command_line);
         PrintAndLogEx(NORMAL, "      %s "SERIAL_PORT_H" -l hf_read            -- execute lua script " _YELLOW_("`hf_read`")"and quit client\n", command_line);
-        PrintAndLogEx(NORMAL, "      %s "SERIAL_PORT_H" mycmds.txt            -- execute each pm3 cmd in file and quit client\n", command_line);
+        PrintAndLogEx(NORMAL, "      %s "SERIAL_PORT_H" -s mycmds.txt         -- execute each pm3 cmd in file and quit client\n", command_line);
     }
 }
 
@@ -268,11 +276,9 @@ int main(int argc, char *argv[]) {
 
     bool usb_present = false;
     bool waitCOMPort = false;
-    bool executeCommand = false;
     bool addLuaExec = false;
     char *script_cmds_file = NULL;
     char *script_cmd = NULL;
-    char *lastarg = NULL;
     char *port = NULL;
     uint32_t speed = 0;
 
@@ -283,50 +289,84 @@ int main(int argc, char *argv[]) {
     rl_extend_line_buffer(1024);
 #endif
 
-    if (argc < 2) {
-
+    char *command_line = argv[0];
 #if defined(_WIN32)
-        for (int m = strlen(argv[0]); m > 0; m--) {
-            if (argv[0][m] == '\\') {
-                show_help(true, argv[0] + (++m));
-                break;
-            }
+    for (int m = strlen(command_line); m > 0; m--) {
+        if ( command_line[m] == '\\' ) {
+            command_line += (++m);
+            break;
         }
-#else
-        show_help(true, argv[0]);
-#endif
-        return 1;
     }
+#endif
 
-    int i = 1;
-    port = argv[i++];
-    for (; i < argc; i++) {
+    for (int i=1; i < argc; i++) {
 
-        // helptext
-        if (strcmp(argv[i], "-h") == 0 || strcmp(argv[i], "-help") == 0) {
+        if (argv[i][0] != '-') {
+            // For backward compatibility we accept direct port
+            if (port != NULL) {
+                // We got already one
+                PrintAndLogEx(ERR, _RED_("ERROR:") "cannot parse command line. We got %s as port and now we got also: %s\n", port, argv[i]);
+                show_help(false, argv[0]);
+                return 1;
+            }
+            port = argv[i];
+            PrintAndLogEx(INFO, "Using UART port %s.\n", port);
+            continue;
+        }
+
+        // port
+        if (strcmp(argv[i], "-p") == 0 || strcmp(argv[i], "--port") == 0) {
+            if (i + 1 == argc) {
+                PrintAndLogEx(ERR, _RED_("ERROR:") "missing port specification after -p\n");
+                show_help(false, argv[0]);
+                return 1;
+            }
+            if (port != NULL) {
+                // We got already one
+                PrintAndLogEx(ERR, _RED_("ERROR:") "cannot parse command line. We got %s as port and now we got also: %s\n", port, argv[i+1]);
+                show_help(false, argv[0]);
+                return 1;
+            }
+            port = argv[++i];
+            continue;
+        }
+
+        // short help
+        if (strcmp(argv[i], "-h") == 0 || strcmp(argv[i], "--help") == 0) {
+            show_help(true, argv[0]);
+            return 0;
+        }
+
+        // dump help
+        if (strcmp(argv[i], "-t") == 0 || strcmp(argv[i], "--text") == 0) {
             show_help(false, argv[0]);
             dumpAllHelp(0);
             return 0;
         }
 
         // dump markup
-        if (strcmp(argv[i], "-m") == 0) {
+        if (strcmp(argv[i], "-m") == 0 || strcmp(argv[i], "--markdown") == 0) {
             dumpAllHelp(1);
             return 0;
         }
 
         // flush output
-        if (strcmp(argv[i], "-f") == 0 || strcmp(argv[i], "-flush") == 0) {
+        if (strcmp(argv[i], "-f") == 0 || strcmp(argv[i], "--flush") == 0) {
             SetFlushAfterWrite(true);
             PrintAndLogEx(INFO, "Output will be flushed after every print.\n");
             continue;
         }
 
         // set baudrate
-        if (strcmp(argv[i], "-b") == 0 || strcmp(argv[i], "-baud") == 0) {
+        if (strcmp(argv[i], "-b") == 0 || strcmp(argv[i], "--baud") == 0) {
+            if (i + 1 == argc) {
+                PrintAndLogEx(ERR, _RED_("ERROR:") "missing baud specification after -b\n");
+                show_help(false, argv[0]);
+                return 1;
+            }
             uint32_t tmpspeed = strtoul(argv[i + 1], NULL, 10);
             if ((tmpspeed == ULONG_MAX) || (tmpspeed == 0)) {
-                PrintAndLogEx(WARNING, "ERROR: invalid baudrate: %s %s\n", argv[i], argv[i + 1]);
+                PrintAndLogEx(ERR, _RED_("ERROR:") "invalid baudrate: %s %s\n", argv[i], argv[i + 1]);
                 return 1;
             }
             speed = tmpspeed;
@@ -335,33 +375,49 @@ int main(int argc, char *argv[]) {
         }
 
         // wait for comport
-        if (strcmp(argv[i], "-w") == 0 || strcmp(argv[i], "-wait") == 0) {
+        if (strcmp(argv[i], "-w") == 0 || strcmp(argv[i], "--wait") == 0) {
             waitCOMPort = true;
             continue;
         }
 
         // execute pm3 command
-        if (strcmp(argv[i], "-c") == 0 || strcmp(argv[i], "-command") == 0) {
-            executeCommand = true;
+        if (strcmp(argv[i], "-c") == 0 || strcmp(argv[i], "--command") == 0) {
+            if (i + 1 == argc) {
+                PrintAndLogEx(ERR, _RED_("ERROR:") "missing command specification after -c\n");
+                show_help(false, argv[0]);
+                return 1;
+            }
+            script_cmd = argv[++i];
+            continue;
+        }
+
+        // execute pm3 command
+        if (strcmp(argv[i], "-s") == 0 || strcmp(argv[i], "--script-file") == 0) {
+            if (i + 1 == argc) {
+                PrintAndLogEx(ERR, _RED_("ERROR:") "missing script file specification after -s\n");
+                show_help(false, argv[0]);
+                return 1;
+            }
+            script_cmds_file = argv[++i];
             continue;
         }
 
         // execute lua script
-        if (strcmp(argv[i], "-l") == 0 || strcmp(argv[i], "-lua") == 0) {
-            executeCommand = true;
+        if (strcmp(argv[i], "-l") == 0 || strcmp(argv[i], "--lua") == 0) {
             addLuaExec = true;
+            if (i + 1 == argc) {
+                PrintAndLogEx(ERR, _RED_("ERROR:") "missing lua script specification after -l\n");
+                show_help(false, argv[0]);
+                return 1;
+            }
+            script_cmd = argv[++i];
             continue;
         }
 
-        if (i < argc - 1) {
-            // We got an unknown parameter
-            PrintAndLogEx(WARNING, "WARNING: ignoring invalid parameter: %s\n", argv[i]);
-        }
-
-        if (i == argc - 1) {
-            // We got presumably a command or a filename
-            lastarg = argv[argc - 1];
-        }
+        // We got an unknown parameter
+        PrintAndLogEx(ERR, _RED_("ERROR:") "invalid parameter: %s\n", argv[i]);
+        show_help(false, argv[0]);
+        return 1;
     }
 
     // default speed for USB 460800,  USART(FPC serial) 115200 baud
@@ -372,52 +428,45 @@ int main(int argc, char *argv[]) {
         speed = 460800;
 #endif
 
-    // If the user passed the filename of the 'script' to execute, get it from last parameter
-    if (lastarg) {
-        if (executeCommand) {
-            script_cmd = lastarg;
+    if (script_cmd) {
+        while (script_cmd[strlen(script_cmd) - 1] == ' ')
+            script_cmd[strlen(script_cmd) - 1] = 0x00;
 
-            while (script_cmd[strlen(script_cmd) - 1] == ' ')
-                script_cmd[strlen(script_cmd) - 1] = 0x00;
-
-            if (strlen(script_cmd) == 0) {
-                script_cmd = NULL;
-            } else {
-                if (addLuaExec) {
-                    // add "script run " to command
-                    int len = strlen(script_cmd) + 11 + 1;
-                    char *ctmp = (char *) calloc(len, sizeof(uint8_t));
-                    if (ctmp != NULL) {
-                        memset(ctmp, 0, len);
-                        strcpy(ctmp, "script run ");
-                        strcpy(&ctmp[11], script_cmd);
-                        script_cmd = ctmp;
-                    }
-                }
-
-                PrintAndLogEx(SUCCESS, "execute command from commandline: %s\n", script_cmd);
-            }
+        if (strlen(script_cmd) == 0) {
+            script_cmd = NULL;
+            PrintAndLogEx(WARNING, "ERROR: execute command: command not found.\n");
+            return 2;
         } else {
-            script_cmds_file = lastarg;
-        }
-    }
+            if (addLuaExec) {
+                // add "script run " to command
+                int len = strlen(script_cmd) + 11 + 1;
+                char *ctmp = (char *) calloc(len, sizeof(uint8_t));
+                if (ctmp != NULL) {
+                    memset(ctmp, 0, len);
+                    strcpy(ctmp, "script run ");
+                    strcpy(&ctmp[11], script_cmd);
+                    script_cmd = ctmp;
+                }
+            }
 
-    // check command
-    if (executeCommand && (!script_cmd || strlen(script_cmd) == 0)) {
-        PrintAndLogEx(WARNING, "ERROR: execute command: command not found.\n");
-        return 2;
+            PrintAndLogEx(SUCCESS, "execute command from commandline: %s\n", script_cmd);
+        }
     }
 
     // ascii art
     bool stdinOnPipe = !isatty(STDIN_FILENO);
-    if (!executeCommand && !script_cmds_file && !stdinOnPipe)
+    if (!script_cmds_file && !stdinOnPipe)
         showBanner();
 
     // set global variables
     set_my_executable_path();
 
     // try to open USB connection to Proxmark
-    usb_present = OpenProxmark(port, waitCOMPort, 20, false, speed);
+    if (port != NULL)
+        usb_present = OpenProxmark(port, waitCOMPort, 20, false, speed);
+
+    if (!usb_present)
+        PrintAndLogEx(NORMAL, "Running in " _YELLOW_("OFFLINE") "mode. Check \"%s -h\" if it's not what you want.\n", command_line);
 
 #ifdef HAVE_GUI
 

From 681c8fd22a63988a8dca6adae1c7843138a9bb55 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 14 Apr 2019 13:35:52 +0200
Subject: [PATCH 1242/1938] main: use proper executable name, especially for
 mingw

---
 client/proxmark3.c | 54 +++++++++++++++++++++++-----------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/client/proxmark3.c b/client/proxmark3.c
index 1fc60ef10..cf52ba649 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -238,11 +238,11 @@ static void set_my_executable_path(void) {
     }
 }
 
-static void show_help(bool showFullHelp, char *command_line) {
+static void show_help(bool showFullHelp, char *exec_name) {
 
     PrintAndLogEx(NORMAL, "");
-    PrintAndLogEx(NORMAL, "syntax: %s [-h|-t|-m]\n", command_line);
-    PrintAndLogEx(NORMAL, "        %s [[-p] <port>] [-b] [-w] [-f] [-c <command>]|[-l <lua_script_file>]|[-s <cmd_script_file>]\n", command_line);
+    PrintAndLogEx(NORMAL, "syntax: %s [-h|-t|-m]\n", exec_name);
+    PrintAndLogEx(NORMAL, "        %s [[-p] <port>] [-b] [-w] [-f] [-c <command>]|[-l <lua_script_file>]|[-s <cmd_script_file>]\n", exec_name);
 
     if (showFullHelp) {
         PrintAndLogEx(NORMAL, "options:");
@@ -257,17 +257,17 @@ static void show_help(bool showFullHelp, char *command_line) {
         PrintAndLogEx(NORMAL, "      -l/--lua <lua script file>          execute lua script.");
         PrintAndLogEx(NORMAL, "      -s/--script-file <cmd_script_file>  script file with one proxmark3 command per line");
         PrintAndLogEx(NORMAL, "\nsamples:");
-        PrintAndLogEx(NORMAL, "      %s -h\n", command_line);
-        PrintAndLogEx(NORMAL, "      %s -m\n", command_line);
-        PrintAndLogEx(NORMAL, "      %s "SERIAL_PORT_H" -f             -- flush output everytime\n", command_line);
-        PrintAndLogEx(NORMAL, "      %s "SERIAL_PORT_H" -w             -- wait for serial port\n", command_line);
+        PrintAndLogEx(NORMAL, "      %s -h\n", exec_name);
+        PrintAndLogEx(NORMAL, "      %s -m\n", exec_name);
+        PrintAndLogEx(NORMAL, "      %s "SERIAL_PORT_H" -f             -- flush output everytime\n", exec_name);
+        PrintAndLogEx(NORMAL, "      %s "SERIAL_PORT_H" -w             -- wait for serial port\n", exec_name);
         PrintAndLogEx(NORMAL, "\n  how to run proxmark3 client\n");
-        PrintAndLogEx(NORMAL, "      %s "SERIAL_PORT_H"                -- runs the pm3 client\n", command_line);
-        PrintAndLogEx(NORMAL, "      %s                             -- runs the pm3 client in OFFLINE mode\n", command_line);
+        PrintAndLogEx(NORMAL, "      %s "SERIAL_PORT_H"                -- runs the pm3 client\n", exec_name);
+        PrintAndLogEx(NORMAL, "      %s                             -- runs the pm3 client in OFFLINE mode\n", exec_name);
         PrintAndLogEx(NORMAL, "\n  how to execute different commands from terminal\n");
-        PrintAndLogEx(NORMAL, "      %s "SERIAL_PORT_H" -c \"hf mf chk 1* ?\"   -- execute cmd and quit client\n", command_line);
-        PrintAndLogEx(NORMAL, "      %s "SERIAL_PORT_H" -l hf_read            -- execute lua script " _YELLOW_("`hf_read`")"and quit client\n", command_line);
-        PrintAndLogEx(NORMAL, "      %s "SERIAL_PORT_H" -s mycmds.txt         -- execute each pm3 cmd in file and quit client\n", command_line);
+        PrintAndLogEx(NORMAL, "      %s "SERIAL_PORT_H" -c \"hf mf chk 1* ?\"   -- execute cmd and quit client\n", exec_name);
+        PrintAndLogEx(NORMAL, "      %s "SERIAL_PORT_H" -l hf_read            -- execute lua script " _YELLOW_("`hf_read`")"and quit client\n", exec_name);
+        PrintAndLogEx(NORMAL, "      %s "SERIAL_PORT_H" -s mycmds.txt         -- execute each pm3 cmd in file and quit client\n", exec_name);
     }
 }
 
@@ -289,11 +289,11 @@ int main(int argc, char *argv[]) {
     rl_extend_line_buffer(1024);
 #endif
 
-    char *command_line = argv[0];
+    char *exec_name = argv[0];
 #if defined(_WIN32)
-    for (int m = strlen(command_line); m > 0; m--) {
-        if ( command_line[m] == '\\' ) {
-            command_line += (++m);
+    for (int m = strlen(exec_name); m > 0; m--) {
+        if ( exec_name[m] == '\\' ) {
+            exec_name += (++m);
             break;
         }
     }
@@ -306,7 +306,7 @@ int main(int argc, char *argv[]) {
             if (port != NULL) {
                 // We got already one
                 PrintAndLogEx(ERR, _RED_("ERROR:") "cannot parse command line. We got %s as port and now we got also: %s\n", port, argv[i]);
-                show_help(false, argv[0]);
+                show_help(false, exec_name);
                 return 1;
             }
             port = argv[i];
@@ -318,13 +318,13 @@ int main(int argc, char *argv[]) {
         if (strcmp(argv[i], "-p") == 0 || strcmp(argv[i], "--port") == 0) {
             if (i + 1 == argc) {
                 PrintAndLogEx(ERR, _RED_("ERROR:") "missing port specification after -p\n");
-                show_help(false, argv[0]);
+                show_help(false, exec_name);
                 return 1;
             }
             if (port != NULL) {
                 // We got already one
                 PrintAndLogEx(ERR, _RED_("ERROR:") "cannot parse command line. We got %s as port and now we got also: %s\n", port, argv[i+1]);
-                show_help(false, argv[0]);
+                show_help(false, exec_name);
                 return 1;
             }
             port = argv[++i];
@@ -333,13 +333,13 @@ int main(int argc, char *argv[]) {
 
         // short help
         if (strcmp(argv[i], "-h") == 0 || strcmp(argv[i], "--help") == 0) {
-            show_help(true, argv[0]);
+            show_help(true, exec_name);
             return 0;
         }
 
         // dump help
         if (strcmp(argv[i], "-t") == 0 || strcmp(argv[i], "--text") == 0) {
-            show_help(false, argv[0]);
+            show_help(false, exec_name);
             dumpAllHelp(0);
             return 0;
         }
@@ -361,7 +361,7 @@ int main(int argc, char *argv[]) {
         if (strcmp(argv[i], "-b") == 0 || strcmp(argv[i], "--baud") == 0) {
             if (i + 1 == argc) {
                 PrintAndLogEx(ERR, _RED_("ERROR:") "missing baud specification after -b\n");
-                show_help(false, argv[0]);
+                show_help(false, exec_name);
                 return 1;
             }
             uint32_t tmpspeed = strtoul(argv[i + 1], NULL, 10);
@@ -384,7 +384,7 @@ int main(int argc, char *argv[]) {
         if (strcmp(argv[i], "-c") == 0 || strcmp(argv[i], "--command") == 0) {
             if (i + 1 == argc) {
                 PrintAndLogEx(ERR, _RED_("ERROR:") "missing command specification after -c\n");
-                show_help(false, argv[0]);
+                show_help(false, exec_name);
                 return 1;
             }
             script_cmd = argv[++i];
@@ -395,7 +395,7 @@ int main(int argc, char *argv[]) {
         if (strcmp(argv[i], "-s") == 0 || strcmp(argv[i], "--script-file") == 0) {
             if (i + 1 == argc) {
                 PrintAndLogEx(ERR, _RED_("ERROR:") "missing script file specification after -s\n");
-                show_help(false, argv[0]);
+                show_help(false, exec_name);
                 return 1;
             }
             script_cmds_file = argv[++i];
@@ -407,7 +407,7 @@ int main(int argc, char *argv[]) {
             addLuaExec = true;
             if (i + 1 == argc) {
                 PrintAndLogEx(ERR, _RED_("ERROR:") "missing lua script specification after -l\n");
-                show_help(false, argv[0]);
+                show_help(false, exec_name);
                 return 1;
             }
             script_cmd = argv[++i];
@@ -416,7 +416,7 @@ int main(int argc, char *argv[]) {
 
         // We got an unknown parameter
         PrintAndLogEx(ERR, _RED_("ERROR:") "invalid parameter: %s\n", argv[i]);
-        show_help(false, argv[0]);
+        show_help(false, exec_name);
         return 1;
     }
 
@@ -466,7 +466,7 @@ int main(int argc, char *argv[]) {
         usb_present = OpenProxmark(port, waitCOMPort, 20, false, speed);
 
     if (!usb_present)
-        PrintAndLogEx(NORMAL, "Running in " _YELLOW_("OFFLINE") "mode. Check \"%s -h\" if it's not what you want.\n", command_line);
+        PrintAndLogEx(NORMAL, "Running in " _YELLOW_("OFFLINE") "mode. Check \"%s -h\" if it's not what you want.\n", exec_name);
 
 #ifdef HAVE_GUI
 

From 9676d788e0dd208ce446daa651be3ec920b9444e Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 14 Apr 2019 13:37:53 +0200
Subject: [PATCH 1243/1938] style

---
 armsrc/fpgaloader.c  | 2 +-
 armsrc/mifaresim.c   | 2 +-
 client/cmdlfindala.c | 8 ++++----
 client/cmdlft55xx.c  | 4 ++--
 client/proxmark3.c   | 6 +++---
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/armsrc/fpgaloader.c b/armsrc/fpgaloader.c
index 2474d7026..1be2c6138 100644
--- a/armsrc/fpgaloader.c
+++ b/armsrc/fpgaloader.c
@@ -468,7 +468,7 @@ void SetAdcMuxFor(uint32_t whichGpio) {
     LOW(GPIO_MUXSEL_LOPKD);
     LOW(GPIO_MUXSEL_HIRAW);
     LOW(GPIO_MUXSEL_LORAW);
-        
+
 #else
     // FPC serial uses HIRAW/LOWRAW pins, so they are excluded here.
     AT91C_BASE_PIOA->PIO_OER = GPIO_MUXSEL_HIPKD | GPIO_MUXSEL_LOPKD;
diff --git a/armsrc/mifaresim.c b/armsrc/mifaresim.c
index 3b7e91687..15aa93117 100644
--- a/armsrc/mifaresim.c
+++ b/armsrc/mifaresim.c
@@ -445,7 +445,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
     uint8_t rAUTH_NT_keystream[4];
     uint32_t nonce = 0;
 
-    tUart *uart = GetUart(); 
+    tUart *uart = GetUart();
 
     if ((flags & FLAG_MF_MINI) == FLAG_MF_MINI) {
         MifareCardType = 0;
diff --git a/client/cmdlfindala.c b/client/cmdlfindala.c
index be850d43f..144a76312 100644
--- a/client/cmdlfindala.c
+++ b/client/cmdlfindala.c
@@ -26,13 +26,13 @@ static int usage_lf_indala_demod(void) {
     PrintAndLogEx(NORMAL, "      h        :  This help");
     PrintAndLogEx(NORMAL, "      clock    :  Set clock (as integer) optional, if not set, autodetect.");
     PrintAndLogEx(NORMAL, "      invert   :  1 for invert output");
-    PrintAndLogEx(NORMAL, "      maxerror :  Set maximum allowed errors, default = 100.");   
+    PrintAndLogEx(NORMAL, "      maxerror :  Set maximum allowed errors, default = 100.");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "        lf indala demod");
     PrintAndLogEx(NORMAL, "        lf indala demod 32       = demod a Indala tag from GraphBuffer using a clock of RF/32");
-    PrintAndLogEx(NORMAL, "        lf indala demod 32 1     = demod a Indala tag from GraphBuffer using a clock of RF/32 and inverting data");    
-    PrintAndLogEx(NORMAL, "        lf indala demod 64 1 0   = demod a Indala tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors");    
+    PrintAndLogEx(NORMAL, "        lf indala demod 32 1     = demod a Indala tag from GraphBuffer using a clock of RF/32 and inverting data");
+    PrintAndLogEx(NORMAL, "        lf indala demod 64 1 0   = demod a Indala tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors");
     return 0;
 }
 
@@ -57,7 +57,7 @@ static int CmdIndalaDemod(const char *Cmd) {
 
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_lf_indala_demod();
-    
+
     int ans;
     if (strlen(Cmd) > 0)
         ans = PSKDemod(Cmd, true);
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index cbfd71dad..b578a42ea 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1211,8 +1211,8 @@ static int CmdT55xxReadTrace(const char *Cmd) {
         ct = localtime_s(&tm_buf, &now) == 0 ? &tm_buf : NULL;
 #else
         ct = localtime_r(&now, &tm_buf);
-#endif        
-        
+#endif
+
         if (data.year > ct->tm_year - 110)
             data.year += 2000;
         else
diff --git a/client/proxmark3.c b/client/proxmark3.c
index cf52ba649..c4000bd84 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -292,14 +292,14 @@ int main(int argc, char *argv[]) {
     char *exec_name = argv[0];
 #if defined(_WIN32)
     for (int m = strlen(exec_name); m > 0; m--) {
-        if ( exec_name[m] == '\\' ) {
+        if (exec_name[m] == '\\') {
             exec_name += (++m);
             break;
         }
     }
 #endif
 
-    for (int i=1; i < argc; i++) {
+    for (int i = 1; i < argc; i++) {
 
         if (argv[i][0] != '-') {
             // For backward compatibility we accept direct port
@@ -323,7 +323,7 @@ int main(int argc, char *argv[]) {
             }
             if (port != NULL) {
                 // We got already one
-                PrintAndLogEx(ERR, _RED_("ERROR:") "cannot parse command line. We got %s as port and now we got also: %s\n", port, argv[i+1]);
+                PrintAndLogEx(ERR, _RED_("ERROR:") "cannot parse command line. We got %s as port and now we got also: %s\n", port, argv[i + 1]);
                 show_help(false, exec_name);
                 return 1;
             }

From 85f67006e4d0655523b8fb7ec61c81de162ca50e Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 14 Apr 2019 14:35:42 +0200
Subject: [PATCH 1244/1938] Remove redundant define

---
 common/usart.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/common/usart.c b/common/usart.c
index 1a46b93c4..f0a58131b 100644
--- a/common/usart.c
+++ b/common/usart.c
@@ -12,8 +12,6 @@
 #include "string.h"
 #include "../armsrc/ticks.h"  // startcountus
 
-#define AT91_BAUD_RATE 115200
-
 volatile AT91PS_USART pUS1 = AT91C_BASE_US1;
 volatile AT91PS_PIO pPIO   = AT91C_BASE_PIOA;
 volatile AT91PS_PDC pPDC   = AT91C_BASE_PDC_US1;

From 3cba736841a386d54ded086445b3a02d5f650d22 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 14 Apr 2019 14:41:53 +0200
Subject: [PATCH 1245/1938] baudrate for usart: use define and limit to 115200
 only for WITH_FPC_HOST

---
 client/proxmark3.c | 6 ++++--
 common/usart.c     | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/client/proxmark3.c b/client/proxmark3.c
index c4000bd84..f0239f81c 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -27,6 +27,7 @@
 #include "cmdhw.h"
 #include "whereami.h"
 #include "comms.h"
+#include "usart.h"
 
 static void showBanner(void) {
     printf("\n\n");
@@ -422,8 +423,9 @@ int main(int argc, char *argv[]) {
 
     // default speed for USB 460800,  USART(FPC serial) 115200 baud
     if (speed == 0)
-#ifdef WITH_FPC
-        speed = 115200;
+#ifdef WITH_FPC_HOST
+        // Let's assume we're talking by default to pm3 over usart in this mode
+        speed = AT91_BAUD_RATE;
 #else
         speed = 460800;
 #endif
diff --git a/common/usart.c b/common/usart.c
index f0a58131b..1695995a2 100644
--- a/common/usart.c
+++ b/common/usart.c
@@ -180,7 +180,7 @@ void usart_init(void) {
     // all interrupts disabled
     pUS1->US_IDR = 0xFFFF;
 
-    pUS1->US_BRGR =  48054841 / (115200 << 3);
+    pUS1->US_BRGR =  48054841 / (AT91_BAUD_RATE << 3);
     // Need speed?
     //pUS1->US_BRGR =  48054841 / (460800 << 3);
 

From 04c0384d3e36b83f220fc8ded94f57911e967e5c Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 14 Apr 2019 17:25:17 +0200
Subject: [PATCH 1246/1938] Testing pm3 communication

---
 armsrc/appmain.c   |  4 ++++
 client/comms.c     | 16 +++++++++++++++-
 client/comms.h     |  1 +
 client/proxmark3.c |  5 +++--
 uart/uart_posix.c  |  1 +
 uart/uart_win32.c  |  1 +
 6 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 2c16d8f56..03ce3750b 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1443,7 +1443,11 @@ void UsbPacketReceived(uint8_t *packet, int len) {
             SendStatus();
             break;
         case CMD_PING:
+#ifdef WITH_FPC_HOST
+            cmd_send(CMD_ACK, reply_via_fpc, 0, 0, 0, 0);
+#else
             cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
+#endif
             break;
 #ifdef WITH_LCD
         case CMD_LCD_RESET:
diff --git a/client/comms.c b/client/comms.c
index a2bf8deed..bd5ff93d8 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -334,7 +334,6 @@ bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode,
         conn.block_after_ACK = flash_mode;
         pthread_create(&USB_communication_thread, NULL, &uart_communication, &conn);
         //pthread_create(&FPC_communication_thread, NULL, &uart_communication, &conn);
-
         fflush(stdout);
         // create a mutex to avoid interlacing print commands from our different threads
         //pthread_mutex_init(&print_lock, NULL);
@@ -342,6 +341,21 @@ bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode,
     }
 }
 
+int TestProxmark(void) {
+    // check if we can communicate with Pm3
+    clearCommandBuffer();
+    UsbCommand resp;
+    UsbCommand c = {CMD_PING, {0, 0, 0}, {{0}}};
+    SendCommand(&c);
+    if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {
+        PrintAndLogEx(INFO, "Ping successful, communicating with PM3 over %s.", resp.arg[0] == 1 ? "FPC" : "USB");
+        return 1;
+    } else {
+        PrintAndLogEx(WARNING, _RED_("Ping failed"));
+        return 0;
+    }
+}
+
 void CloseProxmark(void) {
     conn.run = false;
 
diff --git a/client/comms.h b/client/comms.h
index 483462ac3..68f790eb1 100644
--- a/client/comms.h
+++ b/client/comms.h
@@ -56,6 +56,7 @@ void clearCommandBuffer(void);
 
 #define FLASHMODE_SPEED 460800
 bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode, uint32_t speed);
+int TestProxmark(void);
 void CloseProxmark(void);
 
 bool WaitForResponseTimeoutW(uint32_t cmd, UsbCommand *response, size_t ms_timeout, bool show_warning);
diff --git a/client/proxmark3.c b/client/proxmark3.c
index f0239f81c..5e6ec8c1e 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -311,7 +311,6 @@ int main(int argc, char *argv[]) {
                 return 1;
             }
             port = argv[i];
-            PrintAndLogEx(INFO, "Using UART port %s.\n", port);
             continue;
         }
 
@@ -467,8 +466,10 @@ int main(int argc, char *argv[]) {
     if (port != NULL)
         usb_present = OpenProxmark(port, waitCOMPort, 20, false, speed);
 
+    if (TestProxmark() == 0)
+       usb_present = false;
     if (!usb_present)
-        PrintAndLogEx(NORMAL, "Running in " _YELLOW_("OFFLINE") "mode. Check \"%s -h\" if it's not what you want.\n", exec_name);
+        PrintAndLogEx(INFO, "Running in " _YELLOW_("OFFLINE") "mode. Check \"%s -h\" if it's not what you want.\n", exec_name);
 
 #ifdef HAVE_GUI
 
diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index 8ea8aa619..f07882ef5 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -74,6 +74,7 @@ struct timeval timeout = {
 };
 
 serial_port uart_open(const char *pcPortName, uint32_t speed) {
+    printf("[=] Using UART port %s.\n", pcPortName);
     serial_port_unix *sp = calloc(sizeof(serial_port_unix), sizeof(uint8_t));
     if (sp == 0) return INVALID_SERIAL_PORT;
 
diff --git a/uart/uart_win32.c b/uart/uart_win32.c
index 2ed5c9bcf..e92b49c15 100644
--- a/uart/uart_win32.c
+++ b/uart/uart_win32.c
@@ -49,6 +49,7 @@ typedef struct {
 } serial_port_windows;
 
 serial_port uart_open(const char *pcPortName, uint32_t speed) {
+    printf("[=] Using UART port %s.\n", pcPortName);
     char acPortName[255];
     serial_port_windows *sp = calloc(sizeof(serial_port_windows), sizeof(uint8_t));
 

From ba926a91e5e8cd9c6423f6c88fd00ab8829611fb Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 14 Apr 2019 18:38:06 +0200
Subject: [PATCH 1247/1938] more yellow

---
 client/proxmark3.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/proxmark3.c b/client/proxmark3.c
index 5e6ec8c1e..db4479c9a 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -85,7 +85,7 @@ main_loop(char *script_cmds_file, char *script_cmd, bool usb_present) {
         if (sf)
             PrintAndLogEx(SUCCESS, "executing commands from file: %s\n", script_cmds_file);
         else
-            PrintAndLogEx(ERR, "could not open %s...", script_cmds_file);
+            PrintAndLogEx(ERR, "could not open " _YELLOW_("%s") "...", script_cmds_file);
     }
 
     read_history(".history");
@@ -306,7 +306,7 @@ int main(int argc, char *argv[]) {
             // For backward compatibility we accept direct port
             if (port != NULL) {
                 // We got already one
-                PrintAndLogEx(ERR, _RED_("ERROR:") "cannot parse command line. We got %s as port and now we got also: %s\n", port, argv[i]);
+                PrintAndLogEx(ERR, _RED_("ERROR:") "cannot parse command line. We got " _YELLOW_("%s") " as port and now we got also: " _YELLOW_("%s") "\n", port, argv[i]);
                 show_help(false, exec_name);
                 return 1;
             }
@@ -323,7 +323,7 @@ int main(int argc, char *argv[]) {
             }
             if (port != NULL) {
                 // We got already one
-                PrintAndLogEx(ERR, _RED_("ERROR:") "cannot parse command line. We got %s as port and now we got also: %s\n", port, argv[i + 1]);
+                PrintAndLogEx(ERR, _RED_("ERROR:") "cannot parse command line. We got " _YELLOW_("%s") " as port and now we got also: " _YELLOW_("%s") "\n", port, argv[i + 1]);
                 show_help(false, exec_name);
                 return 1;
             }
@@ -366,7 +366,7 @@ int main(int argc, char *argv[]) {
             }
             uint32_t tmpspeed = strtoul(argv[i + 1], NULL, 10);
             if ((tmpspeed == ULONG_MAX) || (tmpspeed == 0)) {
-                PrintAndLogEx(ERR, _RED_("ERROR:") "invalid baudrate: %s %s\n", argv[i], argv[i + 1]);
+                PrintAndLogEx(ERR, _RED_("ERROR:") "invalid baudrate: -b " _YELLOW_("%s") "\n", argv[i + 1]);
                 return 1;
             }
             speed = tmpspeed;
@@ -415,7 +415,7 @@ int main(int argc, char *argv[]) {
         }
 
         // We got an unknown parameter
-        PrintAndLogEx(ERR, _RED_("ERROR:") "invalid parameter: %s\n", argv[i]);
+        PrintAndLogEx(ERR, _RED_("ERROR:") "invalid parameter: " _YELLOW_("%s") "\n", argv[i]);
         show_help(false, exec_name);
         return 1;
     }

From e0b7f22db10e137f7e948655739da2bf02441f58 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 14 Apr 2019 18:45:53 +0200
Subject: [PATCH 1248/1938] Comment debug msg

---
 common/cmd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/cmd.c b/common/cmd.c
index 73c95bcd5..ab8eeedaa 100644
--- a/common/cmd.c
+++ b/common/cmd.c
@@ -68,7 +68,7 @@ uint8_t cmd_send(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void
 #ifdef WITH_FPC_HOST
     if (reply_via_fpc) {
         sendlen = usart_writebuffer((uint8_t *)&txcmd, sizeof(UsbCommand));
-        Dbprintf_usb("Sent %i bytes over usart", len);
+//        Dbprintf_usb("Sent %i bytes over usart", len);
     } else {
         sendlen = usb_write((uint8_t *)&txcmd, sizeof(UsbCommand));
     }

From 9a7bba2438633f9ef0169861f42cba51997590ad Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 14 Apr 2019 18:49:19 +0200
Subject: [PATCH 1249/1938] Move UART open msg to avoid flood in wait mode

---
 client/comms.c    | 1 +
 uart/uart_posix.c | 1 -
 uart/uart_win32.c | 1 -
 3 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/client/comms.c b/client/comms.c
index bd5ff93d8..ce1a7cd37 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -301,6 +301,7 @@ __attribute__((force_align_arg_pointer))
 bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode, uint32_t speed) {
 
     char *portname = (char *)port;
+    printf("[=] Using UART port %s.\n", portname);
     if (!wait_for_port) {
         sp = uart_open(portname, speed);
     } else {
diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index f07882ef5..8ea8aa619 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -74,7 +74,6 @@ struct timeval timeout = {
 };
 
 serial_port uart_open(const char *pcPortName, uint32_t speed) {
-    printf("[=] Using UART port %s.\n", pcPortName);
     serial_port_unix *sp = calloc(sizeof(serial_port_unix), sizeof(uint8_t));
     if (sp == 0) return INVALID_SERIAL_PORT;
 
diff --git a/uart/uart_win32.c b/uart/uart_win32.c
index e92b49c15..2ed5c9bcf 100644
--- a/uart/uart_win32.c
+++ b/uart/uart_win32.c
@@ -49,7 +49,6 @@ typedef struct {
 } serial_port_windows;
 
 serial_port uart_open(const char *pcPortName, uint32_t speed) {
-    printf("[=] Using UART port %s.\n", pcPortName);
     char acPortName[255];
     serial_port_windows *sp = calloc(sizeof(serial_port_windows), sizeof(uint8_t));
 

From 62f46d65441ba3396853067fe80535075aae6954 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 14 Apr 2019 18:51:07 +0200
Subject: [PATCH 1250/1938] Use PrintAndLogEx

---
 client/comms.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/comms.c b/client/comms.c
index ce1a7cd37..a96823d81 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -301,8 +301,8 @@ __attribute__((force_align_arg_pointer))
 bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode, uint32_t speed) {
 
     char *portname = (char *)port;
-    printf("[=] Using UART port %s.\n", portname);
     if (!wait_for_port) {
+        PrintAndLogEx(INFO, "Using UART port " _YELLOW_("%s"), portname);
         sp = uart_open(portname, speed);
     } else {
         PrintAndLogEx(SUCCESS, "Waiting for Proxmark to appear on " _YELLOW_("%s"), portname);

From 7912f7494bd75124f1b51a900756b6a78c0b846d Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 14 Apr 2019 19:44:55 +0200
Subject: [PATCH 1251/1938] init array

---
 uart/uart_win32.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/uart/uart_win32.c b/uart/uart_win32.c
index 2ed5c9bcf..789b430b9 100644
--- a/uart/uart_win32.c
+++ b/uart/uart_win32.c
@@ -49,7 +49,7 @@ typedef struct {
 } serial_port_windows;
 
 serial_port uart_open(const char *pcPortName, uint32_t speed) {
-    char acPortName[255];
+    char acPortName[255] = {0};
     serial_port_windows *sp = calloc(sizeof(serial_port_windows), sizeof(uint8_t));
 
     if (sp == 0) {

From 53a4f509d092512d525c8fd91368fa28f82010dc Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 14 Apr 2019 23:17:53 +0200
Subject: [PATCH 1252/1938] proxmark3.sh: pass the options

---
 proxmark3.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/proxmark3.sh b/proxmark3.sh
index b109d82e6..1971f41a5 100755
--- a/proxmark3.sh
+++ b/proxmark3.sh
@@ -26,7 +26,7 @@ function wait4proxmark_macOS {
 # start proxmark with first detected interface
 
 if [[ $(uname | awk '{print toupper($0)}') == "LINUX" ]]; then
-    client/proxmark3 $(wait4proxmark_Linux)
+    client/proxmark3 $(wait4proxmark_Linux) $*
 elif [[ $(uname | awk '{print toupper($0)}') == "DARWIN" ]]; then
-    client/proxmark3 $(wait4proxmark_macOS)
+    client/proxmark3 $(wait4proxmark_macOS) $*
 fi

From 938d19ef5786aaadfea0179ea861315fb5086c6c Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Mon, 15 Apr 2019 14:02:21 +0200
Subject: [PATCH 1253/1938] proxmark3.sh: better options fwd

---
 proxmark3.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/proxmark3.sh b/proxmark3.sh
index 1971f41a5..4a7a004d5 100755
--- a/proxmark3.sh
+++ b/proxmark3.sh
@@ -26,7 +26,7 @@ function wait4proxmark_macOS {
 # start proxmark with first detected interface
 
 if [[ $(uname | awk '{print toupper($0)}') == "LINUX" ]]; then
-    client/proxmark3 $(wait4proxmark_Linux) $*
+    client/proxmark3 $(wait4proxmark_Linux) "$@"
 elif [[ $(uname | awk '{print toupper($0)}') == "DARWIN" ]]; then
-    client/proxmark3 $(wait4proxmark_macOS) $*
+    client/proxmark3 $(wait4proxmark_macOS) "$@"
 fi

From 934fb42a95ad5cedf99901743124f8ce1c012d42 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Mon, 15 Apr 2019 18:04:12 +0300
Subject: [PATCH 1254/1938] Jablotron ID length fix

---
 client/cmdlfjablotron.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/cmdlfjablotron.c b/client/cmdlfjablotron.c
index 7a09c75ff..67c4f6a99 100644
--- a/client/cmdlfjablotron.c
+++ b/client/cmdlfjablotron.c
@@ -94,7 +94,8 @@ static int CmdJablotronDemod(const char *Cmd) {
     uint32_t raw1 = bytebits_to_byte(DemodBuffer, 32);
     uint32_t raw2 = bytebits_to_byte(DemodBuffer + 32, 32);
 
-    uint64_t rawid = bytebits_to_byte(DemodBuffer + 16, 40);
+    // bytebits_to_byte - uint32_t
+    uint64_t rawid = ((uint64_t)(bytebits_to_byte(DemodBuffer + 16, 8) & 0xff) << 32) | bytebits_to_byte(DemodBuffer + 24, 32);
     uint64_t id = getJablontronCardId(rawid);
 
     PrintAndLogEx(SUCCESS, "Jablotron Tag Found: Card ID: %"PRIx64" :: Raw: %08X%08X", id, raw1, raw2);

From 34467b7550fbbc7f1c6dcea64d6df842d32ab988 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 16 Apr 2019 10:01:08 +0200
Subject: [PATCH 1255/1938] Variable length frames, part1: USB Host -> Pm3

---
 armsrc/appmain.c  | 67 ++++++++++++++++++++++++++++++++++++++++-------
 client/cmdhw.c    | 26 ++++++++++++++++++
 client/comms.c    | 62 ++++++++++++++++++++++++++++++++++++++++---
 client/comms.h    |  1 +
 common/cmd.c      |  7 ++---
 common/usb_cdc.c  | 59 +++++++++++++++++++++++++++++++++++++++++
 common/usb_cdc.h  |  2 ++
 include/usb_cmd.h | 21 +++++++++++++++
 8 files changed, 229 insertions(+), 16 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 03ce3750b..534cef648 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1444,9 +1444,9 @@ void UsbPacketReceived(uint8_t *packet, int len) {
             break;
         case CMD_PING:
 #ifdef WITH_FPC_HOST
-            cmd_send(CMD_ACK, reply_via_fpc, 0, 0, 0, 0);
+            cmd_send(CMD_ACK, reply_via_fpc, c->d.asDwords[0], c->d.asDwords[(c->arg[0]-1)/4], 0, 0);
 #else
-            cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
+            cmd_send(CMD_ACK, 0, c->d.asDwords[0], c->d.asDwords[(c->arg[0]-1)/4], 0, 0);
 #endif
             break;
 #ifdef WITH_LCD
@@ -1553,24 +1553,73 @@ void  __attribute__((noreturn)) AppMain(void) {
     usb_disable();
     usb_enable();
 
-    uint8_t rx[sizeof(UsbCommand)];
+    // Worst case: Command as large as the old one but encapsulated in NG style
+    uint8_t rx[sizeof(UsbCommandNGPreamble) + sizeof(UsbCommand) + sizeof(UsbCommandNGPostamble)];
+    UsbCommandNGPreamble *pre = (UsbCommandNGPreamble *)rx;
+    UsbCommandNGPostamble *post = (UsbCommandNGPostamble *)(rx + sizeof(UsbCommandNGPreamble) + sizeof(UsbCommand));
 
     for (;;) {
         WDT_HIT();
 
         // Check if there is a usb packet available
         if (usb_poll_validate_length()) {
-            if (usb_read(rx, sizeof(rx))) {
-#ifdef WITH_FPC_HOST
-                reply_via_fpc = 0;
-#endif
-                UsbPacketReceived(rx, sizeof(rx));
+            bool error = false;
+            size_t bytes = usb_read_ng(rx, sizeof(UsbCommandNGPreamble) + sizeof(UsbCommandNG));
+            if (bytes == sizeof(UsbCommandNGPreamble) + sizeof(UsbCommandNG)) {
+                if (pre->magic == USB_PREAMBLE_MAGIC) { // New style NG command
+//                    Dbprintf("Packet frame NG incoming!");
+                    use_cmd_ng = true;
+                    if (pre->length > USB_CMD_DATA_SIZE) {
+                        Dbprintf("Packet frame with incompatible length: 0x%04x", pre->length);
+                        error = true;
+                    }
+                    if ((!error) && (pre->length > 0)) { // Get the variable length payload
+                        bytes = usb_read_ng(rx + sizeof(UsbCommandNGPreamble) + sizeof(UsbCommandNG), pre->length);
+                        if (bytes != pre->length) {
+                            Dbprintf("Packet frame error variable part too short? %d/%d", bytes, pre->length);
+                            error = true;
+                        }
+                    }
+                    if (!error) {                        // Get the postamble
+                        bytes = usb_read_ng(rx + sizeof(UsbCommandNGPreamble) + sizeof(UsbCommand), sizeof(UsbCommandNGPostamble));
+                        if ((bytes != sizeof(UsbCommandNGPostamble)) || (post->magic != USB_POSTAMBLE_MAGIC)) {
+                            Dbprintf("Packet frame error no postamble magic found");
+                            error = true;
+                        }
+                        // TODO check also CRC...
+                    }
+                    if (!error) {
+//                            Dbprintf("Packet frame NG fully received");
+            #ifdef WITH_FPC_HOST
+                            reply_via_fpc = false;
+            #endif
+                            UsbPacketReceived(rx + sizeof(UsbCommandNGPreamble), sizeof(UsbCommand));
+                    }
+
+                } else {                               // Old style command
+                    bytes = usb_read_ng(rx + sizeof(UsbCommandNGPreamble) + sizeof(UsbCommandNG), sizeof(UsbCommand) - sizeof(UsbCommandNGPreamble) - sizeof(UsbCommandNG));
+
+                    if (bytes != sizeof(UsbCommand) - sizeof(UsbCommandNGPreamble) - sizeof(UsbCommandNG)) {
+                        Dbprintf("Packet frame error var part too short? %d/%d", bytes, sizeof(UsbCommand) - sizeof(UsbCommandNGPreamble) - sizeof(UsbCommandNG));
+                        error = true;
+                    }
+                    if (!error) {
+                            use_cmd_ng = false;
+            #ifdef WITH_FPC_HOST
+                            reply_via_fpc = false;
+            #endif
+                            UsbPacketReceived(rx, sizeof(UsbCommand));
+                    }
+                }
+            } else {
+                error = true;
             }
+            // TODO if error, shall we resync ?
         }
 #ifdef WITH_FPC_HOST
         // Check if there is a FPC packet available
         if (usart_readbuffer(rx)) {
-            reply_via_fpc = 1;
+            reply_via_fpc = true;
             UsbPacketReceived(rx, sizeof(rx));
         }
         usart_readcheck(rx, sizeof(rx));
diff --git a/client/cmdhw.c b/client/cmdhw.c
index d1ba4274e..655442738 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -438,6 +438,31 @@ static int CmdPing(const char *Cmd) {
     return 0;
 }
 
+static int CmdPingNG(const char *Cmd) {
+    uint32_t len = strtol(Cmd, NULL, 0);
+    if (len > USB_CMD_DATA_SIZE)
+        len = USB_CMD_DATA_SIZE;
+    PrintAndLogEx(NORMAL, "Pinging with payload len=%d", len);
+    clearCommandBuffer();
+    UsbCommand resp;
+    UsbCommand c = {CMD_PING, {len, 0, 0}, {{0}}};
+    if (len >= 4)
+        c.d.asDwords[0] = 0xAABBCCDD;
+    if (len >= 8)
+    c.d.asDwords[(len-1)/4] = 0xDDCCBBAA;
+    SendCommandNG(&c, len);
+    if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {
+        PrintAndLogEx(NORMAL, "PingNG successful");
+        if (len >= 4)
+            PrintAndLogEx(NORMAL, "%08x -> %08x", 0xAABBCCDD, resp.arg[1]);
+        if (len >= 8)
+            PrintAndLogEx(NORMAL, "%08x -> %08x", 0xDDCCBBAA, resp.arg[2]);
+    }
+    else
+        PrintAndLogEx(NORMAL, "PingNG failed");
+    return 0;
+}
+
 static command_t CommandTable[] = {
     {"help",          CmdHelp,        1, "This help"},
     {"detectreader",  CmdDetectReader, 0, "['l'|'h'] -- Detect external reader field (option 'l' or 'h' to limit to LF or HF)"},
@@ -454,6 +479,7 @@ static command_t CommandTable[] = {
     {"version",       CmdVersion,     0, "Show version information about the connected Proxmark"},
     {"status",        CmdStatus,      0, "Show runtime status information about the connected Proxmark"},
     {"ping",          CmdPing,        0, "Test if the pm3 is responsive"},
+    {"pingng",          CmdPingNG,        0, "Test if the pm3 is responsive"},
     {NULL, NULL, 0, NULL}
 };
 
diff --git a/client/comms.c b/client/comms.c
index a96823d81..d192b4c90 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -25,10 +25,12 @@ static pthread_t USB_communication_thread;
 
 // Transmit buffer.
 static UsbCommand txBuffer;
+static uint8_t txBufferNG[sizeof(UsbCommandNGPreamble) + sizeof(UsbCommand) + sizeof(UsbCommandNGPostamble)];
+size_t txBufferNGLen;
 static bool txBuffer_pending = false;
 static pthread_mutex_t txBufferMutex = PTHREAD_MUTEX_INITIALIZER;
 static pthread_cond_t txBufferSig = PTHREAD_COND_INITIALIZER;
-
+ 
 // Used by UsbReceiveCommand as a ring buffer for messages that are yet to be
 // processed by a command handler (WaitForResponse{,Timeout})
 static UsbCommand rxBuffer[CMD_BUFFER_SIZE];
@@ -84,6 +86,50 @@ void SendCommand(UsbCommand *c) {
 //__atomic_test_and_set(&txcmd_pending, __ATOMIC_SEQ_CST);
 }
 
+void SendCommandNG(UsbCommand *c, size_t len) {
+
+#ifdef COMMS_DEBUG
+    PrintAndLogEx(NORMAL, "Sending %d bytes of payload | cmd %04x\n", len, c->cmd);
+#endif
+
+    if (offline) {
+        PrintAndLogEx(NORMAL, "Sending bytes to proxmark failed - offline");
+        return;
+    }
+    if (len > USB_CMD_DATA_SIZE) {
+        PrintAndLogEx(WARNING, "Sending %d bytes of payload is too much, abort", len);
+        return;
+    }
+
+    UsbCommandNGPreamble *tx_pre = (UsbCommandNGPreamble *)txBufferNG;
+    UsbCommandNGPostamble *tx_post = (UsbCommandNGPostamble *)(txBufferNG + sizeof(UsbCommandNGPreamble) + sizeof(UsbCommandNG) + len);
+
+    pthread_mutex_lock(&txBufferMutex);
+    /**
+    This causes hangups at times, when the pm3 unit is unresponsive or disconnected. The main console thread is alive,
+    but comm thread just spins here. Not good.../holiman
+    **/
+    while (txBuffer_pending) {
+        // wait for communication thread to complete sending a previous commmand
+        pthread_cond_wait(&txBufferSig, &txBufferMutex);
+    }
+
+    tx_pre->magic = USB_PREAMBLE_MAGIC;
+    tx_pre->length = len;
+    memcpy(txBufferNG + sizeof(UsbCommandNGPreamble), c, sizeof(UsbCommandNG) + len);
+    // TODO CRC
+    tx_post->magic = USB_POSTAMBLE_MAGIC;
+    txBufferNGLen = sizeof(UsbCommandNGPreamble) + sizeof(UsbCommandNG) + len + sizeof(UsbCommandNGPostamble);
+    txBuffer_pending = true;
+
+    // tell communication thread that a new command can be send
+    pthread_cond_signal(&txBufferSig);
+
+    pthread_mutex_unlock(&txBufferMutex);
+
+//__atomic_test_and_set(&txcmd_pending, __ATOMIC_SEQ_CST);
+}
+
 /**
  * @brief This method should be called when sending a new command to the pm3. In case any old
  *  responses from previous commands are stored in the buffer, a call to this method should clear them.
@@ -273,9 +319,17 @@ __attribute__((force_align_arg_pointer))
         }
 
         if (txBuffer_pending) {
-            if (!uart_send(sp, (uint8_t *) &txBuffer, sizeof(UsbCommand))) {
-                //counter_to_offline++;
-                PrintAndLogEx(WARNING, "sending bytes to proxmark failed");
+            if (txBufferNGLen) { // NG packet
+                if (!uart_send(sp, (uint8_t *) &txBufferNG, txBufferNGLen)) {
+                    //counter_to_offline++;
+                    PrintAndLogEx(WARNING, "sending bytes to proxmark failed");
+                }
+                txBufferNGLen = 0;
+            } else {
+                if (!uart_send(sp, (uint8_t *) &txBuffer, sizeof(UsbCommand))) {
+                    //counter_to_offline++;
+                    PrintAndLogEx(WARNING, "sending bytes to proxmark failed");
+                }
             }
             txBuffer_pending = false;
 
diff --git a/client/comms.h b/client/comms.h
index 68f790eb1..d6704617b 100644
--- a/client/comms.h
+++ b/client/comms.h
@@ -52,6 +52,7 @@ bool IsOffline(void);
 
 void *uart_receiver(void *targ);
 void SendCommand(UsbCommand *c);
+void SendCommandNG(UsbCommand *c, size_t len);
 void clearCommandBuffer(void);
 
 #define FLASHMODE_SPEED 460800
diff --git a/common/cmd.c b/common/cmd.c
index ab8eeedaa..74f8c00f5 100644
--- a/common/cmd.c
+++ b/common/cmd.c
@@ -31,15 +31,16 @@
  */
 #include "cmd.h"
 
+bool use_cmd_ng = false;
 #ifdef WITH_FPC_HOST
 // "Session" flag, to tell via which interface next msgs should be sent: USB or FPC USART
-bool reply_via_fpc = 0;
+bool reply_via_fpc = false;
 
 extern void Dbprintf(const char *fmt, ...);
 #define Dbprintf_usb(...) {\
-        reply_via_fpc = 0;\
+        reply_via_fpc = false;\
         Dbprintf(__VA_ARGS__);\
-        reply_via_fpc = 1;}
+        reply_via_fpc = true;}
 #endif
 
 uint8_t cmd_send(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len) {
diff --git a/common/usb_cdc.c b/common/usb_cdc.c
index 010d9d2b7..c66593a33 100644
--- a/common/usb_cdc.c
+++ b/common/usb_cdc.c
@@ -646,6 +646,65 @@ uint32_t usb_read(uint8_t *data, size_t len) {
     return nbBytesRcv;
 }
 
+static uint8_t usb_read_ng_buffer[64];
+static size_t usb_read_ng_bufoff=0;
+static size_t usb_read_ng_buflen=0;
+
+uint32_t usb_read_ng(uint8_t *data, size_t len) {
+
+    if (len == 0) return 0;
+
+    uint8_t bank = btReceiveBank;
+    uint32_t packetSize, nbBytesRcv = 0;
+    uint32_t time_out = 0;
+
+    // take first from local buffer
+    if ( len <= usb_read_ng_buflen ) {
+        for (uint32_t i = 0; i < len; i++)
+            data[nbBytesRcv++] = usb_read_ng_buffer[usb_read_ng_bufoff + i];
+        usb_read_ng_buflen -= len;
+        if (usb_read_ng_buflen == 0)
+            usb_read_ng_bufoff = 0;
+        else
+            usb_read_ng_bufoff += len;
+        return nbBytesRcv;
+    } else {
+        for (uint32_t i = 0; i < usb_read_ng_buflen; i++)
+            data[nbBytesRcv++] = usb_read_ng_buffer[usb_read_ng_bufoff + i];
+        len -= usb_read_ng_buflen;
+        usb_read_ng_buflen = 0;
+        usb_read_ng_bufoff = 0;
+    }
+
+    while (len)  {
+        if (!usb_check()) break;
+
+        if ((pUdp->UDP_CSR[AT91C_EP_OUT] & bank)) {
+
+            uint32_t available = (pUdp->UDP_CSR[AT91C_EP_OUT] & AT91C_UDP_RXBYTECNT) >> 16;
+            packetSize = MIN(available, len);
+            available -= packetSize;
+            len -= packetSize;
+            while (packetSize--)
+                data[nbBytesRcv++] = pUdp->UDP_FDR[AT91C_EP_OUT];
+            // fill the local buffer with the remaining bytes
+            for (uint32_t i = 0; i < available; i++)
+                usb_read_ng_buffer[i] = pUdp->UDP_FDR[AT91C_EP_OUT];
+            usb_read_ng_buflen = available;
+            // flip bank
+            UDP_CLEAR_EP_FLAGS(AT91C_EP_OUT, bank)
+            if (bank == AT91C_UDP_RX_DATA_BK0)
+                bank = AT91C_UDP_RX_DATA_BK1;
+            else
+                bank = AT91C_UDP_RX_DATA_BK0;
+        }
+        if (time_out++ == 0x1fff) break;
+    }
+
+    btReceiveBank = bank;
+    return nbBytesRcv;
+}
+
 //*----------------------------------------------------------------------------
 //* \fn    usb_write
 //* \brief Send through endpoint 2 (device to host)
diff --git a/common/usb_cdc.h b/common/usb_cdc.h
index a74e3d8c1..d5a4451ea 100644
--- a/common/usb_cdc.h
+++ b/common/usb_cdc.h
@@ -48,6 +48,8 @@ bool usb_poll(void);
 bool usb_poll_validate_length(void);
 uint32_t usb_read(uint8_t *data, size_t len);
 uint32_t usb_write(const uint8_t *data, const size_t len);
+uint32_t usb_read_ng(uint8_t *data, size_t len);
+uint32_t usb_write_ng(const uint8_t *data, const size_t len);
 
 void SetUSBreconnect(int value);
 int GetUSBreconnect(void);
diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index 57f2c46fd..cbef5aa02 100644
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -35,6 +35,27 @@ typedef struct {
     } d;
 } PACKED UsbCommand;
 
+typedef struct {
+    uint32_t magic;
+    uint32_t length;  // length of the variable part, 0 if none.
+} PACKED UsbCommandNGPreamble;
+
+#define USB_PREAMBLE_MAGIC 0xAA5500FF
+
+typedef struct {
+    uint64_t cmd;
+    uint64_t arg[3];
+} PACKED UsbCommandNG;
+
+typedef struct {
+    uint32_t crc;
+    uint32_t magic;
+} PACKED UsbCommandNGPostamble;
+
+#define USB_POSTAMBLE_MAGIC 0xFF0055AA
+
+extern bool use_cmd_ng;
+
 #ifdef WITH_FPC_HOST
 // "Session" flag, to tell via which interface next msgs should be sent: USB or FPC USART
 extern bool reply_via_fpc;

From 30a1604f2f83f45d2413322ed7a93a443dd1738c Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 16 Apr 2019 14:01:12 +0300
Subject: [PATCH 1256/1938] no message

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 1ebbfea5c..40b35e8da 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -304,7 +304,7 @@ test_script:
 
     #proxmark crypto tests
 
-    ExecTest "emv test" "emv test" {bash -lc "cd ~/client;./proxmark3 comx -c 'emv test'"} "Tests ?OK"
+    ExecTest "emv test" "emv test" {bash -lc "cd ~/client;./proxmark3 comx -c 'emv test'"} "Test(s) [ OK"
 
 
     if ($global:TestsPassed) {

From 8d7ed5dec1d39204a5db9d2472399da20b1c8472 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 16 Apr 2019 14:13:57 +0300
Subject: [PATCH 1257/1938] fix tests output

---
 appveyor.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 40b35e8da..0a6518702 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -292,9 +292,11 @@ test_script:
 
     #proxmark logic tests
 
-    ExecTest "proxmark help" "proxmark3 -h" {bash -lc 'cd ~/client;./proxmark3 -h | grep -q Execute && echo Passed || echo Failed'}
+    ExecTest "proxmark help" "proxmark3 -h" {bash -lc 'cd ~/client;./proxmark3 -h | grep -q wait && echo Passed || echo Failed'}
 
-    ExecTest "proxmark help hardnested" "proxmark3 -h" {bash -lc 'cd ~/client;./proxmark3 -h | grep -q hardnested && echo Passed || echo Failed'}
+    ExecTest "proxmark help text ISO7816" "proxmark3 -t" {bash -lc 'cd ~/client;./proxmark3 -h | grep -q ISO7816 && echo Passed || echo Failed'}
+
+    ExecTest "proxmark help text hardnested" "proxmark3 -h" {bash -lc 'cd ~/client;./proxmark3 -t | grep -q hardnested && echo Passed || echo Failed'}
 
 
     ExecTest "hf mf offline text" "hf mf" {bash -lc "cd ~/client;./proxmark3 comx -c 'hf mf'"} "at_enc"
@@ -304,7 +306,7 @@ test_script:
 
     #proxmark crypto tests
 
-    ExecTest "emv test" "emv test" {bash -lc "cd ~/client;./proxmark3 comx -c 'emv test'"} "Test(s) [ OK"
+    ExecTest "emv test" "emv test" {bash -lc "cd ~/client;./proxmark3 comx -c 'emv test'"} "Test?s? ? OK"
 
 
     if ($global:TestsPassed) {

From 5dd202eeb8520a29d4ca87a05b5f55ad7d7a65b9 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 16 Apr 2019 14:50:38 +0300
Subject: [PATCH 1258/1938] small fix

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 0a6518702..84f7236dc 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -296,7 +296,7 @@ test_script:
 
     ExecTest "proxmark help text ISO7816" "proxmark3 -t" {bash -lc 'cd ~/client;./proxmark3 -h | grep -q ISO7816 && echo Passed || echo Failed'}
 
-    ExecTest "proxmark help text hardnested" "proxmark3 -h" {bash -lc 'cd ~/client;./proxmark3 -t | grep -q hardnested && echo Passed || echo Failed'}
+    ExecTest "proxmark help text hardnested" "proxmark3 -t" {bash -lc 'cd ~/client;./proxmark3 -t | grep -q hardnested && echo Passed || echo Failed'}
 
 
     ExecTest "hf mf offline text" "hf mf" {bash -lc "cd ~/client;./proxmark3 comx -c 'hf mf'"} "at_enc"

From 6f267c24565fc7d02bd84bb66c5f16b14ad2311e Mon Sep 17 00:00:00 2001
From: Oleg Moiseenko <807634+merlokk@users.noreply.github.com>
Date: Tue, 16 Apr 2019 14:56:06 +0300
Subject: [PATCH 1259/1938] small fix

---
 Installation_Instructions/Coverity-Scan-Config-&-Run.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Installation_Instructions/Coverity-Scan-Config-&-Run.md b/Installation_Instructions/Coverity-Scan-Config-&-Run.md
index 9979c41e1..85e9cdbef 100644
--- a/Installation_Instructions/Coverity-Scan-Config-&-Run.md
+++ b/Installation_Instructions/Coverity-Scan-Config-&-Run.md
@@ -21,4 +21,4 @@ Make a tarball
 tar czvf proxmark3.tgz cov-int
 ```
 
-Upload it to coverity.com
+Upload it to scan.coverity.com

From 92541ae0e674ec9c5504dbad1d553815acf7e154 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 16 Apr 2019 15:08:07 +0300
Subject: [PATCH 1260/1938] small fix

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 84f7236dc..c285c8d09 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -294,7 +294,7 @@ test_script:
 
     ExecTest "proxmark help" "proxmark3 -h" {bash -lc 'cd ~/client;./proxmark3 -h | grep -q wait && echo Passed || echo Failed'}
 
-    ExecTest "proxmark help text ISO7816" "proxmark3 -t" {bash -lc 'cd ~/client;./proxmark3 -h | grep -q ISO7816 && echo Passed || echo Failed'}
+    ExecTest "proxmark help text ISO7816" "proxmark3 -t" {bash -lc 'cd ~/client;./proxmark3 -t | grep -q ISO7816 && echo Passed || echo Failed'}
 
     ExecTest "proxmark help text hardnested" "proxmark3 -t" {bash -lc 'cd ~/client;./proxmark3 -t | grep -q hardnested && echo Passed || echo Failed'}
 

From 050be575b25cd6a275a53fcfcbb67d3dab9b4897 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 16 Apr 2019 15:20:58 +0300
Subject: [PATCH 1261/1938] fix error terminal thread

---
 appveyor.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index c285c8d09..b54f1169a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -294,9 +294,9 @@ test_script:
 
     ExecTest "proxmark help" "proxmark3 -h" {bash -lc 'cd ~/client;./proxmark3 -h | grep -q wait && echo Passed || echo Failed'}
 
-    ExecTest "proxmark help text ISO7816" "proxmark3 -t" {bash -lc 'cd ~/client;./proxmark3 -t | grep -q ISO7816 && echo Passed || echo Failed'}
+    ExecTest "proxmark help text ISO7816" "proxmark3 -t" {bash -lc 'cd ~/client;./proxmark3 -t 2>&1 | grep -q ISO7816 && echo Passed || echo Failed'}
 
-    ExecTest "proxmark help text hardnested" "proxmark3 -t" {bash -lc 'cd ~/client;./proxmark3 -t | grep -q hardnested && echo Passed || echo Failed'}
+    ExecTest "proxmark help text hardnested" "proxmark3 -t" {bash -lc 'cd ~/client;./proxmark3 -t 2>&1 | grep -q hardnested && echo Passed || echo Failed'}
 
 
     ExecTest "hf mf offline text" "hf mf" {bash -lc "cd ~/client;./proxmark3 comx -c 'hf mf'"} "at_enc"

From ac7bd3532f24ea096fdd576e944ad2737125ba94 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 16 Apr 2019 15:02:44 +0200
Subject: [PATCH 1262/1938] style

---
 armsrc/hitagS.c | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/armsrc/hitagS.c b/armsrc/hitagS.c
index 5c7bec491..e51f720da 100644
--- a/armsrc/hitagS.c
+++ b/armsrc/hitagS.c
@@ -647,7 +647,7 @@ static void hitagS_handle_reader_command(uint8_t *rx, const size_t rxlen,
 static int hitagS_handle_tag_auth(hitag_function htf, uint64_t key, uint64_t NrAr, uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t *txlen) {
     uint8_t rx_air[HITAG_FRAME_LEN];
     int response_bit[200];
-    int i, j, z, k;
+    int i, j, z;
     unsigned char mask = 1;
     unsigned char uid[32];
     uint8_t uid1 = 0x00, uid2 = 0x00, uid3 = 0x00, uid4 = 0x00;
@@ -673,7 +673,7 @@ static int hitagS_handle_tag_auth(hitag_function htf, uint64_t key, uint64_t NrA
                 z++;
             }
         }
-        k = 0;
+        uint16_t k = 0;
         for (i = 5; i < z; i += 2) {
             uid[k] = response_bit[i];
             k++;
@@ -1749,22 +1749,17 @@ void WritePageHitagS(hitag_function htf, hitag_data *htd, int page) {
  */
 void check_challenges(bool file_given, uint8_t *data) {
     int i, j, z, k;
-    uint8_t uid_byte[4];
     int frame_count = 0, response = 0;
+    uint8_t uid_byte[4];
     uint8_t rx[HITAG_FRAME_LEN];
     uint8_t unlocker[60][8];
     int u1 = 0;
-    size_t rxlen = 0;
+    size_t rxlen = 0, txlen = 0;
     uint8_t txbuf[HITAG_FRAME_LEN];
-    uint8_t *tx = txbuf;
-    size_t txlen = 0;
-    int lastbit;
-    bool bSkip;
-    int reset_sof;
-    int tag_sof;
+    uint8_t *tx;
     int t_wait = HITAG_T_WAIT_MAX;
-    int STATE = 0;
-    bool bStop;
+    int lastbit, reset_sof, tag_sof, STATE = 0;;
+    bool bSkip, bStop;
     int response_bit[200];
     unsigned char mask = 1;
     unsigned char uid[32];

From 9a5b23428dde322182bc2844331f0fbc2963a248 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 16 Apr 2019 15:05:01 +0200
Subject: [PATCH 1263/1938] style

---
 armsrc/felica.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/armsrc/felica.c b/armsrc/felica.c
index f220a8a24..ca03836ed 100644
--- a/armsrc/felica.c
+++ b/armsrc/felica.c
@@ -391,6 +391,7 @@ bool WaitForFelicaReply(uint16_t maxbytes) {
 
     // clear RXRDY:
     uint8_t b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
+    (void)b;
 
     uint32_t timeout = iso18092_get_timeout();
     for (;;) {
@@ -481,7 +482,7 @@ void felica_sendraw(UsbCommand *c) {
     felica_command_t param = c->arg[0];
     size_t len = c->arg[1] & 0xffff;
     uint8_t *cmd = c->d.asBytes;
-    uint32_t arg0 = 0;
+    uint32_t arg0;
 
     felica_card_select_t card;
 
@@ -519,7 +520,6 @@ void felica_sendraw(UsbCommand *c) {
             // Don't append crc on empty bytearray...
             if (len > 0) {
                 AddCrc(buf, len);
-                len += 2;
             }
         }
 

From 00f3c281bbf658460fedf103147f7e2c1a9ec2cd Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 16 Apr 2019 15:06:14 +0200
Subject: [PATCH 1264/1938] style

---
 armsrc/hitagS.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/armsrc/hitagS.c b/armsrc/hitagS.c
index e51f720da..842811473 100644
--- a/armsrc/hitagS.c
+++ b/armsrc/hitagS.c
@@ -650,7 +650,7 @@ static int hitagS_handle_tag_auth(hitag_function htf, uint64_t key, uint64_t NrA
     int i, j, z;
     unsigned char mask = 1;
     unsigned char uid[32];
-    uint8_t uid1 = 0x00, uid2 = 0x00, uid3 = 0x00, uid4 = 0x00;
+    uint8_t uid1, uid2, uid3, uid4;
     unsigned char crc;
     uint64_t state;
     uint8_t auth_ks[4];

From e5928424b6beb8bbf7097e7eb71b8001e35eb9d7 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 16 Apr 2019 15:08:51 +0200
Subject: [PATCH 1265/1938] style

---
 armsrc/iso14443a.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 6e2ac1e85..4dde7846a 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -521,7 +521,7 @@ void RAMFUNC SniffIso14443a(uint8_t param) {
     // triggered == false -- to wait first for card
     bool triggered = !(param & 0x03);
 
-    uint32_t rsamples = 0;
+    uint32_t rx_samples = 0;
 
     DbpString("Starting to sniff");
 
@@ -562,11 +562,11 @@ void RAMFUNC SniffIso14443a(uint8_t param) {
         LED_A_OFF();
 
         // Need two samples to feed Miller and Manchester-Decoder
-        if (rsamples & 0x01) {
+        if (rx_samples & 0x01) {
 
             if (!TagIsActive) {        // no need to try decoding reader data if the tag is sending
                 uint8_t readerdata = (previous_data & 0xF0) | (*data >> 4);
-                if (MillerDecoding(readerdata, (rsamples - 1) * 4)) {
+                if (MillerDecoding(readerdata, (rx_samples - 1) * 4)) {
                     LED_C_ON();
 
                     // check - if there is a short 7bit request from reader
@@ -593,7 +593,7 @@ void RAMFUNC SniffIso14443a(uint8_t param) {
             // no need to try decoding tag data if the reader is sending - and we cannot afford the time
             if (!ReaderIsActive) {
                 uint8_t tagdata = (previous_data << 4) | (*data & 0x0F);
-                if (ManchesterDecoding(tagdata, 0, (rsamples - 1) * 4)) {
+                if (ManchesterDecoding(tagdata, 0, (rx_samples - 1) * 4)) {
                     LED_B_ON();
 
                     if (!LogTrace(receivedResp,
@@ -617,7 +617,7 @@ void RAMFUNC SniffIso14443a(uint8_t param) {
         }
 
         previous_data = *data;
-        rsamples++;
+        rx_samples++;
         data++;
         if (data == dmaBuf + DMA_BUFFER_SIZE) {
             data = dmaBuf;

From 144237abfd2f3434a06353b3317a40b79729c84f Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 16 Apr 2019 15:09:57 +0200
Subject: [PATCH 1266/1938] style

---
 armsrc/iso14443b.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/armsrc/iso14443b.c b/armsrc/iso14443b.c
index 2fa9b54b4..052351173 100644
--- a/armsrc/iso14443b.c
+++ b/armsrc/iso14443b.c
@@ -947,7 +947,6 @@ static RAMFUNC int Handle14443bTagSamplesDemod(int ci, int cq) {
 static void GetTagSamplesFor14443bDemod() {
     bool gotFrame, finished = false;
 //    int lastRxCounter = ISO14443B_DMA_BUFFER_SIZE;
-    int ci = 0, cq = 0;
     uint32_t time_0 = 0, time_stop = 0;
 
     BigBuf_free();
@@ -978,8 +977,8 @@ static void GetTagSamplesFor14443bDemod() {
         WDT_HIT();
 
         // LSB is a fpga signal bit.
-        ci = upTo[0];
-        cq = upTo[1];
+        int ci = upTo[0];
+        int cq = upTo[1];
         upTo += 2;
 //        lastRxCounter -= 2;
 

From 75524b72d170ac2f08b5808f1e8e9665d3442373 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 16 Apr 2019 15:10:55 +0200
Subject: [PATCH 1267/1938] style

---
 armsrc/optimized_cipher.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/armsrc/optimized_cipher.c b/armsrc/optimized_cipher.c
index faf739beb..fee3c156f 100644
--- a/armsrc/optimized_cipher.c
+++ b/armsrc/optimized_cipher.c
@@ -112,7 +112,7 @@ void opt_successor(const uint8_t *k, State *s, bool y, State *successor) {
 void opt_suc(const uint8_t *k, State *s, uint8_t *in, uint8_t length, bool add32Zeroes) {
     State x2;
     int i;
-    uint8_t head = 0;
+    uint8_t head;
     for (i = 0; i < length; i++) {
         head = 1 & (in[i] >> 7);
         opt_successor(k, s, head, &x2);
@@ -149,8 +149,7 @@ void opt_suc(const uint8_t *k, State *s, uint8_t *in, uint8_t length, bool add32
 }
 
 void opt_output(const uint8_t *k, State *s,  uint8_t *buffer) {
-    uint8_t times = 0;
-    uint8_t bout = 0;
+    uint8_t bout, times = 0;
     State temp = {0, 0, 0, 0};
     for (; times < 4; times++) {
         bout = 0;

From 87a74e98b885c14100f3e606f63677ef773d395d Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 16 Apr 2019 15:19:53 +0200
Subject: [PATCH 1268/1938] style

---
 common/crapto1/crapto1.c  |  7 +++----
 tools/nonce2key/crapto1.c | 20 ++++----------------
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/common/crapto1/crapto1.c b/common/crapto1/crapto1.c
index ea496e1c4..232afb4a0 100644
--- a/common/crapto1/crapto1.c
+++ b/common/crapto1/crapto1.c
@@ -85,13 +85,12 @@ static struct Crypto1State *
 recover(uint32_t *o_head, uint32_t *o_tail, uint32_t oks,
         uint32_t *e_head, uint32_t *e_tail, uint32_t eks, int rem,
         struct Crypto1State *sl, uint32_t in, bucket_array_t bucket) {
-    uint32_t *o, *e;
     bucket_info_t bucket_info;
 
     if (rem == -1) {
-        for (e = e_head; e <= e_tail; ++e) {
+        for (uint32_t *e = e_head; e <= e_tail; ++e) {
             *e = *e << 1 ^ (evenparity32(*e & LF_POLY_EVEN)) ^ !!(in & 4);
-            for (o = o_head; o <= o_tail; ++o, ++sl) {
+            for (uint32_t *o = o_head; o <= o_tail; ++o, ++sl) {
                 sl->even = *o;
                 sl->odd = *e ^ (evenparity32(*o & LF_POLY_ODD));
                 sl[1].odd = sl[1].even = 0;
@@ -301,7 +300,7 @@ uint8_t lfsr_rollback_bit(struct Crypto1State *s, uint32_t in, int fb) {
     out ^= LF_POLY_EVEN & (s->even >>= 1);
     out ^= LF_POLY_ODD & s->odd;
     out ^= !!in;
-    out ^= (ret = filter(s->odd)) & !!fb;
+    out ^= (ret = filter(s->odd)) & (!!fb);
 
     s->even |= (evenparity32(out)) << 23;
     return ret;
diff --git a/tools/nonce2key/crapto1.c b/tools/nonce2key/crapto1.c
index 9026a57bb..bc9165f0e 100644
--- a/tools/nonce2key/crapto1.c
+++ b/tools/nonce2key/crapto1.c
@@ -368,12 +368,6 @@ uint8_t lfsr_rollback_bit(struct Crypto1State *s, uint32_t in, int fb) {
  * Rollback the shift register in order to get previous states
  */
 uint8_t lfsr_rollback_byte(struct Crypto1State *s, uint32_t in, int fb) {
-    /*
-    int i, ret = 0;
-    for (i = 7; i >= 0; --i)
-        ret |= lfsr_rollback_bit(s, BIT(in, i), fb) << i;
-    */
-// unfold loop 20160112
     uint8_t ret = 0;
     ret |= lfsr_rollback_bit(s, BIT(in, 7), fb) << 7;
     ret |= lfsr_rollback_bit(s, BIT(in, 6), fb) << 6;
@@ -389,13 +383,7 @@ uint8_t lfsr_rollback_byte(struct Crypto1State *s, uint32_t in, int fb) {
  * Rollback the shift register in order to get previous states
  */
 uint32_t lfsr_rollback_word(struct Crypto1State *s, uint32_t in, int fb) {
-    /*
-    int i;
-    uint32_t ret = 0;
-    for (i = 31; i >= 0; --i)
-        ret |= lfsr_rollback_bit(s, BEBIT(in, i), fb) << (i ^ 24);
-    */
-// unfold loop 20160112
+
     uint32_t ret = 0;
     ret |= lfsr_rollback_bit(s, BEBIT(in, 31), fb) << (31 ^ 24);
     ret |= lfsr_rollback_bit(s, BEBIT(in, 30), fb) << (30 ^ 24);
@@ -442,7 +430,7 @@ static uint16_t *dist = 0;
 int nonce_distance(uint32_t from, uint32_t to) {
     uint16_t x, i;
     if (!dist) {
-        dist = malloc(2 << 16);
+        dist = calloc(2 << 16,  sizeof(uint8_t));
         if (!dist)
             return -1;
         for (x = i = 1; i; ++i) {
@@ -470,7 +458,7 @@ static uint32_t fastfwd[2][8] = {
  * only correct iff [NR_3] ^ NR_3 does not depend on Nr_3
  */
 uint32_t *lfsr_prefix_ks(uint8_t ks[8], int isodd) {
-    uint32_t *candidates = malloc(4 << 10);
+    uint32_t *candidates = calloc(4 << 10, sizeof(uint8_t));
     if (!candidates) return 0;
 
     uint32_t c,  entry;
@@ -538,7 +526,7 @@ struct Crypto1State *lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8]
     odd = lfsr_prefix_ks(ks, 1);
     even = lfsr_prefix_ks(ks, 0);
 
-    s = statelist = malloc((sizeof * statelist) << 20);
+    s = statelist = malloc((sizeof * statelist) << 24); // was << 20. Need more for no_par special attack. Enough???
     if (!s || !odd || !even) {
         free(statelist);
         statelist = 0;

From e30dbf3ecd4177cea7af04608c6b90b772b0d1c6 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 16 Apr 2019 15:22:39 +0200
Subject: [PATCH 1269/1938] style

---
 common/crapto1/crypto1.c  |  2 +-
 tools/nonce2key/crypto1.c | 14 --------------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/common/crapto1/crypto1.c b/common/crapto1/crypto1.c
index 46e9fc239..7d6bb6e7d 100644
--- a/common/crapto1/crypto1.c
+++ b/common/crapto1/crypto1.c
@@ -68,7 +68,7 @@ uint8_t crypto1_bit(struct Crypto1State *s, uint8_t in, int is_encrypted) {
     uint32_t feedin, t;
     uint8_t ret = filter(s->odd);
 
-    feedin  = ret & !!is_encrypted;
+    feedin  = ret & (!!is_encrypted);
     feedin ^= !!in;
     feedin ^= LF_POLY_ODD & s->odd;
     feedin ^= LF_POLY_EVEN & s->even;
diff --git a/tools/nonce2key/crypto1.c b/tools/nonce2key/crypto1.c
index 0c3f97b88..f6f4642e2 100644
--- a/tools/nonce2key/crypto1.c
+++ b/tools/nonce2key/crypto1.c
@@ -62,13 +62,6 @@ uint8_t crypto1_bit(struct Crypto1State *s, uint8_t in, int is_encrypted) {
     return ret;
 }
 uint8_t crypto1_byte(struct Crypto1State *s, uint8_t in, int is_encrypted) {
-    /*
-    uint8_t i, ret = 0;
-
-    for (i = 0; i < 8; ++i)
-        ret |= crypto1_bit(s, BIT(in, i), is_encrypted) << i;
-    */
-// unfold loop 20161012
     uint8_t ret = 0;
     ret |= crypto1_bit(s, BIT(in, 0), is_encrypted) << 0;
     ret |= crypto1_bit(s, BIT(in, 1), is_encrypted) << 1;
@@ -81,13 +74,6 @@ uint8_t crypto1_byte(struct Crypto1State *s, uint8_t in, int is_encrypted) {
     return ret;
 }
 uint32_t crypto1_word(struct Crypto1State *s, uint32_t in, int is_encrypted) {
-    /*
-    uint32_t i, ret = 0;
-
-    for (i = 0; i < 32; ++i)
-        ret |= crypto1_bit(s, BEBIT(in, i), is_encrypted) << (i ^ 24);
-    */
-//unfold loop 2016012
     uint32_t ret = 0;
     ret |= crypto1_bit(s, BEBIT(in, 0), is_encrypted) << (0 ^ 24);
     ret |= crypto1_bit(s, BEBIT(in, 1), is_encrypted) << (1 ^ 24);

From 1c4a7709da9769e65dd82132130cb6665a9e2652 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 16 Apr 2019 15:27:25 +0200
Subject: [PATCH 1270/1938] style

---
 client/cliparser/argtable3.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cliparser/argtable3.c b/client/cliparser/argtable3.c
index 019603f50..5c6947670 100644
--- a/client/cliparser/argtable3.c
+++ b/client/cliparser/argtable3.c
@@ -2552,7 +2552,7 @@ static int arg_rex_scanfn(struct arg_rex *parent, const char *argval) {
     int errorcode = 0;
     const TRexChar *error = NULL;
     TRex *rex = NULL;
-    TRexBool is_match = TRex_False;
+    TRexBool is_match;
 
     if (parent->count == parent->hdr.maxcount) {
         /* maximum number of arguments exceeded */

From 7b30126371d50698cc18db22f979ba980d9f185f Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 16 Apr 2019 15:29:18 +0200
Subject: [PATCH 1271/1938] style

---
 client/cmdhfmf.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 67e56e8e2..2ab4a81f6 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -605,10 +605,8 @@ static int CmdHF14AMfRdBl(const char *Cmd) {
 
 static int CmdHF14AMfRdSc(const char *Cmd) {
     int i;
-    uint8_t sectorNo = 0;
-    uint8_t keyType = 0;
+    uint8_t isOK, sectorNo = 0, keyType = 0;
     uint8_t key[6] = {0, 0, 0, 0, 0, 0};
-    uint8_t isOK  = 0;
     uint8_t *data  = NULL;
     char cmdp = 0x00;
 
@@ -799,10 +797,9 @@ static int CmdHF14AMfDump(const char *Cmd) {
 
     fclose(f);
 
-
     PrintAndLogEx(INFO, "Reading sector access bits...");
 
-    uint8_t tries = 0;
+    uint8_t tries;
     for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
         for (tries = 0; tries < MIFARE_SECTOR_RETRY; tries++) {
 

From 7bc3bea2307bd4802368f4dedb6297d83184eec5 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 16 Apr 2019 15:32:37 +0200
Subject: [PATCH 1272/1938] style

---
 common/crapto1/crapto1.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/crapto1/crapto1.c b/common/crapto1/crapto1.c
index 232afb4a0..a74fbb36c 100644
--- a/common/crapto1/crapto1.c
+++ b/common/crapto1/crapto1.c
@@ -89,7 +89,7 @@ recover(uint32_t *o_head, uint32_t *o_tail, uint32_t oks,
 
     if (rem == -1) {
         for (uint32_t *e = e_head; e <= e_tail; ++e) {
-            *e = *e << 1 ^ (evenparity32(*e & LF_POLY_EVEN)) ^ !!(in & 4);
+            *e = *e << 1 ^ (evenparity32(*e & LF_POLY_EVEN)) ^ (!!(in & 4));
             for (uint32_t *o = o_head; o <= o_tail; ++o, ++sl) {
                 sl->even = *o;
                 sl->odd = *e ^ (evenparity32(*o & LF_POLY_ODD));

From d8f756fd14e0e587a6512569b32e606f9d471a1e Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 16 Apr 2019 15:43:53 +0200
Subject: [PATCH 1273/1938] style

---
 client/loclass/elite_crack.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/loclass/elite_crack.c b/client/loclass/elite_crack.c
index 7df30c696..a461557b1 100644
--- a/client/loclass/elite_crack.c
+++ b/client/loclass/elite_crack.c
@@ -504,8 +504,8 @@ int bruteforceDump(uint8_t dump[], size_t dumpsize, uint16_t keytable[]) {
         errors += bruteforceItem(*attack, keytable);
     }
     free(attack);
-
-    PrintAndLogDevice(SUCCESS, "time: %" PRIu64 " seconds", (msclock() - t1) / 1000);
+    t1 = msclock() - t1;
+    PrintAndLogDevice(SUCCESS, "time: %" PRIu64 " seconds", t1 / 1000);
 
     // Pick out the first 16 bytes of the keytable.
     // The keytable is now in 16-bit ints, where the upper 8 bits

From a6f145bd1ae12c9d89306466267521795c2616d2 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 16 Apr 2019 15:47:21 +0200
Subject: [PATCH 1274/1938] style

---
 client/loclass/cipher.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/loclass/cipher.c b/client/loclass/cipher.c
index 331e0b44e..76a3c1375 100644
--- a/client/loclass/cipher.c
+++ b/client/loclass/cipher.c
@@ -118,7 +118,7 @@ static uint8_t _select(bool x, bool y, uint8_t r) {
     uint8_t retval = 0;
     retval |= (z0 << 2) & 4;
     retval |= (z1 << 1) & 2;
-    retval |= z2 & 1;
+    retval |= (z2) & 1;
 
     // Return value 0 <= retval <= 7
     return retval;

From eae370fc3dc5dc4896e22e7eb92fb0b2a990b6c7 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 16 Apr 2019 15:51:13 +0200
Subject: [PATCH 1275/1938] not null?

---
 client/emv/emv_pk.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/emv/emv_pk.c b/client/emv/emv_pk.c
index 7b8cdd233..f78997f5a 100644
--- a/client/emv/emv_pk.c
+++ b/client/emv/emv_pk.c
@@ -43,7 +43,7 @@
 static ssize_t emv_pk_read_bin(char *buf, unsigned char *bin, size_t size, size_t *read) {
     size_t left = size;
     char *p = buf;
-    while (*p != 0 && *p == ' ')
+    while (p != NULL && *p == ' ')
         p++;
 
     while (left > 0) {
@@ -70,7 +70,7 @@ static ssize_t emv_pk_read_bin(char *buf, unsigned char *bin, size_t size, size_
             return -(p - buf);
     }
 
-    while (*p != 0 && *p == ' ')
+    while (p != NULL && *p == ' ')
         p++;
 
     p--;
@@ -85,7 +85,7 @@ static ssize_t emv_pk_read_ymv(char *buf, unsigned *ymv) {
 
     *ymv = 0;
 
-    while (*p != 0 && *p == ' ')
+    while (p != NULL && *p == ' ')
         p++;
 
     for (i = 0; i < 3; i++) {
@@ -101,7 +101,7 @@ static ssize_t emv_pk_read_ymv(char *buf, unsigned *ymv) {
         temp[i] = (c1 * 16 + c2);
     }
 
-    while (*p != 0 && *p == ' ')
+    while (p != NULL && *p == ' ')
         p++;
 
     p--;
@@ -116,7 +116,7 @@ static ssize_t emv_pk_read_ymv(char *buf, unsigned *ymv) {
 
 static ssize_t emv_pk_read_string(char *buf, char *str, size_t size) {
     char *p = buf;
-    while (*p != 0 && *p == ' ')
+    while (p != NULL && *p == ' ')
         p++;
 
     while (size > 1) {
@@ -132,7 +132,7 @@ static ssize_t emv_pk_read_string(char *buf, char *str, size_t size) {
 
     *str = 0;
 
-    while (*p != 0 && *p == ' ')
+    while (p != NULL && *p == ' ')
         p++;
 
     p--;

From f50566225c51dd9e0eac20d3424a2947db3c091b Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 16 Apr 2019 16:02:03 +0200
Subject: [PATCH 1276/1938] styles

---
 client/emv/emv_pk.c    | 24 ++++++++++++++++++------
 client/fpga_compress.c | 12 +++++-------
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/client/emv/emv_pk.c b/client/emv/emv_pk.c
index f78997f5a..a0bb80979 100644
--- a/client/emv/emv_pk.c
+++ b/client/emv/emv_pk.c
@@ -41,9 +41,13 @@
 #define TOHEX(v) ((v) < 10 ? (v) + '0' : (v) - 10 + 'a')
 
 static ssize_t emv_pk_read_bin(char *buf, unsigned char *bin, size_t size, size_t *read) {
+
+    if ( buf == NULL )
+        return 0;
+    
     size_t left = size;
     char *p = buf;
-    while (p != NULL && *p == ' ')
+    while (*p == ' ')
         p++;
 
     while (left > 0) {
@@ -70,7 +74,7 @@ static ssize_t emv_pk_read_bin(char *buf, unsigned char *bin, size_t size, size_
             return -(p - buf);
     }
 
-    while (p != NULL && *p == ' ')
+    while (*p == ' ')
         p++;
 
     p--;
@@ -79,13 +83,17 @@ static ssize_t emv_pk_read_bin(char *buf, unsigned char *bin, size_t size, size_
 }
 
 static ssize_t emv_pk_read_ymv(char *buf, unsigned *ymv) {
+
+    if ( buf == NULL )
+        return 0;
+    
     int i;
     unsigned char temp[3];
     char *p = buf;
 
     *ymv = 0;
 
-    while (p != NULL && *p == ' ')
+    while (*p == ' ')
         p++;
 
     for (i = 0; i < 3; i++) {
@@ -101,7 +109,7 @@ static ssize_t emv_pk_read_ymv(char *buf, unsigned *ymv) {
         temp[i] = (c1 * 16 + c2);
     }
 
-    while (p != NULL && *p == ' ')
+    while (*p == ' ')
         p++;
 
     p--;
@@ -115,8 +123,12 @@ static ssize_t emv_pk_read_ymv(char *buf, unsigned *ymv) {
 }
 
 static ssize_t emv_pk_read_string(char *buf, char *str, size_t size) {
+
+    if ( buf == NULL )
+        return 0;
+    
     char *p = buf;
-    while (p != NULL && *p == ' ')
+    while (*p == ' ')
         p++;
 
     while (size > 1) {
@@ -132,7 +144,7 @@ static ssize_t emv_pk_read_string(char *buf, char *str, size_t size) {
 
     *str = 0;
 
-    while (p != NULL && *p == ' ')
+    while (*p == ' ')
         p++;
 
     p--;
diff --git a/client/fpga_compress.c b/client/fpga_compress.c
index 4cb45616b..aebb3d17d 100644
--- a/client/fpga_compress.c
+++ b/client/fpga_compress.c
@@ -42,7 +42,7 @@
 #define COMPRESS_MAX_NICE_LENGTH  258
 #define COMPRESS_MAX_CHAIN        8192
 
-#define HARDNESTED_TABLE_SIZE (sizeof(uint32_t) * ((1L<<19)+1))
+#define HARDNESTED_TABLE_SIZE (uint32_t)(sizeof(uint32_t) * ((1L<<19)+1))
 
 static void usage(void) {
     fprintf(stdout, "Usage: fpga_compress <infile1> <infile2> ... <infile_n> <outfile>\n");
@@ -95,15 +95,13 @@ int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile, bool hardn
         if (i >= num_infiles * (hardnested_mode ? HARDNESTED_TABLE_SIZE : FPGA_CONFIG_SIZE)) {
             if (hardnested_mode) {
                 fprintf(stderr,
-#if __WORDSIZE == 64
-                        "Input file too big (> %" PRIu64 " bytes). This is probably not a hardnested bitflip state table.\n"
-#else
-                        "Input file too big (> %li bytes). This is probably not a hardnested bitflip state table.\n"
-#endif
+                        "Input file too big (> %" PRIu32 " bytes). This is probably not a hardnested bitflip state table.\n"
                         , HARDNESTED_TABLE_SIZE);
 
             } else {
-                fprintf(stderr, "Input files too big (total > %li bytes). These are probably not PM3 FPGA config files.\n", num_infiles * FPGA_CONFIG_SIZE);
+                fprintf(stderr,
+                    "Input files too big (total > %li bytes). These are probably not PM3 FPGA config files.\n"
+                    , num_infiles * FPGA_CONFIG_SIZE);
             }
             for (uint16_t j = 0; j < num_infiles; j++) {
                 fclose(infile[j]);

From c6aa14efb703ea224bd2d5ba374f2810fd105a09 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 16 Apr 2019 16:07:25 +0200
Subject: [PATCH 1277/1938] style

---
 client/cmdanalyse.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/client/cmdanalyse.c b/client/cmdanalyse.c
index 2f669d7e5..525c8a9a7 100644
--- a/client/cmdanalyse.c
+++ b/client/cmdanalyse.c
@@ -222,10 +222,7 @@ static uint16_t calcBSDchecksum4(uint8_t *bytes, uint8_t len, uint32_t mask) {
 // measuring LFSR maximum length
 static int CmdAnalyseLfsr(const char *Cmd) {
 
-    uint16_t start_state = 0;  /* Any nonzero start state will work. */
-    uint16_t lfsr = start_state;
-    //uint32_t period = 0;
-
+    uint16_t lfsr, start_state = 0;  /* Any nonzero start state will work. */
     uint8_t iv = param_get8ex(Cmd, 0, 0, 16);
     uint8_t find = param_get8ex(Cmd, 1, 0, 16);
 
@@ -233,11 +230,9 @@ static int CmdAnalyseLfsr(const char *Cmd) {
     PrintAndLogEx(NORMAL, " bit# | lfsr | ^0x40 |  0x%02X ^ lfsr \n", find);
 
     for (uint8_t i = 0x01; i < 0x30; i += 1) {
-        //period = 0;
         legic_prng_init(iv);
         legic_prng_forward(i);
         lfsr = legic_prng_get_bits(12);
-
         PrintAndLogEx(NORMAL, " %02X | %03X | %03X | %03X \n", i, lfsr, 0x40 ^ lfsr, find ^ lfsr);
     }
     return 0;

From d17191d0a4b0d80e21d1919e945c1037c073190b Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 16 Apr 2019 16:11:46 +0200
Subject: [PATCH 1278/1938] style

---
 client/cmdcrc.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/client/cmdcrc.c b/client/cmdcrc.c
index 7ec34e2cd..2a07c7adc 100644
--- a/client/cmdcrc.c
+++ b/client/cmdcrc.c
@@ -57,8 +57,6 @@ int GetModels(char *Models[], int *count, uint8_t *width) {
 
     SETBMP();
 
-    int args = 0, psets, pass;
-    int Cnt = 0;
     if (width[0] == 0) { //reveng -D
         *count = mcount();
         if (!*count) {
@@ -100,6 +98,8 @@ int GetModels(char *Models[], int *count, uint8_t *width) {
         if (!ptst(qpoly))
             rflags &= ~R_HAVEQ;
 
+        int pass;
+        
         /* if endianness not specified, try
          * little-endian then big-endian.
          * NB: crossed-endian algorithms will not be
@@ -108,7 +108,7 @@ int GetModels(char *Models[], int *count, uint8_t *width) {
         /* scan against preset models */
         if (~uflags & C_NOPCK) {
             pass = 0;
-            Cnt = 0;
+            int Cnt = 0, psets;
             do {
                 psets = mcount();
 
@@ -190,6 +190,7 @@ int GetModels(char *Models[], int *count, uint8_t *width) {
             return 0;
         }
         pass = 0;
+        int args = 0;
         do {
             mptr = candmods = reveng(&model, qpoly, rflags, args, apolys);
             if (mptr && plen(mptr->spoly)) {
@@ -233,7 +234,7 @@ int RunModel(char *inModel, char *inHexStr, bool reverse, char endian, char *res
     static model_t model = MZERO;
 
     int ibperhx = 8, obperhx = 8;
-    int rflags = 0; // search flags
+//    int rflags = 0; // search flags
     int c;
     poly_t apoly, crc;
 
@@ -255,17 +256,17 @@ int RunModel(char *inModel, char *inHexStr, bool reverse, char endian, char *res
         PrintAndLogEx(WARNING, "no preset models available");
         return 0;
     }
-    rflags |= R_HAVEP | R_HAVEI | R_HAVERI | R_HAVERO | R_HAVEX;
+//    rflags |= R_HAVEP | R_HAVEI | R_HAVERI | R_HAVERO | R_HAVEX;
 
     //set flags
     switch (endian) {
         case 'b': /* b  big-endian (RefIn = false, RefOut = false ) */
             model.flags &= ~P_REFIN;
-            rflags |= R_HAVERI;
+            //rflags |= R_HAVERI;
         /* fall through: */
         case 'B': /* B  big-endian output (RefOut = false) */
             model.flags &= ~P_REFOUT;
-            rflags |= R_HAVERO;
+            //rflags |= R_HAVERO;
             mnovel(&model);
         /* fall through: */
         case 'r': /* r  right-justified */
@@ -273,11 +274,11 @@ int RunModel(char *inModel, char *inHexStr, bool reverse, char endian, char *res
             break;
         case 'l': /* l  little-endian input and output */
             model.flags |= P_REFIN;
-            rflags |= R_HAVERI;
+            //rflags |= R_HAVERI;
         /* fall through: */
         case 'L': /* L  little-endian output */
             model.flags |= P_REFOUT;
-            rflags |= R_HAVERO;
+            //rflags |= R_HAVERO;
             mnovel(&model);
         /* fall through: */
         case 't': /* t  left-justified */

From d3b6cf720950c388cab28f14cb0c2586db14f5e6 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 16 Apr 2019 17:49:52 +0300
Subject: [PATCH 1279/1938] fix fake com port

---
 appveyor.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index b54f1169a..d3d255192 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -299,14 +299,14 @@ test_script:
     ExecTest "proxmark help text hardnested" "proxmark3 -t" {bash -lc 'cd ~/client;./proxmark3 -t 2>&1 | grep -q hardnested && echo Passed || echo Failed'}
 
 
-    ExecTest "hf mf offline text" "hf mf" {bash -lc "cd ~/client;./proxmark3 comx -c 'hf mf'"} "at_enc"
+    ExecTest "hf mf offline text" "hf mf" {bash -lc "cd ~/client;./proxmark3 -c 'hf mf'"} "at_enc"
 
-    ExecTest "hf mf hardnested" "hf mf hardnested" {bash -lc "cd ~/client;./proxmark3 comx -c 'hf mf hardnested t 1 000000000000'"} "found:"
+    ExecTest "hf mf hardnested" "hf mf hardnested" {bash -lc "cd ~/client;./proxmark3 -c 'hf mf hardnested t 1 000000000000'"} "found:"
 
 
     #proxmark crypto tests
 
-    ExecTest "emv test" "emv test" {bash -lc "cd ~/client;./proxmark3 comx -c 'emv test'"} "Test?s? ? OK"
+    ExecTest "emv test" "emv test" {bash -lc "cd ~/client;./proxmark3 -c 'emv test'"} "Test?s? ? OK"
 
 
     if ($global:TestsPassed) {

From aaedeafbb145c1986fa4fe7393149794940acf6e Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 16 Apr 2019 16:56:56 +0200
Subject: [PATCH 1280/1938] style spaces

---
 armsrc/appmain.c       | 13 ++++++++++++-
 armsrc/fpgaloader.c    | 39 ++++++++++++++++++++-------------------
 client/cmdcrc.c        |  6 +++---
 client/emv/emv_pk.c    | 12 ++++++------
 client/fpga_compress.c |  4 ++--
 client/proxmark3.c     |  2 +-
 6 files changed, 44 insertions(+), 32 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 03ce3750b..9376194e9 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -375,17 +375,28 @@ void printUSBSpeed(void) {
     uint32_t start_time = end_time = GetTickCount();
     uint32_t bytes_transferred = 0;
 
+    uint32_t counter = 0, good = 0, res;
     LED_B_ON();
     while (end_time < start_time + USB_SPEED_TEST_MIN_TIME) {
-        cmd_send(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K, 0, USB_CMD_DATA_SIZE, 0, test_data, USB_CMD_DATA_SIZE);
+        res = cmd_send(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K, 0, USB_CMD_DATA_SIZE, 0, test_data, USB_CMD_DATA_SIZE);
         end_time = GetTickCount();
         bytes_transferred += USB_CMD_DATA_SIZE;
+        if (res == 0)
+            counter++;
+        else
+            good++;
     }
     LED_B_OFF();
 
     Dbprintf("  Time elapsed............%dms", end_time - start_time);
     Dbprintf("  Bytes transferred.......%d", bytes_transferred);
     Dbprintf("  USB Transfer Speed PM3 -> Client = %d Bytes/s", 1000 * bytes_transferred / (end_time - start_time));
+    if (counter > 0)
+        Dbprintf("  Number of errors %u", counter);
+    if (good > 0) {
+        bytes_transferred = USB_CMD_DATA_SIZE * good;
+        Dbprintf("  Number of good %u / bytes %u, true Speed PM3 -> Client = %d Bytes/s", good, bytes_transferred, 1000 * bytes_transferred / (end_time - start_time));
+    }
 }
 
 /**
diff --git a/armsrc/fpgaloader.c b/armsrc/fpgaloader.c
index 1be2c6138..04c49edd2 100644
--- a/armsrc/fpgaloader.c
+++ b/armsrc/fpgaloader.c
@@ -449,33 +449,34 @@ void FpgaWriteConfWord(uint8_t v) {
 // the samples from the ADC always flow through the FPGA.
 //-----------------------------------------------------------------------------
 void SetAdcMuxFor(uint32_t whichGpio) {
+    /*
+    #ifndef WITH_FPC
+        // When compiled without FPC support
+        AT91C_BASE_PIOA->PIO_OER =
+            GPIO_MUXSEL_HIPKD |
+            GPIO_MUXSEL_LOPKD |
+            GPIO_MUXSEL_LORAW |
+            GPIO_MUXSEL_HIRAW;
 
-#ifndef WITH_FPC
-    // When compiled without FPC support
-    AT91C_BASE_PIOA->PIO_OER =
-        GPIO_MUXSEL_HIPKD |
-        GPIO_MUXSEL_LOPKD |
-        GPIO_MUXSEL_LORAW |
-        GPIO_MUXSEL_HIRAW;
+        AT91C_BASE_PIOA->PIO_PER =
+            GPIO_MUXSEL_HIPKD |
+            GPIO_MUXSEL_LOPKD |
+            GPIO_MUXSEL_LORAW |
+            GPIO_MUXSEL_HIRAW;
 
-    AT91C_BASE_PIOA->PIO_PER =
-        GPIO_MUXSEL_HIPKD |
-        GPIO_MUXSEL_LOPKD |
-        GPIO_MUXSEL_LORAW |
-        GPIO_MUXSEL_HIRAW;
+        LOW(GPIO_MUXSEL_HIPKD);
+        LOW(GPIO_MUXSEL_LOPKD);
+        LOW(GPIO_MUXSEL_HIRAW);
+        LOW(GPIO_MUXSEL_LORAW);
 
-    LOW(GPIO_MUXSEL_HIPKD);
-    LOW(GPIO_MUXSEL_LOPKD);
-    LOW(GPIO_MUXSEL_HIRAW);
-    LOW(GPIO_MUXSEL_LORAW);
-
-#else
+    #else
+    */
     // FPC serial uses HIRAW/LOWRAW pins, so they are excluded here.
     AT91C_BASE_PIOA->PIO_OER = GPIO_MUXSEL_HIPKD | GPIO_MUXSEL_LOPKD;
     AT91C_BASE_PIOA->PIO_PER = GPIO_MUXSEL_HIPKD | GPIO_MUXSEL_LOPKD;
     LOW(GPIO_MUXSEL_HIPKD);
     LOW(GPIO_MUXSEL_LOPKD);
-#endif
+//#endif
 
     HIGH(whichGpio);
 }
diff --git a/client/cmdcrc.c b/client/cmdcrc.c
index 2a07c7adc..cebd292b8 100644
--- a/client/cmdcrc.c
+++ b/client/cmdcrc.c
@@ -99,7 +99,7 @@ int GetModels(char *Models[], int *count, uint8_t *width) {
             rflags &= ~R_HAVEQ;
 
         int pass;
-        
+
         /* if endianness not specified, try
          * little-endian then big-endian.
          * NB: crossed-endian algorithms will not be
@@ -262,7 +262,7 @@ int RunModel(char *inModel, char *inHexStr, bool reverse, char endian, char *res
     switch (endian) {
         case 'b': /* b  big-endian (RefIn = false, RefOut = false ) */
             model.flags &= ~P_REFIN;
-            //rflags |= R_HAVERI;
+        //rflags |= R_HAVERI;
         /* fall through: */
         case 'B': /* B  big-endian output (RefOut = false) */
             model.flags &= ~P_REFOUT;
@@ -274,7 +274,7 @@ int RunModel(char *inModel, char *inHexStr, bool reverse, char endian, char *res
             break;
         case 'l': /* l  little-endian input and output */
             model.flags |= P_REFIN;
-            //rflags |= R_HAVERI;
+        //rflags |= R_HAVERI;
         /* fall through: */
         case 'L': /* L  little-endian output */
             model.flags |= P_REFOUT;
diff --git a/client/emv/emv_pk.c b/client/emv/emv_pk.c
index a0bb80979..ae23c8470 100644
--- a/client/emv/emv_pk.c
+++ b/client/emv/emv_pk.c
@@ -42,9 +42,9 @@
 
 static ssize_t emv_pk_read_bin(char *buf, unsigned char *bin, size_t size, size_t *read) {
 
-    if ( buf == NULL )
+    if (buf == NULL)
         return 0;
-    
+
     size_t left = size;
     char *p = buf;
     while (*p == ' ')
@@ -84,9 +84,9 @@ static ssize_t emv_pk_read_bin(char *buf, unsigned char *bin, size_t size, size_
 
 static ssize_t emv_pk_read_ymv(char *buf, unsigned *ymv) {
 
-    if ( buf == NULL )
+    if (buf == NULL)
         return 0;
-    
+
     int i;
     unsigned char temp[3];
     char *p = buf;
@@ -124,9 +124,9 @@ static ssize_t emv_pk_read_ymv(char *buf, unsigned *ymv) {
 
 static ssize_t emv_pk_read_string(char *buf, char *str, size_t size) {
 
-    if ( buf == NULL )
+    if (buf == NULL)
         return 0;
-    
+
     char *p = buf;
     while (*p == ' ')
         p++;
diff --git a/client/fpga_compress.c b/client/fpga_compress.c
index aebb3d17d..7e5616813 100644
--- a/client/fpga_compress.c
+++ b/client/fpga_compress.c
@@ -100,8 +100,8 @@ int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile, bool hardn
 
             } else {
                 fprintf(stderr,
-                    "Input files too big (total > %li bytes). These are probably not PM3 FPGA config files.\n"
-                    , num_infiles * FPGA_CONFIG_SIZE);
+                        "Input files too big (total > %li bytes). These are probably not PM3 FPGA config files.\n"
+                        , num_infiles * FPGA_CONFIG_SIZE);
             }
             for (uint16_t j = 0; j < num_infiles; j++) {
                 fclose(infile[j]);
diff --git a/client/proxmark3.c b/client/proxmark3.c
index db4479c9a..47a50a6a4 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -467,7 +467,7 @@ int main(int argc, char *argv[]) {
         usb_present = OpenProxmark(port, waitCOMPort, 20, false, speed);
 
     if (TestProxmark() == 0)
-       usb_present = false;
+        usb_present = false;
     if (!usb_present)
         PrintAndLogEx(INFO, "Running in " _YELLOW_("OFFLINE") "mode. Check \"%s -h\" if it's not what you want.\n", exec_name);
 

From 64c7ee117e7f7598eec449c639230aec9565be88 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 16 Apr 2019 17:00:18 +0200
Subject: [PATCH 1281/1938] revert

---
 armsrc/appmain.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 9376194e9..f7690e54d 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -375,28 +375,19 @@ void printUSBSpeed(void) {
     uint32_t start_time = end_time = GetTickCount();
     uint32_t bytes_transferred = 0;
 
-    uint32_t counter = 0, good = 0, res;
     LED_B_ON();
     while (end_time < start_time + USB_SPEED_TEST_MIN_TIME) {
         res = cmd_send(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K, 0, USB_CMD_DATA_SIZE, 0, test_data, USB_CMD_DATA_SIZE);
         end_time = GetTickCount();
         bytes_transferred += USB_CMD_DATA_SIZE;
-        if (res == 0)
-            counter++;
-        else
-            good++;
     }
     LED_B_OFF();
 
     Dbprintf("  Time elapsed............%dms", end_time - start_time);
     Dbprintf("  Bytes transferred.......%d", bytes_transferred);
     Dbprintf("  USB Transfer Speed PM3 -> Client = %d Bytes/s", 1000 * bytes_transferred / (end_time - start_time));
-    if (counter > 0)
-        Dbprintf("  Number of errors %u", counter);
-    if (good > 0) {
-        bytes_transferred = USB_CMD_DATA_SIZE * good;
-        Dbprintf("  Number of good %u / bytes %u, true Speed PM3 -> Client = %d Bytes/s", good, bytes_transferred, 1000 * bytes_transferred / (end_time - start_time));
-    }
+    if ( res == 0 )
+        Dbprintf("  Sending failed..........");
 }
 
 /**

From 597019b98aedec4b14e93f685418d00cfc740ca8 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 16 Apr 2019 17:01:00 +0200
Subject: [PATCH 1282/1938] revert

---
 armsrc/fpgaloader.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/armsrc/fpgaloader.c b/armsrc/fpgaloader.c
index 04c49edd2..b7554f6a0 100644
--- a/armsrc/fpgaloader.c
+++ b/armsrc/fpgaloader.c
@@ -449,8 +449,8 @@ void FpgaWriteConfWord(uint8_t v) {
 // the samples from the ADC always flow through the FPGA.
 //-----------------------------------------------------------------------------
 void SetAdcMuxFor(uint32_t whichGpio) {
-    /*
-    #ifndef WITH_FPC
+
+#ifndef WITH_FPC
         // When compiled without FPC support
         AT91C_BASE_PIOA->PIO_OER =
             GPIO_MUXSEL_HIPKD |
@@ -469,14 +469,13 @@ void SetAdcMuxFor(uint32_t whichGpio) {
         LOW(GPIO_MUXSEL_HIRAW);
         LOW(GPIO_MUXSEL_LORAW);
 
-    #else
-    */
+#else
     // FPC serial uses HIRAW/LOWRAW pins, so they are excluded here.
     AT91C_BASE_PIOA->PIO_OER = GPIO_MUXSEL_HIPKD | GPIO_MUXSEL_LOPKD;
     AT91C_BASE_PIOA->PIO_PER = GPIO_MUXSEL_HIPKD | GPIO_MUXSEL_LOPKD;
     LOW(GPIO_MUXSEL_HIPKD);
     LOW(GPIO_MUXSEL_LOPKD);
-//#endif
+#endif
 
     HIGH(whichGpio);
 }

From e04e2d6fa7c3b713d3ca101052b9f29523e92c02 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 16 Apr 2019 17:02:21 +0200
Subject: [PATCH 1283/1938] revert

---
 armsrc/appmain.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index f7690e54d..489de0731 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -376,8 +376,9 @@ void printUSBSpeed(void) {
     uint32_t bytes_transferred = 0;
 
     LED_B_ON();
+    
     while (end_time < start_time + USB_SPEED_TEST_MIN_TIME) {
-        res = cmd_send(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K, 0, USB_CMD_DATA_SIZE, 0, test_data, USB_CMD_DATA_SIZE);
+        cmd_send(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K, 0, USB_CMD_DATA_SIZE, 0, test_data, USB_CMD_DATA_SIZE);
         end_time = GetTickCount();
         bytes_transferred += USB_CMD_DATA_SIZE;
     }
@@ -386,8 +387,6 @@ void printUSBSpeed(void) {
     Dbprintf("  Time elapsed............%dms", end_time - start_time);
     Dbprintf("  Bytes transferred.......%d", bytes_transferred);
     Dbprintf("  USB Transfer Speed PM3 -> Client = %d Bytes/s", 1000 * bytes_transferred / (end_time - start_time));
-    if ( res == 0 )
-        Dbprintf("  Sending failed..........");
 }
 
 /**

From 74ece72b262f0fdde951faecea143ecad0eca670 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 16 Apr 2019 17:21:42 +0200
Subject: [PATCH 1284/1938] textual

---
 client/cmdhfmf.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 2ab4a81f6..ab5c1d7d3 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -3539,7 +3539,7 @@ static command_t CommandTable[] = {
     {"chk",         CmdHF14AMfChk,          0, "Check keys"},
     {"fchk",        CmdHF14AMfChk_fast,     0, "Check keys fast, targets all keys on card"},
     {"decrypt",     CmdHf14AMfDecryptBytes, 1, "[nt] [ar_enc] [at_enc] [data] - to decrypt sniff or trace"},
-    {"-----------", CmdHelp,                1, ""},
+    {"-----------", CmdHelp,                0, ""},
     {"dbg",         CmdHF14AMfDbg,          0, "Set default debug mode"},
     {"rdbl",        CmdHF14AMfRdBl,         0, "Read MIFARE classic block"},
     {"rdsc",        CmdHF14AMfRdSc,         0, "Read MIFARE classic sector"},
@@ -3549,7 +3549,7 @@ static command_t CommandTable[] = {
     {"setmod",      CmdHf14AMfSetMod,       0, "Set MIFARE Classic EV1 load modulation strength"},
     {"auth4",       CmdHF14AMfAuth4,        0, "ISO14443-4 AES authentication"},
 //    {"sniff",       CmdHF14AMfSniff,        0, "Sniff card-reader communication"},
-    {"-----------", CmdHelp,                1, ""},
+    {"-----------", CmdHelp,                0, ""},
     {"sim",         CmdHF14AMf1kSim,        0, "Simulate MIFARE card"},
     {"eclr",        CmdHF14AMfEClear,       0, "Clear simulator memory block"},
     {"eget",        CmdHF14AMfEGet,         0, "Get simulator memory block"},
@@ -3558,14 +3558,14 @@ static command_t CommandTable[] = {
     {"esave",       CmdHF14AMfESave,        0, "Save to file emul dump"},
     {"ecfill",      CmdHF14AMfECFill,       0, "Fill simulator memory with help of keys from simulator"},
     {"ekeyprn",     CmdHF14AMfEKeyPrn,      0, "Print keys from simulator memory"},
-    {"-----------", CmdHelp,                1, ""},
+    {"-----------", CmdHelp,                0, ""},
     {"csetuid",     CmdHF14AMfCSetUID,      0, "Set UID for magic Chinese card"},
     {"csetblk",     CmdHF14AMfCSetBlk,      0, "Write block - Magic Chinese card"},
     {"cgetblk",     CmdHF14AMfCGetBlk,      0, "Read block - Magic Chinese card"},
     {"cgetsc",      CmdHF14AMfCGetSc,       0, "Read sector - Magic Chinese card"},
     {"cload",       CmdHF14AMfCLoad,        0, "Load dump into magic Chinese card"},
     {"csave",       CmdHF14AMfCSave,        0, "Save dump from magic Chinese card into file or emulator"},
-    {"-----------", CmdHelp,                1, ""},
+    {"-----------", CmdHelp,                0, ""},
     {"mad",         CmdHF14AMfMAD,          0, "Checks and prints MAD"},
     {"ndef",        CmdHFMFNDEF,            0, "Prints NDEF records from card"},
 

From 2639de23c61f1d51f7167004bc7d788551939a28 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 16 Apr 2019 17:26:15 +0200
Subject: [PATCH 1285/1938] rearranged banner output and messages

---
 client/comms.c     | 12 +++++-------
 client/proxmark3.c | 11 ++++++-----
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/client/comms.c b/client/comms.c
index a96823d81..09554888d 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -342,17 +342,16 @@ bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode,
     }
 }
 
+// check if we can communicate with Pm3
 int TestProxmark(void) {
-    // check if we can communicate with Pm3
     clearCommandBuffer();
     UsbCommand resp;
     UsbCommand c = {CMD_PING, {0, 0, 0}, {{0}}};
     SendCommand(&c);
-    if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {
-        PrintAndLogEx(INFO, "Ping successful, communicating with PM3 over %s.", resp.arg[0] == 1 ? "FPC" : "USB");
+    if (WaitForResponseTimeout(CMD_ACK, &resp, 5000)) {
+        PrintAndLogEx(INFO, "Communicating with PM3 over %s.", resp.arg[0] == 1 ? "FPC" : "USB");
         return 1;
     } else {
-        PrintAndLogEx(WARNING, _RED_("Ping failed"));
         return 0;
     }
 }
@@ -360,7 +359,6 @@ int TestProxmark(void) {
 void CloseProxmark(void) {
     conn.run = false;
 
-
 #ifdef __BIONIC__
     if (USB_communication_thread != 0) {
         pthread_join(USB_communication_thread, NULL);
@@ -421,8 +419,8 @@ bool WaitForResponseTimeoutW(uint32_t cmd, UsbCommand *response, size_t ms_timeo
 
         if (msclock() - start_time > 3000 && show_warning) {
             // 3 seconds elapsed (but this doesn't mean the timeout was exceeded)
-            PrintAndLogEx(NORMAL, "Waiting for a response from the proxmark...");
-            PrintAndLogEx(NORMAL, "You can cancel this operation by pressing the pm3 button");
+            PrintAndLogEx(INFO, "Waiting for a response from the proxmark...");
+            PrintAndLogEx(INFO, "You can cancel this operation by pressing the pm3 button");
             show_warning = false;
         }
     }
diff --git a/client/proxmark3.c b/client/proxmark3.c
index 47a50a6a4..43ab9bc97 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -420,6 +420,12 @@ int main(int argc, char *argv[]) {
         return 1;
     }
 
+    // ascii art
+    bool stdinOnPipe = !isatty(STDIN_FILENO);
+    if (!script_cmds_file && !stdinOnPipe)
+        showBanner();
+
+
     // default speed for USB 460800,  USART(FPC serial) 115200 baud
     if (speed == 0)
 #ifdef WITH_FPC_HOST
@@ -454,11 +460,6 @@ int main(int argc, char *argv[]) {
         }
     }
 
-    // ascii art
-    bool stdinOnPipe = !isatty(STDIN_FILENO);
-    if (!script_cmds_file && !stdinOnPipe)
-        showBanner();
-
     // set global variables
     set_my_executable_path();
 

From 8657e17a0b91859ea0f207b2d3aeceabb1cccab6 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 16 Apr 2019 17:29:19 +0200
Subject: [PATCH 1286/1938] more colors

---
 client/proxmark3.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/proxmark3.c b/client/proxmark3.c
index 43ab9bc97..4fd182ce7 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -441,7 +441,7 @@ int main(int argc, char *argv[]) {
 
         if (strlen(script_cmd) == 0) {
             script_cmd = NULL;
-            PrintAndLogEx(WARNING, "ERROR: execute command: command not found.\n");
+            PrintAndLogEx(ERR, _RED_("ERROR:") "execute command: " _YELLOW_("command not found") ".\n");
             return 2;
         } else {
             if (addLuaExec) {
@@ -456,7 +456,7 @@ int main(int argc, char *argv[]) {
                 }
             }
 
-            PrintAndLogEx(SUCCESS, "execute command from commandline: %s\n", script_cmd);
+            PrintAndLogEx(SUCCESS, "execute command from commandline: " _YELLOW_("%s") "\n", script_cmd);
         }
     }
 

From 33b4a32dfd1166f3b94973e70574e0efeeae6626 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 16 Apr 2019 19:06:18 +0200
Subject: [PATCH 1287/1938] removed

---
 client/cmdanalyse.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdanalyse.c b/client/cmdanalyse.c
index 525c8a9a7..7c1ab93cf 100644
--- a/client/cmdanalyse.c
+++ b/client/cmdanalyse.c
@@ -222,7 +222,7 @@ static uint16_t calcBSDchecksum4(uint8_t *bytes, uint8_t len, uint32_t mask) {
 // measuring LFSR maximum length
 static int CmdAnalyseLfsr(const char *Cmd) {
 
-    uint16_t lfsr, start_state = 0;  /* Any nonzero start state will work. */
+    uint16_t lfsr;  /* Any nonzero start state will work. */
     uint8_t iv = param_get8ex(Cmd, 0, 0, 16);
     uint8_t find = param_get8ex(Cmd, 1, 0, 16);
 

From 44bbb7d2c70c7fd4c8c709f9438f896c5bb8bd8a Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 16 Apr 2019 20:00:17 +0200
Subject: [PATCH 1288/1938] new frame format, smaller and with crc. Some code
 simplified

---
 armsrc/appmain.c  | 77 +++++++++++++++++++++++++++++------------------
 client/Makefile   |  2 +-
 client/cmdhw.c    |  9 +++---
 client/comms.c    | 19 +++++++-----
 client/comms.h    |  2 +-
 common/cmd.c      |  1 -
 include/usb_cmd.h | 12 +++-----
 7 files changed, 70 insertions(+), 52 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 534cef648..fd3760bed 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -632,11 +632,23 @@ void ListenReaderField(int limit) {
     }
 }
 
-void UsbPacketReceived(uint8_t *packet, int len) {
-    UsbCommand *c = (UsbCommand *)packet;
-    //Dbprintf("received %d bytes, with command: 0x%04x and args: %d %d %d", len, c->cmd, c->arg[0], c->arg[1], c->arg[2]);
+static void UsbPacketReceived(bool cmd_ng, uint8_t *packet) {
+    uint64_t cmd; // To accomodate old cmd, can be reduced to uint16_t once all old cmds are gone.
+    UsbCommandNGPreamble *pre_ng = (UsbCommandNGPreamble *)packet;
+    uint8_t *data_ng = packet + sizeof(UsbCommandNGPreamble);
+    uint16_t datalen_ng = pre_ng->length;
 
-    switch (c->cmd) {
+    // For cmd handlers still using old cmd format:
+    UsbCommand *c = (UsbCommand *)packet;
+    if (cmd_ng) {
+        cmd = pre_ng->cmd;
+//        Dbprintf("received %d bytes payload, with command: 0x%04x", datalen_ng, cmd);
+    } else {
+//        Dbprintf("received %d bytes, with command: 0x%04x and args: %d %d %d", USB_CMD_DATA_SIZE, c->cmd, c->arg[0], c->arg[1], c->arg[2]);
+        cmd = c->cmd;
+    }
+
+    switch (cmd) {
 #ifdef WITH_LF
         case CMD_SET_LF_T55XX_CONFIG:
             setT55xxConfig(c->arg[0], (t55xx_config *) c->d.asBytes);
@@ -1443,11 +1455,19 @@ void UsbPacketReceived(uint8_t *packet, int len) {
             SendStatus();
             break;
         case CMD_PING:
+            if (cmd_ng) {
 #ifdef WITH_FPC_HOST
-            cmd_send(CMD_ACK, reply_via_fpc, c->d.asDwords[0], c->d.asDwords[(c->arg[0]-1)/4], 0, 0);
+            cmd_send(CMD_ACK, reply_via_fpc, ((uint32_t *)data_ng)[0], ((uint32_t *)data_ng)[(datalen_ng-1)/4], 0, 0);
 #else
-            cmd_send(CMD_ACK, 0, c->d.asDwords[0], c->d.asDwords[(c->arg[0]-1)/4], 0, 0);
+            cmd_send(CMD_ACK, 0, ((uint32_t *)data_ng)[0], ((uint32_t *)data_ng)[(c->arg[0]-1)/4], 0, 0);
 #endif
+            } else {
+#ifdef WITH_FPC_HOST
+            cmd_send(CMD_ACK, reply_via_fpc, 0, 0, 0, 0);
+#else
+            cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
+#endif
+        }
             break;
 #ifdef WITH_LCD
         case CMD_LCD_RESET:
@@ -1488,7 +1508,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
             break;
         }
         default:
-            Dbprintf("%s: 0x%04x", "unknown command:", c->cmd);
+            Dbprintf("%s: 0x%04x", "unknown command:", cmd);
             break;
     }
 }
@@ -1553,10 +1573,9 @@ void  __attribute__((noreturn)) AppMain(void) {
     usb_disable();
     usb_enable();
 
-    // Worst case: Command as large as the old one but encapsulated in NG style
-    uint8_t rx[sizeof(UsbCommandNGPreamble) + sizeof(UsbCommand) + sizeof(UsbCommandNGPostamble)];
+    uint8_t rx[USB_PACKET_NG_MAXLEN];
     UsbCommandNGPreamble *pre = (UsbCommandNGPreamble *)rx;
-    UsbCommandNGPostamble *post = (UsbCommandNGPostamble *)(rx + sizeof(UsbCommandNGPreamble) + sizeof(UsbCommand));
+    UsbCommandNGPostamble *post = (UsbCommandNGPostamble *)(rx + sizeof(UsbCommandNGPreamble) + USB_CMD_DATA_SIZE);
 
     for (;;) {
         WDT_HIT();
@@ -1564,54 +1583,54 @@ void  __attribute__((noreturn)) AppMain(void) {
         // Check if there is a usb packet available
         if (usb_poll_validate_length()) {
             bool error = false;
-            size_t bytes = usb_read_ng(rx, sizeof(UsbCommandNGPreamble) + sizeof(UsbCommandNG));
-            if (bytes == sizeof(UsbCommandNGPreamble) + sizeof(UsbCommandNG)) {
+            size_t bytes = usb_read_ng(rx, sizeof(UsbCommandNGPreamble));
+            if (bytes == sizeof(UsbCommandNGPreamble)) {
                 if (pre->magic == USB_PREAMBLE_MAGIC) { // New style NG command
-//                    Dbprintf("Packet frame NG incoming!");
-                    use_cmd_ng = true;
                     if (pre->length > USB_CMD_DATA_SIZE) {
                         Dbprintf("Packet frame with incompatible length: 0x%04x", pre->length);
                         error = true;
                     }
                     if ((!error) && (pre->length > 0)) { // Get the variable length payload
-                        bytes = usb_read_ng(rx + sizeof(UsbCommandNGPreamble) + sizeof(UsbCommandNG), pre->length);
+                        bytes = usb_read_ng(rx + sizeof(UsbCommandNGPreamble), pre->length);
                         if (bytes != pre->length) {
                             Dbprintf("Packet frame error variable part too short? %d/%d", bytes, pre->length);
                             error = true;
                         }
                     }
                     if (!error) {                        // Get the postamble
-                        bytes = usb_read_ng(rx + sizeof(UsbCommandNGPreamble) + sizeof(UsbCommand), sizeof(UsbCommandNGPostamble));
-                        if ((bytes != sizeof(UsbCommandNGPostamble)) || (post->magic != USB_POSTAMBLE_MAGIC)) {
-                            Dbprintf("Packet frame error no postamble magic found");
+                        bytes = usb_read_ng(rx + sizeof(UsbCommandNGPreamble) + USB_CMD_DATA_SIZE, sizeof(UsbCommandNGPostamble));
+                        if (bytes != sizeof(UsbCommandNGPostamble)) {
+                            Dbprintf("Packet frame error fetching postamble");
+                            error = true;
+                        }
+                        uint8_t first, second;
+                        compute_crc(CRC_14443_A, rx, sizeof(UsbCommandNGPreamble) + pre->length, &first, &second);
+                        if ((first << 8) + second != post->crc) {
+                            Dbprintf("Packet frame CRC error %02X%02X <> %04X", first, second, post->crc);
                             error = true;
                         }
-                        // TODO check also CRC...
                     }
                     if (!error) {
-//                            Dbprintf("Packet frame NG fully received");
             #ifdef WITH_FPC_HOST
                             reply_via_fpc = false;
             #endif
-                            UsbPacketReceived(rx + sizeof(UsbCommandNGPreamble), sizeof(UsbCommand));
+                            UsbPacketReceived(true, rx);
                     }
-
                 } else {                               // Old style command
-                    bytes = usb_read_ng(rx + sizeof(UsbCommandNGPreamble) + sizeof(UsbCommandNG), sizeof(UsbCommand) - sizeof(UsbCommandNGPreamble) - sizeof(UsbCommandNG));
-
-                    if (bytes != sizeof(UsbCommand) - sizeof(UsbCommandNGPreamble) - sizeof(UsbCommandNG)) {
-                        Dbprintf("Packet frame error var part too short? %d/%d", bytes, sizeof(UsbCommand) - sizeof(UsbCommandNGPreamble) - sizeof(UsbCommandNG));
+                    bytes = usb_read_ng(rx + sizeof(UsbCommandNGPreamble), sizeof(UsbCommand) - sizeof(UsbCommandNGPreamble));
+                    if (bytes != sizeof(UsbCommand) - sizeof(UsbCommandNGPreamble)) {
+                        Dbprintf("Packet frame error var part too short? %d/%d", bytes, sizeof(UsbCommand) - sizeof(UsbCommandNGPreamble));
                         error = true;
                     }
                     if (!error) {
-                            use_cmd_ng = false;
             #ifdef WITH_FPC_HOST
                             reply_via_fpc = false;
             #endif
-                            UsbPacketReceived(rx, sizeof(UsbCommand));
+                            UsbPacketReceived(false, rx);
                     }
                 }
             } else {
+                Dbprintf("Packet frame preamble too short: %d/%d", bytes, sizeof(UsbCommandNGPreamble));
                 error = true;
             }
             // TODO if error, shall we resync ?
@@ -1620,7 +1639,7 @@ void  __attribute__((noreturn)) AppMain(void) {
         // Check if there is a FPC packet available
         if (usart_readbuffer(rx)) {
             reply_via_fpc = true;
-            UsbPacketReceived(rx, sizeof(rx));
+            UsbPacketReceived(false, rx);
         }
         usart_readcheck(rx, sizeof(rx));
 #endif
diff --git a/client/Makefile b/client/Makefile
index 2f7467fab..7992b68b4 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -119,6 +119,7 @@ CORESRCS =  uart_posix.c \
 			util.c \
 			util_posix.c \
 			scandir.c \
+			crc16.c \
 			comms.c
 
 CMDSRCS =	crapto1/crapto1.c \
@@ -143,7 +144,6 @@ CMDSRCS =	crapto1/crapto1.c \
 			mifare/mifarehost.c \
 			parity.c \
 			crc.c \
-			crc16.c \
 			crc64.c \
 			legic_prng.c \
 			iso15693tools.c \
diff --git a/client/cmdhw.c b/client/cmdhw.c
index 655442738..929d37b73 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -445,12 +445,13 @@ static int CmdPingNG(const char *Cmd) {
     PrintAndLogEx(NORMAL, "Pinging with payload len=%d", len);
     clearCommandBuffer();
     UsbCommand resp;
-    UsbCommand c = {CMD_PING, {len, 0, 0}, {{0}}};
+    uint8_t data[USB_CMD_DATA_SIZE] = {0};
+    uint16_t cmd = CMD_PING;
     if (len >= 4)
-        c.d.asDwords[0] = 0xAABBCCDD;
+        ((uint32_t *)data)[0]=0xAABBCCDD;
     if (len >= 8)
-    c.d.asDwords[(len-1)/4] = 0xDDCCBBAA;
-    SendCommandNG(&c, len);
+        ((uint32_t *)data)[(len-1)/4] = 0xDDCCBBAA;
+    SendCommandNG(cmd, data, len);
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {
         PrintAndLogEx(NORMAL, "PingNG successful");
         if (len >= 4)
diff --git a/client/comms.c b/client/comms.c
index d192b4c90..c6d15087c 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -10,6 +10,7 @@
 //-----------------------------------------------------------------------------
 
 #include "comms.h"
+#include "crc16.h"
 
 // Serial port that we are communicating with the PM3 on.
 static serial_port sp = NULL;
@@ -25,7 +26,7 @@ static pthread_t USB_communication_thread;
 
 // Transmit buffer.
 static UsbCommand txBuffer;
-static uint8_t txBufferNG[sizeof(UsbCommandNGPreamble) + sizeof(UsbCommand) + sizeof(UsbCommandNGPostamble)];
+static uint8_t txBufferNG[USB_PACKET_NG_MAXLEN];
 size_t txBufferNGLen;
 static bool txBuffer_pending = false;
 static pthread_mutex_t txBufferMutex = PTHREAD_MUTEX_INITIALIZER;
@@ -86,10 +87,10 @@ void SendCommand(UsbCommand *c) {
 //__atomic_test_and_set(&txcmd_pending, __ATOMIC_SEQ_CST);
 }
 
-void SendCommandNG(UsbCommand *c, size_t len) {
+void SendCommandNG(uint16_t cmd, uint8_t* data, size_t len) {
 
 #ifdef COMMS_DEBUG
-    PrintAndLogEx(NORMAL, "Sending %d bytes of payload | cmd %04x\n", len, c->cmd);
+    PrintAndLogEx(NORMAL, "Sending %d bytes of payload | cmd %04x\n", len, cmd);
 #endif
 
     if (offline) {
@@ -102,7 +103,7 @@ void SendCommandNG(UsbCommand *c, size_t len) {
     }
 
     UsbCommandNGPreamble *tx_pre = (UsbCommandNGPreamble *)txBufferNG;
-    UsbCommandNGPostamble *tx_post = (UsbCommandNGPostamble *)(txBufferNG + sizeof(UsbCommandNGPreamble) + sizeof(UsbCommandNG) + len);
+    UsbCommandNGPostamble *tx_post = (UsbCommandNGPostamble *)(txBufferNG + sizeof(UsbCommandNGPreamble) + len);
 
     pthread_mutex_lock(&txBufferMutex);
     /**
@@ -116,10 +117,12 @@ void SendCommandNG(UsbCommand *c, size_t len) {
 
     tx_pre->magic = USB_PREAMBLE_MAGIC;
     tx_pre->length = len;
-    memcpy(txBufferNG + sizeof(UsbCommandNGPreamble), c, sizeof(UsbCommandNG) + len);
-    // TODO CRC
-    tx_post->magic = USB_POSTAMBLE_MAGIC;
-    txBufferNGLen = sizeof(UsbCommandNGPreamble) + sizeof(UsbCommandNG) + len + sizeof(UsbCommandNGPostamble);
+    tx_pre->cmd = cmd;
+    memcpy(txBufferNG + sizeof(UsbCommandNGPreamble), data, len);
+    uint8_t first, second;
+    compute_crc(CRC_14443_A, txBufferNG, sizeof(UsbCommandNGPreamble) + len, &first, &second);
+    tx_post->crc = (first << 8) + second;
+    txBufferNGLen = sizeof(UsbCommandNGPreamble) + len + sizeof(UsbCommandNGPostamble);
     txBuffer_pending = true;
 
     // tell communication thread that a new command can be send
diff --git a/client/comms.h b/client/comms.h
index d6704617b..f71c82f4c 100644
--- a/client/comms.h
+++ b/client/comms.h
@@ -52,7 +52,7 @@ bool IsOffline(void);
 
 void *uart_receiver(void *targ);
 void SendCommand(UsbCommand *c);
-void SendCommandNG(UsbCommand *c, size_t len);
+void SendCommandNG(uint16_t cmd, uint8_t* data, size_t len);
 void clearCommandBuffer(void);
 
 #define FLASHMODE_SPEED 460800
diff --git a/common/cmd.c b/common/cmd.c
index 74f8c00f5..d560c60f7 100644
--- a/common/cmd.c
+++ b/common/cmd.c
@@ -31,7 +31,6 @@
  */
 #include "cmd.h"
 
-bool use_cmd_ng = false;
 #ifdef WITH_FPC_HOST
 // "Session" flag, to tell via which interface next msgs should be sent: USB or FPC USART
 bool reply_via_fpc = false;
diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index cbef5aa02..2081d8775 100644
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -37,24 +37,20 @@ typedef struct {
 
 typedef struct {
     uint32_t magic;
-    uint32_t length;  // length of the variable part, 0 if none.
+    uint16_t length;  // length of the variable part, 0 if none.
+    uint16_t cmd;
 } PACKED UsbCommandNGPreamble;
 
 #define USB_PREAMBLE_MAGIC 0xAA5500FF
 
-typedef struct {
-    uint64_t cmd;
-    uint64_t arg[3];
-} PACKED UsbCommandNG;
-
 typedef struct {
     uint32_t crc;
-    uint32_t magic;
 } PACKED UsbCommandNGPostamble;
 
 #define USB_POSTAMBLE_MAGIC 0xFF0055AA
 
-extern bool use_cmd_ng;
+#define USB_PACKET_NG_MINLEN (sizeof(UsbCommandNGPreamble) + sizeof(UsbCommandNGPostamble))
+#define USB_PACKET_NG_MAXLEN (sizeof(UsbCommandNGPreamble) + USB_CMD_DATA_SIZE + sizeof(UsbCommandNGPostamble))
 
 #ifdef WITH_FPC_HOST
 // "Session" flag, to tell via which interface next msgs should be sent: USB or FPC USART

From 436910605b6054de024c3f96434c4c5baa823e41 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 16 Apr 2019 20:00:25 +0200
Subject: [PATCH 1289/1938] unified Proxmark3 text

---
 client/cmddata.c             |  4 ++--
 client/cmdhf14a.c            |  8 ++++----
 client/cmdhffido.c           |  2 +-
 client/cmdhficlass.c         |  2 +-
 client/cmdhfmf.c             |  8 ++++----
 client/cmdhw.c               |  6 +++---
 client/cmdlft55xx.c          |  4 ++--
 client/comms.c               | 12 ++++++------
 client/flash.c               |  6 +++---
 client/flasher.c             |  6 +++---
 client/hid-flasher/flash.c   |  6 +++---
 client/hid-flasher/flasher.c |  2 +-
 client/mifare/mifarehost.c   |  6 +++---
 client/proxmark3.c           |  4 ++--
 14 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/client/cmddata.c b/client/cmddata.c
index e8c33c70c..0f99f5e48 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -1527,7 +1527,7 @@ int CmdTuneSamples(const char *Cmd) {
 
 
     int timeout = 0;
-    PrintAndLogEx(INFO, "\nmeasuring antenna characteristics, please wait...");
+    PrintAndLogEx(INFO, "\nMeasuring antenna characteristics, please wait...");
 
     UsbCommand c = {CMD_MEASURE_ANTENNA_TUNING, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
@@ -1538,7 +1538,7 @@ int CmdTuneSamples(const char *Cmd) {
         printf(".");
         fflush(stdout);
         if (timeout > 7) {
-            PrintAndLogEx(WARNING, "\nno response from Proxmark. Aborting...");
+            PrintAndLogEx(WARNING, "\nNo response from Proxmark3. Aborting...");
             return 1;
         }
     }
diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index c03a39ca0..52b2853b0 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -531,7 +531,7 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
         UsbCommand ca = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}, {{0}}};
         SendCommand(&ca);
         if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-            PrintAndLogEx(ERR, "Proxmark connection timeout.");
+            PrintAndLogEx(ERR, "Proxmark3 connection timeout.");
             return 1;
         }
 
@@ -553,7 +553,7 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
             memcpy(cr.d.asBytes, rats, 2);
             SendCommand(&cr);
             if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-                PrintAndLogEx(ERR, "Proxmark connection timeout.");
+                PrintAndLogEx(ERR, "Proxmark3 connection timeout.");
                 return 1;
             }
 
@@ -630,7 +630,7 @@ static int SelectCard14443_4(bool disconnect, iso14a_card_select_t *card) {
     UsbCommand ca = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}, {{0}}};
     SendCommand(&ca);
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-        PrintAndLogEx(ERR, "Proxmark connection timeout.");
+        PrintAndLogEx(ERR, "Proxmark3 connection timeout.");
         return 1;
     }
 
@@ -652,7 +652,7 @@ static int SelectCard14443_4(bool disconnect, iso14a_card_select_t *card) {
         memcpy(cr.d.asBytes, rats, 2);
         SendCommand(&cr);
         if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-            PrintAndLogEx(ERR, "Proxmark connection timeout.");
+            PrintAndLogEx(ERR, "Proxmark3 connection timeout.");
             return 1;
         }
 
diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index c2f02ef0e..48a612e7f 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -781,7 +781,7 @@ static int CmdHFFido2GetAssertion(const char *cmd) {
     char fname[300] = {0};
 
     CLIParserInit("hf fido assert",
-                  "Execute a FIDO2 Get Assertion command. Needs json file with parameters. Sample file `fido2.json`. File can be placed in proxmark directory or in `proxmark/fido` directory.",
+                  "Execute a FIDO2 Get Assertion command. Needs json file with parameters. Sample file " _YELLOW_("`fido2.json`") ". File can be placed in proxmark directory or in `proxmark/fido` directory.",
                   "Usage:\n\thf fido assert -> execute command default parameters file `fido2.json`\n"
                   "\thf fido assert test.json -l -> execute command with parameters file `text.json` and add to request CredentialId");
 
diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index 4696ed4c6..0850e6606 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -1994,7 +1994,7 @@ static int CmdHFiClassCheckKeys(const char *Cmd) {
             printf(".");
             fflush(stdout);
             if (timeout > 120) {
-                PrintAndLogEx(WARNING, "\nNo response from Proxmark. Aborting...");
+                PrintAndLogEx(WARNING, "\nNo response from Proxmark3. Aborting...");
                 goto out;
             }
         }
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index ab5c1d7d3..0e91c784e 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -1137,7 +1137,7 @@ static int CmdHF14AMfNested(const char *Cmd) {
         int16_t isOK = mfnested(blockNo, keyType, key, trgBlockNo, trgKeyType, keyBlock, true);
         switch (isOK) {
             case -1 :
-                PrintAndLogEx(WARNING, "Error: No response from Proxmark.\n");
+                PrintAndLogEx(WARNING, "Error: No response from Proxmark3.\n");
                 break;
             case -2 :
                 PrintAndLogEx(WARNING, "Button pressed. Aborted.\n");
@@ -1207,7 +1207,7 @@ static int CmdHF14AMfNested(const char *Cmd) {
                     int16_t isOK = mfnested(blockNo, keyType, key, FirstBlockOfSector(sectorNo), trgKeyType, keyBlock, calibrate);
                     switch (isOK) {
                         case -1 :
-                            PrintAndLogEx(WARNING, "error: No response from Proxmark.\n");
+                            PrintAndLogEx(WARNING, "error: No response from Proxmark3.\n");
                             break;
                         case -2 :
                             PrintAndLogEx(WARNING, "button pressed. Aborted.\n");
@@ -1497,7 +1497,7 @@ static int CmdHF14AMfNestedHard(const char *Cmd) {
     if (isOK) {
         switch (isOK) {
             case 1 :
-                PrintAndLogEx(WARNING, "Error: No response from Proxmark.\n");
+                PrintAndLogEx(WARNING, "Error: No response from Proxmark3.\n");
                 break;
             case 2 :
                 PrintAndLogEx(NORMAL, "Button pressed. Aborted.\n");
@@ -2283,7 +2283,7 @@ static int CmdHF14AMfSniff(const char *Cmd) {
 
     PrintAndLogEx(NORMAL, "-------------------------------------------------------------------------\n");
     PrintAndLogEx(NORMAL, "Executing mifare sniffing command. \n");
-    PrintAndLogEx(NORMAL, "Press the key on the proxmark3 device to abort both proxmark3 and client.\n");
+    PrintAndLogEx(NORMAL, "Press the key on the Proxmark3 device to abort both Proxmark3 and client.\n");
     PrintAndLogEx(NORMAL, "Press the key on pc keyboard to abort the client.\n");
     PrintAndLogEx(NORMAL, "-------------------------------------------------------------------------\n");
 
diff --git a/client/cmdhw.c b/client/cmdhw.c
index d1ba4274e..bd013e706 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -451,9 +451,9 @@ static command_t CommandTable[] = {
     {"setlfdivisor",  CmdSetDivisor,  0, "<19 - 255> -- Drive LF antenna at 12Mhz/(divisor+1)"},
     {"setmux",        CmdSetMux,      0, "<loraw|hiraw|lopkd|hipkd> -- Set the ADC mux to a specific value"},
     {"tune",          CmdTune,        0, "Measure antenna tuning"},
-    {"version",       CmdVersion,     0, "Show version information about the connected Proxmark"},
-    {"status",        CmdStatus,      0, "Show runtime status information about the connected Proxmark"},
-    {"ping",          CmdPing,        0, "Test if the pm3 is responsive"},
+    {"version",       CmdVersion,     0, "Show version information about the connected Proxmark3"},
+    {"status",        CmdStatus,      0, "Show runtime status information about the connected Proxmark3"},
+    {"ping",          CmdPing,        0, "Test if the Proxmark3 is responding"},
     {NULL, NULL, 0, NULL}
 };
 
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index b578a42ea..6934e20e3 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -506,7 +506,7 @@ static bool DecodeT5555TraceBlock(void) {
 // sanity check. Don't use proxmark if it is offline and you didn't specify useGraphbuf
 static int SanityOfflineCheck(bool useGraphBuffer) {
     if (!useGraphBuffer && IsOffline()) {
-        PrintAndLogEx(NORMAL, "Your proxmark3 device is offline. Specify [1] to use graphbuffer data instead");
+        PrintAndLogEx(WARNING, "Your proxmark3 device is offline. Specify [1] to use graphbuffer data instead");
         return 0;
     }
     return 1;
@@ -1866,7 +1866,7 @@ static int CmdT55xxChkPwds(const char *Cmd) {
             printf(".");
             fflush(stdout);
             if (timeout > 180) {
-                PrintAndLogEx(WARNING, "\nno response from Proxmark. Aborting...");
+                PrintAndLogEx(WARNING, "\nNo response from Proxmark3. Aborting...");
                 return 2;
             }
         }
diff --git a/client/comms.c b/client/comms.c
index 09554888d..546594c92 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -59,7 +59,7 @@ void SendCommand(UsbCommand *c) {
 #endif
 
     if (offline) {
-        PrintAndLogEx(NORMAL, "Sending bytes to proxmark failed - offline");
+        PrintAndLogEx(WARNING, "Sending bytes to Proxmark3 failed." _YELLOW_("offline") );
         return;
     }
 
@@ -209,7 +209,7 @@ bool hookUpPM3() {
         ret = false;
         offline = 1;
     } else {
-        PrintAndLogEx(SUCCESS, "Proxmark reconnected\n");
+        PrintAndLogEx(SUCCESS, "Proxmark3 reconnected\n");
         serial_port_name = ;
         ret = true;
         offline = 0;
@@ -275,7 +275,7 @@ __attribute__((force_align_arg_pointer))
         if (txBuffer_pending) {
             if (!uart_send(sp, (uint8_t *) &txBuffer, sizeof(UsbCommand))) {
                 //counter_to_offline++;
-                PrintAndLogEx(WARNING, "sending bytes to proxmark failed");
+                PrintAndLogEx(WARNING, "sending bytes to Proxmark3 device" _RED_("failed") );
             }
             txBuffer_pending = false;
 
@@ -305,7 +305,7 @@ bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode,
         PrintAndLogEx(INFO, "Using UART port " _YELLOW_("%s"), portname);
         sp = uart_open(portname, speed);
     } else {
-        PrintAndLogEx(SUCCESS, "Waiting for Proxmark to appear on " _YELLOW_("%s"), portname);
+        PrintAndLogEx(SUCCESS, "Waiting for Proxmark3 to appear on " _YELLOW_("%s"), portname);
         fflush(stdout);
         int openCount = 0;
         do {
@@ -419,7 +419,7 @@ bool WaitForResponseTimeoutW(uint32_t cmd, UsbCommand *response, size_t ms_timeo
 
         if (msclock() - start_time > 3000 && show_warning) {
             // 3 seconds elapsed (but this doesn't mean the timeout was exceeded)
-            PrintAndLogEx(INFO, "Waiting for a response from the proxmark...");
+            PrintAndLogEx(INFO, "Waiting for a response from the proxmark3...");
             PrintAndLogEx(INFO, "You can cancel this operation by pressing the pm3 button");
             show_warning = false;
         }
@@ -529,7 +529,7 @@ bool dl_it(uint8_t *dest, uint32_t bytes, uint32_t start_index, UsbCommand *resp
 
         if (msclock() - start_time > 3000 && show_warning) {
             // 3 seconds elapsed (but this doesn't mean the timeout was exceeded)
-            PrintAndLogEx(NORMAL, "Waiting for a response from the proxmark...");
+            PrintAndLogEx(NORMAL, "Waiting for a response from the Proxmark3...");
             PrintAndLogEx(NORMAL, "You can cancel this operation by pressing the pm3 button");
             show_warning = false;
         }
diff --git a/client/flash.c b/client/flash.c
index 627404ad9..9bf0c94d8 100644
--- a/client/flash.c
+++ b/client/flash.c
@@ -280,7 +280,7 @@ static int get_proxmark_state(uint32_t *state) {
             *state = resp.arg[0];
             break;
         default:
-            fprintf(stderr, _RED_("Error:") "Couldn't get proxmark state, bad response type: 0x%04" PRIx64 "\n", resp.cmd);
+            fprintf(stderr, _RED_("Error:") "Couldn't get Proxmark3 state, bad response type: 0x%04" PRIx64 "\n", resp.cmd);
             return -1;
             break;
     }
@@ -326,12 +326,12 @@ static int enter_bootloader(char *serial_port_name) {
             fprintf(stdout, " " _GREEN_("Found") "\n");
             return 0;
         } else {
-            fprintf(stdout, _RED_("Error:") "Proxmark not found.\n");
+            fprintf(stdout, _RED_("Error:") "Proxmark3 not found.\n");
             return -1;
         }
     }
 
-    fprintf(stderr, _RED_("Error:") "Unknown Proxmark mode\n");
+    fprintf(stderr, _RED_("Error:") "Unknown Proxmark3 mode\n");
     return -1;
 }
 
diff --git a/client/flasher.c b/client/flasher.c
index be74ef8e6..ad17fd080 100644
--- a/client/flasher.c
+++ b/client/flasher.c
@@ -40,8 +40,8 @@ static void usage(char *argv0) {
     fprintf(stdout, "\t-b\tEnable flashing of bootloader area (DANGEROUS)\n\n");
     fprintf(stdout, "\nExample:\n\n\t %s "SERIAL_PORT_H" armsrc/obj/fullimage.elf\n", argv0);
 #ifdef __linux__
-    fprintf(stdout, "\nNote (Linux): if the flasher gets stuck in 'Waiting for Proxmark to reappear on <DEVICE>',\n");
-    fprintf(stdout, "              you need to blacklist proxmark for modem-manager - see wiki for more details:\n\n");
+    fprintf(stdout, "\nNote (Linux): if the flasher gets stuck in 'Waiting for Proxmark3 to reappear on <DEVICE>',\n");
+    fprintf(stdout, "              you need to blacklist Proxmark3 for modem-manager - see wiki for more details:\n\n");
     fprintf(stdout, "              https://github.com/Proxmark/proxmark3/wiki/Gentoo Linux\n\n");
     fprintf(stdout, "              https://github.com/Proxmark/proxmark3/wiki/Ubuntu Linux\n\n");
     fprintf(stdout, "              https://github.com/Proxmark/proxmark3/wiki/OSX\n\n");
@@ -82,7 +82,7 @@ int main(int argc, char **argv) {
     char *serial_port_name = argv[1];
 
     if (!OpenProxmark(serial_port_name, true, 60, true, FLASHMODE_SPEED)) {
-        fprintf(stderr, "Could not find Proxmark on " _RED_("%s") ".\n\n", serial_port_name);
+        fprintf(stderr, "Could not find Proxmark3 on " _RED_("%s") ".\n\n", serial_port_name);
         return -1;
     } else {
         fprintf(stderr, _GREEN_("Found") "\n");
diff --git a/client/hid-flasher/flash.c b/client/hid-flasher/flash.c
index 6c7f037b9..22f57a817 100644
--- a/client/hid-flasher/flash.c
+++ b/client/hid-flasher/flash.c
@@ -281,7 +281,7 @@ static int get_proxmark_state(uint32_t *state) {
             *state = resp.arg[0];
             break;
         default:
-            fprintf(stderr, "Error: Couldn't get proxmark state, bad response type: 0x%04x\n", resp.cmd);
+            fprintf(stderr, "Error: Couldn't get Proxmark3 state, bad response type: 0x%04x\n", resp.cmd);
             return -1;
             break;
     }
@@ -319,7 +319,7 @@ static int enter_bootloader(void) {
             SendCommand(&c);
             fprintf(stderr, "Press and hold down button NOW if your bootloader requires it.\n");
         }
-        fprintf(stderr, "Waiting for Proxmark to reappear on USB...");
+        fprintf(stderr, "Waiting for Proxmark3 to reappear on USB...");
 
         CloseProxmark();
         msleep(1000);
@@ -333,7 +333,7 @@ static int enter_bootloader(void) {
         return 0;
     }
 
-    fprintf(stderr, "Error: Unknown Proxmark mode\n");
+    fprintf(stderr, "Error: Unknown Proxmark3 mode\n");
     return -1;
 }
 
diff --git a/client/hid-flasher/flasher.c b/client/hid-flasher/flasher.c
index 46a68499c..0cc800826 100644
--- a/client/hid-flasher/flasher.c
+++ b/client/hid-flasher/flasher.c
@@ -55,7 +55,7 @@ int main(int argc, char **argv) {
 
     usb_init();
 
-    fprintf(stderr, "Waiting for Proxmark to appear on USB...");
+    fprintf(stderr, "Waiting for Proxmark3 to appear on USB...");
     while (!OpenProxmark(1)) {
         msleep(1000);
         fprintf(stderr, ".");
diff --git a/client/mifare/mifarehost.c b/client/mifare/mifarehost.c
index b7842dda0..211eaea02 100644
--- a/client/mifare/mifarehost.c
+++ b/client/mifare/mifarehost.c
@@ -21,7 +21,7 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
     // message
     PrintAndLogEx(NORMAL, "--------------------------------------------------------------------------------\n");
     PrintAndLogEx(NORMAL, "executing Darkside attack. Expected execution time: 25sec on average");
-    PrintAndLogEx(NORMAL, "press pm3-button on the proxmark3 device to abort both proxmark3 and client.");
+    PrintAndLogEx(NORMAL, "press pm3-button on the Proxmark3 device to abort both Proxmark3 and client.");
     PrintAndLogEx(NORMAL, "--------------------------------------------------------------------------------\n");
 
     while (true) {
@@ -159,7 +159,7 @@ int mfCheckKeys_fast(uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk,
         // s70 with 40*2 keys to check, 80*85 = 6800 auth.
         // takes about 97s, still some margin before abort
         if (timeout > 180) {
-            PrintAndLogEx(WARNING, "\nno response from Proxmark. Aborting...");
+            PrintAndLogEx(WARNING, "\nNo response from Proxmark3. Aborting...");
             return 2;
         }
     }
@@ -919,7 +919,7 @@ int detect_classic_nackbug(bool verbose) {
     UsbCommand resp;
 
     if (verbose)
-        PrintAndLogEx(SUCCESS, "press pm3-button on the proxmark3 device to abort both proxmark3 and client.\n");
+        PrintAndLogEx(SUCCESS, "press pm3-button on the Proxmark3 device to abort both Proxmark3 and client.\n");
 
     // for nice animation
     bool term = !isatty(STDIN_FILENO);
diff --git a/client/proxmark3.c b/client/proxmark3.c
index 4fd182ce7..267071c21 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -206,7 +206,7 @@ main_loop(char *script_cmds_file, char *script_cmd, bool usb_present) {
 
 static void dumpAllHelp(int markdown) {
     PrintAndLogEx(NORMAL, "\n%sProxmark3 command dump%s\n\n", markdown ? "# " : "", markdown ? "" : "\n======================");
-    PrintAndLogEx(NORMAL, "Some commands are available only if a Proxmark is actually connected.%s\n", markdown ? "  " : "");
+    PrintAndLogEx(NORMAL, "Some commands are available only if a Proxmark3 is actually connected.%s\n", markdown ? "  " : "");
     PrintAndLogEx(NORMAL, "Check column \"offline\" for their availability.\n");
     PrintAndLogEx(NORMAL, "\n");
     command_t *cmds = getTopLevelCommandTable();
@@ -262,7 +262,7 @@ static void show_help(bool showFullHelp, char *exec_name) {
         PrintAndLogEx(NORMAL, "      %s -m\n", exec_name);
         PrintAndLogEx(NORMAL, "      %s "SERIAL_PORT_H" -f             -- flush output everytime\n", exec_name);
         PrintAndLogEx(NORMAL, "      %s "SERIAL_PORT_H" -w             -- wait for serial port\n", exec_name);
-        PrintAndLogEx(NORMAL, "\n  how to run proxmark3 client\n");
+        PrintAndLogEx(NORMAL, "\n  how to run Proxmark3 client\n");
         PrintAndLogEx(NORMAL, "      %s "SERIAL_PORT_H"                -- runs the pm3 client\n", exec_name);
         PrintAndLogEx(NORMAL, "      %s                             -- runs the pm3 client in OFFLINE mode\n", exec_name);
         PrintAndLogEx(NORMAL, "\n  how to execute different commands from terminal\n");

From 43608589e3b2a0d06ef1e160b8ef9404b41d2b33 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 16 Apr 2019 20:06:32 +0200
Subject: [PATCH 1290/1938] reduce crc size, change magic

---
 include/usb_cmd.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index 2081d8775..60077d630 100644
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -41,14 +41,12 @@ typedef struct {
     uint16_t cmd;
 } PACKED UsbCommandNGPreamble;
 
-#define USB_PREAMBLE_MAGIC 0xAA5500FF
+#define USB_PREAMBLE_MAGIC 0x61334d50 // PM3a
 
 typedef struct {
-    uint32_t crc;
+    uint16_t crc;
 } PACKED UsbCommandNGPostamble;
 
-#define USB_POSTAMBLE_MAGIC 0xFF0055AA
-
 #define USB_PACKET_NG_MINLEN (sizeof(UsbCommandNGPreamble) + sizeof(UsbCommandNGPostamble))
 #define USB_PACKET_NG_MAXLEN (sizeof(UsbCommandNGPreamble) + USB_CMD_DATA_SIZE + sizeof(UsbCommandNGPostamble))
 

From 83571f02a0ca9b96d2f872cd36a68e0c536eddbd Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 16 Apr 2019 20:49:32 +0200
Subject: [PATCH 1291/1938] style

---
 armsrc/appmain.c   | 26 +++++++++++++-------------
 client/cmdhw.c     |  7 +++----
 client/comms.c     |  4 ++--
 client/comms.h     |  2 +-
 client/proxmark3.c |  2 +-
 common/usb_cdc.c   |  6 +++---
 6 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index fd3760bed..6506ef44d 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1457,17 +1457,17 @@ static void UsbPacketReceived(bool cmd_ng, uint8_t *packet) {
         case CMD_PING:
             if (cmd_ng) {
 #ifdef WITH_FPC_HOST
-            cmd_send(CMD_ACK, reply_via_fpc, ((uint32_t *)data_ng)[0], ((uint32_t *)data_ng)[(datalen_ng-1)/4], 0, 0);
+                cmd_send(CMD_ACK, reply_via_fpc, ((uint32_t *)data_ng)[0], ((uint32_t *)data_ng)[(datalen_ng - 1) / 4], 0, 0);
 #else
-            cmd_send(CMD_ACK, 0, ((uint32_t *)data_ng)[0], ((uint32_t *)data_ng)[(c->arg[0]-1)/4], 0, 0);
+                cmd_send(CMD_ACK, 0, ((uint32_t *)data_ng)[0], ((uint32_t *)data_ng)[(c->arg[0] - 1) / 4], 0, 0);
 #endif
             } else {
 #ifdef WITH_FPC_HOST
-            cmd_send(CMD_ACK, reply_via_fpc, 0, 0, 0, 0);
+                cmd_send(CMD_ACK, reply_via_fpc, 0, 0, 0, 0);
 #else
-            cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
+                cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
 #endif
-        }
+            }
             break;
 #ifdef WITH_LCD
         case CMD_LCD_RESET:
@@ -1611,10 +1611,10 @@ void  __attribute__((noreturn)) AppMain(void) {
                         }
                     }
                     if (!error) {
-            #ifdef WITH_FPC_HOST
-                            reply_via_fpc = false;
-            #endif
-                            UsbPacketReceived(true, rx);
+#ifdef WITH_FPC_HOST
+                        reply_via_fpc = false;
+#endif
+                        UsbPacketReceived(true, rx);
                     }
                 } else {                               // Old style command
                     bytes = usb_read_ng(rx + sizeof(UsbCommandNGPreamble), sizeof(UsbCommand) - sizeof(UsbCommandNGPreamble));
@@ -1623,10 +1623,10 @@ void  __attribute__((noreturn)) AppMain(void) {
                         error = true;
                     }
                     if (!error) {
-            #ifdef WITH_FPC_HOST
-                            reply_via_fpc = false;
-            #endif
-                            UsbPacketReceived(false, rx);
+#ifdef WITH_FPC_HOST
+                        reply_via_fpc = false;
+#endif
+                        UsbPacketReceived(false, rx);
                     }
                 }
             } else {
diff --git a/client/cmdhw.c b/client/cmdhw.c
index 929d37b73..25f0e0f5d 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -448,9 +448,9 @@ static int CmdPingNG(const char *Cmd) {
     uint8_t data[USB_CMD_DATA_SIZE] = {0};
     uint16_t cmd = CMD_PING;
     if (len >= 4)
-        ((uint32_t *)data)[0]=0xAABBCCDD;
+        ((uint32_t *)data)[0] = 0xAABBCCDD;
     if (len >= 8)
-        ((uint32_t *)data)[(len-1)/4] = 0xDDCCBBAA;
+        ((uint32_t *)data)[(len - 1) / 4] = 0xDDCCBBAA;
     SendCommandNG(cmd, data, len);
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {
         PrintAndLogEx(NORMAL, "PingNG successful");
@@ -458,8 +458,7 @@ static int CmdPingNG(const char *Cmd) {
             PrintAndLogEx(NORMAL, "%08x -> %08x", 0xAABBCCDD, resp.arg[1]);
         if (len >= 8)
             PrintAndLogEx(NORMAL, "%08x -> %08x", 0xDDCCBBAA, resp.arg[2]);
-    }
-    else
+    } else
         PrintAndLogEx(NORMAL, "PingNG failed");
     return 0;
 }
diff --git a/client/comms.c b/client/comms.c
index c6d15087c..e917b8d3e 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -31,7 +31,7 @@ size_t txBufferNGLen;
 static bool txBuffer_pending = false;
 static pthread_mutex_t txBufferMutex = PTHREAD_MUTEX_INITIALIZER;
 static pthread_cond_t txBufferSig = PTHREAD_COND_INITIALIZER;
- 
+
 // Used by UsbReceiveCommand as a ring buffer for messages that are yet to be
 // processed by a command handler (WaitForResponse{,Timeout})
 static UsbCommand rxBuffer[CMD_BUFFER_SIZE];
@@ -87,7 +87,7 @@ void SendCommand(UsbCommand *c) {
 //__atomic_test_and_set(&txcmd_pending, __ATOMIC_SEQ_CST);
 }
 
-void SendCommandNG(uint16_t cmd, uint8_t* data, size_t len) {
+void SendCommandNG(uint16_t cmd, uint8_t *data, size_t len) {
 
 #ifdef COMMS_DEBUG
     PrintAndLogEx(NORMAL, "Sending %d bytes of payload | cmd %04x\n", len, cmd);
diff --git a/client/comms.h b/client/comms.h
index f71c82f4c..f81540383 100644
--- a/client/comms.h
+++ b/client/comms.h
@@ -52,7 +52,7 @@ bool IsOffline(void);
 
 void *uart_receiver(void *targ);
 void SendCommand(UsbCommand *c);
-void SendCommandNG(uint16_t cmd, uint8_t* data, size_t len);
+void SendCommandNG(uint16_t cmd, uint8_t *data, size_t len);
 void clearCommandBuffer(void);
 
 #define FLASHMODE_SPEED 460800
diff --git a/client/proxmark3.c b/client/proxmark3.c
index db4479c9a..47a50a6a4 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -467,7 +467,7 @@ int main(int argc, char *argv[]) {
         usb_present = OpenProxmark(port, waitCOMPort, 20, false, speed);
 
     if (TestProxmark() == 0)
-       usb_present = false;
+        usb_present = false;
     if (!usb_present)
         PrintAndLogEx(INFO, "Running in " _YELLOW_("OFFLINE") "mode. Check \"%s -h\" if it's not what you want.\n", exec_name);
 
diff --git a/common/usb_cdc.c b/common/usb_cdc.c
index c66593a33..9090d8dc2 100644
--- a/common/usb_cdc.c
+++ b/common/usb_cdc.c
@@ -647,8 +647,8 @@ uint32_t usb_read(uint8_t *data, size_t len) {
 }
 
 static uint8_t usb_read_ng_buffer[64];
-static size_t usb_read_ng_bufoff=0;
-static size_t usb_read_ng_buflen=0;
+static size_t usb_read_ng_bufoff = 0;
+static size_t usb_read_ng_buflen = 0;
 
 uint32_t usb_read_ng(uint8_t *data, size_t len) {
 
@@ -659,7 +659,7 @@ uint32_t usb_read_ng(uint8_t *data, size_t len) {
     uint32_t time_out = 0;
 
     // take first from local buffer
-    if ( len <= usb_read_ng_buflen ) {
+    if (len <= usb_read_ng_buflen) {
         for (uint32_t i = 0; i < len; i++)
             data[nbBytesRcv++] = usb_read_ng_buffer[usb_read_ng_bufoff + i];
         usb_read_ng_buflen -= len;

From 63f9f11066cca02078dc9348f615c9c1ee94ebe0 Mon Sep 17 00:00:00 2001
From: Eloff <eloff@mail.ru>
Date: Tue, 16 Apr 2019 23:52:05 +0300
Subject: [PATCH 1292/1938] 'hf mf sim' bugs fix, RATS support, etc

---
 CHANGELOG.md       |   1 +
 armsrc/mifaresim.c | 417 +++++++++++++++++++++------------------------
 client/cmdhfmf.c   |  12 +-
 common/protocols.h |   3 +-
 4 files changed, 205 insertions(+), 228 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 71f61eaf3..b768a5cd7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [unreleased][unreleased]
+ - Fix/Add 'hf mf sim' bugs fix, RATS support, etc (@mceloff)
  - Fix serial of FPC. (@ryan)
  - Fix 'data shiftgraphzero' corrupting end of GraphBuffer (@doegox)
  - Fix 'hf legic info' - unsegmented card now uses card size to calc remaining length (@iceman)
diff --git a/armsrc/mifaresim.c b/armsrc/mifaresim.c
index 15aa93117..9d66997a5 100644
--- a/armsrc/mifaresim.c
+++ b/armsrc/mifaresim.c
@@ -34,8 +34,6 @@
 #include "protocols.h"
 #include "apps.h"
 
-uint8_t MifareCardType;
-
 static bool IsTrailerAccessAllowed(uint8_t blockNo, uint8_t keytype, uint8_t action) {
     uint8_t sector_trailer[16];
     emlGetMem(sector_trailer, blockNo, 1);
@@ -151,196 +149,194 @@ static bool IsAccessAllowed(uint8_t blockNo, uint8_t keytype, uint8_t action) {
     }
 }
 
-static bool MifareSimInit(uint16_t flags, uint8_t *datain, tag_response_info_t **responses, uint32_t *cuid, uint8_t *uid_len) {
+static bool MifareSimInit(uint16_t flags, uint8_t *datain, tag_response_info_t **responses, uint32_t *cuid, uint8_t *uid_len, uint8_t **rats, uint8_t *rats_len) {
 
     // SPEC: https://www.nxp.com/docs/en/application-note/AN10833.pdf
     // ATQA
+    static uint8_t rATQA_Mini[]  = {0x04, 0x00};             // indicate Mifare classic Mini 4Byte UID
+    static uint8_t rATQA_1k[]    = {0x04, 0x00};             // indicate Mifare classic 1k 4Byte UID
+    static uint8_t rATQA_2k[]    = {0x04, 0x00};             // indicate Mifare classic 2k 4Byte UID
+    static uint8_t rATQA_4k[]    = {0x02, 0x00};             // indicate Mifare classic 4k 4Byte UID
 
-    static uint8_t rATQA_Mini_4B[]  = {0x44, 0x00};       	// indicate Mifare classic Mini 4Byte UID
-    static uint8_t rATQA_Mini_7B[]  = {0x44, 0x00};       	// indicate Mifare classic Mini 7Byte UID
-    static uint8_t rATQA_Mini_10B[] = {0x44, 0x00};       	// indicate Mifare classic Mini 10Byte UID
-
-    static uint8_t rATQA_1k_4B[]  = {0x04, 0x00}; 				// indicate Mifare classic 1k 4Byte UID
-    static uint8_t rATQA_1k_7B[]  = {0x44, 0x00}; 		 		// indicate Mifare classic 1k 7Byte UID
-    static uint8_t rATQA_1k_10B[] = {0x42, 0x00};				  // indicate Mifare classic 4k 10Byte UID
-
-    static uint8_t rATQA_2k_4B[]  = {0x04, 0x00}; 					// indicate Mifare classic 2k 4Byte UID
-    static uint8_t rATQA_2k_7B[]  = {0x44, 0x00}; 					// indicate Mifare classic 2k 7Byte UID
-    static uint8_t rATQA_2k_10B[] = {0x42, 0x00};				  // indicate Mifare classic 4k 10Byte UID
-
-    static uint8_t rATQA_4k_4B[]  = {0x02, 0x00};				  // indicate Mifare classic 4k 4Byte UID
-    static uint8_t rATQA_4k_7B[]  = {0x42, 0x00};				  // indicate Mifare classic 4k 7Byte UID
-    static uint8_t rATQA_4k_10B[] = {0x42, 0x00};				  // indicate Mifare classic 4k 10Byte UID
-
-    static uint8_t rATQA[] = {0x00, 0x00};
-
-    // SAK + CRC
-    static uint8_t rSAK_mini[] = {0x09, 0x3f, 0xcc};				// mifare Mini
-    static uint8_t rSAK_1[]    = {0x08, 0xb6, 0xdd};				// mifare 1k
-    static uint8_t rSAK_2[]    = {0x08, 0xb6, 0xdd};				// mifare 2k
-    static uint8_t rSAK_4[]    = {0x18, 0x37, 0xcd};				// mifare 4k
+    // SAK
+    static uint8_t rSAK_Mini = 0x09;    // mifare Mini
+    static uint8_t rSAK_1k   = 0x08;	// mifare 1k
+    static uint8_t rSAK_2k   = 0x08;	// mifare 2k with RATS support
+    static uint8_t rSAK_4k   = 0x18;	// mifare 4k
 
     static uint8_t rUIDBCC1[]  = {0x00, 0x00, 0x00, 0x00, 0x00};	// UID 1st cascade level
     static uint8_t rUIDBCC2[]  = {0x00, 0x00, 0x00, 0x00, 0x00};	// UID 2nd cascade level
     static uint8_t rUIDBCC3[]  = {0x00, 0x00, 0x00, 0x00, 0x00};	// UID 3nd cascade level
 
-    static uint8_t rSAK1[]     = {0x04, 0xda, 0x17}; 			// Acknowledge but indicate UID is not finished. Used for any MIFARE Classic CL1 with double UID size
+    static uint8_t rATQA[]     = {0x00, 0x00};             // Current ATQA
+    static uint8_t rSAK[]      = {0x00, 0x00, 0x00};       // Current SAK, CRC
+    static uint8_t rSAKuid[]   = {0x04, 0xda, 0x17};       // UID incomplete cascade bit, CRC
 
+    // RATS answer for 2K NXP mifare classic (with CRC) 
+    static uint8_t rRATS[]     = {0x0c, 0x75, 0x77, 0x80, 0x02, 0xc1, 0x05, 0x2f, 0x2f, 0x01, 0xbc, 0xd6, 0x60, 0xd3};
+    
     *uid_len = 0;
 
+    // By default use 1K tag
+    memcpy(rATQA, rATQA_1k, sizeof(rATQA));
+    rSAK[0] = rSAK_1k;
+
+    //by default RATS not supported
+    *rats_len = 0;
+    *rats = NULL;
+    
     // -- Determine the UID
     // Can be set from emulator memory or incoming data
     // Length: 4,7,or 10 bytes
+
+    // Get UID, SAK, ATQA from EMUL
     if ((flags & FLAG_UID_IN_EMUL) == FLAG_UID_IN_EMUL) {
-        emlGetMemBt(datain, 0, 10);  // load 10bytes from EMUL to the datain pointer. to be used below.
+        uint8_t block0[16];
+        emlGetMemBt(block0, 0, 16);
+
+        // If uid size defined, copy only uid from EMUL to use, backward compatibility for 'hf_colin.c', 'hf_mattyrun.c'
+        if ((flags & (FLAG_4B_UID_IN_DATA | FLAG_7B_UID_IN_DATA | FLAG_10B_UID_IN_DATA)) != 0) {
+            memcpy(datain, block0, 10);  // load 10bytes from EMUL to the datain pointer. to be used below.
+        }
+        else {
+            // Check for 4 bytes uid: bcc corrected and single size uid bits in ATQA
+            if ((block0[0] ^ block0[1] ^ block0[2] ^ block0[3]) == block0[4] && (block0[6] & 0xc0) == 0) {
+                flags |= FLAG_4B_UID_IN_DATA;
+                memcpy(datain, block0, 4); 
+                rSAK[0] = block0[5];
+                memcpy(rATQA, &block0[6], sizeof(rATQA));
+            }
+            // Check for 7 bytes UID: double size uid bits in ATQA
+            else if ((block0[8] & 0xc0) == 0x40) {
+                flags |= FLAG_7B_UID_IN_DATA;
+                memcpy(datain, block0, 7); 
+                rSAK[0] = block0[7];
+                memcpy(rATQA, &block0[8], sizeof(rATQA));
+            }
+            else {
+                Dbprintf("[-] ERROR: Invalid dump. UID/SAK/ATQA not found");
+                return false;
+            }
+        }
+
     }
 
+    // Tune tag type, if defined directly
+    // Otherwise use defined by default or extracted from EMUL
+    if ((flags & FLAG_MF_MINI) == FLAG_MF_MINI) {
+        memcpy(rATQA, rATQA_Mini, sizeof(rATQA));
+        rSAK[0] = rSAK_Mini;
+        Dbprintf("Mifare Mini");
+    }
+    else if ((flags & FLAG_MF_1K) == FLAG_MF_1K) {
+        memcpy(rATQA, rATQA_1k, sizeof(rATQA));
+        rSAK[0] = rSAK_1k;
+        Dbprintf("Mifare 1K");
+    }
+    else if ((flags & FLAG_MF_2K) == FLAG_MF_2K) {
+        memcpy(rATQA, rATQA_2k, sizeof(rATQA));
+        rSAK[0] = rSAK_2k;
+        *rats = rRATS;
+        *rats_len = sizeof(rRATS);
+        Dbprintf("Mifare 2K with RATS support");
+    }
+    else if ((flags & FLAG_MF_4K) == FLAG_MF_4K) {
+        memcpy(rATQA, rATQA_4k, sizeof(rATQA));
+        rSAK[0] = rSAK_4k;
+        Dbprintf("Mifare 4K");
+    }
+
+    // Prepare UID arrays
     if ((flags & FLAG_4B_UID_IN_DATA) == FLAG_4B_UID_IN_DATA) { 	// get UID from datain
         memcpy(rUIDBCC1, datain, 4);
         *uid_len = 4;
         if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("MifareSimInit - FLAG_4B_UID_IN_DATA => Get UID from datain: %02X - Flag: %02X - UIDBCC1: %02X", FLAG_4B_UID_IN_DATA, flags, rUIDBCC1);
+
+
+        // save CUID
+        *cuid = bytes_to_num(rUIDBCC1, 4);
+        // BCC
+        rUIDBCC1[4] = rUIDBCC1[0] ^ rUIDBCC1[1] ^ rUIDBCC1[2] ^ rUIDBCC1[3];
+        if (MF_DBGLEVEL >= MF_DBG_NONE)	{
+            Dbprintf("4B UID: %02x%02x%02x%02x", rUIDBCC1[0], rUIDBCC1[1], rUIDBCC1[2], rUIDBCC1[3]);
+        }
+
+        // Correct uid size bits in ATQA
+        rATQA[0] = (rATQA[0] & 0x3f) | 0x00; // single size uid
+
     } else if ((flags & FLAG_7B_UID_IN_DATA) == FLAG_7B_UID_IN_DATA) {
         memcpy(&rUIDBCC1[1], datain, 3);
         memcpy(rUIDBCC2, datain + 3, 4);
         *uid_len = 7;
         if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("MifareSimInit - FLAG_7B_UID_IN_DATA => Get UID from datain: %02X - Flag: %02X - UIDBCC1: %02X", FLAG_7B_UID_IN_DATA, flags, rUIDBCC1);
+
+        // save CUID
+        *cuid = bytes_to_num(rUIDBCC2, 4);
+        // CascadeTag, CT
+        rUIDBCC1[0] = MIFARE_SELECT_CT;
+        // BCC
+        rUIDBCC1[4] = rUIDBCC1[0] ^ rUIDBCC1[1] ^ rUIDBCC1[2] ^ rUIDBCC1[3];
+        rUIDBCC2[4] = rUIDBCC2[0] ^ rUIDBCC2[1] ^ rUIDBCC2[2] ^ rUIDBCC2[3];
+        if (MF_DBGLEVEL >= MF_DBG_NONE)	{
+            Dbprintf("7B UID: %02x %02x %02x %02x %02x %02x %02x",
+                     rUIDBCC1[1], rUIDBCC1[2], rUIDBCC1[3], rUIDBCC2[0], rUIDBCC2[1], rUIDBCC2[2], rUIDBCC2[3]);
+        }
+
+        // Correct uid size bits in ATQA
+        rATQA[0] = (rATQA[0] & 0x3f) | 0x40; // double size uid
+
     } else if ((flags & FLAG_10B_UID_IN_DATA) == FLAG_10B_UID_IN_DATA) {
         memcpy(&rUIDBCC1[1], datain,   3);
         memcpy(&rUIDBCC2[1], datain + 3, 3);
         memcpy(rUIDBCC3,    datain + 6, 4);
         *uid_len = 10;
         if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("MifareSimInit - FLAG_10B_UID_IN_DATA => Get UID from datain: %02X - Flag: %02X - UIDBCC1: %02X", FLAG_10B_UID_IN_DATA, flags, rUIDBCC1);
+
+        // save CUID
+        *cuid = bytes_to_num(rUIDBCC3, 4);
+        // CascadeTag, CT
+        rUIDBCC1[0] = MIFARE_SELECT_CT;
+        rUIDBCC2[0] = MIFARE_SELECT_CT;
+        // BCC
+        rUIDBCC1[4] = rUIDBCC1[0] ^ rUIDBCC1[1] ^ rUIDBCC1[2] ^ rUIDBCC1[3];
+        rUIDBCC2[4] = rUIDBCC2[0] ^ rUIDBCC2[1] ^ rUIDBCC2[2] ^ rUIDBCC2[3];
+        rUIDBCC3[4] = rUIDBCC3[0] ^ rUIDBCC3[1] ^ rUIDBCC3[2] ^ rUIDBCC3[3];
+
+        if (MF_DBGLEVEL >= MF_DBG_NONE)	{
+            Dbprintf("10B UID: %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x",
+                     rUIDBCC1[1], rUIDBCC1[2], rUIDBCC1[3],
+                     rUIDBCC2[1], rUIDBCC2[2], rUIDBCC2[3],
+                     rUIDBCC3[0], rUIDBCC3[1], rUIDBCC3[2], rUIDBCC3[3]
+                    );
+        }
+
+        // Correct uid size bits in ATQA
+        rATQA[0] = (rATQA[0] & 0x3f) | 0x80; // triple size uid
+    }
+    else {
+        Dbprintf("[-] ERROR: UID size not defined");
+        return false;
     }
 
-    switch (*uid_len) {
+    // Calculate actual CRC
+    AddCrc14A(rSAK, sizeof(rSAK) - 2);
 
-        // UID 4B
-        case 4:
-            switch (MifareCardType) {
-                case 0: // Mifare Mini
-                    memcpy(rATQA, rATQA_Mini_4B, sizeof rATQA_Mini_4B);
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("=> Using rATQA_Mini_4B");
-                    break;
-                case 1: // Mifare 1K
-                    memcpy(rATQA, rATQA_1k_4B, sizeof rATQA_1k_4B);
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("=> Using rATQA_1k_4B");
-                    break;
-                case 2: // Mifare 2K
-                    memcpy(rATQA, rATQA_2k_4B, sizeof rATQA_2k_4B);
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("=> Using rATQA_2k_4B");
-                    break;
-                case 4: // Mifare 4K
-                    memcpy(rATQA, rATQA_4k_4B, sizeof rATQA_4k_4B);
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("=> Using rATQA_4k_4B");
-                    break;
-            }
-
-            // save CUID
-            *cuid = bytes_to_num(rUIDBCC1, 4);
-            // BCC
-            rUIDBCC1[4] = rUIDBCC1[0] ^ rUIDBCC1[1] ^ rUIDBCC1[2] ^ rUIDBCC1[3];
-            if (MF_DBGLEVEL >= MF_DBG_NONE)	{
-                Dbprintf("4B UID: %02x%02x%02x%02x", rUIDBCC1[0], rUIDBCC1[1], rUIDBCC1[2], rUIDBCC1[3]);
-            }
-            break;
-
-        // UID 7B
-        case 7:
-
-            switch (MifareCardType) {
-                case 0: // Mifare Mini
-                    memcpy(rATQA, rATQA_Mini_7B, sizeof rATQA_Mini_7B);
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("=> Using rATQA_Mini_7B");
-                    break;
-                case 1: // Mifare 1K
-                    memcpy(rATQA, rATQA_1k_7B, sizeof rATQA_1k_7B);
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("=> Using rATQA_1k_7B");
-                    break;
-                case 2: // Mifare 2K
-                    memcpy(rATQA, rATQA_2k_7B, sizeof rATQA_2k_7B);
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("=> Using rATQA_2k_7B");
-                    break;
-                case 4: // Mifare 4K
-                    memcpy(rATQA, rATQA_4k_7B, sizeof rATQA_4k_7B);
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("=> Using rATQA_4k_4B");
-                    break;
-            }
-
-            // save CUID
-            *cuid = bytes_to_num(rUIDBCC2, 4);
-            // CascadeTag, CT
-            rUIDBCC1[0] = MIFARE_SELECT_CT;
-            // BCC
-            rUIDBCC1[4] = rUIDBCC1[0] ^ rUIDBCC1[1] ^ rUIDBCC1[2] ^ rUIDBCC1[3];
-            rUIDBCC2[4] = rUIDBCC2[0] ^ rUIDBCC2[1] ^ rUIDBCC2[2] ^ rUIDBCC2[3];
-            if (MF_DBGLEVEL >= MF_DBG_NONE)	{
-                Dbprintf("7B UID: %02x %02x %02x %02x %02x %02x %02x",
-                         rUIDBCC1[1], rUIDBCC1[2], rUIDBCC1[3], rUIDBCC2[0], rUIDBCC2[1], rUIDBCC2[2], rUIDBCC2[3]);
-            }
-            break;
-
-        // UID 10B
-        case 10:
-            switch (MifareCardType) {
-                case 0: // Mifare Mini
-                    memcpy(rATQA, rATQA_Mini_10B, sizeof rATQA_Mini_10B);
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("=> Using rATQA_Mini_10B");
-                    break;
-                case 1: // Mifare 1K
-                    memcpy(rATQA, rATQA_1k_10B, sizeof rATQA_1k_10B);
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("=> Using rATQA_1k_10B");
-                    break;
-                case 2: // Mifare 2K
-                    memcpy(rATQA, rATQA_2k_10B, sizeof rATQA_2k_10B);
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("=> Using rATQA_2k_10B");
-                    break;
-                case 4: // Mifare 4K
-                    memcpy(rATQA, rATQA_4k_10B, sizeof rATQA_4k_10B);
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("=> Using rATQA_4k_10B");
-                    break;
-            }
-
-            // save CUID
-            *cuid = bytes_to_num(rUIDBCC3, 4);
-            // CascadeTag, CT
-            rUIDBCC1[0] = MIFARE_SELECT_CT;
-            rUIDBCC2[0] = MIFARE_SELECT_CT;
-            // BCC
-            rUIDBCC1[4] = rUIDBCC1[0] ^ rUIDBCC1[1] ^ rUIDBCC1[2] ^ rUIDBCC1[3];
-            rUIDBCC2[4] = rUIDBCC2[0] ^ rUIDBCC2[1] ^ rUIDBCC2[2] ^ rUIDBCC2[3];
-            rUIDBCC3[4] = rUIDBCC3[0] ^ rUIDBCC3[1] ^ rUIDBCC3[2] ^ rUIDBCC3[3];
-
-            if (MF_DBGLEVEL >= MF_DBG_NONE)	{
-                Dbprintf("10B UID: %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x",
-                         rUIDBCC1[1], rUIDBCC1[2], rUIDBCC1[3],
-                         rUIDBCC2[1], rUIDBCC2[2], rUIDBCC2[3],
-                         rUIDBCC3[0], rUIDBCC3[1], rUIDBCC3[2], rUIDBCC3[3]
-                        );
-            }
-            break;
-        default:
-            break;
-    }
-
-#define TAG_RESPONSE_COUNT 9
+#define TAG_RESPONSE_COUNT 6
     static tag_response_info_t responses_init[TAG_RESPONSE_COUNT] = {
         { .response = rATQA,     .response_n = sizeof(rATQA)     },		// Answer to request - respond with card type
         { .response = rUIDBCC1,  .response_n = sizeof(rUIDBCC1)  },	  	// Anticollision cascade1 - respond with first part of uid
-        { .response = rUIDBCC2,  .response_n = sizeof(rUIDBCC2)  },		  // Anticollision cascade2 - respond with 2nd part of uid
-        { .response = rUIDBCC3,  .response_n = sizeof(rUIDBCC3)  },		  // Anticollision cascade3 - respond with 3th part of uid
-        { .response = rSAK_mini, .response_n = sizeof(rSAK_mini) },     // SAK Mifare Mini
-        { .response = rSAK_1,    .response_n = sizeof(rSAK_1)    },	    // SAK Mifare 1K
-        { .response = rSAK_2,    .response_n = sizeof(rSAK_2)    },	    // SAK Mifare 2K
-        { .response = rSAK_4,    .response_n = sizeof(rSAK_4)    },	    // SAK Mifare 4K
-        { .response = rSAK1,     .response_n = sizeof(rSAK1)     }		  // Acknowledge select - Need another cascades
+        { .response = rUIDBCC2,  .response_n = sizeof(rUIDBCC2)  },		// Anticollision cascade2 - respond with 2nd part of uid
+        { .response = rUIDBCC3,  .response_n = sizeof(rUIDBCC3)  },		// Anticollision cascade3 - respond with 3th part of uid
+        { .response = rSAK,      .response_n = sizeof(rSAK)      },     //
+        { .response = rSAKuid,   .response_n = sizeof(rSAKuid)   }	    //
     };
 
     // Prepare ("precompile") the responses of the anticollision phase.
     // There will be not enough time to do this at the moment the reader sends its REQA or SELECT
-    // There are 9 predefined responses with a total of 32 bytes data to transmit.
+    // There are 6 predefined responses with a total of 23 bytes data to transmit.
     // Coded responses need one byte per bit to transfer (data, parity, start, stop, correction)
-    // 32 * 8 data bits, 32 * 1 parity bits, 9 start bits, 9 stop bits, 9 correction bits  ->   need 315 bytes buffer
-#define ALLOCATED_TAG_MODULATION_BUFFER_SIZE 512
+    // 23 * 8 data bits, 23 * 1 parity bits, 6 start bits, 6 stop bits, 6 correction bits  ->   need 225 bytes buffer
+#define ALLOCATED_TAG_MODULATION_BUFFER_SIZE 225
 
     uint8_t *free_buffer = BigBuf_malloc(ALLOCATED_TAG_MODULATION_BUFFER_SIZE);
     // modulation buffer pointer and current buffer free space size
@@ -361,11 +357,8 @@ static bool MifareSimInit(uint16_t flags, uint8_t *datain, tag_response_info_t *
 #define UIDBCC1  1
 #define UIDBCC2  2
 #define UIDBCC3  3
-#define SAK_MINI 4
-#define SAK_1    5
-#define SAK_2    6
-#define SAK_4    7
-#define SAK1     8
+#define SAK      4
+#define SAKuid   5
 
     return true;
 }
@@ -422,6 +415,9 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
     uint8_t response[MAX_MIFARE_FRAME_SIZE] = {0x00};
     uint8_t response_par[MAX_MIFARE_PARITY_SIZE] = {0x00};
 
+    uint8_t *rats = NULL;
+    uint8_t rats_len = 0;
+
     uint8_t rAUTH_AT[] = {0x00, 0x00, 0x00, 0x00};
 
     //Here, we collect UID,sector,keytype,NT,AR,NR,NT2,AR2,NR2
@@ -447,27 +443,10 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
 
     tUart *uart = GetUart();
 
-    if ((flags & FLAG_MF_MINI) == FLAG_MF_MINI) {
-        MifareCardType = 0;
-        Dbprintf("Mifare Mini");
-    }
-    if ((flags & FLAG_MF_1K) == FLAG_MF_1K) {
-        MifareCardType = 1;
-        Dbprintf("Mifare 1K");
-    }
-    if ((flags & FLAG_MF_2K) == FLAG_MF_2K) {
-        MifareCardType = 2;
-        Dbprintf("Mifare 2K");
-    }
-    if ((flags & FLAG_MF_4K) == FLAG_MF_4K) {
-        MifareCardType = 4;
-        Dbprintf("Mifare 4K");
-    }
-
     // free eventually allocated BigBuf memory but keep Emulator Memory
     BigBuf_free_keep_EM();
 
-    if (MifareSimInit(flags, datain, &responses, &cuid, &uid_len) == false) {
+    if (MifareSimInit(flags, datain, &responses, &cuid, &uid_len, &rats, &rats_len) == false) {
         BigBuf_free_keep_EM();
         return;
     }
@@ -579,34 +558,21 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                     // Send SAK according UID len
                     switch (uid_len) {
                         case 4:
-                            switch (MifareCardType) {
-                                case 0: // Mifare Mini
-                                    EmSendPrecompiledCmd(&responses[SAK_MINI]);
-                                    break;
-                                case 1: // Mifare 1K
-                                    EmSendPrecompiledCmd(&responses[SAK_1]);
-                                    break;
-                                case 2: // Mifare 2K
-                                    EmSendPrecompiledCmd(&responses[SAK_2]);
-                                    break;
-                                case 4: // Mifare 4K
-                                    EmSendPrecompiledCmd(&responses[SAK_4]);
-                                    break;
-                            }
-
+                            // UID completed
+                            EmSendPrecompiledCmd(&responses[SAK]);
                             LED_B_ON();
                             cardSTATE = MFEMUL_WORK;
                             if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_SELECT1] cardSTATE = MFEMUL_WORK");
                             break;
                         case 7:
                             // SAK => Need another select round
-                            EmSendPrecompiledCmd(&responses[SAK1]);
+                            EmSendPrecompiledCmd(&responses[SAKuid]);
                             cardSTATE	= MFEMUL_SELECT2;
                             if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_SELECT1] cardSTATE = MFEMUL_SELECT2");
                             break;
                         case 10:
                             // SAK => Need another select round
-                            EmSendPrecompiledCmd(&responses[SAK1]);
+                            EmSendPrecompiledCmd(&responses[SAKuid]);
                             cardSTATE	= MFEMUL_SELECT2;
                             if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_SELECT1] cardSTATE = MFEMUL_SELECT2");
                             break;
@@ -657,27 +623,14 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                     switch (uid_len) {
                         case 7:
                             if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_SELECT2] SELECT CL2 %02x%02x%02x%02x received", receivedCmd[2], receivedCmd[3], receivedCmd[4], receivedCmd[5]);
-
-                            switch (MifareCardType) {
-                                case 0: // Mifare Mini
-                                    EmSendPrecompiledCmd(&responses[SAK_MINI]);
-                                    break;
-                                case 1: // Mifare 1K
-                                    EmSendPrecompiledCmd(&responses[SAK_1]);
-                                    break;
-                                case 2: // Mifare 2K
-                                    EmSendPrecompiledCmd(&responses[SAK_2]);
-                                    break;
-                                case 4: // Mifare 4K
-                                    EmSendPrecompiledCmd(&responses[SAK_4]);
-                                    break;
-                            }
+                            // UID completed
+                            EmSendPrecompiledCmd(&responses[SAK]);
                             cardSTATE = MFEMUL_WORK;
                             LED_B_ON();
                             break;
                         case 10:
                             // SAK => Need another select round
-                            EmSendPrecompiledCmd(&responses[SAK1]);
+                            EmSendPrecompiledCmd(&responses[SAKuid]);
                             cardSTATE = MFEMUL_SELECT3;
                             if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_SELECT2] cardSTATE = MFEMUL_SELECT3");
                         default:
@@ -714,22 +667,8 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                         (receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_3 &&
                          receivedCmd[1] == 0x70 &&
                          memcmp(&receivedCmd[2], responses[UIDBCC3].response, 4) == 0)) {
-
-                    switch (MifareCardType) {
-                        case 0: // Mifare Mini
-                            EmSendPrecompiledCmd(&responses[SAK_MINI]);
-                            break;
-                        case 1: // Mifare 1K
-                            EmSendPrecompiledCmd(&responses[SAK_1]);
-                            break;
-                        case 2: // Mifare 2K
-                            EmSendPrecompiledCmd(&responses[SAK_2]);
-                            break;
-                        case 4: // Mifare 4K
-                            EmSendPrecompiledCmd(&responses[SAK_4]);
-                            break;
-                    }
-
+                    // UID completed
+                    EmSendPrecompiledCmd(&responses[SAK]);
                     cardSTATE = MFEMUL_WORK;
                     LED_B_ON();
                     if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
@@ -1003,9 +942,41 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                 }
 
                 // case MFEMUL_WORK => CMD RATS
-                if (receivedCmd_dec[0] == ISO14443A_CMD_RATS) {
-                    EmSend4bit(encrypted_data ? mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA) : CARD_NACK_NA);
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("[MFEMUL_WORK] RCV RATS => NACK");
+                if (receivedCmd_len == 4 && receivedCmd_dec[0] == ISO14443A_CMD_RATS && receivedCmd_dec[1] == 0x80) {
+                    if (rats && rats_len) {
+                        if (encrypted_data) {
+                            memcpy(response, rats, rats_len);
+                            mf_crypto1_encrypt(pcs, response, rats_len, response_par);
+                            EmSendCmdPar(response, rats_len, response_par);
+                        }
+                        else
+                            EmSendCmd(rats, rats_len);
+                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("[MFEMUL_WORK] RCV RATS => ACK");
+                    }
+                    else {
+                        EmSend4bit(encrypted_data ? mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA) : CARD_NACK_NA);
+                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("[MFEMUL_WORK] RCV RATS => NACK");
+                    }
+                    break;
+                }
+                
+                // case MFEMUL_WORK => ISO14443A_CMD_NXP_DESELECT
+                if (receivedCmd_len == 3 && receivedCmd_dec[0] == ISO14443A_CMD_NXP_DESELECT) {
+                    if (rats && rats_len) {
+                        // response back NXP_DESELECT
+                        if (encrypted_data) {
+                            memcpy(response, receivedCmd_dec, receivedCmd_len);
+                            mf_crypto1_encrypt(pcs, response, receivedCmd_len, response_par);
+                            EmSendCmdPar(response, receivedCmd_len, response_par);
+                        }
+                        else
+                            EmSendCmd(receivedCmd_dec, receivedCmd_len);
+                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("[MFEMUL_WORK] RCV NXP DESELECT => ACK");
+                    }
+                    else {
+                        EmSend4bit(encrypted_data ? mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA) : CARD_NACK_NA);
+                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("[MFEMUL_WORK] RCV NXP DESELECT => NACK");
+                    }
                     break;
                 }
 
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 0e91c784e..3d8ad1957 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -2140,7 +2140,7 @@ static int CmdHF14AMf1kSim(const char *Cmd) {
 
     uint8_t uid[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
     uint8_t exitAfterNReads = 0;
-    uint16_t flags = (FLAG_UID_IN_EMUL | FLAG_4B_UID_IN_DATA);
+    uint16_t flags = 0;
     int uidlen = 0;
     uint8_t cmdp = 0;
     bool errors = false, verbose = false, setEmulatorMem = false;
@@ -2191,13 +2191,13 @@ static int CmdHF14AMf1kSim(const char *Cmd) {
                 param_gethex_ex(Cmd, cmdp + 1, uid, &uidlen);
                 switch (uidlen) {
                     case 20:
-                        flags = FLAG_10B_UID_IN_DATA;
+                        flags |= FLAG_10B_UID_IN_DATA;
                         break;
                     case 14:
-                        flags = FLAG_7B_UID_IN_DATA;
+                        flags |= FLAG_7B_UID_IN_DATA;
                         break;
                     case  8:
-                        flags = FLAG_4B_UID_IN_DATA;
+                        flags |= FLAG_4B_UID_IN_DATA;
                         break;
                     default:
                         return usage_hf14_mf1ksim();
@@ -2221,6 +2221,10 @@ static int CmdHF14AMf1kSim(const char *Cmd) {
     //Validations
     if (errors) return usage_hf14_mf1ksim();
 
+    // Use UID, SAK, ATQA from EMUL, if uid not defined
+    if ((flags & (FLAG_4B_UID_IN_DATA | FLAG_7B_UID_IN_DATA | FLAG_10B_UID_IN_DATA)) == 0)
+        flags |= FLAG_UID_IN_EMUL;
+
     PrintAndLogEx(NORMAL, " uid:%s, numreads:%d, flags:%d (0x%02x) "
                   , (uidlen == 0) ? "N/A" : sprint_hex(uid, uidlen >> 1)
                   , exitAfterNReads
diff --git a/common/protocols.h b/common/protocols.h
index f85ebb49b..cef339dc4 100644
--- a/common/protocols.h
+++ b/common/protocols.h
@@ -151,6 +151,7 @@ ISO 7816-4 Basic interindustry commands. For command APDU's.
 #define ISO14443A_CMD_WRITEBLOCK    0xA0
 #define ISO14443A_CMD_HALT          0x50
 #define ISO14443A_CMD_RATS          0xE0
+#define ISO14443A_CMD_NXP_DESELECT  0xC2
 
 #define MIFARE_SELECT_CT            0x88
 #define MIFARE_AUTH_KEYA            0x60
@@ -167,7 +168,7 @@ ISO 7816-4 Basic interindustry commands. For command APDU's.
 #define MIFARE_EV1_SETMODE          0x43
 
 #define MIFARE_ULC_WRITE            0xA2
-#define MIFARE_ULC_COMP_WRITE      0xA0
+#define MIFARE_ULC_COMP_WRITE       0xA0
 #define MIFARE_ULC_AUTH_1           0x1A
 #define MIFARE_ULC_AUTH_2           0xAF
 

From 4eaa2fc5aabc0b1ddb928a5a47f54f222670bcc9 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 16 Apr 2019 23:02:40 +0200
Subject: [PATCH 1293/1938] move common util fcts to /common to avoid common
 files (e.g. crc) to depend on non-common files

---
 armsrc/Makefile      |  1 +
 armsrc/mifareutil.h  |  2 +-
 armsrc/util.c        | 78 --------------------------------------
 armsrc/util.h        | 23 ------------
 client/Makefile      |  1 +
 client/emv/emvjson.c |  1 -
 client/emv/emvjson.h |  1 +
 client/fido/cose.c   |  1 -
 client/fido/cose.h   |  2 +
 client/util.c        | 69 ----------------------------------
 client/util.h        | 30 ---------------
 common/commonutil.c  | 89 ++++++++++++++++++++++++++++++++++++++++++++
 common/commonutil.h  | 55 +++++++++++++++++++++++++++
 common/crc.h         |  2 +-
 common/crc16.h       |  4 +-
 common/i2c.h         |  1 -
 common/lfdemod.h     |  1 -
 common/tea.h         |  2 +-
 common/wiegand.h     |  1 -
 19 files changed, 155 insertions(+), 209 deletions(-)
 create mode 100644 common/commonutil.c
 create mode 100644 common/commonutil.h

diff --git a/armsrc/Makefile b/armsrc/Makefile
index 5ec73b2b3..a3280a0b9 100644
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -157,6 +157,7 @@ THUMBSRC = start.c \
 	$(SRC_FPC) \
 	appmain.c \
 	printf.c \
+	commonutil.c \
 	util.c \
 	string.c \
 	BigBuf.c \
diff --git a/armsrc/mifareutil.h b/armsrc/mifareutil.h
index 46f6fa81a..8bfb1c13f 100644
--- a/armsrc/mifareutil.h
+++ b/armsrc/mifareutil.h
@@ -15,7 +15,7 @@
 #include "proxmark3.h"
 #include "apps.h"
 #include "parity.h"
-#include "util.h"
+#include "commonutil.h"
 #include "string.h"
 #include "iso14443a.h"
 #include "crapto1/crapto1.h"
diff --git a/armsrc/util.c b/armsrc/util.c
index 8ee91b464..60b4723b4 100644
--- a/armsrc/util.c
+++ b/armsrc/util.c
@@ -13,84 +13,6 @@ size_t nbytes(size_t nbits) {
     return (nbits >> 3) + ((nbits % 8) > 0);
 }
 
-/*
- ref  http://www.csm.ornl.gov/~dunigan/crc.html
- Returns the value v with the bottom b [0,32] bits reflected.
- Example: reflect(0x3e23L,3) == 0x3e26
-*/
-uint32_t reflect(uint32_t v, int b) {
-    uint32_t t = v;
-    for (int i = 0; i < b; ++i) {
-        if (t & 1)
-            v |=  BITMASK((b - 1) - i);
-        else
-            v &= ~BITMASK((b - 1) - i);
-        t >>= 1;
-    }
-    return v;
-}
-
-uint8_t reflect8(uint8_t b) {
-    return ((b * 0x80200802ULL) & 0x0884422110ULL) * 0x0101010101ULL >> 32;
-}
-uint16_t reflect16(uint16_t b) {
-    uint16_t v = 0;
-    v |= (b & 0x8000) >> 15;
-    v |= (b & 0x4000) >> 13;
-    v |= (b & 0x2000) >> 11;
-    v |= (b & 0x1000) >> 9;
-    v |= (b & 0x0800) >> 7;
-    v |= (b & 0x0400) >> 5;
-    v |= (b & 0x0200) >> 3;
-    v |= (b & 0x0100) >> 1;
-
-    v |= (b & 0x0080) << 1;
-    v |= (b & 0x0040) << 3;
-    v |= (b & 0x0020) << 5;
-    v |= (b & 0x0010) << 7;
-    v |= (b & 0x0008) << 9;
-    v |= (b & 0x0004) << 11;
-    v |= (b & 0x0002) << 13;
-    v |= (b & 0x0001) << 15;
-    return v;
-}
-
-void num_to_bytes(uint64_t n, size_t len, uint8_t *dest) {
-    while (len--) {
-        dest[len] = (uint8_t) n;
-        n >>= 8;
-    }
-}
-
-uint64_t bytes_to_num(uint8_t *src, size_t len) {
-    uint64_t num = 0;
-    while (len--) {
-        num = (num << 8) | (*src);
-        src++;
-    }
-    return num;
-}
-
-// RotateLeft - Ultralight, Desfire
-void rol(uint8_t *data, const size_t len) {
-    uint8_t first = data[0];
-    for (size_t i = 0; i < len - 1; i++) {
-        data[i] = data[i + 1];
-    }
-    data[len - 1] = first;
-}
-
-void lsl(uint8_t *data, size_t len) {
-    for (size_t n = 0; n < len - 1; n++) {
-        data[n] = (data[n] << 1) | (data[n + 1] >> 7);
-    }
-    data[len - 1] <<= 1;
-}
-
-int32_t le24toh(uint8_t data[3]) {
-    return (data[2] << 16) | (data[1] << 8) | data[0];
-}
-
 //convert hex digit to integer
 uint8_t hex2int(char hexchar) {
     switch (hexchar) {
diff --git a/armsrc/util.h b/armsrc/util.h
index fc519fe43..9be593ad5 100644
--- a/armsrc/util.h
+++ b/armsrc/util.h
@@ -40,20 +40,6 @@
 #define BUTTON_DOUBLE_CLICK -2
 #define BUTTON_ERROR -99
 
-#ifndef BSWAP_16
-# define BSWAP_16(x) ((( ((x) & 0xFF00 ) >> 8))| ( (((x) & 0x00FF) << 8)))
-#endif
-#ifndef BITMASK
-# define BITMASK(X) (1 << (X))
-#endif
-#ifndef ARRAYLEN
-# define ARRAYLEN(x) (sizeof(x)/sizeof((x)[0]))
-#endif
-
-#ifndef NTIME
-# define NTIME(n) for (int _index = 0; _index < n; _index++)
-#endif
-
 #ifndef REV8
 #define REV8(x) ((((x)>>7)&1)+((((x)>>6)&1)<<1)+((((x)>>5)&1)<<2)+((((x)>>4)&1)<<3)+((((x)>>3)&1)<<4)+((((x)>>2)&1)<<5)+((((x)>>1)&1)<<6)+(((x)&1)<<7))
 #endif
@@ -84,15 +70,6 @@
 
 size_t nbytes(size_t nbits);
 
-uint32_t reflect(uint32_t v, int b); // used in crc.c ...
-uint8_t reflect8(uint8_t b);         // dedicated 8bit reversal
-uint16_t reflect16(uint16_t b);      // dedicated 16bit reversal
-
-void num_to_bytes(uint64_t n, size_t len, uint8_t *dest);
-uint64_t bytes_to_num(uint8_t *src, size_t len);
-void rol(uint8_t *data, const size_t len);
-void lsl(uint8_t *data, size_t len);
-int32_t le24toh(uint8_t data[3]);
 uint8_t hex2int(char hexchar);
 
 void LED(int led, int ms);
diff --git a/client/Makefile b/client/Makefile
index 7992b68b4..9d78ab125 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -116,6 +116,7 @@ POSTCOMPILE = $(MV) -f $(OBJDIR)/$*.Td $(OBJDIR)/$*.d
 CORESRCS =  uart_posix.c \
 			uart_win32.c \
 			ui.c \
+			commonutil.c \
 			util.c \
 			util_posix.c \
 			scandir.c \
diff --git a/client/emv/emvjson.c b/client/emv/emvjson.c
index 59de9d37e..c9cffae93 100644
--- a/client/emv/emvjson.c
+++ b/client/emv/emvjson.c
@@ -14,7 +14,6 @@
 #include <stdlib.h>
 #include <inttypes.h>
 #include <string.h>
-#include "util.h"
 #include "ui.h"
 #include "proxmark3.h"
 #include "emv_tags.h"
diff --git a/client/emv/emvjson.h b/client/emv/emvjson.h
index 6bcf8243d..edff18bcd 100644
--- a/client/emv/emvjson.h
+++ b/client/emv/emvjson.h
@@ -12,6 +12,7 @@
 
 #include <jansson.h>
 #include "tlv.h"
+#include "commonutil.h"
 
 typedef struct {
     tlv_tag_t Tag;
diff --git a/client/fido/cose.c b/client/fido/cose.c
index a3fc9755c..6d2fa4faa 100644
--- a/client/fido/cose.c
+++ b/client/fido/cose.c
@@ -13,7 +13,6 @@
 #include "cose.h"
 #include <cbor.h>
 #include "cbortools.h"
-#include "util.h"
 
 static const char COSEEmptyStr[] = "";
 
diff --git a/client/fido/cose.h b/client/fido/cose.h
index f8f28aabf..3243a1632 100644
--- a/client/fido/cose.h
+++ b/client/fido/cose.h
@@ -16,6 +16,8 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <cbor.h>
+#include "commonutil.h"
+#include "util.h"
 
 const char *GetCOSEAlgName(int id);
 const char *GetCOSEAlgDescription(int id);
diff --git a/client/util.c b/client/util.c
index b14023067..ebb534fdf 100644
--- a/client/util.c
+++ b/client/util.c
@@ -372,22 +372,6 @@ void print_blocks(uint32_t *data, size_t len) {
     }
 }
 
-void num_to_bytes(uint64_t n, size_t len, uint8_t *dest) {
-    while (len--) {
-        dest[len] = n & 0xFF;
-        n >>= 8;
-    }
-}
-
-uint64_t bytes_to_num(uint8_t *src, size_t len) {
-    uint64_t num = 0;
-    while (len--) {
-        num = (num << 8) | (*src);
-        src++;
-    }
-    return num;
-}
-
 // takes a number (uint64_t) and creates a binarray in dest.
 void num_to_bytebits(uint64_t n, size_t len, uint8_t *dest) {
     while (len--) {
@@ -773,9 +757,6 @@ void xor(unsigned char *dst, unsigned char *src, size_t len) {
         *dst ^= *src;
 }
 
-int32_t le24toh(uint8_t data[3]) {
-    return (data[2] << 16) | (data[1] << 8) | data[0];
-}
 // Pack a bitarray into a uint32_t.
 uint32_t PackBits(uint8_t start, uint8_t len, uint8_t *bits) {
 
@@ -791,16 +772,6 @@ uint32_t PackBits(uint8_t start, uint8_t len, uint8_t *bits) {
     return tmp;
 }
 
-// RotateLeft - Ultralight, Desfire, works on byte level
-// 00-01-02  >> 01-02-00
-void rol(uint8_t *data, const size_t len) {
-    uint8_t first = data[0];
-    for (size_t i = 0; i < len - 1; i++) {
-        data[i] = data[i + 1];
-    }
-    data[len - 1] = first;
-}
-
 /*
 uint8_t pw_rev_A(uint8_t b) {
     b = (b & 0xF0) >> 4 | (b & 0x0F) << 4;
@@ -809,46 +780,6 @@ uint8_t pw_rev_A(uint8_t b) {
     return b;
 }
 */
-uint8_t reflect8(uint8_t b) {
-    return ((b * 0x80200802ULL) & 0x0884422110ULL) * 0x0101010101ULL >> 32;
-}
-uint16_t reflect16(uint16_t b) {
-    uint16_t v = 0;
-    v |= (b & 0x8000) >> 15;
-    v |= (b & 0x4000) >> 13;
-    v |= (b & 0x2000) >> 11;
-    v |= (b & 0x1000) >> 9;
-    v |= (b & 0x0800) >> 7;
-    v |= (b & 0x0400) >> 5;
-    v |= (b & 0x0200) >> 3;
-    v |= (b & 0x0100) >> 1;
-
-    v |= (b & 0x0080) << 1;
-    v |= (b & 0x0040) << 3;
-    v |= (b & 0x0020) << 5;
-    v |= (b & 0x0010) << 7;
-    v |= (b & 0x0008) << 9;
-    v |= (b & 0x0004) << 11;
-    v |= (b & 0x0002) << 13;
-    v |= (b & 0x0001) << 15;
-    return v;
-}
-/*
- ref  http://www.csm.ornl.gov/~dunigan/crc.html
- Returns the value v with the bottom b [0,32] bits reflected.
- Example: reflect(0x3e23L,3) == 0x3e26
-*/
-uint32_t reflect(uint32_t v, int b) {
-    uint32_t t = v;
-    for (int i = 0; i < b; ++i) {
-        if (t & 1)
-            v |=  BITMASK((b - 1) - i);
-        else
-            v &= ~BITMASK((b - 1) - i);
-        t >>= 1;
-    }
-    return v;
-}
 
 uint64_t HornerScheme(uint64_t num, uint64_t divider, uint64_t factor) {
     uint64_t remaind = 0, quotient = 0, result = 0;
diff --git a/client/util.h b/client/util.h
index 5e60868bb..bd82237d0 100644
--- a/client/util.h
+++ b/client/util.h
@@ -24,9 +24,6 @@
 #include <endian.h>
 #endif
 
-#ifndef BITMASK
-# define BITMASK(X) (1 << (X))
-#endif
 #ifndef ROTR
 # define ROTR(x,n) (((uintmax_t)(x) >> (n)) | ((uintmax_t)(x) << ((sizeof(x) * 8) - (n))))
 #endif
@@ -85,23 +82,6 @@
 #endif
 #endif
 
-// endian change for 16bit
-#ifdef __GNUC__
-#ifndef BSWAP_16
-#define BSWAP_16(x) __builtin_bswap16(x)
-#endif
-#else
-#ifdef _MSC_VER
-#ifndef BSWAP_16
-#define BSWAP_16(x) _byteswap_ushort(x)
-#endif
-#else
-#ifndef BSWAP_16
-# define BSWAP_16(x) ((( ((x) & 0xFF00 ) >> 8))| ( (((x) & 0x00FF) << 8)))
-#endif
-#endif
-#endif
-
 #define EVEN                        0
 #define ODD                         1
 
@@ -132,10 +112,6 @@
 # define FILE_PATH_SIZE 1000
 #endif
 
-#ifndef ARRAYLEN
-# define ARRAYLEN(x) (sizeof(x)/sizeof((x)[0]))
-#endif
-
 #if defined(__linux__) || (__APPLE__)
 # define _BLUE_(s) "\x1b[34m" s "\x1b[0m "
 #else
@@ -217,8 +193,6 @@ char *sprint_ascii_ex(const uint8_t *data, const size_t len, const size_t min_st
 
 void print_blocks(uint32_t *data, size_t len);
 
-void num_to_bytes(uint64_t n, size_t len, uint8_t *dest);
-uint64_t bytes_to_num(uint8_t *src, size_t len);
 void num_to_bytebits(uint64_t n, size_t len, uint8_t *dest);
 void num_to_bytebitsLSBF(uint64_t n, size_t len, uint8_t *dest);
 uint8_t *SwapEndian64(const uint8_t *src, const size_t len, const uint8_t blockSize);
@@ -251,10 +225,6 @@ void xor(unsigned char *dst, unsigned char *src, size_t len);
 int32_t le24toh(uint8_t data[3]);
 
 uint32_t PackBits(uint8_t start, uint8_t len, uint8_t *bits);
-void rol(uint8_t *data, const size_t len);
-uint32_t reflect(uint32_t v, int b);
-uint8_t reflect8(uint8_t b); // dedicated 8bit reversal
-uint16_t reflect16(uint16_t b); // dedicated 16bit reversal
 uint64_t HornerScheme(uint64_t num, uint64_t divider, uint64_t factor);
 
 int num_CPUs(void); // number of logical CPUs
diff --git a/common/commonutil.c b/common/commonutil.c
new file mode 100644
index 000000000..75ad41285
--- /dev/null
+++ b/common/commonutil.c
@@ -0,0 +1,89 @@
+//-----------------------------------------------------------------------------
+// Jonathan Westhues, Sept 2005
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// Utility functions used in many places, not specific to any piece of code.
+//-----------------------------------------------------------------------------
+#include "commonutil.h"
+
+/*
+ ref  http://www.csm.ornl.gov/~dunigan/crc.html
+ Returns the value v with the bottom b [0,32] bits reflected.
+ Example: reflect(0x3e23L,3) == 0x3e26
+*/
+uint32_t reflect(uint32_t v, int b) {
+    uint32_t t = v;
+    for (int i = 0; i < b; ++i) {
+        if (t & 1)
+            v |=  BITMASK((b - 1) - i);
+        else
+            v &= ~BITMASK((b - 1) - i);
+        t >>= 1;
+    }
+    return v;
+}
+
+uint8_t reflect8(uint8_t b) {
+    return ((b * 0x80200802ULL) & 0x0884422110ULL) * 0x0101010101ULL >> 32;
+}
+uint16_t reflect16(uint16_t b) {
+    uint16_t v = 0;
+    v |= (b & 0x8000) >> 15;
+    v |= (b & 0x4000) >> 13;
+    v |= (b & 0x2000) >> 11;
+    v |= (b & 0x1000) >> 9;
+    v |= (b & 0x0800) >> 7;
+    v |= (b & 0x0400) >> 5;
+    v |= (b & 0x0200) >> 3;
+    v |= (b & 0x0100) >> 1;
+
+    v |= (b & 0x0080) << 1;
+    v |= (b & 0x0040) << 3;
+    v |= (b & 0x0020) << 5;
+    v |= (b & 0x0010) << 7;
+    v |= (b & 0x0008) << 9;
+    v |= (b & 0x0004) << 11;
+    v |= (b & 0x0002) << 13;
+    v |= (b & 0x0001) << 15;
+    return v;
+}
+
+void num_to_bytes(uint64_t n, size_t len, uint8_t *dest) {
+    while (len--) {
+        dest[len] = (uint8_t) n;
+        n >>= 8;
+    }
+}
+
+uint64_t bytes_to_num(uint8_t *src, size_t len) {
+    uint64_t num = 0;
+    while (len--) {
+        num = (num << 8) | (*src);
+        src++;
+    }
+    return num;
+}
+
+// RotateLeft - Ultralight, Desfire
+void rol(uint8_t *data, const size_t len) {
+    uint8_t first = data[0];
+    for (size_t i = 0; i < len - 1; i++) {
+        data[i] = data[i + 1];
+    }
+    data[len - 1] = first;
+}
+
+void lsl(uint8_t *data, size_t len) {
+    for (size_t n = 0; n < len - 1; n++) {
+        data[n] = (data[n] << 1) | (data[n + 1] >> 7);
+    }
+    data[len - 1] <<= 1;
+}
+
+int32_t le24toh(uint8_t data[3]) {
+    return (data[2] << 16) | (data[1] << 8) | data[0];
+}
+
diff --git a/common/commonutil.h b/common/commonutil.h
new file mode 100644
index 000000000..e4b2178e5
--- /dev/null
+++ b/common/commonutil.h
@@ -0,0 +1,55 @@
+//-----------------------------------------------------------------------------
+// Jonathan Westhues, Aug 2005
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// Utility functions used in many places, not specific to any piece of code.
+//-----------------------------------------------------------------------------
+
+#ifndef __COMMONUTIL_H
+#define __COMMONUTIL_H
+
+#include <stddef.h>
+#include <inttypes.h>
+// endian change for 16bit
+#ifdef __GNUC__
+#ifndef BSWAP_16
+#define BSWAP_16(x) __builtin_bswap16(x)
+#endif
+#else
+#ifdef _MSC_VER
+#ifndef BSWAP_16
+#define BSWAP_16(x) _byteswap_ushort(x)
+#endif
+#else
+#ifndef BSWAP_16
+# define BSWAP_16(x) ((( ((x) & 0xFF00 ) >> 8))| ( (((x) & 0x00FF) << 8)))
+#endif
+#endif
+#endif
+
+#ifndef BITMASK
+# define BITMASK(X) (1 << (X))
+#endif
+#ifndef ARRAYLEN
+# define ARRAYLEN(x) (sizeof(x)/sizeof((x)[0]))
+#endif
+
+#ifndef NTIME
+# define NTIME(n) for (int _index = 0; _index < n; _index++)
+#endif
+
+uint32_t reflect(uint32_t v, int b); // used in crc.c ...
+uint8_t reflect8(uint8_t b);         // dedicated 8bit reversal
+uint16_t reflect16(uint16_t b);      // dedicated 16bit reversal
+
+void num_to_bytes(uint64_t n, size_t len, uint8_t *dest);
+uint64_t bytes_to_num(uint8_t *src, size_t len);
+
+void rol(uint8_t *data, const size_t len);
+void lsl(uint8_t *data, size_t len);
+int32_t le24toh(uint8_t data[3]);
+
+#endif
diff --git a/common/crc.h b/common/crc.h
index 7cb9caff9..f0fa91194 100644
--- a/common/crc.h
+++ b/common/crc.h
@@ -10,7 +10,7 @@
 #define __CRC_H
 
 #include "common.h" //stdint, stddef, stdbool
-#include "util.h"   // reflect, bswap_16
+#include "commonutil.h"   // reflect, bswap_16
 
 typedef struct crc_ctx {
     uint32_t state;
diff --git a/common/crc16.h b/common/crc16.h
index c5c486df9..cc29d3ee0 100644
--- a/common/crc16.h
+++ b/common/crc16.h
@@ -10,7 +10,9 @@
 
 #include <stdint.h>
 #include <stdio.h>
-#include "util.h"
+#include <stdbool.h>
+#include <string.h>
+#include "commonutil.h"
 
 #define CRC16_POLY_CCITT  0x1021
 #define CRC16_POLY_LEGIC  0xc6c6 //0x6363
diff --git a/common/i2c.h b/common/i2c.h
index df7f6698c..648d0d8d9 100644
--- a/common/i2c.h
+++ b/common/i2c.h
@@ -4,7 +4,6 @@
 #include <stddef.h>
 #include "proxmark3.h"
 #include "apps.h"
-#include "util.h"
 #include "BigBuf.h"
 #include "mifare.h"
 
diff --git a/common/lfdemod.h b/common/lfdemod.h
index 75f18f3c6..a9fe3f70b 100644
--- a/common/lfdemod.h
+++ b/common/lfdemod.h
@@ -19,7 +19,6 @@
 #include <stdlib.h>  // for
 #include <stdbool.h> // for bool
 #include "parity.h"  // for parity test
-#include "util.h"    // for ARRAYLEN
 
 //might not be high enough for noisy environments
 #define NOISE_AMPLITUDE_THRESHOLD 15
diff --git a/common/tea.h b/common/tea.h
index 43ac93428..57be7e834 100644
--- a/common/tea.h
+++ b/common/tea.h
@@ -10,7 +10,7 @@
 #ifndef __TEA_H
 #define __TEA_H
 
-#include "util.h"
+#include "commonutil.h"
 #include <stdint.h>
 #include <stddef.h>
 void tea_encrypt(uint8_t *v, uint8_t *key);
diff --git a/common/wiegand.h b/common/wiegand.h
index 1db50607c..ce219fad1 100644
--- a/common/wiegand.h
+++ b/common/wiegand.h
@@ -10,7 +10,6 @@
 #define __WIEGAND_H
 
 #include "common.h"
-#include "util.h"
 
 uint8_t getParity(uint8_t *bits, uint8_t len, uint8_t type);
 uint8_t checkParity(uint32_t bits, uint8_t len, uint8_t type);

From 96843c3f478842ec5c423ae6fa818256d7a0fd77 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 16 Apr 2019 23:15:23 +0200
Subject: [PATCH 1294/1938] New reply frames transmission (reception still to
 be done)

---
 armsrc/appmain.c  | 16 ++++++---------
 client/cmdhw.c    | 13 ++++++------
 client/comms.c    |  6 +++---
 common/cmd.c      | 51 +++++++++++++++++++++++++++++++++++++++++++++++
 common/cmd.h      |  1 +
 include/usb_cmd.h | 48 +++++++++++++++++++++++++++++++++++++++++---
 6 files changed, 112 insertions(+), 23 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 0742625b7..10d57fbf5 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1457,11 +1457,7 @@ static void UsbPacketReceived(bool cmd_ng, uint8_t *packet) {
             break;
         case CMD_PING:
             if (cmd_ng) {
-#ifdef WITH_FPC_HOST
-                cmd_send(CMD_ACK, reply_via_fpc, ((uint32_t *)data_ng)[0], ((uint32_t *)data_ng)[(datalen_ng - 1) / 4], 0, 0);
-#else
-                cmd_send(CMD_ACK, 0, ((uint32_t *)data_ng)[0], ((uint32_t *)data_ng)[(c->arg[0] - 1) / 4], 0, 0);
-#endif
+                reply_ng(CMD_PING, PM3_SUCCESS, data_ng, datalen_ng);
             } else {
 #ifdef WITH_FPC_HOST
                 cmd_send(CMD_ACK, reply_via_fpc, 0, 0, 0, 0);
@@ -1574,9 +1570,9 @@ void  __attribute__((noreturn)) AppMain(void) {
     usb_disable();
     usb_enable();
 
-    uint8_t rx[USB_PACKET_NG_MAXLEN];
+    uint8_t rx[USB_COMMANDNG_MAXLEN];
     UsbCommandNGPreamble *pre = (UsbCommandNGPreamble *)rx;
-    UsbCommandNGPostamble *post = (UsbCommandNGPostamble *)(rx + sizeof(UsbCommandNGPreamble) + USB_CMD_DATA_SIZE);
+    UsbCommandNGPostamble *post = (UsbCommandNGPostamble *)(rx + sizeof(UsbCommandNGPreamble) + USB_DATANG_SIZE);
 
     for (;;) {
         WDT_HIT();
@@ -1586,8 +1582,8 @@ void  __attribute__((noreturn)) AppMain(void) {
             bool error = false;
             size_t bytes = usb_read_ng(rx, sizeof(UsbCommandNGPreamble));
             if (bytes == sizeof(UsbCommandNGPreamble)) {
-                if (pre->magic == USB_PREAMBLE_MAGIC) { // New style NG command
-                    if (pre->length > USB_CMD_DATA_SIZE) {
+                if (pre->magic == USB_COMMANDNG_PREAMBLE_MAGIC) { // New style NG command
+                    if (pre->length > USB_DATANG_SIZE) {
                         Dbprintf("Packet frame with incompatible length: 0x%04x", pre->length);
                         error = true;
                     }
@@ -1599,7 +1595,7 @@ void  __attribute__((noreturn)) AppMain(void) {
                         }
                     }
                     if (!error) {                        // Get the postamble
-                        bytes = usb_read_ng(rx + sizeof(UsbCommandNGPreamble) + USB_CMD_DATA_SIZE, sizeof(UsbCommandNGPostamble));
+                        bytes = usb_read_ng(rx + sizeof(UsbCommandNGPreamble) + USB_DATANG_SIZE, sizeof(UsbCommandNGPostamble));
                         if (bytes != sizeof(UsbCommandNGPostamble)) {
                             Dbprintf("Packet frame error fetching postamble");
                             error = true;
diff --git a/client/cmdhw.c b/client/cmdhw.c
index 0442052e1..6bdd65585 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -440,17 +440,16 @@ static int CmdPing(const char *Cmd) {
 
 static int CmdPingNG(const char *Cmd) {
     uint32_t len = strtol(Cmd, NULL, 0);
-    if (len > USB_CMD_DATA_SIZE)
-        len = USB_CMD_DATA_SIZE;
+    if (len > USB_DATANG_SIZE)
+        len = USB_DATANG_SIZE;
     PrintAndLogEx(NORMAL, "Pinging with payload len=%d", len);
     clearCommandBuffer();
     UsbCommand resp;
-    uint8_t data[USB_CMD_DATA_SIZE] = {0};
+    uint8_t data[USB_DATANG_SIZE] = {0};
     uint16_t cmd = CMD_PING;
-    if (len >= 4)
-        ((uint32_t *)data)[0] = 0xAABBCCDD;
-    if (len >= 8)
-        ((uint32_t *)data)[(len - 1) / 4] = 0xDDCCBBAA;
+    if (len)
+    for (uint16_t i=0; i<len; i++)
+        data[i] = i & 0xFF;
     SendCommandNG(cmd, data, len);
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {
         PrintAndLogEx(NORMAL, "PingNG successful");
diff --git a/client/comms.c b/client/comms.c
index ac323ec31..52fd80783 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -26,7 +26,7 @@ static pthread_t USB_communication_thread;
 
 // Transmit buffer.
 static UsbCommand txBuffer;
-static uint8_t txBufferNG[USB_PACKET_NG_MAXLEN];
+static uint8_t txBufferNG[USB_COMMANDNG_MAXLEN];
 size_t txBufferNGLen;
 static bool txBuffer_pending = false;
 static pthread_mutex_t txBufferMutex = PTHREAD_MUTEX_INITIALIZER;
@@ -97,7 +97,7 @@ void SendCommandNG(uint16_t cmd, uint8_t *data, size_t len) {
         PrintAndLogEx(NORMAL, "Sending bytes to proxmark failed - offline");
         return;
     }
-    if (len > USB_CMD_DATA_SIZE) {
+    if (len > USB_DATANG_SIZE) {
         PrintAndLogEx(WARNING, "Sending %d bytes of payload is too much, abort", len);
         return;
     }
@@ -115,7 +115,7 @@ void SendCommandNG(uint16_t cmd, uint8_t *data, size_t len) {
         pthread_cond_wait(&txBufferSig, &txBufferMutex);
     }
 
-    tx_pre->magic = USB_PREAMBLE_MAGIC;
+    tx_pre->magic = USB_COMMANDNG_PREAMBLE_MAGIC;
     tx_pre->length = len;
     tx_pre->cmd = cmd;
     memcpy(txBufferNG + sizeof(UsbCommandNGPreamble), data, len);
diff --git a/common/cmd.c b/common/cmd.c
index d560c60f7..42c72269b 100644
--- a/common/cmd.c
+++ b/common/cmd.c
@@ -30,6 +30,7 @@
  * @brief
  */
 #include "cmd.h"
+#include "crc16.h"
 
 #ifdef WITH_FPC_HOST
 // "Session" flag, to tell via which interface next msgs should be sent: USB or FPC USART
@@ -78,3 +79,53 @@ uint8_t cmd_send(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void
 
     return sendlen;
 }
+
+uint8_t reply_ng(uint16_t cmd, int16_t status, uint8_t *data, size_t len) {
+    uint8_t txBufferNG[USB_REPLYNG_MAXLEN];
+    size_t txBufferNGLen;
+//    for (size_t i = 0; i < sizeof(txBufferNG); i++)
+//        ((uint8_t *)&txBufferNG)[i] = 0x00;
+
+    // Compose the outgoing command frame
+    UsbReplyNGPreamble *tx_pre = (UsbReplyNGPreamble *)txBufferNG;
+    tx_pre->magic = USB_REPLYNG_PREAMBLE_MAGIC;
+    tx_pre->cmd = cmd;
+    tx_pre->status = status;
+    if (len > USB_DATANG_SIZE) {
+        len = USB_DATANG_SIZE;
+        // overwrite status
+        tx_pre->status = PM3_EOVFLOW;
+    }
+    tx_pre->length = len;
+    uint8_t *tx_data = txBufferNG + sizeof(UsbReplyNGPreamble);
+    UsbReplyNGPostamble *tx_post = (UsbReplyNGPostamble *)(txBufferNG + sizeof(UsbReplyNGPreamble) + len);
+
+    // Add the (optional) content to the frame, with a maximum size of USB_DATANG_SIZE
+    if (data && len) {
+        for (size_t i = 0; i < len; i++) {
+            tx_data[i] = data[i];
+        }
+    }
+
+    uint8_t first, second;
+    compute_crc(CRC_14443_A, txBufferNG, sizeof(UsbReplyNGPreamble) + len, &first, &second);
+    tx_post->crc = (first << 8) + second;
+    txBufferNGLen = sizeof(UsbReplyNGPreamble) + len + sizeof(UsbReplyNGPostamble);
+
+
+    uint32_t sendlen = 0;
+    // Send frame and make sure all bytes are transmitted
+
+#ifdef WITH_FPC_HOST
+    if (reply_via_fpc) {
+        sendlen = usart_writebuffer(txBufferNG, txBufferNGLen);
+//        Dbprintf_usb("Sent %i bytes over usart", len);
+    } else {
+        sendlen = usb_write(txBufferNG, txBufferNGLen);
+    }
+#else
+    sendlen = usb_write(txBufferNG, txBufferNGLen);
+#endif
+
+    return sendlen;
+}
diff --git a/common/cmd.h b/common/cmd.h
index 858466dd3..a07ef35d0 100644
--- a/common/cmd.h
+++ b/common/cmd.h
@@ -40,6 +40,7 @@
 #include "proxmark3.h"
 
 uint8_t cmd_send(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
+uint8_t reply_ng(uint16_t cmd, int16_t status, uint8_t *data, size_t len);
 
 #endif // _PROXMARK_CMD_H_
 
diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index 60077d630..0edf68dc8 100644
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -25,6 +25,7 @@ typedef BYTE uint8_t;
 #endif
 
 #define USB_CMD_DATA_SIZE 512
+#define USB_DATANG_SIZE 512
 
 typedef struct {
     uint64_t cmd;
@@ -41,14 +42,30 @@ typedef struct {
     uint16_t cmd;
 } PACKED UsbCommandNGPreamble;
 
-#define USB_PREAMBLE_MAGIC 0x61334d50 // PM3a
+#define USB_COMMANDNG_PREAMBLE_MAGIC 0x61334d50 // PM3a
 
 typedef struct {
     uint16_t crc;
 } PACKED UsbCommandNGPostamble;
 
-#define USB_PACKET_NG_MINLEN (sizeof(UsbCommandNGPreamble) + sizeof(UsbCommandNGPostamble))
-#define USB_PACKET_NG_MAXLEN (sizeof(UsbCommandNGPreamble) + USB_CMD_DATA_SIZE + sizeof(UsbCommandNGPostamble))
+#define USB_COMMANDNG_MINLEN (sizeof(UsbCommandNGPreamble) + sizeof(UsbCommandNGPostamble))
+#define USB_COMMANDNG_MAXLEN (sizeof(UsbCommandNGPreamble) + USB_DATANG_SIZE + sizeof(UsbCommandNGPostamble))
+
+typedef struct {
+    uint32_t magic;
+    uint16_t length;  // length of the variable part, 0 if none.
+    uint16_t cmd;
+    int16_t  status;
+} PACKED UsbReplyNGPreamble;
+
+#define USB_REPLYNG_PREAMBLE_MAGIC 0x62334d50 // PM3b
+
+typedef struct {
+    uint16_t crc;
+} PACKED UsbReplyNGPostamble;
+
+#define USB_REPLYNG_MINLEN (sizeof(UsbReplyNGPreamble) + sizeof(UsbReplyNGPostamble))
+#define USB_REPLYNG_MAXLEN (sizeof(UsbReplyNGPreamble) + USB_DATANG_SIZE + sizeof(UsbReplyNGPostamble))
 
 #ifdef WITH_FPC_HOST
 // "Session" flag, to tell via which interface next msgs should be sent: USB or FPC USART
@@ -332,6 +349,31 @@ typedef struct {
 #define FLAG_NONEWLINE   0x0010
 #define FLAG_NOPROMPT    0x0100
 
+// Error codes
+
+// Success (no error)
+#define PM3_SUCCESS             0
+// Undefined error
+#define PM3_EUNDEF             -1
+// Invalid argument(s)
+#define PM3_EINVARG            -2
+// Operation not supported by device
+#define PM3_EDEVNOTSUPP        -3
+// Operation timed out
+#define PM3_ETIMEOUT           -4
+// Operation aborted (by user)
+#define PM3_EOPABORTED         -5
+// Not (yet) implemented
+#define PM3_ENOTIMPL           -6
+// Error while RF transmission
+#define PM3_ERFTRANS           -7
+// Input / output error
+#define PM3_EIO                -8
+// Buffer overflow
+#define PM3_EOVFLOW            -9
+// Software error
+#define PM3_ESOFT             -10
+
 
 // CMD_DEVICE_INFO response packet has flags in arg[0], flag definitions:
 /* Whether a bootloader that understands the common_area is present */

From 8bfc5c1b47b37fd70e17aad22012b68ce8996ef9 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 17 Apr 2019 01:06:26 +0200
Subject: [PATCH 1295/1938] New reply frames reception

---
 armsrc/appmain.c |   6 +-
 client/cmdhw.c   |  12 ++--
 client/comms.c   | 157 +++++++++++++++++++++++++++++++++++++----------
 client/comms.h   |   3 +
 4 files changed, 137 insertions(+), 41 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 10d57fbf5..89e7df1f2 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -378,9 +378,9 @@ void printUSBSpeed(void) {
     LED_B_ON();
     
     while (end_time < start_time + USB_SPEED_TEST_MIN_TIME) {
-        cmd_send(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K, 0, USB_CMD_DATA_SIZE, 0, test_data, USB_CMD_DATA_SIZE);
+        reply_ng(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K, PM3_SUCCESS, test_data, USB_DATANG_SIZE);
         end_time = GetTickCount();
-        bytes_transferred += USB_CMD_DATA_SIZE;
+        bytes_transferred += USB_DATANG_SIZE;
     }
     LED_B_OFF();
 
@@ -634,7 +634,7 @@ void ListenReaderField(int limit) {
 }
 
 static void UsbPacketReceived(bool cmd_ng, uint8_t *packet) {
-    uint64_t cmd; // To accomodate old cmd, can be reduced to uint16_t once all old cmds are gone.
+    uint64_t cmd; // To accommodate old cmd, can be reduced to uint16_t once all old cmds are gone.
     UsbCommandNGPreamble *pre_ng = (UsbCommandNGPreamble *)packet;
     uint8_t *data_ng = packet + sizeof(UsbCommandNGPreamble);
     uint16_t datalen_ng = pre_ng->length;
diff --git a/client/cmdhw.c b/client/cmdhw.c
index 6bdd65585..1f74f7f18 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -444,19 +444,21 @@ static int CmdPingNG(const char *Cmd) {
         len = USB_DATANG_SIZE;
     PrintAndLogEx(NORMAL, "Pinging with payload len=%d", len);
     clearCommandBuffer();
-    UsbCommand resp;
+    uint8_t resp[USB_REPLYNG_MAXLEN];
     uint8_t data[USB_DATANG_SIZE] = {0};
     uint16_t cmd = CMD_PING;
     if (len)
     for (uint16_t i=0; i<len; i++)
         data[i] = i & 0xFF;
     SendCommandNG(cmd, data, len);
-    if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {
+    if (WaitForResponseNGTimeout(CMD_PING, resp, 1000)) {
         PrintAndLogEx(NORMAL, "PingNG successful");
+        UsbReplyNGPreamble *pre = (UsbReplyNGPreamble *)resp;
+        uint8_t *respdata = resp + sizeof(UsbReplyNGPreamble);
         if (len >= 4)
-            PrintAndLogEx(NORMAL, "%08x -> %08x", 0xAABBCCDD, resp.arg[1]);
-        if (len >= 8)
-            PrintAndLogEx(NORMAL, "%08x -> %08x", 0xDDCCBBAA, resp.arg[2]);
+            PrintAndLogEx(NORMAL, "%02x%02x%02x%02x ... %02x%02x%02x%02x",
+                respdata[0], respdata[1], respdata[2], respdata[3],
+                respdata[pre->length-4], respdata[pre->length-3], respdata[pre->length-2], respdata[pre->length-1]);
     } else
         PrintAndLogEx(NORMAL, "PingNG failed");
     return 0;
diff --git a/client/comms.c b/client/comms.c
index 52fd80783..25d9025f9 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -34,7 +34,7 @@ static pthread_cond_t txBufferSig = PTHREAD_COND_INITIALIZER;
 
 // Used by UsbReceiveCommand as a ring buffer for messages that are yet to be
 // processed by a command handler (WaitForResponse{,Timeout})
-static UsbCommand rxBuffer[CMD_BUFFER_SIZE];
+static uint8_t rxBuffer[CMD_BUFFER_SIZE][USB_REPLYNG_MAXLEN];
 
 // Points to the next empty position to write to
 static int cmd_head = 0;
@@ -149,8 +149,7 @@ void clearCommandBuffer() {
  * @brief storeCommand stores a USB command in a circular buffer
  * @param UC
  */
-static void storeCommand(UsbCommand *command) {
-
+static void storeReply(uint8_t *packet) {
     pthread_mutex_lock(&rxBufferMutex);
     if ((cmd_head + 1) % CMD_BUFFER_SIZE == cmd_tail) {
         //If these two are equal, we're about to overwrite in the
@@ -159,8 +158,8 @@ static void storeCommand(UsbCommand *command) {
         fflush(stdout);
     }
     //Store the command at the 'head' location
-    UsbCommand *destination = &rxBuffer[cmd_head];
-    memcpy(destination, command, sizeof(UsbCommand));
+    uint8_t *destination = rxBuffer[cmd_head];
+    memcpy(destination, packet, USB_REPLYNG_MAXLEN);
 
     //increment head and wrap
     cmd_head = (cmd_head + 1) % CMD_BUFFER_SIZE;
@@ -171,7 +170,7 @@ static void storeCommand(UsbCommand *command) {
  * @param response location to write command
  * @return 1 if response was returned, 0 if nothing has been received
  */
-static int getCommand(UsbCommand *response) {
+static int getReply(uint8_t *response) {
     pthread_mutex_lock(&rxBufferMutex);
     //If head == tail, there's nothing to read, or if we just got initialized
     if (cmd_head == cmd_tail)  {
@@ -180,8 +179,8 @@ static int getCommand(UsbCommand *response) {
     }
 
     //Pick out the next unread command
-    UsbCommand *last_unread = &rxBuffer[cmd_tail];
-    memcpy(response, last_unread, sizeof(UsbCommand));
+    uint8_t *last_unread = rxBuffer[cmd_tail];
+    memcpy(response, last_unread, USB_REPLYNG_MAXLEN);
 
     //Increment tail - this is a circular buffer, so modulo buffer size
     cmd_tail = (cmd_tail + 1) % CMD_BUFFER_SIZE;
@@ -194,9 +193,20 @@ static int getCommand(UsbCommand *response) {
 // Entry point into our code: called whenever we received a packet over USB
 // that we weren't necessarily expecting, for example a debug print.
 //-----------------------------------------------------------------------------
-static void UsbCommandReceived(UsbCommand *c) {
+static void UsbReplyReceived(bool reply_ng, uint8_t *packet) {
 
-    switch (c->cmd) {
+    uint64_t cmd; // To accommodate old cmd, can be reduced to uint16_t once all old cmds are gone.
+    UsbReplyNGPreamble *pre_ng = (UsbReplyNGPreamble *)packet;
+
+    // For cmd handlers still using old cmd format:
+    UsbCommand *c = (UsbCommand *)packet;
+    if (reply_ng) {
+        cmd = pre_ng->cmd;
+    } else {
+        cmd = c->cmd;
+    }
+
+    switch (cmd) {
         // First check if we are handling a debug message
         case CMD_DEBUG_PRINT_STRING: {
 
@@ -234,7 +244,7 @@ static void UsbCommandReceived(UsbCommand *c) {
         // CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K packages which is not dealt with. I wonder if simply ignoring them will
         // work. lets try it.
         default: {
-            storeCommand(c);
+            storeReply(packet);
             break;
         }
     }
@@ -275,10 +285,11 @@ __attribute__((force_align_arg_pointer))
 #endif
 *uart_communication(void *targ) {
     communication_arg_t *connection = (communication_arg_t *)targ;
-    size_t rxlen, totallen = 0;
-    UsbCommand rx;
-    UsbCommand *prx = &rx;
+    size_t rxlen;
 
+    uint8_t rx[USB_REPLYNG_MAXLEN];
+    UsbReplyNGPreamble *pre = (UsbReplyNGPreamble *)rx;
+    UsbReplyNGPostamble *post = (UsbReplyNGPostamble *)(rx + sizeof(UsbReplyNGPreamble) + USB_DATANG_SIZE);
     //int counter_to_offline = 0;
 
 #if defined(__MACH__) && defined(__APPLE__)
@@ -288,27 +299,59 @@ __attribute__((force_align_arg_pointer))
     while (connection->run) {
         rxlen = 0;
         bool ACK_received = false;
+        bool error = false;
+        if (uart_receive(sp, rx, sizeof(UsbReplyNGPreamble), &rxlen) && (rxlen == sizeof(UsbReplyNGPreamble))) {
+            if (pre->magic == USB_REPLYNG_PREAMBLE_MAGIC) { // New style NG reply
+                if (pre->length > USB_DATANG_SIZE) {
+                    PrintAndLogEx(WARNING, "Received packet frame with incompatible length: 0x%04x", pre->length);
+                    error = true;
+                }
+                if ((!error) && (pre->length > 0)) { // Get the variable length payload
+                    if ((!uart_receive(sp, rx + sizeof(UsbReplyNGPreamble), pre->length, &rxlen)) || (rxlen != pre->length)) {
+                        PrintAndLogEx(WARNING, "Received packet frame error variable part too short? %d/%d", rxlen, pre->length);
+                        error = true;
+                    }
+                }
+                if (!error) {                        // Get the postamble
+                    if ((!uart_receive(sp, rx + sizeof(UsbReplyNGPreamble) + USB_DATANG_SIZE, sizeof(UsbReplyNGPostamble), &rxlen)) || (rxlen != sizeof(UsbReplyNGPostamble))) {
+                        PrintAndLogEx(WARNING, "Received packet frame error fetching postamble");
+                        error = true;
+                    }
+                    uint8_t first, second;
+                    compute_crc(CRC_14443_A, rx, sizeof(UsbReplyNGPreamble) + pre->length, &first, &second);
+                    if ((first << 8) + second != post->crc) {
+                        PrintAndLogEx(WARNING, "Received packet frame CRC error %02X%02X <> %04X", first, second, post->crc);
+                        error = true;
+                    }
+                }
+                if (!error) {
+//                    PrintAndLogEx(NORMAL, "Received reply NG full !!");
+                    UsbReplyReceived(true, rx);
+//TODO NG don't send ACK anymore but reply with the corresponding cmd, still things seem to work fine...
+                    if (pre->cmd == CMD_ACK) {
+                        ACK_received = true;
+                    }
+                }
+            } else {                               // Old style reply
 
-        if (uart_receive(sp, (uint8_t *)prx, sizeof(UsbCommand) - (prx - &rx), &rxlen) && rxlen) {
-            prx += rxlen;
-            totallen += rxlen;
-
-            if (totallen < sizeof(UsbCommand)) {
-
-                // iceman: this looping is no working as expected at all. The reassemble of package is nonfunctional.
-                // solved so far with increasing the timeouts of the serial port configuration.
-                PrintAndLogEx(NORMAL, "Foo %d | %d (loop)", prx - &rx, rxlen);
-                continue;
+                if ((!uart_receive(sp, rx + sizeof(UsbReplyNGPreamble), sizeof(UsbCommand) - sizeof(UsbReplyNGPreamble), &rxlen)) || (rxlen != sizeof(UsbCommand) - sizeof(UsbReplyNGPreamble))) {
+                    PrintAndLogEx(WARNING, "Received packet frame error var part too short? %d/%d", rxlen, sizeof(UsbCommand) - sizeof(UsbReplyNGPreamble));
+                    error = true;
+                }
+                if (!error) {
+                    UsbReplyReceived(false, rx);
+                    if (((UsbCommand *)rx)->cmd == CMD_ACK) {
+                        ACK_received = true;
+                    }
+                }
             }
-
-            totallen = 0;
-            UsbCommandReceived(&rx);
-            if (rx.cmd == CMD_ACK) {
-                ACK_received = true;
+        } else {
+            if (rxlen > 0) {
+                PrintAndLogEx(WARNING, "Received packet frame preamble too short: %d/%d", rxlen, sizeof(UsbReplyNGPreamble));
+                error = true;
             }
         }
-
-        prx = &rx;
+        // TODO if error, shall we resync ?
 
         pthread_mutex_lock(&txBufferMutex);
 
@@ -466,7 +509,7 @@ bool WaitForResponseTimeoutW(uint32_t cmd, UsbCommand *response, size_t ms_timeo
     // Wait until the command is received
     while (true) {
 
-        while (getCommand(response)) {
+        while (getReply((uint8_t *)response)) {
             if (cmd == CMD_UNKNOWN || response->cmd == cmd)
                 return true;
         }
@@ -492,6 +535,54 @@ bool WaitForResponse(uint32_t cmd, UsbCommand *response) {
     return WaitForResponseTimeoutW(cmd, response, -1, true);
 }
 
+/**
+ * @brief Waits for a certain response type. This method waits for a maximum of
+ * ms_timeout milliseconds for a specified response command.
+
+ * @param cmd command to wait for, or CMD_UNKNOWN to take any command.
+ * @param response struct to copy received command into.
+ * @param ms_timeout display message after 3 seconds
+ * @param show_warning display message after 3 seconds
+ * @return true if command was returned, otherwise false
+ */
+bool WaitForResponseNGTimeoutW(uint32_t cmd, uint8_t *response, size_t ms_timeout, bool show_warning) {
+
+    uint8_t resp[USB_REPLYNG_MAXLEN];
+    if (response == NULL)
+        response = resp;
+    UsbCommandNGPreamble *pre_ng = (UsbCommandNGPreamble *)response;
+
+    uint64_t start_time = msclock();
+
+    // Wait until the command is received
+    while (true) {
+
+        while (getReply(response)) {
+            if (cmd == CMD_UNKNOWN || pre_ng->cmd == cmd)
+                return true;
+        }
+
+        if (msclock() - start_time > ms_timeout)
+            break;
+
+        if (msclock() - start_time > 3000 && show_warning) {
+            // 3 seconds elapsed (but this doesn't mean the timeout was exceeded)
+            PrintAndLogEx(INFO, "Waiting for a response from the proxmark3...");
+            PrintAndLogEx(INFO, "You can cancel this operation by pressing the pm3 button");
+            show_warning = false;
+        }
+    }
+    return false;
+}
+
+bool WaitForResponseNGTimeout(uint32_t cmd, uint8_t *response, size_t ms_timeout) {
+    return WaitForResponseNGTimeoutW(cmd, response, ms_timeout, true);
+}
+
+bool WaitForResponseNG(uint32_t cmd, uint8_t *response) {
+    return WaitForResponseNGTimeoutW(cmd, response, -1, true);
+}
+
 /**
 * Data transfer from Proxmark to client. This method times out after
 * ms_timeout milliseconds.
@@ -550,7 +641,7 @@ bool dl_it(uint8_t *dest, uint32_t bytes, uint32_t start_index, UsbCommand *resp
 
     while (true) {
 
-        if (getCommand(response)) {
+        if (getReply((uint8_t *)response)) {
 
             // sample_buf is a array pointer, located in data.c
             // arg0 = offset in transfer. Startindex of this chunk
diff --git a/client/comms.h b/client/comms.h
index f81540383..fd91c63fe 100644
--- a/client/comms.h
+++ b/client/comms.h
@@ -63,6 +63,9 @@ void CloseProxmark(void);
 bool WaitForResponseTimeoutW(uint32_t cmd, UsbCommand *response, size_t ms_timeout, bool show_warning);
 bool WaitForResponseTimeout(uint32_t cmd, UsbCommand *response, size_t ms_timeout);
 bool WaitForResponse(uint32_t cmd, UsbCommand *response);
+bool WaitForResponseNGTimeoutW(uint32_t cmd, uint8_t *response, size_t ms_timeout, bool show_warning);
+bool WaitForResponseNGTimeout(uint32_t cmd, uint8_t *response, size_t ms_timeout);
+bool WaitForResponseNG(uint32_t cmd, uint8_t *response);
 
 bool GetFromDevice(DeviceMemType_t memtype, uint8_t *dest, uint32_t bytes, uint32_t start_index, UsbCommand *response, size_t ms_timeout, bool show_warning);
 

From 002e6b23fe352e42dd53c0e415c271b11ebc2a40 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 17 Apr 2019 11:47:32 +0200
Subject: [PATCH 1296/1938] Use printandlogex

---
 client/cmdhffido.c | 218 ++++++++++++++++++++++-----------------------
 1 file changed, 105 insertions(+), 113 deletions(-)

diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index 48a612e7f..79aaebef2 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -52,13 +52,13 @@ static int CmdHelp(const char *Cmd);
 static int CmdHFFidoInfo(const char *cmd) {
 
     if (cmd && strlen(cmd) > 0)
-        PrintAndLog("WARNING: command don't have any parameters.\n");
+        PrintAndLogEx(WARNING, "WARNING: command don't have any parameters.\n");
 
     // info about 14a part
     infoHF14A(false, false);
 
     // FIDO info
-    PrintAndLog("--------------------------------------------");
+    PrintAndLogEx(NORMAL, "--------------------------------------------");
     SetAPDULogging(false);
 
     uint8_t buf[APDU_RES_LEN] = {0};
@@ -73,9 +73,9 @@ static int CmdHFFidoInfo(const char *cmd) {
 
     if (sw != 0x9000) {
         if (sw)
-            PrintAndLog("Not a FIDO card! APDU response: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
+            PrintAndLogEx(INFO, "Not a FIDO card! APDU response: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
         else
-            PrintAndLog("APDU exchange error. Card returns 0x0000.");
+            PrintAndLogEx(ERROR, "APDU exchange error. Card returns 0x0000.");
 
         DropField();
         return 0;
@@ -83,14 +83,14 @@ static int CmdHFFidoInfo(const char *cmd) {
 
     if (!strncmp((char *)buf, "U2F_V2", 7)) {
         if (!strncmp((char *)buf, "FIDO_2_0", 8)) {
-            PrintAndLog("FIDO2 authenricator detected. Version: %.*s", len, buf);
+            PrintAndLogEx(INFO, "FIDO2 authenricator detected. Version: %.*s", len, buf);
         } else {
-            PrintAndLog("FIDO authenricator detected (not standard U2F).");
-            PrintAndLog("Non U2F authenticator version:");
+            PrintAndLogEx(INFO, "FIDO authenricator detected (not standard U2F).");
+            PrintAndLogEx(INFO, "Non U2F authenticator version:");
             dump_buffer((const unsigned char *)buf, len, NULL, 0);
         }
     } else {
-        PrintAndLog("FIDO U2F authenricator detected. Version: %.*s", len, buf);
+        PrintAndLogEx(INFO, "FIDO U2F authenricator detected. Version: %.*s", len, buf);
     }
 
     res = FIDO2GetInfo(buf, sizeof(buf), &len, &sw);
@@ -99,28 +99,22 @@ static int CmdHFFidoInfo(const char *cmd) {
         return res;
     }
     if (sw != 0x9000) {
-        PrintAndLog("FIDO2 version not exists (%04x - %s).", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
+        PrintAndLogEx(ERR, "FIDO2 version not exists (%04x - %s).", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
 
         return 0;
     }
 
     if (buf[0]) {
-        PrintAndLog("FIDO2 ger version error: %d - %s", buf[0], fido2GetCmdErrorDescription(buf[0]));
+        PrintAndLogEx(ERR, "FIDO2 ger version error: %d - %s", buf[0], fido2GetCmdErrorDescription(buf[0]));
         return 0;
     }
 
     if (len > 1) {
-//      if (false) {
-//          PrintAndLog("FIDO2 version: (len=%d)", len);
-//          dump_buffer((const unsigned char *)buf, len, NULL, 0);
-//      }
-
-        PrintAndLog("FIDO2 version CBOR decoded:");
+        PrintAndLogEx(SUCCESS, "FIDO2 version CBOR decoded:");
         TinyCborPrintFIDOPackage(fido2CmdGetInfo, true, &buf[1], len - 1);
     } else {
-        PrintAndLog("FIDO2 version length error");
+        PrintAndLogEx(ERR, "FIDO2 version length error");
     }
-
     return 0;
 }
 
@@ -149,13 +143,13 @@ static json_t *OpenJson(int paramnum, char *fname, void *argtable[], bool *err)
         if (access(fname, F_OK) != -1) {
             root = json_load_file(fname, 0, &error);
             if (!root) {
-                PrintAndLog("ERROR: json error on line %d: %s", error.line, error.text);
+                PrintAndLogEx(ERR, "ERROR: json error on line %d: %s", error.line, error.text);
                 *err = true;
                 return NULL;
             }
 
             if (!json_is_object(root)) {
-                PrintAndLog("ERROR: Invalid json format. root must be an object.");
+                PrintAndLogEx(ERR, "ERROR: Invalid json format. root must be an object.");
                 json_decref(root);
                 *err = true;
                 return NULL;
@@ -216,13 +210,13 @@ static int CmdHFFidoRegister(const char *cmd) {
         memset(cdata, 0x00, 32);
         CLIGetStrWithReturn(6, cdata, &chlen);
         if (chlen > 16) {
-            PrintAndLog("ERROR: challenge parameter length in ASCII mode must be less than 16 chars instead of: %d", chlen);
+            PrintAndLogEx(ERR, "ERROR: challenge parameter length in ASCII mode must be less than 16 chars instead of: %d", chlen);
             return 1;
         }
     } else {
         CLIGetHexWithReturn(6, cdata, &chlen);
         if (chlen && chlen != 32) {
-            PrintAndLog("ERROR: challenge parameter length must be 32 bytes only.");
+            PrintAndLogEx(ERR, "ERROR: challenge parameter length must be 32 bytes only.");
             return 1;
         }
     }
@@ -234,13 +228,13 @@ static int CmdHFFidoRegister(const char *cmd) {
         memset(adata, 0x00, 32);
         CLIGetStrWithReturn(7, adata, &applen);
         if (applen > 16) {
-            PrintAndLog("ERROR: application parameter length in ASCII mode must be less than 16 chars instead of: %d", applen);
+            PrintAndLogEx(ERR, "ERROR: application parameter length in ASCII mode must be less than 16 chars instead of: %d", applen);
             return 1;
         }
     } else {
         CLIGetHexWithReturn(7, adata, &applen);
         if (applen && applen != 32) {
-            PrintAndLog("ERROR: application parameter length must be 32 bytes only.");
+            PrintAndLogEx(ERR, "ERROR: application parameter length must be 32 bytes only.");
             return 1;
         }
     }
@@ -262,13 +256,13 @@ static int CmdHFFidoRegister(const char *cmd) {
     int res = FIDOSelect(true, true, buf, sizeof(buf), &len, &sw);
 
     if (res) {
-        PrintAndLog("Can't select authenticator. res=%x. Exit...", res);
+        PrintAndLogEx(ERR, "Can't select authenticator. res=%x. Exit...", res);
         DropField();
         return res;
     }
 
     if (sw != 0x9000) {
-        PrintAndLog("Can't select FIDO application. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
+        PrintAndLogEx(ERR, "Can't select FIDO application. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
         DropField();
         return 2;
     }
@@ -276,44 +270,44 @@ static int CmdHFFidoRegister(const char *cmd) {
     res = FIDORegister(data, buf,  sizeof(buf), &len, &sw);
     DropField();
     if (res) {
-        PrintAndLog("Can't execute register command. res=%x. Exit...", res);
+        PrintAndLogEx(ERR, "Can't execute register command. res=%x. Exit...", res);
         return res;
     }
 
     if (sw != 0x9000) {
-        PrintAndLog("ERROR execute register command. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
+        PrintAndLogEx(ERR, "ERROR execute register command. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
         return 3;
     }
 
-    PrintAndLog("");
+    PrintAndLogEx(NORMAL, "");
     if (APDULogging)
-        PrintAndLog("---------------------------------------------------------------");
-    PrintAndLog("data len: %d", len);
+        PrintAndLogEx(NORMAL, "---------------------------------------------------------------");
+    PrintAndLogEx(NORMAL, "data len: %d", len);
     if (verbose2) {
-        PrintAndLog("--------------data----------------------");
+        PrintAndLogEx(NORMAL, "--------------data----------------------");
         dump_buffer((const unsigned char *)buf, len, NULL, 0);
-        PrintAndLog("--------------data----------------------");
+        PrintAndLogEx(NORMAL, "--------------data----------------------");
     }
 
     if (buf[0] != 0x05) {
-        PrintAndLog("ERROR: First byte must be 0x05, but it %2x", buf[0]);
+        PrintAndLogEx(ERR, "ERROR: First byte must be 0x05, but it %2x", buf[0]);
         return 5;
     }
-    PrintAndLog("User public key: %s", sprint_hex(&buf[1], 65));
+    PrintAndLogEx(SUCCESS, "User public key: %s", sprint_hex(&buf[1], 65));
 
     uint8_t keyHandleLen = buf[66];
-    PrintAndLog("Key handle[%d]: %s", keyHandleLen, sprint_hex(&buf[67], keyHandleLen));
+    PrintAndLogEx(SUCCESS, "Key handle[%d]: %s", keyHandleLen, sprint_hex(&buf[67], keyHandleLen));
 
     int derp = 67 + keyHandleLen;
     int derLen = (buf[derp + 2] << 8) + buf[derp + 3] + 4;
     if (verbose2) {
-        PrintAndLog("DER certificate[%d]:\n------------------DER-------------------", derLen);
+        PrintAndLogEx(NORMAL, "DER certificate[%d]:\n------------------DER-------------------", derLen);
         dump_buffer_simple((const unsigned char *)&buf[derp], derLen, NULL);
-        PrintAndLog("\n----------------DER---------------------");
+        PrintAndLogEx(NORMAL, "\n----------------DER---------------------");
     } else {
         if (verbose)
-            PrintAndLog("------------------DER-------------------");
-        PrintAndLog("DER certificate[%d]: %s...", derLen, sprint_hex(&buf[derp], 20));
+            PrintAndLogEx(NORMAL, "------------------DER-------------------");
+        PrintAndLogEx(NORMAL, "DER certificate[%d]: %s...", derLen, sprint_hex(&buf[derp], 20));
     }
 
     // check and print DER certificate
@@ -321,16 +315,16 @@ static int CmdHFFidoRegister(const char *cmd) {
 
     // print DER certificate in TLV view
     if (showDERTLV) {
-        PrintAndLog("----------------DER TLV-----------------");
+        PrintAndLogEx(NORMAL, "----------------DER TLV-----------------");
         asn1_print(&buf[derp], derLen, "  ");
-        PrintAndLog("----------------DER TLV-----------------");
+        PrintAndLogEx(NORMAL, "----------------DER TLV-----------------");
     }
 
     FIDOCheckDERAndGetKey(&buf[derp], derLen, verbose, public_key, sizeof(public_key));
 
     // get hash
     int hashp = 1 + 65 + 1 + keyHandleLen + derLen;
-    PrintAndLog("Hash[%d]: %s", len - hashp, sprint_hex(&buf[hashp], len - hashp));
+    PrintAndLogEx(SUCCESS, "Hash[%d]: %s", len - hashp, sprint_hex(&buf[hashp], len - hashp));
 
     // check ANSI X9.62 format ECDSA signature (on P-256)
     uint8_t rval[300] = {0};
@@ -338,8 +332,8 @@ static int CmdHFFidoRegister(const char *cmd) {
     res = ecdsa_asn1_get_signature(&buf[hashp], len - hashp, rval, sval);
     if (!res) {
         if (verbose) {
-            PrintAndLog("  r: %s", sprint_hex(rval, 32));
-            PrintAndLog("  s: %s", sprint_hex(sval, 32));
+            PrintAndLogEx(NORMAL, "  r: %s", sprint_hex(rval, 32));
+            PrintAndLogEx(NORMAL, "  s: %s", sprint_hex(sval, 32));
         }
 
         uint8_t xbuf[4096] = {0};
@@ -351,23 +345,23 @@ static int CmdHFFidoRegister(const char *cmd) {
                          &buf[67], keyHandleLen,  // keyHandle
                          &buf[1], 65,             // user public key
                          NULL, 0);
-        //PrintAndLog("--xbuf(%d)[%d]: %s", res, xbuflen, sprint_hex(xbuf, xbuflen));
+        //PrintAndLogEx(NORMAL, "--xbuf(%d)[%d]: %s", res, xbuflen, sprint_hex(xbuf, xbuflen));
         res = ecdsa_signature_verify(public_key, xbuf, xbuflen, &buf[hashp], len - hashp);
         if (res) {
             if (res == -0x4e00) {
-                PrintAndLog("Signature is NOT VALID.");
+                PrintAndLogEx(WARNING, "Signature is NOT VALID.");
             } else {
-                PrintAndLog("Other signature check error: %x %s", (res < 0) ? -res : res, ecdsa_get_error(res));
+                PrintAndLogEx(WARNING, "Other signature check error: %x %s", (res < 0) ? -res : res, ecdsa_get_error(res));
             }
         } else {
-            PrintAndLog("Signature is OK.");
+            PrintAndLogEx(SUCCESS, "Signature is OK.");
         }
 
     } else {
-        PrintAndLog("Invalid signature. res=%d.", res);
+        PrintAndLogEx(WARNING, "Invalid signature. res = %d.", res);
     }
 
-    PrintAndLog("\nauth command: ");
+    PrintAndLogEx(INFO, "\nauth command: ");
     printf("hf fido auth %s%s", paramsPlain ? "-p " : "", sprint_hex_inrow(&buf[67], keyHandleLen));
     if (chlen || applen)
         printf(" %s", paramsPlain ? (char *)cdata : sprint_hex_inrow(cdata, 32));
@@ -385,10 +379,10 @@ static int CmdHFFidoRegister(const char *cmd) {
 
         res = json_dump_file(root, fname, JSON_INDENT(2));
         if (res) {
-            PrintAndLog("ERROR: can't save the file: %s", fname);
+            PrintAndLogEx(ERR, "ERROR: can't save the file: %s", fname);
             return 200;
         }
-        PrintAndLog("File `%s` saved.", fname);
+        PrintAndLogEx(SUCCESS, "File " _YELLOW_("`%s`") " saved.", fname);
 
         // free json object
         json_decref(root);
@@ -457,7 +451,7 @@ static int CmdHFFidoAuthenticate(const char *cmd) {
     // public key
     CLIGetHexWithReturn(8, hdata, &hdatalen);
     if (hdatalen && hdatalen != 65) {
-        PrintAndLog("ERROR: public key length must be 65 bytes only.");
+        PrintAndLogEx(ERR, "ERROR: public key length must be 65 bytes only.");
         return 1;
     }
     if (hdatalen) {
@@ -467,7 +461,7 @@ static int CmdHFFidoAuthenticate(const char *cmd) {
 
     CLIGetHexWithReturn(9, hdata, &hdatalen);
     if (hdatalen > 255) {
-        PrintAndLog("ERROR: application parameter length must be less than 255.");
+        PrintAndLogEx(ERR, "ERROR: application parameter length must be less than 255.");
         return 1;
     }
     if (hdatalen) {
@@ -480,13 +474,13 @@ static int CmdHFFidoAuthenticate(const char *cmd) {
         memset(hdata, 0x00, 32);
         CLIGetStrWithReturn(9, hdata, &hdatalen);
         if (hdatalen > 16) {
-            PrintAndLog("ERROR: challenge parameter length in ASCII mode must be less than 16 chars instead of: %d", hdatalen);
+            PrintAndLogEx(ERR, "ERROR: challenge parameter length in ASCII mode must be less than 16 chars instead of: %d", hdatalen);
             return 1;
         }
     } else {
         CLIGetHexWithReturn(10, hdata, &hdatalen);
         if (hdatalen && hdatalen != 32) {
-            PrintAndLog("ERROR: challenge parameter length must be 32 bytes only.");
+            PrintAndLogEx(ERR, "ERROR: challenge parameter length must be 32 bytes only.");
             return 1;
         }
     }
@@ -497,13 +491,13 @@ static int CmdHFFidoAuthenticate(const char *cmd) {
         memset(hdata, 0x00, 32);
         CLIGetStrWithReturn(11, hdata, &hdatalen);
         if (hdatalen > 16) {
-            PrintAndLog("ERROR: application parameter length in ASCII mode must be less than 16 chars instead of: %d", hdatalen);
+            PrintAndLogEx(ERR, "ERROR: application parameter length in ASCII mode must be less than 16 chars instead of: %d", hdatalen);
             return 1;
         }
     } else {
         CLIGetHexWithReturn(10, hdata, &hdatalen);
         if (hdatalen && hdatalen != 32) {
-            PrintAndLog("ERROR: application parameter length must be 32 bytes only.");
+            PrintAndLogEx(ERR, "ERROR: application parameter length must be 32 bytes only.");
             return 1;
         }
     }
@@ -530,13 +524,13 @@ static int CmdHFFidoAuthenticate(const char *cmd) {
     int res = FIDOSelect(true, true, buf, sizeof(buf), &len, &sw);
 
     if (res) {
-        PrintAndLog("Can't select authenticator. res=%x. Exit...", res);
+        PrintAndLogEx(ERR, "Can't select authenticator. res=%x. Exit...", res);
         DropField();
         return res;
     }
 
     if (sw != 0x9000) {
-        PrintAndLog("Can't select FIDO application. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
+        PrintAndLogEx(ERR, "Can't select FIDO application. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
         DropField();
         return 2;
     }
@@ -544,20 +538,20 @@ static int CmdHFFidoAuthenticate(const char *cmd) {
     res = FIDOAuthentication(data, datalen, controlByte,  buf,  sizeof(buf), &len, &sw);
     DropField();
     if (res) {
-        PrintAndLog("Can't execute authentication command. res=%x. Exit...", res);
+        PrintAndLogEx(ERR, "Can't execute authentication command. res=%x. Exit...", res);
         return res;
     }
 
     if (sw != 0x9000) {
-        PrintAndLog("ERROR execute authentication command. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
+        PrintAndLogEx(ERR, "ERROR execute authentication command. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
         return 3;
     }
 
-    PrintAndLog("---------------------------------------------------------------");
-    PrintAndLog("User presence: %s", (buf[0] ? "verified" : "not verified"));
+    PrintAndLogEx(NORMAL, "---------------------------------------------------------------");
+    PrintAndLogEx(SUCCESS, "User presence: %s", (buf[0] ? "verified" : "not verified"));
     uint32_t cntr = (uint32_t)bytes_to_num(&buf[1], 4);
-    PrintAndLog("Counter: %d", cntr);
-    PrintAndLog("Hash[%d]: %s", len - 5, sprint_hex(&buf[5], len - 5));
+    PrintAndLogEx(SUCCESS, "Counter: %d", cntr);
+    PrintAndLogEx(SUCCESS, "Hash[%d]: %s", len - 5, sprint_hex(&buf[5], len - 5));
 
     // check ANSI X9.62 format ECDSA signature (on P-256)
     uint8_t rval[300] = {0};
@@ -565,8 +559,8 @@ static int CmdHFFidoAuthenticate(const char *cmd) {
     res = ecdsa_asn1_get_signature(&buf[5], len - 5, rval, sval);
     if (!res) {
         if (verbose) {
-            PrintAndLog("  r: %s", sprint_hex(rval, 32));
-            PrintAndLog("  s: %s", sprint_hex(sval, 32));
+            PrintAndLogEx(NORMAL, "  r: %s", sprint_hex(rval, 32));
+            PrintAndLogEx(NORMAL, "  s: %s", sprint_hex(sval, 32));
         }
         if (public_key_loaded) {
             uint8_t xbuf[4096] = {0};
@@ -577,22 +571,22 @@ static int CmdHFFidoAuthenticate(const char *cmd) {
                              &buf[1], 4,    // counter
                              data, 32,      // challenge parameter
                              NULL, 0);
-            //PrintAndLog("--xbuf(%d)[%d]: %s", res, xbuflen, sprint_hex(xbuf, xbuflen));
+            //PrintAndLogEx(NORMAL, "--xbuf(%d)[%d]: %s", res, xbuflen, sprint_hex(xbuf, xbuflen));
             res = ecdsa_signature_verify(public_key, xbuf, xbuflen, &buf[5], len - 5);
             if (res) {
                 if (res == -0x4e00) {
-                    PrintAndLog("Signature is NOT VALID.");
+                    PrintAndLogEx(WARNING, "Signature is NOT VALID.");
                 } else {
-                    PrintAndLog("Other signature check error: %x %s", (res < 0) ? -res : res, ecdsa_get_error(res));
+                    PrintAndLogEx(WARNING, "Other signature check error: %x %s", (res < 0) ? -res : res, ecdsa_get_error(res));
                 }
             } else {
-                PrintAndLog("Signature is OK.");
+                PrintAndLogEx(SUCCESS, "Signature is OK.");
             }
         } else {
-            PrintAndLog("No public key provided. can't check signature.");
+            PrintAndLogEx(WARNING, "No public key provided. can't check signature.");
         }
     } else {
-        PrintAndLog("Invalid signature. res=%d.", res);
+        PrintAndLogEx(ERR, "Invalid signature. res = %d.", res);
     }
 
     if (root) {
@@ -604,10 +598,10 @@ static int CmdHFFidoAuthenticate(const char *cmd) {
 
         res = json_dump_file(root, fname, JSON_INDENT(2));
         if (res) {
-            PrintAndLog("ERROR: can't save the file: %s", fname);
+            PrintAndLogEx(ERR, "ERROR: can't save the file: %s", fname);
             return 200;
         }
-        PrintAndLog("File `%s` saved.", fname);
+        PrintAndLogEx(SUCCESS, "File " _YELLOW_("`%s`") " saved.", fname);
 
         // free json object
         json_decref(root);
@@ -691,13 +685,13 @@ static int CmdHFFido2MakeCredential(const char *cmd) {
 
     int res = GetExistsFileNameJson("fido", cjsonname, fname);
     if (res) {
-        PrintAndLog("ERROR: Can't found the json file.");
+        PrintAndLogEx(ERR, "ERROR: Can't found the json file.");
         return res;
     }
-    PrintAndLog("fname: %s\n", fname);
+    PrintAndLogEx(NORMAL, "fname: %s\n", fname);
     root = json_load_file(fname, 0, &error);
     if (!root) {
-        PrintAndLog("ERROR: json error on line %d: %s", error.line, error.text);
+        PrintAndLogEx(ERR, "ERROR: json error on line %d: %s", error.line, error.text);
         return 1;
     }
 
@@ -711,13 +705,13 @@ static int CmdHFFido2MakeCredential(const char *cmd) {
     res = FIDOSelect(true, true, buf, sizeof(buf), &len, &sw);
 
     if (res) {
-        PrintAndLog("Can't select authenticator. res=%x. Exit...", res);
+        PrintAndLogEx(ERR, "Can't select authenticator. res=%x. Exit...", res);
         DropField();
         return res;
     }
 
     if (sw != 0x9000) {
-        PrintAndLog("Can't select FIDO application. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
+        PrintAndLogEx(ERR, "Can't select FIDO application. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
         DropField();
         return 2;
     }
@@ -727,35 +721,35 @@ static int CmdHFFido2MakeCredential(const char *cmd) {
         return res;
 
     if (showCBOR) {
-        PrintAndLog("CBOR make credentional request:");
-        PrintAndLog("---------------- CBOR ------------------");
+        PrintAndLogEx(INFO, "CBOR make credentional request:");
+        PrintAndLogEx(NORMAL, "---------------- CBOR ------------------");
         TinyCborPrintFIDOPackage(fido2CmdMakeCredential, false, data, datalen);
-        PrintAndLog("---------------- CBOR ------------------");
+        PrintAndLogEx(NORMAL, "---------------- CBOR ------------------");
     }
 
     res = FIDO2MakeCredential(data, datalen, buf,  sizeof(buf), &len, &sw);
     DropField();
     if (res) {
-        PrintAndLog("Can't execute make credential command. res=%x. Exit...", res);
+        PrintAndLogEx(ERR, "Can't execute make credential command. res=%x. Exit...", res);
         return res;
     }
 
     if (sw != 0x9000) {
-        PrintAndLog("ERROR execute make credential command. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
+        PrintAndLogEx(ERR, "ERROR execute make credential command. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
         return 3;
     }
 
     if (buf[0]) {
-        PrintAndLog("FIDO2 make credential error: %d - %s", buf[0], fido2GetCmdErrorDescription(buf[0]));
+        PrintAndLogEx(ERR, "FIDO2 make credential error: %d - %s", buf[0], fido2GetCmdErrorDescription(buf[0]));
         return 0;
     }
 
-    PrintAndLog("MakeCredential result (%d b) OK.", len);
+    PrintAndLogEx(SUCCESS, "MakeCredential result (%d b) OK.", len);
     if (showCBOR) {
-        PrintAndLog("CBOR make credentional response:");
-        PrintAndLog("---------------- CBOR ------------------");
+        PrintAndLogEx(SUCCESS, "CBOR make credentional response:");
+        PrintAndLogEx(NORMAL, "---------------- CBOR ------------------");
         TinyCborPrintFIDOPackage(fido2CmdMakeCredential, true, &buf[1], len - 1);
-        PrintAndLog("---------------- CBOR ------------------");
+        PrintAndLogEx(NORMAL, "---------------- CBOR ------------------");
     }
 
     // parse returned cbor
@@ -764,14 +758,13 @@ static int CmdHFFido2MakeCredential(const char *cmd) {
     if (root) {
         res = json_dump_file(root, fname, JSON_INDENT(2));
         if (res) {
-            PrintAndLog("ERROR: can't save the file: %s", fname);
+            PrintAndLogEx(ERR, "ERROR: can't save the file: %s", fname);
             return 200;
         }
-        PrintAndLog("File `%s` saved.", fname);
+        PrintAndLogEx(SUCCESS, "File " _YELLOW_("`%s`") " saved.", fname);
     }
 
     json_decref(root);
-
     return 0;
 };
 
@@ -818,13 +811,13 @@ static int CmdHFFido2GetAssertion(const char *cmd) {
 
     int res = GetExistsFileNameJson("fido", "fido2", fname);
     if (res) {
-        PrintAndLog("ERROR: Can't found the json file.");
+        PrintAndLogEx(ERR, "ERROR: Can't found the json file.");
         return res;
     }
-    PrintAndLog("fname: %s\n", fname);
+    PrintAndLogEx(NORMAL, "fname: %s\n", fname);
     root = json_load_file(fname, 0, &error);
     if (!root) {
-        PrintAndLog("ERROR: json error on line %d: %s", error.line, error.text);
+        PrintAndLogEx(ERR, "ERROR: json error on line %d: %s", error.line, error.text);
         return 1;
     }
 
@@ -838,13 +831,13 @@ static int CmdHFFido2GetAssertion(const char *cmd) {
     res = FIDOSelect(true, true, buf, sizeof(buf), &len, &sw);
 
     if (res) {
-        PrintAndLog("Can't select authenticator. res=%x. Exit...", res);
+        PrintAndLogEx(ERR, "Can't select authenticator. res=%x. Exit...", res);
         DropField();
         return res;
     }
 
     if (sw != 0x9000) {
-        PrintAndLog("Can't select FIDO application. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
+        PrintAndLogEx(ERR, "Can't select FIDO application. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
         DropField();
         return 2;
     }
@@ -854,35 +847,35 @@ static int CmdHFFido2GetAssertion(const char *cmd) {
         return res;
 
     if (showCBOR) {
-        PrintAndLog("CBOR get assertion request:");
-        PrintAndLog("---------------- CBOR ------------------");
+        PrintAndLogEx(SUCCESS, "CBOR get assertion request:");
+        PrintAndLogEx(NORMAL, "---------------- CBOR ------------------");
         TinyCborPrintFIDOPackage(fido2CmdGetAssertion, false, data, datalen);
-        PrintAndLog("---------------- CBOR ------------------");
+        PrintAndLogEx(NORMAL, "---------------- CBOR ------------------");
     }
 
     res = FIDO2GetAssertion(data, datalen, buf,  sizeof(buf), &len, &sw);
     DropField();
     if (res) {
-        PrintAndLog("Can't execute get assertion command. res=%x. Exit...", res);
+        PrintAndLogEx(ERR, "Can't execute get assertion command. res=%x. Exit...", res);
         return res;
     }
 
     if (sw != 0x9000) {
-        PrintAndLog("ERROR execute get assertion command. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
+        PrintAndLogEx(ERR, "ERROR execute get assertion command. APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
         return 3;
     }
 
     if (buf[0]) {
-        PrintAndLog("FIDO2 get assertion error: %d - %s", buf[0], fido2GetCmdErrorDescription(buf[0]));
+        PrintAndLogEx(ERR, "FIDO2 get assertion error: %d - %s", buf[0], fido2GetCmdErrorDescription(buf[0]));
         return 0;
     }
 
-    PrintAndLog("GetAssertion result (%d b) OK.", len);
+    PrintAndLogEx(SUCCESS, "GetAssertion result (%d b) OK.", len);
     if (showCBOR) {
-        PrintAndLog("CBOR get assertion response:");
-        PrintAndLog("---------------- CBOR ------------------");
+        PrintAndLogEx(SUCCESS, "CBOR get assertion response:");
+        PrintAndLogEx(NORMAL, "---------------- CBOR ------------------");
         TinyCborPrintFIDOPackage(fido2CmdGetAssertion, true, &buf[1], len - 1);
-        PrintAndLog("---------------- CBOR ------------------");
+        PrintAndLogEx(NORMAL, "---------------- CBOR ------------------");
     }
 
     // parse returned cbor
@@ -891,14 +884,13 @@ static int CmdHFFido2GetAssertion(const char *cmd) {
     if (root) {
         res = json_dump_file(root, fname, JSON_INDENT(2));
         if (res) {
-            PrintAndLog("ERROR: can't save the file: %s", fname);
+            PrintAndLogEx(ERR, "ERROR: can't save the file: %s", fname);
             return 200;
         }
-        PrintAndLog("File `%s` saved.", fname);
+        PrintAndLogEx(SUCCESS, "File " _YELLOW_("`%s`") " saved.", fname);
     }
 
     json_decref(root);
-
     return 0;
 };
 

From d89a5d0a5e26ef0ebb713ef7e1ec99dd3b92fe85 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 17 Apr 2019 11:48:17 +0200
Subject: [PATCH 1297/1938] use printandlongex

---
 client/cmdsmartcard.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index a483e424f..d695180ad 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -200,23 +200,23 @@ static int PrintATR(uint8_t *atr, size_t atrlen) {
     bool protocol_T15_present = false;
 
     if (T0 & 0x10) {
-        PrintAndLog("\t- TA1 (Maximum clock frequency, proposed bit duration) [ 0x%02x ]", atr[2 + T1len]);
+        PrintAndLogEx(NORMAL, "\t- TA1 (Maximum clock frequency, proposed bit duration) [ 0x%02x ]", atr[2 + T1len]);
         T1len++;
     }
 
     if (T0 & 0x20) {
-        PrintAndLog("\t- TB1 (Deprecated: VPP requirements) [ 0x%02x ]", atr[2 + T1len]);
+        PrintAndLogEx(NORMAL, "\t- TB1 (Deprecated: VPP requirements) [ 0x%02x ]", atr[2 + T1len]);
         T1len++;
     }
 
     if (T0 & 0x40) {
-        PrintAndLog("\t- TC1 (Extra delay between bytes required by card) [ 0x%02x ]", atr[2 + T1len]);
+        PrintAndLogEx(NORMAL, "\t- TC1 (Extra delay between bytes required by card) [ 0x%02x ]", atr[2 + T1len]);
         T1len++;
     }
 
     if (T0 & 0x80) {
         uint8_t TD1 = atr[2 + T1len];
-        PrintAndLog("\t- TD1 (First offered transmission protocol, presence of TA2..TD2) [ 0x%02x ] Protocol T%d", TD1, TD1 & 0x0f);
+        PrintAndLogEx(NORMAL, "\t- TD1 (First offered transmission protocol, presence of TA2..TD2) [ 0x%02x ] Protocol T%d", TD1, TD1 & 0x0f);
         protocol_T0_present = false;
         if ((TD1 & 0x0f) == 0) {
             protocol_T0_present = true;
@@ -228,20 +228,20 @@ static int PrintATR(uint8_t *atr, size_t atrlen) {
         T1len++;
 
         if (TD1 & 0x10) {
-            PrintAndLog("\t- TA2 (Specific protocol and parameters to be used after the ATR) [ 0x%02x ]", atr[2 + T1len + TD1len]);
+            PrintAndLogEx(NORMAL, "\t- TA2 (Specific protocol and parameters to be used after the ATR) [ 0x%02x ]", atr[2 + T1len + TD1len]);
             TD1len++;
         }
         if (TD1 & 0x20) {
-            PrintAndLog("\t- TB2 (Deprecated: VPP precise voltage requirement) [ 0x%02x ]", atr[2 + T1len + TD1len]);
+            PrintAndLogEx(NORMAL, "\t- TB2 (Deprecated: VPP precise voltage requirement) [ 0x%02x ]", atr[2 + T1len + TD1len]);
             TD1len++;
         }
         if (TD1 & 0x40) {
-            PrintAndLog("\t- TC2 (Maximum waiting time for protocol T=0) [ 0x%02x ]", atr[2 + T1len + TD1len]);
+            PrintAndLogEx(NORMAL, "\t- TC2 (Maximum waiting time for protocol T=0) [ 0x%02x ]", atr[2 + T1len + TD1len]);
             TD1len++;
         }
         if (TD1 & 0x80) {
             uint8_t TDi = atr[2 + T1len + TD1len];
-            PrintAndLog("\t- TD2 (A supported protocol or more global parameters, presence of TA3..TD3) [ 0x%02x ] Protocol T%d", TDi, TDi & 0x0f);
+            PrintAndLogEx(NORMAL, "\t- TD2 (A supported protocol or more global parameters, presence of TA3..TD3) [ 0x%02x ] Protocol T%d", TDi, TDi & 0x0f);
             if ((TDi & 0x0f) == 0) {
                 protocol_T0_present = true;
             }
@@ -255,20 +255,20 @@ static int PrintATR(uint8_t *atr, size_t atrlen) {
             while (nextCycle) {
                 nextCycle = false;
                 if (TDi & 0x10) {
-                    PrintAndLog("\t- TA%d: 0x%02x", vi, atr[2 + T1len + TD1len + TDilen]);
+                    PrintAndLogEx(NORMAL, "\t- TA%d: 0x%02x", vi, atr[2 + T1len + TD1len + TDilen]);
                     TDilen++;
                 }
                 if (TDi & 0x20) {
-                    PrintAndLog("\t- TB%d: 0x%02x", vi, atr[2 + T1len + TD1len + TDilen]);
+                    PrintAndLogEx(NORMAL, "\t- TB%d: 0x%02x", vi, atr[2 + T1len + TD1len + TDilen]);
                     TDilen++;
                 }
                 if (TDi & 0x40) {
-                    PrintAndLog("\t- TC%d: 0x%02x", vi, atr[2 + T1len + TD1len + TDilen]);
+                    PrintAndLogEx(NORMAL, "\t- TC%d: 0x%02x", vi, atr[2 + T1len + TD1len + TDilen]);
                     TDilen++;
                 }
                 if (TDi & 0x80) {
                     TDi = atr[2 + T1len + TD1len + TDilen];
-                    PrintAndLog("\t- TD%d [ 0x%02x ] Protocol T%d", vi, TDi, TDi & 0x0f);
+                    PrintAndLogEx(NORMAL, "\t- TD%d [ 0x%02x ] Protocol T%d", vi, TDi, TDi & 0x0f);
                     TDilen++;
 
                     nextCycle = true;

From 3fdac2577f975895fc7ca0fd4272e694a9cfcd6a Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 17 Apr 2019 11:54:40 +0200
Subject: [PATCH 1298/1938] use printandlogex

---
 client/fido/fidocore.c | 142 ++++++++++++++++++++---------------------
 1 file changed, 71 insertions(+), 71 deletions(-)

diff --git a/client/fido/fidocore.c b/client/fido/fidocore.c
index a10e6291e..c356c3456 100644
--- a/client/fido/fidocore.c
+++ b/client/fido/fidocore.c
@@ -226,52 +226,52 @@ int FIDOCheckDERAndGetKey(uint8_t *der, size_t derLen, bool verbose, uint8_t *pu
     mbedtls_x509_crt_init(&cacert);
     res = mbedtls_x509_crt_parse(&cacert, (const unsigned char *) additional_ca_pem, additional_ca_pem_len);
     if (res < 0) {
-        PrintAndLog("ERROR: CA parse certificate returned -0x%x - %s", -res, ecdsa_get_error(res));
+        PrintAndLogEx(ERR, "ERROR: CA parse certificate returned -0x%x - %s", -res, ecdsa_get_error(res));
     }
     if (verbose)
-        PrintAndLog("CA load OK. %d skipped", res);
+        PrintAndLogEx(SUCCESS, "CA load OK. %d skipped", res);
 
     // load DER certificate from authenticator's data
     mbedtls_x509_crt cert;
     mbedtls_x509_crt_init(&cert);
     res = mbedtls_x509_crt_parse_der(&cert, der, derLen);
     if (res) {
-        PrintAndLog("ERROR: DER parse returned 0x%x - %s", (res < 0) ? -res : res, ecdsa_get_error(res));
+        PrintAndLogEx(ERR, "ERROR: DER parse returned 0x%x - %s", (res < 0) ? -res : res, ecdsa_get_error(res));
     }
 
     // get certificate info
     char linfo[300] = {0};
     if (verbose) {
         mbedtls_x509_crt_info(linfo, sizeof(linfo), "  ", &cert);
-        PrintAndLog("DER certificate info:\n%s", linfo);
+        PrintAndLogEx(SUCCESS, "DER certificate info:\n%s", linfo);
     }
 
     // verify certificate
     uint32_t verifyflags = 0;
     res = mbedtls_x509_crt_verify(&cert, &cacert, NULL, NULL, &verifyflags, NULL, NULL);
     if (res) {
-        PrintAndLog("ERROR: DER verify returned 0x%x - %s\n", (res < 0) ? -res : res, ecdsa_get_error(res));
+        PrintAndLogEx(ERR, "ERROR: DER verify returned 0x%x - %s\n", (res < 0) ? -res : res, ecdsa_get_error(res));
     } else {
-        PrintAndLog("Certificate OK.\n");
+        PrintAndLogEx(SUCCESS, "Certificate OK.\n");
     }
 
     if (verbose) {
         memset(linfo, 0x00, sizeof(linfo));
         mbedtls_x509_crt_verify_info(linfo, sizeof(linfo), "  ", verifyflags);
-        PrintAndLog("Verification info:\n%s", linfo);
+        PrintAndLogEx(SUCCESS, "Verification info:\n%s", linfo);
     }
 
     // get public key
     res = ecdsa_public_key_from_pk(&cert.pk, publicKey, publicKeyMaxLen);
     if (res) {
-        PrintAndLog("ERROR: getting public key from certificate 0x%x - %s", (res < 0) ? -res : res, ecdsa_get_error(res));
+        PrintAndLogEx(ERR, "ERROR: getting public key from certificate 0x%x - %s", (res < 0) ? -res : res, ecdsa_get_error(res));
     } else {
         if (verbose)
-            PrintAndLog("Got a public key from certificate:\n%s", sprint_hex_inrow(publicKey, 65));
+            PrintAndLogEx(SUCCESS, "Got a public key from certificate:\n%s", sprint_hex_inrow(publicKey, 65));
     }
 
     if (verbose)
-        PrintAndLog("------------------DER-------------------");
+        PrintAndLogEx(NORMAL, "------------------DER-------------------");
 
     mbedtls_x509_crt_free(&cert);
     mbedtls_x509_crt_free(&cacert);
@@ -362,15 +362,15 @@ static int FIDO2CheckSignature(json_t *root, uint8_t *publickey, uint8_t *sign,
     res = ecdsa_asn1_get_signature(sign, signLen, rval, sval);
     if (!res) {
         if (verbose) {
-            PrintAndLog("  r: %s", sprint_hex(rval, 32));
-            PrintAndLog("  s: %s", sprint_hex(sval, 32));
+            PrintAndLogEx(NORMAL, "  r: %s", sprint_hex(rval, 32));
+            PrintAndLogEx(NORMAL, "  s: %s", sprint_hex(sval, 32));
         }
 
         uint8_t clientDataHash[32] = {0};
         size_t clientDataHashLen = 0;
         res = JsonLoadBufAsHex(root, "$.ClientDataHash", clientDataHash, sizeof(clientDataHash), &clientDataHashLen);
         if (res || clientDataHashLen != 32) {
-            PrintAndLog("ERROR: Can't get clientDataHash from json!");
+            PrintAndLogEx(ERR, "ERROR: Can't get clientDataHash from json!");
             return 2;
         }
 
@@ -380,20 +380,20 @@ static int FIDO2CheckSignature(json_t *root, uint8_t *publickey, uint8_t *sign,
                          authData, authDataLen,  // rpIdHash[32] + flags[1] + signCount[4]
                          clientDataHash, 32,     // Hash of the serialized client data. "$.ClientDataHash" from json
                          NULL, 0);
-        //PrintAndLog("--xbuf(%d)[%d]: %s", res, xbuflen, sprint_hex(xbuf, xbuflen));
+        //PrintAndLogEx(NORMAL, "--xbuf(%d)[%d]: %s", res, xbuflen, sprint_hex(xbuf, xbuflen));
         res = ecdsa_signature_verify(publickey, xbuf, xbuflen, sign, signLen);
         if (res) {
             if (res == -0x4e00) {
-                PrintAndLog("Signature is NOT VALID.");
+                PrintAndLogEx(WARNING, "Signature is NOT VALID.");
             } else {
-                PrintAndLog("Other signature check error: %x %s", (res < 0) ? -res : res, ecdsa_get_error(res));
+                PrintAndLogEx(WARNING, "Other signature check error: %x %s", (res < 0) ? -res : res, ecdsa_get_error(res));
             }
             return res;
         } else {
-            PrintAndLog("Signature is OK.");
+            PrintAndLogEx(SUCCESS, "Signature is OK.");
         }
     } else {
-        PrintAndLog("Invalid signature. res=%d.", res);
+        PrintAndLogEx(ERR, "Invalid signature. res = %d.", res);
         return res;
     }
 
@@ -415,7 +415,7 @@ int FIDO2MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, b
 
     res = cbor_value_dup_text_string(&map, &buf, &n, &map);
     cbor_check(res);
-    PrintAndLog("format: %s", buf);
+    PrintAndLogEx(INFO, "format: %s", buf);
     free(buf);
 
     // authData
@@ -431,43 +431,43 @@ int FIDO2MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, b
     memcpy(authData, ubuf, authDataLen);
 
     if (verbose2) {
-        PrintAndLog("authData[%d]: %s", n, sprint_hex_inrow(authData, authDataLen));
+        PrintAndLogEx(INFO, "authData[%d]: %s", n, sprint_hex_inrow(authData, authDataLen));
     } else {
-        PrintAndLog("authData[%d]: %s...", n, sprint_hex(authData, MIN(authDataLen, 16)));
+        PrintAndLogEx(INFO, "authData[%d]: %s...", n, sprint_hex(authData, MIN(authDataLen, 16)));
     }
 
-    PrintAndLog("RP ID Hash: %s", sprint_hex(ubuf, 32));
+    PrintAndLogEx(INFO, "RP ID Hash: %s", sprint_hex(ubuf, 32));
 
     // check RP ID Hash
     if (CheckrpIdHash(root, ubuf)) {
-        PrintAndLog("rpIdHash OK.");
+        PrintAndLogEx(SUCCESS, "rpIdHash OK.");
     } else {
-        PrintAndLog("rpIdHash ERROR!");
+        PrintAndLogEx(ERR, "rpIdHash ERROR!");
     }
 
-    PrintAndLog("Flags 0x%02x:", ubuf[32]);
+    PrintAndLogEx(INFO, "Flags 0x%02x:", ubuf[32]);
     if (!ubuf[32])
-        PrintAndLog("none");
+        PrintAndLogEx(SUCCESS, "none");
     if (ubuf[32] & 0x01)
-        PrintAndLog("up - user presence result");
+        PrintAndLogEx(SUCCESS, "up - user presence result");
     if (ubuf[32] & 0x04)
-        PrintAndLog("uv - user verification (fingerprint scan or a PIN or ...) result");
+        PrintAndLogEx(SUCCESS, "uv - user verification (fingerprint scan or a PIN or ...) result");
     if (ubuf[32] & 0x40)
-        PrintAndLog("at - attested credential data included");
+        PrintAndLogEx(SUCCESS, "at - attested credential data included");
     if (ubuf[32] & 0x80)
-        PrintAndLog("ed - extension data included");
+        PrintAndLogEx(SUCCESS, "ed - extension data included");
 
     uint32_t cntr = (uint32_t)bytes_to_num(&ubuf[33], 4);
-    PrintAndLog("Counter: %d", cntr);
+    PrintAndLogEx(SUCCESS, "Counter: %d", cntr);
     JsonSaveInt(root, "$.AppData.Counter", cntr);
 
     // attestation data
-    PrintAndLog("AAGUID: %s", sprint_hex(&ubuf[37], 16));
+    PrintAndLogEx(SUCCESS, "AAGUID: %s", sprint_hex(&ubuf[37], 16));
     JsonSaveBufAsHexCompact(root, "$.AppData.AAGUID", &ubuf[37], 16);
 
     // Credential ID
     uint8_t cridlen = (uint16_t)bytes_to_num(&ubuf[53], 2);
-    PrintAndLog("Credential id[%d]: %s", cridlen, sprint_hex_inrow(&ubuf[55], cridlen));
+    PrintAndLogEx(SUCCESS, "Credential id[%d]: %s", cridlen, sprint_hex_inrow(&ubuf[55], cridlen));
     JsonSaveInt(root, "$.AppData.CredentialIdLen", cridlen);
     JsonSaveBufAsHexCompact(root, "$.AppData.CredentialId", &ubuf[55], cridlen);
 
@@ -475,24 +475,24 @@ int FIDO2MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, b
     uint8_t coseKey[65] = {0};
     uint16_t cplen = n - 55 - cridlen;
     if (verbose2) {
-        PrintAndLog("Credentional public key (COSE_KEY)[%d]: %s", cplen, sprint_hex_inrow(&ubuf[55 + cridlen], cplen));
+        PrintAndLogEx(SUCCESS, "Credentional public key (COSE_KEY)[%d]: %s", cplen, sprint_hex_inrow(&ubuf[55 + cridlen], cplen));
     } else {
-        PrintAndLog("Credentional public key (COSE_KEY)[%d]: %s...", cplen, sprint_hex(&ubuf[55 + cridlen], MIN(cplen, 16)));
+        PrintAndLogEx(SUCCESS, "Credentional public key (COSE_KEY)[%d]: %s...", cplen, sprint_hex(&ubuf[55 + cridlen], MIN(cplen, 16)));
     }
     JsonSaveBufAsHexCompact(root, "$.AppData.COSE_KEY", &ubuf[55 + cridlen], cplen);
 
     if (showCBOR) {
-        PrintAndLog("COSE structure:");
-        PrintAndLog("---------------- CBOR ------------------");
+        PrintAndLogEx(INFO, "COSE structure:");
+        PrintAndLogEx(NORMAL, "---------------- CBOR ------------------");
         TinyCborPrintFIDOPackage(fido2COSEKey, true, &ubuf[55 + cridlen], cplen);
-        PrintAndLog("---------------- CBOR ------------------");
+        PrintAndLogEx(NORMAL, "---------------- CBOR ------------------");
     }
 
     res = COSEGetECDSAKey(&ubuf[55 + cridlen], cplen, verbose, coseKey);
     if (res) {
-        PrintAndLog("ERROR: Can't get COSE_KEY.");
+        PrintAndLogEx(ERR, "ERROR: Can't get COSE_KEY.");
     } else {
-        PrintAndLog("COSE public key: %s", sprint_hex_inrow(coseKey, sizeof(coseKey)));
+        PrintAndLogEx(SUCCESS, "COSE public key: %s", sprint_hex_inrow(coseKey, sizeof(coseKey)));
         JsonSaveBufAsHexCompact(root, "$.AppData.COSEPublicKey", coseKey, sizeof(coseKey));
     }
 
@@ -518,7 +518,7 @@ int FIDO2MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, b
         cbor_check(res);
         if (!strcmp(key, "alg")) {
             cbor_value_get_int64(&mapsmt, &alg);
-            PrintAndLog("Alg [%lld] %s", (long long)alg, GetCOSEAlgDescription(alg));
+            PrintAndLogEx(INFO, "Alg [%lld] %s", (long long)alg, GetCOSEAlgDescription(alg));
             res = cbor_value_advance_fixed(&mapsmt);
             cbor_check(res);
         }
@@ -527,9 +527,9 @@ int FIDO2MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, b
             res = CborGetBinStringValue(&mapsmt, sign, sizeof(sign), &signLen);
             cbor_check(res);
             if (verbose2) {
-                PrintAndLog("signature [%d]: %s", signLen, sprint_hex_inrow(sign, signLen));
+                PrintAndLogEx(INFO, "signature [%d]: %s", signLen, sprint_hex_inrow(sign, signLen));
             } else {
-                PrintAndLog("signature [%d]: %s...", signLen, sprint_hex(sign, MIN(signLen, 16)));
+                PrintAndLogEx(INFO, "signature [%d]: %s...", signLen, sprint_hex(sign, MIN(signLen, 16)));
             }
         }
 
@@ -537,11 +537,11 @@ int FIDO2MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, b
             res = CborGetArrayBinStringValue(&mapsmt, der, sizeof(der), &derLen);
             cbor_check(res);
             if (verbose2) {
-                PrintAndLog("DER certificate[%d]:\n------------------DER-------------------", derLen);
+                PrintAndLogEx(NORMAL, "DER certificate[%d]:\n------------------DER-------------------", derLen);
                 dump_buffer_simple((const unsigned char *)der, derLen, NULL);
-                PrintAndLog("\n----------------DER---------------------");
+                PrintAndLogEx(NORMAL, "\n----------------DER---------------------");
             } else {
-                PrintAndLog("DER [%d]: %s...", derLen, sprint_hex(der, MIN(derLen, 16)));
+                PrintAndLogEx(NORMAL, "DER [%d]: %s...", derLen, sprint_hex(der, MIN(derLen, 16)));
             }
             JsonSaveBufAsHexCompact(root, "$.AppData.DER", der, derLen);
         }
@@ -553,9 +553,9 @@ int FIDO2MakeCredentionalParseRes(json_t *root, uint8_t *data, size_t dataLen, b
 
     // print DER certificate in TLV view
     if (showDERTLV) {
-        PrintAndLog("----------------DER TLV-----------------");
+        PrintAndLogEx(NORMAL, "----------------DER TLV-----------------");
         asn1_print(der, derLen, "  ");
-        PrintAndLog("----------------DER TLV-----------------");
+        PrintAndLogEx(NORMAL, "----------------DER TLV-----------------");
     }
     FIDOCheckDERAndGetKey(der, derLen, verbose, public_key, sizeof(public_key));
     JsonSaveBufAsHexCompact(root, "$.AppData.DERPublicKey", public_key, sizeof(public_key));
@@ -664,14 +664,14 @@ int FIDO2GetAssertionParseRes(json_t *root, uint8_t *data, size_t dataLen, bool
             char ctype[200] = {0};
             res = CborGetStringValue(&mapint, ctype, sizeof(ctype), &n);
             cbor_check(res);
-            PrintAndLog("credential type: %s", ctype);
+            PrintAndLogEx(SUCCESS, "credential type: %s", ctype);
         }
 
         if (!strcmp(key, "id")) {
             uint8_t cid[200] = {0};
             res = CborGetBinStringValue(&mapint, cid, sizeof(cid), &n);
             cbor_check(res);
-            PrintAndLog("credential id [%d]: %s", n, sprint_hex(cid, n));
+            PrintAndLogEx(SUCCESS, "credential id [%d]: %s", n, sprint_hex(cid, n));
         }
     }
     res = cbor_value_leave_container(&map, &mapint);
@@ -690,34 +690,34 @@ int FIDO2GetAssertionParseRes(json_t *root, uint8_t *data, size_t dataLen, bool
     memcpy(authData, ubuf, authDataLen);
 
     if (verbose2) {
-        PrintAndLog("authData[%d]: %s", n, sprint_hex_inrow(authData, authDataLen));
+        PrintAndLogEx(INFO, "authData[%d]: %s", n, sprint_hex_inrow(authData, authDataLen));
     } else {
-        PrintAndLog("authData[%d]: %s...", n, sprint_hex(authData, MIN(authDataLen, 16)));
+        PrintAndLogEx(INFO, "authData[%d]: %s...", n, sprint_hex(authData, MIN(authDataLen, 16)));
     }
 
-    PrintAndLog("RP ID Hash: %s", sprint_hex(ubuf, 32));
+    PrintAndLogEx(INFO, "RP ID Hash: %s", sprint_hex(ubuf, 32));
 
     // check RP ID Hash
     if (CheckrpIdHash(root, ubuf)) {
-        PrintAndLog("rpIdHash OK.");
+        PrintAndLogEx(SUCCESS, "rpIdHash OK.");
     } else {
-        PrintAndLog("rpIdHash ERROR!");
+        PrintAndLogEx(ERR, "rpIdHash ERROR!");
     }
 
-    PrintAndLog("Flags 0x%02x:", ubuf[32]);
+    PrintAndLogEx(INFO, "Flags 0x%02x:", ubuf[32]);
     if (!ubuf[32])
-        PrintAndLog("none");
+        PrintAndLogEx(SUCCESS, "none");
     if (ubuf[32] & 0x01)
-        PrintAndLog("up - user presence result");
+        PrintAndLogEx(SUCCESS, "up - user presence result");
     if (ubuf[32] & 0x04)
-        PrintAndLog("uv - user verification (fingerprint scan or a PIN or ...) result");
+        PrintAndLogEx(SUCCESS, "uv - user verification (fingerprint scan or a PIN or ...) result");
     if (ubuf[32] & 0x40)
-        PrintAndLog("at - attested credential data included");
+        PrintAndLogEx(SUCCESS, "at - attested credential data included");
     if (ubuf[32] & 0x80)
-        PrintAndLog("ed - extension data included");
+        PrintAndLogEx(SUCCESS, "ed - extension data included");
 
     uint32_t cntr = (uint32_t)bytes_to_num(&ubuf[33], 4);
-    PrintAndLog("Counter: %d", cntr);
+    PrintAndLogEx(SUCCESS, "Counter: %d", cntr);
     JsonSaveInt(root, "$.AppData.Counter", cntr);
 
     free(ubuf);
@@ -725,7 +725,7 @@ int FIDO2GetAssertionParseRes(json_t *root, uint8_t *data, size_t dataLen, bool
     // publicKeyCredentialUserEntity
     res = CborMapGetKeyById(&parser, &map, data, dataLen, 4);
     if (res) {
-        PrintAndLog("UserEntity n/a");
+        PrintAndLogEx(SUCCESS, "UserEntity n/a");
     } else {
         res = cbor_value_enter_container(&map, &mapint);
         cbor_check(res);
@@ -739,14 +739,14 @@ int FIDO2GetAssertionParseRes(json_t *root, uint8_t *data, size_t dataLen, bool
                 char cname[200] = {0};
                 res = CborGetStringValue(&mapint, cname, sizeof(cname), &n);
                 cbor_check(res);
-                PrintAndLog("UserEntity %s: %s", key, cname);
+                PrintAndLogEx(SUCCESS, "UserEntity %s: %s", key, cname);
             }
 
             if (!strcmp(key, "id")) {
                 uint8_t cid[200] = {0};
                 res = CborGetBinStringValue(&mapint, cid, sizeof(cid), &n);
                 cbor_check(res);
-                PrintAndLog("UserEntity id [%d]: %s", n, sprint_hex(cid, n));
+                PrintAndLogEx(SUCCESS, "UserEntity id [%d]: %s", n, sprint_hex(cid, n));
 
                 // check
                 uint8_t idbuf[100] = {0};
@@ -755,9 +755,9 @@ int FIDO2GetAssertionParseRes(json_t *root, uint8_t *data, size_t dataLen, bool
                 JsonLoadBufAsHex(root, "$.UserEntity.id", idbuf, sizeof(idbuf), &idbuflen);
 
                 if (idbuflen == n && !memcmp(idbuf, cid, idbuflen)) {
-                    PrintAndLog("UserEntity id OK.");
+                    PrintAndLogEx(SUCCESS, "UserEntity id OK.");
                 } else {
-                    PrintAndLog("ERROR: Wrong UserEntity id (from json: %s)", sprint_hex(idbuf, idbuflen));
+                    PrintAndLogEx(ERR, "ERROR: Wrong UserEntity id (from json: %s)", sprint_hex(idbuf, idbuflen));
                 }
             }
         }
@@ -778,9 +778,9 @@ int FIDO2GetAssertionParseRes(json_t *root, uint8_t *data, size_t dataLen, bool
 
     cbor_check(res);
     if (verbose2) {
-        PrintAndLog("signature [%d]: %s", signLen, sprint_hex_inrow(sign, signLen));
+        PrintAndLogEx(SUCCESS, "signature [%d]: %s", signLen, sprint_hex_inrow(sign, signLen));
     } else {
-        PrintAndLog("signature [%d]: %s...", signLen, sprint_hex(sign, MIN(signLen, 16)));
+        PrintAndLogEx(SUCCESS, "signature [%d]: %s...", signLen, sprint_hex(sign, MIN(signLen, 16)));
     }
 
     // get public key from json
@@ -796,11 +796,11 @@ int FIDO2GetAssertionParseRes(json_t *root, uint8_t *data, size_t dataLen, bool
     // numberOfCredentials
     res = CborMapGetKeyById(&parser, &map, data, dataLen, 5);
     if (res) {
-        PrintAndLog("numberOfCredentials: 1 by default");
+        PrintAndLogEx(SUCCESS, "numberOfCredentials: 1 by default");
     } else {
         int64_t numberOfCredentials = 0;
         cbor_value_get_int64(&map, &numberOfCredentials);
-        PrintAndLog("numberOfCredentials: %lld", (long long)numberOfCredentials);
+        PrintAndLogEx(SUCCESS, "numberOfCredentials: %lld", (long long)numberOfCredentials);
     }
 
     return 0;

From 53b48ae6a978863af650624ac341f2f8305b6af0 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 17 Apr 2019 11:55:52 +0200
Subject: [PATCH 1299/1938] use printandlogex

---
 client/fido/cose.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/client/fido/cose.c b/client/fido/cose.c
index a3fc9755c..b5c6a3511 100644
--- a/client/fido/cose.c
+++ b/client/fido/cose.c
@@ -163,16 +163,16 @@ int COSEGetECDSAKey(uint8_t *data, size_t datalen, bool verbose, uint8_t *public
     size_t len;
 
     if (verbose)
-        PrintAndLog("----------- CBOR decode ----------------");
+        PrintAndLogEx(NORMAL, "----------- CBOR decode ----------------");
 
     // kty
     int res = CborMapGetKeyById(&parser, &map, data, datalen, 1);
     if (!res) {
         cbor_value_get_int64(&map, &i64);
         if (verbose)
-            PrintAndLog("kty [%lld] %s", (long long)i64, GetCOSEktyDescription(i64));
+            PrintAndLogEx(SUCCESS, "kty [%lld] %s", (long long)i64, GetCOSEktyDescription(i64));
         if (i64 != 2)
-            PrintAndLog("ERROR: kty must be 2.");
+            PrintAndLogEx(ERR, "ERROR: kty must be 2.");
     }
 
     // algorithm
@@ -180,9 +180,9 @@ int COSEGetECDSAKey(uint8_t *data, size_t datalen, bool verbose, uint8_t *public
     if (!res) {
         cbor_value_get_int64(&map, &i64);
         if (verbose)
-            PrintAndLog("algorithm [%lld] %s", (long long)i64, GetCOSEAlgDescription(i64));
+            PrintAndLogEx(SUCCESS, "algorithm [%lld] %s", (long long)i64, GetCOSEAlgDescription(i64));
         if (i64 != -7)
-            PrintAndLog("ERROR: algorithm must be -7.");
+            PrintAndLogEx(ERR, "ERROR: algorithm must be -7.");
     }
 
     // curve
@@ -190,9 +190,9 @@ int COSEGetECDSAKey(uint8_t *data, size_t datalen, bool verbose, uint8_t *public
     if (!res) {
         cbor_value_get_int64(&map, &i64);
         if (verbose)
-            PrintAndLog("curve [%lld] %s", (long long)i64, GetCOSECurveDescription(i64));
+            PrintAndLogEx(SUCCESS, "curve [%lld] %s", (long long)i64, GetCOSECurveDescription(i64));
         if (i64 != 1)
-            PrintAndLog("ERROR: curve must be 1.");
+            PrintAndLogEx(ERR, "ERROR: curve must be 1.");
     }
 
     // plain key
@@ -204,9 +204,9 @@ int COSEGetECDSAKey(uint8_t *data, size_t datalen, bool verbose, uint8_t *public
         res = CborGetBinStringValue(&map, &public_key[1], 32, &len);
         cbor_check(res);
         if (verbose)
-            PrintAndLog("x - coordinate [%d]: %s", len, sprint_hex(&public_key[1], 32));
+            PrintAndLogEx(SUCCESS, "x - coordinate [%d]: %s", len, sprint_hex(&public_key[1], 32));
         if (len != 32)
-            PrintAndLog("ERROR: x - coordinate length must be 32.");
+            PrintAndLogEx(ERR, "ERROR: x - coordinate length must be 32.");
     }
 
     // y - coordinate
@@ -215,9 +215,9 @@ int COSEGetECDSAKey(uint8_t *data, size_t datalen, bool verbose, uint8_t *public
         res = CborGetBinStringValue(&map, &public_key[33], 32, &len);
         cbor_check(res);
         if (verbose)
-            PrintAndLog("y - coordinate [%d]: %s", len, sprint_hex(&public_key[33], 32));
+            PrintAndLogEx(SUCCESS, "y - coordinate [%d]: %s", len, sprint_hex(&public_key[33], 32));
         if (len != 32)
-            PrintAndLog("ERROR: y - coordinate length must be 32.");
+            PrintAndLogEx(ERR, "ERROR: y - coordinate length must be 32.");
     }
 
     // d - private key
@@ -227,11 +227,11 @@ int COSEGetECDSAKey(uint8_t *data, size_t datalen, bool verbose, uint8_t *public
         res = CborGetBinStringValue(&map, private_key, sizeof(private_key), &len);
         cbor_check(res);
         if (verbose)
-            PrintAndLog("d - private key [%d]: %s", len, sprint_hex(private_key, len));
+            PrintAndLogEx(SUCCESS, "d - private key [%d]: %s", len, sprint_hex(private_key, len));
     }
 
     if (verbose)
-        PrintAndLog("----------- CBOR decode ----------------");
+        PrintAndLogEx(NORMAL, "----------- CBOR decode ----------------");
 
     return 0;
 }

From 01b83482a7d2df3dc7ea01ccf755d327f70206f1 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 17 Apr 2019 11:58:44 +0200
Subject: [PATCH 1300/1938] use printandlogex

---
 client/emv/emvjson.c | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/client/emv/emvjson.c b/client/emv/emvjson.c
index 59de9d37e..c3b1522d4 100644
--- a/client/emv/emvjson.c
+++ b/client/emv/emvjson.c
@@ -76,7 +76,7 @@ int JsonSaveJsonObject(json_t *root, const char *path, json_t *value) {
 
     if (path[0] == '$') {
         if (json_path_set(root, path, value, 0, &error)) {
-            PrintAndLog("ERROR: can't set json path: ", error.text);
+            PrintAndLogEx(ERR, "ERROR: can't set json path: ", error.text);
             return 2;
         } else {
             return 0;
@@ -152,12 +152,12 @@ int JsonSaveTLVElm(json_t *elm, const char *path, struct tlv *tlvelm, bool saveN
 
             if (json_is_array(elm)) {
                 if (json_array_append_new(elm, obj)) {
-                    PrintAndLog("ERROR: can't append array: %s", path);
+                    PrintAndLogEx(ERR, "ERROR: can't append array: %s", path);
                     return 2;
                 }
             } else {
                 if (json_path_set(elm, path, obj, 0, &error)) {
-                    PrintAndLog("ERROR: can't set json path: ", error.text);
+                    PrintAndLogEx(ERR, "ERROR: can't set json path: ", error.text);
                     return 2;
                 }
             }
@@ -226,7 +226,7 @@ int JsonSaveTLVTree(json_t *root, json_t *elm, const char *path, struct tlvdb *t
 
             // check
             if (!json_is_array(chjson)) {
-                PrintAndLog("E->Internal logic error. `$.Childs` is not an array.");
+                PrintAndLogEx(ERR, "E->Internal logic error. `$.Childs` is not an array.");
                 break;
             }
 
@@ -244,18 +244,18 @@ static bool HexToBuffer(const char *errormsg, const char *hexvalue, uint8_t *buf
 
     switch (param_gethex_to_eol(hexvalue, 0, buffer, maxbufferlen, &buflen)) {
         case 1:
-            PrintAndLog("%s Invalid HEX value.", errormsg);
+            PrintAndLogEx(ERR, "%s Invalid HEX value.", errormsg);
             return false;
         case 2:
-            PrintAndLog("%s Hex value too large.", errormsg);
+            PrintAndLogEx(ERR, "%s Hex value too large.", errormsg);
             return false;
         case 3:
-            PrintAndLog("%s Hex value must have even number of digits.", errormsg);
+            PrintAndLogEx(ERR, "%s Hex value must have even number of digits.", errormsg);
             return false;
     }
 
     if (buflen > maxbufferlen) {
-        PrintAndLog("%s HEX length (%d) more than %d", errormsg, (bufferlen) ? *bufferlen : -1, maxbufferlen);
+        PrintAndLogEx(ERR, "%s HEX length (%d) more than %d", errormsg, (bufferlen) ? *bufferlen : -1, maxbufferlen);
         return false;
     }
 
@@ -301,7 +301,7 @@ bool ParamLoadFromJson(struct tlvdb *tlv) {
     json_error_t error;
 
     if (!tlv) {
-        PrintAndLog("ERROR load params: tlv tree is NULL.");
+        PrintAndLogEx(ERR, "ERROR load params: tlv tree is NULL.");
         return false;
     }
 
@@ -313,30 +313,30 @@ bool ParamLoadFromJson(struct tlvdb *tlv) {
 
     root = json_load_file(fname, 0, &error);
     if (!root) {
-        PrintAndLog("Load params: json error on line %d: %s", error.line, error.text);
+        PrintAndLogEx(ERR, "Load params: json error on line " _YELLOW_("%d") ": %s", error.line, error.text);
         return false;
     }
 
     if (!json_is_array(root)) {
-        PrintAndLog("Load params: Invalid json format. root must be array.");
+        PrintAndLogEx(ERR, "Load params: Invalid json format. root must be array.");
         return false;
     }
 
-    PrintAndLog("Load params: json(%d) OK", json_array_size(root));
+    PrintAndLogEx(SUCCESS, "Load params: json(%d) " _GREEN_("OK"), json_array_size(root));
 
     for (int i = 0; i < json_array_size(root); i++) {
         json_t *data, *jtag, *jlength, *jvalue;
 
         data = json_array_get(root, i);
         if (!json_is_object(data)) {
-            PrintAndLog("Load params: data [%d] is not an object", i + 1);
+            PrintAndLogEx(ERR, "Load params: data [%d] is not an object", i + 1);
             json_decref(root);
             return false;
         }
 
         jtag = json_object_get(data, "tag");
         if (!json_is_string(jtag)) {
-            PrintAndLog("Load params: data [%d] tag is not a string", i + 1);
+            PrintAndLogEx(ERR, "Load params: data [%d] tag is not a string", i + 1);
             json_decref(root);
             return false;
         }
@@ -344,7 +344,7 @@ bool ParamLoadFromJson(struct tlvdb *tlv) {
 
         jvalue = json_object_get(data, "value");
         if (!json_is_string(jvalue)) {
-            PrintAndLog("Load params: data [%d] value is not a string", i + 1);
+            PrintAndLogEx(ERR, "Load params: data [%d] value is not a string", i + 1);
             json_decref(root);
             return false;
         }
@@ -352,19 +352,19 @@ bool ParamLoadFromJson(struct tlvdb *tlv) {
 
         jlength = json_object_get(data, "length");
         if (!json_is_number(jlength)) {
-            PrintAndLog("Load params: data [%d] length is not a number", i + 1);
+            PrintAndLogEx(ERR, "Load params: data [%d] length is not a number", i + 1);
             json_decref(root);
             return false;
         }
 
         int tlvLength = json_integer_value(jlength);
         if (tlvLength > 250) {
-            PrintAndLog("Load params: data [%d] length more than 250", i + 1);
+            PrintAndLogEx(ERR, "Load params: data [%d] length more than 250", i + 1);
             json_decref(root);
             return false;
         }
 
-        PrintAndLog("TLV param: %s[%d]=%s", tlvTag, tlvLength, tlvValue);
+        PrintAndLogEx(SUCCESS, "TLV param: %s[%d]=%s", tlvTag, tlvLength, tlvValue);
         uint8_t buf[251] = {0};
         size_t buflen = 0;
 
@@ -383,7 +383,7 @@ bool ParamLoadFromJson(struct tlvdb *tlv) {
         }
 
         if (buflen != tlvLength) {
-            PrintAndLog("Load params: data [%d] length of HEX must(%d) be identical to length in TLV param(%d)", i + 1, buflen, tlvLength);
+            PrintAndLogEx(ERR, "Load params: data [%d] length of HEX must(%d) be identical to length in TLV param(%d)", i + 1, buflen, tlvLength);
             json_decref(root);
             return false;
         }

From 8e4362bfc72a9f7cbf024d0e66f913c3fcc16e0a Mon Sep 17 00:00:00 2001
From: Iceman <iceman@iuse.se>
Date: Wed, 17 Apr 2019 13:06:03 +0200
Subject: [PATCH 1301/1938] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 67e31b794..972dfa9f9 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,7 @@ Proxmark3 RDV4.0 Dedicated Github
 ===============
 This repo is based on iceman fork for proxmark3. It is dedicated to bringing the most out of the new features for proxmark3 RDV4.0 new hardware and design.
 
+[![Build status](https://ci.appveyor.com/api/projects/status/ct5blik2wa96bv0x/branch/master?svg=true)](https://ci.appveyor.com/project/iceman1001/proxmark3-ji4wj/branch/master)
 [![Latest release](https://img.shields.io/github/release/RfidResearchGroup/proxmark3.svg)](https://github.com/RfidResearchGroup/proxmark3/releases/latest)
 
 <a href="http://www.youtube.com/watch?feature=player_embedded&v=uyJ-y0kSWfc

From bc0e9687d741e7fc7aecf9c51ed69449c20c9dbc Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 17 Apr 2019 13:45:55 +0200
Subject: [PATCH 1302/1938] use printandlogex

---
 client/emv/cmdemv.c | 75 ++++++++++++++++++++-------------------------
 1 file changed, 34 insertions(+), 41 deletions(-)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index be1b28103..fe6dc79c0 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -46,7 +46,7 @@ static void ParamLoadDefaults(struct tlvdb *tlvRoot) {
 static void PrintChannel(EMVCommandChannel channel) {
     switch (channel) {
         case ECC_CONTACTLESS:
-            PrintAndLogEx(INFO, "Channel: CONTACTLESS");
+            PrintAndLogEx(INFO, "Channel: CONTACTLESS (RFID)");
             break;
         case ECC_CONTACT:
             PrintAndLogEx(INFO, "Channel: CONTACT");
@@ -203,7 +203,6 @@ static int CmdEMVPPSE(const char *Cmd) {
     if (res)
         return res;
 
-
     if (decodeTLV)
         TLVPrintFromBuffer(buf, len);
 
@@ -410,7 +409,7 @@ static int CmdEMVAC(const char *Cmd) {
             termDecision = EMVAC_ARQC;
 
         if (termDecision == 0xff) {
-            PrintAndLog("ERROR: can't find terminal decision '%s'", arg_get_str(3)->sval[0]);
+            PrintAndLogEx(ERR, "ERROR: can't find terminal decision '%s'", arg_get_str(3)->sval[0]);
             return 1;
         }
     } else {
@@ -647,7 +646,7 @@ static void InitTransactionParameters(struct tlvdb *tlvRoot, bool paramLoadJSON,
     ParamLoadDefaults(tlvRoot);
 
     if (paramLoadJSON) {
-        PrintAndLog("* * Transaction parameters loading from JSON...");
+        PrintAndLogEx(INFO, "* * Transaction parameters loading from JSON...");
         ParamLoadFromJson(tlvRoot);
     }
 
@@ -678,12 +677,12 @@ static void InitTransactionParameters(struct tlvdb *tlvRoot, bool paramLoadJSON,
 static void ProcessGPOResponseFormat1(struct tlvdb *tlvRoot, uint8_t *buf, size_t len, bool decodeTLV) {
     if (buf[0] == 0x80) {
         if (decodeTLV) {
-            PrintAndLog("GPO response format1:");
+            PrintAndLogEx(SUCCESS, "GPO response format1:");
             TLVPrintFromBuffer(buf, len);
         }
 
         if (len < 4 || (len - 4) % 4) {
-            PrintAndLogEx(ERR, "GPO response format1 parsing error. length=%d", len);
+            PrintAndLogEx(ERR, "GPO response format 1 parsing error. length = %d", len);
         } else {
             // AIP
             struct tlvdb *f1AIP = tlvdb_fixed(0x82, 2, buf + 2);
@@ -708,7 +707,7 @@ static void ProcessGPOResponseFormat1(struct tlvdb *tlvRoot, uint8_t *buf, size_
 static void ProcessACResponseFormat1(struct tlvdb *tlvRoot, uint8_t *buf, size_t len, bool decodeTLV) {
     if (buf[0] == 0x80) {
         if (decodeTLV) {
-            PrintAndLog("GPO response format1:");
+            PrintAndLogEx(SUCCESS, "GPO response format 1:");
             TLVPrintFromBuffer(buf, len);
         }
 
@@ -719,7 +718,7 @@ static void ProcessACResponseFormat1(struct tlvdb *tlvRoot, uint8_t *buf, size_t
         } else {
             struct tlvdb *tlvElm = NULL;
             if (decodeTLV)
-                PrintAndLog("\n------------ Format1 decoded ------------");
+                PrintAndLogEx(NORMAL, "\n------------ Format1 decoded ------------");
 
             // CID (Cryptogram Information Data)
             tlvdb_change_or_add_node_ex(tlvRoot, 0x9f27, 1, &buf[2], &tlvElm);
@@ -873,23 +872,23 @@ static int CmdEMVExec(const char *Cmd) {
 
     if (decodeTLV)
         TLVPrintFromBuffer(buf, len);
-    PrintAndLog("* Selected.");
+    PrintAndLogEx(NORMAL, "* Selected.");
 
-    PrintAndLog("\n* Init transaction parameters.");
+    PrintAndLogEx(NORMAL, "\n* Init transaction parameters.");
     InitTransactionParameters(tlvRoot, paramLoadJSON, TrType, GenACGPO);
     TLVPrintFromTLV(tlvRoot); // TODO delete!!!
 
     PrintAndLogEx(NORMAL, "\n* Calc PDOL.");
     pdol_data_tlv = dol_process(tlvdb_get(tlvRoot, 0x9f38, NULL), tlvRoot, 0x83);
     if (!pdol_data_tlv) {
-        PrintAndLogEx(WARNING, "Error: can't create PDOL TLV.");
+        PrintAndLogEx(ERR, "Error: can't create PDOL TLV.");
         dreturn(4);
     }
 
     size_t pdol_data_tlv_data_len;
     unsigned char *pdol_data_tlv_data = tlv_encode(pdol_data_tlv, &pdol_data_tlv_data_len);
     if (!pdol_data_tlv_data) {
-        PrintAndLogEx(WARNING, "Error: can't create PDOL data.");
+        PrintAndLogEx(ERR, "Error: can't create PDOL data.");
         dreturn(4);
     }
     PrintAndLogEx(NORMAL, "PDOL data[%d]: %s", pdol_data_tlv_data_len, sprint_hex(pdol_data_tlv_data, pdol_data_tlv_data_len));
@@ -901,7 +900,7 @@ static int CmdEMVExec(const char *Cmd) {
     //free(pdol_data_tlv); --- free on exit.
 
     if (res) {
-        PrintAndLogEx(NORMAL, "GPO error(%d): %4x. Exit...", res, sw);
+        PrintAndLogEx(ERR, "GPO error(%d): %4x. Exit...", res, sw);
         dreturn(5);
     }
 
@@ -919,7 +918,7 @@ static int CmdEMVExec(const char *Cmd) {
                 const struct tlv *pantlv = tlvdb_get(tlvRoot, 0x5a, NULL);
                 PrintAndLogEx(NORMAL, "\n* * Extracted PAN from track2: %s", sprint_hex(pantlv->value, pantlv->len));
             } else {
-                PrintAndLogEx(NORMAL, "\n* * WARNING: Can't extract PAN from track2.");
+                PrintAndLogEx(WARNING, "\n* * WARNING: Can't extract PAN from track2.");
             }
         }
     }
@@ -928,7 +927,7 @@ static int CmdEMVExec(const char *Cmd) {
     const struct tlv *AFL = tlvdb_get(tlvRoot, 0x94, NULL);
 
     if (!AFL || !AFL->len)
-        PrintAndLogEx(NORMAL, "WARNING: AFL not found.");
+        PrintAndLogEx(WARNING, "WARNING: AFL not found.");
 
     while (AFL && AFL->len) {
         if (AFL->len % 4) {
@@ -1066,11 +1065,11 @@ static int CmdEMVExec(const char *Cmd) {
             PrintAndLogEx(NORMAL, "* * Generate challenge");
             res = EMVGenerateChallenge(channel, true, buf, sizeof(buf), &len, &sw, tlvRoot);
             if (res) {
-                PrintAndLogEx(WARNING, "Error GetChallenge. APDU error %4x", sw);
+                PrintAndLogEx(ERR, "Error GetChallenge. APDU error %4x", sw);
                 dreturn(6);
             }
             if (len < 4) {
-                PrintAndLogEx(WARNING, "Error GetChallenge. Wrong challenge length %d", len);
+                PrintAndLogEx(ERR, "Error GetChallenge. Wrong challenge length %d", len);
                 dreturn(6);
             }
 
@@ -1085,7 +1084,7 @@ static int CmdEMVExec(const char *Cmd) {
             PrintAndLogEx(NORMAL, "* * Calc CDOL1");
             struct tlv *cdol_data_tlv = dol_process(tlvdb_get(tlvRoot, 0x8c, NULL), tlvRoot, 0x01); // 0x01 - dummy tag
             if (!cdol_data_tlv) {
-                PrintAndLogEx(WARNING, "Error: can't create CDOL1 TLV.");
+                PrintAndLogEx(ERR, "Error: can't create CDOL1 TLV.");
                 dreturn(6);
             }
 
@@ -1096,7 +1095,7 @@ static int CmdEMVExec(const char *Cmd) {
             res = EMVAC(channel, true, (TrType == TT_CDA) ? EMVAC_TC + EMVAC_CDAREQ : EMVAC_TC, (uint8_t *)cdol_data_tlv->value, cdol_data_tlv->len, buf, sizeof(buf), &len, &sw, tlvRoot);
 
             if (res) {
-                PrintAndLogEx(NORMAL, "AC1 error(%d): %4x. Exit...", res, sw);
+                PrintAndLogEx(ERR, "AC1 error(%d): %4x. Exit...", res, sw);
                 dreturn(7);
             }
 
@@ -1175,7 +1174,7 @@ static int CmdEMVExec(const char *Cmd) {
 
                 struct tlv *udol_data_tlv = dol_process(UDOL ? UDOL : &defUDOL, tlvRoot, 0x01); // 0x01 - dummy tag
                 if (!udol_data_tlv) {
-                    PrintAndLogEx(WARNING, "Error: can't create UDOL TLV.");
+                    PrintAndLogEx(ERR, "Error: can't create UDOL TLV.");
                     dreturn(8);
                 }
 
@@ -1185,7 +1184,7 @@ static int CmdEMVExec(const char *Cmd) {
 
                 res = MSCComputeCryptoChecksum(channel, true, (uint8_t *)udol_data_tlv->value, udol_data_tlv->len, buf, sizeof(buf), &len, &sw, tlvRoot);
                 if (res) {
-                    PrintAndLogEx(WARNING, "Error Compute Crypto Checksum. APDU error %4x", sw);
+                    PrintAndLogEx(ERR, "Error Compute Crypto Checksum. APDU error %4x", sw);
                     free(udol_data_tlv);
                     dreturn(9);
                 }
@@ -1198,7 +1197,7 @@ static int CmdEMVExec(const char *Cmd) {
 
             }
         } else {
-            PrintAndLogEx(WARNING, "Error MSD: Track2 data not found.");
+            PrintAndLogEx(ERR, "Error MSD: Track2 data not found.");
         }
     }
 
@@ -1209,7 +1208,7 @@ static int CmdEMVExec(const char *Cmd) {
         PrintAndLogEx(NORMAL, "* * Calc CDOL1");
         struct tlv *cdol1_data_tlv = dol_process(tlvdb_get(tlvRoot, 0x8c, NULL), tlvRoot, 0x01); // 0x01 - dummy tag
         if (!cdol1_data_tlv) {
-            PrintAndLogEx(WARNING, "Error: can't create CDOL1 TLV.");
+            PrintAndLogEx(ERR, "Error: can't create CDOL1 TLV.");
             dreturn(6);
         }
 
@@ -1220,7 +1219,7 @@ static int CmdEMVExec(const char *Cmd) {
         res = EMVAC(channel, true, (TrType == TT_CDA) ? EMVAC_TC + EMVAC_CDAREQ : EMVAC_TC, (uint8_t *)cdol1_data_tlv->value, cdol1_data_tlv->len, buf, sizeof(buf), &len, &sw, tlvRoot);
 
         if (res) {
-            PrintAndLogEx(NORMAL, "AC1 error(%d): %4x. Exit...", res, sw);
+            PrintAndLogEx(ERR, "AC1 error(%d): %4x. Exit...", res, sw);
             free(cdol1_data_tlv);
             dreturn(7);
         }
@@ -1232,7 +1231,7 @@ static int CmdEMVExec(const char *Cmd) {
         tlvdb_get_uint8(tlvRoot, 0x9f27, &CID);
 
         // AC1 print result
-        PrintAndLog("");
+        PrintAndLogEx(NORMAL, "");
         if ((CID & EMVAC_AC_MASK) == EMVAC_AAC)     PrintAndLogEx(INFO, "AC1 result: AAC (Transaction declined)");
         if ((CID & EMVAC_AC_MASK) == EMVAC_TC)      PrintAndLogEx(INFO, "AC1 result: TC (Transaction approved)");
         if ((CID & EMVAC_AC_MASK) == EMVAC_ARQC)    PrintAndLogEx(INFO, "AC1 result: ARQC (Online authorisation requested)");
@@ -1264,13 +1263,13 @@ static int CmdEMVExec(const char *Cmd) {
                     PrintAndLogEx(NORMAL, "CVR length: %d", CVRlen);
                     PrintAndLogEx(NORMAL, "CVR: %s", sprint_hex(&IAD->value[4], CVRlen));
                 } else {
-                    PrintAndLogEx(NORMAL, "Wrong CVR length! CVR: %s", sprint_hex(&IAD->value[3], VDDlen - 2));
+                    PrintAndLogEx(WARNING, "Wrong CVR length! CVR: %s", sprint_hex(&IAD->value[3], VDDlen - 2));
                 }
             }
             if (IDDlen)
                 PrintAndLogEx(NORMAL, "IDD: %s", sprint_hex(&IAD->value[VDDlen + 1], IDDlen));
         } else {
-            PrintAndLogEx(NORMAL, "Issuer Application Data (IAD) not found.");
+            PrintAndLogEx(WARNING, "Issuer Application Data (IAD) not found.");
         }
 
         PrintAndLogEx(NORMAL, "\n* * Processing online request");
@@ -1278,7 +1277,9 @@ static int CmdEMVExec(const char *Cmd) {
         // authorization response code from acquirer
         const char HostResponse[] = "00"; // 0x3030
         size_t HostResponseLen = sizeof(HostResponse) - 1;
+        
         PrintAndLogEx(NORMAL, "Host Response: `%s`", HostResponse);
+        
         tlvdb_change_or_add_node(tlvRoot, 0x8a, HostResponseLen, (const unsigned char *)HostResponse);
 
         if (CryptoVersion == 10) {
@@ -1300,30 +1301,23 @@ static int CmdEMVExec(const char *Cmd) {
                 PrintAndLogEx(NORMAL, "ARPC: n/a");
 
             } else {
-                PrintAndLogEx(NORMAL, "Application Cryptogram (AC) not found.");
+                PrintAndLogEx(WARNING, "Application Cryptogram (AC) not found.");
             }
-
             // here must be external authenticate, but we dont know ARPC
-
         }
 
-
         // needs to send AC2 command (res == ARQC)
         if ((CID & EMVAC_AC_MASK) == EMVAC_ARQC) {
             PrintAndLogEx(NORMAL, "\n* * Calc CDOL2");
             struct tlv *cdol2_data_tlv = dol_process(tlvdb_get(tlvRoot, 0x8d, NULL), tlvRoot, 0x01); // 0x01 - dummy tag
             if (!cdol2_data_tlv) {
-                PrintAndLogEx(WARNING, "Error: can't create CDOL2 TLV.");
+                PrintAndLogEx(ERR, "Error: can't create CDOL2 TLV.");
                 dreturn(6);
             }
 
             PrintAndLogEx(NORMAL, "CDOL2 data[%d]: %s", cdol2_data_tlv->len, sprint_hex(cdol2_data_tlv->value, cdol2_data_tlv->len));
-
             //PrintAndLogEx(NORMAL, "* * AC2");
-
-
             // here must be AC2, but we dont make external authenticate (
-
             /*          // AC2
                         PRINT_INDENT(level);
                         if ((CID & EMVAC_AC2_MASK) == EMVAC_AAC2)     fprintf(f, "\tAC2: AAC (Transaction declined)\n");
@@ -1332,7 +1326,6 @@ static int CmdEMVExec(const char *Cmd) {
                         if ((CID & EMVAC_AC2_MASK) == EMVAC_AC2_MASK) fprintf(f, "\tAC2: RFU\n");
             */
         }
-
     }
 
     DropFieldEx(channel);
@@ -1409,7 +1402,7 @@ static int CmdEMVScan(const char *Cmd) {
 #ifndef WITH_SMARTCARD
     // not compiled with smartcard functionality,  we need to exit
     if (channel == ECC_CONTACT) {
-        PrintAndLogEx(WARNING, "PM3 Client is not compiled with support for SMARTCARD. Exiting.");
+        PrintAndLogEx(ERR, "PM3 Client is not compiled with support for SMARTCARD. Exiting.");
         return 0;
     }
 #endif
@@ -1652,7 +1645,7 @@ static int CmdEMVScan(const char *Cmd) {
 
                 if (decodeTLV) {
                     TLVPrintFromBuffer(buf, len);
-                    PrintAndLog("");
+                    PrintAndLogEx(NORMAL, "");
                 }
 
                 json_t *jsonelm = json_object();
@@ -1692,7 +1685,7 @@ static int CmdEMVScan(const char *Cmd) {
         PrintAndLogEx(ERR, "Can't save the file: %s", fname);
         return 200;
     }
-    PrintAndLogEx(SUCCESS, "File `%s` saved.", fname);
+    PrintAndLogEx(SUCCESS, "File " _YELLOW_("`%s`") " saved.", fname);
 
     // free json object
     json_decref(root);
@@ -1807,7 +1800,7 @@ static int CmdEMVRoca(const char *Cmd) {
         return 5;
     }
 
-    PrintAndLog("\n* Init transaction parameters.");
+    PrintAndLogEx(NORMAL, "\n* Init transaction parameters.");
     InitTransactionParameters(tlvRoot, true, TT_QVSDCMCHIP, false);
 
     PrintAndLogEx(NORMAL, "-->Calc PDOL.");

From 72f6ba712a60a32813562259c464eca496daf775 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 17 Apr 2019 14:01:05 +0200
Subject: [PATCH 1303/1938] textual

---
 client/emv/cmdemv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index fe6dc79c0..879d53c92 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -46,7 +46,7 @@ static void ParamLoadDefaults(struct tlvdb *tlvRoot) {
 static void PrintChannel(EMVCommandChannel channel) {
     switch (channel) {
         case ECC_CONTACTLESS:
-            PrintAndLogEx(INFO, "Channel: CONTACTLESS (RFID)");
+            PrintAndLogEx(INFO, "Channel: CONTACTLESS (T=CL)");
             break;
         case ECC_CONTACT:
             PrintAndLogEx(INFO, "Channel: CONTACT");

From f5b7371d7c49c8f841ff6487424c0c2707cab810 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 17 Apr 2019 14:33:09 +0200
Subject: [PATCH 1304/1938] fix

---
 client/cmdhffido.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index 79aaebef2..f834fd32c 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -75,7 +75,7 @@ static int CmdHFFidoInfo(const char *cmd) {
         if (sw)
             PrintAndLogEx(INFO, "Not a FIDO card! APDU response: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
         else
-            PrintAndLogEx(ERROR, "APDU exchange error. Card returns 0x0000.");
+            PrintAndLogEx(ERR, "APDU exchange error. Card returns 0x0000.");
 
         DropField();
         return 0;

From 2044fd4130edc868d99a6252658d46dd86dc50f2 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 17 Apr 2019 14:35:22 +0200
Subject: [PATCH 1305/1938] fix memleak

---
 client/tinycbor/open_memstream.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/tinycbor/open_memstream.c b/client/tinycbor/open_memstream.c
index 899f3b172..0085641f9 100644
--- a/client/tinycbor/open_memstream.c
+++ b/client/tinycbor/open_memstream.c
@@ -66,8 +66,10 @@ static RetType write_to_buffer(void *cookie, const char *data, LenType len) {
         // make room
         size_t newalloc = newsize + newsize / 2 + 1;    // give 50% more room
         ptr = realloc(ptr, newalloc);
-        if (ptr == NULL)
+        if (ptr == NULL) {
+            free(ptr);
             return -1;
+        )
         b->alloc = newalloc;
         *b->ptr = ptr;
     }

From e0bd6b2019932538eaf1c83939117e066dcc55ce Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 17 Apr 2019 14:39:47 +0200
Subject: [PATCH 1306/1938] another fix

---
 client/tinycbor/open_memstream.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/client/tinycbor/open_memstream.c b/client/tinycbor/open_memstream.c
index 0085641f9..043079143 100644
--- a/client/tinycbor/open_memstream.c
+++ b/client/tinycbor/open_memstream.c
@@ -65,11 +65,15 @@ static RetType write_to_buffer(void *cookie, const char *data, LenType len) {
     if (newsize >= b->alloc) { // NB! one extra byte is needed to avoid buffer overflow at close_buffer
         // make room
         size_t newalloc = newsize + newsize / 2 + 1;    // give 50% more room
-        ptr = realloc(ptr, newalloc);
-        if (ptr == NULL) {
+        
+        char *tmp = realloc(ptr, newalloc);
+        if ( tmp == NULL ) {
             free(ptr);
             return -1;
-        )
+        } else {
+            ptr = tmp;
+        }
+        
         b->alloc = newalloc;
         *b->ptr = ptr;
     }

From 524346901a4aeec05288f9640c5e427c3d63acd9 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 17 Apr 2019 14:48:32 +0200
Subject: [PATCH 1307/1938] test fixes

---
 client/emv/cmdemv.c          |  2 +-
 client/emv/crypto_polarssl.c | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index 879d53c92..041ad73ee 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -287,7 +287,7 @@ static int CmdEMVGPO(const char *Cmd) {
         PrintAndLogEx(ERR, "Can't create PDOL data.");
         tlvdb_free(tmp_ext);
         tlvdb_free(tlvRoot);
-        free(pdol_data_tlv);
+        free(data_tlv);
         return 4;
     }
     PrintAndLogEx(INFO, "PDOL data[%d]: %s", pdol_data_tlv_data_len, sprint_hex(pdol_data_tlv_data, pdol_data_tlv_data_len));
diff --git a/client/emv/crypto_polarssl.c b/client/emv/crypto_polarssl.c
index ff5a867a9..7882790d0 100644
--- a/client/emv/crypto_polarssl.c
+++ b/client/emv/crypto_polarssl.c
@@ -253,20 +253,29 @@ static size_t crypto_pk_polarssl_get_nbits(const struct crypto_pk *_cp) {
 static unsigned char *crypto_pk_polarssl_get_parameter(const struct crypto_pk *_cp, unsigned param, size_t *plen) {
     struct crypto_pk_polarssl *cp = (struct crypto_pk_polarssl *)_cp;
     unsigned char *result = NULL;
+    int res;    
     switch (param) {
         // mod
         case 0:
             *plen = mbedtls_mpi_size(&cp->ctx.N);
             result = malloc(*plen);
             memset(result, 0x00, *plen);
-            mbedtls_mpi_write_binary(&cp->ctx.N, result, *plen);
+            res = mbedtls_mpi_write_binary(&cp->ctx.N, result, *plen);
+            if ( res == 0 ) {
+                printf("Error write_binary.");
+                result = 0;
+            }            
             break;
         // exp
         case 1:
             *plen = mbedtls_mpi_size(&cp->ctx.E);
             result = malloc(*plen);
             memset(result, 0x00, *plen);
-            mbedtls_mpi_write_binary(&cp->ctx.E, result, *plen);
+            res = mbedtls_mpi_write_binary(&cp->ctx.E, result, *plen);
+            if ( res == 0 ) {
+                printf("Error write_binary.");
+                result = 0;                
+            }
             break;
         default:
             printf("Error get parameter. Param = %u", param);

From da2aa2c55fb7bfca0e0c75ff91775456ae4edea0 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 17 Apr 2019 14:50:07 +0200
Subject: [PATCH 1308/1938] test fix

---
 client/emv/cmdemv.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index 041ad73ee..c3d569b42 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -287,7 +287,8 @@ static int CmdEMVGPO(const char *Cmd) {
         PrintAndLogEx(ERR, "Can't create PDOL data.");
         tlvdb_free(tmp_ext);
         tlvdb_free(tlvRoot);
-        free(data_tlv);
+        if ( pdol_data_tlv != &data_tlv);
+            free(pdol_data_tlv);
         return 4;
     }
     PrintAndLogEx(INFO, "PDOL data[%d]: %s", pdol_data_tlv_data_len, sprint_hex(pdol_data_tlv_data, pdol_data_tlv_data_len));

From 1ee3679a98163e5746af06aca2e9b12c3e97bb44 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 17 Apr 2019 14:54:42 +0200
Subject: [PATCH 1309/1938] style

---
 armsrc/fpgaloader.c              | 30 +++++++++++------------
 armsrc/mifaresim.c               | 42 ++++++++++++--------------------
 client/comms.c                   |  4 +--
 client/emv/cmdemv.c              |  8 +++---
 client/emv/crypto_polarssl.c     | 10 ++++----
 client/tinycbor/open_memstream.c |  6 ++---
 6 files changed, 45 insertions(+), 55 deletions(-)

diff --git a/armsrc/fpgaloader.c b/armsrc/fpgaloader.c
index b7554f6a0..1be2c6138 100644
--- a/armsrc/fpgaloader.c
+++ b/armsrc/fpgaloader.c
@@ -451,23 +451,23 @@ void FpgaWriteConfWord(uint8_t v) {
 void SetAdcMuxFor(uint32_t whichGpio) {
 
 #ifndef WITH_FPC
-        // When compiled without FPC support
-        AT91C_BASE_PIOA->PIO_OER =
-            GPIO_MUXSEL_HIPKD |
-            GPIO_MUXSEL_LOPKD |
-            GPIO_MUXSEL_LORAW |
-            GPIO_MUXSEL_HIRAW;
+    // When compiled without FPC support
+    AT91C_BASE_PIOA->PIO_OER =
+        GPIO_MUXSEL_HIPKD |
+        GPIO_MUXSEL_LOPKD |
+        GPIO_MUXSEL_LORAW |
+        GPIO_MUXSEL_HIRAW;
 
-        AT91C_BASE_PIOA->PIO_PER =
-            GPIO_MUXSEL_HIPKD |
-            GPIO_MUXSEL_LOPKD |
-            GPIO_MUXSEL_LORAW |
-            GPIO_MUXSEL_HIRAW;
+    AT91C_BASE_PIOA->PIO_PER =
+        GPIO_MUXSEL_HIPKD |
+        GPIO_MUXSEL_LOPKD |
+        GPIO_MUXSEL_LORAW |
+        GPIO_MUXSEL_HIRAW;
 
-        LOW(GPIO_MUXSEL_HIPKD);
-        LOW(GPIO_MUXSEL_LOPKD);
-        LOW(GPIO_MUXSEL_HIRAW);
-        LOW(GPIO_MUXSEL_LORAW);
+    LOW(GPIO_MUXSEL_HIPKD);
+    LOW(GPIO_MUXSEL_LOPKD);
+    LOW(GPIO_MUXSEL_HIRAW);
+    LOW(GPIO_MUXSEL_LORAW);
 
 #else
     // FPC serial uses HIRAW/LOWRAW pins, so they are excluded here.
diff --git a/armsrc/mifaresim.c b/armsrc/mifaresim.c
index 9d66997a5..2ab779a2a 100644
--- a/armsrc/mifaresim.c
+++ b/armsrc/mifaresim.c
@@ -172,9 +172,9 @@ static bool MifareSimInit(uint16_t flags, uint8_t *datain, tag_response_info_t *
     static uint8_t rSAK[]      = {0x00, 0x00, 0x00};       // Current SAK, CRC
     static uint8_t rSAKuid[]   = {0x04, 0xda, 0x17};       // UID incomplete cascade bit, CRC
 
-    // RATS answer for 2K NXP mifare classic (with CRC) 
+    // RATS answer for 2K NXP mifare classic (with CRC)
     static uint8_t rRATS[]     = {0x0c, 0x75, 0x77, 0x80, 0x02, 0xc1, 0x05, 0x2f, 0x2f, 0x01, 0xbc, 0xd6, 0x60, 0xd3};
-    
+
     *uid_len = 0;
 
     // By default use 1K tag
@@ -184,7 +184,7 @@ static bool MifareSimInit(uint16_t flags, uint8_t *datain, tag_response_info_t *
     //by default RATS not supported
     *rats_len = 0;
     *rats = NULL;
-    
+
     // -- Determine the UID
     // Can be set from emulator memory or incoming data
     // Length: 4,7,or 10 bytes
@@ -197,23 +197,21 @@ static bool MifareSimInit(uint16_t flags, uint8_t *datain, tag_response_info_t *
         // If uid size defined, copy only uid from EMUL to use, backward compatibility for 'hf_colin.c', 'hf_mattyrun.c'
         if ((flags & (FLAG_4B_UID_IN_DATA | FLAG_7B_UID_IN_DATA | FLAG_10B_UID_IN_DATA)) != 0) {
             memcpy(datain, block0, 10);  // load 10bytes from EMUL to the datain pointer. to be used below.
-        }
-        else {
+        } else {
             // Check for 4 bytes uid: bcc corrected and single size uid bits in ATQA
             if ((block0[0] ^ block0[1] ^ block0[2] ^ block0[3]) == block0[4] && (block0[6] & 0xc0) == 0) {
                 flags |= FLAG_4B_UID_IN_DATA;
-                memcpy(datain, block0, 4); 
+                memcpy(datain, block0, 4);
                 rSAK[0] = block0[5];
                 memcpy(rATQA, &block0[6], sizeof(rATQA));
             }
             // Check for 7 bytes UID: double size uid bits in ATQA
             else if ((block0[8] & 0xc0) == 0x40) {
                 flags |= FLAG_7B_UID_IN_DATA;
-                memcpy(datain, block0, 7); 
+                memcpy(datain, block0, 7);
                 rSAK[0] = block0[7];
                 memcpy(rATQA, &block0[8], sizeof(rATQA));
-            }
-            else {
+            } else {
                 Dbprintf("[-] ERROR: Invalid dump. UID/SAK/ATQA not found");
                 return false;
             }
@@ -227,20 +225,17 @@ static bool MifareSimInit(uint16_t flags, uint8_t *datain, tag_response_info_t *
         memcpy(rATQA, rATQA_Mini, sizeof(rATQA));
         rSAK[0] = rSAK_Mini;
         Dbprintf("Mifare Mini");
-    }
-    else if ((flags & FLAG_MF_1K) == FLAG_MF_1K) {
+    } else if ((flags & FLAG_MF_1K) == FLAG_MF_1K) {
         memcpy(rATQA, rATQA_1k, sizeof(rATQA));
         rSAK[0] = rSAK_1k;
         Dbprintf("Mifare 1K");
-    }
-    else if ((flags & FLAG_MF_2K) == FLAG_MF_2K) {
+    } else if ((flags & FLAG_MF_2K) == FLAG_MF_2K) {
         memcpy(rATQA, rATQA_2k, sizeof(rATQA));
         rSAK[0] = rSAK_2k;
         *rats = rRATS;
         *rats_len = sizeof(rRATS);
         Dbprintf("Mifare 2K with RATS support");
-    }
-    else if ((flags & FLAG_MF_4K) == FLAG_MF_4K) {
+    } else if ((flags & FLAG_MF_4K) == FLAG_MF_4K) {
         memcpy(rATQA, rATQA_4k, sizeof(rATQA));
         rSAK[0] = rSAK_4k;
         Dbprintf("Mifare 4K");
@@ -312,8 +307,7 @@ static bool MifareSimInit(uint16_t flags, uint8_t *datain, tag_response_info_t *
 
         // Correct uid size bits in ATQA
         rATQA[0] = (rATQA[0] & 0x3f) | 0x80; // triple size uid
-    }
-    else {
+    } else {
         Dbprintf("[-] ERROR: UID size not defined");
         return false;
     }
@@ -948,18 +942,16 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                             memcpy(response, rats, rats_len);
                             mf_crypto1_encrypt(pcs, response, rats_len, response_par);
                             EmSendCmdPar(response, rats_len, response_par);
-                        }
-                        else
+                        } else
                             EmSendCmd(rats, rats_len);
                         if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("[MFEMUL_WORK] RCV RATS => ACK");
-                    }
-                    else {
+                    } else {
                         EmSend4bit(encrypted_data ? mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA) : CARD_NACK_NA);
                         if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("[MFEMUL_WORK] RCV RATS => NACK");
                     }
                     break;
                 }
-                
+
                 // case MFEMUL_WORK => ISO14443A_CMD_NXP_DESELECT
                 if (receivedCmd_len == 3 && receivedCmd_dec[0] == ISO14443A_CMD_NXP_DESELECT) {
                     if (rats && rats_len) {
@@ -968,12 +960,10 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
                             memcpy(response, receivedCmd_dec, receivedCmd_len);
                             mf_crypto1_encrypt(pcs, response, receivedCmd_len, response_par);
                             EmSendCmdPar(response, receivedCmd_len, response_par);
-                        }
-                        else
+                        } else
                             EmSendCmd(receivedCmd_dec, receivedCmd_len);
                         if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("[MFEMUL_WORK] RCV NXP DESELECT => ACK");
-                    }
-                    else {
+                    } else {
                         EmSend4bit(encrypted_data ? mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA) : CARD_NACK_NA);
                         if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("[MFEMUL_WORK] RCV NXP DESELECT => NACK");
                     }
diff --git a/client/comms.c b/client/comms.c
index 546594c92..c6526f881 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -59,7 +59,7 @@ void SendCommand(UsbCommand *c) {
 #endif
 
     if (offline) {
-        PrintAndLogEx(WARNING, "Sending bytes to Proxmark3 failed." _YELLOW_("offline") );
+        PrintAndLogEx(WARNING, "Sending bytes to Proxmark3 failed." _YELLOW_("offline"));
         return;
     }
 
@@ -275,7 +275,7 @@ __attribute__((force_align_arg_pointer))
         if (txBuffer_pending) {
             if (!uart_send(sp, (uint8_t *) &txBuffer, sizeof(UsbCommand))) {
                 //counter_to_offline++;
-                PrintAndLogEx(WARNING, "sending bytes to Proxmark3 device" _RED_("failed") );
+                PrintAndLogEx(WARNING, "sending bytes to Proxmark3 device" _RED_("failed"));
             }
             txBuffer_pending = false;
 
diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index c3d569b42..2fceab02b 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -287,8 +287,8 @@ static int CmdEMVGPO(const char *Cmd) {
         PrintAndLogEx(ERR, "Can't create PDOL data.");
         tlvdb_free(tmp_ext);
         tlvdb_free(tlvRoot);
-        if ( pdol_data_tlv != &data_tlv);
-            free(pdol_data_tlv);
+        if (pdol_data_tlv != &data_tlv);
+        free(pdol_data_tlv);
         return 4;
     }
     PrintAndLogEx(INFO, "PDOL data[%d]: %s", pdol_data_tlv_data_len, sprint_hex(pdol_data_tlv_data, pdol_data_tlv_data_len));
@@ -1278,9 +1278,9 @@ static int CmdEMVExec(const char *Cmd) {
         // authorization response code from acquirer
         const char HostResponse[] = "00"; // 0x3030
         size_t HostResponseLen = sizeof(HostResponse) - 1;
-        
+
         PrintAndLogEx(NORMAL, "Host Response: `%s`", HostResponse);
-        
+
         tlvdb_change_or_add_node(tlvRoot, 0x8a, HostResponseLen, (const unsigned char *)HostResponse);
 
         if (CryptoVersion == 10) {
diff --git a/client/emv/crypto_polarssl.c b/client/emv/crypto_polarssl.c
index 7882790d0..bee81a797 100644
--- a/client/emv/crypto_polarssl.c
+++ b/client/emv/crypto_polarssl.c
@@ -253,7 +253,7 @@ static size_t crypto_pk_polarssl_get_nbits(const struct crypto_pk *_cp) {
 static unsigned char *crypto_pk_polarssl_get_parameter(const struct crypto_pk *_cp, unsigned param, size_t *plen) {
     struct crypto_pk_polarssl *cp = (struct crypto_pk_polarssl *)_cp;
     unsigned char *result = NULL;
-    int res;    
+    int res;
     switch (param) {
         // mod
         case 0:
@@ -261,10 +261,10 @@ static unsigned char *crypto_pk_polarssl_get_parameter(const struct crypto_pk *_
             result = malloc(*plen);
             memset(result, 0x00, *plen);
             res = mbedtls_mpi_write_binary(&cp->ctx.N, result, *plen);
-            if ( res == 0 ) {
+            if (res == 0) {
                 printf("Error write_binary.");
                 result = 0;
-            }            
+            }
             break;
         // exp
         case 1:
@@ -272,9 +272,9 @@ static unsigned char *crypto_pk_polarssl_get_parameter(const struct crypto_pk *_
             result = malloc(*plen);
             memset(result, 0x00, *plen);
             res = mbedtls_mpi_write_binary(&cp->ctx.E, result, *plen);
-            if ( res == 0 ) {
+            if (res == 0) {
                 printf("Error write_binary.");
-                result = 0;                
+                result = 0;
             }
             break;
         default:
diff --git a/client/tinycbor/open_memstream.c b/client/tinycbor/open_memstream.c
index 043079143..199832461 100644
--- a/client/tinycbor/open_memstream.c
+++ b/client/tinycbor/open_memstream.c
@@ -65,15 +65,15 @@ static RetType write_to_buffer(void *cookie, const char *data, LenType len) {
     if (newsize >= b->alloc) { // NB! one extra byte is needed to avoid buffer overflow at close_buffer
         // make room
         size_t newalloc = newsize + newsize / 2 + 1;    // give 50% more room
-        
+
         char *tmp = realloc(ptr, newalloc);
-        if ( tmp == NULL ) {
+        if (tmp == NULL) {
             free(ptr);
             return -1;
         } else {
             ptr = tmp;
         }
-        
+
         b->alloc = newalloc;
         *b->ptr = ptr;
     }

From 3207aaea671e2fc547f616c20c292c800fc66dae Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 17 Apr 2019 14:57:21 +0200
Subject: [PATCH 1310/1938] style

---
 client/cmdcrc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdcrc.c b/client/cmdcrc.c
index cebd292b8..8e3d9bba1 100644
--- a/client/cmdcrc.c
+++ b/client/cmdcrc.c
@@ -396,7 +396,7 @@ static int CmdrevengSearch(const char *Cmd) {
     uint8_t width[NMODELS] = {0};
     int count = 0;
 
-    uint8_t crcChars = 0;
+    uint8_t crcChars;
     char result[30];
     char revResult[30];
     int ans = GetModels(Models, &count, width);

From 6e803aa5ba446cf7fcf76856adf3b900a212d3b1 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 17 Apr 2019 16:20:39 +0300
Subject: [PATCH 1311/1938] add dlls to release

---
 appveyor.yml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/appveyor.yml b/appveyor.yml
index d3d255192..08c1026ab 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -160,6 +160,21 @@ build_script:
     Copy-Item C:\ProxSpace\pm3\client\hardnested\*.bin C:\ProxSpace\Release\hardnested
 
     Copy-Item C:\ProxSpace\pm3\client\hardnested\tables\*.bin.z C:\ProxSpace\Release\hardnested\tables
+    
+    # dll files
+    Copy-Item C:\ProxSpace\msys2\mingw32\bin\libgcc_s_dw2-1.dll C:\ProxSpace\Release
+
+    Copy-Item C:\ProxSpace\msys2\mingw32\bin\libstdc++-6.dll C:\ProxSpace\Release
+
+    Copy-Item C:\ProxSpace\msys2\mingw32\bin\libwinpthread-1.dll C:\ProxSpace\Release
+
+    Copy-Item C:\ProxSpace\msys2\mingw32\bin\Qt5Core.dll C:\ProxSpace\Release
+
+    Copy-Item C:\ProxSpace\msys2\mingw32\bin\Qt5Gui.dll C:\ProxSpace\Release
+
+    Copy-Item C:\ProxSpace\msys2\mingw32\bin\Qt5Widgets.dll C:\ProxSpace\Release
+
+    #Copy-Item C:\ProxSpace\msys2\mingw32\bin\readline6.dll C:\ProxSpace\Release
 
     Write-Host "[ OK ]" -ForegroundColor Green
 

From ec7ab1a4ed45669e215ad4ffe058d127b38c9207 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 17 Apr 2019 16:52:58 +0200
Subject: [PATCH 1312/1938] fix:
 https://github.com/RfidResearchGroup/proxmark3/issues/166

---
 client/emv/crypto_polarssl.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/emv/crypto_polarssl.c b/client/emv/crypto_polarssl.c
index bee81a797..13f093aa4 100644
--- a/client/emv/crypto_polarssl.c
+++ b/client/emv/crypto_polarssl.c
@@ -261,7 +261,7 @@ static unsigned char *crypto_pk_polarssl_get_parameter(const struct crypto_pk *_
             result = malloc(*plen);
             memset(result, 0x00, *plen);
             res = mbedtls_mpi_write_binary(&cp->ctx.N, result, *plen);
-            if (res == 0) {
+            if (res < 0) {
                 printf("Error write_binary.");
                 result = 0;
             }
@@ -272,7 +272,7 @@ static unsigned char *crypto_pk_polarssl_get_parameter(const struct crypto_pk *_
             result = malloc(*plen);
             memset(result, 0x00, *plen);
             res = mbedtls_mpi_write_binary(&cp->ctx.E, result, *plen);
-            if (res == 0) {
+            if (res < 0) {
                 printf("Error write_binary.");
                 result = 0;
             }

From 853d2e14e6bb9177b5198f9fec1d2fb085a36c89 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 17 Apr 2019 16:53:28 +0200
Subject: [PATCH 1313/1938] null term?

---
 client/jansson/error.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/jansson/error.c b/client/jansson/error.c
index fd2557367..06dc837ec 100644
--- a/client/jansson/error.c
+++ b/client/jansson/error.c
@@ -22,7 +22,7 @@ void jsonp_error_set_source(json_error_t *error, const char *source) {
 
     length = strlen(source);
     if (length < JSON_ERROR_SOURCE_LENGTH) {
-        strncpy(error->source, source, JSON_ERROR_SOURCE_LENGTH);
+        strncpy(error->source, source, JSON_ERROR_SOURCE_LENGTH - 1);
     } else {
         size_t extra = length - JSON_ERROR_SOURCE_LENGTH + 4;
         memcpy(error->source, "...", 3);

From b574db169e6cdf7d118520f431394b91f9d88dc3 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 17 Apr 2019 16:56:52 +0200
Subject: [PATCH 1314/1938] textual

---
 client/emv/emv_roca.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/emv/emv_roca.c b/client/emv/emv_roca.c
index a189fdd70..13428826a 100644
--- a/client/emv/emv_roca.c
+++ b/client/emv/emv_roca.c
@@ -152,10 +152,10 @@ int roca_self_test(void) {
 
 
     if (emv_rocacheck(keyp, 64, false)) {
-        PrintAndLogEx(SUCCESS, "Weak modulus [ %s]", _GREEN_("PASS"));
+        PrintAndLogEx(SUCCESS, "Weak modulus   [ %s]", _GREEN_("PASS"));
     } else {
         ret++;
-        PrintAndLogEx(FAILED, "Weak modulus [ %s]", _RED_("Fail"));
+        PrintAndLogEx(FAILED, "Weak modulus   [ %s]", _RED_("Fail"));
     }
 
     // negative

From c48b16100f3b15e34438fcc89ceef55591936a48 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 17 Apr 2019 18:40:19 +0300
Subject: [PATCH 1315/1938] rdp

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 08c1026ab..907c48328 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -335,4 +335,4 @@ on_success:
 on_failure:
 - ps: Write-Host "Build error." -ForegroundColor Red
 on_finish:
-- ps: $blockRdp = $false; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))

From b1841f1d24fd1d8f210971618a14cc03030068f4 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 17 Apr 2019 19:16:10 +0300
Subject: [PATCH 1316/1938] add readline and small fix

---
 appveyor.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 907c48328..0e6f1054e 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -162,6 +162,7 @@ build_script:
     Copy-Item C:\ProxSpace\pm3\client\hardnested\tables\*.bin.z C:\ProxSpace\Release\hardnested\tables
     
     # dll files
+
     Copy-Item C:\ProxSpace\msys2\mingw32\bin\libgcc_s_dw2-1.dll C:\ProxSpace\Release
 
     Copy-Item C:\ProxSpace\msys2\mingw32\bin\libstdc++-6.dll C:\ProxSpace\Release
@@ -174,7 +175,7 @@ build_script:
 
     Copy-Item C:\ProxSpace\msys2\mingw32\bin\Qt5Widgets.dll C:\ProxSpace\Release
 
-    #Copy-Item C:\ProxSpace\msys2\mingw32\bin\readline6.dll C:\ProxSpace\Release
+    Copy-Item C:\ProxSpace\msys2\mingw32\bin\libreadline6.dll C:\ProxSpace\Release
 
     Write-Host "[ OK ]" -ForegroundColor Green
 
@@ -335,4 +336,4 @@ on_success:
 on_failure:
 - ps: Write-Host "Build error." -ForegroundColor Red
 on_finish:
-- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+- ps: $blockRdp = $false; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))

From 34c51c5632089240dd374c0beab33857a9161bfa Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 17 Apr 2019 19:37:11 +0300
Subject: [PATCH 1317/1938] add termcap

---
 appveyor.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/appveyor.yml b/appveyor.yml
index 0e6f1054e..baaab1dec 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -177,6 +177,8 @@ build_script:
 
     Copy-Item C:\ProxSpace\msys2\mingw32\bin\libreadline6.dll C:\ProxSpace\Release
 
+    Copy-Item C:\ProxSpace\msys2\mingw32\bin\libtermcap-0.dll C:\ProxSpace\Release
+
     Write-Host "[ OK ]" -ForegroundColor Green
 
 

From 44416b722e47bfdcca41ba1f26f913a70ed79efd Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 17 Apr 2019 19:42:10 +0300
Subject: [PATCH 1318/1938] small fix

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index baaab1dec..7718b0743 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -175,7 +175,7 @@ build_script:
 
     Copy-Item C:\ProxSpace\msys2\mingw32\bin\Qt5Widgets.dll C:\ProxSpace\Release
 
-    Copy-Item C:\ProxSpace\msys2\mingw32\bin\libreadline6.dll C:\ProxSpace\Release
+    Copy-Item C:\ProxSpace\msys2\mingw32\bin\libreadline*.dll C:\ProxSpace\Release
 
     Copy-Item C:\ProxSpace\msys2\mingw32\bin\libtermcap-0.dll C:\ProxSpace\Release
 

From 557aa984d4d6a55ae5da215e0d4a9bb9bd1e058d Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 17 Apr 2019 19:53:58 +0300
Subject: [PATCH 1319/1938] timeout fix

---
 appveyor.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 7718b0743..3b937c197 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -274,8 +274,8 @@ test_script:
     #--- end Job
 
       [bool]$res=$false
-      # Wait 120 sec timeout for Job
-      if(Wait-Job $Job -Timeout 150){
+      # Wait 180 sec timeout for Job
+      if(Wait-Job $Job -Timeout 180){
         $Results = $Job | Receive-Job
         if($Results -like "true"){
           $res=$true

From 2783ba7583c689bbdf36b56e96b6f7d9d85cad10 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 17 Apr 2019 19:48:29 +0200
Subject: [PATCH 1320/1938] style redundant assignment

---
 client/cmdlfem4x.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 5d22cb8ad..dd0ab7de1 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -856,9 +856,7 @@ int EM4x50Read(const char *Cmd, bool verbose) {
         phaseoff = 0;
 
     // now do it again to find the end
-    end = skip;
     for (i += 3; i < j - 4 ; ++i) {
-        end += tmpbuff[i];
         if (tmpbuff[i] >= clk * 3 - tol && tmpbuff[i] <= clk * 3 + tol)  //3 clocks
             if (tmpbuff[i + 1] >= clk * 2 - tol && tmpbuff[i + 1] <= clk * 2 + tol) //2 clocks
                 if (tmpbuff[i + 2] >= clk * 3 - tol && tmpbuff[i + 2] <= clk * 3 + tol) //3 clocks

From 587d826f84c85cf891ed371d8f8c205d3ca73deb Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 17 Apr 2019 20:36:10 +0200
Subject: [PATCH 1321/1938] textual

---
 client/cmdhfmf.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 3d8ad1957..117b332bc 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -64,14 +64,14 @@ static int usage_hf14_mifare(void) {
     PrintAndLogEx(NORMAL, "           hf mf darkside 16 B");
     return 0;
 }
-static int usage_hf14_mf1ksim(void) {
+static int usage_hf14_mfsim(void) {
     PrintAndLogEx(NORMAL, "Usage:  hf mf sim [h] u <uid> n <numreads> [i] [x] [e] [v]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "      h    this help");
     PrintAndLogEx(NORMAL, "      u    (Optional) UID 4,7 or 10bytes. If not specified, the UID 4b from emulator memory will be used");
     PrintAndLogEx(NORMAL, "      t    (Optional)   0 = MIFARE Mini");
     PrintAndLogEx(NORMAL, "                        1 = MIFARE Classic 1k (Default)");
-    PrintAndLogEx(NORMAL, "                        1 = MIFARE Classic 2k");
+    PrintAndLogEx(NORMAL, "                        1 = MIFARE Classic 2k plus in SL0 mode");
     PrintAndLogEx(NORMAL, "                        4 = MIFARE Classic 4k");
     PrintAndLogEx(NORMAL, "      n    (Optional) Automatically exit simulation after <numreads> blocks have been read by reader. 0 = infinite");
     PrintAndLogEx(NORMAL, "      i    (Optional) Interactive, means that console will not be returned until simulation finishes or is aborted");
@@ -2136,7 +2136,7 @@ void readerAttack(nonces_t data, bool setEmulatorMem, bool verbose) {
     }
 }
 
-static int CmdHF14AMf1kSim(const char *Cmd) {
+static int CmdHF14AMfSim(const char *Cmd) {
 
     uint8_t uid[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
     uint8_t exitAfterNReads = 0;
@@ -2153,7 +2153,7 @@ static int CmdHF14AMf1kSim(const char *Cmd) {
                 cmdp++;
                 break;
             case 'h':
-                return usage_hf14_mf1ksim();
+                return usage_hf14_mfsim();
             case 'i':
                 flags |= FLAG_INTERACTIVE;
                 cmdp++;
@@ -2200,7 +2200,7 @@ static int CmdHF14AMf1kSim(const char *Cmd) {
                         flags |= FLAG_4B_UID_IN_DATA;
                         break;
                     default:
-                        return usage_hf14_mf1ksim();
+                        return usage_hf14_mfsim();
                 }
                 cmdp += 2;
                 break;
@@ -2219,7 +2219,7 @@ static int CmdHF14AMf1kSim(const char *Cmd) {
         }
     }
     //Validations
-    if (errors) return usage_hf14_mf1ksim();
+    if (errors) return usage_hf14_mfsim();
 
     // Use UID, SAK, ATQA from EMUL, if uid not defined
     if ((flags & (FLAG_4B_UID_IN_DATA | FLAG_7B_UID_IN_DATA | FLAG_10B_UID_IN_DATA)) == 0)
@@ -3554,7 +3554,7 @@ static command_t CommandTable[] = {
     {"auth4",       CmdHF14AMfAuth4,        0, "ISO14443-4 AES authentication"},
 //    {"sniff",       CmdHF14AMfSniff,        0, "Sniff card-reader communication"},
     {"-----------", CmdHelp,                0, ""},
-    {"sim",         CmdHF14AMf1kSim,        0, "Simulate MIFARE card"},
+    {"sim",         CmdHF14AMfSim,        0, "Simulate MIFARE card"},
     {"eclr",        CmdHF14AMfEClear,       0, "Clear simulator memory block"},
     {"eget",        CmdHF14AMfEGet,         0, "Get simulator memory block"},
     {"eset",        CmdHF14AMfESet,         0, "Set simulator memory block"},

From be15ad7fecdd401b3f6a8f1f7def49ae96cff5e3 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 17 Apr 2019 21:30:01 +0200
Subject: [PATCH 1322/1938] Viva la revolucion

---
 armsrc/appmain.c           | 350 +++++++++++++++++++------------------
 armsrc/apps.h              |  10 +-
 armsrc/epa.c               |  22 +--
 armsrc/felica.c            |   8 +-
 armsrc/iso14443a.c         |  12 +-
 armsrc/iso14443a.h         |   2 +-
 armsrc/iso14443b.c         |  10 +-
 armsrc/iso14443b.h         |   2 +-
 bootrom/bootrom.c          |  24 +--
 client/cmdanalyse.c        |   4 +-
 client/cmddata.c           |  22 +--
 client/cmdflashmem.c       |  16 +-
 client/cmdhf14a.c          |  96 +++++-----
 client/cmdhf14b.c          |  62 +++----
 client/cmdhf15.c           |  50 +++---
 client/cmdhfepa.c          |  38 ++--
 client/cmdhffelica.c       |  20 +--
 client/cmdhficlass.c       |  74 ++++----
 client/cmdhflegic.c        |  34 ++--
 client/cmdhfmf.c           |  76 ++++----
 client/cmdhfmfdes.c        | 138 +++++++--------
 client/cmdhfmfdesfire.c    |  20 +--
 client/cmdhfmfhard.c       |  14 +-
 client/cmdhfmfp.c          |   6 +-
 client/cmdhfmfu.c          |  68 +++----
 client/cmdhftopaz.c        |   8 +-
 client/cmdhw.c             |  31 ++--
 client/cmdlf.c             |   6 +-
 client/cmdlfawid.c         |   4 +-
 client/cmdlfem4x.c         |   4 +-
 client/cmdlffdx.c          |   2 +-
 client/cmdlfguard.c        |   2 +-
 client/cmdlfhid.c          |   2 +-
 client/cmdlfhitag.c        |  20 +--
 client/cmdlfjablotron.c    |   2 +-
 client/cmdlfkeri.c         |   2 +-
 client/cmdlfnedap.c        |   2 +-
 client/cmdlfnoralsy.c      |   2 +-
 client/cmdlfpcf7931.c      |   2 +-
 client/cmdlfpresco.c       |   2 +-
 client/cmdlfpyramid.c      |   2 +-
 client/cmdlft55xx.c        |  12 +-
 client/cmdlfviking.c       |   2 +-
 client/cmdlfvisa2000.c     |   2 +-
 client/cmdsmartcard.c      |  32 ++--
 client/cmdtrace.c          |   4 +-
 client/comms.c             | 198 +++++++++------------
 client/comms.h             |  13 +-
 client/flash.c             |  32 ++--
 client/mifare/mifarehost.c |  98 +++++------
 client/scripting.c         |   6 +-
 common/cmd.c               |  29 ++-
 include/usb_cmd.h          |  32 +++-
 53 files changed, 861 insertions(+), 870 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 89e7df1f2..392c697b4 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -633,37 +633,33 @@ void ListenReaderField(int limit) {
     }
 }
 
-static void UsbPacketReceived(bool cmd_ng, uint8_t *packet) {
+static void UsbPacketReceived(UsbCommandNG *packet) {
     uint64_t cmd; // To accommodate old cmd, can be reduced to uint16_t once all old cmds are gone.
-    UsbCommandNGPreamble *pre_ng = (UsbCommandNGPreamble *)packet;
-    uint8_t *data_ng = packet + sizeof(UsbCommandNGPreamble);
-    uint16_t datalen_ng = pre_ng->length;
 
     // For cmd handlers still using old cmd format:
-    UsbCommand *c = (UsbCommand *)packet;
-    if (cmd_ng) {
-        cmd = pre_ng->cmd;
-//        Dbprintf("received %d bytes payload, with command: 0x%04x", datalen_ng, cmd);
+    if (packet->ng) {
+        cmd = packet->core.ng.cmd;
+//        Dbprintf("received NG frame with %d bytes payload, with command: 0x%04x", packet->length, cmd);
     } else {
-//        Dbprintf("received %d bytes, with command: 0x%04x and args: %d %d %d", USB_CMD_DATA_SIZE, c->cmd, c->arg[0], c->arg[1], c->arg[2]);
-        cmd = c->cmd;
+        cmd = packet->core.old.cmd;
+//        Dbprintf("received OLD frame of %d bytes, with command: 0x%04x and args: %d %d %d", packet->length, packet->core.old.cmd, packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2]);
     }
 
     switch (cmd) {
 #ifdef WITH_LF
         case CMD_SET_LF_T55XX_CONFIG:
-            setT55xxConfig(c->arg[0], (t55xx_config *) c->d.asBytes);
+            setT55xxConfig(packet->core.old.arg[0], (t55xx_config *) packet->core.old.d.asBytes);
             break;
         case CMD_SET_LF_SAMPLING_CONFIG:
-            setSamplingConfig((sample_config *) c->d.asBytes);
+            setSamplingConfig((sample_config *) packet->core.old.d.asBytes);
             break;
         case CMD_ACQUIRE_RAW_ADC_SAMPLES_125K: {
-            uint32_t bits = SampleLF(c->arg[0], c->arg[1]);
+            uint32_t bits = SampleLF(packet->core.old.arg[0], packet->core.old.arg[1]);
             cmd_send(CMD_ACK, bits, 0, 0, 0, 0);
             break;
         }
         case CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K:
-            ModThenAcquireRawAdcSamples125k(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+            ModThenAcquireRawAdcSamples125k(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2], packet->core.old.d.asBytes);
             break;
         case CMD_LF_SNIFF_RAW_ADC_SAMPLES: {
             uint32_t bits = SniffLF();
@@ -672,73 +668,73 @@ static void UsbPacketReceived(bool cmd_ng, uint8_t *packet) {
         }
         case CMD_HID_DEMOD_FSK: {
             uint32_t high, low;
-            CmdHIDdemodFSK(c->arg[0], &high, &low, 1);
+            CmdHIDdemodFSK(packet->core.old.arg[0], &high, &low, 1);
             break;
         }
         case CMD_HID_SIM_TAG:
-            CmdHIDsimTAG(c->arg[0], c->arg[1], 1);
+            CmdHIDsimTAG(packet->core.old.arg[0], packet->core.old.arg[1], 1);
             break;
         case CMD_FSK_SIM_TAG:
-            CmdFSKsimTAG(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes, 1);
+            CmdFSKsimTAG(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2], packet->core.old.d.asBytes, 1);
             break;
         case CMD_ASK_SIM_TAG:
-            CmdASKsimTag(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes, 1);
+            CmdASKsimTag(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2], packet->core.old.d.asBytes, 1);
             break;
         case CMD_PSK_SIM_TAG:
-            CmdPSKsimTag(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes, 1);
+            CmdPSKsimTag(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2], packet->core.old.d.asBytes, 1);
             break;
         case CMD_HID_CLONE_TAG:
-            CopyHIDtoT55x7(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes[0]);
+            CopyHIDtoT55x7(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2], packet->core.old.d.asBytes[0]);
             break;
         case CMD_IO_DEMOD_FSK: {
             uint32_t high, low;
-            CmdIOdemodFSK(c->arg[0], &high, &low, 1);
+            CmdIOdemodFSK(packet->core.old.arg[0], &high, &low, 1);
             break;
         }
         case CMD_IO_CLONE_TAG:
-            CopyIOtoT55x7(c->arg[0], c->arg[1]);
+            CopyIOtoT55x7(packet->core.old.arg[0], packet->core.old.arg[1]);
             break;
         case CMD_EM410X_DEMOD: {
             uint32_t high;
             uint64_t low;
-            CmdEM410xdemod(c->arg[0], &high, &low, 1);
+            CmdEM410xdemod(packet->core.old.arg[0], &high, &low, 1);
             break;
         }
         case CMD_EM410X_WRITE_TAG:
-            WriteEM410x(c->arg[0], c->arg[1], c->arg[2]);
+            WriteEM410x(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2]);
             break;
         case CMD_READ_TI_TYPE:
             ReadTItag();
             break;
         case CMD_WRITE_TI_TYPE:
-            WriteTItag(c->arg[0], c->arg[1], c->arg[2]);
+            WriteTItag(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2]);
             break;
         case CMD_SIMULATE_TAG_125K:
             LED_A_ON();
-            SimulateTagLowFrequency(c->arg[0], c->arg[1], 1);
+            SimulateTagLowFrequency(packet->core.old.arg[0], packet->core.old.arg[1], 1);
             LED_A_OFF();
             break;
         case CMD_LF_SIMULATE_BIDIR:
-            SimulateTagLowFrequencyBidir(c->arg[0], c->arg[1]);
+            SimulateTagLowFrequencyBidir(packet->core.old.arg[0], packet->core.old.arg[1]);
             break;
         case CMD_INDALA_CLONE_TAG:
-            CopyIndala64toT55x7(c->d.asDwords[0], c->d.asDwords[1]);
+            CopyIndala64toT55x7(packet->core.old.d.asDwords[0], packet->core.old.d.asDwords[1]);
             break;
         case CMD_INDALA_CLONE_TAG_L:
             CopyIndala224toT55x7(
-                c->d.asDwords[0], c->d.asDwords[1], c->d.asDwords[2], c->d.asDwords[3],
-                c->d.asDwords[4], c->d.asDwords[5], c->d.asDwords[6]
+                packet->core.old.d.asDwords[0], packet->core.old.d.asDwords[1], packet->core.old.d.asDwords[2], packet->core.old.d.asDwords[3],
+                packet->core.old.d.asDwords[4], packet->core.old.d.asDwords[5], packet->core.old.d.asDwords[6]
             );
             break;
         case CMD_T55XX_READ_BLOCK: {
-            T55xxReadBlock(c->arg[0], c->arg[1], c->arg[2]);
+            T55xxReadBlock(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2]);
             break;
         }
         case CMD_T55XX_WRITE_BLOCK:
-            T55xxWriteBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes[0]);
+            T55xxWriteBlock(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2], packet->core.old.d.asBytes[0]);
             break;
         case CMD_T55XX_WAKEUP:
-            T55xxWakeUp(c->arg[0]);
+            T55xxWakeUp(packet->core.old.arg[0]);
             break;
         case CMD_T55XX_RESET_READ:
             T55xxResetRead();
@@ -751,58 +747,58 @@ static void UsbPacketReceived(bool cmd_ng, uint8_t *packet) {
             break;
         case CMD_PCF7931_WRITE:
             WritePCF7931(
-                c->d.asBytes[0], c->d.asBytes[1], c->d.asBytes[2], c->d.asBytes[3],
-                c->d.asBytes[4], c->d.asBytes[5], c->d.asBytes[6], c->d.asBytes[9],
-                c->d.asBytes[7] - 128, c->d.asBytes[8] - 128,
-                c->arg[0],
-                c->arg[1],
-                c->arg[2]
+                packet->core.old.d.asBytes[0], packet->core.old.d.asBytes[1], packet->core.old.d.asBytes[2], packet->core.old.d.asBytes[3],
+                packet->core.old.d.asBytes[4], packet->core.old.d.asBytes[5], packet->core.old.d.asBytes[6], packet->core.old.d.asBytes[9],
+                packet->core.old.d.asBytes[7] - 128, packet->core.old.d.asBytes[8] - 128,
+                packet->core.old.arg[0],
+                packet->core.old.arg[1],
+                packet->core.old.arg[2]
             );
             break;
         case CMD_EM4X_READ_WORD:
-            EM4xReadWord(c->arg[0], c->arg[1], c->arg[2]);
+            EM4xReadWord(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2]);
             break;
         case CMD_EM4X_WRITE_WORD:
-            EM4xWriteWord(c->arg[0], c->arg[1], c->arg[2]);
+            EM4xWriteWord(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2]);
             break;
         case CMD_AWID_DEMOD_FSK:  {
             uint32_t high, low;
             // Set realtime AWID demodulation
-            CmdAWIDdemodFSK(c->arg[0], &high, &low, 1);
+            CmdAWIDdemodFSK(packet->core.old.arg[0], &high, &low, 1);
             break;
         }
         case CMD_VIKING_CLONE_TAG:
-            CopyVikingtoT55xx(c->arg[0], c->arg[1], c->arg[2]);
+            CopyVikingtoT55xx(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2]);
             break;
         case CMD_COTAG:
-            Cotag(c->arg[0]);
+            Cotag(packet->core.old.arg[0]);
             break;
 #endif
 
 #ifdef WITH_HITAG
         case CMD_SNIFF_HITAG: // Eavesdrop Hitag tag, args = type
-            SniffHitag(c->arg[0]);
+            SniffHitag(packet->core.old.arg[0]);
             break;
         case CMD_SIMULATE_HITAG: // Simulate Hitag tag, args = memory content
-            SimulateHitagTag((bool)c->arg[0], c->d.asBytes);
+            SimulateHitagTag((bool)packet->core.old.arg[0], packet->core.old.d.asBytes);
             break;
         case CMD_READER_HITAG: // Reader for Hitag tags, args = type and function
-            ReaderHitag((hitag_function)c->arg[0], (hitag_data *)c->d.asBytes);
+            ReaderHitag((hitag_function)packet->core.old.arg[0], (hitag_data *)packet->core.old.d.asBytes);
             break;
         case CMD_SIMULATE_HITAG_S:// Simulate Hitag s tag, args = memory content
-            SimulateHitagSTag((bool)c->arg[0], c->d.asBytes);
+            SimulateHitagSTag((bool)packet->core.old.arg[0], packet->core.old.d.asBytes);
             break;
         case CMD_TEST_HITAGS_TRACES:// Tests every challenge within the given file
-            check_challenges((bool)c->arg[0], c->d.asBytes);
+            check_challenges((bool)packet->core.old.arg[0], packet->core.old.d.asBytes);
             break;
         case CMD_READ_HITAG_S: //Reader for only Hitag S tags, args = key or challenge
-            ReadHitagS((hitag_function)c->arg[0], (hitag_data *)c->d.asBytes);
+            ReadHitagS((hitag_function)packet->core.old.arg[0], (hitag_data *)packet->core.old.d.asBytes);
             break;
         case CMD_WR_HITAG_S: //writer for Hitag tags args=data to write,page and key or challenge
-            if ((hitag_function)c->arg[0] < 10) {
-                WritePageHitagS((hitag_function)c->arg[0], (hitag_data *)c->d.asBytes, c->arg[2]);
+            if ((hitag_function)packet->core.old.arg[0] < 10) {
+                WritePageHitagS((hitag_function)packet->core.old.arg[0], (hitag_data *)packet->core.old.d.asBytes, packet->core.old.arg[2]);
             } else {
-                WriterHitag((hitag_function)c->arg[0], (hitag_data *)c->d.asBytes, c->arg[2]);
+                WriterHitag((hitag_function)packet->core.old.arg[0], (hitag_data *)packet->core.old.d.asBytes, packet->core.old.arg[2]);
             }
             break;
 #endif
@@ -815,28 +811,28 @@ static void UsbPacketReceived(bool cmd_ng, uint8_t *packet) {
             RecordRawAdcSamplesIso15693();
             break;
         case CMD_ISO_15693_COMMAND:
-            DirectTag15693Command(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+            DirectTag15693Command(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2], packet->core.old.d.asBytes);
             break;
         case CMD_ISO_15693_FIND_AFI:
-            BruteforceIso15693Afi(c->arg[0]);
+            BruteforceIso15693Afi(packet->core.old.arg[0]);
             break;
         case CMD_READER_ISO_15693:
-            ReaderIso15693(c->arg[0]);
+            ReaderIso15693(packet->core.old.arg[0]);
             break;
         case CMD_SIMTAG_ISO_15693:
-            SimTagIso15693(c->arg[0], c->d.asBytes);
+            SimTagIso15693(packet->core.old.arg[0], packet->core.old.d.asBytes);
             break;
 #endif
 
 #ifdef WITH_LEGICRF
         case CMD_SIMULATE_TAG_LEGIC_RF:
-            LegicRfSimulate(c->arg[0]);
+            LegicRfSimulate(packet->core.old.arg[0]);
             break;
         case CMD_WRITER_LEGIC_RF:
-            LegicRfWriter(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+            LegicRfWriter(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2], packet->core.old.d.asBytes);
             break;
         case CMD_READER_LEGIC_RF:
-            LegicRfReader(c->arg[0], c->arg[1], c->arg[2]);
+            LegicRfReader(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2]);
             break;
         case CMD_LEGIC_INFO:
             LegicRfInfo();
@@ -850,35 +846,35 @@ static void UsbPacketReceived(bool cmd_ng, uint8_t *packet) {
             // arg0 = offset
             // arg1 = num of bytes
             FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-            emlSet(c->d.asBytes, c->arg[0], c->arg[1]);
+            emlSet(packet->core.old.d.asBytes, packet->core.old.arg[0], packet->core.old.arg[1]);
             break;
 #endif
 
 #ifdef WITH_ISO14443b
         case CMD_READ_SRI_TAG:
-            ReadSTMemoryIso14443b(c->arg[0]);
+            ReadSTMemoryIso14443b(packet->core.old.arg[0]);
             break;
         case CMD_SNIFF_ISO_14443B:
             SniffIso14443b();
             break;
         case CMD_SIMULATE_TAG_ISO_14443B:
-            SimulateIso14443bTag(c->arg[0]);
+            SimulateIso14443bTag(packet->core.old.arg[0]);
             break;
         case CMD_ISO_14443B_COMMAND:
-            //SendRawCommand14443B(c->arg[0],c->arg[1],c->arg[2],c->d.asBytes);
-            SendRawCommand14443B_Ex(c);
+            //SendRawCommand14443B(packet->core.old.arg[0],packet->core.old.arg[1],packet->core.old.arg[2],packet->core.old.d.asBytes);
+            SendRawCommand14443B_Ex(packet);
             break;
 #endif
 
 #ifdef WITH_FELICA
         case CMD_FELICA_COMMAND:
-            felica_sendraw(c);
+            felica_sendraw(packet);
             break;
         case CMD_FELICA_LITE_SIM:
-            felica_sim_lite(c->arg[0]);
+            felica_sim_lite(packet->core.old.arg[0]);
             break;
         case CMD_FELICA_SNIFF:
-            felica_sniff(c->arg[0], c->arg[1]);
+            felica_sniff(packet->core.old.arg[0], packet->core.old.arg[1]);
             break;
         case CMD_FELICA_LITE_DUMP:
             felica_dump_lite_s();
@@ -887,107 +883,107 @@ static void UsbPacketReceived(bool cmd_ng, uint8_t *packet) {
 
 #ifdef WITH_ISO14443a
         case CMD_SNIFF_ISO_14443a:
-            SniffIso14443a(c->arg[0]);
+            SniffIso14443a(packet->core.old.arg[0]);
             break;
         case CMD_READER_ISO_14443a:
-            ReaderIso14443a(c);
+            ReaderIso14443a(packet);
             break;
         case CMD_SIMULATE_TAG_ISO_14443a:
-            SimulateIso14443aTag(c->arg[0], c->arg[1], c->d.asBytes);  // ## Simulate iso14443a tag - pass tag type & UID
+            SimulateIso14443aTag(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.d.asBytes);  // ## Simulate iso14443a tag - pass tag type & UID
             break;
         case CMD_ANTIFUZZ_ISO_14443a:
-            iso14443a_antifuzz(c->arg[0]);
+            iso14443a_antifuzz(packet->core.old.arg[0]);
             break;
         case CMD_EPA_PACE_COLLECT_NONCE:
-            EPA_PACE_Collect_Nonce(c);
+            EPA_PACE_Collect_Nonce(packet);
             break;
         case CMD_EPA_PACE_REPLAY:
-            EPA_PACE_Replay(c);
+            EPA_PACE_Replay(packet);
             break;
         case CMD_READER_MIFARE:
-            ReaderMifare(c->arg[0], c->arg[1], c->arg[2]);
+            ReaderMifare(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2]);
             break;
         case CMD_MIFARE_READBL:
-            MifareReadBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+            MifareReadBlock(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2], packet->core.old.d.asBytes);
             break;
         case CMD_MIFAREU_READBL:
-            MifareUReadBlock(c->arg[0], c->arg[1], c->d.asBytes);
+            MifareUReadBlock(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.d.asBytes);
             break;
         case CMD_MIFAREUC_AUTH:
-            MifareUC_Auth(c->arg[0], c->d.asBytes);
+            MifareUC_Auth(packet->core.old.arg[0], packet->core.old.d.asBytes);
             break;
         case CMD_MIFAREU_READCARD:
-            MifareUReadCard(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+            MifareUReadCard(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2], packet->core.old.d.asBytes);
             break;
         case CMD_MIFAREUC_SETPWD:
-            MifareUSetPwd(c->arg[0], c->d.asBytes);
+            MifareUSetPwd(packet->core.old.arg[0], packet->core.old.d.asBytes);
             break;
         case CMD_MIFARE_READSC:
-            MifareReadSector(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+            MifareReadSector(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2], packet->core.old.d.asBytes);
             break;
         case CMD_MIFARE_WRITEBL:
-            MifareWriteBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+            MifareWriteBlock(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2], packet->core.old.d.asBytes);
             break;
         //case CMD_MIFAREU_WRITEBL_COMPAT:
-        //MifareUWriteBlockCompat(c->arg[0], c->d.asBytes);
+        //MifareUWriteBlockCompat(packet->core.old.arg[0], packet->core.old.d.asBytes);
         //break;
         case CMD_MIFAREU_WRITEBL:
-            MifareUWriteBlock(c->arg[0], c->arg[1], c->d.asBytes);
+            MifareUWriteBlock(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.d.asBytes);
             break;
         case CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES:
-            MifareAcquireEncryptedNonces(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+            MifareAcquireEncryptedNonces(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2], packet->core.old.d.asBytes);
             break;
         case CMD_MIFARE_ACQUIRE_NONCES:
-            MifareAcquireNonces(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+            MifareAcquireNonces(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2], packet->core.old.d.asBytes);
             break;
         case CMD_MIFARE_NESTED:
-            MifareNested(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+            MifareNested(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2], packet->core.old.d.asBytes);
             break;
         case CMD_MIFARE_CHKKEYS: {
-            MifareChkKeys(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+            MifareChkKeys(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2], packet->core.old.d.asBytes);
             break;
         }
         case CMD_MIFARE_CHKKEYS_FAST: {
-            MifareChkKeys_fast(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+            MifareChkKeys_fast(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2], packet->core.old.d.asBytes);
             break;
         }
         case CMD_SIMULATE_MIFARE_CARD:
-            Mifare1ksim(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+            Mifare1ksim(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2], packet->core.old.d.asBytes);
             break;
 
         // emulator
         case CMD_MIFARE_SET_DBGMODE:
-            MifareSetDbgLvl(c->arg[0]);
+            MifareSetDbgLvl(packet->core.old.arg[0]);
             break;
         case CMD_MIFARE_EML_MEMCLR:
-            MifareEMemClr(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+            MifareEMemClr(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2], packet->core.old.d.asBytes);
             break;
         case CMD_MIFARE_EML_MEMSET:
-            MifareEMemSet(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+            MifareEMemSet(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2], packet->core.old.d.asBytes);
             break;
         case CMD_MIFARE_EML_MEMGET:
-            MifareEMemGet(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+            MifareEMemGet(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2], packet->core.old.d.asBytes);
             break;
         case CMD_MIFARE_EML_CARDLOAD:
-            MifareECardLoad(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+            MifareECardLoad(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2], packet->core.old.d.asBytes);
             break;
 
         // Work with "magic Chinese" card
         case CMD_MIFARE_CSETBLOCK:
-            MifareCSetBlock(c->arg[0], c->arg[1], c->d.asBytes);
+            MifareCSetBlock(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.d.asBytes);
             break;
         case CMD_MIFARE_CGETBLOCK:
-            MifareCGetBlock(c->arg[0], c->arg[1], c->d.asBytes);
+            MifareCGetBlock(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.d.asBytes);
             break;
         case CMD_MIFARE_CIDENT:
             MifareCIdent();
             break;
         // mifare sniffer
 //        case CMD_MIFARE_SNIFFER:
-//            SniffMifare(c->arg[0]);
+//            SniffMifare(packet->core.old.arg[0]);
 //            break;
         case CMD_MIFARE_SETMOD:
-            MifareSetMod(c->arg[0], c->d.asBytes);
+            MifareSetMod(packet->core.old.arg[0], packet->core.old.d.asBytes);
             break;
         //mifare desfire
         case CMD_MIFARE_DESFIRE_READBL:
@@ -995,19 +991,19 @@ static void UsbPacketReceived(bool cmd_ng, uint8_t *packet) {
         case CMD_MIFARE_DESFIRE_WRITEBL:
             break;
         case CMD_MIFARE_DESFIRE_AUTH1:
-            MifareDES_Auth1(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+            MifareDES_Auth1(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2], packet->core.old.d.asBytes);
             break;
         case CMD_MIFARE_DESFIRE_AUTH2:
-            //MifareDES_Auth2(c->arg[0],c->d.asBytes);
+            //MifareDES_Auth2(packet->core.old.arg[0],packet->core.old.d.asBytes);
             break;
         case CMD_MIFARE_DES_READER:
-            //readermifaredes(c->arg[0], c->arg[1], c->d.asBytes);
+            //readermifaredes(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.d.asBytes);
             break;
         case CMD_MIFARE_DESFIRE_INFO:
             MifareDesfireGetInformation();
             break;
         case CMD_MIFARE_DESFIRE:
-            MifareSendCommand(c->arg[0], c->arg[1], c->d.asBytes);
+            MifareSendCommand(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.d.asBytes);
             break;
         case CMD_MIFARE_COLLECT_NONCES:
             break;
@@ -1022,45 +1018,45 @@ static void UsbPacketReceived(bool cmd_ng, uint8_t *packet) {
             SniffIClass();
             break;
         case CMD_SIMULATE_TAG_ICLASS:
-            SimulateIClass(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+            SimulateIClass(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2], packet->core.old.d.asBytes);
             break;
         case CMD_READER_ICLASS:
-            ReaderIClass(c->arg[0]);
+            ReaderIClass(packet->core.old.arg[0]);
             break;
         case CMD_READER_ICLASS_REPLAY:
-            ReaderIClass_Replay(c->arg[0], c->d.asBytes);
+            ReaderIClass_Replay(packet->core.old.arg[0], packet->core.old.d.asBytes);
             break;
         case CMD_ICLASS_EML_MEMSET:
             //iceman, should call FPGADOWNLOAD before, since it corrupts BigBuf
             FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-            emlSet(c->d.asBytes, c->arg[0], c->arg[1]);
+            emlSet(packet->core.old.d.asBytes, packet->core.old.arg[0], packet->core.old.arg[1]);
             break;
         case CMD_ICLASS_WRITEBLOCK:
-            iClass_WriteBlock(c->arg[0], c->d.asBytes);
+            iClass_WriteBlock(packet->core.old.arg[0], packet->core.old.d.asBytes);
             break;
         case CMD_ICLASS_READCHECK:  // auth step 1
-            iClass_ReadCheck(c->arg[0], c->arg[1]);
+            iClass_ReadCheck(packet->core.old.arg[0], packet->core.old.arg[1]);
             break;
         case CMD_ICLASS_READBLOCK:
-            iClass_ReadBlk(c->arg[0]);
+            iClass_ReadBlk(packet->core.old.arg[0]);
             break;
         case CMD_ICLASS_AUTHENTICATION: //check
-            iClass_Authentication(c->d.asBytes);
+            iClass_Authentication(packet->core.old.d.asBytes);
             break;
         case CMD_ICLASS_CHECK_KEYS:
-            iClass_Authentication_fast(c->arg[0], c->arg[1], c->d.asBytes);
+            iClass_Authentication_fast(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.d.asBytes);
             break;
         case CMD_ICLASS_DUMP:
-            iClass_Dump(c->arg[0], c->arg[1]);
+            iClass_Dump(packet->core.old.arg[0], packet->core.old.arg[1]);
             break;
         case CMD_ICLASS_CLONE:
-            iClass_Clone(c->arg[0], c->arg[1], c->d.asBytes);
+            iClass_Clone(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.d.asBytes);
             break;
 #endif
 
 #ifdef WITH_HFSNIFF
         case CMD_HF_SNIFFER:
-            HfSniff(c->arg[0], c->arg[1]);
+            HfSniff(packet->core.old.arg[0], packet->core.old.arg[1]);
             break;
 #endif
 
@@ -1070,26 +1066,26 @@ static void UsbPacketReceived(bool cmd_ng, uint8_t *packet) {
             break;
         }
         case CMD_SMART_SETBAUD: {
-            SmartCardSetBaud(c->arg[0]);
+            SmartCardSetBaud(packet->core.old.arg[0]);
             break;
         }
         case CMD_SMART_SETCLOCK: {
-            SmartCardSetClock(c->arg[0]);
+            SmartCardSetClock(packet->core.old.arg[0]);
             break;
         }
         case CMD_SMART_RAW: {
-            SmartCardRaw(c->arg[0], c->arg[1], c->d.asBytes);
+            SmartCardRaw(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.d.asBytes);
             break;
         }
         case CMD_SMART_UPLOAD: {
             // upload file from client
             uint8_t *mem = BigBuf_get_addr();
-            memcpy(mem + c->arg[0], c->d.asBytes, USB_CMD_DATA_SIZE);
+            memcpy(mem + packet->core.old.arg[0], packet->core.old.d.asBytes, USB_CMD_DATA_SIZE);
             cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
             break;
         }
         case CMD_SMART_UPGRADE: {
-            SmartCardUpgrade(c->arg[0]);
+            SmartCardUpgrade(packet->core.old.arg[0]);
             break;
         }
 #endif
@@ -1131,10 +1127,10 @@ static void UsbPacketReceived(bool cmd_ng, uint8_t *packet) {
             usart_writebuffer((uint8_t *)welcome, strlen(welcome));
 
             sprintf(dest, "| bytes 0x%02x 0x%02x 0x%02x 0x%02x\r\n"
-                    , c->d.asBytes[0]
-                    , c->d.asBytes[1]
-                    , c->d.asBytes[2]
-                    , c->d.asBytes[3]
+                    , packet->core.old.d.asBytes[0]
+                    , packet->core.old.d.asBytes[1]
+                    , packet->core.old.d.asBytes[2]
+                    , packet->core.old.d.asBytes[3]
                    );
             usart_writebuffer((uint8_t *)dest, strlen(dest));
 
@@ -1180,7 +1176,7 @@ static void UsbPacketReceived(bool cmd_ng, uint8_t *packet) {
             break;
 
         case CMD_LISTEN_READER_FIELD:
-            ListenReaderField(c->arg[0]);
+            ListenReaderField(packet->core.old.arg[0]);
             break;
 
         case CMD_FPGA_MAJOR_MODE_OFF: // ## FPGA Control
@@ -1192,12 +1188,12 @@ static void UsbPacketReceived(bool cmd_ng, uint8_t *packet) {
         case CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K: {
             LED_B_ON();
             uint8_t *mem = BigBuf_get_addr();
-            uint32_t startidx = c->arg[0];
-            uint32_t numofbytes = c->arg[1];
+            uint32_t startidx = packet->core.old.arg[0];
+            uint32_t numofbytes = packet->core.old.arg[1];
             // arg0 = startindex
             // arg1 = length bytes to transfer
             // arg2 = BigBuf tracelen
-            //Dbprintf("transfer to client parameters: %" PRIu32 " | %" PRIu32 " | %" PRIu32, startidx, numofbytes, c->arg[2]);
+            //Dbprintf("transfer to client parameters: %" PRIu32 " | %" PRIu32 " | %" PRIu32, startidx, numofbytes, packet->core.old.arg[2]);
 
             for (size_t i = 0; i < numofbytes; i += USB_CMD_DATA_SIZE) {
                 size_t len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);
@@ -1222,13 +1218,13 @@ static void UsbPacketReceived(bool cmd_ng, uint8_t *packet) {
             // arg1 = 0 upload for LF usage
             //        1 upload for HF usage
 #define FPGA_LF 1
-            if (c->arg[1] == FPGA_LF)
+            if (packet->core.old.arg[1] == FPGA_LF)
                 FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
             else
                 FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
 
             uint8_t *mem = BigBuf_get_addr();
-            memcpy(mem + c->arg[0], c->d.asBytes, USB_CMD_DATA_SIZE);
+            memcpy(mem + packet->core.old.arg[0], packet->core.old.d.asBytes, USB_CMD_DATA_SIZE);
             cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
             break;
         }
@@ -1237,8 +1233,8 @@ static void UsbPacketReceived(bool cmd_ng, uint8_t *packet) {
             uint8_t *mem = BigBuf_get_EM_addr();
             bool isok = false;
             size_t len = 0;
-            uint32_t startidx = c->arg[0];
-            uint32_t numofbytes = c->arg[1];
+            uint32_t startidx = packet->core.old.arg[0];
+            uint32_t numofbytes = packet->core.old.arg[1];
 
             // arg0 = startindex
             // arg1 = length bytes to transfer
@@ -1256,16 +1252,16 @@ static void UsbPacketReceived(bool cmd_ng, uint8_t *packet) {
             break;
         }
         case CMD_READ_MEM:
-            ReadMem(c->arg[0]);
+            ReadMem(packet->core.old.arg[0]);
             break;
 #ifdef WITH_FLASH
         case CMD_FLASHMEM_SET_SPIBAUDRATE:
-            FlashmemSetSpiBaudrate(c->arg[0]);
+            FlashmemSetSpiBaudrate(packet->core.old.arg[0]);
             break;
         case CMD_FLASHMEM_READ: {
             LED_B_ON();
-            uint32_t startidx = c->arg[0];
-            uint16_t len = c->arg[1];
+            uint32_t startidx = packet->core.old.arg[0];
+            uint16_t len = packet->core.old.arg[1];
 
             Dbprintf("FlashMem read | %d - %d | ", startidx, len);
 
@@ -1298,9 +1294,9 @@ static void UsbPacketReceived(bool cmd_ng, uint8_t *packet) {
             LED_B_ON();
             uint8_t isok = 0;
             uint16_t res = 0;
-            uint32_t startidx = c->arg[0];
-            uint16_t len = c->arg[1];
-            uint8_t *data = c->d.asBytes;
+            uint32_t startidx = packet->core.old.arg[0];
+            uint16_t len = packet->core.old.arg[1];
+            uint8_t *data = packet->core.old.d.asBytes;
 
             uint32_t tmp = startidx + len;
 
@@ -1359,8 +1355,8 @@ static void UsbPacketReceived(bool cmd_ng, uint8_t *packet) {
         }
         case CMD_FLASHMEM_WIPE: {
             LED_B_ON();
-            uint8_t page = c->arg[0];
-            uint8_t initalwipe = c->arg[1];
+            uint8_t page = packet->core.old.arg[0];
+            uint8_t initalwipe = packet->core.old.arg[1];
             bool isok = false;
             if (initalwipe) {
                 isok = Flash_WipeMemory();
@@ -1379,8 +1375,8 @@ static void UsbPacketReceived(bool cmd_ng, uint8_t *packet) {
 
             LED_B_ON();
             uint8_t *mem = BigBuf_malloc(USB_CMD_DATA_SIZE);
-            uint32_t startidx = c->arg[0];
-            uint32_t numofbytes = c->arg[1];
+            uint32_t startidx = packet->core.old.arg[0];
+            uint32_t numofbytes = packet->core.old.arg[1];
             // arg0 = startindex
             // arg1 = length bytes to transfer
             // arg2 = RFU
@@ -1427,11 +1423,11 @@ static void UsbPacketReceived(bool cmd_ng, uint8_t *packet) {
 #endif
         case CMD_SET_LF_DIVISOR:
             FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-            FpgaSendCommand(FPGA_CMD_SET_DIVISOR, c->arg[0]);
+            FpgaSendCommand(FPGA_CMD_SET_DIVISOR, packet->core.old.arg[0]);
             break;
 
         case CMD_SET_ADC_MUX:
-            switch (c->arg[0]) {
+            switch (packet->core.old.arg[0]) {
                 case 0:
                     SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
                     break;
@@ -1456,8 +1452,8 @@ static void UsbPacketReceived(bool cmd_ng, uint8_t *packet) {
             SendStatus();
             break;
         case CMD_PING:
-            if (cmd_ng) {
-                reply_ng(CMD_PING, PM3_SUCCESS, data_ng, datalen_ng);
+            if (packet->ng) {
+                reply_ng(CMD_PING, PM3_SUCCESS, packet->core.ng.data, packet->length);
             } else {
 #ifdef WITH_FPC_HOST
                 cmd_send(CMD_ACK, reply_via_fpc, 0, 0, 0, 0);
@@ -1471,7 +1467,7 @@ static void UsbPacketReceived(bool cmd_ng, uint8_t *packet) {
             LCDReset();
             break;
         case CMD_LCD:
-            LCDSend(c->arg[0]);
+            LCDSend(packet->core.old.arg[0]);
             break;
 #endif
         case CMD_SETUP_WRITE:
@@ -1570,9 +1566,7 @@ void  __attribute__((noreturn)) AppMain(void) {
     usb_disable();
     usb_enable();
 
-    uint8_t rx[USB_COMMANDNG_MAXLEN];
-    UsbCommandNGPreamble *pre = (UsbCommandNGPreamble *)rx;
-    UsbCommandNGPostamble *post = (UsbCommandNGPostamble *)(rx + sizeof(UsbCommandNGPreamble) + USB_DATANG_SIZE);
+    UsbCommandNG rx;
 
     for (;;) {
         WDT_HIT();
@@ -1580,30 +1574,30 @@ void  __attribute__((noreturn)) AppMain(void) {
         // Check if there is a usb packet available
         if (usb_poll_validate_length()) {
             bool error = false;
-            size_t bytes = usb_read_ng(rx, sizeof(UsbCommandNGPreamble));
+            size_t bytes = usb_read_ng((uint8_t *)&rx, sizeof(UsbCommandNGPreamble));
             if (bytes == sizeof(UsbCommandNGPreamble)) {
-                if (pre->magic == USB_COMMANDNG_PREAMBLE_MAGIC) { // New style NG command
-                    if (pre->length > USB_DATANG_SIZE) {
-                        Dbprintf("Packet frame with incompatible length: 0x%04x", pre->length);
+                if (rx.magic == USB_COMMANDNG_PREAMBLE_MAGIC) { // New style NG command
+                    if (rx.length > USB_DATANG_SIZE) {
+                        Dbprintf("Packet frame with incompatible length: 0x%04x", rx.length);
                         error = true;
                     }
-                    if ((!error) && (pre->length > 0)) { // Get the variable length payload
-                        bytes = usb_read_ng(rx + sizeof(UsbCommandNGPreamble), pre->length);
-                        if (bytes != pre->length) {
-                            Dbprintf("Packet frame error variable part too short? %d/%d", bytes, pre->length);
+                    if (!error) { // Get the core and variable length payload
+                        bytes = usb_read_ng(((uint8_t *)&rx.core), sizeof(UsbPacketNGCore) - USB_DATANG_SIZE + rx.length);
+                        if (bytes != sizeof(UsbPacketNGCore) - USB_DATANG_SIZE + rx.length) {
+                            Dbprintf("Packet frame error variable part too short? %d/%d", bytes, rx.length);
                             error = true;
                         }
                     }
                     if (!error) {                        // Get the postamble
-                        bytes = usb_read_ng(rx + sizeof(UsbCommandNGPreamble) + USB_DATANG_SIZE, sizeof(UsbCommandNGPostamble));
+                        bytes = usb_read_ng(((uint8_t *)&rx.crc), sizeof(UsbCommandNGPostamble));
                         if (bytes != sizeof(UsbCommandNGPostamble)) {
                             Dbprintf("Packet frame error fetching postamble");
                             error = true;
                         }
                         uint8_t first, second;
-                        compute_crc(CRC_14443_A, rx, sizeof(UsbCommandNGPreamble) + pre->length, &first, &second);
-                        if ((first << 8) + second != post->crc) {
-                            Dbprintf("Packet frame CRC error %02X%02X <> %04X", first, second, post->crc);
+                        compute_crc(CRC_14443_A, (uint8_t *)&rx, sizeof(UsbCommandNGPreamble) + sizeof(UsbPacketNGCore) - USB_DATANG_SIZE + rx.length, &first, &second);
+                        if ((first << 8) + second != rx.crc) {
+                            Dbprintf("Packet frame CRC error %02X%02X <> %04X", first, second, rx.crc);
                             error = true;
                         }
                     }
@@ -1611,10 +1605,17 @@ void  __attribute__((noreturn)) AppMain(void) {
 #ifdef WITH_FPC_HOST
                         reply_via_fpc = false;
 #endif
-                        UsbPacketReceived(true, rx);
+                        rx.ng = true;
+                        UsbPacketReceived(&rx);
                     }
                 } else {                               // Old style command
-                    bytes = usb_read_ng(rx + sizeof(UsbCommandNGPreamble), sizeof(UsbCommand) - sizeof(UsbCommandNGPreamble));
+                    uint8_t tmp[sizeof(UsbCommandNGPreamble)];
+                    memcpy(tmp, &rx, sizeof(UsbCommandNGPreamble));
+                    memcpy(&rx.core.old, tmp, sizeof(UsbCommandNGPreamble));
+
+
+
+                    bytes = usb_read_ng(((uint8_t *)&rx.core.old) + sizeof(UsbCommandNGPreamble), sizeof(UsbCommand) - sizeof(UsbCommandNGPreamble));
                     if (bytes != sizeof(UsbCommand) - sizeof(UsbCommandNGPreamble)) {
                         Dbprintf("Packet frame error var part too short? %d/%d", bytes, sizeof(UsbCommand) - sizeof(UsbCommandNGPreamble));
                         error = true;
@@ -1623,22 +1624,31 @@ void  __attribute__((noreturn)) AppMain(void) {
 #ifdef WITH_FPC_HOST
                         reply_via_fpc = false;
 #endif
-                        UsbPacketReceived(false, rx);
+                        rx.ng = false;
+                        rx.magic = 0;
+                        rx.length = USB_CMD_DATA_SIZE;
+                        rx.crc = 0;
+                        UsbPacketReceived(&rx);
                     }
                 }
             } else {
                 Dbprintf("Packet frame preamble too short: %d/%d", bytes, sizeof(UsbCommandNGPreamble));
                 error = true;
             }
-            // TODO if error, shall we resync ?
+            // TODO DOEGOX if error, shall we resync ?
         }
 #ifdef WITH_FPC_HOST
         // Check if there is a FPC packet available
-        if (usart_readbuffer(rx)) {
+// TODO DOEGOX NG packets support here too
+        if (usart_readbuffer((uint8_t *)&rx)) {
             reply_via_fpc = true;
-            UsbPacketReceived(false, rx);
+            rx.ng = false;
+            rx.magic = 0;
+            rx.length = USB_CMD_DATA_SIZE;
+            rx.crc = 0;
+            UsbPacketReceived(&rx);
         }
-        usart_readcheck(rx, sizeof(rx));
+        usart_readcheck((uint8_t *)&rx, sizeof(rx));
 #endif
 
         // Press button for one second to enter a possible standalone mode
diff --git a/armsrc/apps.h b/armsrc/apps.h
index b4c38098c..0d923f04a 100644
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -120,13 +120,13 @@ void AcquireRawAdcSamplesIso14443b(uint32_t parameter);
 void ReadSTMemoryIso14443b(uint8_t numofblocks);
 void RAMFUNC SniffIso14443b(void);
 void SendRawCommand14443B(uint32_t, uint32_t, uint8_t, uint8_t[]);
-void SendRawCommand14443B_Ex(UsbCommand *c);
+void SendRawCommand14443B_Ex(UsbCommandNG *c);
 void ClearFpgaShiftingRegisters(void);
 
 // iso14443a.h
 void RAMFUNC SniffIso14443a(uint8_t param);
 void SimulateIso14443aTag(int tagType, int flags, uint8_t *data);
-void ReaderIso14443a(UsbCommand *c);
+void ReaderIso14443a(UsbCommandNG *c);
 
 // Also used in iclass.c
 //bool RAMFUNC LogTrace(const uint8_t *btBytes, uint16_t len, uint32_t timestamp_start, uint32_t timestamp_end, uint8_t *parity, bool readerToTag);
@@ -137,8 +137,8 @@ void iso14a_set_trigger(bool enable);
 //int GetIso14443aCommandFromReader(uint8_t *received, uint8_t *parity, int *len);
 
 // epa.h
-void EPA_PACE_Collect_Nonce(UsbCommand *c);
-void EPA_PACE_Replay(UsbCommand *c);
+void EPA_PACE_Collect_Nonce(UsbCommandNG *c);
+void EPA_PACE_Replay(UsbCommandNG *c);
 
 // mifarecmd.h
 void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain);
@@ -229,7 +229,7 @@ uint8_t cmd_send(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void
 void HfSniff(int, int);
 
 //felica.c
-void felica_sendraw(UsbCommand *c);
+void felica_sendraw(UsbCommandNG *c);
 void felica_sniff(uint32_t samplesToSkip, uint32_t triggersToSkip);
 void felica_sim_lite(uint64_t uid);
 void felica_dump_lite_s();
diff --git a/armsrc/epa.c b/armsrc/epa.c
index 521bb3f69..8c1db359c 100644
--- a/armsrc/epa.c
+++ b/armsrc/epa.c
@@ -259,7 +259,7 @@ static void EPA_PACE_Collect_Nonce_Abort(uint8_t step, int func_return) {
 //-----------------------------------------------------------------------------
 // Acquire one encrypted PACE nonce
 //-----------------------------------------------------------------------------
-void EPA_PACE_Collect_Nonce(UsbCommand *c) {
+void EPA_PACE_Collect_Nonce(UsbCommandNG *c) {
     /*
      * ack layout:
      *   arg:
@@ -313,7 +313,7 @@ void EPA_PACE_Collect_Nonce(UsbCommand *c) {
 
     // now get the nonce
     uint8_t nonce[256] = {0};
-    uint8_t requested_size = (uint8_t)c->arg[0];
+    uint8_t requested_size = (uint8_t)c->core.old.arg[0];
     func_return = EPA_PACE_Get_Nonce(requested_size, nonce);
     // check if the command succeeded
     if (func_return < 0) {
@@ -430,23 +430,23 @@ int EPA_PACE_MSE_Set_AT(pace_version_info_t pace_version_info, uint8_t password)
 //-----------------------------------------------------------------------------
 // Perform the PACE protocol by replaying given APDUs
 //-----------------------------------------------------------------------------
-void EPA_PACE_Replay(UsbCommand *c) {
+void EPA_PACE_Replay(UsbCommandNG *c) {
     uint32_t timings[sizeof(apdu_lengths_replay) / sizeof(apdu_lengths_replay[0])] = {0};
 
     // if an APDU has been passed, save it
-    if (c->arg[0] != 0) {
+    if (c->core.old.arg[0] != 0) {
         // make sure it's not too big
-        if (c->arg[2] > apdus_replay[c->arg[0] - 1].len) {
+        if (c->core.old.arg[2] > apdus_replay[c->core.old.arg[0] - 1].len) {
             cmd_send(CMD_ACK, 1, 0, 0, NULL, 0);
         }
-        memcpy(apdus_replay[c->arg[0] - 1].data + c->arg[1],
-               c->d.asBytes,
-               c->arg[2]);
+        memcpy(apdus_replay[c->core.old.arg[0] - 1].data + c->core.old.arg[1],
+               c->core.old.d.asBytes,
+               c->core.old.arg[2]);
         // save/update APDU length
-        if (c->arg[1] == 0) {
-            apdu_lengths_replay[c->arg[0] - 1] = c->arg[2];
+        if (c->core.old.arg[1] == 0) {
+            apdu_lengths_replay[c->core.old.arg[0] - 1] = c->core.old.arg[2];
         } else {
-            apdu_lengths_replay[c->arg[0] - 1] += c->arg[2];
+            apdu_lengths_replay[c->core.old.arg[0] - 1] += c->core.old.arg[2];
         }
         cmd_send(CMD_ACK, 0, 0, 0, NULL, 0);
         return;
diff --git a/armsrc/felica.c b/armsrc/felica.c
index ca03836ed..5172e98ef 100644
--- a/armsrc/felica.c
+++ b/armsrc/felica.c
@@ -475,13 +475,13 @@ static void iso18092_setup(uint8_t fpga_minor_mode) {
 // arg0 FeliCa flags
 // arg1 len of commandbytes
 // d.asBytes command bytes to send
-void felica_sendraw(UsbCommand *c) {
+void felica_sendraw(UsbCommandNG *c) {
 
     if (MF_DBGLEVEL > 3) Dbprintf("FeliCa_sendraw Enter");
 
-    felica_command_t param = c->arg[0];
-    size_t len = c->arg[1] & 0xffff;
-    uint8_t *cmd = c->d.asBytes;
+    felica_command_t param = c->core.old.arg[0];
+    size_t len = c->core.old.arg[1] & 0xffff;
+    uint8_t *cmd = c->core.old.d.asBytes;
     uint32_t arg0;
 
     felica_card_select_t card;
diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 4dde7846a..05176d903 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -2350,12 +2350,12 @@ int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, bool send_chaining, void *data, u
 //             low  ::  len of commandbytes
 // arg2         timeout
 // d.asBytes command bytes to send
-void ReaderIso14443a(UsbCommand *c) {
-    iso14a_command_t param = c->arg[0];
-    size_t len = c->arg[1] & 0xffff;
-    size_t lenbits = c->arg[1] >> 16;
-    uint32_t timeout = c->arg[2];
-    uint8_t *cmd = c->d.asBytes;
+void ReaderIso14443a(UsbCommandNG *c) {
+    iso14a_command_t param = c->core.old.arg[0];
+    size_t len = c->core.old.arg[1] & 0xffff;
+    size_t lenbits = c->core.old.arg[1] >> 16;
+    uint32_t timeout = c->core.old.arg[2];
+    uint8_t *cmd = c->core.old.d.asBytes;
     uint32_t arg0;
     uint8_t buf[USB_CMD_DATA_SIZE] = {0x00};
     uint8_t par[MAX_PARITY_SIZE] = {0x00};
diff --git a/armsrc/iso14443a.h b/armsrc/iso14443a.h
index f2a1c6120..ce1d28cf0 100644
--- a/armsrc/iso14443a.h
+++ b/armsrc/iso14443a.h
@@ -121,7 +121,7 @@ RAMFUNC int ManchesterDecoding(uint8_t bit, uint16_t offset, uint32_t non_real_t
 void RAMFUNC SniffIso14443a(uint8_t param);
 void SimulateIso14443aTag(int tagType, int flags, uint8_t *data);
 void iso14443a_antifuzz(uint32_t flags);
-void ReaderIso14443a(UsbCommand *c);
+void ReaderIso14443a(UsbCommandNG *c);
 void ReaderTransmit(uint8_t *frame, uint16_t len, uint32_t *timing);
 void ReaderTransmitBitsPar(uint8_t *frame, uint16_t bits, uint8_t *par, uint32_t *timing);
 void ReaderTransmitPar(uint8_t *frame, uint16_t len, uint8_t *par, uint32_t *timing);
diff --git a/armsrc/iso14443b.c b/armsrc/iso14443b.c
index 052351173..5044d0bc2 100644
--- a/armsrc/iso14443b.c
+++ b/armsrc/iso14443b.c
@@ -1566,11 +1566,11 @@ void iso14b_set_trigger(bool enable) {
  * none
  *
  */
-void SendRawCommand14443B_Ex(UsbCommand *c) {
-    iso14b_command_t param = c->arg[0];
-    size_t len = c->arg[1] & 0xffff;
-    uint32_t timeout = c->arg[2];
-    uint8_t *cmd = c->d.asBytes;
+void SendRawCommand14443B_Ex(UsbCommandNG *c) {
+    iso14b_command_t param = c->core.old.arg[0];
+    size_t len = c->core.old.arg[1] & 0xffff;
+    uint32_t timeout = c->core.old.arg[2];
+    uint8_t *cmd = c->core.old.d.asBytes;
     uint8_t status;
     uint32_t sendlen = sizeof(iso14b_card_select_t);
     uint8_t buf[USB_CMD_DATA_SIZE] = {0x00};
diff --git a/armsrc/iso14443b.h b/armsrc/iso14443b.h
index cf16d48aa..55f6a54b7 100644
--- a/armsrc/iso14443b.h
+++ b/armsrc/iso14443b.h
@@ -34,7 +34,7 @@ extern "C" {
 # define AddCrc14B(data, len) compute_crc(CRC_14443_B, (data), (len), (data)+(len), (data)+(len)+1)
 #endif
 
-void SendRawCommand14443B_Ex(UsbCommand *c);
+void SendRawCommand14443B_Ex(UsbCommandNG *c);
 void iso14443b_setup();
 uint8_t iso14443b_apdu(uint8_t const *message, size_t message_length, uint8_t *response);
 uint8_t iso14443b_select_card(iso14b_card_select_t *card);
diff --git a/bootrom/bootrom.c b/bootrom/bootrom.c
index e5cb77ff7..7fa20ec0a 100644
--- a/bootrom/bootrom.c
+++ b/bootrom/bootrom.c
@@ -84,16 +84,15 @@ static void Fatal(void) {
     for (;;) {};
 }
 
-void UsbPacketReceived(uint8_t *packet, int len) {
+void UsbPacketReceived(UsbCommandNG *packet) {
     int i, dont_ack = 0;
-    UsbCommand *c = (UsbCommand *)packet;
     volatile uint32_t *p;
 
     //if ( len != sizeof(UsbCommand)) Fatal();
 
-    uint32_t arg0 = (uint32_t)c->arg[0];
+    uint32_t arg0 = (uint32_t)packet->core.old.arg[0];
 
-    switch (c->cmd) {
+    switch (packet->core.old.cmd) {
         case CMD_DEVICE_INFO: {
             dont_ack = 1;
             arg0 = DEVICE_INFO_FLAG_BOOTROM_PRESENT | DEVICE_INFO_FLAG_CURRENT_MODE_BOOTROM |
@@ -111,7 +110,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
             */
             p = (volatile uint32_t *)&_flash_start;
             for (i = 0; i < 12; i++)
-                p[i + arg0] = c->d.asDwords[i];
+                p[i + arg0] = packet->core.old.d.asDwords[i];
         }
         break;
 
@@ -119,7 +118,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
             uint32_t *flash_mem = (uint32_t *)(&_flash_start);
             for (int j = 0; j < 2; j++) {
                 for (i = 0 + (64 * j); i < 64 + (64 * j); i++) {
-                    flash_mem[i] = c->d.asDwords[i];
+                    flash_mem[i] = packet->core.old.d.asDwords[i];
                 }
 
                 uint32_t flash_address = arg0 + (0x100 * j);
@@ -155,7 +154,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
         break;
 
         case CMD_START_FLASH: {
-            if (c->arg[2] == START_FLASH_MAGIC)
+            if (packet->core.old.arg[2] == START_FLASH_MAGIC)
                 bootrom_unlocked = 1;
             else
                 bootrom_unlocked = 0;
@@ -164,8 +163,8 @@ void UsbPacketReceived(uint8_t *packet, int len) {
             int prot_end = (int)&_bootrom_end;
             int allow_start = (int)&_flash_start;
             int allow_end = (int)&_flash_end;
-            int cmd_start = c->arg[0];
-            int cmd_end = c->arg[1];
+            int cmd_start = packet->core.old.arg[0];
+            int cmd_end = packet->core.old.arg[1];
 
             /* Only allow command if the bootrom is unlocked, or the parameters are outside of the protected
             * bootrom area. In any case they must be within the flash area.
@@ -197,7 +196,7 @@ static void flash_mode(int externally_entered) {
     start_addr = 0;
     end_addr = 0;
     bootrom_unlocked = 0;
-    uint8_t rx[sizeof(UsbCommand)];
+    UsbCommandNG rx;
 
     usb_enable();
 
@@ -209,8 +208,9 @@ static void flash_mode(int externally_entered) {
 
         // Check if there is a usb packet available
         if (usb_poll_validate_length()) {
-            if (usb_read(rx, sizeof(rx)))
-                UsbPacketReceived(rx, sizeof(rx));
+// TODO DOEGOX
+            if (usb_read((uint8_t *)&rx, sizeof(rx)))
+                UsbPacketReceived(&rx);
         }
 
         if (!externally_entered && !BUTTON_PRESS()) {
diff --git a/client/cmdanalyse.c b/client/cmdanalyse.c
index 7c1ab93cf..a69c53222 100644
--- a/client/cmdanalyse.c
+++ b/client/cmdanalyse.c
@@ -517,11 +517,11 @@ static int CmdAnalyseA(const char *Cmd) {
     clearCommandBuffer();
     SendCommand(&c);
 
-    UsbCommand resp;
+    UsbReplyNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         return 1;
     }
-    PrintAndLogEx(NORMAL, "got ack.  Status %d", resp.arg[0]);
+    PrintAndLogEx(NORMAL, "got ack.  Status %d", resp.core.old.arg[0]);
     return 0;
     /*
         PrintAndLogEx(NORMAL, "-- " _BLUE_("its my message") "\n");
diff --git a/client/cmddata.c b/client/cmddata.c
index 0f99f5e48..e42838a33 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -1457,7 +1457,7 @@ int getSamples(uint32_t n, bool silent) {
 
     if (!silent) PrintAndLogEx(NORMAL, "Reading %d bytes from device memory\n", n);
 
-    UsbCommand response;
+    UsbReplyNG response;
     if (!GetFromDevice(BIG_BUF, got, n, 0, &response, 10000, true)) {
         PrintAndLogEx(WARNING, "timeout while waiting for reply.");
         return 1;
@@ -1468,8 +1468,8 @@ int getSamples(uint32_t n, bool silent) {
     uint8_t bits_per_sample = 8;
 
     //Old devices without this feature would send 0 at arg[0]
-    if (response.arg[0] > 0) {
-        sample_config *sc = (sample_config *) response.d.asBytes;
+    if (response.core.old.arg[0] > 0) {
+        sample_config *sc = (sample_config *) response.core.old.d.asBytes;
         if (!silent) PrintAndLogEx(NORMAL, "Samples @ %d bits/smpl, decimation 1:%d ", sc->bits_per_sample, sc->decimation);
         bits_per_sample = sc->bits_per_sample;
     }
@@ -1532,7 +1532,7 @@ int CmdTuneSamples(const char *Cmd) {
     UsbCommand c = {CMD_MEASURE_ANTENNA_TUNING, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
-    UsbCommand resp;
+    UsbReplyNG resp;
     while (!WaitForResponseTimeout(CMD_MEASURED_ANTENNA_TUNING, &resp, 2000)) {
         timeout++;
         printf(".");
@@ -1544,12 +1544,12 @@ int CmdTuneSamples(const char *Cmd) {
     }
     PrintAndLogEx(NORMAL, "\n");
 
-    uint32_t v_lf125 = resp.arg[0];
-    uint32_t v_lf134 = resp.arg[0] >> 32;
+    uint32_t v_lf125 = resp.core.old.arg[0];
+    uint32_t v_lf134 = resp.core.old.arg[0] >> 32;
 
-    uint32_t v_hf = resp.arg[1];
-    uint32_t peakf = resp.arg[2];
-    uint32_t peakv = resp.arg[2] >> 32;
+    uint32_t v_hf = resp.core.old.arg[1];
+    uint32_t peakf = resp.core.old.arg[2];
+    uint32_t peakv = resp.core.old.arg[2] >> 32;
 
     if (v_lf125 > NON_VOLTAGE)
         PrintAndLogEx(SUCCESS, "LF antenna: %5.2f V - 125.00 kHz", (v_lf125 * ANTENNA_ERROR) / 1000.0);
@@ -1595,8 +1595,8 @@ int CmdTuneSamples(const char *Cmd) {
     // even here, these values has 3% error.
     uint16_t test1 = 0;
     for (int i = 0; i < 256; i++) {
-        GraphBuffer[i] = resp.d.asBytes[i] - 128;
-        test1 += resp.d.asBytes[i];
+        GraphBuffer[i] = resp.core.old.d.asBytes[i] - 128;
+        test1 += resp.core.old.d.asBytes[i];
     }
 
     if (test1 > 0) {
diff --git a/client/cmdflashmem.c b/client/cmdflashmem.c
index 28f0d6853..b59f553b6 100644
--- a/client/cmdflashmem.c
+++ b/client/cmdflashmem.c
@@ -283,14 +283,14 @@ static int CmdFlashMemLoad(const char *Cmd) {
         bytes_remaining -= bytes_in_packet;
         bytes_sent += bytes_in_packet;
 
-        UsbCommand resp;
+        UsbReplyNG resp;
         if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
             PrintAndLogEx(WARNING, "timeout while waiting for reply.");
             free(data);
             return 1;
         }
 
-        uint8_t isok  = resp.arg[0] & 0xFF;
+        uint8_t isok  = resp.core.old.arg[0] & 0xFF;
         if (!isok)
             PrintAndLogEx(FAILED, "Flash write fail [offset %u]", bytes_sent);
 
@@ -392,12 +392,12 @@ static int CmdFlashMemWipe(const char *Cmd) {
     UsbCommand c = {CMD_FLASHMEM_WIPE, {page, initalwipe, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
-    UsbCommand resp;
+    UsbReplyNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 8000)) {
         PrintAndLogEx(WARNING, "timeout while waiting for reply.");
         return 1;
     }
-    uint8_t isok  = resp.arg[0] & 0xFF;
+    uint8_t isok  = resp.core.old.arg[0] & 0xFF;
     if (isok)
         PrintAndLogEx(SUCCESS, "Flash WIPE ok");
     else
@@ -438,13 +438,13 @@ static int CmdFlashMemInfo(const char *Cmd) {
     UsbCommand c = {CMD_FLASHMEM_INFO, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
-    UsbCommand resp;
+    UsbReplyNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         PrintAndLogEx(WARNING, "timeout while waiting for reply.");
         return 1;
     }
 
-    uint8_t isok = resp.arg[0] & 0xFF;
+    uint8_t isok = resp.core.old.arg[0] & 0xFF;
     if (!isok) {
         PrintAndLogEx(FAILED, "failed");
         return 1;
@@ -452,7 +452,7 @@ static int CmdFlashMemInfo(const char *Cmd) {
 
     // validate signature here
     rdv40_validation_t mem;
-    memcpy(&mem, (rdv40_validation_t *)resp.d.asBytes, sizeof(rdv40_validation_t));
+    memcpy(&mem, (rdv40_validation_t *)resp.core.old.d.asBytes, sizeof(rdv40_validation_t));
 
     // Flash ID hash (sha1)
     mbedtls_sha1(mem.flashid, sizeof(mem.flashid), sha_hash);
@@ -572,7 +572,7 @@ static int CmdFlashMemInfo(const char *Cmd) {
                 PrintAndLogEx(WARNING, "timeout while waiting for reply.");
             } else {
 
-                if (!resp.arg[0])
+                if (!resp.core.old.arg[0])
                     PrintAndLogEx(FAILED, "Writing signature failed");
                 else
                     PrintAndLogEx(SUCCESS, "Writing signature ok [offset: %u]", FLASH_MEM_SIGNATURE_OFFSET);
diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 52b2853b0..f9e336153 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -231,12 +231,12 @@ int Hf14443_4aGetCardData(iso14a_card_select_t *card) {
     UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT, 0, 0}, {{0}}};
     SendCommand(&c);
 
-    UsbCommand resp;
+    UsbReplyNG resp;
     WaitForResponse(CMD_ACK, &resp);
 
-    memcpy(card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
+    memcpy(card, (iso14a_card_select_t *)resp.core.old.d.asBytes, sizeof(iso14a_card_select_t));
 
-    uint64_t select_status = resp.arg[0]; // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
+    uint64_t select_status = resp.core.old.arg[0]; // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
 
     if (select_status == 0) {
         PrintAndLogEx(ERR, "E->iso14443a card select failed");
@@ -256,7 +256,7 @@ int Hf14443_4aGetCardData(iso14a_card_select_t *card) {
 
     PrintAndLogEx(NORMAL, " UID: %s", sprint_hex(card->uid, card->uidlen));
     PrintAndLogEx(NORMAL, "ATQA: %02x %02x", card->atqa[1], card->atqa[0]);
-    PrintAndLogEx(NORMAL, " SAK: %02x [%" PRIu64 "]", card->sak, resp.arg[0]);
+    PrintAndLogEx(NORMAL, " SAK: %02x [%" PRIu64 "]", card->sak, resp.core.old.arg[0]);
     if (card->ats_len < 3) { // a valid ATS consists of at least the length byte (TL) and 2 CRC bytes
         PrintAndLogEx(NORMAL, "E-> Error ATS length(%d) : %s", card->ats_len, sprint_hex(card->ats, card->ats_len));
         return 1;
@@ -303,7 +303,7 @@ static int CmdHF14AReader(const char *Cmd) {
     SendCommand(&c);
 
     if (ISO14A_CONNECT & cm) {
-        UsbCommand resp;
+        UsbReplyNG resp;
         if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
             if (!silent) PrintAndLogEx(WARNING, "iso14443a card select failed");
             DropField();
@@ -311,7 +311,7 @@ static int CmdHF14AReader(const char *Cmd) {
         }
 
         iso14a_card_select_t card;
-        memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
+        memcpy(&card, (iso14a_card_select_t *)resp.core.old.d.asBytes, sizeof(iso14a_card_select_t));
 
         /*
             0: couldn't read
@@ -319,7 +319,7 @@ static int CmdHF14AReader(const char *Cmd) {
             2: OK, no ATS
             3: proprietary Anticollision
         */
-        uint64_t select_status = resp.arg[0];
+        uint64_t select_status = resp.core.old.arg[0];
 
         if (select_status == 0) {
             if (!silent) PrintAndLogEx(WARNING, "iso14443a card select failed");
@@ -336,7 +336,7 @@ static int CmdHF14AReader(const char *Cmd) {
 
         PrintAndLogEx(NORMAL, " UID : %s", sprint_hex(card.uid, card.uidlen));
         PrintAndLogEx(NORMAL, "ATQA : %02x %02x", card.atqa[1], card.atqa[0]);
-        PrintAndLogEx(NORMAL, " SAK : %02x [%" PRIu64 "]", card.sak, resp.arg[0]);
+        PrintAndLogEx(NORMAL, " SAK : %02x [%" PRIu64 "]", card.sak, resp.core.old.arg[0]);
 
         if (card.ats_len >= 3) { // a valid ATS consists of at least the length byte (TL) and 2 CRC bytes
             PrintAndLogEx(NORMAL, " ATS : %s", sprint_hex(card.ats, card.ats_len));
@@ -388,13 +388,13 @@ static int CmdHF14ACUIDs(const char *Cmd) {
         UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0}, {{0}}};
         SendCommand(&c);
 
-        UsbCommand resp;
+        UsbReplyNG resp;
         WaitForResponse(CMD_ACK, &resp);
 
-        iso14a_card_select_t *card = (iso14a_card_select_t *) resp.d.asBytes;
+        iso14a_card_select_t *card = (iso14a_card_select_t *) resp.core.old.d.asBytes;
 
         // check if command failed
-        if (resp.arg[0] == 0) {
+        if (resp.core.old.arg[0] == 0) {
             PrintAndLogEx(WARNING, "card select failed.");
         } else {
             char uid_string[20];
@@ -487,16 +487,16 @@ int CmdHF14ASim(const char *Cmd) {
     memcpy(c.d.asBytes, uid, uidlen >> 1);
     clearCommandBuffer();
     SendCommand(&c);
-    UsbCommand resp;
+    UsbReplyNG resp;
 
     PrintAndLogEx(SUCCESS, "press pm3-button to abort simulation");
 
     while (!ukbhit()) {
         if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) continue;
         if (!(flags & FLAG_NR_AR_ATTACK)) break;
-        if ((resp.arg[0] & 0xffff) != CMD_SIMULATE_MIFARE_CARD) break;
+        if ((resp.core.old.arg[0] & 0xffff) != CMD_SIMULATE_MIFARE_CARD) break;
 
-        memcpy(data, resp.d.asBytes, sizeof(data));
+        memcpy(data, resp.core.old.d.asBytes, sizeof(data));
         readerAttack(data[0], setEmulatorMem, verbose);
     }
     showSectorTable();
@@ -525,7 +525,7 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
 
     if (activateField) {
         responseNum = 1;
-        UsbCommand resp;
+        UsbReplyNG resp;
 
         // Anticollision + SELECT card
         UsbCommand ca = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}, {{0}}};
@@ -536,17 +536,17 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
         }
 
         // check result
-        if (resp.arg[0] == 0) {
+        if (resp.core.old.arg[0] == 0) {
             PrintAndLogEx(ERR, "No card in field.");
             return 1;
         }
 
-        if (resp.arg[0] != 1 && resp.arg[0] != 2) {
-            PrintAndLogEx(ERR, "Card not in iso14443-4. res=%d.", resp.arg[0]);
+        if (resp.core.old.arg[0] != 1 && resp.core.old.arg[0] != 2) {
+            PrintAndLogEx(ERR, "Card not in iso14443-4. res=%d.", resp.core.old.arg[0]);
             return 1;
         }
 
-        if (resp.arg[0] == 2) { // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
+        if (resp.core.old.arg[0] == 2) { // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
             // get ATS
             UsbCommand cr = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT, 2, 0}, {{0}}};
             uint8_t rats[] = { 0xE0, 0x80 }; // FSDI=8 (FSD=256), CID=0
@@ -557,7 +557,7 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
                 return 1;
             }
 
-            if (resp.arg[0] == 0) { // ats_len
+            if (resp.core.old.arg[0] == 0) { // ats_len
                 PrintAndLogEx(ERR, "Can't get ATS.");
                 return 1;
             }
@@ -575,11 +575,11 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
     SendCommand(&c);
 
     uint8_t *recv;
-    UsbCommand resp;
+    UsbReplyNG resp;
 
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-        recv = resp.d.asBytes;
-        int iLen = resp.arg[0];
+        recv = resp.core.old.d.asBytes;
+        int iLen = resp.core.old.arg[0];
 
         if (!iLen) {
             PrintAndLogEx(ERR, "No card response.");
@@ -617,7 +617,7 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
 }
 
 static int SelectCard14443_4(bool disconnect, iso14a_card_select_t *card) {
-    UsbCommand resp;
+    UsbReplyNG resp;
 
     frameLength = 0;
 
@@ -635,17 +635,17 @@ static int SelectCard14443_4(bool disconnect, iso14a_card_select_t *card) {
     }
 
     // check result
-    if (resp.arg[0] == 0) {
+    if (resp.core.old.arg[0] == 0) {
         PrintAndLogEx(ERR, "No card in field.");
         return 1;
     }
 
-    if (resp.arg[0] != 1 && resp.arg[0] != 2) {
-        PrintAndLogEx(ERR, "Card not in iso14443-4. res=%d.", resp.arg[0]);
+    if (resp.core.old.arg[0] != 1 && resp.core.old.arg[0] != 2) {
+        PrintAndLogEx(ERR, "Card not in iso14443-4. res=%d.", resp.core.old.arg[0]);
         return 1;
     }
 
-    if (resp.arg[0] == 2) { // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
+    if (resp.core.old.arg[0] == 2) { // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
         // get ATS
         UsbCommand cr = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT, 2, 0}, {{0}}};
         uint8_t rats[] = { 0xE0, 0x80 }; // FSDI=8 (FSD=256), CID=0
@@ -656,20 +656,20 @@ static int SelectCard14443_4(bool disconnect, iso14a_card_select_t *card) {
             return 1;
         }
 
-        if (resp.arg[0] == 0) { // ats_len
+        if (resp.core.old.arg[0] == 0) { // ats_len
             PrintAndLogEx(ERR, "Can't get ATS.");
             return 1;
         }
 
         // get frame length from ATS in data field
-        if (resp.arg[0] > 1) {
-            uint8_t fsci = resp.d.asBytes[1] & 0x0f;
+        if (resp.core.old.arg[0] > 1) {
+            uint8_t fsci = resp.core.old.d.asBytes[1] & 0x0f;
             if (fsci < sizeof(atsFSC) / sizeof(atsFSC[0]))
                 frameLength = atsFSC[fsci];
         }
     } else {
         // get frame length from ATS in card data structure
-        iso14a_card_select_t *vcard = (iso14a_card_select_t *) resp.d.asBytes;
+        iso14a_card_select_t *vcard = (iso14a_card_select_t *) resp.core.old.d.asBytes;
         if (vcard->ats_len > 1) {
             uint8_t fsci = vcard->ats[1] & 0x0f;
             if (fsci < sizeof(atsFSC) / sizeof(atsFSC[0]))
@@ -712,12 +712,12 @@ static int CmdExchangeAPDU(bool chainingin, uint8_t *datain, int datainlen, bool
     SendCommand(&c);
 
     uint8_t *recv;
-    UsbCommand resp;
+    UsbReplyNG resp;
 
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-        recv = resp.d.asBytes;
-        int iLen = resp.arg[0];
-        uint8_t res = resp.arg[1];
+        recv = resp.core.old.d.asBytes;
+        int iLen = resp.core.old.arg[0];
+        uint8_t res = resp.core.old.arg[1];
 
         int dlen = iLen - 2;
         if (dlen < 0)
@@ -1047,12 +1047,12 @@ static int CmdHF14ACmdRaw(const char *Cmd) {
 }
 
 static int waitCmd(uint8_t iSelect) {
-    UsbCommand resp;
+    UsbReplyNG resp;
 
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-        uint16_t len = (resp.arg[0] & 0xFFFF);
+        uint16_t len = (resp.core.old.arg[0] & 0xFFFF);
         if (iSelect) {
-            len = (resp.arg[1] & 0xFFFF);
+            len = (resp.core.old.arg[1] & 0xFFFF);
             if (len) {
                 PrintAndLogEx(NORMAL, "Card selected. UID[%i]:", len);
             } else {
@@ -1065,7 +1065,7 @@ static int waitCmd(uint8_t iSelect) {
         if (!len)
             return 1;
 
-        PrintAndLogEx(NORMAL, "%s", sprint_hex(resp.d.asBytes, len));
+        PrintAndLogEx(NORMAL, "%s", sprint_hex(resp.core.old.d.asBytes, len));
     } else {
         PrintAndLogEx(WARNING, "timeout while waiting for reply.");
         return 3;
@@ -1164,7 +1164,7 @@ int infoHF14A(bool verbose, bool do_nack_test) {
     UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
-    UsbCommand resp;
+    UsbReplyNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         if (verbose) PrintAndLogEx(WARNING, "iso14443a card select failed");
         DropField();
@@ -1172,7 +1172,7 @@ int infoHF14A(bool verbose, bool do_nack_test) {
     }
 
     iso14a_card_select_t card;
-    memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
+    memcpy(&card, (iso14a_card_select_t *)resp.core.old.d.asBytes, sizeof(iso14a_card_select_t));
 
     /*
         0: couldn't read
@@ -1180,7 +1180,7 @@ int infoHF14A(bool verbose, bool do_nack_test) {
         2: OK, no ATS
         3: proprietary Anticollision
     */
-    uint64_t select_status = resp.arg[0];
+    uint64_t select_status = resp.core.old.arg[0];
 
     if (select_status == 0) {
         if (verbose) PrintAndLogEx(WARNING, "iso14443a card select failed");
@@ -1197,7 +1197,7 @@ int infoHF14A(bool verbose, bool do_nack_test) {
 
     PrintAndLogEx(NORMAL, " UID : %s", sprint_hex(card.uid, card.uidlen));
     PrintAndLogEx(NORMAL, "ATQA : %02x %02x", card.atqa[1], card.atqa[0]);
-    PrintAndLogEx(NORMAL, " SAK : %02x [%" PRIu64 "]", card.sak, resp.arg[0]);
+    PrintAndLogEx(NORMAL, " SAK : %02x [%" PRIu64 "]", card.sak, resp.core.old.arg[0]);
 
     bool isMifareClassic = true;
     switch (card.sak) {
@@ -1221,9 +1221,9 @@ int infoHF14A(bool verbose, bool do_nack_test) {
             SendCommand(&c);
             WaitForResponse(CMD_ACK, &resp);
 
-            memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
+            memcpy(&card, (iso14a_card_select_t *)resp.core.old.d.asBytes, sizeof(iso14a_card_select_t));
 
-            select_status = resp.arg[0]; // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS
+            select_status = resp.core.old.arg[0]; // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS
 
             if (select_status == 0) {
                 DropField();
@@ -1295,8 +1295,8 @@ int infoHF14A(bool verbose, bool do_nack_test) {
         SendCommand(&c);
         WaitForResponse(CMD_ACK, &resp);
 
-        memcpy(card.ats, resp.d.asBytes, resp.arg[0]);
-        card.ats_len = resp.arg[0]; // note: ats_len includes CRC Bytes
+        memcpy(card.ats, resp.core.old.d.asBytes, resp.core.old.arg[0]);
+        card.ats_len = resp.core.old.arg[0]; // note: ats_len includes CRC Bytes
     }
 
     if (card.ats_len >= 3) {        // a valid ATS consists of at least the length byte (TL) and 2 CRC bytes
diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c
index b1aa78e64..b9553a909 100644
--- a/client/cmdhf14b.c
+++ b/client/cmdhf14b.c
@@ -124,15 +124,15 @@ static int switch_off_field_14b(void) {
 static bool waitCmd14b(bool verbose) {
 
     uint8_t data[USB_CMD_DATA_SIZE] = {0x00};
-    UsbCommand resp;
+    UsbReplyNG resp;
 
     if (WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
 
-        if ((resp.arg[0] & 0xFF) > 0) return false;
+        if ((resp.core.old.arg[0] & 0xFF) > 0) return false;
 
-        uint16_t len = (resp.arg[1] & 0xFFFF);
+        uint16_t len = (resp.core.old.arg[1] & 0xFFFF);
 
-        memcpy(data, resp.d.asBytes, len);
+        memcpy(data, resp.core.old.d.asBytes, len);
 
         if (verbose) {
             if (len >= 3) {
@@ -301,7 +301,7 @@ static bool get_14b_UID(iso14b_card_select_t *card) {
         return false;
 
     int8_t retry = 3;
-    UsbCommand resp;
+    UsbReplyNG resp;
     UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_SR | ISO14B_DISCONNECT, 0, 0}, {{0}}};
 
     // test for 14b SR
@@ -311,9 +311,9 @@ static bool get_14b_UID(iso14b_card_select_t *card) {
         SendCommand(&c);
         if (WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
 
-            uint8_t status = resp.arg[0];
+            uint8_t status = resp.core.old.arg[0];
             if (status == 0) {
-                memcpy(card, (iso14b_card_select_t *)resp.d.asBytes, sizeof(iso14b_card_select_t));
+                memcpy(card, (iso14b_card_select_t *)resp.core.old.d.asBytes, sizeof(iso14b_card_select_t));
                 return true;
             }
         }
@@ -329,9 +329,9 @@ static bool get_14b_UID(iso14b_card_select_t *card) {
         SendCommand(&c);
         if (WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
 
-            uint8_t status = resp.arg[0];
+            uint8_t status = resp.core.old.arg[0];
             if (status == 0) {
-                memcpy(card, (iso14b_card_select_t *)resp.d.asBytes, sizeof(iso14b_card_select_t));
+                memcpy(card, (iso14b_card_select_t *)resp.core.old.d.asBytes, sizeof(iso14b_card_select_t));
                 return true;
             }
         }
@@ -512,7 +512,7 @@ static bool HF14B_Std_Info(bool verbose) {
     UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_STD | ISO14B_DISCONNECT, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
-    UsbCommand resp;
+    UsbReplyNG resp;
 
     if (!WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
         if (verbose) PrintAndLogEx(WARNING, "command execution timeout");
@@ -521,9 +521,9 @@ static bool HF14B_Std_Info(bool verbose) {
     }
 
     iso14b_card_select_t card;
-    memcpy(&card, (iso14b_card_select_t *)resp.d.asBytes, sizeof(iso14b_card_select_t));
+    memcpy(&card, (iso14b_card_select_t *)resp.core.old.d.asBytes, sizeof(iso14b_card_select_t));
 
-    uint64_t status = resp.arg[0];
+    uint64_t status = resp.core.old.arg[0];
 
     switch (status) {
         case 0:
@@ -553,7 +553,7 @@ static bool HF14B_ST_Info(bool verbose) {
     UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_SR | ISO14B_DISCONNECT, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
-    UsbCommand resp;
+    UsbReplyNG resp;
 
     if (!WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
         if (verbose) PrintAndLogEx(WARNING, "command execution timeout");
@@ -561,9 +561,9 @@ static bool HF14B_ST_Info(bool verbose) {
     }
 
     iso14b_card_select_t card;
-    memcpy(&card, (iso14b_card_select_t *)resp.d.asBytes, sizeof(iso14b_card_select_t));
+    memcpy(&card, (iso14b_card_select_t *)resp.core.old.d.asBytes, sizeof(iso14b_card_select_t));
 
-    uint64_t status = resp.arg[0];
+    uint64_t status = resp.core.old.arg[0];
     if (status > 0)
         return false;
 
@@ -610,16 +610,16 @@ static bool HF14B_ST_Reader(bool verbose) {
     UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_SR | ISO14B_DISCONNECT, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
-    UsbCommand resp;
+    UsbReplyNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
         if (verbose) PrintAndLogEx(WARNING, "command execution timeout");
         return false;
     }
 
     iso14b_card_select_t card;
-    memcpy(&card, (iso14b_card_select_t *)resp.d.asBytes, sizeof(iso14b_card_select_t));
+    memcpy(&card, (iso14b_card_select_t *)resp.core.old.d.asBytes, sizeof(iso14b_card_select_t));
 
-    uint64_t status = resp.arg[0];
+    uint64_t status = resp.core.old.arg[0];
 
     switch (status) {
         case 0:
@@ -650,7 +650,7 @@ static bool HF14B_Std_Reader(bool verbose) {
     UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_STD | ISO14B_DISCONNECT, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
-    UsbCommand resp;
+    UsbReplyNG resp;
 
     if (!WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
         if (verbose) PrintAndLogEx(WARNING, "command execution timeout");
@@ -658,9 +658,9 @@ static bool HF14B_Std_Reader(bool verbose) {
     }
 
     iso14b_card_select_t card;
-    memcpy(&card, (iso14b_card_select_t *)resp.d.asBytes, sizeof(iso14b_card_select_t));
+    memcpy(&card, (iso14b_card_select_t *)resp.core.old.d.asBytes, sizeof(iso14b_card_select_t));
 
-    uint64_t status = resp.arg[0];
+    uint64_t status = resp.core.old.arg[0];
 
     switch (status) {
         case 0:
@@ -697,7 +697,7 @@ static bool HF14B_Other_Reader() {
 
     // clearCommandBuffer();
     // SendCommand(&c);
-    // UsbCommand resp;
+    // UsbReplyNG resp;
     // WaitForResponse(CMD_ACK,&resp);
 
     // if (datalen > 2 ) {
@@ -712,7 +712,7 @@ static bool HF14B_Other_Reader() {
     // c.d.asBytes[0] = ISO14443B_AUTHENTICATE;
     // clearCommandBuffer();
     // SendCommand(&c);
-    // UsbCommand resp;
+    // UsbReplyNG resp;
     // WaitForResponse(CMD_ACK, &resp);
 
     // if (datalen > 0) {
@@ -727,7 +727,7 @@ static bool HF14B_Other_Reader() {
     // c.d.asBytes[0] = ISO14443B_RESET;
     // clearCommandBuffer();
     // SendCommand(&c);
-    // UsbCommand resp;
+    // UsbReplyNG resp;
     // WaitForResponse(CMD_ACK, &resp);
 
     // if (datalen > 0) {
@@ -901,15 +901,15 @@ static int CmdHF14BDump(const char *Cmd) {
     int blocknum = 0;
     uint8_t *recv = NULL;
 
-    UsbCommand resp;
+    UsbReplyNG resp;
     UsbCommand c = {CMD_ISO_14443B_COMMAND, { ISO14B_CONNECT | ISO14B_SELECT_SR, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
 
     //select
     if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
-        if (resp.arg[0]) {
-            PrintAndLogEx(INFO, "failed to select %d | %d", resp.arg[0], resp.arg[1]);
+        if (resp.core.old.arg[0]) {
+            PrintAndLogEx(INFO, "failed to select %d | %d", resp.core.old.arg[0], resp.core.old.arg[1]);
             goto out;
         }
     }
@@ -929,20 +929,20 @@ static int CmdHF14BDump(const char *Cmd) {
 
         if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
 
-            uint8_t status = resp.arg[0] & 0xFF;
+            uint8_t status = resp.core.old.arg[0] & 0xFF;
             if (status > 0) {
                 continue;
             }
 
-            uint16_t len = (resp.arg[1] & 0xFFFF);
-            recv = resp.d.asBytes;
+            uint16_t len = (resp.core.old.arg[1] & 0xFFFF);
+            recv = resp.core.old.d.asBytes;
 
             if (!check_crc(CRC_14443_B, recv, len)) {
                 PrintAndLogEx(FAILED, "crc fail, retrying one more time");
                 continue;
             }
 
-            memcpy(data + (blocknum * 4), resp.d.asBytes, 4);
+            memcpy(data + (blocknum * 4), resp.core.old.d.asBytes, 4);
 
             if (blocknum == 0xFF) {
                 //last read.
diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index 496ea3073..78ff9f860 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -198,7 +198,7 @@ const productName uidmapping[] = {
 // returns 1 if suceeded
 static int getUID(uint8_t *buf) {
 
-    UsbCommand resp;
+    UsbReplyNG resp;
     UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}}; // len,speed,recv?
 
     c.d.asBytes[0] = ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | ISO15_REQ_INVENTORY | ISO15_REQINV_SLOT1;
@@ -218,9 +218,9 @@ static int getUID(uint8_t *buf) {
 
         if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
 
-            uint8_t resplen = resp.arg[0];
-            if (resplen >= 12 && CheckCrc15(resp.d.asBytes, 12)) {
-                memcpy(buf, resp.d.asBytes + 2, 8);
+            uint8_t resplen = resp.core.old.arg[0];
+            if (resplen >= 12 && CheckCrc15(resp.core.old.d.asBytes, 12)) {
+                memcpy(buf, resp.core.old.d.asBytes + 2, 8);
                 return 1;
             }
         }
@@ -594,7 +594,7 @@ static int CmdHF15Info(const char *Cmd) {
     char cmdp = param_getchar(Cmd, 0);
     if (strlen(Cmd) < 1 || cmdp == 'h' || cmdp == 'H') return usage_15_info();
 
-    UsbCommand resp;
+    UsbReplyNG resp;
     uint8_t *recv;
     UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}}; // len,speed,recv?
     uint8_t *req = c.d.asBytes;
@@ -619,14 +619,14 @@ static int CmdHF15Info(const char *Cmd) {
         return 1;
     }
 
-    uint32_t status = resp.arg[0];
+    uint32_t status = resp.core.old.arg[0];
 
     if (status < 2) {
         PrintAndLogEx(WARNING, "iso15693 card doesn't answer to systeminfo command");
         return 1;
     }
 
-    recv = resp.d.asBytes;
+    recv = resp.core.old.d.asBytes;
 
     if (recv[0] & ISO15_RES_ERROR) {
         PrintAndLogEx(WARNING, "iso15693 card returned error %i: %s", recv[0], TagErrorStr(recv[0]));
@@ -783,7 +783,7 @@ static int CmdHF15Dump(const char *Cmd) {
     uint8_t data[256 * 4] = {0};
     memset(data, 0, sizeof(data));
 
-    UsbCommand resp;
+    UsbReplyNG resp;
     UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}}; // len,speed,recv?
     uint8_t *req = c.d.asBytes;
     req[0] = ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | ISO15_REQ_NONINVENTORY | ISO15_REQ_ADDRESS;
@@ -803,13 +803,13 @@ static int CmdHF15Dump(const char *Cmd) {
 
         if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
 
-            uint8_t len = resp.arg[0];
+            uint8_t len = resp.core.old.arg[0];
             if (len < 2) {
                 PrintAndLogEx(FAILED, "iso15693 card select failed");
                 continue;
             }
 
-            recv = resp.d.asBytes;
+            recv = resp.core.old.d.asBytes;
 
             if (!CheckCrc15(recv, len)) {
                 PrintAndLogEx(FAILED, "crc fail");
@@ -821,9 +821,9 @@ static int CmdHF15Dump(const char *Cmd) {
                 break;
             }
 
-            mem[blocknum].lock = resp.d.asBytes[0];
-            memcpy(mem[blocknum].block, resp.d.asBytes + 1, 4);
-            memcpy(data + (blocknum * 4), resp.d.asBytes + 1, 4);
+            mem[blocknum].lock = resp.core.old.d.asBytes[0];
+            memcpy(mem[blocknum].block, resp.core.old.d.asBytes + 1, 4);
+            memcpy(data + (blocknum * 4), resp.core.old.d.asBytes + 1, 4);
 
             retry = 0;
             blocknum++;
@@ -859,7 +859,7 @@ static int CmdHF15Raw(const char *Cmd) {
     char cmdp = param_getchar(Cmd, 0);
     if (strlen(Cmd) < 3 || cmdp == 'h' || cmdp == 'H') return usage_15_raw();
 
-    UsbCommand resp;
+    UsbReplyNG resp;
     UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}}; // len,speed,recv?
     int reply = 1, fast = 1, i = 0;
     bool crc = false;
@@ -926,9 +926,9 @@ static int CmdHF15Raw(const char *Cmd) {
 
     if (reply) {
         if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
-            uint8_t len = resp.arg[0];
+            uint8_t len = resp.core.old.arg[0];
             PrintAndLogEx(NORMAL, "received %i octets", len);
-            PrintAndLogEx(NORMAL, "%s", sprint_hex(resp.d.asBytes, len));
+            PrintAndLogEx(NORMAL, "%s", sprint_hex(resp.core.old.d.asBytes, len));
         } else {
             PrintAndLogEx(WARNING, "timeout while waiting for reply.");
         }
@@ -945,7 +945,7 @@ static int CmdHF15Readmulti(const char *Cmd) {
     char cmdp = param_getchar(Cmd, 0);
     if (strlen(Cmd) < 3 || cmdp == 'h' || cmdp == 'H') return usage_15_readmulti();
 
-    UsbCommand resp;
+    UsbReplyNG resp;
     uint8_t *recv;
     UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}}; // len,speed,recv?
     uint8_t *req = c.d.asBytes;
@@ -986,13 +986,13 @@ static int CmdHF15Readmulti(const char *Cmd) {
         return 1;
     }
 
-    uint32_t status = resp.arg[0];
+    uint32_t status = resp.core.old.arg[0];
     if (status < 2) {
         PrintAndLogEx(FAILED, "iso15693 card select failed");
         return 1;
     }
 
-    recv = resp.d.asBytes;
+    recv = resp.core.old.d.asBytes;
 
     if (!CheckCrc15(recv, status)) {
         PrintAndLogEx(FAILED, "CRC failed");
@@ -1028,7 +1028,7 @@ static int CmdHF15Read(const char *Cmd) {
     char cmdp = param_getchar(Cmd, 0);
     if (strlen(Cmd) < 3 || cmdp == 'h' || cmdp == 'H')  return usage_15_read();
 
-    UsbCommand resp;
+    UsbReplyNG resp;
     uint8_t *recv;
 
     // UsbCommand arg: len, speed, recv?
@@ -1066,13 +1066,13 @@ static int CmdHF15Read(const char *Cmd) {
         return 1;
     }
 
-    uint32_t status = resp.arg[0];
+    uint32_t status = resp.core.old.arg[0];
     if (status < 2) {
         PrintAndLogEx(NORMAL, "iso15693 card select failed");
         return 1;
     }
 
-    recv = resp.d.asBytes;
+    recv = resp.core.old.d.asBytes;
 
     if (!CheckCrc15(recv, status)) {
         PrintAndLogEx(NORMAL, "CRC failed");
@@ -1102,7 +1102,7 @@ static int CmdHF15Write(const char *Cmd) {
     char cmdp = param_getchar(Cmd, 0);
     if (strlen(Cmd) < 3 || cmdp == 'h' || cmdp == 'H') return usage_15_write();
 
-    UsbCommand resp;
+    UsbReplyNG resp;
     uint8_t *recv;
     UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}}; // len,speed,recv?
     uint8_t *req = c.d.asBytes;
@@ -1150,13 +1150,13 @@ static int CmdHF15Write(const char *Cmd) {
         return 1;
     }
 
-    uint32_t status = resp.arg[0];
+    uint32_t status = resp.core.old.arg[0];
     if (status < 2) {
         PrintAndLogEx(FAILED, "iso15693 card select failed");
         return 1;
     }
 
-    recv = resp.d.asBytes;
+    recv = resp.core.old.d.asBytes;
 
     if (!CheckCrc15(recv, status)) {
         PrintAndLogEx(FAILED, "CRC failed");
diff --git a/client/cmdhfepa.c b/client/cmdhfepa.c
index dd12f3bf4..ac9900c64 100644
--- a/client/cmdhfepa.c
+++ b/client/cmdhfepa.c
@@ -34,17 +34,17 @@ static int CmdHFEPACollectPACENonces(const char *Cmd) {
         UsbCommand c = {CMD_EPA_PACE_COLLECT_NONCE, {(int)m, 0, 0}, {{0}}};
         clearCommandBuffer();
         SendCommand(&c);
-        UsbCommand resp;
+        UsbReplyNG resp;
         WaitForResponse(CMD_ACK, &resp);
 
         // check if command failed
-        if (resp.arg[0] != 0) {
-            PrintAndLogEx(FAILED, "Error in step %d, Return code: %d", resp.arg[0], (int)resp.arg[1]);
+        if (resp.core.old.arg[0] != 0) {
+            PrintAndLogEx(FAILED, "Error in step %d, Return code: %d", resp.core.old.arg[0], (int)resp.core.old.arg[1]);
         } else {
-            size_t nonce_length = resp.arg[1];
+            size_t nonce_length = resp.core.old.arg[1];
             char *nonce = (char *) calloc(2 * nonce_length + 1, sizeof(uint8_t));
             for (int j = 0; j < nonce_length; j++) {
-                sprintf(nonce + (2 * j), "%02X", resp.d.asBytes[j]);
+                sprintf(nonce + (2 * j), "%02X", resp.core.old.d.asBytes[j]);
             }
             // print nonce
             PrintAndLogEx(NORMAL, "Length: %d, Nonce: %s", nonce_length, nonce);
@@ -72,7 +72,7 @@ static int CmdHFEPAPACEReplay(const char *Cmd) {
         "Example:\n preplay 0022C1A4 1068000000 1086000002 1234ABCDEF 1A2B3C4D";
 
     // Proxmark response
-    UsbCommand resp;
+    UsbReplyNG resp;
 
     int skip = 0, skip_add = 0, scan_return;
     // for each APDU
@@ -132,7 +132,7 @@ static int CmdHFEPAPACEReplay(const char *Cmd) {
             clearCommandBuffer();
             SendCommand(&usb_cmd);
             WaitForResponse(CMD_ACK, &resp);
-            if (resp.arg[0] != 0) {
+            if (resp.core.old.arg[0] != 0) {
                 PrintAndLogEx(WARNING, "Transfer of APDU #%d Part %d failed!", i, j);
                 return 0;
             }
@@ -144,21 +144,21 @@ static int CmdHFEPAPACEReplay(const char *Cmd) {
     clearCommandBuffer();
     SendCommand(&usb_cmd);
     WaitForResponse(CMD_ACK, &resp);
-    if (resp.arg[0] != 0) {
-        PrintAndLogEx(NORMAL, "\nPACE replay failed in step %u!", (uint32_t)resp.arg[0]);
+    if (resp.core.old.arg[0] != 0) {
+        PrintAndLogEx(NORMAL, "\nPACE replay failed in step %u!", (uint32_t)resp.core.old.arg[0]);
         PrintAndLogEx(NORMAL, "Measured times:");
-        PrintAndLogEx(NORMAL, "MSE Set AT: %u us", resp.d.asDwords[0]);
-        PrintAndLogEx(NORMAL, "GA Get Nonce: %u us", resp.d.asDwords[1]);
-        PrintAndLogEx(NORMAL, "GA Map Nonce: %u us", resp.d.asDwords[2]);
-        PrintAndLogEx(NORMAL, "GA Perform Key Agreement: %u us", resp.d.asDwords[3]);
-        PrintAndLogEx(NORMAL, "GA Mutual Authenticate: %u us", resp.d.asDwords[4]);
+        PrintAndLogEx(NORMAL, "MSE Set AT: %u us", resp.core.old.d.asDwords[0]);
+        PrintAndLogEx(NORMAL, "GA Get Nonce: %u us", resp.core.old.d.asDwords[1]);
+        PrintAndLogEx(NORMAL, "GA Map Nonce: %u us", resp.core.old.d.asDwords[2]);
+        PrintAndLogEx(NORMAL, "GA Perform Key Agreement: %u us", resp.core.old.d.asDwords[3]);
+        PrintAndLogEx(NORMAL, "GA Mutual Authenticate: %u us", resp.core.old.d.asDwords[4]);
     } else {
         PrintAndLogEx(NORMAL, "PACE replay successfull!");
-        PrintAndLogEx(NORMAL, "MSE Set AT: %u us", resp.d.asDwords[0]);
-        PrintAndLogEx(NORMAL, "GA Get Nonce: %u us", resp.d.asDwords[1]);
-        PrintAndLogEx(NORMAL, "GA Map Nonce: %u us", resp.d.asDwords[2]);
-        PrintAndLogEx(NORMAL, "GA Perform Key Agreement: %u us", resp.d.asDwords[3]);
-        PrintAndLogEx(NORMAL, "GA Mutual Authenticate: %u us", resp.d.asDwords[4]);
+        PrintAndLogEx(NORMAL, "MSE Set AT: %u us", resp.core.old.d.asDwords[0]);
+        PrintAndLogEx(NORMAL, "GA Get Nonce: %u us", resp.core.old.d.asDwords[1]);
+        PrintAndLogEx(NORMAL, "GA Map Nonce: %u us", resp.core.old.d.asDwords[2]);
+        PrintAndLogEx(NORMAL, "GA Perform Key Agreement: %u us", resp.core.old.d.asDwords[3]);
+        PrintAndLogEx(NORMAL, "GA Mutual Authenticate: %u us", resp.core.old.d.asDwords[4]);
     }
     return 1;
 }
diff --git a/client/cmdhffelica.c b/client/cmdhffelica.c
index ae095116a..6a7ea4819 100644
--- a/client/cmdhffelica.c
+++ b/client/cmdhffelica.c
@@ -132,7 +132,7 @@ static int CmdHFFelicaSim(const char *Cmd) {
     memcpy(c.d.asBytes, uid, uidlen >> 1);
     clearCommandBuffer();
     SendCommand(&c);
-    UsbCommand resp;
+    UsbReplyNG resp;
 
     if (verbose)
         PrintAndLogEx(NORMAL, "Press pm3-button to abort simulation");
@@ -355,7 +355,7 @@ static int CmdHFFelicaDumpLite(const char *Cmd) {
     UsbCommand c = {CMD_FELICA_LITE_DUMP, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
-    UsbCommand resp;
+    UsbReplyNG resp;
 
     uint8_t timeout = 0;
     while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
@@ -375,12 +375,12 @@ static int CmdHFFelicaDumpLite(const char *Cmd) {
             return 1;
         }
     }
-    if (resp.arg[0] == 0) {
+    if (resp.core.old.arg[0] == 0) {
         PrintAndLogEx(WARNING, "\nButton pressed. Aborted.");
         return 1;
     }
 
-    uint64_t tracelen = resp.arg[1];
+    uint64_t tracelen = resp.core.old.arg[1];
     if (tracelen == 0)
         return 1;
 
@@ -412,14 +412,14 @@ static int CmdHFFelicaDumpLite(const char *Cmd) {
 }
 
 static void waitCmdFelica(uint8_t iSelect) {
-    UsbCommand resp;
+    UsbReplyNG resp;
 
     if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
-        uint16_t len = iSelect ? (resp.arg[1] & 0xffff) : (resp.arg[0]  & 0xffff);
+        uint16_t len = iSelect ? (resp.core.old.arg[1] & 0xffff) : (resp.core.old.arg[0]  & 0xffff);
         PrintAndLogEx(NORMAL, "received %i octets", len);
         if (!len)
             return;
-        PrintAndLogEx(NORMAL, "%s", sprint_hex(resp.d.asBytes, len));
+        PrintAndLogEx(NORMAL, "%s", sprint_hex(resp.core.old.d.asBytes, len));
     } else {
         PrintAndLogEx(WARNING, "timeout while waiting for reply.");
     }
@@ -572,7 +572,7 @@ int readFelicaUid(bool verbose) {
     UsbCommand c = {CMD_FELICA_COMMAND, {FELICA_CONNECT, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
-    UsbCommand resp;
+    UsbReplyNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         if (verbose) PrintAndLogEx(WARNING, "FeliCa card select failed");
         //SendCommand(&cDisconnect);
@@ -580,8 +580,8 @@ int readFelicaUid(bool verbose) {
     }
 
     felica_card_select_t card;
-    memcpy(&card, (felica_card_select_t *)resp.d.asBytes, sizeof(felica_card_select_t));
-    uint64_t status = resp.arg[0];
+    memcpy(&card, (felica_card_select_t *)resp.core.old.d.asBytes, sizeof(felica_card_select_t));
+    uint64_t status = resp.core.old.arg[0];
 
     switch (status) {
         case 1: {
diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index 0850e6606..59273fe06 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -381,7 +381,7 @@ static int CmdHFiClassSim(const char *Cmd) {
             PrintAndLogEx(INFO, "Starting iCLASS sim 2 attack (elite mode)");
             PrintAndLogEx(INFO, "press keyboard to cancel");
             UsbCommand c = {CMD_SIMULATE_TAG_ICLASS, {simType, NUM_CSNS}, {{0}}};
-            UsbCommand resp;
+            UsbReplyNG resp;
             memcpy(c.d.asBytes, csns, 8 * NUM_CSNS);
             clearCommandBuffer();
             SendCommand(&c);
@@ -399,7 +399,7 @@ static int CmdHFiClassSim(const char *Cmd) {
                     return 0;
                 }
             }
-            uint8_t num_mac  = resp.arg[1];
+            uint8_t num_mac  = resp.core.old.arg[1];
             bool success = (NUM_CSNS == num_mac);
             PrintAndLogEx(NORMAL, "[%c] %d out of %d MAC obtained [%s]", (success) ? '+' : '!', num_mac, NUM_CSNS, (success) ? "OK" : "FAIL");
 
@@ -420,9 +420,9 @@ static int CmdHFiClassSim(const char *Cmd) {
                 //copy CSN
                 memcpy(dump + i * 24, csns + i * 8, 8);
                 //copy epurse
-                memcpy(dump + i * 24 + 8, resp.d.asBytes + i * 16, 8);
+                memcpy(dump + i * 24 + 8, resp.core.old.d.asBytes + i * 16, 8);
                 // NR_MAC (eight bytes from the response)  ( 8b csn + 8b epurse == 16)
-                memcpy(dump + i * 24 + 16, resp.d.asBytes + i * 16 + 8, 8);
+                memcpy(dump + i * 24 + 16, resp.core.old.d.asBytes + i * 16 + 8, 8);
             }
             /** Now, save to dumpfile **/
             saveFile("iclass_mac_attack", "bin", dump, datalen);
@@ -434,7 +434,7 @@ static int CmdHFiClassSim(const char *Cmd) {
             PrintAndLogEx(INFO, "Starting iCLASS sim 4 attack (elite mode, reader in key roll mode)");
             PrintAndLogEx(INFO, "press keyboard to cancel");
             UsbCommand c = {CMD_SIMULATE_TAG_ICLASS, {simType, NUM_CSNS}, {{0}}};
-            UsbCommand resp;
+            UsbReplyNG resp;
             memcpy(c.d.asBytes, csns, 8 * NUM_CSNS);
             clearCommandBuffer();
             SendCommand(&c);
@@ -452,7 +452,7 @@ static int CmdHFiClassSim(const char *Cmd) {
                     return 0;
                 }
             }
-            uint8_t num_mac = resp.arg[1];
+            uint8_t num_mac = resp.core.old.arg[1];
             bool success = ((NUM_CSNS * 2) == num_mac);
             PrintAndLogEx(NORMAL, "[%c] %d out of %d MAC obtained [%s]", (success) ? '+' : '!', num_mac, NUM_CSNS * 2, (success) ? "OK" : "FAIL");
 
@@ -475,9 +475,9 @@ static int CmdHFiClassSim(const char *Cmd) {
                 // copy CSN
                 memcpy(dump + i * MAC_ITEM_SIZE, csns + i * 8, 8); //CSN
                 // copy EPURSE
-                memcpy(dump + i * MAC_ITEM_SIZE + 8, resp.d.asBytes + i * 16, 8);
+                memcpy(dump + i * MAC_ITEM_SIZE + 8, resp.core.old.d.asBytes + i * 16, 8);
                 // copy NR_MAC (eight bytes from the response)  ( 8b csn + 8b epurse == 16)
-                memcpy(dump + i * MAC_ITEM_SIZE + 16, resp.d.asBytes + i * 16 + 8, 8);
+                memcpy(dump + i * MAC_ITEM_SIZE + 16, resp.core.old.d.asBytes + i * 16 + 8, 8);
             }
             saveFile("iclass_mac_attack_keyroll_A", "bin", dump, datalen);
 
@@ -489,9 +489,9 @@ static int CmdHFiClassSim(const char *Cmd) {
                 // Copy CSN
                 memcpy(dump + i * MAC_ITEM_SIZE, csns + i * 8, 8);
                 // copy EPURSE
-                memcpy(dump + i * MAC_ITEM_SIZE + 8, resp.d.asBytes + resp_index, 8);
+                memcpy(dump + i * MAC_ITEM_SIZE + 8, resp.core.old.d.asBytes + resp_index, 8);
                 // copy NR_MAC (eight bytes from the response)  ( 8b csn + 8 epurse == 16)
-                memcpy(dump + i * MAC_ITEM_SIZE + 16, resp.d.asBytes + resp_index + 8, 8);
+                memcpy(dump + i * MAC_ITEM_SIZE + 16, resp.core.old.d.asBytes + resp_index + 8, 8);
                 resp_index++;
             }
             saveFile("iclass_mac_attack_keyroll_B", "bin", dump, datalen);
@@ -767,7 +767,7 @@ static void Calc_wb_mac(uint8_t blockno, uint8_t *data, uint8_t *div_key, uint8_
 }
 
 static bool select_only(uint8_t *CSN, uint8_t *CCNR, bool use_credit_key, bool verbose) {
-    UsbCommand resp;
+    UsbReplyNG resp;
     UsbCommand c = {CMD_READER_ICLASS, {0}, {{0}}};
     c.arg[0] = FLAG_ICLASS_READER_ONLY_ONCE | FLAG_ICLASS_READER_CC | FLAG_ICLASS_READER_ONE_TRY;
 
@@ -781,8 +781,8 @@ static bool select_only(uint8_t *CSN, uint8_t *CCNR, bool use_credit_key, bool v
         return false;
     }
 
-    uint8_t isOK = resp.arg[0] & 0xff;
-    uint8_t *data = resp.d.asBytes;
+    uint8_t isOK = resp.core.old.arg[0] & 0xff;
+    uint8_t *data = resp.core.old.d.asBytes;
 
     memcpy(CSN, data, 8);
 
@@ -818,7 +818,7 @@ static bool select_and_auth(uint8_t *KEY, uint8_t *MAC, uint8_t *div_key, bool u
     if (verbose) PrintAndLogEx(SUCCESS, "authing with %s: %s", rawkey ? "raw key" : "diversified key", sprint_hex(div_key, 8));
 
     doMAC(CCNR, div_key, MAC);
-    UsbCommand resp;
+    UsbReplyNG resp;
     UsbCommand d = {CMD_ICLASS_AUTHENTICATION, {0, 0, 0}, {{0}}};
     memcpy(d.d.asBytes, MAC, 4);
     clearCommandBuffer();
@@ -827,7 +827,7 @@ static bool select_and_auth(uint8_t *KEY, uint8_t *MAC, uint8_t *div_key, bool u
         if (verbose) PrintAndLogEx(FAILED, "auth command execute timeout");
         return false;
     }
-    uint8_t isOK = resp.arg[0] & 0xFF;
+    uint8_t isOK = resp.core.old.arg[0] & 0xFF;
     if (!isOK) {
         if (verbose) PrintAndLogEx(FAILED, "authentication error");
         return false;
@@ -940,7 +940,7 @@ static int CmdHFiClassReader_Dump(const char *Cmd) {
 
     //get config and first 3 blocks
     UsbCommand c = {CMD_READER_ICLASS, {flags, 0, 0}, {{0}}};
-    UsbCommand resp;
+    UsbReplyNG resp;
     uint8_t tag_data[255 * 8];
 
     clearCommandBuffer();
@@ -952,8 +952,8 @@ static int CmdHFiClassReader_Dump(const char *Cmd) {
     }
     DropField();
 
-    uint8_t readStatus = resp.arg[0] & 0xff;
-    uint8_t *data  = resp.d.asBytes;
+    uint8_t readStatus = resp.core.old.arg[0] & 0xff;
+    uint8_t *data  = resp.core.old.d.asBytes;
 
     if (readStatus == 0) {
         PrintAndLogEx(FAILED, "no tag found");
@@ -1000,14 +1000,14 @@ static int CmdHFiClassReader_Dump(const char *Cmd) {
     }
     // dump cmd switch off at device when finised.
 
-    uint32_t blocksRead = resp.arg[1];
-    uint8_t isOK = resp.arg[0] & 0xff;
+    uint32_t blocksRead = resp.core.old.arg[1];
+    uint8_t isOK = resp.core.old.arg[0] & 0xff;
     if (!isOK && !blocksRead) {
         PrintAndLogEx(WARNING, "read block failed");
         return 0;
     }
 
-    uint32_t startindex = resp.arg[2];
+    uint32_t startindex = resp.core.old.arg[2];
     if (blocksRead * 8 > sizeof(tag_data) - (blockno * 8)) {
         PrintAndLogEx(FAILED, "data exceeded buffer size!");
         blocksRead = (sizeof(tag_data) / 8) - blockno;
@@ -1046,14 +1046,14 @@ static int CmdHFiClassReader_Dump(const char *Cmd) {
                 PrintAndLogEx(WARNING, "command execute timeout 2");
                 return 0;
             }
-            isOK = resp.arg[0] & 0xff;
-            blocksRead = resp.arg[1];
+            isOK = resp.core.old.arg[0] & 0xff;
+            blocksRead = resp.core.old.arg[1];
             if (!isOK && !blocksRead) {
                 PrintAndLogEx(WARNING, "read block failed 2");
                 return 0;
             }
 
-            startindex = resp.arg[2];
+            startindex = resp.core.old.arg[2];
             if (blocksRead * 8 > sizeof(tag_data) - gotBytes) {
                 PrintAndLogEx(FAILED, "data exceeded buffer size!");
                 blocksRead = (sizeof(tag_data) - gotBytes) / 8;
@@ -1097,7 +1097,7 @@ static int WriteBlock(uint8_t blockno, uint8_t *bldata, uint8_t *KEY, bool use_c
     if (!select_and_auth(KEY, MAC, div_key, use_credit_key, elite, rawkey, verbose))
         return 0;
 
-    UsbCommand resp;
+    UsbReplyNG resp;
 
     Calc_wb_mac(blockno, bldata, div_key, MAC);
     UsbCommand w = {CMD_ICLASS_WRITEBLOCK, {blockno}, {{0}}};
@@ -1110,7 +1110,7 @@ static int WriteBlock(uint8_t blockno, uint8_t *bldata, uint8_t *KEY, bool use_c
         if (verbose) PrintAndLogEx(WARNING, "Write Command execute timeout");
         return 0;
     }
-    uint8_t isOK = resp.arg[0] & 0xff;
+    uint8_t isOK = resp.core.old.arg[0] & 0xff;
     if (isOK)
         PrintAndLogEx(SUCCESS, "Write block successful");
     else
@@ -1342,7 +1342,7 @@ static int CmdHFiClassCloneTag(const char *Cmd) {
         PrintAndLogEx(NORMAL, " MAC |%02x%02x%02x%02x|\n", p[8], p[9], p[10], p[11]);
     }
 
-    UsbCommand resp;
+    UsbReplyNG resp;
     clearCommandBuffer();
     SendCommand(&w);
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 4500)) {
@@ -1367,7 +1367,7 @@ static int ReadBlock(uint8_t *KEY, uint8_t blockno, uint8_t keyType, bool elite,
             return 0;
     }
 
-    UsbCommand resp;
+    UsbReplyNG resp;
     UsbCommand c = {CMD_ICLASS_READBLOCK, {blockno}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
@@ -1376,13 +1376,13 @@ static int ReadBlock(uint8_t *KEY, uint8_t blockno, uint8_t keyType, bool elite,
         return 0;
     }
 
-    uint8_t isOK = resp.arg[0] & 0xff;
+    uint8_t isOK = resp.core.old.arg[0] & 0xff;
     if (!isOK) {
         PrintAndLogEx(WARNING, "read block failed");
         return 0;
     }
-    //data read is stored in: resp.d.asBytes[0-15]
-    PrintAndLogEx(NORMAL, "block %02X: %s\n", blockno, sprint_hex(resp.d.asBytes, 8));
+    //data read is stored in: resp.core.old.d.asBytes[0-15]
+    PrintAndLogEx(NORMAL, "block %02X: %s\n", blockno, sprint_hex(resp.core.old.d.asBytes, 8));
     return 1;
 }
 
@@ -1987,7 +1987,7 @@ static int CmdHFiClassCheckKeys(const char *Cmd) {
         memcpy(c.d.asBytes, pre + i, 4 * keys);
         clearCommandBuffer();
         SendCommand(&c);
-        UsbCommand resp;
+        UsbReplyNG resp;
 
         while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
             timeout++;
@@ -1999,8 +1999,8 @@ static int CmdHFiClassCheckKeys(const char *Cmd) {
             }
         }
 
-        uint8_t found = resp.arg[1] & 0xFF;
-        uint8_t isOK = resp.arg[0] & 0xFF;
+        uint8_t found = resp.core.old.arg[1] & 0xFF;
+        uint8_t isOK = resp.core.old.arg[0] & 0xFF;
 
         t2 = msclock() - t2;
         switch (isOK) {
@@ -2467,14 +2467,14 @@ int readIclass(bool loop, bool verbose) {
 
     UsbCommand c = {CMD_READER_ICLASS, {flags, 0, 0}, {{0}}};
     // loop in client not device - else on windows have a communication error
-    UsbCommand resp;
+    UsbReplyNG resp;
     while (!ukbhit()) {
 
         clearCommandBuffer();
         SendCommand(&c);
         if (WaitForResponseTimeout(CMD_ACK, &resp, 4500)) {
-            uint8_t readStatus = resp.arg[0] & 0xff;
-            uint8_t *data = resp.d.asBytes;
+            uint8_t readStatus = resp.core.old.arg[0] & 0xff;
+            uint8_t *data = resp.core.old.d.asBytes;
 
             if (verbose) PrintAndLogEx(NORMAL, "Readstatus:%02x", readStatus);
             // no tag found or button pressed
diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index 0da3daaaa..905c7e408 100644
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -644,7 +644,7 @@ static int CmdLegicRfWrite(const char *Cmd) {
 
     UsbCommand c = {CMD_WRITER_LEGIC_RF, {offset, len, IV}, {{0}}};
     memcpy(c.d.asBytes, data, len);
-    UsbCommand resp;
+    UsbReplyNG resp;
     clearCommandBuffer();
     SendCommand(&c);
 
@@ -661,7 +661,7 @@ static int CmdLegicRfWrite(const char *Cmd) {
     }
     PrintAndLogEx(NORMAL, "\n");
 
-    uint8_t isOK = resp.arg[0] & 0xFF;
+    uint8_t isOK = resp.core.old.arg[0] & 0xFF;
     if (!isOK) {
         PrintAndLogEx(WARNING, "Failed writing tag");
         return 1;
@@ -759,7 +759,7 @@ int legic_read_mem(uint32_t offset, uint32_t len, uint32_t iv, uint8_t *out, uin
     UsbCommand c = {CMD_READER_LEGIC_RF, {offset, len, iv}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
-    UsbCommand resp;
+    UsbReplyNG resp;
 
     uint8_t timeout = 0;
     while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
@@ -773,8 +773,8 @@ int legic_read_mem(uint32_t offset, uint32_t len, uint32_t iv, uint8_t *out, uin
     }
     PrintAndLogEx(NORMAL, "\n");
 
-    uint8_t isOK = resp.arg[0] & 0xFF;
-    *outlen = resp.arg[1];
+    uint8_t isOK = resp.core.old.arg[0] & 0xFF;
+    *outlen = resp.core.old.arg[1];
     if (!isOK) {
         PrintAndLogEx(WARNING, "Failed reading tag");
         return 2;
@@ -813,15 +813,15 @@ int legic_get_type(legic_card_select_t *card) {
     UsbCommand c = {CMD_LEGIC_INFO, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
-    UsbCommand resp;
+    UsbReplyNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500))
         return 2;
 
-    uint8_t isOK = resp.arg[0] & 0xFF;
+    uint8_t isOK = resp.core.old.arg[0] & 0xFF;
     if (!isOK)
         return 3;
 
-    memcpy(card, (legic_card_select_t *)resp.d.asBytes, sizeof(legic_card_select_t));
+    memcpy(card, (legic_card_select_t *)resp.core.old.d.asBytes, sizeof(legic_card_select_t));
     return 0;
 }
 void legic_chk_iv(uint32_t *iv) {
@@ -903,7 +903,7 @@ static int CmdLegicDump(const char *Cmd) {
     UsbCommand c = {CMD_READER_LEGIC_RF, {0x00, dumplen, 0x55}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
-    UsbCommand resp;
+    UsbReplyNG resp;
 
     uint8_t timeout = 0;
     while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
@@ -917,13 +917,13 @@ static int CmdLegicDump(const char *Cmd) {
     }
     PrintAndLogEx(NORMAL, "\n");
 
-    uint8_t isOK = resp.arg[0] & 0xFF;
+    uint8_t isOK = resp.core.old.arg[0] & 0xFF;
     if (!isOK) {
         PrintAndLogEx(WARNING, "Failed dumping tag data");
         return 2;
     }
 
-    uint16_t readlen = resp.arg[1];
+    uint16_t readlen = resp.core.old.arg[1];
     uint8_t *data = calloc(readlen, sizeof(uint8_t));
     if (!data) {
         PrintAndLogEx(WARNING, "Fail, cannot allocate memory");
@@ -1050,7 +1050,7 @@ static int CmdLegicRestore(const char *Cmd) {
 
     // transfer to device
     UsbCommand c = {CMD_WRITER_LEGIC_RF, {0, 0, 0x55}, {{0}}};
-    UsbCommand resp;
+    UsbReplyNG resp;
     for (size_t i = 7; i < numofbytes; i += USB_CMD_DATA_SIZE) {
 
         size_t len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);
@@ -1073,9 +1073,9 @@ static int CmdLegicRestore(const char *Cmd) {
         }
         PrintAndLogEx(NORMAL, "\n");
 
-        uint8_t isOK = resp.arg[0] & 0xFF;
+        uint8_t isOK = resp.core.old.arg[0] & 0xFF;
         if (!isOK) {
-            PrintAndLogEx(WARNING, "Failed writing tag [msg = %u]", resp.arg[1] & 0xFF);
+            PrintAndLogEx(WARNING, "Failed writing tag [msg = %u]", resp.core.old.arg[1] & 0xFF);
             free(data);
             return 1;
         }
@@ -1243,7 +1243,7 @@ static int CmdLegicWipe(const char *Cmd) {
 
     // transfer to device
     UsbCommand c = {CMD_WRITER_LEGIC_RF, {0, 0, 0x55}, {{0}}};
-    UsbCommand resp;
+    UsbReplyNG resp;
     for (size_t i = 7; i < card.cardsize; i += USB_CMD_DATA_SIZE) {
 
         printf(".");
@@ -1268,9 +1268,9 @@ static int CmdLegicWipe(const char *Cmd) {
         }
         PrintAndLogEx(NORMAL, "\n");
 
-        uint8_t isOK = resp.arg[0] & 0xFF;
+        uint8_t isOK = resp.core.old.arg[0] & 0xFF;
         if (!isOK) {
-            PrintAndLogEx(WARNING, "Failed writing tag [msg = %u]", resp.arg[1] & 0xFF);
+            PrintAndLogEx(WARNING, "Failed writing tag [msg = %u]", resp.core.old.arg[1] & 0xFF);
             free(data);
             return 4;
         }
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 0e91c784e..23e85215c 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -414,7 +414,7 @@ static int GetHFMF14AUID(uint8_t *uid, int *uidlen) {
     UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
-    UsbCommand resp;
+    UsbReplyNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         PrintAndLogEx(WARNING, "iso14443a card select failed");
         DropField();
@@ -422,7 +422,7 @@ static int GetHFMF14AUID(uint8_t *uid, int *uidlen) {
     }
 
     iso14a_card_select_t card;
-    memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
+    memcpy(&card, (iso14a_card_select_t *)resp.core.old.d.asBytes, sizeof(iso14a_card_select_t));
     memcpy(uid, card.uid, card.uidlen * sizeof(uint8_t));
     *uidlen = card.uidlen;
     return 1;
@@ -528,9 +528,9 @@ static int CmdHF14AMfWrBl(const char *Cmd) {
     clearCommandBuffer();
     SendCommand(&c);
 
-    UsbCommand resp;
+    UsbReplyNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-        uint8_t isOK  = resp.arg[0] & 0xff;
+        uint8_t isOK  = resp.core.old.arg[0] & 0xff;
         PrintAndLogEx(NORMAL, "isOk:%02x", isOK);
     } else {
         PrintAndLogEx(NORMAL, "Command execute timeout");
@@ -573,10 +573,10 @@ static int CmdHF14AMfRdBl(const char *Cmd) {
     clearCommandBuffer();
     SendCommand(&c);
 
-    UsbCommand resp;
+    UsbReplyNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-        uint8_t isOK  = resp.arg[0] & 0xff;
-        uint8_t *data = resp.d.asBytes;
+        uint8_t isOK  = resp.core.old.arg[0] & 0xff;
+        uint8_t *data = resp.core.old.d.asBytes;
 
         if (isOK) {
             PrintAndLogEx(NORMAL, "isOk:%02x data:%s", isOK, sprint_hex(data, 16));
@@ -644,10 +644,10 @@ static int CmdHF14AMfRdSc(const char *Cmd) {
     SendCommand(&c);
     PrintAndLogEx(NORMAL, "");
 
-    UsbCommand resp;
+    UsbReplyNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-        isOK  = resp.arg[0] & 0xff;
-        data  = resp.d.asBytes;
+        isOK  = resp.core.old.arg[0] & 0xff;
+        data  = resp.core.old.d.asBytes;
 
         PrintAndLogEx(NORMAL, "isOk:%02x", isOK);
         if (isOK) {
@@ -736,7 +736,7 @@ static int CmdHF14AMfDump(const char *Cmd) {
     memset(dataFilename, 0, sizeof(dataFilename));
 
     FILE *f;
-    UsbCommand resp;
+    UsbReplyNG resp;
 
     while (param_getchar(Cmd, cmdp) != 0x00) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
@@ -809,8 +809,8 @@ static int CmdHF14AMfDump(const char *Cmd) {
             SendCommand(&c);
 
             if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-                uint8_t isOK = resp.arg[0] & 0xff;
-                uint8_t *data = resp.d.asBytes;
+                uint8_t isOK = resp.core.old.arg[0] & 0xff;
+                uint8_t *data = resp.core.old.d.asBytes;
                 if (isOK) {
                     rights[sectorNo][0] = ((data[7] & 0x10) >> 2) | ((data[8] & 0x1) << 1) | ((data[8] & 0x10) >> 4); // C1C2C3 for data area 0
                     rights[sectorNo][1] = ((data[7] & 0x20) >> 3) | ((data[8] & 0x2) << 0) | ((data[8] & 0x20) >> 5); // C1C2C3 for data area 1
@@ -865,14 +865,14 @@ static int CmdHF14AMfDump(const char *Cmd) {
                     }
                 }
                 if (received) {
-                    isOK  = resp.arg[0] & 0xff;
+                    isOK  = resp.core.old.arg[0] & 0xff;
                     if (isOK) break;
                 }
             }
 
             if (received) {
-                isOK  = resp.arg[0] & 0xff;
-                uint8_t *data  = resp.d.asBytes;
+                isOK  = resp.core.old.arg[0] & 0xff;
+                uint8_t *data  = resp.core.old.d.asBytes;
                 if (blockNo == NumBlocksPerSector(sectorNo) - 1) { // sector trailer. Fill in the keys.
                     data[0]  = (keyA[sectorNo][0]);
                     data[1]  = (keyA[sectorNo][1]);
@@ -1050,9 +1050,9 @@ static int CmdHF14AMfRestore(const char *Cmd) {
             clearCommandBuffer();
             SendCommand(&c);
 
-            UsbCommand resp;
+            UsbReplyNG resp;
             if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-                uint8_t isOK  = resp.arg[0] & 0xff;
+                uint8_t isOK  = resp.core.old.arg[0] & 0xff;
                 PrintAndLogEx(SUCCESS, "isOk:%02x", isOK);
             } else {
                 PrintAndLogEx(WARNING, "Command execute timeout");
@@ -1256,13 +1256,13 @@ static int CmdHF14AMfNested(const char *Cmd) {
                 clearCommandBuffer();
                 SendCommand(&c);
 
-                UsbCommand resp;
+                UsbReplyNG resp;
                 if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) continue;
 
-                uint8_t isOK  = resp.arg[0] & 0xff;
+                uint8_t isOK  = resp.core.old.arg[0] & 0xff;
                 if (!isOK) continue;
 
-                uint8_t *data = resp.d.asBytes;
+                uint8_t *data = resp.core.old.d.asBytes;
                 key64 = bytes_to_num(data + 10, 6);
                 if (key64) {
                     PrintAndLogEx(SUCCESS, "data: %s", sprint_hex(data + 10, 6));
@@ -2002,13 +2002,13 @@ static int CmdHF14AMfChk(const char *Cmd) {
                 clearCommandBuffer();
                 SendCommand(&c);
 
-                UsbCommand resp;
+                UsbReplyNG resp;
                 if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) continue;
 
-                uint8_t isOK  = resp.arg[0] & 0xff;
+                uint8_t isOK  = resp.core.old.arg[0] & 0xff;
                 if (!isOK) continue;
 
-                uint8_t *data = resp.d.asBytes;
+                uint8_t *data = resp.core.old.d.asBytes;
                 key64 = bytes_to_num(data + 10, 6);
                 if (key64) {
                     PrintAndLogEx(NORMAL, "Data:%s", sprint_hex(data + 10, 6));
@@ -2231,7 +2231,7 @@ static int CmdHF14AMf1kSim(const char *Cmd) {
     memcpy(c.d.asBytes, uid, sizeof(uid));
     clearCommandBuffer();
     SendCommand(&c);
-    UsbCommand resp;
+    UsbReplyNG resp;
 
     if (flags & FLAG_INTERACTIVE) {
         PrintAndLogEx(INFO, "Press pm3-button or send another cmd to abort simulation");
@@ -2239,9 +2239,9 @@ static int CmdHF14AMf1kSim(const char *Cmd) {
         while (!ukbhit()) {
             if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) continue;
             if (!(flags & FLAG_NR_AR_ATTACK)) break;
-            if ((resp.arg[0] & 0xffff) != CMD_SIMULATE_MIFARE_CARD) break;
+            if ((resp.core.old.arg[0] & 0xffff) != CMD_SIMULATE_MIFARE_CARD) break;
 
-            memcpy(data, resp.d.asBytes, sizeof(data));
+            memcpy(data, resp.core.old.d.asBytes, sizeof(data));
             readerAttack(data[0], setEmulatorMem, verbose);
         }
         showSectorTable();
@@ -2291,7 +2291,7 @@ static int CmdHF14AMfSniff(const char *Cmd) {
     clearCommandBuffer();
     SendCommand(&c);
 
-    UsbCommand resp;
+    UsbReplyNG resp;
 
     // wait cycle
     while (true) {
@@ -2308,9 +2308,9 @@ static int CmdHF14AMfSniff(const char *Cmd) {
             continue;
         }
 
-        res = resp.arg[0] & 0xff;
-        traceLen = resp.arg[1];
-        len = resp.arg[2];
+        res = resp.core.old.arg[0] & 0xff;
+        traceLen = resp.core.old.arg[1];
+        len = resp.core.old.arg[2];
 
         if (res == 0) {
             PrintAndLogEx(SUCCESS, "hf mifare sniff finished");
@@ -2340,7 +2340,7 @@ static int CmdHF14AMfSniff(const char *Cmd) {
             }
 
             // what happens if LEN is bigger then TRACELEN --iceman
-            memcpy(bufPtr, resp.d.asBytes, len);
+            memcpy(bufPtr, resp.core.old.d.asBytes, len);
             bufPtr += len;
             pckNum++;
         }
@@ -3156,9 +3156,9 @@ static int CmdHf14AMfSetMod(const char *Cmd) {
     clearCommandBuffer();
     SendCommand(&c);
 
-    UsbCommand resp;
+    UsbReplyNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-        uint8_t ok = resp.arg[0] & 0xff;
+        uint8_t ok = resp.core.old.arg[0] & 0xff;
         PrintAndLogEx(SUCCESS, "isOk:%02x", ok);
         if (!ok)
             PrintAndLogEx(FAILED, "Failed.");
@@ -3198,7 +3198,7 @@ static int CmdHF14AMfice(const char *Cmd) {
     char ctmp;
     char filename[FILE_PATH_SIZE], *fptr;
     FILE *fnonces = NULL;
-    UsbCommand resp;
+    UsbReplyNG resp;
 
     uint32_t part_limit = 3000;
     uint32_t limit = 50000;
@@ -3257,11 +3257,11 @@ static int CmdHF14AMfice(const char *Cmd) {
         SendCommand(&c);
 
         if (!WaitForResponseTimeout(CMD_ACK, &resp, 3000)) goto out;
-        if (resp.arg[0])  goto out;
+        if (resp.core.old.arg[0])  goto out;
 
-        uint32_t items = resp.arg[2];
+        uint32_t items = resp.core.old.arg[2];
         if (fnonces) {
-            fwrite(resp.d.asBytes, 1, items * 4, fnonces);
+            fwrite(resp.core.old.d.asBytes, 1, items * 4, fnonces);
             fflush(fnonces);
         }
 
diff --git a/client/cmdhfmfdes.c b/client/cmdhfmfdes.c
index 0884c7a1b..b2c1cb9b7 100644
--- a/client/cmdhfmfdes.c
+++ b/client/cmdhfmfdes.c
@@ -56,9 +56,9 @@ static int CmdHF14ADesWb(const char *Cmd) {
         memcpy(c.d.asBytes + 10, bldata, 16);
       SendCommand(&c);
 
-        UsbCommand resp;
+        UsbReplyNG resp;
         if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
-            uint8_t isOK  = resp.arg[0] & 0xff;
+            uint8_t isOK  = resp.core.old.arg[0] & 0xff;
             PrintAndLogEx(NORMAL, "isOk:%02x", isOK);
         } else {
             PrintAndLogEx(NORMAL, "Command execute timeout");
@@ -97,10 +97,10 @@ static int CmdHF14ADesRb(const char *Cmd) {
     memcpy(c.d.asBytes, key, 6);
     SendCommand(&c);
 
-    UsbCommand resp;
+    UsbReplyNG resp;
     if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
-    uint8_t                isOK  = resp.arg[0] & 0xff;
-    uint8_t              * data  = resp.d.asBytes;
+    uint8_t                isOK  = resp.core.old.arg[0] & 0xff;
+    uint8_t              * data  = resp.core.old.d.asBytes;
 
     if (isOK)
     PrintAndLogEx(NORMAL, "isOk:%02x data:%s", isOK, sprint_hex(data, 16));
@@ -118,15 +118,15 @@ static int CmdHF14ADesInfo(const char *Cmd) {
 
     UsbCommand c = {CMD_MIFARE_DESFIRE_INFO, {0, 0, 0}, {{0}}};
     SendCommand(&c);
-    UsbCommand resp;
+    UsbReplyNG resp;
 
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         PrintAndLogEx(WARNING, "Command execute timeout");
         return 0;
     }
-    uint8_t isOK  = resp.arg[0] & 0xff;
+    uint8_t isOK  = resp.core.old.arg[0] & 0xff;
     if (!isOK) {
-        switch (resp.arg[1]) {
+        switch (resp.core.old.arg[1]) {
             case 1:
                 PrintAndLogEx(WARNING, "Can't select card");
                 break;
@@ -143,25 +143,25 @@ static int CmdHF14ADesInfo(const char *Cmd) {
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "-- Desfire Information --------------------------------------");
     PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
-    PrintAndLogEx(NORMAL, "  UID                : %s", sprint_hex(resp.d.asBytes, 7));
-    PrintAndLogEx(NORMAL, "  Batch number       : %s", sprint_hex(resp.d.asBytes + 28, 5));
-    PrintAndLogEx(NORMAL, "  Production date    : week %02x, 20%02x", resp.d.asBytes[33], resp.d.asBytes[34]);
+    PrintAndLogEx(NORMAL, "  UID                : %s", sprint_hex(resp.core.old.d.asBytes, 7));
+    PrintAndLogEx(NORMAL, "  Batch number       : %s", sprint_hex(resp.core.old.d.asBytes + 28, 5));
+    PrintAndLogEx(NORMAL, "  Production date    : week %02x, 20%02x", resp.core.old.d.asBytes[33], resp.core.old.d.asBytes[34]);
     PrintAndLogEx(NORMAL, "  -----------------------------------------------------------");
     PrintAndLogEx(NORMAL, "  Hardware Information");
-    PrintAndLogEx(NORMAL, "      Vendor Id      : %s", getTagInfo(resp.d.asBytes[7]));
-    PrintAndLogEx(NORMAL, "      Type           : 0x%02X", resp.d.asBytes[8]);
-    PrintAndLogEx(NORMAL, "      Subtype        : 0x%02X", resp.d.asBytes[9]);
-    PrintAndLogEx(NORMAL, "      Version        : %s", getVersionStr(resp.d.asBytes[10], resp.d.asBytes[11]));
-    PrintAndLogEx(NORMAL, "      Storage size   : %s", getCardSizeStr(resp.d.asBytes[12]));
-    PrintAndLogEx(NORMAL, "      Protocol       : %s", getProtocolStr(resp.d.asBytes[13]));
+    PrintAndLogEx(NORMAL, "      Vendor Id      : %s", getTagInfo(resp.core.old.d.asBytes[7]));
+    PrintAndLogEx(NORMAL, "      Type           : 0x%02X", resp.core.old.d.asBytes[8]);
+    PrintAndLogEx(NORMAL, "      Subtype        : 0x%02X", resp.core.old.d.asBytes[9]);
+    PrintAndLogEx(NORMAL, "      Version        : %s", getVersionStr(resp.core.old.d.asBytes[10], resp.core.old.d.asBytes[11]));
+    PrintAndLogEx(NORMAL, "      Storage size   : %s", getCardSizeStr(resp.core.old.d.asBytes[12]));
+    PrintAndLogEx(NORMAL, "      Protocol       : %s", getProtocolStr(resp.core.old.d.asBytes[13]));
     PrintAndLogEx(NORMAL, "  -----------------------------------------------------------");
     PrintAndLogEx(NORMAL, "  Software Information");
-    PrintAndLogEx(NORMAL, "      Vendor Id      : %s", getTagInfo(resp.d.asBytes[14]));
-    PrintAndLogEx(NORMAL, "      Type           : 0x%02X", resp.d.asBytes[15]);
-    PrintAndLogEx(NORMAL, "      Subtype        : 0x%02X", resp.d.asBytes[16]);
-    PrintAndLogEx(NORMAL, "      Version        : %d.%d", resp.d.asBytes[17], resp.d.asBytes[18]);
-    PrintAndLogEx(NORMAL, "      storage size   : %s", getCardSizeStr(resp.d.asBytes[19]));
-    PrintAndLogEx(NORMAL, "      Protocol       : %s", getProtocolStr(resp.d.asBytes[20]));
+    PrintAndLogEx(NORMAL, "      Vendor Id      : %s", getTagInfo(resp.core.old.d.asBytes[14]));
+    PrintAndLogEx(NORMAL, "      Type           : 0x%02X", resp.core.old.d.asBytes[15]);
+    PrintAndLogEx(NORMAL, "      Subtype        : 0x%02X", resp.core.old.d.asBytes[16]);
+    PrintAndLogEx(NORMAL, "      Version        : %d.%d", resp.core.old.d.asBytes[17], resp.core.old.d.asBytes[18]);
+    PrintAndLogEx(NORMAL, "      storage size   : %s", getCardSizeStr(resp.core.old.d.asBytes[19]));
+    PrintAndLogEx(NORMAL, "      Protocol       : %s", getProtocolStr(resp.core.old.d.asBytes[20]));
     PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
 
     // Master Key settings
@@ -177,7 +177,7 @@ static int CmdHF14ADesInfo(const char *Cmd) {
         return 0;
 
     uint8_t tmp[3];
-    memcpy(tmp, resp.d.asBytes + 3, 3);
+    memcpy(tmp, resp.core.old.d.asBytes + 3, 3);
 
     PrintAndLogEx(NORMAL, "   Available free memory on card       : %d bytes", le24toh(tmp));
     PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
@@ -257,7 +257,7 @@ void getKeySettings(uint8_t *aid) {
     uint8_t isOK = 0;
     uint32_t options;
     UsbCommand c = {CMD_MIFARE_DESFIRE, {0, 0, 0}, {{0}}};
-    UsbCommand resp;
+    UsbReplyNG resp;
 
     //memset(messStr, 0x00, 512);
 
@@ -269,19 +269,19 @@ void getKeySettings(uint8_t *aid) {
         c.d.asBytes[0] = GET_KEY_SETTINGS;  // 0x45
         SendCommand(&c);
         if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {return;}
-        isOK  = resp.arg[0] & 0xff;
+        isOK  = resp.core.old.arg[0] & 0xff;
         if (!isOK) {
             PrintAndLogEx(WARNING, "   Can't select master application");
             return;
         }
 
-        str = (resp.d.asBytes[3] & (1 << 3)) ? "YES" : "NO";
+        str = (resp.core.old.d.asBytes[3] & (1 << 3)) ? "YES" : "NO";
         PrintAndLogEx(NORMAL, "   [0x08] Configuration changeable       : %s", str);
-        str = (resp.d.asBytes[3] & (1 << 2)) ? "NO" : "YES";
+        str = (resp.core.old.d.asBytes[3] & (1 << 2)) ? "NO" : "YES";
         PrintAndLogEx(NORMAL, "   [0x04] CMK required for create/delete : %s", str);
-        str = (resp.d.asBytes[3] & (1 << 1)) ? "NO" : "YES";
+        str = (resp.core.old.d.asBytes[3] & (1 << 1)) ? "NO" : "YES";
         PrintAndLogEx(NORMAL, "   [0x02] Directory list access with CMK : %s", str);
-        str = (resp.d.asBytes[3] & (1 << 0)) ? "YES" : "NO";
+        str = (resp.core.old.d.asBytes[3] & (1 << 0)) ? "YES" : "NO";
         PrintAndLogEx(NORMAL, "   [0x01] CMK is changeable              : %s", str);
 
         c.arg[LENPOS] = 0x02; //LEN
@@ -289,14 +289,14 @@ void getKeySettings(uint8_t *aid) {
         c.d.asBytes[1] = 0x00;
         SendCommand(&c);
         if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000)) { return; }
-        isOK  = resp.arg[0] & 0xff;
+        isOK  = resp.core.old.arg[0] & 0xff;
         if (!isOK) {
             PrintAndLogEx(WARNING, "   Can't read key-version");
             return;
         }
         PrintAndLogEx(NORMAL, "");
-        PrintAndLogEx(NORMAL, "   Max number of keys       : %d", resp.d.asBytes[4]);
-        PrintAndLogEx(NORMAL, "   Master key Version       : %d (0x%02x)", resp.d.asBytes[3], resp.d.asBytes[3]);
+        PrintAndLogEx(NORMAL, "   Max number of keys       : %d", resp.core.old.d.asBytes[4]);
+        PrintAndLogEx(NORMAL, "   Master key Version       : %d (0x%02x)", resp.core.old.d.asBytes[3], resp.core.old.d.asBytes[3]);
         PrintAndLogEx(NORMAL, "   ----------------------------------------------------------");
 
         c.arg[LENPOS] = 0x02; //LEN
@@ -304,19 +304,19 @@ void getKeySettings(uint8_t *aid) {
         c.d.asBytes[1] = 0x00; // KEY 0
         SendCommand(&c);
         if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {return;}
-        isOK  = resp.d.asBytes[2] & 0xff;
+        isOK  = resp.core.old.d.asBytes[2] & 0xff;
         PrintAndLogEx(NORMAL, "   [0x0A] Authenticate      : %s", (isOK == 0xAE) ? "NO" : "YES");
 
         c.d.asBytes[0] = AUTHENTICATE_ISO; //0x1A
         SendCommand(&c);
         if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {return;}
-        isOK  = resp.d.asBytes[2] & 0xff;
+        isOK  = resp.core.old.d.asBytes[2] & 0xff;
         PrintAndLogEx(NORMAL, "   [0x1A] Authenticate ISO  : %s", (isOK == 0xAE) ? "NO" : "YES");
 
         c.d.asBytes[0] = AUTHENTICATE_AES; //0xAA
         SendCommand(&c);
         if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {return;}
-        isOK  = resp.d.asBytes[2] & 0xff;
+        isOK  = resp.core.old.d.asBytes[2] & 0xff;
         PrintAndLogEx(NORMAL, "   [0xAA] Authenticate AES  : %s", (isOK == 0xAE) ? "NO" : "YES");
         PrintAndLogEx(NORMAL, "");
         PrintAndLogEx(NORMAL, "   ----------------------------------------------------------");
@@ -335,7 +335,7 @@ void getKeySettings(uint8_t *aid) {
             PrintAndLogEx(WARNING, "   Timed-out");
             return;
         }
-        isOK  = resp.arg[0] & 0xff;
+        isOK  = resp.core.old.arg[0] & 0xff;
         if (!isOK) {
             PrintAndLogEx(WARNING, "   Can't select AID: %s", sprint_hex(aid, 3));
             return;
@@ -350,12 +350,12 @@ void getKeySettings(uint8_t *aid) {
         if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
             return;
         }
-        isOK  = resp.arg[0] & 0xff;
+        isOK  = resp.core.old.arg[0] & 0xff;
         if (!isOK) {
             PrintAndLogEx(WARNING, "   Can't read Application Master key settings");
         } else {
             // Access rights.
-            uint8_t rights = (resp.d.asBytes[3] >> 4 & 0xff);
+            uint8_t rights = (resp.core.old.d.asBytes[3] >> 4 & 0xff);
             switch (rights) {
                 case 0x00:
                     str = "AMK authentication is necessary to change any key (default)";
@@ -374,13 +374,13 @@ void getKeySettings(uint8_t *aid) {
             PrintAndLogEx(NORMAL, "-- %s", str);
             PrintAndLogEx(NORMAL, "");
             // same as CMK
-            str = (resp.d.asBytes[3] & (1 << 3)) ? "YES" : "NO";
+            str = (resp.core.old.d.asBytes[3] & (1 << 3)) ? "YES" : "NO";
             PrintAndLogEx(NORMAL, "   0x08 Configuration changeable       : %s", str);
-            str = (resp.d.asBytes[3] & (1 << 2)) ? "NO" : "YES";
+            str = (resp.core.old.d.asBytes[3] & (1 << 2)) ? "NO" : "YES";
             PrintAndLogEx(NORMAL, "   0x04 AMK required for create/delete : %s", str);
-            str = (resp.d.asBytes[3] & (1 << 1)) ? "NO" : "YES";
+            str = (resp.core.old.d.asBytes[3] & (1 << 1)) ? "NO" : "YES";
             PrintAndLogEx(NORMAL, "   0x02 Directory list access with AMK : %s", str);
-            str = (resp.d.asBytes[3] & (1 << 0)) ? "YES" : "NO";
+            str = (resp.core.old.d.asBytes[3] & (1 << 0)) ? "YES" : "NO";
             PrintAndLogEx(NORMAL, "   0x01 AMK is changeable              : %s", str);
         }
 
@@ -397,15 +397,15 @@ void getKeySettings(uint8_t *aid) {
 
         int numOfKeys;
 
-        isOK  = resp.arg[0] & 0xff;
+        isOK  = resp.core.old.arg[0] & 0xff;
         if (isOK == false) {
             PrintAndLogEx(WARNING, "   Can't read Application Master key version. Trying all keys");
             //numOfKeys = MAX_NUM_KEYS;
         } else {
-            numOfKeys = resp.d.asBytes[4];
+            numOfKeys = resp.core.old.d.asBytes[4];
             PrintAndLogEx(NORMAL, "");
             PrintAndLogEx(NORMAL, "     Max number of keys  : %d", numOfKeys);
-            PrintAndLogEx(NORMAL, "     Application Master key Version  : %d (0x%02x)", resp.d.asBytes[3], resp.d.asBytes[3]);
+            PrintAndLogEx(NORMAL, "     Application Master key Version  : %d (0x%02x)", resp.core.old.d.asBytes[3], resp.core.old.d.asBytes[3]);
             PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
         }
 
@@ -431,12 +431,12 @@ static int CmdHF14ADesEnumApplications(const char *Cmd) {
     c.d.asBytes[0] = GET_APPLICATION_IDS;  //0x6a
 
     SendCommand(&c);
-    UsbCommand resp;
+    UsbReplyNG resp;
 
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         return 0;
     }
-    isOK  = resp.arg[0] & 0xff;
+    isOK  = resp.core.old.arg[0] & 0xff;
     if (!isOK) {
         PrintAndLogEx(NORMAL, "Command unsuccessful");
         return 0;
@@ -445,37 +445,37 @@ static int CmdHF14ADesEnumApplications(const char *Cmd) {
     PrintAndLogEx(NORMAL, "-- Desfire Enumerate Applications ---------------------------");
     PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
 
-    UsbCommand respAid;
-    UsbCommand respFiles;
+    UsbReplyNG respAid;
+    UsbReplyNG respFiles;
 
     uint8_t num = 0;
-    int max = resp.arg[1] - 3 - 2;
+    int max = resp.core.old.arg[1] - 3 - 2;
 
     for (int i = 3; i <= max; i += 3) {
-        PrintAndLogEx(NORMAL, " Aid %d : %02X %02X %02X ", num, resp.d.asBytes[i], resp.d.asBytes[i + 1], resp.d.asBytes[i + 2]);
+        PrintAndLogEx(NORMAL, " Aid %d : %02X %02X %02X ", num, resp.core.old.d.asBytes[i], resp.core.old.d.asBytes[i + 1], resp.core.old.d.asBytes[i + 2]);
         num++;
 
-        aid[0] = resp.d.asBytes[i];
-        aid[1] = resp.d.asBytes[i + 1];
-        aid[2] = resp.d.asBytes[i + 2];
+        aid[0] = resp.core.old.d.asBytes[i];
+        aid[1] = resp.core.old.d.asBytes[i + 1];
+        aid[2] = resp.core.old.d.asBytes[i + 2];
         getKeySettings(aid);
 
         // Select Application
         c.arg[CMDPOS] = INIT;
         c.arg[LENPOS] = 0x04;
         c.d.asBytes[0] = SELECT_APPLICATION;  // 0x5a
-        c.d.asBytes[1] = resp.d.asBytes[i];
-        c.d.asBytes[2] = resp.d.asBytes[i + 1];
-        c.d.asBytes[3] = resp.d.asBytes[i + 2];
+        c.d.asBytes[1] = resp.core.old.d.asBytes[i];
+        c.d.asBytes[2] = resp.core.old.d.asBytes[i + 1];
+        c.d.asBytes[3] = resp.core.old.d.asBytes[i + 2];
         SendCommand(&c);
 
         if (!WaitForResponseTimeout(CMD_ACK, &respAid, 1500)) {
             PrintAndLogEx(WARNING, "   Timed-out");
             continue;
         }
-        isOK  = respAid.d.asBytes[2] & 0xff;
+        isOK  = respAid.core.old.d.asBytes[2] & 0xff;
         if (isOK != 0x00) {
-            PrintAndLogEx(WARNING, "   Can't select AID: %s", sprint_hex(resp.d.asBytes + i, 3));
+            PrintAndLogEx(WARNING, "   Can't select AID: %s", sprint_hex(resp.core.old.d.asBytes + i, 3));
             continue;
         }
 
@@ -489,13 +489,13 @@ static int CmdHF14ADesEnumApplications(const char *Cmd) {
             PrintAndLogEx(WARNING, "   Timed-out");
             continue;
         } else {
-            isOK  = respFiles.d.asBytes[2] & 0xff;
+            isOK  = respFiles.core.old.d.asBytes[2] & 0xff;
             if (!isOK) {
                 PrintAndLogEx(WARNING, "   Can't get file ids ");
             } else {
-                int respfileLen = resp.arg[1] - 3 - 2;
+                int respfileLen = resp.core.old.arg[1] - 3 - 2;
                 for (int j = 0; j < respfileLen; ++j) {
-                    PrintAndLogEx(NORMAL, "   Fileid %d :", resp.d.asBytes[j + 3]);
+                    PrintAndLogEx(NORMAL, "   Fileid %d :", resp.core.old.d.asBytes[j + 3]);
                 }
             }
         }
@@ -510,13 +510,13 @@ static int CmdHF14ADesEnumApplications(const char *Cmd) {
             PrintAndLogEx(WARNING, "   Timed-out");
             continue;
         } else {
-            isOK  = respFiles.d.asBytes[2] & 0xff;
+            isOK  = respFiles.core.old.d.asBytes[2] & 0xff;
             if (!isOK) {
                 PrintAndLogEx(WARNING, "   Can't get ISO file ids ");
             } else {
-                int respfileLen = resp.arg[1] - 3 - 2;
+                int respfileLen = resp.core.old.arg[1] - 3 - 2;
                 for (int j = 0; j < respfileLen; ++j) {
-                    PrintAndLogEx(NORMAL, " ISO  Fileid %d :", resp.d.asBytes[j + 3]);
+                    PrintAndLogEx(NORMAL, " ISO  Fileid %d :", resp.core.old.d.asBytes[j + 3]);
                 }
             }
         }
@@ -617,16 +617,16 @@ static int CmdHF14ADesAuth(const char *Cmd) {
     memcpy(c.d.asBytes + 1, key, keylength);
     clearCommandBuffer();
     SendCommand(&c);
-    UsbCommand resp;
+    UsbReplyNG resp;
 
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 3000)) {
         PrintAndLogEx(WARNING, "Client command execute timeout");
         return 0;
     }
 
-    uint8_t isOK  = resp.arg[0] & 0xff;
+    uint8_t isOK  = resp.core.old.arg[0] & 0xff;
     if (isOK) {
-        uint8_t *data = resp.d.asBytes;
+        uint8_t *data = resp.core.old.d.asBytes;
 
         PrintAndLogEx(NORMAL, "  Key        :%s", sprint_hex(key, keylength));
         PrintAndLogEx(NORMAL, "  SESSION    :%s", sprint_hex(data, keylength));
diff --git a/client/cmdhfmfdesfire.c b/client/cmdhfmfdesfire.c
index b55460fa8..a4dcb0d4c 100644
--- a/client/cmdhfmfdesfire.c
+++ b/client/cmdhfmfdesfire.c
@@ -60,11 +60,11 @@ static int CmdHF14AMfDESAuth(const char *Cmd) {
     //Auth1
     UsbCommand c = {CMD_MIFARE_DES_AUTH1, {blockNo}};
     SendCommand(&c);
-    UsbCommand resp;
+    UsbReplyNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-        uint8_t isOK  = resp.arg[0] & 0xff;
-        cuid  = resp.arg[1];
-        uint8_t *data = resp.d.asBytes;
+        uint8_t isOK  = resp.core.old.arg[0] & 0xff;
+        cuid  = resp.core.old.arg[1];
+        uint8_t *data = resp.core.old.d.asBytes;
 
         if (isOK) {
             PrintAndLogEx(NORMAL, "enc(nc)/b0:%s", sprint_hex(data + 2, 8));
@@ -100,7 +100,7 @@ static int CmdHF14AMfDESAuth(const char *Cmd) {
     memcpy(d.d.asBytes, reply, 16);
     SendCommand(&d);
 
-    UsbCommand respb;
+    UsbReplyNG respb;
     if (WaitForResponseTimeout(CMD_ACK, &respb, 1500)) {
         uint8_t  isOK  = respb.arg[0] & 0xff;
         uint8_t *data2 = respb.d.asBytes;
@@ -160,11 +160,11 @@ static int CmdHF14AMfAESAuth(const char *Cmd) {
     //Auth1
     UsbCommand c = {CMD_MIFARE_DES_AUTH1, {blockNo}};
     SendCommand(&c);
-    UsbCommand resp;
+    UsbReplyNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-        uint8_t isOK  = resp.arg[0] & 0xff;
-        cuid  = resp.arg[1];
-        uint8_t *data = resp.d.asBytes;
+        uint8_t isOK  = resp.core.old.arg[0] & 0xff;
+        cuid  = resp.core.old.arg[1];
+        uint8_t *data = resp.core.old.d.asBytes;
 
         if (isOK) {
             PrintAndLogEx(NORMAL, "enc(nc)/b0:%s", sprint_hex(data + 2, 16));
@@ -207,7 +207,7 @@ static int CmdHF14AMfAESAuth(const char *Cmd) {
     memcpy(d.d.asBytes, reply, 32);
     SendCommand(&d);
 
-    UsbCommand respb;
+    UsbReplyNG respb;
     if (WaitForResponseTimeout(CMD_ACK, &respb, 1500)) {
         uint8_t  isOK  = respb.arg[0] & 0xff;
         uint8_t *data2 = respb.d.asBytes;
diff --git a/client/cmdhfmfhard.c b/client/cmdhfmfhard.c
index faca31419..3aaafd80e 100644
--- a/client/cmdhfmfhard.c
+++ b/client/cmdhfmfhard.c
@@ -1372,7 +1372,7 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
     bool reported_suma8 = false;
     char progress_text[80];
     FILE *fnonces = NULL;
-    UsbCommand resp;
+    UsbReplyNG resp;
 
     num_acquired_nonces = 0;
 
@@ -1399,9 +1399,9 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
                 SendCommand(&c1);
                 return 1;
             }
-            if (resp.arg[0]) return resp.arg[0];  // error during nested_hard
+            if (resp.core.old.arg[0]) return resp.core.old.arg[0];  // error during nested_hard
 
-            cuid = resp.arg[1];
+            cuid = resp.core.old.arg[1];
             if (nonce_file_write && fnonces == NULL) {
                 if ((fnonces = fopen(filename, "wb")) == NULL) {
                     PrintAndLogEx(WARNING, "Could not create file %s", filename);
@@ -1420,8 +1420,8 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
         if (!initialize) {
             uint32_t nt_enc1, nt_enc2;
             uint8_t par_enc;
-            uint16_t num_sampled_nonces = resp.arg[2];
-            uint8_t *bufp = resp.d.asBytes;
+            uint16_t num_sampled_nonces = resp.core.old.arg[2];
+            uint8_t *bufp = resp.core.old.d.asBytes;
             for (uint16_t i = 0; i < num_sampled_nonces; i += 2) {
                 nt_enc1 = bytes_to_num(bufp, 4);
                 nt_enc2 = bytes_to_num(bufp + 4, 4);
@@ -1479,11 +1479,11 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
                 }
                 return 1;
             }
-            if (resp.arg[0]) {
+            if (resp.core.old.arg[0]) {
                 if (nonce_file_write) {
                     fclose(fnonces);
                 }
-                return resp.arg[0];  // error during nested_hard
+                return resp.core.old.arg[0];  // error during nested_hard
             }
         }
 
diff --git a/client/cmdhfmfp.c b/client/cmdhfmfp.c
index 554d3ab89..31f6ab449 100644
--- a/client/cmdhfmfp.c
+++ b/client/cmdhfmfp.c
@@ -45,13 +45,13 @@ static int CmdHFMFPInfo(const char *cmd) {
     UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}, {{0}}};
     SendCommand(&c);
 
-    UsbCommand resp;
+    UsbReplyNG resp;
     WaitForResponse(CMD_ACK, &resp);
 
     iso14a_card_select_t card;
-    memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
+    memcpy(&card, (iso14a_card_select_t *)resp.core.old.d.asBytes, sizeof(iso14a_card_select_t));
 
-    uint64_t select_status = resp.arg[0]; // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
+    uint64_t select_status = resp.core.old.arg[0]; // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
 
     if (select_status == 1 || select_status == 2) {
         PrintAndLogEx(NORMAL, "----------------------------------------------");
diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index 38b01bd71..ce1859883 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -468,12 +468,12 @@ static int ul_send_cmd_raw(uint8_t *cmd, uint8_t cmdlen, uint8_t *response, uint
     memcpy(c.d.asBytes, cmd, cmdlen);
     clearCommandBuffer();
     SendCommand(&c);
-    UsbCommand resp;
+    UsbReplyNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return -1;
-    if (!resp.arg[0] && responseLength) return -1;
+    if (!resp.core.old.arg[0] && responseLength) return -1;
 
-    uint16_t resplen = (resp.arg[0] < responseLength) ? resp.arg[0] : responseLength;
-    memcpy(response, resp.d.asBytes, resplen);
+    uint16_t resplen = (resp.core.old.arg[0] < responseLength) ? resp.core.old.arg[0] : responseLength;
+    memcpy(response, resp.core.old.d.asBytes, resplen);
     return resplen;
 }
 
@@ -481,17 +481,17 @@ static int ul_select(iso14a_card_select_t *card) {
 
     ul_switch_on_field();
 
-    UsbCommand resp;
+    UsbReplyNG resp;
     bool ans = false;
     ans = WaitForResponseTimeout(CMD_ACK, &resp, 1500);
 
-    if (!ans || resp.arg[0] < 1) {
+    if (!ans || resp.core.old.arg[0] < 1) {
         PrintAndLogEx(WARNING, "iso14443a card select failed");
         DropField();
         return 0;
     }
 
-    memcpy(card, resp.d.asBytes, sizeof(iso14a_card_select_t));
+    memcpy(card, resp.core.old.d.asBytes, sizeof(iso14a_card_select_t));
     return 1;
 }
 
@@ -537,9 +537,9 @@ static int ulc_authentication(uint8_t *key, bool switch_off_field) {
     memcpy(c.d.asBytes, key, 16);
     clearCommandBuffer();
     SendCommand(&c);
-    UsbCommand resp;
+    UsbReplyNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return 0;
-    if (resp.arg[0] == 1) return 1;
+    if (resp.core.old.arg[0] == 1) return 1;
 
     return 0;
 }
@@ -627,11 +627,11 @@ static int ul_fudan_check(void) {
     memcpy(c.d.asBytes, cmd, 4);
     clearCommandBuffer();
     SendCommand(&c);
-    UsbCommand resp;
+    UsbReplyNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return UL_ERROR;
-    if (resp.arg[0] != 1) return UL_ERROR;
+    if (resp.core.old.arg[0] != 1) return UL_ERROR;
 
-    return (!resp.d.asBytes[0]) ? FUDAN_UL : UL; //if response == 0x00 then Fudan, else Genuine NXP
+    return (!resp.core.old.d.asBytes[0]) ? FUDAN_UL : UL; //if response == 0x00 then Fudan, else Genuine NXP
 }
 
 static int ul_print_default(uint8_t *data) {
@@ -1488,9 +1488,9 @@ static int CmdHF14AMfUWrBl(const char *Cmd) {
 
     clearCommandBuffer();
     SendCommand(&c);
-    UsbCommand resp;
+    UsbReplyNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-        uint8_t isOK  = resp.arg[0] & 0xff;
+        uint8_t isOK  = resp.core.old.arg[0] & 0xff;
         PrintAndLogEx(SUCCESS, "isOk:%02x", isOK);
     } else {
         PrintAndLogEx(WARNING, "Command execute timeout");
@@ -1592,11 +1592,11 @@ static int CmdHF14AMfURdBl(const char *Cmd) {
 
     clearCommandBuffer();
     SendCommand(&c);
-    UsbCommand resp;
+    UsbReplyNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-        uint8_t isOK = resp.arg[0] & 0xff;
+        uint8_t isOK = resp.core.old.arg[0] & 0xff;
         if (isOK) {
-            uint8_t *d = resp.d.asBytes;
+            uint8_t *d = resp.core.old.d.asBytes;
             PrintAndLogEx(NORMAL, "\nBlock#  | Data        | Ascii");
             PrintAndLogEx(NORMAL, "-----------------------------");
             PrintAndLogEx(NORMAL, "%02d/0x%02X | %s| %s\n", blockNo, blockNo, sprint_hex(d, 4), sprint_ascii(d, 4));
@@ -1858,19 +1858,19 @@ static int CmdHF14AMfUDump(const char *Cmd) {
 
     clearCommandBuffer();
     SendCommand(&c);
-    UsbCommand resp;
+    UsbReplyNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         PrintAndLogEx(WARNING, "Command execute time-out");
         return 1;
     }
 
-    if (resp.arg[0] != 1) {
+    if (resp.core.old.arg[0] != 1) {
         PrintAndLogEx(WARNING, "Failed dumping card");
         return 1;
     }
 
-    uint32_t startindex = resp.arg[2];
-    uint32_t bufferSize = resp.arg[1];
+    uint32_t startindex = resp.core.old.arg[2];
+    uint32_t bufferSize = resp.core.old.arg[1];
     if (bufferSize > sizeof(data)) {
         PrintAndLogEx(FAILED, "Data exceeded Buffer size!");
         bufferSize = sizeof(data);
@@ -1982,9 +1982,9 @@ static int CmdHF14AMfUDump(const char *Cmd) {
 }
 
 static void wait4response(uint8_t b) {
-    UsbCommand resp;
+    UsbReplyNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-        uint8_t isOK  = resp.arg[0] & 0xff;
+        uint8_t isOK  = resp.core.old.arg[0] & 0xff;
         if (!isOK)
             PrintAndLogEx(WARNING, "failed to write block %d", b);
     } else {
@@ -2392,12 +2392,12 @@ static int CmdHF14AMfUCSetPwd(const char *Cmd) {
     clearCommandBuffer();
     SendCommand(&c);
 
-    UsbCommand resp;
+    UsbReplyNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-        if ((resp.arg[0] & 0xff) == 1) {
+        if ((resp.core.old.arg[0] & 0xff) == 1) {
             PrintAndLogEx(INFO, "Ultralight-C new password: %s", sprint_hex(pwd, 16));
         } else {
-            PrintAndLogEx(WARNING, "Failed writing at block %d", resp.arg[1] & 0xff);
+            PrintAndLogEx(WARNING, "Failed writing at block %d", resp.core.old.arg[1] & 0xff);
             return 1;
         }
     } else {
@@ -2413,7 +2413,7 @@ static int CmdHF14AMfUCSetPwd(const char *Cmd) {
 static int CmdHF14AMfUCSetUid(const char *Cmd) {
 
     UsbCommand c = {CMD_MIFAREU_READBL, {0, 0, 0}, {{0}}};
-    UsbCommand resp;
+    UsbReplyNG resp;
     uint8_t uid[7] = {0x00};
     char cmdp = tolower(param_getchar(Cmd, 0));
 
@@ -2435,7 +2435,7 @@ static int CmdHF14AMfUCSetUid(const char *Cmd) {
 
     // save old block2.
     uint8_t oldblock2[4] = {0x00};
-    memcpy(resp.d.asBytes, oldblock2, 4);
+    memcpy(resp.core.old.d.asBytes, oldblock2, 4);
 
     // block 0.
     c.cmd = CMD_MIFAREU_WRITEBL;
@@ -2490,12 +2490,12 @@ static int CmdHF14AMfUGenDiverseKeys(const char *Cmd) {
         UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0}, {{0}}};
         clearCommandBuffer();
         SendCommand(&c);
-        UsbCommand resp;
+        UsbReplyNG resp;
         WaitForResponse(CMD_ACK, &resp);
         iso14a_card_select_t card;
-        memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
+        memcpy(&card, (iso14a_card_select_t *)resp.core.old.d.asBytes, sizeof(iso14a_card_select_t));
 
-        uint64_t select_status = resp.arg[0];
+        uint64_t select_status = resp.core.old.arg[0];
         // 0: couldn't read,
         // 1: OK, with ATS
         // 2: OK, no ATS
@@ -2605,12 +2605,12 @@ static int CmdHF14AMfUPwdGen(const char *Cmd) {
         UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0}, {{0}}};
         clearCommandBuffer();
         SendCommand(&c);
-        UsbCommand resp;
+        UsbReplyNG resp;
         WaitForResponse(CMD_ACK, &resp);
         iso14a_card_select_t card;
-        memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
+        memcpy(&card, (iso14a_card_select_t *)resp.core.old.d.asBytes, sizeof(iso14a_card_select_t));
 
-        uint64_t select_status = resp.arg[0];
+        uint64_t select_status = resp.core.old.arg[0];
         // 0: couldn't read
         // 1: OK with ATS
         // 2: OK, no ATS
diff --git a/client/cmdhftopaz.c b/client/cmdhftopaz.c
index f3e9889bb..da498f948 100644
--- a/client/cmdhftopaz.c
+++ b/client/cmdhftopaz.c
@@ -46,14 +46,14 @@ static int topaz_send_cmd_raw(uint8_t *cmd, uint8_t len, uint8_t *response) {
     memcpy(c.d.asBytes, cmd, len);
     SendCommand(&c);
 
-    UsbCommand resp;
+    UsbReplyNG resp;
     WaitForResponse(CMD_ACK, &resp);
 
-    if (resp.arg[0] > 0) {
-        memcpy(response, resp.d.asBytes, resp.arg[0]);
+    if (resp.core.old.arg[0] > 0) {
+        memcpy(response, resp.core.old.d.asBytes, resp.core.old.arg[0]);
     }
 
-    return resp.arg[0];
+    return resp.core.old.arg[0];
 }
 
 
diff --git a/client/cmdhw.c b/client/cmdhw.c
index 1f74f7f18..2073564d8 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -418,9 +418,10 @@ static int CmdVersion(const char *Cmd) {
 static int CmdStatus(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     clearCommandBuffer();
+    UsbReplyNG resp;
     UsbCommand c = {CMD_STATUS, {0, 0, 0}, {{0}}};
     SendCommand(&c);
-    if (!WaitForResponseTimeout(CMD_ACK, &c, 1900))
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 1900))
         PrintAndLogEx(NORMAL, "Status command failed. USB Speed Test timed out");
     return 0;
 }
@@ -428,7 +429,7 @@ static int CmdStatus(const char *Cmd) {
 static int CmdPing(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     clearCommandBuffer();
-    UsbCommand resp;
+    UsbReplyNG resp;
     UsbCommand c = {CMD_PING, {0, 0, 0}, {{0}}};
     SendCommand(&c);
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1000))
@@ -442,25 +443,21 @@ static int CmdPingNG(const char *Cmd) {
     uint32_t len = strtol(Cmd, NULL, 0);
     if (len > USB_DATANG_SIZE)
         len = USB_DATANG_SIZE;
-    PrintAndLogEx(NORMAL, "Pinging with payload len=%d", len);
+    PrintAndLogEx(NORMAL, "PingNG sent with payload len=%d", len);
     clearCommandBuffer();
-    uint8_t resp[USB_REPLYNG_MAXLEN];
+    UsbReplyNG resp;
     uint8_t data[USB_DATANG_SIZE] = {0};
     uint16_t cmd = CMD_PING;
-    if (len)
     for (uint16_t i=0; i<len; i++)
         data[i] = i & 0xFF;
     SendCommandNG(cmd, data, len);
-    if (WaitForResponseNGTimeout(CMD_PING, resp, 1000)) {
-        PrintAndLogEx(NORMAL, "PingNG successful");
-        UsbReplyNGPreamble *pre = (UsbReplyNGPreamble *)resp;
-        uint8_t *respdata = resp + sizeof(UsbReplyNGPreamble);
-        if (len >= 4)
-            PrintAndLogEx(NORMAL, "%02x%02x%02x%02x ... %02x%02x%02x%02x",
-                respdata[0], respdata[1], respdata[2], respdata[3],
-                respdata[pre->length-4], respdata[pre->length-3], respdata[pre->length-2], respdata[pre->length-1]);
+    if (WaitForResponseTimeout(CMD_PING, &resp, 1000)) {
+        bool error = false;
+        if (len)
+            error = memcmp(data, resp.core.ng.data, len) != 0;
+        PrintAndLogEx(NORMAL, "PingNG response received, content is %s", error ? _RED_("NOT ok") : _GREEN_("ok"));
     } else
-        PrintAndLogEx(NORMAL, "PingNG failed");
+        PrintAndLogEx(NORMAL, "PingNG response " _RED_("timeout"));
     return 0;
 }
 
@@ -500,7 +497,7 @@ void pm3_version(bool verbose) {
     if (!verbose)
         return;
     UsbCommand c = {CMD_VERSION, {0, 0, 0}, {{0}}};
-    UsbCommand resp;
+    UsbReplyNG resp;
     clearCommandBuffer();
     SendCommand(&c);
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {
@@ -529,8 +526,8 @@ void pm3_version(bool verbose) {
         PrintAndLogEx(NORMAL, "\n [ CLIENT ]");
         PrintAndLogEx(NORMAL, "  client: iceman %s \n", s);
 
-        PrintAndLogEx(NORMAL, (char *)resp.d.asBytes);
-        lookupChipID(resp.arg[0], resp.arg[1]);
+        PrintAndLogEx(NORMAL, (char *)resp.core.old.d.asBytes);
+        lookupChipID(resp.core.old.arg[0], resp.core.old.arg[1]);
     }
     PrintAndLogEx(NORMAL, "\n");
 }
diff --git a/client/cmdlf.c b/client/cmdlf.c
index 3243d60af..33498a748 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -335,7 +335,7 @@ bool lf_read(bool silent, uint32_t samples) {
     clearCommandBuffer();
     SendCommand(&c);
 
-    UsbCommand resp;
+    UsbReplyNG resp;
     if (g_lf_threshold_set) {
         WaitForResponse(CMD_ACK, &resp);
     } else {
@@ -344,8 +344,8 @@ bool lf_read(bool silent, uint32_t samples) {
             return false;
         }
     }
-    // resp.arg[0] is bits read not bytes read.
-    getSamples(resp.arg[0] / 8, silent);
+    // resp.core.old.arg[0] is bits read not bytes read.
+    getSamples(resp.core.old.arg[0] / 8, silent);
 
     return true;
 }
diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c
index b8f42448b..a05d58387 100644
--- a/client/cmdlfawid.c
+++ b/client/cmdlfawid.c
@@ -92,7 +92,7 @@ static bool sendPing(void) {
     SendCommand(&ping);
     SendCommand(&ping);
     clearCommandBuffer();
-    UsbCommand resp;
+    UsbReplyNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000))
         return false;
     return true;
@@ -392,7 +392,7 @@ static int CmdAWIDClone(const char *Cmd) {
     PrintAndLogEx(INFO, "Preparing to clone AWID %u to T55x7 with FC: %u, CN: %u", fmtlen, fc, cn);
     print_blocks(blocks, 4);
 
-    UsbCommand resp;
+    UsbReplyNG resp;
     UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
 
     for (uint8_t i = 0; i < 4; i++) {
diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 5d22cb8ad..100d3492d 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -1132,7 +1132,7 @@ static int EM4x05ReadWord_ext(uint8_t addr, uint32_t pwd, bool usePwd, uint32_t
     UsbCommand c = {CMD_EM4X_READ_WORD, {addr, pwd, usePwd}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
-    UsbCommand resp;
+    UsbReplyNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         PrintAndLogEx(DEBUG, "timeout while waiting for reply.");
         return -1;
@@ -1235,7 +1235,7 @@ static int CmdEM4x05Write(const char *Cmd) {
     UsbCommand c = {CMD_EM4X_WRITE_WORD, {flag, data, pwd}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
-    UsbCommand resp;
+    UsbReplyNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
         PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
         return -1;
diff --git a/client/cmdlffdx.c b/client/cmdlffdx.c
index e09caca9d..8cde5eaaf 100644
--- a/client/cmdlffdx.c
+++ b/client/cmdlffdx.c
@@ -281,7 +281,7 @@ static int CmdFdxClone(const char *Cmd) {
     PrintAndLogEx(INFO, "Preparing to clone FDX-B to T55x7 with animal ID: %04u-%"PRIu64, countryid, animalid);
     print_blocks(blocks, 5);
 
-    UsbCommand resp;
+    UsbReplyNG resp;
     UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
 
     for (int i = 4; i >= 0; --i) {
diff --git a/client/cmdlfguard.c b/client/cmdlfguard.c
index 3fb84a639..988888773 100644
--- a/client/cmdlfguard.c
+++ b/client/cmdlfguard.c
@@ -171,7 +171,7 @@ static int CmdGuardClone(const char *Cmd) {
     PrintAndLogEx(INFO, "Preparing to clone Guardall to T55x7 with Facility Code: %u, Card Number: %u", facilitycode, cardnumber);
     print_blocks(blocks, 4);
 
-    UsbCommand resp;
+    UsbReplyNG resp;
     UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
 
     for (i = 0; i < 4; ++i) {
diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c
index 0eb76a8bf..7f21ab88d 100644
--- a/client/cmdlfhid.c
+++ b/client/cmdlfhid.c
@@ -98,7 +98,7 @@ static bool sendPing(void) {
     SendCommand(&ping);
     SendCommand(&ping);
     clearCommandBuffer();
-    UsbCommand resp;
+    UsbReplyNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000))
         return false;
     return true;
diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index e7eaea6dd..ed10afee1 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -135,7 +135,7 @@ static int CmdLFHitagList(const char *Cmd) {
     }
 
     // Query for the actual size of the trace
-    UsbCommand response;
+    UsbReplyNG response;
     if (!GetFromDevice(BIG_BUF, got, USB_CMD_DATA_SIZE, 0, &response, 2500, false)) {
         PrintAndLogEx(WARNING, "command execution time out");
         free(got);
@@ -461,19 +461,19 @@ static bool getHitagUid(uint32_t *uid) {
     UsbCommand c = {CMD_READER_HITAG, {RHT2F_UID_ONLY, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
-    UsbCommand resp;
+    UsbReplyNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         PrintAndLogEx(WARNING, "timeout while waiting for reply.");
         return false;
     }
 
-    if (resp.arg[0] == false) {
+    if (resp.core.old.arg[0] == false) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - failed getting UID");
         return false;
     }
 
     if (uid)
-        *uid = bytes_to_num(resp.d.asBytes, 4);
+        *uid = bytes_to_num(resp.core.old.d.asBytes, 4);
 
     return true;
 }
@@ -559,24 +559,24 @@ static int CmdLFHitagReader(const char *Cmd) {
     c.arg[0] = htf;
     clearCommandBuffer();
     SendCommand(&c);
-    UsbCommand resp;
+    UsbReplyNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 4000)) {
         PrintAndLogEx(WARNING, "timeout while waiting for reply.");
         return 1;
     }
 
-    if (resp.arg[0] == false) {
+    if (resp.core.old.arg[0] == false) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - hitag failed");
         return 1;
     }
 
-    uint32_t id = bytes_to_num(resp.d.asBytes, 4);
+    uint32_t id = bytes_to_num(resp.core.old.d.asBytes, 4);
 
     PrintAndLogEx(SUCCESS, "Valid Hitag2 tag found - UID: %08x", id);
     if (htf != RHT2F_UID_ONLY) {
 
         PrintAndLogEx(SUCCESS, "Dumping tag memory...");
-        uint8_t *data = resp.d.asBytes;
+        uint8_t *data = resp.core.old.d.asBytes;
 
         char filename[FILE_PATH_SIZE];
         char *fnameptr = filename;
@@ -676,13 +676,13 @@ static int CmdLFHitagWriter(const char *Cmd) {
 
     clearCommandBuffer();
     SendCommand(&c);
-    UsbCommand resp;
+    UsbReplyNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 4000)) {
         PrintAndLogEx(WARNING, "timeout while waiting for reply.");
         return 1;
     }
 
-    if (resp.arg[0] == false) {
+    if (resp.core.old.arg[0] == false) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - hitag write failed");
         return 1;
     }
diff --git a/client/cmdlfjablotron.c b/client/cmdlfjablotron.c
index 67c4f6a99..b2100fd35 100644
--- a/client/cmdlfjablotron.c
+++ b/client/cmdlfjablotron.c
@@ -155,7 +155,7 @@ static int CmdJablotronClone(const char *Cmd) {
     PrintAndLogEx(INFO, "Preparing to clone Jablotron to T55x7 with FullCode: %"PRIx64, fullcode);
     print_blocks(blocks, 3);
 
-    UsbCommand resp;
+    UsbReplyNG resp;
     UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
 
     for (uint8_t i = 0; i < 3; i++) {
diff --git a/client/cmdlfkeri.c b/client/cmdlfkeri.c
index 7b4f726d6..117038158 100644
--- a/client/cmdlfkeri.c
+++ b/client/cmdlfkeri.c
@@ -146,7 +146,7 @@ static int CmdKeriClone(const char *Cmd) {
     print_blocks(blocks, 3);
 
 
-    UsbCommand resp;
+    UsbReplyNG resp;
     UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
 
 
diff --git a/client/cmdlfnedap.c b/client/cmdlfnedap.c
index c6fd07b62..0a70144a9 100644
--- a/client/cmdlfnedap.c
+++ b/client/cmdlfnedap.c
@@ -202,7 +202,7 @@ static int CmdLFNedapClone(const char *Cmd) {
     PrintAndLogEx(INFO, "Preparing to clone NEDAP to T55x7 with card number: %u", cardnumber);
     print_blocks(blocks, 5);
 
-    UsbCommand resp;
+    UsbReplyNG resp;
     UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}, {{0}}};
 
     for (uint8_t i = 0; i<5; ++i ) {
diff --git a/client/cmdlfnoralsy.c b/client/cmdlfnoralsy.c
index db906c65c..93fb4615f 100644
--- a/client/cmdlfnoralsy.c
+++ b/client/cmdlfnoralsy.c
@@ -154,7 +154,7 @@ static int CmdNoralsyClone(const char *Cmd) {
     PrintAndLogEx(INFO, "Preparing to clone Noralsy to T55x7 with CardId: %u", id);
     print_blocks(blocks, 4);
 
-    UsbCommand resp;
+    UsbReplyNG resp;
     UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
 
     for (uint8_t i = 0; i < 4; i++) {
diff --git a/client/cmdlfpcf7931.c b/client/cmdlfpcf7931.c
index 283aa269e..a9836a113 100644
--- a/client/cmdlfpcf7931.c
+++ b/client/cmdlfpcf7931.c
@@ -99,7 +99,7 @@ static int CmdLFPCF7931Read(const char *Cmd) {
     uint8_t ctmp = param_getchar(Cmd, 0);
     if (ctmp == 'H' || ctmp == 'h') return usage_pcf7931_read();
 
-    UsbCommand resp;
+    UsbReplyNG resp;
     UsbCommand c = {CMD_PCF7931_READ, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
diff --git a/client/cmdlfpresco.c b/client/cmdlfpresco.c
index 2d24ba60e..9689b1a3c 100644
--- a/client/cmdlfpresco.c
+++ b/client/cmdlfpresco.c
@@ -120,7 +120,7 @@ static int CmdPrescoClone(const char *Cmd) {
     PrintAndLogEx(INFO, "Preparing to clone Presco to T55x7 with SiteCode: %u, UserCode: %u, FullCode: %08x", sitecode, usercode, fullcode);
     print_blocks(blocks, 5);
 
-    UsbCommand resp;
+    UsbReplyNG resp;
     UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
 
     for (uint8_t i = 0; i < 5; i++) {
diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c
index 6f46700d6..62573fbf4 100644
--- a/client/cmdlfpyramid.c
+++ b/client/cmdlfpyramid.c
@@ -232,7 +232,7 @@ static int CmdPyramidClone(const char *Cmd) {
     PrintAndLogEx(INFO, "Preparing to clone Farpointe/Pyramid to T55x7 with Facility Code: %u, Card Number: %u", facilitycode, cardnumber);
     print_blocks(blocks, 5);
 
-    UsbCommand resp;
+    UsbReplyNG resp;
     UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
 
     for (uint8_t i = 0; i < 5; ++i) {
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 6934e20e3..6a3401555 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1075,7 +1075,7 @@ static int CmdT55xxWriteBlock(const char *Cmd) {
     }
 
     UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {data, block, 0}, {{0}}};
-    UsbCommand resp;
+    UsbReplyNG resp;
     c.d.asBytes[0] = (page1) ? 0x2 : 0;
     c.d.asBytes[0] |= (testMode) ? 0x4 : 0;
 
@@ -1859,7 +1859,7 @@ static int CmdT55xxChkPwds(const char *Cmd) {
         UsbCommand c = {CMD_T55XX_CHKPWDS, {0, 0, 0}, {{0}}};
         clearCommandBuffer();
         SendCommand(&c);
-        UsbCommand resp;
+        UsbReplyNG resp;
 
         while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
             timeout++;
@@ -1871,13 +1871,13 @@ static int CmdT55xxChkPwds(const char *Cmd) {
             }
         }
 
-        if (resp.arg[0]) {
-            PrintAndLogEx(SUCCESS, "\nFound a candidate [ " _YELLOW_("%08X") " ]. Trying to validate", resp.arg[1]);
+        if (resp.core.old.arg[0]) {
+            PrintAndLogEx(SUCCESS, "\nFound a candidate [ " _YELLOW_("%08X") " ]. Trying to validate", resp.core.old.arg[1]);
 
-            if (AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, resp.arg[1])) {
+            if (AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, resp.core.old.arg[1])) {
                 found = tryDetectModulation();
                 if (found) {
-                    PrintAndLogEx(SUCCESS, "Found valid password: [ " _GREEN_("%08") " ]", resp.arg[1]);
+                    PrintAndLogEx(SUCCESS, "Found valid password: [ " _GREEN_("%08") " ]", resp.core.old.arg[1]);
                 } else {
                     PrintAndLogEx(WARNING, "Check pwd failed");
                 }
diff --git a/client/cmdlfviking.c b/client/cmdlfviking.c
index 21c175afe..aa1c6fc3d 100644
--- a/client/cmdlfviking.c
+++ b/client/cmdlfviking.c
@@ -91,7 +91,7 @@ static int CmdVikingClone(const char *Cmd) {
     UsbCommand c = {CMD_VIKING_CLONE_TAG, {rawID >> 32, rawID & 0xFFFFFFFF, Q5}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
-    UsbCommand resp;
+    UsbReplyNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
         PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
         return -1;
diff --git a/client/cmdlfvisa2000.c b/client/cmdlfvisa2000.c
index 00882b732..dc0a60975 100644
--- a/client/cmdlfvisa2000.c
+++ b/client/cmdlfvisa2000.c
@@ -166,7 +166,7 @@ static int CmdVisa2kClone(const char *Cmd) {
     PrintAndLogEx(INFO, "Preparing to clone Visa2000 to T55x7 with CardId: %u", id);
     print_blocks(blocks, 4);
 
-    UsbCommand resp;
+    UsbReplyNG resp;
     UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
 
     for (uint8_t i = 0; i < 4; i++) {
diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index a483e424f..cf0561a50 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -309,18 +309,18 @@ static int PrintATR(uint8_t *atr, size_t atrlen) {
 }
 
 static int smart_wait(uint8_t *data, bool silent) {
-    UsbCommand resp;
+    UsbReplyNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         if (!silent) PrintAndLogEx(WARNING, "smart card response timeout");
         return -1;
     }
 
-    uint32_t len = resp.arg[0];
+    uint32_t len = resp.core.old.arg[0];
     if (!len) {
         if (!silent) PrintAndLogEx(WARNING, "smart card response failed");
         return -2;
     }
-    memcpy(data, resp.d.asBytes, len);
+    memcpy(data, resp.core.old.d.asBytes, len);
     if (len >= 2) {
         if (!silent) PrintAndLogEx(SUCCESS, "%02X%02X | %s", data[len - 2], data[len - 1], GetAPDUCodeDescription(data[len - 2], data[len - 1]));
     } else {
@@ -678,12 +678,12 @@ static int CmdSmartUpgrade(const char *Cmd) {
     UsbCommand c = {CMD_SMART_UPGRADE, {firmware_size, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
-    UsbCommand resp;
+    UsbReplyNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         PrintAndLogEx(WARNING, "timeout while waiting for reply.");
         return 1;
     }
-    if ((resp.arg[0] & 0xFF)) {
+    if ((resp.core.old.arg[0] & 0xFF)) {
         PrintAndLogEx(SUCCESS, "Sim module firmware upgrade " _GREEN_("successful"));
         PrintAndLogEx(SUCCESS, "\n run " _YELLOW_("`hw status`") " to validate the fw version ");
     } else {
@@ -717,20 +717,20 @@ static int CmdSmartInfo(const char *Cmd) {
     UsbCommand c = {CMD_SMART_ATR, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
-    UsbCommand resp;
+    UsbReplyNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         if (!silent) PrintAndLogEx(WARNING, "smart card select failed");
         return 1;
     }
 
-    uint8_t isok = resp.arg[0] & 0xFF;
+    uint8_t isok = resp.core.old.arg[0] & 0xFF;
     if (!isok) {
         if (!silent) PrintAndLogEx(WARNING, "smart card select failed");
         return 1;
     }
 
     smart_card_atr_t card;
-    memcpy(&card, (smart_card_atr_t *)resp.d.asBytes, sizeof(smart_card_atr_t));
+    memcpy(&card, (smart_card_atr_t *)resp.core.old.d.asBytes, sizeof(smart_card_atr_t));
 
     // print header
     PrintAndLogEx(INFO, "--- Smartcard Information ---------");
@@ -792,19 +792,19 @@ static int CmdSmartReader(const char *Cmd) {
     UsbCommand c = {CMD_SMART_ATR, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
-    UsbCommand resp;
+    UsbReplyNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         if (!silent) PrintAndLogEx(WARNING, "smart card select failed");
         return 1;
     }
 
-    uint8_t isok = resp.arg[0] & 0xFF;
+    uint8_t isok = resp.core.old.arg[0] & 0xFF;
     if (!isok) {
         if (!silent) PrintAndLogEx(WARNING, "smart card select failed");
         return 1;
     }
     smart_card_atr_t card;
-    memcpy(&card, (smart_card_atr_t *)resp.d.asBytes, sizeof(smart_card_atr_t));
+    memcpy(&card, (smart_card_atr_t *)resp.core.old.d.asBytes, sizeof(smart_card_atr_t));
 
     PrintAndLogEx(INFO, "ISO7816-3 ATR : %s", sprint_hex(card.atr, card.atr_len));
     return 0;
@@ -838,13 +838,13 @@ static int CmdSmartSetClock(const char *Cmd) {
     UsbCommand c = {CMD_SMART_SETCLOCK, {clock1, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
-    UsbCommand resp;
+    UsbReplyNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         PrintAndLogEx(WARNING, "smart card select failed");
         return 1;
     }
 
-    uint8_t isok = resp.arg[0] & 0xFF;
+    uint8_t isok = resp.core.old.arg[0] & 0xFF;
     if (!isok) {
         PrintAndLogEx(WARNING, "smart card set clock failed");
         return 1;
@@ -1217,20 +1217,20 @@ bool smart_select(bool silent, smart_card_atr_t *atr) {
     UsbCommand c = {CMD_SMART_ATR, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
-    UsbCommand resp;
+    UsbReplyNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         if (!silent) PrintAndLogEx(WARNING, "smart card select failed");
         return false;
     }
 
-    uint8_t isok = resp.arg[0] & 0xFF;
+    uint8_t isok = resp.core.old.arg[0] & 0xFF;
     if (!isok) {
         if (!silent) PrintAndLogEx(WARNING, "smart card select failed");
         return false;
     }
 
     smart_card_atr_t card;
-    memcpy(&card, (smart_card_atr_t *)resp.d.asBytes, sizeof(smart_card_atr_t));
+    memcpy(&card, (smart_card_atr_t *)resp.core.old.d.asBytes, sizeof(smart_card_atr_t));
 
     if (atr)
         memcpy(atr, &card, sizeof(smart_card_atr_t));
diff --git a/client/cmdtrace.c b/client/cmdtrace.c
index a84daf646..c5420f4fc 100644
--- a/client/cmdtrace.c
+++ b/client/cmdtrace.c
@@ -672,13 +672,13 @@ int CmdTraceList(const char *Cmd) {
 
     if (isOnline) {
         // Query for the size of the trace,  downloading USB_CMD_DATA_SIZE
-        UsbCommand response;
+        UsbReplyNG response;
         if (!GetFromDevice(BIG_BUF, trace, USB_CMD_DATA_SIZE, 0, &response, 4000, true)) {
             PrintAndLogEx(WARNING, "timeout while waiting for reply.");
             return 1;
         }
 
-        traceLen = response.arg[2];
+        traceLen = response.core.old.arg[2];
         if (traceLen > USB_CMD_DATA_SIZE) {
             uint8_t *p = realloc(trace, traceLen);
             if (p == NULL) {
diff --git a/client/comms.c b/client/comms.c
index 25d9025f9..6e5d0382a 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -26,7 +26,7 @@ static pthread_t USB_communication_thread;
 
 // Transmit buffer.
 static UsbCommand txBuffer;
-static uint8_t txBufferNG[USB_COMMANDNG_MAXLEN];
+static UsbCommandNG txBufferNG;
 size_t txBufferNGLen;
 static bool txBuffer_pending = false;
 static pthread_mutex_t txBufferMutex = PTHREAD_MUTEX_INITIALIZER;
@@ -34,7 +34,7 @@ static pthread_cond_t txBufferSig = PTHREAD_COND_INITIALIZER;
 
 // Used by UsbReceiveCommand as a ring buffer for messages that are yet to be
 // processed by a command handler (WaitForResponse{,Timeout})
-static uint8_t rxBuffer[CMD_BUFFER_SIZE][USB_REPLYNG_MAXLEN];
+static UsbReplyNG rxBuffer[CMD_BUFFER_SIZE];
 
 // Points to the next empty position to write to
 static int cmd_head = 0;
@@ -45,6 +45,8 @@ static int cmd_tail = 0;
 // to lock rxBuffer operations from different threads
 static pthread_mutex_t rxBufferMutex = PTHREAD_MUTEX_INITIALIZER;
 
+static bool dl_it(uint8_t *dest, uint32_t bytes, uint32_t start_index, UsbReplyNG *response, size_t ms_timeout, bool show_warning, uint32_t rec_cmd);
+
 // These wrappers are required because it is not possible to access a static
 // global variable outside of the context of a single file.
 void SetOffline(bool value) {
@@ -102,8 +104,7 @@ void SendCommandNG(uint16_t cmd, uint8_t *data, size_t len) {
         return;
     }
 
-    UsbCommandNGPreamble *tx_pre = (UsbCommandNGPreamble *)txBufferNG;
-    UsbCommandNGPostamble *tx_post = (UsbCommandNGPostamble *)(txBufferNG + sizeof(UsbCommandNGPreamble) + len);
+    UsbCommandNGPostamble *tx_post = (UsbCommandNGPostamble *)((uint8_t *)&txBufferNG + sizeof(UsbCommandNGPreamble) + sizeof(UsbPacketNGCore) - USB_DATANG_SIZE + len);
 
     pthread_mutex_lock(&txBufferMutex);
     /**
@@ -115,14 +116,14 @@ void SendCommandNG(uint16_t cmd, uint8_t *data, size_t len) {
         pthread_cond_wait(&txBufferSig, &txBufferMutex);
     }
 
-    tx_pre->magic = USB_COMMANDNG_PREAMBLE_MAGIC;
-    tx_pre->length = len;
-    tx_pre->cmd = cmd;
-    memcpy(txBufferNG + sizeof(UsbCommandNGPreamble), data, len);
+    txBufferNG.magic = USB_COMMANDNG_PREAMBLE_MAGIC;
+    txBufferNG.length = len;
+    txBufferNG.core.ng.cmd = cmd;
+    memcpy(&txBufferNG.core.ng.data, data, len);
     uint8_t first, second;
-    compute_crc(CRC_14443_A, txBufferNG, sizeof(UsbCommandNGPreamble) + len, &first, &second);
+    compute_crc(CRC_14443_A, (uint8_t *)&txBufferNG, sizeof(UsbCommandNGPreamble) + sizeof(UsbPacketNGCore) - USB_DATANG_SIZE + len, &first, &second);
     tx_post->crc = (first << 8) + second;
-    txBufferNGLen = sizeof(UsbCommandNGPreamble) + len + sizeof(UsbCommandNGPostamble);
+    txBufferNGLen = sizeof(UsbCommandNGPreamble) + sizeof(UsbPacketNGCore) - USB_DATANG_SIZE + len + sizeof(UsbCommandNGPostamble);
     txBuffer_pending = true;
 
     // tell communication thread that a new command can be send
@@ -149,7 +150,7 @@ void clearCommandBuffer() {
  * @brief storeCommand stores a USB command in a circular buffer
  * @param UC
  */
-static void storeReply(uint8_t *packet) {
+static void storeReply(UsbReplyNG *packet) {
     pthread_mutex_lock(&rxBufferMutex);
     if ((cmd_head + 1) % CMD_BUFFER_SIZE == cmd_tail) {
         //If these two are equal, we're about to overwrite in the
@@ -158,8 +159,8 @@ static void storeReply(uint8_t *packet) {
         fflush(stdout);
     }
     //Store the command at the 'head' location
-    uint8_t *destination = rxBuffer[cmd_head];
-    memcpy(destination, packet, USB_REPLYNG_MAXLEN);
+    UsbReplyNG *destination = &rxBuffer[cmd_head];
+    memcpy(destination, packet, sizeof(UsbReplyNG));
 
     //increment head and wrap
     cmd_head = (cmd_head + 1) % CMD_BUFFER_SIZE;
@@ -170,7 +171,7 @@ static void storeReply(uint8_t *packet) {
  * @param response location to write command
  * @return 1 if response was returned, 0 if nothing has been received
  */
-static int getReply(uint8_t *response) {
+static int getReply(UsbReplyNG *packet) {
     pthread_mutex_lock(&rxBufferMutex);
     //If head == tail, there's nothing to read, or if we just got initialized
     if (cmd_head == cmd_tail)  {
@@ -179,8 +180,7 @@ static int getReply(uint8_t *response) {
     }
 
     //Pick out the next unread command
-    uint8_t *last_unread = rxBuffer[cmd_tail];
-    memcpy(response, last_unread, USB_REPLYNG_MAXLEN);
+    memcpy(packet, &rxBuffer[cmd_tail], sizeof(UsbReplyNG));
 
     //Increment tail - this is a circular buffer, so modulo buffer size
     cmd_tail = (cmd_tail + 1) % CMD_BUFFER_SIZE;
@@ -193,17 +193,26 @@ static int getReply(uint8_t *response) {
 // Entry point into our code: called whenever we received a packet over USB
 // that we weren't necessarily expecting, for example a debug print.
 //-----------------------------------------------------------------------------
-static void UsbReplyReceived(bool reply_ng, uint8_t *packet) {
+static void UsbReplyReceived(UsbReplyNG *packet) {
 
     uint64_t cmd; // To accommodate old cmd, can be reduced to uint16_t once all old cmds are gone.
-    UsbReplyNGPreamble *pre_ng = (UsbReplyNGPreamble *)packet;
+
+
+    if (packet->ng) {
+//        PrintAndLogEx(NORMAL, "RECV NG magic %08x length %04x status %04x crc %04x cmd %04x", packet->magic, packet->length, packet->status, packet->crc, packet->core.ng.cmd);
+        cmd = packet->core.ng.cmd;
+    } else {
+//        PrintAndLogEx(NORMAL, "RECV OLD magic %08x length %04x status %04x crc %04x cmd %04x", packet->magic, packet->length, packet->status, packet->crc, packet->core.old.cmd);
+        cmd = packet->core.old.cmd;
+    }
+
+
 
     // For cmd handlers still using old cmd format:
-    UsbCommand *c = (UsbCommand *)packet;
-    if (reply_ng) {
-        cmd = pre_ng->cmd;
+    if (packet->ng) {
+        cmd = packet->core.ng.cmd;
     } else {
-        cmd = c->cmd;
+        cmd = packet->core.old.cmd;
     }
 
     switch (cmd) {
@@ -212,9 +221,9 @@ static void UsbReplyReceived(bool reply_ng, uint8_t *packet) {
 
             char s[USB_CMD_DATA_SIZE + 1];
             memset(s, 0x00, sizeof(s));
-            size_t len = MIN(c->arg[0], USB_CMD_DATA_SIZE);
-            memcpy(s, c->d.asBytes, len);
-            uint64_t flag = c->arg[1];
+            size_t len = MIN(packet->core.old.arg[0], USB_CMD_DATA_SIZE);
+            memcpy(s, packet->core.old.d.asBytes, len);
+            uint64_t flag = packet->core.old.arg[1];
 
             switch (flag) {
                 case FLAG_RAWPRINT:
@@ -237,7 +246,7 @@ static void UsbReplyReceived(bool reply_ng, uint8_t *packet) {
             break;
         }
         case CMD_DEBUG_PRINT_INTEGERS: {
-            PrintAndLogEx(NORMAL, "#db# %" PRIx64 ", %" PRIx64 ", %" PRIx64 "", c->arg[0], c->arg[1], c->arg[2]);
+            PrintAndLogEx(NORMAL, "#db# %" PRIx64 ", %" PRIx64 ", %" PRIx64 "", packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2]);
             break;
         }
         // iceman:  hw status - down the path on device, runs printusbspeed which starts sending a lot of
@@ -287,9 +296,7 @@ __attribute__((force_align_arg_pointer))
     communication_arg_t *connection = (communication_arg_t *)targ;
     size_t rxlen;
 
-    uint8_t rx[USB_REPLYNG_MAXLEN];
-    UsbReplyNGPreamble *pre = (UsbReplyNGPreamble *)rx;
-    UsbReplyNGPostamble *post = (UsbReplyNGPostamble *)(rx + sizeof(UsbReplyNGPreamble) + USB_DATANG_SIZE);
+    UsbReplyNG rx;
     //int counter_to_offline = 0;
 
 #if defined(__MACH__) && defined(__APPLE__)
@@ -300,47 +307,56 @@ __attribute__((force_align_arg_pointer))
         rxlen = 0;
         bool ACK_received = false;
         bool error = false;
-        if (uart_receive(sp, rx, sizeof(UsbReplyNGPreamble), &rxlen) && (rxlen == sizeof(UsbReplyNGPreamble))) {
-            if (pre->magic == USB_REPLYNG_PREAMBLE_MAGIC) { // New style NG reply
-                if (pre->length > USB_DATANG_SIZE) {
-                    PrintAndLogEx(WARNING, "Received packet frame with incompatible length: 0x%04x", pre->length);
+        if (uart_receive(sp, (uint8_t *)&rx, sizeof(UsbReplyNGPreamble), &rxlen) && (rxlen == sizeof(UsbReplyNGPreamble))) {
+            if (rx.magic == USB_REPLYNG_PREAMBLE_MAGIC) { // New style NG reply
+                if (rx.length > USB_DATANG_SIZE) {
+                    PrintAndLogEx(WARNING, "Received packet frame with incompatible length: 0x%04x", rx.length);
                     error = true;
                 }
-                if ((!error) && (pre->length > 0)) { // Get the variable length payload
-                    if ((!uart_receive(sp, rx + sizeof(UsbReplyNGPreamble), pre->length, &rxlen)) || (rxlen != pre->length)) {
-                        PrintAndLogEx(WARNING, "Received packet frame error variable part too short? %d/%d", rxlen, pre->length);
+                if (!error) { // Get the core and variable length payload
+                    if ((!uart_receive(sp, (uint8_t *)&rx.core, sizeof(UsbPacketNGCore) - USB_DATANG_SIZE + rx.length, &rxlen)) || (rxlen != sizeof(UsbPacketNGCore) - USB_DATANG_SIZE + rx.length)) {
+                        PrintAndLogEx(WARNING, "Received packet frame error variable part too short? %d/%d", rxlen, rx.length);
                         error = true;
                     }
                 }
                 if (!error) {                        // Get the postamble
-                    if ((!uart_receive(sp, rx + sizeof(UsbReplyNGPreamble) + USB_DATANG_SIZE, sizeof(UsbReplyNGPostamble), &rxlen)) || (rxlen != sizeof(UsbReplyNGPostamble))) {
+                    if ((!uart_receive(sp, (uint8_t *)&rx.crc, sizeof(UsbReplyNGPostamble), &rxlen)) || (rxlen != sizeof(UsbReplyNGPostamble))) {
                         PrintAndLogEx(WARNING, "Received packet frame error fetching postamble");
                         error = true;
                     }
                     uint8_t first, second;
-                    compute_crc(CRC_14443_A, rx, sizeof(UsbReplyNGPreamble) + pre->length, &first, &second);
-                    if ((first << 8) + second != post->crc) {
-                        PrintAndLogEx(WARNING, "Received packet frame CRC error %02X%02X <> %04X", first, second, post->crc);
+                    compute_crc(CRC_14443_A, (uint8_t *)&rx, sizeof(UsbReplyNGPreamble) + sizeof(UsbPacketNGCore) - USB_DATANG_SIZE + rx.length, &first, &second);
+                    if ((first << 8) + second != rx.crc) {
+                        PrintAndLogEx(WARNING, "Received packet frame CRC error %02X%02X <> %04X", first, second, rx.crc);
                         error = true;
                     }
                 }
                 if (!error) {
 //                    PrintAndLogEx(NORMAL, "Received reply NG full !!");
-                    UsbReplyReceived(true, rx);
-//TODO NG don't send ACK anymore but reply with the corresponding cmd, still things seem to work fine...
-                    if (pre->cmd == CMD_ACK) {
+                    rx.ng = true;
+                    UsbReplyReceived(&rx);
+//TODO DOEGOX NG don't send ACK anymore but reply with the corresponding cmd, still things seem to work fine...
+                    if (rx.core.ng.cmd == CMD_ACK) {
                         ACK_received = true;
                     }
                 }
             } else {                               // Old style reply
-
-                if ((!uart_receive(sp, rx + sizeof(UsbReplyNGPreamble), sizeof(UsbCommand) - sizeof(UsbReplyNGPreamble), &rxlen)) || (rxlen != sizeof(UsbCommand) - sizeof(UsbReplyNGPreamble))) {
+                uint8_t tmp[sizeof(UsbReplyNGPreamble)];
+                memcpy(tmp, &rx, sizeof(UsbReplyNGPreamble));
+                memcpy(&rx.core.old, tmp, sizeof(UsbReplyNGPreamble));
+                if ((!uart_receive(sp, ((uint8_t *)&rx.core.old) + sizeof(UsbReplyNGPreamble), sizeof(UsbCommand) - sizeof(UsbReplyNGPreamble), &rxlen)) || (rxlen != sizeof(UsbCommand) - sizeof(UsbReplyNGPreamble))) {
                     PrintAndLogEx(WARNING, "Received packet frame error var part too short? %d/%d", rxlen, sizeof(UsbCommand) - sizeof(UsbReplyNGPreamble));
                     error = true;
                 }
                 if (!error) {
-                    UsbReplyReceived(false, rx);
-                    if (((UsbCommand *)rx)->cmd == CMD_ACK) {
+//                    PrintAndLogEx(NORMAL, "Received reply old full !!");
+                    rx.ng = false;
+                    rx.magic = 0;
+                    rx.length = USB_CMD_DATA_SIZE;
+                    rx.status = 0;
+                    rx.crc = 0;
+                    UsbReplyReceived(&rx);
+                    if (rx.core.old.cmd == CMD_ACK) {
                         ACK_received = true;
                     }
                 }
@@ -351,7 +367,7 @@ __attribute__((force_align_arg_pointer))
                 error = true;
             }
         }
-        // TODO if error, shall we resync ?
+        // TODO DOEGOX if error, shall we resync ?
 
         pthread_mutex_lock(&txBufferMutex);
 
@@ -445,11 +461,11 @@ bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode,
 // check if we can communicate with Pm3
 int TestProxmark(void) {
     clearCommandBuffer();
-    UsbCommand resp;
+    UsbReplyNG resp;
     UsbCommand c = {CMD_PING, {0, 0, 0}, {{0}}};
     SendCommand(&c);
     if (WaitForResponseTimeout(CMD_ACK, &resp, 5000)) {
-        PrintAndLogEx(INFO, "Communicating with PM3 over %s.", resp.arg[0] == 1 ? "FPC" : "USB");
+        PrintAndLogEx(INFO, "Communicating with PM3 over %s.", resp.core.old.arg[0] == 1 ? "FPC" : "USB");
         return 1;
     } else {
         return 0;
@@ -497,9 +513,9 @@ void CloseProxmark(void) {
  * @param show_warning display message after 3 seconds
  * @return true if command was returned, otherwise false
  */
-bool WaitForResponseTimeoutW(uint32_t cmd, UsbCommand *response, size_t ms_timeout, bool show_warning) {
+bool WaitForResponseTimeoutW(uint32_t cmd, UsbReplyNG *response, size_t ms_timeout, bool show_warning) {
 
-    UsbCommand resp;
+    UsbReplyNG resp;
 
     if (response == NULL)
         response = &resp;
@@ -509,8 +525,10 @@ bool WaitForResponseTimeoutW(uint32_t cmd, UsbCommand *response, size_t ms_timeo
     // Wait until the command is received
     while (true) {
 
-        while (getReply((uint8_t *)response)) {
-            if (cmd == CMD_UNKNOWN || response->cmd == cmd)
+        while (getReply(response)) {
+            if (cmd == CMD_UNKNOWN || (response->ng && response->core.ng.cmd == cmd))
+                return true;
+            if (cmd == CMD_UNKNOWN || ((!response->ng) && response->core.old.cmd == cmd))
                 return true;
         }
 
@@ -527,62 +545,14 @@ bool WaitForResponseTimeoutW(uint32_t cmd, UsbCommand *response, size_t ms_timeo
     return false;
 }
 
-bool WaitForResponseTimeout(uint32_t cmd, UsbCommand *response, size_t ms_timeout) {
+bool WaitForResponseTimeout(uint32_t cmd, UsbReplyNG *response, size_t ms_timeout) {
     return WaitForResponseTimeoutW(cmd, response, ms_timeout, true);
 }
 
-bool WaitForResponse(uint32_t cmd, UsbCommand *response) {
+bool WaitForResponse(uint32_t cmd, UsbReplyNG *response) {
     return WaitForResponseTimeoutW(cmd, response, -1, true);
 }
 
-/**
- * @brief Waits for a certain response type. This method waits for a maximum of
- * ms_timeout milliseconds for a specified response command.
-
- * @param cmd command to wait for, or CMD_UNKNOWN to take any command.
- * @param response struct to copy received command into.
- * @param ms_timeout display message after 3 seconds
- * @param show_warning display message after 3 seconds
- * @return true if command was returned, otherwise false
- */
-bool WaitForResponseNGTimeoutW(uint32_t cmd, uint8_t *response, size_t ms_timeout, bool show_warning) {
-
-    uint8_t resp[USB_REPLYNG_MAXLEN];
-    if (response == NULL)
-        response = resp;
-    UsbCommandNGPreamble *pre_ng = (UsbCommandNGPreamble *)response;
-
-    uint64_t start_time = msclock();
-
-    // Wait until the command is received
-    while (true) {
-
-        while (getReply(response)) {
-            if (cmd == CMD_UNKNOWN || pre_ng->cmd == cmd)
-                return true;
-        }
-
-        if (msclock() - start_time > ms_timeout)
-            break;
-
-        if (msclock() - start_time > 3000 && show_warning) {
-            // 3 seconds elapsed (but this doesn't mean the timeout was exceeded)
-            PrintAndLogEx(INFO, "Waiting for a response from the proxmark3...");
-            PrintAndLogEx(INFO, "You can cancel this operation by pressing the pm3 button");
-            show_warning = false;
-        }
-    }
-    return false;
-}
-
-bool WaitForResponseNGTimeout(uint32_t cmd, uint8_t *response, size_t ms_timeout) {
-    return WaitForResponseNGTimeoutW(cmd, response, ms_timeout, true);
-}
-
-bool WaitForResponseNG(uint32_t cmd, uint8_t *response) {
-    return WaitForResponseNGTimeoutW(cmd, response, -1, true);
-}
-
 /**
 * Data transfer from Proxmark to client. This method times out after
 * ms_timeout milliseconds.
@@ -596,12 +566,12 @@ bool WaitForResponseNG(uint32_t cmd, uint8_t *response) {
 * @param show_warning display message after 2 seconds
 * @return true if command was returned, otherwise false
 */
-bool GetFromDevice(DeviceMemType_t memtype, uint8_t *dest, uint32_t bytes, uint32_t start_index, UsbCommand *response, size_t ms_timeout, bool show_warning) {
+bool GetFromDevice(DeviceMemType_t memtype, uint8_t *dest, uint32_t bytes, uint32_t start_index, UsbReplyNG *response, size_t ms_timeout, bool show_warning) {
 
     if (dest == NULL) return false;
     if (bytes == 0) return true;
 
-    UsbCommand resp;
+    UsbReplyNG resp;
     if (response == NULL)
         response = &resp;
 
@@ -634,24 +604,24 @@ bool GetFromDevice(DeviceMemType_t memtype, uint8_t *dest, uint32_t bytes, uint3
     return false;
 }
 
-bool dl_it(uint8_t *dest, uint32_t bytes, uint32_t start_index, UsbCommand *response, size_t ms_timeout, bool show_warning, uint32_t rec_cmd) {
+static bool dl_it(uint8_t *dest, uint32_t bytes, uint32_t start_index, UsbReplyNG *response, size_t ms_timeout, bool show_warning, uint32_t rec_cmd) {
 
     uint32_t bytes_completed = 0;
     uint64_t start_time = msclock();
 
     while (true) {
 
-        if (getReply((uint8_t *)response)) {
+        if (getReply(response)) {
 
             // sample_buf is a array pointer, located in data.c
             // arg0 = offset in transfer. Startindex of this chunk
             // arg1 = length bytes to transfer
             // arg2 = bigbuff tracelength (?)
-            if (response->cmd == rec_cmd) {
+            if (response->core.old.cmd == rec_cmd) {
 
-                uint32_t offset = response->arg[0];
-                uint32_t copy_bytes = MIN(bytes - bytes_completed, response->arg[1]);
-                //uint32_t tracelen = c->arg[2];
+                uint32_t offset = response->core.old.arg[0];
+                uint32_t copy_bytes = MIN(bytes - bytes_completed, response->core.old.arg[1]);
+                //uint32_t tracelen = response->core.old.arg[2];
 
                 // extended bounds check1.  upper limit is USB_CMD_DATA_SIZE
                 // shouldn't happen
@@ -663,9 +633,9 @@ bool dl_it(uint8_t *dest, uint32_t bytes, uint32_t start_index, UsbCommand *resp
                     break;
                 }
 
-                memcpy(dest + offset, response->d.asBytes, copy_bytes);
+                memcpy(dest + offset, response->core.old.d.asBytes, copy_bytes);
                 bytes_completed += copy_bytes;
-            } else if (response->cmd == CMD_ACK) {
+            } else if (response->core.old.cmd == CMD_ACK) {
                 return true;
             }
         }
diff --git a/client/comms.h b/client/comms.h
index fd91c63fe..37ff500d4 100644
--- a/client/comms.h
+++ b/client/comms.h
@@ -45,8 +45,6 @@ typedef struct {
 } communication_arg_t;
 
 
-bool dl_it(uint8_t *dest, uint32_t bytes, uint32_t start_index, UsbCommand *response, size_t ms_timeout, bool show_warning, uint32_t rec_cmd);
-
 void SetOffline(bool value);
 bool IsOffline(void);
 
@@ -60,14 +58,11 @@ bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode,
 int TestProxmark(void);
 void CloseProxmark(void);
 
-bool WaitForResponseTimeoutW(uint32_t cmd, UsbCommand *response, size_t ms_timeout, bool show_warning);
-bool WaitForResponseTimeout(uint32_t cmd, UsbCommand *response, size_t ms_timeout);
-bool WaitForResponse(uint32_t cmd, UsbCommand *response);
-bool WaitForResponseNGTimeoutW(uint32_t cmd, uint8_t *response, size_t ms_timeout, bool show_warning);
-bool WaitForResponseNGTimeout(uint32_t cmd, uint8_t *response, size_t ms_timeout);
-bool WaitForResponseNG(uint32_t cmd, uint8_t *response);
+bool WaitForResponseTimeoutW(uint32_t cmd, UsbReplyNG *response, size_t ms_timeout, bool show_warning);
+bool WaitForResponseTimeout(uint32_t cmd, UsbReplyNG *response, size_t ms_timeout);
+bool WaitForResponse(uint32_t cmd, UsbReplyNG *response);
 
-bool GetFromDevice(DeviceMemType_t memtype, uint8_t *dest, uint32_t bytes, uint32_t start_index, UsbCommand *response, size_t ms_timeout, bool show_warning);
+bool GetFromDevice(DeviceMemType_t memtype, uint8_t *dest, uint32_t bytes, uint32_t start_index, UsbReplyNG *response, size_t ms_timeout, bool show_warning);
 
 #endif
 
diff --git a/client/flash.c b/client/flash.c
index 9bf0c94d8..85f427630 100644
--- a/client/flash.c
+++ b/client/flash.c
@@ -261,7 +261,7 @@ fail:
 static int get_proxmark_state(uint32_t *state) {
     UsbCommand c = {CMD_DEVICE_INFO};
     SendCommand(&c);
-    UsbCommand resp;
+    UsbReplyNG resp;
     WaitForResponse(CMD_UNKNOWN, &resp);  // wait for any response. No timeout.
 
     // Three outcomes:
@@ -269,7 +269,7 @@ static int get_proxmark_state(uint32_t *state) {
     // 2. The old os code will respond with CMD_DEBUG_PRINT_STRING and "unknown command"
     // 3. The new bootrom and os codes will respond with CMD_DEVICE_INFO and flags
 
-    switch (resp.cmd) {
+    switch (resp.core.old.cmd) {
         case CMD_ACK:
             *state = DEVICE_INFO_FLAG_CURRENT_MODE_BOOTROM;
             break;
@@ -277,10 +277,10 @@ static int get_proxmark_state(uint32_t *state) {
             *state = DEVICE_INFO_FLAG_CURRENT_MODE_OS;
             break;
         case CMD_DEVICE_INFO:
-            *state = resp.arg[0];
+            *state = resp.core.old.arg[0];
             break;
         default:
-            fprintf(stderr, _RED_("Error:") "Couldn't get Proxmark3 state, bad response type: 0x%04" PRIx64 "\n", resp.cmd);
+            fprintf(stderr, _RED_("Error:") "Couldn't get Proxmark3 state, bad response type: 0x%04" PRIx64 "\n", resp.core.old.cmd);
             return -1;
             break;
     }
@@ -335,13 +335,13 @@ static int enter_bootloader(char *serial_port_name) {
     return -1;
 }
 
-static int wait_for_ack(UsbCommand *ack) {
+static int wait_for_ack(UsbReplyNG *ack) {
     WaitForResponse(CMD_UNKNOWN, ack);
 
-    if (ack->cmd != CMD_ACK) {
+    if (ack->core.old.cmd != CMD_ACK) {
         printf("Error: Unexpected reply 0x%04" PRIx64 " %s (expected ACK)\n",
-               ack->cmd,
-               (ack->cmd == CMD_NACK) ? "NACK" : ""
+               ack->core.old.cmd,
+               (ack->core.old.cmd == CMD_NACK) ? "NACK" : ""
               );
         return -1;
     }
@@ -362,6 +362,7 @@ int flash_start_flashing(int enable_bl_writes, char *serial_port_name) {
         // This command is stupid. Why the heck does it care which area we're
         // flashing, as long as it's not the bootloader area? The mind boggles.
         UsbCommand c = {CMD_START_FLASH};
+        UsbReplyNG resp;
 
         if (enable_bl_writes) {
             c.arg[0] = FLASH_START;
@@ -373,7 +374,7 @@ int flash_start_flashing(int enable_bl_writes, char *serial_port_name) {
             c.arg[2] = 0;
         }
         SendCommand(&c);
-        return wait_for_ack(&c);
+        return wait_for_ack(&resp);
     } else {
         fprintf(stderr, _RED_("Note: Your bootloader does not understand the new START_FLASH command") "\n");
         fprintf(stderr, _RED_("It is recommended that you update your bootloader") "\n\n");
@@ -386,14 +387,15 @@ static int write_block(uint32_t address, uint8_t *data, uint32_t length) {
     memset(block_buf, 0xFF, BLOCK_SIZE);
     memcpy(block_buf, data, length);
     UsbCommand c = {CMD_FINISH_WRITE, {address, 0, 0}};
+    UsbReplyNG resp;
     memcpy(c.d.asBytes, block_buf, length);
     SendCommand(&c);
-    int ret = wait_for_ack(&c);
-    if (ret && c.arg[0]) {
-        uint32_t lock_bits = c.arg[0] >> 16;
-        bool lock_error = c.arg[0] & AT91C_MC_LOCKE;
-        bool prog_error = c.arg[0] & AT91C_MC_PROGE;
-        bool security_bit = c.arg[0] & AT91C_MC_SECURITY;
+    int ret = wait_for_ack(&resp);
+    if (ret && resp.core.old.arg[0]) {
+        uint32_t lock_bits = resp.core.old.arg[0] >> 16;
+        bool lock_error = resp.core.old.arg[0] & AT91C_MC_LOCKE;
+        bool prog_error = resp.core.old.arg[0] & AT91C_MC_PROGE;
+        bool security_bit = resp.core.old.arg[0] & AT91C_MC_SECURITY;
         printf("%s", lock_error ? "       Lock Error\n" : "");
         printf("%s", prog_error ? "       Invalid Command or bad Keyword\n" : "");
         printf("%s", security_bit ? "       Security Bit is set!\n" : "");
diff --git a/client/mifare/mifarehost.c b/client/mifare/mifarehost.c
index 211eaea02..87cb94c3a 100644
--- a/client/mifare/mifarehost.c
+++ b/client/mifare/mifarehost.c
@@ -45,18 +45,18 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
                 return -5;
             }
 
-            UsbCommand resp;
+            UsbReplyNG resp;
             if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
-                int16_t isOK  = resp.arg[0];
+                int16_t isOK  = resp.core.old.arg[0];
                 if (isOK < 0)
                     return isOK;
 
-                uid = (uint32_t)bytes_to_num(resp.d.asBytes +  0, 4);
-                nt = (uint32_t)bytes_to_num(resp.d.asBytes +  4, 4);
-                par_list = bytes_to_num(resp.d.asBytes +  8, 8);
-                ks_list = bytes_to_num(resp.d.asBytes +  16, 8);
-                nr = (uint32_t)bytes_to_num(resp.d.asBytes + 24, 4);
-                ar = (uint32_t)bytes_to_num(resp.d.asBytes + 28, 4);
+                uid = (uint32_t)bytes_to_num(resp.core.old.d.asBytes +  0, 4);
+                nt = (uint32_t)bytes_to_num(resp.core.old.d.asBytes +  4, 4);
+                par_list = bytes_to_num(resp.core.old.d.asBytes +  8, 8);
+                ks_list = bytes_to_num(resp.core.old.d.asBytes +  16, 8);
+                nr = (uint32_t)bytes_to_num(resp.core.old.d.asBytes + 24, 4);
+                ar = (uint32_t)bytes_to_num(resp.core.old.d.asBytes + 28, 4);
                 break;
             }
         }
@@ -127,10 +127,10 @@ int mfCheckKeys(uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t keyc
     memcpy(c.d.asBytes, keyBlock, 6 * keycnt);
     clearCommandBuffer();
     SendCommand(&c);
-    UsbCommand resp;
+    UsbReplyNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) return 1;
-    if ((resp.arg[0] & 0xff) != 0x01) return 2;
-    *key = bytes_to_num(resp.d.asBytes, 6);
+    if ((resp.core.old.arg[0] & 0xff) != 0x01) return 2;
+    *key = bytes_to_num(resp.core.old.d.asBytes, 6);
     return 0;
 }
 
@@ -149,7 +149,7 @@ int mfCheckKeys_fast(uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk,
     memcpy(c.d.asBytes, keyBlock, 6 * size);
     clearCommandBuffer();
     SendCommand(&c);
-    UsbCommand resp;
+    UsbReplyNG resp;
 
     while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
         timeout++;
@@ -166,7 +166,7 @@ int mfCheckKeys_fast(uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk,
     t2 = msclock() - t2;
 
     // time to convert the returned data.
-    uint8_t curr_keys = resp.arg[0];
+    uint8_t curr_keys = resp.core.old.arg[0];
 
     PrintAndLogEx(SUCCESS, "\nChunk: %.1fs | found %u/%u keys (%u)", (float)(t2 / 1000.0), curr_keys, (sectorsCnt << 1), size);
 
@@ -177,8 +177,8 @@ int mfCheckKeys_fast(uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk,
         uint8_t arr[80];
         uint64_t foo = 0;
         uint16_t bar = 0;
-        foo = bytes_to_num(resp.d.asBytes + 480, 8);
-        bar = (resp.d.asBytes[489]  << 8 | resp.d.asBytes[488]);
+        foo = bytes_to_num(resp.core.old.d.asBytes + 480, 8);
+        bar = (resp.core.old.d.asBytes[489]  << 8 | resp.core.old.d.asBytes[488]);
 
         for (uint8_t i = 0; i < 64; i++)
             arr[i] = (foo >> i) & 0x1;
@@ -190,7 +190,7 @@ int mfCheckKeys_fast(uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk,
         icesector_t *tmp = calloc(sectorsCnt, sizeof(icesector_t));
         if (tmp == NULL)
             return 1;
-        memcpy(tmp, resp.d.asBytes, sectorsCnt * sizeof(icesector_t));
+        memcpy(tmp, resp.core.old.d.asBytes, sectorsCnt * sizeof(icesector_t));
 
         for (int i = 0; i < sectorsCnt; i++) {
             // key A
@@ -293,7 +293,7 @@ __attribute__((force_align_arg_pointer))
 int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t *resultKey, bool calibrate) {
     uint16_t i;
     uint32_t uid;
-    UsbCommand resp;
+    UsbReplyNG resp;
     StateList_t statelists[2];
     struct Crypto1State *p1, *p2, *p3, *p4;
 
@@ -304,16 +304,16 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo,
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return -1;
 
     // error during nested
-    if (resp.arg[0]) return resp.arg[0];
+    if (resp.core.old.arg[0]) return resp.core.old.arg[0];
 
-    memcpy(&uid, resp.d.asBytes, 4);
+    memcpy(&uid, resp.core.old.d.asBytes, 4);
 
     for (i = 0; i < 2; i++) {
-        statelists[i].blockNo = resp.arg[2] & 0xff;
-        statelists[i].keyType = (resp.arg[2] >> 8) & 0xff;
+        statelists[i].blockNo = resp.core.old.arg[2] & 0xff;
+        statelists[i].keyType = (resp.core.old.arg[2] >> 8) & 0xff;
         statelists[i].uid = uid;
-        memcpy(&statelists[i].nt, (void *)(resp.d.asBytes + 4 + i * 8 + 0), 4);
-        memcpy(&statelists[i].ks1, (void *)(resp.d.asBytes + 4 + i * 8 + 4), 4);
+        memcpy(&statelists[i].nt, (void *)(resp.core.old.d.asBytes + 4 + i * 8 + 0), 4);
+        memcpy(&statelists[i].ks1, (void *)(resp.core.old.d.asBytes + 4 + i * 8 + 4), 4);
     }
 
     // calc keys
@@ -397,8 +397,8 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo,
             num_to_bytes(key64, 6, resultKey);
 
             PrintAndLogEx(SUCCESS, "target block:%3u key type: %c  -- found valid key [%012" PRIx64 "]",
-                          (uint16_t)resp.arg[2] & 0xff,
-                          (resp.arg[2] >> 8) ? 'B' : 'A',
+                          (uint16_t)resp.core.old.arg[2] & 0xff,
+                          (resp.core.old.arg[2] >> 8) ? 'B' : 'A',
                           key64
                          );
             return -5;
@@ -407,8 +407,8 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo,
 
 out:
     PrintAndLogEx(SUCCESS, "target block:%3u key type: %c",
-                  (uint16_t)resp.arg[2] & 0xff,
-                  (resp.arg[2] >> 8) ? 'B' : 'A'
+                  (uint16_t)resp.core.old.arg[2] & 0xff,
+                  (resp.core.old.arg[2] >> 8) ? 'B' : 'A'
                  );
 
     free(statelists[0].head.slhead);
@@ -424,12 +424,12 @@ int mfReadSector(uint8_t sectorNo, uint8_t keyType, uint8_t *key, uint8_t *data)
     clearCommandBuffer();
     SendCommand(&c);
 
-    UsbCommand resp;
+    UsbReplyNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-        uint8_t isOK  = resp.arg[0] & 0xff;
+        uint8_t isOK  = resp.core.old.arg[0] & 0xff;
 
         if (isOK) {
-            memcpy(data, resp.d.asBytes, mfNumBlocksPerSector(sectorNo) * 16);
+            memcpy(data, resp.core.old.d.asBytes, mfNumBlocksPerSector(sectorNo) * 16);
             return 0;
         } else {
             return 1;
@@ -447,9 +447,9 @@ int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount) {
     UsbCommand c = {CMD_MIFARE_EML_MEMGET, {blockNum, blocksCount, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
-    UsbCommand resp;
+    UsbReplyNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return 1;
-    memcpy(data, resp.d.asBytes, blocksCount * 16);
+    memcpy(data, resp.core.old.d.asBytes, blocksCount * 16);
     return 0;
 }
 
@@ -505,11 +505,11 @@ int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, uint8_t params) {
     memcpy(c.d.asBytes, data, 16);
     clearCommandBuffer();
     SendCommand(&c);
-    UsbCommand resp;
+    UsbReplyNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-        uint8_t isOK  = resp.arg[0] & 0xff;
+        uint8_t isOK  = resp.core.old.arg[0] & 0xff;
         if (uid != NULL)
-            memcpy(uid, resp.d.asBytes, 4);
+            memcpy(uid, resp.core.old.d.asBytes, 4);
         if (!isOK)
             return 2;
     } else {
@@ -523,12 +523,12 @@ int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params) {
     UsbCommand c = {CMD_MIFARE_CGETBLOCK, {params, blockNo, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
-    UsbCommand resp;
+    UsbReplyNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-        uint8_t isOK  = resp.arg[0] & 0xff;
+        uint8_t isOK  = resp.core.old.arg[0] & 0xff;
         if (!isOK)
             return 2;
-        memcpy(data, resp.d.asBytes, 16);
+        memcpy(data, resp.core.old.d.asBytes, 16);
     } else {
         PrintAndLogEx(WARNING, "command execute timeout");
         return 1;
@@ -869,7 +869,7 @@ int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t *data,
 */
 int detect_classic_prng(void) {
 
-    UsbCommand resp, respA;
+    UsbReplyNG resp, respA;
     uint8_t cmd[] = {MIFARE_AUTH_KEYA, 0x00};
     uint32_t flags = ISO14A_CONNECT | ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_RATS;
 
@@ -885,7 +885,7 @@ int detect_classic_prng(void) {
     }
 
     // if select tag failed.
-    if (resp.arg[0] == 0) {
+    if (resp.core.old.arg[0] == 0) {
         PrintAndLogEx(WARNING, "error:  selecting tag failed,  can't detect prng\n");
         return -2;
     }
@@ -895,12 +895,12 @@ int detect_classic_prng(void) {
     }
 
     // check respA
-    if (respA.arg[0] != 4) {
-        PrintAndLogEx(WARNING, "PRNG data error: Wrong length: %d", respA.arg[0]);
+    if (respA.core.old.arg[0] != 4) {
+        PrintAndLogEx(WARNING, "PRNG data error: Wrong length: %d", respA.core.old.arg[0]);
         return -4;
     }
 
-    uint32_t nonce = bytes_to_num(respA.d.asBytes, respA.arg[0]);
+    uint32_t nonce = bytes_to_num(respA.core.old.d.asBytes, respA.core.old.arg[0]);
     return validate_prng_nonce(nonce);
 }
 /* Detect Mifare Classic NACK bug
@@ -916,7 +916,7 @@ int detect_classic_nackbug(bool verbose) {
     UsbCommand c = {CMD_MIFARE_NACK_DETECT, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
-    UsbCommand resp;
+    UsbReplyNG resp;
 
     if (verbose)
         PrintAndLogEx(SUCCESS, "press pm3-button on the Proxmark3 device to abort both Proxmark3 and client.\n");
@@ -949,9 +949,9 @@ int detect_classic_nackbug(bool verbose) {
         }
 
         if (WaitForResponseTimeout(CMD_ACK, &resp, 500)) {
-            int32_t ok = resp.arg[0];
-            uint32_t nacks = resp.arg[1];
-            uint32_t auths = resp.arg[2];
+            int32_t ok = resp.core.old.arg[0];
+            uint32_t nacks = resp.core.old.arg[1];
+            uint32_t auths = resp.core.old.arg[2];
             PrintAndLogEx(NORMAL, "");
 
             if (verbose) {
@@ -998,12 +998,12 @@ int detect_classic_nackbug(bool verbose) {
 void detect_classic_magic(void) {
 
     uint8_t isGeneration = 0;
-    UsbCommand resp;
+    UsbReplyNG resp;
     UsbCommand c = {CMD_MIFARE_CIDENT, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500))
-        isGeneration = resp.arg[0] & 0xff;
+        isGeneration = resp.core.old.arg[0] & 0xff;
 
     switch (isGeneration) {
         case 1:
diff --git a/client/scripting.c b/client/scripting.c
index fb00022d5..109257dee 100644
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -184,10 +184,10 @@ static int l_WaitForResponseTimeout(lua_State *L) {
         ms_timeout = luaL_checkunsigned(L, 2);
     }
 
-    UsbCommand response;
-    if (WaitForResponseTimeout(cmd, &response, ms_timeout)) {
+    UsbReplyNG resp;
+    if (WaitForResponseTimeout(cmd, &resp, ms_timeout)) {
         //Push it as a string
-        lua_pushlstring(L, (const char *)&response, sizeof(UsbCommand));
+        lua_pushlstring(L, (const char *)&resp, sizeof(UsbReplyNG));
         return 1;
     } else {
         //signal error by returning Nil, errorstring
diff --git a/common/cmd.c b/common/cmd.c
index 42c72269b..45e002df1 100644
--- a/common/cmd.c
+++ b/common/cmd.c
@@ -81,50 +81,47 @@ uint8_t cmd_send(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void
 }
 
 uint8_t reply_ng(uint16_t cmd, int16_t status, uint8_t *data, size_t len) {
-    uint8_t txBufferNG[USB_REPLYNG_MAXLEN];
+    UsbReplyNG txBufferNG;
     size_t txBufferNGLen;
 //    for (size_t i = 0; i < sizeof(txBufferNG); i++)
 //        ((uint8_t *)&txBufferNG)[i] = 0x00;
 
     // Compose the outgoing command frame
-    UsbReplyNGPreamble *tx_pre = (UsbReplyNGPreamble *)txBufferNG;
-    tx_pre->magic = USB_REPLYNG_PREAMBLE_MAGIC;
-    tx_pre->cmd = cmd;
-    tx_pre->status = status;
+    txBufferNG.magic = USB_REPLYNG_PREAMBLE_MAGIC;
+    txBufferNG.core.ng.cmd = cmd;
+    txBufferNG.status = status;
     if (len > USB_DATANG_SIZE) {
         len = USB_DATANG_SIZE;
         // overwrite status
-        tx_pre->status = PM3_EOVFLOW;
+        txBufferNG.status = PM3_EOVFLOW;
     }
-    tx_pre->length = len;
-    uint8_t *tx_data = txBufferNG + sizeof(UsbReplyNGPreamble);
-    UsbReplyNGPostamble *tx_post = (UsbReplyNGPostamble *)(txBufferNG + sizeof(UsbReplyNGPreamble) + len);
+    txBufferNG.length = len;
+    UsbReplyNGPostamble *tx_post = (UsbReplyNGPostamble *)((uint8_t *)&txBufferNG + sizeof(UsbReplyNGPreamble) + sizeof(UsbPacketNGCore) - USB_DATANG_SIZE + len);
 
     // Add the (optional) content to the frame, with a maximum size of USB_DATANG_SIZE
     if (data && len) {
         for (size_t i = 0; i < len; i++) {
-            tx_data[i] = data[i];
+            txBufferNG.core.ng.data[i] = data[i];
         }
     }
 
     uint8_t first, second;
-    compute_crc(CRC_14443_A, txBufferNG, sizeof(UsbReplyNGPreamble) + len, &first, &second);
+    compute_crc(CRC_14443_A, (uint8_t *)&txBufferNG, sizeof(UsbReplyNGPreamble) + sizeof(UsbPacketNGCore) - USB_DATANG_SIZE + len, &first, &second);
     tx_post->crc = (first << 8) + second;
-    txBufferNGLen = sizeof(UsbReplyNGPreamble) + len + sizeof(UsbReplyNGPostamble);
-
+    txBufferNGLen = sizeof(UsbReplyNGPreamble) + sizeof(UsbPacketNGCore) - USB_DATANG_SIZE + len + sizeof(UsbReplyNGPostamble);
 
     uint32_t sendlen = 0;
     // Send frame and make sure all bytes are transmitted
 
 #ifdef WITH_FPC_HOST
     if (reply_via_fpc) {
-        sendlen = usart_writebuffer(txBufferNG, txBufferNGLen);
+        sendlen = usart_writebuffer((uint8_t *)&txBufferNG, txBufferNGLen);
 //        Dbprintf_usb("Sent %i bytes over usart", len);
     } else {
-        sendlen = usb_write(txBufferNG, txBufferNGLen);
+        sendlen = usb_write((uint8_t *)&txBufferNG, txBufferNGLen);
     }
 #else
-    sendlen = usb_write(txBufferNG, txBufferNGLen);
+    sendlen = usb_write((uint8_t *)&txBufferNG, txBufferNGLen);
 #endif
 
     return sendlen;
diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index 0edf68dc8..df899099e 100644
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -36,10 +36,14 @@ typedef struct {
     } d;
 } PACKED UsbCommand;
 
+typedef struct {
+    uint16_t cmd;
+    uint8_t data[USB_DATANG_SIZE];
+} PACKED UsbPacketNGCore;
+
 typedef struct {
     uint32_t magic;
     uint16_t length;  // length of the variable part, 0 if none.
-    uint16_t cmd;
 } PACKED UsbCommandNGPreamble;
 
 #define USB_COMMANDNG_PREAMBLE_MAGIC 0x61334d50 // PM3a
@@ -48,13 +52,20 @@ typedef struct {
     uint16_t crc;
 } PACKED UsbCommandNGPostamble;
 
-#define USB_COMMANDNG_MINLEN (sizeof(UsbCommandNGPreamble) + sizeof(UsbCommandNGPostamble))
-#define USB_COMMANDNG_MAXLEN (sizeof(UsbCommandNGPreamble) + USB_DATANG_SIZE + sizeof(UsbCommandNGPostamble))
+typedef struct {
+    uint32_t magic;
+    uint16_t length;  // length of the variable part, 0 if none.
+    union {           // we can simplify it once we get rid of old format compatibility
+        UsbPacketNGCore ng;
+        UsbCommand old;
+    } core;
+    uint16_t crc;
+    bool ng;
+} PACKED UsbCommandNG;
 
 typedef struct {
     uint32_t magic;
     uint16_t length;  // length of the variable part, 0 if none.
-    uint16_t cmd;
     int16_t  status;
 } PACKED UsbReplyNGPreamble;
 
@@ -64,8 +75,17 @@ typedef struct {
     uint16_t crc;
 } PACKED UsbReplyNGPostamble;
 
-#define USB_REPLYNG_MINLEN (sizeof(UsbReplyNGPreamble) + sizeof(UsbReplyNGPostamble))
-#define USB_REPLYNG_MAXLEN (sizeof(UsbReplyNGPreamble) + USB_DATANG_SIZE + sizeof(UsbReplyNGPostamble))
+typedef struct {
+    uint32_t magic;  //  \                  //
+    uint16_t length; //     Preamble        //
+    int16_t  status; //  /                  //
+    union {           // we can simplify it once we get rid of old format compatibility
+        UsbPacketNGCore ng;
+        UsbCommand old;
+    } core;
+    uint16_t crc;    //  -- Postamble       //
+    bool ng;
+} PACKED UsbReplyNG;
 
 #ifdef WITH_FPC_HOST
 // "Session" flag, to tell via which interface next msgs should be sent: USB or FPC USART

From 64eb93c9c4319538abaddda4725c25ac1741d1e5 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 17 Apr 2019 22:08:10 +0200
Subject: [PATCH 1323/1938] style

---
 armsrc/appmain.c | 2 +-
 client/cmdhw.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 392c697b4..c621c2923 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -376,7 +376,7 @@ void printUSBSpeed(void) {
     uint32_t bytes_transferred = 0;
 
     LED_B_ON();
-    
+
     while (end_time < start_time + USB_SPEED_TEST_MIN_TIME) {
         reply_ng(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K, PM3_SUCCESS, test_data, USB_DATANG_SIZE);
         end_time = GetTickCount();
diff --git a/client/cmdhw.c b/client/cmdhw.c
index 2073564d8..97c518231 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -448,7 +448,7 @@ static int CmdPingNG(const char *Cmd) {
     UsbReplyNG resp;
     uint8_t data[USB_DATANG_SIZE] = {0};
     uint16_t cmd = CMD_PING;
-    for (uint16_t i=0; i<len; i++)
+    for (uint16_t i = 0; i < len; i++)
         data[i] = i & 0xFF;
     SendCommandNG(cmd, data, len);
     if (WaitForResponseTimeout(CMD_PING, &resp, 1000)) {

From 533667ea6ddf88e5115d91ae52dc06fb256da6f2 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 17 Apr 2019 23:44:48 +0200
Subject: [PATCH 1324/1938] Better Reply structs

---
 armsrc/appmain.c           |  24 +++----
 armsrc/apps.h              |   2 +-
 client/cli.c               |   2 +-
 client/cmdanalyse.c        |   4 +-
 client/cmddata.c           |  22 +++---
 client/cmdflashmem.c       |  22 +++---
 client/cmdhf.c             |   4 +-
 client/cmdhf14a.c          | 104 ++++++++++++++--------------
 client/cmdhf14b.c          |  68 +++++++++----------
 client/cmdhf15.c           |  62 ++++++++---------
 client/cmdhfepa.c          |  38 +++++------
 client/cmdhffelica.c       |  26 +++----
 client/cmdhficlass.c       |  86 ++++++++++++------------
 client/cmdhflegic.c        |  38 +++++------
 client/cmdhfmf.c           |  90 ++++++++++++-------------
 client/cmdhfmfdes.c        | 134 ++++++++++++++++++-------------------
 client/cmdhfmfdesfire.c    |  20 +++---
 client/cmdhfmfhard.c       |  16 ++---
 client/cmdhfmfp.c          |   6 +-
 client/cmdhfmfu.c          |  68 +++++++++----------
 client/cmdhftopaz.c        |  12 ++--
 client/cmdhw.c             |  34 +++++-----
 client/cmdlf.c             |  24 +++----
 client/cmdlfawid.c         |  10 +--
 client/cmdlfcotag.c        |   2 +-
 client/cmdlfem4x.c         |   8 +--
 client/cmdlffdx.c          |   4 +-
 client/cmdlfguard.c        |   4 +-
 client/cmdlfhid.c          |  10 +--
 client/cmdlfhitag.c        |  24 +++----
 client/cmdlfindala.c       |   4 +-
 client/cmdlfio.c           |   8 +--
 client/cmdlfjablotron.c    |   4 +-
 client/cmdlfkeri.c         |   4 +-
 client/cmdlfnedap.c        |   4 +-
 client/cmdlfnoralsy.c      |   4 +-
 client/cmdlfparadox.c      |   2 +-
 client/cmdlfpcf7931.c      |   4 +-
 client/cmdlfpresco.c       |   4 +-
 client/cmdlfpyramid.c      |   4 +-
 client/cmdlft55xx.c        |  20 +++---
 client/cmdlfti.c           |   4 +-
 client/cmdlfviking.c       |   4 +-
 client/cmdlfvisa2000.c     |   4 +-
 client/cmdsmartcard.c      |  48 ++++++-------
 client/cmdtrace.c          |   2 +-
 client/comms.c             | 116 ++++++++++++++++----------------
 client/comms.h             |   2 +-
 client/flash.c             |  34 +++++-----
 client/flasher.c           |   4 +-
 client/mifare/mifarehost.c | 100 +++++++++++++--------------
 client/scripting.c         |  12 ++--
 client/snooper.c           |   2 +-
 client/util.h              |   2 +-
 common/cmd.c               |  37 +++++-----
 common/usart.c             |   6 +-
 include/usb_cmd.h          |  36 ++++++----
 57 files changed, 725 insertions(+), 718 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index c621c2923..bab5ada6e 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -363,7 +363,7 @@ void SendVersion(void) {
 }
 
 // measure the USB Speed by sending SpeedTestBufferSize bytes to client and measuring the elapsed time.
-// Note: this mimics GetFromBigbuf(), i.e. we have the overhead of the UsbCommand structure included.
+// Note: this mimics GetFromBigbuf(), i.e. we have the overhead of the UsbCommandOLD structure included.
 void printUSBSpeed(void) {
     Dbprintf("USB Speed");
     Dbprintf("  Sending USB packets to client...");
@@ -378,9 +378,9 @@ void printUSBSpeed(void) {
     LED_B_ON();
 
     while (end_time < start_time + USB_SPEED_TEST_MIN_TIME) {
-        reply_ng(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K, PM3_SUCCESS, test_data, USB_DATANG_SIZE);
+        reply_ng(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K, PM3_SUCCESS, test_data, USB_CMD_DATA_SIZE);
         end_time = GetTickCount();
-        bytes_transferred += USB_DATANG_SIZE;
+        bytes_transferred += USB_CMD_DATA_SIZE;
     }
     LED_B_OFF();
 
@@ -1142,13 +1142,13 @@ static void UsbPacketReceived(UsbCommandNG *packet) {
             cmd_send(CMD_DEBUG_PRINT_STRING, strlen(dest), 0, 0, dest, strlen(dest));
             LED_A_OFF();
             /*
-            uint8_t my_rx[sizeof(UsbCommand)];
+            uint8_t my_rx[sizeof(UsbCommandOLD)];
             while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
                 LED_B_INV();
                 if (usart_readbuffer(my_rx) ) {
                     //UsbPacketReceived(my_rx, sizeof(my_rx));
 
-                    UsbCommand *my = (UsbCommand *)my_rx;
+                    UsbCommandOLD *my = (UsbCommandOLD *)my_rx;
                     if (my->cmd > 0 ) {
                         Dbprintf("received command: 0x%04x and args: %d %d %d", my->cmd, my->arg[0], my->arg[1], my->arg[2]);
                     }
@@ -1577,13 +1577,13 @@ void  __attribute__((noreturn)) AppMain(void) {
             size_t bytes = usb_read_ng((uint8_t *)&rx, sizeof(UsbCommandNGPreamble));
             if (bytes == sizeof(UsbCommandNGPreamble)) {
                 if (rx.magic == USB_COMMANDNG_PREAMBLE_MAGIC) { // New style NG command
-                    if (rx.length > USB_DATANG_SIZE) {
+                    if (rx.length > USB_CMD_DATA_SIZE) {
                         Dbprintf("Packet frame with incompatible length: 0x%04x", rx.length);
                         error = true;
                     }
                     if (!error) { // Get the core and variable length payload
-                        bytes = usb_read_ng(((uint8_t *)&rx.core), sizeof(UsbPacketNGCore) - USB_DATANG_SIZE + rx.length);
-                        if (bytes != sizeof(UsbPacketNGCore) - USB_DATANG_SIZE + rx.length) {
+                        bytes = usb_read_ng(((uint8_t *)&rx.core), sizeof(UsbPacketNGCore) - USB_CMD_DATA_SIZE + rx.length);
+                        if (bytes != sizeof(UsbPacketNGCore) - USB_CMD_DATA_SIZE + rx.length) {
                             Dbprintf("Packet frame error variable part too short? %d/%d", bytes, rx.length);
                             error = true;
                         }
@@ -1595,7 +1595,7 @@ void  __attribute__((noreturn)) AppMain(void) {
                             error = true;
                         }
                         uint8_t first, second;
-                        compute_crc(CRC_14443_A, (uint8_t *)&rx, sizeof(UsbCommandNGPreamble) + sizeof(UsbPacketNGCore) - USB_DATANG_SIZE + rx.length, &first, &second);
+                        compute_crc(CRC_14443_A, (uint8_t *)&rx, sizeof(UsbCommandNGPreamble) + sizeof(UsbPacketNGCore) - USB_CMD_DATA_SIZE + rx.length, &first, &second);
                         if ((first << 8) + second != rx.crc) {
                             Dbprintf("Packet frame CRC error %02X%02X <> %04X", first, second, rx.crc);
                             error = true;
@@ -1615,9 +1615,9 @@ void  __attribute__((noreturn)) AppMain(void) {
 
 
 
-                    bytes = usb_read_ng(((uint8_t *)&rx.core.old) + sizeof(UsbCommandNGPreamble), sizeof(UsbCommand) - sizeof(UsbCommandNGPreamble));
-                    if (bytes != sizeof(UsbCommand) - sizeof(UsbCommandNGPreamble)) {
-                        Dbprintf("Packet frame error var part too short? %d/%d", bytes, sizeof(UsbCommand) - sizeof(UsbCommandNGPreamble));
+                    bytes = usb_read_ng(((uint8_t *)&rx.core.old) + sizeof(UsbCommandNGPreamble), sizeof(UsbCommandOLD) - sizeof(UsbCommandNGPreamble));
+                    if (bytes != sizeof(UsbCommandOLD) - sizeof(UsbCommandNGPreamble)) {
+                        Dbprintf("Packet frame error var part too short? %d/%d", bytes, sizeof(UsbCommandOLD) - sizeof(UsbCommandNGPreamble));
                         error = true;
                     }
                     if (!error) {
diff --git a/armsrc/apps.h b/armsrc/apps.h
index 0d923f04a..afa505123 100644
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -222,7 +222,7 @@ void iClass_Clone(uint8_t startblock, uint8_t endblock, uint8_t *data);
 void iClass_ReadCheck(uint8_t blockno, uint8_t keytype);
 
 // cmd.h
-uint8_t cmd_receive(UsbCommand *cmd);
+uint8_t cmd_receive(UsbCommandOLD *cmd);
 uint8_t cmd_send(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
 
 // util.h
diff --git a/client/cli.c b/client/cli.c
index 270689732..2d8466ba7 100644
--- a/client/cli.c
+++ b/client/cli.c
@@ -37,7 +37,7 @@ int main(int argc, char **argv) {
     while (1) {
         while (!OpenProxmark()) { sleep(1); }
         while (1) {
-            UsbCommand cmdbuf;
+            UsbCommandOLD cmdbuf;
             CommandReceived(argv[1]);
             HANDLE_ERROR;
             ReceiveCommand(&cmdbuf);
diff --git a/client/cmdanalyse.c b/client/cmdanalyse.c
index a69c53222..fd64a2de3 100644
--- a/client/cmdanalyse.c
+++ b/client/cmdanalyse.c
@@ -512,7 +512,7 @@ static int CmdAnalyseA(const char *Cmd) {
     if (errors || cmdp == 0) return usage_analyse_a();
 
 
-    UsbCommand c = {CMD_FPC_SEND, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_FPC_SEND, {0, 0, 0}, {{0}}};
     memcpy(c.d.asBytes, data, USB_CMD_DATA_SIZE);
     clearCommandBuffer();
     SendCommand(&c);
@@ -521,7 +521,7 @@ static int CmdAnalyseA(const char *Cmd) {
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         return 1;
     }
-    PrintAndLogEx(NORMAL, "got ack.  Status %d", resp.core.old.arg[0]);
+    PrintAndLogEx(NORMAL, "got ack.  Status %d", resp.oldarg[0]);
     return 0;
     /*
         PrintAndLogEx(NORMAL, "-- " _BLUE_("its my message") "\n");
diff --git a/client/cmddata.c b/client/cmddata.c
index e42838a33..c96e9fb7d 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -874,7 +874,7 @@ static int CmdBuffClear(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_data_buffclear();
 
-    UsbCommand c = {CMD_BUFF_CLEAR, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_BUFF_CLEAR, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     ClearGraph(true);
@@ -1468,8 +1468,8 @@ int getSamples(uint32_t n, bool silent) {
     uint8_t bits_per_sample = 8;
 
     //Old devices without this feature would send 0 at arg[0]
-    if (response.core.old.arg[0] > 0) {
-        sample_config *sc = (sample_config *) response.core.old.d.asBytes;
+    if (response.oldarg[0] > 0) {
+        sample_config *sc = (sample_config *) response.data.asBytes;
         if (!silent) PrintAndLogEx(NORMAL, "Samples @ %d bits/smpl, decimation 1:%d ", sc->bits_per_sample, sc->decimation);
         bits_per_sample = sc->bits_per_sample;
     }
@@ -1529,7 +1529,7 @@ int CmdTuneSamples(const char *Cmd) {
     int timeout = 0;
     PrintAndLogEx(INFO, "\nMeasuring antenna characteristics, please wait...");
 
-    UsbCommand c = {CMD_MEASURE_ANTENNA_TUNING, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_MEASURE_ANTENNA_TUNING, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbReplyNG resp;
@@ -1544,12 +1544,12 @@ int CmdTuneSamples(const char *Cmd) {
     }
     PrintAndLogEx(NORMAL, "\n");
 
-    uint32_t v_lf125 = resp.core.old.arg[0];
-    uint32_t v_lf134 = resp.core.old.arg[0] >> 32;
+    uint32_t v_lf125 = resp.oldarg[0];
+    uint32_t v_lf134 = resp.oldarg[0] >> 32;
 
-    uint32_t v_hf = resp.core.old.arg[1];
-    uint32_t peakf = resp.core.old.arg[2];
-    uint32_t peakv = resp.core.old.arg[2] >> 32;
+    uint32_t v_hf = resp.oldarg[1];
+    uint32_t peakf = resp.oldarg[2];
+    uint32_t peakv = resp.oldarg[2] >> 32;
 
     if (v_lf125 > NON_VOLTAGE)
         PrintAndLogEx(SUCCESS, "LF antenna: %5.2f V - 125.00 kHz", (v_lf125 * ANTENNA_ERROR) / 1000.0);
@@ -1595,8 +1595,8 @@ int CmdTuneSamples(const char *Cmd) {
     // even here, these values has 3% error.
     uint16_t test1 = 0;
     for (int i = 0; i < 256; i++) {
-        GraphBuffer[i] = resp.core.old.d.asBytes[i] - 128;
-        test1 += resp.core.old.d.asBytes[i];
+        GraphBuffer[i] = resp.data.asBytes[i] - 128;
+        test1 += resp.data.asBytes[i];
     }
 
     if (test1 > 0) {
diff --git a/client/cmdflashmem.c b/client/cmdflashmem.c
index b59f553b6..73b1176f6 100644
--- a/client/cmdflashmem.c
+++ b/client/cmdflashmem.c
@@ -140,7 +140,7 @@ static int CmdFlashMemRead(const char *Cmd) {
         return 1;
     }
 
-    UsbCommand c = {CMD_FLASHMEM_READ, {start_index, len, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_FLASHMEM_READ, {start_index, len, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -153,7 +153,7 @@ static int CmdFlashmemSpiBaudrate(const char *Cmd) {
     uint32_t baudrate = param_get32ex(Cmd, 0, 0, 10);
     baudrate = baudrate * 1000000;
     if (baudrate != FLASH_BAUD && baudrate != FLASH_MINBAUD) return usage_flashmem_spibaud();
-    UsbCommand c = {CMD_FLASHMEM_SET_SPIBAUDRATE, {baudrate, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_FLASHMEM_SET_SPIBAUDRATE, {baudrate, 0, 0}, {{0}}};
     SendCommand(&c);
     return 0;
 }
@@ -274,7 +274,7 @@ static int CmdFlashMemLoad(const char *Cmd) {
     while (bytes_remaining > 0) {
         uint32_t bytes_in_packet = MIN(FLASH_MEM_BLOCK_SIZE, bytes_remaining);
 
-        UsbCommand c = {CMD_FLASHMEM_WRITE, {start_index + bytes_sent, bytes_in_packet, 0}, {{0}}};
+        UsbCommandOLD c = {CMD_FLASHMEM_WRITE, {start_index + bytes_sent, bytes_in_packet, 0}, {{0}}};
 
         memcpy(c.d.asBytes, data + bytes_sent, bytes_in_packet);
         clearCommandBuffer();
@@ -290,7 +290,7 @@ static int CmdFlashMemLoad(const char *Cmd) {
             return 1;
         }
 
-        uint8_t isok  = resp.core.old.arg[0] & 0xFF;
+        uint8_t isok  = resp.oldarg[0] & 0xFF;
         if (!isok)
             PrintAndLogEx(FAILED, "Flash write fail [offset %u]", bytes_sent);
 
@@ -389,7 +389,7 @@ static int CmdFlashMemWipe(const char *Cmd) {
     //Validations
     if (errors || cmdp == 0) return usage_flashmem_wipe();
 
-    UsbCommand c = {CMD_FLASHMEM_WIPE, {page, initalwipe, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_FLASHMEM_WIPE, {page, initalwipe, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbReplyNG resp;
@@ -397,7 +397,7 @@ static int CmdFlashMemWipe(const char *Cmd) {
         PrintAndLogEx(WARNING, "timeout while waiting for reply.");
         return 1;
     }
-    uint8_t isok  = resp.core.old.arg[0] & 0xFF;
+    uint8_t isok  = resp.oldarg[0] & 0xFF;
     if (isok)
         PrintAndLogEx(SUCCESS, "Flash WIPE ok");
     else
@@ -435,7 +435,7 @@ static int CmdFlashMemInfo(const char *Cmd) {
     //Validations
     if (errors) return usage_flashmem_info();
 
-    UsbCommand c = {CMD_FLASHMEM_INFO, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_FLASHMEM_INFO, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbReplyNG resp;
@@ -444,7 +444,7 @@ static int CmdFlashMemInfo(const char *Cmd) {
         return 1;
     }
 
-    uint8_t isok = resp.core.old.arg[0] & 0xFF;
+    uint8_t isok = resp.oldarg[0] & 0xFF;
     if (!isok) {
         PrintAndLogEx(FAILED, "failed");
         return 1;
@@ -452,7 +452,7 @@ static int CmdFlashMemInfo(const char *Cmd) {
 
     // validate signature here
     rdv40_validation_t mem;
-    memcpy(&mem, (rdv40_validation_t *)resp.core.old.d.asBytes, sizeof(rdv40_validation_t));
+    memcpy(&mem, (rdv40_validation_t *)resp.data.asBytes, sizeof(rdv40_validation_t));
 
     // Flash ID hash (sha1)
     mbedtls_sha1(mem.flashid, sizeof(mem.flashid), sha_hash);
@@ -564,7 +564,7 @@ static int CmdFlashMemInfo(const char *Cmd) {
 
         if (shall_write) {
             // save to mem
-            c = (UsbCommand) {CMD_FLASHMEM_WRITE, {FLASH_MEM_SIGNATURE_OFFSET, FLASH_MEM_SIGNATURE_LEN, 0}, {{0}}};
+            c = (UsbCommandOLD) {CMD_FLASHMEM_WRITE, {FLASH_MEM_SIGNATURE_OFFSET, FLASH_MEM_SIGNATURE_LEN, 0}, {{0}}};
             memcpy(c.d.asBytes, sign, sizeof(sign));
             clearCommandBuffer();
             SendCommand(&c);
@@ -572,7 +572,7 @@ static int CmdFlashMemInfo(const char *Cmd) {
                 PrintAndLogEx(WARNING, "timeout while waiting for reply.");
             } else {
 
-                if (!resp.core.old.arg[0])
+                if (!resp.oldarg[0])
                     PrintAndLogEx(FAILED, "Writing signature failed");
                 else
                     PrintAndLogEx(SUCCESS, "Writing signature ok [offset: %u]", FLASH_MEM_SIGNATURE_OFFSET);
diff --git a/client/cmdhf.c b/client/cmdhf.c
index f984a3ff0..5d569b629 100644
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -84,7 +84,7 @@ int CmdHFSearch(const char *Cmd) {
 int CmdHFTune(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     PrintAndLogEx(SUCCESS, "Measuring HF antenna, press button to exit");
-    UsbCommand c = {CMD_MEASURE_ANTENNA_TUNING_HF, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_MEASURE_ANTENNA_TUNING_HF, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -97,7 +97,7 @@ int CmdHFSniff(const char *Cmd) {
     int skippairs =  param_get32ex(Cmd, 0, 0, 10);
     int skiptriggers =  param_get32ex(Cmd, 1, 0, 10);
 
-    UsbCommand c = {CMD_HF_SNIFFER, {skippairs, skiptriggers, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_HF_SNIFFER, {skippairs, skiptriggers, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index f9e336153..512f35473 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -228,15 +228,15 @@ static int CmdHF14AList(const char *Cmd) {
 }
 
 int Hf14443_4aGetCardData(iso14a_card_select_t *card) {
-    UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT, 0, 0}, {{0}}};
     SendCommand(&c);
 
     UsbReplyNG resp;
     WaitForResponse(CMD_ACK, &resp);
 
-    memcpy(card, (iso14a_card_select_t *)resp.core.old.d.asBytes, sizeof(iso14a_card_select_t));
+    memcpy(card, (iso14a_card_select_t *)resp.data.asBytes, sizeof(iso14a_card_select_t));
 
-    uint64_t select_status = resp.core.old.arg[0]; // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
+    uint64_t select_status = resp.oldarg[0]; // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
 
     if (select_status == 0) {
         PrintAndLogEx(ERR, "E->iso14443a card select failed");
@@ -256,7 +256,7 @@ int Hf14443_4aGetCardData(iso14a_card_select_t *card) {
 
     PrintAndLogEx(NORMAL, " UID: %s", sprint_hex(card->uid, card->uidlen));
     PrintAndLogEx(NORMAL, "ATQA: %02x %02x", card->atqa[1], card->atqa[0]);
-    PrintAndLogEx(NORMAL, " SAK: %02x [%" PRIu64 "]", card->sak, resp.core.old.arg[0]);
+    PrintAndLogEx(NORMAL, " SAK: %02x [%" PRIu64 "]", card->sak, resp.oldarg[0]);
     if (card->ats_len < 3) { // a valid ATS consists of at least the length byte (TL) and 2 CRC bytes
         PrintAndLogEx(NORMAL, "E-> Error ATS length(%d) : %s", card->ats_len, sprint_hex(card->ats, card->ats_len));
         return 1;
@@ -298,7 +298,7 @@ static int CmdHF14AReader(const char *Cmd) {
     if (!disconnectAfter)
         cm |= ISO14A_NO_DISCONNECT;
 
-    UsbCommand c = {CMD_READER_ISO_14443a, {cm, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_READER_ISO_14443a, {cm, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
 
@@ -311,7 +311,7 @@ static int CmdHF14AReader(const char *Cmd) {
         }
 
         iso14a_card_select_t card;
-        memcpy(&card, (iso14a_card_select_t *)resp.core.old.d.asBytes, sizeof(iso14a_card_select_t));
+        memcpy(&card, (iso14a_card_select_t *)resp.data.asBytes, sizeof(iso14a_card_select_t));
 
         /*
             0: couldn't read
@@ -319,7 +319,7 @@ static int CmdHF14AReader(const char *Cmd) {
             2: OK, no ATS
             3: proprietary Anticollision
         */
-        uint64_t select_status = resp.core.old.arg[0];
+        uint64_t select_status = resp.oldarg[0];
 
         if (select_status == 0) {
             if (!silent) PrintAndLogEx(WARNING, "iso14443a card select failed");
@@ -336,7 +336,7 @@ static int CmdHF14AReader(const char *Cmd) {
 
         PrintAndLogEx(NORMAL, " UID : %s", sprint_hex(card.uid, card.uidlen));
         PrintAndLogEx(NORMAL, "ATQA : %02x %02x", card.atqa[1], card.atqa[0]);
-        PrintAndLogEx(NORMAL, " SAK : %02x [%" PRIu64 "]", card.sak, resp.core.old.arg[0]);
+        PrintAndLogEx(NORMAL, " SAK : %02x [%" PRIu64 "]", card.sak, resp.oldarg[0]);
 
         if (card.ats_len >= 3) { // a valid ATS consists of at least the length byte (TL) and 2 CRC bytes
             PrintAndLogEx(NORMAL, " ATS : %s", sprint_hex(card.ats, card.ats_len));
@@ -385,16 +385,16 @@ static int CmdHF14ACUIDs(const char *Cmd) {
         }
 
         // execute anticollision procedure
-        UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0}, {{0}}};
+        UsbCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0}, {{0}}};
         SendCommand(&c);
 
         UsbReplyNG resp;
         WaitForResponse(CMD_ACK, &resp);
 
-        iso14a_card_select_t *card = (iso14a_card_select_t *) resp.core.old.d.asBytes;
+        iso14a_card_select_t *card = (iso14a_card_select_t *) resp.data.asBytes;
 
         // check if command failed
-        if (resp.core.old.arg[0] == 0) {
+        if (resp.oldarg[0] == 0) {
             PrintAndLogEx(WARNING, "card select failed.");
         } else {
             char uid_string[20];
@@ -483,7 +483,7 @@ int CmdHF14ASim(const char *Cmd) {
     if (useUIDfromEML)
         flags |= FLAG_UID_IN_EMUL;
 
-    UsbCommand c = {CMD_SIMULATE_TAG_ISO_14443a, { tagtype, flags, 0 }, {{0}}};
+    UsbCommandOLD c = {CMD_SIMULATE_TAG_ISO_14443a, { tagtype, flags, 0 }, {{0}}};
     memcpy(c.d.asBytes, uid, uidlen >> 1);
     clearCommandBuffer();
     SendCommand(&c);
@@ -494,9 +494,9 @@ int CmdHF14ASim(const char *Cmd) {
     while (!ukbhit()) {
         if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) continue;
         if (!(flags & FLAG_NR_AR_ATTACK)) break;
-        if ((resp.core.old.arg[0] & 0xffff) != CMD_SIMULATE_MIFARE_CARD) break;
+        if ((resp.oldarg[0] & 0xffff) != CMD_SIMULATE_MIFARE_CARD) break;
 
-        memcpy(data, resp.core.old.d.asBytes, sizeof(data));
+        memcpy(data, resp.data.asBytes, sizeof(data));
         readerAttack(data[0], setEmulatorMem, verbose);
     }
     showSectorTable();
@@ -512,7 +512,7 @@ int CmdHF14ASniff(const char *Cmd) {
         if (ctmp == 'c') param |= 0x01;
         if (ctmp == 'r') param |= 0x02;
     }
-    UsbCommand c = {CMD_SNIFF_ISO_14443a, {param, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_SNIFF_ISO_14443a, {param, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -528,7 +528,7 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
         UsbReplyNG resp;
 
         // Anticollision + SELECT card
-        UsbCommand ca = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}, {{0}}};
+        UsbCommandOLD ca = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}, {{0}}};
         SendCommand(&ca);
         if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
             PrintAndLogEx(ERR, "Proxmark3 connection timeout.");
@@ -536,19 +536,19 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
         }
 
         // check result
-        if (resp.core.old.arg[0] == 0) {
+        if (resp.oldarg[0] == 0) {
             PrintAndLogEx(ERR, "No card in field.");
             return 1;
         }
 
-        if (resp.core.old.arg[0] != 1 && resp.core.old.arg[0] != 2) {
-            PrintAndLogEx(ERR, "Card not in iso14443-4. res=%d.", resp.core.old.arg[0]);
+        if (resp.oldarg[0] != 1 && resp.oldarg[0] != 2) {
+            PrintAndLogEx(ERR, "Card not in iso14443-4. res=%d.", resp.oldarg[0]);
             return 1;
         }
 
-        if (resp.core.old.arg[0] == 2) { // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
+        if (resp.oldarg[0] == 2) { // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
             // get ATS
-            UsbCommand cr = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT, 2, 0}, {{0}}};
+            UsbCommandOLD cr = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT, 2, 0}, {{0}}};
             uint8_t rats[] = { 0xE0, 0x80 }; // FSDI=8 (FSD=256), CID=0
             memcpy(cr.d.asBytes, rats, 2);
             SendCommand(&cr);
@@ -557,7 +557,7 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
                 return 1;
             }
 
-            if (resp.core.old.arg[0] == 0) { // ats_len
+            if (resp.oldarg[0] == 0) { // ats_len
                 PrintAndLogEx(ERR, "Can't get ATS.");
                 return 1;
             }
@@ -567,7 +567,7 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
     if (leaveSignalON)
         cmdc |= ISO14A_NO_DISCONNECT;
 
-    UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_APPEND_CRC | cmdc, (datainlen & 0xFFFF) + 2, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_APPEND_CRC | cmdc, (datainlen & 0xFFFF) + 2, 0}, {{0}}};
     uint8_t header[] = { 0x0a | responseNum, 0x00};
     responseNum ^= 1;
     memcpy(c.d.asBytes, header, 2);
@@ -578,8 +578,8 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
     UsbReplyNG resp;
 
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-        recv = resp.core.old.d.asBytes;
-        int iLen = resp.core.old.arg[0];
+        recv = resp.data.asBytes;
+        int iLen = resp.oldarg[0];
 
         if (!iLen) {
             PrintAndLogEx(ERR, "No card response.");
@@ -627,7 +627,7 @@ static int SelectCard14443_4(bool disconnect, iso14a_card_select_t *card) {
     DropField();
 
     // Anticollision + SELECT card
-    UsbCommand ca = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}, {{0}}};
+    UsbCommandOLD ca = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}, {{0}}};
     SendCommand(&ca);
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         PrintAndLogEx(ERR, "Proxmark3 connection timeout.");
@@ -635,19 +635,19 @@ static int SelectCard14443_4(bool disconnect, iso14a_card_select_t *card) {
     }
 
     // check result
-    if (resp.core.old.arg[0] == 0) {
+    if (resp.oldarg[0] == 0) {
         PrintAndLogEx(ERR, "No card in field.");
         return 1;
     }
 
-    if (resp.core.old.arg[0] != 1 && resp.core.old.arg[0] != 2) {
-        PrintAndLogEx(ERR, "Card not in iso14443-4. res=%d.", resp.core.old.arg[0]);
+    if (resp.oldarg[0] != 1 && resp.oldarg[0] != 2) {
+        PrintAndLogEx(ERR, "Card not in iso14443-4. res=%d.", resp.oldarg[0]);
         return 1;
     }
 
-    if (resp.core.old.arg[0] == 2) { // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
+    if (resp.oldarg[0] == 2) { // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
         // get ATS
-        UsbCommand cr = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT, 2, 0}, {{0}}};
+        UsbCommandOLD cr = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT, 2, 0}, {{0}}};
         uint8_t rats[] = { 0xE0, 0x80 }; // FSDI=8 (FSD=256), CID=0
         memcpy(cr.d.asBytes, rats, 2);
         SendCommand(&cr);
@@ -656,20 +656,20 @@ static int SelectCard14443_4(bool disconnect, iso14a_card_select_t *card) {
             return 1;
         }
 
-        if (resp.core.old.arg[0] == 0) { // ats_len
+        if (resp.oldarg[0] == 0) { // ats_len
             PrintAndLogEx(ERR, "Can't get ATS.");
             return 1;
         }
 
         // get frame length from ATS in data field
-        if (resp.core.old.arg[0] > 1) {
-            uint8_t fsci = resp.core.old.d.asBytes[1] & 0x0f;
+        if (resp.oldarg[0] > 1) {
+            uint8_t fsci = resp.data.asBytes[1] & 0x0f;
             if (fsci < sizeof(atsFSC) / sizeof(atsFSC[0]))
                 frameLength = atsFSC[fsci];
         }
     } else {
         // get frame length from ATS in card data structure
-        iso14a_card_select_t *vcard = (iso14a_card_select_t *) resp.core.old.d.asBytes;
+        iso14a_card_select_t *vcard = (iso14a_card_select_t *) resp.data.asBytes;
         if (vcard->ats_len > 1) {
             uint8_t fsci = vcard->ats[1] & 0x0f;
             if (fsci < sizeof(atsFSC) / sizeof(atsFSC[0]))
@@ -704,7 +704,7 @@ static int CmdExchangeAPDU(bool chainingin, uint8_t *datain, int datainlen, bool
     // https://stackoverflow.com/questions/32994936/safe-max-java-card-apdu-data-command-and-respond-size
     // here length USB_CMD_DATA_SIZE=512
     // timeout must be authomatically set by "get ATS"
-    UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_APDU | ISO14A_NO_DISCONNECT | cmdc, (datainlen & 0xFFFF), 0}, {{0}}};
+    UsbCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_APDU | ISO14A_NO_DISCONNECT | cmdc, (datainlen & 0xFFFF), 0}, {{0}}};
 
     if (datain)
         memcpy(c.d.asBytes, datain, datainlen);
@@ -715,9 +715,9 @@ static int CmdExchangeAPDU(bool chainingin, uint8_t *datain, int datainlen, bool
     UsbReplyNG resp;
 
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-        recv = resp.core.old.d.asBytes;
-        int iLen = resp.core.old.arg[0];
-        uint8_t res = resp.core.old.arg[1];
+        recv = resp.data.asBytes;
+        int iLen = resp.oldarg[0];
+        uint8_t res = resp.oldarg[1];
 
         int dlen = iLen - 2;
         if (dlen < 0)
@@ -891,7 +891,7 @@ static int CmdHF14AAPDU(const char *Cmd) {
 }
 
 static int CmdHF14ACmdRaw(const char *Cmd) {
-    UsbCommand c = {CMD_READER_ISO_14443a, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_READER_ISO_14443a, {0, 0, 0}, {{0}}};
     bool reply = 1;
     bool crc = false;
     bool power = false;
@@ -1050,9 +1050,9 @@ static int waitCmd(uint8_t iSelect) {
     UsbReplyNG resp;
 
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-        uint16_t len = (resp.core.old.arg[0] & 0xFFFF);
+        uint16_t len = (resp.oldarg[0] & 0xFFFF);
         if (iSelect) {
-            len = (resp.core.old.arg[1] & 0xFFFF);
+            len = (resp.oldarg[1] & 0xFFFF);
             if (len) {
                 PrintAndLogEx(NORMAL, "Card selected. UID[%i]:", len);
             } else {
@@ -1065,7 +1065,7 @@ static int waitCmd(uint8_t iSelect) {
         if (!len)
             return 1;
 
-        PrintAndLogEx(NORMAL, "%s", sprint_hex(resp.core.old.d.asBytes, len));
+        PrintAndLogEx(NORMAL, "%s", sprint_hex(resp.data.asBytes, len));
     } else {
         PrintAndLogEx(WARNING, "timeout while waiting for reply.");
         return 3;
@@ -1096,7 +1096,7 @@ static int CmdHF14AAntiFuzz(const char *Cmd) {
         arg0 = FLAG_10B_UID_IN_DATA;
 
     CLIParserFree();
-    UsbCommand c = {CMD_ANTIFUZZ_ISO_14443a, {arg0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_ANTIFUZZ_ISO_14443a, {arg0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -1161,7 +1161,7 @@ int CmdHF14A(const char *Cmd) {
 }
 
 int infoHF14A(bool verbose, bool do_nack_test) {
-    UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbReplyNG resp;
@@ -1172,7 +1172,7 @@ int infoHF14A(bool verbose, bool do_nack_test) {
     }
 
     iso14a_card_select_t card;
-    memcpy(&card, (iso14a_card_select_t *)resp.core.old.d.asBytes, sizeof(iso14a_card_select_t));
+    memcpy(&card, (iso14a_card_select_t *)resp.data.asBytes, sizeof(iso14a_card_select_t));
 
     /*
         0: couldn't read
@@ -1180,7 +1180,7 @@ int infoHF14A(bool verbose, bool do_nack_test) {
         2: OK, no ATS
         3: proprietary Anticollision
     */
-    uint64_t select_status = resp.core.old.arg[0];
+    uint64_t select_status = resp.oldarg[0];
 
     if (select_status == 0) {
         if (verbose) PrintAndLogEx(WARNING, "iso14443a card select failed");
@@ -1197,7 +1197,7 @@ int infoHF14A(bool verbose, bool do_nack_test) {
 
     PrintAndLogEx(NORMAL, " UID : %s", sprint_hex(card.uid, card.uidlen));
     PrintAndLogEx(NORMAL, "ATQA : %02x %02x", card.atqa[1], card.atqa[0]);
-    PrintAndLogEx(NORMAL, " SAK : %02x [%" PRIu64 "]", card.sak, resp.core.old.arg[0]);
+    PrintAndLogEx(NORMAL, " SAK : %02x [%" PRIu64 "]", card.sak, resp.oldarg[0]);
 
     bool isMifareClassic = true;
     switch (card.sak) {
@@ -1221,9 +1221,9 @@ int infoHF14A(bool verbose, bool do_nack_test) {
             SendCommand(&c);
             WaitForResponse(CMD_ACK, &resp);
 
-            memcpy(&card, (iso14a_card_select_t *)resp.core.old.d.asBytes, sizeof(iso14a_card_select_t));
+            memcpy(&card, (iso14a_card_select_t *)resp.data.asBytes, sizeof(iso14a_card_select_t));
 
-            select_status = resp.core.old.arg[0]; // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS
+            select_status = resp.oldarg[0]; // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS
 
             if (select_status == 0) {
                 DropField();
@@ -1295,8 +1295,8 @@ int infoHF14A(bool verbose, bool do_nack_test) {
         SendCommand(&c);
         WaitForResponse(CMD_ACK, &resp);
 
-        memcpy(card.ats, resp.core.old.d.asBytes, resp.core.old.arg[0]);
-        card.ats_len = resp.core.old.arg[0]; // note: ats_len includes CRC Bytes
+        memcpy(card.ats, resp.data.asBytes, resp.oldarg[0]);
+        card.ats_len = resp.oldarg[0]; // note: ats_len includes CRC Bytes
     }
 
     if (card.ats_len >= 3) {        // a valid ATS consists of at least the length byte (TL) and 2 CRC bytes
diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c
index b9553a909..4eba870eb 100644
--- a/client/cmdhf14b.c
+++ b/client/cmdhf14b.c
@@ -108,14 +108,14 @@ static int usage_hf_14b_dump(void) {
 
 /*
 static void switch_on_field_14b(void) {
-    UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
 }
 */
 
 static int switch_off_field_14b(void) {
-    UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_DISCONNECT, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_ISO_14443B_COMMAND, {ISO14B_DISCONNECT, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -128,11 +128,11 @@ static bool waitCmd14b(bool verbose) {
 
     if (WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
 
-        if ((resp.core.old.arg[0] & 0xFF) > 0) return false;
+        if ((resp.oldarg[0] & 0xFF) > 0) return false;
 
-        uint16_t len = (resp.core.old.arg[1] & 0xFFFF);
+        uint16_t len = (resp.oldarg[1] & 0xFFFF);
 
-        memcpy(data, resp.core.old.d.asBytes, len);
+        memcpy(data, resp.data.asBytes, len);
 
         if (verbose) {
             if (len >= 3) {
@@ -171,7 +171,7 @@ static int CmdHF14BSim(const char *Cmd) {
         pupi = param_get32ex(Cmd, 1, 0, 16);
     }
 
-    UsbCommand c = {CMD_SIMULATE_TAG_ISO_14443B, {pupi, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_SIMULATE_TAG_ISO_14443B, {pupi, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -182,7 +182,7 @@ static int CmdHF14BSniff(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_hf_14b_sniff();
 
-    UsbCommand c = {CMD_SNIFF_ISO_14443B, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_SNIFF_ISO_14443B, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -277,7 +277,7 @@ static int CmdHF14BCmdRaw(const char *Cmd) {
     // Max buffer is USB_CMD_DATA_SIZE
     datalen = (datalen > USB_CMD_DATA_SIZE) ? USB_CMD_DATA_SIZE : datalen;
 
-    UsbCommand c = {CMD_ISO_14443B_COMMAND, {flags, datalen, time_wait}, {{0}}};
+    UsbCommandOLD c = {CMD_ISO_14443B_COMMAND, {flags, datalen, time_wait}, {{0}}};
     memcpy(c.d.asBytes, data, datalen);
     clearCommandBuffer();
     SendCommand(&c);
@@ -302,7 +302,7 @@ static bool get_14b_UID(iso14b_card_select_t *card) {
 
     int8_t retry = 3;
     UsbReplyNG resp;
-    UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_SR | ISO14B_DISCONNECT, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_SR | ISO14B_DISCONNECT, 0, 0}, {{0}}};
 
     // test for 14b SR
     while (retry--) {
@@ -311,9 +311,9 @@ static bool get_14b_UID(iso14b_card_select_t *card) {
         SendCommand(&c);
         if (WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
 
-            uint8_t status = resp.core.old.arg[0];
+            uint8_t status = resp.oldarg[0];
             if (status == 0) {
-                memcpy(card, (iso14b_card_select_t *)resp.core.old.d.asBytes, sizeof(iso14b_card_select_t));
+                memcpy(card, (iso14b_card_select_t *)resp.data.asBytes, sizeof(iso14b_card_select_t));
                 return true;
             }
         }
@@ -329,9 +329,9 @@ static bool get_14b_UID(iso14b_card_select_t *card) {
         SendCommand(&c);
         if (WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
 
-            uint8_t status = resp.core.old.arg[0];
+            uint8_t status = resp.oldarg[0];
             if (status == 0) {
-                memcpy(card, (iso14b_card_select_t *)resp.core.old.d.asBytes, sizeof(iso14b_card_select_t));
+                memcpy(card, (iso14b_card_select_t *)resp.data.asBytes, sizeof(iso14b_card_select_t));
                 return true;
             }
         }
@@ -509,7 +509,7 @@ static bool HF14B_Std_Info(bool verbose) {
     bool isSuccess = false;
 
     // 14b get and print UID only (general info)
-    UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_STD | ISO14B_DISCONNECT, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_STD | ISO14B_DISCONNECT, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbReplyNG resp;
@@ -521,9 +521,9 @@ static bool HF14B_Std_Info(bool verbose) {
     }
 
     iso14b_card_select_t card;
-    memcpy(&card, (iso14b_card_select_t *)resp.core.old.d.asBytes, sizeof(iso14b_card_select_t));
+    memcpy(&card, (iso14b_card_select_t *)resp.data.asBytes, sizeof(iso14b_card_select_t));
 
-    uint64_t status = resp.core.old.arg[0];
+    uint64_t status = resp.oldarg[0];
 
     switch (status) {
         case 0:
@@ -550,7 +550,7 @@ static bool HF14B_Std_Info(bool verbose) {
 // SRx get and print full info (needs more info...)
 static bool HF14B_ST_Info(bool verbose) {
 
-    UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_SR | ISO14B_DISCONNECT, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_SR | ISO14B_DISCONNECT, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbReplyNG resp;
@@ -561,9 +561,9 @@ static bool HF14B_ST_Info(bool verbose) {
     }
 
     iso14b_card_select_t card;
-    memcpy(&card, (iso14b_card_select_t *)resp.core.old.d.asBytes, sizeof(iso14b_card_select_t));
+    memcpy(&card, (iso14b_card_select_t *)resp.data.asBytes, sizeof(iso14b_card_select_t));
 
-    uint64_t status = resp.core.old.arg[0];
+    uint64_t status = resp.oldarg[0];
     if (status > 0)
         return false;
 
@@ -607,7 +607,7 @@ static bool HF14B_ST_Reader(bool verbose) {
     bool isSuccess = false;
 
     // SRx get and print general info about SRx chip from UID
-    UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_SR | ISO14B_DISCONNECT, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_SR | ISO14B_DISCONNECT, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbReplyNG resp;
@@ -617,9 +617,9 @@ static bool HF14B_ST_Reader(bool verbose) {
     }
 
     iso14b_card_select_t card;
-    memcpy(&card, (iso14b_card_select_t *)resp.core.old.d.asBytes, sizeof(iso14b_card_select_t));
+    memcpy(&card, (iso14b_card_select_t *)resp.data.asBytes, sizeof(iso14b_card_select_t));
 
-    uint64_t status = resp.core.old.arg[0];
+    uint64_t status = resp.oldarg[0];
 
     switch (status) {
         case 0:
@@ -647,7 +647,7 @@ static bool HF14B_Std_Reader(bool verbose) {
     bool isSuccess = false;
 
     // 14b get and print UID only (general info)
-    UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_STD | ISO14B_DISCONNECT, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_STD | ISO14B_DISCONNECT, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbReplyNG resp;
@@ -658,9 +658,9 @@ static bool HF14B_Std_Reader(bool verbose) {
     }
 
     iso14b_card_select_t card;
-    memcpy(&card, (iso14b_card_select_t *)resp.core.old.d.asBytes, sizeof(iso14b_card_select_t));
+    memcpy(&card, (iso14b_card_select_t *)resp.data.asBytes, sizeof(iso14b_card_select_t));
 
-    uint64_t status = resp.core.old.arg[0];
+    uint64_t status = resp.oldarg[0];
 
     switch (status) {
         case 0:
@@ -692,7 +692,7 @@ static bool HF14B_Other_Reader() {
     // // 14b get and print UID only (general info)
     // uint32_t flags = ISO14B_CONNECT | ISO14B_SELECT_STD | ISO14B_RAW | ISO14B_APPEND_CRC;
 
-    // UsbCommand c = {CMD_ISO_14443B_COMMAND, {flags, datalen, 0}, {{0}}};
+    // UsbCommandOLD c = {CMD_ISO_14443B_COMMAND, {flags, datalen, 0}, {{0}}};
     // memcpy(c.d.asBytes, data, datalen);
 
     // clearCommandBuffer();
@@ -762,7 +762,7 @@ static int CmdHF14BReadSri(const char *Cmd) {
     uint8_t tagtype = param_get8(Cmd, 0);
     uint8_t blocks = (tagtype == 1) ? 0x7F : 0x0F;
 
-    UsbCommand c = {CMD_READ_SRI_TAG, {blocks, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_READ_SRI_TAG, {blocks, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -902,14 +902,14 @@ static int CmdHF14BDump(const char *Cmd) {
     uint8_t *recv = NULL;
 
     UsbReplyNG resp;
-    UsbCommand c = {CMD_ISO_14443B_COMMAND, { ISO14B_CONNECT | ISO14B_SELECT_SR, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_ISO_14443B_COMMAND, { ISO14B_CONNECT | ISO14B_SELECT_SR, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
 
     //select
     if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
-        if (resp.core.old.arg[0]) {
-            PrintAndLogEx(INFO, "failed to select %d | %d", resp.core.old.arg[0], resp.core.old.arg[1]);
+        if (resp.oldarg[0]) {
+            PrintAndLogEx(INFO, "failed to select %d | %d", resp.oldarg[0], resp.oldarg[1]);
             goto out;
         }
     }
@@ -929,20 +929,20 @@ static int CmdHF14BDump(const char *Cmd) {
 
         if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
 
-            uint8_t status = resp.core.old.arg[0] & 0xFF;
+            uint8_t status = resp.oldarg[0] & 0xFF;
             if (status > 0) {
                 continue;
             }
 
-            uint16_t len = (resp.core.old.arg[1] & 0xFFFF);
-            recv = resp.core.old.d.asBytes;
+            uint16_t len = (resp.oldarg[1] & 0xFFFF);
+            recv = resp.data.asBytes;
 
             if (!check_crc(CRC_14443_B, recv, len)) {
                 PrintAndLogEx(FAILED, "crc fail, retrying one more time");
                 continue;
             }
 
-            memcpy(data + (blocknum * 4), resp.core.old.d.asBytes, 4);
+            memcpy(data + (blocknum * 4), resp.data.asBytes, 4);
 
             if (blocknum == 0xFF) {
                 //last read.
diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index 78ff9f860..199a8952d 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -199,7 +199,7 @@ const productName uidmapping[] = {
 static int getUID(uint8_t *buf) {
 
     UsbReplyNG resp;
-    UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}}; // len,speed,recv?
+    UsbCommandOLD c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}}; // len,speed,recv?
 
     c.d.asBytes[0] = ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | ISO15_REQ_INVENTORY | ISO15_REQINV_SLOT1;
     c.d.asBytes[1] = ISO15_CMD_INVENTORY;
@@ -218,9 +218,9 @@ static int getUID(uint8_t *buf) {
 
         if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
 
-            uint8_t resplen = resp.core.old.arg[0];
-            if (resplen >= 12 && CheckCrc15(resp.core.old.d.asBytes, 12)) {
-                memcpy(buf, resp.core.old.d.asBytes + 2, 8);
+            uint8_t resplen = resp.oldarg[0];
+            if (resplen >= 12 && CheckCrc15(resp.data.asBytes, 12)) {
+                memcpy(buf, resp.data.asBytes + 2, 8);
                 return 1;
             }
         }
@@ -418,7 +418,7 @@ static int usage_15_readmulti(void) {
  * Parameters:
  *  **cmd   command line
  */
-static int prepareHF15Cmd(char **cmd, UsbCommand *c, uint8_t iso15cmd) {
+static int prepareHF15Cmd(char **cmd, UsbCommandOLD *c, uint8_t iso15cmd) {
     int temp;
     uint8_t *req = c->d.asBytes;
     uint8_t uid[8] = {0x00};
@@ -577,7 +577,7 @@ static int CmdHF15Samples(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_15_samples();
 
-    UsbCommand c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_15693, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_15693, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
 
@@ -596,7 +596,7 @@ static int CmdHF15Info(const char *Cmd) {
 
     UsbReplyNG resp;
     uint8_t *recv;
-    UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}}; // len,speed,recv?
+    UsbCommandOLD c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}}; // len,speed,recv?
     uint8_t *req = c.d.asBytes;
     char cmdbuf[100] = {0};
     char *cmd = cmdbuf;
@@ -619,14 +619,14 @@ static int CmdHF15Info(const char *Cmd) {
         return 1;
     }
 
-    uint32_t status = resp.core.old.arg[0];
+    uint32_t status = resp.oldarg[0];
 
     if (status < 2) {
         PrintAndLogEx(WARNING, "iso15693 card doesn't answer to systeminfo command");
         return 1;
     }
 
-    recv = resp.core.old.d.asBytes;
+    recv = resp.data.asBytes;
 
     if (recv[0] & ISO15_RES_ERROR) {
         PrintAndLogEx(WARNING, "iso15693 card returned error %i: %s", recv[0], TagErrorStr(recv[0]));
@@ -674,7 +674,7 @@ static int CmdHF15Record(const char *Cmd) {
     char cmdp =  tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_15_record();
 
-    UsbCommand c = {CMD_RECORD_RAW_ADC_SAMPLES_ISO_15693, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_RECORD_RAW_ADC_SAMPLES_ISO_15693, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -702,7 +702,7 @@ static int CmdHF15Sim(const char *Cmd) {
 
     PrintAndLogEx(SUCCESS, "Starting simulating UID %s", sprint_hex(uid, sizeof(uid)));
 
-    UsbCommand c = {CMD_SIMTAG_ISO_15693, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_SIMTAG_ISO_15693, {0, 0, 0}, {{0}}};
     memcpy(c.d.asBytes, uid, 8);
     clearCommandBuffer();
     SendCommand(&c);
@@ -718,7 +718,7 @@ static int CmdHF15Afi(const char *Cmd) {
 
     PrintAndLogEx(SUCCESS, "press pm3-button to cancel");
 
-    UsbCommand c = {CMD_ISO_15693_FIND_AFI, {strtol(Cmd, NULL, 0), 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_ISO_15693_FIND_AFI, {strtol(Cmd, NULL, 0), 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -784,7 +784,7 @@ static int CmdHF15Dump(const char *Cmd) {
     memset(data, 0, sizeof(data));
 
     UsbReplyNG resp;
-    UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}}; // len,speed,recv?
+    UsbCommandOLD c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}}; // len,speed,recv?
     uint8_t *req = c.d.asBytes;
     req[0] = ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | ISO15_REQ_NONINVENTORY | ISO15_REQ_ADDRESS;
     req[1] = ISO15_CMD_READ;
@@ -803,13 +803,13 @@ static int CmdHF15Dump(const char *Cmd) {
 
         if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
 
-            uint8_t len = resp.core.old.arg[0];
+            uint8_t len = resp.oldarg[0];
             if (len < 2) {
                 PrintAndLogEx(FAILED, "iso15693 card select failed");
                 continue;
             }
 
-            recv = resp.core.old.d.asBytes;
+            recv = resp.data.asBytes;
 
             if (!CheckCrc15(recv, len)) {
                 PrintAndLogEx(FAILED, "crc fail");
@@ -821,9 +821,9 @@ static int CmdHF15Dump(const char *Cmd) {
                 break;
             }
 
-            mem[blocknum].lock = resp.core.old.d.asBytes[0];
-            memcpy(mem[blocknum].block, resp.core.old.d.asBytes + 1, 4);
-            memcpy(data + (blocknum * 4), resp.core.old.d.asBytes + 1, 4);
+            mem[blocknum].lock = resp.data.asBytes[0];
+            memcpy(mem[blocknum].block, resp.data.asBytes + 1, 4);
+            memcpy(data + (blocknum * 4), resp.data.asBytes + 1, 4);
 
             retry = 0;
             blocknum++;
@@ -860,7 +860,7 @@ static int CmdHF15Raw(const char *Cmd) {
     if (strlen(Cmd) < 3 || cmdp == 'h' || cmdp == 'H') return usage_15_raw();
 
     UsbReplyNG resp;
-    UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}}; // len,speed,recv?
+    UsbCommandOLD c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}}; // len,speed,recv?
     int reply = 1, fast = 1, i = 0;
     bool crc = false;
     char buf[5] = "";
@@ -926,9 +926,9 @@ static int CmdHF15Raw(const char *Cmd) {
 
     if (reply) {
         if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
-            uint8_t len = resp.core.old.arg[0];
+            uint8_t len = resp.oldarg[0];
             PrintAndLogEx(NORMAL, "received %i octets", len);
-            PrintAndLogEx(NORMAL, "%s", sprint_hex(resp.core.old.d.asBytes, len));
+            PrintAndLogEx(NORMAL, "%s", sprint_hex(resp.data.asBytes, len));
         } else {
             PrintAndLogEx(WARNING, "timeout while waiting for reply.");
         }
@@ -947,7 +947,7 @@ static int CmdHF15Readmulti(const char *Cmd) {
 
     UsbReplyNG resp;
     uint8_t *recv;
-    UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}}; // len,speed,recv?
+    UsbCommandOLD c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}}; // len,speed,recv?
     uint8_t *req = c.d.asBytes;
     int reqlen = 0;
     uint8_t pagenum, pagecount;
@@ -986,13 +986,13 @@ static int CmdHF15Readmulti(const char *Cmd) {
         return 1;
     }
 
-    uint32_t status = resp.core.old.arg[0];
+    uint32_t status = resp.oldarg[0];
     if (status < 2) {
         PrintAndLogEx(FAILED, "iso15693 card select failed");
         return 1;
     }
 
-    recv = resp.core.old.d.asBytes;
+    recv = resp.data.asBytes;
 
     if (!CheckCrc15(recv, status)) {
         PrintAndLogEx(FAILED, "CRC failed");
@@ -1031,11 +1031,11 @@ static int CmdHF15Read(const char *Cmd) {
     UsbReplyNG resp;
     uint8_t *recv;
 
-    // UsbCommand arg: len, speed, recv?
+    // UsbCommandOLD arg: len, speed, recv?
     // arg0 (datalen,  cmd len?  .arg0 == crc?)
     // arg1 (speed == 0 == 1 of 256,  == 1 == 1 of 4 )
     // arg2 (recv == 1 == expect a response)
-    UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}};
+    UsbCommandOLD c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}};
     uint8_t *req = c.d.asBytes;
     int reqlen = 0, blocknum;
     char cmdbuf[100] = {0};
@@ -1066,13 +1066,13 @@ static int CmdHF15Read(const char *Cmd) {
         return 1;
     }
 
-    uint32_t status = resp.core.old.arg[0];
+    uint32_t status = resp.oldarg[0];
     if (status < 2) {
         PrintAndLogEx(NORMAL, "iso15693 card select failed");
         return 1;
     }
 
-    recv = resp.core.old.d.asBytes;
+    recv = resp.data.asBytes;
 
     if (!CheckCrc15(recv, status)) {
         PrintAndLogEx(NORMAL, "CRC failed");
@@ -1104,7 +1104,7 @@ static int CmdHF15Write(const char *Cmd) {
 
     UsbReplyNG resp;
     uint8_t *recv;
-    UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}}; // len,speed,recv?
+    UsbCommandOLD c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}}; // len,speed,recv?
     uint8_t *req = c.d.asBytes;
     int reqlen = 0, pagenum, temp;
     char cmdbuf[100] = {0};
@@ -1150,13 +1150,13 @@ static int CmdHF15Write(const char *Cmd) {
         return 1;
     }
 
-    uint32_t status = resp.core.old.arg[0];
+    uint32_t status = resp.oldarg[0];
     if (status < 2) {
         PrintAndLogEx(FAILED, "iso15693 card select failed");
         return 1;
     }
 
-    recv = resp.core.old.d.asBytes;
+    recv = resp.data.asBytes;
 
     if (!CheckCrc15(recv, status)) {
         PrintAndLogEx(FAILED, "CRC failed");
diff --git a/client/cmdhfepa.c b/client/cmdhfepa.c
index ac9900c64..ea6f5c48d 100644
--- a/client/cmdhfepa.c
+++ b/client/cmdhfepa.c
@@ -31,20 +31,20 @@ static int CmdHFEPACollectPACENonces(const char *Cmd) {
     // repeat n times
     for (uint32_t i = 0; i < n; i++) {
         // execute PACE
-        UsbCommand c = {CMD_EPA_PACE_COLLECT_NONCE, {(int)m, 0, 0}, {{0}}};
+        UsbCommandOLD c = {CMD_EPA_PACE_COLLECT_NONCE, {(int)m, 0, 0}, {{0}}};
         clearCommandBuffer();
         SendCommand(&c);
         UsbReplyNG resp;
         WaitForResponse(CMD_ACK, &resp);
 
         // check if command failed
-        if (resp.core.old.arg[0] != 0) {
-            PrintAndLogEx(FAILED, "Error in step %d, Return code: %d", resp.core.old.arg[0], (int)resp.core.old.arg[1]);
+        if (resp.oldarg[0] != 0) {
+            PrintAndLogEx(FAILED, "Error in step %d, Return code: %d", resp.oldarg[0], (int)resp.oldarg[1]);
         } else {
-            size_t nonce_length = resp.core.old.arg[1];
+            size_t nonce_length = resp.oldarg[1];
             char *nonce = (char *) calloc(2 * nonce_length + 1, sizeof(uint8_t));
             for (int j = 0; j < nonce_length; j++) {
-                sprintf(nonce + (2 * j), "%02X", resp.core.old.d.asBytes[j]);
+                sprintf(nonce + (2 * j), "%02X", resp.data.asBytes[j]);
             }
             // print nonce
             PrintAndLogEx(NORMAL, "Length: %d, Nonce: %s", nonce_length, nonce);
@@ -109,7 +109,7 @@ static int CmdHFEPAPACEReplay(const char *Cmd) {
     }
 
     // transfer the APDUs to the Proxmark
-    UsbCommand usb_cmd;
+    UsbCommandOLD usb_cmd;
     usb_cmd.cmd = CMD_EPA_PACE_REPLAY;
     for (int i = 0; i < sizeof(apdu_lengths); i++) {
         // APDU number
@@ -132,7 +132,7 @@ static int CmdHFEPAPACEReplay(const char *Cmd) {
             clearCommandBuffer();
             SendCommand(&usb_cmd);
             WaitForResponse(CMD_ACK, &resp);
-            if (resp.core.old.arg[0] != 0) {
+            if (resp.oldarg[0] != 0) {
                 PrintAndLogEx(WARNING, "Transfer of APDU #%d Part %d failed!", i, j);
                 return 0;
             }
@@ -144,21 +144,21 @@ static int CmdHFEPAPACEReplay(const char *Cmd) {
     clearCommandBuffer();
     SendCommand(&usb_cmd);
     WaitForResponse(CMD_ACK, &resp);
-    if (resp.core.old.arg[0] != 0) {
-        PrintAndLogEx(NORMAL, "\nPACE replay failed in step %u!", (uint32_t)resp.core.old.arg[0]);
+    if (resp.oldarg[0] != 0) {
+        PrintAndLogEx(NORMAL, "\nPACE replay failed in step %u!", (uint32_t)resp.oldarg[0]);
         PrintAndLogEx(NORMAL, "Measured times:");
-        PrintAndLogEx(NORMAL, "MSE Set AT: %u us", resp.core.old.d.asDwords[0]);
-        PrintAndLogEx(NORMAL, "GA Get Nonce: %u us", resp.core.old.d.asDwords[1]);
-        PrintAndLogEx(NORMAL, "GA Map Nonce: %u us", resp.core.old.d.asDwords[2]);
-        PrintAndLogEx(NORMAL, "GA Perform Key Agreement: %u us", resp.core.old.d.asDwords[3]);
-        PrintAndLogEx(NORMAL, "GA Mutual Authenticate: %u us", resp.core.old.d.asDwords[4]);
+        PrintAndLogEx(NORMAL, "MSE Set AT: %u us", resp.data.asDwords[0]);
+        PrintAndLogEx(NORMAL, "GA Get Nonce: %u us", resp.data.asDwords[1]);
+        PrintAndLogEx(NORMAL, "GA Map Nonce: %u us", resp.data.asDwords[2]);
+        PrintAndLogEx(NORMAL, "GA Perform Key Agreement: %u us", resp.data.asDwords[3]);
+        PrintAndLogEx(NORMAL, "GA Mutual Authenticate: %u us", resp.data.asDwords[4]);
     } else {
         PrintAndLogEx(NORMAL, "PACE replay successfull!");
-        PrintAndLogEx(NORMAL, "MSE Set AT: %u us", resp.core.old.d.asDwords[0]);
-        PrintAndLogEx(NORMAL, "GA Get Nonce: %u us", resp.core.old.d.asDwords[1]);
-        PrintAndLogEx(NORMAL, "GA Map Nonce: %u us", resp.core.old.d.asDwords[2]);
-        PrintAndLogEx(NORMAL, "GA Perform Key Agreement: %u us", resp.core.old.d.asDwords[3]);
-        PrintAndLogEx(NORMAL, "GA Mutual Authenticate: %u us", resp.core.old.d.asDwords[4]);
+        PrintAndLogEx(NORMAL, "MSE Set AT: %u us", resp.data.asDwords[0]);
+        PrintAndLogEx(NORMAL, "GA Get Nonce: %u us", resp.data.asDwords[1]);
+        PrintAndLogEx(NORMAL, "GA Map Nonce: %u us", resp.data.asDwords[2]);
+        PrintAndLogEx(NORMAL, "GA Perform Key Agreement: %u us", resp.data.asDwords[3]);
+        PrintAndLogEx(NORMAL, "GA Mutual Authenticate: %u us", resp.data.asDwords[4]);
     }
     return 1;
 }
diff --git a/client/cmdhffelica.c b/client/cmdhffelica.c
index 6a7ea4819..9e9d057de 100644
--- a/client/cmdhffelica.c
+++ b/client/cmdhffelica.c
@@ -128,7 +128,7 @@ static int CmdHFFelicaSim(const char *Cmd) {
     //Validations
     if (errors || cmdp == 0) return usage_hf_felica_sim();
 
-    UsbCommand c = {CMD_FELICA_SIMULATE_TAG, { tagtype, flags, 0 }, {{0}}};
+    UsbCommandOLD c = {CMD_FELICA_SIMULATE_TAG, { tagtype, flags, 0 }, {{0}}};
     memcpy(c.d.asBytes, uid, uidlen >> 1);
     clearCommandBuffer();
     SendCommand(&c);
@@ -174,7 +174,7 @@ static int CmdHFFelicaSniff(const char *Cmd) {
     //Validations
     if (errors || cmdp == 0) return usage_hf_felica_sniff();
 
-    UsbCommand c = {CMD_FELICA_SNIFF, {samples2skip, triggers2skip, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_FELICA_SNIFF, {samples2skip, triggers2skip, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -188,7 +188,7 @@ static int CmdHFFelicaSimLite(const char *Cmd) {
     if (!uid)
         return usage_hf_felica_simlite();
 
-    UsbCommand c = {CMD_FELICA_LITE_SIM, {uid, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_FELICA_LITE_SIM, {uid, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -352,7 +352,7 @@ static int CmdHFFelicaDumpLite(const char *Cmd) {
 
     PrintAndLogEx(SUCCESS, "FeliCa lite - dump started");
     PrintAndLogEx(SUCCESS, "press pm3-button to cancel");
-    UsbCommand c = {CMD_FELICA_LITE_DUMP, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_FELICA_LITE_DUMP, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbReplyNG resp;
@@ -375,12 +375,12 @@ static int CmdHFFelicaDumpLite(const char *Cmd) {
             return 1;
         }
     }
-    if (resp.core.old.arg[0] == 0) {
+    if (resp.oldarg[0] == 0) {
         PrintAndLogEx(WARNING, "\nButton pressed. Aborted.");
         return 1;
     }
 
-    uint64_t tracelen = resp.core.old.arg[1];
+    uint64_t tracelen = resp.oldarg[1];
     if (tracelen == 0)
         return 1;
 
@@ -415,18 +415,18 @@ static void waitCmdFelica(uint8_t iSelect) {
     UsbReplyNG resp;
 
     if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
-        uint16_t len = iSelect ? (resp.core.old.arg[1] & 0xffff) : (resp.core.old.arg[0]  & 0xffff);
+        uint16_t len = iSelect ? (resp.oldarg[1] & 0xffff) : (resp.oldarg[0]  & 0xffff);
         PrintAndLogEx(NORMAL, "received %i octets", len);
         if (!len)
             return;
-        PrintAndLogEx(NORMAL, "%s", sprint_hex(resp.core.old.d.asBytes, len));
+        PrintAndLogEx(NORMAL, "%s", sprint_hex(resp.data.asBytes, len));
     } else {
         PrintAndLogEx(WARNING, "timeout while waiting for reply.");
     }
 }
 
 static int CmdHFFelicaCmdRaw(const char *Cmd) {
-    UsbCommand c = {CMD_FELICA_COMMAND, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_FELICA_COMMAND, {0, 0, 0}, {{0}}};
     bool reply = 1;
     bool crc = false;
     bool power = false;
@@ -568,8 +568,8 @@ int CmdHFFelica(const char *Cmd) {
 
 int readFelicaUid(bool verbose) {
 
-    //UsbCommand cDisconnect = {CMD_FELICA_COMMAND, {0,0,0}, {{0}}};
-    UsbCommand c = {CMD_FELICA_COMMAND, {FELICA_CONNECT, 0, 0}, {{0}}};
+    //UsbCommandOLD cDisconnect = {CMD_FELICA_COMMAND, {0,0,0}, {{0}}};
+    UsbCommandOLD c = {CMD_FELICA_COMMAND, {FELICA_CONNECT, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbReplyNG resp;
@@ -580,8 +580,8 @@ int readFelicaUid(bool verbose) {
     }
 
     felica_card_select_t card;
-    memcpy(&card, (felica_card_select_t *)resp.core.old.d.asBytes, sizeof(felica_card_select_t));
-    uint64_t status = resp.core.old.arg[0];
+    memcpy(&card, (felica_card_select_t *)resp.data.asBytes, sizeof(felica_card_select_t));
+    uint64_t status = resp.oldarg[0];
 
     switch (status) {
         case 1: {
diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index 59273fe06..3a5b50ad0 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -281,7 +281,7 @@ static int CmdHFiClassList(const char *Cmd) {
 static int CmdHFiClassSniff(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_hf_iclass_sniff();
-    UsbCommand c = {CMD_SNIFF_ICLASS, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_SNIFF_ICLASS, {0, 0, 0}, {{0}}};
     SendCommand(&c);
     return 0;
 }
@@ -380,7 +380,7 @@ static int CmdHFiClassSim(const char *Cmd) {
         case 2: {
             PrintAndLogEx(INFO, "Starting iCLASS sim 2 attack (elite mode)");
             PrintAndLogEx(INFO, "press keyboard to cancel");
-            UsbCommand c = {CMD_SIMULATE_TAG_ICLASS, {simType, NUM_CSNS}, {{0}}};
+            UsbCommandOLD c = {CMD_SIMULATE_TAG_ICLASS, {simType, NUM_CSNS}, {{0}}};
             UsbReplyNG resp;
             memcpy(c.d.asBytes, csns, 8 * NUM_CSNS);
             clearCommandBuffer();
@@ -399,7 +399,7 @@ static int CmdHFiClassSim(const char *Cmd) {
                     return 0;
                 }
             }
-            uint8_t num_mac  = resp.core.old.arg[1];
+            uint8_t num_mac  = resp.oldarg[1];
             bool success = (NUM_CSNS == num_mac);
             PrintAndLogEx(NORMAL, "[%c] %d out of %d MAC obtained [%s]", (success) ? '+' : '!', num_mac, NUM_CSNS, (success) ? "OK" : "FAIL");
 
@@ -420,9 +420,9 @@ static int CmdHFiClassSim(const char *Cmd) {
                 //copy CSN
                 memcpy(dump + i * 24, csns + i * 8, 8);
                 //copy epurse
-                memcpy(dump + i * 24 + 8, resp.core.old.d.asBytes + i * 16, 8);
+                memcpy(dump + i * 24 + 8, resp.data.asBytes + i * 16, 8);
                 // NR_MAC (eight bytes from the response)  ( 8b csn + 8b epurse == 16)
-                memcpy(dump + i * 24 + 16, resp.core.old.d.asBytes + i * 16 + 8, 8);
+                memcpy(dump + i * 24 + 16, resp.data.asBytes + i * 16 + 8, 8);
             }
             /** Now, save to dumpfile **/
             saveFile("iclass_mac_attack", "bin", dump, datalen);
@@ -433,7 +433,7 @@ static int CmdHFiClassSim(const char *Cmd) {
             // reader in key roll mode,  when it has two keys it alternates when trying to verify.
             PrintAndLogEx(INFO, "Starting iCLASS sim 4 attack (elite mode, reader in key roll mode)");
             PrintAndLogEx(INFO, "press keyboard to cancel");
-            UsbCommand c = {CMD_SIMULATE_TAG_ICLASS, {simType, NUM_CSNS}, {{0}}};
+            UsbCommandOLD c = {CMD_SIMULATE_TAG_ICLASS, {simType, NUM_CSNS}, {{0}}};
             UsbReplyNG resp;
             memcpy(c.d.asBytes, csns, 8 * NUM_CSNS);
             clearCommandBuffer();
@@ -452,7 +452,7 @@ static int CmdHFiClassSim(const char *Cmd) {
                     return 0;
                 }
             }
-            uint8_t num_mac = resp.core.old.arg[1];
+            uint8_t num_mac = resp.oldarg[1];
             bool success = ((NUM_CSNS * 2) == num_mac);
             PrintAndLogEx(NORMAL, "[%c] %d out of %d MAC obtained [%s]", (success) ? '+' : '!', num_mac, NUM_CSNS * 2, (success) ? "OK" : "FAIL");
 
@@ -475,9 +475,9 @@ static int CmdHFiClassSim(const char *Cmd) {
                 // copy CSN
                 memcpy(dump + i * MAC_ITEM_SIZE, csns + i * 8, 8); //CSN
                 // copy EPURSE
-                memcpy(dump + i * MAC_ITEM_SIZE + 8, resp.core.old.d.asBytes + i * 16, 8);
+                memcpy(dump + i * MAC_ITEM_SIZE + 8, resp.data.asBytes + i * 16, 8);
                 // copy NR_MAC (eight bytes from the response)  ( 8b csn + 8b epurse == 16)
-                memcpy(dump + i * MAC_ITEM_SIZE + 16, resp.core.old.d.asBytes + i * 16 + 8, 8);
+                memcpy(dump + i * MAC_ITEM_SIZE + 16, resp.data.asBytes + i * 16 + 8, 8);
             }
             saveFile("iclass_mac_attack_keyroll_A", "bin", dump, datalen);
 
@@ -489,9 +489,9 @@ static int CmdHFiClassSim(const char *Cmd) {
                 // Copy CSN
                 memcpy(dump + i * MAC_ITEM_SIZE, csns + i * 8, 8);
                 // copy EPURSE
-                memcpy(dump + i * MAC_ITEM_SIZE + 8, resp.core.old.d.asBytes + resp_index, 8);
+                memcpy(dump + i * MAC_ITEM_SIZE + 8, resp.data.asBytes + resp_index, 8);
                 // copy NR_MAC (eight bytes from the response)  ( 8b csn + 8 epurse == 16)
-                memcpy(dump + i * MAC_ITEM_SIZE + 16, resp.core.old.d.asBytes + resp_index + 8, 8);
+                memcpy(dump + i * MAC_ITEM_SIZE + 16, resp.data.asBytes + resp_index + 8, 8);
                 resp_index++;
             }
             saveFile("iclass_mac_attack_keyroll_B", "bin", dump, datalen);
@@ -501,7 +501,7 @@ static int CmdHFiClassSim(const char *Cmd) {
         case 1:
         case 3:
         default: {
-            UsbCommand c = {CMD_SIMULATE_TAG_ICLASS, {simType, numberOfCSNs}, {{0}}};
+            UsbCommandOLD c = {CMD_SIMULATE_TAG_ICLASS, {simType, numberOfCSNs}, {{0}}};
             memcpy(c.d.asBytes, CSN, 8);
             clearCommandBuffer();
             SendCommand(&c);
@@ -531,7 +531,7 @@ static int CmdHFiClassReader_Replay(const char *Cmd) {
         return 1;
     }
 
-    UsbCommand c = {CMD_READER_ICLASS_REPLAY, {readerType}, {{0}}};
+    UsbCommandOLD c = {CMD_READER_ICLASS_REPLAY, {readerType}, {{0}}};
     memcpy(c.d.asBytes, MAC, 4);
     clearCommandBuffer();
     SendCommand(&c);
@@ -540,7 +540,7 @@ static int CmdHFiClassReader_Replay(const char *Cmd) {
 
 /*
 static int iclassEmlSetMem(uint8_t *data, int blockNum, int blocksCount) {
-    UsbCommand c = {CMD_MIFARE_EML_MEMSET, {blockNum, blocksCount, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_MIFARE_EML_MEMSET, {blockNum, blocksCount, 0}, {{0}}};
     memcpy(c.d.asBytes, data, blocksCount * 16);
     clearCommandBuffer();
     SendCommand(&c);
@@ -603,7 +603,7 @@ static int CmdHFiClassELoad(const char *Cmd) {
 
     while (bytes_remaining > 0) {
         uint32_t bytes_in_packet = MIN(USB_CMD_DATA_SIZE, bytes_remaining);
-        UsbCommand c = {CMD_ICLASS_EML_MEMSET, {bytes_sent, bytes_in_packet, 0}, {{0}}};
+        UsbCommandOLD c = {CMD_ICLASS_EML_MEMSET, {bytes_sent, bytes_in_packet, 0}, {{0}}};
         memcpy(c.d.asBytes, dump + bytes_sent, bytes_in_packet);
         clearCommandBuffer();
         SendCommand(&c);
@@ -768,7 +768,7 @@ static void Calc_wb_mac(uint8_t blockno, uint8_t *data, uint8_t *div_key, uint8_
 
 static bool select_only(uint8_t *CSN, uint8_t *CCNR, bool use_credit_key, bool verbose) {
     UsbReplyNG resp;
-    UsbCommand c = {CMD_READER_ICLASS, {0}, {{0}}};
+    UsbCommandOLD c = {CMD_READER_ICLASS, {0}, {{0}}};
     c.arg[0] = FLAG_ICLASS_READER_ONLY_ONCE | FLAG_ICLASS_READER_CC | FLAG_ICLASS_READER_ONE_TRY;
 
     if (use_credit_key)
@@ -781,8 +781,8 @@ static bool select_only(uint8_t *CSN, uint8_t *CCNR, bool use_credit_key, bool v
         return false;
     }
 
-    uint8_t isOK = resp.core.old.arg[0] & 0xff;
-    uint8_t *data = resp.core.old.d.asBytes;
+    uint8_t isOK = resp.oldarg[0] & 0xff;
+    uint8_t *data = resp.data.asBytes;
 
     memcpy(CSN, data, 8);
 
@@ -819,7 +819,7 @@ static bool select_and_auth(uint8_t *KEY, uint8_t *MAC, uint8_t *div_key, bool u
 
     doMAC(CCNR, div_key, MAC);
     UsbReplyNG resp;
-    UsbCommand d = {CMD_ICLASS_AUTHENTICATION, {0, 0, 0}, {{0}}};
+    UsbCommandOLD d = {CMD_ICLASS_AUTHENTICATION, {0, 0, 0}, {{0}}};
     memcpy(d.d.asBytes, MAC, 4);
     clearCommandBuffer();
     SendCommand(&d);
@@ -827,7 +827,7 @@ static bool select_and_auth(uint8_t *KEY, uint8_t *MAC, uint8_t *div_key, bool u
         if (verbose) PrintAndLogEx(FAILED, "auth command execute timeout");
         return false;
     }
-    uint8_t isOK = resp.core.old.arg[0] & 0xFF;
+    uint8_t isOK = resp.oldarg[0] & 0xFF;
     if (!isOK) {
         if (verbose) PrintAndLogEx(FAILED, "authentication error");
         return false;
@@ -939,7 +939,7 @@ static int CmdHFiClassReader_Dump(const char *Cmd) {
                      FLAG_ICLASS_READER_ONE_TRY;
 
     //get config and first 3 blocks
-    UsbCommand c = {CMD_READER_ICLASS, {flags, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_READER_ICLASS, {flags, 0, 0}, {{0}}};
     UsbReplyNG resp;
     uint8_t tag_data[255 * 8];
 
@@ -952,8 +952,8 @@ static int CmdHFiClassReader_Dump(const char *Cmd) {
     }
     DropField();
 
-    uint8_t readStatus = resp.core.old.arg[0] & 0xff;
-    uint8_t *data  = resp.core.old.d.asBytes;
+    uint8_t readStatus = resp.oldarg[0] & 0xff;
+    uint8_t *data  = resp.data.asBytes;
 
     if (readStatus == 0) {
         PrintAndLogEx(FAILED, "no tag found");
@@ -981,7 +981,7 @@ static int CmdHFiClassReader_Dump(const char *Cmd) {
     }
 
     // begin dump
-    UsbCommand w = {CMD_ICLASS_DUMP, {blockno, numblks - blockno + 1}, {{0}}};
+    UsbCommandOLD w = {CMD_ICLASS_DUMP, {blockno, numblks - blockno + 1}, {{0}}};
     clearCommandBuffer();
     SendCommand(&w);
     while (true) {
@@ -1000,14 +1000,14 @@ static int CmdHFiClassReader_Dump(const char *Cmd) {
     }
     // dump cmd switch off at device when finised.
 
-    uint32_t blocksRead = resp.core.old.arg[1];
-    uint8_t isOK = resp.core.old.arg[0] & 0xff;
+    uint32_t blocksRead = resp.oldarg[1];
+    uint8_t isOK = resp.oldarg[0] & 0xff;
     if (!isOK && !blocksRead) {
         PrintAndLogEx(WARNING, "read block failed");
         return 0;
     }
 
-    uint32_t startindex = resp.core.old.arg[2];
+    uint32_t startindex = resp.oldarg[2];
     if (blocksRead * 8 > sizeof(tag_data) - (blockno * 8)) {
         PrintAndLogEx(FAILED, "data exceeded buffer size!");
         blocksRead = (sizeof(tag_data) / 8) - blockno;
@@ -1046,14 +1046,14 @@ static int CmdHFiClassReader_Dump(const char *Cmd) {
                 PrintAndLogEx(WARNING, "command execute timeout 2");
                 return 0;
             }
-            isOK = resp.core.old.arg[0] & 0xff;
-            blocksRead = resp.core.old.arg[1];
+            isOK = resp.oldarg[0] & 0xff;
+            blocksRead = resp.oldarg[1];
             if (!isOK && !blocksRead) {
                 PrintAndLogEx(WARNING, "read block failed 2");
                 return 0;
             }
 
-            startindex = resp.core.old.arg[2];
+            startindex = resp.oldarg[2];
             if (blocksRead * 8 > sizeof(tag_data) - gotBytes) {
                 PrintAndLogEx(FAILED, "data exceeded buffer size!");
                 blocksRead = (sizeof(tag_data) - gotBytes) / 8;
@@ -1100,7 +1100,7 @@ static int WriteBlock(uint8_t blockno, uint8_t *bldata, uint8_t *KEY, bool use_c
     UsbReplyNG resp;
 
     Calc_wb_mac(blockno, bldata, div_key, MAC);
-    UsbCommand w = {CMD_ICLASS_WRITEBLOCK, {blockno}, {{0}}};
+    UsbCommandOLD w = {CMD_ICLASS_WRITEBLOCK, {blockno}, {{0}}};
     memcpy(w.d.asBytes, bldata, 8);
     memcpy(w.d.asBytes + 8, MAC, 4);
 
@@ -1110,7 +1110,7 @@ static int WriteBlock(uint8_t blockno, uint8_t *bldata, uint8_t *KEY, bool use_c
         if (verbose) PrintAndLogEx(WARNING, "Write Command execute timeout");
         return 0;
     }
-    uint8_t isOK = resp.core.old.arg[0] & 0xff;
+    uint8_t isOK = resp.oldarg[0] & 0xff;
     if (isOK)
         PrintAndLogEx(SUCCESS, "Write block successful");
     else
@@ -1321,7 +1321,7 @@ static int CmdHFiClassCloneTag(const char *Cmd) {
         return 0;
     }
 
-    UsbCommand w = {CMD_ICLASS_CLONE, {startblock, endblock}, {{0}}};
+    UsbCommandOLD w = {CMD_ICLASS_CLONE, {startblock, endblock}, {{0}}};
     uint8_t *ptr;
     // calculate all mac for every the block we will write
     for (i = startblock; i <= endblock; i++) {
@@ -1368,7 +1368,7 @@ static int ReadBlock(uint8_t *KEY, uint8_t blockno, uint8_t keyType, bool elite,
     }
 
     UsbReplyNG resp;
-    UsbCommand c = {CMD_ICLASS_READBLOCK, {blockno}, {{0}}};
+    UsbCommandOLD c = {CMD_ICLASS_READBLOCK, {blockno}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 4500)) {
@@ -1376,13 +1376,13 @@ static int ReadBlock(uint8_t *KEY, uint8_t blockno, uint8_t keyType, bool elite,
         return 0;
     }
 
-    uint8_t isOK = resp.core.old.arg[0] & 0xff;
+    uint8_t isOK = resp.oldarg[0] & 0xff;
     if (!isOK) {
         PrintAndLogEx(WARNING, "read block failed");
         return 0;
     }
-    //data read is stored in: resp.core.old.d.asBytes[0-15]
-    PrintAndLogEx(NORMAL, "block %02X: %s\n", blockno, sprint_hex(resp.core.old.d.asBytes, 8));
+    //data read is stored in: resp.data.asBytes[0-15]
+    PrintAndLogEx(NORMAL, "block %02X: %s\n", blockno, sprint_hex(resp.data.asBytes, 8));
     return 1;
 }
 
@@ -1977,7 +1977,7 @@ static int CmdHFiClassCheckKeys(const char *Cmd) {
         if (keys == keycnt - i)
             lastChunk = true;
 
-        UsbCommand c = {CMD_ICLASS_CHECK_KEYS, { (lastChunk << 8), keys, 0}, {{0}}};
+        UsbCommandOLD c = {CMD_ICLASS_CHECK_KEYS, { (lastChunk << 8), keys, 0}, {{0}}};
 
         // bit 16
         //   - 1 indicates credit key
@@ -1999,8 +1999,8 @@ static int CmdHFiClassCheckKeys(const char *Cmd) {
             }
         }
 
-        uint8_t found = resp.core.old.arg[1] & 0xFF;
-        uint8_t isOK = resp.core.old.arg[0] & 0xFF;
+        uint8_t found = resp.oldarg[1] & 0xFF;
+        uint8_t isOK = resp.oldarg[0] & 0xFF;
 
         t2 = msclock() - t2;
         switch (isOK) {
@@ -2465,7 +2465,7 @@ int readIclass(bool loop, bool verbose) {
                      FLAG_ICLASS_READER_CONF | FLAG_ICLASS_READER_ONLY_ONCE |
                      FLAG_ICLASS_READER_ONE_TRY;
 
-    UsbCommand c = {CMD_READER_ICLASS, {flags, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_READER_ICLASS, {flags, 0, 0}, {{0}}};
     // loop in client not device - else on windows have a communication error
     UsbReplyNG resp;
     while (!ukbhit()) {
@@ -2473,8 +2473,8 @@ int readIclass(bool loop, bool verbose) {
         clearCommandBuffer();
         SendCommand(&c);
         if (WaitForResponseTimeout(CMD_ACK, &resp, 4500)) {
-            uint8_t readStatus = resp.core.old.arg[0] & 0xff;
-            uint8_t *data = resp.core.old.d.asBytes;
+            uint8_t readStatus = resp.oldarg[0] & 0xff;
+            uint8_t *data = resp.data.asBytes;
 
             if (verbose) PrintAndLogEx(NORMAL, "Readstatus:%02x", readStatus);
             // no tag found or button pressed
diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index 905c7e408..4e454e0ab 100644
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -524,7 +524,7 @@ static int CmdLegicRfSim(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) == 0 || cmdp == 'h') return usage_legic_sim();
 
-    UsbCommand c = {CMD_SIMULATE_TAG_LEGIC_RF, {1}, {{0}}};
+    UsbCommandOLD c = {CMD_SIMULATE_TAG_LEGIC_RF, {1}, {{0}}};
     sscanf(Cmd, " %" SCNi64, &c.arg[0]);
     clearCommandBuffer();
     SendCommand(&c);
@@ -642,7 +642,7 @@ static int CmdLegicRfWrite(const char *Cmd) {
 
     PrintAndLogEx(SUCCESS, "Writing to tag");
 
-    UsbCommand c = {CMD_WRITER_LEGIC_RF, {offset, len, IV}, {{0}}};
+    UsbCommandOLD c = {CMD_WRITER_LEGIC_RF, {offset, len, IV}, {{0}}};
     memcpy(c.d.asBytes, data, len);
     UsbReplyNG resp;
     clearCommandBuffer();
@@ -661,7 +661,7 @@ static int CmdLegicRfWrite(const char *Cmd) {
     }
     PrintAndLogEx(NORMAL, "\n");
 
-    uint8_t isOK = resp.core.old.arg[0] & 0xFF;
+    uint8_t isOK = resp.oldarg[0] & 0xFF;
     if (!isOK) {
         PrintAndLogEx(WARNING, "Failed writing tag");
         return 1;
@@ -756,7 +756,7 @@ int legic_read_mem(uint32_t offset, uint32_t len, uint32_t iv, uint8_t *out, uin
 
     legic_chk_iv(&iv);
 
-    UsbCommand c = {CMD_READER_LEGIC_RF, {offset, len, iv}, {{0}}};
+    UsbCommandOLD c = {CMD_READER_LEGIC_RF, {offset, len, iv}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbReplyNG resp;
@@ -773,8 +773,8 @@ int legic_read_mem(uint32_t offset, uint32_t len, uint32_t iv, uint8_t *out, uin
     }
     PrintAndLogEx(NORMAL, "\n");
 
-    uint8_t isOK = resp.core.old.arg[0] & 0xFF;
-    *outlen = resp.core.old.arg[1];
+    uint8_t isOK = resp.oldarg[0] & 0xFF;
+    *outlen = resp.oldarg[1];
     if (!isOK) {
         PrintAndLogEx(WARNING, "Failed reading tag");
         return 2;
@@ -810,18 +810,18 @@ int legic_get_type(legic_card_select_t *card) {
 
     if (card == NULL) return 1;
 
-    UsbCommand c = {CMD_LEGIC_INFO, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_LEGIC_INFO, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbReplyNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500))
         return 2;
 
-    uint8_t isOK = resp.core.old.arg[0] & 0xFF;
+    uint8_t isOK = resp.oldarg[0] & 0xFF;
     if (!isOK)
         return 3;
 
-    memcpy(card, (legic_card_select_t *)resp.core.old.d.asBytes, sizeof(legic_card_select_t));
+    memcpy(card, (legic_card_select_t *)resp.data.asBytes, sizeof(legic_card_select_t));
     return 0;
 }
 void legic_chk_iv(uint32_t *iv) {
@@ -837,7 +837,7 @@ void legic_chk_iv(uint32_t *iv) {
 }
 void legic_seteml(uint8_t *src, uint32_t offset, uint32_t numofbytes) {
 
-    UsbCommand c = {CMD_LEGIC_ESET, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_LEGIC_ESET, {0, 0, 0}, {{0}}};
     for (size_t i = offset; i < numofbytes; i += USB_CMD_DATA_SIZE) {
 
         size_t len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);
@@ -900,7 +900,7 @@ static int CmdLegicDump(const char *Cmd) {
     legic_print_type(dumplen, 0);
     PrintAndLogEx(SUCCESS, "Reading tag memory %d b...", dumplen);
 
-    UsbCommand c = {CMD_READER_LEGIC_RF, {0x00, dumplen, 0x55}, {{0}}};
+    UsbCommandOLD c = {CMD_READER_LEGIC_RF, {0x00, dumplen, 0x55}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbReplyNG resp;
@@ -917,13 +917,13 @@ static int CmdLegicDump(const char *Cmd) {
     }
     PrintAndLogEx(NORMAL, "\n");
 
-    uint8_t isOK = resp.core.old.arg[0] & 0xFF;
+    uint8_t isOK = resp.oldarg[0] & 0xFF;
     if (!isOK) {
         PrintAndLogEx(WARNING, "Failed dumping tag data");
         return 2;
     }
 
-    uint16_t readlen = resp.core.old.arg[1];
+    uint16_t readlen = resp.oldarg[1];
     uint8_t *data = calloc(readlen, sizeof(uint8_t));
     if (!data) {
         PrintAndLogEx(WARNING, "Fail, cannot allocate memory");
@@ -1049,7 +1049,7 @@ static int CmdLegicRestore(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "Restoring to card");
 
     // transfer to device
-    UsbCommand c = {CMD_WRITER_LEGIC_RF, {0, 0, 0x55}, {{0}}};
+    UsbCommandOLD c = {CMD_WRITER_LEGIC_RF, {0, 0, 0x55}, {{0}}};
     UsbReplyNG resp;
     for (size_t i = 7; i < numofbytes; i += USB_CMD_DATA_SIZE) {
 
@@ -1073,9 +1073,9 @@ static int CmdLegicRestore(const char *Cmd) {
         }
         PrintAndLogEx(NORMAL, "\n");
 
-        uint8_t isOK = resp.core.old.arg[0] & 0xFF;
+        uint8_t isOK = resp.oldarg[0] & 0xFF;
         if (!isOK) {
-            PrintAndLogEx(WARNING, "Failed writing tag [msg = %u]", resp.core.old.arg[1] & 0xFF);
+            PrintAndLogEx(WARNING, "Failed writing tag [msg = %u]", resp.oldarg[1] & 0xFF);
             free(data);
             return 1;
         }
@@ -1242,7 +1242,7 @@ static int CmdLegicWipe(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "Erasing");
 
     // transfer to device
-    UsbCommand c = {CMD_WRITER_LEGIC_RF, {0, 0, 0x55}, {{0}}};
+    UsbCommandOLD c = {CMD_WRITER_LEGIC_RF, {0, 0, 0x55}, {{0}}};
     UsbReplyNG resp;
     for (size_t i = 7; i < card.cardsize; i += USB_CMD_DATA_SIZE) {
 
@@ -1268,9 +1268,9 @@ static int CmdLegicWipe(const char *Cmd) {
         }
         PrintAndLogEx(NORMAL, "\n");
 
-        uint8_t isOK = resp.core.old.arg[0] & 0xFF;
+        uint8_t isOK = resp.oldarg[0] & 0xFF;
         if (!isOK) {
-            PrintAndLogEx(WARNING, "Failed writing tag [msg = %u]", resp.core.old.arg[1] & 0xFF);
+            PrintAndLogEx(WARNING, "Failed writing tag [msg = %u]", resp.oldarg[1] & 0xFF);
             free(data);
             return 4;
         }
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index f8292c18a..5c7fda8de 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -411,7 +411,7 @@ static int usage_hf14_nack(void) {
 }
 
 static int GetHFMF14AUID(uint8_t *uid, int *uidlen) {
-    UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbReplyNG resp;
@@ -422,7 +422,7 @@ static int GetHFMF14AUID(uint8_t *uid, int *uidlen) {
     }
 
     iso14a_card_select_t card;
-    memcpy(&card, (iso14a_card_select_t *)resp.core.old.d.asBytes, sizeof(iso14a_card_select_t));
+    memcpy(&card, (iso14a_card_select_t *)resp.data.asBytes, sizeof(iso14a_card_select_t));
     memcpy(uid, card.uid, card.uidlen * sizeof(uint8_t));
     *uidlen = card.uidlen;
     return 1;
@@ -522,7 +522,7 @@ static int CmdHF14AMfWrBl(const char *Cmd) {
     PrintAndLogEx(NORMAL, "--block no:%d, key type:%c, key:%s", blockNo, keyType ? 'B' : 'A', sprint_hex(key, 6));
     PrintAndLogEx(NORMAL, "--data: %s", sprint_hex(bldata, 16));
 
-    UsbCommand c = {CMD_MIFARE_WRITEBL, {blockNo, keyType, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_MIFARE_WRITEBL, {blockNo, keyType, 0}, {{0}}};
     memcpy(c.d.asBytes, key, 6);
     memcpy(c.d.asBytes + 10, bldata, 16);
     clearCommandBuffer();
@@ -530,7 +530,7 @@ static int CmdHF14AMfWrBl(const char *Cmd) {
 
     UsbReplyNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-        uint8_t isOK  = resp.core.old.arg[0] & 0xff;
+        uint8_t isOK  = resp.oldarg[0] & 0xff;
         PrintAndLogEx(NORMAL, "isOk:%02x", isOK);
     } else {
         PrintAndLogEx(NORMAL, "Command execute timeout");
@@ -568,15 +568,15 @@ static int CmdHF14AMfRdBl(const char *Cmd) {
     }
     PrintAndLogEx(NORMAL, "--block no:%d, key type:%c, key:%s ", blockNo, keyType ? 'B' : 'A', sprint_hex(key, 6));
 
-    UsbCommand c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}, {{0}}};
     memcpy(c.d.asBytes, key, 6);
     clearCommandBuffer();
     SendCommand(&c);
 
     UsbReplyNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-        uint8_t isOK  = resp.core.old.arg[0] & 0xff;
-        uint8_t *data = resp.core.old.d.asBytes;
+        uint8_t isOK  = resp.oldarg[0] & 0xff;
+        uint8_t *data = resp.data.asBytes;
 
         if (isOK) {
             PrintAndLogEx(NORMAL, "isOk:%02x data:%s", isOK, sprint_hex(data, 16));
@@ -638,7 +638,7 @@ static int CmdHF14AMfRdSc(const char *Cmd) {
     }
     PrintAndLogEx(NORMAL, "--sector no:%d key type:%c key:%s ", sectorNo, keyType ? 'B' : 'A', sprint_hex(key, 6));
 
-    UsbCommand c = {CMD_MIFARE_READSC, {sectorNo, keyType, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_MIFARE_READSC, {sectorNo, keyType, 0}, {{0}}};
     memcpy(c.d.asBytes, key, 6);
     clearCommandBuffer();
     SendCommand(&c);
@@ -646,8 +646,8 @@ static int CmdHF14AMfRdSc(const char *Cmd) {
 
     UsbReplyNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-        isOK  = resp.core.old.arg[0] & 0xff;
-        data  = resp.core.old.d.asBytes;
+        isOK  = resp.oldarg[0] & 0xff;
+        data  = resp.data.asBytes;
 
         PrintAndLogEx(NORMAL, "isOk:%02x", isOK);
         if (isOK) {
@@ -803,14 +803,14 @@ static int CmdHF14AMfDump(const char *Cmd) {
     for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
         for (tries = 0; tries < MIFARE_SECTOR_RETRY; tries++) {
 
-            UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 0, 0}, {{0}}};
+            UsbCommandOLD c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 0, 0}, {{0}}};
             memcpy(c.d.asBytes, keyA[sectorNo], 6);
             clearCommandBuffer();
             SendCommand(&c);
 
             if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-                uint8_t isOK = resp.core.old.arg[0] & 0xff;
-                uint8_t *data = resp.core.old.d.asBytes;
+                uint8_t isOK = resp.oldarg[0] & 0xff;
+                uint8_t *data = resp.data.asBytes;
                 if (isOK) {
                     rights[sectorNo][0] = ((data[7] & 0x10) >> 2) | ((data[8] & 0x1) << 1) | ((data[8] & 0x10) >> 4); // C1C2C3 for data area 0
                     rights[sectorNo][1] = ((data[7] & 0x20) >> 3) | ((data[8] & 0x2) << 0) | ((data[8] & 0x20) >> 5); // C1C2C3 for data area 1
@@ -840,7 +840,7 @@ static int CmdHF14AMfDump(const char *Cmd) {
 
             for (tries = 0; tries < MIFARE_SECTOR_RETRY; tries++) {
                 if (blockNo == NumBlocksPerSector(sectorNo) - 1) { // sector trailer. At least the Access Conditions can always be read with key A.
-                    UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}, {{0}}};
+                    UsbCommandOLD c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}, {{0}}};
                     memcpy(c.d.asBytes, keyA[sectorNo], 6);
                     clearCommandBuffer();
                     SendCommand(&c);
@@ -848,7 +848,7 @@ static int CmdHF14AMfDump(const char *Cmd) {
                 } else {                                           // data block. Check if it can be read with key A or key B
                     uint8_t data_area = (sectorNo < 32) ? blockNo : blockNo / 5;
                     if ((rights[sectorNo][data_area] == 0x03) || (rights[sectorNo][data_area] == 0x05)) { // only key B would work
-                        UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 1, 0}, {{0}}};
+                        UsbCommandOLD c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 1, 0}, {{0}}};
                         memcpy(c.d.asBytes, keyB[sectorNo], 6);
                         SendCommand(&c);
                         received = WaitForResponseTimeout(CMD_ACK, &resp, 1500);
@@ -857,7 +857,7 @@ static int CmdHF14AMfDump(const char *Cmd) {
                         PrintAndLogEx(WARNING, "access rights do not allow reading of sector %2d block %3d", sectorNo, blockNo);
                         tries = MIFARE_SECTOR_RETRY;
                     } else {                                                                              // key A would work
-                        UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}, {{0}}};
+                        UsbCommandOLD c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}, {{0}}};
                         memcpy(c.d.asBytes, keyA[sectorNo], 6);
                         clearCommandBuffer();
                         SendCommand(&c);
@@ -865,14 +865,14 @@ static int CmdHF14AMfDump(const char *Cmd) {
                     }
                 }
                 if (received) {
-                    isOK  = resp.core.old.arg[0] & 0xff;
+                    isOK  = resp.oldarg[0] & 0xff;
                     if (isOK) break;
                 }
             }
 
             if (received) {
-                isOK  = resp.core.old.arg[0] & 0xff;
-                uint8_t *data  = resp.core.old.d.asBytes;
+                isOK  = resp.oldarg[0] & 0xff;
+                uint8_t *data  = resp.data.asBytes;
                 if (blockNo == NumBlocksPerSector(sectorNo) - 1) { // sector trailer. Fill in the keys.
                     data[0]  = (keyA[sectorNo][0]);
                     data[1]  = (keyA[sectorNo][1]);
@@ -1019,7 +1019,7 @@ static int CmdHF14AMfRestore(const char *Cmd) {
 
     for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
         for (blockNo = 0; blockNo < NumBlocksPerSector(sectorNo); blockNo++) {
-            UsbCommand c = {CMD_MIFARE_WRITEBL, {FirstBlockOfSector(sectorNo) + blockNo, keyType, 0}, {{0}}};
+            UsbCommandOLD c = {CMD_MIFARE_WRITEBL, {FirstBlockOfSector(sectorNo) + blockNo, keyType, 0}, {{0}}};
             memcpy(c.d.asBytes, key, 6);
             bytes_read = fread(bldata, 1, 16, fdump);
             if (bytes_read != 16) {
@@ -1052,7 +1052,7 @@ static int CmdHF14AMfRestore(const char *Cmd) {
 
             UsbReplyNG resp;
             if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-                uint8_t isOK  = resp.core.old.arg[0] & 0xff;
+                uint8_t isOK  = resp.oldarg[0] & 0xff;
                 PrintAndLogEx(SUCCESS, "isOk:%02x", isOK);
             } else {
                 PrintAndLogEx(WARNING, "Command execute timeout");
@@ -1251,7 +1251,7 @@ static int CmdHF14AMfNested(const char *Cmd) {
 
                 PrintAndLogEx(SUCCESS, "reading block %d", sectrail);
 
-                UsbCommand c = {CMD_MIFARE_READBL, {sectrail, 0, 0}, {{0}}};
+                UsbCommandOLD c = {CMD_MIFARE_READBL, {sectrail, 0, 0}, {{0}}};
                 num_to_bytes(e_sector[i].Key[0], 6, c.d.asBytes); // KEY A
                 clearCommandBuffer();
                 SendCommand(&c);
@@ -1259,10 +1259,10 @@ static int CmdHF14AMfNested(const char *Cmd) {
                 UsbReplyNG resp;
                 if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) continue;
 
-                uint8_t isOK  = resp.core.old.arg[0] & 0xff;
+                uint8_t isOK  = resp.oldarg[0] & 0xff;
                 if (!isOK) continue;
 
-                uint8_t *data = resp.core.old.d.asBytes;
+                uint8_t *data = resp.data.asBytes;
                 key64 = bytes_to_num(data + 10, 6);
                 if (key64) {
                     PrintAndLogEx(SUCCESS, "data: %s", sprint_hex(data + 10, 6));
@@ -1997,7 +1997,7 @@ static int CmdHF14AMfChk(const char *Cmd) {
 
                 PrintAndLogEx(NORMAL, "Reading block %d", sectrail);
 
-                UsbCommand c = {CMD_MIFARE_READBL, {sectrail, 0, 0}, {{0}}};
+                UsbCommandOLD c = {CMD_MIFARE_READBL, {sectrail, 0, 0}, {{0}}};
                 num_to_bytes(e_sector[i].Key[0], 6, c.d.asBytes); // KEY A
                 clearCommandBuffer();
                 SendCommand(&c);
@@ -2005,10 +2005,10 @@ static int CmdHF14AMfChk(const char *Cmd) {
                 UsbReplyNG resp;
                 if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) continue;
 
-                uint8_t isOK  = resp.core.old.arg[0] & 0xff;
+                uint8_t isOK  = resp.oldarg[0] & 0xff;
                 if (!isOK) continue;
 
-                uint8_t *data = resp.core.old.d.asBytes;
+                uint8_t *data = resp.data.asBytes;
                 key64 = bytes_to_num(data + 10, 6);
                 if (key64) {
                     PrintAndLogEx(NORMAL, "Data:%s", sprint_hex(data + 10, 6));
@@ -2231,7 +2231,7 @@ static int CmdHF14AMfSim(const char *Cmd) {
                   , flags
                   , flags);
 
-    UsbCommand c = {CMD_SIMULATE_MIFARE_CARD, {flags, exitAfterNReads, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_SIMULATE_MIFARE_CARD, {flags, exitAfterNReads, 0}, {{0}}};
     memcpy(c.d.asBytes, uid, sizeof(uid));
     clearCommandBuffer();
     SendCommand(&c);
@@ -2243,9 +2243,9 @@ static int CmdHF14AMfSim(const char *Cmd) {
         while (!ukbhit()) {
             if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) continue;
             if (!(flags & FLAG_NR_AR_ATTACK)) break;
-            if ((resp.core.old.arg[0] & 0xffff) != CMD_SIMULATE_MIFARE_CARD) break;
+            if ((resp.oldarg[0] & 0xffff) != CMD_SIMULATE_MIFARE_CARD) break;
 
-            memcpy(data, resp.core.old.d.asBytes, sizeof(data));
+            memcpy(data, resp.data.asBytes, sizeof(data));
             readerAttack(data[0], setEmulatorMem, verbose);
         }
         showSectorTable();
@@ -2291,7 +2291,7 @@ static int CmdHF14AMfSniff(const char *Cmd) {
     PrintAndLogEx(NORMAL, "Press the key on pc keyboard to abort the client.\n");
     PrintAndLogEx(NORMAL, "-------------------------------------------------------------------------\n");
 
-    UsbCommand c = {CMD_MIFARE_SNIFFER, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_MIFARE_SNIFFER, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
 
@@ -2312,9 +2312,9 @@ static int CmdHF14AMfSniff(const char *Cmd) {
             continue;
         }
 
-        res = resp.core.old.arg[0] & 0xff;
-        traceLen = resp.core.old.arg[1];
-        len = resp.core.old.arg[2];
+        res = resp.oldarg[0] & 0xff;
+        traceLen = resp.oldarg[1];
+        len = resp.oldarg[2];
 
         if (res == 0) {
             PrintAndLogEx(SUCCESS, "hf mifare sniff finished");
@@ -2344,7 +2344,7 @@ static int CmdHF14AMfSniff(const char *Cmd) {
             }
 
             // what happens if LEN is bigger then TRACELEN --iceman
-            memcpy(bufPtr, resp.core.old.d.asBytes, len);
+            memcpy(bufPtr, resp.data.asBytes, len);
             bufPtr += len;
             pckNum++;
         }
@@ -2422,7 +2422,7 @@ int CmdHF14AMfDbg(const char *Cmd) {
     uint8_t dbgMode = param_get8ex(Cmd, 0, 0, 10);
     if (dbgMode > 4) return usage_hf14_dbg();
 
-    UsbCommand c = {CMD_MIFARE_SET_DBGMODE, {dbgMode, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_MIFARE_SET_DBGMODE, {dbgMode, 0, 0}, {{0}}};
     SendCommand(&c);
     return 0;
 }
@@ -2508,7 +2508,7 @@ static int CmdHF14AMfEClear(const char *Cmd) {
     char c = tolower(param_getchar(Cmd, 0));
     if (c == 'h') return usage_hf14_eclr();
 
-    UsbCommand cmd = {CMD_MIFARE_EML_MEMCLR, {0, 0, 0}, {{0}}};
+    UsbCommandOLD cmd = {CMD_MIFARE_EML_MEMCLR, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&cmd);
     return 0;
@@ -2693,7 +2693,7 @@ static int CmdHF14AMfECFill(const char *Cmd) {
     numSectors = NumOfSectors(c);
 
     PrintAndLogEx(NORMAL, "--params: numSectors: %d, keyType: %c\n", numSectors, (keyType == 0) ? 'A' : 'B');
-    UsbCommand cmd = {CMD_MIFARE_EML_CARDLOAD, {numSectors, keyType, 0}, {{0}}};
+    UsbCommandOLD cmd = {CMD_MIFARE_EML_CARDLOAD, {numSectors, keyType, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&cmd);
     return 0;
@@ -3155,14 +3155,14 @@ static int CmdHf14AMfSetMod(const char *Cmd) {
         return 1;
     }
 
-    UsbCommand c = {CMD_MIFARE_SETMOD, {mod, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_MIFARE_SETMOD, {mod, 0, 0}, {{0}}};
     memcpy(c.d.asBytes, key, 6);
     clearCommandBuffer();
     SendCommand(&c);
 
     UsbReplyNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-        uint8_t ok = resp.core.old.arg[0] & 0xff;
+        uint8_t ok = resp.oldarg[0] & 0xff;
         PrintAndLogEx(SUCCESS, "isOk:%02x", ok);
         if (!ok)
             PrintAndLogEx(FAILED, "Failed.");
@@ -3256,16 +3256,16 @@ static int CmdHF14AMfice(const char *Cmd) {
         flags = 0;
         flags |= initialize ? 0x0001 : 0;
         flags |= slow ? 0x0002 : 0;
-        UsbCommand c = {CMD_MIFARE_ACQUIRE_NONCES, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, flags}, {{0}}};
+        UsbCommandOLD c = {CMD_MIFARE_ACQUIRE_NONCES, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, flags}, {{0}}};
         clearCommandBuffer();
         SendCommand(&c);
 
         if (!WaitForResponseTimeout(CMD_ACK, &resp, 3000)) goto out;
-        if (resp.core.old.arg[0])  goto out;
+        if (resp.oldarg[0])  goto out;
 
-        uint32_t items = resp.core.old.arg[2];
+        uint32_t items = resp.oldarg[2];
         if (fnonces) {
-            fwrite(resp.core.old.d.asBytes, 1, items * 4, fnonces);
+            fwrite(resp.data.asBytes, 1, items * 4, fnonces);
             fflush(fnonces);
         }
 
@@ -3289,7 +3289,7 @@ out:
         fclose(fnonces);
     }
 
-    UsbCommand c = {CMD_MIFARE_ACQUIRE_NONCES, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, 4}, {{0}}};
+    UsbCommandOLD c = {CMD_MIFARE_ACQUIRE_NONCES, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, 4}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
diff --git a/client/cmdhfmfdes.c b/client/cmdhfmfdes.c
index b2c1cb9b7..64e6dc3ba 100644
--- a/client/cmdhfmfdes.c
+++ b/client/cmdhfmfdes.c
@@ -51,14 +51,14 @@ static int CmdHF14ADesWb(const char *Cmd) {
         PrintAndLogEx(NORMAL, "--block no:%02x key type:%02x key:%s", blockNo, keyType, sprint_hex(key, 6));
         PrintAndLogEx(NORMAL, "--data: %s", sprint_hex(bldata, 16));
 
-      UsbCommand c = {CMD_MIFARE_WRITEBL, {blockNo, keyType, 0}, {{0}}};
+      UsbCommandOLD c = {CMD_MIFARE_WRITEBL, {blockNo, keyType, 0}, {{0}}};
         memcpy(c.d.asBytes, key, 6);
         memcpy(c.d.asBytes + 10, bldata, 16);
       SendCommand(&c);
 
         UsbReplyNG resp;
         if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
-            uint8_t isOK  = resp.core.old.arg[0] & 0xff;
+            uint8_t isOK  = resp.oldarg[0] & 0xff;
             PrintAndLogEx(NORMAL, "isOk:%02x", isOK);
         } else {
             PrintAndLogEx(NORMAL, "Command execute timeout");
@@ -93,14 +93,14 @@ static int CmdHF14ADesRb(const char *Cmd) {
     }
     PrintAndLogEx(NORMAL, "--block no:%02x key type:%02x key:%s ", blockNo, keyType, sprint_hex(key, 6));
 
-    UsbCommand c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}, {{0}}};
     memcpy(c.d.asBytes, key, 6);
     SendCommand(&c);
 
     UsbReplyNG resp;
     if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
-    uint8_t                isOK  = resp.core.old.arg[0] & 0xff;
-    uint8_t              * data  = resp.core.old.d.asBytes;
+    uint8_t                isOK  = resp.oldarg[0] & 0xff;
+    uint8_t              * data  = resp.data.asBytes;
 
     if (isOK)
     PrintAndLogEx(NORMAL, "isOk:%02x data:%s", isOK, sprint_hex(data, 16));
@@ -116,7 +116,7 @@ static int CmdHF14ADesRb(const char *Cmd) {
 static int CmdHF14ADesInfo(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
 
-    UsbCommand c = {CMD_MIFARE_DESFIRE_INFO, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_MIFARE_DESFIRE_INFO, {0, 0, 0}, {{0}}};
     SendCommand(&c);
     UsbReplyNG resp;
 
@@ -124,9 +124,9 @@ static int CmdHF14ADesInfo(const char *Cmd) {
         PrintAndLogEx(WARNING, "Command execute timeout");
         return 0;
     }
-    uint8_t isOK  = resp.core.old.arg[0] & 0xff;
+    uint8_t isOK  = resp.oldarg[0] & 0xff;
     if (!isOK) {
-        switch (resp.core.old.arg[1]) {
+        switch (resp.oldarg[1]) {
             case 1:
                 PrintAndLogEx(WARNING, "Can't select card");
                 break;
@@ -143,25 +143,25 @@ static int CmdHF14ADesInfo(const char *Cmd) {
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "-- Desfire Information --------------------------------------");
     PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
-    PrintAndLogEx(NORMAL, "  UID                : %s", sprint_hex(resp.core.old.d.asBytes, 7));
-    PrintAndLogEx(NORMAL, "  Batch number       : %s", sprint_hex(resp.core.old.d.asBytes + 28, 5));
-    PrintAndLogEx(NORMAL, "  Production date    : week %02x, 20%02x", resp.core.old.d.asBytes[33], resp.core.old.d.asBytes[34]);
+    PrintAndLogEx(NORMAL, "  UID                : %s", sprint_hex(resp.data.asBytes, 7));
+    PrintAndLogEx(NORMAL, "  Batch number       : %s", sprint_hex(resp.data.asBytes + 28, 5));
+    PrintAndLogEx(NORMAL, "  Production date    : week %02x, 20%02x", resp.data.asBytes[33], resp.data.asBytes[34]);
     PrintAndLogEx(NORMAL, "  -----------------------------------------------------------");
     PrintAndLogEx(NORMAL, "  Hardware Information");
-    PrintAndLogEx(NORMAL, "      Vendor Id      : %s", getTagInfo(resp.core.old.d.asBytes[7]));
-    PrintAndLogEx(NORMAL, "      Type           : 0x%02X", resp.core.old.d.asBytes[8]);
-    PrintAndLogEx(NORMAL, "      Subtype        : 0x%02X", resp.core.old.d.asBytes[9]);
-    PrintAndLogEx(NORMAL, "      Version        : %s", getVersionStr(resp.core.old.d.asBytes[10], resp.core.old.d.asBytes[11]));
-    PrintAndLogEx(NORMAL, "      Storage size   : %s", getCardSizeStr(resp.core.old.d.asBytes[12]));
-    PrintAndLogEx(NORMAL, "      Protocol       : %s", getProtocolStr(resp.core.old.d.asBytes[13]));
+    PrintAndLogEx(NORMAL, "      Vendor Id      : %s", getTagInfo(resp.data.asBytes[7]));
+    PrintAndLogEx(NORMAL, "      Type           : 0x%02X", resp.data.asBytes[8]);
+    PrintAndLogEx(NORMAL, "      Subtype        : 0x%02X", resp.data.asBytes[9]);
+    PrintAndLogEx(NORMAL, "      Version        : %s", getVersionStr(resp.data.asBytes[10], resp.data.asBytes[11]));
+    PrintAndLogEx(NORMAL, "      Storage size   : %s", getCardSizeStr(resp.data.asBytes[12]));
+    PrintAndLogEx(NORMAL, "      Protocol       : %s", getProtocolStr(resp.data.asBytes[13]));
     PrintAndLogEx(NORMAL, "  -----------------------------------------------------------");
     PrintAndLogEx(NORMAL, "  Software Information");
-    PrintAndLogEx(NORMAL, "      Vendor Id      : %s", getTagInfo(resp.core.old.d.asBytes[14]));
-    PrintAndLogEx(NORMAL, "      Type           : 0x%02X", resp.core.old.d.asBytes[15]);
-    PrintAndLogEx(NORMAL, "      Subtype        : 0x%02X", resp.core.old.d.asBytes[16]);
-    PrintAndLogEx(NORMAL, "      Version        : %d.%d", resp.core.old.d.asBytes[17], resp.core.old.d.asBytes[18]);
-    PrintAndLogEx(NORMAL, "      storage size   : %s", getCardSizeStr(resp.core.old.d.asBytes[19]));
-    PrintAndLogEx(NORMAL, "      Protocol       : %s", getProtocolStr(resp.core.old.d.asBytes[20]));
+    PrintAndLogEx(NORMAL, "      Vendor Id      : %s", getTagInfo(resp.data.asBytes[14]));
+    PrintAndLogEx(NORMAL, "      Type           : 0x%02X", resp.data.asBytes[15]);
+    PrintAndLogEx(NORMAL, "      Subtype        : 0x%02X", resp.data.asBytes[16]);
+    PrintAndLogEx(NORMAL, "      Version        : %d.%d", resp.data.asBytes[17], resp.data.asBytes[18]);
+    PrintAndLogEx(NORMAL, "      storage size   : %s", getCardSizeStr(resp.data.asBytes[19]));
+    PrintAndLogEx(NORMAL, "      Protocol       : %s", getProtocolStr(resp.data.asBytes[20]));
     PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
 
     // Master Key settings
@@ -177,7 +177,7 @@ static int CmdHF14ADesInfo(const char *Cmd) {
         return 0;
 
     uint8_t tmp[3];
-    memcpy(tmp, resp.core.old.d.asBytes + 3, 3);
+    memcpy(tmp, resp.data.asBytes + 3, 3);
 
     PrintAndLogEx(NORMAL, "   Available free memory on card       : %d bytes", le24toh(tmp));
     PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
@@ -256,7 +256,7 @@ void getKeySettings(uint8_t *aid) {
     const char *str = messStr;
     uint8_t isOK = 0;
     uint32_t options;
-    UsbCommand c = {CMD_MIFARE_DESFIRE, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_MIFARE_DESFIRE, {0, 0, 0}, {{0}}};
     UsbReplyNG resp;
 
     //memset(messStr, 0x00, 512);
@@ -269,19 +269,19 @@ void getKeySettings(uint8_t *aid) {
         c.d.asBytes[0] = GET_KEY_SETTINGS;  // 0x45
         SendCommand(&c);
         if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {return;}
-        isOK  = resp.core.old.arg[0] & 0xff;
+        isOK  = resp.oldarg[0] & 0xff;
         if (!isOK) {
             PrintAndLogEx(WARNING, "   Can't select master application");
             return;
         }
 
-        str = (resp.core.old.d.asBytes[3] & (1 << 3)) ? "YES" : "NO";
+        str = (resp.data.asBytes[3] & (1 << 3)) ? "YES" : "NO";
         PrintAndLogEx(NORMAL, "   [0x08] Configuration changeable       : %s", str);
-        str = (resp.core.old.d.asBytes[3] & (1 << 2)) ? "NO" : "YES";
+        str = (resp.data.asBytes[3] & (1 << 2)) ? "NO" : "YES";
         PrintAndLogEx(NORMAL, "   [0x04] CMK required for create/delete : %s", str);
-        str = (resp.core.old.d.asBytes[3] & (1 << 1)) ? "NO" : "YES";
+        str = (resp.data.asBytes[3] & (1 << 1)) ? "NO" : "YES";
         PrintAndLogEx(NORMAL, "   [0x02] Directory list access with CMK : %s", str);
-        str = (resp.core.old.d.asBytes[3] & (1 << 0)) ? "YES" : "NO";
+        str = (resp.data.asBytes[3] & (1 << 0)) ? "YES" : "NO";
         PrintAndLogEx(NORMAL, "   [0x01] CMK is changeable              : %s", str);
 
         c.arg[LENPOS] = 0x02; //LEN
@@ -289,14 +289,14 @@ void getKeySettings(uint8_t *aid) {
         c.d.asBytes[1] = 0x00;
         SendCommand(&c);
         if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000)) { return; }
-        isOK  = resp.core.old.arg[0] & 0xff;
+        isOK  = resp.oldarg[0] & 0xff;
         if (!isOK) {
             PrintAndLogEx(WARNING, "   Can't read key-version");
             return;
         }
         PrintAndLogEx(NORMAL, "");
-        PrintAndLogEx(NORMAL, "   Max number of keys       : %d", resp.core.old.d.asBytes[4]);
-        PrintAndLogEx(NORMAL, "   Master key Version       : %d (0x%02x)", resp.core.old.d.asBytes[3], resp.core.old.d.asBytes[3]);
+        PrintAndLogEx(NORMAL, "   Max number of keys       : %d", resp.data.asBytes[4]);
+        PrintAndLogEx(NORMAL, "   Master key Version       : %d (0x%02x)", resp.data.asBytes[3], resp.data.asBytes[3]);
         PrintAndLogEx(NORMAL, "   ----------------------------------------------------------");
 
         c.arg[LENPOS] = 0x02; //LEN
@@ -304,19 +304,19 @@ void getKeySettings(uint8_t *aid) {
         c.d.asBytes[1] = 0x00; // KEY 0
         SendCommand(&c);
         if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {return;}
-        isOK  = resp.core.old.d.asBytes[2] & 0xff;
+        isOK  = resp.data.asBytes[2] & 0xff;
         PrintAndLogEx(NORMAL, "   [0x0A] Authenticate      : %s", (isOK == 0xAE) ? "NO" : "YES");
 
         c.d.asBytes[0] = AUTHENTICATE_ISO; //0x1A
         SendCommand(&c);
         if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {return;}
-        isOK  = resp.core.old.d.asBytes[2] & 0xff;
+        isOK  = resp.data.asBytes[2] & 0xff;
         PrintAndLogEx(NORMAL, "   [0x1A] Authenticate ISO  : %s", (isOK == 0xAE) ? "NO" : "YES");
 
         c.d.asBytes[0] = AUTHENTICATE_AES; //0xAA
         SendCommand(&c);
         if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {return;}
-        isOK  = resp.core.old.d.asBytes[2] & 0xff;
+        isOK  = resp.data.asBytes[2] & 0xff;
         PrintAndLogEx(NORMAL, "   [0xAA] Authenticate AES  : %s", (isOK == 0xAE) ? "NO" : "YES");
         PrintAndLogEx(NORMAL, "");
         PrintAndLogEx(NORMAL, "   ----------------------------------------------------------");
@@ -335,7 +335,7 @@ void getKeySettings(uint8_t *aid) {
             PrintAndLogEx(WARNING, "   Timed-out");
             return;
         }
-        isOK  = resp.core.old.arg[0] & 0xff;
+        isOK  = resp.oldarg[0] & 0xff;
         if (!isOK) {
             PrintAndLogEx(WARNING, "   Can't select AID: %s", sprint_hex(aid, 3));
             return;
@@ -350,12 +350,12 @@ void getKeySettings(uint8_t *aid) {
         if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
             return;
         }
-        isOK  = resp.core.old.arg[0] & 0xff;
+        isOK  = resp.oldarg[0] & 0xff;
         if (!isOK) {
             PrintAndLogEx(WARNING, "   Can't read Application Master key settings");
         } else {
             // Access rights.
-            uint8_t rights = (resp.core.old.d.asBytes[3] >> 4 & 0xff);
+            uint8_t rights = (resp.data.asBytes[3] >> 4 & 0xff);
             switch (rights) {
                 case 0x00:
                     str = "AMK authentication is necessary to change any key (default)";
@@ -374,13 +374,13 @@ void getKeySettings(uint8_t *aid) {
             PrintAndLogEx(NORMAL, "-- %s", str);
             PrintAndLogEx(NORMAL, "");
             // same as CMK
-            str = (resp.core.old.d.asBytes[3] & (1 << 3)) ? "YES" : "NO";
+            str = (resp.data.asBytes[3] & (1 << 3)) ? "YES" : "NO";
             PrintAndLogEx(NORMAL, "   0x08 Configuration changeable       : %s", str);
-            str = (resp.core.old.d.asBytes[3] & (1 << 2)) ? "NO" : "YES";
+            str = (resp.data.asBytes[3] & (1 << 2)) ? "NO" : "YES";
             PrintAndLogEx(NORMAL, "   0x04 AMK required for create/delete : %s", str);
-            str = (resp.core.old.d.asBytes[3] & (1 << 1)) ? "NO" : "YES";
+            str = (resp.data.asBytes[3] & (1 << 1)) ? "NO" : "YES";
             PrintAndLogEx(NORMAL, "   0x02 Directory list access with AMK : %s", str);
-            str = (resp.core.old.d.asBytes[3] & (1 << 0)) ? "YES" : "NO";
+            str = (resp.data.asBytes[3] & (1 << 0)) ? "YES" : "NO";
             PrintAndLogEx(NORMAL, "   0x01 AMK is changeable              : %s", str);
         }
 
@@ -397,15 +397,15 @@ void getKeySettings(uint8_t *aid) {
 
         int numOfKeys;
 
-        isOK  = resp.core.old.arg[0] & 0xff;
+        isOK  = resp.oldarg[0] & 0xff;
         if (isOK == false) {
             PrintAndLogEx(WARNING, "   Can't read Application Master key version. Trying all keys");
             //numOfKeys = MAX_NUM_KEYS;
         } else {
-            numOfKeys = resp.core.old.d.asBytes[4];
+            numOfKeys = resp.data.asBytes[4];
             PrintAndLogEx(NORMAL, "");
             PrintAndLogEx(NORMAL, "     Max number of keys  : %d", numOfKeys);
-            PrintAndLogEx(NORMAL, "     Application Master key Version  : %d (0x%02x)", resp.core.old.d.asBytes[3], resp.core.old.d.asBytes[3]);
+            PrintAndLogEx(NORMAL, "     Application Master key Version  : %d (0x%02x)", resp.data.asBytes[3], resp.data.asBytes[3]);
             PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
         }
 
@@ -427,7 +427,7 @@ static int CmdHF14ADesEnumApplications(const char *Cmd) {
     uint8_t aid[3];
     uint32_t options = (INIT | DISCONNECT);
 
-    UsbCommand c = {CMD_MIFARE_DESFIRE, {options, 0x01 }, {{0}}};
+    UsbCommandOLD c = {CMD_MIFARE_DESFIRE, {options, 0x01 }, {{0}}};
     c.d.asBytes[0] = GET_APPLICATION_IDS;  //0x6a
 
     SendCommand(&c);
@@ -436,7 +436,7 @@ static int CmdHF14ADesEnumApplications(const char *Cmd) {
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         return 0;
     }
-    isOK  = resp.core.old.arg[0] & 0xff;
+    isOK  = resp.oldarg[0] & 0xff;
     if (!isOK) {
         PrintAndLogEx(NORMAL, "Command unsuccessful");
         return 0;
@@ -449,33 +449,33 @@ static int CmdHF14ADesEnumApplications(const char *Cmd) {
     UsbReplyNG respFiles;
 
     uint8_t num = 0;
-    int max = resp.core.old.arg[1] - 3 - 2;
+    int max = resp.oldarg[1] - 3 - 2;
 
     for (int i = 3; i <= max; i += 3) {
-        PrintAndLogEx(NORMAL, " Aid %d : %02X %02X %02X ", num, resp.core.old.d.asBytes[i], resp.core.old.d.asBytes[i + 1], resp.core.old.d.asBytes[i + 2]);
+        PrintAndLogEx(NORMAL, " Aid %d : %02X %02X %02X ", num, resp.data.asBytes[i], resp.data.asBytes[i + 1], resp.data.asBytes[i + 2]);
         num++;
 
-        aid[0] = resp.core.old.d.asBytes[i];
-        aid[1] = resp.core.old.d.asBytes[i + 1];
-        aid[2] = resp.core.old.d.asBytes[i + 2];
+        aid[0] = resp.data.asBytes[i];
+        aid[1] = resp.data.asBytes[i + 1];
+        aid[2] = resp.data.asBytes[i + 2];
         getKeySettings(aid);
 
         // Select Application
         c.arg[CMDPOS] = INIT;
         c.arg[LENPOS] = 0x04;
         c.d.asBytes[0] = SELECT_APPLICATION;  // 0x5a
-        c.d.asBytes[1] = resp.core.old.d.asBytes[i];
-        c.d.asBytes[2] = resp.core.old.d.asBytes[i + 1];
-        c.d.asBytes[3] = resp.core.old.d.asBytes[i + 2];
+        c.d.asBytes[1] = resp.data.asBytes[i];
+        c.d.asBytes[2] = resp.data.asBytes[i + 1];
+        c.d.asBytes[3] = resp.data.asBytes[i + 2];
         SendCommand(&c);
 
         if (!WaitForResponseTimeout(CMD_ACK, &respAid, 1500)) {
             PrintAndLogEx(WARNING, "   Timed-out");
             continue;
         }
-        isOK  = respAid.core.old.d.asBytes[2] & 0xff;
+        isOK  = respAid.data.asBytes[2] & 0xff;
         if (isOK != 0x00) {
-            PrintAndLogEx(WARNING, "   Can't select AID: %s", sprint_hex(resp.core.old.d.asBytes + i, 3));
+            PrintAndLogEx(WARNING, "   Can't select AID: %s", sprint_hex(resp.data.asBytes + i, 3));
             continue;
         }
 
@@ -489,13 +489,13 @@ static int CmdHF14ADesEnumApplications(const char *Cmd) {
             PrintAndLogEx(WARNING, "   Timed-out");
             continue;
         } else {
-            isOK  = respFiles.core.old.d.asBytes[2] & 0xff;
+            isOK  = respFiles.data.asBytes[2] & 0xff;
             if (!isOK) {
                 PrintAndLogEx(WARNING, "   Can't get file ids ");
             } else {
-                int respfileLen = resp.core.old.arg[1] - 3 - 2;
+                int respfileLen = resp.oldarg[1] - 3 - 2;
                 for (int j = 0; j < respfileLen; ++j) {
-                    PrintAndLogEx(NORMAL, "   Fileid %d :", resp.core.old.d.asBytes[j + 3]);
+                    PrintAndLogEx(NORMAL, "   Fileid %d :", resp.data.asBytes[j + 3]);
                 }
             }
         }
@@ -510,13 +510,13 @@ static int CmdHF14ADesEnumApplications(const char *Cmd) {
             PrintAndLogEx(WARNING, "   Timed-out");
             continue;
         } else {
-            isOK  = respFiles.core.old.d.asBytes[2] & 0xff;
+            isOK  = respFiles.data.asBytes[2] & 0xff;
             if (!isOK) {
                 PrintAndLogEx(WARNING, "   Can't get ISO file ids ");
             } else {
-                int respfileLen = resp.core.old.arg[1] - 3 - 2;
+                int respfileLen = resp.oldarg[1] - 3 - 2;
                 for (int j = 0; j < respfileLen; ++j) {
-                    PrintAndLogEx(NORMAL, " ISO  Fileid %d :", resp.core.old.d.asBytes[j + 3]);
+                    PrintAndLogEx(NORMAL, " ISO  Fileid %d :", resp.data.asBytes[j + 3]);
                 }
             }
         }
@@ -611,7 +611,7 @@ static int CmdHF14ADesAuth(const char *Cmd) {
         return 1;
     }
     // algo, nyckell�ngd,
-    UsbCommand c = {CMD_MIFARE_DESFIRE_AUTH1, { cmdAuthMode, cmdAuthAlgo, cmdKeyNo }, {{0}}};
+    UsbCommandOLD c = {CMD_MIFARE_DESFIRE_AUTH1, { cmdAuthMode, cmdAuthAlgo, cmdKeyNo }, {{0}}};
 
     c.d.asBytes[0] = keylength;
     memcpy(c.d.asBytes + 1, key, keylength);
@@ -624,9 +624,9 @@ static int CmdHF14ADesAuth(const char *Cmd) {
         return 0;
     }
 
-    uint8_t isOK  = resp.core.old.arg[0] & 0xff;
+    uint8_t isOK  = resp.oldarg[0] & 0xff;
     if (isOK) {
-        uint8_t *data = resp.core.old.d.asBytes;
+        uint8_t *data = resp.data.asBytes;
 
         PrintAndLogEx(NORMAL, "  Key        :%s", sprint_hex(key, keylength));
         PrintAndLogEx(NORMAL, "  SESSION    :%s", sprint_hex(data, keylength));
diff --git a/client/cmdhfmfdesfire.c b/client/cmdhfmfdesfire.c
index a4dcb0d4c..449eb4dd7 100644
--- a/client/cmdhfmfdesfire.c
+++ b/client/cmdhfmfdesfire.c
@@ -58,13 +58,13 @@ static int CmdHF14AMfDESAuth(const char *Cmd) {
     //DES_set_key((DES_cblock *)key2,&ks2);
 
     //Auth1
-    UsbCommand c = {CMD_MIFARE_DES_AUTH1, {blockNo}};
+    UsbCommandOLD c = {CMD_MIFARE_DES_AUTH1, {blockNo}};
     SendCommand(&c);
     UsbReplyNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-        uint8_t isOK  = resp.core.old.arg[0] & 0xff;
-        cuid  = resp.core.old.arg[1];
-        uint8_t *data = resp.core.old.d.asBytes;
+        uint8_t isOK  = resp.oldarg[0] & 0xff;
+        cuid  = resp.oldarg[1];
+        uint8_t *data = resp.data.asBytes;
 
         if (isOK) {
             PrintAndLogEx(NORMAL, "enc(nc)/b0:%s", sprint_hex(data + 2, 8));
@@ -94,7 +94,7 @@ static int CmdHF14AMfDESAuth(const char *Cmd) {
     PrintAndLogEx(NORMAL, "b2:%s", sprint_hex(b2, 8));
 
     //Auth2
-    UsbCommand d = {CMD_MIFARE_DES_AUTH2, {cuid}};
+    UsbCommandOLD d = {CMD_MIFARE_DES_AUTH2, {cuid}};
     memcpy(reply, b1, 8);
     memcpy(reply + 8, b2, 8);
     memcpy(d.d.asBytes, reply, 16);
@@ -158,13 +158,13 @@ static int CmdHF14AMfAESAuth(const char *Cmd) {
     AES_set_decrypt_key(key, 128, &key_d);
 
     //Auth1
-    UsbCommand c = {CMD_MIFARE_DES_AUTH1, {blockNo}};
+    UsbCommandOLD c = {CMD_MIFARE_DES_AUTH1, {blockNo}};
     SendCommand(&c);
     UsbReplyNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-        uint8_t isOK  = resp.core.old.arg[0] & 0xff;
-        cuid  = resp.core.old.arg[1];
-        uint8_t *data = resp.core.old.d.asBytes;
+        uint8_t isOK  = resp.oldarg[0] & 0xff;
+        cuid  = resp.oldarg[1];
+        uint8_t *data = resp.data.asBytes;
 
         if (isOK) {
             PrintAndLogEx(NORMAL, "enc(nc)/b0:%s", sprint_hex(data + 2, 16));
@@ -201,7 +201,7 @@ static int CmdHF14AMfAESAuth(const char *Cmd) {
     PrintAndLogEx(NORMAL, "b2:%s", sprint_hex(b2, 16));
 
     //Auth2
-    UsbCommand d = {CMD_MIFARE_DES_AUTH2, {cuid}};
+    UsbCommandOLD d = {CMD_MIFARE_DES_AUTH2, {cuid}};
     memcpy(reply, b1, 16);
     memcpy(reply + 16, b2, 16);
     memcpy(d.d.asBytes, reply, 32);
diff --git a/client/cmdhfmfhard.c b/client/cmdhfmfhard.c
index 3aaafd80e..72244de38 100644
--- a/client/cmdhfmfhard.c
+++ b/client/cmdhfmfhard.c
@@ -1383,7 +1383,7 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
         flags |= initialize ? 0x0001 : 0;
         flags |= slow ? 0x0002 : 0;
         flags |= field_off ? 0x0004 : 0;
-        UsbCommand c = {CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, flags}, {{0}}};
+        UsbCommandOLD c = {CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, flags}, {{0}}};
         memcpy(c.d.asBytes, key, 6);
 
         clearCommandBuffer();
@@ -1394,14 +1394,14 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
         if (initialize) {
             if (!WaitForResponseTimeout(CMD_ACK, &resp, 3000)) {
                 //strange second call (iceman)
-                UsbCommand c1 = {CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, 4}, {{0}}};
+                UsbCommandOLD c1 = {CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, 4}, {{0}}};
                 clearCommandBuffer();
                 SendCommand(&c1);
                 return 1;
             }
-            if (resp.core.old.arg[0]) return resp.core.old.arg[0];  // error during nested_hard
+            if (resp.oldarg[0]) return resp.oldarg[0];  // error during nested_hard
 
-            cuid = resp.core.old.arg[1];
+            cuid = resp.oldarg[1];
             if (nonce_file_write && fnonces == NULL) {
                 if ((fnonces = fopen(filename, "wb")) == NULL) {
                     PrintAndLogEx(WARNING, "Could not create file %s", filename);
@@ -1420,8 +1420,8 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
         if (!initialize) {
             uint32_t nt_enc1, nt_enc2;
             uint8_t par_enc;
-            uint16_t num_sampled_nonces = resp.core.old.arg[2];
-            uint8_t *bufp = resp.core.old.d.asBytes;
+            uint16_t num_sampled_nonces = resp.oldarg[2];
+            uint8_t *bufp = resp.data.asBytes;
             for (uint16_t i = 0; i < num_sampled_nonces; i += 2) {
                 nt_enc1 = bytes_to_num(bufp, 4);
                 nt_enc2 = bytes_to_num(bufp + 4, 4);
@@ -1479,11 +1479,11 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
                 }
                 return 1;
             }
-            if (resp.core.old.arg[0]) {
+            if (resp.oldarg[0]) {
                 if (nonce_file_write) {
                     fclose(fnonces);
                 }
-                return resp.core.old.arg[0];  // error during nested_hard
+                return resp.oldarg[0];  // error during nested_hard
             }
         }
 
diff --git a/client/cmdhfmfp.c b/client/cmdhfmfp.c
index 31f6ab449..b075b653f 100644
--- a/client/cmdhfmfp.c
+++ b/client/cmdhfmfp.c
@@ -42,16 +42,16 @@ static int CmdHFMFPInfo(const char *cmd) {
     infoHF14A(false, false);
 
     // Mifare Plus info
-    UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}, {{0}}};
     SendCommand(&c);
 
     UsbReplyNG resp;
     WaitForResponse(CMD_ACK, &resp);
 
     iso14a_card_select_t card;
-    memcpy(&card, (iso14a_card_select_t *)resp.core.old.d.asBytes, sizeof(iso14a_card_select_t));
+    memcpy(&card, (iso14a_card_select_t *)resp.data.asBytes, sizeof(iso14a_card_select_t));
 
-    uint64_t select_status = resp.core.old.arg[0]; // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
+    uint64_t select_status = resp.oldarg[0]; // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
 
     if (select_status == 1 || select_status == 2) {
         PrintAndLogEx(NORMAL, "----------------------------------------------");
diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index ce1859883..01f2c8899 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -458,22 +458,22 @@ static char *getUlev1CardSizeStr(uint8_t fsize) {
 }
 
 static void ul_switch_on_field(void) {
-    UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT | ISO14A_NO_RATS, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT | ISO14A_NO_RATS, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
 }
 
 static int ul_send_cmd_raw(uint8_t *cmd, uint8_t cmdlen, uint8_t *response, uint16_t responseLength) {
-    UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_NO_DISCONNECT | ISO14A_APPEND_CRC | ISO14A_NO_RATS, cmdlen, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_NO_DISCONNECT | ISO14A_APPEND_CRC | ISO14A_NO_RATS, cmdlen, 0}, {{0}}};
     memcpy(c.d.asBytes, cmd, cmdlen);
     clearCommandBuffer();
     SendCommand(&c);
     UsbReplyNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return -1;
-    if (!resp.core.old.arg[0] && responseLength) return -1;
+    if (!resp.oldarg[0] && responseLength) return -1;
 
-    uint16_t resplen = (resp.core.old.arg[0] < responseLength) ? resp.core.old.arg[0] : responseLength;
-    memcpy(response, resp.core.old.d.asBytes, resplen);
+    uint16_t resplen = (resp.oldarg[0] < responseLength) ? resp.oldarg[0] : responseLength;
+    memcpy(response, resp.data.asBytes, resplen);
     return resplen;
 }
 
@@ -485,13 +485,13 @@ static int ul_select(iso14a_card_select_t *card) {
     bool ans = false;
     ans = WaitForResponseTimeout(CMD_ACK, &resp, 1500);
 
-    if (!ans || resp.core.old.arg[0] < 1) {
+    if (!ans || resp.oldarg[0] < 1) {
         PrintAndLogEx(WARNING, "iso14443a card select failed");
         DropField();
         return 0;
     }
 
-    memcpy(card, resp.core.old.d.asBytes, sizeof(iso14a_card_select_t));
+    memcpy(card, resp.data.asBytes, sizeof(iso14a_card_select_t));
     return 1;
 }
 
@@ -533,13 +533,13 @@ static int ulc_requestAuthentication(uint8_t *nonce, uint16_t nonceLength) {
 
 static int ulc_authentication(uint8_t *key, bool switch_off_field) {
 
-    UsbCommand c = {CMD_MIFAREUC_AUTH, {switch_off_field}, {{0}}};
+    UsbCommandOLD c = {CMD_MIFAREUC_AUTH, {switch_off_field}, {{0}}};
     memcpy(c.d.asBytes, key, 16);
     clearCommandBuffer();
     SendCommand(&c);
     UsbReplyNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return 0;
-    if (resp.core.old.arg[0] == 1) return 1;
+    if (resp.oldarg[0] == 1) return 1;
 
     return 0;
 }
@@ -621,7 +621,7 @@ static int ul_fudan_check(void) {
     if (!ul_select(&card))
         return UL_ERROR;
 
-    UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_NO_DISCONNECT | ISO14A_NO_RATS, 4, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_NO_DISCONNECT | ISO14A_NO_RATS, 4, 0}, {{0}}};
 
     uint8_t cmd[4] = {0x30, 0x00, 0x02, 0xa7}; //wrong crc on purpose  should be 0xa8
     memcpy(c.d.asBytes, cmd, 4);
@@ -629,9 +629,9 @@ static int ul_fudan_check(void) {
     SendCommand(&c);
     UsbReplyNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return UL_ERROR;
-    if (resp.core.old.arg[0] != 1) return UL_ERROR;
+    if (resp.oldarg[0] != 1) return UL_ERROR;
 
-    return (!resp.core.old.d.asBytes[0]) ? FUDAN_UL : UL; //if response == 0x00 then Fudan, else Genuine NXP
+    return (!resp.data.asBytes[0]) ? FUDAN_UL : UL; //if response == 0x00 then Fudan, else Genuine NXP
 }
 
 static int ul_print_default(uint8_t *data) {
@@ -1475,7 +1475,7 @@ static int CmdHF14AMfUWrBl(const char *Cmd) {
         PrintAndLogEx(NORMAL, "Block: %0d (0x%02X) [ %s]", blockNo, blockNo, sprint_hex(blockdata, 4));
 
     //Send write Block
-    UsbCommand c = {CMD_MIFAREU_WRITEBL, {blockNo}, {{0}}};
+    UsbCommandOLD c = {CMD_MIFAREU_WRITEBL, {blockNo}, {{0}}};
     memcpy(c.d.asBytes, blockdata, 4);
 
     if (hasAuthKey) {
@@ -1490,7 +1490,7 @@ static int CmdHF14AMfUWrBl(const char *Cmd) {
     SendCommand(&c);
     UsbReplyNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-        uint8_t isOK  = resp.core.old.arg[0] & 0xff;
+        uint8_t isOK  = resp.oldarg[0] & 0xff;
         PrintAndLogEx(SUCCESS, "isOk:%02x", isOK);
     } else {
         PrintAndLogEx(WARNING, "Command execute timeout");
@@ -1581,7 +1581,7 @@ static int CmdHF14AMfURdBl(const char *Cmd) {
     if (swapEndian && hasPwdKey)  authKeyPtr = SwapEndian64(authenticationkey, 4, 4);
 
     //Read Block
-    UsbCommand c = {CMD_MIFAREU_READBL, {blockNo}, {{0}}};
+    UsbCommandOLD c = {CMD_MIFAREU_READBL, {blockNo}, {{0}}};
     if (hasAuthKey) {
         c.arg[1] = 1;
         memcpy(c.d.asBytes, authKeyPtr, 16);
@@ -1594,9 +1594,9 @@ static int CmdHF14AMfURdBl(const char *Cmd) {
     SendCommand(&c);
     UsbReplyNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-        uint8_t isOK = resp.core.old.arg[0] & 0xff;
+        uint8_t isOK = resp.oldarg[0] & 0xff;
         if (isOK) {
-            uint8_t *d = resp.core.old.d.asBytes;
+            uint8_t *d = resp.data.asBytes;
             PrintAndLogEx(NORMAL, "\nBlock#  | Data        | Ascii");
             PrintAndLogEx(NORMAL, "-----------------------------");
             PrintAndLogEx(NORMAL, "%02d/0x%02X | %s| %s\n", blockNo, blockNo, sprint_hex(d, 4), sprint_ascii(d, 4));
@@ -1846,7 +1846,7 @@ static int CmdHF14AMfUDump(const char *Cmd) {
     }
     ul_print_type(tagtype, 0);
     PrintAndLogEx(SUCCESS, "Reading tag memory...");
-    UsbCommand c = {CMD_MIFAREU_READCARD, {startPage, pages}, {{0}}};
+    UsbCommandOLD c = {CMD_MIFAREU_READCARD, {startPage, pages}, {{0}}};
     if (hasAuthKey) {
         if (tagtype & UL_C)
             c.arg[2] = 1; //UL_C auth
@@ -1864,13 +1864,13 @@ static int CmdHF14AMfUDump(const char *Cmd) {
         return 1;
     }
 
-    if (resp.core.old.arg[0] != 1) {
+    if (resp.oldarg[0] != 1) {
         PrintAndLogEx(WARNING, "Failed dumping card");
         return 1;
     }
 
-    uint32_t startindex = resp.core.old.arg[2];
-    uint32_t bufferSize = resp.core.old.arg[1];
+    uint32_t startindex = resp.oldarg[2];
+    uint32_t bufferSize = resp.oldarg[1];
     if (bufferSize > sizeof(data)) {
         PrintAndLogEx(FAILED, "Data exceeded Buffer size!");
         bufferSize = sizeof(data);
@@ -1984,7 +1984,7 @@ static int CmdHF14AMfUDump(const char *Cmd) {
 static void wait4response(uint8_t b) {
     UsbReplyNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-        uint8_t isOK  = resp.core.old.arg[0] & 0xff;
+        uint8_t isOK  = resp.oldarg[0] & 0xff;
         if (!isOK)
             PrintAndLogEx(WARNING, "failed to write block %d", b);
     } else {
@@ -2010,7 +2010,7 @@ static int CmdHF14AMfURestore(const char *Cmd) {
     bool read_key = false;
     size_t filelen = 0;
     FILE *f;
-    UsbCommand c = {CMD_MIFAREU_WRITEBL, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_MIFAREU_WRITEBL, {0, 0, 0}, {{0}}};
 
     memset(authkey, 0x00, sizeof(authkey));
 
@@ -2387,17 +2387,17 @@ static int CmdHF14AMfUCSetPwd(const char *Cmd) {
         return 1;
     }
 
-    UsbCommand c = {CMD_MIFAREUC_SETPWD, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_MIFAREUC_SETPWD, {0, 0, 0}, {{0}}};
     memcpy(c.d.asBytes, pwd, 16);
     clearCommandBuffer();
     SendCommand(&c);
 
     UsbReplyNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-        if ((resp.core.old.arg[0] & 0xff) == 1) {
+        if ((resp.oldarg[0] & 0xff) == 1) {
             PrintAndLogEx(INFO, "Ultralight-C new password: %s", sprint_hex(pwd, 16));
         } else {
-            PrintAndLogEx(WARNING, "Failed writing at block %d", resp.core.old.arg[1] & 0xff);
+            PrintAndLogEx(WARNING, "Failed writing at block %d", resp.oldarg[1] & 0xff);
             return 1;
         }
     } else {
@@ -2412,7 +2412,7 @@ static int CmdHF14AMfUCSetPwd(const char *Cmd) {
 //
 static int CmdHF14AMfUCSetUid(const char *Cmd) {
 
-    UsbCommand c = {CMD_MIFAREU_READBL, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_MIFAREU_READBL, {0, 0, 0}, {{0}}};
     UsbReplyNG resp;
     uint8_t uid[7] = {0x00};
     char cmdp = tolower(param_getchar(Cmd, 0));
@@ -2435,7 +2435,7 @@ static int CmdHF14AMfUCSetUid(const char *Cmd) {
 
     // save old block2.
     uint8_t oldblock2[4] = {0x00};
-    memcpy(resp.core.old.d.asBytes, oldblock2, 4);
+    memcpy(resp.data.asBytes, oldblock2, 4);
 
     // block 0.
     c.cmd = CMD_MIFAREU_WRITEBL;
@@ -2487,15 +2487,15 @@ static int CmdHF14AMfUGenDiverseKeys(const char *Cmd) {
 
     if (cmdp == 'r') {
         // read uid from tag
-        UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0}, {{0}}};
+        UsbCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0}, {{0}}};
         clearCommandBuffer();
         SendCommand(&c);
         UsbReplyNG resp;
         WaitForResponse(CMD_ACK, &resp);
         iso14a_card_select_t card;
-        memcpy(&card, (iso14a_card_select_t *)resp.core.old.d.asBytes, sizeof(iso14a_card_select_t));
+        memcpy(&card, (iso14a_card_select_t *)resp.data.asBytes, sizeof(iso14a_card_select_t));
 
-        uint64_t select_status = resp.core.old.arg[0];
+        uint64_t select_status = resp.oldarg[0];
         // 0: couldn't read,
         // 1: OK, with ATS
         // 2: OK, no ATS
@@ -2602,15 +2602,15 @@ static int CmdHF14AMfUPwdGen(const char *Cmd) {
 
     if (cmdp == 'r') {
         // read uid from tag
-        UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0}, {{0}}};
+        UsbCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0}, {{0}}};
         clearCommandBuffer();
         SendCommand(&c);
         UsbReplyNG resp;
         WaitForResponse(CMD_ACK, &resp);
         iso14a_card_select_t card;
-        memcpy(&card, (iso14a_card_select_t *)resp.core.old.d.asBytes, sizeof(iso14a_card_select_t));
+        memcpy(&card, (iso14a_card_select_t *)resp.data.asBytes, sizeof(iso14a_card_select_t));
 
-        uint64_t select_status = resp.core.old.arg[0];
+        uint64_t select_status = resp.oldarg[0];
         // 0: couldn't read
         // 1: OK with ATS
         // 2: OK, no ATS
diff --git a/client/cmdhftopaz.c b/client/cmdhftopaz.c
index da498f948..48ccf8e9f 100644
--- a/client/cmdhftopaz.c
+++ b/client/cmdhftopaz.c
@@ -31,29 +31,29 @@ static struct {
 } topaz_tag;
 
 static void topaz_switch_on_field(void) {
-    UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_SELECT | ISO14A_NO_DISCONNECT | ISO14A_TOPAZMODE | ISO14A_NO_RATS, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_SELECT | ISO14A_NO_DISCONNECT | ISO14A_TOPAZMODE | ISO14A_NO_RATS, 0, 0}, {{0}}};
     SendCommand(&c);
 }
 
 static void topaz_switch_off_field(void) {
-    UsbCommand c = {CMD_READER_ISO_14443a, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_READER_ISO_14443a, {0, 0, 0}, {{0}}};
     SendCommand(&c);
 }
 
 // send a raw topaz command, returns the length of the response (0 in case of error)
 static int topaz_send_cmd_raw(uint8_t *cmd, uint8_t len, uint8_t *response) {
-    UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_NO_DISCONNECT | ISO14A_TOPAZMODE | ISO14A_NO_RATS, len, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_NO_DISCONNECT | ISO14A_TOPAZMODE | ISO14A_NO_RATS, len, 0}, {{0}}};
     memcpy(c.d.asBytes, cmd, len);
     SendCommand(&c);
 
     UsbReplyNG resp;
     WaitForResponse(CMD_ACK, &resp);
 
-    if (resp.core.old.arg[0] > 0) {
-        memcpy(response, resp.core.old.d.asBytes, resp.core.old.arg[0]);
+    if (resp.oldarg[0] > 0) {
+        memcpy(response, resp.data.asBytes, resp.oldarg[0]);
     }
 
-    return resp.core.old.arg[0];
+    return resp.oldarg[0];
 }
 
 
diff --git a/client/cmdhw.c b/client/cmdhw.c
index 97c518231..b547caae2 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -308,7 +308,7 @@ static void lookupChipID(uint32_t iChipID, uint32_t mem_used) {
 }
 
 static int CmdDetectReader(const char *Cmd) {
-    UsbCommand c = {CMD_LISTEN_READER_FIELD, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_LISTEN_READER_FIELD, {0, 0, 0}, {{0}}};
     // 'l' means LF - 125/134 kHz
     if (*Cmd == 'l') {
         c.arg[0] = 1;
@@ -326,7 +326,7 @@ static int CmdDetectReader(const char *Cmd) {
 // ## FPGA Control
 static int CmdFPGAOff(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
-    UsbCommand c = {CMD_FPGA_MAJOR_MODE_OFF, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_FPGA_MAJOR_MODE_OFF, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -336,7 +336,7 @@ static int CmdFPGAOff(const char *Cmd) {
 static int CmdLCD(const char *Cmd) {
     int i, j;
 
-    UsbCommand c = {CMD_LCD, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_LCD, {0, 0, 0}, {{0}}};
     sscanf(Cmd, "%x %d", &i, &j);
     while (j--) {
         c.arg[0] = i & 0x1ff;
@@ -347,7 +347,7 @@ static int CmdLCD(const char *Cmd) {
 }
 
 static int CmdLCDReset(const char *Cmd) {
-    UsbCommand c = {CMD_LCD_RESET, {strtol(Cmd, NULL, 0), 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_LCD_RESET, {strtol(Cmd, NULL, 0), 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -355,7 +355,7 @@ static int CmdLCDReset(const char *Cmd) {
 #endif
 
 static int CmdReadmem(const char *Cmd) {
-    UsbCommand c = {CMD_READ_MEM, {strtol(Cmd, NULL, 0), 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_READ_MEM, {strtol(Cmd, NULL, 0), 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -363,7 +363,7 @@ static int CmdReadmem(const char *Cmd) {
 
 static int CmdReset(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
-    UsbCommand c = {CMD_HARDWARE_RESET, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_HARDWARE_RESET, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -374,7 +374,7 @@ static int CmdReset(const char *Cmd) {
  * 600kHz.
  */
 static int CmdSetDivisor(const char *Cmd) {
-    UsbCommand c = {CMD_SET_LF_DIVISOR, {strtol(Cmd, NULL, 0), 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_SET_LF_DIVISOR, {strtol(Cmd, NULL, 0), 0, 0}, {{0}}};
 
     if (c.arg[0] < 19 || c.arg[0] > 255) {
         PrintAndLogEx(NORMAL, "divisor must be between 19 and 255");
@@ -394,7 +394,7 @@ static int CmdSetMux(const char *Cmd) {
         return 1;
     }
 
-    UsbCommand c = {CMD_SET_ADC_MUX, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_SET_ADC_MUX, {0, 0, 0}, {{0}}};
 
     if (strcmp(Cmd, "lopkd") == 0)      c.arg[0] = 0;
     else if (strcmp(Cmd, "loraw") == 0) c.arg[0] = 1;
@@ -419,7 +419,7 @@ static int CmdStatus(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     clearCommandBuffer();
     UsbReplyNG resp;
-    UsbCommand c = {CMD_STATUS, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_STATUS, {0, 0, 0}, {{0}}};
     SendCommand(&c);
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1900))
         PrintAndLogEx(NORMAL, "Status command failed. USB Speed Test timed out");
@@ -430,7 +430,7 @@ static int CmdPing(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     clearCommandBuffer();
     UsbReplyNG resp;
-    UsbCommand c = {CMD_PING, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_PING, {0, 0, 0}, {{0}}};
     SendCommand(&c);
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1000))
         PrintAndLogEx(NORMAL, "Ping successful");
@@ -441,12 +441,12 @@ static int CmdPing(const char *Cmd) {
 
 static int CmdPingNG(const char *Cmd) {
     uint32_t len = strtol(Cmd, NULL, 0);
-    if (len > USB_DATANG_SIZE)
-        len = USB_DATANG_SIZE;
+    if (len > USB_CMD_DATA_SIZE)
+        len = USB_CMD_DATA_SIZE;
     PrintAndLogEx(NORMAL, "PingNG sent with payload len=%d", len);
     clearCommandBuffer();
     UsbReplyNG resp;
-    uint8_t data[USB_DATANG_SIZE] = {0};
+    uint8_t data[USB_CMD_DATA_SIZE] = {0};
     uint16_t cmd = CMD_PING;
     for (uint16_t i = 0; i < len; i++)
         data[i] = i & 0xFF;
@@ -454,7 +454,7 @@ static int CmdPingNG(const char *Cmd) {
     if (WaitForResponseTimeout(CMD_PING, &resp, 1000)) {
         bool error = false;
         if (len)
-            error = memcmp(data, resp.core.ng.data, len) != 0;
+            error = memcmp(data, resp.data.asBytes, len) != 0;
         PrintAndLogEx(NORMAL, "PingNG response received, content is %s", error ? _RED_("NOT ok") : _GREEN_("ok"));
     } else
         PrintAndLogEx(NORMAL, "PingNG response " _RED_("timeout"));
@@ -496,7 +496,7 @@ int CmdHW(const char *Cmd) {
 void pm3_version(bool verbose) {
     if (!verbose)
         return;
-    UsbCommand c = {CMD_VERSION, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_VERSION, {0, 0, 0}, {{0}}};
     UsbReplyNG resp;
     clearCommandBuffer();
     SendCommand(&c);
@@ -526,8 +526,8 @@ void pm3_version(bool verbose) {
         PrintAndLogEx(NORMAL, "\n [ CLIENT ]");
         PrintAndLogEx(NORMAL, "  client: iceman %s \n", s);
 
-        PrintAndLogEx(NORMAL, (char *)resp.core.old.d.asBytes);
-        lookupChipID(resp.core.old.arg[0], resp.core.old.arg[1]);
+        PrintAndLogEx(NORMAL, (char *)resp.data.asBytes);
+        lookupChipID(resp.oldarg[0], resp.oldarg[1]);
     }
     PrintAndLogEx(NORMAL, "\n");
 }
diff --git a/client/cmdlf.c b/client/cmdlf.c
index 33498a748..54519a8e9 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -144,7 +144,7 @@ static int usage_lf_find(void) {
 /* send a LF command before reading */
 int CmdLFCommandRead(const char *Cmd) {
 
-    UsbCommand c = {CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K, {0, 0, 0}, {{0}}};
     bool errors = false;
 
     uint8_t cmdp = 0;
@@ -322,7 +322,7 @@ int CmdLFSetConfig(const char *Cmd) {
 
     sample_config config = { decimation, bps, averaging, divisor, trigger_threshold };
 
-    UsbCommand c = {CMD_SET_LF_SAMPLING_CONFIG, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_SET_LF_SAMPLING_CONFIG, {0, 0, 0}, {{0}}};
     memcpy(c.d.asBytes, &config, sizeof(sample_config));
     clearCommandBuffer();
     SendCommand(&c);
@@ -331,7 +331,7 @@ int CmdLFSetConfig(const char *Cmd) {
 
 bool lf_read(bool silent, uint32_t samples) {
     if (IsOffline()) return false;
-    UsbCommand c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_125K, {silent, samples, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_125K, {silent, samples, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
 
@@ -344,8 +344,8 @@ bool lf_read(bool silent, uint32_t samples) {
             return false;
         }
     }
-    // resp.core.old.arg[0] is bits read not bytes read.
-    getSamples(resp.core.old.arg[0] / 8, silent);
+    // resp.oldarg[0] is bits read not bytes read.
+    getSamples(resp.oldarg[0] / 8, silent);
 
     return true;
 }
@@ -387,7 +387,7 @@ int CmdLFSniff(const char *Cmd) {
     uint8_t cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_lf_sniff();
 
-    UsbCommand c = {CMD_LF_SNIFF_RAW_ADC_SAMPLES, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_LF_SNIFF_RAW_ADC_SAMPLES, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     WaitForResponse(CMD_ACK, NULL);
@@ -420,7 +420,7 @@ int CmdLFSim(const char *Cmd) {
 
     //can send only 512 bits at a time (1 byte sent per bit...)
     for (uint16_t i = 0; i < GraphTraceLen; i += USB_CMD_DATA_SIZE) {
-        UsbCommand c = {CMD_UPLOAD_SIM_SAMPLES_125K, {i, FPGA_LF, 0}, {{0}}};
+        UsbCommandOLD c = {CMD_UPLOAD_SIM_SAMPLES_125K, {i, FPGA_LF, 0}, {{0}}};
 
         for (uint16_t j = 0; j < USB_CMD_DATA_SIZE; j++)
             c.d.asBytes[j] = GraphBuffer[i + j];
@@ -434,7 +434,7 @@ int CmdLFSim(const char *Cmd) {
 
     PrintAndLogEx(NORMAL, "Simulating");
 
-    UsbCommand c = {CMD_SIMULATE_TAG_125K, {GraphTraceLen, gap, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_SIMULATE_TAG_125K, {GraphTraceLen, gap, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -523,7 +523,7 @@ int CmdLFfskSim(const char *Cmd) {
         PrintAndLogEx(NORMAL, "DemodBuffer too long for current implementation - length: %d - max: %d", size, USB_CMD_DATA_SIZE);
         size = USB_CMD_DATA_SIZE;
     }
-    UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}, {{0}}};
+    UsbCommandOLD c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}, {{0}}};
 
     memcpy(c.d.asBytes, DemodBuffer, size);
     clearCommandBuffer();
@@ -619,7 +619,7 @@ int CmdLFaskSim(const char *Cmd) {
     arg1 = clk << 8 | encoding;
     arg2 = invert << 8 | separator;
 
-    UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
+    UsbCommandOLD c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
     memcpy(c.d.asBytes, DemodBuffer, size);
     clearCommandBuffer();
     SendCommand(&c);
@@ -726,7 +726,7 @@ int CmdLFpskSim(const char *Cmd) {
         PrintAndLogEx(NORMAL, "DemodBuffer too long for current implementation - length: %d - max: %d", size, USB_CMD_DATA_SIZE);
         size = USB_CMD_DATA_SIZE;
     }
-    UsbCommand c = {CMD_PSK_SIM_TAG, {arg1, arg2, size}, {{0}}};
+    UsbCommandOLD c = {CMD_PSK_SIM_TAG, {arg1, arg2, size}, {{0}}};
     PrintAndLogEx(DEBUG, "DEBUG: Sending DemodBuffer Length: %d", size);
     memcpy(c.d.asBytes, DemodBuffer, size);
     clearCommandBuffer();
@@ -739,7 +739,7 @@ int CmdLFSimBidir(const char *Cmd) {
     // Set ADC to twice the carrier for a slight supersampling
     // HACK: not implemented in ARMSRC.
     PrintAndLogEx(INFO, "Not implemented yet.");
-    UsbCommand c = {CMD_LF_SIMULATE_BIDIR, {47, 384, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_LF_SIMULATE_BIDIR, {47, 384, 0}, {{0}}};
     SendCommand(&c);
     return 0;
 }
diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c
index a05d58387..26c657064 100644
--- a/client/cmdlfawid.c
+++ b/client/cmdlfawid.c
@@ -87,7 +87,7 @@ static int usage_lf_awid_brute(void) {
 }
 
 static bool sendPing(void) {
-    UsbCommand ping = {CMD_PING, {1, 2, 3}, {{0}}};
+    UsbCommandOLD ping = {CMD_PING, {1, 2, 3}, {{0}}};
     SendCommand(&ping);
     SendCommand(&ping);
     SendCommand(&ping);
@@ -112,7 +112,7 @@ static bool sendTry(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint32_t delay, ui
     uint64_t arg1 = (high << 8) + low;
     uint64_t arg2 = (invert << 8) + clk;
 
-    UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, bs_len}, {{0}}};
+    UsbCommandOLD c = {CMD_FSK_SIM_TAG, {arg1, arg2, bs_len}, {{0}}};
     memcpy(c.d.asBytes, bits, bs_len);
     clearCommandBuffer();
     SendCommand(&c);
@@ -171,7 +171,7 @@ static int CmdAWIDRead_device(const char *Cmd) {
 
     if (Cmd[0] == 'h' || Cmd[0] == 'H') return usage_lf_awid_read();
     uint8_t findone = (Cmd[0] == '1') ? 1 : 0;
-    UsbCommand c = {CMD_AWID_DEMOD_FSK, {findone, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_AWID_DEMOD_FSK, {findone, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -350,7 +350,7 @@ static int CmdAWIDSim(const char *Cmd) {
     // arg1 --- fcHigh<<8 + fcLow
     // arg2 --- Inversion and clk setting
     // 96   --- Bitstream length: 96-bits == 12 bytes
-    UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}, {{0}}};
+    UsbCommandOLD c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}, {{0}}};
     memcpy(c.d.asBytes, bits, size);
     clearCommandBuffer();
     SendCommand(&c);
@@ -393,7 +393,7 @@ static int CmdAWIDClone(const char *Cmd) {
     print_blocks(blocks, 4);
 
     UsbReplyNG resp;
-    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
 
     for (uint8_t i = 0; i < 4; i++) {
         c.arg[0] = blocks[i];
diff --git a/client/cmdlfcotag.c b/client/cmdlfcotag.c
index 5709ae92f..303c494c3 100644
--- a/client/cmdlfcotag.c
+++ b/client/cmdlfcotag.c
@@ -74,7 +74,7 @@ static int CmdCOTAGRead(const char *Cmd) {
     uint32_t rawsignal = 1;
     sscanf(Cmd, "%u", &rawsignal);
 
-    UsbCommand c = {CMD_COTAG, {rawsignal, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_COTAG, {rawsignal, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     if (!WaitForResponseTimeout(CMD_ACK, NULL, 7000)) {
diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 5fe4fd5ab..94af1b7b4 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -389,7 +389,7 @@ int AskEm410xDemod(const char *Cmd, uint32_t *hi, uint64_t *lo, bool verbose) {
 static int CmdEM410xRead_device(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     uint8_t findone = (cmdp == '1') ? 1 : 0;
-    UsbCommand c = {CMD_EM410X_DEMOD, {findone, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_EM410X_DEMOD, {findone, 0, 0}, {{0}}};
     SendCommand(&c);
     return 0;
 }
@@ -648,7 +648,7 @@ static int CmdEM410xWrite(const char *Cmd) {
         return 0;
     }
 
-    UsbCommand c = {CMD_EM410X_WRITE_TAG, {card, (uint32_t)(id >> 32), (uint32_t)id}, {{0}}};
+    UsbCommandOLD c = {CMD_EM410X_WRITE_TAG, {card, (uint32_t)(id >> 32), (uint32_t)id}, {{0}}};
     SendCommand(&c);
     return 0;
 }
@@ -1127,7 +1127,7 @@ static bool demodEM4x05resp(uint32_t *word) {
 
 //////////////// 4205 / 4305 commands
 static int EM4x05ReadWord_ext(uint8_t addr, uint32_t pwd, bool usePwd, uint32_t *word) {
-    UsbCommand c = {CMD_EM4X_READ_WORD, {addr, pwd, usePwd}, {{0}}};
+    UsbCommandOLD c = {CMD_EM4X_READ_WORD, {addr, pwd, usePwd}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbReplyNG resp;
@@ -1230,7 +1230,7 @@ static int CmdEM4x05Write(const char *Cmd) {
 
     uint16_t flag = (addr << 8) | (usePwd);
 
-    UsbCommand c = {CMD_EM4X_WRITE_WORD, {flag, data, pwd}, {{0}}};
+    UsbCommandOLD c = {CMD_EM4X_WRITE_WORD, {flag, data, pwd}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbReplyNG resp;
diff --git a/client/cmdlffdx.c b/client/cmdlffdx.c
index 8cde5eaaf..2d4d1dc4c 100644
--- a/client/cmdlffdx.c
+++ b/client/cmdlffdx.c
@@ -282,7 +282,7 @@ static int CmdFdxClone(const char *Cmd) {
     print_blocks(blocks, 5);
 
     UsbReplyNG resp;
-    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
 
     for (int i = 4; i >= 0; --i) {
         c.arg[0] = blocks[i];
@@ -318,7 +318,7 @@ static int CmdFdxSim(const char *Cmd) {
 
     PrintAndLogEx(SUCCESS, "Simulating FDX-B animal ID: %04u-%"PRIu64, countryid, animalid);
 
-    UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
+    UsbCommandOLD c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
 
     //getFDXBits(uint64_t national_id, uint16_t country, uint8_t isanimal, uint8_t isextended, uint32_t extended, uint8_t *bits)
     getFDXBits(animalid, countryid, 1, 0, 0, c.d.asBytes);
diff --git a/client/cmdlfguard.c b/client/cmdlfguard.c
index 988888773..31e15b9c3 100644
--- a/client/cmdlfguard.c
+++ b/client/cmdlfguard.c
@@ -172,7 +172,7 @@ static int CmdGuardClone(const char *Cmd) {
     print_blocks(blocks, 4);
 
     UsbReplyNG resp;
-    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
 
     for (i = 0; i < 4; ++i) {
         c.arg[0] = blocks[i];
@@ -217,7 +217,7 @@ static int CmdGuardSim(const char *Cmd) {
     arg1 = (clock1 << 8) | encoding;
     arg2 = (invert << 8) | separator;
 
-    UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
+    UsbCommandOLD c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
     memcpy(c.d.asBytes, bs, size);
     clearCommandBuffer();
     SendCommand(&c);
diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c
index 7f21ab88d..62eb0d423 100644
--- a/client/cmdlfhid.c
+++ b/client/cmdlfhid.c
@@ -93,7 +93,7 @@ static int usage_lf_hid_brute(void) {
 
 // sending three times.  Didn't seem to break the previous sim?
 static bool sendPing(void) {
-    UsbCommand ping = {CMD_PING, {1, 2, 3}, {{0}}};
+    UsbCommandOLD ping = {CMD_PING, {1, 2, 3}, {{0}}};
     SendCommand(&ping);
     SendCommand(&ping);
     SendCommand(&ping);
@@ -113,7 +113,7 @@ static bool sendTry(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint32_t delay, ui
 
     uint64_t arg1 = bytebits_to_byte(bits, 32);
     uint64_t arg2 = bytebits_to_byte(bits + 32, 32);
-    UsbCommand c = {CMD_HID_SIM_TAG, {arg1, arg2, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_HID_SIM_TAG, {arg1, arg2, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
 
@@ -242,7 +242,7 @@ static int CmdHIDRead_device(const char *Cmd) {
 
     if (Cmd[0] == 'h' || Cmd[0] == 'H') return usage_lf_hid_read();
     uint8_t findone = (Cmd[0] == '1') ? 1 : 0;
-    UsbCommand c = {CMD_HID_DEMOD_FSK, {findone, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_HID_DEMOD_FSK, {findone, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -263,7 +263,7 @@ static int CmdHIDSim(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "Simulating HID tag with ID %x%08x", hi, lo);
     PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation");
 
-    UsbCommand c = {CMD_HID_SIM_TAG, {hi, lo, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_HID_SIM_TAG, {hi, lo, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -273,7 +273,7 @@ static int CmdHIDClone(const char *Cmd) {
 
     uint32_t hi2 = 0, hi = 0, lo = 0;
     uint32_t n = 0, i = 0;
-    UsbCommand c = {CMD_HID_CLONE_TAG, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_HID_CLONE_TAG, {0, 0, 0}, {{0}}};
 
     uint8_t ctmp = param_getchar(Cmd, 0);
     if (strlen(Cmd) == 0 || ctmp == 'H' || ctmp == 'h') return usage_lf_hid_clone();
diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index ed10afee1..851215e54 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -260,7 +260,7 @@ static int CmdLFHitagSniff(const char *Cmd) {
     char ctmp = tolower(param_getchar(Cmd, 0));
     if (ctmp == 'h') return usage_hitag_sniff();
 
-    UsbCommand c = {CMD_SNIFF_HITAG, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_SNIFF_HITAG, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -277,7 +277,7 @@ static int CmdLFHitagSim(const char *Cmd) {
     int res = 0;
     char filename[FILE_PATH_SIZE] = { 0x00 };
 
-    UsbCommand c = {CMD_SIMULATE_HITAG, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_SIMULATE_HITAG, {0, 0, 0}, {{0}}};
 
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
@@ -458,7 +458,7 @@ static void printHitagConfiguration(uint8_t config) {
 
 static bool getHitagUid(uint32_t *uid) {
 
-    UsbCommand c = {CMD_READER_HITAG, {RHT2F_UID_ONLY, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_READER_HITAG, {RHT2F_UID_ONLY, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbReplyNG resp;
@@ -467,13 +467,13 @@ static bool getHitagUid(uint32_t *uid) {
         return false;
     }
 
-    if (resp.core.old.arg[0] == false) {
+    if (resp.oldarg[0] == false) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - failed getting UID");
         return false;
     }
 
     if (uid)
-        *uid = bytes_to_num(resp.core.old.d.asBytes, 4);
+        *uid = bytes_to_num(resp.data.asBytes, 4);
 
     return true;
 }
@@ -513,7 +513,7 @@ static int CmdLFHitagInfo(const char *Cmd) {
 //
 static int CmdLFHitagReader(const char *Cmd) {
 
-    UsbCommand c = {CMD_READER_HITAG, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_READER_HITAG, {0, 0, 0}, {{0}}};
     hitag_data *htd = (hitag_data *)c.d.asBytes;
     hitag_function htf = param_get32ex(Cmd, 0, 0, 10);
 
@@ -565,18 +565,18 @@ static int CmdLFHitagReader(const char *Cmd) {
         return 1;
     }
 
-    if (resp.core.old.arg[0] == false) {
+    if (resp.oldarg[0] == false) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - hitag failed");
         return 1;
     }
 
-    uint32_t id = bytes_to_num(resp.core.old.d.asBytes, 4);
+    uint32_t id = bytes_to_num(resp.data.asBytes, 4);
 
     PrintAndLogEx(SUCCESS, "Valid Hitag2 tag found - UID: %08x", id);
     if (htf != RHT2F_UID_ONLY) {
 
         PrintAndLogEx(SUCCESS, "Dumping tag memory...");
-        uint8_t *data = resp.core.old.d.asBytes;
+        uint8_t *data = resp.data.asBytes;
 
         char filename[FILE_PATH_SIZE];
         char *fnameptr = filename;
@@ -595,7 +595,7 @@ static int CmdLFHitagReader(const char *Cmd) {
 
 static int CmdLFHitagCheckChallenges(const char *Cmd) {
 
-    UsbCommand c = { CMD_TEST_HITAGS_TRACES, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = { CMD_TEST_HITAGS_TRACES, {0, 0, 0}, {{0}}};
     char filename[FILE_PATH_SIZE] = { 0x00 };
     size_t datalen = 0;
     int res = 0;
@@ -644,7 +644,7 @@ static int CmdLFHitagCheckChallenges(const char *Cmd) {
 }
 
 static int CmdLFHitagWriter(const char *Cmd) {
-    UsbCommand c = { CMD_WR_HITAG_S, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = { CMD_WR_HITAG_S, {0, 0, 0}, {{0}}};
     hitag_data *htd = (hitag_data *)c.d.asBytes;
     hitag_function htf = param_get32ex(Cmd, 0, 0, 10);
 
@@ -682,7 +682,7 @@ static int CmdLFHitagWriter(const char *Cmd) {
         return 1;
     }
 
-    if (resp.core.old.arg[0] == false) {
+    if (resp.oldarg[0] == false) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - hitag write failed");
         return 1;
     }
diff --git a/client/cmdlfindala.c b/client/cmdlfindala.c
index 144a76312..44a2c4da4 100644
--- a/client/cmdlfindala.c
+++ b/client/cmdlfindala.c
@@ -404,7 +404,7 @@ static int CmdIndalaSim(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "Simulating Indala UID: %s",  sprint_hex(hexuid, len));
     PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation or run another command");
 
-    UsbCommand c = {CMD_PSK_SIM_TAG, {arg1, arg2, size}, {{0}}};
+    UsbCommandOLD c = {CMD_PSK_SIM_TAG, {arg1, arg2, size}, {{0}}};
     memcpy(c.d.asBytes, bits, size);
     clearCommandBuffer();
     SendCommand(&c);
@@ -438,7 +438,7 @@ static int CmdIndalaClone(const char *Cmd) {
     CLIGetHexWithReturn(2, data, &datalen);
     CLIParserFree();
 
-    UsbCommand c = {0, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {0, {0, 0, 0}, {{0}}};
 
     if (isLongUid) {
         PrintAndLogEx(INFO, "Preparing to clone Indala 224bit tag with RawID %s", sprint_hex(data, datalen));
diff --git a/client/cmdlfio.c b/client/cmdlfio.c
index 92f954511..13168f410 100644
--- a/client/cmdlfio.c
+++ b/client/cmdlfio.c
@@ -66,7 +66,7 @@ static int usage_lf_io_clone(void) {
 static int CmdIOProxRead_device(const char *Cmd) {
     if (Cmd[0] == 'h' || Cmd[0] == 'H') return usage_lf_io_read();
     int findone = (Cmd[0] == '1') ? 1 : 0;
-    UsbCommand c = {CMD_IO_DEMOD_FSK, {findone, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_IO_DEMOD_FSK, {findone, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -215,7 +215,7 @@ static int CmdIOProxSim(const char *Cmd) {
     // arg1 --- fcHigh<<8 + fcLow
     // arg2 --- Invert and clk setting
     // size --- 64 bits == 8 bytes
-    UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}, {{0}}};
+    UsbCommandOLD c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}, {{0}}};
     memcpy(c.d.asBytes, bits, size);
     clearCommandBuffer();
     SendCommand(&c);
@@ -258,8 +258,8 @@ static int CmdIOProxClone(const char *Cmd) {
     PrintAndLogEx(INFO, "Preparing to clone IOProx to T55x7 with Version: %u FC: %u, CN: %u", version, fc, cn);
     print_blocks(blocks, 3);
 
-    //UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}, {{0}}};
-    UsbCommand c = {CMD_IO_CLONE_TAG, {blocks[1], blocks[2], 0}, {{0}}};
+    //UsbCommandOLD c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}, {{0}}};
+    UsbCommandOLD c = {CMD_IO_CLONE_TAG, {blocks[1], blocks[2], 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
diff --git a/client/cmdlfjablotron.c b/client/cmdlfjablotron.c
index b2100fd35..531c5cac7 100644
--- a/client/cmdlfjablotron.c
+++ b/client/cmdlfjablotron.c
@@ -156,7 +156,7 @@ static int CmdJablotronClone(const char *Cmd) {
     print_blocks(blocks, 3);
 
     UsbReplyNG resp;
-    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
 
     for (uint8_t i = 0; i < 3; i++) {
         c.arg[0] = blocks[i];
@@ -193,7 +193,7 @@ static int CmdJablotronSim(const char *Cmd) {
 
     PrintAndLogEx(SUCCESS, "Simulating Jablotron - FullCode: %"PRIx64, fullcode);
 
-    UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
+    UsbCommandOLD c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
     getJablotronBits(fullcode, c.d.asBytes);
     clearCommandBuffer();
     SendCommand(&c);
diff --git a/client/cmdlfkeri.c b/client/cmdlfkeri.c
index 117038158..127bc9159 100644
--- a/client/cmdlfkeri.c
+++ b/client/cmdlfkeri.c
@@ -147,7 +147,7 @@ static int CmdKeriClone(const char *Cmd) {
 
 
     UsbReplyNG resp;
-    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
 
 
     for (uint8_t i = 0; i < 3; i++) {
@@ -189,7 +189,7 @@ static int CmdKeriSim(const char *Cmd) {
 
     PrintAndLogEx(SUCCESS, "Simulating KERI - Internal Id: %u", internalid);
 
-    UsbCommand c = {CMD_PSK_SIM_TAG, {arg1, arg2, size}, {{0}}};
+    UsbCommandOLD c = {CMD_PSK_SIM_TAG, {arg1, arg2, size}, {{0}}};
     memcpy(c.d.asBytes, bits, size);
     clearCommandBuffer();
     SendCommand(&c);
diff --git a/client/cmdlfnedap.c b/client/cmdlfnedap.c
index 0a70144a9..7123b4179 100644
--- a/client/cmdlfnedap.c
+++ b/client/cmdlfnedap.c
@@ -203,7 +203,7 @@ static int CmdLFNedapClone(const char *Cmd) {
     print_blocks(blocks, 5);
 
     UsbReplyNG resp;
-    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}, {{0}}};
+    UsbCommandOLD c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}, {{0}}};
 
     for (uint8_t i = 0; i<5; ++i ) {
         c.arg[0] = blocks[i];
@@ -248,7 +248,7 @@ static int CmdLFNedapSim(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "bin  %s", sprint_bin_break(bs, 128, 32));
     PrintAndLogEx(SUCCESS, "Simulating Nedap - CardNumber: %u", cardnumber);
 
-    UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
+    UsbCommandOLD c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
     memcpy(c.d.asBytes, bs, size);
     clearCommandBuffer();
     SendCommand(&c);
diff --git a/client/cmdlfnoralsy.c b/client/cmdlfnoralsy.c
index 93fb4615f..44bcf6d39 100644
--- a/client/cmdlfnoralsy.c
+++ b/client/cmdlfnoralsy.c
@@ -155,7 +155,7 @@ static int CmdNoralsyClone(const char *Cmd) {
     print_blocks(blocks, 4);
 
     UsbReplyNG resp;
-    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
 
     for (uint8_t i = 0; i < 4; i++) {
         c.arg[0] = blocks[i];
@@ -198,7 +198,7 @@ static int CmdNoralsySim(const char *Cmd) {
 
     PrintAndLogEx(SUCCESS, "Simulating Noralsy - CardId: %u", id);
 
-    UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
+    UsbCommandOLD c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
     memcpy(c.d.asBytes, bs, size);
     clearCommandBuffer();
     SendCommand(&c);
diff --git a/client/cmdlfparadox.c b/client/cmdlfparadox.c
index 3b7f97373..aa62e7978 100644
--- a/client/cmdlfparadox.c
+++ b/client/cmdlfparadox.c
@@ -138,7 +138,7 @@ static int CmdParadoxSim(const char *Cmd) {
 
     PrintAndLogEx(NORMAL, "Simulating Paradox - Facility Code: %u, CardNumber: %u", facilitycode, cardnumber);
 
-    UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}, {{0}}};
+    UsbCommandOLD c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}, {{0}}};
     memcpy(c.d.asBytes, bs, size);
     clearCommandBuffer();
     SendCommand(&c);
diff --git a/client/cmdlfpcf7931.c b/client/cmdlfpcf7931.c
index a9836a113..75322fb34 100644
--- a/client/cmdlfpcf7931.c
+++ b/client/cmdlfpcf7931.c
@@ -100,7 +100,7 @@ static int CmdLFPCF7931Read(const char *Cmd) {
     if (ctmp == 'H' || ctmp == 'h') return usage_pcf7931_read();
 
     UsbReplyNG resp;
-    UsbCommand c = {CMD_PCF7931_READ, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_PCF7931_READ, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
@@ -145,7 +145,7 @@ static int CmdLFPCF7931Write(const char *Cmd) {
     PrintAndLogEx(NORMAL, "          pos: %d", bytepos);
     PrintAndLogEx(NORMAL, "         data: 0x%02X", data);
 
-    UsbCommand c = {CMD_PCF7931_WRITE, { block, bytepos, data}, {{0}}};
+    UsbCommandOLD c = {CMD_PCF7931_WRITE, { block, bytepos, data}, {{0}}};
     memcpy(c.d.asDwords, configPcf.Pwd, sizeof(configPcf.Pwd));
     c.d.asDwords[7] = (configPcf.OffsetWidth + 128);
     c.d.asDwords[8] = (configPcf.OffsetPosition + 128);
diff --git a/client/cmdlfpresco.c b/client/cmdlfpresco.c
index 9689b1a3c..7ea253928 100644
--- a/client/cmdlfpresco.c
+++ b/client/cmdlfpresco.c
@@ -121,7 +121,7 @@ static int CmdPrescoClone(const char *Cmd) {
     print_blocks(blocks, 5);
 
     UsbReplyNG resp;
-    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
 
     for (uint8_t i = 0; i < 5; i++) {
         c.arg[0] = blocks[i];
@@ -152,7 +152,7 @@ static int CmdPrescoSim(const char *Cmd) {
 
     PrintAndLogEx(SUCCESS, "Simulating Presco - SiteCode: %u, UserCode: %u, FullCode: %08X", sitecode, usercode, fullcode);
 
-    UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
+    UsbCommandOLD c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
     getPrescoBits(fullcode, c.d.asBytes);
     clearCommandBuffer();
     SendCommand(&c);
diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c
index 62573fbf4..3bfc39acc 100644
--- a/client/cmdlfpyramid.c
+++ b/client/cmdlfpyramid.c
@@ -233,7 +233,7 @@ static int CmdPyramidClone(const char *Cmd) {
     print_blocks(blocks, 5);
 
     UsbReplyNG resp;
-    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
 
     for (uint8_t i = 0; i < 5; ++i) {
         c.arg[0] = blocks[i];
@@ -277,7 +277,7 @@ static int CmdPyramidSim(const char *Cmd) {
 
     PrintAndLogEx(SUCCESS, "Simulating Farpointe/Pyramid - Facility Code: %u, CardNumber: %u", facilitycode, cardnumber);
 
-    UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}, {{0}}};
+    UsbCommandOLD c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}, {{0}}};
     memcpy(c.d.asBytes, bs, size);
     clearCommandBuffer();
     SendCommand(&c);
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 6a3401555..ec26905a5 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1018,7 +1018,7 @@ static int CmdT55xxWakeUp(const char *Cmd) {
     }
     if (errors) return usage_t55xx_wakup();
 
-    UsbCommand c = {CMD_T55XX_WAKEUP, {password, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_T55XX_WAKEUP, {password, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     PrintAndLogEx(SUCCESS, "Wake up command sent. Try read now");
@@ -1074,7 +1074,7 @@ static int CmdT55xxWriteBlock(const char *Cmd) {
         return 0;
     }
 
-    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {data, block, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_T55XX_WRITE_BLOCK, {data, block, 0}, {{0}}};
     UsbReplyNG resp;
     c.d.asBytes[0] = (page1) ? 0x2 : 0;
     c.d.asBytes[0] |= (testMode) ? 0x4 : 0;
@@ -1515,7 +1515,7 @@ bool AquireData(uint8_t page, uint8_t block, bool pwdmode, uint32_t password) {
     // arg1: which block to read
     // arg2: password
     uint8_t arg0 = (page << 1 | (pwdmode));
-    UsbCommand c = {CMD_T55XX_READ_BLOCK, {arg0, block, password}, {{0}}};
+    UsbCommandOLD c = {CMD_T55XX_READ_BLOCK, {arg0, block, password}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     if (!WaitForResponseTimeout(CMD_ACK, NULL, 2500)) {
@@ -1775,7 +1775,7 @@ static void t55x7_create_config_block(int tagtype) {
 
 static int CmdResetRead(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
-    UsbCommand c = {CMD_T55XX_RESET_READ, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_T55XX_RESET_READ, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     if (!WaitForResponseTimeout(CMD_ACK, NULL, 2500)) {
@@ -1856,7 +1856,7 @@ static int CmdT55xxChkPwds(const char *Cmd) {
     uint64_t t1 = msclock();
 
     if (cmdp == 'm') {
-        UsbCommand c = {CMD_T55XX_CHKPWDS, {0, 0, 0}, {{0}}};
+        UsbCommandOLD c = {CMD_T55XX_CHKPWDS, {0, 0, 0}, {{0}}};
         clearCommandBuffer();
         SendCommand(&c);
         UsbReplyNG resp;
@@ -1871,13 +1871,13 @@ static int CmdT55xxChkPwds(const char *Cmd) {
             }
         }
 
-        if (resp.core.old.arg[0]) {
-            PrintAndLogEx(SUCCESS, "\nFound a candidate [ " _YELLOW_("%08X") " ]. Trying to validate", resp.core.old.arg[1]);
+        if (resp.oldarg[0]) {
+            PrintAndLogEx(SUCCESS, "\nFound a candidate [ " _YELLOW_("%08X") " ]. Trying to validate", resp.oldarg[1]);
 
-            if (AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, resp.core.old.arg[1])) {
+            if (AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, resp.oldarg[1])) {
                 found = tryDetectModulation();
                 if (found) {
-                    PrintAndLogEx(SUCCESS, "Found valid password: [ " _GREEN_("%08") " ]", resp.core.old.arg[1]);
+                    PrintAndLogEx(SUCCESS, "Found valid password: [ " _GREEN_("%08") " ]", resp.oldarg[1]);
                 } else {
                     PrintAndLogEx(WARNING, "Check pwd failed");
                 }
@@ -2299,7 +2299,7 @@ static int CmdT55xxSetDeviceConfig(const char *Cmd) {
 
     t55xx_config conf = { startgap * 8, writegap * 8, write0 * 8, write1 * 8, readgap * 8 };
 
-    UsbCommand c = {CMD_SET_LF_T55XX_CONFIG, {shall_persist, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_SET_LF_T55XX_CONFIG, {shall_persist, 0, 0}, {{0}}};
     memcpy(c.d.asBytes, &conf, sizeof(t55xx_config));
     clearCommandBuffer();
     SendCommand(&c);
diff --git a/client/cmdlfti.c b/client/cmdlfti.c
index fc468dde0..fffbbfcaf 100644
--- a/client/cmdlfti.c
+++ b/client/cmdlfti.c
@@ -275,7 +275,7 @@ out:
 // read a TI tag and return its ID
 static int CmdTIRead(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
-    UsbCommand c = {CMD_READ_TI_TYPE};
+    UsbCommandOLD c = {CMD_READ_TI_TYPE};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -284,7 +284,7 @@ static int CmdTIRead(const char *Cmd) {
 // write new data to a r/w TI tag
 static int CmdTIWrite(const char *Cmd) {
     int res = 0;
-    UsbCommand c = {CMD_WRITE_TI_TYPE};
+    UsbCommandOLD c = {CMD_WRITE_TI_TYPE};
     res = sscanf(Cmd, "%012" SCNx64 " %012" SCNx64 " %012" SCNx64 "", &c.arg[0], &c.arg[1], &c.arg[2]);
 
     if (res == 2)
diff --git a/client/cmdlfviking.c b/client/cmdlfviking.c
index aa1c6fc3d..06cef1bab 100644
--- a/client/cmdlfviking.c
+++ b/client/cmdlfviking.c
@@ -88,7 +88,7 @@ static int CmdVikingClone(const char *Cmd) {
 
     PrintAndLogEx(INFO, "Preparing to clone Viking tag - ID: %08X, Raw: %08X%08X", id, (uint32_t)(rawID >> 32), (uint32_t)(rawID & 0xFFFFFFFF));
 
-    UsbCommand c = {CMD_VIKING_CLONE_TAG, {rawID >> 32, rawID & 0xFFFFFFFF, Q5}, {{0}}};
+    UsbCommandOLD c = {CMD_VIKING_CLONE_TAG, {rawID >> 32, rawID & 0xFFFFFFFF, Q5}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbReplyNG resp;
@@ -119,7 +119,7 @@ static int CmdVikingSim(const char *Cmd) {
 
     PrintAndLogEx(SUCCESS, "Simulating Viking - ID: %08X, Raw: %08X%08X", id, (uint32_t)(rawID >> 32), (uint32_t)(rawID & 0xFFFFFFFF));
 
-    UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
+    UsbCommandOLD c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
     num_to_bytebits(rawID, size, c.d.asBytes);
     clearCommandBuffer();
     SendCommand(&c);
diff --git a/client/cmdlfvisa2000.c b/client/cmdlfvisa2000.c
index dc0a60975..f7d711856 100644
--- a/client/cmdlfvisa2000.c
+++ b/client/cmdlfvisa2000.c
@@ -167,7 +167,7 @@ static int CmdVisa2kClone(const char *Cmd) {
     print_blocks(blocks, 4);
 
     UsbReplyNG resp;
-    UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
 
     for (uint8_t i = 0; i < 4; i++) {
         c.arg[0] = blocks[i];
@@ -198,7 +198,7 @@ static int CmdVisa2kSim(const char *Cmd) {
 
     PrintAndLogEx(SUCCESS, "Simulating Visa2000 - CardId: %u", id);
 
-    UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
+    UsbCommandOLD c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
 
     uint32_t blocks[3] = { BL0CK1, id, (visa_parity(id) << 4) | visa_chksum(id) };
 
diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index 4efb092ba..fd25acee0 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -315,12 +315,12 @@ static int smart_wait(uint8_t *data, bool silent) {
         return -1;
     }
 
-    uint32_t len = resp.core.old.arg[0];
+    uint32_t len = resp.oldarg[0];
     if (!len) {
         if (!silent) PrintAndLogEx(WARNING, "smart card response failed");
         return -2;
     }
-    memcpy(data, resp.core.old.d.asBytes, len);
+    memcpy(data, resp.data.asBytes, len);
     if (len >= 2) {
         if (!silent) PrintAndLogEx(SUCCESS, "%02X%02X | %s", data[len - 2], data[len - 1], GetAPDUCodeDescription(data[len - 2], data[len - 1]));
     } else {
@@ -347,7 +347,7 @@ static int smart_responseEx(uint8_t *data, bool silent) {
         int len = data[datalen - 1];
         if (!silent) PrintAndLogEx(INFO, "Requesting 0x%02X bytes response", len);
         uint8_t getstatus[] = {0x00, ISO7816_GET_RESPONSE, 0x00, 0x00, len};
-        UsbCommand cStatus = {CMD_SMART_RAW, {SC_RAW, sizeof(getstatus), 0}, {{0}}};
+        UsbCommandOLD cStatus = {CMD_SMART_RAW, {SC_RAW, sizeof(getstatus), 0}, {{0}}};
         memcpy(cStatus.d.asBytes, getstatus, sizeof(getstatus));
         clearCommandBuffer();
         SendCommand(&cStatus);
@@ -454,7 +454,7 @@ static int CmdSmartRaw(const char *Cmd) {
 
     // arg0 = RFU flags
     // arg1 = length
-    UsbCommand c = {CMD_SMART_RAW, {0, hexlen, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_SMART_RAW, {0, hexlen, 0}, {{0}}};
 
     if (active || active_select) {
         c.arg[0] |= SC_CONNECT;
@@ -652,7 +652,7 @@ static int CmdSmartUpgrade(const char *Cmd) {
 
     while (bytes_remaining > 0) {
         uint32_t bytes_in_packet = MIN(USB_CMD_DATA_SIZE, bytes_remaining);
-        UsbCommand c = {CMD_SMART_UPLOAD, {index + bytes_sent, bytes_in_packet, 0}, {{0}}};
+        UsbCommandOLD c = {CMD_SMART_UPLOAD, {index + bytes_sent, bytes_in_packet, 0}, {{0}}};
 
         // Fill usb bytes with 0xFF
         memset(c.d.asBytes, 0xFF, USB_CMD_DATA_SIZE);
@@ -675,7 +675,7 @@ static int CmdSmartUpgrade(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "Sim module firmware updating,  don\'t turn off your PM3!");
 
     // trigger the firmware upgrade
-    UsbCommand c = {CMD_SMART_UPGRADE, {firmware_size, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_SMART_UPGRADE, {firmware_size, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbReplyNG resp;
@@ -683,7 +683,7 @@ static int CmdSmartUpgrade(const char *Cmd) {
         PrintAndLogEx(WARNING, "timeout while waiting for reply.");
         return 1;
     }
-    if ((resp.core.old.arg[0] & 0xFF)) {
+    if ((resp.oldarg[0] & 0xFF)) {
         PrintAndLogEx(SUCCESS, "Sim module firmware upgrade " _GREEN_("successful"));
         PrintAndLogEx(SUCCESS, "\n run " _YELLOW_("`hw status`") " to validate the fw version ");
     } else {
@@ -714,7 +714,7 @@ static int CmdSmartInfo(const char *Cmd) {
     //Validations
     if (errors) return usage_sm_info();
 
-    UsbCommand c = {CMD_SMART_ATR, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_SMART_ATR, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbReplyNG resp;
@@ -723,14 +723,14 @@ static int CmdSmartInfo(const char *Cmd) {
         return 1;
     }
 
-    uint8_t isok = resp.core.old.arg[0] & 0xFF;
+    uint8_t isok = resp.oldarg[0] & 0xFF;
     if (!isok) {
         if (!silent) PrintAndLogEx(WARNING, "smart card select failed");
         return 1;
     }
 
     smart_card_atr_t card;
-    memcpy(&card, (smart_card_atr_t *)resp.core.old.d.asBytes, sizeof(smart_card_atr_t));
+    memcpy(&card, (smart_card_atr_t *)resp.data.asBytes, sizeof(smart_card_atr_t));
 
     // print header
     PrintAndLogEx(INFO, "--- Smartcard Information ---------");
@@ -789,7 +789,7 @@ static int CmdSmartReader(const char *Cmd) {
     //Validations
     if (errors) return usage_sm_reader();
 
-    UsbCommand c = {CMD_SMART_ATR, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_SMART_ATR, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbReplyNG resp;
@@ -798,13 +798,13 @@ static int CmdSmartReader(const char *Cmd) {
         return 1;
     }
 
-    uint8_t isok = resp.core.old.arg[0] & 0xFF;
+    uint8_t isok = resp.oldarg[0] & 0xFF;
     if (!isok) {
         if (!silent) PrintAndLogEx(WARNING, "smart card select failed");
         return 1;
     }
     smart_card_atr_t card;
-    memcpy(&card, (smart_card_atr_t *)resp.core.old.d.asBytes, sizeof(smart_card_atr_t));
+    memcpy(&card, (smart_card_atr_t *)resp.data.asBytes, sizeof(smart_card_atr_t));
 
     PrintAndLogEx(INFO, "ISO7816-3 ATR : %s", sprint_hex(card.atr, card.atr_len));
     return 0;
@@ -835,7 +835,7 @@ static int CmdSmartSetClock(const char *Cmd) {
     //Validations
     if (errors || cmdp == 0) return usage_sm_setclock();
 
-    UsbCommand c = {CMD_SMART_SETCLOCK, {clock1, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_SMART_SETCLOCK, {clock1, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbReplyNG resp;
@@ -844,7 +844,7 @@ static int CmdSmartSetClock(const char *Cmd) {
         return 1;
     }
 
-    uint8_t isok = resp.core.old.arg[0] & 0xFF;
+    uint8_t isok = resp.oldarg[0] & 0xFF;
     if (!isok) {
         PrintAndLogEx(WARNING, "smart card set clock failed");
         return 1;
@@ -887,7 +887,7 @@ static void smart_brute_prim() {
 
     PrintAndLogEx(INFO, "Reading primitives");
 
-    UsbCommand c = {CMD_SMART_RAW, {SC_RAW_T0, 5, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_SMART_RAW, {SC_RAW_T0, 5, 0}, {{0}}};
 
     for (int i = 0; i < sizeof(get_card_data); i += 5) {
 
@@ -917,7 +917,7 @@ static int smart_brute_sfi(bool decodeTLV) {
     int len;
     // READ RECORD
     uint8_t READ_RECORD[] = {0x00, 0xB2, 0x00, 0x00, 0x00};
-    UsbCommand c = {CMD_SMART_RAW, {SC_RAW_T0, sizeof(READ_RECORD), 0}, {{0}}};
+    UsbCommandOLD c = {CMD_SMART_RAW, {SC_RAW_T0, sizeof(READ_RECORD), 0}, {{0}}};
 
     PrintAndLogEx(INFO, "Start SFI brute forcing");
 
@@ -984,7 +984,7 @@ static void smart_brute_options(bool decodeTLV) {
     uint8_t GET_PROCESSING_OPTIONS[] = {0x80, 0xA8, 0x00, 0x00, 0x02, 0x83, 0x00, 0x00};
 
     // Get processing options command
-    UsbCommand c = {CMD_SMART_RAW, {SC_RAW_T0, sizeof(GET_PROCESSING_OPTIONS), 0}, {{0}}};
+    UsbCommandOLD c = {CMD_SMART_RAW, {SC_RAW_T0, sizeof(GET_PROCESSING_OPTIONS), 0}, {{0}}};
     memcpy(c.d.asBytes, GET_PROCESSING_OPTIONS, sizeof(GET_PROCESSING_OPTIONS));
     clearCommandBuffer();
     SendCommand(&c);
@@ -1041,7 +1041,7 @@ static int CmdSmartBruteforceSFI(const char *Cmd) {
 //  uint8_t VERIFY[] = {0x00, 0x20, 0x00, 0x80};
 
     // Select AID command
-    UsbCommand cAid = {CMD_SMART_RAW, {SC_RAW_T0, 0, 0}, {{0}}};
+    UsbCommandOLD cAid = {CMD_SMART_RAW, {SC_RAW_T0, 0, 0}, {{0}}};
 
     PrintAndLogEx(INFO, "Importing AID list");
     json_t *root = NULL;
@@ -1178,7 +1178,7 @@ int ExchangeAPDUSC(uint8_t *datain, int datainlen, bool activateCard, bool leave
 
     PrintAndLogEx(DEBUG, "APDU SC");
 
-    UsbCommand c = {CMD_SMART_RAW, {SC_RAW_T0, datainlen, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_SMART_RAW, {SC_RAW_T0, datainlen, 0}, {{0}}};
     if (activateCard) {
         c.arg[0] |= SC_SELECT | SC_CONNECT;
     }
@@ -1194,7 +1194,7 @@ int ExchangeAPDUSC(uint8_t *datain, int datainlen, bool activateCard, bool leave
 
     // retry
     if (len > 1 && dataout[len - 2] == 0x6c && datainlen > 4) {
-        UsbCommand c2 = {CMD_SMART_RAW, {SC_RAW_T0, datainlen, 0}, {{0}}};
+        UsbCommandOLD c2 = {CMD_SMART_RAW, {SC_RAW_T0, datainlen, 0}, {{0}}};
         memcpy(c2.d.asBytes, datain, 5);
 
         // transfer length via T=0
@@ -1214,7 +1214,7 @@ bool smart_select(bool silent, smart_card_atr_t *atr) {
     if (atr)
         memset(atr, 0, sizeof(smart_card_atr_t));
 
-    UsbCommand c = {CMD_SMART_ATR, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_SMART_ATR, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbReplyNG resp;
@@ -1223,14 +1223,14 @@ bool smart_select(bool silent, smart_card_atr_t *atr) {
         return false;
     }
 
-    uint8_t isok = resp.core.old.arg[0] & 0xFF;
+    uint8_t isok = resp.oldarg[0] & 0xFF;
     if (!isok) {
         if (!silent) PrintAndLogEx(WARNING, "smart card select failed");
         return false;
     }
 
     smart_card_atr_t card;
-    memcpy(&card, (smart_card_atr_t *)resp.core.old.d.asBytes, sizeof(smart_card_atr_t));
+    memcpy(&card, (smart_card_atr_t *)resp.data.asBytes, sizeof(smart_card_atr_t));
 
     if (atr)
         memcpy(atr, &card, sizeof(smart_card_atr_t));
diff --git a/client/cmdtrace.c b/client/cmdtrace.c
index c5420f4fc..e8e8cd498 100644
--- a/client/cmdtrace.c
+++ b/client/cmdtrace.c
@@ -678,7 +678,7 @@ int CmdTraceList(const char *Cmd) {
             return 1;
         }
 
-        traceLen = response.core.old.arg[2];
+        traceLen = response.oldarg[2];
         if (traceLen > USB_CMD_DATA_SIZE) {
             uint8_t *p = realloc(trace, traceLen);
             if (p == NULL) {
diff --git a/client/comms.c b/client/comms.c
index 5f67548f6..571a1d8fc 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -25,7 +25,7 @@ static pthread_t USB_communication_thread;
 //static pthread_t FPC_communication_thread;
 
 // Transmit buffer.
-static UsbCommand txBuffer;
+static UsbCommandOLD txBuffer;
 static UsbCommandNG txBufferNG;
 size_t txBufferNGLen;
 static bool txBuffer_pending = false;
@@ -57,7 +57,7 @@ bool IsOffline() {
     return offline;
 }
 
-void SendCommand(UsbCommand *c) {
+void SendCommand(UsbCommandOLD *c) {
 
 #ifdef COMMS_DEBUG
     PrintAndLogEx(NORMAL, "Sending %d bytes | cmd %04x\n", sizeof(UsbCommand), c->cmd);
@@ -99,12 +99,12 @@ void SendCommandNG(uint16_t cmd, uint8_t *data, size_t len) {
         PrintAndLogEx(NORMAL, "Sending bytes to proxmark failed - offline");
         return;
     }
-    if (len > USB_DATANG_SIZE) {
+    if (len > USB_CMD_DATA_SIZE) {
         PrintAndLogEx(WARNING, "Sending %d bytes of payload is too much, abort", len);
         return;
     }
 
-    UsbCommandNGPostamble *tx_post = (UsbCommandNGPostamble *)((uint8_t *)&txBufferNG + sizeof(UsbCommandNGPreamble) + sizeof(UsbPacketNGCore) - USB_DATANG_SIZE + len);
+    UsbCommandNGPostamble *tx_post = (UsbCommandNGPostamble *)((uint8_t *)&txBufferNG + sizeof(UsbCommandNGPreamble) + sizeof(UsbPacketNGCore) - USB_CMD_DATA_SIZE + len);
 
     pthread_mutex_lock(&txBufferMutex);
     /**
@@ -121,9 +121,9 @@ void SendCommandNG(uint16_t cmd, uint8_t *data, size_t len) {
     txBufferNG.core.ng.cmd = cmd;
     memcpy(&txBufferNG.core.ng.data, data, len);
     uint8_t first, second;
-    compute_crc(CRC_14443_A, (uint8_t *)&txBufferNG, sizeof(UsbCommandNGPreamble) + sizeof(UsbPacketNGCore) - USB_DATANG_SIZE + len, &first, &second);
+    compute_crc(CRC_14443_A, (uint8_t *)&txBufferNG, sizeof(UsbCommandNGPreamble) + sizeof(UsbPacketNGCore) - USB_CMD_DATA_SIZE + len, &first, &second);
     tx_post->crc = (first << 8) + second;
-    txBufferNGLen = sizeof(UsbCommandNGPreamble) + sizeof(UsbPacketNGCore) - USB_DATANG_SIZE + len + sizeof(UsbCommandNGPostamble);
+    txBufferNGLen = sizeof(UsbCommandNGPreamble) + sizeof(UsbPacketNGCore) - USB_CMD_DATA_SIZE + len + sizeof(UsbCommandNGPostamble);
     txBuffer_pending = true;
 
     // tell communication thread that a new command can be send
@@ -195,35 +195,19 @@ static int getReply(UsbReplyNG *packet) {
 //-----------------------------------------------------------------------------
 static void UsbReplyReceived(UsbReplyNG *packet) {
 
-    uint64_t cmd; // To accommodate old cmd, can be reduced to uint16_t once all old cmds are gone.
+//DOEGOX
+//PrintAndLogEx(NORMAL, "RECV %s magic %08x length %04x status %04x crc %04x cmd %04x",
+//              packet->ng ? "NG" : "OLD", packet->magic, packet->length, packet->status, packet->crc, packet->cmd);
 
-
-    if (packet->ng) {
-//        PrintAndLogEx(NORMAL, "RECV NG magic %08x length %04x status %04x crc %04x cmd %04x", packet->magic, packet->length, packet->status, packet->crc, packet->core.ng.cmd);
-        cmd = packet->core.ng.cmd;
-    } else {
-//        PrintAndLogEx(NORMAL, "RECV OLD magic %08x length %04x status %04x crc %04x cmd %04x", packet->magic, packet->length, packet->status, packet->crc, packet->core.old.cmd);
-        cmd = packet->core.old.cmd;
-    }
-
-
-
-    // For cmd handlers still using old cmd format:
-    if (packet->ng) {
-        cmd = packet->core.ng.cmd;
-    } else {
-        cmd = packet->core.old.cmd;
-    }
-
-    switch (cmd) {
+    switch (packet->cmd) {
         // First check if we are handling a debug message
         case CMD_DEBUG_PRINT_STRING: {
 
             char s[USB_CMD_DATA_SIZE + 1];
             memset(s, 0x00, sizeof(s));
-            size_t len = MIN(packet->core.old.arg[0], USB_CMD_DATA_SIZE);
-            memcpy(s, packet->core.old.d.asBytes, len);
-            uint64_t flag = packet->core.old.arg[1];
+            size_t len = MIN(packet->oldarg[0], USB_CMD_DATA_SIZE);
+            memcpy(s, packet->data.asBytes, len);
+            uint64_t flag = packet->oldarg[1];
 
             switch (flag) {
                 case FLAG_RAWPRINT:
@@ -246,7 +230,7 @@ static void UsbReplyReceived(UsbReplyNG *packet) {
             break;
         }
         case CMD_DEBUG_PRINT_INTEGERS: {
-            PrintAndLogEx(NORMAL, "#db# %" PRIx64 ", %" PRIx64 ", %" PRIx64 "", packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2]);
+            PrintAndLogEx(NORMAL, "#db# %" PRIx64 ", %" PRIx64 ", %" PRIx64 "", packet->oldarg[0], packet->oldarg[1], packet->oldarg[2]);
             break;
         }
         // iceman:  hw status - down the path on device, runs printusbspeed which starts sending a lot of
@@ -297,6 +281,7 @@ __attribute__((force_align_arg_pointer))
     size_t rxlen;
 
     UsbReplyNG rx;
+    UsbReplyNGRaw rx_raw;
     //int counter_to_offline = 0;
 
 #if defined(__MACH__) && defined(__APPLE__)
@@ -307,25 +292,34 @@ __attribute__((force_align_arg_pointer))
         rxlen = 0;
         bool ACK_received = false;
         bool error = false;
-        if (uart_receive(sp, (uint8_t *)&rx, sizeof(UsbReplyNGPreamble), &rxlen) && (rxlen == sizeof(UsbReplyNGPreamble))) {
+        if (uart_receive(sp, (uint8_t *)&rx_raw.pre, sizeof(UsbReplyNGPreamble), &rxlen) && (rxlen == sizeof(UsbReplyNGPreamble))) {
+            rx.magic = rx_raw.pre.magic;
+            rx.length = rx_raw.pre.length;
+            rx.status = rx_raw.pre.status;
+            rx.cmd = rx_raw.pre.cmd;
             if (rx.magic == USB_REPLYNG_PREAMBLE_MAGIC) { // New style NG reply
-                if (rx.length > USB_DATANG_SIZE) {
+                if (rx.length > USB_CMD_DATA_SIZE) {
                     PrintAndLogEx(WARNING, "Received packet frame with incompatible length: 0x%04x", rx.length);
                     error = true;
                 }
-                if (!error) { // Get the core and variable length payload
-                    if ((!uart_receive(sp, (uint8_t *)&rx.core, sizeof(UsbPacketNGCore) - USB_DATANG_SIZE + rx.length, &rxlen)) || (rxlen != sizeof(UsbPacketNGCore) - USB_DATANG_SIZE + rx.length)) {
+                if ((!error) && (rx.length > 0)) { // Get the variable length payload
+                    if ((!uart_receive(sp, (uint8_t *)&rx_raw.data, rx.length, &rxlen)) || (rxlen != rx.length)) {
                         PrintAndLogEx(WARNING, "Received packet frame error variable part too short? %d/%d", rxlen, rx.length);
                         error = true;
+                    } else {
+                        memcpy(&rx.data, &rx_raw.data, rx.length);
                     }
                 }
                 if (!error) {                        // Get the postamble
-                    if ((!uart_receive(sp, (uint8_t *)&rx.crc, sizeof(UsbReplyNGPostamble), &rxlen)) || (rxlen != sizeof(UsbReplyNGPostamble))) {
+                    if ((!uart_receive(sp, (uint8_t *)&rx_raw.post, sizeof(UsbReplyNGPostamble), &rxlen)) || (rxlen != sizeof(UsbReplyNGPostamble))) {
                         PrintAndLogEx(WARNING, "Received packet frame error fetching postamble");
                         error = true;
                     }
+                }
+                if (!error) {                        // Check CRC
+                    rx.crc = rx_raw.post.crc;
                     uint8_t first, second;
-                    compute_crc(CRC_14443_A, (uint8_t *)&rx, sizeof(UsbReplyNGPreamble) + sizeof(UsbPacketNGCore) - USB_DATANG_SIZE + rx.length, &first, &second);
+                    compute_crc(CRC_14443_A, (uint8_t *)&rx_raw, sizeof(UsbReplyNGPreamble) + rx.length, &first, &second);
                     if ((first << 8) + second != rx.crc) {
                         PrintAndLogEx(WARNING, "Received packet frame CRC error %02X%02X <> %04X", first, second, rx.crc);
                         error = true;
@@ -336,27 +330,31 @@ __attribute__((force_align_arg_pointer))
                     rx.ng = true;
                     UsbReplyReceived(&rx);
 //TODO DOEGOX NG don't send ACK anymore but reply with the corresponding cmd, still things seem to work fine...
-                    if (rx.core.ng.cmd == CMD_ACK) {
+                    if (rx.cmd == CMD_ACK) {
                         ACK_received = true;
                     }
                 }
             } else {                               // Old style reply
-                uint8_t tmp[sizeof(UsbReplyNGPreamble)];
-                memcpy(tmp, &rx, sizeof(UsbReplyNGPreamble));
-                memcpy(&rx.core.old, tmp, sizeof(UsbReplyNGPreamble));
-                if ((!uart_receive(sp, ((uint8_t *)&rx.core.old) + sizeof(UsbReplyNGPreamble), sizeof(UsbCommand) - sizeof(UsbReplyNGPreamble), &rxlen)) || (rxlen != sizeof(UsbCommand) - sizeof(UsbReplyNGPreamble))) {
-                    PrintAndLogEx(WARNING, "Received packet frame error var part too short? %d/%d", rxlen, sizeof(UsbCommand) - sizeof(UsbReplyNGPreamble));
+                UsbCommandOLD rx_old;
+                memcpy(&rx_old, &rx_raw.pre, sizeof(UsbReplyNGPreamble));
+                if ((!uart_receive(sp, ((uint8_t *)&rx_old) + sizeof(UsbReplyNGPreamble), sizeof(UsbCommandOLD) - sizeof(UsbReplyNGPreamble), &rxlen)) || (rxlen != sizeof(UsbCommandOLD) - sizeof(UsbReplyNGPreamble))) {
+                    PrintAndLogEx(WARNING, "Received packet frame error var part too short? %d/%d", rxlen, sizeof(UsbCommandOLD) - sizeof(UsbReplyNGPreamble));
                     error = true;
                 }
                 if (!error) {
 //                    PrintAndLogEx(NORMAL, "Received reply old full !!");
                     rx.ng = false;
                     rx.magic = 0;
-                    rx.length = USB_CMD_DATA_SIZE;
                     rx.status = 0;
                     rx.crc = 0;
+                    rx.cmd = rx_old.cmd;
+                    rx.oldarg[0] = rx_old.arg[0];
+                    rx.oldarg[1] = rx_old.arg[1];
+                    rx.oldarg[2] = rx_old.arg[2];
+                    rx.length = USB_CMD_DATA_SIZE;
+                    memcpy(&rx.data, &rx_old.d, rx.length);
                     UsbReplyReceived(&rx);
-                    if (rx.core.old.cmd == CMD_ACK) {
+                    if (rx.cmd == CMD_ACK) {
                         ACK_received = true;
                     }
                 }
@@ -388,7 +386,7 @@ __attribute__((force_align_arg_pointer))
                 }
                 txBufferNGLen = 0;
             } else {
-                if (!uart_send(sp, (uint8_t *) &txBuffer, sizeof(UsbCommand))) {
+                if (!uart_send(sp, (uint8_t *) &txBuffer, sizeof(UsbCommandOLD))) {
                     //counter_to_offline++;
                     PrintAndLogEx(WARNING, "sending bytes to Proxmark3 device" _RED_("failed"));
                 }
@@ -462,10 +460,10 @@ bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode,
 int TestProxmark(void) {
     clearCommandBuffer();
     UsbReplyNG resp;
-    UsbCommand c = {CMD_PING, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_PING, {0, 0, 0}, {{0}}};
     SendCommand(&c);
     if (WaitForResponseTimeout(CMD_ACK, &resp, 5000)) {
-        PrintAndLogEx(INFO, "Communicating with PM3 over %s.", resp.core.old.arg[0] == 1 ? "FPC" : "USB");
+        PrintAndLogEx(INFO, "Communicating with PM3 over %s.", resp.oldarg[0] == 1 ? "FPC" : "USB");
         return 1;
     } else {
         return 0;
@@ -526,9 +524,7 @@ bool WaitForResponseTimeoutW(uint32_t cmd, UsbReplyNG *response, size_t ms_timeo
     while (true) {
 
         while (getReply(response)) {
-            if (cmd == CMD_UNKNOWN || (response->ng && response->core.ng.cmd == cmd))
-                return true;
-            if (cmd == CMD_UNKNOWN || ((!response->ng) && response->core.old.cmd == cmd))
+            if (cmd == CMD_UNKNOWN || response->cmd == cmd)
                 return true;
         }
 
@@ -580,22 +576,22 @@ bool GetFromDevice(DeviceMemType_t memtype, uint8_t *dest, uint32_t bytes, uint3
 
     switch (memtype) {
         case BIG_BUF: {
-            UsbCommand c = {CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K, {start_index, bytes, 0}, {{0}}};
+            UsbCommandOLD c = {CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K, {start_index, bytes, 0}, {{0}}};
             SendCommand(&c);
             return dl_it(dest, bytes, start_index, response, ms_timeout, show_warning, CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K);
         }
         case BIG_BUF_EML: {
-            UsbCommand c = {CMD_DOWNLOAD_EML_BIGBUF, {start_index, bytes, 0}, {{0}}};
+            UsbCommandOLD c = {CMD_DOWNLOAD_EML_BIGBUF, {start_index, bytes, 0}, {{0}}};
             SendCommand(&c);
             return dl_it(dest, bytes, start_index, response, ms_timeout, show_warning, CMD_DOWNLOADED_EML_BIGBUF);
         }
         case FLASH_MEM: {
-            UsbCommand c = {CMD_FLASHMEM_DOWNLOAD, {start_index, bytes, 0}, {{0}}};
+            UsbCommandOLD c = {CMD_FLASHMEM_DOWNLOAD, {start_index, bytes, 0}, {{0}}};
             SendCommand(&c);
             return dl_it(dest, bytes, start_index, response, ms_timeout, show_warning, CMD_FLASHMEM_DOWNLOADED);
         }
         case SIM_MEM: {
-            //UsbCommand c = {CMD_DOWNLOAD_SIM_MEM, {start_index, bytes, 0}, {{0}}};
+            //UsbCommandOLD c = {CMD_DOWNLOAD_SIM_MEM, {start_index, bytes, 0}, {{0}}};
             //SendCommand(&c);
             //return dl_it(dest, bytes, start_index, response, ms_timeout, show_warning, CMD_DOWNLOADED_SIMMEM);
             return false;
@@ -617,11 +613,11 @@ static bool dl_it(uint8_t *dest, uint32_t bytes, uint32_t start_index, UsbReplyN
             // arg0 = offset in transfer. Startindex of this chunk
             // arg1 = length bytes to transfer
             // arg2 = bigbuff tracelength (?)
-            if (response->core.old.cmd == rec_cmd) {
+            if (response->cmd == rec_cmd) {
 
-                uint32_t offset = response->core.old.arg[0];
-                uint32_t copy_bytes = MIN(bytes - bytes_completed, response->core.old.arg[1]);
-                //uint32_t tracelen = response->core.old.arg[2];
+                uint32_t offset = response->oldarg[0];
+                uint32_t copy_bytes = MIN(bytes - bytes_completed, response->oldarg[1]);
+                //uint32_t tracelen = response->oldarg[2];
 
                 // extended bounds check1.  upper limit is USB_CMD_DATA_SIZE
                 // shouldn't happen
@@ -633,9 +629,9 @@ static bool dl_it(uint8_t *dest, uint32_t bytes, uint32_t start_index, UsbReplyN
                     break;
                 }
 
-                memcpy(dest + offset, response->core.old.d.asBytes, copy_bytes);
+                memcpy(dest + offset, response->data.asBytes, copy_bytes);
                 bytes_completed += copy_bytes;
-            } else if (response->core.old.cmd == CMD_ACK) {
+            } else if (response->cmd == CMD_ACK) {
                 return true;
             }
         }
diff --git a/client/comms.h b/client/comms.h
index 37ff500d4..6410eadfa 100644
--- a/client/comms.h
+++ b/client/comms.h
@@ -49,7 +49,7 @@ void SetOffline(bool value);
 bool IsOffline(void);
 
 void *uart_receiver(void *targ);
-void SendCommand(UsbCommand *c);
+void SendCommand(UsbCommandOLD *c);
 void SendCommandNG(uint16_t cmd, uint8_t *data, size_t len);
 void clearCommandBuffer(void);
 
diff --git a/client/flash.c b/client/flash.c
index 85f427630..c2d5aa159 100644
--- a/client/flash.c
+++ b/client/flash.c
@@ -259,7 +259,7 @@ fail:
 
 // Get the state of the proxmark, backwards compatible
 static int get_proxmark_state(uint32_t *state) {
-    UsbCommand c = {CMD_DEVICE_INFO};
+    UsbCommandOLD c = {CMD_DEVICE_INFO};
     SendCommand(&c);
     UsbReplyNG resp;
     WaitForResponse(CMD_UNKNOWN, &resp);  // wait for any response. No timeout.
@@ -269,7 +269,7 @@ static int get_proxmark_state(uint32_t *state) {
     // 2. The old os code will respond with CMD_DEBUG_PRINT_STRING and "unknown command"
     // 3. The new bootrom and os codes will respond with CMD_DEVICE_INFO and flags
 
-    switch (resp.core.old.cmd) {
+    switch (resp.cmd) {
         case CMD_ACK:
             *state = DEVICE_INFO_FLAG_CURRENT_MODE_BOOTROM;
             break;
@@ -277,10 +277,10 @@ static int get_proxmark_state(uint32_t *state) {
             *state = DEVICE_INFO_FLAG_CURRENT_MODE_OS;
             break;
         case CMD_DEVICE_INFO:
-            *state = resp.core.old.arg[0];
+            *state = resp.oldarg[0];
             break;
         default:
-            fprintf(stderr, _RED_("Error:") "Couldn't get Proxmark3 state, bad response type: 0x%04" PRIx64 "\n", resp.core.old.cmd);
+            fprintf(stderr, _RED_("Error:") "Couldn't get Proxmark3 state, bad response type: 0x%04x\n", resp.cmd);
             return -1;
             break;
     }
@@ -300,7 +300,7 @@ static int enter_bootloader(char *serial_port_name) {
 
     if (state & DEVICE_INFO_FLAG_CURRENT_MODE_OS) {
         fprintf(stdout, _BLUE_("Entering bootloader...") "\n");
-        UsbCommand c;
+        UsbCommandOLD c;
         memset(&c, 0, sizeof(c));
 
         if ((state & DEVICE_INFO_FLAG_BOOTROM_PRESENT)
@@ -338,10 +338,10 @@ static int enter_bootloader(char *serial_port_name) {
 static int wait_for_ack(UsbReplyNG *ack) {
     WaitForResponse(CMD_UNKNOWN, ack);
 
-    if (ack->core.old.cmd != CMD_ACK) {
-        printf("Error: Unexpected reply 0x%04" PRIx64 " %s (expected ACK)\n",
-               ack->core.old.cmd,
-               (ack->core.old.cmd == CMD_NACK) ? "NACK" : ""
+    if (ack->cmd != CMD_ACK) {
+        printf("Error: Unexpected reply 0x%04x %s (expected ACK)\n",
+               ack->cmd,
+               (ack->cmd == CMD_NACK) ? "NACK" : ""
               );
         return -1;
     }
@@ -361,7 +361,7 @@ int flash_start_flashing(int enable_bl_writes, char *serial_port_name) {
     if (state & DEVICE_INFO_FLAG_UNDERSTANDS_START_FLASH) {
         // This command is stupid. Why the heck does it care which area we're
         // flashing, as long as it's not the bootloader area? The mind boggles.
-        UsbCommand c = {CMD_START_FLASH};
+        UsbCommandOLD c = {CMD_START_FLASH};
         UsbReplyNG resp;
 
         if (enable_bl_writes) {
@@ -386,16 +386,16 @@ static int write_block(uint32_t address, uint8_t *data, uint32_t length) {
     uint8_t block_buf[BLOCK_SIZE];
     memset(block_buf, 0xFF, BLOCK_SIZE);
     memcpy(block_buf, data, length);
-    UsbCommand c = {CMD_FINISH_WRITE, {address, 0, 0}};
+    UsbCommandOLD c = {CMD_FINISH_WRITE, {address, 0, 0}};
     UsbReplyNG resp;
     memcpy(c.d.asBytes, block_buf, length);
     SendCommand(&c);
     int ret = wait_for_ack(&resp);
-    if (ret && resp.core.old.arg[0]) {
-        uint32_t lock_bits = resp.core.old.arg[0] >> 16;
-        bool lock_error = resp.core.old.arg[0] & AT91C_MC_LOCKE;
-        bool prog_error = resp.core.old.arg[0] & AT91C_MC_PROGE;
-        bool security_bit = resp.core.old.arg[0] & AT91C_MC_SECURITY;
+    if (ret && resp.oldarg[0]) {
+        uint32_t lock_bits = resp.oldarg[0] >> 16;
+        bool lock_error = resp.oldarg[0] & AT91C_MC_LOCKE;
+        bool prog_error = resp.oldarg[0] & AT91C_MC_PROGE;
+        bool security_bit = resp.oldarg[0] & AT91C_MC_SECURITY;
         printf("%s", lock_error ? "       Lock Error\n" : "");
         printf("%s", prog_error ? "       Invalid Command or bad Keyword\n" : "");
         printf("%s", security_bit ? "       Security Bit is set!\n" : "");
@@ -459,7 +459,7 @@ void flash_free(flash_file_t *ctx) {
 
 // just reset the unit
 int flash_stop_flashing(void) {
-    UsbCommand c = {CMD_HARDWARE_RESET};
+    UsbCommandOLD c = {CMD_HARDWARE_RESET};
     SendCommand(&c);
     msleep(100);
     return 0;
diff --git a/client/flasher.c b/client/flasher.c
index ad17fd080..57d6c32f8 100644
--- a/client/flasher.c
+++ b/client/flasher.c
@@ -20,9 +20,9 @@
 
 #define MAX_FILES 4
 
-void cmd_debug(UsbCommand *c) {
+void cmd_debug(UsbCommandOLD *c) {
     //  Debug
-    printf("UsbCommand length[len=%zu]\n", sizeof(UsbCommand));
+    printf("UsbCommandOLD length[len=%zu]\n", sizeof(UsbCommandOLD));
     printf("  cmd[len=%zu]: %016" PRIx64"\n", sizeof(c->cmd), c->cmd);
     printf(" arg0[len=%zu]: %016" PRIx64"\n", sizeof(c->arg[0]), c->arg[0]);
     printf(" arg1[len=%zu]: %016" PRIx64"\n", sizeof(c->arg[1]), c->arg[1]);
diff --git a/client/mifare/mifarehost.c b/client/mifare/mifarehost.c
index 87cb94c3a..19bad2ba8 100644
--- a/client/mifare/mifarehost.c
+++ b/client/mifare/mifarehost.c
@@ -16,7 +16,7 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
     uint64_t par_list = 0, ks_list = 0;
     uint64_t *keylist = NULL, *last_keylist = NULL;
 
-    UsbCommand c = {CMD_READER_MIFARE, {true, blockno, key_type}, {{0}}};
+    UsbCommandOLD c = {CMD_READER_MIFARE, {true, blockno, key_type}, {{0}}};
 
     // message
     PrintAndLogEx(NORMAL, "--------------------------------------------------------------------------------\n");
@@ -47,16 +47,16 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
 
             UsbReplyNG resp;
             if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
-                int16_t isOK  = resp.core.old.arg[0];
+                int16_t isOK  = resp.oldarg[0];
                 if (isOK < 0)
                     return isOK;
 
-                uid = (uint32_t)bytes_to_num(resp.core.old.d.asBytes +  0, 4);
-                nt = (uint32_t)bytes_to_num(resp.core.old.d.asBytes +  4, 4);
-                par_list = bytes_to_num(resp.core.old.d.asBytes +  8, 8);
-                ks_list = bytes_to_num(resp.core.old.d.asBytes +  16, 8);
-                nr = (uint32_t)bytes_to_num(resp.core.old.d.asBytes + 24, 4);
-                ar = (uint32_t)bytes_to_num(resp.core.old.d.asBytes + 28, 4);
+                uid = (uint32_t)bytes_to_num(resp.data.asBytes +  0, 4);
+                nt = (uint32_t)bytes_to_num(resp.data.asBytes +  4, 4);
+                par_list = bytes_to_num(resp.data.asBytes +  8, 8);
+                ks_list = bytes_to_num(resp.data.asBytes +  16, 8);
+                nr = (uint32_t)bytes_to_num(resp.data.asBytes + 24, 4);
+                ar = (uint32_t)bytes_to_num(resp.data.asBytes + 28, 4);
                 break;
             }
         }
@@ -123,14 +123,14 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
 }
 int mfCheckKeys(uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t keycnt, uint8_t *keyBlock, uint64_t *key) {
     *key = -1;
-    UsbCommand c = {CMD_MIFARE_CHKKEYS, { (blockNo | (keyType << 8)), clear_trace, keycnt}, {{0}}};
+    UsbCommandOLD c = {CMD_MIFARE_CHKKEYS, { (blockNo | (keyType << 8)), clear_trace, keycnt}, {{0}}};
     memcpy(c.d.asBytes, keyBlock, 6 * keycnt);
     clearCommandBuffer();
     SendCommand(&c);
     UsbReplyNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) return 1;
-    if ((resp.core.old.arg[0] & 0xff) != 0x01) return 2;
-    *key = bytes_to_num(resp.core.old.d.asBytes, 6);
+    if ((resp.oldarg[0] & 0xff) != 0x01) return 2;
+    *key = bytes_to_num(resp.data.asBytes, 6);
     return 0;
 }
 
@@ -145,7 +145,7 @@ int mfCheckKeys_fast(uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk,
     uint32_t timeout = 0;
 
     // send keychunk
-    UsbCommand c = {CMD_MIFARE_CHKKEYS_FAST, { (sectorsCnt | (firstChunk << 8) | (lastChunk << 12)), ((use_flashmemory << 8) | strategy), size}, {{0}}};
+    UsbCommandOLD c = {CMD_MIFARE_CHKKEYS_FAST, { (sectorsCnt | (firstChunk << 8) | (lastChunk << 12)), ((use_flashmemory << 8) | strategy), size}, {{0}}};
     memcpy(c.d.asBytes, keyBlock, 6 * size);
     clearCommandBuffer();
     SendCommand(&c);
@@ -166,7 +166,7 @@ int mfCheckKeys_fast(uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk,
     t2 = msclock() - t2;
 
     // time to convert the returned data.
-    uint8_t curr_keys = resp.core.old.arg[0];
+    uint8_t curr_keys = resp.oldarg[0];
 
     PrintAndLogEx(SUCCESS, "\nChunk: %.1fs | found %u/%u keys (%u)", (float)(t2 / 1000.0), curr_keys, (sectorsCnt << 1), size);
 
@@ -177,8 +177,8 @@ int mfCheckKeys_fast(uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk,
         uint8_t arr[80];
         uint64_t foo = 0;
         uint16_t bar = 0;
-        foo = bytes_to_num(resp.core.old.d.asBytes + 480, 8);
-        bar = (resp.core.old.d.asBytes[489]  << 8 | resp.core.old.d.asBytes[488]);
+        foo = bytes_to_num(resp.data.asBytes + 480, 8);
+        bar = (resp.data.asBytes[489]  << 8 | resp.data.asBytes[488]);
 
         for (uint8_t i = 0; i < 64; i++)
             arr[i] = (foo >> i) & 0x1;
@@ -190,7 +190,7 @@ int mfCheckKeys_fast(uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk,
         icesector_t *tmp = calloc(sectorsCnt, sizeof(icesector_t));
         if (tmp == NULL)
             return 1;
-        memcpy(tmp, resp.core.old.d.asBytes, sectorsCnt * sizeof(icesector_t));
+        memcpy(tmp, resp.data.asBytes, sectorsCnt * sizeof(icesector_t));
 
         for (int i = 0; i < sectorsCnt; i++) {
             // key A
@@ -297,23 +297,23 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo,
     StateList_t statelists[2];
     struct Crypto1State *p1, *p2, *p3, *p4;
 
-    UsbCommand c = {CMD_MIFARE_NESTED, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, calibrate}, {{0}}};
+    UsbCommandOLD c = {CMD_MIFARE_NESTED, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, calibrate}, {{0}}};
     memcpy(c.d.asBytes, key, 6);
     clearCommandBuffer();
     SendCommand(&c);
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return -1;
 
     // error during nested
-    if (resp.core.old.arg[0]) return resp.core.old.arg[0];
+    if (resp.oldarg[0]) return resp.oldarg[0];
 
-    memcpy(&uid, resp.core.old.d.asBytes, 4);
+    memcpy(&uid, resp.data.asBytes, 4);
 
     for (i = 0; i < 2; i++) {
-        statelists[i].blockNo = resp.core.old.arg[2] & 0xff;
-        statelists[i].keyType = (resp.core.old.arg[2] >> 8) & 0xff;
+        statelists[i].blockNo = resp.oldarg[2] & 0xff;
+        statelists[i].keyType = (resp.oldarg[2] >> 8) & 0xff;
         statelists[i].uid = uid;
-        memcpy(&statelists[i].nt, (void *)(resp.core.old.d.asBytes + 4 + i * 8 + 0), 4);
-        memcpy(&statelists[i].ks1, (void *)(resp.core.old.d.asBytes + 4 + i * 8 + 4), 4);
+        memcpy(&statelists[i].nt, (void *)(resp.data.asBytes + 4 + i * 8 + 0), 4);
+        memcpy(&statelists[i].ks1, (void *)(resp.data.asBytes + 4 + i * 8 + 4), 4);
     }
 
     // calc keys
@@ -397,8 +397,8 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo,
             num_to_bytes(key64, 6, resultKey);
 
             PrintAndLogEx(SUCCESS, "target block:%3u key type: %c  -- found valid key [%012" PRIx64 "]",
-                          (uint16_t)resp.core.old.arg[2] & 0xff,
-                          (resp.core.old.arg[2] >> 8) ? 'B' : 'A',
+                          (uint16_t)resp.oldarg[2] & 0xff,
+                          (resp.oldarg[2] >> 8) ? 'B' : 'A',
                           key64
                          );
             return -5;
@@ -407,8 +407,8 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo,
 
 out:
     PrintAndLogEx(SUCCESS, "target block:%3u key type: %c",
-                  (uint16_t)resp.core.old.arg[2] & 0xff,
-                  (resp.core.old.arg[2] >> 8) ? 'B' : 'A'
+                  (uint16_t)resp.oldarg[2] & 0xff,
+                  (resp.oldarg[2] >> 8) ? 'B' : 'A'
                  );
 
     free(statelists[0].head.slhead);
@@ -419,17 +419,17 @@ out:
 // MIFARE
 int mfReadSector(uint8_t sectorNo, uint8_t keyType, uint8_t *key, uint8_t *data) {
 
-    UsbCommand c = {CMD_MIFARE_READSC, {sectorNo, keyType, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_MIFARE_READSC, {sectorNo, keyType, 0}, {{0}}};
     memcpy(c.d.asBytes, key, 6);
     clearCommandBuffer();
     SendCommand(&c);
 
     UsbReplyNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-        uint8_t isOK  = resp.core.old.arg[0] & 0xff;
+        uint8_t isOK  = resp.oldarg[0] & 0xff;
 
         if (isOK) {
-            memcpy(data, resp.core.old.d.asBytes, mfNumBlocksPerSector(sectorNo) * 16);
+            memcpy(data, resp.data.asBytes, mfNumBlocksPerSector(sectorNo) * 16);
             return 0;
         } else {
             return 1;
@@ -444,12 +444,12 @@ int mfReadSector(uint8_t sectorNo, uint8_t keyType, uint8_t *key, uint8_t *data)
 
 // EMULATOR
 int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount) {
-    UsbCommand c = {CMD_MIFARE_EML_MEMGET, {blockNum, blocksCount, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_MIFARE_EML_MEMGET, {blockNum, blocksCount, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbReplyNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return 1;
-    memcpy(data, resp.core.old.d.asBytes, blocksCount * 16);
+    memcpy(data, resp.data.asBytes, blocksCount * 16);
     return 0;
 }
 
@@ -458,7 +458,7 @@ int mfEmlSetMem(uint8_t *data, int blockNum, int blocksCount) {
 }
 
 int mfEmlSetMem_xt(uint8_t *data, int blockNum, int blocksCount, int blockBtWidth) {
-    UsbCommand c = {CMD_MIFARE_EML_MEMSET, {blockNum, blocksCount, blockBtWidth}, {{0}}};
+    UsbCommandOLD c = {CMD_MIFARE_EML_MEMSET, {blockNum, blocksCount, blockBtWidth}, {{0}}};
     memcpy(c.d.asBytes, data, blocksCount * blockBtWidth);
     clearCommandBuffer();
     SendCommand(&c);
@@ -501,15 +501,15 @@ int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, uint8_
 
 int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, uint8_t params) {
 
-    UsbCommand c = {CMD_MIFARE_CSETBLOCK, {params, blockNo, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_MIFARE_CSETBLOCK, {params, blockNo, 0}, {{0}}};
     memcpy(c.d.asBytes, data, 16);
     clearCommandBuffer();
     SendCommand(&c);
     UsbReplyNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-        uint8_t isOK  = resp.core.old.arg[0] & 0xff;
+        uint8_t isOK  = resp.oldarg[0] & 0xff;
         if (uid != NULL)
-            memcpy(uid, resp.core.old.d.asBytes, 4);
+            memcpy(uid, resp.data.asBytes, 4);
         if (!isOK)
             return 2;
     } else {
@@ -520,15 +520,15 @@ int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, uint8_t params) {
 }
 
 int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params) {
-    UsbCommand c = {CMD_MIFARE_CGETBLOCK, {params, blockNo, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_MIFARE_CGETBLOCK, {params, blockNo, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbReplyNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-        uint8_t isOK  = resp.core.old.arg[0] & 0xff;
+        uint8_t isOK  = resp.oldarg[0] & 0xff;
         if (!isOK)
             return 2;
-        memcpy(data, resp.core.old.d.asBytes, 16);
+        memcpy(data, resp.data.asBytes, 16);
     } else {
         PrintAndLogEx(WARNING, "command execute timeout");
         return 1;
@@ -873,7 +873,7 @@ int detect_classic_prng(void) {
     uint8_t cmd[] = {MIFARE_AUTH_KEYA, 0x00};
     uint32_t flags = ISO14A_CONNECT | ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_RATS;
 
-    UsbCommand c = {CMD_READER_ISO_14443a, {flags, sizeof(cmd), 0}, {{0}}};
+    UsbCommandOLD c = {CMD_READER_ISO_14443a, {flags, sizeof(cmd), 0}, {{0}}};
     memcpy(c.d.asBytes, cmd, sizeof(cmd));
 
     clearCommandBuffer();
@@ -885,7 +885,7 @@ int detect_classic_prng(void) {
     }
 
     // if select tag failed.
-    if (resp.core.old.arg[0] == 0) {
+    if (resp.oldarg[0] == 0) {
         PrintAndLogEx(WARNING, "error:  selecting tag failed,  can't detect prng\n");
         return -2;
     }
@@ -895,12 +895,12 @@ int detect_classic_prng(void) {
     }
 
     // check respA
-    if (respA.core.old.arg[0] != 4) {
-        PrintAndLogEx(WARNING, "PRNG data error: Wrong length: %d", respA.core.old.arg[0]);
+    if (respA.oldarg[0] != 4) {
+        PrintAndLogEx(WARNING, "PRNG data error: Wrong length: %d", respA.oldarg[0]);
         return -4;
     }
 
-    uint32_t nonce = bytes_to_num(respA.core.old.d.asBytes, respA.core.old.arg[0]);
+    uint32_t nonce = bytes_to_num(respA.data.asBytes, respA.oldarg[0]);
     return validate_prng_nonce(nonce);
 }
 /* Detect Mifare Classic NACK bug
@@ -913,7 +913,7 @@ returns:
 */
 int detect_classic_nackbug(bool verbose) {
 
-    UsbCommand c = {CMD_MIFARE_NACK_DETECT, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_MIFARE_NACK_DETECT, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     UsbReplyNG resp;
@@ -949,9 +949,9 @@ int detect_classic_nackbug(bool verbose) {
         }
 
         if (WaitForResponseTimeout(CMD_ACK, &resp, 500)) {
-            int32_t ok = resp.core.old.arg[0];
-            uint32_t nacks = resp.core.old.arg[1];
-            uint32_t auths = resp.core.old.arg[2];
+            int32_t ok = resp.oldarg[0];
+            uint32_t nacks = resp.oldarg[1];
+            uint32_t auths = resp.oldarg[2];
             PrintAndLogEx(NORMAL, "");
 
             if (verbose) {
@@ -999,11 +999,11 @@ void detect_classic_magic(void) {
 
     uint8_t isGeneration = 0;
     UsbReplyNG resp;
-    UsbCommand c = {CMD_MIFARE_CIDENT, {0, 0, 0}, {{0}}};
+    UsbCommandOLD c = {CMD_MIFARE_CIDENT, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500))
-        isGeneration = resp.core.old.arg[0] & 0xff;
+        isGeneration = resp.oldarg[0] & 0xff;
 
     switch (isGeneration) {
         case 1:
diff --git a/client/scripting.c b/client/scripting.c
index 109257dee..cabda564e 100644
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -12,7 +12,7 @@
 
 /**
  * The following params expected:
- *  UsbCommand c
+ *  UsbCommandOLD c
  *@brief l_SendCommand
  * @param L
  * @return
@@ -29,19 +29,19 @@ static int l_SendCommand(lua_State *L) {
         uint8_t  asBytes[USB_CMD_DATA_SIZE]; // 1 byte * 512 = 512 bytes (OR)
         uint32_t asDwords[USB_CMD_DATA_SIZE/4]; // 4 byte * 128 = 512 bytes
       } d;
-    } PACKED UsbCommand;
+    } PACKED UsbCommandOLD;
 
     ==> A 544 byte buffer will do.
     **/
     size_t size;
     const char *data = luaL_checklstring(L, 1, &size);
-    if (size != sizeof(UsbCommand)) {
-        printf("Got data size %d, expected %d", (int) size, (int) sizeof(UsbCommand));
+    if (size != sizeof(UsbCommandOLD)) {
+        printf("Got data size %d, expected %d", (int) size, (int) sizeof(UsbCommandOLD));
         lua_pushstring(L, "Wrong data size");
         return 1;
     }
 
-    SendCommand((UsbCommand *)data);
+    SendCommand((UsbCommandOLD *)data);
     return 0; // no return values
 }
 
@@ -262,7 +262,7 @@ static int l_foobar(lua_State *L) {
     printf("Arguments discarded, stack now contains %d elements", lua_gettop(L));
 
     // todo: this is not used, where was it intended for?
-    // UsbCommand response =  {CMD_MIFARE_READBL, {1337, 1338, 1339}, {{0}}};
+    // UsbCommandOLD response =  {CMD_MIFARE_READBL, {1337, 1338, 1339}, {{0}}};
 
     printf("Now returning a uint64_t as a string");
     uint64_t x = 0xDEADC0DE;
diff --git a/client/snooper.c b/client/snooper.c
index 35267bc22..82de3824d 100644
--- a/client/snooper.c
+++ b/client/snooper.c
@@ -26,7 +26,7 @@ int main() {
     while (1) {
         while (!OpenProxmark()) { sleep(1); }
         while (1) {
-            UsbCommand cmdbuf;
+            UsbCommandOLD cmdbuf;
             CommandReceived("hf 14a sniff");
             HANDLE_ERROR;
             ReceiveCommand(&cmdbuf);
diff --git a/client/util.h b/client/util.h
index bd82237d0..e482c8572 100644
--- a/client/util.h
+++ b/client/util.h
@@ -150,7 +150,7 @@
 
 #ifndef DropField
 #define DropField() { \
-        UsbCommand c_drop = {CMD_READER_ISO_14443a, {0,0,0}, {{0}}}; clearCommandBuffer(); SendCommand(&c_drop); \
+        UsbCommandOLD c_drop = {CMD_READER_ISO_14443a, {0,0,0}, {{0}}}; clearCommandBuffer(); SendCommand(&c_drop); \
     }
 #endif
 
diff --git a/common/cmd.c b/common/cmd.c
index 45e002df1..2d54a2d2f 100644
--- a/common/cmd.c
+++ b/common/cmd.c
@@ -44,9 +44,9 @@ extern void Dbprintf(const char *fmt, ...);
 #endif
 
 uint8_t cmd_send(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len) {
-    UsbCommand txcmd;
+    UsbCommandOLD txcmd;
 
-    for (size_t i = 0; i < sizeof(UsbCommand); i++)
+    for (size_t i = 0; i < sizeof(UsbCommandOLD); i++)
         ((uint8_t *)&txcmd)[i] = 0x00;
 
     // Compose the outgoing command frame
@@ -68,47 +68,48 @@ uint8_t cmd_send(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void
 
 #ifdef WITH_FPC_HOST
     if (reply_via_fpc) {
-        sendlen = usart_writebuffer((uint8_t *)&txcmd, sizeof(UsbCommand));
+        sendlen = usart_writebuffer((uint8_t *)&txcmd, sizeof(UsbCommandOLD));
 //        Dbprintf_usb("Sent %i bytes over usart", len);
     } else {
-        sendlen = usb_write((uint8_t *)&txcmd, sizeof(UsbCommand));
+        sendlen = usb_write((uint8_t *)&txcmd, sizeof(UsbCommandOLD));
     }
 #else
-    sendlen = usb_write((uint8_t *)&txcmd, sizeof(UsbCommand));
+    sendlen = usb_write((uint8_t *)&txcmd, sizeof(UsbCommandOLD));
 #endif
 
     return sendlen;
 }
 
 uint8_t reply_ng(uint16_t cmd, int16_t status, uint8_t *data, size_t len) {
-    UsbReplyNG txBufferNG;
+    UsbReplyNGRaw txBufferNG;
     size_t txBufferNGLen;
 //    for (size_t i = 0; i < sizeof(txBufferNG); i++)
 //        ((uint8_t *)&txBufferNG)[i] = 0x00;
 
     // Compose the outgoing command frame
-    txBufferNG.magic = USB_REPLYNG_PREAMBLE_MAGIC;
-    txBufferNG.core.ng.cmd = cmd;
-    txBufferNG.status = status;
-    if (len > USB_DATANG_SIZE) {
-        len = USB_DATANG_SIZE;
+    txBufferNG.pre.magic = USB_REPLYNG_PREAMBLE_MAGIC;
+    txBufferNG.pre.cmd = cmd;
+    txBufferNG.pre.status = status;
+    if (len > USB_CMD_DATA_SIZE) {
+        len = USB_CMD_DATA_SIZE;
         // overwrite status
-        txBufferNG.status = PM3_EOVFLOW;
+        txBufferNG.pre.status = PM3_EOVFLOW;
     }
-    txBufferNG.length = len;
-    UsbReplyNGPostamble *tx_post = (UsbReplyNGPostamble *)((uint8_t *)&txBufferNG + sizeof(UsbReplyNGPreamble) + sizeof(UsbPacketNGCore) - USB_DATANG_SIZE + len);
+    txBufferNG.pre.length = len;
 
-    // Add the (optional) content to the frame, with a maximum size of USB_DATANG_SIZE
+    // Add the (optional) content to the frame, with a maximum size of USB_CMD_DATA_SIZE
     if (data && len) {
         for (size_t i = 0; i < len; i++) {
-            txBufferNG.core.ng.data[i] = data[i];
+            txBufferNG.data[i] = data[i];
         }
     }
 
     uint8_t first, second;
-    compute_crc(CRC_14443_A, (uint8_t *)&txBufferNG, sizeof(UsbReplyNGPreamble) + sizeof(UsbPacketNGCore) - USB_DATANG_SIZE + len, &first, &second);
+    compute_crc(CRC_14443_A, (uint8_t *)&txBufferNG, sizeof(UsbReplyNGPreamble) + len, &first, &second);
+
+    UsbReplyNGPostamble *tx_post = (UsbReplyNGPostamble *)((uint8_t *)&txBufferNG + sizeof(UsbReplyNGPreamble) + len);
     tx_post->crc = (first << 8) + second;
-    txBufferNGLen = sizeof(UsbReplyNGPreamble) + sizeof(UsbPacketNGCore) - USB_DATANG_SIZE + len + sizeof(UsbReplyNGPostamble);
+    txBufferNGLen = sizeof(UsbReplyNGPreamble) + len + sizeof(UsbReplyNGPostamble);
 
     uint32_t sendlen = 0;
     // Send frame and make sure all bytes are transmitted
diff --git a/common/usart.c b/common/usart.c
index 1695995a2..2cabbb470 100644
--- a/common/usart.c
+++ b/common/usart.c
@@ -38,8 +38,8 @@ void usart_close(void) {
 }
 */
 
-static uint8_t us_inbuf[sizeof(UsbCommand)];
-static uint8_t us_outbuf[sizeof(UsbCommand)];
+static uint8_t us_inbuf[sizeof(UsbCommandOLD)];
+static uint8_t us_outbuf[sizeof(UsbCommandOLD)];
 /*
 // transfer from client to device
 inline int16_t usart_readbuffer(uint8_t *data) {
@@ -63,7 +63,7 @@ inline int16_t usart_readbuffer(uint8_t *data) {
     // Check if the first PDC bank is free
     if (pUS1->US_RCR == 0) {
         pUS1->US_RPR = (uint32_t)data;
-        pUS1->US_RCR = sizeof(UsbCommand);
+        pUS1->US_RCR = sizeof(UsbCommandOLD);
         pUS1->US_PTCR = AT91C_PDC_RXTEN | AT91C_PDC_TXTEN;
         check = 0;
         return 2;
diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index df899099e..ed6ba08e8 100644
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -25,7 +25,6 @@ typedef BYTE uint8_t;
 #endif
 
 #define USB_CMD_DATA_SIZE 512
-#define USB_DATANG_SIZE 512
 
 typedef struct {
     uint64_t cmd;
@@ -34,11 +33,11 @@ typedef struct {
         uint8_t  asBytes[USB_CMD_DATA_SIZE];
         uint32_t asDwords[USB_CMD_DATA_SIZE / 4];
     } d;
-} PACKED UsbCommand;
+} PACKED UsbCommandOLD;
 
 typedef struct {
     uint16_t cmd;
-    uint8_t data[USB_DATANG_SIZE];
+    uint8_t data[USB_CMD_DATA_SIZE];
 } PACKED UsbPacketNGCore;
 
 typedef struct {
@@ -57,7 +56,7 @@ typedef struct {
     uint16_t length;  // length of the variable part, 0 if none.
     union {           // we can simplify it once we get rid of old format compatibility
         UsbPacketNGCore ng;
-        UsbCommand old;
+        UsbCommandOLD old;
     } core;
     uint16_t crc;
     bool ng;
@@ -67,6 +66,7 @@ typedef struct {
     uint32_t magic;
     uint16_t length;  // length of the variable part, 0 if none.
     int16_t  status;
+    uint16_t cmd;
 } PACKED UsbReplyNGPreamble;
 
 #define USB_REPLYNG_PREAMBLE_MAGIC 0x62334d50 // PM3b
@@ -75,18 +75,28 @@ typedef struct {
     uint16_t crc;
 } PACKED UsbReplyNGPostamble;
 
+// For internal usage
 typedef struct {
-    uint32_t magic;  //  \                  //
-    uint16_t length; //     Preamble        //
-    int16_t  status; //  /                  //
-    union {           // we can simplify it once we get rid of old format compatibility
-        UsbPacketNGCore ng;
-        UsbCommand old;
-    } core;
-    uint16_t crc;    //  -- Postamble       //
-    bool ng;
+    uint16_t cmd;
+    uint16_t length;
+    uint32_t magic;      //  NG
+    int16_t  status;     //  NG
+    uint16_t crc;        //  NG
+    uint64_t oldarg[3];  //  OLD
+    union {
+        uint8_t  asBytes[USB_CMD_DATA_SIZE];
+        uint32_t asDwords[USB_CMD_DATA_SIZE / 4];
+    } data;
+    bool ng;             // does it store NG data or OLD data?
 } PACKED UsbReplyNG;
 
+// For reception and CRC check
+typedef struct {
+    UsbReplyNGPreamble pre;
+    uint8_t data[USB_CMD_DATA_SIZE];
+    UsbReplyNGPostamble post;
+} PACKED UsbReplyNGRaw;
+
 #ifdef WITH_FPC_HOST
 // "Session" flag, to tell via which interface next msgs should be sent: USB or FPC USART
 extern bool reply_via_fpc;

From 4e31c6110bc153d16fe1363cadce8622906d0c5b Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 18 Apr 2019 00:12:52 +0200
Subject: [PATCH 1325/1938] Better Command structs

---
 armsrc/appmain.c   | 315 +++++++++++++++++++++++----------------------
 armsrc/epa.c       |  18 +--
 armsrc/felica.c    |   6 +-
 armsrc/iso14443a.c |  10 +-
 armsrc/iso14443b.c |   8 +-
 bootrom/bootrom.c  |  14 +-
 client/comms.c     |  20 +--
 include/usb_cmd.h  |  34 +++--
 8 files changed, 219 insertions(+), 206 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index bab5ada6e..dd029b3e2 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -634,32 +634,29 @@ void ListenReaderField(int limit) {
 }
 
 static void UsbPacketReceived(UsbCommandNG *packet) {
-    uint64_t cmd; // To accommodate old cmd, can be reduced to uint16_t once all old cmds are gone.
-
-    // For cmd handlers still using old cmd format:
+/*
     if (packet->ng) {
-        cmd = packet->core.ng.cmd;
-//        Dbprintf("received NG frame with %d bytes payload, with command: 0x%04x", packet->length, cmd);
+        Dbprintf("received NG frame with %d bytes payload, with command: 0x%04x", packet->length, cmd);
     } else {
-        cmd = packet->core.old.cmd;
-//        Dbprintf("received OLD frame of %d bytes, with command: 0x%04x and args: %d %d %d", packet->length, packet->core.old.cmd, packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2]);
+        Dbprintf("received OLD frame of %d bytes, with command: 0x%04x and args: %d %d %d", packet->length, packet->cmd, packet->oldarg[0], packet->oldarg[1], packet->oldarg[2]);
     }
+*/
 
-    switch (cmd) {
+    switch (packet->cmd) {
 #ifdef WITH_LF
         case CMD_SET_LF_T55XX_CONFIG:
-            setT55xxConfig(packet->core.old.arg[0], (t55xx_config *) packet->core.old.d.asBytes);
+            setT55xxConfig(packet->oldarg[0], (t55xx_config *) packet->data.asBytes);
             break;
         case CMD_SET_LF_SAMPLING_CONFIG:
-            setSamplingConfig((sample_config *) packet->core.old.d.asBytes);
+            setSamplingConfig((sample_config *) packet->data.asBytes);
             break;
         case CMD_ACQUIRE_RAW_ADC_SAMPLES_125K: {
-            uint32_t bits = SampleLF(packet->core.old.arg[0], packet->core.old.arg[1]);
+            uint32_t bits = SampleLF(packet->oldarg[0], packet->oldarg[1]);
             cmd_send(CMD_ACK, bits, 0, 0, 0, 0);
             break;
         }
         case CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K:
-            ModThenAcquireRawAdcSamples125k(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2], packet->core.old.d.asBytes);
+            ModThenAcquireRawAdcSamples125k(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
             break;
         case CMD_LF_SNIFF_RAW_ADC_SAMPLES: {
             uint32_t bits = SniffLF();
@@ -668,73 +665,73 @@ static void UsbPacketReceived(UsbCommandNG *packet) {
         }
         case CMD_HID_DEMOD_FSK: {
             uint32_t high, low;
-            CmdHIDdemodFSK(packet->core.old.arg[0], &high, &low, 1);
+            CmdHIDdemodFSK(packet->oldarg[0], &high, &low, 1);
             break;
         }
         case CMD_HID_SIM_TAG:
-            CmdHIDsimTAG(packet->core.old.arg[0], packet->core.old.arg[1], 1);
+            CmdHIDsimTAG(packet->oldarg[0], packet->oldarg[1], 1);
             break;
         case CMD_FSK_SIM_TAG:
-            CmdFSKsimTAG(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2], packet->core.old.d.asBytes, 1);
+            CmdFSKsimTAG(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes, 1);
             break;
         case CMD_ASK_SIM_TAG:
-            CmdASKsimTag(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2], packet->core.old.d.asBytes, 1);
+            CmdASKsimTag(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes, 1);
             break;
         case CMD_PSK_SIM_TAG:
-            CmdPSKsimTag(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2], packet->core.old.d.asBytes, 1);
+            CmdPSKsimTag(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes, 1);
             break;
         case CMD_HID_CLONE_TAG:
-            CopyHIDtoT55x7(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2], packet->core.old.d.asBytes[0]);
+            CopyHIDtoT55x7(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes[0]);
             break;
         case CMD_IO_DEMOD_FSK: {
             uint32_t high, low;
-            CmdIOdemodFSK(packet->core.old.arg[0], &high, &low, 1);
+            CmdIOdemodFSK(packet->oldarg[0], &high, &low, 1);
             break;
         }
         case CMD_IO_CLONE_TAG:
-            CopyIOtoT55x7(packet->core.old.arg[0], packet->core.old.arg[1]);
+            CopyIOtoT55x7(packet->oldarg[0], packet->oldarg[1]);
             break;
         case CMD_EM410X_DEMOD: {
             uint32_t high;
             uint64_t low;
-            CmdEM410xdemod(packet->core.old.arg[0], &high, &low, 1);
+            CmdEM410xdemod(packet->oldarg[0], &high, &low, 1);
             break;
         }
         case CMD_EM410X_WRITE_TAG:
-            WriteEM410x(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2]);
+            WriteEM410x(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2]);
             break;
         case CMD_READ_TI_TYPE:
             ReadTItag();
             break;
         case CMD_WRITE_TI_TYPE:
-            WriteTItag(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2]);
+            WriteTItag(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2]);
             break;
         case CMD_SIMULATE_TAG_125K:
             LED_A_ON();
-            SimulateTagLowFrequency(packet->core.old.arg[0], packet->core.old.arg[1], 1);
+            SimulateTagLowFrequency(packet->oldarg[0], packet->oldarg[1], 1);
             LED_A_OFF();
             break;
         case CMD_LF_SIMULATE_BIDIR:
-            SimulateTagLowFrequencyBidir(packet->core.old.arg[0], packet->core.old.arg[1]);
+            SimulateTagLowFrequencyBidir(packet->oldarg[0], packet->oldarg[1]);
             break;
         case CMD_INDALA_CLONE_TAG:
-            CopyIndala64toT55x7(packet->core.old.d.asDwords[0], packet->core.old.d.asDwords[1]);
+            CopyIndala64toT55x7(packet->data.asDwords[0], packet->data.asDwords[1]);
             break;
         case CMD_INDALA_CLONE_TAG_L:
             CopyIndala224toT55x7(
-                packet->core.old.d.asDwords[0], packet->core.old.d.asDwords[1], packet->core.old.d.asDwords[2], packet->core.old.d.asDwords[3],
-                packet->core.old.d.asDwords[4], packet->core.old.d.asDwords[5], packet->core.old.d.asDwords[6]
+                packet->data.asDwords[0], packet->data.asDwords[1], packet->data.asDwords[2], packet->data.asDwords[3],
+                packet->data.asDwords[4], packet->data.asDwords[5], packet->data.asDwords[6]
             );
             break;
         case CMD_T55XX_READ_BLOCK: {
-            T55xxReadBlock(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2]);
+            T55xxReadBlock(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2]);
             break;
         }
         case CMD_T55XX_WRITE_BLOCK:
-            T55xxWriteBlock(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2], packet->core.old.d.asBytes[0]);
+            T55xxWriteBlock(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes[0]);
             break;
         case CMD_T55XX_WAKEUP:
-            T55xxWakeUp(packet->core.old.arg[0]);
+            T55xxWakeUp(packet->oldarg[0]);
             break;
         case CMD_T55XX_RESET_READ:
             T55xxResetRead();
@@ -747,58 +744,58 @@ static void UsbPacketReceived(UsbCommandNG *packet) {
             break;
         case CMD_PCF7931_WRITE:
             WritePCF7931(
-                packet->core.old.d.asBytes[0], packet->core.old.d.asBytes[1], packet->core.old.d.asBytes[2], packet->core.old.d.asBytes[3],
-                packet->core.old.d.asBytes[4], packet->core.old.d.asBytes[5], packet->core.old.d.asBytes[6], packet->core.old.d.asBytes[9],
-                packet->core.old.d.asBytes[7] - 128, packet->core.old.d.asBytes[8] - 128,
-                packet->core.old.arg[0],
-                packet->core.old.arg[1],
-                packet->core.old.arg[2]
+                packet->data.asBytes[0], packet->data.asBytes[1], packet->data.asBytes[2], packet->data.asBytes[3],
+                packet->data.asBytes[4], packet->data.asBytes[5], packet->data.asBytes[6], packet->data.asBytes[9],
+                packet->data.asBytes[7] - 128, packet->data.asBytes[8] - 128,
+                packet->oldarg[0],
+                packet->oldarg[1],
+                packet->oldarg[2]
             );
             break;
         case CMD_EM4X_READ_WORD:
-            EM4xReadWord(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2]);
+            EM4xReadWord(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2]);
             break;
         case CMD_EM4X_WRITE_WORD:
-            EM4xWriteWord(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2]);
+            EM4xWriteWord(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2]);
             break;
         case CMD_AWID_DEMOD_FSK:  {
             uint32_t high, low;
             // Set realtime AWID demodulation
-            CmdAWIDdemodFSK(packet->core.old.arg[0], &high, &low, 1);
+            CmdAWIDdemodFSK(packet->oldarg[0], &high, &low, 1);
             break;
         }
         case CMD_VIKING_CLONE_TAG:
-            CopyVikingtoT55xx(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2]);
+            CopyVikingtoT55xx(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2]);
             break;
         case CMD_COTAG:
-            Cotag(packet->core.old.arg[0]);
+            Cotag(packet->oldarg[0]);
             break;
 #endif
 
 #ifdef WITH_HITAG
         case CMD_SNIFF_HITAG: // Eavesdrop Hitag tag, args = type
-            SniffHitag(packet->core.old.arg[0]);
+            SniffHitag(packet->oldarg[0]);
             break;
         case CMD_SIMULATE_HITAG: // Simulate Hitag tag, args = memory content
-            SimulateHitagTag((bool)packet->core.old.arg[0], packet->core.old.d.asBytes);
+            SimulateHitagTag((bool)packet->oldarg[0], packet->data.asBytes);
             break;
         case CMD_READER_HITAG: // Reader for Hitag tags, args = type and function
-            ReaderHitag((hitag_function)packet->core.old.arg[0], (hitag_data *)packet->core.old.d.asBytes);
+            ReaderHitag((hitag_function)packet->oldarg[0], (hitag_data *)packet->data.asBytes);
             break;
         case CMD_SIMULATE_HITAG_S:// Simulate Hitag s tag, args = memory content
-            SimulateHitagSTag((bool)packet->core.old.arg[0], packet->core.old.d.asBytes);
+            SimulateHitagSTag((bool)packet->oldarg[0], packet->data.asBytes);
             break;
         case CMD_TEST_HITAGS_TRACES:// Tests every challenge within the given file
-            check_challenges((bool)packet->core.old.arg[0], packet->core.old.d.asBytes);
+            check_challenges((bool)packet->oldarg[0], packet->data.asBytes);
             break;
         case CMD_READ_HITAG_S: //Reader for only Hitag S tags, args = key or challenge
-            ReadHitagS((hitag_function)packet->core.old.arg[0], (hitag_data *)packet->core.old.d.asBytes);
+            ReadHitagS((hitag_function)packet->oldarg[0], (hitag_data *)packet->data.asBytes);
             break;
         case CMD_WR_HITAG_S: //writer for Hitag tags args=data to write,page and key or challenge
-            if ((hitag_function)packet->core.old.arg[0] < 10) {
-                WritePageHitagS((hitag_function)packet->core.old.arg[0], (hitag_data *)packet->core.old.d.asBytes, packet->core.old.arg[2]);
+            if ((hitag_function)packet->oldarg[0] < 10) {
+                WritePageHitagS((hitag_function)packet->oldarg[0], (hitag_data *)packet->data.asBytes, packet->oldarg[2]);
             } else {
-                WriterHitag((hitag_function)packet->core.old.arg[0], (hitag_data *)packet->core.old.d.asBytes, packet->core.old.arg[2]);
+                WriterHitag((hitag_function)packet->oldarg[0], (hitag_data *)packet->data.asBytes, packet->oldarg[2]);
             }
             break;
 #endif
@@ -811,28 +808,28 @@ static void UsbPacketReceived(UsbCommandNG *packet) {
             RecordRawAdcSamplesIso15693();
             break;
         case CMD_ISO_15693_COMMAND:
-            DirectTag15693Command(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2], packet->core.old.d.asBytes);
+            DirectTag15693Command(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
             break;
         case CMD_ISO_15693_FIND_AFI:
-            BruteforceIso15693Afi(packet->core.old.arg[0]);
+            BruteforceIso15693Afi(packet->oldarg[0]);
             break;
         case CMD_READER_ISO_15693:
-            ReaderIso15693(packet->core.old.arg[0]);
+            ReaderIso15693(packet->oldarg[0]);
             break;
         case CMD_SIMTAG_ISO_15693:
-            SimTagIso15693(packet->core.old.arg[0], packet->core.old.d.asBytes);
+            SimTagIso15693(packet->oldarg[0], packet->data.asBytes);
             break;
 #endif
 
 #ifdef WITH_LEGICRF
         case CMD_SIMULATE_TAG_LEGIC_RF:
-            LegicRfSimulate(packet->core.old.arg[0]);
+            LegicRfSimulate(packet->oldarg[0]);
             break;
         case CMD_WRITER_LEGIC_RF:
-            LegicRfWriter(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2], packet->core.old.d.asBytes);
+            LegicRfWriter(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
             break;
         case CMD_READER_LEGIC_RF:
-            LegicRfReader(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2]);
+            LegicRfReader(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2]);
             break;
         case CMD_LEGIC_INFO:
             LegicRfInfo();
@@ -846,22 +843,22 @@ static void UsbPacketReceived(UsbCommandNG *packet) {
             // arg0 = offset
             // arg1 = num of bytes
             FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-            emlSet(packet->core.old.d.asBytes, packet->core.old.arg[0], packet->core.old.arg[1]);
+            emlSet(packet->data.asBytes, packet->oldarg[0], packet->oldarg[1]);
             break;
 #endif
 
 #ifdef WITH_ISO14443b
         case CMD_READ_SRI_TAG:
-            ReadSTMemoryIso14443b(packet->core.old.arg[0]);
+            ReadSTMemoryIso14443b(packet->oldarg[0]);
             break;
         case CMD_SNIFF_ISO_14443B:
             SniffIso14443b();
             break;
         case CMD_SIMULATE_TAG_ISO_14443B:
-            SimulateIso14443bTag(packet->core.old.arg[0]);
+            SimulateIso14443bTag(packet->oldarg[0]);
             break;
         case CMD_ISO_14443B_COMMAND:
-            //SendRawCommand14443B(packet->core.old.arg[0],packet->core.old.arg[1],packet->core.old.arg[2],packet->core.old.d.asBytes);
+            //SendRawCommand14443B(packet->oldarg[0],packet->oldarg[1],packet->oldarg[2],packet->data.asBytes);
             SendRawCommand14443B_Ex(packet);
             break;
 #endif
@@ -871,10 +868,10 @@ static void UsbPacketReceived(UsbCommandNG *packet) {
             felica_sendraw(packet);
             break;
         case CMD_FELICA_LITE_SIM:
-            felica_sim_lite(packet->core.old.arg[0]);
+            felica_sim_lite(packet->oldarg[0]);
             break;
         case CMD_FELICA_SNIFF:
-            felica_sniff(packet->core.old.arg[0], packet->core.old.arg[1]);
+            felica_sniff(packet->oldarg[0], packet->oldarg[1]);
             break;
         case CMD_FELICA_LITE_DUMP:
             felica_dump_lite_s();
@@ -883,16 +880,16 @@ static void UsbPacketReceived(UsbCommandNG *packet) {
 
 #ifdef WITH_ISO14443a
         case CMD_SNIFF_ISO_14443a:
-            SniffIso14443a(packet->core.old.arg[0]);
+            SniffIso14443a(packet->oldarg[0]);
             break;
         case CMD_READER_ISO_14443a:
             ReaderIso14443a(packet);
             break;
         case CMD_SIMULATE_TAG_ISO_14443a:
-            SimulateIso14443aTag(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.d.asBytes);  // ## Simulate iso14443a tag - pass tag type & UID
+            SimulateIso14443aTag(packet->oldarg[0], packet->oldarg[1], packet->data.asBytes);  // ## Simulate iso14443a tag - pass tag type & UID
             break;
         case CMD_ANTIFUZZ_ISO_14443a:
-            iso14443a_antifuzz(packet->core.old.arg[0]);
+            iso14443a_antifuzz(packet->oldarg[0]);
             break;
         case CMD_EPA_PACE_COLLECT_NONCE:
             EPA_PACE_Collect_Nonce(packet);
@@ -901,89 +898,89 @@ static void UsbPacketReceived(UsbCommandNG *packet) {
             EPA_PACE_Replay(packet);
             break;
         case CMD_READER_MIFARE:
-            ReaderMifare(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2]);
+            ReaderMifare(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2]);
             break;
         case CMD_MIFARE_READBL:
-            MifareReadBlock(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2], packet->core.old.d.asBytes);
+            MifareReadBlock(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
             break;
         case CMD_MIFAREU_READBL:
-            MifareUReadBlock(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.d.asBytes);
+            MifareUReadBlock(packet->oldarg[0], packet->oldarg[1], packet->data.asBytes);
             break;
         case CMD_MIFAREUC_AUTH:
-            MifareUC_Auth(packet->core.old.arg[0], packet->core.old.d.asBytes);
+            MifareUC_Auth(packet->oldarg[0], packet->data.asBytes);
             break;
         case CMD_MIFAREU_READCARD:
-            MifareUReadCard(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2], packet->core.old.d.asBytes);
+            MifareUReadCard(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
             break;
         case CMD_MIFAREUC_SETPWD:
-            MifareUSetPwd(packet->core.old.arg[0], packet->core.old.d.asBytes);
+            MifareUSetPwd(packet->oldarg[0], packet->data.asBytes);
             break;
         case CMD_MIFARE_READSC:
-            MifareReadSector(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2], packet->core.old.d.asBytes);
+            MifareReadSector(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
             break;
         case CMD_MIFARE_WRITEBL:
-            MifareWriteBlock(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2], packet->core.old.d.asBytes);
+            MifareWriteBlock(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
             break;
         //case CMD_MIFAREU_WRITEBL_COMPAT:
-        //MifareUWriteBlockCompat(packet->core.old.arg[0], packet->core.old.d.asBytes);
+        //MifareUWriteBlockCompat(packet->oldarg[0], packet->data.asBytes);
         //break;
         case CMD_MIFAREU_WRITEBL:
-            MifareUWriteBlock(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.d.asBytes);
+            MifareUWriteBlock(packet->oldarg[0], packet->oldarg[1], packet->data.asBytes);
             break;
         case CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES:
-            MifareAcquireEncryptedNonces(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2], packet->core.old.d.asBytes);
+            MifareAcquireEncryptedNonces(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
             break;
         case CMD_MIFARE_ACQUIRE_NONCES:
-            MifareAcquireNonces(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2], packet->core.old.d.asBytes);
+            MifareAcquireNonces(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
             break;
         case CMD_MIFARE_NESTED:
-            MifareNested(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2], packet->core.old.d.asBytes);
+            MifareNested(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
             break;
         case CMD_MIFARE_CHKKEYS: {
-            MifareChkKeys(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2], packet->core.old.d.asBytes);
+            MifareChkKeys(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
             break;
         }
         case CMD_MIFARE_CHKKEYS_FAST: {
-            MifareChkKeys_fast(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2], packet->core.old.d.asBytes);
+            MifareChkKeys_fast(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
             break;
         }
         case CMD_SIMULATE_MIFARE_CARD:
-            Mifare1ksim(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2], packet->core.old.d.asBytes);
+            Mifare1ksim(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
             break;
 
         // emulator
         case CMD_MIFARE_SET_DBGMODE:
-            MifareSetDbgLvl(packet->core.old.arg[0]);
+            MifareSetDbgLvl(packet->oldarg[0]);
             break;
         case CMD_MIFARE_EML_MEMCLR:
-            MifareEMemClr(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2], packet->core.old.d.asBytes);
+            MifareEMemClr(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
             break;
         case CMD_MIFARE_EML_MEMSET:
-            MifareEMemSet(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2], packet->core.old.d.asBytes);
+            MifareEMemSet(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
             break;
         case CMD_MIFARE_EML_MEMGET:
-            MifareEMemGet(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2], packet->core.old.d.asBytes);
+            MifareEMemGet(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
             break;
         case CMD_MIFARE_EML_CARDLOAD:
-            MifareECardLoad(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2], packet->core.old.d.asBytes);
+            MifareECardLoad(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
             break;
 
         // Work with "magic Chinese" card
         case CMD_MIFARE_CSETBLOCK:
-            MifareCSetBlock(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.d.asBytes);
+            MifareCSetBlock(packet->oldarg[0], packet->oldarg[1], packet->data.asBytes);
             break;
         case CMD_MIFARE_CGETBLOCK:
-            MifareCGetBlock(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.d.asBytes);
+            MifareCGetBlock(packet->oldarg[0], packet->oldarg[1], packet->data.asBytes);
             break;
         case CMD_MIFARE_CIDENT:
             MifareCIdent();
             break;
         // mifare sniffer
 //        case CMD_MIFARE_SNIFFER:
-//            SniffMifare(packet->core.old.arg[0]);
+//            SniffMifare(packet->oldarg[0]);
 //            break;
         case CMD_MIFARE_SETMOD:
-            MifareSetMod(packet->core.old.arg[0], packet->core.old.d.asBytes);
+            MifareSetMod(packet->oldarg[0], packet->data.asBytes);
             break;
         //mifare desfire
         case CMD_MIFARE_DESFIRE_READBL:
@@ -991,19 +988,19 @@ static void UsbPacketReceived(UsbCommandNG *packet) {
         case CMD_MIFARE_DESFIRE_WRITEBL:
             break;
         case CMD_MIFARE_DESFIRE_AUTH1:
-            MifareDES_Auth1(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2], packet->core.old.d.asBytes);
+            MifareDES_Auth1(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
             break;
         case CMD_MIFARE_DESFIRE_AUTH2:
-            //MifareDES_Auth2(packet->core.old.arg[0],packet->core.old.d.asBytes);
+            //MifareDES_Auth2(packet->oldarg[0],packet->data.asBytes);
             break;
         case CMD_MIFARE_DES_READER:
-            //readermifaredes(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.d.asBytes);
+            //readermifaredes(packet->oldarg[0], packet->oldarg[1], packet->data.asBytes);
             break;
         case CMD_MIFARE_DESFIRE_INFO:
             MifareDesfireGetInformation();
             break;
         case CMD_MIFARE_DESFIRE:
-            MifareSendCommand(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.d.asBytes);
+            MifareSendCommand(packet->oldarg[0], packet->oldarg[1], packet->data.asBytes);
             break;
         case CMD_MIFARE_COLLECT_NONCES:
             break;
@@ -1018,45 +1015,45 @@ static void UsbPacketReceived(UsbCommandNG *packet) {
             SniffIClass();
             break;
         case CMD_SIMULATE_TAG_ICLASS:
-            SimulateIClass(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.arg[2], packet->core.old.d.asBytes);
+            SimulateIClass(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
             break;
         case CMD_READER_ICLASS:
-            ReaderIClass(packet->core.old.arg[0]);
+            ReaderIClass(packet->oldarg[0]);
             break;
         case CMD_READER_ICLASS_REPLAY:
-            ReaderIClass_Replay(packet->core.old.arg[0], packet->core.old.d.asBytes);
+            ReaderIClass_Replay(packet->oldarg[0], packet->data.asBytes);
             break;
         case CMD_ICLASS_EML_MEMSET:
             //iceman, should call FPGADOWNLOAD before, since it corrupts BigBuf
             FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-            emlSet(packet->core.old.d.asBytes, packet->core.old.arg[0], packet->core.old.arg[1]);
+            emlSet(packet->data.asBytes, packet->oldarg[0], packet->oldarg[1]);
             break;
         case CMD_ICLASS_WRITEBLOCK:
-            iClass_WriteBlock(packet->core.old.arg[0], packet->core.old.d.asBytes);
+            iClass_WriteBlock(packet->oldarg[0], packet->data.asBytes);
             break;
         case CMD_ICLASS_READCHECK:  // auth step 1
-            iClass_ReadCheck(packet->core.old.arg[0], packet->core.old.arg[1]);
+            iClass_ReadCheck(packet->oldarg[0], packet->oldarg[1]);
             break;
         case CMD_ICLASS_READBLOCK:
-            iClass_ReadBlk(packet->core.old.arg[0]);
+            iClass_ReadBlk(packet->oldarg[0]);
             break;
         case CMD_ICLASS_AUTHENTICATION: //check
-            iClass_Authentication(packet->core.old.d.asBytes);
+            iClass_Authentication(packet->data.asBytes);
             break;
         case CMD_ICLASS_CHECK_KEYS:
-            iClass_Authentication_fast(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.d.asBytes);
+            iClass_Authentication_fast(packet->oldarg[0], packet->oldarg[1], packet->data.asBytes);
             break;
         case CMD_ICLASS_DUMP:
-            iClass_Dump(packet->core.old.arg[0], packet->core.old.arg[1]);
+            iClass_Dump(packet->oldarg[0], packet->oldarg[1]);
             break;
         case CMD_ICLASS_CLONE:
-            iClass_Clone(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.d.asBytes);
+            iClass_Clone(packet->oldarg[0], packet->oldarg[1], packet->data.asBytes);
             break;
 #endif
 
 #ifdef WITH_HFSNIFF
         case CMD_HF_SNIFFER:
-            HfSniff(packet->core.old.arg[0], packet->core.old.arg[1]);
+            HfSniff(packet->oldarg[0], packet->oldarg[1]);
             break;
 #endif
 
@@ -1066,26 +1063,26 @@ static void UsbPacketReceived(UsbCommandNG *packet) {
             break;
         }
         case CMD_SMART_SETBAUD: {
-            SmartCardSetBaud(packet->core.old.arg[0]);
+            SmartCardSetBaud(packet->oldarg[0]);
             break;
         }
         case CMD_SMART_SETCLOCK: {
-            SmartCardSetClock(packet->core.old.arg[0]);
+            SmartCardSetClock(packet->oldarg[0]);
             break;
         }
         case CMD_SMART_RAW: {
-            SmartCardRaw(packet->core.old.arg[0], packet->core.old.arg[1], packet->core.old.d.asBytes);
+            SmartCardRaw(packet->oldarg[0], packet->oldarg[1], packet->data.asBytes);
             break;
         }
         case CMD_SMART_UPLOAD: {
             // upload file from client
             uint8_t *mem = BigBuf_get_addr();
-            memcpy(mem + packet->core.old.arg[0], packet->core.old.d.asBytes, USB_CMD_DATA_SIZE);
+            memcpy(mem + packet->oldarg[0], packet->data.asBytes, USB_CMD_DATA_SIZE);
             cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
             break;
         }
         case CMD_SMART_UPGRADE: {
-            SmartCardUpgrade(packet->core.old.arg[0]);
+            SmartCardUpgrade(packet->oldarg[0]);
             break;
         }
 #endif
@@ -1127,10 +1124,10 @@ static void UsbPacketReceived(UsbCommandNG *packet) {
             usart_writebuffer((uint8_t *)welcome, strlen(welcome));
 
             sprintf(dest, "| bytes 0x%02x 0x%02x 0x%02x 0x%02x\r\n"
-                    , packet->core.old.d.asBytes[0]
-                    , packet->core.old.d.asBytes[1]
-                    , packet->core.old.d.asBytes[2]
-                    , packet->core.old.d.asBytes[3]
+                    , packet->data.asBytes[0]
+                    , packet->data.asBytes[1]
+                    , packet->data.asBytes[2]
+                    , packet->data.asBytes[3]
                    );
             usart_writebuffer((uint8_t *)dest, strlen(dest));
 
@@ -1176,7 +1173,7 @@ static void UsbPacketReceived(UsbCommandNG *packet) {
             break;
 
         case CMD_LISTEN_READER_FIELD:
-            ListenReaderField(packet->core.old.arg[0]);
+            ListenReaderField(packet->oldarg[0]);
             break;
 
         case CMD_FPGA_MAJOR_MODE_OFF: // ## FPGA Control
@@ -1188,12 +1185,12 @@ static void UsbPacketReceived(UsbCommandNG *packet) {
         case CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K: {
             LED_B_ON();
             uint8_t *mem = BigBuf_get_addr();
-            uint32_t startidx = packet->core.old.arg[0];
-            uint32_t numofbytes = packet->core.old.arg[1];
+            uint32_t startidx = packet->oldarg[0];
+            uint32_t numofbytes = packet->oldarg[1];
             // arg0 = startindex
             // arg1 = length bytes to transfer
             // arg2 = BigBuf tracelen
-            //Dbprintf("transfer to client parameters: %" PRIu32 " | %" PRIu32 " | %" PRIu32, startidx, numofbytes, packet->core.old.arg[2]);
+            //Dbprintf("transfer to client parameters: %" PRIu32 " | %" PRIu32 " | %" PRIu32, startidx, numofbytes, packet->oldarg[2]);
 
             for (size_t i = 0; i < numofbytes; i += USB_CMD_DATA_SIZE) {
                 size_t len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);
@@ -1218,13 +1215,13 @@ static void UsbPacketReceived(UsbCommandNG *packet) {
             // arg1 = 0 upload for LF usage
             //        1 upload for HF usage
 #define FPGA_LF 1
-            if (packet->core.old.arg[1] == FPGA_LF)
+            if (packet->oldarg[1] == FPGA_LF)
                 FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
             else
                 FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
 
             uint8_t *mem = BigBuf_get_addr();
-            memcpy(mem + packet->core.old.arg[0], packet->core.old.d.asBytes, USB_CMD_DATA_SIZE);
+            memcpy(mem + packet->oldarg[0], packet->data.asBytes, USB_CMD_DATA_SIZE);
             cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
             break;
         }
@@ -1233,8 +1230,8 @@ static void UsbPacketReceived(UsbCommandNG *packet) {
             uint8_t *mem = BigBuf_get_EM_addr();
             bool isok = false;
             size_t len = 0;
-            uint32_t startidx = packet->core.old.arg[0];
-            uint32_t numofbytes = packet->core.old.arg[1];
+            uint32_t startidx = packet->oldarg[0];
+            uint32_t numofbytes = packet->oldarg[1];
 
             // arg0 = startindex
             // arg1 = length bytes to transfer
@@ -1252,16 +1249,16 @@ static void UsbPacketReceived(UsbCommandNG *packet) {
             break;
         }
         case CMD_READ_MEM:
-            ReadMem(packet->core.old.arg[0]);
+            ReadMem(packet->oldarg[0]);
             break;
 #ifdef WITH_FLASH
         case CMD_FLASHMEM_SET_SPIBAUDRATE:
-            FlashmemSetSpiBaudrate(packet->core.old.arg[0]);
+            FlashmemSetSpiBaudrate(packet->oldarg[0]);
             break;
         case CMD_FLASHMEM_READ: {
             LED_B_ON();
-            uint32_t startidx = packet->core.old.arg[0];
-            uint16_t len = packet->core.old.arg[1];
+            uint32_t startidx = packet->oldarg[0];
+            uint16_t len = packet->oldarg[1];
 
             Dbprintf("FlashMem read | %d - %d | ", startidx, len);
 
@@ -1294,9 +1291,9 @@ static void UsbPacketReceived(UsbCommandNG *packet) {
             LED_B_ON();
             uint8_t isok = 0;
             uint16_t res = 0;
-            uint32_t startidx = packet->core.old.arg[0];
-            uint16_t len = packet->core.old.arg[1];
-            uint8_t *data = packet->core.old.d.asBytes;
+            uint32_t startidx = packet->oldarg[0];
+            uint16_t len = packet->oldarg[1];
+            uint8_t *data = packet->data.asBytes;
 
             uint32_t tmp = startidx + len;
 
@@ -1355,8 +1352,8 @@ static void UsbPacketReceived(UsbCommandNG *packet) {
         }
         case CMD_FLASHMEM_WIPE: {
             LED_B_ON();
-            uint8_t page = packet->core.old.arg[0];
-            uint8_t initalwipe = packet->core.old.arg[1];
+            uint8_t page = packet->oldarg[0];
+            uint8_t initalwipe = packet->oldarg[1];
             bool isok = false;
             if (initalwipe) {
                 isok = Flash_WipeMemory();
@@ -1375,8 +1372,8 @@ static void UsbPacketReceived(UsbCommandNG *packet) {
 
             LED_B_ON();
             uint8_t *mem = BigBuf_malloc(USB_CMD_DATA_SIZE);
-            uint32_t startidx = packet->core.old.arg[0];
-            uint32_t numofbytes = packet->core.old.arg[1];
+            uint32_t startidx = packet->oldarg[0];
+            uint32_t numofbytes = packet->oldarg[1];
             // arg0 = startindex
             // arg1 = length bytes to transfer
             // arg2 = RFU
@@ -1423,11 +1420,11 @@ static void UsbPacketReceived(UsbCommandNG *packet) {
 #endif
         case CMD_SET_LF_DIVISOR:
             FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-            FpgaSendCommand(FPGA_CMD_SET_DIVISOR, packet->core.old.arg[0]);
+            FpgaSendCommand(FPGA_CMD_SET_DIVISOR, packet->oldarg[0]);
             break;
 
         case CMD_SET_ADC_MUX:
-            switch (packet->core.old.arg[0]) {
+            switch (packet->oldarg[0]) {
                 case 0:
                     SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
                     break;
@@ -1453,7 +1450,7 @@ static void UsbPacketReceived(UsbCommandNG *packet) {
             break;
         case CMD_PING:
             if (packet->ng) {
-                reply_ng(CMD_PING, PM3_SUCCESS, packet->core.ng.data, packet->length);
+                reply_ng(CMD_PING, PM3_SUCCESS, packet->data.asBytes, packet->length);
             } else {
 #ifdef WITH_FPC_HOST
                 cmd_send(CMD_ACK, reply_via_fpc, 0, 0, 0, 0);
@@ -1467,7 +1464,7 @@ static void UsbPacketReceived(UsbCommandNG *packet) {
             LCDReset();
             break;
         case CMD_LCD:
-            LCDSend(packet->core.old.arg[0]);
+            LCDSend(packet->oldarg[0]);
             break;
 #endif
         case CMD_SETUP_WRITE:
@@ -1501,7 +1498,7 @@ static void UsbPacketReceived(UsbCommandNG *packet) {
             break;
         }
         default:
-            Dbprintf("%s: 0x%04x", "unknown command:", cmd);
+            Dbprintf("%s: 0x%04x", "unknown command:", packet->cmd);
             break;
     }
 }
@@ -1567,6 +1564,7 @@ void  __attribute__((noreturn)) AppMain(void) {
     usb_enable();
 
     UsbCommandNG rx;
+    UsbCommandNGRaw rx_raw;
 
     for (;;) {
         WDT_HIT();
@@ -1574,28 +1572,36 @@ void  __attribute__((noreturn)) AppMain(void) {
         // Check if there is a usb packet available
         if (usb_poll_validate_length()) {
             bool error = false;
-            size_t bytes = usb_read_ng((uint8_t *)&rx, sizeof(UsbCommandNGPreamble));
+            size_t bytes = usb_read_ng((uint8_t *)&rx_raw.pre, sizeof(UsbCommandNGPreamble));
             if (bytes == sizeof(UsbCommandNGPreamble)) {
+                rx.magic = rx_raw.pre.magic;
+                rx.length = rx_raw.pre.length;
+                rx.cmd = rx_raw.pre.cmd;
                 if (rx.magic == USB_COMMANDNG_PREAMBLE_MAGIC) { // New style NG command
                     if (rx.length > USB_CMD_DATA_SIZE) {
                         Dbprintf("Packet frame with incompatible length: 0x%04x", rx.length);
                         error = true;
                     }
                     if (!error) { // Get the core and variable length payload
-                        bytes = usb_read_ng(((uint8_t *)&rx.core), sizeof(UsbPacketNGCore) - USB_CMD_DATA_SIZE + rx.length);
-                        if (bytes != sizeof(UsbPacketNGCore) - USB_CMD_DATA_SIZE + rx.length) {
+                        bytes = usb_read_ng(((uint8_t *)&rx_raw.data), rx.length);
+                        if (bytes != rx.length) {
                             Dbprintf("Packet frame error variable part too short? %d/%d", bytes, rx.length);
                             error = true;
+                        } else {
+                            memcpy(&rx.data, &rx_raw.data, rx.length);
                         }
                     }
                     if (!error) {                        // Get the postamble
-                        bytes = usb_read_ng(((uint8_t *)&rx.crc), sizeof(UsbCommandNGPostamble));
+                        bytes = usb_read_ng(((uint8_t *)&rx_raw.foopost), sizeof(UsbCommandNGPostamble));
                         if (bytes != sizeof(UsbCommandNGPostamble)) {
                             Dbprintf("Packet frame error fetching postamble");
                             error = true;
                         }
+                    }
+                    if (!error) {                        // Check CRC
+                        rx.crc = rx_raw.foopost.crc;
                         uint8_t first, second;
-                        compute_crc(CRC_14443_A, (uint8_t *)&rx, sizeof(UsbCommandNGPreamble) + sizeof(UsbPacketNGCore) - USB_CMD_DATA_SIZE + rx.length, &first, &second);
+                        compute_crc(CRC_14443_A, (uint8_t *)&rx_raw, sizeof(UsbCommandNGPreamble) + rx.length, &first, &second);
                         if ((first << 8) + second != rx.crc) {
                             Dbprintf("Packet frame CRC error %02X%02X <> %04X", first, second, rx.crc);
                             error = true;
@@ -1609,13 +1615,9 @@ void  __attribute__((noreturn)) AppMain(void) {
                         UsbPacketReceived(&rx);
                     }
                 } else {                               // Old style command
-                    uint8_t tmp[sizeof(UsbCommandNGPreamble)];
-                    memcpy(tmp, &rx, sizeof(UsbCommandNGPreamble));
-                    memcpy(&rx.core.old, tmp, sizeof(UsbCommandNGPreamble));
-
-
-
-                    bytes = usb_read_ng(((uint8_t *)&rx.core.old) + sizeof(UsbCommandNGPreamble), sizeof(UsbCommandOLD) - sizeof(UsbCommandNGPreamble));
+                    UsbCommandOLD rx_old;
+                    memcpy(&rx_old, &rx_raw.pre, sizeof(UsbCommandNGPreamble));
+                    bytes = usb_read_ng(((uint8_t *)&rx_old) + sizeof(UsbCommandNGPreamble), sizeof(UsbCommandOLD) - sizeof(UsbCommandNGPreamble));
                     if (bytes != sizeof(UsbCommandOLD) - sizeof(UsbCommandNGPreamble)) {
                         Dbprintf("Packet frame error var part too short? %d/%d", bytes, sizeof(UsbCommandOLD) - sizeof(UsbCommandNGPreamble));
                         error = true;
@@ -1626,8 +1628,13 @@ void  __attribute__((noreturn)) AppMain(void) {
 #endif
                         rx.ng = false;
                         rx.magic = 0;
-                        rx.length = USB_CMD_DATA_SIZE;
                         rx.crc = 0;
+                        rx.cmd = rx_old.cmd;
+                        rx.oldarg[0] = rx_old.arg[0];
+                        rx.oldarg[1] = rx_old.arg[1];
+                        rx.oldarg[2] = rx_old.arg[2];
+                        rx.length = USB_CMD_DATA_SIZE;
+                        memcpy(&rx.data, &rx_old.d, rx.length);
                         UsbPacketReceived(&rx);
                     }
                 }
diff --git a/armsrc/epa.c b/armsrc/epa.c
index 8c1db359c..be3145452 100644
--- a/armsrc/epa.c
+++ b/armsrc/epa.c
@@ -313,7 +313,7 @@ void EPA_PACE_Collect_Nonce(UsbCommandNG *c) {
 
     // now get the nonce
     uint8_t nonce[256] = {0};
-    uint8_t requested_size = (uint8_t)c->core.old.arg[0];
+    uint8_t requested_size = (uint8_t)c->oldarg[0];
     func_return = EPA_PACE_Get_Nonce(requested_size, nonce);
     // check if the command succeeded
     if (func_return < 0) {
@@ -434,19 +434,19 @@ void EPA_PACE_Replay(UsbCommandNG *c) {
     uint32_t timings[sizeof(apdu_lengths_replay) / sizeof(apdu_lengths_replay[0])] = {0};
 
     // if an APDU has been passed, save it
-    if (c->core.old.arg[0] != 0) {
+    if (c->oldarg[0] != 0) {
         // make sure it's not too big
-        if (c->core.old.arg[2] > apdus_replay[c->core.old.arg[0] - 1].len) {
+        if (c->oldarg[2] > apdus_replay[c->oldarg[0] - 1].len) {
             cmd_send(CMD_ACK, 1, 0, 0, NULL, 0);
         }
-        memcpy(apdus_replay[c->core.old.arg[0] - 1].data + c->core.old.arg[1],
-               c->core.old.d.asBytes,
-               c->core.old.arg[2]);
+        memcpy(apdus_replay[c->oldarg[0] - 1].data + c->oldarg[1],
+               c->data.asBytes,
+               c->oldarg[2]);
         // save/update APDU length
-        if (c->core.old.arg[1] == 0) {
-            apdu_lengths_replay[c->core.old.arg[0] - 1] = c->core.old.arg[2];
+        if (c->oldarg[1] == 0) {
+            apdu_lengths_replay[c->oldarg[0] - 1] = c->oldarg[2];
         } else {
-            apdu_lengths_replay[c->core.old.arg[0] - 1] += c->core.old.arg[2];
+            apdu_lengths_replay[c->oldarg[0] - 1] += c->oldarg[2];
         }
         cmd_send(CMD_ACK, 0, 0, 0, NULL, 0);
         return;
diff --git a/armsrc/felica.c b/armsrc/felica.c
index 5172e98ef..6ab60fc5f 100644
--- a/armsrc/felica.c
+++ b/armsrc/felica.c
@@ -479,9 +479,9 @@ void felica_sendraw(UsbCommandNG *c) {
 
     if (MF_DBGLEVEL > 3) Dbprintf("FeliCa_sendraw Enter");
 
-    felica_command_t param = c->core.old.arg[0];
-    size_t len = c->core.old.arg[1] & 0xffff;
-    uint8_t *cmd = c->core.old.d.asBytes;
+    felica_command_t param = c->oldarg[0];
+    size_t len = c->oldarg[1] & 0xffff;
+    uint8_t *cmd = c->data.asBytes;
     uint32_t arg0;
 
     felica_card_select_t card;
diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 05176d903..07711ad80 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -2351,11 +2351,11 @@ int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, bool send_chaining, void *data, u
 // arg2         timeout
 // d.asBytes command bytes to send
 void ReaderIso14443a(UsbCommandNG *c) {
-    iso14a_command_t param = c->core.old.arg[0];
-    size_t len = c->core.old.arg[1] & 0xffff;
-    size_t lenbits = c->core.old.arg[1] >> 16;
-    uint32_t timeout = c->core.old.arg[2];
-    uint8_t *cmd = c->core.old.d.asBytes;
+    iso14a_command_t param = c->oldarg[0];
+    size_t len = c->oldarg[1] & 0xffff;
+    size_t lenbits = c->oldarg[1] >> 16;
+    uint32_t timeout = c->oldarg[2];
+    uint8_t *cmd = c->data.asBytes;
     uint32_t arg0;
     uint8_t buf[USB_CMD_DATA_SIZE] = {0x00};
     uint8_t par[MAX_PARITY_SIZE] = {0x00};
diff --git a/armsrc/iso14443b.c b/armsrc/iso14443b.c
index 5044d0bc2..aa3abcfb1 100644
--- a/armsrc/iso14443b.c
+++ b/armsrc/iso14443b.c
@@ -1567,10 +1567,10 @@ void iso14b_set_trigger(bool enable) {
  *
  */
 void SendRawCommand14443B_Ex(UsbCommandNG *c) {
-    iso14b_command_t param = c->core.old.arg[0];
-    size_t len = c->core.old.arg[1] & 0xffff;
-    uint32_t timeout = c->core.old.arg[2];
-    uint8_t *cmd = c->core.old.d.asBytes;
+    iso14b_command_t param = c->oldarg[0];
+    size_t len = c->oldarg[1] & 0xffff;
+    uint32_t timeout = c->oldarg[2];
+    uint8_t *cmd = c->data.asBytes;
     uint8_t status;
     uint32_t sendlen = sizeof(iso14b_card_select_t);
     uint8_t buf[USB_CMD_DATA_SIZE] = {0x00};
diff --git a/bootrom/bootrom.c b/bootrom/bootrom.c
index 7fa20ec0a..78bda337c 100644
--- a/bootrom/bootrom.c
+++ b/bootrom/bootrom.c
@@ -90,9 +90,9 @@ void UsbPacketReceived(UsbCommandNG *packet) {
 
     //if ( len != sizeof(UsbCommand)) Fatal();
 
-    uint32_t arg0 = (uint32_t)packet->core.old.arg[0];
+    uint32_t arg0 = (uint32_t)packet->oldarg[0];
 
-    switch (packet->core.old.cmd) {
+    switch (packet->cmd) {
         case CMD_DEVICE_INFO: {
             dont_ack = 1;
             arg0 = DEVICE_INFO_FLAG_BOOTROM_PRESENT | DEVICE_INFO_FLAG_CURRENT_MODE_BOOTROM |
@@ -110,7 +110,7 @@ void UsbPacketReceived(UsbCommandNG *packet) {
             */
             p = (volatile uint32_t *)&_flash_start;
             for (i = 0; i < 12; i++)
-                p[i + arg0] = packet->core.old.d.asDwords[i];
+                p[i + arg0] = packet->data.asDwords[i];
         }
         break;
 
@@ -118,7 +118,7 @@ void UsbPacketReceived(UsbCommandNG *packet) {
             uint32_t *flash_mem = (uint32_t *)(&_flash_start);
             for (int j = 0; j < 2; j++) {
                 for (i = 0 + (64 * j); i < 64 + (64 * j); i++) {
-                    flash_mem[i] = packet->core.old.d.asDwords[i];
+                    flash_mem[i] = packet->data.asDwords[i];
                 }
 
                 uint32_t flash_address = arg0 + (0x100 * j);
@@ -154,7 +154,7 @@ void UsbPacketReceived(UsbCommandNG *packet) {
         break;
 
         case CMD_START_FLASH: {
-            if (packet->core.old.arg[2] == START_FLASH_MAGIC)
+            if (packet->oldarg[2] == START_FLASH_MAGIC)
                 bootrom_unlocked = 1;
             else
                 bootrom_unlocked = 0;
@@ -163,8 +163,8 @@ void UsbPacketReceived(UsbCommandNG *packet) {
             int prot_end = (int)&_bootrom_end;
             int allow_start = (int)&_flash_start;
             int allow_end = (int)&_flash_end;
-            int cmd_start = packet->core.old.arg[0];
-            int cmd_end = packet->core.old.arg[1];
+            int cmd_start = packet->oldarg[0];
+            int cmd_end = packet->oldarg[1];
 
             /* Only allow command if the bootrom is unlocked, or the parameters are outside of the protected
             * bootrom area. In any case they must be within the flash area.
diff --git a/client/comms.c b/client/comms.c
index 571a1d8fc..a3643898f 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -26,7 +26,7 @@ static pthread_t USB_communication_thread;
 
 // Transmit buffer.
 static UsbCommandOLD txBuffer;
-static UsbCommandNG txBufferNG;
+static UsbCommandNGRaw txBufferNG;
 size_t txBufferNGLen;
 static bool txBuffer_pending = false;
 static pthread_mutex_t txBufferMutex = PTHREAD_MUTEX_INITIALIZER;
@@ -104,7 +104,7 @@ void SendCommandNG(uint16_t cmd, uint8_t *data, size_t len) {
         return;
     }
 
-    UsbCommandNGPostamble *tx_post = (UsbCommandNGPostamble *)((uint8_t *)&txBufferNG + sizeof(UsbCommandNGPreamble) + sizeof(UsbPacketNGCore) - USB_CMD_DATA_SIZE + len);
+    UsbCommandNGPostamble *tx_post = (UsbCommandNGPostamble *)((uint8_t *)&txBufferNG + sizeof(UsbCommandNGPreamble) + len);
 
     pthread_mutex_lock(&txBufferMutex);
     /**
@@ -116,14 +116,14 @@ void SendCommandNG(uint16_t cmd, uint8_t *data, size_t len) {
         pthread_cond_wait(&txBufferSig, &txBufferMutex);
     }
 
-    txBufferNG.magic = USB_COMMANDNG_PREAMBLE_MAGIC;
-    txBufferNG.length = len;
-    txBufferNG.core.ng.cmd = cmd;
-    memcpy(&txBufferNG.core.ng.data, data, len);
+    txBufferNG.pre.magic = USB_COMMANDNG_PREAMBLE_MAGIC;
+    txBufferNG.pre.length = len;
+    txBufferNG.pre.cmd = cmd;
+    memcpy(&txBufferNG.data, data, len);
     uint8_t first, second;
-    compute_crc(CRC_14443_A, (uint8_t *)&txBufferNG, sizeof(UsbCommandNGPreamble) + sizeof(UsbPacketNGCore) - USB_CMD_DATA_SIZE + len, &first, &second);
+    compute_crc(CRC_14443_A, (uint8_t *)&txBufferNG, sizeof(UsbCommandNGPreamble) + len, &first, &second);
     tx_post->crc = (first << 8) + second;
-    txBufferNGLen = sizeof(UsbCommandNGPreamble) + sizeof(UsbPacketNGCore) - USB_CMD_DATA_SIZE + len + sizeof(UsbCommandNGPostamble);
+    txBufferNGLen = sizeof(UsbCommandNGPreamble) + len + sizeof(UsbCommandNGPostamble);
     txBuffer_pending = true;
 
     // tell communication thread that a new command can be send
@@ -311,13 +311,13 @@ __attribute__((force_align_arg_pointer))
                     }
                 }
                 if (!error) {                        // Get the postamble
-                    if ((!uart_receive(sp, (uint8_t *)&rx_raw.post, sizeof(UsbReplyNGPostamble), &rxlen)) || (rxlen != sizeof(UsbReplyNGPostamble))) {
+                    if ((!uart_receive(sp, (uint8_t *)&rx_raw.foopost, sizeof(UsbReplyNGPostamble), &rxlen)) || (rxlen != sizeof(UsbReplyNGPostamble))) {
                         PrintAndLogEx(WARNING, "Received packet frame error fetching postamble");
                         error = true;
                     }
                 }
                 if (!error) {                        // Check CRC
-                    rx.crc = rx_raw.post.crc;
+                    rx.crc = rx_raw.foopost.crc;
                     uint8_t first, second;
                     compute_crc(CRC_14443_A, (uint8_t *)&rx_raw, sizeof(UsbReplyNGPreamble) + rx.length, &first, &second);
                     if ((first << 8) + second != rx.crc) {
diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index ed6ba08e8..a460dd980 100644
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -35,14 +35,10 @@ typedef struct {
     } d;
 } PACKED UsbCommandOLD;
 
-typedef struct {
-    uint16_t cmd;
-    uint8_t data[USB_CMD_DATA_SIZE];
-} PACKED UsbPacketNGCore;
-
 typedef struct {
     uint32_t magic;
     uint16_t length;  // length of the variable part, 0 if none.
+    uint16_t cmd;
 } PACKED UsbCommandNGPreamble;
 
 #define USB_COMMANDNG_PREAMBLE_MAGIC 0x61334d50 // PM3a
@@ -51,17 +47,27 @@ typedef struct {
     uint16_t crc;
 } PACKED UsbCommandNGPostamble;
 
+// For internal usage
 typedef struct {
-    uint32_t magic;
-    uint16_t length;  // length of the variable part, 0 if none.
-    union {           // we can simplify it once we get rid of old format compatibility
-        UsbPacketNGCore ng;
-        UsbCommandOLD old;
-    } core;
-    uint16_t crc;
-    bool ng;
+    uint16_t cmd;
+    uint16_t length;
+    uint32_t magic;      //  NG
+    uint16_t crc;        //  NG
+    uint64_t oldarg[3];  //  OLD
+    union {
+        uint8_t  asBytes[USB_CMD_DATA_SIZE];
+        uint32_t asDwords[USB_CMD_DATA_SIZE / 4];
+    } data;
+    bool ng;             // does it store NG data or OLD data?
 } PACKED UsbCommandNG;
 
+// For reception and CRC check
+typedef struct {
+    UsbCommandNGPreamble pre;
+    uint8_t data[USB_CMD_DATA_SIZE];
+    UsbCommandNGPostamble foopost; // Probably not at that offset!
+} PACKED UsbCommandNGRaw;
+
 typedef struct {
     uint32_t magic;
     uint16_t length;  // length of the variable part, 0 if none.
@@ -94,7 +100,7 @@ typedef struct {
 typedef struct {
     UsbReplyNGPreamble pre;
     uint8_t data[USB_CMD_DATA_SIZE];
-    UsbReplyNGPostamble post;
+    UsbReplyNGPostamble foopost; // Probably not at that offset!
 } PACKED UsbReplyNGRaw;
 
 #ifdef WITH_FPC_HOST

From cb411ffab444e065835b5e2cd1b352768c69f534 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 18 Apr 2019 00:50:31 +0200
Subject: [PATCH 1326/1938] receive_ng in common/

---
 armsrc/appmain.c | 79 ++++--------------------------------------------
 armsrc/apps.h    |  1 -
 common/cmd.c     | 52 +++++++++++++++++++++++++++++++
 common/cmd.h     |  1 +
 4 files changed, 59 insertions(+), 74 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index dd029b3e2..57189342a 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1563,90 +1563,23 @@ void  __attribute__((noreturn)) AppMain(void) {
     usb_disable();
     usb_enable();
 
-    UsbCommandNG rx;
-    UsbCommandNGRaw rx_raw;
-
     for (;;) {
         WDT_HIT();
 
         // Check if there is a usb packet available
         if (usb_poll_validate_length()) {
-            bool error = false;
-            size_t bytes = usb_read_ng((uint8_t *)&rx_raw.pre, sizeof(UsbCommandNGPreamble));
-            if (bytes == sizeof(UsbCommandNGPreamble)) {
-                rx.magic = rx_raw.pre.magic;
-                rx.length = rx_raw.pre.length;
-                rx.cmd = rx_raw.pre.cmd;
-                if (rx.magic == USB_COMMANDNG_PREAMBLE_MAGIC) { // New style NG command
-                    if (rx.length > USB_CMD_DATA_SIZE) {
-                        Dbprintf("Packet frame with incompatible length: 0x%04x", rx.length);
-                        error = true;
-                    }
-                    if (!error) { // Get the core and variable length payload
-                        bytes = usb_read_ng(((uint8_t *)&rx_raw.data), rx.length);
-                        if (bytes != rx.length) {
-                            Dbprintf("Packet frame error variable part too short? %d/%d", bytes, rx.length);
-                            error = true;
-                        } else {
-                            memcpy(&rx.data, &rx_raw.data, rx.length);
-                        }
-                    }
-                    if (!error) {                        // Get the postamble
-                        bytes = usb_read_ng(((uint8_t *)&rx_raw.foopost), sizeof(UsbCommandNGPostamble));
-                        if (bytes != sizeof(UsbCommandNGPostamble)) {
-                            Dbprintf("Packet frame error fetching postamble");
-                            error = true;
-                        }
-                    }
-                    if (!error) {                        // Check CRC
-                        rx.crc = rx_raw.foopost.crc;
-                        uint8_t first, second;
-                        compute_crc(CRC_14443_A, (uint8_t *)&rx_raw, sizeof(UsbCommandNGPreamble) + rx.length, &first, &second);
-                        if ((first << 8) + second != rx.crc) {
-                            Dbprintf("Packet frame CRC error %02X%02X <> %04X", first, second, rx.crc);
-                            error = true;
-                        }
-                    }
-                    if (!error) {
-#ifdef WITH_FPC_HOST
-                        reply_via_fpc = false;
-#endif
-                        rx.ng = true;
-                        UsbPacketReceived(&rx);
-                    }
-                } else {                               // Old style command
-                    UsbCommandOLD rx_old;
-                    memcpy(&rx_old, &rx_raw.pre, sizeof(UsbCommandNGPreamble));
-                    bytes = usb_read_ng(((uint8_t *)&rx_old) + sizeof(UsbCommandNGPreamble), sizeof(UsbCommandOLD) - sizeof(UsbCommandNGPreamble));
-                    if (bytes != sizeof(UsbCommandOLD) - sizeof(UsbCommandNGPreamble)) {
-                        Dbprintf("Packet frame error var part too short? %d/%d", bytes, sizeof(UsbCommandOLD) - sizeof(UsbCommandNGPreamble));
-                        error = true;
-                    }
-                    if (!error) {
-#ifdef WITH_FPC_HOST
-                        reply_via_fpc = false;
-#endif
-                        rx.ng = false;
-                        rx.magic = 0;
-                        rx.crc = 0;
-                        rx.cmd = rx_old.cmd;
-                        rx.oldarg[0] = rx_old.arg[0];
-                        rx.oldarg[1] = rx_old.arg[1];
-                        rx.oldarg[2] = rx_old.arg[2];
-                        rx.length = USB_CMD_DATA_SIZE;
-                        memcpy(&rx.data, &rx_old.d, rx.length);
-                        UsbPacketReceived(&rx);
-                    }
-                }
+            UsbCommandNG rx;
+            if (receive_ng(&rx) == 0) {
+                UsbPacketReceived(&rx);
             } else {
-                Dbprintf("Packet frame preamble too short: %d/%d", bytes, sizeof(UsbCommandNGPreamble));
-                error = true;
+                Dbprintf("Error in frame reception");
+                // TODO DOEGOX if error, shall we resync ?
             }
-            // TODO DOEGOX if error, shall we resync ?
         }
 #ifdef WITH_FPC_HOST
         // Check if there is a FPC packet available
 // TODO DOEGOX NG packets support here too
+        UsbCommandNG rx;
         if (usart_readbuffer((uint8_t *)&rx)) {
             reply_via_fpc = true;
             rx.ng = false;
diff --git a/armsrc/apps.h b/armsrc/apps.h
index afa505123..68d9f570b 100644
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -222,7 +222,6 @@ void iClass_Clone(uint8_t startblock, uint8_t endblock, uint8_t *data);
 void iClass_ReadCheck(uint8_t blockno, uint8_t keytype);
 
 // cmd.h
-uint8_t cmd_receive(UsbCommandOLD *cmd);
 uint8_t cmd_send(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
 
 // util.h
diff --git a/common/cmd.c b/common/cmd.c
index 2d54a2d2f..7988088bd 100644
--- a/common/cmd.c
+++ b/common/cmd.c
@@ -127,3 +127,55 @@ uint8_t reply_ng(uint16_t cmd, int16_t status, uint8_t *data, size_t len) {
 
     return sendlen;
 }
+
+int16_t receive_ng(UsbCommandNG *rx) {
+    UsbCommandNGRaw rx_raw;
+    size_t bytes = usb_read_ng((uint8_t *)&rx_raw.pre, sizeof(UsbCommandNGPreamble));
+    if (bytes != sizeof(UsbCommandNGPreamble))
+        return PM3_EIO;
+    rx->magic = rx_raw.pre.magic;
+    rx->length = rx_raw.pre.length;
+    rx->cmd = rx_raw.pre.cmd;
+    if (rx->magic == USB_COMMANDNG_PREAMBLE_MAGIC) { // New style NG command
+        if (rx->length > USB_CMD_DATA_SIZE)
+            return PM3_EOVFLOW;
+        // Get the core and variable length payload
+        bytes = usb_read_ng((uint8_t *)&rx_raw.data, rx->length);
+        if (bytes != rx->length)
+            return PM3_EIO;
+        memcpy(rx->data.asBytes, rx_raw.data, rx->length);
+        // Get the postamble
+        bytes = usb_read_ng((uint8_t *)&rx_raw.foopost, sizeof(UsbCommandNGPostamble));
+        if (bytes != sizeof(UsbCommandNGPostamble))
+            return PM3_EIO;
+        // Check CRC
+        rx->crc = rx_raw.foopost.crc;
+        uint8_t first, second;
+        compute_crc(CRC_14443_A, (uint8_t *)&rx_raw, sizeof(UsbCommandNGPreamble) + rx->length, &first, &second);
+        if ((first << 8) + second != rx->crc)
+            return PM3_EIO;
+#ifdef WITH_FPC_HOST
+        reply_via_fpc = false;
+#endif
+        rx->ng = true;
+    } else {                               // Old style command
+        UsbCommandOLD rx_old;
+        memcpy(&rx_old, &rx_raw.pre, sizeof(UsbCommandNGPreamble));
+        bytes = usb_read_ng(((uint8_t *)&rx_old) + sizeof(UsbCommandNGPreamble), sizeof(UsbCommandOLD) - sizeof(UsbCommandNGPreamble));
+        if (bytes != sizeof(UsbCommandOLD) - sizeof(UsbCommandNGPreamble))
+            return PM3_EIO;
+#ifdef WITH_FPC_HOST
+        reply_via_fpc = false;
+#endif
+        rx->ng = false;
+        rx->magic = 0;
+        rx->crc = 0;
+        rx->cmd = rx_old.cmd;
+        rx->oldarg[0] = rx_old.arg[0];
+        rx->oldarg[1] = rx_old.arg[1];
+        rx->oldarg[2] = rx_old.arg[2];
+        rx->length = USB_CMD_DATA_SIZE;
+        memcpy(&rx->data, &rx_old.d.asBytes, rx->length);
+    }
+    return PM3_SUCCESS;
+}
diff --git a/common/cmd.h b/common/cmd.h
index a07ef35d0..f7dc52e7b 100644
--- a/common/cmd.h
+++ b/common/cmd.h
@@ -41,6 +41,7 @@
 
 uint8_t cmd_send(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
 uint8_t reply_ng(uint16_t cmd, int16_t status, uint8_t *data, size_t len);
+int16_t receive_ng(UsbCommandNG *rx);
 
 #endif // _PROXMARK_CMD_H_
 

From 72dd4d5ddeb19f19bb40de8459894f18d5f985bf Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 18 Apr 2019 09:27:38 +0200
Subject: [PATCH 1327/1938] chg: 'fpga lf sim' - 25% both on sides.

---
 fpga/lo_simulate.v | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fpga/lo_simulate.v b/fpga/lo_simulate.v
index 57e602a2b..687bed27c 100644
--- a/fpga/lo_simulate.v
+++ b/fpga/lo_simulate.v
@@ -64,7 +64,7 @@ reg output_state;
 always @(posedge pck0)
 begin
 	if((pck_divider == 8'd7) && !clk_state) begin
-		is_high = (adc_d >= 8'd200);
+		is_high = (adc_d >= 8'd191);
 		is_low = (adc_d <= 8'd64);
 	end
 end

From 1033b67f3c6c02d2f3aabc8e6ea5e5fb0995acfe Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 18 Apr 2019 09:41:31 +0200
Subject: [PATCH 1328/1938] chg: fpga lf simulation

---
 fpga/Makefile    |   2 +-
 fpga/fpga_lf.bit | Bin 42175 -> 42175 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/fpga/Makefile b/fpga/Makefile
index 324b48c7b..0a30cad29 100644
--- a/fpga/Makefile
+++ b/fpga/Makefile
@@ -1,4 +1,4 @@
-include ../common/Makefile.common
+include ../common/Makefile.common      # for $(DETECTED_OS)
 
 all: fpga_lf.bit fpga_hf.bit
 clean:
diff --git a/fpga/fpga_lf.bit b/fpga/fpga_lf.bit
index 7d9a840a33150630332b2219d4c4f14ee3ada715..a668017bf5bd30773e80319dcf61b46028fa9333 100644
GIT binary patch
delta 32
ocmdmgl4<`*rU_=kmih`N`i2$^DGZznmR825R>npfJ<FB=0HuNnT>t<8

delta 32
ocmdmgl4<`*rU_=k7WxX7`U(~dDGZ#3##W~0R;Gp<J<FB=0Hsg~U;qFB


From 8bf8f1735ef2c68739a60bef662048f1137fa3cb Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Thu, 18 Apr 2019 11:25:57 +0300
Subject: [PATCH 1329/1938] smallfix

---
 client/emv/emv_roca.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/emv/emv_roca.c b/client/emv/emv_roca.c
index 13428826a..a3a8cb7fe 100644
--- a/client/emv/emv_roca.c
+++ b/client/emv/emv_roca.c
@@ -142,6 +142,7 @@ cleanup:
 int roca_self_test(void) {
     int ret = 0;
 
+    PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(INFO, "ROCA check vulnerability tests");
 
     // positive

From 15558070adaa76c7b3aa4c5968b9a3b5c6de09dc Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 18 Apr 2019 10:41:11 +0200
Subject: [PATCH 1330/1938] Fix receive_ng returned val test

---
 armsrc/appmain.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 57189342a..adbf6b315 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1569,7 +1569,7 @@ void  __attribute__((noreturn)) AppMain(void) {
         // Check if there is a usb packet available
         if (usb_poll_validate_length()) {
             UsbCommandNG rx;
-            if (receive_ng(&rx) == 0) {
+            if (receive_ng(&rx) == PM3_SUCCESS) {
                 UsbPacketReceived(&rx);
             } else {
                 Dbprintf("Error in frame reception");

From 0e855f647a3e8104f87eb1e285a40c2fee01b65f Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 18 Apr 2019 10:45:24 +0200
Subject: [PATCH 1331/1938] typo

---
 client/cmdhficlass.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index 0850e6606..5372022ab 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -2439,7 +2439,7 @@ static command_t CommandTable[] = {
     {"readblk",     CmdHFiClass_ReadBlock,      0, "[options..] Authenticate and Read iClass block"},
     {"reader",      CmdHFiClassReader,          0, "            Act like an iClass reader"},
     {"readtagfile", CmdHFiClassReadTagFile,     1, "[options..] Display Content from tagfile"},
-    {"replay",      CmdHFiClassReader_Replay,   0, "<mac>       Read an iClass tag via Reply Attack"},
+    {"replay",      CmdHFiClassReader_Replay,   0, "<mac>       Read an iClass tag via Replay Attack"},
     {"sim",         CmdHFiClassSim,             0, "[options..] Simulate iClass tag"},
     {"sniff",       CmdHFiClassSniff,           0, "            Eavesdrop iClass communication"},
     {"writeblk",    CmdHFiClass_WriteBlock,     0, "[options..] Authenticate and Write iClass block"},

From 482db057413b196efd90547c9c9a7ebd80e0c503 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 18 Apr 2019 12:43:35 +0200
Subject: [PATCH 1332/1938] Rename few stuff for consistency

---
 armsrc/Standalone/hf_colin.c |  6 +--
 armsrc/Standalone/hf_young.c |  4 +-
 armsrc/appmain.c             | 68 ++++++++++++++---------------
 armsrc/apps.h                | 12 +++---
 armsrc/epa.c                 | 18 ++++----
 armsrc/felica.c              | 10 ++---
 armsrc/hitag2.c              |  6 +--
 armsrc/hitagS.c              |  6 +--
 armsrc/iclass.c              | 36 ++++++++--------
 armsrc/iso14443a.c           | 18 ++++----
 armsrc/iso14443a.h           |  2 +-
 armsrc/iso14443b.c           | 10 ++---
 armsrc/iso14443b.h           |  2 +-
 armsrc/iso15693.c            |  6 +--
 armsrc/legicrf.c             | 22 +++++-----
 armsrc/lfops.c               | 18 ++++----
 armsrc/mifarecmd.c           | 46 ++++++++++----------
 armsrc/mifaredesfire.c       | 12 +++---
 armsrc/mifaresim.c           |  2 +-
 armsrc/mifaresniff.c         |  6 +--
 armsrc/pcf7931.c             |  2 +-
 bootrom/bootrom.c            | 20 ++++-----
 client/cli.c                 |  2 +-
 client/cmdanalyse.c          |  4 +-
 client/cmddata.c             |  8 ++--
 client/cmdflashmem.c         | 18 ++++----
 client/cmdhf.c               |  4 +-
 client/cmdhf14a.c            | 48 ++++++++++-----------
 client/cmdhf14b.c            | 46 ++++++++++----------
 client/cmdhf15.c             | 40 ++++++++---------
 client/cmdhfepa.c            |  8 ++--
 client/cmdhffelica.c         | 22 +++++-----
 client/cmdhficlass.c         | 52 +++++++++++-----------
 client/cmdhflegic.c          | 28 ++++++------
 client/cmdhfmf.c             | 62 +++++++++++++-------------
 client/cmdhfmfdes.c          | 28 ++++++------
 client/cmdhfmfdesfire.c      | 16 +++----
 client/cmdhfmfhard.c         |  6 +--
 client/cmdhfmfp.c            |  4 +-
 client/cmdhfmfu.c            | 48 ++++++++++-----------
 client/cmdhftopaz.c          |  8 ++--
 client/cmdhw.c               | 30 ++++++-------
 client/cmdlf.c               | 22 +++++-----
 client/cmdlfawid.c           | 14 +++---
 client/cmdlfcotag.c          |  2 +-
 client/cmdlfem4x.c           | 12 +++---
 client/cmdlffdx.c            |  6 +--
 client/cmdlfguard.c          |  6 +--
 client/cmdlfhid.c            | 12 +++---
 client/cmdlfhitag.c          | 20 ++++-----
 client/cmdlfindala.c         |  4 +-
 client/cmdlfio.c             |  8 ++--
 client/cmdlfjablotron.c      |  6 +--
 client/cmdlfkeri.c           |  6 +--
 client/cmdlfnedap.c          |  6 +--
 client/cmdlfnoralsy.c        |  6 +--
 client/cmdlfparadox.c        |  2 +-
 client/cmdlfpcf7931.c        |  6 +--
 client/cmdlfpresco.c         |  6 +--
 client/cmdlfpyramid.c        |  6 +--
 client/cmdlft55xx.c          | 16 +++----
 client/cmdlfti.c             |  4 +-
 client/cmdlfviking.c         |  6 +--
 client/cmdlfvisa2000.c       |  6 +--
 client/cmdsmartcard.c        | 40 ++++++++---------
 client/cmdtrace.c            |  2 +-
 client/comms.c               | 84 ++++++++++++++++++------------------
 client/comms.h               | 10 ++---
 client/flash.c               | 18 ++++----
 client/flasher.c             |  4 +-
 client/hid-flasher/flash.c   | 14 +++---
 client/hid-flasher/proxusb.c | 18 ++++----
 client/hid-flasher/proxusb.h |  6 +--
 client/hid-flasher/usb_cmd.h | 11 ++++-
 client/mifare/mifarehost.c   | 46 ++++++++++----------
 client/scripting.c           | 16 +++----
 client/snooper.c             |  2 +-
 client/util.h                |  2 +-
 common/cmd.c                 | 42 +++++++++---------
 common/cmd.h                 |  4 +-
 common/i2c.c                 | 10 ++---
 common/usart.c               |  6 +--
 include/usb_cmd.h            | 35 +++++++++------
 83 files changed, 691 insertions(+), 675 deletions(-)

diff --git a/armsrc/Standalone/hf_colin.c b/armsrc/Standalone/hf_colin.c
index d8c1063e3..3eb2ddfe6 100644
--- a/armsrc/Standalone/hf_colin.c
+++ b/armsrc/Standalone/hf_colin.c
@@ -428,12 +428,12 @@ failtag:
                 err = 1;
                 allKeysFound = false;
                 // used in “portable” imlementation on microcontroller: it reports back the fail and open the standalone lock
-                // cmd_send(CMD_CJB_FSMSTATE_MENU, 0, 0, 0, 0, 0);
+                // reply_old(CMD_CJB_FSMSTATE_MENU, 0, 0, 0, 0, 0);
                 break;
             } else if (key == -2) {
                 err = 1; // Can't select card.
                 allKeysFound = false;
-                // cmd_send(CMD_CJB_FSMSTATE_MENU, 0, 0, 0, 0, 0);
+                // reply_old(CMD_CJB_FSMSTATE_MENU, 0, 0, 0, 0, 0);
                 break;
             } else {
                 /*  BRACE YOURSELF : AS LONG AS WE TRAP A KNOWN KEY, WE STOP CHECKING AND ENFORCE KNOWN SCHEMES */
@@ -442,7 +442,7 @@ failtag:
                 num_to_bytes(key64, 6, foundKey[type][sec]);
                 cjSetCursRight();
                 DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %012" PRIx64 " ; TYP: %i", sec, key64, type);
-                /*cmd_send(CMD_CJB_INFORM_CLIENT_KEY, 12, sec, type, tosendkey, 12);*/
+                /*reply_old(CMD_CJB_INFORM_CLIENT_KEY, 12, sec, type, tosendkey, 12);*/
                 switch (key64) {
                     /////////////////////////////////////////////////////////
                     // COMMON SCHEME 1  : INFINITRON/HEXACT
diff --git a/armsrc/Standalone/hf_young.c b/armsrc/Standalone/hf_young.c
index 24e20dd7f..324f9cf8e 100644
--- a/armsrc/Standalone/hf_young.c
+++ b/armsrc/Standalone/hf_young.c
@@ -132,12 +132,12 @@ void RunMod() {
             SpinDelay(500);
             // Begin clone function here:
             /* Example from client/mifarehost.c for commanding a block write for "magic Chinese" cards:
-                    UsbCommand c = {CMD_MIFARE_CSETBLOCK, {params & (0xFE | (uid == NULL ? 0:1)), blockNo, 0}};
+                    PacketCommandOLD c = {CMD_MIFARE_CSETBLOCK, {params & (0xFE | (uid == NULL ? 0:1)), blockNo, 0}};
                     memcpy(c.d.asBytes, data, 16);
                     SendCommand(&c);
 
                 Block read is similar:
-                    UsbCommand c = {CMD_MIFARE_CGETBLOCK, {params, blockNo, 0}};
+                    PacketCommandOLD c = {CMD_MIFARE_CGETBLOCK, {params, blockNo, 0}};
                 We need to imitate that call with blockNo 0 to set a uid.
 
                 The get and set commands are handled in this file:
diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index adbf6b315..fabac5ce1 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -117,7 +117,7 @@ void print_result(char *name, uint8_t *buf, size_t len) {
 void DbpStringEx(char *str, uint32_t cmd) {
 #if DEBUG
     uint8_t len = strlen(str);
-    cmd_send(CMD_DEBUG_PRINT_STRING, len, cmd, 0, (uint8_t *)str, len);
+    reply_old(CMD_DEBUG_PRINT_STRING, len, cmd, 0, (uint8_t *)str, len);
 #endif
 }
 
@@ -129,7 +129,7 @@ void DbpString(char *str) {
 
 #if 0
 void DbpIntegers(int x1, int x2, int x3) {
-    cmd_send(CMD_DEBUG_PRINT_INTEGERS, x1, x2, x3, 0, 0);
+    reply_old(CMD_DEBUG_PRINT_INTEGERS, x1, x2, x3, 0, 0);
 }
 #endif
 void DbprintfEx(uint32_t cmd, const char *fmt, ...) {
@@ -289,7 +289,7 @@ void MeasureAntennaTuning(void) {
     arg2 <<= 32;
     arg2 |= peakf;
 
-    cmd_send(CMD_MEASURED_ANTENNA_TUNING, arg0, v_hf, arg2, LF_Results, 256);
+    reply_old(CMD_MEASURED_ANTENNA_TUNING, arg0, v_hf, arg2, LF_Results, 256);
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     LEDsoff();
 }
@@ -359,11 +359,11 @@ void SendVersion(void) {
     // Send Chip ID and used flash memory
     uint32_t text_and_rodata_section_size = (uint32_t)&__data_src_start__ - (uint32_t)&_flash_start;
     uint32_t compressed_data_section_size = common_area.arg1;
-    cmd_send(CMD_ACK, *(AT91C_DBGU_CIDR), text_and_rodata_section_size + compressed_data_section_size, 0, VersionString, strlen(VersionString));
+    reply_old(CMD_ACK, *(AT91C_DBGU_CIDR), text_and_rodata_section_size + compressed_data_section_size, 0, VersionString, strlen(VersionString));
 }
 
 // measure the USB Speed by sending SpeedTestBufferSize bytes to client and measuring the elapsed time.
-// Note: this mimics GetFromBigbuf(), i.e. we have the overhead of the UsbCommandOLD structure included.
+// Note: this mimics GetFromBigbuf(), i.e. we have the overhead of the PacketCommandOLD structure included.
 void printUSBSpeed(void) {
     Dbprintf("USB Speed");
     Dbprintf("  Sending USB packets to client...");
@@ -412,7 +412,7 @@ void SendStatus(void) {
     Dbprintf("  ToSendBit...............%d", ToSendBit);
     Dbprintf("  ToSend BUFFERSIZE.......%d", TOSEND_BUFFER_SIZE);
     printStandAloneModes();
-    cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
+    reply_old(CMD_ACK, 1, 0, 0, 0, 0);
 }
 
 // Show some leds in a pattern to identify StandAlone mod is running
@@ -633,7 +633,7 @@ void ListenReaderField(int limit) {
     }
 }
 
-static void UsbPacketReceived(UsbCommandNG *packet) {
+static void PacketReceived(PacketCommandNG *packet) {
 /*
     if (packet->ng) {
         Dbprintf("received NG frame with %d bytes payload, with command: 0x%04x", packet->length, cmd);
@@ -652,7 +652,7 @@ static void UsbPacketReceived(UsbCommandNG *packet) {
             break;
         case CMD_ACQUIRE_RAW_ADC_SAMPLES_125K: {
             uint32_t bits = SampleLF(packet->oldarg[0], packet->oldarg[1]);
-            cmd_send(CMD_ACK, bits, 0, 0, 0, 0);
+            reply_old(CMD_ACK, bits, 0, 0, 0, 0);
             break;
         }
         case CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K:
@@ -660,7 +660,7 @@ static void UsbPacketReceived(UsbCommandNG *packet) {
             break;
         case CMD_LF_SNIFF_RAW_ADC_SAMPLES: {
             uint32_t bits = SniffLF();
-            cmd_send(CMD_ACK, bits, 0, 0, 0, 0);
+            reply_old(CMD_ACK, bits, 0, 0, 0, 0);
             break;
         }
         case CMD_HID_DEMOD_FSK: {
@@ -1078,7 +1078,7 @@ static void UsbPacketReceived(UsbCommandNG *packet) {
             // upload file from client
             uint8_t *mem = BigBuf_get_addr();
             memcpy(mem + packet->oldarg[0], packet->data.asBytes, USB_CMD_DATA_SIZE);
-            cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
+            reply_old(CMD_ACK, 1, 0, 0, 0, 0);
             break;
         }
         case CMD_SMART_UPGRADE: {
@@ -1136,25 +1136,25 @@ static void UsbPacketReceived(UsbCommandNG *packet) {
 
 
             //usb
-            cmd_send(CMD_DEBUG_PRINT_STRING, strlen(dest), 0, 0, dest, strlen(dest));
+            reply_old(CMD_DEBUG_PRINT_STRING, strlen(dest), 0, 0, dest, strlen(dest));
             LED_A_OFF();
             /*
-            uint8_t my_rx[sizeof(UsbCommandOLD)];
+            uint8_t my_rx[sizeof(PacketCommandOLD)];
             while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
                 LED_B_INV();
                 if (usart_readbuffer(my_rx) ) {
-                    //UsbPacketReceived(my_rx, sizeof(my_rx));
+                    //PacketReceived(my_rx, sizeof(my_rx));
 
-                    UsbCommandOLD *my = (UsbCommandOLD *)my_rx;
+                    PacketCommandOLD *my = (PacketCommandOLD *)my_rx;
                     if (my->cmd > 0 ) {
                         Dbprintf("received command: 0x%04x and args: %d %d %d", my->cmd, my->arg[0], my->arg[1], my->arg[2]);
                     }
                 }
             }
             */
-            //cmd_send(CMD_DEBUG_PRINT_STRING, strlen(dest), 0, 0, dest, strlen(dest));
+            //reply_old(CMD_DEBUG_PRINT_STRING, strlen(dest), 0, 0, dest, strlen(dest));
 
-            cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
+            reply_old(CMD_ACK, 0, 0, 0, 0, 0);
             StopTicks();
             break;
         }
@@ -1194,7 +1194,7 @@ static void UsbPacketReceived(UsbCommandNG *packet) {
 
             for (size_t i = 0; i < numofbytes; i += USB_CMD_DATA_SIZE) {
                 size_t len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);
-                bool isok = cmd_send(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K, i, len, BigBuf_get_traceLen(), mem + startidx + i, len);
+                bool isok = reply_old(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K, i, len, BigBuf_get_traceLen(), mem + startidx + i, len);
                 if (isok != 0)
                     Dbprintf("transfer to client failed ::  | bytes between %d - %d (%d)", i, i + len, len);
             }
@@ -1204,7 +1204,7 @@ static void UsbPacketReceived(UsbCommandNG *packet) {
             // arg1 = RFU
             // arg2 = tracelen?
             // asbytes = samplingconfig array
-            cmd_send(CMD_ACK, 1, 0, BigBuf_get_traceLen(), getSamplingConfig(), sizeof(sample_config));
+            reply_old(CMD_ACK, 1, 0, BigBuf_get_traceLen(), getSamplingConfig(), sizeof(sample_config));
             LED_B_OFF();
             break;
         }
@@ -1222,7 +1222,7 @@ static void UsbPacketReceived(UsbCommandNG *packet) {
 
             uint8_t *mem = BigBuf_get_addr();
             memcpy(mem + packet->oldarg[0], packet->data.asBytes, USB_CMD_DATA_SIZE);
-            cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
+            reply_old(CMD_ACK, 1, 0, 0, 0, 0);
             break;
         }
         case CMD_DOWNLOAD_EML_BIGBUF: {
@@ -1239,12 +1239,12 @@ static void UsbPacketReceived(UsbCommandNG *packet) {
 
             for (size_t i = 0; i < numofbytes; i += USB_CMD_DATA_SIZE) {
                 len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);
-                isok = cmd_send(CMD_DOWNLOADED_EML_BIGBUF, i, len, 0, mem + startidx + i, len);
+                isok = reply_old(CMD_DOWNLOADED_EML_BIGBUF, i, len, 0, mem + startidx + i, len);
                 if (isok != 0)
                     Dbprintf("transfer to client failed ::  | bytes between %d - %d (%d)", i, i + len, len);
             }
             // Trigger a finish downloading signal with an ACK frame
-            cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
+            reply_old(CMD_ACK, 1, 0, 0, 0, 0);
             LED_B_OFF();
             break;
         }
@@ -1346,7 +1346,7 @@ static void UsbPacketReceived(UsbCommandNG *packet) {
             }
             FlashStop();
 
-            cmd_send(CMD_ACK, isok, 0, 0, 0, 0);
+            reply_old(CMD_ACK, isok, 0, 0, 0, 0);
             LED_B_OFF();
             break;
         }
@@ -1357,14 +1357,14 @@ static void UsbPacketReceived(UsbCommandNG *packet) {
             bool isok = false;
             if (initalwipe) {
                 isok = Flash_WipeMemory();
-                cmd_send(CMD_ACK, isok, 0, 0, 0, 0);
+                reply_old(CMD_ACK, isok, 0, 0, 0, 0);
                 LED_B_OFF();
                 break;
             }
             if (page < 3)
                 isok = Flash_WipeMemoryPage(page);
 
-            cmd_send(CMD_ACK, isok, 0, 0, 0, 0);
+            reply_old(CMD_ACK, isok, 0, 0, 0, 0);
             LED_B_OFF();
             break;
         }
@@ -1389,13 +1389,13 @@ static void UsbPacketReceived(UsbCommandNG *packet) {
                 if (!isok)
                     Dbprintf("reading flash memory failed ::  | bytes between %d - %d", i, len);
 
-                isok = cmd_send(CMD_FLASHMEM_DOWNLOADED, i, len, 0, mem, len);
+                isok = reply_old(CMD_FLASHMEM_DOWNLOADED, i, len, 0, mem, len);
                 if (isok != 0)
                     Dbprintf("transfer to client failed ::  | bytes between %d - %d", i, len);
             }
             FlashStop();
 
-            cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
+            reply_old(CMD_ACK, 1, 0, 0, 0, 0);
             BigBuf_free();
             LED_B_OFF();
             break;
@@ -1411,7 +1411,7 @@ static void UsbPacketReceived(UsbCommandNG *packet) {
                 Flash_UniqueID(info->flashid);
                 FlashStop();
             }
-            cmd_send(CMD_ACK, isok, 0, 0, info, sizeof(rdv40_validation_t));
+            reply_old(CMD_ACK, isok, 0, 0, info, sizeof(rdv40_validation_t));
             BigBuf_free();
 
             LED_B_OFF();
@@ -1453,9 +1453,9 @@ static void UsbPacketReceived(UsbCommandNG *packet) {
                 reply_ng(CMD_PING, PM3_SUCCESS, packet->data.asBytes, packet->length);
             } else {
 #ifdef WITH_FPC_HOST
-                cmd_send(CMD_ACK, reply_via_fpc, 0, 0, 0, 0);
+                reply_old(CMD_ACK, reply_via_fpc, 0, 0, 0, 0);
 #else
-                cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
+                reply_old(CMD_ACK, 0, 0, 0, 0, 0);
 #endif
             }
             break;
@@ -1494,7 +1494,7 @@ static void UsbPacketReceived(UsbCommandNG *packet) {
             if (common_area.flags.bootrom_present) {
                 dev_info |= DEVICE_INFO_FLAG_BOOTROM_PRESENT;
             }
-            cmd_send(CMD_DEVICE_INFO, dev_info, 0, 0, 0, 0);
+            reply_old(CMD_DEVICE_INFO, dev_info, 0, 0, 0, 0);
             break;
         }
         default:
@@ -1568,9 +1568,9 @@ void  __attribute__((noreturn)) AppMain(void) {
 
         // Check if there is a usb packet available
         if (usb_poll_validate_length()) {
-            UsbCommandNG rx;
+            PacketCommandNG rx;
             if (receive_ng(&rx) == PM3_SUCCESS) {
-                UsbPacketReceived(&rx);
+                PacketReceived(&rx);
             } else {
                 Dbprintf("Error in frame reception");
                 // TODO DOEGOX if error, shall we resync ?
@@ -1579,14 +1579,14 @@ void  __attribute__((noreturn)) AppMain(void) {
 #ifdef WITH_FPC_HOST
         // Check if there is a FPC packet available
 // TODO DOEGOX NG packets support here too
-        UsbCommandNG rx;
+        PacketCommandNG rx;
         if (usart_readbuffer((uint8_t *)&rx)) {
             reply_via_fpc = true;
             rx.ng = false;
             rx.magic = 0;
             rx.length = USB_CMD_DATA_SIZE;
             rx.crc = 0;
-            UsbPacketReceived(&rx);
+            PacketReceived(&rx);
         }
         usart_readcheck((uint8_t *)&rx, sizeof(rx));
 #endif
diff --git a/armsrc/apps.h b/armsrc/apps.h
index 68d9f570b..fe2fa46cd 100644
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -120,13 +120,13 @@ void AcquireRawAdcSamplesIso14443b(uint32_t parameter);
 void ReadSTMemoryIso14443b(uint8_t numofblocks);
 void RAMFUNC SniffIso14443b(void);
 void SendRawCommand14443B(uint32_t, uint32_t, uint8_t, uint8_t[]);
-void SendRawCommand14443B_Ex(UsbCommandNG *c);
+void SendRawCommand14443B_Ex(PacketCommandNG *c);
 void ClearFpgaShiftingRegisters(void);
 
 // iso14443a.h
 void RAMFUNC SniffIso14443a(uint8_t param);
 void SimulateIso14443aTag(int tagType, int flags, uint8_t *data);
-void ReaderIso14443a(UsbCommandNG *c);
+void ReaderIso14443a(PacketCommandNG *c);
 
 // Also used in iclass.c
 //bool RAMFUNC LogTrace(const uint8_t *btBytes, uint16_t len, uint32_t timestamp_start, uint32_t timestamp_end, uint8_t *parity, bool readerToTag);
@@ -137,8 +137,8 @@ void iso14a_set_trigger(bool enable);
 //int GetIso14443aCommandFromReader(uint8_t *received, uint8_t *parity, int *len);
 
 // epa.h
-void EPA_PACE_Collect_Nonce(UsbCommandNG *c);
-void EPA_PACE_Replay(UsbCommandNG *c);
+void EPA_PACE_Collect_Nonce(PacketCommandNG *c);
+void EPA_PACE_Replay(PacketCommandNG *c);
 
 // mifarecmd.h
 void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain);
@@ -222,13 +222,13 @@ void iClass_Clone(uint8_t startblock, uint8_t endblock, uint8_t *data);
 void iClass_ReadCheck(uint8_t blockno, uint8_t keytype);
 
 // cmd.h
-uint8_t cmd_send(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
+uint8_t reply_old(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
 
 // util.h
 void HfSniff(int, int);
 
 //felica.c
-void felica_sendraw(UsbCommandNG *c);
+void felica_sendraw(PacketCommandNG *c);
 void felica_sniff(uint32_t samplesToSkip, uint32_t triggersToSkip);
 void felica_sim_lite(uint64_t uid);
 void felica_dump_lite_s();
diff --git a/armsrc/epa.c b/armsrc/epa.c
index be3145452..c29ead02f 100644
--- a/armsrc/epa.c
+++ b/armsrc/epa.c
@@ -253,13 +253,13 @@ static void EPA_PACE_Collect_Nonce_Abort(uint8_t step, int func_return) {
     EPA_Finish();
 
     // send the USB packet
-    cmd_send(CMD_ACK, step, func_return, 0, 0, 0);
+    reply_old(CMD_ACK, step, func_return, 0, 0, 0);
 }
 
 //-----------------------------------------------------------------------------
 // Acquire one encrypted PACE nonce
 //-----------------------------------------------------------------------------
-void EPA_PACE_Collect_Nonce(UsbCommandNG *c) {
+void EPA_PACE_Collect_Nonce(PacketCommandNG *c) {
     /*
      * ack layout:
      *   arg:
@@ -325,7 +325,7 @@ void EPA_PACE_Collect_Nonce(UsbCommandNG *c) {
     EPA_Finish();
 
     // save received information
-    cmd_send(CMD_ACK, 0, func_return, 0, nonce, func_return);
+    reply_old(CMD_ACK, 0, func_return, 0, nonce, func_return);
 }
 
 //-----------------------------------------------------------------------------
@@ -430,14 +430,14 @@ int EPA_PACE_MSE_Set_AT(pace_version_info_t pace_version_info, uint8_t password)
 //-----------------------------------------------------------------------------
 // Perform the PACE protocol by replaying given APDUs
 //-----------------------------------------------------------------------------
-void EPA_PACE_Replay(UsbCommandNG *c) {
+void EPA_PACE_Replay(PacketCommandNG *c) {
     uint32_t timings[sizeof(apdu_lengths_replay) / sizeof(apdu_lengths_replay[0])] = {0};
 
     // if an APDU has been passed, save it
     if (c->oldarg[0] != 0) {
         // make sure it's not too big
         if (c->oldarg[2] > apdus_replay[c->oldarg[0] - 1].len) {
-            cmd_send(CMD_ACK, 1, 0, 0, NULL, 0);
+            reply_old(CMD_ACK, 1, 0, 0, NULL, 0);
         }
         memcpy(apdus_replay[c->oldarg[0] - 1].data + c->oldarg[1],
                c->data.asBytes,
@@ -448,7 +448,7 @@ void EPA_PACE_Replay(UsbCommandNG *c) {
         } else {
             apdu_lengths_replay[c->oldarg[0] - 1] += c->oldarg[2];
         }
-        cmd_send(CMD_ACK, 0, 0, 0, NULL, 0);
+        reply_old(CMD_ACK, 0, 0, 0, NULL, 0);
         return;
     }
 
@@ -459,7 +459,7 @@ void EPA_PACE_Replay(UsbCommandNG *c) {
     func_return = EPA_Setup();
     if (func_return != 0) {
         EPA_Finish();
-        cmd_send(CMD_ACK, 2, func_return, 0, NULL, 0);
+        reply_old(CMD_ACK, 2, func_return, 0, NULL, 0);
         return;
     }
 
@@ -482,12 +482,12 @@ void EPA_PACE_Replay(UsbCommandNG *c) {
                     || response_apdu[func_return - 4] != 0x90
                     || response_apdu[func_return - 3] != 0x00)) {
             EPA_Finish();
-            cmd_send(CMD_ACK, 3 + i, func_return, 0, timings, 20);
+            reply_old(CMD_ACK, 3 + i, func_return, 0, timings, 20);
             return;
         }
     }
     EPA_Finish();
-    cmd_send(CMD_ACK, 0, 0, 0, timings, 20);
+    reply_old(CMD_ACK, 0, 0, 0, timings, 20);
     return;
 }
 
diff --git a/armsrc/felica.c b/armsrc/felica.c
index 6ab60fc5f..6efff73e0 100644
--- a/armsrc/felica.c
+++ b/armsrc/felica.c
@@ -475,7 +475,7 @@ static void iso18092_setup(uint8_t fpga_minor_mode) {
 // arg0 FeliCa flags
 // arg1 len of commandbytes
 // d.asBytes command bytes to send
-void felica_sendraw(UsbCommandNG *c) {
+void felica_sendraw(PacketCommandNG *c) {
 
     if (MF_DBGLEVEL > 3) Dbprintf("FeliCa_sendraw Enter");
 
@@ -498,7 +498,7 @@ void felica_sendraw(UsbCommandNG *c) {
         // if failed selecting, turn off antenna and quite.
         if (!(param & FELICA_NO_SELECT)) {
             arg0 = felica_select_card(&card);
-            cmd_send(CMD_ACK, arg0, sizeof(card.uid), 0, &card, sizeof(felica_card_select_t));
+            reply_old(CMD_ACK, arg0, sizeof(card.uid), 0, &card, sizeof(felica_card_select_t));
             if (arg0 > 0)
                 goto OUT;
         }
@@ -525,7 +525,7 @@ void felica_sendraw(UsbCommandNG *c) {
 
         TransmitFor18092_AsReader(buf, buf[2] + 4, NULL, 1, 0);
         arg0 = !WaitForFelicaReply(1024);
-        cmd_send(CMD_ACK, arg0, 0, 0, FelicaFrame.framebytes + 2, FelicaFrame.len - 2);
+        reply_old(CMD_ACK, arg0, 0, 0, FelicaFrame.framebytes + 2, FelicaFrame.len - 2);
     }
 
     if ((param & FELICA_NO_DISCONNECT))
@@ -603,7 +603,7 @@ void felica_sniff(uint32_t samplesToSkip, uint32_t triggersToSkip) {
     set_tracelen(numbts);
 
     Dbprintf("Felica sniffing done, tracelen: %i, use hf list felica for annotations", BigBuf_get_traceLen());
-    cmd_send(CMD_ACK, 1, numbts, 0, 0, 0);
+    reply_old(CMD_ACK, 1, numbts, 0, 0, 0);
 }
 
 #define R_POLL0_LEN    0x16
@@ -794,5 +794,5 @@ void felica_dump_lite_s() {
 
     //setting tracelen - important!  it was set by buffer overflow before
     set_tracelen(cnt);
-    cmd_send(CMD_ACK, isOK, cnt, 0, 0, 0);
+    reply_old(CMD_ACK, isOK, cnt, 0, 0, 0);
 }
diff --git a/armsrc/hitag2.c b/armsrc/hitag2.c
index 43c1bd831..9dacca28a 100644
--- a/armsrc/hitag2.c
+++ b/armsrc/hitag2.c
@@ -1350,9 +1350,9 @@ out:
     StartTicks();
 
     if (bSuccessful)
-        cmd_send(CMD_ACK, bSuccessful, 0, 0, (uint8_t *)tag.sectors, 48);
+        reply_old(CMD_ACK, bSuccessful, 0, 0, (uint8_t *)tag.sectors, 48);
     else
-        cmd_send(CMD_ACK, bSuccessful, 0, 0, 0, 0);
+        reply_old(CMD_ACK, bSuccessful, 0, 0, 0, 0);
 }
 
 void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
@@ -1613,5 +1613,5 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
 
     StartTicks();
 
-    cmd_send(CMD_ACK, bSuccessful, 0, 0, (uint8_t *)tag.sectors, 48);
+    reply_old(CMD_ACK, bSuccessful, 0, 0, (uint8_t *)tag.sectors, 48);
 }
diff --git a/armsrc/hitagS.c b/armsrc/hitagS.c
index 842811473..2c8bdb1a2 100644
--- a/armsrc/hitagS.c
+++ b/armsrc/hitagS.c
@@ -1444,7 +1444,7 @@ void ReadHitagS(hitag_function htf, hitag_data *htd) {
 
     StartTicks();
 
-    cmd_send(CMD_ACK, bSuccessful, 0, 0, 0, 0);
+    reply_old(CMD_ACK, bSuccessful, 0, 0, 0, 0);
 }
 
 /*
@@ -1737,7 +1737,7 @@ void WritePageHitagS(hitag_function htf, hitag_data *htd, int page) {
 
     StartTicks();
 
-    cmd_send(CMD_ACK, bSuccessful, 0, 0, 0, 0);
+    reply_old(CMD_ACK, bSuccessful, 0, 0, 0, 0);
 }
 
 /*
@@ -2041,7 +2041,7 @@ void check_challenges(bool file_given, uint8_t *data) {
 
     StartTicks();
 
-    cmd_send(CMD_ACK, bSuccessful, 0, 0, 0, 0);
+    reply_old(CMD_ACK, bSuccessful, 0, 0, 0, 0);
 }
 
 
diff --git a/armsrc/iclass.c b/armsrc/iclass.c
index c77cf4d85..bafa1593a 100644
--- a/armsrc/iclass.c
+++ b/armsrc/iclass.c
@@ -1195,11 +1195,11 @@ void SimulateIClass(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain
 
             if (doIClassSimulation(MODE_EXIT_AFTER_MAC, mac_responses + i * EPURSE_MAC_SIZE)) {
                 // Button pressed
-                cmd_send(CMD_ACK, CMD_SIMULATE_TAG_ICLASS, i, 0, mac_responses, i * EPURSE_MAC_SIZE);
+                reply_old(CMD_ACK, CMD_SIMULATE_TAG_ICLASS, i, 0, mac_responses, i * EPURSE_MAC_SIZE);
                 goto out;
             }
         }
-        cmd_send(CMD_ACK, CMD_SIMULATE_TAG_ICLASS, i, 0, mac_responses, i * EPURSE_MAC_SIZE);
+        reply_old(CMD_ACK, CMD_SIMULATE_TAG_ICLASS, i, 0, mac_responses, i * EPURSE_MAC_SIZE);
 
     } else if (simType == 3) {
         //This is 'full sim' mode, where we use the emulator storage for data.
@@ -1226,20 +1226,20 @@ void SimulateIClass(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain
 
             // keyroll 1
             if (doIClassSimulation(MODE_EXIT_AFTER_MAC, mac_responses + i * EPURSE_MAC_SIZE)) {
-                cmd_send(CMD_ACK, CMD_SIMULATE_TAG_ICLASS, i * 2, 0, mac_responses, i * EPURSE_MAC_SIZE * 2);
+                reply_old(CMD_ACK, CMD_SIMULATE_TAG_ICLASS, i * 2, 0, mac_responses, i * EPURSE_MAC_SIZE * 2);
                 // Button pressed
                 goto out;
             }
 
             // keyroll 2
             if (doIClassSimulation(MODE_EXIT_AFTER_MAC, mac_responses + (i + numberOfCSNS) * EPURSE_MAC_SIZE)) {
-                cmd_send(CMD_ACK, CMD_SIMULATE_TAG_ICLASS, i * 2, 0, mac_responses, i * EPURSE_MAC_SIZE * 2);
+                reply_old(CMD_ACK, CMD_SIMULATE_TAG_ICLASS, i * 2, 0, mac_responses, i * EPURSE_MAC_SIZE * 2);
                 // Button pressed
                 goto out;
             }
         }
         // double the amount of collected data.
-        cmd_send(CMD_ACK, CMD_SIMULATE_TAG_ICLASS, i * 2, 0, mac_responses, i * EPURSE_MAC_SIZE * 2);
+        reply_old(CMD_ACK, CMD_SIMULATE_TAG_ICLASS, i * 2, 0, mac_responses, i * EPURSE_MAC_SIZE * 2);
 
     } else {
         // We may want a mode here where we hardcode the csns to use (from proxclone).
@@ -2082,7 +2082,7 @@ void ReaderIClass(uint8_t arg0) {
             if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("SEND %c",  send ? 'y' : 'n');
 
             if (send) {
-                cmd_send(CMD_ACK, result_status, 0, 0, card_data, sizeof(card_data));
+                reply_old(CMD_ACK, result_status, 0, 0, card_data, sizeof(card_data));
                 if (abort_after_read) {
                     LED_B_OFF();
                     return;
@@ -2096,10 +2096,10 @@ void ReaderIClass(uint8_t arg0) {
     }
 
     if (userCancelled) {
-        cmd_send(CMD_ACK, 0xFF, 0, 0, card_data, 0);
+        reply_old(CMD_ACK, 0xFF, 0, 0, card_data, 0);
         switch_off();
     } else {
-        cmd_send(CMD_ACK, 0, 0, 0, card_data, 0);
+        reply_old(CMD_ACK, 0, 0, 0, card_data, 0);
     }
 }
 
@@ -2180,7 +2180,7 @@ void ReaderIClass_Replay(uint8_t arg0, uint8_t *mac) {
                 stored_data_length += 8;
                 if (stored_data_length + 8 > USB_CMD_DATA_SIZE) {
                     //Time to send this off and start afresh
-                    cmd_send(CMD_ACK,
+                    reply_old(CMD_ACK,
                              stored_data_length,//data length
                              failedRead,//Failed blocks?
                              0,//Not used ATM
@@ -2200,7 +2200,7 @@ void ReaderIClass_Replay(uint8_t arg0, uint8_t *mac) {
 
         //Send off any remaining data
         if (stored_data_length > 0) {
-            cmd_send(CMD_ACK,
+            reply_old(CMD_ACK,
                      stored_data_length,//data length
                      failedRead,//Failed blocks?
                      0,//Not used ATM
@@ -2212,7 +2212,7 @@ void ReaderIClass_Replay(uint8_t arg0, uint8_t *mac) {
         break;
     }
     //Signal end of transmission
-    cmd_send(CMD_ACK,
+    reply_old(CMD_ACK,
              0,//data length
              0,//Failed blocks?
              0,//Not used ATM
@@ -2229,7 +2229,7 @@ void iClass_ReadCheck(uint8_t blockno, uint8_t keytype) {
     uint8_t resp[] = {0, 0, 0, 0, 0, 0, 0, 0};
     size_t isOK = 0;
     isOK = sendCmdGetResponseWithRetries(readcheck, sizeof(readcheck), resp, sizeof(resp), 6);
-    cmd_send(CMD_ACK, isOK, 0, 0, 0, 0);
+    reply_old(CMD_ACK, isOK, 0, 0, 0, 0);
     switch_off();
 }
 
@@ -2248,7 +2248,7 @@ void iClass_Authentication(uint8_t *mac) {
 
     // 6 retries
     bool isOK = sendCmdGetResponseWithRetries(check, sizeof(check), resp, 4, 6);
-    cmd_send(CMD_ACK, isOK, 0, 0, 0, 0);
+    reply_old(CMD_ACK, isOK, 0, 0, 0, 0);
 }
 
 typedef struct iclass_premac {
@@ -2332,7 +2332,7 @@ void iClass_Authentication_fast(uint64_t arg0, uint64_t arg1, uint8_t *datain) {
 
 out:
     // send keyindex.
-    cmd_send(CMD_ACK, isOK, i, 0, 0, 0);
+    reply_old(CMD_ACK, isOK, i, 0, 0, 0);
 
     if (isOK >= 1 || lastChunk) {
         switch_off();
@@ -2360,7 +2360,7 @@ bool iClass_ReadBlock(uint8_t blockno, uint8_t *data, uint8_t len) {
 void iClass_ReadBlk(uint8_t blockno) {
     uint8_t data[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
     bool isOK = iClass_ReadBlock(blockno, data, sizeof(data));
-    cmd_send(CMD_ACK, isOK, 0, 0, data, sizeof(data));
+    reply_old(CMD_ACK, isOK, 0, 0, data, sizeof(data));
     switch_off();
 }
 
@@ -2394,7 +2394,7 @@ void iClass_Dump(uint8_t blockno, uint8_t numblks) {
         memcpy(dataout + (blkCnt * 8), blockdata, 8);
     }
     //return pointer to dump memory in arg3
-    cmd_send(CMD_ACK, isOK, blkCnt, BigBuf_max_traceLen(), 0, 0);
+    reply_old(CMD_ACK, isOK, blkCnt, BigBuf_max_traceLen(), 0, 0);
     switch_off();
     BigBuf_free();
 }
@@ -2424,7 +2424,7 @@ bool iClass_WriteBlock_ext(uint8_t blockno, uint8_t *data) {
 // turn off afterwards
 void iClass_WriteBlock(uint8_t blockno, uint8_t *data) {
     bool isOK = iClass_WriteBlock_ext(blockno, data);
-    cmd_send(CMD_ACK, isOK, 0, 0, 0, 0);
+    reply_old(CMD_ACK, isOK, 0, 0, 0, 0);
     switch_off();
 }
 
@@ -2451,6 +2451,6 @@ void iClass_Clone(uint8_t startblock, uint8_t endblock, uint8_t *data) {
     else
         DbpString("Clone incomplete");
 
-    cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
+    reply_old(CMD_ACK, 1, 0, 0, 0, 0);
     switch_off();
 }
diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 07711ad80..0f6442047 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -1273,7 +1273,7 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
                         ar_nr_nonces[index].state = SECOND;
 
                         // send to client
-                        cmd_send(CMD_ACK, CMD_SIMULATE_MIFARE_CARD, 0, 0, &ar_nr_nonces[index], sizeof(nonces_t));
+                        reply_old(CMD_ACK, CMD_SIMULATE_MIFARE_CARD, 0, 0, &ar_nr_nonces[index], sizeof(nonces_t));
 
                         ar_nr_nonces[index].state = EMPTY;
                         ar_nr_nonces[index].sector = 0;
@@ -1392,7 +1392,7 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
         }
     }
 
-    cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
+    reply_old(CMD_ACK, 1, 0, 0, 0, 0);
     switch_off();
 
     set_tracing(false);
@@ -1943,7 +1943,7 @@ void iso14443a_antifuzz(uint32_t flags) {
         }
     }
 
-    cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
+    reply_old(CMD_ACK, 1, 0, 0, 0, 0);
     switch_off();
     BigBuf_free_keep_EM();
 }
@@ -2350,7 +2350,7 @@ int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, bool send_chaining, void *data, u
 //             low  ::  len of commandbytes
 // arg2         timeout
 // d.asBytes command bytes to send
-void ReaderIso14443a(UsbCommandNG *c) {
+void ReaderIso14443a(PacketCommandNG *c) {
     iso14a_command_t param = c->oldarg[0];
     size_t len = c->oldarg[1] & 0xffff;
     size_t lenbits = c->oldarg[1] >> 16;
@@ -2376,7 +2376,7 @@ void ReaderIso14443a(UsbCommandNG *c) {
         if (!(param & ISO14A_NO_SELECT)) {
             iso14a_card_select_t *card = (iso14a_card_select_t *)buf;
             arg0 = iso14443a_select_card(NULL, card, NULL, true, 0, param & ISO14A_NO_RATS);
-            cmd_send(CMD_ACK, arg0, card->uidlen, 0, buf, sizeof(iso14a_card_select_t));
+            reply_old(CMD_ACK, arg0, card->uidlen, 0, buf, sizeof(iso14a_card_select_t));
             if (arg0 == 0)
                 goto OUT;
         }
@@ -2388,7 +2388,7 @@ void ReaderIso14443a(UsbCommandNG *c) {
     if ((param & ISO14A_APDU)) {
         uint8_t res;
         arg0 = iso14_apdu(cmd, len, (param & ISO14A_SEND_CHAINING), buf, &res);
-        cmd_send(CMD_ACK, arg0, res, 0, buf, sizeof(buf));
+        reply_old(CMD_ACK, arg0, res, 0, buf, sizeof(buf));
     }
 
     if ((param & ISO14A_RAW)) {
@@ -2432,7 +2432,7 @@ void ReaderIso14443a(UsbCommandNG *c) {
             }
         }
         arg0 = ReaderReceive(buf, par);
-        cmd_send(CMD_ACK, arg0, 0, 0, buf, sizeof(buf));
+        reply_old(CMD_ACK, arg0, 0, 0, buf, sizeof(buf));
     }
 
     if ((param & ISO14A_REQUEST_TRIGGER))
@@ -2737,7 +2737,7 @@ void ReaderMifare(bool first_try, uint8_t block, uint8_t keytype) {
     memcpy(buf + 16, ks_list, 8);
     memcpy(buf + 24, mf_nr_ar, 8);
 
-    cmd_send(CMD_ACK, isOK, 0, 0, buf, sizeof(buf));
+    reply_old(CMD_ACK, isOK, 0, 0, buf, sizeof(buf));
 
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     LEDsoff();
@@ -2963,7 +2963,7 @@ void DetectNACKbug() {
 
     // num_nacks = number of nacks recieved. should be only 1. if not its a clone card which always sends NACK (parity == 0) ?
     // i  =  number of authentications sent.  Not always 256, since we are trying to sync but close to it.
-    cmd_send(CMD_ACK, isOK, num_nacks, i, 0, 0);
+    reply_old(CMD_ACK, isOK, num_nacks, i, 0, 0);
 
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     LEDsoff();
diff --git a/armsrc/iso14443a.h b/armsrc/iso14443a.h
index ce1d28cf0..3c89f17af 100644
--- a/armsrc/iso14443a.h
+++ b/armsrc/iso14443a.h
@@ -121,7 +121,7 @@ RAMFUNC int ManchesterDecoding(uint8_t bit, uint16_t offset, uint32_t non_real_t
 void RAMFUNC SniffIso14443a(uint8_t param);
 void SimulateIso14443aTag(int tagType, int flags, uint8_t *data);
 void iso14443a_antifuzz(uint32_t flags);
-void ReaderIso14443a(UsbCommandNG *c);
+void ReaderIso14443a(PacketCommandNG *c);
 void ReaderTransmit(uint8_t *frame, uint16_t len, uint32_t *timing);
 void ReaderTransmitBitsPar(uint8_t *frame, uint16_t bits, uint8_t *par, uint32_t *timing);
 void ReaderTransmitPar(uint8_t *frame, uint16_t len, uint8_t *par, uint32_t *timing);
diff --git a/armsrc/iso14443b.c b/armsrc/iso14443b.c
index aa3abcfb1..5484b435c 100644
--- a/armsrc/iso14443b.c
+++ b/armsrc/iso14443b.c
@@ -1566,7 +1566,7 @@ void iso14b_set_trigger(bool enable) {
  * none
  *
  */
-void SendRawCommand14443B_Ex(UsbCommandNG *c) {
+void SendRawCommand14443B_Ex(PacketCommandNG *c) {
     iso14b_command_t param = c->oldarg[0];
     size_t len = c->oldarg[1] & 0xffff;
     uint32_t timeout = c->oldarg[2];
@@ -1594,7 +1594,7 @@ void SendRawCommand14443B_Ex(UsbCommandNG *c) {
     if ((param & ISO14B_SELECT_STD) == ISO14B_SELECT_STD) {
         iso14b_card_select_t *card = (iso14b_card_select_t *)buf;
         status = iso14443b_select_card(card);
-        cmd_send(CMD_ACK, status, sendlen, 0, buf, sendlen);
+        reply_old(CMD_ACK, status, sendlen, 0, buf, sendlen);
         // 0: OK 2: attrib fail, 3:crc fail,
         if (status > 0) goto out;
     }
@@ -1602,14 +1602,14 @@ void SendRawCommand14443B_Ex(UsbCommandNG *c) {
     if ((param & ISO14B_SELECT_SR) == ISO14B_SELECT_SR) {
         iso14b_card_select_t *card = (iso14b_card_select_t *)buf;
         status = iso14443b_select_srx_card(card);
-        cmd_send(CMD_ACK, status, sendlen, 0, buf, sendlen);
+        reply_old(CMD_ACK, status, sendlen, 0, buf, sendlen);
         // 0: OK 2: demod fail, 3:crc fail,
         if (status > 0) goto out;
     }
 
     if ((param & ISO14B_APDU) == ISO14B_APDU) {
         status = iso14443b_apdu(cmd, len, buf);
-        cmd_send(CMD_ACK, status, status, 0, buf, status);
+        reply_old(CMD_ACK, status, status, 0, buf, status);
     }
 
     if ((param & ISO14B_RAW) == ISO14B_RAW) {
@@ -1623,7 +1623,7 @@ void SendRawCommand14443B_Ex(UsbCommandNG *c) {
 
         sendlen = MIN(Demod.len, USB_CMD_DATA_SIZE);
         status = (Demod.len > 0) ? 0 : 1;
-        cmd_send(CMD_ACK, status, sendlen, 0, Demod.output, sendlen);
+        reply_old(CMD_ACK, status, sendlen, 0, Demod.output, sendlen);
     }
 
 out:
diff --git a/armsrc/iso14443b.h b/armsrc/iso14443b.h
index 55f6a54b7..2618b0770 100644
--- a/armsrc/iso14443b.h
+++ b/armsrc/iso14443b.h
@@ -34,7 +34,7 @@ extern "C" {
 # define AddCrc14B(data, len) compute_crc(CRC_14443_B, (data), (len), (data)+(len), (data)+(len)+1)
 #endif
 
-void SendRawCommand14443B_Ex(UsbCommandNG *c);
+void SendRawCommand14443B_Ex(PacketCommandNG *c);
 void iso14443b_setup();
 uint8_t iso14443b_apdu(uint8_t const *message, size_t message_length, uint8_t *response);
 uint8_t iso14443b_select_card(iso14b_card_select_t *card);
diff --git a/armsrc/iso15693.c b/armsrc/iso15693.c
index dd94514af..f1a06a7bb 100644
--- a/armsrc/iso15693.c
+++ b/armsrc/iso15693.c
@@ -849,7 +849,7 @@ void ReaderIso15693(uint32_t parameter) {
         // arg1 = len of response (12 bytes)
         // arg2 = rtf
         // asbytes = uid.
-        cmd_send(CMD_ACK, 1, sizeof(uid), 0, uid, sizeof(uid));
+        reply_old(CMD_ACK, 1, sizeof(uid), 0, uid, sizeof(uid));
     }
 
     if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
@@ -989,7 +989,7 @@ void DirectTag15693Command(uint32_t datalen, uint32_t speed, uint32_t recv, uint
         buflen = (buflen > ISO15_MAX_FRAME) ? ISO15_MAX_FRAME : buflen;
 
         LED_B_ON();
-        cmd_send(CMD_ACK, buflen, 0, 0, buf, buflen);
+        reply_old(CMD_ACK, buflen, 0, 0, buf, buflen);
         LED_B_OFF();
 
         if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
@@ -998,6 +998,6 @@ void DirectTag15693Command(uint32_t datalen, uint32_t speed, uint32_t recv, uint
             Dbhexdump(buflen, buf, true);
         }
     } else {
-        cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
+        reply_old(CMD_ACK, 1, 0, 0, 0, 0);
     }
 }
diff --git a/armsrc/legicrf.c b/armsrc/legicrf.c
index 6a2cccd7c..2d3bf742f 100644
--- a/armsrc/legicrf.c
+++ b/armsrc/legicrf.c
@@ -402,7 +402,7 @@ void LegicRfInfo(void) {
     // establish shared secret and detect card type
     uint8_t card_type = setup_phase(0x01);
     if (init_card(card_type, &card) != 0) {
-        cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
+        reply_old(CMD_ACK, 0, 0, 0, 0, 0);
         goto OUT;
     }
 
@@ -410,7 +410,7 @@ void LegicRfInfo(void) {
     for (uint8_t i = 0; i < sizeof(card.uid); ++i) {
         int16_t byte = read_byte(i, card.cmdsize);
         if (byte == -1) {
-            cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
+            reply_old(CMD_ACK, 0, 0, 0, 0, 0);
             goto OUT;
         }
         card.uid[i] = byte & 0xFF;
@@ -420,12 +420,12 @@ void LegicRfInfo(void) {
     int16_t mcc = read_byte(4, card.cmdsize);
     int16_t calc_mcc = CRC8Legic(card.uid, 4);;
     if (mcc != calc_mcc) {
-        cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
+        reply_old(CMD_ACK, 0, 0, 0, 0, 0);
         goto OUT;
     }
 
     // OK
-    cmd_send(CMD_ACK, 1, 0, 0, (uint8_t *)&card, sizeof(legic_card_select_t));
+    reply_old(CMD_ACK, 1, 0, 0, (uint8_t *)&card, sizeof(legic_card_select_t));
 
 OUT:
     switch_off();
@@ -439,7 +439,7 @@ void LegicRfReader(uint16_t offset, uint16_t len, uint8_t iv) {
     // establish shared secret and detect card type
     uint8_t card_type = setup_phase(iv);
     if (init_card(card_type, &card) != 0) {
-        cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
+        reply_old(CMD_ACK, 0, 0, 0, 0, 0);
         goto OUT;
     }
 
@@ -451,14 +451,14 @@ void LegicRfReader(uint16_t offset, uint16_t len, uint8_t iv) {
     for (uint16_t i = 0; i < len; ++i) {
         int16_t byte = read_byte(offset + i, card.cmdsize);
         if (byte == -1) {
-            cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
+            reply_old(CMD_ACK, 0, 0, 0, 0, 0);
             goto OUT;
         }
         legic_mem[i] = byte;
     }
 
     // OK
-    cmd_send(CMD_ACK, 1, len, 0, legic_mem, len);
+    reply_old(CMD_ACK, 1, len, 0, legic_mem, len);
 
 OUT:
     switch_off();
@@ -471,14 +471,14 @@ void LegicRfWriter(uint16_t offset, uint16_t len, uint8_t iv, uint8_t *data) {
 
     // uid is not writeable
     if (offset <= WRITE_LOWERLIMIT) {
-        cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
+        reply_old(CMD_ACK, 0, 0, 0, 0, 0);
         goto OUT;
     }
 
     // establish shared secret and detect card type
     uint8_t card_type = setup_phase(iv);
     if (init_card(card_type, &card) != 0) {
-        cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
+        reply_old(CMD_ACK, 0, 0, 0, 0, 0);
         goto OUT;
     }
 
@@ -491,13 +491,13 @@ void LegicRfWriter(uint16_t offset, uint16_t len, uint8_t iv, uint8_t *data) {
     while (len-- > 0 && !BUTTON_PRESS()) {
         if (!write_byte(len + offset, data[len], card.addrsize)) {
             Dbprintf("operation failed | %02X | %02X | %02X", len + offset, len, data[len]);
-            cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
+            reply_old(CMD_ACK, 0, 0, 0, 0, 0);
             goto OUT;
         }
     }
 
     // OK
-    cmd_send(CMD_ACK, 1, len, 0, legic_mem, len);
+    reply_old(CMD_ACK, 1, len, 0, legic_mem, len);
 
 OUT:
     switch_off();
diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index 613e786c2..8b0efde9d 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -242,7 +242,7 @@ void ModThenAcquireRawAdcSamples125k(uint32_t delay_off, uint32_t period_0, uint
     // Turn off antenna
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     // tell client we are done
-    cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
+    reply_old(CMD_ACK, 0, 0, 0, 0, 0);
 }
 
 /* blank r/w tag data stream
@@ -1388,7 +1388,7 @@ void T55xxResetRead(void) {
 
     // Turn the field off
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); // field off
-    cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
+    reply_old(CMD_ACK, 0, 0, 0, 0, 0);
     LED_A_OFF();
 }
 
@@ -1467,7 +1467,7 @@ void T55xxWriteBlockExt(uint32_t Data, uint8_t Block, uint32_t Pwd, uint8_t arg)
 // Write one card block in page 0, no lock
 void T55xxWriteBlock(uint32_t Data, uint8_t Block, uint32_t Pwd, uint8_t arg) {
     T55xxWriteBlockExt(Data, Block, Pwd, arg);
-    cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
+    reply_old(CMD_ACK, 0, 0, 0, 0, 0);
 }
 
 // Read one card block in page [page]
@@ -1532,7 +1532,7 @@ void T55xxReadBlock(uint16_t arg0, uint8_t Block, uint32_t Pwd) {
     // Turn the field off
     if (!brute_mem) {
         FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-        cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
+        reply_old(CMD_ACK, 0, 0, 0, 0, 0);
         LED_A_OFF();
     }
 }
@@ -1629,7 +1629,7 @@ void T55xx_ChkPwds() {
 
 OUT:
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-    cmd_send(CMD_ACK, ret, candidate, 0, 0, 0);
+    reply_old(CMD_ACK, ret, candidate, 0, 0, 0);
     LEDsoff();
 }
 
@@ -1757,7 +1757,7 @@ void CopyVikingtoT55xx(uint32_t block1, uint32_t block2, uint8_t Q5) {
     // Program the data blocks for supplied ID and the block 0 config
     WriteT55xx(data, 0, 3);
     LED_D_OFF();
-    cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
+    reply_old(CMD_ACK, 0, 0, 0, 0, 0);
 }
 
 // Define 9bit header for EM410x tags
@@ -2028,7 +2028,7 @@ void EM4xReadWord(uint8_t addr, uint32_t pwd, uint8_t usepwd) {
     DoPartialAcquisition(20, true, 6000, 1000);
 
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-    cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
+    reply_old(CMD_ACK, 0, 0, 0, 0, 0);
     LED_A_OFF();
 }
 
@@ -2064,7 +2064,7 @@ void EM4xWriteWord(uint32_t flag, uint32_t data, uint32_t pwd) {
     DoPartialAcquisition(20, true, 6000, 1000);
 
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-    cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
+    reply_old(CMD_ACK, 0, 0, 0, 0, 0);
     LED_A_OFF();
 }
 
@@ -2118,7 +2118,7 @@ void Cotag(uint32_t arg0) {
 
     // Turn the field off
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); // field off
-    cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
+    reply_old(CMD_ACK, 0, 0, 0, 0, 0);
     LEDsoff();
 }
 
diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index 853721840..52645d627 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -93,7 +93,7 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
     if (MF_DBGLEVEL >= 2) DbpString("READ BLOCK FINISHED");
 
     LED_B_ON();
-    cmd_send(CMD_ACK, isOK, 0, 0, dataoutbuf, 16);
+    reply_old(CMD_ACK, isOK, 0, 0, dataoutbuf, 16);
     LED_B_OFF();
 
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
@@ -129,7 +129,7 @@ void MifareUC_Auth(uint8_t arg0, uint8_t *keybytes) {
         FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
         LEDsoff();
     }
-    cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
+    reply_old(CMD_ACK, 1, 0, 0, 0, 0);
 }
 
 // Arg0 = BlockNo,
@@ -189,7 +189,7 @@ void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain) {
         return;
     }
 
-    cmd_send(CMD_ACK, 1, 0, 0, dataout, 16);
+    reply_old(CMD_ACK, 1, 0, 0, dataout, 16);
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     LEDsoff();
 }
@@ -252,7 +252,7 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
     crypto1_destroy(pcs);
 
     LED_B_ON();
-    cmd_send(CMD_ACK, isOK, 0, 0, dataoutbuf, 16 * NumBlocksPerSector(sectorNo));
+    reply_old(CMD_ACK, isOK, 0, 0, dataoutbuf, 16 * NumBlocksPerSector(sectorNo));
     LED_B_OFF();
 
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
@@ -352,7 +352,7 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
 
     countblocks *= 4;
 
-    cmd_send(CMD_ACK, 1, countblocks, BigBuf_max_traceLen(), 0, 0);
+    reply_old(CMD_ACK, 1, countblocks, BigBuf_max_traceLen(), 0, 0);
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     LEDsoff();
     BigBuf_free();
@@ -419,7 +419,7 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
 
     if (MF_DBGLEVEL >= 2) DbpString("WRITE BLOCK FINISHED");
 
-    cmd_send(CMD_ACK, isOK, 0, 0, 0, 0);
+    reply_old(CMD_ACK, isOK, 0, 0, 0, 0);
 
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     LEDsoff();
@@ -461,7 +461,7 @@ void MifareUWriteBlockCompat(uint8_t arg0, uint8_t *datain)
 
     if (MF_DBGLEVEL >= 2)   DbpString("WRITE BLOCK FINISHED");
 
-    cmd_send(CMD_ACK,1,0,0,0,0);
+    reply_old(CMD_ACK,1,0,0,0,0);
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     LEDsoff();
 }
@@ -530,7 +530,7 @@ void MifareUWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain) {
 
     if (MF_DBGLEVEL >= 2) DbpString("WRITE BLOCK FINISHED");
 
-    cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
+    reply_old(CMD_ACK, 1, 0, 0, 0, 0);
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     LEDsoff();
     set_tracing(false);
@@ -603,7 +603,7 @@ void MifareUSetPwd(uint8_t arg0, uint8_t *datain) {
         return;
     };
 
-    cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
+    reply_old(CMD_ACK, 1, 0, 0, 0, 0);
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     LEDsoff();
     set_tracing(false);
@@ -706,7 +706,7 @@ void MifareAcquireNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *
 
     LED_C_OFF();
     LED_B_ON();
-    cmd_send(CMD_ACK, isOK, cuid, num_nonces - 1, buf, sizeof(buf));
+    reply_old(CMD_ACK, isOK, cuid, num_nonces - 1, buf, sizeof(buf));
     LED_B_OFF();
 
     if (MF_DBGLEVEL >= 3) DbpString("AcquireNonces finished");
@@ -834,7 +834,7 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
     LED_C_OFF();
     crypto1_destroy(pcs);
     LED_B_ON();
-    cmd_send(CMD_ACK, isOK, cuid, num_nonces, buf, sizeof(buf));
+    reply_old(CMD_ACK, isOK, cuid, num_nonces, buf, sizeof(buf));
     LED_B_OFF();
 
     if (MF_DBGLEVEL >= 3) DbpString("AcquireEncryptedNonces finished");
@@ -1054,7 +1054,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)
     memcpy(buf + 16, &target_ks[1], 4);
 
     LED_B_ON();
-    cmd_send(CMD_ACK, isOK, 0, targetBlockNo + (targetKeyType * 0x100), buf, sizeof(buf));
+    reply_old(CMD_ACK, isOK, 0, targetBlockNo + (targetKeyType * 0x100), buf, sizeof(buf));
     LED_B_OFF();
 
     if (MF_DBGLEVEL >= 3) DbpString("NESTED FINISHED");
@@ -1504,7 +1504,7 @@ OUT:
         tmp[488] = bar & 0xFF;
         tmp[489] = bar >> 8 & 0xFF;
 
-        cmd_send(CMD_ACK, foundkeys, 0, 0, tmp, 480 + 10);
+        reply_old(CMD_ACK, foundkeys, 0, 0, tmp, 480 + 10);
 
         set_tracing(false);
         FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
@@ -1512,7 +1512,7 @@ OUT:
         BigBuf_Clear_ext(false);
     } else {
         // partial/none keys found
-        cmd_send(CMD_ACK, foundkeys, 0, 0, 0, 0);
+        reply_old(CMD_ACK, foundkeys, 0, 0, 0, 0);
     }
 }
 
@@ -1592,7 +1592,7 @@ void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) {
     }
 
     LED_B_ON();
-    cmd_send(CMD_ACK, isOK, 0, 0, datain + i * 6, 6);
+    reply_old(CMD_ACK, isOK, 0, 0, datain + i * 6, 6);
 
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     LEDsoff();
@@ -1635,7 +1635,7 @@ void MifareEMemGet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)
     emlGetMem(buf, arg0, arg1); // data, block num, blocks count (max 4)
 
     LED_B_ON();
-    cmd_send(CMD_ACK, arg0, arg1, 0, buf, USB_CMD_DATA_SIZE);
+    reply_old(CMD_ACK, arg0, arg1, 0, buf, USB_CMD_DATA_SIZE);
     LED_B_OFF();
 }
 
@@ -1841,7 +1841,7 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain) {
     } // end while
 
     if (isOK)
-        cmd_send(CMD_ACK, 1, 0, 0, uid, sizeof(uid));
+        reply_old(CMD_ACK, 1, 0, 0, uid, sizeof(uid));
     else
         OnErrorMagic(errormsg);
 
@@ -1916,7 +1916,7 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain) {
             memcpy(datain, data, sizeof(data));
     } else {
         if (isOK)
-            cmd_send(CMD_ACK, 1, 0, 0, data, sizeof(data));
+            reply_old(CMD_ACK, 1, 0, 0, data, sizeof(data));
         else
             OnErrorMagic(errormsg);
     }
@@ -1975,7 +1975,7 @@ TEST2:
     };
 
 OUT:
-    cmd_send(CMD_ACK, isGen, 0, 0, 0, 0);
+    reply_old(CMD_ACK, isGen, 0, 0, 0, 0);
     // turns off
     OnSuccessMagic();
     BigBuf_free();
@@ -1988,7 +1988,7 @@ void OnSuccessMagic() {
 }
 void OnErrorMagic(uint8_t reason) {
     //          ACK, ISOK, reason,0,0,0
-    cmd_send(CMD_ACK, 0, reason, 0, 0, 0);
+    reply_old(CMD_ACK, 0, reason, 0, 0, 0);
     OnSuccessMagic();
 }
 
@@ -2042,7 +2042,7 @@ void MifareSetMod(uint8_t mod, uint8_t *key) {
     crypto1_destroy(pcs);
 
     LED_B_ON();
-    cmd_send(CMD_ACK, isOK, 0, 0, 0, 0);
+    reply_old(CMD_ACK, isOK, 0, 0, 0, 0);
     LED_B_OFF();
 
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
@@ -2075,7 +2075,7 @@ void Mifare_DES_Auth1(uint8_t arg0, uint8_t *datain) {
     }
 
     if (MF_DBGLEVEL >= MF_DBG_EXTENDED) DbpString("AUTH 1 FINISHED");
-    cmd_send(CMD_ACK, 1, cuid, 0, dataout, sizeof(dataout));
+    reply_old(CMD_ACK, 1, cuid, 0, dataout, sizeof(dataout));
 }
 
 void Mifare_DES_Auth2(uint32_t arg0, uint8_t *datain) {
@@ -2096,7 +2096,7 @@ void Mifare_DES_Auth2(uint32_t arg0, uint8_t *datain) {
 
     if (MF_DBGLEVEL >= MF_DBG_EXTENDED) DbpString("AUTH 2 FINISHED");
 
-    cmd_send(CMD_ACK, isOK, 0, 0, dataout, sizeof(dataout));
+    reply_old(CMD_ACK, isOK, 0, 0, dataout, sizeof(dataout));
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     LEDsoff();
     set_tracing(false);
diff --git a/armsrc/mifaredesfire.c b/armsrc/mifaredesfire.c
index 6168425bc..4854adc51 100644
--- a/armsrc/mifaredesfire.c
+++ b/armsrc/mifaredesfire.c
@@ -81,7 +81,7 @@ void MifareSendCommand(uint8_t arg0, uint8_t arg1, uint8_t *datain) {
     if (flags & DISCONNECT)
         OnSuccess();
 
-    cmd_send(CMD_ACK, 1, len, 0, resp, len);
+    reply_old(CMD_ACK, 1, len, 0, resp, len);
 }
 
 void MifareDesfireGetInformation() {
@@ -160,7 +160,7 @@ void MifareDesfireGetInformation() {
 
     memcpy(dataout + 7 + 7 + 7, resp + 3, 14);
 
-    cmd_send(CMD_ACK, 1, 0, 0, dataout, sizeof(dataout));
+    reply_old(CMD_ACK, 1, 0, 0, dataout, sizeof(dataout));
 
     // reset the pcb_blocknum,
     pcb_blocknum = 0;
@@ -409,9 +409,9 @@ void MifareDES_Auth1(uint8_t arg0, uint8_t arg1, uint8_t arg2,  uint8_t *datain)
 
                 OnSuccess();
                 if (arg1 == 2)
-                    cmd_send(CMD_ACK, 1, 0, 0, skey->data, 16);
+                    reply_old(CMD_ACK, 1, 0, 0, skey->data, 16);
                 else if (arg1 == 1)
-                    cmd_send(CMD_ACK, 1, 0, 0, skey->data, 8);
+                    reply_old(CMD_ACK, 1, 0, 0, skey->data, 8);
             } else {
                 DbpString("Authentication failed.");
                 OnError(6);
@@ -494,7 +494,7 @@ void MifareDES_Auth1(uint8_t arg0, uint8_t arg1, uint8_t arg2,  uint8_t *datain)
     }
 
     OnSuccess();
-    cmd_send(CMD_ACK, 1, len, 0, resp, len);
+    reply_old(CMD_ACK, 1, len, 0, resp, len);
 }
 
 // 3 different ISO ways to send data to a DESFIRE (direct, capsuled, capsuled ISO)
@@ -567,6 +567,6 @@ void OnSuccess() {
 }
 
 void OnError(uint8_t reason) {
-    cmd_send(CMD_ACK, 0, reason, 0, 0, 0);
+    reply_old(CMD_ACK, 0, reason, 0, 0, 0);
     OnSuccess();
 }
diff --git a/armsrc/mifaresim.c b/armsrc/mifaresim.c
index 2ab779a2a..f0708dd8c 100644
--- a/armsrc/mifaresim.c
+++ b/armsrc/mifaresim.c
@@ -1219,7 +1219,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
 
     if ((flags & FLAG_INTERACTIVE) == FLAG_INTERACTIVE) {  // Interactive mode flag, means we need to send ACK
         //Send the collected ar_nr in the response
-        cmd_send(CMD_ACK, CMD_SIMULATE_MIFARE_CARD, button_pushed, 0, &ar_nr_resp, sizeof(ar_nr_resp));
+        reply_old(CMD_ACK, CMD_SIMULATE_MIFARE_CARD, button_pushed, 0, &ar_nr_resp, sizeof(ar_nr_resp));
     }
 
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
diff --git a/armsrc/mifaresniff.c b/armsrc/mifaresniff.c
index 849d2693b..5d50f55c5 100644
--- a/armsrc/mifaresniff.c
+++ b/armsrc/mifaresniff.c
@@ -190,7 +190,7 @@ void MfSniffInit(void) {
 
 void MfSniffEnd(void) {
     LED_B_ON();
-    cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
+    reply_old(CMD_ACK, 0, 0, 0, 0, 0);
     LED_B_OFF();
 }
 
@@ -316,12 +316,12 @@ void RAMFUNC MfSniffSend() {
     while (packlen > 0) {
         LED_B_ON();
         chunksize = MIN(USB_CMD_DATA_SIZE, packlen); // chunk size 512
-        cmd_send(CMD_ACK, 1, tracelen, chunksize, data + tracelen - packlen, chunksize);
+        reply_old(CMD_ACK, 1, tracelen, chunksize, data + tracelen - packlen, chunksize);
         packlen -= chunksize;
         LED_B_OFF();
     }
 
     LED_B_ON();
-    cmd_send(CMD_ACK, 2, 0, 0, 0, 0);  // 2 == data transfer finished.
+    reply_old(CMD_ACK, 2, 0, 0, 0, 0);  // 2 == data transfer finished.
     LED_B_OFF();
 }
diff --git a/armsrc/pcf7931.c b/armsrc/pcf7931.c
index a308853e7..942569a9c 100644
--- a/armsrc/pcf7931.c
+++ b/armsrc/pcf7931.c
@@ -295,7 +295,7 @@ end:
 
         Dbprintf("-----------------------------------------");
     }
-    cmd_send(CMD_ACK, 0, 0, 0, 0, 0);
+    reply_old(CMD_ACK, 0, 0, 0, 0, 0);
 }
 
 static void RealWritePCF7931(uint8_t *pass, uint16_t init_delay, int32_t l, int32_t p, uint8_t address, uint8_t byte, uint8_t data) {
diff --git a/bootrom/bootrom.c b/bootrom/bootrom.c
index 78bda337c..cb39df6eb 100644
--- a/bootrom/bootrom.c
+++ b/bootrom/bootrom.c
@@ -20,7 +20,7 @@ void DbpString(char *str) {
     while (str[len] != 0x00)
         len++;
 
-    cmd_send(CMD_DEBUG_PRINT_STRING, len, 0, 0, (uint8_t *)str, len);
+    reply_old(CMD_DEBUG_PRINT_STRING, len, 0, 0, (uint8_t *)str, len);
 }
 
 static void ConfigClocks(void) {
@@ -84,12 +84,10 @@ static void Fatal(void) {
     for (;;) {};
 }
 
-void UsbPacketReceived(UsbCommandNG *packet) {
+void PacketReceived(PacketCommandNG *packet) {
     int i, dont_ack = 0;
     volatile uint32_t *p;
 
-    //if ( len != sizeof(UsbCommand)) Fatal();
-
     uint32_t arg0 = (uint32_t)packet->oldarg[0];
 
     switch (packet->cmd) {
@@ -100,7 +98,7 @@ void UsbPacketReceived(UsbCommandNG *packet) {
             if (common_area.flags.osimage_present)
                 arg0 |= DEVICE_INFO_FLAG_OSIMAGE_PRESENT;
 
-            cmd_send(CMD_DEVICE_INFO, arg0, 1, 2, 0, 0);
+            reply_old(CMD_DEVICE_INFO, arg0, 1, 2, 0, 0);
         }
         break;
 
@@ -127,7 +125,7 @@ void UsbPacketReceived(UsbCommandNG *packet) {
                 if (((flash_address + AT91C_IFLASH_PAGE_SIZE - 1) >= end_addr) || (flash_address < start_addr)) {
                     /* Disallow write */
                     dont_ack = 1;
-                    cmd_send(CMD_NACK, 0, 0, 0, 0, 0);
+                    reply_old(CMD_NACK, 0, 0, 0, 0, 0);
                 } else {
                     uint32_t page_n = (flash_address - ((uint32_t)flash_mem)) / AT91C_IFLASH_PAGE_SIZE;
                     /* Translate address to flash page and do flash, update here for the 512k part */
@@ -141,7 +139,7 @@ void UsbPacketReceived(UsbCommandNG *packet) {
                 while (!((sr = AT91C_BASE_EFC0->EFC_FSR) & AT91C_MC_FRDY));
                 if (sr & (AT91C_MC_LOCKE | AT91C_MC_PROGE)) {
                     dont_ack = 1;
-                    cmd_send(CMD_NACK, sr, 0, 0, 0, 0);
+                    reply_old(CMD_NACK, sr, 0, 0, 0, 0);
                 }
             }
         }
@@ -177,7 +175,7 @@ void UsbPacketReceived(UsbCommandNG *packet) {
             } else {
                 start_addr = end_addr = 0;
                 dont_ack = 1;
-                cmd_send(CMD_NACK, 0, 0, 0, 0, 0);
+                reply_old(CMD_NACK, 0, 0, 0, 0, 0);
             }
         }
         break;
@@ -189,14 +187,14 @@ void UsbPacketReceived(UsbCommandNG *packet) {
     }
 
     if (!dont_ack)
-        cmd_send(CMD_ACK, arg0, 0, 0, 0, 0);
+        reply_old(CMD_ACK, arg0, 0, 0, 0, 0);
 }
 
 static void flash_mode(int externally_entered) {
     start_addr = 0;
     end_addr = 0;
     bootrom_unlocked = 0;
-    UsbCommandNG rx;
+    PacketCommandNG rx;
 
     usb_enable();
 
@@ -210,7 +208,7 @@ static void flash_mode(int externally_entered) {
         if (usb_poll_validate_length()) {
 // TODO DOEGOX
             if (usb_read((uint8_t *)&rx, sizeof(rx)))
-                UsbPacketReceived(&rx);
+                PacketReceived(&rx);
         }
 
         if (!externally_entered && !BUTTON_PRESS()) {
diff --git a/client/cli.c b/client/cli.c
index 2d8466ba7..35c023c71 100644
--- a/client/cli.c
+++ b/client/cli.c
@@ -37,7 +37,7 @@ int main(int argc, char **argv) {
     while (1) {
         while (!OpenProxmark()) { sleep(1); }
         while (1) {
-            UsbCommandOLD cmdbuf;
+            PacketCommandOLD cmdbuf;
             CommandReceived(argv[1]);
             HANDLE_ERROR;
             ReceiveCommand(&cmdbuf);
diff --git a/client/cmdanalyse.c b/client/cmdanalyse.c
index fd64a2de3..97e4eae0b 100644
--- a/client/cmdanalyse.c
+++ b/client/cmdanalyse.c
@@ -512,12 +512,12 @@ static int CmdAnalyseA(const char *Cmd) {
     if (errors || cmdp == 0) return usage_analyse_a();
 
 
-    UsbCommandOLD c = {CMD_FPC_SEND, {0, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_FPC_SEND, {0, 0, 0}, {{0}}};
     memcpy(c.d.asBytes, data, USB_CMD_DATA_SIZE);
     clearCommandBuffer();
     SendCommand(&c);
 
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         return 1;
     }
diff --git a/client/cmddata.c b/client/cmddata.c
index c96e9fb7d..78e6df0a7 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -874,7 +874,7 @@ static int CmdBuffClear(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_data_buffclear();
 
-    UsbCommandOLD c = {CMD_BUFF_CLEAR, {0, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_BUFF_CLEAR, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     ClearGraph(true);
@@ -1457,7 +1457,7 @@ int getSamples(uint32_t n, bool silent) {
 
     if (!silent) PrintAndLogEx(NORMAL, "Reading %d bytes from device memory\n", n);
 
-    UsbReplyNG response;
+    PacketResponseNG response;
     if (!GetFromDevice(BIG_BUF, got, n, 0, &response, 10000, true)) {
         PrintAndLogEx(WARNING, "timeout while waiting for reply.");
         return 1;
@@ -1529,10 +1529,10 @@ int CmdTuneSamples(const char *Cmd) {
     int timeout = 0;
     PrintAndLogEx(INFO, "\nMeasuring antenna characteristics, please wait...");
 
-    UsbCommandOLD c = {CMD_MEASURE_ANTENNA_TUNING, {0, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_MEASURE_ANTENNA_TUNING, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     while (!WaitForResponseTimeout(CMD_MEASURED_ANTENNA_TUNING, &resp, 2000)) {
         timeout++;
         printf(".");
diff --git a/client/cmdflashmem.c b/client/cmdflashmem.c
index 73b1176f6..8e8215501 100644
--- a/client/cmdflashmem.c
+++ b/client/cmdflashmem.c
@@ -140,7 +140,7 @@ static int CmdFlashMemRead(const char *Cmd) {
         return 1;
     }
 
-    UsbCommandOLD c = {CMD_FLASHMEM_READ, {start_index, len, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_FLASHMEM_READ, {start_index, len, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -153,7 +153,7 @@ static int CmdFlashmemSpiBaudrate(const char *Cmd) {
     uint32_t baudrate = param_get32ex(Cmd, 0, 0, 10);
     baudrate = baudrate * 1000000;
     if (baudrate != FLASH_BAUD && baudrate != FLASH_MINBAUD) return usage_flashmem_spibaud();
-    UsbCommandOLD c = {CMD_FLASHMEM_SET_SPIBAUDRATE, {baudrate, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_FLASHMEM_SET_SPIBAUDRATE, {baudrate, 0, 0}, {{0}}};
     SendCommand(&c);
     return 0;
 }
@@ -274,7 +274,7 @@ static int CmdFlashMemLoad(const char *Cmd) {
     while (bytes_remaining > 0) {
         uint32_t bytes_in_packet = MIN(FLASH_MEM_BLOCK_SIZE, bytes_remaining);
 
-        UsbCommandOLD c = {CMD_FLASHMEM_WRITE, {start_index + bytes_sent, bytes_in_packet, 0}, {{0}}};
+        PacketCommandOLD c = {CMD_FLASHMEM_WRITE, {start_index + bytes_sent, bytes_in_packet, 0}, {{0}}};
 
         memcpy(c.d.asBytes, data + bytes_sent, bytes_in_packet);
         clearCommandBuffer();
@@ -283,7 +283,7 @@ static int CmdFlashMemLoad(const char *Cmd) {
         bytes_remaining -= bytes_in_packet;
         bytes_sent += bytes_in_packet;
 
-        UsbReplyNG resp;
+        PacketResponseNG resp;
         if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
             PrintAndLogEx(WARNING, "timeout while waiting for reply.");
             free(data);
@@ -389,10 +389,10 @@ static int CmdFlashMemWipe(const char *Cmd) {
     //Validations
     if (errors || cmdp == 0) return usage_flashmem_wipe();
 
-    UsbCommandOLD c = {CMD_FLASHMEM_WIPE, {page, initalwipe, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_FLASHMEM_WIPE, {page, initalwipe, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 8000)) {
         PrintAndLogEx(WARNING, "timeout while waiting for reply.");
         return 1;
@@ -435,10 +435,10 @@ static int CmdFlashMemInfo(const char *Cmd) {
     //Validations
     if (errors) return usage_flashmem_info();
 
-    UsbCommandOLD c = {CMD_FLASHMEM_INFO, {0, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_FLASHMEM_INFO, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         PrintAndLogEx(WARNING, "timeout while waiting for reply.");
         return 1;
@@ -564,7 +564,7 @@ static int CmdFlashMemInfo(const char *Cmd) {
 
         if (shall_write) {
             // save to mem
-            c = (UsbCommandOLD) {CMD_FLASHMEM_WRITE, {FLASH_MEM_SIGNATURE_OFFSET, FLASH_MEM_SIGNATURE_LEN, 0}, {{0}}};
+            c = (PacketCommandOLD) {CMD_FLASHMEM_WRITE, {FLASH_MEM_SIGNATURE_OFFSET, FLASH_MEM_SIGNATURE_LEN, 0}, {{0}}};
             memcpy(c.d.asBytes, sign, sizeof(sign));
             clearCommandBuffer();
             SendCommand(&c);
diff --git a/client/cmdhf.c b/client/cmdhf.c
index 5d569b629..4c4f6f7df 100644
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -84,7 +84,7 @@ int CmdHFSearch(const char *Cmd) {
 int CmdHFTune(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     PrintAndLogEx(SUCCESS, "Measuring HF antenna, press button to exit");
-    UsbCommandOLD c = {CMD_MEASURE_ANTENNA_TUNING_HF, {0, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_MEASURE_ANTENNA_TUNING_HF, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -97,7 +97,7 @@ int CmdHFSniff(const char *Cmd) {
     int skippairs =  param_get32ex(Cmd, 0, 0, 10);
     int skiptriggers =  param_get32ex(Cmd, 1, 0, 10);
 
-    UsbCommandOLD c = {CMD_HF_SNIFFER, {skippairs, skiptriggers, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_HF_SNIFFER, {skippairs, skiptriggers, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 512f35473..6429d3c99 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -228,10 +228,10 @@ static int CmdHF14AList(const char *Cmd) {
 }
 
 int Hf14443_4aGetCardData(iso14a_card_select_t *card) {
-    UsbCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT, 0, 0}, {{0}}};
     SendCommand(&c);
 
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     WaitForResponse(CMD_ACK, &resp);
 
     memcpy(card, (iso14a_card_select_t *)resp.data.asBytes, sizeof(iso14a_card_select_t));
@@ -298,12 +298,12 @@ static int CmdHF14AReader(const char *Cmd) {
     if (!disconnectAfter)
         cm |= ISO14A_NO_DISCONNECT;
 
-    UsbCommandOLD c = {CMD_READER_ISO_14443a, {cm, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_READER_ISO_14443a, {cm, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
 
     if (ISO14A_CONNECT & cm) {
-        UsbReplyNG resp;
+        PacketResponseNG resp;
         if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
             if (!silent) PrintAndLogEx(WARNING, "iso14443a card select failed");
             DropField();
@@ -385,10 +385,10 @@ static int CmdHF14ACUIDs(const char *Cmd) {
         }
 
         // execute anticollision procedure
-        UsbCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0}, {{0}}};
+        PacketCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0}, {{0}}};
         SendCommand(&c);
 
-        UsbReplyNG resp;
+        PacketResponseNG resp;
         WaitForResponse(CMD_ACK, &resp);
 
         iso14a_card_select_t *card = (iso14a_card_select_t *) resp.data.asBytes;
@@ -483,11 +483,11 @@ int CmdHF14ASim(const char *Cmd) {
     if (useUIDfromEML)
         flags |= FLAG_UID_IN_EMUL;
 
-    UsbCommandOLD c = {CMD_SIMULATE_TAG_ISO_14443a, { tagtype, flags, 0 }, {{0}}};
+    PacketCommandOLD c = {CMD_SIMULATE_TAG_ISO_14443a, { tagtype, flags, 0 }, {{0}}};
     memcpy(c.d.asBytes, uid, uidlen >> 1);
     clearCommandBuffer();
     SendCommand(&c);
-    UsbReplyNG resp;
+    PacketResponseNG resp;
 
     PrintAndLogEx(SUCCESS, "press pm3-button to abort simulation");
 
@@ -512,7 +512,7 @@ int CmdHF14ASniff(const char *Cmd) {
         if (ctmp == 'c') param |= 0x01;
         if (ctmp == 'r') param |= 0x02;
     }
-    UsbCommandOLD c = {CMD_SNIFF_ISO_14443a, {param, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_SNIFF_ISO_14443a, {param, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -525,10 +525,10 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
 
     if (activateField) {
         responseNum = 1;
-        UsbReplyNG resp;
+        PacketResponseNG resp;
 
         // Anticollision + SELECT card
-        UsbCommandOLD ca = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}, {{0}}};
+        PacketCommandOLD ca = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}, {{0}}};
         SendCommand(&ca);
         if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
             PrintAndLogEx(ERR, "Proxmark3 connection timeout.");
@@ -548,7 +548,7 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
 
         if (resp.oldarg[0] == 2) { // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
             // get ATS
-            UsbCommandOLD cr = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT, 2, 0}, {{0}}};
+            PacketCommandOLD cr = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT, 2, 0}, {{0}}};
             uint8_t rats[] = { 0xE0, 0x80 }; // FSDI=8 (FSD=256), CID=0
             memcpy(cr.d.asBytes, rats, 2);
             SendCommand(&cr);
@@ -567,7 +567,7 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
     if (leaveSignalON)
         cmdc |= ISO14A_NO_DISCONNECT;
 
-    UsbCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_APPEND_CRC | cmdc, (datainlen & 0xFFFF) + 2, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_APPEND_CRC | cmdc, (datainlen & 0xFFFF) + 2, 0}, {{0}}};
     uint8_t header[] = { 0x0a | responseNum, 0x00};
     responseNum ^= 1;
     memcpy(c.d.asBytes, header, 2);
@@ -575,7 +575,7 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
     SendCommand(&c);
 
     uint8_t *recv;
-    UsbReplyNG resp;
+    PacketResponseNG resp;
 
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         recv = resp.data.asBytes;
@@ -617,7 +617,7 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
 }
 
 static int SelectCard14443_4(bool disconnect, iso14a_card_select_t *card) {
-    UsbReplyNG resp;
+    PacketResponseNG resp;
 
     frameLength = 0;
 
@@ -627,7 +627,7 @@ static int SelectCard14443_4(bool disconnect, iso14a_card_select_t *card) {
     DropField();
 
     // Anticollision + SELECT card
-    UsbCommandOLD ca = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}, {{0}}};
+    PacketCommandOLD ca = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}, {{0}}};
     SendCommand(&ca);
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         PrintAndLogEx(ERR, "Proxmark3 connection timeout.");
@@ -647,7 +647,7 @@ static int SelectCard14443_4(bool disconnect, iso14a_card_select_t *card) {
 
     if (resp.oldarg[0] == 2) { // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
         // get ATS
-        UsbCommandOLD cr = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT, 2, 0}, {{0}}};
+        PacketCommandOLD cr = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT, 2, 0}, {{0}}};
         uint8_t rats[] = { 0xE0, 0x80 }; // FSDI=8 (FSD=256), CID=0
         memcpy(cr.d.asBytes, rats, 2);
         SendCommand(&cr);
@@ -704,7 +704,7 @@ static int CmdExchangeAPDU(bool chainingin, uint8_t *datain, int datainlen, bool
     // https://stackoverflow.com/questions/32994936/safe-max-java-card-apdu-data-command-and-respond-size
     // here length USB_CMD_DATA_SIZE=512
     // timeout must be authomatically set by "get ATS"
-    UsbCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_APDU | ISO14A_NO_DISCONNECT | cmdc, (datainlen & 0xFFFF), 0}, {{0}}};
+    PacketCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_APDU | ISO14A_NO_DISCONNECT | cmdc, (datainlen & 0xFFFF), 0}, {{0}}};
 
     if (datain)
         memcpy(c.d.asBytes, datain, datainlen);
@@ -712,7 +712,7 @@ static int CmdExchangeAPDU(bool chainingin, uint8_t *datain, int datainlen, bool
     SendCommand(&c);
 
     uint8_t *recv;
-    UsbReplyNG resp;
+    PacketResponseNG resp;
 
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         recv = resp.data.asBytes;
@@ -891,7 +891,7 @@ static int CmdHF14AAPDU(const char *Cmd) {
 }
 
 static int CmdHF14ACmdRaw(const char *Cmd) {
-    UsbCommandOLD c = {CMD_READER_ISO_14443a, {0, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_READER_ISO_14443a, {0, 0, 0}, {{0}}};
     bool reply = 1;
     bool crc = false;
     bool power = false;
@@ -1047,7 +1047,7 @@ static int CmdHF14ACmdRaw(const char *Cmd) {
 }
 
 static int waitCmd(uint8_t iSelect) {
-    UsbReplyNG resp;
+    PacketResponseNG resp;
 
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         uint16_t len = (resp.oldarg[0] & 0xFFFF);
@@ -1096,7 +1096,7 @@ static int CmdHF14AAntiFuzz(const char *Cmd) {
         arg0 = FLAG_10B_UID_IN_DATA;
 
     CLIParserFree();
-    UsbCommandOLD c = {CMD_ANTIFUZZ_ISO_14443a, {arg0, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_ANTIFUZZ_ISO_14443a, {arg0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -1161,10 +1161,10 @@ int CmdHF14A(const char *Cmd) {
 }
 
 int infoHF14A(bool verbose, bool do_nack_test) {
-    UsbCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         if (verbose) PrintAndLogEx(WARNING, "iso14443a card select failed");
         DropField();
diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c
index 4eba870eb..6fa549468 100644
--- a/client/cmdhf14b.c
+++ b/client/cmdhf14b.c
@@ -108,14 +108,14 @@ static int usage_hf_14b_dump(void) {
 
 /*
 static void switch_on_field_14b(void) {
-    UsbCommandOLD c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
 }
 */
 
 static int switch_off_field_14b(void) {
-    UsbCommandOLD c = {CMD_ISO_14443B_COMMAND, {ISO14B_DISCONNECT, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_ISO_14443B_COMMAND, {ISO14B_DISCONNECT, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -124,7 +124,7 @@ static int switch_off_field_14b(void) {
 static bool waitCmd14b(bool verbose) {
 
     uint8_t data[USB_CMD_DATA_SIZE] = {0x00};
-    UsbReplyNG resp;
+    PacketResponseNG resp;
 
     if (WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
 
@@ -171,7 +171,7 @@ static int CmdHF14BSim(const char *Cmd) {
         pupi = param_get32ex(Cmd, 1, 0, 16);
     }
 
-    UsbCommandOLD c = {CMD_SIMULATE_TAG_ISO_14443B, {pupi, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_SIMULATE_TAG_ISO_14443B, {pupi, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -182,7 +182,7 @@ static int CmdHF14BSniff(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_hf_14b_sniff();
 
-    UsbCommandOLD c = {CMD_SNIFF_ISO_14443B, {0, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_SNIFF_ISO_14443B, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -277,7 +277,7 @@ static int CmdHF14BCmdRaw(const char *Cmd) {
     // Max buffer is USB_CMD_DATA_SIZE
     datalen = (datalen > USB_CMD_DATA_SIZE) ? USB_CMD_DATA_SIZE : datalen;
 
-    UsbCommandOLD c = {CMD_ISO_14443B_COMMAND, {flags, datalen, time_wait}, {{0}}};
+    PacketCommandOLD c = {CMD_ISO_14443B_COMMAND, {flags, datalen, time_wait}, {{0}}};
     memcpy(c.d.asBytes, data, datalen);
     clearCommandBuffer();
     SendCommand(&c);
@@ -301,8 +301,8 @@ static bool get_14b_UID(iso14b_card_select_t *card) {
         return false;
 
     int8_t retry = 3;
-    UsbReplyNG resp;
-    UsbCommandOLD c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_SR | ISO14B_DISCONNECT, 0, 0}, {{0}}};
+    PacketResponseNG resp;
+    PacketCommandOLD c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_SR | ISO14B_DISCONNECT, 0, 0}, {{0}}};
 
     // test for 14b SR
     while (retry--) {
@@ -509,10 +509,10 @@ static bool HF14B_Std_Info(bool verbose) {
     bool isSuccess = false;
 
     // 14b get and print UID only (general info)
-    UsbCommandOLD c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_STD | ISO14B_DISCONNECT, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_STD | ISO14B_DISCONNECT, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
-    UsbReplyNG resp;
+    PacketResponseNG resp;
 
     if (!WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
         if (verbose) PrintAndLogEx(WARNING, "command execution timeout");
@@ -550,10 +550,10 @@ static bool HF14B_Std_Info(bool verbose) {
 // SRx get and print full info (needs more info...)
 static bool HF14B_ST_Info(bool verbose) {
 
-    UsbCommandOLD c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_SR | ISO14B_DISCONNECT, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_SR | ISO14B_DISCONNECT, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
-    UsbReplyNG resp;
+    PacketResponseNG resp;
 
     if (!WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
         if (verbose) PrintAndLogEx(WARNING, "command execution timeout");
@@ -607,10 +607,10 @@ static bool HF14B_ST_Reader(bool verbose) {
     bool isSuccess = false;
 
     // SRx get and print general info about SRx chip from UID
-    UsbCommandOLD c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_SR | ISO14B_DISCONNECT, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_SR | ISO14B_DISCONNECT, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
         if (verbose) PrintAndLogEx(WARNING, "command execution timeout");
         return false;
@@ -647,10 +647,10 @@ static bool HF14B_Std_Reader(bool verbose) {
     bool isSuccess = false;
 
     // 14b get and print UID only (general info)
-    UsbCommandOLD c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_STD | ISO14B_DISCONNECT, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_STD | ISO14B_DISCONNECT, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
-    UsbReplyNG resp;
+    PacketResponseNG resp;
 
     if (!WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
         if (verbose) PrintAndLogEx(WARNING, "command execution timeout");
@@ -692,12 +692,12 @@ static bool HF14B_Other_Reader() {
     // // 14b get and print UID only (general info)
     // uint32_t flags = ISO14B_CONNECT | ISO14B_SELECT_STD | ISO14B_RAW | ISO14B_APPEND_CRC;
 
-    // UsbCommandOLD c = {CMD_ISO_14443B_COMMAND, {flags, datalen, 0}, {{0}}};
+    // PacketCommandOLD c = {CMD_ISO_14443B_COMMAND, {flags, datalen, 0}, {{0}}};
     // memcpy(c.d.asBytes, data, datalen);
 
     // clearCommandBuffer();
     // SendCommand(&c);
-    // UsbReplyNG resp;
+    // PacketResponseNG resp;
     // WaitForResponse(CMD_ACK,&resp);
 
     // if (datalen > 2 ) {
@@ -712,7 +712,7 @@ static bool HF14B_Other_Reader() {
     // c.d.asBytes[0] = ISO14443B_AUTHENTICATE;
     // clearCommandBuffer();
     // SendCommand(&c);
-    // UsbReplyNG resp;
+    // PacketResponseNG resp;
     // WaitForResponse(CMD_ACK, &resp);
 
     // if (datalen > 0) {
@@ -727,7 +727,7 @@ static bool HF14B_Other_Reader() {
     // c.d.asBytes[0] = ISO14443B_RESET;
     // clearCommandBuffer();
     // SendCommand(&c);
-    // UsbReplyNG resp;
+    // PacketResponseNG resp;
     // WaitForResponse(CMD_ACK, &resp);
 
     // if (datalen > 0) {
@@ -762,7 +762,7 @@ static int CmdHF14BReadSri(const char *Cmd) {
     uint8_t tagtype = param_get8(Cmd, 0);
     uint8_t blocks = (tagtype == 1) ? 0x7F : 0x0F;
 
-    UsbCommandOLD c = {CMD_READ_SRI_TAG, {blocks, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_READ_SRI_TAG, {blocks, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -901,8 +901,8 @@ static int CmdHF14BDump(const char *Cmd) {
     int blocknum = 0;
     uint8_t *recv = NULL;
 
-    UsbReplyNG resp;
-    UsbCommandOLD c = {CMD_ISO_14443B_COMMAND, { ISO14B_CONNECT | ISO14B_SELECT_SR, 0, 0}, {{0}}};
+    PacketResponseNG resp;
+    PacketCommandOLD c = {CMD_ISO_14443B_COMMAND, { ISO14B_CONNECT | ISO14B_SELECT_SR, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
 
diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index 199a8952d..9aef649cc 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -198,8 +198,8 @@ const productName uidmapping[] = {
 // returns 1 if suceeded
 static int getUID(uint8_t *buf) {
 
-    UsbReplyNG resp;
-    UsbCommandOLD c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}}; // len,speed,recv?
+    PacketResponseNG resp;
+    PacketCommandOLD c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}}; // len,speed,recv?
 
     c.d.asBytes[0] = ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | ISO15_REQ_INVENTORY | ISO15_REQINV_SLOT1;
     c.d.asBytes[1] = ISO15_CMD_INVENTORY;
@@ -418,7 +418,7 @@ static int usage_15_readmulti(void) {
  * Parameters:
  *  **cmd   command line
  */
-static int prepareHF15Cmd(char **cmd, UsbCommandOLD *c, uint8_t iso15cmd) {
+static int prepareHF15Cmd(char **cmd, PacketCommandOLD *c, uint8_t iso15cmd) {
     int temp;
     uint8_t *req = c->d.asBytes;
     uint8_t uid[8] = {0x00};
@@ -577,7 +577,7 @@ static int CmdHF15Samples(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_15_samples();
 
-    UsbCommandOLD c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_15693, {0, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_15693, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
 
@@ -594,9 +594,9 @@ static int CmdHF15Info(const char *Cmd) {
     char cmdp = param_getchar(Cmd, 0);
     if (strlen(Cmd) < 1 || cmdp == 'h' || cmdp == 'H') return usage_15_info();
 
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     uint8_t *recv;
-    UsbCommandOLD c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}}; // len,speed,recv?
+    PacketCommandOLD c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}}; // len,speed,recv?
     uint8_t *req = c.d.asBytes;
     char cmdbuf[100] = {0};
     char *cmd = cmdbuf;
@@ -674,7 +674,7 @@ static int CmdHF15Record(const char *Cmd) {
     char cmdp =  tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_15_record();
 
-    UsbCommandOLD c = {CMD_RECORD_RAW_ADC_SAMPLES_ISO_15693, {0, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_RECORD_RAW_ADC_SAMPLES_ISO_15693, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -702,7 +702,7 @@ static int CmdHF15Sim(const char *Cmd) {
 
     PrintAndLogEx(SUCCESS, "Starting simulating UID %s", sprint_hex(uid, sizeof(uid)));
 
-    UsbCommandOLD c = {CMD_SIMTAG_ISO_15693, {0, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_SIMTAG_ISO_15693, {0, 0, 0}, {{0}}};
     memcpy(c.d.asBytes, uid, 8);
     clearCommandBuffer();
     SendCommand(&c);
@@ -718,7 +718,7 @@ static int CmdHF15Afi(const char *Cmd) {
 
     PrintAndLogEx(SUCCESS, "press pm3-button to cancel");
 
-    UsbCommandOLD c = {CMD_ISO_15693_FIND_AFI, {strtol(Cmd, NULL, 0), 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_ISO_15693_FIND_AFI, {strtol(Cmd, NULL, 0), 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -783,8 +783,8 @@ static int CmdHF15Dump(const char *Cmd) {
     uint8_t data[256 * 4] = {0};
     memset(data, 0, sizeof(data));
 
-    UsbReplyNG resp;
-    UsbCommandOLD c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}}; // len,speed,recv?
+    PacketResponseNG resp;
+    PacketCommandOLD c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}}; // len,speed,recv?
     uint8_t *req = c.d.asBytes;
     req[0] = ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | ISO15_REQ_NONINVENTORY | ISO15_REQ_ADDRESS;
     req[1] = ISO15_CMD_READ;
@@ -859,8 +859,8 @@ static int CmdHF15Raw(const char *Cmd) {
     char cmdp = param_getchar(Cmd, 0);
     if (strlen(Cmd) < 3 || cmdp == 'h' || cmdp == 'H') return usage_15_raw();
 
-    UsbReplyNG resp;
-    UsbCommandOLD c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}}; // len,speed,recv?
+    PacketResponseNG resp;
+    PacketCommandOLD c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}}; // len,speed,recv?
     int reply = 1, fast = 1, i = 0;
     bool crc = false;
     char buf[5] = "";
@@ -945,9 +945,9 @@ static int CmdHF15Readmulti(const char *Cmd) {
     char cmdp = param_getchar(Cmd, 0);
     if (strlen(Cmd) < 3 || cmdp == 'h' || cmdp == 'H') return usage_15_readmulti();
 
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     uint8_t *recv;
-    UsbCommandOLD c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}}; // len,speed,recv?
+    PacketCommandOLD c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}}; // len,speed,recv?
     uint8_t *req = c.d.asBytes;
     int reqlen = 0;
     uint8_t pagenum, pagecount;
@@ -1028,14 +1028,14 @@ static int CmdHF15Read(const char *Cmd) {
     char cmdp = param_getchar(Cmd, 0);
     if (strlen(Cmd) < 3 || cmdp == 'h' || cmdp == 'H')  return usage_15_read();
 
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     uint8_t *recv;
 
-    // UsbCommandOLD arg: len, speed, recv?
+    // PacketCommandOLD arg: len, speed, recv?
     // arg0 (datalen,  cmd len?  .arg0 == crc?)
     // arg1 (speed == 0 == 1 of 256,  == 1 == 1 of 4 )
     // arg2 (recv == 1 == expect a response)
-    UsbCommandOLD c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}};
+    PacketCommandOLD c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}};
     uint8_t *req = c.d.asBytes;
     int reqlen = 0, blocknum;
     char cmdbuf[100] = {0};
@@ -1102,9 +1102,9 @@ static int CmdHF15Write(const char *Cmd) {
     char cmdp = param_getchar(Cmd, 0);
     if (strlen(Cmd) < 3 || cmdp == 'h' || cmdp == 'H') return usage_15_write();
 
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     uint8_t *recv;
-    UsbCommandOLD c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}}; // len,speed,recv?
+    PacketCommandOLD c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}}; // len,speed,recv?
     uint8_t *req = c.d.asBytes;
     int reqlen = 0, pagenum, temp;
     char cmdbuf[100] = {0};
diff --git a/client/cmdhfepa.c b/client/cmdhfepa.c
index ea6f5c48d..6a7674ddd 100644
--- a/client/cmdhfepa.c
+++ b/client/cmdhfepa.c
@@ -31,10 +31,10 @@ static int CmdHFEPACollectPACENonces(const char *Cmd) {
     // repeat n times
     for (uint32_t i = 0; i < n; i++) {
         // execute PACE
-        UsbCommandOLD c = {CMD_EPA_PACE_COLLECT_NONCE, {(int)m, 0, 0}, {{0}}};
+        PacketCommandOLD c = {CMD_EPA_PACE_COLLECT_NONCE, {(int)m, 0, 0}, {{0}}};
         clearCommandBuffer();
         SendCommand(&c);
-        UsbReplyNG resp;
+        PacketResponseNG resp;
         WaitForResponse(CMD_ACK, &resp);
 
         // check if command failed
@@ -72,7 +72,7 @@ static int CmdHFEPAPACEReplay(const char *Cmd) {
         "Example:\n preplay 0022C1A4 1068000000 1086000002 1234ABCDEF 1A2B3C4D";
 
     // Proxmark response
-    UsbReplyNG resp;
+    PacketResponseNG resp;
 
     int skip = 0, skip_add = 0, scan_return;
     // for each APDU
@@ -109,7 +109,7 @@ static int CmdHFEPAPACEReplay(const char *Cmd) {
     }
 
     // transfer the APDUs to the Proxmark
-    UsbCommandOLD usb_cmd;
+    PacketCommandOLD usb_cmd;
     usb_cmd.cmd = CMD_EPA_PACE_REPLAY;
     for (int i = 0; i < sizeof(apdu_lengths); i++) {
         // APDU number
diff --git a/client/cmdhffelica.c b/client/cmdhffelica.c
index 9e9d057de..e628101b3 100644
--- a/client/cmdhffelica.c
+++ b/client/cmdhffelica.c
@@ -128,11 +128,11 @@ static int CmdHFFelicaSim(const char *Cmd) {
     //Validations
     if (errors || cmdp == 0) return usage_hf_felica_sim();
 
-    UsbCommandOLD c = {CMD_FELICA_SIMULATE_TAG, { tagtype, flags, 0 }, {{0}}};
+    PacketCommandOLD c = {CMD_FELICA_SIMULATE_TAG, { tagtype, flags, 0 }, {{0}}};
     memcpy(c.d.asBytes, uid, uidlen >> 1);
     clearCommandBuffer();
     SendCommand(&c);
-    UsbReplyNG resp;
+    PacketResponseNG resp;
 
     if (verbose)
         PrintAndLogEx(NORMAL, "Press pm3-button to abort simulation");
@@ -174,7 +174,7 @@ static int CmdHFFelicaSniff(const char *Cmd) {
     //Validations
     if (errors || cmdp == 0) return usage_hf_felica_sniff();
 
-    UsbCommandOLD c = {CMD_FELICA_SNIFF, {samples2skip, triggers2skip, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_FELICA_SNIFF, {samples2skip, triggers2skip, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -188,7 +188,7 @@ static int CmdHFFelicaSimLite(const char *Cmd) {
     if (!uid)
         return usage_hf_felica_simlite();
 
-    UsbCommandOLD c = {CMD_FELICA_LITE_SIM, {uid, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_FELICA_LITE_SIM, {uid, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -352,10 +352,10 @@ static int CmdHFFelicaDumpLite(const char *Cmd) {
 
     PrintAndLogEx(SUCCESS, "FeliCa lite - dump started");
     PrintAndLogEx(SUCCESS, "press pm3-button to cancel");
-    UsbCommandOLD c = {CMD_FELICA_LITE_DUMP, {0, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_FELICA_LITE_DUMP, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
-    UsbReplyNG resp;
+    PacketResponseNG resp;
 
     uint8_t timeout = 0;
     while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
@@ -412,7 +412,7 @@ static int CmdHFFelicaDumpLite(const char *Cmd) {
 }
 
 static void waitCmdFelica(uint8_t iSelect) {
-    UsbReplyNG resp;
+    PacketResponseNG resp;
 
     if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
         uint16_t len = iSelect ? (resp.oldarg[1] & 0xffff) : (resp.oldarg[0]  & 0xffff);
@@ -426,7 +426,7 @@ static void waitCmdFelica(uint8_t iSelect) {
 }
 
 static int CmdHFFelicaCmdRaw(const char *Cmd) {
-    UsbCommandOLD c = {CMD_FELICA_COMMAND, {0, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_FELICA_COMMAND, {0, 0, 0}, {{0}}};
     bool reply = 1;
     bool crc = false;
     bool power = false;
@@ -568,11 +568,11 @@ int CmdHFFelica(const char *Cmd) {
 
 int readFelicaUid(bool verbose) {
 
-    //UsbCommandOLD cDisconnect = {CMD_FELICA_COMMAND, {0,0,0}, {{0}}};
-    UsbCommandOLD c = {CMD_FELICA_COMMAND, {FELICA_CONNECT, 0, 0}, {{0}}};
+    //PacketCommandOLD cDisconnect = {CMD_FELICA_COMMAND, {0,0,0}, {{0}}};
+    PacketCommandOLD c = {CMD_FELICA_COMMAND, {FELICA_CONNECT, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         if (verbose) PrintAndLogEx(WARNING, "FeliCa card select failed");
         //SendCommand(&cDisconnect);
diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index 3a5b50ad0..faa8f3941 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -281,7 +281,7 @@ static int CmdHFiClassList(const char *Cmd) {
 static int CmdHFiClassSniff(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_hf_iclass_sniff();
-    UsbCommandOLD c = {CMD_SNIFF_ICLASS, {0, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_SNIFF_ICLASS, {0, 0, 0}, {{0}}};
     SendCommand(&c);
     return 0;
 }
@@ -380,8 +380,8 @@ static int CmdHFiClassSim(const char *Cmd) {
         case 2: {
             PrintAndLogEx(INFO, "Starting iCLASS sim 2 attack (elite mode)");
             PrintAndLogEx(INFO, "press keyboard to cancel");
-            UsbCommandOLD c = {CMD_SIMULATE_TAG_ICLASS, {simType, NUM_CSNS}, {{0}}};
-            UsbReplyNG resp;
+            PacketCommandOLD c = {CMD_SIMULATE_TAG_ICLASS, {simType, NUM_CSNS}, {{0}}};
+            PacketResponseNG resp;
             memcpy(c.d.asBytes, csns, 8 * NUM_CSNS);
             clearCommandBuffer();
             SendCommand(&c);
@@ -433,8 +433,8 @@ static int CmdHFiClassSim(const char *Cmd) {
             // reader in key roll mode,  when it has two keys it alternates when trying to verify.
             PrintAndLogEx(INFO, "Starting iCLASS sim 4 attack (elite mode, reader in key roll mode)");
             PrintAndLogEx(INFO, "press keyboard to cancel");
-            UsbCommandOLD c = {CMD_SIMULATE_TAG_ICLASS, {simType, NUM_CSNS}, {{0}}};
-            UsbReplyNG resp;
+            PacketCommandOLD c = {CMD_SIMULATE_TAG_ICLASS, {simType, NUM_CSNS}, {{0}}};
+            PacketResponseNG resp;
             memcpy(c.d.asBytes, csns, 8 * NUM_CSNS);
             clearCommandBuffer();
             SendCommand(&c);
@@ -501,7 +501,7 @@ static int CmdHFiClassSim(const char *Cmd) {
         case 1:
         case 3:
         default: {
-            UsbCommandOLD c = {CMD_SIMULATE_TAG_ICLASS, {simType, numberOfCSNs}, {{0}}};
+            PacketCommandOLD c = {CMD_SIMULATE_TAG_ICLASS, {simType, numberOfCSNs}, {{0}}};
             memcpy(c.d.asBytes, CSN, 8);
             clearCommandBuffer();
             SendCommand(&c);
@@ -531,7 +531,7 @@ static int CmdHFiClassReader_Replay(const char *Cmd) {
         return 1;
     }
 
-    UsbCommandOLD c = {CMD_READER_ICLASS_REPLAY, {readerType}, {{0}}};
+    PacketCommandOLD c = {CMD_READER_ICLASS_REPLAY, {readerType}, {{0}}};
     memcpy(c.d.asBytes, MAC, 4);
     clearCommandBuffer();
     SendCommand(&c);
@@ -540,7 +540,7 @@ static int CmdHFiClassReader_Replay(const char *Cmd) {
 
 /*
 static int iclassEmlSetMem(uint8_t *data, int blockNum, int blocksCount) {
-    UsbCommandOLD c = {CMD_MIFARE_EML_MEMSET, {blockNum, blocksCount, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_MIFARE_EML_MEMSET, {blockNum, blocksCount, 0}, {{0}}};
     memcpy(c.d.asBytes, data, blocksCount * 16);
     clearCommandBuffer();
     SendCommand(&c);
@@ -603,7 +603,7 @@ static int CmdHFiClassELoad(const char *Cmd) {
 
     while (bytes_remaining > 0) {
         uint32_t bytes_in_packet = MIN(USB_CMD_DATA_SIZE, bytes_remaining);
-        UsbCommandOLD c = {CMD_ICLASS_EML_MEMSET, {bytes_sent, bytes_in_packet, 0}, {{0}}};
+        PacketCommandOLD c = {CMD_ICLASS_EML_MEMSET, {bytes_sent, bytes_in_packet, 0}, {{0}}};
         memcpy(c.d.asBytes, dump + bytes_sent, bytes_in_packet);
         clearCommandBuffer();
         SendCommand(&c);
@@ -767,8 +767,8 @@ static void Calc_wb_mac(uint8_t blockno, uint8_t *data, uint8_t *div_key, uint8_
 }
 
 static bool select_only(uint8_t *CSN, uint8_t *CCNR, bool use_credit_key, bool verbose) {
-    UsbReplyNG resp;
-    UsbCommandOLD c = {CMD_READER_ICLASS, {0}, {{0}}};
+    PacketResponseNG resp;
+    PacketCommandOLD c = {CMD_READER_ICLASS, {0}, {{0}}};
     c.arg[0] = FLAG_ICLASS_READER_ONLY_ONCE | FLAG_ICLASS_READER_CC | FLAG_ICLASS_READER_ONE_TRY;
 
     if (use_credit_key)
@@ -818,8 +818,8 @@ static bool select_and_auth(uint8_t *KEY, uint8_t *MAC, uint8_t *div_key, bool u
     if (verbose) PrintAndLogEx(SUCCESS, "authing with %s: %s", rawkey ? "raw key" : "diversified key", sprint_hex(div_key, 8));
 
     doMAC(CCNR, div_key, MAC);
-    UsbReplyNG resp;
-    UsbCommandOLD d = {CMD_ICLASS_AUTHENTICATION, {0, 0, 0}, {{0}}};
+    PacketResponseNG resp;
+    PacketCommandOLD d = {CMD_ICLASS_AUTHENTICATION, {0, 0, 0}, {{0}}};
     memcpy(d.d.asBytes, MAC, 4);
     clearCommandBuffer();
     SendCommand(&d);
@@ -939,8 +939,8 @@ static int CmdHFiClassReader_Dump(const char *Cmd) {
                      FLAG_ICLASS_READER_ONE_TRY;
 
     //get config and first 3 blocks
-    UsbCommandOLD c = {CMD_READER_ICLASS, {flags, 0, 0}, {{0}}};
-    UsbReplyNG resp;
+    PacketCommandOLD c = {CMD_READER_ICLASS, {flags, 0, 0}, {{0}}};
+    PacketResponseNG resp;
     uint8_t tag_data[255 * 8];
 
     clearCommandBuffer();
@@ -981,7 +981,7 @@ static int CmdHFiClassReader_Dump(const char *Cmd) {
     }
 
     // begin dump
-    UsbCommandOLD w = {CMD_ICLASS_DUMP, {blockno, numblks - blockno + 1}, {{0}}};
+    PacketCommandOLD w = {CMD_ICLASS_DUMP, {blockno, numblks - blockno + 1}, {{0}}};
     clearCommandBuffer();
     SendCommand(&w);
     while (true) {
@@ -1097,10 +1097,10 @@ static int WriteBlock(uint8_t blockno, uint8_t *bldata, uint8_t *KEY, bool use_c
     if (!select_and_auth(KEY, MAC, div_key, use_credit_key, elite, rawkey, verbose))
         return 0;
 
-    UsbReplyNG resp;
+    PacketResponseNG resp;
 
     Calc_wb_mac(blockno, bldata, div_key, MAC);
-    UsbCommandOLD w = {CMD_ICLASS_WRITEBLOCK, {blockno}, {{0}}};
+    PacketCommandOLD w = {CMD_ICLASS_WRITEBLOCK, {blockno}, {{0}}};
     memcpy(w.d.asBytes, bldata, 8);
     memcpy(w.d.asBytes + 8, MAC, 4);
 
@@ -1321,7 +1321,7 @@ static int CmdHFiClassCloneTag(const char *Cmd) {
         return 0;
     }
 
-    UsbCommandOLD w = {CMD_ICLASS_CLONE, {startblock, endblock}, {{0}}};
+    PacketCommandOLD w = {CMD_ICLASS_CLONE, {startblock, endblock}, {{0}}};
     uint8_t *ptr;
     // calculate all mac for every the block we will write
     for (i = startblock; i <= endblock; i++) {
@@ -1342,7 +1342,7 @@ static int CmdHFiClassCloneTag(const char *Cmd) {
         PrintAndLogEx(NORMAL, " MAC |%02x%02x%02x%02x|\n", p[8], p[9], p[10], p[11]);
     }
 
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     clearCommandBuffer();
     SendCommand(&w);
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 4500)) {
@@ -1367,8 +1367,8 @@ static int ReadBlock(uint8_t *KEY, uint8_t blockno, uint8_t keyType, bool elite,
             return 0;
     }
 
-    UsbReplyNG resp;
-    UsbCommandOLD c = {CMD_ICLASS_READBLOCK, {blockno}, {{0}}};
+    PacketResponseNG resp;
+    PacketCommandOLD c = {CMD_ICLASS_READBLOCK, {blockno}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 4500)) {
@@ -1977,7 +1977,7 @@ static int CmdHFiClassCheckKeys(const char *Cmd) {
         if (keys == keycnt - i)
             lastChunk = true;
 
-        UsbCommandOLD c = {CMD_ICLASS_CHECK_KEYS, { (lastChunk << 8), keys, 0}, {{0}}};
+        PacketCommandOLD c = {CMD_ICLASS_CHECK_KEYS, { (lastChunk << 8), keys, 0}, {{0}}};
 
         // bit 16
         //   - 1 indicates credit key
@@ -1987,7 +1987,7 @@ static int CmdHFiClassCheckKeys(const char *Cmd) {
         memcpy(c.d.asBytes, pre + i, 4 * keys);
         clearCommandBuffer();
         SendCommand(&c);
-        UsbReplyNG resp;
+        PacketResponseNG resp;
 
         while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
             timeout++;
@@ -2465,9 +2465,9 @@ int readIclass(bool loop, bool verbose) {
                      FLAG_ICLASS_READER_CONF | FLAG_ICLASS_READER_ONLY_ONCE |
                      FLAG_ICLASS_READER_ONE_TRY;
 
-    UsbCommandOLD c = {CMD_READER_ICLASS, {flags, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_READER_ICLASS, {flags, 0, 0}, {{0}}};
     // loop in client not device - else on windows have a communication error
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     while (!ukbhit()) {
 
         clearCommandBuffer();
diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index 4e454e0ab..78b0d24a2 100644
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -524,7 +524,7 @@ static int CmdLegicRfSim(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) == 0 || cmdp == 'h') return usage_legic_sim();
 
-    UsbCommandOLD c = {CMD_SIMULATE_TAG_LEGIC_RF, {1}, {{0}}};
+    PacketCommandOLD c = {CMD_SIMULATE_TAG_LEGIC_RF, {1}, {{0}}};
     sscanf(Cmd, " %" SCNi64, &c.arg[0]);
     clearCommandBuffer();
     SendCommand(&c);
@@ -642,9 +642,9 @@ static int CmdLegicRfWrite(const char *Cmd) {
 
     PrintAndLogEx(SUCCESS, "Writing to tag");
 
-    UsbCommandOLD c = {CMD_WRITER_LEGIC_RF, {offset, len, IV}, {{0}}};
+    PacketCommandOLD c = {CMD_WRITER_LEGIC_RF, {offset, len, IV}, {{0}}};
     memcpy(c.d.asBytes, data, len);
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     clearCommandBuffer();
     SendCommand(&c);
 
@@ -756,10 +756,10 @@ int legic_read_mem(uint32_t offset, uint32_t len, uint32_t iv, uint8_t *out, uin
 
     legic_chk_iv(&iv);
 
-    UsbCommandOLD c = {CMD_READER_LEGIC_RF, {offset, len, iv}, {{0}}};
+    PacketCommandOLD c = {CMD_READER_LEGIC_RF, {offset, len, iv}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
-    UsbReplyNG resp;
+    PacketResponseNG resp;
 
     uint8_t timeout = 0;
     while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
@@ -810,10 +810,10 @@ int legic_get_type(legic_card_select_t *card) {
 
     if (card == NULL) return 1;
 
-    UsbCommandOLD c = {CMD_LEGIC_INFO, {0, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_LEGIC_INFO, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500))
         return 2;
 
@@ -837,7 +837,7 @@ void legic_chk_iv(uint32_t *iv) {
 }
 void legic_seteml(uint8_t *src, uint32_t offset, uint32_t numofbytes) {
 
-    UsbCommandOLD c = {CMD_LEGIC_ESET, {0, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_LEGIC_ESET, {0, 0, 0}, {{0}}};
     for (size_t i = offset; i < numofbytes; i += USB_CMD_DATA_SIZE) {
 
         size_t len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);
@@ -900,10 +900,10 @@ static int CmdLegicDump(const char *Cmd) {
     legic_print_type(dumplen, 0);
     PrintAndLogEx(SUCCESS, "Reading tag memory %d b...", dumplen);
 
-    UsbCommandOLD c = {CMD_READER_LEGIC_RF, {0x00, dumplen, 0x55}, {{0}}};
+    PacketCommandOLD c = {CMD_READER_LEGIC_RF, {0x00, dumplen, 0x55}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
-    UsbReplyNG resp;
+    PacketResponseNG resp;
 
     uint8_t timeout = 0;
     while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
@@ -1049,8 +1049,8 @@ static int CmdLegicRestore(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "Restoring to card");
 
     // transfer to device
-    UsbCommandOLD c = {CMD_WRITER_LEGIC_RF, {0, 0, 0x55}, {{0}}};
-    UsbReplyNG resp;
+    PacketCommandOLD c = {CMD_WRITER_LEGIC_RF, {0, 0, 0x55}, {{0}}};
+    PacketResponseNG resp;
     for (size_t i = 7; i < numofbytes; i += USB_CMD_DATA_SIZE) {
 
         size_t len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);
@@ -1242,8 +1242,8 @@ static int CmdLegicWipe(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "Erasing");
 
     // transfer to device
-    UsbCommandOLD c = {CMD_WRITER_LEGIC_RF, {0, 0, 0x55}, {{0}}};
-    UsbReplyNG resp;
+    PacketCommandOLD c = {CMD_WRITER_LEGIC_RF, {0, 0, 0x55}, {{0}}};
+    PacketResponseNG resp;
     for (size_t i = 7; i < card.cardsize; i += USB_CMD_DATA_SIZE) {
 
         printf(".");
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 5c7fda8de..96bfb06b6 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -411,10 +411,10 @@ static int usage_hf14_nack(void) {
 }
 
 static int GetHFMF14AUID(uint8_t *uid, int *uidlen) {
-    UsbCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         PrintAndLogEx(WARNING, "iso14443a card select failed");
         DropField();
@@ -522,13 +522,13 @@ static int CmdHF14AMfWrBl(const char *Cmd) {
     PrintAndLogEx(NORMAL, "--block no:%d, key type:%c, key:%s", blockNo, keyType ? 'B' : 'A', sprint_hex(key, 6));
     PrintAndLogEx(NORMAL, "--data: %s", sprint_hex(bldata, 16));
 
-    UsbCommandOLD c = {CMD_MIFARE_WRITEBL, {blockNo, keyType, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_MIFARE_WRITEBL, {blockNo, keyType, 0}, {{0}}};
     memcpy(c.d.asBytes, key, 6);
     memcpy(c.d.asBytes + 10, bldata, 16);
     clearCommandBuffer();
     SendCommand(&c);
 
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         uint8_t isOK  = resp.oldarg[0] & 0xff;
         PrintAndLogEx(NORMAL, "isOk:%02x", isOK);
@@ -568,12 +568,12 @@ static int CmdHF14AMfRdBl(const char *Cmd) {
     }
     PrintAndLogEx(NORMAL, "--block no:%d, key type:%c, key:%s ", blockNo, keyType ? 'B' : 'A', sprint_hex(key, 6));
 
-    UsbCommandOLD c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}, {{0}}};
     memcpy(c.d.asBytes, key, 6);
     clearCommandBuffer();
     SendCommand(&c);
 
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         uint8_t isOK  = resp.oldarg[0] & 0xff;
         uint8_t *data = resp.data.asBytes;
@@ -638,13 +638,13 @@ static int CmdHF14AMfRdSc(const char *Cmd) {
     }
     PrintAndLogEx(NORMAL, "--sector no:%d key type:%c key:%s ", sectorNo, keyType ? 'B' : 'A', sprint_hex(key, 6));
 
-    UsbCommandOLD c = {CMD_MIFARE_READSC, {sectorNo, keyType, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_MIFARE_READSC, {sectorNo, keyType, 0}, {{0}}};
     memcpy(c.d.asBytes, key, 6);
     clearCommandBuffer();
     SendCommand(&c);
     PrintAndLogEx(NORMAL, "");
 
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         isOK  = resp.oldarg[0] & 0xff;
         data  = resp.data.asBytes;
@@ -736,7 +736,7 @@ static int CmdHF14AMfDump(const char *Cmd) {
     memset(dataFilename, 0, sizeof(dataFilename));
 
     FILE *f;
-    UsbReplyNG resp;
+    PacketResponseNG resp;
 
     while (param_getchar(Cmd, cmdp) != 0x00) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
@@ -803,7 +803,7 @@ static int CmdHF14AMfDump(const char *Cmd) {
     for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
         for (tries = 0; tries < MIFARE_SECTOR_RETRY; tries++) {
 
-            UsbCommandOLD c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 0, 0}, {{0}}};
+            PacketCommandOLD c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 0, 0}, {{0}}};
             memcpy(c.d.asBytes, keyA[sectorNo], 6);
             clearCommandBuffer();
             SendCommand(&c);
@@ -840,7 +840,7 @@ static int CmdHF14AMfDump(const char *Cmd) {
 
             for (tries = 0; tries < MIFARE_SECTOR_RETRY; tries++) {
                 if (blockNo == NumBlocksPerSector(sectorNo) - 1) { // sector trailer. At least the Access Conditions can always be read with key A.
-                    UsbCommandOLD c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}, {{0}}};
+                    PacketCommandOLD c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}, {{0}}};
                     memcpy(c.d.asBytes, keyA[sectorNo], 6);
                     clearCommandBuffer();
                     SendCommand(&c);
@@ -848,7 +848,7 @@ static int CmdHF14AMfDump(const char *Cmd) {
                 } else {                                           // data block. Check if it can be read with key A or key B
                     uint8_t data_area = (sectorNo < 32) ? blockNo : blockNo / 5;
                     if ((rights[sectorNo][data_area] == 0x03) || (rights[sectorNo][data_area] == 0x05)) { // only key B would work
-                        UsbCommandOLD c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 1, 0}, {{0}}};
+                        PacketCommandOLD c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 1, 0}, {{0}}};
                         memcpy(c.d.asBytes, keyB[sectorNo], 6);
                         SendCommand(&c);
                         received = WaitForResponseTimeout(CMD_ACK, &resp, 1500);
@@ -857,7 +857,7 @@ static int CmdHF14AMfDump(const char *Cmd) {
                         PrintAndLogEx(WARNING, "access rights do not allow reading of sector %2d block %3d", sectorNo, blockNo);
                         tries = MIFARE_SECTOR_RETRY;
                     } else {                                                                              // key A would work
-                        UsbCommandOLD c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}, {{0}}};
+                        PacketCommandOLD c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}, {{0}}};
                         memcpy(c.d.asBytes, keyA[sectorNo], 6);
                         clearCommandBuffer();
                         SendCommand(&c);
@@ -1019,7 +1019,7 @@ static int CmdHF14AMfRestore(const char *Cmd) {
 
     for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
         for (blockNo = 0; blockNo < NumBlocksPerSector(sectorNo); blockNo++) {
-            UsbCommandOLD c = {CMD_MIFARE_WRITEBL, {FirstBlockOfSector(sectorNo) + blockNo, keyType, 0}, {{0}}};
+            PacketCommandOLD c = {CMD_MIFARE_WRITEBL, {FirstBlockOfSector(sectorNo) + blockNo, keyType, 0}, {{0}}};
             memcpy(c.d.asBytes, key, 6);
             bytes_read = fread(bldata, 1, 16, fdump);
             if (bytes_read != 16) {
@@ -1050,7 +1050,7 @@ static int CmdHF14AMfRestore(const char *Cmd) {
             clearCommandBuffer();
             SendCommand(&c);
 
-            UsbReplyNG resp;
+            PacketResponseNG resp;
             if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
                 uint8_t isOK  = resp.oldarg[0] & 0xff;
                 PrintAndLogEx(SUCCESS, "isOk:%02x", isOK);
@@ -1251,12 +1251,12 @@ static int CmdHF14AMfNested(const char *Cmd) {
 
                 PrintAndLogEx(SUCCESS, "reading block %d", sectrail);
 
-                UsbCommandOLD c = {CMD_MIFARE_READBL, {sectrail, 0, 0}, {{0}}};
+                PacketCommandOLD c = {CMD_MIFARE_READBL, {sectrail, 0, 0}, {{0}}};
                 num_to_bytes(e_sector[i].Key[0], 6, c.d.asBytes); // KEY A
                 clearCommandBuffer();
                 SendCommand(&c);
 
-                UsbReplyNG resp;
+                PacketResponseNG resp;
                 if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) continue;
 
                 uint8_t isOK  = resp.oldarg[0] & 0xff;
@@ -1997,12 +1997,12 @@ static int CmdHF14AMfChk(const char *Cmd) {
 
                 PrintAndLogEx(NORMAL, "Reading block %d", sectrail);
 
-                UsbCommandOLD c = {CMD_MIFARE_READBL, {sectrail, 0, 0}, {{0}}};
+                PacketCommandOLD c = {CMD_MIFARE_READBL, {sectrail, 0, 0}, {{0}}};
                 num_to_bytes(e_sector[i].Key[0], 6, c.d.asBytes); // KEY A
                 clearCommandBuffer();
                 SendCommand(&c);
 
-                UsbReplyNG resp;
+                PacketResponseNG resp;
                 if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) continue;
 
                 uint8_t isOK  = resp.oldarg[0] & 0xff;
@@ -2231,11 +2231,11 @@ static int CmdHF14AMfSim(const char *Cmd) {
                   , flags
                   , flags);
 
-    UsbCommandOLD c = {CMD_SIMULATE_MIFARE_CARD, {flags, exitAfterNReads, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_SIMULATE_MIFARE_CARD, {flags, exitAfterNReads, 0}, {{0}}};
     memcpy(c.d.asBytes, uid, sizeof(uid));
     clearCommandBuffer();
     SendCommand(&c);
-    UsbReplyNG resp;
+    PacketResponseNG resp;
 
     if (flags & FLAG_INTERACTIVE) {
         PrintAndLogEx(INFO, "Press pm3-button or send another cmd to abort simulation");
@@ -2291,11 +2291,11 @@ static int CmdHF14AMfSniff(const char *Cmd) {
     PrintAndLogEx(NORMAL, "Press the key on pc keyboard to abort the client.\n");
     PrintAndLogEx(NORMAL, "-------------------------------------------------------------------------\n");
 
-    UsbCommandOLD c = {CMD_MIFARE_SNIFFER, {0, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_MIFARE_SNIFFER, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
 
-    UsbReplyNG resp;
+    PacketResponseNG resp;
 
     // wait cycle
     while (true) {
@@ -2422,7 +2422,7 @@ int CmdHF14AMfDbg(const char *Cmd) {
     uint8_t dbgMode = param_get8ex(Cmd, 0, 0, 10);
     if (dbgMode > 4) return usage_hf14_dbg();
 
-    UsbCommandOLD c = {CMD_MIFARE_SET_DBGMODE, {dbgMode, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_MIFARE_SET_DBGMODE, {dbgMode, 0, 0}, {{0}}};
     SendCommand(&c);
     return 0;
 }
@@ -2508,7 +2508,7 @@ static int CmdHF14AMfEClear(const char *Cmd) {
     char c = tolower(param_getchar(Cmd, 0));
     if (c == 'h') return usage_hf14_eclr();
 
-    UsbCommandOLD cmd = {CMD_MIFARE_EML_MEMCLR, {0, 0, 0}, {{0}}};
+    PacketCommandOLD cmd = {CMD_MIFARE_EML_MEMCLR, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&cmd);
     return 0;
@@ -2693,7 +2693,7 @@ static int CmdHF14AMfECFill(const char *Cmd) {
     numSectors = NumOfSectors(c);
 
     PrintAndLogEx(NORMAL, "--params: numSectors: %d, keyType: %c\n", numSectors, (keyType == 0) ? 'A' : 'B');
-    UsbCommandOLD cmd = {CMD_MIFARE_EML_CARDLOAD, {numSectors, keyType, 0}, {{0}}};
+    PacketCommandOLD cmd = {CMD_MIFARE_EML_CARDLOAD, {numSectors, keyType, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&cmd);
     return 0;
@@ -3155,12 +3155,12 @@ static int CmdHf14AMfSetMod(const char *Cmd) {
         return 1;
     }
 
-    UsbCommandOLD c = {CMD_MIFARE_SETMOD, {mod, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_MIFARE_SETMOD, {mod, 0, 0}, {{0}}};
     memcpy(c.d.asBytes, key, 6);
     clearCommandBuffer();
     SendCommand(&c);
 
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         uint8_t ok = resp.oldarg[0] & 0xff;
         PrintAndLogEx(SUCCESS, "isOk:%02x", ok);
@@ -3202,7 +3202,7 @@ static int CmdHF14AMfice(const char *Cmd) {
     char ctmp;
     char filename[FILE_PATH_SIZE], *fptr;
     FILE *fnonces = NULL;
-    UsbReplyNG resp;
+    PacketResponseNG resp;
 
     uint32_t part_limit = 3000;
     uint32_t limit = 50000;
@@ -3256,7 +3256,7 @@ static int CmdHF14AMfice(const char *Cmd) {
         flags = 0;
         flags |= initialize ? 0x0001 : 0;
         flags |= slow ? 0x0002 : 0;
-        UsbCommandOLD c = {CMD_MIFARE_ACQUIRE_NONCES, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, flags}, {{0}}};
+        PacketCommandOLD c = {CMD_MIFARE_ACQUIRE_NONCES, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, flags}, {{0}}};
         clearCommandBuffer();
         SendCommand(&c);
 
@@ -3289,7 +3289,7 @@ out:
         fclose(fnonces);
     }
 
-    UsbCommandOLD c = {CMD_MIFARE_ACQUIRE_NONCES, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, 4}, {{0}}};
+    PacketCommandOLD c = {CMD_MIFARE_ACQUIRE_NONCES, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, 4}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
diff --git a/client/cmdhfmfdes.c b/client/cmdhfmfdes.c
index 64e6dc3ba..cfe531050 100644
--- a/client/cmdhfmfdes.c
+++ b/client/cmdhfmfdes.c
@@ -51,12 +51,12 @@ static int CmdHF14ADesWb(const char *Cmd) {
         PrintAndLogEx(NORMAL, "--block no:%02x key type:%02x key:%s", blockNo, keyType, sprint_hex(key, 6));
         PrintAndLogEx(NORMAL, "--data: %s", sprint_hex(bldata, 16));
 
-      UsbCommandOLD c = {CMD_MIFARE_WRITEBL, {blockNo, keyType, 0}, {{0}}};
+      PacketCommandOLD c = {CMD_MIFARE_WRITEBL, {blockNo, keyType, 0}, {{0}}};
         memcpy(c.d.asBytes, key, 6);
         memcpy(c.d.asBytes + 10, bldata, 16);
       SendCommand(&c);
 
-        UsbReplyNG resp;
+        PacketResponseNG resp;
         if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
             uint8_t isOK  = resp.oldarg[0] & 0xff;
             PrintAndLogEx(NORMAL, "isOk:%02x", isOK);
@@ -93,11 +93,11 @@ static int CmdHF14ADesRb(const char *Cmd) {
     }
     PrintAndLogEx(NORMAL, "--block no:%02x key type:%02x key:%s ", blockNo, keyType, sprint_hex(key, 6));
 
-    UsbCommandOLD c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}, {{0}}};
     memcpy(c.d.asBytes, key, 6);
     SendCommand(&c);
 
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
     uint8_t                isOK  = resp.oldarg[0] & 0xff;
     uint8_t              * data  = resp.data.asBytes;
@@ -116,9 +116,9 @@ static int CmdHF14ADesRb(const char *Cmd) {
 static int CmdHF14ADesInfo(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
 
-    UsbCommandOLD c = {CMD_MIFARE_DESFIRE_INFO, {0, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_MIFARE_DESFIRE_INFO, {0, 0, 0}, {{0}}};
     SendCommand(&c);
-    UsbReplyNG resp;
+    PacketResponseNG resp;
 
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         PrintAndLogEx(WARNING, "Command execute timeout");
@@ -256,8 +256,8 @@ void getKeySettings(uint8_t *aid) {
     const char *str = messStr;
     uint8_t isOK = 0;
     uint32_t options;
-    UsbCommandOLD c = {CMD_MIFARE_DESFIRE, {0, 0, 0}, {{0}}};
-    UsbReplyNG resp;
+    PacketCommandOLD c = {CMD_MIFARE_DESFIRE, {0, 0, 0}, {{0}}};
+    PacketResponseNG resp;
 
     //memset(messStr, 0x00, 512);
 
@@ -427,11 +427,11 @@ static int CmdHF14ADesEnumApplications(const char *Cmd) {
     uint8_t aid[3];
     uint32_t options = (INIT | DISCONNECT);
 
-    UsbCommandOLD c = {CMD_MIFARE_DESFIRE, {options, 0x01 }, {{0}}};
+    PacketCommandOLD c = {CMD_MIFARE_DESFIRE, {options, 0x01 }, {{0}}};
     c.d.asBytes[0] = GET_APPLICATION_IDS;  //0x6a
 
     SendCommand(&c);
-    UsbReplyNG resp;
+    PacketResponseNG resp;
 
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         return 0;
@@ -445,8 +445,8 @@ static int CmdHF14ADesEnumApplications(const char *Cmd) {
     PrintAndLogEx(NORMAL, "-- Desfire Enumerate Applications ---------------------------");
     PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
 
-    UsbReplyNG respAid;
-    UsbReplyNG respFiles;
+    PacketResponseNG respAid;
+    PacketResponseNG respFiles;
 
     uint8_t num = 0;
     int max = resp.oldarg[1] - 3 - 2;
@@ -611,13 +611,13 @@ static int CmdHF14ADesAuth(const char *Cmd) {
         return 1;
     }
     // algo, nyckell�ngd,
-    UsbCommandOLD c = {CMD_MIFARE_DESFIRE_AUTH1, { cmdAuthMode, cmdAuthAlgo, cmdKeyNo }, {{0}}};
+    PacketCommandOLD c = {CMD_MIFARE_DESFIRE_AUTH1, { cmdAuthMode, cmdAuthAlgo, cmdKeyNo }, {{0}}};
 
     c.d.asBytes[0] = keylength;
     memcpy(c.d.asBytes + 1, key, keylength);
     clearCommandBuffer();
     SendCommand(&c);
-    UsbReplyNG resp;
+    PacketResponseNG resp;
 
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 3000)) {
         PrintAndLogEx(WARNING, "Client command execute timeout");
diff --git a/client/cmdhfmfdesfire.c b/client/cmdhfmfdesfire.c
index 449eb4dd7..824190ba7 100644
--- a/client/cmdhfmfdesfire.c
+++ b/client/cmdhfmfdesfire.c
@@ -58,9 +58,9 @@ static int CmdHF14AMfDESAuth(const char *Cmd) {
     //DES_set_key((DES_cblock *)key2,&ks2);
 
     //Auth1
-    UsbCommandOLD c = {CMD_MIFARE_DES_AUTH1, {blockNo}};
+    PacketCommandOLD c = {CMD_MIFARE_DES_AUTH1, {blockNo}};
     SendCommand(&c);
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         uint8_t isOK  = resp.oldarg[0] & 0xff;
         cuid  = resp.oldarg[1];
@@ -94,13 +94,13 @@ static int CmdHF14AMfDESAuth(const char *Cmd) {
     PrintAndLogEx(NORMAL, "b2:%s", sprint_hex(b2, 8));
 
     //Auth2
-    UsbCommandOLD d = {CMD_MIFARE_DES_AUTH2, {cuid}};
+    PacketCommandOLD d = {CMD_MIFARE_DES_AUTH2, {cuid}};
     memcpy(reply, b1, 8);
     memcpy(reply + 8, b2, 8);
     memcpy(d.d.asBytes, reply, 16);
     SendCommand(&d);
 
-    UsbReplyNG respb;
+    PacketResponseNG respb;
     if (WaitForResponseTimeout(CMD_ACK, &respb, 1500)) {
         uint8_t  isOK  = respb.arg[0] & 0xff;
         uint8_t *data2 = respb.d.asBytes;
@@ -158,9 +158,9 @@ static int CmdHF14AMfAESAuth(const char *Cmd) {
     AES_set_decrypt_key(key, 128, &key_d);
 
     //Auth1
-    UsbCommandOLD c = {CMD_MIFARE_DES_AUTH1, {blockNo}};
+    PacketCommandOLD c = {CMD_MIFARE_DES_AUTH1, {blockNo}};
     SendCommand(&c);
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         uint8_t isOK  = resp.oldarg[0] & 0xff;
         cuid  = resp.oldarg[1];
@@ -201,13 +201,13 @@ static int CmdHF14AMfAESAuth(const char *Cmd) {
     PrintAndLogEx(NORMAL, "b2:%s", sprint_hex(b2, 16));
 
     //Auth2
-    UsbCommandOLD d = {CMD_MIFARE_DES_AUTH2, {cuid}};
+    PacketCommandOLD d = {CMD_MIFARE_DES_AUTH2, {cuid}};
     memcpy(reply, b1, 16);
     memcpy(reply + 16, b2, 16);
     memcpy(d.d.asBytes, reply, 32);
     SendCommand(&d);
 
-    UsbReplyNG respb;
+    PacketResponseNG respb;
     if (WaitForResponseTimeout(CMD_ACK, &respb, 1500)) {
         uint8_t  isOK  = respb.arg[0] & 0xff;
         uint8_t *data2 = respb.d.asBytes;
diff --git a/client/cmdhfmfhard.c b/client/cmdhfmfhard.c
index 72244de38..0c5500fb3 100644
--- a/client/cmdhfmfhard.c
+++ b/client/cmdhfmfhard.c
@@ -1372,7 +1372,7 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
     bool reported_suma8 = false;
     char progress_text[80];
     FILE *fnonces = NULL;
-    UsbReplyNG resp;
+    PacketResponseNG resp;
 
     num_acquired_nonces = 0;
 
@@ -1383,7 +1383,7 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
         flags |= initialize ? 0x0001 : 0;
         flags |= slow ? 0x0002 : 0;
         flags |= field_off ? 0x0004 : 0;
-        UsbCommandOLD c = {CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, flags}, {{0}}};
+        PacketCommandOLD c = {CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, flags}, {{0}}};
         memcpy(c.d.asBytes, key, 6);
 
         clearCommandBuffer();
@@ -1394,7 +1394,7 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
         if (initialize) {
             if (!WaitForResponseTimeout(CMD_ACK, &resp, 3000)) {
                 //strange second call (iceman)
-                UsbCommandOLD c1 = {CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, 4}, {{0}}};
+                PacketCommandOLD c1 = {CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, 4}, {{0}}};
                 clearCommandBuffer();
                 SendCommand(&c1);
                 return 1;
diff --git a/client/cmdhfmfp.c b/client/cmdhfmfp.c
index b075b653f..32566988e 100644
--- a/client/cmdhfmfp.c
+++ b/client/cmdhfmfp.c
@@ -42,10 +42,10 @@ static int CmdHFMFPInfo(const char *cmd) {
     infoHF14A(false, false);
 
     // Mifare Plus info
-    UsbCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}, {{0}}};
     SendCommand(&c);
 
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     WaitForResponse(CMD_ACK, &resp);
 
     iso14a_card_select_t card;
diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index 01f2c8899..3e41e1608 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -458,17 +458,17 @@ static char *getUlev1CardSizeStr(uint8_t fsize) {
 }
 
 static void ul_switch_on_field(void) {
-    UsbCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT | ISO14A_NO_RATS, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT | ISO14A_NO_RATS, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
 }
 
 static int ul_send_cmd_raw(uint8_t *cmd, uint8_t cmdlen, uint8_t *response, uint16_t responseLength) {
-    UsbCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_NO_DISCONNECT | ISO14A_APPEND_CRC | ISO14A_NO_RATS, cmdlen, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_NO_DISCONNECT | ISO14A_APPEND_CRC | ISO14A_NO_RATS, cmdlen, 0}, {{0}}};
     memcpy(c.d.asBytes, cmd, cmdlen);
     clearCommandBuffer();
     SendCommand(&c);
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return -1;
     if (!resp.oldarg[0] && responseLength) return -1;
 
@@ -481,7 +481,7 @@ static int ul_select(iso14a_card_select_t *card) {
 
     ul_switch_on_field();
 
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     bool ans = false;
     ans = WaitForResponseTimeout(CMD_ACK, &resp, 1500);
 
@@ -533,11 +533,11 @@ static int ulc_requestAuthentication(uint8_t *nonce, uint16_t nonceLength) {
 
 static int ulc_authentication(uint8_t *key, bool switch_off_field) {
 
-    UsbCommandOLD c = {CMD_MIFAREUC_AUTH, {switch_off_field}, {{0}}};
+    PacketCommandOLD c = {CMD_MIFAREUC_AUTH, {switch_off_field}, {{0}}};
     memcpy(c.d.asBytes, key, 16);
     clearCommandBuffer();
     SendCommand(&c);
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return 0;
     if (resp.oldarg[0] == 1) return 1;
 
@@ -621,13 +621,13 @@ static int ul_fudan_check(void) {
     if (!ul_select(&card))
         return UL_ERROR;
 
-    UsbCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_NO_DISCONNECT | ISO14A_NO_RATS, 4, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_NO_DISCONNECT | ISO14A_NO_RATS, 4, 0}, {{0}}};
 
     uint8_t cmd[4] = {0x30, 0x00, 0x02, 0xa7}; //wrong crc on purpose  should be 0xa8
     memcpy(c.d.asBytes, cmd, 4);
     clearCommandBuffer();
     SendCommand(&c);
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return UL_ERROR;
     if (resp.oldarg[0] != 1) return UL_ERROR;
 
@@ -1475,7 +1475,7 @@ static int CmdHF14AMfUWrBl(const char *Cmd) {
         PrintAndLogEx(NORMAL, "Block: %0d (0x%02X) [ %s]", blockNo, blockNo, sprint_hex(blockdata, 4));
 
     //Send write Block
-    UsbCommandOLD c = {CMD_MIFAREU_WRITEBL, {blockNo}, {{0}}};
+    PacketCommandOLD c = {CMD_MIFAREU_WRITEBL, {blockNo}, {{0}}};
     memcpy(c.d.asBytes, blockdata, 4);
 
     if (hasAuthKey) {
@@ -1488,7 +1488,7 @@ static int CmdHF14AMfUWrBl(const char *Cmd) {
 
     clearCommandBuffer();
     SendCommand(&c);
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         uint8_t isOK  = resp.oldarg[0] & 0xff;
         PrintAndLogEx(SUCCESS, "isOk:%02x", isOK);
@@ -1581,7 +1581,7 @@ static int CmdHF14AMfURdBl(const char *Cmd) {
     if (swapEndian && hasPwdKey)  authKeyPtr = SwapEndian64(authenticationkey, 4, 4);
 
     //Read Block
-    UsbCommandOLD c = {CMD_MIFAREU_READBL, {blockNo}, {{0}}};
+    PacketCommandOLD c = {CMD_MIFAREU_READBL, {blockNo}, {{0}}};
     if (hasAuthKey) {
         c.arg[1] = 1;
         memcpy(c.d.asBytes, authKeyPtr, 16);
@@ -1592,7 +1592,7 @@ static int CmdHF14AMfURdBl(const char *Cmd) {
 
     clearCommandBuffer();
     SendCommand(&c);
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         uint8_t isOK = resp.oldarg[0] & 0xff;
         if (isOK) {
@@ -1846,7 +1846,7 @@ static int CmdHF14AMfUDump(const char *Cmd) {
     }
     ul_print_type(tagtype, 0);
     PrintAndLogEx(SUCCESS, "Reading tag memory...");
-    UsbCommandOLD c = {CMD_MIFAREU_READCARD, {startPage, pages}, {{0}}};
+    PacketCommandOLD c = {CMD_MIFAREU_READCARD, {startPage, pages}, {{0}}};
     if (hasAuthKey) {
         if (tagtype & UL_C)
             c.arg[2] = 1; //UL_C auth
@@ -1858,7 +1858,7 @@ static int CmdHF14AMfUDump(const char *Cmd) {
 
     clearCommandBuffer();
     SendCommand(&c);
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         PrintAndLogEx(WARNING, "Command execute time-out");
         return 1;
@@ -1982,7 +1982,7 @@ static int CmdHF14AMfUDump(const char *Cmd) {
 }
 
 static void wait4response(uint8_t b) {
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         uint8_t isOK  = resp.oldarg[0] & 0xff;
         if (!isOK)
@@ -2010,7 +2010,7 @@ static int CmdHF14AMfURestore(const char *Cmd) {
     bool read_key = false;
     size_t filelen = 0;
     FILE *f;
-    UsbCommandOLD c = {CMD_MIFAREU_WRITEBL, {0, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_MIFAREU_WRITEBL, {0, 0, 0}, {{0}}};
 
     memset(authkey, 0x00, sizeof(authkey));
 
@@ -2387,12 +2387,12 @@ static int CmdHF14AMfUCSetPwd(const char *Cmd) {
         return 1;
     }
 
-    UsbCommandOLD c = {CMD_MIFAREUC_SETPWD, {0, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_MIFAREUC_SETPWD, {0, 0, 0}, {{0}}};
     memcpy(c.d.asBytes, pwd, 16);
     clearCommandBuffer();
     SendCommand(&c);
 
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         if ((resp.oldarg[0] & 0xff) == 1) {
             PrintAndLogEx(INFO, "Ultralight-C new password: %s", sprint_hex(pwd, 16));
@@ -2412,8 +2412,8 @@ static int CmdHF14AMfUCSetPwd(const char *Cmd) {
 //
 static int CmdHF14AMfUCSetUid(const char *Cmd) {
 
-    UsbCommandOLD c = {CMD_MIFAREU_READBL, {0, 0, 0}, {{0}}};
-    UsbReplyNG resp;
+    PacketCommandOLD c = {CMD_MIFAREU_READBL, {0, 0, 0}, {{0}}};
+    PacketResponseNG resp;
     uint8_t uid[7] = {0x00};
     char cmdp = tolower(param_getchar(Cmd, 0));
 
@@ -2487,10 +2487,10 @@ static int CmdHF14AMfUGenDiverseKeys(const char *Cmd) {
 
     if (cmdp == 'r') {
         // read uid from tag
-        UsbCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0}, {{0}}};
+        PacketCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0}, {{0}}};
         clearCommandBuffer();
         SendCommand(&c);
-        UsbReplyNG resp;
+        PacketResponseNG resp;
         WaitForResponse(CMD_ACK, &resp);
         iso14a_card_select_t card;
         memcpy(&card, (iso14a_card_select_t *)resp.data.asBytes, sizeof(iso14a_card_select_t));
@@ -2602,10 +2602,10 @@ static int CmdHF14AMfUPwdGen(const char *Cmd) {
 
     if (cmdp == 'r') {
         // read uid from tag
-        UsbCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0}, {{0}}};
+        PacketCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0}, {{0}}};
         clearCommandBuffer();
         SendCommand(&c);
-        UsbReplyNG resp;
+        PacketResponseNG resp;
         WaitForResponse(CMD_ACK, &resp);
         iso14a_card_select_t card;
         memcpy(&card, (iso14a_card_select_t *)resp.data.asBytes, sizeof(iso14a_card_select_t));
diff --git a/client/cmdhftopaz.c b/client/cmdhftopaz.c
index 48ccf8e9f..962a19c8d 100644
--- a/client/cmdhftopaz.c
+++ b/client/cmdhftopaz.c
@@ -31,22 +31,22 @@ static struct {
 } topaz_tag;
 
 static void topaz_switch_on_field(void) {
-    UsbCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_SELECT | ISO14A_NO_DISCONNECT | ISO14A_TOPAZMODE | ISO14A_NO_RATS, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_SELECT | ISO14A_NO_DISCONNECT | ISO14A_TOPAZMODE | ISO14A_NO_RATS, 0, 0}, {{0}}};
     SendCommand(&c);
 }
 
 static void topaz_switch_off_field(void) {
-    UsbCommandOLD c = {CMD_READER_ISO_14443a, {0, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_READER_ISO_14443a, {0, 0, 0}, {{0}}};
     SendCommand(&c);
 }
 
 // send a raw topaz command, returns the length of the response (0 in case of error)
 static int topaz_send_cmd_raw(uint8_t *cmd, uint8_t len, uint8_t *response) {
-    UsbCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_NO_DISCONNECT | ISO14A_TOPAZMODE | ISO14A_NO_RATS, len, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_NO_DISCONNECT | ISO14A_TOPAZMODE | ISO14A_NO_RATS, len, 0}, {{0}}};
     memcpy(c.d.asBytes, cmd, len);
     SendCommand(&c);
 
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     WaitForResponse(CMD_ACK, &resp);
 
     if (resp.oldarg[0] > 0) {
diff --git a/client/cmdhw.c b/client/cmdhw.c
index b547caae2..99b8ea49b 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -308,7 +308,7 @@ static void lookupChipID(uint32_t iChipID, uint32_t mem_used) {
 }
 
 static int CmdDetectReader(const char *Cmd) {
-    UsbCommandOLD c = {CMD_LISTEN_READER_FIELD, {0, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_LISTEN_READER_FIELD, {0, 0, 0}, {{0}}};
     // 'l' means LF - 125/134 kHz
     if (*Cmd == 'l') {
         c.arg[0] = 1;
@@ -326,7 +326,7 @@ static int CmdDetectReader(const char *Cmd) {
 // ## FPGA Control
 static int CmdFPGAOff(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
-    UsbCommandOLD c = {CMD_FPGA_MAJOR_MODE_OFF, {0, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_FPGA_MAJOR_MODE_OFF, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -336,7 +336,7 @@ static int CmdFPGAOff(const char *Cmd) {
 static int CmdLCD(const char *Cmd) {
     int i, j;
 
-    UsbCommandOLD c = {CMD_LCD, {0, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_LCD, {0, 0, 0}, {{0}}};
     sscanf(Cmd, "%x %d", &i, &j);
     while (j--) {
         c.arg[0] = i & 0x1ff;
@@ -347,7 +347,7 @@ static int CmdLCD(const char *Cmd) {
 }
 
 static int CmdLCDReset(const char *Cmd) {
-    UsbCommandOLD c = {CMD_LCD_RESET, {strtol(Cmd, NULL, 0), 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_LCD_RESET, {strtol(Cmd, NULL, 0), 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -355,7 +355,7 @@ static int CmdLCDReset(const char *Cmd) {
 #endif
 
 static int CmdReadmem(const char *Cmd) {
-    UsbCommandOLD c = {CMD_READ_MEM, {strtol(Cmd, NULL, 0), 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_READ_MEM, {strtol(Cmd, NULL, 0), 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -363,7 +363,7 @@ static int CmdReadmem(const char *Cmd) {
 
 static int CmdReset(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
-    UsbCommandOLD c = {CMD_HARDWARE_RESET, {0, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_HARDWARE_RESET, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -374,7 +374,7 @@ static int CmdReset(const char *Cmd) {
  * 600kHz.
  */
 static int CmdSetDivisor(const char *Cmd) {
-    UsbCommandOLD c = {CMD_SET_LF_DIVISOR, {strtol(Cmd, NULL, 0), 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_SET_LF_DIVISOR, {strtol(Cmd, NULL, 0), 0, 0}, {{0}}};
 
     if (c.arg[0] < 19 || c.arg[0] > 255) {
         PrintAndLogEx(NORMAL, "divisor must be between 19 and 255");
@@ -394,7 +394,7 @@ static int CmdSetMux(const char *Cmd) {
         return 1;
     }
 
-    UsbCommandOLD c = {CMD_SET_ADC_MUX, {0, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_SET_ADC_MUX, {0, 0, 0}, {{0}}};
 
     if (strcmp(Cmd, "lopkd") == 0)      c.arg[0] = 0;
     else if (strcmp(Cmd, "loraw") == 0) c.arg[0] = 1;
@@ -418,8 +418,8 @@ static int CmdVersion(const char *Cmd) {
 static int CmdStatus(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     clearCommandBuffer();
-    UsbReplyNG resp;
-    UsbCommandOLD c = {CMD_STATUS, {0, 0, 0}, {{0}}};
+    PacketResponseNG resp;
+    PacketCommandOLD c = {CMD_STATUS, {0, 0, 0}, {{0}}};
     SendCommand(&c);
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1900))
         PrintAndLogEx(NORMAL, "Status command failed. USB Speed Test timed out");
@@ -429,8 +429,8 @@ static int CmdStatus(const char *Cmd) {
 static int CmdPing(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     clearCommandBuffer();
-    UsbReplyNG resp;
-    UsbCommandOLD c = {CMD_PING, {0, 0, 0}, {{0}}};
+    PacketResponseNG resp;
+    PacketCommandOLD c = {CMD_PING, {0, 0, 0}, {{0}}};
     SendCommand(&c);
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1000))
         PrintAndLogEx(NORMAL, "Ping successful");
@@ -445,7 +445,7 @@ static int CmdPingNG(const char *Cmd) {
         len = USB_CMD_DATA_SIZE;
     PrintAndLogEx(NORMAL, "PingNG sent with payload len=%d", len);
     clearCommandBuffer();
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     uint8_t data[USB_CMD_DATA_SIZE] = {0};
     uint16_t cmd = CMD_PING;
     for (uint16_t i = 0; i < len; i++)
@@ -496,8 +496,8 @@ int CmdHW(const char *Cmd) {
 void pm3_version(bool verbose) {
     if (!verbose)
         return;
-    UsbCommandOLD c = {CMD_VERSION, {0, 0, 0}, {{0}}};
-    UsbReplyNG resp;
+    PacketCommandOLD c = {CMD_VERSION, {0, 0, 0}, {{0}}};
+    PacketResponseNG resp;
     clearCommandBuffer();
     SendCommand(&c);
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {
diff --git a/client/cmdlf.c b/client/cmdlf.c
index 54519a8e9..ae8dc39dd 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -144,7 +144,7 @@ static int usage_lf_find(void) {
 /* send a LF command before reading */
 int CmdLFCommandRead(const char *Cmd) {
 
-    UsbCommandOLD c = {CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K, {0, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K, {0, 0, 0}, {{0}}};
     bool errors = false;
 
     uint8_t cmdp = 0;
@@ -322,7 +322,7 @@ int CmdLFSetConfig(const char *Cmd) {
 
     sample_config config = { decimation, bps, averaging, divisor, trigger_threshold };
 
-    UsbCommandOLD c = {CMD_SET_LF_SAMPLING_CONFIG, {0, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_SET_LF_SAMPLING_CONFIG, {0, 0, 0}, {{0}}};
     memcpy(c.d.asBytes, &config, sizeof(sample_config));
     clearCommandBuffer();
     SendCommand(&c);
@@ -331,11 +331,11 @@ int CmdLFSetConfig(const char *Cmd) {
 
 bool lf_read(bool silent, uint32_t samples) {
     if (IsOffline()) return false;
-    UsbCommandOLD c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_125K, {silent, samples, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_125K, {silent, samples, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
 
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     if (g_lf_threshold_set) {
         WaitForResponse(CMD_ACK, &resp);
     } else {
@@ -387,7 +387,7 @@ int CmdLFSniff(const char *Cmd) {
     uint8_t cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_lf_sniff();
 
-    UsbCommandOLD c = {CMD_LF_SNIFF_RAW_ADC_SAMPLES, {0, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_LF_SNIFF_RAW_ADC_SAMPLES, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     WaitForResponse(CMD_ACK, NULL);
@@ -420,7 +420,7 @@ int CmdLFSim(const char *Cmd) {
 
     //can send only 512 bits at a time (1 byte sent per bit...)
     for (uint16_t i = 0; i < GraphTraceLen; i += USB_CMD_DATA_SIZE) {
-        UsbCommandOLD c = {CMD_UPLOAD_SIM_SAMPLES_125K, {i, FPGA_LF, 0}, {{0}}};
+        PacketCommandOLD c = {CMD_UPLOAD_SIM_SAMPLES_125K, {i, FPGA_LF, 0}, {{0}}};
 
         for (uint16_t j = 0; j < USB_CMD_DATA_SIZE; j++)
             c.d.asBytes[j] = GraphBuffer[i + j];
@@ -434,7 +434,7 @@ int CmdLFSim(const char *Cmd) {
 
     PrintAndLogEx(NORMAL, "Simulating");
 
-    UsbCommandOLD c = {CMD_SIMULATE_TAG_125K, {GraphTraceLen, gap, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_SIMULATE_TAG_125K, {GraphTraceLen, gap, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -523,7 +523,7 @@ int CmdLFfskSim(const char *Cmd) {
         PrintAndLogEx(NORMAL, "DemodBuffer too long for current implementation - length: %d - max: %d", size, USB_CMD_DATA_SIZE);
         size = USB_CMD_DATA_SIZE;
     }
-    UsbCommandOLD c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}, {{0}}};
+    PacketCommandOLD c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}, {{0}}};
 
     memcpy(c.d.asBytes, DemodBuffer, size);
     clearCommandBuffer();
@@ -619,7 +619,7 @@ int CmdLFaskSim(const char *Cmd) {
     arg1 = clk << 8 | encoding;
     arg2 = invert << 8 | separator;
 
-    UsbCommandOLD c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
+    PacketCommandOLD c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
     memcpy(c.d.asBytes, DemodBuffer, size);
     clearCommandBuffer();
     SendCommand(&c);
@@ -726,7 +726,7 @@ int CmdLFpskSim(const char *Cmd) {
         PrintAndLogEx(NORMAL, "DemodBuffer too long for current implementation - length: %d - max: %d", size, USB_CMD_DATA_SIZE);
         size = USB_CMD_DATA_SIZE;
     }
-    UsbCommandOLD c = {CMD_PSK_SIM_TAG, {arg1, arg2, size}, {{0}}};
+    PacketCommandOLD c = {CMD_PSK_SIM_TAG, {arg1, arg2, size}, {{0}}};
     PrintAndLogEx(DEBUG, "DEBUG: Sending DemodBuffer Length: %d", size);
     memcpy(c.d.asBytes, DemodBuffer, size);
     clearCommandBuffer();
@@ -739,7 +739,7 @@ int CmdLFSimBidir(const char *Cmd) {
     // Set ADC to twice the carrier for a slight supersampling
     // HACK: not implemented in ARMSRC.
     PrintAndLogEx(INFO, "Not implemented yet.");
-    UsbCommandOLD c = {CMD_LF_SIMULATE_BIDIR, {47, 384, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_LF_SIMULATE_BIDIR, {47, 384, 0}, {{0}}};
     SendCommand(&c);
     return 0;
 }
diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c
index 26c657064..4b22292bf 100644
--- a/client/cmdlfawid.c
+++ b/client/cmdlfawid.c
@@ -87,12 +87,12 @@ static int usage_lf_awid_brute(void) {
 }
 
 static bool sendPing(void) {
-    UsbCommandOLD ping = {CMD_PING, {1, 2, 3}, {{0}}};
+    PacketCommandOLD ping = {CMD_PING, {1, 2, 3}, {{0}}};
     SendCommand(&ping);
     SendCommand(&ping);
     SendCommand(&ping);
     clearCommandBuffer();
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000))
         return false;
     return true;
@@ -112,7 +112,7 @@ static bool sendTry(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint32_t delay, ui
     uint64_t arg1 = (high << 8) + low;
     uint64_t arg2 = (invert << 8) + clk;
 
-    UsbCommandOLD c = {CMD_FSK_SIM_TAG, {arg1, arg2, bs_len}, {{0}}};
+    PacketCommandOLD c = {CMD_FSK_SIM_TAG, {arg1, arg2, bs_len}, {{0}}};
     memcpy(c.d.asBytes, bits, bs_len);
     clearCommandBuffer();
     SendCommand(&c);
@@ -171,7 +171,7 @@ static int CmdAWIDRead_device(const char *Cmd) {
 
     if (Cmd[0] == 'h' || Cmd[0] == 'H') return usage_lf_awid_read();
     uint8_t findone = (Cmd[0] == '1') ? 1 : 0;
-    UsbCommandOLD c = {CMD_AWID_DEMOD_FSK, {findone, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_AWID_DEMOD_FSK, {findone, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -350,7 +350,7 @@ static int CmdAWIDSim(const char *Cmd) {
     // arg1 --- fcHigh<<8 + fcLow
     // arg2 --- Inversion and clk setting
     // 96   --- Bitstream length: 96-bits == 12 bytes
-    UsbCommandOLD c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}, {{0}}};
+    PacketCommandOLD c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}, {{0}}};
     memcpy(c.d.asBytes, bits, size);
     clearCommandBuffer();
     SendCommand(&c);
@@ -392,8 +392,8 @@ static int CmdAWIDClone(const char *Cmd) {
     PrintAndLogEx(INFO, "Preparing to clone AWID %u to T55x7 with FC: %u, CN: %u", fmtlen, fc, cn);
     print_blocks(blocks, 4);
 
-    UsbReplyNG resp;
-    UsbCommandOLD c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
+    PacketResponseNG resp;
+    PacketCommandOLD c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
 
     for (uint8_t i = 0; i < 4; i++) {
         c.arg[0] = blocks[i];
diff --git a/client/cmdlfcotag.c b/client/cmdlfcotag.c
index 303c494c3..a8deaf584 100644
--- a/client/cmdlfcotag.c
+++ b/client/cmdlfcotag.c
@@ -74,7 +74,7 @@ static int CmdCOTAGRead(const char *Cmd) {
     uint32_t rawsignal = 1;
     sscanf(Cmd, "%u", &rawsignal);
 
-    UsbCommandOLD c = {CMD_COTAG, {rawsignal, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_COTAG, {rawsignal, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     if (!WaitForResponseTimeout(CMD_ACK, NULL, 7000)) {
diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 94af1b7b4..10faa0de9 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -389,7 +389,7 @@ int AskEm410xDemod(const char *Cmd, uint32_t *hi, uint64_t *lo, bool verbose) {
 static int CmdEM410xRead_device(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     uint8_t findone = (cmdp == '1') ? 1 : 0;
-    UsbCommandOLD c = {CMD_EM410X_DEMOD, {findone, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_EM410X_DEMOD, {findone, 0, 0}, {{0}}};
     SendCommand(&c);
     return 0;
 }
@@ -648,7 +648,7 @@ static int CmdEM410xWrite(const char *Cmd) {
         return 0;
     }
 
-    UsbCommandOLD c = {CMD_EM410X_WRITE_TAG, {card, (uint32_t)(id >> 32), (uint32_t)id}, {{0}}};
+    PacketCommandOLD c = {CMD_EM410X_WRITE_TAG, {card, (uint32_t)(id >> 32), (uint32_t)id}, {{0}}};
     SendCommand(&c);
     return 0;
 }
@@ -1127,10 +1127,10 @@ static bool demodEM4x05resp(uint32_t *word) {
 
 //////////////// 4205 / 4305 commands
 static int EM4x05ReadWord_ext(uint8_t addr, uint32_t pwd, bool usePwd, uint32_t *word) {
-    UsbCommandOLD c = {CMD_EM4X_READ_WORD, {addr, pwd, usePwd}, {{0}}};
+    PacketCommandOLD c = {CMD_EM4X_READ_WORD, {addr, pwd, usePwd}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         PrintAndLogEx(DEBUG, "timeout while waiting for reply.");
         return -1;
@@ -1230,10 +1230,10 @@ static int CmdEM4x05Write(const char *Cmd) {
 
     uint16_t flag = (addr << 8) | (usePwd);
 
-    UsbCommandOLD c = {CMD_EM4X_WRITE_WORD, {flag, data, pwd}, {{0}}};
+    PacketCommandOLD c = {CMD_EM4X_WRITE_WORD, {flag, data, pwd}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
         PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
         return -1;
diff --git a/client/cmdlffdx.c b/client/cmdlffdx.c
index 2d4d1dc4c..7eb4d37b6 100644
--- a/client/cmdlffdx.c
+++ b/client/cmdlffdx.c
@@ -281,8 +281,8 @@ static int CmdFdxClone(const char *Cmd) {
     PrintAndLogEx(INFO, "Preparing to clone FDX-B to T55x7 with animal ID: %04u-%"PRIu64, countryid, animalid);
     print_blocks(blocks, 5);
 
-    UsbReplyNG resp;
-    UsbCommandOLD c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
+    PacketResponseNG resp;
+    PacketCommandOLD c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
 
     for (int i = 4; i >= 0; --i) {
         c.arg[0] = blocks[i];
@@ -318,7 +318,7 @@ static int CmdFdxSim(const char *Cmd) {
 
     PrintAndLogEx(SUCCESS, "Simulating FDX-B animal ID: %04u-%"PRIu64, countryid, animalid);
 
-    UsbCommandOLD c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
+    PacketCommandOLD c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
 
     //getFDXBits(uint64_t national_id, uint16_t country, uint8_t isanimal, uint8_t isextended, uint32_t extended, uint8_t *bits)
     getFDXBits(animalid, countryid, 1, 0, 0, c.d.asBytes);
diff --git a/client/cmdlfguard.c b/client/cmdlfguard.c
index 31e15b9c3..8959583dc 100644
--- a/client/cmdlfguard.c
+++ b/client/cmdlfguard.c
@@ -171,8 +171,8 @@ static int CmdGuardClone(const char *Cmd) {
     PrintAndLogEx(INFO, "Preparing to clone Guardall to T55x7 with Facility Code: %u, Card Number: %u", facilitycode, cardnumber);
     print_blocks(blocks, 4);
 
-    UsbReplyNG resp;
-    UsbCommandOLD c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
+    PacketResponseNG resp;
+    PacketCommandOLD c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
 
     for (i = 0; i < 4; ++i) {
         c.arg[0] = blocks[i];
@@ -217,7 +217,7 @@ static int CmdGuardSim(const char *Cmd) {
     arg1 = (clock1 << 8) | encoding;
     arg2 = (invert << 8) | separator;
 
-    UsbCommandOLD c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
+    PacketCommandOLD c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
     memcpy(c.d.asBytes, bs, size);
     clearCommandBuffer();
     SendCommand(&c);
diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c
index 62eb0d423..4a4e43f5a 100644
--- a/client/cmdlfhid.c
+++ b/client/cmdlfhid.c
@@ -93,12 +93,12 @@ static int usage_lf_hid_brute(void) {
 
 // sending three times.  Didn't seem to break the previous sim?
 static bool sendPing(void) {
-    UsbCommandOLD ping = {CMD_PING, {1, 2, 3}, {{0}}};
+    PacketCommandOLD ping = {CMD_PING, {1, 2, 3}, {{0}}};
     SendCommand(&ping);
     SendCommand(&ping);
     SendCommand(&ping);
     clearCommandBuffer();
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000))
         return false;
     return true;
@@ -113,7 +113,7 @@ static bool sendTry(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint32_t delay, ui
 
     uint64_t arg1 = bytebits_to_byte(bits, 32);
     uint64_t arg2 = bytebits_to_byte(bits + 32, 32);
-    UsbCommandOLD c = {CMD_HID_SIM_TAG, {arg1, arg2, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_HID_SIM_TAG, {arg1, arg2, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
 
@@ -242,7 +242,7 @@ static int CmdHIDRead_device(const char *Cmd) {
 
     if (Cmd[0] == 'h' || Cmd[0] == 'H') return usage_lf_hid_read();
     uint8_t findone = (Cmd[0] == '1') ? 1 : 0;
-    UsbCommandOLD c = {CMD_HID_DEMOD_FSK, {findone, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_HID_DEMOD_FSK, {findone, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -263,7 +263,7 @@ static int CmdHIDSim(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "Simulating HID tag with ID %x%08x", hi, lo);
     PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation");
 
-    UsbCommandOLD c = {CMD_HID_SIM_TAG, {hi, lo, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_HID_SIM_TAG, {hi, lo, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -273,7 +273,7 @@ static int CmdHIDClone(const char *Cmd) {
 
     uint32_t hi2 = 0, hi = 0, lo = 0;
     uint32_t n = 0, i = 0;
-    UsbCommandOLD c = {CMD_HID_CLONE_TAG, {0, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_HID_CLONE_TAG, {0, 0, 0}, {{0}}};
 
     uint8_t ctmp = param_getchar(Cmd, 0);
     if (strlen(Cmd) == 0 || ctmp == 'H' || ctmp == 'h') return usage_lf_hid_clone();
diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index 851215e54..32d346f75 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -135,7 +135,7 @@ static int CmdLFHitagList(const char *Cmd) {
     }
 
     // Query for the actual size of the trace
-    UsbReplyNG response;
+    PacketResponseNG response;
     if (!GetFromDevice(BIG_BUF, got, USB_CMD_DATA_SIZE, 0, &response, 2500, false)) {
         PrintAndLogEx(WARNING, "command execution time out");
         free(got);
@@ -260,7 +260,7 @@ static int CmdLFHitagSniff(const char *Cmd) {
     char ctmp = tolower(param_getchar(Cmd, 0));
     if (ctmp == 'h') return usage_hitag_sniff();
 
-    UsbCommandOLD c = {CMD_SNIFF_HITAG, {0, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_SNIFF_HITAG, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -277,7 +277,7 @@ static int CmdLFHitagSim(const char *Cmd) {
     int res = 0;
     char filename[FILE_PATH_SIZE] = { 0x00 };
 
-    UsbCommandOLD c = {CMD_SIMULATE_HITAG, {0, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_SIMULATE_HITAG, {0, 0, 0}, {{0}}};
 
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
@@ -458,10 +458,10 @@ static void printHitagConfiguration(uint8_t config) {
 
 static bool getHitagUid(uint32_t *uid) {
 
-    UsbCommandOLD c = {CMD_READER_HITAG, {RHT2F_UID_ONLY, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_READER_HITAG, {RHT2F_UID_ONLY, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         PrintAndLogEx(WARNING, "timeout while waiting for reply.");
         return false;
@@ -513,7 +513,7 @@ static int CmdLFHitagInfo(const char *Cmd) {
 //
 static int CmdLFHitagReader(const char *Cmd) {
 
-    UsbCommandOLD c = {CMD_READER_HITAG, {0, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_READER_HITAG, {0, 0, 0}, {{0}}};
     hitag_data *htd = (hitag_data *)c.d.asBytes;
     hitag_function htf = param_get32ex(Cmd, 0, 0, 10);
 
@@ -559,7 +559,7 @@ static int CmdLFHitagReader(const char *Cmd) {
     c.arg[0] = htf;
     clearCommandBuffer();
     SendCommand(&c);
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 4000)) {
         PrintAndLogEx(WARNING, "timeout while waiting for reply.");
         return 1;
@@ -595,7 +595,7 @@ static int CmdLFHitagReader(const char *Cmd) {
 
 static int CmdLFHitagCheckChallenges(const char *Cmd) {
 
-    UsbCommandOLD c = { CMD_TEST_HITAGS_TRACES, {0, 0, 0}, {{0}}};
+    PacketCommandOLD c = { CMD_TEST_HITAGS_TRACES, {0, 0, 0}, {{0}}};
     char filename[FILE_PATH_SIZE] = { 0x00 };
     size_t datalen = 0;
     int res = 0;
@@ -644,7 +644,7 @@ static int CmdLFHitagCheckChallenges(const char *Cmd) {
 }
 
 static int CmdLFHitagWriter(const char *Cmd) {
-    UsbCommandOLD c = { CMD_WR_HITAG_S, {0, 0, 0}, {{0}}};
+    PacketCommandOLD c = { CMD_WR_HITAG_S, {0, 0, 0}, {{0}}};
     hitag_data *htd = (hitag_data *)c.d.asBytes;
     hitag_function htf = param_get32ex(Cmd, 0, 0, 10);
 
@@ -676,7 +676,7 @@ static int CmdLFHitagWriter(const char *Cmd) {
 
     clearCommandBuffer();
     SendCommand(&c);
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 4000)) {
         PrintAndLogEx(WARNING, "timeout while waiting for reply.");
         return 1;
diff --git a/client/cmdlfindala.c b/client/cmdlfindala.c
index 44a2c4da4..ff19b9e27 100644
--- a/client/cmdlfindala.c
+++ b/client/cmdlfindala.c
@@ -404,7 +404,7 @@ static int CmdIndalaSim(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "Simulating Indala UID: %s",  sprint_hex(hexuid, len));
     PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation or run another command");
 
-    UsbCommandOLD c = {CMD_PSK_SIM_TAG, {arg1, arg2, size}, {{0}}};
+    PacketCommandOLD c = {CMD_PSK_SIM_TAG, {arg1, arg2, size}, {{0}}};
     memcpy(c.d.asBytes, bits, size);
     clearCommandBuffer();
     SendCommand(&c);
@@ -438,7 +438,7 @@ static int CmdIndalaClone(const char *Cmd) {
     CLIGetHexWithReturn(2, data, &datalen);
     CLIParserFree();
 
-    UsbCommandOLD c = {0, {0, 0, 0}, {{0}}};
+    PacketCommandOLD c = {0, {0, 0, 0}, {{0}}};
 
     if (isLongUid) {
         PrintAndLogEx(INFO, "Preparing to clone Indala 224bit tag with RawID %s", sprint_hex(data, datalen));
diff --git a/client/cmdlfio.c b/client/cmdlfio.c
index 13168f410..cbba850c0 100644
--- a/client/cmdlfio.c
+++ b/client/cmdlfio.c
@@ -66,7 +66,7 @@ static int usage_lf_io_clone(void) {
 static int CmdIOProxRead_device(const char *Cmd) {
     if (Cmd[0] == 'h' || Cmd[0] == 'H') return usage_lf_io_read();
     int findone = (Cmd[0] == '1') ? 1 : 0;
-    UsbCommandOLD c = {CMD_IO_DEMOD_FSK, {findone, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_IO_DEMOD_FSK, {findone, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -215,7 +215,7 @@ static int CmdIOProxSim(const char *Cmd) {
     // arg1 --- fcHigh<<8 + fcLow
     // arg2 --- Invert and clk setting
     // size --- 64 bits == 8 bytes
-    UsbCommandOLD c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}, {{0}}};
+    PacketCommandOLD c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}, {{0}}};
     memcpy(c.d.asBytes, bits, size);
     clearCommandBuffer();
     SendCommand(&c);
@@ -258,8 +258,8 @@ static int CmdIOProxClone(const char *Cmd) {
     PrintAndLogEx(INFO, "Preparing to clone IOProx to T55x7 with Version: %u FC: %u, CN: %u", version, fc, cn);
     print_blocks(blocks, 3);
 
-    //UsbCommandOLD c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}, {{0}}};
-    UsbCommandOLD c = {CMD_IO_CLONE_TAG, {blocks[1], blocks[2], 0}, {{0}}};
+    //PacketCommandOLD c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}, {{0}}};
+    PacketCommandOLD c = {CMD_IO_CLONE_TAG, {blocks[1], blocks[2], 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
diff --git a/client/cmdlfjablotron.c b/client/cmdlfjablotron.c
index 531c5cac7..0febca75c 100644
--- a/client/cmdlfjablotron.c
+++ b/client/cmdlfjablotron.c
@@ -155,8 +155,8 @@ static int CmdJablotronClone(const char *Cmd) {
     PrintAndLogEx(INFO, "Preparing to clone Jablotron to T55x7 with FullCode: %"PRIx64, fullcode);
     print_blocks(blocks, 3);
 
-    UsbReplyNG resp;
-    UsbCommandOLD c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
+    PacketResponseNG resp;
+    PacketCommandOLD c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
 
     for (uint8_t i = 0; i < 3; i++) {
         c.arg[0] = blocks[i];
@@ -193,7 +193,7 @@ static int CmdJablotronSim(const char *Cmd) {
 
     PrintAndLogEx(SUCCESS, "Simulating Jablotron - FullCode: %"PRIx64, fullcode);
 
-    UsbCommandOLD c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
+    PacketCommandOLD c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
     getJablotronBits(fullcode, c.d.asBytes);
     clearCommandBuffer();
     SendCommand(&c);
diff --git a/client/cmdlfkeri.c b/client/cmdlfkeri.c
index 127bc9159..5815b8b6a 100644
--- a/client/cmdlfkeri.c
+++ b/client/cmdlfkeri.c
@@ -146,8 +146,8 @@ static int CmdKeriClone(const char *Cmd) {
     print_blocks(blocks, 3);
 
 
-    UsbReplyNG resp;
-    UsbCommandOLD c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
+    PacketResponseNG resp;
+    PacketCommandOLD c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
 
 
     for (uint8_t i = 0; i < 3; i++) {
@@ -189,7 +189,7 @@ static int CmdKeriSim(const char *Cmd) {
 
     PrintAndLogEx(SUCCESS, "Simulating KERI - Internal Id: %u", internalid);
 
-    UsbCommandOLD c = {CMD_PSK_SIM_TAG, {arg1, arg2, size}, {{0}}};
+    PacketCommandOLD c = {CMD_PSK_SIM_TAG, {arg1, arg2, size}, {{0}}};
     memcpy(c.d.asBytes, bits, size);
     clearCommandBuffer();
     SendCommand(&c);
diff --git a/client/cmdlfnedap.c b/client/cmdlfnedap.c
index 7123b4179..bcf9496f4 100644
--- a/client/cmdlfnedap.c
+++ b/client/cmdlfnedap.c
@@ -202,8 +202,8 @@ static int CmdLFNedapClone(const char *Cmd) {
     PrintAndLogEx(INFO, "Preparing to clone NEDAP to T55x7 with card number: %u", cardnumber);
     print_blocks(blocks, 5);
 
-    UsbReplyNG resp;
-    UsbCommandOLD c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}, {{0}}};
+    PacketResponseNG resp;
+    PacketCommandOLD c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}, {{0}}};
 
     for (uint8_t i = 0; i<5; ++i ) {
         c.arg[0] = blocks[i];
@@ -248,7 +248,7 @@ static int CmdLFNedapSim(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "bin  %s", sprint_bin_break(bs, 128, 32));
     PrintAndLogEx(SUCCESS, "Simulating Nedap - CardNumber: %u", cardnumber);
 
-    UsbCommandOLD c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
+    PacketCommandOLD c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
     memcpy(c.d.asBytes, bs, size);
     clearCommandBuffer();
     SendCommand(&c);
diff --git a/client/cmdlfnoralsy.c b/client/cmdlfnoralsy.c
index 44bcf6d39..fc3a6fb14 100644
--- a/client/cmdlfnoralsy.c
+++ b/client/cmdlfnoralsy.c
@@ -154,8 +154,8 @@ static int CmdNoralsyClone(const char *Cmd) {
     PrintAndLogEx(INFO, "Preparing to clone Noralsy to T55x7 with CardId: %u", id);
     print_blocks(blocks, 4);
 
-    UsbReplyNG resp;
-    UsbCommandOLD c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
+    PacketResponseNG resp;
+    PacketCommandOLD c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
 
     for (uint8_t i = 0; i < 4; i++) {
         c.arg[0] = blocks[i];
@@ -198,7 +198,7 @@ static int CmdNoralsySim(const char *Cmd) {
 
     PrintAndLogEx(SUCCESS, "Simulating Noralsy - CardId: %u", id);
 
-    UsbCommandOLD c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
+    PacketCommandOLD c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
     memcpy(c.d.asBytes, bs, size);
     clearCommandBuffer();
     SendCommand(&c);
diff --git a/client/cmdlfparadox.c b/client/cmdlfparadox.c
index aa62e7978..3b76c9ac6 100644
--- a/client/cmdlfparadox.c
+++ b/client/cmdlfparadox.c
@@ -138,7 +138,7 @@ static int CmdParadoxSim(const char *Cmd) {
 
     PrintAndLogEx(NORMAL, "Simulating Paradox - Facility Code: %u, CardNumber: %u", facilitycode, cardnumber);
 
-    UsbCommandOLD c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}, {{0}}};
+    PacketCommandOLD c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}, {{0}}};
     memcpy(c.d.asBytes, bs, size);
     clearCommandBuffer();
     SendCommand(&c);
diff --git a/client/cmdlfpcf7931.c b/client/cmdlfpcf7931.c
index 75322fb34..686ded78c 100644
--- a/client/cmdlfpcf7931.c
+++ b/client/cmdlfpcf7931.c
@@ -99,8 +99,8 @@ static int CmdLFPCF7931Read(const char *Cmd) {
     uint8_t ctmp = param_getchar(Cmd, 0);
     if (ctmp == 'H' || ctmp == 'h') return usage_pcf7931_read();
 
-    UsbReplyNG resp;
-    UsbCommandOLD c = {CMD_PCF7931_READ, {0, 0, 0}, {{0}}};
+    PacketResponseNG resp;
+    PacketCommandOLD c = {CMD_PCF7931_READ, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
@@ -145,7 +145,7 @@ static int CmdLFPCF7931Write(const char *Cmd) {
     PrintAndLogEx(NORMAL, "          pos: %d", bytepos);
     PrintAndLogEx(NORMAL, "         data: 0x%02X", data);
 
-    UsbCommandOLD c = {CMD_PCF7931_WRITE, { block, bytepos, data}, {{0}}};
+    PacketCommandOLD c = {CMD_PCF7931_WRITE, { block, bytepos, data}, {{0}}};
     memcpy(c.d.asDwords, configPcf.Pwd, sizeof(configPcf.Pwd));
     c.d.asDwords[7] = (configPcf.OffsetWidth + 128);
     c.d.asDwords[8] = (configPcf.OffsetPosition + 128);
diff --git a/client/cmdlfpresco.c b/client/cmdlfpresco.c
index 7ea253928..1d6d3de44 100644
--- a/client/cmdlfpresco.c
+++ b/client/cmdlfpresco.c
@@ -120,8 +120,8 @@ static int CmdPrescoClone(const char *Cmd) {
     PrintAndLogEx(INFO, "Preparing to clone Presco to T55x7 with SiteCode: %u, UserCode: %u, FullCode: %08x", sitecode, usercode, fullcode);
     print_blocks(blocks, 5);
 
-    UsbReplyNG resp;
-    UsbCommandOLD c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
+    PacketResponseNG resp;
+    PacketCommandOLD c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
 
     for (uint8_t i = 0; i < 5; i++) {
         c.arg[0] = blocks[i];
@@ -152,7 +152,7 @@ static int CmdPrescoSim(const char *Cmd) {
 
     PrintAndLogEx(SUCCESS, "Simulating Presco - SiteCode: %u, UserCode: %u, FullCode: %08X", sitecode, usercode, fullcode);
 
-    UsbCommandOLD c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
+    PacketCommandOLD c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
     getPrescoBits(fullcode, c.d.asBytes);
     clearCommandBuffer();
     SendCommand(&c);
diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c
index 3bfc39acc..60fd5396a 100644
--- a/client/cmdlfpyramid.c
+++ b/client/cmdlfpyramid.c
@@ -232,8 +232,8 @@ static int CmdPyramidClone(const char *Cmd) {
     PrintAndLogEx(INFO, "Preparing to clone Farpointe/Pyramid to T55x7 with Facility Code: %u, Card Number: %u", facilitycode, cardnumber);
     print_blocks(blocks, 5);
 
-    UsbReplyNG resp;
-    UsbCommandOLD c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
+    PacketResponseNG resp;
+    PacketCommandOLD c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
 
     for (uint8_t i = 0; i < 5; ++i) {
         c.arg[0] = blocks[i];
@@ -277,7 +277,7 @@ static int CmdPyramidSim(const char *Cmd) {
 
     PrintAndLogEx(SUCCESS, "Simulating Farpointe/Pyramid - Facility Code: %u, CardNumber: %u", facilitycode, cardnumber);
 
-    UsbCommandOLD c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}, {{0}}};
+    PacketCommandOLD c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}, {{0}}};
     memcpy(c.d.asBytes, bs, size);
     clearCommandBuffer();
     SendCommand(&c);
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index ec26905a5..2f6fb3775 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1018,7 +1018,7 @@ static int CmdT55xxWakeUp(const char *Cmd) {
     }
     if (errors) return usage_t55xx_wakup();
 
-    UsbCommandOLD c = {CMD_T55XX_WAKEUP, {password, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_T55XX_WAKEUP, {password, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     PrintAndLogEx(SUCCESS, "Wake up command sent. Try read now");
@@ -1074,8 +1074,8 @@ static int CmdT55xxWriteBlock(const char *Cmd) {
         return 0;
     }
 
-    UsbCommandOLD c = {CMD_T55XX_WRITE_BLOCK, {data, block, 0}, {{0}}};
-    UsbReplyNG resp;
+    PacketCommandOLD c = {CMD_T55XX_WRITE_BLOCK, {data, block, 0}, {{0}}};
+    PacketResponseNG resp;
     c.d.asBytes[0] = (page1) ? 0x2 : 0;
     c.d.asBytes[0] |= (testMode) ? 0x4 : 0;
 
@@ -1515,7 +1515,7 @@ bool AquireData(uint8_t page, uint8_t block, bool pwdmode, uint32_t password) {
     // arg1: which block to read
     // arg2: password
     uint8_t arg0 = (page << 1 | (pwdmode));
-    UsbCommandOLD c = {CMD_T55XX_READ_BLOCK, {arg0, block, password}, {{0}}};
+    PacketCommandOLD c = {CMD_T55XX_READ_BLOCK, {arg0, block, password}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     if (!WaitForResponseTimeout(CMD_ACK, NULL, 2500)) {
@@ -1775,7 +1775,7 @@ static void t55x7_create_config_block(int tagtype) {
 
 static int CmdResetRead(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
-    UsbCommandOLD c = {CMD_T55XX_RESET_READ, {0, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_T55XX_RESET_READ, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     if (!WaitForResponseTimeout(CMD_ACK, NULL, 2500)) {
@@ -1856,10 +1856,10 @@ static int CmdT55xxChkPwds(const char *Cmd) {
     uint64_t t1 = msclock();
 
     if (cmdp == 'm') {
-        UsbCommandOLD c = {CMD_T55XX_CHKPWDS, {0, 0, 0}, {{0}}};
+        PacketCommandOLD c = {CMD_T55XX_CHKPWDS, {0, 0, 0}, {{0}}};
         clearCommandBuffer();
         SendCommand(&c);
-        UsbReplyNG resp;
+        PacketResponseNG resp;
 
         while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
             timeout++;
@@ -2299,7 +2299,7 @@ static int CmdT55xxSetDeviceConfig(const char *Cmd) {
 
     t55xx_config conf = { startgap * 8, writegap * 8, write0 * 8, write1 * 8, readgap * 8 };
 
-    UsbCommandOLD c = {CMD_SET_LF_T55XX_CONFIG, {shall_persist, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_SET_LF_T55XX_CONFIG, {shall_persist, 0, 0}, {{0}}};
     memcpy(c.d.asBytes, &conf, sizeof(t55xx_config));
     clearCommandBuffer();
     SendCommand(&c);
diff --git a/client/cmdlfti.c b/client/cmdlfti.c
index fffbbfcaf..b675f693a 100644
--- a/client/cmdlfti.c
+++ b/client/cmdlfti.c
@@ -275,7 +275,7 @@ out:
 // read a TI tag and return its ID
 static int CmdTIRead(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
-    UsbCommandOLD c = {CMD_READ_TI_TYPE};
+    PacketCommandOLD c = {CMD_READ_TI_TYPE};
     clearCommandBuffer();
     SendCommand(&c);
     return 0;
@@ -284,7 +284,7 @@ static int CmdTIRead(const char *Cmd) {
 // write new data to a r/w TI tag
 static int CmdTIWrite(const char *Cmd) {
     int res = 0;
-    UsbCommandOLD c = {CMD_WRITE_TI_TYPE};
+    PacketCommandOLD c = {CMD_WRITE_TI_TYPE};
     res = sscanf(Cmd, "%012" SCNx64 " %012" SCNx64 " %012" SCNx64 "", &c.arg[0], &c.arg[1], &c.arg[2]);
 
     if (res == 2)
diff --git a/client/cmdlfviking.c b/client/cmdlfviking.c
index 06cef1bab..d0a42295b 100644
--- a/client/cmdlfviking.c
+++ b/client/cmdlfviking.c
@@ -88,10 +88,10 @@ static int CmdVikingClone(const char *Cmd) {
 
     PrintAndLogEx(INFO, "Preparing to clone Viking tag - ID: %08X, Raw: %08X%08X", id, (uint32_t)(rawID >> 32), (uint32_t)(rawID & 0xFFFFFFFF));
 
-    UsbCommandOLD c = {CMD_VIKING_CLONE_TAG, {rawID >> 32, rawID & 0xFFFFFFFF, Q5}, {{0}}};
+    PacketCommandOLD c = {CMD_VIKING_CLONE_TAG, {rawID >> 32, rawID & 0xFFFFFFFF, Q5}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
         PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
         return -1;
@@ -119,7 +119,7 @@ static int CmdVikingSim(const char *Cmd) {
 
     PrintAndLogEx(SUCCESS, "Simulating Viking - ID: %08X, Raw: %08X%08X", id, (uint32_t)(rawID >> 32), (uint32_t)(rawID & 0xFFFFFFFF));
 
-    UsbCommandOLD c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
+    PacketCommandOLD c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
     num_to_bytebits(rawID, size, c.d.asBytes);
     clearCommandBuffer();
     SendCommand(&c);
diff --git a/client/cmdlfvisa2000.c b/client/cmdlfvisa2000.c
index f7d711856..05fe3f098 100644
--- a/client/cmdlfvisa2000.c
+++ b/client/cmdlfvisa2000.c
@@ -166,8 +166,8 @@ static int CmdVisa2kClone(const char *Cmd) {
     PrintAndLogEx(INFO, "Preparing to clone Visa2000 to T55x7 with CardId: %u", id);
     print_blocks(blocks, 4);
 
-    UsbReplyNG resp;
-    UsbCommandOLD c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
+    PacketResponseNG resp;
+    PacketCommandOLD c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
 
     for (uint8_t i = 0; i < 4; i++) {
         c.arg[0] = blocks[i];
@@ -198,7 +198,7 @@ static int CmdVisa2kSim(const char *Cmd) {
 
     PrintAndLogEx(SUCCESS, "Simulating Visa2000 - CardId: %u", id);
 
-    UsbCommandOLD c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
+    PacketCommandOLD c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
 
     uint32_t blocks[3] = { BL0CK1, id, (visa_parity(id) << 4) | visa_chksum(id) };
 
diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index fd25acee0..656753395 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -309,7 +309,7 @@ static int PrintATR(uint8_t *atr, size_t atrlen) {
 }
 
 static int smart_wait(uint8_t *data, bool silent) {
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         if (!silent) PrintAndLogEx(WARNING, "smart card response timeout");
         return -1;
@@ -347,7 +347,7 @@ static int smart_responseEx(uint8_t *data, bool silent) {
         int len = data[datalen - 1];
         if (!silent) PrintAndLogEx(INFO, "Requesting 0x%02X bytes response", len);
         uint8_t getstatus[] = {0x00, ISO7816_GET_RESPONSE, 0x00, 0x00, len};
-        UsbCommandOLD cStatus = {CMD_SMART_RAW, {SC_RAW, sizeof(getstatus), 0}, {{0}}};
+        PacketCommandOLD cStatus = {CMD_SMART_RAW, {SC_RAW, sizeof(getstatus), 0}, {{0}}};
         memcpy(cStatus.d.asBytes, getstatus, sizeof(getstatus));
         clearCommandBuffer();
         SendCommand(&cStatus);
@@ -454,7 +454,7 @@ static int CmdSmartRaw(const char *Cmd) {
 
     // arg0 = RFU flags
     // arg1 = length
-    UsbCommandOLD c = {CMD_SMART_RAW, {0, hexlen, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_SMART_RAW, {0, hexlen, 0}, {{0}}};
 
     if (active || active_select) {
         c.arg[0] |= SC_CONNECT;
@@ -652,7 +652,7 @@ static int CmdSmartUpgrade(const char *Cmd) {
 
     while (bytes_remaining > 0) {
         uint32_t bytes_in_packet = MIN(USB_CMD_DATA_SIZE, bytes_remaining);
-        UsbCommandOLD c = {CMD_SMART_UPLOAD, {index + bytes_sent, bytes_in_packet, 0}, {{0}}};
+        PacketCommandOLD c = {CMD_SMART_UPLOAD, {index + bytes_sent, bytes_in_packet, 0}, {{0}}};
 
         // Fill usb bytes with 0xFF
         memset(c.d.asBytes, 0xFF, USB_CMD_DATA_SIZE);
@@ -675,10 +675,10 @@ static int CmdSmartUpgrade(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "Sim module firmware updating,  don\'t turn off your PM3!");
 
     // trigger the firmware upgrade
-    UsbCommandOLD c = {CMD_SMART_UPGRADE, {firmware_size, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_SMART_UPGRADE, {firmware_size, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         PrintAndLogEx(WARNING, "timeout while waiting for reply.");
         return 1;
@@ -714,10 +714,10 @@ static int CmdSmartInfo(const char *Cmd) {
     //Validations
     if (errors) return usage_sm_info();
 
-    UsbCommandOLD c = {CMD_SMART_ATR, {0, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_SMART_ATR, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         if (!silent) PrintAndLogEx(WARNING, "smart card select failed");
         return 1;
@@ -789,10 +789,10 @@ static int CmdSmartReader(const char *Cmd) {
     //Validations
     if (errors) return usage_sm_reader();
 
-    UsbCommandOLD c = {CMD_SMART_ATR, {0, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_SMART_ATR, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         if (!silent) PrintAndLogEx(WARNING, "smart card select failed");
         return 1;
@@ -835,10 +835,10 @@ static int CmdSmartSetClock(const char *Cmd) {
     //Validations
     if (errors || cmdp == 0) return usage_sm_setclock();
 
-    UsbCommandOLD c = {CMD_SMART_SETCLOCK, {clock1, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_SMART_SETCLOCK, {clock1, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         PrintAndLogEx(WARNING, "smart card select failed");
         return 1;
@@ -887,7 +887,7 @@ static void smart_brute_prim() {
 
     PrintAndLogEx(INFO, "Reading primitives");
 
-    UsbCommandOLD c = {CMD_SMART_RAW, {SC_RAW_T0, 5, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_SMART_RAW, {SC_RAW_T0, 5, 0}, {{0}}};
 
     for (int i = 0; i < sizeof(get_card_data); i += 5) {
 
@@ -917,7 +917,7 @@ static int smart_brute_sfi(bool decodeTLV) {
     int len;
     // READ RECORD
     uint8_t READ_RECORD[] = {0x00, 0xB2, 0x00, 0x00, 0x00};
-    UsbCommandOLD c = {CMD_SMART_RAW, {SC_RAW_T0, sizeof(READ_RECORD), 0}, {{0}}};
+    PacketCommandOLD c = {CMD_SMART_RAW, {SC_RAW_T0, sizeof(READ_RECORD), 0}, {{0}}};
 
     PrintAndLogEx(INFO, "Start SFI brute forcing");
 
@@ -984,7 +984,7 @@ static void smart_brute_options(bool decodeTLV) {
     uint8_t GET_PROCESSING_OPTIONS[] = {0x80, 0xA8, 0x00, 0x00, 0x02, 0x83, 0x00, 0x00};
 
     // Get processing options command
-    UsbCommandOLD c = {CMD_SMART_RAW, {SC_RAW_T0, sizeof(GET_PROCESSING_OPTIONS), 0}, {{0}}};
+    PacketCommandOLD c = {CMD_SMART_RAW, {SC_RAW_T0, sizeof(GET_PROCESSING_OPTIONS), 0}, {{0}}};
     memcpy(c.d.asBytes, GET_PROCESSING_OPTIONS, sizeof(GET_PROCESSING_OPTIONS));
     clearCommandBuffer();
     SendCommand(&c);
@@ -1041,7 +1041,7 @@ static int CmdSmartBruteforceSFI(const char *Cmd) {
 //  uint8_t VERIFY[] = {0x00, 0x20, 0x00, 0x80};
 
     // Select AID command
-    UsbCommandOLD cAid = {CMD_SMART_RAW, {SC_RAW_T0, 0, 0}, {{0}}};
+    PacketCommandOLD cAid = {CMD_SMART_RAW, {SC_RAW_T0, 0, 0}, {{0}}};
 
     PrintAndLogEx(INFO, "Importing AID list");
     json_t *root = NULL;
@@ -1178,7 +1178,7 @@ int ExchangeAPDUSC(uint8_t *datain, int datainlen, bool activateCard, bool leave
 
     PrintAndLogEx(DEBUG, "APDU SC");
 
-    UsbCommandOLD c = {CMD_SMART_RAW, {SC_RAW_T0, datainlen, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_SMART_RAW, {SC_RAW_T0, datainlen, 0}, {{0}}};
     if (activateCard) {
         c.arg[0] |= SC_SELECT | SC_CONNECT;
     }
@@ -1194,7 +1194,7 @@ int ExchangeAPDUSC(uint8_t *datain, int datainlen, bool activateCard, bool leave
 
     // retry
     if (len > 1 && dataout[len - 2] == 0x6c && datainlen > 4) {
-        UsbCommandOLD c2 = {CMD_SMART_RAW, {SC_RAW_T0, datainlen, 0}, {{0}}};
+        PacketCommandOLD c2 = {CMD_SMART_RAW, {SC_RAW_T0, datainlen, 0}, {{0}}};
         memcpy(c2.d.asBytes, datain, 5);
 
         // transfer length via T=0
@@ -1214,10 +1214,10 @@ bool smart_select(bool silent, smart_card_atr_t *atr) {
     if (atr)
         memset(atr, 0, sizeof(smart_card_atr_t));
 
-    UsbCommandOLD c = {CMD_SMART_ATR, {0, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_SMART_ATR, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         if (!silent) PrintAndLogEx(WARNING, "smart card select failed");
         return false;
diff --git a/client/cmdtrace.c b/client/cmdtrace.c
index e8e8cd498..88be40892 100644
--- a/client/cmdtrace.c
+++ b/client/cmdtrace.c
@@ -672,7 +672,7 @@ int CmdTraceList(const char *Cmd) {
 
     if (isOnline) {
         // Query for the size of the trace,  downloading USB_CMD_DATA_SIZE
-        UsbReplyNG response;
+        PacketResponseNG response;
         if (!GetFromDevice(BIG_BUF, trace, USB_CMD_DATA_SIZE, 0, &response, 4000, true)) {
             PrintAndLogEx(WARNING, "timeout while waiting for reply.");
             return 1;
diff --git a/client/comms.c b/client/comms.c
index a3643898f..48fbdf293 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -25,16 +25,16 @@ static pthread_t USB_communication_thread;
 //static pthread_t FPC_communication_thread;
 
 // Transmit buffer.
-static UsbCommandOLD txBuffer;
-static UsbCommandNGRaw txBufferNG;
+static PacketCommandOLD txBuffer;
+static PacketCommandNGRaw txBufferNG;
 size_t txBufferNGLen;
 static bool txBuffer_pending = false;
 static pthread_mutex_t txBufferMutex = PTHREAD_MUTEX_INITIALIZER;
 static pthread_cond_t txBufferSig = PTHREAD_COND_INITIALIZER;
 
-// Used by UsbReceiveCommand as a ring buffer for messages that are yet to be
+// Used by PacketResponseReceived as a ring buffer for messages that are yet to be
 // processed by a command handler (WaitForResponse{,Timeout})
-static UsbReplyNG rxBuffer[CMD_BUFFER_SIZE];
+static PacketResponseNG rxBuffer[CMD_BUFFER_SIZE];
 
 // Points to the next empty position to write to
 static int cmd_head = 0;
@@ -45,7 +45,7 @@ static int cmd_tail = 0;
 // to lock rxBuffer operations from different threads
 static pthread_mutex_t rxBufferMutex = PTHREAD_MUTEX_INITIALIZER;
 
-static bool dl_it(uint8_t *dest, uint32_t bytes, uint32_t start_index, UsbReplyNG *response, size_t ms_timeout, bool show_warning, uint32_t rec_cmd);
+static bool dl_it(uint8_t *dest, uint32_t bytes, uint32_t start_index, PacketResponseNG *response, size_t ms_timeout, bool show_warning, uint32_t rec_cmd);
 
 // These wrappers are required because it is not possible to access a static
 // global variable outside of the context of a single file.
@@ -57,10 +57,10 @@ bool IsOffline() {
     return offline;
 }
 
-void SendCommand(UsbCommandOLD *c) {
+void SendCommand(PacketCommandOLD *c) {
 
 #ifdef COMMS_DEBUG
-    PrintAndLogEx(NORMAL, "Sending %d bytes | cmd %04x\n", sizeof(UsbCommand), c->cmd);
+    PrintAndLogEx(NORMAL, "Sending %d bytes | cmd %04x\n", sizeof(PacketCommandOLD), c->cmd);
 #endif
 
     if (offline) {
@@ -104,7 +104,7 @@ void SendCommandNG(uint16_t cmd, uint8_t *data, size_t len) {
         return;
     }
 
-    UsbCommandNGPostamble *tx_post = (UsbCommandNGPostamble *)((uint8_t *)&txBufferNG + sizeof(UsbCommandNGPreamble) + len);
+    PacketCommandNGPostamble *tx_post = (PacketCommandNGPostamble *)((uint8_t *)&txBufferNG + sizeof(PacketCommandNGPreamble) + len);
 
     pthread_mutex_lock(&txBufferMutex);
     /**
@@ -121,9 +121,9 @@ void SendCommandNG(uint16_t cmd, uint8_t *data, size_t len) {
     txBufferNG.pre.cmd = cmd;
     memcpy(&txBufferNG.data, data, len);
     uint8_t first, second;
-    compute_crc(CRC_14443_A, (uint8_t *)&txBufferNG, sizeof(UsbCommandNGPreamble) + len, &first, &second);
+    compute_crc(CRC_14443_A, (uint8_t *)&txBufferNG, sizeof(PacketCommandNGPreamble) + len, &first, &second);
     tx_post->crc = (first << 8) + second;
-    txBufferNGLen = sizeof(UsbCommandNGPreamble) + len + sizeof(UsbCommandNGPostamble);
+    txBufferNGLen = sizeof(PacketCommandNGPreamble) + len + sizeof(PacketCommandNGPostamble);
     txBuffer_pending = true;
 
     // tell communication thread that a new command can be send
@@ -150,7 +150,7 @@ void clearCommandBuffer() {
  * @brief storeCommand stores a USB command in a circular buffer
  * @param UC
  */
-static void storeReply(UsbReplyNG *packet) {
+static void storeReply(PacketResponseNG *packet) {
     pthread_mutex_lock(&rxBufferMutex);
     if ((cmd_head + 1) % CMD_BUFFER_SIZE == cmd_tail) {
         //If these two are equal, we're about to overwrite in the
@@ -159,8 +159,8 @@ static void storeReply(UsbReplyNG *packet) {
         fflush(stdout);
     }
     //Store the command at the 'head' location
-    UsbReplyNG *destination = &rxBuffer[cmd_head];
-    memcpy(destination, packet, sizeof(UsbReplyNG));
+    PacketResponseNG *destination = &rxBuffer[cmd_head];
+    memcpy(destination, packet, sizeof(PacketResponseNG));
 
     //increment head and wrap
     cmd_head = (cmd_head + 1) % CMD_BUFFER_SIZE;
@@ -171,7 +171,7 @@ static void storeReply(UsbReplyNG *packet) {
  * @param response location to write command
  * @return 1 if response was returned, 0 if nothing has been received
  */
-static int getReply(UsbReplyNG *packet) {
+static int getReply(PacketResponseNG *packet) {
     pthread_mutex_lock(&rxBufferMutex);
     //If head == tail, there's nothing to read, or if we just got initialized
     if (cmd_head == cmd_tail)  {
@@ -180,7 +180,7 @@ static int getReply(UsbReplyNG *packet) {
     }
 
     //Pick out the next unread command
-    memcpy(packet, &rxBuffer[cmd_tail], sizeof(UsbReplyNG));
+    memcpy(packet, &rxBuffer[cmd_tail], sizeof(PacketResponseNG));
 
     //Increment tail - this is a circular buffer, so modulo buffer size
     cmd_tail = (cmd_tail + 1) % CMD_BUFFER_SIZE;
@@ -193,7 +193,7 @@ static int getReply(UsbReplyNG *packet) {
 // Entry point into our code: called whenever we received a packet over USB
 // that we weren't necessarily expecting, for example a debug print.
 //-----------------------------------------------------------------------------
-static void UsbReplyReceived(UsbReplyNG *packet) {
+static void PacketResponseReceived(PacketResponseNG *packet) {
 
 //DOEGOX
 //PrintAndLogEx(NORMAL, "RECV %s magic %08x length %04x status %04x crc %04x cmd %04x",
@@ -280,8 +280,8 @@ __attribute__((force_align_arg_pointer))
     communication_arg_t *connection = (communication_arg_t *)targ;
     size_t rxlen;
 
-    UsbReplyNG rx;
-    UsbReplyNGRaw rx_raw;
+    PacketResponseNG rx;
+    PacketResponseNGRaw rx_raw;
     //int counter_to_offline = 0;
 
 #if defined(__MACH__) && defined(__APPLE__)
@@ -292,7 +292,7 @@ __attribute__((force_align_arg_pointer))
         rxlen = 0;
         bool ACK_received = false;
         bool error = false;
-        if (uart_receive(sp, (uint8_t *)&rx_raw.pre, sizeof(UsbReplyNGPreamble), &rxlen) && (rxlen == sizeof(UsbReplyNGPreamble))) {
+        if (uart_receive(sp, (uint8_t *)&rx_raw.pre, sizeof(PacketResponseNGPreamble), &rxlen) && (rxlen == sizeof(PacketResponseNGPreamble))) {
             rx.magic = rx_raw.pre.magic;
             rx.length = rx_raw.pre.length;
             rx.status = rx_raw.pre.status;
@@ -311,7 +311,7 @@ __attribute__((force_align_arg_pointer))
                     }
                 }
                 if (!error) {                        // Get the postamble
-                    if ((!uart_receive(sp, (uint8_t *)&rx_raw.foopost, sizeof(UsbReplyNGPostamble), &rxlen)) || (rxlen != sizeof(UsbReplyNGPostamble))) {
+                    if ((!uart_receive(sp, (uint8_t *)&rx_raw.foopost, sizeof(PacketResponseNGPostamble), &rxlen)) || (rxlen != sizeof(PacketResponseNGPostamble))) {
                         PrintAndLogEx(WARNING, "Received packet frame error fetching postamble");
                         error = true;
                     }
@@ -319,7 +319,7 @@ __attribute__((force_align_arg_pointer))
                 if (!error) {                        // Check CRC
                     rx.crc = rx_raw.foopost.crc;
                     uint8_t first, second;
-                    compute_crc(CRC_14443_A, (uint8_t *)&rx_raw, sizeof(UsbReplyNGPreamble) + rx.length, &first, &second);
+                    compute_crc(CRC_14443_A, (uint8_t *)&rx_raw, sizeof(PacketResponseNGPreamble) + rx.length, &first, &second);
                     if ((first << 8) + second != rx.crc) {
                         PrintAndLogEx(WARNING, "Received packet frame CRC error %02X%02X <> %04X", first, second, rx.crc);
                         error = true;
@@ -328,17 +328,17 @@ __attribute__((force_align_arg_pointer))
                 if (!error) {
 //                    PrintAndLogEx(NORMAL, "Received reply NG full !!");
                     rx.ng = true;
-                    UsbReplyReceived(&rx);
+                    PacketResponseReceived(&rx);
 //TODO DOEGOX NG don't send ACK anymore but reply with the corresponding cmd, still things seem to work fine...
                     if (rx.cmd == CMD_ACK) {
                         ACK_received = true;
                     }
                 }
             } else {                               // Old style reply
-                UsbCommandOLD rx_old;
-                memcpy(&rx_old, &rx_raw.pre, sizeof(UsbReplyNGPreamble));
-                if ((!uart_receive(sp, ((uint8_t *)&rx_old) + sizeof(UsbReplyNGPreamble), sizeof(UsbCommandOLD) - sizeof(UsbReplyNGPreamble), &rxlen)) || (rxlen != sizeof(UsbCommandOLD) - sizeof(UsbReplyNGPreamble))) {
-                    PrintAndLogEx(WARNING, "Received packet frame error var part too short? %d/%d", rxlen, sizeof(UsbCommandOLD) - sizeof(UsbReplyNGPreamble));
+                PacketResponseOLD rx_old;
+                memcpy(&rx_old, &rx_raw.pre, sizeof(PacketResponseNGPreamble));
+                if ((!uart_receive(sp, ((uint8_t *)&rx_old) + sizeof(PacketResponseNGPreamble), sizeof(PacketResponseOLD) - sizeof(PacketResponseNGPreamble), &rxlen)) || (rxlen != sizeof(PacketResponseOLD) - sizeof(PacketResponseNGPreamble))) {
+                    PrintAndLogEx(WARNING, "Received packet frame error var part too short? %d/%d", rxlen, sizeof(PacketResponseOLD) - sizeof(PacketResponseNGPreamble));
                     error = true;
                 }
                 if (!error) {
@@ -353,7 +353,7 @@ __attribute__((force_align_arg_pointer))
                     rx.oldarg[2] = rx_old.arg[2];
                     rx.length = USB_CMD_DATA_SIZE;
                     memcpy(&rx.data, &rx_old.d, rx.length);
-                    UsbReplyReceived(&rx);
+                    PacketResponseReceived(&rx);
                     if (rx.cmd == CMD_ACK) {
                         ACK_received = true;
                     }
@@ -361,7 +361,7 @@ __attribute__((force_align_arg_pointer))
             }
         } else {
             if (rxlen > 0) {
-                PrintAndLogEx(WARNING, "Received packet frame preamble too short: %d/%d", rxlen, sizeof(UsbReplyNGPreamble));
+                PrintAndLogEx(WARNING, "Received packet frame preamble too short: %d/%d", rxlen, sizeof(PacketResponseNGPreamble));
                 error = true;
             }
         }
@@ -386,7 +386,7 @@ __attribute__((force_align_arg_pointer))
                 }
                 txBufferNGLen = 0;
             } else {
-                if (!uart_send(sp, (uint8_t *) &txBuffer, sizeof(UsbCommandOLD))) {
+                if (!uart_send(sp, (uint8_t *) &txBuffer, sizeof(PacketCommandOLD))) {
                     //counter_to_offline++;
                     PrintAndLogEx(WARNING, "sending bytes to Proxmark3 device" _RED_("failed"));
                 }
@@ -459,8 +459,8 @@ bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode,
 // check if we can communicate with Pm3
 int TestProxmark(void) {
     clearCommandBuffer();
-    UsbReplyNG resp;
-    UsbCommandOLD c = {CMD_PING, {0, 0, 0}, {{0}}};
+    PacketResponseNG resp;
+    PacketCommandOLD c = {CMD_PING, {0, 0, 0}, {{0}}};
     SendCommand(&c);
     if (WaitForResponseTimeout(CMD_ACK, &resp, 5000)) {
         PrintAndLogEx(INFO, "Communicating with PM3 over %s.", resp.oldarg[0] == 1 ? "FPC" : "USB");
@@ -511,9 +511,9 @@ void CloseProxmark(void) {
  * @param show_warning display message after 3 seconds
  * @return true if command was returned, otherwise false
  */
-bool WaitForResponseTimeoutW(uint32_t cmd, UsbReplyNG *response, size_t ms_timeout, bool show_warning) {
+bool WaitForResponseTimeoutW(uint32_t cmd, PacketResponseNG *response, size_t ms_timeout, bool show_warning) {
 
-    UsbReplyNG resp;
+    PacketResponseNG resp;
 
     if (response == NULL)
         response = &resp;
@@ -541,11 +541,11 @@ bool WaitForResponseTimeoutW(uint32_t cmd, UsbReplyNG *response, size_t ms_timeo
     return false;
 }
 
-bool WaitForResponseTimeout(uint32_t cmd, UsbReplyNG *response, size_t ms_timeout) {
+bool WaitForResponseTimeout(uint32_t cmd, PacketResponseNG *response, size_t ms_timeout) {
     return WaitForResponseTimeoutW(cmd, response, ms_timeout, true);
 }
 
-bool WaitForResponse(uint32_t cmd, UsbReplyNG *response) {
+bool WaitForResponse(uint32_t cmd, PacketResponseNG *response) {
     return WaitForResponseTimeoutW(cmd, response, -1, true);
 }
 
@@ -562,12 +562,12 @@ bool WaitForResponse(uint32_t cmd, UsbReplyNG *response) {
 * @param show_warning display message after 2 seconds
 * @return true if command was returned, otherwise false
 */
-bool GetFromDevice(DeviceMemType_t memtype, uint8_t *dest, uint32_t bytes, uint32_t start_index, UsbReplyNG *response, size_t ms_timeout, bool show_warning) {
+bool GetFromDevice(DeviceMemType_t memtype, uint8_t *dest, uint32_t bytes, uint32_t start_index, PacketResponseNG *response, size_t ms_timeout, bool show_warning) {
 
     if (dest == NULL) return false;
     if (bytes == 0) return true;
 
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     if (response == NULL)
         response = &resp;
 
@@ -576,22 +576,22 @@ bool GetFromDevice(DeviceMemType_t memtype, uint8_t *dest, uint32_t bytes, uint3
 
     switch (memtype) {
         case BIG_BUF: {
-            UsbCommandOLD c = {CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K, {start_index, bytes, 0}, {{0}}};
+            PacketCommandOLD c = {CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K, {start_index, bytes, 0}, {{0}}};
             SendCommand(&c);
             return dl_it(dest, bytes, start_index, response, ms_timeout, show_warning, CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K);
         }
         case BIG_BUF_EML: {
-            UsbCommandOLD c = {CMD_DOWNLOAD_EML_BIGBUF, {start_index, bytes, 0}, {{0}}};
+            PacketCommandOLD c = {CMD_DOWNLOAD_EML_BIGBUF, {start_index, bytes, 0}, {{0}}};
             SendCommand(&c);
             return dl_it(dest, bytes, start_index, response, ms_timeout, show_warning, CMD_DOWNLOADED_EML_BIGBUF);
         }
         case FLASH_MEM: {
-            UsbCommandOLD c = {CMD_FLASHMEM_DOWNLOAD, {start_index, bytes, 0}, {{0}}};
+            PacketCommandOLD c = {CMD_FLASHMEM_DOWNLOAD, {start_index, bytes, 0}, {{0}}};
             SendCommand(&c);
             return dl_it(dest, bytes, start_index, response, ms_timeout, show_warning, CMD_FLASHMEM_DOWNLOADED);
         }
         case SIM_MEM: {
-            //UsbCommandOLD c = {CMD_DOWNLOAD_SIM_MEM, {start_index, bytes, 0}, {{0}}};
+            //PacketCommandOLD c = {CMD_DOWNLOAD_SIM_MEM, {start_index, bytes, 0}, {{0}}};
             //SendCommand(&c);
             //return dl_it(dest, bytes, start_index, response, ms_timeout, show_warning, CMD_DOWNLOADED_SIMMEM);
             return false;
@@ -600,7 +600,7 @@ bool GetFromDevice(DeviceMemType_t memtype, uint8_t *dest, uint32_t bytes, uint3
     return false;
 }
 
-static bool dl_it(uint8_t *dest, uint32_t bytes, uint32_t start_index, UsbReplyNG *response, size_t ms_timeout, bool show_warning, uint32_t rec_cmd) {
+static bool dl_it(uint8_t *dest, uint32_t bytes, uint32_t start_index, PacketResponseNG *response, size_t ms_timeout, bool show_warning, uint32_t rec_cmd) {
 
     uint32_t bytes_completed = 0;
     uint64_t start_time = msclock();
diff --git a/client/comms.h b/client/comms.h
index 6410eadfa..ee0dff19c 100644
--- a/client/comms.h
+++ b/client/comms.h
@@ -49,7 +49,7 @@ void SetOffline(bool value);
 bool IsOffline(void);
 
 void *uart_receiver(void *targ);
-void SendCommand(UsbCommandOLD *c);
+void SendCommand(PacketCommandOLD *c);
 void SendCommandNG(uint16_t cmd, uint8_t *data, size_t len);
 void clearCommandBuffer(void);
 
@@ -58,11 +58,11 @@ bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode,
 int TestProxmark(void);
 void CloseProxmark(void);
 
-bool WaitForResponseTimeoutW(uint32_t cmd, UsbReplyNG *response, size_t ms_timeout, bool show_warning);
-bool WaitForResponseTimeout(uint32_t cmd, UsbReplyNG *response, size_t ms_timeout);
-bool WaitForResponse(uint32_t cmd, UsbReplyNG *response);
+bool WaitForResponseTimeoutW(uint32_t cmd, PacketResponseNG *response, size_t ms_timeout, bool show_warning);
+bool WaitForResponseTimeout(uint32_t cmd, PacketResponseNG *response, size_t ms_timeout);
+bool WaitForResponse(uint32_t cmd, PacketResponseNG *response);
 
-bool GetFromDevice(DeviceMemType_t memtype, uint8_t *dest, uint32_t bytes, uint32_t start_index, UsbReplyNG *response, size_t ms_timeout, bool show_warning);
+bool GetFromDevice(DeviceMemType_t memtype, uint8_t *dest, uint32_t bytes, uint32_t start_index, PacketResponseNG *response, size_t ms_timeout, bool show_warning);
 
 #endif
 
diff --git a/client/flash.c b/client/flash.c
index c2d5aa159..790edf49b 100644
--- a/client/flash.c
+++ b/client/flash.c
@@ -259,9 +259,9 @@ fail:
 
 // Get the state of the proxmark, backwards compatible
 static int get_proxmark_state(uint32_t *state) {
-    UsbCommandOLD c = {CMD_DEVICE_INFO};
+    PacketCommandOLD c = {CMD_DEVICE_INFO};
     SendCommand(&c);
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     WaitForResponse(CMD_UNKNOWN, &resp);  // wait for any response. No timeout.
 
     // Three outcomes:
@@ -300,7 +300,7 @@ static int enter_bootloader(char *serial_port_name) {
 
     if (state & DEVICE_INFO_FLAG_CURRENT_MODE_OS) {
         fprintf(stdout, _BLUE_("Entering bootloader...") "\n");
-        UsbCommandOLD c;
+        PacketCommandOLD c;
         memset(&c, 0, sizeof(c));
 
         if ((state & DEVICE_INFO_FLAG_BOOTROM_PRESENT)
@@ -335,7 +335,7 @@ static int enter_bootloader(char *serial_port_name) {
     return -1;
 }
 
-static int wait_for_ack(UsbReplyNG *ack) {
+static int wait_for_ack(PacketResponseNG *ack) {
     WaitForResponse(CMD_UNKNOWN, ack);
 
     if (ack->cmd != CMD_ACK) {
@@ -361,8 +361,8 @@ int flash_start_flashing(int enable_bl_writes, char *serial_port_name) {
     if (state & DEVICE_INFO_FLAG_UNDERSTANDS_START_FLASH) {
         // This command is stupid. Why the heck does it care which area we're
         // flashing, as long as it's not the bootloader area? The mind boggles.
-        UsbCommandOLD c = {CMD_START_FLASH};
-        UsbReplyNG resp;
+        PacketCommandOLD c = {CMD_START_FLASH};
+        PacketResponseNG resp;
 
         if (enable_bl_writes) {
             c.arg[0] = FLASH_START;
@@ -386,8 +386,8 @@ static int write_block(uint32_t address, uint8_t *data, uint32_t length) {
     uint8_t block_buf[BLOCK_SIZE];
     memset(block_buf, 0xFF, BLOCK_SIZE);
     memcpy(block_buf, data, length);
-    UsbCommandOLD c = {CMD_FINISH_WRITE, {address, 0, 0}};
-    UsbReplyNG resp;
+    PacketCommandOLD c = {CMD_FINISH_WRITE, {address, 0, 0}};
+    PacketResponseNG resp;
     memcpy(c.d.asBytes, block_buf, length);
     SendCommand(&c);
     int ret = wait_for_ack(&resp);
@@ -459,7 +459,7 @@ void flash_free(flash_file_t *ctx) {
 
 // just reset the unit
 int flash_stop_flashing(void) {
-    UsbCommandOLD c = {CMD_HARDWARE_RESET};
+    PacketCommandOLD c = {CMD_HARDWARE_RESET};
     SendCommand(&c);
     msleep(100);
     return 0;
diff --git a/client/flasher.c b/client/flasher.c
index 57d6c32f8..817990d7e 100644
--- a/client/flasher.c
+++ b/client/flasher.c
@@ -20,9 +20,9 @@
 
 #define MAX_FILES 4
 
-void cmd_debug(UsbCommandOLD *c) {
+void cmd_debug(PacketCommandOLD *c) {
     //  Debug
-    printf("UsbCommandOLD length[len=%zu]\n", sizeof(UsbCommandOLD));
+    printf("PacketCommandOLD length[len=%zu]\n", sizeof(PacketCommandOLD));
     printf("  cmd[len=%zu]: %016" PRIx64"\n", sizeof(c->cmd), c->cmd);
     printf(" arg0[len=%zu]: %016" PRIx64"\n", sizeof(c->arg[0]), c->arg[0]);
     printf(" arg1[len=%zu]: %016" PRIx64"\n", sizeof(c->arg[1]), c->arg[1]);
diff --git a/client/hid-flasher/flash.c b/client/hid-flasher/flash.c
index 22f57a817..77bba2402 100644
--- a/client/hid-flasher/flash.c
+++ b/client/hid-flasher/flash.c
@@ -260,9 +260,9 @@ fail:
 
 // Get the state of the proxmark, backwards compatible
 static int get_proxmark_state(uint32_t *state) {
-    UsbCommand c = {CMD_DEVICE_INFO};
+    PacketCommandOLD c = {CMD_DEVICE_INFO};
     SendCommand(&c);
-    UsbCommand resp;
+    PacketResponseOLD resp;
     ReceiveCommand(&resp);
 
     // Three outcomes:
@@ -303,7 +303,7 @@ static int enter_bootloader(void) {
 
     if (state & DEVICE_INFO_FLAG_CURRENT_MODE_OS) {
         fprintf(stderr, "Entering bootloader...\n");
-        UsbCommand c;
+        PacketCommandOLD c;
         memset(&c, 0, sizeof(c));
 
         if ((state & DEVICE_INFO_FLAG_BOOTROM_PRESENT)
@@ -338,7 +338,7 @@ static int enter_bootloader(void) {
 }
 
 static int wait_for_ack(void) {
-    UsbCommand ack;
+    PacketResponseOLD ack;
     ReceiveCommand(&ack);
     if (ack.cmd != CMD_ACK) {
         printf("Error: Unexpected reply 0x%04x (expected ACK)\n", ack.cmd);
@@ -360,7 +360,7 @@ int flash_start_flashing(int enable_bl_writes) {
     if (state & DEVICE_INFO_FLAG_UNDERSTANDS_START_FLASH) {
         // This command is stupid. Why the heck does it care which area we're
         // flashing, as long as it's not the bootloader area? The mind boggles.
-        UsbCommand c = {CMD_START_FLASH};
+        PacketCommandOLD c = {CMD_START_FLASH};
 
         if (enable_bl_writes) {
             c.arg[0] = FLASH_START;
@@ -387,7 +387,7 @@ static int write_block(uint32_t address, uint8_t *data, uint32_t length) {
     memset(block_buf, 0xFF, BLOCK_SIZE);
     memcpy(block_buf, data, length);
 
-    UsbCommand c = {CMD_SETUP_WRITE};
+    PacketCommandOLD c = {CMD_SETUP_WRITE};
     for (int i = 0; i < 240; i += 48) {
         memcpy(c.d.asBytes, block_buf + i, 48);
         c.arg[0] = i / 4;
@@ -458,7 +458,7 @@ void flash_free(flash_file_t *ctx) {
 
 // just reset the unit
 int flash_stop_flashing(void) {
-    UsbCommand c = {CMD_HARDWARE_RESET};
+    PacketCommandOLD c = {CMD_HARDWARE_RESET};
     SendCommand(&c);
     msleep(100);
     return 0;
diff --git a/client/hid-flasher/proxusb.c b/client/hid-flasher/proxusb.c
index 7563429d8..021e60813 100644
--- a/client/hid-flasher/proxusb.c
+++ b/client/hid-flasher/proxusb.c
@@ -20,14 +20,14 @@ static unsigned int claimed_iface = 0;
 unsigned char return_on_error = 0;
 unsigned char error_occured = 0;
 
-void SendCommand(UsbCommand *c) {
+void SendCommand(PacketCommandOLD *c) {
     int ret;
 
 #if 0
-    printf("Sending %d bytes\n", sizeof(UsbCommand));
+    printf("Sending %d bytes\n", sizeof(PacketCommandOLD));
 #endif
 
-    ret = usb_bulk_write(devh, 0x01, (char *)c, sizeof(UsbCommand), 1000);
+    ret = usb_bulk_write(devh, 0x01, (char *)c, sizeof(PacketCommandOLD), 1000);
     if (ret < 0) {
         error_occured = 1;
         if (return_on_error)
@@ -48,11 +48,11 @@ void SendCommand(UsbCommand *c) {
     }
 }
 
-bool ReceiveCommandPoll(UsbCommand *c) {
+bool ReceiveCommandPoll(PacketResponseOLD *c) {
     int ret;
 
-    memset(c, 0, sizeof(UsbCommand));
-    ret = usb_bulk_read(devh, 0x82, (char *)c, sizeof(UsbCommand), 500);
+    memset(c, 0, sizeof(PacketResponseOLD));
+    ret = usb_bulk_read(devh, 0x82, (char *)c, sizeof(PacketResponseOLD), 500);
     if (ret < 0) {
         if (ret != -ETIMEDOUT) {
             error_occured = 1;
@@ -73,16 +73,16 @@ bool ReceiveCommandPoll(UsbCommand *c) {
             return false;
         }
     } else {
-        if (ret && (ret < sizeof(UsbCommand))) {
+        if (ret && (ret < sizeof(PacketResponseOLD))) {
             fprintf(stderr, "Read only %d instead of requested %d bytes!\n",
-                    ret, (int)sizeof(UsbCommand));
+                    ret, (int)sizeof(PacketResponseOLD));
         }
     }
 
     return ret > 0;
 }
 
-void ReceiveCommand(UsbCommand *c) {
+void ReceiveCommand(PacketResponseOLD *c) {
 //  printf("%s()\n", __FUNCTION__);
     int retval = 0;
     do {
diff --git a/client/hid-flasher/proxusb.h b/client/hid-flasher/proxusb.h
index 69d47abd2..01c5a7102 100644
--- a/client/hid-flasher/proxusb.h
+++ b/client/hid-flasher/proxusb.h
@@ -27,9 +27,9 @@
 extern unsigned char return_on_error;
 extern unsigned char error_occured;
 
-void SendCommand(UsbCommand *c);
-bool ReceiveCommandPoll(UsbCommand *c);
-void ReceiveCommand(UsbCommand *c);
+void SendCommand(PacketCommand *c);
+bool ReceiveCommandPoll(PacketCommand *c);
+void ReceiveCommand(PacketCommand *c);
 struct usb_dev_handle *FindProxmark(int verbose, unsigned int *iface);
 struct usb_dev_handle *OpenProxmark(int verbose);
 void CloseProxmark(void);
diff --git a/client/hid-flasher/usb_cmd.h b/client/hid-flasher/usb_cmd.h
index ac563bd26..2b383faf8 100644
--- a/client/hid-flasher/usb_cmd.h
+++ b/client/hid-flasher/usb_cmd.h
@@ -30,7 +30,16 @@ typedef struct {
         uint8_t     asBytes[48];
         uint32_t    asDwords[12];
     } d;
-} PACKED UsbCommand;
+} PACKED PacketCommandOLD;
+
+typedef struct {
+    uint32_t    cmd;
+    uint32_t    arg[3];
+    union {
+        uint8_t     asBytes[48];
+        uint32_t    asDwords[12];
+    } d;
+} PACKED PacketResponseOLD;
 
 // For the bootloader
 #define CMD_DEVICE_INFO                                                   0x0000
diff --git a/client/mifare/mifarehost.c b/client/mifare/mifarehost.c
index 19bad2ba8..0c905fdc4 100644
--- a/client/mifare/mifarehost.c
+++ b/client/mifare/mifarehost.c
@@ -16,7 +16,7 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
     uint64_t par_list = 0, ks_list = 0;
     uint64_t *keylist = NULL, *last_keylist = NULL;
 
-    UsbCommandOLD c = {CMD_READER_MIFARE, {true, blockno, key_type}, {{0}}};
+    PacketCommandOLD c = {CMD_READER_MIFARE, {true, blockno, key_type}, {{0}}};
 
     // message
     PrintAndLogEx(NORMAL, "--------------------------------------------------------------------------------\n");
@@ -45,7 +45,7 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
                 return -5;
             }
 
-            UsbReplyNG resp;
+            PacketResponseNG resp;
             if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
                 int16_t isOK  = resp.oldarg[0];
                 if (isOK < 0)
@@ -123,11 +123,11 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
 }
 int mfCheckKeys(uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t keycnt, uint8_t *keyBlock, uint64_t *key) {
     *key = -1;
-    UsbCommandOLD c = {CMD_MIFARE_CHKKEYS, { (blockNo | (keyType << 8)), clear_trace, keycnt}, {{0}}};
+    PacketCommandOLD c = {CMD_MIFARE_CHKKEYS, { (blockNo | (keyType << 8)), clear_trace, keycnt}, {{0}}};
     memcpy(c.d.asBytes, keyBlock, 6 * keycnt);
     clearCommandBuffer();
     SendCommand(&c);
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) return 1;
     if ((resp.oldarg[0] & 0xff) != 0x01) return 2;
     *key = bytes_to_num(resp.data.asBytes, 6);
@@ -145,11 +145,11 @@ int mfCheckKeys_fast(uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk,
     uint32_t timeout = 0;
 
     // send keychunk
-    UsbCommandOLD c = {CMD_MIFARE_CHKKEYS_FAST, { (sectorsCnt | (firstChunk << 8) | (lastChunk << 12)), ((use_flashmemory << 8) | strategy), size}, {{0}}};
+    PacketCommandOLD c = {CMD_MIFARE_CHKKEYS_FAST, { (sectorsCnt | (firstChunk << 8) | (lastChunk << 12)), ((use_flashmemory << 8) | strategy), size}, {{0}}};
     memcpy(c.d.asBytes, keyBlock, 6 * size);
     clearCommandBuffer();
     SendCommand(&c);
-    UsbReplyNG resp;
+    PacketResponseNG resp;
 
     while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
         timeout++;
@@ -293,11 +293,11 @@ __attribute__((force_align_arg_pointer))
 int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t *resultKey, bool calibrate) {
     uint16_t i;
     uint32_t uid;
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     StateList_t statelists[2];
     struct Crypto1State *p1, *p2, *p3, *p4;
 
-    UsbCommandOLD c = {CMD_MIFARE_NESTED, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, calibrate}, {{0}}};
+    PacketCommandOLD c = {CMD_MIFARE_NESTED, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, calibrate}, {{0}}};
     memcpy(c.d.asBytes, key, 6);
     clearCommandBuffer();
     SendCommand(&c);
@@ -419,12 +419,12 @@ out:
 // MIFARE
 int mfReadSector(uint8_t sectorNo, uint8_t keyType, uint8_t *key, uint8_t *data) {
 
-    UsbCommandOLD c = {CMD_MIFARE_READSC, {sectorNo, keyType, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_MIFARE_READSC, {sectorNo, keyType, 0}, {{0}}};
     memcpy(c.d.asBytes, key, 6);
     clearCommandBuffer();
     SendCommand(&c);
 
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         uint8_t isOK  = resp.oldarg[0] & 0xff;
 
@@ -444,10 +444,10 @@ int mfReadSector(uint8_t sectorNo, uint8_t keyType, uint8_t *key, uint8_t *data)
 
 // EMULATOR
 int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount) {
-    UsbCommandOLD c = {CMD_MIFARE_EML_MEMGET, {blockNum, blocksCount, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_MIFARE_EML_MEMGET, {blockNum, blocksCount, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return 1;
     memcpy(data, resp.data.asBytes, blocksCount * 16);
     return 0;
@@ -458,7 +458,7 @@ int mfEmlSetMem(uint8_t *data, int blockNum, int blocksCount) {
 }
 
 int mfEmlSetMem_xt(uint8_t *data, int blockNum, int blocksCount, int blockBtWidth) {
-    UsbCommandOLD c = {CMD_MIFARE_EML_MEMSET, {blockNum, blocksCount, blockBtWidth}, {{0}}};
+    PacketCommandOLD c = {CMD_MIFARE_EML_MEMSET, {blockNum, blocksCount, blockBtWidth}, {{0}}};
     memcpy(c.d.asBytes, data, blocksCount * blockBtWidth);
     clearCommandBuffer();
     SendCommand(&c);
@@ -501,11 +501,11 @@ int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, uint8_
 
 int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, uint8_t params) {
 
-    UsbCommandOLD c = {CMD_MIFARE_CSETBLOCK, {params, blockNo, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_MIFARE_CSETBLOCK, {params, blockNo, 0}, {{0}}};
     memcpy(c.d.asBytes, data, 16);
     clearCommandBuffer();
     SendCommand(&c);
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         uint8_t isOK  = resp.oldarg[0] & 0xff;
         if (uid != NULL)
@@ -520,10 +520,10 @@ int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, uint8_t params) {
 }
 
 int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params) {
-    UsbCommandOLD c = {CMD_MIFARE_CGETBLOCK, {params, blockNo, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_MIFARE_CGETBLOCK, {params, blockNo, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         uint8_t isOK  = resp.oldarg[0] & 0xff;
         if (!isOK)
@@ -869,11 +869,11 @@ int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t *data,
 */
 int detect_classic_prng(void) {
 
-    UsbReplyNG resp, respA;
+    PacketResponseNG resp, respA;
     uint8_t cmd[] = {MIFARE_AUTH_KEYA, 0x00};
     uint32_t flags = ISO14A_CONNECT | ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_RATS;
 
-    UsbCommandOLD c = {CMD_READER_ISO_14443a, {flags, sizeof(cmd), 0}, {{0}}};
+    PacketCommandOLD c = {CMD_READER_ISO_14443a, {flags, sizeof(cmd), 0}, {{0}}};
     memcpy(c.d.asBytes, cmd, sizeof(cmd));
 
     clearCommandBuffer();
@@ -913,10 +913,10 @@ returns:
 */
 int detect_classic_nackbug(bool verbose) {
 
-    UsbCommandOLD c = {CMD_MIFARE_NACK_DETECT, {0, 0, 0}, {{0}}};
+    PacketCommandOLD c = {CMD_MIFARE_NACK_DETECT, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
-    UsbReplyNG resp;
+    PacketResponseNG resp;
 
     if (verbose)
         PrintAndLogEx(SUCCESS, "press pm3-button on the Proxmark3 device to abort both Proxmark3 and client.\n");
@@ -998,8 +998,8 @@ int detect_classic_nackbug(bool verbose) {
 void detect_classic_magic(void) {
 
     uint8_t isGeneration = 0;
-    UsbReplyNG resp;
-    UsbCommandOLD c = {CMD_MIFARE_CIDENT, {0, 0, 0}, {{0}}};
+    PacketResponseNG resp;
+    PacketCommandOLD c = {CMD_MIFARE_CIDENT, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
     SendCommand(&c);
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500))
diff --git a/client/scripting.c b/client/scripting.c
index cabda564e..fe3f1b58b 100644
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -12,7 +12,7 @@
 
 /**
  * The following params expected:
- *  UsbCommandOLD c
+ *  PacketCommandOLD c
  *@brief l_SendCommand
  * @param L
  * @return
@@ -29,19 +29,19 @@ static int l_SendCommand(lua_State *L) {
         uint8_t  asBytes[USB_CMD_DATA_SIZE]; // 1 byte * 512 = 512 bytes (OR)
         uint32_t asDwords[USB_CMD_DATA_SIZE/4]; // 4 byte * 128 = 512 bytes
       } d;
-    } PACKED UsbCommandOLD;
+    } PACKED PacketCommandOLD;
 
     ==> A 544 byte buffer will do.
     **/
     size_t size;
     const char *data = luaL_checklstring(L, 1, &size);
-    if (size != sizeof(UsbCommandOLD)) {
-        printf("Got data size %d, expected %d", (int) size, (int) sizeof(UsbCommandOLD));
+    if (size != sizeof(PacketCommandOLD)) {
+        printf("Got data size %d, expected %d", (int) size, (int) sizeof(PacketCommandOLD));
         lua_pushstring(L, "Wrong data size");
         return 1;
     }
 
-    SendCommand((UsbCommandOLD *)data);
+    SendCommand((PacketCommandOLD *)data);
     return 0; // no return values
 }
 
@@ -184,10 +184,10 @@ static int l_WaitForResponseTimeout(lua_State *L) {
         ms_timeout = luaL_checkunsigned(L, 2);
     }
 
-    UsbReplyNG resp;
+    PacketResponseNG resp;
     if (WaitForResponseTimeout(cmd, &resp, ms_timeout)) {
         //Push it as a string
-        lua_pushlstring(L, (const char *)&resp, sizeof(UsbReplyNG));
+        lua_pushlstring(L, (const char *)&resp, sizeof(PacketResponseNG));
         return 1;
     } else {
         //signal error by returning Nil, errorstring
@@ -262,7 +262,7 @@ static int l_foobar(lua_State *L) {
     printf("Arguments discarded, stack now contains %d elements", lua_gettop(L));
 
     // todo: this is not used, where was it intended for?
-    // UsbCommandOLD response =  {CMD_MIFARE_READBL, {1337, 1338, 1339}, {{0}}};
+    // PacketCommandOLD response =  {CMD_MIFARE_READBL, {1337, 1338, 1339}, {{0}}};
 
     printf("Now returning a uint64_t as a string");
     uint64_t x = 0xDEADC0DE;
diff --git a/client/snooper.c b/client/snooper.c
index 82de3824d..86ef8faba 100644
--- a/client/snooper.c
+++ b/client/snooper.c
@@ -26,7 +26,7 @@ int main() {
     while (1) {
         while (!OpenProxmark()) { sleep(1); }
         while (1) {
-            UsbCommandOLD cmdbuf;
+            PacketCommandOLD cmdbuf;
             CommandReceived("hf 14a sniff");
             HANDLE_ERROR;
             ReceiveCommand(&cmdbuf);
diff --git a/client/util.h b/client/util.h
index e482c8572..30077ec22 100644
--- a/client/util.h
+++ b/client/util.h
@@ -150,7 +150,7 @@
 
 #ifndef DropField
 #define DropField() { \
-        UsbCommandOLD c_drop = {CMD_READER_ISO_14443a, {0,0,0}, {{0}}}; clearCommandBuffer(); SendCommand(&c_drop); \
+        PacketCommandOLD c_drop = {CMD_READER_ISO_14443a, {0,0,0}, {{0}}}; clearCommandBuffer(); SendCommand(&c_drop); \
     }
 #endif
 
diff --git a/common/cmd.c b/common/cmd.c
index 7988088bd..6465f0beb 100644
--- a/common/cmd.c
+++ b/common/cmd.c
@@ -43,10 +43,10 @@ extern void Dbprintf(const char *fmt, ...);
         reply_via_fpc = true;}
 #endif
 
-uint8_t cmd_send(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len) {
-    UsbCommandOLD txcmd;
+uint8_t reply_old(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len) {
+    PacketResponseOLD txcmd;
 
-    for (size_t i = 0; i < sizeof(UsbCommandOLD); i++)
+    for (size_t i = 0; i < sizeof(PacketResponseOLD); i++)
         ((uint8_t *)&txcmd)[i] = 0x00;
 
     // Compose the outgoing command frame
@@ -68,20 +68,20 @@ uint8_t cmd_send(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void
 
 #ifdef WITH_FPC_HOST
     if (reply_via_fpc) {
-        sendlen = usart_writebuffer((uint8_t *)&txcmd, sizeof(UsbCommandOLD));
+        sendlen = usart_writebuffer((uint8_t *)&txcmd, sizeof(PacketResponseOLD));
 //        Dbprintf_usb("Sent %i bytes over usart", len);
     } else {
-        sendlen = usb_write((uint8_t *)&txcmd, sizeof(UsbCommandOLD));
+        sendlen = usb_write((uint8_t *)&txcmd, sizeof(PacketResponseOLD));
     }
 #else
-    sendlen = usb_write((uint8_t *)&txcmd, sizeof(UsbCommandOLD));
+    sendlen = usb_write((uint8_t *)&txcmd, sizeof(PacketResponseOLD));
 #endif
 
     return sendlen;
 }
 
 uint8_t reply_ng(uint16_t cmd, int16_t status, uint8_t *data, size_t len) {
-    UsbReplyNGRaw txBufferNG;
+    PacketResponseNGRaw txBufferNG;
     size_t txBufferNGLen;
 //    for (size_t i = 0; i < sizeof(txBufferNG); i++)
 //        ((uint8_t *)&txBufferNG)[i] = 0x00;
@@ -105,11 +105,11 @@ uint8_t reply_ng(uint16_t cmd, int16_t status, uint8_t *data, size_t len) {
     }
 
     uint8_t first, second;
-    compute_crc(CRC_14443_A, (uint8_t *)&txBufferNG, sizeof(UsbReplyNGPreamble) + len, &first, &second);
+    compute_crc(CRC_14443_A, (uint8_t *)&txBufferNG, sizeof(PacketResponseNGPreamble) + len, &first, &second);
 
-    UsbReplyNGPostamble *tx_post = (UsbReplyNGPostamble *)((uint8_t *)&txBufferNG + sizeof(UsbReplyNGPreamble) + len);
+    PacketResponseNGPostamble *tx_post = (PacketResponseNGPostamble *)((uint8_t *)&txBufferNG + sizeof(PacketResponseNGPreamble) + len);
     tx_post->crc = (first << 8) + second;
-    txBufferNGLen = sizeof(UsbReplyNGPreamble) + len + sizeof(UsbReplyNGPostamble);
+    txBufferNGLen = sizeof(PacketResponseNGPreamble) + len + sizeof(PacketResponseNGPostamble);
 
     uint32_t sendlen = 0;
     // Send frame and make sure all bytes are transmitted
@@ -128,10 +128,10 @@ uint8_t reply_ng(uint16_t cmd, int16_t status, uint8_t *data, size_t len) {
     return sendlen;
 }
 
-int16_t receive_ng(UsbCommandNG *rx) {
-    UsbCommandNGRaw rx_raw;
-    size_t bytes = usb_read_ng((uint8_t *)&rx_raw.pre, sizeof(UsbCommandNGPreamble));
-    if (bytes != sizeof(UsbCommandNGPreamble))
+int16_t receive_ng(PacketCommandNG *rx) {
+    PacketCommandNGRaw rx_raw;
+    size_t bytes = usb_read_ng((uint8_t *)&rx_raw.pre, sizeof(PacketCommandNGPreamble));
+    if (bytes != sizeof(PacketCommandNGPreamble))
         return PM3_EIO;
     rx->magic = rx_raw.pre.magic;
     rx->length = rx_raw.pre.length;
@@ -145,13 +145,13 @@ int16_t receive_ng(UsbCommandNG *rx) {
             return PM3_EIO;
         memcpy(rx->data.asBytes, rx_raw.data, rx->length);
         // Get the postamble
-        bytes = usb_read_ng((uint8_t *)&rx_raw.foopost, sizeof(UsbCommandNGPostamble));
-        if (bytes != sizeof(UsbCommandNGPostamble))
+        bytes = usb_read_ng((uint8_t *)&rx_raw.foopost, sizeof(PacketCommandNGPostamble));
+        if (bytes != sizeof(PacketCommandNGPostamble))
             return PM3_EIO;
         // Check CRC
         rx->crc = rx_raw.foopost.crc;
         uint8_t first, second;
-        compute_crc(CRC_14443_A, (uint8_t *)&rx_raw, sizeof(UsbCommandNGPreamble) + rx->length, &first, &second);
+        compute_crc(CRC_14443_A, (uint8_t *)&rx_raw, sizeof(PacketCommandNGPreamble) + rx->length, &first, &second);
         if ((first << 8) + second != rx->crc)
             return PM3_EIO;
 #ifdef WITH_FPC_HOST
@@ -159,10 +159,10 @@ int16_t receive_ng(UsbCommandNG *rx) {
 #endif
         rx->ng = true;
     } else {                               // Old style command
-        UsbCommandOLD rx_old;
-        memcpy(&rx_old, &rx_raw.pre, sizeof(UsbCommandNGPreamble));
-        bytes = usb_read_ng(((uint8_t *)&rx_old) + sizeof(UsbCommandNGPreamble), sizeof(UsbCommandOLD) - sizeof(UsbCommandNGPreamble));
-        if (bytes != sizeof(UsbCommandOLD) - sizeof(UsbCommandNGPreamble))
+        PacketCommandOLD rx_old;
+        memcpy(&rx_old, &rx_raw.pre, sizeof(PacketCommandNGPreamble));
+        bytes = usb_read_ng(((uint8_t *)&rx_old) + sizeof(PacketCommandNGPreamble), sizeof(PacketCommandOLD) - sizeof(PacketCommandNGPreamble));
+        if (bytes != sizeof(PacketCommandOLD) - sizeof(PacketCommandNGPreamble))
             return PM3_EIO;
 #ifdef WITH_FPC_HOST
         reply_via_fpc = false;
diff --git a/common/cmd.h b/common/cmd.h
index f7dc52e7b..a03a8e3f7 100644
--- a/common/cmd.h
+++ b/common/cmd.h
@@ -39,9 +39,9 @@
 #include "usart.h"
 #include "proxmark3.h"
 
-uint8_t cmd_send(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
+uint8_t reply_old(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
 uint8_t reply_ng(uint16_t cmd, int16_t status, uint8_t *data, size_t len);
-int16_t receive_ng(UsbCommandNG *rx);
+int16_t receive_ng(PacketCommandNG *rx);
 
 #endif // _PROXMARK_CMD_H_
 
diff --git a/common/i2c.c b/common/i2c.c
index 4ff9ecf14..e027fe387 100644
--- a/common/i2c.c
+++ b/common/i2c.c
@@ -691,7 +691,7 @@ void SmartCardAtr(void) {
     set_tracing(true);
     I2C_Reset_EnterMainProgram();
     bool isOK = GetATR(&card);
-    cmd_send(CMD_ACK, isOK, sizeof(smart_card_atr_t), 0, &card, sizeof(smart_card_atr_t));
+    reply_old(CMD_ACK, isOK, sizeof(smart_card_atr_t), 0, &card, sizeof(smart_card_atr_t));
     set_tracing(false);
     LEDsoff();
 }
@@ -716,7 +716,7 @@ void SmartCardRaw(uint64_t arg0, uint64_t arg1, uint8_t *data) {
         if ((flags & SC_SELECT)) {
             smart_card_atr_t card;
             bool gotATR = GetATR(&card);
-            //cmd_send(CMD_ACK, gotATR, sizeof(smart_card_atr_t), 0, &card, sizeof(smart_card_atr_t));
+            //reply_old(CMD_ACK, gotATR, sizeof(smart_card_atr_t), 0, &card, sizeof(smart_card_atr_t));
             if (!gotATR)
                 goto OUT;
         }
@@ -742,7 +742,7 @@ void SmartCardRaw(uint64_t arg0, uint64_t arg1, uint8_t *data) {
         }
     }
 OUT:
-    cmd_send(CMD_ACK, len, 0, 0, resp, len);
+    reply_old(CMD_ACK, len, 0, 0, resp, len);
     BigBuf_free();
     set_tracing(false);
     LEDsoff();
@@ -801,7 +801,7 @@ void SmartCardUpgrade(uint64_t arg0) {
         length -= size;
         pos += size;
     }
-    cmd_send(CMD_ACK, isOK, pos, 0, 0, 0);
+    reply_old(CMD_ACK, isOK, pos, 0, 0, 0);
     LED_C_OFF();
     BigBuf_free();
 }
@@ -818,7 +818,7 @@ void SmartCardSetClock(uint64_t arg0) {
     // start [C0 05 xx] stop
     I2C_WriteByte(arg0, I2C_DEVICE_CMD_SIM_CLC, I2C_DEVICE_ADDRESS_MAIN);
 
-    cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
+    reply_old(CMD_ACK, 1, 0, 0, 0, 0);
     set_tracing(false);
     LEDsoff();
 }
diff --git a/common/usart.c b/common/usart.c
index 2cabbb470..9ac1b2c8d 100644
--- a/common/usart.c
+++ b/common/usart.c
@@ -38,8 +38,8 @@ void usart_close(void) {
 }
 */
 
-static uint8_t us_inbuf[sizeof(UsbCommandOLD)];
-static uint8_t us_outbuf[sizeof(UsbCommandOLD)];
+static uint8_t us_inbuf[sizeof(PacketCommandOLD)];
+static uint8_t us_outbuf[sizeof(PacketResponseOLD)];
 /*
 // transfer from client to device
 inline int16_t usart_readbuffer(uint8_t *data) {
@@ -63,7 +63,7 @@ inline int16_t usart_readbuffer(uint8_t *data) {
     // Check if the first PDC bank is free
     if (pUS1->US_RCR == 0) {
         pUS1->US_RPR = (uint32_t)data;
-        pUS1->US_RCR = sizeof(UsbCommandOLD);
+        pUS1->US_RCR = sizeof(PacketCommandOLD);
         pUS1->US_PTCR = AT91C_PDC_RXTEN | AT91C_PDC_TXTEN;
         check = 0;
         return 2;
diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index a460dd980..ba6e320f0 100644
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -33,19 +33,19 @@ typedef struct {
         uint8_t  asBytes[USB_CMD_DATA_SIZE];
         uint32_t asDwords[USB_CMD_DATA_SIZE / 4];
     } d;
-} PACKED UsbCommandOLD;
+} PACKED PacketCommandOLD;
 
 typedef struct {
     uint32_t magic;
     uint16_t length;  // length of the variable part, 0 if none.
     uint16_t cmd;
-} PACKED UsbCommandNGPreamble;
+} PACKED PacketCommandNGPreamble;
 
 #define USB_COMMANDNG_PREAMBLE_MAGIC 0x61334d50 // PM3a
 
 typedef struct {
     uint16_t crc;
-} PACKED UsbCommandNGPostamble;
+} PACKED PacketCommandNGPostamble;
 
 // For internal usage
 typedef struct {
@@ -59,27 +59,36 @@ typedef struct {
         uint32_t asDwords[USB_CMD_DATA_SIZE / 4];
     } data;
     bool ng;             // does it store NG data or OLD data?
-} PACKED UsbCommandNG;
+} PACKED PacketCommandNG;
 
 // For reception and CRC check
 typedef struct {
-    UsbCommandNGPreamble pre;
+    PacketCommandNGPreamble pre;
     uint8_t data[USB_CMD_DATA_SIZE];
-    UsbCommandNGPostamble foopost; // Probably not at that offset!
-} PACKED UsbCommandNGRaw;
+    PacketCommandNGPostamble foopost; // Probably not at that offset!
+} PACKED PacketCommandNGRaw;
+
+typedef struct {
+    uint64_t cmd;
+    uint64_t arg[3];
+    union {
+        uint8_t  asBytes[USB_CMD_DATA_SIZE];
+        uint32_t asDwords[USB_CMD_DATA_SIZE / 4];
+    } d;
+} PACKED PacketResponseOLD;
 
 typedef struct {
     uint32_t magic;
     uint16_t length;  // length of the variable part, 0 if none.
     int16_t  status;
     uint16_t cmd;
-} PACKED UsbReplyNGPreamble;
+} PACKED PacketResponseNGPreamble;
 
 #define USB_REPLYNG_PREAMBLE_MAGIC 0x62334d50 // PM3b
 
 typedef struct {
     uint16_t crc;
-} PACKED UsbReplyNGPostamble;
+} PACKED PacketResponseNGPostamble;
 
 // For internal usage
 typedef struct {
@@ -94,14 +103,14 @@ typedef struct {
         uint32_t asDwords[USB_CMD_DATA_SIZE / 4];
     } data;
     bool ng;             // does it store NG data or OLD data?
-} PACKED UsbReplyNG;
+} PACKED PacketResponseNG;
 
 // For reception and CRC check
 typedef struct {
-    UsbReplyNGPreamble pre;
+    PacketResponseNGPreamble pre;
     uint8_t data[USB_CMD_DATA_SIZE];
-    UsbReplyNGPostamble foopost; // Probably not at that offset!
-} PACKED UsbReplyNGRaw;
+    PacketResponseNGPostamble foopost; // Probably not at that offset!
+} PACKED PacketResponseNGRaw;
 
 #ifdef WITH_FPC_HOST
 // "Session" flag, to tell via which interface next msgs should be sent: USB or FPC USART

From 960b21793c1647a9d67b23b67deef992e967a8ab Mon Sep 17 00:00:00 2001
From: Eloff <eloff@mail.ru>
Date: Thu, 18 Apr 2019 21:02:48 +0300
Subject: [PATCH 1333/1938] 'hf mf sim' full-byte anti-collision frame support

---
 CHANGELOG.md        |   1 +
 armsrc/appmain.c    |   2 +-
 armsrc/mifaresim.c  | 298 ++++++++++++++++++++------------------------
 armsrc/mifareutil.h |  18 ++-
 client/cmdhflist.c  |  30 ++++-
 client/cmdhfmf.c    |   2 +-
 6 files changed, 170 insertions(+), 181 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b768a5cd7..5a9d1f9ec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [unreleased][unreleased]
+ - Add 'hf mf sim' full-byte split anticollision support (@mceloff)
  - Fix/Add 'hf mf sim' bugs fix, RATS support, etc (@mceloff)
  - Fix serial of FPC. (@ryan)
  - Fix 'data shiftgraphzero' corrupting end of GraphBuffer (@doegox)
diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 489de0731..e7887b9af 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -376,7 +376,7 @@ void printUSBSpeed(void) {
     uint32_t bytes_transferred = 0;
 
     LED_B_ON();
-    
+
     while (end_time < start_time + USB_SPEED_TEST_MIN_TIME) {
         cmd_send(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K, 0, USB_CMD_DATA_SIZE, 0, test_data, USB_CMD_DATA_SIZE);
         end_time = GetTickCount();
diff --git a/armsrc/mifaresim.c b/armsrc/mifaresim.c
index 2ab779a2a..433930c71 100644
--- a/armsrc/mifaresim.c
+++ b/armsrc/mifaresim.c
@@ -164,9 +164,21 @@ static bool MifareSimInit(uint16_t flags, uint8_t *datain, tag_response_info_t *
     static uint8_t rSAK_2k   = 0x08;	// mifare 2k with RATS support
     static uint8_t rSAK_4k   = 0x18;	// mifare 4k
 
-    static uint8_t rUIDBCC1[]  = {0x00, 0x00, 0x00, 0x00, 0x00};	// UID 1st cascade level
-    static uint8_t rUIDBCC2[]  = {0x00, 0x00, 0x00, 0x00, 0x00};	// UID 2nd cascade level
-    static uint8_t rUIDBCC3[]  = {0x00, 0x00, 0x00, 0x00, 0x00};	// UID 3nd cascade level
+    static uint8_t rUIDBCC1[]   = {0x00, 0x00, 0x00, 0x00, 0x00};	// UID 1st cascade level
+    static uint8_t rUIDBCC1b4[] = {0x00, 0x00, 0x00, 0x00};	        // UID 1st cascade level, last 4 bytes
+    static uint8_t rUIDBCC1b3[] = {0x00, 0x00, 0x00};	            // UID 1st cascade level, last 3 bytes
+    static uint8_t rUIDBCC1b2[] = {0x00, 0x00};	                    // UID 1st cascade level, last 2 bytes
+    static uint8_t rUIDBCC1b1[] = {0x00};	                        // UID 1st cascade level, last byte
+    static uint8_t rUIDBCC2[]   = {0x00, 0x00, 0x00, 0x00, 0x00};	// UID 2nd cascade level
+    static uint8_t rUIDBCC2b4[] = {0x00, 0x00, 0x00, 0x00};	        // UID 2st cascade level, last 4 bytes
+    static uint8_t rUIDBCC2b3[] = {0x00, 0x00, 0x00};	            // UID 2st cascade level, last 3 bytes
+    static uint8_t rUIDBCC2b2[] = {0x00, 0x00};	                    // UID 2st cascade level, last 2 bytes
+    static uint8_t rUIDBCC2b1[] = {0x00};	                        // UID 2st cascade level, last byte
+    static uint8_t rUIDBCC3[]   = {0x00, 0x00, 0x00, 0x00, 0x00};	// UID 3nd cascade level
+    static uint8_t rUIDBCC3b4[] = {0x00, 0x00, 0x00, 0x00};	        // UID 3st cascade level, last 4 bytes
+    static uint8_t rUIDBCC3b3[] = {0x00, 0x00, 0x00};	            // UID 3st cascade level, last 3 bytes
+    static uint8_t rUIDBCC3b2[] = {0x00, 0x00};	                    // UID 3st cascade level, last 2 bytes
+    static uint8_t rUIDBCC3b1[] = {0x00};	                        // UID 3st cascade level, last byte
 
     static uint8_t rATQA[]     = {0x00, 0x00};             // Current ATQA
     static uint8_t rSAK[]      = {0x00, 0x00, 0x00};       // Current SAK, CRC
@@ -312,25 +324,58 @@ static bool MifareSimInit(uint16_t flags, uint8_t *datain, tag_response_info_t *
         return false;
     }
 
+    // clone UIDs for byte-frame anti-collision multiple tag selection procedure
+    memcpy(rUIDBCC1b4, &rUIDBCC1[1], 4);
+    memcpy(rUIDBCC1b3, &rUIDBCC1[2], 3);
+    memcpy(rUIDBCC1b2, &rUIDBCC1[3], 2);
+    memcpy(rUIDBCC1b1, &rUIDBCC1[4], 1);
+    if (*uid_len >= 7) {
+        memcpy(rUIDBCC2b4, &rUIDBCC2[1], 4);
+        memcpy(rUIDBCC2b3, &rUIDBCC2[2], 3);
+        memcpy(rUIDBCC2b2, &rUIDBCC2[3], 2);
+        memcpy(rUIDBCC2b1, &rUIDBCC2[4], 1);
+    }
+    if (*uid_len == 10) {
+        memcpy(rUIDBCC3b4, &rUIDBCC3[1], 4);
+        memcpy(rUIDBCC3b3, &rUIDBCC3[2], 3);
+        memcpy(rUIDBCC3b2, &rUIDBCC3[3], 2);
+        memcpy(rUIDBCC3b1, &rUIDBCC3[4], 1);
+    }
+
     // Calculate actual CRC
     AddCrc14A(rSAK, sizeof(rSAK) - 2);
 
-#define TAG_RESPONSE_COUNT 6
+#define TAG_RESPONSE_COUNT 18
     static tag_response_info_t responses_init[TAG_RESPONSE_COUNT] = {
         { .response = rATQA,     .response_n = sizeof(rATQA)     },		// Answer to request - respond with card type
-        { .response = rUIDBCC1,  .response_n = sizeof(rUIDBCC1)  },	  	// Anticollision cascade1 - respond with first part of uid
-        { .response = rUIDBCC2,  .response_n = sizeof(rUIDBCC2)  },		// Anticollision cascade2 - respond with 2nd part of uid
-        { .response = rUIDBCC3,  .response_n = sizeof(rUIDBCC3)  },		// Anticollision cascade3 - respond with 3th part of uid
         { .response = rSAK,      .response_n = sizeof(rSAK)      },     //
-        { .response = rSAKuid,   .response_n = sizeof(rSAKuid)   }	    //
+        { .response = rSAKuid,   .response_n = sizeof(rSAKuid)   },	    //
+        // Do not reorder. Block used via relative index of rUIDBCC1
+        { .response = rUIDBCC1,  .response_n = sizeof(rUIDBCC1)  },	  	// Anticollision cascade1 - respond with first part of uid
+        { .response = rUIDBCC1b4, .response_n = sizeof(rUIDBCC1b4)},
+        { .response = rUIDBCC1b3, .response_n = sizeof(rUIDBCC1b3)},
+        { .response = rUIDBCC1b2, .response_n = sizeof(rUIDBCC1b2)},
+        { .response = rUIDBCC1b1, .response_n = sizeof(rUIDBCC1b1)},
+        // Do not reorder. Block used via relative index of rUIDBCC2
+        { .response = rUIDBCC2,  .response_n = sizeof(rUIDBCC2)  },		// Anticollision cascade2 - respond with 2nd part of uid
+        { .response = rUIDBCC2b4, .response_n = sizeof(rUIDBCC2b4)},
+        { .response = rUIDBCC2b3, .response_n = sizeof(rUIDBCC2b3)},
+        { .response = rUIDBCC2b2, .response_n = sizeof(rUIDBCC2b2)},
+        { .response = rUIDBCC2b1, .response_n = sizeof(rUIDBCC2b1)},
+        // Do not reorder. Block used via relative index of rUIDBCC3
+        { .response = rUIDBCC3,  .response_n = sizeof(rUIDBCC3)  },		// Anticollision cascade3 - respond with 3th part of uid
+        { .response = rUIDBCC3b4, .response_n = sizeof(rUIDBCC3b4)},
+        { .response = rUIDBCC3b3, .response_n = sizeof(rUIDBCC3b3)},
+        { .response = rUIDBCC3b2, .response_n = sizeof(rUIDBCC3b2)},
+        { .response = rUIDBCC3b1, .response_n = sizeof(rUIDBCC3b1)}
     };
 
     // Prepare ("precompile") the responses of the anticollision phase.
     // There will be not enough time to do this at the moment the reader sends its REQA or SELECT
-    // There are 6 predefined responses with a total of 23 bytes data to transmit.
+    // There are 18 predefined responses with a total of 53 bytes data to transmit.
     // Coded responses need one byte per bit to transfer (data, parity, start, stop, correction)
-    // 23 * 8 data bits, 23 * 1 parity bits, 6 start bits, 6 stop bits, 6 correction bits  ->   need 225 bytes buffer
-#define ALLOCATED_TAG_MODULATION_BUFFER_SIZE 225
+    // 53 * 8 data bits, 53 * 1 parity bits, 18 start bits, 18 stop bits, 18 correction bits  ->   need 571 bytes buffer
+#define ALLOCATED_TAG_MODULATION_BUFFER_SIZE 571
 
     uint8_t *free_buffer = BigBuf_malloc(ALLOCATED_TAG_MODULATION_BUFFER_SIZE);
     // modulation buffer pointer and current buffer free space size
@@ -348,11 +393,11 @@ static bool MifareSimInit(uint16_t flags, uint8_t *datain, tag_response_info_t *
 
     // indices into responses array:
 #define ATQA     0
-#define UIDBCC1  1
-#define UIDBCC2  2
-#define UIDBCC3  3
-#define SAK      4
-#define SAKuid   5
+#define SAK      1
+#define SAKuid   2
+#define UIDBCC1  3
+#define UIDBCC2  8
+#define UIDBCC3  13
 
     return true;
 }
@@ -501,7 +546,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
 
             LED_B_OFF();
             LED_C_OFF();
-            cardSTATE = MFEMUL_SELECT1;
+            cardSTATE = MFEMUL_SELECT;
             continue;
         }
 
@@ -519,163 +564,86 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
             // The anti-collision sequence, which is a mandatory part of the card activation sequence.
             // It auto with 4-byte UID (= Single Size UID),
             // 7 -byte UID (= Double Size UID) or 10-byte UID (= Triple Size UID).
-
-            // Cascade Level 1
+            // For details see chapter 2 of AN10927.pdf
             //
-            // In the Cascade Level 1, the card send the anti-collision command CL1 (0x93) and the PICC returns
-            // either the 4-byte UID (UID0...UID4) and one-byte BCC
-            // or a Cascade Tag (CT) followed by the first 3 byte of the UID (UID0...UID2) and onebyte BCC.
-            //
-            // The CT (0x88) indicates that the UID is not yet complete, and another Cascade Level is needed
-            //
-            // The UID0 byte of a 4-byte UID must not be 0x88.
-            // The CL1 then must be selected, using the Select command CL1 (0x93). The PICC returns its SAK CL1, which indicates
-            // whether the UID is complete or not, and (if so),
-            // the type of card and whether the card supports T=CL.
-
-            case MFEMUL_SELECT1: {
-                // select all - 0x93 0x20 (Anti Collision CL1)
-                if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("cardSTATE = MFEMUL_SELECT1 - receivedCmd_len: %d - receivedCmd[0]: %02x - receivedCmd[1]: %02x", receivedCmd_len, receivedCmd[0], receivedCmd[1]);
-                if (receivedCmd_len == 2 && (receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT && receivedCmd[1] == 0x20)) {
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("SELECT ALL CL1 received - EmSendPrecompiledCmd(%02x)", &responses[UIDBCC1]);
-                    EmSendPrecompiledCmd(&responses[UIDBCC1]);
-                    break;
-                }
-
-                // select card - 0x93 0x70 (Select CL1)
-                if (receivedCmd_len == 9 &&
-                        (receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT &&
-                         receivedCmd[1] == 0x70 &&
-                         memcmp(&receivedCmd[2], responses[UIDBCC1].response, 4) == 0)) {
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("SELECT CL1 %02x%02x%02x%02x received", receivedCmd[2], receivedCmd[3], receivedCmd[4], receivedCmd[5]);
-
-                    // Send SAK according UID len
-                    switch (uid_len) {
-                        case 4:
-                            // UID completed
-                            EmSendPrecompiledCmd(&responses[SAK]);
-                            LED_B_ON();
-                            cardSTATE = MFEMUL_WORK;
-                            if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_SELECT1] cardSTATE = MFEMUL_WORK");
+            // This case is used for all Cascade Levels, because:
+            // 1) Any devices (under Android for example) after full select procedure completed,
+            //    when UID is known, uses "fast-selection" method. In this case reader ignores
+            //    first cascades and tries to select tag by last bytes of UID of last cascade
+            // 2) Any readers (like ACR122U) uses bit oriented anti-collision frames during selectin,
+            //    same as multiple tags. For details see chapter 6.1.5.3 of ISO/IEC 14443-3
+            case MFEMUL_SELECT: {
+                int uid_index = -1;
+                // Extract cascade level
+                if (receivedCmd_len >= 2) {
+                    switch (receivedCmd[0]) {
+                        case ISO14443A_CMD_ANTICOLL_OR_SELECT:
+                            uid_index = UIDBCC1;
                             break;
-                        case 7:
-                            // SAK => Need another select round
-                            EmSendPrecompiledCmd(&responses[SAKuid]);
-                            cardSTATE	= MFEMUL_SELECT2;
-                            if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_SELECT1] cardSTATE = MFEMUL_SELECT2");
+                        case ISO14443A_CMD_ANTICOLL_OR_SELECT_2:
+                            uid_index = UIDBCC2;
                             break;
-                        case 10:
-                            // SAK => Need another select round
-                            EmSendPrecompiledCmd(&responses[SAKuid]);
-                            cardSTATE	= MFEMUL_SELECT2;
-                            if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_SELECT1] cardSTATE = MFEMUL_SELECT2");
-                            break;
-                        default:
-                            break;
-                    } // End Switch (uid_len)
-
-                } else {
-                    // IDLE
-                    cardSTATE_TO_IDLE();
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_SELECT1] cardSTATE = MFEMUL_IDLE");
-                }
-                // Break Case MFEMUL_SELECT1
-                break;
-            }
-
-
-            // Cascade Level 2
-            //
-            // If the UID is not yet complete, the PCD continues with an anti-collision CL2 command (0x95),
-            // and the PICC returns
-            // • either the last 4 bytes of the Double Size UID (UID3...UID6) and one-byte BCC,
-            // • or a Cascade Tag (CT) followed by the next 3 bytes of the Triple Size UID (UID3...UID5) and one-byte BCC.
-            // The CT (0x88) indicates that the UID is not yet complete, and another Cascade Level  has to follow.
-            //
-            // The UID3 byte of a 7 byte or 10-byte UID must not be 0x88
-            // The CL2 then must be selected, using the Select command CL2 (0x95).
-            // The PICC returns its SAK CL2, which indicates
-            // whether the UID is complete or not, and (if so),
-            // the type of card and whether the card supports T=CL.
-
-            // select all cl2 - 0x95 0x20
-
-            case MFEMUL_SELECT2: {
-                if (receivedCmd_len == 2 &&
-                        (receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2 && receivedCmd[1] == 0x20)) {
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("[MFEMUL_SELECT2] SELECT ALL CL2 received");
-                    EmSendPrecompiledCmd(&responses[UIDBCC2]);
-                    break;
-                }
-
-                // select cl2 card - 0x95 0x70 xxxxxxxxxxxx
-                if (receivedCmd_len == 9 &&
-                        (receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2 &&
-                         receivedCmd[1] == 0x70 &&
-                         memcmp(&receivedCmd[2], responses[UIDBCC2].response, 4) == 0)) {
-
-                    switch (uid_len) {
-                        case 7:
-                            if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_SELECT2] SELECT CL2 %02x%02x%02x%02x received", receivedCmd[2], receivedCmd[3], receivedCmd[4], receivedCmd[5]);
-                            // UID completed
-                            EmSendPrecompiledCmd(&responses[SAK]);
-                            cardSTATE = MFEMUL_WORK;
-                            LED_B_ON();
-                            break;
-                        case 10:
-                            // SAK => Need another select round
-                            EmSendPrecompiledCmd(&responses[SAKuid]);
-                            cardSTATE = MFEMUL_SELECT3;
-                            if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_SELECT2] cardSTATE = MFEMUL_SELECT3");
-                        default:
+                        case ISO14443A_CMD_ANTICOLL_OR_SELECT_3:
+                            uid_index = UIDBCC3;
                             break;
                     }
-
-                } else {
-                    // IDLE
-                    cardSTATE_TO_IDLE();
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_SELECT2] cardSTATE = MFEMUL_IDLE");
                 }
-                // Break Case MFEMUL_SELECT2
-                break;
-            }
-
-
-            // Cascade Level 3
-            // Select command CL3 (0x97)
-            //
-            // If the UID is not yet complete, the PCD continues with an anti-collision CL3 command (0x97)
-            // and the PICC returns the last 4 bytes of the Triple Size UID (UID6...UID9) and one-byte BCC.
-            // The PICC returns its SAK CL3, which indicates the type of card and whether the card supports T=CL
-
-            case MFEMUL_SELECT3: {
-                if (!uid_len) {
+                if (uid_index < 0) {
                     LogTrace(uart->output, uart->len, uart->startTime * 16 - DELAY_AIR2ARM_AS_TAG, uart->endTime * 16 - DELAY_AIR2ARM_AS_TAG, uart->parity, true);
-                    break;
-                }
-                if (receivedCmd_len == 2 && (receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_3 && receivedCmd[1] == 0x20)) {
-                    EmSendPrecompiledCmd(&responses[UIDBCC3]);
-                    break;
-                }
-                if (receivedCmd_len == 9 &&
-                        (receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_3 &&
-                         receivedCmd[1] == 0x70 &&
-                         memcmp(&receivedCmd[2], responses[UIDBCC3].response, 4) == 0)) {
-                    // UID completed
-                    EmSendPrecompiledCmd(&responses[SAK]);
-                    cardSTATE = MFEMUL_WORK;
-                    LED_B_ON();
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
-                        Dbprintf("[MFEMUL_SELECT3] --> WORK. anticol3 time: %d", GetTickCount() - selTimer);
-                        Dbprintf("[MFEMUL_SELECT3] cardSTATE = MFEMUL_WORK");
-                    }
-                    continue;
-                } else {
-                    // IDLE
                     cardSTATE_TO_IDLE();
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_SELECT3] cardSTATE = MFEMUL_IDLE");
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_SELECT] Incorrect cascade level received");
+                    break;
                 }
-                // Break Case MFEMUL_SELECT3
+
+                // Incoming SELECT ALL for any cascade level
+                if (receivedCmd_len == 2 && receivedCmd[1] == 0x20) {
+                    EmSendPrecompiledCmd(&responses[uid_index]);
+                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("SELECT ALL - EmSendPrecompiledCmd(%02x)", &responses[uid_index]);
+                    break;
+                }
+
+                // Incoming SELECT CLx for any cascade level
+                if (receivedCmd_len == 9 && receivedCmd[1] == 0x70) {
+                    if (memcmp(&receivedCmd[2], responses[uid_index].response, 4) == 0) {
+                        bool finished = (uid_len == 4  && uid_index == UIDBCC1) ||
+                                        (uid_len == 7  && uid_index == UIDBCC2) ||
+                                        (uid_len == 10 && uid_index == UIDBCC3);
+                        EmSendPrecompiledCmd(&responses[finished ? SAK : SAKuid]);
+                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("SELECT CLx %02x%02x%02x%02x received", receivedCmd[2], receivedCmd[3], receivedCmd[4], receivedCmd[5]);
+                        if (finished) {
+                            LED_B_ON();
+                            cardSTATE = MFEMUL_WORK;
+                            if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_SELECT] cardSTATE = MFEMUL_WORK");
+                        }
+                    } else {
+                        // IDLE, not our UID
+                        LogTrace(uart->output, uart->len, uart->startTime * 16 - DELAY_AIR2ARM_AS_TAG, uart->endTime * 16 - DELAY_AIR2ARM_AS_TAG, uart->parity, true);
+                        cardSTATE_TO_IDLE();
+                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_SELECT] cardSTATE = MFEMUL_IDLE");
+                    }
+                    break;
+                }
+
+                // Incoming anti-collision frame
+                if (receivedCmd_len >= 2 && receivedCmd_len <= 6 && receivedCmd[1] == 0x50) {
+                    // we can process only full-byte frame anti-collision procedure
+                    if (memcmp(&receivedCmd[2], responses[uid_index].response, receivedCmd_len - 2) == 0) {
+                        // response missing part of UID via relative array index
+                        EmSendPrecompiledCmd(&responses[uid_index + receivedCmd_len - 2]);
+                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("SELECT ANTICOLLISION - EmSendPrecompiledCmd(%02x)", &responses[uid_index]);
+                    } else {
+                        // IDLE, not our UID or split-byte frame anti-collision (not supports)
+                        LogTrace(uart->output, uart->len, uart->startTime * 16 - DELAY_AIR2ARM_AS_TAG, uart->endTime * 16 - DELAY_AIR2ARM_AS_TAG, uart->parity, true);
+                        cardSTATE_TO_IDLE();
+                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_SELECT] cardSTATE = MFEMUL_IDLE");
+                    }
+                    break;
+                }
+
+                // Unknown selection procedure
+                LogTrace(uart->output, uart->len, uart->startTime * 16 - DELAY_AIR2ARM_AS_TAG, uart->endTime * 16 - DELAY_AIR2ARM_AS_TAG, uart->parity, true);
+                cardSTATE_TO_IDLE();
+                if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_SELECT] Unknown selection procedure");
                 break;
             }
 
diff --git a/armsrc/mifareutil.h b/armsrc/mifareutil.h
index 46f6fa81a..110f41eaa 100644
--- a/armsrc/mifareutil.h
+++ b/armsrc/mifareutil.h
@@ -48,16 +48,14 @@
 //mifare emulator states
 #define MFEMUL_NOFIELD      0
 #define MFEMUL_IDLE         1
-#define MFEMUL_SELECT1      2
-#define MFEMUL_SELECT2      3
-#define MFEMUL_SELECT3      4
-#define MFEMUL_AUTH1        5
-#define MFEMUL_WORK         7
-#define MFEMUL_WRITEBL2     8
-#define MFEMUL_INTREG_INC   9
-#define MFEMUL_INTREG_DEC   10
-#define MFEMUL_INTREG_REST  11
-#define MFEMUL_HALTED       12
+#define MFEMUL_SELECT       2
+#define MFEMUL_AUTH1        3
+#define MFEMUL_WORK         4
+#define MFEMUL_WRITEBL2     5
+#define MFEMUL_INTREG_INC   6
+#define MFEMUL_INTREG_DEC   7
+#define MFEMUL_INTREG_REST  8
+#define MFEMUL_HALTED       9
 
 #define cardSTATE_TO_IDLE() cardSTATE = MFEMUL_IDLE; LED_B_OFF(); LED_C_OFF();
 
diff --git a/client/cmdhflist.c b/client/cmdhflist.c
index fa8fd8857..9b49f4d92 100644
--- a/client/cmdhflist.c
+++ b/client/cmdhflist.c
@@ -45,6 +45,10 @@ void ClearAuthData() {
 uint8_t iso14443A_CRC_check(bool isResponse, uint8_t *d, uint8_t n) {
     if (n < 3) return 2;
     if (isResponse && (n < 6)) return 2;
+    if (n > 2 && d[1] == 0x50 &&
+            d[0] >= ISO14443A_CMD_ANTICOLL_OR_SELECT &&
+            d[0] <= ISO14443A_CMD_ANTICOLL_OR_SELECT_3)
+        return 2;
     return check_crc(CRC_14443_A, d, n);
 }
 
@@ -143,20 +147,38 @@ int applyIso14443a(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize) {
             break;
         case ISO14443A_CMD_ANTICOLL_OR_SELECT: {
             // 93 20 = Anticollision (usage: 9320 - answer: 4bytes UID+1byte UID-bytes-xor)
-            // 93 70 = Select (usage: 9370+5bytes 9320 answer - answer: 1byte SAK)
+            // 93 50 = Bit oriented anti-collision (usage: 9350+ up to 5bytes, 9350 answer - up to 5bytes UID+BCC)
+            // 93 70 = Select (usage: 9370+5bytes 9370 answer - answer: 1byte SAK)
             if (cmd[1] == 0x70)
                 snprintf(exp, size, "SELECT_UID");
-            else
+            else if (cmd[1] == 0x20 || cmd[1] == 0x50)
                 snprintf(exp, size, "ANTICOLL");
+            else
+                snprintf(exp, size, "SELECT_XXX");
             break;
         }
         case ISO14443A_CMD_ANTICOLL_OR_SELECT_2: {
             //95 20 = Anticollision of cascade level2
+            //95 50 = Bit oriented anti-collision level2
             //95 70 = Select of cascade level2
-            if (cmd[2] == 0x70)
+            if (cmd[1] == 0x70)
                 snprintf(exp, size, "SELECT_UID-2");
-            else
+            else if (cmd[1] == 0x20 || cmd[1] == 0x50)
                 snprintf(exp, size, "ANTICOLL-2");
+            else
+                snprintf(exp, size, "SELECT_XXX-2");
+            break;
+        }
+        case ISO14443A_CMD_ANTICOLL_OR_SELECT_3: {
+            //97 20 = Anticollision of cascade level3
+            //97 50 = Bit oriented anti-collision level3
+            //97 70 = Select of cascade level3
+            if (cmd[1] == 0x70)
+                snprintf(exp, size, "SELECT_UID-2");
+            else if (cmd[1] == 0x20 || cmd[1] == 0x50)
+                snprintf(exp, size, "ANTICOLL-3");
+            else
+                snprintf(exp, size, "SELECT_XXX-3");
             break;
         }
         case ISO14443A_CMD_REQA:
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 117b332bc..a64c40fe1 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -71,7 +71,7 @@ static int usage_hf14_mfsim(void) {
     PrintAndLogEx(NORMAL, "      u    (Optional) UID 4,7 or 10bytes. If not specified, the UID 4b from emulator memory will be used");
     PrintAndLogEx(NORMAL, "      t    (Optional)   0 = MIFARE Mini");
     PrintAndLogEx(NORMAL, "                        1 = MIFARE Classic 1k (Default)");
-    PrintAndLogEx(NORMAL, "                        1 = MIFARE Classic 2k plus in SL0 mode");
+    PrintAndLogEx(NORMAL, "                        2 = MIFARE Classic 2k plus in SL0 mode");
     PrintAndLogEx(NORMAL, "                        4 = MIFARE Classic 4k");
     PrintAndLogEx(NORMAL, "      n    (Optional) Automatically exit simulation after <numreads> blocks have been read by reader. 0 = infinite");
     PrintAndLogEx(NORMAL, "      i    (Optional) Interactive, means that console will not be returned until simulation finishes or is aborted");

From 9ff841efb2a042a26bc20c61fa64d56e87550035 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 18 Apr 2019 21:39:35 +0200
Subject: [PATCH 1334/1938] CRC optional, replaced by magic on USB

---
 armsrc/appmain.c  |  4 ----
 armsrc/apps.h     |  4 +++-
 client/comms.c    | 35 +++++++++++++++++++++---------
 client/comms.h    |  5 +++++
 common/cmd.c      | 55 ++++++++++++++++++++++++++---------------------
 common/cmd.h      | 10 +++++++--
 include/usb_cmd.h | 11 ++++------
 7 files changed, 75 insertions(+), 49 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index fabac5ce1..704e95dd8 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1452,11 +1452,7 @@ static void PacketReceived(PacketCommandNG *packet) {
             if (packet->ng) {
                 reply_ng(CMD_PING, PM3_SUCCESS, packet->data.asBytes, packet->length);
             } else {
-#ifdef WITH_FPC_HOST
                 reply_old(CMD_ACK, reply_via_fpc, 0, 0, 0, 0);
-#else
-                reply_old(CMD_ACK, 0, 0, 0, 0, 0);
-#endif
             }
             break;
 #ifdef WITH_LCD
diff --git a/armsrc/apps.h b/armsrc/apps.h
index fe2fa46cd..507c04782 100644
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -222,7 +222,9 @@ void iClass_Clone(uint8_t startblock, uint8_t endblock, uint8_t *data);
 void iClass_ReadCheck(uint8_t blockno, uint8_t keytype);
 
 // cmd.h
-uint8_t reply_old(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
+int16_t reply_old(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
+int16_t reply_ng(uint16_t cmd, int16_t status, uint8_t *data, size_t len);
+int16_t receive_ng(PacketCommandNG *rx);
 
 // util.h
 void HfSniff(int, int);
diff --git a/client/comms.c b/client/comms.c
index 48fbdf293..536b3af14 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -18,6 +18,11 @@ static char *serial_port_name = NULL;
 
 // If TRUE, then there is no active connection to the PM3, and we will drop commands sent.
 static bool offline;
+// Flags to tell where to add CRC on sent replies
+bool send_with_crc_on_usb = false;
+bool send_with_crc_on_fpc = true;
+// "Session" flag, to tell via which interface next msgs should be sent: USB or FPC USART
+bool send_via_fpc = false;
 
 static communication_arg_t conn;
 
@@ -120,9 +125,16 @@ void SendCommandNG(uint16_t cmd, uint8_t *data, size_t len) {
     txBufferNG.pre.length = len;
     txBufferNG.pre.cmd = cmd;
     memcpy(&txBufferNG.data, data, len);
-    uint8_t first, second;
-    compute_crc(CRC_14443_A, (uint8_t *)&txBufferNG, sizeof(PacketCommandNGPreamble) + len, &first, &second);
-    tx_post->crc = (first << 8) + second;
+    
+    if ((send_via_fpc && send_with_crc_on_fpc) || ((!send_via_fpc) && send_with_crc_on_usb)) {
+        uint8_t first, second;
+        compute_crc(CRC_14443_A, (uint8_t *)&txBufferNG, sizeof(PacketCommandNGPreamble) + len, &first, &second);
+        tx_post->crc = (first << 8) + second;
+    } else {
+        tx_post->crc = USB_COMMANDNG_POSTAMBLE_MAGIC;
+    }
+
+
     txBufferNGLen = sizeof(PacketCommandNGPreamble) + len + sizeof(PacketCommandNGPostamble);
     txBuffer_pending = true;
 
@@ -316,13 +328,15 @@ __attribute__((force_align_arg_pointer))
                         error = true;
                     }
                 }
-                if (!error) {                        // Check CRC
+                if (!error) {                        // Check CRC, accept MAGIC as placeholder
                     rx.crc = rx_raw.foopost.crc;
-                    uint8_t first, second;
-                    compute_crc(CRC_14443_A, (uint8_t *)&rx_raw, sizeof(PacketResponseNGPreamble) + rx.length, &first, &second);
-                    if ((first << 8) + second != rx.crc) {
-                        PrintAndLogEx(WARNING, "Received packet frame CRC error %02X%02X <> %04X", first, second, rx.crc);
-                        error = true;
+                    if (rx.crc != USB_REPLYNG_POSTAMBLE_MAGIC) {
+                        uint8_t first, second;
+                        compute_crc(CRC_14443_A, (uint8_t *)&rx_raw, sizeof(PacketResponseNGPreamble) + rx.length, &first, &second);
+                        if ((first << 8) + second != rx.crc) {
+                            PrintAndLogEx(WARNING, "Received packet frame CRC error %02X%02X <> %04X", first, second, rx.crc);
+                            error = true;
+                        }
                     }
                 }
                 if (!error) {
@@ -463,7 +477,8 @@ int TestProxmark(void) {
     PacketCommandOLD c = {CMD_PING, {0, 0, 0}, {{0}}};
     SendCommand(&c);
     if (WaitForResponseTimeout(CMD_ACK, &resp, 5000)) {
-        PrintAndLogEx(INFO, "Communicating with PM3 over %s.", resp.oldarg[0] == 1 ? "FPC" : "USB");
+        send_via_fpc = resp.oldarg[0] == 1;
+        PrintAndLogEx(INFO, "Communicating with PM3 over %s.", send_via_fpc ? "FPC" : "USB");
         return 1;
     } else {
         return 0;
diff --git a/client/comms.h b/client/comms.h
index ee0dff19c..32885994d 100644
--- a/client/comms.h
+++ b/client/comms.h
@@ -44,6 +44,11 @@ typedef struct {
     bool block_after_ACK; // if true, block after receiving an ACK package
 } communication_arg_t;
 
+// Flags to tell where to add CRC on sent replies
+extern bool send_with_crc_on_usb;
+extern bool send_with_crc_on_fpc;
+// "Session" flag, to tell via which interface next msgs are sent: USB or FPC USART
+extern bool send_via_fpc;
 
 void SetOffline(bool value);
 bool IsOffline(void);
diff --git a/common/cmd.c b/common/cmd.c
index 6465f0beb..a33dc2a29 100644
--- a/common/cmd.c
+++ b/common/cmd.c
@@ -32,18 +32,22 @@
 #include "cmd.h"
 #include "crc16.h"
 
-#ifdef WITH_FPC_HOST
+// Flags to tell where to add CRC on sent replies
+bool reply_with_crc_on_usb = false;
+bool reply_with_crc_on_fpc = true;
 // "Session" flag, to tell via which interface next msgs should be sent: USB or FPC USART
 bool reply_via_fpc = false;
 
+#ifdef WITH_FPC_HOST
 extern void Dbprintf(const char *fmt, ...);
 #define Dbprintf_usb(...) {\
+        bool tmp = reply_via_fpc;\
         reply_via_fpc = false;\
         Dbprintf(__VA_ARGS__);\
-        reply_via_fpc = true;}
+        reply_via_fpc = tmp;}
 #endif
 
-uint8_t reply_old(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len) {
+int16_t reply_old(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len) {
     PacketResponseOLD txcmd;
 
     for (size_t i = 0; i < sizeof(PacketResponseOLD); i++)
@@ -66,21 +70,21 @@ uint8_t reply_old(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, voi
     uint32_t sendlen = 0;
     // Send frame and make sure all bytes are transmitted
 
-#ifdef WITH_FPC_HOST
     if (reply_via_fpc) {
+#ifdef WITH_FPC_HOST
         sendlen = usart_writebuffer((uint8_t *)&txcmd, sizeof(PacketResponseOLD));
 //        Dbprintf_usb("Sent %i bytes over usart", len);
+#else
+        return PM3_EDEVNOTSUPP;
+#endif
     } else {
         sendlen = usb_write((uint8_t *)&txcmd, sizeof(PacketResponseOLD));
     }
-#else
-    sendlen = usb_write((uint8_t *)&txcmd, sizeof(PacketResponseOLD));
-#endif
 
     return sendlen;
 }
 
-uint8_t reply_ng(uint16_t cmd, int16_t status, uint8_t *data, size_t len) {
+int16_t reply_ng(uint16_t cmd, int16_t status, uint8_t *data, size_t len) {
     PacketResponseNGRaw txBufferNG;
     size_t txBufferNGLen;
 //    for (size_t i = 0; i < sizeof(txBufferNG); i++)
@@ -104,26 +108,29 @@ uint8_t reply_ng(uint16_t cmd, int16_t status, uint8_t *data, size_t len) {
         }
     }
 
-    uint8_t first, second;
-    compute_crc(CRC_14443_A, (uint8_t *)&txBufferNG, sizeof(PacketResponseNGPreamble) + len, &first, &second);
-
     PacketResponseNGPostamble *tx_post = (PacketResponseNGPostamble *)((uint8_t *)&txBufferNG + sizeof(PacketResponseNGPreamble) + len);
-    tx_post->crc = (first << 8) + second;
+    if ((reply_via_fpc && reply_with_crc_on_fpc) || ((!reply_via_fpc) && reply_with_crc_on_usb)) {
+        uint8_t first, second;
+        compute_crc(CRC_14443_A, (uint8_t *)&txBufferNG, sizeof(PacketResponseNGPreamble) + len, &first, &second);
+        tx_post->crc = (first << 8) + second;
+    } else {
+        tx_post->crc = USB_REPLYNG_POSTAMBLE_MAGIC;
+    }
     txBufferNGLen = sizeof(PacketResponseNGPreamble) + len + sizeof(PacketResponseNGPostamble);
 
     uint32_t sendlen = 0;
     // Send frame and make sure all bytes are transmitted
 
-#ifdef WITH_FPC_HOST
     if (reply_via_fpc) {
+#ifdef WITH_FPC_HOST
         sendlen = usart_writebuffer((uint8_t *)&txBufferNG, txBufferNGLen);
 //        Dbprintf_usb("Sent %i bytes over usart", len);
+#else
+        return PM3_EDEVNOTSUPP;
+#endif
     } else {
         sendlen = usb_write((uint8_t *)&txBufferNG, txBufferNGLen);
     }
-#else
-    sendlen = usb_write((uint8_t *)&txBufferNG, txBufferNGLen);
-#endif
 
     return sendlen;
 }
@@ -148,15 +155,15 @@ int16_t receive_ng(PacketCommandNG *rx) {
         bytes = usb_read_ng((uint8_t *)&rx_raw.foopost, sizeof(PacketCommandNGPostamble));
         if (bytes != sizeof(PacketCommandNGPostamble))
             return PM3_EIO;
-        // Check CRC
+        // Check CRC, accept MAGIC as placeholder
         rx->crc = rx_raw.foopost.crc;
-        uint8_t first, second;
-        compute_crc(CRC_14443_A, (uint8_t *)&rx_raw, sizeof(PacketCommandNGPreamble) + rx->length, &first, &second);
-        if ((first << 8) + second != rx->crc)
-            return PM3_EIO;
-#ifdef WITH_FPC_HOST
+        if (rx->crc != USB_COMMANDNG_POSTAMBLE_MAGIC) {
+            uint8_t first, second;
+            compute_crc(CRC_14443_A, (uint8_t *)&rx_raw, sizeof(PacketCommandNGPreamble) + rx->length, &first, &second);
+            if ((first << 8) + second != rx->crc)
+                return PM3_EIO;
+        }
         reply_via_fpc = false;
-#endif
         rx->ng = true;
     } else {                               // Old style command
         PacketCommandOLD rx_old;
@@ -164,9 +171,7 @@ int16_t receive_ng(PacketCommandNG *rx) {
         bytes = usb_read_ng(((uint8_t *)&rx_old) + sizeof(PacketCommandNGPreamble), sizeof(PacketCommandOLD) - sizeof(PacketCommandNGPreamble));
         if (bytes != sizeof(PacketCommandOLD) - sizeof(PacketCommandNGPreamble))
             return PM3_EIO;
-#ifdef WITH_FPC_HOST
         reply_via_fpc = false;
-#endif
         rx->ng = false;
         rx->magic = 0;
         rx->crc = 0;
diff --git a/common/cmd.h b/common/cmd.h
index a03a8e3f7..ae9d95e46 100644
--- a/common/cmd.h
+++ b/common/cmd.h
@@ -39,9 +39,15 @@
 #include "usart.h"
 #include "proxmark3.h"
 
-uint8_t reply_old(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
-uint8_t reply_ng(uint16_t cmd, int16_t status, uint8_t *data, size_t len);
+int16_t reply_old(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
+int16_t reply_ng(uint16_t cmd, int16_t status, uint8_t *data, size_t len);
 int16_t receive_ng(PacketCommandNG *rx);
 
+// Flags to tell where to add CRC on sent replies
+extern bool reply_with_crc_on_usb;
+extern bool reply_with_crc_on_fpc;
+// "Session" flag, to tell via which interface next msgs should be sent: USB or FPC USART
+extern bool reply_via_fpc;
+
 #endif // _PROXMARK_CMD_H_
 
diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index ba6e320f0..bed83311c 100644
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -41,7 +41,8 @@ typedef struct {
     uint16_t cmd;
 } PACKED PacketCommandNGPreamble;
 
-#define USB_COMMANDNG_PREAMBLE_MAGIC 0x61334d50 // PM3a
+#define USB_COMMANDNG_PREAMBLE_MAGIC  0x61334d50 // PM3a
+#define USB_COMMANDNG_POSTAMBLE_MAGIC 0x3361     // a3
 
 typedef struct {
     uint16_t crc;
@@ -84,7 +85,8 @@ typedef struct {
     uint16_t cmd;
 } PACKED PacketResponseNGPreamble;
 
-#define USB_REPLYNG_PREAMBLE_MAGIC 0x62334d50 // PM3b
+#define USB_REPLYNG_PREAMBLE_MAGIC  0x62334d50 // PM3b
+#define USB_REPLYNG_POSTAMBLE_MAGIC 0x3362     // b3
 
 typedef struct {
     uint16_t crc;
@@ -112,11 +114,6 @@ typedef struct {
     PacketResponseNGPostamble foopost; // Probably not at that offset!
 } PACKED PacketResponseNGRaw;
 
-#ifdef WITH_FPC_HOST
-// "Session" flag, to tell via which interface next msgs should be sent: USB or FPC USART
-extern bool reply_via_fpc;
-#endif
-
 // A struct used to send sample-configs over USB
 typedef struct {
     uint8_t decimation;

From 8c89b35f1e6a811247d0261d20ce3e5eca13d804 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 18 Apr 2019 21:41:48 +0200
Subject: [PATCH 1335/1938] style

---
 armsrc/appmain.c |  4 ++--
 armsrc/iclass.c  | 36 ++++++++++++++++++------------------
 client/comms.c   |  2 +-
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 704e95dd8..d453fe01e 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -634,13 +634,13 @@ void ListenReaderField(int limit) {
 }
 
 static void PacketReceived(PacketCommandNG *packet) {
-/*
+    /*
     if (packet->ng) {
         Dbprintf("received NG frame with %d bytes payload, with command: 0x%04x", packet->length, cmd);
     } else {
         Dbprintf("received OLD frame of %d bytes, with command: 0x%04x and args: %d %d %d", packet->length, packet->cmd, packet->oldarg[0], packet->oldarg[1], packet->oldarg[2]);
     }
-*/
+    */
 
     switch (packet->cmd) {
 #ifdef WITH_LF
diff --git a/armsrc/iclass.c b/armsrc/iclass.c
index bafa1593a..9e8dfd653 100644
--- a/armsrc/iclass.c
+++ b/armsrc/iclass.c
@@ -2181,12 +2181,12 @@ void ReaderIClass_Replay(uint8_t arg0, uint8_t *mac) {
                 if (stored_data_length + 8 > USB_CMD_DATA_SIZE) {
                     //Time to send this off and start afresh
                     reply_old(CMD_ACK,
-                             stored_data_length,//data length
-                             failedRead,//Failed blocks?
-                             0,//Not used ATM
-                             card_data,
-                             stored_data_length
-                            );
+                              stored_data_length,//data length
+                              failedRead,//Failed blocks?
+                              0,//Not used ATM
+                              card_data,
+                              stored_data_length
+                             );
                     //reset
                     stored_data_length = 0;
                     failedRead = 0;
@@ -2201,24 +2201,24 @@ void ReaderIClass_Replay(uint8_t arg0, uint8_t *mac) {
         //Send off any remaining data
         if (stored_data_length > 0) {
             reply_old(CMD_ACK,
-                     stored_data_length,//data length
-                     failedRead,//Failed blocks?
-                     0,//Not used ATM
-                     card_data,
-                     stored_data_length
-                    );
+                      stored_data_length,//data length
+                      failedRead,//Failed blocks?
+                      0,//Not used ATM
+                      card_data,
+                      stored_data_length
+                     );
         }
         //If we got here, let's break
         break;
     }
     //Signal end of transmission
     reply_old(CMD_ACK,
-             0,//data length
-             0,//Failed blocks?
-             0,//Not used ATM
-             card_data,
-             0
-            );
+              0,//data length
+              0,//Failed blocks?
+              0,//Not used ATM
+              card_data,
+              0
+             );
     switch_off();
 }
 
diff --git a/client/comms.c b/client/comms.c
index 536b3af14..7b20307d9 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -125,7 +125,7 @@ void SendCommandNG(uint16_t cmd, uint8_t *data, size_t len) {
     txBufferNG.pre.length = len;
     txBufferNG.pre.cmd = cmd;
     memcpy(&txBufferNG.data, data, len);
-    
+
     if ((send_via_fpc && send_with_crc_on_fpc) || ((!send_via_fpc) && send_with_crc_on_usb)) {
         uint8_t first, second;
         compute_crc(CRC_14443_A, (uint8_t *)&txBufferNG, sizeof(PacketCommandNGPreamble) + len, &first, &second);

From b860cc6eaf0d8e8d6ba90800d54507675ea919f7 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 18 Apr 2019 21:49:32 +0200
Subject: [PATCH 1336/1938] Rename MAGIC defines

---
 client/comms.c    | 8 ++++----
 common/cmd.c      | 8 ++++----
 include/usb_cmd.h | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/client/comms.c b/client/comms.c
index 7b20307d9..7244eae60 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -121,7 +121,7 @@ void SendCommandNG(uint16_t cmd, uint8_t *data, size_t len) {
         pthread_cond_wait(&txBufferSig, &txBufferMutex);
     }
 
-    txBufferNG.pre.magic = USB_COMMANDNG_PREAMBLE_MAGIC;
+    txBufferNG.pre.magic = COMMANDNG_PREAMBLE_MAGIC;
     txBufferNG.pre.length = len;
     txBufferNG.pre.cmd = cmd;
     memcpy(&txBufferNG.data, data, len);
@@ -131,7 +131,7 @@ void SendCommandNG(uint16_t cmd, uint8_t *data, size_t len) {
         compute_crc(CRC_14443_A, (uint8_t *)&txBufferNG, sizeof(PacketCommandNGPreamble) + len, &first, &second);
         tx_post->crc = (first << 8) + second;
     } else {
-        tx_post->crc = USB_COMMANDNG_POSTAMBLE_MAGIC;
+        tx_post->crc = COMMANDNG_POSTAMBLE_MAGIC;
     }
 
 
@@ -309,7 +309,7 @@ __attribute__((force_align_arg_pointer))
             rx.length = rx_raw.pre.length;
             rx.status = rx_raw.pre.status;
             rx.cmd = rx_raw.pre.cmd;
-            if (rx.magic == USB_REPLYNG_PREAMBLE_MAGIC) { // New style NG reply
+            if (rx.magic == RESPONSENG_PREAMBLE_MAGIC) { // New style NG reply
                 if (rx.length > USB_CMD_DATA_SIZE) {
                     PrintAndLogEx(WARNING, "Received packet frame with incompatible length: 0x%04x", rx.length);
                     error = true;
@@ -330,7 +330,7 @@ __attribute__((force_align_arg_pointer))
                 }
                 if (!error) {                        // Check CRC, accept MAGIC as placeholder
                     rx.crc = rx_raw.foopost.crc;
-                    if (rx.crc != USB_REPLYNG_POSTAMBLE_MAGIC) {
+                    if (rx.crc != RESPONSENG_POSTAMBLE_MAGIC) {
                         uint8_t first, second;
                         compute_crc(CRC_14443_A, (uint8_t *)&rx_raw, sizeof(PacketResponseNGPreamble) + rx.length, &first, &second);
                         if ((first << 8) + second != rx.crc) {
diff --git a/common/cmd.c b/common/cmd.c
index a33dc2a29..f2dbe5b31 100644
--- a/common/cmd.c
+++ b/common/cmd.c
@@ -91,7 +91,7 @@ int16_t reply_ng(uint16_t cmd, int16_t status, uint8_t *data, size_t len) {
 //        ((uint8_t *)&txBufferNG)[i] = 0x00;
 
     // Compose the outgoing command frame
-    txBufferNG.pre.magic = USB_REPLYNG_PREAMBLE_MAGIC;
+    txBufferNG.pre.magic = RESPONSENG_PREAMBLE_MAGIC;
     txBufferNG.pre.cmd = cmd;
     txBufferNG.pre.status = status;
     if (len > USB_CMD_DATA_SIZE) {
@@ -114,7 +114,7 @@ int16_t reply_ng(uint16_t cmd, int16_t status, uint8_t *data, size_t len) {
         compute_crc(CRC_14443_A, (uint8_t *)&txBufferNG, sizeof(PacketResponseNGPreamble) + len, &first, &second);
         tx_post->crc = (first << 8) + second;
     } else {
-        tx_post->crc = USB_REPLYNG_POSTAMBLE_MAGIC;
+        tx_post->crc = RESPONSENG_POSTAMBLE_MAGIC;
     }
     txBufferNGLen = sizeof(PacketResponseNGPreamble) + len + sizeof(PacketResponseNGPostamble);
 
@@ -143,7 +143,7 @@ int16_t receive_ng(PacketCommandNG *rx) {
     rx->magic = rx_raw.pre.magic;
     rx->length = rx_raw.pre.length;
     rx->cmd = rx_raw.pre.cmd;
-    if (rx->magic == USB_COMMANDNG_PREAMBLE_MAGIC) { // New style NG command
+    if (rx->magic == COMMANDNG_PREAMBLE_MAGIC) { // New style NG command
         if (rx->length > USB_CMD_DATA_SIZE)
             return PM3_EOVFLOW;
         // Get the core and variable length payload
@@ -157,7 +157,7 @@ int16_t receive_ng(PacketCommandNG *rx) {
             return PM3_EIO;
         // Check CRC, accept MAGIC as placeholder
         rx->crc = rx_raw.foopost.crc;
-        if (rx->crc != USB_COMMANDNG_POSTAMBLE_MAGIC) {
+        if (rx->crc != COMMANDNG_POSTAMBLE_MAGIC) {
             uint8_t first, second;
             compute_crc(CRC_14443_A, (uint8_t *)&rx_raw, sizeof(PacketCommandNGPreamble) + rx->length, &first, &second);
             if ((first << 8) + second != rx->crc)
diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index bed83311c..8ab53f252 100644
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -41,8 +41,8 @@ typedef struct {
     uint16_t cmd;
 } PACKED PacketCommandNGPreamble;
 
-#define USB_COMMANDNG_PREAMBLE_MAGIC  0x61334d50 // PM3a
-#define USB_COMMANDNG_POSTAMBLE_MAGIC 0x3361     // a3
+#define COMMANDNG_PREAMBLE_MAGIC  0x61334d50 // PM3a
+#define COMMANDNG_POSTAMBLE_MAGIC 0x3361     // a3
 
 typedef struct {
     uint16_t crc;
@@ -85,8 +85,8 @@ typedef struct {
     uint16_t cmd;
 } PACKED PacketResponseNGPreamble;
 
-#define USB_REPLYNG_PREAMBLE_MAGIC  0x62334d50 // PM3b
-#define USB_REPLYNG_POSTAMBLE_MAGIC 0x3362     // b3
+#define RESPONSENG_PREAMBLE_MAGIC  0x62334d50 // PM3b
+#define RESPONSENG_POSTAMBLE_MAGIC 0x3362     // b3
 
 typedef struct {
     uint16_t crc;

From 9bd59a8d401c873a8b88afd1ef05412d74d0c28e Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 18 Apr 2019 22:19:28 +0200
Subject: [PATCH 1337/1938] Add SendCommandOLD

---
 client/cmdhw.c | 13 +++++--------
 client/comms.c | 12 ++++++++++++
 client/comms.h |  1 +
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/client/cmdhw.c b/client/cmdhw.c
index 99b8ea49b..6b4ec04bd 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -419,8 +419,7 @@ static int CmdStatus(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     clearCommandBuffer();
     PacketResponseNG resp;
-    PacketCommandOLD c = {CMD_STATUS, {0, 0, 0}, {{0}}};
-    SendCommand(&c);
+    SendCommandOLD(CMD_STATUS, 0, 0, 0, NULL, 0);
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1900))
         PrintAndLogEx(NORMAL, "Status command failed. USB Speed Test timed out");
     return 0;
@@ -430,12 +429,11 @@ static int CmdPing(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     clearCommandBuffer();
     PacketResponseNG resp;
-    PacketCommandOLD c = {CMD_PING, {0, 0, 0}, {{0}}};
-    SendCommand(&c);
+    SendCommandOLD(CMD_PING, 0, 0, 0, NULL, 0);
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1000))
-        PrintAndLogEx(NORMAL, "Ping successful");
+        PrintAndLogEx(NORMAL, "Ping " _GREEN_("successful"));
     else
-        PrintAndLogEx(NORMAL, "Ping failed");
+        PrintAndLogEx(NORMAL, "Ping " _RED_("failed"));
     return 0;
 }
 
@@ -447,10 +445,9 @@ static int CmdPingNG(const char *Cmd) {
     clearCommandBuffer();
     PacketResponseNG resp;
     uint8_t data[USB_CMD_DATA_SIZE] = {0};
-    uint16_t cmd = CMD_PING;
     for (uint16_t i = 0; i < len; i++)
         data[i] = i & 0xFF;
-    SendCommandNG(cmd, data, len);
+    SendCommandNG(CMD_PING, data, len);
     if (WaitForResponseTimeout(CMD_PING, &resp, 1000)) {
         bool error = false;
         if (len)
diff --git a/client/comms.c b/client/comms.c
index 7244eae60..ccec1832b 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -94,6 +94,18 @@ void SendCommand(PacketCommandOLD *c) {
 //__atomic_test_and_set(&txcmd_pending, __ATOMIC_SEQ_CST);
 }
 
+// Let's move slowly to an API closer to SendCommandNG
+void SendCommandOLD(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len) {
+    PacketCommandOLD c = {CMD_UNKNOWN, {0, 0, 0}, {{0}}};
+    c.cmd = cmd;
+    c.arg[0] = arg0;
+    c.arg[1] = arg1;
+    c.arg[2] = arg2;
+    if (len && data)
+        memcpy(&c.d, data, len);
+    SendCommand(&c);
+}
+
 void SendCommandNG(uint16_t cmd, uint8_t *data, size_t len) {
 
 #ifdef COMMS_DEBUG
diff --git a/client/comms.h b/client/comms.h
index 32885994d..6034a5741 100644
--- a/client/comms.h
+++ b/client/comms.h
@@ -55,6 +55,7 @@ bool IsOffline(void);
 
 void *uart_receiver(void *targ);
 void SendCommand(PacketCommandOLD *c);
+void SendCommandOLD(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
 void SendCommandNG(uint16_t cmd, uint8_t *data, size_t len);
 void clearCommandBuffer(void);
 

From 7dbd12ad2740f6df65dd42314dfc98535f82f9af Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 18 Apr 2019 22:42:15 +0200
Subject: [PATCH 1338/1938] SendCommandOLD: cmdhw

---
 client/cmdhw.c | 88 +++++++++++++++++++++++---------------------------
 client/comms.c |  4 +--
 2 files changed, 43 insertions(+), 49 deletions(-)

diff --git a/client/cmdhw.c b/client/cmdhw.c
index 6b4ec04bd..e2a483ef2 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -308,65 +308,58 @@ static void lookupChipID(uint32_t iChipID, uint32_t mem_used) {
 }
 
 static int CmdDetectReader(const char *Cmd) {
-    PacketCommandOLD c = {CMD_LISTEN_READER_FIELD, {0, 0, 0}, {{0}}};
+    uint16_t arg = 0;
     // 'l' means LF - 125/134 kHz
     if (*Cmd == 'l') {
-        c.arg[0] = 1;
+        arg = 1;
     } else if (*Cmd == 'h') {
-        c.arg[0] = 2;
+        arg = 2;
     } else if (*Cmd != '\0') {
         PrintAndLogEx(NORMAL, "use 'detectreader' or 'detectreader l' or 'detectreader h'");
-        return 0;
+        return PM3_EINVARG;
     }
     clearCommandBuffer();
-    SendCommand(&c);
-    return 0;
+    SendCommandOLD(CMD_LISTEN_READER_FIELD, arg, 0, 0, NULL, 0);
+    return PM3_SUCCESS;
 }
 
 // ## FPGA Control
 static int CmdFPGAOff(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
-    PacketCommandOLD c = {CMD_FPGA_MAJOR_MODE_OFF, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
-    return 0;
+    SendCommandOLD(CMD_FPGA_MAJOR_MODE_OFF, 0, 0, 0, NULL, 0);
+    return PM3_SUCCESS;
 }
 
 #ifdef WITH_LCD
 static int CmdLCD(const char *Cmd) {
     int i, j;
-
-    PacketCommandOLD c = {CMD_LCD, {0, 0, 0}, {{0}}};
     sscanf(Cmd, "%x %d", &i, &j);
     while (j--) {
-        c.arg[0] = i & 0x1ff;
         clearCommandBuffer();
-        SendCommand(&c);
+        SendCommandOLD(CMD_LCD, i & 0x1ff, 0, 0, NULL, 0);
     }
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdLCDReset(const char *Cmd) {
-    PacketCommandOLD c = {CMD_LCD_RESET, {strtol(Cmd, NULL, 0), 0, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
-    return 0;
+    SendCommandOLD(CMD_LCD_RESET, strtol(Cmd, NULL, 0), 0, 0, NULL, 0);
+    return PM3_SUCCESS;
 }
 #endif
 
 static int CmdReadmem(const char *Cmd) {
-    PacketCommandOLD c = {CMD_READ_MEM, {strtol(Cmd, NULL, 0), 0, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
-    return 0;
+    SendCommandOLD(CMD_READ_MEM, strtol(Cmd, NULL, 0), 0, 0, NULL, 0);
+    return PM3_SUCCESS;
 }
 
 static int CmdReset(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
-    PacketCommandOLD c = {CMD_HARDWARE_RESET, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
-    return 0;
+    SendCommandOLD(CMD_HARDWARE_RESET, 0, 0, 0, NULL, 0);
+    return PM3_SUCCESS;
 }
 
 /*
@@ -374,35 +367,38 @@ static int CmdReset(const char *Cmd) {
  * 600kHz.
  */
 static int CmdSetDivisor(const char *Cmd) {
-    PacketCommandOLD c = {CMD_SET_LF_DIVISOR, {strtol(Cmd, NULL, 0), 0, 0}, {{0}}};
+    uint16_t arg = strtol(Cmd, NULL, 0);
 
-    if (c.arg[0] < 19 || c.arg[0] > 255) {
+    if (arg < 19 || arg > 255) {
         PrintAndLogEx(NORMAL, "divisor must be between 19 and 255");
-        return 1;
+        return PM3_EINVARG;
     }
     // 12 000 000 (12Mhz)
     clearCommandBuffer();
-    SendCommand(&c);
-    PrintAndLogEx(NORMAL, "Divisor set, expected %.1f KHz", ((double)12000 / (c.arg[0] + 1)));
-    return 0;
+    SendCommandOLD(CMD_SET_LF_DIVISOR, arg, 0, 0, NULL, 0);
+    PrintAndLogEx(NORMAL, "Divisor set, expected %.1f KHz", ((double)12000 / (arg + 1)));
+    return PM3_SUCCESS;
 }
 
 static int CmdSetMux(const char *Cmd) {
 
     if (strlen(Cmd) < 5) {
         PrintAndLogEx(NORMAL, "expected:  lopkd | loraw | hipkd | hiraw");
-        return 1;
+        return PM3_EINVARG;
     }
 
-    PacketCommandOLD c = {CMD_SET_ADC_MUX, {0, 0, 0}, {{0}}};
-
-    if (strcmp(Cmd, "lopkd") == 0)      c.arg[0] = 0;
-    else if (strcmp(Cmd, "loraw") == 0) c.arg[0] = 1;
-    else if (strcmp(Cmd, "hipkd") == 0) c.arg[0] = 2;
-    else if (strcmp(Cmd, "hiraw") == 0) c.arg[0] = 3;
+    uint16_t arg = 0;
+    if (strcmp(Cmd, "lopkd") == 0)      arg = 0;
+    else if (strcmp(Cmd, "loraw") == 0) arg = 1;
+    else if (strcmp(Cmd, "hipkd") == 0) arg = 2;
+    else if (strcmp(Cmd, "hiraw") == 0) arg = 3;
+    else {
+        PrintAndLogEx(NORMAL, "expected:  lopkd | loraw | hipkd | hiraw");
+        return PM3_EINVARG;
+    }
     clearCommandBuffer();
-    SendCommand(&c);
-    return 0;
+    SendCommandOLD(CMD_SET_ADC_MUX, arg, 0, 0, NULL, 0);
+    return PM3_SUCCESS;
 }
 
 static int CmdTune(const char *Cmd) {
@@ -412,7 +408,7 @@ static int CmdTune(const char *Cmd) {
 static int CmdVersion(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     pm3_version(true);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdStatus(const char *Cmd) {
@@ -422,7 +418,7 @@ static int CmdStatus(const char *Cmd) {
     SendCommandOLD(CMD_STATUS, 0, 0, 0, NULL, 0);
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1900))
         PrintAndLogEx(NORMAL, "Status command failed. USB Speed Test timed out");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdPing(const char *Cmd) {
@@ -434,7 +430,7 @@ static int CmdPing(const char *Cmd) {
         PrintAndLogEx(NORMAL, "Ping " _GREEN_("successful"));
     else
         PrintAndLogEx(NORMAL, "Ping " _RED_("failed"));
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdPingNG(const char *Cmd) {
@@ -455,7 +451,7 @@ static int CmdPingNG(const char *Cmd) {
         PrintAndLogEx(NORMAL, "PingNG response received, content is %s", error ? _RED_("NOT ok") : _GREEN_("ok"));
     } else
         PrintAndLogEx(NORMAL, "PingNG response " _RED_("timeout"));
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static command_t CommandTable[] = {
@@ -481,22 +477,20 @@ static command_t CommandTable[] = {
 static int CmdHelp(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 int CmdHW(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 void pm3_version(bool verbose) {
     if (!verbose)
         return;
-    PacketCommandOLD c = {CMD_VERSION, {0, 0, 0}, {{0}}};
     PacketResponseNG resp;
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_VERSION, 0, 0, 0, NULL, 0);
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {
 #ifdef __WIN32
         PrintAndLogEx(NORMAL, "\n [ Proxmark3 RFID instrument ]\n");
diff --git a/client/comms.c b/client/comms.c
index ccec1832b..1055f6dd4 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -408,13 +408,13 @@ __attribute__((force_align_arg_pointer))
             if (txBufferNGLen) { // NG packet
                 if (!uart_send(sp, (uint8_t *) &txBufferNG, txBufferNGLen)) {
                     //counter_to_offline++;
-                    PrintAndLogEx(WARNING, "sending bytes to Proxmark3 device" _RED_("failed"));
+                    PrintAndLogEx(WARNING, "sending bytes to Proxmark3 device " _RED_("failed"));
                 }
                 txBufferNGLen = 0;
             } else {
                 if (!uart_send(sp, (uint8_t *) &txBuffer, sizeof(PacketCommandOLD))) {
                     //counter_to_offline++;
-                    PrintAndLogEx(WARNING, "sending bytes to Proxmark3 device" _RED_("failed"));
+                    PrintAndLogEx(WARNING, "sending bytes to Proxmark3 device " _RED_("failed"));
                 }
             }
             txBuffer_pending = false;

From dcfee8963b6aecbffc389dbb87c2fca034d5dbac Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 18 Apr 2019 23:26:12 +0200
Subject: [PATCH 1339/1938] SendCommandOLD & errors: cmdflashmem

---
 client/cmdflashmem.c | 136 ++++++++++++++++++++++++-------------------
 client/cmdparser.c   |   6 +-
 include/usb_cmd.h    |   6 ++
 3 files changed, 86 insertions(+), 62 deletions(-)

diff --git a/client/cmdflashmem.c b/client/cmdflashmem.c
index 8e8215501..cd839d0a1 100644
--- a/client/cmdflashmem.c
+++ b/client/cmdflashmem.c
@@ -37,7 +37,7 @@ static int usage_flashmem_spibaud(void) {
     PrintAndLogEx(NORMAL, "           Unless you know what you are doing, please stay at 24Mhz");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "           mem spibaud 48");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int usage_flashmem_read(void) {
@@ -49,7 +49,7 @@ static int usage_flashmem_read(void) {
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "        mem read o 0 l 32");    // read 32 bytes starting at offset 0
     PrintAndLogEx(NORMAL, "        mem read o 1024 l 10"); // read 10 bytes starting at offset 1024
-    return 0;
+    return PM3_SUCCESS;
 }
 static int usage_flashmem_load(void) {
     PrintAndLogEx(NORMAL, "Loads binary file into flash memory on device");
@@ -66,7 +66,7 @@ static int usage_flashmem_load(void) {
     PrintAndLogEx(NORMAL, "        mem load f default_keys m");
     PrintAndLogEx(NORMAL, "        mem load f default_pwd t");
     PrintAndLogEx(NORMAL, "        mem load f default_iclass_keys i");
-    return 0;
+    return PM3_SUCCESS;
 }
 static int usage_flashmem_save(void) {
     PrintAndLogEx(NORMAL, "Saves flash memory on device into the file");
@@ -79,7 +79,7 @@ static int usage_flashmem_save(void) {
     PrintAndLogEx(NORMAL, "        mem save f myfile");                 // download whole flashmem to file myfile
     PrintAndLogEx(NORMAL, "        mem save f myfile l 4096");          // download 4096 bytes from default offset 0 to file myfile
     PrintAndLogEx(NORMAL, "        mem save f myfile o 1024 l 4096");   // downlowd 4096 bytes from offset 1024 to file myfile
-    return 0;
+    return PM3_SUCCESS;
 }
 static int usage_flashmem_wipe(void) {
 
@@ -93,7 +93,7 @@ static int usage_flashmem_wipe(void) {
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "        mem wipe ");     // wipe page 0,1,2
     PrintAndLogEx(NORMAL, "        mem wipe p 0");  // wipes first page.
-    return 0;
+    return PM3_SUCCESS;
 }
 static int usage_flashmem_info(void) {
     PrintAndLogEx(NORMAL, "Collect signature and verify it from flash memory\n");
@@ -104,7 +104,7 @@ static int usage_flashmem_info(void) {
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "        mem info");
     PrintAndLogEx(NORMAL, "        mem info s");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdFlashMemRead(const char *Cmd) {
@@ -124,7 +124,8 @@ static int CmdFlashMemRead(const char *Cmd) {
                 cmdp += 2;
                 break;
             case 'h':
-                return usage_flashmem_read();
+                usage_flashmem_read();
+                return PM3_SUCCESS;
             default:
                 PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
                 errors = true;
@@ -133,29 +134,35 @@ static int CmdFlashMemRead(const char *Cmd) {
     }
 
     //Validations
-    if (errors || cmdp == 0) return usage_flashmem_read();
-
+    if (errors || cmdp == 0) {
+        usage_flashmem_read();
+        return PM3_EINVARG;
+    }
     if (start_index + len > FLASH_MEM_MAX_SIZE) {
         PrintAndLogDevice(WARNING, "error, start_index + length is larger than available memory");
-        return 1;
+        return PM3_EOVFLOW;
     }
 
-    PacketCommandOLD c = {CMD_FLASHMEM_READ, {start_index, len, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
-    return 0;
+    SendCommandOLD(CMD_FLASHMEM_READ, start_index, len, 0, NULL, 0);
+    return PM3_SUCCESS;
 }
 
 static int CmdFlashmemSpiBaudrate(const char *Cmd) {
 
     char ctmp = tolower(param_getchar(Cmd, 0));
-    if (strlen(Cmd) < 1 || ctmp == 'h') return usage_flashmem_spibaud();
+    if (strlen(Cmd) < 1 || ctmp == 'h') {
+        usage_flashmem_spibaud();
+        return PM3_EINVARG;
+    }
     uint32_t baudrate = param_get32ex(Cmd, 0, 0, 10);
     baudrate = baudrate * 1000000;
-    if (baudrate != FLASH_BAUD && baudrate != FLASH_MINBAUD) return usage_flashmem_spibaud();
-    PacketCommandOLD c = {CMD_FLASHMEM_SET_SPIBAUDRATE, {baudrate, 0, 0}, {{0}}};
-    SendCommand(&c);
-    return 0;
+    if (baudrate != FLASH_BAUD && baudrate != FLASH_MINBAUD) {
+        usage_flashmem_spibaud();
+        return PM3_EINVARG;
+    }
+    SendCommandOLD(CMD_FLASHMEM_SET_SPIBAUDRATE, baudrate, 0, 0, NULL, 0);
+    return PM3_SUCCESS;
 }
 
 static int CmdFlashMemLoad(const char *Cmd) {
@@ -169,7 +176,8 @@ static int CmdFlashMemLoad(const char *Cmd) {
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
             case 'h':
-                return usage_flashmem_load();
+                usage_flashmem_load();
+                return PM3_SUCCESS;
             case 'f':
                 if (param_getstr(Cmd, cmdp + 1, filename, FILE_PATH_SIZE) >= FILE_PATH_SIZE) {
                     PrintAndLogEx(FAILED, "Filename too long");
@@ -202,8 +210,10 @@ static int CmdFlashMemLoad(const char *Cmd) {
     }
 
     //Validations
-    if (errors || cmdp == 0) return usage_flashmem_load();
-
+    if (errors || cmdp == 0) {
+        usage_flashmem_load();
+        return PM3_EINVARG;
+    }
     size_t datalen = 0;
     uint16_t keycount = 0;
     int res = 0;
@@ -215,7 +225,7 @@ static int CmdFlashMemLoad(const char *Cmd) {
             res = loadFileDICTIONARY(filename, "dic", data + 2, &datalen, 6, &keycount);
             if (res || !keycount) {
                 free(data);
-                return 1;
+                return PM3_EFILE;
             }
             data[0] = (keycount >> 0) & 0xFF;
             data[1] = (keycount >> 8) & 0xFF;
@@ -226,7 +236,7 @@ static int CmdFlashMemLoad(const char *Cmd) {
             res = loadFileDICTIONARY(filename, "dic", data + 2, &datalen, 4, &keycount);
             if (res || !keycount) {
                 free(data);
-                return 1;
+                return PM3_EFILE;
             }
             data[0] = (keycount >> 0) & 0xFF;
             data[1] = (keycount >> 8) & 0xFF;
@@ -237,7 +247,7 @@ static int CmdFlashMemLoad(const char *Cmd) {
             res = loadFileDICTIONARY(filename, "dic", data + 2, &datalen, 8, &keycount);
             if (res || !keycount) {
                 free(data);
-                return 1;
+                return PM3_EFILE;
             }
             data[0] = (keycount >> 0) & 0xFF;
             data[1] = (keycount >> 8) & 0xFF;
@@ -248,13 +258,13 @@ static int CmdFlashMemLoad(const char *Cmd) {
             //int res = loadFileEML( filename, "eml", data, &datalen);
             if (res) {
                 free(data);
-                return 1;
+                return PM3_EFILE;
             }
 
             if (datalen > FLASH_MEM_MAX_SIZE) {
                 PrintAndLogDevice(WARNING, "error, filesize is larger than available memory");
                 free(data);
-                return 1;
+                return PM3_EOVFLOW;
             }
             break;
     }
@@ -262,7 +272,7 @@ static int CmdFlashMemLoad(const char *Cmd) {
     uint8_t *newdata = realloc(data, datalen);
     if (newdata == NULL) {
         free(data);
-        return 1;
+        return PM3_EMALLOC;
     } else {
         data = newdata;
     }
@@ -274,11 +284,8 @@ static int CmdFlashMemLoad(const char *Cmd) {
     while (bytes_remaining > 0) {
         uint32_t bytes_in_packet = MIN(FLASH_MEM_BLOCK_SIZE, bytes_remaining);
 
-        PacketCommandOLD c = {CMD_FLASHMEM_WRITE, {start_index + bytes_sent, bytes_in_packet, 0}, {{0}}};
-
-        memcpy(c.d.asBytes, data + bytes_sent, bytes_in_packet);
         clearCommandBuffer();
-        SendCommand(&c);
+        SendCommandOLD(CMD_FLASHMEM_WRITE, start_index + bytes_sent, bytes_in_packet, 0, data + bytes_sent, bytes_in_packet);
 
         bytes_remaining -= bytes_in_packet;
         bytes_sent += bytes_in_packet;
@@ -287,18 +294,19 @@ static int CmdFlashMemLoad(const char *Cmd) {
         if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
             PrintAndLogEx(WARNING, "timeout while waiting for reply.");
             free(data);
-            return 1;
+            return PM3_ETIMEOUT;
         }
 
         uint8_t isok  = resp.oldarg[0] & 0xFF;
-        if (!isok)
+        if (!isok) {
             PrintAndLogEx(FAILED, "Flash write fail [offset %u]", bytes_sent);
-
+            return PM3_EFLASH;
+        }
     }
     free(data);
 
     PrintAndLogEx(SUCCESS, "Wrote %u bytes to offset %u", datalen, start_index);
-    return 0;
+    return PM3_SUCCESS;
 }
 static int CmdFlashMemSave(const char *Cmd) {
 
@@ -310,7 +318,8 @@ static int CmdFlashMemSave(const char *Cmd) {
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
             case 'h':
-                return usage_flashmem_save();
+                usage_flashmem_save();
+                return PM3_EINVARG;
             case 'l':
                 len = param_get32ex(Cmd, cmdp + 1, FLASH_MEM_MAX_SIZE, 10);
                 cmdp += 2;
@@ -336,25 +345,28 @@ static int CmdFlashMemSave(const char *Cmd) {
     }
 
     //Validations
-    if (errors || cmdp == 0) return usage_flashmem_save();
+    if (errors || cmdp == 0) {
+        usage_flashmem_save();
+        return PM3_EINVARG;
+    }
 
     uint8_t *dump = calloc(len, sizeof(uint8_t));
     if (!dump) {
         PrintAndLogDevice(WARNING, "error, cannot allocate memory ");
-        return 1;
+        return PM3_EMALLOC;
     }
 
     PrintAndLogEx(NORMAL, "downloading %u bytes from flashmem", len);
     if (!GetFromDevice(FLASH_MEM, dump, len, start_index, NULL, -1, true)) {
         PrintAndLogEx(FAILED, "ERROR; downloading flashmem");
         free(dump);
-        return 1;
+        return PM3_EFLASH;
     }
 
     saveFile(filename, "bin", dump, len);
     saveFileEML(filename, "eml", dump, len, 16);
     free(dump);
-    return 0;
+    return PM3_SUCCESS;
 }
 static int CmdFlashMemWipe(const char *Cmd) {
 
@@ -365,7 +377,8 @@ static int CmdFlashMemWipe(const char *Cmd) {
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
             case 'h':
-                return usage_flashmem_wipe();
+                usage_flashmem_wipe();
+                return PM3_SUCCESS;
             case 'p':
                 page = param_get8ex(Cmd, cmdp + 1, 0, 10);
                 if (page > 2) {
@@ -387,23 +400,27 @@ static int CmdFlashMemWipe(const char *Cmd) {
     }
 
     //Validations
-    if (errors || cmdp == 0) return usage_flashmem_wipe();
+    if (errors || cmdp == 0) {
+        usage_flashmem_wipe();
+        return PM3_EINVARG;
+    }
 
-    PacketCommandOLD c = {CMD_FLASHMEM_WIPE, {page, initalwipe, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_FLASHMEM_WIPE, page, initalwipe, 0, NULL, 0);
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 8000)) {
         PrintAndLogEx(WARNING, "timeout while waiting for reply.");
-        return 1;
+        return PM3_ETIMEOUT;
     }
     uint8_t isok  = resp.oldarg[0] & 0xFF;
     if (isok)
         PrintAndLogEx(SUCCESS, "Flash WIPE ok");
-    else
+    else {
         PrintAndLogEx(FAILED, "Flash WIPE failed");
+        return PM3_EFLASH;
+    }
 
-    return 0;
+    return PM3_SUCCESS;
 }
 static int CmdFlashMemInfo(const char *Cmd) {
 
@@ -415,7 +432,8 @@ static int CmdFlashMemInfo(const char *Cmd) {
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
             case 'h':
-                return usage_flashmem_info();
+                usage_flashmem_info();
+                return PM3_SUCCESS;
             case 's': {
                 shall_sign = true;
                 cmdp++;
@@ -433,21 +451,23 @@ static int CmdFlashMemInfo(const char *Cmd) {
     }
 
     //Validations
-    if (errors) return usage_flashmem_info();
+    if (errors) {
+        usage_flashmem_info();
+        return PM3_EINVARG;
+    }
 
-    PacketCommandOLD c = {CMD_FLASHMEM_INFO, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_FLASHMEM_INFO, 0, 0, 0, NULL, 0);
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         PrintAndLogEx(WARNING, "timeout while waiting for reply.");
-        return 1;
+        return PM3_ETIMEOUT;
     }
 
     uint8_t isok = resp.oldarg[0] & 0xFF;
     if (!isok) {
         PrintAndLogEx(FAILED, "failed");
-        return 1;
+        return PM3_EFLASH;
     }
 
     // validate signature here
@@ -564,10 +584,8 @@ static int CmdFlashMemInfo(const char *Cmd) {
 
         if (shall_write) {
             // save to mem
-            c = (PacketCommandOLD) {CMD_FLASHMEM_WRITE, {FLASH_MEM_SIGNATURE_OFFSET, FLASH_MEM_SIGNATURE_LEN, 0}, {{0}}};
-            memcpy(c.d.asBytes, sign, sizeof(sign));
             clearCommandBuffer();
-            SendCommand(&c);
+            SendCommandOLD(CMD_FLASHMEM_WRITE, FLASH_MEM_SIGNATURE_OFFSET, FLASH_MEM_SIGNATURE_LEN, 0, sign, sizeof(sign));
             if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
                 PrintAndLogEx(WARNING, "timeout while waiting for reply.");
             } else {
@@ -591,7 +609,7 @@ static int CmdFlashMemInfo(const char *Cmd) {
         PrintAndLogEx(FAILED, "RSA Verification failed");
 
     mbedtls_rsa_free(&rsa);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static command_t CommandTable[] = {
@@ -608,13 +626,13 @@ static command_t CommandTable[] = {
 static int CmdHelp(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 int CmdFlashMem(const char *Cmd) {
     clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 #endif
diff --git a/client/cmdparser.c b/client/cmdparser.c
index 5ff0c9255..75a117045 100644
--- a/client/cmdparser.c
+++ b/client/cmdparser.c
@@ -31,12 +31,12 @@ int CmdsParse(const command_t Commands[], const char *Cmd) {
     // Help dump children
     if (strcmp(Cmd, "XX_internal_command_dump_XX") == 0) {
         dumpCommandsRecursive(Commands, 0);
-        return 0;
+        return PM3_SUCCESS;
     }
     // Markdown help dump children
     if (strcmp(Cmd, "XX_internal_command_dump_markdown_XX") == 0) {
         dumpCommandsRecursive(Commands, 1);
-        return 0;
+        return PM3_SUCCESS;
     }
     char cmd_name[128];
     int len = 0;
@@ -70,7 +70,7 @@ int CmdsParse(const command_t Commands[], const char *Cmd) {
         CmdsHelp(Commands);
     }
 
-    return 0;
+    return PM3_SUCCESS;
 }
 
 char pparent[512] = {0};
diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index 8ab53f252..87aaee54c 100644
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -415,6 +415,12 @@ typedef struct {
 #define PM3_EOVFLOW            -9
 // Software error
 #define PM3_ESOFT             -10
+// Flash error
+#define PM3_EFLASH            -11
+// Memory allocation error
+#define PM3_EMALLOC           -12
+// File error
+#define PM3_EFILE             -13
 
 
 // CMD_DEVICE_INFO response packet has flags in arg[0], flag definitions:

From 38fc6e22909329bcff0376b611298d03c42bb245 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 19 Apr 2019 00:42:25 +0200
Subject: [PATCH 1340/1938] errors: cmdmain

---
 client/cmdflashmem.c | 3 +--
 client/cmdmain.c     | 8 ++++----
 client/proxmark3.c   | 3 ++-
 include/usb_cmd.h    | 2 ++
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/client/cmdflashmem.c b/client/cmdflashmem.c
index cd839d0a1..fd8cf0554 100644
--- a/client/cmdflashmem.c
+++ b/client/cmdflashmem.c
@@ -631,8 +631,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdFlashMem(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return PM3_SUCCESS;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 #endif
diff --git a/client/cmdmain.c b/client/cmdmain.c
index db91b9c19..45a5139b2 100644
--- a/client/cmdmain.c
+++ b/client/cmdmain.c
@@ -28,17 +28,17 @@ static int CmdRem(const char *Cmd) {
 #endif
     strftime(buf, sizeof(buf), "%Y-%m-%dT%H:%M:%SZ", ct);  // ISO8601
     PrintAndLogEx(NORMAL, "%s remark: %s", buf, Cmd);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdQuit(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
-    return 99;
+    return PM3_EFATAL;
 }
 
 static int CmdRev(const char *Cmd) {
     CmdCrc(Cmd);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static command_t CommandTable[] = {
@@ -67,7 +67,7 @@ static command_t CommandTable[] = {
 static int CmdHelp(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 //-----------------------------------------------------------------------------
diff --git a/client/proxmark3.c b/client/proxmark3.c
index 267071c21..dbeb3f217 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -181,8 +181,9 @@ main_loop(char *script_cmds_file, char *script_cmd, bool usb_present) {
                 if ((!entry) || (strcmp(entry->line, cmd) != 0))
                     add_history(cmd);
 
+//                PrintAndLogEx(NORMAL, "RETVAL: %d\n", ret);
                 // exit or quit
-                if (ret == 99)
+                if (ret == PM3_EFATAL)
                     break;
             }
             free(cmd);
diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index 87aaee54c..9e060e80c 100644
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -421,6 +421,8 @@ typedef struct {
 #define PM3_EMALLOC           -12
 // File error
 #define PM3_EFILE             -13
+// Quit program
+#define PM3_EFATAL            -99
 
 
 // CMD_DEVICE_INFO response packet has flags in arg[0], flag definitions:

From 1b6a45ac17fd87294c4c7a1305bc796e3f797c88 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 19 Apr 2019 00:47:51 +0200
Subject: [PATCH 1341/1938] propagate CmdsParse return value

---
 client/cmdanalyse.c     | 3 +--
 client/cmddata.c        | 3 +--
 client/cmdhf.c          | 3 +--
 client/cmdhf14a.c       | 3 +--
 client/cmdhf14b.c       | 3 +--
 client/cmdhf15.c        | 5 ++---
 client/cmdhfepa.c       | 3 +--
 client/cmdhffelica.c    | 3 +--
 client/cmdhffido.c      | 3 +--
 client/cmdhficlass.c    | 3 +--
 client/cmdhflegic.c     | 3 +--
 client/cmdhfmf.c        | 3 +--
 client/cmdhfmfdes.c     | 3 +--
 client/cmdhfmfdesfire.c | 3 +--
 client/cmdhfmfp.c       | 3 +--
 client/cmdhfmfu.c       | 3 +--
 client/cmdhftopaz.c     | 3 +--
 client/cmdlf.c          | 3 +--
 client/cmdlfawid.c      | 3 +--
 client/cmdlfcotag.c     | 3 +--
 client/cmdlfem4x.c      | 3 +--
 client/cmdlffdx.c       | 3 +--
 client/cmdlfguard.c     | 3 +--
 client/cmdlfhid.c       | 3 +--
 client/cmdlfhitag.c     | 3 +--
 client/cmdlfindala.c    | 3 +--
 client/cmdlfio.c        | 3 +--
 client/cmdlfjablotron.c | 3 +--
 client/cmdlfkeri.c      | 3 +--
 client/cmdlfnedap.c     | 3 +--
 client/cmdlfnexwatch.c  | 3 +--
 client/cmdlfnoralsy.c   | 3 +--
 client/cmdlfpac.c       | 3 +--
 client/cmdlfparadox.c   | 3 +--
 client/cmdlfpcf7931.c   | 3 +--
 client/cmdlfpresco.c    | 3 +--
 client/cmdlfpyramid.c   | 3 +--
 client/cmdlfsecurakey.c | 3 +--
 client/cmdlft55xx.c     | 3 +--
 client/cmdlfti.c        | 3 +--
 client/cmdlfviking.c    | 3 +--
 client/cmdlfvisa2000.c  | 3 +--
 client/cmdscript.c      | 3 +--
 client/cmdsmartcard.c   | 3 +--
 client/cmdtrace.c       | 3 +--
 client/emv/cmdemv.c     | 3 +--
 46 files changed, 47 insertions(+), 93 deletions(-)

diff --git a/client/cmdanalyse.c b/client/cmdanalyse.c
index 97e4eae0b..3e334efc5 100644
--- a/client/cmdanalyse.c
+++ b/client/cmdanalyse.c
@@ -925,6 +925,5 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdAnalyse(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
diff --git a/client/cmddata.c b/client/cmddata.c
index 78e6df0a7..80ebc7317 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -2147,7 +2147,6 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdData(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
diff --git a/client/cmdhf.c b/client/cmdhf.c
index 4c4f6f7df..713f5821d 100644
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -127,8 +127,7 @@ static command_t CommandTable[] = {
 
 int CmdHF(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 int CmdHelp(const char *Cmd) {
diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 6429d3c99..074db3706 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -1156,8 +1156,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdHF14A(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 int infoHF14A(bool verbose, bool do_nack_test) {
diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c
index 6fa549468..4f06e5b75 100644
--- a/client/cmdhf14b.c
+++ b/client/cmdhf14b.c
@@ -1120,8 +1120,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdHF14B(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 // get and print all info known about any known 14b tag
diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index 9aef649cc..58fe81945 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -1293,7 +1293,7 @@ static int CmdHF15Restore(const char *Cmd) {
     return 0;
 }
 
-static command_t CommandTable15[] = {
+static command_t CommandTable[] = {
     {"help",        CmdHF15Help,        1, "This help"},
     {"demod",       CmdHF15Demod,       1, "Demodulate ISO15693 from tag"},
     {"dump",        CmdHF15Dump,        0, "Read all memory pages of an ISO15693 tag, save to file"},
@@ -1320,8 +1320,7 @@ static int CmdHF15Help(const char *Cmd) {
 
 int CmdHF15(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable15, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 // used with 'hf search'
diff --git a/client/cmdhfepa.c b/client/cmdhfepa.c
index 6a7674ddd..3f95894e7 100644
--- a/client/cmdhfepa.c
+++ b/client/cmdhfepa.c
@@ -178,6 +178,5 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdHFEPA(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
diff --git a/client/cmdhffelica.c b/client/cmdhffelica.c
index e628101b3..24cc696b3 100644
--- a/client/cmdhffelica.c
+++ b/client/cmdhffelica.c
@@ -562,8 +562,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdHFFelica(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 int readFelicaUid(bool verbose) {
diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index f834fd32c..2bdb9421b 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -906,8 +906,7 @@ static command_t CommandTable[] = {
 
 int CmdHFFido(const char *Cmd) {
     (void)WaitForResponseTimeout(CMD_ACK, NULL, 100);
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 int CmdHelp(const char *Cmd) {
diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index faa8f3941..bfd76d377 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -2454,8 +2454,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdHFiClass(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 int readIclass(bool loop, bool verbose) {
diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index 78b0d24a2..18555b957 100644
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -1311,8 +1311,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdHFLegic(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 int readLegicUid(bool verbose) {
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 96bfb06b6..2a4430262 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -3585,7 +3585,6 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdHFMF(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
diff --git a/client/cmdhfmfdes.c b/client/cmdhfmfdes.c
index cfe531050..fc903361e 100644
--- a/client/cmdhfmfdes.c
+++ b/client/cmdhfmfdes.c
@@ -659,7 +659,6 @@ static int CmdHelp(const char *Cmd) {
 int CmdHFMFDes(const char *Cmd) {
     // flush
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
diff --git a/client/cmdhfmfdesfire.c b/client/cmdhfmfdesfire.c
index 824190ba7..ac078f2ce 100644
--- a/client/cmdhfmfdesfire.c
+++ b/client/cmdhfmfdesfire.c
@@ -241,6 +241,5 @@ static int CmdHelp(const char *Cmd) {
 int CmdHFMFDesfire(const char *Cmd) {
     // flush
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
diff --git a/client/cmdhfmfp.c b/client/cmdhfmfp.c
index 32566988e..4b6d2afb2 100644
--- a/client/cmdhfmfp.c
+++ b/client/cmdhfmfp.c
@@ -862,7 +862,6 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdHFMFP(const char *Cmd) {
     (void)WaitForResponseTimeout(CMD_ACK, NULL, 100);
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index 3e41e1608..ca7ae75be 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -2671,7 +2671,6 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdHFMFUltra(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
diff --git a/client/cmdhftopaz.c b/client/cmdhftopaz.c
index 962a19c8d..3cf443c76 100644
--- a/client/cmdhftopaz.c
+++ b/client/cmdhftopaz.c
@@ -525,8 +525,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdHFTopaz(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 int readTopazUid(void) {
diff --git a/client/cmdlf.c b/client/cmdlf.c
index ae8dc39dd..4a78f6e92 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -1007,8 +1007,7 @@ static command_t CommandTable[] = {
 
 int CmdLF(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 int CmdHelp(const char *Cmd) {
diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c
index 4b22292bf..d28d4bc37 100644
--- a/client/cmdlfawid.c
+++ b/client/cmdlfawid.c
@@ -522,8 +522,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdLFAWID(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 //refactored by marshmellow
diff --git a/client/cmdlfcotag.c b/client/cmdlfcotag.c
index a8deaf584..98d1cbe1a 100644
--- a/client/cmdlfcotag.c
+++ b/client/cmdlfcotag.c
@@ -118,8 +118,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdLFCOTAG(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 int demodCOTAG(void) {
diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 10faa0de9..266b8d0a2 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -1495,8 +1495,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdLFEM4X(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 int demodEM410x(void) {
diff --git a/client/cmdlffdx.c b/client/cmdlffdx.c
index 7eb4d37b6..060717d50 100644
--- a/client/cmdlffdx.c
+++ b/client/cmdlffdx.c
@@ -344,8 +344,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdLFFdx(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 // Ask/Biphase Demod then try to locate an ISO 11784/85 ID
diff --git a/client/cmdlfguard.c b/client/cmdlfguard.c
index 8959583dc..b92129fd8 100644
--- a/client/cmdlfguard.c
+++ b/client/cmdlfguard.c
@@ -241,8 +241,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdLFGuard(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 // by marshmellow
diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c
index 4a4e43f5a..5675b1824 100644
--- a/client/cmdlfhid.c
+++ b/client/cmdlfhid.c
@@ -624,8 +624,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdLFHID(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 int demodHID(void) {
diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index 32d346f75..ede8c3cd1 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -720,8 +720,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdLFHitag(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 int readHitagUid(void) {
diff --git a/client/cmdlfindala.c b/client/cmdlfindala.c
index ff19b9e27..c4ad8bb3b 100644
--- a/client/cmdlfindala.c
+++ b/client/cmdlfindala.c
@@ -480,8 +480,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdLFINDALA(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 // redesigned by marshmellow adjusted from existing decode functions
diff --git a/client/cmdlfio.c b/client/cmdlfio.c
index cbba850c0..cc5fec9d5 100644
--- a/client/cmdlfio.c
+++ b/client/cmdlfio.c
@@ -282,8 +282,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdLFIO(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 int demodIOProx(void) {
diff --git a/client/cmdlfjablotron.c b/client/cmdlfjablotron.c
index 0febca75c..fbe1168a6 100644
--- a/client/cmdlfjablotron.c
+++ b/client/cmdlfjablotron.c
@@ -217,8 +217,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdLFJablotron(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 int getJablotronBits(uint64_t fullcode, uint8_t *bits) {
diff --git a/client/cmdlfkeri.c b/client/cmdlfkeri.c
index 5815b8b6a..10e171bdd 100644
--- a/client/cmdlfkeri.c
+++ b/client/cmdlfkeri.c
@@ -214,8 +214,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdLFKeri(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 // find KERI preamble in already demoded data
diff --git a/client/cmdlfnedap.c b/client/cmdlfnedap.c
index bcf9496f4..43fd1a1b0 100644
--- a/client/cmdlfnedap.c
+++ b/client/cmdlfnedap.c
@@ -320,8 +320,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdLFNedap(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 // find nedap preamble in already demoded data
diff --git a/client/cmdlfnexwatch.c b/client/cmdlfnexwatch.c
index 67536d06e..6adc3bc1a 100644
--- a/client/cmdlfnexwatch.c
+++ b/client/cmdlfnexwatch.c
@@ -89,8 +89,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdLFNEXWATCH(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 int detectNexWatch(uint8_t *dest, size_t *size, bool *invert) {
diff --git a/client/cmdlfnoralsy.c b/client/cmdlfnoralsy.c
index fc3a6fb14..66b2183af 100644
--- a/client/cmdlfnoralsy.c
+++ b/client/cmdlfnoralsy.c
@@ -222,8 +222,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdLFNoralsy(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 int getnoralsyBits(uint32_t id, uint16_t year, uint8_t *bits) {
diff --git a/client/cmdlfpac.c b/client/cmdlfpac.c
index 5aa1edd45..333269494 100644
--- a/client/cmdlfpac.c
+++ b/client/cmdlfpac.c
@@ -71,8 +71,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdLFPac(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 // by marshmellow
diff --git a/client/cmdlfparadox.c b/client/cmdlfparadox.c
index 3b76c9ac6..173871e0e 100644
--- a/client/cmdlfparadox.c
+++ b/client/cmdlfparadox.c
@@ -164,8 +164,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdLFParadox(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 // loop to get raw paradox waveform then FSK demodulate the TAG ID from it
diff --git a/client/cmdlfpcf7931.c b/client/cmdlfpcf7931.c
index 686ded78c..ad212f926 100644
--- a/client/cmdlfpcf7931.c
+++ b/client/cmdlfpcf7931.c
@@ -173,7 +173,6 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdLFPCF7931(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
diff --git a/client/cmdlfpresco.c b/client/cmdlfpresco.c
index 1d6d3de44..0560862ec 100644
--- a/client/cmdlfpresco.c
+++ b/client/cmdlfpresco.c
@@ -175,8 +175,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdLFPresco(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 // find presco preamble 0x10D in already demoded data
diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c
index 60fd5396a..cb146edd3 100644
--- a/client/cmdlfpyramid.c
+++ b/client/cmdlfpyramid.c
@@ -295,8 +295,7 @@ static command_t CommandTable[] = {
 
 int CmdLFPyramid(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 int CmdHelp(const char *Cmd) {
diff --git a/client/cmdlfsecurakey.c b/client/cmdlfsecurakey.c
index ab5079dd5..23acad670 100644
--- a/client/cmdlfsecurakey.c
+++ b/client/cmdlfsecurakey.c
@@ -116,8 +116,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdLFSecurakey(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 // by marshmellow
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 2f6fb3775..65693dac6 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -2335,7 +2335,6 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdLFT55XX(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
diff --git a/client/cmdlfti.c b/client/cmdlfti.c
index b675f693a..9276c903c 100644
--- a/client/cmdlfti.c
+++ b/client/cmdlfti.c
@@ -315,8 +315,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdLFTI(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 int demodTI(void) {
diff --git a/client/cmdlfviking.c b/client/cmdlfviking.c
index d0a42295b..3234da145 100644
--- a/client/cmdlfviking.c
+++ b/client/cmdlfviking.c
@@ -143,8 +143,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdLFViking(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 // calc checksum
diff --git a/client/cmdlfvisa2000.c b/client/cmdlfvisa2000.c
index 05fe3f098..6a6b14f00 100644
--- a/client/cmdlfvisa2000.c
+++ b/client/cmdlfvisa2000.c
@@ -227,8 +227,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdLFVisa2k(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 // by iceman
diff --git a/client/cmdscript.c b/client/cmdscript.c
index bcaf581bf..ba581290f 100644
--- a/client/cmdscript.c
+++ b/client/cmdscript.c
@@ -193,7 +193,6 @@ static int CmdHelp(const char *Cmd) {
  */
 int CmdScript(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index 656753395..3f933b4ad 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -1166,8 +1166,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdSmartcard(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 int ExchangeAPDUSC(uint8_t *datain, int datainlen, bool activateCard, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
diff --git a/client/cmdtrace.c b/client/cmdtrace.c
index 88be40892..7cda18d77 100644
--- a/client/cmdtrace.c
+++ b/client/cmdtrace.c
@@ -586,8 +586,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdTrace(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 int CmdTraceList(const char *Cmd) {
diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index 2fceab02b..8af27b9a8 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -1968,7 +1968,6 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdEMV(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 

From a6f52e839f4ed5fd0ece77ecfd9dcc5076d2daab Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 19 Apr 2019 01:14:04 +0200
Subject: [PATCH 1342/1938] fix bug

---
 client/cmdhf15.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index 58fe81945..f1a49eb9b 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -1314,7 +1314,7 @@ static command_t CommandTable[] = {
 
 static int CmdHF15Help(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
-    CmdsHelp(CommandTable15);
+    CmdsHelp(CommandTable);
     return 0;
 }
 

From 9b4896225c1b28a5144415323568ede30348dbec Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 19 Apr 2019 01:14:33 +0200
Subject: [PATCH 1343/1938] SendCommandOLD for hf_young

---
 armsrc/Standalone/hf_young.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/armsrc/Standalone/hf_young.c b/armsrc/Standalone/hf_young.c
index 324f9cf8e..c931417be 100644
--- a/armsrc/Standalone/hf_young.c
+++ b/armsrc/Standalone/hf_young.c
@@ -132,9 +132,7 @@ void RunMod() {
             SpinDelay(500);
             // Begin clone function here:
             /* Example from client/mifarehost.c for commanding a block write for "magic Chinese" cards:
-                    PacketCommandOLD c = {CMD_MIFARE_CSETBLOCK, {params & (0xFE | (uid == NULL ? 0:1)), blockNo, 0}};
-                    memcpy(c.d.asBytes, data, 16);
-                    SendCommand(&c);
+                    SendCommandOLD(CMD_MIFARE_CSETBLOCK, params & (0xFE | (uid == NULL ? 0:1)), blockNo, 0, data, 16);
 
                 Block read is similar:
                     PacketCommandOLD c = {CMD_MIFARE_CGETBLOCK, {params, blockNo, 0}};

From 45afe8dec00f17a53425b7e02572c06f680f0814 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 19 Apr 2019 01:14:58 +0200
Subject: [PATCH 1344/1938] errors retval for cmdemv

---
 client/emv/cmdemv.c | 112 +++++++++++++++++++++++---------------------
 1 file changed, 58 insertions(+), 54 deletions(-)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index 8af27b9a8..abd6467c3 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -102,7 +102,7 @@ static int CmdEMVSelect(const char *Cmd) {
     if (decodeTLV)
         TLVPrintFromBuffer(buf, len);
 
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdEMVSearch(const char *Cmd) {
@@ -140,7 +140,7 @@ static int CmdEMVSearch(const char *Cmd) {
 
     if (EMVSearch(channel, activateField, leaveSignalON, decodeTLV, t)) {
         tlvdb_free(t);
-        return 2;
+        return PM3_ERFTRANS;
     }
 
     PrintAndLogEx(SUCCESS, "Search completed.");
@@ -152,7 +152,7 @@ static int CmdEMVSearch(const char *Cmd) {
 
     tlvdb_free(t);
 
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdEMVPPSE(const char *Cmd) {
@@ -206,7 +206,7 @@ static int CmdEMVPPSE(const char *Cmd) {
     if (decodeTLV)
         TLVPrintFromBuffer(buf, len);
 
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdEMVGPO(const char *Cmd) {
@@ -272,7 +272,7 @@ static int CmdEMVGPO(const char *Cmd) {
             PrintAndLogEx(ERR, "Can't create PDOL TLV.");
             tlvdb_free(tmp_ext);
             tlvdb_free(tlvRoot);
-            return 4;
+            return PM3_ESOFT;
         }
     } else {
         if (paramsLoadFromFile) {
@@ -289,7 +289,7 @@ static int CmdEMVGPO(const char *Cmd) {
         tlvdb_free(tlvRoot);
         if (pdol_data_tlv != &data_tlv);
         free(pdol_data_tlv);
-        return 4;
+        return PM3_ESOFT;
     }
     PrintAndLogEx(INFO, "PDOL data[%d]: %s", pdol_data_tlv_data_len, sprint_hex(pdol_data_tlv_data, pdol_data_tlv_data_len));
 
@@ -314,7 +314,7 @@ static int CmdEMVGPO(const char *Cmd) {
     if (decodeTLV)
         TLVPrintFromBuffer(buf, len);
 
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdEMVReadRecord(const char *Cmd) {
@@ -348,7 +348,7 @@ static int CmdEMVReadRecord(const char *Cmd) {
 
     if (datalen != 2) {
         PrintAndLogEx(ERR, "Command needs to have 2 bytes of data");
-        return 1;
+        return PM3_EINVARG;
     }
 
     SetAPDULogging(APDULogging);
@@ -369,7 +369,7 @@ static int CmdEMVReadRecord(const char *Cmd) {
     if (decodeTLV)
         TLVPrintFromBuffer(buf, len);
 
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdEMVAC(const char *Cmd) {
@@ -411,7 +411,7 @@ static int CmdEMVAC(const char *Cmd) {
 
         if (termDecision == 0xff) {
             PrintAndLogEx(ERR, "ERROR: can't find terminal decision '%s'", arg_get_str(3)->sval[0]);
-            return 1;
+            return PM3_EINVARG;
         }
     } else {
         termDecision = EMVAC_TC;
@@ -458,7 +458,7 @@ static int CmdEMVAC(const char *Cmd) {
             PrintAndLogEx(ERR, "Can't create CDOL TLV.");
             tlvdb_free(tmp_ext);
             tlvdb_free(tlvRoot);
-            return 4;
+            return PM3_ESOFT;
         }
     } else {
         if (paramsLoadFromFile) {
@@ -490,7 +490,7 @@ static int CmdEMVAC(const char *Cmd) {
     if (decodeTLV)
         TLVPrintFromBuffer(buf, len);
 
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdEMVGenerateChallenge(const char *Cmd) {
@@ -535,7 +535,7 @@ static int CmdEMVGenerateChallenge(const char *Cmd) {
     if (len != 4 && len != 8)
         PrintAndLogEx(WARNING, "Length of challenge must be 4 or 8, but it %d", len);
 
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdEMVInternalAuthenticate(const char *Cmd) {
@@ -605,7 +605,7 @@ static int CmdEMVInternalAuthenticate(const char *Cmd) {
             PrintAndLogEx(ERR, "Can't create DDOL TLV.");
             tlvdb_free(tmp_ext);
             tlvdb_free(tlvRoot);
-            return 4;
+            return PM3_ESOFT;
         }
     } else {
         if (paramsLoadFromFile) {
@@ -637,7 +637,7 @@ static int CmdEMVInternalAuthenticate(const char *Cmd) {
     if (decodeTLV)
         TLVPrintFromBuffer(buf, len);
 
-    return 0;
+    return PM3_SUCCESS;
 }
 
 #define dreturn(n) {free(pdol_data_tlv); tlvdb_free(tlvSelect); tlvdb_free(tlvRoot); DropFieldEx( channel ); return n;}
@@ -813,7 +813,7 @@ static int CmdEMVExec(const char *Cmd) {
     // not compiled with smartcard functionality,  we need to exit
     if (channel == ECC_CONTACT) {
         PrintAndLogEx(WARNING, "PM3 Client is not compiled with support for SMARTCARD. Exiting.");
-        return 0;
+        return PM3_EDEVNOTSUPP;
     }
 #endif
 
@@ -843,7 +843,7 @@ static int CmdEMVExec(const char *Cmd) {
         PrintAndLogEx(NORMAL, "\n* Search AID in list.");
         SetAPDULogging(false);
         if (EMVSearch(channel, activateField, true, decodeTLV, tlvSelect)) {
-            dreturn(2);
+            dreturn(PM3_ERFTRANS);
         }
 
         // check search and select application id
@@ -858,7 +858,7 @@ static int CmdEMVExec(const char *Cmd) {
     // check if we found EMV application on card
     if (!AIDlen) {
         PrintAndLogEx(WARNING, "Can't select AID. EMV AID not found");
-        dreturn(2);
+        dreturn(PM3_ERFTRANS);
     }
 
     // Select
@@ -868,7 +868,7 @@ static int CmdEMVExec(const char *Cmd) {
 
     if (res) {
         PrintAndLogEx(WARNING, "Can't select AID (%d). Exit...", res);
-        dreturn(3);
+        dreturn(PM3_ERFTRANS);
     }
 
     if (decodeTLV)
@@ -883,14 +883,14 @@ static int CmdEMVExec(const char *Cmd) {
     pdol_data_tlv = dol_process(tlvdb_get(tlvRoot, 0x9f38, NULL), tlvRoot, 0x83);
     if (!pdol_data_tlv) {
         PrintAndLogEx(ERR, "Error: can't create PDOL TLV.");
-        dreturn(4);
+        dreturn(PM3_ESOFT);
     }
 
     size_t pdol_data_tlv_data_len;
     unsigned char *pdol_data_tlv_data = tlv_encode(pdol_data_tlv, &pdol_data_tlv_data_len);
     if (!pdol_data_tlv_data) {
         PrintAndLogEx(ERR, "Error: can't create PDOL data.");
-        dreturn(4);
+        dreturn(PM3_ESOFT);
     }
     PrintAndLogEx(NORMAL, "PDOL data[%d]: %s", pdol_data_tlv_data_len, sprint_hex(pdol_data_tlv_data, pdol_data_tlv_data_len));
 
@@ -902,7 +902,7 @@ static int CmdEMVExec(const char *Cmd) {
 
     if (res) {
         PrintAndLogEx(ERR, "GPO error(%d): %4x. Exit...", res, sw);
-        dreturn(5);
+        dreturn(PM3_ERFTRANS);
     }
 
     // process response template format 1 [id:80  2b AIP + x4b AFL] and format 2 [id:77 TLV]
@@ -1067,11 +1067,11 @@ static int CmdEMVExec(const char *Cmd) {
             res = EMVGenerateChallenge(channel, true, buf, sizeof(buf), &len, &sw, tlvRoot);
             if (res) {
                 PrintAndLogEx(ERR, "Error GetChallenge. APDU error %4x", sw);
-                dreturn(6);
+                dreturn(PM3_ERFTRANS);
             }
             if (len < 4) {
                 PrintAndLogEx(ERR, "Error GetChallenge. Wrong challenge length %d", len);
-                dreturn(6);
+                dreturn(PM3_ESOFT);
             }
 
             // ICC Dynamic Number
@@ -1086,7 +1086,7 @@ static int CmdEMVExec(const char *Cmd) {
             struct tlv *cdol_data_tlv = dol_process(tlvdb_get(tlvRoot, 0x8c, NULL), tlvRoot, 0x01); // 0x01 - dummy tag
             if (!cdol_data_tlv) {
                 PrintAndLogEx(ERR, "Error: can't create CDOL1 TLV.");
-                dreturn(6);
+                dreturn(PM3_ESOFT);
             }
 
             PrintAndLogEx(NORMAL, "CDOL1 data[%d]: %s", cdol_data_tlv->len, sprint_hex(cdol_data_tlv->value, cdol_data_tlv->len));
@@ -1097,7 +1097,7 @@ static int CmdEMVExec(const char *Cmd) {
 
             if (res) {
                 PrintAndLogEx(ERR, "AC1 error(%d): %4x. Exit...", res, sw);
-                dreturn(7);
+                dreturn(PM3_ERFTRANS);
             }
 
             if (decodeTLV)
@@ -1176,7 +1176,7 @@ static int CmdEMVExec(const char *Cmd) {
                 struct tlv *udol_data_tlv = dol_process(UDOL ? UDOL : &defUDOL, tlvRoot, 0x01); // 0x01 - dummy tag
                 if (!udol_data_tlv) {
                     PrintAndLogEx(ERR, "Error: can't create UDOL TLV.");
-                    dreturn(8);
+                    dreturn(PM3_ESOFT);
                 }
 
                 PrintAndLogEx(NORMAL, "UDOL data[%d]: %s", udol_data_tlv->len, sprint_hex(udol_data_tlv->value, udol_data_tlv->len));
@@ -1187,7 +1187,7 @@ static int CmdEMVExec(const char *Cmd) {
                 if (res) {
                     PrintAndLogEx(ERR, "Error Compute Crypto Checksum. APDU error %4x", sw);
                     free(udol_data_tlv);
-                    dreturn(9);
+                    dreturn(PM3_ESOFT);
                 }
 
                 // Mastercard compute cryptographic checksum result
@@ -1210,7 +1210,7 @@ static int CmdEMVExec(const char *Cmd) {
         struct tlv *cdol1_data_tlv = dol_process(tlvdb_get(tlvRoot, 0x8c, NULL), tlvRoot, 0x01); // 0x01 - dummy tag
         if (!cdol1_data_tlv) {
             PrintAndLogEx(ERR, "Error: can't create CDOL1 TLV.");
-            dreturn(6);
+            dreturn(PM3_ESOFT);
         }
 
         PrintAndLogEx(NORMAL, "CDOL1 data[%d]: %s", cdol1_data_tlv->len, sprint_hex(cdol1_data_tlv->value, cdol1_data_tlv->len));
@@ -1222,7 +1222,7 @@ static int CmdEMVExec(const char *Cmd) {
         if (res) {
             PrintAndLogEx(ERR, "AC1 error(%d): %4x. Exit...", res, sw);
             free(cdol1_data_tlv);
-            dreturn(7);
+            dreturn(PM3_ERFTRANS);
         }
 
         // process Format1 (0x80) and print Format2 (0x77)
@@ -1313,7 +1313,7 @@ static int CmdEMVExec(const char *Cmd) {
             struct tlv *cdol2_data_tlv = dol_process(tlvdb_get(tlvRoot, 0x8d, NULL), tlvRoot, 0x01); // 0x01 - dummy tag
             if (!cdol2_data_tlv) {
                 PrintAndLogEx(ERR, "Error: can't create CDOL2 TLV.");
-                dreturn(6);
+                dreturn(PM3_ESOFT);
             }
 
             PrintAndLogEx(NORMAL, "CDOL2 data[%d]: %s", cdol2_data_tlv->len, sprint_hex(cdol2_data_tlv->value, cdol2_data_tlv->len));
@@ -1337,7 +1337,7 @@ static int CmdEMVExec(const char *Cmd) {
     tlvdb_free(tlvRoot);
 
     PrintAndLogEx(NORMAL, "\n* Transaction completed.");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdEMVScan(const char *Cmd) {
@@ -1404,7 +1404,7 @@ static int CmdEMVScan(const char *Cmd) {
     // not compiled with smartcard functionality,  we need to exit
     if (channel == ECC_CONTACT) {
         PrintAndLogEx(ERR, "PM3 Client is not compiled with support for SMARTCARD. Exiting.");
-        return 0;
+        return PM3_EDEVNOTSUPP;
     }
 #endif
 
@@ -1421,12 +1421,12 @@ static int CmdEMVScan(const char *Cmd) {
         root = json_load_file(fname, 0, &error);
         if (!root) {
             PrintAndLogEx(ERR, "Json error on line %d: %s", error.line, error.text);
-            return 1;
+            return PM3_EFILE;
         }
 
         if (!json_is_object(root)) {
             PrintAndLogEx(ERR, "Invalid json format. root must be an object.");
-            return 1;
+            return PM3_EFILE;
         }
     } else {
         root = json_object();
@@ -1443,7 +1443,7 @@ static int CmdEMVScan(const char *Cmd) {
 
         iso14a_card_select_t card;
         if (Hf14443_4aGetCardData(&card)) {
-            return 2;
+            return PM3_ERFTRANS;
         }
 
         JsonSaveStr(root, "$.Card.Contactless.Communication", "iso14443-4a");
@@ -1458,7 +1458,7 @@ static int CmdEMVScan(const char *Cmd) {
         smart_select(true, &card);
         if (!card.atr_len) {
             PrintAndLogEx(ERR, "Can't get ATR from a smart card.");
-            return 1;
+            return PM3_ERFTRANS;
         }
 
         JsonSaveStr(root, "$.Card.Contact.Communication", "iso7816");
@@ -1501,7 +1501,7 @@ static int CmdEMVScan(const char *Cmd) {
             PrintAndLogEx(ERR, "Can't found any of EMV AID. Exit...");
             tlvdb_free(tlvSelect);
             DropFieldEx(channel);
-            return 3;
+            return PM3_ERFTRANS;
         }
 
         // check search and select application id
@@ -1517,7 +1517,7 @@ static int CmdEMVScan(const char *Cmd) {
     if (!AIDlen) {
         PrintAndLogEx(INFO, "Can't select AID. EMV AID not found. Exit...");
         DropFieldEx(channel);
-        return 4;
+        return PM3_ERFTRANS;
     }
 
     JsonSaveBufAsHex(root, "$.Application.AID", AID, AIDlen);
@@ -1536,7 +1536,7 @@ static int CmdEMVScan(const char *Cmd) {
         PrintAndLogEx(ERR, "Can't select AID (%d). Exit...", res);
         tlvdb_free(tlvRoot);
         DropFieldEx(channel);
-        return 5;
+        return PM3_ERFTRANS;
     }
 
     if (decodeTLV)
@@ -1564,7 +1564,7 @@ static int CmdEMVScan(const char *Cmd) {
         PrintAndLogEx(ERR, "Can't create PDOL TLV.");
         tlvdb_free(tlvRoot);
         DropFieldEx(channel);
-        return 6;
+        return PM3_ESOFT;
     }
 
     size_t pdol_data_tlv_data_len;
@@ -1574,7 +1574,7 @@ static int CmdEMVScan(const char *Cmd) {
         tlvdb_free(tlvRoot);
         free(pdol_data_tlv);
         DropFieldEx(channel);
-        return 6;
+        return PM3_ESOFT;
     }
     PrintAndLogEx(INFO, "PDOL data[%d]: %s", pdol_data_tlv_data_len, sprint_hex(pdol_data_tlv_data, pdol_data_tlv_data_len));
 
@@ -1588,7 +1588,7 @@ static int CmdEMVScan(const char *Cmd) {
         PrintAndLogEx(ERR, "GPO error(%d): %4x. Exit...", res, sw);
         tlvdb_free(tlvRoot);
         DropFieldEx(channel);
-        return 7;
+        return PM3_ERFTRANS;
     }
     ProcessGPOResponseFormat1(tlvRoot, buf, len, decodeTLV);
 
@@ -1684,14 +1684,14 @@ static int CmdEMVScan(const char *Cmd) {
     res = json_dump_file(root, fname, JSON_INDENT(2));
     if (res) {
         PrintAndLogEx(ERR, "Can't save the file: %s", fname);
-        return 200;
+        return PM3_EFILE;
     }
     PrintAndLogEx(SUCCESS, "File " _YELLOW_("`%s`") " saved.", fname);
 
     // free json object
     json_decref(root);
 
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdEMVList(const char *Cmd) {
@@ -1740,7 +1740,7 @@ static int CmdEMVRoca(const char *Cmd) {
     // not compiled with smartcard functionality,  we need to exit
     if (channel == ECC_CONTACT) {
         PrintAndLogEx(WARNING, "PM3 Client is not compiled with support for SMARTCARD. Exiting.");
-        return 0;
+        return PM3_EDEVNOTSUPP;
     }
 #endif
 
@@ -1767,7 +1767,7 @@ static int CmdEMVRoca(const char *Cmd) {
             PrintAndLogEx(ERR, "Can't found any of EMV AID. Exit...");
             tlvdb_free(tlvSelect);
             DropFieldEx(channel);
-            return 3;
+            return PM3_ERFTRANS;
         }
 
         // check search and select application id
@@ -1783,7 +1783,7 @@ static int CmdEMVRoca(const char *Cmd) {
     if (!AIDlen) {
         PrintAndLogEx(INFO, "Can't select AID. EMV AID not found. Exit...");
         DropFieldEx(channel);
-        return 4;
+        return PM3_ERFTRANS;
     }
 
     // Init TLV tree
@@ -1798,7 +1798,7 @@ static int CmdEMVRoca(const char *Cmd) {
         PrintAndLogEx(ERR, "Can't select AID (%d). Exit...", res);
         tlvdb_free(tlvRoot);
         DropFieldEx(channel);
-        return 5;
+        return PM3_ERFTRANS;
     }
 
     PrintAndLogEx(NORMAL, "\n* Init transaction parameters.");
@@ -1810,7 +1810,7 @@ static int CmdEMVRoca(const char *Cmd) {
         PrintAndLogEx(ERR, "Can't create PDOL TLV.");
         tlvdb_free(tlvRoot);
         DropFieldEx(channel);
-        return 6;
+        return PM3_ESOFT;
     }
 
     size_t pdol_data_tlv_data_len;
@@ -1820,7 +1820,7 @@ static int CmdEMVRoca(const char *Cmd) {
         tlvdb_free(tlvRoot);
         DropFieldEx(channel);
         free(pdol_data_tlv);
-        return 6;
+        return PM3_ESOFT;
     }
     PrintAndLogEx(INFO, "PDOL data[%d]: %s", pdol_data_tlv_data_len, sprint_hex(pdol_data_tlv_data, pdol_data_tlv_data_len));
 
@@ -1834,7 +1834,7 @@ static int CmdEMVRoca(const char *Cmd) {
         PrintAndLogEx(ERR, "GPO error(%d): %4x. Exit...", res, sw);
         tlvdb_free(tlvRoot);
         DropFieldEx(channel);
-        return 7;
+        return PM3_ERFTRANS;
     }
     ProcessGPOResponseFormat1(tlvRoot, buf, len, false);
 
@@ -1874,6 +1874,7 @@ static int CmdEMVRoca(const char *Cmd) {
     }
 
     // getting certificates
+    int ret = PM3_SUCCESS;
     if (tlvdb_get(tlvRoot, 0x90, NULL)) {
         PrintAndLogEx(INFO, "-->Recovering certificates.");
         PKISetStrictExecution(false);
@@ -1881,6 +1882,7 @@ static int CmdEMVRoca(const char *Cmd) {
         struct emv_pk *pk = get_ca_pk(tlvRoot);
         if (!pk) {
             PrintAndLogEx(ERR, "ERROR: Key not found. Exit.");
+            ret = PM3_ESOFT;
             goto out;
         }
 
@@ -1888,6 +1890,7 @@ static int CmdEMVRoca(const char *Cmd) {
         if (!issuer_pk) {
             emv_pk_free(pk);
             PrintAndLogEx(WARNING, "WARNING: Issuer certificate not found. Exit.");
+            ret = PM3_ESOFT;
             goto out;
         }
 
@@ -1903,6 +1906,7 @@ static int CmdEMVRoca(const char *Cmd) {
             emv_pk_free(pk);
             emv_pk_free(issuer_pk);
             PrintAndLogEx(WARNING, "WARNING: ICC certificate not found. Exit.");
+            ret = PM3_ESOFT;
             goto out;
         }
         PrintAndLogEx(SUCCESS, "ICC PK recovered. RID %s IDX %02hhx CSN %s\n",
@@ -1932,7 +1936,7 @@ out:
     tlvdb_free(tlvRoot);
 
     DropFieldEx(channel);
-    return 0;
+    return ret;
 }
 
 static command_t CommandTable[] =  {
@@ -1963,7 +1967,7 @@ static command_t CommandTable[] =  {
 static int CmdHelp(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 int CmdEMV(const char *Cmd) {

From 2ac5482d9c72aac24d532ff799a906464c3895c0 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 19 Apr 2019 01:45:45 +0200
Subject: [PATCH 1345/1938] SendCommandOLD & errors retval: mifarehost

---
 client/mifare/mifarehost.c | 178 ++++++++++++++++---------------------
 1 file changed, 79 insertions(+), 99 deletions(-)

diff --git a/client/mifare/mifarehost.c b/client/mifare/mifarehost.c
index 0c905fdc4..d8a32cf62 100644
--- a/client/mifare/mifarehost.c
+++ b/client/mifare/mifarehost.c
@@ -15,8 +15,7 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
     uint32_t nt = 0, nr = 0, ar = 0;
     uint64_t par_list = 0, ks_list = 0;
     uint64_t *keylist = NULL, *last_keylist = NULL;
-
-    PacketCommandOLD c = {CMD_READER_MIFARE, {true, blockno, key_type}, {{0}}};
+    bool arg0 = true;
 
     // message
     PrintAndLogEx(NORMAL, "--------------------------------------------------------------------------------\n");
@@ -26,13 +25,13 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
 
     while (true) {
         clearCommandBuffer();
-        SendCommand(&c);
+        SendCommandOLD(CMD_READER_MIFARE, arg0, blockno, key_type, NULL, 0);
 
         //flush queue
         while (ukbhit()) {
             int gc = getchar();
             (void)gc;
-            return -5;
+            return PM3_EOPABORTED;
         }
 
         // wait cycle
@@ -42,7 +41,7 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
             if (ukbhit()) {
                 int gc = getchar();
                 (void)gc;
-                return -5;
+                return PM3_EOPABORTED;
             }
 
             PacketResponseNG resp;
@@ -62,10 +61,10 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
         }
         PrintAndLogEx(NORMAL, "\n");
 
-        if (par_list == 0 && c.arg[0] == true) {
+        if (par_list == 0 && arg0 == true) {
             PrintAndLogEx(SUCCESS, "Parity is all zero. Most likely this card sends NACK on every authentication.");
         }
-        c.arg[0] = false;
+        arg0 = false;
 
         uint32_t keycount = nonce2key(uid, nt, nr, ar, par_list, ks_list, &keylist);
 
@@ -114,24 +113,22 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
             PrintAndLogEx(FAILED, "all candidate keys failed. Restarting darkside attack");
             free(last_keylist);
             last_keylist = keylist;
-            c.arg[0] = true;
+            arg0 = true;
         }
     }
     free(last_keylist);
     free(keylist);
-    return 0;
+    return PM3_SUCCESS;
 }
 int mfCheckKeys(uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t keycnt, uint8_t *keyBlock, uint64_t *key) {
     *key = -1;
-    PacketCommandOLD c = {CMD_MIFARE_CHKKEYS, { (blockNo | (keyType << 8)), clear_trace, keycnt}, {{0}}};
-    memcpy(c.d.asBytes, keyBlock, 6 * keycnt);
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_MIFARE_CHKKEYS, (blockNo | (keyType << 8)), clear_trace, keycnt, keyBlock, 6 * keycnt);
     PacketResponseNG resp;
-    if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) return 1;
-    if ((resp.oldarg[0] & 0xff) != 0x01) return 2;
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) return PM3_ETIMEOUT;
+    if ((resp.oldarg[0] & 0xff) != 0x01) return PM3_EUNDEF;
     *key = bytes_to_num(resp.data.asBytes, 6);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 // Sends chunks of keys to device.
@@ -145,10 +142,8 @@ int mfCheckKeys_fast(uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk,
     uint32_t timeout = 0;
 
     // send keychunk
-    PacketCommandOLD c = {CMD_MIFARE_CHKKEYS_FAST, { (sectorsCnt | (firstChunk << 8) | (lastChunk << 12)), ((use_flashmemory << 8) | strategy), size}, {{0}}};
-    memcpy(c.d.asBytes, keyBlock, 6 * size);
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_MIFARE_CHKKEYS_FAST, (sectorsCnt | (firstChunk << 8) | (lastChunk << 12)), ((use_flashmemory << 8) | strategy), size, keyBlock, 6 * size);
     PacketResponseNG resp;
 
     while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
@@ -160,7 +155,7 @@ int mfCheckKeys_fast(uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk,
         // takes about 97s, still some margin before abort
         if (timeout > 180) {
             PrintAndLogEx(WARNING, "\nNo response from Proxmark3. Aborting...");
-            return 2;
+            return PM3_ETIMEOUT;
         }
     }
     t2 = msclock() - t2;
@@ -297,11 +292,9 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo,
     StateList_t statelists[2];
     struct Crypto1State *p1, *p2, *p3, *p4;
 
-    PacketCommandOLD c = {CMD_MIFARE_NESTED, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, calibrate}, {{0}}};
-    memcpy(c.d.asBytes, key, 6);
     clearCommandBuffer();
-    SendCommand(&c);
-    if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return -1;
+    SendCommandOLD(CMD_MIFARE_NESTED, blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, calibrate, key, 6);
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return PM3_ETIMEOUT;
 
     // error during nested
     if (resp.oldarg[0]) return resp.oldarg[0];
@@ -419,10 +412,8 @@ out:
 // MIFARE
 int mfReadSector(uint8_t sectorNo, uint8_t keyType, uint8_t *key, uint8_t *data) {
 
-    PacketCommandOLD c = {CMD_MIFARE_READSC, {sectorNo, keyType, 0}, {{0}}};
-    memcpy(c.d.asBytes, key, 6);
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_MIFARE_READSC, sectorNo, keyType, 0, key, 6);
 
     PacketResponseNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
@@ -430,27 +421,26 @@ int mfReadSector(uint8_t sectorNo, uint8_t keyType, uint8_t *key, uint8_t *data)
 
         if (isOK) {
             memcpy(data, resp.data.asBytes, mfNumBlocksPerSector(sectorNo) * 16);
-            return 0;
+            return PM3_SUCCESS;
         } else {
-            return 1;
+            return PM3_EUNDEF;
         }
     } else {
         PrintAndLogEx(ERR, "Command execute timeout");
-        return 2;
+        return PM3_ETIMEOUT;
     }
 
-    return 0;
+    return PM3_SUCCESS;
 }
 
 // EMULATOR
 int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount) {
-    PacketCommandOLD c = {CMD_MIFARE_EML_MEMGET, {blockNum, blocksCount, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_MIFARE_EML_MEMGET, blockNum, blocksCount, 0, NULL, 0);
     PacketResponseNG resp;
-    if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return 1;
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return PM3_ETIMEOUT;
     memcpy(data, resp.data.asBytes, blocksCount * 16);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 int mfEmlSetMem(uint8_t *data, int blockNum, int blocksCount) {
@@ -458,11 +448,9 @@ int mfEmlSetMem(uint8_t *data, int blockNum, int blocksCount) {
 }
 
 int mfEmlSetMem_xt(uint8_t *data, int blockNum, int blocksCount, int blockBtWidth) {
-    PacketCommandOLD c = {CMD_MIFARE_EML_MEMSET, {blockNum, blocksCount, blockBtWidth}, {{0}}};
-    memcpy(c.d.asBytes, data, blocksCount * blockBtWidth);
     clearCommandBuffer();
-    SendCommand(&c);
-    return 0;
+    SendCommandOLD(CMD_MIFARE_EML_MEMSET, blockNum, blocksCount, blockBtWidth, data, blocksCount * blockBtWidth);
+    return PM3_SUCCESS;
 }
 
 // "MAGIC" CARD
@@ -501,39 +489,36 @@ int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, uint8_
 
 int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, uint8_t params) {
 
-    PacketCommandOLD c = {CMD_MIFARE_CSETBLOCK, {params, blockNo, 0}, {{0}}};
-    memcpy(c.d.asBytes, data, 16);
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_MIFARE_CSETBLOCK, params, blockNo, 0, data, 16);
     PacketResponseNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         uint8_t isOK  = resp.oldarg[0] & 0xff;
         if (uid != NULL)
             memcpy(uid, resp.data.asBytes, 4);
         if (!isOK)
-            return 2;
+            return PM3_EUNDEF;
     } else {
         PrintAndLogEx(WARNING, "command execute timeout");
-        return 1;
+        return PM3_ETIMEOUT;
     }
-    return 0;
+    return PM3_SUCCESS;
 }
 
 int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params) {
-    PacketCommandOLD c = {CMD_MIFARE_CGETBLOCK, {params, blockNo, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_MIFARE_CGETBLOCK, params, blockNo, 0, NULL, 0);
     PacketResponseNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         uint8_t isOK  = resp.oldarg[0] & 0xff;
         if (!isOK)
-            return 2;
+            return PM3_EUNDEF;
         memcpy(data, resp.data.asBytes, 16);
     } else {
         PrintAndLogEx(WARNING, "command execute timeout");
-        return 1;
+        return PM3_ETIMEOUT;
     }
-    return 0;
+    return PM3_SUCCESS;
 }
 
 // SNIFFER
@@ -586,7 +571,7 @@ int loadTraceCard(uint8_t *tuid, uint8_t uidlen) {
     FillFileNameByUID(traceFileName, tuid, ".eml", uidlen);
 
     f = fopen(traceFileName, "r");
-    if (!f) return 1;
+    if (!f) return PM3_EFILE;
 
     blockNum = 0;
 
@@ -596,14 +581,14 @@ int loadTraceCard(uint8_t *tuid, uint8_t uidlen) {
         if (fgets(buf, sizeof(buf), f) == NULL) {
             PrintAndLogEx(FAILED, "No trace file found or reading error.");
             fclose(f);
-            return 2;
+            return PM3_EFILE;
         }
 
         if (strlen(buf) < 32) {
             if (feof(f)) break;
             PrintAndLogEx(FAILED, "File content error. Block data must include 32 HEX symbols");
             fclose(f);
-            return 2;
+            return PM3_EFILE;
         }
         for (i = 0; i < 32; i += 2) {
             sscanf(&buf[i], "%02X", &tmp);
@@ -615,16 +600,16 @@ int loadTraceCard(uint8_t *tuid, uint8_t uidlen) {
         blockNum++;
     }
     fclose(f);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 int saveTraceCard(void) {
 
-    if ((!strlen(traceFileName)) || (isTraceCardEmpty())) return 0;
+    if ((!strlen(traceFileName)) || (isTraceCardEmpty())) return PM3_ESOFT;
 
     FILE *f;
     f = fopen(traceFileName, "w+");
-    if (!f) return 1;
+    if (!f) return PM3_EFILE;
 
     // given 4096 tracecard size,  these loop will only match a 1024, 1kb card memory
     // 4086/16 == 256blocks.
@@ -638,7 +623,7 @@ int saveTraceCard(void) {
     }
     fflush(f);
     fclose(f);
-    return 0;
+    return PM3_SUCCESS;
 }
 //
 int mfTraceInit(uint8_t *tuid, uint8_t uidlen, uint8_t *atqa, uint8_t sak, bool wantSaveToEmlFile) {
@@ -657,7 +642,7 @@ int mfTraceInit(uint8_t *tuid, uint8_t uidlen, uint8_t *atqa, uint8_t sak, bool
     traceCurBlock = 0;
     cuid = bytes_to_num(tuid + (uidlen - 4), 4);
     traceState = TRACE_IDLE;
-    return 0;
+    return PM3_SUCCESS;
 }
 
 void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len, bool isEncrypted) {
@@ -680,11 +665,11 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
     uint32_t ar_enc = 0;  // encrypted reader response
     uint32_t at_enc = 0;  // encrypted tag response
     if (traceState == TRACE_ERROR)
-        return 1;
+        return PM3_ESOFT;
 
     if (len > 255) {
         traceState = TRACE_ERROR;
-        return 1;
+        return PM3_ESOFT;
     }
 
     uint8_t data[255];
@@ -705,7 +690,7 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
                 PrintAndLogEx(NORMAL, "DEC| CRC ERROR!!!");
                 AddLogLine(logHexFileName, "DEC| ", "CRC ERROR!!!");
                 traceState = TRACE_ERROR;  // do not decrypt the next commands
-                return 1;
+                return PM3_ESOFT;
             }
 
             // AUTHENTICATION
@@ -713,29 +698,29 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
                 traceState = TRACE_AUTH1;
                 traceCurBlock = data[1];
                 traceCurKey = data[0] == 60 ? 1 : 0;
-                return 0;
+                return PM3_SUCCESS;
             }
 
             // READ
             if ((len == 4) && ((data[0] == ISO14443A_CMD_READBLOCK))) {
                 traceState = TRACE_READ_DATA;
                 traceCurBlock = data[1];
-                return 0;
+                return PM3_SUCCESS;
             }
 
             // WRITE
             if ((len == 4) && ((data[0] == ISO14443A_CMD_WRITEBLOCK))) {
                 traceState = TRACE_WRITE_OK;
                 traceCurBlock = data[1];
-                return 0;
+                return PM3_SUCCESS;
             }
 
             // HALT
             if ((len == 4) && ((data[0] == ISO14443A_CMD_HALT) && (data[1] == 0x00))) {
                 traceState = TRACE_ERROR;  // do not decrypt the next commands
-                return 0;
+                return PM3_SUCCESS;
             }
-            return 0;
+            return PM3_SUCCESS;
 
         case TRACE_READ_DATA:
             if (len == 18) {
@@ -747,19 +732,19 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
                     memcpy(traceCard + traceCurBlock * 16, data, 16);
                 }
                 if (wantSaveToEmlFile) saveTraceCard();
-                return 0;
+                return PM3_SUCCESS;
             } else {
                 traceState = TRACE_ERROR;
-                return 1;
+                return PM3_ESOFT;
             }
             break;
         case TRACE_WRITE_OK:
             if ((len == 1) && (data[0] == 0x0a)) {
                 traceState = TRACE_WRITE_DATA;
-                return 0;
+                return PM3_SUCCESS;
             } else {
                 traceState = TRACE_ERROR;
-                return 1;
+                return PM3_ESOFT;
             }
             break;
         case TRACE_WRITE_DATA:
@@ -767,20 +752,20 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
                 traceState = TRACE_IDLE;
                 memcpy(traceCard + traceCurBlock * 16, data, 16);
                 if (wantSaveToEmlFile) saveTraceCard();
-                return 0;
+                return PM3_SUCCESS;
             } else {
                 traceState = TRACE_ERROR;
-                return 1;
+                return PM3_ESOFT;
             }
             break;
         case TRACE_AUTH1:
             if (len == 4) {
                 traceState = TRACE_AUTH2;
                 //nt = bytes_to_num(data, 4);
-                return 0;
+                return PM3_SUCCESS;
             } else {
                 traceState = TRACE_ERROR;
-                return 1;
+                return PM3_ESOFT;
             }
             break;
         case TRACE_AUTH2:
@@ -788,10 +773,10 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
                 traceState = TRACE_AUTH_OK;
                 //nr_enc = bytes_to_num(data, 4);
                 //ar_enc = bytes_to_num(data + 4, 4);
-                return 0;
+                return PM3_SUCCESS;
             } else {
                 traceState = TRACE_ERROR;
-                return 1;
+                return PM3_ESOFT;
             }
             break;
         case TRACE_AUTH_OK:
@@ -843,9 +828,9 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
             break;
         default:
             traceState = TRACE_ERROR;
-            return 1;
+            return PM3_ESOFT;
     }
-    return 0;
+    return PM3_SUCCESS;
 }
 
 int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t *data, int len) {
@@ -857,7 +842,7 @@ int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t *data,
     mf_crypto1_decrypt(s, data, len, false);
     PrintAndLogEx(SUCCESS, "decrypted data: [%s]", sprint_hex(data, len));
     crypto1_destroy(s);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 /* Detect Tag Prng,
@@ -873,31 +858,28 @@ int detect_classic_prng(void) {
     uint8_t cmd[] = {MIFARE_AUTH_KEYA, 0x00};
     uint32_t flags = ISO14A_CONNECT | ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_RATS;
 
-    PacketCommandOLD c = {CMD_READER_ISO_14443a, {flags, sizeof(cmd), 0}, {{0}}};
-    memcpy(c.d.asBytes, cmd, sizeof(cmd));
-
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_READER_ISO_14443a, flags, sizeof(cmd), 0, cmd, sizeof(cmd));
 
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
         PrintAndLogEx(WARNING, "PRNG UID: Reply timeout.");
-        return -1;
+        return PM3_ETIMEOUT;
     }
 
     // if select tag failed.
     if (resp.oldarg[0] == 0) {
         PrintAndLogEx(WARNING, "error:  selecting tag failed,  can't detect prng\n");
-        return -2;
+        return PM3_ERFTRANS;
     }
     if (!WaitForResponseTimeout(CMD_ACK, &respA, 2500)) {
         PrintAndLogEx(WARNING, "PRNG data: Reply timeout.");
-        return -3;
+        return PM3_ETIMEOUT;
     }
 
     // check respA
     if (respA.oldarg[0] != 4) {
         PrintAndLogEx(WARNING, "PRNG data error: Wrong length: %d", respA.oldarg[0]);
-        return -4;
+        return PM3_ESOFT;
     }
 
     uint32_t nonce = bytes_to_num(respA.data.asBytes, respA.oldarg[0]);
@@ -913,9 +895,8 @@ returns:
 */
 int detect_classic_nackbug(bool verbose) {
 
-    PacketCommandOLD c = {CMD_MIFARE_NACK_DETECT, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_MIFARE_NACK_DETECT, 0, 0, 0, NULL, 0);
     PacketResponseNG resp;
 
     if (verbose)
@@ -945,7 +926,7 @@ int detect_classic_nackbug(bool verbose) {
         if (ukbhit()) {
             int gc = getchar();
             (void)gc;
-            return -1;
+            return PM3_EOPABORTED;
         }
 
         if (WaitForResponseTimeout(CMD_ACK, &resp, 500)) {
@@ -961,47 +942,46 @@ int detect_classic_nackbug(bool verbose) {
             switch (ok) {
                 case 99 :
                     PrintAndLogEx(WARNING, "button pressed. Aborted.");
-                    return 0;
+                    return PM3_EOPABORTED;
                 case 96 :
                 case 98 : {
                     if (verbose)
                         PrintAndLogEx(FAILED, "card random number generator is not predictable.");
                     PrintAndLogEx(WARNING, "detection failed");
-                    return 2;
+                    return PM3_SUCCESS;
                 }
                 case 97 : {
                     if (verbose) {
                         PrintAndLogEx(FAILED, "card random number generator seems to be based on the well-known generating polynomial");
                         PrintAndLogEx(NORMAL, "[- ]with 16 effective bits only, but shows unexpected behavior, try again.");
                     }
-                    return 2;
+                    return PM3_SUCCESS;
                 }
                 case  2 :
                     PrintAndLogEx(SUCCESS, _GREEN_("always leak NACK detected"));
-                    return 3;
+                    return PM3_SUCCESS;
                 case  1 :
                     PrintAndLogEx(SUCCESS, _GREEN_("NACK bug detected"));
-                    return 1;
+                    return PM3_SUCCESS;
                 case  0 :
                     PrintAndLogEx(SUCCESS, "No NACK bug detected");
-                    return 2;
+                    return PM3_SUCCESS;
                 default :
                     PrintAndLogEx(WARNING, "errorcode from device [%i]", ok);
-                    return 0;
+                    return PM3_EUNDEF;
             }
             break;
         }
     }
-    return 0;
+    return PM3_SUCCESS;
 }
 /* try to see if card responses to "chinese magic backdoor" commands. */
 void detect_classic_magic(void) {
 
     uint8_t isGeneration = 0;
     PacketResponseNG resp;
-    PacketCommandOLD c = {CMD_MIFARE_CIDENT, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_MIFARE_CIDENT, 0, 0, 0, NULL, 0);
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500))
         isGeneration = resp.oldarg[0] & 0xff;
 

From b68ccfa7b8c9e784a9aebf87cb5c283507511410 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 19 Apr 2019 02:01:47 +0200
Subject: [PATCH 1346/1938] SendCommandOLD : comms & flash

---
 client/comms.c | 15 +++++----------
 client/flash.c | 28 +++++++---------------------
 client/util.h  |  2 +-
 3 files changed, 13 insertions(+), 32 deletions(-)

diff --git a/client/comms.c b/client/comms.c
index 1055f6dd4..a7f9ad42a 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -486,8 +486,7 @@ bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode,
 int TestProxmark(void) {
     clearCommandBuffer();
     PacketResponseNG resp;
-    PacketCommandOLD c = {CMD_PING, {0, 0, 0}, {{0}}};
-    SendCommand(&c);
+    SendCommandOLD(CMD_PING, 0, 0, 0, NULL, 0);
     if (WaitForResponseTimeout(CMD_ACK, &resp, 5000)) {
         send_via_fpc = resp.oldarg[0] == 1;
         PrintAndLogEx(INFO, "Communicating with PM3 over %s.", send_via_fpc ? "FPC" : "USB");
@@ -603,23 +602,19 @@ bool GetFromDevice(DeviceMemType_t memtype, uint8_t *dest, uint32_t bytes, uint3
 
     switch (memtype) {
         case BIG_BUF: {
-            PacketCommandOLD c = {CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K, {start_index, bytes, 0}, {{0}}};
-            SendCommand(&c);
+            SendCommandOLD(CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K, start_index, bytes, 0, NULL, 0);
             return dl_it(dest, bytes, start_index, response, ms_timeout, show_warning, CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K);
         }
         case BIG_BUF_EML: {
-            PacketCommandOLD c = {CMD_DOWNLOAD_EML_BIGBUF, {start_index, bytes, 0}, {{0}}};
-            SendCommand(&c);
+            SendCommandOLD(CMD_DOWNLOAD_EML_BIGBUF, start_index, bytes, 0, NULL, 0);
             return dl_it(dest, bytes, start_index, response, ms_timeout, show_warning, CMD_DOWNLOADED_EML_BIGBUF);
         }
         case FLASH_MEM: {
-            PacketCommandOLD c = {CMD_FLASHMEM_DOWNLOAD, {start_index, bytes, 0}, {{0}}};
-            SendCommand(&c);
+            SendCommandOLD(CMD_FLASHMEM_DOWNLOAD, start_index, bytes, 0, NULL, 0);
             return dl_it(dest, bytes, start_index, response, ms_timeout, show_warning, CMD_FLASHMEM_DOWNLOADED);
         }
         case SIM_MEM: {
-            //PacketCommandOLD c = {CMD_DOWNLOAD_SIM_MEM, {start_index, bytes, 0}, {{0}}};
-            //SendCommand(&c);
+            //SendCommandOLD(CMD_DOWNLOAD_SIM_MEM, start_index, bytes, 0, NULL, 0);
             //return dl_it(dest, bytes, start_index, response, ms_timeout, show_warning, CMD_DOWNLOADED_SIMMEM);
             return false;
         }
diff --git a/client/flash.c b/client/flash.c
index 790edf49b..366c7094c 100644
--- a/client/flash.c
+++ b/client/flash.c
@@ -259,8 +259,7 @@ fail:
 
 // Get the state of the proxmark, backwards compatible
 static int get_proxmark_state(uint32_t *state) {
-    PacketCommandOLD c = {CMD_DEVICE_INFO};
-    SendCommand(&c);
+    SendCommandOLD(CMD_DEVICE_INFO, 0, 0, 0, NULL, 0);
     PacketResponseNG resp;
     WaitForResponse(CMD_UNKNOWN, &resp);  // wait for any response. No timeout.
 
@@ -300,20 +299,16 @@ static int enter_bootloader(char *serial_port_name) {
 
     if (state & DEVICE_INFO_FLAG_CURRENT_MODE_OS) {
         fprintf(stdout, _BLUE_("Entering bootloader...") "\n");
-        PacketCommandOLD c;
-        memset(&c, 0, sizeof(c));
 
         if ((state & DEVICE_INFO_FLAG_BOOTROM_PRESENT)
                 && (state & DEVICE_INFO_FLAG_OSIMAGE_PRESENT)) {
             // New style handover: Send CMD_START_FLASH, which will reset the board
             // and enter the bootrom on the next boot.
-            c.cmd = CMD_START_FLASH;
-            SendCommand(&c);
+            SendCommandOLD(CMD_START_FLASH, 0, 0, 0, NULL, 0);
             fprintf(stdout, "(Press and release the button only to abort)\n");
         } else {
             // Old style handover: Ask the user to press the button, then reset the board
-            c.cmd = CMD_HARDWARE_RESET;
-            SendCommand(&c);
+            SendCommandOLD(CMD_HARDWARE_RESET, 0, 0, 0, NULL, 0);
             fprintf(stdout, "Press and hold down button NOW if your bootloader requires it.\n");
         }
         msleep(100);
@@ -361,19 +356,13 @@ int flash_start_flashing(int enable_bl_writes, char *serial_port_name) {
     if (state & DEVICE_INFO_FLAG_UNDERSTANDS_START_FLASH) {
         // This command is stupid. Why the heck does it care which area we're
         // flashing, as long as it's not the bootloader area? The mind boggles.
-        PacketCommandOLD c = {CMD_START_FLASH};
         PacketResponseNG resp;
 
         if (enable_bl_writes) {
-            c.arg[0] = FLASH_START;
-            c.arg[1] = FLASH_END;
-            c.arg[2] = START_FLASH_MAGIC;
+            SendCommandOLD(CMD_START_FLASH, FLASH_START, FLASH_END, START_FLASH_MAGIC, NULL, 0);
         } else {
-            c.arg[0] = BOOTLOADER_END;
-            c.arg[1] = FLASH_END;
-            c.arg[2] = 0;
+            SendCommandOLD(CMD_START_FLASH,BOOTLOADER_END, FLASH_END, 0, NULL, 0);
         }
-        SendCommand(&c);
         return wait_for_ack(&resp);
     } else {
         fprintf(stderr, _RED_("Note: Your bootloader does not understand the new START_FLASH command") "\n");
@@ -386,10 +375,8 @@ static int write_block(uint32_t address, uint8_t *data, uint32_t length) {
     uint8_t block_buf[BLOCK_SIZE];
     memset(block_buf, 0xFF, BLOCK_SIZE);
     memcpy(block_buf, data, length);
-    PacketCommandOLD c = {CMD_FINISH_WRITE, {address, 0, 0}};
     PacketResponseNG resp;
-    memcpy(c.d.asBytes, block_buf, length);
-    SendCommand(&c);
+    SendCommandOLD(CMD_FINISH_WRITE, address, 0, 0, block_buf, length);
     int ret = wait_for_ack(&resp);
     if (ret && resp.oldarg[0]) {
         uint32_t lock_bits = resp.oldarg[0] >> 16;
@@ -459,8 +446,7 @@ void flash_free(flash_file_t *ctx) {
 
 // just reset the unit
 int flash_stop_flashing(void) {
-    PacketCommandOLD c = {CMD_HARDWARE_RESET};
-    SendCommand(&c);
+    SendCommandOLD(CMD_HARDWARE_RESET, 0, 0, 0, NULL, 0);
     msleep(100);
     return 0;
 }
diff --git a/client/util.h b/client/util.h
index 30077ec22..b55cfc435 100644
--- a/client/util.h
+++ b/client/util.h
@@ -150,7 +150,7 @@
 
 #ifndef DropField
 #define DropField() { \
-        PacketCommandOLD c_drop = {CMD_READER_ISO_14443a, {0,0,0}, {{0}}}; clearCommandBuffer(); SendCommand(&c_drop); \
+        clearCommandBuffer(); SendCommandOLD(CMD_READER_ISO_14443a, 0, 0, 0, NULL, 0); \
     }
 #endif
 

From 128d90ca3cec4d91fc8cd58af878949481b1d5c1 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 19 Apr 2019 02:10:52 +0200
Subject: [PATCH 1347/1938] SendCommandOLD: hid-flasher

---
 client/hid-flasher/flash.c | 35 ++++++++---------------------------
 1 file changed, 8 insertions(+), 27 deletions(-)

diff --git a/client/hid-flasher/flash.c b/client/hid-flasher/flash.c
index 77bba2402..6c8fc808d 100644
--- a/client/hid-flasher/flash.c
+++ b/client/hid-flasher/flash.c
@@ -260,8 +260,7 @@ fail:
 
 // Get the state of the proxmark, backwards compatible
 static int get_proxmark_state(uint32_t *state) {
-    PacketCommandOLD c = {CMD_DEVICE_INFO};
-    SendCommand(&c);
+    SendCommandOLD(CMD_DEVICE_INFO, 0, 0, 0, NULL, 0);
     PacketResponseOLD resp;
     ReceiveCommand(&resp);
 
@@ -303,20 +302,16 @@ static int enter_bootloader(void) {
 
     if (state & DEVICE_INFO_FLAG_CURRENT_MODE_OS) {
         fprintf(stderr, "Entering bootloader...\n");
-        PacketCommandOLD c;
-        memset(&c, 0, sizeof(c));
 
         if ((state & DEVICE_INFO_FLAG_BOOTROM_PRESENT)
                 && (state & DEVICE_INFO_FLAG_OSIMAGE_PRESENT)) {
             // New style handover: Send CMD_START_FLASH, which will reset the board
             // and enter the bootrom on the next boot.
-            c.cmd = CMD_START_FLASH;
-            SendCommand(&c);
+            SendCommandOLD(CMD_START_FLASH, 0, 0, 0, NULL, 0);
             fprintf(stderr, "(Press and release the button only to abort)\n");
         } else {
             // Old style handover: Ask the user to press the button, then reset the board
-            c.cmd = CMD_HARDWARE_RESET;
-            SendCommand(&c);
+            SendCommandOLD(CMD_HARDWARE_RESET, 0, 0, 0, NULL, 0);
             fprintf(stderr, "Press and hold down button NOW if your bootloader requires it.\n");
         }
         fprintf(stderr, "Waiting for Proxmark3 to reappear on USB...");
@@ -360,18 +355,11 @@ int flash_start_flashing(int enable_bl_writes) {
     if (state & DEVICE_INFO_FLAG_UNDERSTANDS_START_FLASH) {
         // This command is stupid. Why the heck does it care which area we're
         // flashing, as long as it's not the bootloader area? The mind boggles.
-        PacketCommandOLD c = {CMD_START_FLASH};
-
         if (enable_bl_writes) {
-            c.arg[0] = FLASH_START;
-            c.arg[1] = FLASH_END;
-            c.arg[2] = START_FLASH_MAGIC;
+            SendCommandOLD(CMD_START_FLASH, FLASH_START, FLASH_END, START_FLASH_MAGIC, NULL, 0);
         } else {
-            c.arg[0] = BOOTLOADER_END;
-            c.arg[1] = FLASH_END;
-            c.arg[2] = 0;
+            SendCommandOLD(CMD_START_FLASH,BOOTLOADER_END, FLASH_END, 0, NULL, 0);
         }
-        SendCommand(&c);
         return wait_for_ack();
     } else {
         fprintf(stderr, "Note: Your bootloader does not understand the new START_FLASH command\n");
@@ -387,19 +375,13 @@ static int write_block(uint32_t address, uint8_t *data, uint32_t length) {
     memset(block_buf, 0xFF, BLOCK_SIZE);
     memcpy(block_buf, data, length);
 
-    PacketCommandOLD c = {CMD_SETUP_WRITE};
     for (int i = 0; i < 240; i += 48) {
-        memcpy(c.d.asBytes, block_buf + i, 48);
-        c.arg[0] = i / 4;
-        SendCommand(&c);
+        SendCommandOLD(CMD_SETUP_WRITE, i / 4, 0, 0, block_buf + i, 48);
         if (wait_for_ack() < 0)
             return -1;
     }
 
-    c.cmd = CMD_FINISH_WRITE;
-    c.arg[0] = address;
-    memcpy(c.d.asBytes, block_buf + 240, 16);
-    SendCommand(&c);
+    SendCommandOLD(CMD_FINISH_WRITE, address, 0, 0, block_buf + 240, 16);
     return wait_for_ack();
 }
 
@@ -458,8 +440,7 @@ void flash_free(flash_file_t *ctx) {
 
 // just reset the unit
 int flash_stop_flashing(void) {
-    PacketCommandOLD c = {CMD_HARDWARE_RESET};
-    SendCommand(&c);
+    SendCommandOLD(CMD_HARDWARE_RESET, 0, 0, 0, NULL, 0);
     msleep(100);
     return 0;
 }

From 52d1b7341ffb6f4826146f358aa01f76d12ebdbf Mon Sep 17 00:00:00 2001
From: Eloff <eloff@mail.ru>
Date: Fri, 19 Apr 2019 09:39:11 +0300
Subject: [PATCH 1348/1938] typo

---
 client/cmdhflist.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdhflist.c b/client/cmdhflist.c
index 9b49f4d92..ab1f8da1d 100644
--- a/client/cmdhflist.c
+++ b/client/cmdhflist.c
@@ -174,7 +174,7 @@ int applyIso14443a(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize) {
             //97 50 = Bit oriented anti-collision level3
             //97 70 = Select of cascade level3
             if (cmd[1] == 0x70)
-                snprintf(exp, size, "SELECT_UID-2");
+                snprintf(exp, size, "SELECT_UID-3");
             else if (cmd[1] == 0x20 || cmd[1] == 0x50)
                 snprintf(exp, size, "ANTICOLL-3");
             else

From 9c776c89358839a9a6356a9780cbe0442bfea34e Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 19 Apr 2019 09:23:02 +0200
Subject: [PATCH 1349/1938] fix: standalonemode matty_run now compiles

---
 armsrc/Standalone/hf_mattyrun.c | 2 +-
 armsrc/Standalone/hf_mattyrun.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/armsrc/Standalone/hf_mattyrun.c b/armsrc/Standalone/hf_mattyrun.c
index 1f2fb6f11..de22d11f9 100644
--- a/armsrc/Standalone/hf_mattyrun.c
+++ b/armsrc/Standalone/hf_mattyrun.c
@@ -328,7 +328,7 @@ void RunMod() {
 
     /*
         TODO:
-        - Get UID from tag and set accordingly in emulator memory and call mifare1ksim with right flags (iceman)
+        - Get UID from tag and set accordingly in emulator memory and call mifaresim with right flags (iceman)
     */
     if (!allKeysFound && keyFound) {
         Dbprintf("\t✕ There's currently no nested attack in MattyRun, sorry!");
diff --git a/armsrc/Standalone/hf_mattyrun.h b/armsrc/Standalone/hf_mattyrun.h
index 6602eba54..c37624821 100644
--- a/armsrc/Standalone/hf_mattyrun.h
+++ b/armsrc/Standalone/hf_mattyrun.h
@@ -12,10 +12,10 @@
 #ifndef __HF_MATTYRUN_H
 #define __HF_MATTYRUN_H
 
-//#include <stdbool.h> // for bool
 #include "standalone.h" // standalone definitions
 #include "apps.h"       // debugstatements, lfops?
 #include "usb_cmd.h"    // mifare1ksim flags
+#include "mifaresim.h"  // mifare1ksim
 #include "mifareutil.h"
 
 #define OPTS 2

From b29b07c8ad8c22922113b63ba23b9762fb52036a Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 19 Apr 2019 09:23:24 +0200
Subject: [PATCH 1350/1938] chg: hitag compile flag optional

---
 armsrc/Makefile | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/armsrc/Makefile b/armsrc/Makefile
index 5ec73b2b3..42965767b 100644
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -31,7 +31,6 @@ APP_CFLAGS = $(PLATFORM_DEFS) \
 			 -DWITH_CRC \
 			 -DON_DEVICE \
 			 -DWITH_LF \
-			 -DWITH_HITAG \
  			 -DWITH_ISO15693 \
 			 -DWITH_LEGICRF \
 			 -DWITH_ISO14443b \
@@ -43,6 +42,7 @@ APP_CFLAGS = $(PLATFORM_DEFS) \
 			 -fno-strict-aliasing -ffunction-sections -fdata-sections
 
 ### IMPORTANT -  move the commented variable below this line
+#			 -DWITH_HITAG \
 #			 -DWITH_FPC \
 #			 -DWITH_LCD \
 #			 -DWITH_EMV \
@@ -54,11 +54,11 @@ APP_CFLAGS = $(PLATFORM_DEFS) \
 #			 -DWITH_LF_PROXBRUTE
 #			 -DWITH_LF_HIDBRUTE
 #			 -DWITH_HF_YOUNG
-#			 -DWITH_HF_MATTYRUN -
+#			 -DWITH_HF_MATTYRUN
 #			 -DWITH_HF_COLIN
 #			 -DWITH_HF_BOG
 
-SRC_LF = lfops.c hitag2_crypto.c hitag2.c hitagS.c lfsampling.c pcf7931.c lfdemod.c
+SRC_LF = lfops.c lfsampling.c pcf7931.c lfdemod.c
 SRC_ISO15693 = iso15693.c iso15693tools.c
 SRC_ISO14443a = iso14443a.c mifareutil.c mifarecmd.c epa.c mifaresim.c
 SRC_ISO14443b = iso14443b.c
@@ -88,6 +88,12 @@ else
 	SRC_FPC =
 endif
 
+ifneq (,$(findstring WITH_HITAG,$(APP_CLAGS)))
+    SRC_HITAG = hitag2_crypto.c hitag2.c hitagS.c
+else
+    SRC_HITAG =
+endif
+
 ifneq (,$(findstring WITH_LCD,$(APP_CLAGS)))
     SRC_LCD = fonts.c LCD.c
 else
@@ -155,6 +161,7 @@ THUMBSRC = start.c \
 	$(SRC_FLASH) \
 	$(SRC_SMARTCARD) \
 	$(SRC_FPC) \
+    $(SRC_HITAG) \
 	appmain.c \
 	printf.c \
 	util.c \

From 05674dc559a84f80f68e84afd4da521ca1bf475c Mon Sep 17 00:00:00 2001
From: Iceman <iceman@iuse.se>
Date: Fri, 19 Apr 2019 09:29:50 +0200
Subject: [PATCH 1351/1938] Update readme.md

---
 armsrc/Standalone/readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/armsrc/Standalone/readme.md b/armsrc/Standalone/readme.md
index b694971a5..12fe6c145 100644
--- a/armsrc/Standalone/readme.md
+++ b/armsrc/Standalone/readme.md
@@ -81,7 +81,7 @@ APP_CFLAGS = -DWITH_CRC \
              -DWITH_FLASH \
              -DWITH_SMARTCARD \
              -DWITH_HFSNOOP \
-             -DWITH_HF_COLIN\
+             -DWITH_HF_COLIN \
              -DWITH_FPC \
              -fno-strict-aliasing -ffunction-sections -fdata-sections
 

From b495f4bc444c6cec0b1875b5656f21e567eeb303 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 19 Apr 2019 09:59:34 +0200
Subject: [PATCH 1352/1938] fix: Standalone/hf_colin now compiles

---
 armsrc/Standalone/hf_colin.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/armsrc/Standalone/hf_colin.h b/armsrc/Standalone/hf_colin.h
index 2b7879b6b..251620626 100644
--- a/armsrc/Standalone/hf_colin.h
+++ b/armsrc/Standalone/hf_colin.h
@@ -17,6 +17,7 @@
 #define __HF_COLIN_H
 
 #include "proxmark3.h"
+#include "mifaresim.h"  // mifare1ksim
 #include "mifareutil.h"
 #include "iso14443a.h"
 #include "protocols.h"

From c4766b264995d4e3844784d12ae35cfee954576f Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 19 Apr 2019 17:03:39 +0200
Subject: [PATCH 1353/1938] Semi-Automated SendCommand -> SendCommandOLD

---
 armsrc/Standalone/hf_young.c |   2 +-
 client/cmdanalyse.c          |   4 +-
 client/cmddata.c             |   6 +-
 client/cmdhf.c               |   6 +-
 client/cmdhf14a.c            |  91 +++++++-----------
 client/cmdhf14b.c            |  64 ++++---------
 client/cmdhf15.c             | 134 ++++++++++++---------------
 client/cmdhfepa.c            |  31 +++----
 client/cmdhffelica.c         |  34 +++----
 client/cmdhficlass.c         |  78 ++++++----------
 client/cmdhflegic.c          |  37 ++------
 client/cmdhfmf.c             |  81 ++++++-----------
 client/cmdhfmfdes.c          | 141 +++++++++++++---------------
 client/cmdhfmfdesfire.c      |  14 +--
 client/cmdhfmfhard.c         |   9 +-
 client/cmdhfmfp.c            |   3 +-
 client/cmdhfmfu.c            | 172 ++++++++++++++++-------------------
 client/cmdhftopaz.c          |  10 +-
 client/cmdlf.c               |  65 ++++---------
 client/cmdlfawid.c           |  30 ++----
 client/cmdlfcotag.c          |   3 +-
 client/cmdlfem4x.c           |  12 +--
 client/cmdlffdx.c            |  16 +---
 client/cmdlfguard.c          |  16 +---
 client/cmdlfhid.c            |  30 ++----
 client/cmdlfhitag.c          |  77 +++++++---------
 client/cmdlfindala.c         |  40 ++++----
 client/cmdlfio.c             |  17 +---
 client/cmdlfjablotron.c      |  16 +---
 client/cmdlfkeri.c           |  14 +--
 client/cmdlfnedap.c          |  15 +--
 client/cmdlfnoralsy.c        |  18 +---
 client/cmdlfparadox.c        |  10 +-
 client/cmdlfpcf7931.c        |  15 ++-
 client/cmdlfpresco.c         |  16 +---
 client/cmdlfpyramid.c        |  15 +--
 client/cmdlft55xx.c          |  29 +++---
 client/cmdlfti.c             |  11 +--
 client/cmdlfviking.c         |  14 +--
 client/cmdlfvisa2000.c       |  16 +---
 client/cmdsmartcard.c        |  88 ++++++------------
 41 files changed, 543 insertions(+), 957 deletions(-)

diff --git a/armsrc/Standalone/hf_young.c b/armsrc/Standalone/hf_young.c
index c931417be..95f12da2a 100644
--- a/armsrc/Standalone/hf_young.c
+++ b/armsrc/Standalone/hf_young.c
@@ -135,7 +135,7 @@ void RunMod() {
                     SendCommandOLD(CMD_MIFARE_CSETBLOCK, params & (0xFE | (uid == NULL ? 0:1)), blockNo, 0, data, 16);
 
                 Block read is similar:
-                    PacketCommandOLD c = {CMD_MIFARE_CGETBLOCK, {params, blockNo, 0}};
+                    SendCommandOLD(CMD_MIFARE_CGETBLOCK, params, blockNo, 0,...};
                 We need to imitate that call with blockNo 0 to set a uid.
 
                 The get and set commands are handled in this file:
diff --git a/client/cmdanalyse.c b/client/cmdanalyse.c
index 3e334efc5..2385de4e0 100644
--- a/client/cmdanalyse.c
+++ b/client/cmdanalyse.c
@@ -512,10 +512,8 @@ static int CmdAnalyseA(const char *Cmd) {
     if (errors || cmdp == 0) return usage_analyse_a();
 
 
-    PacketCommandOLD c = {CMD_FPC_SEND, {0, 0, 0}, {{0}}};
-    memcpy(c.d.asBytes, data, USB_CMD_DATA_SIZE);
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_FPC_SEND, 0, 0, 0, data, USB_CMD_DATA_SIZE);
 
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
diff --git a/client/cmddata.c b/client/cmddata.c
index 80ebc7317..6ac03202d 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -874,9 +874,8 @@ static int CmdBuffClear(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_data_buffclear();
 
-    PacketCommandOLD c = {CMD_BUFF_CLEAR, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_BUFF_CLEAR, 0, 0, 0, NULL, 0);
     ClearGraph(true);
     return 0;
 }
@@ -1529,9 +1528,8 @@ int CmdTuneSamples(const char *Cmd) {
     int timeout = 0;
     PrintAndLogEx(INFO, "\nMeasuring antenna characteristics, please wait...");
 
-    PacketCommandOLD c = {CMD_MEASURE_ANTENNA_TUNING, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_MEASURE_ANTENNA_TUNING, 0, 0, 0, NULL, 0);
     PacketResponseNG resp;
     while (!WaitForResponseTimeout(CMD_MEASURED_ANTENNA_TUNING, &resp, 2000)) {
         timeout++;
diff --git a/client/cmdhf.c b/client/cmdhf.c
index 713f5821d..405ad4c67 100644
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -84,9 +84,8 @@ int CmdHFSearch(const char *Cmd) {
 int CmdHFTune(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     PrintAndLogEx(SUCCESS, "Measuring HF antenna, press button to exit");
-    PacketCommandOLD c = {CMD_MEASURE_ANTENNA_TUNING_HF, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_MEASURE_ANTENNA_TUNING_HF, 0, 0, 0, NULL, 0);
     return 0;
 }
 
@@ -97,9 +96,8 @@ int CmdHFSniff(const char *Cmd) {
     int skippairs =  param_get32ex(Cmd, 0, 0, 10);
     int skiptriggers =  param_get32ex(Cmd, 1, 0, 10);
 
-    PacketCommandOLD c = {CMD_HF_SNIFFER, {skippairs, skiptriggers, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_HF_SNIFFER, skippairs, skiptriggers, 0, NULL, 0);
     return 0;
 }
 
diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 074db3706..d3298a8ee 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -228,8 +228,7 @@ static int CmdHF14AList(const char *Cmd) {
 }
 
 int Hf14443_4aGetCardData(iso14a_card_select_t *card) {
-    PacketCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT, 0, 0}, {{0}}};
-    SendCommand(&c);
+    SendCommandOLD(CMD_READER_ISO_14443a, ISO14A_CONNECT, 0, 0, NULL, 0);
 
     PacketResponseNG resp;
     WaitForResponse(CMD_ACK, &resp);
@@ -298,9 +297,8 @@ static int CmdHF14AReader(const char *Cmd) {
     if (!disconnectAfter)
         cm |= ISO14A_NO_DISCONNECT;
 
-    PacketCommandOLD c = {CMD_READER_ISO_14443a, {cm, 0, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_READER_ISO_14443a, cm, 0, 0, NULL, 0);
 
     if (ISO14A_CONNECT & cm) {
         PacketResponseNG resp;
@@ -385,8 +383,7 @@ static int CmdHF14ACUIDs(const char *Cmd) {
         }
 
         // execute anticollision procedure
-        PacketCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0}, {{0}}};
-        SendCommand(&c);
+        SendCommandOLD(CMD_READER_ISO_14443a, ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0, NULL, 0);
 
         PacketResponseNG resp;
         WaitForResponse(CMD_ACK, &resp);
@@ -483,10 +480,8 @@ int CmdHF14ASim(const char *Cmd) {
     if (useUIDfromEML)
         flags |= FLAG_UID_IN_EMUL;
 
-    PacketCommandOLD c = {CMD_SIMULATE_TAG_ISO_14443a, { tagtype, flags, 0 }, {{0}}};
-    memcpy(c.d.asBytes, uid, uidlen >> 1);
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_SIMULATE_TAG_ISO_14443a,  tagtype, flags, 0 , uid, uidlen >> 1);
     PacketResponseNG resp;
 
     PrintAndLogEx(SUCCESS, "press pm3-button to abort simulation");
@@ -512,9 +507,8 @@ int CmdHF14ASniff(const char *Cmd) {
         if (ctmp == 'c') param |= 0x01;
         if (ctmp == 'r') param |= 0x02;
     }
-    PacketCommandOLD c = {CMD_SNIFF_ISO_14443a, {param, 0, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_SNIFF_ISO_14443a, param, 0, 0, NULL, 0);
     return 0;
 }
 
@@ -528,8 +522,7 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
         PacketResponseNG resp;
 
         // Anticollision + SELECT card
-        PacketCommandOLD ca = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}, {{0}}};
-        SendCommand(&ca);
+        SendCommandOLD(CMD_READER_ISO_14443a, ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0, NULL, 0);
         if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
             PrintAndLogEx(ERR, "Proxmark3 connection timeout.");
             return 1;
@@ -548,10 +541,8 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
 
         if (resp.oldarg[0] == 2) { // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
             // get ATS
-            PacketCommandOLD cr = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT, 2, 0}, {{0}}};
             uint8_t rats[] = { 0xE0, 0x80 }; // FSDI=8 (FSD=256), CID=0
-            memcpy(cr.d.asBytes, rats, 2);
-            SendCommand(&cr);
+            SendCommandOLD(CMD_READER_ISO_14443a, ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT, 2, 0, rats, 2);
             if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
                 PrintAndLogEx(ERR, "Proxmark3 connection timeout.");
                 return 1;
@@ -567,12 +558,10 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
     if (leaveSignalON)
         cmdc |= ISO14A_NO_DISCONNECT;
 
-    PacketCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_APPEND_CRC | cmdc, (datainlen & 0xFFFF) + 2, 0}, {{0}}};
-    uint8_t header[] = { 0x0a | responseNum, 0x00};
+    uint8_t data[USB_CMD_DATA_SIZE] = { 0x0a | responseNum, 0x00};
     responseNum ^= 1;
-    memcpy(c.d.asBytes, header, 2);
-    memcpy(&c.d.asBytes[2], datain, datainlen);
-    SendCommand(&c);
+    memcpy(&data[2], datain, datainlen & 0xFFFF);
+    SendCommandOLD(CMD_READER_ISO_14443a, ISO14A_RAW | ISO14A_APPEND_CRC | cmdc, (datainlen & 0xFFFF) + 2, 0, data, (datainlen & 0xFFFF) + 2);
 
     uint8_t *recv;
     PacketResponseNG resp;
@@ -595,8 +584,8 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
             return 2;
         }
 
-        if (recv[0] != header[0]) {
-            PrintAndLogEx(ERR, "iso14443-4 framing error. Card send %2x must be %2x", dataout[0], header[0]);
+        if (recv[0] != data[0]) {
+            PrintAndLogEx(ERR, "iso14443-4 framing error. Card send %2x must be %2x", dataout[0], data[0]);
             return 2;
         }
 
@@ -627,8 +616,7 @@ static int SelectCard14443_4(bool disconnect, iso14a_card_select_t *card) {
     DropField();
 
     // Anticollision + SELECT card
-    PacketCommandOLD ca = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}, {{0}}};
-    SendCommand(&ca);
+    SendCommandOLD(CMD_READER_ISO_14443a, ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0, NULL, 0);
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         PrintAndLogEx(ERR, "Proxmark3 connection timeout.");
         return 1;
@@ -647,10 +635,8 @@ static int SelectCard14443_4(bool disconnect, iso14a_card_select_t *card) {
 
     if (resp.oldarg[0] == 2) { // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
         // get ATS
-        PacketCommandOLD cr = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT, 2, 0}, {{0}}};
         uint8_t rats[] = { 0xE0, 0x80 }; // FSDI=8 (FSD=256), CID=0
-        memcpy(cr.d.asBytes, rats, 2);
-        SendCommand(&cr);
+        SendCommandOLD(CMD_READER_ISO_14443a, ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT, sizeof(rats), 0, rats, sizeof(rats));
         if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
             PrintAndLogEx(ERR, "Proxmark3 connection timeout.");
             return 1;
@@ -704,12 +690,10 @@ static int CmdExchangeAPDU(bool chainingin, uint8_t *datain, int datainlen, bool
     // https://stackoverflow.com/questions/32994936/safe-max-java-card-apdu-data-command-and-respond-size
     // here length USB_CMD_DATA_SIZE=512
     // timeout must be authomatically set by "get ATS"
-    PacketCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_APDU | ISO14A_NO_DISCONNECT | cmdc, (datainlen & 0xFFFF), 0}, {{0}}};
-
     if (datain)
-        memcpy(c.d.asBytes, datain, datainlen);
-
-    SendCommand(&c);
+        SendCommandOLD(CMD_READER_ISO_14443a, ISO14A_APDU | ISO14A_NO_DISCONNECT | cmdc, (datainlen & 0xFFFF), 0, datain, datainlen & 0xFFFF);
+    else
+        SendCommandOLD(CMD_READER_ISO_14443a, ISO14A_APDU | ISO14A_NO_DISCONNECT | cmdc, 0, 0, NULL, 0);
 
     uint8_t *recv;
     PacketResponseNG resp;
@@ -891,7 +875,6 @@ static int CmdHF14AAPDU(const char *Cmd) {
 }
 
 static int CmdHF14ACmdRaw(const char *Cmd) {
-    PacketCommandOLD c = {CMD_READER_ISO_14443a, {0, 0, 0}, {{0}}};
     bool reply = 1;
     bool crc = false;
     bool power = false;
@@ -996,45 +979,44 @@ static int CmdHF14ACmdRaw(const char *Cmd) {
         data[datalen++] = second;
     }
 
+    uint16_t flags = 0;
     if (active || active_select) {
-        c.arg[0] |= ISO14A_CONNECT;
+        flags |= ISO14A_CONNECT;
         if (active)
-            c.arg[0] |= ISO14A_NO_SELECT;
+            flags |= ISO14A_NO_SELECT;
     }
 
+    uint32_t argtimeout = 0;
     if (bTimeout) {
 #define MAX_TIMEOUT 40542464 // = (2^32-1) * (8*16) / 13560000Hz * 1000ms/s
-        c.arg[0] |= ISO14A_SET_TIMEOUT;
+        flags |= ISO14A_SET_TIMEOUT;
         if (timeout > MAX_TIMEOUT) {
             timeout = MAX_TIMEOUT;
             PrintAndLogEx(NORMAL, "Set timeout to 40542 seconds (11.26 hours). The max we can wait for response");
         }
-        c.arg[2] = 13560000 / 1000 / (8 * 16) * timeout; // timeout in ETUs (time to transfer 1 bit, approx. 9.4 us)
+        argtimeout = 13560000 / 1000 / (8 * 16) * timeout; // timeout in ETUs (time to transfer 1 bit, approx. 9.4 us)
     }
 
     if (power) {
-        c.arg[0] |= ISO14A_NO_DISCONNECT;
+        flags |= ISO14A_NO_DISCONNECT;
     }
 
     if (datalen > 0) {
-        c.arg[0] |= ISO14A_RAW;
+        flags |= ISO14A_RAW;
     }
 
     if (topazmode) {
-        c.arg[0] |= ISO14A_TOPAZMODE;
+        flags |= ISO14A_TOPAZMODE;
     }
     if (no_rats) {
-        c.arg[0] |= ISO14A_NO_RATS;
+        flags |= ISO14A_NO_RATS;
     }
 
     // Max buffer is USB_CMD_DATA_SIZE
     datalen = (datalen > USB_CMD_DATA_SIZE) ? USB_CMD_DATA_SIZE : datalen;
 
-    c.arg[1] = (datalen & 0xFFFF) | ((uint32_t)(numbits << 16));
-    memcpy(c.d.asBytes, data, datalen);
-
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_READER_ISO_14443a, flags, (datalen & 0xFFFF) | ((uint32_t)(numbits << 16)), argtimeout, data, datalen & 0xFFFF);
 
     if (reply) {
         int res = 0;
@@ -1096,9 +1078,8 @@ static int CmdHF14AAntiFuzz(const char *Cmd) {
         arg0 = FLAG_10B_UID_IN_DATA;
 
     CLIParserFree();
-    PacketCommandOLD c = {CMD_ANTIFUZZ_ISO_14443a, {arg0, 0, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_ANTIFUZZ_ISO_14443a, arg0, 0, 0, NULL, 0);
     return 0;
 }
 
@@ -1160,9 +1141,8 @@ int CmdHF14A(const char *Cmd) {
 }
 
 int infoHF14A(bool verbose, bool do_nack_test) {
-    PacketCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_READER_ISO_14443a, ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0, NULL, 0);
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         if (verbose) PrintAndLogEx(WARNING, "iso14443a card select failed");
@@ -1213,11 +1193,8 @@ int infoHF14A(bool verbose, bool do_nack_test) {
                 PrintAndLogEx(NORMAL, "TYPE: Possible AZTEK (iso14443a compliant)");
 
             // reconnect for further tests
-            c.arg[0] = ISO14A_CONNECT | ISO14A_NO_DISCONNECT;
-            c.arg[1] = 0;
-            c.arg[2] = 0;
             clearCommandBuffer();
-            SendCommand(&c);
+            SendCommandOLD(CMD_READER_ISO_14443a, ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0, NULL, 0);
             WaitForResponse(CMD_ACK, &resp);
 
             memcpy(&card, (iso14a_card_select_t *)resp.data.asBytes, sizeof(iso14a_card_select_t));
@@ -1286,12 +1263,8 @@ int infoHF14A(bool verbose, bool do_nack_test) {
     // try to request ATS even if tag claims not to support it
     if (select_status == 2) {
         uint8_t rats[] = { 0xE0, 0x80 }; // FSDI=8 (FSD=256), CID=0
-        c.arg[0] = ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT;
-        c.arg[1] = 2;
-        c.arg[2] = 0;
-        memcpy(c.d.asBytes, rats, 2);
         clearCommandBuffer();
-        SendCommand(&c);
+        SendCommandOLD(CMD_READER_ISO_14443a, ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT, 2, 0, rats, sizeof(rats));
         WaitForResponse(CMD_ACK, &resp);
 
         memcpy(card.ats, resp.data.asBytes, resp.oldarg[0]);
diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c
index 4f06e5b75..54a292447 100644
--- a/client/cmdhf14b.c
+++ b/client/cmdhf14b.c
@@ -108,16 +108,14 @@ static int usage_hf_14b_dump(void) {
 
 /*
 static void switch_on_field_14b(void) {
-    PacketCommandOLD c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT, 0, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_ISO_14443B_COMMAND, ISO14B_CONNECT, 0, 0, NULL, 0);
 }
 */
 
 static int switch_off_field_14b(void) {
-    PacketCommandOLD c = {CMD_ISO_14443B_COMMAND, {ISO14B_DISCONNECT, 0, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_ISO_14443B_COMMAND, ISO14B_DISCONNECT, 0, 0, NULL, 0);
     return 0;
 }
 
@@ -171,9 +169,8 @@ static int CmdHF14BSim(const char *Cmd) {
         pupi = param_get32ex(Cmd, 1, 0, 16);
     }
 
-    PacketCommandOLD c = {CMD_SIMULATE_TAG_ISO_14443B, {pupi, 0, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_SIMULATE_TAG_ISO_14443B, pupi, 0, 0, NULL, 0);
     return 0;
 }
 
@@ -182,9 +179,8 @@ static int CmdHF14BSniff(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_hf_14b_sniff();
 
-    PacketCommandOLD c = {CMD_SNIFF_ISO_14443B, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_SNIFF_ISO_14443B, 0, 0, 0, NULL, 0);
     return 0;
 }
 
@@ -277,10 +273,8 @@ static int CmdHF14BCmdRaw(const char *Cmd) {
     // Max buffer is USB_CMD_DATA_SIZE
     datalen = (datalen > USB_CMD_DATA_SIZE) ? USB_CMD_DATA_SIZE : datalen;
 
-    PacketCommandOLD c = {CMD_ISO_14443B_COMMAND, {flags, datalen, time_wait}, {{0}}};
-    memcpy(c.d.asBytes, data, datalen);
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_ISO_14443B_COMMAND, flags, datalen, time_wait, data, datalen);
 
     if (!reply) return 1;
 
@@ -302,13 +296,12 @@ static bool get_14b_UID(iso14b_card_select_t *card) {
 
     int8_t retry = 3;
     PacketResponseNG resp;
-    PacketCommandOLD c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_SR | ISO14B_DISCONNECT, 0, 0}, {{0}}};
 
     // test for 14b SR
     while (retry--) {
 
         clearCommandBuffer();
-        SendCommand(&c);
+        SendCommandOLD(CMD_ISO_14443B_COMMAND, ISO14B_CONNECT | ISO14B_SELECT_SR | ISO14B_DISCONNECT, 0, 0, NULL, 0);
         if (WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
 
             uint8_t status = resp.oldarg[0];
@@ -320,13 +313,11 @@ static bool get_14b_UID(iso14b_card_select_t *card) {
     } // retry
 
     // test 14b standard
-    c.arg[0] = ISO14B_CONNECT | ISO14B_SELECT_STD | ISO14B_DISCONNECT;
     retry = 3;
     while (retry--) {
 
-
         clearCommandBuffer();
-        SendCommand(&c);
+        SendCommandOLD(CMD_ISO_14443B_COMMAND, ISO14B_CONNECT | ISO14B_SELECT_STD | ISO14B_DISCONNECT, 0, 0, NULL, 0);
         if (WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
 
             uint8_t status = resp.oldarg[0];
@@ -509,9 +500,8 @@ static bool HF14B_Std_Info(bool verbose) {
     bool isSuccess = false;
 
     // 14b get and print UID only (general info)
-    PacketCommandOLD c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_STD | ISO14B_DISCONNECT, 0, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_ISO_14443B_COMMAND, ISO14B_CONNECT | ISO14B_SELECT_STD | ISO14B_DISCONNECT, 0, 0, NULL, 0);
     PacketResponseNG resp;
 
     if (!WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
@@ -550,9 +540,8 @@ static bool HF14B_Std_Info(bool verbose) {
 // SRx get and print full info (needs more info...)
 static bool HF14B_ST_Info(bool verbose) {
 
-    PacketCommandOLD c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_SR | ISO14B_DISCONNECT, 0, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_ISO_14443B_COMMAND, ISO14B_CONNECT | ISO14B_SELECT_SR | ISO14B_DISCONNECT, 0, 0, NULL, 0);
     PacketResponseNG resp;
 
     if (!WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
@@ -607,9 +596,8 @@ static bool HF14B_ST_Reader(bool verbose) {
     bool isSuccess = false;
 
     // SRx get and print general info about SRx chip from UID
-    PacketCommandOLD c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_SR | ISO14B_DISCONNECT, 0, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_ISO_14443B_COMMAND, ISO14B_CONNECT | ISO14B_SELECT_SR | ISO14B_DISCONNECT, 0, 0, NULL, 0);
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
         if (verbose) PrintAndLogEx(WARNING, "command execution timeout");
@@ -647,9 +635,8 @@ static bool HF14B_Std_Reader(bool verbose) {
     bool isSuccess = false;
 
     // 14b get and print UID only (general info)
-    PacketCommandOLD c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_STD | ISO14B_DISCONNECT, 0, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_ISO_14443B_COMMAND, ISO14B_CONNECT | ISO14B_SELECT_STD | ISO14B_DISCONNECT, 0, 0, NULL, 0);
     PacketResponseNG resp;
 
     if (!WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
@@ -692,11 +679,8 @@ static bool HF14B_Other_Reader() {
     // // 14b get and print UID only (general info)
     // uint32_t flags = ISO14B_CONNECT | ISO14B_SELECT_STD | ISO14B_RAW | ISO14B_APPEND_CRC;
 
-    // PacketCommandOLD c = {CMD_ISO_14443B_COMMAND, {flags, datalen, 0}, {{0}}};
-    // memcpy(c.d.asBytes, data, datalen);
-
     // clearCommandBuffer();
-    // SendCommand(&c);
+    // SendCommandOLD(CMD_ISO_14443B_COMMAND, flags, datalen, 0, data, datalen);
     // PacketResponseNG resp;
     // WaitForResponse(CMD_ACK,&resp);
 
@@ -708,10 +692,9 @@ static bool HF14B_Other_Reader() {
     // return true;
     // }
 
-    // c.arg1 = 1;
-    // c.d.asBytes[0] = ISO14443B_AUTHENTICATE;
+    // data[0] = ISO14443B_AUTHENTICATE;
     // clearCommandBuffer();
-    // SendCommand(&c);
+    // SendCommandOLD(CMD_ISO_14443B_COMMAND, flags, 1, 0, data, 1);
     // PacketResponseNG resp;
     // WaitForResponse(CMD_ACK, &resp);
 
@@ -723,10 +706,9 @@ static bool HF14B_Other_Reader() {
     // return true;
     // }
 
-    // c.arg1 = 1;
-    // c.d.asBytes[0] = ISO14443B_RESET;
+    // data[0] = ISO14443B_RESET;
     // clearCommandBuffer();
-    // SendCommand(&c);
+    // SendCommandOLD(CMD_ISO_14443B_COMMAND, flags, 1, 0, data, 1);
     // PacketResponseNG resp;
     // WaitForResponse(CMD_ACK, &resp);
 
@@ -762,9 +744,8 @@ static int CmdHF14BReadSri(const char *Cmd) {
     uint8_t tagtype = param_get8(Cmd, 0);
     uint8_t blocks = (tagtype == 1) ? 0x7F : 0x0F;
 
-    PacketCommandOLD c = {CMD_READ_SRI_TAG, {blocks, 0, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_READ_SRI_TAG, blocks, 0, 0, NULL, 0);
     return 0;
 }
 // New command to write a SRI512/SRIX4K tag.
@@ -902,9 +883,8 @@ static int CmdHF14BDump(const char *Cmd) {
     uint8_t *recv = NULL;
 
     PacketResponseNG resp;
-    PacketCommandOLD c = {CMD_ISO_14443B_COMMAND, { ISO14B_CONNECT | ISO14B_SELECT_SR, 0, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_ISO_14443B_COMMAND,  ISO14B_CONNECT | ISO14B_SELECT_SR, 0, 0, NULL, 0);
 
     //select
     if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
@@ -914,18 +894,14 @@ static int CmdHF14BDump(const char *Cmd) {
         }
     }
 
-    c.arg[0] = ISO14B_APPEND_CRC | ISO14B_RAW;
-    c.arg[1] = 2;
-
-    uint8_t *req = c.d.asBytes;
-    req[0] = ISO14443B_READ_BLK;
+    uint8_t req[2] = {ISO14443B_READ_BLK};
 
     for (int retry = 0; retry < 5; retry++) {
 
         req[1] = blocknum;
 
         clearCommandBuffer();
-        SendCommand(&c);
+        SendCommandOLD(CMD_ISO_14443B_COMMAND,  ISO14B_APPEND_CRC | ISO14B_RAW, 2, 0, req, sizeof(req));
 
         if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
 
diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index f1a49eb9b..3035d017c 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -199,14 +199,12 @@ const productName uidmapping[] = {
 static int getUID(uint8_t *buf) {
 
     PacketResponseNG resp;
-    PacketCommandOLD c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}}; // len,speed,recv?
+    uint8_t data[5];
+    data[0] = ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | ISO15_REQ_INVENTORY | ISO15_REQINV_SLOT1;
+    data[1] = ISO15_CMD_INVENTORY;
+    data[2] = 0; // mask length
 
-    c.d.asBytes[0] = ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | ISO15_REQ_INVENTORY | ISO15_REQINV_SLOT1;
-    c.d.asBytes[1] = ISO15_CMD_INVENTORY;
-    c.d.asBytes[2] = 0; // mask length
-
-    AddCrc15(c.d.asBytes, 3);
-    c.arg[0] = 5; // len
+    AddCrc15(data, 3);
 
     uint8_t retry;
 
@@ -214,7 +212,7 @@ static int getUID(uint8_t *buf) {
     for (retry = 0; retry < 3; retry++) {
 
         clearCommandBuffer();
-        SendCommand(&c);
+        SendCommandOLD(CMD_ISO_15693_COMMAND, sizeof(data), 1, 1, data, sizeof(data));
 
         if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
 
@@ -418,17 +416,16 @@ static int usage_15_readmulti(void) {
  * Parameters:
  *  **cmd   command line
  */
-static int prepareHF15Cmd(char **cmd, PacketCommandOLD *c, uint8_t iso15cmd) {
+static int prepareHF15Cmd(char **cmd, uint16_t *reqlen, uint8_t *arg1, uint8_t *req, uint8_t iso15cmd) { // reqlen arg0
     int temp;
-    uint8_t *req = c->d.asBytes;
     uint8_t uid[8] = {0x00};
-    uint32_t reqlen = 0;
+    uint32_t tmpreqlen = 0;
 
     // strip
     while (**cmd == ' ' || **cmd == '\t')(*cmd)++;
 
     if (strstr(*cmd, "-2") == *cmd) {
-        c->arg[1] = 0; // use 1of256
+        *arg1 = 0; // use 1of256
         (*cmd) += 2;
     }
 
@@ -436,7 +433,7 @@ static int prepareHF15Cmd(char **cmd, PacketCommandOLD *c, uint8_t iso15cmd) {
     while (**cmd == ' ' || **cmd == '\t')(*cmd)++;
 
     if (strstr(*cmd, "-o") == *cmd) {
-        req[reqlen] = ISO15_REQ_OPTION;
+        req[tmpreqlen] = ISO15_REQ_OPTION;
         (*cmd) += 2;
     }
 
@@ -451,25 +448,25 @@ static int prepareHF15Cmd(char **cmd, PacketCommandOLD *c, uint8_t iso15cmd) {
         case 'u':
         case 'U':
             // unaddressed mode may not be supported by all vendors
-            req[reqlen++] |= ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | ISO15_REQ_NONINVENTORY;
-            req[reqlen++] = iso15cmd;
+            req[tmpreqlen++] |= ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | ISO15_REQ_NONINVENTORY;
+            req[tmpreqlen++] = iso15cmd;
             break;
         case '*':
             // we scan for the UID ourself
-            req[reqlen++] |= ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | ISO15_REQ_NONINVENTORY | ISO15_REQ_ADDRESS;
-            req[reqlen++] = iso15cmd;
+            req[tmpreqlen++] |= ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | ISO15_REQ_NONINVENTORY | ISO15_REQ_ADDRESS;
+            req[tmpreqlen++] = iso15cmd;
 
             if (!getUID(uid)) {
                 PrintAndLogEx(WARNING, "No tag found");
                 return 0;
             }
-            memcpy(&req[reqlen], uid, sizeof(uid));
+            memcpy(&req[tmpreqlen], uid, sizeof(uid));
             PrintAndLogEx(NORMAL, "Detected UID %s", sprintUID(NULL, uid));
-            reqlen += sizeof(uid);
+            tmpreqlen += sizeof(uid);
             break;
         default:
-            req[reqlen++] |= ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | ISO15_REQ_NONINVENTORY | ISO15_REQ_ADDRESS;
-            req[reqlen++] = iso15cmd;
+            req[tmpreqlen++] |= ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | ISO15_REQ_NONINVENTORY | ISO15_REQ_ADDRESS;
+            req[tmpreqlen++] = iso15cmd;
 
             // parse UID
             for (int i = 0; i < 8 && (*cmd)[i * 2] && (*cmd)[i * 2 + 1]; i++) {
@@ -478,8 +475,8 @@ static int prepareHF15Cmd(char **cmd, PacketCommandOLD *c, uint8_t iso15cmd) {
             }
 
             PrintAndLogEx(NORMAL, "Using UID %s", sprintUID(NULL, uid));
-            memcpy(&req[reqlen], uid, sizeof(uid));
-            reqlen +=  sizeof(uid);
+            memcpy(&req[tmpreqlen], uid, sizeof(uid));
+            tmpreqlen +=  sizeof(uid);
             break;
     }
     // skip to next space
@@ -487,7 +484,7 @@ static int prepareHF15Cmd(char **cmd, PacketCommandOLD *c, uint8_t iso15cmd) {
     // skip over the space
     while (**cmd == ' ' || **cmd == '\t')(*cmd)++;
 
-    c->arg[0] = reqlen;
+    *reqlen = tmpreqlen;
     return 1;
 }
 
@@ -577,9 +574,8 @@ static int CmdHF15Samples(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_15_samples();
 
-    PacketCommandOLD c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_15693, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_15693, 0, 0, 0, NULL, 0);
 
     getSamples(0, false);
     return 0;
@@ -596,23 +592,24 @@ static int CmdHF15Info(const char *Cmd) {
 
     PacketResponseNG resp;
     uint8_t *recv;
-    PacketCommandOLD c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}}; // len,speed,recv?
-    uint8_t *req = c.d.asBytes;
+    uint8_t req[USB_CMD_DATA_SIZE];
+    uint16_t reqlen;
+    uint8_t arg1 = 1;
     char cmdbuf[100] = {0};
     char *cmd = cmdbuf;
 
     strncpy(cmd, Cmd, sizeof(cmdbuf) - 1);
 
-    if (!prepareHF15Cmd(&cmd, &c, ISO15_CMD_SYSINFO))
+    if (!prepareHF15Cmd(&cmd, &reqlen, &arg1, req, ISO15_CMD_SYSINFO))
         return 0;
 
-    AddCrc15(req,  c.arg[0]);
-    c.arg[0] += 2;
+    AddCrc15(req,  reqlen);
+    reqlen += 2;
 
-    //PrintAndLogEx(NORMAL, "cmd %s", sprint_hex(c.d.asBytes, reqlen) );
+    //PrintAndLogEx(NORMAL, "cmd %s", sprint_hex(req, reqlen) );
 
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_ISO_15693_COMMAND, reqlen, arg1, 1, req, reqlen);
 
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
         PrintAndLogEx(WARNING, "iso15693 card select failed");
@@ -674,9 +671,8 @@ static int CmdHF15Record(const char *Cmd) {
     char cmdp =  tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_15_record();
 
-    PacketCommandOLD c = {CMD_RECORD_RAW_ADC_SAMPLES_ISO_15693, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_RECORD_RAW_ADC_SAMPLES_ISO_15693, 0, 0, 0, NULL, 0);
     return 0;
 }
 
@@ -702,10 +698,8 @@ static int CmdHF15Sim(const char *Cmd) {
 
     PrintAndLogEx(SUCCESS, "Starting simulating UID %s", sprint_hex(uid, sizeof(uid)));
 
-    PacketCommandOLD c = {CMD_SIMTAG_ISO_15693, {0, 0, 0}, {{0}}};
-    memcpy(c.d.asBytes, uid, 8);
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_SIMTAG_ISO_15693, 0, 0, 0, uid, 8);
     return 0;
 }
 
@@ -718,9 +712,8 @@ static int CmdHF15Afi(const char *Cmd) {
 
     PrintAndLogEx(SUCCESS, "press pm3-button to cancel");
 
-    PacketCommandOLD c = {CMD_ISO_15693_FIND_AFI, {strtol(Cmd, NULL, 0), 0, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_ISO_15693_FIND_AFI, strtol(Cmd, NULL, 0), 0, 0, NULL, 0);
     return 0;
 }
 
@@ -784,8 +777,7 @@ static int CmdHF15Dump(const char *Cmd) {
     memset(data, 0, sizeof(data));
 
     PacketResponseNG resp;
-    PacketCommandOLD c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}}; // len,speed,recv?
-    uint8_t *req = c.d.asBytes;
+    uint8_t req[13];
     req[0] = ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | ISO15_REQ_NONINVENTORY | ISO15_REQ_ADDRESS;
     req[1] = ISO15_CMD_READ;
 
@@ -796,10 +788,9 @@ static int CmdHF15Dump(const char *Cmd) {
 
         req[10] = blocknum;
         AddCrc15(req, 11);
-        c.arg[0] = 13;
 
         clearCommandBuffer();
-        SendCommand(&c);
+        SendCommandOLD(CMD_ISO_15693_COMMAND, sizeof(req), 1, 1, req, sizeof(req));
 
         if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
 
@@ -860,7 +851,6 @@ static int CmdHF15Raw(const char *Cmd) {
     if (strlen(Cmd) < 3 || cmdp == 'h' || cmdp == 'H') return usage_15_raw();
 
     PacketResponseNG resp;
-    PacketCommandOLD c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}}; // len,speed,recv?
     int reply = 1, fast = 1, i = 0;
     bool crc = false;
     char buf[5] = "";
@@ -916,13 +906,8 @@ static int CmdHF15Raw(const char *Cmd) {
         datalen += 2;
     }
 
-    c.arg[0] = datalen;
-    c.arg[1] = fast;
-    c.arg[2] = reply;
-    memcpy(c.d.asBytes, data, datalen);
-
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_ISO_15693_COMMAND, datalen, fast, reply, data, datalen);
 
     if (reply) {
         if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
@@ -947,22 +932,20 @@ static int CmdHF15Readmulti(const char *Cmd) {
 
     PacketResponseNG resp;
     uint8_t *recv;
-    PacketCommandOLD c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}}; // len,speed,recv?
-    uint8_t *req = c.d.asBytes;
-    int reqlen = 0;
+    uint8_t req[USB_CMD_DATA_SIZE];
+    uint16_t reqlen = 0;
+    uint8_t arg1 = 1;
     uint8_t pagenum, pagecount;
     char cmdbuf[100] = {0};
     char *cmd = cmdbuf;
     strncpy(cmd, Cmd, sizeof(cmdbuf) - 1);
 
-    if (!prepareHF15Cmd(&cmd, &c, ISO15_CMD_READMULTI))
+    if (!prepareHF15Cmd(&cmd, &reqlen, &arg1, req, ISO15_CMD_READMULTI))
         return 0;
 
     // add OPTION flag, in order to get lock-info
     req[0] |= ISO15_REQ_OPTION;
 
-    reqlen = c.arg[0];
-
     // decimal
     pagenum = param_get8ex(cmd, 0, 0, 10);
     pagecount = param_get8ex(cmd, 1, 0, 10);
@@ -976,10 +959,10 @@ static int CmdHF15Readmulti(const char *Cmd) {
     req[reqlen++] = pagenum;
     req[reqlen++] = pagecount;
     AddCrc15(req, reqlen);
-    c.arg[0] = reqlen + 2;
+    reqlen += 2;
 
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_ISO_15693_COMMAND, reqlen, arg1, 1, req, reqlen);
 
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
         PrintAndLogEx(FAILED, "iso15693 card select failed");
@@ -1031,35 +1014,33 @@ static int CmdHF15Read(const char *Cmd) {
     PacketResponseNG resp;
     uint8_t *recv;
 
-    // PacketCommandOLD arg: len, speed, recv?
+    // arg: len, speed, recv?
     // arg0 (datalen,  cmd len?  .arg0 == crc?)
     // arg1 (speed == 0 == 1 of 256,  == 1 == 1 of 4 )
     // arg2 (recv == 1 == expect a response)
-    PacketCommandOLD c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}};
-    uint8_t *req = c.d.asBytes;
-    int reqlen = 0, blocknum;
+    uint8_t req[USB_CMD_DATA_SIZE];
+    uint16_t reqlen = 0;
+    uint8_t arg1 = 1;
+    int blocknum;
     char cmdbuf[100] = {0};
     char *cmd = cmdbuf;
     strncpy(cmd, Cmd, sizeof(cmdbuf) - 1);
 
-    if (!prepareHF15Cmd(&cmd, &c, ISO15_CMD_READ))
+    if (!prepareHF15Cmd(&cmd, &reqlen, &arg1, req, ISO15_CMD_READ))
         return 0;
 
     // add OPTION flag, in order to get lock-info
     req[0] |= ISO15_REQ_OPTION;
 
-    reqlen = c.arg[0];
-
     blocknum = strtol(cmd, NULL, 0);
 
     req[reqlen++] = (uint8_t)blocknum;
 
     AddCrc15(req, reqlen);
-
-    c.arg[0] = reqlen + 2;
+    reqlen += 2;
 
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_ISO_15693_COMMAND, reqlen, arg1, 1, req, reqlen);
 
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
         PrintAndLogEx(NORMAL, "iso15693 card select failed");
@@ -1104,20 +1085,19 @@ static int CmdHF15Write(const char *Cmd) {
 
     PacketResponseNG resp;
     uint8_t *recv;
-    PacketCommandOLD c = {CMD_ISO_15693_COMMAND, {0, 1, 1}, {{0}}}; // len,speed,recv?
-    uint8_t *req = c.d.asBytes;
-    int reqlen = 0, pagenum, temp;
+    uint8_t req[USB_CMD_DATA_SIZE];
+    uint16_t reqlen = 0;
+    uint8_t arg1 = 1;
+    int pagenum, temp;
     char cmdbuf[100] = {0};
     char *cmd = cmdbuf;
     char *cmd2;
 
     strncpy(cmd, Cmd, sizeof(cmdbuf) - 1);
 
-    if (!prepareHF15Cmd(&cmd, &c, ISO15_CMD_WRITE))
+    if (!prepareHF15Cmd(&cmd, &reqlen, &arg1, req, ISO15_CMD_WRITE))
         return 0;
 
-    reqlen = c.arg[0];
-
     // *cmd -> page num ; *cmd2 -> data
     cmd2 = cmd;
     while (*cmd2 != ' ' && *cmd2 != '\t' && *cmd2) cmd2++;
@@ -1138,12 +1118,12 @@ static int CmdHF15Write(const char *Cmd) {
         cmd2 += 2;
     }
     AddCrc15(req, reqlen);
-    c.arg[0] = reqlen + 2;
+    reqlen += 2;
 
     PrintAndLogEx(NORMAL, "iso15693 writing to page %02d (0x%02X) | data ", pagenum, pagenum);
 
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_ISO_15693_COMMAND, reqlen, arg1, 1, req, reqlen);
 
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
         PrintAndLogEx(FAILED, "iso15693 card timeout, data may be written anyway");
diff --git a/client/cmdhfepa.c b/client/cmdhfepa.c
index 3f95894e7..6adb71a28 100644
--- a/client/cmdhfepa.c
+++ b/client/cmdhfepa.c
@@ -31,9 +31,8 @@ static int CmdHFEPACollectPACENonces(const char *Cmd) {
     // repeat n times
     for (uint32_t i = 0; i < n; i++) {
         // execute PACE
-        PacketCommandOLD c = {CMD_EPA_PACE_COLLECT_NONCE, {(int)m, 0, 0}, {{0}}};
         clearCommandBuffer();
-        SendCommand(&c);
+        SendCommandOLD(CMD_EPA_PACE_COLLECT_NONCE, (int)m, 0, 0, NULL, 0);
         PacketResponseNG resp;
         WaitForResponse(CMD_ACK, &resp);
 
@@ -109,28 +108,23 @@ static int CmdHFEPAPACEReplay(const char *Cmd) {
     }
 
     // transfer the APDUs to the Proxmark
-    PacketCommandOLD usb_cmd;
-    usb_cmd.cmd = CMD_EPA_PACE_REPLAY;
+    uint8_t data[USB_CMD_DATA_SIZE];
     for (int i = 0; i < sizeof(apdu_lengths); i++) {
-        // APDU number
-        usb_cmd.arg[0] = i + 1;
         // transfer the APDU in several parts if necessary
-        for (int j = 0; j * sizeof(usb_cmd.d.asBytes) < apdu_lengths[i]; j++) {
-            // offset into the APDU
-            usb_cmd.arg[1] = j * sizeof(usb_cmd.d.asBytes);
+        for (int j = 0; j * sizeof(data) < apdu_lengths[i]; j++) {
             // amount of data in this packet
-            int packet_length = apdu_lengths[i] - (j * sizeof(usb_cmd.d.asBytes));
-            if (packet_length > sizeof(usb_cmd.d.asBytes)) {
-                packet_length = sizeof(usb_cmd.d.asBytes);
+            int packet_length = apdu_lengths[i] - (j * sizeof(data));
+            if (packet_length > sizeof(data)) {
+                packet_length = sizeof(data);
             }
-            usb_cmd.arg[2] = packet_length;
-
-            memcpy(usb_cmd.d.asBytes, // + (j * sizeof(usb_cmd.d.asBytes)),
-                   apdus[i] + (j * sizeof(usb_cmd.d.asBytes)),
+            memcpy(data, // + (j * sizeof(data)),
+                   apdus[i] + (j * sizeof(data)),
                    packet_length);
 
             clearCommandBuffer();
-            SendCommand(&usb_cmd);
+            // arg0: APDU number
+            // arg1: offset into the APDU
+            SendCommandOLD(CMD_EPA_PACE_REPLAY, i + 1, j * sizeof(data), packet_length, data, packet_length);
             WaitForResponse(CMD_ACK, &resp);
             if (resp.oldarg[0] != 0) {
                 PrintAndLogEx(WARNING, "Transfer of APDU #%d Part %d failed!", i, j);
@@ -140,9 +134,8 @@ static int CmdHFEPAPACEReplay(const char *Cmd) {
     }
 
     // now perform the replay
-    usb_cmd.arg[0] = 0;
     clearCommandBuffer();
-    SendCommand(&usb_cmd);
+    SendCommandOLD(CMD_EPA_PACE_REPLAY, 0, 0, 0, NULL, 0);
     WaitForResponse(CMD_ACK, &resp);
     if (resp.oldarg[0] != 0) {
         PrintAndLogEx(NORMAL, "\nPACE replay failed in step %u!", (uint32_t)resp.oldarg[0]);
diff --git a/client/cmdhffelica.c b/client/cmdhffelica.c
index 24cc696b3..aa3aa0499 100644
--- a/client/cmdhffelica.c
+++ b/client/cmdhffelica.c
@@ -128,10 +128,8 @@ static int CmdHFFelicaSim(const char *Cmd) {
     //Validations
     if (errors || cmdp == 0) return usage_hf_felica_sim();
 
-    PacketCommandOLD c = {CMD_FELICA_SIMULATE_TAG, { tagtype, flags, 0 }, {{0}}};
-    memcpy(c.d.asBytes, uid, uidlen >> 1);
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_FELICA_SIMULATE_TAG,  tagtype, flags, 0 , uid, uidlen >> 1);
     PacketResponseNG resp;
 
     if (verbose)
@@ -174,9 +172,8 @@ static int CmdHFFelicaSniff(const char *Cmd) {
     //Validations
     if (errors || cmdp == 0) return usage_hf_felica_sniff();
 
-    PacketCommandOLD c = {CMD_FELICA_SNIFF, {samples2skip, triggers2skip, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_FELICA_SNIFF, samples2skip, triggers2skip, 0, NULL, 0);
     return 0;
 }
 
@@ -188,9 +185,8 @@ static int CmdHFFelicaSimLite(const char *Cmd) {
     if (!uid)
         return usage_hf_felica_simlite();
 
-    PacketCommandOLD c = {CMD_FELICA_LITE_SIM, {uid, 0, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_FELICA_LITE_SIM, uid, 0, 0, NULL, 0);
     return 0;
 }
 
@@ -352,9 +348,8 @@ static int CmdHFFelicaDumpLite(const char *Cmd) {
 
     PrintAndLogEx(SUCCESS, "FeliCa lite - dump started");
     PrintAndLogEx(SUCCESS, "press pm3-button to cancel");
-    PacketCommandOLD c = {CMD_FELICA_LITE_DUMP, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_FELICA_LITE_DUMP, 0, 0, 0, NULL, 0);
     PacketResponseNG resp;
 
     uint8_t timeout = 0;
@@ -426,7 +421,6 @@ static void waitCmdFelica(uint8_t iSelect) {
 }
 
 static int CmdHFFelicaCmdRaw(const char *Cmd) {
-    PacketCommandOLD c = {CMD_FELICA_COMMAND, {0, 0, 0}, {{0}}};
     bool reply = 1;
     bool crc = false;
     bool power = false;
@@ -509,28 +503,26 @@ static int CmdHFFelicaCmdRaw(const char *Cmd) {
         data[datalen++] = b2;
     }
 
+    uint8_t flags = 0;
     if (active || active_select) {
-        c.arg[0] |= FELICA_CONNECT;
+        flags |= FELICA_CONNECT;
         if (active)
-            c.arg[0] |= FELICA_NO_SELECT;
+            flags |= FELICA_NO_SELECT;
     }
 
     if (power) {
-        c.arg[0] |= FELICA_NO_DISCONNECT;
+        flags |= FELICA_NO_DISCONNECT;
     }
 
     if (datalen > 0) {
-        c.arg[0] |= FELICA_RAW;
+        flags |= FELICA_RAW;
     }
 
     // Max buffer is USB_CMD_DATA_SIZE
     datalen = (datalen > USB_CMD_DATA_SIZE) ? USB_CMD_DATA_SIZE : datalen;
 
-    c.arg[1] = (datalen & 0xFFFF) | (uint32_t)(numbits << 16);
-    memcpy(c.d.asBytes, data, datalen);
-
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_FELICA_COMMAND, flags, (datalen & 0xFFFF) | (uint32_t)(numbits << 16), 0, data, datalen);
 
     if (reply) {
         if (active_select)
@@ -567,14 +559,12 @@ int CmdHFFelica(const char *Cmd) {
 
 int readFelicaUid(bool verbose) {
 
-    //PacketCommandOLD cDisconnect = {CMD_FELICA_COMMAND, {0,0,0}, {{0}}};
-    PacketCommandOLD c = {CMD_FELICA_COMMAND, {FELICA_CONNECT, 0, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_FELICA_COMMAND, FELICA_CONNECT, 0, 0, NULL, 0);
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         if (verbose) PrintAndLogEx(WARNING, "FeliCa card select failed");
-        //SendCommand(&cDisconnect);
+        //SendCommandOLD(CMD_FELICA_COMMAND, 0, 0, 0, NULL, 0);
         return 0;
     }
 
diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index bfd76d377..4b02b7cc6 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -281,8 +281,7 @@ static int CmdHFiClassList(const char *Cmd) {
 static int CmdHFiClassSniff(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_hf_iclass_sniff();
-    PacketCommandOLD c = {CMD_SNIFF_ICLASS, {0, 0, 0}, {{0}}};
-    SendCommand(&c);
+    SendCommandOLD(CMD_SNIFF_ICLASS, 0, 0, 0, NULL, 0);
     return 0;
 }
 
@@ -380,11 +379,9 @@ static int CmdHFiClassSim(const char *Cmd) {
         case 2: {
             PrintAndLogEx(INFO, "Starting iCLASS sim 2 attack (elite mode)");
             PrintAndLogEx(INFO, "press keyboard to cancel");
-            PacketCommandOLD c = {CMD_SIMULATE_TAG_ICLASS, {simType, NUM_CSNS}, {{0}}};
             PacketResponseNG resp;
-            memcpy(c.d.asBytes, csns, 8 * NUM_CSNS);
             clearCommandBuffer();
-            SendCommand(&c);
+            SendCommandOLD(CMD_SIMULATE_TAG_ICLASS, simType, NUM_CSNS, 0, csns, 8 * NUM_CSNS);
 
             while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
                 tries++;
@@ -433,11 +430,9 @@ static int CmdHFiClassSim(const char *Cmd) {
             // reader in key roll mode,  when it has two keys it alternates when trying to verify.
             PrintAndLogEx(INFO, "Starting iCLASS sim 4 attack (elite mode, reader in key roll mode)");
             PrintAndLogEx(INFO, "press keyboard to cancel");
-            PacketCommandOLD c = {CMD_SIMULATE_TAG_ICLASS, {simType, NUM_CSNS}, {{0}}};
             PacketResponseNG resp;
-            memcpy(c.d.asBytes, csns, 8 * NUM_CSNS);
             clearCommandBuffer();
-            SendCommand(&c);
+            SendCommandOLD(CMD_SIMULATE_TAG_ICLASS, simType, NUM_CSNS, 0, csns, 8 * NUM_CSNS);
 
             while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
                 tries++;
@@ -501,10 +496,8 @@ static int CmdHFiClassSim(const char *Cmd) {
         case 1:
         case 3:
         default: {
-            PacketCommandOLD c = {CMD_SIMULATE_TAG_ICLASS, {simType, numberOfCSNs}, {{0}}};
-            memcpy(c.d.asBytes, CSN, 8);
             clearCommandBuffer();
-            SendCommand(&c);
+            SendCommandOLD(CMD_SIMULATE_TAG_ICLASS, simType, numberOfCSNs, 0, CSN, 8);
             break;
         }
     }
@@ -531,19 +524,15 @@ static int CmdHFiClassReader_Replay(const char *Cmd) {
         return 1;
     }
 
-    PacketCommandOLD c = {CMD_READER_ICLASS_REPLAY, {readerType}, {{0}}};
-    memcpy(c.d.asBytes, MAC, 4);
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_READER_ICLASS_REPLAY, readerType, 0, 0, MAC, 4);
     return 0;
 }
 
 /*
 static int iclassEmlSetMem(uint8_t *data, int blockNum, int blocksCount) {
-    PacketCommandOLD c = {CMD_MIFARE_EML_MEMSET, {blockNum, blocksCount, 0}, {{0}}};
-    memcpy(c.d.asBytes, data, blocksCount * 16);
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_MIFARE_EML_MEMSET, blockNum, blocksCount, 0, data, blocksCount * 16);
     return 0;
 }
 */
@@ -603,10 +592,8 @@ static int CmdHFiClassELoad(const char *Cmd) {
 
     while (bytes_remaining > 0) {
         uint32_t bytes_in_packet = MIN(USB_CMD_DATA_SIZE, bytes_remaining);
-        PacketCommandOLD c = {CMD_ICLASS_EML_MEMSET, {bytes_sent, bytes_in_packet, 0}, {{0}}};
-        memcpy(c.d.asBytes, dump + bytes_sent, bytes_in_packet);
         clearCommandBuffer();
-        SendCommand(&c);
+        SendCommandOLD(CMD_ICLASS_EML_MEMSET, bytes_sent, bytes_in_packet, 0, dump + bytes_sent, bytes_in_packet);
         bytes_remaining -= bytes_in_packet;
         bytes_sent += bytes_in_packet;
     }
@@ -768,14 +755,13 @@ static void Calc_wb_mac(uint8_t blockno, uint8_t *data, uint8_t *div_key, uint8_
 
 static bool select_only(uint8_t *CSN, uint8_t *CCNR, bool use_credit_key, bool verbose) {
     PacketResponseNG resp;
-    PacketCommandOLD c = {CMD_READER_ICLASS, {0}, {{0}}};
-    c.arg[0] = FLAG_ICLASS_READER_ONLY_ONCE | FLAG_ICLASS_READER_CC | FLAG_ICLASS_READER_ONE_TRY;
+    uint8_t flags = FLAG_ICLASS_READER_ONLY_ONCE | FLAG_ICLASS_READER_CC | FLAG_ICLASS_READER_ONE_TRY;
 
     if (use_credit_key)
-        c.arg[0] |= FLAG_ICLASS_READER_CEDITKEY;
+        flags |= FLAG_ICLASS_READER_CEDITKEY;
 
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_READER_ICLASS, flags, 0, 0, NULL, 0);
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 4000)) {
         PrintAndLogEx(WARNING, "command execute timeout");
         return false;
@@ -819,10 +805,8 @@ static bool select_and_auth(uint8_t *KEY, uint8_t *MAC, uint8_t *div_key, bool u
 
     doMAC(CCNR, div_key, MAC);
     PacketResponseNG resp;
-    PacketCommandOLD d = {CMD_ICLASS_AUTHENTICATION, {0, 0, 0}, {{0}}};
-    memcpy(d.d.asBytes, MAC, 4);
     clearCommandBuffer();
-    SendCommand(&d);
+    SendCommandOLD(CMD_ICLASS_AUTHENTICATION, 0, 0, 0, MAC, 4);
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 4000)) {
         if (verbose) PrintAndLogEx(FAILED, "auth command execute timeout");
         return false;
@@ -939,12 +923,11 @@ static int CmdHFiClassReader_Dump(const char *Cmd) {
                      FLAG_ICLASS_READER_ONE_TRY;
 
     //get config and first 3 blocks
-    PacketCommandOLD c = {CMD_READER_ICLASS, {flags, 0, 0}, {{0}}};
     PacketResponseNG resp;
     uint8_t tag_data[255 * 8];
 
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_READER_ICLASS, flags, 0, 0, NULL, 0);
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 4500)) {
         PrintAndLogEx(WARNING, "command execute timeout");
         DropField();
@@ -981,9 +964,8 @@ static int CmdHFiClassReader_Dump(const char *Cmd) {
     }
 
     // begin dump
-    PacketCommandOLD w = {CMD_ICLASS_DUMP, {blockno, numblks - blockno + 1}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&w);
+    SendCommandOLD(CMD_ICLASS_DUMP, blockno, numblks - blockno + 1, 0, NULL, 0);
     while (true) {
         printf(".");
         fflush(stdout);
@@ -1038,10 +1020,8 @@ static int CmdHFiClassReader_Dump(const char *Cmd) {
         // do we still need to read more block?  (aa2 enabled?)
         if (maxBlk > blockno + numblks + 1) {
             // setup dump and start
-            w.arg[0] = blockno + blocksRead;
-            w.arg[1] = maxBlk - (blockno + blocksRead);
             clearCommandBuffer();
-            SendCommand(&w);
+            SendCommandOLD(CMD_ICLASS_DUMP, blockno + blocksRead, maxBlk - (blockno + blocksRead), 0, NULL, 0);
             if (!WaitForResponseTimeout(CMD_ACK, &resp, 4500)) {
                 PrintAndLogEx(WARNING, "command execute timeout 2");
                 return 0;
@@ -1100,12 +1080,12 @@ static int WriteBlock(uint8_t blockno, uint8_t *bldata, uint8_t *KEY, bool use_c
     PacketResponseNG resp;
 
     Calc_wb_mac(blockno, bldata, div_key, MAC);
-    PacketCommandOLD w = {CMD_ICLASS_WRITEBLOCK, {blockno}, {{0}}};
-    memcpy(w.d.asBytes, bldata, 8);
-    memcpy(w.d.asBytes + 8, MAC, 4);
+    uint8_t data[12];
+    memcpy(data, bldata, 8);
+    memcpy(data + 8, MAC, 4);
 
     clearCommandBuffer();
-    SendCommand(&w);
+    SendCommandOLD(CMD_ICLASS_WRITEBLOCK, blockno, 0, 0, data, sizeof(data));
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 4500)) {
         if (verbose) PrintAndLogEx(WARNING, "Write Command execute timeout");
         return 0;
@@ -1321,8 +1301,8 @@ static int CmdHFiClassCloneTag(const char *Cmd) {
         return 0;
     }
 
-    PacketCommandOLD w = {CMD_ICLASS_CLONE, {startblock, endblock}, {{0}}};
     uint8_t *ptr;
+    uint8_t data[(endblock - startblock) * 12];
     // calculate all mac for every the block we will write
     for (i = startblock; i <= endblock; i++) {
         Calc_wb_mac(i, tag_data[i - startblock].d, div_key, MAC);
@@ -1330,13 +1310,13 @@ static int CmdHFiClassCloneTag(const char *Cmd) {
         // memcpy(pointer,tag_data[i - 6],8) 8 bytes
         // memcpy(pointer + 8,mac,sizoof(mac) 4 bytes;
         // next one
-        ptr = w.d.asBytes + (i - startblock) * 12;
+        ptr = data + (i - startblock) * 12;
         memcpy(ptr, &(tag_data[i - startblock].d[0]), 8);
         memcpy(ptr + 8, MAC, 4);
     }
     uint8_t p[12];
     for (i = 0; i <= endblock - startblock; i++) {
-        memcpy(p, w.d.asBytes + (i * 12), 12);
+        memcpy(p, data + (i * 12), 12);
         PrintAndLogEx(NORMAL, "Block |%02x|", i + startblock);
         PrintAndLogEx(NORMAL, " %02x%02x%02x%02x%02x%02x%02x%02x |", p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7]);
         PrintAndLogEx(NORMAL, " MAC |%02x%02x%02x%02x|\n", p[8], p[9], p[10], p[11]);
@@ -1344,7 +1324,7 @@ static int CmdHFiClassCloneTag(const char *Cmd) {
 
     PacketResponseNG resp;
     clearCommandBuffer();
-    SendCommand(&w);
+    SendCommandOLD(CMD_ICLASS_CLONE, startblock, endblock, 0, data, (endblock - startblock) * 12);
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 4500)) {
         PrintAndLogEx(WARNING, "command execute timeout");
         return 0;
@@ -1368,9 +1348,8 @@ static int ReadBlock(uint8_t *KEY, uint8_t blockno, uint8_t keyType, bool elite,
     }
 
     PacketResponseNG resp;
-    PacketCommandOLD c = {CMD_ICLASS_READBLOCK, {blockno}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_ICLASS_READBLOCK, blockno, 0, 0, NULL, 0);
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 4500)) {
         PrintAndLogEx(WARNING, "Command execute timeout");
         return 0;
@@ -1977,16 +1956,14 @@ static int CmdHFiClassCheckKeys(const char *Cmd) {
         if (keys == keycnt - i)
             lastChunk = true;
 
-        PacketCommandOLD c = {CMD_ICLASS_CHECK_KEYS, { (lastChunk << 8), keys, 0}, {{0}}};
-
+        uint32_t flags = lastChunk << 8;
         // bit 16
         //   - 1 indicates credit key
         //   - 0 indicates debit key (default)
-        c.arg[0] |= (use_credit_key << 16);
+        flags |= (use_credit_key << 16);
 
-        memcpy(c.d.asBytes, pre + i, 4 * keys);
         clearCommandBuffer();
-        SendCommand(&c);
+        SendCommandOLD(CMD_ICLASS_CHECK_KEYS, flags, keys, 0, pre + i, 4 * keys);
         PacketResponseNG resp;
 
         while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
@@ -2464,13 +2441,12 @@ int readIclass(bool loop, bool verbose) {
                      FLAG_ICLASS_READER_CONF | FLAG_ICLASS_READER_ONLY_ONCE |
                      FLAG_ICLASS_READER_ONE_TRY;
 
-    PacketCommandOLD c = {CMD_READER_ICLASS, {flags, 0, 0}, {{0}}};
     // loop in client not device - else on windows have a communication error
     PacketResponseNG resp;
     while (!ukbhit()) {
 
         clearCommandBuffer();
-        SendCommand(&c);
+        SendCommandOLD(CMD_READER_ICLASS, flags, 0, 0, NULL, 0);
         if (WaitForResponseTimeout(CMD_ACK, &resp, 4500)) {
             uint8_t readStatus = resp.oldarg[0] & 0xff;
             uint8_t *data = resp.data.asBytes;
diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index 18555b957..21f40dacd 100644
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -524,10 +524,10 @@ static int CmdLegicRfSim(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) == 0 || cmdp == 'h') return usage_legic_sim();
 
-    PacketCommandOLD c = {CMD_SIMULATE_TAG_LEGIC_RF, {1}, {{0}}};
-    sscanf(Cmd, " %" SCNi64, &c.arg[0]);
+    uint64_t id = 1;
+    sscanf(Cmd, " %" SCNi64, &id);
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_SIMULATE_TAG_LEGIC_RF, id, 0, 0, NULL, 0);
     return 0;
 }
 
@@ -642,11 +642,9 @@ static int CmdLegicRfWrite(const char *Cmd) {
 
     PrintAndLogEx(SUCCESS, "Writing to tag");
 
-    PacketCommandOLD c = {CMD_WRITER_LEGIC_RF, {offset, len, IV}, {{0}}};
-    memcpy(c.d.asBytes, data, len);
     PacketResponseNG resp;
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_WRITER_LEGIC_RF, offset, len, IV, data, len);
 
 
     uint8_t timeout = 0;
@@ -756,9 +754,8 @@ int legic_read_mem(uint32_t offset, uint32_t len, uint32_t iv, uint8_t *out, uin
 
     legic_chk_iv(&iv);
 
-    PacketCommandOLD c = {CMD_READER_LEGIC_RF, {offset, len, iv}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_READER_LEGIC_RF, offset, len, iv, NULL, 0);
     PacketResponseNG resp;
 
     uint8_t timeout = 0;
@@ -810,9 +807,8 @@ int legic_get_type(legic_card_select_t *card) {
 
     if (card == NULL) return 1;
 
-    PacketCommandOLD c = {CMD_LEGIC_INFO, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_LEGIC_INFO, 0, 0, 0, NULL, 0);
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500))
         return 2;
@@ -837,15 +833,11 @@ void legic_chk_iv(uint32_t *iv) {
 }
 void legic_seteml(uint8_t *src, uint32_t offset, uint32_t numofbytes) {
 
-    PacketCommandOLD c = {CMD_LEGIC_ESET, {0, 0, 0}, {{0}}};
     for (size_t i = offset; i < numofbytes; i += USB_CMD_DATA_SIZE) {
 
         size_t len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);
-        c.arg[0] = i; // offset
-        c.arg[1] = len; // number of bytes
-        memcpy(c.d.asBytes, src + i, len);
         clearCommandBuffer();
-        SendCommand(&c);
+        SendCommandOLD(CMD_LEGIC_ESET, i, len, 0, src + i, len);
     }
 }
 
@@ -900,9 +892,8 @@ static int CmdLegicDump(const char *Cmd) {
     legic_print_type(dumplen, 0);
     PrintAndLogEx(SUCCESS, "Reading tag memory %d b...", dumplen);
 
-    PacketCommandOLD c = {CMD_READER_LEGIC_RF, {0x00, dumplen, 0x55}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_READER_LEGIC_RF, 0x00, dumplen, 0x55, NULL, 0);
     PacketResponseNG resp;
 
     uint8_t timeout = 0;
@@ -1049,16 +1040,12 @@ static int CmdLegicRestore(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "Restoring to card");
 
     // transfer to device
-    PacketCommandOLD c = {CMD_WRITER_LEGIC_RF, {0, 0, 0x55}, {{0}}};
     PacketResponseNG resp;
     for (size_t i = 7; i < numofbytes; i += USB_CMD_DATA_SIZE) {
 
         size_t len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);
-        c.arg[0] = i; // offset
-        c.arg[1] = len; // number of bytes
-        memcpy(c.d.asBytes, data + i, len);
         clearCommandBuffer();
-        SendCommand(&c);
+        SendCommandOLD(CMD_WRITER_LEGIC_RF, i, len, 0x55, data + i, len);
 
         uint8_t timeout = 0;
         while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
@@ -1242,18 +1229,14 @@ static int CmdLegicWipe(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "Erasing");
 
     // transfer to device
-    PacketCommandOLD c = {CMD_WRITER_LEGIC_RF, {0, 0, 0x55}, {{0}}};
     PacketResponseNG resp;
     for (size_t i = 7; i < card.cardsize; i += USB_CMD_DATA_SIZE) {
 
         printf(".");
         fflush(stdout);
         size_t len = MIN((card.cardsize - i), USB_CMD_DATA_SIZE);
-        c.arg[0] = i; // offset
-        c.arg[1] = len; // number of bytes
-        memcpy(c.d.asBytes, data + i, len);
         clearCommandBuffer();
-        SendCommand(&c);
+        SendCommandOLD(CMD_WRITER_LEGIC_RF, i, len, 0x55, data + i, len);
 
         uint8_t timeout = 0;
         while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 2a4430262..ff044122f 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -411,9 +411,8 @@ static int usage_hf14_nack(void) {
 }
 
 static int GetHFMF14AUID(uint8_t *uid, int *uidlen) {
-    PacketCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT, 0, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_READER_ISO_14443a, ISO14A_CONNECT, 0, 0, NULL, 0);
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         PrintAndLogEx(WARNING, "iso14443a card select failed");
@@ -522,11 +521,11 @@ static int CmdHF14AMfWrBl(const char *Cmd) {
     PrintAndLogEx(NORMAL, "--block no:%d, key type:%c, key:%s", blockNo, keyType ? 'B' : 'A', sprint_hex(key, 6));
     PrintAndLogEx(NORMAL, "--data: %s", sprint_hex(bldata, 16));
 
-    PacketCommandOLD c = {CMD_MIFARE_WRITEBL, {blockNo, keyType, 0}, {{0}}};
-    memcpy(c.d.asBytes, key, 6);
-    memcpy(c.d.asBytes + 10, bldata, 16);
+    uint8_t data[26];
+    memcpy(data, key, 6);
+    memcpy(data + 10, bldata, 16);
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_MIFARE_WRITEBL, blockNo, keyType, 0, data, sizeof(data));
 
     PacketResponseNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
@@ -568,10 +567,8 @@ static int CmdHF14AMfRdBl(const char *Cmd) {
     }
     PrintAndLogEx(NORMAL, "--block no:%d, key type:%c, key:%s ", blockNo, keyType ? 'B' : 'A', sprint_hex(key, 6));
 
-    PacketCommandOLD c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}, {{0}}};
-    memcpy(c.d.asBytes, key, 6);
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_MIFARE_READBL, blockNo, keyType, 0, key, 6);
 
     PacketResponseNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
@@ -638,10 +635,8 @@ static int CmdHF14AMfRdSc(const char *Cmd) {
     }
     PrintAndLogEx(NORMAL, "--sector no:%d key type:%c key:%s ", sectorNo, keyType ? 'B' : 'A', sprint_hex(key, 6));
 
-    PacketCommandOLD c = {CMD_MIFARE_READSC, {sectorNo, keyType, 0}, {{0}}};
-    memcpy(c.d.asBytes, key, 6);
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_MIFARE_READSC, sectorNo, keyType, 0, key, 6);
     PrintAndLogEx(NORMAL, "");
 
     PacketResponseNG resp;
@@ -803,10 +798,8 @@ static int CmdHF14AMfDump(const char *Cmd) {
     for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
         for (tries = 0; tries < MIFARE_SECTOR_RETRY; tries++) {
 
-            PacketCommandOLD c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 0, 0}, {{0}}};
-            memcpy(c.d.asBytes, keyA[sectorNo], 6);
             clearCommandBuffer();
-            SendCommand(&c);
+            SendCommandOLD(CMD_MIFARE_READBL, FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 0, 0, keyA[sectorNo], 6);
 
             if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
                 uint8_t isOK = resp.oldarg[0] & 0xff;
@@ -840,27 +833,21 @@ static int CmdHF14AMfDump(const char *Cmd) {
 
             for (tries = 0; tries < MIFARE_SECTOR_RETRY; tries++) {
                 if (blockNo == NumBlocksPerSector(sectorNo) - 1) { // sector trailer. At least the Access Conditions can always be read with key A.
-                    PacketCommandOLD c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}, {{0}}};
-                    memcpy(c.d.asBytes, keyA[sectorNo], 6);
                     clearCommandBuffer();
-                    SendCommand(&c);
+                    SendCommandOLD(CMD_MIFARE_READBL, FirstBlockOfSector(sectorNo) + blockNo, 0, 0, keyA[sectorNo], 6);
                     received = WaitForResponseTimeout(CMD_ACK, &resp, 1500);
                 } else {                                           // data block. Check if it can be read with key A or key B
                     uint8_t data_area = (sectorNo < 32) ? blockNo : blockNo / 5;
                     if ((rights[sectorNo][data_area] == 0x03) || (rights[sectorNo][data_area] == 0x05)) { // only key B would work
-                        PacketCommandOLD c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 1, 0}, {{0}}};
-                        memcpy(c.d.asBytes, keyB[sectorNo], 6);
-                        SendCommand(&c);
+                        SendCommandOLD(CMD_MIFARE_READBL, FirstBlockOfSector(sectorNo) + blockNo, 1, 0, keyB[sectorNo], 6);
                         received = WaitForResponseTimeout(CMD_ACK, &resp, 1500);
                     } else if (rights[sectorNo][data_area] == 0x07) {                                     // no key would work
                         isOK = false;
                         PrintAndLogEx(WARNING, "access rights do not allow reading of sector %2d block %3d", sectorNo, blockNo);
                         tries = MIFARE_SECTOR_RETRY;
                     } else {                                                                              // key A would work
-                        PacketCommandOLD c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}, {{0}}};
-                        memcpy(c.d.asBytes, keyA[sectorNo], 6);
                         clearCommandBuffer();
-                        SendCommand(&c);
+                        SendCommandOLD(CMD_MIFARE_READBL, FirstBlockOfSector(sectorNo) + blockNo, 0, 0, keyA[sectorNo], 6);
                         received = WaitForResponseTimeout(CMD_ACK, &resp, 1500);
                     }
                 }
@@ -1019,8 +1006,8 @@ static int CmdHF14AMfRestore(const char *Cmd) {
 
     for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
         for (blockNo = 0; blockNo < NumBlocksPerSector(sectorNo); blockNo++) {
-            PacketCommandOLD c = {CMD_MIFARE_WRITEBL, {FirstBlockOfSector(sectorNo) + blockNo, keyType, 0}, {{0}}};
-            memcpy(c.d.asBytes, key, 6);
+            uint8_t data[26];
+            memcpy(data, key, 6);
             bytes_read = fread(bldata, 1, 16, fdump);
             if (bytes_read != 16) {
                 PrintAndLogEx(WARNING, "File reading error " _YELLOW_("%s"), dataFilename);
@@ -1046,9 +1033,9 @@ static int CmdHF14AMfRestore(const char *Cmd) {
 
             PrintAndLogEx(NORMAL, "Writing to block %3d: %s", FirstBlockOfSector(sectorNo) + blockNo, sprint_hex(bldata, 16));
 
-            memcpy(c.d.asBytes + 10, bldata, 16);
+            memcpy(data + 10, bldata, 16);
             clearCommandBuffer();
-            SendCommand(&c);
+            SendCommandOLD(CMD_MIFARE_WRITEBL, FirstBlockOfSector(sectorNo) + blockNo, keyType, 0, data, sizeof(data));
 
             PacketResponseNG resp;
             if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
@@ -1251,10 +1238,10 @@ static int CmdHF14AMfNested(const char *Cmd) {
 
                 PrintAndLogEx(SUCCESS, "reading block %d", sectrail);
 
-                PacketCommandOLD c = {CMD_MIFARE_READBL, {sectrail, 0, 0}, {{0}}};
-                num_to_bytes(e_sector[i].Key[0], 6, c.d.asBytes); // KEY A
+                uint8_t txdata[6];
+                num_to_bytes(e_sector[i].Key[0], 6, txdata); // KEY A
                 clearCommandBuffer();
-                SendCommand(&c);
+                SendCommandOLD(CMD_MIFARE_READBL, sectrail, 0, 0, txdata, sizeof(txdata));
 
                 PacketResponseNG resp;
                 if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) continue;
@@ -1997,10 +1984,10 @@ static int CmdHF14AMfChk(const char *Cmd) {
 
                 PrintAndLogEx(NORMAL, "Reading block %d", sectrail);
 
-                PacketCommandOLD c = {CMD_MIFARE_READBL, {sectrail, 0, 0}, {{0}}};
-                num_to_bytes(e_sector[i].Key[0], 6, c.d.asBytes); // KEY A
+                uint8_t txdata[6];
+                num_to_bytes(e_sector[i].Key[0], 6, txdata); // KEY A
                 clearCommandBuffer();
-                SendCommand(&c);
+                SendCommandOLD(CMD_MIFARE_READBL, sectrail, 0, 0, txdata, sizeof(txdata));
 
                 PacketResponseNG resp;
                 if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) continue;
@@ -2231,10 +2218,8 @@ static int CmdHF14AMfSim(const char *Cmd) {
                   , flags
                   , flags);
 
-    PacketCommandOLD c = {CMD_SIMULATE_MIFARE_CARD, {flags, exitAfterNReads, 0}, {{0}}};
-    memcpy(c.d.asBytes, uid, sizeof(uid));
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_SIMULATE_MIFARE_CARD, flags, exitAfterNReads, 0, uid, sizeof(uid));
     PacketResponseNG resp;
 
     if (flags & FLAG_INTERACTIVE) {
@@ -2291,9 +2276,8 @@ static int CmdHF14AMfSniff(const char *Cmd) {
     PrintAndLogEx(NORMAL, "Press the key on pc keyboard to abort the client.\n");
     PrintAndLogEx(NORMAL, "-------------------------------------------------------------------------\n");
 
-    PacketCommandOLD c = {CMD_MIFARE_SNIFFER, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_MIFARE_SNIFFER, 0, 0, 0, NULL, 0);
 
     PacketResponseNG resp;
 
@@ -2422,8 +2406,7 @@ int CmdHF14AMfDbg(const char *Cmd) {
     uint8_t dbgMode = param_get8ex(Cmd, 0, 0, 10);
     if (dbgMode > 4) return usage_hf14_dbg();
 
-    PacketCommandOLD c = {CMD_MIFARE_SET_DBGMODE, {dbgMode, 0, 0}, {{0}}};
-    SendCommand(&c);
+    SendCommandOLD(CMD_MIFARE_SET_DBGMODE, dbgMode, 0, 0, NULL, 0);
     return 0;
 }
 
@@ -2508,9 +2491,8 @@ static int CmdHF14AMfEClear(const char *Cmd) {
     char c = tolower(param_getchar(Cmd, 0));
     if (c == 'h') return usage_hf14_eclr();
 
-    PacketCommandOLD cmd = {CMD_MIFARE_EML_MEMCLR, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&cmd);
+    SendCommandOLD(CMD_MIFARE_EML_MEMCLR, 0, 0, 0, NULL, 0);
     return 0;
 }
 
@@ -2693,9 +2675,8 @@ static int CmdHF14AMfECFill(const char *Cmd) {
     numSectors = NumOfSectors(c);
 
     PrintAndLogEx(NORMAL, "--params: numSectors: %d, keyType: %c\n", numSectors, (keyType == 0) ? 'A' : 'B');
-    PacketCommandOLD cmd = {CMD_MIFARE_EML_CARDLOAD, {numSectors, keyType, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&cmd);
+    SendCommandOLD(CMD_MIFARE_EML_CARDLOAD, numSectors, keyType, 0, NULL, 0);
     return 0;
 }
 
@@ -3155,10 +3136,8 @@ static int CmdHf14AMfSetMod(const char *Cmd) {
         return 1;
     }
 
-    PacketCommandOLD c = {CMD_MIFARE_SETMOD, {mod, 0, 0}, {{0}}};
-    memcpy(c.d.asBytes, key, 6);
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_MIFARE_SETMOD, mod, 0, 0, key, 6);
 
     PacketResponseNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
@@ -3256,9 +3235,8 @@ static int CmdHF14AMfice(const char *Cmd) {
         flags = 0;
         flags |= initialize ? 0x0001 : 0;
         flags |= slow ? 0x0002 : 0;
-        PacketCommandOLD c = {CMD_MIFARE_ACQUIRE_NONCES, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, flags}, {{0}}};
         clearCommandBuffer();
-        SendCommand(&c);
+        SendCommandOLD(CMD_MIFARE_ACQUIRE_NONCES, blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, flags, NULL, 0);
 
         if (!WaitForResponseTimeout(CMD_ACK, &resp, 3000)) goto out;
         if (resp.oldarg[0])  goto out;
@@ -3289,9 +3267,8 @@ out:
         fclose(fnonces);
     }
 
-    PacketCommandOLD c = {CMD_MIFARE_ACQUIRE_NONCES, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, 4}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_MIFARE_ACQUIRE_NONCES, blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, 4, NULL, 0);
     return 0;
 }
 
diff --git a/client/cmdhfmfdes.c b/client/cmdhfmfdes.c
index fc903361e..4ca2589f9 100644
--- a/client/cmdhfmfdes.c
+++ b/client/cmdhfmfdes.c
@@ -9,9 +9,6 @@
 //-----------------------------------------------------------------------------
 #include "cmdhfmfdes.h"
 
-uint8_t CMDPOS = 0;
-uint8_t LENPOS = 1;
-
 uint8_t key_zero_data[16] = { 0x00 };
 uint8_t key_ones_data[16] = { 0x01 };
 uint8_t key_defa_data[16] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f };
@@ -51,10 +48,10 @@ static int CmdHF14ADesWb(const char *Cmd) {
         PrintAndLogEx(NORMAL, "--block no:%02x key type:%02x key:%s", blockNo, keyType, sprint_hex(key, 6));
         PrintAndLogEx(NORMAL, "--data: %s", sprint_hex(bldata, 16));
 
-      PacketCommandOLD c = {CMD_MIFARE_WRITEBL, {blockNo, keyType, 0}, {{0}}};
-        memcpy(c.d.asBytes, key, 6);
-        memcpy(c.d.asBytes + 10, bldata, 16);
-      SendCommand(&c);
+        uint8_t data[26];
+        memcpy(data, key, 6);
+        memcpy(data + 10, bldata, 16);
+        SendCommandOLD(CMD_MIFARE_WRITEBL, blockNo, keyType, 0, data, sizeof(data));
 
         PacketResponseNG resp;
         if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
@@ -93,9 +90,7 @@ static int CmdHF14ADesRb(const char *Cmd) {
     }
     PrintAndLogEx(NORMAL, "--block no:%02x key type:%02x key:%s ", blockNo, keyType, sprint_hex(key, 6));
 
-    PacketCommandOLD c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}, {{0}}};
-    memcpy(c.d.asBytes, key, 6);
-    SendCommand(&c);
+    SendCommandOLD(CMD_MIFARE_READBL, blockNo, keyType, 0, key, 6);
 
     PacketResponseNG resp;
     if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
@@ -116,8 +111,7 @@ static int CmdHF14ADesRb(const char *Cmd) {
 static int CmdHF14ADesInfo(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
 
-    PacketCommandOLD c = {CMD_MIFARE_DESFIRE_INFO, {0, 0, 0}, {{0}}};
-    SendCommand(&c);
+    SendCommandOLD(CMD_MIFARE_DESFIRE_INFO, 0, 0, 0, NULL, 0);
     PacketResponseNG resp;
 
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
@@ -168,11 +162,8 @@ static int CmdHF14ADesInfo(const char *Cmd) {
     getKeySettings(NULL);
 
     // Free memory on card
-    c.cmd = CMD_MIFARE_DESFIRE;
-    c.arg[0] = (INIT | DISCONNECT);
-    c.arg[1] = 0x01;
-    c.d.asBytes[0] = GET_FREE_MEMORY;
-    SendCommand(&c);
+    uint8_t data[1] = {GET_FREE_MEMORY};
+    SendCommandOLD(CMD_MIFARE_DESFIRE, (INIT | DISCONNECT), 0x01, 0, data, sizeof(data));
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500))
         return 0;
 
@@ -255,8 +246,6 @@ void getKeySettings(uint8_t *aid) {
     char messStr[512] = {0x00};
     const char *str = messStr;
     uint8_t isOK = 0;
-    uint32_t options;
-    PacketCommandOLD c = {CMD_MIFARE_DESFIRE, {0, 0, 0}, {{0}}};
     PacketResponseNG resp;
 
     //memset(messStr, 0x00, 512);
@@ -264,10 +253,10 @@ void getKeySettings(uint8_t *aid) {
     if (aid == NULL) {
         PrintAndLogEx(NORMAL, " CMK - PICC, Card Master Key settings ");
         PrintAndLogEx(NORMAL, "");
-        c.arg[CMDPOS] = (INIT | DISCONNECT);
-        c.arg[LENPOS] =  0x01;
-        c.d.asBytes[0] = GET_KEY_SETTINGS;  // 0x45
-        SendCommand(&c);
+        {
+            uint8_t data[1] = {GET_KEY_SETTINGS};  // 0x45
+            SendCommandOLD(CMD_MIFARE_DESFIRE, INIT | DISCONNECT, sizeof(data), 0, data, sizeof(data));
+        }
         if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {return;}
         isOK  = resp.oldarg[0] & 0xff;
         if (!isOK) {
@@ -283,11 +272,10 @@ void getKeySettings(uint8_t *aid) {
         PrintAndLogEx(NORMAL, "   [0x02] Directory list access with CMK : %s", str);
         str = (resp.data.asBytes[3] & (1 << 0)) ? "YES" : "NO";
         PrintAndLogEx(NORMAL, "   [0x01] CMK is changeable              : %s", str);
-
-        c.arg[LENPOS] = 0x02; //LEN
-        c.d.asBytes[0] = GET_KEY_VERSION; //0x64
-        c.d.asBytes[1] = 0x00;
-        SendCommand(&c);
+        {
+            uint8_t data[2] = {GET_KEY_VERSION, 0};  // 0x64
+            SendCommandOLD(CMD_MIFARE_DESFIRE, INIT | DISCONNECT, sizeof(data), 0, data, sizeof(data));
+        }
         if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000)) { return; }
         isOK  = resp.oldarg[0] & 0xff;
         if (!isOK) {
@@ -299,22 +287,26 @@ void getKeySettings(uint8_t *aid) {
         PrintAndLogEx(NORMAL, "   Master key Version       : %d (0x%02x)", resp.data.asBytes[3], resp.data.asBytes[3]);
         PrintAndLogEx(NORMAL, "   ----------------------------------------------------------");
 
-        c.arg[LENPOS] = 0x02; //LEN
-        c.d.asBytes[0] = AUTHENTICATE; //0x0A
-        c.d.asBytes[1] = 0x00; // KEY 0
-        SendCommand(&c);
+        {
+            uint8_t data[2] = {AUTHENTICATE, 0};  // 0x0A, KEY 0
+            SendCommandOLD(CMD_MIFARE_DESFIRE, INIT | DISCONNECT, sizeof(data), 0, data, sizeof(data));
+        }
         if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {return;}
         isOK  = resp.data.asBytes[2] & 0xff;
         PrintAndLogEx(NORMAL, "   [0x0A] Authenticate      : %s", (isOK == 0xAE) ? "NO" : "YES");
 
-        c.d.asBytes[0] = AUTHENTICATE_ISO; //0x1A
-        SendCommand(&c);
+        {
+            uint8_t data[2] = {AUTHENTICATE_ISO, 0};  // 0x1A, KEY 0
+            SendCommandOLD(CMD_MIFARE_DESFIRE, INIT | DISCONNECT, sizeof(data), 0, data, sizeof(data));
+        }
         if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {return;}
         isOK  = resp.data.asBytes[2] & 0xff;
         PrintAndLogEx(NORMAL, "   [0x1A] Authenticate ISO  : %s", (isOK == 0xAE) ? "NO" : "YES");
 
-        c.d.asBytes[0] = AUTHENTICATE_AES; //0xAA
-        SendCommand(&c);
+        {
+            uint8_t data[2] = {AUTHENTICATE_AES, 0};  // 0xAA, KEY 0
+            SendCommandOLD(CMD_MIFARE_DESFIRE, INIT | DISCONNECT, sizeof(data), 0, data, sizeof(data));
+        }
         if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {return;}
         isOK  = resp.data.asBytes[2] & 0xff;
         PrintAndLogEx(NORMAL, "   [0xAA] Authenticate AES  : %s", (isOK == 0xAE) ? "NO" : "YES");
@@ -325,12 +317,11 @@ void getKeySettings(uint8_t *aid) {
         PrintAndLogEx(NORMAL, " AMK - Application Master Key settings");
 
         // SELECT AID
-        c.arg[0] = (INIT | CLEARTRACE);
-        c.arg[LENPOS] = 0x04;
-        c.d.asBytes[0] = SELECT_APPLICATION;  // 0x5a
-        memcpy(c.d.asBytes + 1, aid, 3);
-        SendCommand(&c);
-
+        {
+            uint8_t data[4] = {SELECT_APPLICATION};  // 0x5a
+            memcpy(data + 1, aid, 3);
+            SendCommandOLD(CMD_MIFARE_DESFIRE, INIT | CLEARTRACE, sizeof(data), 0, data, sizeof(data));
+        }
         if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
             PrintAndLogEx(WARNING, "   Timed-out");
             return;
@@ -342,11 +333,10 @@ void getKeySettings(uint8_t *aid) {
         }
 
         // KEY SETTINGS
-        options = NONE;
-        c.arg[0] = options;
-        c.arg[LENPOS] = 0x01;
-        c.d.asBytes[0] = GET_KEY_SETTINGS; // 0x45
-        SendCommand(&c);
+        {
+            uint8_t data[1] = {GET_KEY_SETTINGS};  // 0x45
+            SendCommandOLD(CMD_MIFARE_DESFIRE, NONE, sizeof(data), 0, data, sizeof(data));
+        }
         if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
             return;
         }
@@ -385,11 +375,10 @@ void getKeySettings(uint8_t *aid) {
         }
 
         // KEY VERSION  - AMK
-        c.arg[0] = NONE;
-        c.arg[LENPOS] = 0x02;
-        c.d.asBytes[0] = GET_KEY_VERSION; //0x64
-        c.d.asBytes[1] = 0x00;
-        SendCommand(&c);
+        {
+            uint8_t data[2] = {GET_KEY_VERSION, 0};  // 0x64
+            SendCommandOLD(CMD_MIFARE_DESFIRE, NONE, sizeof(data), 0, data, sizeof(data));
+        }
         if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
             PrintAndLogEx(WARNING, "   Timed-out");
             return;
@@ -425,12 +414,10 @@ static int CmdHF14ADesEnumApplications(const char *Cmd) {
 
     uint8_t isOK = 0x00;
     uint8_t aid[3];
-    uint32_t options = (INIT | DISCONNECT);
-
-    PacketCommandOLD c = {CMD_MIFARE_DESFIRE, {options, 0x01 }, {{0}}};
-    c.d.asBytes[0] = GET_APPLICATION_IDS;  //0x6a
-
-    SendCommand(&c);
+    {
+        uint8_t data[1] = {GET_APPLICATION_IDS}; //0x6a
+        SendCommandOLD(CMD_MIFARE_DESFIRE, INIT | DISCONNECT, sizeof(data), 0, data, sizeof(data));
+    }
     PacketResponseNG resp;
 
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
@@ -461,13 +448,11 @@ static int CmdHF14ADesEnumApplications(const char *Cmd) {
         getKeySettings(aid);
 
         // Select Application
-        c.arg[CMDPOS] = INIT;
-        c.arg[LENPOS] = 0x04;
-        c.d.asBytes[0] = SELECT_APPLICATION;  // 0x5a
-        c.d.asBytes[1] = resp.data.asBytes[i];
-        c.d.asBytes[2] = resp.data.asBytes[i + 1];
-        c.d.asBytes[3] = resp.data.asBytes[i + 2];
-        SendCommand(&c);
+        {
+            uint8_t data[4] = {SELECT_APPLICATION};  // 0x5a
+            memcpy(data + 1, &resp.data.asBytes[i], 3);
+            SendCommandOLD(CMD_MIFARE_DESFIRE, INIT, sizeof(data), 0, data, sizeof(data));
+        }
 
         if (!WaitForResponseTimeout(CMD_ACK, &respAid, 1500)) {
             PrintAndLogEx(WARNING, "   Timed-out");
@@ -480,10 +465,10 @@ static int CmdHF14ADesEnumApplications(const char *Cmd) {
         }
 
         // Get File IDs
-        c.arg[CMDPOS] = NONE;
-        c.arg[LENPOS] = 0x01;
-        c.d.asBytes[0] = GET_FILE_IDS; // 0x6f
-        SendCommand(&c);
+        {
+            uint8_t data[1] = {GET_FILE_IDS};  // 0x6f
+            SendCommandOLD(CMD_MIFARE_DESFIRE, NONE, sizeof(data), 0, data, sizeof(data));
+        }
 
         if (!WaitForResponseTimeout(CMD_ACK, &respFiles, 1500)) {
             PrintAndLogEx(WARNING, "   Timed-out");
@@ -501,10 +486,10 @@ static int CmdHF14ADesEnumApplications(const char *Cmd) {
         }
 
         // Get ISO File IDs
-        c.arg[CMDPOS] = DISCONNECT;
-        c.arg[LENPOS] = 0x01;
-        c.d.asBytes[0] = GET_ISOFILE_IDS; // 0x61
-        SendCommand(&c);
+        {
+            uint8_t data[1] = {GET_ISOFILE_IDS};  // 0x61
+            SendCommandOLD(CMD_MIFARE_DESFIRE, DISCONNECT, sizeof(data), 0, data, sizeof(data));
+        }
 
         if (!WaitForResponseTimeout(CMD_ACK, &respFiles, 1500)) {
             PrintAndLogEx(WARNING, "   Timed-out");
@@ -610,13 +595,11 @@ static int CmdHF14ADesAuth(const char *Cmd) {
         PrintAndLogEx(WARNING, "Key must include %d HEX symbols", keylength);
         return 1;
     }
-    // algo, nyckell�ngd,
-    PacketCommandOLD c = {CMD_MIFARE_DESFIRE_AUTH1, { cmdAuthMode, cmdAuthAlgo, cmdKeyNo }, {{0}}};
-
-    c.d.asBytes[0] = keylength;
-    memcpy(c.d.asBytes + 1, key, keylength);
+    // algo, keylength,
+    uint8_t data[25] = {keylength}; // max length: 1 + 24 (3k3DES)
+    memcpy(data + 1, key, keylength);
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_MIFARE_DESFIRE_AUTH1, cmdAuthMode, cmdAuthAlgo, cmdKeyNo, data, keylength+1);
     PacketResponseNG resp;
 
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 3000)) {
diff --git a/client/cmdhfmfdesfire.c b/client/cmdhfmfdesfire.c
index ac078f2ce..90779722a 100644
--- a/client/cmdhfmfdesfire.c
+++ b/client/cmdhfmfdesfire.c
@@ -58,8 +58,7 @@ static int CmdHF14AMfDESAuth(const char *Cmd) {
     //DES_set_key((DES_cblock *)key2,&ks2);
 
     //Auth1
-    PacketCommandOLD c = {CMD_MIFARE_DES_AUTH1, {blockNo}};
-    SendCommand(&c);
+    SendCommandOLD(CMD_MIFARE_DES_AUTH1, blockNo, 0, 0, NULL, 0);
     PacketResponseNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         uint8_t isOK  = resp.oldarg[0] & 0xff;
@@ -94,11 +93,9 @@ static int CmdHF14AMfDESAuth(const char *Cmd) {
     PrintAndLogEx(NORMAL, "b2:%s", sprint_hex(b2, 8));
 
     //Auth2
-    PacketCommandOLD d = {CMD_MIFARE_DES_AUTH2, {cuid}};
     memcpy(reply, b1, 8);
     memcpy(reply + 8, b2, 8);
-    memcpy(d.d.asBytes, reply, 16);
-    SendCommand(&d);
+    SendCommandOLD(CMD_MIFARE_DES_AUTH2, cuid, 0, 0, reply, sizeof(reply));
 
     PacketResponseNG respb;
     if (WaitForResponseTimeout(CMD_ACK, &respb, 1500)) {
@@ -158,8 +155,7 @@ static int CmdHF14AMfAESAuth(const char *Cmd) {
     AES_set_decrypt_key(key, 128, &key_d);
 
     //Auth1
-    PacketCommandOLD c = {CMD_MIFARE_DES_AUTH1, {blockNo}};
-    SendCommand(&c);
+    SendCommandOLD(CMD_MIFARE_DES_AUTH1, blockNo, 0, 0, NULL, 0);
     PacketResponseNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         uint8_t isOK  = resp.oldarg[0] & 0xff;
@@ -201,11 +197,9 @@ static int CmdHF14AMfAESAuth(const char *Cmd) {
     PrintAndLogEx(NORMAL, "b2:%s", sprint_hex(b2, 16));
 
     //Auth2
-    PacketCommandOLD d = {CMD_MIFARE_DES_AUTH2, {cuid}};
     memcpy(reply, b1, 16);
     memcpy(reply + 16, b2, 16);
-    memcpy(d.d.asBytes, reply, 32);
-    SendCommand(&d);
+    SendCommandOLD(CMD_MIFARE_DES_AUTH2, cuid, 0, 0, reply, sizeof(reply));
 
     PacketResponseNG respb;
     if (WaitForResponseTimeout(CMD_ACK, &respb, 1500)) {
diff --git a/client/cmdhfmfhard.c b/client/cmdhfmfhard.c
index 0c5500fb3..038a2bd4c 100644
--- a/client/cmdhfmfhard.c
+++ b/client/cmdhfmfhard.c
@@ -1383,20 +1383,17 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
         flags |= initialize ? 0x0001 : 0;
         flags |= slow ? 0x0002 : 0;
         flags |= field_off ? 0x0004 : 0;
-        PacketCommandOLD c = {CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, flags}, {{0}}};
-        memcpy(c.d.asBytes, key, 6);
 
         clearCommandBuffer();
-        SendCommand(&c);
+        SendCommandOLD(CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES, blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, flags, key, 6);
 
         if (field_off) break;
 
         if (initialize) {
             if (!WaitForResponseTimeout(CMD_ACK, &resp, 3000)) {
                 //strange second call (iceman)
-                PacketCommandOLD c1 = {CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, 4}, {{0}}};
                 clearCommandBuffer();
-                SendCommand(&c1);
+                SendCommandOLD(CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES, blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, 4, NULL, 0);
                 return 1;
             }
             if (resp.oldarg[0]) return resp.oldarg[0];  // error during nested_hard
@@ -1469,7 +1466,7 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
         }
 
         if (acquisition_completed) {
-            field_off = true; // switch off field with next SendCommand and then finish
+            field_off = true; // switch off field with next SendCommandOLD and then finish
         }
 
         if (!initialize) {
diff --git a/client/cmdhfmfp.c b/client/cmdhfmfp.c
index 4b6d2afb2..6552f8713 100644
--- a/client/cmdhfmfp.c
+++ b/client/cmdhfmfp.c
@@ -42,8 +42,7 @@ static int CmdHFMFPInfo(const char *cmd) {
     infoHF14A(false, false);
 
     // Mifare Plus info
-    PacketCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}, {{0}}};
-    SendCommand(&c);
+    SendCommandOLD(CMD_READER_ISO_14443a, ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0, NULL, 0);
 
     PacketResponseNG resp;
     WaitForResponse(CMD_ACK, &resp);
diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index ca7ae75be..e69f6a996 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -458,16 +458,13 @@ static char *getUlev1CardSizeStr(uint8_t fsize) {
 }
 
 static void ul_switch_on_field(void) {
-    PacketCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT | ISO14A_NO_RATS, 0, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_READER_ISO_14443a, ISO14A_CONNECT | ISO14A_NO_DISCONNECT | ISO14A_NO_RATS, 0, 0, NULL, 0);
 }
 
 static int ul_send_cmd_raw(uint8_t *cmd, uint8_t cmdlen, uint8_t *response, uint16_t responseLength) {
-    PacketCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_NO_DISCONNECT | ISO14A_APPEND_CRC | ISO14A_NO_RATS, cmdlen, 0}, {{0}}};
-    memcpy(c.d.asBytes, cmd, cmdlen);
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_READER_ISO_14443a, ISO14A_RAW | ISO14A_NO_DISCONNECT | ISO14A_APPEND_CRC | ISO14A_NO_RATS, cmdlen, 0, cmd, cmdlen);
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return -1;
     if (!resp.oldarg[0] && responseLength) return -1;
@@ -533,10 +530,8 @@ static int ulc_requestAuthentication(uint8_t *nonce, uint16_t nonceLength) {
 
 static int ulc_authentication(uint8_t *key, bool switch_off_field) {
 
-    PacketCommandOLD c = {CMD_MIFAREUC_AUTH, {switch_off_field}, {{0}}};
-    memcpy(c.d.asBytes, key, 16);
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_MIFAREUC_AUTH, switch_off_field, 0, 0, key, 16);
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return 0;
     if (resp.oldarg[0] == 1) return 1;
@@ -621,12 +616,9 @@ static int ul_fudan_check(void) {
     if (!ul_select(&card))
         return UL_ERROR;
 
-    PacketCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_NO_DISCONNECT | ISO14A_NO_RATS, 4, 0}, {{0}}};
-
     uint8_t cmd[4] = {0x30, 0x00, 0x02, 0xa7}; //wrong crc on purpose  should be 0xa8
-    memcpy(c.d.asBytes, cmd, 4);
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_READER_ISO_14443a,ISO14A_RAW | ISO14A_NO_DISCONNECT | ISO14A_NO_RATS, 4, 0, cmd, sizeof(cmd));
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return UL_ERROR;
     if (resp.oldarg[0] != 1) return UL_ERROR;
@@ -1475,19 +1467,22 @@ static int CmdHF14AMfUWrBl(const char *Cmd) {
         PrintAndLogEx(NORMAL, "Block: %0d (0x%02X) [ %s]", blockNo, blockNo, sprint_hex(blockdata, 4));
 
     //Send write Block
-    PacketCommandOLD c = {CMD_MIFAREU_WRITEBL, {blockNo}, {{0}}};
-    memcpy(c.d.asBytes, blockdata, 4);
-
+    uint8_t cmddata[20];
+    memcpy(cmddata, blockdata, 4);
+    uint8_t datalen = 4;
+    uint8_t keytype = 0;
     if (hasAuthKey) {
-        c.arg[1] = 1;
-        memcpy(c.d.asBytes + 4, authKeyPtr, 16);
+        keytype = 1;
+        memcpy(cmddata + datalen, authKeyPtr, 16);
+        datalen += 16;
     } else if (hasPwdKey) {
-        c.arg[1] = 2;
-        memcpy(c.d.asBytes + 4, authKeyPtr, 4);
+        keytype = 2;
+        memcpy(cmddata + datalen, authKeyPtr, 4);
+        datalen += 4;
     }
 
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_MIFAREU_WRITEBL, blockNo, keytype, 0, cmddata, datalen);
     PacketResponseNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         uint8_t isOK  = resp.oldarg[0] & 0xff;
@@ -1581,17 +1576,18 @@ static int CmdHF14AMfURdBl(const char *Cmd) {
     if (swapEndian && hasPwdKey)  authKeyPtr = SwapEndian64(authenticationkey, 4, 4);
 
     //Read Block
-    PacketCommandOLD c = {CMD_MIFAREU_READBL, {blockNo}, {{0}}};
+    uint8_t keytype = 0;
+    uint8_t datalen = 0;
     if (hasAuthKey) {
-        c.arg[1] = 1;
-        memcpy(c.d.asBytes, authKeyPtr, 16);
+        keytype = 1;
+        datalen = 16;
     } else if (hasPwdKey) {
-        c.arg[1] = 2;
-        memcpy(c.d.asBytes, authKeyPtr, 4);
+        keytype = 2;
+        datalen = 4;
     }
 
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_MIFAREU_READBL, blockNo, keytype, 0, authKeyPtr, datalen);
     PacketResponseNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         uint8_t isOK = resp.oldarg[0] & 0xff;
@@ -1846,18 +1842,17 @@ static int CmdHF14AMfUDump(const char *Cmd) {
     }
     ul_print_type(tagtype, 0);
     PrintAndLogEx(SUCCESS, "Reading tag memory...");
-    PacketCommandOLD c = {CMD_MIFAREU_READCARD, {startPage, pages}, {{0}}};
+    uint8_t keytype = 0;
     if (hasAuthKey) {
         if (tagtype & UL_C)
-            c.arg[2] = 1; //UL_C auth
+            keytype = 1; //UL_C auth
         else
-            c.arg[2] = 2; //UL_EV1/NTAG auth
-
-        memcpy(c.d.asBytes, authKeyPtr, dataLen);
+            keytype = 2; //UL_EV1/NTAG auth
     }
 
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_MIFAREU_READCARD, startPage, pages, keytype, authKeyPtr, dataLen);
+
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         PrintAndLogEx(WARNING, "Command execute time-out");
@@ -2010,7 +2005,6 @@ static int CmdHF14AMfURestore(const char *Cmd) {
     bool read_key = false;
     size_t filelen = 0;
     FILE *f;
-    PacketCommandOLD c = {CMD_MIFAREU_WRITEBL, {0, 0, 0}, {{0}}};
 
     memset(authkey, 0x00, sizeof(authkey));
 
@@ -2114,10 +2108,12 @@ static int CmdHF14AMfURestore(const char *Cmd) {
             p_authkey = SwapEndian64(authkey, keylen, 4);
     }
 
+    uint8_t data[20] = {0};
+    uint8_t keytype = 0;
     // set key - only once
     if (hasKey) {
-        c.arg[1] = (keylen == 16) ? 1 : 2;
-        memcpy(c.d.asBytes + 4, p_authkey, keylen);
+        keytype = (keylen == 16) ? 1 : 2;
+        memcpy(data + 4, p_authkey, keylen);
     }
 
     // write version, signature, pack
@@ -2130,54 +2126,51 @@ static int CmdHF14AMfURestore(const char *Cmd) {
 #define MFU_NTAG_SPECIAL_SIGNATURE  0xF2
         // pwd
         if (hasKey || read_key) {
-            c.arg[0] = MFU_NTAG_SPECIAL_PWD;
 
             if (read_key) {
                 // try reading key from dump and use.
-                memcpy(c.d.asBytes, mem->data + (bytes_read - 48 - 8), 4);
+                memcpy(data, mem->data + (bytes_read - 48 - 8), 4);
             } else {
-                memcpy(c.d.asBytes,  p_authkey, 4);
+                memcpy(data,  p_authkey, 4);
             }
 
-            PrintAndLogEx(NORMAL, "special PWD     block written 0x%X - %s\n", MFU_NTAG_SPECIAL_PWD, sprint_hex(c.d.asBytes, 4));
+            PrintAndLogEx(NORMAL, "special PWD     block written 0x%X - %s\n", MFU_NTAG_SPECIAL_PWD, sprint_hex(data, 4));
             clearCommandBuffer();
-            SendCommand(&c);
+            SendCommandOLD(CMD_MIFAREU_WRITEBL, MFU_NTAG_SPECIAL_PWD, keytype, 0, data, sizeof(data));
+
             wait4response(MFU_NTAG_SPECIAL_PWD);
 
             // copy the new key
-            c.arg[1] = 2;
-            memcpy(authkey, c.d.asBytes, 4);
-            memcpy(c.d.asBytes + 4, authkey, 4);
+            keytype = 2;
+            memcpy(authkey, data, 4);
+            memcpy(data + 4, authkey, 4);
         }
 
         // pack
-        c.arg[0] = MFU_NTAG_SPECIAL_PACK;
-        c.d.asBytes[0] = mem->pack[0];
-        c.d.asBytes[1] = mem->pack[1];
-        c.d.asBytes[2] = 0;
-        c.d.asBytes[3] = 0;
-        PrintAndLogEx(NORMAL, "special PACK    block written 0x%X - %s\n", MFU_NTAG_SPECIAL_PACK, sprint_hex(c.d.asBytes, 4));
+        data[0] = mem->pack[0];
+        data[1] = mem->pack[1];
+        data[2] = 0;
+        data[3] = 0;
+        PrintAndLogEx(NORMAL, "special PACK    block written 0x%X - %s\n", MFU_NTAG_SPECIAL_PACK, sprint_hex(data, 4));
         clearCommandBuffer();
-        SendCommand(&c);
+        SendCommandOLD(CMD_MIFAREU_WRITEBL, MFU_NTAG_SPECIAL_PACK, keytype, 0, data, sizeof(data));
         wait4response(MFU_NTAG_SPECIAL_PACK);
 
         // Signature
         for (uint8_t s = MFU_NTAG_SPECIAL_SIGNATURE, i = 0; s < MFU_NTAG_SPECIAL_SIGNATURE + 8; s++, i += 4) {
-            c.arg[0] = s;
-            memcpy(c.d.asBytes, mem->signature + i, 4);
-            PrintAndLogEx(NORMAL, "special SIG     block written 0x%X - %s\n", s, sprint_hex(c.d.asBytes, 4));
+            memcpy(data, mem->signature + i, 4);
+            PrintAndLogEx(NORMAL, "special SIG     block written 0x%X - %s\n", s, sprint_hex(data, 4));
             clearCommandBuffer();
-            SendCommand(&c);
+            SendCommandOLD(CMD_MIFAREU_WRITEBL, s, keytype, 0, data, sizeof(data));
             wait4response(s);
         }
 
         // Version
         for (uint8_t s = MFU_NTAG_SPECIAL_VERSION, i = 0; s < MFU_NTAG_SPECIAL_VERSION + 2; s++, i += 4) {
-            c.arg[0] = s;
-            memcpy(c.d.asBytes, mem->version + i, 4);
-            PrintAndLogEx(NORMAL, "special VERSION block written 0x%X - %s\n", s, sprint_hex(c.d.asBytes, 4));
+            memcpy(data, mem->version + i, 4);
+            PrintAndLogEx(NORMAL, "special VERSION block written 0x%X - %s\n", s, sprint_hex(data, 4));
             clearCommandBuffer();
-            SendCommand(&c);
+            SendCommandOLD(CMD_MIFAREU_WRITEBL, s, keytype, 0, data, sizeof(data));
             wait4response(s);
         }
     }
@@ -2189,10 +2182,9 @@ static int CmdHF14AMfURestore(const char *Cmd) {
     for (uint8_t b = 4; b < pages - 5; b++) {
 
         //Send write Block
-        c.arg[0] = b;
-        memcpy(c.d.asBytes, mem->data + (b * 4), 4);
+        memcpy(data, mem->data + (b * 4), 4);
         clearCommandBuffer();
-        SendCommand(&c);
+        SendCommandOLD(CMD_MIFAREU_WRITEBL, b, keytype, 0, data, sizeof(data));
         wait4response(b);
         printf(".");
         fflush(stdout);
@@ -2204,18 +2196,17 @@ static int CmdHF14AMfURestore(const char *Cmd) {
 
         PrintAndLogEx(INFO, "Restoring configuration blocks.\n");
 
-        PrintAndLogEx(NORMAL, "authentication with keytype[%x]  %s\n", (uint8_t)(c.arg[1] & 0xff), sprint_hex(p_authkey, 4));
+        PrintAndLogEx(NORMAL, "authentication with keytype[%x]  %s\n", (uint8_t)(keytype & 0xff), sprint_hex(p_authkey, 4));
 
         // otp, uid, lock, cfg1, cfg0, dynlockbits
         uint8_t blocks[] = {3, 0, 1, 2, pages - 5, pages - 4, pages - 3};
         for (uint8_t i = 0; i < sizeof(blocks); i++) {
             uint8_t b = blocks[i];
-            c.arg[0] = b;
-            memcpy(c.d.asBytes, mem->data + (b * 4), 4);
+            memcpy(data, mem->data + (b * 4), 4);
             clearCommandBuffer();
-            SendCommand(&c);
+            SendCommandOLD(CMD_MIFAREU_WRITEBL, b, keytype, 0, data, sizeof(data));
             wait4response(b);
-            PrintAndLogEx(NORMAL, "special block written %u - %s\n", b, sprint_hex(c.d.asBytes, 4));
+            PrintAndLogEx(NORMAL, "special block written %u - %s\n", b, sprint_hex(data, 4));
         }
     }
 
@@ -2387,10 +2378,8 @@ static int CmdHF14AMfUCSetPwd(const char *Cmd) {
         return 1;
     }
 
-    PacketCommandOLD c = {CMD_MIFAREUC_SETPWD, {0, 0, 0}, {{0}}};
-    memcpy(c.d.asBytes, pwd, 16);
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_MIFAREUC_SETPWD, 0, 0, 0, pwd, 16);
 
     PacketResponseNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
@@ -2412,7 +2401,6 @@ static int CmdHF14AMfUCSetPwd(const char *Cmd) {
 //
 static int CmdHF14AMfUCSetUid(const char *Cmd) {
 
-    PacketCommandOLD c = {CMD_MIFAREU_READBL, {0, 0, 0}, {{0}}};
     PacketResponseNG resp;
     uint8_t uid[7] = {0x00};
     char cmdp = tolower(param_getchar(Cmd, 0));
@@ -2425,9 +2413,8 @@ static int CmdHF14AMfUCSetUid(const char *Cmd) {
     }
 
     // read block2.
-    c.arg[0] = 2;
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_MIFAREU_READBL, 2, 0, 0, NULL, 0);
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         PrintAndLogEx(WARNING, "Command execute timeout");
         return 2;
@@ -2438,40 +2425,37 @@ static int CmdHF14AMfUCSetUid(const char *Cmd) {
     memcpy(resp.data.asBytes, oldblock2, 4);
 
     // block 0.
-    c.cmd = CMD_MIFAREU_WRITEBL;
-    c.arg[0] = 0;
-    c.d.asBytes[0] = uid[0];
-    c.d.asBytes[1] = uid[1];
-    c.d.asBytes[2] = uid[2];
-    c.d.asBytes[3] =  0x88 ^ uid[0] ^ uid[1] ^ uid[2];
+    uint8_t data[4];
+    data[0] = uid[0];
+    data[1] = uid[1];
+    data[2] = uid[2];
+    data[3] =  0x88 ^ uid[0] ^ uid[1] ^ uid[2];
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_MIFAREU_WRITEBL, 0, 0, 0, data, sizeof(data));
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         PrintAndLogEx(WARNING, "Command execute timeout");
         return 3;
     }
 
     // block 1.
-    c.arg[0] = 1;
-    c.d.asBytes[0] = uid[3];
-    c.d.asBytes[1] = uid[4];
-    c.d.asBytes[2] = uid[5];
-    c.d.asBytes[3] = uid[6];
+    data[0] = uid[3];
+    data[1] = uid[4];
+    data[2] = uid[5];
+    data[3] = uid[6];
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_MIFAREU_WRITEBL, 1, 0, 0, data, sizeof(data));
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         PrintAndLogEx(WARNING, "Command execute timeout");
         return 4;
     }
 
     // block 2.
-    c.arg[0] = 2;
-    c.d.asBytes[0] = uid[3] ^ uid[4] ^ uid[5] ^ uid[6];
-    c.d.asBytes[1] = oldblock2[1];
-    c.d.asBytes[2] = oldblock2[2];
-    c.d.asBytes[3] = oldblock2[3];
+    data[0] = uid[3] ^ uid[4] ^ uid[5] ^ uid[6];
+    data[1] = oldblock2[1];
+    data[2] = oldblock2[2];
+    data[3] = oldblock2[3];
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_MIFAREU_WRITEBL, 2, 0, 0, data, sizeof(data));
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         PrintAndLogEx(WARNING, "Command execute timeout");
         return 5;
@@ -2487,9 +2471,8 @@ static int CmdHF14AMfUGenDiverseKeys(const char *Cmd) {
 
     if (cmdp == 'r') {
         // read uid from tag
-        PacketCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0}, {{0}}};
         clearCommandBuffer();
-        SendCommand(&c);
+        SendCommandOLD(CMD_READER_ISO_14443a, ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0, NULL, 0);
         PacketResponseNG resp;
         WaitForResponse(CMD_ACK, &resp);
         iso14a_card_select_t card;
@@ -2602,9 +2585,8 @@ static int CmdHF14AMfUPwdGen(const char *Cmd) {
 
     if (cmdp == 'r') {
         // read uid from tag
-        PacketCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0}, {{0}}};
         clearCommandBuffer();
-        SendCommand(&c);
+        SendCommandOLD(CMD_READER_ISO_14443a, ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0, NULL, 0);
         PacketResponseNG resp;
         WaitForResponse(CMD_ACK, &resp);
         iso14a_card_select_t card;
diff --git a/client/cmdhftopaz.c b/client/cmdhftopaz.c
index 3cf443c76..a87566d23 100644
--- a/client/cmdhftopaz.c
+++ b/client/cmdhftopaz.c
@@ -31,20 +31,16 @@ static struct {
 } topaz_tag;
 
 static void topaz_switch_on_field(void) {
-    PacketCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_SELECT | ISO14A_NO_DISCONNECT | ISO14A_TOPAZMODE | ISO14A_NO_RATS, 0, 0}, {{0}}};
-    SendCommand(&c);
+    SendCommandOLD(CMD_READER_ISO_14443a, ISO14A_CONNECT | ISO14A_NO_SELECT | ISO14A_NO_DISCONNECT | ISO14A_TOPAZMODE | ISO14A_NO_RATS, 0, 0, NULL, 0);
 }
 
 static void topaz_switch_off_field(void) {
-    PacketCommandOLD c = {CMD_READER_ISO_14443a, {0, 0, 0}, {{0}}};
-    SendCommand(&c);
+    SendCommandOLD(CMD_READER_ISO_14443a, 0, 0, 0, NULL, 0);
 }
 
 // send a raw topaz command, returns the length of the response (0 in case of error)
 static int topaz_send_cmd_raw(uint8_t *cmd, uint8_t len, uint8_t *response) {
-    PacketCommandOLD c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_NO_DISCONNECT | ISO14A_TOPAZMODE | ISO14A_NO_RATS, len, 0}, {{0}}};
-    memcpy(c.d.asBytes, cmd, len);
-    SendCommand(&c);
+    SendCommandOLD(CMD_READER_ISO_14443a, ISO14A_RAW | ISO14A_NO_DISCONNECT | ISO14A_TOPAZMODE | ISO14A_NO_RATS, len, 0, cmd, len);
 
     PacketResponseNG resp;
     WaitForResponse(CMD_ACK, &resp);
diff --git a/client/cmdlf.c b/client/cmdlf.c
index 4a78f6e92..eb82e6bfe 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -144,28 +144,33 @@ static int usage_lf_find(void) {
 /* send a LF command before reading */
 int CmdLFCommandRead(const char *Cmd) {
 
-    PacketCommandOLD c = {CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K, {0, 0, 0}, {{0}}};
     bool errors = false;
 
+    uint32_t arg0 = 0;
+    uint32_t arg1 = 0;
+    uint32_t arg2 = 0;
+    uint8_t data[USB_CMD_DATA_SIZE];
+    uint16_t datalen = 0;
+    
     uint8_t cmdp = 0;
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
             case 'h':
                 return usage_lf_cmdread();
             case 'c':
-                param_getstr(Cmd, cmdp + 1, (char *)&c.d.asBytes, sizeof(c.d.asBytes));
+                datalen = param_getstr(Cmd, cmdp + 1, (char *)&data, sizeof(data));
                 cmdp += 2;
                 break;
             case 'd':
-                c.arg[0] = param_get32ex(Cmd, cmdp + 1, 0, 10);
+                arg0 = param_get32ex(Cmd, cmdp + 1, 0, 10);
                 cmdp += 2;
                 break;
             case 'z':
-                c.arg[1] = param_get32ex(Cmd, cmdp + 1, 0, 10) & 0xFFFF;
+                arg1 = param_get32ex(Cmd, cmdp + 1, 0, 10) & 0xFFFF;
                 cmdp += 2;
                 break;
             case 'o':
-                c.arg[2] = param_get32ex(Cmd, cmdp + 1, 0, 10) & 0xFFFF;
+                arg2 = param_get32ex(Cmd, cmdp + 1, 0, 10) & 0xFFFF;
                 cmdp += 2;
                 break;
             default:
@@ -179,7 +184,7 @@ int CmdLFCommandRead(const char *Cmd) {
     if (errors || cmdp == 0)  return usage_lf_cmdread();
 
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K, arg0, arg1, arg2, data, datalen);
 
     WaitForResponse(CMD_ACK, NULL);
     getSamples(0, true);
@@ -322,18 +327,15 @@ int CmdLFSetConfig(const char *Cmd) {
 
     sample_config config = { decimation, bps, averaging, divisor, trigger_threshold };
 
-    PacketCommandOLD c = {CMD_SET_LF_SAMPLING_CONFIG, {0, 0, 0}, {{0}}};
-    memcpy(c.d.asBytes, &config, sizeof(sample_config));
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_SET_LF_SAMPLING_CONFIG, 0, 0, 0, &config, sizeof(sample_config));
     return 0;
 }
 
 bool lf_read(bool silent, uint32_t samples) {
     if (IsOffline()) return false;
-    PacketCommandOLD c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_125K, {silent, samples, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_ACQUIRE_RAW_ADC_SAMPLES_125K, silent, samples, 0, NULL, 0);
 
     PacketResponseNG resp;
     if (g_lf_threshold_set) {
@@ -387,9 +389,8 @@ int CmdLFSniff(const char *Cmd) {
     uint8_t cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_lf_sniff();
 
-    PacketCommandOLD c = {CMD_LF_SNIFF_RAW_ADC_SAMPLES, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_LF_SNIFF_RAW_ADC_SAMPLES, 0, 0, 0, NULL, 0);
     WaitForResponse(CMD_ACK, NULL);
     getSamples(0, false);
     return 0;
@@ -420,13 +421,8 @@ int CmdLFSim(const char *Cmd) {
 
     //can send only 512 bits at a time (1 byte sent per bit...)
     for (uint16_t i = 0; i < GraphTraceLen; i += USB_CMD_DATA_SIZE) {
-        PacketCommandOLD c = {CMD_UPLOAD_SIM_SAMPLES_125K, {i, FPGA_LF, 0}, {{0}}};
-
-        for (uint16_t j = 0; j < USB_CMD_DATA_SIZE; j++)
-            c.d.asBytes[j] = GraphBuffer[i + j];
-
         clearCommandBuffer();
-        SendCommand(&c);
+        SendCommandOLD(CMD_UPLOAD_SIM_SAMPLES_125K, i, FPGA_LF, 0, &GraphBuffer[i], USB_CMD_DATA_SIZE);
         WaitForResponse(CMD_ACK, NULL);
         printf(".");
         fflush(stdout);
@@ -434,9 +430,8 @@ int CmdLFSim(const char *Cmd) {
 
     PrintAndLogEx(NORMAL, "Simulating");
 
-    PacketCommandOLD c = {CMD_SIMULATE_TAG_125K, {GraphTraceLen, gap, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_SIMULATE_TAG_125K, GraphTraceLen, gap, 0, NULL, 0);
     return 0;
 }
 
@@ -515,19 +510,13 @@ int CmdLFfskSim(const char *Cmd) {
     if (fcHigh == 0) fcHigh = 10;
     if (fcLow == 0) fcLow = 8;
 
-    uint16_t arg1, arg2;
-    arg1 = fcHigh << 8 | fcLow;
-    arg2 = (separator << 8) | clk;
     size_t size = DemodBufferLen;
     if (size > USB_CMD_DATA_SIZE) {
         PrintAndLogEx(NORMAL, "DemodBuffer too long for current implementation - length: %d - max: %d", size, USB_CMD_DATA_SIZE);
         size = USB_CMD_DATA_SIZE;
     }
-    PacketCommandOLD c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}, {{0}}};
-
-    memcpy(c.d.asBytes, DemodBuffer, size);
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_FSK_SIM_TAG, fcHigh << 8 | fcLow, (separator << 8) | clk, size, DemodBuffer, size);
 
     setClockGrid(clk, 0);
     return 0;
@@ -607,22 +596,14 @@ int CmdLFaskSim(const char *Cmd) {
     if (encoding == 0) clk /= 2; //askraw needs to double the clock speed
 
     size_t size = DemodBufferLen;
-
     if (size > USB_CMD_DATA_SIZE) {
         PrintAndLogEx(NORMAL, "DemodBuffer too long for current implementation - length: %d - max: %d", size, USB_CMD_DATA_SIZE);
         size = USB_CMD_DATA_SIZE;
     }
 
     PrintAndLogEx(NORMAL, "preparing to sim ask data: %d bits", size);
-
-    uint16_t arg1, arg2;
-    arg1 = clk << 8 | encoding;
-    arg2 = invert << 8 | separator;
-
-    PacketCommandOLD c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
-    memcpy(c.d.asBytes, DemodBuffer, size);
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_ASK_SIM_TAG, clk << 8 | encoding, invert << 8 | separator, size, DemodBuffer, size);
     return 0;
 }
 
@@ -718,19 +699,14 @@ int CmdLFpskSim(const char *Cmd) {
             PrintAndLogEx(NORMAL, "Sorry, PSK3 not yet available");
         }
     }
-    uint16_t arg1, arg2;
-    arg1 = clk << 8 | carrier;
-    arg2 = invert;
     size_t size = DemodBufferLen;
     if (size > USB_CMD_DATA_SIZE) {
         PrintAndLogEx(NORMAL, "DemodBuffer too long for current implementation - length: %d - max: %d", size, USB_CMD_DATA_SIZE);
         size = USB_CMD_DATA_SIZE;
     }
-    PacketCommandOLD c = {CMD_PSK_SIM_TAG, {arg1, arg2, size}, {{0}}};
     PrintAndLogEx(DEBUG, "DEBUG: Sending DemodBuffer Length: %d", size);
-    memcpy(c.d.asBytes, DemodBuffer, size);
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_PSK_SIM_TAG, clk << 8 | carrier, invert, size, DemodBuffer, size);
     return 0;
 }
 
@@ -739,8 +715,7 @@ int CmdLFSimBidir(const char *Cmd) {
     // Set ADC to twice the carrier for a slight supersampling
     // HACK: not implemented in ARMSRC.
     PrintAndLogEx(INFO, "Not implemented yet.");
-    PacketCommandOLD c = {CMD_LF_SIMULATE_BIDIR, {47, 384, 0}, {{0}}};
-    SendCommand(&c);
+    SendCommandOLD(CMD_LF_SIMULATE_BIDIR, 47, 384, 0, NULL, 0);
     return 0;
 }
 
diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c
index d28d4bc37..a65abc909 100644
--- a/client/cmdlfawid.c
+++ b/client/cmdlfawid.c
@@ -87,10 +87,9 @@ static int usage_lf_awid_brute(void) {
 }
 
 static bool sendPing(void) {
-    PacketCommandOLD ping = {CMD_PING, {1, 2, 3}, {{0}}};
-    SendCommand(&ping);
-    SendCommand(&ping);
-    SendCommand(&ping);
+    SendCommandOLD(CMD_PING, 1, 2, 3, NULL, 0);
+    SendCommandOLD(CMD_PING, 1, 2, 3, NULL, 0);
+    SendCommandOLD(CMD_PING, 1, 2, 3, NULL, 0);
     clearCommandBuffer();
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000))
@@ -109,13 +108,9 @@ static bool sendTry(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint32_t delay, ui
     }
 
     uint8_t clk = 50, high = 10, low = 8, invert = 1;
-    uint64_t arg1 = (high << 8) + low;
-    uint64_t arg2 = (invert << 8) + clk;
 
-    PacketCommandOLD c = {CMD_FSK_SIM_TAG, {arg1, arg2, bs_len}, {{0}}};
-    memcpy(c.d.asBytes, bits, bs_len);
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_FSK_SIM_TAG, (high << 8) + low, (invert << 8) + clk, bs_len, bits, bs_len);
 
     msleep(delay);
     sendPing();
@@ -171,9 +166,8 @@ static int CmdAWIDRead_device(const char *Cmd) {
 
     if (Cmd[0] == 'h' || Cmd[0] == 'H') return usage_lf_awid_read();
     uint8_t findone = (Cmd[0] == '1') ? 1 : 0;
-    PacketCommandOLD c = {CMD_AWID_DEMOD_FSK, {findone, 0, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_AWID_DEMOD_FSK, findone, 0, 0, NULL, 0);
     return 0;
 }
 */
@@ -321,8 +315,7 @@ static int CmdAWIDSim(const char *Cmd) {
     uint32_t fc = 0, cn = 0;
     uint8_t fmtlen = 0;
     uint8_t bits[96];
-    size_t size = sizeof(bits);
-    memset(bits, 0x00, size);
+    memset(bits, 0x00, sizeof(bits));
 
     char cmdp = param_getchar(Cmd, 0);
     if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_awid_sim();
@@ -343,17 +336,13 @@ static int CmdAWIDSim(const char *Cmd) {
     }
 
     uint8_t clk = 50, high = 10, low = 8, invert = 1;
-    uint64_t arg1 = (high << 8) + low;
-    uint64_t arg2 = (invert << 8) + clk;
 
     // AWID uses: FSK2a fcHigh: 10, fcLow: 8, clk: 50, invert: 1
     // arg1 --- fcHigh<<8 + fcLow
     // arg2 --- Inversion and clk setting
     // 96   --- Bitstream length: 96-bits == 12 bytes
-    PacketCommandOLD c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}, {{0}}};
-    memcpy(c.d.asBytes, bits, size);
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_FSK_SIM_TAG, (high << 8) + low, (invert << 8) + clk, sizeof(bits), bits, sizeof(bits));
     return 0;
 }
 
@@ -393,13 +382,10 @@ static int CmdAWIDClone(const char *Cmd) {
     print_blocks(blocks, 4);
 
     PacketResponseNG resp;
-    PacketCommandOLD c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
 
     for (uint8_t i = 0; i < 4; i++) {
-        c.arg[0] = blocks[i];
-        c.arg[1] = i;
         clearCommandBuffer();
-        SendCommand(&c);
+        SendCommandOLD(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, NULL, 0);
         if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
             return -1;
diff --git a/client/cmdlfcotag.c b/client/cmdlfcotag.c
index 98d1cbe1a..79a259b79 100644
--- a/client/cmdlfcotag.c
+++ b/client/cmdlfcotag.c
@@ -74,9 +74,8 @@ static int CmdCOTAGRead(const char *Cmd) {
     uint32_t rawsignal = 1;
     sscanf(Cmd, "%u", &rawsignal);
 
-    PacketCommandOLD c = {CMD_COTAG, {rawsignal, 0, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_COTAG, rawsignal, 0, 0, NULL, 0);
     if (!WaitForResponseTimeout(CMD_ACK, NULL, 7000)) {
         PrintAndLogEx(WARNING, "command execution time out");
         return -1;
diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 266b8d0a2..12c7447a4 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -389,8 +389,7 @@ int AskEm410xDemod(const char *Cmd, uint32_t *hi, uint64_t *lo, bool verbose) {
 static int CmdEM410xRead_device(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     uint8_t findone = (cmdp == '1') ? 1 : 0;
-    PacketCommandOLD c = {CMD_EM410X_DEMOD, {findone, 0, 0}, {{0}}};
-    SendCommand(&c);
+    SendCommandOLD(CMD_EM410X_DEMOD, findone, 0, 0, NULL, 0);
     return 0;
 }
 */
@@ -648,8 +647,7 @@ static int CmdEM410xWrite(const char *Cmd) {
         return 0;
     }
 
-    PacketCommandOLD c = {CMD_EM410X_WRITE_TAG, {card, (uint32_t)(id >> 32), (uint32_t)id}, {{0}}};
-    SendCommand(&c);
+    SendCommandOLD(CMD_EM410X_WRITE_TAG, card, (uint32_t)(id >> 32), (uint32_t)id, NULL, 0);
     return 0;
 }
 
@@ -1127,9 +1125,8 @@ static bool demodEM4x05resp(uint32_t *word) {
 
 //////////////// 4205 / 4305 commands
 static int EM4x05ReadWord_ext(uint8_t addr, uint32_t pwd, bool usePwd, uint32_t *word) {
-    PacketCommandOLD c = {CMD_EM4X_READ_WORD, {addr, pwd, usePwd}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_EM4X_READ_WORD, addr, pwd, usePwd, NULL, 0);
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         PrintAndLogEx(DEBUG, "timeout while waiting for reply.");
@@ -1230,9 +1227,8 @@ static int CmdEM4x05Write(const char *Cmd) {
 
     uint16_t flag = (addr << 8) | (usePwd);
 
-    PacketCommandOLD c = {CMD_EM4X_WRITE_WORD, {flag, data, pwd}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_EM4X_WRITE_WORD, flag, data, pwd, NULL, 0);
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
         PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
diff --git a/client/cmdlffdx.c b/client/cmdlffdx.c
index 060717d50..e2a627aae 100644
--- a/client/cmdlffdx.c
+++ b/client/cmdlffdx.c
@@ -282,13 +282,10 @@ static int CmdFdxClone(const char *Cmd) {
     print_blocks(blocks, 5);
 
     PacketResponseNG resp;
-    PacketCommandOLD c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
 
     for (int i = 4; i >= 0; --i) {
-        c.arg[0] = blocks[i];
-        c.arg[1] = i;
         clearCommandBuffer();
-        SendCommand(&c);
+        SendCommandOLD(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, NULL, 0);
         if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
             return -1;
@@ -311,19 +308,14 @@ static int CmdFdxSim(const char *Cmd) {
 
     // 32, no STT, BIPHASE INVERTED == diphase
     uint8_t clk = 32, encoding = 2, separator = 0, invert = 1;
-    uint16_t arg1, arg2;
-    size_t size = 128;
-    arg1 = clk << 8 | encoding;
-    arg2 = invert << 8 | separator;
 
     PrintAndLogEx(SUCCESS, "Simulating FDX-B animal ID: %04u-%"PRIu64, countryid, animalid);
 
-    PacketCommandOLD c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
-
+    uint8_t data[128];
     //getFDXBits(uint64_t national_id, uint16_t country, uint8_t isanimal, uint8_t isextended, uint32_t extended, uint8_t *bits)
-    getFDXBits(animalid, countryid, 1, 0, 0, c.d.asBytes);
+    getFDXBits(animalid, countryid, 1, 0, 0, data);
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_ASK_SIM_TAG, clk << 8 | encoding, invert << 8 | separator, sizeof(data), data, sizeof(data));
     return 0;
 }
 
diff --git a/client/cmdlfguard.c b/client/cmdlfguard.c
index b92129fd8..8dfa9dddb 100644
--- a/client/cmdlfguard.c
+++ b/client/cmdlfguard.c
@@ -172,13 +172,10 @@ static int CmdGuardClone(const char *Cmd) {
     print_blocks(blocks, 4);
 
     PacketResponseNG resp;
-    PacketCommandOLD c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
 
     for (i = 0; i < 4; ++i) {
-        c.arg[0] = blocks[i];
-        c.arg[1] = i;
         clearCommandBuffer();
-        SendCommand(&c);
+        SendCommandOLD(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, NULL, 0);
         if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
             return -1;
@@ -199,8 +196,7 @@ static int CmdGuardSim(const char *Cmd) {
     if (sscanf(Cmd, "%u %u %u", &fmtlen, &fc, &cn) != 3) return usage_lf_guard_sim();
 
     uint8_t bs[96];
-    size_t size = sizeof(bs);
-    memset(bs, 0x00, size);
+    memset(bs, 0x00, sizeof(bs));
 
     fmtlen &= 0x7F;
     facilitycode = (fc & 0x000000FF);
@@ -213,14 +209,8 @@ static int CmdGuardSim(const char *Cmd) {
 
     PrintAndLogEx(SUCCESS, "Simulating Guardall - Facility Code: %u, CardNumber: %u", facilitycode, cardnumber);
 
-    uint64_t arg1, arg2;
-    arg1 = (clock1 << 8) | encoding;
-    arg2 = (invert << 8) | separator;
-
-    PacketCommandOLD c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
-    memcpy(c.d.asBytes, bs, size);
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_ASK_SIM_TAG, (clock1 << 8) | encoding, (invert << 8) | separator, sizeof(bs), bs, sizeof(bs));
     return 0;
 }
 
diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c
index 5675b1824..8acf9037e 100644
--- a/client/cmdlfhid.c
+++ b/client/cmdlfhid.c
@@ -93,10 +93,9 @@ static int usage_lf_hid_brute(void) {
 
 // sending three times.  Didn't seem to break the previous sim?
 static bool sendPing(void) {
-    PacketCommandOLD ping = {CMD_PING, {1, 2, 3}, {{0}}};
-    SendCommand(&ping);
-    SendCommand(&ping);
-    SendCommand(&ping);
+    SendCommandOLD(CMD_PING, 1, 2, 3, NULL, 0);
+    SendCommandOLD(CMD_PING, 1, 2, 3, NULL, 0);
+    SendCommandOLD(CMD_PING, 1, 2, 3, NULL, 0);
     clearCommandBuffer();
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000))
@@ -111,11 +110,8 @@ static bool sendTry(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint32_t delay, ui
 
     calcWiegand(fmtlen, fc, cn, bits, 0);
 
-    uint64_t arg1 = bytebits_to_byte(bits, 32);
-    uint64_t arg2 = bytebits_to_byte(bits + 32, 32);
-    PacketCommandOLD c = {CMD_HID_SIM_TAG, {arg1, arg2, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_HID_SIM_TAG, bytebits_to_byte(bits, 32), bytebits_to_byte(bits + 32, 32), 0, NULL, 0);
 
     msleep(delay);
     sendPing();
@@ -242,9 +238,8 @@ static int CmdHIDRead_device(const char *Cmd) {
 
     if (Cmd[0] == 'h' || Cmd[0] == 'H') return usage_lf_hid_read();
     uint8_t findone = (Cmd[0] == '1') ? 1 : 0;
-    PacketCommandOLD c = {CMD_HID_DEMOD_FSK, {findone, 0, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_HID_DEMOD_FSK, findone, 0, 0, NULL, 0);
     return 0;
 }
 */
@@ -263,9 +258,8 @@ static int CmdHIDSim(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "Simulating HID tag with ID %x%08x", hi, lo);
     PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation");
 
-    PacketCommandOLD c = {CMD_HID_SIM_TAG, {hi, lo, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_HID_SIM_TAG, hi, lo, 0, NULL, 0);
     return 0;
 }
 
@@ -273,11 +267,10 @@ static int CmdHIDClone(const char *Cmd) {
 
     uint32_t hi2 = 0, hi = 0, lo = 0;
     uint32_t n = 0, i = 0;
-    PacketCommandOLD c = {CMD_HID_CLONE_TAG, {0, 0, 0}, {{0}}};
 
     uint8_t ctmp = param_getchar(Cmd, 0);
     if (strlen(Cmd) == 0 || ctmp == 'H' || ctmp == 'h') return usage_lf_hid_clone();
-
+    uint8_t longid[1] = {0};
     if (strchr(Cmd, 'l') != 0) {
         while (sscanf(&Cmd[i++], "%1x", &n) == 1) {
             hi2 = (hi2 << 4) | (hi >> 28);
@@ -287,7 +280,7 @@ static int CmdHIDClone(const char *Cmd) {
 
         PrintAndLogEx(INFO, "Preparing to clone HID tag with long ID %x%08x%08x", hi2, hi, lo);
 
-        c.d.asBytes[0] = 1;
+        longid[0] = 1;
     } else {
         while (sscanf(&Cmd[i++], "%1x", &n) == 1) {
             hi = (hi << 4) | (lo >> 28);
@@ -295,15 +288,10 @@ static int CmdHIDClone(const char *Cmd) {
         }
         PrintAndLogEx(INFO, "Preparing to clone HID tag with ID %x%08x", hi, lo);
         hi2 = 0;
-        c.d.asBytes[0] = 0;
     }
 
-    c.arg[0] = hi2;
-    c.arg[1] = hi;
-    c.arg[2] = lo;
-
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_HID_CLONE_TAG, hi2, hi, lo, longid, sizeof(longid));
     return 0;
 }
 
diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index ede8c3cd1..008c53d1b 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -260,9 +260,8 @@ static int CmdLFHitagSniff(const char *Cmd) {
     char ctmp = tolower(param_getchar(Cmd, 0));
     if (ctmp == 'h') return usage_hitag_sniff();
 
-    PacketCommandOLD c = {CMD_SNIFF_HITAG, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_SNIFF_HITAG, 0, 0, 0, NULL, 0);
     return 0;
 }
 
@@ -277,8 +276,7 @@ static int CmdLFHitagSim(const char *Cmd) {
     int res = 0;
     char filename[FILE_PATH_SIZE] = { 0x00 };
 
-    PacketCommandOLD c = {CMD_SIMULATE_HITAG, {0, 0, 0}, {{0}}};
-
+    uint16_t cmd = CMD_SIMULATE_HITAG;
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
             case 'h':
@@ -289,7 +287,7 @@ static int CmdLFHitagSim(const char *Cmd) {
                 cmdp++;
                 break;
             case 's':
-                c.cmd = CMD_SIMULATE_HITAG_S;
+                cmd = CMD_SIMULATE_HITAG_S;
                 maxdatalen = 4 * 64;
                 cmdp++;
                 break;
@@ -337,12 +335,12 @@ static int CmdLFHitagSim(const char *Cmd) {
         return usage_hitag_sim();
     }
 
-    c.arg[0] = (uint32_t)tag_mem_supplied;
-    if (tag_mem_supplied) {
-        memcpy(c.d.asBytes, data, datalen);
-    }
     clearCommandBuffer();
-    SendCommand(&c);
+    if (tag_mem_supplied) {
+        SendCommandOLD(cmd, 1, 0, 0, data, datalen);
+    } else {
+        SendCommandOLD(cmd, 0, 0, 0, NULL, 0);
+    }
 
     free(data);
     return 0;
@@ -458,9 +456,8 @@ static void printHitagConfiguration(uint8_t config) {
 
 static bool getHitagUid(uint32_t *uid) {
 
-    PacketCommandOLD c = {CMD_READER_HITAG, {RHT2F_UID_ONLY, 0, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_READER_HITAG, RHT2F_UID_ONLY, 0, 0, NULL, 0);
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         PrintAndLogEx(WARNING, "timeout while waiting for reply.");
@@ -513,33 +510,33 @@ static int CmdLFHitagInfo(const char *Cmd) {
 //
 static int CmdLFHitagReader(const char *Cmd) {
 
-    PacketCommandOLD c = {CMD_READER_HITAG, {0, 0, 0}, {{0}}};
-    hitag_data *htd = (hitag_data *)c.d.asBytes;
+    uint16_t cmd = CMD_READER_HITAG;
+    hitag_data htd;
     hitag_function htf = param_get32ex(Cmd, 0, 0, 10);
 
     switch (htf) {
         case RHTSF_CHALLENGE: {
-            c.cmd = CMD_READ_HITAG_S;
-            num_to_bytes(param_get32ex(Cmd, 1, 0, 16), 4, htd->auth.NrAr);
-            num_to_bytes(param_get32ex(Cmd, 2, 0, 16), 4, htd->auth.NrAr + 4);
+            cmd = CMD_READ_HITAG_S;
+            num_to_bytes(param_get32ex(Cmd, 1, 0, 16), 4, htd.auth.NrAr);
+            num_to_bytes(param_get32ex(Cmd, 2, 0, 16), 4, htd.auth.NrAr + 4);
             break;
         }
         case RHTSF_KEY: {
-            c.cmd = CMD_READ_HITAG_S;
-            num_to_bytes(param_get64ex(Cmd, 1, 0, 16), 6, htd->crypto.key);
+            cmd = CMD_READ_HITAG_S;
+            num_to_bytes(param_get64ex(Cmd, 1, 0, 16), 6, htd.crypto.key);
             break;
         }
         case RHT2F_PASSWORD: {
-            num_to_bytes(param_get32ex(Cmd, 1, 0, 16), 4, htd->pwd.password);
+            num_to_bytes(param_get32ex(Cmd, 1, 0, 16), 4, htd.pwd.password);
             break;
         }
         case RHT2F_AUTHENTICATE: {
-            num_to_bytes(param_get32ex(Cmd, 1, 0, 16), 4, htd->auth.NrAr);
-            num_to_bytes(param_get32ex(Cmd, 2, 0, 16), 4, htd->auth.NrAr + 4);
+            num_to_bytes(param_get32ex(Cmd, 1, 0, 16), 4, htd.auth.NrAr);
+            num_to_bytes(param_get32ex(Cmd, 2, 0, 16), 4, htd.auth.NrAr + 4);
             break;
         }
         case RHT2F_CRYPTO: {
-            num_to_bytes(param_get64ex(Cmd, 1, 0, 16), 6, htd->crypto.key);
+            num_to_bytes(param_get64ex(Cmd, 1, 0, 16), 6, htd.crypto.key);
             break;
         }
         case RHT2F_TEST_AUTH_ATTEMPTS: {
@@ -556,9 +553,8 @@ static int CmdLFHitagReader(const char *Cmd) {
             return usage_hitag_reader();
     }
 
-    c.arg[0] = htf;
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(cmd, htf, 0, 0, &htd, sizeof(htd));
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 4000)) {
         PrintAndLogEx(WARNING, "timeout while waiting for reply.");
@@ -595,7 +591,6 @@ static int CmdLFHitagReader(const char *Cmd) {
 
 static int CmdLFHitagCheckChallenges(const char *Cmd) {
 
-    PacketCommandOLD c = { CMD_TEST_HITAGS_TRACES, {0, 0, 0}, {{0}}};
     char filename[FILE_PATH_SIZE] = { 0x00 };
     size_t datalen = 0;
     int res = 0;
@@ -610,14 +605,13 @@ static int CmdLFHitagCheckChallenges(const char *Cmd) {
                 free(data);
                 return usage_hitag_checkchallenges();
             case 'f':
+                //file with all the challenges to try
                 param_getstr(Cmd, cmdp + 1, filename, sizeof(filename));
                 res = loadFile(filename, "cc", data, 8 * 60, &datalen);
                 if (res > 0) {
                     errors = true;
                     break;
                 }
-
-                memcpy(c.d.asBytes, data, datalen);
                 file_given = true;
                 cmdp += 2;
                 break;
@@ -634,32 +628,33 @@ static int CmdLFHitagCheckChallenges(const char *Cmd) {
         return usage_hitag_checkchallenges();
     }
 
-    //file with all the challenges to try
-    c.arg[0] = (uint32_t)file_given;
     clearCommandBuffer();
-    SendCommand(&c);
+    if (file_given)
+        SendCommandOLD(CMD_TEST_HITAGS_TRACES, 1, 0, 0, data, datalen);
+    else
+        SendCommandOLD(CMD_TEST_HITAGS_TRACES, 0, 0, 0, NULL, 0);
 
     free(data);
     return 0;
 }
 
 static int CmdLFHitagWriter(const char *Cmd) {
-    PacketCommandOLD c = { CMD_WR_HITAG_S, {0, 0, 0}, {{0}}};
-    hitag_data *htd = (hitag_data *)c.d.asBytes;
+    hitag_data htd;
     hitag_function htf = param_get32ex(Cmd, 0, 0, 10);
 
+    uint32_t arg2 = 0;
     switch (htf) {
         case WHTSF_CHALLENGE: {
-            num_to_bytes(param_get64ex(Cmd, 1, 0, 16), 8, htd->auth.NrAr);
-            c.arg[2] = param_get32ex(Cmd, 2, 0, 10);
-            num_to_bytes(param_get32ex(Cmd, 3, 0, 16), 4, htd->auth.data);
+            num_to_bytes(param_get64ex(Cmd, 1, 0, 16), 8, htd.auth.NrAr);
+            arg2 = param_get32ex(Cmd, 2, 0, 10);
+            num_to_bytes(param_get32ex(Cmd, 3, 0, 16), 4, htd.auth.data);
             break;
         }
         case WHTSF_KEY:
         case WHT2F_CRYPTO: {
-            num_to_bytes(param_get64ex(Cmd, 1, 0, 16), 6, htd->crypto.key);
-            c.arg[2] = param_get32ex(Cmd, 2, 0, 10);
-            num_to_bytes(param_get32ex(Cmd, 3, 0, 16), 4, htd->crypto.data);
+            num_to_bytes(param_get64ex(Cmd, 1, 0, 16), 6, htd.crypto.key);
+            arg2 = param_get32ex(Cmd, 2, 0, 10);
+            num_to_bytes(param_get32ex(Cmd, 3, 0, 16), 4, htd.crypto.data);
             break;
         }
         case RHTSF_CHALLENGE:
@@ -672,10 +667,8 @@ static int CmdLFHitagWriter(const char *Cmd) {
             return usage_hitag_writer();
     }
 
-    c.arg[0] = htf;
-
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_WR_HITAG_S, htf, 0, arg2, &htd, sizeof(htd));
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 4000)) {
         PrintAndLogEx(WARNING, "timeout while waiting for reply.");
diff --git a/client/cmdlfindala.c b/client/cmdlfindala.c
index c4ad8bb3b..10cf0c916 100644
--- a/client/cmdlfindala.c
+++ b/client/cmdlfindala.c
@@ -373,8 +373,7 @@ static int CmdIndalaSim(const char *Cmd) {
     if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_indala_sim();
 
     uint8_t bits[224];
-    size_t size = sizeof(bits);
-    memset(bits, 0x00, size);
+    memset(bits, 0x00, sizeof(bits));
 
     // uid
     uint8_t hexuid[100];
@@ -394,9 +393,6 @@ static int CmdIndalaSim(const char *Cmd) {
 
     // indala PSK
     uint8_t clk = 32, carrier = 2, invert = 0;
-    uint16_t arg1, arg2;
-    arg1 = clk << 8 | carrier;
-    arg2 = invert;
 
     // It has to send either 64bits (8bytes) or 224bits (28bytes).  Zero padding needed if not.
     // lf simpsk 1 c 32 r 2 d 0102030405060708
@@ -404,10 +400,8 @@ static int CmdIndalaSim(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "Simulating Indala UID: %s",  sprint_hex(hexuid, len));
     PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation or run another command");
 
-    PacketCommandOLD c = {CMD_PSK_SIM_TAG, {arg1, arg2, size}, {{0}}};
-    memcpy(c.d.asBytes, bits, size);
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_PSK_SIM_TAG, clk << 8 | carrier, invert, sizeof(bits), bits, sizeof(bits));
     return 0;
 }
 
@@ -438,27 +432,27 @@ static int CmdIndalaClone(const char *Cmd) {
     CLIGetHexWithReturn(2, data, &datalen);
     CLIParserFree();
 
-    PacketCommandOLD c = {0, {0, 0, 0}, {{0}}};
-
     if (isLongUid) {
         PrintAndLogEx(INFO, "Preparing to clone Indala 224bit tag with RawID %s", sprint_hex(data, datalen));
-        c.cmd = CMD_INDALA_CLONE_TAG_L;
-        c.d.asDwords[0] = bytes_to_num(data, 4);
-        c.d.asDwords[1] = bytes_to_num(data +  4, 4);
-        c.d.asDwords[2] = bytes_to_num(data +  8, 4);
-        c.d.asDwords[3] = bytes_to_num(data + 12, 4);
-        c.d.asDwords[4] = bytes_to_num(data + 16, 4);
-        c.d.asDwords[5] = bytes_to_num(data + 20, 4);
-        c.d.asDwords[6] = bytes_to_num(data + 24, 4);
+        uint32_t datawords[7] = {0};
+        datawords[0] = bytes_to_num(data, 4);
+        datawords[1] = bytes_to_num(data +  4, 4);
+        datawords[2] = bytes_to_num(data +  8, 4);
+        datawords[3] = bytes_to_num(data + 12, 4);
+        datawords[4] = bytes_to_num(data + 16, 4);
+        datawords[5] = bytes_to_num(data + 20, 4);
+        datawords[6] = bytes_to_num(data + 24, 4);
+        clearCommandBuffer();
+        SendCommandOLD(CMD_INDALA_CLONE_TAG_L, 0, 0, 0, datawords, sizeof(datawords));
     } else {
         PrintAndLogEx(INFO, "Preparing to clone Indala 64bit tag with RawID %s", sprint_hex(data, datalen));
-        c.cmd = CMD_INDALA_CLONE_TAG;
-        c.d.asDwords[0] = bytes_to_num(data, 4);
-        c.d.asDwords[1] = bytes_to_num(data + 4, 4);
+        uint32_t datawords[2] = {0};
+        datawords[0] = bytes_to_num(data, 4);
+        datawords[1] = bytes_to_num(data + 4, 4);
+        clearCommandBuffer();
+        SendCommandOLD(CMD_INDALA_CLONE_TAG, 0, 0, 0, datawords, sizeof(datawords));
     }
 
-    clearCommandBuffer();
-    SendCommand(&c);
     return 0;
 }
 
diff --git a/client/cmdlfio.c b/client/cmdlfio.c
index cc5fec9d5..6e60f8728 100644
--- a/client/cmdlfio.c
+++ b/client/cmdlfio.c
@@ -66,9 +66,8 @@ static int usage_lf_io_clone(void) {
 static int CmdIOProxRead_device(const char *Cmd) {
     if (Cmd[0] == 'h' || Cmd[0] == 'H') return usage_lf_io_read();
     int findone = (Cmd[0] == '1') ? 1 : 0;
-    PacketCommandOLD c = {CMD_IO_DEMOD_FSK, {findone, 0, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_IO_DEMOD_FSK, findone, 0, 0, NULL, 0);
     return 0;
 }
 */
@@ -181,8 +180,7 @@ static int CmdIOProxSim(const char *Cmd) {
     uint16_t cn = 0;
     uint8_t version = 0, fc = 0;
     uint8_t bits[64];
-    size_t size = sizeof(bits);
-    memset(bits, 0x00, size);
+    memset(bits, 0x00, sizeof(bits));
 
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_io_sim();
@@ -200,9 +198,6 @@ static int CmdIOProxSim(const char *Cmd) {
 
     // clock 64, FSK2a fcHIGH 10 | fcLOW 8
     uint8_t clk = 64, invert = 1, high = 10, low = 8;
-    uint16_t arg1, arg2;
-    arg1 = high << 8 | low;
-    arg2 = invert << 8 | clk;
 
     PrintAndLogEx(SUCCESS, "Simulating IOProx version: %u FC: %u; CN: %u\n", version, fc, cn);
     PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation or run another command");
@@ -215,10 +210,8 @@ static int CmdIOProxSim(const char *Cmd) {
     // arg1 --- fcHigh<<8 + fcLow
     // arg2 --- Invert and clk setting
     // size --- 64 bits == 8 bytes
-    PacketCommandOLD c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}, {{0}}};
-    memcpy(c.d.asBytes, bits, size);
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_FSK_SIM_TAG, high << 8 | low, invert << 8 | clk, sizeof(bits), bits, sizeof(bits));
     return 0;
 }
 
@@ -258,10 +251,8 @@ static int CmdIOProxClone(const char *Cmd) {
     PrintAndLogEx(INFO, "Preparing to clone IOProx to T55x7 with Version: %u FC: %u, CN: %u", version, fc, cn);
     print_blocks(blocks, 3);
 
-    //PacketCommandOLD c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}, {{0}}};
-    PacketCommandOLD c = {CMD_IO_CLONE_TAG, {blocks[1], blocks[2], 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_IO_CLONE_TAG, blocks[1], blocks[2], 0, NULL, 0);
     return 0;
 }
 
diff --git a/client/cmdlfjablotron.c b/client/cmdlfjablotron.c
index fbe1168a6..cf5230f19 100644
--- a/client/cmdlfjablotron.c
+++ b/client/cmdlfjablotron.c
@@ -156,13 +156,10 @@ static int CmdJablotronClone(const char *Cmd) {
     print_blocks(blocks, 3);
 
     PacketResponseNG resp;
-    PacketCommandOLD c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
 
     for (uint8_t i = 0; i < 3; i++) {
-        c.arg[0] = blocks[i];
-        c.arg[1] = i;
         clearCommandBuffer();
-        SendCommand(&c);
+        SendCommandOLD(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, NULL, 0);
         if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
             return -1;
@@ -186,17 +183,12 @@ static int CmdJablotronSim(const char *Cmd) {
     }
 
     uint8_t clk = 64, encoding = 2, separator = 0, invert = 1;
-    uint16_t arg1, arg2;
-    size_t size = 64;
-    arg1 = clk << 8 | encoding;
-    arg2 = invert << 8 | separator;
-
     PrintAndLogEx(SUCCESS, "Simulating Jablotron - FullCode: %"PRIx64, fullcode);
 
-    PacketCommandOLD c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
-    getJablotronBits(fullcode, c.d.asBytes);
+    uint8_t data[64];
+    getJablotronBits(fullcode, data);
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_ASK_SIM_TAG, clk << 8 | encoding, invert << 8 | separator, sizeof(data), data, sizeof(data));
     return 0;
 }
 
diff --git a/client/cmdlfkeri.c b/client/cmdlfkeri.c
index 10e171bdd..055eb1a4b 100644
--- a/client/cmdlfkeri.c
+++ b/client/cmdlfkeri.c
@@ -147,14 +147,10 @@ static int CmdKeriClone(const char *Cmd) {
 
 
     PacketResponseNG resp;
-    PacketCommandOLD c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
-
 
     for (uint8_t i = 0; i < 3; i++) {
-        c.arg[0] = blocks[i];
-        c.arg[1] = i;
         clearCommandBuffer();
-        SendCommand(&c);
+        SendCommandOLD(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, NULL, 0);
         if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
             return -1;
@@ -182,17 +178,11 @@ static int CmdKeriSim(const char *Cmd) {
     }
 
     uint8_t clk = 32, carrier = 2, invert = 0;
-    uint16_t arg1, arg2;
-    size_t size = 64;
-    arg1 = clk << 8 | carrier;
-    arg2 = invert;
 
     PrintAndLogEx(SUCCESS, "Simulating KERI - Internal Id: %u", internalid);
 
-    PacketCommandOLD c = {CMD_PSK_SIM_TAG, {arg1, arg2, size}, {{0}}};
-    memcpy(c.d.asBytes, bits, size);
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_PSK_SIM_TAG, clk << 8 | carrier, invert, sizeof(bits), bits, sizeof(bits));
 
     return 0;
 }
diff --git a/client/cmdlfnedap.c b/client/cmdlfnedap.c
index 43fd1a1b0..2d95fa008 100644
--- a/client/cmdlfnedap.c
+++ b/client/cmdlfnedap.c
@@ -203,13 +203,10 @@ static int CmdLFNedapClone(const char *Cmd) {
     print_blocks(blocks, 5);
 
     PacketResponseNG resp;
-    PacketCommandOLD c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}, {{0}}};
 
     for (uint8_t i = 0; i<5; ++i ) {
-        c.arg[0] = blocks[i];
-        c.arg[1] = i;
         clearCommandBuffer();
-        SendCommand(&c);
+        SendCommandOLD(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, NULL, 0);
         if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)){
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
             return -1;
@@ -231,14 +228,10 @@ static int CmdLFNedapSim(const char *Cmd) {
     cardnumber = (cn & 0x00FFFFFF);
 
     uint8_t bs[128];
-    size_t size = sizeof(bs);
-    memset(bs, 0x00, size);
+    memset(bs, 0x00, sizeof(bs));
 
     // NEDAP,  Biphase = 2, clock 64, inverted,  (DIPhase == inverted BIphase
     uint8_t  clk = 64, encoding = 2, separator = 0, invert = 1;
-    uint16_t arg1, arg2;
-    arg1 = clk << 8 | encoding;
-    arg2 = invert << 8 | separator;
 
     if (!getNedapBits(cardnumber, bs)) {
         PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
@@ -248,10 +241,8 @@ static int CmdLFNedapSim(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "bin  %s", sprint_bin_break(bs, 128, 32));
     PrintAndLogEx(SUCCESS, "Simulating Nedap - CardNumber: %u", cardnumber);
 
-    PacketCommandOLD c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
-    memcpy(c.d.asBytes, bs, size);
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_ASK_SIM_TAG, clk << 8 | encoding, invert << 8 | separator, sizeof(bs), bs, sizeof(bs));
     return 0;
 }
 
diff --git a/client/cmdlfnoralsy.c b/client/cmdlfnoralsy.c
index 66b2183af..227237936 100644
--- a/client/cmdlfnoralsy.c
+++ b/client/cmdlfnoralsy.c
@@ -155,13 +155,10 @@ static int CmdNoralsyClone(const char *Cmd) {
     print_blocks(blocks, 4);
 
     PacketResponseNG resp;
-    PacketCommandOLD c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
 
     for (uint8_t i = 0; i < 4; i++) {
-        c.arg[0] = blocks[i];
-        c.arg[1] = i;
         clearCommandBuffer();
-        SendCommand(&c);
+        SendCommandOLD(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, NULL, 0);
         if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
             return -1;
@@ -173,8 +170,7 @@ static int CmdNoralsyClone(const char *Cmd) {
 static int CmdNoralsySim(const char *Cmd) {
 
     uint8_t bits[96];
-    uint8_t *bs = bits;
-    memset(bs, 0, sizeof(bits));
+    memset(bits, 0, sizeof(bits));
 
     uint16_t year = 0;
     uint32_t id = 0;
@@ -186,22 +182,16 @@ static int CmdNoralsySim(const char *Cmd) {
     year = param_get32ex(Cmd, 1, 2000, 10);
 
     uint8_t clk = 32, encoding = 1, separator = 1, invert = 0;
-    uint16_t arg1, arg2;
-    size_t size = 96;
-    arg1 = clk << 8 | encoding;
-    arg2 = invert << 8 | separator;
 
-    if (!getnoralsyBits(id, year, bs)) {
+    if (!getnoralsyBits(id, year, bits)) {
         PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
         return 1;
     }
 
     PrintAndLogEx(SUCCESS, "Simulating Noralsy - CardId: %u", id);
 
-    PacketCommandOLD c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
-    memcpy(c.d.asBytes, bs, size);
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_ASK_SIM_TAG, clk << 8 | encoding, invert << 8 | separator, sizeof(bits), bits, sizeof(bits));
     return 0;
 }
 
diff --git a/client/cmdlfparadox.c b/client/cmdlfparadox.c
index 173871e0e..11f295b0c 100644
--- a/client/cmdlfparadox.c
+++ b/client/cmdlfparadox.c
@@ -117,14 +117,10 @@ static int CmdParadoxSim(const char *Cmd) {
     uint32_t facilitycode = 0, cardnumber = 0, fc = 0, cn = 0;
 
     uint8_t bs[96];
-    size_t size = sizeof(bs);
-    memset(bs, 0x00, size);
+    memset(bs, 0x00, sizeof(bs));
 
     // Paradox uses:  fcHigh: 10, fcLow: 8, clk: 50, invert: 1  FSK2a
     uint8_t clk = 50, invert = 1, high = 10, low = 8;
-    uint16_t arg1, arg2;
-    arg1 = high << 8 | low;
-    arg2 = invert << 8 | clk;
 
     if (sscanf(Cmd, "%u %u", &fc, &cn) != 2) return usage_lf_paradox_sim();
 
@@ -138,10 +134,8 @@ static int CmdParadoxSim(const char *Cmd) {
 
     PrintAndLogEx(NORMAL, "Simulating Paradox - Facility Code: %u, CardNumber: %u", facilitycode, cardnumber);
 
-    PacketCommandOLD c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}, {{0}}};
-    memcpy(c.d.asBytes, bs, size);
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_FSK_SIM_TAG, high << 8 | low, invert << 8 | clk, sizeof(bs), bs, sizeof(bs));
 
     PrintAndLogEx(NORMAL, "UNFINISHED");
     return 0;
diff --git a/client/cmdlfpcf7931.c b/client/cmdlfpcf7931.c
index ad212f926..ae93cecef 100644
--- a/client/cmdlfpcf7931.c
+++ b/client/cmdlfpcf7931.c
@@ -100,9 +100,8 @@ static int CmdLFPCF7931Read(const char *Cmd) {
     if (ctmp == 'H' || ctmp == 'h') return usage_pcf7931_read();
 
     PacketResponseNG resp;
-    PacketCommandOLD c = {CMD_PCF7931_READ, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_PCF7931_READ, 0, 0, 0, NULL, 0);
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         PrintAndLogEx(WARNING, "command execution time out");
         return 1;
@@ -145,14 +144,14 @@ static int CmdLFPCF7931Write(const char *Cmd) {
     PrintAndLogEx(NORMAL, "          pos: %d", bytepos);
     PrintAndLogEx(NORMAL, "         data: 0x%02X", data);
 
-    PacketCommandOLD c = {CMD_PCF7931_WRITE, { block, bytepos, data}, {{0}}};
-    memcpy(c.d.asDwords, configPcf.Pwd, sizeof(configPcf.Pwd));
-    c.d.asDwords[7] = (configPcf.OffsetWidth + 128);
-    c.d.asDwords[8] = (configPcf.OffsetPosition + 128);
-    c.d.asDwords[9] = configPcf.InitDelay;
+    uint32_t buf[10]; // TODO sparse struct, 7 *bytes* then words at offset 4*7!
+    memcpy(buf, configPcf.Pwd, sizeof(configPcf.Pwd));
+    buf[7] = (configPcf.OffsetWidth + 128);
+    buf[8] = (configPcf.OffsetPosition + 128);
+    buf[9] = configPcf.InitDelay;
 
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_PCF7931_WRITE, block, bytepos, data, buf, sizeof(buf));
     //no ack?
     return 0;
 }
diff --git a/client/cmdlfpresco.c b/client/cmdlfpresco.c
index 0560862ec..672d8643a 100644
--- a/client/cmdlfpresco.c
+++ b/client/cmdlfpresco.c
@@ -121,13 +121,10 @@ static int CmdPrescoClone(const char *Cmd) {
     print_blocks(blocks, 5);
 
     PacketResponseNG resp;
-    PacketCommandOLD c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
 
     for (uint8_t i = 0; i < 5; i++) {
-        c.arg[0] = blocks[i];
-        c.arg[1] = i;
         clearCommandBuffer();
-        SendCommand(&c);
+        SendCommandOLD(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, NULL, 0);
         if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
             return -1;
@@ -145,17 +142,12 @@ static int CmdPrescoSim(const char *Cmd) {
     if (getWiegandFromPresco(Cmd, &sitecode, &usercode, &fullcode, &Q5) == -1) return usage_lf_presco_sim();
 
     uint8_t clk = 32, encoding = 1, separator = 1, invert = 0;
-    uint16_t arg1, arg2;
-    size_t size = 128;
-    arg1 = clk << 8 | encoding;
-    arg2 = invert << 8 | separator;
 
     PrintAndLogEx(SUCCESS, "Simulating Presco - SiteCode: %u, UserCode: %u, FullCode: %08X", sitecode, usercode, fullcode);
 
-    PacketCommandOLD c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
-    getPrescoBits(fullcode, c.d.asBytes);
-    clearCommandBuffer();
-    SendCommand(&c);
+    uint8_t data[128];
+    getPrescoBits(fullcode, data);
+    SendCommandOLD(CMD_ASK_SIM_TAG, clk << 8 | encoding, invert << 8 | separator, sizeof(data), data, sizeof(data));
     return 0;
 }
 
diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c
index cb146edd3..72f129583 100644
--- a/client/cmdlfpyramid.c
+++ b/client/cmdlfpyramid.c
@@ -233,13 +233,10 @@ static int CmdPyramidClone(const char *Cmd) {
     print_blocks(blocks, 5);
 
     PacketResponseNG resp;
-    PacketCommandOLD c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
 
     for (uint8_t i = 0; i < 5; ++i) {
-        c.arg[0] = blocks[i];
-        c.arg[1] = i;
         clearCommandBuffer();
-        SendCommand(&c);
+        SendCommandOLD(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, NULL, 0);
         if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
             return -1;
@@ -256,14 +253,10 @@ static int CmdPyramidSim(const char *Cmd) {
     uint32_t facilitycode = 0, cardnumber = 0, fc = 0, cn = 0;
 
     uint8_t bs[128];
-    size_t size = sizeof(bs);
-    memset(bs, 0x00, size);
+    memset(bs, 0x00, sizeof(bs));
 
     // Pyramid uses:  fcHigh: 10, fcLow: 8, clk: 50, invert: 0
     uint8_t clk = 50, invert = 0, high = 10, low = 8;
-    uint16_t arg1, arg2;
-    arg1 = high << 8 | low;
-    arg2 = invert << 8 | clk;
 
     if (sscanf(Cmd, "%u %u", &fc, &cn) != 2) return usage_lf_pyramid_sim();
 
@@ -277,10 +270,8 @@ static int CmdPyramidSim(const char *Cmd) {
 
     PrintAndLogEx(SUCCESS, "Simulating Farpointe/Pyramid - Facility Code: %u, CardNumber: %u", facilitycode, cardnumber);
 
-    PacketCommandOLD c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}, {{0}}};
-    memcpy(c.d.asBytes, bs, size);
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_FSK_SIM_TAG, high << 8 | low, invert << 8 | clk, sizeof(bs), bs, sizeof(bs));
     return 0;
 }
 
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 65693dac6..668a461e0 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1018,9 +1018,8 @@ static int CmdT55xxWakeUp(const char *Cmd) {
     }
     if (errors) return usage_t55xx_wakup();
 
-    PacketCommandOLD c = {CMD_T55XX_WAKEUP, {password, 0, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_T55XX_WAKEUP, password, 0, 0, NULL, 0);
     PrintAndLogEx(SUCCESS, "Wake up command sent. Try read now");
     return 0;
 }
@@ -1074,24 +1073,25 @@ static int CmdT55xxWriteBlock(const char *Cmd) {
         return 0;
     }
 
-    PacketCommandOLD c = {CMD_T55XX_WRITE_BLOCK, {data, block, 0}, {{0}}};
     PacketResponseNG resp;
-    c.d.asBytes[0] = (page1) ? 0x2 : 0;
-    c.d.asBytes[0] |= (testMode) ? 0x4 : 0;
+    uint8_t flags[1] = {0};
+    flags[0] = (page1) ? 0x2 : 0;
+    flags[0] |= (testMode) ? 0x4 : 0;
 
     char pwdStr[16] = {0};
     snprintf(pwdStr, sizeof(pwdStr), "pwd: 0x%08X", password);
 
     PrintAndLogEx(INFO, "Writing page %d  block: %02d  data: 0x%08X %s", page1, block, data, (usepwd) ? pwdStr : "");
 
+    uint64_t arg_pwd = 0;
     //Password mode
     if (usepwd) {
-        c.arg[2] = password;
-        c.d.asBytes[0] |= 0x1;
+        arg_pwd = password;
+        flags[0] |= 0x1;
     }
 
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_T55XX_WRITE_BLOCK, data, block, arg_pwd, flags, sizeof(flags));
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         PrintAndLogEx(WARNING, "Error occurred, device did not ACK write operation. (May be due to old firmware)");
         return 0;
@@ -1515,9 +1515,8 @@ bool AquireData(uint8_t page, uint8_t block, bool pwdmode, uint32_t password) {
     // arg1: which block to read
     // arg2: password
     uint8_t arg0 = (page << 1 | (pwdmode));
-    PacketCommandOLD c = {CMD_T55XX_READ_BLOCK, {arg0, block, password}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_T55XX_READ_BLOCK, arg0, block, password, NULL, 0);
     if (!WaitForResponseTimeout(CMD_ACK, NULL, 2500)) {
         PrintAndLogEx(WARNING, "command execution time out");
         return false;
@@ -1775,9 +1774,8 @@ static void t55x7_create_config_block(int tagtype) {
 
 static int CmdResetRead(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
-    PacketCommandOLD c = {CMD_T55XX_RESET_READ, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_T55XX_RESET_READ, 0, 0, 0, NULL, 0);
     if (!WaitForResponseTimeout(CMD_ACK, NULL, 2500)) {
         PrintAndLogEx(WARNING, "command execution time out");
         return 0;
@@ -1856,9 +1854,8 @@ static int CmdT55xxChkPwds(const char *Cmd) {
     uint64_t t1 = msclock();
 
     if (cmdp == 'm') {
-        PacketCommandOLD c = {CMD_T55XX_CHKPWDS, {0, 0, 0}, {{0}}};
         clearCommandBuffer();
-        SendCommand(&c);
+        SendCommandOLD(CMD_T55XX_CHKPWDS, 0, 0, 0, NULL, 0);
         PacketResponseNG resp;
 
         while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
@@ -2299,10 +2296,8 @@ static int CmdT55xxSetDeviceConfig(const char *Cmd) {
 
     t55xx_config conf = { startgap * 8, writegap * 8, write0 * 8, write1 * 8, readgap * 8 };
 
-    PacketCommandOLD c = {CMD_SET_LF_T55XX_CONFIG, {shall_persist, 0, 0}, {{0}}};
-    memcpy(c.d.asBytes, &conf, sizeof(t55xx_config));
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_SET_LF_T55XX_CONFIG, shall_persist, 0, 0, &conf, sizeof(t55xx_config));
     return 0;
 }
 
diff --git a/client/cmdlfti.c b/client/cmdlfti.c
index 9276c903c..3b12116b6 100644
--- a/client/cmdlfti.c
+++ b/client/cmdlfti.c
@@ -275,27 +275,26 @@ out:
 // read a TI tag and return its ID
 static int CmdTIRead(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
-    PacketCommandOLD c = {CMD_READ_TI_TYPE};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_READ_TI_TYPE, 0, 0, 0, NULL, 0);
     return 0;
 }
 
 // write new data to a r/w TI tag
 static int CmdTIWrite(const char *Cmd) {
     int res = 0;
-    PacketCommandOLD c = {CMD_WRITE_TI_TYPE};
-    res = sscanf(Cmd, "%012" SCNx64 " %012" SCNx64 " %012" SCNx64 "", &c.arg[0], &c.arg[1], &c.arg[2]);
+    uint64_t arg0, arg1, arg2;
+    res = sscanf(Cmd, "%012" SCNx64 " %012" SCNx64 " %012" SCNx64 "", &arg0, &arg1, &arg2);
 
     if (res == 2)
-        c.arg[2] = 0;
+        arg2 = 0;
 
     if (res < 2) {
         PrintAndLogEx(WARNING, "Please specify the data as two hex strings, optionally the CRC as a third");
         return 1;
     }
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_WRITE_TI_TYPE, arg0, arg1, arg2, NULL, 0);
     return 0;
 }
 
diff --git a/client/cmdlfviking.c b/client/cmdlfviking.c
index 3234da145..66eda8219 100644
--- a/client/cmdlfviking.c
+++ b/client/cmdlfviking.c
@@ -88,9 +88,8 @@ static int CmdVikingClone(const char *Cmd) {
 
     PrintAndLogEx(INFO, "Preparing to clone Viking tag - ID: %08X, Raw: %08X%08X", id, (uint32_t)(rawID >> 32), (uint32_t)(rawID & 0xFFFFFFFF));
 
-    PacketCommandOLD c = {CMD_VIKING_CLONE_TAG, {rawID >> 32, rawID & 0xFFFFFFFF, Q5}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_VIKING_CLONE_TAG, rawID >> 32, rawID & 0xFFFFFFFF, Q5, NULL, 0);
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
         PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
@@ -112,17 +111,12 @@ static int CmdVikingSim(const char *Cmd) {
 
     rawID = getVikingBits(id);
 
-    uint16_t arg1, arg2;
-    size_t size = 64;
-    arg1 = clk << 8 | encoding;
-    arg2 = invert << 8 | separator;
-
     PrintAndLogEx(SUCCESS, "Simulating Viking - ID: %08X, Raw: %08X%08X", id, (uint32_t)(rawID >> 32), (uint32_t)(rawID & 0xFFFFFFFF));
 
-    PacketCommandOLD c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
-    num_to_bytebits(rawID, size, c.d.asBytes);
+    uint8_t data[64];
+    num_to_bytebits(rawID, sizeof(data), data);
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_ASK_SIM_TAG, clk << 8 | encoding, invert << 8 | separator, sizeof(data), data, sizeof(data));
     return 0;
 }
 
diff --git a/client/cmdlfvisa2000.c b/client/cmdlfvisa2000.c
index 6a6b14f00..424a28106 100644
--- a/client/cmdlfvisa2000.c
+++ b/client/cmdlfvisa2000.c
@@ -167,13 +167,10 @@ static int CmdVisa2kClone(const char *Cmd) {
     print_blocks(blocks, 4);
 
     PacketResponseNG resp;
-    PacketCommandOLD c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}, {{0}}};
 
     for (uint8_t i = 0; i < 4; i++) {
-        c.arg[0] = blocks[i];
-        c.arg[1] = i;
         clearCommandBuffer();
-        SendCommand(&c);
+        SendCommandOLD(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, NULL, 0);
         if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
             return -1;
@@ -191,22 +188,17 @@ static int CmdVisa2kSim(const char *Cmd) {
     id = param_get32ex(Cmd, 0, 0, 10);
 
     uint8_t clk = 64, encoding = 1, separator = 1, invert = 0;
-    uint16_t arg1, arg2;
-    size_t size = 96;
-    arg1 = clk << 8 | encoding;
-    arg2 = invert << 8 | separator;
 
     PrintAndLogEx(SUCCESS, "Simulating Visa2000 - CardId: %u", id);
 
-    PacketCommandOLD c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}, {{0}}};
-
     uint32_t blocks[3] = { BL0CK1, id, (visa_parity(id) << 4) | visa_chksum(id) };
 
+    uint8_t data[96];
     for (int i = 0; i < 3; ++i)
-        num_to_bytebits(blocks[i], 32, c.d.asBytes + i * 32);
+        num_to_bytebits(blocks[i], 32, data + i * 32);
 
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_ASK_SIM_TAG, clk << 8 | encoding, invert << 8 | separator, sizeof(data), data, sizeof(data));
     return 0;
 }
 
diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index 3f933b4ad..3f9703ccd 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -347,10 +347,8 @@ static int smart_responseEx(uint8_t *data, bool silent) {
         int len = data[datalen - 1];
         if (!silent) PrintAndLogEx(INFO, "Requesting 0x%02X bytes response", len);
         uint8_t getstatus[] = {0x00, ISO7816_GET_RESPONSE, 0x00, 0x00, len};
-        PacketCommandOLD cStatus = {CMD_SMART_RAW, {SC_RAW, sizeof(getstatus), 0}, {{0}}};
-        memcpy(cStatus.d.asBytes, getstatus, sizeof(getstatus));
         clearCommandBuffer();
-        SendCommand(&cStatus);
+        SendCommandOLD(CMD_SMART_RAW, SC_RAW, sizeof(getstatus), 0, getstatus, sizeof(getstatus));
 
         datalen = smart_wait(data, silent);
 
@@ -452,26 +450,22 @@ static int CmdSmartRaw(const char *Cmd) {
     //Validations
     if (errors || cmdp == 0) return usage_sm_raw();
 
-    // arg0 = RFU flags
-    // arg1 = length
-    PacketCommandOLD c = {CMD_SMART_RAW, {0, hexlen, 0}, {{0}}};
-
+    uint8_t flags = 0;
     if (active || active_select) {
-        c.arg[0] |= SC_CONNECT;
+        flags |= SC_CONNECT;
         if (active_select)
-            c.arg[0] |= SC_SELECT;
+            flags |= SC_SELECT;
     }
 
     if (hexlen > 0) {
         if (useT0)
-            c.arg[0] |= SC_RAW_T0;
+            flags |= SC_RAW_T0;
         else
-            c.arg[0] |= SC_RAW;
+            flags |= SC_RAW;
     }
 
-    memcpy(c.d.asBytes, data, hexlen);
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_SMART_RAW, flags, hexlen, 0, data, hexlen);
 
     // reading response from smart card
     if (reply) {
@@ -489,9 +483,8 @@ static int CmdSmartRaw(const char *Cmd) {
         if (buf[0] == 0x6C) {
             data[4] = buf[1];
 
-            memcpy(c.d.asBytes, data, sizeof(data));
             clearCommandBuffer();
-            SendCommand(&c);
+            SendCommandOLD(CMD_SMART_RAW, 0, hexlen, 0, data, hexlen);
             len = smart_response(buf);
 
             data[4] = 0;
@@ -652,13 +645,8 @@ static int CmdSmartUpgrade(const char *Cmd) {
 
     while (bytes_remaining > 0) {
         uint32_t bytes_in_packet = MIN(USB_CMD_DATA_SIZE, bytes_remaining);
-        PacketCommandOLD c = {CMD_SMART_UPLOAD, {index + bytes_sent, bytes_in_packet, 0}, {{0}}};
-
-        // Fill usb bytes with 0xFF
-        memset(c.d.asBytes, 0xFF, USB_CMD_DATA_SIZE);
-        memcpy(c.d.asBytes, dump + bytes_sent, bytes_in_packet);
         clearCommandBuffer();
-        SendCommand(&c);
+        SendCommandOLD(CMD_SMART_UPLOAD, index + bytes_sent, bytes_in_packet, 0, dump + bytes_sent, bytes_in_packet);
         if (!WaitForResponseTimeout(CMD_ACK, NULL, 2000)) {
             PrintAndLogEx(WARNING, "timeout while waiting for reply.");
             free(dump);
@@ -675,9 +663,8 @@ static int CmdSmartUpgrade(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "Sim module firmware updating,  don\'t turn off your PM3!");
 
     // trigger the firmware upgrade
-    PacketCommandOLD c = {CMD_SMART_UPGRADE, {firmware_size, 0, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_SMART_UPGRADE, firmware_size, 0, 0, NULL, 0);
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         PrintAndLogEx(WARNING, "timeout while waiting for reply.");
@@ -714,9 +701,8 @@ static int CmdSmartInfo(const char *Cmd) {
     //Validations
     if (errors) return usage_sm_info();
 
-    PacketCommandOLD c = {CMD_SMART_ATR, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_SMART_ATR, 0, 0, 0, NULL, 0);
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         if (!silent) PrintAndLogEx(WARNING, "smart card select failed");
@@ -789,9 +775,8 @@ static int CmdSmartReader(const char *Cmd) {
     //Validations
     if (errors) return usage_sm_reader();
 
-    PacketCommandOLD c = {CMD_SMART_ATR, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_SMART_ATR, 0, 0, 0, NULL, 0);
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         if (!silent) PrintAndLogEx(WARNING, "smart card select failed");
@@ -835,9 +820,8 @@ static int CmdSmartSetClock(const char *Cmd) {
     //Validations
     if (errors || cmdp == 0) return usage_sm_setclock();
 
-    PacketCommandOLD c = {CMD_SMART_SETCLOCK, {clock1, 0, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_SMART_SETCLOCK, clock1, 0, 0, NULL, 0);
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         PrintAndLogEx(WARNING, "smart card select failed");
@@ -887,13 +871,10 @@ static void smart_brute_prim() {
 
     PrintAndLogEx(INFO, "Reading primitives");
 
-    PacketCommandOLD c = {CMD_SMART_RAW, {SC_RAW_T0, 5, 0}, {{0}}};
-
     for (int i = 0; i < sizeof(get_card_data); i += 5) {
 
-        memcpy(c.d.asBytes, get_card_data + i, 5);
         clearCommandBuffer();
-        SendCommand(&c);
+        SendCommandOLD(CMD_SMART_RAW, SC_RAW_T0, 5, 0, get_card_data + i, 5);
 
         int len = smart_responseEx(buf, true);
 
@@ -917,8 +898,6 @@ static int smart_brute_sfi(bool decodeTLV) {
     int len;
     // READ RECORD
     uint8_t READ_RECORD[] = {0x00, 0xB2, 0x00, 0x00, 0x00};
-    PacketCommandOLD c = {CMD_SMART_RAW, {SC_RAW_T0, sizeof(READ_RECORD), 0}, {{0}}};
-
     PrintAndLogEx(INFO, "Start SFI brute forcing");
 
     for (uint8_t sfi = 1; sfi <= 31; sfi++) {
@@ -939,18 +918,16 @@ static int smart_brute_sfi(bool decodeTLV) {
             READ_RECORD[2] = rec;
             READ_RECORD[3] = (sfi << 3) | 4;
 
-            memcpy(c.d.asBytes, READ_RECORD, sizeof(READ_RECORD));
             clearCommandBuffer();
-            SendCommand(&c);
+            SendCommandOLD(CMD_SMART_RAW, SC_RAW_T0, sizeof(READ_RECORD), 0, READ_RECORD, sizeof(READ_RECORD));
 
             len = smart_responseEx(buf, true);
 
             if (buf[0] == 0x6C) {
                 READ_RECORD[4] = buf[1];
 
-                memcpy(c.d.asBytes, READ_RECORD, sizeof(READ_RECORD));
                 clearCommandBuffer();
-                SendCommand(&c);
+                SendCommandOLD(CMD_SMART_RAW, SC_RAW_T0, sizeof(READ_RECORD), 0, READ_RECORD, sizeof(READ_RECORD));
                 len = smart_responseEx(buf, true);
 
                 READ_RECORD[4] = 0;
@@ -984,10 +961,8 @@ static void smart_brute_options(bool decodeTLV) {
     uint8_t GET_PROCESSING_OPTIONS[] = {0x80, 0xA8, 0x00, 0x00, 0x02, 0x83, 0x00, 0x00};
 
     // Get processing options command
-    PacketCommandOLD c = {CMD_SMART_RAW, {SC_RAW_T0, sizeof(GET_PROCESSING_OPTIONS), 0}, {{0}}};
-    memcpy(c.d.asBytes, GET_PROCESSING_OPTIONS, sizeof(GET_PROCESSING_OPTIONS));
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_SMART_RAW, SC_RAW_T0, sizeof(GET_PROCESSING_OPTIONS), 0, GET_PROCESSING_OPTIONS, sizeof(GET_PROCESSING_OPTIONS));
 
     int len = smart_responseEx(buf, true);
     if (len > 4) {
@@ -1040,9 +1015,6 @@ static int CmdSmartBruteforceSFI(const char *Cmd) {
 //  uint8_t UNBLOCK_PIN[] = {0x84, 0x24, 0x00, 0x00, 0x00};
 //  uint8_t VERIFY[] = {0x00, 0x20, 0x00, 0x80};
 
-    // Select AID command
-    PacketCommandOLD cAid = {CMD_SMART_RAW, {SC_RAW_T0, 0, 0}, {{0}}};
-
     PrintAndLogEx(INFO, "Importing AID list");
     json_t *root = NULL;
     smart_loadjson("aidlist", "json", &root);
@@ -1092,14 +1064,13 @@ static int CmdSmartBruteforceSFI(const char *Cmd) {
         snprintf(caid, 8 + 2 + aidlen + 1, SELECT, aidlen >> 1, aid);
 
         int hexlen = 0;
-        int res = param_gethex_to_eol(caid, 0, cAid.d.asBytes, sizeof(cAid.d.asBytes), &hexlen);
+        uint8_t cmddata[USB_CMD_DATA_SIZE];
+        int res = param_gethex_to_eol(caid, 0, cmddata, sizeof(cmddata), &hexlen);
         if (res)
             continue;
 
-        cAid.arg[1] = hexlen;
-
         clearCommandBuffer();
-        SendCommand(&cAid);
+        SendCommandOLD(CMD_SMART_RAW, SC_RAW_T0, hexlen, 0, cmddata, hexlen);
 
         int len = smart_responseEx(buf, true);
         if (len < 3)
@@ -1177,13 +1148,12 @@ int ExchangeAPDUSC(uint8_t *datain, int datainlen, bool activateCard, bool leave
 
     PrintAndLogEx(DEBUG, "APDU SC");
 
-    PacketCommandOLD c = {CMD_SMART_RAW, {SC_RAW_T0, datainlen, 0}, {{0}}};
+    uint8_t flags = SC_RAW_T0;
     if (activateCard) {
-        c.arg[0] |= SC_SELECT | SC_CONNECT;
+        flags |= SC_SELECT | SC_CONNECT;
     }
-    memcpy(c.d.asBytes, datain, datainlen);
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_SMART_RAW, flags, datainlen, 0, datain, datainlen);
 
     int len = smart_responseEx(dataout, true);
 
@@ -1193,14 +1163,15 @@ int ExchangeAPDUSC(uint8_t *datain, int datainlen, bool activateCard, bool leave
 
     // retry
     if (len > 1 && dataout[len - 2] == 0x6c && datainlen > 4) {
-        PacketCommandOLD c2 = {CMD_SMART_RAW, {SC_RAW_T0, datainlen, 0}, {{0}}};
-        memcpy(c2.d.asBytes, datain, 5);
+        uint8_t data [5];
+        memcpy(data, datain, 5);
 
         // transfer length via T=0
-        c2.d.asBytes[4] = dataout[len - 1];
+        data[4] = dataout[len - 1];
 
         clearCommandBuffer();
-        SendCommand(&c2);
+        // something fishy: we have only 5 bytes but we put datainlen in arg1?
+        SendCommandOLD(CMD_SMART_RAW, SC_RAW_T0, datainlen, 0, data, sizeof(data));
 
         len = smart_responseEx(dataout, true);
     }
@@ -1213,9 +1184,8 @@ bool smart_select(bool silent, smart_card_atr_t *atr) {
     if (atr)
         memset(atr, 0, sizeof(smart_card_atr_t));
 
-    PacketCommandOLD c = {CMD_SMART_ATR, {0, 0, 0}, {{0}}};
     clearCommandBuffer();
-    SendCommand(&c);
+    SendCommandOLD(CMD_SMART_ATR, 0, 0, 0, NULL, 0);
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         if (!silent) PrintAndLogEx(WARNING, "smart card select failed");

From c7a4d7af3a651fadb13abb5d67e792919e932898 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 19 Apr 2019 23:15:02 +0200
Subject: [PATCH 1354/1938] Add ref to new mifaresim.h in standalone modes

---
 armsrc/Standalone/hf_colin.h    | 1 +
 armsrc/Standalone/hf_mattyrun.h | 1 +
 2 files changed, 2 insertions(+)

diff --git a/armsrc/Standalone/hf_colin.h b/armsrc/Standalone/hf_colin.h
index 251620626..c8f2ab8ed 100644
--- a/armsrc/Standalone/hf_colin.h
+++ b/armsrc/Standalone/hf_colin.h
@@ -19,6 +19,7 @@
 #include "proxmark3.h"
 #include "mifaresim.h"  // mifare1ksim
 #include "mifareutil.h"
+#include "mifaresim.h"
 #include "iso14443a.h"
 #include "protocols.h"
 #include "util.h"
diff --git a/armsrc/Standalone/hf_mattyrun.h b/armsrc/Standalone/hf_mattyrun.h
index c37624821..687979162 100644
--- a/armsrc/Standalone/hf_mattyrun.h
+++ b/armsrc/Standalone/hf_mattyrun.h
@@ -17,6 +17,7 @@
 #include "usb_cmd.h"    // mifare1ksim flags
 #include "mifaresim.h"  // mifare1ksim
 #include "mifareutil.h"
+#include "mifaresim.h"
 
 #define OPTS 2
 

From f500b452d95a1fb67104a4c3d09d79446a08f5b7 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 20 Apr 2019 00:33:31 +0200
Subject: [PATCH 1355/1938] document new frame format

---
 doc/new_frame_format.txt | 179 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 179 insertions(+)
 create mode 100644 doc/new_frame_format.txt

diff --git a/doc/new_frame_format.txt b/doc/new_frame_format.txt
new file mode 100644
index 000000000..8a33004e3
--- /dev/null
+++ b/doc/new_frame_format.txt
@@ -0,0 +1,179 @@
+
+A major change is the support of variable length frames between host and Proxmark3.
+This is a step especially important for usage over FPC/USART/BT.
+
+Old format
+==========
+
+Previously, frames were, in both directions like this:
+
+    uint64_t cmd;
+    uint64_t arg[3];
+    union {
+        uint8_t  asBytes[USB_CMD_DATA_SIZE];
+        uint32_t asDwords[USB_CMD_DATA_SIZE / 4];
+    } d;
+
+with USB_CMD_DATA_SIZE = 512 and there was no API abstraction, everybody was forging/parsing these frames.
+So the frame size was fixed, 544 bytes, even for simple ACKs.
+When snooping the USB transfers, we can observe the host is sending 544b Bulk USB frames while the Proxmark3 is limited by its internal buffers and is sending 128b, 128b, 128b, 128b, 32b, so in total 5 packets.
+
+New format
+==========
+
+Even if we make the payload part variable in the old format, we've still a minimum of 32 bytes per frame with fields arbitrarily large.
+So we designed a new format from scratch:
+
+For commands being sent to the Proxmark:
+
+    uint32_t magic;
+    uint16_t length;
+    uint16_t cmd;
+    uint8_t  data[length];
+    uint16_t crc;
+
+* magic:  arbitrary magic ("PM3a") to help re-sync if needed
+* length: length of the variable payload, 0 if none, max 512 (USB_CMD_DATA_SIZE) for now.
+* cmd:    as previously, on 16b as it's enough
+* data:   variable length payload
+* crc:    either an actual CRC (crc14a) or a Magic placeholder ("a3")
+
+For responses from the Proxmark:
+
+    uint32_t magic;
+    uint16_t length;
+    int16_t  status;
+    uint16_t cmd;
+    uint8_t  data[length];
+    uint16_t crc;
+
+* magic:  arbitrary magic ("PM3a") to help re-sync if needed
+* length: length of the variable payload, 0 if none, max 512 (USB_CMD_DATA_SIZE) for now.
+* status: a field to send back the status of the command execution
+* cmd:    as previously, on 16b as it's enough
+* data:   variable length payload
+* crc:    either an actual CRC (crc14a) or a Magic placeholder ("a3")
+
+We used to send an anonymous ACK, now we're replying with the corresponding command name and a status.
+CRC is optional and on reception, the magic "a3" is accepted as placeholder. If it's different then it's checked as a CRC.
+By default CRC is user over USART and is disabled over USB, on both directions.
+
+Internal structures used to handle these packets are:
+* PacketCommandNGPreamble
+* PacketCommandNGPostamble
+* PacketCommandNGRaw
+* PacketResponseNGPreamble
+* PacketResponseNGPostamble
+* PacketResponseNGRaw
+
+But they are abstracted from the developer view with a new API.
+
+Transition
+==========
+
+Because it's a long transition to clean all the code from the old format and because we don't want to break stuffs when flashing the bootloader, the old frames are still supported together with the new frames. The old structure is now called PacketCommandOLD and PacketResponseOLD and it's also abstracted from the developer view with the new API.
+
+New format API
+==============
+
+So the new API is a merge of the old and the new frame formats, to ensure a smooth transition.
+The boolean "ng" indicates if the structure is storing data from the old or the new format.
+After the full transition, we might remove the fields "oldarg" and "ng".
+
+typedef struct {
+    uint16_t cmd;
+    uint16_t length;
+    uint32_t magic;      //  NG
+    uint16_t crc;        //  NG
+    uint64_t oldarg[3];  //  OLD
+    union {
+        uint8_t  asBytes[USB_CMD_DATA_SIZE];
+        uint32_t asDwords[USB_CMD_DATA_SIZE / 4];
+    } data;
+    bool ng;             // does it store NG data or OLD data?
+} PACKED PacketCommandNG;
+
+typedef struct {
+    uint16_t cmd;
+    uint16_t length;
+    uint32_t magic;      //  NG
+    int16_t  status;     //  NG
+    uint16_t crc;        //  NG
+    uint64_t oldarg[3];  //  OLD
+    union {
+        uint8_t  asBytes[USB_CMD_DATA_SIZE];
+        uint32_t asDwords[USB_CMD_DATA_SIZE / 4];
+    } data;
+    bool ng;             // does it store NG data or OLD data?
+} PACKED PacketResponseNG;
+
+
+On the client, for sending frames:
+----------------------------------
+(client->comms.c)
+*****************************************
+void SendCommandNG(uint16_t cmd, uint8_t *data, size_t len);
+void SendCommandOLD(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
+*****************************************
+
+So cmds should make the transition from SendCommandOLD to SendCommandNG to benefit from smaller frames (and armsrc handlers adjusted accordingly of course).
+
+Internally these functions prepare the new or old frames and call uart_communication which calls uart_send.
+
+On the Proxmark3, for receiving frames:
+---------------------------------------
+(armsrc/appmain.c)
+*****************************************
+PacketCommandNG
+*****************************************
+AppMain calls receive_ng(common/cmd.c) which calls usb_read_ng to get a PacketCommandNG, then passes it to PacketReceived.
+(no matter if it's an old frame or a new frame, check PacketCommandNG "ng" field to know)
+PacketReceive is the commands broker.
+Old handlers will still find their stuff in "oldarg" field.
+
+TODO AppMain still calls directly usart_readbuffer for USART and does not support new frames on USART.
+
+
+On the Proxmark3, for sending frames:
+-------------------------------------
+(common/cmd.c)
+*****************************************
+int16_t reply_ng(uint16_t cmd, int16_t status, uint8_t *data, size_t len)
+int16_t reply_old(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len)
+*****************************************
+
+So replies should make the transition from reply_old to reply_ng to benefit from smaller frames (and client reception adjusted accordingly of course).
+
+Example with CMD_PING that supports both styles (from client CmdPing or CmdPingNG) and replies with the new frame format when it receives new command format:
+    if (packet->ng) {
+        reply_ng(CMD_PING, PM3_SUCCESS, packet->data.asBytes, packet->length);
+    } else {
+        reply_old(CMD_ACK, reply_via_fpc, 0, 0, 0, 0);
+    }
+
+On the client, for receiving frames:
+------------------------------------
+(client->comms.c)
+*****************************************
+WaitForResponseTimeout -> PacketResponseNG
+*****************************************
+uart_communication calls uart_receive and create a PacketResponseNG, then passes it to PacketResponseReceived.
+PacketResponseReceived treats it immediately (prints) or stores it with storeReply.
+Commands do WaitForResponseTimeoutW (or dl_it) which uses getReply to fetch responses.
+
+API transition
+==============
+
+In short, to mode from one format to the other, we need for each command:
+
+* (client TX) SendCommandOLD -> SendCommandNG (with all stuff in ad-hoc structs in "data" field)
+* (pm3 RX) PacketCommandNG parsing, from "oldarg" to only the "data" field
+* (pm3 TX) reply_old -> reply_ng (with all stuff in ad-hoc structs in "data" field)
+* (client RX) PacketResponseNG parsing, from "oldarg" to only the "data" field
+
+Bootrom
+=======
+TODO
+We need to be very careful to make a flasher that can deal with old & new bootroms.
+New bootrom might need to also still support old frame format, to ease flashing back to repos supporting the old format...
+

From 238fc10c9a7ab05c4be565db5fca3c533c1c39c9 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 20 Apr 2019 01:08:07 +0200
Subject: [PATCH 1356/1938] style

---
 client/cmdhf14a.c          | 2 +-
 client/cmdhffelica.c       | 2 +-
 client/cmdhfmfdes.c        | 2 +-
 client/cmdhfmfu.c          | 2 +-
 client/cmdlf.c             | 2 +-
 client/flash.c             | 2 +-
 client/hid-flasher/flash.c | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index d3298a8ee..e6ad488bd 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -481,7 +481,7 @@ int CmdHF14ASim(const char *Cmd) {
         flags |= FLAG_UID_IN_EMUL;
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_SIMULATE_TAG_ISO_14443a,  tagtype, flags, 0 , uid, uidlen >> 1);
+    SendCommandOLD(CMD_SIMULATE_TAG_ISO_14443a,  tagtype, flags, 0, uid, uidlen >> 1);
     PacketResponseNG resp;
 
     PrintAndLogEx(SUCCESS, "press pm3-button to abort simulation");
diff --git a/client/cmdhffelica.c b/client/cmdhffelica.c
index aa3aa0499..68c0cfb5b 100644
--- a/client/cmdhffelica.c
+++ b/client/cmdhffelica.c
@@ -129,7 +129,7 @@ static int CmdHFFelicaSim(const char *Cmd) {
     if (errors || cmdp == 0) return usage_hf_felica_sim();
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_FELICA_SIMULATE_TAG,  tagtype, flags, 0 , uid, uidlen >> 1);
+    SendCommandOLD(CMD_FELICA_SIMULATE_TAG,  tagtype, flags, 0, uid, uidlen >> 1);
     PacketResponseNG resp;
 
     if (verbose)
diff --git a/client/cmdhfmfdes.c b/client/cmdhfmfdes.c
index 4ca2589f9..62f328acc 100644
--- a/client/cmdhfmfdes.c
+++ b/client/cmdhfmfdes.c
@@ -599,7 +599,7 @@ static int CmdHF14ADesAuth(const char *Cmd) {
     uint8_t data[25] = {keylength}; // max length: 1 + 24 (3k3DES)
     memcpy(data + 1, key, keylength);
     clearCommandBuffer();
-    SendCommandOLD(CMD_MIFARE_DESFIRE_AUTH1, cmdAuthMode, cmdAuthAlgo, cmdKeyNo, data, keylength+1);
+    SendCommandOLD(CMD_MIFARE_DESFIRE_AUTH1, cmdAuthMode, cmdAuthAlgo, cmdKeyNo, data, keylength + 1);
     PacketResponseNG resp;
 
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 3000)) {
diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index e69f6a996..fcfa4b85e 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -618,7 +618,7 @@ static int ul_fudan_check(void) {
 
     uint8_t cmd[4] = {0x30, 0x00, 0x02, 0xa7}; //wrong crc on purpose  should be 0xa8
     clearCommandBuffer();
-    SendCommandOLD(CMD_READER_ISO_14443a,ISO14A_RAW | ISO14A_NO_DISCONNECT | ISO14A_NO_RATS, 4, 0, cmd, sizeof(cmd));
+    SendCommandOLD(CMD_READER_ISO_14443a, ISO14A_RAW | ISO14A_NO_DISCONNECT | ISO14A_NO_RATS, 4, 0, cmd, sizeof(cmd));
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return UL_ERROR;
     if (resp.oldarg[0] != 1) return UL_ERROR;
diff --git a/client/cmdlf.c b/client/cmdlf.c
index eb82e6bfe..adc1a8a63 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -151,7 +151,7 @@ int CmdLFCommandRead(const char *Cmd) {
     uint32_t arg2 = 0;
     uint8_t data[USB_CMD_DATA_SIZE];
     uint16_t datalen = 0;
-    
+
     uint8_t cmdp = 0;
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
diff --git a/client/flash.c b/client/flash.c
index 366c7094c..17add5777 100644
--- a/client/flash.c
+++ b/client/flash.c
@@ -361,7 +361,7 @@ int flash_start_flashing(int enable_bl_writes, char *serial_port_name) {
         if (enable_bl_writes) {
             SendCommandOLD(CMD_START_FLASH, FLASH_START, FLASH_END, START_FLASH_MAGIC, NULL, 0);
         } else {
-            SendCommandOLD(CMD_START_FLASH,BOOTLOADER_END, FLASH_END, 0, NULL, 0);
+            SendCommandOLD(CMD_START_FLASH, BOOTLOADER_END, FLASH_END, 0, NULL, 0);
         }
         return wait_for_ack(&resp);
     } else {
diff --git a/client/hid-flasher/flash.c b/client/hid-flasher/flash.c
index 6c8fc808d..1aece96d9 100644
--- a/client/hid-flasher/flash.c
+++ b/client/hid-flasher/flash.c
@@ -358,7 +358,7 @@ int flash_start_flashing(int enable_bl_writes) {
         if (enable_bl_writes) {
             SendCommandOLD(CMD_START_FLASH, FLASH_START, FLASH_END, START_FLASH_MAGIC, NULL, 0);
         } else {
-            SendCommandOLD(CMD_START_FLASH,BOOTLOADER_END, FLASH_END, 0, NULL, 0);
+            SendCommandOLD(CMD_START_FLASH, BOOTLOADER_END, FLASH_END, 0, NULL, 0);
         }
         return wait_for_ack();
     } else {

From a45238236daa65c3022478511c12b7021d511e9a Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 20 Apr 2019 01:47:50 +0200
Subject: [PATCH 1357/1938] armsrc: put new frame parsing in common for usart
 (still usart_read_ng to do)

---
 armsrc/appmain.c  | 27 ++++++---------------------
 common/cmd.c      | 30 +++++++++++++++++++++++-------
 common/usart.c    |  5 +++++
 common/usart.h    |  1 +
 include/usb_cmd.h |  2 ++
 5 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index d453fe01e..3d205ac11 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1562,30 +1562,15 @@ void  __attribute__((noreturn)) AppMain(void) {
     for (;;) {
         WDT_HIT();
 
-        // Check if there is a usb packet available
-        if (usb_poll_validate_length()) {
-            PacketCommandNG rx;
-            if (receive_ng(&rx) == PM3_SUCCESS) {
-                PacketReceived(&rx);
-            } else {
-                Dbprintf("Error in frame reception");
-                // TODO DOEGOX if error, shall we resync ?
-            }
-        }
-#ifdef WITH_FPC_HOST
-        // Check if there is a FPC packet available
-// TODO DOEGOX NG packets support here too
+        // Check if there is a packet available
         PacketCommandNG rx;
-        if (usart_readbuffer((uint8_t *)&rx)) {
-            reply_via_fpc = true;
-            rx.ng = false;
-            rx.magic = 0;
-            rx.length = USB_CMD_DATA_SIZE;
-            rx.crc = 0;
+        int16_t ret = receive_ng(&rx);
+        if (ret == PM3_SUCCESS) {
             PacketReceived(&rx);
+        } else if (ret != PM3_NODATA) {
+            Dbprintf("Error in frame reception");
+            // TODO DOEGOX if error, shall we resync ?
         }
-        usart_readcheck((uint8_t *)&rx, sizeof(rx));
-#endif
 
         // Press button for one second to enter a possible standalone mode
         if (BUTTON_HELD(1000) > 0) {
diff --git a/common/cmd.c b/common/cmd.c
index f2dbe5b31..b08d88589 100644
--- a/common/cmd.c
+++ b/common/cmd.c
@@ -135,9 +135,11 @@ int16_t reply_ng(uint16_t cmd, int16_t status, uint8_t *data, size_t len) {
     return sendlen;
 }
 
-int16_t receive_ng(PacketCommandNG *rx) {
+static int16_t receive_ng_internal(PacketCommandNG *rx, uint32_t read_ng(uint8_t *data, size_t len), bool fpc) {
     PacketCommandNGRaw rx_raw;
-    size_t bytes = usb_read_ng((uint8_t *)&rx_raw.pre, sizeof(PacketCommandNGPreamble));
+    size_t bytes = read_ng((uint8_t *)&rx_raw.pre, sizeof(PacketCommandNGPreamble));
+    if (bytes == 0)
+        return PM3_NODATA;
     if (bytes != sizeof(PacketCommandNGPreamble))
         return PM3_EIO;
     rx->magic = rx_raw.pre.magic;
@@ -147,12 +149,12 @@ int16_t receive_ng(PacketCommandNG *rx) {
         if (rx->length > USB_CMD_DATA_SIZE)
             return PM3_EOVFLOW;
         // Get the core and variable length payload
-        bytes = usb_read_ng((uint8_t *)&rx_raw.data, rx->length);
+        bytes = read_ng((uint8_t *)&rx_raw.data, rx->length);
         if (bytes != rx->length)
             return PM3_EIO;
         memcpy(rx->data.asBytes, rx_raw.data, rx->length);
         // Get the postamble
-        bytes = usb_read_ng((uint8_t *)&rx_raw.foopost, sizeof(PacketCommandNGPostamble));
+        bytes = read_ng((uint8_t *)&rx_raw.foopost, sizeof(PacketCommandNGPostamble));
         if (bytes != sizeof(PacketCommandNGPostamble))
             return PM3_EIO;
         // Check CRC, accept MAGIC as placeholder
@@ -163,15 +165,15 @@ int16_t receive_ng(PacketCommandNG *rx) {
             if ((first << 8) + second != rx->crc)
                 return PM3_EIO;
         }
-        reply_via_fpc = false;
+        reply_via_fpc = fpc;
         rx->ng = true;
     } else {                               // Old style command
         PacketCommandOLD rx_old;
         memcpy(&rx_old, &rx_raw.pre, sizeof(PacketCommandNGPreamble));
-        bytes = usb_read_ng(((uint8_t *)&rx_old) + sizeof(PacketCommandNGPreamble), sizeof(PacketCommandOLD) - sizeof(PacketCommandNGPreamble));
+        bytes = read_ng(((uint8_t *)&rx_old) + sizeof(PacketCommandNGPreamble), sizeof(PacketCommandOLD) - sizeof(PacketCommandNGPreamble));
         if (bytes != sizeof(PacketCommandOLD) - sizeof(PacketCommandNGPreamble))
             return PM3_EIO;
-        reply_via_fpc = false;
+        reply_via_fpc = fpc;
         rx->ng = false;
         rx->magic = 0;
         rx->crc = 0;
@@ -184,3 +186,17 @@ int16_t receive_ng(PacketCommandNG *rx) {
     }
     return PM3_SUCCESS;
 }
+
+int16_t receive_ng(PacketCommandNG *rx) {
+
+    // Check if there is a packet available
+    if (usb_poll_validate_length())
+        return receive_ng_internal(rx, usb_read_ng, false);
+
+#ifdef WITH_FPC_HOST
+    // Check if there is a FPC packet available
+    return receive_ng_internal(rx, usart_read_ng, true);
+#else
+    return PM3_NODATA;
+#endif
+}
diff --git a/common/usart.c b/common/usart.c
index 9ac1b2c8d..928a0ee14 100644
--- a/common/usart.c
+++ b/common/usart.c
@@ -100,6 +100,11 @@ inline int16_t usart_readcommand(uint8_t *data) {
     return 0;
 }
 
+uint32_t usart_read_ng(uint8_t *data, size_t len) {
+    // TODO DOEGOX
+    return 0;
+}
+
 inline bool usart_commandavailable(void) {
     return (pUS1->US_RCR == 0);
 }
diff --git a/common/usart.h b/common/usart.h
index 9200d8731..16d0d8773 100644
--- a/common/usart.h
+++ b/common/usart.h
@@ -14,6 +14,7 @@ int16_t usart_writebuffer(uint8_t *data, size_t len);
 bool usart_dataavailable(void);
 int16_t usart_readcommand(uint8_t *data);
 void usart_readcheck(uint8_t *data, size_t len);
+uint32_t usart_read_ng(uint8_t *data, size_t len);
 
 bool usart_commandavailable(void);
 #endif
diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index 9e060e80c..09b864a28 100644
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -421,6 +421,8 @@ typedef struct {
 #define PM3_EMALLOC           -12
 // File error
 #define PM3_EFILE             -13
+// No data
+#define PM3_NODATA            -98
 // Quit program
 #define PM3_EFATAL            -99
 

From 95822d83602f64f63c70343bd48c2f4ff22a5ba0 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 20 Apr 2019 01:49:37 +0200
Subject: [PATCH 1358/1938] minor

---
 client/comms.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/client/comms.c b/client/comms.c
index a7f9ad42a..dfc9e9863 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -219,9 +219,8 @@ static int getReply(PacketResponseNG *packet) {
 //-----------------------------------------------------------------------------
 static void PacketResponseReceived(PacketResponseNG *packet) {
 
-//DOEGOX
-//PrintAndLogEx(NORMAL, "RECV %s magic %08x length %04x status %04x crc %04x cmd %04x",
-//              packet->ng ? "NG" : "OLD", packet->magic, packet->length, packet->status, packet->crc, packet->cmd);
+//  PrintAndLogEx(NORMAL, "RECV %s magic %08x length %04x status %04x crc %04x cmd %04x",
+//                packet->ng ? "NG" : "OLD", packet->magic, packet->length, packet->status, packet->crc, packet->cmd);
 
     switch (packet->cmd) {
         // First check if we are handling a debug message

From 3bcf80bb34038c527aad4b0ac2ddf4e70c9363b4 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 20 Apr 2019 02:41:40 +0200
Subject: [PATCH 1359/1938] Introduce SendCommandMIX, to still get some varlen
 on old API

---
 client/cmdhw.c    |  2 +-
 client/comms.c    | 22 ++++++++++++++++++++--
 client/comms.h    |  1 +
 common/cmd.c      | 15 +++++++++++++--
 include/usb_cmd.h |  3 ++-
 5 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/client/cmdhw.c b/client/cmdhw.c
index e2a483ef2..8c687e232 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -425,7 +425,7 @@ static int CmdPing(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     clearCommandBuffer();
     PacketResponseNG resp;
-    SendCommandOLD(CMD_PING, 0, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_PING, 0, 0, 0, NULL, 0);
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1000))
         PrintAndLogEx(NORMAL, "Ping " _GREEN_("successful"));
     else
diff --git a/client/comms.c b/client/comms.c
index dfc9e9863..9b5dd1c26 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -106,8 +106,7 @@ void SendCommandOLD(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, v
     SendCommand(&c);
 }
 
-void SendCommandNG(uint16_t cmd, uint8_t *data, size_t len) {
-
+static void SendCommandNG_internal(uint16_t cmd, uint8_t *data, size_t len, bool ng) {
 #ifdef COMMS_DEBUG
     PrintAndLogEx(NORMAL, "Sending %d bytes of payload | cmd %04x\n", len, cmd);
 #endif
@@ -134,6 +133,7 @@ void SendCommandNG(uint16_t cmd, uint8_t *data, size_t len) {
     }
 
     txBufferNG.pre.magic = COMMANDNG_PREAMBLE_MAGIC;
+    txBufferNG.pre.ng = ng;
     txBufferNG.pre.length = len;
     txBufferNG.pre.cmd = cmd;
     memcpy(&txBufferNG.data, data, len);
@@ -158,6 +158,24 @@ void SendCommandNG(uint16_t cmd, uint8_t *data, size_t len) {
 //__atomic_test_and_set(&txcmd_pending, __ATOMIC_SEQ_CST);
 }
 
+void SendCommandNG(uint16_t cmd, uint8_t *data, size_t len) {
+    SendCommandNG_internal(cmd, data, len, true);
+}
+
+void SendCommandMIX(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len) {
+    uint64_t arg[3] = {arg0, arg1, arg2};
+    if (len > USB_CMD_DATA_SIZE - sizeof(arg)) {
+        PrintAndLogEx(WARNING, "Sending %d bytes of payload is too much for MIX frames, abort", len);
+        return;
+    }
+    uint8_t cmddata[USB_CMD_DATA_SIZE];
+    memcpy(cmddata, arg, sizeof(arg));
+    if (len && data)
+        memcpy(cmddata + sizeof(arg), data, len);
+    SendCommandNG_internal(cmd, cmddata, len + sizeof(arg), false);
+}
+
+
 /**
  * @brief This method should be called when sending a new command to the pm3. In case any old
  *  responses from previous commands are stored in the buffer, a call to this method should clear them.
diff --git a/client/comms.h b/client/comms.h
index 6034a5741..c70a67c51 100644
--- a/client/comms.h
+++ b/client/comms.h
@@ -57,6 +57,7 @@ void *uart_receiver(void *targ);
 void SendCommand(PacketCommandOLD *c);
 void SendCommandOLD(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
 void SendCommandNG(uint16_t cmd, uint8_t *data, size_t len);
+void SendCommandMIX(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
 void clearCommandBuffer(void);
 
 #define FLASHMODE_SPEED 460800
diff --git a/common/cmd.c b/common/cmd.c
index b08d88589..e9736a241 100644
--- a/common/cmd.c
+++ b/common/cmd.c
@@ -143,6 +143,7 @@ static int16_t receive_ng_internal(PacketCommandNG *rx, uint32_t read_ng(uint8_t
     if (bytes != sizeof(PacketCommandNGPreamble))
         return PM3_EIO;
     rx->magic = rx_raw.pre.magic;
+    rx->ng = rx_raw.pre.ng;
     rx->length = rx_raw.pre.length;
     rx->cmd = rx_raw.pre.cmd;
     if (rx->magic == COMMANDNG_PREAMBLE_MAGIC) { // New style NG command
@@ -152,7 +153,18 @@ static int16_t receive_ng_internal(PacketCommandNG *rx, uint32_t read_ng(uint8_t
         bytes = read_ng((uint8_t *)&rx_raw.data, rx->length);
         if (bytes != rx->length)
             return PM3_EIO;
-        memcpy(rx->data.asBytes, rx_raw.data, rx->length);
+        if (rx->ng)
+            memcpy(rx->data.asBytes, rx_raw.data, rx->length);
+        else {
+            uint64_t arg[3];
+            if (rx->length < sizeof(arg))
+                return PM3_EIO;
+            memcpy(arg, rx_raw.data, sizeof(arg));
+            rx->oldarg[0] = arg[0];
+            rx->oldarg[1] = arg[1];
+            rx->oldarg[2] = arg[2];
+            memcpy(rx->data.asBytes, rx_raw.data + sizeof(arg), rx->length - sizeof(arg));
+        }
         // Get the postamble
         bytes = read_ng((uint8_t *)&rx_raw.foopost, sizeof(PacketCommandNGPostamble));
         if (bytes != sizeof(PacketCommandNGPostamble))
@@ -166,7 +178,6 @@ static int16_t receive_ng_internal(PacketCommandNG *rx, uint32_t read_ng(uint8_t
                 return PM3_EIO;
         }
         reply_via_fpc = fpc;
-        rx->ng = true;
     } else {                               // Old style command
         PacketCommandOLD rx_old;
         memcpy(&rx_old, &rx_raw.pre, sizeof(PacketCommandNGPreamble));
diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index 09b864a28..6ff7f1241 100644
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -37,7 +37,8 @@ typedef struct {
 
 typedef struct {
     uint32_t magic;
-    uint16_t length;  // length of the variable part, 0 if none.
+    uint16_t length : 15;  // length of the variable part, 0 if none.
+    bool ng : 1;
     uint16_t cmd;
 } PACKED PacketCommandNGPreamble;
 

From a7773b339539e1b8198edbfef925cfbb702ba10d Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 20 Apr 2019 03:17:19 +0200
Subject: [PATCH 1360/1938] Introduce reply_mix, to still get some varlen on
 old API

---
 armsrc/appmain.c  |  2 +-
 client/comms.c    | 37 ++++++++++++++++++++++++++++---------
 common/cmd.c      | 43 ++++++++++++++++++++++++++++++++-----------
 common/cmd.h      |  1 +
 include/usb_cmd.h |  3 ++-
 5 files changed, 64 insertions(+), 22 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 3d205ac11..69de9f1a6 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1452,7 +1452,7 @@ static void PacketReceived(PacketCommandNG *packet) {
             if (packet->ng) {
                 reply_ng(CMD_PING, PM3_SUCCESS, packet->data.asBytes, packet->length);
             } else {
-                reply_old(CMD_ACK, reply_via_fpc, 0, 0, 0, 0);
+                reply_mix(CMD_ACK, reply_via_fpc, 0, 0, 0, 0);
             }
             break;
 #ifdef WITH_LCD
diff --git a/client/comms.c b/client/comms.c
index 9b5dd1c26..59215a299 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -335,20 +335,40 @@ __attribute__((force_align_arg_pointer))
         bool error = false;
         if (uart_receive(sp, (uint8_t *)&rx_raw.pre, sizeof(PacketResponseNGPreamble), &rxlen) && (rxlen == sizeof(PacketResponseNGPreamble))) {
             rx.magic = rx_raw.pre.magic;
-            rx.length = rx_raw.pre.length;
+            uint16_t length = rx_raw.pre.length;
+            rx.ng = rx_raw.pre.ng;
             rx.status = rx_raw.pre.status;
             rx.cmd = rx_raw.pre.cmd;
             if (rx.magic == RESPONSENG_PREAMBLE_MAGIC) { // New style NG reply
-                if (rx.length > USB_CMD_DATA_SIZE) {
-                    PrintAndLogEx(WARNING, "Received packet frame with incompatible length: 0x%04x", rx.length);
+                if (length > USB_CMD_DATA_SIZE) {
+                    PrintAndLogEx(WARNING, "Received packet frame with incompatible length: 0x%04x", length);
                     error = true;
                 }
-                if ((!error) && (rx.length > 0)) { // Get the variable length payload
-                    if ((!uart_receive(sp, (uint8_t *)&rx_raw.data, rx.length, &rxlen)) || (rxlen != rx.length)) {
-                        PrintAndLogEx(WARNING, "Received packet frame error variable part too short? %d/%d", rxlen, rx.length);
+                if ((!error) && (length > 0)) { // Get the variable length payload
+                    if ((!uart_receive(sp, (uint8_t *)&rx_raw.data, length, &rxlen)) || (rxlen != length)) {
+                        PrintAndLogEx(WARNING, "Received packet frame error variable part too short? %d/%d", rxlen, length);
                         error = true;
                     } else {
-                        memcpy(&rx.data, &rx_raw.data, rx.length);
+
+
+                        if (rx.ng) {
+                            memcpy(&rx.data, &rx_raw.data, length);
+                            rx.length = length;
+                        } else {
+                            uint64_t arg[3];
+                            if (length < sizeof(arg)) {
+                                PrintAndLogEx(WARNING, "Received MIX packet frame with incompatible length: 0x%04x", length);
+                                error = true;
+                            }
+                            if (!error) {
+                                memcpy(arg, &rx_raw.data, sizeof(arg));
+                                rx.oldarg[0] = arg[0];
+                                rx.oldarg[1] = arg[1];
+                                rx.oldarg[2] = arg[2];
+                                memcpy(&rx.data, ((uint8_t *)&rx_raw.data) + sizeof(arg), length - sizeof(arg));
+                                rx.length = length - sizeof(arg);
+                            }
+                        }
                     }
                 }
                 if (!error) {                        // Get the postamble
@@ -361,7 +381,7 @@ __attribute__((force_align_arg_pointer))
                     rx.crc = rx_raw.foopost.crc;
                     if (rx.crc != RESPONSENG_POSTAMBLE_MAGIC) {
                         uint8_t first, second;
-                        compute_crc(CRC_14443_A, (uint8_t *)&rx_raw, sizeof(PacketResponseNGPreamble) + rx.length, &first, &second);
+                        compute_crc(CRC_14443_A, (uint8_t *)&rx_raw, sizeof(PacketResponseNGPreamble) + length, &first, &second);
                         if ((first << 8) + second != rx.crc) {
                             PrintAndLogEx(WARNING, "Received packet frame CRC error %02X%02X <> %04X", first, second, rx.crc);
                             error = true;
@@ -370,7 +390,6 @@ __attribute__((force_align_arg_pointer))
                 }
                 if (!error) {
 //                    PrintAndLogEx(NORMAL, "Received reply NG full !!");
-                    rx.ng = true;
                     PacketResponseReceived(&rx);
 //TODO DOEGOX NG don't send ACK anymore but reply with the corresponding cmd, still things seem to work fine...
                     if (rx.cmd == CMD_ACK) {
diff --git a/common/cmd.c b/common/cmd.c
index e9736a241..83e48895e 100644
--- a/common/cmd.c
+++ b/common/cmd.c
@@ -84,7 +84,7 @@ int16_t reply_old(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, voi
     return sendlen;
 }
 
-int16_t reply_ng(uint16_t cmd, int16_t status, uint8_t *data, size_t len) {
+static int16_t reply_ng_internal(uint16_t cmd, int16_t status, uint8_t *data, size_t len, bool ng) {
     PacketResponseNGRaw txBufferNG;
     size_t txBufferNGLen;
 //    for (size_t i = 0; i < sizeof(txBufferNG); i++)
@@ -94,6 +94,7 @@ int16_t reply_ng(uint16_t cmd, int16_t status, uint8_t *data, size_t len) {
     txBufferNG.pre.magic = RESPONSENG_PREAMBLE_MAGIC;
     txBufferNG.pre.cmd = cmd;
     txBufferNG.pre.status = status;
+    txBufferNG.pre.ng = ng;
     if (len > USB_CMD_DATA_SIZE) {
         len = USB_CMD_DATA_SIZE;
         // overwrite status
@@ -135,6 +136,24 @@ int16_t reply_ng(uint16_t cmd, int16_t status, uint8_t *data, size_t len) {
     return sendlen;
 }
 
+int16_t reply_ng(uint16_t cmd, int16_t status, uint8_t *data, size_t len) {
+    return reply_ng_internal(cmd, status, data, len, true);
+}
+
+int16_t reply_mix(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len) {
+    uint16_t status = PM3_SUCCESS;
+    uint64_t arg[3] = {arg0, arg1, arg2};
+    if (len > USB_CMD_DATA_SIZE - sizeof(arg)) {
+        len = USB_CMD_DATA_SIZE - sizeof(arg);
+        status = PM3_EOVFLOW;
+    }
+    uint8_t cmddata[USB_CMD_DATA_SIZE];
+    memcpy(cmddata, arg, sizeof(arg));
+    if (len && data)
+        memcpy(cmddata + sizeof(arg), data, len);
+    return reply_ng_internal(cmd, status, cmddata, len + sizeof(arg), false);
+}
+
 static int16_t receive_ng_internal(PacketCommandNG *rx, uint32_t read_ng(uint8_t *data, size_t len), bool fpc) {
     PacketCommandNGRaw rx_raw;
     size_t bytes = read_ng((uint8_t *)&rx_raw.pre, sizeof(PacketCommandNGPreamble));
@@ -144,26 +163,28 @@ static int16_t receive_ng_internal(PacketCommandNG *rx, uint32_t read_ng(uint8_t
         return PM3_EIO;
     rx->magic = rx_raw.pre.magic;
     rx->ng = rx_raw.pre.ng;
-    rx->length = rx_raw.pre.length;
+    uint16_t length = rx_raw.pre.length;
     rx->cmd = rx_raw.pre.cmd;
     if (rx->magic == COMMANDNG_PREAMBLE_MAGIC) { // New style NG command
-        if (rx->length > USB_CMD_DATA_SIZE)
+        if (length > USB_CMD_DATA_SIZE)
             return PM3_EOVFLOW;
         // Get the core and variable length payload
-        bytes = read_ng((uint8_t *)&rx_raw.data, rx->length);
-        if (bytes != rx->length)
+        bytes = read_ng((uint8_t *)&rx_raw.data, length);
+        if (bytes != length)
             return PM3_EIO;
-        if (rx->ng)
-            memcpy(rx->data.asBytes, rx_raw.data, rx->length);
-        else {
+        if (rx->ng) {
+            memcpy(rx->data.asBytes, rx_raw.data, length);
+            rx->length = length;
+        } else {
             uint64_t arg[3];
-            if (rx->length < sizeof(arg))
+            if (length < sizeof(arg))
                 return PM3_EIO;
             memcpy(arg, rx_raw.data, sizeof(arg));
             rx->oldarg[0] = arg[0];
             rx->oldarg[1] = arg[1];
             rx->oldarg[2] = arg[2];
-            memcpy(rx->data.asBytes, rx_raw.data + sizeof(arg), rx->length - sizeof(arg));
+            memcpy(rx->data.asBytes, rx_raw.data + sizeof(arg), length - sizeof(arg));
+            rx->length = length - sizeof(arg);
         }
         // Get the postamble
         bytes = read_ng((uint8_t *)&rx_raw.foopost, sizeof(PacketCommandNGPostamble));
@@ -173,7 +194,7 @@ static int16_t receive_ng_internal(PacketCommandNG *rx, uint32_t read_ng(uint8_t
         rx->crc = rx_raw.foopost.crc;
         if (rx->crc != COMMANDNG_POSTAMBLE_MAGIC) {
             uint8_t first, second;
-            compute_crc(CRC_14443_A, (uint8_t *)&rx_raw, sizeof(PacketCommandNGPreamble) + rx->length, &first, &second);
+            compute_crc(CRC_14443_A, (uint8_t *)&rx_raw, sizeof(PacketCommandNGPreamble) + length, &first, &second);
             if ((first << 8) + second != rx->crc)
                 return PM3_EIO;
         }
diff --git a/common/cmd.h b/common/cmd.h
index ae9d95e46..4c9d6b1d1 100644
--- a/common/cmd.h
+++ b/common/cmd.h
@@ -41,6 +41,7 @@
 
 int16_t reply_old(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
 int16_t reply_ng(uint16_t cmd, int16_t status, uint8_t *data, size_t len);
+int16_t reply_mix(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
 int16_t receive_ng(PacketCommandNG *rx);
 
 // Flags to tell where to add CRC on sent replies
diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index 6ff7f1241..316c99c3c 100644
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -81,7 +81,8 @@ typedef struct {
 
 typedef struct {
     uint32_t magic;
-    uint16_t length;  // length of the variable part, 0 if none.
+    uint16_t length : 15;  // length of the variable part, 0 if none.
+    bool ng : 1;
     int16_t  status;
     uint16_t cmd;
 } PACKED PacketResponseNGPreamble;

From c7ada019bfd0421b34cfb85285d2aff2560a06ac Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 20 Apr 2019 03:29:44 +0200
Subject: [PATCH 1361/1938] update new frames doc with MIX frames

---
 doc/new_frame_format.txt | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/doc/new_frame_format.txt b/doc/new_frame_format.txt
index 8a33004e3..d4b16efd4 100644
--- a/doc/new_frame_format.txt
+++ b/doc/new_frame_format.txt
@@ -27,13 +27,15 @@ So we designed a new format from scratch:
 For commands being sent to the Proxmark:
 
     uint32_t magic;
-    uint16_t length;
+    uint16_t length : 15;
+    bool ng : 1;
     uint16_t cmd;
     uint8_t  data[length];
     uint16_t crc;
 
 * magic:  arbitrary magic ("PM3a") to help re-sync if needed
 * length: length of the variable payload, 0 if none, max 512 (USB_CMD_DATA_SIZE) for now.
+* ng:     flag to tell if the data is following the new format (ng) or the old one, see transition notes below
 * cmd:    as previously, on 16b as it's enough
 * data:   variable length payload
 * crc:    either an actual CRC (crc14a) or a Magic placeholder ("a3")
@@ -41,7 +43,8 @@ For commands being sent to the Proxmark:
 For responses from the Proxmark:
 
     uint32_t magic;
-    uint16_t length;
+    uint16_t length : 15;
+    bool ng : 1;
     int16_t  status;
     uint16_t cmd;
     uint8_t  data[length];
@@ -49,6 +52,7 @@ For responses from the Proxmark:
 
 * magic:  arbitrary magic ("PM3a") to help re-sync if needed
 * length: length of the variable payload, 0 if none, max 512 (USB_CMD_DATA_SIZE) for now.
+* ng:     flag to tell if the data is following the new format (ng) or the old one, see transition notes below
 * status: a field to send back the status of the command execution
 * cmd:    as previously, on 16b as it's enough
 * data:   variable length payload
@@ -78,6 +82,7 @@ New format API
 
 So the new API is a merge of the old and the new frame formats, to ensure a smooth transition.
 The boolean "ng" indicates if the structure is storing data from the old or the new format.
+Old format can come from either old 544b frames or mixed frames (variable length but still with oldargs).
 After the full transition, we might remove the fields "oldarg" and "ng".
 
 typedef struct {
@@ -114,9 +119,11 @@ On the client, for sending frames:
 *****************************************
 void SendCommandNG(uint16_t cmd, uint8_t *data, size_t len);
 void SendCommandOLD(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
+void SendCommandMIX(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
 *****************************************
 
 So cmds should make the transition from SendCommandOLD to SendCommandNG to benefit from smaller frames (and armsrc handlers adjusted accordingly of course).
+SendCommandMIX is a transition fct: it uses the same API as SendCommandOLD but benefits somehow from variable length frames. It occupies at least 24b of data for the oldargs and real data is therefore limited to USB_CMD_DATA_SIZE - 24. Besides the size limitation, the receiver handler doesn't know if this was an OLD frame or a MIX frame, it gets its oldargs and data as usual.
 
 Internally these functions prepare the new or old frames and call uart_communication which calls uart_send.
 
@@ -127,7 +134,7 @@ On the Proxmark3, for receiving frames:
 PacketCommandNG
 *****************************************
 AppMain calls receive_ng(common/cmd.c) which calls usb_read_ng to get a PacketCommandNG, then passes it to PacketReceived.
-(no matter if it's an old frame or a new frame, check PacketCommandNG "ng" field to know)
+(no matter if it's an old frame or a new frame, check PacketCommandNG "ng" field to know if there are oldargs)
 PacketReceive is the commands broker.
 Old handlers will still find their stuff in "oldarg" field.
 
@@ -140,15 +147,18 @@ On the Proxmark3, for sending frames:
 *****************************************
 int16_t reply_ng(uint16_t cmd, int16_t status, uint8_t *data, size_t len)
 int16_t reply_old(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len)
+int16_t reply_mix(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len)
 *****************************************
 
 So replies should make the transition from reply_old to reply_ng to benefit from smaller frames (and client reception adjusted accordingly of course).
+reply_mix is a transition fct: it uses the same API as reply_old but benefits somehow from variable length frames. It occupies at least 24b of data for the oldargs and real data is therefore limited to USB_CMD_DATA_SIZE - 24. Besides the size limitation, the client command doesn't know if this was an OLD frame or a MIX frame, it gets its oldargs and data as usual.
 
 Example with CMD_PING that supports both styles (from client CmdPing or CmdPingNG) and replies with the new frame format when it receives new command format:
     if (packet->ng) {
         reply_ng(CMD_PING, PM3_SUCCESS, packet->data.asBytes, packet->length);
     } else {
-        reply_old(CMD_ACK, reply_via_fpc, 0, 0, 0, 0);
+        // reply_old(CMD_ACK, reply_via_fpc, 0, 0, 0, 0);
+        reply_mix(CMD_ACK, reply_via_fpc, 0, 0, 0, 0);
     }
 
 On the client, for receiving frames:
@@ -171,6 +181,11 @@ In short, to mode from one format to the other, we need for each command:
 * (pm3 TX) reply_old -> reply_ng (with all stuff in ad-hoc structs in "data" field)
 * (client RX) PacketResponseNG parsing, from "oldarg" to only the "data" field
 
+Meanwhile, a fast transition to MIX frames can be done with:
+
+* (client TX) SendCommandOLD -> SendCommandMIX (but check the limited data size)
+* (pm3 TX) reply_old -> reply_mix (but check the limited data size)
+
 Bootrom
 =======
 TODO

From e4006a7563afcd41a908022f4b793f4c1229ac73 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 20 Apr 2019 10:34:54 +0200
Subject: [PATCH 1362/1938] doc errors

---
 armsrc/appmain.c         |  2 +-
 common/cmd.c             |  4 ++--
 doc/new_frame_format.txt |  2 +-
 include/usb_cmd.h        | 34 ++++++++++++++++++----------------
 4 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 69de9f1a6..146e1fd3c 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1567,7 +1567,7 @@ void  __attribute__((noreturn)) AppMain(void) {
         int16_t ret = receive_ng(&rx);
         if (ret == PM3_SUCCESS) {
             PacketReceived(&rx);
-        } else if (ret != PM3_NODATA) {
+        } else if (ret != PM3_ENODATA) {
             Dbprintf("Error in frame reception");
             // TODO DOEGOX if error, shall we resync ?
         }
diff --git a/common/cmd.c b/common/cmd.c
index 83e48895e..c1320e0cc 100644
--- a/common/cmd.c
+++ b/common/cmd.c
@@ -158,7 +158,7 @@ static int16_t receive_ng_internal(PacketCommandNG *rx, uint32_t read_ng(uint8_t
     PacketCommandNGRaw rx_raw;
     size_t bytes = read_ng((uint8_t *)&rx_raw.pre, sizeof(PacketCommandNGPreamble));
     if (bytes == 0)
-        return PM3_NODATA;
+        return PM3_ENODATA;
     if (bytes != sizeof(PacketCommandNGPreamble))
         return PM3_EIO;
     rx->magic = rx_raw.pre.magic;
@@ -229,6 +229,6 @@ int16_t receive_ng(PacketCommandNG *rx) {
     // Check if there is a FPC packet available
     return receive_ng_internal(rx, usart_read_ng, true);
 #else
-    return PM3_NODATA;
+    return PM3_ENODATA;
 #endif
 }
diff --git a/doc/new_frame_format.txt b/doc/new_frame_format.txt
index d4b16efd4..359437407 100644
--- a/doc/new_frame_format.txt
+++ b/doc/new_frame_format.txt
@@ -174,7 +174,7 @@ Commands do WaitForResponseTimeoutW (or dl_it) which uses getReply to fetch resp
 API transition
 ==============
 
-In short, to mode from one format to the other, we need for each command:
+In short, to move from one format to the other, we need for each command:
 
 * (client TX) SendCommandOLD -> SendCommandNG (with all stuff in ad-hoc structs in "data" field)
 * (pm3 RX) PacketCommandNG parsing, from "oldarg" to only the "data" field
diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index 316c99c3c..a52271d61 100644
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -393,39 +393,41 @@ typedef struct {
 #define FLAG_NONEWLINE   0x0010
 #define FLAG_NOPROMPT    0x0100
 
-// Error codes
+// Error codes                          Usages:
 
 // Success (no error)
 #define PM3_SUCCESS             0
+
 // Undefined error
 #define PM3_EUNDEF             -1
-// Invalid argument(s)
+// Invalid argument(s)                  client:     user input parsing
 #define PM3_EINVARG            -2
-// Operation not supported by device
+// Operation not supported by device    client/pm3: probably only on pm3 once client becomes universal
 #define PM3_EDEVNOTSUPP        -3
-// Operation timed out
+// Operation timed out                  client:     no response in time from pm3
 #define PM3_ETIMEOUT           -4
-// Operation aborted (by user)
+// Operation aborted (by user)          client/pm3: kbd/button pressed
 #define PM3_EOPABORTED         -5
-// Not (yet) implemented
+// Not (yet) implemented                client/pm3: TBD placeholder
 #define PM3_ENOTIMPL           -6
-// Error while RF transmission
+// Error while RF transmission          client/pm3: fail between pm3 & card
 #define PM3_ERFTRANS           -7
-// Input / output error
+// Input / output error                 pm3:        error in client frame reception
 #define PM3_EIO                -8
-// Buffer overflow
+// Buffer overflow                      client/pm3: specified buffer too large for the operation
 #define PM3_EOVFLOW            -9
-// Software error
+// Software error                       client/pm3: e.g. error in parsing some data
 #define PM3_ESOFT             -10
-// Flash error
+// Flash error                          client/pm3: error in RDV4 Flash operation
 #define PM3_EFLASH            -11
-// Memory allocation error
+// Memory allocation error              client:     error in memory allocation (maybe also for pm3 BigBuff?)
 #define PM3_EMALLOC           -12
-// File error
+// File error                           client:     error related to file access on host
 #define PM3_EFILE             -13
-// No data
-#define PM3_NODATA            -98
-// Quit program
+
+// No data                              pm3:        reserved, no host frame available (not really an error)
+#define PM3_ENODATA           -98
+// Quit program                         client:     reserved, order to quit the program
 #define PM3_EFATAL            -99
 
 

From 7ca1e987764c04b3b5a61f40260d81fcd5fd135e Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 20 Apr 2019 11:17:09 +0200
Subject: [PATCH 1363/1938] Protect SetAdcMuxFor with FPC

---
 armsrc/fpgaloader.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/armsrc/fpgaloader.c b/armsrc/fpgaloader.c
index 1be2c6138..f21985c71 100644
--- a/armsrc/fpgaloader.c
+++ b/armsrc/fpgaloader.c
@@ -468,16 +468,18 @@ void SetAdcMuxFor(uint32_t whichGpio) {
     LOW(GPIO_MUXSEL_LOPKD);
     LOW(GPIO_MUXSEL_HIRAW);
     LOW(GPIO_MUXSEL_LORAW);
-
+    HIGH(whichGpio);
 #else
+    if ((whichGpio == GPIO_MUXSEL_LORAW) || (whichGpio == GPIO_MUXSEL_HIRAW))
+        return;
     // FPC serial uses HIRAW/LOWRAW pins, so they are excluded here.
     AT91C_BASE_PIOA->PIO_OER = GPIO_MUXSEL_HIPKD | GPIO_MUXSEL_LOPKD;
     AT91C_BASE_PIOA->PIO_PER = GPIO_MUXSEL_HIPKD | GPIO_MUXSEL_LOPKD;
     LOW(GPIO_MUXSEL_HIPKD);
     LOW(GPIO_MUXSEL_LOPKD);
+    HIGH(whichGpio);
 #endif
 
-    HIGH(whichGpio);
 }
 
 void Fpga_print_status(void) {

From 6e744043f561895ba8cbf6ee8a44fdee65ef3063 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 20 Apr 2019 19:17:32 +0200
Subject: [PATCH 1364/1938] usart working... when debugged...

---
 armsrc/appmain.c   |  13 +--
 client/comms.c     |  22 ++++-
 client/proxmark3.c |   2 +-
 common/cmd.c       |   6 +-
 common/usart.c     | 204 +++++++++++++++++++++++----------------------
 common/usart.h     |  13 +--
 uart/uart.h        |   1 +
 uart/uart_posix.c  |  11 ++-
 uart/uart_win32.c  |   8 +-
 9 files changed, 162 insertions(+), 118 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 146e1fd3c..63a7dba10 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1106,16 +1106,17 @@ static void PacketReceived(PacketCommandNG *packet) {
 
             uint8_t my_rx[20];
             memset(my_rx, 0, sizeof(my_rx));
-            res = usart_readbuffer(my_rx, sizeof(my_rx));
+            res = usart_readbuffer(my_rx);
             WaitMS(1);
             Dbprintf("GOT  %d | %c%c%c%c%c%c%c%c", res,  my_rx[0], my_rx[1], my_rx[2], my_rx[3], my_rx[4], my_rx[5], my_rx[6], my_rx[7]);
             */
 
 
-            char dest[USB_CMD_DATA_SIZE] = {'\0'};
-            if (usart_dataavailable()) {
+            char dest[USART_FIFOLEN] = {'\0'};
+            uint16_t available = usart_rxdata_available();
+            if (available > 0) {
                 Dbprintf("RX DATA!");
-                uint16_t len = usart_readbuffer((uint8_t *)dest);
+                uint16_t len = usart_read_ng((uint8_t *)dest, available);
                 dest[len] = '\0';
                 Dbprintf("RX: %d | %02X %02X %02X %02X %02X %02X %02X %02X ", len,  dest[0], dest[1], dest[2], dest[3], dest[4], dest[5], dest[6], dest[7]);
             }
@@ -1142,7 +1143,7 @@ static void PacketReceived(PacketCommandNG *packet) {
             uint8_t my_rx[sizeof(PacketCommandOLD)];
             while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
                 LED_B_INV();
-                if (usart_readbuffer(my_rx) ) {
+                if (usart_read_ng(my_rx) ) {
                     //PacketReceived(my_rx, sizeof(my_rx));
 
                     PacketCommandOLD *my = (PacketCommandOLD *)my_rx;
@@ -1568,7 +1569,7 @@ void  __attribute__((noreturn)) AppMain(void) {
         if (ret == PM3_SUCCESS) {
             PacketReceived(&rx);
         } else if (ret != PM3_ENODATA) {
-            Dbprintf("Error in frame reception");
+            Dbprintf("Error in frame reception: %d", ret);
             // TODO DOEGOX if error, shall we resync ?
         }
 
diff --git a/client/comms.c b/client/comms.c
index 59215a299..8e9eb0a64 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -563,6 +563,21 @@ void CloseProxmark(void) {
     memset(&USB_communication_thread, 0, sizeof(pthread_t));
 }
 
+// Gives a rough estimate of the communication delay based on channel & baudrate
+// Max communication delay is when sending largest frame and receiving largest frame
+// Empirical measures on FTDI with physical cable:
+// "hw pingng 512"
+//    usb ->    6..32ms
+// 460800 ->   40..70ms
+//   9600 -> 1100..1150ms
+//           ~ = 12000000 / USART_BAUD_RATE
+// Let's take 2x (maybe we need more for BT link?)
+static size_t communication_delay(void) {
+    if (send_via_fpc)  // needed also for Windows USB USART??
+        return 2 * (12000000 / uart_speed);
+    return 100;
+}
+
 /**
  * @brief Waits for a certain response type. This method waits for a maximum of
  * ms_timeout milliseconds for a specified response command.
@@ -580,14 +595,18 @@ bool WaitForResponseTimeoutW(uint32_t cmd, PacketResponseNG *response, size_t ms
     if (response == NULL)
         response = &resp;
 
+    // Add delay depending on the communication channel & speed
+    ms_timeout += communication_delay();
     uint64_t start_time = msclock();
 
     // Wait until the command is received
     while (true) {
 
         while (getReply(response)) {
-            if (cmd == CMD_UNKNOWN || response->cmd == cmd)
+            if (cmd == CMD_UNKNOWN || response->cmd == cmd) {
+//                PrintAndLogEx(INFO, "Waited %i ms", msclock() - start_time);
                 return true;
+            }
         }
 
         if (msclock() - start_time > ms_timeout)
@@ -600,6 +619,7 @@ bool WaitForResponseTimeoutW(uint32_t cmd, PacketResponseNG *response, size_t ms
             show_warning = false;
         }
     }
+//    PrintAndLogEx(INFO, "Wait timeout after %i ms", msclock() - start_time);
     return false;
 }
 
diff --git a/client/proxmark3.c b/client/proxmark3.c
index dbeb3f217..99cdc6eea 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -431,7 +431,7 @@ int main(int argc, char *argv[]) {
     if (speed == 0)
 #ifdef WITH_FPC_HOST
         // Let's assume we're talking by default to pm3 over usart in this mode
-        speed = AT91_BAUD_RATE;
+        speed = USART_BAUD_RATE;
 #else
         speed = 460800;
 #endif
diff --git a/common/cmd.c b/common/cmd.c
index c1320e0cc..fb8396051 100644
--- a/common/cmd.c
+++ b/common/cmd.c
@@ -227,8 +227,8 @@ int16_t receive_ng(PacketCommandNG *rx) {
 
 #ifdef WITH_FPC_HOST
     // Check if there is a FPC packet available
-    return receive_ng_internal(rx, usart_read_ng, true);
-#else
-    return PM3_ENODATA;
+    if (usart_rxdata_available() > 0)
+        return receive_ng_internal(rx, usart_read_ng, true);
 #endif
+    return PM3_ENODATA;
 }
diff --git a/common/usart.c b/common/usart.c
index 928a0ee14..56f6bb446 100644
--- a/common/usart.c
+++ b/common/usart.c
@@ -38,119 +38,123 @@ void usart_close(void) {
 }
 */
 
-static uint8_t us_inbuf[sizeof(PacketCommandOLD)];
-static uint8_t us_outbuf[sizeof(PacketResponseOLD)];
-/*
-// transfer from client to device
-inline int16_t usart_readbuffer(uint8_t *data) {
-    uint32_t rcr = pUS1->US_RCR;
-    if (rcr < sizeof(us_inbuf)) {
-        pUS1->US_PTCR = AT91C_PDC_RXTDIS;
-        memcpy(data, us_inbuf, sizeof(us_inbuf) - rcr);
-        // Reset DMA buffer
-        pUS1->US_RPR = (uint32_t)us_inbuf;
-        pUS1->US_RCR = sizeof(us_inbuf);
-        pUS1->US_PTCR = AT91C_PDC_RXTEN;
-        return sizeof(us_inbuf) - rcr;
-    } else {
-        return 0;
-    }
-}
-*/
+static uint8_t us_inbuf1[USART_BUFFLEN];
+static uint8_t us_inbuf2[USART_BUFFLEN];
+uint8_t *usart_cur_inbuf = NULL;
+uint16_t usart_cur_inbuf_off = 0;
+static uint8_t us_rxfifo[USART_FIFOLEN];
+static size_t us_rxfifo_low = 0;
+static size_t us_rxfifo_high = 0;
 
-uint8_t check = 0;
-inline int16_t usart_readbuffer(uint8_t *data) {
-    // Check if the first PDC bank is free
-    if (pUS1->US_RCR == 0) {
-        pUS1->US_RPR = (uint32_t)data;
-        pUS1->US_RCR = sizeof(PacketCommandOLD);
-        pUS1->US_PTCR = AT91C_PDC_RXTEN | AT91C_PDC_TXTEN;
-        check = 0;
-        return 2;
-    } else {
-        return 0;
-    }
-}
 
-void usart_readcheck(uint8_t *data, size_t len) {
-    if (pUS1->US_RCR < len) {
-        if (check == 0) {
-            StartCountUS();
-            check = 1;
+static void usart_fill_rxfifo(void) {
+    if (pUS1->US_RNCR == 0) { // One buffer got filled, backup buffer being used
+// TODO check if we have room...
+        uint16_t available = USART_BUFFLEN - usart_cur_inbuf_off;
+        for (uint16_t i = 0; i < available; i++) {
+            us_rxfifo[us_rxfifo_high++] = usart_cur_inbuf[usart_cur_inbuf_off + i];
+            if (us_rxfifo_high == sizeof(us_rxfifo))
+                us_rxfifo_high = 0;
         }
-        //300ms
-        if (GetCountUS() > 300000) {
-            pUS1->US_RPR = (uint32_t)data;
-            pUS1->US_RCR = len;
-            check = 0;
+        // Give next buffer
+        pUS1->US_RNPR = (uint32_t)usart_cur_inbuf;
+        pUS1->US_RNCR = USART_BUFFLEN;
+        // Swap current buff
+        if (usart_cur_inbuf == us_inbuf1)
+            usart_cur_inbuf = us_inbuf2;
+        else
+            usart_cur_inbuf = us_inbuf1;
+        usart_cur_inbuf_off = 0;
+    }
+    if (pUS1->US_RCR < USART_BUFFLEN - usart_cur_inbuf_off) { // Current buffer partially filled
+        uint16_t available = USART_BUFFLEN - pUS1->US_RCR - usart_cur_inbuf_off;
+// TODO check if we have room...
+        for (uint16_t i = 0; i < available; i++) {
+            us_rxfifo[us_rxfifo_high++] = usart_cur_inbuf[usart_cur_inbuf_off + i];
+            if (us_rxfifo_high == sizeof(us_rxfifo))
+                us_rxfifo_high = 0;
         }
-    } else {
-        check = 0;
+        usart_cur_inbuf_off += available;
     }
 }
 
-inline bool usart_dataavailable(void) {
-    return pUS1->US_RCR < sizeof(us_inbuf);
+uint16_t usart_rxdata_available(void) {
+    usart_fill_rxfifo();
+    if (us_rxfifo_low <= us_rxfifo_high)
+        return us_rxfifo_high - us_rxfifo_low;
+    else
+        return sizeof(us_rxfifo) - us_rxfifo_low + us_rxfifo_high;
 }
 
-inline int16_t usart_readcommand(uint8_t *data) {
-    if (pUS1->US_RCR == 0)
-        return usart_readbuffer(data);
-
-    return 0;
-}
+extern bool reply_via_fpc;
+extern void Dbprintf(const char *fmt, ...);
+#define Dbprintf_usb(...) {\
+        bool tmp = reply_via_fpc;\
+        reply_via_fpc = false;\
+        Dbprintf(__VA_ARGS__);\
+        reply_via_fpc = tmp;}
 
 uint32_t usart_read_ng(uint8_t *data, size_t len) {
-    // TODO DOEGOX
-    return 0;
+    if (len == 0) return 0;
+    uint32_t packetSize, nbBytesRcv = 0;
+    uint32_t try = 0;
+//    uint32_t highest_observed_try = 0;
+    // Empirical max try observed: 3000000 / USART_BAUD_RATE
+    // Let's take 10x
+    uint32_t maxtry = 10 * ( 3000000 / USART_BAUD_RATE );
+
+    while (len) {
+        uint32_t available = usart_rxdata_available();
+
+        packetSize = MIN(available, len);
+        if (available > 0) {
+//            Dbprintf_usb("Dbg USART ask %d bytes, available %d bytes, packetsize %d bytes", len, available, packetSize);
+//            highest_observed_try = MAX(highest_observed_try, try);
+            try = 0;
+        }
+        len -= packetSize;
+        while (packetSize--) {
+            data[nbBytesRcv++] = us_rxfifo[us_rxfifo_low++];
+            if (us_rxfifo_low == sizeof(us_rxfifo))
+                us_rxfifo_low = 0;
+        }
+        if (try++ == maxtry) {
+            Dbprintf_usb("Dbg USART TIMEOUT");
+            break;
+        }
+    }
+//    highest_observed_try = MAX(highest_observed_try, try);
+//    Dbprintf_usb("Dbg USART max observed try %i", highest_observed_try);
+    return nbBytesRcv;
 }
 
-inline bool usart_commandavailable(void) {
-    return (pUS1->US_RCR == 0);
-}
-/*
 // transfer from device to client
 inline int16_t usart_writebuffer(uint8_t *data, size_t len) {
 
+    // Wait for one free PDC bank
+    while (pUS1->US_TCR && pUS1->US_TNCR) {};
+    // ? alternative to wait for end of transmissions?
+    // while (!(pUS1->US_CSR & AT91C_US_ENDTX)) {};
 
-    if (pUS1->US_CSR & AT91C_US_ENDTX) {
-        memcpy(us_outbuf, data, len);
-        pUS1->US_TPR = (uint32_t)us_outbuf;
+    // Check if the current PDC bank is free
+    if (pUS1->US_TCR == 0) {
+        pUS1->US_TPR = (uint32_t)data;
         pUS1->US_TCR = len;
-        pUS1->US_PTCR = AT91C_PDC_TXTEN;
-        while (!(pUS1->US_CSR & AT91C_US_ENDTX)) {};
-        pUS1->US_PTCR = AT91C_PDC_TXTDIS;
-        return len;
+    }
+    // Check if the backup PDC bank is free
+    else if (pUS1->US_TNCR == 0) {
+        pUS1->US_TNPR = (uint32_t)data;
+        pUS1->US_TNCR = len;
     } else {
+        // we shouldn't be here
         return 0;
     }
+    // Make sure TX transfer is enabled
+    pUS1->US_PTCR = AT91C_PDC_TXTEN;// | AT91C_PDC_RXTEN;
+    //wait until finishing all transfers
+    while (pUS1->US_TNCR || pUS1->US_TCR) {};
+    return len;
 }
-*/
-
-// transfer from device to client
-inline int16_t usart_writebuffer(uint8_t *data, size_t len) {
-
-    while (pUS1->US_TCR && pUS1->US_TNCR) {};
-
-    // Check if the first PDC bank is free
-    if (pUS1->US_TCR == 0) {
-        memcpy(us_outbuf, data, len);
-        pUS1->US_TPR = (uint32_t)us_outbuf;
-        pUS1->US_TCR = sizeof(us_outbuf);
-        pUS1->US_PTCR = AT91C_PDC_TXTEN | AT91C_PDC_RXTEN;
-    }
-    // Check if the second PDC bank is free
-    else if (pUS1->US_TNCR == 0) {
-        memcpy(us_outbuf, data, len);
-        pUS1->US_TNPR = (uint32_t)us_outbuf;
-        pUS1->US_TNCR = sizeof(us_outbuf);
-        pUS1->US_PTCR = AT91C_PDC_TXTEN | AT91C_PDC_RXTEN;
-    }
-    //wait until finishing transfer
-    while (pUS1->US_TCR && pUS1->US_TNCR) {};
-    return 0;
-}
-
 
 void usart_init(void) {
 
@@ -185,9 +189,7 @@ void usart_init(void) {
     // all interrupts disabled
     pUS1->US_IDR = 0xFFFF;
 
-    pUS1->US_BRGR =  48054841 / (AT91_BAUD_RATE << 3);
-    // Need speed?
-    //pUS1->US_BRGR =  48054841 / (460800 << 3);
+    pUS1->US_BRGR =  48054841 / (USART_BAUD_RATE << 3);
 
     // Write the Timeguard Register
     pUS1->US_TTGR = 0;
@@ -195,9 +197,13 @@ void usart_init(void) {
     pUS1->US_FIDI = 0;
     pUS1->US_IF = 0;
 
-    // Disable double buffers for now
+    // Initialize DMA buffers
+    pUS1->US_TPR = (uint32_t)0;
+    pUS1->US_TCR = 0;
     pUS1->US_TNPR = (uint32_t)0;
     pUS1->US_TNCR = 0;
+    pUS1->US_RPR = (uint32_t)0;
+    pUS1->US_RCR = 0;
     pUS1->US_RNPR = (uint32_t)0;
     pUS1->US_RNCR = 0;
 
@@ -205,8 +211,10 @@ void usart_init(void) {
     pUS1->US_CR = (AT91C_US_RXEN | AT91C_US_TXEN);
 
     // ready to receive
-    pUS1->US_RPR = (uint32_t)us_inbuf;
-    pUS1->US_RCR = 0;
-    pUS1->US_RNCR = 0;
+    pUS1->US_RPR = (uint32_t)us_inbuf1;
+    pUS1->US_RCR = USART_BUFFLEN;
+    usart_cur_inbuf = us_inbuf1;
+    pUS1->US_RNPR = (uint32_t)us_inbuf2;
+    pUS1->US_RNCR = USART_BUFFLEN;
     pUS1->US_PTCR = AT91C_PDC_RXTEN;
 }
diff --git a/common/usart.h b/common/usart.h
index 16d0d8773..1f37429c8 100644
--- a/common/usart.h
+++ b/common/usart.h
@@ -4,17 +4,18 @@
 #include <stddef.h>
 #include "proxmark3.h"
 
-#define AT91_BAUD_RATE 115200
+//#define USART_BAUD_RATE 9600
+#define USART_BAUD_RATE 115200
+//#define USART_BAUD_RATE 460800
+
 
 void usart_init(void);
 void usart_close(void);
 
-int16_t usart_readbuffer(uint8_t *data);
 int16_t usart_writebuffer(uint8_t *data, size_t len);
-bool usart_dataavailable(void);
-int16_t usart_readcommand(uint8_t *data);
-void usart_readcheck(uint8_t *data, size_t len);
 uint32_t usart_read_ng(uint8_t *data, size_t len);
+uint16_t usart_rxdata_available(void);
+#define USART_BUFFLEN 512
+#define USART_FIFOLEN (2*USART_BUFFLEN)
 
-bool usart_commandavailable(void);
 #endif
diff --git a/uart/uart.h b/uart/uart.h
index 714f646b9..49900be39 100644
--- a/uart/uart.h
+++ b/uart/uart.h
@@ -103,6 +103,7 @@ bool uart_set_speed(serial_port sp, const uint32_t uiPortSpeed);
 /* Gets the current speed of the serial port, in baud.
  */
 uint32_t uart_get_speed(const serial_port sp);
+extern uint32_t uart_speed;
 
 #endif // _UART_H_
 
diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index 8ea8aa619..e3b7c56b8 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -60,6 +60,9 @@
 # define SOL_TCP IPPROTO_TCP
 #endif
 
+// To memorise baudrate, we don't want to call get_speed systematically
+uint32_t uart_speed;
+
 typedef struct termios term_info;
 typedef struct {
     int fd;           // Serial port file descriptor
@@ -206,7 +209,8 @@ serial_port uart_open(const char *pcPortName, uint32_t speed) {
             }
         }
     }
-    printf("[=] UART Setting serial baudrate %u\n", speed);
+    uart_speed = uart_get_speed(sp);
+    printf("[=] UART Setting serial baudrate %u\n", uart_speed);
     return sp;
 }
 
@@ -408,7 +412,10 @@ bool uart_set_speed(serial_port sp, const uint32_t uiPortSpeed) {
     // Set port speed (Input and Output)
     cfsetispeed(&ti, stPortSpeed);
     cfsetospeed(&ti, stPortSpeed);
-    return (tcsetattr(spu->fd, TCSANOW, &ti) != -1);
+    bool result = tcsetattr(spu->fd, TCSANOW, &ti) != -1;
+    if (result)
+        uart_speed = uiPortSpeed;
+    return result;
 }
 
 uint32_t uart_get_speed(const serial_port sp) {
diff --git a/uart/uart_win32.c b/uart/uart_win32.c
index 789b430b9..c6e3142cf 100644
--- a/uart/uart_win32.c
+++ b/uart/uart_win32.c
@@ -42,6 +42,9 @@
 #ifdef _WIN32
 #include <windows.h>
 
+// To memorise baudrate, we don't want to call get_speed systematically
+uint32_t uart_speed;
+
 typedef struct {
     HANDLE hPort;     // Serial port handle
     DCB dcb;          // Device control settings
@@ -121,7 +124,8 @@ serial_port uart_open(const char *pcPortName, uint32_t speed) {
             }
         }
     }
-    printf("[=] UART Setting serial baudrate %i\n", speed);
+    uart_speed = uart_get_speed(sp);
+    printf("[=] UART Setting serial baudrate %u\n", uart_speed);
     return sp;
 }
 
@@ -152,6 +156,8 @@ bool uart_set_speed(serial_port sp, const uint32_t uiPortSpeed) {
     spw->dcb.BaudRate = uiPortSpeed;
     bool result = SetCommState(spw->hPort, &spw->dcb);
     PurgeComm(spw->hPort, PURGE_RXABORT | PURGE_RXCLEAR);
+    if (result)
+        uart_speed = uiPortSpeed;
     return result;
 }
 

From 4aa1b49493fef34968442249e9e3c3ad667a9f5a Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 21 Apr 2019 01:05:02 +0200
Subject: [PATCH 1365/1938] fix uart_posix: bytecound must be 32b

---
 client/comms.c    |  2 +-
 uart/uart.h       |  4 ++--
 uart/uart_posix.c | 10 ++++++----
 uart/uart_win32.c |  6 +++---
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/client/comms.c b/client/comms.c
index 8e9eb0a64..038e90fea 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -319,7 +319,7 @@ __attribute__((force_align_arg_pointer))
 #endif
 *uart_communication(void *targ) {
     communication_arg_t *connection = (communication_arg_t *)targ;
-    size_t rxlen;
+    uint32_t rxlen;
 
     PacketResponseNG rx;
     PacketResponseNGRaw rx_raw;
diff --git a/uart/uart.h b/uart/uart.h
index 49900be39..4cbea26c8 100644
--- a/uart/uart.h
+++ b/uart/uart.h
@@ -88,13 +88,13 @@ void uart_close(const serial_port sp);
  * partial read may have completed into the buffer by the corresponding
  * implementation, so pszRxLen should be checked to see if any data was written.
  */
-bool uart_receive(const serial_port sp, uint8_t *pbtRx, size_t pszMaxRxLen, size_t *pszRxLen);
+bool uart_receive(const serial_port sp, uint8_t *pbtRx, uint32_t pszMaxRxLen, uint32_t *pszRxLen);
 
 /* Sends a buffer to a given serial port.
  *   pbtTx: A pointer to a buffer containing the data to send.
  *   len: The amount of data to be sent.
  */
-bool uart_send(const serial_port sp, const uint8_t *pbtTx, const size_t len);
+bool uart_send(const serial_port sp, const uint8_t *pbtTx, const uint32_t len);
 
 /* Sets the current speed of the serial port, in baud.
  */
diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index e3b7c56b8..177088d05 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -234,8 +234,8 @@ void uart_close(const serial_port sp) {
     free(sp);
 }
 
-bool uart_receive(const serial_port sp, uint8_t *pbtRx, size_t pszMaxRxLen, size_t *pszRxLen) {
-    size_t byteCount;
+bool uart_receive(const serial_port sp, uint8_t *pbtRx, uint32_t pszMaxRxLen, uint32_t *pszRxLen) {
+    uint32_t byteCount;  // FIONREAD returns size on 32b
     fd_set rfds;
     struct timeval tv;
 
@@ -267,10 +267,12 @@ bool uart_receive(const serial_port sp, uint8_t *pbtRx, size_t pszMaxRxLen, size
 
         // Retrieve the count of the incoming bytes
         res = ioctl(((serial_port_unix *)sp)->fd, FIONREAD, &byteCount);
+        printf("UART:: RX ioctl res %d byteCount %u\n", res, byteCount);
         if (res < 0) return false;
 
         // Cap the number of bytes, so we don't overrun the buffer
         if (pszMaxRxLen - (*pszRxLen) < byteCount) {
+            printf("UART:: RX buffer overrun (have %u, need %u)\n", pszMaxRxLen - (*pszRxLen), byteCount);
             byteCount = pszMaxRxLen - (*pszRxLen);
         }
 
@@ -292,8 +294,8 @@ bool uart_receive(const serial_port sp, uint8_t *pbtRx, size_t pszMaxRxLen, size
     return true;
 }
 
-bool uart_send(const serial_port sp, const uint8_t *pbtTx, const size_t len) {
-    size_t pos = 0;
+bool uart_send(const serial_port sp, const uint8_t *pbtTx, const uint32_t len) {
+    uint32_t pos = 0;
     fd_set rfds;
     struct timeval tv;
 
diff --git a/uart/uart_win32.c b/uart/uart_win32.c
index c6e3142cf..36a10731a 100644
--- a/uart/uart_win32.c
+++ b/uart/uart_win32.c
@@ -169,11 +169,11 @@ uint32_t uart_get_speed(const serial_port sp) {
     return 0;
 }
 
-bool uart_receive(const serial_port sp, uint8_t *p_rx, size_t pszMaxRxLen, size_t *len) {
-    return ReadFile(((serial_port_windows *)sp)->hPort, p_rx, pszMaxRxLen, (LPDWORD)len, NULL);
+bool uart_receive(const serial_port sp, uint8_t *pbtRx, uint32_t pszMaxRxLen, uint32_t *pszRxLen) {
+    return ReadFile(((serial_port_windows *)sp)->hPort, pbtRx, pszMaxRxLen, (LPDWORD)pszRxLen, NULL);
 }
 
-bool uart_send(const serial_port sp, const uint8_t *p_tx, const size_t len) {
+bool uart_send(const serial_port sp, const uint8_t *p_tx, const uint32_t len) {
     DWORD txlen = 0;
     return WriteFile(((serial_port_windows *)sp)->hPort, p_tx, len, &txlen, NULL);
 }

From a77ea12b7756424b87974c13ed493b4957fe1de9 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 21 Apr 2019 01:38:24 +0200
Subject: [PATCH 1366/1938] client uart: increase rx timeout

---
 uart/uart_posix.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index 177088d05..41e4338b0 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -70,10 +70,11 @@ typedef struct {
     term_info tiNew;  // Terminal info during the transaction
 } serial_port_unix;
 
-// Set time-out on 30 miliseconds
+// Set time-out on 300 milliseconds
+// It was 30 ms for USB but we need more to receive from USART
 struct timeval timeout = {
     .tv_sec  =     0, // 0 second
-    .tv_usec = 30000  // 30 000 micro seconds
+    .tv_usec = 300000  // 300 000 micro seconds
 };
 
 serial_port uart_open(const char *pcPortName, uint32_t speed) {
@@ -257,7 +258,7 @@ bool uart_receive(const serial_port sp, uint8_t *pbtRx, uint32_t pszMaxRxLen, ui
         // Read time-out
         if (res == 0) {
             if (*pszRxLen == 0) {
-                // Error, we received no data
+                // We received no data
                 return false;
             } else {
                 // We received some data, but nothing more is available
@@ -267,12 +268,12 @@ bool uart_receive(const serial_port sp, uint8_t *pbtRx, uint32_t pszMaxRxLen, ui
 
         // Retrieve the count of the incoming bytes
         res = ioctl(((serial_port_unix *)sp)->fd, FIONREAD, &byteCount);
-        printf("UART:: RX ioctl res %d byteCount %u\n", res, byteCount);
+//        printf("UART:: RX ioctl res %d byteCount %u\n", res, byteCount);
         if (res < 0) return false;
 
         // Cap the number of bytes, so we don't overrun the buffer
         if (pszMaxRxLen - (*pszRxLen) < byteCount) {
-            printf("UART:: RX buffer overrun (have %u, need %u)\n", pszMaxRxLen - (*pszRxLen), byteCount);
+//            printf("UART:: RX prevent overrun (have %u, need %u)\n", pszMaxRxLen - (*pszRxLen), byteCount);
             byteCount = pszMaxRxLen - (*pszRxLen);
         }
 
@@ -280,7 +281,9 @@ bool uart_receive(const serial_port sp, uint8_t *pbtRx, uint32_t pszMaxRxLen, ui
         res = read(((serial_port_unix *)sp)->fd, pbtRx + (*pszRxLen), byteCount);
 
         // Stop if the OS has some troubles reading the data
-        if (res <= 0) return false;
+        if (res <= 0) {
+            return false;
+        }
 
         *pszRxLen += res;
 
@@ -288,7 +291,6 @@ bool uart_receive(const serial_port sp, uint8_t *pbtRx, uint32_t pszMaxRxLen, ui
             // We have all the data we wanted.
             return true;
         }
-
     } while (byteCount);
 
     return true;

From 59963eb41e58bd860caab5c328ddd6c3396484a5 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 21 Apr 2019 01:44:52 +0200
Subject: [PATCH 1367/1938] doc timeouts

---
 doc/new_frame_format.txt | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/doc/new_frame_format.txt b/doc/new_frame_format.txt
index 359437407..3ca272be4 100644
--- a/doc/new_frame_format.txt
+++ b/doc/new_frame_format.txt
@@ -192,3 +192,32 @@ TODO
 We need to be very careful to make a flasher that can deal with old & new bootroms.
 New bootrom might need to also still support old frame format, to ease flashing back to repos supporting the old format...
 
+
+
+Timings
+=======
+
+Needed to increase client RX uart timeout: it was 30ms, we put arbitrarily 300ms as for TCP
+(uart/uart_posix.c)
+struct timeval timeout = {
+    .tv_sec  =     0, // 0 second
+    .tv_usec = 300000  // 300 000 micro seconds
+};
+
+Add automatically some communication delay in the WaitForResponseTimeout timeout
+Only when using FPC, timeout = 2* empirically measured delay (FTDI cable)
+(client/comms.c)
+static size_t communication_delay(void) {
+    if (send_via_fpc)  // needed also for Windows USB USART??
+        return 2 * (12000000 / uart_speed);
+    return 100;
+}
+
+Needed to tune pm3 RX usart maxtry
+(common/usart.c)
+uint32_t usart_read_ng(uint8_t *data, size_t len) {
+// Empirical max try observed: 3000000 / USART_BAUD_RATE
+// Let's take 10x
+uint32_t maxtry = 10 * ( 3000000 / USART_BAUD_RATE );
+
+

From db3103b531cf146dc13ac2b883cd13fb6e86976e Mon Sep 17 00:00:00 2001
From: Eloff <eloff@mail.ru>
Date: Sun, 21 Apr 2019 03:18:00 +0300
Subject: [PATCH 1368/1938] UL/NTAG new dump file format. Added counters
 support, simulation

---
 CHANGELOG.md                      |   1 +
 armsrc/iso14443a.c                | 103 +++++++++++++++++-------------
 armsrc/iso14443a.h                |  12 ++++
 armsrc/util.c                     |   6 ++
 armsrc/util.h                     |   1 +
 client/cmdhfmfu.c                 |  45 +++++++------
 client/cmdhfmfu.h                 |   8 +--
 client/loclass/fileutils.c        |  11 ++--
 client/scripts/dumptoemul-mfu.lua |  10 +--
 9 files changed, 123 insertions(+), 74 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b768a5cd7..54323e4d9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [unreleased][unreleased]
+ - Change/Add new dump format for Ultralight/NTAG, counters support, simulation (@mceloff)
  - Fix/Add 'hf mf sim' bugs fix, RATS support, etc (@mceloff)
  - Fix serial of FPC. (@ryan)
  - Fix 'data shiftgraphzero' corrupting end of GraphBuffer (@doegox)
diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 4dde7846a..154d621d6 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -832,8 +832,6 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
 
     // PACK response to PWD AUTH for EV1/NTAG
     uint8_t response8[4] = {0, 0, 0, 0};
-    // Counter for EV1/NTAG
-    uint32_t counters[] = {0, 0, 0};
 
     // The first response contains the ATQA (note: bytes are transmitted in reverse order).
     uint8_t response1[] = {0, 0};
@@ -848,6 +846,9 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
     memset(ar_nr_nonces, 0x00, sizeof(ar_nr_nonces));
     uint8_t    moebius_count = 0;
 
+    // some first pages of UL/NTAG dump is special data
+    mfu_dump_prefix_t *mfu_header =  tagType == 2 || tagType == 7 ? (mfu_dump_prefix_t *) BigBuf_get_EM_addr() : NULL;
+
     switch (tagType) {
         case 1: { // MIFARE Classic 1k
             response1[0] = 0x04;
@@ -884,13 +885,12 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
         case 7: { // NTAG
             response1[0] = 0x44;
             sak = 0x00;
-            // PACK
-            response8[0] = 0x80;
-            response8[1] = 0x80;
+            // PACK, from last page of dump
+            emlGetMemBt(response8, MFU_DUMP_PREFIX_LENGTH + mfu_header->pages * 4, 2);
             compute_crc(CRC_14443_A, response8, 2, &response8[2], &response8[3]);
             // uid not supplied then get from emulator memory
             if (data[0] == 0) {
-                uint16_t start = 4 * (0 + 12);
+                uint16_t start = MFU_DUMP_PREFIX_LENGTH;
                 uint8_t emdata[8];
                 emlGetMemBt(emdata, start, sizeof(emdata));
                 memcpy(data, emdata, 3); // uid bytes 0-2
@@ -1086,12 +1086,17 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
             uint8_t block = receivedCmd[1];
             // if Ultralight or NTAG (4 byte blocks)
             if (tagType == 7 || tagType == 2) {
-                // first 12 blocks of emu are [getversion answer - check tearing - pack - 0x00 - signature]
-                uint16_t start = 4 * (block + 12);
-                uint8_t emdata[MAX_MIFARE_FRAME_SIZE];
-                emlGetMemBt(emdata, start, 16);
-                AddCrc14A(emdata, 16);
-                EmSendCmd(emdata, sizeof(emdata));
+                if (block > mfu_header->pages) {
+                    // send NACK 0x0 == invalid argument
+                    EmSend4bit(CARD_NACK_IV);
+                } else {
+                    // first blocks of emu are header
+                    uint16_t start = block * 4 + MFU_DUMP_PREFIX_LENGTH;
+                    uint8_t emdata[MAX_MIFARE_FRAME_SIZE];
+                    emlGetMemBt(emdata, start, 16);
+                    AddCrc14A(emdata, 16);
+                    EmSendCmd(emdata, sizeof(emdata));
+                }
                 // We already responded, do not send anything with the EmSendCmd14443aRaw() that is called below
                 p_response = NULL;
             } else if (tagType == 9 && block == 1) {
@@ -1110,23 +1115,36 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
                 p_response = NULL;
             }
         } else if (receivedCmd[0] == MIFARE_ULEV1_FASTREAD) {    // Received a FAST READ (ranged read)
-            uint8_t emdata[MAX_FRAME_SIZE];
-            // first 12 blocks of emu are [getversion answer - check tearing - pack - 0x00 - signature]
-            int start = (receivedCmd[1] + 12) * 4;
-            len   = (receivedCmd[2] - receivedCmd[1] + 1) * 4;
-            emlGetMemBt(emdata, start, len);
-            AddCrc14A(emdata, len);
-            EmSendCmd(emdata, len + 2);
+            uint8_t block1 = receivedCmd[1];
+            uint8_t block2 = receivedCmd[2];
+            if (block1 > mfu_header->pages) {
+                // send NACK 0x0 == invalid argument
+                EmSend4bit(CARD_NACK_IV);
+            } else {
+                uint8_t emdata[MAX_FRAME_SIZE];
+                // first blocks of emu are header
+                int start = block1 * 4 + MFU_DUMP_PREFIX_LENGTH;
+                len   = (block2 - block1 + 1) * 4;
+                emlGetMemBt(emdata, start, len);
+                AddCrc14A(emdata, len);
+                EmSendCmd(emdata, len + 2);
+            }
             p_response = NULL;
         } else if ((receivedCmd[0] == MIFARE_ULC_WRITE || receivedCmd[0] == MIFARE_ULC_COMP_WRITE) && (tagType == 2 || tagType == 7)) {        // Received a WRITE
             // cmd + block + 4/16 bytes data + 2 bytes crc
             if (len == 8 || len == 20) {
                 bool isCrcCorrect = CheckCrc14A(receivedCmd, len);
                 if (isCrcCorrect) {
-                    int block = receivedCmd[1] + 12; // first 12 blocks of emu are [getversion answer - check tearing - pack - 0x00 - signature]
-                    emlSetMem_xt(&receivedCmd[2], block, 1, 4);
-                    // send ACK
-                    EmSend4bit(CARD_ACK);
+                    uint8_t block = receivedCmd[1];
+                    if (block > mfu_header->pages) {
+                        // send NACK 0x0 == invalid argument
+                        EmSend4bit(CARD_NACK_IV);
+                    } else {
+                        // first blocks of emu are header
+                        emlSetMem_xt(&receivedCmd[2], block + MFU_DUMP_PREFIX_LENGTH / 4, 1, 4);
+                        // send ACK
+                        EmSend4bit(CARD_ACK);
+                    }
                 } else {
                     // send NACK 0x1 == crc/parity error
                     EmSend4bit(CARD_NACK_PA);
@@ -1137,10 +1155,9 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
             }
             p_response = NULL;
         } else if (receivedCmd[0] == MIFARE_ULEV1_READSIG && tagType == 7) {    // Received a READ SIGNATURE --
-            // first 12 blocks of emu are [getversion answer - check tearing - pack - 0x00 - signature]
-            uint16_t start = 4 * 4;
+            // first blocks of emu are header
             uint8_t emdata[34];
-            emlGetMemBt(emdata, start, 32);
+            memcpy(emdata, mfu_header->signature, 32);
             AddCrc14A(emdata, 32);
             EmSendCmd(emdata, sizeof(emdata));
             p_response = NULL;
@@ -1151,7 +1168,7 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
                 EmSend4bit(0x00);
             } else {
                 uint8_t cmd[] =  {0x00, 0x00, 0x00, 0x14, 0xa5};
-                num_to_bytes(counters[index], 3, cmd);
+                memcpy(cmd, mfu_header->counter_tearing[index], 3);
                 AddCrc14A(cmd, sizeof(cmd) - 2);
                 EmSendCmd(cmd, sizeof(cmd));
             }
@@ -1162,15 +1179,13 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
                 // send NACK 0x0 == invalid argument
                 EmSend4bit(0x00);
             } else {
-
-                uint32_t val = bytes_to_num(receivedCmd + 2, 4);
-
+                uint32_t val = le24toh(receivedCmd + 2) + le24toh(mfu_header->counter_tearing[index]);
                 // if new value + old value is bigger 24bits,  fail
-                if (val + counters[index] > 0xFFFFFF) {
+                if (val > 0xFFFFFF) {
                     // send NACK 0x4 == counter overflow
                     EmSend4bit(CARD_NACK_NA);
                 } else {
-                    counters[index] = val;
+                    htole24(val, mfu_header->counter_tearing[index]);
                     // send ACK
                     EmSend4bit(CARD_ACK);
                 }
@@ -1184,7 +1199,7 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
                 // send NACK 0x0 == invalid argument
                 EmSend4bit(0x00);
             } else {
-                emlGetMemBt(emdata, 10 + index, 1);
+                emdata[0] = mfu_header->counter_tearing[index][3];
                 AddCrc14A(emdata, sizeof(emdata) - 2);
                 EmSendCmd(emdata, sizeof(emdata));
             }
@@ -1195,7 +1210,7 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
         } else if (receivedCmd[0] == MIFARE_AUTH_KEYA || receivedCmd[0] == MIFARE_AUTH_KEYB) {    // Received an authentication request
             if (tagType == 7) {     // IF NTAG /EV1  0x60 == GET_VERSION, not a authentication request.
                 uint8_t emdata[10];
-                emlGetMemBt(emdata, 0, 8);
+                memcpy(emdata, mfu_header->version, 8);
                 AddCrc14A(emdata, sizeof(emdata) - 2);
                 EmSendCmd(emdata, sizeof(emdata));
                 p_response = NULL;
@@ -1291,15 +1306,17 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
         } else if (receivedCmd[0] == MIFARE_ULC_AUTH_1) {  // ULC authentication, or Desfire Authentication
         } else if (receivedCmd[0] == MIFARE_ULEV1_AUTH) { // NTAG / EV-1 authentication
             if (tagType == 7) {
-                uint16_t start = 13; // first 4 blocks of emu are [getversion answer - check tearing - pack - 0x00]
-                uint8_t emdata[4];
-                emlGetMemBt(emdata, start, 2);
-                AddCrc14A(emdata, 2);
-                EmSendCmd(emdata, sizeof(emdata));
-                p_response = NULL;
-                uint32_t pwd = bytes_to_num(receivedCmd + 1, 4);
-
-                if (MF_DBGLEVEL >= 3) Dbprintf("Auth attempt: %08x", pwd);
+                // PWD stored in dump now
+                uint8_t pwd[4];
+                emlGetMemBt(pwd, (mfu_header->pages - 1) * 4 + MFU_DUMP_PREFIX_LENGTH, sizeof(pwd));
+                if (memcmp(receivedCmd + 1, pwd, 4) == 0) {
+                    p_response = &responses[7]; // precompiled PACK
+                } else {
+                    EmSend4bit(CARD_NACK_NA);
+                    uint32_t pwd = bytes_to_num(receivedCmd + 1, 4);
+                    if (MF_DBGLEVEL >= 3) Dbprintf("Auth attempt: %08x", pwd);
+                    p_response = NULL;
+                }
             }
         } else {
             // Check for ISO 14443A-4 compliant commands, look at left nibble
diff --git a/armsrc/iso14443a.h b/armsrc/iso14443a.h
index f2a1c6120..27b6b8afe 100644
--- a/armsrc/iso14443a.h
+++ b/armsrc/iso14443a.h
@@ -95,6 +95,18 @@ typedef struct {
     uint8_t *parity;
 } tUart;
 
+// Length must be aligned to 4 bytes (UL/NTAG page)
+#define MFU_DUMP_PREFIX_LENGTH 56
+
+typedef struct {
+    uint8_t version[8];
+    uint8_t tbo[2];
+    uint8_t tbo1[1];
+    uint8_t pages;                  // max page number in dump
+    uint8_t signature[32];
+    uint8_t counter_tearing[3][4];  // 3 bytes counter, 1 byte tearing flag
+} mfu_dump_prefix_t;
+
 #ifndef AddCrc14A
 # define AddCrc14A(data, len) compute_crc(CRC_14443_A, (data), (len), (data)+(len), (data)+(len)+1)
 #endif
diff --git a/armsrc/util.c b/armsrc/util.c
index 8ee91b464..ce6a62d22 100644
--- a/armsrc/util.c
+++ b/armsrc/util.c
@@ -91,6 +91,12 @@ int32_t le24toh(uint8_t data[3]) {
     return (data[2] << 16) | (data[1] << 8) | data[0];
 }
 
+void htole24(uint32_t val, uint8_t data[3]) {
+    data[0] = (uint8_t) val;
+    data[1] = (uint8_t)(val >> 8);
+    data[2] = (uint8_t)(val >> 16);
+}
+
 //convert hex digit to integer
 uint8_t hex2int(char hexchar) {
     switch (hexchar) {
diff --git a/armsrc/util.h b/armsrc/util.h
index fc519fe43..f592f1ff3 100644
--- a/armsrc/util.h
+++ b/armsrc/util.h
@@ -93,6 +93,7 @@ uint64_t bytes_to_num(uint8_t *src, size_t len);
 void rol(uint8_t *data, const size_t len);
 void lsl(uint8_t *data, size_t len);
 int32_t le24toh(uint8_t data[3]);
+void htole24(uint32_t val, uint8_t data[3]);
 uint8_t hex2int(char hexchar);
 
 void LED(int led, int ms);
diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index 38b01bd71..47fb487f9 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -1619,11 +1619,15 @@ void printMFUdumpEx(mfu_dump_t *card, uint16_t pages, uint8_t startpage) {
     PrintAndLogEx(NORMAL, "----------+-------------------------+---------");
     PrintAndLogEx(NORMAL, "Version   | %s| %s", sprint_hex(card->version, sizeof(card->version)), sprint_ascii(card->version, sizeof(card->version)));
     PrintAndLogEx(NORMAL, "TBD       | %-24s| %s", sprint_hex(card->tbo, sizeof(card->tbo)), sprint_ascii(card->tbo, sizeof(card->tbo)));
-    PrintAndLogEx(NORMAL, "Tearing   | %-24s| %s", sprint_hex(card->tearing, sizeof(card->tearing)), sprint_ascii(card->tearing, sizeof(card->tearing)));
-    PrintAndLogEx(NORMAL, "Pack      | %-24s| %s", sprint_hex(card->pack, sizeof(card->pack)), sprint_ascii(card->pack, sizeof(card->pack)));
     PrintAndLogEx(NORMAL, "TBD       | %-24s| %s", sprint_hex(card->tbo1, sizeof(card->tbo1)), sprint_ascii(card->tbo1, sizeof(card->tbo1)));
     PrintAndLogEx(NORMAL, "Signature1| %s| %s", sprint_hex(card->signature, 16), sprint_ascii(card->signature, 16));
     PrintAndLogEx(NORMAL, "Signature2| %s| %s", sprint_hex(card->signature + 16, 16), sprint_ascii(card->signature + 16, 16));
+    PrintAndLogEx(NORMAL, "Counter0  | %-24s| %s", sprint_hex(card->counter_tearing[0],     3), sprint_ascii(card->counter_tearing[0],     3));
+    PrintAndLogEx(NORMAL, "Tearing0  | %-24s| %s", sprint_hex(card->counter_tearing[0] + 3, 1), sprint_ascii(card->counter_tearing[0] + 3, 1));
+    PrintAndLogEx(NORMAL, "Counter1  | %-24s| %s", sprint_hex(card->counter_tearing[1],     3), sprint_ascii(card->counter_tearing[1],     3));
+    PrintAndLogEx(NORMAL, "Tearing1  | %-24s| %s", sprint_hex(card->counter_tearing[1] + 3, 1), sprint_ascii(card->counter_tearing[1] + 3, 1));
+    PrintAndLogEx(NORMAL, "Counter2  | %-24s| %s", sprint_hex(card->counter_tearing[2],     3), sprint_ascii(card->counter_tearing[2],     3));
+    PrintAndLogEx(NORMAL, "Tearing3  | %-24s| %s", sprint_hex(card->counter_tearing[2] + 3, 1), sprint_ascii(card->counter_tearing[2] + 3, 1));
     PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
     PrintAndLogEx(NORMAL, "\nBlock#   | Data        |lck| Ascii");
     PrintAndLogEx(NORMAL, "---------+-------------+---+------");
@@ -1889,8 +1893,7 @@ static int CmdHF14AMfUDump(const char *Cmd) {
     mfu_dump_t dump_file_data;
     uint8_t get_pack[] = {0, 0};
     uint8_t get_version[] = {0, 0, 0, 0, 0, 0, 0, 0};
-    uint8_t get_tearing[] = {0, 0, 0};
-    uint8_t get_counter[] = {0, 0, 0};
+    uint8_t get_counter_tearing[][4] = {{0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}};
     uint8_t dummy_pack[] = {0, 0};
     uint8_t get_signature[32];
     memset(get_signature, 0, sizeof(get_signature));
@@ -1920,8 +1923,8 @@ static int CmdHF14AMfUDump(const char *Cmd) {
 
         ulev1_getVersion(get_version, sizeof(get_version));
         for (uint8_t n = 0; n < 3; ++n) {
-            ulev1_readTearing(n, get_tearing + n, 1);
-            ulev1_readCounter(n, get_counter, sizeof(get_counter));
+            ulev1_readTearing(n, &get_counter_tearing[n][3], 1);
+            ulev1_readCounter(n, &get_counter_tearing[n][0], 3);
         }
 
         DropField();
@@ -1935,7 +1938,8 @@ static int CmdHF14AMfUDump(const char *Cmd) {
     }
 
     // format and add keys to block dump output
-    if (hasAuthKey) {
+    // only add keys if not partial read, and complete pages read
+    if (!is_partial && pages == card_mem_size && hasAuthKey) {
         // if we didn't swapendian before - do it now for the sprint_hex call
         // NOTE: default entry is bigendian (unless swapped), sprint_hex outputs little endian
         //       need to swap to keep it the same
@@ -1954,11 +1958,11 @@ static int CmdHF14AMfUDump(const char *Cmd) {
     }
 
     //add *special* blocks to dump
-    //iceman:  need to add counters and pwd values to the dump format
+    // pack and pwd saved into last pages of dump, if was not partial read
+    dump_file_data.pages = pages - 1;
     memcpy(dump_file_data.version, get_version, sizeof(dump_file_data.version));
-    memcpy(dump_file_data.tearing, get_tearing, sizeof(dump_file_data.tearing));
-    memcpy(dump_file_data.pack, get_pack, sizeof(dump_file_data.pack));
     memcpy(dump_file_data.signature, get_signature, sizeof(dump_file_data.signature));
+    memcpy(dump_file_data.counter_tearing, get_counter_tearing, sizeof(dump_file_data.counter_tearing));
     memcpy(dump_file_data.data, data, pages * 4);
 
     printMFUdumpEx(&dump_file_data, pages, startPage);
@@ -2092,16 +2096,22 @@ static int CmdHF14AMfURestore(const char *Cmd) {
     // read all data
     size_t bytes_read = fread(dump, 1, fsize, f);
     fclose(f);
-    if (bytes_read < 48) {
+    if (bytes_read < DUMP_PREFIX_LENGTH) {
         PrintAndLogEx(WARNING, "Error, dump file is too small");
         free(dump);
         return 1;
     }
 
-    PrintAndLogEx(INFO, "Restoring " _YELLOW_("%s")" to card", filename);
-
     mfu_dump_t *mem = (mfu_dump_t *)dump;
-    uint8_t pages = (bytes_read - 48) / 4;
+    uint8_t pages = (bytes_read - DUMP_PREFIX_LENGTH) / 4;
+
+    if (pages - 1 != mem->pages) {
+        PrintAndLogEx(WARNING, "Error, invalid dump, wrong page count");
+        free(dump);
+        return 1;
+    }
+
+    PrintAndLogEx(INFO, "Restoring " _YELLOW_("%s")" to card", filename);
 
     // print dump
     printMFUdumpEx(mem, pages, 0);
@@ -2134,7 +2144,7 @@ static int CmdHF14AMfURestore(const char *Cmd) {
 
             if (read_key) {
                 // try reading key from dump and use.
-                memcpy(c.d.asBytes, mem->data + (bytes_read - 48 - 8), 4);
+                memcpy(c.d.asBytes, mem->data + (bytes_read - DUMP_PREFIX_LENGTH - 8), 4);
             } else {
                 memcpy(c.d.asBytes,  p_authkey, 4);
             }
@@ -2150,10 +2160,9 @@ static int CmdHF14AMfURestore(const char *Cmd) {
             memcpy(c.d.asBytes + 4, authkey, 4);
         }
 
-        // pack
+        // pack now stored in dump
         c.arg[0] = MFU_NTAG_SPECIAL_PACK;
-        c.d.asBytes[0] = mem->pack[0];
-        c.d.asBytes[1] = mem->pack[1];
+        memcpy(c.d.asBytes, mem->data + (bytes_read - DUMP_PREFIX_LENGTH - 4), 2);
         c.d.asBytes[2] = 0;
         c.d.asBytes[3] = 0;
         PrintAndLogEx(NORMAL, "special PACK    block written 0x%X - %s\n", MFU_NTAG_SPECIAL_PACK, sprint_hex(c.d.asBytes, 4));
diff --git a/client/cmdhfmfu.h b/client/cmdhfmfu.h
index 444a55ea6..ea631b171 100644
--- a/client/cmdhfmfu.h
+++ b/client/cmdhfmfu.h
@@ -12,16 +12,16 @@
 #include "comms.h"
 #include "loclass/fileutils.h"
 
-#define DUMP_PREFIX_LENGTH 48
+// Length must be aligned to 4 bytes (UL/NTAG page)
+#define DUMP_PREFIX_LENGTH 56
 
 typedef struct {
     uint8_t version[8];
     uint8_t tbo[2];
-    uint8_t tearing[3];
-    uint8_t pack[2];
     uint8_t tbo1[1];
+    uint8_t pages;                  // max page number in dump
     uint8_t signature[32];
-    //uint8_t counter[3];
+    uint8_t counter_tearing[3][4];  // 3 bytes counter, 1 byte tearing flag
     uint8_t data[1024];
 } mfu_dump_t;
 
diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index 72d3e26af..1aa11cfd6 100644
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -221,13 +221,16 @@ int saveFileJSON(const char *preferredName, const char *suffix, JSONFileType fty
             JsonSaveBufAsHexCompact(root, "$.Card.UID", uid, sizeof(uid));
             JsonSaveBufAsHexCompact(root, "$.Card.Version", tmp->version, sizeof(tmp->version));
             JsonSaveBufAsHexCompact(root, "$.Card.TBO_0", tmp->tbo, sizeof(tmp->tbo));
-            JsonSaveBufAsHexCompact(root, "$.Card.Tearing", tmp->tearing, sizeof(tmp->tearing));
-            JsonSaveBufAsHexCompact(root, "$.Card.Pack",  tmp->pack, sizeof(tmp->pack));
             JsonSaveBufAsHexCompact(root, "$.Card.TBO_1", tmp->tbo1, sizeof(tmp->tbo1));
             JsonSaveBufAsHexCompact(root, "$.Card.Signature", tmp->signature, sizeof(tmp->signature));
-            JsonSaveStr(root, "$.Card.Counter", "N/A");
+            JsonSaveBufAsHexCompact(root, "$.Card.Counter0", tmp->counter_tearing[0], 3);
+            JsonSaveBufAsHexCompact(root, "$.Card.Tearing0", tmp->counter_tearing[0] + 3, 1);
+            JsonSaveBufAsHexCompact(root, "$.Card.Counter1", tmp->counter_tearing[1], 3);
+            JsonSaveBufAsHexCompact(root, "$.Card.Tearing1", tmp->counter_tearing[1] + 3, 1);
+            JsonSaveBufAsHexCompact(root, "$.Card.Counter2", tmp->counter_tearing[2], 3);
+            JsonSaveBufAsHexCompact(root, "$.Card.Tearing2", tmp->counter_tearing[2] + 3, 1);
 
-            // size of header 48b
+            // size of header 56b
             size_t len = (datalen - DUMP_PREFIX_LENGTH) / 4;
 
             for (size_t i = 0; i < len; i++) {
diff --git a/client/scripts/dumptoemul-mfu.lua b/client/scripts/dumptoemul-mfu.lua
index 34fbdc1d0..fb14077d5 100644
--- a/client/scripts/dumptoemul-mfu.lua
+++ b/client/scripts/dumptoemul-mfu.lua
@@ -104,11 +104,11 @@ local function main(args)
     -- lua uses start index and endindex,  not count.
     -- UID is  3three skip bcc0 then 4bytes.
     -- 1 lua is one-index.
-    -- 1 + 96 (48*2)  new dump format has version/signature/counter data here
-    -- 97,98,99,100,101,102   UID first three bytes
-    -- 103,104 bcc0
-    -- 105---  UID last four bytes
-    local uid = string.sub(dumpdata, 97, 97+5)..string.sub(dumpdata, 97+8, 97+8+7)
+    -- 1 + 112 (56*2)  new dump format has version/signature/counter data here
+    -- 113,114,115,116,117,118   UID first three bytes
+    -- 119,120 bcc0
+    -- 121---  UID last four bytes
+    local uid = string.sub(dumpdata, 113, 113+5)..string.sub(dumpdata, 113+8, 113+8+7)
     output = output or (uid .. ".eml")
 
     -- Format some linebreaks

From e0cd5850f9ab02ef6dbe924800cbfdda51505d6b Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 21 Apr 2019 12:02:30 +0200
Subject: [PATCH 1369/1938] usart: clean, doc, now uart_posix 60ms

---
 common/usart.c           | 22 +++++++---------------
 doc/new_frame_format.txt | 18 ++++++++++++++++--
 uart/uart_posix.c        |  7 ++++---
 3 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/common/usart.c b/common/usart.c
index 56f6bb446..ecbd3a8e3 100644
--- a/common/usart.c
+++ b/common/usart.c
@@ -119,7 +119,7 @@ uint32_t usart_read_ng(uint8_t *data, size_t len) {
                 us_rxfifo_low = 0;
         }
         if (try++ == maxtry) {
-            Dbprintf_usb("Dbg USART TIMEOUT");
+//            Dbprintf_usb("Dbg USART TIMEOUT");
             break;
         }
     }
@@ -133,8 +133,6 @@ inline int16_t usart_writebuffer(uint8_t *data, size_t len) {
 
     // Wait for one free PDC bank
     while (pUS1->US_TCR && pUS1->US_TNCR) {};
-    // ? alternative to wait for end of transmissions?
-    // while (!(pUS1->US_CSR & AT91C_US_ENDTX)) {};
 
     // Check if the current PDC bank is free
     if (pUS1->US_TCR == 0) {
@@ -149,8 +147,6 @@ inline int16_t usart_writebuffer(uint8_t *data, size_t len) {
         // we shouldn't be here
         return 0;
     }
-    // Make sure TX transfer is enabled
-    pUS1->US_PTCR = AT91C_PDC_TXTEN;// | AT91C_PDC_RXTEN;
     //wait until finishing all transfers
     while (pUS1->US_TNCR || pUS1->US_TCR) {};
     return len;
@@ -202,19 +198,15 @@ void usart_init(void) {
     pUS1->US_TCR = 0;
     pUS1->US_TNPR = (uint32_t)0;
     pUS1->US_TNCR = 0;
-    pUS1->US_RPR = (uint32_t)0;
-    pUS1->US_RCR = 0;
-    pUS1->US_RNPR = (uint32_t)0;
-    pUS1->US_RNCR = 0;
-
-    // re-enable receiver / transmitter
-    pUS1->US_CR = (AT91C_US_RXEN | AT91C_US_TXEN);
-
-    // ready to receive
     pUS1->US_RPR = (uint32_t)us_inbuf1;
     pUS1->US_RCR = USART_BUFFLEN;
     usart_cur_inbuf = us_inbuf1;
     pUS1->US_RNPR = (uint32_t)us_inbuf2;
     pUS1->US_RNCR = USART_BUFFLEN;
-    pUS1->US_PTCR = AT91C_PDC_RXTEN;
+
+    // re-enable receiver / transmitter
+    pUS1->US_CR = (AT91C_US_RXEN | AT91C_US_TXEN);
+
+    // ready to receive and transmit
+    pUS1->US_PTCR = AT91C_PDC_RXTEN | AT91C_PDC_TXTEN;
 }
diff --git a/doc/new_frame_format.txt b/doc/new_frame_format.txt
index 3ca272be4..58aacc3d6 100644
--- a/doc/new_frame_format.txt
+++ b/doc/new_frame_format.txt
@@ -197,11 +197,25 @@ New bootrom might need to also still support old frame format, to ease flashing
 Timings
 =======
 
-Needed to increase client RX uart timeout: it was 30ms, we put arbitrarily 300ms as for TCP
+(common/usart.h)
+USART_BAUD_RATE defined
+
+     9600: #db#   USB Transfer Speed PM3 -> Client =    934 Bytes/s
+   115200: #db#   USB Transfer Speed PM3 -> Client =  11137 Bytes/s
+   460800: #db#   USB Transfer Speed PM3 -> Client =  43119 Bytes/s
+linux usb: #db#   USB Transfer Speed PM3 -> Client = 666624 Bytes/s (~7Mbaud)
+
+
+At some point, when still activating AT91C_PDC_TXTEN in usart_writebuffer, we needed to increase client uart timeout.
+We tried 300ms, but then USB flasher failed :
+[=] UART Setting serial baudrate 460800
+.Found
+Error: Unknown Proxmark3 mode
+Now we're at 60ms
 (uart/uart_posix.c)
 struct timeval timeout = {
     .tv_sec  =     0, // 0 second
-    .tv_usec = 300000  // 300 000 micro seconds
+    .tv_usec = 60000  // 60 000 micro seconds
 };
 
 Add automatically some communication delay in the WaitForResponseTimeout timeout
diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index 41e4338b0..dac473379 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -70,11 +70,12 @@ typedef struct {
     term_info tiNew;  // Terminal info during the transaction
 } serial_port_unix;
 
-// Set time-out on 300 milliseconds
-// It was 30 ms for USB but we need more to receive from USART
+// To be checked, receiving from USART might need more than 30ms
+// if we get errors about partial packet reception
+// but e.g. extending to 300ms makes USB flasher failing
 struct timeval timeout = {
     .tv_sec  =     0, // 0 second
-    .tv_usec = 300000  // 300 000 micro seconds
+    .tv_usec = 60000  // 60 000 micro seconds
 };
 
 serial_port uart_open(const char *pcPortName, uint32_t speed) {

From ba0c2d7592dc5167979754c5141af96f362e9949 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 21 Apr 2019 12:11:25 +0200
Subject: [PATCH 1370/1938] doc timings

---
 doc/new_frame_format.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/new_frame_format.txt b/doc/new_frame_format.txt
index 58aacc3d6..0b96e8a6d 100644
--- a/doc/new_frame_format.txt
+++ b/doc/new_frame_format.txt
@@ -220,6 +220,10 @@ struct timeval timeout = {
 
 Add automatically some communication delay in the WaitForResponseTimeout timeout
 Only when using FPC, timeout = 2* empirically measured delay (FTDI cable)
+Empirically measured delay (FTDI cable) with "hw pingng 512" :
+   usb ->    6..32ms
+460800 ->   40..70ms
+  9600 -> 1100..1150ms
 (client/comms.c)
 static size_t communication_delay(void) {
     if (send_via_fpc)  // needed also for Windows USB USART??

From 06cb40afbdcab237a324ed9cb457a182ca9c2b14 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 21 Apr 2019 12:11:44 +0200
Subject: [PATCH 1371/1938] doc timings

---
 doc/new_frame_format.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/new_frame_format.txt b/doc/new_frame_format.txt
index 0b96e8a6d..6f1d8b52c 100644
--- a/doc/new_frame_format.txt
+++ b/doc/new_frame_format.txt
@@ -221,8 +221,8 @@ struct timeval timeout = {
 Add automatically some communication delay in the WaitForResponseTimeout timeout
 Only when using FPC, timeout = 2* empirically measured delay (FTDI cable)
 Empirically measured delay (FTDI cable) with "hw pingng 512" :
-   usb ->    6..32ms
-460800 ->   40..70ms
+   usb ->    6..  32ms
+460800 ->   40..  70ms
   9600 -> 1100..1150ms
 (client/comms.c)
 static size_t communication_delay(void) {

From f8de50f5c9735ea8087f45766f2d7ad49d7c4ee3 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 21 Apr 2019 13:19:35 +0200
Subject: [PATCH 1372/1938] document usart RX FIFO

---
 doc/new_frame_format.txt | 37 +++++++++++++++++++++++++++++++++----
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/doc/new_frame_format.txt b/doc/new_frame_format.txt
index 6f1d8b52c..fefdb2c49 100644
--- a/doc/new_frame_format.txt
+++ b/doc/new_frame_format.txt
@@ -133,14 +133,11 @@ On the Proxmark3, for receiving frames:
 *****************************************
 PacketCommandNG
 *****************************************
-AppMain calls receive_ng(common/cmd.c) which calls usb_read_ng to get a PacketCommandNG, then passes it to PacketReceived.
+AppMain calls receive_ng(common/cmd.c) which calls usb_read_ng/usart_read_ng to get a PacketCommandNG, then passes it to PacketReceived.
 (no matter if it's an old frame or a new frame, check PacketCommandNG "ng" field to know if there are oldargs)
 PacketReceive is the commands broker.
 Old handlers will still find their stuff in "oldarg" field.
 
-TODO AppMain still calls directly usart_readbuffer for USART and does not support new frames on USART.
-
-
 On the Proxmark3, for sending frames:
 -------------------------------------
 (common/cmd.c)
@@ -192,7 +189,39 @@ TODO
 We need to be very careful to make a flasher that can deal with old & new bootroms.
 New bootrom might need to also still support old frame format, to ease flashing back to repos supporting the old format...
 
+New usart RX FIFO
+=================
 
+USART code has been rewritten to cope with unknown size packets.
+* using USART full duplex with double DMA buffer on RX & TX
+* using internal FIFO for RX
+
+usart_init:
+* USART is activated all way long from usart_init(), no need to touch it in RX/TX routines: pUS1->US_PTCR = AT91C_PDC_RXTEN | AT91C_PDC_TXTEN
+
+usart_writebuffer:
+* still using double DMA but accepts arbitrary packet sizes
+* removed unneeded memcpy.
+* wait for both DMA buffers to be treated before returning (TODO still needed?)
+
+usart_read_ng:
+* user tells expected packet length
+* relies on usart_rxdata_available to know if there is data in our FIFO buffer
+* fetches data from our FIFO
+* dynamic number of tries (depending on FPC speed) to wait for asked data
+
+usart_rxdata_available:
+* polls usart_fill_rxfifo
+* returns number of bytes available in our FIFO
+
+usart_fill_rxfifo:
+* if next DMA buffer got moved to current buffer (US_RNCR == 0), it means one DMA buffer is full
+  * transfer current DMA buffer data to our FIFO
+  * swap to the other DMA buffer
+  * provide the emptied DMA buffer as next DMA buffer
+* if current DMA buffer is partially filled
+  * transfer available data to our FIFO
+  * remember how many bytes we already copied to our FIFO
 
 Timings
 =======

From 3dd1f1c78c01501475083b6ec51bd75a5c679116 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 21 Apr 2019 14:10:31 +0200
Subject: [PATCH 1373/1938] make style (hmm not perfect, we'll have to live
 with it I guess)

---
 common/usart.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/usart.c b/common/usart.c
index ecbd3a8e3..8d9b74257 100644
--- a/common/usart.c
+++ b/common/usart.c
@@ -101,7 +101,7 @@ uint32_t usart_read_ng(uint8_t *data, size_t len) {
 //    uint32_t highest_observed_try = 0;
     // Empirical max try observed: 3000000 / USART_BAUD_RATE
     // Let's take 10x
-    uint32_t maxtry = 10 * ( 3000000 / USART_BAUD_RATE );
+    uint32_t maxtry = 10 * (3000000 / USART_BAUD_RATE);
 
     while (len) {
         uint32_t available = usart_rxdata_available();
@@ -120,8 +120,8 @@ uint32_t usart_read_ng(uint8_t *data, size_t len) {
         }
         if (try++ == maxtry) {
 //            Dbprintf_usb("Dbg USART TIMEOUT");
-            break;
-        }
+                break;
+            }
     }
 //    highest_observed_try = MAX(highest_observed_try, try);
 //    Dbprintf_usb("Dbg USART max observed try %i", highest_observed_try);

From a2e55be4681a15217983dcabbac9b3e513f84463 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 21 Apr 2019 17:34:56 +0200
Subject: [PATCH 1374/1938] new format doc

---
 armsrc/appmain.c         |  2 +-
 doc/new_frame_format.txt | 61 ++++++++++++++++++++++++++++++++++++----
 2 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 63a7dba10..668eaa267 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -363,7 +363,7 @@ void SendVersion(void) {
 }
 
 // measure the USB Speed by sending SpeedTestBufferSize bytes to client and measuring the elapsed time.
-// Note: this mimics GetFromBigbuf(), i.e. we have the overhead of the PacketCommandOLD structure included.
+// Note: this mimics GetFromBigbuf(), i.e. we have the overhead of the PacketCommandNG structure included.
 void printUSBSpeed(void) {
     Dbprintf("USB Speed");
     Dbprintf("  Sending USB packets to client...");
diff --git a/doc/new_frame_format.txt b/doc/new_frame_format.txt
index fefdb2c49..283cea500 100644
--- a/doc/new_frame_format.txt
+++ b/doc/new_frame_format.txt
@@ -226,13 +226,20 @@ usart_fill_rxfifo:
 Timings
 =======
 
-(common/usart.h)
-USART_BAUD_RATE defined
+Reference (before new format):
 
-     9600: #db#   USB Transfer Speed PM3 -> Client =    934 Bytes/s
-   115200: #db#   USB Transfer Speed PM3 -> Client =  11137 Bytes/s
-   460800: #db#   USB Transfer Speed PM3 -> Client =  43119 Bytes/s
-linux usb: #db#   USB Transfer Speed PM3 -> Client = 666624 Bytes/s (~7Mbaud)
+    linux usb: #db#   USB Transfer Speed PM3 -> Client = 545109 Bytes/s
+On a Windows VM:
+proxspace usb: #db#   USB Transfer Speed PM3 -> Client = 233998 Bytes/s
+
+
+(common/usart.h)
+USART_BAUD_RATE defined there
+
+         9600: #db#   USB Transfer Speed PM3 -> Client =    934 Bytes/s
+       115200: #db#   USB Transfer Speed PM3 -> Client =  11137 Bytes/s
+       460800: #db#   USB Transfer Speed PM3 -> Client =  43119 Bytes/s
+    linux usb: #db#   USB Transfer Speed PM3 -> Client = 666624 Bytes/s (equiv. to ~7Mbaud)
 
 
 At some point, when still activating AT91C_PDC_TXTEN in usart_writebuffer, we needed to increase client uart timeout.
@@ -267,4 +274,46 @@ uint32_t usart_read_ng(uint8_t *data, size_t len) {
 // Let's take 10x
 uint32_t maxtry = 10 * ( 3000000 / USART_BAUD_RATE );
 
+Reference frames
+================
+
+Captured on linux USB.
+
+For helping debug...
+
+Initial connection:
+TestProxmark: SendCommandOLD(CMD_PING, 0, 0, 0, NULL, 0);
+->544=0901000000000000000000000000000000000000000000000000000000000000  -> OLD
+CMD_PING: reply_mix(CMD_ACK, reply_via_fpc, 0, 0, 0, 0);
+<-36=504d336218000000ff0000000000000000000000000000000000000000000000   <- MIX
+main_loop pm3_version: SendCommandOLD(CMD_VERSION, 0, 0, 0, NULL, 0);
+->544=0701000000000000000000000000000000000000000000000000000000000000  -> OLD
+SendVersion:  reply_old(CMD_ACK,...);
+<-128=ff000000000000004f0a0b270000000009710300000000000000000000000000  <- OLD
+<-128=6572696d656e74616c5f7661726c656e2f33646431663163372d64697274792d
+<-128=484620696d616765206275696c7420666f7220327333307671313030206f6e20
+<-128=0000000000000000000000000000000000000000000000000000000000000000
+<-32=0000000000000000000000000000000000000000000000000000000000000000
+
+"hw ping"
+CmdPing  SendCommandMIX(CMD_PING, 0, 0, 0, NULL, 0);
+->34=504d336118000901000000000000000000000000000000000000000000000000   -> MIX
+CMD_PING reply_mix(CMD_ACK, reply_via_fpc, 0, 0, 0, 0);
+<-36=504d336218000000ff0000000000000000000000000000000000000000000000   <- MIX
+
+"hw pingng"
+CmdPingNG  SendCommandNG(CMD_PING, data, len);
+->10=504d3361008009016133                                               -> NG
+CMD_PING reply_ng(CMD_PING, PM3_SUCCESS, packet->data.asBytes, packet->length);
+<-12=504d33620080000009016233                                           <- NG
+
+"hw pingng 512"
+CmdPingNG  SendCommandNG(CMD_PING, data, len);
+->522=504d336100820901000102030405060708090a0b0c0d0e0f1011121314151617  -> NG
+CMD_PING reply_ng(CMD_PING, PM3_SUCCESS, packet->data.asBytes, packet->length);
+<-128=504d3362008200000901000102030405060708090a0b0c0d0e0f101112131415  <- NG
+<-128=767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495
+<-128=f6f7f8f9fafbfcfdfeff000102030405060708090a0b0c0d0e0f101112131415
+<-128=767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495
+<-12=f6f7f8f9fafbfcfdfeff6233
 

From 75ee60f267d33de35154cfa7e56f3c30b6f2a563 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 21 Apr 2019 23:26:51 +0200
Subject: [PATCH 1375/1938] WaitForResponseTimeoutW: fix, no
 communication_delay when timeout=-1

---
 client/comms.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/comms.c b/client/comms.c
index 038e90fea..305e84281 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -596,7 +596,9 @@ bool WaitForResponseTimeoutW(uint32_t cmd, PacketResponseNG *response, size_t ms
         response = &resp;
 
     // Add delay depending on the communication channel & speed
-    ms_timeout += communication_delay();
+    if (ms_timeout != (size_t)-1)
+        ms_timeout += communication_delay();
+
     uint64_t start_time = msclock();
 
     // Wait until the command is received

From 913c03d3c4792bdd167c1429ce2f7adfd70b9e32 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 21 Apr 2019 23:56:04 +0200
Subject: [PATCH 1376/1938] Reset WaitForResponse timeout every time we get a
 packet as cmds sending a lot of Dbprintf msgs can take ages on slow links
 e.g. "hw status" on 9600 baud link takes 26.5s with "reply_old" Dbprintf

---
 client/comms.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/client/comms.c b/client/comms.c
index 305e84281..26c7e04f3 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -50,6 +50,10 @@ static int cmd_tail = 0;
 // to lock rxBuffer operations from different threads
 static pthread_mutex_t rxBufferMutex = PTHREAD_MUTEX_INITIALIZER;
 
+// Global start time for WaitForResponseTimeout, so we can reset timeout when we get Dbprintf packets
+// as sending lot of these packets can slow down things wuite a lot on slow links (e.g. hw status at 9600)
+static uint64_t WaitForResponseTimeout_start_time;
+
 static bool dl_it(uint8_t *dest, uint32_t bytes, uint32_t start_index, PacketResponseNG *response, size_t ms_timeout, bool show_warning, uint32_t rec_cmd);
 
 // These wrappers are required because it is not possible to access a static
@@ -240,6 +244,9 @@ static void PacketResponseReceived(PacketResponseNG *packet) {
 //  PrintAndLogEx(NORMAL, "RECV %s magic %08x length %04x status %04x crc %04x cmd %04x",
 //                packet->ng ? "NG" : "OLD", packet->magic, packet->length, packet->status, packet->crc, packet->cmd);
 
+    // we got a packet, reset WaitForResponseTimeout timeout
+    WaitForResponseTimeout_start_time = msclock();
+
     switch (packet->cmd) {
         // First check if we are handling a debug message
         case CMD_DEBUG_PRINT_STRING: {
@@ -599,29 +606,29 @@ bool WaitForResponseTimeoutW(uint32_t cmd, PacketResponseNG *response, size_t ms
     if (ms_timeout != (size_t)-1)
         ms_timeout += communication_delay();
 
-    uint64_t start_time = msclock();
+    WaitForResponseTimeout_start_time = msclock();
 
     // Wait until the command is received
     while (true) {
 
         while (getReply(response)) {
             if (cmd == CMD_UNKNOWN || response->cmd == cmd) {
-//                PrintAndLogEx(INFO, "Waited %i ms", msclock() - start_time);
+//                PrintAndLogEx(INFO, "Waited %i ms", msclock() - WaitForResponseTimeout_start_time);
                 return true;
             }
         }
 
-        if (msclock() - start_time > ms_timeout)
+        if (msclock() - WaitForResponseTimeout_start_time > ms_timeout)
             break;
 
-        if (msclock() - start_time > 3000 && show_warning) {
+        if (msclock() - WaitForResponseTimeout_start_time > 3000 && show_warning) {
             // 3 seconds elapsed (but this doesn't mean the timeout was exceeded)
             PrintAndLogEx(INFO, "Waiting for a response from the proxmark3...");
             PrintAndLogEx(INFO, "You can cancel this operation by pressing the pm3 button");
             show_warning = false;
         }
     }
-//    PrintAndLogEx(INFO, "Wait timeout after %i ms", msclock() - start_time);
+//    PrintAndLogEx(INFO, "Wait timeout after %i ms", msclock() - WaitForResponseTimeout_start_time);
     return false;
 }
 

From 81780e5c980c9c1e6af96daa6098c5a621ba1a0d Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 21 Apr 2019 23:58:53 +0200
Subject: [PATCH 1377/1938] DbpStringEx using now reply_mix. hw status at 9600:
 from 26.5s to 7s

---
 armsrc/appmain.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 668eaa267..aa85df22d 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -117,7 +117,7 @@ void print_result(char *name, uint8_t *buf, size_t len) {
 void DbpStringEx(char *str, uint32_t cmd) {
 #if DEBUG
     uint8_t len = strlen(str);
-    reply_old(CMD_DEBUG_PRINT_STRING, len, cmd, 0, (uint8_t *)str, len);
+    reply_mix(CMD_DEBUG_PRINT_STRING, len, cmd, 0, (uint8_t *)str, len);
 #endif
 }
 

From cdd4177968c0539e88f3acce7a901a1b3a8a298b Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Mon, 22 Apr 2019 00:30:01 +0200
Subject: [PATCH 1378/1938] usart_writebuffer_sync simplified as we're always
 sending in blocking mode anyway

---
 armsrc/appmain.c |  6 +++---
 common/cmd.c     |  4 ++--
 common/usart.c   | 26 ++++++++------------------
 3 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index aa85df22d..298f4df7f 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1100,7 +1100,7 @@ static void PacketReceived(PacketCommandNG *packet) {
             strncat(at, s_at, sizeof(at) - strlen(at) - 1);
             DbpString("Try AT baud rate setting");
             usart_init();
-            int16_t res = usart_writebuffer((uint8_t*)&at, sizeof(at));
+            int16_t res = usart_writebuffer_sync((uint8_t*)&at, sizeof(at));
             WaitMS(1);
             Dbprintf("SEND %d | %c%c%c%c%c%c%c%c%c%c%c", res,  at[0], at[1], at[2], at[3], at[4], at[5], at[6], at[7], at[8], at[9], at[10]);
 
@@ -1122,7 +1122,7 @@ static void PacketReceived(PacketCommandNG *packet) {
             }
 
             static const char *welcome = "Proxmark3 Serial interface via FPC ready\r\n";
-            usart_writebuffer((uint8_t *)welcome, strlen(welcome));
+            usart_writebuffer_sync((uint8_t *)welcome, strlen(welcome));
 
             sprintf(dest, "| bytes 0x%02x 0x%02x 0x%02x 0x%02x\r\n"
                     , packet->data.asBytes[0]
@@ -1130,7 +1130,7 @@ static void PacketReceived(PacketCommandNG *packet) {
                     , packet->data.asBytes[2]
                     , packet->data.asBytes[3]
                    );
-            usart_writebuffer((uint8_t *)dest, strlen(dest));
+            usart_writebuffer_sync((uint8_t *)dest, strlen(dest));
 
 
             LED_A_ON();
diff --git a/common/cmd.c b/common/cmd.c
index fb8396051..13ca856d8 100644
--- a/common/cmd.c
+++ b/common/cmd.c
@@ -72,7 +72,7 @@ int16_t reply_old(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, voi
 
     if (reply_via_fpc) {
 #ifdef WITH_FPC_HOST
-        sendlen = usart_writebuffer((uint8_t *)&txcmd, sizeof(PacketResponseOLD));
+        sendlen = usart_writebuffer_sync((uint8_t *)&txcmd, sizeof(PacketResponseOLD));
 //        Dbprintf_usb("Sent %i bytes over usart", len);
 #else
         return PM3_EDEVNOTSUPP;
@@ -124,7 +124,7 @@ static int16_t reply_ng_internal(uint16_t cmd, int16_t status, uint8_t *data, si
 
     if (reply_via_fpc) {
 #ifdef WITH_FPC_HOST
-        sendlen = usart_writebuffer((uint8_t *)&txBufferNG, txBufferNGLen);
+        sendlen = usart_writebuffer_sync((uint8_t *)&txBufferNG, txBufferNGLen);
 //        Dbprintf_usb("Sent %i bytes over usart", len);
 #else
         return PM3_EDEVNOTSUPP;
diff --git a/common/usart.c b/common/usart.c
index 8d9b74257..cb4153062 100644
--- a/common/usart.c
+++ b/common/usart.c
@@ -129,25 +129,15 @@ uint32_t usart_read_ng(uint8_t *data, size_t len) {
 }
 
 // transfer from device to client
-inline int16_t usart_writebuffer(uint8_t *data, size_t len) {
+inline int16_t usart_writebuffer_sync(uint8_t *data, size_t len) {
 
-    // Wait for one free PDC bank
-    while (pUS1->US_TCR && pUS1->US_TNCR) {};
-
-    // Check if the current PDC bank is free
-    if (pUS1->US_TCR == 0) {
-        pUS1->US_TPR = (uint32_t)data;
-        pUS1->US_TCR = len;
-    }
-    // Check if the backup PDC bank is free
-    else if (pUS1->US_TNCR == 0) {
-        pUS1->US_TNPR = (uint32_t)data;
-        pUS1->US_TNCR = len;
-    } else {
-        // we shouldn't be here
-        return 0;
-    }
-    //wait until finishing all transfers
+    // Wait for current PDC bank to be free
+    // (and check next bank too, in case there will be a usart_writebuffer_async)
+    while (pUS1->US_TNCR || pUS1->US_TCR) {};
+    pUS1->US_TPR = (uint32_t)data;
+    pUS1->US_TCR = len;
+    // Wait until finishing all transfers to make sure "data" buffer can be discarded
+    // (if we don't wait here, bulk send as e.g. "hw status" will fail)
     while (pUS1->US_TNCR || pUS1->US_TCR) {};
     return len;
 }

From cf68c972f066455a3b4d2afab0491a35306e6d4f Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Mon, 22 Apr 2019 00:30:39 +0200
Subject: [PATCH 1379/1938] forgot usart.h

---
 common/usart.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/usart.h b/common/usart.h
index 1f37429c8..1b3c6ded7 100644
--- a/common/usart.h
+++ b/common/usart.h
@@ -12,7 +12,7 @@
 void usart_init(void);
 void usart_close(void);
 
-int16_t usart_writebuffer(uint8_t *data, size_t len);
+int16_t usart_writebuffer_sync(uint8_t *data, size_t len);
 uint32_t usart_read_ng(uint8_t *data, size_t len);
 uint16_t usart_rxdata_available(void);
 #define USART_BUFFLEN 512

From eebea8c088bea69856b9c770d51a7ef039916475 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Mon, 22 Apr 2019 01:33:32 +0200
Subject: [PATCH 1380/1938] DbpStringEx using reply_ng

---
 armsrc/appmain.c | 10 ++++++++--
 client/comms.c   | 20 +++++++++++++++++---
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 298f4df7f..83a639227 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -116,8 +116,14 @@ void print_result(char *name, uint8_t *buf, size_t len) {
 
 void DbpStringEx(char *str, uint32_t cmd) {
 #if DEBUG
-    uint8_t len = strlen(str);
-    reply_mix(CMD_DEBUG_PRINT_STRING, len, cmd, 0, (uint8_t *)str, len);
+    struct {
+        uint16_t flag;
+        uint8_t buf[USB_CMD_DATA_SIZE - sizeof(uint16_t)];
+    } PACKED data;
+    data.flag = cmd;
+    uint16_t len = MIN(strlen(str), sizeof(data.buf));
+    memcpy(data.buf, str, len);
+    reply_ng(CMD_DEBUG_PRINT_STRING, PM3_SUCCESS, (uint8_t*)&data, sizeof(data.flag) + len);
 #endif
 }
 
diff --git a/client/comms.c b/client/comms.c
index 26c7e04f3..24f43e4b0 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -253,9 +253,23 @@ static void PacketResponseReceived(PacketResponseNG *packet) {
 
             char s[USB_CMD_DATA_SIZE + 1];
             memset(s, 0x00, sizeof(s));
-            size_t len = MIN(packet->oldarg[0], USB_CMD_DATA_SIZE);
-            memcpy(s, packet->data.asBytes, len);
-            uint64_t flag = packet->oldarg[1];
+
+            size_t len;
+            uint16_t flag;
+            if (packet->ng) {
+                struct d {
+                    uint16_t flag;
+                    uint8_t buf[USB_CMD_DATA_SIZE - sizeof(uint16_t)];
+                } PACKED;
+                struct d* data = (struct d*)&packet->data.asBytes;
+                len = packet->length - sizeof(data->flag);
+                memcpy(s, data->buf, len);
+                flag = data->flag;
+            } else {
+                len = MIN(packet->oldarg[0], USB_CMD_DATA_SIZE);
+                memcpy(s, packet->data.asBytes, len);
+                flag = packet->oldarg[1];
+            }
 
             switch (flag) {
                 case FLAG_RAWPRINT:

From 4d0875442f12d85a4ab8cfba9bd4f1f444bdc612 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Mon, 22 Apr 2019 01:33:39 +0200
Subject: [PATCH 1381/1938] uart_posix rx timeouts

---
 uart/uart_posix.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index dac473379..f4123b6d3 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -70,12 +70,15 @@ typedef struct {
     term_info tiNew;  // Terminal info during the transaction
 } serial_port_unix;
 
-// To be checked, receiving from USART might need more than 30ms
-// if we get errors about partial packet reception
-// but e.g. extending to 300ms makes USB flasher failing
+// Receiving from USART need more than 30ms as we used on USB
+// else we get errors about partial packet reception
+// Now we're using 100ms
+// FTDI   9600 hw status -> we need 20ms
+// FTDI 115200 hw status -> we need 50ms
+// FTDI 460800 hw status -> we need 30ms
 struct timeval timeout = {
-    .tv_sec  =     0, // 0 second
-    .tv_usec = 60000  // 60 000 micro seconds
+    .tv_sec  =      0, // 0 second
+    .tv_usec = 100000  // 100 000 micro seconds
 };
 
 serial_port uart_open(const char *pcPortName, uint32_t speed) {

From c4e16ebb9b43e90bd152ba6870721da396c60d26 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Mon, 22 Apr 2019 01:36:58 +0200
Subject: [PATCH 1382/1938] update new frames doc

---
 doc/new_frame_format.txt | 54 +++++++++++++++++++++++++++++++---------
 1 file changed, 42 insertions(+), 12 deletions(-)

diff --git a/doc/new_frame_format.txt b/doc/new_frame_format.txt
index 283cea500..00c1bfaa9 100644
--- a/doc/new_frame_format.txt
+++ b/doc/new_frame_format.txt
@@ -199,10 +199,12 @@ USART code has been rewritten to cope with unknown size packets.
 usart_init:
 * USART is activated all way long from usart_init(), no need to touch it in RX/TX routines: pUS1->US_PTCR = AT91C_PDC_RXTEN | AT91C_PDC_TXTEN
 
-usart_writebuffer:
-* still using double DMA but accepts arbitrary packet sizes
-* removed unneeded memcpy.
-* wait for both DMA buffers to be treated before returning (TODO still needed?)
+usart_writebuffer_sync:
+* still using DMA but accepts arbitrary packet sizes
+* removed unneeded memcpy
+* wait for DMA buffer to be treated before returning, therefore "sync"
+* we could make an async version but caller must be sure the DMA buffer remains available!
+* as it's sync, no need for next DMA buffer
 
 usart_read_ng:
 * user tells expected packet length
@@ -242,16 +244,16 @@ USART_BAUD_RATE defined there
     linux usb: #db#   USB Transfer Speed PM3 -> Client = 666624 Bytes/s (equiv. to ~7Mbaud)
 
 
-At some point, when still activating AT91C_PDC_TXTEN in usart_writebuffer, we needed to increase client uart timeout.
-We tried 300ms, but then USB flasher failed :
-[=] UART Setting serial baudrate 460800
-.Found
-Error: Unknown Proxmark3 mode
-Now we're at 60ms
 (uart/uart_posix.c)
+// Receiving from USART need more than 30ms as we used on USB
+// else we get errors about "Received packet frame ... too short"
+// Now we're using 100ms
+// FTDI   9600 hw status -> we need 20ms
+// FTDI 115200 hw status -> we need 50ms
+// FTDI 460800 hw status -> we need 30ms
 struct timeval timeout = {
-    .tv_sec  =     0, // 0 second
-    .tv_usec = 60000  // 60 000 micro seconds
+    .tv_sec  =      0, // 0 second
+    .tv_usec = 100000  // 100 000 micro seconds
 };
 
 Add automatically some communication delay in the WaitForResponseTimeout timeout
@@ -274,6 +276,34 @@ uint32_t usart_read_ng(uint8_t *data, size_t len) {
 // Let's take 10x
 uint32_t maxtry = 10 * ( 3000000 / USART_BAUD_RATE );
 
+
+
+DbpStringEx using reply_old:
+time client/proxmark3 -p /dev/ttyACM0 -c "hw status"
+2.52s
+time client/proxmark3 -p /dev/ttyUSB0 -b 460800 -c "hw status"
+3.03s
+time client/proxmark3 -p /dev/ttyUSB0 -b 115200 -c "hw status"
+4.88s
+DbpStringEx using reply_old:
+time client/proxmark3 -p /dev/ttyUSB0 -b 9600 -c "hw status"
+26.5s
+
+DbpStringEx using reply_mix:
+time client/proxmark3 -p /dev/ttyUSB0 -b 9600 -c "hw status"
+7.08s
+
+DbpStringEx using reply_ng:
+time client/proxmark3 -p /dev/ttyACM0 -c "hw status"
+2.10s
+time client/proxmark3 -p /dev/ttyUSB0 -b 460800 -c "hw status"
+2.22s
+time client/proxmark3 -p /dev/ttyUSB0 -b 115200 -c "hw status"
+2.43s
+time client/proxmark3 -p /dev/ttyUSB0 -b 9600 -c "hw status"
+5.75s
+
+
 Reference frames
 ================
 

From a9bb465271136c80a3814e7005399201b9097c98 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Mon, 22 Apr 2019 02:10:31 +0200
Subject: [PATCH 1383/1938] reply_xx return val is int16_t, not bool

---
 armsrc/appmain.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 83a639227..89d462003 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1201,8 +1201,8 @@ static void PacketReceived(PacketCommandNG *packet) {
 
             for (size_t i = 0; i < numofbytes; i += USB_CMD_DATA_SIZE) {
                 size_t len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);
-                bool isok = reply_old(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K, i, len, BigBuf_get_traceLen(), mem + startidx + i, len);
-                if (isok != 0)
+                int16_t result = reply_old(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K, i, len, BigBuf_get_traceLen(), mem + startidx + i, len);
+                if (result <= 0)
                     Dbprintf("transfer to client failed ::  | bytes between %d - %d (%d)", i, i + len, len);
             }
             // Trigger a finish downloading signal with an ACK frame
@@ -1235,7 +1235,6 @@ static void PacketReceived(PacketCommandNG *packet) {
         case CMD_DOWNLOAD_EML_BIGBUF: {
             LED_B_ON();
             uint8_t *mem = BigBuf_get_EM_addr();
-            bool isok = false;
             size_t len = 0;
             uint32_t startidx = packet->oldarg[0];
             uint32_t numofbytes = packet->oldarg[1];
@@ -1246,8 +1245,8 @@ static void PacketReceived(PacketCommandNG *packet) {
 
             for (size_t i = 0; i < numofbytes; i += USB_CMD_DATA_SIZE) {
                 len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);
-                isok = reply_old(CMD_DOWNLOADED_EML_BIGBUF, i, len, 0, mem + startidx + i, len);
-                if (isok != 0)
+                int16_t result = reply_old(CMD_DOWNLOADED_EML_BIGBUF, i, len, 0, mem + startidx + i, len);
+                if (result <= 0)
                     Dbprintf("transfer to client failed ::  | bytes between %d - %d (%d)", i, i + len, len);
             }
             // Trigger a finish downloading signal with an ACK frame

From 3e402797c15b4055dc5da9d71611ef4d333047d2 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Mon, 22 Apr 2019 02:11:46 +0200
Subject: [PATCH 1384/1938] dl_it uses also global start_time reset by packets
 reception as this can take ages (50s at 9600 baud for LF samples)

---
 client/comms.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/client/comms.c b/client/comms.c
index 24f43e4b0..fd48d3b40 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -50,9 +50,9 @@ static int cmd_tail = 0;
 // to lock rxBuffer operations from different threads
 static pthread_mutex_t rxBufferMutex = PTHREAD_MUTEX_INITIALIZER;
 
-// Global start time for WaitForResponseTimeout, so we can reset timeout when we get Dbprintf packets
-// as sending lot of these packets can slow down things wuite a lot on slow links (e.g. hw status at 9600)
-static uint64_t WaitForResponseTimeout_start_time;
+// Global start time for WaitForResponseTimeout & dl_it, so we can reset timeout when we get packets
+// as sending lot of these packets can slow down things wuite a lot on slow links (e.g. hw status or lf read at 9600)
+static uint64_t timeout_start_time;
 
 static bool dl_it(uint8_t *dest, uint32_t bytes, uint32_t start_index, PacketResponseNG *response, size_t ms_timeout, bool show_warning, uint32_t rec_cmd);
 
@@ -245,7 +245,7 @@ static void PacketResponseReceived(PacketResponseNG *packet) {
 //                packet->ng ? "NG" : "OLD", packet->magic, packet->length, packet->status, packet->crc, packet->cmd);
 
     // we got a packet, reset WaitForResponseTimeout timeout
-    WaitForResponseTimeout_start_time = msclock();
+    timeout_start_time = msclock();
 
     switch (packet->cmd) {
         // First check if we are handling a debug message
@@ -620,29 +620,29 @@ bool WaitForResponseTimeoutW(uint32_t cmd, PacketResponseNG *response, size_t ms
     if (ms_timeout != (size_t)-1)
         ms_timeout += communication_delay();
 
-    WaitForResponseTimeout_start_time = msclock();
+    timeout_start_time = msclock();
 
     // Wait until the command is received
     while (true) {
 
         while (getReply(response)) {
             if (cmd == CMD_UNKNOWN || response->cmd == cmd) {
-//                PrintAndLogEx(INFO, "Waited %i ms", msclock() - WaitForResponseTimeout_start_time);
+//                PrintAndLogEx(INFO, "Waited %i ms", msclock() - timeout_start_time);
                 return true;
             }
         }
 
-        if (msclock() - WaitForResponseTimeout_start_time > ms_timeout)
+        if (msclock() - timeout_start_time > ms_timeout)
             break;
 
-        if (msclock() - WaitForResponseTimeout_start_time > 3000 && show_warning) {
+        if (msclock() - timeout_start_time > 3000 && show_warning) {
             // 3 seconds elapsed (but this doesn't mean the timeout was exceeded)
             PrintAndLogEx(INFO, "Waiting for a response from the proxmark3...");
             PrintAndLogEx(INFO, "You can cancel this operation by pressing the pm3 button");
             show_warning = false;
         }
     }
-//    PrintAndLogEx(INFO, "Wait timeout after %i ms", msclock() - WaitForResponseTimeout_start_time);
+//    PrintAndLogEx(INFO, "Wait timeout after %i ms", msclock() - timeout_start_time);
     return false;
 }
 
@@ -704,7 +704,7 @@ bool GetFromDevice(DeviceMemType_t memtype, uint8_t *dest, uint32_t bytes, uint3
 static bool dl_it(uint8_t *dest, uint32_t bytes, uint32_t start_index, PacketResponseNG *response, size_t ms_timeout, bool show_warning, uint32_t rec_cmd) {
 
     uint32_t bytes_completed = 0;
-    uint64_t start_time = msclock();
+    timeout_start_time = msclock();
 
     while (true) {
 
@@ -737,12 +737,12 @@ static bool dl_it(uint8_t *dest, uint32_t bytes, uint32_t start_index, PacketRes
             }
         }
 
-        if (msclock() - start_time > ms_timeout) {
+        if (msclock() - timeout_start_time > ms_timeout) {
             PrintAndLogEx(FAILED, "Timed out while trying to download data from device");
             break;
         }
 
-        if (msclock() - start_time > 3000 && show_warning) {
+        if (msclock() - timeout_start_time > 3000 && show_warning) {
             // 3 seconds elapsed (but this doesn't mean the timeout was exceeded)
             PrintAndLogEx(NORMAL, "Waiting for a response from the Proxmark3...");
             PrintAndLogEx(NORMAL, "You can cancel this operation by pressing the pm3 button");

From f29facd15a0cfe4fcb1fa6affab97e96a161b673 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Mon, 22 Apr 2019 02:28:58 +0200
Subject: [PATCH 1385/1938] Harmonize usb_write & usart_writebuffer_sync return
 values

---
 armsrc/appmain.c |  4 ++--
 armsrc/apps.h    |  5 +++--
 common/cmd.c     | 12 ++++++------
 common/cmd.h     |  6 +++---
 common/usart.c   |  2 +-
 common/usart.h   |  2 +-
 common/usb_cdc.c | 14 +++++++-------
 common/usb_cdc.h |  3 +--
 8 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 89d462003..553f66414 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1203,7 +1203,7 @@ static void PacketReceived(PacketCommandNG *packet) {
                 size_t len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);
                 int16_t result = reply_old(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K, i, len, BigBuf_get_traceLen(), mem + startidx + i, len);
                 if (result <= 0)
-                    Dbprintf("transfer to client failed ::  | bytes between %d - %d (%d)", i, i + len, len);
+                    Dbprintf("transfer to client failed ::  | bytes between %d - %d (%d) | result: %d", i, i + len, len, result);
             }
             // Trigger a finish downloading signal with an ACK frame
             // iceman,  when did sending samplingconfig array got attached here?!?
@@ -1247,7 +1247,7 @@ static void PacketReceived(PacketCommandNG *packet) {
                 len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);
                 int16_t result = reply_old(CMD_DOWNLOADED_EML_BIGBUF, i, len, 0, mem + startidx + i, len);
                 if (result <= 0)
-                    Dbprintf("transfer to client failed ::  | bytes between %d - %d (%d)", i, i + len, len);
+                    Dbprintf("transfer to client failed ::  | bytes between %d - %d (%d) | result: %d", i, i + len, len, result);
             }
             // Trigger a finish downloading signal with an ACK frame
             reply_old(CMD_ACK, 1, 0, 0, 0, 0);
diff --git a/armsrc/apps.h b/armsrc/apps.h
index 507c04782..723e55fa5 100644
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -222,8 +222,9 @@ void iClass_Clone(uint8_t startblock, uint8_t endblock, uint8_t *data);
 void iClass_ReadCheck(uint8_t blockno, uint8_t keytype);
 
 // cmd.h
-int16_t reply_old(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
-int16_t reply_ng(uint16_t cmd, int16_t status, uint8_t *data, size_t len);
+int32_t reply_old(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
+int32_t reply_mix(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
+int32_t reply_ng(uint16_t cmd, int16_t status, uint8_t *data, size_t len);
 int16_t receive_ng(PacketCommandNG *rx);
 
 // util.h
diff --git a/common/cmd.c b/common/cmd.c
index 13ca856d8..dfde60848 100644
--- a/common/cmd.c
+++ b/common/cmd.c
@@ -47,7 +47,7 @@ extern void Dbprintf(const char *fmt, ...);
         reply_via_fpc = tmp;}
 #endif
 
-int16_t reply_old(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len) {
+int32_t reply_old(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len) {
     PacketResponseOLD txcmd;
 
     for (size_t i = 0; i < sizeof(PacketResponseOLD); i++)
@@ -67,7 +67,7 @@ int16_t reply_old(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, voi
         }
     }
 
-    uint32_t sendlen = 0;
+    int32_t sendlen = 0;
     // Send frame and make sure all bytes are transmitted
 
     if (reply_via_fpc) {
@@ -84,7 +84,7 @@ int16_t reply_old(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, voi
     return sendlen;
 }
 
-static int16_t reply_ng_internal(uint16_t cmd, int16_t status, uint8_t *data, size_t len, bool ng) {
+static int32_t reply_ng_internal(uint16_t cmd, int16_t status, uint8_t *data, size_t len, bool ng) {
     PacketResponseNGRaw txBufferNG;
     size_t txBufferNGLen;
 //    for (size_t i = 0; i < sizeof(txBufferNG); i++)
@@ -119,7 +119,7 @@ static int16_t reply_ng_internal(uint16_t cmd, int16_t status, uint8_t *data, si
     }
     txBufferNGLen = sizeof(PacketResponseNGPreamble) + len + sizeof(PacketResponseNGPostamble);
 
-    uint32_t sendlen = 0;
+    int32_t sendlen = 0;
     // Send frame and make sure all bytes are transmitted
 
     if (reply_via_fpc) {
@@ -136,11 +136,11 @@ static int16_t reply_ng_internal(uint16_t cmd, int16_t status, uint8_t *data, si
     return sendlen;
 }
 
-int16_t reply_ng(uint16_t cmd, int16_t status, uint8_t *data, size_t len) {
+int32_t reply_ng(uint16_t cmd, int16_t status, uint8_t *data, size_t len) {
     return reply_ng_internal(cmd, status, data, len, true);
 }
 
-int16_t reply_mix(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len) {
+int32_t reply_mix(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len) {
     uint16_t status = PM3_SUCCESS;
     uint64_t arg[3] = {arg0, arg1, arg2};
     if (len > USB_CMD_DATA_SIZE - sizeof(arg)) {
diff --git a/common/cmd.h b/common/cmd.h
index 4c9d6b1d1..e6e30aadc 100644
--- a/common/cmd.h
+++ b/common/cmd.h
@@ -39,9 +39,9 @@
 #include "usart.h"
 #include "proxmark3.h"
 
-int16_t reply_old(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
-int16_t reply_ng(uint16_t cmd, int16_t status, uint8_t *data, size_t len);
-int16_t reply_mix(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
+int32_t reply_old(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
+int32_t reply_ng(uint16_t cmd, int16_t status, uint8_t *data, size_t len);
+int32_t reply_mix(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
 int16_t receive_ng(PacketCommandNG *rx);
 
 // Flags to tell where to add CRC on sent replies
diff --git a/common/usart.c b/common/usart.c
index cb4153062..8294844a2 100644
--- a/common/usart.c
+++ b/common/usart.c
@@ -129,7 +129,7 @@ uint32_t usart_read_ng(uint8_t *data, size_t len) {
 }
 
 // transfer from device to client
-inline int16_t usart_writebuffer_sync(uint8_t *data, size_t len) {
+inline int32_t usart_writebuffer_sync(uint8_t *data, size_t len) {
 
     // Wait for current PDC bank to be free
     // (and check next bank too, in case there will be a usart_writebuffer_async)
diff --git a/common/usart.h b/common/usart.h
index 1b3c6ded7..ff65049fa 100644
--- a/common/usart.h
+++ b/common/usart.h
@@ -12,7 +12,7 @@
 void usart_init(void);
 void usart_close(void);
 
-int16_t usart_writebuffer_sync(uint8_t *data, size_t len);
+int32_t usart_writebuffer_sync(uint8_t *data, size_t len);
 uint32_t usart_read_ng(uint8_t *data, size_t len);
 uint16_t usart_rxdata_available(void);
 #define USART_BUFFLEN 512
diff --git a/common/usb_cdc.c b/common/usb_cdc.c
index 9090d8dc2..b464beffc 100644
--- a/common/usb_cdc.c
+++ b/common/usb_cdc.c
@@ -709,13 +709,13 @@ uint32_t usb_read_ng(uint8_t *data, size_t len) {
 //* \fn    usb_write
 //* \brief Send through endpoint 2 (device to host)
 //*----------------------------------------------------------------------------
-uint32_t usb_write(const uint8_t *data, const size_t len) {
+int32_t usb_write(const uint8_t *data, const size_t len) {
 
-    if (!len) return 0;
-    if (!usb_check()) return 0;
+    if (!len) return PM3_EINVARG;
+    if (!usb_check()) return PM3_EIO;
 
     // can we write?
-    if ((pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXPKTRDY) != 0) return 0;
+    if ((pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXPKTRDY) != 0) return PM3_EIO;
 
     size_t length = len;
     uint32_t cpt = 0;
@@ -741,7 +741,7 @@ uint32_t usb_write(const uint8_t *data, const size_t len) {
         // Wait for previous chunk to be sent
         // (iceman) when is the bankswapping done?
         while (!(pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP)) {
-            if (!usb_check()) return length;
+            if (!usb_check()) return PM3_EIO;
         }
 
         UDP_CLEAR_EP_FLAGS(AT91C_EP_IN, AT91C_UDP_TXCOMP);
@@ -752,13 +752,13 @@ uint32_t usb_write(const uint8_t *data, const size_t len) {
 
     // Wait for the end of transfer
     while (!(pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP)) {
-        if (!usb_check()) return length;
+        if (!usb_check()) return PM3_EIO;
     }
 
     UDP_CLEAR_EP_FLAGS(AT91C_EP_IN, AT91C_UDP_TXCOMP);
     while (pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP) {};
 
-    return length;
+    return len;
 }
 
 //*----------------------------------------------------------------------------
diff --git a/common/usb_cdc.h b/common/usb_cdc.h
index d5a4451ea..3079f93e3 100644
--- a/common/usb_cdc.h
+++ b/common/usb_cdc.h
@@ -47,9 +47,8 @@ bool usb_check(void);
 bool usb_poll(void);
 bool usb_poll_validate_length(void);
 uint32_t usb_read(uint8_t *data, size_t len);
-uint32_t usb_write(const uint8_t *data, const size_t len);
+int32_t usb_write(const uint8_t *data, const size_t len);
 uint32_t usb_read_ng(uint8_t *data, size_t len);
-uint32_t usb_write_ng(const uint8_t *data, const size_t len);
 
 void SetUSBreconnect(int value);
 int GetUSBreconnect(void);

From d6892136ac1bd03467b75c2b3e58dfc6c6dbe36c Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Mon, 22 Apr 2019 02:44:06 +0200
Subject: [PATCH 1386/1938] Add communication_delay also to dl_it timeout

---
 client/comms.c           |  4 ++++
 doc/new_frame_format.txt | 11 ++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/client/comms.c b/client/comms.c
index fd48d3b40..12157f41e 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -706,6 +706,10 @@ static bool dl_it(uint8_t *dest, uint32_t bytes, uint32_t start_index, PacketRes
     uint32_t bytes_completed = 0;
     timeout_start_time = msclock();
 
+    // Add delay depending on the communication channel & speed
+    if (ms_timeout != (size_t)-1)
+        ms_timeout += communication_delay();
+
     while (true) {
 
         if (getReply(response)) {
diff --git a/doc/new_frame_format.txt b/doc/new_frame_format.txt
index 00c1bfaa9..77eedafc2 100644
--- a/doc/new_frame_format.txt
+++ b/doc/new_frame_format.txt
@@ -256,7 +256,7 @@ struct timeval timeout = {
     .tv_usec = 100000  // 100 000 micro seconds
 };
 
-Add automatically some communication delay in the WaitForResponseTimeout timeout
+Add automatically some communication delay in the WaitForResponseTimeout & dl_it timeouts
 Only when using FPC, timeout = 2* empirically measured delay (FTDI cable)
 Empirically measured delay (FTDI cable) with "hw pingng 512" :
    usb ->    6..  32ms
@@ -269,6 +269,11 @@ static size_t communication_delay(void) {
     return 100;
 }
 
+Because some commands send a lot of frames before finishing (hw status, lf read,...),
+WaitForResponseTimeout & dl_it timeouts are reset at each packet reception,
+so timeout is actually counted after latest received packet,
+it doesn't depend anymore on the number of received packets.
+
 Needed to tune pm3 RX usart maxtry
 (common/usart.c)
 uint32_t usart_read_ng(uint8_t *data, size_t len) {
@@ -303,6 +308,10 @@ time client/proxmark3 -p /dev/ttyUSB0 -b 115200 -c "hw status"
 time client/proxmark3 -p /dev/ttyUSB0 -b 9600 -c "hw status"
 5.75s
 
+time client/proxmark3 -p /dev/ttyUSB0 -b 9600 -c "lf read"
+50.38s
+time client/proxmark3 -p /dev/ttyUSB0 -b 115200 -c "lf read"
+6.28s
 
 Reference frames
 ================

From 166da51360209e117afcab6df58368705c67be73 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 22 Apr 2019 19:21:07 +0200
Subject: [PATCH 1387/1938] textual

---
 client/cmdhfmf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index a64c40fe1..494d7db5b 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -3555,7 +3555,7 @@ static command_t CommandTable[] = {
 //    {"sniff",       CmdHF14AMfSniff,        0, "Sniff card-reader communication"},
     {"-----------", CmdHelp,                0, ""},
     {"sim",         CmdHF14AMfSim,        0, "Simulate MIFARE card"},
-    {"eclr",        CmdHF14AMfEClear,       0, "Clear simulator memory block"},
+    {"eclr",        CmdHF14AMfEClear,       0, "Clear simulator memory"},
     {"eget",        CmdHF14AMfEGet,         0, "Get simulator memory block"},
     {"eset",        CmdHF14AMfESet,         0, "Set simulator memory block"},
     {"eload",       CmdHF14AMfELoad,        0, "Load from file emul dump"},

From 458ce75073046563238d56b539ba021749ff5717 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 22 Apr 2019 19:21:55 +0200
Subject: [PATCH 1388/1938] textual

---
 client/cmdtrace.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdtrace.c b/client/cmdtrace.c
index a84daf646..de056d814 100644
--- a/client/cmdtrace.c
+++ b/client/cmdtrace.c
@@ -517,7 +517,7 @@ static int CmdTraceLoad(const char *Cmd) {
     param_getstr(Cmd, 0, filename, sizeof(filename));
 
     if ((f = fopen(filename, "rb")) == NULL) {
-        PrintAndLogEx(FAILED, "Could not open file %s", filename);
+        PrintAndLogEx(FAILED, "Could not open file " _YELLOW_("%s"), filename);
         return 0;
     }
 

From 3bd145652bc33b551a77cceaee37b2fdbd09d4e3 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 22 Apr 2019 19:29:45 +0200
Subject: [PATCH 1389/1938] document offsets

---
 common/ldscript.common | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/ldscript.common b/common/ldscript.common
index 5b2f1e3c4..1be33df95 100644
--- a/common/ldscript.common
+++ b/common/ldscript.common
@@ -11,6 +11,8 @@ ms of the GNU GPL, version 2 or,
 
 /* AT91SAM7S256 has 256k Flash and 64k RAM */
 /* AT91SAM7S512 has 512k Flash and 64k RAM */
+/* boot space = 8192bytes (0x2000) */
+/* osimage space =   (512k - 0x2000 == 524288 - 8192 == 516096bytes == 0x7E000 ) */
 MEMORY
 {
     bootphase1 : ORIGIN = 0x00100000, LENGTH = 0x200             /* Phase 1 bootloader: Copies real bootloader to RAM */

From 04536a35644ede8bf0585557d4c582d9944adc06 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 22 Apr 2019 19:31:22 +0200
Subject: [PATCH 1390/1938] translation

---
 common/i2c.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/common/i2c.c b/common/i2c.c
index 4ff9ecf14..5094b450a 100644
--- a/common/i2c.c
+++ b/common/i2c.c
@@ -26,7 +26,8 @@
 
 volatile unsigned long c;
 
-// 直接使用循环来延时，一个循环 6 条指令，48M， Delay=1 大概为 200kbps
+// Direct use the loop to delay. 6 instructions loop, Masterclock 48Mhz, 
+// delay=1 is about 200kbps
 // timer.
 // I2CSpinDelayClk(4) = 12.31us
 // I2CSpinDelayClk(1) = 3.07us
@@ -89,11 +90,9 @@ void I2C_init(void) {
     AT91C_BASE_PIOA->PIO_OER |= (GPIO_SCL | GPIO_SDA | GPIO_RST);
     AT91C_BASE_PIOA->PIO_PER |= (GPIO_SCL | GPIO_SDA | GPIO_RST);
 
-
     bool isok = (SCL_read && SDA_read);
     if (!isok)
         I2C_recovery();
-
 }
 
 // set the reset state

From 127f5ed1929fe44bf6b7f21120d4fd35b94f9763 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Mon, 22 Apr 2019 22:11:57 +0200
Subject: [PATCH 1391/1938] Revert c7a4d7af, remove redundant include

---
 armsrc/Standalone/hf_colin.h    | 1 -
 armsrc/Standalone/hf_mattyrun.h | 1 -
 2 files changed, 2 deletions(-)

diff --git a/armsrc/Standalone/hf_colin.h b/armsrc/Standalone/hf_colin.h
index c8f2ab8ed..251620626 100644
--- a/armsrc/Standalone/hf_colin.h
+++ b/armsrc/Standalone/hf_colin.h
@@ -19,7 +19,6 @@
 #include "proxmark3.h"
 #include "mifaresim.h"  // mifare1ksim
 #include "mifareutil.h"
-#include "mifaresim.h"
 #include "iso14443a.h"
 #include "protocols.h"
 #include "util.h"
diff --git a/armsrc/Standalone/hf_mattyrun.h b/armsrc/Standalone/hf_mattyrun.h
index 687979162..c37624821 100644
--- a/armsrc/Standalone/hf_mattyrun.h
+++ b/armsrc/Standalone/hf_mattyrun.h
@@ -17,7 +17,6 @@
 #include "usb_cmd.h"    // mifare1ksim flags
 #include "mifaresim.h"  // mifare1ksim
 #include "mifareutil.h"
-#include "mifaresim.h"
 
 #define OPTS 2
 

From 4161779083d31c4722bcfe38493a63467dd5d4af Mon Sep 17 00:00:00 2001
From: Eloff <eloff@mail.ru>
Date: Mon, 22 Apr 2019 23:20:35 +0300
Subject: [PATCH 1392/1938] loops for counters output

---
 client/cmdhfmfu.c          | 10 ++++------
 client/loclass/fileutils.c | 15 ++++++++-------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index 47fb487f9..5ba989584 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -1622,12 +1622,10 @@ void printMFUdumpEx(mfu_dump_t *card, uint16_t pages, uint8_t startpage) {
     PrintAndLogEx(NORMAL, "TBD       | %-24s| %s", sprint_hex(card->tbo1, sizeof(card->tbo1)), sprint_ascii(card->tbo1, sizeof(card->tbo1)));
     PrintAndLogEx(NORMAL, "Signature1| %s| %s", sprint_hex(card->signature, 16), sprint_ascii(card->signature, 16));
     PrintAndLogEx(NORMAL, "Signature2| %s| %s", sprint_hex(card->signature + 16, 16), sprint_ascii(card->signature + 16, 16));
-    PrintAndLogEx(NORMAL, "Counter0  | %-24s| %s", sprint_hex(card->counter_tearing[0],     3), sprint_ascii(card->counter_tearing[0],     3));
-    PrintAndLogEx(NORMAL, "Tearing0  | %-24s| %s", sprint_hex(card->counter_tearing[0] + 3, 1), sprint_ascii(card->counter_tearing[0] + 3, 1));
-    PrintAndLogEx(NORMAL, "Counter1  | %-24s| %s", sprint_hex(card->counter_tearing[1],     3), sprint_ascii(card->counter_tearing[1],     3));
-    PrintAndLogEx(NORMAL, "Tearing1  | %-24s| %s", sprint_hex(card->counter_tearing[1] + 3, 1), sprint_ascii(card->counter_tearing[1] + 3, 1));
-    PrintAndLogEx(NORMAL, "Counter2  | %-24s| %s", sprint_hex(card->counter_tearing[2],     3), sprint_ascii(card->counter_tearing[2],     3));
-    PrintAndLogEx(NORMAL, "Tearing3  | %-24s| %s", sprint_hex(card->counter_tearing[2] + 3, 1), sprint_ascii(card->counter_tearing[2] + 3, 1));
+    for (uint8_t i = 0; i < 3; i ++) {
+        PrintAndLogEx(NORMAL, "Counter%d  | %-24s| %s", i, sprint_hex(card->counter_tearing[i],     3), sprint_ascii(card->counter_tearing[i],     3));
+        PrintAndLogEx(NORMAL, "Tearing%d  | %-24s| %s", i, sprint_hex(card->counter_tearing[i] + 3, 1), sprint_ascii(card->counter_tearing[i] + 3, 1));
+    }
     PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
     PrintAndLogEx(NORMAL, "\nBlock#   | Data        |lck| Ascii");
     PrintAndLogEx(NORMAL, "---------+-------------+---+------");
diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index 1aa11cfd6..4ce49f2b2 100644
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -218,23 +218,24 @@ int saveFileJSON(const char *preferredName, const char *suffix, JSONFileType fty
             memcpy(uid, tmp->data, 3);
             memcpy(uid + 3, tmp->data + 4, 4);
 
+            char path[PATH_MAX_LENGTH] = {0};
+
             JsonSaveBufAsHexCompact(root, "$.Card.UID", uid, sizeof(uid));
             JsonSaveBufAsHexCompact(root, "$.Card.Version", tmp->version, sizeof(tmp->version));
             JsonSaveBufAsHexCompact(root, "$.Card.TBO_0", tmp->tbo, sizeof(tmp->tbo));
             JsonSaveBufAsHexCompact(root, "$.Card.TBO_1", tmp->tbo1, sizeof(tmp->tbo1));
             JsonSaveBufAsHexCompact(root, "$.Card.Signature", tmp->signature, sizeof(tmp->signature));
-            JsonSaveBufAsHexCompact(root, "$.Card.Counter0", tmp->counter_tearing[0], 3);
-            JsonSaveBufAsHexCompact(root, "$.Card.Tearing0", tmp->counter_tearing[0] + 3, 1);
-            JsonSaveBufAsHexCompact(root, "$.Card.Counter1", tmp->counter_tearing[1], 3);
-            JsonSaveBufAsHexCompact(root, "$.Card.Tearing1", tmp->counter_tearing[1] + 3, 1);
-            JsonSaveBufAsHexCompact(root, "$.Card.Counter2", tmp->counter_tearing[2], 3);
-            JsonSaveBufAsHexCompact(root, "$.Card.Tearing2", tmp->counter_tearing[2] + 3, 1);
+            for (uint8_t i = 0; i < 3; i ++) {
+                sprintf(path, "$.Card.Counter%d", i);
+                JsonSaveBufAsHexCompact(root, path, tmp->counter_tearing[i], 3);
+                sprintf(path, "$.Card.Tearing%d", i);
+                JsonSaveBufAsHexCompact(root, path, tmp->counter_tearing[i] + 3, 1);
+            }
 
             // size of header 56b
             size_t len = (datalen - DUMP_PREFIX_LENGTH) / 4;
 
             for (size_t i = 0; i < len; i++) {
-                char path[PATH_MAX_LENGTH] = {0};
                 sprintf(path, "$.blocks.%zu", i);
                 JsonSaveBufAsHexCompact(root, path, tmp->data + (i * 4), 4);
             }

From b0eef756c122b18315640710c2930d19d1b99f4d Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Mon, 22 Apr 2019 22:58:45 +0200
Subject: [PATCH 1393/1938] return PM3_SUCCESS on usart_writebuffer_sync,
 usb_write

---
 armsrc/appmain.c | 10 +++++-----
 armsrc/apps.h    |  8 ++++----
 common/cmd.c     | 28 ++++++++++++++--------------
 common/cmd.h     |  8 ++++----
 common/usart.c   |  4 ++--
 common/usart.h   |  2 +-
 common/usb_cdc.c |  4 ++--
 common/usb_cdc.h |  2 +-
 8 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 553f66414..75fb584c7 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1201,8 +1201,8 @@ static void PacketReceived(PacketCommandNG *packet) {
 
             for (size_t i = 0; i < numofbytes; i += USB_CMD_DATA_SIZE) {
                 size_t len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);
-                int16_t result = reply_old(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K, i, len, BigBuf_get_traceLen(), mem + startidx + i, len);
-                if (result <= 0)
+                int result = reply_old(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K, i, len, BigBuf_get_traceLen(), mem + startidx + i, len);
+                if (result != PM3_SUCCESS)
                     Dbprintf("transfer to client failed ::  | bytes between %d - %d (%d) | result: %d", i, i + len, len, result);
             }
             // Trigger a finish downloading signal with an ACK frame
@@ -1245,8 +1245,8 @@ static void PacketReceived(PacketCommandNG *packet) {
 
             for (size_t i = 0; i < numofbytes; i += USB_CMD_DATA_SIZE) {
                 len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);
-                int16_t result = reply_old(CMD_DOWNLOADED_EML_BIGBUF, i, len, 0, mem + startidx + i, len);
-                if (result <= 0)
+                int result = reply_old(CMD_DOWNLOADED_EML_BIGBUF, i, len, 0, mem + startidx + i, len);
+                if (result != PM3_SUCCESS)
                     Dbprintf("transfer to client failed ::  | bytes between %d - %d (%d) | result: %d", i, i + len, len, result);
             }
             // Trigger a finish downloading signal with an ACK frame
@@ -1570,7 +1570,7 @@ void  __attribute__((noreturn)) AppMain(void) {
 
         // Check if there is a packet available
         PacketCommandNG rx;
-        int16_t ret = receive_ng(&rx);
+        int ret = receive_ng(&rx);
         if (ret == PM3_SUCCESS) {
             PacketReceived(&rx);
         } else if (ret != PM3_ENODATA) {
diff --git a/armsrc/apps.h b/armsrc/apps.h
index 723e55fa5..eef64e6fe 100644
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -222,10 +222,10 @@ void iClass_Clone(uint8_t startblock, uint8_t endblock, uint8_t *data);
 void iClass_ReadCheck(uint8_t blockno, uint8_t keytype);
 
 // cmd.h
-int32_t reply_old(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
-int32_t reply_mix(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
-int32_t reply_ng(uint16_t cmd, int16_t status, uint8_t *data, size_t len);
-int16_t receive_ng(PacketCommandNG *rx);
+int reply_old(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
+int reply_mix(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
+int reply_ng(uint16_t cmd, int16_t status, uint8_t *data, size_t len);
+int receive_ng(PacketCommandNG *rx);
 
 // util.h
 void HfSniff(int, int);
diff --git a/common/cmd.c b/common/cmd.c
index dfde60848..2605c40e8 100644
--- a/common/cmd.c
+++ b/common/cmd.c
@@ -47,7 +47,7 @@ extern void Dbprintf(const char *fmt, ...);
         reply_via_fpc = tmp;}
 #endif
 
-int32_t reply_old(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len) {
+int reply_old(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len) {
     PacketResponseOLD txcmd;
 
     for (size_t i = 0; i < sizeof(PacketResponseOLD); i++)
@@ -67,24 +67,24 @@ int32_t reply_old(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, voi
         }
     }
 
-    int32_t sendlen = 0;
+    int result = PM3_EUNDEF;
     // Send frame and make sure all bytes are transmitted
 
     if (reply_via_fpc) {
 #ifdef WITH_FPC_HOST
-        sendlen = usart_writebuffer_sync((uint8_t *)&txcmd, sizeof(PacketResponseOLD));
+        result = usart_writebuffer_sync((uint8_t *)&txcmd, sizeof(PacketResponseOLD));
 //        Dbprintf_usb("Sent %i bytes over usart", len);
 #else
         return PM3_EDEVNOTSUPP;
 #endif
     } else {
-        sendlen = usb_write((uint8_t *)&txcmd, sizeof(PacketResponseOLD));
+        result = usb_write((uint8_t *)&txcmd, sizeof(PacketResponseOLD));
     }
 
-    return sendlen;
+    return result;
 }
 
-static int32_t reply_ng_internal(uint16_t cmd, int16_t status, uint8_t *data, size_t len, bool ng) {
+static int reply_ng_internal(uint16_t cmd, int16_t status, uint8_t *data, size_t len, bool ng) {
     PacketResponseNGRaw txBufferNG;
     size_t txBufferNGLen;
 //    for (size_t i = 0; i < sizeof(txBufferNG); i++)
@@ -119,28 +119,28 @@ static int32_t reply_ng_internal(uint16_t cmd, int16_t status, uint8_t *data, si
     }
     txBufferNGLen = sizeof(PacketResponseNGPreamble) + len + sizeof(PacketResponseNGPostamble);
 
-    int32_t sendlen = 0;
+    int result = PM3_EUNDEF;
     // Send frame and make sure all bytes are transmitted
 
     if (reply_via_fpc) {
 #ifdef WITH_FPC_HOST
-        sendlen = usart_writebuffer_sync((uint8_t *)&txBufferNG, txBufferNGLen);
+        result = usart_writebuffer_sync((uint8_t *)&txBufferNG, txBufferNGLen);
 //        Dbprintf_usb("Sent %i bytes over usart", len);
 #else
         return PM3_EDEVNOTSUPP;
 #endif
     } else {
-        sendlen = usb_write((uint8_t *)&txBufferNG, txBufferNGLen);
+        result = usb_write((uint8_t *)&txBufferNG, txBufferNGLen);
     }
 
-    return sendlen;
+    return result;
 }
 
-int32_t reply_ng(uint16_t cmd, int16_t status, uint8_t *data, size_t len) {
+int reply_ng(uint16_t cmd, int16_t status, uint8_t *data, size_t len) {
     return reply_ng_internal(cmd, status, data, len, true);
 }
 
-int32_t reply_mix(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len) {
+int reply_mix(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len) {
     uint16_t status = PM3_SUCCESS;
     uint64_t arg[3] = {arg0, arg1, arg2};
     if (len > USB_CMD_DATA_SIZE - sizeof(arg)) {
@@ -154,7 +154,7 @@ int32_t reply_mix(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, voi
     return reply_ng_internal(cmd, status, cmddata, len + sizeof(arg), false);
 }
 
-static int16_t receive_ng_internal(PacketCommandNG *rx, uint32_t read_ng(uint8_t *data, size_t len), bool fpc) {
+static int receive_ng_internal(PacketCommandNG *rx, uint32_t read_ng(uint8_t *data, size_t len), bool fpc) {
     PacketCommandNGRaw rx_raw;
     size_t bytes = read_ng((uint8_t *)&rx_raw.pre, sizeof(PacketCommandNGPreamble));
     if (bytes == 0)
@@ -219,7 +219,7 @@ static int16_t receive_ng_internal(PacketCommandNG *rx, uint32_t read_ng(uint8_t
     return PM3_SUCCESS;
 }
 
-int16_t receive_ng(PacketCommandNG *rx) {
+int receive_ng(PacketCommandNG *rx) {
 
     // Check if there is a packet available
     if (usb_poll_validate_length())
diff --git a/common/cmd.h b/common/cmd.h
index e6e30aadc..fd42607f9 100644
--- a/common/cmd.h
+++ b/common/cmd.h
@@ -39,10 +39,10 @@
 #include "usart.h"
 #include "proxmark3.h"
 
-int32_t reply_old(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
-int32_t reply_ng(uint16_t cmd, int16_t status, uint8_t *data, size_t len);
-int32_t reply_mix(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
-int16_t receive_ng(PacketCommandNG *rx);
+int reply_old(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
+int reply_ng(uint16_t cmd, int16_t status, uint8_t *data, size_t len);
+int reply_mix(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
+int receive_ng(PacketCommandNG *rx);
 
 // Flags to tell where to add CRC on sent replies
 extern bool reply_with_crc_on_usb;
diff --git a/common/usart.c b/common/usart.c
index 8294844a2..f62ea1d21 100644
--- a/common/usart.c
+++ b/common/usart.c
@@ -129,7 +129,7 @@ uint32_t usart_read_ng(uint8_t *data, size_t len) {
 }
 
 // transfer from device to client
-inline int32_t usart_writebuffer_sync(uint8_t *data, size_t len) {
+inline int usart_writebuffer_sync(uint8_t *data, size_t len) {
 
     // Wait for current PDC bank to be free
     // (and check next bank too, in case there will be a usart_writebuffer_async)
@@ -139,7 +139,7 @@ inline int32_t usart_writebuffer_sync(uint8_t *data, size_t len) {
     // Wait until finishing all transfers to make sure "data" buffer can be discarded
     // (if we don't wait here, bulk send as e.g. "hw status" will fail)
     while (pUS1->US_TNCR || pUS1->US_TCR) {};
-    return len;
+    return PM3_SUCCESS;
 }
 
 void usart_init(void) {
diff --git a/common/usart.h b/common/usart.h
index ff65049fa..c6581526b 100644
--- a/common/usart.h
+++ b/common/usart.h
@@ -12,7 +12,7 @@
 void usart_init(void);
 void usart_close(void);
 
-int32_t usart_writebuffer_sync(uint8_t *data, size_t len);
+int usart_writebuffer_sync(uint8_t *data, size_t len);
 uint32_t usart_read_ng(uint8_t *data, size_t len);
 uint16_t usart_rxdata_available(void);
 #define USART_BUFFLEN 512
diff --git a/common/usb_cdc.c b/common/usb_cdc.c
index b464beffc..04f86ad71 100644
--- a/common/usb_cdc.c
+++ b/common/usb_cdc.c
@@ -709,7 +709,7 @@ uint32_t usb_read_ng(uint8_t *data, size_t len) {
 //* \fn    usb_write
 //* \brief Send through endpoint 2 (device to host)
 //*----------------------------------------------------------------------------
-int32_t usb_write(const uint8_t *data, const size_t len) {
+int usb_write(const uint8_t *data, const size_t len) {
 
     if (!len) return PM3_EINVARG;
     if (!usb_check()) return PM3_EIO;
@@ -758,7 +758,7 @@ int32_t usb_write(const uint8_t *data, const size_t len) {
     UDP_CLEAR_EP_FLAGS(AT91C_EP_IN, AT91C_UDP_TXCOMP);
     while (pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP) {};
 
-    return len;
+    return PM3_SUCCESS;
 }
 
 //*----------------------------------------------------------------------------
diff --git a/common/usb_cdc.h b/common/usb_cdc.h
index 3079f93e3..3dbe9df5f 100644
--- a/common/usb_cdc.h
+++ b/common/usb_cdc.h
@@ -47,7 +47,7 @@ bool usb_check(void);
 bool usb_poll(void);
 bool usb_poll_validate_length(void);
 uint32_t usb_read(uint8_t *data, size_t len);
-int32_t usb_write(const uint8_t *data, const size_t len);
+int usb_write(const uint8_t *data, const size_t len);
 uint32_t usb_read_ng(uint8_t *data, size_t len);
 
 void SetUSBreconnect(int value);

From 268ca8294e87e9c6b79c0fd722cb283e9b2d8e59 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Mon, 22 Apr 2019 23:17:34 +0200
Subject: [PATCH 1394/1938] flash read tested over usart

---
 doc/new_frame_format.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/doc/new_frame_format.txt b/doc/new_frame_format.txt
index 77eedafc2..29fb6592e 100644
--- a/doc/new_frame_format.txt
+++ b/doc/new_frame_format.txt
@@ -313,6 +313,13 @@ time client/proxmark3 -p /dev/ttyUSB0 -b 9600 -c "lf read"
 time client/proxmark3 -p /dev/ttyUSB0 -b 115200 -c "lf read"
 6.28s
 
+time client/proxmark3 -p /dev/ttyACM0 -c "mem save f foo_usb"
+1.48s
+time client/proxmark3 -p /dev/ttyUSB0 -b 115200 -c "mem save f foo_fpc"
+25.34s
+
+
+
 Reference frames
 ================
 

From dda63f9556b328e9e7d01c33839a824619bfa40f Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 23 Apr 2019 00:25:14 +0200
Subject: [PATCH 1395/1938] usart_fill_rxfifo: fetch no more than available
 room in FIFO

---
 common/usart.c | 53 +++++++++++++++++++++++++++++++++++---------------
 1 file changed, 37 insertions(+), 16 deletions(-)

diff --git a/common/usart.c b/common/usart.c
index f62ea1d21..4200fb5fb 100644
--- a/common/usart.c
+++ b/common/usart.c
@@ -48,27 +48,48 @@ static size_t us_rxfifo_high = 0;
 
 
 static void usart_fill_rxfifo(void) {
+    uint16_t rxfifo_free = 0;
     if (pUS1->US_RNCR == 0) { // One buffer got filled, backup buffer being used
-// TODO check if we have room...
-        uint16_t available = USART_BUFFLEN - usart_cur_inbuf_off;
-        for (uint16_t i = 0; i < available; i++) {
-            us_rxfifo[us_rxfifo_high++] = usart_cur_inbuf[usart_cur_inbuf_off + i];
-            if (us_rxfifo_high == sizeof(us_rxfifo))
-                us_rxfifo_high = 0;
-        }
-        // Give next buffer
-        pUS1->US_RNPR = (uint32_t)usart_cur_inbuf;
-        pUS1->US_RNCR = USART_BUFFLEN;
-        // Swap current buff
-        if (usart_cur_inbuf == us_inbuf1)
-            usart_cur_inbuf = us_inbuf2;
+        if (us_rxfifo_low > us_rxfifo_high)
+            rxfifo_free = us_rxfifo_low - us_rxfifo_high;
         else
-            usart_cur_inbuf = us_inbuf1;
-        usart_cur_inbuf_off = 0;
+            rxfifo_free = sizeof(us_rxfifo) - us_rxfifo_high + us_rxfifo_low;
+        uint16_t available = USART_BUFFLEN - usart_cur_inbuf_off;
+        if (available <= rxfifo_free) {
+            for (uint16_t i = 0; i < available; i++) {
+                us_rxfifo[us_rxfifo_high++] = usart_cur_inbuf[usart_cur_inbuf_off + i];
+                if (us_rxfifo_high == sizeof(us_rxfifo))
+                    us_rxfifo_high = 0;
+            }
+            // Give next buffer
+            pUS1->US_RNPR = (uint32_t)usart_cur_inbuf;
+            pUS1->US_RNCR = USART_BUFFLEN;
+            // Swap current buff
+            if (usart_cur_inbuf == us_inbuf1)
+                usart_cur_inbuf = us_inbuf2;
+            else
+                usart_cur_inbuf = us_inbuf1;
+            usart_cur_inbuf_off = 0;
+        } else {
+            // Take only what we have room for
+            available = rxfifo_free;
+            for (uint16_t i = 0; i < available; i++) {
+                us_rxfifo[us_rxfifo_high++] = usart_cur_inbuf[usart_cur_inbuf_off + i];
+                if (us_rxfifo_high == sizeof(us_rxfifo))
+                    us_rxfifo_high = 0;
+            }
+            usart_cur_inbuf_off += available;
+            return;
+        }
     }
     if (pUS1->US_RCR < USART_BUFFLEN - usart_cur_inbuf_off) { // Current buffer partially filled
+        if (us_rxfifo_low > us_rxfifo_high)
+            rxfifo_free = us_rxfifo_low - us_rxfifo_high;
+        else
+            rxfifo_free = sizeof(us_rxfifo) - us_rxfifo_high + us_rxfifo_low;
         uint16_t available = USART_BUFFLEN - pUS1->US_RCR - usart_cur_inbuf_off;
-// TODO check if we have room...
+        if (available > rxfifo_free)
+            available = rxfifo_free;
         for (uint16_t i = 0; i < available; i++) {
             us_rxfifo[us_rxfifo_high++] = usart_cur_inbuf[usart_cur_inbuf_off + i];
             if (us_rxfifo_high == sizeof(us_rxfifo))

From a8c1fa7a3bd4ba8c537aea196e51268bc527af47 Mon Sep 17 00:00:00 2001
From: Eloff <eloff@mail.ru>
Date: Tue, 23 Apr 2019 17:07:20 +0300
Subject: [PATCH 1396/1938] backward compatibility, on load converter for old
 mfu dump format

---
 armsrc/iso14443a.c         | 11 ++++++++---
 client/cmdhfmf.c           | 10 ++++++++++
 client/cmdhfmfu.c          | 18 +++++++++++++-----
 client/cmdhfmfu.h          | 20 +++++++++++++++++++-
 client/loclass/fileutils.c | 37 ++++++++++++++++++++++++++++++++++++-
 client/loclass/fileutils.h | 10 ++++++++++
 6 files changed, 96 insertions(+), 10 deletions(-)

diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 154d621d6..63acc2cb9 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -1318,6 +1318,9 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
                     p_response = NULL;
                 }
             }
+        } else if (receivedCmd[0] == MIFARE_ULEV1_VCSL) {
+            EmSend4bit(CARD_NACK_NA);
+            p_response = NULL;
         } else {
             // Check for ISO 14443A-4 compliant commands, look at left nibble
             switch (receivedCmd[0]) {
@@ -1371,8 +1374,10 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
                 default: {
                     // Never seen this command before
                     LogTrace(receivedCmd, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
-                    Dbprintf("Received unknown command (len=%d):", len);
-                    Dbhexdump(len, receivedCmd, false);
+                    if (MF_DBGLEVEL >= 3) {
+                        Dbprintf("Received unknown command (len=%d):", len);
+                        Dbhexdump(len, receivedCmd, false);
+                    }
                     // Do not respond
                     dynamic_response_info.response_n = 0;
                 }
@@ -1388,7 +1393,7 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
                 dynamic_response_info.response_n += 2;
 
                 if (prepare_tag_modulation(&dynamic_response_info, DYNAMIC_MODULATION_BUFFER_SIZE) == false) {
-                    DbpString("Error preparing tag response");
+                    if (MF_DBGLEVEL >= 3) DbpString("Error preparing tag response");
                     LogTrace(receivedCmd, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
                     break;
                 }
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index a64c40fe1..810a9b009 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -2590,6 +2590,16 @@ int CmdHF14AMfELoad(const char *Cmd) {
         return 2;
     }
 
+    // convert old mfu format to new
+    if (blockWidth == 4) {
+        res = convertOldMfuDump(&data, &datalen);
+        if (res) {
+            PrintAndLogEx(FAILED, "Failed convert on load to new Ultralight/NTAG format");
+            free(data);
+            return res;
+        }
+    }
+
     PrintAndLogEx(INFO, "Copying to emulator memory");
 
     blockNum = 0;
diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index 5ba989584..39ee6a6b0 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -1973,7 +1973,7 @@ static int CmdHF14AMfUDump(const char *Cmd) {
         fptr += sprintf(fptr, "hf-mfu-");
         FillFileNameByUID(fptr, card.uid, "-dump", card.uidlen);
     }
-    uint16_t datalen = pages * 4 + DUMP_PREFIX_LENGTH;
+    uint16_t datalen = pages * 4 + MFU_DUMP_PREFIX_LENGTH;
     saveFile(filename, "bin", (uint8_t *)&dump_file_data, datalen);
     saveFileJSON(filename, "json", jsfMfuMemory, (uint8_t *)&dump_file_data, datalen);
 
@@ -2094,14 +2094,22 @@ static int CmdHF14AMfURestore(const char *Cmd) {
     // read all data
     size_t bytes_read = fread(dump, 1, fsize, f);
     fclose(f);
-    if (bytes_read < DUMP_PREFIX_LENGTH) {
+    if (bytes_read < MFU_DUMP_PREFIX_LENGTH) {
         PrintAndLogEx(WARNING, "Error, dump file is too small");
         free(dump);
         return 1;
     }
 
+    // convert old format to new format, if need
+    int res = convertOldMfuDump(&dump, &bytes_read);
+    if (res) {
+        PrintAndLogEx(WARNING, "Failed convert on load to new Ultralight/NTAG format");
+        free(dump);
+        return res;
+    }
+
     mfu_dump_t *mem = (mfu_dump_t *)dump;
-    uint8_t pages = (bytes_read - DUMP_PREFIX_LENGTH) / 4;
+    uint8_t pages = (bytes_read - MFU_DUMP_PREFIX_LENGTH) / 4;
 
     if (pages - 1 != mem->pages) {
         PrintAndLogEx(WARNING, "Error, invalid dump, wrong page count");
@@ -2142,7 +2150,7 @@ static int CmdHF14AMfURestore(const char *Cmd) {
 
             if (read_key) {
                 // try reading key from dump and use.
-                memcpy(c.d.asBytes, mem->data + (bytes_read - DUMP_PREFIX_LENGTH - 8), 4);
+                memcpy(c.d.asBytes, mem->data + (bytes_read - MFU_DUMP_PREFIX_LENGTH - 8), 4);
             } else {
                 memcpy(c.d.asBytes,  p_authkey, 4);
             }
@@ -2160,7 +2168,7 @@ static int CmdHF14AMfURestore(const char *Cmd) {
 
         // pack now stored in dump
         c.arg[0] = MFU_NTAG_SPECIAL_PACK;
-        memcpy(c.d.asBytes, mem->data + (bytes_read - DUMP_PREFIX_LENGTH - 4), 2);
+        memcpy(c.d.asBytes, mem->data + (bytes_read - MFU_DUMP_PREFIX_LENGTH - 4), 2);
         c.d.asBytes[2] = 0;
         c.d.asBytes[3] = 0;
         PrintAndLogEx(NORMAL, "special PACK    block written 0x%X - %s\n", MFU_NTAG_SPECIAL_PACK, sprint_hex(c.d.asBytes, 4));
diff --git a/client/cmdhfmfu.h b/client/cmdhfmfu.h
index ea631b171..4294939b6 100644
--- a/client/cmdhfmfu.h
+++ b/client/cmdhfmfu.h
@@ -12,8 +12,10 @@
 #include "comms.h"
 #include "loclass/fileutils.h"
 
+
+// New Ultralight/NTAG dump file format
 // Length must be aligned to 4 bytes (UL/NTAG page)
-#define DUMP_PREFIX_LENGTH 56
+#define MFU_DUMP_PREFIX_LENGTH 56
 
 typedef struct {
     uint8_t version[8];
@@ -25,6 +27,22 @@ typedef struct {
     uint8_t data[1024];
 } mfu_dump_t;
 
+// Old Ultralight/NTAG dump file format
+// It is used only for converting
+#define OLD_MFU_DUMP_PREFIX_LENGTH 48
+
+typedef struct {
+    uint8_t version[8];
+    uint8_t tbo[2];
+    uint8_t tearing[3];
+    uint8_t pack[2];
+    uint8_t tbo1[1];
+    uint8_t signature[32];
+    //uint8_t counter[3];
+    uint8_t data[1024];
+} old_mfu_dump_t;
+
+
 uint32_t GetHF14AMfU_Type(void);
 int ul_print_type(uint32_t tagtype, uint8_t spaces);
 
diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index 4ce49f2b2..ef3ec2417 100644
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -233,7 +233,7 @@ int saveFileJSON(const char *preferredName, const char *suffix, JSONFileType fty
             }
 
             // size of header 56b
-            size_t len = (datalen - DUMP_PREFIX_LENGTH) / 4;
+            size_t len = (datalen - MFU_DUMP_PREFIX_LENGTH) / 4;
 
             for (size_t i = 0; i < len; i++) {
                 sprintf(path, "$.blocks.%zu", i);
@@ -568,6 +568,41 @@ out:
     return retval;
 }
 
+int convertOldMfuDump(uint8_t **dump, size_t *dumplen) {
+    if (!dump || !dumplen || *dumplen < OLD_MFU_DUMP_PREFIX_LENGTH)
+        return 1;
+    // try to check new file format
+    mfu_dump_t *mfu_dump = (mfu_dump_t *) *dump;
+    if ((*dumplen - MFU_DUMP_PREFIX_LENGTH) / 4 - 1 == mfu_dump->pages)
+        return 0;
+    // convert old format
+    old_mfu_dump_t *old_mfu_dump = (old_mfu_dump_t *) *dump;
+
+    size_t old_data_len = *dumplen - OLD_MFU_DUMP_PREFIX_LENGTH;
+    size_t new_dump_len = old_data_len + MFU_DUMP_PREFIX_LENGTH;
+
+    mfu_dump = (mfu_dump_t *) calloc(new_dump_len, sizeof(uint8_t));
+
+    memcpy(mfu_dump->version, old_mfu_dump->version, 8);
+    mfu_dump->tbo[0] = old_mfu_dump->tbo[0];
+    mfu_dump->tbo[1] = old_mfu_dump->tbo[1];
+    mfu_dump->tbo1[0] = old_mfu_dump->tbo1[0];
+    memcpy(mfu_dump->signature, old_mfu_dump->signature, 32);
+    mfu_dump->counter_tearing[0][3] = old_mfu_dump->tearing[0];
+    mfu_dump->counter_tearing[1][3] = old_mfu_dump->tearing[1];
+    mfu_dump->counter_tearing[2][3] = old_mfu_dump->tearing[2];
+
+    memcpy(mfu_dump->data, old_mfu_dump->data, old_data_len);
+    mfu_dump->pages = old_data_len / 4 - 1;
+    // free old buffer, return new buffer
+    *dumplen = new_dump_len;
+    free(*dump);
+    *dump = (uint8_t *) mfu_dump;
+    PrintAndLogDevice(SUCCESS, "old mfu dump format, was converted on load to " _GREEN_("%d") " pages", mfu_dump->pages + 1);
+    return 0;
+}
+
+
 #else //if we're on ARM
 
 #endif
diff --git a/client/loclass/fileutils.h b/client/loclass/fileutils.h
index ddc906725..57dfbebc8 100644
--- a/client/loclass/fileutils.h
+++ b/client/loclass/fileutils.h
@@ -158,6 +158,15 @@ int loadFileJSON(const char *preferredName, const char *suffix, void *data, size
 */
 int loadFileDICTIONARY(const char *preferredName, const char *suffix, void *data, size_t *datalen, uint8_t keylen, uint16_t *keycnt);
 
+/**
+ * @brief  Utility function to check and convert old mfu dump format to new
+ *
+ * @param dump pointer to loaded dump to check and convert format
+ * @param dumplen the number of bytes loaded dump and converted
+ * @return 0 for ok, 1 for fails
+*/
+int convertOldMfuDump(uint8_t **dump, size_t *dumplen);
+
 #define PrintAndLogDevice(level, format, args...)  PrintAndLogEx(level, format , ## args)
 #else
 
@@ -171,6 +180,7 @@ int loadFileDICTIONARY(const char *preferredName, const char *suffix, void *data
 #define PrintAndLogDevice(level, format, args...) { }
 
 
+
 #endif //ON_DEVICE
 
 #endif // FILEUTILS_H

From 66ee8dc09edd9ad553d1c4370d06192bb0ea20fb Mon Sep 17 00:00:00 2001
From: Eloff <eloff@mail.ru>
Date: Tue, 23 Apr 2019 21:14:20 +0300
Subject: [PATCH 1397/1938] used predefined constants, common types moved to
 common header files

---
 armsrc/iso14443a.c         | 40 +++++++++++++++++++-------------------
 armsrc/iso14443a.h         | 12 ------------
 client/cmdhfmfu.h          | 14 -------------
 client/loclass/fileutils.c |  8 +++-----
 include/mifare.h           | 17 ++++++++++++++++
 5 files changed, 40 insertions(+), 51 deletions(-)

diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 63acc2cb9..a87415919 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -624,7 +624,7 @@ void RAMFUNC SniffIso14443a(uint8_t param) {
         }
     } // end main loop
 
-    if (MF_DBGLEVEL >= 1) {
+    if (MF_DBGLEVEL >= MF_DBG_ERROR) {
         Dbprintf("maxDataLen=%d, Uart.state=%x, Uart.len=%d", maxDataLen, Uart.state, Uart.len);
         Dbprintf("traceLen=%d, Uart.output[0]=%08x", BigBuf_get_traceLen(), (uint32_t)Uart.output[0]);
     }
@@ -847,7 +847,7 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
     uint8_t    moebius_count = 0;
 
     // some first pages of UL/NTAG dump is special data
-    mfu_dump_prefix_t *mfu_header =  tagType == 2 || tagType == 7 ? (mfu_dump_prefix_t *) BigBuf_get_EM_addr() : NULL;
+    mfu_dump_t *mfu_header =  tagType == 2 || tagType == 7 ? (mfu_dump_t *) BigBuf_get_EM_addr() : NULL;
 
     switch (tagType) {
         case 1: { // MIFARE Classic 1k
@@ -1314,7 +1314,7 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
                 } else {
                     EmSend4bit(CARD_NACK_NA);
                     uint32_t pwd = bytes_to_num(receivedCmd + 1, 4);
-                    if (MF_DBGLEVEL >= 3) Dbprintf("Auth attempt: %08x", pwd);
+                    if (MF_DBGLEVEL >= MF_DBG_DEBUG) Dbprintf("Auth attempt: %08x", pwd);
                     p_response = NULL;
                 }
             }
@@ -1374,7 +1374,7 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
                 default: {
                     // Never seen this command before
                     LogTrace(receivedCmd, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
-                    if (MF_DBGLEVEL >= 3) {
+                    if (MF_DBGLEVEL >= MF_DBG_DEBUG) {
                         Dbprintf("Received unknown command (len=%d):", len);
                         Dbhexdump(len, receivedCmd, false);
                     }
@@ -1393,7 +1393,7 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
                 dynamic_response_info.response_n += 2;
 
                 if (prepare_tag_modulation(&dynamic_response_info, DYNAMIC_MODULATION_BUFFER_SIZE) == false) {
-                    if (MF_DBGLEVEL >= 3) DbpString("Error preparing tag response");
+                    if (MF_DBGLEVEL >= MF_DBG_DEBUG) DbpString("Error preparing tag response");
                     LogTrace(receivedCmd, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
                     break;
                 }
@@ -1420,7 +1420,7 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
     set_tracing(false);
     BigBuf_free_keep_EM();
 
-    if (MF_DBGLEVEL >= 4) {
+    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
         Dbprintf("-[ Wake ups after halt  [%d]", happened);
         Dbprintf("-[ Messages after halt  [%d]", happened2);
         Dbprintf("-[ Num of received cmd  [%d]", cmdsRecvd);
@@ -1470,7 +1470,7 @@ static void TransmitFor14443a(const uint8_t *cmd, uint16_t len, uint32_t *timing
         else
             PrepareDelayedTransfer(*timing & 0x00000007);        // Delay transfer (fine tuning - up to 7 MF clock ticks)
 
-        if (MF_DBGLEVEL >= 4 && GetCountSspClk() >= (*timing & 0xfffffff8))
+        if (MF_DBGLEVEL >= MF_DBG_EXTENDED && GetCountSspClk() >= (*timing & 0xfffffff8))
             Dbprintf("TransmitFor14443a: Missed timing");
         while (GetCountSspClk() < (*timing & 0xfffffff8)) {};    // Delay transfer (multiple of 8 MF clock ticks)
         LastTimeProxToAirStart = *timing;
@@ -1952,12 +1952,12 @@ void iso14443a_antifuzz(uint32_t flags) {
             }
 
             EmSendCmdEx(resp, 5, true);
-            if (MF_DBGLEVEL >= 4) Dbprintf("ANTICOLL or SELECT %x", received[1]);
+            if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("ANTICOLL or SELECT %x", received[1]);
             LED_D_INV();
 
             continue;
         } else if (received[1] == 0x20 && received[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2) {  // Received request for UID (cascade 2)
-            if (MF_DBGLEVEL >= 4) Dbprintf("ANTICOLL or SELECT_2");
+            if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("ANTICOLL or SELECT_2");
         } else if (received[1] == 0x70 && received[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT) {    // Received a SELECT (cascade 1)
         } else if (received[1] == 0x70 && received[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2) {  // Received a SELECT (cascade 2)
         } else {
@@ -2575,7 +2575,7 @@ void ReaderMifare(bool first_try, uint8_t block, uint8_t keytype) {
         if (!have_uid) { // need a full select cycle to get the uid first
             iso14a_card_select_t card_info;
             if (!iso14443a_select_card(uid, &card_info, &cuid, true, 0, true)) {
-                if (MF_DBGLEVEL >= 1)    Dbprintf("Mifare: Can't select card (ALL)");
+                if (MF_DBGLEVEL >= MF_DBG_ERROR)    Dbprintf("Mifare: Can't select card (ALL)");
                 continue;
             }
             switch (card_info.uidlen) {
@@ -2594,7 +2594,7 @@ void ReaderMifare(bool first_try, uint8_t block, uint8_t keytype) {
             have_uid = true;
         } else { // no need for anticollision. We can directly select the card
             if (!iso14443a_fast_select_card(uid, cascade_levels)) {
-                if (MF_DBGLEVEL >= 1)    Dbprintf("Mifare: Can't select card (UID)");
+                if (MF_DBGLEVEL >= MF_DBG_ERROR)    Dbprintf("Mifare: Can't select card (UID)");
                 continue;
             }
         }
@@ -2666,7 +2666,7 @@ void ReaderMifare(bool first_try, uint8_t block, uint8_t keytype) {
                     sync_time = GetCountSspClk() & 0xfffffff8;
                 }
 
-                if (MF_DBGLEVEL >= 4)
+                if (MF_DBGLEVEL >= MF_DBG_EXTENDED)
                     Dbprintf("calibrating in cycle %d. nt_distance=%d, elapsed_prng_sequences=%d, new sync_cycles: %d\n", i, nt_distance, elapsed_prng_sequences, sync_cycles);
 
                 LED_B_OFF();
@@ -2693,13 +2693,13 @@ void ReaderMifare(bool first_try, uint8_t block, uint8_t keytype) {
             }
 
             if (consecutive_resyncs < 3) {
-                if (MF_DBGLEVEL >= 4) {
+                if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
                     Dbprintf("Lost sync in cycle %d. nt_distance=%d. Consecutive Resyncs = %d. Trying one time catch up...\n", i, catch_up_cycles, consecutive_resyncs);
                 }
             } else {
                 sync_cycles += catch_up_cycles;
 
-                if (MF_DBGLEVEL >= 4)
+                if (MF_DBGLEVEL >= MF_DBG_EXTENDED)
                     Dbprintf("Lost sync in cycle %d for the fourth time consecutively (nt_distance = %d). Adjusting sync_cycles to %d.\n", i, catch_up_cycles, sync_cycles);
 
                 last_catch_up = 0;
@@ -2749,7 +2749,7 @@ void ReaderMifare(bool first_try, uint8_t block, uint8_t keytype) {
 
     mf_nr_ar[3] &= 0x1F;
 
-    if (MF_DBGLEVEL >= 4) Dbprintf("Number of sent auth requestes: %u", i);
+    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Number of sent auth requestes: %u", i);
 
     uint8_t buf[32] = {0x00};
     memset(buf, 0x00, sizeof(buf));
@@ -2824,7 +2824,7 @@ void DetectNACKbug() {
         if (!have_uid) { // need a full select cycle to get the uid first
             iso14a_card_select_t card_info;
             if (!iso14443a_select_card(uid, &card_info, &cuid, true, 0, true)) {
-                if (MF_DBGLEVEL >= 1)    Dbprintf("Mifare: Can't select card (ALL)");
+                if (MF_DBGLEVEL >= MF_DBG_ERROR)    Dbprintf("Mifare: Can't select card (ALL)");
                 continue;
             }
             switch (card_info.uidlen) {
@@ -2843,7 +2843,7 @@ void DetectNACKbug() {
             have_uid = true;
         } else { // no need for anticollision. We can directly select the card
             if (!iso14443a_fast_select_card(uid, cascade_levels)) {
-                if (MF_DBGLEVEL >= 1)    Dbprintf("Mifare: Can't select card (UID)");
+                if (MF_DBGLEVEL >= MF_DBG_ERROR)    Dbprintf("Mifare: Can't select card (UID)");
                 continue;
             }
         }
@@ -2921,7 +2921,7 @@ void DetectNACKbug() {
                     break;
                 }
 
-                if (MF_DBGLEVEL >= 4)
+                if (MF_DBGLEVEL >= MF_DBG_EXTENDED)
                     Dbprintf("calibrating in cycle %d. nt_distance=%d, elapsed_prng_sequences=%d, new sync_cycles: %d\n", i, nt_distance, elapsed_prng_sequences, sync_cycles);
 
                 continue;
@@ -2948,13 +2948,13 @@ void DetectNACKbug() {
             }
 
             if (consecutive_resyncs < 3) {
-                if (MF_DBGLEVEL >= 4) {
+                if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
                     Dbprintf("Lost sync in cycle %d. nt_distance=%d. Consecutive Resyncs = %d. Trying one time catch up...\n", i, catch_up_cycles, consecutive_resyncs);
                 }
             } else {
                 sync_cycles += catch_up_cycles;
 
-                if (MF_DBGLEVEL >= 4) {
+                if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
                     Dbprintf("Lost sync in cycle %d for the fourth time consecutively (nt_distance = %d). Adjusting sync_cycles to %d.\n", i, catch_up_cycles, sync_cycles);
                     Dbprintf("nt [%08x] attacted [%08x]", nt, nt_attacked);
                 }
diff --git a/armsrc/iso14443a.h b/armsrc/iso14443a.h
index 27b6b8afe..f2a1c6120 100644
--- a/armsrc/iso14443a.h
+++ b/armsrc/iso14443a.h
@@ -95,18 +95,6 @@ typedef struct {
     uint8_t *parity;
 } tUart;
 
-// Length must be aligned to 4 bytes (UL/NTAG page)
-#define MFU_DUMP_PREFIX_LENGTH 56
-
-typedef struct {
-    uint8_t version[8];
-    uint8_t tbo[2];
-    uint8_t tbo1[1];
-    uint8_t pages;                  // max page number in dump
-    uint8_t signature[32];
-    uint8_t counter_tearing[3][4];  // 3 bytes counter, 1 byte tearing flag
-} mfu_dump_prefix_t;
-
 #ifndef AddCrc14A
 # define AddCrc14A(data, len) compute_crc(CRC_14443_A, (data), (len), (data)+(len), (data)+(len)+1)
 #endif
diff --git a/client/cmdhfmfu.h b/client/cmdhfmfu.h
index 4294939b6..6587cd538 100644
--- a/client/cmdhfmfu.h
+++ b/client/cmdhfmfu.h
@@ -13,20 +13,6 @@
 #include "loclass/fileutils.h"
 
 
-// New Ultralight/NTAG dump file format
-// Length must be aligned to 4 bytes (UL/NTAG page)
-#define MFU_DUMP_PREFIX_LENGTH 56
-
-typedef struct {
-    uint8_t version[8];
-    uint8_t tbo[2];
-    uint8_t tbo1[1];
-    uint8_t pages;                  // max page number in dump
-    uint8_t signature[32];
-    uint8_t counter_tearing[3][4];  // 3 bytes counter, 1 byte tearing flag
-    uint8_t data[1024];
-} mfu_dump_t;
-
 // Old Ultralight/NTAG dump file format
 // It is used only for converting
 #define OLD_MFU_DUMP_PREFIX_LENGTH 48
diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index ef3ec2417..da86f68da 100644
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -584,13 +584,11 @@ int convertOldMfuDump(uint8_t **dump, size_t *dumplen) {
     mfu_dump = (mfu_dump_t *) calloc(new_dump_len, sizeof(uint8_t));
 
     memcpy(mfu_dump->version, old_mfu_dump->version, 8);
-    mfu_dump->tbo[0] = old_mfu_dump->tbo[0];
-    mfu_dump->tbo[1] = old_mfu_dump->tbo[1];
+    memcpy(mfu_dump->tbo, old_mfu_dump->tbo, 2);
     mfu_dump->tbo1[0] = old_mfu_dump->tbo1[0];
     memcpy(mfu_dump->signature, old_mfu_dump->signature, 32);
-    mfu_dump->counter_tearing[0][3] = old_mfu_dump->tearing[0];
-    mfu_dump->counter_tearing[1][3] = old_mfu_dump->tearing[1];
-    mfu_dump->counter_tearing[2][3] = old_mfu_dump->tearing[2];
+    for (int i = 0; i < 3; i++)
+        mfu_dump->counter_tearing[i][3] = old_mfu_dump->tearing[i];
 
     memcpy(mfu_dump->data, old_mfu_dump->data, old_data_len);
     mfu_dump->pages = old_data_len / 4 - 1;
diff --git a/include/mifare.h b/include/mifare.h
index 410250593..87ba3a74e 100644
--- a/include/mifare.h
+++ b/include/mifare.h
@@ -19,6 +19,23 @@
 #define MF_MAD1_SECTOR 0x00
 #define MF_MAD2_SECTOR 0x10
 
+//-----------------------------------------------------------------------------
+// Common types, used by client and ARM
+//-----------------------------------------------------------------------------
+// New Ultralight/NTAG dump file format
+// Length must be aligned to 4 bytes (UL/NTAG page)
+#define MFU_DUMP_PREFIX_LENGTH 56
+
+typedef struct {
+    uint8_t version[8];
+    uint8_t tbo[2];
+    uint8_t tbo1[1];
+    uint8_t pages;                  // max page number in dump
+    uint8_t signature[32];
+    uint8_t counter_tearing[3][4];  // 3 bytes counter, 1 byte tearing flag
+    uint8_t data[1024];
+} mfu_dump_t;
+
 //-----------------------------------------------------------------------------
 // ISO 14443A
 //-----------------------------------------------------------------------------

From e453aff88ce3e802ade992dbfa62228461833dad Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 23 Apr 2019 23:36:36 +0200
Subject: [PATCH 1398/1938] First adjustments for FPC BT link

---
 client/cmdhw.c    | 7 +++++++
 client/comms.c    | 2 +-
 common/usart.c    | 9 ++++++++-
 include/usb_cmd.h | 3 +++
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/client/cmdhw.c b/client/cmdhw.c
index 8c687e232..fc4f4c422 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -491,7 +491,14 @@ void pm3_version(bool verbose) {
     PacketResponseNG resp;
     clearCommandBuffer();
     SendCommandOLD(CMD_VERSION, 0, 0, 0, NULL, 0);
+#ifdef USART_SLOW_LINK
+    // 10s timeout for slow FPC, e.g. over BT
+    // as this is the very first command sent to the pm3
+    // that initiates the BT connection
+    if (WaitForResponseTimeout(CMD_ACK, &resp, 10000)) {
+#else
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {
+#endif
 #ifdef __WIN32
         PrintAndLogEx(NORMAL, "\n [ Proxmark3 RFID instrument ]\n");
 #else
diff --git a/client/comms.c b/client/comms.c
index 12157f41e..c52872870 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -421,7 +421,7 @@ __attribute__((force_align_arg_pointer))
                 PacketResponseOLD rx_old;
                 memcpy(&rx_old, &rx_raw.pre, sizeof(PacketResponseNGPreamble));
                 if ((!uart_receive(sp, ((uint8_t *)&rx_old) + sizeof(PacketResponseNGPreamble), sizeof(PacketResponseOLD) - sizeof(PacketResponseNGPreamble), &rxlen)) || (rxlen != sizeof(PacketResponseOLD) - sizeof(PacketResponseNGPreamble))) {
-                    PrintAndLogEx(WARNING, "Received packet frame error var part too short? %d/%d", rxlen, sizeof(PacketResponseOLD) - sizeof(PacketResponseNGPreamble));
+                    PrintAndLogEx(WARNING, "Received packet OLD frame payload error too short? %d/%d", rxlen, sizeof(PacketResponseOLD) - sizeof(PacketResponseNGPreamble));
                     error = true;
                 }
                 if (!error) {
diff --git a/common/usart.c b/common/usart.c
index 4200fb5fb..3e10d13bf 100644
--- a/common/usart.c
+++ b/common/usart.c
@@ -122,7 +122,14 @@ uint32_t usart_read_ng(uint8_t *data, size_t len) {
 //    uint32_t highest_observed_try = 0;
     // Empirical max try observed: 3000000 / USART_BAUD_RATE
     // Let's take 10x
-    uint32_t maxtry = 10 * (3000000 / USART_BAUD_RATE);
+
+    uint32_t tryconstant = 0;
+#ifdef USART_SLOW_LINK
+    // Experienced up to 13200 tries on BT link even at 460800
+    tryconstant = 50000;
+#endif
+
+    uint32_t maxtry = 10 * (3000000 / USART_BAUD_RATE) + tryconstant;
 
     while (len) {
         uint32_t available = usart_rxdata_available();
diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index a52271d61..38381e97a 100644
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -13,6 +13,9 @@
 #ifndef __USB_CMD_H
 #define __USB_CMD_H
 
+// Use it e.g. when using slow links such as BT
+#define USART_SLOW_LINK
+
 #ifdef _MSC_VER
 typedef DWORD uint32_t;
 typedef BYTE uint8_t;

From 25048ccf2ffcd5faee018e2157c91f11f8fe74b9 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 24 Apr 2019 00:53:25 +0200
Subject: [PATCH 1399/1938] Fix segfault when loading a file

---
 client/loclass/fileutils.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index 72d3e26af..e01d04e33 100644
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -313,8 +313,8 @@ int loadFile(const char *preferredName, const char *suffix, void *data, size_t m
         goto out;
     }
 
-    if (bytes_read != maxdatalen) {
-        PrintAndLogDevice(WARNING, "Warning, bytes read exeed calling array limit. Max bytes is %d bytes", maxdatalen);
+    if (bytes_read > maxdatalen) {
+        PrintAndLogDevice(WARNING, "Warning, bytes read exceed calling array limit. Max bytes is %d bytes", maxdatalen);
         bytes_read = maxdatalen;
     }
 

From 1b246cd380d8fa7a92006512a072a7c557d3557f Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 24 Apr 2019 15:04:43 +0200
Subject: [PATCH 1400/1938] Force no-ms-bitfields to ensure proper struc
 packing on Windows

---
 client/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/Makefile b/client/Makefile
index 2f7467fab..5efd89696 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -50,7 +50,7 @@ CBORLIB = $(CBORLIBPATH)/tinycbor.a
 LIBS = -I../zlib -I../uart -I../liblua -I$(MBEDTLSLIBPATH) -I$(JANSSONLIBPATH) -I$(CBORLIBPATH)
 INCLUDES_CLIENT = -I. -I../include -I../common -I/opt/local/include $(LIBS)
 LDFLAGS = $(ENV_LDFLAGS)
-CFLAGS = $(ENV_CFLAGS) -std=c99 -D_ISOC99_SOURCE -DPRESETS $(INCLUDES_CLIENT) -Wall -g -O3
+CFLAGS = $(ENV_CFLAGS) -std=c99 -D_ISOC99_SOURCE -DPRESETS $(INCLUDES_CLIENT) -Wall -g -O3 -mno-ms-bitfields
 CXXFLAGS = -I../include -Wall -O3
 
 LUAPLATFORM = generic

From 4b5800d78f1f4f51a193fbc81b6e0902a42c90b7 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 24 Apr 2019 15:57:24 +0200
Subject: [PATCH 1401/1938] remove name

---
 armsrc/appmain.c | 2 +-
 client/comms.c   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 75fb584c7..4aefcd99f 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1575,7 +1575,7 @@ void  __attribute__((noreturn)) AppMain(void) {
             PacketReceived(&rx);
         } else if (ret != PM3_ENODATA) {
             Dbprintf("Error in frame reception: %d", ret);
-            // TODO DOEGOX if error, shall we resync ?
+            // TODO if error, shall we resync ?
         }
 
         // Press button for one second to enter a possible standalone mode
diff --git a/client/comms.c b/client/comms.c
index c52872870..881806c84 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -412,7 +412,7 @@ __attribute__((force_align_arg_pointer))
                 if (!error) {
 //                    PrintAndLogEx(NORMAL, "Received reply NG full !!");
                     PacketResponseReceived(&rx);
-//TODO DOEGOX NG don't send ACK anymore but reply with the corresponding cmd, still things seem to work fine...
+//TODO NG don't send ACK anymore but reply with the corresponding cmd, still things seem to work fine...
                     if (rx.cmd == CMD_ACK) {
                         ACK_received = true;
                     }
@@ -448,7 +448,7 @@ __attribute__((force_align_arg_pointer))
                 error = true;
             }
         }
-        // TODO DOEGOX if error, shall we resync ?
+        // TODO if error, shall we resync ?
 
         pthread_mutex_lock(&txBufferMutex);
 

From 7d2d23ce50f412450699db35c94a7c231d8b0a49 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 25 Apr 2019 01:53:00 +0200
Subject: [PATCH 1402/1938] fix bootrom using new names (but still old packets)

---
 bootrom/Makefile  |  3 +--
 bootrom/bootrom.c | 56 ++++++++++++++++++++++++++++++++++++-----------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/bootrom/Makefile b/bootrom/Makefile
index 967acc6f5..9cd8871df 100644
--- a/bootrom/Makefile
+++ b/bootrom/Makefile
@@ -8,8 +8,7 @@
 
 # DO NOT use thumb mode in the phase 1 bootloader since that generates a section with glue code
 ARMSRC =
-THUMBSRC = cmd.c \
-	usb_cdc.c \
+THUMBSRC = usb_cdc.c \
 	bootrom.c
 
 ASMSRC = ram-reset.s flash-reset.s
diff --git a/bootrom/bootrom.c b/bootrom/bootrom.c
index cb39df6eb..8b1545332 100644
--- a/bootrom/bootrom.c
+++ b/bootrom/bootrom.c
@@ -8,13 +8,40 @@
 
 #include <proxmark3.h>
 #include "usb_cdc.h"
-#include "cmd.h"
 
 struct common_area common_area __attribute__((section(".commonarea")));
 unsigned int start_addr, end_addr, bootrom_unlocked;
 extern char _bootrom_start, _bootrom_end, _flash_start, _flash_end;
 extern uint32_t _osimage_entry;
 
+static int reply_old(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len) {
+    PacketResponseOLD txcmd;
+
+    for (size_t i = 0; i < sizeof(PacketResponseOLD); i++)
+        ((uint8_t *)&txcmd)[i] = 0x00;
+
+    // Compose the outgoing command frame
+    txcmd.cmd = cmd;
+    txcmd.arg[0] = arg0;
+    txcmd.arg[1] = arg1;
+    txcmd.arg[2] = arg2;
+
+    // Add the (optional) content to the frame, with a maximum size of USB_CMD_DATA_SIZE
+    if (data && len) {
+        len = MIN(len, USB_CMD_DATA_SIZE);
+        for (size_t i = 0; i < len; i++) {
+            txcmd.d.asBytes[i] = ((uint8_t *)data)[i];
+        }
+    }
+
+    int result = PM3_EUNDEF;
+    // Send frame and make sure all bytes are transmitted
+
+    result = usb_write((uint8_t *)&txcmd, sizeof(PacketResponseOLD));
+
+    return result;
+}
+
 void DbpString(char *str) {
     uint8_t len = 0;
     while (str[len] != 0x00)
@@ -84,13 +111,16 @@ static void Fatal(void) {
     for (;;) {};
 }
 
-void PacketReceived(PacketCommandNG *packet) {
+void UsbPacketReceived(uint8_t *packet, int len) {
     int i, dont_ack = 0;
+    PacketCommandOLD *c = (PacketCommandOLD *)packet;
     volatile uint32_t *p;
 
-    uint32_t arg0 = (uint32_t)packet->oldarg[0];
+    //if ( len != sizeof(PacketCommandOLD`)) Fatal();
 
-    switch (packet->cmd) {
+    uint32_t arg0 = (uint32_t)c->arg[0];
+
+    switch (c->cmd) {
         case CMD_DEVICE_INFO: {
             dont_ack = 1;
             arg0 = DEVICE_INFO_FLAG_BOOTROM_PRESENT | DEVICE_INFO_FLAG_CURRENT_MODE_BOOTROM |
@@ -108,7 +138,7 @@ void PacketReceived(PacketCommandNG *packet) {
             */
             p = (volatile uint32_t *)&_flash_start;
             for (i = 0; i < 12; i++)
-                p[i + arg0] = packet->data.asDwords[i];
+                p[i + arg0] = c->d.asDwords[i];
         }
         break;
 
@@ -116,7 +146,7 @@ void PacketReceived(PacketCommandNG *packet) {
             uint32_t *flash_mem = (uint32_t *)(&_flash_start);
             for (int j = 0; j < 2; j++) {
                 for (i = 0 + (64 * j); i < 64 + (64 * j); i++) {
-                    flash_mem[i] = packet->data.asDwords[i];
+                    flash_mem[i] = c->d.asDwords[i];
                 }
 
                 uint32_t flash_address = arg0 + (0x100 * j);
@@ -152,7 +182,7 @@ void PacketReceived(PacketCommandNG *packet) {
         break;
 
         case CMD_START_FLASH: {
-            if (packet->oldarg[2] == START_FLASH_MAGIC)
+            if (c->arg[2] == START_FLASH_MAGIC)
                 bootrom_unlocked = 1;
             else
                 bootrom_unlocked = 0;
@@ -161,8 +191,8 @@ void PacketReceived(PacketCommandNG *packet) {
             int prot_end = (int)&_bootrom_end;
             int allow_start = (int)&_flash_start;
             int allow_end = (int)&_flash_end;
-            int cmd_start = packet->oldarg[0];
-            int cmd_end = packet->oldarg[1];
+            int cmd_start = c->arg[0];
+            int cmd_end = c->arg[1];
 
             /* Only allow command if the bootrom is unlocked, or the parameters are outside of the protected
             * bootrom area. In any case they must be within the flash area.
@@ -194,7 +224,7 @@ static void flash_mode(int externally_entered) {
     start_addr = 0;
     end_addr = 0;
     bootrom_unlocked = 0;
-    PacketCommandNG rx;
+    uint8_t rx[sizeof(PacketCommandOLD)];
 
     usb_enable();
 
@@ -206,9 +236,9 @@ static void flash_mode(int externally_entered) {
 
         // Check if there is a usb packet available
         if (usb_poll_validate_length()) {
-// TODO DOEGOX
-            if (usb_read((uint8_t *)&rx, sizeof(rx)))
-                PacketReceived(&rx);
+            if (usb_read(rx, sizeof(rx))) {
+                UsbPacketReceived(rx, sizeof(rx));
+            }
         }
 
         if (!externally_entered && !BUTTON_PRESS()) {

From 9fca642e105345606d97ec7b7b319e372c251087 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 25 Apr 2019 01:59:30 +0200
Subject: [PATCH 1403/1938] Add makefile dependencies for recovery: need
 bootrom & os

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 512c9e2db..cf327d95f 100644
--- a/Makefile
+++ b/Makefile
@@ -52,7 +52,7 @@ armsrc/%: FORCE
 	$(MAKE) -C armsrc $(patsubst armsrc/%,%,$@)
 client/%: FORCE
 	$(MAKE) -C client $(patsubst client/%,%,$@)
-recovery/%: FORCE
+recovery/%: FORCE bootrom/% armsrc/%
 	$(MAKE) -C recovery $(patsubst recovery/%,%,$@)
 FORCE: # Dummy target to force remake in the subdirectories, even if files exist (this Makefile doesn't know about the prerequisites)
 

From 42a03fc9f14a582d99b5e6723b450828f1f19edf Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 25 Apr 2019 02:00:23 +0200
Subject: [PATCH 1404/1938] Add openocd config files for JLink

---
 tools/at91sam7s256-jlink.cfg | 38 ++++++++++++++++++++++++++++++++++++
 tools/at91sam7s512-jlink.cfg | 38 ++++++++++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+)
 create mode 100644 tools/at91sam7s256-jlink.cfg
 create mode 100644 tools/at91sam7s512-jlink.cfg

diff --git a/tools/at91sam7s256-jlink.cfg b/tools/at91sam7s256-jlink.cfg
new file mode 100644
index 000000000..c022c59a1
--- /dev/null
+++ b/tools/at91sam7s256-jlink.cfg
@@ -0,0 +1,38 @@
+#define our ports
+telnet_port 4444
+gdb_port 3333
+
+interface jlink
+transport select jtag
+adapter_khz 1000
+
+#reset_config <signals> [combination] [trst_type] [srst_type]
+reset_config srst_only srst_pulls_trst
+
+jtag newtap sam7x cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id 0x3f0f0f0f
+
+target create sam7x.cpu arm7tdmi -endian little -chain-position sam7x.cpu
+
+sam7x.cpu configure -event reset-init {
+	soft_reset_halt
+	mww 0xfffffd00 0xa5000004	# RSTC_CR: Reset peripherals
+	mww 0xfffffd44 0x00008000	# WDT_MR: disable watchdog
+	mww 0xfffffd08 0xa5000001	# RSTC_MR enable user reset
+	mww 0xfffffc20 0x00005001	# CKGR_MOR : enable the main oscillator
+	sleep 10
+	mww 0xfffffc2c 0x000b1c02	# CKGR_PLLR: 16MHz * 12/2 = 96MHz
+	sleep 10
+	mww 0xfffffc30 0x00000007	# PMC_MCKR : MCK = PLL / 2 = 48 MHz
+	sleep 10
+	mww 0xffffff60 0x00480100	# MC_FMR: flash mode (FWS=1,FMCN=72)
+	sleep 100
+}
+
+gdb_memory_map enable
+#gdb_breakpoint_override hard
+#armv4_5 core_state arm
+
+sam7x.cpu configure -work-area-virt 0 -work-area-phys 0x00200000 -work-area-size 0x10000 -work-area-backup 0
+#flash bank sam7x.flash.0 at91sam7 0x100000 0x40000 0 4 sam7x.cpu
+flash bank sam7x.flash.0 at91sam7 0 0 0 0 sam7x.cpu 0 0 0 0 0 0 0 18432
+flash bank sam7x.flash.1 at91sam7 0 0 0 0 sam7x.cpu 1 0 0 0 0 0 0 18432
diff --git a/tools/at91sam7s512-jlink.cfg b/tools/at91sam7s512-jlink.cfg
new file mode 100644
index 000000000..8582dc02b
--- /dev/null
+++ b/tools/at91sam7s512-jlink.cfg
@@ -0,0 +1,38 @@
+#define our ports
+telnet_port 4444
+gdb_port 3333
+
+interface jlink
+transport select jtag
+adapter_khz 1000
+
+#reset_config <signals> [combination] [trst_type] [srst_type]
+reset_config srst_only srst_pulls_trst
+
+jtag newtap sam7x cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id 0x3f0f0f0f
+
+target create sam7x.cpu arm7tdmi -endian little -chain-position sam7x.cpu
+
+sam7x.cpu configure -event reset-init {
+	soft_reset_halt
+	mww 0xfffffd00 0xa5000004	# RSTC_CR: Reset peripherals
+	mww 0xfffffd44 0x00008000	# WDT_MR: disable watchdog
+	mww 0xfffffd08 0xa5000001	# RSTC_MR enable user reset
+	mww 0xfffffc20 0x00005001	# CKGR_MOR : enable the main oscillator
+	sleep 10
+	mww 0xfffffc2c 0x000b1c02	# CKGR_PLLR: 16MHz * 12/2 = 96MHz
+	sleep 10
+	mww 0xfffffc30 0x00000007	# PMC_MCKR : MCK = PLL / 2 = 48 MHz
+	sleep 10
+	mww 0xffffff60 0x00480100	# MC_FMR: flash mode (FWS=1,FMCN=72)
+	sleep 100
+}
+
+gdb_memory_map enable
+#gdb_breakpoint_override hard
+#armv4_5 core_state arm
+
+sam7x.cpu configure -work-area-virt 0 -work-area-phys 0x00200000 -work-area-size 0x10000 -work-area-backup 0
+#flash bank sam7x.flash.0 at91sam7 0x100000 0x40000 0 4 sam7x.cpu
+flash bank sam7x512.flash.0 at91sam7 0 0 0 0 sam7x.cpu 0 0 0 0 0 0 0 18432
+flash bank sam7x512.flash.1 at91sam7 0 0 0 0 sam7x.cpu 1 0 0 0 0 0 0 18432

From ce8d5c66abfd3ef153e47381405ab88d97e60134 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 25 Apr 2019 08:29:15 +0200
Subject: [PATCH 1405/1938] fix
 https://github.com/RfidResearchGroup/proxmark3/issues/173

this seems to work for OSX,  and improved linux version with fallback.
---
 client/util.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/client/util.c b/client/util.c
index b14023067..3c7ef4ba0 100644
--- a/client/util.c
+++ b/client/util.c
@@ -866,9 +866,18 @@ int num_CPUs(void) {
     SYSTEM_INFO sysinfo;
     GetSystemInfo(&sysinfo);
     return sysinfo.dwNumberOfProcessors;
-#elif defined(__linux__) || defined(__APPLE__)
+#elif defined(__linux__) && defined(_SC_NPROCESSORS_ONLN)
 #include <unistd.h>
-    return sysconf(_SC_NPROCESSORS_ONLN);
+    int count = sysconf(_SC_NPROCESSORS_ONLN);
+    if (count <= 0) 
+        count = 1;
+    return count;   
+#elif defined(__APPLE__)
+#include "sys/sysctl.h"
+    uint32 logicalcores = 0;
+    size_t size = sizeof( logicalcores );
+    sysctlbyname( "hw.logicalcpu", &logicalcores, &size, NULL, 0 );
+    return logicalcores;
 #else
     return 1;
 #endif

From 90463cb79fba1c390b866b4754a33643f0759b25 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 25 Apr 2019 09:49:47 +0200
Subject: [PATCH 1406/1938] fix again OSX

---
 client/util.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/util.c b/client/util.c
index 3c7ef4ba0..dadac9ef6 100644
--- a/client/util.c
+++ b/client/util.c
@@ -874,7 +874,7 @@ int num_CPUs(void) {
     return count;   
 #elif defined(__APPLE__)
 #include "sys/sysctl.h"
-    uint32 logicalcores = 0;
+    uint32_t logicalcores = 0;
     size_t size = sizeof( logicalcores );
     sysctlbyname( "hw.logicalcpu", &logicalcores, &size, NULL, 0 );
     return logicalcores;

From fe35a972f57a9f526002e5570f1d98800c5c239c Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 25 Apr 2019 16:08:08 +0200
Subject: [PATCH 1407/1938] fix:
 https://github.com/RfidResearchGroup/proxmark3/issues/174 remove all
 offending code,  return 1.   Will only impact the speed of hardnested
 execution.

---
 client/util.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/client/util.c b/client/util.c
index dadac9ef6..472b9d17d 100644
--- a/client/util.c
+++ b/client/util.c
@@ -873,11 +873,15 @@ int num_CPUs(void) {
         count = 1;
     return count;   
 #elif defined(__APPLE__)
+/*
+   TODO ICEMAN 2019, its commented out until someone finds a better solution
 #include "sys/sysctl.h"
     uint32_t logicalcores = 0;
     size_t size = sizeof( logicalcores );
     sysctlbyname( "hw.logicalcpu", &logicalcores, &size, NULL, 0 );
     return logicalcores;
+    */
+    return 1;    
 #else
     return 1;
 #endif

From 3bfd01bffb5e8e74539c16f01f733f81a5d70d49 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 25 Apr 2019 16:55:00 +0200
Subject: [PATCH 1408/1938] fix:  warning on mingw64.   This offset is
 calculated, casting it to u32 should be fine.

---
 client/fido/cbortools.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/client/fido/cbortools.c b/client/fido/cbortools.c
index 1864ac7c3..d7a138779 100644
--- a/client/fido/cbortools.c
+++ b/client/fido/cbortools.c
@@ -204,12 +204,10 @@ int TinyCborPrintFIDOPackage(uint8_t cmdCode, bool isResponse, uint8_t *data, si
 
     if (err) {
         fprintf(stderr,
-#if __WORDSIZE == 64
-                "CBOR parsing failure at offset %" PRId64 " : %s\n",
-#else
                 "CBOR parsing failure at offset %" PRId32 " : %s\n",
-#endif
-                cb.ptr - data, cbor_error_string(err));
+                (uint32_t)(cb.ptr - data),
+                cbor_error_string(err)
+                );
         return 1;
     }
 

From ef95d8c74295f9182ce24dad043d3995ec760fb4 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 25 Apr 2019 16:57:18 +0200
Subject: [PATCH 1409/1938] chg: 'hf mf sim' - textual

---
 client/cmdhfmf.c | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 179609891..8471ff45a 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -2145,6 +2145,8 @@ static int CmdHF14AMfSim(const char *Cmd) {
     uint8_t cmdp = 0;
     bool errors = false, verbose = false, setEmulatorMem = false;
     nonces_t data[1];
+    char csize[13] = { 0 };
+    char uidsize[8] = { 0 };
 
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
@@ -2165,24 +2167,21 @@ static int CmdHF14AMfSim(const char *Cmd) {
             case 't':
                 switch (param_get8(Cmd, cmdp + 1)) {
                     case 0:
-                        // Mifare MINI
                         flags |= FLAG_MF_MINI;
-                        break;
-                    case 1:
-                        // Mifare Classic 1k
-                        flags |= FLAG_MF_1K;
+                        sprintf(csize, "MINI");
                         break;
                     case 2:
-                        // Mifare Classic 2k
                         flags |= FLAG_MF_2K;
+                        sprintf(csize, "2K with RATS");
                         break;
                     case 4:
-                        // Mifare Classic 4k
                         flags |= FLAG_MF_4K;
+                        sprintf(csize, "4K");
                         break;
+                    case 1:
                     default:
-                        // Mifare Classic 1k
                         flags |= FLAG_MF_1K;
+                        sprintf(csize, "1K");
                         break;
                 }
                 cmdp += 2;
@@ -2192,12 +2191,15 @@ static int CmdHF14AMfSim(const char *Cmd) {
                 switch (uidlen) {
                     case 20:
                         flags |= FLAG_10B_UID_IN_DATA;
+                        sprintf(uidsize, "10 byte");
                         break;
                     case 14:
                         flags |= FLAG_7B_UID_IN_DATA;
+                        sprintf(uidsize, "7 byte");
                         break;
                     case  8:
                         flags |= FLAG_4B_UID_IN_DATA;
+                        sprintf(uidsize, "4 byte");
                         break;
                     default:
                         return usage_hf14_mfsim();
@@ -2222,11 +2224,17 @@ static int CmdHF14AMfSim(const char *Cmd) {
     if (errors) return usage_hf14_mfsim();
 
     // Use UID, SAK, ATQA from EMUL, if uid not defined
-    if ((flags & (FLAG_4B_UID_IN_DATA | FLAG_7B_UID_IN_DATA | FLAG_10B_UID_IN_DATA)) == 0)
+    if ((flags & (FLAG_4B_UID_IN_DATA | FLAG_7B_UID_IN_DATA | FLAG_10B_UID_IN_DATA)) == 0) {
         flags |= FLAG_UID_IN_EMUL;
+    }
 
-    PrintAndLogEx(NORMAL, " uid:%s, numreads:%d, flags:%d (0x%02x) "
+    PrintAndLogEx(INFO, _YELLOW_("Mifare %s") " | %s UID  " _YELLOW_("%s") ""
+                  , csize
+                  , uidsize
                   , (uidlen == 0) ? "N/A" : sprint_hex(uid, uidlen >> 1)
+    );
+    
+    PrintAndLogEx(INFO, "Options [ numreads: %d, flags: %d (0x%02x) ]"
                   , exitAfterNReads
                   , flags
                   , flags);

From 278ec017fe176cd6ce84405e7540f6fce99d466e Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 25 Apr 2019 17:04:51 +0200
Subject: [PATCH 1410/1938] chg: increased client side timeout. Accoring to
 test with rdv4 addon ( @doegox )

---
 uart/uart_posix.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index f4123b6d3..462cd7320 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -78,7 +78,7 @@ typedef struct {
 // FTDI 460800 hw status -> we need 30ms
 struct timeval timeout = {
     .tv_sec  =      0, // 0 second
-    .tv_usec = 100000  // 100 000 micro seconds
+    .tv_usec = 200000  // 200 000 micro seconds
 };
 
 serial_port uart_open(const char *pcPortName, uint32_t speed) {

From df96b58fcccce65a526c698a60b897c0acfe54b7 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 25 Apr 2019 17:06:40 +0200
Subject: [PATCH 1411/1938] style

---
 armsrc/appmain.c             | 2 +-
 client/comms.c               | 6 +++---
 client/jansson/pack_unpack.c | 9 +++++++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 4aefcd99f..9e730dc08 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -123,7 +123,7 @@ void DbpStringEx(char *str, uint32_t cmd) {
     data.flag = cmd;
     uint16_t len = MIN(strlen(str), sizeof(data.buf));
     memcpy(data.buf, str, len);
-    reply_ng(CMD_DEBUG_PRINT_STRING, PM3_SUCCESS, (uint8_t*)&data, sizeof(data.flag) + len);
+    reply_ng(CMD_DEBUG_PRINT_STRING, PM3_SUCCESS, (uint8_t *)&data, sizeof(data.flag) + len);
 #endif
 }
 
diff --git a/client/comms.c b/client/comms.c
index 881806c84..f7c84c7c4 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -261,7 +261,7 @@ static void PacketResponseReceived(PacketResponseNG *packet) {
                     uint16_t flag;
                     uint8_t buf[USB_CMD_DATA_SIZE - sizeof(uint16_t)];
                 } PACKED;
-                struct d* data = (struct d*)&packet->data.asBytes;
+                struct d *data = (struct d *)&packet->data.asBytes;
                 len = packet->length - sizeof(data->flag);
                 memcpy(s, data->buf, len);
                 flag = data->flag;
@@ -617,7 +617,7 @@ bool WaitForResponseTimeoutW(uint32_t cmd, PacketResponseNG *response, size_t ms
         response = &resp;
 
     // Add delay depending on the communication channel & speed
-    if (ms_timeout != (size_t)-1)
+    if (ms_timeout != (size_t) -1)
         ms_timeout += communication_delay();
 
     timeout_start_time = msclock();
@@ -707,7 +707,7 @@ static bool dl_it(uint8_t *dest, uint32_t bytes, uint32_t start_index, PacketRes
     timeout_start_time = msclock();
 
     // Add delay depending on the communication channel & speed
-    if (ms_timeout != (size_t)-1)
+    if (ms_timeout != (size_t) -1)
         ms_timeout += communication_delay();
 
     while (true) {
diff --git a/client/jansson/pack_unpack.c b/client/jansson/pack_unpack.c
index af7aab0fd..651e1c56b 100644
--- a/client/jansson/pack_unpack.c
+++ b/client/jansson/pack_unpack.c
@@ -480,9 +480,14 @@ static int unpack_object(scanner_t *s, json_t *root, va_list *ap) {
         return -1;
     }
 
+
     if (root && !json_is_object(root)) {
-        set_error(s, "<validation>", json_error_wrong_type, "Expected object, got %s",
-                  type_name(root));
+        set_error(s,
+                  "<validation>",
+                  json_error_wrong_type,
+                  "Expected object, got %s",
+                  (root) ? type_name(root) : "NULL"
+                 );
         goto out;
     }
     next_token(s);

From b173f73c816e24a01b07253110c5c4e4945e51fa Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 25 Apr 2019 17:11:40 +0200
Subject: [PATCH 1412/1938] style

---
 common/i2c.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/i2c.c b/common/i2c.c
index 733b55b70..68f13ed0c 100644
--- a/common/i2c.c
+++ b/common/i2c.c
@@ -26,7 +26,7 @@
 
 volatile unsigned long c;
 
-// Direct use the loop to delay. 6 instructions loop, Masterclock 48Mhz, 
+// Direct use the loop to delay. 6 instructions loop, Masterclock 48Mhz,
 // delay=1 is about 200kbps
 // timer.
 // I2CSpinDelayClk(4) = 12.31us

From 5c9c4637d803ff7dd75b7973991bd5411d4546e7 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 25 Apr 2019 19:55:37 +0200
Subject: [PATCH 1413/1938] doc uart timings

---
 uart/uart_posix.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index 462cd7320..e022c1ac0 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -72,10 +72,10 @@ typedef struct {
 
 // Receiving from USART need more than 30ms as we used on USB
 // else we get errors about partial packet reception
-// Now we're using 100ms
-// FTDI   9600 hw status -> we need 20ms
-// FTDI 115200 hw status -> we need 50ms
-// FTDI 460800 hw status -> we need 30ms
+// FTDI   9600 hw status        -> we need 20ms
+// FTDI 115200 hw status        -> we need 50ms
+// FTDI 460800 hw status        -> we need 30ms
+// BT   115200 hf mf fchk 1 dic -> we need 140ms
 struct timeval timeout = {
     .tv_sec  =      0, // 0 second
     .tv_usec = 200000  // 200 000 micro seconds

From 6e8f7a7e303d4199dde87f1adcdb57179552d8bc Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 25 Apr 2019 19:56:13 +0200
Subject: [PATCH 1414/1938] more doc on bootrom

---
 doc/new_frame_format.txt | 44 +++++++++++++++++++++++++++++++++++-----
 1 file changed, 39 insertions(+), 5 deletions(-)

diff --git a/doc/new_frame_format.txt b/doc/new_frame_format.txt
index 29fb6592e..c42591f62 100644
--- a/doc/new_frame_format.txt
+++ b/doc/new_frame_format.txt
@@ -185,9 +185,38 @@ Meanwhile, a fast transition to MIX frames can be done with:
 
 Bootrom
 =======
-TODO
-We need to be very careful to make a flasher that can deal with old & new bootroms.
-New bootrom might need to also still support old frame format, to ease flashing back to repos supporting the old format...
+
+Bootrom code will still use the old frame format to remain compatible with other repos supporting the old format and because it would hardly gain anything from the new format:
+* almost all frames convey 512b of payload, so difference in overhead is neglictible
+* bringing flash over usart sounds risky and would be terribly slow anyway (115200 bauds vs. 7M bauds).
+
+On the Proxmark3, for receiving frames:
+---------------------------------------
+(bootrom/bootrom.c)
+usb_read (common/usb_cdc.c) -> UsbPacketReceived (bootrom.c)
+  -> CMD_DEVICE_INFO / CMD_START_FLASH / CMD_FINISH_WRITE / CMD_HARDWARE_RESET / CMD_SETUP_WRITE
+also usb_enable, usb_disable (common/usb_cdc.c)
+
+On the Proxmark3, for sending frames:
+-------------------------------------
+(bootrom/bootrom.c)
+reply_old (bootrom.c) -> usb_write (common/usb_cdc.c)
+also usb_enable, usb_disable (common/usb_cdc.c)
+
+On the client, for sending frames:
+-------------------------------------
+
+Therefore, the flasher client (client/flasher.c + client->flash.c) must still use these old frames.
+It uses a few commands in common with current client code:
+OpenProxmark
+CloseProxmark
+SendCommandOLD
+  -> CMD_DEVICE_INFO / CMD_START_FLASH / CMD_FINISH_WRITE / CMD_HARDWARE_RESET
+
+On the client, for receiving frames:
+------------------------------------
+As usual, old frames are still supported
+WaitForResponseTimeout -> PacketResponseNG
 
 New usart RX FIFO
 =================
@@ -323,10 +352,15 @@ time client/proxmark3 -p /dev/ttyUSB0 -b 115200 -c "mem save f foo_fpc"
 Reference frames
 ================
 
-Captured on linux USB.
-
 For helping debug...
 
+On linux USB
+* sent packets can be 544
+* received packets are max 128, so 544 = 128+128+128+128+32
+On linux UART (FTDI)
+* sent packets are max 256, so 544 = 256+256+32
+* received packets are max 512, so 544 = 512+32
+
 Initial connection:
 TestProxmark: SendCommandOLD(CMD_PING, 0, 0, 0, NULL, 0);
 ->544=0901000000000000000000000000000000000000000000000000000000000000  -> OLD

From a844afc273288d902c7cfba08c3fe6cfdb6f035f Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 25 Apr 2019 20:42:41 +0200
Subject: [PATCH 1415/1938] Guard Hitag code

---
 client/cmdlf.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/client/cmdlf.c b/client/cmdlf.c
index 3243d60af..3e2311203 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -883,7 +883,9 @@ int CmdLFfind(const char *Cmd) {
         // The improved noise detection will find Cotag.
         if (getSignalProperties()->isnoise) {
 
+#ifdef WITH_HITAG
             if (readHitagUid()) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Hitag") " found!"); return 1;}
+#endif
             if (readCOTAGUid()) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("COTAG ID") " found!"); return 1;}
 
             PrintAndLogEx(FAILED, "\n" _YELLOW_("No data found!") " - Signal looks like noise. Maybe not an LF tag?");
@@ -972,7 +974,9 @@ static command_t CommandTable[] = {
     {"fdx",         CmdLFFdx,           1, "{ FDX-B RFIDs...             }"},
     {"gproxii",     CmdLFGuard,         1, "{ Guardall Prox II RFIDs...  }"},
     {"hid",         CmdLFHID,           1, "{ HID RFIDs...               }"},
+#ifdef WITH_HITAG
     {"hitag",       CmdLFHitag,         1, "{ Hitag CHIPs...             }"},
+#endif
     {"indala",      CmdLFINDALA,        1, "{ Indala RFIDs...            }"},
     {"io",          CmdLFIO,            1, "{ ioProx RFIDs...            }"},
     {"jablotron",   CmdLFJablotron,     1, "{ Jablotron RFIDs...         }"},

From a6278ff8cdb98788464a17505a8ca1fc567e4be4 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 25 Apr 2019 20:51:20 +0200
Subject: [PATCH 1416/1938] chg:  forgot to readd hitag support :)

---
 armsrc/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/armsrc/Makefile b/armsrc/Makefile
index 42965767b..a5d0b1403 100644
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -31,6 +31,7 @@ APP_CFLAGS = $(PLATFORM_DEFS) \
 			 -DWITH_CRC \
 			 -DON_DEVICE \
 			 -DWITH_LF \
+			 -DWITH_HITAG \
  			 -DWITH_ISO15693 \
 			 -DWITH_LEGICRF \
 			 -DWITH_ISO14443b \

From 27e94f5669af12bf82873ead7e52794957163b71 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 25 Apr 2019 20:59:11 +0200
Subject: [PATCH 1417/1938] remove redundant def

---
 armsrc/Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/armsrc/Makefile b/armsrc/Makefile
index a5d0b1403..fa54d4451 100644
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -43,7 +43,6 @@ APP_CFLAGS = $(PLATFORM_DEFS) \
 			 -fno-strict-aliasing -ffunction-sections -fdata-sections
 
 ### IMPORTANT -  move the commented variable below this line
-#			 -DWITH_HITAG \
 #			 -DWITH_FPC \
 #			 -DWITH_LCD \
 #			 -DWITH_EMV \

From 176645b9fcc3fdd75f894b8be3aac1c5f89184f5 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 25 Apr 2019 21:16:11 +0200
Subject: [PATCH 1418/1938] REM: removed unused define

---
 armsrc/Makefile             | 1 -
 armsrc/Standalone/readme.md | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/armsrc/Makefile b/armsrc/Makefile
index a5d0b1403..15bf55d33 100644
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -28,7 +28,6 @@ endif
 #in the next section to remove that particular feature from compilation.
 # NO space,TABs after the "\" sign.
 APP_CFLAGS = $(PLATFORM_DEFS) \
-			 -DWITH_CRC \
 			 -DON_DEVICE \
 			 -DWITH_LF \
 			 -DWITH_HITAG \
diff --git a/armsrc/Standalone/readme.md b/armsrc/Standalone/readme.md
index 12fe6c145..21eadc45f 100644
--- a/armsrc/Standalone/readme.md
+++ b/armsrc/Standalone/readme.md
@@ -68,8 +68,7 @@ Once all this is done, you and others can now easily compile different standalon
 #remove one of the following defines and comment out the relevant line
 #in the next section to remove that particular feature from compilation.
 # NO space,TABs after the "\" sign.
-APP_CFLAGS = -DWITH_CRC \
-             -DON_DEVICE \
+APP_CFLAGS = -DON_DEVICE \
              -DWITH_LF \
              -DWITH_HITAG \
              -DWITH_ISO15693 \

From a59f7a50ce8b9e639ebf70cc6db76fadc5d23ad8 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 25 Apr 2019 21:21:53 +0200
Subject: [PATCH 1419/1938] fix:  spellingmistake

---
 armsrc/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/armsrc/Makefile b/armsrc/Makefile
index 7cf1a0ce1..ed129c950 100644
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -87,13 +87,13 @@ else
 	SRC_FPC =
 endif
 
-ifneq (,$(findstring WITH_HITAG,$(APP_CLAGS)))
+ifneq (,$(findstring WITH_HITAG,$(APP_CFLAGS)))
     SRC_HITAG = hitag2_crypto.c hitag2.c hitagS.c
 else
     SRC_HITAG =
 endif
 
-ifneq (,$(findstring WITH_LCD,$(APP_CLAGS)))
+ifneq (,$(findstring WITH_LCD,$(APP_CFLAGS)))
     SRC_LCD = fonts.c LCD.c
 else
     SRC_LCD =

From 7220653ccdab4934f02dfc2c9c503d6cdcef0c2e Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 25 Apr 2019 21:44:34 +0200
Subject: [PATCH 1420/1938] chg: refactor standalone mode info string add:
 icerun - skeleton standalone mode for ppl to use as base for their new modes.

---
 armsrc/Makefile                  |  2 +-
 armsrc/Standalone/hf_bog.c       |  4 +++
 armsrc/Standalone/hf_colin.c     |  4 +++
 armsrc/Standalone/hf_mattyrun.c  |  4 +++
 armsrc/Standalone/hf_young.c     |  4 +++
 armsrc/Standalone/lf_hidbrute.c  |  4 +++
 armsrc/Standalone/lf_icerun.c    | 41 +++++++++++++++++++++++++
 armsrc/Standalone/lf_icerun.h    | 17 +++++++++++
 armsrc/Standalone/lf_proxbrute.c |  4 +++
 armsrc/Standalone/lf_samyrun.c   |  4 +++
 armsrc/Standalone/standalone.h   |  1 +
 armsrc/appmain.c                 | 52 ++++++--------------------------
 12 files changed, 97 insertions(+), 44 deletions(-)
 create mode 100644 armsrc/Standalone/lf_icerun.c
 create mode 100644 armsrc/Standalone/lf_icerun.h

diff --git a/armsrc/Makefile b/armsrc/Makefile
index ed129c950..498453755 100644
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -103,7 +103,7 @@ endif
 SRC_STANDALONE =
 # WITH_LF_ICERUN
 ifneq (,$(findstring WITH_LF_ICERUN,$(APP_CFLAGS)))
-	SRC_STANDALONE =
+	SRC_STANDALONE = lf_icerun.c
 endif
 # WITH_LF_SAMYRUN
 ifneq (,$(findstring WITH_LF_SAMYRUN,$(APP_CFLAGS)))
diff --git a/armsrc/Standalone/hf_bog.c b/armsrc/Standalone/hf_bog.c
index 36e600392..151282f3a 100644
--- a/armsrc/Standalone/hf_bog.c
+++ b/armsrc/Standalone/hf_bog.c
@@ -281,6 +281,10 @@ void RAMFUNC SniffAndStore(uint8_t param) {
     }
 }
 
+void ModInfo(void) {
+    DbpString("   HF 14a sniff standalone with ULC/ULEV1/NTAG auth storing in flashmem - aka BogitoRun (Bogito)");
+}
+
 void RunMod() {
 
     StandAloneMode();
diff --git a/armsrc/Standalone/hf_colin.c b/armsrc/Standalone/hf_colin.c
index d8c1063e3..681223a02 100644
--- a/armsrc/Standalone/hf_colin.c
+++ b/armsrc/Standalone/hf_colin.c
@@ -195,6 +195,10 @@ void WriteTagToFlash(uint8_t index, size_t size) {
     return;
 }
 
+void ModInfo(void) {
+    DbpString("   HF Mifare ultra fast sniff/sim/clone - aka VIGIKPWN (Colin Brigato)");
+}
+
 void RunMod() {
     StandAloneMode();
     FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
diff --git a/armsrc/Standalone/hf_mattyrun.c b/armsrc/Standalone/hf_mattyrun.c
index de22d11f9..9bcfd63d3 100644
--- a/armsrc/Standalone/hf_mattyrun.c
+++ b/armsrc/Standalone/hf_mattyrun.c
@@ -191,6 +191,10 @@ static int saMifareChkKeys(uint8_t blockNo, uint8_t keyType, bool clearTrace, ui
     return -1;
 }
 
+void ModInfo(void) {
+    DbpString("   HF Mifare sniff/clone - aka MattyRun (Matías A. Ré Medina)");
+}
+
 void RunMod() {
     StandAloneMode();
     Dbprintf(">>  Matty mifare chk/dump/sim  a.k.a MattyRun Started  <<");
diff --git a/armsrc/Standalone/hf_young.c b/armsrc/Standalone/hf_young.c
index 24e20dd7f..f09a5eaa0 100644
--- a/armsrc/Standalone/hf_young.c
+++ b/armsrc/Standalone/hf_young.c
@@ -18,6 +18,10 @@ typedef struct {
 } __attribute__((__packed__)) card_clone_t;
 
 
+void ModInfo(void) {
+    DbpString("   HF Mifare sniff/simulation - (Craig Young)");
+}
+
 void RunMod() {
     StandAloneMode();
     Dbprintf(">>  Craig Young Mifare sniff UID/clone uid 2 magic/sim  a.k.a YoungRun Started  <<");
diff --git a/armsrc/Standalone/lf_hidbrute.c b/armsrc/Standalone/lf_hidbrute.c
index 8571c0ce1..fbd71a704 100644
--- a/armsrc/Standalone/lf_hidbrute.c
+++ b/armsrc/Standalone/lf_hidbrute.c
@@ -26,6 +26,10 @@
 //-----------------------------------------------------------------------------------
 #include "lf_hidbrute.h"
 
+void ModInfo(void) {
+    DbpString("   LF HID corporate 1000 bruteforce - aka Corporatebrute (Federico dotta & Maurizio Agazzini)");
+}
+
 // samy's sniff and repeat routine for LF
 void RunMod() {
     StandAloneMode();
diff --git a/armsrc/Standalone/lf_icerun.c b/armsrc/Standalone/lf_icerun.c
new file mode 100644
index 000000000..b9a87e397
--- /dev/null
+++ b/armsrc/Standalone/lf_icerun.c
@@ -0,0 +1,41 @@
+//-----------------------------------------------------------------------------
+// Christian Herrmann, 2019
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// main code for skeleton  aka IceRun by Iceman
+//-----------------------------------------------------------------------------
+#include "lf_icerun.h"
+
+void ModInfo(void) {
+    DbpString("   LF skeleton mode -  aka IceRun (iceman)");
+}
+
+// samy's sniff and repeat routine for LF
+void RunMod() {
+    StandAloneMode();
+    Dbprintf("[=] LF skeleton code a.k.a IceRun started");
+    FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
+
+    // the main loop for your standalone mode
+    for (;;) {
+        WDT_HIT();
+
+        // exit from IceRun,   send a usbcommand.
+        if (usb_poll_validate_length()) break;
+
+        // Was our button held down or pressed?
+        int button_pressed = BUTTON_HELD(1000);
+
+        Dbprintf("button %d", button_pressed);
+        
+        if ( button_pressed )
+            break;
+    }
+
+out:
+    DbpString("[=] exiting");
+    LEDsoff();
+}
diff --git a/armsrc/Standalone/lf_icerun.h b/armsrc/Standalone/lf_icerun.h
new file mode 100644
index 000000000..50427320a
--- /dev/null
+++ b/armsrc/Standalone/lf_icerun.h
@@ -0,0 +1,17 @@
+//-----------------------------------------------------------------------------
+// Iceman, Christian Herrmann, 2019
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// StandAlone Mod
+//-----------------------------------------------------------------------------
+
+#ifndef __LF_ICERUN_H
+#define __LF_ICERUN_H
+
+#include "standalone.h" // standalone definitions
+#include "apps.h" // debugstatements, lfops?
+
+#endif /* __LF_ICERUN_H */
diff --git a/armsrc/Standalone/lf_proxbrute.c b/armsrc/Standalone/lf_proxbrute.c
index 178ce98fb..c9fce3ac6 100644
--- a/armsrc/Standalone/lf_proxbrute.c
+++ b/armsrc/Standalone/lf_proxbrute.c
@@ -11,6 +11,10 @@
 //-----------------------------------------------------------------------------
 #include "lf_proxbrute.h"
 
+void ModInfo(void) {
+    DbpString("   LF HID ProxII bruteforce - aka Proxbrute (Brad Antoniewicz)");
+}
+
 // samy's sniff and repeat routine for LF
 void RunMod() {
     StandAloneMode();
diff --git a/armsrc/Standalone/lf_samyrun.c b/armsrc/Standalone/lf_samyrun.c
index b4530fa2f..8b3ae5360 100644
--- a/armsrc/Standalone/lf_samyrun.c
+++ b/armsrc/Standalone/lf_samyrun.c
@@ -10,6 +10,10 @@
 //-----------------------------------------------------------------------------
 #include "lf_samyrun.h"
 
+void ModInfo(void) {
+    DbpString("   LF HID26 standalone - aka SamyRun (Samy Kamkar)");
+}
+
 // samy's sniff and repeat routine for LF
 void RunMod() {
     StandAloneMode();
diff --git a/armsrc/Standalone/standalone.h b/armsrc/Standalone/standalone.h
index 334bbc2b4..217c7b4cf 100644
--- a/armsrc/Standalone/standalone.h
+++ b/armsrc/Standalone/standalone.h
@@ -15,5 +15,6 @@
 #include <inttypes.h> // PRIu64
 
 void RunMod();
+void ModInfo();
 
 #endif /* __STANDALONE_H */
diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index e7887b9af..ca64d008f 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -411,7 +411,15 @@ void SendStatus(void) {
     Dbprintf("  ToSendMax...............%d", ToSendMax);
     Dbprintf("  ToSendBit...............%d", ToSendBit);
     Dbprintf("  ToSend BUFFERSIZE.......%d", TOSEND_BUFFER_SIZE);
-    printStandAloneModes();
+    DbpString("Installed StandAlone Mode");
+    ModInfo();
+
+    //DbpString("Running ");
+    //Dbprintf("  Is Device attached to USB| %s", USB_ATTACHED() ? "Yes" : "No");
+    //Dbprintf("  Is Device attached to FPC| %s", send_using_0 ? "Yes" : "No");
+    //Dbprintf("  Is USB_reconnect value   | %d", GetUSBreconnect() );
+    //Dbprintf("  Is USB_configured value  | %d", GetUSBconfigured() );
+    
     cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
 }
 
@@ -427,48 +435,6 @@ void StandAloneMode(void) {
     SpinDown(50);
     SpinDelay(500);
 }
-// detection of which Standalone Modes is installed
-// (iceman)
-void printStandAloneModes(void) {
-
-    DbpString("Installed StandAlone Mode");
-
-#if defined(WITH_LF_ICERUN)
-    DbpString("   LF sniff/clone/simulation -  aka IceRun (iceman)");
-#endif
-#if defined(WITH_HF_YOUNG)
-    DbpString("   HF Mifare sniff/simulation - (Craig Young)");
-#endif
-#if defined(WITH_LF_SAMYRUN)
-    DbpString("   LF HID26 standalone - aka SamyRun (Samy Kamkar)");
-#endif
-#if defined(WITH_LF_PROXBRUTE)
-    DbpString("   LF HID ProxII bruteforce - aka Proxbrute (Brad Antoniewicz)");
-#endif
-#if defined(WITH_LF_HIDBRUTE)
-    DbpString("   LF HID corporate 1000 bruteforce - aka Corporatebrute (Federico dotta & Maurizio Agazzini)");
-#endif
-#if defined(WITH_HF_MATTYRUN)
-    DbpString("   HF Mifare sniff/clone - aka MattyRun (Matías A. Ré Medina)");
-#endif
-#if defined(WITH_HF_COLIN)
-    DbpString("   HF Mifare ultra fast sniff/sim/clone - aka VIGIKPWN (Colin Brigato)");
-#endif
-#if defined(WITH_HF_BOG)
-    DbpString("   HF 14a sniff standalone with ULC/ULEV1/NTAG auth storing in flashmem - aka BogitoRun (Bogito)");
-#endif
-
-    //DbpString("Running ");
-    //Dbprintf("  Is Device attached to USB| %s", USB_ATTACHED() ? "Yes" : "No");
-    //Dbprintf("  Is Device attached to FPC| %s", 0 ? "Yes" : "No");
-    //Dbprintf("  Is USB_reconnect value   | %d", GetUSBreconnect() );
-    //Dbprintf("  Is USB_configured value  | %d", GetUSBconfigured() );
-
-    //.. add your own standalone detection based on with compiler directive you are used.
-    // don't "reuse" the already taken ones, this will make things easier when trying to detect the different modes
-    // 2017-08-06  must adapt the makefile and have individual compilation flags for all mods
-    //
-}
 
 /*
 OBJECTIVE

From 505506c5dd7b317c8728d78f538d95a08ebd95b2 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 25 Apr 2019 21:50:55 +0200
Subject: [PATCH 1421/1938] textual

---
 armsrc/Standalone/readme.md | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/armsrc/Standalone/readme.md b/armsrc/Standalone/readme.md
index 21eadc45f..38bd982c6 100644
--- a/armsrc/Standalone/readme.md
+++ b/armsrc/Standalone/readme.md
@@ -3,6 +3,7 @@
 This contains functionality for different StandAlone modes. The fullimage will be built given the correct compiler flags used. Build targets for these files are contained in `armsrc/Makefile`.
 
 If you want to implement a new standalone mode, you need to implement the methods provided in `standalone.h`.
+Have a look at the skeleton standalone mode called  IceRun, in the files `lf_icerun.c lf_icerun.h`.
 
 ## Implementing a standalone mode
 
@@ -10,7 +11,11 @@ Each standalone mod needs to have its own compiler flag to be added in `armsrc\m
 
 The RunMod function is your "main" function when running.  You need to check for Usb commands,  in order to let the pm3 client break the standalone mode.  See this basic skeleton of main function RunMod().
 ````
-void RunMod() {
+void ModInfo(void) {
+    DbpString("   HF good description of your mode - (my name)");
+}
+
+void RunMod(void) {
     // led show
     StandAloneMode();
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
@@ -54,14 +59,10 @@ endif
 ```
 
 ## Adding identification of your mode
-Do please add a identification string in the function `printStandAloneModes` inside `armsrc\appmain.c`
+Do please add a identification string in a function called `ModInfo` inside your source code file.
 This will enable an easy way to detect on client side which standalone mods has been installed on the device.
-```
-#if defined(WITH_HF_COLIN)
-    DbpString("   HF Mifare ultra fast sniff/sim/clone - aka VIGIKPWN (Colin Brigato)");
-#endif
-````
 
+## Compiling your standalone mode
 Once all this is done, you and others can now easily compile different standalone modes by just swapping the -D directive in `armsrc\makefile`
 
 ````
@@ -85,8 +86,6 @@ APP_CFLAGS = -DON_DEVICE \
              -fno-strict-aliasing -ffunction-sections -fdata-sections
 
 ### IMPORTANT -  move the commented variable below this line
-#             -DWITH_LCD \
-#             -DWITH_EMV \
 #             -DWITH_FPC \
 #
 # Standalone Mods

From f3b3508d3e8b887a9d957a40e66e39d1bdc9195e Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 25 Apr 2019 22:15:16 +0200
Subject: [PATCH 1422/1938] Move compile options to Makefile.hal

---
 Makefile                    |  7 ++--
 armsrc/Makefile             | 65 ++++++++++++-------------------------
 armsrc/Standalone/readme.md | 60 +++++++++-------------------------
 armsrc/appmain.c            | 20 ++++++------
 client/Makefile             |  7 ++--
 common/Makefile.hal         | 52 ++++++++++++++++++++++++++++-
 6 files changed, 104 insertions(+), 107 deletions(-)

diff --git a/Makefile b/Makefile
index cf327d95f..a474fadd3 100644
--- a/Makefile
+++ b/Makefile
@@ -35,9 +35,10 @@ endif
 include common/Makefile.hal
 
 $(info ===================================================================)
-$(info PLATFORM: $(PLATFORM))
-$(info $(PLTNAME))
-$(info Included supports: $(PLATFORM_DEFS))
+$(info PLATFORM:          $(PLATFORM))
+$(info Platform name:     $(PLTNAME))
+$(info Included options:  $(PLATFORM_DEFS_INFO))
+$(info Standalone mode:   $(PLATFORM_DEFS_INFO_STANDALONE))
 $(info ===================================================================)
 
 all clean: %: client/% bootrom/% armsrc/% recovery/% mfkey/% nonce2key/%
diff --git a/armsrc/Makefile b/armsrc/Makefile
index ed129c950..eb8158dd7 100644
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -18,9 +18,10 @@ ifeq ($(PLTNAME),)
   endif
   include ../common/Makefile.hal
   $(info ===================================================================)
-  $(info PLATFORM: $(PLATFORM))
-  $(info $(PLTNAME))
-  $(info Included supports: $(PLATFORM_DEFS))
+  $(info PLATFORM:          $(PLATFORM))
+  $(info Platform name:     $(PLTNAME))
+  $(info Included options:  $(PLATFORM_DEFS_INFO))
+  $(info Standalone mode:   $(PLATFORM_DEFS_INFO_STANDALONE))
   $(info ===================================================================)
 endif
 
@@ -29,34 +30,8 @@ endif
 # NO space,TABs after the "\" sign.
 APP_CFLAGS = $(PLATFORM_DEFS) \
 			 -DON_DEVICE \
-			 -DWITH_LF \
-			 -DWITH_HITAG \
- 			 -DWITH_ISO15693 \
-			 -DWITH_LEGICRF \
-			 -DWITH_ISO14443b \
-			 -DWITH_ISO14443a \
-			 -DWITH_ICLASS \
-			 -DWITH_FELICA \
-			 -DWITH_HFSNIFF \
-			 -DWITH_LF_SAMYRUN \
 			 -fno-strict-aliasing -ffunction-sections -fdata-sections
 
-### IMPORTANT -  move the commented variable below this line
-#			 -DWITH_FPC \
-#			 -DWITH_LCD \
-#			 -DWITH_EMV \
-#
-# Standalone Mods
-#-------------------------------------------------------
-#			 -DWITH_LF_ICERUN
-#			 -DWITH_LF_SAMYRUN
-#			 -DWITH_LF_PROXBRUTE
-#			 -DWITH_LF_HIDBRUTE
-#			 -DWITH_HF_YOUNG
-#			 -DWITH_HF_MATTYRUN
-#			 -DWITH_HF_COLIN
-#			 -DWITH_HF_BOG
-
 SRC_LF = lfops.c lfsampling.c pcf7931.c lfdemod.c
 SRC_ISO15693 = iso15693.c iso15693tools.c
 SRC_ISO14443a = iso14443a.c mifareutil.c mifarecmd.c epa.c mifaresim.c
@@ -101,36 +76,36 @@ endif
 
 # Generic standalone Mode injection of source code
 SRC_STANDALONE =
-# WITH_LF_ICERUN
-ifneq (,$(findstring WITH_LF_ICERUN,$(APP_CFLAGS)))
+# WITH_STANDALONE_LF_ICERUN
+ifneq (,$(findstring WITH_STANDALONE_LF_ICERUN,$(APP_CFLAGS)))
 	SRC_STANDALONE =
 endif
-# WITH_LF_SAMYRUN
-ifneq (,$(findstring WITH_LF_SAMYRUN,$(APP_CFLAGS)))
+# WITH_STANDALONE_LF_SAMYRUN
+ifneq (,$(findstring WITH_STANDALONE_LF_SAMYRUN,$(APP_CFLAGS)))
 	SRC_STANDALONE = lf_samyrun.c
 endif
-# WITH_LF_PROXBRUTE
-ifneq (,$(findstring WITH_LF_PROXBRUTE,$(APP_CFLAGS)))
+# WITH_STANDALONE_LF_PROXBRUTE
+ifneq (,$(findstring WITH_STANDALONE_LF_PROXBRUTE,$(APP_CFLAGS)))
 	SRC_STANDALONE = lf_proxbrute.c
 endif
-# WITH_LF_HIDBRUTE
-ifneq (,$(findstring WITH_LF_HIDBRUTE,$(APP_CFLAGS)))
+# WITH_STANDALONE_LF_HIDBRUTE
+ifneq (,$(findstring WITH_STANDALONE_LF_HIDBRUTE,$(APP_CFLAGS)))
 	SRC_STANDALONE = lf_hidbrute.c
 endif
-# WITH_HF_YOUNG
-ifneq (,$(findstring WITH_HF_YOUNG,$(APP_CFLAGS)))
+# WITH_STANDALONE_HF_YOUNG
+ifneq (,$(findstring WITH_STANDALONE_HF_YOUNG,$(APP_CFLAGS)))
 	SRC_STANDALONE = hf_young.c
 endif
-# WITH_HF_MATTYRUN
-ifneq (,$(findstring WITH_HF_MATTYRUN,$(APP_CFLAGS)))
+# WITH_STANDALONE_HF_MATTYRUN
+ifneq (,$(findstring WITH_STANDALONE_HF_MATTYRUN,$(APP_CFLAGS)))
 	SRC_STANDALONE = hf_mattyrun.c
 endif
-# WITH_HF_COLIN
-ifneq (,$(findstring WITH_HF_COLIN,$(APP_CFLAGS)))
+# WITH_STANDALONE_HF_COLIN
+ifneq (,$(findstring WITH_STANDALONE_HF_COLIN,$(APP_CFLAGS)))
 	SRC_STANDALONE = vtsend.c hf_colin.c
 endif
-# WITH_HF_BOG
-ifneq (,$(findstring WITH_HF_BOG,$(APP_CFLAGS)))
+# WITH_STANDALONE_HF_BOG
+ifneq (,$(findstring WITH_STANDALONE_HF_BOG,$(APP_CFLAGS)))
 	SRC_STANDALONE = hf_bog.c
 endif
 
diff --git a/armsrc/Standalone/readme.md b/armsrc/Standalone/readme.md
index 21eadc45f..3d0005def 100644
--- a/armsrc/Standalone/readme.md
+++ b/armsrc/Standalone/readme.md
@@ -32,21 +32,23 @@ As it is now, you can only have one standalone mode installed at the time.
 Use HF/LF to denote which frequence your mod is targeting.  
 Use you own github name/similar for perpetual honour to denote your mod
 
-Samples of directive flag used in the `armsrc\makefile`:
+Samples of directive flag used in the `common/Makefile.hal`:
 ```
-### -DWITH_LF_ICERUN
-### -DWITH_LF_SAMYRUN
-### -DWITH_LF_PROXBRUTE
-### -DWITH_LF_HIDBRUTE
-### -DWITH_HF_COLIN
-### -DWITH_HF_YOUNG
-### -DWITH_HF_MATTYRUN
+#PLATFORM_DEFS += -DWITH_STANDALONE_LF_SAMYRUN
+#PLATFORM_DEFS += -DWITH_STANDALONE_LF_ICERUN
+#PLATFORM_DEFS += -DWITH_STANDALONE_LF_SAMYRUN
+#PLATFORM_DEFS += -DWITH_STANDALONE_LF_PROXBRUTE
+#PLATFORM_DEFS += -DWITH_STANDALONE_LF_HIDBRUTE
+#PLATFORM_DEFS += -DWITH_STANDALONE_HF_YOUNG
+#PLATFORM_DEFS += -DWITH_STANDALONE_HF_MATTYRUN
+#PLATFORM_DEFS += -DWITH_STANDALONE_HF_COLIN
+#PLATFORM_DEFS += -DWITH_STANDALONE_HF_BOG
 ```
 Add your source code file like the following sample in the `armsrc\makefile`
 
 ```
-# WITH_HF_COLIN
-ifneq (,$(findstring WITH_HF_COLIN,$(APP_CFLAGS)))
+# WITH_STANDALONE_HF_COLIN
+ifneq (,$(findstring WITH_STANDALONE_HF_COLIN,$(APP_CFLAGS)))
     SRC_STANDALONE = hf_colin.c vtsend.c
 else
     SRC_STANDALONE =
@@ -57,45 +59,13 @@ endif
 Do please add a identification string in the function `printStandAloneModes` inside `armsrc\appmain.c`
 This will enable an easy way to detect on client side which standalone mods has been installed on the device.
 ```
-#if defined(WITH_HF_COLIN)
+#if defined(WITH_STANDALONE_HF_COLIN)
     DbpString("   HF Mifare ultra fast sniff/sim/clone - aka VIGIKPWN (Colin Brigato)");
 #endif
 ````
 
-Once all this is done, you and others can now easily compile different standalone modes by just swapping the -D directive in `armsrc\makefile`
+Once all this is done, you and others can now easily compile different standalone modes by just selecting one of the standalone modes in `common/Makefile.hal`, e.g.:
 
 ````
-#remove one of the following defines and comment out the relevant line
-#in the next section to remove that particular feature from compilation.
-# NO space,TABs after the "\" sign.
-APP_CFLAGS = -DON_DEVICE \
-             -DWITH_LF \
-             -DWITH_HITAG \
-             -DWITH_ISO15693 \
-             -DWITH_LEGICRF \
-             -DWITH_ISO14443b \
-             -DWITH_ISO14443a \
-             -DWITH_ICLASS \
-             -DWITH_FELICA \
-             -DWITH_FLASH \
-             -DWITH_SMARTCARD \
-             -DWITH_HFSNOOP \
-             -DWITH_HF_COLIN \
-             -DWITH_FPC \
-             -fno-strict-aliasing -ffunction-sections -fdata-sections
-
-### IMPORTANT -  move the commented variable below this line
-#             -DWITH_LCD \
-#             -DWITH_EMV \
-#             -DWITH_FPC \
-#
-# Standalone Mods
-#-------------------------------------------------------
-#             -DWITH_LF_ICERUN
-#             -DWITH_LF_SAMYRUN
-#             -DWITH_LF_PROXBRUTE
-#             -DWITH_LF_HIDBRUTE
-#             -DWITH_HF_YOUNG
-#             -DWITH_HF_MATTYRUN
-#             -DWITH_HF_COLIN
+PLATFORM_DEFS += -DWITH_STANDALONE_HF_COLIN
 ````
diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index e7887b9af..3a2f14d04 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -433,28 +433,28 @@ void printStandAloneModes(void) {
 
     DbpString("Installed StandAlone Mode");
 
-#if defined(WITH_LF_ICERUN)
+#if defined(WITH_STANDALONE_LF_ICERUN)
     DbpString("   LF sniff/clone/simulation -  aka IceRun (iceman)");
 #endif
-#if defined(WITH_HF_YOUNG)
+#if defined(WITH_STANDALONE_HF_YOUNG)
     DbpString("   HF Mifare sniff/simulation - (Craig Young)");
 #endif
-#if defined(WITH_LF_SAMYRUN)
+#if defined(WITH_STANDALONE_LF_SAMYRUN)
     DbpString("   LF HID26 standalone - aka SamyRun (Samy Kamkar)");
 #endif
-#if defined(WITH_LF_PROXBRUTE)
+#if defined(WITH_STANDALONE_LF_PROXBRUTE)
     DbpString("   LF HID ProxII bruteforce - aka Proxbrute (Brad Antoniewicz)");
 #endif
-#if defined(WITH_LF_HIDBRUTE)
+#if defined(WITH_STANDALONE_LF_HIDBRUTE)
     DbpString("   LF HID corporate 1000 bruteforce - aka Corporatebrute (Federico dotta & Maurizio Agazzini)");
 #endif
-#if defined(WITH_HF_MATTYRUN)
+#if defined(WITH_STANDALONE_HF_MATTYRUN)
     DbpString("   HF Mifare sniff/clone - aka MattyRun (Matías A. Ré Medina)");
 #endif
-#if defined(WITH_HF_COLIN)
+#if defined(WITH_STANDALONE_HF_COLIN)
     DbpString("   HF Mifare ultra fast sniff/sim/clone - aka VIGIKPWN (Colin Brigato)");
 #endif
-#if defined(WITH_HF_BOG)
+#if defined(WITH_STANDALONE_HF_BOG)
     DbpString("   HF 14a sniff standalone with ULC/ULEV1/NTAG auth storing in flashmem - aka BogitoRun (Bogito)");
 #endif
 
@@ -1585,11 +1585,11 @@ void  __attribute__((noreturn)) AppMain(void) {
             * All standalone mod "main loop" should be the RunMod() function.
             * Since the standalone is either LF or HF, the somewhat bisarr defines below exists.
             */
-#if defined (WITH_LF) && ( defined (WITH_LF_SAMYRUN) || defined (WITH_LF_HIDBRUTE) || defined (WITH_LF_PROXBRUTE) )
+#if defined (WITH_LF) && ( defined (WITH_STANDALONE_LF_SAMYRUN) || defined (WITH_STANDALONE_LF_HIDBRUTE) || defined (WITH_STANDALONE_LF_PROXBRUTE) )
             RunMod();
 #endif
 
-#if defined (WITH_ISO14443a) && ( defined (WITH_HF_YOUNG) || defined(WITH_HF_COLIN) || defined(WITH_HF_MATTYRUN) || defined(WITH_HF_BOG) )
+#if defined (WITH_ISO14443a) && ( defined (WITH_STANDALONE_HF_YOUNG) || defined(WITH_STANDALONE_HF_COLIN) || defined(WITH_STANDALONE_HF_MATTYRUN) || defined(WITH_STANDALONE_HF_BOG) )
             RunMod();
 #endif
 
diff --git a/client/Makefile b/client/Makefile
index 5efd89696..012d02425 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -14,9 +14,10 @@ ifeq ($(PLTNAME),)
   endif
   include ../common/Makefile.hal
   $(info ===================================================================)
-  $(info PLATFORM: $(PLATFORM))
-  $(info $(PLTNAME))
-  $(info Included supports: $(PLATFORM_DEFS))
+  $(info PLATFORM:          $(PLATFORM))
+  $(info Platform name:     $(PLTNAME))
+  $(info Included options:  $(PLATFORM_DEFS_INFO))
+  $(info Standalone mode:   $(PLATFORM_DEFS_INFO_STANDALONE))
   $(info ===================================================================)
 endif
 
diff --git a/common/Makefile.hal b/common/Makefile.hal
index 717d59110..d6f87a2e6 100644
--- a/common/Makefile.hal
+++ b/common/Makefile.hal
@@ -56,12 +56,62 @@ else
   $(error Invalid or empty PLATFORM: $(PLATFORM). Known platforms: $(KNOWN_PLATFORMS))
 endif
 
-# Add flags dependencies
+# common LF support
+PLATFORM_DEFS += \
+	-DWITH_LF \
+	-DWITH_HITAG
+
+# common HF support
+PLATFORM_DEFS += \
+	-DWITH_ISO15693 \
+	-DWITH_LEGICRF \
+	-DWITH_ISO14443b \
+	-DWITH_ISO14443a \
+	-DWITH_ICLASS \
+	-DWITH_FELICA \
+	-DWITH_HFSNIFF
+
+# Standalone mode
+# !! Choose only one !!
+PLATFORM_DEFS += -DWITH_STANDALONE_LF_SAMYRUN
+#PLATFORM_DEFS += -DWITH_STANDALONE_LF_ICERUN
+#PLATFORM_DEFS += -DWITH_STANDALONE_LF_SAMYRUN
+#PLATFORM_DEFS += -DWITH_STANDALONE_LF_PROXBRUTE
+#PLATFORM_DEFS += -DWITH_STANDALONE_LF_HIDBRUTE
+#PLATFORM_DEFS += -DWITH_STANDALONE_HF_YOUNG
+#PLATFORM_DEFS += -DWITH_STANDALONE_HF_MATTYRUN
+#PLATFORM_DEFS += -DWITH_STANDALONE_HF_COLIN
+#PLATFORM_DEFS += -DWITH_STANDALONE_HF_BOG
+
+$(info $(findstring WITH_STANDALONE_*,$(PLATFORM_DEFS)))
+
+# Misc
+#PLATFORM_DEFS += -DWITH_LCD
+
+
+# Add flags dependencies :
+
+# WITH_FPC_* needs WITH_FPC :
 ifneq (,$(findstring WITH_FPC_,$(PLATFORM_DEFS)))
   PLATFORM_DEFS += -DWITH_FPC
 endif
+# WITH_EMV possible if WITH_ISO14443a :
+ifneq (,$(findstring WITH_ISO14443a,$(PLATFORM_DEFS)))
+  PLATFORM_DEFS += -DWITH_EMV
+endif
+
+PLATFORM_DEFS_INFO = $(strip $(filter-out STANDALONE%, $(subst -DWITH_,,$(PLATFORM_DEFS))))
+PLATFORM_DEFS_INFO_STANDALONE = $(strip $(subst STANDALONE_,, $(filter STANDALONE%, $(subst -DWITH_,,$(PLATFORM_DEFS)))))
+
+# Check that only one Standalone mode has been chosen
+ifneq (,$(word 2, $(PLATFORM_DEFS_INFO_STANDALONE)))
+  $(error You must choose only one Standalone mode!: $(PLATFORM_DEFS_INFO_STANDALONE))
+endif
+
 
 export PLATFORM
 export PLTNAME
 export MCU
 export PLATFORM_DEFS
+export PLATFORM_DEFS_INFO
+export PLATFORM_DEFS_INFO_STANDALONE

From c616f47d6b6bf0a62034b8b814848dd9aebdd6f5 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 25 Apr 2019 22:40:46 +0200
Subject: [PATCH 1423/1938] Use placeholder for standalone mode if needed

---
 armsrc/Makefile                 | 2 +-
 armsrc/Standalone/placeholder.c | 9 +++++++++
 armsrc/appmain.c                | 8 --------
 3 files changed, 10 insertions(+), 9 deletions(-)
 create mode 100644 armsrc/Standalone/placeholder.c

diff --git a/armsrc/Makefile b/armsrc/Makefile
index d03448293..29f5505e3 100644
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -77,7 +77,7 @@ endif
 # Generic standalone Mode injection of source code
 
 
-SRC_STANDALONE =
+SRC_STANDALONE = placeholder.c
 # WITH_STANDALONE_LF_ICERUN
 ifneq (,$(findstring WITH_STANDALONE_LF_ICERUN,$(APP_CFLAGS)))
 	SRC_STANDALONE = lf_icerun.c
diff --git a/armsrc/Standalone/placeholder.c b/armsrc/Standalone/placeholder.c
new file mode 100644
index 000000000..e179bc876
--- /dev/null
+++ b/armsrc/Standalone/placeholder.c
@@ -0,0 +1,9 @@
+#include "standalone.h" // standalone definitions
+#include "apps.h" // debug statements
+
+void ModInfo(void) {
+    DbpString("   No standalone mode present");
+}
+
+void RunMod() {
+}
diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index b6bba90d6..8c42a6017 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1549,16 +1549,8 @@ void  __attribute__((noreturn)) AppMain(void) {
             /*
             * So this is the trigger to execute a standalone mod.  Generic entrypoint by following the standalone/standalone.h headerfile
             * All standalone mod "main loop" should be the RunMod() function.
-            * Since the standalone is either LF or HF, the somewhat bisarr defines below exists.
             */
-#if defined (WITH_LF) && ( defined (WITH_STANDALONE_LF_SAMYRUN) || defined (WITH_STANDALONE_LF_HIDBRUTE) || defined (WITH_STANDALONE_LF_PROXBRUTE) )
             RunMod();
-#endif
-
-#if defined (WITH_ISO14443a) && ( defined (WITH_STANDALONE_HF_YOUNG) || defined(WITH_STANDALONE_HF_COLIN) || defined(WITH_STANDALONE_HF_MATTYRUN) || defined(WITH_STANDALONE_HF_BOG) )
-            RunMod();
-#endif
-
         }
     }
 }

From 423e6bfb321255e01ea8beba2d3941774a3867fd Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 25 Apr 2019 22:43:08 +0200
Subject: [PATCH 1424/1938] adjust standalone doc

---
 armsrc/Standalone/readme.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/armsrc/Standalone/readme.md b/armsrc/Standalone/readme.md
index e5746e97b..85cbdb1ca 100644
--- a/armsrc/Standalone/readme.md
+++ b/armsrc/Standalone/readme.md
@@ -7,7 +7,7 @@ Have a look at the skeleton standalone mode called  IceRun, in the files `lf_ice
 
 ## Implementing a standalone mode
 
-Each standalone mod needs to have its own compiler flag to be added in `armsrc\makefile` and inside the function `AppMain` inside  AppMain.c.  Inside Appmain a call to RunMod is needed.  It looks strange because of what kinds of dependencies your mode will have.  
+Each standalone mod needs to have its own compiler flag to be added in `armsrc\makefile`.
 
 The RunMod function is your "main" function when running.  You need to check for Usb commands,  in order to let the pm3 client break the standalone mode.  See this basic skeleton of main function RunMod().
 ````
@@ -49,7 +49,7 @@ Samples of directive flag used in the `common/Makefile.hal`:
 #PLATFORM_DEFS += -DWITH_STANDALONE_HF_COLIN
 #PLATFORM_DEFS += -DWITH_STANDALONE_HF_BOG
 ```
-Add your source code file like the following sample in the `armsrc\makefile`
+Add your source code file like the following sample in the `armsrc/Makefile`
 
 ```
 # WITH_STANDALONE_HF_COLIN

From 5c49fcbfdbfe6cb32f4754da4036a2f35b127c1f Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 25 Apr 2019 22:51:01 +0200
Subject: [PATCH 1425/1938] CHG: remove WITH_EMV since its not used at all.

---
 client/cmdtrace.c   | 3 ---
 common/Makefile.hal | 4 ----
 2 files changed, 7 deletions(-)

diff --git a/client/cmdtrace.c b/client/cmdtrace.c
index de056d814..28605c08f 100644
--- a/client/cmdtrace.c
+++ b/client/cmdtrace.c
@@ -28,9 +28,6 @@ static int usage_trace_list() {
     PrintAndLogEx(NORMAL, "    14b    - interpret data as iso14443b communications");
     PrintAndLogEx(NORMAL, "    15     - interpret data as iso15693 communications");
     PrintAndLogEx(NORMAL, "    des    - interpret data as DESFire communications");
-#ifdef WITH_EMV
-    PrintAndLogEx(NORMAL, "    emv    - interpret data as EMV / communications");
-#endif
     PrintAndLogEx(NORMAL, "    iclass - interpret data as iclass communications");
     PrintAndLogEx(NORMAL, "    topaz  - interpret data as topaz communications");
     PrintAndLogEx(NORMAL, "    7816   - interpret data as iso7816-4 communications");
diff --git a/common/Makefile.hal b/common/Makefile.hal
index d6f87a2e6..83d2dbf41 100644
--- a/common/Makefile.hal
+++ b/common/Makefile.hal
@@ -95,10 +95,6 @@ $(info $(findstring WITH_STANDALONE_*,$(PLATFORM_DEFS)))
 ifneq (,$(findstring WITH_FPC_,$(PLATFORM_DEFS)))
   PLATFORM_DEFS += -DWITH_FPC
 endif
-# WITH_EMV possible if WITH_ISO14443a :
-ifneq (,$(findstring WITH_ISO14443a,$(PLATFORM_DEFS)))
-  PLATFORM_DEFS += -DWITH_EMV
-endif
 
 PLATFORM_DEFS_INFO = $(strip $(filter-out STANDALONE%, $(subst -DWITH_,,$(PLATFORM_DEFS))))
 PLATFORM_DEFS_INFO_STANDALONE = $(strip $(subst STANDALONE_,, $(filter STANDALONE%, $(subst -DWITH_,,$(PLATFORM_DEFS)))))

From 3e641e217d1ed195c599d8e7c8de2fb1ef815869 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 25 Apr 2019 23:09:06 +0200
Subject: [PATCH 1426/1938] remove redundant def

---
 common/Makefile.hal | 1 -
 1 file changed, 1 deletion(-)

diff --git a/common/Makefile.hal b/common/Makefile.hal
index d6f87a2e6..58311189f 100644
--- a/common/Makefile.hal
+++ b/common/Makefile.hal
@@ -75,7 +75,6 @@ PLATFORM_DEFS += \
 # !! Choose only one !!
 PLATFORM_DEFS += -DWITH_STANDALONE_LF_SAMYRUN
 #PLATFORM_DEFS += -DWITH_STANDALONE_LF_ICERUN
-#PLATFORM_DEFS += -DWITH_STANDALONE_LF_SAMYRUN
 #PLATFORM_DEFS += -DWITH_STANDALONE_LF_PROXBRUTE
 #PLATFORM_DEFS += -DWITH_STANDALONE_LF_HIDBRUTE
 #PLATFORM_DEFS += -DWITH_STANDALONE_HF_YOUNG

From f90b04d4cf9eceeeb3d35b37d2e89620ac07a919 Mon Sep 17 00:00:00 2001
From: Iceman <iceman@iuse.se>
Date: Thu, 25 Apr 2019 23:20:33 +0200
Subject: [PATCH 1427/1938] Update readme.md

---
 armsrc/Standalone/readme.md | 64 +++++++++++++++++++++++++++----------
 1 file changed, 47 insertions(+), 17 deletions(-)

diff --git a/armsrc/Standalone/readme.md b/armsrc/Standalone/readme.md
index 85cbdb1ca..403134620 100644
--- a/armsrc/Standalone/readme.md
+++ b/armsrc/Standalone/readme.md
@@ -1,23 +1,32 @@
 # StandAlone Modes
 
-This contains functionality for different StandAlone modes. The fullimage will be built given the correct compiler flags used. Build targets for these files are contained in `armsrc/Makefile`.
+This contains functionality for different StandAlone modes. The fullimage will be built given the correct compiler flags used. Build targets for these files are contained in `armsrc/Makefile` and `common/Makefile.hal`
 
 If you want to implement a new standalone mode, you need to implement the methods provided in `standalone.h`.
-Have a look at the skeleton standalone mode called  IceRun, in the files `lf_icerun.c lf_icerun.h`.
+Have a look at the skeleton standalone mode called IceRun, in the files `lf_icerun.c lf_icerun.h`.
+
+As it is now, you can only have one standalone mode installed at the time.  
 
 ## Implementing a standalone mode
 
-Each standalone mod needs to have its own compiler flag to be added in `armsrc\makefile`.
+We suggest you keep your standalone code inside the Armsrc/Standalone folder. And that you name your files according to your standalone mode name.
+
+The `standalone.h` states that you must have two function implemented. 
+
+The ModInfo function, which is your identification of your standalone mode.  This string will show when running the command `hw status` on the client.
+
+The RunMod function, which is your "main" function when running.  You need to check for Usb commands,  in order to let the pm3 client break the standalone mode.  See this basic skeleton of main function RunMod() and Modinfo() below.
 
-The RunMod function is your "main" function when running.  You need to check for Usb commands,  in order to let the pm3 client break the standalone mode.  See this basic skeleton of main function RunMod().
 ````
 void ModInfo(void) {
-    DbpString("   HF good description of your mode - (my name)");
+    DbpString("   LF good description of your mode - aka FooRun (my name)");
 }
 
 void RunMod(void) {
     // led show
     StandAloneMode();
+
+    // Do you target LF or HF?
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
 
     // main loop
@@ -31,11 +40,24 @@ void RunMod(void) {
     }
 ````
 
-As it is now, you can only have one standalone mode installed at the time.  
+Each standalone mode needs to have its own compiler flag to be added in `armsrc\makefile`.
 
-## Name
-Use HF/LF to denote which frequence your mod is targeting.  
-Use you own github name/similar for perpetual honour to denote your mod
+## Naming your standalone mode
+
+We suggest that you follow these guidelines,
+- Use HF/LF to denote which frequence your mod is targeting.  
+- Use you own github name/similar for perpetual honour to denote your mode.
+
+sample:
+ `LF_FOORUN`
+
+Which indicates your mode targets LF and is called FOO.
+
+This leads to your next step, your DEFINE name needed in Makefile.
+`WITH_STANDALONE_LF_FOORUN`
+
+
+## Update COMMON/MAKEFILE.HAL
 
 Samples of directive flag used in the `common/Makefile.hal`:
 ```
@@ -49,24 +71,32 @@ Samples of directive flag used in the `common/Makefile.hal`:
 #PLATFORM_DEFS += -DWITH_STANDALONE_HF_COLIN
 #PLATFORM_DEFS += -DWITH_STANDALONE_HF_BOG
 ```
-Add your source code file like the following sample in the `armsrc/Makefile`
+
+## Update ARMSRC/MAKEFILE
+Add your source code files like the following sample in the `armsrc/Makefile`
 
 ```
-# WITH_STANDALONE_HF_COLIN
-ifneq (,$(findstring WITH_STANDALONE_HF_COLIN,$(APP_CFLAGS)))
-    SRC_STANDALONE = hf_colin.c vtsend.c
-else
-    SRC_STANDALONE =
+# WITH_STANDALONE_LF_FOO
+ifneq (,$(findstring WITH_STANDALONE_LF_FOO,$(APP_CFLAGS)))
+    SRC_STANDALONE = lf_foo.c
 endif
 ```
 
-## Adding identification of your mode
+## Adding identification string of your mode
 Do please add a identification string in a function called `ModInfo` inside your source code file.
 This will enable an easy way to detect on client side which standalone mods has been installed on the device.
 
+````
+void ModInfo(void) {
+    DbpString("   LF good description of your mode - aka FooRun (my name)");
+}
+````
+
 ## Compiling your standalone mode
 Once all this is done, you and others can now easily compile different standalone modes by just selecting one of the standalone modes in `common/Makefile.hal`, e.g.:
 
 ```
-PLATFORM_DEFS += -DWITH_STANDALONE_HF_COLIN
+PLATFORM_DEFS += -DWITH_STANDALONE_LF_FOO
 ```
+
+Remember only one can be selected at a time for now.

From 1e797e17206a94c91027c91ea9b9b70a4c2fdc92 Mon Sep 17 00:00:00 2001
From: Iceman <iceman@iuse.se>
Date: Thu, 25 Apr 2019 23:20:54 +0200
Subject: [PATCH 1428/1938] Update readme.md

---
 armsrc/Standalone/readme.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/armsrc/Standalone/readme.md b/armsrc/Standalone/readme.md
index 403134620..5a8dbde1d 100644
--- a/armsrc/Standalone/readme.md
+++ b/armsrc/Standalone/readme.md
@@ -63,7 +63,6 @@ Samples of directive flag used in the `common/Makefile.hal`:
 ```
 #PLATFORM_DEFS += -DWITH_STANDALONE_LF_SAMYRUN
 #PLATFORM_DEFS += -DWITH_STANDALONE_LF_ICERUN
-#PLATFORM_DEFS += -DWITH_STANDALONE_LF_SAMYRUN
 #PLATFORM_DEFS += -DWITH_STANDALONE_LF_PROXBRUTE
 #PLATFORM_DEFS += -DWITH_STANDALONE_LF_HIDBRUTE
 #PLATFORM_DEFS += -DWITH_STANDALONE_HF_YOUNG

From 839a0ef9fb8b279d84c94315a98fcfa3adb52d77 Mon Sep 17 00:00:00 2001
From: Iceman <iceman@iuse.se>
Date: Thu, 25 Apr 2019 23:23:44 +0200
Subject: [PATCH 1429/1938] Update readme.md

---
 armsrc/Standalone/readme.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/armsrc/Standalone/readme.md b/armsrc/Standalone/readme.md
index 5a8dbde1d..1bf1a385f 100644
--- a/armsrc/Standalone/readme.md
+++ b/armsrc/Standalone/readme.md
@@ -54,12 +54,13 @@ sample:
 Which indicates your mode targets LF and is called FOO.
 
 This leads to your next step, your DEFINE name needed in Makefile.
+
 `WITH_STANDALONE_LF_FOORUN`
 
 
 ## Update COMMON/MAKEFILE.HAL
 
-Samples of directive flag used in the `common/Makefile.hal`:
+Samples of directive flag used in the `common/Makefile.ha` and your suggested DEFINE.
 ```
 #PLATFORM_DEFS += -DWITH_STANDALONE_LF_SAMYRUN
 #PLATFORM_DEFS += -DWITH_STANDALONE_LF_ICERUN
@@ -69,12 +70,18 @@ Samples of directive flag used in the `common/Makefile.hal`:
 #PLATFORM_DEFS += -DWITH_STANDALONE_HF_MATTYRUN
 #PLATFORM_DEFS += -DWITH_STANDALONE_HF_COLIN
 #PLATFORM_DEFS += -DWITH_STANDALONE_HF_BOG
+#PLATFORM_DEFS += -DWITH_STANDALONE_LF_FOORUN
 ```
 
 ## Update ARMSRC/MAKEFILE
 Add your source code files like the following sample in the `armsrc/Makefile`
 
 ```
+# WITH_STANDALONE_LF_ICERUN
+ifneq (,$(findstring WITH_STANDALONE_LF_ICERUN,$(APP_CFLAGS)))
+	SRC_STANDALONE = lf_icerun.c
+endif
+
 # WITH_STANDALONE_LF_FOO
 ifneq (,$(findstring WITH_STANDALONE_LF_FOO,$(APP_CFLAGS)))
     SRC_STANDALONE = lf_foo.c

From 9a6ad6597f09f9cc628588b987dc5ae1eb7a78bb Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 25 Apr 2019 23:40:51 +0200
Subject: [PATCH 1430/1938] update standalone readme

---
 armsrc/Standalone/readme.md | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/armsrc/Standalone/readme.md b/armsrc/Standalone/readme.md
index 1bf1a385f..c9f7946ad 100644
--- a/armsrc/Standalone/readme.md
+++ b/armsrc/Standalone/readme.md
@@ -9,17 +9,17 @@ As it is now, you can only have one standalone mode installed at the time.
 
 ## Implementing a standalone mode
 
-We suggest you keep your standalone code inside the Armsrc/Standalone folder. And that you name your files according to your standalone mode name.
+We suggest you keep your standalone code inside the `armsrc/Standalone` folder. And that you name your files according to your standalone mode name.
 
-The `standalone.h` states that you must have two function implemented. 
+The `standalone.h` states that you must have two functions implemented. 
 
 The ModInfo function, which is your identification of your standalone mode.  This string will show when running the command `hw status` on the client.
 
-The RunMod function, which is your "main" function when running.  You need to check for Usb commands,  in order to let the pm3 client break the standalone mode.  See this basic skeleton of main function RunMod() and Modinfo() below.
+The RunMod function, which is your "main" function when running.  You need to check for Usb commands, in order to let the pm3 client break the standalone mode.  See this basic skeleton of main function RunMod() and Modinfo() below.
 
 ````
 void ModInfo(void) {
-    DbpString("   LF good description of your mode - aka FooRun (my name)");
+    DbpString("   LF good description of your mode - aka FooRun (your name)");
 }
 
 void RunMod(void) {
@@ -40,27 +40,27 @@ void RunMod(void) {
     }
 ````
 
-Each standalone mode needs to have its own compiler flag to be added in `armsrc\makefile`.
+Each standalone mode needs to have its own compiler flag to be added in `armsrc/Makefile`.
 
 ## Naming your standalone mode
 
-We suggest that you follow these guidelines,
-- Use HF/LF to denote which frequence your mod is targeting.  
+We suggest that you follow these guidelines:
+- Use HF/LF to denote which frequency your mode is targeting.  
 - Use you own github name/similar for perpetual honour to denote your mode.
 
 sample:
- `LF_FOORUN`
+ `LF_FOO`
 
 Which indicates your mode targets LF and is called FOO.
 
 This leads to your next step, your DEFINE name needed in Makefile.
 
-`WITH_STANDALONE_LF_FOORUN`
+`WITH_STANDALONE_LF_FOO`
 
 
 ## Update COMMON/MAKEFILE.HAL
 
-Samples of directive flag used in the `common/Makefile.ha` and your suggested DEFINE.
+Add your suggested DEFINE to the samples of directive flag provided in the `common/Makefile.hal`.
 ```
 #PLATFORM_DEFS += -DWITH_STANDALONE_LF_SAMYRUN
 #PLATFORM_DEFS += -DWITH_STANDALONE_LF_ICERUN
@@ -70,7 +70,7 @@ Samples of directive flag used in the `common/Makefile.ha` and your suggested DE
 #PLATFORM_DEFS += -DWITH_STANDALONE_HF_MATTYRUN
 #PLATFORM_DEFS += -DWITH_STANDALONE_HF_COLIN
 #PLATFORM_DEFS += -DWITH_STANDALONE_HF_BOG
-#PLATFORM_DEFS += -DWITH_STANDALONE_LF_FOORUN
+#PLATFORM_DEFS += -DWITH_STANDALONE_LF_FOO
 ```
 
 ## Update ARMSRC/MAKEFILE
@@ -90,11 +90,11 @@ endif
 
 ## Adding identification string of your mode
 Do please add a identification string in a function called `ModInfo` inside your source code file.
-This will enable an easy way to detect on client side which standalone mods has been installed on the device.
+This will enable an easy way to detect on client side which standalone mode has been installed on the device.
 
 ````
 void ModInfo(void) {
-    DbpString("   LF good description of your mode - aka FooRun (my name)");
+    DbpString("   LF good description of your mode - aka FooRun (your name)");
 }
 ````
 

From 7d6f971db4ca1b9c06e166c223e87b8306b5da8e Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 26 Apr 2019 00:04:32 +0200
Subject: [PATCH 1431/1938] archive and fix hid-flasher

---
 .../flasher}/Info.plist                               |  0
 .../flasher}/Makefile                                 | 11 ++++-------
 .../flasher}/elf.h                                    |  0
 .../flasher}/flash.c                                  |  2 +-
 .../flasher}/flash.h                                  |  0
 .../flasher}/flasher.c                                |  2 +-
 .../flasher}/obj/.dummy                               |  0
 .../flasher}/proxendian.h                             |  0
 .../flasher}/proxmark3.h                              |  0
 .../flasher}/proxusb.c                                |  1 +
 .../flasher}/proxusb.h                                |  1 -
 .../flasher}/sleep.h                                  |  0
 .../flasher}/usb_cmd.h                                |  0
 client/{ => deprecated-hid-flasher}/unbind-proxmark   |  0
 14 files changed, 7 insertions(+), 10 deletions(-)
 rename client/{hid-flasher => deprecated-hid-flasher/flasher}/Info.plist (100%)
 rename client/{hid-flasher => deprecated-hid-flasher/flasher}/Makefile (73%)
 rename client/{hid-flasher => deprecated-hid-flasher/flasher}/elf.h (100%)
 rename client/{hid-flasher => deprecated-hid-flasher/flasher}/flash.c (99%)
 rename client/{hid-flasher => deprecated-hid-flasher/flasher}/flash.h (100%)
 rename client/{hid-flasher => deprecated-hid-flasher/flasher}/flasher.c (99%)
 rename client/{hid-flasher => deprecated-hid-flasher/flasher}/obj/.dummy (100%)
 rename client/{hid-flasher => deprecated-hid-flasher/flasher}/proxendian.h (100%)
 rename client/{hid-flasher => deprecated-hid-flasher/flasher}/proxmark3.h (100%)
 rename client/{hid-flasher => deprecated-hid-flasher/flasher}/proxusb.c (99%)
 rename client/{hid-flasher => deprecated-hid-flasher/flasher}/proxusb.h (97%)
 rename client/{hid-flasher => deprecated-hid-flasher/flasher}/sleep.h (100%)
 rename client/{hid-flasher => deprecated-hid-flasher/flasher}/usb_cmd.h (100%)
 rename client/{ => deprecated-hid-flasher}/unbind-proxmark (100%)

diff --git a/client/hid-flasher/Info.plist b/client/deprecated-hid-flasher/flasher/Info.plist
similarity index 100%
rename from client/hid-flasher/Info.plist
rename to client/deprecated-hid-flasher/flasher/Info.plist
diff --git a/client/hid-flasher/Makefile b/client/deprecated-hid-flasher/flasher/Makefile
similarity index 73%
rename from client/hid-flasher/Makefile
rename to client/deprecated-hid-flasher/flasher/Makefile
index 90b29748f..bff511459 100644
--- a/client/hid-flasher/Makefile
+++ b/client/deprecated-hid-flasher/flasher/Makefile
@@ -3,26 +3,23 @@
 # at your option, any later version. See the LICENSE.txt file for the text of
 # the license.
 #-----------------------------------------------------------------------------
-include ../../common/Makefile.common
 
 CC=gcc
 CXX=g++
 #COMMON_FLAGS = -m32
 
-VPATH = ../../common
 OBJDIR = obj
 
+LDLIBS = -lreadline -lpthread
+CFLAGS = -std=gnu99 -Wall -Wno-unused-function $(COMMON_FLAGS) -g -O3
 ifeq ($(platform),Darwin)
-	LDLIBS = -L/opt/local/lib -L/usr/local/lib -lusb-1.0 -lreadline -lpthread
-	CFLAGS = -std=gnu99 -I. -I../include -I../common -I/usr/local/include -I/opt/local/include -Wall -Wno-unused-function $(COMMON_FLAGS) -g -O3
+	LDLIBS += -lusb-1.0
 else
-	LDLIBS = -L/opt/local/lib -L/usr/local/lib -lusb -lreadline -lpthread
-	CFLAGS = -std=gnu99 -I. -I../include -I../common -I/opt/local/include -Wall -Wno-unused-function $(COMMON_FLAGS) -g -O3
+	LDLIBS += -lusb
 endif
 
 LDFLAGS = $(COMMON_FLAGS)
 CXXFLAGS =
-QTLDLIBS =
 
 RM = rm -f
 BINS = flasher
diff --git a/client/hid-flasher/elf.h b/client/deprecated-hid-flasher/flasher/elf.h
similarity index 100%
rename from client/hid-flasher/elf.h
rename to client/deprecated-hid-flasher/flasher/elf.h
diff --git a/client/hid-flasher/flash.c b/client/deprecated-hid-flasher/flasher/flash.c
similarity index 99%
rename from client/hid-flasher/flash.c
rename to client/deprecated-hid-flasher/flasher/flash.c
index 22f57a817..48d0f00de 100644
--- a/client/hid-flasher/flash.c
+++ b/client/deprecated-hid-flasher/flasher/flash.c
@@ -11,11 +11,11 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "util_posix.h"
 #include "proxusb.h"
 #include "flash.h"
 #include "elf.h"
 #include "proxendian.h"
+#include "sleep.h"
 
 #define FLASH_START            0x100000
 #define FLASH_SIZE             (256*1024)
diff --git a/client/hid-flasher/flash.h b/client/deprecated-hid-flasher/flasher/flash.h
similarity index 100%
rename from client/hid-flasher/flash.h
rename to client/deprecated-hid-flasher/flasher/flash.h
diff --git a/client/hid-flasher/flasher.c b/client/deprecated-hid-flasher/flasher/flasher.c
similarity index 99%
rename from client/hid-flasher/flasher.c
rename to client/deprecated-hid-flasher/flasher/flasher.c
index 0cc800826..f9d5f49b7 100644
--- a/client/hid-flasher/flasher.c
+++ b/client/deprecated-hid-flasher/flasher/flasher.c
@@ -9,9 +9,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "util_posix.h"
 #include "proxusb.h"
 #include "flash.h"
+#include "sleep.h"
 
 static void usage(char *argv0) {
     fprintf(stderr, "Usage:   %s [-b] image.elf [image.elf...]\n\n", argv0);
diff --git a/client/hid-flasher/obj/.dummy b/client/deprecated-hid-flasher/flasher/obj/.dummy
similarity index 100%
rename from client/hid-flasher/obj/.dummy
rename to client/deprecated-hid-flasher/flasher/obj/.dummy
diff --git a/client/hid-flasher/proxendian.h b/client/deprecated-hid-flasher/flasher/proxendian.h
similarity index 100%
rename from client/hid-flasher/proxendian.h
rename to client/deprecated-hid-flasher/flasher/proxendian.h
diff --git a/client/hid-flasher/proxmark3.h b/client/deprecated-hid-flasher/flasher/proxmark3.h
similarity index 100%
rename from client/hid-flasher/proxmark3.h
rename to client/deprecated-hid-flasher/flasher/proxmark3.h
diff --git a/client/hid-flasher/proxusb.c b/client/deprecated-hid-flasher/flasher/proxusb.c
similarity index 99%
rename from client/hid-flasher/proxusb.c
rename to client/deprecated-hid-flasher/flasher/proxusb.c
index 7563429d8..71bb0708c 100644
--- a/client/hid-flasher/proxusb.c
+++ b/client/deprecated-hid-flasher/flasher/proxusb.c
@@ -9,6 +9,7 @@
 // USB utilities
 //-----------------------------------------------------------------------------
 #include "proxusb.h"
+#include "sleep.h"
 
 // It seems to be missing for mingw
 #ifndef ETIMEDOUT
diff --git a/client/hid-flasher/proxusb.h b/client/deprecated-hid-flasher/flasher/proxusb.h
similarity index 97%
rename from client/hid-flasher/proxusb.h
rename to client/deprecated-hid-flasher/flasher/proxusb.h
index 69d47abd2..f79fd7e33 100644
--- a/client/hid-flasher/proxusb.h
+++ b/client/deprecated-hid-flasher/flasher/proxusb.h
@@ -22,7 +22,6 @@
 #include <errno.h>
 #include "proxmark3.h"
 #include "usb_cmd.h"
-#include "util_posix.h"
 
 extern unsigned char return_on_error;
 extern unsigned char error_occured;
diff --git a/client/hid-flasher/sleep.h b/client/deprecated-hid-flasher/flasher/sleep.h
similarity index 100%
rename from client/hid-flasher/sleep.h
rename to client/deprecated-hid-flasher/flasher/sleep.h
diff --git a/client/hid-flasher/usb_cmd.h b/client/deprecated-hid-flasher/flasher/usb_cmd.h
similarity index 100%
rename from client/hid-flasher/usb_cmd.h
rename to client/deprecated-hid-flasher/flasher/usb_cmd.h
diff --git a/client/unbind-proxmark b/client/deprecated-hid-flasher/unbind-proxmark
similarity index 100%
rename from client/unbind-proxmark
rename to client/deprecated-hid-flasher/unbind-proxmark

From 9e39d6ffc35bbe641078e9edd27e79fc9286a1c5 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 26 Apr 2019 01:31:14 +0200
Subject: [PATCH 1432/1938] new light scheme for detectreader

---
 armsrc/appmain.c | 73 ++++++++++++++++++++++++++++++------------------
 1 file changed, 46 insertions(+), 27 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 60f667e21..05cae9ace 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -464,20 +464,8 @@ current compared to the maximum current detected. Basically, once you know
 what kind of external reader is present, it will help you spot the best location to place
 your antenna. You will probably not get some good results if there is a LF and a HF reader
 at the same place! :-)
-
-LIGHT SCHEME USED:
 */
-static const char LIGHT_SCHEME[] = {
-    0x0, /* ----     | No field detected */
-    0x1, /* X---     | 14% of maximum current detected */
-    0x2, /* -X--     | 29% of maximum current detected */
-    0x4, /* --X-     | 43% of maximum current detected */
-    0x8, /* ---X     | 57% of maximum current detected */
-    0xC, /* --XX     | 71% of maximum current detected */
-    0xE, /* -XXX     | 86% of maximum current detected */
-    0xF, /* XXXX     | 100% of maximum current detected */
-};
-static const int LIGHT_LEN = sizeof(LIGHT_SCHEME) / sizeof(LIGHT_SCHEME[0]);
+#define LIGHT_LEVELS 20
 
 void ListenReaderField(int limit) {
 #define LF_ONLY 1
@@ -486,7 +474,7 @@ void ListenReaderField(int limit) {
 
     uint16_t lf_av, lf_av_new, lf_baseline = 0, lf_max;
     uint16_t hf_av, hf_av_new,  hf_baseline = 0, hf_max;
-    uint16_t mode = 1, display_val, display_max, i;
+    uint16_t mode = 1, display_val, display_max;
 
     // switch off FPGA - we don't want to measure our own signal
     // 20180315 - iceman,  why load this before and then turn off?
@@ -588,23 +576,54 @@ void ListenReaderField(int limit) {
                     display_max = lf_max;
                 }
             }
-            for (i = 0; i < LIGHT_LEN; i++) {
-                if (display_val >= ((display_max / LIGHT_LEN)*i) && display_val <= ((display_max / LIGHT_LEN) * (i + 1))) {
-                    if (LIGHT_SCHEME[i] & 0x1) LED_C_ON();
-                    else LED_C_OFF();
-                    if (LIGHT_SCHEME[i] & 0x2) LED_A_ON();
-                    else LED_A_OFF();
-                    if (LIGHT_SCHEME[i] & 0x4) LED_B_ON();
-                    else LED_B_OFF();
-                    if (LIGHT_SCHEME[i] & 0x8) LED_D_ON();
-                    else LED_D_OFF();
-                    break;
-                }
+            display_val = display_val * (4*LIGHT_LEVELS) / MAX(1,display_max);
+            uint32_t duty_a = MIN(MAX(display_val, 0*LIGHT_LEVELS), 1*LIGHT_LEVELS) - 0*LIGHT_LEVELS;
+            uint32_t duty_b = MIN(MAX(display_val, 1*LIGHT_LEVELS), 2*LIGHT_LEVELS) - 1*LIGHT_LEVELS;
+            uint32_t duty_c = MIN(MAX(display_val, 2*LIGHT_LEVELS), 3*LIGHT_LEVELS) - 2*LIGHT_LEVELS;
+            uint32_t duty_d = MIN(MAX(display_val, 3*LIGHT_LEVELS), 4*LIGHT_LEVELS) - 3*LIGHT_LEVELS;
+            if (duty_a == 0) {
+                LED_A_OFF();
+            } else if (duty_a == LIGHT_LEVELS) {
+                LED_A_ON();
+            } else {
+                LED_A_ON();
+                SpinDelay(duty_a);
+                LED_A_OFF();
+                SpinDelay(LIGHT_LEVELS - duty_a);
+            }
+            if (duty_b == 0) {
+                LED_B_OFF();
+            } else if (duty_b == LIGHT_LEVELS) {
+                LED_B_ON();
+            } else {
+                LED_B_ON();
+                SpinDelay(duty_b);
+                LED_B_OFF();
+                SpinDelay(LIGHT_LEVELS - duty_b);
+            }
+            if (duty_c == 0) {
+                LED_C_OFF();
+            } else if (duty_c == LIGHT_LEVELS) {
+                LED_C_ON();
+            } else {
+                LED_C_ON();
+                SpinDelay(duty_c);
+                LED_C_OFF();
+                SpinDelay(LIGHT_LEVELS - duty_c);
+            }
+            if (duty_d == 0) {
+                LED_D_OFF();
+            } else if (duty_d == LIGHT_LEVELS) {
+                LED_D_ON();
+            } else {
+                LED_D_ON();
+                SpinDelay(duty_d);
+                LED_D_OFF();
+                SpinDelay(LIGHT_LEVELS - duty_d);
             }
         }
     }
 }
-
 static void PacketReceived(PacketCommandNG *packet) {
     /*
     if (packet->ng) {

From acc101ed37fcc1241b935ad63a9e31ce7703ea1c Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 26 Apr 2019 08:29:21 +0200
Subject: [PATCH 1433/1938] doc magic

---
 include/proxmark3.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/proxmark3.h b/include/proxmark3.h
index 8fedafb3e..0dc4aea94 100644
--- a/include/proxmark3.h
+++ b/include/proxmark3.h
@@ -108,7 +108,7 @@
 //NVDD goes LOW when USB is attached.
 #define USB_ATTACHED()    !((AT91C_BASE_PIOA->PIO_PDSR & GPIO_NVDD_ON) == GPIO_NVDD_ON)
 
-#define VERSION_INFORMATION_MAGIC 0x56334d50
+#define VERSION_INFORMATION_MAGIC 0x56334d50 // "PM3V"
 struct version_information {
     int magic; /* Magic sequence to identify this as a correct version information structure. Must be VERSION_INFORMATION_MAGIC */
     char versionversion; /* Must be 1 */
@@ -118,7 +118,7 @@ struct version_information {
     char buildtime[30]; /* string with the build time */
 } __attribute__((packed));
 
-#define COMMON_AREA_MAGIC 0x43334d50
+#define COMMON_AREA_MAGIC 0x43334d50 // "PM3C"
 #define COMMON_AREA_COMMAND_NONE 0
 #define COMMON_AREA_COMMAND_ENTER_FLASH_MODE 1
 struct common_area {

From 70995f0f1e70e3b3f74f3970ee5b469643d069c8 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 26 Apr 2019 08:29:48 +0200
Subject: [PATCH 1434/1938] use color macros

---
 client/cmdhw.c             |  6 +-----
 client/mifare/mifarehost.c |  2 +-
 client/proxmark3.c         | 12 ++++++------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/client/cmdhw.c b/client/cmdhw.c
index bd013e706..a01b72dca 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -477,11 +477,7 @@ void pm3_version(bool verbose) {
     clearCommandBuffer();
     SendCommand(&c);
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {
-#ifdef __WIN32
-        PrintAndLogEx(NORMAL, "\n [ Proxmark3 RFID instrument ]\n");
-#else
-        PrintAndLogEx(NORMAL, "\n\e[34m [ Proxmark3 RFID instrument ]\e[0m\n");
-#endif
+        PrintAndLogEx(NORMAL, "\n" _BLUE_(" [ Proxmark3 RFID instrument ]") "\n");
         char s[60] = {0};
 #if defined(WITH_FLASH) || defined(WITH_SMARTCARD) || defined(WITH_FPC)
         strncat(s, "build for RDV40 with ", sizeof(s) - strlen(s) - 1);
diff --git a/client/mifare/mifarehost.c b/client/mifare/mifarehost.c
index 211eaea02..5677a1849 100644
--- a/client/mifare/mifarehost.c
+++ b/client/mifare/mifarehost.c
@@ -935,7 +935,7 @@ int detect_classic_nackbug(bool verbose) {
         } else {
             printf(
 #if defined(__linux__) || (__APPLE__)
-                "\e[32m\e[s%c\e[u\e[0m", star[(staridx++ % 4) ]
+                _GREEN_("\e[s%c\e[u"), star[(staridx++ % 4) ]
 #else
                 "."
 #endif
diff --git a/client/proxmark3.c b/client/proxmark3.c
index 267071c21..aef3c5979 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -32,12 +32,12 @@
 static void showBanner(void) {
     printf("\n\n");
 #if defined(__linux__) || (__APPLE__)
-    printf("\e[34m██████╗ ███╗   ███╗ ████╗\e[0m     ...iceman fork\n");
-    printf("\e[34m██╔══██╗████╗ ████║   ══█║\e[0m      ...dedicated to \e[34mRDV40\e[0m\n");
-    printf("\e[34m██████╔╝██╔████╔██║ ████╔╝\e[0m\n");
-    printf("\e[34m██╔═══╝ ██║╚██╔╝██║   ══█║\e[0m    iceman@icesql.net\n");
-    printf("\e[34m██║     ██║ ╚═╝ ██║ ████╔╝\e[0m   https://github.com/rfidresearchgroup/proxmark3/\n");
-    printf("\e[34m╚═╝     ╚═╝     ╚═╝ ╚═══╝\e[0m pre-release v4.0\n");
+    printf(_BLUE_("██████╗ ███╗   ███╗ ████╗ ") "    ...iceman fork\n");
+    printf(_BLUE_("██╔══██╗████╗ ████║   ══█║") "      ...dedicated to " _BLUE_("RDV40") "\n");
+    printf(_BLUE_("██████╔╝██╔████╔██║ ████╔╝") "\n");
+    printf(_BLUE_("██╔═══╝ ██║╚██╔╝██║   ══█║") "    iceman@icesql.net\n");
+    printf(_BLUE_("██║     ██║ ╚═╝ ██║ ████╔╝") "   https://github.com/rfidresearchgroup/proxmark3/\n");
+    printf(_BLUE_("╚═╝     ╚═╝     ╚═╝ ╚═══╝ ") "pre-release v4.0\n");
 #else
     printf("======. ===.   ===. ====.     ...iceman fork\n");
     printf("==...==.====. ====.   ..=.      ...dedicated to RDV40\n");

From cb452c98ba5053e96de86050849b0aea9fa78a59 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 26 Apr 2019 10:36:06 +0200
Subject: [PATCH 1435/1938] rework Dbprintf & add color support

---
 armsrc/BigBuf.c                 |   4 +-
 armsrc/Standalone/hf_colin.c    | 190 ++++++++++++++++----------------
 armsrc/Standalone/hf_mattyrun.c |  22 ++--
 armsrc/appmain.c                |  20 ++--
 armsrc/apps.h                   |   1 +
 armsrc/flashmem.c               |   2 +-
 armsrc/fpgaloader.c             |   2 +-
 armsrc/lfops.c                  |   2 +-
 armsrc/lfsampling.c             |   2 +-
 armsrc/util.h                   |   7 ++
 client/comms.c                  |  56 +++++++---
 common/i2c.c                    |   2 +-
 include/usb_cmd.h               |  11 +-
 13 files changed, 175 insertions(+), 146 deletions(-)

diff --git a/armsrc/BigBuf.c b/armsrc/BigBuf.c
index 267e6811b..ef768ab2b 100644
--- a/armsrc/BigBuf.c
+++ b/armsrc/BigBuf.c
@@ -96,10 +96,10 @@ void BigBuf_free_keep_EM(void) {
 }
 
 void BigBuf_print_status(void) {
-    Dbprintf("Memory");
+    DbpStringEx(FLAG_LOG|FLAG_ANSI, _BLUE_("Memory"));
     Dbprintf("  BIGBUF_SIZE.............%d", BIGBUF_SIZE);
     Dbprintf("  Available memory........%d", BigBuf_hi);
-    Dbprintf("Tracing");
+    DbpStringEx(FLAG_LOG|FLAG_ANSI, _BLUE_("Tracing"));
     Dbprintf("  tracing ................%d", tracing);
     Dbprintf("  traceLen ...............%d", traceLen);
 }
diff --git a/armsrc/Standalone/hf_colin.c b/armsrc/Standalone/hf_colin.c
index 681223a02..dbec84760 100644
--- a/armsrc/Standalone/hf_colin.c
+++ b/armsrc/Standalone/hf_colin.c
@@ -54,7 +54,7 @@ void cjPrintBigArray(const char *bigar, int len, uint8_t newlines, uint8_t debug
     }
     if (newlines > 0)
     {
-        DbprintfEx(FLAG_NOLOG, " ");
+        DbprintfEx(FLAG_NEWLINE, " ");
     }
 }
 */
@@ -81,7 +81,7 @@ void cjPrintKey(uint64_t key, uint8_t *foundKey, uint16_t sectorNo, uint8_t type
     char tosendkey[13];
     sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[0], foundKey[1], foundKey[2], foundKey[3], foundKey[4], foundKey[5]);
     cjSetCursRight();
-    DbprintfEx(FLAG_NOLOG, "SEC: %02x | KEY : %s | TYP: %d", sectorNo, tosendkey, type);
+    DbprintfEx(FLAG_NEWLINE, "SEC: %02x | KEY : %s | TYP: %d", sectorNo, tosendkey, type);
 }
 */
 
@@ -94,7 +94,7 @@ void ReadLastTagFromFlash() {
     uint32_t startidx = 0;
     uint16_t len = 1024;
 
-    DbprintfEx(FLAG_NOLOG, "Button HELD ! Using LAST Known TAG for Simulation...");
+    DbprintfEx(FLAG_NEWLINE, "Button HELD ! Using LAST Known TAG for Simulation...");
     cjSetCursLeft();
 
     size_t size = len;
@@ -114,7 +114,7 @@ void ReadLastTagFromFlash() {
         if (isok == len) {
             emlSetMem(mem, 0, 64);
         } else {
-            DbprintfEx(FLAG_NOLOG, "FlashMem reading failed | %d | %d", len, isok);
+            DbprintfEx(FLAG_NEWLINE, "FlashMem reading failed | %d | %d", len, isok);
             cjSetCursLeft();
             FlashStop();
             SpinOff(100);
@@ -122,9 +122,9 @@ void ReadLastTagFromFlash() {
         }
     }
     end_time = GetTickCount();
-    DbprintfEx(FLAG_NOLOG, "[OK] Last tag recovered from FLASHMEM set to emulator");
+    DbprintfEx(FLAG_NEWLINE, "[OK] Last tag recovered from FLASHMEM set to emulator");
     cjSetCursLeft();
-    DbprintfEx(FLAG_NOLOG, "%s[IN]%s %s%dms%s for TAG_FLASH_READ", _GREEN_, _WHITE_, _YELLOW_, end_time - start_time, _WHITE_);
+    DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "%s[IN]%s %s%dms%s for TAG_FLASH_READ", _GREEN_, _WHITE_, _YELLOW_, end_time - start_time, _WHITE_);
     cjSetCursLeft();
     FlashStop();
     SpinOff(0);
@@ -173,7 +173,7 @@ void WriteTagToFlash(uint8_t index, size_t size) {
         uint8_t isok = (res == bytes_in_packet) ? 1 : 0;
 
         if (!isok) {
-            DbprintfEx(FLAG_NOLOG, "FlashMem write FAILEd [offset %u]", bytes_sent);
+            DbprintfEx(FLAG_NEWLINE, "FlashMem write FAILEd [offset %u]", bytes_sent);
             cjSetCursLeft();
             SpinOff(100);
             return;
@@ -186,9 +186,9 @@ void WriteTagToFlash(uint8_t index, size_t size) {
     }
     end_time = GetTickCount();
 
-    DbprintfEx(FLAG_NOLOG, "[OK] TAG WRITTEN TO FLASH ! [0-to offset %u]", bytes_sent);
+    DbprintfEx(FLAG_NEWLINE, "[OK] TAG WRITTEN TO FLASH ! [0-to offset %u]", bytes_sent);
     cjSetCursLeft();
-    DbprintfEx(FLAG_NOLOG, "%s[IN]%s %s%dms%s for TAG_FLASH_WRITE", _GREEN_, _WHITE_, _YELLOW_, end_time - start_time, _WHITE_);
+    DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "%s[IN]%s %s%dms%s for TAG_FLASH_WRITE", _GREEN_, _WHITE_, _YELLOW_, end_time - start_time, _WHITE_);
     cjSetCursLeft();
     FlashStop();
     SpinOff(0);
@@ -328,9 +328,9 @@ void RunMod() {
 
     // banner:
     vtsend_reset(NULL);
-    DbprintfEx(FLAG_NOLOG, "\r\n%s", clearTerm);
-    DbprintfEx(FLAG_NOLOG, "%s%s%s", _CYAN_, sub_banner, _WHITE_);
-    DbprintfEx(FLAG_NOLOG, "%s>>%s C.J.B's MifareFastPwn Started\r\n", _RED_, _WHITE_);
+    DbprintfEx(FLAG_NEWLINE, "\r\n%s", clearTerm);
+    DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "%s%s%s", _CYAN_, sub_banner, _WHITE_);
+    DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "%s>>%s C.J.B's MifareFastPwn Started\r\n", _RED_, _WHITE_);
 
     currline = 20;
     curlline = 20;
@@ -342,7 +342,7 @@ failtag:
     vtsend_cursor_position_save(NULL);
     vtsend_set_attribute(NULL, 1);
     vtsend_set_attribute(NULL, 5);
-    DbprintfEx(FLAG_NOLOG, "\t\t\t[ Waiting For Tag ]");
+    DbprintfEx(FLAG_NEWLINE, "\t\t\t[ Waiting For Tag ]");
     vtsend_set_attribute(NULL, 0);
 
     iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
@@ -360,7 +360,7 @@ failtag:
 
         if (BUTTON_HELD(10) > 0) {
             WDT_HIT();
-            DbprintfEx(FLAG_NOLOG, "\t\t\t[    READING FLASH   ]");
+            DbprintfEx(FLAG_NEWLINE, "\t\t\t[    READING FLASH   ]");
             ReadLastTagFromFlash();
             goto readysim;
         }
@@ -370,16 +370,16 @@ failtag:
 
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     vtsend_cursor_position_restore(NULL);
-    DbprintfEx(FLAG_NOLOG, "\t\t\t%s[   GOT a Tag !   ]%s", _GREEN_, _WHITE_);
+    DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "\t\t\t%s[   GOT a Tag !   ]%s", _GREEN_, _WHITE_);
     cjSetCursLeft();
-    DbprintfEx(FLAG_NOLOG, "\t\t\t       `---> Breaking keys ---->");
+    DbprintfEx(FLAG_NEWLINE, "\t\t\t       `---> Breaking keys ---->");
     cjSetCursRight();
 
-    DbprintfEx(FLAG_NOLOG, "\t%sGOT TAG :%s %08x%s", _RED_, _CYAN_, cjcuid, _WHITE_);
+    DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "\t%sGOT TAG :%s %08x%s", _RED_, _CYAN_, cjcuid, _WHITE_);
 
     if (cjcuid == 0) {
         cjSetCursLeft();
-        DbprintfEx(FLAG_NOLOG, "%s>>%s BUG: 0000_CJCUID! Retrying...", _RED_, _WHITE_);
+        DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "%s>>%s BUG: 0000_CJCUID! Retrying...", _RED_, _WHITE_);
         SpinErr(0, 100, 8);
         goto failtag;
     }
@@ -387,11 +387,11 @@ failtag:
     SpinOff(50);
     LED_B_ON();
     cjSetCursRight();
-    DbprintfEx(FLAG_NOLOG, "--------+--------------------+-------");
+    DbprintfEx(FLAG_NEWLINE, "--------+--------------------+-------");
     cjSetCursRight();
-    DbprintfEx(FLAG_NOLOG, " SECTOR |        KEY         |  A/B  ");
+    DbprintfEx(FLAG_NEWLINE, " SECTOR |        KEY         |  A/B  ");
     cjSetCursRight();
-    DbprintfEx(FLAG_NOLOG, "--------+--------------------+-------");
+    DbprintfEx(FLAG_NEWLINE, "--------+--------------------+-------");
 
     uint32_t end_time;
     uint32_t start_time = end_time = GetTickCount();
@@ -445,26 +445,26 @@ failtag:
                 char tosendkey[13];
                 num_to_bytes(key64, 6, foundKey[type][sec]);
                 cjSetCursRight();
-                DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %012" PRIx64 " ; TYP: %i", sec, key64, type);
+                DbprintfEx(FLAG_NEWLINE, "SEC: %02x ; KEY : %012" PRIx64 " ; TYP: %i", sec, key64, type);
                 /*cmd_send(CMD_CJB_INFORM_CLIENT_KEY, 12, sec, type, tosendkey, 12);*/
                 switch (key64) {
                     /////////////////////////////////////////////////////////
                     // COMMON SCHEME 1  : INFINITRON/HEXACT
                     case 0x484558414354:
                         cjSetCursLeft();
-                        DbprintfEx(FLAG_NOLOG, "%s>>>>>>>>>>>>!*STOP*!<<<<<<<<<<<<<<%s", _RED_, _WHITE_);
+                        DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "%s>>>>>>>>>>>>!*STOP*!<<<<<<<<<<<<<<%s", _RED_, _WHITE_);
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NOLOG, "    .TAG SEEMS %sDETERMINISTIC%s.     ", _GREEN_, _WHITE_);
+                        DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "    .TAG SEEMS %sDETERMINISTIC%s.     ", _GREEN_, _WHITE_);
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NOLOG, "%sDetected: %s INFI_HEXACT_VIGIK_TAG%s", _ORANGE_, _CYAN_, _WHITE_);
+                        DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "%sDetected: %s INFI_HEXACT_VIGIK_TAG%s", _ORANGE_, _CYAN_, _WHITE_);
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NOLOG, "...%s[%sKey_derivation_schemeTest%s]%s...", _YELLOW_, _GREEN_, _YELLOW_, _GREEN_);
+                        DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "...%s[%sKey_derivation_schemeTest%s]%s...", _YELLOW_, _GREEN_, _YELLOW_, _GREEN_);
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NOLOG, "%s>>>>>>>>>>>>!*DONE*!<<<<<<<<<<<<<<%s", _GREEN_, _WHITE_);
+                        DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "%s>>>>>>>>>>>>!*DONE*!<<<<<<<<<<<<<<%s", _GREEN_, _WHITE_);
                         ;
                         // Type 0 / A first
                         uint16_t t = 0;
@@ -473,7 +473,7 @@ failtag:
                             sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][s][0], foundKey[t][s][1], foundKey[t][s][2],
                                     foundKey[t][s][3], foundKey[t][s][4], foundKey[t][s][5]);
                             cjSetCursRight();
-                            DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", s, tosendkey, t);
+                            DbprintfEx(FLAG_NEWLINE, "SEC: %02x ; KEY : %s ; TYP: %d", s, tosendkey, t);
                         }
                         t = 1;
                         uint16_t sectorNo = 0;
@@ -482,112 +482,112 @@ failtag:
                                 foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
                         cjSetCursRight();
 
-                        DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
+                        DbprintfEx(FLAG_NEWLINE, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
                         sectorNo = 1;
                         num_to_bytes(0x49fae4e3849f, 6, foundKey[t][sectorNo]);
                         sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
                                 foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
                         cjSetCursRight();
 
-                        DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
+                        DbprintfEx(FLAG_NEWLINE, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
                         sectorNo = 2;
                         num_to_bytes(0x38fcf33072e0, 6, foundKey[t][sectorNo]);
                         sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
                                 foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
                         cjSetCursRight();
 
-                        DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
+                        DbprintfEx(FLAG_NEWLINE, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
                         sectorNo = 3;
                         num_to_bytes(0x8ad5517b4b18, 6, foundKey[t][sectorNo]);
                         sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
                                 foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
                         cjSetCursRight();
 
-                        DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
+                        DbprintfEx(FLAG_NEWLINE, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
                         sectorNo = 4;
                         num_to_bytes(0x509359f131b1, 6, foundKey[t][sectorNo]);
                         sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
                                 foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
                         cjSetCursRight();
 
-                        DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
+                        DbprintfEx(FLAG_NEWLINE, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
                         sectorNo = 5;
                         num_to_bytes(0x6c78928e1317, 6, foundKey[t][sectorNo]);
                         sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
                                 foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
                         cjSetCursRight();
 
-                        DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
+                        DbprintfEx(FLAG_NEWLINE, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
                         sectorNo = 6;
                         num_to_bytes(0xaa0720018738, 6, foundKey[t][sectorNo]);
                         sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
                                 foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
                         cjSetCursRight();
 
-                        DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
+                        DbprintfEx(FLAG_NEWLINE, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
                         sectorNo = 7;
                         num_to_bytes(0xa6cac2886412, 6, foundKey[t][sectorNo]);
                         sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
                                 foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
                         cjSetCursRight();
 
-                        DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
+                        DbprintfEx(FLAG_NEWLINE, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
                         sectorNo = 8;
                         num_to_bytes(0x62d0c424ed8e, 6, foundKey[t][sectorNo]);
                         sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
                                 foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
                         cjSetCursRight();
 
-                        DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
+                        DbprintfEx(FLAG_NEWLINE, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
                         sectorNo = 9;
                         num_to_bytes(0xe64a986a5d94, 6, foundKey[t][sectorNo]);
                         sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
                                 foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
                         cjSetCursRight();
 
-                        DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
+                        DbprintfEx(FLAG_NEWLINE, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
                         sectorNo = 10;
                         num_to_bytes(0x8fa1d601d0a2, 6, foundKey[t][sectorNo]);
                         sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
                                 foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
                         cjSetCursRight();
 
-                        DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
+                        DbprintfEx(FLAG_NEWLINE, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
                         sectorNo = 11;
                         num_to_bytes(0x89347350bd36, 6, foundKey[t][sectorNo]);
                         sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
                                 foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
                         cjSetCursRight();
 
-                        DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
+                        DbprintfEx(FLAG_NEWLINE, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
                         sectorNo = 12;
                         num_to_bytes(0x66d2b7dc39ef, 6, foundKey[t][sectorNo]);
                         sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
                                 foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
                         cjSetCursRight();
 
-                        DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
+                        DbprintfEx(FLAG_NEWLINE, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
                         sectorNo = 13;
                         num_to_bytes(0x6bc1e1ae547d, 6, foundKey[t][sectorNo]);
                         sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
                                 foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
                         cjSetCursRight();
 
-                        DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
+                        DbprintfEx(FLAG_NEWLINE, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
                         sectorNo = 14;
                         num_to_bytes(0x22729a9bd40f, 6, foundKey[t][sectorNo]);
                         sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
                                 foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
                         cjSetCursRight();
 
-                        DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
+                        DbprintfEx(FLAG_NEWLINE, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
                         sectorNo = 15;
                         num_to_bytes(0x484558414354, 6, foundKey[t][sectorNo]);
                         sprintf(tosendkey, "%02x%02x%02x%02x%02x%02x", foundKey[t][sectorNo][0], foundKey[t][sectorNo][1], foundKey[t][sectorNo][2],
                                 foundKey[t][sectorNo][3], foundKey[t][sectorNo][4], foundKey[t][sectorNo][5]);
                         cjSetCursRight();
 
-                        DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
+                        DbprintfEx(FLAG_NEWLINE, "SEC: %02x ; KEY : %s ; TYP: %d", sectorNo, tosendkey, t);
                         trapped = 1;
                         break;
                     ////////////////END OF SCHEME 1//////////////////////////////
@@ -597,19 +597,19 @@ failtag:
                     case 0x8829da9daf76:
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NOLOG, "%s>>>>>>>>>>>>!*STOP*!<<<<<<<<<<<<<<%s", _RED_, _WHITE_);
+                        DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "%s>>>>>>>>>>>>!*STOP*!<<<<<<<<<<<<<<%s", _RED_, _WHITE_);
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NOLOG, "    .TAG SEEMS %sDETERMINISTIC%s.     ", _GREEN_, _WHITE_);
+                        DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "    .TAG SEEMS %sDETERMINISTIC%s.     ", _GREEN_, _WHITE_);
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NOLOG, "%sDetected :%sURMET_CAPTIVE_VIGIK_TAG%s", _ORANGE_, _CYAN_, _WHITE_);
+                        DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "%sDetected :%sURMET_CAPTIVE_VIGIK_TAG%s", _ORANGE_, _CYAN_, _WHITE_);
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NOLOG, "...%s[%sKey_derivation_schemeTest%s]%s...", _YELLOW_, _GREEN_, _YELLOW_, _GREEN_);
+                        DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "...%s[%sKey_derivation_schemeTest%s]%s...", _YELLOW_, _GREEN_, _YELLOW_, _GREEN_);
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NOLOG, "%s>>>>>>>>>>>>!*DONE*!<<<<<<<<<<<<<<%s", _GREEN_, _WHITE_);
+                        DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "%s>>>>>>>>>>>>!*DONE*!<<<<<<<<<<<<<<%s", _GREEN_, _WHITE_);
                         cjSetCursLeft();
 
                         // emlClearMem();
@@ -626,7 +626,7 @@ failtag:
                                         foundKey[i][s][5]
                                        );
                                 cjSetCursRight();
-                                DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", s, tosendkey, i);
+                                DbprintfEx(FLAG_NEWLINE, "SEC: %02x ; KEY : %s ; TYP: %d", s, tosendkey, i);
                             }
                         }
                         trapped = 1;
@@ -639,19 +639,19 @@ failtag:
                     case 0x424c41524f4e:
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NOLOG, "%s>>>>>>>>>>>>!*STOP*!<<<<<<<<<<<<<<%s", _RED_, _WHITE_);
+                        DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "%s>>>>>>>>>>>>!*STOP*!<<<<<<<<<<<<<<%s", _RED_, _WHITE_);
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NOLOG, "    .TAG SEEMS %sDETERMINISTIC%s.     ", _GREEN_, _WHITE_);
+                        DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "    .TAG SEEMS %sDETERMINISTIC%s.     ", _GREEN_, _WHITE_);
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NOLOG, "%s  Detected :%sNORALSY_VIGIK_TAG %s", _ORANGE_, _CYAN_, _WHITE_);
+                        DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "%s  Detected :%sNORALSY_VIGIK_TAG %s", _ORANGE_, _CYAN_, _WHITE_);
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NOLOG, "...%s[%sKey_derivation_schemeTest%s]%s...", _YELLOW_, _GREEN_, _YELLOW_, _GREEN_);
+                        DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "...%s[%sKey_derivation_schemeTest%s]%s...", _YELLOW_, _GREEN_, _YELLOW_, _GREEN_);
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NOLOG, "%s>>>>>>>>>>>>!*DONE*!<<<<<<<<<<<<<<%s", _GREEN_, _WHITE_);
+                        DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "%s>>>>>>>>>>>>!*DONE*!<<<<<<<<<<<<<<%s", _GREEN_, _WHITE_);
 
                         t = 0;
                         for (uint16_t s = 0; s < sectorsCnt; s++) {
@@ -664,7 +664,7 @@ failtag:
                                     foundKey[t][s][4],
                                     foundKey[t][s][5]);
                             cjSetCursRight();
-                            DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", s, tosendkey, t);
+                            DbprintfEx(FLAG_NEWLINE, "SEC: %02x ; KEY : %s ; TYP: %d", s, tosendkey, t);
                         }
 
                         t = 1;
@@ -678,7 +678,7 @@ failtag:
                                     foundKey[t][s][4],
                                     foundKey[t][s][5]);
                             cjSetCursRight();
-                            DbprintfEx(FLAG_NOLOG, "SEC: %02x ; KEY : %s ; TYP: %d", s, tosendkey, t);
+                            DbprintfEx(FLAG_NEWLINE, "SEC: %02x ; KEY : %s ; TYP: %d", s, tosendkey, t);
                         }
                         trapped = 1;
                         break;
@@ -692,7 +692,7 @@ failtag:
     if (!allKeysFound) {
         cjSetCursLeft();
         cjTabulize();
-        DbprintfEx(FLAG_NOLOG, "%s[ FAIL ]%s\r\n->did not found all the keys :'(", _RED_, _WHITE_);
+        DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "%s[ FAIL ]%s\r\n->did not found all the keys :'(", _RED_, _WHITE_);
         cjSetCursLeft();
         SpinErr(1, 100, 8);
         SpinOff(100);
@@ -711,25 +711,25 @@ failtag:
     }
     cjSetCursLeft();
 
-    DbprintfEx(FLAG_NOLOG, "%s>>%s Setting Keys->Emulator MEM...[%sOK%s]", _YELLOW_, _WHITE_, _GREEN_, _WHITE_);
+    DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "%s>>%s Setting Keys->Emulator MEM...[%sOK%s]", _YELLOW_, _WHITE_, _GREEN_, _WHITE_);
 
     /* filling TAG to emulator */
     uint8_t filled = 0;
     cjSetCursLeft();
 
-    DbprintfEx(FLAG_NOLOG, "%s>>%s Filling Emulator <- from A keys...", _YELLOW_, _WHITE_);
+    DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "%s>>%s Filling Emulator <- from A keys...", _YELLOW_, _WHITE_);
     e_MifareECardLoad(sectorsCnt, 0, 0, &filled);
     if (filled != 1) {
         cjSetCursLeft();
 
-        DbprintfEx(FLAG_NOLOG, "%s>>%s W_FAILURE ! %sTrying fallback B keys....", _RED_, _ORANGE_, _WHITE_);
+        DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "%s>>%s W_FAILURE ! %sTrying fallback B keys....", _RED_, _ORANGE_, _WHITE_);
 
         /* no trace, no dbg  */
         e_MifareECardLoad(sectorsCnt, 1, 0, &filled);
         if (filled != 1) {
             cjSetCursLeft();
 
-            DbprintfEx(FLAG_NOLOG, "FATAL:EML_FALLBACKFILL_B");
+            DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "FATAL:EML_FALLBACKFILL_B");
             SpinErr(2, 100, 8);
             SpinOff(100);
             return;
@@ -739,13 +739,13 @@ failtag:
     end_time = GetTickCount();
     cjSetCursLeft();
 
-    DbprintfEx(FLAG_NOLOG, "%s>>%s Time for VIGIK break :%s%dms%s", _GREEN_, _WHITE_, _YELLOW_, end_time - start_time, _WHITE_);
+    DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "%s>>%s Time for VIGIK break :%s%dms%s", _GREEN_, _WHITE_, _YELLOW_, end_time - start_time, _WHITE_);
 
     vtsend_cursor_position_save(NULL);
     vtsend_set_attribute(NULL, 1);
     vtsend_set_attribute(NULL, 5);
     cjTabulize();
-    DbprintfEx(FLAG_NOLOG, "[    WRITING FLASH   ]");
+    DbprintfEx(FLAG_NEWLINE, "[    WRITING FLASH   ]");
     cjSetCursLeft();
     cjSetCursLeft();
 
@@ -755,20 +755,20 @@ readysim:
     // SIM ?
     cjSetCursLeft();
 
-    DbprintfEx(FLAG_NOLOG, "-> We launch Emulation ->");
+    DbprintfEx(FLAG_NEWLINE, "-> We launch Emulation ->");
     cjSetCursLeft();
 
-    DbprintfEx(FLAG_NOLOG, "%s!> HOLD ON : %s When you'll click, simm will stop", _RED_, _WHITE_);
+    DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "%s!> HOLD ON : %s When you'll click, simm will stop", _RED_, _WHITE_);
     cjSetCursLeft();
 
-    DbprintfEx(FLAG_NOLOG, "Then %s immediately %s we'll try to %s dump our emulator state%s \r\nin a %s chinese tag%s", _RED_, _WHITE_, _YELLOW_, _WHITE_,
+    DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "Then %s immediately %s we'll try to %s dump our emulator state%s \r\nin a %s chinese tag%s", _RED_, _WHITE_, _YELLOW_, _WHITE_,
                _CYAN_, _WHITE_);
     cjSetCursLeft();
     cjSetCursLeft();
 
     cjTabulize();
 
-    DbprintfEx(FLAG_NOLOG, "[    SIMULATION   ]");
+    DbprintfEx(FLAG_NEWLINE, "[    SIMULATION   ]");
     vtsend_set_attribute(NULL, 0);
 
     SpinOff(100);
@@ -777,21 +777,21 @@ readysim:
     LED_C_OFF();
     SpinOff(50);
     vtsend_cursor_position_restore(NULL);
-    DbprintfEx(FLAG_NOLOG, "[   SIMUL ENDED   ]%s", _GREEN_, _WHITE_);
+    DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "[   SIMUL ENDED   ]%s", _GREEN_, _WHITE_);
     cjSetCursLeft();
 
-    DbprintfEx(FLAG_NOLOG, "<- We're out of Emulation");
+    DbprintfEx(FLAG_NEWLINE, "<- We're out of Emulation");
     // END SIM
 
     cjSetCursLeft();
 
-    DbprintfEx(FLAG_NOLOG, "-> Trying a clone !");
+    DbprintfEx(FLAG_NEWLINE, "-> Trying a clone !");
     saMifareMakeTag();
     cjSetCursLeft();
     vtsend_cursor_position_restore(NULL);
-    DbprintfEx(FLAG_NOLOG, "%s[ CLONED? ]", _CYAN_);
+    DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "%s[ CLONED? ]", _CYAN_);
 
-    DbprintfEx(FLAG_NOLOG, "-> End Cloning.");
+    DbprintfEx(FLAG_NEWLINE, "-> End Cloning.");
     WDT_HIT();
 
     // Debunk...
@@ -799,7 +799,7 @@ readysim:
     cjTabulize();
     vtsend_set_attribute(NULL, 0);
     vtsend_set_attribute(NULL, 7);
-    DbprintfEx(FLAG_NOLOG, "- [ LA FIN ] -\r\n%s`-> You can take shell back :) ...", _WHITE_);
+    DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "- [ LA FIN ] -\r\n%s`-> You can take shell back :) ...", _WHITE_);
     cjSetCursLeft();
     vtsend_set_attribute(NULL, 0);
     SpinErr(3, 100, 16);
@@ -844,14 +844,14 @@ void e_MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *dat
             if (isOK && mifare_classic_auth(pcs, cjcuid, FirstBlockOfSector(s), keyType, ui64Key, AUTH_FIRST)) {
 
                 if (MF_DBGLEVEL >= 1)
-                    DbprintfEx(FLAG_NOLOG, "Sector[%2d]. Auth error", s);
+                    DbprintfEx(FLAG_NEWLINE, "Sector[%2d]. Auth error", s);
                 break;
             }
         } else {
             if (isOK && mifare_classic_auth(pcs, cjcuid, FirstBlockOfSector(s), keyType, ui64Key, AUTH_NESTED)) {
                 isOK = false;
                 if (MF_DBGLEVEL >= 1)
-                    DbprintfEx(FLAG_NOLOG, "Sector[%2d]. Auth nested error", s);
+                    DbprintfEx(FLAG_NEWLINE, "Sector[%2d]. Auth nested error", s);
                 break;
             }
         }
@@ -860,7 +860,7 @@ void e_MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *dat
             if (isOK && mifare_classic_readblock(pcs, cjcuid, FirstBlockOfSector(s) + blockNo, dataoutbuf)) {
                 isOK = false;
                 if (MF_DBGLEVEL >= 1)
-                    DbprintfEx(FLAG_NOLOG, "Error reading sector %2d block %2d", s, blockNo);
+                    DbprintfEx(FLAG_NEWLINE, "Error reading sector %2d block %2d", s, blockNo);
                 break;
             };
             if (isOK) {
@@ -881,7 +881,7 @@ void e_MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *dat
 
     if (mifare_classic_halt(pcs, cjcuid)) {
         if (MF_DBGLEVEL >= 1)
-            DbprintfEx(FLAG_NOLOG, "Halt error");
+            DbprintfEx(FLAG_NEWLINE, "Halt error");
     };
 
     crypto1_destroy(pcs);
@@ -909,7 +909,7 @@ int cjat91_saMifareChkKeys(uint8_t blockNo, uint8_t keyType, bool clearTrace, ui
         // if (!iso14443a_fast_select_card(cjuid, 0)) {
         if (!iso14443a_select_card(cjuid, NULL, &cjcuid, true, 0, true)) {
             cjSetCursLeft();
-            DbprintfEx(FLAG_NOLOG, "%sFATAL%s : E_MF_LOSTTAG", _RED_, _WHITE_);
+            DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "%sFATAL%s : E_MF_LOSTTAG", _RED_, _WHITE_);
             return -1;
         }
 
@@ -938,12 +938,12 @@ void saMifareMakeTag(void) {
     cjTabulize();
     vtsend_cursor_position_save(NULL);
     vtsend_set_attribute(NULL, 1);
-    DbprintfEx(FLAG_NOLOG, "[ CLONING ]");
+    DbprintfEx(FLAG_NEWLINE, "[ CLONING ]");
     vtsend_set_attribute(NULL, 0);
 
     cjSetCursFRight();
 
-    DbprintfEx(FLAG_NOLOG, ">> Write to Special:");
+    DbprintfEx(FLAG_NEWLINE, ">> Write to Special:");
     int flags = 0;
     for (int blockNum = 0; blockNum < 16 * 4; blockNum++) {
         uint8_t mblock[16];
@@ -968,7 +968,7 @@ void saMifareMakeTag(void) {
             if (currfline > 53) {
                 currfline = 54;
             }
-            DbprintfEx(FLAG_NOLOG, "Block :%02x %sOK%s", blockNum, _GREEN_, _WHITE_);
+            DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "Block :%02x %sOK%s", blockNum, _GREEN_, _WHITE_);
             //                                                      DbprintfEx(FLAG_RAWPRINT,"FATAL:E_MF_CHINESECOOK_NORICE");
             //                                                      cfail=1;
             // return;
@@ -977,15 +977,15 @@ void saMifareMakeTag(void) {
             cjSetCursLeft();
             cjSetCursLeft();
 
-            DbprintfEx(FLAG_NOLOG, "`--> %sFAIL%s : CHN_FAIL_BLK_%02x_NOK", _RED_, _WHITE_, blockNum);
+            DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "`--> %sFAIL%s : CHN_FAIL_BLK_%02x_NOK", _RED_, _WHITE_, blockNum);
             cjSetCursFRight();
-            DbprintfEx(FLAG_NOLOG, "%s>>>>%s STOP AT %02x", _RED_, _WHITE_, blockNum);
+            DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "%s>>>>%s STOP AT %02x", _RED_, _WHITE_, blockNum);
             cfail++;
             break;
         }
         cjSetCursFRight();
 
-        DbprintfEx(FLAG_NOLOG, "%s>>>>>>>> END <<<<<<<<%s", _YELLOW_, _WHITE_);
+        DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "%s>>>>>>>> END <<<<<<<<%s", _YELLOW_, _WHITE_);
         // break;
         /*if (cfail == 1) {
                 DbprintfEx(FLAG_RAWPRINT,"FATAL: E_MF_HARA_KIRI_\r\n");
@@ -1039,12 +1039,12 @@ int saMifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *data
         // get UID from chip
         if (workFlags & 0x01) {
             if (!iso14443a_select_card(cjuid, NULL, &cjcuid, true, 0, true)) {
-                DbprintfEx(FLAG_NOLOG, "Can't select card");
+                DbprintfEx(FLAG_NEWLINE, "Can't select card");
                 break;
             };
 
             if (mifare_classic_halt(NULL, cjcuid)) {
-                DbprintfEx(FLAG_NOLOG, "Halt error");
+                DbprintfEx(FLAG_NEWLINE, "Halt error");
                 break;
             };
         };
@@ -1053,18 +1053,18 @@ int saMifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *data
         if (needWipe) {
             ReaderTransmitBitsPar(wupC1, 7, 0, NULL);
             if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
-                DbprintfEx(FLAG_NOLOG, "wupC1 error");
+                DbprintfEx(FLAG_NEWLINE, "wupC1 error");
                 break;
             };
 
             ReaderTransmit(wipeC, sizeof(wipeC), NULL);
             if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
-                DbprintfEx(FLAG_NOLOG, "wipeC error");
+                DbprintfEx(FLAG_NEWLINE, "wipeC error");
                 break;
             };
 
             if (mifare_classic_halt(NULL, cjcuid)) {
-                DbprintfEx(FLAG_NOLOG, "Halt error");
+                DbprintfEx(FLAG_NEWLINE, "Halt error");
                 break;
             };
         };
@@ -1074,19 +1074,19 @@ int saMifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *data
         if (workFlags & 0x02) {
             ReaderTransmitBitsPar(wupC1, 7, 0, NULL);
             if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
-                DbprintfEx(FLAG_NOLOG, "wupC1 error");
+                DbprintfEx(FLAG_NEWLINE, "wupC1 error");
                 break;
             };
 
             ReaderTransmit(wupC2, sizeof(wupC2), NULL);
             if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
-                DbprintfEx(FLAG_NOLOG, "wupC2 errorv");
+                DbprintfEx(FLAG_NEWLINE, "wupC2 errorv");
                 break;
             };
         }
 
         if ((mifare_sendcmd_short(NULL, 0, 0xA0, blockNo, receivedAnswer, receivedAnswerPar, NULL) != 1) || (receivedAnswer[0] != 0x0a)) {
-            DbprintfEx(FLAG_NOLOG, "write block send command error");
+            DbprintfEx(FLAG_NEWLINE, "write block send command error");
             break;
         };
 
@@ -1094,7 +1094,7 @@ int saMifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *data
         AddCrc14A(d_block, 16);
         ReaderTransmit(d_block, sizeof(d_block), NULL);
         if ((ReaderReceive(receivedAnswer, receivedAnswerPar) != 1) || (receivedAnswer[0] != 0x0a)) {
-            DbprintfEx(FLAG_NOLOG, "write block send data error");
+            DbprintfEx(FLAG_NEWLINE, "write block send data error");
             break;
         };
 
@@ -1102,7 +1102,7 @@ int saMifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *data
             if (mifare_classic_halt(NULL, cjcuid)) {
                 cjSetCursFRight();
 
-                DbprintfEx(FLAG_NOLOG, "Halt error");
+                DbprintfEx(FLAG_NEWLINE, "Halt error");
                 break;
             };
         }
diff --git a/armsrc/Standalone/hf_mattyrun.c b/armsrc/Standalone/hf_mattyrun.c
index 9bcfd63d3..002a50c51 100644
--- a/armsrc/Standalone/hf_mattyrun.c
+++ b/armsrc/Standalone/hf_mattyrun.c
@@ -75,12 +75,12 @@ static int saMifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_
         // get UID from chip
         if (workFlags & 0x01) {
             if (!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
-                DbprintfEx(FLAG_NOLOG, "Can't select card");
+                DbprintfEx(FLAG_NEWLINE, "Can't select card");
                 break;
             };
 
             if (mifare_classic_halt(NULL, cuid)) {
-                DbprintfEx(FLAG_NOLOG, "Halt error");
+                DbprintfEx(FLAG_NEWLINE, "Halt error");
                 break;
             };
         };
@@ -89,18 +89,18 @@ static int saMifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_
         if (needWipe) {
             ReaderTransmitBitsPar(wupC1, 7, 0, NULL);
             if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
-                DbprintfEx(FLAG_NOLOG, "wupC1 error");
+                DbprintfEx(FLAG_NEWLINE, "wupC1 error");
                 break;
             };
 
             ReaderTransmit(wipeC, sizeof(wipeC), NULL);
             if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
-                DbprintfEx(FLAG_NOLOG, "wipeC error");
+                DbprintfEx(FLAG_NEWLINE, "wipeC error");
                 break;
             };
 
             if (mifare_classic_halt(NULL, cuid)) {
-                DbprintfEx(FLAG_NOLOG, "Halt error");
+                DbprintfEx(FLAG_NEWLINE, "Halt error");
                 break;
             };
         };
@@ -110,19 +110,19 @@ static int saMifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_
         if (workFlags & 0x02) {
             ReaderTransmitBitsPar(wupC1, 7, 0, NULL);
             if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
-                DbprintfEx(FLAG_NOLOG, "wupC1 error");
+                DbprintfEx(FLAG_NEWLINE, "wupC1 error");
                 break;
             };
 
             ReaderTransmit(wupC2, sizeof(wupC2), NULL);
             if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
-                DbprintfEx(FLAG_NOLOG, "wupC2 errorv");
+                DbprintfEx(FLAG_NEWLINE, "wupC2 errorv");
                 break;
             };
         }
 
         if ((mifare_sendcmd_short(NULL, 0, 0xA0, blockNo, receivedAnswer, receivedAnswerPar, NULL) != 1) || (receivedAnswer[0] != 0x0a)) {
-            DbprintfEx(FLAG_NOLOG, "write block send command error");
+            DbprintfEx(FLAG_NEWLINE, "write block send command error");
             break;
         };
 
@@ -130,13 +130,13 @@ static int saMifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_
         AddCrc14A(d_block, 16);
         ReaderTransmit(d_block, sizeof(d_block), NULL);
         if ((ReaderReceive(receivedAnswer, receivedAnswerPar) != 1) || (receivedAnswer[0] != 0x0a)) {
-            DbprintfEx(FLAG_NOLOG, "write block send data error");
+            DbprintfEx(FLAG_NEWLINE, "write block send data error");
             break;
         };
 
         if (workFlags & 0x04) {
             if (mifare_classic_halt(NULL, cuid)) {
-                DbprintfEx(FLAG_NOLOG, "Halt error");
+                DbprintfEx(FLAG_NEWLINE, "Halt error");
                 break;
             };
         }
@@ -168,7 +168,7 @@ static int saMifareChkKeys(uint8_t blockNo, uint8_t keyType, bool clearTrace, ui
         /* no need for anticollision. just verify tag is still here */
         // if (!iso14443a_fast_select_card(cjuid, 0)) {
         if (!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
-            DbprintfEx(FLAG_NOLOG, "FATAL : E_MF_LOSTTAG");
+            DbprintfEx(FLAG_NEWLINE, "FATAL : E_MF_LOSTTAG");
             return -1;
         }
 
diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 8c42a6017..066f3a5d7 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -114,16 +114,16 @@ void print_result(char *name, uint8_t *buf, size_t len) {
 // Debug print functions, to go out over USB, to the usual PC-side client.
 //=============================================================================
 
-void DbpStringEx(char *str, uint32_t cmd) {
+void DbpStringEx(uint32_t flags, char *str) {
 #if DEBUG
     uint8_t len = strlen(str);
-    cmd_send(CMD_DEBUG_PRINT_STRING, len, cmd, 0, (uint8_t *)str, len);
+    cmd_send(CMD_DEBUG_PRINT_STRING, len, flags, 0, (uint8_t *)str, len);
 #endif
 }
 
 void DbpString(char *str) {
 #if DEBUG
-    DbpStringEx(str, 0);
+    DbpStringEx(FLAG_LOG, str);
 #endif
 }
 
@@ -132,7 +132,7 @@ void DbpIntegers(int x1, int x2, int x3) {
     cmd_send(CMD_DEBUG_PRINT_INTEGERS, x1, x2, x3, 0, 0);
 }
 #endif
-void DbprintfEx(uint32_t cmd, const char *fmt, ...) {
+void DbprintfEx(uint32_t flags, const char *fmt, ...) {
 #if DEBUG
     // should probably limit size here; oh well, let's just use a big buffer
     char output_string[128] = {0x00};
@@ -141,7 +141,7 @@ void DbprintfEx(uint32_t cmd, const char *fmt, ...) {
     kvsprintf(fmt, output_string, 10, ap);
     va_end(ap);
 
-    DbpStringEx(output_string, cmd);
+    DbpStringEx(flags, output_string);
 #endif
 }
 
@@ -310,10 +310,10 @@ void MeasureAntennaTuningHf(void) {
         } else {
             volt = (MAX_ADC_HF_VOLTAGE_RDV40 * AvgAdc(ADC_CHAN_HF_RDV40)) >> 10;
         }
-        DbprintfEx(FLAG_NONEWLINE, "%u mV / %5u V", volt, (uint16_t)(volt / 1000));
+        DbprintfEx(FLAG_INPLACE, "%u mV / %5u V", volt, (uint16_t)(volt / 1000));
     }
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-    DbprintfEx(FLAG_NOOPT, "\n[+] cancelled", 1);
+    DbprintfEx(FLAG_LOG, "\n[+] cancelled", 1);
 }
 
 void ReadMem(int addr) {
@@ -365,7 +365,7 @@ void SendVersion(void) {
 // measure the USB Speed by sending SpeedTestBufferSize bytes to client and measuring the elapsed time.
 // Note: this mimics GetFromBigbuf(), i.e. we have the overhead of the UsbCommand structure included.
 void printUSBSpeed(void) {
-    Dbprintf("USB Speed");
+    DbpStringEx(FLAG_LOG|FLAG_ANSI, _BLUE_("USB Speed"));
     Dbprintf("  Sending USB packets to client...");
 
 #define USB_SPEED_TEST_MIN_TIME 1500 // in milliseconds
@@ -406,12 +406,12 @@ void SendStatus(void) {
     printT55xxConfig(); // LF T55XX Config
 #endif
     printUSBSpeed();
-    Dbprintf("Various");
+    DbpStringEx(FLAG_LOG|FLAG_ANSI, _BLUE_("Various"));
     Dbprintf("  MF_DBGLEVEL.............%d", MF_DBGLEVEL);
     Dbprintf("  ToSendMax...............%d", ToSendMax);
     Dbprintf("  ToSendBit...............%d", ToSendBit);
     Dbprintf("  ToSend BUFFERSIZE.......%d", TOSEND_BUFFER_SIZE);
-    DbpString("Installed StandAlone Mode");
+    DbpStringEx(FLAG_LOG|FLAG_ANSI, _BLUE_("Installed StandAlone Mode"));
     ModInfo();
 
     //DbpString("Running ");
diff --git a/armsrc/apps.h b/armsrc/apps.h
index b4c38098c..d356fd052 100644
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -45,6 +45,7 @@ void ReadMem(int addr);
 void __attribute__((noreturn)) AppMain(void);
 //void DbpIntegers(int a, int b, int c);
 void DbpString(char *str);
+void DbpStringEx(uint32_t cmd, char *str);
 void Dbprintf(const char *fmt, ...);
 void DbprintfEx(uint32_t cmd, const char *fmt, ...);
 void Dbhexdump(int len, uint8_t *d, bool bAsci);
diff --git a/armsrc/flashmem.c b/armsrc/flashmem.c
index d2010fe6d..e423805a2 100644
--- a/armsrc/flashmem.c
+++ b/armsrc/flashmem.c
@@ -512,7 +512,7 @@ void Flash_EraseChip(void) {
 */
 
 void Flashmem_print_status(void) {
-    DbpString("Flash memory");
+    DbpStringEx(FLAG_LOG|FLAG_ANSI, _BLUE_("Flash memory"));
     Dbprintf("  Baudrate................%dMHz", FLASHMEM_SPIBAUDRATE / 1000000);
 
     if (!FlashInit()) {
diff --git a/armsrc/fpgaloader.c b/armsrc/fpgaloader.c
index 1be2c6138..4dd4d4403 100644
--- a/armsrc/fpgaloader.c
+++ b/armsrc/fpgaloader.c
@@ -481,7 +481,7 @@ void SetAdcMuxFor(uint32_t whichGpio) {
 }
 
 void Fpga_print_status(void) {
-    Dbprintf("Currently loaded FPGA image");
+    DbpStringEx(FLAG_LOG|FLAG_ANSI, _BLUE_("Currently loaded FPGA image"));
     Dbprintf("  mode....................%s", fpga_version_information[downloaded_bitstream - 1]);
 }
 
diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index 613e786c2..2c4569951 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -55,7 +55,7 @@ Default LF T55xx config is set to:
 t55xx_config t_config = { 29 * 8, 17 * 8, 15 * 8, 47 * 8, 15 * 8 } ;
 
 void printT55xxConfig(void) {
-    Dbprintf("LF T55XX config");
+    DbpStringEx(FLAG_LOG|FLAG_ANSI, _BLUE_("LF T55XX config"));
     Dbprintf("  [a] startgap............%d*8 (%d)", t_config.start_gap / 8, t_config.start_gap);
     Dbprintf("  [b] writegap............%d*8 (%d)", t_config.write_gap / 8, t_config.write_gap);
     Dbprintf("  [c] write_0.............%d*8 (%d)", t_config.write_0 / 8,   t_config.write_0);
diff --git a/armsrc/lfsampling.c b/armsrc/lfsampling.c
index 20473f3e6..becf966c8 100644
--- a/armsrc/lfsampling.c
+++ b/armsrc/lfsampling.c
@@ -19,7 +19,7 @@ Default LF config is set to:
 sample_config config = { 1, 8, 1, 95, 0 } ;
 
 void printConfig() {
-    Dbprintf("LF Sampling config");
+    DbpStringEx(FLAG_LOG|FLAG_ANSI, _BLUE_("LF Sampling config"));
     Dbprintf("  [q] divisor.............%d (%d KHz)", config.divisor, 12000 / (config.divisor + 1));
     Dbprintf("  [b] bps.................%d", config.bits_per_sample);
     Dbprintf("  [d] decimation..........%d", config.decimation);
diff --git a/armsrc/util.h b/armsrc/util.h
index f592f1ff3..b31025a0e 100644
--- a/armsrc/util.h
+++ b/armsrc/util.h
@@ -18,6 +18,13 @@
 #include "ticks.h"
 
 // Basic macros
+# define _BLUE_(s) "\x1b[34m" s "\x1b[0m "
+# define _RED_(s) "\x1b[31m" s "\x1b[0m "
+# define _GREEN_(s) "\x1b[32m" s "\x1b[0m "
+# define _YELLOW_(s) "\x1b[33m" s "\x1b[0m "
+# define _MAGENTA_(s) "\x1b[35m" s "\x1b[0m "
+# define _CYAN_(s) "\x1b[36m" s "\x1b[0m "
+
 #ifndef SHORT_COIL
 #define SHORT_COIL()     LOW(GPIO_SSC_DOUT)
 #endif
diff --git a/client/comms.c b/client/comms.c
index c6526f881..6bddf33e2 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -154,26 +154,48 @@ static void UsbCommandReceived(UsbCommand *c) {
             char s[USB_CMD_DATA_SIZE + 1];
             memset(s, 0x00, sizeof(s));
             size_t len = MIN(c->arg[0], USB_CMD_DATA_SIZE);
-            memcpy(s, c->d.asBytes, len);
             uint64_t flag = c->arg[1];
 
-            switch (flag) {
-                case FLAG_RAWPRINT:
-                    printf("%s", s);
-                    break;
-                case FLAG_NONEWLINE:
-                    printf("\r%s", s);
-                    break;
-                case FLAG_NOLOG:
-                    printf("%s\r\n", s);
-                    break;
-                //case FLAG_NOPROMPT:
-                //  break;
-                case FLAG_NOOPT:
-                default:
-                    PrintAndLogEx(NORMAL, "#db# %s", s);
-                    break;
+#if defined(__linux__) || (__APPLE__)
+            memcpy(s, c->d.asBytes, len);
+#else
+            if (flag & FLAG_ANSI)
+                // Filter out ANSI sequences on these OS
+                uint16_t si=0;
+                for (uint16_t i=0; i < len; i++) {
+                    if ((c->d.asBytes[i] == '\x1b') && (i < len - 1) && (c->d.asBytes[i+1] >= 0x40) && (c->d.asBytes[i+1] <= 0x5F)) { // entering ANSI sequence
+                        i++;
+                        if ((c->d.asBytes[i] == '[') && (i < len - 1)) { // entering CSI sequence
+                            i++;
+                            while ((i < len - 1) && (c->d.asBytes[i] >= 0x30) && (c->d.asBytes[i] <= 0x3F)) { // parameter bytes
+                                i++;
+                            }
+                            while ((i < len - 1) && (c->d.asBytes[i] >= 0x20) && (c->d.asBytes[i] <= 0x2F)) { // intermediate bytes
+                                i++;
+                            }
+                            if ((c->d.asBytes[i] >= 0x40) && (c->d.asBytes[i] <= 0x7F)) { // final byte
+                                continue;
+                            }
+                        } else {
+                            continue;
+                        }
+                    }
+                    s[si++] = c->d.asBytes[i];
+                }
+            } else {
+                memcpy(s, c->d.asBytes, len);
             }
+#endif
+            if (flag & FLAG_LOG) {
+                PrintAndLogEx(NORMAL, "#db# %s", s);
+            } else {
+                if (flag & FLAG_INPLACE)
+                    printf("\r");
+                printf("%s", s);
+                if (flag & FLAG_NEWLINE)
+                    printf("\r\n");
+            }
+
             fflush(stdout);
             break;
         }
diff --git a/common/i2c.c b/common/i2c.c
index 5094b450a..8cb88d9b0 100644
--- a/common/i2c.c
+++ b/common/i2c.c
@@ -593,7 +593,7 @@ bool I2C_WriteFW(uint8_t *data, uint8_t len, uint8_t msb, uint8_t lsb, uint8_t d
 }
 
 void I2C_print_status(void) {
-    DbpString("Smart card module (ISO 7816)");
+    DbpStringEx(FLAG_LOG|FLAG_ANSI, _BLUE_("Smart card module (ISO 7816"));
     uint8_t resp[] = {0, 0, 0, 0};
     I2C_Reset_EnterMainProgram();
     uint8_t len = I2C_BufferRead(resp, sizeof(resp), I2C_DEVICE_CMD_GETVERSION, I2C_DEVICE_ADDRESS_MAIN);
diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index 57f2c46fd..4d3f61c07 100644
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -311,12 +311,11 @@ typedef struct {
 #define FLAG_ICLASS_READER_CEDITKEY    0x40
 
 // Dbprintf flags
-#define FLAG_RAWPRINT    0x0111
-#define FLAG_NOOPT       0x0000
-#define FLAG_NOLOG       0x0001
-#define FLAG_NONEWLINE   0x0010
-#define FLAG_NOPROMPT    0x0100
-
+#define FLAG_RAWPRINT    0x00
+#define FLAG_LOG         0x01
+#define FLAG_NEWLINE     0x02
+#define FLAG_INPLACE     0x04
+#define FLAG_ANSI        0x08
 
 // CMD_DEVICE_INFO response packet has flags in arg[0], flag definitions:
 /* Whether a bootloader that understands the common_area is present */

From 4494c3dc617bbf425358d2130afa0a147514a4f1 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 26 Apr 2019 10:46:00 +0200
Subject: [PATCH 1436/1938] text

---
 common/i2c.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/i2c.c b/common/i2c.c
index 8cb88d9b0..1d821d645 100644
--- a/common/i2c.c
+++ b/common/i2c.c
@@ -593,7 +593,7 @@ bool I2C_WriteFW(uint8_t *data, uint8_t len, uint8_t msb, uint8_t lsb, uint8_t d
 }
 
 void I2C_print_status(void) {
-    DbpStringEx(FLAG_LOG|FLAG_ANSI, _BLUE_("Smart card module (ISO 7816"));
+    DbpStringEx(FLAG_LOG|FLAG_ANSI, _BLUE_("Smart card module (ISO 7816)"));
     uint8_t resp[] = {0, 0, 0, 0};
     I2C_Reset_EnterMainProgram();
     uint8_t len = I2C_BufferRead(resp, sizeof(resp), I2C_DEVICE_CMD_GETVERSION, I2C_DEVICE_ADDRESS_MAIN);

From 4ad9f579392e42b3ccc672689190ac30a798f108 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 26 Apr 2019 10:49:30 +0200
Subject: [PATCH 1437/1938] missing bracket

---
 client/comms.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/comms.c b/client/comms.c
index 6bddf33e2..7731a65a1 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -159,9 +159,9 @@ static void UsbCommandReceived(UsbCommand *c) {
 #if defined(__linux__) || (__APPLE__)
             memcpy(s, c->d.asBytes, len);
 #else
-            if (flag & FLAG_ANSI)
+            if (flag & FLAG_ANSI) {
                 // Filter out ANSI sequences on these OS
-                uint16_t si=0;
+                uint16_t si = 0;
                 for (uint16_t i=0; i < len; i++) {
                     if ((c->d.asBytes[i] == '\x1b') && (i < len - 1) && (c->d.asBytes[i+1] >= 0x40) && (c->d.asBytes[i+1] <= 0x5F)) { // entering ANSI sequence
                         i++;

From b12be75a5b3bb733cfb61be1c79066e7991e88a9 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 26 Apr 2019 12:02:34 +0200
Subject: [PATCH 1438/1938] Remove block_after_ACK mechanism on NG frames,
 flashing uses OLD and NG won't use ACK anymore

---
 client/comms.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/client/comms.c b/client/comms.c
index d04581175..4501326c1 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -438,10 +438,6 @@ __attribute__((force_align_arg_pointer))
                 if (!error) {
 //                    PrintAndLogEx(NORMAL, "Received reply NG full !!");
                     PacketResponseReceived(&rx);
-//TODO NG don't send ACK anymore but reply with the corresponding cmd, still things seem to work fine...
-                    if (rx.cmd == CMD_ACK) {
-                        ACK_received = true;
-                    }
                 }
             } else {                               // Old style reply
                 PacketResponseOLD rx_old;
@@ -480,6 +476,7 @@ __attribute__((force_align_arg_pointer))
 
         if (connection->block_after_ACK) {
             // if we just received an ACK, wait here until a new command is to be transmitted
+            // This is only working on OLD frames, and only used by flasher
             if (ACK_received) {
                 while (!txBuffer_pending) {
                     pthread_cond_wait(&txBufferSig, &txBufferMutex);

From b2d0bea05fe76b10c6ad802ecdadf3da69c6eaa6 Mon Sep 17 00:00:00 2001
From: Eloff <eloff@mail.ru>
Date: Fri, 26 Apr 2019 13:22:57 +0300
Subject: [PATCH 1439/1938] 'hf 14a sim' more flexible init responses method

---
 armsrc/iso14443a.c | 447 ++++++++++++++++++++++++---------------------
 1 file changed, 237 insertions(+), 210 deletions(-)

diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index a87415919..83455bc82 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -817,6 +817,211 @@ bool prepare_allocated_tag_modulation(tag_response_info_t *response_info, uint8_
         return false;
     }
 }
+
+static bool SimulateIso14443aInit(int tagType, int flags, uint8_t *data, tag_response_info_t **responses, uint32_t *cuid, uint32_t counters[3], uint8_t tearings[3], uint8_t *pages) {
+    uint8_t sak = 0;
+    // The first response contains the ATQA (note: bytes are transmitted in reverse order).
+    static uint8_t rATQA[2] = { 0x00 };
+    // The second response contains the (mandatory) first 24 bits of the UID
+    static uint8_t rUIDc1[5] = { 0x00 };
+    // For UID size 7,
+    static uint8_t rUIDc2[5] = { 0x00 };
+    // Prepare the mandatory SAK (for 4 and 7 byte UID)
+    static uint8_t rSAKc1[3]  = { 0x00 };
+    // Prepare the optional second SAK (for 7 byte UID), drop the cascade bit
+    static uint8_t rSAKc2[3]  = { 0x00 };
+    // dummy ATS (pseudo-ATR), answer to RATS
+    static uint8_t rRATS[] = { 0x04, 0x58, 0x80, 0x02, 0x00, 0x00 };
+    // PACK response to PWD AUTH for EV1/NTAG
+    static uint8_t rPACK[4] = { 0x00 };
+    // GET_VERSION response for EV1/NTAG
+    static uint8_t rVERSION[10] = { 0x00 };
+    // READ_SIG response for EV1/NTAG
+    static uint8_t rSIGN[34] = { 0x00 };
+
+    switch (tagType) {
+        case 1: { // MIFARE Classic 1k
+            rATQA[0] = 0x04;
+            sak = 0x08;
+        }
+        break;
+        case 2: { // MIFARE Ultralight
+            rATQA[0] = 0x44;
+            sak = 0x00;
+            // some first pages of UL/NTAG dump is special data
+            mfu_dump_t *mfu_header = (mfu_dump_t *) BigBuf_get_EM_addr();
+            *pages = mfu_header->pages;
+        }
+        break;
+        case 3: { // MIFARE DESFire
+            rATQA[0] = 0x04;
+            rATQA[1] = 0x03;
+            sak = 0x20;
+        }
+        break;
+        case 4: { // ISO/IEC 14443-4 - javacard (JCOP)
+            rATQA[0] = 0x04;
+            sak = 0x28;
+        }
+        break;
+        case 5: { // MIFARE TNP3XXX
+            rATQA[0] = 0x01;
+            rATQA[1] = 0x0f;
+            sak = 0x01;
+        }
+        break;
+        case 6: { // MIFARE Mini 320b
+            rATQA[0] = 0x44;
+            sak = 0x09;
+        }
+        break;
+        case 7: { // NTAG
+            rATQA[0] = 0x44;
+            sak = 0x00;
+            // some first pages of UL/NTAG dump is special data
+            mfu_dump_t *mfu_header = (mfu_dump_t *) BigBuf_get_EM_addr();
+            *pages = mfu_header->pages;
+            // counters and tearing flags
+            for (int i = 0; i < 3; i++) {
+                counters[i] = le24toh(mfu_header->counter_tearing[i]);
+                tearings[i] = mfu_header->counter_tearing[i][3];
+            }
+            // GET_VERSION
+            memcpy(rVERSION, mfu_header->version, 8);
+            AddCrc14A(rVERSION, sizeof(rVERSION) - 2);
+            // READ_SIG
+            memcpy(rSIGN, mfu_header->signature, 32);
+            AddCrc14A(rSIGN, sizeof(rSIGN) - 2);
+            // PACK, from last page of dump
+            emlGetMemBt(rPACK, MFU_DUMP_PREFIX_LENGTH + mfu_header->pages * 4, 2);
+            AddCrc14A(rPACK, sizeof(rPACK) - 2);
+        }
+        break;
+        case 8: { // MIFARE Classic 4k
+            rATQA[0] = 0x02;
+            sak = 0x18;
+        }
+        break;
+        case 9 : { // FM11RF005SH (Shanghai Metro)
+            rATQA[0] = 0x03;
+            rATQA[1] = 0x00;
+            sak = 0x0A;
+        }
+        break;
+        default: {
+            if (MF_DBGLEVEL >= MF_DBG_ERROR)    Dbprintf("Error: unkown tagtype (%d)", tagType);
+            return false;
+        }
+        break;
+    }
+
+    // if uid not supplied then get from emulator memory
+    if (data[0] == 0 || (flags & FLAG_UID_IN_EMUL) == FLAG_UID_IN_EMUL) {
+        if (tagType == 2 || tagType == 7) {
+            uint16_t start = MFU_DUMP_PREFIX_LENGTH;
+            uint8_t emdata[8];
+            emlGetMemBt(emdata, start, sizeof(emdata));
+            memcpy(data, emdata, 3); // uid bytes 0-2
+            memcpy(data + 3, emdata + 4, 4); // uid bytes 3-7
+            flags |= FLAG_7B_UID_IN_DATA;
+        } else {
+            emlGetMemBt(data, 0, 4);
+            flags |= FLAG_4B_UID_IN_DATA;
+        }
+    }
+
+    if ((flags & FLAG_7B_UID_IN_DATA) == FLAG_7B_UID_IN_DATA) {
+        rUIDc1[0] = 0x88;  // Cascade Tag marker
+        rUIDc1[1] = data[0];
+        rUIDc1[2] = data[1];
+        rUIDc1[3] = data[2];
+
+        rUIDc2[0] = data[3];
+        rUIDc2[1] = data[4];
+        rUIDc2[2] = data[5];
+        rUIDc2[3] = data[6];
+        rUIDc2[4] = rUIDc2[0] ^ rUIDc2[1] ^ rUIDc2[2] ^ rUIDc2[3];
+
+        // Configure the ATQA and SAK accordingly
+        rATQA[0] |= 0x40;
+        sak |= 0x04;
+
+        *cuid = bytes_to_num(data + 3, 4);
+    } else if ((flags & FLAG_4B_UID_IN_DATA) == FLAG_4B_UID_IN_DATA) {
+        memcpy(rUIDc1, data, 4);
+        // Configure the ATQA and SAK accordingly
+        rATQA[0] &= 0xBF;
+        sak &= 0xFB;
+        *cuid = bytes_to_num(data, 4);
+    } else {
+        if (MF_DBGLEVEL >= MF_DBG_ERROR)    Dbprintf("[-] ERROR: UID size not defined");
+        return false;
+    }
+
+    // Calculate the BitCountCheck (BCC) for the first 4 bytes of the UID.
+    rUIDc1[4] = rUIDc1[0] ^ rUIDc1[1] ^ rUIDc1[2] ^ rUIDc1[3];
+
+    rSAKc1[0] = sak;
+    AddCrc14A(rSAKc1, sizeof(rSAKc1) - 2);
+
+    rSAKc2[0] = sak & 0xFB;
+    AddCrc14A(rSAKc2, sizeof(rSAKc2) - 2);
+
+    // Format byte = 0x58: FSCI=0x08 (FSC=256), TA(1) and TC(1) present,
+    // TA(1) = 0x80: different divisors not supported, DR = 1, DS = 1
+    // TB(1) = not present. Defaults: FWI = 4 (FWT = 256 * 16 * 2^4 * 1/fc = 4833us), SFGI = 0 (SFG = 256 * 16 * 2^0 * 1/fc = 302us)
+    // TC(1) = 0x02: CID supported, NAD not supported
+    AddCrc14A(rRATS, sizeof(rRATS) - 2);
+
+#define TAG_RESPONSE_COUNT 9
+    static tag_response_info_t responses_init[TAG_RESPONSE_COUNT] = {
+        { .response = rATQA,      .response_n = sizeof(rATQA)      },  // Answer to request - respond with card type
+        { .response = rUIDc1,     .response_n = sizeof(rUIDc1)     },  // Anticollision cascade1 - respond with uid
+        { .response = rUIDc2,     .response_n = sizeof(rUIDc2)     },  // Anticollision cascade2 - respond with 2nd half of uid if asked
+        { .response = rSAKc1,     .response_n = sizeof(rSAKc1)     },  // Acknowledge select - cascade 1
+        { .response = rSAKc2,     .response_n = sizeof(rSAKc2)     },  // Acknowledge select - cascade 2
+        { .response = rRATS,      .response_n = sizeof(rRATS)      },  // dummy ATS (pseudo-ATR), answer to RATS
+        { .response = rPACK,      .response_n = sizeof(rPACK)      },  // EV1/NTAG PACK response
+        { .response = rVERSION,   .response_n = sizeof(rVERSION)   },  // EV1/NTAG GET_VERSION response
+        { .response = rSIGN,      .response_n = sizeof(rSIGN)      }   // EV1/NTAG READ_SIG response
+    };
+
+    // "precompile" responses. There are 9 predefined responses with a total of 72 bytes data to transmit.
+    // Coded responses need one byte per bit to transfer (data, parity, start, stop, correction)
+    // 72 * 8 data bits, 72 * 1 parity bits, 9 start bits, 9 stop bits, 9 correction bits -- 675 bytes buffer
+#define ALLOCATED_TAG_MODULATION_BUFFER_SIZE 675
+
+    uint8_t *free_buffer = BigBuf_malloc(ALLOCATED_TAG_MODULATION_BUFFER_SIZE);
+    // modulation buffer pointer and current buffer free space size
+    uint8_t *free_buffer_pointer = free_buffer;
+    size_t free_buffer_size = ALLOCATED_TAG_MODULATION_BUFFER_SIZE;
+
+    // Prepare the responses of the anticollision phase
+    // there will be not enough time to do this at the moment the reader sends it REQA
+    for (size_t i = 0; i < TAG_RESPONSE_COUNT; i++) {
+        if (prepare_allocated_tag_modulation(&responses_init[i], &free_buffer_pointer, &free_buffer_size) == false) {
+            BigBuf_free_keep_EM();
+            if (MF_DBGLEVEL >= MF_DBG_ERROR)    Dbprintf("Not enough modulation buffer size, exit after %d elements", i);
+            return false;
+        }
+    }
+
+    *responses = responses_init;
+
+    // indices into responses array:
+#define ATQA      0
+#define UIDC1     1
+#define UIDC2     2
+#define SAKC1     3
+#define SAKC2     4
+#define RATS      5
+#define PACK      6
+#define VERSION   7
+#define SIGNATURE 8
+
+    return true;
+}
+
 //-----------------------------------------------------------------------------
 // Main loop of simulated tag: receive commands from reader, decide what
 // response to send, and send it.
@@ -826,15 +1031,12 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
 
 #define ATTACK_KEY_COUNT 8 // keep same as define in cmdhfmf.c -> readerAttack()
 
-    uint8_t sak = 0;
+    tag_response_info_t *responses;
     uint32_t cuid = 0;
     uint32_t nonce = 0;
-
-    // PACK response to PWD AUTH for EV1/NTAG
-    uint8_t response8[4] = {0, 0, 0, 0};
-
-    // The first response contains the ATQA (note: bytes are transmitted in reverse order).
-    uint8_t response1[] = {0, 0};
+    uint32_t counters[3] = { 0x00, 0x00, 0x00 };
+    uint8_t tearings[3] = { 0xbd, 0xbd, 0xbd };
+    uint8_t pages = 0;
 
     // Here, we collect CUID, block1, keytype1, NT1, NR1, AR1, CUID, block2, keytyp2, NT2, NR2, AR2
     // it should also collect block, keytype.
@@ -846,159 +1048,9 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
     memset(ar_nr_nonces, 0x00, sizeof(ar_nr_nonces));
     uint8_t    moebius_count = 0;
 
-    // some first pages of UL/NTAG dump is special data
-    mfu_dump_t *mfu_header =  tagType == 2 || tagType == 7 ? (mfu_dump_t *) BigBuf_get_EM_addr() : NULL;
-
-    switch (tagType) {
-        case 1: { // MIFARE Classic 1k
-            response1[0] = 0x04;
-            sak = 0x08;
-        }
-        break;
-        case 2: { // MIFARE Ultralight
-            response1[0] = 0x44;
-            sak = 0x00;
-        }
-        break;
-        case 3: { // MIFARE DESFire
-            response1[0] = 0x04;
-            response1[1] = 0x03;
-            sak = 0x20;
-        }
-        break;
-        case 4: { // ISO/IEC 14443-4 - javacard (JCOP)
-            response1[0] = 0x04;
-            sak = 0x28;
-        }
-        break;
-        case 5: { // MIFARE TNP3XXX
-            response1[0] = 0x01;
-            response1[1] = 0x0f;
-            sak = 0x01;
-        }
-        break;
-        case 6: { // MIFARE Mini 320b
-            response1[0] = 0x44;
-            sak = 0x09;
-        }
-        break;
-        case 7: { // NTAG
-            response1[0] = 0x44;
-            sak = 0x00;
-            // PACK, from last page of dump
-            emlGetMemBt(response8, MFU_DUMP_PREFIX_LENGTH + mfu_header->pages * 4, 2);
-            compute_crc(CRC_14443_A, response8, 2, &response8[2], &response8[3]);
-            // uid not supplied then get from emulator memory
-            if (data[0] == 0) {
-                uint16_t start = MFU_DUMP_PREFIX_LENGTH;
-                uint8_t emdata[8];
-                emlGetMemBt(emdata, start, sizeof(emdata));
-                memcpy(data, emdata, 3); // uid bytes 0-2
-                memcpy(data + 3, emdata + 4, 4); // uid bytes 3-7
-                flags |= FLAG_7B_UID_IN_DATA;
-            }
-        }
-        break;
-        case 8: { // MIFARE Classic 4k
-            response1[0] = 0x02;
-            sak = 0x18;
-        }
-        break;
-        case 9 : { // FM11RF005SH (Shanghai Metro)
-            response1[0] = 0x03;
-            response1[1] = 0x00;
-            sak = 0x0A;
-        }
-        break;
-        default: {
-            Dbprintf("Error: unkown tagtype (%d)", tagType);
-            return;
-        }
-        break;
-    }
-
-    // The second response contains the (mandatory) first 24 bits of the UID
-    uint8_t response2[5] = {0x00};
-
-    // For UID size 7,
-    uint8_t response2a[5] = {0x00};
-
-    if ((flags & FLAG_7B_UID_IN_DATA) == FLAG_7B_UID_IN_DATA) {
-        response2[0] = 0x88;  // Cascade Tag marker
-        response2[1] = data[0];
-        response2[2] = data[1];
-        response2[3] = data[2];
-
-        response2a[0] = data[3];
-        response2a[1] = data[4];
-        response2a[2] = data[5];
-        response2a[3] = data[6]; //??
-        response2a[4] = response2a[0] ^ response2a[1] ^ response2a[2] ^ response2a[3];
-
-        // Configure the ATQA and SAK accordingly
-        response1[0] |= 0x40;
-        sak |= 0x04;
-
-        cuid = bytes_to_num(data + 3, 4);
-    } else {
-        memcpy(response2, data, 4);
-        // Configure the ATQA and SAK accordingly
-        response1[0] &= 0xBF;
-        sak &= 0xFB;
-        cuid = bytes_to_num(data, 4);
-    }
-
-    // Calculate the BitCountCheck (BCC) for the first 4 bytes of the UID.
-    response2[4] = response2[0] ^ response2[1] ^ response2[2] ^ response2[3];
-
-    // Prepare the mandatory SAK (for 4 and 7 byte UID)
-    uint8_t response3[3]  = {sak, 0x00, 0x00};
-    compute_crc(CRC_14443_A, response3, 1, &response3[1], &response3[2]);
-
-    // Prepare the optional second SAK (for 7 byte UID), drop the cascade bit
-    uint8_t response3a[3]  = {0x00};
-    response3a[0] = sak & 0xFB;
-    compute_crc(CRC_14443_A, response3a, 1, &response3a[1], &response3a[2]);
-
-    // Tag NONCE.
-    uint8_t response5[4];
-
-    uint8_t response6[] = { 0x04, 0x58, 0x80, 0x02, 0x00, 0x00 };     // dummy ATS (pseudo-ATR), answer to RATS:
-
-    // Format byte = 0x58: FSCI=0x08 (FSC=256), TA(1) and TC(1) present,
-    // TA(1) = 0x80: different divisors not supported, DR = 1, DS = 1
-    // TB(1) = not present. Defaults: FWI = 4 (FWT = 256 * 16 * 2^4 * 1/fc = 4833us), SFGI = 0 (SFG = 256 * 16 * 2^0 * 1/fc = 302us)
-    // TC(1) = 0x02: CID supported, NAD not supported
-    compute_crc(CRC_14443_A, response6, 4, &response6[4], &response6[5]);
-
-    // Prepare GET_VERSION (different for UL EV-1 / NTAG)
-    // uint8_t response7_EV1[] = {0x00, 0x04, 0x03, 0x01, 0x01, 0x00, 0x0b, 0x03, 0xfd, 0xf7};  //EV1 48bytes VERSION.
-    // uint8_t response7_NTAG[] = {0x00, 0x04, 0x04, 0x02, 0x01, 0x00, 0x11, 0x03, 0x01, 0x9e}; //NTAG 215
-    // Prepare CHK_TEARING
-    // uint8_t response9[] =  {0xBD,0x90,0x3f};
-
-#define TAG_RESPONSE_COUNT 8
-    tag_response_info_t responses[TAG_RESPONSE_COUNT] = {
-        { .response = response1,  .response_n = sizeof(response1)  },  // Answer to request - respond with card type
-        { .response = response2,  .response_n = sizeof(response2)  },  // Anticollision cascade1 - respond with uid
-        { .response = response2a, .response_n = sizeof(response2a) },  // Anticollision cascade2 - respond with 2nd half of uid if asked
-        { .response = response3,  .response_n = sizeof(response3)  },  // Acknowledge select - cascade 1
-        { .response = response3a, .response_n = sizeof(response3a) },  // Acknowledge select - cascade 2
-        { .response = response5,  .response_n = sizeof(response5)  },  // Authentication answer (random nonce)
-        { .response = response6,  .response_n = sizeof(response6)  },  // dummy ATS (pseudo-ATR), answer to RATS
-
-        { .response = response8,   .response_n = sizeof(response8) }  // EV1/NTAG PACK response
-    };
-    // { .response = response7_NTAG, .response_n = sizeof(response7_NTAG)}, // EV1/NTAG GET_VERSION response
-    // { .response = response9,      .response_n = sizeof(response9)     }  // EV1/NTAG CHK_TEAR response
-
-    // "precompile" responses. There are 8 predefined responses with a total of 32 bytes data to transmit.
-    // Coded responses need one byte per bit to transfer (data, parity, start, stop, correction)
-    // 32 * 8 data bits, 32 * 1 parity bits, 8 start bits, 8 stop bits, 8 correction bits
-    // -> need 312 bytes buffer
-    // 42 * 8 data bits, 42 * 1 parity bits, 9 start bits, 9 stop bits, 9 correction bits --405
-    // 45 * 8 data bits, 45 * 1 parity bits, 10 start bits, 10 stop bits, 10 correction bits --435
-#define ALLOCATED_TAG_MODULATION_BUFFER_SIZE 453
+    // command buffers
+    uint8_t receivedCmd[MAX_FRAME_SIZE] = { 0x00 };
+    uint8_t receivedCmdPar[MAX_PARITY_SIZE] = { 0x00 };
 
     // Allocate 512 bytes for the dynamic modulation, created when the reader queries for it
     // Such a response is less time critical, so we can prepare them on the fly
@@ -1016,22 +1068,10 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
     // free eventually allocated BigBuf memory but keep Emulator Memory
     BigBuf_free_keep_EM();
 
-    // allocate buffers:
-    uint8_t *receivedCmd = BigBuf_malloc(MAX_FRAME_SIZE);
-    uint8_t *receivedCmdPar = BigBuf_malloc(MAX_PARITY_SIZE);
-    uint8_t *free_buffer = BigBuf_malloc(ALLOCATED_TAG_MODULATION_BUFFER_SIZE);
-    // modulation buffer pointer and current buffer free space size
-    uint8_t *free_buffer_pointer = free_buffer;
-    size_t free_buffer_size = ALLOCATED_TAG_MODULATION_BUFFER_SIZE;
 
-    // Prepare the responses of the anticollision phase
-    // there will be not enough time to do this at the moment the reader sends it REQA
-    for (size_t i = 0; i < TAG_RESPONSE_COUNT; i++) {
-        if (prepare_allocated_tag_modulation(&responses[i], &free_buffer_pointer, &free_buffer_size) == false) {
-            BigBuf_free_keep_EM();
-            Dbprintf("Not enough modulation buffer size, exit after %d elements", i);
-            return;
-        }
+    if (SimulateIso14443aInit(tagType, flags, data, &responses, &cuid, counters, tearings, &pages) == false) {
+        BigBuf_free_keep_EM();
+        return;
     }
 
     // We need to listen to the high-frequency, peak-detected path.
@@ -1065,28 +1105,28 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
         // Okay, look at the command now.
         lastorder = order;
         if (receivedCmd[0] == ISO14443A_CMD_REQA) { // Received a REQUEST
-            p_response = &responses[0];
+            p_response = &responses[ATQA];
             order = 1;
         } else if (receivedCmd[0] == ISO14443A_CMD_WUPA) { // Received a WAKEUP
-            p_response = &responses[0];
+            p_response = &responses[ATQA];
             order = 6;
         } else if (receivedCmd[1] == 0x20 && receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT) {    // Received request for UID (cascade 1)
-            p_response = &responses[1];
+            p_response = &responses[UIDC1];
             order = 2;
         } else if (receivedCmd[1] == 0x20 && receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2) {  // Received request for UID (cascade 2)
-            p_response = &responses[2];
+            p_response = &responses[UIDC2];
             order = 20;
         } else if (receivedCmd[1] == 0x70 && receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT) {    // Received a SELECT (cascade 1)
-            p_response = &responses[3];
+            p_response = &responses[SAKC1];
             order = 3;
         } else if (receivedCmd[1] == 0x70 && receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2) {  // Received a SELECT (cascade 2)
-            p_response = &responses[4];
+            p_response = &responses[SAKC2];
             order = 30;
         } else if (receivedCmd[0] == ISO14443A_CMD_READBLOCK) {    // Received a (plain) READ
             uint8_t block = receivedCmd[1];
             // if Ultralight or NTAG (4 byte blocks)
             if (tagType == 7 || tagType == 2) {
-                if (block > mfu_header->pages) {
+                if (block > pages) {
                     // send NACK 0x0 == invalid argument
                     EmSend4bit(CARD_NACK_IV);
                 } else {
@@ -1103,7 +1143,7 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
                 // FM11005SH.   16blocks,  4bytes / block.
                 //   block0 = 2byte Customer ID (CID), 2byte Manufacture ID (MID)
                 //   block1 = 4byte UID.
-                p_response = &responses[1];
+                p_response = &responses[UIDC1];
             } else { // all other tags (16 byte block tags)
                 uint8_t emdata[MAX_MIFARE_FRAME_SIZE];
                 emlGetMemBt(emdata, block, 16);
@@ -1117,7 +1157,7 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
         } else if (receivedCmd[0] == MIFARE_ULEV1_FASTREAD) {    // Received a FAST READ (ranged read)
             uint8_t block1 = receivedCmd[1];
             uint8_t block2 = receivedCmd[2];
-            if (block1 > mfu_header->pages) {
+            if (block1 > pages) {
                 // send NACK 0x0 == invalid argument
                 EmSend4bit(CARD_NACK_IV);
             } else {
@@ -1136,7 +1176,7 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
                 bool isCrcCorrect = CheckCrc14A(receivedCmd, len);
                 if (isCrcCorrect) {
                     uint8_t block = receivedCmd[1];
-                    if (block > mfu_header->pages) {
+                    if (block > pages) {
                         // send NACK 0x0 == invalid argument
                         EmSend4bit(CARD_NACK_IV);
                     } else {
@@ -1155,12 +1195,7 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
             }
             p_response = NULL;
         } else if (receivedCmd[0] == MIFARE_ULEV1_READSIG && tagType == 7) {    // Received a READ SIGNATURE --
-            // first blocks of emu are header
-            uint8_t emdata[34];
-            memcpy(emdata, mfu_header->signature, 32);
-            AddCrc14A(emdata, 32);
-            EmSendCmd(emdata, sizeof(emdata));
-            p_response = NULL;
+            p_response = &responses[SIGNATURE];
         } else if (receivedCmd[0] == MIFARE_ULEV1_READ_CNT && tagType == 7) {    // Received a READ COUNTER --
             uint8_t index = receivedCmd[1];
             if (index > 2) {
@@ -1168,7 +1203,7 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
                 EmSend4bit(0x00);
             } else {
                 uint8_t cmd[] =  {0x00, 0x00, 0x00, 0x14, 0xa5};
-                memcpy(cmd, mfu_header->counter_tearing[index], 3);
+                htole24(counters[index], cmd);
                 AddCrc14A(cmd, sizeof(cmd) - 2);
                 EmSendCmd(cmd, sizeof(cmd));
             }
@@ -1179,13 +1214,13 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
                 // send NACK 0x0 == invalid argument
                 EmSend4bit(0x00);
             } else {
-                uint32_t val = le24toh(receivedCmd + 2) + le24toh(mfu_header->counter_tearing[index]);
+                uint32_t val = le24toh(receivedCmd + 2) + counters[index];
                 // if new value + old value is bigger 24bits,  fail
                 if (val > 0xFFFFFF) {
                     // send NACK 0x4 == counter overflow
                     EmSend4bit(CARD_NACK_NA);
                 } else {
-                    htole24(val, mfu_header->counter_tearing[index]);
+                    counters[index] = val;
                     // send ACK
                     EmSend4bit(CARD_ACK);
                 }
@@ -1193,15 +1228,15 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
             p_response = NULL;
         } else if (receivedCmd[0] == MIFARE_ULEV1_CHECKTEAR && tagType == 7) {    // Received a CHECK_TEARING_EVENT --
             // first 12 blocks of emu are [getversion answer - check tearing - pack - 0x00 - signature]
-            uint8_t emdata[3];
             uint8_t index = receivedCmd[1];
             if (index > 2) {
                 // send NACK 0x0 == invalid argument
                 EmSend4bit(0x00);
             } else {
-                emdata[0] = mfu_header->counter_tearing[index][3];
-                AddCrc14A(emdata, sizeof(emdata) - 2);
-                EmSendCmd(emdata, sizeof(emdata));
+                uint8_t cmd[3];
+                cmd[0] = tearings[index];
+                AddCrc14A(cmd, sizeof(cmd) - 2);
+                EmSendCmd(cmd, sizeof(cmd));
             }
             p_response = NULL;
         } else if (receivedCmd[0] == ISO14443A_CMD_HALT) {    // Received a HALT
@@ -1209,26 +1244,18 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
             p_response = NULL;
         } else if (receivedCmd[0] == MIFARE_AUTH_KEYA || receivedCmd[0] == MIFARE_AUTH_KEYB) {    // Received an authentication request
             if (tagType == 7) {     // IF NTAG /EV1  0x60 == GET_VERSION, not a authentication request.
-                uint8_t emdata[10];
-                memcpy(emdata, mfu_header->version, 8);
-                AddCrc14A(emdata, sizeof(emdata) - 2);
-                EmSendCmd(emdata, sizeof(emdata));
-                p_response = NULL;
+                p_response = &responses[VERSION];
             } else {
-
                 cardAUTHKEY = receivedCmd[0] - 0x60;
                 cardAUTHSC = receivedCmd[1] / 4; // received block num
 
                 // incease nonce at AUTH requests. this is time consuming.
                 nonce = prng_successor(GetTickCount(), 32);
-                //num_to_bytes(nonce, 4, response5);
                 num_to_bytes(nonce, 4, dynamic_response_info.response);
                 dynamic_response_info.response_n = 4;
 
-                //prepare_tag_modulation(&responses[5], DYNAMIC_MODULATION_BUFFER_SIZE);
                 prepare_tag_modulation(&dynamic_response_info, DYNAMIC_MODULATION_BUFFER_SIZE);
                 p_response = &dynamic_response_info;
-                //p_response = &responses[5];
                 order = 7;
             }
         } else if (receivedCmd[0] == ISO14443A_CMD_RATS) {    // Received a RATS request
@@ -1236,7 +1263,7 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
                 EmSend4bit(CARD_NACK_NA);
                 p_response = NULL;
             } else {
-                p_response = &responses[6];
+                p_response = &responses[RATS];
                 order = 70;
             }
         } else if (order == 7 && len == 8) { // Received {nr] and {ar} (part of authentication)
@@ -1308,9 +1335,9 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
             if (tagType == 7) {
                 // PWD stored in dump now
                 uint8_t pwd[4];
-                emlGetMemBt(pwd, (mfu_header->pages - 1) * 4 + MFU_DUMP_PREFIX_LENGTH, sizeof(pwd));
+                emlGetMemBt(pwd, (pages - 1) * 4 + MFU_DUMP_PREFIX_LENGTH, sizeof(pwd));
                 if (memcmp(receivedCmd + 1, pwd, 4) == 0) {
-                    p_response = &responses[7]; // precompiled PACK
+                    p_response = &responses[PACK]; // precompiled PACK
                 } else {
                     EmSend4bit(CARD_NACK_NA);
                     uint32_t pwd = bytes_to_num(receivedCmd + 1, 4);

From 87eee0cf5c963921b904368727c09e48e1a1dd2d Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 26 Apr 2019 13:07:45 +0200
Subject: [PATCH 1440/1938] text

---
 armsrc/appmain.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 066f3a5d7..633d21a07 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -365,8 +365,8 @@ void SendVersion(void) {
 // measure the USB Speed by sending SpeedTestBufferSize bytes to client and measuring the elapsed time.
 // Note: this mimics GetFromBigbuf(), i.e. we have the overhead of the UsbCommand structure included.
 void printUSBSpeed(void) {
-    DbpStringEx(FLAG_LOG|FLAG_ANSI, _BLUE_("USB Speed"));
-    Dbprintf("  Sending USB packets to client...");
+    DbpStringEx(FLAG_LOG|FLAG_ANSI, _BLUE_("Transfer Speed"));
+    Dbprintf("  Sending packets to client...");
 
 #define USB_SPEED_TEST_MIN_TIME 1500 // in milliseconds
     uint8_t *test_data = BigBuf_get_addr();
@@ -386,7 +386,7 @@ void printUSBSpeed(void) {
 
     Dbprintf("  Time elapsed............%dms", end_time - start_time);
     Dbprintf("  Bytes transferred.......%d", bytes_transferred);
-    Dbprintf("  USB Transfer Speed PM3 -> Client = %d Bytes/s", 1000 * bytes_transferred / (end_time - start_time));
+    Dbprintf("  Transfer Speed PM3 -> Client = " _YELLOW_("%d") " bytes/s", 1000 * bytes_transferred / (end_time - start_time));
 }
 
 /**

From 01b31c742b3c204fde0ef6f7caf7c1049097bb84 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 26 Apr 2019 13:53:11 +0200
Subject: [PATCH 1441/1938] Use block_after_ACK in flashmem too

---
 client/cmdflashmem.c | 6 +++++-
 client/comms.c       | 4 ++--
 client/comms.h       | 1 +
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/client/cmdflashmem.c b/client/cmdflashmem.c
index fd8cf0554..cbf336773 100644
--- a/client/cmdflashmem.c
+++ b/client/cmdflashmem.c
@@ -280,11 +280,13 @@ static int CmdFlashMemLoad(const char *Cmd) {
     //Send to device
     uint32_t bytes_sent = 0;
     uint32_t bytes_remaining = datalen;
-
     while (bytes_remaining > 0) {
         uint32_t bytes_in_packet = MIN(FLASH_MEM_BLOCK_SIZE, bytes_remaining);
 
         clearCommandBuffer();
+        if (bytes_remaining > bytes_in_packet)
+            // fast push mode
+            conn.block_after_ACK = true;
         SendCommandOLD(CMD_FLASHMEM_WRITE, start_index + bytes_sent, bytes_in_packet, 0, data + bytes_sent, bytes_in_packet);
 
         bytes_remaining -= bytes_in_packet;
@@ -293,9 +295,11 @@ static int CmdFlashMemLoad(const char *Cmd) {
         PacketResponseNG resp;
         if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
             PrintAndLogEx(WARNING, "timeout while waiting for reply.");
+            conn.block_after_ACK = false;
             free(data);
             return PM3_ETIMEOUT;
         }
+        conn.block_after_ACK = false;
 
         uint8_t isok  = resp.oldarg[0] & 0xFF;
         if (!isok) {
diff --git a/client/comms.c b/client/comms.c
index 4501326c1..4ae05fc82 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -24,7 +24,7 @@ bool send_with_crc_on_fpc = true;
 // "Session" flag, to tell via which interface next msgs should be sent: USB or FPC USART
 bool send_via_fpc = false;
 
-static communication_arg_t conn;
+communication_arg_t conn;
 
 static pthread_t USB_communication_thread;
 //static pthread_t FPC_communication_thread;
@@ -476,7 +476,7 @@ __attribute__((force_align_arg_pointer))
 
         if (connection->block_after_ACK) {
             // if we just received an ACK, wait here until a new command is to be transmitted
-            // This is only working on OLD frames, and only used by flasher
+            // This is only working on OLD frames, and only used by flasher and flashmem
             if (ACK_received) {
                 while (!txBuffer_pending) {
                     pthread_cond_wait(&txBufferSig, &txBufferMutex);
diff --git a/client/comms.h b/client/comms.h
index c70a67c51..b3be16b1a 100644
--- a/client/comms.h
+++ b/client/comms.h
@@ -49,6 +49,7 @@ extern bool send_with_crc_on_usb;
 extern bool send_with_crc_on_fpc;
 // "Session" flag, to tell via which interface next msgs are sent: USB or FPC USART
 extern bool send_via_fpc;
+extern communication_arg_t conn;
 
 void SetOffline(bool value);
 bool IsOffline(void);

From a1bb2ec10685e9c887e2e25c651f29660da9d19b Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 26 Apr 2019 22:17:26 +0200
Subject: [PATCH 1442/1938] Trying original SPI mode for 24MHz flash mem

---
 armsrc/flashmem.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/armsrc/flashmem.c b/armsrc/flashmem.c
index e423805a2..331696dec 100644
--- a/armsrc/flashmem.c
+++ b/armsrc/flashmem.c
@@ -80,10 +80,14 @@ void FlashSetup(uint32_t baudrate) {
 
     uint8_t csaat = 1;
     uint32_t dlybct = 0;
+    uint8_t ncpha = 1;
+    uint8_t cpol = 0;
     if (baudrate > FLASH_MINFAST) {
         baudrate = FLASH_FASTBAUD;
         //csaat = 0;
         dlybct = 1500;
+        ncpha = 0;
+        cpol = 0;
     }
 
     AT91C_BASE_SPI->SPI_CSR[2] =
@@ -119,9 +123,10 @@ void FlashSetup(uint32_t baudrate) {
             1    0    1    1       clock normally low    read on falling edge
             2    1    0    0       clock normally high   read on falling edge
             3    1    1    1       clock normally high   read on rising edge
+            Update: for 24MHz, writing is more stable with ncpha=1, else bitflips occur.
         */
-        (0 << 1)             |  // Clock Phase data captured on leading edge, changes on following edge
-        (0 << 0);               // Clock Polarity inactive state is logic 0
+        (ncpha << 1)             |  // Clock Phase data captured on leading edge, changes on following edge
+        (cpol << 0);               // Clock Polarity inactive state is logic 0
 
     // read first, empty buffer
     if (AT91C_BASE_SPI->SPI_RDR == 0) {};

From 3b6a249646d64446b24d383da8139d7ae03e47fd Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 26 Apr 2019 23:16:24 +0200
Subject: [PATCH 1443/1938] move global connection flags to cnn struct

---
 client/comms.c           | 19 ++++++++++---------
 client/comms.h           | 10 +++++-----
 doc/new_frame_format.txt |  2 +-
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/client/comms.c b/client/comms.c
index 4ae05fc82..7c349c908 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -18,11 +18,6 @@ static char *serial_port_name = NULL;
 
 // If TRUE, then there is no active connection to the PM3, and we will drop commands sent.
 static bool offline;
-// Flags to tell where to add CRC on sent replies
-bool send_with_crc_on_usb = false;
-bool send_with_crc_on_fpc = true;
-// "Session" flag, to tell via which interface next msgs should be sent: USB or FPC USART
-bool send_via_fpc = false;
 
 communication_arg_t conn;
 
@@ -142,7 +137,7 @@ static void SendCommandNG_internal(uint16_t cmd, uint8_t *data, size_t len, bool
     txBufferNG.pre.cmd = cmd;
     memcpy(&txBufferNG.data, data, len);
 
-    if ((send_via_fpc && send_with_crc_on_fpc) || ((!send_via_fpc) && send_with_crc_on_usb)) {
+    if ((conn.send_via_fpc && conn.send_with_crc_on_fpc) || ((!conn.send_via_fpc) && conn.send_with_crc_on_usb)) {
         uint8_t first, second;
         compute_crc(CRC_14443_A, (uint8_t *)&txBufferNG, sizeof(PacketCommandNGPreamble) + len, &first, &second);
         tx_post->crc = (first << 8) + second;
@@ -553,6 +548,12 @@ bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode,
         serial_port_name = portname;
         conn.run = true;
         conn.block_after_ACK = flash_mode;
+        // Flags to tell where to add CRC on sent replies
+        conn.send_with_crc_on_usb = false;
+        conn.send_with_crc_on_fpc = true;
+        // "Session" flag, to tell via which interface next msgs should be sent: USB or FPC USART
+        conn.send_via_fpc = false;
+
         pthread_create(&USB_communication_thread, NULL, &uart_communication, &conn);
         //pthread_create(&FPC_communication_thread, NULL, &uart_communication, &conn);
         fflush(stdout);
@@ -568,8 +569,8 @@ int TestProxmark(void) {
     PacketResponseNG resp;
     SendCommandOLD(CMD_PING, 0, 0, 0, NULL, 0);
     if (WaitForResponseTimeout(CMD_ACK, &resp, 5000)) {
-        send_via_fpc = resp.oldarg[0] == 1;
-        PrintAndLogEx(INFO, "Communicating with PM3 over %s.", send_via_fpc ? "FPC" : "USB");
+        conn.send_via_fpc = resp.oldarg[0] == 1;
+        PrintAndLogEx(INFO, "Communicating with PM3 over %s.", conn.send_via_fpc ? "FPC" : "USB");
         return 1;
     } else {
         return 0;
@@ -617,7 +618,7 @@ void CloseProxmark(void) {
 //           ~ = 12000000 / USART_BAUD_RATE
 // Let's take 2x (maybe we need more for BT link?)
 static size_t communication_delay(void) {
-    if (send_via_fpc)  // needed also for Windows USB USART??
+    if (conn.send_via_fpc)  // needed also for Windows USB USART??
         return 2 * (12000000 / uart_speed);
     return 100;
 }
diff --git a/client/comms.h b/client/comms.h
index b3be16b1a..8ddbcd271 100644
--- a/client/comms.h
+++ b/client/comms.h
@@ -42,13 +42,13 @@ typedef enum {
 typedef struct {
     bool run; // If TRUE, continue running the uart_communication thread
     bool block_after_ACK; // if true, block after receiving an ACK package
+    // Flags to tell where to add CRC on sent replies
+    bool send_with_crc_on_usb;
+    bool send_with_crc_on_fpc;
+    // "Session" flag, to tell via which interface next msgs are sent: USB or FPC USART
+    bool send_via_fpc;
 } communication_arg_t;
 
-// Flags to tell where to add CRC on sent replies
-extern bool send_with_crc_on_usb;
-extern bool send_with_crc_on_fpc;
-// "Session" flag, to tell via which interface next msgs are sent: USB or FPC USART
-extern bool send_via_fpc;
 extern communication_arg_t conn;
 
 void SetOffline(bool value);
diff --git a/doc/new_frame_format.txt b/doc/new_frame_format.txt
index c42591f62..e6e3e0f69 100644
--- a/doc/new_frame_format.txt
+++ b/doc/new_frame_format.txt
@@ -293,7 +293,7 @@ Empirically measured delay (FTDI cable) with "hw pingng 512" :
   9600 -> 1100..1150ms
 (client/comms.c)
 static size_t communication_delay(void) {
-    if (send_via_fpc)  // needed also for Windows USB USART??
+    if (conn.send_via_fpc)  // needed also for Windows USB USART??
         return 2 * (12000000 / uart_speed);
     return 100;
 }

From 4a576efc44e503a76aed659824d016d534f51c59 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 26 Apr 2019 23:26:51 +0200
Subject: [PATCH 1444/1938] TestProxmark only if OpenProxmark returned pm3
 present

---
 client/proxmark3.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/proxmark3.c b/client/proxmark3.c
index aef3c5979..a16a6a7a8 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -467,7 +467,7 @@ int main(int argc, char *argv[]) {
     if (port != NULL)
         usb_present = OpenProxmark(port, waitCOMPort, 20, false, speed);
 
-    if (TestProxmark() == 0)
+    if (usb_present && (TestProxmark() == 0))
         usb_present = false;
     if (!usb_present)
         PrintAndLogEx(INFO, "Running in " _YELLOW_("OFFLINE") "mode. Check \"%s -h\" if it's not what you want.\n", exec_name);

From 897632a7178bf641de0baf49fe5c0693ac4e5613 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 26 Apr 2019 23:30:03 +0200
Subject: [PATCH 1445/1938] rename usb_present

---
 client/proxgui.cpp |  8 ++++----
 client/proxgui.h   |  2 +-
 client/proxguiqt.h |  2 +-
 client/proxmark3.c | 28 ++++++++++++++--------------
 client/proxmark3.h |  2 +-
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/client/proxgui.cpp b/client/proxgui.cpp
index 9953c07ae..bc382d1c2 100644
--- a/client/proxgui.cpp
+++ b/client/proxgui.cpp
@@ -15,14 +15,14 @@
 static ProxGuiQT *gui = NULL;
 static WorkerThread *main_loop_thread = NULL;
 
-WorkerThread::WorkerThread(char *script_cmds_file, char *script_cmd, bool usb_present) : script_cmds_file(script_cmds_file), script_cmd(script_cmd), usb_present(usb_present) {
+WorkerThread::WorkerThread(char *script_cmds_file, char *script_cmd, bool pm3_present) : script_cmds_file(script_cmds_file), script_cmd(script_cmd), pm3_present(pm3_present) {
 }
 
 WorkerThread::~WorkerThread() {
 }
 
 void WorkerThread::run() {
-    main_loop(script_cmds_file, script_cmd, usb_present);
+    main_loop(script_cmds_file, script_cmd, pm3_present);
 }
 
 extern "C" void ShowGraphWindow(void) {
@@ -53,12 +53,12 @@ extern "C" void MainGraphics(void) {
     gui->MainLoop();
 }
 
-extern "C" void InitGraphics(int argc, char **argv, char *script_cmds_file, char *script_cmd, bool usb_present) {
+extern "C" void InitGraphics(int argc, char **argv, char *script_cmds_file, char *script_cmd, bool pm3_present) {
 #ifdef Q_WS_X11
     if (getenv("DISPLAY") == NULL)
         return;
 #endif
-    main_loop_thread = new WorkerThread(script_cmds_file, script_cmd, usb_present);
+    main_loop_thread = new WorkerThread(script_cmds_file, script_cmd, pm3_present);
     gui = new ProxGuiQT(argc, argv, main_loop_thread);
 }
 
diff --git a/client/proxgui.h b/client/proxgui.h
index 2c573f023..40fb1ce2d 100644
--- a/client/proxgui.h
+++ b/client/proxgui.h
@@ -22,7 +22,7 @@ void ShowGraphWindow(void);
 void HideGraphWindow(void);
 void RepaintGraphWindow(void);
 void MainGraphics(void);
-void InitGraphics(int argc, char **argv, char *script_cmds_file, char *script_cmd, bool usb_present);
+void InitGraphics(int argc, char **argv, char *script_cmds_file, char *script_cmd, bool pm3_present);
 void ExitGraphics(void);
 #ifndef MAX_GRAPH_TRACE_LEN
 #define MAX_GRAPH_TRACE_LEN (40000 * 8)
diff --git a/client/proxguiqt.h b/client/proxguiqt.h
index 6d92c22e7..2685aecde 100644
--- a/client/proxguiqt.h
+++ b/client/proxguiqt.h
@@ -99,7 +99,7 @@ class WorkerThread : public QThread {
   private:
     char *script_cmds_file = NULL;
     char *script_cmd = NULL;
-    bool usb_present;
+    bool pm3_present;
 };
 
 class ProxGuiQT : public QObject {
diff --git a/client/proxmark3.c b/client/proxmark3.c
index a16a6a7a8..0ada54e78 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -58,7 +58,7 @@ void
 __attribute__((force_align_arg_pointer))
 #endif
 #endif
-main_loop(char *script_cmds_file, char *script_cmd, bool usb_present) {
+main_loop(char *script_cmds_file, char *script_cmd, bool pm3_present) {
 
     char *cmd = NULL;
     bool execCommand = (script_cmd != NULL);
@@ -68,7 +68,7 @@ main_loop(char *script_cmds_file, char *script_cmd, bool usb_present) {
 
     PrintAndLogEx(DEBUG, "ISATTY/STDIN_FILENO == %s\n", (stdinOnPipe) ? "true" : "false");
 
-    if (usb_present) {
+    if (pm3_present) {
         SetOffline(false);
         // cache Version information now:
         if (execCommand || script_cmds_file || stdinOnPipe)
@@ -98,10 +98,10 @@ main_loop(char *script_cmds_file, char *script_cmd, bool usb_present) {
         if ( IsOffline() ) {
 
             // sets the global variable, SP and offline)
-            usb_present = hookUpPM3();
+            pm3_present = hookUpPM3();
 
             // usb and the reader_thread is NULL,  create a new reader thread.
-            if (usb_present && !IsOffline() ) {
+            if (pm3_present && !IsOffline() ) {
                 rarg.run = 1;
                 pthread_create(&reader_thread, NULL, &uart_receiver, &rarg);
                 // cache Version information now:
@@ -275,7 +275,7 @@ static void show_help(bool showFullHelp, char *exec_name) {
 int main(int argc, char *argv[]) {
     srand(time(0));
 
-    bool usb_present = false;
+    bool pm3_present = false;
     bool waitCOMPort = false;
     bool addLuaExec = false;
     char *script_cmds_file = NULL;
@@ -465,35 +465,35 @@ int main(int argc, char *argv[]) {
 
     // try to open USB connection to Proxmark
     if (port != NULL)
-        usb_present = OpenProxmark(port, waitCOMPort, 20, false, speed);
+        pm3_present = OpenProxmark(port, waitCOMPort, 20, false, speed);
 
-    if (usb_present && (TestProxmark() == 0))
-        usb_present = false;
-    if (!usb_present)
+    if (pm3_present && (TestProxmark() == 0))
+        pm3_present = false;
+    if (!pm3_present)
         PrintAndLogEx(INFO, "Running in " _YELLOW_("OFFLINE") "mode. Check \"%s -h\" if it's not what you want.\n", exec_name);
 
 #ifdef HAVE_GUI
 
 #  ifdef _WIN32
-    InitGraphics(argc, argv, script_cmds_file, script_cmd, usb_present);
+    InitGraphics(argc, argv, script_cmds_file, script_cmd, pm3_present);
     MainGraphics();
 #  else
     // for *nix distro's,  check enviroment variable to verify a display
     char *display = getenv("DISPLAY");
     if (display && strlen(display) > 1) {
-        InitGraphics(argc, argv, script_cmds_file, script_cmd, usb_present);
+        InitGraphics(argc, argv, script_cmds_file, script_cmd, pm3_present);
         MainGraphics();
     } else {
-        main_loop(script_cmds_file, script_cmd, usb_present);
+        main_loop(script_cmds_file, script_cmd, pm3_present);
     }
 #  endif
 
 #else
-    main_loop(script_cmds_file, script_cmd, usb_present);
+    main_loop(script_cmds_file, script_cmd, pm3_present);
 #endif
 
     // Clean up the port
-    if (usb_present) {
+    if (pm3_present) {
         CloseProxmark();
     }
 
diff --git a/client/proxmark3.h b/client/proxmark3.h
index 52fe27385..5d5a49c9a 100644
--- a/client/proxmark3.h
+++ b/client/proxmark3.h
@@ -23,7 +23,7 @@ extern "C" {
 
 const char *get_my_executable_path(void);
 const char *get_my_executable_directory(void);
-void main_loop(char *script_cmds_file, char *script_cmd, bool usb_present);
+void main_loop(char *script_cmds_file, char *script_cmd, bool pm3_present);
 
 #ifdef __cplusplus
 }

From a60b2f24a8dfc4704a66648bc067333e25adc84d Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 26 Apr 2019 23:51:43 +0200
Subject: [PATCH 1446/1938] update.sh flash boot only if option -b

---
 update.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/update.sh b/update.sh
index fe5f0dd95..aa58b693e 100755
--- a/update.sh
+++ b/update.sh
@@ -1,5 +1,10 @@
 #!/bin/bash
 
+FULLIMAGE="armsrc/obj/fullimage.elf"
+if [ "$1" == "-b" ]; then
+  FLASHBOOT="-b bootrom/obj/bootrom.elf"
+fi
+
 function wait4proxmark_Linux {
     echo >&2 "Waiting for Proxmark to appear..."
     while [ ! -c /dev/ttyACM? -a ! -L /dev/pm3-? ]; do
@@ -26,7 +31,7 @@ function wait4proxmark_macOS {
 # Detect OS and flash bootroom & system image
 
 if [[ $(uname | awk '{print toupper($0)}') == "LINUX" ]]; then
-    client/flasher $(wait4proxmark_Linux) -b bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf
+    client/flasher $(wait4proxmark_Linux) $FLASHBOOT $FULLIMAGE
 elif [[ $(uname | awk '{print toupper($0)}') == "DARWIN" ]]; then
-    client/flasher $(wait4proxmark_macOS) -b bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf
+    client/flasher $(wait4proxmark_macOS) $FLASHBOOT $FULLIMAGE
 fi

From d3cc0bb71c5f4f270df78116bfedaaab10d5fc03 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 27 Apr 2019 00:30:44 +0200
Subject: [PATCH 1447/1938] Add support for: proxmark3 -c "hw ping;hw
 version;hw ping"

---
 client/proxmark3.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/client/proxmark3.c b/client/proxmark3.c
index 0ada54e78..f1cf3a056 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -62,6 +62,9 @@ main_loop(char *script_cmds_file, char *script_cmd, bool pm3_present) {
 
     char *cmd = NULL;
     bool execCommand = (script_cmd != NULL);
+    uint16_t script_cmd_len = strlen(script_cmd);
+    if (execCommand)
+        strcreplace(script_cmd, script_cmd_len, ';', '\0');
     bool stdinOnPipe = !isatty(STDIN_FILENO);
     FILE *sf = NULL;
     char script_cmd_buf[256] = {0x00};  // iceman, needs lua script the same file_path_buffer as the rest
@@ -134,11 +137,13 @@ main_loop(char *script_cmds_file, char *script_cmd, bool pm3_present) {
         } else {
             // If there is a script command
             if (execCommand) {
-
                 if ((cmd = strmcopy(script_cmd)) != NULL)
                     PrintAndLogEx(NORMAL, PROXPROMPT"%s", cmd);
-
-                execCommand = false;
+                uint16_t len = strlen(script_cmd) + 1;
+                script_cmd += len;
+                if (script_cmd_len == len - 1)
+                    execCommand = false;
+                script_cmd_len -= len;
             } else {
                 // exit after exec command
                 if (script_cmd)

From 200290bc567751f5af954870bdbec20dc26a8e01 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 27 Apr 2019 00:33:14 +0200
Subject: [PATCH 1448/1938] doc multiple commands with -c

---
 client/proxmark3.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/proxmark3.c b/client/proxmark3.c
index f1cf3a056..010fd6ff0 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -259,7 +259,7 @@ static void show_help(bool showFullHelp, char *exec_name) {
         PrintAndLogEx(NORMAL, "      -b/--baud                           serial port speed");
         PrintAndLogEx(NORMAL, "      -w/--wait                           20sec waiting the serial port to appear in the OS");
         PrintAndLogEx(NORMAL, "      -f/--flush                          output will be flushed after every print");
-        PrintAndLogEx(NORMAL, "      -c/--command <command>              execute one proxmark3 command.");
+        PrintAndLogEx(NORMAL, "      -c/--command <command>              execute one proxmark3 command (or several separated by ';').");
         PrintAndLogEx(NORMAL, "      -l/--lua <lua script file>          execute lua script.");
         PrintAndLogEx(NORMAL, "      -s/--script-file <cmd_script_file>  script file with one proxmark3 command per line");
         PrintAndLogEx(NORMAL, "\nsamples:");

From 12937884f6a7a969e64b7c85f7a47829e97f2bc9 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 27 Apr 2019 01:15:52 +0200
Subject: [PATCH 1449/1938] move uart_speed to conn struct and display baudrate
 only for real UART

---
 client/comms.c    | 6 ++++--
 client/comms.h    | 2 ++
 uart/uart.h       | 2 +-
 uart/uart_posix.c | 8 ++------
 uart/uart_win32.c | 8 ++------
 5 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/client/comms.c b/client/comms.c
index 7c349c908..4bcc2b7b8 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -570,7 +570,9 @@ int TestProxmark(void) {
     SendCommandOLD(CMD_PING, 0, 0, 0, NULL, 0);
     if (WaitForResponseTimeout(CMD_ACK, &resp, 5000)) {
         conn.send_via_fpc = resp.oldarg[0] == 1;
-        PrintAndLogEx(INFO, "Communicating with PM3 over %s.", conn.send_via_fpc ? "FPC" : "USB");
+        PrintAndLogEx(INFO, "Communicating with PM3 over %s.", conn.send_via_fpc ? _YELLOW_("FPC") : _YELLOW_("USB-CDC"));
+        if (conn.send_via_fpc)
+            PrintAndLogEx(INFO, "UART Serial baudrate: " _YELLOW_("%u") "\n", conn.uart_speed);
         return 1;
     } else {
         return 0;
@@ -619,7 +621,7 @@ void CloseProxmark(void) {
 // Let's take 2x (maybe we need more for BT link?)
 static size_t communication_delay(void) {
     if (conn.send_via_fpc)  // needed also for Windows USB USART??
-        return 2 * (12000000 / uart_speed);
+        return 2 * (12000000 / conn.uart_speed);
     return 100;
 }
 
diff --git a/client/comms.h b/client/comms.h
index 8ddbcd271..7952ce18c 100644
--- a/client/comms.h
+++ b/client/comms.h
@@ -47,6 +47,8 @@ typedef struct {
     bool send_with_crc_on_fpc;
     // "Session" flag, to tell via which interface next msgs are sent: USB or FPC USART
     bool send_via_fpc;
+    // To memorise baudrate, we don't want to call get_speed systematically
+    uint32_t uart_speed;
 } communication_arg_t;
 
 extern communication_arg_t conn;
diff --git a/uart/uart.h b/uart/uart.h
index 4cbea26c8..f97327953 100644
--- a/uart/uart.h
+++ b/uart/uart.h
@@ -39,6 +39,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include "common.h"
+#include "comms.h"
 #include "util_posix.h" // msclock
 
 
@@ -103,7 +104,6 @@ bool uart_set_speed(serial_port sp, const uint32_t uiPortSpeed);
 /* Gets the current speed of the serial port, in baud.
  */
 uint32_t uart_get_speed(const serial_port sp);
-extern uint32_t uart_speed;
 
 #endif // _UART_H_
 
diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index e022c1ac0..30a9ba098 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -60,9 +60,6 @@
 # define SOL_TCP IPPROTO_TCP
 #endif
 
-// To memorise baudrate, we don't want to call get_speed systematically
-uint32_t uart_speed;
-
 typedef struct termios term_info;
 typedef struct {
     int fd;           // Serial port file descriptor
@@ -214,8 +211,7 @@ serial_port uart_open(const char *pcPortName, uint32_t speed) {
             }
         }
     }
-    uart_speed = uart_get_speed(sp);
-    printf("[=] UART Setting serial baudrate %u\n", uart_speed);
+    conn.uart_speed = uart_get_speed(sp);
     return sp;
 }
 
@@ -422,7 +418,7 @@ bool uart_set_speed(serial_port sp, const uint32_t uiPortSpeed) {
     cfsetospeed(&ti, stPortSpeed);
     bool result = tcsetattr(spu->fd, TCSANOW, &ti) != -1;
     if (result)
-        uart_speed = uiPortSpeed;
+        conn.uart_speed = uiPortSpeed;
     return result;
 }
 
diff --git a/uart/uart_win32.c b/uart/uart_win32.c
index 36a10731a..80d6b8a24 100644
--- a/uart/uart_win32.c
+++ b/uart/uart_win32.c
@@ -42,9 +42,6 @@
 #ifdef _WIN32
 #include <windows.h>
 
-// To memorise baudrate, we don't want to call get_speed systematically
-uint32_t uart_speed;
-
 typedef struct {
     HANDLE hPort;     // Serial port handle
     DCB dcb;          // Device control settings
@@ -124,8 +121,7 @@ serial_port uart_open(const char *pcPortName, uint32_t speed) {
             }
         }
     }
-    uart_speed = uart_get_speed(sp);
-    printf("[=] UART Setting serial baudrate %u\n", uart_speed);
+    conn.uart_speed = uart_get_speed(sp);
     return sp;
 }
 
@@ -157,7 +153,7 @@ bool uart_set_speed(serial_port sp, const uint32_t uiPortSpeed) {
     bool result = SetCommState(spw->hPort, &spw->dcb);
     PurgeComm(spw->hPort, PURGE_RXABORT | PURGE_RXCLEAR);
     if (result)
-        uart_speed = uiPortSpeed;
+        conn.uart_speed = uiPortSpeed;
     return result;
 }
 

From 7d1161d7d872736348a9450074d64b18100a1bbe Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 27 Apr 2019 01:16:43 +0200
Subject: [PATCH 1450/1938] First packet is in TestProxmark, not pm3_version

---
 client/cmdhw.c | 7 -------
 client/comms.c | 9 ++++++++-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/client/cmdhw.c b/client/cmdhw.c
index 1cbba480a..1c2c77a55 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -491,14 +491,7 @@ void pm3_version(bool verbose) {
     PacketResponseNG resp;
     clearCommandBuffer();
     SendCommandOLD(CMD_VERSION, 0, 0, 0, NULL, 0);
-#ifdef USART_SLOW_LINK
-    // 10s timeout for slow FPC, e.g. over BT
-    // as this is the very first command sent to the pm3
-    // that initiates the BT connection
-    if (WaitForResponseTimeout(CMD_ACK, &resp, 10000)) {
-#else
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {
-#endif
         PrintAndLogEx(NORMAL, "\n" _BLUE_(" [ Proxmark3 RFID instrument ]") "\n");
         char s[60] = {0};
 #if defined(WITH_FLASH) || defined(WITH_SMARTCARD) || defined(WITH_FPC)
diff --git a/client/comms.c b/client/comms.c
index 4bcc2b7b8..7762a532b 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -568,7 +568,14 @@ int TestProxmark(void) {
     clearCommandBuffer();
     PacketResponseNG resp;
     SendCommandOLD(CMD_PING, 0, 0, 0, NULL, 0);
-    if (WaitForResponseTimeout(CMD_ACK, &resp, 5000)) {
+#ifdef USART_SLOW_LINK
+    // 10s timeout for slow FPC, e.g. over BT
+    // as this is the very first command sent to the pm3
+    // that initiates the BT connection
+    if (WaitForResponseTimeout(CMD_ACK, &resp, 10000)) {
+#else
+    if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {
+#endif
         conn.send_via_fpc = resp.oldarg[0] == 1;
         PrintAndLogEx(INFO, "Communicating with PM3 over %s.", conn.send_via_fpc ? _YELLOW_("FPC") : _YELLOW_("USB-CDC"));
         if (conn.send_via_fpc)

From e2e0b704c537712604e26aa6655ef9b5d7f43d9d Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 27 Apr 2019 02:46:20 +0200
Subject: [PATCH 1451/1938] Several changes in the initial connection, see
 details:

* TestProxmark uses pingng
* New command CMD_CAPABILITIES to transmit capabilities from pm3 to host
* Use TestProxmark to retrieve capabilities with that new command
* CloseProxmark if TestProxmark fails
* Hide baudrate for USB and retrieve real baudrate from pm3 for BT
---
 armsrc/appmain.c   | 12 ++++++++++++
 client/comms.c     | 37 ++++++++++++++++++++++++++++---------
 client/comms.h     |  2 +-
 client/proxmark3.c |  5 ++++-
 include/usb_cmd.h  | 13 +++++++++----
 5 files changed, 54 insertions(+), 15 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 54f9d40b5..fc777cbdf 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -429,6 +429,16 @@ void SendStatus(void) {
     reply_old(CMD_ACK, 1, 0, 0, 0, 0);
 }
 
+void SendCapabilities(void) {
+    capabilities_t capabilities;
+    capabilities.via_fpc = reply_via_fpc;
+    if (reply_via_fpc)
+        capabilities.baudrate = USART_BAUD_RATE;
+    else
+        capabilities.baudrate = 0; // no real baudrate for USB-CDC
+    reply_ng(CMD_CAPABILITIES, PM3_SUCCESS, (uint8_t *)&capabilities, sizeof(capabilities));
+}
+
 // Show some leds in a pattern to identify StandAlone mod is running
 void StandAloneMode(void) {
 
@@ -1439,6 +1449,8 @@ static void PacketReceived(PacketCommandNG *packet) {
         case CMD_STATUS:
             SendStatus();
             break;
+        case CMD_CAPABILITIES:
+            SendCapabilities();
         case CMD_PING:
             if (packet->ng) {
                 reply_ng(CMD_PING, PM3_SUCCESS, packet->data.asBytes, packet->length);
diff --git a/client/comms.c b/client/comms.c
index 7762a532b..b4f075d05 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -20,6 +20,7 @@ static char *serial_port_name = NULL;
 static bool offline;
 
 communication_arg_t conn;
+capabilities_t pm3_capabilities;
 
 static pthread_t USB_communication_thread;
 //static pthread_t FPC_communication_thread;
@@ -567,22 +568,40 @@ bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode,
 int TestProxmark(void) {
     clearCommandBuffer();
     PacketResponseNG resp;
-    SendCommandOLD(CMD_PING, 0, 0, 0, NULL, 0);
+    uint16_t len = 32;
+    uint8_t data[len];
+    for (uint16_t i = 0; i < len; i++)
+        data[i] = i & 0xFF;
+    SendCommandNG(CMD_PING, data, len);
 #ifdef USART_SLOW_LINK
     // 10s timeout for slow FPC, e.g. over BT
     // as this is the very first command sent to the pm3
     // that initiates the BT connection
-    if (WaitForResponseTimeout(CMD_ACK, &resp, 10000)) {
+    if (WaitForResponseTimeoutW(CMD_PING, &resp, 10000, false)) {
 #else
-    if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {
+    if (WaitForResponseTimeoutW(CMD_PING, &resp, 1000, false)) {
 #endif
-        conn.send_via_fpc = resp.oldarg[0] == 1;
-        PrintAndLogEx(INFO, "Communicating with PM3 over %s.", conn.send_via_fpc ? _YELLOW_("FPC") : _YELLOW_("USB-CDC"));
-        if (conn.send_via_fpc)
-            PrintAndLogEx(INFO, "UART Serial baudrate: " _YELLOW_("%u") "\n", conn.uart_speed);
-        return 1;
+
+        bool error = false;
+        if (len)
+            error = memcmp(data, resp.data.asBytes, len) != 0;
+        if (error)
+            return PM3_EIO;
+
+        SendCommandNG(CMD_CAPABILITIES, NULL, 0);
+        if (WaitForResponseTimeoutW(CMD_PING, &resp, 1000, false)) {
+            memcpy(&pm3_capabilities, resp.data.asBytes, resp.length);
+            conn.send_via_fpc = pm3_capabilities.via_fpc;
+            conn.uart_speed = pm3_capabilities.baudrate;
+            PrintAndLogEx(INFO, "Communicating with PM3 over %s", conn.send_via_fpc ? _YELLOW_("FPC UART") : _YELLOW_("USB-CDC"));
+            if (conn.send_via_fpc)
+                PrintAndLogEx(INFO, "UART Serial baudrate: " _YELLOW_("%u") "\n", conn.uart_speed);
+            return PM3_SUCCESS;
+        } else {
+            return PM3_ETIMEOUT;
+        }
     } else {
-        return 0;
+        return PM3_ETIMEOUT;
     }
 }
 
diff --git a/client/comms.h b/client/comms.h
index 7952ce18c..516d39b1a 100644
--- a/client/comms.h
+++ b/client/comms.h
@@ -47,7 +47,7 @@ typedef struct {
     bool send_with_crc_on_fpc;
     // "Session" flag, to tell via which interface next msgs are sent: USB or FPC USART
     bool send_via_fpc;
-    // To memorise baudrate, we don't want to call get_speed systematically
+    // To memorise baudrate
     uint32_t uart_speed;
 } communication_arg_t;
 
diff --git a/client/proxmark3.c b/client/proxmark3.c
index fab2b7022..1c3693ea2 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -468,8 +468,11 @@ int main(int argc, char *argv[]) {
     if (port != NULL)
         pm3_present = OpenProxmark(port, waitCOMPort, 20, false, speed);
 
-    if (pm3_present && (TestProxmark() == 0))
+    if (pm3_present && (TestProxmark() != PM3_SUCCESS)) {
+        PrintAndLogEx(ERR, _RED_("ERROR:") "cannot communicate with the Proxmark\n");
+        CloseProxmark();
         pm3_present = false;
+    }
     if (!pm3_present)
         PrintAndLogEx(INFO, "Running in " _YELLOW_("OFFLINE") "mode. Check \"%s -h\" if it's not what you want.\n", exec_name);
 
diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index 0887655c4..75ceb8515 100644
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -136,6 +136,14 @@ typedef struct {
     uint16_t read_gap;
 } t55xx_config;
 
+// TODO add more fields to report all hw & sw capabilities of pm3
+typedef struct {
+    uint32_t baudrate;
+    bool via_fpc;
+} PACKED capabilities_t;
+
+extern capabilities_t pm3_capabilities;
+
 // For the bootloader
 #define CMD_DEVICE_INFO                                                   0x0000
 #define CMD_SETUP_WRITE                                                   0x0001
@@ -156,12 +164,9 @@ typedef struct {
 #define CMD_VERSION                                                       0x0107
 #define CMD_STATUS                                                        0x0108
 #define CMD_PING                                                          0x0109
-
 #define CMD_DOWNLOAD_EML_BIGBUF                                           0x0110
 #define CMD_DOWNLOADED_EML_BIGBUF                                         0x0111
-
-
-
+#define CMD_CAPABILITIES                                                  0x0112
 
 // RDV40, Flash memory operations
 #define CMD_FLASHMEM_READ                                                 0x0120

From a555799a7c489cae41895df79e773669fb2107ba Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 27 Apr 2019 10:41:10 +0200
Subject: [PATCH 1452/1938] Stop poking Internet when compiling

---
 tools/mkversion.pl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/mkversion.pl b/tools/mkversion.pl
index ed5cea206..a71aac96f 100644
--- a/tools/mkversion.pl
+++ b/tools/mkversion.pl
@@ -32,7 +32,8 @@ my $commandGIT = "env which git";
 
 if ( defined($commandGIT) )  {
 
-    my $githistory = `git fetch --all`;
+    # this goes on Internet and cause major slowdowns on poor connections or intranets, let's comment it
+    #my $githistory = `git fetch --all`;
     # now avoiding the "fatal: No names found, cannot describe anything." error by fallbacking to abbrev hash in such case
     my $gitversion = `git describe --dirty --always`;
     my $gitbranch = `git rev-parse --abbrev-ref HEAD`;

From 238eda8b176c7617e041dd1b88a19c81b4973850 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 27 Apr 2019 11:07:59 +0200
Subject: [PATCH 1453/1938] chg: 'hw detectreader' cleanup

---
 client/cmdhw.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/client/cmdhw.c b/client/cmdhw.c
index 1c2c77a55..72f0b4b2f 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -309,15 +309,22 @@ static void lookupChipID(uint32_t iChipID, uint32_t mem_used) {
 
 static int CmdDetectReader(const char *Cmd) {
     uint16_t arg = 0;
-    // 'l' means LF - 125/134 kHz
-    if (*Cmd == 'l') {
+    char c = tolower(Cmd[0]);   
+    switch ( c ) {
+        case 'l': 
         arg = 1;
-    } else if (*Cmd == 'h') {
+            break;
+        case 'h':
         arg = 2;
-    } else if (*Cmd != '\0') {
-        PrintAndLogEx(NORMAL, "use 'detectreader' or 'detectreader l' or 'detectreader h'");
+            break;
+        default: {
+            PrintAndLogEx(NORMAL, "use 'detectreader'");
+            PrintAndLogEx(NORMAL, "    'detectreader l'   -- 125/134 kHz");
+            PrintAndLogEx(NORMAL, "    'detectreader h'   -- 13.56 mHz");
         return PM3_EINVARG;
     }
+    }
+    
     clearCommandBuffer();
     SendCommandOLD(CMD_LISTEN_READER_FIELD, arg, 0, 0, NULL, 0);
     return PM3_SUCCESS;

From 5f831ee77650ad1551c3b9a361c04e8ef4954c61 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 27 Apr 2019 11:09:20 +0200
Subject: [PATCH 1454/1938] chg: 'hw detectreader' - clean up

---
 armsrc/appmain.c | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index fc777cbdf..10e749d39 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -485,6 +485,7 @@ void ListenReaderField(int limit) {
     uint16_t lf_av, lf_av_new, lf_baseline = 0, lf_max;
     uint16_t hf_av, hf_av_new,  hf_baseline = 0, hf_max;
     uint16_t mode = 1, display_val, display_max;
+    bool use_high = false;
 
     // switch off FPGA - we don't want to measure our own signal
     // 20180315 - iceman,  why load this before and then turn off?
@@ -493,28 +494,29 @@ void ListenReaderField(int limit) {
 
     LEDsoff();
 
+    if (limit == LF_ONLY) {
     lf_av = lf_max = AvgAdc(ADC_CHAN_LF);
-
-    if (limit != HF_ONLY) {
         Dbprintf("LF 125/134kHz Baseline: %dmV", (MAX_ADC_LF_VOLTAGE * lf_av) >> 10);
         lf_baseline = lf_av;
     }
 
+    if (limit == HF_ONLY) {
+        
     hf_av = hf_max = AvgAdc(ADC_CHAN_HF);
 
     // iceman,  useless,  since we are measuring readerfield,  not our field.  My tests shows a max of 20v from a reader.
     // RDV40 will hit the roof, try other ADC channel used in that hardware revision.
-    bool use_high = (((MAX_ADC_HF_VOLTAGE * hf_max) >> 10) > MAX_ADC_HF_VOLTAGE - 300);
+        use_high = (((MAX_ADC_HF_VOLTAGE * hf_max) >> 10) > MAX_ADC_HF_VOLTAGE - 300);
     if (use_high) {
         hf_av = hf_max = AvgAdc(ADC_CHAN_HF_RDV40);
     }
 
-    if (limit != LF_ONLY) {
         Dbprintf("HF 13.56MHz Baseline: %dmV", (MAX_ADC_HF_VOLTAGE * hf_av) >> 10);
         hf_baseline = hf_av;
     }
 
     for (;;) {
+        
         // Switch modes with button
         if (BUTTON_PRESS()) {
             SpinDelay(500);
@@ -526,14 +528,14 @@ void ListenReaderField(int limit) {
                 case 2:
                 default:
                     DbpString("Stopped");
+                    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);                    
                     LEDsoff();
                     return;
-                    break;
             }
         }
         WDT_HIT();
 
-        if (limit != HF_ONLY) {
+        if (limit == LF_ONLY) {
             if (mode == 1) {
                 if (ABS(lf_av - lf_baseline) > REPORT_CHANGE)
                     LED_D_ON();
@@ -551,7 +553,7 @@ void ListenReaderField(int limit) {
             }
         }
 
-        if (limit != LF_ONLY) {
+        if (limit == HF_ONLY) {
             if (mode == 1) {
                 if (ABS(hf_av - hf_baseline) > REPORT_CHANGE)
                     LED_B_ON();
@@ -586,11 +588,14 @@ void ListenReaderField(int limit) {
                     display_max = lf_max;
                 }
             }
+            
             display_val = display_val * (4*LIGHT_LEVELS) / MAX(1,display_max);
             uint32_t duty_a = MIN(MAX(display_val, 0*LIGHT_LEVELS), 1*LIGHT_LEVELS) - 0*LIGHT_LEVELS;
             uint32_t duty_b = MIN(MAX(display_val, 1*LIGHT_LEVELS), 2*LIGHT_LEVELS) - 1*LIGHT_LEVELS;
             uint32_t duty_c = MIN(MAX(display_val, 2*LIGHT_LEVELS), 3*LIGHT_LEVELS) - 2*LIGHT_LEVELS;
             uint32_t duty_d = MIN(MAX(display_val, 3*LIGHT_LEVELS), 4*LIGHT_LEVELS) - 3*LIGHT_LEVELS;
+            
+            // LED A
             if (duty_a == 0) {
                 LED_A_OFF();
             } else if (duty_a == LIGHT_LEVELS) {
@@ -601,6 +606,8 @@ void ListenReaderField(int limit) {
                 LED_A_OFF();
                 SpinDelay(LIGHT_LEVELS - duty_a);
             }
+
+            // LED B            
             if (duty_b == 0) {
                 LED_B_OFF();
             } else if (duty_b == LIGHT_LEVELS) {
@@ -611,6 +618,8 @@ void ListenReaderField(int limit) {
                 LED_B_OFF();
                 SpinDelay(LIGHT_LEVELS - duty_b);
             }
+
+            // LED C
             if (duty_c == 0) {
                 LED_C_OFF();
             } else if (duty_c == LIGHT_LEVELS) {
@@ -621,6 +630,8 @@ void ListenReaderField(int limit) {
                 LED_C_OFF();
                 SpinDelay(LIGHT_LEVELS - duty_c);
             }
+
+            // LED D
             if (duty_d == 0) {
                 LED_D_OFF();
             } else if (duty_d == LIGHT_LEVELS) {

From ae5b6fa169fba2fffe40ae0f05b07ebfe3ac1279 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 27 Apr 2019 11:25:07 +0200
Subject: [PATCH 1455/1938] rework shell scripts for easy client or flasher

---
 flash-all.sh       |  4 ++++
 flash-bootrom.sh   |  4 ++++
 flash-fullimage.sh |  4 ++++
 proxmark3.sh       | 43 ++++++++++++++++++++++++++++++++++++++-----
 tools/mkversion.pl |  2 +-
 update.sh          | 37 -------------------------------------
 6 files changed, 51 insertions(+), 43 deletions(-)
 create mode 100755 flash-all.sh
 create mode 100755 flash-bootrom.sh
 create mode 100755 flash-fullimage.sh
 delete mode 100755 update.sh

diff --git a/flash-all.sh b/flash-all.sh
new file mode 100755
index 000000000..27e1fb526
--- /dev/null
+++ b/flash-all.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+cd $(dirname "$0")
+. proxmark3.sh
diff --git a/flash-bootrom.sh b/flash-bootrom.sh
new file mode 100755
index 000000000..27e1fb526
--- /dev/null
+++ b/flash-bootrom.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+cd $(dirname "$0")
+. proxmark3.sh
diff --git a/flash-fullimage.sh b/flash-fullimage.sh
new file mode 100755
index 000000000..27e1fb526
--- /dev/null
+++ b/flash-fullimage.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+cd $(dirname "$0")
+. proxmark3.sh
diff --git a/proxmark3.sh b/proxmark3.sh
index 4a7a004d5..0d7b36657 100755
--- a/proxmark3.sh
+++ b/proxmark3.sh
@@ -1,5 +1,10 @@
 #!/bin/bash
 
+FULLIMAGE="armsrc/obj/fullimage.elf"
+BOOTIMAGE="bootrom/obj/bootrom.elf"
+
+cd $(dirname "$0")
+
 function wait4proxmark_Linux {
     echo >&2 "Waiting for Proxmark to appear..."
     while [ ! -c /dev/ttyACM? -a ! -c /dev/pm3-? ]; do
@@ -23,10 +28,38 @@ function wait4proxmark_macOS {
     echo $PM3
 }
 
-# start proxmark with first detected interface
+SCRIPT=$(basename -- "$0")
 
-if [[ $(uname | awk '{print toupper($0)}') == "LINUX" ]]; then
-    client/proxmark3 $(wait4proxmark_Linux) "$@"
-elif [[ $(uname | awk '{print toupper($0)}') == "DARWIN" ]]; then
-    client/proxmark3 $(wait4proxmark_macOS) "$@"
+if [ "$SCRIPT" = "proxmark3.sh" ]; then
+  CMD=client/proxmark3
+elif [ "$SCRIPT" = "flash-all.sh" ]; then
+  CMD=client/flasher
+  ARG1="-b $BOOTIMAGE"
+  ARG2="$FULLIMAGE"
+elif [ "$SCRIPT" = "flash-fullimage.sh" ]; then
+  CMD=client/flasher
+  ARG2="$FULLIMAGE"
+elif [ "$SCRIPT" = "flash-bootrom.sh" ]; then
+  CMD=client/flasher
+  ARG1="-b $BOOTIMAGE"
+else
+  echo "Script ran under unknown name, abort: $SCRIPT"
+  exit 1
 fi
+HOSTOS=$(uname | awk '{print toupper($0)}')
+if [ "$HOSTOS" = "LINUX" ]; then
+    PORT=$(wait4proxmark_Linux)
+elif [ "$HOSTOS" = "DARWIN" ]; then
+    PORT=$(wait4proxmark_macOS)
+else
+    echo "Host OS not recognized, abort: $HOSTOS"
+    exit 1
+fi
+if [ "$PORT" = "" ]; then
+    echo "No port, abort"
+    exit 1
+fi
+
+echo Running "$CMD" "$PORT" $ARG1 $ARG2 "$@"
+"$CMD" "$PORT" $ARG1 $ARG2 "$@"
+exit $?
diff --git a/tools/mkversion.pl b/tools/mkversion.pl
index a71aac96f..715b8081c 100644
--- a/tools/mkversion.pl
+++ b/tools/mkversion.pl
@@ -14,7 +14,7 @@ $ENV{'LC_ALL'} = "C";
 $ENV{'LANG'} = "C";
 
 # if you are making your own fork,  change this line to reflect your fork-name
-my $fullgitinfo = 'iceman';
+my $fullgitinfo = 'RRG';
 my $ctime;
 # GIT status  0 = dirty,  1 = clean ,  2 = undecided
 my $clean = 2;
diff --git a/update.sh b/update.sh
deleted file mode 100755
index aa58b693e..000000000
--- a/update.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-FULLIMAGE="armsrc/obj/fullimage.elf"
-if [ "$1" == "-b" ]; then
-  FLASHBOOT="-b bootrom/obj/bootrom.elf"
-fi
-
-function wait4proxmark_Linux {
-    echo >&2 "Waiting for Proxmark to appear..."
-    while [ ! -c /dev/ttyACM? -a ! -L /dev/pm3-? ]; do
-        sleep .1
-    done
-    local PM3=`ls -1 /dev/pm3-? /dev/ttyACM? 2>/dev/null | head -1`
-    echo >&2 -e "Found proxmark on ${PM3}\n"
-    echo $PM3
-}
-
-function wait4proxmark_macOS {
-    echo >&2 "Waiting for Proxmark to appear..."
-    while true; do
-        PM3=$(ls /dev/pm3-* /dev/cu.usbmodem* 2>/dev/null | head -1)
-        if [[ $PM3 != "" ]]; then
-            #echo >&2 -e "Found proxmark on $(ls /dev/pm3-* /dev/cu.usbmodem* 2>/dev/null | head -1)\n"
-            break
-        fi
-        sleep .1
-    done
-    echo $PM3
-}
-
-# Detect OS and flash bootroom & system image
-
-if [[ $(uname | awk '{print toupper($0)}') == "LINUX" ]]; then
-    client/flasher $(wait4proxmark_Linux) $FLASHBOOT $FULLIMAGE
-elif [[ $(uname | awk '{print toupper($0)}') == "DARWIN" ]]; then
-    client/flasher $(wait4proxmark_macOS) $FLASHBOOT $FULLIMAGE
-fi

From c5c364d99406106fa5a017d7ab0cd76b90e0fd61 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 27 Apr 2019 11:57:11 +0200
Subject: [PATCH 1456/1938] fix: compilation on mingw

---
 client/comms.c | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/client/comms.c b/client/comms.c
index b4f075d05..095bcc115 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -237,26 +237,35 @@ static void memcpy_filtered(void *dest, const void *src, size_t n, bool filter)
 #else
     if (filter) {
         // Filter out ANSI sequences on these OS
-        uint16_t si=0;
-        for (uint16_t i=0; i < n; i++) {
-            if ((src[i] == '\x1b') && (i < n - 1) && (src[i+1] >= 0x40) && (src[i+1] <= 0x5F)) { // entering ANSI sequence
+        uint8_t *rdest = (uint8_t *)dest;
+        uint8_t *rsrc = (uint8_t *)src;
+        uint16_t si = 0;
+        for (uint16_t i = 0; i < n; i++) {
+            if ( (rsrc[i] == '\x1b') 
+                && (i < n - 1) 
+                && (rsrc[i + 1] >= 0x40) 
+                && (rsrc[i + 1] <= 0x5F) ) { // entering ANSI sequence
+                
                 i++;
-                if ((src[i] == '[') && (i < n - 1)) { // entering CSI sequence
+                if ((rsrc[i] == '[') && (i < n - 1)) { // entering CSI sequence
                     i++;
-                    while ((i < n - 1) && (src[i] >= 0x30) && (src[i] <= 0x3F)) { // parameter bytes
+                    
+                    while ((i < n - 1) && (rsrc[i] >= 0x30) && (rsrc[i] <= 0x3F)) { // parameter bytes
                         i++;
                     }
-                    while ((i < n - 1) && (src[i] >= 0x20) && (src[i] <= 0x2F)) { // intermediate bytes
+                    
+                    while ((i < n - 1) && (rsrc[i] >= 0x20) && (rsrc[i] <= 0x2F)) { // intermediate bytes
                         i++;
                     }
-                    if ((src[i] >= 0x40) && (src[i] <= 0x7F)) { // final byte
+                    
+                    if ((rsrc[i] >= 0x40) && (rsrc[i] <= 0x7F)) { // final byte
                         continue;
                     }
                 } else {
                     continue;
                 }
             }
-            dest[si++] = src[i];
+            rdest[si++] = rsrc[i];
         }
     } else {
         memcpy(dest, src, n);

From d47efa8547315d71cf01f24d413a8641cd9fc79c Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 27 Apr 2019 12:01:22 +0200
Subject: [PATCH 1457/1938] fix uninitialized

---
 armsrc/appmain.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 10e749d39..094e48372 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -482,8 +482,8 @@ void ListenReaderField(int limit) {
 #define HF_ONLY 2
 #define REPORT_CHANGE 10    // report new values only if they have changed at least by REPORT_CHANGE
 
-    uint16_t lf_av, lf_av_new, lf_baseline = 0, lf_max;
-    uint16_t hf_av, hf_av_new,  hf_baseline = 0, hf_max;
+    uint16_t lf_av = 0, lf_av_new, lf_baseline = 0, lf_max = 0;
+    uint16_t hf_av = 0, hf_av_new,  hf_baseline = 0, hf_max = 0;
     uint16_t mode = 1, display_val, display_max;
     bool use_high = false;
 
@@ -495,7 +495,7 @@ void ListenReaderField(int limit) {
     LEDsoff();
 
     if (limit == LF_ONLY) {
-    lf_av = lf_max = AvgAdc(ADC_CHAN_LF);
+        lf_av = lf_max = AvgAdc(ADC_CHAN_LF);
         Dbprintf("LF 125/134kHz Baseline: %dmV", (MAX_ADC_LF_VOLTAGE * lf_av) >> 10);
         lf_baseline = lf_av;
     }

From 8ebc44ee81ec9c36a5732b5a369c97db263fcf0f Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 27 Apr 2019 16:52:23 +0200
Subject: [PATCH 1458/1938] fix segfault

---
 client/proxmark3.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/client/proxmark3.c b/client/proxmark3.c
index 010fd6ff0..47ea28e36 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -62,9 +62,11 @@ main_loop(char *script_cmds_file, char *script_cmd, bool pm3_present) {
 
     char *cmd = NULL;
     bool execCommand = (script_cmd != NULL);
-    uint16_t script_cmd_len = strlen(script_cmd);
-    if (execCommand)
+    uint16_t script_cmd_len = 0;
+    if (execCommand) {
+        script_cmd_len = strlen(script_cmd);
         strcreplace(script_cmd, script_cmd_len, ';', '\0');
+    }
     bool stdinOnPipe = !isatty(STDIN_FILENO);
     FILE *sf = NULL;
     char script_cmd_buf[256] = {0x00};  // iceman, needs lua script the same file_path_buffer as the rest

From c13f9e7a0f99ad09f8a053a92a36c7c0493bad61 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 28 Apr 2019 11:05:23 +0200
Subject: [PATCH 1459/1938] add:  SendCommandMIX,  SendCommandOLD support in
 LUA

---
 client/scripting.c | 353 +++++++++++++++++++++++++++++----------------
 1 file changed, 231 insertions(+), 122 deletions(-)

diff --git a/client/scripting.c b/client/scripting.c
index fe3f1b58b..333067e8a 100644
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -10,29 +10,31 @@
 //-----------------------------------------------------------------------------
 #include "scripting.h"
 
+static int returnToLuaWithError(lua_State *L, const char *fmt, ...) {
+    char buffer[200];
+    va_list args;
+    va_start(args, fmt);
+    vsnprintf(buffer, sizeof(buffer), fmt, args);
+    va_end(args);
+
+    lua_pushnil(L);
+    lua_pushstring(L, buffer);
+    return 2;
+}
+
+static int l_clearCommandBuffer(lua_State *L) {
+    clearCommandBuffer();
+    return 0;
+}
+
 /**
  * The following params expected:
- *  PacketCommandOLD c
+ *  UsbCommand c
  *@brief l_SendCommand
  * @param L
  * @return
  */
 static int l_SendCommand(lua_State *L) {
-
-    /*
-     The SendCommand (native) expects the following structure:
-
-     typedef struct {
-      uint64_t cmd; //8 bytes
-      uint64_t arg[3]; // 8*3 bytes = 24 bytes
-      union {
-        uint8_t  asBytes[USB_CMD_DATA_SIZE]; // 1 byte * 512 = 512 bytes (OR)
-        uint32_t asDwords[USB_CMD_DATA_SIZE/4]; // 4 byte * 128 = 512 bytes
-      } d;
-    } PACKED PacketCommandOLD;
-
-    ==> A 544 byte buffer will do.
-    **/
     size_t size;
     const char *data = luaL_checklstring(L, 1, &size);
     if (size != sizeof(PacketCommandOLD)) {
@@ -42,9 +44,141 @@ static int l_SendCommand(lua_State *L) {
     }
 
     SendCommand((PacketCommandOLD *)data);
-    return 0; // no return values
+    return 0;
 }
 
+/**
+ * The following params expected:
+ * @brief l_SendCommandOLD
+ * @param L - a lua string with the following five params.
+ * @param cmd  must be hexstring, max u64
+ * @param arg0  must be hexstring, max u64
+ * @param arg1  must be hexstring, max u64
+ * @param arg2  must be hexstring, max u64
+ * @param data  must be hexstring less than 1024 chars(512bytes)
+ * @return
+ */
+static int l_SendCommandOLD(lua_State *L) {
+//  SendCommandOLD(CMD_HF_SNIFFER, skippairs, skiptriggers, 0, NULL, 0);
+// (uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len)
+
+    uint64_t cmd, arg0, arg1, arg2;
+    uint8_t data[USB_CMD_DATA_SIZE] = {0}; 
+    size_t len = 0, size;
+
+    //Check number of arguments
+    int n = lua_gettop(L);
+    if (n != 5)  {
+        return returnToLuaWithError(L, "You need to supply five parameters");
+    }
+
+    // parse input
+    // cmd
+    const char *p_cmd = luaL_checklstring(L, 1, &size);
+    if (size != 4)
+        return returnToLuaWithError(L, "Wrong size of cmd, got %d bytes, expected 2", (int) size);
+    sscanf(p_cmd, " %" SCNx64, &cmd);
+    
+    // arg0
+    const char *p_arg0 = luaL_checklstring(L, 2, &size);
+    if (size != 16)
+        return returnToLuaWithError(L, "Wrong size of arg0, got %d bytes, expected 16", (int) size);
+    sscanf(p_arg0, " %" SCNx64, &arg0);
+    
+    // arg1
+    const char *p_arg1 = luaL_checklstring(L, 3, &size);
+    if (size != 16)
+        return returnToLuaWithError(L, "Wrong size of arg1, got %d bytes, expected 16", (int) size);
+    sscanf(p_arg1, " %" SCNx64, &arg1);
+
+    // arg2
+    const char *p_arg2 = luaL_checklstring(L, 4, &size);
+    if (size != 16)
+        return returnToLuaWithError(L, "Wrong size of arg2, got %d bytes, expected 16", (int) size);
+    sscanf(p_arg2, " %" SCNx64, &arg2);
+    
+    // data
+    const char *p_data = luaL_checklstring(L, 5, &size);
+    
+    if ( size ) {
+        if ( size > 1024 )
+            size = 1024;
+         
+        uint32_t tmp;
+        for (int i = 0; i < size; i += 2) {
+            sscanf(&p_data[i], "%02x", &tmp);
+            data[i >> 1] = tmp & 0xFF;
+            len++;
+        }
+    }
+    SendCommandOLD(cmd, arg0, arg1, arg2, data, len);
+    return 0;
+}
+
+/**
+ * The following params expected:
+ * @brief l_SendCommandMIX
+ * @param L - a lua string with the following five params. 
+ * @param cmd  must be hexstring, max u64
+ * @param arg0  must be hexstring, max u64
+ * @param arg1  must be hexstring, max u64
+ * @param arg2  must be hexstring, max u64
+ * @param data  must be hexstring less than 1024 chars(512bytes)
+ * @return
+ */
+static int l_SendCommandMIX(lua_State *L) {
+
+    uint64_t cmd, arg0, arg1, arg2;
+    uint8_t data[USB_CMD_DATA_SIZE] = {0};
+    size_t len = 0, size;
+
+    // check number of arguments
+    int n = lua_gettop(L);
+    if (n != 5)
+        return returnToLuaWithError(L, "You need to supply five parameters");
+       
+    // parse input
+    // cmd
+    const char *p_cmd = luaL_checklstring(L, 1, &size);
+    if (size != 4)
+        return returnToLuaWithError(L, "Wrong size of cmd, got %d bytes, expected 2", (int) size);
+    sscanf(p_cmd, " %" SCNx64, &cmd);
+    
+    // arg0
+    const char *p_arg0 = luaL_checklstring(L, 2, &size);
+    if (size != 16)
+        return returnToLuaWithError(L, "Wrong size of arg0, got %d bytes, expected 16", (int) size);
+    sscanf(p_arg0, " %" SCNx64, &arg0);
+    
+    // arg1
+    const char *p_arg1 = luaL_checklstring(L, 3, &size);
+    if (size != 16)
+        return returnToLuaWithError(L, "Wrong size of arg1, got %d bytes, expected 16", (int) size);
+    sscanf(p_arg1, " %" SCNx64, &arg1);
+
+    // arg2
+    const char *p_arg2 = luaL_checklstring(L, 4, &size);
+    if (size != 16)
+        return returnToLuaWithError(L, "Wrong size of arg2, got %d bytes, expected 16", (int) size);
+    sscanf(p_arg2, " %" SCNx64, &arg2);
+    
+    // data
+    const char *p_data = luaL_checklstring(L, 5, &size);    
+    if ( size ) {
+        if ( size > 1024 )
+            size = 1024;
+         
+        uint32_t tmp;
+        for (int i = 0; i < size; i += 2) {
+            sscanf(&p_data[i], "%02x", &tmp);
+            data[i >> 1] = tmp & 0xFF;
+            len++;
+        }
+    }
+
+    SendCommandMIX(cmd, arg0, arg1, arg2, data, len);
+    return 0;
+}
 /**
  * @brief The following params expected:
  * uint8_t *dest
@@ -60,36 +194,26 @@ static int l_GetFromBigBuf(lua_State *L) {
     //Check number of arguments
     int n = lua_gettop(L);
     if (n == 0) {
-        //signal error by returning Nil, errorstring
-        lua_pushnil(L);
-        lua_pushstring(L, "You need to supply number of bytes and startindex");
-        return 2; // two return values
+        return returnToLuaWithError(L, "You need to supply number of bytes and startindex");
     }
+    
     if (n >= 2) {
         startindex = luaL_checknumber(L, 1);
         len = luaL_checknumber(L, 2);
     }
 
     if (len == 0) {
-        //signal error by returning Nil, errorstring
-        lua_pushnil(L);
-        lua_pushstring(L, "You need to supply number of bytes larger than zero");
-        return 2; // two return values
+        return returnToLuaWithError(L, "You need to supply number of bytes larger than zero");
     }
 
     uint8_t *data = calloc(len, sizeof(uint8_t));
     if (!data) {
-        //signal error by returning Nil, errorstring
-        lua_pushnil(L);
-        lua_pushstring(L, "Allocating memory failed");
-        return 2; // two return values
+        return returnToLuaWithError(L, "Allocating memory failed");
     }
 
     if (!GetFromDevice(BIG_BUF, data, len, startindex, NULL, 2500, false)) {
         free(data);
-        lua_pushnil(L);
-        lua_pushstring(L, "command execution time out");
-        return 2;
+        return returnToLuaWithError(L, "command execution time out");
     }
 
     //Push it as a string
@@ -109,42 +233,29 @@ static int l_GetFromBigBuf(lua_State *L) {
 static int l_GetFromFlashMem(lua_State *L) {
 
 #ifndef WITH_FLASH
-    lua_pushnil(L);
-    lua_pushstring(L, "Not compiled with FLASH MEM support");
-    return 2;
+    return returnToLuaWithError(L, "Not compiled with FLASH MEM support");
 #else
     int len = 0, startindex = 0;
 
     int n = lua_gettop(L);
-    if (n == 0) {
-        lua_pushnil(L);
-        lua_pushstring(L, "You need to supply number of bytes and startindex");
-        return 2;
-    }
+    if (n == 0)
+        return returnToLuaWithError(L, "You need to supply number of bytes and startindex");
+    
     if (n >= 2) {
         startindex = luaL_checknumber(L, 1);
         len = luaL_checknumber(L, 2);
     }
 
-    if (len == 0) {
-        //signal error by returning Nil, errorstring
-        lua_pushnil(L);
-        lua_pushstring(L, "You need to supply number of bytes larger than zero");
-        return 2; // two return values
-    }
+    if (len == 0)
+        return returnToLuaWithError(L, "You need to supply number of bytes larger than zero");
 
     uint8_t *data = calloc(len, sizeof(uint8_t));
-    if (!data) {
-        lua_pushnil(L);
-        lua_pushstring(L, "Allocating memory failed");
-        return 2;
-    }
+    if (!data)
+        return returnToLuaWithError(L, "Allocating memory failed");
 
     if (!GetFromDevice(FLASH_MEM, data, len, startindex, NULL, -1, false)) {
         free(data);
-        lua_pushnil(L);
-        lua_pushstring(L, "command execution time out");
-        return 2;
+        return returnToLuaWithError(L, "command execution time out");
     }
 
     lua_pushlstring(L, (const char *)data, len);
@@ -159,7 +270,7 @@ static int l_GetFromFlashMem(lua_State *L) {
  * uint32_t cmd
  * size_t ms_timeout
  * @param L
- * @return
+ * @return struct of PacketResponseNG
  */
 static int l_WaitForResponseTimeout(lua_State *L) {
 
@@ -168,45 +279,24 @@ static int l_WaitForResponseTimeout(lua_State *L) {
 
     //Check number of arguments
     int n = lua_gettop(L);
-    if (n == 0)  {
-        //signal error by returning Nil, errorstring
-        lua_pushnil(L);
-        lua_pushstring(L, "You need to supply at least command to wait for");
-        return 2;
-    }
+    if (n == 0)
+        return returnToLuaWithError(L, "You need to supply at least command to wait for");
 
     // extract first param.  cmd byte to look for
-    if (n >= 1) {
+    if (n >= 1)
         cmd = luaL_checkunsigned(L, 1);
-    }
+
     // extract second param. timeout value
-    if (n >= 2) {
+    if (n >= 2)
         ms_timeout = luaL_checkunsigned(L, 2);
-    }
 
     PacketResponseNG resp;
-    if (WaitForResponseTimeout(cmd, &resp, ms_timeout)) {
-        //Push it as a string
-        lua_pushlstring(L, (const char *)&resp, sizeof(PacketResponseNG));
-        return 1;
-    } else {
-        //signal error by returning Nil, errorstring
-        lua_pushnil(L);
-        lua_pushstring(L, "No response from the device");
-        return 2;
-    }
-}
+    if (WaitForResponseTimeout(cmd, &resp, ms_timeout) == 0)
+        return returnToLuaWithError(L, "No response from the device");
 
-static int returnToLuaWithError(lua_State *L, const char *fmt, ...) {
-    char buffer[200];
-    va_list args;
-    va_start(args, fmt);
-    vsnprintf(buffer, sizeof(buffer), fmt, args);
-    va_end(args);
-
-    lua_pushnil(L);
-    lua_pushstring(L, buffer);
-    return 2;
+    //Push it as a string
+    lua_pushlstring(L, (const char *)&resp, sizeof(PacketResponseNG));
+    return 1;
 }
 
 static int l_mfDarkside(lua_State *L) {
@@ -245,10 +335,6 @@ static int l_mfDarkside(lua_State *L) {
     return 2;
 }
 
-static int l_clearCommandBuffer(lua_State *L) {
-    clearCommandBuffer();
-    return 0;
-}
 /**
  * @brief l_foobar is a dummy function to test lua-integration with
  * @param L
@@ -273,7 +359,6 @@ static int l_foobar(lua_State *L) {
     return 2;
 }
 
-
 /**
  * @brief Utility to check if a key has been pressed by the user. This method does not block.
  * @param L
@@ -283,6 +368,7 @@ static int l_ukbhit(lua_State *L) {
     lua_pushboolean(L, ukbhit() ? true : false);
     return 1;
 }
+
 /**
  * @brief Calls the command line parser to deal with the command. This enables
  * lua-scripts to do stuff like "core.console('hf mf mifare')"
@@ -338,7 +424,8 @@ static int l_aes128decrypt_cbc(lua_State *L) {
     uint32_t tmp;
     size_t size;
     const char *p_key = luaL_checklstring(L, 1, &size);
-    if (size != 32)  return returnToLuaWithError(L, "Wrong size of key, got %d bytes, expected 32", (int) size);
+    if (size != 32)
+        return returnToLuaWithError(L, "Wrong size of key, got %d bytes, expected 32", (int) size);
 
     const char *p_encTxt = luaL_checklstring(L, 2, &size);
 
@@ -369,7 +456,8 @@ static int l_aes128decrypt_ecb(lua_State *L) {
     uint32_t tmp;
     size_t size;
     const char *p_key = luaL_checklstring(L, 1, &size);
-    if (size != 32)  return returnToLuaWithError(L, "Wrong size of key, got %d bytes, expected 32", (int) size);
+    if (size != 32)
+        return returnToLuaWithError(L, "Wrong size of key, got %d bytes, expected 32", (int) size);
 
     const char *p_encTxt = luaL_checklstring(L, 2, &size);
 
@@ -400,7 +488,8 @@ static int l_aes128encrypt_cbc(lua_State *L) {
     uint32_t tmp;
     size_t size;
     const char *p_key = luaL_checklstring(L, 1, &size);
-    if (size != 32)  return returnToLuaWithError(L, "Wrong size of key, got %d bytes, expected 32", (int) size);
+    if (size != 32)
+        return returnToLuaWithError(L, "Wrong size of key, got %d bytes, expected 32", (int) size);
 
     const char *p_txt = luaL_checklstring(L, 2, &size);
 
@@ -431,7 +520,8 @@ static int l_aes128encrypt_ecb(lua_State *L) {
     uint32_t tmp;
     size_t size;
     const char *p_key = luaL_checklstring(L, 1, &size);
-    if (size != 32) return returnToLuaWithError(L, "Wrong size of key, got %d bytes, expected 32", (int) size);
+    if (size != 32)
+        return returnToLuaWithError(L, "Wrong size of key, got %d bytes, expected 32", (int) size);
 
     const char *p_txt = luaL_checklstring(L, 2, &size);
 
@@ -493,6 +583,7 @@ static int l_crc64(lua_State *L) {
     return 1;
 }
 
+// TO BE IMPLEMENTED
 static int l_crc64_ecma182(lua_State *L) {
     //size_t size;
     uint64_t crc = 0;
@@ -534,7 +625,8 @@ static int l_reveng_models(lua_State *L) {
 
     int count = 0;
     uint8_t in_width = luaL_checkunsigned(L, 1);
-    if (in_width > 89) return returnToLuaWithError(L, "Width cannot exceed 89, got %d", in_width);
+    if (in_width > 89)
+        return returnToLuaWithError(L, "Width cannot exceed 89, got %d", in_width);
 
     uint8_t width[NMODELS];
     memset(width, 0, sizeof(width));
@@ -590,35 +682,44 @@ static int l_hardnested(lua_State *L) {
     size_t size;
     uint32_t tmp;
     const char *p_blockno = luaL_checklstring(L, 1, &size);
-    if (size != 2)  return returnToLuaWithError(L, "Wrong size of blockNo, got %d bytes, expected 2", (int) size);
+    if (size != 2)
+        return returnToLuaWithError(L, "Wrong size of blockNo, got %d bytes, expected 2", (int) size);
 
     const char *p_keytype = luaL_checklstring(L, 2, &size);
-    if (size != 1)  return returnToLuaWithError(L, "Wrong size of keyType, got %d bytes, expected 1", (int) size);
+    if (size != 1)
+        return returnToLuaWithError(L, "Wrong size of keyType, got %d bytes, expected 1", (int) size);
 
     const char *p_key = luaL_checklstring(L, 3, &size);
-    if (size != 12)  return returnToLuaWithError(L, "Wrong size of key, got %d bytes, expected 12", (int) size);
+    if (size != 12)
+        return returnToLuaWithError(L, "Wrong size of key, got %d bytes, expected 12", (int) size);
 
     const char *p_trg_blockno = luaL_checklstring(L, 4, &size);
-    if (size != 2)  return returnToLuaWithError(L, "Wrong size of trgBlockNo, got %d bytes, expected 2", (int) size);
+    if (size != 2)
+        return returnToLuaWithError(L, "Wrong size of trgBlockNo, got %d bytes, expected 2", (int) size);
 
     const char *p_trg_keytype = luaL_checklstring(L, 5, &size);
-    if (size != 1)  return returnToLuaWithError(L, "Wrong size of trgKeyType, got %d bytes, expected 1", (int) size);
+    if (size != 1)
+        return returnToLuaWithError(L, "Wrong size of trgKeyType, got %d bytes, expected 1", (int) size);
 
     const char *p_trgkey = luaL_checklstring(L, 6, &size);
     if (size != 12)
         haveTarget = false;
 
     const char *p_nonce_file_read = luaL_checklstring(L, 7, &size);
-    if (size != 1)  return returnToLuaWithError(L, "Wrong size of nonce_file_read, got %d bytes, expected 1", (int) size);
+    if (size != 1)
+        return returnToLuaWithError(L, "Wrong size of nonce_file_read, got %d bytes, expected 1", (int) size);
 
     const char *p_nonce_file_write = luaL_checklstring(L, 8, &size);
-    if (size != 1)  return returnToLuaWithError(L, "Wrong size of nonce_file_write, got %d bytes, expected 1", (int) size);
+    if (size != 1)
+        return returnToLuaWithError(L, "Wrong size of nonce_file_write, got %d bytes, expected 1", (int) size);
 
     const char *p_slow = luaL_checklstring(L, 9, &size);
-    if (size != 1)  return returnToLuaWithError(L, "Wrong size of slow, got %d bytes, expected 1", (int) size);
+    if (size != 1)
+        return returnToLuaWithError(L, "Wrong size of slow, got %d bytes, expected 1", (int) size);
 
     const char *p_tests = luaL_checklstring(L, 10, &size);
-    if (size != 1)  return returnToLuaWithError(L, "Wrong size of tests, got %d bytes, expected 1", (int) size);
+    if (size != 1)
+        return returnToLuaWithError(L, "Wrong size of tests, got %d bytes, expected 1", (int) size);
 
     char filename[FILE_PATH_SIZE] = "nonces.bin";
     const char *p_filename = luaL_checklstring(L, 11, &size);
@@ -684,7 +785,8 @@ static int l_keygen_algoD(lua_State *L) {
     size_t size;
     uint32_t tmp;
     const char *p_uid = luaL_checklstring(L, 1, &size);
-    if (size != 14) return returnToLuaWithError(L, "Wrong size of UID, got %d bytes, expected 14", (int) size);
+    if (size != 14)
+        return returnToLuaWithError(L, "Wrong size of UID, got %d bytes, expected 14", (int) size);
 
     uint8_t uid[7] = {0, 0, 0, 0, 0, 0, 0};
 
@@ -712,24 +814,29 @@ static int l_T55xx_readblock(lua_State *L) {
 
     //Check number of arguments
     int n = lua_gettop(L);
-    if (n != 4) {
+    if (n != 4)
         return returnToLuaWithError(L, "Wrong number of arguments, got %d bytes, expected 4", n);
-    }
 
     uint32_t block, usepage1, override, password;
     bool usepwd;
     size_t size;
 
     const char *p_blockno = luaL_checklstring(L, 1, &size);
-    if (size < 1 || size > 2)  return returnToLuaWithError(L, "Wrong size of blockNo, got %d, expected 1 or 2", (int) size);
+    if (size < 1 || size > 2)
+        return returnToLuaWithError(L, "Wrong size of blockNo, got %d, expected 1 or 2", (int) size);
+    
     sscanf(p_blockno, "%x", &block);
 
     const char *p_usepage1 = luaL_checklstring(L, 2, &size);
-    if (size != 1)  return returnToLuaWithError(L, "Wrong size of usePage1, got %d, expected 1", (int) size);
+    if (size != 1)
+        return returnToLuaWithError(L, "Wrong size of usePage1, got %d, expected 1", (int) size);
+    
     sscanf(p_usepage1, "%x", &usepage1);
 
     const char *p_override = luaL_checklstring(L, 3, &size);
-    if (size != 1)  return returnToLuaWithError(L, "Wrong size of override, got %d, expected 1", (int) size);
+    if (size != 1)
+        return returnToLuaWithError(L, "Wrong size of override, got %d, expected 1", (int) size);
+    
     sscanf(p_override, "%x", &override);
 
     const char *p_pwd = luaL_checklstring(L, 4, &size);
@@ -737,7 +844,9 @@ static int l_T55xx_readblock(lua_State *L) {
         usepwd = false;
     } else {
 
-        if (size != 8) return returnToLuaWithError(L, "Wrong size of pwd, got %d , expected 8", (int) size);
+        if (size != 8)
+            return returnToLuaWithError(L, "Wrong size of pwd, got %d , expected 8", (int) size);
+        
         sscanf(p_pwd, "%08x", &password);
         usepwd = true;
     }
@@ -794,7 +903,9 @@ static int l_T55xx_detect(lua_State *L) {
     switch (n) {
         case 2: {
             const char *p_gb = luaL_checklstring(L, 2, &size);
-            if (size != 1)  return returnToLuaWithError(L, "Wrong size of useGB, got %d , expected 1", (int) size);
+            if (size != 1)
+                return returnToLuaWithError(L, "Wrong size of useGB, got %d , expected 1", (int) size);
+            
             sscanf(p_gb, "%u", &gb);
             useGB = (gb) ? true : false;
             printf("p_gb size  %zu | %c \n", size, useGB ? 'Y' : 'N');
@@ -805,7 +916,9 @@ static int l_T55xx_detect(lua_State *L) {
                 usepwd = false;
             } else {
 
-                if (size != 8)  return returnToLuaWithError(L, "Wrong size of pwd, got %d , expected 8", (int) size);
+                if (size != 8)
+                    return returnToLuaWithError(L, "Wrong size of pwd, got %d , expected 8", (int) size);
+                
                 sscanf(p_pwd, "%08x", &password);
                 usepwd = true;
             }
@@ -819,19 +932,13 @@ static int l_T55xx_detect(lua_State *L) {
 
         isok = AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, usepwd, password);
         if (isok == false) {
-            // signal error by returning Nil, errorstring
-            lua_pushnil(L);
-            lua_pushstring(L, "Failed to aquire LF signal data");
-            return 2;
+            return returnToLuaWithError(L, "Failed to aquire LF signal data");
         }
     }
 
     isok = tryDetectModulation();
     if (isok == false) {
-        // signal error by returning Nil, errorstring
-        lua_pushnil(L);
-        lua_pushstring(L,  "Could not detect modulation automatically. Try setting it manually with \'lf t55xx config\'");
-        return 2;
+        return returnToLuaWithError(L, "Could not detect modulation automatically. Try setting it manually with \'lf t55xx config\'");
     }
 
     lua_pushinteger(L, isok);
@@ -865,6 +972,8 @@ static int setLuaPath(lua_State *L, const char *path) {
 int set_pm3_libraries(lua_State *L) {
     static const luaL_Reg libs[] = {
         {"SendCommand",                 l_SendCommand},
+        {"SendCommandOLD",              l_SendCommandOLD},
+        {"SendCommandMIX",              l_SendCommandMIX},
         {"GetFromBigBuf",               l_GetFromBigBuf},
         {"GetFromFlashMem",             l_GetFromFlashMem},
         {"WaitForResponseTimeout",      l_WaitForResponseTimeout},

From ab6870c57383da980927b5a26d2ec137982d3ff0 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 28 Apr 2019 11:08:41 +0200
Subject: [PATCH 1460/1938] style

---
 armsrc/BigBuf.c               |  4 +-
 armsrc/Standalone/hf_colin.c  | 76 +++++++++++++++++------------------
 armsrc/Standalone/lf_icerun.c |  4 +-
 armsrc/appmain.c              | 42 +++++++++----------
 armsrc/flashmem.c             |  2 +-
 armsrc/fpgaloader.c           |  2 +-
 armsrc/lfops.c                |  2 +-
 armsrc/lfsampling.c           |  2 +-
 8 files changed, 67 insertions(+), 67 deletions(-)

diff --git a/armsrc/BigBuf.c b/armsrc/BigBuf.c
index ef768ab2b..07409029a 100644
--- a/armsrc/BigBuf.c
+++ b/armsrc/BigBuf.c
@@ -96,10 +96,10 @@ void BigBuf_free_keep_EM(void) {
 }
 
 void BigBuf_print_status(void) {
-    DbpStringEx(FLAG_LOG|FLAG_ANSI, _BLUE_("Memory"));
+    DbpStringEx(FLAG_LOG | FLAG_ANSI, _BLUE_("Memory"));
     Dbprintf("  BIGBUF_SIZE.............%d", BIGBUF_SIZE);
     Dbprintf("  Available memory........%d", BigBuf_hi);
-    DbpStringEx(FLAG_LOG|FLAG_ANSI, _BLUE_("Tracing"));
+    DbpStringEx(FLAG_LOG | FLAG_ANSI, _BLUE_("Tracing"));
     Dbprintf("  tracing ................%d", tracing);
     Dbprintf("  traceLen ...............%d", traceLen);
 }
diff --git a/armsrc/Standalone/hf_colin.c b/armsrc/Standalone/hf_colin.c
index 71cb636d1..c2f74f64e 100644
--- a/armsrc/Standalone/hf_colin.c
+++ b/armsrc/Standalone/hf_colin.c
@@ -124,7 +124,7 @@ void ReadLastTagFromFlash() {
     end_time = GetTickCount();
     DbprintfEx(FLAG_NEWLINE, "[OK] Last tag recovered from FLASHMEM set to emulator");
     cjSetCursLeft();
-    DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "%s[IN]%s %s%dms%s for TAG_FLASH_READ", _GREEN_, _WHITE_, _YELLOW_, end_time - start_time, _WHITE_);
+    DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "%s[IN]%s %s%dms%s for TAG_FLASH_READ", _GREEN_, _WHITE_, _YELLOW_, end_time - start_time, _WHITE_);
     cjSetCursLeft();
     FlashStop();
     SpinOff(0);
@@ -188,7 +188,7 @@ void WriteTagToFlash(uint8_t index, size_t size) {
 
     DbprintfEx(FLAG_NEWLINE, "[OK] TAG WRITTEN TO FLASH ! [0-to offset %u]", bytes_sent);
     cjSetCursLeft();
-    DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "%s[IN]%s %s%dms%s for TAG_FLASH_WRITE", _GREEN_, _WHITE_, _YELLOW_, end_time - start_time, _WHITE_);
+    DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "%s[IN]%s %s%dms%s for TAG_FLASH_WRITE", _GREEN_, _WHITE_, _YELLOW_, end_time - start_time, _WHITE_);
     cjSetCursLeft();
     FlashStop();
     SpinOff(0);
@@ -329,8 +329,8 @@ void RunMod() {
     // banner:
     vtsend_reset(NULL);
     DbprintfEx(FLAG_NEWLINE, "\r\n%s", clearTerm);
-    DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "%s%s%s", _CYAN_, sub_banner, _WHITE_);
-    DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "%s>>%s C.J.B's MifareFastPwn Started\r\n", _RED_, _WHITE_);
+    DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "%s%s%s", _CYAN_, sub_banner, _WHITE_);
+    DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "%s>>%s C.J.B's MifareFastPwn Started\r\n", _RED_, _WHITE_);
 
     currline = 20;
     curlline = 20;
@@ -370,16 +370,16 @@ failtag:
 
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     vtsend_cursor_position_restore(NULL);
-    DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "\t\t\t%s[   GOT a Tag !   ]%s", _GREEN_, _WHITE_);
+    DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "\t\t\t%s[   GOT a Tag !   ]%s", _GREEN_, _WHITE_);
     cjSetCursLeft();
     DbprintfEx(FLAG_NEWLINE, "\t\t\t       `---> Breaking keys ---->");
     cjSetCursRight();
 
-    DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "\t%sGOT TAG :%s %08x%s", _RED_, _CYAN_, cjcuid, _WHITE_);
+    DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "\t%sGOT TAG :%s %08x%s", _RED_, _CYAN_, cjcuid, _WHITE_);
 
     if (cjcuid == 0) {
         cjSetCursLeft();
-        DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "%s>>%s BUG: 0000_CJCUID! Retrying...", _RED_, _WHITE_);
+        DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "%s>>%s BUG: 0000_CJCUID! Retrying...", _RED_, _WHITE_);
         SpinErr(0, 100, 8);
         goto failtag;
     }
@@ -452,19 +452,19 @@ failtag:
                     // COMMON SCHEME 1  : INFINITRON/HEXACT
                     case 0x484558414354:
                         cjSetCursLeft();
-                        DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "%s>>>>>>>>>>>>!*STOP*!<<<<<<<<<<<<<<%s", _RED_, _WHITE_);
+                        DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "%s>>>>>>>>>>>>!*STOP*!<<<<<<<<<<<<<<%s", _RED_, _WHITE_);
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "    .TAG SEEMS %sDETERMINISTIC%s.     ", _GREEN_, _WHITE_);
+                        DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "    .TAG SEEMS %sDETERMINISTIC%s.     ", _GREEN_, _WHITE_);
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "%sDetected: %s INFI_HEXACT_VIGIK_TAG%s", _ORANGE_, _CYAN_, _WHITE_);
+                        DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "%sDetected: %s INFI_HEXACT_VIGIK_TAG%s", _ORANGE_, _CYAN_, _WHITE_);
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "...%s[%sKey_derivation_schemeTest%s]%s...", _YELLOW_, _GREEN_, _YELLOW_, _GREEN_);
+                        DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "...%s[%sKey_derivation_schemeTest%s]%s...", _YELLOW_, _GREEN_, _YELLOW_, _GREEN_);
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "%s>>>>>>>>>>>>!*DONE*!<<<<<<<<<<<<<<%s", _GREEN_, _WHITE_);
+                        DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "%s>>>>>>>>>>>>!*DONE*!<<<<<<<<<<<<<<%s", _GREEN_, _WHITE_);
                         ;
                         // Type 0 / A first
                         uint16_t t = 0;
@@ -597,19 +597,19 @@ failtag:
                     case 0x8829da9daf76:
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "%s>>>>>>>>>>>>!*STOP*!<<<<<<<<<<<<<<%s", _RED_, _WHITE_);
+                        DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "%s>>>>>>>>>>>>!*STOP*!<<<<<<<<<<<<<<%s", _RED_, _WHITE_);
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "    .TAG SEEMS %sDETERMINISTIC%s.     ", _GREEN_, _WHITE_);
+                        DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "    .TAG SEEMS %sDETERMINISTIC%s.     ", _GREEN_, _WHITE_);
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "%sDetected :%sURMET_CAPTIVE_VIGIK_TAG%s", _ORANGE_, _CYAN_, _WHITE_);
+                        DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "%sDetected :%sURMET_CAPTIVE_VIGIK_TAG%s", _ORANGE_, _CYAN_, _WHITE_);
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "...%s[%sKey_derivation_schemeTest%s]%s...", _YELLOW_, _GREEN_, _YELLOW_, _GREEN_);
+                        DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "...%s[%sKey_derivation_schemeTest%s]%s...", _YELLOW_, _GREEN_, _YELLOW_, _GREEN_);
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "%s>>>>>>>>>>>>!*DONE*!<<<<<<<<<<<<<<%s", _GREEN_, _WHITE_);
+                        DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "%s>>>>>>>>>>>>!*DONE*!<<<<<<<<<<<<<<%s", _GREEN_, _WHITE_);
                         cjSetCursLeft();
 
                         // emlClearMem();
@@ -639,19 +639,19 @@ failtag:
                     case 0x424c41524f4e:
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "%s>>>>>>>>>>>>!*STOP*!<<<<<<<<<<<<<<%s", _RED_, _WHITE_);
+                        DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "%s>>>>>>>>>>>>!*STOP*!<<<<<<<<<<<<<<%s", _RED_, _WHITE_);
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "    .TAG SEEMS %sDETERMINISTIC%s.     ", _GREEN_, _WHITE_);
+                        DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "    .TAG SEEMS %sDETERMINISTIC%s.     ", _GREEN_, _WHITE_);
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "%s  Detected :%sNORALSY_VIGIK_TAG %s", _ORANGE_, _CYAN_, _WHITE_);
+                        DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "%s  Detected :%sNORALSY_VIGIK_TAG %s", _ORANGE_, _CYAN_, _WHITE_);
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "...%s[%sKey_derivation_schemeTest%s]%s...", _YELLOW_, _GREEN_, _YELLOW_, _GREEN_);
+                        DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "...%s[%sKey_derivation_schemeTest%s]%s...", _YELLOW_, _GREEN_, _YELLOW_, _GREEN_);
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "%s>>>>>>>>>>>>!*DONE*!<<<<<<<<<<<<<<%s", _GREEN_, _WHITE_);
+                        DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "%s>>>>>>>>>>>>!*DONE*!<<<<<<<<<<<<<<%s", _GREEN_, _WHITE_);
 
                         t = 0;
                         for (uint16_t s = 0; s < sectorsCnt; s++) {
@@ -692,7 +692,7 @@ failtag:
     if (!allKeysFound) {
         cjSetCursLeft();
         cjTabulize();
-        DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "%s[ FAIL ]%s\r\n->did not found all the keys :'(", _RED_, _WHITE_);
+        DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "%s[ FAIL ]%s\r\n->did not found all the keys :'(", _RED_, _WHITE_);
         cjSetCursLeft();
         SpinErr(1, 100, 8);
         SpinOff(100);
@@ -711,25 +711,25 @@ failtag:
     }
     cjSetCursLeft();
 
-    DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "%s>>%s Setting Keys->Emulator MEM...[%sOK%s]", _YELLOW_, _WHITE_, _GREEN_, _WHITE_);
+    DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "%s>>%s Setting Keys->Emulator MEM...[%sOK%s]", _YELLOW_, _WHITE_, _GREEN_, _WHITE_);
 
     /* filling TAG to emulator */
     uint8_t filled = 0;
     cjSetCursLeft();
 
-    DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "%s>>%s Filling Emulator <- from A keys...", _YELLOW_, _WHITE_);
+    DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "%s>>%s Filling Emulator <- from A keys...", _YELLOW_, _WHITE_);
     e_MifareECardLoad(sectorsCnt, 0, 0, &filled);
     if (filled != 1) {
         cjSetCursLeft();
 
-        DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "%s>>%s W_FAILURE ! %sTrying fallback B keys....", _RED_, _ORANGE_, _WHITE_);
+        DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "%s>>%s W_FAILURE ! %sTrying fallback B keys....", _RED_, _ORANGE_, _WHITE_);
 
         /* no trace, no dbg  */
         e_MifareECardLoad(sectorsCnt, 1, 0, &filled);
         if (filled != 1) {
             cjSetCursLeft();
 
-            DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "FATAL:EML_FALLBACKFILL_B");
+            DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "FATAL:EML_FALLBACKFILL_B");
             SpinErr(2, 100, 8);
             SpinOff(100);
             return;
@@ -739,7 +739,7 @@ failtag:
     end_time = GetTickCount();
     cjSetCursLeft();
 
-    DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "%s>>%s Time for VIGIK break :%s%dms%s", _GREEN_, _WHITE_, _YELLOW_, end_time - start_time, _WHITE_);
+    DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "%s>>%s Time for VIGIK break :%s%dms%s", _GREEN_, _WHITE_, _YELLOW_, end_time - start_time, _WHITE_);
 
     vtsend_cursor_position_save(NULL);
     vtsend_set_attribute(NULL, 1);
@@ -758,10 +758,10 @@ readysim:
     DbprintfEx(FLAG_NEWLINE, "-> We launch Emulation ->");
     cjSetCursLeft();
 
-    DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "%s!> HOLD ON : %s When you'll click, simm will stop", _RED_, _WHITE_);
+    DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "%s!> HOLD ON : %s When you'll click, simm will stop", _RED_, _WHITE_);
     cjSetCursLeft();
 
-    DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "Then %s immediately %s we'll try to %s dump our emulator state%s \r\nin a %s chinese tag%s", _RED_, _WHITE_, _YELLOW_, _WHITE_,
+    DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "Then %s immediately %s we'll try to %s dump our emulator state%s \r\nin a %s chinese tag%s", _RED_, _WHITE_, _YELLOW_, _WHITE_,
                _CYAN_, _WHITE_);
     cjSetCursLeft();
     cjSetCursLeft();
@@ -777,7 +777,7 @@ readysim:
     LED_C_OFF();
     SpinOff(50);
     vtsend_cursor_position_restore(NULL);
-    DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "[   SIMUL ENDED   ]%s", _GREEN_, _WHITE_);
+    DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "[   SIMUL ENDED   ]%s", _GREEN_, _WHITE_);
     cjSetCursLeft();
 
     DbprintfEx(FLAG_NEWLINE, "<- We're out of Emulation");
@@ -789,7 +789,7 @@ readysim:
     saMifareMakeTag();
     cjSetCursLeft();
     vtsend_cursor_position_restore(NULL);
-    DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "%s[ CLONED? ]", _CYAN_);
+    DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "%s[ CLONED? ]", _CYAN_);
 
     DbprintfEx(FLAG_NEWLINE, "-> End Cloning.");
     WDT_HIT();
@@ -799,7 +799,7 @@ readysim:
     cjTabulize();
     vtsend_set_attribute(NULL, 0);
     vtsend_set_attribute(NULL, 7);
-    DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "- [ LA FIN ] -\r\n%s`-> You can take shell back :) ...", _WHITE_);
+    DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "- [ LA FIN ] -\r\n%s`-> You can take shell back :) ...", _WHITE_);
     cjSetCursLeft();
     vtsend_set_attribute(NULL, 0);
     SpinErr(3, 100, 16);
@@ -909,7 +909,7 @@ int cjat91_saMifareChkKeys(uint8_t blockNo, uint8_t keyType, bool clearTrace, ui
         // if (!iso14443a_fast_select_card(cjuid, 0)) {
         if (!iso14443a_select_card(cjuid, NULL, &cjcuid, true, 0, true)) {
             cjSetCursLeft();
-            DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "%sFATAL%s : E_MF_LOSTTAG", _RED_, _WHITE_);
+            DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "%sFATAL%s : E_MF_LOSTTAG", _RED_, _WHITE_);
             return -1;
         }
 
@@ -968,7 +968,7 @@ void saMifareMakeTag(void) {
             if (currfline > 53) {
                 currfline = 54;
             }
-            DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "Block :%02x %sOK%s", blockNum, _GREEN_, _WHITE_);
+            DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "Block :%02x %sOK%s", blockNum, _GREEN_, _WHITE_);
             //                                                      DbprintfEx(FLAG_RAWPRINT,"FATAL:E_MF_CHINESECOOK_NORICE");
             //                                                      cfail=1;
             // return;
@@ -977,15 +977,15 @@ void saMifareMakeTag(void) {
             cjSetCursLeft();
             cjSetCursLeft();
 
-            DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "`--> %sFAIL%s : CHN_FAIL_BLK_%02x_NOK", _RED_, _WHITE_, blockNum);
+            DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "`--> %sFAIL%s : CHN_FAIL_BLK_%02x_NOK", _RED_, _WHITE_, blockNum);
             cjSetCursFRight();
-            DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "%s>>>>%s STOP AT %02x", _RED_, _WHITE_, blockNum);
+            DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "%s>>>>%s STOP AT %02x", _RED_, _WHITE_, blockNum);
             cfail++;
             break;
         }
         cjSetCursFRight();
 
-        DbprintfEx(FLAG_NEWLINE|FLAG_ANSI, "%s>>>>>>>> END <<<<<<<<%s", _YELLOW_, _WHITE_);
+        DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "%s>>>>>>>> END <<<<<<<<%s", _YELLOW_, _WHITE_);
         // break;
         /*if (cfail == 1) {
                 DbprintfEx(FLAG_RAWPRINT,"FATAL: E_MF_HARA_KIRI_\r\n");
diff --git a/armsrc/Standalone/lf_icerun.c b/armsrc/Standalone/lf_icerun.c
index b9a87e397..bb1d8f6ac 100644
--- a/armsrc/Standalone/lf_icerun.c
+++ b/armsrc/Standalone/lf_icerun.c
@@ -30,8 +30,8 @@ void RunMod() {
         int button_pressed = BUTTON_HELD(1000);
 
         Dbprintf("button %d", button_pressed);
-        
-        if ( button_pressed )
+
+        if (button_pressed)
             break;
     }
 
diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 094e48372..2a67b044b 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -371,7 +371,7 @@ void SendVersion(void) {
 // measure the USB Speed by sending SpeedTestBufferSize bytes to client and measuring the elapsed time.
 // Note: this mimics GetFromBigbuf(), i.e. we have the overhead of the PacketCommandNG structure included.
 void printUSBSpeed(void) {
-    DbpStringEx(FLAG_LOG|FLAG_ANSI, _BLUE_("Transfer Speed"));
+    DbpStringEx(FLAG_LOG | FLAG_ANSI, _BLUE_("Transfer Speed"));
     Dbprintf("  Sending packets to client...");
 
 #define USB_SPEED_TEST_MIN_TIME 1500 // in milliseconds
@@ -412,12 +412,12 @@ void SendStatus(void) {
     printT55xxConfig(); // LF T55XX Config
 #endif
     printUSBSpeed();
-    DbpStringEx(FLAG_LOG|FLAG_ANSI, _BLUE_("Various"));
+    DbpStringEx(FLAG_LOG | FLAG_ANSI, _BLUE_("Various"));
     Dbprintf("  MF_DBGLEVEL.............%d", MF_DBGLEVEL);
     Dbprintf("  ToSendMax...............%d", ToSendMax);
     Dbprintf("  ToSendBit...............%d", ToSendBit);
     Dbprintf("  ToSend BUFFERSIZE.......%d", TOSEND_BUFFER_SIZE);
-    DbpStringEx(FLAG_LOG|FLAG_ANSI, _BLUE_("Installed StandAlone Mode"));
+    DbpStringEx(FLAG_LOG | FLAG_ANSI, _BLUE_("Installed StandAlone Mode"));
     ModInfo();
 
     //DbpString("Running ");
@@ -425,7 +425,7 @@ void SendStatus(void) {
     //Dbprintf("  Is Device attached to FPC| %s", send_using_0 ? "Yes" : "No");
     //Dbprintf("  Is USB_reconnect value   | %d", GetUSBreconnect() );
     //Dbprintf("  Is USB_configured value  | %d", GetUSBconfigured() );
-    
+
     reply_old(CMD_ACK, 1, 0, 0, 0, 0);
 }
 
@@ -501,22 +501,22 @@ void ListenReaderField(int limit) {
     }
 
     if (limit == HF_ONLY) {
-        
-    hf_av = hf_max = AvgAdc(ADC_CHAN_HF);
 
-    // iceman,  useless,  since we are measuring readerfield,  not our field.  My tests shows a max of 20v from a reader.
-    // RDV40 will hit the roof, try other ADC channel used in that hardware revision.
+        hf_av = hf_max = AvgAdc(ADC_CHAN_HF);
+
+        // iceman,  useless,  since we are measuring readerfield,  not our field.  My tests shows a max of 20v from a reader.
+        // RDV40 will hit the roof, try other ADC channel used in that hardware revision.
         use_high = (((MAX_ADC_HF_VOLTAGE * hf_max) >> 10) > MAX_ADC_HF_VOLTAGE - 300);
-    if (use_high) {
-        hf_av = hf_max = AvgAdc(ADC_CHAN_HF_RDV40);
-    }
+        if (use_high) {
+            hf_av = hf_max = AvgAdc(ADC_CHAN_HF_RDV40);
+        }
 
         Dbprintf("HF 13.56MHz Baseline: %dmV", (MAX_ADC_HF_VOLTAGE * hf_av) >> 10);
         hf_baseline = hf_av;
     }
 
     for (;;) {
-        
+
         // Switch modes with button
         if (BUTTON_PRESS()) {
             SpinDelay(500);
@@ -528,7 +528,7 @@ void ListenReaderField(int limit) {
                 case 2:
                 default:
                     DbpString("Stopped");
-                    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);                    
+                    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
                     LEDsoff();
                     return;
             }
@@ -588,13 +588,13 @@ void ListenReaderField(int limit) {
                     display_max = lf_max;
                 }
             }
-            
-            display_val = display_val * (4*LIGHT_LEVELS) / MAX(1,display_max);
-            uint32_t duty_a = MIN(MAX(display_val, 0*LIGHT_LEVELS), 1*LIGHT_LEVELS) - 0*LIGHT_LEVELS;
-            uint32_t duty_b = MIN(MAX(display_val, 1*LIGHT_LEVELS), 2*LIGHT_LEVELS) - 1*LIGHT_LEVELS;
-            uint32_t duty_c = MIN(MAX(display_val, 2*LIGHT_LEVELS), 3*LIGHT_LEVELS) - 2*LIGHT_LEVELS;
-            uint32_t duty_d = MIN(MAX(display_val, 3*LIGHT_LEVELS), 4*LIGHT_LEVELS) - 3*LIGHT_LEVELS;
-            
+
+            display_val = display_val * (4 * LIGHT_LEVELS) / MAX(1, display_max);
+            uint32_t duty_a = MIN(MAX(display_val, 0 * LIGHT_LEVELS), 1 * LIGHT_LEVELS) - 0 * LIGHT_LEVELS;
+            uint32_t duty_b = MIN(MAX(display_val, 1 * LIGHT_LEVELS), 2 * LIGHT_LEVELS) - 1 * LIGHT_LEVELS;
+            uint32_t duty_c = MIN(MAX(display_val, 2 * LIGHT_LEVELS), 3 * LIGHT_LEVELS) - 2 * LIGHT_LEVELS;
+            uint32_t duty_d = MIN(MAX(display_val, 3 * LIGHT_LEVELS), 4 * LIGHT_LEVELS) - 3 * LIGHT_LEVELS;
+
             // LED A
             if (duty_a == 0) {
                 LED_A_OFF();
@@ -607,7 +607,7 @@ void ListenReaderField(int limit) {
                 SpinDelay(LIGHT_LEVELS - duty_a);
             }
 
-            // LED B            
+            // LED B
             if (duty_b == 0) {
                 LED_B_OFF();
             } else if (duty_b == LIGHT_LEVELS) {
diff --git a/armsrc/flashmem.c b/armsrc/flashmem.c
index 331696dec..6cb13dfc8 100644
--- a/armsrc/flashmem.c
+++ b/armsrc/flashmem.c
@@ -517,7 +517,7 @@ void Flash_EraseChip(void) {
 */
 
 void Flashmem_print_status(void) {
-    DbpStringEx(FLAG_LOG|FLAG_ANSI, _BLUE_("Flash memory"));
+    DbpStringEx(FLAG_LOG | FLAG_ANSI, _BLUE_("Flash memory"));
     Dbprintf("  Baudrate................%dMHz", FLASHMEM_SPIBAUDRATE / 1000000);
 
     if (!FlashInit()) {
diff --git a/armsrc/fpgaloader.c b/armsrc/fpgaloader.c
index 154cd40d2..849524bce 100644
--- a/armsrc/fpgaloader.c
+++ b/armsrc/fpgaloader.c
@@ -483,7 +483,7 @@ void SetAdcMuxFor(uint32_t whichGpio) {
 }
 
 void Fpga_print_status(void) {
-    DbpStringEx(FLAG_LOG|FLAG_ANSI, _BLUE_("Currently loaded FPGA image"));
+    DbpStringEx(FLAG_LOG | FLAG_ANSI, _BLUE_("Currently loaded FPGA image"));
     Dbprintf("  mode....................%s", fpga_version_information[downloaded_bitstream - 1]);
 }
 
diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index 9b49928e1..d1a81220f 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -55,7 +55,7 @@ Default LF T55xx config is set to:
 t55xx_config t_config = { 29 * 8, 17 * 8, 15 * 8, 47 * 8, 15 * 8 } ;
 
 void printT55xxConfig(void) {
-    DbpStringEx(FLAG_LOG|FLAG_ANSI, _BLUE_("LF T55XX config"));
+    DbpStringEx(FLAG_LOG | FLAG_ANSI, _BLUE_("LF T55XX config"));
     Dbprintf("  [a] startgap............%d*8 (%d)", t_config.start_gap / 8, t_config.start_gap);
     Dbprintf("  [b] writegap............%d*8 (%d)", t_config.write_gap / 8, t_config.write_gap);
     Dbprintf("  [c] write_0.............%d*8 (%d)", t_config.write_0 / 8,   t_config.write_0);
diff --git a/armsrc/lfsampling.c b/armsrc/lfsampling.c
index becf966c8..73c8bcd45 100644
--- a/armsrc/lfsampling.c
+++ b/armsrc/lfsampling.c
@@ -19,7 +19,7 @@ Default LF config is set to:
 sample_config config = { 1, 8, 1, 95, 0 } ;
 
 void printConfig() {
-    DbpStringEx(FLAG_LOG|FLAG_ANSI, _BLUE_("LF Sampling config"));
+    DbpStringEx(FLAG_LOG | FLAG_ANSI, _BLUE_("LF Sampling config"));
     Dbprintf("  [q] divisor.............%d (%d KHz)", config.divisor, 12000 / (config.divisor + 1));
     Dbprintf("  [b] bps.................%d", config.bits_per_sample);
     Dbprintf("  [d] decimation..........%d", config.decimation);

From 9779868753c47e757f1168189eb391a434e9fd3a Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 28 Apr 2019 11:09:46 +0200
Subject: [PATCH 1461/1938] style

---
 client/cmdcrc.c         | 12 +++++++++-
 client/cmdhfmf.c        |  4 ++--
 client/cmdhw.c          | 16 ++++++-------
 client/comms.c          | 16 ++++++-------
 client/fido/cbortools.c |  2 +-
 client/reveng/poly.c    | 23 ++++++++++++++++---
 client/scripting.c      | 50 ++++++++++++++++++++---------------------
 client/util.c           | 20 ++++++++---------
 common/i2c.c            |  2 +-
 9 files changed, 86 insertions(+), 59 deletions(-)

diff --git a/client/cmdcrc.c b/client/cmdcrc.c
index 8e3d9bba1..e5d62d46e 100644
--- a/client/cmdcrc.c
+++ b/client/cmdcrc.c
@@ -414,6 +414,17 @@ static int CmdrevengSearch(const char *Cmd) {
         // can't test a model that has more crc digits than our data
         if (crcChars >= dataLen)
             continue;
+
+        PrintAndLogEx(DEBUG
+                      , "DEBUG: dataLen %d, crcChars %u,  width[i] %u"
+                      , dataLen
+                      , crcChars
+                      , width[i]
+                     );
+
+        if (crcChars == 0)
+            continue;
+
         memset(result, 0, 30);
         char *inCRC = calloc(crcChars + 1, sizeof(char));
         memcpy(inCRC, inHexStr + (dataLen - crcChars), crcChars);
@@ -421,7 +432,6 @@ static int CmdrevengSearch(const char *Cmd) {
         char *outHex = calloc(dataLen - crcChars + 1, sizeof(char));
         memcpy(outHex, inHexStr, dataLen - crcChars);
 
-        PrintAndLogEx(DEBUG, "DEBUG: dataLen: %d, crcChars: %d, Model: %s, CRC: %s, width: %d, outHex: %s", dataLen, crcChars, Models[i], inCRC, width[i], outHex);
         ans = RunModel(Models[i], outHex, false, 0, result);
         if (ans) {
             // test for match
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index a0a300c6c..052bcd191 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -2219,8 +2219,8 @@ static int CmdHF14AMfSim(const char *Cmd) {
                   , csize
                   , uidsize
                   , (uidlen == 0) ? "N/A" : sprint_hex(uid, uidlen >> 1)
-    );
-    
+                 );
+
     PrintAndLogEx(INFO, "Options [ numreads: %d, flags: %d (0x%02x) ]"
                   , exitAfterNReads
                   , flags
diff --git a/client/cmdhw.c b/client/cmdhw.c
index 72f0b4b2f..461e48f0b 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -309,22 +309,22 @@ static void lookupChipID(uint32_t iChipID, uint32_t mem_used) {
 
 static int CmdDetectReader(const char *Cmd) {
     uint16_t arg = 0;
-    char c = tolower(Cmd[0]);   
-    switch ( c ) {
-        case 'l': 
-        arg = 1;
+    char c = tolower(Cmd[0]);
+    switch (c) {
+        case 'l':
+            arg = 1;
             break;
         case 'h':
-        arg = 2;
+            arg = 2;
             break;
         default: {
             PrintAndLogEx(NORMAL, "use 'detectreader'");
             PrintAndLogEx(NORMAL, "    'detectreader l'   -- 125/134 kHz");
             PrintAndLogEx(NORMAL, "    'detectreader h'   -- 13.56 mHz");
-        return PM3_EINVARG;
+            return PM3_EINVARG;
+        }
     }
-    }
-    
+
     clearCommandBuffer();
     SendCommandOLD(CMD_LISTEN_READER_FIELD, arg, 0, 0, NULL, 0);
     return PM3_SUCCESS;
diff --git a/client/comms.c b/client/comms.c
index 095bcc115..d79f12c30 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -241,23 +241,23 @@ static void memcpy_filtered(void *dest, const void *src, size_t n, bool filter)
         uint8_t *rsrc = (uint8_t *)src;
         uint16_t si = 0;
         for (uint16_t i = 0; i < n; i++) {
-            if ( (rsrc[i] == '\x1b') 
-                && (i < n - 1) 
-                && (rsrc[i + 1] >= 0x40) 
-                && (rsrc[i + 1] <= 0x5F) ) { // entering ANSI sequence
-                
+            if ((rsrc[i] == '\x1b')
+                    && (i < n - 1)
+                    && (rsrc[i + 1] >= 0x40)
+                    && (rsrc[i + 1] <= 0x5F)) {  // entering ANSI sequence
+
                 i++;
                 if ((rsrc[i] == '[') && (i < n - 1)) { // entering CSI sequence
                     i++;
-                    
+
                     while ((i < n - 1) && (rsrc[i] >= 0x30) && (rsrc[i] <= 0x3F)) { // parameter bytes
                         i++;
                     }
-                    
+
                     while ((i < n - 1) && (rsrc[i] >= 0x20) && (rsrc[i] <= 0x2F)) { // intermediate bytes
                         i++;
                     }
-                    
+
                     if ((rsrc[i] >= 0x40) && (rsrc[i] <= 0x7F)) { // final byte
                         continue;
                     }
diff --git a/client/fido/cbortools.c b/client/fido/cbortools.c
index d7a138779..7cb7fc456 100644
--- a/client/fido/cbortools.c
+++ b/client/fido/cbortools.c
@@ -207,7 +207,7 @@ int TinyCborPrintFIDOPackage(uint8_t cmdCode, bool isResponse, uint8_t *data, si
                 "CBOR parsing failure at offset %" PRId32 " : %s\n",
                 (uint32_t)(cb.ptr - data),
                 cbor_error_string(err)
-                );
+               );
         return 1;
     }
 
diff --git a/client/reveng/poly.c b/client/reveng/poly.c
index 0ce60aac2..0fc6555d9 100644
--- a/client/reveng/poly.c
+++ b/client/reveng/poly.c
@@ -596,11 +596,15 @@ plast(const poly_t poly) {
     unsigned long idx, size = SIZE(poly.length);
     bmp_t accu;
     unsigned int probe = BMP_SUB, ofs = 0;
-
     if (!poly.length) return (0UL);
     idx = size - 1UL;
     while (idx && !(accu = poly.bitmap[idx])) --idx;
+
+    if (poly.length == 24)
+        printf("ICE plast B - poly.length %lu vs size %lu idx %lu bitmap %ld\n", poly.length, size, idx,  poly.bitmap[idx]);
+
     if (!idx && !(accu = poly.bitmap[idx])) return (0UL);
+
     /* now accu == poly.bitmap[idx] and contains last significant term */
     while (probe) {
 #ifndef BMP_POF2
@@ -609,7 +613,6 @@ plast(const poly_t poly) {
         if (accu << (ofs | probe)) ofs |= probe;
         probe >>= 1;
     }
-
     return (idx * BMP_BIT + ofs + 1UL);
 }
 
@@ -1074,20 +1077,34 @@ praloc(poly_t *poly, unsigned long length) {
     if (oldsize != size)
         /* reallocate if array pointer is null or array resized */
         poly->bitmap = (bmp_t *) realloc((void *)poly->bitmap, size * sizeof(bmp_t));
+
     if (poly->bitmap) {
+
+        if (poly->length == 24)
+            printf("ICE praloc - poly->length %lu\n", poly->length);
+
+
         if (poly->length < length) {
             /* poly->length >= 0, length > 0, size > 0.
              * poly expanded. clear old last word and all new words
              */
             if (LOFS(poly->length))
                 poly->bitmap[oldsize - 1UL] &= ~(~BMP_C(0) >> LOFS(poly->length));
+
             while (oldsize < size)
                 poly->bitmap[oldsize++] = BMP_C(0);
-        } else if (LOFS(length))
+
+            if (poly->length == 24) printf("ICE praloc MISS A\n");
+
+        } else if (LOFS(length)) {
             /* poly->length >= length > 0.
              * poly shrunk. clear new last word
              */
             poly->bitmap[size - 1UL] &= ~(~BMP_C(0) >> LOFS(length));
+
+            if (poly->length == 24) printf("ICE praloc B  size %lu,  bm %lu \n", size, poly->bitmap[size - 1UL]);
+        }
+
         poly->length = length;
     } else
         uerror("cannot reallocate memory for poly");
diff --git a/client/scripting.c b/client/scripting.c
index 333067e8a..fb5bf4f1d 100644
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -63,7 +63,7 @@ static int l_SendCommandOLD(lua_State *L) {
 // (uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len)
 
     uint64_t cmd, arg0, arg1, arg2;
-    uint8_t data[USB_CMD_DATA_SIZE] = {0}; 
+    uint8_t data[USB_CMD_DATA_SIZE] = {0};
     size_t len = 0, size;
 
     //Check number of arguments
@@ -78,13 +78,13 @@ static int l_SendCommandOLD(lua_State *L) {
     if (size != 4)
         return returnToLuaWithError(L, "Wrong size of cmd, got %d bytes, expected 2", (int) size);
     sscanf(p_cmd, " %" SCNx64, &cmd);
-    
+
     // arg0
     const char *p_arg0 = luaL_checklstring(L, 2, &size);
     if (size != 16)
         return returnToLuaWithError(L, "Wrong size of arg0, got %d bytes, expected 16", (int) size);
     sscanf(p_arg0, " %" SCNx64, &arg0);
-    
+
     // arg1
     const char *p_arg1 = luaL_checklstring(L, 3, &size);
     if (size != 16)
@@ -96,14 +96,14 @@ static int l_SendCommandOLD(lua_State *L) {
     if (size != 16)
         return returnToLuaWithError(L, "Wrong size of arg2, got %d bytes, expected 16", (int) size);
     sscanf(p_arg2, " %" SCNx64, &arg2);
-    
+
     // data
     const char *p_data = luaL_checklstring(L, 5, &size);
-    
-    if ( size ) {
-        if ( size > 1024 )
+
+    if (size) {
+        if (size > 1024)
             size = 1024;
-         
+
         uint32_t tmp;
         for (int i = 0; i < size; i += 2) {
             sscanf(&p_data[i], "%02x", &tmp);
@@ -118,7 +118,7 @@ static int l_SendCommandOLD(lua_State *L) {
 /**
  * The following params expected:
  * @brief l_SendCommandMIX
- * @param L - a lua string with the following five params. 
+ * @param L - a lua string with the following five params.
  * @param cmd  must be hexstring, max u64
  * @param arg0  must be hexstring, max u64
  * @param arg1  must be hexstring, max u64
@@ -136,20 +136,20 @@ static int l_SendCommandMIX(lua_State *L) {
     int n = lua_gettop(L);
     if (n != 5)
         return returnToLuaWithError(L, "You need to supply five parameters");
-       
+
     // parse input
     // cmd
     const char *p_cmd = luaL_checklstring(L, 1, &size);
     if (size != 4)
         return returnToLuaWithError(L, "Wrong size of cmd, got %d bytes, expected 2", (int) size);
     sscanf(p_cmd, " %" SCNx64, &cmd);
-    
+
     // arg0
     const char *p_arg0 = luaL_checklstring(L, 2, &size);
     if (size != 16)
         return returnToLuaWithError(L, "Wrong size of arg0, got %d bytes, expected 16", (int) size);
     sscanf(p_arg0, " %" SCNx64, &arg0);
-    
+
     // arg1
     const char *p_arg1 = luaL_checklstring(L, 3, &size);
     if (size != 16)
@@ -161,13 +161,13 @@ static int l_SendCommandMIX(lua_State *L) {
     if (size != 16)
         return returnToLuaWithError(L, "Wrong size of arg2, got %d bytes, expected 16", (int) size);
     sscanf(p_arg2, " %" SCNx64, &arg2);
-    
+
     // data
-    const char *p_data = luaL_checklstring(L, 5, &size);    
-    if ( size ) {
-        if ( size > 1024 )
+    const char *p_data = luaL_checklstring(L, 5, &size);
+    if (size) {
+        if (size > 1024)
             size = 1024;
-         
+
         uint32_t tmp;
         for (int i = 0; i < size; i += 2) {
             sscanf(&p_data[i], "%02x", &tmp);
@@ -196,7 +196,7 @@ static int l_GetFromBigBuf(lua_State *L) {
     if (n == 0) {
         return returnToLuaWithError(L, "You need to supply number of bytes and startindex");
     }
-    
+
     if (n >= 2) {
         startindex = luaL_checknumber(L, 1);
         len = luaL_checknumber(L, 2);
@@ -240,7 +240,7 @@ static int l_GetFromFlashMem(lua_State *L) {
     int n = lua_gettop(L);
     if (n == 0)
         return returnToLuaWithError(L, "You need to supply number of bytes and startindex");
-    
+
     if (n >= 2) {
         startindex = luaL_checknumber(L, 1);
         len = luaL_checknumber(L, 2);
@@ -824,19 +824,19 @@ static int l_T55xx_readblock(lua_State *L) {
     const char *p_blockno = luaL_checklstring(L, 1, &size);
     if (size < 1 || size > 2)
         return returnToLuaWithError(L, "Wrong size of blockNo, got %d, expected 1 or 2", (int) size);
-    
+
     sscanf(p_blockno, "%x", &block);
 
     const char *p_usepage1 = luaL_checklstring(L, 2, &size);
     if (size != 1)
         return returnToLuaWithError(L, "Wrong size of usePage1, got %d, expected 1", (int) size);
-    
+
     sscanf(p_usepage1, "%x", &usepage1);
 
     const char *p_override = luaL_checklstring(L, 3, &size);
     if (size != 1)
         return returnToLuaWithError(L, "Wrong size of override, got %d, expected 1", (int) size);
-    
+
     sscanf(p_override, "%x", &override);
 
     const char *p_pwd = luaL_checklstring(L, 4, &size);
@@ -846,7 +846,7 @@ static int l_T55xx_readblock(lua_State *L) {
 
         if (size != 8)
             return returnToLuaWithError(L, "Wrong size of pwd, got %d , expected 8", (int) size);
-        
+
         sscanf(p_pwd, "%08x", &password);
         usepwd = true;
     }
@@ -905,7 +905,7 @@ static int l_T55xx_detect(lua_State *L) {
             const char *p_gb = luaL_checklstring(L, 2, &size);
             if (size != 1)
                 return returnToLuaWithError(L, "Wrong size of useGB, got %d , expected 1", (int) size);
-            
+
             sscanf(p_gb, "%u", &gb);
             useGB = (gb) ? true : false;
             printf("p_gb size  %zu | %c \n", size, useGB ? 'Y' : 'N');
@@ -918,7 +918,7 @@ static int l_T55xx_detect(lua_State *L) {
 
                 if (size != 8)
                     return returnToLuaWithError(L, "Wrong size of pwd, got %d , expected 8", (int) size);
-                
+
                 sscanf(p_pwd, "%08x", &password);
                 usepwd = true;
             }
diff --git a/client/util.c b/client/util.c
index a99eeaaaf..ce21ffbee 100644
--- a/client/util.c
+++ b/client/util.c
@@ -800,19 +800,19 @@ int num_CPUs(void) {
 #elif defined(__linux__) && defined(_SC_NPROCESSORS_ONLN)
 #include <unistd.h>
     int count = sysconf(_SC_NPROCESSORS_ONLN);
-    if (count <= 0) 
+    if (count <= 0)
         count = 1;
-    return count;   
+    return count;
 #elif defined(__APPLE__)
-/*
-   TODO ICEMAN 2019, its commented out until someone finds a better solution
+    /*
+       TODO ICEMAN 2019, its commented out until someone finds a better solution
 #include "sys/sysctl.h"
-    uint32_t logicalcores = 0;
-    size_t size = sizeof( logicalcores );
-    sysctlbyname( "hw.logicalcpu", &logicalcores, &size, NULL, 0 );
-    return logicalcores;
-    */
-    return 1;    
+        uint32_t logicalcores = 0;
+        size_t size = sizeof( logicalcores );
+        sysctlbyname( "hw.logicalcpu", &logicalcores, &size, NULL, 0 );
+        return logicalcores;
+        */
+    return 1;
 #else
     return 1;
 #endif
diff --git a/common/i2c.c b/common/i2c.c
index b2a9056d4..1a2f2d5d0 100644
--- a/common/i2c.c
+++ b/common/i2c.c
@@ -593,7 +593,7 @@ bool I2C_WriteFW(uint8_t *data, uint8_t len, uint8_t msb, uint8_t lsb, uint8_t d
 }
 
 void I2C_print_status(void) {
-    DbpStringEx(FLAG_LOG|FLAG_ANSI, _BLUE_("Smart card module (ISO 7816)"));
+    DbpStringEx(FLAG_LOG | FLAG_ANSI, _BLUE_("Smart card module (ISO 7816)"));
     uint8_t resp[] = {0, 0, 0, 0};
     I2C_Reset_EnterMainProgram();
     uint8_t len = I2C_BufferRead(resp, sizeof(resp), I2C_DEVICE_CMD_GETVERSION, I2C_DEVICE_ADDRESS_MAIN);

From cc5b63823b9d4780b48d9b08ab1d4485d9177f44 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 28 Apr 2019 12:52:25 +0200
Subject: [PATCH 1462/1938] chg: better sending

---
 client/scripting.c | 66 ++++++++++++----------------------------------
 1 file changed, 17 insertions(+), 49 deletions(-)

diff --git a/client/scripting.c b/client/scripting.c
index fb5bf4f1d..5b84480b4 100644
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -73,33 +73,13 @@ static int l_SendCommandOLD(lua_State *L) {
     }
 
     // parse input
-    // cmd
-    const char *p_cmd = luaL_checklstring(L, 1, &size);
-    if (size != 4)
-        return returnToLuaWithError(L, "Wrong size of cmd, got %d bytes, expected 2", (int) size);
-    sscanf(p_cmd, " %" SCNx64, &cmd);
-
-    // arg0
-    const char *p_arg0 = luaL_checklstring(L, 2, &size);
-    if (size != 16)
-        return returnToLuaWithError(L, "Wrong size of arg0, got %d bytes, expected 16", (int) size);
-    sscanf(p_arg0, " %" SCNx64, &arg0);
-
-    // arg1
-    const char *p_arg1 = luaL_checklstring(L, 3, &size);
-    if (size != 16)
-        return returnToLuaWithError(L, "Wrong size of arg1, got %d bytes, expected 16", (int) size);
-    sscanf(p_arg1, " %" SCNx64, &arg1);
-
-    // arg2
-    const char *p_arg2 = luaL_checklstring(L, 4, &size);
-    if (size != 16)
-        return returnToLuaWithError(L, "Wrong size of arg2, got %d bytes, expected 16", (int) size);
-    sscanf(p_arg2, " %" SCNx64, &arg2);
+    cmd = luaL_checknumber(L, 1);   
+    arg0 = luaL_checknumber(L, 2);
+    arg1 = luaL_checknumber(L, 3);
+    arg2 = luaL_checknumber(L, 4);    
 
     // data
     const char *p_data = luaL_checklstring(L, 5, &size);
-
     if (size) {
         if (size > 1024)
             size = 1024;
@@ -111,8 +91,11 @@ static int l_SendCommandOLD(lua_State *L) {
             len++;
         }
     }
+    
+    printf("Sending old\n");
     SendCommandOLD(cmd, arg0, arg1, arg2, data, len);
-    return 0;
+    lua_pushboolean(L, true);    
+    return 1;
 }
 
 /**
@@ -138,29 +121,10 @@ static int l_SendCommandMIX(lua_State *L) {
         return returnToLuaWithError(L, "You need to supply five parameters");
 
     // parse input
-    // cmd
-    const char *p_cmd = luaL_checklstring(L, 1, &size);
-    if (size != 4)
-        return returnToLuaWithError(L, "Wrong size of cmd, got %d bytes, expected 2", (int) size);
-    sscanf(p_cmd, " %" SCNx64, &cmd);
-
-    // arg0
-    const char *p_arg0 = luaL_checklstring(L, 2, &size);
-    if (size != 16)
-        return returnToLuaWithError(L, "Wrong size of arg0, got %d bytes, expected 16", (int) size);
-    sscanf(p_arg0, " %" SCNx64, &arg0);
-
-    // arg1
-    const char *p_arg1 = luaL_checklstring(L, 3, &size);
-    if (size != 16)
-        return returnToLuaWithError(L, "Wrong size of arg1, got %d bytes, expected 16", (int) size);
-    sscanf(p_arg1, " %" SCNx64, &arg1);
-
-    // arg2
-    const char *p_arg2 = luaL_checklstring(L, 4, &size);
-    if (size != 16)
-        return returnToLuaWithError(L, "Wrong size of arg2, got %d bytes, expected 16", (int) size);
-    sscanf(p_arg2, " %" SCNx64, &arg2);
+    cmd = luaL_checknumber(L, 1);   
+    arg0 = luaL_checknumber(L, 2);
+    arg1 = luaL_checknumber(L, 3);
+    arg2 = luaL_checknumber(L, 4);    
 
     // data
     const char *p_data = luaL_checklstring(L, 5, &size);
@@ -176,8 +140,12 @@ static int l_SendCommandMIX(lua_State *L) {
         }
     }
 
+    printf("Sending MIX\n cmd %016" PRIx64 "\n" , cmd);
+    printf("arg %016" PRIx64 " %016" PRIx64 " %016" PRIx64 "\n", arg0,arg1,arg2);
+    printf("len %d\n", len);
     SendCommandMIX(cmd, arg0, arg1, arg2, data, len);
-    return 0;
+    lua_pushboolean(L, true);
+    return 1;
 }
 /**
  * @brief The following params expected:

From 292462fb74b2e21a11f58a97e328d7c43cae47d4 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 28 Apr 2019 16:31:49 +0200
Subject: [PATCH 1463/1938] fixes to sendMIX/SendNG

---
 client/scripting.c | 48 +++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 43 insertions(+), 5 deletions(-)

diff --git a/client/scripting.c b/client/scripting.c
index 5b84480b4..309e5dc40 100644
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -91,8 +91,7 @@ static int l_SendCommandOLD(lua_State *L) {
             len++;
         }
     }
-    
-    printf("Sending old\n");
+
     SendCommandOLD(cmd, arg0, arg1, arg2, data, len);
     lua_pushboolean(L, true);    
     return 1;
@@ -140,13 +139,51 @@ static int l_SendCommandMIX(lua_State *L) {
         }
     }
 
-    printf("Sending MIX\n cmd %016" PRIx64 "\n" , cmd);
-    printf("arg %016" PRIx64 " %016" PRIx64 " %016" PRIx64 "\n", arg0,arg1,arg2);
-    printf("len %d\n", len);
     SendCommandMIX(cmd, arg0, arg1, arg2, data, len);
     lua_pushboolean(L, true);
     return 1;
 }
+/**
+ * The following params expected:
+ * @brief l_SendCommandMIX
+ * @param L - a lua string with the following two params.
+ * @param cmd  must be hexstring, max u64
+ * @param data  must be hexstring less than 1024 chars(512bytes)
+ * @return
+ */
+static int l_SendCommandNG(lua_State *L) {
+
+    uint8_t data[USB_CMD_DATA_SIZE] = {0};
+    size_t len = 0, size;
+
+    // check number of arguments
+    int n = lua_gettop(L);
+    if (n != 2)
+        return returnToLuaWithError(L, "You need to supply two parameters");
+
+    // parse input
+    uint64_t cmd = luaL_checknumber(L, 1);   
+
+    // data
+    const char *p_data = luaL_checklstring(L, 2, &size);
+    if (size) {
+        if (size > 1024)
+            size = 1024;
+
+        uint32_t tmp;
+        for (int i = 0; i < size; i += 2) {
+            sscanf(&p_data[i], "%02x", &tmp);
+            data[i >> 1] = tmp & 0xFF;
+            len++;
+        }
+    }
+
+    SendCommandNG(cmd, data, len);
+    lua_pushboolean(L, true);
+    return 1;
+}
+
+
 /**
  * @brief The following params expected:
  * uint8_t *dest
@@ -942,6 +979,7 @@ int set_pm3_libraries(lua_State *L) {
         {"SendCommand",                 l_SendCommand},
         {"SendCommandOLD",              l_SendCommandOLD},
         {"SendCommandMIX",              l_SendCommandMIX},
+        {"SendCommandNG",               l_SendCommandNG},
         {"GetFromBigBuf",               l_GetFromBigBuf},
         {"GetFromFlashMem",             l_GetFromFlashMem},
         {"WaitForResponseTimeout",      l_WaitForResponseTimeout},

From 195887487bbb65fadcd43e1727f35d55467d2923 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 28 Apr 2019 16:35:30 +0200
Subject: [PATCH 1464/1938] fixes to commands.lua to support MIX/NG

---
 client/lualibs/commands.lua | 148 ++++++++++++++++++++++++++++++++++--
 1 file changed, 141 insertions(+), 7 deletions(-)

diff --git a/client/lualibs/commands.lua b/client/lualibs/commands.lua
index c493699c5..b41a663bf 100644
--- a/client/lualibs/commands.lua
+++ b/client/lualibs/commands.lua
@@ -3,6 +3,7 @@ Handle Proxmark USB Commands
 --]]
 
 local _commands = require('usb_cmd')
+local util = require('utils')
 
 local _reverse_lookup,k,v = {}
     for k, v in pairs(_commands) do
@@ -29,14 +30,14 @@ Command = {
         o.arg3 = o.arg3 or 0
         local data = o.data or "0"
 
-        if(type(data) == 'string') then
+        if (type(data) == 'string') then
             -- We need to check if it is correct length, otherwise pad it
             local len = string.len(data)
-            if(len < 1024) then
+            if (len < 1024) then
                 --Should be 1024 hex characters to represent 512 bytes of data
                 data = data .. string.rep("0",1024 - len )
             end
-            if(len > 1024) then
+            if (len > 1024) then
                 -- OOps, a bit too much data here
                 print( ( "WARNING: data size too large, was %s chars, will be truncated "):format(len) )
                 --
@@ -48,12 +49,55 @@ Command = {
         o.data = data
         return o
     end,
-    parse = function (packet)
-        local count, cmd, arg1, arg2, arg3, data = bin.unpack('LLLLH511', packet)
-        return Command:new{cmd = cmd, arg1 = arg1, arg2 = arg2, arg3 = arg3, data = data}
-    end
+    newMIX = function(self, o)
 
+        local o = o or {}   -- create object if user does not provide one
+        setmetatable(o, self) -- DIY inheritance a'la javascript
+        self.__index = self
+
+        o.cmd = o.cmd or _commands.CMD_UNKNOWN
+        o.arg1 = o.arg1 or 0
+        o.arg2 = o.arg2 or 0
+        o.arg3 = o.arg3 or 0
+        local data = o.data or ''
+
+        if (type(data) == 'string') then
+            if (#data > 1024) then
+                -- OOps, a bit too much data here
+                print( ( "WARNING: data size too large, was %s chars, will be truncated "):format( #data) )
+                --
+                data = data:sub(1,1024)
+            end
+        end
+        o.data = data
+        return o
+    end,
+    newNG = function(self, o)
+
+        local o = o or {}   -- create object if user does not provide one
+        setmetatable(o, self) -- DIY inheritance a'la javascript
+        self.__index = self
+
+        o.cmd = o.cmd or _commands.CMD_UNKNOWN
+        local data = o.data or ''
+
+        if (type(data) == 'string') then
+            if (#data > 1024) then
+                -- OOps, a bit too much data here
+                print( ( "WARNING: data size too large, was %s chars, will be truncated "):format( #data) )
+                --
+                data = data:sub(1,1024)
+            end
+        end
+        o.data = data
+        return o
+    end,    
+    parse = function (packet)
+            local count, cmd, arg1, arg2, arg3, data = bin.unpack('LLLLH511', packet)
+            return Command:new{cmd = cmd, arg1 = arg1, arg2 = arg2, arg3 = arg3, data = data}
+    end    
 }
+-- commented out,  not used.   
 function Command:__tostring()
     local output = ("%s\r\nargs : (%s, %s, %s)\r\ndata:\r\n%s\r\n"):format(
         _commands.tostring(self.cmd),
@@ -63,6 +107,7 @@ function Command:__tostring()
         tostring(self.data))
     return output
 end
+
 function Command:getBytes()
     --If a hex-string has been used
     local data  = self.data
@@ -70,4 +115,93 @@ function Command:getBytes()
     local arg1, arg2, arg3 = self.arg1, self.arg2, self.arg3
     return bin.pack("LLLLH",cmd, arg1, arg2, arg3, data);
 end
+
+function Command:__responsetostring()
+    print('NG package received')
+    print('CMD    ::', _commands.tostring(self.resp_cmd))
+    print('Length ::', tostring(self.resp_length))
+    print('Magic  ::', string.format("0x%08X", self.resp_magic), util.ConvertHexToAscii(string.format("0x%08X", self.resp_magic)))
+    print('Status ::', tostring(self.resp_status))
+    print('crc    ::', string.format("0x%02X", self.resp_crc))
+    print('Args   ::', ("(%s, %s, %s)\r\n"):format(
+                    tostring(self.resp_arg1),
+                    tostring(self.resp_arg2),
+                    tostring(self.resp_arg3)))
+    print('NG     ::', self.resp_ng)    
+    print('package ::', self.resp_response)
+end
+
+function Command:sendMIX( ignore_response, timeout )
+    local data = self.data
+    local cmd = self.cmd
+    local arg1, arg2, arg3 = self.arg1, self.arg2, self.arg3
+        
+    local err, msg = core.SendCommandMIX(cmd, arg1, arg2, arg3, data)
+    if err == nil then return err, msg end
+    
+    if ignoreresponse then return true, nil end
+
+    local response, msg = core.WaitForResponseTimeout(_commands.CMD_ACK, timeout)
+    if response == nil then
+        return nil, 'Error, waiting for response timed out :: '..msg
+    end
+    
+    -- lets digest 
+    local data
+    local count, cmd, length, magic, status, crc, arg1, arg2, arg3 = bin.unpack('SSIsSLLL', response)
+    count, data, ng = bin.unpack('H'..length..'C', response, count)
+    
+--[[  uncomment if you want to debug    
+    self.resp_cmd = cmd
+    self.resp_length = length
+    self.resp_magic = magic
+    self.resp_status = status
+    self.resp_crc = crc
+    self.resp_arg1 = arg1
+    self.resp_arg2 = arg2
+    self.resp_arg3 = arg3
+    self.resp_data = data
+    self.resp_ng = ng
+    self:__responsetostring()
+--]]
+
+    local packed = bin.pack("LLLLH", cmd, arg1, arg2, arg3, data)
+    return packed, nil;
+end
+function Command:sendNG( ignore_response, timeout )
+    local data = self.data
+    local cmd = self.cmd       
+    local err, msg = core.SendCommandNG(cmd, data)
+    if err == nil then return err, msg end
+    
+    if ignoreresponse then return true, nil end
+
+    local response, msg = core.WaitForResponseTimeout(cmd, timeout)
+    if response == nil then
+        return nil, 'Error, waiting for response timed out :: '..msg
+    end
+    
+    -- lets digest 
+    local data
+    local count, cmd, length, magic, status, crc, arg1, arg2, arg3 = bin.unpack('SSIsSLLL', response)
+    count, data, ng = bin.unpack('H'..length..'C', response, count)
+
+--[[  uncomment if you want to debug
+    self.resp_cmd = cmd
+    self.resp_length = length
+    self.resp_magic = magic
+    self.resp_status = status
+    self.resp_crc = crc
+    self.resp_arg1 = arg1
+    self.resp_arg2 = arg2
+    self.resp_arg3 = arg3
+    self.resp_data = data
+    self.resp_ng = ng
+    self:__responsetostring()
+--]]
+
+    local packed = bin.pack("LLLLH", cmd, arg1, arg2, arg3, data)
+    return packed, nil;
+end
+
 return _commands

From c6172b4d9c127b567f15843cb520fdf7f3647fdf Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 28 Apr 2019 16:47:50 +0200
Subject: [PATCH 1465/1938] LoadEML: don't complain on the last \n

---
 client/loclass/fileutils.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index f01fe93aa..52be1d4b8 100644
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -365,6 +365,8 @@ int loadFileEML(const char *preferredName, const char *suffix, void *data, size_
         memset(line, 0, sizeof(line));
 
         if (fgets(line, sizeof(line), f) == NULL) {
+            if (feof(f))
+                break;
             fclose(f);
             PrintAndLogEx(FAILED, "File reading error.");
             retval = 2;

From 05ddd39caeaf14ad7deedb7b23bf08c84c0deeb8 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 28 Apr 2019 17:06:07 +0200
Subject: [PATCH 1466/1938] textual,  to reflect which repo.

---
 tools/mkversion.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/mkversion.pl b/tools/mkversion.pl
index 715b8081c..aaac146f8 100644
--- a/tools/mkversion.pl
+++ b/tools/mkversion.pl
@@ -14,7 +14,7 @@ $ENV{'LC_ALL'} = "C";
 $ENV{'LANG'} = "C";
 
 # if you are making your own fork,  change this line to reflect your fork-name
-my $fullgitinfo = 'RRG';
+my $fullgitinfo = 'RRG/Iceman';
 my $ctime;
 # GIT status  0 = dirty,  1 = clean ,  2 = undecided
 my $clean = 2;

From 819896acf610d2af145758bd4af50c62c0ab2337 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 28 Apr 2019 18:46:06 +0200
Subject: [PATCH 1467/1938] first batch of updated scripts to use sendMIX
 commands instead.

---
 client/lualibs/commands.lua  |  19 +++++--
 client/lualibs/read14a.lua   |  34 +++---------
 client/scripts/tnp3dump.lua  | 100 +++++++++++++++++------------------
 client/scripts/tnp3sim.lua   |  78 ++++++++++++++-------------
 client/scripts/tracetest.lua |  53 ++++++++++---------
 client/scripts/ufodump.lua   |  89 +++++++++++++++++++------------
 client/scripts/ul_uid.lua    |  44 +++++++--------
 7 files changed, 223 insertions(+), 194 deletions(-)

diff --git a/client/lualibs/commands.lua b/client/lualibs/commands.lua
index b41a663bf..4a7780ff9 100644
--- a/client/lualibs/commands.lua
+++ b/client/lualibs/commands.lua
@@ -4,6 +4,7 @@ Handle Proxmark USB Commands
 
 local _commands = require('usb_cmd')
 local util = require('utils')
+local TIMEOUT = 2000
 
 local _reverse_lookup,k,v = {}
     for k, v in pairs(_commands) do
@@ -131,6 +132,14 @@ function Command:__responsetostring()
     print('package ::', self.resp_response)
 end
 
+
+--- Sends a packet to the device
+-- @param command - the usb packet to send
+-- @param ignoreresponse - if set to true, we don't read the device answer packet
+--     which is usually recipe for fail. If not sent, the host will wait 2s for a
+--     response of type CMD_ACK
+-- @return packet,nil if successfull
+--         nil, errormessage if unsuccessfull
 function Command:sendMIX( ignore_response, timeout )
     local data = self.data
     local cmd = self.cmd
@@ -139,7 +148,9 @@ function Command:sendMIX( ignore_response, timeout )
     local err, msg = core.SendCommandMIX(cmd, arg1, arg2, arg3, data)
     if err == nil then return err, msg end
     
-    if ignoreresponse then return true, nil end
+    if ignore_response then return true, nil end
+
+    if timeout == nil then timeout = TIMEOUT end
 
     local response, msg = core.WaitForResponseTimeout(_commands.CMD_ACK, timeout)
     if response == nil then
@@ -174,8 +185,10 @@ function Command:sendNG( ignore_response, timeout )
     local err, msg = core.SendCommandNG(cmd, data)
     if err == nil then return err, msg end
     
-    if ignoreresponse then return true, nil end
-
+    if ignore_response then return true, nil end
+    
+    if timeout == nil then timeout = TIMEOUT end
+    
     local response, msg = core.WaitForResponseTimeout(cmd, timeout)
     if response == nil then
         return nil, 'Error, waiting for response timed out :: '..msg
diff --git a/client/lualibs/read14a.lua b/client/lualibs/read14a.lua
index 8e8ac594a..2f75fe81c 100644
--- a/client/lualibs/read14a.lua
+++ b/client/lualibs/read14a.lua
@@ -71,26 +71,6 @@ local function parse14443a(data)
     return { uid = uid, atqa  = atqa, sak = sak, name = tostring_14443a(sak), data = data}
 end
 
---- Sends a USBpacket to the device
--- @param command - the usb packet to send
--- @param ignoreresponse - if set to true, we don't read the device answer packet
---     which is usually recipe for fail. If not sent, the host will wait 2s for a
---     response of type CMD_ACK
--- @return packet,nil if successfull
---         nil, errormessage if unsuccessfull
-local function sendToDevice(command, ignoreresponse)
-    --core.clearCommandBuffer()
-    local err = core.SendCommand(command:getBytes())
-    if err then
-        print(err)
-        return nil, err
-    end
-    if ignoreresponse then return nil,nil end
-
-    local response = core.WaitForResponseTimeout(cmds.CMD_ACK, TIMEOUT)
-    return response,nil
-end
-
 -- This function does a connect and retrieves som einfo
 -- @param dont_disconnect - if true, does not disable the field
 -- @return if successfull: an table containing card info
@@ -98,7 +78,10 @@ end
 local function read14443a(dont_disconnect, no_rats)
     local command, result, info, err, data
 
-    command = Command:new{cmd = cmds.CMD_READER_ISO_14443a, arg1 = ISO14A_COMMAND.ISO14A_CONNECT }
+    command = Command:newMIX{
+            cmd = cmds.CMD_READER_ISO_14443a,
+            arg1 = ISO14A_COMMAND.ISO14A_CONNECT
+            }
 
     if dont_disconnect then
         command.arg1 = command.arg1 + ISO14A_COMMAND.ISO14A_NO_DISCONNECT
@@ -106,17 +89,17 @@ local function read14443a(dont_disconnect, no_rats)
     if no_rats then
         command.arg1 = command.arg1 + ISO14A_COMMAND.ISO14A_NO_RATS
     end
-
-    local result,err = sendToDevice(command)
+    
+    local result,err = command:sendMIX()
     if result then
         local count,cmd,arg0,arg1,arg2 = bin.unpack('LLLL',result)
         if arg0 == 0 then
-            return nil, "iso14443a card select failed"
+            return nil, 'iso14443a card select failed'
         end
         data = string.sub(result,count)
         info, err = parse14443a(data)
     else
-        err ="No response from card"
+        err = 'No response from card'
     end
 
     if err then
@@ -143,7 +126,6 @@ local library = {
     read = read14443a,
     waitFor14443a = waitFor14443a,
     parse14443a = parse14443a,
-    sendToDevice = sendToDevice,
     ISO14A_COMMAND = ISO14A_COMMAND,
 }
 
diff --git a/client/scripts/tnp3dump.lua b/client/scripts/tnp3dump.lua
index f48abff6c..32afc6fdc 100644
--- a/client/scripts/tnp3dump.lua
+++ b/client/scripts/tnp3dump.lua
@@ -7,7 +7,14 @@ local md5 = require('md5')
 local dumplib = require('html_dumplib')
 local toys = require('default_toys')
 
-example =[[
+copyright = ''
+author = 'Iceman'
+version = 'v1.0.1'
+desc =[[
+This script will try to dump the contents of a Mifare TNP3xxx card.
+It will need a valid KeyA in order to find the other keys and decode the card.
+]]
+example = [[
     script run tnp3dump
     script run tnp3dump -n
     script run tnp3dump -p
@@ -18,11 +25,9 @@ example =[[
     script run tnp3dump -p -o myfile
     script run tnp3dump -k aabbccddeeff -n -o myfile
 ]]
-author = "Iceman"
-usage = "script run tnp3dump -k <key> -n -p -o <filename>"
-desc =[[
-This script will try to dump the contents of a Mifare TNP3xxx card.
-It will need a valid KeyA in order to find the other keys and decode the card.
+usage = [[
+script run tnp3dump -k <key> -n -p -o <filename>
+
 Arguments:
     -h             : this help
     -k <key>       : Sector 0 Key A.
@@ -31,41 +36,44 @@ Arguments:
     -o             : filename for the saved dumps
 ]]
 local RANDOM = '20436F707972696768742028432920323031302041637469766973696F6E2E20416C6C205269676874732052657365727665642E20'
-local TIMEOUT = 2500 -- Shouldn't take longer than 2 seconds
 local DEBUG = false -- the debug flag
 local numBlocks = 64
 local numSectors = 16
 ---
 -- A debug printout-function
-function dbg(args)
+local function dbg(args)
     if not DEBUG then return end
-
-    if type(args) == "table" then
+    if type(args) == 'table' then
         local i = 1
         while result[i] do
             dbg(result[i])
             i = i+1
         end
     else
-        print("###", args)
+        print('###', args)
     end
 end
 ---
 -- This is only meant to be used when errors occur
-function oops(err)
-    print("ERROR: ",err)
-    return nil,err
+local function oops(err)
+    print('ERROR:', err)
+    core.clearCommandBuffer()
+    return nil, err
 end
 ---
 -- Usage help
-function help()
+local function help()
+    print(copyright)
+    print(author)
+    print(version)
     print(desc)
-    print("Example usage")
+    print('Example usage')
     print(example)
+    print(usage)
 end
 --
 -- Exit message
-function ExitMsg(msg)
+local function ExitMsg(msg)
     print( string.rep('--',20) )
     print( string.rep('--',20) )
     print(msg)
@@ -79,18 +87,18 @@ local function readdumpkeys(infile)
      return hex
 end
 
-local function waitCmd()
-    local response = core.WaitForResponseTimeout(cmds.CMD_ACK, TIMEOUT)
-    if response then
-        local count, cmd, arg0 = bin.unpack('LL',response)
-        if(arg0==1) then
-            local count,arg1,arg2,data = bin.unpack('LLH511',response,count)
-            return data:sub(1,32)
-        else
-            return nil, "Couldn't read block.. ["..arg0.."]"
-        end
+local function getblockdata(response)
+    if not response then
+        return nil, 'No response from device'
+    end
+    
+    local count, cmd, arg0 = bin.unpack('LL', response)
+    if arg0 == 1 then
+        local count, arg1, arg2, data = bin.unpack('LLH511', response, count)
+        return data:sub(1, 32)
+    else
+        return nil, "Couldn't read block.. ["..arg0.."]"
     end
-    return nil, 'No response from device'
 end
 
 local function main(args)
@@ -98,9 +106,7 @@ local function main(args)
     print( string.rep('--',20) )
     print( string.rep('--',20) )
 
-    local keyA
-    local cmd
-    local err
+    local keyA, cmd, err
     local useNested = false
     local usePreCalc = false
     local cmdReadBlockString = 'hf mf rdbl %d A %s'
@@ -127,9 +133,7 @@ local function main(args)
     core.console( cmdSetDbgOff)
 
     result, err = lib14a.read(false, true)
-    if not result then
-        return oops(err)
-    end
+    if not result then return oops(err) end
 
     core.clearCommandBuffer()
 
@@ -159,23 +163,20 @@ local function main(args)
         akeys = hex:sub(0,12*16)
     end
 
+    local block0, block1
     -- Read block 0
     dbg('Reading block 0')
-    cmd = Command:new{cmd = cmds.CMD_MIFARE_READBL, arg1 = 0, arg2 = 0, arg3 = 0, data = keyA}
-    err = core.SendCommand(cmd:getBytes())
-    if err then return oops(err) end
-    local block0, err = waitCmd()
-    if err then return oops(err) end
-
+    cmd = Command:newMIX{cmd = cmds.CMD_MIFARE_READBL, data = keyA}
+    block0, err = getblockdata(cmd:sendMIX(false))
+    if not block0 then return oops(err) end
+    
     core.clearCommandBuffer()
 
     -- Read block 1
     dbg('Reading block 1')
-    cmd = Command:new{cmd = cmds.CMD_MIFARE_READBL, arg1 = 1, arg2 = 0, arg3 = 0, data = keyA}
-    err = core.SendCommand(cmd:getBytes())
-    if err then return oops(err) end
-    local block1, err = waitCmd()
-    if err then return oops(err) end
+    cmd = Command:newMIX{cmd = cmds.CMD_MIFARE_READBL, arg1 = 1, data = keyA}
+    block1, err = getblockdata(cmd:sendMIX(false))
+    if not block1 then return oops(err) end
 
     core.clearCommandBuffer()
 
@@ -201,12 +202,9 @@ local function main(args)
 
         pos = (math.floor( blockNo / 4 ) * 12)+1
         key = akeys:sub(pos, pos + 11 )
-        cmd = Command:new{cmd = cmds.CMD_MIFARE_READBL, arg1 = blockNo ,arg2 = 0,arg3 = 0, data = key}
-        local err = core.SendCommand(cmd:getBytes())
-        if err then return oops(err) end
-        local blockdata, err = waitCmd()
-        if err then return oops(err) end
-
+        cmd = Command:newMIX{cmd = cmds.CMD_MIFARE_READBL, arg1 = blockNo, data = key}
+        local blockdata, err = getblockdata(cmd:sendMIX(false))
+        if not blockdata then return oops(err) end
 
         if  blockNo%4 ~= 3 then
 
diff --git a/client/scripts/tnp3sim.lua b/client/scripts/tnp3sim.lua
index ffda5a46d..21845794e 100644
--- a/client/scripts/tnp3sim.lua
+++ b/client/scripts/tnp3sim.lua
@@ -7,27 +7,29 @@ local md5 = require('md5')
 local toys = require('default_toys')
 local pre = require('precalc')
 
-example =[[
-    1. script run tnp3sim
-    2. script run tnp3sim -m
-    3. script run tnp3sim -m -i myfile
-]]
-author = "Iceman"
-usage = "script run tnp3sim -h -m -i <filename>"
+copyright = ''
+author = 'Iceman'
+version = 'v1.0.1'
 desc =[[
 This script will try to load a binary datadump of a Mifare TNP3xxx card.
 It vill try to validate all checksums and view some information stored in the dump
 For an experimental mode, it tries to manipulate some data.
 At last it sends all data to the PM3 device memory where it can be used in the command  "hf mf sim"
+]]
+example =[[
+    1. script run tnp3sim
+    2. script run tnp3sim -m
+    3. script run tnp3sim -m -i myfile
+]]
+usage = [[
+script run tnp3sim -h -m -i <filename>
 
 Arguments:
     -h             : this help
     -m             : Maxed out items (experimental)
     -i             : filename for the datadump to read (bin)
+]]
 
-    ]]
-
-local TIMEOUT = 2000 -- Shouldn't take longer than 2 seconds
 local DEBUG = true -- the debug flag
 local RANDOM = '20436F707972696768742028432920323031302041637469766973696F6E2E20416C6C205269676874732052657365727665642E20'
 
@@ -42,35 +44,39 @@ local format = string.format
 
 ---
 -- A debug printout-function
-function dbg(args)
+local function dbg(args)
     if not DEBUG then return end
-
-    if type(args) == "table" then
+    if type(args) == 'table' then
         local i = 1
         while result[i] do
             dbg(result[i])
             i = i+1
         end
     else
-        print("###", args)
+        print('###', args)
     end
 end
 ---
 -- This is only meant to be used when errors occur
-function oops(err)
-    print("ERROR: ",err)
-    return nil,err
+local function oops(err)
+    print('ERROR:', err)
+    core.clearCommandBuffer()
+    return nil, err
 end
 ---
 -- Usage help
-function help()
+local function help()
+    print(copyright)
+    print(author)
+    print(version)
     print(desc)
-    print("Example usage")
+    print('Example usage')
     print(example)
+    print(usage)
 end
 --
 -- Exit message
-function ExitMsg(msg)
+local function ExitMsg(msg)
     print( string.rep('--',20) )
     print( string.rep('--',20) )
     print(msg)
@@ -78,9 +84,9 @@ function ExitMsg(msg)
 end
 
 local function writedumpfile(infile)
-     t = infile:read("*all")
+     t = infile:read('*all')
      len = string.len(t)
-     local len,hex = bin.unpack(("H%d"):format(len),t)
+     local len,hex = bin.unpack(('H%d'):format(len),t)
      return hex
 end
 -- blocks with data
@@ -238,9 +244,9 @@ local function LoadEmulator(uid, blocks)
             end
         end
         core.clearCommandBuffer()
-        cmd = Command:new{cmd = cmds.CMD_MIFARE_EML_MEMSET, arg1 = _ ,arg2 = 1,arg3 = 16, data = blockdata}
-        local err = core.SendCommand(cmd:getBytes())
-        if err then return err end
+        cmd = Command:newMIX{cmd = cmds.CMD_MIFARE_EML_MEMSET, arg1 = _ ,arg2 = 1,arg3 = 16, data = blockdata}
+        local err, msg = cmd:sendMIX(true)
+        if err == nil then return err, msg end
     end
     io.write('\n')
 end
@@ -348,30 +354,30 @@ local function main(args)
 
     local result, err, hex
     local maxed = false
-    local inputTemplate = "dumpdata.bin"
-    local outputTemplate = os.date("toydump_%Y-%m-%d_%H%M");
+    local inputTemplate = 'dumpdata.bin'
+    local outputTemplate = os.date('toydump_%Y-%m-%d_%H%M');
 
         -- Arguments for the script
     for o, a in getopt.getopt(args, 'hmi:o:') do
-        if o == "h" then return help() end
-        if o == "m" then maxed = true end
-        if o == "o" then outputTemplate = a end
-        if o == "i" then inputTemplate = a end
+        if o == 'h' then return help() end
+        if o == 'm' then maxed = true end
+        if o == 'o' then outputTemplate = a end
+        if o == 'i' then inputTemplate = a end
     end
 
     -- Turn off Debug
-    local cmdSetDbgOff = "hf mf dbg 0"
+    local cmdSetDbgOff = 'hf mf dbg 0'
     core.console( cmdSetDbgOff)
 
     -- Load dump.bin file
-    print( (' Load data from %s'):format(inputTemplate))
+    print( ('Load data from %s'):format(inputTemplate))
     hex, err = utils.ReadDumpFile(inputTemplate)
     if not hex then return oops(err) end
 
     local blocks = {}
     local blockindex = 0
     for i = 1, #hex, 32 do
-        blocks[blockindex] = hex:sub(i,i+31)
+        blocks[blockindex] = hex:sub(i, i+31)
         blockindex = blockindex + 1
     end
 
@@ -397,8 +403,8 @@ local function main(args)
         print( (' ITEM TYPE : 0x%s 0x%s'):format(toytype, subtype) )
     end
 
-    print( ('       UID : 0x%s'):format(uid) )
-    print( ('    CARDID : 0x%s %s [%s]'):format(
+    print( ('       UID : %s'):format(uid) )
+    print( ('    CARDID : %s %s [%s]'):format(
                                 cardidMsw,cardidLsw,
                                 --Num2Card(cardidMsw, cardidLsw))
                                 '')
diff --git a/client/scripts/tracetest.lua b/client/scripts/tracetest.lua
index c3ddedf87..e5943fd6a 100644
--- a/client/scripts/tracetest.lua
+++ b/client/scripts/tracetest.lua
@@ -4,11 +4,9 @@ local bin = require('bin')
 local utils = require('utils')
 local dumplib = require('html_dumplib')
 
-example =[[
-    1. script run tracetest
-]]
-author = "Iceman"
-usage = "script run tracetest"
+copyright = ''
+author = 'Iceman'
+version = 'v1.0.1'
 desc =[[
 This script will load several traces files in ../traces/ folder and do
 "data load"
@@ -17,45 +15,52 @@ This script will load several traces files in ../traces/ folder and do
 The following tracefiles will be loaded:
    em*.pm3
    m*.pm3
+]]
+example =[[
+    script run tracetest
+]]
+usage = [[
+script run tracetest -h
 
 Arguments:
     -h             : this help
 ]]
-
-local TIMEOUT = 2000 -- Shouldn't take longer than 2 seconds
 local DEBUG = true -- the debug flag
 ---
 -- A debug printout-function
-function dbg(args)
-    if not DEBUG then
-        return
-    end
-
-    if type(args) == "table" then
+local function dbg(args)
+    if not DEBUG then return end
+    if type(args) == 'table' then
         local i = 1
         while result[i] do
             dbg(result[i])
             i = i+1
         end
     else
-        print("###", args)
+        print('###', args)
     end
 end
 ---
 -- This is only meant to be used when errors occur
-function oops(err)
-    print("ERROR: ",err)
+local function oops(err)
+    print('ERROR:', err)
+    core.clearCommandBuffer()
+    return nil, err
 end
 ---
 -- Usage help
-function help()
+local function help()
+    print(copyright)
+    print(author)
+    print(version)
     print(desc)
-    print("Example usage")
+    print('Example usage')
     print(example)
+    print(usage)
 end
 --
 -- Exit message
-function ExitMsg(msg)
+local function ExitMsg(msg)
     print( string.rep('--',20) )
     print( string.rep('--',20) )
     print(msg)
@@ -73,11 +78,11 @@ local function main(args)
     local tracesMOD = "find '../traces/' -iname 'm*.pm3' -type f"
 
     local write2File = false
-    local outputTemplate = os.date("testtest_%Y-%m-%d_%H%M%S")
+    local outputTemplate = os.date('testtest_%Y-%m-%d_%H%M%S')
 
     -- Arguments for the script
     for o, arg in getopt.getopt(args, 'h') do
-        if o == "h" then return help() end
+        if o == 'h' then return help() end
     end
 
     core.clearCommandBuffer()
@@ -98,13 +103,13 @@ local function main(args)
     end
     p.close();
 
-    local cmdLFSEARCH = "lf search 1 u"
+    local cmdLFSEARCH = 'lf search 1 u'
 
     -- main loop
     io.write('Starting to test traces > ')
     for _,file in pairs(files) do
 
-        local x = "data load "..file
+        local x = 'data load '..file
         dbg(x)
         core.console(x)
 
@@ -114,7 +119,7 @@ local function main(args)
         core.clearCommandBuffer()
 
         if core.ukbhit() then
-            print("aborted by user")
+            print('aborted by user')
             break
         end
     end
diff --git a/client/scripts/ufodump.lua b/client/scripts/ufodump.lua
index f91949166..0270bafaa 100644
--- a/client/scripts/ufodump.lua
+++ b/client/scripts/ufodump.lua
@@ -2,17 +2,25 @@ local cmds = require('commands')
 local getopt = require('getopt')
 local lib14a = require('read14a')
 local utils = require('utils')
-example = [[
-    script run ufodump
-    script run ufodump -b 10
-]]
-author = "Iceman"
+
+copyright = ''
+author = 'Iceman'
+version = 'v1.0.1'
 desc =
 [[
 This is a script that reads AZTEK iso14443a tags.
 It starts from block 0,  and ends at default block 20.  Use 'b' to say different endblock.
-
 xor:  the first three block (0,1,2) is not XORED.  The rest seems to be xored.
+]]
+example = [[
+    -- default
+    script run ufodump
+    
+    -- stop at block 10
+    script run ufodump -b 10
+]]
+usage = [[
+script run ufudump -h -b
 
 Arguments:
       h   this helptext
@@ -20,43 +28,54 @@ Arguments:
 ]]
 
 -- Some globals
-local TIMEOUT = 2000 -- Shouldn't take longer than 2 seconds
 local DEBUG = false -- the debug flag
 ---
 -- A debug printout-function
 local function dbg(args)
-    if DEBUG then
-        print("###", args)
+    if not DEBUG then return end
+    if type(args) == 'table' then
+        local i = 1
+        while args[i] do
+            dbg(args[i])
+            i = i+1
+        end
+    else
+        print('###', args)
     end
 end
 ---
 -- This is only meant to be used when errors occur
 local function oops(err)
-    print("ERROR: ",err)
+    print('ERROR:', err)
     core.clearCommandBuffer()
+    return nil, err    
 end
 ---
 -- Usage help
 local function help()
+    print(copyright)
+    print(author)
+    print(version)
     print(desc)
-    print("Example usage")
+    print('Example usage')
     print(example)
+    print(usage)    
 end
 --
 -- writes data to ascii textfile.
 function writeDumpFile(uid, blockData)
-        local destination = string.format("%s.eml", uid)
-        local file = io.open(destination, "w")
+        local destination = string.format('%s.eml', uid)
+        local file = io.open(destination, 'w')
         if file == nil then
-            return nil, string.format("Could not write to file %s", destination)
+            return nil, string.format('Could not write to file %s', destination)
         end
         local rowlen = string.len(blockData[1])
 
         for i,block in ipairs(blockData) do
             if rowlen ~= string.len(block) then
-                print(string.format("WARNING: Dumpdata seems corrupted, line %d was not the same length as line 1",i))
+                print(string.format('WARNING: Dumpdata seems corrupted, line %d was not the same length as line 1',i))
             end
-            file:write(block.."\n")
+            file:write(block..'\n')
         end
         file:close()
         return destination
@@ -91,24 +110,28 @@ end
 --
 -- Send a "raw" iso14443a package, ie "hf 14a raw" command
 function sendRaw(rawdata, options)
-    --print(">> ", rawdata)
-    local flags = lib14a.ISO14A_COMMAND.ISO14A_NO_DISCONNECT + lib14a.ISO14A_COMMAND.ISO14A_RAW + lib14a.ISO14A_COMMAND.ISO14A_APPEND_CRC + lib14a.ISO14A_COMMAND.ISO14A_NO_RATS
-    local command = Command:new{cmd = cmds.CMD_READER_ISO_14443a,
+
+    local flags = lib14a.ISO14A_COMMAND.ISO14A_NO_DISCONNECT
+                + lib14a.ISO14A_COMMAND.ISO14A_RAW
+                + lib14a.ISO14A_COMMAND.ISO14A_APPEND_CRC
+                + lib14a.ISO14A_COMMAND.ISO14A_NO_RATS
+
+    local command = Command:newMIX{cmd = cmds.CMD_READER_ISO_14443a,
                                 arg1 = flags, -- Send raw
                                 -- arg2 contains the length, which is half the length
                                 -- of the ASCII-string rawdata
                                 arg2 = string.len(rawdata)/2,
                                 data = rawdata}
-    return lib14a.sendToDevice(command, options.ignore_response)
+                                
+    return command:sendMIX(options.ignore_response)
 end
 --
 -- Sends an instruction to do nothing, only disconnect
 function disconnect()
-    local command = Command:new{cmd = cmds.CMD_READER_ISO_14443a, arg1 = 0,}
+    local command = Command:newMIX{cmd = cmds.CMD_READER_ISO_14443a, arg1 = 0,}
     -- We can ignore the response here, no ACK is returned for this command
     -- Check /armsrc/iso14443a.c, ReaderIso14443a() for details
-    return lib14a.sendToDevice(command, true)
-    --core.console("hf 14a raw -r")
+    return command:sendMIX(true)
 end
 ---
 -- The main entry point
@@ -119,8 +142,8 @@ function main(args)
 
     -- Read the parameters
     for o, a in getopt.getopt(args, 'hb:') do
-        if o == "h" then return help() end
-        if o == "b" then endblock = a end
+        if o == 'h' then return help() end
+        if o == 'b' then endblock = a end
     end
     endblock = endblock or 20
 
@@ -132,12 +155,12 @@ function main(args)
     local blockData = {}
 
     -- Show tag info
-    print(("\nFound Card UID [%s]\n"):format(info.uid))
+    print(('\nFound Card UID [%s]\n'):format(info.uid))
 
-    print("blk | data             | xored")
-    print("----+------------------+-------------------")
+    print('blk | data             | xored')
+    print('----+------------------+-------------------')
     for block = 00, endblock do
-        local cmd = string.format("10%02x00", block)
+        local cmd = string.format('10%02x00', block)
         res, err = sendRaw(cmd , {ignore_response = ignore_response})
         if err then disconnect() return oops(err) end
 
@@ -154,7 +177,7 @@ function main(args)
     local filename, err = writeDumpFile(info.uid, blockData)
     if err then return oops(err) end
 
-    print(string.format("\nDumped data into %s", filename))
+    print(string.format('\nDumped data into %s', filename))
 end
 
 -------------------------
@@ -162,13 +185,13 @@ end
 -------------------------
 function selftest()
     DEBUG = true
-    dbg("Performing test")
+    dbg('Performing test')
     main()
-    dbg("Tests done")
+    dbg('Tests done')
 end
 -- Flip the switch here to perform a sanity check.
 -- It read a nonce in two different ways, as specified in the usage-section
-if "--test"==args then
+if '--test' == args then
     selftest()
 else
     -- Call the main
diff --git a/client/scripts/ul_uid.lua b/client/scripts/ul_uid.lua
index 7dbb51b49..16957d593 100644
--- a/client/scripts/ul_uid.lua
+++ b/client/scripts/ul_uid.lua
@@ -3,7 +3,7 @@ local utils =  require('utils')
 
 copyright = ''
 author = "Iceman"
-version = 'v1.0.0'
+version = 'v1.0.1'
 desc = [[
 This script tries to set UID on a mifare Ultralight magic card which either
  - answers to chinese backdoor commands
@@ -31,20 +31,21 @@ local bxor = bit32.bxor
 -- A debug printout-function
 local function dbg(args)
     if not DEBUG then return end
-    if type(args) == "table" then
+    if type(args) == 'table' then
         local i = 1
         while args[i] do
             dbg(args[i])
             i = i+1
         end
     else
-        print("###", args)
+        print('###', args)
     end
 end
 ---
 -- This is only meant to be used when errors occur
 local function oops(err)
-    print("ERROR: ",err)
+    print('ERROR:', err)
+    core.clearCommandBuffer()    
     return nil, err
 end
 ---
@@ -56,6 +57,7 @@ local function help()
     print(desc)
     print('Example usage')
     print(example)
+    print(usage)    
 end
 --
 --- Set UID on magic command enabled
@@ -64,19 +66,19 @@ function magicUID(b0, b1, b2)
     print('Using backdoor Magic tag function')
 
     -- write block 0
-    core.console("hf 14a raw -p -a -b 7 40")
-    core.console("hf 14a raw -p -a 43")
-    core.console("hf 14a raw -c -a A200"..b0)
+    core.console('hf 14a raw -p -a -b 7 40')
+    core.console('hf 14a raw -p -a 43')
+    core.console('hf 14a raw -c -a A200'..b0)
 
     -- write block 1
-    core.console("hf 14a raw -p -a -b 7 40")
-    core.console("hf 14a raw -p -a 43")
-    core.console("hf 14a raw -c -a A201"..b1)
+    core.console('hf 14a raw -p -a -b 7 40')
+    core.console('hf 14a raw -p -a 43')
+    core.console('hf 14a raw -c -a A201'..b1)
 
     -- write block 2
-    core.console("hf 14a raw -p -a -b 7 40")
-    core.console("hf 14a raw -p -a 43")
-    core.console("hf 14a raw -c -a A202"..b2)
+    core.console('hf 14a raw -p -a -b 7 40')
+    core.console('hf 14a raw -p -a 43')
+    core.console('hf 14a raw -c -a A202'..b2)
 end
 --
 --- Set UID on magic but brickable
@@ -84,16 +86,16 @@ function brickableUID(b0, b1, b2)
 
     print('Using BRICKABLE Magic tag function')
 
-    core.console("hf 14a raw -p -s -3")
+    core.console('hf 14a raw -p -s -3')
 
     -- write block 0
-    core.console("hf 14a raw -p -c A200"..b0)
+    core.console('hf 14a raw -p -c A200'..b0)
 
     -- write block 1
-    core.console("hf 14a raw -p -c A201"..b1)
+    core.console('hf 14a raw -p -c A201'..b1)
 
     -- write block 2
-    core.console("hf 14a raw -p -c A202"..b2)
+    core.console('hf 14a raw -p -c A202'..b2)
 end
 ---
 -- The main entry point
@@ -108,9 +110,9 @@ function main(args)
 
     -- Read the parameters
     for o, a in getopt.getopt(args, 'hu:b') do
-        if o == "h" then return help() end
-        if o == "u" then uid = a end
-        if o == "b" then tagtype = 2 end
+        if o == 'h' then return help() end
+        if o == 'u' then uid = a end
+        if o == 'b' then tagtype = 2 end
     end
 
     -- uid string checks
@@ -138,7 +140,7 @@ function main(args)
     end
 
         --halt
-    core.console("hf 14a raw -c -a 5000")
+    core.console('hf 14a raw -c -a 5000')
 end
 
 main(args)

From a5ba5a99e888c477df5337eaee32cc72561fe45e Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 28 Apr 2019 18:48:59 +0200
Subject: [PATCH 1468/1938] forgot FLAGS...

---
 armsrc/appmain.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 2a67b044b..c3a52bc93 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -392,7 +392,7 @@ void printUSBSpeed(void) {
 
     Dbprintf("  Time elapsed............%dms", end_time - start_time);
     Dbprintf("  Bytes transferred.......%d", bytes_transferred);
-    Dbprintf("  Transfer Speed PM3 -> Client = " _YELLOW_("%d") " bytes/s", 1000 * bytes_transferred / (end_time - start_time));
+    DbprintfEx(FLAG_LOG | FLAG_ANSI, "  Transfer Speed PM3 -> Client = " _YELLOW_("%d") " bytes/s", 1000 * bytes_transferred / (end_time - start_time));
 }
 
 /**

From 405f24522e89c592eaf1eed4287a481385a31ea3 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 28 Apr 2019 19:21:04 +0200
Subject: [PATCH 1469/1938] loadFile*: accept when suffix is already provided

---
 client/cmdflashmem.c       | 10 +++++-----
 client/cmdhfmf.c           | 10 +++++-----
 client/cmdlfhitag.c        |  8 ++++----
 client/cmdlft55xx.c        |  2 +-
 client/loclass/fileutils.c | 35 ++++++++++++-----------------------
 client/loclass/fileutils.h | 11 ++++-------
 client/util.c              | 28 +++++++++++++++++++++++++++-
 client/util.h              |  4 +++-
 8 files changed, 61 insertions(+), 47 deletions(-)

diff --git a/client/cmdflashmem.c b/client/cmdflashmem.c
index 28f0d6853..b77161951 100644
--- a/client/cmdflashmem.c
+++ b/client/cmdflashmem.c
@@ -212,7 +212,7 @@ static int CmdFlashMemLoad(const char *Cmd) {
     switch (d) {
         case DICTIONARY_MIFARE:
             start_index = DEFAULT_MF_KEYS_OFFSET;
-            res = loadFileDICTIONARY(filename, "dic", data + 2, &datalen, 6, &keycount);
+            res = loadFileDICTIONARY(filename, data + 2, &datalen, 6, &keycount);
             if (res || !keycount) {
                 free(data);
                 return 1;
@@ -223,7 +223,7 @@ static int CmdFlashMemLoad(const char *Cmd) {
             break;
         case DICTIONARY_T55XX:
             start_index = DEFAULT_T55XX_KEYS_OFFSET;
-            res = loadFileDICTIONARY(filename, "dic", data + 2, &datalen, 4, &keycount);
+            res = loadFileDICTIONARY(filename, data + 2, &datalen, 4, &keycount);
             if (res || !keycount) {
                 free(data);
                 return 1;
@@ -234,7 +234,7 @@ static int CmdFlashMemLoad(const char *Cmd) {
             break;
         case DICTIONARY_ICLASS:
             start_index = DEFAULT_ICLASS_KEYS_OFFSET;
-            res = loadFileDICTIONARY(filename, "dic", data + 2, &datalen, 8, &keycount);
+            res = loadFileDICTIONARY(filename, data + 2, &datalen, 8, &keycount);
             if (res || !keycount) {
                 free(data);
                 return 1;
@@ -244,8 +244,8 @@ static int CmdFlashMemLoad(const char *Cmd) {
             datalen += 2;
             break;
         case DICTIONARY_NONE:
-            res = loadFile(filename, "bin", data, FLASH_MEM_MAX_SIZE, &datalen);
-            //int res = loadFileEML( filename, "eml", data, &datalen);
+            res = loadFile(filename, ".bin", data, FLASH_MEM_MAX_SIZE, &datalen);
+            //int res = loadFileEML( filename, data, &datalen);
             if (res) {
                 free(data);
                 return 1;
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 8471ff45a..db1b7d798 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -2584,8 +2584,8 @@ int CmdHF14AMfELoad(const char *Cmd) {
 
     uint8_t *data = calloc(4096, sizeof(uint8_t));
     size_t datalen = 0;
-    //int res = loadFile(filename, "bin", data, maxdatalen, &datalen);
-    int res = loadFileEML(filename, "eml", data, &datalen);
+    //int res = loadFile(filename, ".bin", data, maxdatalen, &datalen);
+    int res = loadFileEML(filename, data, &datalen);
     if (res) {
         free(data);
         return 1;
@@ -2880,12 +2880,12 @@ static int CmdHF14AMfCLoad(const char *Cmd) {
     size_t datalen = 0;
     int res = 0;
     if (fillFromBin) {
-        res = loadFile(fileName, "bin", data, maxdatalen, &datalen);
+        res = loadFile(fileName, ".bin", data, maxdatalen, &datalen);
     } else {
         if (fillFromJson) {
-            res = loadFileJSON(fileName, "json", data, maxdatalen, &datalen);
+            res = loadFileJSON(fileName, data, maxdatalen, &datalen);
         } else {
-            res = loadFileEML(Cmd, "eml", data, &datalen);
+            res = loadFileEML(Cmd, data, &datalen);
         }
     }
 
diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index e7eaea6dd..f901a042c 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -295,7 +295,7 @@ static int CmdLFHitagSim(const char *Cmd) {
                 break;
             case 'e':
                 param_getstr(Cmd, cmdp + 1, filename, sizeof(filename));
-                res = loadFileEML(filename, "eml", data, &datalen);
+                res = loadFileEML(filename, data, &datalen);
                 if (res > 0 || datalen != maxdatalen) {
                     PrintAndLogDevice(FAILED, "error, bytes read mismatch file size");
                     errors = true;
@@ -306,7 +306,7 @@ static int CmdLFHitagSim(const char *Cmd) {
                 break;
             case 'j':
                 param_getstr(Cmd, cmdp + 1, filename, sizeof(filename));
-                res = loadFileJSON(filename, "json", data, maxdatalen, &datalen);
+                res = loadFileJSON(filename, data, maxdatalen, &datalen);
                 if (res > 0) {
                     errors = true;
                     break;
@@ -316,7 +316,7 @@ static int CmdLFHitagSim(const char *Cmd) {
                 break;
             case 'b':
                 param_getstr(Cmd, cmdp + 1, filename, sizeof(filename));
-                res = loadFile(filename, "bin", data, maxdatalen, &datalen);
+                res = loadFile(filename, ".bin", data, maxdatalen, &datalen);
                 if (res > 0) {
                     errors = true;
                     break;
@@ -611,7 +611,7 @@ static int CmdLFHitagCheckChallenges(const char *Cmd) {
                 return usage_hitag_checkchallenges();
             case 'f':
                 param_getstr(Cmd, cmdp + 1, filename, sizeof(filename));
-                res = loadFile(filename, "cc", data, 8 * 60, &datalen);
+                res = loadFile(filename, ".cc", data, 8 * 60, &datalen);
                 if (res > 0) {
                     errors = true;
                     break;
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 6934e20e3..52abba90b 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1906,7 +1906,7 @@ static int CmdT55xxChkPwds(const char *Cmd) {
             return 1;
         }
 
-        int res = loadFileDICTIONARY(filename, "dic", keyBlock, &datalen, 4, &keycount);
+        int res = loadFileDICTIONARY(filename, keyBlock, &datalen, 4, &keycount);
         if (res || keycount == 0) {
             PrintAndLogEx(WARNING, "No keys found in file");
             free(keyBlock);
diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index 52be1d4b8..5370c0c5b 100644
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -274,14 +274,11 @@ out:
 
 int loadFile(const char *preferredName, const char *suffix, void *data, size_t maxdatalen, size_t *datalen) {
 
-    if (preferredName == NULL) return 1;
-    if (suffix == NULL) return 1;
     if (data == NULL) return 1;
+    char *fileName = filenamemcopy(preferredName, suffix);
+    if (fileName == NULL) return 1;
 
     int retval = 0;
-    int size = sizeof(char) * (strlen(preferredName) + strlen(suffix) + 10);
-    char *fileName = calloc(size, sizeof(char));
-    sprintf(fileName, "%s.%s", preferredName, suffix);
 
     FILE *f = fopen(fileName, "rb");
     if (!f) {
@@ -336,17 +333,14 @@ out:
     return retval;
 }
 
-int loadFileEML(const char *preferredName, const char *suffix, void *data, size_t *datalen) {
+int loadFileEML(const char *preferredName, void *data, size_t *datalen) {
 
-    if (preferredName == NULL) return 1;
-    if (suffix == NULL) return 1;
     if (data == NULL) return 1;
+    char *fileName = filenamemcopy(preferredName, ".eml");
+    if (fileName == NULL) return 1;
 
     size_t counter = 0;
     int retval = 0, hexlen = 0;
-    int size = sizeof(char) * (strlen(preferredName) + strlen(suffix) + 10);
-    char *fileName = calloc(size, sizeof(char));
-    sprintf(fileName, "%s.%s", preferredName, suffix);
 
     FILE *f = fopen(fileName, "r");
     if (!f) {
@@ -393,20 +387,17 @@ out:
     return retval;
 }
 
-int loadFileJSON(const char *preferredName, const char *suffix, void *data, size_t maxdatalen, size_t *datalen) {
+int loadFileJSON(const char *preferredName, void *data, size_t maxdatalen, size_t *datalen) {
 
-    if (preferredName == NULL) return 1;
-    if (suffix == NULL) return 1;
     if (data == NULL) return 1;
+    char *fileName = filenamemcopy(preferredName, ".json");
+    if (fileName == NULL) return 1;
 
     *datalen = 0;
     json_t *root;
     json_error_t error;
 
     int retval = 0;
-    int size = sizeof(char) * (strlen(preferredName) + strlen(suffix) + 10);
-    char *fileName = calloc(size, sizeof(char));
-    sprintf(fileName, "%s.%s", preferredName, suffix);
 
     root = json_load_file(fileName, 0, &error);
     if (!root) {
@@ -502,11 +493,12 @@ out:
     return retval;
 }
 
-int loadFileDICTIONARY(const char *preferredName, const char *suffix, void *data, size_t *datalen, uint8_t keylen, uint16_t *keycnt) {
+int loadFileDICTIONARY(const char *preferredName, void *data, size_t *datalen, uint8_t keylen, uint16_t *keycnt) {
+
 
-    if (preferredName == NULL) return 1;
-    if (suffix == NULL) return 1;
     if (data == NULL) return 1;
+    char *fileName = filenamemcopy(preferredName, ".dic");
+    if (fileName == NULL) return 1;
 
     // t5577 == 4bytes
     // mifare == 6 bytes
@@ -523,9 +515,6 @@ int loadFileDICTIONARY(const char *preferredName, const char *suffix, void *data
 
     size_t counter = 0;
     int retval = 0;
-    int size = sizeof(char) * (strlen(preferredName) + strlen(suffix) + 10);
-    char *fileName = calloc(size, sizeof(char));
-    sprintf(fileName, "%s.%s", preferredName, suffix);
 
     FILE *f = fopen(fileName, "r");
     if (!f) {
diff --git a/client/loclass/fileutils.h b/client/loclass/fileutils.h
index 57dfbebc8..6f6b5456a 100644
--- a/client/loclass/fileutils.h
+++ b/client/loclass/fileutils.h
@@ -110,7 +110,7 @@ int saveFileJSON(const char *preferredName, const char *suffix, JSONFileType fty
  * E.g. dumpdata-15.bin
  *
  * @param preferredName
- * @param suffix the file suffix. Leave out the ".".
+ * @param suffix the file suffix. Including the ".".
  * @param data The data array to store the loaded bytes from file
  * @param maxdatalen the number of bytes that your data array has
  * @param datalen the number of bytes loaded from file
@@ -123,25 +123,23 @@ int loadFile(const char *preferredName, const char *suffix, void *data, size_t m
  * E.g. dumpdata-15.txt
  *
  * @param preferredName
- * @param suffix the file suffix. Leave out the ".".
  * @param data The data array to store the loaded bytes from file
  * @param datalen the number of bytes loaded from file
  * @return 0 for ok, 1 for failz
 */
-int loadFileEML(const char *preferredName, const char *suffix, void *data, size_t *datalen);
+int loadFileEML(const char *preferredName, void *data, size_t *datalen);
 
 /**
  * @brief  Utility function to load data from a JSON textfile. This method takes a preferred name.
  * E.g. dumpdata-15.json
  *
  * @param preferredName
- * @param suffix the file suffix. Leave out the ".".
  * @param data The data array to store the loaded bytes from file
  * @param maxdatalen maximum size of data array in bytes
  * @param datalen the number of bytes loaded from file
  * @return 0 for ok, 1 for failz
 */
-int loadFileJSON(const char *preferredName, const char *suffix, void *data, size_t maxdatalen, size_t *datalen);
+int loadFileJSON(const char *preferredName, void *data, size_t maxdatalen, size_t *datalen);
 
 
 /**
@@ -149,14 +147,13 @@ int loadFileJSON(const char *preferredName, const char *suffix, void *data, size
  * E.g. default_keys.dic
  *
  * @param preferredName
- * @param suffix the file suffix. Leave out the ".".
  * @param data The data array to store the loaded bytes from file
  * @param maxdatalen maximum size of data array in bytes
  * @param datalen the number of bytes loaded from file
  * @param keylen  the number of bytes a key per row is
  * @return 0 for ok, 1 for failz
 */
-int loadFileDICTIONARY(const char *preferredName, const char *suffix, void *data, size_t *datalen, uint8_t keylen, uint16_t *keycnt);
+int loadFileDICTIONARY(const char *preferredName, void *data, size_t *datalen, uint8_t keylen, uint16_t *keycnt);
 
 /**
  * @brief  Utility function to check and convert old mfu dump format to new
diff --git a/client/util.c b/client/util.c
index 472b9d17d..0d8781619 100644
--- a/client/util.c
+++ b/client/util.c
@@ -891,10 +891,23 @@ void str_lower(char *s) {
     for (size_t i = 0; i < strlen(s); i++)
         s[i] = tolower(s[i]);
 }
+
+// check for prefix in string
 bool str_startswith(const char *s,  const char *pre) {
     return strncmp(pre, s, strlen(pre)) == 0;
 }
 
+// check for suffix in string
+bool str_endswith(const char *s,  const char *suffix) {
+    size_t ls = strlen(s);
+    size_t lsuffix = strlen(suffix);
+    if (ls >= lsuffix)
+    {
+        return strncmp(suffix, s + (ls - lsuffix), lsuffix) == 0;
+    }
+    return false;
+}
+
 // Replace unprintable characters with a dot in char buffer
 void clean_ascii(unsigned char *buf, size_t len) {
     for (size_t i = 0; i < len; i++) {
@@ -917,7 +930,7 @@ void strcreplace(char *buf, size_t len, char from, char to) {
     }
 }
 
-char *strmcopy(char *buf) {
+char *strmcopy(const char *buf) {
     char *str = (char *) calloc(strlen(buf) + 1, sizeof(uint8_t));
     if (str != NULL) {
         memset(str, 0, strlen(buf) + 1);
@@ -925,3 +938,16 @@ char *strmcopy(char *buf) {
     }
     return str;
 }
+
+char *filenamemcopy(const char *preferredName, const char *suffix) {
+    if (preferredName == NULL) return NULL;
+    if (suffix == NULL) return NULL;
+    char *fileName = (char *) calloc(strlen(preferredName) + strlen(suffix) + 1, sizeof(uint8_t));
+    if (fileName == NULL)
+        return NULL;
+    strcpy(fileName, preferredName);
+    if (str_endswith(fileName, suffix))
+        return fileName;
+    strcat(fileName, suffix);
+    return fileName;
+}
diff --git a/client/util.h b/client/util.h
index 5e60868bb..6d0cc98aa 100644
--- a/client/util.h
+++ b/client/util.h
@@ -261,8 +261,10 @@ int num_CPUs(void); // number of logical CPUs
 
 void str_lower(char *s); // converts string to lower case
 bool str_startswith(const char *s,  const char *pre);  // check for prefix in string
+bool str_endswith(const char *s,  const char *suffix);    // check for suffix in string
 void clean_ascii(unsigned char *buf, size_t len);
 void strcleanrn(char *buf, size_t len);
 void strcreplace(char *buf, size_t len, char from, char to);
-char *strmcopy(char *buf);
+char *strmcopy(const char *buf);
+char *filenamemcopy(const char *preferredName, const char *suffix);
 #endif

From 02c2ea5a1537ea09bed7ebd3e9a1f05eeee9aa2d Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 28 Apr 2019 19:26:26 +0200
Subject: [PATCH 1470/1938] chg: next batch of scripts

---
 client/scripts/test_t55x7_ask.lua | 56 +++++++++++---------
 client/scripts/test_t55x7_bi.lua  | 53 +++++++++++--------
 client/scripts/test_t55x7_fsk.lua | 53 ++++++++++---------
 client/scripts/test_t55x7_psk.lua | 59 ++++++++++++---------
 client/scripts/tnp3clone.lua      | 86 ++++++++++++++++++-------------
 client/scripts/tnp3dump.lua       |  5 +-
 client/scripts/tnp3sim.lua        |  5 +-
 client/scripts/ul_uid.lua         |  2 +-
 8 files changed, 184 insertions(+), 135 deletions(-)

diff --git a/client/scripts/test_t55x7_ask.lua b/client/scripts/test_t55x7_ask.lua
index 0e0d3d9e3..7ca3a1f29 100644
--- a/client/scripts/test_t55x7_ask.lua
+++ b/client/scripts/test_t55x7_ask.lua
@@ -6,11 +6,9 @@ local utils = require('utils')
 local format=string.format
 local floor=math.floor
 
-example =[[
-    1. script run test_t55x7_ask
-]]
-author = "Iceman"
-usage = "script run test_t55x7_ask"
+copyright = ''
+author = 'Iceman'
+version = 'v1.0.1'
 desc =[[
 This script will program a T55x7 TAG with the configuration: block 0x00 data 0x000100
 The outlined procedure is as following:
@@ -38,12 +36,17 @@ Loop:
 
 
 testsuit for the ASK/MANCHESTER demod
+]]
+example =[[
+    1. script run test_t55x7_ask
+]]
+usage = [[
+script run test_t55x7_ask
 
 Arguments:
     -h             : this help
 ]]
 
-local TIMEOUT = 2000 -- Shouldn't take longer than 2 seconds
 local DEBUG = true -- the debug flag
 
 --BLOCK 0 = 00008040 ASK / MAN
@@ -58,31 +61,34 @@ local procedurecmds = {
 ---
 -- A debug printout-function
 local function dbg(args)
-    if not DEBUG then
-        return
-    end
-
-    if type(args) == "table" then
+    if not DEBUG then return end
+    if type(args) == 'table' then
         local i = 1
-        while args[i] do
-            dbg(args[i])
+        while result[i] do
+            dbg(result[i])
             i = i+1
         end
     else
-        print("###", args)
+        print('###', args)
     end
 end
 ---
 -- This is only meant to be used when errors occur
 local function oops(err)
-    print("ERROR: ",err)
+    print('ERROR:', err)
+    core.clearCommandBuffer()
+    return nil, err
 end
 ---
 -- Usage help
 local function help()
+    print(copyright)
+    print(author)
+    print(version)
     print(desc)
-    print("Example usage")
+    print('Example usage')
     print(example)
+    print(usage)
 end
 --
 -- Exit message
@@ -95,7 +101,7 @@ end
 
 local function test()
     local y
-    local block = "00"
+    local block = '00'
     for y = 0x0, 0x1d, 0x4 do
         for _ = 1, #procedurecmds do
             local pcmd = procedurecmds[_]
@@ -106,12 +112,14 @@ local function test()
 
                 local config = pcmd:format(config1, y, config2)
                 dbg(('lf t55xx write b 0  d %s'):format(config))
-                config = tonumber(config,16)
-
-                local writecmd = Command:new{cmd = cmds.CMD_T55XX_WRITE_BLOCK,arg1 = config, arg2 = block, arg3 = "00", data = "00"}
-                local err = core.SendCommand(writecmd:getBytes())
-                if err then return oops(err) end
-                local response = core.WaitForResponseTimeout(cmds.CMD_ACK,TIMEOUT)
+                config = tonumber(config, 16)
+                local wc = Command:newMIX{
+                                        cmd = cmds.CMD_T55XX_WRITE_BLOCK
+                                        , arg1 = config
+                                        , arg2 = block
+                                        }
+                local reponse, err = wc:sendMIX(false)
+                if not response then return oops(err) end
 
             else
                 dbg(pcmd)
@@ -130,7 +138,7 @@ local function main(args)
 
     -- Arguments for the script
     for o, arg in getopt.getopt(args, 'h') do
-        if o == "h" then return help() end
+        if o == 'h' then return help() end
     end
 
     core.clearCommandBuffer()
diff --git a/client/scripts/test_t55x7_bi.lua b/client/scripts/test_t55x7_bi.lua
index dce5350dc..21c0234c0 100644
--- a/client/scripts/test_t55x7_bi.lua
+++ b/client/scripts/test_t55x7_bi.lua
@@ -3,12 +3,10 @@ local getopt = require('getopt')
 local bin = require('bin')
 local utils = require('utils')
 
-example =[[
-    1. script run test_t55x7_bi
-]]
-author = "Iceman"
-usage = "script run test_t55x7_bi"
-desc =[[
+copyright = ''
+author = 'Iceman'
+version = 'v1.0.1'
+desc = [[
 This script will program a T55x7 TAG with the configuration: block 0x00 data 0x00010040
 The outlined procedure is as following:
 
@@ -32,12 +30,17 @@ Loop:
 
 
 testsuit for the BIPHASE demod
+]]
+example = [[
+    1. script run test_t55x7_bi
+]]
+usage = [[
+script run test_t55x7_bi
 
 Arguments:
     -h             : this help
 ]]
 
-local TIMEOUT = 2000 -- Shouldn't take longer than 2 seconds
 local DEBUG = true -- the debug flag
 
 --BLOCK 0 = 00010040 BIPHASE
@@ -52,31 +55,34 @@ local procedurecmds = {
 ---
 -- A debug printout-function
 local function dbg(args)
-    if not DEBUG then
-        return
-    end
-
-    if type(args) == "table" then
+    if not DEBUG then return end
+    if type(args) == 'table' then
         local i = 1
         while args[i] do
             dbg(args[i])
             i = i+1
         end
     else
-        print("###", args)
+        print('###', args)
     end
 end
 ---
 -- This is only meant to be used when errors occur
 local function oops(err)
-    print("ERROR: ",err)
+    print('ERROR:', err)
+    core.clearCommandBuffer()
+    return nil, err
 end
 ---
 -- Usage help
 local function help()
+    print(copyright)
+    print(author)
+    print(version)
     print(desc)
-    print("Example usage")
+    print('Example usage')
     print(example)
+    print(usage)
 end
 --
 -- Exit message
@@ -89,7 +95,7 @@ end
 
 local function test()
     local y
-    local block = "00"
+    local block = '00'
     for y = 1, 0x1D, 4 do
         for _ = 1, #procedurecmds do
             local pcmd = procedurecmds[_]
@@ -101,11 +107,14 @@ local function test()
                 local config = pcmd:format(config1, y, config2)
                 dbg(('lf t55xx write b 0 d %s'):format(config))
 
-                config = tonumber(config,16)
-                local writecmd = Command:new{cmd = cmds.CMD_T55XX_WRITE_BLOCK,arg1 = config, arg2 = block, arg3 = "00", data = "00"}
-                local err = core.SendCommand(writecmd:getBytes())
-                if err then return oops(err) end
-                local response = core.WaitForResponseTimeout(cmds.CMD_ACK,TIMEOUT)
+                config = tonumber(config, 16)
+                local wc = Command:newMIX{
+                                        cmd = cmds.CMD_T55XX_WRITE_BLOCK
+                                        , arg1 = config
+                                        , arg2 = block
+                                        }
+                local reponse, err = wc:sendMIX(false)
+                if not response then return oops(err) end
             else
                 dbg(pcmd)
                 core.console( pcmd )
@@ -124,7 +133,7 @@ local function main(args)
 
     -- Arguments for the script
     for o, arg in getopt.getopt(args, 'h') do
-        if o == "h" then return help() end
+        if o == 'h' then return help() end
     end
 
     core.clearCommandBuffer()
diff --git a/client/scripts/test_t55x7_fsk.lua b/client/scripts/test_t55x7_fsk.lua
index 492f71681..0b1c49e80 100644
--- a/client/scripts/test_t55x7_fsk.lua
+++ b/client/scripts/test_t55x7_fsk.lua
@@ -3,12 +3,10 @@ local getopt = require('getopt')
 local bin = require('bin')
 local utils = require('utils')
 
-example =[[
-    1. script run test_t55x7_fsk
-]]
-author = "Iceman"
-usage = "script run test_t55x7_fsk"
-desc =[[
+copyright = ''
+author = 'Iceman'
+version = 'v1.0.1'
+desc = [[
 This script will program a T55x7 TAG with the configuration: block 0x00 data 0x000100
 The outlined procedure is as following:
 
@@ -33,14 +31,18 @@ Loop:
     -xx 18 xxxx = RF/100
     -xx 1C xxxx = RF/128
 
-
 testsuit for the ASK/MANCHESTER demod
+]]
+example = [[
+    1. script run test_t55x7_fsk
+]]
+usage = [[
+script run test_t55x7_fsk
 
 Arguments:
     -h             : this help
 ]]
 
-local TIMEOUT = 2000 -- Shouldn't take longer than 2 seconds
 local DEBUG = true -- the debug flag
 
 --BLOCK 0 = 00008040 FSK
@@ -55,31 +57,34 @@ local procedurecmds = {
 ---
 -- A debug printout-function
 local function dbg(args)
-    if not DEBUG then
-        return
-    end
-
-    if type(args) == "table" then
+    if not DEBUG then return end
+    if type(args) == 'table' then
         local i = 1
         while args[i] do
             dbg(args[i])
             i = i+1
         end
     else
-        print("###", args)
+        print('###', args)
     end
 end
 ---
 -- This is only meant to be used when errors occur
 local function oops(err)
-    print("ERROR: ",err)
+    print('ERROR:', err)
+    core.clearCommandBuffer()
+    return nil, err
 end
 ---
 -- Usage help
 local function help()
+    print(copyright)
+    print(author)
+    print(version)
     print(desc)
-    print("Example usage")
+    print('Example usage')
     print(example)
+    print(usage)
 end
 --
 -- Exit message
@@ -92,7 +97,7 @@ end
 
 local function test(modulation)
     local y
-    local block = "00"
+    local block = '00'
     for y = 0x0, 0x1d, 0x4 do
         for _ = 1, #procedurecmds do
             local pcmd = procedurecmds[_]
@@ -105,11 +110,13 @@ local function test(modulation)
                 dbg(('lf t55xx write b 0 d %s'):format(config))
 
                 config = tonumber(config,16)
-                local writecmd = Command:new{cmd = cmds.CMD_T55XX_WRITE_BLOCK,arg1 = config, arg2 = block, arg3 = "00", data = "00"}
-                local err = core.SendCommand(writecmd:getBytes())
-                if err then return oops(err) end
-                local response = core.WaitForResponseTimeout(cmds.CMD_ACK,TIMEOUT)
-
+                local wc = Command:newMIX{
+                                        cmd = cmds.CMD_T55XX_WRITE_BLOCK
+                                        , arg1 = config
+                                        , arg2 = block
+                                        }
+                local reponse, err = wc:sendMIX(false)
+                if not response then return oops(err) end
             else
                 dbg(pcmd)
                 core.console( pcmd )
@@ -127,7 +134,7 @@ local function main(args)
 
     -- Arguments for the script
     for o, arg in getopt.getopt(args, 'h') do
-        if o == "h" then return help() end
+        if o == 'h' then return help() end
     end
 
     core.clearCommandBuffer()
diff --git a/client/scripts/test_t55x7_psk.lua b/client/scripts/test_t55x7_psk.lua
index bd3aa2f79..a3bce696d 100644
--- a/client/scripts/test_t55x7_psk.lua
+++ b/client/scripts/test_t55x7_psk.lua
@@ -3,13 +3,10 @@ local getopt = require('getopt')
 local bin = require('bin')
 local utils = require('utils')
 
-example =[[
-    1. script run test_t55x7_psk
-    2. script run test_t55x7_psk -o
-]]
-author = "Iceman"
-usage = "script run test_t55x7_psk"
-desc =[[
+copyright = ''
+author = 'Iceman'
+version = 'v1.0.1'
+desc = [[
 This script will program a T55x7 TAG with the configuration: block 0x00 data 0x00088040
 The outlined procedure is as following:
 
@@ -30,12 +27,18 @@ Loop OUTER:
             XXXXX8XX = PSK RF/8
 
 In all 12 individual test for the PSK demod
+]]
+example = [[
+    1. script run test_t55x7_psk
+    2. script run test_t55x7_psk -o
+]]
+usage = [[
+script run test_t55x7_psk
 
 Arguments:
     -h             : this help
 ]]
 
-local TIMEOUT = 2000 -- Shouldn't take longer than 2 seconds
 local DEBUG = true -- the debug flag
 
 -- --BLOCK 0 = 00 08 80 40 PSK
@@ -53,31 +56,34 @@ local procedurecmds = {
 ---
 -- A debug printout-function
 local function dbg(args)
-    if not DEBUG then
-        return
-    end
-
-    if type(args) == "table" then
+    if not DEBUG then return end
+    if type(args) == 'table' then
         local i = 1
         while args[i] do
             dbg(args[i])
             i = i+1
         end
     else
-        print("###", args)
+        print('###', args)
     end
 end
 ---
 -- This is only meant to be used when errors occur
 local function oops(err)
-    print("ERROR: ",err)
+    print('ERROR:', err)
+    core.clearCommandBuffer()
+    return nil, err
 end
 ---
 -- Usage help
 local function help()
+    print(copyright)
+    print(author)
+    print(version)
     print(desc)
-    print("Example usage")
+    print('Example usage')
     print(example)
+    print(usage)
 end
 --
 -- Exit message
@@ -91,7 +97,7 @@ end
 local function test(modulation)
     local bitrate
     local clockrate
-    local block = "00"
+    local block = '00'
     for bitrate = 0x0, 0x1d, 0x4 do
 
         for clockrate = 0,8,4 do
@@ -103,16 +109,19 @@ local function test(modulation)
 
                 elseif _ == 1 then
 
-                    dbg("Writing to T55x7 TAG")
+                    dbg('Writing to T55x7 TAG')
 
                     local config = cmd:format(bitrate, modulation, clockrate)
-                    dbg(('lf t55xx write b 0  d %s'):format(config))
+                    dbg(('lf t55xx write b 0 d %s'):format(config))
 
-                    config = tonumber(config,16)
-                    local writecmd = Command:new{cmd = cmds.CMD_T55XX_WRITE_BLOCK,arg1 = config, arg2 = block, arg3 = "00", data = "00"}
-                    local err = core.SendCommand(writecmd:getBytes())
-                    if err then return oops(err) end
-                    local response = core.WaitForResponseTimeout(cmds.CMD_ACK,TIMEOUT)
+                    config = tonumber(config, 16)
+                    local wc = Command:newMIX{
+                                            cmd = cmds.CMD_T55XX_WRITE_BLOCK
+                                            , arg1 = config
+                                            , arg2 = block
+                                            }
+                    local reponse, err = wc:sendMIX(false)
+                    if not response then return oops(err) end
                 else
                     dbg(cmd)
                     core.console( cmd )
@@ -131,7 +140,7 @@ local function main(args)
 
     -- Arguments for the script
     for o, arg in getopt.getopt(args, 'h') do
-        if o == "h" then return help() end
+        if o == 'h' then return help() end
     end
 
     core.clearCommandBuffer()
diff --git a/client/scripts/tnp3clone.lua b/client/scripts/tnp3clone.lua
index 386a7e25c..0bb18375b 100644
--- a/client/scripts/tnp3clone.lua
+++ b/client/scripts/tnp3clone.lua
@@ -10,6 +10,12 @@ local rsh = bit32.rshift
 local bor = bit32.bor
 local band = bit32.band
 
+copyright = ''
+author = "Iceman"
+version = 'v1.0.1'
+desc =[[
+This script will try making a barebone clone of a tnp3 tag on to a magic generation1 card.
+]]
 example =[[
     script run tnp3clone
     script run tnp3clone -h
@@ -17,10 +23,8 @@ example =[[
     script run tnp3clone -t aa00 -s 0030
 
 ]]
-author = "Iceman"
-usage = "script run tnp3clone -t <toytype> -s <subtype>"
-desc =[[
-This script will try making a barebone clone of a tnp3 tag on to a magic generation1 card.
+usage = [[
+script run tnp3clone -t <toytype> -s <subtype>
 
 Arguments:
     -h             : this help
@@ -36,51 +40,59 @@ Arguments:
     023c - Special
     0020 - Swapforce
 ]]
-
+---
 -- This is only meant to be used when errors occur
 local function oops(err)
-    print("ERROR: ",err)
+    print('ERROR:', err)
+    core.clearCommandBuffer()
+    return nil, err
 end
 -- Usage help
 local function help()
+    print(copyright)
+    print(author)
+    print(version)
     print(desc)
-    print("Example usage")
+    print('Example usage')
     print(example)
+    print(usage)
 end
-
-local function waitCmd()
-    local response = core.WaitForResponseTimeout(cmds.CMD_ACK,2000)
-    if response then
-        local count,cmd,arg0 = bin.unpack('LL',response)
-        if(arg0==1) then
-            local count,arg1,arg2,data = bin.unpack('LLH511',response,count)
-            return data:sub(1,32)
-        else
-            return nil, "Couldn't read block."
-        end
+---
+-- decode response and get the blockdata from a normal mifare read command
+local function getblockdata(response)
+    if not response then
+        return nil, 'No response from device'
+    end
+    
+    local count, cmd, arg0 = bin.unpack('LL', response)
+    if arg0 == 1 then
+        local count, arg1, arg2, data = bin.unpack('LLH511', response, count)
+        return data:sub(1, 32)
+    else
+        return nil, "Couldn't read block.. ["..arg0.."]"
     end
-    return nil, "No response from device"
 end
 
 local function readblock( blocknum, keyA )
     -- Read block N
-    cmd = Command:new{cmd = cmds.CMD_MIFARE_READBL, arg1 = blocknum, arg2 = 0, arg3 = 0, data = keyA}
-    err = core.SendCommand(cmd:getBytes())
-    if err then return nil, err end
-    local block0, err = waitCmd()
-    if err then return nil, err end
-    return block0
+    local c = Command:newMIX{cmd = cmds.CMD_MIFARE_READBL, arg1 = blocknum, data = keyA}
+    local b, err = getblockdata(c:sendMIX())
+    if not b then return oops(err) end
+    return b
 end
-
+---
+-- decode response and get the blockdata from backdoor magic command 
 local function readmagicblock( blocknum )
     -- Read block N
     local CSETBLOCK_SINGLE_OPERATION = 0x1F
-    cmd = Command:new{cmd = cmds.CMD_MIFARE_CGETBLOCK, arg1 = CSETBLOCK_SINGLE_OPERATION, arg2 = 0, arg3 = blocknum}
-    err = core.SendCommand(cmd:getBytes())
-    if err then return nil, err end
-    local block0, err = waitCmd()
-    if err then return nil, err end
-    return block0
+    local c = Command:newMIX{
+                    cmd = cmds.CMD_MIFARE_CGETBLOCK
+                    , arg1 = CSETBLOCK_SINGLE_OPERATION
+                    , arg3 = blocknum
+                    }
+    local b, err = getblockdata(c:sendMIX())
+    if not b then return oops(err) end
+    return b
 end
 
 local function main(args)
@@ -103,10 +115,10 @@ local function main(args)
 
     -- Arguments for the script
     for o, a in getopt.getopt(args, 'ht:s:l') do
-        if o == "h" then return help() end
-        if o == "t" then toytype = a end
-        if o == "s" then subtype = a end
-        if o == "l" then return toys.List() end
+        if o == 'h' then return help() end
+        if o == 't' then toytype = a end
+        if o == 's' then subtype = a end
+        if o == 'l' then return toys.List() end
     end
 
     if #toytype ~= 4 then return oops('[!] Wrong size - toytype. (4hex symbols)') end
@@ -115,7 +127,7 @@ local function main(args)
     -- look up type, find & validate types
     local item = toys.Find( toytype, subtype)
     if item then
-        print( ('[+] Looking up input: Found %s - %s (%s)'):format(item[6],item[5], item[4]) )
+        print( ('[+] Looking up input: Found %s - %s (%s)'):format(item[6], item[5], item[4]) )
     else
         print('[-] Didn\'t find item type. If you are sure about it, post on forum')
     end
diff --git a/client/scripts/tnp3dump.lua b/client/scripts/tnp3dump.lua
index 32afc6fdc..b0db89718 100644
--- a/client/scripts/tnp3dump.lua
+++ b/client/scripts/tnp3dump.lua
@@ -131,7 +131,8 @@ local function main(args)
     -- Turn off Debug
     local cmdSetDbgOff = "hf mf dbg 0"
     core.console( cmdSetDbgOff)
-
+    utils.Sleep(0.5)
+    
     result, err = lib14a.read(false, true)
     if not result then return oops(err) end
 
@@ -166,7 +167,7 @@ local function main(args)
     local block0, block1
     -- Read block 0
     dbg('Reading block 0')
-    cmd = Command:newMIX{cmd = cmds.CMD_MIFARE_READBL, data = keyA}
+    cmd = Command:newMIX{cmd = cmds.CMD_MIFARE_READBL, arg1 = 0, data = keyA}
     block0, err = getblockdata(cmd:sendMIX(false))
     if not block0 then return oops(err) end
     
diff --git a/client/scripts/tnp3sim.lua b/client/scripts/tnp3sim.lua
index 21845794e..8ba56238d 100644
--- a/client/scripts/tnp3sim.lua
+++ b/client/scripts/tnp3sim.lua
@@ -235,7 +235,6 @@ local function LoadEmulator(uid, blocks)
                 local key = md5.sumhexa(baseStr)
                 local enc = core.aes128_encrypt(key, blockdata)
                 blockdata = utils.ConvertAsciiToHex(enc)
-                io.write( _..',')
             end
         else
             -- add keys if not existing..
@@ -243,6 +242,9 @@ local function LoadEmulator(uid, blocks)
                 blockdata = AddKey(keys, _, blockdata)
             end
         end
+        
+        io.write( _..',')
+        io.flush()
         core.clearCommandBuffer()
         cmd = Command:newMIX{cmd = cmds.CMD_MIFARE_EML_MEMSET, arg1 = _ ,arg2 = 1,arg3 = 16, data = blockdata}
         local err, msg = cmd:sendMIX(true)
@@ -368,6 +370,7 @@ local function main(args)
     -- Turn off Debug
     local cmdSetDbgOff = 'hf mf dbg 0'
     core.console( cmdSetDbgOff)
+    utils.Sleep(0.5)
 
     -- Load dump.bin file
     print( ('Load data from %s'):format(inputTemplate))
diff --git a/client/scripts/ul_uid.lua b/client/scripts/ul_uid.lua
index 16957d593..7b806b1fe 100644
--- a/client/scripts/ul_uid.lua
+++ b/client/scripts/ul_uid.lua
@@ -45,7 +45,7 @@ end
 -- This is only meant to be used when errors occur
 local function oops(err)
     print('ERROR:', err)
-    core.clearCommandBuffer()    
+    core.clearCommandBuffer()
     return nil, err
 end
 ---

From 25dd7c9a1cff2896e3bdf9067dd349836ba5b2c5 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 28 Apr 2019 19:39:09 +0200
Subject: [PATCH 1471/1938] spelling

---
 client/scripts/test_t55x7_ask.lua | 2 +-
 client/scripts/test_t55x7_bi.lua  | 2 +-
 client/scripts/test_t55x7_fsk.lua | 2 +-
 client/scripts/test_t55x7_psk.lua | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/scripts/test_t55x7_ask.lua b/client/scripts/test_t55x7_ask.lua
index 7ca3a1f29..0570aa855 100644
--- a/client/scripts/test_t55x7_ask.lua
+++ b/client/scripts/test_t55x7_ask.lua
@@ -118,7 +118,7 @@ local function test()
                                         , arg1 = config
                                         , arg2 = block
                                         }
-                local reponse, err = wc:sendMIX(false)
+                local response, err = wc:sendMIX(false)
                 if not response then return oops(err) end
 
             else
diff --git a/client/scripts/test_t55x7_bi.lua b/client/scripts/test_t55x7_bi.lua
index 21c0234c0..67f9ccec3 100644
--- a/client/scripts/test_t55x7_bi.lua
+++ b/client/scripts/test_t55x7_bi.lua
@@ -113,7 +113,7 @@ local function test()
                                         , arg1 = config
                                         , arg2 = block
                                         }
-                local reponse, err = wc:sendMIX(false)
+                local response, err = wc:sendMIX(false)
                 if not response then return oops(err) end
             else
                 dbg(pcmd)
diff --git a/client/scripts/test_t55x7_fsk.lua b/client/scripts/test_t55x7_fsk.lua
index 0b1c49e80..b58c213d1 100644
--- a/client/scripts/test_t55x7_fsk.lua
+++ b/client/scripts/test_t55x7_fsk.lua
@@ -115,7 +115,7 @@ local function test(modulation)
                                         , arg1 = config
                                         , arg2 = block
                                         }
-                local reponse, err = wc:sendMIX(false)
+                local response, err = wc:sendMIX(false)
                 if not response then return oops(err) end
             else
                 dbg(pcmd)
diff --git a/client/scripts/test_t55x7_psk.lua b/client/scripts/test_t55x7_psk.lua
index a3bce696d..43798ff47 100644
--- a/client/scripts/test_t55x7_psk.lua
+++ b/client/scripts/test_t55x7_psk.lua
@@ -120,7 +120,7 @@ local function test(modulation)
                                             , arg1 = config
                                             , arg2 = block
                                             }
-                    local reponse, err = wc:sendMIX(false)
+                    local response, err = wc:sendMIX(false)
                     if not response then return oops(err) end
                 else
                     dbg(cmd)

From 79bfe892d6a42aab319fbddf35ed246cf949460b Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 28 Apr 2019 19:45:00 +0200
Subject: [PATCH 1472/1938] next

---
 client/scripts/test_t55x7.lua | 55 ++++++++++++++++++++---------------
 1 file changed, 31 insertions(+), 24 deletions(-)

diff --git a/client/scripts/test_t55x7.lua b/client/scripts/test_t55x7.lua
index 710df0c3f..478336313 100644
--- a/client/scripts/test_t55x7.lua
+++ b/client/scripts/test_t55x7.lua
@@ -3,12 +3,12 @@ local getopt = require('getopt')
 local bin = require('bin')
 local utils = require('utils')
 
-local format=string.format
-local floor=math.floor
+local format = string.format
+local floor = math.floor
 
 copyright = ''
 author = "Iceman"
-version  = ''
+version  = 'v1.0.1'
 desc =[[
 This script will program a T55x7 TAG with a configuration and four blocks of data.
 It will then try to detect and read back those block data and compare if read data matches the expected data.
@@ -39,7 +39,6 @@ Arguments:
     -h       this help
 ]]
 
-local TIMEOUT = 2000 -- Shouldn't take longer than 2 seconds
 local DEBUG = false -- the debug flag
 local total_tests = 0
 local total_pass = 0
@@ -54,24 +53,23 @@ local data_blocks_cmds = {
 ---
 -- A debug printout-function
 local function dbg(args)
-    if not DEBUG then
-        return
-    end
-
-    if type(args) == "table" then
+    if not DEBUG then return end
+    if type(args) == 'table' then
         local i = 1
         while args[i] do
             dbg(args[i])
             i = i+1
         end
     else
-        print("###", args)
+        print('###', args)
     end
 end
 ---
 -- This is only meant to be used when errors occur
 local function oops(err)
-    print("ERROR: ",err)
+    print('ERROR:', err)
+    core.clearCommandBuffer()
+    return nil, err
 end
 ---
 -- Usage help
@@ -82,6 +80,7 @@ local function help()
     print(desc)
     print("Example usage")
     print(example)
+    print(usage)    
 end
 ---
 -- Exit message
@@ -210,10 +209,10 @@ local function WipeCard()
     local res, msg = core.t55xx_detect()
     if not res then
         oops("Can't detect modulation. Test failed.")
-        core.console("rem [ERR:DETECT:WIPED] Failed to detect after wipe")
+        core.console('rem [ERR:DETECT:WIPED] Failed to detect after wipe')
         return false
     else
-        local wipe_data_cmd = "lf t55xx write b %s d %s"
+        local wipe_data_cmd = 'lf t55xx write b %s d %s'
         for _ = 1, #data_blocks_cmds do
             local val = data_blocks_cmds[_]
             local c = string.format(wipe_data_cmd, _, val)
@@ -227,9 +226,9 @@ end
 local function CheckReadBlock(block)
     local data, msg
     -- blockno, page1, override, pwd
-    data, msg = core.t55xx_readblock(block, "0", "0", "")
+    data, msg = core.t55xx_readblock(block, '0', '0', '')
     if not data then
-        return ""
+        return ''
     end
     return ('%08X'):format(data)
 end
@@ -238,7 +237,7 @@ local function test(modulation)
 
     local process_block0_cmds = {}
     local y
-    local block = "00"
+    local block = '00'
 
     local s = ('Start test of %s'):format(modulation)
     print(s)
@@ -256,16 +255,19 @@ local function test(modulation)
         -- Write Config block
         dbg(('lf t55xx write b 0 d %s'):format(p_config_cmd))
         local config = tonumber(p_config_cmd, 16)
-        local writecmd = Command:new{cmd = cmds.CMD_T55XX_WRITE_BLOCK,arg1 = config, arg2 = block, arg3 = '00', data = '00'}
-        local err = core.SendCommand(writecmd:getBytes())
-        if err then return oops(err) end
-        local response = core.WaitForResponseTimeout(cmds.CMD_ACK,TIMEOUT)
+        local wc = Command:newMIX{
+                                cmd = cmds.CMD_T55XX_WRITE_BLOCK
+                                , arg1 = config
+                                , arg2 = block
+                                }
+        local response, err = wc:sendMIX(false)
+        if not response then return oops(err) end        
 
         -- Detect
         local res, msg = core.t55xx_detect()
         if not res then
             print("can't detect modulation, skip to next config")
-            core.console(format("rem [ERR:DETECT:%s] Failed to detect modulation", p_config_cmd))
+            core.console(format('rem [ERR:DETECT:%s] Failed to detect modulation', p_config_cmd))
             core.console(format('rem [SUMMARY:%s] FAIL detection', p_config_cmd))
             total_tests = total_tests + #data_blocks_cmds
         else
@@ -299,7 +301,7 @@ local function main(args)
 
     -- Arguments for the script
     for o, arg in getopt.getopt(args, 'h') do
-        if o == "h" then return help() end
+        if o == 'h' then return help() end
     end
 
     core.clearCommandBuffer()
@@ -321,7 +323,12 @@ local function main(args)
     end
 
     exitMsg('Tests finished')
-    core.console( format('rem [SUMMARY] Success rate: %d/%d tests passed%s', total_pass, total_tests, total_pass < total_tests and ", help me improving that number!" or " \\o/"))
-
+    core.console( 
+            format('rem [SUMMARY] Success rate: %d/%d tests passed%s'
+                , total_pass
+                , total_tests
+                , total_pass < total_tests and ', help me improving that number!' or ' \\o/'
+           )
+    )
 end
 main(args)

From f4f8636b8660a50673aff93fcd77e1b05f924ed5 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 28 Apr 2019 19:51:25 +0200
Subject: [PATCH 1473/1938] more converting scripts

---
 client/scripts/read_pwd_mem.lua | 60 ++++++++++++++--------------
 client/scripts/remagic.lua      | 70 +++++++++++++++++++++------------
 2 files changed, 75 insertions(+), 55 deletions(-)

diff --git a/client/scripts/read_pwd_mem.lua b/client/scripts/read_pwd_mem.lua
index 4611c32cc..783a53b12 100644
--- a/client/scripts/read_pwd_mem.lua
+++ b/client/scripts/read_pwd_mem.lua
@@ -2,8 +2,8 @@ local getopt = require('getopt')
 local bin = require('bin')
 
 copyright = 'Copyright (c) 2018 Bogito. All rights reserved.'
-author = "Bogito"
-version = 'v1.0.1'
+author = 'Bogito'
+version = 'v1.0.2'
 desc =
 [[
 This script will read the flash memory of RDV4 and print the stored passwords.
@@ -11,20 +11,6 @@ It was meant to be used as a help tool after using the BogRun standalone mode.
 
 (Iceman) script adapted to read and print keys in the default dictionary flashmemory sections.
 ]]
-usage =
-[[
-Usage:
-    script run read_pwd_mem -h -o <offset> -l <length> -k <keylength>
-
-Arguments:
-    -h              :  this help
-    -o <offset>     :  memory offset, default is 0
-    -l <length>     :  length in bytes, default is 256
-    -k <keylen>     :  key length in bytes <4|6|8> ,  default is 4
-    -m              :  print Mifare dictionary keys
-    -t              :  print t55xx dictionary passwords
-    -i              :  print iClass dictionary keys
-]]
 example =
 [[
     -- This will scan the first 256 bytes of flash memory for stored passwords
@@ -39,21 +25,37 @@ example =
     -- This will print found
     script run read_pwd_mem -o 241664 -k 6
 ]]
+usage =
+[[
+Usage:
+    script run read_pwd_mem -h -o <offset> -l <length> -k <keylength>
+
+Arguments:
+    -h              :  this help
+    -o <offset>     :  memory offset, default is 0
+    -l <length>     :  length in bytes, default is 256
+    -k <keylen>     :  key length in bytes <4|6|8> ,  default is 4
+    -m              :  print Mifare dictionary keys
+    -t              :  print t55xx dictionary passwords
+    -i              :  print iClass dictionary keys
+]]
 ---
 -- This is only meant to be used when errors occur
 local function oops(err)
-    print("ERROR: ", err)
+    print('ERROR:', err)
+    core.clearCommandBuffer()
     return nil, err
 end
 ---
 -- Usage help
 local function help()
     print(copyright)
+    print(author)
     print(version)
     print(desc)
-    print(usage)
-    print('Example usage:')
+    print('Example usage')
     print(example)
+    print(usage)
 end
 ---
 -- The main entry point
@@ -73,20 +75,20 @@ local function main(args)
     for o, a in getopt.getopt(args, 'ho:l:k:mti') do
 
         -- help
-        if o == "h" then return help() end
+        if o == 'h' then return help() end
 
         -- offset
-        if o == "o" then offset = tonumber(a) end
+        if o == 'o' then offset = tonumber(a) end
 
         -- num of bytes to read
-        if o == "l" then length = tonumber(a) end
+        if o == 'l' then length = tonumber(a) end
 
         -- keylength
-        if o == "k" then keylength = tonumber(a); usedkey = true end
+        if o == 'k' then keylength = tonumber(a); usedkey = true end
 
-        if o == "m" then keylength =6; usedkey = true; offset = 0x3F000-0x4000; end
-        if o == "t" then keylength =4; usedkey = true; offset = 0x3F000-0x3000; end
-        if o == "i" then keylength =8; usedkey = true; offset = 0x3F000-0x5000; end
+        if o == 'm' then keylength =6; usedkey = true; offset = 0x3F000-0x4000; end
+        if o == 't' then keylength =4; usedkey = true; offset = 0x3F000-0x3000; end
+        if o == 'i' then keylength =8; usedkey = true; offset = 0x3F000-0x5000; end
     end
 
     if length < 0 or length > 256 then
@@ -116,7 +118,7 @@ local function main(args)
         for i = 1, keys do
 
             key  = string.sub(s, (i - 1) * kl + 1, i * kl )
-            print(string.format("[%02d] %s",i, key))
+            print(string.format('[%02d] %s',i, key))
         end
         print( string.rep('--',20) )
         print( ('[+] found %d passwords'):format(keys))
@@ -128,8 +130,8 @@ local function main(args)
         for i = 1, (length/keylength) do
 
             key  = string.sub(s, (i-1)*8+1, i*8)
-            if key == "FFFFFFFF" then break end
-            print(string.format("[%02d] %s",i, key))
+            if key == 'FFFFFFFF' then break end
+            print(string.format('[%02d] %s',i, key))
             cnt = cnt + 1
         end
         print( string.rep('--',20) )
diff --git a/client/scripts/remagic.lua b/client/scripts/remagic.lua
index 29e9a2c56..096fcfa27 100644
--- a/client/scripts/remagic.lua
+++ b/client/scripts/remagic.lua
@@ -1,12 +1,21 @@
 local getopt = require('getopt')
 
-example = "script run remagic"
-author = "Iceman"
+copyright = ''
+author = 'Iceman'
+version = 'v1.0.1'
 desc =
 [[
 This is a script that tries to bring back a chinese magic card (1k generation1)
 from the dead when it's block 0 has been written with bad values.
 or mifare Ultralight magic card which answers to chinese backdoor commands
+]]
+example = [[
+    -- target a Ultralight based card
+    1. script run remagic -u
+
+]]
+usage = [[
+script run remagic
 
 Arguments:
     -h      this help
@@ -15,55 +24,64 @@ Arguments:
 ---
 -- A debug printout-function
 local function dbg(args)
-    if DEBUG then
+    if not DEBUG then return end
+    if type(args) == 'table' then
+        local i = 1
+        while result[i] do
+            dbg(result[i])
+            i = i+1
+        end
+    else
         print('###', args)
     end
 end
 ---
 -- This is only meant to be used when errors occur
 local function oops(err)
-    print('ERROR: ',err)
+    print('ERROR:', err)
+    core.clearCommandBuffer()
+    return nil, err
 end
 ---
 -- Usage help
 local function help()
+    print(copyright)
+    print(author)
+    print(version)
     print(desc)
     print('Example usage')
     print(example)
+    print(usage)
 end
 
 local function cmdUltralight()
     return {
-    --[[
-    --]]
-    [0] = "hf 14a raw -p -a -b 7 40",
-    [1] = "hf 14a raw -p -a 43",
-    [2] = "hf 14a raw -c -a A2005380712A",
-    [3] = "hf 14a raw -p -a -b 7 40",
-    [4] = "hf 14a raw -p -a 43",
-    [5] = "hf 14a raw -c -a A2010200D980",
-    [6] = "hf 14a raw -p -a -b 7 40",
-    [7] = "hf 14a raw -p -a 43",
-    [8] = "hf 14a raw -c -a A2025B480000",
-    [9] = "hf 14a raw -c -a 5000",
+    [0] = 'hf 14a raw -p -a -b 7 40',
+    [1] = 'hf 14a raw -p -a 43',
+    [2] = 'hf 14a raw -c -a A2005380712A',
+    [3] = 'hf 14a raw -p -a -b 7 40',
+    [4] = 'hf 14a raw -p -a 43',
+    [5] = 'hf 14a raw -c -a A2010200D980',
+    [6] = 'hf 14a raw -p -a -b 7 40',
+    [7] = 'hf 14a raw -p -a 43',
+    [8] = 'hf 14a raw -c -a A2025B480000',
+    [9] = 'hf 14a raw -c -a 5000',
     }
 end
 local function cmdClassic()
     return {
-    --[[
-    --]]
-    [0] = "hf 14a raw -p -a -b 7 40",
-    [1] = "hf 14a raw -p -a 43",
-    [2] = "hf 14a raw -c -p -a A000",
-    [3] = "hf 14a raw -c -p -a 01020304049802000000000000001001",
-    [4] = "hf 14a raw -c -a 5000",
+    [0] = 'hf 14a raw -p -a -b 7 40',
+    [1] = 'hf 14a raw -p -a 43',
+    [2] = 'hf 14a raw -c -p -a A000',
+    [3] = 'hf 14a raw -c -p -a 01020304049802000000000000001001',
+    [4] = 'hf 14a raw -c -a 5000',
     }
 end
 local function cmdRestoreST()
     local arr = {}
     for i = 0, 15 do
         local blk = 3 + (4*i)
-        arr[i] = "hf mf csetbl "..blk.." FFFFFFFFFFFFFF078000FFFFFFFFFFFF"
+        arr[i] = 'hf mf csetbl '..blk..' FFFFFFFFFFFFFF078000FFFFFFFFFFFF'
     end
     return arr
 end
@@ -86,8 +104,8 @@ function main(args)
 
     -- Read the parameters
     for o, a in getopt.getopt(args, 'hu') do
-        if o == "h" then return help() end
-        if o == "u" then isUltralight = true end
+        if o == 'h' then return help() end
+        if o == 'u' then isUltralight = true end
     end
 
     core.clearCommandBuffer()

From 1dbcb712c3ba71efb03df31f72e76c3f4985ac75 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 28 Apr 2019 20:42:57 +0200
Subject: [PATCH 1474/1938] safeFile*: accept when suffix is already provided

---
 client/cmdflashmem.c       |  4 +--
 client/cmdhf14b.c          |  4 +--
 client/cmdhf15.c           |  4 +--
 client/cmdhficlass.c       | 10 +++---
 client/cmdhflegic.c        |  4 +--
 client/cmdhfmf.c           | 18 +++++-----
 client/cmdhfmfu.c          |  4 +--
 client/cmdlfhitag.c        |  6 ++--
 client/cmdtrace.c          |  2 +-
 client/loclass/fileutils.c | 73 ++++++++++++++++++++++++--------------
 client/loclass/fileutils.h |  8 ++---
 client/util.c              | 13 -------
 client/util.h              |  1 -
 13 files changed, 77 insertions(+), 74 deletions(-)

diff --git a/client/cmdflashmem.c b/client/cmdflashmem.c
index b77161951..3a744a544 100644
--- a/client/cmdflashmem.c
+++ b/client/cmdflashmem.c
@@ -351,8 +351,8 @@ static int CmdFlashMemSave(const char *Cmd) {
         return 1;
     }
 
-    saveFile(filename, "bin", dump, len);
-    saveFileEML(filename, "eml", dump, len, 16);
+    saveFile(filename, ".bin", dump, len);
+    saveFileEML(filename, dump, len, 16);
     free(dump);
     return 0;
 }
diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c
index b1aa78e64..8f222b1e8 100644
--- a/client/cmdhf14b.c
+++ b/client/cmdhf14b.c
@@ -985,8 +985,8 @@ static int CmdHF14BDump(const char *Cmd) {
 
 
     size_t datalen = (blocks + 1) * 4;
-    saveFileEML(filename, "eml", data, datalen, 4);
-    saveFile(filename, "bin", data, datalen);
+    saveFileEML(filename, data, datalen, 4);
+    saveFile(filename, ".bin", data, datalen);
 out:
     return switch_off_field_14b();
 }
diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index 496ea3073..db9f66735 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -842,8 +842,8 @@ static int CmdHF15Dump(const char *Cmd) {
     PrintAndLogEx(NORMAL, "\n");
 
     size_t datalen = blocknum * 4;
-    saveFileEML(filename, "eml", data, datalen, 4);
-    saveFile(filename, "bin", data, datalen);
+    saveFileEML(filename, data, datalen, 4);
+    saveFile(filename, ".bin", data, datalen);
     return 0;
 }
 
diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index 5372022ab..b9a1b091d 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -425,7 +425,7 @@ static int CmdHFiClassSim(const char *Cmd) {
                 memcpy(dump + i * 24 + 16, resp.d.asBytes + i * 16 + 8, 8);
             }
             /** Now, save to dumpfile **/
-            saveFile("iclass_mac_attack", "bin", dump, datalen);
+            saveFile("iclass_mac_attack", ".bin", dump, datalen);
             free(dump);
             break;
         }
@@ -479,7 +479,7 @@ static int CmdHFiClassSim(const char *Cmd) {
                 // copy NR_MAC (eight bytes from the response)  ( 8b csn + 8b epurse == 16)
                 memcpy(dump + i * MAC_ITEM_SIZE + 16, resp.d.asBytes + i * 16 + 8, 8);
             }
-            saveFile("iclass_mac_attack_keyroll_A", "bin", dump, datalen);
+            saveFile("iclass_mac_attack_keyroll_A", ".bin", dump, datalen);
 
             //KEYROLL 2
             memset(dump, 0, datalen);
@@ -494,7 +494,7 @@ static int CmdHFiClassSim(const char *Cmd) {
                 memcpy(dump + i * MAC_ITEM_SIZE + 16, resp.d.asBytes + resp_index + 8, 8);
                 resp_index++;
             }
-            saveFile("iclass_mac_attack_keyroll_B", "bin", dump, datalen);
+            saveFile("iclass_mac_attack_keyroll_B", ".bin", dump, datalen);
             free(dump);
             break;
         }
@@ -720,7 +720,7 @@ static int CmdHFiClassDecrypt(const char *Cmd) {
         }
     }
 
-    saveFile(outfilename, "bin", decrypted, fsize);
+    saveFile(outfilename, ".bin", decrypted, fsize);
     printIclassDumpContents(decrypted, 1, (fsize / 8), fsize);
     free(decrypted);
     return 0;
@@ -1087,7 +1087,7 @@ static int CmdHFiClassReader_Dump(const char *Cmd) {
 
     // save the dump to .bin file
     PrintAndLogEx(SUCCESS, "saving dump file - %d blocks read", gotBytes / 8);
-    saveFile(filename, "bin", tag_data, gotBytes);
+    saveFile(filename, ".bin", tag_data, gotBytes);
     return 1;
 }
 
diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index 0da3daaaa..3ea33f089 100644
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -1212,8 +1212,8 @@ static int CmdLegicESave(const char *Cmd) {
     else
         sprintf(fnameptr + fileNlen, ".bin");
 
-    saveFileEML(filename, "eml", data, numofbytes, 8);
-    saveFile(filename, "bin", data, numofbytes);
+    saveFileEML(filename, data, numofbytes, 8);
+    saveFile(filename, ".bin", data, numofbytes);
     return 0;
 }
 
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index db1b7d798..120240e3e 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -917,9 +917,9 @@ static int CmdHF14AMfDump(const char *Cmd) {
 
     uint16_t bytes = 16 * (FirstBlockOfSector(numSectors - 1) + NumBlocksPerSector(numSectors - 1));
 
-    saveFile(dataFilename, "bin", (uint8_t *)carddata, bytes);
-    saveFileEML(dataFilename, "eml", (uint8_t *)carddata, bytes, MFBLOCK_SIZE);
-    saveFileJSON(dataFilename, "json", jsfCardMemory, (uint8_t *)carddata, bytes);
+    saveFile(dataFilename, ".bin", (uint8_t *)carddata, bytes);
+    saveFileEML(dataFilename, (uint8_t *)carddata, bytes, MFBLOCK_SIZE);
+    saveFileJSON(dataFilename, jsfCardMemory, (uint8_t *)carddata, bytes);
     return 0;
 }
 
@@ -2685,9 +2685,9 @@ static int CmdHF14AMfESave(const char *Cmd) {
         FillFileNameByUID(fnameptr, dump, "-dump", 4);
     }
 
-    saveFile(filename, "bin", dump, bytes);
-    saveFileEML(filename, "eml", dump, bytes, MFBLOCK_SIZE);
-    saveFileJSON(filename, "json", jsfCardMemory, dump, bytes);
+    saveFile(filename, ".bin", dump, bytes);
+    saveFileEML(filename, dump, bytes, MFBLOCK_SIZE);
+    saveFileJSON(filename, jsfCardMemory, dump, bytes);
     free(dump);
     return 0;
 }
@@ -3119,9 +3119,9 @@ static int CmdHF14AMfCSave(const char *Cmd) {
         PrintAndLogEx(SUCCESS, "uploaded %d bytes to emulator memory", bytes);
     }
 
-    saveFile(filename, "bin", dump, bytes);
-    saveFileEML(filename, "eml", dump, bytes, MFBLOCK_SIZE);
-    saveFileJSON(filename, "json", jsfCardMemory, dump, bytes);
+    saveFile(filename, ".bin", dump, bytes);
+    saveFileEML(filename, dump, bytes, MFBLOCK_SIZE);
+    saveFileJSON(filename, jsfCardMemory, dump, bytes);
     free(dump);
     return 0;
 }
diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index 39ee6a6b0..501bd9551 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -1974,8 +1974,8 @@ static int CmdHF14AMfUDump(const char *Cmd) {
         FillFileNameByUID(fptr, card.uid, "-dump", card.uidlen);
     }
     uint16_t datalen = pages * 4 + MFU_DUMP_PREFIX_LENGTH;
-    saveFile(filename, "bin", (uint8_t *)&dump_file_data, datalen);
-    saveFileJSON(filename, "json", jsfMfuMemory, (uint8_t *)&dump_file_data, datalen);
+    saveFile(filename, ".bin", (uint8_t *)&dump_file_data, datalen);
+    saveFileJSON(filename, jsfMfuMemory, (uint8_t *)&dump_file_data, datalen);
 
     if (is_partial)
         PrintAndLogEx(WARNING, "Partial dump created. (%d of %d blocks)", pages, card_mem_size);
diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index f901a042c..be66b460b 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -583,9 +583,9 @@ static int CmdLFHitagReader(const char *Cmd) {
         fnameptr += sprintf(fnameptr, "lf-hitag-");
         FillFileNameByUID(fnameptr, data, "-dump", 4);
 
-        saveFile(filename, "bin", data, 48);
-        saveFileEML(filename, "eml", data, 48, 4);
-        saveFileJSON(filename, "json", jsfHitag, data, 48);
+        saveFile(filename, ".bin", data, 48);
+        saveFileEML(filename, data, 48, 4);
+        saveFileJSON(filename, jsfHitag, data, 48);
 
         // block3, 1 byte
         printHitagConfiguration(data[4 * 3]);
diff --git a/client/cmdtrace.c b/client/cmdtrace.c
index 28605c08f..1582f2997 100644
--- a/client/cmdtrace.c
+++ b/client/cmdtrace.c
@@ -563,7 +563,7 @@ static int CmdTraceSave(const char *Cmd) {
     if (strlen(Cmd) < 1 || cmdp == 'h') return usage_trace_save();
 
     param_getstr(Cmd, 0, filename, sizeof(filename));
-    saveFile(filename, "bin", trace, traceLen);
+    saveFile(filename, ".bin", trace, traceLen);
     return 0;
 }
 
diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index 5370c0c5b..5e3b423f7 100644
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -57,15 +57,49 @@ int fileExists(const char *filename) {
     return result == 0;
 }
 
-int saveFile(const char *preferredName, const char *suffix, const void *data, size_t datalen) {
-    int size = sizeof(char) * (strlen(preferredName) + strlen(suffix) + 10);
-    char *fileName = calloc(size, sizeof(char));
+static char *filenamemcopy(const char *preferredName, const char *suffix) {
+    if (preferredName == NULL) return NULL;
+    if (suffix == NULL) return NULL;
+    char *fileName = (char *) calloc(strlen(preferredName) + strlen(suffix) + 1, sizeof(uint8_t));
+    if (fileName == NULL)
+        return NULL;
+    strcpy(fileName, preferredName);
+    if (str_endswith(fileName, suffix))
+        return fileName;
+    strcat(fileName, suffix);
+    return fileName;
+}
+
+static char *newfilenamemcopy(const char *preferredName, const char *suffix) {
+    if (preferredName == NULL) return NULL;
+    if (suffix == NULL) return NULL;
+    char *preferredNameTmp = (char *) calloc(strlen(preferredName) + 1, sizeof(uint8_t));
+    if (preferredNameTmp == NULL)
+        return NULL;
+    strcpy(preferredNameTmp, preferredName);
+    if (str_endswith(preferredNameTmp, suffix))
+        preferredNameTmp[strlen(preferredNameTmp) - strlen(suffix)] = '\0';
+    char *fileName = (char *) calloc(strlen(preferredNameTmp) + strlen(suffix) + 1 + 10, sizeof(uint8_t)); // 10: room for filenum to ensure new filename
+    if (fileName == NULL) {
+        free(preferredNameTmp);
+        return NULL;
+    }
     int num = 1;
-    sprintf(fileName, "%s.%s", preferredName, suffix);
+    sprintf(fileName, "%s%s", preferredNameTmp, suffix);
     while (fileExists(fileName)) {
-        sprintf(fileName, "%s-%d.%s", preferredName, num, suffix);
+        sprintf(fileName, "%s-%d%s", preferredNameTmp, num, suffix);
         num++;
     }
+    free(preferredNameTmp);
+    return fileName;
+}
+
+int saveFile(const char *preferredName, const char *suffix, const void *data, size_t datalen) {
+
+    if (data == NULL) return 1;
+    char *fileName = newfilenamemcopy(preferredName, suffix);
+    if (fileName == NULL) return 1;
+
     /* We should have a valid filename now, e.g. dumpdata-3.bin */
 
     /*Opening file for writing in binary mode*/
@@ -83,23 +117,15 @@ int saveFile(const char *preferredName, const char *suffix, const void *data, si
     return 0;
 }
 
-int saveFileEML(const char *preferredName, const char *suffix, uint8_t *data, size_t datalen, size_t blocksize) {
+int saveFileEML(const char *preferredName, uint8_t *data, size_t datalen, size_t blocksize) {
 
-    if (preferredName == NULL) return 1;
-    if (suffix == NULL) return 1;
     if (data == NULL) return 1;
+    char *fileName = newfilenamemcopy(preferredName, ".eml");
+    if (fileName == NULL) return 1;
 
     int retval = 0;
     int blocks = datalen / blocksize;
     uint16_t currblock = 1;
-    int size = sizeof(char) * (strlen(preferredName) + strlen(suffix) + 10);
-    char *fileName = calloc(size, sizeof(char));
-    int num = 1;
-    sprintf(fileName, "%s.%s", preferredName, suffix);
-    while (fileExists(fileName)) {
-        sprintf(fileName, "%s-%d.%s", preferredName, num, suffix);
-        num++;
-    }
 
     /* We should have a valid filename now, e.g. dumpdata-3.bin */
 
@@ -136,20 +162,13 @@ out:
     return retval;
 }
 
-int saveFileJSON(const char *preferredName, const char *suffix, JSONFileType ftype, uint8_t *data, size_t datalen) {
-    if (preferredName == NULL) return 1;
-    if (suffix == NULL) return 1;
+int saveFileJSON(const char *preferredName, JSONFileType ftype, uint8_t *data, size_t datalen) {
+
     if (data == NULL) return 1;
+    char *fileName = newfilenamemcopy(preferredName, ".json");
+    if (fileName == NULL) return 1;
 
     int retval = 0;
-    int size = sizeof(char) * (strlen(preferredName) + strlen(suffix) + 10);
-    char *fileName = calloc(size, sizeof(char));
-    int num = 1;
-    sprintf(fileName, "%s.%s", preferredName, suffix);
-    while (fileExists(fileName)) {
-        sprintf(fileName, "%s-%d.%s", preferredName, num, suffix);
-        num++;
-    }
 
     json_t *root = json_object();
     JsonSaveStr(root, "Created", "proxmark3");
diff --git a/client/loclass/fileutils.h b/client/loclass/fileutils.h
index 6f6b5456a..dae23a1b1 100644
--- a/client/loclass/fileutils.h
+++ b/client/loclass/fileutils.h
@@ -70,7 +70,7 @@ int fileExists(const char *filename);
  * E.g. dumpdata-15.txt
  *
  * @param preferredName
- * @param suffix the file suffix. Leave out the ".".
+ * @param suffix the file suffix. Including the ".".
  * @param data The binary data to write to the file
  * @param datalen the length of the data
  * @return 0 for ok, 1 for failz
@@ -83,13 +83,12 @@ int saveFile(const char *preferredName, const char *suffix, const void *data, si
  * E.g. dumpdata-15.txt
  *
  * @param preferredName
- * @param suffix the file suffix. Leave out the ".".
  * @param data The binary data to write to the file
  * @param datalen the length of the data
  * @param blocksize the length of one row
  * @return 0 for ok, 1 for failz
 */
-int saveFileEML(const char *preferredName, const char *suffix, uint8_t *data, size_t datalen, size_t blocksize);
+int saveFileEML(const char *preferredName, uint8_t *data, size_t datalen, size_t blocksize);
 
 /** STUB
  * @brief Utility function to save JSON data to a file. This method takes a preferred name, but if that
@@ -97,13 +96,12 @@ int saveFileEML(const char *preferredName, const char *suffix, uint8_t *data, si
  * E.g. dumpdata-15.json
  *
  * @param preferredName
- * @param suffix the file suffix. Leave out the ".".
  * @param ftype type of file.
  * @param data The binary data to write to the file
  * @param datalen the length of the data
  * @return 0 for ok, 1 for failz
  */
-int saveFileJSON(const char *preferredName, const char *suffix, JSONFileType ftype, uint8_t *data, size_t datalen);
+int saveFileJSON(const char *preferredName, JSONFileType ftype, uint8_t *data, size_t datalen);
 
 /** STUB
  * @brief Utility function to load data from a binary file. This method takes a preferred name.
diff --git a/client/util.c b/client/util.c
index 0d8781619..c215e05dd 100644
--- a/client/util.c
+++ b/client/util.c
@@ -938,16 +938,3 @@ char *strmcopy(const char *buf) {
     }
     return str;
 }
-
-char *filenamemcopy(const char *preferredName, const char *suffix) {
-    if (preferredName == NULL) return NULL;
-    if (suffix == NULL) return NULL;
-    char *fileName = (char *) calloc(strlen(preferredName) + strlen(suffix) + 1, sizeof(uint8_t));
-    if (fileName == NULL)
-        return NULL;
-    strcpy(fileName, preferredName);
-    if (str_endswith(fileName, suffix))
-        return fileName;
-    strcat(fileName, suffix);
-    return fileName;
-}
diff --git a/client/util.h b/client/util.h
index 6d0cc98aa..9674bd460 100644
--- a/client/util.h
+++ b/client/util.h
@@ -266,5 +266,4 @@ void clean_ascii(unsigned char *buf, size_t len);
 void strcleanrn(char *buf, size_t len);
 void strcreplace(char *buf, size_t len, char from, char to);
 char *strmcopy(const char *buf);
-char *filenamemcopy(const char *preferredName, const char *suffix);
 #endif

From cf0d17853ef7b943dba493f4637ec98c6d5cdd00 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 28 Apr 2019 21:29:47 +0200
Subject: [PATCH 1475/1938] next

---
 client/scripts/ndef_dump.lua  | 193 +++++++++++++++-------------------
 client/scripts/ntag_3d.lua    |  33 +++---
 client/scripts/parameters.lua |  30 ++++--
 3 files changed, 128 insertions(+), 128 deletions(-)

diff --git a/client/scripts/ndef_dump.lua b/client/scripts/ndef_dump.lua
index 0bb597a52..fee7af9fe 100644
--- a/client/scripts/ndef_dump.lua
+++ b/client/scripts/ndef_dump.lua
@@ -1,11 +1,13 @@
-
--- Ability to read what card is there
 local getopt = require('getopt')
 local cmds = require('commands')
 local taglib = require('taglib')
+local utils = require('utils')
 
-local desc =
-[[This script will automatically recognize and dump full content of a NFC NDEF Initialized tag; non-initialized tags will be ignored.
+copyright = ''
+author = 'Martin Holst Swende & Asper'
+version = 'v1.0.1'
+desc = [[
+This script will automatically recognize and dump full content of a NFC NDEF Initialized tag; non-initialized tags will be ignored.
 
 It also write the dump to an eml-file <uid>.eml.
 
@@ -15,130 +17,104 @@ raw data, but when saving into that for, we lose the infromation about how the m
 For example: 24 bytes could be 6 blocks of 4 bytes, or vice versa.
 Therefore, the .eml is better to use file when saving dumps.)
 
+]]
+example = [[
+    1. script run ndef_dump
+]]
+usage = [[
+script run ndef_dump
+
 Arguments:
     -h              this help
     -d              debug logging on
 
 ]]
-local example = "script run xxx"
-local author = "Martin Holst Swende & Asper"
+
+local DEBUG = true -- the debug flag
+
 ---
--- PrintAndLog
-local function prlog(...)
-    -- TODO; replace this with a call to the proper PrintAndLog
-    print(...)
+-- A debug printout-function
+local function dbg(args)
+    if not DEBUG then return end
+    if type(args) == 'table' then
+        local i = 1
+        while result[i] do
+            dbg(result[i])
+            i = i+1
+        end
+    else
+        print('###', args)
+    end
 end
 ---
 -- This is only meant to be used when errors occur
 local function oops(err)
-    prlog("ERROR: ",err)
-    return nil,err
+    print('ERROR:', err)
+    core.clearCommandBuffer()
+    return nil, err
 end
-
-
--- Perhaps this will be moved to a separate library at one point
-local utils = {
-    --- Writes an eml-file.
-    -- @param uid - the uid of the tag. Used in filename
-    -- @param blockData. Assumed to be on the format {'\0\1\2\3,'\b\e\e\f' ...,
-    -- that is, blockData[row] contains a string with the actual data, not ascii hex representation
-    -- return filename if all went well,
-    -- @reurn nil, error message if unsuccessfull
-    writeDumpFile = function(uid, blockData)
-        local destination = string.format("%s.eml", uid)
-        local file = io.open(destination, "w")
-        if file == nil then
-            return nil, string.format("Could not write to file %s", destination)
-        end
-        local rowlen = string.len(blockData[1])
-
-        for i,block in ipairs(blockData) do
-            if rowlen ~= string.len(block) then
-                prlog(string.format("WARNING: Dumpdata seems corrupted, line %d was not the same length as line 1",i))
-            end
-
-            local formatString = string.format("H%d", string.len(block))
-            local _,hex = bin.unpack(formatString,block)
-            file:write(hex.."\n")
-        end
-        file:close()
-        return destination
-    end,
-}
-
 ---
 -- Usage help
 local function help()
-    prlog(desc)
-    prlog("Example usage")
-    prlog(example)
+    print(copyright)
+    print(author)
+    print(version)
+    print(desc)
+    print('Example usage')
+    print(example)
+    print(usage)
 end
 
-local function debug(...)
-    if DEBUG then
-        prlog("debug:", ...)
-    end
-end
-
-
 --- This function is a lua-implementation of
 -- cmdhf14a.c:waitCmd(uint8_t iSelect)
 local function waitCmd(iSelect)
-    local response = core.WaitForResponseTimeout(cmds.CMD_ACK,1000)
+    local response = core.WaitForResponseTimeout(cmds.CMD_ACK, 1000)
     if response then
         local count,cmd,arg0,arg1,arg2 = bin.unpack('LLLL',response)
 
         local iLen = arg0
         if iSelect then iLen = arg1 end
-        debug(("Received %i octets (arg0:%d, arg1:%d)"):format(iLen, arg0, arg1))
+        dbg(("Received %i octets (arg0:%d, arg1:%d)"):format(iLen, arg0, arg1))
         if iLen == 0 then return nil, "No response from tag" end
         local recv = string.sub(response,count, iLen+count-1)
         return recv
     end
     return nil, "No response from device"
 end
-
-
+---
+--
 local function show(data)
-    if DEBUG then
-        local formatString = ("H%d"):format(string.len(data))
-        local _,hexdata = bin.unpack(formatString, data)
-        debug("Hexdata" , hexdata)
-    end
+    local formatString = ('H%d'):format(string.len(data))
+    local _,hexdata = bin.unpack(formatString, data)
+    dbg('Hexdata', hexdata)
 end
 --- Fire up a connection with a tag, return uid
 -- @return UID if successfull
 -- @return nil, errormessage if unsuccessfull
-
 local function open()
-    debug("Opening connection")
+    dbg('Opening connection')
     core.clearCommandBuffer()
-    local x = string.format("hf 14a raw -r -p -s")
-    debug(x)
+    local x = string.format('hf 14a raw -r -p -s')
+    dbg(x)
     core.console(x)
-    debug("done")
+    dbg('done')
     data, err = waitCmd(true)
     if err then return oops(err) end
     show(data)
-    local formatString = ("H%d"):format(string.len(data))
+    local formatString = ('H%d'):format(string.len(data))
     local _,uid = bin.unpack(formatString, data)
     return uid
 end
 --- Shut down tag communication
 -- return no return values
 local function close()
-    debug("Closing connection")
+    dbg('Closing connection')
     core.clearCommandBuffer()
-    local x = string.format("hf 14a raw -r")
-    debug(x)
+    local x = string.format('hf 14a raw -r')
+    dbg(x)
     core.console(x)
-    debug("done")
-    --data, err = waitCmd(true)
-    --data, err = waitCmd(false)
-
+    dbg('done')
 end
-
-
 ---_ Gets data from a block
 -- @return {block, block+1, block+2, block+3} if successfull
 -- @return nil, errormessage if unsuccessfull
@@ -147,10 +123,10 @@ local function getBlock(block)
 
     core.clearCommandBuffer()
 
-    local x = string.format("hf 14a raw -r -c -p 30 %02x", block)
-    debug(x)
+    local x = string.format('hf 14a raw -r -c -p 30 %02x', block)
+    dbg(x)
     core.console(x)
-    debug("done")
+    dbg('done')
     -- By now, there should be an ACK waiting from the device, since
     -- we used the -r flag (don't read response).
 
@@ -159,28 +135,28 @@ local function getBlock(block)
     show(data)
 
     if string.len(data) < 18 then
-        return nil, ("Expected at least 18 bytes, got %d - this tag is not NDEF-compliant"):format(string.len(data))
+        return nil, ('Expected at least 18 bytes, got %d - this tag is not NDEF-compliant'):format(string.len(data))
     end
     -- Now, parse out the block data
     -- 0534 00B9 049C AD7F 4A00 0000 E110 1000 2155
     -- b0b0 b0b0 b1b1 b1b1 b2b2 b2b2 b3b3 b3b3 CRCC
-    b0 = string.sub(data,1,4)
-    b1 = string.sub(data,5,8)
-    b2 = string.sub(data,9,12)
-    b3 = string.sub(data,13,16)
-    return {b0,b1,b2,b3}
+    b0 = string.sub(data, 1, 4)
+    b1 = string.sub(data, 5, 8)
+    b2 = string.sub(data, 9, 12)
+    b3 = string.sub(data, 13, 16)
+    return {b0, b1, b2, b3}
 end
 
-
-
-
 local function main( args)
-    debug("script started")
-    local err, data, data2,k,v,i
+
+    print( string.rep('--',20) )
+    print( string.rep('--',20) )
+    dbg('script started')
+    local err, data, data2, k, v, i
     -- Read the parameters
     for o, a in getopt.getopt(args, 'hd') do
-        if o == "h" then help() return end
-        if o == "d" then DEBUG = true end
+        if o == 'h' then return help() end
+        if o == 'd' then DEBUG = true end
     end
 
     -- Info contained within the tag (block 0 example)
@@ -196,15 +172,19 @@ local function main( args)
 
     -- First, get blockt 3 byte 2
     local blocks, err = getBlock(0)
-    if err then return oops(err) end
+    if err then
+        close()
+        return oops(err) 
+    end
     -- Block 3 contains number of blocks
     local b3chars = {string.byte(blocks[4], 1,4)}
     local numBlocks = b3chars[3] * 2 + 6
-    prlog("Number of blocks:", numBlocks)
+    print("Number of blocks:", numBlocks)
 
     -- NDEF compliant?
     if b3chars[1] ~= 0xE1 then
-        return oops("This tag is not NDEF-Compliant")
+        close()
+        return oops('This tag is not NDEF-Compliant')
     end
 
     local ndefVersion = b3chars[2]
@@ -214,34 +194,33 @@ local function main( args)
     local manufacturer = taglib.lookupManufacturer(bl1_b1)
 
     -- Reuse existing info
-    local blockData = {blocks[1],blocks[2],blocks[3],blocks[4]}
-
+    local blockData = {blocks[1], blocks[2], blocks[3], blocks[4]}
 
     --[[ Due to the infineon my-d move bug
     (if I send 30 0F i receive block0f+block00+block01+block02 insted of block0f+block10+block11+block12)
     the only way to avoid this is to send the read command as many times as block numbers
     removing bytes from 5 to 18 from each answer.
     --]]
-    prlog("Dumping data...please wait")
+    print('Dumping data...please wait')
     for i=4,numBlocks-1,1 do
         blocks, err = getBlock(i)
-        if err then return oops(err) end
-        table.insert(blockData,blocks[1])
+        if err then close(); return oops(err) end
+        table.insert(blockData, blocks[1])
     end
     -- Deactivate field
     close()
     -- Print results
-    prlog(string.format("Tag manufacturer: %s", manufacturer))
-    prlog(string.format("Tag UID: %s", uidHexstr))
-    prlog(string.format("Tag NDEF version: 0x%02x", ndefVersion))
+    print(string.format('Tag manufacturer: %s', manufacturer))
+    print(string.format('Tag UID: %s', uidHexstr))
+    print(string.format('Tag NDEF version: 0x%02x', ndefVersion))
 
     for k,v in ipairs(blockData) do
-        prlog(string.format("Block %02x: %02x %02x %02x %02x",k-1, string.byte(v, 1,4)))
+        print(string.format('Block %02x: %02x %02x %02x %02x', k-1, string.byte(v, 1,4)))
     end
     local filename, err = utils.writeDumpFile(uidHexstr, blockData)
     if err then return oops(err) end
 
-    prlog(string.format("Dumped data into %s", filename))
+    print(string.format('Dumped data into %s', filename))
 
 end
 main(args)
diff --git a/client/scripts/ntag_3d.lua b/client/scripts/ntag_3d.lua
index abbfe5946..e5b4205d8 100644
--- a/client/scripts/ntag_3d.lua
+++ b/client/scripts/ntag_3d.lua
@@ -1,9 +1,10 @@
 local getopt = require('getopt')
 local lib14a = require('read14a')
+local utils = require('utils')
 
 copyright = 'Copyright (c) 2017 IceSQL AB. All rights reserved.'
 author = "Christian Herrmann"
-version = 'v1.0.3'
+version = 'v1.0.4'
 desc = [[
 This script writes a empty template for 3D printing system onto a empty NTAG213 or MAGIC NTAG21*
 
@@ -143,7 +144,6 @@ end
 -- A debug printout-function
 local function dbg(args)
     if not DEBUG then return end
-
     if type(args) == 'table' then
         local i = 1
         while result[i] do
@@ -157,17 +157,20 @@ end
 ---
 -- This is only meant to be used when errors occur
 local function oops(err)
-    print('ERROR: ',err)
-    return nil,err
+    print('ERROR:', err)
+    core.clearCommandBuffer()
+    return nil, err
 end
 ---
 -- Usage help
 local function help()
     print(copyright)
+    print(author)
     print(version)
     print(desc)
     print('Example usage')
     print(example)
+    print(usage)
 end
 --
 -- Exit message
@@ -183,6 +186,7 @@ local function write_tag(uid, t)
 
     print('Writing to tag')
     core.console('hf mf dbg 0')
+    utils.Sleep(0.5)
 
     local cmd = ''
     local pwd, pack = core.keygen_algo_d(uid)
@@ -200,6 +204,7 @@ local function write_tag(uid, t)
     core.console(('hf mfu wrbl b 40 d %s k %08X'):format(t[40], pwd))
 
     core.console('hf mf dbg 1')
+    utils.Sleep(0.5)
     print('Done')
 end
 ---
@@ -228,7 +233,7 @@ end
 ---
 -- generates random hex numbers between 31-39
 local function random_num_hex(length)
-    local str = ""
+    local str = ''
     local i
     for i = 1, length, 1 do
         str = str..math.random(31, 39)
@@ -325,15 +330,15 @@ local function main(args)
 
     -- Read the parameters
     for o, a in getopt.getopt(args, 'ht1u:l:m:c:p:s:') do
-        if o == "h" then return help() end
-        if o == "t" then return selftest() end
-        if o == "u" then uid = a; useUID = true end
-        if o == "m" then material = a end
-        if o == "c" then color = a end
-        if o == "l" then length = tonumber(a) end
-        if o == "p" then producer = a end
-        if o == "s" then sales = a end
-        if o == "1" then useMAGIC = true end
+        if o == 'h' then return help() end
+        if o == 't' then return selftest() end
+        if o == 'u' then uid = a; useUID = true end
+        if o == 'm' then material = a end
+        if o == 'c' then color = a end
+        if o == 'l' then length = tonumber(a) end
+        if o == 'p' then producer = a end
+        if o == 's' then sales = a end
+        if o == '1' then useMAGIC = true end
     end
 
     color = find(_colors, color)
diff --git a/client/scripts/parameters.lua b/client/scripts/parameters.lua
index 4eb86446d..d68b7b06a 100644
--- a/client/scripts/parameters.lua
+++ b/client/scripts/parameters.lua
@@ -1,19 +1,34 @@
-
 -- The getopt-functionality is loaded from pm3/getopt.lua
 -- Have a look there for further details
 getopt = require('getopt')
 
-usage = "script run parameters.lua -a 1 -blala -c -de"
-author = "Martin Holst Swende"
-desc =[[
+copyright = ''
+usage = 'script run parameters.lua -a 1 -blala -c -de'
+author = 'Martin Holst Swende'
+version = 'v1.0.1'
+desc = [[
 This is an example script to demonstrate handle parameters in scripts.
 For more info, check the comments in the code
 ]]
+example = [[
+]]
+usage = [[
+]]
+---
+-- Usage help
+local function help()
+    print(copyright)
+    print(author)
+    print(version)
+    print(desc)
+    print('Example usage')
+    print(example)
+    print(usage)
+end
 
 local function main(args)
 
-    print(desc)
-    print("These parameters were passed")
+    print('These parameters were passed')
     --[[
     When passing parameters,
     x:      means that a value should follow x
@@ -31,7 +46,8 @@ local function main(args)
     4. The format b lala (without -) is *not* supported
     --]]
 
-    for o, a in getopt.getopt(args, 'a:b:ced') do
+    for o, a in getopt.getopt(args, 'ha:b:ced') do
+        if o == 'h' then return help() end
         print(o, a)
     end
 end

From 997f5d700ee4e6072f2970276b94b1f75ac6ccd9 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 28 Apr 2019 21:34:05 +0200
Subject: [PATCH 1476/1938] detect wrong numOfBlocks / numOfSectors arguments

---
 client/cmdhfmf.c | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 120240e3e..42bcd5b64 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -683,7 +683,7 @@ static uint16_t NumOfBlocks(char card) {
         case '4' :
             return MIFARE_4K_MAXBLOCK;
         default  :
-            return MIFARE_1K_MAXBLOCK;
+            return 0;
     }
 }
 
@@ -698,7 +698,7 @@ static uint8_t NumOfSectors(char card) {
         case '4' :
             return MIFARE_4K_MAXSECTOR;
         default  :
-            return MIFARE_1K_MAXSECTOR;
+            return 0;
     }
 }
 
@@ -753,6 +753,7 @@ static int CmdHF14AMfDump(const char *Cmd) {
             default:
                 if (cmdp == 0) {
                     numSectors = NumOfSectors(param_getchar(Cmd, cmdp));
+                    if (numSectors == 0) return usage_hf14_dump();
                     cmdp++;
                 } else {
                     PrintAndLogEx(WARNING, "Unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
@@ -961,6 +962,7 @@ static int CmdHF14AMfRestore(const char *Cmd) {
             default:
                 if (cmdp == 0) {
                     numSectors = NumOfSectors(param_getchar(Cmd, cmdp));
+                    if (numSectors == 0) return usage_hf14_restore();
                     cmdp++;
                 } else {
                     PrintAndLogEx(WARNING, "Unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
@@ -1114,6 +1116,7 @@ static int CmdHF14AMfNested(const char *Cmd) {
         }
     } else {
         SectorsCnt = NumOfSectors(cmdp);
+        if (SectorsCnt == 0) return usage_hf14_nested();
     }
 
     uint8_t j = 4;
@@ -1816,6 +1819,7 @@ static int CmdHF14AMfChk(const char *Cmd) {
     if (param_getchar(Cmd, 0) == '*') {
         blockNo = 3;
         SectorsCnt = NumOfSectors(param_getchar(Cmd + 1, 0));
+        if (SectorsCnt == 0) return usage_hf14_chk();
     } else {
         blockNo = param_get8(Cmd, 0);
     }
@@ -2659,7 +2663,12 @@ static int CmdHF14AMfESave(const char *Cmd) {
     char c = tolower(param_getchar(Cmd, 0));
     if (c == 'h') return usage_hf14_esave();
 
-    blocks = NumOfBlocks(c);
+    if (c != 0) {
+        blocks = NumOfBlocks(c);
+        if (blocks == 0) return usage_hf14_esave();
+    } else {
+        blocks = MIFARE_1K_MAXBLOCK;
+    }
     bytes = blocks * MFBLOCK_SIZE;
 
     dump = calloc(bytes, sizeof(uint8_t));
@@ -2708,7 +2717,12 @@ static int CmdHF14AMfECFill(const char *Cmd) {
         keyType = 1;
 
     c = tolower(param_getchar(Cmd, 1));
-    numSectors = NumOfSectors(c);
+    if (c != 0) {
+        numSectors = NumOfSectors(c);
+        if (numSectors == 0) return usage_hf14_ecfill();
+    } else {
+        numSectors = MIFARE_1K_MAXSECTOR;
+    }
 
     PrintAndLogEx(NORMAL, "--params: numSectors: %d, keyType: %c\n", numSectors, (keyType == 0) ? 'A' : 'B');
     UsbCommand cmd = {CMD_MIFARE_EML_CARDLOAD, {numSectors, keyType, 0}, {{0}}};
@@ -2727,7 +2741,12 @@ static int CmdHF14AMfEKeyPrn(const char *Cmd) {
     if (c == 'h')
         return usage_hf14_ekeyprn();
 
-    numSectors = NumOfSectors(c);
+    if (c != 0) {
+        numSectors = NumOfSectors(c);
+        if (numSectors == 0) return usage_hf14_ekeyprn();
+    } else {
+        numSectors = MIFARE_1K_MAXSECTOR;
+    }
 
     PrintAndLogEx(NORMAL, "|---|----------------|----------------|");
     PrintAndLogEx(NORMAL, "|sec|key A           |key B           |");

From 334e6d208b5bc5bc6a69265a6f63a9edc9cbe2d5 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 28 Apr 2019 22:16:50 +0200
Subject: [PATCH 1477/1938] hf mf eload: fix absence of filename

---
 client/cmdhfmf.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 42bcd5b64..45e1a7b77 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -2584,7 +2584,8 @@ int CmdHF14AMfELoad(const char *Cmd) {
     if (numblk2 > 0)
         numBlocks = numblk2;
 
-    param_getstr(Cmd, nameParamNo, filename, sizeof(filename));
+    if (0 == param_getstr(Cmd, nameParamNo, filename, sizeof(filename)))
+        return usage_hf14_eload();
 
     uint8_t *data = calloc(4096, sizeof(uint8_t));
     size_t datalen = 0;

From 281cdead26b51c014e9d501ae2be5a00ca19072a Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 28 Apr 2019 22:38:44 +0200
Subject: [PATCH 1478/1938] ltrim cmd before display

---
 client/proxmark3.c | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/client/proxmark3.c b/client/proxmark3.c
index 47ea28e36..0483cbc20 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -97,7 +97,7 @@ main_loop(char *script_cmds_file, char *script_cmd, bool pm3_present) {
 
     // loops every time enter is pressed...
     while (1) {
-
+        bool printprompt = false;
         // this should hook up the PM3 again.
         /*
         if ( IsOffline() ) {
@@ -134,13 +134,13 @@ main_loop(char *script_cmds_file, char *script_cmd, bool pm3_present) {
                 strcleanrn(script_cmd_buf, sizeof(script_cmd_buf));
 
                 if ((cmd = strmcopy(script_cmd_buf)) != NULL)
-                    PrintAndLogEx(NORMAL, PROXPROMPT"%s\n", cmd);
+                    printprompt = true;
             }
         } else {
             // If there is a script command
             if (execCommand) {
                 if ((cmd = strmcopy(script_cmd)) != NULL)
-                    PrintAndLogEx(NORMAL, PROXPROMPT"%s", cmd);
+                    printprompt = true;
                 uint16_t len = strlen(script_cmd) + 1;
                 script_cmd += len;
                 if (script_cmd_len == len - 1)
@@ -165,7 +165,7 @@ main_loop(char *script_cmds_file, char *script_cmd, bool pm3_present) {
                     strcleanrn(script_cmd_buf, sizeof(script_cmd_buf));
 
                     if ((cmd = strmcopy(script_cmd_buf)) != NULL)
-                        PrintAndLogEx(NORMAL, PROXPROMPT"%s", cmd);
+                        printprompt = true;
 
                 } else {
                     cmd = readline(PROXPROMPT);
@@ -179,10 +179,20 @@ main_loop(char *script_cmds_file, char *script_cmd, bool pm3_present) {
 
             // rtrim
             size_t l = strlen(cmd);
-            if (l > 0 && isspace(cmd[l - 1]))
-                cmd[l - 1] = 0x00;
+            while (l > 0 && isspace(cmd[l - 1])) {
+                cmd[--l] = '\0';
+            }
+            // ltrim
+            size_t off=0;
+            while ((cmd[off] != '\0') && isspace(cmd[off]))
+                off++;
+            for (size_t i=0; i < strlen(cmd) - off; i++)
+                cmd[i] = cmd[i+off];
+            cmd[strlen(cmd) - off] = '\0';
 
-            if (cmd[0] != 0x00) {
+            if (cmd[0] != '\0') {
+                if (printprompt)
+                    PrintAndLogEx(NORMAL, PROXPROMPT"%s", cmd);
                 int ret = CommandReceived(cmd);
                 HIST_ENTRY *entry = history_get(history_length);
                 if ((!entry) || (strcmp(entry->line, cmd) != 0))

From 5bc9118a19dc4839bb276429ad949f1e63013922 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 28 Apr 2019 22:51:40 +0200
Subject: [PATCH 1479/1938] baudrate only for physical uart

---
 client/proxmark3.c | 10 ++--------
 common/usb_cdc.c   | 16 ++++++++--------
 common/usb_cdc.h   |  1 +
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/client/proxmark3.c b/client/proxmark3.c
index 5cf045170..35db95975 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -259,7 +259,7 @@ static void show_help(bool showFullHelp, char *exec_name) {
         PrintAndLogEx(NORMAL, "      -t/--text                           dump all interactive command's help at once");
         PrintAndLogEx(NORMAL, "      -m/--markdown                       dump all interactive help at once in markdown syntax");
         PrintAndLogEx(NORMAL, "      -p/--port                           serial port to connect to");
-        PrintAndLogEx(NORMAL, "      -b/--baud                           serial port speed");
+        PrintAndLogEx(NORMAL, "      -b/--baud                           serial port speed (only needed for physical UART, not for USB-CDC or BT)");
         PrintAndLogEx(NORMAL, "      -w/--wait                           20sec waiting the serial port to appear in the OS");
         PrintAndLogEx(NORMAL, "      -f/--flush                          output will be flushed after every print");
         PrintAndLogEx(NORMAL, "      -c/--command <command>              execute one proxmark3 command (or several separated by ';').");
@@ -433,15 +433,9 @@ int main(int argc, char *argv[]) {
     if (!script_cmds_file && !stdinOnPipe)
         showBanner();
 
-
-    // default speed for USB 460800,  USART(FPC serial) 115200 baud
+    // Let's take a baudrate ok for real UART, USB-CDC & BT don't use that info anyway
     if (speed == 0)
-#ifdef WITH_FPC_HOST
-        // Let's assume we're talking by default to pm3 over usart in this mode
         speed = USART_BAUD_RATE;
-#else
-        speed = 460800;
-#endif
 
     if (script_cmd) {
         while (script_cmd[strlen(script_cmd) - 1] == ' ')
diff --git a/common/usb_cdc.c b/common/usb_cdc.c
index 04f86ad71..63d5c66d0 100644
--- a/common/usb_cdc.c
+++ b/common/usb_cdc.c
@@ -420,7 +420,7 @@ const char *getStringDescriptor(uint8_t idx) {
         reg |= REG_NO_EFFECT_1_ALL; \
         reg &= ~(flags); \
         pUdp->UDP_CSR[(endpoint)] = reg; \
-    } \
+    }
 
 // reset flags in the UDP_CSR register and waits for synchronization
 #define UDP_SET_EP_FLAGS(endpoint, flags) { \
@@ -429,7 +429,7 @@ const char *getStringDescriptor(uint8_t idx) {
         reg |= REG_NO_EFFECT_1_ALL; \
         reg |= (flags); \
         pUdp->UDP_CSR[(endpoint)] = reg; \
-    } \
+    }
 
 
 typedef struct {
@@ -439,12 +439,12 @@ typedef struct {
     uint8_t DataBits;
 } AT91S_CDC_LINE_CODING, *AT91PS_CDC_LINE_CODING;
 
-AT91S_CDC_LINE_CODING line = {
-    115200, // baudrate
-    0,      // 1 Stop Bit
-    0,      // None Parity
-    8
-};     // 8 Data bits
+AT91S_CDC_LINE_CODING line = { // purely informative, actual values don't matter
+    USART_BAUD_RATE, // baudrate
+    0,               // 1 Stop Bit
+    0,               // None Parity
+    8                // 8 Data bits
+};
 
 static void SpinDelay(int ms) {
     int us = ms * 1000;
diff --git a/common/usb_cdc.h b/common/usb_cdc.h
index 3dbe9df5f..64dfbcd4d 100644
--- a/common/usb_cdc.h
+++ b/common/usb_cdc.h
@@ -37,6 +37,7 @@
 
 #include <wchar.h>
 #include "at91sam7s512.h"
+#include "usart.h"
 #include "config_gpio.h"
 #include "proxmark3.h" // USB_CONNECT()
 #include "common.h"

From 69f8d81f4e9864f8152c1d253bea754f6de7ea1c Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 28 Apr 2019 22:54:00 +0200
Subject: [PATCH 1480/1938] style

---
 client/lualibs/commands.lua   | 32 ++++++++++++++++----------------
 client/lualibs/read14a.lua    |  2 +-
 client/proxmark3.c            |  6 +++---
 client/scripting.c            | 12 ++++++------
 client/scripts/ndef_dump.lua  |  2 +-
 client/scripts/test_t55x7.lua |  6 +++---
 client/scripts/tnp3clone.lua  |  4 ++--
 client/scripts/tnp3dump.lua   |  6 +++---
 client/scripts/tnp3sim.lua    |  2 +-
 client/scripts/ufodump.lua    |  8 ++++----
 client/scripts/ul_uid.lua     |  2 +-
 client/util.c                 |  3 +--
 12 files changed, 42 insertions(+), 43 deletions(-)

diff --git a/client/lualibs/commands.lua b/client/lualibs/commands.lua
index 4a7780ff9..244f3e6a1 100644
--- a/client/lualibs/commands.lua
+++ b/client/lualibs/commands.lua
@@ -92,13 +92,13 @@ Command = {
         end
         o.data = data
         return o
-    end,    
+    end,
     parse = function (packet)
             local count, cmd, arg1, arg2, arg3, data = bin.unpack('LLLLH511', packet)
             return Command:new{cmd = cmd, arg1 = arg1, arg2 = arg2, arg3 = arg3, data = data}
-    end    
+    end
 }
--- commented out,  not used.   
+-- commented out,  not used.
 function Command:__tostring()
     local output = ("%s\r\nargs : (%s, %s, %s)\r\ndata:\r\n%s\r\n"):format(
         _commands.tostring(self.cmd),
@@ -128,7 +128,7 @@ function Command:__responsetostring()
                     tostring(self.resp_arg1),
                     tostring(self.resp_arg2),
                     tostring(self.resp_arg3)))
-    print('NG     ::', self.resp_ng)    
+    print('NG     ::', self.resp_ng)
     print('package ::', self.resp_response)
 end
 
@@ -144,10 +144,10 @@ function Command:sendMIX( ignore_response, timeout )
     local data = self.data
     local cmd = self.cmd
     local arg1, arg2, arg3 = self.arg1, self.arg2, self.arg3
-        
+
     local err, msg = core.SendCommandMIX(cmd, arg1, arg2, arg3, data)
     if err == nil then return err, msg end
-    
+
     if ignore_response then return true, nil end
 
     if timeout == nil then timeout = TIMEOUT end
@@ -156,13 +156,13 @@ function Command:sendMIX( ignore_response, timeout )
     if response == nil then
         return nil, 'Error, waiting for response timed out :: '..msg
     end
-    
-    -- lets digest 
+
+    -- lets digest
     local data
     local count, cmd, length, magic, status, crc, arg1, arg2, arg3 = bin.unpack('SSIsSLLL', response)
     count, data, ng = bin.unpack('H'..length..'C', response, count)
-    
---[[  uncomment if you want to debug    
+
+--[[  uncomment if you want to debug
     self.resp_cmd = cmd
     self.resp_length = length
     self.resp_magic = magic
@@ -181,20 +181,20 @@ function Command:sendMIX( ignore_response, timeout )
 end
 function Command:sendNG( ignore_response, timeout )
     local data = self.data
-    local cmd = self.cmd       
+    local cmd = self.cmd
     local err, msg = core.SendCommandNG(cmd, data)
     if err == nil then return err, msg end
-    
+
     if ignore_response then return true, nil end
-    
+
     if timeout == nil then timeout = TIMEOUT end
-    
+
     local response, msg = core.WaitForResponseTimeout(cmd, timeout)
     if response == nil then
         return nil, 'Error, waiting for response timed out :: '..msg
     end
-    
-    -- lets digest 
+
+    -- lets digest
     local data
     local count, cmd, length, magic, status, crc, arg1, arg2, arg3 = bin.unpack('SSIsSLLL', response)
     count, data, ng = bin.unpack('H'..length..'C', response, count)
diff --git a/client/lualibs/read14a.lua b/client/lualibs/read14a.lua
index 2f75fe81c..537f090b9 100644
--- a/client/lualibs/read14a.lua
+++ b/client/lualibs/read14a.lua
@@ -89,7 +89,7 @@ local function read14443a(dont_disconnect, no_rats)
     if no_rats then
         command.arg1 = command.arg1 + ISO14A_COMMAND.ISO14A_NO_RATS
     end
-    
+
     local result,err = command:sendMIX()
     if result then
         local count,cmd,arg0,arg1,arg2 = bin.unpack('LLLL',result)
diff --git a/client/proxmark3.c b/client/proxmark3.c
index db8478d2e..bb6553a09 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -183,11 +183,11 @@ main_loop(char *script_cmds_file, char *script_cmd, bool pm3_present) {
                 cmd[--l] = '\0';
             }
             // ltrim
-            size_t off=0;
+            size_t off = 0;
             while ((cmd[off] != '\0') && isspace(cmd[off]))
                 off++;
-            for (size_t i=0; i < strlen(cmd) - off; i++)
-                cmd[i] = cmd[i+off];
+            for (size_t i = 0; i < strlen(cmd) - off; i++)
+                cmd[i] = cmd[i + off];
             cmd[strlen(cmd) - off] = '\0';
 
             if (cmd[0] != '\0') {
diff --git a/client/scripting.c b/client/scripting.c
index 309e5dc40..5aa76d33c 100644
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -73,10 +73,10 @@ static int l_SendCommandOLD(lua_State *L) {
     }
 
     // parse input
-    cmd = luaL_checknumber(L, 1);   
+    cmd = luaL_checknumber(L, 1);
     arg0 = luaL_checknumber(L, 2);
     arg1 = luaL_checknumber(L, 3);
-    arg2 = luaL_checknumber(L, 4);    
+    arg2 = luaL_checknumber(L, 4);
 
     // data
     const char *p_data = luaL_checklstring(L, 5, &size);
@@ -93,7 +93,7 @@ static int l_SendCommandOLD(lua_State *L) {
     }
 
     SendCommandOLD(cmd, arg0, arg1, arg2, data, len);
-    lua_pushboolean(L, true);    
+    lua_pushboolean(L, true);
     return 1;
 }
 
@@ -120,10 +120,10 @@ static int l_SendCommandMIX(lua_State *L) {
         return returnToLuaWithError(L, "You need to supply five parameters");
 
     // parse input
-    cmd = luaL_checknumber(L, 1);   
+    cmd = luaL_checknumber(L, 1);
     arg0 = luaL_checknumber(L, 2);
     arg1 = luaL_checknumber(L, 3);
-    arg2 = luaL_checknumber(L, 4);    
+    arg2 = luaL_checknumber(L, 4);
 
     // data
     const char *p_data = luaL_checklstring(L, 5, &size);
@@ -162,7 +162,7 @@ static int l_SendCommandNG(lua_State *L) {
         return returnToLuaWithError(L, "You need to supply two parameters");
 
     // parse input
-    uint64_t cmd = luaL_checknumber(L, 1);   
+    uint64_t cmd = luaL_checknumber(L, 1);
 
     // data
     const char *p_data = luaL_checklstring(L, 2, &size);
diff --git a/client/scripts/ndef_dump.lua b/client/scripts/ndef_dump.lua
index fee7af9fe..a89c4f32a 100644
--- a/client/scripts/ndef_dump.lua
+++ b/client/scripts/ndef_dump.lua
@@ -174,7 +174,7 @@ local function main( args)
     local blocks, err = getBlock(0)
     if err then
         close()
-        return oops(err) 
+        return oops(err)
     end
     -- Block 3 contains number of blocks
     local b3chars = {string.byte(blocks[4], 1,4)}
diff --git a/client/scripts/test_t55x7.lua b/client/scripts/test_t55x7.lua
index 478336313..412f4acb8 100644
--- a/client/scripts/test_t55x7.lua
+++ b/client/scripts/test_t55x7.lua
@@ -80,7 +80,7 @@ local function help()
     print(desc)
     print("Example usage")
     print(example)
-    print(usage)    
+    print(usage)
 end
 ---
 -- Exit message
@@ -261,7 +261,7 @@ local function test(modulation)
                                 , arg2 = block
                                 }
         local response, err = wc:sendMIX(false)
-        if not response then return oops(err) end        
+        if not response then return oops(err) end
 
         -- Detect
         local res, msg = core.t55xx_detect()
@@ -323,7 +323,7 @@ local function main(args)
     end
 
     exitMsg('Tests finished')
-    core.console( 
+    core.console(
             format('rem [SUMMARY] Success rate: %d/%d tests passed%s'
                 , total_pass
                 , total_tests
diff --git a/client/scripts/tnp3clone.lua b/client/scripts/tnp3clone.lua
index 0bb18375b..1e3545a1b 100644
--- a/client/scripts/tnp3clone.lua
+++ b/client/scripts/tnp3clone.lua
@@ -63,7 +63,7 @@ local function getblockdata(response)
     if not response then
         return nil, 'No response from device'
     end
-    
+
     local count, cmd, arg0 = bin.unpack('LL', response)
     if arg0 == 1 then
         local count, arg1, arg2, data = bin.unpack('LLH511', response, count)
@@ -81,7 +81,7 @@ local function readblock( blocknum, keyA )
     return b
 end
 ---
--- decode response and get the blockdata from backdoor magic command 
+-- decode response and get the blockdata from backdoor magic command
 local function readmagicblock( blocknum )
     -- Read block N
     local CSETBLOCK_SINGLE_OPERATION = 0x1F
diff --git a/client/scripts/tnp3dump.lua b/client/scripts/tnp3dump.lua
index b0db89718..7da530f7d 100644
--- a/client/scripts/tnp3dump.lua
+++ b/client/scripts/tnp3dump.lua
@@ -91,7 +91,7 @@ local function getblockdata(response)
     if not response then
         return nil, 'No response from device'
     end
-    
+
     local count, cmd, arg0 = bin.unpack('LL', response)
     if arg0 == 1 then
         local count, arg1, arg2, data = bin.unpack('LLH511', response, count)
@@ -132,7 +132,7 @@ local function main(args)
     local cmdSetDbgOff = "hf mf dbg 0"
     core.console( cmdSetDbgOff)
     utils.Sleep(0.5)
-    
+
     result, err = lib14a.read(false, true)
     if not result then return oops(err) end
 
@@ -170,7 +170,7 @@ local function main(args)
     cmd = Command:newMIX{cmd = cmds.CMD_MIFARE_READBL, arg1 = 0, data = keyA}
     block0, err = getblockdata(cmd:sendMIX(false))
     if not block0 then return oops(err) end
-    
+
     core.clearCommandBuffer()
 
     -- Read block 1
diff --git a/client/scripts/tnp3sim.lua b/client/scripts/tnp3sim.lua
index 8ba56238d..8e595363e 100644
--- a/client/scripts/tnp3sim.lua
+++ b/client/scripts/tnp3sim.lua
@@ -242,7 +242,7 @@ local function LoadEmulator(uid, blocks)
                 blockdata = AddKey(keys, _, blockdata)
             end
         end
-        
+
         io.write( _..',')
         io.flush()
         core.clearCommandBuffer()
diff --git a/client/scripts/ufodump.lua b/client/scripts/ufodump.lua
index 0270bafaa..d3d039741 100644
--- a/client/scripts/ufodump.lua
+++ b/client/scripts/ufodump.lua
@@ -15,7 +15,7 @@ xor:  the first three block (0,1,2) is not XORED.  The rest seems to be xored.
 example = [[
     -- default
     script run ufodump
-    
+
     -- stop at block 10
     script run ufodump -b 10
 ]]
@@ -48,7 +48,7 @@ end
 local function oops(err)
     print('ERROR:', err)
     core.clearCommandBuffer()
-    return nil, err    
+    return nil, err
 end
 ---
 -- Usage help
@@ -59,7 +59,7 @@ local function help()
     print(desc)
     print('Example usage')
     print(example)
-    print(usage)    
+    print(usage)
 end
 --
 -- writes data to ascii textfile.
@@ -122,7 +122,7 @@ function sendRaw(rawdata, options)
                                 -- of the ASCII-string rawdata
                                 arg2 = string.len(rawdata)/2,
                                 data = rawdata}
-                                
+
     return command:sendMIX(options.ignore_response)
 end
 --
diff --git a/client/scripts/ul_uid.lua b/client/scripts/ul_uid.lua
index 7b806b1fe..9ac89c211 100644
--- a/client/scripts/ul_uid.lua
+++ b/client/scripts/ul_uid.lua
@@ -57,7 +57,7 @@ local function help()
     print(desc)
     print('Example usage')
     print(example)
-    print(usage)    
+    print(usage)
 end
 --
 --- Set UID on magic command enabled
diff --git a/client/util.c b/client/util.c
index ddb38fc27..50bbe0516 100644
--- a/client/util.c
+++ b/client/util.c
@@ -832,8 +832,7 @@ bool str_startswith(const char *s,  const char *pre) {
 bool str_endswith(const char *s,  const char *suffix) {
     size_t ls = strlen(s);
     size_t lsuffix = strlen(suffix);
-    if (ls >= lsuffix)
-    {
+    if (ls >= lsuffix) {
         return strncmp(suffix, s + (ls - lsuffix), lsuffix) == 0;
     }
     return false;

From 639c33820ed4c74356727e86baf1de76bd38b7b6 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 28 Apr 2019 23:16:39 +0200
Subject: [PATCH 1481/1938] changelog

---
 CHANGELOG.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 74f5f8006..843ffb231 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,22 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [unreleased][unreleased]
+ - Change: loadFile* & saveFile* accept filenames with (or still without) extension (@doegox)
+ - Fix LoadEML to accept final "\n", e.g. from pm3_mfd2eml.py (@doegox)
+ - Change: rework shell scripts for easy client or flasher (@doegox)
+ - Fix: stop poking Internet when compiling (@doegox)
+ - Add support for multiple commands to "-c", e.g. proxmark3 -c "hw ping;hw version" (@doegox)
+ - Fix external flash writing bitflips issues at 24MHz (@doegox)
+ - Add color support to Dbprintf & alike and rework Dbprintf flags (@doegox)
+ - Change: archive (and fix) hid-flasher (@doegox)
+ - Add standalone placeholder to simplify new standalone integration (@doegox)
+ - Change: refactor standalone mode info string (@iceman)
+ - Add iceman skeleton standalone mode for ppl to use as base for their new modes (@iceman)
+ - Change: move compilation options to Makefile.hal (@doegox)
+ - Fix compilation under OSX (@iceman)
+ - Add openocd config files for JLink (@doegox)
+ - Fix compilation dependencies for recovery (@doegox)
+ - Fix segfault when loading a file (@doegox)
  - Change/Add new dump format for Ultralight/NTAG, counters support, simulation (@mceloff)
  - Add 'hf mf sim' full-byte split anticollision support (@mceloff)
  - Fix/Add 'hf mf sim' bugs fix, RATS support, etc (@mceloff)

From 7611e96848215cc83a6203d6c09a6e7b4b1be3aa Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 28 Apr 2019 23:34:08 +0200
Subject: [PATCH 1482/1938] changelog

---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 843ffb231..68657412f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [unreleased][unreleased]
+ - Add support new frame format in all Lua scripts (@iceman)
+ - Add CMD_CAPABILITIES for pm3 to inform dynamically the client (@doegox)
+ - Change baudrate handling, make it clear it's only indicative for USB-CDC & BT (@doegox)
+ - Change much faster flashmem writes (@doegox)
+ - Change: new progressive light scheme for 'hw detectreader' (@doegox)
+ - Add common error definitions system for retvals (@doegox)
+ - Change USART RX & TX code and fix delays handling to make it more robust, especially over BT (@doegox)
+ - Add support for new frames format, speedup & huge changes, see doc/new_frame_format.txt (@doegox)
  - Change: loadFile* & saveFile* accept filenames with (or still without) extension (@doegox)
  - Fix LoadEML to accept final "\n", e.g. from pm3_mfd2eml.py (@doegox)
  - Change: rework shell scripts for easy client or flasher (@doegox)

From 9d512d411c8a86104f3d0c55bc0fbcacb57322ce Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 28 Apr 2019 23:43:55 +0200
Subject: [PATCH 1483/1938] chg: added manufacturer to 14ainfo structure. chg:
 ndefdump remakes

---
 client/lualibs/read14a.lua   |  21 +++--
 client/scripts/ndef_dump.lua | 159 +++++++++++++++--------------------
 client/scripts/ufodump.lua   |  21 +----
 3 files changed, 82 insertions(+), 119 deletions(-)

diff --git a/client/lualibs/read14a.lua b/client/lualibs/read14a.lua
index 2f75fe81c..dfa2ea73c 100644
--- a/client/lualibs/read14a.lua
+++ b/client/lualibs/read14a.lua
@@ -11,6 +11,7 @@
 
 --]]
 -- Loads the commands-library
+local taglib = require('taglib')
 local cmds = require('commands')
 local TIMEOUT = 2000 -- Shouldn't take longer than 2 seconds
 local ISO14A_COMMAND = {
@@ -43,16 +44,12 @@ ISO14443a_TYPES[0x38] = "Nokia 6212 or 6131 MIFARE CLASSIC 4K"
 ISO14443a_TYPES[0x88] = "Infineon MIFARE CLASSIC 1K"
 ISO14443a_TYPES[0x98] = "Gemplus MPCOS"
 
-
 local function tostring_14443a(sak)
     return ISO14443a_TYPES[sak] or ("Unknown (SAK=%x)"):format(sak)
 end
 
 local function parse14443a(data)
     --[[
-
-    Based on this struct :
-
     typedef struct {
         uint8_t uid[10];
         uint8_t uidlen;
@@ -61,14 +58,20 @@ local function parse14443a(data)
         uint8_t ats_len;
         uint8_t ats[256];
     } __attribute__((__packed__)) iso14a_card_select_t;
-
     --]]
 
     local count, uid, uidlen, atqa, sak, ats_len, ats = bin.unpack('H10CH2CC',data)
-    uid = uid:sub(1, 2*uidlen)
-    --print("uid, atqa, sak: ",uid, atqa, sak)
-    --print("TYPE: ", tostring_1443a(sak))
-    return { uid = uid, atqa  = atqa, sak = sak, name = tostring_14443a(sak), data = data}
+    uid = uid:sub(1, 2 * uidlen)
+    local man_byte = tonumber(uid:sub(1,2), 16)
+
+    return { 
+        uid = uid,
+        atqa  = atqa,
+        sak = sak,
+        name = tostring_14443a(sak),
+        data = data,
+        manufacturer = taglib.lookupManufacturer(man_byte)
+    }
 end
 
 -- This function does a connect and retrieves som einfo
diff --git a/client/scripts/ndef_dump.lua b/client/scripts/ndef_dump.lua
index fee7af9fe..d184ee2d1 100644
--- a/client/scripts/ndef_dump.lua
+++ b/client/scripts/ndef_dump.lua
@@ -1,6 +1,6 @@
 local getopt = require('getopt')
 local cmds = require('commands')
-local taglib = require('taglib')
+local lib14a = require('read14a')
 local utils = require('utils')
 
 copyright = ''
@@ -64,93 +64,58 @@ local function help()
     print(example)
     print(usage)
 end
-
---- This function is a lua-implementation of
--- cmdhf14a.c:waitCmd(uint8_t iSelect)
-local function waitCmd(iSelect)
-    local response = core.WaitForResponseTimeout(cmds.CMD_ACK, 1000)
-    if response then
-        local count,cmd,arg0,arg1,arg2 = bin.unpack('LLLL',response)
-
-        local iLen = arg0
-        if iSelect then iLen = arg1 end
-        dbg(("Received %i octets (arg0:%d, arg1:%d)"):format(iLen, arg0, arg1))
-        if iLen == 0 then return nil, "No response from tag" end
-        local recv = string.sub(response,count, iLen+count-1)
-        return recv
-    end
-    return nil, "No response from device"
+--
+-- Sends an instruction to do nothing, only disconnect
+function disconnect()
+    local command = Command:newMIX{cmd = cmds.CMD_READER_ISO_14443a, arg1 = 0,}
+    -- We can ignore the response here, no ACK is returned for this command
+    -- Check /armsrc/iso14443a.c, ReaderIso14443a() for details
+    return command:sendMIX(true)
 end
 ---
 --
-local function show(data)
-    local formatString = ('H%d'):format(string.len(data))
-    local _,hexdata = bin.unpack(formatString, data)
-    dbg('Hexdata', hexdata)
-end
---- Fire up a connection with a tag, return uid
--- @return UID if successfull
--- @return nil, errormessage if unsuccessfull
-local function open()
-    dbg('Opening connection')
-    core.clearCommandBuffer()
-    local x = string.format('hf 14a raw -r -p -s')
-    dbg(x)
-    core.console(x)
-    dbg('done')
-    data, err = waitCmd(true)
-    if err then return oops(err) end
-    show(data)
-    local formatString = ('H%d'):format(string.len(data))
-    local _,uid = bin.unpack(formatString, data)
-    return uid
-end
---- Shut down tag communication
--- return no return values
-local function close()
-    dbg('Closing connection')
-    core.clearCommandBuffer()
-    local x = string.format('hf 14a raw -r')
-    dbg(x)
-    core.console(x)
-    dbg('done')
+local function getblockdata(response)
+    if not response then
+        return nil, 'No response from device'
+    end
+    
+    local count, cmd, arg0 = bin.unpack('LL', response)
+    if arg0 == 1 then
+        local count, arg1, arg2, data = bin.unpack('LLH511', response, count)
+        return data:sub(1, 32)
+    else
+        return nil, "Couldn't read block"
+    end
 end
 ---_ Gets data from a block
 -- @return {block, block+1, block+2, block+3} if successfull
 -- @return nil, errormessage if unsuccessfull
-local function getBlock(block)
-    local data, err
-
-    core.clearCommandBuffer()
-
-    local x = string.format('hf 14a raw -r -c -p 30 %02x', block)
-    dbg(x)
-    core.console(x)
-    dbg('done')
-    -- By now, there should be an ACK waiting from the device, since
-    -- we used the -r flag (don't read response).
-
-    data, err = waitCmd(false)
-    if err then return oops(err) end
-    show(data)
-
-    if string.len(data) < 18 then
-        return nil, ('Expected at least 18 bytes, got %d - this tag is not NDEF-compliant'):format(string.len(data))
+local function getBlock(blockno)
+    local block, err
+    local cmd = Command:newMIX{cmd = cmds.CMD_MIFAREU_READBL, arg1 = blockno, data = 0}
+    block, err = getblockdata(cmd:sendMIX(false))
+    if not block then return oops(err) end
+    
+    if #block < 32 then
+        return nil, ('Expected at least 16 bytes, got %d - this tag is not NDEF-compliant'):format(string.len(data))
     end
+    print('block', block)
     -- Now, parse out the block data
     -- 0534 00B9 049C AD7F 4A00 0000 E110 1000 2155
     -- b0b0 b0b0 b1b1 b1b1 b2b2 b2b2 b3b3 b3b3 CRCC
-    b0 = string.sub(data, 1, 4)
-    b1 = string.sub(data, 5, 8)
-    b2 = string.sub(data, 9, 12)
-    b3 = string.sub(data, 13, 16)
+    b0 = string.sub(block, 1, 8)
+    b1 = string.sub(block, 9, 16)
+    b2 = string.sub(block, 17, 24)
+    b3 = string.sub(block, 25, 32)
     return {b0, b1, b2, b3}
-end
-
+end    
+---
+--
 local function main( args)
 
     print( string.rep('--',20) )
     print( string.rep('--',20) )
+    
     dbg('script started')
     local err, data, data2, k, v, i
     -- Read the parameters
@@ -159,6 +124,21 @@ local function main( args)
         if o == 'd' then DEBUG = true end
     end
 
+    -- First of all, connect
+    info, err = lib14a.read(true, true)
+    if err then 
+        disconnect();
+        return oops(err)
+    end
+    core.clearCommandBuffer()
+
+    if info.name:match("Ultralight") then
+        dbg('Found a tag')
+    else
+        disconnect()
+        return oops('Not a Ultralightbased card. This script reads NDEF formatted UL/NTAGS')
+    end
+    
     -- Info contained within the tag (block 0 example)
     -- 0534 00B9 049C AD7F 4A00 0000 E110 1000 2155
     -- b0b0 b0b0 b1b1 b1b1 b2b2 b2b2 b3b3 b3b3 CRCC
@@ -167,31 +147,24 @@ local function main( args)
     -- N = NDEF-Structure-Compliant (if value is E1)
     -- V = NFC Forum Specification version (if 10 = v1.0)
 
-    -- First, 'connect' (fire up the field) and get the uid
-    local uidHexstr = open()
-
     -- First, get blockt 3 byte 2
     local blocks, err = getBlock(0)
     if err then
-        close()
+        disconnect()
         return oops(err) 
     end
     -- Block 3 contains number of blocks
-    local b3chars = {string.byte(blocks[4], 1,4)}
+    local b3chars = utils.ConvertHexToBytes(blocks[4]);
     local numBlocks = b3chars[3] * 2 + 6
     print("Number of blocks:", numBlocks)
 
     -- NDEF compliant?
     if b3chars[1] ~= 0xE1 then
-        close()
+        disconnect()
         return oops('This tag is not NDEF-Compliant')
     end
 
-    local ndefVersion = b3chars[2]
-
-    -- Block 1, byte 1 contains manufacturer info
-    local bl1_b1 = string.byte(blocks[1], 1)
-    local manufacturer = taglib.lookupManufacturer(bl1_b1)
+    local ndefversion = b3chars[2]
 
     -- Reuse existing info
     local blockData = {blocks[1], blocks[2], blocks[3], blocks[4]}
@@ -202,22 +175,28 @@ local function main( args)
     removing bytes from 5 to 18 from each answer.
     --]]
     print('Dumping data...please wait')
-    for i=4,numBlocks-1,1 do
+    for i = 4, numBlocks - 1, 1 do
         blocks, err = getBlock(i)
-        if err then close(); return oops(err) end
+        if err then 
+            disconnect(); 
+            return oops(err)
+        end
         table.insert(blockData, blocks[1])
     end
     -- Deactivate field
-    close()
+    disconnect()
     -- Print results
-    print(string.format('Tag manufacturer: %s', manufacturer))
-    print(string.format('Tag UID: %s', uidHexstr))
-    print(string.format('Tag NDEF version: 0x%02x', ndefVersion))
+    print('Tag info')    
+    print('UID         ', info.uid)
+    print('NDEF version', ('%02x'):format(ndefversion))
+    print('Manufacturer', info.manufacturer)
+    print('Type        ', info.name)
 
     for k,v in ipairs(blockData) do
         print(string.format('Block %02x: %02x %02x %02x %02x', k-1, string.byte(v, 1,4)))
     end
-    local filename, err = utils.writeDumpFile(uidHexstr, blockData)
+    
+    local filename, err = utils.WriteDumpFile(info.uid, blockData)
     if err then return oops(err) end
 
     print(string.format('Dumped data into %s', filename))
diff --git a/client/scripts/ufodump.lua b/client/scripts/ufodump.lua
index 0270bafaa..d21e00497 100644
--- a/client/scripts/ufodump.lua
+++ b/client/scripts/ufodump.lua
@@ -62,25 +62,6 @@ local function help()
     print(usage)    
 end
 --
--- writes data to ascii textfile.
-function writeDumpFile(uid, blockData)
-        local destination = string.format('%s.eml', uid)
-        local file = io.open(destination, 'w')
-        if file == nil then
-            return nil, string.format('Could not write to file %s', destination)
-        end
-        local rowlen = string.len(blockData[1])
-
-        for i,block in ipairs(blockData) do
-            if rowlen ~= string.len(block) then
-                print(string.format('WARNING: Dumpdata seems corrupted, line %d was not the same length as line 1',i))
-            end
-            file:write(block..'\n')
-        end
-        file:close()
-        return destination
-end
---
 --- Picks out and displays the data read from a tag
 -- Specifically, takes a usb packet, converts to a Command
 -- (as in commands.lua), takes the data-array and
@@ -174,7 +155,7 @@ function main(args)
     print("----+------------------+-------------------")
     disconnect()
 
-    local filename, err = writeDumpFile(info.uid, blockData)
+    local filename, err = utils.WriteDumpFile(info.uid, blockData)
     if err then return oops(err) end
 
     print(string.format('\nDumped data into %s', filename))

From 805b679b2f77f2c0509a80ad1fa4da2ea655582e Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 28 Apr 2019 23:58:51 +0200
Subject: [PATCH 1484/1938] fxing

---
 client/scripts/ndef_dump.lua | 151 +++++++++++++++--------------------
 1 file changed, 65 insertions(+), 86 deletions(-)

diff --git a/client/scripts/ndef_dump.lua b/client/scripts/ndef_dump.lua
index a89c4f32a..7d06c1520 100644
--- a/client/scripts/ndef_dump.lua
+++ b/client/scripts/ndef_dump.lua
@@ -1,6 +1,6 @@
 local getopt = require('getopt')
 local cmds = require('commands')
-local taglib = require('taglib')
+local lib14a = require('read14a')
 local utils = require('utils')
 
 copyright = ''
@@ -64,93 +64,58 @@ local function help()
     print(example)
     print(usage)
 end
-
---- This function is a lua-implementation of
--- cmdhf14a.c:waitCmd(uint8_t iSelect)
-local function waitCmd(iSelect)
-    local response = core.WaitForResponseTimeout(cmds.CMD_ACK, 1000)
-    if response then
-        local count,cmd,arg0,arg1,arg2 = bin.unpack('LLLL',response)
-
-        local iLen = arg0
-        if iSelect then iLen = arg1 end
-        dbg(("Received %i octets (arg0:%d, arg1:%d)"):format(iLen, arg0, arg1))
-        if iLen == 0 then return nil, "No response from tag" end
-        local recv = string.sub(response,count, iLen+count-1)
-        return recv
-    end
-    return nil, "No response from device"
+--
+-- Sends an instruction to do nothing, only disconnect
+function disconnect()
+    local command = Command:newMIX{cmd = cmds.CMD_READER_ISO_14443a, arg1 = 0,}
+    -- We can ignore the response here, no ACK is returned for this command
+    -- Check /armsrc/iso14443a.c, ReaderIso14443a() for details
+    return command:sendMIX(true)
 end
 ---
 --
-local function show(data)
-    local formatString = ('H%d'):format(string.len(data))
-    local _,hexdata = bin.unpack(formatString, data)
-    dbg('Hexdata', hexdata)
+local function getblockdata(response)
+    if not response then
+        return nil, 'No response from device'
 end
---- Fire up a connection with a tag, return uid
--- @return UID if successfull
--- @return nil, errormessage if unsuccessfull
-local function open()
-    dbg('Opening connection')
-    core.clearCommandBuffer()
-    local x = string.format('hf 14a raw -r -p -s')
-    dbg(x)
-    core.console(x)
-    dbg('done')
-    data, err = waitCmd(true)
-    if err then return oops(err) end
-    show(data)
-    local formatString = ('H%d'):format(string.len(data))
-    local _,uid = bin.unpack(formatString, data)
-    return uid
+    
+    local count, cmd, arg0 = bin.unpack('LL', response)
+    if arg0 == 1 then
+        local count, arg1, arg2, data = bin.unpack('LLH511', response, count)
+        return data:sub(1, 32)
+    else
+        return nil, "Couldn't read block"
 end
---- Shut down tag communication
--- return no return values
-local function close()
-    dbg('Closing connection')
-    core.clearCommandBuffer()
-    local x = string.format('hf 14a raw -r')
-    dbg(x)
-    core.console(x)
-    dbg('done')
 end
 ---_ Gets data from a block
 -- @return {block, block+1, block+2, block+3} if successfull
 -- @return nil, errormessage if unsuccessfull
-local function getBlock(block)
-    local data, err
-
-    core.clearCommandBuffer()
-
-    local x = string.format('hf 14a raw -r -c -p 30 %02x', block)
-    dbg(x)
-    core.console(x)
-    dbg('done')
-    -- By now, there should be an ACK waiting from the device, since
-    -- we used the -r flag (don't read response).
-
-    data, err = waitCmd(false)
-    if err then return oops(err) end
-    show(data)
-
-    if string.len(data) < 18 then
-        return nil, ('Expected at least 18 bytes, got %d - this tag is not NDEF-compliant'):format(string.len(data))
+local function getBlock(blockno)
+    local block, err
+    local cmd = Command:newMIX{cmd = cmds.CMD_MIFAREU_READBL, arg1 = blockno, data = 0}
+    block, err = getblockdata(cmd:sendMIX(false))
+    if not block then return oops(err) end
+    
+    if #block < 32 then
+        return nil, ('Expected at least 16 bytes, got %d - this tag is not NDEF-compliant'):format(string.len(data))
     end
+    print('block', block)
     -- Now, parse out the block data
     -- 0534 00B9 049C AD7F 4A00 0000 E110 1000 2155
     -- b0b0 b0b0 b1b1 b1b1 b2b2 b2b2 b3b3 b3b3 CRCC
-    b0 = string.sub(data, 1, 4)
-    b1 = string.sub(data, 5, 8)
-    b2 = string.sub(data, 9, 12)
-    b3 = string.sub(data, 13, 16)
+    b0 = string.sub(block, 1, 8)
+    b1 = string.sub(block, 9, 16)
+    b2 = string.sub(block, 17, 24)
+    b3 = string.sub(block, 25, 32)
     return {b0, b1, b2, b3}
 end
-
+---
+--
 local function main( args)
 
     print( string.rep('--',20) )
     print( string.rep('--',20) )
+    
     dbg('script started')
     local err, data, data2, k, v, i
     -- Read the parameters
@@ -159,6 +124,21 @@ local function main( args)
         if o == 'd' then DEBUG = true end
     end
 
+    -- First of all, connect
+    info, err = lib14a.read(true, true)
+    if err then 
+        disconnect();
+        return oops(err)
+    end
+    core.clearCommandBuffer()
+
+    if info.name:match("Ultralight") then
+        dbg('Found a tag')
+    else
+        disconnect()
+        return oops('Not a Ultralightbased card. This script reads NDEF formatted UL/NTAGS')
+    end
+    
     -- Info contained within the tag (block 0 example)
     -- 0534 00B9 049C AD7F 4A00 0000 E110 1000 2155
     -- b0b0 b0b0 b1b1 b1b1 b2b2 b2b2 b3b3 b3b3 CRCC
@@ -167,31 +147,24 @@ local function main( args)
     -- N = NDEF-Structure-Compliant (if value is E1)
     -- V = NFC Forum Specification version (if 10 = v1.0)
 
-    -- First, 'connect' (fire up the field) and get the uid
-    local uidHexstr = open()
-
     -- First, get blockt 3 byte 2
     local blocks, err = getBlock(0)
     if err then
-        close()
+        disconnect()
         return oops(err)
     end
     -- Block 3 contains number of blocks
-    local b3chars = {string.byte(blocks[4], 1,4)}
+    local b3chars = utils.ConvertHexToBytes(blocks[4]);
     local numBlocks = b3chars[3] * 2 + 6
     print("Number of blocks:", numBlocks)
 
     -- NDEF compliant?
     if b3chars[1] ~= 0xE1 then
-        close()
+        disconnect()
         return oops('This tag is not NDEF-Compliant')
     end
 
-    local ndefVersion = b3chars[2]
-
-    -- Block 1, byte 1 contains manufacturer info
-    local bl1_b1 = string.byte(blocks[1], 1)
-    local manufacturer = taglib.lookupManufacturer(bl1_b1)
+    local ndefversion = b3chars[2]
 
     -- Reuse existing info
     local blockData = {blocks[1], blocks[2], blocks[3], blocks[4]}
@@ -204,20 +177,26 @@ local function main( args)
     print('Dumping data...please wait')
     for i=4,numBlocks-1,1 do
         blocks, err = getBlock(i)
-        if err then close(); return oops(err) end
+        if err then 
+            disconnect(); 
+            return oops(err)
+        end
         table.insert(blockData, blocks[1])
     end
     -- Deactivate field
-    close()
+    disconnect()
     -- Print results
-    print(string.format('Tag manufacturer: %s', manufacturer))
-    print(string.format('Tag UID: %s', uidHexstr))
-    print(string.format('Tag NDEF version: 0x%02x', ndefVersion))
+    print('Tag info')    
+    print('UID         ', info.uid)
+    print('NDEF version', ('%02x'):format(ndefversion))
+    print('Manufacturer', info.manufacturer)
+    print('Type        ', info.name)
 
     for k,v in ipairs(blockData) do
         print(string.format('Block %02x: %02x %02x %02x %02x', k-1, string.byte(v, 1,4)))
     end
-    local filename, err = utils.writeDumpFile(uidHexstr, blockData)
+    
+    local filename, err = utils.WriteDumpFile(info.uid, blockData)
     if err then return oops(err) end
 
     print(string.format('Dumped data into %s', filename))

From f0c0b854ac7174ecacef5cafa795f9694ccf1e8f Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Mon, 29 Apr 2019 01:08:59 +0200
Subject: [PATCH 1485/1938] Fix mifare_ultra_readblockEx, copy full 16b of mful
 block (was 14)

---
 armsrc/mifareutil.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/armsrc/mifareutil.c b/armsrc/mifareutil.c
index 1de6d95f8..306f7a14e 100644
--- a/armsrc/mifareutil.c
+++ b/armsrc/mifareutil.c
@@ -358,7 +358,7 @@ int mifare_ultra_readblockEx(uint8_t blockNo, uint8_t *blockData) {
         return 3;
     }
 
-    memcpy(blockData, receivedAnswer, 14);
+    memcpy(blockData, receivedAnswer, 16);
     return 0;
 }
 int mifare_ultra_readblock(uint8_t blockNo, uint8_t *blockData) {

From 5e8fc73527c93baefe8e7323f20f3cb5722eadc2 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Mon, 29 Apr 2019 01:20:03 +0200
Subject: [PATCH 1486/1938] Debug hexdumps of comm

---
 client/comms.c | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/client/comms.c b/client/comms.c
index d79f12c30..b08345db3 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -12,6 +12,9 @@
 #include "comms.h"
 #include "crc16.h"
 
+//#define COMMS_DEBUG
+//#define COMMS_DEBUG_RAW
+
 // Serial port that we are communicating with the PM3 on.
 static serial_port sp = NULL;
 static char *serial_port_name = NULL;
@@ -65,7 +68,10 @@ bool IsOffline() {
 void SendCommand(PacketCommandOLD *c) {
 
 #ifdef COMMS_DEBUG
-    PrintAndLogEx(NORMAL, "Sending %d bytes | cmd %04x\n", sizeof(PacketCommandOLD), c->cmd);
+    PrintAndLogEx(NORMAL, "Sending %d bytes | cmd %04x", sizeof(PacketCommandOLD), c->cmd);
+#endif
+#ifdef COMMS_DEBUG_RAW
+    print_hex_break((uint8_t *)c, sizeof(PacketCommandOLD), 32);
 #endif
 
     if (offline) {
@@ -108,7 +114,7 @@ void SendCommandOLD(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, v
 
 static void SendCommandNG_internal(uint16_t cmd, uint8_t *data, size_t len, bool ng) {
 #ifdef COMMS_DEBUG
-    PrintAndLogEx(NORMAL, "Sending %d bytes of payload | cmd %04x\n", len, cmd);
+    PrintAndLogEx(NORMAL, "Sending %d bytes of payload | cmd %04x", len, cmd);
 #endif
 
     if (offline) {
@@ -146,8 +152,11 @@ static void SendCommandNG_internal(uint16_t cmd, uint8_t *data, size_t len, bool
         tx_post->crc = COMMANDNG_POSTAMBLE_MAGIC;
     }
 
-
     txBufferNGLen = sizeof(PacketCommandNGPreamble) + len + sizeof(PacketCommandNGPostamble);
+
+#ifdef COMMS_DEBUG_RAW
+    print_hex_break((uint8_t *)&txBufferNG, txBufferNGLen, 32);
+#endif
     txBuffer_pending = true;
 
     // tell communication thread that a new command can be send
@@ -223,6 +232,12 @@ static int getReply(PacketResponseNG *packet) {
 
     //Pick out the next unread command
     memcpy(packet, &rxBuffer[cmd_tail], sizeof(PacketResponseNG));
+#ifdef COMMS_DEBUG
+    PrintAndLogEx(NORMAL, "Receiving");
+#endif
+#ifdef COMMS_DEBUG_RAW
+    print_hex_break((uint8_t *)packet, sizeof(PacketResponseNG), 32);
+#endif
 
     //Increment tail - this is a circular buffer, so modulo buffer size
     cmd_tail = (cmd_tail + 1) % CMD_BUFFER_SIZE;

From bcdfa7e48265cd2ccf97d7b9fe87a378bdbbaee5 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Mon, 29 Apr 2019 01:08:59 +0200
Subject: [PATCH 1487/1938] Fix mifare_ultra_readblockEx, copy full 16b of mful
 block (was 14)

---
 armsrc/mifareutil.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/armsrc/mifareutil.c b/armsrc/mifareutil.c
index 1de6d95f8..306f7a14e 100644
--- a/armsrc/mifareutil.c
+++ b/armsrc/mifareutil.c
@@ -358,7 +358,7 @@ int mifare_ultra_readblockEx(uint8_t blockNo, uint8_t *blockData) {
         return 3;
     }
 
-    memcpy(blockData, receivedAnswer, 14);
+    memcpy(blockData, receivedAnswer, 16);
     return 0;
 }
 int mifare_ultra_readblock(uint8_t blockNo, uint8_t *blockData) {

From b254e70160debb2203087f4fb731e6eba104563c Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 29 Apr 2019 01:32:45 +0200
Subject: [PATCH 1488/1938] next

---
 client/scripts/brutesim.lua  | 68 +++++++++++++++++++-----------------
 client/scripts/ndef_dump.lua |  3 +-
 2 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/client/scripts/brutesim.lua b/client/scripts/brutesim.lua
index a15cf6e60..863fff88b 100644
--- a/client/scripts/brutesim.lua
+++ b/client/scripts/brutesim.lua
@@ -2,7 +2,7 @@ local getopt = require('getopt')
 
 copyright = ''
 author = 'Kenzy Carey'
-version = ''
+version = 'v1.0.1'
 desc = [[
 
   .-----------------------------------------------------------------.
@@ -64,21 +64,23 @@ local lshift = bit32.lshift
 ---
 -- A debug printout-function
 local function dbg(args)
-    if type(args) == "table" then
+    if not DEBUG then return end
+    if type(args) == 'table' then
         local i = 1
-        while args[i] do
-            dbg(args[i])
+        while result[i] do
+            dbg(result[i])
             i = i+1
         end
     else
-        print("###", args)
+        print('###', args)
     end
 end
 ---
 -- This is only meant to be used when errors occur
 local function oops(err)
-    print("ERROR: ",err)
-    return nil,err
+    print('ERROR:', err)
+    core.clearCommandBuffer()
+    return nil, err
 end
 ---
 -- Usage help
@@ -87,12 +89,13 @@ local function help()
     print(author)
     print(version)
     print(desc)
-    print("Example usage")
+    print('Example usage')
     print(example)
+    print(usage)
 end
 --
 -- Exit message
-function exitMsg(msg)
+local function exitMsg(msg)
     print( string.rep('--',20) )
     print( string.rep('--',20) )
     print(msg)
@@ -117,7 +120,7 @@ end
 --
 -- check for parity in bit-string.
 local function evenparity(s)
-    local _, count = string.gsub(s, "1", "")
+    local _, count = string.gsub(s, '1', '')
     local p = count % 2
     if (p == 0) then
         return false
@@ -136,7 +139,7 @@ local function cardHex(i, f)
     bits = bor(bits, lshift(high, 25))
     preamble = bor(0, lshift(1, 5))
     bits = bor(bits, lshift(1, 26))
-    return ("%04x%08x"):format(preamble, bits)
+    return ('%04x%08x'):format(preamble, bits)
 end
 --
 --
@@ -160,7 +163,7 @@ local function main(args)
 
     -- Check to see if -r argument was passed
     if isempty(rfidtag) then
-        print("You must supply the flag -r (rfid tag)")
+        print('You must supply the flag -r (rfid tag)')
         print(usage)
         return
     end
@@ -196,13 +199,13 @@ local function main(args)
         facilityrequired = 0
     elseif rfidtag == '14a' then
         consolecommand = 'hf 14a sim'
-        if facility == "1" then rfidtagname = 'MIFARE Classic' -- Here we use the -f option to read the 14a type instead of the facility code
-        elseif facility == "2" then rfidtagname = 'MIFARE Ultralight'
-        elseif facility == "3" then rfidtagname = 'MIFARE Desfire'
-        elseif facility == "4" then rfidtagname = 'ISO/IEC 14443-4'
-        elseif facility == "5" then rfidtagname = 'MIFARE Tnp3xxx'
+        if facility == '1' then rfidtagname = 'MIFARE Classic' -- Here we use the -f option to read the 14a type instead of the facility code
+        elseif facility == '2' then rfidtagname = 'MIFARE Ultralight'
+        elseif facility == '3' then rfidtagname = 'MIFARE Desfire'
+        elseif facility == '4' then rfidtagname = 'ISO/IEC 14443-4'
+        elseif facility == '5' then rfidtagname = 'MIFARE Tnp3xxx'
         else
-            print("Invalid 14a type (-f) supplied. Must be 1-5")
+            print('Invalid 14a type (-f) supplied. Must be 1-5')
             print(usage)
             return
         end
@@ -212,36 +215,36 @@ local function main(args)
         rfidtagname = 'HID'
         facilityrequired = 1
     else                                  -- Display error and exit out if bad RFID tag was supplied
-        print("Invalid rfid tag (-r) supplied")
+        print('Invalid rfid tag (-r) supplied')
         print(usage)
         return
     end
 
     if isempty(baseid) then               -- Display error and exit out if no starting id is set
-        print("You must supply the flag -b (base id)")
+        print('You must supply the flag -b (base id)')
         print(usage)
         return
     end
 
     if isempty(count) then                -- Display error and exit out of no count is set
-        print("You must supply the flag -c (count)")
+        print('You must supply the flag -c (count)')
         print(usage)
         return
     end
 
     if facilityrequired == 1 then         -- If FC is required
-        facilitymessage = " - Facility Code: " -- Add FC to status message
+        facilitymessage = ' - Facility Code: ' -- Add FC to status message
         if isempty(facility) then         -- If FC was left blank, display warning and set FC to 0
-            print("Using 0 for the facility code as -f was not supplied")
+            print('Using 0 for the facility code as -f was not supplied')
             facility = 0
         end
     else                                  -- If FC is not required
-        facility = ""                     -- Clear FC
-        facilitymessage = ""              -- Remove FC from status message
+        facility = ''                     -- Clear FC
+        facilitymessage = ''              -- Remove FC from status message
     end
 
     if isempty(timeout) then              -- If timeout was not supplied, show warning and set timeout to 0
-        print("Using 0 for the timeout as -t was not supplied")
+        print('Using 0 for the timeout as -t was not supplied')
         timeout = 0
     end
 
@@ -251,7 +254,7 @@ local function main(args)
     end
 
     if tonumber(count) < 1 then
-        print("Count -c must be set to 1 or higher")
+        print('Count -c must be set to 1 or higher')
         return
     else
         count = count -1                  -- Make our count accurate by removing 1, because math
@@ -264,16 +267,15 @@ local function main(args)
         endid = baseid + count
         fordirection = 1
     else                                  -- If invalid direction was set, show warning and set up our for loop to count down
-        print("Invalid direction (-d) supplied, using down")
+        print('Invalid direction (-d) supplied, using down')
         endid = baseid - count
         fordirection = -1
     end
 
 
-
     -- display status message
-    print("")
-    print("BruteForcing "..rfidtagname..""..facilitymessage..""..facility.." - CardNumber Start: "..baseid.." - CardNumber End: "..endid.." - TimeOut: "..timeout)
+    print('')
+    print('BruteForcing '..rfidtagname..''..facilitymessage..''..facility..' - CardNumber Start: '..baseid..' - CardNumber End: '..endid..' - TimeOut: '..timeout)
     print("")
 
     -- loop through for each count (-c)
@@ -286,10 +288,10 @@ local function main(args)
         core.console(consolecommand..' '..facility..' '..cardnum)
 
         if timeout == 'pause' then
-            print("Press enter to continue ...")
+            print('Press enter to continue ...')
             io.read()
         else
-            os.execute("sleep "..timeout.."")
+            os.execute('sleep '..timeout..'')
         end
     end
 
diff --git a/client/scripts/ndef_dump.lua b/client/scripts/ndef_dump.lua
index 7d06c1520..da24c767e 100644
--- a/client/scripts/ndef_dump.lua
+++ b/client/scripts/ndef_dump.lua
@@ -99,7 +99,6 @@ local function getBlock(blockno)
     if #block < 32 then
         return nil, ('Expected at least 16 bytes, got %d - this tag is not NDEF-compliant'):format(string.len(data))
     end
-    print('block', block)
     -- Now, parse out the block data
     -- 0534 00B9 049C AD7F 4A00 0000 E110 1000 2155
     -- b0b0 b0b0 b1b1 b1b1 b2b2 b2b2 b3b3 b3b3 CRCC
@@ -175,7 +174,7 @@ local function main( args)
     removing bytes from 5 to 18 from each answer.
     --]]
     print('Dumping data...please wait')
-    for i=4,numBlocks-1,1 do
+    for i = 4, numBlocks - 1, 1 do
         blocks, err = getBlock(i)
         if err then 
             disconnect(); 

From 47fbb557b47fdfd079f3ee7275dd73d8eabe1dda Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 29 Apr 2019 01:39:40 +0200
Subject: [PATCH 1489/1938] next

---
 client/scripts/mifare_access.lua  | 50 +++++++++++++++--------------
 client/scripts/mifare_autopwn.lua | 52 ++++++++++++++++++-------------
 2 files changed, 57 insertions(+), 45 deletions(-)

diff --git a/client/scripts/mifare_access.lua b/client/scripts/mifare_access.lua
index 20120aced..1c38576e7 100644
--- a/client/scripts/mifare_access.lua
+++ b/client/scripts/mifare_access.lua
@@ -2,11 +2,13 @@ local getopt = require('getopt')
 
 copyright = ''
 author = "Neuromancer"
-version = 'v1.0.0'
+version = 'v1.0.1'
 desc = [[
 This script tries to decode Mifare Classic Access bytes
 ]]
-example = 'script run mifare_access -a 7F0F0869'
+example = [[
+    1. script run mifare_access -a 7F0F0869
+]]
 usage = [[
 script run mifare_access -h -a <access bytes>
 
@@ -24,20 +26,21 @@ local rshift = bit32.rshift
 -- A debug printout-function
 local function dbg(args)
     if not DEBUG then return end
-    if type(args) == "table" then
+    if type(args) == 'table' then
         local i = 1
         while args[i] do
             dbg(args[i])
             i = i+1
         end
     else
-        print("###", args)
+        print('###', args)
     end
 end
 ---
 -- This is only meant to be used when errors occur
 local function oops(err)
-    print("ERROR: ",err)
+    print('ERROR:', err)
+    core.clearCommandBuffer()
     return nil, err
 end
 ---
@@ -49,6 +52,7 @@ local function help()
     print(desc)
     print('Example usage')
     print(example)
+    print(usage)
 end
 
 local access_condition_sector_trailer = {}
@@ -81,13 +85,13 @@ local function main(args)
 
     -- Read the parameters
     for o, a in getopt.getopt(args, 'ha:') do
-        if o == "h" then return help() end
-        if o == "a" then access = a end
+        if o == 'h' then return help() end
+        if o == 'a' then access = a end
     end
 
     if access == nil then return oops('empty ACCESS CONDITIONS') end
     if #access == 0 then return oops('empty ACCESS CONDITIONS') end
-    if #access ~= 8 then return oops("Wrong length. Should be 4 hex bytes ACCESS CONDITIONS (e.g. 7F0F0869)") end
+    if #access ~= 8 then return oops('Wrong length. Should be 4 hex bytes ACCESS CONDITIONS (e.g. 7F0F0869)') end
 
     local c2_b = tonumber(string.sub(access, 1, 1), 16)
     local c1_b = tonumber(string.sub(access, 2, 2), 16)
@@ -97,34 +101,34 @@ local function main(args)
     local c2 = tonumber(string.sub(access, 6, 6), 16)
     local gpb = string.sub(access, 7, 8)
 
-    if bxor(c1, c1_b) ~= 0xF then print("!!! bitflip in c1") end
-    if bxor(c2, c2_b) ~= 0xF then print("!!! bitflip in c2") end
-    if bxor(c3, c3_b) ~= 0xF then print("!!! bitflip in c3") end
+    if bxor(c1, c1_b) ~= 0xF then print('!!! bitflip in c1') end
+    if bxor(c2, c2_b) ~= 0xF then print('!!! bitflip in c2') end
+    if bxor(c3, c3_b) ~= 0xF then print('!!! bitflip in c3') end
 
     local ab = c1 * 256 + c2 * 16 + c3
 
     for block = 0,3 do
-        print("--> block "..block)
+        print('--> block '..block)
         -- mask bits for block
         local abi = band(rshift(ab, block), 0x111)
         -- compress bits
         abi = band(abi + rshift(abi, 3) + rshift(abi, 6),7)
         -- print(abi)
         if block == 3 then
-            print("     KEYSECXA read: "..access_condition_sector_trailer[abi][1])
-            print("    KEYSECXA write: "..access_condition_sector_trailer[abi][2])
-            print(" ACCESS COND. read: "..access_condition_sector_trailer[abi][3])
-            print("ACCESS COND. write: "..access_condition_sector_trailer[abi][4])
-            print("     KEYSECXB read: "..access_condition_sector_trailer[abi][5])
-            print("    KEYSECXB write: "..access_condition_sector_trailer[abi][6])
+            print('     KEYSECXA read: '..access_condition_sector_trailer[abi][1])
+            print('    KEYSECXA write: '..access_condition_sector_trailer[abi][2])
+            print(' ACCESS COND. read: '..access_condition_sector_trailer[abi][3])
+            print('ACCESS COND. write: '..access_condition_sector_trailer[abi][4])
+            print('     KEYSECXB read: '..access_condition_sector_trailer[abi][5])
+            print('    KEYSECXB write: '..access_condition_sector_trailer[abi][6])
         else
-            print("                   read: "..access_condition_data_block[abi][1])
-            print("                  write: "..access_condition_data_block[abi][2])
-            print("                    inc: "..access_condition_data_block[abi][3])
-            print("decr, transfer, restore: "..access_condition_data_block[abi][4])
+            print('                   read: '..access_condition_data_block[abi][1])
+            print('                  write: '..access_condition_data_block[abi][2])
+            print('                    inc: '..access_condition_data_block[abi][3])
+            print('decr, transfer, restore: '..access_condition_data_block[abi][4])
         end
     end
 
-    print("GPB: "..gpb)
+    print('GPB: '..gpb)
 end
 main(args)
diff --git a/client/scripts/mifare_autopwn.lua b/client/scripts/mifare_autopwn.lua
index 9a94b7a98..cc37f6103 100644
--- a/client/scripts/mifare_autopwn.lua
+++ b/client/scripts/mifare_autopwn.lua
@@ -3,14 +3,18 @@ local lib14a = require('read14a')
 local cmds = require('commands')
 local utils = require('utils')
 
-example = "script run mifare_autopwn"
+copyright = ''
 author = "Martin Holst Swende"
-desc =
-[[
+version = 'v1.0.1'
+desc = [[
 This is a script which automates cracking and dumping mifare classic cards. It sets itself into
 'listening'-mode, after which it cracks and dumps any mifare classic card that you
 place by the device.
-
+]]
+example = [[
+script run mifare_autopwn
+]]
+usage = [[
 Arguments:
     -h          this help
     -d          debug logging on
@@ -33,7 +37,6 @@ local DEBUG = false
 -- A debug printout-function
 local function dbg(args)
     if not DEBUG then return end
-
     if type(args) == 'table' then
         local i = 1
         while result[i] do
@@ -47,15 +50,20 @@ end
 ---
 -- This is only meant to be used when errors occur
 local function oops(err)
-    print("ERROR: ",err)
-    return nil,err
+    print('ERROR:', err)
+    core.clearCommandBuffer()
+    return nil, err
 end
 ---
 -- Usage help
 local function help()
+    print(copyright)
+    print(author)
+    print(version)
     print(desc)
-    print("Example usage")
+    print('Example usage')
     print(example)
+    print(usage)
 end
 ---
 -- Waits for a mifare card to be placed within the vicinity of the reader.
@@ -67,7 +75,7 @@ local function wait_for_mifare()
         if res then return res end
         -- err means that there was no response from card
     end
-    return nil, "Aborted by user"
+    return nil, 'Aborted by user'
 end
 
 local function nested(key,sak)
@@ -85,7 +93,7 @@ local function nested(key,sak)
     else
         print("I don't know how many sectors there are on this type of card, defaulting to 16")
     end
-    local cmd = string.format("hf mf nested %d 0 A %s d", typ, key)
+    local cmd = string.format('hf mf nested %d 0 A %s d', typ, key)
     core.console(cmd)
 end
 
@@ -146,14 +154,14 @@ local function main(args)
     local print_message = true
     -- Read the parameters
     for o, a in getopt.getopt(args, 'hdk:') do
-        if o == "h" then help() return end
-        if o == "d" then DEBUG = true end
+        if o == 'h' then help() return end
+        if o == 'd' then DEBUG = true end
         if o == 'k' then key = a end
     end
 
     while not exit do
         if print_message then
-            print("Waiting for card or press any key to stop")
+            print('Waiting for card or press any key to stop')
             print_message = false
         end
         res, err = wait_for_mifare()
@@ -168,29 +176,29 @@ local function main(args)
 
             -- check if PRNG is WEAK
             if perform_prng_test() == 1 then
-                print("Card found, commencing crack on UID", uid)
+                print('Card found, commencing crack on UID', uid)
 
                 if #key == 12 then
-                    print("Using key: "..key);
+                    print('Using key: '..key);
                 else
                     -- Crack it
                     local cnt
                     err, res = core.mfDarkside()
-                    if     err == -1 then return oops("Button pressed. Aborted.")
-                    elseif err == -2 then return oops("Card is not vulnerable to Darkside attack (doesn't send NACK on authentication requests).")
-                    elseif err == -3 then return oops("Card is not vulnerable to Darkside attack (its random number generator is not predictable).")
+                    if     err == -1 then return oops('Button pressed. Aborted.')
+                    elseif err == -2 then return oops([[Card is not vulnerable to Darkside attack (doesn't send NACK on authentication requests).]])
+                    elseif err == -3 then return oops([[Card is not vulnerable to Darkside attack (its random number generator is not predictable).]])
                     elseif err == -4 then return oops([[
         Card is not vulnerable to Darkside attack (its random number generator seems to be based on the wellknown
         generating polynomial with 16 effective bits only, but shows unexpected behaviour.]])
-                    elseif err == -5 then return oops("Aborted via keyboard.")
+                    elseif err == -5 then return oops('Aborted via keyboard.')
                     end
                     -- The key is actually 8 bytes, so a
                     -- 6-byte key is sent as 00XXXXXX
                     -- This means we unpack it as first
                     -- two bytes, then six bytes actual key data
                     -- We can discard first and second return values
-                    _,_,key = bin.unpack("H2H6",res)
-                    print("Found valid key: "..key);
+                    _,_,key = bin.unpack('H2H6',res)
+                    print('Found valid key: '..key);
                 end
                 -- Use nested attack
                 nested(key, sak)
@@ -199,7 +207,7 @@ local function main(args)
 
                 if #key == 12 then exit = true end
             else
-                print("Card found, darkside attack useless PRNG hardend on UID", uid)
+                print('Card found, darkside attack useless PRNG hardend on UID', uid)
             end
             print_message = true
         end

From 2b561ad732740ca1fd796a999f637a36bc51e9f5 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 29 Apr 2019 01:51:00 +0200
Subject: [PATCH 1490/1938] next

---
 client/scripts/mfkeys.lua    | 73 +++++++++++++++++++-----------------
 client/scripts/ndef_dump.lua | 11 +++---
 2 files changed, 43 insertions(+), 41 deletions(-)

diff --git a/client/scripts/mfkeys.lua b/client/scripts/mfkeys.lua
index ff739683d..7710164fd 100644
--- a/client/scripts/mfkeys.lua
+++ b/client/scripts/mfkeys.lua
@@ -8,26 +8,22 @@
 
     Copyright (C) 2013 m h swende <martin at swende.se>
 --]]
--- Loads the commands-library
 local cmds = require('commands')
--- Load the default keys
 local keylist = require('mf_default_keys')
--- Ability to read what card is there
 local lib14a = require('read14a')
 local getopt = require('getopt')
--- Asks the user for input
 local utils = require('utils')
 
-example =[[
-     script run mfkeys
-]]
+copyright = ''
 author = "Holiman"
-usage = "script run mfkeys"
+version = 'v1.0.1'
 desc = ("This script implements Mifare check keys.\
 It utilises a large list of default keys (currently %d keys).\
-If you want to add more, just put them inside /lualibs/mf_default_keys.lua\n"):format(#keylist) ..
-[[
-
+If you want to add more, just put them inside /lualibs/mf_default_keys.lua\n"):format(#keylist)
+example = [[
+    1. script run mfkeys
+]]
+usage = [[
 Arguments:
     -h             : this help
     -p             : print keys
@@ -37,36 +33,36 @@ local TIMEOUT = 10000 -- 10 seconds
 ---
 -- This is only meant to be used when errors occur
 local function oops(err)
-    print('ERROR: ',err)
-    return nil,err
+    print('ERROR:', err)
+    core.clearCommandBuffer()
+    return nil, err
 end
 ---
 -- Usage help
 local function help()
+    print(copyright)
+    print(author)
+    print(version)
     print(desc)
-    print("Example usage")
+    print('Example usage')
     print(example)
+    print(usage)
 end
 --
 -- waits for answer from pm3 device
-local function checkCommand(command)
-    core.clearCommandBuffer()
-    local usb = command:getBytes()
-    core.SendCommand(usb)
-    local result = core.WaitForResponseTimeout(cmds.CMD_ACK, TIMEOUT)
-    if result then
-        local count, cmd, arg0 = bin.unpack('LL',result)
-        if(arg0==1) then
-            local count, arg1, arg2, data = bin.unpack('LLH511',result,count)
-            key = data:sub(1,12)
-            return key
-        else
-            return nil
-        end
-    else
+local function checkCommand(response)
+    if not response then
         print("Timeout while waiting for response. Increase TIMEOUT in mfkeys.lua to wait longer")
         return nil, "Timeout while waiting for device to respond"
     end
+   
+    local count, cmd, arg0, arg1, arg2, data = bin.unpack('LLLLH40',result)    
+    if arg0 == 1 then
+        key = data:sub(1, 12)
+        return key
+    end
+    
+    return nil
 end
 
 local function checkBlock(blockno, testkeys, keytype)
@@ -85,13 +81,15 @@ local function checkBlock(blockno, testkeys, keytype)
 
         local d1 = table.concat(testkeys, "", start, n)
 
+        core.clearCommandBuffer() 
+        
         print(("Testing block %d, keytype %d, with %d keys"):format(blockno, keytype, chunksize))
-        local command = Command:new{cmd = cmds.CMD_MIFARE_CHKKEYS,
+        local c = Command:newMIX{cmd = cmds.CMD_MIFARE_CHKKEYS,
                                 arg1 =  arg1,
-                                arg2 = 0,
                                 arg3 = chunksize,
                                 data = d1}
-        local status = checkCommand(command)
+        status, err = checkCommand(cmd:sendMIX(false, TIMEOUT))
+
         if status then return status, blockno end
         start = start + chunksize
         remaining = remaining - chunksize
@@ -101,7 +99,7 @@ local function checkBlock(blockno, testkeys, keytype)
     end
     return nil
 end
-
+---
 -- A function to display the results
 local function display_results(keys)
     local sector, keyA, keyB, succA, succB
@@ -116,6 +114,7 @@ local function display_results(keys)
     end
     print('|---|----------------|---|----------------|---|')
 end
+---
 -- A little helper to place an item first in the list
 local function placeFirst(akey, list)
     akey = akey:lower()
@@ -179,12 +178,16 @@ local function dumptofile(keys)
         file:close()
     end
 end
+---
+--
 local function printkeys()
     for i=1, #keylist do
         print(i, keylist[i])
     end
     print ('Number of keys: '..#keylist)
 end
+---
+--
 local function perform_check(numsectors)
 
     local keyType = 0 -- A=0, B=1
@@ -256,8 +259,8 @@ local function main(args)
 
     -- Arguments for the script
     for o, a in getopt.getopt(args, 'hp') do
-        if o == "h" then return help() end
-        if o == "p" then return printkeys() end
+        if o == 'h' then return help() end
+        if o == 'p' then return printkeys() end
     end
     -- identify tag
     tag, err = lib14a.read(false, true)
diff --git a/client/scripts/ndef_dump.lua b/client/scripts/ndef_dump.lua
index da24c767e..2e85ea865 100644
--- a/client/scripts/ndef_dump.lua
+++ b/client/scripts/ndef_dump.lua
@@ -77,15 +77,14 @@ end
 local function getblockdata(response)
     if not response then
         return nil, 'No response from device'
-end
+    end
     
-    local count, cmd, arg0 = bin.unpack('LL', response)
+    local count, cmd, arg0, arg1, arg2, data = bin.unpack('LLLLH40', response)
     if arg0 == 1 then
-        local count, arg1, arg2, data = bin.unpack('LLH511', response, count)
         return data:sub(1, 32)
-    else
-        return nil, "Couldn't read block"
-end
+    end
+
+    return nil, "Couldn't read block"
 end
 ---_ Gets data from a block
 -- @return {block, block+1, block+2, block+3} if successfull

From 7cc6975e5227aa8fc7637b6ad7fba3550acd6cfe Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 29 Apr 2019 01:52:55 +0200
Subject: [PATCH 1491/1938] fix

---
 client/scripts/mfkeys.lua    | 2 +-
 client/scripts/ndef_dump.lua | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/scripts/mfkeys.lua b/client/scripts/mfkeys.lua
index 7710164fd..b077a6cbf 100644
--- a/client/scripts/mfkeys.lua
+++ b/client/scripts/mfkeys.lua
@@ -88,7 +88,7 @@ local function checkBlock(blockno, testkeys, keytype)
                                 arg1 =  arg1,
                                 arg3 = chunksize,
                                 data = d1}
-        status, err = checkCommand(cmd:sendMIX(false, TIMEOUT))
+        status, err = checkCommand(c:sendMIX(false, TIMEOUT))
 
         if status then return status, blockno end
         start = start + chunksize
diff --git a/client/scripts/ndef_dump.lua b/client/scripts/ndef_dump.lua
index 2e85ea865..0db3108f0 100644
--- a/client/scripts/ndef_dump.lua
+++ b/client/scripts/ndef_dump.lua
@@ -91,8 +91,8 @@ end
 -- @return nil, errormessage if unsuccessfull
 local function getBlock(blockno)
     local block, err
-    local cmd = Command:newMIX{cmd = cmds.CMD_MIFAREU_READBL, arg1 = blockno, data = 0}
-    block, err = getblockdata(cmd:sendMIX(false))
+    local c = Command:newMIX{cmd = cmds.CMD_MIFAREU_READBL, arg1 = blockno, data = 0}
+    block, err = getblockdata(c:sendMIX(false))
     if not block then return oops(err) end
     
     if #block < 32 then

From 7454a4dcf23471952e1bf1c21182794cddc45c0e Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 29 Apr 2019 02:07:40 +0200
Subject: [PATCH 1492/1938] chg: 'hf mf chkkeys' - now uses NG

---
 armsrc/appmain.c           | 2 +-
 armsrc/apps.h              | 2 +-
 armsrc/mifarecmd.c         | 9 +++++++--
 client/lualibs/read14a.lua | 7 +++++--
 client/scripts/mfkeys.lua  | 4 ++--
 5 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index c3a52bc93..b7c167730 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -949,7 +949,7 @@ static void PacketReceived(PacketCommandNG *packet) {
             MifareNested(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
             break;
         case CMD_MIFARE_CHKKEYS: {
-            MifareChkKeys(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
+            MifareChkKeys(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes, packet->ng);            
             break;
         }
         case CMD_MIFARE_CHKKEYS_FAST: {
diff --git a/armsrc/apps.h b/armsrc/apps.h
index 07a646a03..d2fdf5bac 100644
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -153,7 +153,7 @@ void MifareUWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain);
 void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain);
 void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *datain);
 void MifareAcquireNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *datain);
-void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain);
+void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain, bool ng);
 void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain);
 void MifareSetDbgLvl(uint16_t arg0);
 void MifareEMemClr(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain);
diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index 52645d627..0e21a9736 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -1516,7 +1516,7 @@ OUT:
     }
 }
 
-void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) {
+void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain, bool ng) {
 
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 
@@ -1592,8 +1592,13 @@ void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) {
     }
 
     LED_B_ON();
-    reply_old(CMD_ACK, isOK, 0, 0, datain + i * 6, 6);
 
+    if (ng) {
+        reply_ng(CMD_MIFARE_CHKKEYS, PM3_SUCCESS, datain + i * 6, 6);
+    } else {
+        reply_mix(CMD_ACK, isOK, 0, 0, datain + i * 6, 6);
+    }
+//    reply_old(CMD_ACK, isOK, 0, 0, datain + i * 6, 6);
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     LEDsoff();
 
diff --git a/client/lualibs/read14a.lua b/client/lualibs/read14a.lua
index 012102931..8473278f8 100644
--- a/client/lualibs/read14a.lua
+++ b/client/lualibs/read14a.lua
@@ -13,7 +13,10 @@
 -- Loads the commands-library
 local taglib = require('taglib')
 local cmds = require('commands')
-local TIMEOUT = 2000 -- Shouldn't take longer than 2 seconds
+
+-- Shouldn't take longer than 2 seconds
+local TIMEOUT = 2000
+
 local ISO14A_COMMAND = {
     ISO14A_CONNECT = 1,
     ISO14A_NO_DISCONNECT = 2,
@@ -99,7 +102,7 @@ local function read14443a(dont_disconnect, no_rats)
         if arg0 == 0 then
             return nil, 'iso14443a card select failed'
         end
-        data = string.sub(result,count)
+        data = string.sub(result, count)
         info, err = parse14443a(data)
     else
         err = 'No response from card'
diff --git a/client/scripts/mfkeys.lua b/client/scripts/mfkeys.lua
index b077a6cbf..7d39db5a5 100644
--- a/client/scripts/mfkeys.lua
+++ b/client/scripts/mfkeys.lua
@@ -84,11 +84,11 @@ local function checkBlock(blockno, testkeys, keytype)
         core.clearCommandBuffer() 
         
         print(("Testing block %d, keytype %d, with %d keys"):format(blockno, keytype, chunksize))
-        local c = Command:newMIX{cmd = cmds.CMD_MIFARE_CHKKEYS,
+        local c = Command:newNG{cmd = cmds.CMD_MIFARE_CHKKEYS,
                                 arg1 =  arg1,
                                 arg3 = chunksize,
                                 data = d1}
-        status, err = checkCommand(c:sendMIX(false, TIMEOUT))
+        status, err = checkCommand(c:sendNG(false, TIMEOUT))
 
         if status then return status, blockno end
         start = start + chunksize

From 03d6454d959075bf100bb1c40f0cc8d02f85db67 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 29 Apr 2019 12:12:14 +0200
Subject: [PATCH 1493/1938] chg: 'script run mfkeys' : uses NG chg: 'hf mf chk'
 : uses old/mix

---
 armsrc/mifarecmd.c          | 23 ++++++++++++++-------
 client/lualibs/commands.lua | 18 ++++++++---------
 client/scripting.c          |  2 +-
 client/scripts/mfkeys.lua   | 40 ++++++++++++++++++++++---------------
 4 files changed, 50 insertions(+), 33 deletions(-)

diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index 0e21a9736..db421954c 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -1529,13 +1529,22 @@ void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain, b
     uint64_t key = 0;
     uint32_t cuid = 0;
     int i, res;
-    uint8_t blockNo = arg0 & 0xFF;
-    uint8_t keyType = (arg0 >> 8) & 0xFF;
-    uint8_t keyCount = arg2;
-    uint8_t cascade_levels = 0;
-    uint8_t isOK = 0;
-    bool have_uid = false;
-    bool clearTrace = arg1 & 0xFF;
+    uint8_t cascade_levels = 0, isOK = 0;
+    uint8_t blockNo, keyType, keyCount;
+    bool clearTrace, have_uid = false;
+
+    if (ng) {
+        keyType = datain[0];
+        blockNo = datain[1];
+        clearTrace = datain[2];
+        keyCount = datain[3];
+        datain += 4;
+    } else {
+        blockNo = arg0 & 0xFF;
+        keyType = (arg0 >> 8) & 0xFF;
+        clearTrace = arg1;
+        keyCount = arg2;
+    }
 
     LEDsoff();
     LED_A_ON();
diff --git a/client/lualibs/commands.lua b/client/lualibs/commands.lua
index 244f3e6a1..a9a2a95e9 100644
--- a/client/lualibs/commands.lua
+++ b/client/lualibs/commands.lua
@@ -33,7 +33,7 @@ Command = {
 
         if (type(data) == 'string') then
             -- We need to check if it is correct length, otherwise pad it
-            local len = string.len(data)
+            local len = #data
             if (len < 1024) then
                 --Should be 1024 hex characters to represent 512 bytes of data
                 data = data .. string.rep("0",1024 - len )
@@ -42,7 +42,7 @@ Command = {
                 -- OOps, a bit too much data here
                 print( ( "WARNING: data size too large, was %s chars, will be truncated "):format(len) )
                 --
-                data = data:sub(1,1024)
+                data = data:sub(1, 1024)
             end
         else
             print(("WARNING; data was NOT a (hex-) string, but was %s"):format(type(data)))
@@ -67,7 +67,7 @@ Command = {
                 -- OOps, a bit too much data here
                 print( ( "WARNING: data size too large, was %s chars, will be truncated "):format( #data) )
                 --
-                data = data:sub(1,1024)
+                data = data:sub(1, 1024)
             end
         end
         o.data = data
@@ -87,7 +87,7 @@ Command = {
                 -- OOps, a bit too much data here
                 print( ( "WARNING: data size too large, was %s chars, will be truncated "):format( #data) )
                 --
-                data = data:sub(1,1024)
+                data = data:sub(1, 1024)
             end
         end
         o.data = data
@@ -129,7 +129,7 @@ function Command:__responsetostring()
                     tostring(self.resp_arg2),
                     tostring(self.resp_arg3)))
     print('NG     ::', self.resp_ng)
-    print('package ::', self.resp_response)
+    print('Data   ::', self.resp_data)
 end
 
 
@@ -194,12 +194,13 @@ function Command:sendNG( ignore_response, timeout )
         return nil, 'Error, waiting for response timed out :: '..msg
     end
 
-    -- lets digest
+--[[  uncomment if you want to debug
+
+    -- lets digest response NG package.  
     local data
     local count, cmd, length, magic, status, crc, arg1, arg2, arg3 = bin.unpack('SSIsSLLL', response)
     count, data, ng = bin.unpack('H'..length..'C', response, count)
 
---[[  uncomment if you want to debug
     self.resp_cmd = cmd
     self.resp_length = length
     self.resp_magic = magic
@@ -213,8 +214,7 @@ function Command:sendNG( ignore_response, timeout )
     self:__responsetostring()
 --]]
 
-    local packed = bin.pack("LLLLH", cmd, arg1, arg2, arg3, data)
-    return packed, nil;
+    return response
 end
 
 return _commands
diff --git a/client/scripting.c b/client/scripting.c
index 5aa76d33c..fe1fe1def 100644
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -162,7 +162,7 @@ static int l_SendCommandNG(lua_State *L) {
         return returnToLuaWithError(L, "You need to supply two parameters");
 
     // parse input
-    uint64_t cmd = luaL_checknumber(L, 1);
+    uint16_t cmd = luaL_checknumber(L, 1);
 
     // data
     const char *p_data = luaL_checklstring(L, 2, &size);
diff --git a/client/scripts/mfkeys.lua b/client/scripts/mfkeys.lua
index 7d39db5a5..a8426fda5 100644
--- a/client/scripts/mfkeys.lua
+++ b/client/scripts/mfkeys.lua
@@ -29,6 +29,8 @@ Arguments:
     -p             : print keys
 ]]
 
+local PM3_SUCCESS = 0 -- needs to be refactored into own like usb_cmd
+
 local TIMEOUT = 10000 -- 10 seconds
 ---
 -- This is only meant to be used when errors occur
@@ -56,8 +58,11 @@ local function checkCommand(response)
         return nil, "Timeout while waiting for device to respond"
     end
    
-    local count, cmd, arg0, arg1, arg2, data = bin.unpack('LLLLH40',result)    
-    if arg0 == 1 then
+    local data
+    local count, cmd, length, magic, status, crc, arg1, arg2, arg3 = bin.unpack('SSIsSLLL', response)
+    count, data, ng = bin.unpack('H'..length..'C', response, count)
+
+    if status == PM3_SUCCESS then
         key = data:sub(1, 12)
         return key
     end
@@ -67,34 +72,37 @@ end
 
 local function checkBlock(blockno, testkeys, keytype)
 
-    -- The command data is only 512 bytes, each key is 6 bytes, meaning that we can send max 85 keys in one go.
+    -- The command data is only 512 bytes,
+    -- each key is 6 bytes,
+    -- NG args inside dataarray is 4 bytes.  That give us (512-4)/6 or max 84 keys in one go.
     -- If there's more, we need to split it up
     local arg1 = bit32.bor(bit32.lshift(keytype, 8), blockno)
-
+    local arg2 = '00' -- don't clear trace
     local start, remaining = 1, #testkeys
+    local maxchunk = math.floor((512-4)/6)
     local chunksize = remaining
-    if remaining > 85 then chunksize = 85 end
+    if remaining > maxchunk then chunksize = maxchunk end
     local n = chunksize
-
+    
     while remaining > 0 do
-        --print('start', start, 'chunksize', chunksize, 'testkeys kvar', remaining, 'N-index=', n)
+--        print('start', start, 'chunksize', chunksize, 'testkeys kvar', remaining, 'N-index=', n)
 
+        local d0 = ('%04X%02X%02X'):format(arg1, arg2, chunksize)
         local d1 = table.concat(testkeys, "", start, n)
+	
+        core.clearCommandBuffer()
 
-        core.clearCommandBuffer() 
-        
         print(("Testing block %d, keytype %d, with %d keys"):format(blockno, keytype, chunksize))
-        local c = Command:newNG{cmd = cmds.CMD_MIFARE_CHKKEYS,
-                                arg1 =  arg1,
-                                arg3 = chunksize,
-                                data = d1}
-        status, err = checkCommand(c:sendNG(false, TIMEOUT))
 
-        if status then return status, blockno end
+        local c = Command:newNG{cmd = cmds.CMD_MIFARE_CHKKEYS, data = d0..d1}
+        key, err = checkCommand(c:sendNG(false, TIMEOUT))
+	
+        if key then return key, blockno end
+
         start = start + chunksize
         remaining = remaining - chunksize
 
-        if remaining < 85 then chunksize = remaining end
+        if remaining < maxchunk then chunksize = remaining end
         n = n + chunksize
     end
     return nil

From 67e3ac3f542a3bdd20764364fdfed677461d0a4b Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 29 Apr 2019 14:19:41 +0200
Subject: [PATCH 1494/1938] add: ndef parsing to LUA

---
 client/scripting.c           | 40 ++++++++++++++++++++++++++++++++++++
 client/scripting.h           |  3 ++-
 client/scripts/ndef_dump.lua | 12 +++++++----
 3 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/client/scripting.c b/client/scripting.c
index fe1fe1def..59a03025f 100644
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -951,6 +951,45 @@ static int l_T55xx_detect(lua_State *L) {
     return 2;
 }
 
+//
+static int l_ndefparse(lua_State *L) {
+
+    size_t len = 0, size;
+
+    //Check number of arguments
+    int n = lua_gettop(L);
+    if (n != 3)  {
+        return returnToLuaWithError(L, "You need to supply three parameters");
+    }
+
+    size_t datalen = luaL_checknumber(L, 1);
+    bool verbose = luaL_checknumber(L, 2);
+
+    uint8_t *data = calloc(datalen, sizeof(uint8_t));
+    if (data == 0) {
+        return returnToLuaWithError(L, "Allocating memory failed");
+    }
+    
+    // data
+    const char *p_data = luaL_checklstring(L, 3, &size);
+    if (size) {
+        if (size > (datalen << 1) )
+            size = (datalen << 1);
+
+        uint32_t tmp;
+        for (int i = 0; i < size; i += 2) {
+            sscanf(&p_data[i], "%02x", &tmp);
+            data[i >> 1] = tmp & 0xFF;
+            len++;
+        }
+    }
+    
+    int res = NDEFDecodeAndPrint(data, datalen, verbose);
+    lua_pushinteger(L, res);
+    return 1;
+}
+
+
 /**
  * @brief Sets the lua path to include "./lualibs/?.lua", in order for a script to be
  * able to do "require('foobar')" if foobar.lua is within lualibs folder.
@@ -1009,6 +1048,7 @@ int set_pm3_libraries(lua_State *L) {
         {"keygen_algo_d",               l_keygen_algoD},
         {"t55xx_readblock",             l_T55xx_readblock},
         {"t55xx_detect",                l_T55xx_detect},
+        {"ndefparse"   ,                l_ndefparse},
         {NULL, NULL}
     };
 
diff --git a/client/scripting.h b/client/scripting.h
index 75a08605b..4db566dcc 100644
--- a/client/scripting.h
+++ b/client/scripting.h
@@ -29,7 +29,8 @@
 #include "cmdhfmfhard.h"
 #include "cmdhfmfu.h"
 #include "protocols.h"
-#include "cmdlft55xx.h"  // read t55xx etc
+#include "cmdlft55xx.h"   // read t55xx etc
+#include "mifare/ndef.h"  // ndef parsing
 
 #define LUA_LIBRARIES_DIRECTORY "lualibs/"
 #define LUA_SCRIPTS_DIRECTORY   "scripts/"
diff --git a/client/scripts/ndef_dump.lua b/client/scripts/ndef_dump.lua
index 0db3108f0..da6b7d806 100644
--- a/client/scripts/ndef_dump.lua
+++ b/client/scripts/ndef_dump.lua
@@ -92,7 +92,7 @@ end
 local function getBlock(blockno)
     local block, err
     local c = Command:newMIX{cmd = cmds.CMD_MIFAREU_READBL, arg1 = blockno, data = 0}
-    block, err = getblockdata(c:sendMIX(false))
+    block, err = getblockdata(c:scr(false))
     if not block then return oops(err) end
     
     if #block < 32 then
@@ -153,8 +153,9 @@ local function main( args)
     end
     -- Block 3 contains number of blocks
     local b3chars = utils.ConvertHexToBytes(blocks[4]);
-    local numBlocks = b3chars[3] * 2 + 6
-    print("Number of blocks:", numBlocks)
+    local t5tarea = b3chars[3] * 8
+    local t5tarea_blocks = t5tarea / 4;
+    print("Number of blocks:", t5tarea_blocks)
 
     -- NDEF compliant?
     if b3chars[1] ~= 0xE1 then
@@ -173,7 +174,7 @@ local function main( args)
     removing bytes from 5 to 18 from each answer.
     --]]
     print('Dumping data...please wait')
-    for i = 4, numBlocks - 1, 1 do
+    for i = 4, t5tarea_blocks - 1, 1 do
         blocks, err = getBlock(i)
         if err then 
             disconnect(); 
@@ -190,6 +191,9 @@ local function main( args)
     print('Manufacturer', info.manufacturer)
     print('Type        ', info.name)
 
+
+    core.ndefparse( t5tarea, true, blockData);
+
     for k,v in ipairs(blockData) do
         print(string.format('Block %02x: %02x %02x %02x %02x', k-1, string.byte(v, 1,4)))
     end

From f4b75d7f5b8485e6eafcfbd510974c54b4e8b69e Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 29 Apr 2019 14:42:37 +0200
Subject: [PATCH 1495/1938] fix: ndef parse uri off by one

---
 client/mifare/ndef.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/client/mifare/ndef.c b/client/mifare/ndef.c
index d44991c0e..df4741dbc 100644
--- a/client/mifare/ndef.c
+++ b/client/mifare/ndef.c
@@ -225,7 +225,12 @@ static int ndefDecodePayload(NDEFHeader_t *ndef) {
             }
 
             if (!strncmp((char *)ndef->Type, "U", ndef->TypeLen)) {
-                PrintAndLogEx(NORMAL, "\turi    : %s%.*s", (ndef->Payload[0] <= 0x23 ? URI_s[ndef->Payload[0]] : "[err]"), ndef->PayloadLen, &ndef->Payload[1]);
+                PrintAndLogEx(NORMAL
+                    , "\turi    : %s%.*s"
+                    , (ndef->Payload[0] <= 0x23 ? URI_s[ndef->Payload[0]] : "[err]")
+                    , ndef->PayloadLen-1
+                    , &ndef->Payload[1]
+                    );
             }
 
             if (!strncmp((char *)ndef->Type, "Sig", ndef->TypeLen)) {
@@ -353,6 +358,5 @@ int NDEFDecodeAndPrint(uint8_t *ndef, size_t ndefLen, bool verbose) {
             }
         }
     }
-
     return 0;
 }

From ea7ad8cbc69106fb8d7b11ce0a17cb36015492fd Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 29 Apr 2019 14:44:08 +0200
Subject: [PATCH 1496/1938] fixes to ndef

---
 client/scripts/ndef_dump.lua | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/scripts/ndef_dump.lua b/client/scripts/ndef_dump.lua
index da6b7d806..8218e414c 100644
--- a/client/scripts/ndef_dump.lua
+++ b/client/scripts/ndef_dump.lua
@@ -92,7 +92,7 @@ end
 local function getBlock(blockno)
     local block, err
     local c = Command:newMIX{cmd = cmds.CMD_MIFAREU_READBL, arg1 = blockno, data = 0}
-    block, err = getblockdata(c:scr(false))
+    block, err = getblockdata(c:sendMIX(false))
     if not block then return oops(err) end
     
     if #block < 32 then
@@ -191,8 +191,8 @@ local function main( args)
     print('Manufacturer', info.manufacturer)
     print('Type        ', info.name)
 
-
-    core.ndefparse( t5tarea, true, blockData);
+    local ndefdata = table.concat(blockData, '', 5)
+    core.ndefparse(t5tarea, 1, ndefdata)
 
     for k,v in ipairs(blockData) do
         print(string.format('Block %02x: %02x %02x %02x %02x', k-1, string.byte(v, 1,4)))

From f4f61fecd674cda12beaba1dd68bcb21e8e458bc Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 29 Apr 2019 14:47:44 +0200
Subject: [PATCH 1497/1938] chg: 'script run ndef_dump' - optional verbose
 ndefparsing

---
 client/scripts/ndef_dump.lua | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/client/scripts/ndef_dump.lua b/client/scripts/ndef_dump.lua
index 8218e414c..d0384a9f7 100644
--- a/client/scripts/ndef_dump.lua
+++ b/client/scripts/ndef_dump.lua
@@ -27,6 +27,7 @@ script run ndef_dump
 Arguments:
     -h              this help
     -d              debug logging on
+    -v              verbose output (from ndef parsing)
 
 ]]
 
@@ -117,9 +118,10 @@ local function main( args)
     dbg('script started')
     local err, data, data2, k, v, i
     -- Read the parameters
-    for o, a in getopt.getopt(args, 'hd') do
+    for o, a in getopt.getopt(args, 'hdv') do
         if o == 'h' then return help() end
         if o == 'd' then DEBUG = true end
+        if o == 'v' then verbose = 1 end
     end
 
     -- First of all, connect
@@ -192,7 +194,7 @@ local function main( args)
     print('Type        ', info.name)
 
     local ndefdata = table.concat(blockData, '', 5)
-    core.ndefparse(t5tarea, 1, ndefdata)
+    core.ndefparse(t5tarea, verbose, ndefdata)
 
     for k,v in ipairs(blockData) do
         print(string.format('Block %02x: %02x %02x %02x %02x', k-1, string.byte(v, 1,4)))

From 50f5b1b4221a1a8f90929c4281dcbdf6f756f875 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 29 Apr 2019 14:49:18 +0200
Subject: [PATCH 1498/1938] intial

---
 client/scripts/ndef_dump.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/scripts/ndef_dump.lua b/client/scripts/ndef_dump.lua
index d0384a9f7..470a91bf2 100644
--- a/client/scripts/ndef_dump.lua
+++ b/client/scripts/ndef_dump.lua
@@ -116,7 +116,7 @@ local function main( args)
     print( string.rep('--',20) )
     
     dbg('script started')
-    local err, data, data2, k, v, i
+    local err, data, data2, k, v, i, verbose = 0
     -- Read the parameters
     for o, a in getopt.getopt(args, 'hdv') do
         if o == 'h' then return help() end

From c4e4e7dc6909ddb6aa8a4f39413dfb3146318476 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 29 Apr 2019 14:55:39 +0200
Subject: [PATCH 1499/1938] text

---
 client/scripts/ndef_dump.lua | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/client/scripts/ndef_dump.lua b/client/scripts/ndef_dump.lua
index 470a91bf2..f17ff21b3 100644
--- a/client/scripts/ndef_dump.lua
+++ b/client/scripts/ndef_dump.lua
@@ -115,8 +115,8 @@ local function main( args)
     print( string.rep('--',20) )
     print( string.rep('--',20) )
     
-    dbg('script started')
-    local err, data, data2, k, v, i, verbose = 0
+    local err, data, data2, k, v, i
+    local verbose = 0
     -- Read the parameters
     for o, a in getopt.getopt(args, 'hdv') do
         if o == 'h' then return help() end
@@ -133,10 +133,10 @@ local function main( args)
     core.clearCommandBuffer()
 
     if info.name:match("Ultralight") then
-        dbg('Found a tag')
+        print('[=]  Found a tag')
     else
         disconnect()
-        return oops('Not a Ultralightbased card. This script reads NDEF formatted UL/NTAGS')
+        return oops('[!]  Not a Ultralightbased card. This script reads NDEF formatted UL/NTAGS')
     end
     
     -- Info contained within the tag (block 0 example)
@@ -157,12 +157,12 @@ local function main( args)
     local b3chars = utils.ConvertHexToBytes(blocks[4]);
     local t5tarea = b3chars[3] * 8
     local t5tarea_blocks = t5tarea / 4;
-    print("Number of blocks:", t5tarea_blocks)
+    print("[=]  Number of blocks:", t5tarea_blocks)
 
     -- NDEF compliant?
     if b3chars[1] ~= 0xE1 then
         disconnect()
-        return oops('This tag is not NDEF-Compliant')
+        return oops('[!]  This tag is not NDEF-Compliant')
     end
 
     local ndefversion = b3chars[2]
@@ -175,7 +175,7 @@ local function main( args)
     the only way to avoid this is to send the read command as many times as block numbers
     removing bytes from 5 to 18 from each answer.
     --]]
-    print('Dumping data...please wait')
+    print('[=]  Dumping data...please wait')
     for i = 4, t5tarea_blocks - 1, 1 do
         blocks, err = getBlock(i)
         if err then 
@@ -187,11 +187,12 @@ local function main( args)
     -- Deactivate field
     disconnect()
     -- Print results
-    print('Tag info')    
-    print('UID         ', info.uid)
-    print('NDEF version', ('%02x'):format(ndefversion))
-    print('Manufacturer', info.manufacturer)
-    print('Type        ', info.name)
+    print('[=]  Tag NDEF info')
+    print('[=]  ------------------------------------------------')
+    print('[=]  UID         ', info.uid)
+    print('[=]  NDEF version', ('%02x'):format(ndefversion))
+    print('[=]  Manufacturer', info.manufacturer)
+    print('[=]  Type        ', info.name)
 
     local ndefdata = table.concat(blockData, '', 5)
     core.ndefparse(t5tarea, verbose, ndefdata)
@@ -203,7 +204,7 @@ local function main( args)
     local filename, err = utils.WriteDumpFile(info.uid, blockData)
     if err then return oops(err) end
 
-    print(string.format('Dumped data into %s', filename))
+    print(string.format('[+]  Dumped data into %s', filename))
 
 end
 main(args)

From 60ea44069ed36d36795874c24443a5d86d78c736 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 29 Apr 2019 14:57:05 +0200
Subject: [PATCH 1500/1938] text

---
 client/scripts/ndef_dump.lua | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/client/scripts/ndef_dump.lua b/client/scripts/ndef_dump.lua
index f17ff21b3..644a251e1 100644
--- a/client/scripts/ndef_dump.lua
+++ b/client/scripts/ndef_dump.lua
@@ -193,10 +193,11 @@ local function main( args)
     print('[=]  NDEF version', ('%02x'):format(ndefversion))
     print('[=]  Manufacturer', info.manufacturer)
     print('[=]  Type        ', info.name)
-
+    print('[=]  ------------------------------------------------')
     local ndefdata = table.concat(blockData, '', 5)
     core.ndefparse(t5tarea, verbose, ndefdata)
-
+    print('[=]  ------------------------------------------------')
+    
     for k,v in ipairs(blockData) do
         print(string.format('Block %02x: %02x %02x %02x %02x', k-1, string.byte(v, 1,4)))
     end

From 9e34a8e56d621e404c89e446a12581c2c706c6d1 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 29 Apr 2019 17:34:24 +0200
Subject: [PATCH 1501/1938] chg: 'hf mfu info' - ndef has 4 byte blocks on
 UL/NTAG

---
 client/cmdhfmfu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index 7b242ace1..6066ebe6e 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -690,7 +690,7 @@ static int ndef_print_CC(uint8_t *data) {
     PrintAndLogEx(NORMAL, "Capability Container: %s", sprint_hex(data, 4));
     PrintAndLogEx(NORMAL, "  %02X : NDEF Magic Number", data[0]);
     PrintAndLogEx(NORMAL, "  %02X : version %d.%d supported by tag", data[1], (data[1] & 0xF0) >> 4, data[1] & 0x0F);
-    PrintAndLogEx(NORMAL, "  %02X : Physical Memory Size: %d bytes", data[2], (data[2] + 1) * 8);
+    PrintAndLogEx(NORMAL, "  %02X : Physical Memory Size: %d bytes", data[2], (data[2] + 1) * 4);
     if (data[2] == 0x96)
         PrintAndLogEx(NORMAL, "  %02X : NDEF Memory Size: %d bytes", data[2], 48);
     else if (data[2] == 0x12)

From 31a531f1d03f926735a1fc29661bfc6dfc82a145 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 29 Apr 2019 17:34:47 +0200
Subject: [PATCH 1502/1938] chg: better ndef parsing and texts

---
 client/scripts/ndef_dump.lua | 87 ++++++++++++++++++++++++++----------
 1 file changed, 64 insertions(+), 23 deletions(-)

diff --git a/client/scripts/ndef_dump.lua b/client/scripts/ndef_dump.lua
index 644a251e1..7bdbd5e1e 100644
--- a/client/scripts/ndef_dump.lua
+++ b/client/scripts/ndef_dump.lua
@@ -32,7 +32,8 @@ Arguments:
 ]]
 
 local DEBUG = true -- the debug flag
-
+local band = bit32.band
+local rshift = bit32.rshift
 ---
 -- A debug printout-function
 local function dbg(args)
@@ -133,10 +134,10 @@ local function main( args)
     core.clearCommandBuffer()
 
     if info.name:match("Ultralight") then
-        print('[=]  Found a tag')
+        print('[=] Found a tag')
     else
         disconnect()
-        return oops('[!]  Not a Ultralightbased card. This script reads NDEF formatted UL/NTAGS')
+        return oops('[!] Not a Ultralightbased card. This script reads NDEF formatted UL/NTAGS')
     end
     
     -- Info contained within the tag (block 0 example)
@@ -154,19 +155,16 @@ local function main( args)
         return oops(err)
     end
     -- Block 3 contains number of blocks
-    local b3chars = utils.ConvertHexToBytes(blocks[4]);
-    local t5tarea = b3chars[3] * 8
+    local b3 = utils.ConvertHexToBytes(blocks[4]);
+    local t5tarea = b3[3] * 8
     local t5tarea_blocks = t5tarea / 4;
-    print("[=]  Number of blocks:", t5tarea_blocks)
 
     -- NDEF compliant?
-    if b3chars[1] ~= 0xE1 then
+    if b3[1] ~= 0xE1 then
         disconnect()
-        return oops('[!]  This tag is not NDEF-Compliant')
+        return oops('[!] This tag is not NDEF-Compliant')
     end
 
-    local ndefversion = b3chars[2]
-
     -- Reuse existing info
     local blockData = {blocks[1], blocks[2], blocks[3], blocks[4]}
 
@@ -175,7 +173,7 @@ local function main( args)
     the only way to avoid this is to send the read command as many times as block numbers
     removing bytes from 5 to 18 from each answer.
     --]]
-    print('[=]  Dumping data...please wait')
+    print('[=] Dumping data...')
     for i = 4, t5tarea_blocks - 1, 1 do
         blocks, err = getBlock(i)
         if err then 
@@ -187,25 +185,68 @@ local function main( args)
     -- Deactivate field
     disconnect()
     -- Print results
-    print('[=]  Tag NDEF info')
-    print('[=]  ------------------------------------------------')
-    print('[=]  UID         ', info.uid)
-    print('[=]  NDEF version', ('%02x'):format(ndefversion))
-    print('[=]  Manufacturer', info.manufacturer)
-    print('[=]  Type        ', info.name)
-    print('[=]  ------------------------------------------------')
+    print('[=] --- Tag NDEF Message info')
+    print('[=] '.. string.rep('--', 50) )
+    print('[=]          Type : ', info.name)
+    print('[=]           UID : ', info.uid)
+    print('[=]  Manufacturer : ', info.manufacturer)
+    print('[=]  Capacity Container : '.. blockData[4])
+    print(('[=]     %02X : NDEF Magic Number'):format(b3[1]) )
+
+    local vLow = band(b3[2], 0xF)
+    local vHi = band(rshift(b3[2], 4), 0xF)
+    print(('[=]     %02X : version %d.%d supported by tag'):format(b3[2], vHi, vLow) )
+    
+    print(('[=]     %02X : Physical Memory Size: %d bytes'):format(b3[3], t5tarea) )
+    if b3[3] == 0x96 then
+       print(('  %02X : NDEF Memory Size: %d bytes'):format(b3[3], 48))
+    elseif b3[3] == 0x12 then
+       print(('  %02X : NDEF Memory Size: %d bytes'):format(b3[3], 144))
+    elseif b3[3] == 0x3E then
+       print(('  %02X : NDEF Memory Size: %d bytes'):format(b3[3], 496))
+    elseif b3[3] == 0x6D then
+       print(('  %02X : NDEF Memory Size: %d bytes'):format(b3[3], 872))
+    end
+
+    local rLow = band(b3[4], 0xF)
+    local rHi = band(rshift(b3[4], 4), 0xF)
+    local wstr, rstr
+
+    if rLow == 0 then
+       wstr = 'Write access granted without any security'
+    elseif rLow == 0x0F then
+       wstr = 'No write access granted at all'
+    else
+       wstr = '(RFU)'
+    end
+
+    if rHi ~= 0x00 then
+       rstr = '(RFU)'
+    else
+       rstr = 'Read access granted without any security'
+    end
+
+    print( ('[=]     %02X : %s / %s'):format(b3[4], rstr, wstr))
+
+    print('[=] '.. string.rep('--', 50) )
     local ndefdata = table.concat(blockData, '', 5)
     core.ndefparse(t5tarea, verbose, ndefdata)
-    print('[=]  ------------------------------------------------')
-    
+    print('[=] '.. string.rep('--', 50) )
+
+    print('')
+    print('[=] Tag dump')
+    print('|---|-------------------|')
     for k,v in ipairs(blockData) do
-        print(string.format('Block %02x: %02x %02x %02x %02x', k-1, string.byte(v, 1,4)))
+
+--        print(string.format('Block %02x: %02x %02x %02x %02x', k-1, string.byte(v, 1,4)))
+	print(string.format(' %02x | %s', k-1, v) )
     end
+   print('|---|-------------------|')
     
     local filename, err = utils.WriteDumpFile(info.uid, blockData)
     if err then return oops(err) end
 
-    print(string.format('[+]  Dumped data into %s', filename))
+    print(string.format('[+] Dumped data into %s', filename))
 
 end
-main(args)
+main(args)
\ No newline at end of file

From b08b1c2cd9e26a5a1bb2739c630fd1b4cd1ca96e Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 29 Apr 2019 18:58:27 +0200
Subject: [PATCH 1503/1938] chg: 'hf mfu info' - ndef parsing was a bit wrong

---
 client/cmdhfmfu.c | 66 +++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 61 insertions(+), 5 deletions(-)

diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index 6066ebe6e..ab805020e 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -686,11 +686,56 @@ static int ndef_print_CC(uint8_t *data) {
     if (data[0] != 0xE1)
         return -1;
 
+// b7, b6 major version
+// b5, b4 minor version
+// b3, b2 read
+// 00 always, 01 rfu, 10 proprietary, 11 rfu
+// b1, b0 write
+// 00 always, 01 rfo, 10 proprietary, 11 never
+    uint8_t write = data[1] & 0x03;
+    uint8_t read  = (data[1] & 0x0C) >> 2;
+    uint8_t minor = (data[1] & 0x30) >> 4;
+    uint8_t major = (data[1] & 0xC0) >> 6;
+
+   char wStr[50];
+   switch ( write ) {
+       case 0:
+        sprintf(wStr, "Write access granted without any security");
+        break;
+       case 1:
+        sprintf(wStr, "RFU");
+        break;
+       case 2:
+        sprintf(wStr, "Proprietary");
+        break;
+       case 3:
+        sprintf(wStr, "No write access");
+        break;
+   }
+   char rStr[46];
+   switch ( read ) {
+       case 0:
+        sprintf(rStr, "Read access granted without any security");
+        break;
+       case 1:
+       case 3:
+        sprintf(rStr, "RFU");
+        break;
+       case 2:
+        sprintf(rStr, "Proprietary");
+        break;
+   }
+
+
     PrintAndLogEx(NORMAL, "--- NDEF Message");
     PrintAndLogEx(NORMAL, "Capability Container: %s", sprint_hex(data, 4));
     PrintAndLogEx(NORMAL, "  %02X : NDEF Magic Number", data[0]);
-    PrintAndLogEx(NORMAL, "  %02X : version %d.%d supported by tag", data[1], (data[1] & 0xF0) >> 4, data[1] & 0x0F);
-    PrintAndLogEx(NORMAL, "  %02X : Physical Memory Size: %d bytes", data[2], (data[2] + 1) * 4);
+
+//    PrintAndLogEx(NORMAL, "  %02X : version %d.%d supported by tag", data[1], (data[1] & 0xF0) >> 4, data[1] & 0x0F);
+    PrintAndLogEx(NORMAL, "  %02X : version %d.%d supported by tag", data[1], major, minor);
+    PrintAndLogEx(NORMAL, "       : %s / %s", rStr, wStr);
+    
+    PrintAndLogEx(NORMAL, "  %02X : Physical Memory Size: %d bytes", data[2], data[2] * 8);
     if (data[2] == 0x96)
         PrintAndLogEx(NORMAL, "  %02X : NDEF Memory Size: %d bytes", data[2], 48);
     else if (data[2] == 0x12)
@@ -700,9 +745,20 @@ static int ndef_print_CC(uint8_t *data) {
     else if (data[2] == 0x6D)
         PrintAndLogEx(NORMAL, "  %02X : NDEF Memory Size: %d bytes", data[2], 872);
 
-    PrintAndLogEx(NORMAL, "  %02X : %s / %s", data[3],
-                  (data[3] & 0xF0) ? "(RFU)" : "Read access granted without any security",
-                  (data[3] & 0x0F) == 0 ? "Write access granted without any security" : (data[3] & 0x0F) == 0x0F ? "No write access granted at all" : "(RFU)");
+    uint8_t msb3   = (data[3] & 0xE0) >> 5;
+    uint8_t sf     = (data[3] & 0x10) >> 4;
+    uint8_t lb     = (data[3] & 0x08) >> 3;
+    uint8_t mlrule = (data[3] & 0x06) >> 1;
+    uint8_t mbread = (data[3] & 0x01);    
+
+    PrintAndLogEx(NORMAL, "  Additional feature information");
+    PrintAndLogEx(NORMAL, "  %02X", data[3]);
+    PrintAndLogEx(NORMAL, "  00000000"); 
+    PrintAndLogEx(NORMAL, "  xxx      - %02X : RFU (%s)", msb3, (msb3 == 0) ? _GREEN_("OK") : _RED_("Fail"));
+    PrintAndLogEx(NORMAL, "     x     - %02X : %s special frame", sf, (sf) ? "support" : "don\'t support");
+    PrintAndLogEx(NORMAL, "      x    - %02X : %s lock block", lb, (lb) ? "support" : "don\'t support");
+    PrintAndLogEx(NORMAL, "       xx  - %02X : RFU (%s)", mlrule, (mlrule == 0) ? _GREEN_("OK") : _RED_("Fail"));
+    PrintAndLogEx(NORMAL, "         x - %02X : IC %s multiple block reads", mbread, (mbread) ? "support" : "don\'t support");
     return 0;
 }
 

From fc6be9fea49d675a36109aafb8576b599248b454 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Mon, 29 Apr 2019 22:38:26 +0200
Subject: [PATCH 1504/1938] Define USB_CMD_DATA_SIZE_MIX

---
 client/comms.c    | 2 +-
 include/usb_cmd.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/comms.c b/client/comms.c
index b08345db3..4840a6b4a 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -173,7 +173,7 @@ void SendCommandNG(uint16_t cmd, uint8_t *data, size_t len) {
 
 void SendCommandMIX(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len) {
     uint64_t arg[3] = {arg0, arg1, arg2};
-    if (len > USB_CMD_DATA_SIZE - sizeof(arg)) {
+    if (len > USB_CMD_DATA_SIZE_MIX) {
         PrintAndLogEx(WARNING, "Sending %d bytes of payload is too much for MIX frames, abort", len);
         return;
     }
diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index 75ceb8515..f40a71dbc 100644
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -28,6 +28,7 @@ typedef BYTE uint8_t;
 #endif
 
 #define USB_CMD_DATA_SIZE 512
+#define USB_CMD_DATA_SIZE_MIX ( USB_CMD_DATA_SIZE - 3 * sizeof(uint64_t) )
 
 typedef struct {
     uint64_t cmd;

From ac9f3b29f6babf3953ec9971492113b20e20f6cc Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Mon, 29 Apr 2019 22:38:54 +0200
Subject: [PATCH 1505/1938] better COMMS_DEBUG_RAW

---
 client/comms.c | 44 ++++++++++++++++++++++++++++++++------------
 1 file changed, 32 insertions(+), 12 deletions(-)

diff --git a/client/comms.c b/client/comms.c
index 4840a6b4a..7cd92f14b 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -68,10 +68,12 @@ bool IsOffline() {
 void SendCommand(PacketCommandOLD *c) {
 
 #ifdef COMMS_DEBUG
-    PrintAndLogEx(NORMAL, "Sending %d bytes | cmd %04x", sizeof(PacketCommandOLD), c->cmd);
+    PrintAndLogEx(NORMAL, "Sending %s", "OLD");
 #endif
 #ifdef COMMS_DEBUG_RAW
-    print_hex_break((uint8_t *)c, sizeof(PacketCommandOLD), 32);
+    print_hex_break((uint8_t *)&c->cmd, sizeof(c->cmd), 32);
+    print_hex_break((uint8_t *)&c->arg, sizeof(c->arg), 32);
+    print_hex_break((uint8_t *)&c->d, sizeof(c->d), 32);
 #endif
 
     if (offline) {
@@ -114,7 +116,7 @@ void SendCommandOLD(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, v
 
 static void SendCommandNG_internal(uint16_t cmd, uint8_t *data, size_t len, bool ng) {
 #ifdef COMMS_DEBUG
-    PrintAndLogEx(NORMAL, "Sending %d bytes of payload | cmd %04x", len, cmd);
+    PrintAndLogEx(NORMAL, "Sending %s", ng ? "NG" : "MIX");
 #endif
 
     if (offline) {
@@ -155,7 +157,14 @@ static void SendCommandNG_internal(uint16_t cmd, uint8_t *data, size_t len, bool
     txBufferNGLen = sizeof(PacketCommandNGPreamble) + len + sizeof(PacketCommandNGPostamble);
 
 #ifdef COMMS_DEBUG_RAW
-    print_hex_break((uint8_t *)&txBufferNG, txBufferNGLen, 32);
+    print_hex_break((uint8_t *)&txBufferNG.pre, sizeof(PacketCommandNGPreamble), 32);
+    if (ng) {
+        print_hex_break((uint8_t *)&txBufferNG.data, len, 32);
+    } else {
+        print_hex_break((uint8_t *)&txBufferNG.data, 3 * sizeof(uint64_t), 32);
+        print_hex_break((uint8_t *)&txBufferNG.data + 3 * sizeof(uint64_t), len - 3 * sizeof(uint64_t), 32);
+    }
+    print_hex_break((uint8_t *)&tx_post, sizeof(PacketCommandNGPostamble), 32);
 #endif
     txBuffer_pending = true;
 
@@ -232,12 +241,6 @@ static int getReply(PacketResponseNG *packet) {
 
     //Pick out the next unread command
     memcpy(packet, &rxBuffer[cmd_tail], sizeof(PacketResponseNG));
-#ifdef COMMS_DEBUG
-    PrintAndLogEx(NORMAL, "Receiving");
-#endif
-#ifdef COMMS_DEBUG_RAW
-    print_hex_break((uint8_t *)packet, sizeof(PacketResponseNG), 32);
-#endif
 
     //Increment tail - this is a circular buffer, so modulo buffer size
     cmd_tail = (cmd_tail + 1) % CMD_BUFFER_SIZE;
@@ -456,7 +459,14 @@ __attribute__((force_align_arg_pointer))
                     }
                 }
                 if (!error) {
-//                    PrintAndLogEx(NORMAL, "Received reply NG full !!");
+#ifdef COMMS_DEBUG
+                    PrintAndLogEx(NORMAL, "Receiving %s:", rx.ng ? "NG" : "MIX");
+#endif
+#ifdef COMMS_DEBUG_RAW
+                    print_hex_break((uint8_t *)&rx_raw.pre, sizeof(PacketResponseNGPreamble), 32);
+                    print_hex_break((uint8_t *)&rx_raw.data, rx_raw.pre.length, 32);
+                    print_hex_break((uint8_t *)&rx_raw.foopost, sizeof(PacketResponseNGPostamble), 32);
+#endif
                     PacketResponseReceived(&rx);
                 }
             } else {                               // Old style reply
@@ -467,7 +477,14 @@ __attribute__((force_align_arg_pointer))
                     error = true;
                 }
                 if (!error) {
-//                    PrintAndLogEx(NORMAL, "Received reply old full !!");
+#ifdef COMMS_DEBUG
+                    PrintAndLogEx(NORMAL, "Receiving OLD:");
+#endif
+#ifdef COMMS_DEBUG_RAW
+                    print_hex_break((uint8_t *)&rx_old.cmd, sizeof(rx_old.cmd), 32);
+                    print_hex_break((uint8_t *)&rx_old.arg, sizeof(rx_old.arg), 32);
+                    print_hex_break((uint8_t *)&rx_old.d, sizeof(rx_old.d), 32);
+#endif
                     rx.ng = false;
                     rx.magic = 0;
                     rx.status = 0;
@@ -498,6 +515,9 @@ __attribute__((force_align_arg_pointer))
             // if we just received an ACK, wait here until a new command is to be transmitted
             // This is only working on OLD frames, and only used by flasher and flashmem
             if (ACK_received) {
+#ifdef COMMS_DEBUG
+                PrintAndLogEx(NORMAL, "Received ACK, fast TX mode: ignoring other RX till TX");
+#endif
                 while (!txBuffer_pending) {
                     pthread_cond_wait(&txBufferSig, &txBufferMutex);
                 }

From 32a512b13e1cd812998d74a8fe98a6e0b10355e7 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Mon, 29 Apr 2019 22:39:18 +0200
Subject: [PATCH 1506/1938] Support break_after_ACK for MIX frames

---
 client/comms.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/client/comms.c b/client/comms.c
index 7cd92f14b..ffe1aa974 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -437,6 +437,9 @@ __attribute__((force_align_arg_pointer))
                                 rx.oldarg[2] = arg[2];
                                 memcpy(&rx.data, ((uint8_t *)&rx_raw.data) + sizeof(arg), length - sizeof(arg));
                                 rx.length = length - sizeof(arg);
+                                if (rx.cmd == CMD_ACK) {
+                                    ACK_received = true;
+                                }
                             }
                         }
                     }

From 35ea8e745e666d3ca4dc6995108aaccd2a7d07b8 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Mon, 29 Apr 2019 22:39:42 +0200
Subject: [PATCH 1507/1938] Faster CmdHF14AMfChk

---
 client/cmdhfmf.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 45be7c2bc..abd754708 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -1938,6 +1938,8 @@ static int CmdHF14AMfChk(const char *Cmd) {
     // time
     uint64_t t1 = msclock();
 
+    // fast push mode
+    conn.block_after_ACK = true;
 
     // check keys.
     for (trgKeyType = (keyType == 2) ? 0 : keyType; trgKeyType < 2; (keyType == 2) ? (++trgKeyType) : (trgKeyType = 2)) {
@@ -2011,6 +2013,10 @@ static int CmdHF14AMfChk(const char *Cmd) {
     }
 
 out:
+    // Disable fast mode and send a dummy command to make it effective
+    conn.block_after_ACK = false;
+    SendCommandMIX(CMD_PING, 0, 0, 0, NULL, 0);
+    WaitForResponseTimeout(CMD_ACK, NULL, 1000);
 
     //print keys
     printKeyTable(SectorsCnt, e_sector);

From 73b6fa7cbc38bcf03c57fc520bfd9114a9715c09 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Mon, 29 Apr 2019 22:40:10 +0200
Subject: [PATCH 1508/1938] Simpler newfilenamemcopy

---
 client/loclass/fileutils.c | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index 5e3b423f7..a592e7dfc 100644
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -73,24 +73,19 @@ static char *filenamemcopy(const char *preferredName, const char *suffix) {
 static char *newfilenamemcopy(const char *preferredName, const char *suffix) {
     if (preferredName == NULL) return NULL;
     if (suffix == NULL) return NULL;
-    char *preferredNameTmp = (char *) calloc(strlen(preferredName) + 1, sizeof(uint8_t));
-    if (preferredNameTmp == NULL)
-        return NULL;
-    strcpy(preferredNameTmp, preferredName);
-    if (str_endswith(preferredNameTmp, suffix))
-        preferredNameTmp[strlen(preferredNameTmp) - strlen(suffix)] = '\0';
-    char *fileName = (char *) calloc(strlen(preferredNameTmp) + strlen(suffix) + 1 + 10, sizeof(uint8_t)); // 10: room for filenum to ensure new filename
+    uint16_t preferredNameLen = strlen(preferredName);
+    if (str_endswith(preferredName, suffix))
+        preferredNameLen -= strlen(suffix);
+    char *fileName = (char *) calloc(preferredNameLen + strlen(suffix) + 1 + 10, sizeof(uint8_t)); // 10: room for filenum to ensure new filename
     if (fileName == NULL) {
-        free(preferredNameTmp);
         return NULL;
     }
     int num = 1;
-    sprintf(fileName, "%s%s", preferredNameTmp, suffix);
+    sprintf(fileName, "%.*s%s", preferredNameLen, preferredName, suffix);
     while (fileExists(fileName)) {
-        sprintf(fileName, "%s-%d%s", preferredNameTmp, num, suffix);
+        sprintf(fileName, "%.*s-%d%s", preferredNameLen, preferredName, num, suffix);
         num++;
     }
-    free(preferredNameTmp);
     return fileName;
 }
 

From 61525e7e891981ed5a7971a711d94333124b705a Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Mon, 29 Apr 2019 22:40:36 +0200
Subject: [PATCH 1509/1938] update ng doc

---
 doc/new_frame_format.txt | 40 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/doc/new_frame_format.txt b/doc/new_frame_format.txt
index e6e3e0f69..c8383a3bc 100644
--- a/doc/new_frame_format.txt
+++ b/doc/new_frame_format.txt
@@ -123,7 +123,10 @@ void SendCommandMIX(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, v
 *****************************************
 
 So cmds should make the transition from SendCommandOLD to SendCommandNG to benefit from smaller frames (and armsrc handlers adjusted accordingly of course).
-SendCommandMIX is a transition fct: it uses the same API as SendCommandOLD but benefits somehow from variable length frames. It occupies at least 24b of data for the oldargs and real data is therefore limited to USB_CMD_DATA_SIZE - 24. Besides the size limitation, the receiver handler doesn't know if this was an OLD frame or a MIX frame, it gets its oldargs and data as usual.
+SendCommandMIX is a transition fct: it uses the same API as SendCommandOLD but benefits somehow from variable length frames. It occupies at least 24b of data for the oldargs and real data is therefore limited to USB_CMD_DATA_SIZE - 24 (defined as USB_CMD_DATA_SIZE_MIX). Besides the size limitation, the receiver handler doesn't know if this was an OLD frame or a MIX frame, it gets its oldargs and data as usual.
+Warning : it makes sense to move from SendCommandOLD to SendCommandMIX only for *commands with small payloads*.
+* otherwise both have about the same size
+* SendCommandMIX has a smaller payload (USB_CMD_DATA_SIZE_MIX < USB_CMD_DATA_SIZE) so it's risky to blindly move from OLD to MIX if there is a large payload.
 
 Internally these functions prepare the new or old frames and call uart_communication which calls uart_send.
 
@@ -348,6 +351,41 @@ time client/proxmark3 -p /dev/ttyUSB0 -b 115200 -c "mem save f foo_fpc"
 25.34s
 
 
+Sending multiple commands can still be slow because it waits regularly for incoming RX frames and the timings are quite conservative because of BT (see struct timeval timeout in uart_posix.c, now at 200ms). When one knows there is no response to wait before the next command, he can use the same trick as in the flasher:
+
+    // fast push mode
+    conn.block_after_ACK = true;
+    some loop {
+        if (sending_last_command)
+            // Disable fast mode
+            conn.block_after_ACK = false;
+        SendCommandOLD / SendCommandMix
+        if (!WaitForResponseTimeout(CMD_ACK, &resp, some_timeout)) {
+            ....
+            conn.block_after_ACK = false;
+            return PM3_ETIMEOUT;
+        }
+    }
+    return PM3_SUCCESS;
+
+Or if it's too complex to determine when we're sending the last command:
+
+    // fast push mode
+    conn.block_after_ACK = true;
+    some loop {
+        SendCommandOLD / SendCommandMIX
+        if (!WaitForResponseTimeout(CMD_ACK, &resp, some_timeout)) {
+            ....
+            conn.block_after_ACK = false;
+            return PM3_ETIMEOUT;
+        }
+    }
+    // Disable fast mode and send a dummy command to make it effective
+    conn.block_after_ACK = false;
+    SendCommandMIX(CMD_PING, 0, 0, 0, NULL, 0);
+    WaitForResponseTimeout(CMD_ACK, NULL, 1000);
+    return PM3_SUCCESS;
+
 
 Reference frames
 ================

From 56f92348ea3dac026cb4fd1897c1278ab286eeb4 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Mon, 29 Apr 2019 22:41:28 +0200
Subject: [PATCH 1510/1938] style

---
 armsrc/appmain.c             |  2 +-
 client/cmdhfmfu.c            | 62 ++++++++++++++++++------------------
 client/lualibs/commands.lua  |  2 +-
 client/lualibs/read14a.lua   |  2 +-
 client/mifare/ndef.c         | 10 +++---
 client/scripting.c           |  8 ++---
 client/scripts/mfkeys.lua    | 10 +++---
 client/scripts/ndef_dump.lua | 20 ++++++------
 8 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index b7c167730..ce716f026 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -949,7 +949,7 @@ static void PacketReceived(PacketCommandNG *packet) {
             MifareNested(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
             break;
         case CMD_MIFARE_CHKKEYS: {
-            MifareChkKeys(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes, packet->ng);            
+            MifareChkKeys(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes, packet->ng);
             break;
         }
         case CMD_MIFARE_CHKKEYS_FAST: {
diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index ab805020e..3246960d6 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -697,34 +697,34 @@ static int ndef_print_CC(uint8_t *data) {
     uint8_t minor = (data[1] & 0x30) >> 4;
     uint8_t major = (data[1] & 0xC0) >> 6;
 
-   char wStr[50];
-   switch ( write ) {
-       case 0:
-        sprintf(wStr, "Write access granted without any security");
-        break;
-       case 1:
-        sprintf(wStr, "RFU");
-        break;
-       case 2:
-        sprintf(wStr, "Proprietary");
-        break;
-       case 3:
-        sprintf(wStr, "No write access");
-        break;
-   }
-   char rStr[46];
-   switch ( read ) {
-       case 0:
-        sprintf(rStr, "Read access granted without any security");
-        break;
-       case 1:
-       case 3:
-        sprintf(rStr, "RFU");
-        break;
-       case 2:
-        sprintf(rStr, "Proprietary");
-        break;
-   }
+    char wStr[50];
+    switch (write) {
+        case 0:
+            sprintf(wStr, "Write access granted without any security");
+            break;
+        case 1:
+            sprintf(wStr, "RFU");
+            break;
+        case 2:
+            sprintf(wStr, "Proprietary");
+            break;
+        case 3:
+            sprintf(wStr, "No write access");
+            break;
+    }
+    char rStr[46];
+    switch (read) {
+        case 0:
+            sprintf(rStr, "Read access granted without any security");
+            break;
+        case 1:
+        case 3:
+            sprintf(rStr, "RFU");
+            break;
+        case 2:
+            sprintf(rStr, "Proprietary");
+            break;
+    }
 
 
     PrintAndLogEx(NORMAL, "--- NDEF Message");
@@ -734,7 +734,7 @@ static int ndef_print_CC(uint8_t *data) {
 //    PrintAndLogEx(NORMAL, "  %02X : version %d.%d supported by tag", data[1], (data[1] & 0xF0) >> 4, data[1] & 0x0F);
     PrintAndLogEx(NORMAL, "  %02X : version %d.%d supported by tag", data[1], major, minor);
     PrintAndLogEx(NORMAL, "       : %s / %s", rStr, wStr);
-    
+
     PrintAndLogEx(NORMAL, "  %02X : Physical Memory Size: %d bytes", data[2], data[2] * 8);
     if (data[2] == 0x96)
         PrintAndLogEx(NORMAL, "  %02X : NDEF Memory Size: %d bytes", data[2], 48);
@@ -749,11 +749,11 @@ static int ndef_print_CC(uint8_t *data) {
     uint8_t sf     = (data[3] & 0x10) >> 4;
     uint8_t lb     = (data[3] & 0x08) >> 3;
     uint8_t mlrule = (data[3] & 0x06) >> 1;
-    uint8_t mbread = (data[3] & 0x01);    
+    uint8_t mbread = (data[3] & 0x01);
 
     PrintAndLogEx(NORMAL, "  Additional feature information");
     PrintAndLogEx(NORMAL, "  %02X", data[3]);
-    PrintAndLogEx(NORMAL, "  00000000"); 
+    PrintAndLogEx(NORMAL, "  00000000");
     PrintAndLogEx(NORMAL, "  xxx      - %02X : RFU (%s)", msb3, (msb3 == 0) ? _GREEN_("OK") : _RED_("Fail"));
     PrintAndLogEx(NORMAL, "     x     - %02X : %s special frame", sf, (sf) ? "support" : "don\'t support");
     PrintAndLogEx(NORMAL, "      x    - %02X : %s lock block", lb, (lb) ? "support" : "don\'t support");
diff --git a/client/lualibs/commands.lua b/client/lualibs/commands.lua
index a9a2a95e9..8f87d81fb 100644
--- a/client/lualibs/commands.lua
+++ b/client/lualibs/commands.lua
@@ -196,7 +196,7 @@ function Command:sendNG( ignore_response, timeout )
 
 --[[  uncomment if you want to debug
 
-    -- lets digest response NG package.  
+    -- lets digest response NG package.
     local data
     local count, cmd, length, magic, status, crc, arg1, arg2, arg3 = bin.unpack('SSIsSLLL', response)
     count, data, ng = bin.unpack('H'..length..'C', response, count)
diff --git a/client/lualibs/read14a.lua b/client/lualibs/read14a.lua
index 8473278f8..60c904d4a 100644
--- a/client/lualibs/read14a.lua
+++ b/client/lualibs/read14a.lua
@@ -67,7 +67,7 @@ local function parse14443a(data)
     uid = uid:sub(1, 2 * uidlen)
     local man_byte = tonumber(uid:sub(1,2), 16)
 
-    return { 
+    return {
         uid = uid,
         atqa  = atqa,
         sak = sak,
diff --git a/client/mifare/ndef.c b/client/mifare/ndef.c
index df4741dbc..7d0100d70 100644
--- a/client/mifare/ndef.c
+++ b/client/mifare/ndef.c
@@ -226,11 +226,11 @@ static int ndefDecodePayload(NDEFHeader_t *ndef) {
 
             if (!strncmp((char *)ndef->Type, "U", ndef->TypeLen)) {
                 PrintAndLogEx(NORMAL
-                    , "\turi    : %s%.*s"
-                    , (ndef->Payload[0] <= 0x23 ? URI_s[ndef->Payload[0]] : "[err]")
-                    , ndef->PayloadLen-1
-                    , &ndef->Payload[1]
-                    );
+                              , "\turi    : %s%.*s"
+                              , (ndef->Payload[0] <= 0x23 ? URI_s[ndef->Payload[0]] : "[err]")
+                              , ndef->PayloadLen - 1
+                              , &ndef->Payload[1]
+                             );
             }
 
             if (!strncmp((char *)ndef->Type, "Sig", ndef->TypeLen)) {
diff --git a/client/scripting.c b/client/scripting.c
index 59a03025f..cb086832d 100644
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -969,11 +969,11 @@ static int l_ndefparse(lua_State *L) {
     if (data == 0) {
         return returnToLuaWithError(L, "Allocating memory failed");
     }
-    
+
     // data
     const char *p_data = luaL_checklstring(L, 3, &size);
     if (size) {
-        if (size > (datalen << 1) )
+        if (size > (datalen << 1))
             size = (datalen << 1);
 
         uint32_t tmp;
@@ -983,7 +983,7 @@ static int l_ndefparse(lua_State *L) {
             len++;
         }
     }
-    
+
     int res = NDEFDecodeAndPrint(data, datalen, verbose);
     lua_pushinteger(L, res);
     return 1;
@@ -1048,7 +1048,7 @@ int set_pm3_libraries(lua_State *L) {
         {"keygen_algo_d",               l_keygen_algoD},
         {"t55xx_readblock",             l_T55xx_readblock},
         {"t55xx_detect",                l_T55xx_detect},
-        {"ndefparse"   ,                l_ndefparse},
+        {"ndefparse",                l_ndefparse},
         {NULL, NULL}
     };
 
diff --git a/client/scripts/mfkeys.lua b/client/scripts/mfkeys.lua
index a8426fda5..bfc221ca1 100644
--- a/client/scripts/mfkeys.lua
+++ b/client/scripts/mfkeys.lua
@@ -57,7 +57,7 @@ local function checkCommand(response)
         print("Timeout while waiting for response. Increase TIMEOUT in mfkeys.lua to wait longer")
         return nil, "Timeout while waiting for device to respond"
     end
-   
+
     local data
     local count, cmd, length, magic, status, crc, arg1, arg2, arg3 = bin.unpack('SSIsSLLL', response)
     count, data, ng = bin.unpack('H'..length..'C', response, count)
@@ -66,7 +66,7 @@ local function checkCommand(response)
         key = data:sub(1, 12)
         return key
     end
-    
+
     return nil
 end
 
@@ -83,20 +83,20 @@ local function checkBlock(blockno, testkeys, keytype)
     local chunksize = remaining
     if remaining > maxchunk then chunksize = maxchunk end
     local n = chunksize
-    
+
     while remaining > 0 do
 --        print('start', start, 'chunksize', chunksize, 'testkeys kvar', remaining, 'N-index=', n)
 
         local d0 = ('%04X%02X%02X'):format(arg1, arg2, chunksize)
         local d1 = table.concat(testkeys, "", start, n)
-	
+
         core.clearCommandBuffer()
 
         print(("Testing block %d, keytype %d, with %d keys"):format(blockno, keytype, chunksize))
 
         local c = Command:newNG{cmd = cmds.CMD_MIFARE_CHKKEYS, data = d0..d1}
         key, err = checkCommand(c:sendNG(false, TIMEOUT))
-	
+
         if key then return key, blockno end
 
         start = start + chunksize
diff --git a/client/scripts/ndef_dump.lua b/client/scripts/ndef_dump.lua
index 7bdbd5e1e..d162e35cf 100644
--- a/client/scripts/ndef_dump.lua
+++ b/client/scripts/ndef_dump.lua
@@ -80,7 +80,7 @@ local function getblockdata(response)
     if not response then
         return nil, 'No response from device'
     end
-    
+
     local count, cmd, arg0, arg1, arg2, data = bin.unpack('LLLLH40', response)
     if arg0 == 1 then
         return data:sub(1, 32)
@@ -96,7 +96,7 @@ local function getBlock(blockno)
     local c = Command:newMIX{cmd = cmds.CMD_MIFAREU_READBL, arg1 = blockno, data = 0}
     block, err = getblockdata(c:sendMIX(false))
     if not block then return oops(err) end
-    
+
     if #block < 32 then
         return nil, ('Expected at least 16 bytes, got %d - this tag is not NDEF-compliant'):format(string.len(data))
     end
@@ -115,7 +115,7 @@ local function main( args)
 
     print( string.rep('--',20) )
     print( string.rep('--',20) )
-    
+
     local err, data, data2, k, v, i
     local verbose = 0
     -- Read the parameters
@@ -127,7 +127,7 @@ local function main( args)
 
     -- First of all, connect
     info, err = lib14a.read(true, true)
-    if err then 
+    if err then
         disconnect();
         return oops(err)
     end
@@ -139,7 +139,7 @@ local function main( args)
         disconnect()
         return oops('[!] Not a Ultralightbased card. This script reads NDEF formatted UL/NTAGS')
     end
-    
+
     -- Info contained within the tag (block 0 example)
     -- 0534 00B9 049C AD7F 4A00 0000 E110 1000 2155
     -- b0b0 b0b0 b1b1 b1b1 b2b2 b2b2 b3b3 b3b3 CRCC
@@ -176,8 +176,8 @@ local function main( args)
     print('[=] Dumping data...')
     for i = 4, t5tarea_blocks - 1, 1 do
         blocks, err = getBlock(i)
-        if err then 
-            disconnect(); 
+        if err then
+            disconnect();
             return oops(err)
         end
         table.insert(blockData, blocks[1])
@@ -196,7 +196,7 @@ local function main( args)
     local vLow = band(b3[2], 0xF)
     local vHi = band(rshift(b3[2], 4), 0xF)
     print(('[=]     %02X : version %d.%d supported by tag'):format(b3[2], vHi, vLow) )
-    
+
     print(('[=]     %02X : Physical Memory Size: %d bytes'):format(b3[3], t5tarea) )
     if b3[3] == 0x96 then
        print(('  %02X : NDEF Memory Size: %d bytes'):format(b3[3], 48))
@@ -242,11 +242,11 @@ local function main( args)
 	print(string.format(' %02x | %s', k-1, v) )
     end
    print('|---|-------------------|')
-    
+
     local filename, err = utils.WriteDumpFile(info.uid, blockData)
     if err then return oops(err) end
 
     print(string.format('[+] Dumped data into %s', filename))
 
 end
-main(args)
\ No newline at end of file
+main(args)

From f4d62eec09ce9a6575f6b1d0f7056e93a99ee155 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Mon, 29 Apr 2019 23:02:49 +0200
Subject: [PATCH 1511/1938] Fix COMMS_DEBUG_RAW

---
 client/comms.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/comms.c b/client/comms.c
index ffe1aa974..2cb397007 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -164,7 +164,7 @@ static void SendCommandNG_internal(uint16_t cmd, uint8_t *data, size_t len, bool
         print_hex_break((uint8_t *)&txBufferNG.data, 3 * sizeof(uint64_t), 32);
         print_hex_break((uint8_t *)&txBufferNG.data + 3 * sizeof(uint64_t), len - 3 * sizeof(uint64_t), 32);
     }
-    print_hex_break((uint8_t *)&tx_post, sizeof(PacketCommandNGPostamble), 32);
+    print_hex_break((uint8_t *)tx_post, sizeof(PacketCommandNGPostamble), 32);
 #endif
     txBuffer_pending = true;
 

From a91d0a7b194159d541aa86c650f762267952c730 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 30 Apr 2019 00:41:52 +0200
Subject: [PATCH 1512/1938] Smart color handling:

* if on Windows, no color, as usual
* if on Linux, color only on real term
  * no color when > foo
  * no color in the logfile
---
 armsrc/mifareutil.h  |  2 +-
 armsrc/util.h        |  7 +----
 client/comms.c       | 57 ++++++++----------------------------
 client/emv/emvjson.h |  1 -
 client/fido/cose.h   |  1 -
 client/proxmark3.c   | 30 +++++++++----------
 client/ui.c          | 70 +++++++++++++++++++++++++++++++++++++++-----
 client/ui.h          |  1 +
 client/util.h        | 37 +----------------------
 common/commonutil.h  |  7 +++++
 10 files changed, 101 insertions(+), 112 deletions(-)

diff --git a/armsrc/mifareutil.h b/armsrc/mifareutil.h
index 7d384fff9..110f41eaa 100644
--- a/armsrc/mifareutil.h
+++ b/armsrc/mifareutil.h
@@ -15,7 +15,7 @@
 #include "proxmark3.h"
 #include "apps.h"
 #include "parity.h"
-#include "commonutil.h"
+#include "util.h"
 #include "string.h"
 #include "iso14443a.h"
 #include "crapto1/crapto1.h"
diff --git a/armsrc/util.h b/armsrc/util.h
index c01915195..1ea6ae741 100644
--- a/armsrc/util.h
+++ b/armsrc/util.h
@@ -12,18 +12,13 @@
 #define __UTIL_H
 
 #include "common.h"
+#include "commonutil.h"
 #include "proxmark3.h"
 #include "string.h"
 #include "BigBuf.h"
 #include "ticks.h"
 
 // Basic macros
-# define _BLUE_(s) "\x1b[34m" s "\x1b[0m "
-# define _RED_(s) "\x1b[31m" s "\x1b[0m "
-# define _GREEN_(s) "\x1b[32m" s "\x1b[0m "
-# define _YELLOW_(s) "\x1b[33m" s "\x1b[0m "
-# define _MAGENTA_(s) "\x1b[35m" s "\x1b[0m "
-# define _CYAN_(s) "\x1b[36m" s "\x1b[0m "
 
 #ifndef SHORT_COIL
 #define SHORT_COIL()     LOW(GPIO_SSC_DOUT)
diff --git a/client/comms.c b/client/comms.c
index 2cb397007..e3bb602bb 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -11,6 +11,10 @@
 
 #include "comms.h"
 #include "crc16.h"
+#if defined(__linux__) || (__APPLE__)
+#include <sys/stat.h>
+#include <unistd.h>
+#endif
 
 //#define COMMS_DEBUG
 //#define COMMS_DEBUG_RAW
@@ -249,48 +253,6 @@ static int getReply(PacketResponseNG *packet) {
     return 1;
 }
 
-static void memcpy_filtered(void *dest, const void *src, size_t n, bool filter) {
-#if defined(__linux__) || (__APPLE__)
-    memcpy(dest, src, n);
-#else
-    if (filter) {
-        // Filter out ANSI sequences on these OS
-        uint8_t *rdest = (uint8_t *)dest;
-        uint8_t *rsrc = (uint8_t *)src;
-        uint16_t si = 0;
-        for (uint16_t i = 0; i < n; i++) {
-            if ((rsrc[i] == '\x1b')
-                    && (i < n - 1)
-                    && (rsrc[i + 1] >= 0x40)
-                    && (rsrc[i + 1] <= 0x5F)) {  // entering ANSI sequence
-
-                i++;
-                if ((rsrc[i] == '[') && (i < n - 1)) { // entering CSI sequence
-                    i++;
-
-                    while ((i < n - 1) && (rsrc[i] >= 0x30) && (rsrc[i] <= 0x3F)) { // parameter bytes
-                        i++;
-                    }
-
-                    while ((i < n - 1) && (rsrc[i] >= 0x20) && (rsrc[i] <= 0x2F)) { // intermediate bytes
-                        i++;
-                    }
-
-                    if ((rsrc[i] >= 0x40) && (rsrc[i] <= 0x7F)) { // final byte
-                        continue;
-                    }
-                } else {
-                    continue;
-                }
-            }
-            rdest[si++] = rsrc[i];
-        }
-    } else {
-        memcpy(dest, src, n);
-    }
-#endif
-}
-
 //-----------------------------------------------------------------------------
 // Entry point into our code: called whenever we received a packet over USB
 // that we weren't necessarily expecting, for example a debug print.
@@ -303,6 +265,13 @@ static void PacketResponseReceived(PacketResponseNG *packet) {
     // we got a packet, reset WaitForResponseTimeout timeout
     timeout_start_time = msclock();
 
+    bool filter_ansi = true;
+#if defined(__linux__) || (__APPLE__)
+    struct stat tmp_stat;
+    if ((fstat (STDOUT_FILENO, &tmp_stat) == 0) && (S_ISCHR (tmp_stat.st_mode)) && isatty(STDIN_FILENO))
+        filter_ansi = false;
+#endif
+
     switch (packet->cmd) {
         // First check if we are handling a debug message
         case CMD_DEBUG_PRINT_STRING: {
@@ -320,11 +289,11 @@ static void PacketResponseReceived(PacketResponseNG *packet) {
                 struct d *data = (struct d *)&packet->data.asBytes;
                 len = packet->length - sizeof(data->flag);
                 flag = data->flag;
-                memcpy_filtered(s, data->buf, len, flag & FLAG_ANSI);
+                memcpy_filter_ansi(s, data->buf, len, (flag & FLAG_ANSI) && filter_ansi);
             } else {
                 len = MIN(packet->oldarg[0], USB_CMD_DATA_SIZE);
                 flag = packet->oldarg[1];
-                memcpy_filtered(s, packet->data.asBytes, len, flag & FLAG_ANSI);
+                memcpy_filter_ansi(s, packet->data.asBytes, len, (flag & FLAG_ANSI) && filter_ansi);
             }
 
             if (flag & FLAG_LOG) {
diff --git a/client/emv/emvjson.h b/client/emv/emvjson.h
index edff18bcd..6bcf8243d 100644
--- a/client/emv/emvjson.h
+++ b/client/emv/emvjson.h
@@ -12,7 +12,6 @@
 
 #include <jansson.h>
 #include "tlv.h"
-#include "commonutil.h"
 
 typedef struct {
     tlv_tag_t Tag;
diff --git a/client/fido/cose.h b/client/fido/cose.h
index 3243a1632..e62054646 100644
--- a/client/fido/cose.h
+++ b/client/fido/cose.h
@@ -16,7 +16,6 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <cbor.h>
-#include "commonutil.h"
 #include "util.h"
 
 const char *GetCOSEAlgName(int id);
diff --git a/client/proxmark3.c b/client/proxmark3.c
index bb6553a09..c8f10a49a 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -30,25 +30,25 @@
 #include "usart.h"
 
 static void showBanner(void) {
-    printf("\n\n");
+    PrintAndLogEx(NORMAL, "\n");
 #if defined(__linux__) || (__APPLE__)
-    printf(_BLUE_("██████╗ ███╗   ███╗ ████╗ ") "    ...iceman fork\n");
-    printf(_BLUE_("██╔══██╗████╗ ████║   ══█║") "      ...dedicated to " _BLUE_("RDV40") "\n");
-    printf(_BLUE_("██████╔╝██╔████╔██║ ████╔╝") "\n");
-    printf(_BLUE_("██╔═══╝ ██║╚██╔╝██║   ══█║") "    iceman@icesql.net\n");
-    printf(_BLUE_("██║     ██║ ╚═╝ ██║ ████╔╝") "   https://github.com/rfidresearchgroup/proxmark3/\n");
-    printf(_BLUE_("╚═╝     ╚═╝     ╚═╝ ╚═══╝ ") "pre-release v4.0\n");
+    PrintAndLogEx(NORMAL, _BLUE_("██████╗ ███╗   ███╗ ████╗ ") "    ...iceman fork");
+    PrintAndLogEx(NORMAL, _BLUE_("██╔══██╗████╗ ████║   ══█║") "      ...dedicated to " _BLUE_("RDV40"));
+    PrintAndLogEx(NORMAL, _BLUE_("██████╔╝██╔████╔██║ ████╔╝"));
+    PrintAndLogEx(NORMAL, _BLUE_("██╔═══╝ ██║╚██╔╝██║   ══█║") "    iceman@icesql.net");
+    PrintAndLogEx(NORMAL, _BLUE_("██║     ██║ ╚═╝ ██║ ████╔╝") "   https://github.com/rfidresearchgroup/proxmark3/");
+    PrintAndLogEx(NORMAL, _BLUE_("╚═╝     ╚═╝     ╚═╝ ╚═══╝ ") "pre-release v4.0");
 #else
-    printf("======. ===.   ===. ====.     ...iceman fork\n");
-    printf("==...==.====. ====.   ..=.      ...dedicated to RDV40\n");
-    printf("======..==.====.==. ====..\n");
-    printf("==..... ==..==..==.   ..=.    iceman@icesql.net\n");
-    printf("==.     ==. ... ==. ====..   https://github.com/rfidresearchgroup/proxmark3/\n");
-    printf("...     ...     ... .....  pre-release v4.0\n");
+    PrintAndLogEx(NORMAL, "======. ===.   ===. ====.     ...iceman fork");
+    PrintAndLogEx(NORMAL, "==...==.====. ====.   ..=.      ...dedicated to RDV40");
+    PrintAndLogEx(NORMAL, "======..==.====.==. ====..");
+    PrintAndLogEx(NORMAL, "==..... ==..==..==.   ..=.    iceman@icesql.net");
+    PrintAndLogEx(NORMAL, "==.     ==. ... ==. ====..   https://github.com/rfidresearchgroup/proxmark3/");
+    PrintAndLogEx(NORMAL, "...     ...     ... .....  pre-release v4.0");
 #endif
-    printf("\nSupport iceman on patreon,   https://www.patreon.com/iceman1001/");
+    PrintAndLogEx(NORMAL, "\nSupport iceman on patreon,   https://www.patreon.com/iceman1001/");
 //    printf("\nMonero: 43mNJLpgBVaTvyZmX9ajcohpvVkaRy1kbZPm8tqAb7itZgfuYecgkRF36rXrKFUkwEGeZedPsASRxgv4HPBHvJwyJdyvQuP");
-    printf("\n\n\n");
+    PrintAndLogEx(NORMAL, "\n");
     fflush(stdout);
 }
 
diff --git a/client/ui.c b/client/ui.c
index fb976c56b..cff0881ff 100644
--- a/client/ui.c
+++ b/client/ui.c
@@ -16,6 +16,10 @@
 #endif
 
 #include "ui.h"
+#if defined(__linux__) || (__APPLE__)
+#include <unistd.h>
+#include <sys/stat.h>
+#endif
 
 double CursorScaleFactor = 1;
 int PlotGridX = 0, PlotGridY = 0, PlotGridXdefault = 64, PlotGridYdefault = 64;
@@ -138,10 +142,11 @@ void PrintAndLogEx(logLevel_t level, const char *fmt, ...) {
 void PrintAndLog(const char *fmt, ...) {
     char *saved_line;
     int saved_point;
-    va_list argptr, argptr2;
+    va_list argptr;
     static FILE *logfile = NULL;
     static int logging = 1;
-
+    char buffer[MAX_PRINT_BUFFER] = {0};
+    char buffer2[MAX_PRINT_BUFFER] = {0};
     // lock this section to avoid interlacing prints from different threads
     pthread_mutex_lock(&print_lock);
 
@@ -171,10 +176,18 @@ void PrintAndLog(const char *fmt, ...) {
 #endif
 
     va_start(argptr, fmt);
-    va_copy(argptr2, argptr);
-    vprintf(fmt, argptr);
-    printf("          "); // cleaning prompt
+    vsnprintf(buffer, sizeof(buffer), fmt, argptr);
     va_end(argptr);
+
+    bool filter_ansi = true;
+#if defined(__linux__) || (__APPLE__)
+    struct stat tmp_stat;
+    if ((fstat (STDOUT_FILENO, &tmp_stat) == 0) && (S_ISCHR (tmp_stat.st_mode)) && isatty(STDIN_FILENO))
+        filter_ansi = false;
+#endif
+    memcpy_filter_ansi(buffer2, buffer, sizeof(buffer), filter_ansi);
+    printf("%s", buffer2);
+    printf("          "); // cleaning prompt
     printf("\n");
 
 #ifdef RL_STATE_READCMD
@@ -189,11 +202,14 @@ void PrintAndLog(const char *fmt, ...) {
 #endif
 
     if (logging && logfile) {
-        vfprintf(logfile, fmt, argptr2);
-        fprintf(logfile, "\n");
+        if (filter_ansi) { // already done
+            fprintf(logfile, "%s\n", buffer2);
+        } else {
+            memcpy_filter_ansi(buffer, buffer2, sizeof(buffer2), true);
+            fprintf(logfile, "%s\n", buffer);
+        }
         fflush(logfile);
     }
-    va_end(argptr2);
 
     if (flushAfterWrite)
         fflush(stdout);
@@ -210,6 +226,44 @@ void SetFlushAfterWrite(bool value) {
     flushAfterWrite = value;
 }
 
+void memcpy_filter_ansi(void *dest, const void *src, size_t n, bool filter) {
+    if (filter) {
+        // Filter out ANSI sequences on these OS
+        uint8_t *rdest = (uint8_t *)dest;
+        uint8_t *rsrc = (uint8_t *)src;
+        uint16_t si = 0;
+        for (uint16_t i = 0; i < n; i++) {
+            if ((rsrc[i] == '\x1b')
+                    && (i < n - 1)
+                    && (rsrc[i + 1] >= 0x40)
+                    && (rsrc[i + 1] <= 0x5F)) {  // entering ANSI sequence
+
+                i++;
+                if ((rsrc[i] == '[') && (i < n - 1)) { // entering CSI sequence
+                    i++;
+
+                    while ((i < n - 1) && (rsrc[i] >= 0x30) && (rsrc[i] <= 0x3F)) { // parameter bytes
+                        i++;
+                    }
+
+                    while ((i < n - 1) && (rsrc[i] >= 0x20) && (rsrc[i] <= 0x2F)) { // intermediate bytes
+                        i++;
+                    }
+
+                    if ((rsrc[i] >= 0x40) && (rsrc[i] <= 0x7F)) { // final byte
+                        continue;
+                    }
+                } else {
+                    continue;
+                }
+            }
+            rdest[si++] = rsrc[i];
+        }
+    } else {
+        memcpy(dest, src, n);
+    }
+}
+
 void iceIIR_Butterworth(int *data, const size_t len) {
 
     int *output = (int *) calloc(sizeof(int) * len, sizeof(uint8_t));
diff --git a/client/ui.h b/client/ui.h
index 574881918..1f493d346 100644
--- a/client/ui.h
+++ b/client/ui.h
@@ -39,6 +39,7 @@ void PrintAndLogOptions(const char *str[][2], size_t size, size_t space);
 void PrintAndLogEx(logLevel_t level, const char *fmt, ...);
 void SetLogFilename(char *fn);
 void SetFlushAfterWrite(bool value);
+void memcpy_filter_ansi(void *dest, const void *src, size_t n, bool filter);
 
 extern double CursorScaleFactor;
 extern int PlotGridX, PlotGridY, PlotGridXdefault, PlotGridYdefault, GridOffset;
diff --git a/client/util.h b/client/util.h
index 78ecf6b91..0222097b7 100644
--- a/client/util.h
+++ b/client/util.h
@@ -19,6 +19,7 @@
 #include <stdio.h>
 #include <time.h>
 #include "ui.h"     // PrintAndLog
+#include "commonutil.h"
 
 #ifdef ANDROID
 #include <endian.h>
@@ -112,42 +113,6 @@
 # define FILE_PATH_SIZE 1000
 #endif
 
-#if defined(__linux__) || (__APPLE__)
-# define _BLUE_(s) "\x1b[34m" s "\x1b[0m "
-#else
-# define _BLUE_(s) s " "
-#endif
-
-#if defined(__linux__) || (__APPLE__)
-# define _RED_(s) "\x1b[31m" s "\x1b[0m "
-#else
-# define _RED_(s) s " "
-#endif
-
-#if defined(__linux__) || (__APPLE__)
-# define _GREEN_(s) "\x1b[32m" s "\x1b[0m "
-#else
-# define _GREEN_(s) s " "
-#endif
-
-#if defined(__linux__) || (__APPLE__)
-# define _YELLOW_(s) "\x1b[33m" s "\x1b[0m "
-#else
-# define _YELLOW_(s) s " "
-#endif
-
-#if defined(__linux__) || (__APPLE__)
-# define _MAGENTA_(s) "\x1b[35m" s "\x1b[0m "
-#else
-# define _MAGENTA_(s) s " "
-#endif
-
-#if defined(__linux__) || (__APPLE__)
-# define _CYAN_(s) "\x1b[36m" s "\x1b[0m "
-#else
-# define _CYAN_(s) s " "
-#endif
-
 #ifndef DropField
 #define DropField() { \
         clearCommandBuffer(); SendCommandOLD(CMD_READER_ISO_14443a, 0, 0, 0, NULL, 0); \
diff --git a/common/commonutil.h b/common/commonutil.h
index 2d1a3776c..9504abd5b 100644
--- a/common/commonutil.h
+++ b/common/commonutil.h
@@ -53,4 +53,11 @@ void lsl(uint8_t *data, size_t len);
 int32_t le24toh(uint8_t data[3]);
 void htole24(uint32_t val, uint8_t data[3]);
 
+# define _BLUE_(s) "\x1b[34m" s "\x1b[0m "
+# define _RED_(s) "\x1b[31m" s "\x1b[0m "
+# define _GREEN_(s) "\x1b[32m" s "\x1b[0m "
+# define _YELLOW_(s) "\x1b[33m" s "\x1b[0m "
+# define _MAGENTA_(s) "\x1b[35m" s "\x1b[0m "
+# define _CYAN_(s) "\x1b[36m" s "\x1b[0m "
+
 #endif

From 26c953aee83e5273578cc884426026364a916055 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 30 Apr 2019 09:47:21 +0200
Subject: [PATCH 1513/1938] MINGW, uart speed up when compiling with FPC
 support

---
 uart/uart_win32.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/uart/uart_win32.c b/uart/uart_win32.c
index 80d6b8a24..a3ac22ebe 100644
--- a/uart/uart_win32.c
+++ b/uart/uart_win32.c
@@ -88,10 +88,10 @@ serial_port uart_open(const char *pcPortName, uint32_t speed) {
     // took settings from libnfc/buses/uart.c
 #ifdef WITH_FPC
     // Still relevant?
-    sp->ct.ReadIntervalTimeout         = 1000;
+    sp->ct.ReadIntervalTimeout         = 150; //200;
     sp->ct.ReadTotalTimeoutMultiplier  = 0;
-    sp->ct.ReadTotalTimeoutConstant    = 1500;
-    sp->ct.WriteTotalTimeoutMultiplier = 1000;
+    sp->ct.ReadTotalTimeoutConstant    = 150; //200;
+    sp->ct.WriteTotalTimeoutMultiplier = 150; //200;
     sp->ct.WriteTotalTimeoutConstant   = 0;
 #else
     sp->ct.ReadIntervalTimeout         = 30;

From 0ee710ed929abdae10279f8882b39391bdc9ed4a Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 30 Apr 2019 09:48:08 +0200
Subject: [PATCH 1514/1938] chg:  lua scripts now get easy access to
 fast_push_mode option

---
 client/scripting.c | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/client/scripting.c b/client/scripting.c
index cb086832d..70943f360 100644
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -27,6 +27,33 @@ static int l_clearCommandBuffer(lua_State *L) {
     return 0;
 }
 
+/**
+ * Enable / Disable fast push mode for lua scripts like mfkeys
+ * The following params expected:
+ *  
+ *@brief l_fast_push_mode
+ * @param L
+ * @return
+ */
+static int l_fast_push_mode(lua_State *L){
+    
+    luaL_checktype(L, 1, LUA_TBOOLEAN);
+    
+    bool enable = lua_toboolean(L, 1);
+
+    conn.block_after_ACK = enable;
+    
+    // Disable fast mode and send a dummy command to make it effective
+    if (enable == false) {
+        SendCommandMIX(CMD_PING, 0, 0, 0, NULL, 0);
+        WaitForResponseTimeout(CMD_ACK, NULL, 1000);
+    }
+    
+    //Push the retval on the stack
+    lua_pushboolean(L, enable);
+    return 1;
+}
+
 /**
  * The following params expected:
  *  UsbCommand c
@@ -1048,7 +1075,8 @@ int set_pm3_libraries(lua_State *L) {
         {"keygen_algo_d",               l_keygen_algoD},
         {"t55xx_readblock",             l_T55xx_readblock},
         {"t55xx_detect",                l_T55xx_detect},
-        {"ndefparse",                l_ndefparse},
+        {"ndefparse",                   l_ndefparse},
+        {"fast_push_mode",              l_fast_push_mode},
         {NULL, NULL}
     };
 

From 10ac5fd256e81049e7cf2ab283651bb7920ec9c0 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 30 Apr 2019 10:10:25 +0200
Subject: [PATCH 1515/1938] chg: 'lf sim' - now uses fast push mode

---
 client/cmdlf.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/client/cmdlf.c b/client/cmdlf.c
index bafa7353b..71209d554 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -419,6 +419,9 @@ int CmdLFSim(const char *Cmd) {
 
     PrintAndLogEx(DEBUG, "DEBUG: Sending [%d bytes]\n", GraphTraceLen);
 
+    // fast push mode
+    conn.block_after_ACK = true;
+    
     //can send only 512 bits at a time (1 byte sent per bit...)
     for (uint16_t i = 0; i < GraphTraceLen; i += USB_CMD_DATA_SIZE) {
         clearCommandBuffer();
@@ -427,6 +430,10 @@ int CmdLFSim(const char *Cmd) {
         printf(".");
         fflush(stdout);
     }
+    printf("\n");
+
+    // Disable fast mode and send a dummy command to make it effective
+    conn.block_after_ACK = false;
 
     PrintAndLogEx(NORMAL, "Simulating");
 

From 918a46a984f391239009d4689ea24889d45f04ce Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 30 Apr 2019 12:12:55 +0200
Subject: [PATCH 1516/1938] uninit.

---
 client/cmdhf15.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index b55904bd6..0aeccb5ea 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -592,7 +592,7 @@ static int CmdHF15Info(const char *Cmd) {
 
     PacketResponseNG resp;
     uint8_t *recv;
-    uint8_t req[USB_CMD_DATA_SIZE];
+    uint8_t req[USB_CMD_DATA_SIZE] = {0};
     uint16_t reqlen;
     uint8_t arg1 = 1;
     char cmdbuf[100] = {0};
@@ -932,7 +932,7 @@ static int CmdHF15Readmulti(const char *Cmd) {
 
     PacketResponseNG resp;
     uint8_t *recv;
-    uint8_t req[USB_CMD_DATA_SIZE];
+    uint8_t req[USB_CMD_DATA_SIZE] = {0};
     uint16_t reqlen = 0;
     uint8_t arg1 = 1;
     uint8_t pagenum, pagecount;
@@ -1018,7 +1018,7 @@ static int CmdHF15Read(const char *Cmd) {
     // arg0 (datalen,  cmd len?  .arg0 == crc?)
     // arg1 (speed == 0 == 1 of 256,  == 1 == 1 of 4 )
     // arg2 (recv == 1 == expect a response)
-    uint8_t req[USB_CMD_DATA_SIZE];
+    uint8_t req[USB_CMD_DATA_SIZE] = {0};
     uint16_t reqlen = 0;
     uint8_t arg1 = 1;
     int blocknum;
@@ -1085,7 +1085,7 @@ static int CmdHF15Write(const char *Cmd) {
 
     PacketResponseNG resp;
     uint8_t *recv;
-    uint8_t req[USB_CMD_DATA_SIZE];
+    uint8_t req[USB_CMD_DATA_SIZE] = {0};
     uint16_t reqlen = 0;
     uint8_t arg1 = 1;
     int pagenum, temp;

From 481d70b0da9900a87de1b0edbf72f0c81e076f79 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 30 Apr 2019 12:14:46 +0200
Subject: [PATCH 1517/1938] chg: 'hf iclass eload' - use fast push mode.

---
 client/cmdhficlass.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index a794358a7..014e6cc9d 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -586,6 +586,10 @@ static int CmdHFiClassELoad(const char *Cmd) {
         free(dump);
         return 1;
     }
+
+    // fast push mode
+    conn.block_after_ACK = false;
+    
     //Send to device
     uint32_t bytes_sent = 0;
     uint32_t bytes_remaining  = bytes_read;
@@ -598,6 +602,12 @@ static int CmdHFiClassELoad(const char *Cmd) {
         bytes_sent += bytes_in_packet;
     }
     free(dump);
+
+    // Disable fast mode and send a dummy command to make it effective
+    conn.block_after_ACK = false;
+    SendCommandMIX(CMD_PING, 0, 0, 0, NULL, 0);
+    WaitForResponseTimeout(CMD_ACK, NULL, 1000);
+    
     PrintAndLogEx(SUCCESS, "sent %d bytes of data to device emulator memory", bytes_sent);
     return 0;
 }

From e1063e2836b20547e25ee20b38225787e251f0ee Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 30 Apr 2019 12:57:44 +0200
Subject: [PATCH 1518/1938] chg:  reconfigure uart timeouts when compiled for
 FPC and connecting over USB.

---
 client/comms.c    | 10 ++++++++--
 include/usb_cmd.h | 15 +++++++++++++++
 uart/uart.h       |  3 +++
 uart/uart_posix.c | 17 ++++++++---------
 uart/uart_win32.c | 43 ++++++++++++++++++++-----------------------
 5 files changed, 54 insertions(+), 34 deletions(-)

diff --git a/client/comms.c b/client/comms.c
index 2cb397007..ab39cfb6b 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -577,7 +577,6 @@ bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode,
             printf(".");
             fflush(stdout);
         } while (++openCount < timeout && (sp == INVALID_SERIAL_PORT || sp == CLAIMED_SERIAL_PORT));
-        //PrintAndLogEx(NORMAL, "\n");
     }
 
     // check result of uart opening
@@ -641,8 +640,15 @@ int TestProxmark(void) {
             conn.send_via_fpc = pm3_capabilities.via_fpc;
             conn.uart_speed = pm3_capabilities.baudrate;
             PrintAndLogEx(INFO, "Communicating with PM3 over %s", conn.send_via_fpc ? _YELLOW_("FPC UART") : _YELLOW_("USB-CDC"));
-            if (conn.send_via_fpc)
+            if (conn.send_via_fpc) {
                 PrintAndLogEx(INFO, "UART Serial baudrate: " _YELLOW_("%u") "\n", conn.uart_speed);
+            }
+            
+            // reconfigure.
+            if ( conn.send_via_fpc == false ) {
+                uart_reconfigure_timeouts(sp, UART_USB_CLIENT_RX_TIMEOUT_MS );
+            }
+           
             return PM3_SUCCESS;
         } else {
             return PM3_ETIMEOUT;
diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index f40a71dbc..4d4a9e8dd 100644
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -440,6 +440,21 @@ extern capabilities_t pm3_capabilities;
 #define PM3_EFATAL            -99
 
 
+// Receiving from USART need more than 30ms as we used on USB
+// else we get errors about partial packet reception
+// FTDI   9600 hw status        -> we need 20ms
+// FTDI 115200 hw status        -> we need 50ms
+// FTDI 460800 hw status        -> we need 30ms
+// BT   115200 hf mf fchk 1 dic -> we need 140ms
+// all zero's configure: no timeout for read/write used.
+// took settings from libnfc/buses/uart.c
+
+// uart_windows.c
+# define UART_FPC_CLIENT_RX_TIMEOUT_MS  170
+# define UART_USB_CLIENT_RX_TIMEOUT_MS  20
+# define UART_TCP_CLIENT_RX_TIMEOUT_MS  300
+
+
 // CMD_DEVICE_INFO response packet has flags in arg[0], flag definitions:
 /* Whether a bootloader that understands the common_area is present */
 #define DEVICE_INFO_FLAG_BOOTROM_PRESENT             (1<<0)
diff --git a/uart/uart.h b/uart/uart.h
index f97327953..28be233f0 100644
--- a/uart/uart.h
+++ b/uart/uart.h
@@ -105,5 +105,8 @@ bool uart_set_speed(serial_port sp, const uint32_t uiPortSpeed);
  */
 uint32_t uart_get_speed(const serial_port sp);
 
+/* Reconfigure timeouts
+ */
+ bool uart_reconfigure_timeouts(serial_port *sp, uint32_t value );
 #endif // _UART_H_
 
diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index 30a9ba098..67802645a 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -67,17 +67,16 @@ typedef struct {
     term_info tiNew;  // Terminal info during the transaction
 } serial_port_unix;
 
-// Receiving from USART need more than 30ms as we used on USB
-// else we get errors about partial packet reception
-// FTDI   9600 hw status        -> we need 20ms
-// FTDI 115200 hw status        -> we need 50ms
-// FTDI 460800 hw status        -> we need 30ms
-// BT   115200 hf mf fchk 1 dic -> we need 140ms
+// see usb_cmd.h
 struct timeval timeout = {
-    .tv_sec  =      0, // 0 second
-    .tv_usec = 200000  // 200 000 micro seconds
+    .tv_sec  = 0, // 0 second
+    .tv_usec = UART_FPC_CLIENT_RX_TIMEOUT_US
 };
 
+bool uart_reconfigure_timeouts(serial_port *sp, uint32_t value ) {
+    timeout.usec = value * 1000;
+}
+
 serial_port uart_open(const char *pcPortName, uint32_t speed) {
     serial_port_unix *sp = calloc(sizeof(serial_port_unix), sizeof(uint8_t));
     if (sp == 0) return INVALID_SERIAL_PORT;
@@ -92,7 +91,7 @@ serial_port uart_open(const char *pcPortName, uint32_t speed) {
             return INVALID_SERIAL_PORT;
         }
 
-        timeout.tv_usec = 300000;  // 300 000 micro seconds
+        timeout.tv_usec = UART_TCP_CLIENT_RX_TIMEOUT_US;
 
         char *colon = strrchr(addrstr, ':');
         const char *portstr;
diff --git a/uart/uart_win32.c b/uart/uart_win32.c
index a3ac22ebe..6baa5eda4 100644
--- a/uart/uart_win32.c
+++ b/uart/uart_win32.c
@@ -48,6 +48,24 @@ typedef struct {
     COMMTIMEOUTS ct;  // Serial port time-out configuration
 } serial_port_windows;
 
+bool uart_reconfigure_timeouts(serial_port *sp, uint32_t value) {
+    
+    serial_port_windows *spw = (serial_port_windows*)sp;
+    spw->ct.ReadIntervalTimeout         = value;
+    spw->ct.ReadTotalTimeoutMultiplier  = 0;
+    spw->ct.ReadTotalTimeoutConstant    = value;
+    spw->ct.WriteTotalTimeoutMultiplier = value;
+    spw->ct.WriteTotalTimeoutConstant   = 0;
+
+    if (!SetCommTimeouts(spw->hPort, &spw->ct)) {
+        uart_close(spw);
+        printf("[!] UART error while setting comm time outs\n");
+        return INVALID_SERIAL_PORT;
+    }
+
+    PurgeComm(spw->hPort, PURGE_RXABORT | PURGE_RXCLEAR);
+}
+
 serial_port uart_open(const char *pcPortName, uint32_t speed) {
     char acPortName[255] = {0};
     serial_port_windows *sp = calloc(sizeof(serial_port_windows), sizeof(uint8_t));
@@ -84,30 +102,8 @@ serial_port uart_open(const char *pcPortName, uint32_t speed) {
         printf("[!] UART error while setting com state\n");
         return INVALID_SERIAL_PORT;
     }
-    // all zero's configure: no timeout for read/write used.
-    // took settings from libnfc/buses/uart.c
-#ifdef WITH_FPC
-    // Still relevant?
-    sp->ct.ReadIntervalTimeout         = 150; //200;
-    sp->ct.ReadTotalTimeoutMultiplier  = 0;
-    sp->ct.ReadTotalTimeoutConstant    = 150; //200;
-    sp->ct.WriteTotalTimeoutMultiplier = 150; //200;
-    sp->ct.WriteTotalTimeoutConstant   = 0;
-#else
-    sp->ct.ReadIntervalTimeout         = 30;
-    sp->ct.ReadTotalTimeoutMultiplier  = 0;
-    sp->ct.ReadTotalTimeoutConstant    = 30;
-    sp->ct.WriteTotalTimeoutMultiplier = 30;
-    sp->ct.WriteTotalTimeoutConstant   = 0;
-#endif
 
-    if (!SetCommTimeouts(sp->hPort, &sp->ct)) {
-        uart_close(sp);
-        printf("[!] UART error while setting comm time outs\n");
-        return INVALID_SERIAL_PORT;
-    }
-
-    PurgeComm(sp->hPort, PURGE_RXABORT | PURGE_RXCLEAR);
+    uart_reconfigure_timeouts(sp, UART_FPC_CLIENT_RX_TIMEOUT_MS);
 
     if (!uart_set_speed(sp, speed)) {
         // trying some fallbacks automatically
@@ -154,6 +150,7 @@ bool uart_set_speed(serial_port sp, const uint32_t uiPortSpeed) {
     PurgeComm(spw->hPort, PURGE_RXABORT | PURGE_RXCLEAR);
     if (result)
         conn.uart_speed = uiPortSpeed;
+    
     return result;
 }
 

From 7ee6125ef635c112e0b392ac5e60613e630bba7b Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 30 Apr 2019 13:01:55 +0200
Subject: [PATCH 1519/1938] fixes..

---
 uart/uart_posix.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index 67802645a..a39fb7d89 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -70,11 +70,11 @@ typedef struct {
 // see usb_cmd.h
 struct timeval timeout = {
     .tv_sec  = 0, // 0 second
-    .tv_usec = UART_FPC_CLIENT_RX_TIMEOUT_US
+    .tv_usec = UART_FPC_CLIENT_RX_TIMEOUT_MS * 1000
 };
 
 bool uart_reconfigure_timeouts(serial_port *sp, uint32_t value ) {
-    timeout.usec = value * 1000;
+    timeout.tv_usec = value * 1000;
 }
 
 serial_port uart_open(const char *pcPortName, uint32_t speed) {
@@ -91,7 +91,7 @@ serial_port uart_open(const char *pcPortName, uint32_t speed) {
             return INVALID_SERIAL_PORT;
         }
 
-        timeout.tv_usec = UART_TCP_CLIENT_RX_TIMEOUT_US;
+        timeout.tv_usec = UART_TCP_CLIENT_RX_TIMEOUT_MS * 1000;
 
         char *colon = strrchr(addrstr, ':');
         const char *portstr;

From 0a4b90ac20402a1deb077458a14cb082fc7d1d3a Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 30 Apr 2019 13:02:27 +0200
Subject: [PATCH 1520/1938] Simplify color & banner logic

---
 armsrc/BigBuf.c              |  4 +-
 armsrc/Standalone/hf_colin.c | 76 ++++++++++++++++++------------------
 armsrc/appmain.c             | 10 ++---
 armsrc/flashmem.c            |  2 +-
 armsrc/fpgaloader.c          |  2 +-
 armsrc/lfops.c               |  2 +-
 armsrc/lfsampling.c          |  2 +-
 client/comms.c               | 11 +-----
 client/proxmark3.c           | 18 +++++++--
 client/ui.c                  | 12 +-----
 client/ui.h                  |  8 ++++
 common/i2c.c                 |  2 +-
 12 files changed, 77 insertions(+), 72 deletions(-)

diff --git a/armsrc/BigBuf.c b/armsrc/BigBuf.c
index 07409029a..7b199930a 100644
--- a/armsrc/BigBuf.c
+++ b/armsrc/BigBuf.c
@@ -96,10 +96,10 @@ void BigBuf_free_keep_EM(void) {
 }
 
 void BigBuf_print_status(void) {
-    DbpStringEx(FLAG_LOG | FLAG_ANSI, _BLUE_("Memory"));
+    DbpString(_BLUE_("Memory"));
     Dbprintf("  BIGBUF_SIZE.............%d", BIGBUF_SIZE);
     Dbprintf("  Available memory........%d", BigBuf_hi);
-    DbpStringEx(FLAG_LOG | FLAG_ANSI, _BLUE_("Tracing"));
+    DbpString(_BLUE_("Tracing"));
     Dbprintf("  tracing ................%d", tracing);
     Dbprintf("  traceLen ...............%d", traceLen);
 }
diff --git a/armsrc/Standalone/hf_colin.c b/armsrc/Standalone/hf_colin.c
index c2f74f64e..098cfa1b6 100644
--- a/armsrc/Standalone/hf_colin.c
+++ b/armsrc/Standalone/hf_colin.c
@@ -124,7 +124,7 @@ void ReadLastTagFromFlash() {
     end_time = GetTickCount();
     DbprintfEx(FLAG_NEWLINE, "[OK] Last tag recovered from FLASHMEM set to emulator");
     cjSetCursLeft();
-    DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "%s[IN]%s %s%dms%s for TAG_FLASH_READ", _GREEN_, _WHITE_, _YELLOW_, end_time - start_time, _WHITE_);
+    DbprintfEx(FLAG_NEWLINE, "%s[IN]%s %s%dms%s for TAG_FLASH_READ", _GREEN_, _WHITE_, _YELLOW_, end_time - start_time, _WHITE_);
     cjSetCursLeft();
     FlashStop();
     SpinOff(0);
@@ -188,7 +188,7 @@ void WriteTagToFlash(uint8_t index, size_t size) {
 
     DbprintfEx(FLAG_NEWLINE, "[OK] TAG WRITTEN TO FLASH ! [0-to offset %u]", bytes_sent);
     cjSetCursLeft();
-    DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "%s[IN]%s %s%dms%s for TAG_FLASH_WRITE", _GREEN_, _WHITE_, _YELLOW_, end_time - start_time, _WHITE_);
+    DbprintfEx(FLAG_NEWLINE, "%s[IN]%s %s%dms%s for TAG_FLASH_WRITE", _GREEN_, _WHITE_, _YELLOW_, end_time - start_time, _WHITE_);
     cjSetCursLeft();
     FlashStop();
     SpinOff(0);
@@ -329,8 +329,8 @@ void RunMod() {
     // banner:
     vtsend_reset(NULL);
     DbprintfEx(FLAG_NEWLINE, "\r\n%s", clearTerm);
-    DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "%s%s%s", _CYAN_, sub_banner, _WHITE_);
-    DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "%s>>%s C.J.B's MifareFastPwn Started\r\n", _RED_, _WHITE_);
+    DbprintfEx(FLAG_NEWLINE, "%s%s%s", _CYAN_, sub_banner, _WHITE_);
+    DbprintfEx(FLAG_NEWLINE, "%s>>%s C.J.B's MifareFastPwn Started\r\n", _RED_, _WHITE_);
 
     currline = 20;
     curlline = 20;
@@ -370,16 +370,16 @@ failtag:
 
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     vtsend_cursor_position_restore(NULL);
-    DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "\t\t\t%s[   GOT a Tag !   ]%s", _GREEN_, _WHITE_);
+    DbprintfEx(FLAG_NEWLINE, "\t\t\t%s[   GOT a Tag !   ]%s", _GREEN_, _WHITE_);
     cjSetCursLeft();
     DbprintfEx(FLAG_NEWLINE, "\t\t\t       `---> Breaking keys ---->");
     cjSetCursRight();
 
-    DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "\t%sGOT TAG :%s %08x%s", _RED_, _CYAN_, cjcuid, _WHITE_);
+    DbprintfEx(FLAG_NEWLINE, "\t%sGOT TAG :%s %08x%s", _RED_, _CYAN_, cjcuid, _WHITE_);
 
     if (cjcuid == 0) {
         cjSetCursLeft();
-        DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "%s>>%s BUG: 0000_CJCUID! Retrying...", _RED_, _WHITE_);
+        DbprintfEx(FLAG_NEWLINE, "%s>>%s BUG: 0000_CJCUID! Retrying...", _RED_, _WHITE_);
         SpinErr(0, 100, 8);
         goto failtag;
     }
@@ -452,19 +452,19 @@ failtag:
                     // COMMON SCHEME 1  : INFINITRON/HEXACT
                     case 0x484558414354:
                         cjSetCursLeft();
-                        DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "%s>>>>>>>>>>>>!*STOP*!<<<<<<<<<<<<<<%s", _RED_, _WHITE_);
+                        DbprintfEx(FLAG_NEWLINE, "%s>>>>>>>>>>>>!*STOP*!<<<<<<<<<<<<<<%s", _RED_, _WHITE_);
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "    .TAG SEEMS %sDETERMINISTIC%s.     ", _GREEN_, _WHITE_);
+                        DbprintfEx(FLAG_NEWLINE, "    .TAG SEEMS %sDETERMINISTIC%s.     ", _GREEN_, _WHITE_);
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "%sDetected: %s INFI_HEXACT_VIGIK_TAG%s", _ORANGE_, _CYAN_, _WHITE_);
+                        DbprintfEx(FLAG_NEWLINE, "%sDetected: %s INFI_HEXACT_VIGIK_TAG%s", _ORANGE_, _CYAN_, _WHITE_);
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "...%s[%sKey_derivation_schemeTest%s]%s...", _YELLOW_, _GREEN_, _YELLOW_, _GREEN_);
+                        DbprintfEx(FLAG_NEWLINE, "...%s[%sKey_derivation_schemeTest%s]%s...", _YELLOW_, _GREEN_, _YELLOW_, _GREEN_);
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "%s>>>>>>>>>>>>!*DONE*!<<<<<<<<<<<<<<%s", _GREEN_, _WHITE_);
+                        DbprintfEx(FLAG_NEWLINE, "%s>>>>>>>>>>>>!*DONE*!<<<<<<<<<<<<<<%s", _GREEN_, _WHITE_);
                         ;
                         // Type 0 / A first
                         uint16_t t = 0;
@@ -597,19 +597,19 @@ failtag:
                     case 0x8829da9daf76:
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "%s>>>>>>>>>>>>!*STOP*!<<<<<<<<<<<<<<%s", _RED_, _WHITE_);
+                        DbprintfEx(FLAG_NEWLINE, "%s>>>>>>>>>>>>!*STOP*!<<<<<<<<<<<<<<%s", _RED_, _WHITE_);
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "    .TAG SEEMS %sDETERMINISTIC%s.     ", _GREEN_, _WHITE_);
+                        DbprintfEx(FLAG_NEWLINE, "    .TAG SEEMS %sDETERMINISTIC%s.     ", _GREEN_, _WHITE_);
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "%sDetected :%sURMET_CAPTIVE_VIGIK_TAG%s", _ORANGE_, _CYAN_, _WHITE_);
+                        DbprintfEx(FLAG_NEWLINE, "%sDetected :%sURMET_CAPTIVE_VIGIK_TAG%s", _ORANGE_, _CYAN_, _WHITE_);
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "...%s[%sKey_derivation_schemeTest%s]%s...", _YELLOW_, _GREEN_, _YELLOW_, _GREEN_);
+                        DbprintfEx(FLAG_NEWLINE, "...%s[%sKey_derivation_schemeTest%s]%s...", _YELLOW_, _GREEN_, _YELLOW_, _GREEN_);
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "%s>>>>>>>>>>>>!*DONE*!<<<<<<<<<<<<<<%s", _GREEN_, _WHITE_);
+                        DbprintfEx(FLAG_NEWLINE, "%s>>>>>>>>>>>>!*DONE*!<<<<<<<<<<<<<<%s", _GREEN_, _WHITE_);
                         cjSetCursLeft();
 
                         // emlClearMem();
@@ -639,19 +639,19 @@ failtag:
                     case 0x424c41524f4e:
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "%s>>>>>>>>>>>>!*STOP*!<<<<<<<<<<<<<<%s", _RED_, _WHITE_);
+                        DbprintfEx(FLAG_NEWLINE, "%s>>>>>>>>>>>>!*STOP*!<<<<<<<<<<<<<<%s", _RED_, _WHITE_);
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "    .TAG SEEMS %sDETERMINISTIC%s.     ", _GREEN_, _WHITE_);
+                        DbprintfEx(FLAG_NEWLINE, "    .TAG SEEMS %sDETERMINISTIC%s.     ", _GREEN_, _WHITE_);
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "%s  Detected :%sNORALSY_VIGIK_TAG %s", _ORANGE_, _CYAN_, _WHITE_);
+                        DbprintfEx(FLAG_NEWLINE, "%s  Detected :%sNORALSY_VIGIK_TAG %s", _ORANGE_, _CYAN_, _WHITE_);
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "...%s[%sKey_derivation_schemeTest%s]%s...", _YELLOW_, _GREEN_, _YELLOW_, _GREEN_);
+                        DbprintfEx(FLAG_NEWLINE, "...%s[%sKey_derivation_schemeTest%s]%s...", _YELLOW_, _GREEN_, _YELLOW_, _GREEN_);
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "%s>>>>>>>>>>>>!*DONE*!<<<<<<<<<<<<<<%s", _GREEN_, _WHITE_);
+                        DbprintfEx(FLAG_NEWLINE, "%s>>>>>>>>>>>>!*DONE*!<<<<<<<<<<<<<<%s", _GREEN_, _WHITE_);
 
                         t = 0;
                         for (uint16_t s = 0; s < sectorsCnt; s++) {
@@ -692,7 +692,7 @@ failtag:
     if (!allKeysFound) {
         cjSetCursLeft();
         cjTabulize();
-        DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "%s[ FAIL ]%s\r\n->did not found all the keys :'(", _RED_, _WHITE_);
+        DbprintfEx(FLAG_NEWLINE, "%s[ FAIL ]%s\r\n->did not found all the keys :'(", _RED_, _WHITE_);
         cjSetCursLeft();
         SpinErr(1, 100, 8);
         SpinOff(100);
@@ -711,25 +711,25 @@ failtag:
     }
     cjSetCursLeft();
 
-    DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "%s>>%s Setting Keys->Emulator MEM...[%sOK%s]", _YELLOW_, _WHITE_, _GREEN_, _WHITE_);
+    DbprintfEx(FLAG_NEWLINE, "%s>>%s Setting Keys->Emulator MEM...[%sOK%s]", _YELLOW_, _WHITE_, _GREEN_, _WHITE_);
 
     /* filling TAG to emulator */
     uint8_t filled = 0;
     cjSetCursLeft();
 
-    DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "%s>>%s Filling Emulator <- from A keys...", _YELLOW_, _WHITE_);
+    DbprintfEx(FLAG_NEWLINE, "%s>>%s Filling Emulator <- from A keys...", _YELLOW_, _WHITE_);
     e_MifareECardLoad(sectorsCnt, 0, 0, &filled);
     if (filled != 1) {
         cjSetCursLeft();
 
-        DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "%s>>%s W_FAILURE ! %sTrying fallback B keys....", _RED_, _ORANGE_, _WHITE_);
+        DbprintfEx(FLAG_NEWLINE, "%s>>%s W_FAILURE ! %sTrying fallback B keys....", _RED_, _ORANGE_, _WHITE_);
 
         /* no trace, no dbg  */
         e_MifareECardLoad(sectorsCnt, 1, 0, &filled);
         if (filled != 1) {
             cjSetCursLeft();
 
-            DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "FATAL:EML_FALLBACKFILL_B");
+            DbprintfEx(FLAG_NEWLINE, "FATAL:EML_FALLBACKFILL_B");
             SpinErr(2, 100, 8);
             SpinOff(100);
             return;
@@ -739,7 +739,7 @@ failtag:
     end_time = GetTickCount();
     cjSetCursLeft();
 
-    DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "%s>>%s Time for VIGIK break :%s%dms%s", _GREEN_, _WHITE_, _YELLOW_, end_time - start_time, _WHITE_);
+    DbprintfEx(FLAG_NEWLINE, "%s>>%s Time for VIGIK break :%s%dms%s", _GREEN_, _WHITE_, _YELLOW_, end_time - start_time, _WHITE_);
 
     vtsend_cursor_position_save(NULL);
     vtsend_set_attribute(NULL, 1);
@@ -758,10 +758,10 @@ readysim:
     DbprintfEx(FLAG_NEWLINE, "-> We launch Emulation ->");
     cjSetCursLeft();
 
-    DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "%s!> HOLD ON : %s When you'll click, simm will stop", _RED_, _WHITE_);
+    DbprintfEx(FLAG_NEWLINE, "%s!> HOLD ON : %s When you'll click, simm will stop", _RED_, _WHITE_);
     cjSetCursLeft();
 
-    DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "Then %s immediately %s we'll try to %s dump our emulator state%s \r\nin a %s chinese tag%s", _RED_, _WHITE_, _YELLOW_, _WHITE_,
+    DbprintfEx(FLAG_NEWLINE, "Then %s immediately %s we'll try to %s dump our emulator state%s \r\nin a %s chinese tag%s", _RED_, _WHITE_, _YELLOW_, _WHITE_,
                _CYAN_, _WHITE_);
     cjSetCursLeft();
     cjSetCursLeft();
@@ -777,7 +777,7 @@ readysim:
     LED_C_OFF();
     SpinOff(50);
     vtsend_cursor_position_restore(NULL);
-    DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "[   SIMUL ENDED   ]%s", _GREEN_, _WHITE_);
+    DbprintfEx(FLAG_NEWLINE, "[   SIMUL ENDED   ]%s", _GREEN_, _WHITE_);
     cjSetCursLeft();
 
     DbprintfEx(FLAG_NEWLINE, "<- We're out of Emulation");
@@ -789,7 +789,7 @@ readysim:
     saMifareMakeTag();
     cjSetCursLeft();
     vtsend_cursor_position_restore(NULL);
-    DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "%s[ CLONED? ]", _CYAN_);
+    DbprintfEx(FLAG_NEWLINE, "%s[ CLONED? ]", _CYAN_);
 
     DbprintfEx(FLAG_NEWLINE, "-> End Cloning.");
     WDT_HIT();
@@ -799,7 +799,7 @@ readysim:
     cjTabulize();
     vtsend_set_attribute(NULL, 0);
     vtsend_set_attribute(NULL, 7);
-    DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "- [ LA FIN ] -\r\n%s`-> You can take shell back :) ...", _WHITE_);
+    DbprintfEx(FLAG_NEWLINE, "- [ LA FIN ] -\r\n%s`-> You can take shell back :) ...", _WHITE_);
     cjSetCursLeft();
     vtsend_set_attribute(NULL, 0);
     SpinErr(3, 100, 16);
@@ -909,7 +909,7 @@ int cjat91_saMifareChkKeys(uint8_t blockNo, uint8_t keyType, bool clearTrace, ui
         // if (!iso14443a_fast_select_card(cjuid, 0)) {
         if (!iso14443a_select_card(cjuid, NULL, &cjcuid, true, 0, true)) {
             cjSetCursLeft();
-            DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "%sFATAL%s : E_MF_LOSTTAG", _RED_, _WHITE_);
+            DbprintfEx(FLAG_NEWLINE, "%sFATAL%s : E_MF_LOSTTAG", _RED_, _WHITE_);
             return -1;
         }
 
@@ -968,7 +968,7 @@ void saMifareMakeTag(void) {
             if (currfline > 53) {
                 currfline = 54;
             }
-            DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "Block :%02x %sOK%s", blockNum, _GREEN_, _WHITE_);
+            DbprintfEx(FLAG_NEWLINE, "Block :%02x %sOK%s", blockNum, _GREEN_, _WHITE_);
             //                                                      DbprintfEx(FLAG_RAWPRINT,"FATAL:E_MF_CHINESECOOK_NORICE");
             //                                                      cfail=1;
             // return;
@@ -977,15 +977,15 @@ void saMifareMakeTag(void) {
             cjSetCursLeft();
             cjSetCursLeft();
 
-            DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "`--> %sFAIL%s : CHN_FAIL_BLK_%02x_NOK", _RED_, _WHITE_, blockNum);
+            DbprintfEx(FLAG_NEWLINE, "`--> %sFAIL%s : CHN_FAIL_BLK_%02x_NOK", _RED_, _WHITE_, blockNum);
             cjSetCursFRight();
-            DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "%s>>>>%s STOP AT %02x", _RED_, _WHITE_, blockNum);
+            DbprintfEx(FLAG_NEWLINE, "%s>>>>%s STOP AT %02x", _RED_, _WHITE_, blockNum);
             cfail++;
             break;
         }
         cjSetCursFRight();
 
-        DbprintfEx(FLAG_NEWLINE | FLAG_ANSI, "%s>>>>>>>> END <<<<<<<<%s", _YELLOW_, _WHITE_);
+        DbprintfEx(FLAG_NEWLINE, "%s>>>>>>>> END <<<<<<<<%s", _YELLOW_, _WHITE_);
         // break;
         /*if (cfail == 1) {
                 DbprintfEx(FLAG_RAWPRINT,"FATAL: E_MF_HARA_KIRI_\r\n");
diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index ce716f026..623d7483f 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -319,7 +319,7 @@ void MeasureAntennaTuningHf(void) {
         DbprintfEx(FLAG_INPLACE, "%u mV / %5u V", volt, (uint16_t)(volt / 1000));
     }
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-    DbprintfEx(FLAG_LOG, "\n[+] cancelled", 1);
+    Dbprintf("\n[+] cancelled", 1);
 }
 
 void ReadMem(int addr) {
@@ -371,7 +371,7 @@ void SendVersion(void) {
 // measure the USB Speed by sending SpeedTestBufferSize bytes to client and measuring the elapsed time.
 // Note: this mimics GetFromBigbuf(), i.e. we have the overhead of the PacketCommandNG structure included.
 void printUSBSpeed(void) {
-    DbpStringEx(FLAG_LOG | FLAG_ANSI, _BLUE_("Transfer Speed"));
+    DbpString(_BLUE_("Transfer Speed"));
     Dbprintf("  Sending packets to client...");
 
 #define USB_SPEED_TEST_MIN_TIME 1500 // in milliseconds
@@ -392,7 +392,7 @@ void printUSBSpeed(void) {
 
     Dbprintf("  Time elapsed............%dms", end_time - start_time);
     Dbprintf("  Bytes transferred.......%d", bytes_transferred);
-    DbprintfEx(FLAG_LOG | FLAG_ANSI, "  Transfer Speed PM3 -> Client = " _YELLOW_("%d") " bytes/s", 1000 * bytes_transferred / (end_time - start_time));
+    Dbprintf("  Transfer Speed PM3 -> Client = " _YELLOW_("%d") " bytes/s", 1000 * bytes_transferred / (end_time - start_time));
 }
 
 /**
@@ -412,12 +412,12 @@ void SendStatus(void) {
     printT55xxConfig(); // LF T55XX Config
 #endif
     printUSBSpeed();
-    DbpStringEx(FLAG_LOG | FLAG_ANSI, _BLUE_("Various"));
+    DbpString(_BLUE_("Various"));
     Dbprintf("  MF_DBGLEVEL.............%d", MF_DBGLEVEL);
     Dbprintf("  ToSendMax...............%d", ToSendMax);
     Dbprintf("  ToSendBit...............%d", ToSendBit);
     Dbprintf("  ToSend BUFFERSIZE.......%d", TOSEND_BUFFER_SIZE);
-    DbpStringEx(FLAG_LOG | FLAG_ANSI, _BLUE_("Installed StandAlone Mode"));
+    DbpString(_BLUE_("Installed StandAlone Mode"));
     ModInfo();
 
     //DbpString("Running ");
diff --git a/armsrc/flashmem.c b/armsrc/flashmem.c
index 6cb13dfc8..47a9b8c97 100644
--- a/armsrc/flashmem.c
+++ b/armsrc/flashmem.c
@@ -517,7 +517,7 @@ void Flash_EraseChip(void) {
 */
 
 void Flashmem_print_status(void) {
-    DbpStringEx(FLAG_LOG | FLAG_ANSI, _BLUE_("Flash memory"));
+    DbpString(_BLUE_("Flash memory"));
     Dbprintf("  Baudrate................%dMHz", FLASHMEM_SPIBAUDRATE / 1000000);
 
     if (!FlashInit()) {
diff --git a/armsrc/fpgaloader.c b/armsrc/fpgaloader.c
index 849524bce..520cce855 100644
--- a/armsrc/fpgaloader.c
+++ b/armsrc/fpgaloader.c
@@ -483,7 +483,7 @@ void SetAdcMuxFor(uint32_t whichGpio) {
 }
 
 void Fpga_print_status(void) {
-    DbpStringEx(FLAG_LOG | FLAG_ANSI, _BLUE_("Currently loaded FPGA image"));
+    DbpString(_BLUE_("Currently loaded FPGA image"));
     Dbprintf("  mode....................%s", fpga_version_information[downloaded_bitstream - 1]);
 }
 
diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index d1a81220f..31418d5b5 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -55,7 +55,7 @@ Default LF T55xx config is set to:
 t55xx_config t_config = { 29 * 8, 17 * 8, 15 * 8, 47 * 8, 15 * 8 } ;
 
 void printT55xxConfig(void) {
-    DbpStringEx(FLAG_LOG | FLAG_ANSI, _BLUE_("LF T55XX config"));
+    DbpString(_BLUE_("LF T55XX config"));
     Dbprintf("  [a] startgap............%d*8 (%d)", t_config.start_gap / 8, t_config.start_gap);
     Dbprintf("  [b] writegap............%d*8 (%d)", t_config.write_gap / 8, t_config.write_gap);
     Dbprintf("  [c] write_0.............%d*8 (%d)", t_config.write_0 / 8,   t_config.write_0);
diff --git a/armsrc/lfsampling.c b/armsrc/lfsampling.c
index 73c8bcd45..1767f2e64 100644
--- a/armsrc/lfsampling.c
+++ b/armsrc/lfsampling.c
@@ -19,7 +19,7 @@ Default LF config is set to:
 sample_config config = { 1, 8, 1, 95, 0 } ;
 
 void printConfig() {
-    DbpStringEx(FLAG_LOG | FLAG_ANSI, _BLUE_("LF Sampling config"));
+    DbpString(_BLUE_("LF Sampling config"));
     Dbprintf("  [q] divisor.............%d (%d KHz)", config.divisor, 12000 / (config.divisor + 1));
     Dbprintf("  [b] bps.................%d", config.bits_per_sample);
     Dbprintf("  [d] decimation..........%d", config.decimation);
diff --git a/client/comms.c b/client/comms.c
index e3bb602bb..b3103ae1c 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -265,13 +265,6 @@ static void PacketResponseReceived(PacketResponseNG *packet) {
     // we got a packet, reset WaitForResponseTimeout timeout
     timeout_start_time = msclock();
 
-    bool filter_ansi = true;
-#if defined(__linux__) || (__APPLE__)
-    struct stat tmp_stat;
-    if ((fstat (STDOUT_FILENO, &tmp_stat) == 0) && (S_ISCHR (tmp_stat.st_mode)) && isatty(STDIN_FILENO))
-        filter_ansi = false;
-#endif
-
     switch (packet->cmd) {
         // First check if we are handling a debug message
         case CMD_DEBUG_PRINT_STRING: {
@@ -289,11 +282,11 @@ static void PacketResponseReceived(PacketResponseNG *packet) {
                 struct d *data = (struct d *)&packet->data.asBytes;
                 len = packet->length - sizeof(data->flag);
                 flag = data->flag;
-                memcpy_filter_ansi(s, data->buf, len, (flag & FLAG_ANSI) && filter_ansi);
+                memcpy(s, data->buf, len);
             } else {
                 len = MIN(packet->oldarg[0], USB_CMD_DATA_SIZE);
                 flag = packet->oldarg[1];
-                memcpy_filter_ansi(s, packet->data.asBytes, len, (flag & FLAG_ANSI) && filter_ansi);
+                memcpy(s, packet->data.asBytes, len);
             }
 
             if (flag & FLAG_LOG) {
diff --git a/client/proxmark3.c b/client/proxmark3.c
index c8f10a49a..d3193040b 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -438,9 +438,21 @@ int main(int argc, char *argv[]) {
         return 1;
     }
 
-    // ascii art
-    bool stdinOnPipe = !isatty(STDIN_FILENO);
-    if (!script_cmds_file && !stdinOnPipe)
+    session.supports_colors = false;
+    session.stdinOnTTY = isatty(STDIN_FILENO);
+    session.stdoutOnTTY = isatty(STDOUT_FILENO);
+#if defined(__linux__) || (__APPLE__)
+    // it's okay to use color if:
+    // * Linux or OSX
+    // * Not redirected to a file but printed to term
+    // For info, grep --color=auto is doing sth like this, plus test getenv("TERM") != "dumb":
+    //   struct stat tmp_stat;
+    //   if ((fstat (STDOUT_FILENO, &tmp_stat) == 0) && (S_ISCHR (tmp_stat.st_mode)) && isatty(STDIN_FILENO))
+    if (session.stdinOnTTY && session.stdoutOnTTY)
+        session.supports_colors = true;
+#endif
+    // ascii art only in interactive client
+    if (!script_cmds_file && !script_cmd && session.stdinOnTTY && session.stdoutOnTTY)
         showBanner();
 
     // Let's take a baudrate ok for real UART, USB-CDC & BT don't use that info anyway
diff --git a/client/ui.c b/client/ui.c
index cff0881ff..1868de28a 100644
--- a/client/ui.c
+++ b/client/ui.c
@@ -16,10 +16,7 @@
 #endif
 
 #include "ui.h"
-#if defined(__linux__) || (__APPLE__)
-#include <unistd.h>
-#include <sys/stat.h>
-#endif
+session_arg_t session;
 
 double CursorScaleFactor = 1;
 int PlotGridX = 0, PlotGridY = 0, PlotGridXdefault = 64, PlotGridYdefault = 64;
@@ -179,12 +176,7 @@ void PrintAndLog(const char *fmt, ...) {
     vsnprintf(buffer, sizeof(buffer), fmt, argptr);
     va_end(argptr);
 
-    bool filter_ansi = true;
-#if defined(__linux__) || (__APPLE__)
-    struct stat tmp_stat;
-    if ((fstat (STDOUT_FILENO, &tmp_stat) == 0) && (S_ISCHR (tmp_stat.st_mode)) && isatty(STDIN_FILENO))
-        filter_ansi = false;
-#endif
+    bool filter_ansi = !session.supports_colors;
     memcpy_filter_ansi(buffer2, buffer, sizeof(buffer), filter_ansi);
     printf("%s", buffer2);
     printf("          "); // cleaning prompt
diff --git a/client/ui.h b/client/ui.h
index 1f493d346..6e14ac2d7 100644
--- a/client/ui.h
+++ b/client/ui.h
@@ -24,6 +24,14 @@
 #include <complex.h>
 #include "util.h"
 
+typedef struct {
+    bool stdinOnTTY;
+    bool stdoutOnTTY;
+    bool supports_colors;
+} session_arg_t;
+
+extern session_arg_t session;
+
 #ifndef M_PI
 #define M_PI 3.14159265358979323846264338327
 #endif
diff --git a/common/i2c.c b/common/i2c.c
index 1a2f2d5d0..cf4614c18 100644
--- a/common/i2c.c
+++ b/common/i2c.c
@@ -593,7 +593,7 @@ bool I2C_WriteFW(uint8_t *data, uint8_t len, uint8_t msb, uint8_t lsb, uint8_t d
 }
 
 void I2C_print_status(void) {
-    DbpStringEx(FLAG_LOG | FLAG_ANSI, _BLUE_("Smart card module (ISO 7816)"));
+    DbpString(_BLUE_("Smart card module (ISO 7816)"));
     uint8_t resp[] = {0, 0, 0, 0};
     I2C_Reset_EnterMainProgram();
     uint8_t len = I2C_BufferRead(resp, sizeof(resp), I2C_DEVICE_CMD_GETVERSION, I2C_DEVICE_ADDRESS_MAIN);

From 937d839c6ab81ca160da16370701f7da04e30d19 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 30 Apr 2019 13:27:19 +0200
Subject: [PATCH 1521/1938] chg: 'script run mfkeys' - use fast push mode.

---
 client/scripts/mfkeys.lua | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/client/scripts/mfkeys.lua b/client/scripts/mfkeys.lua
index bfc221ca1..c2702b4a6 100644
--- a/client/scripts/mfkeys.lua
+++ b/client/scripts/mfkeys.lua
@@ -206,6 +206,10 @@ local function perform_check(numsectors)
         keys[i] = {0,0,'',''}
     end
 
+    core.fast_push_mode(true)
+
+    local start_time = os.time()
+    
     for sector = 0, #keys do
         -- Check if user aborted
         if core.ukbhit() then
@@ -227,9 +231,15 @@ local function perform_check(numsectors)
 
         keys[sector] = {succA, succB, keyA, keyB}
     end
-
+    
+    local end_time = os.time()
+    print('')
+    print('[+] mfkeys - Checkkey execution time: '..os.difftime(end_time, start_time)..' sec')
+    
+    core.fast_push_mode(false)
+    
     display_results(keys)
-
+   
     -- save to dumpkeys.bin
     dumptofile(keys)
 end
@@ -262,7 +272,6 @@ end
 -- The main entry point
 local function main(args)
 
-    local start_time = os.time()
     local numSectors = 16
 
     -- Arguments for the script
@@ -273,14 +282,11 @@ local function main(args)
     -- identify tag
     tag, err = lib14a.read(false, true)
     if not tag then return oops(err) end
-
+    
     -- detect sectors and print taginfo
     numsectors = taginfo(tag)
 
     perform_check(numsectors)
-
-    local end_time = os.time()
-    print('mfkeys - Total execution time: '..os.difftime(end_time, start_time)..' sec')
 end
 
 main( args)

From c1445d2a318f6daffcef1623b32f73069ac90236 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 30 Apr 2019 14:01:23 +0200
Subject: [PATCH 1522/1938] CHG: 'hf mf chk' - uses NG

---
 client/cmdhfmf.c           |  2 +-
 client/mifare/mifarehost.c | 21 ++++++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index abd754708..03e2689a5 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -1933,7 +1933,7 @@ static int CmdHF14AMfChk(const char *Cmd) {
 
 
     uint8_t trgKeyType = 0;
-    uint32_t max_keys = keycnt > (USB_CMD_DATA_SIZE / 6) ? (USB_CMD_DATA_SIZE / 6) : keycnt;
+    uint32_t max_keys = keycnt > ((USB_CMD_DATA_SIZE - 4) / 6) ? ((USB_CMD_DATA_SIZE - 4) / 6) : keycnt;
 
     // time
     uint64_t t1 = msclock();
diff --git a/client/mifare/mifarehost.c b/client/mifare/mifarehost.c
index 54c3804c9..cd823b3a7 100644
--- a/client/mifare/mifarehost.c
+++ b/client/mifare/mifarehost.c
@@ -90,7 +90,7 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
 
         *key = UINT64_C(-1);
         uint8_t keyBlock[USB_CMD_DATA_SIZE];
-        uint32_t max_keys = USB_CMD_DATA_SIZE / 6;
+        uint32_t max_keys = (USB_CMD_DATA_SIZE - 4) / 6;
         for (uint32_t i = 0; i < keycount; i += max_keys) {
 
             uint32_t size = keycount - i > max_keys ? max_keys : keycount - i;
@@ -122,11 +122,18 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
 }
 int mfCheckKeys(uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t keycnt, uint8_t *keyBlock, uint64_t *key) {
     *key = -1;
-    clearCommandBuffer();
-    SendCommandOLD(CMD_MIFARE_CHKKEYS, (blockNo | (keyType << 8)), clear_trace, keycnt, keyBlock, 6 * keycnt);
+    clearCommandBuffer();   
+    uint8_t data[USB_CMD_DATA_SIZE] = {0};
+    data[0] = keyType;
+    data[1] = blockNo;
+    data[2] = clear_trace;
+    data[3] = keycnt;
+    memcpy(data + 4, keyBlock, 6 * keycnt);
+    SendCommandNG(CMD_MIFARE_CHKKEYS, data, (4 + 6 * keycnt) );
+    
     PacketResponseNG resp;
-    if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) return PM3_ETIMEOUT;
-    if ((resp.oldarg[0] & 0xff) != 0x01) return PM3_EUNDEF;
+    if (!WaitForResponseTimeout(CMD_MIFARE_CHKKEYS, &resp, 2500)) return PM3_ETIMEOUT;
+    if (resp.status != PM3_SUCCESS) return PM3_EUNDEF;
     *key = bytes_to_num(resp.data.asBytes, 6);
     return PM3_SUCCESS;
 }
@@ -213,7 +220,7 @@ int mfCheckKeys_fast(uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk,
 // ref: https://github.com/J-Run/mf_key_brute
 int mfKeyBrute(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint64_t *resultkey) {
 
-#define KEYS_IN_BLOCK 85
+#define KEYS_IN_BLOCK 84
 #define KEYBLOCK_SIZE 510
 #define CANDIDATE_SIZE 0xFFFF * 6
 
@@ -372,7 +379,7 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo,
     uint64_t key64 = -1;
 
     // The list may still contain several key candidates. Test each of them with mfCheckKeys
-    uint32_t max_keys = keycnt > (USB_CMD_DATA_SIZE / 6) ? (USB_CMD_DATA_SIZE / 6) : keycnt;
+    uint32_t max_keys = keycnt > ((USB_CMD_DATA_SIZE - 4) / 6) ? ((USB_CMD_DATA_SIZE - 4) / 6) : keycnt;
     uint8_t keyBlock[USB_CMD_DATA_SIZE] = {0x00};
 
     for (i = 0; i < keycnt; i += max_keys) {

From 2dea3684ae0be6c4afdacb33f1da7a0818593a03 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 30 Apr 2019 14:19:26 +0200
Subject: [PATCH 1523/1938] fix: 'hf iclass eload' - enable NG (Thanks @doegox)
 chg: 'hf iclass chk' - now uses fast push mode

---
 client/cmdhficlass.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index 014e6cc9d..8326834a0 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -588,7 +588,7 @@ static int CmdHFiClassELoad(const char *Cmd) {
     }
 
     // fast push mode
-    conn.block_after_ACK = false;
+    conn.block_after_ACK = true;
     
     //Send to device
     uint32_t bytes_sent = 0;
@@ -1947,6 +1947,9 @@ static int CmdHFiClassCheckKeys(const char *Cmd) {
     uint32_t chunksize = keycnt > (USB_CMD_DATA_SIZE / 4) ? (USB_CMD_DATA_SIZE / 4) : keycnt;
     bool lastChunk = false;
 
+    // fast push mode
+    conn.block_after_ACK = true;
+    
     // main keychunk loop
     for (uint32_t i = 0; i < keycnt; i += chunksize) {
 
@@ -2032,6 +2035,11 @@ out:
 
     PrintAndLogEx(SUCCESS, "\nTime in iclass checkkeys: %.0f seconds\n", (float)t1 / 1000.0);
 
+    // Disable fast mode and send a dummy command to make it effective
+    conn.block_after_ACK = false;
+    SendCommandMIX(CMD_PING, 0, 0, 0, NULL, 0);
+    WaitForResponseTimeout(CMD_ACK, NULL, 1000);
+
     DropField();
     free(pre);
     free(keyBlock);

From 6cddaa0a08c575727e5ee6b566f22e8d59e81845 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 30 Apr 2019 14:29:52 +0200
Subject: [PATCH 1524/1938] fix: 'hf mf keybrute' - adapt to NG for checkkeys. 
  Kind of out-of-datem, since hardnested solves this better.

---
 client/mifare/mifarehost.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/mifare/mifarehost.c b/client/mifare/mifarehost.c
index cd823b3a7..293fc76b0 100644
--- a/client/mifare/mifarehost.c
+++ b/client/mifare/mifarehost.c
@@ -220,9 +220,9 @@ int mfCheckKeys_fast(uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk,
 // ref: https://github.com/J-Run/mf_key_brute
 int mfKeyBrute(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint64_t *resultkey) {
 
-#define KEYS_IN_BLOCK 84
-#define KEYBLOCK_SIZE 510
-#define CANDIDATE_SIZE 0xFFFF * 6
+#define KEYS_IN_BLOCK   ((USB_CMD_DATA_SIZE - 4) / 6)
+#define KEYBLOCK_SIZE   (KEYS_IN_BLOCK * 6)
+#define CANDIDATE_SIZE  (0xFFFF * 6)
 
     uint64_t key64;
     uint8_t found = false;

From cddc25994cf7970a0d55496314bfb24d3ed59f51 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 30 Apr 2019 16:16:17 +0200
Subject: [PATCH 1525/1938] fix: by reference

---
 client/comms.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/comms.c b/client/comms.c
index ab39cfb6b..869de55c6 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -646,7 +646,7 @@ int TestProxmark(void) {
             
             // reconfigure.
             if ( conn.send_via_fpc == false ) {
-                uart_reconfigure_timeouts(sp, UART_USB_CLIENT_RX_TIMEOUT_MS );
+                uart_reconfigure_timeouts(&sp, UART_USB_CLIENT_RX_TIMEOUT_MS );
             }
            
             return PM3_SUCCESS;

From 5c9c38ff718d072967131a9daa5ad9d77eb0a497 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 30 Apr 2019 20:19:29 +0200
Subject: [PATCH 1526/1938] Use PrintAndLogEx in flasher

---
 client/comms.c   |  4 +-
 client/flash.c   | 95 ++++++++++++++++++++++++------------------------
 client/flasher.c | 55 ++++++++++++++++------------
 client/ui.c      | 19 ++++++----
 client/ui.h      |  1 -
 5 files changed, 92 insertions(+), 82 deletions(-)

diff --git a/client/comms.c b/client/comms.c
index b3103ae1c..e03654577 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -544,12 +544,12 @@ bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode,
 
     // check result of uart opening
     if (sp == INVALID_SERIAL_PORT) {
-        PrintAndLogEx(WARNING, _RED_("ERROR:") "invalid serial port " _YELLOW_("%s"), portname);
+        PrintAndLogEx(WARNING, "\n" _RED_("ERROR:") "invalid serial port " _YELLOW_("%s"), portname);
         sp = NULL;
         serial_port_name = NULL;
         return false;
     } else if (sp == CLAIMED_SERIAL_PORT) {
-        PrintAndLogEx(WARNING, _RED_("ERROR:") "serial port " _YELLOW_("%s") " is claimed by another process", portname);
+        PrintAndLogEx(WARNING, "\n" _RED_("ERROR:") "serial port " _YELLOW_("%s") " is claimed by another process", portname);
         sp = NULL;
         serial_port_name = NULL;
         return false;
diff --git a/client/flash.c b/client/flash.c
index 17add5777..40c811c08 100644
--- a/client/flash.c
+++ b/client/flash.c
@@ -40,13 +40,13 @@ static int build_segs_from_phdrs(flash_file_t *ctx, FILE *fd, Elf32_Phdr *phdrs,
 
     ctx->segments = calloc(sizeof(flash_seg_t) * num_phdrs, sizeof(uint8_t));
     if (!ctx->segments) {
-        fprintf(stderr, "Out of memory\n");
+        PrintAndLogEx(ERR, "Out of memory");
         return -1;
     }
     ctx->num_segs = 0;
     seg = ctx->segments;
 
-    fprintf(stdout, "Loading usable ELF segments:\n");
+    PrintAndLogEx(NORMAL, "Loading usable ELF segments:");
     for (int i = 0; i < num_phdrs; i++) {
         if (le32(phdr->p_type) != PT_LOAD) {
             phdr++;
@@ -62,27 +62,27 @@ static int build_segs_from_phdrs(flash_file_t *ctx, FILE *fd, Elf32_Phdr *phdrs,
             phdr++;
             continue;
         }
-        fprintf(stdout, "%d: V 0x%08x P 0x%08x (0x%08x->0x%08x) [%c%c%c] @0x%x\n",
+        PrintAndLogEx(NORMAL, "%d: V 0x%08x P 0x%08x (0x%08x->0x%08x) [%c%c%c] @0x%x",
                 i, vaddr, paddr, filesz, memsz,
                 (flags & PF_R) ? 'R' : ' ',
                 (flags & PF_W) ? 'W' : ' ',
                 (flags & PF_X) ? 'X' : ' ',
                 offset);
         if (filesz != memsz) {
-            fprintf(stderr, "Error: PHDR file size does not equal memory size\n"
-                    "(DATA+BSS PHDRs do not make sense on ROM platforms!)\n");
+            PrintAndLogEx(ERR, "Error: PHDR file size does not equal memory size\n"
+                    "(DATA+BSS PHDRs do not make sense on ROM platforms!)");
             return -1;
         }
         if (paddr < last_end) {
-            fprintf(stderr, "Error: PHDRs not sorted or overlap\n");
+            PrintAndLogEx(ERR, "Error: PHDRs not sorted or overlap");
             return -1;
         }
         if (paddr < FLASH_START || (paddr + filesz) > FLASH_END) {
-            fprintf(stderr, "Error: PHDR is not contained in Flash\n");
+            PrintAndLogEx(ERR, "Error: PHDR is not contained in Flash");
             return -1;
         }
         if (vaddr >= FLASH_START && vaddr < FLASH_END && (flags & PF_W)) {
-            fprintf(stderr, "Error: Flash VMA segment is writable\n");
+            PrintAndLogEx(ERR, "Error: Flash VMA segment is writable");
             return -1;
         }
 
@@ -90,11 +90,11 @@ static int build_segs_from_phdrs(flash_file_t *ctx, FILE *fd, Elf32_Phdr *phdrs,
         // make extra space if we need to move the data forward
         data = calloc(filesz + BLOCK_SIZE, sizeof(uint8_t));
         if (!data) {
-            fprintf(stderr, "Error: Out of memory\n");
+            PrintAndLogEx(ERR, "Error: Out of memory");
             return -1;
         }
         if (fseek(fd, offset, SEEK_SET) < 0 || fread(data, 1, filesz, fd) != filesz) {
-            fprintf(stderr, "Error while reading PHDR payload\n");
+            PrintAndLogEx(ERR, "Error while reading PHDR payload");
             free(data);
             return -1;
         }
@@ -113,17 +113,17 @@ static int build_segs_from_phdrs(flash_file_t *ctx, FILE *fd, Elf32_Phdr *phdrs,
                     uint32_t hole = this_offset - prev_seg->length;
                     uint8_t *new_data = calloc(new_length, sizeof(uint8_t));
                     if (!new_data) {
-                        fprintf(stderr, "Error: Out of memory\n");
+                        PrintAndLogEx(ERR, "Error: Out of memory");
                         free(data);
                         return -1;
                     }
                     memset(new_data, 0xff, new_length);
                     memcpy(new_data, prev_seg->data, prev_seg->length);
                     memcpy(new_data + this_offset, data, filesz);
-                    fprintf(stderr, "Note: Extending previous segment from 0x%x to 0x%x bytes\n",
+                    PrintAndLogEx(NORMAL, "Note: Extending previous segment from 0x%x to 0x%x bytes",
                             prev_seg->length, new_length);
                     if (hole)
-                        fprintf(stderr, "Note: 0x%x-byte hole created\n", hole);
+                        PrintAndLogEx(NORMAL, "Note: 0x%x-byte hole created", hole);
                     free(data);
                     free(prev_seg->data);
                     prev_seg->data = new_data;
@@ -133,7 +133,7 @@ static int build_segs_from_phdrs(flash_file_t *ctx, FILE *fd, Elf32_Phdr *phdrs,
                     continue;
                 }
             }
-            fprintf(stderr, "Warning: segment does not begin on a block boundary, will pad\n");
+            PrintAndLogEx(WARNING, "Warning: segment does not begin on a block boundary, will pad");
             memmove(data + block_offset, data, filesz);
             memset(data, 0xFF, block_offset);
             filesz += block_offset;
@@ -158,19 +158,19 @@ static int check_segs(flash_file_t *ctx, int can_write_bl) {
         flash_seg_t *seg = &ctx->segments[i];
 
         if (seg->start & (BLOCK_SIZE - 1)) {
-            fprintf(stderr, "Error: Segment is not aligned\n");
+            PrintAndLogEx(ERR, "Error: Segment is not aligned");
             return -1;
         }
         if (seg->start < FLASH_START) {
-            fprintf(stderr, "Error: Segment is outside of flash bounds\n");
+            PrintAndLogEx(ERR, "Error: Segment is outside of flash bounds");
             return -1;
         }
         if (seg->start + seg->length > FLASH_END) {
-            fprintf(stderr, "Error: Segment is outside of flash bounds\n");
+            PrintAndLogEx(ERR, "Error: Segment is outside of flash bounds");
             return -1;
         }
         if (!can_write_bl && seg->start < BOOTLOADER_END) {
-            fprintf(stderr, "Attempted to write bootloader but bootloader writes are not enabled\n");
+            PrintAndLogEx(ERR, "Attempted to write bootloader but bootloader writes are not enabled");
             return -1;
         }
     }
@@ -187,52 +187,52 @@ int flash_load(flash_file_t *ctx, const char *name, int can_write_bl) {
 
     fd = fopen(name, "rb");
     if (!fd) {
-        fprintf(stderr, _RED_("Could not open file") "%s  >>> ", name);
+        PrintAndLogEx(ERR, _RED_("Could not open file") "%s  >>> ", name);
         perror(NULL);
         goto fail;
     }
 
-    fprintf(stdout, _BLUE_("Loading ELF file") _YELLOW_("%s") "\n", name);
+    PrintAndLogEx(NORMAL, _BLUE_("Loading ELF file") _YELLOW_("%s"), name);
 
     if (fread(&ehdr, sizeof(ehdr), 1, fd) != 1) {
-        fprintf(stderr, "Error while reading ELF file header\n");
+        PrintAndLogEx(ERR, "Error while reading ELF file header");
         goto fail;
     }
     if (memcmp(ehdr.e_ident, elf_ident, sizeof(elf_ident))
             || le32(ehdr.e_version) != 1) {
-        fprintf(stderr, "Not an ELF file or wrong ELF type\n");
+        PrintAndLogEx(ERR, "Not an ELF file or wrong ELF type");
         goto fail;
     }
     if (le16(ehdr.e_type) != ET_EXEC) {
-        fprintf(stderr, "ELF is not executable\n");
+        PrintAndLogEx(ERR, "ELF is not executable");
         goto fail;
     }
     if (le16(ehdr.e_machine) != EM_ARM) {
-        fprintf(stderr, "Wrong ELF architecture\n");
+        PrintAndLogEx(ERR, "Wrong ELF architecture");
         goto fail;
     }
     if (!ehdr.e_phnum || !ehdr.e_phoff) {
-        fprintf(stderr, "ELF has no PHDRs\n");
+        PrintAndLogEx(ERR, "ELF has no PHDRs");
         goto fail;
     }
     if (le16(ehdr.e_phentsize) != sizeof(Elf32_Phdr)) {
         // could be a structure padding issue...
-        fprintf(stderr, "Either the ELF file or this code is made of fail\n");
+        PrintAndLogEx(ERR, "Either the ELF file or this code is made of fail");
         goto fail;
     }
     num_phdrs = le16(ehdr.e_phnum);
 
     phdrs = calloc(le16(ehdr.e_phnum) * sizeof(Elf32_Phdr), sizeof(uint8_t));
     if (!phdrs) {
-        fprintf(stderr, "Out of memory\n");
+        PrintAndLogEx(ERR, "Out of memory");
         goto fail;
     }
     if (fseek(fd, le32(ehdr.e_phoff), SEEK_SET) < 0) {
-        fprintf(stderr, "Error while reading ELF PHDRs\n");
+        PrintAndLogEx(ERR, "Error while reading ELF PHDRs");
         goto fail;
     }
     if (fread(phdrs, sizeof(Elf32_Phdr), num_phdrs, fd) != num_phdrs) {
-        fprintf(stderr, "Error while reading ELF PHDRs\n");
+        PrintAndLogEx(ERR, "Error while reading ELF PHDRs");
         goto fail;
     }
 
@@ -279,7 +279,7 @@ static int get_proxmark_state(uint32_t *state) {
             *state = resp.oldarg[0];
             break;
         default:
-            fprintf(stderr, _RED_("Error:") "Couldn't get Proxmark3 state, bad response type: 0x%04x\n", resp.cmd);
+            PrintAndLogEx(ERR, _RED_("Error:") "Couldn't get Proxmark3 state, bad response type: 0x%04x", resp.cmd);
             return -1;
             break;
     }
@@ -298,18 +298,18 @@ static int enter_bootloader(char *serial_port_name) {
         return 0;
 
     if (state & DEVICE_INFO_FLAG_CURRENT_MODE_OS) {
-        fprintf(stdout, _BLUE_("Entering bootloader...") "\n");
+        PrintAndLogEx(NORMAL, _BLUE_("Entering bootloader..."));
 
         if ((state & DEVICE_INFO_FLAG_BOOTROM_PRESENT)
                 && (state & DEVICE_INFO_FLAG_OSIMAGE_PRESENT)) {
             // New style handover: Send CMD_START_FLASH, which will reset the board
             // and enter the bootrom on the next boot.
             SendCommandOLD(CMD_START_FLASH, 0, 0, 0, NULL, 0);
-            fprintf(stdout, "(Press and release the button only to abort)\n");
+            PrintAndLogEx(NORMAL, "(Press and release the button only to abort)");
         } else {
             // Old style handover: Ask the user to press the button, then reset the board
             SendCommandOLD(CMD_HARDWARE_RESET, 0, 0, 0, NULL, 0);
-            fprintf(stdout, "Press and hold down button NOW if your bootloader requires it.\n");
+            PrintAndLogEx(NORMAL, "Press and hold down button NOW if your bootloader requires it.");
         }
         msleep(100);
         CloseProxmark();
@@ -318,15 +318,15 @@ static int enter_bootloader(char *serial_port_name) {
 
         bool opened = OpenProxmark(serial_port_name, true, 60, true, FLASHMODE_SPEED);
         if (opened) {
-            fprintf(stdout, " " _GREEN_("Found") "\n");
+            PrintAndLogEx(NORMAL, " " _GREEN_("Found"));
             return 0;
         } else {
-            fprintf(stdout, _RED_("Error:") "Proxmark3 not found.\n");
+            PrintAndLogEx(ERR, _RED_("Error:") "Proxmark3 not found.");
             return -1;
         }
     }
 
-    fprintf(stderr, _RED_("Error:") "Unknown Proxmark3 mode\n");
+    PrintAndLogEx(ERR, _RED_("Error:") "Unknown Proxmark3 mode");
     return -1;
 }
 
@@ -334,7 +334,7 @@ static int wait_for_ack(PacketResponseNG *ack) {
     WaitForResponse(CMD_UNKNOWN, ack);
 
     if (ack->cmd != CMD_ACK) {
-        printf("Error: Unexpected reply 0x%04x %s (expected ACK)\n",
+        PrintAndLogEx(ERR, "Error: Unexpected reply 0x%04x %s (expected ACK)",
                ack->cmd,
                (ack->cmd == CMD_NACK) ? "NACK" : ""
               );
@@ -365,8 +365,8 @@ int flash_start_flashing(int enable_bl_writes, char *serial_port_name) {
         }
         return wait_for_ack(&resp);
     } else {
-        fprintf(stderr, _RED_("Note: Your bootloader does not understand the new START_FLASH command") "\n");
-        fprintf(stderr, _RED_("It is recommended that you update your bootloader") "\n\n");
+        PrintAndLogEx(ERR, _RED_("Note: Your bootloader does not understand the new START_FLASH command"));
+        PrintAndLogEx(ERR, _RED_("It is recommended that you update your bootloader") "\n");
     }
     return 0;
 }
@@ -383,17 +383,17 @@ static int write_block(uint32_t address, uint8_t *data, uint32_t length) {
         bool lock_error = resp.oldarg[0] & AT91C_MC_LOCKE;
         bool prog_error = resp.oldarg[0] & AT91C_MC_PROGE;
         bool security_bit = resp.oldarg[0] & AT91C_MC_SECURITY;
-        printf("%s", lock_error ? "       Lock Error\n" : "");
-        printf("%s", prog_error ? "       Invalid Command or bad Keyword\n" : "");
-        printf("%s", security_bit ? "       Security Bit is set!\n" : "");
-        printf("       Lock Bits:      0x%04x\n", lock_bits);
+        PrintAndLogEx(NORMAL, "%s", lock_error ? "       Lock Error" : "");
+        PrintAndLogEx(NORMAL, "%s", prog_error ? "       Invalid Command or bad Keyword" : "");
+        PrintAndLogEx(NORMAL, "%s", security_bit ? "       Security Bit is set!" : "");
+        PrintAndLogEx(NORMAL, "       Lock Bits:      0x%04x", lock_bits);
     }
     return ret;
 }
 
 // Write a file's segments to Flash
 int flash_write(flash_file_t *ctx) {
-    fprintf(stdout, "Writing segments for file: %s\n", ctx->filename);
+    PrintAndLogEx(NORMAL, "Writing segments for file: %s", ctx->filename);
     for (int i = 0; i < ctx->num_segs; i++) {
         flash_seg_t *seg = &ctx->segments[i];
 
@@ -401,7 +401,7 @@ int flash_write(flash_file_t *ctx) {
         uint32_t blocks = (length + BLOCK_SIZE - 1) / BLOCK_SIZE;
         uint32_t end = seg->start + length;
 
-        fprintf(stdout, " 0x%08x..0x%08x [0x%x / %u blocks]", seg->start, end - 1, length, blocks);
+        PrintAndLogEx(NORMAL, " 0x%08x..0x%08x [0x%x / %u blocks]", seg->start, end - 1, length, blocks);
         fflush(stdout);
         int block = 0;
         uint8_t *data = seg->data;
@@ -413,8 +413,7 @@ int flash_write(flash_file_t *ctx) {
                 block_size = BLOCK_SIZE;
 
             if (write_block(baddr, data, block_size) < 0) {
-                fprintf(stderr, " ERROR\n");
-                fprintf(stderr, "Error writing block %d of %u\n", block, blocks);
+                PrintAndLogEx(ERR, "Error writing block %d of %u", block, blocks);
                 return -1;
             }
 
@@ -425,7 +424,7 @@ int flash_write(flash_file_t *ctx) {
             fprintf(stdout, ".");
             fflush(stdout);
         }
-        fprintf(stdout, _GREEN_("OK") "\n");
+        PrintAndLogEx(NORMAL, _GREEN_("OK"));
         fflush(stdout);
     }
     return 0;
diff --git a/client/flasher.c b/client/flasher.c
index 817990d7e..b98f02a8b 100644
--- a/client/flasher.c
+++ b/client/flasher.c
@@ -17,34 +17,35 @@
 #include "flash.h"
 #include "comms.h"
 #include "usb_cmd.h"
+#include "ui.h"
 
 #define MAX_FILES 4
 
 void cmd_debug(PacketCommandOLD *c) {
     //  Debug
-    printf("PacketCommandOLD length[len=%zu]\n", sizeof(PacketCommandOLD));
-    printf("  cmd[len=%zu]: %016" PRIx64"\n", sizeof(c->cmd), c->cmd);
-    printf(" arg0[len=%zu]: %016" PRIx64"\n", sizeof(c->arg[0]), c->arg[0]);
-    printf(" arg1[len=%zu]: %016" PRIx64"\n", sizeof(c->arg[1]), c->arg[1]);
-    printf(" arg2[len=%zu]: %016" PRIx64"\n", sizeof(c->arg[2]), c->arg[2]);
-    printf(" data[len=%zu]: ", sizeof(c->d.asBytes));
+    PrintAndLogEx(NORMAL, "PacketCommandOLD length[len=%zu]", sizeof(PacketCommandOLD));
+    PrintAndLogEx(NORMAL, "  cmd[len=%zu]: %016" PRIx64, sizeof(c->cmd), c->cmd);
+    PrintAndLogEx(NORMAL, " arg0[len=%zu]: %016" PRIx64, sizeof(c->arg[0]), c->arg[0]);
+    PrintAndLogEx(NORMAL, " arg1[len=%zu]: %016" PRIx64, sizeof(c->arg[1]), c->arg[1]);
+    PrintAndLogEx(NORMAL, " arg2[len=%zu]: %016" PRIx64, sizeof(c->arg[2]), c->arg[2]);
+    PrintAndLogEx(NORMAL, " data[len=%zu]: ", sizeof(c->d.asBytes));
 
     for (size_t i = 0; i < 16; i++)
-        printf("%02x", c->d.asBytes[i]);
+        PrintAndLogEx(NORMAL, "%02x", c->d.asBytes[i]);
 
-    printf("...\n");
+    PrintAndLogEx(NORMAL, "...");
 }
 
 static void usage(char *argv0) {
-    fprintf(stdout, "Usage:   %s <port> [-b] image.elf [image.elf...]\n\n", argv0);
-    fprintf(stdout, "\t-b\tEnable flashing of bootloader area (DANGEROUS)\n\n");
-    fprintf(stdout, "\nExample:\n\n\t %s "SERIAL_PORT_H" armsrc/obj/fullimage.elf\n", argv0);
+    PrintAndLogEx(NORMAL, "Usage:   %s <port> [-b] image.elf [image.elf...]\n", argv0);
+    PrintAndLogEx(NORMAL, "\t-b\tEnable flashing of bootloader area (DANGEROUS)\n");
+    PrintAndLogEx(NORMAL, "\nExample:\n\n\t %s "SERIAL_PORT_H" armsrc/obj/fullimage.elf", argv0);
 #ifdef __linux__
-    fprintf(stdout, "\nNote (Linux): if the flasher gets stuck in 'Waiting for Proxmark3 to reappear on <DEVICE>',\n");
-    fprintf(stdout, "              you need to blacklist Proxmark3 for modem-manager - see wiki for more details:\n\n");
-    fprintf(stdout, "              https://github.com/Proxmark/proxmark3/wiki/Gentoo Linux\n\n");
-    fprintf(stdout, "              https://github.com/Proxmark/proxmark3/wiki/Ubuntu Linux\n\n");
-    fprintf(stdout, "              https://github.com/Proxmark/proxmark3/wiki/OSX\n\n");
+    PrintAndLogEx(NORMAL, "\nNote (Linux): if the flasher gets stuck in 'Waiting for Proxmark3 to reappear on <DEVICE>',");
+    PrintAndLogEx(NORMAL, "              you need to blacklist Proxmark3 for modem-manager - see wiki for more details:\n");
+    PrintAndLogEx(NORMAL, "              https://github.com/Proxmark/proxmark3/wiki/Gentoo Linux\n");
+    PrintAndLogEx(NORMAL, "              https://github.com/Proxmark/proxmark3/wiki/Ubuntu Linux\n");
+    PrintAndLogEx(NORMAL, "              https://github.com/Proxmark/proxmark3/wiki/OSX\n");
 #endif
 }
 
@@ -56,6 +57,14 @@ int main(int argc, char **argv) {
 
     memset(files, 0, sizeof(files));
 
+    session.supports_colors = false;
+    session.stdinOnTTY = isatty(STDIN_FILENO);
+    session.stdoutOnTTY = isatty(STDOUT_FILENO);
+#if defined(__linux__) || (__APPLE__)
+    if (session.stdinOnTTY && session.stdoutOnTTY)
+        session.supports_colors = true;
+#endif
+
     if (argc < 3) {
         usage(argv[0]);
         return -1;
@@ -74,7 +83,7 @@ int main(int argc, char **argv) {
             if (res < 0)
                 return -1;
 
-            fprintf(stderr, "\n");
+            PrintAndLogEx(NORMAL, "");
             num_files++;
         }
     }
@@ -82,27 +91,27 @@ int main(int argc, char **argv) {
     char *serial_port_name = argv[1];
 
     if (!OpenProxmark(serial_port_name, true, 60, true, FLASHMODE_SPEED)) {
-        fprintf(stderr, "Could not find Proxmark3 on " _RED_("%s") ".\n\n", serial_port_name);
+        PrintAndLogEx(ERR, "Could not find Proxmark3 on " _RED_("%s") ".\n", serial_port_name);
         return -1;
     } else {
-        fprintf(stderr, _GREEN_("Found") "\n");
+        PrintAndLogEx(NORMAL, _GREEN_("Found"));
     }
 
     res = flash_start_flashing(can_write_bl, serial_port_name);
     if (res < 0)
         return -1;
 
-    fprintf(stdout, "\n" _BLUE_("Flashing...")"\n");
+    PrintAndLogEx(NORMAL, "\n" _BLUE_("Flashing..."));
 
     for (int i = 0; i < num_files; i++) {
         res = flash_write(&files[i]);
         if (res < 0)
             return -1;
         flash_free(&files[i]);
-        fprintf(stdout, "\n");
+        PrintAndLogEx(NORMAL, "\n");
     }
 
-    fprintf(stdout, _BLUE_("Resetting hardware...") "\n");
+    PrintAndLogEx(NORMAL, _BLUE_("Resetting hardware..."));
 
     res = flash_stop_flashing();
     if (res < 0)
@@ -110,6 +119,6 @@ int main(int argc, char **argv) {
 
     CloseProxmark();
 
-    fprintf(stdout, _BLUE_("All done.") "\n\nHave a nice day!\n");
+    PrintAndLogEx(NORMAL, _BLUE_("All done.") "\n\nHave a nice day!");
     return 0;
 }
diff --git a/client/ui.c b/client/ui.c
index 1868de28a..816ec2863 100644
--- a/client/ui.c
+++ b/client/ui.c
@@ -28,6 +28,7 @@ bool showDemod = true;
 
 pthread_mutex_t print_lock = PTHREAD_MUTEX_INITIALIZER;
 static const char *logfilename = "proxmark3.log";
+static void fPrintAndLog(FILE *stream, const char *fmt, ...);
 
 /*
 static float complex cexpf(float complex Z) {
@@ -74,10 +75,12 @@ void PrintAndLogEx(logLevel_t level, const char *fmt, ...) {
     char *tmp_ptr = NULL;
     //   {NORMAL, SUCCESS, INFO, FAILED, WARNING, ERR, DEBUG}
     static const char *prefixes[7] = { "", "[+] ", "[=] ", "[-] ", "[!] ", "[!!] ", "[#] "};
+    FILE* stream = stdout;
 
     switch (level) {
         case ERR:
             strncpy(prefix, _RED_("[!!]"), sizeof(prefix) - 1);
+            stream = stderr;
             break;
         case FAILED:
             strncpy(prefix, _RED_("[-]"), sizeof(prefix) - 1);
@@ -104,7 +107,7 @@ void PrintAndLogEx(logLevel_t level, const char *fmt, ...) {
 
     // no prefixes for normal
     if (level == NORMAL) {
-        PrintAndLog("%s", buffer);
+        fPrintAndLog(stream, "%s", buffer);
         return;
     }
 
@@ -114,7 +117,7 @@ void PrintAndLogEx(logLevel_t level, const char *fmt, ...) {
 
         // line starts with newline
         if (buffer[0] == '\n')
-            PrintAndLog("");
+            fPrintAndLog(stream, "");
 
         token = strtok_r(buffer, delim, &tmp_ptr);
 
@@ -129,14 +132,14 @@ void PrintAndLogEx(logLevel_t level, const char *fmt, ...) {
 
             token = strtok_r(NULL, delim, &tmp_ptr);
         }
-        PrintAndLog("%s", buffer2);
+        fPrintAndLog(stream, "%s", buffer2);
     } else {
         snprintf(buffer2, sizeof(buffer2), "%s%s", prefix, buffer);
-        PrintAndLog("%s", buffer2);
+        fPrintAndLog(stream, "%s", buffer2);
     }
 }
 
-void PrintAndLog(const char *fmt, ...) {
+static void fPrintAndLog(FILE *stream, const char *fmt, ...) {
     char *saved_line;
     int saved_point;
     va_list argptr;
@@ -178,9 +181,9 @@ void PrintAndLog(const char *fmt, ...) {
 
     bool filter_ansi = !session.supports_colors;
     memcpy_filter_ansi(buffer2, buffer, sizeof(buffer), filter_ansi);
-    printf("%s", buffer2);
-    printf("          "); // cleaning prompt
-    printf("\n");
+    fprintf(stream, "%s", buffer2);
+    fprintf(stream, "          "); // cleaning prompt
+    fprintf(stream, "\n");
 
 #ifdef RL_STATE_READCMD
     // We are using GNU readline. libedit (OSX) doesn't support this flag.
diff --git a/client/ui.h b/client/ui.h
index 6e14ac2d7..0ffe02aa5 100644
--- a/client/ui.h
+++ b/client/ui.h
@@ -42,7 +42,6 @@ void ShowGui(void);
 void HideGraphWindow(void);
 void ShowGraphWindow(void);
 void RepaintGraphWindow(void);
-void PrintAndLog(const char *fmt, ...);
 void PrintAndLogOptions(const char *str[][2], size_t size, size_t space);
 void PrintAndLogEx(logLevel_t level, const char *fmt, ...);
 void SetLogFilename(char *fn);

From a5d05e8d4256f50977ed94bbe4c9e94e5ea21bd3 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 30 Apr 2019 20:23:15 +0200
Subject: [PATCH 1527/1938] Remove cmd_debug from flasher, we've
 COMMS_DEBUG_RAW if needed

---
 client/flasher.c | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/client/flasher.c b/client/flasher.c
index b98f02a8b..8e1f44aa9 100644
--- a/client/flasher.c
+++ b/client/flasher.c
@@ -21,21 +21,6 @@
 
 #define MAX_FILES 4
 
-void cmd_debug(PacketCommandOLD *c) {
-    //  Debug
-    PrintAndLogEx(NORMAL, "PacketCommandOLD length[len=%zu]", sizeof(PacketCommandOLD));
-    PrintAndLogEx(NORMAL, "  cmd[len=%zu]: %016" PRIx64, sizeof(c->cmd), c->cmd);
-    PrintAndLogEx(NORMAL, " arg0[len=%zu]: %016" PRIx64, sizeof(c->arg[0]), c->arg[0]);
-    PrintAndLogEx(NORMAL, " arg1[len=%zu]: %016" PRIx64, sizeof(c->arg[1]), c->arg[1]);
-    PrintAndLogEx(NORMAL, " arg2[len=%zu]: %016" PRIx64, sizeof(c->arg[2]), c->arg[2]);
-    PrintAndLogEx(NORMAL, " data[len=%zu]: ", sizeof(c->d.asBytes));
-
-    for (size_t i = 0; i < 16; i++)
-        PrintAndLogEx(NORMAL, "%02x", c->d.asBytes[i]);
-
-    PrintAndLogEx(NORMAL, "...");
-}
-
 static void usage(char *argv0) {
     PrintAndLogEx(NORMAL, "Usage:   %s <port> [-b] image.elf [image.elf...]\n", argv0);
     PrintAndLogEx(NORMAL, "\t-b\tEnable flashing of bootloader area (DANGEROUS)\n");

From 27f70579611478fd277ddeb9beda91fa09117729 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 30 Apr 2019 21:10:11 +0200
Subject: [PATCH 1528/1938] Rename few USB -> PM3 to avoid misleading
 interpretations

---
 armsrc/Standalone/hf_mattyrun.h               |  2 +-
 armsrc/appmain.c                              | 30 +++++++++----------
 armsrc/iclass.c                               | 12 ++++----
 armsrc/iso14443a.c                            |  2 +-
 armsrc/iso14443a.h                            |  2 +-
 armsrc/iso14443b.c                            |  4 +--
 armsrc/mifarecmd.c                            | 14 ++++-----
 armsrc/mifaredesfire.c                        |  8 ++---
 armsrc/mifaresniff.c                          |  2 +-
 bootrom/bootrom.c                             |  4 +--
 client/Makefile                               |  8 ++---
 client/cmdanalyse.c                           |  4 +--
 client/cmdhf14a.c                             | 16 +++++-----
 client/cmdhf14b.c                             |  8 ++---
 client/cmdhf15.c                              |  8 ++---
 client/cmdhfepa.c                             |  2 +-
 client/cmdhffelica.c                          |  6 ++--
 client/cmdhficlass.c                          | 10 +++----
 client/cmdhficlass.h                          |  2 +-
 client/cmdhflegic.c                           | 12 ++++----
 client/cmdhfmf.c                              |  4 +--
 client/cmdhw.c                                |  6 ++--
 client/cmdlf.c                                | 24 +++++++--------
 client/cmdlfhitag.c                           |  6 ++--
 client/cmdmain.h                              |  2 +-
 client/cmdsmartcard.c                         | 18 +++++------
 client/cmdtrace.c                             |  8 ++---
 client/comms.c                                | 20 ++++++-------
 client/comms.h                                |  2 +-
 client/flash.h                                |  2 +-
 client/flasher.c                              |  2 +-
 client/mifare/mifarehost.c                    | 12 ++++----
 .../{usb_cmd_h2lua.awk => pm3_cmd_h2lua.awk}  |  2 +-
 client/proxmark3.h                            |  2 +-
 client/scripting.c                            | 10 +++----
 client/scripting.h                            |  2 +-
 common/Makefile.common                        |  2 +-
 common/cmd.c                                  | 20 ++++++-------
 common/cmd.h                                  |  2 +-
 include/{usb_cmd.h => pm3_cmd.h}              | 24 +++++++--------
 include/proxmark3.h                           |  2 +-
 uart/uart_posix.c                             |  2 +-
 42 files changed, 165 insertions(+), 165 deletions(-)
 rename client/{usb_cmd_h2lua.awk => pm3_cmd_h2lua.awk} (85%)
 rename include/{usb_cmd.h => pm3_cmd.h} (97%)

diff --git a/armsrc/Standalone/hf_mattyrun.h b/armsrc/Standalone/hf_mattyrun.h
index c37624821..5577e298a 100644
--- a/armsrc/Standalone/hf_mattyrun.h
+++ b/armsrc/Standalone/hf_mattyrun.h
@@ -14,7 +14,7 @@
 
 #include "standalone.h" // standalone definitions
 #include "apps.h"       // debugstatements, lfops?
-#include "usb_cmd.h"    // mifare1ksim flags
+#include "pm3_cmd.h"    // mifare1ksim flags
 #include "mifaresim.h"  // mifare1ksim
 #include "mifareutil.h"
 
diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index ce716f026..b81f7a70b 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -118,7 +118,7 @@ void DbpStringEx(uint32_t flags, char *str) {
 #if DEBUG
     struct {
         uint16_t flag;
-        uint8_t buf[USB_CMD_DATA_SIZE - sizeof(uint16_t)];
+        uint8_t buf[PM3_CMD_DATA_SIZE - sizeof(uint16_t)];
     } PACKED data;
     data.flag = flags;
     uint16_t len = MIN(strlen(str), sizeof(data.buf));
@@ -333,8 +333,8 @@ extern struct version_information version_information;
 /* bootrom version information is pointed to from _bootphase1_version_pointer */
 extern char *_bootphase1_version_pointer, _flash_start, _flash_end, _bootrom_start, _bootrom_end, __data_src_start__;
 void SendVersion(void) {
-    char temp[USB_CMD_DATA_SIZE]; /* Limited data payload in USB packets */
-    char VersionString[USB_CMD_DATA_SIZE] = { '\0' };
+    char temp[PM3_CMD_DATA_SIZE]; /* Limited data payload in USB packets */
+    char VersionString[PM3_CMD_DATA_SIZE] = { '\0' };
 
     /* Try to find the bootrom version information. Expect to find a pointer at
      * symbol _bootphase1_version_pointer, perform slight sanity checks on the
@@ -384,9 +384,9 @@ void printUSBSpeed(void) {
     LED_B_ON();
 
     while (end_time < start_time + USB_SPEED_TEST_MIN_TIME) {
-        reply_ng(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K, PM3_SUCCESS, test_data, USB_CMD_DATA_SIZE);
+        reply_ng(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K, PM3_SUCCESS, test_data, PM3_CMD_DATA_SIZE);
         end_time = GetTickCount();
-        bytes_transferred += USB_CMD_DATA_SIZE;
+        bytes_transferred += PM3_CMD_DATA_SIZE;
     }
     LED_B_OFF();
 
@@ -1089,7 +1089,7 @@ static void PacketReceived(PacketCommandNG *packet) {
         case CMD_SMART_UPLOAD: {
             // upload file from client
             uint8_t *mem = BigBuf_get_addr();
-            memcpy(mem + packet->oldarg[0], packet->data.asBytes, USB_CMD_DATA_SIZE);
+            memcpy(mem + packet->oldarg[0], packet->data.asBytes, PM3_CMD_DATA_SIZE);
             reply_old(CMD_ACK, 1, 0, 0, 0, 0);
             break;
         }
@@ -1205,8 +1205,8 @@ static void PacketReceived(PacketCommandNG *packet) {
             // arg2 = BigBuf tracelen
             //Dbprintf("transfer to client parameters: %" PRIu32 " | %" PRIu32 " | %" PRIu32, startidx, numofbytes, packet->oldarg[2]);
 
-            for (size_t i = 0; i < numofbytes; i += USB_CMD_DATA_SIZE) {
-                size_t len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);
+            for (size_t i = 0; i < numofbytes; i += PM3_CMD_DATA_SIZE) {
+                size_t len = MIN((numofbytes - i), PM3_CMD_DATA_SIZE);
                 int result = reply_old(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K, i, len, BigBuf_get_traceLen(), mem + startidx + i, len);
                 if (result != PM3_SUCCESS)
                     Dbprintf("transfer to client failed ::  | bytes between %d - %d (%d) | result: %d", i, i + len, len, result);
@@ -1234,7 +1234,7 @@ static void PacketReceived(PacketCommandNG *packet) {
                 FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
 
             uint8_t *mem = BigBuf_get_addr();
-            memcpy(mem + packet->oldarg[0], packet->data.asBytes, USB_CMD_DATA_SIZE);
+            memcpy(mem + packet->oldarg[0], packet->data.asBytes, PM3_CMD_DATA_SIZE);
             reply_old(CMD_ACK, 1, 0, 0, 0, 0);
             break;
         }
@@ -1249,8 +1249,8 @@ static void PacketReceived(PacketCommandNG *packet) {
             // arg1 = length bytes to transfer
             // arg2 = RFU
 
-            for (size_t i = 0; i < numofbytes; i += USB_CMD_DATA_SIZE) {
-                len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);
+            for (size_t i = 0; i < numofbytes; i += PM3_CMD_DATA_SIZE) {
+                len = MIN((numofbytes - i), PM3_CMD_DATA_SIZE);
                 int result = reply_old(CMD_DOWNLOADED_EML_BIGBUF, i, len, 0, mem + startidx + i, len);
                 if (result != PM3_SUCCESS)
                     Dbprintf("transfer to client failed ::  | bytes between %d - %d (%d) | result: %d", i, i + len, len, result);
@@ -1274,7 +1274,7 @@ static void PacketReceived(PacketCommandNG *packet) {
 
             Dbprintf("FlashMem read | %d - %d | ", startidx, len);
 
-            size_t size = MIN(USB_CMD_DATA_SIZE, len);
+            size_t size = MIN(PM3_CMD_DATA_SIZE, len);
 
             if (!FlashInit()) {
                 break;
@@ -1383,7 +1383,7 @@ static void PacketReceived(PacketCommandNG *packet) {
         case CMD_FLASHMEM_DOWNLOAD: {
 
             LED_B_ON();
-            uint8_t *mem = BigBuf_malloc(USB_CMD_DATA_SIZE);
+            uint8_t *mem = BigBuf_malloc(PM3_CMD_DATA_SIZE);
             uint32_t startidx = packet->oldarg[0];
             uint32_t numofbytes = packet->oldarg[1];
             // arg0 = startindex
@@ -1394,8 +1394,8 @@ static void PacketReceived(PacketCommandNG *packet) {
                 break;
             }
 
-            for (size_t i = 0; i < numofbytes; i += USB_CMD_DATA_SIZE) {
-                size_t len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);
+            for (size_t i = 0; i < numofbytes; i += PM3_CMD_DATA_SIZE) {
+                size_t len = MIN((numofbytes - i), PM3_CMD_DATA_SIZE);
 
                 bool isok = Flash_ReadDataCont(startidx + i, mem, len);
                 if (!isok)
diff --git a/armsrc/iclass.c b/armsrc/iclass.c
index 9e8dfd653..8d52ba209 100644
--- a/armsrc/iclass.c
+++ b/armsrc/iclass.c
@@ -1168,7 +1168,7 @@ void SimulateIClass(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain
 
     //Use the emulator memory for SIM
     uint8_t *emulator = BigBuf_get_EM_addr();
-    uint8_t mac_responses[USB_CMD_DATA_SIZE] = { 0 };
+    uint8_t mac_responses[PM3_CMD_DATA_SIZE] = { 0 };
 
     if (simType == 0) {
         // Use the CSN from commandline
@@ -1188,7 +1188,7 @@ void SimulateIClass(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain
         // in order to obtain the keys, as in the "dismantling iclass"-paper.
 #define EPURSE_MAC_SIZE 16
         int i = 0;
-        for (; i < numberOfCSNS && i * EPURSE_MAC_SIZE + 8 < USB_CMD_DATA_SIZE; i++) {
+        for (; i < numberOfCSNS && i * EPURSE_MAC_SIZE + 8 < PM3_CMD_DATA_SIZE; i++) {
             // The usb data is 512 bytes, fitting 65 8-byte CSNs in there.
 
             memcpy(emulator, datain + (i * 8), 8);
@@ -1220,7 +1220,7 @@ void SimulateIClass(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain
         // attack below is same as SIM 2, but we run the CSN twice to collected the mac for both keys.
         int i = 0;
         // The usb data is 512 bytes, fitting 65 8-byte CSNs in there.  iceman fork uses 9 CSNS
-        for (; i < numberOfCSNS && i * EPURSE_MAC_SIZE + 8 < USB_CMD_DATA_SIZE; i++) {
+        for (; i < numberOfCSNS && i * EPURSE_MAC_SIZE + 8 < PM3_CMD_DATA_SIZE; i++) {
 
             memcpy(emulator, datain + (i * 8), 8);
 
@@ -2110,7 +2110,7 @@ void ReaderIClass_Replay(uint8_t arg0, uint8_t *mac) {
     uint8_t mem = 0;
     uint8_t check[] = { 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
     uint8_t read[]  = { 0x0c, 0x00, 0x00, 0x00 };
-    uint8_t card_data[USB_CMD_DATA_SIZE] = {0};
+    uint8_t card_data[PM3_CMD_DATA_SIZE] = {0};
     uint8_t resp[ICLASS_BUFFER_SIZE] = {0};
 
     static struct memory_t {
@@ -2158,7 +2158,7 @@ void ReaderIClass_Replay(uint8_t arg0, uint8_t *mac) {
 
         WDT_HIT();
         //Set card_data to all zeroes, we'll fill it with data
-        memset(card_data, 0x0, USB_CMD_DATA_SIZE);
+        memset(card_data, 0x0, PM3_CMD_DATA_SIZE);
         uint8_t failedRead = 0;
         uint32_t stored_data_length = 0;
 
@@ -2178,7 +2178,7 @@ void ReaderIClass_Replay(uint8_t arg0, uint8_t *mac) {
                 //Fill up the buffer
                 memcpy(card_data + stored_data_length, resp, 8);
                 stored_data_length += 8;
-                if (stored_data_length + 8 > USB_CMD_DATA_SIZE) {
+                if (stored_data_length + 8 > PM3_CMD_DATA_SIZE) {
                     //Time to send this off and start afresh
                     reply_old(CMD_ACK,
                               stored_data_length,//data length
diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 702e83e2b..2b5c3f06f 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -2406,7 +2406,7 @@ void ReaderIso14443a(PacketCommandNG *c) {
     uint32_t timeout = c->oldarg[2];
     uint8_t *cmd = c->data.asBytes;
     uint32_t arg0;
-    uint8_t buf[USB_CMD_DATA_SIZE] = {0x00};
+    uint8_t buf[PM3_CMD_DATA_SIZE] = {0x00};
     uint8_t par[MAX_PARITY_SIZE] = {0x00};
 
     if ((param & ISO14A_CONNECT))
diff --git a/armsrc/iso14443a.h b/armsrc/iso14443a.h
index 3c89f17af..4d898e18d 100644
--- a/armsrc/iso14443a.h
+++ b/armsrc/iso14443a.h
@@ -17,7 +17,7 @@
 extern "C" {
 #endif
 
-#include "usb_cmd.h"
+#include "pm3_cmd.h"
 #include "cmd.h"
 #include "apps.h"
 #include "util.h"
diff --git a/armsrc/iso14443b.c b/armsrc/iso14443b.c
index 5484b435c..e72625761 100644
--- a/armsrc/iso14443b.c
+++ b/armsrc/iso14443b.c
@@ -1573,7 +1573,7 @@ void SendRawCommand14443B_Ex(PacketCommandNG *c) {
     uint8_t *cmd = c->data.asBytes;
     uint8_t status;
     uint32_t sendlen = sizeof(iso14b_card_select_t);
-    uint8_t buf[USB_CMD_DATA_SIZE] = {0x00};
+    uint8_t buf[PM3_CMD_DATA_SIZE] = {0x00};
 
     if (MF_DBGLEVEL > 3) Dbprintf("14b raw: param, %04x", param);
 
@@ -1621,7 +1621,7 @@ void SendRawCommand14443B_Ex(PacketCommandNG *c) {
         CodeAndTransmit14443bAsReader(cmd, len); // raw
         GetTagSamplesFor14443bDemod(); // raw
 
-        sendlen = MIN(Demod.len, USB_CMD_DATA_SIZE);
+        sendlen = MIN(Demod.len, PM3_CMD_DATA_SIZE);
         status = (Demod.len > 0) ? 0 : 1;
         reply_old(CMD_ACK, status, sendlen, 0, Demod.output, sendlen);
     }
diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index db421954c..36510dfbf 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -621,7 +621,7 @@ void MifareAcquireNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *
     uint8_t uid[10] = {0x00};
     uint8_t answer[MAX_MIFARE_FRAME_SIZE] = {0x00};
     uint8_t par[1] = {0x00};
-    uint8_t buf[USB_CMD_DATA_SIZE] = {0x00};
+    uint8_t buf[PM3_CMD_DATA_SIZE] = {0x00};
     uint32_t cuid = 0;
     int16_t isOK = 0;
     uint16_t num_nonces = 0;
@@ -645,7 +645,7 @@ void MifareAcquireNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *
 
     LED_C_ON();
 
-    for (uint16_t i = 0; i <= USB_CMD_DATA_SIZE - 4; i += 4) {
+    for (uint16_t i = 0; i <= PM3_CMD_DATA_SIZE - 4; i += 4) {
 
         // Test if the action was cancelled
         if (BUTTON_PRESS()) {
@@ -733,7 +733,7 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
     uint8_t uid[10] = {0x00};
     uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};
     uint8_t par_enc[1] = {0x00};
-    uint8_t buf[USB_CMD_DATA_SIZE] = {0x00};
+    uint8_t buf[PM3_CMD_DATA_SIZE] = {0x00};
 
     uint64_t ui64Key = bytes_to_num(datain, 6);
     uint32_t cuid = 0;
@@ -763,7 +763,7 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
 
     LED_C_ON();
 
-    for (uint16_t i = 0; i <= USB_CMD_DATA_SIZE - 9;) {
+    for (uint16_t i = 0; i <= PM3_CMD_DATA_SIZE - 9;) {
 
         // Test if the action was cancelled
         if (BUTTON_PRESS()) {
@@ -1645,11 +1645,11 @@ void MifareEMemSet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)
 
 void MifareEMemGet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain) {
     FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-    uint8_t buf[USB_CMD_DATA_SIZE] = {0x00};
+    uint8_t buf[PM3_CMD_DATA_SIZE] = {0x00};
     emlGetMem(buf, arg0, arg1); // data, block num, blocks count (max 4)
 
     LED_B_ON();
-    reply_old(CMD_ACK, arg0, arg1, 0, buf, USB_CMD_DATA_SIZE);
+    reply_old(CMD_ACK, arg0, arg1, 0, buf, PM3_CMD_DATA_SIZE);
     LED_B_OFF();
 }
 
@@ -1949,7 +1949,7 @@ void MifareCIdent() {
     uint8_t recpar[1] = {0x00};
     uint8_t rats[4] = { ISO14443A_CMD_RATS, 0x80, 0x31, 0x73 };
     uint8_t *par = BigBuf_malloc(MAX_PARITY_SIZE);
-    uint8_t *buf = BigBuf_malloc(USB_CMD_DATA_SIZE);
+    uint8_t *buf = BigBuf_malloc(PM3_CMD_DATA_SIZE);
     uint8_t *uid = BigBuf_malloc(10);
     uint32_t cuid = 0;
 
diff --git a/armsrc/mifaredesfire.c b/armsrc/mifaredesfire.c
index 4854adc51..c152bcb9f 100644
--- a/armsrc/mifaredesfire.c
+++ b/armsrc/mifaredesfire.c
@@ -88,8 +88,8 @@ void MifareDesfireGetInformation() {
 
     int len = 0;
     iso14a_card_select_t card;
-    uint8_t resp[USB_CMD_DATA_SIZE] = {0x00};
-    uint8_t dataout[USB_CMD_DATA_SIZE] = {0x00};
+    uint8_t resp[PM3_CMD_DATA_SIZE] = {0x00};
+    uint8_t dataout[PM3_CMD_DATA_SIZE] = {0x00};
 
     /*
         1 = PCB                 1
@@ -505,7 +505,7 @@ int DesfireAPDU(uint8_t *cmd, size_t cmd_len, uint8_t *dataout) {
 
     size_t len = 0;
     size_t wrappedLen = 0;
-    uint8_t wCmd[USB_CMD_DATA_SIZE] = {0x00};
+    uint8_t wCmd[PM3_CMD_DATA_SIZE] = {0x00};
     uint8_t resp[MAX_FRAME_SIZE];
     uint8_t par[MAX_PARITY_SIZE];
 
@@ -537,7 +537,7 @@ int DesfireAPDU(uint8_t *cmd, size_t cmd_len, uint8_t *dataout) {
 // CreateAPDU
 size_t CreateAPDU(uint8_t *datain, size_t len, uint8_t *dataout) {
 
-    size_t cmdlen = MIN(len + 4, USB_CMD_DATA_SIZE - 1);
+    size_t cmdlen = MIN(len + 4, PM3_CMD_DATA_SIZE - 1);
 
     uint8_t cmd[cmdlen];
     memset(cmd, 0, cmdlen);
diff --git a/armsrc/mifaresniff.c b/armsrc/mifaresniff.c
index 5d50f55c5..790614c01 100644
--- a/armsrc/mifaresniff.c
+++ b/armsrc/mifaresniff.c
@@ -315,7 +315,7 @@ void RAMFUNC MfSniffSend() {
 
     while (packlen > 0) {
         LED_B_ON();
-        chunksize = MIN(USB_CMD_DATA_SIZE, packlen); // chunk size 512
+        chunksize = MIN(PM3_CMD_DATA_SIZE, packlen); // chunk size 512
         reply_old(CMD_ACK, 1, tracelen, chunksize, data + tracelen - packlen, chunksize);
         packlen -= chunksize;
         LED_B_OFF();
diff --git a/bootrom/bootrom.c b/bootrom/bootrom.c
index 8b1545332..7caa01360 100644
--- a/bootrom/bootrom.c
+++ b/bootrom/bootrom.c
@@ -26,9 +26,9 @@ static int reply_old(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2,
     txcmd.arg[1] = arg1;
     txcmd.arg[2] = arg2;
 
-    // Add the (optional) content to the frame, with a maximum size of USB_CMD_DATA_SIZE
+    // Add the (optional) content to the frame, with a maximum size of PM3_CMD_DATA_SIZE
     if (data && len) {
-        len = MIN(len, USB_CMD_DATA_SIZE);
+        len = MIN(len, PM3_CMD_DATA_SIZE);
         for (size_t i = 0; i < len; i++) {
             txcmd.d.asBytes[i] = ((uint8_t *)data)[i];
         }
diff --git a/client/Makefile b/client/Makefile
index d6f25156e..9b35d6df8 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -283,7 +283,7 @@ ifeq "$(SUPPORTS_AVX512)" "True"
 endif
 
 BINS = proxmark3 flasher fpga_compress
-CLEAN = $(BINS) $(COREOBJS) $(CMDOBJS) $(OBJCOBJS) $(ZLIBOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(OBJDIR)/*.o *.moc.cpp ui/ui_overlays.h lualibs/usb_cmd.lua lualibs/mf_default_keys.lua
+CLEAN = $(BINS) $(COREOBJS) $(CMDOBJS) $(OBJCOBJS) $(ZLIBOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(OBJDIR)/*.o *.moc.cpp ui/ui_overlays.h lualibs/pm3_cmd.lua lualibs/mf_default_keys.lua
 
 # need to assign dependancies to build these first...
 all: lua_build jansson_build mbedtls_build cbor_build $(BINS)
@@ -292,7 +292,7 @@ all-static: LDLIBS:=-static $(LDLIBS)
 all-static: proxmark3 flasher fpga_compress
 
 proxmark3: LDLIBS+=$(LUALIB) $(JANSSONLIB) $(MBEDTLSLIB) $(CBORLIB) $(QTLDLIBS)
-proxmark3: $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(OBJCOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(ZLIBOBJS) lualibs/usb_cmd.lua lualibs/mf_default_keys.lua
+proxmark3: $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(OBJCOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(ZLIBOBJS) lualibs/pm3_cmd.lua lualibs/mf_default_keys.lua
 	$(LD) $(LDFLAGS) $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(OBJCOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(ZLIBOBJS) $(LDLIBS)  -o $@
 
 flasher: $(OBJDIR)/flash.o $(OBJDIR)/flasher.o $(COREOBJS) $(OBJCOBJS)
@@ -309,8 +309,8 @@ proxguiqt.moc.cpp: proxguiqt.h
 ui/ui_overlays.h: ui/overlays.ui
 	$(UIC) $^ > $@
 
-lualibs/usb_cmd.lua: ../include/usb_cmd.h
-	awk -f usb_cmd_h2lua.awk $^ > $@
+lualibs/pm3_cmd.lua: ../include/pm3_cmd.h
+	awk -f pm3_cmd_h2lua.awk $^ > $@
 
 lualibs/mf_default_keys.lua : default_keys.dic
 	awk -f default_keys_dic2lua.awk $^ > $@
diff --git a/client/cmdanalyse.c b/client/cmdanalyse.c
index 2385de4e0..1b12b33fd 100644
--- a/client/cmdanalyse.c
+++ b/client/cmdanalyse.c
@@ -488,7 +488,7 @@ static int CmdAnalyseA(const char *Cmd) {
     int hexlen = 0;
     uint8_t cmdp = 0;
     bool errors = false;
-    uint8_t data[USB_CMD_DATA_SIZE] = {0x00};
+    uint8_t data[PM3_CMD_DATA_SIZE] = {0x00};
 
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
@@ -513,7 +513,7 @@ static int CmdAnalyseA(const char *Cmd) {
 
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_FPC_SEND, 0, 0, 0, data, USB_CMD_DATA_SIZE);
+    SendCommandOLD(CMD_FPC_SEND, 0, 0, 0, data, PM3_CMD_DATA_SIZE);
 
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index e6ad488bd..42e5e5c29 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -558,7 +558,7 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
     if (leaveSignalON)
         cmdc |= ISO14A_NO_DISCONNECT;
 
-    uint8_t data[USB_CMD_DATA_SIZE] = { 0x0a | responseNum, 0x00};
+    uint8_t data[PM3_CMD_DATA_SIZE] = { 0x0a | responseNum, 0x00};
     responseNum ^= 1;
     memcpy(&data[2], datain, datainlen & 0xFFFF);
     SendCommandOLD(CMD_READER_ISO_14443a, ISO14A_RAW | ISO14A_APPEND_CRC | cmdc, (datainlen & 0xFFFF) + 2, 0, data, (datainlen & 0xFFFF) + 2);
@@ -688,7 +688,7 @@ static int CmdExchangeAPDU(bool chainingin, uint8_t *datain, int datainlen, bool
 
     // "Command APDU" length should be 5+255+1, but javacard's APDU buffer might be smaller - 133 bytes
     // https://stackoverflow.com/questions/32994936/safe-max-java-card-apdu-data-command-and-respond-size
-    // here length USB_CMD_DATA_SIZE=512
+    // here length PM3_CMD_DATA_SIZE=512
     // timeout must be authomatically set by "get ATS"
     if (datain)
         SendCommandOLD(CMD_READER_ISO_14443a, ISO14A_APDU | ISO14A_NO_DISCONNECT | cmdc, (datainlen & 0xFFFF), 0, datain, datainlen & 0xFFFF);
@@ -764,7 +764,7 @@ int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool lea
 
     // 3 byte here - 1b framing header, 2b crc16
     if (APDUInFramingEnable &&
-            ((frameLength && (datainlen > frameLength - 3)) || (datainlen > USB_CMD_DATA_SIZE - 3))) {
+            ((frameLength && (datainlen > frameLength - 3)) || (datainlen > PM3_CMD_DATA_SIZE - 3))) {
         int clen = 0;
 
         bool vActivateField = activateField;
@@ -828,7 +828,7 @@ int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool lea
 
 // ISO14443-4. 7. Half-duplex block transmission protocol
 static int CmdHF14AAPDU(const char *Cmd) {
-    uint8_t data[USB_CMD_DATA_SIZE];
+    uint8_t data[PM3_CMD_DATA_SIZE];
     int datalen = 0;
     bool activateField = false;
     bool leaveSignalON = false;
@@ -857,7 +857,7 @@ static int CmdHF14AAPDU(const char *Cmd) {
     CLIParserFree();
     PrintAndLogEx(NORMAL, ">>>>[%s%s%s] %s", activateField ? "sel " : "", leaveSignalON ? "keep " : "", decodeTLV ? "TLV" : "", sprint_hex(data, datalen));
 
-    int res = ExchangeAPDU14a(data, datalen, activateField, leaveSignalON, data, USB_CMD_DATA_SIZE, &datalen);
+    int res = ExchangeAPDU14a(data, datalen, activateField, leaveSignalON, data, PM3_CMD_DATA_SIZE, &datalen);
 
     if (res)
         return res;
@@ -887,7 +887,7 @@ static int CmdHF14ACmdRaw(const char *Cmd) {
     bool topazmode = false;
     char buf[5] = "";
     int i = 0;
-    uint8_t data[USB_CMD_DATA_SIZE];
+    uint8_t data[PM3_CMD_DATA_SIZE];
     uint16_t datalen = 0;
     uint32_t temp;
 
@@ -1012,8 +1012,8 @@ static int CmdHF14ACmdRaw(const char *Cmd) {
         flags |= ISO14A_NO_RATS;
     }
 
-    // Max buffer is USB_CMD_DATA_SIZE
-    datalen = (datalen > USB_CMD_DATA_SIZE) ? USB_CMD_DATA_SIZE : datalen;
+    // Max buffer is PM3_CMD_DATA_SIZE
+    datalen = (datalen > PM3_CMD_DATA_SIZE) ? PM3_CMD_DATA_SIZE : datalen;
 
     clearCommandBuffer();
     SendCommandOLD(CMD_READER_ISO_14443a, flags, (datalen & 0xFFFF) | ((uint32_t)(numbits << 16)), argtimeout, data, datalen & 0xFFFF);
diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c
index 3512e4860..0696a3203 100644
--- a/client/cmdhf14b.c
+++ b/client/cmdhf14b.c
@@ -121,7 +121,7 @@ static int switch_off_field_14b(void) {
 
 static bool waitCmd14b(bool verbose) {
 
-    uint8_t data[USB_CMD_DATA_SIZE] = {0x00};
+    uint8_t data[PM3_CMD_DATA_SIZE] = {0x00};
     PacketResponseNG resp;
 
     if (WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
@@ -188,7 +188,7 @@ static int CmdHF14BCmdRaw(const char *Cmd) {
     bool reply = true, power = false, select = false, hasTimeout = false;
     char buf[5] = "";
     int i = 0;
-    uint8_t data[USB_CMD_DATA_SIZE] = {0x00};
+    uint8_t data[PM3_CMD_DATA_SIZE] = {0x00};
     uint16_t datalen = 0;
     uint32_t flags = ISO14B_CONNECT;
     uint32_t temp = 0, user_timeout = 0, time_wait = 0;
@@ -270,8 +270,8 @@ static int CmdHF14BCmdRaw(const char *Cmd) {
     if (datalen > 0)
         flags |= ISO14B_RAW;
 
-    // Max buffer is USB_CMD_DATA_SIZE
-    datalen = (datalen > USB_CMD_DATA_SIZE) ? USB_CMD_DATA_SIZE : datalen;
+    // Max buffer is PM3_CMD_DATA_SIZE
+    datalen = (datalen > PM3_CMD_DATA_SIZE) ? PM3_CMD_DATA_SIZE : datalen;
 
     clearCommandBuffer();
     SendCommandOLD(CMD_ISO_14443B_COMMAND, flags, datalen, time_wait, data, datalen);
diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index 0aeccb5ea..5cce0079a 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -592,7 +592,7 @@ static int CmdHF15Info(const char *Cmd) {
 
     PacketResponseNG resp;
     uint8_t *recv;
-    uint8_t req[USB_CMD_DATA_SIZE] = {0};
+    uint8_t req[PM3_CMD_DATA_SIZE] = {0};
     uint16_t reqlen;
     uint8_t arg1 = 1;
     char cmdbuf[100] = {0};
@@ -932,7 +932,7 @@ static int CmdHF15Readmulti(const char *Cmd) {
 
     PacketResponseNG resp;
     uint8_t *recv;
-    uint8_t req[USB_CMD_DATA_SIZE] = {0};
+    uint8_t req[PM3_CMD_DATA_SIZE] = {0};
     uint16_t reqlen = 0;
     uint8_t arg1 = 1;
     uint8_t pagenum, pagecount;
@@ -1018,7 +1018,7 @@ static int CmdHF15Read(const char *Cmd) {
     // arg0 (datalen,  cmd len?  .arg0 == crc?)
     // arg1 (speed == 0 == 1 of 256,  == 1 == 1 of 4 )
     // arg2 (recv == 1 == expect a response)
-    uint8_t req[USB_CMD_DATA_SIZE] = {0};
+    uint8_t req[PM3_CMD_DATA_SIZE] = {0};
     uint16_t reqlen = 0;
     uint8_t arg1 = 1;
     int blocknum;
@@ -1085,7 +1085,7 @@ static int CmdHF15Write(const char *Cmd) {
 
     PacketResponseNG resp;
     uint8_t *recv;
-    uint8_t req[USB_CMD_DATA_SIZE] = {0};
+    uint8_t req[PM3_CMD_DATA_SIZE] = {0};
     uint16_t reqlen = 0;
     uint8_t arg1 = 1;
     int pagenum, temp;
diff --git a/client/cmdhfepa.c b/client/cmdhfepa.c
index 6adb71a28..3b6549cce 100644
--- a/client/cmdhfepa.c
+++ b/client/cmdhfepa.c
@@ -108,7 +108,7 @@ static int CmdHFEPAPACEReplay(const char *Cmd) {
     }
 
     // transfer the APDUs to the Proxmark
-    uint8_t data[USB_CMD_DATA_SIZE];
+    uint8_t data[PM3_CMD_DATA_SIZE];
     for (int i = 0; i < sizeof(apdu_lengths); i++) {
         // transfer the APDU in several parts if necessary
         for (int j = 0; j * sizeof(data) < apdu_lengths[i]; j++) {
diff --git a/client/cmdhffelica.c b/client/cmdhffelica.c
index 68c0cfb5b..c61e386c8 100644
--- a/client/cmdhffelica.c
+++ b/client/cmdhffelica.c
@@ -429,7 +429,7 @@ static int CmdHFFelicaCmdRaw(const char *Cmd) {
     uint16_t numbits = 0;
     char buf[5] = "";
     int i = 0;
-    uint8_t data[USB_CMD_DATA_SIZE];
+    uint8_t data[PM3_CMD_DATA_SIZE];
     uint16_t datalen = 0;
     uint32_t temp;
 
@@ -518,8 +518,8 @@ static int CmdHFFelicaCmdRaw(const char *Cmd) {
         flags |= FELICA_RAW;
     }
 
-    // Max buffer is USB_CMD_DATA_SIZE
-    datalen = (datalen > USB_CMD_DATA_SIZE) ? USB_CMD_DATA_SIZE : datalen;
+    // Max buffer is PM3_CMD_DATA_SIZE
+    datalen = (datalen > PM3_CMD_DATA_SIZE) ? PM3_CMD_DATA_SIZE : datalen;
 
     clearCommandBuffer();
     SendCommandOLD(CMD_FELICA_COMMAND, flags, (datalen & 0xFFFF) | (uint32_t)(numbits << 16), 0, data, datalen);
diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index 8326834a0..1b0eebff9 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -595,7 +595,7 @@ static int CmdHFiClassELoad(const char *Cmd) {
     uint32_t bytes_remaining  = bytes_read;
 
     while (bytes_remaining > 0) {
-        uint32_t bytes_in_packet = MIN(USB_CMD_DATA_SIZE, bytes_remaining);
+        uint32_t bytes_in_packet = MIN(PM3_CMD_DATA_SIZE, bytes_remaining);
         clearCommandBuffer();
         SendCommandOLD(CMD_ICLASS_EML_MEMSET, bytes_sent, bytes_in_packet, 0, dump + bytes_sent, bytes_in_packet);
         bytes_remaining -= bytes_in_packet;
@@ -1272,10 +1272,10 @@ static int CmdHFiClassCloneTag(const char *Cmd) {
 
     FILE *f;
 
-    iclass_block_t tag_data[USB_CMD_DATA_SIZE / 12];
+    iclass_block_t tag_data[PM3_CMD_DATA_SIZE / 12];
 
-    if ((endblock - startblock + 1) * 12 > USB_CMD_DATA_SIZE) {
-        PrintAndLogEx(NORMAL, "Trying to write too many blocks at once.  Max: %d", USB_CMD_DATA_SIZE / 8);
+    if ((endblock - startblock + 1) * 12 > PM3_CMD_DATA_SIZE) {
+        PrintAndLogEx(NORMAL, "Trying to write too many blocks at once.  Max: %d", PM3_CMD_DATA_SIZE / 8);
     }
     // file handling and reading
     f = fopen(filename, "rb");
@@ -1944,7 +1944,7 @@ static int CmdHFiClassCheckKeys(const char *Cmd) {
     //PrintPreCalcMac(keyBlock, keycnt, pre);
 
     // max 42 keys inside USB_COMMAND.  512/4 = 103 mac
-    uint32_t chunksize = keycnt > (USB_CMD_DATA_SIZE / 4) ? (USB_CMD_DATA_SIZE / 4) : keycnt;
+    uint32_t chunksize = keycnt > (PM3_CMD_DATA_SIZE / 4) ? (PM3_CMD_DATA_SIZE / 4) : keycnt;
     bool lastChunk = false;
 
     // fast push mode
diff --git a/client/cmdhficlass.h b/client/cmdhficlass.h
index 0ae5a97cd..aa29fae1e 100644
--- a/client/cmdhficlass.h
+++ b/client/cmdhficlass.h
@@ -29,7 +29,7 @@
 #include "loclass/elite_crack.h"
 #include "loclass/fileutils.h"
 #include "protocols.h"
-#include "usb_cmd.h"
+#include "pm3_cmd.h"
 #include "cmdhfmfu.h"
 #include "cmdhf.h"
 #include "protocols.h" // picopass structs,
diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index ca5f53a2b..85a3a18bc 100644
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -833,9 +833,9 @@ void legic_chk_iv(uint32_t *iv) {
 }
 void legic_seteml(uint8_t *src, uint32_t offset, uint32_t numofbytes) {
 
-    for (size_t i = offset; i < numofbytes; i += USB_CMD_DATA_SIZE) {
+    for (size_t i = offset; i < numofbytes; i += PM3_CMD_DATA_SIZE) {
 
-        size_t len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);
+        size_t len = MIN((numofbytes - i), PM3_CMD_DATA_SIZE);
         clearCommandBuffer();
         SendCommandOLD(CMD_LEGIC_ESET, i, len, 0, src + i, len);
     }
@@ -1041,9 +1041,9 @@ static int CmdLegicRestore(const char *Cmd) {
 
     // transfer to device
     PacketResponseNG resp;
-    for (size_t i = 7; i < numofbytes; i += USB_CMD_DATA_SIZE) {
+    for (size_t i = 7; i < numofbytes; i += PM3_CMD_DATA_SIZE) {
 
-        size_t len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);
+        size_t len = MIN((numofbytes - i), PM3_CMD_DATA_SIZE);
         clearCommandBuffer();
         SendCommandOLD(CMD_WRITER_LEGIC_RF, i, len, 0x55, data + i, len);
 
@@ -1230,11 +1230,11 @@ static int CmdLegicWipe(const char *Cmd) {
 
     // transfer to device
     PacketResponseNG resp;
-    for (size_t i = 7; i < card.cardsize; i += USB_CMD_DATA_SIZE) {
+    for (size_t i = 7; i < card.cardsize; i += PM3_CMD_DATA_SIZE) {
 
         printf(".");
         fflush(stdout);
-        size_t len = MIN((card.cardsize - i), USB_CMD_DATA_SIZE);
+        size_t len = MIN((card.cardsize - i), PM3_CMD_DATA_SIZE);
         clearCommandBuffer();
         SendCommandOLD(CMD_WRITER_LEGIC_RF, i, len, 0x55, data + i, len);
 
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 03e2689a5..f45222773 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -1661,7 +1661,7 @@ static int CmdHF14AMfChk_fast(const char *Cmd) {
         return 1;
     }
 
-    uint32_t chunksize = keycnt > (USB_CMD_DATA_SIZE / 6) ? (USB_CMD_DATA_SIZE / 6) : keycnt;
+    uint32_t chunksize = keycnt > (PM3_CMD_DATA_SIZE / 6) ? (PM3_CMD_DATA_SIZE / 6) : keycnt;
     bool firstChunk = true, lastChunk = false;
 
     // time
@@ -1933,7 +1933,7 @@ static int CmdHF14AMfChk(const char *Cmd) {
 
 
     uint8_t trgKeyType = 0;
-    uint32_t max_keys = keycnt > ((USB_CMD_DATA_SIZE - 4) / 6) ? ((USB_CMD_DATA_SIZE - 4) / 6) : keycnt;
+    uint32_t max_keys = keycnt > ((PM3_CMD_DATA_SIZE - 4) / 6) ? ((PM3_CMD_DATA_SIZE - 4) / 6) : keycnt;
 
     // time
     uint64_t t1 = msclock();
diff --git a/client/cmdhw.c b/client/cmdhw.c
index 461e48f0b..2a62d3e67 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -442,12 +442,12 @@ static int CmdPing(const char *Cmd) {
 
 static int CmdPingNG(const char *Cmd) {
     uint32_t len = strtol(Cmd, NULL, 0);
-    if (len > USB_CMD_DATA_SIZE)
-        len = USB_CMD_DATA_SIZE;
+    if (len > PM3_CMD_DATA_SIZE)
+        len = PM3_CMD_DATA_SIZE;
     PrintAndLogEx(NORMAL, "PingNG sent with payload len=%d", len);
     clearCommandBuffer();
     PacketResponseNG resp;
-    uint8_t data[USB_CMD_DATA_SIZE] = {0};
+    uint8_t data[PM3_CMD_DATA_SIZE] = {0};
     for (uint16_t i = 0; i < len; i++)
         data[i] = i & 0xFF;
     SendCommandNG(CMD_PING, data, len);
diff --git a/client/cmdlf.c b/client/cmdlf.c
index 71209d554..1e5878cf2 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -149,7 +149,7 @@ int CmdLFCommandRead(const char *Cmd) {
     uint32_t arg0 = 0;
     uint32_t arg1 = 0;
     uint32_t arg2 = 0;
-    uint8_t data[USB_CMD_DATA_SIZE];
+    uint8_t data[PM3_CMD_DATA_SIZE];
     uint16_t datalen = 0;
 
     uint8_t cmdp = 0;
@@ -423,9 +423,9 @@ int CmdLFSim(const char *Cmd) {
     conn.block_after_ACK = true;
     
     //can send only 512 bits at a time (1 byte sent per bit...)
-    for (uint16_t i = 0; i < GraphTraceLen; i += USB_CMD_DATA_SIZE) {
+    for (uint16_t i = 0; i < GraphTraceLen; i += PM3_CMD_DATA_SIZE) {
         clearCommandBuffer();
-        SendCommandOLD(CMD_UPLOAD_SIM_SAMPLES_125K, i, FPGA_LF, 0, &GraphBuffer[i], USB_CMD_DATA_SIZE);
+        SendCommandOLD(CMD_UPLOAD_SIM_SAMPLES_125K, i, FPGA_LF, 0, &GraphBuffer[i], PM3_CMD_DATA_SIZE);
         WaitForResponse(CMD_ACK, NULL);
         printf(".");
         fflush(stdout);
@@ -518,9 +518,9 @@ int CmdLFfskSim(const char *Cmd) {
     if (fcLow == 0) fcLow = 8;
 
     size_t size = DemodBufferLen;
-    if (size > USB_CMD_DATA_SIZE) {
-        PrintAndLogEx(NORMAL, "DemodBuffer too long for current implementation - length: %d - max: %d", size, USB_CMD_DATA_SIZE);
-        size = USB_CMD_DATA_SIZE;
+    if (size > PM3_CMD_DATA_SIZE) {
+        PrintAndLogEx(NORMAL, "DemodBuffer too long for current implementation - length: %d - max: %d", size, PM3_CMD_DATA_SIZE);
+        size = PM3_CMD_DATA_SIZE;
     }
     clearCommandBuffer();
     SendCommandOLD(CMD_FSK_SIM_TAG, fcHigh << 8 | fcLow, (separator << 8) | clk, size, DemodBuffer, size);
@@ -603,9 +603,9 @@ int CmdLFaskSim(const char *Cmd) {
     if (encoding == 0) clk /= 2; //askraw needs to double the clock speed
 
     size_t size = DemodBufferLen;
-    if (size > USB_CMD_DATA_SIZE) {
-        PrintAndLogEx(NORMAL, "DemodBuffer too long for current implementation - length: %d - max: %d", size, USB_CMD_DATA_SIZE);
-        size = USB_CMD_DATA_SIZE;
+    if (size > PM3_CMD_DATA_SIZE) {
+        PrintAndLogEx(NORMAL, "DemodBuffer too long for current implementation - length: %d - max: %d", size, PM3_CMD_DATA_SIZE);
+        size = PM3_CMD_DATA_SIZE;
     }
 
     PrintAndLogEx(NORMAL, "preparing to sim ask data: %d bits", size);
@@ -707,9 +707,9 @@ int CmdLFpskSim(const char *Cmd) {
         }
     }
     size_t size = DemodBufferLen;
-    if (size > USB_CMD_DATA_SIZE) {
-        PrintAndLogEx(NORMAL, "DemodBuffer too long for current implementation - length: %d - max: %d", size, USB_CMD_DATA_SIZE);
-        size = USB_CMD_DATA_SIZE;
+    if (size > PM3_CMD_DATA_SIZE) {
+        PrintAndLogEx(NORMAL, "DemodBuffer too long for current implementation - length: %d - max: %d", size, PM3_CMD_DATA_SIZE);
+        size = PM3_CMD_DATA_SIZE;
     }
     PrintAndLogEx(DEBUG, "DEBUG: Sending DemodBuffer Length: %d", size);
     clearCommandBuffer();
diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index 3d4138565..a7e2aee26 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -128,7 +128,7 @@ static int CmdLFHitagList(const char *Cmd) {
     return 0;
 
     /*
-    uint8_t *got = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
+    uint8_t *got = calloc(PM3_CMD_DATA_SIZE, sizeof(uint8_t));
     if (!got) {
         PrintAndLogEx(WARNING, "Cannot allocate memory for trace");
         return 2;
@@ -136,14 +136,14 @@ static int CmdLFHitagList(const char *Cmd) {
 
     // Query for the actual size of the trace
     PacketResponseNG response;
-    if (!GetFromDevice(BIG_BUF, got, USB_CMD_DATA_SIZE, 0, &response, 2500, false)) {
+    if (!GetFromDevice(BIG_BUF, got, PM3_CMD_DATA_SIZE, 0, &response, 2500, false)) {
         PrintAndLogEx(WARNING, "command execution time out");
         free(got);
         return 2;
     }
 
     uint16_t traceLen = response.arg[2];
-    if (traceLen > USB_CMD_DATA_SIZE) {
+    if (traceLen > PM3_CMD_DATA_SIZE) {
         uint8_t *p = realloc(got, traceLen);
         if (p == NULL) {
             PrintAndLogEx(WARNING, "Cannot allocate memory for trace");
diff --git a/client/cmdmain.h b/client/cmdmain.h
index 8a43ad6b8..0bf5ff1e7 100644
--- a/client/cmdmain.h
+++ b/client/cmdmain.h
@@ -19,7 +19,7 @@
 #include <string.h>
 #include "util_posix.h"
 #include "proxmark3.h"
-#include "usb_cmd.h"
+#include "pm3_cmd.h"
 #include "util.h"
 #include "ui.h"
 #include "cmdparser.h"
diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index 3f9703ccd..b5b303534 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -395,7 +395,7 @@ static int CmdSmartRaw(const char *Cmd) {
     bool useT0 = false;
     uint8_t cmdp = 0;
     bool errors = false, reply = true, decodeTLV = false, breakloop = false;
-    uint8_t data[USB_CMD_DATA_SIZE] = {0x00};
+    uint8_t data[PM3_CMD_DATA_SIZE] = {0x00};
 
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
@@ -470,7 +470,7 @@ static int CmdSmartRaw(const char *Cmd) {
     // reading response from smart card
     if (reply) {
 
-        uint8_t *buf = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
+        uint8_t *buf = calloc(PM3_CMD_DATA_SIZE, sizeof(uint8_t));
         if (!buf)
             return 1;
 
@@ -644,7 +644,7 @@ static int CmdSmartUpgrade(const char *Cmd) {
     uint32_t bytes_remaining = firmware_size;
 
     while (bytes_remaining > 0) {
-        uint32_t bytes_in_packet = MIN(USB_CMD_DATA_SIZE, bytes_remaining);
+        uint32_t bytes_in_packet = MIN(PM3_CMD_DATA_SIZE, bytes_remaining);
         clearCommandBuffer();
         SendCommandOLD(CMD_SMART_UPLOAD, index + bytes_sent, bytes_in_packet, 0, dump + bytes_sent, bytes_in_packet);
         if (!WaitForResponseTimeout(CMD_ACK, NULL, 2000)) {
@@ -858,7 +858,7 @@ static int CmdSmartList(const char *Cmd) {
 
 static void smart_brute_prim() {
 
-    uint8_t *buf = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
+    uint8_t *buf = calloc(PM3_CMD_DATA_SIZE, sizeof(uint8_t));
     if (!buf)
         return;
 
@@ -891,7 +891,7 @@ static void smart_brute_prim() {
 
 static int smart_brute_sfi(bool decodeTLV) {
 
-    uint8_t *buf = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
+    uint8_t *buf = calloc(PM3_CMD_DATA_SIZE, sizeof(uint8_t));
     if (!buf)
         return 1;
 
@@ -945,7 +945,7 @@ static int smart_brute_sfi(bool decodeTLV) {
                     }
                 }
             }
-            memset(buf, 0x00, USB_CMD_DATA_SIZE);
+            memset(buf, 0x00, PM3_CMD_DATA_SIZE);
         }
     }
     free(buf);
@@ -954,7 +954,7 @@ static int smart_brute_sfi(bool decodeTLV) {
 
 static void smart_brute_options(bool decodeTLV) {
 
-    uint8_t *buf = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
+    uint8_t *buf = calloc(PM3_CMD_DATA_SIZE, sizeof(uint8_t));
     if (!buf)
         return;
 
@@ -1019,7 +1019,7 @@ static int CmdSmartBruteforceSFI(const char *Cmd) {
     json_t *root = NULL;
     smart_loadjson("aidlist", "json", &root);
 
-    uint8_t *buf = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
+    uint8_t *buf = calloc(PM3_CMD_DATA_SIZE, sizeof(uint8_t));
     if (!buf)
         return 1;
 
@@ -1064,7 +1064,7 @@ static int CmdSmartBruteforceSFI(const char *Cmd) {
         snprintf(caid, 8 + 2 + aidlen + 1, SELECT, aidlen >> 1, aid);
 
         int hexlen = 0;
-        uint8_t cmddata[USB_CMD_DATA_SIZE];
+        uint8_t cmddata[PM3_CMD_DATA_SIZE];
         int res = param_gethex_to_eol(caid, 0, cmddata, sizeof(cmddata), &hexlen);
         if (res)
             continue;
diff --git a/client/cmdtrace.c b/client/cmdtrace.c
index f243999a5..a329f8931 100644
--- a/client/cmdtrace.c
+++ b/client/cmdtrace.c
@@ -664,18 +664,18 @@ int CmdTraceList(const char *Cmd) {
 
     // reserv some space.
     if (!trace)
-        trace = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
+        trace = calloc(PM3_CMD_DATA_SIZE, sizeof(uint8_t));
 
     if (isOnline) {
-        // Query for the size of the trace,  downloading USB_CMD_DATA_SIZE
+        // Query for the size of the trace,  downloading PM3_CMD_DATA_SIZE
         PacketResponseNG response;
-        if (!GetFromDevice(BIG_BUF, trace, USB_CMD_DATA_SIZE, 0, &response, 4000, true)) {
+        if (!GetFromDevice(BIG_BUF, trace, PM3_CMD_DATA_SIZE, 0, &response, 4000, true)) {
             PrintAndLogEx(WARNING, "timeout while waiting for reply.");
             return 1;
         }
 
         traceLen = response.oldarg[2];
-        if (traceLen > USB_CMD_DATA_SIZE) {
+        if (traceLen > PM3_CMD_DATA_SIZE) {
             uint8_t *p = realloc(trace, traceLen);
             if (p == NULL) {
                 PrintAndLogEx(FAILED, "Cannot allocate memory for trace");
diff --git a/client/comms.c b/client/comms.c
index 869de55c6..5037c1598 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -123,7 +123,7 @@ static void SendCommandNG_internal(uint16_t cmd, uint8_t *data, size_t len, bool
         PrintAndLogEx(NORMAL, "Sending bytes to proxmark failed - offline");
         return;
     }
-    if (len > USB_CMD_DATA_SIZE) {
+    if (len > PM3_CMD_DATA_SIZE) {
         PrintAndLogEx(WARNING, "Sending %d bytes of payload is too much, abort", len);
         return;
     }
@@ -182,11 +182,11 @@ void SendCommandNG(uint16_t cmd, uint8_t *data, size_t len) {
 
 void SendCommandMIX(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len) {
     uint64_t arg[3] = {arg0, arg1, arg2};
-    if (len > USB_CMD_DATA_SIZE_MIX) {
+    if (len > PM3_CMD_DATA_SIZE_MIX) {
         PrintAndLogEx(WARNING, "Sending %d bytes of payload is too much for MIX frames, abort", len);
         return;
     }
-    uint8_t cmddata[USB_CMD_DATA_SIZE];
+    uint8_t cmddata[PM3_CMD_DATA_SIZE];
     memcpy(cmddata, arg, sizeof(arg));
     if (len && data)
         memcpy(cmddata + sizeof(arg), data, len);
@@ -307,7 +307,7 @@ static void PacketResponseReceived(PacketResponseNG *packet) {
         // First check if we are handling a debug message
         case CMD_DEBUG_PRINT_STRING: {
 
-            char s[USB_CMD_DATA_SIZE + 1];
+            char s[PM3_CMD_DATA_SIZE + 1];
             memset(s, 0x00, sizeof(s));
 
             size_t len;
@@ -315,14 +315,14 @@ static void PacketResponseReceived(PacketResponseNG *packet) {
             if (packet->ng) {
                 struct d {
                     uint16_t flag;
-                    uint8_t buf[USB_CMD_DATA_SIZE - sizeof(uint16_t)];
+                    uint8_t buf[PM3_CMD_DATA_SIZE - sizeof(uint16_t)];
                 } PACKED;
                 struct d *data = (struct d *)&packet->data.asBytes;
                 len = packet->length - sizeof(data->flag);
                 flag = data->flag;
                 memcpy_filtered(s, data->buf, len, flag & FLAG_ANSI);
             } else {
-                len = MIN(packet->oldarg[0], USB_CMD_DATA_SIZE);
+                len = MIN(packet->oldarg[0], PM3_CMD_DATA_SIZE);
                 flag = packet->oldarg[1];
                 memcpy_filtered(s, packet->data.asBytes, len, flag & FLAG_ANSI);
             }
@@ -410,7 +410,7 @@ __attribute__((force_align_arg_pointer))
             rx.status = rx_raw.pre.status;
             rx.cmd = rx_raw.pre.cmd;
             if (rx.magic == RESPONSENG_PREAMBLE_MAGIC) { // New style NG reply
-                if (length > USB_CMD_DATA_SIZE) {
+                if (length > PM3_CMD_DATA_SIZE) {
                     PrintAndLogEx(WARNING, "Received packet frame with incompatible length: 0x%04x", length);
                     error = true;
                 }
@@ -496,7 +496,7 @@ __attribute__((force_align_arg_pointer))
                     rx.oldarg[0] = rx_old.arg[0];
                     rx.oldarg[1] = rx_old.arg[1];
                     rx.oldarg[2] = rx_old.arg[2];
-                    rx.length = USB_CMD_DATA_SIZE;
+                    rx.length = PM3_CMD_DATA_SIZE;
                     memcpy(&rx.data, &rx_old.d, rx.length);
                     PacketResponseReceived(&rx);
                     if (rx.cmd == CMD_ACK) {
@@ -829,9 +829,9 @@ static bool dl_it(uint8_t *dest, uint32_t bytes, uint32_t start_index, PacketRes
                 uint32_t copy_bytes = MIN(bytes - bytes_completed, response->oldarg[1]);
                 //uint32_t tracelen = response->oldarg[2];
 
-                // extended bounds check1.  upper limit is USB_CMD_DATA_SIZE
+                // extended bounds check1.  upper limit is PM3_CMD_DATA_SIZE
                 // shouldn't happen
-                copy_bytes = MIN(copy_bytes, USB_CMD_DATA_SIZE);
+                copy_bytes = MIN(copy_bytes, PM3_CMD_DATA_SIZE);
 
                 // extended bounds check2.
                 if (offset + copy_bytes > bytes) {
diff --git a/client/comms.h b/client/comms.h
index 516d39b1a..c53b75bee 100644
--- a/client/comms.h
+++ b/client/comms.h
@@ -15,7 +15,7 @@
 #include <stdbool.h>
 #include <pthread.h>
 
-#include "usb_cmd.h"
+#include "pm3_cmd.h"
 #include "uart.h"
 #include "ui.h"
 #include "common.h"
diff --git a/client/flash.h b/client/flash.h
index b474c79b6..a230715d1 100644
--- a/client/flash.h
+++ b/client/flash.h
@@ -18,7 +18,7 @@
 #include "proxmark3.h"
 #include "elf.h"
 #include "proxendian.h"
-#include "usb_cmd.h"
+#include "pm3_cmd.h"
 #include "at91sam7s512.h"
 #include "util_posix.h"
 #include "util.h"
diff --git a/client/flasher.c b/client/flasher.c
index 817990d7e..fe96b9681 100644
--- a/client/flasher.c
+++ b/client/flasher.c
@@ -16,7 +16,7 @@
 #include "util.h"
 #include "flash.h"
 #include "comms.h"
-#include "usb_cmd.h"
+#include "pm3_cmd.h"
 
 #define MAX_FILES 4
 
diff --git a/client/mifare/mifarehost.c b/client/mifare/mifarehost.c
index 293fc76b0..5c0d31771 100644
--- a/client/mifare/mifarehost.c
+++ b/client/mifare/mifarehost.c
@@ -89,8 +89,8 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
         PrintAndLogEx(SUCCESS, "found %u candidate key%s\n", keycount, (keycount > 1) ? "s." : ".");
 
         *key = UINT64_C(-1);
-        uint8_t keyBlock[USB_CMD_DATA_SIZE];
-        uint32_t max_keys = (USB_CMD_DATA_SIZE - 4) / 6;
+        uint8_t keyBlock[PM3_CMD_DATA_SIZE];
+        uint32_t max_keys = (PM3_CMD_DATA_SIZE - 4) / 6;
         for (uint32_t i = 0; i < keycount; i += max_keys) {
 
             uint32_t size = keycount - i > max_keys ? max_keys : keycount - i;
@@ -123,7 +123,7 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
 int mfCheckKeys(uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t keycnt, uint8_t *keyBlock, uint64_t *key) {
     *key = -1;
     clearCommandBuffer();   
-    uint8_t data[USB_CMD_DATA_SIZE] = {0};
+    uint8_t data[PM3_CMD_DATA_SIZE] = {0};
     data[0] = keyType;
     data[1] = blockNo;
     data[2] = clear_trace;
@@ -220,7 +220,7 @@ int mfCheckKeys_fast(uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk,
 // ref: https://github.com/J-Run/mf_key_brute
 int mfKeyBrute(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint64_t *resultkey) {
 
-#define KEYS_IN_BLOCK   ((USB_CMD_DATA_SIZE - 4) / 6)
+#define KEYS_IN_BLOCK   ((PM3_CMD_DATA_SIZE - 4) / 6)
 #define KEYBLOCK_SIZE   (KEYS_IN_BLOCK * 6)
 #define CANDIDATE_SIZE  (0xFFFF * 6)
 
@@ -379,8 +379,8 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo,
     uint64_t key64 = -1;
 
     // The list may still contain several key candidates. Test each of them with mfCheckKeys
-    uint32_t max_keys = keycnt > ((USB_CMD_DATA_SIZE - 4) / 6) ? ((USB_CMD_DATA_SIZE - 4) / 6) : keycnt;
-    uint8_t keyBlock[USB_CMD_DATA_SIZE] = {0x00};
+    uint32_t max_keys = keycnt > ((PM3_CMD_DATA_SIZE - 4) / 6) ? ((PM3_CMD_DATA_SIZE - 4) / 6) : keycnt;
+    uint8_t keyBlock[PM3_CMD_DATA_SIZE] = {0x00};
 
     for (i = 0; i < keycnt; i += max_keys) {
 
diff --git a/client/usb_cmd_h2lua.awk b/client/pm3_cmd_h2lua.awk
similarity index 85%
rename from client/usb_cmd_h2lua.awk
rename to client/pm3_cmd_h2lua.awk
index e18bea523..a7b3409dd 100644
--- a/client/usb_cmd_h2lua.awk
+++ b/client/pm3_cmd_h2lua.awk
@@ -1,7 +1,7 @@
 BEGIN {
     print "--[["
     print "These are Proxmark command definitions."
-    print "This file is automatically generated from usb_cmd.h - DON'T EDIT MANUALLY."
+    print "This file is automatically generated from pm3_cmd.h - DON'T EDIT MANUALLY."
     print "--]]"
     print "local __commands = {"
 }
diff --git a/client/proxmark3.h b/client/proxmark3.h
index 5d5a49c9a..20664ab81 100644
--- a/client/proxmark3.h
+++ b/client/proxmark3.h
@@ -12,7 +12,7 @@
 #ifndef PROXMARK3_H__
 #define PROXMARK3_H__
 
-#include "usb_cmd.h"
+#include "pm3_cmd.h"
 #include "cmdscript.h"  // CmdScriptRun
 
 #define PROXPROMPT "pm3 --> "
diff --git a/client/scripting.c b/client/scripting.c
index 70943f360..e855c0fe9 100644
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -90,7 +90,7 @@ static int l_SendCommandOLD(lua_State *L) {
 // (uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len)
 
     uint64_t cmd, arg0, arg1, arg2;
-    uint8_t data[USB_CMD_DATA_SIZE] = {0};
+    uint8_t data[PM3_CMD_DATA_SIZE] = {0};
     size_t len = 0, size;
 
     //Check number of arguments
@@ -138,7 +138,7 @@ static int l_SendCommandOLD(lua_State *L) {
 static int l_SendCommandMIX(lua_State *L) {
 
     uint64_t cmd, arg0, arg1, arg2;
-    uint8_t data[USB_CMD_DATA_SIZE] = {0};
+    uint8_t data[PM3_CMD_DATA_SIZE] = {0};
     size_t len = 0, size;
 
     // check number of arguments
@@ -180,7 +180,7 @@ static int l_SendCommandMIX(lua_State *L) {
  */
 static int l_SendCommandNG(lua_State *L) {
 
-    uint8_t data[USB_CMD_DATA_SIZE] = {0};
+    uint8_t data[PM3_CMD_DATA_SIZE] = {0};
     size_t len = 0, size;
 
     // check number of arguments
@@ -414,7 +414,7 @@ static int l_CmdConsole(lua_State *L) {
 
 static int l_iso15693_crc(lua_State *L) {
     uint32_t tmp;
-    unsigned char buf[USB_CMD_DATA_SIZE] = {0x00};
+    unsigned char buf[PM3_CMD_DATA_SIZE] = {0x00};
     size_t size = 0;
     const char *data = luaL_checklstring(L, 1, &size);
 
@@ -431,7 +431,7 @@ static int l_iso15693_crc(lua_State *L) {
 
 static int l_iso14443b_crc(lua_State *L) {
     uint32_t tmp;
-    unsigned char buf[USB_CMD_DATA_SIZE] = {0x00};
+    unsigned char buf[PM3_CMD_DATA_SIZE] = {0x00};
     size_t size = 0;
     const char *data = luaL_checklstring(L, 1, &size);
 
diff --git a/client/scripting.h b/client/scripting.h
index 4db566dcc..5b8c15ddd 100644
--- a/client/scripting.h
+++ b/client/scripting.h
@@ -15,7 +15,7 @@
 #include <lualib.h>
 #include <lauxlib.h>
 #include "proxmark3.h"
-#include "usb_cmd.h"
+#include "pm3_cmd.h"
 #include "cmdmain.h"
 #include "comms.h"
 #include "util.h"
diff --git a/common/Makefile.common b/common/Makefile.common
index bfbfc0a80..a0e44fbe9 100644
--- a/common/Makefile.common
+++ b/common/Makefile.common
@@ -62,7 +62,7 @@ endif
 # Also search prerequisites in the common directory (for usb.c), the fpga directory (for fpga.bit), and the zlib directory
 VPATH = . ../common ../common/crapto1 ../common/polarssl ../fpga ../zlib ../armsrc/Standalone ../uart
 
-INCLUDES = ../include/proxmark3.h ../include/at91sam7s512.h ../include/config_gpio.h ../include/usb_cmd.h $(APP_INCLUDES)
+INCLUDES = ../include/proxmark3.h ../include/at91sam7s512.h ../include/config_gpio.h ../include/pm3_cmd.h $(APP_INCLUDES)
 
 CFLAGS =  -c $(INCLUDE) -Wall -Werror -pedantic -Wunused -std=c99 $(APP_CFLAGS) -Os
 LDFLAGS = -nostartfiles -nodefaultlibs -Wl,-gc-sections -n
diff --git a/common/cmd.c b/common/cmd.c
index 2605c40e8..caf85748e 100644
--- a/common/cmd.c
+++ b/common/cmd.c
@@ -59,9 +59,9 @@ int reply_old(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *d
     txcmd.arg[1] = arg1;
     txcmd.arg[2] = arg2;
 
-    // Add the (optional) content to the frame, with a maximum size of USB_CMD_DATA_SIZE
+    // Add the (optional) content to the frame, with a maximum size of PM3_CMD_DATA_SIZE
     if (data && len) {
-        len = MIN(len, USB_CMD_DATA_SIZE);
+        len = MIN(len, PM3_CMD_DATA_SIZE);
         for (size_t i = 0; i < len; i++) {
             txcmd.d.asBytes[i] = ((uint8_t *)data)[i];
         }
@@ -95,14 +95,14 @@ static int reply_ng_internal(uint16_t cmd, int16_t status, uint8_t *data, size_t
     txBufferNG.pre.cmd = cmd;
     txBufferNG.pre.status = status;
     txBufferNG.pre.ng = ng;
-    if (len > USB_CMD_DATA_SIZE) {
-        len = USB_CMD_DATA_SIZE;
+    if (len > PM3_CMD_DATA_SIZE) {
+        len = PM3_CMD_DATA_SIZE;
         // overwrite status
         txBufferNG.pre.status = PM3_EOVFLOW;
     }
     txBufferNG.pre.length = len;
 
-    // Add the (optional) content to the frame, with a maximum size of USB_CMD_DATA_SIZE
+    // Add the (optional) content to the frame, with a maximum size of PM3_CMD_DATA_SIZE
     if (data && len) {
         for (size_t i = 0; i < len; i++) {
             txBufferNG.data[i] = data[i];
@@ -143,11 +143,11 @@ int reply_ng(uint16_t cmd, int16_t status, uint8_t *data, size_t len) {
 int reply_mix(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len) {
     uint16_t status = PM3_SUCCESS;
     uint64_t arg[3] = {arg0, arg1, arg2};
-    if (len > USB_CMD_DATA_SIZE - sizeof(arg)) {
-        len = USB_CMD_DATA_SIZE - sizeof(arg);
+    if (len > PM3_CMD_DATA_SIZE - sizeof(arg)) {
+        len = PM3_CMD_DATA_SIZE - sizeof(arg);
         status = PM3_EOVFLOW;
     }
-    uint8_t cmddata[USB_CMD_DATA_SIZE];
+    uint8_t cmddata[PM3_CMD_DATA_SIZE];
     memcpy(cmddata, arg, sizeof(arg));
     if (len && data)
         memcpy(cmddata + sizeof(arg), data, len);
@@ -166,7 +166,7 @@ static int receive_ng_internal(PacketCommandNG *rx, uint32_t read_ng(uint8_t *da
     uint16_t length = rx_raw.pre.length;
     rx->cmd = rx_raw.pre.cmd;
     if (rx->magic == COMMANDNG_PREAMBLE_MAGIC) { // New style NG command
-        if (length > USB_CMD_DATA_SIZE)
+        if (length > PM3_CMD_DATA_SIZE)
             return PM3_EOVFLOW;
         // Get the core and variable length payload
         bytes = read_ng((uint8_t *)&rx_raw.data, length);
@@ -213,7 +213,7 @@ static int receive_ng_internal(PacketCommandNG *rx, uint32_t read_ng(uint8_t *da
         rx->oldarg[0] = rx_old.arg[0];
         rx->oldarg[1] = rx_old.arg[1];
         rx->oldarg[2] = rx_old.arg[2];
-        rx->length = USB_CMD_DATA_SIZE;
+        rx->length = PM3_CMD_DATA_SIZE;
         memcpy(&rx->data, &rx_old.d.asBytes, rx->length);
     }
     return PM3_SUCCESS;
diff --git a/common/cmd.h b/common/cmd.h
index fd42607f9..352da88d4 100644
--- a/common/cmd.h
+++ b/common/cmd.h
@@ -34,7 +34,7 @@
 #define _PROXMARK_CMD_H_
 
 #include "common.h"
-#include "usb_cmd.h"
+#include "pm3_cmd.h"
 #include "usb_cdc.h"
 #include "usart.h"
 #include "proxmark3.h"
diff --git a/include/usb_cmd.h b/include/pm3_cmd.h
similarity index 97%
rename from include/usb_cmd.h
rename to include/pm3_cmd.h
index 4d4a9e8dd..41ebf221c 100644
--- a/include/usb_cmd.h
+++ b/include/pm3_cmd.h
@@ -27,15 +27,15 @@ typedef BYTE uint8_t;
 #define PACKED __attribute__((packed))
 #endif
 
-#define USB_CMD_DATA_SIZE 512
-#define USB_CMD_DATA_SIZE_MIX ( USB_CMD_DATA_SIZE - 3 * sizeof(uint64_t) )
+#define PM3_CMD_DATA_SIZE 512
+#define PM3_CMD_DATA_SIZE_MIX ( PM3_CMD_DATA_SIZE - 3 * sizeof(uint64_t) )
 
 typedef struct {
     uint64_t cmd;
     uint64_t arg[3];
     union {
-        uint8_t  asBytes[USB_CMD_DATA_SIZE];
-        uint32_t asDwords[USB_CMD_DATA_SIZE / 4];
+        uint8_t  asBytes[PM3_CMD_DATA_SIZE];
+        uint32_t asDwords[PM3_CMD_DATA_SIZE / 4];
     } d;
 } PACKED PacketCommandOLD;
 
@@ -61,8 +61,8 @@ typedef struct {
     uint16_t crc;        //  NG
     uint64_t oldarg[3];  //  OLD
     union {
-        uint8_t  asBytes[USB_CMD_DATA_SIZE];
-        uint32_t asDwords[USB_CMD_DATA_SIZE / 4];
+        uint8_t  asBytes[PM3_CMD_DATA_SIZE];
+        uint32_t asDwords[PM3_CMD_DATA_SIZE / 4];
     } data;
     bool ng;             // does it store NG data or OLD data?
 } PACKED PacketCommandNG;
@@ -70,7 +70,7 @@ typedef struct {
 // For reception and CRC check
 typedef struct {
     PacketCommandNGPreamble pre;
-    uint8_t data[USB_CMD_DATA_SIZE];
+    uint8_t data[PM3_CMD_DATA_SIZE];
     PacketCommandNGPostamble foopost; // Probably not at that offset!
 } PACKED PacketCommandNGRaw;
 
@@ -78,8 +78,8 @@ typedef struct {
     uint64_t cmd;
     uint64_t arg[3];
     union {
-        uint8_t  asBytes[USB_CMD_DATA_SIZE];
-        uint32_t asDwords[USB_CMD_DATA_SIZE / 4];
+        uint8_t  asBytes[PM3_CMD_DATA_SIZE];
+        uint32_t asDwords[PM3_CMD_DATA_SIZE / 4];
     } d;
 } PACKED PacketResponseOLD;
 
@@ -107,8 +107,8 @@ typedef struct {
     uint16_t crc;        //  NG
     uint64_t oldarg[3];  //  OLD
     union {
-        uint8_t  asBytes[USB_CMD_DATA_SIZE];
-        uint32_t asDwords[USB_CMD_DATA_SIZE / 4];
+        uint8_t  asBytes[PM3_CMD_DATA_SIZE];
+        uint32_t asDwords[PM3_CMD_DATA_SIZE / 4];
     } data;
     bool ng;             // does it store NG data or OLD data?
 } PACKED PacketResponseNG;
@@ -116,7 +116,7 @@ typedef struct {
 // For reception and CRC check
 typedef struct {
     PacketResponseNGPreamble pre;
-    uint8_t data[USB_CMD_DATA_SIZE];
+    uint8_t data[PM3_CMD_DATA_SIZE];
     PacketResponseNGPostamble foopost; // Probably not at that offset!
 } PACKED PacketResponseNGRaw;
 
diff --git a/include/proxmark3.h b/include/proxmark3.h
index 0dc4aea94..3cdf3147e 100644
--- a/include/proxmark3.h
+++ b/include/proxmark3.h
@@ -14,7 +14,7 @@
 // Might as well have the hardware-specific defines everywhere.
 #include "at91sam7s512.h"
 #include "config_gpio.h"
-#include "usb_cmd.h"
+#include "pm3_cmd.h"
 
 #define WDT_HIT()                               AT91C_BASE_WDTC->WDTC_WDCR = 0xa5000001
 
diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index a39fb7d89..aeac79b43 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -67,7 +67,7 @@ typedef struct {
     term_info tiNew;  // Terminal info during the transaction
 } serial_port_unix;
 
-// see usb_cmd.h
+// see pm3_cmd.h
 struct timeval timeout = {
     .tv_sec  = 0, // 0 second
     .tv_usec = UART_FPC_CLIENT_RX_TIMEOUT_MS * 1000

From dbf5e740694e4c44b9f4f01fbe161c7bc1d226ea Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 30 Apr 2019 21:48:14 +0200
Subject: [PATCH 1529/1938] Fix "control reaches end of non-void function"
 warning

---
 uart/uart.h       | 2 +-
 uart/uart_posix.c | 3 ++-
 uart/uart_win32.c | 5 +++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/uart/uart.h b/uart/uart.h
index 28be233f0..f803655be 100644
--- a/uart/uart.h
+++ b/uart/uart.h
@@ -107,6 +107,6 @@ uint32_t uart_get_speed(const serial_port sp);
 
 /* Reconfigure timeouts
  */
- bool uart_reconfigure_timeouts(serial_port *sp, uint32_t value );
+int uart_reconfigure_timeouts(serial_port *sp, uint32_t value );
 #endif // _UART_H_
 
diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index aeac79b43..87559ff88 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -73,8 +73,9 @@ struct timeval timeout = {
     .tv_usec = UART_FPC_CLIENT_RX_TIMEOUT_MS * 1000
 };
 
-bool uart_reconfigure_timeouts(serial_port *sp, uint32_t value ) {
+int uart_reconfigure_timeouts(serial_port *sp, uint32_t value ) {
     timeout.tv_usec = value * 1000;
+    return PM3_SUCCESS;
 }
 
 serial_port uart_open(const char *pcPortName, uint32_t speed) {
diff --git a/uart/uart_win32.c b/uart/uart_win32.c
index 6baa5eda4..0096304d0 100644
--- a/uart/uart_win32.c
+++ b/uart/uart_win32.c
@@ -48,7 +48,7 @@ typedef struct {
     COMMTIMEOUTS ct;  // Serial port time-out configuration
 } serial_port_windows;
 
-bool uart_reconfigure_timeouts(serial_port *sp, uint32_t value) {
+int uart_reconfigure_timeouts(serial_port *sp, uint32_t value) {
     
     serial_port_windows *spw = (serial_port_windows*)sp;
     spw->ct.ReadIntervalTimeout         = value;
@@ -60,10 +60,11 @@ bool uart_reconfigure_timeouts(serial_port *sp, uint32_t value) {
     if (!SetCommTimeouts(spw->hPort, &spw->ct)) {
         uart_close(spw);
         printf("[!] UART error while setting comm time outs\n");
-        return INVALID_SERIAL_PORT;
+        return PM3_EIO;
     }
 
     PurgeComm(spw->hPort, PURGE_RXABORT | PURGE_RXCLEAR);
+    return PM3_SUCCESS;
 }
 
 serial_port uart_open(const char *pcPortName, uint32_t speed) {

From e6315b88a1065cec90655588f1270836456559d3 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 30 Apr 2019 21:55:43 +0200
Subject: [PATCH 1530/1938] missing

---
 client/flasher.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/flasher.c b/client/flasher.c
index 10b48f6ef..e13180211 100644
--- a/client/flasher.c
+++ b/client/flasher.c
@@ -11,6 +11,7 @@
 #include <string.h>
 #include <inttypes.h>
 #include <pthread.h>
+#include <unistd.h>
 #include "util_posix.h"
 #include "proxmark3.h"
 #include "util.h"

From f8f39d61963feeed130b74d503329bd9488af3b2 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 30 Apr 2019 22:03:20 +0200
Subject: [PATCH 1531/1938] fix: passing a struct.

---
 client/comms.c     | 2 +-
 client/proxmark3.c | 2 +-
 uart/uart.h        | 2 +-
 uart/uart_posix.c  | 2 +-
 uart/uart_win32.c  | 5 +++--
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/client/comms.c b/client/comms.c
index 9b8d9e7eb..5bff3c13b 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -608,7 +608,7 @@ int TestProxmark(void) {
             
             // reconfigure.
             if ( conn.send_via_fpc == false ) {
-                uart_reconfigure_timeouts(&sp, UART_USB_CLIENT_RX_TIMEOUT_MS );
+                uart_reconfigure_timeouts(sp, UART_USB_CLIENT_RX_TIMEOUT_MS );
             }
            
             return PM3_SUCCESS;
diff --git a/client/proxmark3.c b/client/proxmark3.c
index d3193040b..87e4ee814 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -157,7 +157,7 @@ main_loop(char *script_cmds_file, char *script_cmd, bool pm3_present) {
                     // clear array
                     memset(script_cmd_buf, 0, sizeof(script_cmd_buf));
                     // get
-                    if (!fgets(script_cmd_buf, sizeof(script_cmd_buf), stdin)) {
+                    if (fgets(script_cmd_buf, sizeof(script_cmd_buf), stdin) == NULL) {
                         PrintAndLogEx(ERR, "STDIN unexpected end, exit...");
                         break;
                     }
diff --git a/uart/uart.h b/uart/uart.h
index f803655be..24c1063a3 100644
--- a/uart/uart.h
+++ b/uart/uart.h
@@ -107,6 +107,6 @@ uint32_t uart_get_speed(const serial_port sp);
 
 /* Reconfigure timeouts
  */
-int uart_reconfigure_timeouts(serial_port *sp, uint32_t value );
+int uart_reconfigure_timeouts(serial_port sp, uint32_t value );
 #endif // _UART_H_
 
diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index 87559ff88..f1bb0b733 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -73,7 +73,7 @@ struct timeval timeout = {
     .tv_usec = UART_FPC_CLIENT_RX_TIMEOUT_MS * 1000
 };
 
-int uart_reconfigure_timeouts(serial_port *sp, uint32_t value ) {
+int uart_reconfigure_timeouts(serial_port sp, uint32_t value ) {
     timeout.tv_usec = value * 1000;
     return PM3_SUCCESS;
 }
diff --git a/uart/uart_win32.c b/uart/uart_win32.c
index 0096304d0..6fc30ce47 100644
--- a/uart/uart_win32.c
+++ b/uart/uart_win32.c
@@ -48,9 +48,10 @@ typedef struct {
     COMMTIMEOUTS ct;  // Serial port time-out configuration
 } serial_port_windows;
 
-int uart_reconfigure_timeouts(serial_port *sp, uint32_t value) {
+int uart_reconfigure_timeouts(serial_port sp, uint32_t value) {
     
-    serial_port_windows *spw = (serial_port_windows*)sp;
+    serial_port_windows *spw;
+    spw = (serial_port_windows *)sp;
     spw->ct.ReadIntervalTimeout         = value;
     spw->ct.ReadTotalTimeoutMultiplier  = 0;
     spw->ct.ReadTotalTimeoutConstant    = value;

From 820a6d99a9b32afb7a7285dae394ac62c505159e Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 30 Apr 2019 23:52:40 +0200
Subject: [PATCH 1532/1938] better offline mode

---
 client/cmdlf.c      |  6 +++---
 client/cmdlfawid.c  |  2 +-
 client/cmdlfhid.c   |  2 +-
 client/cmdlft55xx.c |  4 ++--
 client/cmdparser.c  | 15 ++++++++++++---
 client/comms.c      | 23 +++++------------------
 client/comms.h      |  3 ---
 client/proxgui.cpp  |  8 ++++----
 client/proxgui.h    |  2 +-
 client/proxguiqt.h  |  3 +--
 client/proxmark3.c  | 33 +++++++++++++++------------------
 client/proxmark3.h  |  2 +-
 client/ui.h         |  1 +
 13 files changed, 47 insertions(+), 57 deletions(-)

diff --git a/client/cmdlf.c b/client/cmdlf.c
index 1e5878cf2..593c59d12 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -333,7 +333,7 @@ int CmdLFSetConfig(const char *Cmd) {
 }
 
 bool lf_read(bool silent, uint32_t samples) {
-    if (IsOffline()) return false;
+    if (!session.pm3_present) return false;
     clearCommandBuffer();
     SendCommandOLD(CMD_ACQUIRE_RAW_ADC_SAMPLES_125K, silent, samples, 0, NULL, 0);
 
@@ -354,7 +354,7 @@ bool lf_read(bool silent, uint32_t samples) {
 
 int CmdLFRead(const char *Cmd) {
 
-    if (IsOffline()) return 0;
+    if (!session.pm3_present) return 0;
 
     bool errors = false;
     bool silent = false;
@@ -843,7 +843,7 @@ int CmdLFfind(const char *Cmd) {
 
     if (cmdp == 'u') testRaw = 'u';
 
-    bool isOnline = (!IsOffline() && (cmdp != '1'));
+    bool isOnline = (session.pm3_present && (cmdp != '1'));
 
     if (isOnline)
         lf_read(true, 30000);
diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c
index a65abc909..fc57e9597 100644
--- a/client/cmdlfawid.c
+++ b/client/cmdlfawid.c
@@ -467,7 +467,7 @@ static int CmdAWIDBrute(const char *Cmd) {
     // main loop
     for (;;) {
 
-        if (IsOffline()) {
+        if (!session.pm3_present) {
             PrintAndLogEx(WARNING, "Device offline\n");
             return  2;
         }
diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c
index 8acf9037e..857d79adb 100644
--- a/client/cmdlfhid.c
+++ b/client/cmdlfhid.c
@@ -569,7 +569,7 @@ static int CmdHIDBrute(const char *Cmd) {
     // main loop
     for (;;) {
 
-        if (IsOffline()) {
+        if (!session.pm3_present) {
             PrintAndLogEx(WARNING, "Device offline\n");
             return  2;
         }
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 8057c7469..661d4bdbb 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -505,7 +505,7 @@ static bool DecodeT5555TraceBlock(void) {
 
 // sanity check. Don't use proxmark if it is offline and you didn't specify useGraphbuf
 static int SanityOfflineCheck(bool useGraphBuffer) {
-    if (!useGraphBuffer && IsOffline()) {
+    if (!useGraphBuffer && !session.pm3_present) {
         PrintAndLogEx(WARNING, "Your proxmark3 device is offline. Specify [1] to use graphbuffer data instead");
         return 0;
     }
@@ -1914,7 +1914,7 @@ static int CmdT55xxChkPwds(const char *Cmd) {
         uint64_t curr_password = 0x00;
         for (uint16_t c = 0; c < keycount; ++c) {
 
-            if (IsOffline()) {
+            if (!session.pm3_present) {
                 PrintAndLogEx(WARNING, "Device offline\n");
                 free(keyBlock);
                 return 2;
diff --git a/client/cmdparser.c b/client/cmdparser.c
index 75a117045..bb24e532b 100644
--- a/client/cmdparser.c
+++ b/client/cmdparser.c
@@ -21,7 +21,7 @@ void CmdsHelp(const command_t Commands[]) {
     if (Commands[0].Name == NULL) return;
     int i = 0;
     while (Commands[i].Name) {
-        if (!IsOffline() || Commands[i].Offline)
+        if (session.pm3_present || Commands[i].Offline)
             PrintAndLogEx(NORMAL, "%-16s %s", Commands[i].Name, Commands[i].Help);
         ++i;
     }
@@ -44,8 +44,17 @@ int CmdsParse(const command_t Commands[], const char *Cmd) {
     sscanf(Cmd, "%127s%n", cmd_name, &len);
     str_lower(cmd_name);
     int i = 0;
-    while (Commands[i].Name && strcmp(Commands[i].Name, cmd_name))
+    while (Commands[i].Name) {
+        if (0 == strcmp(Commands[i].Name, cmd_name)) {
+            if (session.pm3_present || Commands[i].Offline) {
+                break;
+            } else {
+                PrintAndLogEx(WARNING, "This command is only available in " _YELLOW_("online") "mode");
+                return PM3_ENOTIMPL;
+            }
+        }
         ++i;
+    }
 
     /* try to find exactly one prefix-match */
     if (!Commands[i].Name) {
@@ -53,7 +62,7 @@ int CmdsParse(const command_t Commands[], const char *Cmd) {
         int matches = 0;
 
         for (i = 0; Commands[i].Name; i++) {
-            if (!strncmp(Commands[i].Name, cmd_name, strlen(cmd_name))) {
+            if (!strncmp(Commands[i].Name, cmd_name, strlen(cmd_name)) && (session.pm3_present || Commands[i].Offline)) {
                 last_match = i;
                 matches++;
             }
diff --git a/client/comms.c b/client/comms.c
index 5bff3c13b..d1f42a8a4 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -23,9 +23,6 @@
 static serial_port sp = NULL;
 static char *serial_port_name = NULL;
 
-// If TRUE, then there is no active connection to the PM3, and we will drop commands sent.
-static bool offline;
-
 communication_arg_t conn;
 capabilities_t pm3_capabilities;
 
@@ -59,16 +56,6 @@ static uint64_t timeout_start_time;
 
 static bool dl_it(uint8_t *dest, uint32_t bytes, uint32_t start_index, PacketResponseNG *response, size_t ms_timeout, bool show_warning, uint32_t rec_cmd);
 
-// These wrappers are required because it is not possible to access a static
-// global variable outside of the context of a single file.
-void SetOffline(bool value) {
-    offline = value;
-}
-
-bool IsOffline() {
-    return offline;
-}
-
 void SendCommand(PacketCommandOLD *c) {
 
 #ifdef COMMS_DEBUG
@@ -80,7 +67,7 @@ void SendCommand(PacketCommandOLD *c) {
     print_hex_break((uint8_t *)&c->d, sizeof(c->d), 32);
 #endif
 
-    if (offline) {
+    if (!session.pm3_present) {
         PrintAndLogEx(WARNING, "Sending bytes to Proxmark3 failed." _YELLOW_("offline"));
         return;
     }
@@ -123,7 +110,7 @@ static void SendCommandNG_internal(uint16_t cmd, uint8_t *data, size_t len, bool
     PrintAndLogEx(NORMAL, "Sending %s", ng ? "NG" : "MIX");
 #endif
 
-    if (offline) {
+    if (!session.pm3_present) {
         PrintAndLogEx(NORMAL, "Sending bytes to proxmark failed - offline");
         return;
     }
@@ -326,18 +313,18 @@ bool hookUpPM3() {
         sp = NULL;
         serial_port_name = NULL;
         ret = false;
-        offline = 1;
+        session.pm3_present = false;
     } else if (sp == CLAIMED_SERIAL_PORT) {
         PrintAndLogEx(WARNING, "Reconnect failed, retrying... (reason: serial port is claimed by another process)\n");
         sp = NULL;
         serial_port_name = NULL;
         ret = false;
-        offline = 1;
+        session.pm3_present = false;
     } else {
         PrintAndLogEx(SUCCESS, "Proxmark3 reconnected\n");
         serial_port_name = ;
         ret = true;
-        offline = 0;
+        session.pm3_present = true;
     }
     return ret;
 }
diff --git a/client/comms.h b/client/comms.h
index c53b75bee..9edf030cd 100644
--- a/client/comms.h
+++ b/client/comms.h
@@ -53,9 +53,6 @@ typedef struct {
 
 extern communication_arg_t conn;
 
-void SetOffline(bool value);
-bool IsOffline(void);
-
 void *uart_receiver(void *targ);
 void SendCommand(PacketCommandOLD *c);
 void SendCommandOLD(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
diff --git a/client/proxgui.cpp b/client/proxgui.cpp
index bc382d1c2..120f2b26d 100644
--- a/client/proxgui.cpp
+++ b/client/proxgui.cpp
@@ -15,14 +15,14 @@
 static ProxGuiQT *gui = NULL;
 static WorkerThread *main_loop_thread = NULL;
 
-WorkerThread::WorkerThread(char *script_cmds_file, char *script_cmd, bool pm3_present) : script_cmds_file(script_cmds_file), script_cmd(script_cmd), pm3_present(pm3_present) {
+WorkerThread::WorkerThread(char *script_cmds_file, char *script_cmd) : script_cmds_file(script_cmds_file), script_cmd(script_cmd) {
 }
 
 WorkerThread::~WorkerThread() {
 }
 
 void WorkerThread::run() {
-    main_loop(script_cmds_file, script_cmd, pm3_present);
+    main_loop(script_cmds_file, script_cmd);
 }
 
 extern "C" void ShowGraphWindow(void) {
@@ -53,12 +53,12 @@ extern "C" void MainGraphics(void) {
     gui->MainLoop();
 }
 
-extern "C" void InitGraphics(int argc, char **argv, char *script_cmds_file, char *script_cmd, bool pm3_present) {
+extern "C" void InitGraphics(int argc, char **argv, char *script_cmds_file, char *script_cmd) {
 #ifdef Q_WS_X11
     if (getenv("DISPLAY") == NULL)
         return;
 #endif
-    main_loop_thread = new WorkerThread(script_cmds_file, script_cmd, pm3_present);
+    main_loop_thread = new WorkerThread(script_cmds_file, script_cmd);
     gui = new ProxGuiQT(argc, argv, main_loop_thread);
 }
 
diff --git a/client/proxgui.h b/client/proxgui.h
index 40fb1ce2d..dfbddbc0c 100644
--- a/client/proxgui.h
+++ b/client/proxgui.h
@@ -22,7 +22,7 @@ void ShowGraphWindow(void);
 void HideGraphWindow(void);
 void RepaintGraphWindow(void);
 void MainGraphics(void);
-void InitGraphics(int argc, char **argv, char *script_cmds_file, char *script_cmd, bool pm3_present);
+void InitGraphics(int argc, char **argv, char *script_cmds_file, char *script_cmd);
 void ExitGraphics(void);
 #ifndef MAX_GRAPH_TRACE_LEN
 #define MAX_GRAPH_TRACE_LEN (40000 * 8)
diff --git a/client/proxguiqt.h b/client/proxguiqt.h
index 2685aecde..f8f919307 100644
--- a/client/proxguiqt.h
+++ b/client/proxguiqt.h
@@ -93,13 +93,12 @@ class ProxWidget : public QWidget {
 class WorkerThread : public QThread {
     Q_OBJECT;
   public:
-    WorkerThread(char *, char *, bool);
+    WorkerThread(char *, char *);
     ~WorkerThread();
     void run();
   private:
     char *script_cmds_file = NULL;
     char *script_cmd = NULL;
-    bool pm3_present;
 };
 
 class ProxGuiQT : public QObject {
diff --git a/client/proxmark3.c b/client/proxmark3.c
index 87e4ee814..2a6ff7aa4 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -58,7 +58,7 @@ void
 __attribute__((force_align_arg_pointer))
 #endif
 #endif
-main_loop(char *script_cmds_file, char *script_cmd, bool pm3_present) {
+main_loop(char *script_cmds_file, char *script_cmd) {
 
     char *cmd = NULL;
     bool execCommand = (script_cmd != NULL);
@@ -73,15 +73,12 @@ main_loop(char *script_cmds_file, char *script_cmd, bool pm3_present) {
 
     PrintAndLogEx(DEBUG, "ISATTY/STDIN_FILENO == %s\n", (stdinOnPipe) ? "true" : "false");
 
-    if (pm3_present) {
-        SetOffline(false);
+    if (session.pm3_present) {
         // cache Version information now:
         if (execCommand || script_cmds_file || stdinOnPipe)
             pm3_version(false);
         else
             pm3_version(true);
-    } else {
-        SetOffline(true);
     }
 
     if (script_cmds_file) {
@@ -100,13 +97,13 @@ main_loop(char *script_cmds_file, char *script_cmd, bool pm3_present) {
         bool printprompt = false;
         // this should hook up the PM3 again.
         /*
-        if ( IsOffline() ) {
+        if ( !session.pm3_present ) {
 
             // sets the global variable, SP and offline)
-            pm3_present = hookUpPM3();
+            session.pm3_present = hookUpPM3();
 
             // usb and the reader_thread is NULL,  create a new reader thread.
-            if (pm3_present && !IsOffline() ) {
+            if (session.pm3_present) {
                 rarg.run = 1;
                 pthread_create(&reader_thread, NULL, &uart_receiver, &rarg);
                 // cache Version information now:
@@ -293,7 +290,7 @@ static void show_help(bool showFullHelp, char *exec_name) {
 int main(int argc, char *argv[]) {
     srand(time(0));
 
-    bool pm3_present = false;
+    session.pm3_present = false;
     bool waitCOMPort = false;
     bool addLuaExec = false;
     char *script_cmds_file = NULL;
@@ -489,38 +486,38 @@ int main(int argc, char *argv[]) {
 
     // try to open USB connection to Proxmark
     if (port != NULL)
-        pm3_present = OpenProxmark(port, waitCOMPort, 20, false, speed);
+        session.pm3_present = OpenProxmark(port, waitCOMPort, 20, false, speed);
 
-    if (pm3_present && (TestProxmark() != PM3_SUCCESS)) {
+    if (session.pm3_present && (TestProxmark() != PM3_SUCCESS)) {
         PrintAndLogEx(ERR, _RED_("ERROR:") "cannot communicate with the Proxmark\n");
         CloseProxmark();
-        pm3_present = false;
+        session.pm3_present = false;
     }
-    if (!pm3_present)
+    if (!session.pm3_present)
         PrintAndLogEx(INFO, "Running in " _YELLOW_("OFFLINE") "mode. Check \"%s -h\" if it's not what you want.\n", exec_name);
 
 #ifdef HAVE_GUI
 
 #  ifdef _WIN32
-    InitGraphics(argc, argv, script_cmds_file, script_cmd, pm3_present);
+    InitGraphics(argc, argv, script_cmds_file, script_cmd);
     MainGraphics();
 #  else
     // for *nix distro's,  check enviroment variable to verify a display
     char *display = getenv("DISPLAY");
     if (display && strlen(display) > 1) {
-        InitGraphics(argc, argv, script_cmds_file, script_cmd, pm3_present);
+        InitGraphics(argc, argv, script_cmds_file, script_cmd);
         MainGraphics();
     } else {
-        main_loop(script_cmds_file, script_cmd, pm3_present);
+        main_loop(script_cmds_file, script_cmd);
     }
 #  endif
 
 #else
-    main_loop(script_cmds_file, script_cmd, pm3_present);
+    main_loop(script_cmds_file, script_cmd);
 #endif
 
     // Clean up the port
-    if (pm3_present) {
+    if (session.pm3_present) {
         CloseProxmark();
     }
 
diff --git a/client/proxmark3.h b/client/proxmark3.h
index 20664ab81..afebc1c0a 100644
--- a/client/proxmark3.h
+++ b/client/proxmark3.h
@@ -23,7 +23,7 @@ extern "C" {
 
 const char *get_my_executable_path(void);
 const char *get_my_executable_directory(void);
-void main_loop(char *script_cmds_file, char *script_cmd, bool pm3_present);
+void main_loop(char *script_cmds_file, char *script_cmd);
 
 #ifdef __cplusplus
 }
diff --git a/client/ui.h b/client/ui.h
index 0ffe02aa5..5ab30b3e1 100644
--- a/client/ui.h
+++ b/client/ui.h
@@ -28,6 +28,7 @@ typedef struct {
     bool stdinOnTTY;
     bool stdoutOnTTY;
     bool supports_colors;
+    bool pm3_present;
 } session_arg_t;
 
 extern session_arg_t session;

From 2c5c5fb3d7012e7e5eebd5a75fb12a04b15daf8f Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 1 May 2019 01:24:46 +0200
Subject: [PATCH 1533/1938] sort out jtag config files

---
 .../at91sam7s256-armusbocd-flash-program.cfg  | 39 --------------
 tools/at91sam7s256-armusbocd.cfg              | 29 ----------
 tools/at91sam7s256-jtagkey.cfg                | 24 ---------
 tools/at91sam7s256-wiggler.cfg                | 39 --------------
 tools/at91sam7s512-busblaster.cfg             | 54 -------------------
 tools/at91sam7s512-buspirate.cfg              | 52 ------------------
 tools/at91sam7s512-jlink.cfg                  | 38 -------------
 tools/at91sam7s512-jtagkey.cfg                | 41 --------------
 .../chip-at91sam7s.cfg}                       | 12 +----
 tools/jtag_openocd/interface-armusbocd.cfg    | 12 +++++
 tools/jtag_openocd/interface-busblaster.cfg   | 14 +++++
 tools/jtag_openocd/interface-buspirate.cfg    | 20 +++++++
 tools/jtag_openocd/interface-jlink.cfg        |  7 +++
 tools/jtag_openocd/interface-jtagkey.cfg      | 12 +++++
 tools/jtag_openocd/interface-wiggler.cfg      |  9 ++++
 tools/jtag_openocd/openocd_flash_recovery.sh  | 12 +++++
 16 files changed, 88 insertions(+), 326 deletions(-)
 delete mode 100644 tools/at91sam7s256-armusbocd-flash-program.cfg
 delete mode 100644 tools/at91sam7s256-armusbocd.cfg
 delete mode 100644 tools/at91sam7s256-jtagkey.cfg
 delete mode 100644 tools/at91sam7s256-wiggler.cfg
 delete mode 100644 tools/at91sam7s512-busblaster.cfg
 delete mode 100644 tools/at91sam7s512-buspirate.cfg
 delete mode 100644 tools/at91sam7s512-jlink.cfg
 delete mode 100644 tools/at91sam7s512-jtagkey.cfg
 rename tools/{at91sam7s256-jlink.cfg => jtag_openocd/chip-at91sam7s.cfg} (81%)
 create mode 100644 tools/jtag_openocd/interface-armusbocd.cfg
 create mode 100644 tools/jtag_openocd/interface-busblaster.cfg
 create mode 100644 tools/jtag_openocd/interface-buspirate.cfg
 create mode 100644 tools/jtag_openocd/interface-jlink.cfg
 create mode 100644 tools/jtag_openocd/interface-jtagkey.cfg
 create mode 100644 tools/jtag_openocd/interface-wiggler.cfg
 create mode 100755 tools/jtag_openocd/openocd_flash_recovery.sh

diff --git a/tools/at91sam7s256-armusbocd-flash-program.cfg b/tools/at91sam7s256-armusbocd-flash-program.cfg
deleted file mode 100644
index 1884407ae..000000000
--- a/tools/at91sam7s256-armusbocd-flash-program.cfg
+++ /dev/null
@@ -1,39 +0,0 @@
-#define our ports
-telnet_port 4444
-gdb_port 3333
-
-#commands specific to the Olimex ARM-USB-OCD Dongle
-interface ft2232
-ft2232_device_desc "Olimex OpenOCD JTAG"
-ft2232_layout "olimex-jtag"
-ft2232_vid_pid 0x15BA 0x0003
-jtag_speed 2
-jtag_nsrst_delay 200
-jtag_ntrst_delay 200
-
-#reset_config <signals> [combination] [trst_type] [srst_type]
-reset_config srst_only srst_pulls_trst
-
-#jtag_device <IR length> <IR capture> <IR mask> <IDCODE instruction>
-jtag_device 4 0x1 0xf 0xe
-
-#daemon_startup <'attach'|'reset'>
-daemon_startup reset
-
-#target <type> <endianess> <reset_mode> <jtag#> [variant]
-target arm7tdmi little run_and_init 0 arm7tdmi_r4
-
-#run_and_halt_time <target#> <time_in_ms>
-run_and_halt_time 0 30
-
-# commands below are specific to AT91sam7 Flash Programming
-# ---------------------------------------------------------
-
-#target_script specifies the flash programming script file
-target_script 0 reset script.ocd
-
-#working_area <target#> <address> <size> <'backup'|'nobackup'>
-working_area 0 0x40000000 0x4000 nobackup
-
-#flash bank at91sam7 0 0 0 0 <target#>
-flash bank at91sam7 0 0 0 0 0
diff --git a/tools/at91sam7s256-armusbocd.cfg b/tools/at91sam7s256-armusbocd.cfg
deleted file mode 100644
index 3d0bdd248..000000000
--- a/tools/at91sam7s256-armusbocd.cfg
+++ /dev/null
@@ -1,29 +0,0 @@
-#define our ports
-telnet_port 4444
-gdb_port 3333
-
-#commands specific to the Olimex arm-usb-ocd
-interface ft2232
-# Be careful to reflect the exact description here:
-ft2232_device_desc "Olimex OpenOCD JTAG"
-ft2232_layout "olimex-jtag"
-ft2232_vid_pid 0x15BA 0x0003
-jtag_speed 2
-jtag_nsrst_delay 200
-jtag_ntrst_delay 200
-
-#reset_config <signals> [combination] [trst_type] [srst_type]
-reset_config srst_only srst_pulls_trst
-
-#jtag_device <IR length> <IR capture> <IR mask> <IDCODE instruction>
-jtag_device 4 0x1 0xf 0xe
-
-#daemon_startup <'attach'|'reset'>
-daemon_startup reset
-
-#target <type> <endianess> <reset_mode> <jtag#> [variant]
-target arm7tdmi little run_and_init 0 arm7tdmi_r4
-
-#run_and_halt_time <target#> <time_in_ms>
-run_and_halt_time 0 30
-
diff --git a/tools/at91sam7s256-jtagkey.cfg b/tools/at91sam7s256-jtagkey.cfg
deleted file mode 100644
index 2c32b7955..000000000
--- a/tools/at91sam7s256-jtagkey.cfg
+++ /dev/null
@@ -1,24 +0,0 @@
-#define our ports
-telnet_port 4444
-gdb_port 3333
-
-#commands specific to the Amontec JTAGKey
-interface ft2232
-ft2232_device_desc "Amontec JTAGkey A"
-ft2232_layout jtagkey
-ft2232_vid_pid 0x0403 0xcff8
-jtag_khz 200
-jtag_nsrst_delay 200
-jtag_ntrst_delay 200
-
-#reset_config <signals> [combination] [trst_type] [srst_type]
-reset_config srst_only srst_pulls_trst
-
-jtag newtap sam7x256 cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id 0x3f0f0f0f
-
-target create sam7x256.cpu arm7tdmi -endian little -chain-position sam7x256.cpu -variant arm7tdmi
-
-gdb_memory_map enable
-
-sam7x256.cpu configure -work-area-virt 0 -work-area-phys 0x00200000 -work-area-size 0x10000 -work-area-backup 0
-flash bank at91sam7 0x100000 0x40000 0 4 sam7x256.cpu
diff --git a/tools/at91sam7s256-wiggler.cfg b/tools/at91sam7s256-wiggler.cfg
deleted file mode 100644
index 83180dc9f..000000000
--- a/tools/at91sam7s256-wiggler.cfg
+++ /dev/null
@@ -1,39 +0,0 @@
-telnet_port 4444
-gdb_port 3333
-
-interface parport
-parport_port 0x378
-parport_cable wiggler
-jtag_speed 0
-jtag_nsrst_delay 200
-jtag_ntrst_delay 200
-
-reset_config srst_only srst_pulls_trst
-
-jtag newtap sam7x256 cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id 0x3f0f0f0f
-#jtag newtap xilinx tap -irlen 6 -ircapture 0x1 -irmask 0xf -expected-id 0x1c1a093
-
-target create sam7x256.cpu arm7tdmi -endian little -chain-position sam7x256.cpu -variant arm7tdmi
-sam7x256.cpu configure -event reset-init {
-	# disable watchdog
-	mww 0xfffffd44 0x00008000
-	# enable user reset
-	mww 0xfffffd08 0xa5000001
-	# CKGR_MOR : enable the main oscillator
-	mww 0xfffffc20 0x00000601
-	sleep 10
-	# CKGR_PLLR:  16 MHz * (5+1) /1 = 96Mhz
-	mww 0xfffffc2c 0x00051c01
-	sleep 10
-	# PMC_MCKR : MCK = PLL / 2 = 48 MHz
-	mww 0xfffffc30 0x00000007
-	sleep 10
-	# MC_FMR: flash mode (FWS=1,FMCN=60)
-	mww 0xffffff60 0x003c0100
-	sleep 100
-}
-
-gdb_memory_map enable
-
-sam7x256.cpu configure -work-area-virt 0 -work-area-phys 0x00200000 -work-area-size 0x10000 -work-area-backup 0
-flash bank at91sam7 0 0 0 0 0
diff --git a/tools/at91sam7s512-busblaster.cfg b/tools/at91sam7s512-busblaster.cfg
deleted file mode 100644
index 6555936b4..000000000
--- a/tools/at91sam7s512-busblaster.cfg
+++ /dev/null
@@ -1,54 +0,0 @@
-## General OpenOCD configuration
-# Ports
-telnet_port 4444
-gdb_port 3333
-
-## Interface configuration section
-# Interface
-
-# you can use
-#source [find interface/ftdi/dp_busblaster.cfg]
-# or
-
-interface ftdi
-ftdi_device_desc "Dual RS232-HS"
-ftdi_vid_pid 0x0403 0x6010
-
-ftdi_layout_init 0x0c08 0x0f1b
-ftdi_layout_signal nTRST -data 0x0100 -noe 0x0400
-ftdi_layout_signal nSRST -data 0x0200 -noe 0x0800
-
-adapter_khz 1000
-
-## Chipset configuration section
-# use combined on interfaces or targets that can't set TRST/SRST separately
-reset_config srst_only srst_pulls_trst
-
-jtag newtap sam7x cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id 0x3f0f0f0f
-
-target create sam7x.cpu arm7tdmi -endian little -chain-position sam7x.cpu
-
-sam7x.cpu configure -event reset-init {
-    soft_reset_halt
-    mww 0xfffffd00 0xa5000004   # RSTC_CR: Reset peripherals
-    mww 0xfffffd44 0x00008000   # WDT_MR: disable watchdog
-    mww 0xfffffd08 0xa5000001   # RSTC_MR enable user reset
-    mww 0xfffffc20 0x00005001   # CKGR_MOR : enable the main oscillator
-    sleep 10
-    mww 0xfffffc2c 0x000b1c02   # CKGR_PLLR: 16MHz * 12/2 = 96MHz
-    sleep 10
-    mww 0xfffffc30 0x00000007   # PMC_MCKR : MCK = PLL / 2 = 48 MHz
-    sleep 10
-    mww 0xffffff60 0x00480100   # MC_FMR: flash mode (FWS=1,FMCN=72)
-    sleep 100
-
-}
-
-# GDB can also flash my flash!
-gdb_memory_map enable
-gdb_breakpoint_override hard
-#armv4_5 core_state arm
-
-sam7x.cpu configure -work-area-virt 0 -work-area-phys 0x00200000 -work-area-size 0x10000 -work-area-backup 0
-flash bank sam7x512.flash.0 at91sam7 0 0 0 0 sam7x.cpu 0 0 0 0 0 0 0 18432
-flash bank sam7x512.flash.1 at91sam7 0 0 0 0 sam7x.cpu 1 0 0 0 0 0 0 18432
diff --git a/tools/at91sam7s512-buspirate.cfg b/tools/at91sam7s512-buspirate.cfg
deleted file mode 100644
index 64473667a..000000000
--- a/tools/at91sam7s512-buspirate.cfg
+++ /dev/null
@@ -1,52 +0,0 @@
-# Ports
-telnet_port 4444
-gdb_port 3333
-
-# Interface
-interface buspirate
-buspirate_port /dev/ttyUSB0
-adapter_khz 1000
-
-# Communication speed
-buspirate_speed normal # or fast
-
-# Voltage regulator: enabled = 1 or disabled = 0
-buspirate_vreg 1
-
-# Pin mode: normal or open-drain
-buspirate_mode normal
-
-# Pull-up state: enabled = 1 or disabled = 0
-buspirate_pullup 1
-
-# use combined on interfaces or targets that can't set TRST/SRST separately
-reset_config srst_only srst_pulls_trst
-
-jtag newtap sam7x cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id 0x3f0f0f0f 
-
-target create sam7x.cpu arm7tdmi -endian little -chain-position sam7x.cpu 
-
-sam7x.cpu configure -event reset-init { 
-    soft_reset_halt
-    mww 0xfffffd00 0xa5000004   # RSTC_CR: Reset peripherals
-    mww 0xfffffd44 0x00008000   # WDT_MR: disable watchdog
-    mww 0xfffffd08 0xa5000001   # RSTC_MR enable user reset
-    mww 0xfffffc20 0x00005001   # CKGR_MOR : enable the main oscillator
-    sleep 10
-    mww 0xfffffc2c 0x000b1c02   # CKGR_PLLR: 16MHz * 12/2 = 96MHz
-    sleep 10
-    mww 0xfffffc30 0x00000007   # PMC_MCKR : MCK = PLL / 2 = 48 MHz
-    sleep 10
-    mww 0xffffff60 0x00480100   # MC_FMR: flash mode (FWS=1,FMCN=72)
-    sleep 100
-
-}
-
-gdb_memory_map enable
-#gdb_breakpoint_override hard
-#armv4_5 core_state arm
-
-sam7x.cpu configure -work-area-virt 0 -work-area-phys 0x00200000 -work-area-size 0x10000 -work-area-backup 0
-flash bank sam7x512.flash.0 at91sam7 0 0 0 0 sam7x.cpu 0 0 0 0 0 0 0 18432
-flash bank sam7x512.flash.1 at91sam7 0 0 0 0 sam7x.cpu 1 0 0 0 0 0 0 18432
-
diff --git a/tools/at91sam7s512-jlink.cfg b/tools/at91sam7s512-jlink.cfg
deleted file mode 100644
index 8582dc02b..000000000
--- a/tools/at91sam7s512-jlink.cfg
+++ /dev/null
@@ -1,38 +0,0 @@
-#define our ports
-telnet_port 4444
-gdb_port 3333
-
-interface jlink
-transport select jtag
-adapter_khz 1000
-
-#reset_config <signals> [combination] [trst_type] [srst_type]
-reset_config srst_only srst_pulls_trst
-
-jtag newtap sam7x cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id 0x3f0f0f0f
-
-target create sam7x.cpu arm7tdmi -endian little -chain-position sam7x.cpu
-
-sam7x.cpu configure -event reset-init {
-	soft_reset_halt
-	mww 0xfffffd00 0xa5000004	# RSTC_CR: Reset peripherals
-	mww 0xfffffd44 0x00008000	# WDT_MR: disable watchdog
-	mww 0xfffffd08 0xa5000001	# RSTC_MR enable user reset
-	mww 0xfffffc20 0x00005001	# CKGR_MOR : enable the main oscillator
-	sleep 10
-	mww 0xfffffc2c 0x000b1c02	# CKGR_PLLR: 16MHz * 12/2 = 96MHz
-	sleep 10
-	mww 0xfffffc30 0x00000007	# PMC_MCKR : MCK = PLL / 2 = 48 MHz
-	sleep 10
-	mww 0xffffff60 0x00480100	# MC_FMR: flash mode (FWS=1,FMCN=72)
-	sleep 100
-}
-
-gdb_memory_map enable
-#gdb_breakpoint_override hard
-#armv4_5 core_state arm
-
-sam7x.cpu configure -work-area-virt 0 -work-area-phys 0x00200000 -work-area-size 0x10000 -work-area-backup 0
-#flash bank sam7x.flash.0 at91sam7 0x100000 0x40000 0 4 sam7x.cpu
-flash bank sam7x512.flash.0 at91sam7 0 0 0 0 sam7x.cpu 0 0 0 0 0 0 0 18432
-flash bank sam7x512.flash.1 at91sam7 0 0 0 0 sam7x.cpu 1 0 0 0 0 0 0 18432
diff --git a/tools/at91sam7s512-jtagkey.cfg b/tools/at91sam7s512-jtagkey.cfg
deleted file mode 100644
index 3bcc5120b..000000000
--- a/tools/at91sam7s512-jtagkey.cfg
+++ /dev/null
@@ -1,41 +0,0 @@
-#define our ports
-telnet_port 4444
-gdb_port 3333
-
-#commands specific to the Amontec JTAGKey
-interface ft2232
-ft2232_device_desc "Amontec JTAGkey A"
-ft2232_layout jtagkey
-ft2232_vid_pid 0x0403 0xcff8
-jtag_khz 200
-jtag_nsrst_delay 200
-jtag_ntrst_delay 200
-
-#reset_config <signals> [combination] [trst_type] [srst_type]
-reset_config srst_only srst_pulls_trst
-
-jtag newtap sam7x cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id 0x3f0f0f0f
-
-target create sam7x.cpu arm7tdmi -endian little -chain-position sam7x.cpu -variant arm7tdmi
-
-sam7x.cpu configure -event reset-init {
-	soft_reset_halt
-	mww 0xfffffd00 0xa5000004	# RSTC_CR: Reset peripherals
-	mww 0xfffffd44 0x00008000	# WDT_MR: disable watchdog
-	mww 0xfffffd08 0xa5000001	# RSTC_MR enable user reset
-	mww 0xfffffc20 0x00005001	# CKGR_MOR : enable the main oscillator
-	sleep 10
-	mww 0xfffffc2c 0x000b1c02	# CKGR_PLLR: 16MHz * 12/2 = 96MHz
-	sleep 10
-	mww 0xfffffc30 0x00000007	# PMC_MCKR : MCK = PLL / 2 = 48 MHz
-	sleep 10
-	mww 0xffffff60 0x00480100	# MC_FMR: flash mode (FWS=1,FMCN=72)
-	sleep 100
-}
-
-gdb_memory_map enable
-gdb_breakpoint_override hard
-armv4_5 core_state arm
-
-sam7x.cpu configure -work-area-virt 0 -work-area-phys 0x00200000 -work-area-size 0x10000 -work-area-backup 0
-flash bank at91sam7 0x100000 0x40000 0 4 sam7x.cpu
diff --git a/tools/at91sam7s256-jlink.cfg b/tools/jtag_openocd/chip-at91sam7s.cfg
similarity index 81%
rename from tools/at91sam7s256-jlink.cfg
rename to tools/jtag_openocd/chip-at91sam7s.cfg
index c022c59a1..a0787770a 100644
--- a/tools/at91sam7s256-jlink.cfg
+++ b/tools/jtag_openocd/chip-at91sam7s.cfg
@@ -1,12 +1,5 @@
-#define our ports
-telnet_port 4444
-gdb_port 3333
-
-interface jlink
-transport select jtag
-adapter_khz 1000
-
-#reset_config <signals> [combination] [trst_type] [srst_type]
+## Chipset configuration section
+# use combined on interfaces or targets that can't set TRST/SRST separately
 reset_config srst_only srst_pulls_trst
 
 jtag newtap sam7x cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id 0x3f0f0f0f
@@ -33,6 +26,5 @@ gdb_memory_map enable
 #armv4_5 core_state arm
 
 sam7x.cpu configure -work-area-virt 0 -work-area-phys 0x00200000 -work-area-size 0x10000 -work-area-backup 0
-#flash bank sam7x.flash.0 at91sam7 0x100000 0x40000 0 4 sam7x.cpu
 flash bank sam7x.flash.0 at91sam7 0 0 0 0 sam7x.cpu 0 0 0 0 0 0 0 18432
 flash bank sam7x.flash.1 at91sam7 0 0 0 0 sam7x.cpu 1 0 0 0 0 0 0 18432
diff --git a/tools/jtag_openocd/interface-armusbocd.cfg b/tools/jtag_openocd/interface-armusbocd.cfg
new file mode 100644
index 000000000..4f5c6bb93
--- /dev/null
+++ b/tools/jtag_openocd/interface-armusbocd.cfg
@@ -0,0 +1,12 @@
+#define our ports
+telnet_port 4444
+gdb_port 3333
+
+#commands specific to the Olimex ARM-USB-OCD Dongle
+interface ft2232
+ft2232_device_desc "Olimex OpenOCD JTAG"
+ft2232_layout "olimex-jtag"
+ft2232_vid_pid 0x15BA 0x0003
+jtag_speed 2
+jtag_nsrst_delay 200
+jtag_ntrst_delay 200
diff --git a/tools/jtag_openocd/interface-busblaster.cfg b/tools/jtag_openocd/interface-busblaster.cfg
new file mode 100644
index 000000000..4d3ac032e
--- /dev/null
+++ b/tools/jtag_openocd/interface-busblaster.cfg
@@ -0,0 +1,14 @@
+## General OpenOCD configuration
+# Ports
+telnet_port 4444
+gdb_port 3333
+
+interface ftdi
+ftdi_device_desc "Dual RS232-HS"
+ftdi_vid_pid 0x0403 0x6010
+
+ftdi_layout_init 0x0c08 0x0f1b
+ftdi_layout_signal nTRST -data 0x0100 -noe 0x0400
+ftdi_layout_signal nSRST -data 0x0200 -noe 0x0800
+
+adapter_khz 1000
diff --git a/tools/jtag_openocd/interface-buspirate.cfg b/tools/jtag_openocd/interface-buspirate.cfg
new file mode 100644
index 000000000..66d0ce614
--- /dev/null
+++ b/tools/jtag_openocd/interface-buspirate.cfg
@@ -0,0 +1,20 @@
+# Ports
+telnet_port 4444
+gdb_port 3333
+
+# Interface
+interface buspirate
+buspirate_port /dev/ttyUSB0
+adapter_khz 1000
+
+# Communication speed
+buspirate_speed normal # or fast
+
+# Voltage regulator: enabled = 1 or disabled = 0
+buspirate_vreg 1
+
+# Pin mode: normal or open-drain
+buspirate_mode normal
+
+# Pull-up state: enabled = 1 or disabled = 0
+buspirate_pullup 1
diff --git a/tools/jtag_openocd/interface-jlink.cfg b/tools/jtag_openocd/interface-jlink.cfg
new file mode 100644
index 000000000..fe6c892f8
--- /dev/null
+++ b/tools/jtag_openocd/interface-jlink.cfg
@@ -0,0 +1,7 @@
+#define our ports
+telnet_port 4444
+gdb_port 3333
+
+interface jlink
+transport select jtag
+adapter_khz 1000
diff --git a/tools/jtag_openocd/interface-jtagkey.cfg b/tools/jtag_openocd/interface-jtagkey.cfg
new file mode 100644
index 000000000..305dfd7da
--- /dev/null
+++ b/tools/jtag_openocd/interface-jtagkey.cfg
@@ -0,0 +1,12 @@
+#define our ports
+telnet_port 4444
+gdb_port 3333
+
+#commands specific to the Amontec JTAGKey
+interface ft2232
+ft2232_device_desc "Amontec JTAGkey A"
+ft2232_layout jtagkey
+ft2232_vid_pid 0x0403 0xcff8
+jtag_khz 200
+jtag_nsrst_delay 200
+jtag_ntrst_delay 200
diff --git a/tools/jtag_openocd/interface-wiggler.cfg b/tools/jtag_openocd/interface-wiggler.cfg
new file mode 100644
index 000000000..024ed9710
--- /dev/null
+++ b/tools/jtag_openocd/interface-wiggler.cfg
@@ -0,0 +1,9 @@
+telnet_port 4444
+gdb_port 3333
+
+interface parport
+parport_port 0x378
+parport_cable wiggler
+jtag_speed 0
+jtag_nsrst_delay 200
+jtag_ntrst_delay 200
diff --git a/tools/jtag_openocd/openocd_flash_recovery.sh b/tools/jtag_openocd/openocd_flash_recovery.sh
new file mode 100755
index 000000000..06a92990b
--- /dev/null
+++ b/tools/jtag_openocd/openocd_flash_recovery.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# Example for 512kb version, using Segger Jlink:
+CONFIG_CHIP=chip-at91sam7s.cfg
+CONFIG_IF=interface-jlink.cfg
+IMAGE=../../recovery/proxmark3_recovery.bin
+
+if [ ! -e "$IMAGE" ]; then
+    echo "$IMAGE missing. Abort!"
+    exit 1
+fi
+openocd -f $CONFIG_IF -f $CONFIG_CHIP -c "init;halt;flash erase_sector 0 0 15;flash erase_sector 1 0 15;flash write_image $IMAGE 0x100000;exit"

From 2eb4cd9162ebef031bdea041177fa5130247e13a Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 1 May 2019 01:31:29 +0200
Subject: [PATCH 1534/1938] jtag comments

---
 tools/jtag_openocd/interface-armusbocd.cfg   | 4 ++--
 tools/jtag_openocd/interface-busblaster.cfg  | 2 +-
 tools/jtag_openocd/interface-buspirate.cfg   | 2 +-
 tools/jtag_openocd/interface-jlink.cfg       | 3 ++-
 tools/jtag_openocd/interface-jtagkey.cfg     | 4 ++--
 tools/jtag_openocd/interface-wiggler.cfg     | 1 +
 tools/jtag_openocd/openocd_flash_recovery.sh | 2 +-
 7 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/tools/jtag_openocd/interface-armusbocd.cfg b/tools/jtag_openocd/interface-armusbocd.cfg
index 4f5c6bb93..e4689e21b 100644
--- a/tools/jtag_openocd/interface-armusbocd.cfg
+++ b/tools/jtag_openocd/interface-armusbocd.cfg
@@ -1,8 +1,8 @@
-#define our ports
+# Ports
 telnet_port 4444
 gdb_port 3333
 
-#commands specific to the Olimex ARM-USB-OCD Dongle
+# Commands specific to the Olimex ARM-USB-OCD Dongle
 interface ft2232
 ft2232_device_desc "Olimex OpenOCD JTAG"
 ft2232_layout "olimex-jtag"
diff --git a/tools/jtag_openocd/interface-busblaster.cfg b/tools/jtag_openocd/interface-busblaster.cfg
index 4d3ac032e..337e9a2de 100644
--- a/tools/jtag_openocd/interface-busblaster.cfg
+++ b/tools/jtag_openocd/interface-busblaster.cfg
@@ -1,8 +1,8 @@
-## General OpenOCD configuration
 # Ports
 telnet_port 4444
 gdb_port 3333
 
+# Commands specific to the Bus Blaster
 interface ftdi
 ftdi_device_desc "Dual RS232-HS"
 ftdi_vid_pid 0x0403 0x6010
diff --git a/tools/jtag_openocd/interface-buspirate.cfg b/tools/jtag_openocd/interface-buspirate.cfg
index 66d0ce614..4ed5b88a5 100644
--- a/tools/jtag_openocd/interface-buspirate.cfg
+++ b/tools/jtag_openocd/interface-buspirate.cfg
@@ -2,7 +2,7 @@
 telnet_port 4444
 gdb_port 3333
 
-# Interface
+# Commands specific to the BusPirate
 interface buspirate
 buspirate_port /dev/ttyUSB0
 adapter_khz 1000
diff --git a/tools/jtag_openocd/interface-jlink.cfg b/tools/jtag_openocd/interface-jlink.cfg
index fe6c892f8..56a04fef2 100644
--- a/tools/jtag_openocd/interface-jlink.cfg
+++ b/tools/jtag_openocd/interface-jlink.cfg
@@ -1,7 +1,8 @@
-#define our ports
+# Ports
 telnet_port 4444
 gdb_port 3333
 
+# Commands specific to the Segger J-Link
 interface jlink
 transport select jtag
 adapter_khz 1000
diff --git a/tools/jtag_openocd/interface-jtagkey.cfg b/tools/jtag_openocd/interface-jtagkey.cfg
index 305dfd7da..3e48c08df 100644
--- a/tools/jtag_openocd/interface-jtagkey.cfg
+++ b/tools/jtag_openocd/interface-jtagkey.cfg
@@ -1,8 +1,8 @@
-#define our ports
+# Ports
 telnet_port 4444
 gdb_port 3333
 
-#commands specific to the Amontec JTAGKey
+# Commands specific to the Amontec JTAGKey
 interface ft2232
 ft2232_device_desc "Amontec JTAGkey A"
 ft2232_layout jtagkey
diff --git a/tools/jtag_openocd/interface-wiggler.cfg b/tools/jtag_openocd/interface-wiggler.cfg
index 024ed9710..88448de82 100644
--- a/tools/jtag_openocd/interface-wiggler.cfg
+++ b/tools/jtag_openocd/interface-wiggler.cfg
@@ -1,6 +1,7 @@
 telnet_port 4444
 gdb_port 3333
 
+# Commands specific to the Wiggler
 interface parport
 parport_port 0x378
 parport_cable wiggler
diff --git a/tools/jtag_openocd/openocd_flash_recovery.sh b/tools/jtag_openocd/openocd_flash_recovery.sh
index 06a92990b..b51076d5a 100755
--- a/tools/jtag_openocd/openocd_flash_recovery.sh
+++ b/tools/jtag_openocd/openocd_flash_recovery.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Example for 512kb version, using Segger Jlink:
+# Example using Segger Jlink:
 CONFIG_CHIP=chip-at91sam7s.cfg
 CONFIG_IF=interface-jlink.cfg
 IMAGE=../../recovery/proxmark3_recovery.bin

From 5801cfa4a850ebae7f25f72fabe18831057e8998 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 1 May 2019 01:32:17 +0200
Subject: [PATCH 1535/1938] Add JTAG support for Shikra, thanks @NinjaStyle82

---
 tools/jtag_openocd/interface-shikra.cfg | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 tools/jtag_openocd/interface-shikra.cfg

diff --git a/tools/jtag_openocd/interface-shikra.cfg b/tools/jtag_openocd/interface-shikra.cfg
new file mode 100644
index 000000000..507c301b4
--- /dev/null
+++ b/tools/jtag_openocd/interface-shikra.cfg
@@ -0,0 +1,10 @@
+# Ports
+telnet_port 4444
+gdb_port 3333
+
+# Commands specific to the Shikra
+interface ftdi
+transport select jtag
+ftdi_vid_pid 0x0403 0x6014
+ftdi_layout_init 0x0c08 0x0f1b
+adapter_khz 2000

From 4f11ef048f1118b39ace9ba5f63940b7bbcb4b5d Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 1 May 2019 01:38:52 +0200
Subject: [PATCH 1536/1938] style

---
 client/cmdhficlass.c       |  6 +++---
 client/cmdlf.c             |  2 +-
 client/comms.c             |  8 ++++----
 client/flash.c             | 20 ++++++++++----------
 client/mifare/mifarehost.c |  6 +++---
 client/scripting.c         | 12 ++++++------
 client/scripts/mfkeys.lua  | 12 ++++++------
 client/ui.c                |  2 +-
 uart/uart.h                |  2 +-
 uart/uart_posix.c          |  2 +-
 uart/uart_win32.c          |  4 ++--
 11 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index 1b0eebff9..5f04f03f5 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -589,7 +589,7 @@ static int CmdHFiClassELoad(const char *Cmd) {
 
     // fast push mode
     conn.block_after_ACK = true;
-    
+
     //Send to device
     uint32_t bytes_sent = 0;
     uint32_t bytes_remaining  = bytes_read;
@@ -607,7 +607,7 @@ static int CmdHFiClassELoad(const char *Cmd) {
     conn.block_after_ACK = false;
     SendCommandMIX(CMD_PING, 0, 0, 0, NULL, 0);
     WaitForResponseTimeout(CMD_ACK, NULL, 1000);
-    
+
     PrintAndLogEx(SUCCESS, "sent %d bytes of data to device emulator memory", bytes_sent);
     return 0;
 }
@@ -1949,7 +1949,7 @@ static int CmdHFiClassCheckKeys(const char *Cmd) {
 
     // fast push mode
     conn.block_after_ACK = true;
-    
+
     // main keychunk loop
     for (uint32_t i = 0; i < keycnt; i += chunksize) {
 
diff --git a/client/cmdlf.c b/client/cmdlf.c
index 593c59d12..7725dc327 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -421,7 +421,7 @@ int CmdLFSim(const char *Cmd) {
 
     // fast push mode
     conn.block_after_ACK = true;
-    
+
     //can send only 512 bits at a time (1 byte sent per bit...)
     for (uint16_t i = 0; i < GraphTraceLen; i += PM3_CMD_DATA_SIZE) {
         clearCommandBuffer();
diff --git a/client/comms.c b/client/comms.c
index d1f42a8a4..8ee60bbe4 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -592,12 +592,12 @@ int TestProxmark(void) {
             if (conn.send_via_fpc) {
                 PrintAndLogEx(INFO, "UART Serial baudrate: " _YELLOW_("%u") "\n", conn.uart_speed);
             }
-            
+
             // reconfigure.
-            if ( conn.send_via_fpc == false ) {
-                uart_reconfigure_timeouts(sp, UART_USB_CLIENT_RX_TIMEOUT_MS );
+            if (conn.send_via_fpc == false) {
+                uart_reconfigure_timeouts(sp, UART_USB_CLIENT_RX_TIMEOUT_MS);
             }
-           
+
             return PM3_SUCCESS;
         } else {
             return PM3_ETIMEOUT;
diff --git a/client/flash.c b/client/flash.c
index 40c811c08..0d989eecd 100644
--- a/client/flash.c
+++ b/client/flash.c
@@ -63,14 +63,14 @@ static int build_segs_from_phdrs(flash_file_t *ctx, FILE *fd, Elf32_Phdr *phdrs,
             continue;
         }
         PrintAndLogEx(NORMAL, "%d: V 0x%08x P 0x%08x (0x%08x->0x%08x) [%c%c%c] @0x%x",
-                i, vaddr, paddr, filesz, memsz,
-                (flags & PF_R) ? 'R' : ' ',
-                (flags & PF_W) ? 'W' : ' ',
-                (flags & PF_X) ? 'X' : ' ',
-                offset);
+                      i, vaddr, paddr, filesz, memsz,
+                      (flags & PF_R) ? 'R' : ' ',
+                      (flags & PF_W) ? 'W' : ' ',
+                      (flags & PF_X) ? 'X' : ' ',
+                      offset);
         if (filesz != memsz) {
             PrintAndLogEx(ERR, "Error: PHDR file size does not equal memory size\n"
-                    "(DATA+BSS PHDRs do not make sense on ROM platforms!)");
+                          "(DATA+BSS PHDRs do not make sense on ROM platforms!)");
             return -1;
         }
         if (paddr < last_end) {
@@ -121,7 +121,7 @@ static int build_segs_from_phdrs(flash_file_t *ctx, FILE *fd, Elf32_Phdr *phdrs,
                     memcpy(new_data, prev_seg->data, prev_seg->length);
                     memcpy(new_data + this_offset, data, filesz);
                     PrintAndLogEx(NORMAL, "Note: Extending previous segment from 0x%x to 0x%x bytes",
-                            prev_seg->length, new_length);
+                                  prev_seg->length, new_length);
                     if (hole)
                         PrintAndLogEx(NORMAL, "Note: 0x%x-byte hole created", hole);
                     free(data);
@@ -335,9 +335,9 @@ static int wait_for_ack(PacketResponseNG *ack) {
 
     if (ack->cmd != CMD_ACK) {
         PrintAndLogEx(ERR, "Error: Unexpected reply 0x%04x %s (expected ACK)",
-               ack->cmd,
-               (ack->cmd == CMD_NACK) ? "NACK" : ""
-              );
+                      ack->cmd,
+                      (ack->cmd == CMD_NACK) ? "NACK" : ""
+                     );
         return -1;
     }
     return 0;
diff --git a/client/mifare/mifarehost.c b/client/mifare/mifarehost.c
index 5c0d31771..5f21e6750 100644
--- a/client/mifare/mifarehost.c
+++ b/client/mifare/mifarehost.c
@@ -122,15 +122,15 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
 }
 int mfCheckKeys(uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t keycnt, uint8_t *keyBlock, uint64_t *key) {
     *key = -1;
-    clearCommandBuffer();   
+    clearCommandBuffer();
     uint8_t data[PM3_CMD_DATA_SIZE] = {0};
     data[0] = keyType;
     data[1] = blockNo;
     data[2] = clear_trace;
     data[3] = keycnt;
     memcpy(data + 4, keyBlock, 6 * keycnt);
-    SendCommandNG(CMD_MIFARE_CHKKEYS, data, (4 + 6 * keycnt) );
-    
+    SendCommandNG(CMD_MIFARE_CHKKEYS, data, (4 + 6 * keycnt));
+
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_MIFARE_CHKKEYS, &resp, 2500)) return PM3_ETIMEOUT;
     if (resp.status != PM3_SUCCESS) return PM3_EUNDEF;
diff --git a/client/scripting.c b/client/scripting.c
index e855c0fe9..d2fd4fd90 100644
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -30,25 +30,25 @@ static int l_clearCommandBuffer(lua_State *L) {
 /**
  * Enable / Disable fast push mode for lua scripts like mfkeys
  * The following params expected:
- *  
+ *
  *@brief l_fast_push_mode
  * @param L
  * @return
  */
-static int l_fast_push_mode(lua_State *L){
-    
+static int l_fast_push_mode(lua_State *L) {
+
     luaL_checktype(L, 1, LUA_TBOOLEAN);
-    
+
     bool enable = lua_toboolean(L, 1);
 
     conn.block_after_ACK = enable;
-    
+
     // Disable fast mode and send a dummy command to make it effective
     if (enable == false) {
         SendCommandMIX(CMD_PING, 0, 0, 0, NULL, 0);
         WaitForResponseTimeout(CMD_ACK, NULL, 1000);
     }
-    
+
     //Push the retval on the stack
     lua_pushboolean(L, enable);
     return 1;
diff --git a/client/scripts/mfkeys.lua b/client/scripts/mfkeys.lua
index c2702b4a6..9fb3d3f9d 100644
--- a/client/scripts/mfkeys.lua
+++ b/client/scripts/mfkeys.lua
@@ -209,7 +209,7 @@ local function perform_check(numsectors)
     core.fast_push_mode(true)
 
     local start_time = os.time()
-    
+
     for sector = 0, #keys do
         -- Check if user aborted
         if core.ukbhit() then
@@ -231,15 +231,15 @@ local function perform_check(numsectors)
 
         keys[sector] = {succA, succB, keyA, keyB}
     end
-    
+
     local end_time = os.time()
     print('')
     print('[+] mfkeys - Checkkey execution time: '..os.difftime(end_time, start_time)..' sec')
-    
+
     core.fast_push_mode(false)
-    
+
     display_results(keys)
-   
+
     -- save to dumpkeys.bin
     dumptofile(keys)
 end
@@ -282,7 +282,7 @@ local function main(args)
     -- identify tag
     tag, err = lib14a.read(false, true)
     if not tag then return oops(err) end
-    
+
     -- detect sectors and print taginfo
     numsectors = taginfo(tag)
 
diff --git a/client/ui.c b/client/ui.c
index 816ec2863..1dc5a1dca 100644
--- a/client/ui.c
+++ b/client/ui.c
@@ -75,7 +75,7 @@ void PrintAndLogEx(logLevel_t level, const char *fmt, ...) {
     char *tmp_ptr = NULL;
     //   {NORMAL, SUCCESS, INFO, FAILED, WARNING, ERR, DEBUG}
     static const char *prefixes[7] = { "", "[+] ", "[=] ", "[-] ", "[!] ", "[!!] ", "[#] "};
-    FILE* stream = stdout;
+    FILE *stream = stdout;
 
     switch (level) {
         case ERR:
diff --git a/uart/uart.h b/uart/uart.h
index 24c1063a3..fe51f0643 100644
--- a/uart/uart.h
+++ b/uart/uart.h
@@ -107,6 +107,6 @@ uint32_t uart_get_speed(const serial_port sp);
 
 /* Reconfigure timeouts
  */
-int uart_reconfigure_timeouts(serial_port sp, uint32_t value );
+int uart_reconfigure_timeouts(serial_port sp, uint32_t value);
 #endif // _UART_H_
 
diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index f1bb0b733..c80ad295b 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -73,7 +73,7 @@ struct timeval timeout = {
     .tv_usec = UART_FPC_CLIENT_RX_TIMEOUT_MS * 1000
 };
 
-int uart_reconfigure_timeouts(serial_port sp, uint32_t value ) {
+int uart_reconfigure_timeouts(serial_port sp, uint32_t value) {
     timeout.tv_usec = value * 1000;
     return PM3_SUCCESS;
 }
diff --git a/uart/uart_win32.c b/uart/uart_win32.c
index 6fc30ce47..9939eee1c 100644
--- a/uart/uart_win32.c
+++ b/uart/uart_win32.c
@@ -49,7 +49,7 @@ typedef struct {
 } serial_port_windows;
 
 int uart_reconfigure_timeouts(serial_port sp, uint32_t value) {
-    
+
     serial_port_windows *spw;
     spw = (serial_port_windows *)sp;
     spw->ct.ReadIntervalTimeout         = value;
@@ -152,7 +152,7 @@ bool uart_set_speed(serial_port sp, const uint32_t uiPortSpeed) {
     PurgeComm(spw->hPort, PURGE_RXABORT | PURGE_RXCLEAR);
     if (result)
         conn.uart_speed = uiPortSpeed;
-    
+
     return result;
 }
 

From 63d67e2b0f229b3bc5787bbf4a10a4bf625c965d Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 1 May 2019 05:48:20 +0200
Subject: [PATCH 1537/1938] fix: setting pm3_present in flasher.

---
 client/flasher.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/client/flasher.c b/client/flasher.c
index e13180211..b4a24c911 100644
--- a/client/flasher.c
+++ b/client/flasher.c
@@ -68,19 +68,20 @@ int main(int argc, char **argv) {
             res = flash_load(&files[num_files], argv[i], can_write_bl);
             if (res < 0)
                 return -1;
-
+    
             PrintAndLogEx(NORMAL, "");
             num_files++;
         }
     }
 
     char *serial_port_name = argv[1];
-
-    if (!OpenProxmark(serial_port_name, true, 60, true, FLASHMODE_SPEED)) {
+    
+    session.pm3_present = OpenProxmark(serial_port_name, true, 60, true, FLASHMODE_SPEED);
+    if (session.pm3_present) {
+        PrintAndLogEx(NORMAL, _GREEN_("Found"));
+    } else {
         PrintAndLogEx(ERR, "Could not find Proxmark3 on " _RED_("%s") ".\n", serial_port_name);
         return -1;
-    } else {
-        PrintAndLogEx(NORMAL, _GREEN_("Found"));
     }
 
     res = flash_start_flashing(can_write_bl, serial_port_name);

From 5ab9716e771d28cf6ce70ec95b5ee948e87df392 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 1 May 2019 06:04:33 +0200
Subject: [PATCH 1538/1938] textual

---
 client/flash.c   | 22 +++++++++++-----------
 client/flasher.c |  6 +++---
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/client/flash.c b/client/flash.c
index 0d989eecd..322fc3e49 100644
--- a/client/flash.c
+++ b/client/flash.c
@@ -46,7 +46,7 @@ static int build_segs_from_phdrs(flash_file_t *ctx, FILE *fd, Elf32_Phdr *phdrs,
     ctx->num_segs = 0;
     seg = ctx->segments;
 
-    PrintAndLogEx(NORMAL, "Loading usable ELF segments:");
+    PrintAndLogEx(SUCCESS, "Loading usable ELF segments:");
     for (int i = 0; i < num_phdrs; i++) {
         if (le32(phdr->p_type) != PT_LOAD) {
             phdr++;
@@ -62,7 +62,7 @@ static int build_segs_from_phdrs(flash_file_t *ctx, FILE *fd, Elf32_Phdr *phdrs,
             phdr++;
             continue;
         }
-        PrintAndLogEx(NORMAL, "%d: V 0x%08x P 0x%08x (0x%08x->0x%08x) [%c%c%c] @0x%x",
+        PrintAndLogEx(SUCCESS, "   "_YELLOW_("%d")": V 0x%08x P 0x%08x (0x%08x->0x%08x) [%c%c%c] @0x%x",
                       i, vaddr, paddr, filesz, memsz,
                       (flags & PF_R) ? 'R' : ' ',
                       (flags & PF_W) ? 'W' : ' ',
@@ -120,10 +120,10 @@ static int build_segs_from_phdrs(flash_file_t *ctx, FILE *fd, Elf32_Phdr *phdrs,
                     memset(new_data, 0xff, new_length);
                     memcpy(new_data, prev_seg->data, prev_seg->length);
                     memcpy(new_data + this_offset, data, filesz);
-                    PrintAndLogEx(NORMAL, "Note: Extending previous segment from 0x%x to 0x%x bytes",
+                    PrintAndLogEx(INFO, "Note: Extending previous segment from 0x%x to 0x%x bytes",
                                   prev_seg->length, new_length);
                     if (hole)
-                        PrintAndLogEx(NORMAL, "Note: 0x%x-byte hole created", hole);
+                        PrintAndLogEx(INFO, "Note: 0x%x-byte hole created", hole);
                     free(data);
                     free(prev_seg->data);
                     prev_seg->data = new_data;
@@ -192,7 +192,7 @@ int flash_load(flash_file_t *ctx, const char *name, int can_write_bl) {
         goto fail;
     }
 
-    PrintAndLogEx(NORMAL, _BLUE_("Loading ELF file") _YELLOW_("%s"), name);
+    PrintAndLogEx(SUCCESS, _BLUE_("Loading ELF file") _YELLOW_("%s"), name);
 
     if (fread(&ehdr, sizeof(ehdr), 1, fd) != 1) {
         PrintAndLogEx(ERR, "Error while reading ELF file header");
@@ -298,18 +298,18 @@ static int enter_bootloader(char *serial_port_name) {
         return 0;
 
     if (state & DEVICE_INFO_FLAG_CURRENT_MODE_OS) {
-        PrintAndLogEx(NORMAL, _BLUE_("Entering bootloader..."));
+        PrintAndLogEx(SUCCESS, _BLUE_("Entering bootloader..."));
 
         if ((state & DEVICE_INFO_FLAG_BOOTROM_PRESENT)
                 && (state & DEVICE_INFO_FLAG_OSIMAGE_PRESENT)) {
             // New style handover: Send CMD_START_FLASH, which will reset the board
             // and enter the bootrom on the next boot.
             SendCommandOLD(CMD_START_FLASH, 0, 0, 0, NULL, 0);
-            PrintAndLogEx(NORMAL, "(Press and release the button only to abort)");
+            PrintAndLogEx(SUCCESS, "(Press and release the button only to " _YELLOW_("abort") ")");
         } else {
             // Old style handover: Ask the user to press the button, then reset the board
             SendCommandOLD(CMD_HARDWARE_RESET, 0, 0, 0, NULL, 0);
-            PrintAndLogEx(NORMAL, "Press and hold down button NOW if your bootloader requires it.");
+            PrintAndLogEx(SUCCESS, "Press and hold down button NOW if your bootloader requires it.");
         }
         msleep(100);
         CloseProxmark();
@@ -393,7 +393,7 @@ static int write_block(uint32_t address, uint8_t *data, uint32_t length) {
 
 // Write a file's segments to Flash
 int flash_write(flash_file_t *ctx) {
-    PrintAndLogEx(NORMAL, "Writing segments for file: %s", ctx->filename);
+    PrintAndLogEx(SUCCESS, "Writing segments for file: %s", ctx->filename);
     for (int i = 0; i < ctx->num_segs; i++) {
         flash_seg_t *seg = &ctx->segments[i];
 
@@ -401,7 +401,7 @@ int flash_write(flash_file_t *ctx) {
         uint32_t blocks = (length + BLOCK_SIZE - 1) / BLOCK_SIZE;
         uint32_t end = seg->start + length;
 
-        PrintAndLogEx(NORMAL, " 0x%08x..0x%08x [0x%x / %u blocks]", seg->start, end - 1, length, blocks);
+        PrintAndLogEx(SUCCESS, " 0x%08x..0x%08x [0x%x / %u blocks]", seg->start, end - 1, length, blocks);
         fflush(stdout);
         int block = 0;
         uint8_t *data = seg->data;
@@ -424,7 +424,7 @@ int flash_write(flash_file_t *ctx) {
             fprintf(stdout, ".");
             fflush(stdout);
         }
-        PrintAndLogEx(NORMAL, _GREEN_("OK"));
+        PrintAndLogEx(NORMAL, " " _GREEN_("OK"));
         fflush(stdout);
     }
     return 0;
diff --git a/client/flasher.c b/client/flasher.c
index b4a24c911..782888102 100644
--- a/client/flasher.c
+++ b/client/flasher.c
@@ -88,7 +88,7 @@ int main(int argc, char **argv) {
     if (res < 0)
         return -1;
 
-    PrintAndLogEx(NORMAL, "\n" _BLUE_("Flashing..."));
+    PrintAndLogEx(SUCCESS, "\n" _BLUE_("Flashing..."));
 
     for (int i = 0; i < num_files; i++) {
         res = flash_write(&files[i]);
@@ -98,7 +98,7 @@ int main(int argc, char **argv) {
         PrintAndLogEx(NORMAL, "\n");
     }
 
-    PrintAndLogEx(NORMAL, _BLUE_("Resetting hardware..."));
+    PrintAndLogEx(SUCCESS, _BLUE_("Resetting hardware..."));
 
     res = flash_stop_flashing();
     if (res < 0)
@@ -106,6 +106,6 @@ int main(int argc, char **argv) {
 
     CloseProxmark();
 
-    PrintAndLogEx(NORMAL, _BLUE_("All done.") "\n\nHave a nice day!");
+    PrintAndLogEx(SUCCESS, _BLUE_("All done.") "\n\nHave a nice day!");
     return 0;
 }

From 13b2e6eed78b951606855d171834e2c4074deb0f Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 1 May 2019 12:19:51 +0200
Subject: [PATCH 1539/1938] Fix hf mf chk

---
 armsrc/mifarecmd.c         | 17 +++++++++++------
 client/cmdhfmf.c           | 12 +++++-------
 client/mifare/mifarehost.c | 17 ++++++++++++-----
 3 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index 36510dfbf..b354bd6d4 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -1529,7 +1529,12 @@ void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain, b
     uint64_t key = 0;
     uint32_t cuid = 0;
     int i, res;
-    uint8_t cascade_levels = 0, isOK = 0;
+    uint8_t cascade_levels = 0;
+    struct {
+        uint8_t key[6];
+        bool found;
+    } PACKED keyresult;
+    keyresult.found = false;
     uint8_t blockNo, keyType, keyCount;
     bool clearTrace, have_uid = false;
 
@@ -1595,19 +1600,19 @@ void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain, b
 
         if (res)
             continue;
-
-        isOK = 1;
+        memcpy(keyresult.key, datain + i * 6, 6);
+        keyresult.found = true;
         break;
     }
 
     LED_B_ON();
 
     if (ng) {
-        reply_ng(CMD_MIFARE_CHKKEYS, PM3_SUCCESS, datain + i * 6, 6);
+        reply_ng(CMD_MIFARE_CHKKEYS, PM3_SUCCESS, (uint8_t*)&keyresult, sizeof(keyresult));
     } else {
-        reply_mix(CMD_ACK, isOK, 0, 0, datain + i * 6, 6);
+        reply_mix(CMD_ACK, keyresult.found, 0, 0, (uint8_t*)&keyresult.key, sizeof(keyresult.key));
     }
-//    reply_old(CMD_ACK, isOK, 0, 0, datain + i * 6, 6);
+//    reply_old(CMD_ACK, keyresult.found, 0, 0, (uint8_t*)&keyresult.key, sizeof(keyresult.key));
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     LEDsoff();
 
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index f45222773..01676bc95 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -1117,8 +1117,7 @@ static int CmdHF14AMfNested(const char *Cmd) {
     }
 
     // check if we can authenticate to sector
-    res = mfCheckKeys(blockNo, keyType, true, 1, key, &key64);
-    if (res) {
+    if (mfCheckKeys(blockNo, keyType, true, 1, key, &key64) != PM3_SUCCESS) {
         PrintAndLogEx(WARNING, "Wrong key. Can't authenticate to block:%3d key type:%c", blockNo, keyType ? 'B' : 'A');
         return 3;
     }
@@ -1179,6 +1178,7 @@ static int CmdHF14AMfNested(const char *Cmd) {
 
         PrintAndLogEx(SUCCESS, "Testing known keys. Sector count=%d", SectorsCnt);
         res = mfCheckKeys_fast(SectorsCnt, true, true, 1, MIFARE_DEFAULTKEYS_SIZE + 1, keyBlock, e_sector, false);
+        // TODO check result!!
 
         uint64_t t2 = msclock() - t1;
         PrintAndLogEx(SUCCESS, "Time to check %d known keys: %.0f seconds\n", MIFARE_DEFAULTKEYS_SIZE, (float)t2 / 1000.0);
@@ -1464,8 +1464,7 @@ static int CmdHF14AMfNestedHard(const char *Cmd) {
     if (!know_target_key && nonce_file_read == false) {
         uint64_t key64 = 0;
         // check if we can authenticate to sector
-        int res = mfCheckKeys(blockNo, keyType, true, 1, key, &key64);
-        if (res) {
+        if (mfCheckKeys(blockNo, keyType, true, 1, key, &key64) != PM3_SUCCESS) {
             PrintAndLogEx(WARNING, "Key is wrong. Can't authenticate to block:%3d key type:%c", blockNo, keyType ? 'B' : 'A');
             return 3;
         }
@@ -1795,7 +1794,7 @@ static int CmdHF14AMfChk(const char *Cmd) {
     int clen = 0;
     int transferToEml = 0;
     int createDumpFile = 0;
-    int i, res, keycnt = 0;
+    int i, keycnt = 0;
 
     keyBlock = calloc(MIFARE_DEFAULTKEYS_SIZE, 6);
     if (keyBlock == NULL) return 1;
@@ -1963,8 +1962,7 @@ static int CmdHF14AMfChk(const char *Cmd) {
 
                 uint32_t size = keycnt - c > max_keys ? max_keys : keycnt - c;
 
-                res = mfCheckKeys(b, trgKeyType, true, size, &keyBlock[6 * c], &key64);
-                if (!res) {
+                if (mfCheckKeys(b, trgKeyType, true, size, &keyBlock[6 * c], &key64) == PM3_SUCCESS) {
                     e_sector[i].Key[trgKeyType] = key64;
                     e_sector[i].foundKey[trgKeyType] = true;
                     break;
diff --git a/client/mifare/mifarehost.c b/client/mifare/mifarehost.c
index 5f21e6750..16ecc80cd 100644
--- a/client/mifare/mifarehost.c
+++ b/client/mifare/mifarehost.c
@@ -102,7 +102,7 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
                 }
             }
 
-            if (!mfCheckKeys(blockno, key_type - 0x60, false, size, keyBlock, key)) {
+            if (mfCheckKeys(blockno, key_type - 0x60, false, size, keyBlock, key) == PM3_SUCCESS) {
                 break;
             }
         }
@@ -133,8 +133,15 @@ int mfCheckKeys(uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t keyc
 
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_MIFARE_CHKKEYS, &resp, 2500)) return PM3_ETIMEOUT;
-    if (resp.status != PM3_SUCCESS) return PM3_EUNDEF;
-    *key = bytes_to_num(resp.data.asBytes, 6);
+    if (resp.status != PM3_SUCCESS) return resp.status;
+
+    struct kr {
+        uint8_t key[6];
+        bool found;
+    } PACKED;
+    struct kr *keyresult = (struct kr *)&resp.data.asBytes;
+    if (!keyresult->found) return PM3_ESOFT;
+    *key = bytes_to_num(keyresult->key, sizeof(keyresult->key));
     return PM3_SUCCESS;
 }
 
@@ -251,7 +258,7 @@ int mfKeyBrute(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint64_t *resultk
         memcpy(keyBlock, candidates + i, KEYBLOCK_SIZE);
 
         // check a block of generated candidate keys.
-        if (!mfCheckKeys(blockNo, keyType, true, KEYS_IN_BLOCK, keyBlock, &key64)) {
+        if (mfCheckKeys(blockNo, keyType, true, KEYS_IN_BLOCK, keyBlock, &key64) == PM3_SUCCESS) {
             *resultkey = key64;
             found = true;
             break;
@@ -391,7 +398,7 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo,
             num_to_bytes(key64, 6, keyBlock + i * 6);
         }
 
-        if (!mfCheckKeys(statelists[0].blockNo, statelists[0].keyType, false, size, keyBlock, &key64)) {
+        if (mfCheckKeys(statelists[0].blockNo, statelists[0].keyType, false, size, keyBlock, &key64) == PM3_SUCCESS) {
             free(statelists[0].head.slhead);
             free(statelists[1].head.slhead);
             num_to_bytes(key64, 6, resultKey);

From b7e3806eff57ba6a88b129ecac7cce7a0e20a569 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 1 May 2019 13:15:51 +0200
Subject: [PATCH 1540/1938] chg: 'hf mf chk'  - let eload part benefit for fast
 push mode chg: 'script run mfkeys' -  corrected to use NG frames correct

---
 client/cmdhfmf.c            | 19 +++++-----
 client/lualibs/commands.lua | 70 ++++++++++++++++++-------------------
 client/scripts/mfkeys.lua   | 22 +++++-------
 3 files changed, 53 insertions(+), 58 deletions(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 01676bc95..8d48245a5 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -1932,7 +1932,7 @@ static int CmdHF14AMfChk(const char *Cmd) {
 
 
     uint8_t trgKeyType = 0;
-    uint32_t max_keys = keycnt > ((PM3_CMD_DATA_SIZE - 4) / 6) ? ((PM3_CMD_DATA_SIZE - 4) / 6) : keycnt;
+    uint16_t max_keys = keycnt > ((PM3_CMD_DATA_SIZE - 4) / 6) ? ((PM3_CMD_DATA_SIZE - 4) / 6) : keycnt;
 
     // time
     uint64_t t1 = msclock();
@@ -1949,7 +1949,7 @@ static int CmdHF14AMfChk(const char *Cmd) {
             // skip already found keys.
             if (e_sector[i].foundKey[trgKeyType]) continue;
 
-            for (uint32_t c = 0; c < keycnt; c += max_keys) {
+            for (uint16_t c = 0; c < keycnt; c += max_keys) {
 
                 printf(".");
                 fflush(stdout);
@@ -1960,15 +1960,13 @@ static int CmdHF14AMfChk(const char *Cmd) {
                     goto out;
                 }
 
-                uint32_t size = keycnt - c > max_keys ? max_keys : keycnt - c;
+                uint16_t size = keycnt - c > max_keys ? max_keys : keycnt - c;
 
                 if (mfCheckKeys(b, trgKeyType, true, size, &keyBlock[6 * c], &key64) == PM3_SUCCESS) {
                     e_sector[i].Key[trgKeyType] = key64;
                     e_sector[i].foundKey[trgKeyType] = true;
                     break;
                 }
-
-
             }
             b < 127 ? (b += 4) : (b += 16);
         }
@@ -2011,11 +2009,6 @@ static int CmdHF14AMfChk(const char *Cmd) {
     }
 
 out:
-    // Disable fast mode and send a dummy command to make it effective
-    conn.block_after_ACK = false;
-    SendCommandMIX(CMD_PING, 0, 0, 0, NULL, 0);
-    WaitForResponseTimeout(CMD_ACK, NULL, 1000);
-
     //print keys
     printKeyTable(SectorsCnt, e_sector);
 
@@ -2032,6 +2025,12 @@ out:
         PrintAndLogEx(SUCCESS, "Found keys have been transferred to the emulator memory");
     }
 
+    // Disable fast mode and send a dummy command to make it effective
+    conn.block_after_ACK = false;
+    SendCommandMIX(CMD_PING, 0, 0, 0, NULL, 0);
+    WaitForResponseTimeout(CMD_ACK, NULL, 1000);
+    
+    
     if (createDumpFile) {
         fptr = GenerateFilename("hf-mf-", "-key.bin");
         if (fptr == NULL) {
diff --git a/client/lualibs/commands.lua b/client/lualibs/commands.lua
index 8f87d81fb..ca959291f 100644
--- a/client/lualibs/commands.lua
+++ b/client/lualibs/commands.lua
@@ -117,22 +117,6 @@ function Command:getBytes()
     return bin.pack("LLLLH",cmd, arg1, arg2, arg3, data);
 end
 
-function Command:__responsetostring()
-    print('NG package received')
-    print('CMD    ::', _commands.tostring(self.resp_cmd))
-    print('Length ::', tostring(self.resp_length))
-    print('Magic  ::', string.format("0x%08X", self.resp_magic), util.ConvertHexToAscii(string.format("0x%08X", self.resp_magic)))
-    print('Status ::', tostring(self.resp_status))
-    print('crc    ::', string.format("0x%02X", self.resp_crc))
-    print('Args   ::', ("(%s, %s, %s)\r\n"):format(
-                    tostring(self.resp_arg1),
-                    tostring(self.resp_arg2),
-                    tostring(self.resp_arg3)))
-    print('NG     ::', self.resp_ng)
-    print('Data   ::', self.resp_data)
-end
-
-
 --- Sends a packet to the device
 -- @param command - the usb packet to send
 -- @param ignoreresponse - if set to true, we don't read the device answer packet
@@ -177,13 +161,21 @@ function Command:sendMIX( ignore_response, timeout )
 --]]
 
     local packed = bin.pack("LLLLH", cmd, arg1, arg2, arg3, data)
+    --[[
+    return { Cmd = cmd,
+            Arg1 = arg1,
+            Arg2 = arg2,
+            Arg3 = arg3,
+            Data = data,
+    }
+    --]]
     return packed, nil;
 end
 function Command:sendNG( ignore_response, timeout )
     local data = self.data
     local cmd = self.cmd
     local err, msg = core.SendCommandNG(cmd, data)
-    if err == nil then return err, msg end
+    if err == nil then return nil, msg end
 
     if ignore_response then return true, nil end
 
@@ -193,28 +185,36 @@ function Command:sendNG( ignore_response, timeout )
     if response == nil then
         return nil, 'Error, waiting for response timed out :: '..msg
     end
+    local data
+    local count, cmd, length, magic, status, crc, arg0, arg1, arg2 = bin.unpack('SSIsSLLL', response)
+    count, data, ng = bin.unpack('H'..length..'C', response, count)
 
 --[[  uncomment if you want to debug
 
-    -- lets digest response NG package.
-    local data
-    local count, cmd, length, magic, status, crc, arg1, arg2, arg3 = bin.unpack('SSIsSLLL', response)
-    count, data, ng = bin.unpack('H'..length..'C', response, count)
-
-    self.resp_cmd = cmd
-    self.resp_length = length
-    self.resp_magic = magic
-    self.resp_status = status
-    self.resp_crc = crc
-    self.resp_arg1 = arg1
-    self.resp_arg2 = arg2
-    self.resp_arg3 = arg3
-    self.resp_data = data
-    self.resp_ng = ng
-    self:__responsetostring()
+    print('NG package received')
+    print('CMD    ::', tostring(cmd))
+    print('Length ::', tostring(length))
+    print('Magic  ::', string.format("0x%08X", magic), util.ConvertHexToAscii(string.format("0x%08X", magic)))
+    print('Status ::', tostring(status))
+    print('crc    ::', string.format("0x%02X", crc))
+    print('Args   ::', ("(%s, %s, %s)\r\n"):format(
+                    tostring(arg0),
+                    tostring(arg1),
+                    tostring(arg2)))
+    print('NG     ::', ng)
+    print('Data   ::', data)
 --]]
-
-    return response
+    return { Cmd = cmd,
+            Length = length,
+            Magic = magic,
+            Status = status,
+            Crc = crc,
+            Oldarg0 = arg0,
+            Oldarg1 = arg1,
+            Oldarg2 = arg2,
+            Data = data,
+            Ng = ng
+    }
 end
 
 return _commands
diff --git a/client/scripts/mfkeys.lua b/client/scripts/mfkeys.lua
index 9fb3d3f9d..f04059b67 100644
--- a/client/scripts/mfkeys.lua
+++ b/client/scripts/mfkeys.lua
@@ -58,15 +58,14 @@ local function checkCommand(response)
         return nil, "Timeout while waiting for device to respond"
     end
 
-    local data
-    local count, cmd, length, magic, status, crc, arg1, arg2, arg3 = bin.unpack('SSIsSLLL', response)
-    count, data, ng = bin.unpack('H'..length..'C', response, count)
-
-    if status == PM3_SUCCESS then
-        key = data:sub(1, 12)
-        return key
+    if response.Status == PM3_SUCCESS then
+        --decode data array
+        key = response.Data:sub(1, 12)
+        found = tonumber(response.Data:sub(13,14))
+        if found == 1 then
+            return key
+        end
     end
-
     return nil
 end
 
@@ -76,8 +75,6 @@ local function checkBlock(blockno, testkeys, keytype)
     -- each key is 6 bytes,
     -- NG args inside dataarray is 4 bytes.  That give us (512-4)/6 or max 84 keys in one go.
     -- If there's more, we need to split it up
-    local arg1 = bit32.bor(bit32.lshift(keytype, 8), blockno)
-    local arg2 = '00' -- don't clear trace
     local start, remaining = 1, #testkeys
     local maxchunk = math.floor((512-4)/6)
     local chunksize = remaining
@@ -85,9 +82,8 @@ local function checkBlock(blockno, testkeys, keytype)
     local n = chunksize
 
     while remaining > 0 do
---        print('start', start, 'chunksize', chunksize, 'testkeys kvar', remaining, 'N-index=', n)
 
-        local d0 = ('%04X%02X%02X'):format(arg1, arg2, chunksize)
+        local d0 = ('%02X%02X00%02X'):format(keytype, blockno, chunksize)
         local d1 = table.concat(testkeys, "", start, n)
 
         core.clearCommandBuffer()
@@ -95,7 +91,7 @@ local function checkBlock(blockno, testkeys, keytype)
         print(("Testing block %d, keytype %d, with %d keys"):format(blockno, keytype, chunksize))
 
         local c = Command:newNG{cmd = cmds.CMD_MIFARE_CHKKEYS, data = d0..d1}
-        key, err = checkCommand(c:sendNG(false, TIMEOUT))
+        key, err = checkCommand(c:sendNG(false))
 
         if key then return key, blockno end
 

From 645a4e9d1d7a3e5a3eb2a80f7db6b1745105b208 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 1 May 2019 14:55:14 +0200
Subject: [PATCH 1541/1938] generalize KEYS_IN_BLOCK usage

---
 client/cmdhfmf.c           | 2 +-
 client/mifare/mifarehost.c | 8 ++------
 client/mifare/mifarehost.h | 3 +++
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 8d48245a5..792dc95f3 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -1932,7 +1932,7 @@ static int CmdHF14AMfChk(const char *Cmd) {
 
 
     uint8_t trgKeyType = 0;
-    uint16_t max_keys = keycnt > ((PM3_CMD_DATA_SIZE - 4) / 6) ? ((PM3_CMD_DATA_SIZE - 4) / 6) : keycnt;
+    uint16_t max_keys = keycnt > KEYS_IN_BLOCK ? KEYS_IN_BLOCK : keycnt;
 
     // time
     uint64_t t1 = msclock();
diff --git a/client/mifare/mifarehost.c b/client/mifare/mifarehost.c
index 16ecc80cd..f9f80aa5c 100644
--- a/client/mifare/mifarehost.c
+++ b/client/mifare/mifarehost.c
@@ -90,7 +90,7 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
 
         *key = UINT64_C(-1);
         uint8_t keyBlock[PM3_CMD_DATA_SIZE];
-        uint32_t max_keys = (PM3_CMD_DATA_SIZE - 4) / 6;
+        uint32_t max_keys = KEYS_IN_BLOCK;
         for (uint32_t i = 0; i < keycount; i += max_keys) {
 
             uint32_t size = keycount - i > max_keys ? max_keys : keycount - i;
@@ -227,10 +227,6 @@ int mfCheckKeys_fast(uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk,
 // ref: https://github.com/J-Run/mf_key_brute
 int mfKeyBrute(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint64_t *resultkey) {
 
-#define KEYS_IN_BLOCK   ((PM3_CMD_DATA_SIZE - 4) / 6)
-#define KEYBLOCK_SIZE   (KEYS_IN_BLOCK * 6)
-#define CANDIDATE_SIZE  (0xFFFF * 6)
-
     uint64_t key64;
     uint8_t found = false;
     uint8_t candidates[CANDIDATE_SIZE] = {0x00};
@@ -386,7 +382,7 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo,
     uint64_t key64 = -1;
 
     // The list may still contain several key candidates. Test each of them with mfCheckKeys
-    uint32_t max_keys = keycnt > ((PM3_CMD_DATA_SIZE - 4) / 6) ? ((PM3_CMD_DATA_SIZE - 4) / 6) : keycnt;
+    uint32_t max_keys = keycnt > KEYS_IN_BLOCK ? KEYS_IN_BLOCK : keycnt;
     uint8_t keyBlock[PM3_CMD_DATA_SIZE] = {0x00};
 
     for (i = 0; i < keycnt; i += max_keys) {
diff --git a/client/mifare/mifarehost.h b/client/mifare/mifarehost.h
index fd3935d41..90837bcf7 100644
--- a/client/mifare/mifarehost.h
+++ b/client/mifare/mifarehost.h
@@ -68,6 +68,9 @@ typedef struct {
 } icesector_t;
 
 extern char logHexFileName[FILE_PATH_SIZE];
+#define KEYS_IN_BLOCK   ((PM3_CMD_DATA_SIZE - 4) / 6)
+#define KEYBLOCK_SIZE   (KEYS_IN_BLOCK * 6)
+#define CANDIDATE_SIZE  (0xFFFF * 6)
 
 int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key);
 int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t *resultKey, bool calibrate);

From ec5f70caf26a84daa11e3349a2e27f5d886499eb Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 1 May 2019 15:15:48 +0200
Subject: [PATCH 1542/1938] easier to read

---
 client/cmdhfmf.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 792dc95f3..6c82d36a5 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -180,7 +180,7 @@ static int usage_hf14_chk(void) {
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "      hf mf chk 0 A 1234567890ab keys.dic     -- target block 0, Key A");
-    PrintAndLogEx(NORMAL, "      hf mf chk *1 ? t                        -- target all blocks, all keys, 1K, write to emul");
+    PrintAndLogEx(NORMAL, "      hf mf chk *1 ? t                        -- target all blocks, all keys, 1K, write to emulator memory");
     PrintAndLogEx(NORMAL, "      hf mf chk *1 ? d                        -- target all blocks, all keys, 1K, write to file");
     return 0;
 }
@@ -1728,12 +1728,13 @@ out:
         if (transferToEml) {
             uint8_t block[16] = {0x00};
             for (i = 0; i < sectorsCnt; ++i) {
-                mfEmlGetMem(block, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
+                uint8_t blockno = FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1;
+                mfEmlGetMem(block, blockno, 1);
                 if (e_sector[i].foundKey[0])
                     num_to_bytes(e_sector[i].Key[0], 6, block);
                 if (e_sector[i].foundKey[1])
                     num_to_bytes(e_sector[i].Key[1], 6, block + 10);
-                mfEmlSetMem(block, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
+                mfEmlSetMem(block, blockno, 1);
             }
             PrintAndLogEx(SUCCESS, "Found keys have been transferred to the emulator memory");
         }
@@ -2015,12 +2016,13 @@ out:
     if (transferToEml) {
         uint8_t block[16] = {0x00};
         for (i = 0; i < SectorsCnt; ++i) {
-            mfEmlGetMem(block, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
+            uint8_t blockno = FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1;
+            mfEmlGetMem(block, blockno, 1);
             if (e_sector[i].foundKey[0])
                 num_to_bytes(e_sector[i].Key[0], 6, block);
             if (e_sector[i].foundKey[1])
                 num_to_bytes(e_sector[i].Key[1], 6, block + 10);
-            mfEmlSetMem(block, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
+            mfEmlSetMem(block, blockno, 1);
         }
         PrintAndLogEx(SUCCESS, "Found keys have been transferred to the emulator memory");
     }

From 9d261adfb1ddca2871d88600fffa9bb039d51ef6 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 1 May 2019 16:48:04 +0200
Subject: [PATCH 1543/1938] Reduce BUSY_TIMEOUT and handles FPC/FLASH FW more
 gracefully on non-RDV4 pm3

---
 armsrc/appmain.c  | 9 +++++----
 armsrc/flashmem.c | 6 +++---
 armsrc/flashmem.h | 3 ++-
 common/i2c.c      | 2 +-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 8db64cf70..8d17d7115 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1564,15 +1564,16 @@ void  __attribute__((noreturn)) AppMain(void) {
     usart_init();
 #endif
 
-#ifdef WITH_FLASH
-    loadT55xxConfig();
-#endif
-
     // This is made as late as possible to ensure enumeration without timeout
     // against device such as http://www.hobbytronics.co.uk/usb-host-board-v2
     usb_disable();
     usb_enable();
 
+#ifdef WITH_FLASH
+    // If flash is not present, BUSY_TIMEOUT kicks in, let's do it after USB
+    loadT55xxConfig();
+#endif
+
     for (;;) {
         WDT_HIT();
 
diff --git a/armsrc/flashmem.c b/armsrc/flashmem.c
index 47a9b8c97..3ec746074 100644
--- a/armsrc/flashmem.c
+++ b/armsrc/flashmem.c
@@ -521,10 +521,10 @@ void Flashmem_print_status(void) {
     Dbprintf("  Baudrate................%dMHz", FLASHMEM_SPIBAUDRATE / 1000000);
 
     if (!FlashInit()) {
-        DbpString("  Init....................FAIL");
+        DbpString("  Init...................." _RED_("FAILED"));
         return;
     }
-    DbpString("  Init....................OK");
+    DbpString("  Init...................." _GREEN_("OK"));
 
     uint8_t dev_id = Flash_ReadID();
     switch (dev_id) {
@@ -538,7 +538,7 @@ void Flashmem_print_status(void) {
             DbpString("  Memory size.............512 kbits / 64kb");
             break;
         default :
-            DbpString("  Device ID............... -->  Unknown  <--");
+            DbpString("  Device ID..............." _YELLOW_(" -->  Unknown  <--"));
             break;
     }
 
diff --git a/armsrc/flashmem.h b/armsrc/flashmem.h
index d899a4d31..db0c70790 100644
--- a/armsrc/flashmem.h
+++ b/armsrc/flashmem.h
@@ -61,7 +61,8 @@
 #define SUSPEND         0x75
 #define RESUME          0x7A
 
-#define BUSY_TIMEOUT    1000000000L
+// Flash busy timeout: 20ms is the strict minimum when writing 256kb
+#define BUSY_TIMEOUT    50000L
 
 #define WINBOND_MANID   0xEF
 #define WINBOND_DEVID   0x11
diff --git a/common/i2c.c b/common/i2c.c
index cf4614c18..0b26bb0dc 100644
--- a/common/i2c.c
+++ b/common/i2c.c
@@ -600,7 +600,7 @@ void I2C_print_status(void) {
     if (len > 0)
         Dbprintf("  version.................v%x.%02d", resp[0], resp[1]);
     else
-        DbpString("  version.................FAILED");
+        DbpString("  version................." _RED_("FAILED"));
 }
 
 // Will read response from smart card module,  retries 3 times to get the data.

From bc6d9f407476b86e3baca5b8e46c63bc1e8e27a1 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 1 May 2019 17:19:37 +0200
Subject: [PATCH 1544/1938] pm3 report compiled capabilities

---
 armsrc/appmain.c  | 78 +++++++++++++++++++++++++++++++++++++++++++++++
 include/pm3_cmd.h | 25 +++++++++++++++
 2 files changed, 103 insertions(+)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 8d17d7115..f877b88dd 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -436,6 +436,84 @@ void SendCapabilities(void) {
         capabilities.baudrate = USART_BAUD_RATE;
     else
         capabilities.baudrate = 0; // no real baudrate for USB-CDC
+
+#ifdef WITH_FLASH
+    capabilities.compiled_with_flash = true;
+#else
+    capabilities.compiled_with_flash = false;
+#endif
+#ifdef WITH_SMARTCARD
+    capabilities.compiled_with_smartcard = true;
+#else
+    capabilities.compiled_with_smartcard = false;
+#endif
+
+#ifdef WITH_FPC
+    capabilities.compiled_with_fpc = true;
+#else
+    capabilities.compiled_with_fpc = false;
+#endif
+#ifdef WITH_FPC_HOST
+    capabilities.compiled_with_fpc_host = true;
+#else
+    capabilities.compiled_with_fpc_host = false;
+#endif
+#ifdef WITH_LF
+    capabilities.compiled_with_lf = true;
+#else
+    capabilities.compiled_with_lf = false;
+#endif
+#ifdef WITH_HITAG
+    capabilities.compiled_with_hitag = true;
+#else
+    capabilities.compiled_with_hitag = false;
+#endif
+#ifdef WITH_HFSNIFF
+    capabilities.compiled_with_hfsniff = true;
+#else
+    capabilities.compiled_with_hfsniff = false;
+#endif
+#ifdef WITH_ISO14443a
+    capabilities.compiled_with_iso14443a = true;
+#else
+    capabilities.compiled_with_iso14443a = false;
+#endif
+#ifdef WITH_ISO14443b
+    capabilities.compiled_with_iso14443b = true;
+#else
+    capabilities.compiled_with_iso14443b = false;
+#endif
+#ifdef WITH_ISO15693
+    capabilities.compiled_with_iso15693 = true;
+#else
+    capabilities.compiled_with_iso15693 = false;
+#endif
+#ifdef WITH_FELICA
+    capabilities.compiled_with_felica = true;
+#else
+    capabilities.compiled_with_felica = false;
+#endif
+#ifdef WITH_LEGICRF
+    capabilities.compiled_with_legicrf = true;
+#else
+    capabilities.compiled_with_legicrf = false;
+#endif
+#ifdef WITH_ICLASS
+    capabilities.compiled_with_iclass = true;
+#else
+    capabilities.compiled_with_iclass = false;
+#endif
+#ifdef WITH_LCD
+    capabilities.compiled_with_lcd = true;
+#else
+    capabilities.compiled_with_lcd = false;
+#endif
+
+// TODO
+//    capabilities.hw_available_flash
+//    capabilities.hw_available_smartcard
+//    capabilities.hw_available_fpc_host
+
     reply_ng(CMD_CAPABILITIES, PM3_SUCCESS, (uint8_t *)&capabilities, sizeof(capabilities));
 }
 
diff --git a/include/pm3_cmd.h b/include/pm3_cmd.h
index 41ebf221c..ffbdc4734 100644
--- a/include/pm3_cmd.h
+++ b/include/pm3_cmd.h
@@ -141,6 +141,31 @@ typedef struct {
 typedef struct {
     uint32_t baudrate;
     bool via_fpc;
+    // rdv4
+    bool compiled_with_flash;
+    bool compiled_with_smartcard;
+    bool compiled_with_fpc;
+    bool compiled_with_fpc_host;
+    // lf
+    bool compiled_with_lf;
+    bool compiled_with_hitag;
+    // hf
+    bool compiled_with_hfsniff;
+    bool compiled_with_iso14443a;
+    bool compiled_with_iso14443b;
+    bool compiled_with_iso15693;
+    bool compiled_with_felica;
+    bool compiled_with_legicrf;
+    bool compiled_with_iclass;
+    // misc
+    bool compiled_with_lcd;
+
+    // Following are not yet implemented:
+    // rdv4
+    bool hw_available_flash;
+    bool hw_available_smartcard;
+    // rdv4 bt addon
+    bool hw_available_fpc_host;
 } PACKED capabilities_t;
 
 extern capabilities_t pm3_capabilities;

From 5a6929c533d0dcab14e9ea935fb877ec7c8fabef Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 1 May 2019 18:26:12 +0200
Subject: [PATCH 1545/1938] chg: lua lib 14a,  added disconnect support

---
 client/lualibs/read14a.lua | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/client/lualibs/read14a.lua b/client/lualibs/read14a.lua
index 60c904d4a..37f13decb 100644
--- a/client/lualibs/read14a.lua
+++ b/client/lualibs/read14a.lua
@@ -128,10 +128,20 @@ local function waitFor14443a()
     end
     return nil, "Aborted by user"
 end
+
+-- Sends an instruction to do nothing, only disconnect
+local function disconnect14443a()
+    local c = Command:newMIX{cmd = cmds.CMD_READER_ISO_14443a}
+    -- We can ignore the response here, no ACK is returned for this command
+    -- Check /armsrc/iso14443a.c, ReaderIso14443a() for details
+    return c.sendMIX(true)
+end
+
 local library = {
     read = read14443a,
     waitFor14443a = waitFor14443a,
     parse14443a = parse14443a,
+    disconnect = disconnect14443a,
     ISO14A_COMMAND = ISO14A_COMMAND,
 }
 

From ca43afa19b186e854a25fbcc6269d375d73d9e07 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 1 May 2019 20:48:15 +0200
Subject: [PATCH 1546/1938] begin of dynamic capabilities handling in client

---
 client/cmdanalyse.c     | 20 +++++------
 client/cmddata.c        | 74 +++++++++++++++++++-------------------
 client/cmdflashmem.c    | 16 ++++-----
 client/cmdhf.c          | 38 ++++++++++----------
 client/cmdhf14a.c       | 24 ++++++-------
 client/cmdhf14b.c       | 22 ++++++------
 client/cmdhf15.c        | 32 ++++++++---------
 client/cmdhfepa.c       |  8 ++---
 client/cmdhffelica.c    | 18 +++++-----
 client/cmdhffido.c      | 12 +++----
 client/cmdhficlass.c    | 42 +++++++++++-----------
 client/cmdhflegic.c     | 28 +++++++--------
 client/cmdhfmf.c        | 80 ++++++++++++++++++++---------------------
 client/cmdhfmfdes.c     | 10 +++---
 client/cmdhfmfdesfire.c | 10 +++---
 client/cmdhfmfp.c       | 22 ++++++------
 client/cmdhfmfu.c       | 30 ++++++++--------
 client/cmdhftopaz.c     | 12 +++----
 client/cmdhw.c          | 30 ++++++++--------
 client/cmdlf.c          | 76 +++++++++++++++++++--------------------
 client/cmdlfawid.c      | 14 ++++----
 client/cmdlfcotag.c     |  8 ++---
 client/cmdlfem4x.c      | 32 ++++++++---------
 client/cmdlffdx.c       | 12 +++----
 client/cmdlfguard.c     | 12 +++----
 client/cmdlfhid.c       | 16 ++++-----
 client/cmdlfhitag.c     | 16 ++++-----
 client/cmdlfindala.c    | 14 ++++----
 client/cmdlfio.c        | 12 +++----
 client/cmdlfjablotron.c | 12 +++----
 client/cmdlfkeri.c      | 12 +++----
 client/cmdlfnedap.c     | 12 +++----
 client/cmdlfnexwatch.c  |  8 ++---
 client/cmdlfnoralsy.c   | 12 +++----
 client/cmdlfpac.c       |  8 ++---
 client/cmdlfparadox.c   | 10 +++---
 client/cmdlfpcf7931.c   | 10 +++---
 client/cmdlfpresco.c    | 10 +++---
 client/cmdlfpyramid.c   | 12 +++----
 client/cmdlfsecurakey.c |  8 ++---
 client/cmdlft55xx.c     | 36 +++++++++----------
 client/cmdlfti.c        | 10 +++---
 client/cmdlfviking.c    | 12 +++----
 client/cmdlfvisa2000.c  | 12 +++----
 client/cmdmain.c        | 32 ++++++++---------
 client/cmdmain.h        |  6 ----
 client/cmdparser.c      | 40 ++++++++++++++-------
 client/cmdparser.h      |  7 ++--
 client/cmdscript.c      |  8 ++---
 client/cmdsmartcard.c   | 18 +++++-----
 client/cmdtrace.c       | 10 +++---
 client/emv/cmdemv.c     | 40 ++++++++++-----------
 client/flasher.c        |  1 +
 client/proxmark3.c      |  3 ++
 client/ui.h             |  1 +
 55 files changed, 554 insertions(+), 536 deletions(-)

diff --git a/client/cmdanalyse.c b/client/cmdanalyse.c
index 1b12b33fd..3e80371ea 100644
--- a/client/cmdanalyse.c
+++ b/client/cmdanalyse.c
@@ -903,16 +903,16 @@ static int CmdAnalyseNuid(const char *Cmd) {
     return 0;
 }
 static command_t CommandTable[] = {
-    {"help",    CmdHelp,            1, "This help"},
-    {"lcr",     CmdAnalyseLCR,      1, "Generate final byte for XOR LRC"},
-    {"crc",     CmdAnalyseCRC,      1, "Stub method for CRC evaluations"},
-    {"chksum",  CmdAnalyseCHKSUM,   1, "Checksum with adding, masking and one's complement"},
-    {"dates",   CmdAnalyseDates,    1, "Look for datestamps in a given array of bytes"},
-    {"tea",     CmdAnalyseTEASelfTest, 1, "Crypto TEA test"},
-    {"lfsr",    CmdAnalyseLfsr,     1, "LFSR tests"},
-    {"a",       CmdAnalyseA,        1, "num bits test"},
-    {"nuid",    CmdAnalyseNuid,     1, "create NUID from 7byte UID"},
-    {NULL, NULL, 0, NULL}
+    {"help",    CmdHelp,            AlwaysAvailable, "This help"},
+    {"lcr",     CmdAnalyseLCR,      AlwaysAvailable, "Generate final byte for XOR LRC"},
+    {"crc",     CmdAnalyseCRC,      AlwaysAvailable, "Stub method for CRC evaluations"},
+    {"chksum",  CmdAnalyseCHKSUM,   AlwaysAvailable, "Checksum with adding, masking and one's complement"},
+    {"dates",   CmdAnalyseDates,    AlwaysAvailable, "Look for datestamps in a given array of bytes"},
+    {"tea",     CmdAnalyseTEASelfTest, AlwaysAvailable, "Crypto TEA test"},
+    {"lfsr",    CmdAnalyseLfsr,     AlwaysAvailable, "LFSR tests"},
+    {"a",       CmdAnalyseA,        AlwaysAvailable, "num bits test"},
+    {"nuid",    CmdAnalyseNuid,     AlwaysAvailable, "create NUID from 7byte UID"},
+    {NULL, NULL, NULL, NULL}
 };
 
 static int CmdHelp(const char *Cmd) {
diff --git a/client/cmddata.c b/client/cmddata.c
index 6ac03202d..a83c4811d 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -2097,44 +2097,44 @@ static int CmdDataIIR(const char *Cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",            CmdHelp,            1, "This help"},
-    {"askedgedetect",   CmdAskEdgeDetect,   1, "[threshold] Adjust Graph for manual ASK demod using the length of sample differences to detect the edge of a wave (use 20-45, def:25)"},
-    {"autocorr",        CmdAutoCorr,        1, "[window length] [g] -- Autocorrelation over window - g to save back to GraphBuffer (overwrite)"},
-    {"biphaserawdecode", CmdBiphaseDecodeRaw, 1, "[offset] [invert<0|1>] [maxErr] -- Biphase decode bin stream in DemodBuffer (offset = 0|1 bits to shift the decode start)"},
-    {"bin2hex",         Cmdbin2hex,         1, "<digits> -- Converts binary to hexadecimal"},
-    {"bitsamples",      CmdBitsamples,      0, "Get raw samples as bitstring"},
-    {"buffclear",       CmdBuffClear,       1, "Clears bigbuff on deviceside and graph window"},
-    {"dec",             CmdDec,             1, "Decimate samples"},
-    {"detectclock",     CmdDetectClockRate, 1, "[<a|f|n|p>] Detect ASK, FSK, NRZ, PSK clock rate of wave in GraphBuffer"},
-    {"fsktonrz",        CmdFSKToNRZ,        1, "Convert fsk2 to nrz wave for alternate fsk demodulating (for weak fsk)"},
+    {"help",            CmdHelp,            AlwaysAvailable, "This help"},
+    {"askedgedetect",   CmdAskEdgeDetect,   AlwaysAvailable, "[threshold] Adjust Graph for manual ASK demod using the length of sample differences to detect the edge of a wave (use 20-45, def:25)"},
+    {"autocorr",        CmdAutoCorr,        AlwaysAvailable, "[window length] [g] -- Autocorrelation over window - g to save back to GraphBuffer (overwrite)"},
+    {"biphaserawdecode", CmdBiphaseDecodeRaw, AlwaysAvailable, "[offset] [invert<0|1>] [maxErr] -- Biphase decode bin stream in DemodBuffer (offset = 0|1 bits to shift the decode start)"},
+    {"bin2hex",         Cmdbin2hex,         AlwaysAvailable, "<digits> -- Converts binary to hexadecimal"},
+    {"bitsamples",      CmdBitsamples,      IfPm3Present,    "Get raw samples as bitstring"},
+    {"buffclear",       CmdBuffClear,       AlwaysAvailable, "Clears bigbuff on deviceside and graph window"},
+    {"dec",             CmdDec,             AlwaysAvailable, "Decimate samples"},
+    {"detectclock",     CmdDetectClockRate, AlwaysAvailable, "[<a|f|n|p>] Detect ASK, FSK, NRZ, PSK clock rate of wave in GraphBuffer"},
+    {"fsktonrz",        CmdFSKToNRZ,        AlwaysAvailable, "Convert fsk2 to nrz wave for alternate fsk demodulating (for weak fsk)"},
 
-    {"getbitstream",    CmdGetBitStream,    1, "Convert GraphBuffer's >=1 values to 1 and <1 to 0"},
-    {"grid",            CmdGrid,            1, "<x> <y> -- overlay grid on graph window, use zero value to turn off either"},
-    {"hexsamples",      CmdHexsamples,      0, "<bytes> [<offset>] -- Dump big buffer as hex bytes"},
-    {"hex2bin",         Cmdhex2bin,         1, "<hexadecimal> -- Converts hexadecimal to binary"},
-    {"hide",            CmdHide,            1, "Hide graph window"},
-    {"hpf",             CmdHpf,             1, "Remove DC offset from trace"},
-    {"load",            CmdLoad,            1, "<filename> -- Load trace (to graph window"},
-    {"ltrim",           CmdLtrim,           1, "<samples> -- Trim samples from left of trace"},
-    {"rtrim",           CmdRtrim,           1, "<location to end trace> -- Trim samples from right of trace"},
-    {"mtrim",           CmdMtrim,           1, "<start> <stop> -- Trim out samples from the specified start to the specified stop"},
-    {"manrawdecode",    Cmdmandecoderaw,    1, "[invert] [maxErr] -- Manchester decode binary stream in DemodBuffer"},
-    {"norm",            CmdNorm,            1, "Normalize max/min to +/-128"},
-    {"plot",            CmdPlot,            1, "Show graph window (hit 'h' in window for keystroke help)"},
-    {"printdemodbuffer", CmdPrintDemodBuff,  1, "[x] [o] <offset> [l] <length> -- print the data in the DemodBuffer - 'x' for hex output"},
-    {"rawdemod",        CmdRawDemod,        1, "[modulation] ... <options> -see help (h option) -- Demodulate the data in the GraphBuffer and output binary"},
-    {"samples",         CmdSamples,         0, "[512 - 40000] -- Get raw samples for graph window (GraphBuffer)"},
-    {"save",            CmdSave,            1, "<filename> -- Save trace (from graph window)"},
-    {"setgraphmarkers", CmdSetGraphMarkers, 1, "[orange_marker] [blue_marker] (in graph window)"},
-    {"scale",           CmdScale,           1, "<int> -- Set cursor display scale"},
-    {"setdebugmode",    CmdSetDebugMode,    1, "<0|1|2> -- Turn on or off Debugging Level for lf demods"},
-    {"shiftgraphzero",  CmdGraphShiftZero,  1, "<shift> -- Shift 0 for Graphed wave + or - shift value"},
-    {"dirthreshold",    CmdDirectionalThreshold,   1, "<thres up> <thres down> -- Max rising higher up-thres/ Min falling lower down-thres, keep rest as prev."},
-    {"tune",            CmdTuneSamples,     0, "Get hw tune samples for graph window"},
-    {"undec",           CmdUndec,           1, "Un-decimate samples by 2"},
-    {"zerocrossings",   CmdZerocrossings,   1, "Count time between zero-crossings"},
-    {"iir",             CmdDataIIR,         0, "apply IIR buttersworth filter on plotdata"},
-    {NULL, NULL, 0, NULL}
+    {"getbitstream",    CmdGetBitStream,    AlwaysAvailable, "Convert GraphBuffer's >=1 values to 1 and <1 to 0"},
+    {"grid",            CmdGrid,            AlwaysAvailable, "<x> <y> -- overlay grid on graph window, use zero value to turn off either"},
+    {"hexsamples",      CmdHexsamples,      IfPm3Present,    "<bytes> [<offset>] -- Dump big buffer as hex bytes"},
+    {"hex2bin",         Cmdhex2bin,         AlwaysAvailable, "<hexadecimal> -- Converts hexadecimal to binary"},
+    {"hide",            CmdHide,            AlwaysAvailable, "Hide graph window"},
+    {"hpf",             CmdHpf,             AlwaysAvailable, "Remove DC offset from trace"},
+    {"load",            CmdLoad,            AlwaysAvailable, "<filename> -- Load trace (to graph window"},
+    {"ltrim",           CmdLtrim,           AlwaysAvailable, "<samples> -- Trim samples from left of trace"},
+    {"rtrim",           CmdRtrim,           AlwaysAvailable, "<location to end trace> -- Trim samples from right of trace"},
+    {"mtrim",           CmdMtrim,           AlwaysAvailable, "<start> <stop> -- Trim out samples from the specified start to the specified stop"},
+    {"manrawdecode",    Cmdmandecoderaw,    AlwaysAvailable, "[invert] [maxErr] -- Manchester decode binary stream in DemodBuffer"},
+    {"norm",            CmdNorm,            AlwaysAvailable, "Normalize max/min to +/-128"},
+    {"plot",            CmdPlot,            AlwaysAvailable, "Show graph window (hit 'h' in window for keystroke help)"},
+    {"printdemodbuffer", CmdPrintDemodBuff,  AlwaysAvailable, "[x] [o] <offset> [l] <length> -- print the data in the DemodBuffer - 'x' for hex output"},
+    {"rawdemod",        CmdRawDemod,        AlwaysAvailable, "[modulation] ... <options> -see help (h option) -- Demodulate the data in the GraphBuffer and output binary"},
+    {"samples",         CmdSamples,         IfPm3Present,    "[512 - 40000] -- Get raw samples for graph window (GraphBuffer)"},
+    {"save",            CmdSave,            AlwaysAvailable, "<filename> -- Save trace (from graph window)"},
+    {"setgraphmarkers", CmdSetGraphMarkers, AlwaysAvailable, "[orange_marker] [blue_marker] (in graph window)"},
+    {"scale",           CmdScale,           AlwaysAvailable, "<int> -- Set cursor display scale"},
+    {"setdebugmode",    CmdSetDebugMode,    AlwaysAvailable, "<0|1|2> -- Turn on or off Debugging Level for lf demods"},
+    {"shiftgraphzero",  CmdGraphShiftZero,  AlwaysAvailable, "<shift> -- Shift 0 for Graphed wave + or - shift value"},
+    {"dirthreshold",    CmdDirectionalThreshold,   AlwaysAvailable, "<thres up> <thres down> -- Max rising higher up-thres/ Min falling lower down-thres, keep rest as prev."},
+    {"tune",            CmdTuneSamples,     IfPm3Present,    "Get hw tune samples for graph window"},
+    {"undec",           CmdUndec,           AlwaysAvailable, "Un-decimate samples by 2"},
+    {"zerocrossings",   CmdZerocrossings,   AlwaysAvailable, "Count time between zero-crossings"},
+    {"iir",             CmdDataIIR,         IfPm3Present,    "apply IIR buttersworth filter on plotdata"},
+    {NULL, NULL, NULL, NULL}
 };
 
 static int CmdHelp(const char *Cmd) {
diff --git a/client/cmdflashmem.c b/client/cmdflashmem.c
index 3a202c875..127bd3419 100644
--- a/client/cmdflashmem.c
+++ b/client/cmdflashmem.c
@@ -617,14 +617,14 @@ static int CmdFlashMemInfo(const char *Cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",    CmdHelp,            1, "This help"},
-    {"spibaud", CmdFlashmemSpiBaudrate, 1, "Set Flash memory Spi baudrate [rdv40]"},
-    {"read",    CmdFlashMemRead,    1, "Read Flash memory [rdv40]"},
-    {"info",    CmdFlashMemInfo,    1, "Flash memory information [rdv40]"},
-    {"load",    CmdFlashMemLoad,    1, "Load data into flash memory [rdv40]"},
-    {"save",    CmdFlashMemSave,    1, "Save data from flash memory [rdv40]"},
-    {"wipe",    CmdFlashMemWipe,    1, "Wipe data from flash memory [rdv40]"},
-    {NULL, NULL, 0, NULL}
+    {"help",    CmdHelp,            AlwaysAvailable, "This help"},
+    {"spibaud", CmdFlashmemSpiBaudrate, AlwaysAvailable, "Set Flash memory Spi baudrate [rdv40]"},
+    {"read",    CmdFlashMemRead,    AlwaysAvailable, "Read Flash memory [rdv40]"},
+    {"info",    CmdFlashMemInfo,    AlwaysAvailable, "Flash memory information [rdv40]"},
+    {"load",    CmdFlashMemLoad,    AlwaysAvailable, "Load data into flash memory [rdv40]"},
+    {"save",    CmdFlashMemSave,    AlwaysAvailable, "Save data from flash memory [rdv40]"},
+    {"wipe",    CmdFlashMemWipe,    AlwaysAvailable, "Wipe data from flash memory [rdv40]"},
+    {NULL, NULL, NULL, NULL}
 };
 
 static int CmdHelp(const char *Cmd) {
diff --git a/client/cmdhf.c b/client/cmdhf.c
index 405ad4c67..06624cd1b 100644
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -102,25 +102,25 @@ int CmdHFSniff(const char *Cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",        CmdHelp,          1, "This help"},
-    {"14a",         CmdHF14A,         1, "{ ISO14443A RFIDs...               }"},
-    {"14b",         CmdHF14B,         1, "{ ISO14443B RFIDs...               }"},
-    {"15",          CmdHF15,          1, "{ ISO15693 RFIDs...                }"},
-    {"epa",         CmdHFEPA,         1, "{ German Identification Card...    }"},
-    {"felica",      CmdHFFelica,      1, "{ ISO18092 / Felica RFIDs...       }"},
-    {"legic",       CmdHFLegic,       1, "{ LEGIC RFIDs...                   }"},
-    {"iclass",      CmdHFiClass,      1, "{ ICLASS RFIDs...                  }"},
-    {"mf",          CmdHFMF,          1, "{ MIFARE RFIDs...                  }"},
-    {"mfp",         CmdHFMFP,         1, "{ MIFARE Plus RFIDs...             }"},
-    {"mfu",         CmdHFMFUltra,     1, "{ MIFARE Ultralight RFIDs...       }"},
-    {"mfdes",       CmdHFMFDes,       1, "{ MIFARE Desfire RFIDs...          }"},
-    {"topaz",       CmdHFTopaz,       1, "{ TOPAZ (NFC Type 1) RFIDs...      }"},
-    {"fido",        CmdHFFido,        1, "{ FIDO and FIDO2 authenticators... }"},
-    {"list",        CmdTraceList,     0, "List protocol data in trace buffer"},
-    {"tune",        CmdHFTune,        0, "Continuously measure HF antenna tuning"},
-    {"search",      CmdHFSearch,      1, "Search for known HF tags [preliminary]"},
-    {"sniff",       CmdHFSniff,       0, "<samples to skip (10000)> <triggers to skip (1)> Generic HF Sniff"},
-    {NULL, NULL, 0, NULL}
+    {"help",        CmdHelp,          AlwaysAvailable, "This help"},
+    {"14a",         CmdHF14A,         AlwaysAvailable, "{ ISO14443A RFIDs...               }"},
+    {"14b",         CmdHF14B,         AlwaysAvailable, "{ ISO14443B RFIDs...               }"},
+    {"15",          CmdHF15,          AlwaysAvailable, "{ ISO15693 RFIDs...                }"},
+    {"epa",         CmdHFEPA,         AlwaysAvailable, "{ German Identification Card...    }"},
+    {"felica",      CmdHFFelica,      AlwaysAvailable, "{ ISO18092 / Felica RFIDs...       }"},
+    {"legic",       CmdHFLegic,       AlwaysAvailable, "{ LEGIC RFIDs...                   }"},
+    {"iclass",      CmdHFiClass,      AlwaysAvailable, "{ ICLASS RFIDs...                  }"},
+    {"mf",          CmdHFMF,          AlwaysAvailable, "{ MIFARE RFIDs...                  }"},
+    {"mfp",         CmdHFMFP,         AlwaysAvailable, "{ MIFARE Plus RFIDs...             }"},
+    {"mfu",         CmdHFMFUltra,     AlwaysAvailable, "{ MIFARE Ultralight RFIDs...       }"},
+    {"mfdes",       CmdHFMFDes,       AlwaysAvailable, "{ MIFARE Desfire RFIDs...          }"},
+    {"topaz",       CmdHFTopaz,       AlwaysAvailable, "{ TOPAZ (NFC Type 1) RFIDs...      }"},
+    {"fido",        CmdHFFido,        AlwaysAvailable, "{ FIDO and FIDO2 authenticators... }"},
+    {"list",        CmdTraceList,     IfPm3Present,    "List protocol data in trace buffer"},
+    {"tune",        CmdHFTune,        IfPm3Present,    "Continuously measure HF antenna tuning"},
+    {"search",      CmdHFSearch,      AlwaysAvailable, "Search for known HF tags [preliminary]"},
+    {"sniff",       CmdHFSniff,       IfPm3Hfsniff,    "<samples to skip (10000)> <triggers to skip (1)> Generic HF Sniff"},
+    {NULL, NULL, NULL, NULL}
 };
 
 int CmdHF(const char *Cmd) {
diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 42e5e5c29..c54c51741 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -1115,18 +1115,18 @@ static int CmdHF14AChaining(const char *Cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",        CmdHelp,              1, "This help"},
-    {"list",        CmdHF14AList,         0, "List ISO 14443-a history"},
-    {"info",        CmdHF14AInfo,         0, "Tag information"},
-    {"reader",      CmdHF14AReader,       0, "Act like an ISO14443-a reader"},
-    {"cuids",       CmdHF14ACUIDs,        0, "<n> Collect n>0 ISO14443-a UIDs in one go"},
-    {"sim",         CmdHF14ASim,          0, "<UID> -- Simulate ISO 14443-a tag"},
-    {"sniff",       CmdHF14ASniff,        0, "sniff ISO 14443-a traffic"},
-    {"apdu",        CmdHF14AAPDU,         0, "Send ISO 14443-4 APDU to tag"},
-    {"chaining",    CmdHF14AChaining,     0, "Control ISO 14443-4 input chaining"},
-    {"raw",         CmdHF14ACmdRaw,       0, "Send raw hex data to tag"},
-    {"antifuzz",    CmdHF14AAntiFuzz,     0, "Fuzzing the anticollision phase.  Warning! Readers may react strange"},
-    {NULL, NULL, 0, NULL}
+    {"help",        CmdHelp,              AlwaysAvailable, "This help"},
+    {"list",        CmdHF14AList,         IfPm3Present,    "List ISO 14443-a history"},
+    {"info",        CmdHF14AInfo,         IfPm3Present,    "Tag information"},
+    {"reader",      CmdHF14AReader,       IfPm3Present,    "Act like an ISO14443-a reader"},
+    {"cuids",       CmdHF14ACUIDs,        IfPm3Present,    "<n> Collect n>0 ISO14443-a UIDs in one go"},
+    {"sim",         CmdHF14ASim,          IfPm3Present,    "<UID> -- Simulate ISO 14443-a tag"},
+    {"sniff",       CmdHF14ASniff,        IfPm3Present,    "sniff ISO 14443-a traffic"},
+    {"apdu",        CmdHF14AAPDU,         IfPm3Present,    "Send ISO 14443-4 APDU to tag"},
+    {"chaining",    CmdHF14AChaining,     IfPm3Present,    "Control ISO 14443-4 input chaining"},
+    {"raw",         CmdHF14ACmdRaw,       IfPm3Present,    "Send raw hex data to tag"},
+    {"antifuzz",    CmdHF14AAntiFuzz,     IfPm3Present,    "Fuzzing the anticollision phase.  Warning! Readers may react strange"},
+    {NULL, NULL, NULL, NULL}
 };
 
 static int CmdHelp(const char *Cmd) {
diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c
index 0696a3203..c11074850 100644
--- a/client/cmdhf14b.c
+++ b/client/cmdhf14b.c
@@ -1074,18 +1074,18 @@ static int srix4kValid(const char *Cmd) {
 }
 */
 static command_t CommandTable[] = {
-    {"help",        CmdHelp,        1, "This help"},
-    {"dump",        CmdHF14BDump,   0, "Read all memory pages of an ISO14443-B tag, save to file"},
-    {"info",        CmdHF14Binfo,   0, "Tag information"},
-    {"list",        CmdHF14BList,   0, "List ISO 14443B history"},
-    {"raw",         CmdHF14BCmdRaw, 0, "Send raw hex data to tag"},
-    {"reader",      CmdHF14BReader, 0, "Act as a 14443B reader to identify a tag"},
-    {"sim",         CmdHF14BSim,    0, "Fake ISO 14443B tag"},
-    {"sniff",       CmdHF14BSniff,  0, "Eavesdrop ISO 14443B"},
-    {"sriread",     CmdHF14BReadSri,  0, "Read contents of a SRI512 | SRIX4K tag"},
-    {"sriwrite",    CmdHF14BWriteSri, 0, "Write data to a SRI512 | SRIX4K tag"},
+    {"help",        CmdHelp,        AlwaysAvailable, "This help"},
+    {"dump",        CmdHF14BDump,   IfPm3Present,    "Read all memory pages of an ISO14443-B tag, save to file"},
+    {"info",        CmdHF14Binfo,   IfPm3Present,    "Tag information"},
+    {"list",        CmdHF14BList,   IfPm3Present,    "List ISO 14443B history"},
+    {"raw",         CmdHF14BCmdRaw, IfPm3Present,    "Send raw hex data to tag"},
+    {"reader",      CmdHF14BReader, IfPm3Present,    "Act as a 14443B reader to identify a tag"},
+    {"sim",         CmdHF14BSim,    IfPm3Present,    "Fake ISO 14443B tag"},
+    {"sniff",       CmdHF14BSniff,  IfPm3Present,    "Eavesdrop ISO 14443B"},
+    {"sriread",     CmdHF14BReadSri,  IfPm3Present,    "Read contents of a SRI512 | SRIX4K tag"},
+    {"sriwrite",    CmdHF14BWriteSri, IfPm3Present,    "Write data to a SRI512 | SRIX4K tag"},
     //{"valid",     srix4kValid,    1, "srix4k checksum test"},
-    {NULL, NULL, 0, NULL}
+    {NULL, NULL, NULL, NULL}
 };
 
 static int CmdHelp(const char *Cmd) {
diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index 5cce0079a..eba66143f 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -1274,22 +1274,22 @@ static int CmdHF15Restore(const char *Cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",        CmdHF15Help,        1, "This help"},
-    {"demod",       CmdHF15Demod,       1, "Demodulate ISO15693 from tag"},
-    {"dump",        CmdHF15Dump,        0, "Read all memory pages of an ISO15693 tag, save to file"},
-    {"findafi",     CmdHF15Afi,         0, "Brute force AFI of an ISO15693 tag"},
-    {"info",        CmdHF15Info,        0, "Tag information"},
-    {"list",        CmdHF15List,        0, "List ISO15693 history"},
-    {"raw",         CmdHF15Raw,         0, "Send raw hex data to tag"},
-    {"reader",      CmdHF15Reader,      0, "Act like an ISO15693 reader"},
-    {"record",      CmdHF15Record,      0, "Record Samples (ISO15693)"},
-    {"restore",     CmdHF15Restore,     0, "Restore from file to all memory pages of an ISO15693 tag"},
-    {"sim",         CmdHF15Sim,         0, "Fake an ISO15693 tag"},
-    {"samples",     CmdHF15Samples,     0, "Acquire Samples as Reader (enables carrier, sends inquiry)"},
-    {"read",        CmdHF15Read,        0, "Read a block"},
-    {"write",       CmdHF15Write,       0, "Write a block"},
-    {"readmulti",   CmdHF15Readmulti,   0, "Reads multiple Blocks"},
-    {NULL, NULL, 0, NULL}
+    {"help",        CmdHF15Help,        AlwaysAvailable, "This help"},
+    {"demod",       CmdHF15Demod,       AlwaysAvailable, "Demodulate ISO15693 from tag"},
+    {"dump",        CmdHF15Dump,        IfPm3Present,    "Read all memory pages of an ISO15693 tag, save to file"},
+    {"findafi",     CmdHF15Afi,         IfPm3Present,    "Brute force AFI of an ISO15693 tag"},
+    {"info",        CmdHF15Info,        IfPm3Present,    "Tag information"},
+    {"list",        CmdHF15List,        IfPm3Present,    "List ISO15693 history"},
+    {"raw",         CmdHF15Raw,         IfPm3Present,    "Send raw hex data to tag"},
+    {"reader",      CmdHF15Reader,      IfPm3Present,    "Act like an ISO15693 reader"},
+    {"record",      CmdHF15Record,      IfPm3Present,    "Record Samples (ISO15693)"},
+    {"restore",     CmdHF15Restore,     IfPm3Present,    "Restore from file to all memory pages of an ISO15693 tag"},
+    {"sim",         CmdHF15Sim,         IfPm3Present,    "Fake an ISO15693 tag"},
+    {"samples",     CmdHF15Samples,     IfPm3Present,    "Acquire Samples as Reader (enables carrier, sends inquiry)"},
+    {"read",        CmdHF15Read,        IfPm3Present,    "Read a block"},
+    {"write",       CmdHF15Write,       IfPm3Present,    "Write a block"},
+    {"readmulti",   CmdHF15Readmulti,   IfPm3Present,    "Reads multiple Blocks"},
+    {NULL, NULL, NULL, NULL}
 };
 
 static int CmdHF15Help(const char *Cmd) {
diff --git a/client/cmdhfepa.c b/client/cmdhfepa.c
index 3b6549cce..18812d15a 100644
--- a/client/cmdhfepa.c
+++ b/client/cmdhfepa.c
@@ -157,10 +157,10 @@ static int CmdHFEPAPACEReplay(const char *Cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",    CmdHelp,                   1, "This help"},
-    {"cnonces", CmdHFEPACollectPACENonces, 0, "<m> <n> <d> Acquire n>0 encrypted PACE nonces of size m>0 with d sec pauses"},
-    {"preplay", CmdHFEPAPACEReplay,        0, "<mse> <get> <map> <pka> <ma> Perform PACE protocol by replaying given APDUs"},
-    {NULL, NULL, 0, NULL}
+    {"help",    CmdHelp,                   AlwaysAvailable, "This help"},
+    {"cnonces", CmdHFEPACollectPACENonces, IfPm3Present,    "<m> <n> <d> Acquire n>0 encrypted PACE nonces of size m>0 with d sec pauses"},
+    {"preplay", CmdHFEPAPACEReplay,        IfPm3Present,    "<mse> <get> <map> <pka> <ma> Perform PACE protocol by replaying given APDUs"},
+    {NULL, NULL, NULL, NULL}
 };
 
 static int CmdHelp(const char *Cmd) {
diff --git a/client/cmdhffelica.c b/client/cmdhffelica.c
index c61e386c8..6565dc2b2 100644
--- a/client/cmdhffelica.c
+++ b/client/cmdhffelica.c
@@ -534,16 +534,16 @@ static int CmdHFFelicaCmdRaw(const char *Cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",      CmdHelp,              1, "This help"},
-    {"list",      CmdHFFelicaList,      0, "List ISO 18092/FeliCa history"},
-    {"reader",    CmdHFFelicaReader,    0, "Act like an ISO18092/FeliCa reader"},
-    {"sim",       CmdHFFelicaSim,       0, "<UID> -- Simulate ISO 18092/FeliCa tag"},
-    {"sniff",     CmdHFFelicaSniff,     0, "sniff ISO 18092/Felica traffic"},
-    {"raw",       CmdHFFelicaCmdRaw,    0, "Send raw hex data to tag"},
+    {"help",      CmdHelp,              AlwaysAvailable, "This help"},
+    {"list",      CmdHFFelicaList,      IfPm3Present,    "List ISO 18092/FeliCa history"},
+    {"reader",    CmdHFFelicaReader,    IfPm3Present,    "Act like an ISO18092/FeliCa reader"},
+    {"sim",       CmdHFFelicaSim,       IfPm3Present,    "<UID> -- Simulate ISO 18092/FeliCa tag"},
+    {"sniff",     CmdHFFelicaSniff,     IfPm3Present,    "sniff ISO 18092/Felica traffic"},
+    {"raw",       CmdHFFelicaCmdRaw,    IfPm3Present,    "Send raw hex data to tag"},
 
-    {"litesim",   CmdHFFelicaSimLite,   0, "<NDEF2> - only reply to poll request"},
-    {"litedump",  CmdHFFelicaDumpLite,  0, "Wait for and try dumping FelicaLite"},
-    {NULL, NULL, 0, NULL}
+    {"litesim",   CmdHFFelicaSimLite,   IfPm3Present,    "<NDEF2> - only reply to poll request"},
+    {"litedump",  CmdHFFelicaDumpLite,  IfPm3Present,    "Wait for and try dumping FelicaLite"},
+    {NULL, NULL, NULL, NULL}
 };
 
 static int CmdHelp(const char *Cmd) {
diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index 2bdb9421b..522d525ec 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -895,12 +895,12 @@ static int CmdHFFido2GetAssertion(const char *cmd) {
 };
 
 static command_t CommandTable[] = {
-    {"help",             CmdHelp,                    1, "This help."},
-    {"info",             CmdHFFidoInfo,              0, "Info about FIDO tag."},
-    {"reg",              CmdHFFidoRegister,          0, "FIDO U2F Registration Message."},
-    {"auth",             CmdHFFidoAuthenticate,      0, "FIDO U2F Authentication Message."},
-    {"make",             CmdHFFido2MakeCredential,   0, "FIDO2 MakeCredential command."},
-    {"assert",           CmdHFFido2GetAssertion,     0, "FIDO2 GetAssertion command."},
+    {"help",             CmdHelp,                    AlwaysAvailable, "This help."},
+    {"info",             CmdHFFidoInfo,              IfPm3Present,    "Info about FIDO tag."},
+    {"reg",              CmdHFFidoRegister,          IfPm3Present,    "FIDO U2F Registration Message."},
+    {"auth",             CmdHFFidoAuthenticate,      IfPm3Present,    "FIDO U2F Authentication Message."},
+    {"make",             CmdHFFido2MakeCredential,   IfPm3Present,    "FIDO2 MakeCredential command."},
+    {"assert",           CmdHFFido2GetAssertion,     IfPm3Present,    "FIDO2 GetAssertion command."},
     {NULL,               NULL,                       0, NULL}
 };
 
diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index 5f04f03f5..cd3c204cb 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -2418,27 +2418,27 @@ static int CmdHFiClassPermuteKey(const char *Cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",        CmdHelp,                    1, "This help"},
-    {"calcnewkey",  CmdHFiClassCalcNewKey,      1, "[options..] Calc Diversified keys (blocks 3 & 4) to write new keys"},
-    {"chk",         CmdHFiClassCheckKeys,       1, "            Check keys"},
-    {"clone",       CmdHFiClassCloneTag,        0, "[options..] Authenticate and Clone from iClass bin file"},
-    {"decrypt",     CmdHFiClassDecrypt,         1, "[f <fname>] Decrypt tagdump" },
-    {"dump",        CmdHFiClassReader_Dump,     0, "[options..] Authenticate and Dump iClass tag's AA1"},
-    {"eload",       CmdHFiClassELoad,           0, "[f <fname>] (experimental) Load data into iClass emulator memory"},
-    {"encryptblk",  CmdHFiClassEncryptBlk,      1, "<BlockData> Encrypt given block data"},
-    {"list",        CmdHFiClassList,            0, "            List iClass history"},
-    {"loclass",     CmdHFiClass_loclass,        1, "[options..] Use loclass to perform bruteforce of reader attack dump"},
-    {"lookup",      CmdHFiClassLookUp,          1, "[options..] Uses authentication trace to check for key in dictionary file"},
-    {"managekeys",  CmdHFiClassManageKeys,      1, "[options..] Manage the keys to use with iClass"},
-    {"permutekey",  CmdHFiClassPermuteKey,      0, "            Permute function from 'heart of darkness' paper"},
-    {"readblk",     CmdHFiClass_ReadBlock,      0, "[options..] Authenticate and Read iClass block"},
-    {"reader",      CmdHFiClassReader,          0, "            Act like an iClass reader"},
-    {"readtagfile", CmdHFiClassReadTagFile,     1, "[options..] Display Content from tagfile"},
-    {"replay",      CmdHFiClassReader_Replay,   0, "<mac>       Read an iClass tag via Replay Attack"},
-    {"sim",         CmdHFiClassSim,             0, "[options..] Simulate iClass tag"},
-    {"sniff",       CmdHFiClassSniff,           0, "            Eavesdrop iClass communication"},
-    {"writeblk",    CmdHFiClass_WriteBlock,     0, "[options..] Authenticate and Write iClass block"},
-    {NULL, NULL, 0, NULL}
+    {"help",        CmdHelp,                    AlwaysAvailable, "This help"},
+    {"calcnewkey",  CmdHFiClassCalcNewKey,      AlwaysAvailable, "[options..] Calc Diversified keys (blocks 3 & 4) to write new keys"},
+    {"chk",         CmdHFiClassCheckKeys,       AlwaysAvailable, "            Check keys"},
+    {"clone",       CmdHFiClassCloneTag,        IfPm3Present,    "[options..] Authenticate and Clone from iClass bin file"},
+    {"decrypt",     CmdHFiClassDecrypt,         AlwaysAvailable, "[f <fname>] Decrypt tagdump" },
+    {"dump",        CmdHFiClassReader_Dump,     IfPm3Present,    "[options..] Authenticate and Dump iClass tag's AA1"},
+    {"eload",       CmdHFiClassELoad,           IfPm3Present,    "[f <fname>] (experimental) Load data into iClass emulator memory"},
+    {"encryptblk",  CmdHFiClassEncryptBlk,      AlwaysAvailable, "<BlockData> Encrypt given block data"},
+    {"list",        CmdHFiClassList,            IfPm3Present,    "            List iClass history"},
+    {"loclass",     CmdHFiClass_loclass,        AlwaysAvailable, "[options..] Use loclass to perform bruteforce of reader attack dump"},
+    {"lookup",      CmdHFiClassLookUp,          AlwaysAvailable, "[options..] Uses authentication trace to check for key in dictionary file"},
+    {"managekeys",  CmdHFiClassManageKeys,      AlwaysAvailable, "[options..] Manage the keys to use with iClass"},
+    {"permutekey",  CmdHFiClassPermuteKey,      IfPm3Present,    "            Permute function from 'heart of darkness' paper"},
+    {"readblk",     CmdHFiClass_ReadBlock,      IfPm3Present,    "[options..] Authenticate and Read iClass block"},
+    {"reader",      CmdHFiClassReader,          IfPm3Present,    "            Act like an iClass reader"},
+    {"readtagfile", CmdHFiClassReadTagFile,     AlwaysAvailable, "[options..] Display Content from tagfile"},
+    {"replay",      CmdHFiClassReader_Replay,   IfPm3Present,    "<mac>       Read an iClass tag via Replay Attack"},
+    {"sim",         CmdHFiClassSim,             IfPm3Present,    "[options..] Simulate iClass tag"},
+    {"sniff",       CmdHFiClassSniff,           IfPm3Present,    "            Eavesdrop iClass communication"},
+    {"writeblk",    CmdHFiClass_WriteBlock,     IfPm3Present,    "[options..] Authenticate and Write iClass block"},
+    {NULL, NULL, NULL, NULL}
 };
 
 static int CmdHelp(const char *Cmd) {
diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index 85a3a18bc..6ebcd7db2 100644
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -1270,20 +1270,20 @@ static int CmdLegicList(const char *Cmd) {
 }
 
 static command_t CommandTable[] =  {
-    {"help",    CmdHelp,          1, "This help"},
-    {"reader",  CmdLegicReader,   1, "LEGIC Prime Reader UID and tag info"},
-    {"info",    CmdLegicInfo,     0, "Display deobfuscated and decoded LEGIC Prime tag data"},
-    {"dump",    CmdLegicDump,     0, "Dump LEGIC Prime tag to binary file"},
-    {"restore", CmdLegicRestore,  0, "Restore a dump file onto a LEGIC Prime tag"},
-    {"rdmem",   CmdLegicRdmem,    0, "Read bytes from a LEGIC Prime tag"},
-    {"sim",     CmdLegicRfSim,    0, "Start tag simulator"},
-    {"write",   CmdLegicRfWrite,  0, "Write data to a LEGIC Prime tag"},
-    {"crc",     CmdLegicCalcCrc,  1, "Calculate Legic CRC over given bytes"},
-    {"eload",   CmdLegicELoad,    1, "Load binary dump to emulator memory"},
-    {"esave",   CmdLegicESave,    1, "Save emulator memory to binary file"},
-    {"list",    CmdLegicList,     1, "List LEGIC history"},
-    {"wipe",    CmdLegicWipe,     1, "Wipe a LEGIC Prime tag"},
-    {NULL, NULL, 0, NULL}
+    {"help",    CmdHelp,          AlwaysAvailable, "This help"},
+    {"reader",  CmdLegicReader,   AlwaysAvailable, "LEGIC Prime Reader UID and tag info"},
+    {"info",    CmdLegicInfo,     IfPm3Present,    "Display deobfuscated and decoded LEGIC Prime tag data"},
+    {"dump",    CmdLegicDump,     IfPm3Present,    "Dump LEGIC Prime tag to binary file"},
+    {"restore", CmdLegicRestore,  IfPm3Present,    "Restore a dump file onto a LEGIC Prime tag"},
+    {"rdmem",   CmdLegicRdmem,    IfPm3Present,    "Read bytes from a LEGIC Prime tag"},
+    {"sim",     CmdLegicRfSim,    IfPm3Present,    "Start tag simulator"},
+    {"write",   CmdLegicRfWrite,  IfPm3Present,    "Write data to a LEGIC Prime tag"},
+    {"crc",     CmdLegicCalcCrc,  AlwaysAvailable, "Calculate Legic CRC over given bytes"},
+    {"eload",   CmdLegicELoad,    AlwaysAvailable, "Load binary dump to emulator memory"},
+    {"esave",   CmdLegicESave,    AlwaysAvailable, "Save emulator memory to binary file"},
+    {"list",    CmdLegicList,     AlwaysAvailable, "List LEGIC history"},
+    {"wipe",    CmdLegicWipe,     AlwaysAvailable, "Wipe a LEGIC Prime tag"},
+    {NULL, NULL, NULL, NULL}
 };
 
 static int CmdHelp(const char *Cmd) {
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 6c82d36a5..dac5c3b11 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -3553,48 +3553,48 @@ static int CmdHF14AMfList(const char *Cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",        CmdHelp,                1, "This help"},
-    {"list",        CmdHF14AMfList,         0, "List Mifare history"},
-    {"darkside",    CmdHF14AMfDarkside,     0, "Darkside attack. read parity error messages."},
-    {"nested",      CmdHF14AMfNested,       0, "Nested attack. Test nested authentication"},
-    {"hardnested",  CmdHF14AMfNestedHard,   0, "Nested attack for hardened Mifare cards"},
-    {"keybrute",    CmdHF14AMfKeyBrute,     0, "J_Run's 2nd phase of multiple sector nested authentication key recovery"},
-    {"nack",        CmdHf14AMfNack,         0, "Test for Mifare NACK bug"},
-    {"chk",         CmdHF14AMfChk,          0, "Check keys"},
-    {"fchk",        CmdHF14AMfChk_fast,     0, "Check keys fast, targets all keys on card"},
-    {"decrypt",     CmdHf14AMfDecryptBytes, 1, "[nt] [ar_enc] [at_enc] [data] - to decrypt sniff or trace"},
-    {"-----------", CmdHelp,                0, ""},
-    {"dbg",         CmdHF14AMfDbg,          0, "Set default debug mode"},
-    {"rdbl",        CmdHF14AMfRdBl,         0, "Read MIFARE classic block"},
-    {"rdsc",        CmdHF14AMfRdSc,         0, "Read MIFARE classic sector"},
-    {"dump",        CmdHF14AMfDump,         0, "Dump MIFARE classic tag to binary file"},
-    {"restore",     CmdHF14AMfRestore,      0, "Restore MIFARE classic binary file to BLANK tag"},
-    {"wrbl",        CmdHF14AMfWrBl,         0, "Write MIFARE classic block"},
-    {"setmod",      CmdHf14AMfSetMod,       0, "Set MIFARE Classic EV1 load modulation strength"},
-    {"auth4",       CmdHF14AMfAuth4,        0, "ISO14443-4 AES authentication"},
+    {"help",        CmdHelp,                AlwaysAvailable, "This help"},
+    {"list",        CmdHF14AMfList,         IfPm3Present,    "List Mifare history"},
+    {"darkside",    CmdHF14AMfDarkside,     IfPm3Present,    "Darkside attack. read parity error messages."},
+    {"nested",      CmdHF14AMfNested,       IfPm3Present,    "Nested attack. Test nested authentication"},
+    {"hardnested",  CmdHF14AMfNestedHard,   IfPm3Present,    "Nested attack for hardened Mifare cards"},
+    {"keybrute",    CmdHF14AMfKeyBrute,     IfPm3Present,    "J_Run's 2nd phase of multiple sector nested authentication key recovery"},
+    {"nack",        CmdHf14AMfNack,         IfPm3Present,    "Test for Mifare NACK bug"},
+    {"chk",         CmdHF14AMfChk,          IfPm3Present,    "Check keys"},
+    {"fchk",        CmdHF14AMfChk_fast,     IfPm3Present,    "Check keys fast, targets all keys on card"},
+    {"decrypt",     CmdHf14AMfDecryptBytes, AlwaysAvailable, "[nt] [ar_enc] [at_enc] [data] - to decrypt sniff or trace"},
+    {"-----------", CmdHelp,                IfPm3Present,    ""},
+    {"dbg",         CmdHF14AMfDbg,          IfPm3Present,    "Set default debug mode"},
+    {"rdbl",        CmdHF14AMfRdBl,         IfPm3Present,    "Read MIFARE classic block"},
+    {"rdsc",        CmdHF14AMfRdSc,         IfPm3Present,    "Read MIFARE classic sector"},
+    {"dump",        CmdHF14AMfDump,         IfPm3Present,    "Dump MIFARE classic tag to binary file"},
+    {"restore",     CmdHF14AMfRestore,      IfPm3Present,    "Restore MIFARE classic binary file to BLANK tag"},
+    {"wrbl",        CmdHF14AMfWrBl,         IfPm3Present,    "Write MIFARE classic block"},
+    {"setmod",      CmdHf14AMfSetMod,       IfPm3Present,    "Set MIFARE Classic EV1 load modulation strength"},
+    {"auth4",       CmdHF14AMfAuth4,        IfPm3Present,    "ISO14443-4 AES authentication"},
 //    {"sniff",       CmdHF14AMfSniff,        0, "Sniff card-reader communication"},
-    {"-----------", CmdHelp,                0, ""},
-    {"sim",         CmdHF14AMfSim,        0, "Simulate MIFARE card"},
-    {"eclr",        CmdHF14AMfEClear,       0, "Clear simulator memory"},
-    {"eget",        CmdHF14AMfEGet,         0, "Get simulator memory block"},
-    {"eset",        CmdHF14AMfESet,         0, "Set simulator memory block"},
-    {"eload",       CmdHF14AMfELoad,        0, "Load from file emul dump"},
-    {"esave",       CmdHF14AMfESave,        0, "Save to file emul dump"},
-    {"ecfill",      CmdHF14AMfECFill,       0, "Fill simulator memory with help of keys from simulator"},
-    {"ekeyprn",     CmdHF14AMfEKeyPrn,      0, "Print keys from simulator memory"},
-    {"-----------", CmdHelp,                0, ""},
-    {"csetuid",     CmdHF14AMfCSetUID,      0, "Set UID for magic Chinese card"},
-    {"csetblk",     CmdHF14AMfCSetBlk,      0, "Write block - Magic Chinese card"},
-    {"cgetblk",     CmdHF14AMfCGetBlk,      0, "Read block - Magic Chinese card"},
-    {"cgetsc",      CmdHF14AMfCGetSc,       0, "Read sector - Magic Chinese card"},
-    {"cload",       CmdHF14AMfCLoad,        0, "Load dump into magic Chinese card"},
-    {"csave",       CmdHF14AMfCSave,        0, "Save dump from magic Chinese card into file or emulator"},
-    {"-----------", CmdHelp,                0, ""},
-    {"mad",         CmdHF14AMfMAD,          0, "Checks and prints MAD"},
-    {"ndef",        CmdHFMFNDEF,            0, "Prints NDEF records from card"},
+    {"-----------", CmdHelp,                IfPm3Present,    ""},
+    {"sim",         CmdHF14AMfSim,        IfPm3Present,    "Simulate MIFARE card"},
+    {"eclr",        CmdHF14AMfEClear,       IfPm3Present,    "Clear simulator memory"},
+    {"eget",        CmdHF14AMfEGet,         IfPm3Present,    "Get simulator memory block"},
+    {"eset",        CmdHF14AMfESet,         IfPm3Present,    "Set simulator memory block"},
+    {"eload",       CmdHF14AMfELoad,        IfPm3Present,    "Load from file emul dump"},
+    {"esave",       CmdHF14AMfESave,        IfPm3Present,    "Save to file emul dump"},
+    {"ecfill",      CmdHF14AMfECFill,       IfPm3Present,    "Fill simulator memory with help of keys from simulator"},
+    {"ekeyprn",     CmdHF14AMfEKeyPrn,      IfPm3Present,    "Print keys from simulator memory"},
+    {"-----------", CmdHelp,                IfPm3Present,    ""},
+    {"csetuid",     CmdHF14AMfCSetUID,      IfPm3Present,    "Set UID for magic Chinese card"},
+    {"csetblk",     CmdHF14AMfCSetBlk,      IfPm3Present,    "Write block - Magic Chinese card"},
+    {"cgetblk",     CmdHF14AMfCGetBlk,      IfPm3Present,    "Read block - Magic Chinese card"},
+    {"cgetsc",      CmdHF14AMfCGetSc,       IfPm3Present,    "Read sector - Magic Chinese card"},
+    {"cload",       CmdHF14AMfCLoad,        IfPm3Present,    "Load dump into magic Chinese card"},
+    {"csave",       CmdHF14AMfCSave,        IfPm3Present,    "Save dump from magic Chinese card into file or emulator"},
+    {"-----------", CmdHelp,                IfPm3Present,    ""},
+    {"mad",         CmdHF14AMfMAD,          IfPm3Present,    "Checks and prints MAD"},
+    {"ndef",        CmdHFMFNDEF,            IfPm3Present,    "Prints NDEF records from card"},
 
-    {"ice",         CmdHF14AMfice,          0, "collect Mifare Classic nonces to file"},
-    {NULL, NULL, 0, NULL}
+    {"ice",         CmdHF14AMfice,          IfPm3Present,    "collect Mifare Classic nonces to file"},
+    {NULL, NULL, NULL, NULL}
 };
 
 static int CmdHelp(const char *Cmd) {
diff --git a/client/cmdhfmfdes.c b/client/cmdhfmfdes.c
index 62f328acc..fa776fdd6 100644
--- a/client/cmdhfmfdes.c
+++ b/client/cmdhfmfdes.c
@@ -624,13 +624,13 @@ static int CmdHF14ADesAuth(const char *Cmd) {
 
 
 static command_t CommandTable[] = {
-    {"help",    CmdHelp,                    1, "This help"},
-    {"info",    CmdHF14ADesInfo,            0, "Tag information"},
-    {"enum",    CmdHF14ADesEnumApplications, 0, "Tries enumerate all applications"},
-    {"auth",    CmdHF14ADesAuth,            0, "Tries a MIFARE DesFire Authentication"},
+    {"help",    CmdHelp,                    AlwaysAvailable, "This help"},
+    {"info",    CmdHF14ADesInfo,            IfPm3Present,    "Tag information"},
+    {"enum",    CmdHF14ADesEnumApplications, IfPm3Present,    "Tries enumerate all applications"},
+    {"auth",    CmdHF14ADesAuth,            IfPm3Present,    "Tries a MIFARE DesFire Authentication"},
 //    {"rdbl",    CmdHF14ADesRb,              0, "Read MIFARE DesFire block"},
 //    {"wrbl",    CmdHF14ADesWb,              0, "write MIFARE DesFire block"},
-    {NULL, NULL, 0, NULL}
+    {NULL, NULL, NULL, NULL}
 };
 
 static int CmdHelp(const char *Cmd) {
diff --git a/client/cmdhfmfdesfire.c b/client/cmdhfmfdesfire.c
index 90779722a..7f9ae0758 100644
--- a/client/cmdhfmfdesfire.c
+++ b/client/cmdhfmfdesfire.c
@@ -220,11 +220,11 @@ static int CmdHF14AMfAESAuth(const char *Cmd) {
 // Menu Stuff
 //------------------------------------
 static command_t CommandTable[] = {
-    {"help",    CmdHelp,            1, "This help"},
-    {"dbg",     CmdHF14AMfDbg,      0, "Set default debug mode"},
-    {"des-auth", CmdHF14AMfDESAuth,  0, "Desfire Authentication"},
-    {"ev1-auth", CmdHF14AMfAESAuth,  0, "EV1 Authentication"},
-    {NULL, NULL, 0, NULL}
+    {"help",    CmdHelp,            AlwaysAvailable, "This help"},
+    {"dbg",     CmdHF14AMfDbg,      IfPm3Present,    "Set default debug mode"},
+    {"des-auth", CmdHF14AMfDESAuth,  IfPm3Present,    "Desfire Authentication"},
+    {"ev1-auth", CmdHF14AMfAESAuth,  IfPm3Present,    "EV1 Authentication"},
+    {NULL, NULL, NULL, NULL}
 };
 
 static int CmdHelp(const char *Cmd) {
diff --git a/client/cmdhfmfp.c b/client/cmdhfmfp.c
index 6552f8713..3474a12ae 100644
--- a/client/cmdhfmfp.c
+++ b/client/cmdhfmfp.c
@@ -839,17 +839,17 @@ static int CmdHFMFPNDEF(const char *cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",             CmdHelp,                 1, "This help"},
-    {"info",             CmdHFMFPInfo,            0, "Info about Mifare Plus tag"},
-    {"wrp",              CmdHFMFPWritePerso,      0, "Write Perso command"},
-    {"initp",            CmdHFMFPInitPerso,       0, "Fills all the card's keys"},
-    {"commitp",          CmdHFMFPCommitPerso,     0, "Move card to SL1 or SL3 mode"},
-    {"auth",             CmdHFMFPAuth,            0, "Authentication"},
-    {"rdbl",             CmdHFMFPRdbl,            0, "Read blocks"},
-    {"rdsc",             CmdHFMFPRdsc,            0, "Read sectors"},
-    {"wrbl",             CmdHFMFPWrbl,            0, "Write blocks"},
-    {"mad",              CmdHFMFPMAD,             0, "Checks and prints MAD"},
-    {"ndef",             CmdHFMFPNDEF,            0, "Prints NDEF records from card"},
+    {"help",             CmdHelp,                 AlwaysAvailable, "This help"},
+    {"info",             CmdHFMFPInfo,            IfPm3Present,    "Info about Mifare Plus tag"},
+    {"wrp",              CmdHFMFPWritePerso,      IfPm3Present,    "Write Perso command"},
+    {"initp",            CmdHFMFPInitPerso,       IfPm3Present,    "Fills all the card's keys"},
+    {"commitp",          CmdHFMFPCommitPerso,     IfPm3Present,    "Move card to SL1 or SL3 mode"},
+    {"auth",             CmdHFMFPAuth,            IfPm3Present,    "Authentication"},
+    {"rdbl",             CmdHFMFPRdbl,            IfPm3Present,    "Read blocks"},
+    {"rdsc",             CmdHFMFPRdsc,            IfPm3Present,    "Read sectors"},
+    {"wrbl",             CmdHFMFPWrbl,            IfPm3Present,    "Write blocks"},
+    {"mad",              CmdHFMFPMAD,             IfPm3Present,    "Checks and prints MAD"},
+    {"ndef",             CmdHFMFPNDEF,            IfPm3Present,    "Prints NDEF records from card"},
     {NULL,               NULL,                    0, NULL}
 };
 
diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index 3246960d6..5b30e2259 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -2699,21 +2699,21 @@ static int CmdHF14AMfUPwdGen(const char *Cmd) {
 // Menu Stuff
 //------------------------------------
 static command_t CommandTable[] = {
-    {"help",    CmdHelp,            1, "This help"},
-    {"dbg",     CmdHF14AMfDbg,      0, "Set default debug mode"},
-    {"info",    CmdHF14AMfUInfo,    0, "Tag information"},
-    {"dump",    CmdHF14AMfUDump,    0, "Dump Ultralight / Ultralight-C / NTAG tag to binary file"},
-    {"restore", CmdHF14AMfURestore, 0, "Restore a dump onto a MFU MAGIC tag"},
-    {"eload",   CmdHF14AMfUeLoad,   0, "load Ultralight .eml dump file into emulator memory"},
-    {"rdbl",    CmdHF14AMfURdBl,    0, "Read block"},
-    {"wrbl",    CmdHF14AMfUWrBl,    0, "Write block"},
-    {"cauth",   CmdHF14AMfUCAuth,   0, "Authentication    - Ultralight C"},
-    {"setpwd",  CmdHF14AMfUCSetPwd, 0, "Set 3des password - Ultralight-C"},
-    {"setuid",  CmdHF14AMfUCSetUid, 0, "Set UID - MAGIC tags only"},
-    {"sim",     CmdHF14AMfUSim,     0, "Simulate Ultralight from emulator memory"},
-    {"gen",     CmdHF14AMfUGenDiverseKeys, 1, "Generate 3des mifare diversified keys"},
-    {"pwdgen",  CmdHF14AMfUPwdGen,  1, "Generate pwd from known algos"},
-    {NULL, NULL, 0, NULL}
+    {"help",    CmdHelp,            AlwaysAvailable, "This help"},
+    {"dbg",     CmdHF14AMfDbg,      IfPm3Present,    "Set default debug mode"},
+    {"info",    CmdHF14AMfUInfo,    IfPm3Present,    "Tag information"},
+    {"dump",    CmdHF14AMfUDump,    IfPm3Present,    "Dump Ultralight / Ultralight-C / NTAG tag to binary file"},
+    {"restore", CmdHF14AMfURestore, IfPm3Present,    "Restore a dump onto a MFU MAGIC tag"},
+    {"eload",   CmdHF14AMfUeLoad,   IfPm3Present,    "load Ultralight .eml dump file into emulator memory"},
+    {"rdbl",    CmdHF14AMfURdBl,    IfPm3Present,    "Read block"},
+    {"wrbl",    CmdHF14AMfUWrBl,    IfPm3Present,    "Write block"},
+    {"cauth",   CmdHF14AMfUCAuth,   IfPm3Present,    "Authentication    - Ultralight C"},
+    {"setpwd",  CmdHF14AMfUCSetPwd, IfPm3Present,    "Set 3des password - Ultralight-C"},
+    {"setuid",  CmdHF14AMfUCSetUid, IfPm3Present,    "Set UID - MAGIC tags only"},
+    {"sim",     CmdHF14AMfUSim,     IfPm3Present,    "Simulate Ultralight from emulator memory"},
+    {"gen",     CmdHF14AMfUGenDiverseKeys, AlwaysAvailable, "Generate 3des mifare diversified keys"},
+    {"pwdgen",  CmdHF14AMfUPwdGen,  AlwaysAvailable, "Generate pwd from known algos"},
+    {NULL, NULL, NULL, NULL}
 };
 
 static int CmdHelp(const char *Cmd) {
diff --git a/client/cmdhftopaz.c b/client/cmdhftopaz.c
index a87566d23..74705441f 100644
--- a/client/cmdhftopaz.c
+++ b/client/cmdhftopaz.c
@@ -504,12 +504,12 @@ static int CmdHFTopazList(const char *Cmd) {
 static int CmdHelp(const char *Cmd);
 
 static command_t CommandTable[] = {
-    {"help",    CmdHelp,            1, "This help"},
-    {"reader",  CmdHFTopazReader,   0, "Act like a Topaz reader"},
-    {"sim",     CmdHFTopazSim,      0, "<UID> -- Simulate Topaz tag"},
-    {"sniff",   CmdHF14ASniff,      0, "Sniff Topaz reader-tag communication"},
-    {"raw",     CmdHFTopazCmdRaw,   0, "Send raw hex data to tag"},
-    {"list",    CmdHFTopazList,     0, "List Topaz history"},
+    {"help",    CmdHelp,            AlwaysAvailable, "This help"},
+    {"reader",  CmdHFTopazReader,   IfPm3Present,    "Act like a Topaz reader"},
+    {"sim",     CmdHFTopazSim,      IfPm3Present,    "<UID> -- Simulate Topaz tag"},
+    {"sniff",   CmdHF14ASniff,      IfPm3Present,    "Sniff Topaz reader-tag communication"},
+    {"raw",     CmdHFTopazCmdRaw,   IfPm3Present,    "Send raw hex data to tag"},
+    {"list",    CmdHFTopazList,     IfPm3Present,    "List Topaz history"},
     {NULL,      NULL,               0, NULL}
 };
 
diff --git a/client/cmdhw.c b/client/cmdhw.c
index 2a62d3e67..0dece387b 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -462,23 +462,23 @@ static int CmdPingNG(const char *Cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",          CmdHelp,        1, "This help"},
-    {"detectreader",  CmdDetectReader, 0, "['l'|'h'] -- Detect external reader field (option 'l' or 'h' to limit to LF or HF)"},
-    {"fpgaoff",       CmdFPGAOff,     0, "Set FPGA off"},
+    {"help",          CmdHelp,        AlwaysAvailable, "This help"},
+    {"detectreader",  CmdDetectReader, IfPm3Present,    "['l'|'h'] -- Detect external reader field (option 'l' or 'h' to limit to LF or HF)"},
+    {"fpgaoff",       CmdFPGAOff,     IfPm3Present,    "Set FPGA off"},
 #ifdef WITH_LCD
-    {"lcd",           CmdLCD,         0, "<HEX command> <count> -- Send command/data to LCD"},
-    {"lcdreset",      CmdLCDReset,    0, "Hardware reset LCD"},
+    {"lcd",           CmdLCD,         IfPm3Present,    "<HEX command> <count> -- Send command/data to LCD"},
+    {"lcdreset",      CmdLCDReset,    IfPm3Present,    "Hardware reset LCD"},
 #endif
-    {"readmem",       CmdReadmem,     0, "[address] -- Read memory at decimal address from flash"},
-    {"reset",         CmdReset,       0, "Reset the Proxmark3"},
-    {"setlfdivisor",  CmdSetDivisor,  0, "<19 - 255> -- Drive LF antenna at 12Mhz/(divisor+1)"},
-    {"setmux",        CmdSetMux,      0, "<loraw|hiraw|lopkd|hipkd> -- Set the ADC mux to a specific value"},
-    {"tune",          CmdTune,        0, "Measure antenna tuning"},
-    {"version",       CmdVersion,     0, "Show version information about the connected Proxmark3"},
-    {"status",        CmdStatus,      0, "Show runtime status information about the connected Proxmark3"},
-    {"ping",          CmdPing,        0, "Test if the Proxmark3 is responding"},
-    {"pingng",        CmdPingNG,      0, "Test if the Proxmark3 is responsive, using new frame format (experimental)"},
-    {NULL, NULL, 0, NULL}
+    {"readmem",       CmdReadmem,     IfPm3Present,    "[address] -- Read memory at decimal address from flash"},
+    {"reset",         CmdReset,       IfPm3Present,    "Reset the Proxmark3"},
+    {"setlfdivisor",  CmdSetDivisor,  IfPm3Present,    "<19 - 255> -- Drive LF antenna at 12Mhz/(divisor+1)"},
+    {"setmux",        CmdSetMux,      IfPm3Present,    "<loraw|hiraw|lopkd|hipkd> -- Set the ADC mux to a specific value"},
+    {"tune",          CmdTune,        IfPm3Present,    "Measure antenna tuning"},
+    {"version",       CmdVersion,     IfPm3Present,    "Show version information about the connected Proxmark3"},
+    {"status",        CmdStatus,      IfPm3Present,    "Show runtime status information about the connected Proxmark3"},
+    {"ping",          CmdPing,        IfPm3Present,    "Test if the Proxmark3 is responding"},
+    {"pingng",        CmdPingNG,      IfPm3Present,    "Test if the Proxmark3 is responsive, using new frame format (experimental)"},
+    {NULL, NULL, NULL, NULL}
 };
 
 static int CmdHelp(const char *Cmd) {
diff --git a/client/cmdlf.c b/client/cmdlf.c
index 7725dc327..cf607f2e4 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -949,46 +949,46 @@ out:
 }
 
 static command_t CommandTable[] = {
-    {"help",        CmdHelp,            1, "This help"},
-    {"awid",        CmdLFAWID,          1, "{ AWID RFIDs...              }"},
-    {"cotag",       CmdLFCOTAG,         1, "{ COTAG CHIPs...             }"},
-    {"em",          CmdLFEM4X,          1, "{ EM4X CHIPs & RFIDs...      }"},
-    {"fdx",         CmdLFFdx,           1, "{ FDX-B RFIDs...             }"},
-    {"gproxii",     CmdLFGuard,         1, "{ Guardall Prox II RFIDs...  }"},
-    {"hid",         CmdLFHID,           1, "{ HID RFIDs...               }"},
+    {"help",        CmdHelp,            AlwaysAvailable, "This help"},
+    {"awid",        CmdLFAWID,          AlwaysAvailable, "{ AWID RFIDs...              }"},
+    {"cotag",       CmdLFCOTAG,         AlwaysAvailable, "{ COTAG CHIPs...             }"},
+    {"em",          CmdLFEM4X,          AlwaysAvailable, "{ EM4X CHIPs & RFIDs...      }"},
+    {"fdx",         CmdLFFdx,           AlwaysAvailable, "{ FDX-B RFIDs...             }"},
+    {"gproxii",     CmdLFGuard,         AlwaysAvailable, "{ Guardall Prox II RFIDs...  }"},
+    {"hid",         CmdLFHID,           AlwaysAvailable, "{ HID RFIDs...               }"},
 #ifdef WITH_HITAG
-    {"hitag",       CmdLFHitag,         1, "{ Hitag CHIPs...             }"},
+    {"hitag",       CmdLFHitag,         AlwaysAvailable, "{ Hitag CHIPs...             }"},
 #endif
-    {"indala",      CmdLFINDALA,        1, "{ Indala RFIDs...            }"},
-    {"io",          CmdLFIO,            1, "{ ioProx RFIDs...            }"},
-    {"jablotron",   CmdLFJablotron,     1, "{ Jablotron RFIDs...         }"},
-    {"keri",        CmdLFKeri,          1, "{ KERI RFIDs...              }"},
-    {"nedap",       CmdLFNedap,         1, "{ Nedap RFIDs...             }"},
-    {"nexwatch",    CmdLFNEXWATCH,      1, "{ NexWatch RFIDs...          }"},
-    {"noralsy",     CmdLFNoralsy,       1, "{ Noralsy RFIDs...           }"},
-    {"pac",         CmdLFPac,           1, "{ PAC/Stanley RFIDs...       }"},
-    {"paradox",     CmdLFParadox,       1, "{ Paradox RFIDs...           }"},
-    {"pcf7931",     CmdLFPCF7931,       1, "{ PCF7931 CHIPs...           }"},
-    {"presco",      CmdLFPresco,        1, "{ Presco RFIDs...            }"},
-    {"pyramid",     CmdLFPyramid,       1, "{ Farpointe/Pyramid RFIDs... }"},
-    {"securakey",   CmdLFSecurakey,     1, "{ Securakey RFIDs...         }"},
-    {"ti",          CmdLFTI,            1, "{ TI CHIPs...                }"},
-    {"t55xx",       CmdLFT55XX,         1, "{ T55xx CHIPs...             }"},
-    {"viking",      CmdLFViking,        1, "{ Viking RFIDs...            }"},
-    {"visa2000",    CmdLFVisa2k,        1, "{ Visa2000 RFIDs...          }"},
-    {"config",      CmdLFSetConfig,     0, "Set config for LF sampling, bit/sample, decimation, frequency"},
-    {"cmdread",     CmdLFCommandRead,   0, "<off period> <'0' period> <'1' period> <command> ['h' 134] \n\t\t-- Modulate LF reader field to send command before read (all periods in microseconds)"},
-    {"flexdemod",   CmdFlexdemod,       1, "Demodulate samples for FlexPass"},
-    {"read",        CmdLFRead,          0, "['s' silent] Read 125/134 kHz LF ID-only tag. Do 'lf read h' for help"},
-    {"search",      CmdLFfind,          1, "[offline] ['u'] Read and Search for valid known tag (in offline mode it you can load first then search) \n\t\t-- 'u' to search for unknown tags"},
-    {"sim",         CmdLFSim,           0, "[GAP] -- Simulate LF tag from buffer with optional GAP (in microseconds)"},
-    {"simask",      CmdLFaskSim,        0, "[clock] [invert <1|0>] [biphase/manchester/raw <'b'|'m'|'r'>] [msg separator 's'] [d <hexdata>] \n\t\t-- Simulate LF ASK tag from demodbuffer or input"},
-    {"simfsk",      CmdLFfskSim,        0, "[c <clock>] [i] [H <fcHigh>] [L <fcLow>] [d <hexdata>] \n\t\t-- Simulate LF FSK tag from demodbuffer or input"},
-    {"simpsk",      CmdLFpskSim,        0, "[1|2|3] [c <clock>] [i] [r <carrier>] [d <raw hex to sim>] \n\t\t-- Simulate LF PSK tag from demodbuffer or input"},
-    {"simbidir",    CmdLFSimBidir,      0, "Simulate LF tag (with bidirectional data transmission between reader and tag)"},
-    {"sniff",       CmdLFSniff,         0, "Sniff LF traffic between reader and tag"},
-    {"vchdemod",    CmdVchDemod,        1, "['clone'] -- Demodulate samples for VeriChip"},
-    {NULL, NULL, 0, NULL}
+    {"indala",      CmdLFINDALA,        AlwaysAvailable, "{ Indala RFIDs...            }"},
+    {"io",          CmdLFIO,            AlwaysAvailable, "{ ioProx RFIDs...            }"},
+    {"jablotron",   CmdLFJablotron,     AlwaysAvailable, "{ Jablotron RFIDs...         }"},
+    {"keri",        CmdLFKeri,          AlwaysAvailable, "{ KERI RFIDs...              }"},
+    {"nedap",       CmdLFNedap,         AlwaysAvailable, "{ Nedap RFIDs...             }"},
+    {"nexwatch",    CmdLFNEXWATCH,      AlwaysAvailable, "{ NexWatch RFIDs...          }"},
+    {"noralsy",     CmdLFNoralsy,       AlwaysAvailable, "{ Noralsy RFIDs...           }"},
+    {"pac",         CmdLFPac,           AlwaysAvailable, "{ PAC/Stanley RFIDs...       }"},
+    {"paradox",     CmdLFParadox,       AlwaysAvailable, "{ Paradox RFIDs...           }"},
+    {"pcf7931",     CmdLFPCF7931,       AlwaysAvailable, "{ PCF7931 CHIPs...           }"},
+    {"presco",      CmdLFPresco,        AlwaysAvailable, "{ Presco RFIDs...            }"},
+    {"pyramid",     CmdLFPyramid,       AlwaysAvailable, "{ Farpointe/Pyramid RFIDs... }"},
+    {"securakey",   CmdLFSecurakey,     AlwaysAvailable, "{ Securakey RFIDs...         }"},
+    {"ti",          CmdLFTI,            AlwaysAvailable, "{ TI CHIPs...                }"},
+    {"t55xx",       CmdLFT55XX,         AlwaysAvailable, "{ T55xx CHIPs...             }"},
+    {"viking",      CmdLFViking,        AlwaysAvailable, "{ Viking RFIDs...            }"},
+    {"visa2000",    CmdLFVisa2k,        AlwaysAvailable, "{ Visa2000 RFIDs...          }"},
+    {"config",      CmdLFSetConfig,     IfPm3Present,    "Set config for LF sampling, bit/sample, decimation, frequency"},
+    {"cmdread",     CmdLFCommandRead,   IfPm3Present,    "<off period> <'0' period> <'1' period> <command> ['h' 134] \n\t\t-- Modulate LF reader field to send command before read (all periods in microseconds)"},
+    {"flexdemod",   CmdFlexdemod,       AlwaysAvailable, "Demodulate samples for FlexPass"},
+    {"read",        CmdLFRead,          IfPm3Present,    "['s' silent] Read 125/134 kHz LF ID-only tag. Do 'lf read h' for help"},
+    {"search",      CmdLFfind,          AlwaysAvailable, "[offline] ['u'] Read and Search for valid known tag (in offline mode it you can load first then search) \n\t\t-- 'u' to search for unknown tags"},
+    {"sim",         CmdLFSim,           IfPm3Present,    "[GAP] -- Simulate LF tag from buffer with optional GAP (in microseconds)"},
+    {"simask",      CmdLFaskSim,        IfPm3Present,    "[clock] [invert <1|0>] [biphase/manchester/raw <'b'|'m'|'r'>] [msg separator 's'] [d <hexdata>] \n\t\t-- Simulate LF ASK tag from demodbuffer or input"},
+    {"simfsk",      CmdLFfskSim,        IfPm3Present,    "[c <clock>] [i] [H <fcHigh>] [L <fcLow>] [d <hexdata>] \n\t\t-- Simulate LF FSK tag from demodbuffer or input"},
+    {"simpsk",      CmdLFpskSim,        IfPm3Present,    "[1|2|3] [c <clock>] [i] [r <carrier>] [d <raw hex to sim>] \n\t\t-- Simulate LF PSK tag from demodbuffer or input"},
+    {"simbidir",    CmdLFSimBidir,      IfPm3Present,    "Simulate LF tag (with bidirectional data transmission between reader and tag)"},
+    {"sniff",       CmdLFSniff,         IfPm3Present,    "Sniff LF traffic between reader and tag"},
+    {"vchdemod",    CmdVchDemod,        AlwaysAvailable, "['clone'] -- Demodulate samples for VeriChip"},
+    {NULL, NULL, NULL, NULL}
 };
 
 int CmdLF(const char *Cmd) {
diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c
index fc57e9597..abecb6791 100644
--- a/client/cmdlfawid.c
+++ b/client/cmdlfawid.c
@@ -491,13 +491,13 @@ static int CmdAWIDBrute(const char *Cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",    CmdHelp,        1, "this help"},
-    {"demod",   CmdAWIDDemod,   0, "demodulate an AWID FSK tag from the GraphBuffer"},
-    {"read",    CmdAWIDRead,    0, "attempt to read and extract tag data"},
-    {"clone",   CmdAWIDClone,   0, "clone AWID to T55x7"},
-    {"sim",     CmdAWIDSim,     0, "simulate AWID tag"},
-    {"brute",   CmdAWIDBrute,   0, "Bruteforce card number against reader"},
-    {NULL, NULL, 0, NULL}
+    {"help",    CmdHelp,        AlwaysAvailable, "this help"},
+    {"demod",   CmdAWIDDemod,   IfPm3Present,    "demodulate an AWID FSK tag from the GraphBuffer"},
+    {"read",    CmdAWIDRead,    IfPm3Present,    "attempt to read and extract tag data"},
+    {"clone",   CmdAWIDClone,   IfPm3Present,    "clone AWID to T55x7"},
+    {"sim",     CmdAWIDSim,     IfPm3Present,    "simulate AWID tag"},
+    {"brute",   CmdAWIDBrute,   IfPm3Present,    "Bruteforce card number against reader"},
+    {NULL, NULL, NULL, NULL}
 };
 
 static int CmdHelp(const char *Cmd) {
diff --git a/client/cmdlfcotag.c b/client/cmdlfcotag.c
index 79a259b79..2bb92f32a 100644
--- a/client/cmdlfcotag.c
+++ b/client/cmdlfcotag.c
@@ -103,10 +103,10 @@ static int CmdCOTAGRead(const char *Cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",      CmdHelp,         1, "This help"},
-    {"demod",     CmdCOTAGDemod,   1, "Tries to decode a COTAG signal"},
-    {"read",      CmdCOTAGRead,    0, "Attempt to read and extract tag data"},
-    {NULL, NULL, 0, NULL}
+    {"help",      CmdHelp,         AlwaysAvailable, "This help"},
+    {"demod",     CmdCOTAGDemod,   AlwaysAvailable, "Tries to decode a COTAG signal"},
+    {"read",      CmdCOTAGRead,    IfPm3Present,    "Attempt to read and extract tag data"},
+    {NULL, NULL, NULL, NULL}
 };
 
 static int CmdHelp(const char *Cmd) {
diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 12c7447a4..be00d01ba 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -1464,23 +1464,23 @@ static int CmdEM4x05Info(const char *Cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",        CmdHelp,              1, "This help"},
+    {"help",        CmdHelp,              AlwaysAvailable, "This help"},
     //{"410x_demod",  CmdEMdemodASK,        0, "Extract ID from EM410x tag on antenna)"},
-    {"410x_demod",  CmdEM410xDemod,       1, "demodulate a EM410x tag from the GraphBuffer"},
-    {"410x_read",   CmdEM410xRead,        0, "attempt to read and extract tag data"},
-    {"410x_sim",    CmdEM410xSim,         0, "simulate EM410x tag"},
-    {"410x_brute",  CmdEM410xBrute,       0, "reader bruteforce attack by simulating EM410x tags"},
-    {"410x_watch",  CmdEM410xWatch,       0, "watches for EM410x 125/134 kHz tags (option 'h' for 134)"},
-    {"410x_spoof",  CmdEM410xWatchnSpoof, 0, "watches for EM410x 125/134 kHz tags, and replays them. (option 'h' for 134)" },
-    {"410x_write",  CmdEM410xWrite,       0, "write EM410x UID to T5555(Q5) or T55x7 tag"},
-    {"4x05_dump",   CmdEM4x05Dump,        0, "dump EM4x05/EM4x69 tag"},
-    {"4x05_info",   CmdEM4x05Info,        0, "tag information EM4x05/EM4x69"},
-    {"4x05_read",   CmdEM4x05Read,        0, "read word data from EM4x05/EM4x69"},
-    {"4x05_write",  CmdEM4x05Write,       0, "write word data to EM4x05/EM4x69"},
-    {"4x50_dump",   CmdEM4x50Dump,        0, "dump EM4x50 tag"},
-    {"4x50_read",   CmdEM4x50Read,        0, "read word data from EM4x50"},
-    {"4x50_write",  CmdEM4x50Write,       0, "write word data to EM4x50"},
-    {NULL, NULL, 0, NULL}
+    {"410x_demod",  CmdEM410xDemod,       AlwaysAvailable, "demodulate a EM410x tag from the GraphBuffer"},
+    {"410x_read",   CmdEM410xRead,        IfPm3Present,    "attempt to read and extract tag data"},
+    {"410x_sim",    CmdEM410xSim,         IfPm3Present,    "simulate EM410x tag"},
+    {"410x_brute",  CmdEM410xBrute,       IfPm3Present,    "reader bruteforce attack by simulating EM410x tags"},
+    {"410x_watch",  CmdEM410xWatch,       IfPm3Present,    "watches for EM410x 125/134 kHz tags (option 'h' for 134)"},
+    {"410x_spoof",  CmdEM410xWatchnSpoof, IfPm3Present,    "watches for EM410x 125/134 kHz tags, and replays them. (option 'h' for 134)" },
+    {"410x_write",  CmdEM410xWrite,       IfPm3Present,    "write EM410x UID to T5555(Q5) or T55x7 tag"},
+    {"4x05_dump",   CmdEM4x05Dump,        IfPm3Present,    "dump EM4x05/EM4x69 tag"},
+    {"4x05_info",   CmdEM4x05Info,        IfPm3Present,    "tag information EM4x05/EM4x69"},
+    {"4x05_read",   CmdEM4x05Read,        IfPm3Present,    "read word data from EM4x05/EM4x69"},
+    {"4x05_write",  CmdEM4x05Write,       IfPm3Present,    "write word data to EM4x05/EM4x69"},
+    {"4x50_dump",   CmdEM4x50Dump,        IfPm3Present,    "dump EM4x50 tag"},
+    {"4x50_read",   CmdEM4x50Read,        IfPm3Present,    "read word data from EM4x50"},
+    {"4x50_write",  CmdEM4x50Write,       IfPm3Present,    "write word data to EM4x50"},
+    {NULL, NULL, NULL, NULL}
 };
 
 static int CmdHelp(const char *Cmd) {
diff --git a/client/cmdlffdx.c b/client/cmdlffdx.c
index e2a627aae..48155e867 100644
--- a/client/cmdlffdx.c
+++ b/client/cmdlffdx.c
@@ -320,12 +320,12 @@ static int CmdFdxSim(const char *Cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",    CmdHelp,    1, "this help"},
-    {"demod",   CmdFdxDemod, 1, "demodulate a FDX-B ISO11784/85 tag from the GraphBuffer"},
-    {"read",    CmdFdxRead, 0, "attempt to read and extract tag data"},
-    {"clone",   CmdFdxClone, 0, "clone animal ID tag to T55x7 (or to q5/T5555)"},
-    {"sim",     CmdFdxSim,  0, "simulate Animal ID tag"},
-    {NULL, NULL, 0, NULL}
+    {"help",    CmdHelp,    AlwaysAvailable, "this help"},
+    {"demod",   CmdFdxDemod, AlwaysAvailable, "demodulate a FDX-B ISO11784/85 tag from the GraphBuffer"},
+    {"read",    CmdFdxRead, IfPm3Present,    "attempt to read and extract tag data"},
+    {"clone",   CmdFdxClone, IfPm3Present,    "clone animal ID tag to T55x7 (or to q5/T5555)"},
+    {"sim",     CmdFdxSim,  IfPm3Present,    "simulate Animal ID tag"},
+    {NULL, NULL, NULL, NULL}
 };
 
 static int CmdHelp(const char *Cmd) {
diff --git a/client/cmdlfguard.c b/client/cmdlfguard.c
index 8dfa9dddb..663311bbb 100644
--- a/client/cmdlfguard.c
+++ b/client/cmdlfguard.c
@@ -215,12 +215,12 @@ static int CmdGuardSim(const char *Cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",    CmdHelp,        1, "this help"},
-    {"demod",   CmdGuardDemod,  1, "demodulate a G Prox II tag from the GraphBuffer"},
-    {"read",    CmdGuardRead,   0, "attempt to read and extract tag data from the antenna"},
-    {"clone",   CmdGuardClone,  0, "clone Guardall tag"},
-    {"sim",     CmdGuardSim,    0, "simulate Guardall tag"},
-    {NULL, NULL, 0, NULL}
+    {"help",    CmdHelp,        AlwaysAvailable, "this help"},
+    {"demod",   CmdGuardDemod,  AlwaysAvailable, "demodulate a G Prox II tag from the GraphBuffer"},
+    {"read",    CmdGuardRead,   IfPm3Present,    "attempt to read and extract tag data from the antenna"},
+    {"clone",   CmdGuardClone,  IfPm3Present,    "clone Guardall tag"},
+    {"sim",     CmdGuardSim,    IfPm3Present,    "simulate Guardall tag"},
+    {NULL, NULL, NULL, NULL}
 };
 
 static int CmdHelp(const char *Cmd) {
diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c
index 857d79adb..a92f1fc00 100644
--- a/client/cmdlfhid.c
+++ b/client/cmdlfhid.c
@@ -594,14 +594,14 @@ static int CmdHIDBrute(const char *Cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",    CmdHelp,        1, "this help"},
-    {"demod",   CmdHIDDemod,    0, "demodulate HID Prox tag from the GraphBuffer"},
-    {"read",    CmdHIDRead,     0, "attempt to read and extract tag data"},
-    {"clone",   CmdHIDClone,    0, "clone HID to T55x7"},
-    {"sim",     CmdHIDSim,      0, "simulate HID tag"},
-    {"wiegand", CmdHIDWiegand,  1, "convert facility code/card number to Wiegand code"},
-    {"brute",   CmdHIDBrute,    0, "bruteforce card number against reader"},
-    {NULL, NULL, 0, NULL}
+    {"help",    CmdHelp,        AlwaysAvailable, "this help"},
+    {"demod",   CmdHIDDemod,    IfPm3Present,    "demodulate HID Prox tag from the GraphBuffer"},
+    {"read",    CmdHIDRead,     IfPm3Present,    "attempt to read and extract tag data"},
+    {"clone",   CmdHIDClone,    IfPm3Present,    "clone HID to T55x7"},
+    {"sim",     CmdHIDSim,      IfPm3Present,    "simulate HID tag"},
+    {"wiegand", CmdHIDWiegand,  AlwaysAvailable, "convert facility code/card number to Wiegand code"},
+    {"brute",   CmdHIDBrute,    IfPm3Present,    "bruteforce card number against reader"},
+    {NULL, NULL, NULL, NULL}
 };
 
 static int CmdHelp(const char *Cmd) {
diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index a7e2aee26..87b3cad1d 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -694,14 +694,14 @@ static int CmdLFHitagDump(const char *Cmd) {
 */
 
 static command_t CommandTable[] = {
-    {"help",     CmdHelp,                   1, "This help" },
-    {"list",     CmdLFHitagList,            0, "List Hitag trace history" },
-    {"info",     CmdLFHitagInfo,            1, "Tag information" },
-    {"reader",   CmdLFHitagReader,          1, "Act like a Hitag Reader" },
-    {"sim",      CmdLFHitagSim,             1, "Simulate Hitag transponder" },
-    {"sniff",    CmdLFHitagSniff,           1, "Eavesdrop Hitag communication" },
-    {"writer",   CmdLFHitagWriter,          1, "Act like a Hitag Writer" },
-    {"cc",       CmdLFHitagCheckChallenges, 1, "Test all challenges" },
+    {"help",     CmdHelp,                   AlwaysAvailable, "This help" },
+    {"list",     CmdLFHitagList,            IfPm3Present,    "List Hitag trace history" },
+    {"info",     CmdLFHitagInfo,            AlwaysAvailable, "Tag information" },
+    {"reader",   CmdLFHitagReader,          AlwaysAvailable, "Act like a Hitag Reader" },
+    {"sim",      CmdLFHitagSim,             AlwaysAvailable, "Simulate Hitag transponder" },
+    {"sniff",    CmdLFHitagSniff,           AlwaysAvailable, "Eavesdrop Hitag communication" },
+    {"writer",   CmdLFHitagWriter,          AlwaysAvailable, "Act like a Hitag Writer" },
+    {"cc",       CmdLFHitagCheckChallenges, AlwaysAvailable, "Test all challenges" },
     { NULL, NULL, 0, NULL }
 };
 
diff --git a/client/cmdlfindala.c b/client/cmdlfindala.c
index 10cf0c916..bedf18cb6 100644
--- a/client/cmdlfindala.c
+++ b/client/cmdlfindala.c
@@ -457,13 +457,13 @@ static int CmdIndalaClone(const char *Cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",     CmdHelp,            1, "this help"},
-    {"demod",    CmdIndalaDemod,     1, "demodulate an indala tag (PSK1) from GraphBuffer"},
-    {"altdemod", CmdIndalaDemodAlt,  1, "alternative method to Demodulate samples for Indala 64 bit UID (option '224' for 224 bit)"},
-    {"read",     CmdIndalaRead,      0, "read an Indala Prox tag from the antenna"},
-    {"clone",    CmdIndalaClone,     0, "clone Indala to T55x7"},
-    {"sim",      CmdIndalaSim,       0, "simulate Indala tag"},
-    {NULL, NULL, 0, NULL}
+    {"help",     CmdHelp,            AlwaysAvailable, "this help"},
+    {"demod",    CmdIndalaDemod,     AlwaysAvailable, "demodulate an indala tag (PSK1) from GraphBuffer"},
+    {"altdemod", CmdIndalaDemodAlt,  AlwaysAvailable, "alternative method to Demodulate samples for Indala 64 bit UID (option '224' for 224 bit)"},
+    {"read",     CmdIndalaRead,      IfPm3Present,    "read an Indala Prox tag from the antenna"},
+    {"clone",    CmdIndalaClone,     IfPm3Present,    "clone Indala to T55x7"},
+    {"sim",      CmdIndalaSim,       IfPm3Present,    "simulate Indala tag"},
+    {NULL, NULL, NULL, NULL}
 };
 
 static int CmdHelp(const char *Cmd) {
diff --git a/client/cmdlfio.c b/client/cmdlfio.c
index 6e60f8728..17b6c70b8 100644
--- a/client/cmdlfio.c
+++ b/client/cmdlfio.c
@@ -257,12 +257,12 @@ static int CmdIOProxClone(const char *Cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",    CmdHelp,        1, "this help"},
-    {"demod",   CmdIOProxDemod, 1, "demodulate an IOProx tag from the GraphBuffer"},
-    {"read",    CmdIOProxRead,  1, "attempt to read and extract tag data"},
-    {"clone",   CmdIOProxClone, 0, "clone IOProx to T55x7"},
-    {"sim",     CmdIOProxSim,   0, "simulate IOProx tag"},
-    {NULL, NULL, 0, NULL}
+    {"help",    CmdHelp,        AlwaysAvailable, "this help"},
+    {"demod",   CmdIOProxDemod, AlwaysAvailable, "demodulate an IOProx tag from the GraphBuffer"},
+    {"read",    CmdIOProxRead,  AlwaysAvailable, "attempt to read and extract tag data"},
+    {"clone",   CmdIOProxClone, IfPm3Present,    "clone IOProx to T55x7"},
+    {"sim",     CmdIOProxSim,   IfPm3Present,    "simulate IOProx tag"},
+    {NULL, NULL, NULL, NULL}
 };
 
 static int CmdHelp(const char *Cmd) {
diff --git a/client/cmdlfjablotron.c b/client/cmdlfjablotron.c
index cf5230f19..2d69dfff4 100644
--- a/client/cmdlfjablotron.c
+++ b/client/cmdlfjablotron.c
@@ -193,12 +193,12 @@ static int CmdJablotronSim(const char *Cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",    CmdHelp,            1, "This help"},
-    {"demod",   CmdJablotronDemod,  1, "Demodulate an Jablotron tag from the GraphBuffer"},
-    {"read",    CmdJablotronRead,   0, "Attempt to read and extract tag data from the antenna"},
-    {"clone",   CmdJablotronClone,  0, "clone jablotron tag"},
-    {"sim",     CmdJablotronSim,    0, "simulate jablotron tag"},
-    {NULL, NULL, 0, NULL}
+    {"help",    CmdHelp,            AlwaysAvailable, "This help"},
+    {"demod",   CmdJablotronDemod,  AlwaysAvailable, "Demodulate an Jablotron tag from the GraphBuffer"},
+    {"read",    CmdJablotronRead,   IfPm3Present,    "Attempt to read and extract tag data from the antenna"},
+    {"clone",   CmdJablotronClone,  IfPm3Present,    "clone jablotron tag"},
+    {"sim",     CmdJablotronSim,    IfPm3Present,    "simulate jablotron tag"},
+    {NULL, NULL, NULL, NULL}
 };
 
 static int CmdHelp(const char *Cmd) {
diff --git a/client/cmdlfkeri.c b/client/cmdlfkeri.c
index 055eb1a4b..5e03aaa75 100644
--- a/client/cmdlfkeri.c
+++ b/client/cmdlfkeri.c
@@ -188,12 +188,12 @@ static int CmdKeriSim(const char *Cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",  CmdHelp,      1, "This help"},
-    {"demod", CmdKeriDemod, 1, "Demodulate an KERI tag from the GraphBuffer"},
-    {"read",  CmdKeriRead,  0, "Attempt to read and extract tag data from the antenna"},
-    {"clone", CmdKeriClone, 0, "clone KERI to T55x7"},
-    {"sim",   CmdKeriSim,   0, "simulate KERI tag"},
-    {NULL, NULL, 0, NULL}
+    {"help",  CmdHelp,      AlwaysAvailable, "This help"},
+    {"demod", CmdKeriDemod, AlwaysAvailable, "Demodulate an KERI tag from the GraphBuffer"},
+    {"read",  CmdKeriRead,  IfPm3Present,    "Attempt to read and extract tag data from the antenna"},
+    {"clone", CmdKeriClone, IfPm3Present,    "clone KERI to T55x7"},
+    {"sim",   CmdKeriSim,   IfPm3Present,    "simulate KERI tag"},
+    {NULL, NULL, NULL, NULL}
 };
 
 static int CmdHelp(const char *Cmd) {
diff --git a/client/cmdlfnedap.c b/client/cmdlfnedap.c
index 2d95fa008..035c40919 100644
--- a/client/cmdlfnedap.c
+++ b/client/cmdlfnedap.c
@@ -294,13 +294,13 @@ static int CmdLFNedapChk(const char *Cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",    CmdHelp,        1, "this help"},
-    {"demod",   CmdLFNedapDemod, 0, "demodulate an Nedap tag from the GraphBuffer"},
-    {"read",    CmdLFNedapRead, 0, "attempt to read and extract tag data"},
+    {"help",    CmdHelp,        AlwaysAvailable, "this help"},
+    {"demod",   CmdLFNedapDemod, IfPm3Present,    "demodulate an Nedap tag from the GraphBuffer"},
+    {"read",    CmdLFNedapRead, IfPm3Present,    "attempt to read and extract tag data"},
 //  {"clone",   CmdLFNedapClone,0, "<Card Number>  clone nedap tag"},
-    {"sim",     CmdLFNedapSim,  0, "simulate nedap tag"},
-    {"chk",     CmdLFNedapChk,  1, "calculate Nedap Checksum <uid bytes>"},
-    {NULL, NULL, 0, NULL}
+    {"sim",     CmdLFNedapSim,  IfPm3Present,    "simulate nedap tag"},
+    {"chk",     CmdLFNedapChk,  AlwaysAvailable, "calculate Nedap Checksum <uid bytes>"},
+    {NULL, NULL, NULL, NULL}
 };
 
 static int CmdHelp(const char *Cmd) {
diff --git a/client/cmdlfnexwatch.c b/client/cmdlfnexwatch.c
index 6adc3bc1a..aeb85974d 100644
--- a/client/cmdlfnexwatch.c
+++ b/client/cmdlfnexwatch.c
@@ -75,10 +75,10 @@ static int CmdNexWatchRead(const char *Cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",  CmdHelp,          1, "This help"},
-    {"demod", CmdNexWatchDemod, 1, "Demodulate a NexWatch tag (nexkey, quadrakey) from the GraphBuffer"},
-    {"read",  CmdNexWatchRead,  0, "Attempt to Read and Extract tag data from the antenna"},
-    {NULL, NULL, 0, NULL}
+    {"help",  CmdHelp,          AlwaysAvailable, "This help"},
+    {"demod", CmdNexWatchDemod, AlwaysAvailable, "Demodulate a NexWatch tag (nexkey, quadrakey) from the GraphBuffer"},
+    {"read",  CmdNexWatchRead,  IfPm3Present,    "Attempt to Read and Extract tag data from the antenna"},
+    {NULL, NULL, NULL, NULL}
 };
 
 static int CmdHelp(const char *Cmd) {
diff --git a/client/cmdlfnoralsy.c b/client/cmdlfnoralsy.c
index 227237936..4ebe7adc6 100644
--- a/client/cmdlfnoralsy.c
+++ b/client/cmdlfnoralsy.c
@@ -196,12 +196,12 @@ static int CmdNoralsySim(const char *Cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",    CmdHelp,        1, "This help"},
-    {"demod",   CmdNoralsyDemod, 1, "Demodulate an Noralsy tag from the GraphBuffer"},
-    {"read",    CmdNoralsyRead, 0, "Attempt to read and extract tag data from the antenna"},
-    {"clone",   CmdNoralsyClone, 0, "clone Noralsy to T55x7"},
-    {"sim",     CmdNoralsySim,  0, "simulate Noralsy tag"},
-    {NULL, NULL, 0, NULL}
+    {"help",    CmdHelp,        AlwaysAvailable, "This help"},
+    {"demod",   CmdNoralsyDemod, AlwaysAvailable, "Demodulate an Noralsy tag from the GraphBuffer"},
+    {"read",    CmdNoralsyRead, IfPm3Present,    "Attempt to read and extract tag data from the antenna"},
+    {"clone",   CmdNoralsyClone, IfPm3Present,    "clone Noralsy to T55x7"},
+    {"sim",     CmdNoralsySim,  IfPm3Present,    "simulate Noralsy tag"},
+    {NULL, NULL, NULL, NULL}
 };
 
 static int CmdHelp(const char *Cmd) {
diff --git a/client/cmdlfpac.c b/client/cmdlfpac.c
index 333269494..7dc637e89 100644
--- a/client/cmdlfpac.c
+++ b/client/cmdlfpac.c
@@ -57,10 +57,10 @@ static int CmdPacRead(const char *Cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",  CmdHelp,    1, "This help"},
-    {"demod", CmdPacDemod, 1, "Demodulate an PAC tag from the GraphBuffer"},
-    {"read",  CmdPacRead, 0, "Attempt to read and extract tag data from the antenna"},
-    {NULL, NULL, 0, NULL}
+    {"help",  CmdHelp,    AlwaysAvailable, "This help"},
+    {"demod", CmdPacDemod, AlwaysAvailable, "Demodulate an PAC tag from the GraphBuffer"},
+    {"read",  CmdPacRead, IfPm3Present,    "Attempt to read and extract tag data from the antenna"},
+    {NULL, NULL, NULL, NULL}
 };
 
 static int CmdHelp(const char *Cmd) {
diff --git a/client/cmdlfparadox.c b/client/cmdlfparadox.c
index 11f295b0c..32bc25c98 100644
--- a/client/cmdlfparadox.c
+++ b/client/cmdlfparadox.c
@@ -142,12 +142,12 @@ static int CmdParadoxSim(const char *Cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",  CmdHelp,          1, "This help"},
-    {"demod", CmdParadoxDemod,  1, "Demodulate a Paradox FSK tag from the GraphBuffer"},
-    {"read",  CmdParadoxRead,   0, "Attempt to read and Extract tag data from the antenna"},
+    {"help",  CmdHelp,          AlwaysAvailable, "This help"},
+    {"demod", CmdParadoxDemod,  AlwaysAvailable, "Demodulate a Paradox FSK tag from the GraphBuffer"},
+    {"read",  CmdParadoxRead,   IfPm3Present,    "Attempt to read and Extract tag data from the antenna"},
 //  {"clone", CmdParadoxClone,  0, "clone paradox tag"},
-    {"sim",   CmdParadoxSim,    0, "simulate paradox tag"},
-    {NULL, NULL, 0, NULL}
+    {"sim",   CmdParadoxSim,    IfPm3Present,    "simulate paradox tag"},
+    {NULL, NULL, NULL, NULL}
 };
 
 static int CmdHelp(const char *Cmd) {
diff --git a/client/cmdlfpcf7931.c b/client/cmdlfpcf7931.c
index ae93cecef..189bc495e 100644
--- a/client/cmdlfpcf7931.c
+++ b/client/cmdlfpcf7931.c
@@ -157,11 +157,11 @@ static int CmdLFPCF7931Write(const char *Cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",   CmdHelp,            1, "This help"},
-    {"read",   CmdLFPCF7931Read,   0, "Read content of a PCF7931 transponder"},
-    {"write",  CmdLFPCF7931Write,  0, "Write data on a PCF7931 transponder."},
-    {"config", CmdLFPCF7931Config, 1, "Configure the password, the tags initialization delay and time offsets (optional)"},
-    {NULL, NULL, 0, NULL}
+    {"help",   CmdHelp,            AlwaysAvailable, "This help"},
+    {"read",   CmdLFPCF7931Read,   IfPm3Present,    "Read content of a PCF7931 transponder"},
+    {"write",  CmdLFPCF7931Write,  IfPm3Present,    "Write data on a PCF7931 transponder."},
+    {"config", CmdLFPCF7931Config, AlwaysAvailable, "Configure the password, the tags initialization delay and time offsets (optional)"},
+    {NULL, NULL, NULL, NULL}
 };
 
 static int CmdHelp(const char *Cmd) {
diff --git a/client/cmdlfpresco.c b/client/cmdlfpresco.c
index 672d8643a..3a6b23722 100644
--- a/client/cmdlfpresco.c
+++ b/client/cmdlfpresco.c
@@ -152,11 +152,11 @@ static int CmdPrescoSim(const char *Cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",    CmdHelp,        1, "This help"},
-    {"read",    CmdPrescoRead,  0, "Attempt to read and Extract tag data"},
-    {"clone",   CmdPrescoClone, 0, "clone presco tag"},
-    {"sim",     CmdPrescoSim,   0, "simulate presco tag"},
-    {NULL, NULL, 0, NULL}
+    {"help",    CmdHelp,        AlwaysAvailable, "This help"},
+    {"read",    CmdPrescoRead,  IfPm3Present,    "Attempt to read and Extract tag data"},
+    {"clone",   CmdPrescoClone, IfPm3Present,    "clone presco tag"},
+    {"sim",     CmdPrescoSim,   IfPm3Present,    "simulate presco tag"},
+    {NULL, NULL, NULL, NULL}
 };
 
 static int CmdHelp(const char *Cmd) {
diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c
index 72f129583..b2bc8e33b 100644
--- a/client/cmdlfpyramid.c
+++ b/client/cmdlfpyramid.c
@@ -276,12 +276,12 @@ static int CmdPyramidSim(const char *Cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",    CmdHelp,        1, "this help"},
-    {"demod",   CmdPyramidDemod, 0, "demodulate a Pyramid FSK tag from the GraphBuffer"},
-    {"read",    CmdPyramidRead, 0, "attempt to read and extract tag data"},
-    {"clone",   CmdPyramidClone, 0, "clone pyramid tag"},
-    {"sim",     CmdPyramidSim,  0, "simulate pyramid tag"},
-    {NULL, NULL, 0, NULL}
+    {"help",    CmdHelp,        AlwaysAvailable, "this help"},
+    {"demod",   CmdPyramidDemod, IfPm3Present,    "demodulate a Pyramid FSK tag from the GraphBuffer"},
+    {"read",    CmdPyramidRead, IfPm3Present,    "attempt to read and extract tag data"},
+    {"clone",   CmdPyramidClone, IfPm3Present,    "clone pyramid tag"},
+    {"sim",     CmdPyramidSim,  IfPm3Present,    "simulate pyramid tag"},
+    {NULL, NULL, NULL, NULL}
 };
 
 int CmdLFPyramid(const char *Cmd) {
diff --git a/client/cmdlfsecurakey.c b/client/cmdlfsecurakey.c
index 23acad670..3629cd9b0 100644
--- a/client/cmdlfsecurakey.c
+++ b/client/cmdlfsecurakey.c
@@ -100,12 +100,12 @@ static int CmdSecurakeyRead(const char *Cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",  CmdHelp,          1, "This help"},
-    {"demod", CmdSecurakeyDemod, 1, "Demodulate an Securakey tag from the GraphBuffer"},
-    {"read",  CmdSecurakeyRead, 0, "Attempt to read and extract tag data from the antenna"},
+    {"help",  CmdHelp,          AlwaysAvailable, "This help"},
+    {"demod", CmdSecurakeyDemod, AlwaysAvailable, "Demodulate an Securakey tag from the GraphBuffer"},
+    {"read",  CmdSecurakeyRead, IfPm3Present,    "Attempt to read and extract tag data from the antenna"},
     //{"clone", CmdSecurakeyClone,0, "clone Securakey tag"},
     //{"sim",   CmdSecurakeydSim, 0, "simulate Securakey tag"},
-    {NULL, NULL, 0, NULL}
+    {NULL, NULL, NULL, NULL}
 };
 
 static int CmdHelp(const char *Cmd) {
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 661d4bdbb..8ec3de2d4 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -2302,24 +2302,24 @@ static int CmdT55xxSetDeviceConfig(const char *Cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",        CmdHelp,                 1, "This help"},
-    {"bruteforce",  CmdT55xxBruteForce,      0, "<start password> <end password> [i <*.dic>] Simple bruteforce attack to find password"},
-    {"config",      CmdT55xxSetConfig,       1, "Set/Get T55XX configuration (modulation, inverted, offset, rate)"},
-    {"chk",         CmdT55xxChkPwds,         1, "Check passwords"},
-    {"detect",      CmdT55xxDetect,          1, "[1] Try detecting the tag modulation from reading the configuration block."},
-    {"deviceconfig", CmdT55xxSetDeviceConfig, 1, "Set/Get T55XX device configuration (startgap, writegap, write0, write1, readgap"},
-    {"p1detect",    CmdT55xxDetectPage1,     1, "[1] Try detecting if this is a t55xx tag by reading page 1"},
-    {"dump",        CmdT55xxDump,            0, "[password] [o] Dump T55xx card block 0-7. Optional [password], [override]"},
-    {"info",        CmdT55xxInfo,            1, "[1] Show T55x7 configuration data (page 0/ blk 0)"},
-    {"read",        CmdT55xxReadBlock,       0, "b <block> p [password] [o] [1] -- Read T55xx block data. Optional [p password], [override], [page1]"},
-    {"resetread",   CmdResetRead,            0, "Send Reset Cmd then lf read the stream to attempt to identify the start of it (needs a demod and/or plot after)"},
-    {"recoverpw",   CmdT55xxRecoverPW,       0, "[password] Try to recover from bad password write from a cloner. Only use on PW protected chips!"},
-    {"special",     special,                 0, "Show block changes with 64 different offsets"},
-    {"trace",       CmdT55xxReadTrace,       1, "[1] Show T55x7 traceability data (page 1/ blk 0-1)"},
-    {"wakeup",      CmdT55xxWakeUp,          0, "Send AOR wakeup command"},
-    {"wipe",        CmdT55xxWipe,            0, "[q] Wipe a T55xx tag and set defaults (will destroy any data on tag)"},
-    {"write",       CmdT55xxWriteBlock,      0, "b <block> d <data> p [password] [1] -- Write T55xx block data. Optional [p password], [page1]"},
-    {NULL, NULL, 0, NULL}
+    {"help",        CmdHelp,                 AlwaysAvailable, "This help"},
+    {"bruteforce",  CmdT55xxBruteForce,      IfPm3Present,    "<start password> <end password> [i <*.dic>] Simple bruteforce attack to find password"},
+    {"config",      CmdT55xxSetConfig,       AlwaysAvailable, "Set/Get T55XX configuration (modulation, inverted, offset, rate)"},
+    {"chk",         CmdT55xxChkPwds,         AlwaysAvailable, "Check passwords"},
+    {"detect",      CmdT55xxDetect,          AlwaysAvailable, "[1] Try detecting the tag modulation from reading the configuration block."},
+    {"deviceconfig", CmdT55xxSetDeviceConfig, AlwaysAvailable, "Set/Get T55XX device configuration (startgap, writegap, write0, write1, readgap"},
+    {"p1detect",    CmdT55xxDetectPage1,     AlwaysAvailable, "[1] Try detecting if this is a t55xx tag by reading page 1"},
+    {"dump",        CmdT55xxDump,            IfPm3Present,    "[password] [o] Dump T55xx card block 0-7. Optional [password], [override]"},
+    {"info",        CmdT55xxInfo,            AlwaysAvailable, "[1] Show T55x7 configuration data (page 0/ blk 0)"},
+    {"read",        CmdT55xxReadBlock,       IfPm3Present,    "b <block> p [password] [o] [1] -- Read T55xx block data. Optional [p password], [override], [page1]"},
+    {"resetread",   CmdResetRead,            IfPm3Present,    "Send Reset Cmd then lf read the stream to attempt to identify the start of it (needs a demod and/or plot after)"},
+    {"recoverpw",   CmdT55xxRecoverPW,       IfPm3Present,    "[password] Try to recover from bad password write from a cloner. Only use on PW protected chips!"},
+    {"special",     special,                 IfPm3Present,    "Show block changes with 64 different offsets"},
+    {"trace",       CmdT55xxReadTrace,       AlwaysAvailable, "[1] Show T55x7 traceability data (page 1/ blk 0-1)"},
+    {"wakeup",      CmdT55xxWakeUp,          IfPm3Present,    "Send AOR wakeup command"},
+    {"wipe",        CmdT55xxWipe,            IfPm3Present,    "[q] Wipe a T55xx tag and set defaults (will destroy any data on tag)"},
+    {"write",       CmdT55xxWriteBlock,      IfPm3Present,    "b <block> d <data> p [password] [1] -- Write T55xx block data. Optional [p password], [page1]"},
+    {NULL, NULL, NULL, NULL}
 };
 
 static int CmdHelp(const char *Cmd) {
diff --git a/client/cmdlfti.c b/client/cmdlfti.c
index 3b12116b6..0889be200 100644
--- a/client/cmdlfti.c
+++ b/client/cmdlfti.c
@@ -299,11 +299,11 @@ static int CmdTIWrite(const char *Cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",      CmdHelp,        1, "This help"},
-    {"demod",     CmdTIDemod,     1, "Demodulate raw bits for TI-type LF tag from the GraphBuffer"},
-    {"read",      CmdTIRead,      0, "Read and decode a TI 134 kHz tag"},
-    {"write",     CmdTIWrite,     0, "Write new data to a r/w TI 134 kHz tag"},
-    {NULL, NULL, 0, NULL}
+    {"help",      CmdHelp,        AlwaysAvailable, "This help"},
+    {"demod",     CmdTIDemod,     AlwaysAvailable, "Demodulate raw bits for TI-type LF tag from the GraphBuffer"},
+    {"read",      CmdTIRead,      IfPm3Present,    "Read and decode a TI 134 kHz tag"},
+    {"write",     CmdTIWrite,     IfPm3Present,    "Write new data to a r/w TI 134 kHz tag"},
+    {NULL, NULL, NULL, NULL}
 };
 
 static int CmdHelp(const char *Cmd) {
diff --git a/client/cmdlfviking.c b/client/cmdlfviking.c
index 66eda8219..3f6e91eae 100644
--- a/client/cmdlfviking.c
+++ b/client/cmdlfviking.c
@@ -121,12 +121,12 @@ static int CmdVikingSim(const char *Cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",    CmdHelp,        1, "This help"},
-    {"demod",   CmdVikingDemod, 1, "Demodulate a Viking tag from the GraphBuffer"},
-    {"read",    CmdVikingRead,  0, "Attempt to read and Extract tag data from the antenna"},
-    {"clone",   CmdVikingClone, 0, "<8 digit ID number> clone viking tag"},
-    {"sim",     CmdVikingSim,   0, "<8 digit ID number> simulate viking tag"},
-    {NULL, NULL, 0, NULL}
+    {"help",    CmdHelp,        AlwaysAvailable, "This help"},
+    {"demod",   CmdVikingDemod, AlwaysAvailable, "Demodulate a Viking tag from the GraphBuffer"},
+    {"read",    CmdVikingRead,  IfPm3Present,    "Attempt to read and Extract tag data from the antenna"},
+    {"clone",   CmdVikingClone, IfPm3Present,    "<8 digit ID number> clone viking tag"},
+    {"sim",     CmdVikingSim,   IfPm3Present,    "<8 digit ID number> simulate viking tag"},
+    {NULL, NULL, NULL, NULL}
 };
 
 static int CmdHelp(const char *Cmd) {
diff --git a/client/cmdlfvisa2000.c b/client/cmdlfvisa2000.c
index 424a28106..348a9adeb 100644
--- a/client/cmdlfvisa2000.c
+++ b/client/cmdlfvisa2000.c
@@ -203,12 +203,12 @@ static int CmdVisa2kSim(const char *Cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",    CmdHelp,        1, "This help"},
-    {"demod",   CmdVisa2kDemod, 1, "demodulate an VISA2000 tag from the GraphBuffer"},
-    {"read",    CmdVisa2kRead,  0, "attempt to read and extract tag data from the antenna"},
-    {"clone",   CmdVisa2kClone, 0, "clone Visa2000 to t55x7"},
-    {"sim",     CmdVisa2kSim,   0, "simulate Visa2000 tag"},
-    {NULL, NULL, 0, NULL}
+    {"help",    CmdHelp,        AlwaysAvailable, "This help"},
+    {"demod",   CmdVisa2kDemod, AlwaysAvailable, "demodulate an VISA2000 tag from the GraphBuffer"},
+    {"read",    CmdVisa2kRead,  IfPm3Present,    "attempt to read and extract tag data from the antenna"},
+    {"clone",   CmdVisa2kClone, IfPm3Present,    "clone Visa2000 to t55x7"},
+    {"sim",     CmdVisa2kSim,   IfPm3Present,    "simulate Visa2000 tag"},
+    {NULL, NULL, NULL, NULL}
 };
 
 static int CmdHelp(const char *Cmd) {
diff --git a/client/cmdmain.c b/client/cmdmain.c
index 45a5139b2..2349dac9b 100644
--- a/client/cmdmain.c
+++ b/client/cmdmain.c
@@ -42,26 +42,26 @@ static int CmdRev(const char *Cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",    CmdHelp,      1, "This help. Use '<command> help' for details of a particular command."},
-    {"analyse", CmdAnalyse,   1, "{ Analyse utils... }"},
-    {"data",    CmdData,      1, "{ Plot window / data buffer manipulation... }"},
-    {"hf",      CmdHF,        1, "{ High Frequency commands... }"},
-    {"hw",      CmdHW,        1, "{ Hardware commands... }"},
-    {"lf",      CmdLF,        1, "{ Low Frequency commands... }"},
-    {"emv",     CmdEMV,       1, "{ EMV iso14443 and iso7816... }"},
-    {"rem",     CmdRem,       1, "{ Add text to row in log file }"},
-    {"reveng",  CmdRev,       1, "{ Crc calculations from the RevEng software... }"},
-    {"script",  CmdScript,    1, "{ Scripting commands }"},
-    {"trace",   CmdTrace,     1, "{ Trace manipulation... }"},
+    {"help",    CmdHelp,      AlwaysAvailable, "This help. Use '<command> help' for details of a particular command."},
+    {"analyse", CmdAnalyse,   AlwaysAvailable, "{ Analyse utils... }"},
+    {"data",    CmdData,      AlwaysAvailable, "{ Plot window / data buffer manipulation... }"},
+    {"hf",      CmdHF,        AlwaysAvailable, "{ High Frequency commands... }"},
+    {"hw",      CmdHW,        AlwaysAvailable, "{ Hardware commands... }"},
+    {"lf",      CmdLF,        AlwaysAvailable, "{ Low Frequency commands... }"},
+    {"emv",     CmdEMV,       AlwaysAvailable, "{ EMV iso14443 and iso7816... }"},
+    {"rem",     CmdRem,       AlwaysAvailable, "{ Add text to row in log file }"},
+    {"reveng",  CmdRev,       AlwaysAvailable, "{ Crc calculations from the RevEng software... }"},
+    {"script",  CmdScript,    AlwaysAvailable, "{ Scripting commands }"},
+    {"trace",   CmdTrace,     AlwaysAvailable, "{ Trace manipulation... }"},
 #ifdef WITH_FLASH
-    {"mem",     CmdFlashMem,  1, "{ Flash Memory manipulation... }"},
+    {"mem",     CmdFlashMem,  AlwaysAvailable, "{ Flash Memory manipulation... }"},
 #endif
 #ifdef WITH_SMARTCARD
-    {"sc",      CmdSmartcard, 1, "{ Smart card ISO7816 commands... }"},
+    {"sc",      CmdSmartcard, AlwaysAvailable, "{ Smart card ISO7816 commands... }"},
 #endif
-    {"quit",    CmdQuit,      1, ""},
-    {"exit",    CmdQuit,      1, "Exit program"},
-    {NULL, NULL, 0, NULL}
+    {"quit",    CmdQuit,      AlwaysAvailable, ""},
+    {"exit",    CmdQuit,      AlwaysAvailable, "Exit program"},
+    {NULL, NULL, NULL, NULL}
 };
 
 static int CmdHelp(const char *Cmd) {
diff --git a/client/cmdmain.h b/client/cmdmain.h
index 0bf5ff1e7..f5e9bab68 100644
--- a/client/cmdmain.h
+++ b/client/cmdmain.h
@@ -32,14 +32,8 @@
 #include "cmdcrc.h"
 #include "cmdanalyse.h"
 #include "emv/cmdemv.h"   // EMV
-
-#ifdef WITH_FLASH
 #include "cmdflashmem.h"  // rdv40 flashmem commands
-#endif
-
-#ifdef WITH_SMARTCARD
 #include "cmdsmartcard.h" // rdv40 smart card ISO7816 commands
-#endif
 
 int CommandReceived(char *Cmd);
 command_t *getTopLevelCommandTable(void);
diff --git a/client/cmdparser.c b/client/cmdparser.c
index bb24e532b..b205a0d1f 100644
--- a/client/cmdparser.c
+++ b/client/cmdparser.c
@@ -17,11 +17,27 @@
 #include "proxmark3.h"
 #include "comms.h"
 
+bool AlwaysAvailable(void) {
+    return true;
+}
+
+bool IfPm3Present(void) {
+    if (session.help_dump_mode)
+        return false;
+    return session.pm3_present;
+}
+
+bool IfPm3Hfsniff(void) {
+    if (!IfPm3Present())
+        return false;
+    return pm3_capabilities.compiled_with_hfsniff;
+}
+
 void CmdsHelp(const command_t Commands[]) {
     if (Commands[0].Name == NULL) return;
     int i = 0;
     while (Commands[i].Name) {
-        if (session.pm3_present || Commands[i].Offline)
+        if (Commands[i].IsAvailable())
             PrintAndLogEx(NORMAL, "%-16s %s", Commands[i].Name, Commands[i].Help);
         ++i;
     }
@@ -46,7 +62,7 @@ int CmdsParse(const command_t Commands[], const char *Cmd) {
     int i = 0;
     while (Commands[i].Name) {
         if (0 == strcmp(Commands[i].Name, cmd_name)) {
-            if (session.pm3_present || Commands[i].Offline) {
+            if (Commands[i].IsAvailable()) {
                 break;
             } else {
                 PrintAndLogEx(WARNING, "This command is only available in " _YELLOW_("online") "mode");
@@ -62,7 +78,7 @@ int CmdsParse(const command_t Commands[], const char *Cmd) {
         int matches = 0;
 
         for (i = 0; Commands[i].Name; i++) {
-            if (!strncmp(Commands[i].Name, cmd_name, strlen(cmd_name)) && (session.pm3_present || Commands[i].Offline)) {
+            if (!strncmp(Commands[i].Name, cmd_name, strlen(cmd_name)) && Commands[i].IsAvailable()) {
                 last_match = i;
                 matches++;
             }
@@ -94,33 +110,33 @@ void dumpCommandsRecursive(const command_t cmds[], int markdown) {
     // First, dump all single commands, which are not a container for
     // other commands
     if (markdown) {
-        PrintAndLogEx(NORMAL, "|%-*s|%-*s|%s\n", w_cmd, "command", w_off, "offline", "description");
-        PrintAndLogEx(NORMAL, "|%-*s|%-*s|%s\n", w_cmd, "-------", w_off, "-------", "-----------");
+        PrintAndLogEx(NORMAL, "|%-*s|%-*s|%s", w_cmd, "command", w_off, "offline", "description");
+        PrintAndLogEx(NORMAL, "|%-*s|%-*s|%s", w_cmd, "-------", w_off, "-------", "-----------");
     } else {
-        PrintAndLogEx(NORMAL, "%-*s|%-*s|%s\n", w_cmd, "command", w_off, "offline", "description");
-        PrintAndLogEx(NORMAL, "%-*s|%-*s|%s\n", w_cmd, "-------", w_off, "-------", "-----------");
+        PrintAndLogEx(NORMAL, "%-*s|%-*s|%s", w_cmd, "command", w_off, "offline", "description");
+        PrintAndLogEx(NORMAL, "%-*s|%-*s|%s", w_cmd, "-------", w_off, "-------", "-----------");
     }
 
     while (cmds[i].Name) {
         const char *cmd_offline = "N";
         if (cmds[i].Help[0] == '{' && ++i) continue;
 
-        if (cmds[i].Offline)
+        if (cmds[i].IsAvailable())
             cmd_offline = "Y";
         if (markdown)
-            PrintAndLogEx(NORMAL, "|`%s%-*s`|%-*s|`%s`\n", parent, w_cmd - (int)strlen(parent) - 2, cmds[i].Name, w_off, cmd_offline, cmds[i].Help);
+            PrintAndLogEx(NORMAL, "|`%s%-*s`|%-*s|`%s`", parent, w_cmd - (int)strlen(parent) - 2, cmds[i].Name, w_off, cmd_offline, cmds[i].Help);
         else
-            PrintAndLogEx(NORMAL, "%s%-*s|%-*s|%s\n", parent, w_cmd - (int)strlen(parent), cmds[i].Name, w_off, cmd_offline, cmds[i].Help);
+            PrintAndLogEx(NORMAL, "%s%-*s|%-*s|%s", parent, w_cmd - (int)strlen(parent), cmds[i].Name, w_off, cmd_offline, cmds[i].Help);
         ++i;
     }
-    PrintAndLogEx(NORMAL, "\n\n");
+    PrintAndLogEx(NORMAL, "\n");
     i = 0;
 
     // Then, print the categories. These will go into subsections with their own tables
     while (cmds[i].Name) {
         if (cmds[i].Help[0] != '{' && ++i)  continue;
 
-        PrintAndLogEx(NORMAL, "### %s%s\n\n %s\n\n", parent, cmds[i].Name, cmds[i].Help);
+        PrintAndLogEx(NORMAL, "### %s%s\n\n %s\n", parent, cmds[i].Name, cmds[i].Help);
 
         char currentparent[512] = {0};
         snprintf(currentparent, sizeof currentparent, "%s%s ", parent, cmds[i].Name);
diff --git a/client/cmdparser.h b/client/cmdparser.h
index 722fd0d21..9b7e9e734 100644
--- a/client/cmdparser.h
+++ b/client/cmdparser.h
@@ -14,12 +14,15 @@
 typedef struct command_s {
     const char *Name;
     int (*Parse)(const char *Cmd);
-    int Offline;
+    bool (*IsAvailable)(void);
     const char *Help;
 } command_t;
-
 // command_t array are expected to be NULL terminated
 
+bool AlwaysAvailable(void);
+bool IfPm3Present(void);
+bool IfPm3Hfsniff(void);
+
 // Print help for each command in the command array
 void CmdsHelp(const command_t Commands[]);
 // Print each command in the command array without help
diff --git a/client/cmdscript.c b/client/cmdscript.c
index ba581290f..8880e18fd 100644
--- a/client/cmdscript.c
+++ b/client/cmdscript.c
@@ -167,10 +167,10 @@ static int CmdScriptRun(const char *Cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",  CmdHelp,          1, "This help"},
-    {"list",  CmdScriptList,    1, "List available scripts"},
-    {"run",   CmdScriptRun,     1, "<name> -- Execute a script"},
-    {NULL, NULL, 0, NULL}
+    {"help",  CmdHelp,          AlwaysAvailable, "This help"},
+    {"list",  CmdScriptList,    AlwaysAvailable, "List available scripts"},
+    {"run",   CmdScriptRun,     AlwaysAvailable, "<name> -- Execute a script"},
+    {NULL, NULL, NULL, NULL}
 };
 
 /**
diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index b5b303534..4b41f7201 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -1118,15 +1118,15 @@ static int CmdSmartBruteforceSFI(const char *Cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",     CmdHelp,               1, "This help"},
-    {"list",     CmdSmartList,          0, "List ISO 7816 history"},
-    {"info",     CmdSmartInfo,          1, "Tag information"},
-    {"reader",   CmdSmartReader,        1, "Act like an IS07816 reader"},
-    {"raw",      CmdSmartRaw,           1, "Send raw hex data to tag"},
-    {"upgrade",  CmdSmartUpgrade,       1, "Upgrade sim module firmware"},
-    {"setclock", CmdSmartSetClock,      1, "Set clock speed"},
-    {"brute",    CmdSmartBruteforceSFI, 1, "Bruteforce SFI"},
-    {NULL, NULL, 0, NULL}
+    {"help",     CmdHelp,               AlwaysAvailable, "This help"},
+    {"list",     CmdSmartList,          IfPm3Present,    "List ISO 7816 history"},
+    {"info",     CmdSmartInfo,          AlwaysAvailable, "Tag information"},
+    {"reader",   CmdSmartReader,        AlwaysAvailable, "Act like an IS07816 reader"},
+    {"raw",      CmdSmartRaw,           AlwaysAvailable, "Send raw hex data to tag"},
+    {"upgrade",  CmdSmartUpgrade,       AlwaysAvailable, "Upgrade sim module firmware"},
+    {"setclock", CmdSmartSetClock,      AlwaysAvailable, "Set clock speed"},
+    {"brute",    CmdSmartBruteforceSFI, AlwaysAvailable, "Bruteforce SFI"},
+    {NULL, NULL, NULL, NULL}
 };
 
 static int CmdHelp(const char *Cmd) {
diff --git a/client/cmdtrace.c b/client/cmdtrace.c
index a329f8931..e50a2b2c4 100644
--- a/client/cmdtrace.c
+++ b/client/cmdtrace.c
@@ -568,11 +568,11 @@ static int CmdTraceSave(const char *Cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",    CmdHelp,          1, "This help"},
-    {"list",    CmdTraceList,     1, "List protocol data in trace buffer"},
-    {"load",    CmdTraceLoad,     1, "Load trace from file"},
-    {"save",    CmdTraceSave,     1, "Save trace buffer to file"},
-    {NULL, NULL, 0, NULL}
+    {"help",    CmdHelp,          AlwaysAvailable, "This help"},
+    {"list",    CmdTraceList,     AlwaysAvailable, "List protocol data in trace buffer"},
+    {"load",    CmdTraceLoad,     AlwaysAvailable, "Load trace from file"},
+    {"save",    CmdTraceSave,     AlwaysAvailable, "Save trace buffer to file"},
+    {NULL, NULL, NULL, NULL}
 };
 
 static int CmdHelp(const char *Cmd) {
diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index abd6467c3..fa7f35e3a 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -1940,28 +1940,28 @@ out:
 }
 
 static command_t CommandTable[] =  {
-    {"help",        CmdHelp,                        1, "This help"},
-    {"exec",        CmdEMVExec,                     0, "Executes EMV contactless transaction."},
-    {"pse",         CmdEMVPPSE,                     0, "Execute PPSE. It selects 2PAY.SYS.DDF01 or 1PAY.SYS.DDF01 directory."},
-    {"search",      CmdEMVSearch,                   0, "Try to select all applets from applets list and print installed applets."},
-    {"select",      CmdEMVSelect,                   0, "Select applet."},
-    {"gpo",         CmdEMVGPO,                      0, "Execute GetProcessingOptions."},
-    {"readrec",     CmdEMVReadRecord,               0, "Read files from card."},
-    {"genac",       CmdEMVAC,                       0, "Generate ApplicationCryptogram."},
-    {"challenge",   CmdEMVGenerateChallenge,        0, "Generate challenge."},
-    {"intauth",     CmdEMVInternalAuthenticate,     0, "Internal authentication."},
-    {"scan",        CmdEMVScan,                     0, "Scan EMV card and save it contents to json file for emulator."},
-    {"test",        CmdEMVTest,                     0, "Crypto logic test."},
+    {"help",        CmdHelp,                        AlwaysAvailable, "This help"},
+    {"exec",        CmdEMVExec,                     IfPm3Present,    "Executes EMV contactless transaction."},
+    {"pse",         CmdEMVPPSE,                     IfPm3Present,    "Execute PPSE. It selects 2PAY.SYS.DDF01 or 1PAY.SYS.DDF01 directory."},
+    {"search",      CmdEMVSearch,                   IfPm3Present,    "Try to select all applets from applets list and print installed applets."},
+    {"select",      CmdEMVSelect,                   IfPm3Present,    "Select applet."},
+    {"gpo",         CmdEMVGPO,                      IfPm3Present,    "Execute GetProcessingOptions."},
+    {"readrec",     CmdEMVReadRecord,               IfPm3Present,    "Read files from card."},
+    {"genac",       CmdEMVAC,                       IfPm3Present,    "Generate ApplicationCryptogram."},
+    {"challenge",   CmdEMVGenerateChallenge,        IfPm3Present,    "Generate challenge."},
+    {"intauth",     CmdEMVInternalAuthenticate,     IfPm3Present,    "Internal authentication."},
+    {"scan",        CmdEMVScan,                     IfPm3Present,    "Scan EMV card and save it contents to json file for emulator."},
+    {"test",        CmdEMVTest,                     IfPm3Present,    "Crypto logic test."},
     /*
-    {"getrng",      CmdEMVGetrng,                   0, "get random number from terminal"},
-    {"eload",       CmdEmvELoad,                    0, "load EMV tag into device"},
-    {"dump",        CmdEmvDump,                     0, "dump EMV tag values"},
-    {"sim",         CmdEmvSim,                      0, "simulate EMV tag"},
-    {"clone",       CmdEmvClone,                    0, "clone an EMV tag"},
+    {"getrng",      CmdEMVGetrng,                   IfPm3Present,    "get random number from terminal"},
+    {"eload",       CmdEmvELoad,                    IfPm3Present,    "load EMV tag into device"},
+    {"dump",        CmdEmvDump,                     IfPm3Present,    "dump EMV tag values"},
+    {"sim",         CmdEmvSim,                      IfPm3Present,    "simulate EMV tag"},
+    {"clone",       CmdEmvClone,                    IfPm3Present,    "clone an EMV tag"},
     */
-    {"list",        CmdEMVList,                     0, "List ISO7816 history"},
-    {"roca",        CmdEMVRoca,                     0, "Extract public keys and run ROCA test"},
-    {NULL, NULL, 0, NULL}
+    {"list",        CmdEMVList,                     IfPm3Present,    "List ISO7816 history"},
+    {"roca",        CmdEMVRoca,                     IfPm3Present,    "Extract public keys and run ROCA test"},
+    {NULL, NULL, NULL, NULL}
 };
 
 static int CmdHelp(const char *Cmd) {
diff --git a/client/flasher.c b/client/flasher.c
index 782888102..430a411af 100644
--- a/client/flasher.c
+++ b/client/flasher.c
@@ -50,6 +50,7 @@ int main(int argc, char **argv) {
     if (session.stdinOnTTY && session.stdoutOnTTY)
         session.supports_colors = true;
 #endif
+    session.help_dump_mode = false;
 
     if (argc < 3) {
         usage(argv[0]);
diff --git a/client/proxmark3.c b/client/proxmark3.c
index 2a6ff7aa4..1dde3d61e 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -220,12 +220,14 @@ main_loop(char *script_cmds_file, char *script_cmd) {
 }
 
 static void dumpAllHelp(int markdown) {
+    session.help_dump_mode = true;
     PrintAndLogEx(NORMAL, "\n%sProxmark3 command dump%s\n\n", markdown ? "# " : "", markdown ? "" : "\n======================");
     PrintAndLogEx(NORMAL, "Some commands are available only if a Proxmark3 is actually connected.%s\n", markdown ? "  " : "");
     PrintAndLogEx(NORMAL, "Check column \"offline\" for their availability.\n");
     PrintAndLogEx(NORMAL, "\n");
     command_t *cmds = getTopLevelCommandTable();
     dumpCommandsRecursive(cmds, markdown);
+    session.help_dump_mode = false;
 }
 
 static char *my_executable_path = NULL;
@@ -291,6 +293,7 @@ int main(int argc, char *argv[]) {
     srand(time(0));
 
     session.pm3_present = false;
+    session.help_dump_mode = false;
     bool waitCOMPort = false;
     bool addLuaExec = false;
     char *script_cmds_file = NULL;
diff --git a/client/ui.h b/client/ui.h
index 5ab30b3e1..4f70b54cd 100644
--- a/client/ui.h
+++ b/client/ui.h
@@ -29,6 +29,7 @@ typedef struct {
     bool stdoutOnTTY;
     bool supports_colors;
     bool pm3_present;
+    bool help_dump_mode;
 } session_arg_t;
 
 extern session_arg_t session;

From 10489db97da9cc256124dd12412880c9ff8ad374 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 1 May 2019 21:09:23 +0200
Subject: [PATCH 1547/1938] capabilities: more IsAvailable helpers

---
 client/cmdparser.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++
 client/cmdparser.h | 14 ++++++++
 2 files changed, 99 insertions(+)

diff --git a/client/cmdparser.c b/client/cmdparser.c
index b205a0d1f..0eeb6c8d5 100644
--- a/client/cmdparser.c
+++ b/client/cmdparser.c
@@ -27,12 +27,97 @@ bool IfPm3Present(void) {
     return session.pm3_present;
 }
 
+bool IfPm3Flash(void) {
+    if (!IfPm3Present())
+        return false;
+// TODO
+//    capabilities.hw_available_flash
+    return pm3_capabilities.compiled_with_flash;
+}
+
+bool IfPm3Smartcard(void) {
+    if (!IfPm3Present())
+        return false;
+// TODO
+//    capabilities.hw_available_smartcard
+    return pm3_capabilities.compiled_with_smartcard;
+}
+
+bool IfPm3Fpc(void) {
+    if (!IfPm3Present())
+        return false;
+    return pm3_capabilities.compiled_with_fpc;
+}
+
+bool IfPm3FpcHost(void) {
+    if (!IfPm3Present())
+        return false;
+// TODO
+//    capabilities.hw_available_fpc_host
+    return pm3_capabilities.compiled_with_fpc_host;
+}
+
+bool IfPm3Lf(void) {
+    if (!IfPm3Present())
+        return false;
+    return pm3_capabilities.compiled_with_lf;
+}
+
+bool IfPm3Hitag(void) {
+    if (!IfPm3Present())
+        return false;
+    return pm3_capabilities.compiled_with_hitag;
+}
+
 bool IfPm3Hfsniff(void) {
     if (!IfPm3Present())
         return false;
     return pm3_capabilities.compiled_with_hfsniff;
 }
 
+bool IfPm3Iso14443a(void) {
+    if (!IfPm3Present())
+        return false;
+    return pm3_capabilities.compiled_with_iso14443a;
+}
+
+bool IfPm3Iso14443a(void) {
+    if (!IfPm3Present())
+        return false;
+    return pm3_capabilities.compiled_with_iso14443b;
+}
+
+bool IfPm3Iso15693(void) {
+    if (!IfPm3Present())
+        return false;
+    return pm3_capabilities.compiled_with_iso15693;
+}
+
+bool IfPm3Felica(void) {
+    if (!IfPm3Present())
+        return false;
+    return pm3_capabilities.compiled_with_felica;
+}
+
+bool IfPm3Legicrf(void) {
+    if (!IfPm3Present())
+        return false;
+    return pm3_capabilities.compiled_with_legicrf;
+}
+
+bool IfPm3Iclass(void) {
+    if (!IfPm3Present())
+        return false;
+    return pm3_capabilities.compiled_with_iclass;
+}
+
+bool IfPm3Lcd(void) {
+    if (!IfPm3Present())
+        return false;
+    return pm3_capabilities.compiled_with_lcd;
+}
+
+
 void CmdsHelp(const command_t Commands[]) {
     if (Commands[0].Name == NULL) return;
     int i = 0;
diff --git a/client/cmdparser.h b/client/cmdparser.h
index 9b7e9e734..48e465075 100644
--- a/client/cmdparser.h
+++ b/client/cmdparser.h
@@ -19,9 +19,23 @@ typedef struct command_s {
 } command_t;
 // command_t array are expected to be NULL terminated
 
+// helpers for command_t IsAvailable
 bool AlwaysAvailable(void);
 bool IfPm3Present(void);
+bool IfPm3Flash(void);
+bool IfPm3Smartcard(void);
+bool IfPm3Fpc(void);
+bool IfPm3FpcHost(void);
+bool IfPm3Lf(void);
+bool IfPm3Hitag(void);
 bool IfPm3Hfsniff(void);
+bool IfPm3Iso14443a(void);
+bool IfPm3Iso14443a(void);
+bool IfPm3Iso15693(void);
+bool IfPm3Felica(void);
+bool IfPm3Legicrf(void);
+bool IfPm3Iclass(void);
+bool IfPm3Lcd(void);
 
 // Print help for each command in the command array
 void CmdsHelp(const command_t Commands[]);

From 52179146b6c9e80f73ef8be474dc90f92cb52ac2 Mon Sep 17 00:00:00 2001
From: Uli Heilmeier <uh@heilmeier.eu>
Date: Wed, 1 May 2019 21:31:34 +0200
Subject: [PATCH 1548/1938] cmdparser: fix copy& paste typo

---
 client/cmdparser.c | 2 +-
 client/cmdparser.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/cmdparser.c b/client/cmdparser.c
index 0eeb6c8d5..2ecd25fc4 100644
--- a/client/cmdparser.c
+++ b/client/cmdparser.c
@@ -81,7 +81,7 @@ bool IfPm3Iso14443a(void) {
     return pm3_capabilities.compiled_with_iso14443a;
 }
 
-bool IfPm3Iso14443a(void) {
+bool IfPm3Iso14443b(void) {
     if (!IfPm3Present())
         return false;
     return pm3_capabilities.compiled_with_iso14443b;
diff --git a/client/cmdparser.h b/client/cmdparser.h
index 48e465075..57c5422e9 100644
--- a/client/cmdparser.h
+++ b/client/cmdparser.h
@@ -30,7 +30,7 @@ bool IfPm3Lf(void);
 bool IfPm3Hitag(void);
 bool IfPm3Hfsniff(void);
 bool IfPm3Iso14443a(void);
-bool IfPm3Iso14443a(void);
+bool IfPm3Iso14443b(void);
 bool IfPm3Iso15693(void);
 bool IfPm3Felica(void);
 bool IfPm3Legicrf(void);

From cad676a23c31e25d6d14535a5dd8ecce20304e55 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 1 May 2019 21:46:29 +0200
Subject: [PATCH 1549/1938] Replace WITH_FLASH by dynamic detection in client

---
 client/cmdflashmem.c | 16 ++++++---------
 client/cmdflashmem.h |  4 ----
 client/cmdhfmf.c     |  9 +++------
 client/cmdhw.c       | 23 +++++-----------------
 client/cmdmain.c     |  8 ++------
 client/scripting.c   | 46 ++++++++++++++++++++++----------------------
 6 files changed, 39 insertions(+), 67 deletions(-)

diff --git a/client/cmdflashmem.c b/client/cmdflashmem.c
index 127bd3419..4627dfebb 100644
--- a/client/cmdflashmem.c
+++ b/client/cmdflashmem.c
@@ -7,8 +7,6 @@
 //-----------------------------------------------------------------------------
 // Proxmark3 RDV40 Flash memory commands
 //-----------------------------------------------------------------------------
-#ifdef WITH_FLASH
-
 #include "cmdflashmem.h"
 
 #include "mbedtls/rsa.h"
@@ -618,12 +616,12 @@ static int CmdFlashMemInfo(const char *Cmd) {
 
 static command_t CommandTable[] = {
     {"help",    CmdHelp,            AlwaysAvailable, "This help"},
-    {"spibaud", CmdFlashmemSpiBaudrate, AlwaysAvailable, "Set Flash memory Spi baudrate [rdv40]"},
-    {"read",    CmdFlashMemRead,    AlwaysAvailable, "Read Flash memory [rdv40]"},
-    {"info",    CmdFlashMemInfo,    AlwaysAvailable, "Flash memory information [rdv40]"},
-    {"load",    CmdFlashMemLoad,    AlwaysAvailable, "Load data into flash memory [rdv40]"},
-    {"save",    CmdFlashMemSave,    AlwaysAvailable, "Save data from flash memory [rdv40]"},
-    {"wipe",    CmdFlashMemWipe,    AlwaysAvailable, "Wipe data from flash memory [rdv40]"},
+    {"spibaud", CmdFlashmemSpiBaudrate, IfPm3Flash,  "Set Flash memory Spi baudrate [rdv40]"},
+    {"read",    CmdFlashMemRead,    IfPm3Flash,      "Read Flash memory [rdv40]"},
+    {"info",    CmdFlashMemInfo,    IfPm3Flash,      "Flash memory information [rdv40]"},
+    {"load",    CmdFlashMemLoad,    IfPm3Flash,      "Load data into flash memory [rdv40]"},
+    {"save",    CmdFlashMemSave,    IfPm3Flash,      "Save data from flash memory [rdv40]"},
+    {"wipe",    CmdFlashMemWipe,    IfPm3Flash,      "Wipe data from flash memory [rdv40]"},
     {NULL, NULL, NULL, NULL}
 };
 
@@ -637,5 +635,3 @@ int CmdFlashMem(const char *Cmd) {
     clearCommandBuffer();
     return CmdsParse(CommandTable, Cmd);
 }
-
-#endif
diff --git a/client/cmdflashmem.h b/client/cmdflashmem.h
index c58de661d..3c37239b7 100644
--- a/client/cmdflashmem.h
+++ b/client/cmdflashmem.h
@@ -8,8 +8,6 @@
 // Proxmark3 RDV40 Flash memory commands
 //-----------------------------------------------------------------------------
 
-#ifdef WITH_FLASH
-
 #ifndef CMDFLASHMEM_H__
 #define CMDFLASHMEM_H__
 
@@ -36,5 +34,3 @@ typedef enum {
 int CmdFlashMem(const char *Cmd);
 
 #endif
-
-#endif
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index dac5c3b11..1b10440df 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -202,9 +202,8 @@ static int usage_hf14_chk_fast(void) {
     PrintAndLogEx(NORMAL, "      hf mf fchk 1 1234567890ab keys.dic    -- target 1K using key 1234567890ab, using dictionary file");
     PrintAndLogEx(NORMAL, "      hf mf fchk 1 t                        -- target 1K, write to emulator memory");
     PrintAndLogEx(NORMAL, "      hf mf fchk 1 d                        -- target 1K, write to file");
-#ifdef WITH_FLASH
-    PrintAndLogEx(NORMAL, "      hf mf fchk 1 m                        -- target 1K, use dictionary from flashmemory");
-#endif
+    if (IfPm3Flash())
+        PrintAndLogEx(NORMAL, "      hf mf fchk 1 m                        -- target 1K, use dictionary from flashmemory");
     return 0;
 }
 static int usage_hf14_keybrute(void) {
@@ -1593,9 +1592,7 @@ static int CmdHF14AMfChk_fast(const char *Cmd) {
         } else if (clen == 1) {
             if (ctmp == 't') { transferToEml = 1; continue; }
             if (ctmp == 'd') { createDumpFile = 1; continue; }
-#ifdef WITH_FLASH
-            if (ctmp == 'm') { use_flashmemory = true; continue; }
-#endif
+            if ((ctmp == 'm') && (IfPm3Flash())){ use_flashmemory = true; continue; }
         } else {
             // May be a dic file
             if (param_getstr(Cmd, i, filename, FILE_PATH_SIZE) >= FILE_PATH_SIZE) {
diff --git a/client/cmdhw.c b/client/cmdhw.c
index 0dece387b..22de1e9e5 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -500,25 +500,12 @@ void pm3_version(bool verbose) {
     SendCommandOLD(CMD_VERSION, 0, 0, 0, NULL, 0);
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {
         PrintAndLogEx(NORMAL, "\n" _BLUE_(" [ Proxmark3 RFID instrument ]") "\n");
-        char s[60] = {0};
-#if defined(WITH_FLASH) || defined(WITH_SMARTCARD) || defined(WITH_FPC)
-        strncat(s, "build for RDV40 with ", sizeof(s) - strlen(s) - 1);
-#endif
-#ifdef WITH_FLASH
-        strncat(s, "flashmem; ", sizeof(s) - strlen(s) - 1);
-#endif
-#ifdef WITH_SMARTCARD
-        strncat(s, "smartcard; ", sizeof(s) - strlen(s) - 1);
-#endif
-#ifdef WITH_FPC
-#ifdef WITH_FPC_HOST
-        strncat(s, "fpc-host; ", sizeof(s) - strlen(s) - 1);
-#else
-        strncat(s, "fpc; ", sizeof(s) - strlen(s) - 1);
-#endif
-#endif
         PrintAndLogEx(NORMAL, "\n [ CLIENT ]");
-        PrintAndLogEx(NORMAL, "  client: iceman %s \n", s);
+        PrintAndLogEx(NORMAL, "  client: RRG/Iceman"); // TODO version info?
+        PrintAndLogEx(NORMAL, "\n [ PROXMARK ]");
+        PrintAndLogEx(NORMAL, "  external flash:          %s", IfPm3Flash() ? _GREEN_("present") : _YELLOW_("absent"));
+        PrintAndLogEx(NORMAL, "  smartcard reader:        %s", IfPm3Smartcard() ? _GREEN_("present") : _YELLOW_("absent"));
+        PrintAndLogEx(NORMAL, "  USART for addon support: %s\n", IfPm3FpcHost() ? _GREEN_("present") : _YELLOW_("absent"));
 
         PrintAndLogEx(NORMAL, (char *)resp.data.asBytes);
         lookupChipID(resp.oldarg[0], resp.oldarg[1]);
diff --git a/client/cmdmain.c b/client/cmdmain.c
index 2349dac9b..646df1b3c 100644
--- a/client/cmdmain.c
+++ b/client/cmdmain.c
@@ -53,12 +53,8 @@ static command_t CommandTable[] = {
     {"reveng",  CmdRev,       AlwaysAvailable, "{ Crc calculations from the RevEng software... }"},
     {"script",  CmdScript,    AlwaysAvailable, "{ Scripting commands }"},
     {"trace",   CmdTrace,     AlwaysAvailable, "{ Trace manipulation... }"},
-#ifdef WITH_FLASH
-    {"mem",     CmdFlashMem,  AlwaysAvailable, "{ Flash Memory manipulation... }"},
-#endif
-#ifdef WITH_SMARTCARD
-    {"sc",      CmdSmartcard, AlwaysAvailable, "{ Smart card ISO7816 commands... }"},
-#endif
+    {"mem",     CmdFlashMem,  IfPm3Flash,      "{ Flash Memory manipulation... }"},
+    {"sc",      CmdSmartcard, IfPm3Smartcard,  "{ Smart card ISO7816 commands... }"},
     {"quit",    CmdQuit,      AlwaysAvailable, ""},
     {"exit",    CmdQuit,      AlwaysAvailable, "Exit program"},
     {NULL, NULL, NULL, NULL}
diff --git a/client/scripting.c b/client/scripting.c
index d2fd4fd90..468c63cfa 100644
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -264,36 +264,36 @@ static int l_GetFromBigBuf(lua_State *L) {
  */
 static int l_GetFromFlashMem(lua_State *L) {
 
-#ifndef WITH_FLASH
-    return returnToLuaWithError(L, "Not compiled with FLASH MEM support");
-#else
-    int len = 0, startindex = 0;
+    if (IfPm3Flash()) {
+        int len = 0, startindex = 0;
 
-    int n = lua_gettop(L);
-    if (n == 0)
-        return returnToLuaWithError(L, "You need to supply number of bytes and startindex");
+        int n = lua_gettop(L);
+        if (n == 0)
+            return returnToLuaWithError(L, "You need to supply number of bytes and startindex");
 
-    if (n >= 2) {
-        startindex = luaL_checknumber(L, 1);
-        len = luaL_checknumber(L, 2);
-    }
+        if (n >= 2) {
+            startindex = luaL_checknumber(L, 1);
+            len = luaL_checknumber(L, 2);
+        }
 
-    if (len == 0)
-        return returnToLuaWithError(L, "You need to supply number of bytes larger than zero");
+        if (len == 0)
+            return returnToLuaWithError(L, "You need to supply number of bytes larger than zero");
 
-    uint8_t *data = calloc(len, sizeof(uint8_t));
-    if (!data)
-        return returnToLuaWithError(L, "Allocating memory failed");
+        uint8_t *data = calloc(len, sizeof(uint8_t));
+        if (!data)
+            return returnToLuaWithError(L, "Allocating memory failed");
 
-    if (!GetFromDevice(FLASH_MEM, data, len, startindex, NULL, -1, false)) {
+        if (!GetFromDevice(FLASH_MEM, data, len, startindex, NULL, -1, false)) {
+            free(data);
+            return returnToLuaWithError(L, "command execution time out");
+        }
+
+        lua_pushlstring(L, (const char *)data, len);
         free(data);
-        return returnToLuaWithError(L, "command execution time out");
+        return 1;
+    } else {
+        return returnToLuaWithError(L, "No FLASH MEM support");
     }
-
-    lua_pushlstring(L, (const char *)data, len);
-    free(data);
-    return 1;
-#endif
 }
 
 

From 6b2677c1541568687413e16e6c049f0dca3c374a Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 1 May 2019 22:33:27 +0200
Subject: [PATCH 1550/1938] Replace WITH_SMARTCARD by dynamic detection in
 client

---
 client/emv/cmdemv.c  | 33 +++++++++++++++------------------
 client/emv/emvcore.c |  9 ++++-----
 2 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index fa7f35e3a..f2b6da624 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -809,13 +809,12 @@ static int CmdEMVExec(const char *Cmd) {
     uint8_t psenum = (channel == ECC_CONTACT) ? 1 : 2;
     CLIParserFree();
 
-#ifndef WITH_SMARTCARD
-    // not compiled with smartcard functionality,  we need to exit
-    if (channel == ECC_CONTACT) {
-        PrintAndLogEx(WARNING, "PM3 Client is not compiled with support for SMARTCARD. Exiting.");
-        return PM3_EDEVNOTSUPP;
+    if (!IfPm3Smartcard()) {
+        if (channel == ECC_CONTACT) {
+            PrintAndLogEx(WARNING, "PM3 does not have SMARTCARD support. Exiting.");
+            return PM3_EDEVNOTSUPP;
+        }
     }
-#endif
 
     SetAPDULogging(showAPDU);
 
@@ -1400,13 +1399,12 @@ static int CmdEMVScan(const char *Cmd) {
     CLIGetStrWithReturn(12, relfname, &relfnamelen);
     CLIParserFree();
 
-#ifndef WITH_SMARTCARD
-    // not compiled with smartcard functionality,  we need to exit
-    if (channel == ECC_CONTACT) {
-        PrintAndLogEx(ERR, "PM3 Client is not compiled with support for SMARTCARD. Exiting.");
-        return PM3_EDEVNOTSUPP;
+    if (!IfPm3Smartcard()) {
+        if (channel == ECC_CONTACT) {
+            PrintAndLogEx(WARNING, "PM3 does not have SMARTCARD support. Exiting.");
+            return PM3_EDEVNOTSUPP;
+        }
     }
-#endif
 
     SetAPDULogging(showAPDU);
 
@@ -1736,13 +1734,12 @@ static int CmdEMVRoca(const char *Cmd) {
     PrintChannel(channel);
     CLIParserFree();
 
-#ifndef WITH_SMARTCARD
-    // not compiled with smartcard functionality,  we need to exit
-    if (channel == ECC_CONTACT) {
-        PrintAndLogEx(WARNING, "PM3 Client is not compiled with support for SMARTCARD. Exiting.");
-        return PM3_EDEVNOTSUPP;
+    if (!IfPm3Smartcard()) {
+        if (channel == ECC_CONTACT) {
+            PrintAndLogEx(WARNING, "PM3 does not have SMARTCARD support. Exiting.");
+            return PM3_EDEVNOTSUPP;
+        }
     }
-#endif
 
     // select card
     uint8_t psenum = (channel == ECC_CONTACT) ? 1 : 2;
diff --git a/client/emv/emvcore.c b/client/emv/emvcore.c
index 70cfec82a..e9e725448 100644
--- a/client/emv/emvcore.c
+++ b/client/emv/emvcore.c
@@ -293,11 +293,10 @@ static int EMVExchangeEx(EMVCommandChannel channel, bool ActivateField, bool Lea
             }
             break;
         case ECC_CONTACT:
-#ifdef WITH_SMARTCARD
-            res = ExchangeAPDUSC(data, (IncludeLe ? 6 : 5) + apdu.Lc, ActivateField, LeaveFieldON, Result, (int)MaxResultLen, (int *)ResultLen);
-#else
-            res = 1;
-#endif
+            if (IfPm3Smartcard())
+                res = ExchangeAPDUSC(data, (IncludeLe ? 6 : 5) + apdu.Lc, ActivateField, LeaveFieldON, Result, (int)MaxResultLen, (int *)ResultLen);
+            else
+                res = 1;
             if (res) {
                 return res;
             }

From a79c792d9ff2f6457d690fec6d82e3b64ff600b3 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 1 May 2019 22:37:47 +0200
Subject: [PATCH 1551/1938] Fix smartcard commands visibility

---
 client/cmdsmartcard.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index 4b41f7201..342aa67f4 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -1119,13 +1119,13 @@ static int CmdSmartBruteforceSFI(const char *Cmd) {
 
 static command_t CommandTable[] = {
     {"help",     CmdHelp,               AlwaysAvailable, "This help"},
-    {"list",     CmdSmartList,          IfPm3Present,    "List ISO 7816 history"},
-    {"info",     CmdSmartInfo,          AlwaysAvailable, "Tag information"},
-    {"reader",   CmdSmartReader,        AlwaysAvailable, "Act like an IS07816 reader"},
-    {"raw",      CmdSmartRaw,           AlwaysAvailable, "Send raw hex data to tag"},
-    {"upgrade",  CmdSmartUpgrade,       AlwaysAvailable, "Upgrade sim module firmware"},
-    {"setclock", CmdSmartSetClock,      AlwaysAvailable, "Set clock speed"},
-    {"brute",    CmdSmartBruteforceSFI, AlwaysAvailable, "Bruteforce SFI"},
+    {"list",     CmdSmartList,          IfPm3Smartcard,  "List ISO 7816 history"},
+    {"info",     CmdSmartInfo,          IfPm3Smartcard,  "Tag information"},
+    {"reader",   CmdSmartReader,        IfPm3Smartcard,  "Act like an IS07816 reader"},
+    {"raw",      CmdSmartRaw,           IfPm3Smartcard,  "Send raw hex data to tag"},
+    {"upgrade",  CmdSmartUpgrade,       IfPm3Smartcard,  "Upgrade sim module firmware"},
+    {"setclock", CmdSmartSetClock,      IfPm3Smartcard,  "Set clock speed"},
+    {"brute",    CmdSmartBruteforceSFI, IfPm3Smartcard,  "Bruteforce SFI"},
     {NULL, NULL, NULL, NULL}
 };
 

From bb966caab1c72434e16fb426fc772f49f59b898d Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 1 May 2019 22:47:21 +0200
Subject: [PATCH 1552/1938] Replace WITH_LCD by dynamic detection in client

---
 client/cmdhw.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/client/cmdhw.c b/client/cmdhw.c
index 22de1e9e5..337ee4e0f 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -338,7 +338,6 @@ static int CmdFPGAOff(const char *Cmd) {
     return PM3_SUCCESS;
 }
 
-#ifdef WITH_LCD
 static int CmdLCD(const char *Cmd) {
     int i, j;
     sscanf(Cmd, "%x %d", &i, &j);
@@ -354,7 +353,6 @@ static int CmdLCDReset(const char *Cmd) {
     SendCommandOLD(CMD_LCD_RESET, strtol(Cmd, NULL, 0), 0, 0, NULL, 0);
     return PM3_SUCCESS;
 }
-#endif
 
 static int CmdReadmem(const char *Cmd) {
     clearCommandBuffer();
@@ -465,10 +463,8 @@ static command_t CommandTable[] = {
     {"help",          CmdHelp,        AlwaysAvailable, "This help"},
     {"detectreader",  CmdDetectReader, IfPm3Present,    "['l'|'h'] -- Detect external reader field (option 'l' or 'h' to limit to LF or HF)"},
     {"fpgaoff",       CmdFPGAOff,     IfPm3Present,    "Set FPGA off"},
-#ifdef WITH_LCD
-    {"lcd",           CmdLCD,         IfPm3Present,    "<HEX command> <count> -- Send command/data to LCD"},
-    {"lcdreset",      CmdLCDReset,    IfPm3Present,    "Hardware reset LCD"},
-#endif
+    {"lcd",           CmdLCD,         IfPm3Lcd,        "<HEX command> <count> -- Send command/data to LCD"},
+    {"lcdreset",      CmdLCDReset,    IfPm3Lcd,        "Hardware reset LCD"},
     {"readmem",       CmdReadmem,     IfPm3Present,    "[address] -- Read memory at decimal address from flash"},
     {"reset",         CmdReset,       IfPm3Present,    "Reset the Proxmark3"},
     {"setlfdivisor",  CmdSetDivisor,  IfPm3Present,    "<19 - 255> -- Drive LF antenna at 12Mhz/(divisor+1)"},

From 30d29434d5e526827d2c7d86427a28ed1e6ede52 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 1 May 2019 22:56:10 +0200
Subject: [PATCH 1553/1938] Replace WITH_FPC by dynamic detection in client

---
 client/cmdanalyse.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/client/cmdanalyse.c b/client/cmdanalyse.c
index 3e80371ea..c4f318d33 100644
--- a/client/cmdanalyse.c
+++ b/client/cmdanalyse.c
@@ -490,6 +490,11 @@ static int CmdAnalyseA(const char *Cmd) {
     bool errors = false;
     uint8_t data[PM3_CMD_DATA_SIZE] = {0x00};
 
+    if (!IfPm3Fpc) {
+        PrintAndLogEx(ERR, "Device has no FPC USART support");
+        return PM3_EDEVNOTSUPP;
+    }
+
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
             case 'd':

From 2d99c6096bb8756c930ec1b28ef0b9fb1ef495a3 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 1 May 2019 23:04:20 +0200
Subject: [PATCH 1554/1938] fix IfPm3Fpc call

---
 client/cmdanalyse.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdanalyse.c b/client/cmdanalyse.c
index c4f318d33..ede26699b 100644
--- a/client/cmdanalyse.c
+++ b/client/cmdanalyse.c
@@ -490,7 +490,7 @@ static int CmdAnalyseA(const char *Cmd) {
     bool errors = false;
     uint8_t data[PM3_CMD_DATA_SIZE] = {0x00};
 
-    if (!IfPm3Fpc) {
+    if (!IfPm3Fpc()) {
         PrintAndLogEx(ERR, "Device has no FPC USART support");
         return PM3_EDEVNOTSUPP;
     }

From 582d948ac23287489fa9eecaec333c6de5828ac6 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 1 May 2019 23:04:50 +0200
Subject: [PATCH 1555/1938] Replace WITH_ISO15693 by dynamic detection in
 client

---
 client/cmdhf15.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index eba66143f..17f9c7087 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -1276,19 +1276,19 @@ static int CmdHF15Restore(const char *Cmd) {
 static command_t CommandTable[] = {
     {"help",        CmdHF15Help,        AlwaysAvailable, "This help"},
     {"demod",       CmdHF15Demod,       AlwaysAvailable, "Demodulate ISO15693 from tag"},
-    {"dump",        CmdHF15Dump,        IfPm3Present,    "Read all memory pages of an ISO15693 tag, save to file"},
-    {"findafi",     CmdHF15Afi,         IfPm3Present,    "Brute force AFI of an ISO15693 tag"},
-    {"info",        CmdHF15Info,        IfPm3Present,    "Tag information"},
-    {"list",        CmdHF15List,        IfPm3Present,    "List ISO15693 history"},
-    {"raw",         CmdHF15Raw,         IfPm3Present,    "Send raw hex data to tag"},
-    {"reader",      CmdHF15Reader,      IfPm3Present,    "Act like an ISO15693 reader"},
-    {"record",      CmdHF15Record,      IfPm3Present,    "Record Samples (ISO15693)"},
-    {"restore",     CmdHF15Restore,     IfPm3Present,    "Restore from file to all memory pages of an ISO15693 tag"},
-    {"sim",         CmdHF15Sim,         IfPm3Present,    "Fake an ISO15693 tag"},
-    {"samples",     CmdHF15Samples,     IfPm3Present,    "Acquire Samples as Reader (enables carrier, sends inquiry)"},
-    {"read",        CmdHF15Read,        IfPm3Present,    "Read a block"},
-    {"write",       CmdHF15Write,       IfPm3Present,    "Write a block"},
-    {"readmulti",   CmdHF15Readmulti,   IfPm3Present,    "Reads multiple Blocks"},
+    {"dump",        CmdHF15Dump,        IfPm3Iso15693,   "Read all memory pages of an ISO15693 tag, save to file"},
+    {"findafi",     CmdHF15Afi,         IfPm3Iso15693,   "Brute force AFI of an ISO15693 tag"},
+    {"info",        CmdHF15Info,        IfPm3Iso15693,   "Tag information"},
+    {"list",        CmdHF15List,        IfPm3Iso15693,   "List ISO15693 history"},
+    {"raw",         CmdHF15Raw,         IfPm3Iso15693,   "Send raw hex data to tag"},
+    {"reader",      CmdHF15Reader,      IfPm3Iso15693,   "Act like an ISO15693 reader"},
+    {"record",      CmdHF15Record,      IfPm3Iso15693,   "Record Samples (ISO15693)"},
+    {"restore",     CmdHF15Restore,     IfPm3Iso15693,   "Restore from file to all memory pages of an ISO15693 tag"},
+    {"sim",         CmdHF15Sim,         IfPm3Iso15693,   "Fake an ISO15693 tag"},
+    {"samples",     CmdHF15Samples,     IfPm3Iso15693,   "Acquire Samples as Reader (enables carrier, sends inquiry)"},
+    {"read",        CmdHF15Read,        IfPm3Iso15693,   "Read a block"},
+    {"write",       CmdHF15Write,       IfPm3Iso15693,   "Write a block"},
+    {"readmulti",   CmdHF15Readmulti,   IfPm3Iso15693,   "Reads multiple Blocks"},
     {NULL, NULL, NULL, NULL}
 };
 

From 858def687af2689a9d57a0043bde6e525afd0d40 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 1 May 2019 23:14:30 +0200
Subject: [PATCH 1556/1938] Replace WITH_LEGIC by dynamic detection in client

---
 client/cmdhflegic.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index 6ebcd7db2..4b71fcfe3 100644
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -1271,18 +1271,18 @@ static int CmdLegicList(const char *Cmd) {
 
 static command_t CommandTable[] =  {
     {"help",    CmdHelp,          AlwaysAvailable, "This help"},
-    {"reader",  CmdLegicReader,   AlwaysAvailable, "LEGIC Prime Reader UID and tag info"},
-    {"info",    CmdLegicInfo,     IfPm3Present,    "Display deobfuscated and decoded LEGIC Prime tag data"},
-    {"dump",    CmdLegicDump,     IfPm3Present,    "Dump LEGIC Prime tag to binary file"},
-    {"restore", CmdLegicRestore,  IfPm3Present,    "Restore a dump file onto a LEGIC Prime tag"},
-    {"rdmem",   CmdLegicRdmem,    IfPm3Present,    "Read bytes from a LEGIC Prime tag"},
-    {"sim",     CmdLegicRfSim,    IfPm3Present,    "Start tag simulator"},
-    {"write",   CmdLegicRfWrite,  IfPm3Present,    "Write data to a LEGIC Prime tag"},
+    {"reader",  CmdLegicReader,   IfPm3Legicrf,    "LEGIC Prime Reader UID and tag info"},
+    {"info",    CmdLegicInfo,     IfPm3Legicrf,    "Display deobfuscated and decoded LEGIC Prime tag data"},
+    {"dump",    CmdLegicDump,     IfPm3Legicrf,    "Dump LEGIC Prime tag to binary file"},
+    {"restore", CmdLegicRestore,  IfPm3Legicrf,    "Restore a dump file onto a LEGIC Prime tag"},
+    {"rdmem",   CmdLegicRdmem,    IfPm3Legicrf,    "Read bytes from a LEGIC Prime tag"},
+    {"sim",     CmdLegicRfSim,    IfPm3Legicrf,    "Start tag simulator"},
+    {"write",   CmdLegicRfWrite,  IfPm3Legicrf,    "Write data to a LEGIC Prime tag"},
     {"crc",     CmdLegicCalcCrc,  AlwaysAvailable, "Calculate Legic CRC over given bytes"},
-    {"eload",   CmdLegicELoad,    AlwaysAvailable, "Load binary dump to emulator memory"},
-    {"esave",   CmdLegicESave,    AlwaysAvailable, "Save emulator memory to binary file"},
-    {"list",    CmdLegicList,     AlwaysAvailable, "List LEGIC history"},
-    {"wipe",    CmdLegicWipe,     AlwaysAvailable, "Wipe a LEGIC Prime tag"},
+    {"eload",   CmdLegicELoad,    IfPm3Legicrf,    "Load binary dump to emulator memory"},
+    {"esave",   CmdLegicESave,    IfPm3Legicrf,    "Save emulator memory to binary file"},
+    {"list",    CmdLegicList,     IfPm3Legicrf,    "List LEGIC history"},
+    {"wipe",    CmdLegicWipe,     IfPm3Legicrf,    "Wipe a LEGIC Prime tag"},
     {NULL, NULL, NULL, NULL}
 };
 

From 745bff41435c0a98fa4ec17c73074b3cff623045 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 1 May 2019 23:17:14 +0200
Subject: [PATCH 1557/1938] Replace WITH_ISO14443b by dynamic detection in
 client

---
 client/cmdhf14b.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c
index c11074850..5d794b3b1 100644
--- a/client/cmdhf14b.c
+++ b/client/cmdhf14b.c
@@ -1074,17 +1074,17 @@ static int srix4kValid(const char *Cmd) {
 }
 */
 static command_t CommandTable[] = {
-    {"help",        CmdHelp,        AlwaysAvailable, "This help"},
-    {"dump",        CmdHF14BDump,   IfPm3Present,    "Read all memory pages of an ISO14443-B tag, save to file"},
-    {"info",        CmdHF14Binfo,   IfPm3Present,    "Tag information"},
-    {"list",        CmdHF14BList,   IfPm3Present,    "List ISO 14443B history"},
-    {"raw",         CmdHF14BCmdRaw, IfPm3Present,    "Send raw hex data to tag"},
-    {"reader",      CmdHF14BReader, IfPm3Present,    "Act as a 14443B reader to identify a tag"},
-    {"sim",         CmdHF14BSim,    IfPm3Present,    "Fake ISO 14443B tag"},
-    {"sniff",       CmdHF14BSniff,  IfPm3Present,    "Eavesdrop ISO 14443B"},
-    {"sriread",     CmdHF14BReadSri,  IfPm3Present,    "Read contents of a SRI512 | SRIX4K tag"},
-    {"sriwrite",    CmdHF14BWriteSri, IfPm3Present,    "Write data to a SRI512 | SRIX4K tag"},
-    //{"valid",     srix4kValid,    1, "srix4k checksum test"},
+    {"help",        CmdHelp,          AlwaysAvailable, "This help"},
+    {"dump",        CmdHF14BDump,     IfPm3Iso14443b,  "Read all memory pages of an ISO14443-B tag, save to file"},
+    {"info",        CmdHF14Binfo,     IfPm3Iso14443b,  "Tag information"},
+    {"list",        CmdHF14BList,     IfPm3Iso14443b,  "List ISO 14443B history"},
+    {"raw",         CmdHF14BCmdRaw,   IfPm3Iso14443b,  "Send raw hex data to tag"},
+    {"reader",      CmdHF14BReader,   IfPm3Iso14443b,  "Act as a 14443B reader to identify a tag"},
+    {"sim",         CmdHF14BSim,      IfPm3Iso14443b,  "Fake ISO 14443B tag"},
+    {"sniff",       CmdHF14BSniff,    IfPm3Iso14443b,  "Eavesdrop ISO 14443B"},
+    {"sriread",     CmdHF14BReadSri,  IfPm3Iso14443b,  "Read contents of a SRI512 | SRIX4K tag"},
+    {"sriwrite",    CmdHF14BWriteSri, IfPm3Iso14443b,  "Write data to a SRI512 | SRIX4K tag"},
+    //{"valid",     srix4kValid,      AlwaysAvailable, "srix4k checksum test"},
     {NULL, NULL, NULL, NULL}
 };
 

From c640c63e51f5b2fb0133a3a3ef98b207274adc51 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 1 May 2019 23:18:21 +0200
Subject: [PATCH 1558/1938] Replace WITH_FELICA by dynamic detection in client

---
 client/cmdhffelica.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/client/cmdhffelica.c b/client/cmdhffelica.c
index 6565dc2b2..b434521e0 100644
--- a/client/cmdhffelica.c
+++ b/client/cmdhffelica.c
@@ -535,14 +535,14 @@ static int CmdHFFelicaCmdRaw(const char *Cmd) {
 
 static command_t CommandTable[] = {
     {"help",      CmdHelp,              AlwaysAvailable, "This help"},
-    {"list",      CmdHFFelicaList,      IfPm3Present,    "List ISO 18092/FeliCa history"},
-    {"reader",    CmdHFFelicaReader,    IfPm3Present,    "Act like an ISO18092/FeliCa reader"},
-    {"sim",       CmdHFFelicaSim,       IfPm3Present,    "<UID> -- Simulate ISO 18092/FeliCa tag"},
-    {"sniff",     CmdHFFelicaSniff,     IfPm3Present,    "sniff ISO 18092/Felica traffic"},
-    {"raw",       CmdHFFelicaCmdRaw,    IfPm3Present,    "Send raw hex data to tag"},
+    {"list",      CmdHFFelicaList,      IfPm3Felica,     "List ISO 18092/FeliCa history"},
+    {"reader",    CmdHFFelicaReader,    IfPm3Felica,     "Act like an ISO18092/FeliCa reader"},
+    {"sim",       CmdHFFelicaSim,       IfPm3Felica,     "<UID> -- Simulate ISO 18092/FeliCa tag"},
+    {"sniff",     CmdHFFelicaSniff,     IfPm3Felica,     "sniff ISO 18092/Felica traffic"},
+    {"raw",       CmdHFFelicaCmdRaw,    IfPm3Felica,     "Send raw hex data to tag"},
 
-    {"litesim",   CmdHFFelicaSimLite,   IfPm3Present,    "<NDEF2> - only reply to poll request"},
-    {"litedump",  CmdHFFelicaDumpLite,  IfPm3Present,    "Wait for and try dumping FelicaLite"},
+    {"litesim",   CmdHFFelicaSimLite,   IfPm3Felica,     "<NDEF2> - only reply to poll request"},
+    {"litedump",  CmdHFFelicaDumpLite,  IfPm3Felica,     "Wait for and try dumping FelicaLite"},
     {NULL, NULL, NULL, NULL}
 };
 

From 78fdffddf70a67901af9f045b44f996632481c26 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 1 May 2019 23:20:18 +0200
Subject: [PATCH 1559/1938] Replace WITH_ICLASS by dynamic detection in client

---
 client/cmdhficlass.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index cd3c204cb..fc3498ae8 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -2421,23 +2421,23 @@ static command_t CommandTable[] = {
     {"help",        CmdHelp,                    AlwaysAvailable, "This help"},
     {"calcnewkey",  CmdHFiClassCalcNewKey,      AlwaysAvailable, "[options..] Calc Diversified keys (blocks 3 & 4) to write new keys"},
     {"chk",         CmdHFiClassCheckKeys,       AlwaysAvailable, "            Check keys"},
-    {"clone",       CmdHFiClassCloneTag,        IfPm3Present,    "[options..] Authenticate and Clone from iClass bin file"},
+    {"clone",       CmdHFiClassCloneTag,        IfPm3Iclass,     "[options..] Authenticate and Clone from iClass bin file"},
     {"decrypt",     CmdHFiClassDecrypt,         AlwaysAvailable, "[f <fname>] Decrypt tagdump" },
-    {"dump",        CmdHFiClassReader_Dump,     IfPm3Present,    "[options..] Authenticate and Dump iClass tag's AA1"},
-    {"eload",       CmdHFiClassELoad,           IfPm3Present,    "[f <fname>] (experimental) Load data into iClass emulator memory"},
+    {"dump",        CmdHFiClassReader_Dump,     IfPm3Iclass,     "[options..] Authenticate and Dump iClass tag's AA1"},
+    {"eload",       CmdHFiClassELoad,           IfPm3Iclass,     "[f <fname>] (experimental) Load data into iClass emulator memory"},
     {"encryptblk",  CmdHFiClassEncryptBlk,      AlwaysAvailable, "<BlockData> Encrypt given block data"},
-    {"list",        CmdHFiClassList,            IfPm3Present,    "            List iClass history"},
+    {"list",        CmdHFiClassList,            IfPm3Iclass,     "            List iClass history"},
     {"loclass",     CmdHFiClass_loclass,        AlwaysAvailable, "[options..] Use loclass to perform bruteforce of reader attack dump"},
     {"lookup",      CmdHFiClassLookUp,          AlwaysAvailable, "[options..] Uses authentication trace to check for key in dictionary file"},
     {"managekeys",  CmdHFiClassManageKeys,      AlwaysAvailable, "[options..] Manage the keys to use with iClass"},
-    {"permutekey",  CmdHFiClassPermuteKey,      IfPm3Present,    "            Permute function from 'heart of darkness' paper"},
-    {"readblk",     CmdHFiClass_ReadBlock,      IfPm3Present,    "[options..] Authenticate and Read iClass block"},
-    {"reader",      CmdHFiClassReader,          IfPm3Present,    "            Act like an iClass reader"},
+    {"permutekey",  CmdHFiClassPermuteKey,      IfPm3Iclass,     "            Permute function from 'heart of darkness' paper"},
+    {"readblk",     CmdHFiClass_ReadBlock,      IfPm3Iclass,     "[options..] Authenticate and Read iClass block"},
+    {"reader",      CmdHFiClassReader,          IfPm3Iclass,     "            Act like an iClass reader"},
     {"readtagfile", CmdHFiClassReadTagFile,     AlwaysAvailable, "[options..] Display Content from tagfile"},
-    {"replay",      CmdHFiClassReader_Replay,   IfPm3Present,    "<mac>       Read an iClass tag via Replay Attack"},
-    {"sim",         CmdHFiClassSim,             IfPm3Present,    "[options..] Simulate iClass tag"},
-    {"sniff",       CmdHFiClassSniff,           IfPm3Present,    "            Eavesdrop iClass communication"},
-    {"writeblk",    CmdHFiClass_WriteBlock,     IfPm3Present,    "[options..] Authenticate and Write iClass block"},
+    {"replay",      CmdHFiClassReader_Replay,   IfPm3Iclass,     "<mac>       Read an iClass tag via Replay Attack"},
+    {"sim",         CmdHFiClassSim,             IfPm3Iclass,     "[options..] Simulate iClass tag"},
+    {"sniff",       CmdHFiClassSniff,           IfPm3Iclass,     "            Eavesdrop iClass communication"},
+    {"writeblk",    CmdHFiClass_WriteBlock,     IfPm3Iclass,     "[options..] Authenticate and Write iClass block"},
     {NULL, NULL, NULL, NULL}
 };
 

From d7b53aacee7084f25485244037d0653453104866 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 1 May 2019 23:26:06 +0200
Subject: [PATCH 1560/1938] Replace WITH_HITAG by dynamic detection in client

---
 client/cmdlf.c      |  8 +++-----
 client/cmdlfhitag.c | 14 +++++++-------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/client/cmdlf.c b/client/cmdlf.c
index cf607f2e4..49ee94ba5 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -865,9 +865,9 @@ int CmdLFfind(const char *Cmd) {
         // The improved noise detection will find Cotag.
         if (getSignalProperties()->isnoise) {
 
-#ifdef WITH_HITAG
-            if (readHitagUid()) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Hitag") " found!"); return 1;}
-#endif
+            if (IfPm3Hitag()) {
+                if (readHitagUid()) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Hitag") " found!"); return 1;}
+            }
             if (readCOTAGUid()) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("COTAG ID") " found!"); return 1;}
 
             PrintAndLogEx(FAILED, "\n" _YELLOW_("No data found!") " - Signal looks like noise. Maybe not an LF tag?");
@@ -956,9 +956,7 @@ static command_t CommandTable[] = {
     {"fdx",         CmdLFFdx,           AlwaysAvailable, "{ FDX-B RFIDs...             }"},
     {"gproxii",     CmdLFGuard,         AlwaysAvailable, "{ Guardall Prox II RFIDs...  }"},
     {"hid",         CmdLFHID,           AlwaysAvailable, "{ HID RFIDs...               }"},
-#ifdef WITH_HITAG
     {"hitag",       CmdLFHitag,         AlwaysAvailable, "{ Hitag CHIPs...             }"},
-#endif
     {"indala",      CmdLFINDALA,        AlwaysAvailable, "{ Indala RFIDs...            }"},
     {"io",          CmdLFIO,            AlwaysAvailable, "{ ioProx RFIDs...            }"},
     {"jablotron",   CmdLFJablotron,     AlwaysAvailable, "{ Jablotron RFIDs...         }"},
diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index 87b3cad1d..86eb3930a 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -695,13 +695,13 @@ static int CmdLFHitagDump(const char *Cmd) {
 
 static command_t CommandTable[] = {
     {"help",     CmdHelp,                   AlwaysAvailable, "This help" },
-    {"list",     CmdLFHitagList,            IfPm3Present,    "List Hitag trace history" },
-    {"info",     CmdLFHitagInfo,            AlwaysAvailable, "Tag information" },
-    {"reader",   CmdLFHitagReader,          AlwaysAvailable, "Act like a Hitag Reader" },
-    {"sim",      CmdLFHitagSim,             AlwaysAvailable, "Simulate Hitag transponder" },
-    {"sniff",    CmdLFHitagSniff,           AlwaysAvailable, "Eavesdrop Hitag communication" },
-    {"writer",   CmdLFHitagWriter,          AlwaysAvailable, "Act like a Hitag Writer" },
-    {"cc",       CmdLFHitagCheckChallenges, AlwaysAvailable, "Test all challenges" },
+    {"list",     CmdLFHitagList,            IfPm3Hitag,      "List Hitag trace history" },
+    {"info",     CmdLFHitagInfo,            IfPm3Hitag,      "Tag information" },
+    {"reader",   CmdLFHitagReader,          IfPm3Hitag,      "Act like a Hitag Reader" },
+    {"sim",      CmdLFHitagSim,             IfPm3Hitag,      "Simulate Hitag transponder" },
+    {"sniff",    CmdLFHitagSniff,           IfPm3Hitag,      "Eavesdrop Hitag communication" },
+    {"writer",   CmdLFHitagWriter,          IfPm3Hitag,      "Act like a Hitag Writer" },
+    {"cc",       CmdLFHitagCheckChallenges, IfPm3Hitag,      "Test all challenges" },
     { NULL, NULL, 0, NULL }
 };
 

From e6135a8f78cbd824417fd1ab8039848af437688a Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 1 May 2019 23:38:57 +0200
Subject: [PATCH 1561/1938] Replace WITH_ISO14443a by dynamic detection in
 client

---
 client/cmdhf14a.c       | 20 +++++------
 client/cmdhfepa.c       |  4 +--
 client/cmdhffido.c      | 10 +++---
 client/cmdhfmf.c        | 74 ++++++++++++++++++++---------------------
 client/cmdhfmfdes.c     | 12 +++----
 client/cmdhfmfdesfire.c |  8 ++---
 client/cmdhfmfp.c       | 20 +++++------
 client/cmdhfmfu.c       | 26 +++++++--------
 client/cmdhftopaz.c     | 10 +++---
 client/cmdparser.c      |  6 ++++
 client/cmdparser.h      |  1 +
 11 files changed, 99 insertions(+), 92 deletions(-)

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index c54c51741..1f27e5a2d 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -1116,16 +1116,16 @@ static int CmdHF14AChaining(const char *Cmd) {
 
 static command_t CommandTable[] = {
     {"help",        CmdHelp,              AlwaysAvailable, "This help"},
-    {"list",        CmdHF14AList,         IfPm3Present,    "List ISO 14443-a history"},
-    {"info",        CmdHF14AInfo,         IfPm3Present,    "Tag information"},
-    {"reader",      CmdHF14AReader,       IfPm3Present,    "Act like an ISO14443-a reader"},
-    {"cuids",       CmdHF14ACUIDs,        IfPm3Present,    "<n> Collect n>0 ISO14443-a UIDs in one go"},
-    {"sim",         CmdHF14ASim,          IfPm3Present,    "<UID> -- Simulate ISO 14443-a tag"},
-    {"sniff",       CmdHF14ASniff,        IfPm3Present,    "sniff ISO 14443-a traffic"},
-    {"apdu",        CmdHF14AAPDU,         IfPm3Present,    "Send ISO 14443-4 APDU to tag"},
-    {"chaining",    CmdHF14AChaining,     IfPm3Present,    "Control ISO 14443-4 input chaining"},
-    {"raw",         CmdHF14ACmdRaw,       IfPm3Present,    "Send raw hex data to tag"},
-    {"antifuzz",    CmdHF14AAntiFuzz,     IfPm3Present,    "Fuzzing the anticollision phase.  Warning! Readers may react strange"},
+    {"list",        CmdHF14AList,         IfPm3Iso14443a,  "List ISO 14443-a history"},
+    {"info",        CmdHF14AInfo,         IfPm3Iso14443a,  "Tag information"},
+    {"reader",      CmdHF14AReader,       IfPm3Iso14443a,  "Act like an ISO14443-a reader"},
+    {"cuids",       CmdHF14ACUIDs,        IfPm3Iso14443a,  "<n> Collect n>0 ISO14443-a UIDs in one go"},
+    {"sim",         CmdHF14ASim,          IfPm3Iso14443a,  "<UID> -- Simulate ISO 14443-a tag"},
+    {"sniff",       CmdHF14ASniff,        IfPm3Iso14443a,  "sniff ISO 14443-a traffic"},
+    {"apdu",        CmdHF14AAPDU,         IfPm3Iso14443a,  "Send ISO 14443-4 APDU to tag"},
+    {"chaining",    CmdHF14AChaining,     IfPm3Iso14443a,  "Control ISO 14443-4 input chaining"},
+    {"raw",         CmdHF14ACmdRaw,       IfPm3Iso14443a,  "Send raw hex data to tag"},
+    {"antifuzz",    CmdHF14AAntiFuzz,     IfPm3Iso14443a,  "Fuzzing the anticollision phase.  Warning! Readers may react strange"},
     {NULL, NULL, NULL, NULL}
 };
 
diff --git a/client/cmdhfepa.c b/client/cmdhfepa.c
index 18812d15a..c2dbc0163 100644
--- a/client/cmdhfepa.c
+++ b/client/cmdhfepa.c
@@ -158,8 +158,8 @@ static int CmdHFEPAPACEReplay(const char *Cmd) {
 
 static command_t CommandTable[] = {
     {"help",    CmdHelp,                   AlwaysAvailable, "This help"},
-    {"cnonces", CmdHFEPACollectPACENonces, IfPm3Present,    "<m> <n> <d> Acquire n>0 encrypted PACE nonces of size m>0 with d sec pauses"},
-    {"preplay", CmdHFEPAPACEReplay,        IfPm3Present,    "<mse> <get> <map> <pka> <ma> Perform PACE protocol by replaying given APDUs"},
+    {"cnonces", CmdHFEPACollectPACENonces, IfPm3Iso14443,   "<m> <n> <d> Acquire n>0 encrypted PACE nonces of size m>0 with d sec pauses"},
+    {"preplay", CmdHFEPAPACEReplay,        IfPm3Iso14443,   "<mse> <get> <map> <pka> <ma> Perform PACE protocol by replaying given APDUs"},
     {NULL, NULL, NULL, NULL}
 };
 
diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index 522d525ec..39b080dca 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -896,11 +896,11 @@ static int CmdHFFido2GetAssertion(const char *cmd) {
 
 static command_t CommandTable[] = {
     {"help",             CmdHelp,                    AlwaysAvailable, "This help."},
-    {"info",             CmdHFFidoInfo,              IfPm3Present,    "Info about FIDO tag."},
-    {"reg",              CmdHFFidoRegister,          IfPm3Present,    "FIDO U2F Registration Message."},
-    {"auth",             CmdHFFidoAuthenticate,      IfPm3Present,    "FIDO U2F Authentication Message."},
-    {"make",             CmdHFFido2MakeCredential,   IfPm3Present,    "FIDO2 MakeCredential command."},
-    {"assert",           CmdHFFido2GetAssertion,     IfPm3Present,    "FIDO2 GetAssertion command."},
+    {"info",             CmdHFFidoInfo,              IfPm3Iso14443a,  "Info about FIDO tag."},
+    {"reg",              CmdHFFidoRegister,          IfPm3Iso14443a,  "FIDO U2F Registration Message."},
+    {"auth",             CmdHFFidoAuthenticate,      IfPm3Iso14443a,  "FIDO U2F Authentication Message."},
+    {"make",             CmdHFFido2MakeCredential,   IfPm3Iso14443a,  "FIDO2 MakeCredential command."},
+    {"assert",           CmdHFFido2GetAssertion,     IfPm3Iso14443a,  "FIDO2 GetAssertion command."},
     {NULL,               NULL,                       0, NULL}
 };
 
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 1b10440df..736b705a8 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -3551,46 +3551,46 @@ static int CmdHF14AMfList(const char *Cmd) {
 
 static command_t CommandTable[] = {
     {"help",        CmdHelp,                AlwaysAvailable, "This help"},
-    {"list",        CmdHF14AMfList,         IfPm3Present,    "List Mifare history"},
-    {"darkside",    CmdHF14AMfDarkside,     IfPm3Present,    "Darkside attack. read parity error messages."},
-    {"nested",      CmdHF14AMfNested,       IfPm3Present,    "Nested attack. Test nested authentication"},
-    {"hardnested",  CmdHF14AMfNestedHard,   IfPm3Present,    "Nested attack for hardened Mifare cards"},
-    {"keybrute",    CmdHF14AMfKeyBrute,     IfPm3Present,    "J_Run's 2nd phase of multiple sector nested authentication key recovery"},
-    {"nack",        CmdHf14AMfNack,         IfPm3Present,    "Test for Mifare NACK bug"},
-    {"chk",         CmdHF14AMfChk,          IfPm3Present,    "Check keys"},
-    {"fchk",        CmdHF14AMfChk_fast,     IfPm3Present,    "Check keys fast, targets all keys on card"},
+    {"list",        CmdHF14AMfList,         IfPm3Iso14443a,  "List Mifare history"},
+    {"darkside",    CmdHF14AMfDarkside,     IfPm3Iso14443a,  "Darkside attack. read parity error messages."},
+    {"nested",      CmdHF14AMfNested,       IfPm3Iso14443a,  "Nested attack. Test nested authentication"},
+    {"hardnested",  CmdHF14AMfNestedHard,   IfPm3Iso14443a,  "Nested attack for hardened Mifare cards"},
+    {"keybrute",    CmdHF14AMfKeyBrute,     IfPm3Iso14443a,  "J_Run's 2nd phase of multiple sector nested authentication key recovery"},
+    {"nack",        CmdHf14AMfNack,         IfPm3Iso14443a,  "Test for Mifare NACK bug"},
+    {"chk",         CmdHF14AMfChk,          IfPm3Iso14443a,  "Check keys"},
+    {"fchk",        CmdHF14AMfChk_fast,     IfPm3Iso14443a,  "Check keys fast, targets all keys on card"},
     {"decrypt",     CmdHf14AMfDecryptBytes, AlwaysAvailable, "[nt] [ar_enc] [at_enc] [data] - to decrypt sniff or trace"},
-    {"-----------", CmdHelp,                IfPm3Present,    ""},
-    {"dbg",         CmdHF14AMfDbg,          IfPm3Present,    "Set default debug mode"},
-    {"rdbl",        CmdHF14AMfRdBl,         IfPm3Present,    "Read MIFARE classic block"},
-    {"rdsc",        CmdHF14AMfRdSc,         IfPm3Present,    "Read MIFARE classic sector"},
-    {"dump",        CmdHF14AMfDump,         IfPm3Present,    "Dump MIFARE classic tag to binary file"},
-    {"restore",     CmdHF14AMfRestore,      IfPm3Present,    "Restore MIFARE classic binary file to BLANK tag"},
-    {"wrbl",        CmdHF14AMfWrBl,         IfPm3Present,    "Write MIFARE classic block"},
-    {"setmod",      CmdHf14AMfSetMod,       IfPm3Present,    "Set MIFARE Classic EV1 load modulation strength"},
-    {"auth4",       CmdHF14AMfAuth4,        IfPm3Present,    "ISO14443-4 AES authentication"},
+    {"-----------", CmdHelp,                IfPm3Iso14443a,  ""},
+    {"dbg",         CmdHF14AMfDbg,          IfPm3Iso14443a,  "Set default debug mode"},
+    {"rdbl",        CmdHF14AMfRdBl,         IfPm3Iso14443a,  "Read MIFARE classic block"},
+    {"rdsc",        CmdHF14AMfRdSc,         IfPm3Iso14443a,  "Read MIFARE classic sector"},
+    {"dump",        CmdHF14AMfDump,         IfPm3Iso14443a,  "Dump MIFARE classic tag to binary file"},
+    {"restore",     CmdHF14AMfRestore,      IfPm3Iso14443a,  "Restore MIFARE classic binary file to BLANK tag"},
+    {"wrbl",        CmdHF14AMfWrBl,         IfPm3Iso14443a,  "Write MIFARE classic block"},
+    {"setmod",      CmdHf14AMfSetMod,       IfPm3Iso14443a,  "Set MIFARE Classic EV1 load modulation strength"},
+    {"auth4",       CmdHF14AMfAuth4,        IfPm3Iso14443a,  "ISO14443-4 AES authentication"},
 //    {"sniff",       CmdHF14AMfSniff,        0, "Sniff card-reader communication"},
-    {"-----------", CmdHelp,                IfPm3Present,    ""},
-    {"sim",         CmdHF14AMfSim,        IfPm3Present,    "Simulate MIFARE card"},
-    {"eclr",        CmdHF14AMfEClear,       IfPm3Present,    "Clear simulator memory"},
-    {"eget",        CmdHF14AMfEGet,         IfPm3Present,    "Get simulator memory block"},
-    {"eset",        CmdHF14AMfESet,         IfPm3Present,    "Set simulator memory block"},
-    {"eload",       CmdHF14AMfELoad,        IfPm3Present,    "Load from file emul dump"},
-    {"esave",       CmdHF14AMfESave,        IfPm3Present,    "Save to file emul dump"},
-    {"ecfill",      CmdHF14AMfECFill,       IfPm3Present,    "Fill simulator memory with help of keys from simulator"},
-    {"ekeyprn",     CmdHF14AMfEKeyPrn,      IfPm3Present,    "Print keys from simulator memory"},
-    {"-----------", CmdHelp,                IfPm3Present,    ""},
-    {"csetuid",     CmdHF14AMfCSetUID,      IfPm3Present,    "Set UID for magic Chinese card"},
-    {"csetblk",     CmdHF14AMfCSetBlk,      IfPm3Present,    "Write block - Magic Chinese card"},
-    {"cgetblk",     CmdHF14AMfCGetBlk,      IfPm3Present,    "Read block - Magic Chinese card"},
-    {"cgetsc",      CmdHF14AMfCGetSc,       IfPm3Present,    "Read sector - Magic Chinese card"},
-    {"cload",       CmdHF14AMfCLoad,        IfPm3Present,    "Load dump into magic Chinese card"},
-    {"csave",       CmdHF14AMfCSave,        IfPm3Present,    "Save dump from magic Chinese card into file or emulator"},
-    {"-----------", CmdHelp,                IfPm3Present,    ""},
-    {"mad",         CmdHF14AMfMAD,          IfPm3Present,    "Checks and prints MAD"},
-    {"ndef",        CmdHFMFNDEF,            IfPm3Present,    "Prints NDEF records from card"},
+    {"-----------", CmdHelp,                IfPm3Iso14443a,  ""},
+    {"sim",         CmdHF14AMfSim,        IfPm3Iso14443a,  "Simulate MIFARE card"},
+    {"eclr",        CmdHF14AMfEClear,       IfPm3Iso14443a,  "Clear simulator memory"},
+    {"eget",        CmdHF14AMfEGet,         IfPm3Iso14443a,  "Get simulator memory block"},
+    {"eset",        CmdHF14AMfESet,         IfPm3Iso14443a,  "Set simulator memory block"},
+    {"eload",       CmdHF14AMfELoad,        IfPm3Iso14443a,  "Load from file emul dump"},
+    {"esave",       CmdHF14AMfESave,        IfPm3Iso14443a,  "Save to file emul dump"},
+    {"ecfill",      CmdHF14AMfECFill,       IfPm3Iso14443a,  "Fill simulator memory with help of keys from simulator"},
+    {"ekeyprn",     CmdHF14AMfEKeyPrn,      IfPm3Iso14443a,  "Print keys from simulator memory"},
+    {"-----------", CmdHelp,                IfPm3Iso14443a,  ""},
+    {"csetuid",     CmdHF14AMfCSetUID,      IfPm3Iso14443a,  "Set UID for magic Chinese card"},
+    {"csetblk",     CmdHF14AMfCSetBlk,      IfPm3Iso14443a,  "Write block - Magic Chinese card"},
+    {"cgetblk",     CmdHF14AMfCGetBlk,      IfPm3Iso14443a,  "Read block - Magic Chinese card"},
+    {"cgetsc",      CmdHF14AMfCGetSc,       IfPm3Iso14443a,  "Read sector - Magic Chinese card"},
+    {"cload",       CmdHF14AMfCLoad,        IfPm3Iso14443a,  "Load dump into magic Chinese card"},
+    {"csave",       CmdHF14AMfCSave,        IfPm3Iso14443a,  "Save dump from magic Chinese card into file or emulator"},
+    {"-----------", CmdHelp,                IfPm3Iso14443a,  ""},
+    {"mad",         CmdHF14AMfMAD,          IfPm3Iso14443a,  "Checks and prints MAD"},
+    {"ndef",        CmdHFMFNDEF,            IfPm3Iso14443a,  "Prints NDEF records from card"},
 
-    {"ice",         CmdHF14AMfice,          IfPm3Present,    "collect Mifare Classic nonces to file"},
+    {"ice",         CmdHF14AMfice,          IfPm3Iso14443a,  "collect Mifare Classic nonces to file"},
     {NULL, NULL, NULL, NULL}
 };
 
diff --git a/client/cmdhfmfdes.c b/client/cmdhfmfdes.c
index fa776fdd6..f5218ebb1 100644
--- a/client/cmdhfmfdes.c
+++ b/client/cmdhfmfdes.c
@@ -624,12 +624,12 @@ static int CmdHF14ADesAuth(const char *Cmd) {
 
 
 static command_t CommandTable[] = {
-    {"help",    CmdHelp,                    AlwaysAvailable, "This help"},
-    {"info",    CmdHF14ADesInfo,            IfPm3Present,    "Tag information"},
-    {"enum",    CmdHF14ADesEnumApplications, IfPm3Present,    "Tries enumerate all applications"},
-    {"auth",    CmdHF14ADesAuth,            IfPm3Present,    "Tries a MIFARE DesFire Authentication"},
-//    {"rdbl",    CmdHF14ADesRb,              0, "Read MIFARE DesFire block"},
-//    {"wrbl",    CmdHF14ADesWb,              0, "write MIFARE DesFire block"},
+    {"help",    CmdHelp,                     AlwaysAvailable, "This help"},
+    {"info",    CmdHF14ADesInfo,             IfPm3Iso14443a,  "Tag information"},
+    {"enum",    CmdHF14ADesEnumApplications, IfPm3Iso14443a,  "Tries enumerate all applications"},
+    {"auth",    CmdHF14ADesAuth,             IfPm3Iso14443a,  "Tries a MIFARE DesFire Authentication"},
+//    {"rdbl",    CmdHF14ADesRb,               IfPm3Iso14443a,  "Read MIFARE DesFire block"},
+//    {"wrbl",    CmdHF14ADesWb,               IfPm3Iso14443a,  "write MIFARE DesFire block"},
     {NULL, NULL, NULL, NULL}
 };
 
diff --git a/client/cmdhfmfdesfire.c b/client/cmdhfmfdesfire.c
index 7f9ae0758..b93edd02a 100644
--- a/client/cmdhfmfdesfire.c
+++ b/client/cmdhfmfdesfire.c
@@ -220,10 +220,10 @@ static int CmdHF14AMfAESAuth(const char *Cmd) {
 // Menu Stuff
 //------------------------------------
 static command_t CommandTable[] = {
-    {"help",    CmdHelp,            AlwaysAvailable, "This help"},
-    {"dbg",     CmdHF14AMfDbg,      IfPm3Present,    "Set default debug mode"},
-    {"des-auth", CmdHF14AMfDESAuth,  IfPm3Present,    "Desfire Authentication"},
-    {"ev1-auth", CmdHF14AMfAESAuth,  IfPm3Present,    "EV1 Authentication"},
+    {"help",     CmdHelp,            AlwaysAvailable, "This help"},
+    {"dbg",      CmdHF14AMfDbg,      IfPm3Iso14443a,  "Set default debug mode"},
+    {"des-auth", CmdHF14AMfDESAuth,  IfPm3Iso14443a,  "Desfire Authentication"},
+    {"ev1-auth", CmdHF14AMfAESAuth,  IfPm3Iso14443a,  "EV1 Authentication"},
     {NULL, NULL, NULL, NULL}
 };
 
diff --git a/client/cmdhfmfp.c b/client/cmdhfmfp.c
index 3474a12ae..e9bff0128 100644
--- a/client/cmdhfmfp.c
+++ b/client/cmdhfmfp.c
@@ -840,16 +840,16 @@ static int CmdHFMFPNDEF(const char *cmd) {
 
 static command_t CommandTable[] = {
     {"help",             CmdHelp,                 AlwaysAvailable, "This help"},
-    {"info",             CmdHFMFPInfo,            IfPm3Present,    "Info about Mifare Plus tag"},
-    {"wrp",              CmdHFMFPWritePerso,      IfPm3Present,    "Write Perso command"},
-    {"initp",            CmdHFMFPInitPerso,       IfPm3Present,    "Fills all the card's keys"},
-    {"commitp",          CmdHFMFPCommitPerso,     IfPm3Present,    "Move card to SL1 or SL3 mode"},
-    {"auth",             CmdHFMFPAuth,            IfPm3Present,    "Authentication"},
-    {"rdbl",             CmdHFMFPRdbl,            IfPm3Present,    "Read blocks"},
-    {"rdsc",             CmdHFMFPRdsc,            IfPm3Present,    "Read sectors"},
-    {"wrbl",             CmdHFMFPWrbl,            IfPm3Present,    "Write blocks"},
-    {"mad",              CmdHFMFPMAD,             IfPm3Present,    "Checks and prints MAD"},
-    {"ndef",             CmdHFMFPNDEF,            IfPm3Present,    "Prints NDEF records from card"},
+    {"info",             CmdHFMFPInfo,            IfPm3Iso14443a,  "Info about Mifare Plus tag"},
+    {"wrp",              CmdHFMFPWritePerso,      IfPm3Iso14443a,  "Write Perso command"},
+    {"initp",            CmdHFMFPInitPerso,       IfPm3Iso14443a,  "Fills all the card's keys"},
+    {"commitp",          CmdHFMFPCommitPerso,     IfPm3Iso14443a,  "Move card to SL1 or SL3 mode"},
+    {"auth",             CmdHFMFPAuth,            IfPm3Iso14443a,  "Authentication"},
+    {"rdbl",             CmdHFMFPRdbl,            IfPm3Iso14443a,  "Read blocks"},
+    {"rdsc",             CmdHFMFPRdsc,            IfPm3Iso14443a,  "Read sectors"},
+    {"wrbl",             CmdHFMFPWrbl,            IfPm3Iso14443a,  "Write blocks"},
+    {"mad",              CmdHFMFPMAD,             IfPm3Iso14443a,  "Checks and prints MAD"},
+    {"ndef",             CmdHFMFPNDEF,            IfPm3Iso14443a,  "Prints NDEF records from card"},
     {NULL,               NULL,                    0, NULL}
 };
 
diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index 5b30e2259..c38d8355b 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -2699,20 +2699,20 @@ static int CmdHF14AMfUPwdGen(const char *Cmd) {
 // Menu Stuff
 //------------------------------------
 static command_t CommandTable[] = {
-    {"help",    CmdHelp,            AlwaysAvailable, "This help"},
-    {"dbg",     CmdHF14AMfDbg,      IfPm3Present,    "Set default debug mode"},
-    {"info",    CmdHF14AMfUInfo,    IfPm3Present,    "Tag information"},
-    {"dump",    CmdHF14AMfUDump,    IfPm3Present,    "Dump Ultralight / Ultralight-C / NTAG tag to binary file"},
-    {"restore", CmdHF14AMfURestore, IfPm3Present,    "Restore a dump onto a MFU MAGIC tag"},
-    {"eload",   CmdHF14AMfUeLoad,   IfPm3Present,    "load Ultralight .eml dump file into emulator memory"},
-    {"rdbl",    CmdHF14AMfURdBl,    IfPm3Present,    "Read block"},
-    {"wrbl",    CmdHF14AMfUWrBl,    IfPm3Present,    "Write block"},
-    {"cauth",   CmdHF14AMfUCAuth,   IfPm3Present,    "Authentication    - Ultralight C"},
-    {"setpwd",  CmdHF14AMfUCSetPwd, IfPm3Present,    "Set 3des password - Ultralight-C"},
-    {"setuid",  CmdHF14AMfUCSetUid, IfPm3Present,    "Set UID - MAGIC tags only"},
-    {"sim",     CmdHF14AMfUSim,     IfPm3Present,    "Simulate Ultralight from emulator memory"},
+    {"help",    CmdHelp,                   AlwaysAvailable, "This help"},
+    {"dbg",     CmdHF14AMfDbg,             IfPm3Iso14443a,  "Set default debug mode"},
+    {"info",    CmdHF14AMfUInfo,           IfPm3Iso14443a,  "Tag information"},
+    {"dump",    CmdHF14AMfUDump,           IfPm3Iso14443a,  "Dump Ultralight / Ultralight-C / NTAG tag to binary file"},
+    {"restore", CmdHF14AMfURestore,        IfPm3Iso14443a,  "Restore a dump onto a MFU MAGIC tag"},
+    {"eload",   CmdHF14AMfUeLoad,          IfPm3Iso14443a,  "load Ultralight .eml dump file into emulator memory"},
+    {"rdbl",    CmdHF14AMfURdBl,           IfPm3Iso14443a,  "Read block"},
+    {"wrbl",    CmdHF14AMfUWrBl,           IfPm3Iso14443a,  "Write block"},
+    {"cauth",   CmdHF14AMfUCAuth,          IfPm3Iso14443a,  "Authentication    - Ultralight C"},
+    {"setpwd",  CmdHF14AMfUCSetPwd,        IfPm3Iso14443a,  "Set 3des password - Ultralight-C"},
+    {"setuid",  CmdHF14AMfUCSetUid,        IfPm3Iso14443a,  "Set UID - MAGIC tags only"},
+    {"sim",     CmdHF14AMfUSim,            IfPm3Iso14443a,  "Simulate Ultralight from emulator memory"},
     {"gen",     CmdHF14AMfUGenDiverseKeys, AlwaysAvailable, "Generate 3des mifare diversified keys"},
-    {"pwdgen",  CmdHF14AMfUPwdGen,  AlwaysAvailable, "Generate pwd from known algos"},
+    {"pwdgen",  CmdHF14AMfUPwdGen,         AlwaysAvailable, "Generate pwd from known algos"},
     {NULL, NULL, NULL, NULL}
 };
 
diff --git a/client/cmdhftopaz.c b/client/cmdhftopaz.c
index 74705441f..c594a3f15 100644
--- a/client/cmdhftopaz.c
+++ b/client/cmdhftopaz.c
@@ -505,11 +505,11 @@ static int CmdHelp(const char *Cmd);
 
 static command_t CommandTable[] = {
     {"help",    CmdHelp,            AlwaysAvailable, "This help"},
-    {"reader",  CmdHFTopazReader,   IfPm3Present,    "Act like a Topaz reader"},
-    {"sim",     CmdHFTopazSim,      IfPm3Present,    "<UID> -- Simulate Topaz tag"},
-    {"sniff",   CmdHF14ASniff,      IfPm3Present,    "Sniff Topaz reader-tag communication"},
-    {"raw",     CmdHFTopazCmdRaw,   IfPm3Present,    "Send raw hex data to tag"},
-    {"list",    CmdHFTopazList,     IfPm3Present,    "List Topaz history"},
+    {"reader",  CmdHFTopazReader,   IfPm3Iso14443a,  "Act like a Topaz reader"},
+    {"sim",     CmdHFTopazSim,      IfPm3Iso14443a,  "<UID> -- Simulate Topaz tag"},
+    {"sniff",   CmdHF14ASniff,      IfPm3Iso14443a,  "Sniff Topaz reader-tag communication"},
+    {"raw",     CmdHFTopazCmdRaw,   IfPm3Iso14443a,  "Send raw hex data to tag"},
+    {"list",    CmdHFTopazList,     IfPm3Iso14443a,  "List Topaz history"},
     {NULL,      NULL,               0, NULL}
 };
 
diff --git a/client/cmdparser.c b/client/cmdparser.c
index 2ecd25fc4..c7bd7a01e 100644
--- a/client/cmdparser.c
+++ b/client/cmdparser.c
@@ -87,6 +87,12 @@ bool IfPm3Iso14443b(void) {
     return pm3_capabilities.compiled_with_iso14443b;
 }
 
+bool IfPm3Iso14443(void) {
+    if (!IfPm3Present())
+        return false;
+    return pm3_capabilities.compiled_with_iso14443a || pm3_capabilities.compiled_with_iso14443b;
+}
+
 bool IfPm3Iso15693(void) {
     if (!IfPm3Present())
         return false;
diff --git a/client/cmdparser.h b/client/cmdparser.h
index 57c5422e9..36788d226 100644
--- a/client/cmdparser.h
+++ b/client/cmdparser.h
@@ -31,6 +31,7 @@ bool IfPm3Hitag(void);
 bool IfPm3Hfsniff(void);
 bool IfPm3Iso14443a(void);
 bool IfPm3Iso14443b(void);
+bool IfPm3Iso14443(void);
 bool IfPm3Iso15693(void);
 bool IfPm3Felica(void);
 bool IfPm3Legicrf(void);

From 36058090737b4f0dd89aee8c6ddaf6b6dce2fa61 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 1 May 2019 23:43:08 +0200
Subject: [PATCH 1562/1938] Remove WITH_FLASH from common as it's used by
 client too

---
 include/common.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/include/common.h b/include/common.h
index 76ebccbf0..bfb831c2f 100644
--- a/include/common.h
+++ b/include/common.h
@@ -82,7 +82,6 @@ extern uint32_t FLASHMEM_SPIBAUDRATE;
 # define FLASH_MEM_SIGNATURE_OFFSET (FLASH_MEM_MAX_SIZE - FLASH_MEM_SIGNATURE_LEN)
 #endif
 
-#ifdef WITH_FLASH
 #ifndef T55XX_CONFIG_LEN
 # define T55XX_CONFIG_LEN sizeof( t55xx_config )
 #endif
@@ -102,7 +101,6 @@ extern uint32_t FLASHMEM_SPIBAUDRATE;
 #ifndef DEFAULT_ICLASS_KEYS_OFFSET
 # define DEFAULT_ICLASS_KEYS_OFFSET (FLASH_MEM_MAX_4K_SECTOR - 0x5000)
 #endif
-#endif
 
 // RDV40,  validation structure to help identifying that client/firmware is talking with RDV40
 typedef struct {

From 32bb9511ec5aefb2cd9785d2c1322676d858b436 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 2 May 2019 00:02:38 +0200
Subject: [PATCH 1563/1938] Replace WITH_LF by dynamic detection in client

---
 client/cmdlf.c          | 18 +++++++++---------
 client/cmdlfawid.c      | 10 +++++-----
 client/cmdlfcotag.c     |  2 +-
 client/cmdlfem4x.c      | 28 ++++++++++++++--------------
 client/cmdlffdx.c       |  8 ++++----
 client/cmdlfguard.c     |  6 +++---
 client/cmdlfhid.c       | 10 +++++-----
 client/cmdlfindala.c    |  6 +++---
 client/cmdlfio.c        |  6 +++---
 client/cmdlfjablotron.c |  6 +++---
 client/cmdlfkeri.c      |  6 +++---
 client/cmdlfnedap.c     | 12 ++++++------
 client/cmdlfnexwatch.c  |  2 +-
 client/cmdlfnoralsy.c   |  8 ++++----
 client/cmdlfpac.c       |  4 ++--
 client/cmdlfparadox.c   |  6 +++---
 client/cmdlfpcf7931.c   |  4 ++--
 client/cmdlfpresco.c    |  6 +++---
 client/cmdlfpyramid.c   | 10 +++++-----
 client/cmdlfsecurakey.c |  8 ++++----
 client/cmdlft55xx.c     | 34 +++++++++++++++++-----------------
 client/cmdlfti.c        |  4 ++--
 client/cmdlfviking.c    |  6 +++---
 client/cmdlfvisa2000.c  |  6 +++---
 24 files changed, 108 insertions(+), 108 deletions(-)

diff --git a/client/cmdlf.c b/client/cmdlf.c
index 49ee94ba5..9330b2ff4 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -974,17 +974,17 @@ static command_t CommandTable[] = {
     {"t55xx",       CmdLFT55XX,         AlwaysAvailable, "{ T55xx CHIPs...             }"},
     {"viking",      CmdLFViking,        AlwaysAvailable, "{ Viking RFIDs...            }"},
     {"visa2000",    CmdLFVisa2k,        AlwaysAvailable, "{ Visa2000 RFIDs...          }"},
-    {"config",      CmdLFSetConfig,     IfPm3Present,    "Set config for LF sampling, bit/sample, decimation, frequency"},
-    {"cmdread",     CmdLFCommandRead,   IfPm3Present,    "<off period> <'0' period> <'1' period> <command> ['h' 134] \n\t\t-- Modulate LF reader field to send command before read (all periods in microseconds)"},
+    {"config",      CmdLFSetConfig,     IfPm3Lf,         "Set config for LF sampling, bit/sample, decimation, frequency"},
+    {"cmdread",     CmdLFCommandRead,   IfPm3Lf,         "<off period> <'0' period> <'1' period> <command> ['h' 134] \n\t\t-- Modulate LF reader field to send command before read (all periods in microseconds)"},
     {"flexdemod",   CmdFlexdemod,       AlwaysAvailable, "Demodulate samples for FlexPass"},
-    {"read",        CmdLFRead,          IfPm3Present,    "['s' silent] Read 125/134 kHz LF ID-only tag. Do 'lf read h' for help"},
+    {"read",        CmdLFRead,          IfPm3Lf,         "['s' silent] Read 125/134 kHz LF ID-only tag. Do 'lf read h' for help"},
     {"search",      CmdLFfind,          AlwaysAvailable, "[offline] ['u'] Read and Search for valid known tag (in offline mode it you can load first then search) \n\t\t-- 'u' to search for unknown tags"},
-    {"sim",         CmdLFSim,           IfPm3Present,    "[GAP] -- Simulate LF tag from buffer with optional GAP (in microseconds)"},
-    {"simask",      CmdLFaskSim,        IfPm3Present,    "[clock] [invert <1|0>] [biphase/manchester/raw <'b'|'m'|'r'>] [msg separator 's'] [d <hexdata>] \n\t\t-- Simulate LF ASK tag from demodbuffer or input"},
-    {"simfsk",      CmdLFfskSim,        IfPm3Present,    "[c <clock>] [i] [H <fcHigh>] [L <fcLow>] [d <hexdata>] \n\t\t-- Simulate LF FSK tag from demodbuffer or input"},
-    {"simpsk",      CmdLFpskSim,        IfPm3Present,    "[1|2|3] [c <clock>] [i] [r <carrier>] [d <raw hex to sim>] \n\t\t-- Simulate LF PSK tag from demodbuffer or input"},
-    {"simbidir",    CmdLFSimBidir,      IfPm3Present,    "Simulate LF tag (with bidirectional data transmission between reader and tag)"},
-    {"sniff",       CmdLFSniff,         IfPm3Present,    "Sniff LF traffic between reader and tag"},
+    {"sim",         CmdLFSim,           IfPm3Lf,         "[GAP] -- Simulate LF tag from buffer with optional GAP (in microseconds)"},
+    {"simask",      CmdLFaskSim,        IfPm3Lf,         "[clock] [invert <1|0>] [biphase/manchester/raw <'b'|'m'|'r'>] [msg separator 's'] [d <hexdata>] \n\t\t-- Simulate LF ASK tag from demodbuffer or input"},
+    {"simfsk",      CmdLFfskSim,        IfPm3Lf,         "[c <clock>] [i] [H <fcHigh>] [L <fcLow>] [d <hexdata>] \n\t\t-- Simulate LF FSK tag from demodbuffer or input"},
+    {"simpsk",      CmdLFpskSim,        IfPm3Lf,         "[1|2|3] [c <clock>] [i] [r <carrier>] [d <raw hex to sim>] \n\t\t-- Simulate LF PSK tag from demodbuffer or input"},
+    {"simbidir",    CmdLFSimBidir,      IfPm3Lf,         "Simulate LF tag (with bidirectional data transmission between reader and tag)"},
+    {"sniff",       CmdLFSniff,         IfPm3Lf,         "Sniff LF traffic between reader and tag"},
     {"vchdemod",    CmdVchDemod,        AlwaysAvailable, "['clone'] -- Demodulate samples for VeriChip"},
     {NULL, NULL, NULL, NULL}
 };
diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c
index abecb6791..046df1ce9 100644
--- a/client/cmdlfawid.c
+++ b/client/cmdlfawid.c
@@ -492,11 +492,11 @@ static int CmdAWIDBrute(const char *Cmd) {
 
 static command_t CommandTable[] = {
     {"help",    CmdHelp,        AlwaysAvailable, "this help"},
-    {"demod",   CmdAWIDDemod,   IfPm3Present,    "demodulate an AWID FSK tag from the GraphBuffer"},
-    {"read",    CmdAWIDRead,    IfPm3Present,    "attempt to read and extract tag data"},
-    {"clone",   CmdAWIDClone,   IfPm3Present,    "clone AWID to T55x7"},
-    {"sim",     CmdAWIDSim,     IfPm3Present,    "simulate AWID tag"},
-    {"brute",   CmdAWIDBrute,   IfPm3Present,    "Bruteforce card number against reader"},
+    {"demod",   CmdAWIDDemod,   AlwaysAvailable, "demodulate an AWID FSK tag from the GraphBuffer"},
+    {"read",    CmdAWIDRead,    IfPm3Lf,         "attempt to read and extract tag data"},
+    {"clone",   CmdAWIDClone,   IfPm3Lf,         "clone AWID to T55x7"},
+    {"sim",     CmdAWIDSim,     IfPm3Lf,         "simulate AWID tag"},
+    {"brute",   CmdAWIDBrute,   IfPm3Lf,         "Bruteforce card number against reader"},
     {NULL, NULL, NULL, NULL}
 };
 
diff --git a/client/cmdlfcotag.c b/client/cmdlfcotag.c
index 2bb92f32a..9875d969f 100644
--- a/client/cmdlfcotag.c
+++ b/client/cmdlfcotag.c
@@ -105,7 +105,7 @@ static int CmdCOTAGRead(const char *Cmd) {
 static command_t CommandTable[] = {
     {"help",      CmdHelp,         AlwaysAvailable, "This help"},
     {"demod",     CmdCOTAGDemod,   AlwaysAvailable, "Tries to decode a COTAG signal"},
-    {"read",      CmdCOTAGRead,    IfPm3Present,    "Attempt to read and extract tag data"},
+    {"read",      CmdCOTAGRead,    IfPm3Lf,         "Attempt to read and extract tag data"},
     {NULL, NULL, NULL, NULL}
 };
 
diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index be00d01ba..dc06f02d5 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -1465,21 +1465,21 @@ static int CmdEM4x05Info(const char *Cmd) {
 
 static command_t CommandTable[] = {
     {"help",        CmdHelp,              AlwaysAvailable, "This help"},
-    //{"410x_demod",  CmdEMdemodASK,        0, "Extract ID from EM410x tag on antenna)"},
+    //{"410x_demod",  CmdEMdemodASK,        IfPm3Lf,         "Extract ID from EM410x tag on antenna)"},
     {"410x_demod",  CmdEM410xDemod,       AlwaysAvailable, "demodulate a EM410x tag from the GraphBuffer"},
-    {"410x_read",   CmdEM410xRead,        IfPm3Present,    "attempt to read and extract tag data"},
-    {"410x_sim",    CmdEM410xSim,         IfPm3Present,    "simulate EM410x tag"},
-    {"410x_brute",  CmdEM410xBrute,       IfPm3Present,    "reader bruteforce attack by simulating EM410x tags"},
-    {"410x_watch",  CmdEM410xWatch,       IfPm3Present,    "watches for EM410x 125/134 kHz tags (option 'h' for 134)"},
-    {"410x_spoof",  CmdEM410xWatchnSpoof, IfPm3Present,    "watches for EM410x 125/134 kHz tags, and replays them. (option 'h' for 134)" },
-    {"410x_write",  CmdEM410xWrite,       IfPm3Present,    "write EM410x UID to T5555(Q5) or T55x7 tag"},
-    {"4x05_dump",   CmdEM4x05Dump,        IfPm3Present,    "dump EM4x05/EM4x69 tag"},
-    {"4x05_info",   CmdEM4x05Info,        IfPm3Present,    "tag information EM4x05/EM4x69"},
-    {"4x05_read",   CmdEM4x05Read,        IfPm3Present,    "read word data from EM4x05/EM4x69"},
-    {"4x05_write",  CmdEM4x05Write,       IfPm3Present,    "write word data to EM4x05/EM4x69"},
-    {"4x50_dump",   CmdEM4x50Dump,        IfPm3Present,    "dump EM4x50 tag"},
-    {"4x50_read",   CmdEM4x50Read,        IfPm3Present,    "read word data from EM4x50"},
-    {"4x50_write",  CmdEM4x50Write,       IfPm3Present,    "write word data to EM4x50"},
+    {"410x_read",   CmdEM410xRead,        IfPm3Lf,         "attempt to read and extract tag data"},
+    {"410x_sim",    CmdEM410xSim,         IfPm3Lf,         "simulate EM410x tag"},
+    {"410x_brute",  CmdEM410xBrute,       IfPm3Lf,         "reader bruteforce attack by simulating EM410x tags"},
+    {"410x_watch",  CmdEM410xWatch,       IfPm3Lf,         "watches for EM410x 125/134 kHz tags (option 'h' for 134)"},
+    {"410x_spoof",  CmdEM410xWatchnSpoof, IfPm3Lf,         "watches for EM410x 125/134 kHz tags, and replays them. (option 'h' for 134)" },
+    {"410x_write",  CmdEM410xWrite,       IfPm3Lf,         "write EM410x UID to T5555(Q5) or T55x7 tag"},
+    {"4x05_dump",   CmdEM4x05Dump,        IfPm3Lf,         "dump EM4x05/EM4x69 tag"},
+    {"4x05_info",   CmdEM4x05Info,        IfPm3Lf,         "tag information EM4x05/EM4x69"},
+    {"4x05_read",   CmdEM4x05Read,        IfPm3Lf,         "read word data from EM4x05/EM4x69"},
+    {"4x05_write",  CmdEM4x05Write,       IfPm3Lf,         "write word data to EM4x05/EM4x69"},
+    {"4x50_dump",   CmdEM4x50Dump,        IfPm3Lf,         "dump EM4x50 tag"},
+    {"4x50_read",   CmdEM4x50Read,        IfPm3Lf,         "read word data from EM4x50"},
+    {"4x50_write",  CmdEM4x50Write,       IfPm3Lf,         "write word data to EM4x50"},
     {NULL, NULL, NULL, NULL}
 };
 
diff --git a/client/cmdlffdx.c b/client/cmdlffdx.c
index 48155e867..6ad487888 100644
--- a/client/cmdlffdx.c
+++ b/client/cmdlffdx.c
@@ -320,11 +320,11 @@ static int CmdFdxSim(const char *Cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",    CmdHelp,    AlwaysAvailable, "this help"},
+    {"help",    CmdHelp,     AlwaysAvailable, "this help"},
     {"demod",   CmdFdxDemod, AlwaysAvailable, "demodulate a FDX-B ISO11784/85 tag from the GraphBuffer"},
-    {"read",    CmdFdxRead, IfPm3Present,    "attempt to read and extract tag data"},
-    {"clone",   CmdFdxClone, IfPm3Present,    "clone animal ID tag to T55x7 (or to q5/T5555)"},
-    {"sim",     CmdFdxSim,  IfPm3Present,    "simulate Animal ID tag"},
+    {"read",    CmdFdxRead,  IfPm3Lf,         "attempt to read and extract tag data"},
+    {"clone",   CmdFdxClone, IfPm3Lf,         "clone animal ID tag to T55x7 (or to q5/T5555)"},
+    {"sim",     CmdFdxSim,   IfPm3Lf,         "simulate Animal ID tag"},
     {NULL, NULL, NULL, NULL}
 };
 
diff --git a/client/cmdlfguard.c b/client/cmdlfguard.c
index 663311bbb..420398b66 100644
--- a/client/cmdlfguard.c
+++ b/client/cmdlfguard.c
@@ -217,9 +217,9 @@ static int CmdGuardSim(const char *Cmd) {
 static command_t CommandTable[] = {
     {"help",    CmdHelp,        AlwaysAvailable, "this help"},
     {"demod",   CmdGuardDemod,  AlwaysAvailable, "demodulate a G Prox II tag from the GraphBuffer"},
-    {"read",    CmdGuardRead,   IfPm3Present,    "attempt to read and extract tag data from the antenna"},
-    {"clone",   CmdGuardClone,  IfPm3Present,    "clone Guardall tag"},
-    {"sim",     CmdGuardSim,    IfPm3Present,    "simulate Guardall tag"},
+    {"read",    CmdGuardRead,   IfPm3Lf,         "attempt to read and extract tag data from the antenna"},
+    {"clone",   CmdGuardClone,  IfPm3Lf,         "clone Guardall tag"},
+    {"sim",     CmdGuardSim,    IfPm3Lf,         "simulate Guardall tag"},
     {NULL, NULL, NULL, NULL}
 };
 
diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c
index a92f1fc00..13ab591fa 100644
--- a/client/cmdlfhid.c
+++ b/client/cmdlfhid.c
@@ -595,12 +595,12 @@ static int CmdHIDBrute(const char *Cmd) {
 
 static command_t CommandTable[] = {
     {"help",    CmdHelp,        AlwaysAvailable, "this help"},
-    {"demod",   CmdHIDDemod,    IfPm3Present,    "demodulate HID Prox tag from the GraphBuffer"},
-    {"read",    CmdHIDRead,     IfPm3Present,    "attempt to read and extract tag data"},
-    {"clone",   CmdHIDClone,    IfPm3Present,    "clone HID to T55x7"},
-    {"sim",     CmdHIDSim,      IfPm3Present,    "simulate HID tag"},
+    {"demod",   CmdHIDDemod,    AlwaysAvailable, "demodulate HID Prox tag from the GraphBuffer"},
+    {"read",    CmdHIDRead,     IfPm3Lf,         "attempt to read and extract tag data"},
+    {"clone",   CmdHIDClone,    IfPm3Lf,         "clone HID to T55x7"},
+    {"sim",     CmdHIDSim,      IfPm3Lf,         "simulate HID tag"},
     {"wiegand", CmdHIDWiegand,  AlwaysAvailable, "convert facility code/card number to Wiegand code"},
-    {"brute",   CmdHIDBrute,    IfPm3Present,    "bruteforce card number against reader"},
+    {"brute",   CmdHIDBrute,    IfPm3Lf,         "bruteforce card number against reader"},
     {NULL, NULL, NULL, NULL}
 };
 
diff --git a/client/cmdlfindala.c b/client/cmdlfindala.c
index bedf18cb6..d1d99db78 100644
--- a/client/cmdlfindala.c
+++ b/client/cmdlfindala.c
@@ -460,9 +460,9 @@ static command_t CommandTable[] = {
     {"help",     CmdHelp,            AlwaysAvailable, "this help"},
     {"demod",    CmdIndalaDemod,     AlwaysAvailable, "demodulate an indala tag (PSK1) from GraphBuffer"},
     {"altdemod", CmdIndalaDemodAlt,  AlwaysAvailable, "alternative method to Demodulate samples for Indala 64 bit UID (option '224' for 224 bit)"},
-    {"read",     CmdIndalaRead,      IfPm3Present,    "read an Indala Prox tag from the antenna"},
-    {"clone",    CmdIndalaClone,     IfPm3Present,    "clone Indala to T55x7"},
-    {"sim",      CmdIndalaSim,       IfPm3Present,    "simulate Indala tag"},
+    {"read",     CmdIndalaRead,      IfPm3Lf,         "read an Indala Prox tag from the antenna"},
+    {"clone",    CmdIndalaClone,     IfPm3Lf,         "clone Indala to T55x7"},
+    {"sim",      CmdIndalaSim,       IfPm3Lf,         "simulate Indala tag"},
     {NULL, NULL, NULL, NULL}
 };
 
diff --git a/client/cmdlfio.c b/client/cmdlfio.c
index 17b6c70b8..16214052b 100644
--- a/client/cmdlfio.c
+++ b/client/cmdlfio.c
@@ -259,9 +259,9 @@ static int CmdIOProxClone(const char *Cmd) {
 static command_t CommandTable[] = {
     {"help",    CmdHelp,        AlwaysAvailable, "this help"},
     {"demod",   CmdIOProxDemod, AlwaysAvailable, "demodulate an IOProx tag from the GraphBuffer"},
-    {"read",    CmdIOProxRead,  AlwaysAvailable, "attempt to read and extract tag data"},
-    {"clone",   CmdIOProxClone, IfPm3Present,    "clone IOProx to T55x7"},
-    {"sim",     CmdIOProxSim,   IfPm3Present,    "simulate IOProx tag"},
+    {"read",    CmdIOProxRead,  IfPm3Lf,         "attempt to read and extract tag data"},
+    {"clone",   CmdIOProxClone, IfPm3Lf,         "clone IOProx to T55x7"},
+    {"sim",     CmdIOProxSim,   IfPm3Lf,         "simulate IOProx tag"},
     {NULL, NULL, NULL, NULL}
 };
 
diff --git a/client/cmdlfjablotron.c b/client/cmdlfjablotron.c
index 2d69dfff4..c31923510 100644
--- a/client/cmdlfjablotron.c
+++ b/client/cmdlfjablotron.c
@@ -195,9 +195,9 @@ static int CmdJablotronSim(const char *Cmd) {
 static command_t CommandTable[] = {
     {"help",    CmdHelp,            AlwaysAvailable, "This help"},
     {"demod",   CmdJablotronDemod,  AlwaysAvailable, "Demodulate an Jablotron tag from the GraphBuffer"},
-    {"read",    CmdJablotronRead,   IfPm3Present,    "Attempt to read and extract tag data from the antenna"},
-    {"clone",   CmdJablotronClone,  IfPm3Present,    "clone jablotron tag"},
-    {"sim",     CmdJablotronSim,    IfPm3Present,    "simulate jablotron tag"},
+    {"read",    CmdJablotronRead,   IfPm3Lf,         "Attempt to read and extract tag data from the antenna"},
+    {"clone",   CmdJablotronClone,  IfPm3Lf,         "clone jablotron tag"},
+    {"sim",     CmdJablotronSim,    IfPm3Lf,         "simulate jablotron tag"},
     {NULL, NULL, NULL, NULL}
 };
 
diff --git a/client/cmdlfkeri.c b/client/cmdlfkeri.c
index 5e03aaa75..8d0111914 100644
--- a/client/cmdlfkeri.c
+++ b/client/cmdlfkeri.c
@@ -190,9 +190,9 @@ static int CmdKeriSim(const char *Cmd) {
 static command_t CommandTable[] = {
     {"help",  CmdHelp,      AlwaysAvailable, "This help"},
     {"demod", CmdKeriDemod, AlwaysAvailable, "Demodulate an KERI tag from the GraphBuffer"},
-    {"read",  CmdKeriRead,  IfPm3Present,    "Attempt to read and extract tag data from the antenna"},
-    {"clone", CmdKeriClone, IfPm3Present,    "clone KERI to T55x7"},
-    {"sim",   CmdKeriSim,   IfPm3Present,    "simulate KERI tag"},
+    {"read",  CmdKeriRead,  IfPm3Lf,         "Attempt to read and extract tag data from the antenna"},
+    {"clone", CmdKeriClone, IfPm3Lf,         "clone KERI to T55x7"},
+    {"sim",   CmdKeriSim,   IfPm3Lf,         "simulate KERI tag"},
     {NULL, NULL, NULL, NULL}
 };
 
diff --git a/client/cmdlfnedap.c b/client/cmdlfnedap.c
index 035c40919..e4a09ad34 100644
--- a/client/cmdlfnedap.c
+++ b/client/cmdlfnedap.c
@@ -294,12 +294,12 @@ static int CmdLFNedapChk(const char *Cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",    CmdHelp,        AlwaysAvailable, "this help"},
-    {"demod",   CmdLFNedapDemod, IfPm3Present,    "demodulate an Nedap tag from the GraphBuffer"},
-    {"read",    CmdLFNedapRead, IfPm3Present,    "attempt to read and extract tag data"},
-//  {"clone",   CmdLFNedapClone,0, "<Card Number>  clone nedap tag"},
-    {"sim",     CmdLFNedapSim,  IfPm3Present,    "simulate nedap tag"},
-    {"chk",     CmdLFNedapChk,  AlwaysAvailable, "calculate Nedap Checksum <uid bytes>"},
+    {"help",    CmdHelp,         AlwaysAvailable, "this help"},
+    {"demod",   CmdLFNedapDemod, AlwaysAvailable, "demodulate an Nedap tag from the GraphBuffer"},
+    {"read",    CmdLFNedapRead,  IfPm3Lf,         "attempt to read and extract tag data"},
+//  {"clone",   CmdLFNedapClone, IfPm3Lf,         "<Card Number>  clone nedap tag"},
+    {"sim",     CmdLFNedapSim,   IfPm3Lf,         "simulate nedap tag"},
+    {"chk",     CmdLFNedapChk,   AlwaysAvailable, "calculate Nedap Checksum <uid bytes>"},
     {NULL, NULL, NULL, NULL}
 };
 
diff --git a/client/cmdlfnexwatch.c b/client/cmdlfnexwatch.c
index aeb85974d..6c8e9e143 100644
--- a/client/cmdlfnexwatch.c
+++ b/client/cmdlfnexwatch.c
@@ -77,7 +77,7 @@ static int CmdNexWatchRead(const char *Cmd) {
 static command_t CommandTable[] = {
     {"help",  CmdHelp,          AlwaysAvailable, "This help"},
     {"demod", CmdNexWatchDemod, AlwaysAvailable, "Demodulate a NexWatch tag (nexkey, quadrakey) from the GraphBuffer"},
-    {"read",  CmdNexWatchRead,  IfPm3Present,    "Attempt to Read and Extract tag data from the antenna"},
+    {"read",  CmdNexWatchRead,  IfPm3Lf,         "Attempt to Read and Extract tag data from the antenna"},
     {NULL, NULL, NULL, NULL}
 };
 
diff --git a/client/cmdlfnoralsy.c b/client/cmdlfnoralsy.c
index 4ebe7adc6..417ac534f 100644
--- a/client/cmdlfnoralsy.c
+++ b/client/cmdlfnoralsy.c
@@ -196,11 +196,11 @@ static int CmdNoralsySim(const char *Cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",    CmdHelp,        AlwaysAvailable, "This help"},
+    {"help",    CmdHelp,         AlwaysAvailable, "This help"},
     {"demod",   CmdNoralsyDemod, AlwaysAvailable, "Demodulate an Noralsy tag from the GraphBuffer"},
-    {"read",    CmdNoralsyRead, IfPm3Present,    "Attempt to read and extract tag data from the antenna"},
-    {"clone",   CmdNoralsyClone, IfPm3Present,    "clone Noralsy to T55x7"},
-    {"sim",     CmdNoralsySim,  IfPm3Present,    "simulate Noralsy tag"},
+    {"read",    CmdNoralsyRead,  IfPm3Lf,         "Attempt to read and extract tag data from the antenna"},
+    {"clone",   CmdNoralsyClone, IfPm3Lf,         "clone Noralsy to T55x7"},
+    {"sim",     CmdNoralsySim,   IfPm3Lf,         "simulate Noralsy tag"},
     {NULL, NULL, NULL, NULL}
 };
 
diff --git a/client/cmdlfpac.c b/client/cmdlfpac.c
index 7dc637e89..eb745abb3 100644
--- a/client/cmdlfpac.c
+++ b/client/cmdlfpac.c
@@ -57,9 +57,9 @@ static int CmdPacRead(const char *Cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",  CmdHelp,    AlwaysAvailable, "This help"},
+    {"help",  CmdHelp,     AlwaysAvailable, "This help"},
     {"demod", CmdPacDemod, AlwaysAvailable, "Demodulate an PAC tag from the GraphBuffer"},
-    {"read",  CmdPacRead, IfPm3Present,    "Attempt to read and extract tag data from the antenna"},
+    {"read",  CmdPacRead,  IfPm3Lf,         "Attempt to read and extract tag data from the antenna"},
     {NULL, NULL, NULL, NULL}
 };
 
diff --git a/client/cmdlfparadox.c b/client/cmdlfparadox.c
index 32bc25c98..6b836c846 100644
--- a/client/cmdlfparadox.c
+++ b/client/cmdlfparadox.c
@@ -144,9 +144,9 @@ static int CmdParadoxSim(const char *Cmd) {
 static command_t CommandTable[] = {
     {"help",  CmdHelp,          AlwaysAvailable, "This help"},
     {"demod", CmdParadoxDemod,  AlwaysAvailable, "Demodulate a Paradox FSK tag from the GraphBuffer"},
-    {"read",  CmdParadoxRead,   IfPm3Present,    "Attempt to read and Extract tag data from the antenna"},
-//  {"clone", CmdParadoxClone,  0, "clone paradox tag"},
-    {"sim",   CmdParadoxSim,    IfPm3Present,    "simulate paradox tag"},
+    {"read",  CmdParadoxRead,   IfPm3Lf,         "Attempt to read and Extract tag data from the antenna"},
+//  {"clone", CmdParadoxClone,  IfPm3Lf,         "clone paradox tag"},
+    {"sim",   CmdParadoxSim,    IfPm3Lf,         "simulate paradox tag"},
     {NULL, NULL, NULL, NULL}
 };
 
diff --git a/client/cmdlfpcf7931.c b/client/cmdlfpcf7931.c
index 189bc495e..1574cd033 100644
--- a/client/cmdlfpcf7931.c
+++ b/client/cmdlfpcf7931.c
@@ -158,8 +158,8 @@ static int CmdLFPCF7931Write(const char *Cmd) {
 
 static command_t CommandTable[] = {
     {"help",   CmdHelp,            AlwaysAvailable, "This help"},
-    {"read",   CmdLFPCF7931Read,   IfPm3Present,    "Read content of a PCF7931 transponder"},
-    {"write",  CmdLFPCF7931Write,  IfPm3Present,    "Write data on a PCF7931 transponder."},
+    {"read",   CmdLFPCF7931Read,   IfPm3Lf,         "Read content of a PCF7931 transponder"},
+    {"write",  CmdLFPCF7931Write,  IfPm3Lf,         "Write data on a PCF7931 transponder."},
     {"config", CmdLFPCF7931Config, AlwaysAvailable, "Configure the password, the tags initialization delay and time offsets (optional)"},
     {NULL, NULL, NULL, NULL}
 };
diff --git a/client/cmdlfpresco.c b/client/cmdlfpresco.c
index 3a6b23722..e81a436fa 100644
--- a/client/cmdlfpresco.c
+++ b/client/cmdlfpresco.c
@@ -153,9 +153,9 @@ static int CmdPrescoSim(const char *Cmd) {
 
 static command_t CommandTable[] = {
     {"help",    CmdHelp,        AlwaysAvailable, "This help"},
-    {"read",    CmdPrescoRead,  IfPm3Present,    "Attempt to read and Extract tag data"},
-    {"clone",   CmdPrescoClone, IfPm3Present,    "clone presco tag"},
-    {"sim",     CmdPrescoSim,   IfPm3Present,    "simulate presco tag"},
+    {"read",    CmdPrescoRead,  IfPm3Lf,         "Attempt to read and Extract tag data"},
+    {"clone",   CmdPrescoClone, IfPm3Lf,         "clone presco tag"},
+    {"sim",     CmdPrescoSim,   IfPm3Lf,         "simulate presco tag"},
     {NULL, NULL, NULL, NULL}
 };
 
diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c
index b2bc8e33b..351299204 100644
--- a/client/cmdlfpyramid.c
+++ b/client/cmdlfpyramid.c
@@ -276,11 +276,11 @@ static int CmdPyramidSim(const char *Cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",    CmdHelp,        AlwaysAvailable, "this help"},
-    {"demod",   CmdPyramidDemod, IfPm3Present,    "demodulate a Pyramid FSK tag from the GraphBuffer"},
-    {"read",    CmdPyramidRead, IfPm3Present,    "attempt to read and extract tag data"},
-    {"clone",   CmdPyramidClone, IfPm3Present,    "clone pyramid tag"},
-    {"sim",     CmdPyramidSim,  IfPm3Present,    "simulate pyramid tag"},
+    {"help",    CmdHelp,         AlwaysAvailable, "this help"},
+    {"demod",   CmdPyramidDemod, AlwaysAvailable, "demodulate a Pyramid FSK tag from the GraphBuffer"},
+    {"read",    CmdPyramidRead,  IfPm3Lf,         "attempt to read and extract tag data"},
+    {"clone",   CmdPyramidClone, IfPm3Lf,         "clone pyramid tag"},
+    {"sim",     CmdPyramidSim,   IfPm3Lf,         "simulate pyramid tag"},
     {NULL, NULL, NULL, NULL}
 };
 
diff --git a/client/cmdlfsecurakey.c b/client/cmdlfsecurakey.c
index 3629cd9b0..6da3e474b 100644
--- a/client/cmdlfsecurakey.c
+++ b/client/cmdlfsecurakey.c
@@ -100,11 +100,11 @@ static int CmdSecurakeyRead(const char *Cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",  CmdHelp,          AlwaysAvailable, "This help"},
+    {"help",  CmdHelp,           AlwaysAvailable, "This help"},
     {"demod", CmdSecurakeyDemod, AlwaysAvailable, "Demodulate an Securakey tag from the GraphBuffer"},
-    {"read",  CmdSecurakeyRead, IfPm3Present,    "Attempt to read and extract tag data from the antenna"},
-    //{"clone", CmdSecurakeyClone,0, "clone Securakey tag"},
-    //{"sim",   CmdSecurakeydSim, 0, "simulate Securakey tag"},
+    {"read",  CmdSecurakeyRead,  IfPm3Lf,         "Attempt to read and extract tag data from the antenna"},
+    //{"clone", CmdSecurakeyClone, IfPm3Lf,         "clone Securakey tag"},
+    //{"sim",   CmdSecurakeydSim,  IfPm3Lf,         "simulate Securakey tag"},
     {NULL, NULL, NULL, NULL}
 };
 
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 8ec3de2d4..cb21ef215 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -2302,23 +2302,23 @@ static int CmdT55xxSetDeviceConfig(const char *Cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",        CmdHelp,                 AlwaysAvailable, "This help"},
-    {"bruteforce",  CmdT55xxBruteForce,      IfPm3Present,    "<start password> <end password> [i <*.dic>] Simple bruteforce attack to find password"},
-    {"config",      CmdT55xxSetConfig,       AlwaysAvailable, "Set/Get T55XX configuration (modulation, inverted, offset, rate)"},
-    {"chk",         CmdT55xxChkPwds,         AlwaysAvailable, "Check passwords"},
-    {"detect",      CmdT55xxDetect,          AlwaysAvailable, "[1] Try detecting the tag modulation from reading the configuration block."},
-    {"deviceconfig", CmdT55xxSetDeviceConfig, AlwaysAvailable, "Set/Get T55XX device configuration (startgap, writegap, write0, write1, readgap"},
-    {"p1detect",    CmdT55xxDetectPage1,     AlwaysAvailable, "[1] Try detecting if this is a t55xx tag by reading page 1"},
-    {"dump",        CmdT55xxDump,            IfPm3Present,    "[password] [o] Dump T55xx card block 0-7. Optional [password], [override]"},
-    {"info",        CmdT55xxInfo,            AlwaysAvailable, "[1] Show T55x7 configuration data (page 0/ blk 0)"},
-    {"read",        CmdT55xxReadBlock,       IfPm3Present,    "b <block> p [password] [o] [1] -- Read T55xx block data. Optional [p password], [override], [page1]"},
-    {"resetread",   CmdResetRead,            IfPm3Present,    "Send Reset Cmd then lf read the stream to attempt to identify the start of it (needs a demod and/or plot after)"},
-    {"recoverpw",   CmdT55xxRecoverPW,       IfPm3Present,    "[password] Try to recover from bad password write from a cloner. Only use on PW protected chips!"},
-    {"special",     special,                 IfPm3Present,    "Show block changes with 64 different offsets"},
-    {"trace",       CmdT55xxReadTrace,       AlwaysAvailable, "[1] Show T55x7 traceability data (page 1/ blk 0-1)"},
-    {"wakeup",      CmdT55xxWakeUp,          IfPm3Present,    "Send AOR wakeup command"},
-    {"wipe",        CmdT55xxWipe,            IfPm3Present,    "[q] Wipe a T55xx tag and set defaults (will destroy any data on tag)"},
-    {"write",       CmdT55xxWriteBlock,      IfPm3Present,    "b <block> d <data> p [password] [1] -- Write T55xx block data. Optional [p password], [page1]"},
+    {"help",         CmdHelp,                 AlwaysAvailable, "This help"},
+    {"bruteforce",   CmdT55xxBruteForce,      IfPm3Lf,         "<start password> <end password> [i <*.dic>] Simple bruteforce attack to find password"},
+    {"config",       CmdT55xxSetConfig,       AlwaysAvailable, "Set/Get T55XX configuration (modulation, inverted, offset, rate)"},
+    {"chk",          CmdT55xxChkPwds,         IfPm3Lf,         "Check passwords"},
+    {"detect",       CmdT55xxDetect,          AlwaysAvailable, "[1] Try detecting the tag modulation from reading the configuration block."},
+    {"deviceconfig", CmdT55xxSetDeviceConfig, IfPm3Lf,         "Set/Get T55XX device configuration (startgap, writegap, write0, write1, readgap"},
+    {"p1detect",     CmdT55xxDetectPage1,     IfPm3Lf,         "[1] Try detecting if this is a t55xx tag by reading page 1"},
+    {"dump",         CmdT55xxDump,            IfPm3Lf,         "[password] [o] Dump T55xx card block 0-7. Optional [password], [override]"},
+    {"info",         CmdT55xxInfo,            AlwaysAvailable, "[1] Show T55x7 configuration data (page 0/ blk 0)"},
+    {"read",         CmdT55xxReadBlock,       IfPm3Lf,         "b <block> p [password] [o] [1] -- Read T55xx block data. Optional [p password], [override], [page1]"},
+    {"resetread",    CmdResetRead,            IfPm3Lf,         "Send Reset Cmd then lf read the stream to attempt to identify the start of it (needs a demod and/or plot after)"},
+    {"recoverpw",    CmdT55xxRecoverPW,       IfPm3Lf,         "[password] Try to recover from bad password write from a cloner. Only use on PW protected chips!"},
+    {"special",      special,                 IfPm3Lf,         "Show block changes with 64 different offsets"},
+    {"trace",        CmdT55xxReadTrace,       AlwaysAvailable, "[1] Show T55x7 traceability data (page 1/ blk 0-1)"},
+    {"wakeup",       CmdT55xxWakeUp,          IfPm3Lf,         "Send AOR wakeup command"},
+    {"wipe",         CmdT55xxWipe,            IfPm3Lf,         "[q] Wipe a T55xx tag and set defaults (will destroy any data on tag)"},
+    {"write",        CmdT55xxWriteBlock,      IfPm3Lf,         "b <block> d <data> p [password] [1] -- Write T55xx block data. Optional [p password], [page1]"},
     {NULL, NULL, NULL, NULL}
 };
 
diff --git a/client/cmdlfti.c b/client/cmdlfti.c
index 0889be200..3c6b22ed1 100644
--- a/client/cmdlfti.c
+++ b/client/cmdlfti.c
@@ -301,8 +301,8 @@ static int CmdTIWrite(const char *Cmd) {
 static command_t CommandTable[] = {
     {"help",      CmdHelp,        AlwaysAvailable, "This help"},
     {"demod",     CmdTIDemod,     AlwaysAvailable, "Demodulate raw bits for TI-type LF tag from the GraphBuffer"},
-    {"read",      CmdTIRead,      IfPm3Present,    "Read and decode a TI 134 kHz tag"},
-    {"write",     CmdTIWrite,     IfPm3Present,    "Write new data to a r/w TI 134 kHz tag"},
+    {"read",      CmdTIRead,      IfPm3Lf,         "Read and decode a TI 134 kHz tag"},
+    {"write",     CmdTIWrite,     IfPm3Lf,         "Write new data to a r/w TI 134 kHz tag"},
     {NULL, NULL, NULL, NULL}
 };
 
diff --git a/client/cmdlfviking.c b/client/cmdlfviking.c
index 3f6e91eae..d21c30076 100644
--- a/client/cmdlfviking.c
+++ b/client/cmdlfviking.c
@@ -123,9 +123,9 @@ static int CmdVikingSim(const char *Cmd) {
 static command_t CommandTable[] = {
     {"help",    CmdHelp,        AlwaysAvailable, "This help"},
     {"demod",   CmdVikingDemod, AlwaysAvailable, "Demodulate a Viking tag from the GraphBuffer"},
-    {"read",    CmdVikingRead,  IfPm3Present,    "Attempt to read and Extract tag data from the antenna"},
-    {"clone",   CmdVikingClone, IfPm3Present,    "<8 digit ID number> clone viking tag"},
-    {"sim",     CmdVikingSim,   IfPm3Present,    "<8 digit ID number> simulate viking tag"},
+    {"read",    CmdVikingRead,  IfPm3Lf,         "Attempt to read and Extract tag data from the antenna"},
+    {"clone",   CmdVikingClone, IfPm3Lf,         "<8 digit ID number> clone viking tag"},
+    {"sim",     CmdVikingSim,   IfPm3Lf,         "<8 digit ID number> simulate viking tag"},
     {NULL, NULL, NULL, NULL}
 };
 
diff --git a/client/cmdlfvisa2000.c b/client/cmdlfvisa2000.c
index 348a9adeb..f0b7c7c13 100644
--- a/client/cmdlfvisa2000.c
+++ b/client/cmdlfvisa2000.c
@@ -205,9 +205,9 @@ static int CmdVisa2kSim(const char *Cmd) {
 static command_t CommandTable[] = {
     {"help",    CmdHelp,        AlwaysAvailable, "This help"},
     {"demod",   CmdVisa2kDemod, AlwaysAvailable, "demodulate an VISA2000 tag from the GraphBuffer"},
-    {"read",    CmdVisa2kRead,  IfPm3Present,    "attempt to read and extract tag data from the antenna"},
-    {"clone",   CmdVisa2kClone, IfPm3Present,    "clone Visa2000 to t55x7"},
-    {"sim",     CmdVisa2kSim,   IfPm3Present,    "simulate Visa2000 tag"},
+    {"read",    CmdVisa2kRead,  IfPm3Lf,         "attempt to read and extract tag data from the antenna"},
+    {"clone",   CmdVisa2kClone, IfPm3Lf,         "clone Visa2000 to t55x7"},
+    {"sim",     CmdVisa2kSim,   IfPm3Lf,         "simulate Visa2000 tag"},
     {NULL, NULL, NULL, NULL}
 };
 

From d1c6f12aff9acfc6a16c7c05931e76eb48973439 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 2 May 2019 00:06:10 +0200
Subject: [PATCH 1564/1938] protect CMD_UPLOAD_SIM_SAMPLES_125K by WITH_LF

---
 armsrc/appmain.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index f877b88dd..bb7272c85 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1299,7 +1299,6 @@ static void PacketReceived(PacketCommandNG *packet) {
             LED_B_OFF();
             break;
         }
-#endif
         case CMD_UPLOAD_SIM_SAMPLES_125K: {
             // iceman; since changing fpga_bitstreams clears bigbuff, Its better to call it before.
             // to be able to use this one for uploading data to device
@@ -1316,6 +1315,7 @@ static void PacketReceived(PacketCommandNG *packet) {
             reply_old(CMD_ACK, 1, 0, 0, 0, 0);
             break;
         }
+#endif
         case CMD_DOWNLOAD_EML_BIGBUF: {
             LED_B_ON();
             uint8_t *mem = BigBuf_get_EM_addr();

From f217b47cbd793ef496dfdebf2bccfadb8669a6cb Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 2 May 2019 00:18:20 +0200
Subject: [PATCH 1565/1938] style

---
 armsrc/mifarecmd.c |  4 +--
 client/cmddata.c   | 72 +++++++++++++++++++++++-----------------------
 client/cmdhfmf.c   |  6 ++--
 client/flasher.c   |  4 +--
 4 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index b354bd6d4..1c6d0b589 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -1608,9 +1608,9 @@ void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain, b
     LED_B_ON();
 
     if (ng) {
-        reply_ng(CMD_MIFARE_CHKKEYS, PM3_SUCCESS, (uint8_t*)&keyresult, sizeof(keyresult));
+        reply_ng(CMD_MIFARE_CHKKEYS, PM3_SUCCESS, (uint8_t *)&keyresult, sizeof(keyresult));
     } else {
-        reply_mix(CMD_ACK, keyresult.found, 0, 0, (uint8_t*)&keyresult.key, sizeof(keyresult.key));
+        reply_mix(CMD_ACK, keyresult.found, 0, 0, (uint8_t *)&keyresult.key, sizeof(keyresult.key));
     }
 //    reply_old(CMD_ACK, keyresult.found, 0, 0, (uint8_t*)&keyresult.key, sizeof(keyresult.key));
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
diff --git a/client/cmddata.c b/client/cmddata.c
index a83c4811d..962b537a0 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -2097,43 +2097,43 @@ static int CmdDataIIR(const char *Cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",            CmdHelp,            AlwaysAvailable, "This help"},
-    {"askedgedetect",   CmdAskEdgeDetect,   AlwaysAvailable, "[threshold] Adjust Graph for manual ASK demod using the length of sample differences to detect the edge of a wave (use 20-45, def:25)"},
-    {"autocorr",        CmdAutoCorr,        AlwaysAvailable, "[window length] [g] -- Autocorrelation over window - g to save back to GraphBuffer (overwrite)"},
-    {"biphaserawdecode", CmdBiphaseDecodeRaw, AlwaysAvailable, "[offset] [invert<0|1>] [maxErr] -- Biphase decode bin stream in DemodBuffer (offset = 0|1 bits to shift the decode start)"},
-    {"bin2hex",         Cmdbin2hex,         AlwaysAvailable, "<digits> -- Converts binary to hexadecimal"},
-    {"bitsamples",      CmdBitsamples,      IfPm3Present,    "Get raw samples as bitstring"},
-    {"buffclear",       CmdBuffClear,       AlwaysAvailable, "Clears bigbuff on deviceside and graph window"},
-    {"dec",             CmdDec,             AlwaysAvailable, "Decimate samples"},
-    {"detectclock",     CmdDetectClockRate, AlwaysAvailable, "[<a|f|n|p>] Detect ASK, FSK, NRZ, PSK clock rate of wave in GraphBuffer"},
-    {"fsktonrz",        CmdFSKToNRZ,        AlwaysAvailable, "Convert fsk2 to nrz wave for alternate fsk demodulating (for weak fsk)"},
+    {"help",            CmdHelp,                 AlwaysAvailable, "This help"},
+    {"askedgedetect",   CmdAskEdgeDetect,        AlwaysAvailable, "[threshold] Adjust Graph for manual ASK demod using the length of sample differences to detect the edge of a wave (use 20-45, def:25)"},
+    {"autocorr",        CmdAutoCorr,             AlwaysAvailable, "[window length] [g] -- Autocorrelation over window - g to save back to GraphBuffer (overwrite)"},
+    {"biphaserawdecode", CmdBiphaseDecodeRaw,    AlwaysAvailable, "[offset] [invert<0|1>] [maxErr] -- Biphase decode bin stream in DemodBuffer (offset = 0|1 bits to shift the decode start)"},
+    {"bin2hex",         Cmdbin2hex,              AlwaysAvailable, "<digits> -- Converts binary to hexadecimal"},
+    {"bitsamples",      CmdBitsamples,           IfPm3Present,    "Get raw samples as bitstring"},
+    {"buffclear",       CmdBuffClear,            AlwaysAvailable, "Clears bigbuff on deviceside and graph window"},
+    {"dec",             CmdDec,                  AlwaysAvailable, "Decimate samples"},
+    {"detectclock",     CmdDetectClockRate,      AlwaysAvailable, "[<a|f|n|p>] Detect ASK, FSK, NRZ, PSK clock rate of wave in GraphBuffer"},
+    {"fsktonrz",        CmdFSKToNRZ,             AlwaysAvailable, "Convert fsk2 to nrz wave for alternate fsk demodulating (for weak fsk)"},
 
-    {"getbitstream",    CmdGetBitStream,    AlwaysAvailable, "Convert GraphBuffer's >=1 values to 1 and <1 to 0"},
-    {"grid",            CmdGrid,            AlwaysAvailable, "<x> <y> -- overlay grid on graph window, use zero value to turn off either"},
-    {"hexsamples",      CmdHexsamples,      IfPm3Present,    "<bytes> [<offset>] -- Dump big buffer as hex bytes"},
-    {"hex2bin",         Cmdhex2bin,         AlwaysAvailable, "<hexadecimal> -- Converts hexadecimal to binary"},
-    {"hide",            CmdHide,            AlwaysAvailable, "Hide graph window"},
-    {"hpf",             CmdHpf,             AlwaysAvailable, "Remove DC offset from trace"},
-    {"load",            CmdLoad,            AlwaysAvailable, "<filename> -- Load trace (to graph window"},
-    {"ltrim",           CmdLtrim,           AlwaysAvailable, "<samples> -- Trim samples from left of trace"},
-    {"rtrim",           CmdRtrim,           AlwaysAvailable, "<location to end trace> -- Trim samples from right of trace"},
-    {"mtrim",           CmdMtrim,           AlwaysAvailable, "<start> <stop> -- Trim out samples from the specified start to the specified stop"},
-    {"manrawdecode",    Cmdmandecoderaw,    AlwaysAvailable, "[invert] [maxErr] -- Manchester decode binary stream in DemodBuffer"},
-    {"norm",            CmdNorm,            AlwaysAvailable, "Normalize max/min to +/-128"},
-    {"plot",            CmdPlot,            AlwaysAvailable, "Show graph window (hit 'h' in window for keystroke help)"},
-    {"printdemodbuffer", CmdPrintDemodBuff,  AlwaysAvailable, "[x] [o] <offset> [l] <length> -- print the data in the DemodBuffer - 'x' for hex output"},
-    {"rawdemod",        CmdRawDemod,        AlwaysAvailable, "[modulation] ... <options> -see help (h option) -- Demodulate the data in the GraphBuffer and output binary"},
-    {"samples",         CmdSamples,         IfPm3Present,    "[512 - 40000] -- Get raw samples for graph window (GraphBuffer)"},
-    {"save",            CmdSave,            AlwaysAvailable, "<filename> -- Save trace (from graph window)"},
-    {"setgraphmarkers", CmdSetGraphMarkers, AlwaysAvailable, "[orange_marker] [blue_marker] (in graph window)"},
-    {"scale",           CmdScale,           AlwaysAvailable, "<int> -- Set cursor display scale"},
-    {"setdebugmode",    CmdSetDebugMode,    AlwaysAvailable, "<0|1|2> -- Turn on or off Debugging Level for lf demods"},
-    {"shiftgraphzero",  CmdGraphShiftZero,  AlwaysAvailable, "<shift> -- Shift 0 for Graphed wave + or - shift value"},
-    {"dirthreshold",    CmdDirectionalThreshold,   AlwaysAvailable, "<thres up> <thres down> -- Max rising higher up-thres/ Min falling lower down-thres, keep rest as prev."},
-    {"tune",            CmdTuneSamples,     IfPm3Present,    "Get hw tune samples for graph window"},
-    {"undec",           CmdUndec,           AlwaysAvailable, "Un-decimate samples by 2"},
-    {"zerocrossings",   CmdZerocrossings,   AlwaysAvailable, "Count time between zero-crossings"},
-    {"iir",             CmdDataIIR,         IfPm3Present,    "apply IIR buttersworth filter on plotdata"},
+    {"getbitstream",    CmdGetBitStream,         AlwaysAvailable, "Convert GraphBuffer's >=1 values to 1 and <1 to 0"},
+    {"grid",            CmdGrid,                 AlwaysAvailable, "<x> <y> -- overlay grid on graph window, use zero value to turn off either"},
+    {"hexsamples",      CmdHexsamples,           IfPm3Present,    "<bytes> [<offset>] -- Dump big buffer as hex bytes"},
+    {"hex2bin",         Cmdhex2bin,              AlwaysAvailable, "<hexadecimal> -- Converts hexadecimal to binary"},
+    {"hide",            CmdHide,                 AlwaysAvailable, "Hide graph window"},
+    {"hpf",             CmdHpf,                  AlwaysAvailable, "Remove DC offset from trace"},
+    {"load",            CmdLoad,                 AlwaysAvailable, "<filename> -- Load trace (to graph window"},
+    {"ltrim",           CmdLtrim,                AlwaysAvailable, "<samples> -- Trim samples from left of trace"},
+    {"rtrim",           CmdRtrim,                AlwaysAvailable, "<location to end trace> -- Trim samples from right of trace"},
+    {"mtrim",           CmdMtrim,                AlwaysAvailable, "<start> <stop> -- Trim out samples from the specified start to the specified stop"},
+    {"manrawdecode",    Cmdmandecoderaw,         AlwaysAvailable, "[invert] [maxErr] -- Manchester decode binary stream in DemodBuffer"},
+    {"norm",            CmdNorm,                 AlwaysAvailable, "Normalize max/min to +/-128"},
+    {"plot",            CmdPlot,                 AlwaysAvailable, "Show graph window (hit 'h' in window for keystroke help)"},
+    {"printdemodbuffer", CmdPrintDemodBuff,      AlwaysAvailable, "[x] [o] <offset> [l] <length> -- print the data in the DemodBuffer - 'x' for hex output"},
+    {"rawdemod",        CmdRawDemod,             AlwaysAvailable, "[modulation] ... <options> -see help (h option) -- Demodulate the data in the GraphBuffer and output binary"},
+    {"samples",         CmdSamples,              IfPm3Present,    "[512 - 40000] -- Get raw samples for graph window (GraphBuffer)"},
+    {"save",            CmdSave,                 AlwaysAvailable, "<filename> -- Save trace (from graph window)"},
+    {"setgraphmarkers", CmdSetGraphMarkers,      AlwaysAvailable, "[orange_marker] [blue_marker] (in graph window)"},
+    {"scale",           CmdScale,                AlwaysAvailable, "<int> -- Set cursor display scale"},
+    {"setdebugmode",    CmdSetDebugMode,         AlwaysAvailable, "<0|1|2> -- Turn on or off Debugging Level for lf demods"},
+    {"shiftgraphzero",  CmdGraphShiftZero,       AlwaysAvailable, "<shift> -- Shift 0 for Graphed wave + or - shift value"},
+    {"dirthreshold",    CmdDirectionalThreshold, AlwaysAvailable, "<thres up> <thres down> -- Max rising higher up-thres/ Min falling lower down-thres, keep rest as prev."},
+    {"tune",            CmdTuneSamples,          IfPm3Present,    "Get hw tune samples for graph window"},
+    {"undec",           CmdUndec,                AlwaysAvailable, "Un-decimate samples by 2"},
+    {"zerocrossings",   CmdZerocrossings,        AlwaysAvailable, "Count time between zero-crossings"},
+    {"iir",             CmdDataIIR,              IfPm3Present,    "apply IIR buttersworth filter on plotdata"},
     {NULL, NULL, NULL, NULL}
 };
 
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 736b705a8..ceebb5ea4 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -1592,7 +1592,7 @@ static int CmdHF14AMfChk_fast(const char *Cmd) {
         } else if (clen == 1) {
             if (ctmp == 't') { transferToEml = 1; continue; }
             if (ctmp == 'd') { createDumpFile = 1; continue; }
-            if ((ctmp == 'm') && (IfPm3Flash())){ use_flashmemory = true; continue; }
+            if ((ctmp == 'm') && (IfPm3Flash())) { use_flashmemory = true; continue; }
         } else {
             // May be a dic file
             if (param_getstr(Cmd, i, filename, FILE_PATH_SIZE) >= FILE_PATH_SIZE) {
@@ -2028,8 +2028,8 @@ out:
     conn.block_after_ACK = false;
     SendCommandMIX(CMD_PING, 0, 0, 0, NULL, 0);
     WaitForResponseTimeout(CMD_ACK, NULL, 1000);
-    
-    
+
+
     if (createDumpFile) {
         fptr = GenerateFilename("hf-mf-", "-key.bin");
         if (fptr == NULL) {
diff --git a/client/flasher.c b/client/flasher.c
index 430a411af..874717215 100644
--- a/client/flasher.c
+++ b/client/flasher.c
@@ -69,14 +69,14 @@ int main(int argc, char **argv) {
             res = flash_load(&files[num_files], argv[i], can_write_bl);
             if (res < 0)
                 return -1;
-    
+
             PrintAndLogEx(NORMAL, "");
             num_files++;
         }
     }
 
     char *serial_port_name = argv[1];
-    
+
     session.pm3_present = OpenProxmark(serial_port_name, true, 60, true, FLASHMODE_SPEED);
     if (session.pm3_present) {
         PrintAndLogEx(NORMAL, _GREEN_("Found"));

From 59cc7b46d4d42258e37aaa1bd014f399940fc246 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 2 May 2019 00:23:58 +0200
Subject: [PATCH 1566/1938] emv: dynamic detection in client

---
 client/emv/cmdemv.c | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index f2b6da624..f3c3b9253 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -1938,26 +1938,26 @@ out:
 
 static command_t CommandTable[] =  {
     {"help",        CmdHelp,                        AlwaysAvailable, "This help"},
-    {"exec",        CmdEMVExec,                     IfPm3Present,    "Executes EMV contactless transaction."},
-    {"pse",         CmdEMVPPSE,                     IfPm3Present,    "Execute PPSE. It selects 2PAY.SYS.DDF01 or 1PAY.SYS.DDF01 directory."},
-    {"search",      CmdEMVSearch,                   IfPm3Present,    "Try to select all applets from applets list and print installed applets."},
-    {"select",      CmdEMVSelect,                   IfPm3Present,    "Select applet."},
-    {"gpo",         CmdEMVGPO,                      IfPm3Present,    "Execute GetProcessingOptions."},
-    {"readrec",     CmdEMVReadRecord,               IfPm3Present,    "Read files from card."},
-    {"genac",       CmdEMVAC,                       IfPm3Present,    "Generate ApplicationCryptogram."},
-    {"challenge",   CmdEMVGenerateChallenge,        IfPm3Present,    "Generate challenge."},
-    {"intauth",     CmdEMVInternalAuthenticate,     IfPm3Present,    "Internal authentication."},
-    {"scan",        CmdEMVScan,                     IfPm3Present,    "Scan EMV card and save it contents to json file for emulator."},
-    {"test",        CmdEMVTest,                     IfPm3Present,    "Crypto logic test."},
+    {"exec",        CmdEMVExec,                     IfPm3Iso14443,   "Executes EMV contactless transaction."},
+    {"pse",         CmdEMVPPSE,                     IfPm3Iso14443,   "Execute PPSE. It selects 2PAY.SYS.DDF01 or 1PAY.SYS.DDF01 directory."},
+    {"search",      CmdEMVSearch,                   IfPm3Iso14443,   "Try to select all applets from applets list and print installed applets."},
+    {"select",      CmdEMVSelect,                   IfPm3Iso14443,   "Select applet."},
+    {"gpo",         CmdEMVGPO,                      IfPm3Iso14443,   "Execute GetProcessingOptions."},
+    {"readrec",     CmdEMVReadRecord,               IfPm3Iso14443,   "Read files from card."},
+    {"genac",       CmdEMVAC,                       IfPm3Iso14443,   "Generate ApplicationCryptogram."},
+    {"challenge",   CmdEMVGenerateChallenge,        IfPm3Iso14443,   "Generate challenge."},
+    {"intauth",     CmdEMVInternalAuthenticate,     IfPm3Iso14443,   "Internal authentication."},
+    {"scan",        CmdEMVScan,                     IfPm3Iso14443,   "Scan EMV card and save it contents to json file for emulator."},
+    {"test",        CmdEMVTest,                     AlwaysAvailable, "Crypto logic test."},
     /*
-    {"getrng",      CmdEMVGetrng,                   IfPm3Present,    "get random number from terminal"},
-    {"eload",       CmdEmvELoad,                    IfPm3Present,    "load EMV tag into device"},
-    {"dump",        CmdEmvDump,                     IfPm3Present,    "dump EMV tag values"},
-    {"sim",         CmdEmvSim,                      IfPm3Present,    "simulate EMV tag"},
-    {"clone",       CmdEmvClone,                    IfPm3Present,    "clone an EMV tag"},
+    {"getrng",      CmdEMVGetrng,                   IfPm3Iso14443,   "get random number from terminal"},
+    {"eload",       CmdEmvELoad,                    IfPm3Iso14443,   "load EMV tag into device"},
+    {"dump",        CmdEmvDump,                     IfPm3Iso14443,   "dump EMV tag values"},
+    {"sim",         CmdEmvSim,                      IfPm3Iso14443,   "simulate EMV tag"},
+    {"clone",       CmdEmvClone,                    IfPm3Iso14443,   "clone an EMV tag"},
     */
-    {"list",        CmdEMVList,                     IfPm3Present,    "List ISO7816 history"},
-    {"roca",        CmdEMVRoca,                     IfPm3Present,    "Extract public keys and run ROCA test"},
+    {"list",        CmdEMVList,                     IfPm3Iso14443,   "List ISO7816 history"},
+    {"roca",        CmdEMVRoca,                     IfPm3Iso14443,   "Extract public keys and run ROCA test"},
     {NULL, NULL, NULL, NULL}
 };
 

From e286b3091db2488b09394c0ed67bff07bc9f81eb Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 2 May 2019 00:34:55 +0200
Subject: [PATCH 1567/1938] remove cli.c, outdated and we can do the same with
 pm3 client

---
 client/cli.c | 56 ----------------------------------------------------
 1 file changed, 56 deletions(-)
 delete mode 100644 client/cli.c

diff --git a/client/cli.c b/client/cli.c
deleted file mode 100644
index 35c023c71..000000000
--- a/client/cli.c
+++ /dev/null
@@ -1,56 +0,0 @@
-//-----------------------------------------------------------------------------
-// This code is licensed to you under the terms of the GNU GPL, version 2 or,
-// at your option, any later version. See the LICENSE.txt file for the text of
-// the license.
-//-----------------------------------------------------------------------------
-// Command line binary
-//-----------------------------------------------------------------------------
-
-#include <stdio.h>
-#include "util_posix.h"
-#include "ui.h"
-//#include "proxusb.h"
-#include "cmdmain.h"
-
-#define HANDLE_ERROR if (error_occured) { \
-        error_occured = 0;\
-        break;\
-    }
-
-int main(int argc, char **argv) {
-    if (argc != 3 && argc != 4) {
-        printf("\n\tusage: cli <command 1> <command 2> [logfile (default cli.log)]\n");
-        printf("\n");
-        printf("\texample: cli hf 14a sniff hf 14a list h14a.log\n");
-        printf("\n");
-        return -1;
-    }
-
-    usb_init();
-    if (argc == 4)
-        SetLogFilename(argv[3]);
-    else
-        SetLogFilename("cli.log");
-
-    return_on_error = 1;
-
-    while (1) {
-        while (!OpenProxmark()) { sleep(1); }
-        while (1) {
-            PacketCommandOLD cmdbuf;
-            CommandReceived(argv[1]);
-            HANDLE_ERROR;
-            ReceiveCommand(&cmdbuf);
-            HANDLE_ERROR;
-            for (int i = 0; i < 5; ++i) {
-                ReceiveCommandPoll(&cmdbuf);
-            }
-            HANDLE_ERROR;
-            CommandReceived(argv[2]);
-            HANDLE_ERROR;
-        }
-    }
-
-    CloseProxmark();
-    return 0;
-}

From 4e17b1734353b1be87ef2d50ddb0653bee2681f6 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 2 May 2019 00:40:00 +0200
Subject: [PATCH 1568/1938] remove snooper.c, outdated and we can do the same
 with pm3 client

---
 client/snooper.c | 45 ---------------------------------------------
 1 file changed, 45 deletions(-)
 delete mode 100644 client/snooper.c

diff --git a/client/snooper.c b/client/snooper.c
deleted file mode 100644
index 86ef8faba..000000000
--- a/client/snooper.c
+++ /dev/null
@@ -1,45 +0,0 @@
-//-----------------------------------------------------------------------------
-// Copyright (C) 2009 Michael Gernoth <michael at gernoth.net>
-//
-// This code is licensed to you under the terms of the GNU GPL, version 2 or,
-// at your option, any later version. See the LICENSE.txt file for the text of
-// the license.
-//-----------------------------------------------------------------------------
-// Sniff binary
-//-----------------------------------------------------------------------------
-
-#include "util_posix.h"
-#include "ui.h"
-#include "cmdmain.h"
-
-#define HANDLE_ERROR if (error_occured) { \
-        error_occured = 0;\
-        break;\
-    }
-
-int main() {
-    usb_init();
-    SetLogFilename("sniffer.log");
-
-    return_on_error = 1;
-
-    while (1) {
-        while (!OpenProxmark()) { sleep(1); }
-        while (1) {
-            PacketCommandOLD cmdbuf;
-            CommandReceived("hf 14a sniff");
-            HANDLE_ERROR;
-            ReceiveCommand(&cmdbuf);
-            HANDLE_ERROR;
-            for (int i = 0; i < 5; ++i) {
-                ReceiveCommandPoll(&cmdbuf);
-            }
-            HANDLE_ERROR;
-            CommandReceived("hf list 14a");
-            HANDLE_ERROR;
-        }
-    }
-
-    CloseProxmark();
-    return 0;
-}

From 0cedfc7b2b6de6f7e1a33479d50fdbfd91802a49 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 2 May 2019 10:42:02 +0200
Subject: [PATCH 1569/1938] chg: list should always be available,  since we can
 now load / save trace files.

---
 client/cmdhf.c       | 2 +-
 client/cmdhf14a.c    | 2 +-
 client/cmdhf14b.c    | 2 +-
 client/cmdhf15.c     | 2 +-
 client/cmdhffelica.c | 2 +-
 client/cmdhficlass.c | 2 +-
 client/cmdhflegic.c  | 2 +-
 client/cmdhfmf.c     | 2 +-
 client/cmdhftopaz.c  | 2 +-
 client/emv/cmdemv.c  | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/client/cmdhf.c b/client/cmdhf.c
index 06624cd1b..ab34e39fc 100644
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -116,7 +116,7 @@ static command_t CommandTable[] = {
     {"mfdes",       CmdHFMFDes,       AlwaysAvailable, "{ MIFARE Desfire RFIDs...          }"},
     {"topaz",       CmdHFTopaz,       AlwaysAvailable, "{ TOPAZ (NFC Type 1) RFIDs...      }"},
     {"fido",        CmdHFFido,        AlwaysAvailable, "{ FIDO and FIDO2 authenticators... }"},
-    {"list",        CmdTraceList,     IfPm3Present,    "List protocol data in trace buffer"},
+    {"list",        CmdTraceList,     AlwaysAvailable,    "List protocol data in trace buffer"},
     {"tune",        CmdHFTune,        IfPm3Present,    "Continuously measure HF antenna tuning"},
     {"search",      CmdHFSearch,      AlwaysAvailable, "Search for known HF tags [preliminary]"},
     {"sniff",       CmdHFSniff,       IfPm3Hfsniff,    "<samples to skip (10000)> <triggers to skip (1)> Generic HF Sniff"},
diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 1f27e5a2d..773aca7ff 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -1116,7 +1116,7 @@ static int CmdHF14AChaining(const char *Cmd) {
 
 static command_t CommandTable[] = {
     {"help",        CmdHelp,              AlwaysAvailable, "This help"},
-    {"list",        CmdHF14AList,         IfPm3Iso14443a,  "List ISO 14443-a history"},
+    {"list",        CmdHF14AList,         AlwaysAvailable,  "List ISO 14443-a history"},
     {"info",        CmdHF14AInfo,         IfPm3Iso14443a,  "Tag information"},
     {"reader",      CmdHF14AReader,       IfPm3Iso14443a,  "Act like an ISO14443-a reader"},
     {"cuids",       CmdHF14ACUIDs,        IfPm3Iso14443a,  "<n> Collect n>0 ISO14443-a UIDs in one go"},
diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c
index 5d794b3b1..89126d618 100644
--- a/client/cmdhf14b.c
+++ b/client/cmdhf14b.c
@@ -1077,7 +1077,7 @@ static command_t CommandTable[] = {
     {"help",        CmdHelp,          AlwaysAvailable, "This help"},
     {"dump",        CmdHF14BDump,     IfPm3Iso14443b,  "Read all memory pages of an ISO14443-B tag, save to file"},
     {"info",        CmdHF14Binfo,     IfPm3Iso14443b,  "Tag information"},
-    {"list",        CmdHF14BList,     IfPm3Iso14443b,  "List ISO 14443B history"},
+    {"list",        CmdHF14BList,     AlwaysAvailable,  "List ISO 14443B history"},
     {"raw",         CmdHF14BCmdRaw,   IfPm3Iso14443b,  "Send raw hex data to tag"},
     {"reader",      CmdHF14BReader,   IfPm3Iso14443b,  "Act as a 14443B reader to identify a tag"},
     {"sim",         CmdHF14BSim,      IfPm3Iso14443b,  "Fake ISO 14443B tag"},
diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index 17f9c7087..65bb963d5 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -1279,7 +1279,7 @@ static command_t CommandTable[] = {
     {"dump",        CmdHF15Dump,        IfPm3Iso15693,   "Read all memory pages of an ISO15693 tag, save to file"},
     {"findafi",     CmdHF15Afi,         IfPm3Iso15693,   "Brute force AFI of an ISO15693 tag"},
     {"info",        CmdHF15Info,        IfPm3Iso15693,   "Tag information"},
-    {"list",        CmdHF15List,        IfPm3Iso15693,   "List ISO15693 history"},
+    {"list",        CmdHF15List,        AlwaysAvailable,   "List ISO15693 history"},
     {"raw",         CmdHF15Raw,         IfPm3Iso15693,   "Send raw hex data to tag"},
     {"reader",      CmdHF15Reader,      IfPm3Iso15693,   "Act like an ISO15693 reader"},
     {"record",      CmdHF15Record,      IfPm3Iso15693,   "Record Samples (ISO15693)"},
diff --git a/client/cmdhffelica.c b/client/cmdhffelica.c
index b434521e0..65559e1a8 100644
--- a/client/cmdhffelica.c
+++ b/client/cmdhffelica.c
@@ -535,7 +535,7 @@ static int CmdHFFelicaCmdRaw(const char *Cmd) {
 
 static command_t CommandTable[] = {
     {"help",      CmdHelp,              AlwaysAvailable, "This help"},
-    {"list",      CmdHFFelicaList,      IfPm3Felica,     "List ISO 18092/FeliCa history"},
+    {"list",      CmdHFFelicaList,      AlwaysAvailable,     "List ISO 18092/FeliCa history"},
     {"reader",    CmdHFFelicaReader,    IfPm3Felica,     "Act like an ISO18092/FeliCa reader"},
     {"sim",       CmdHFFelicaSim,       IfPm3Felica,     "<UID> -- Simulate ISO 18092/FeliCa tag"},
     {"sniff",     CmdHFFelicaSniff,     IfPm3Felica,     "sniff ISO 18092/Felica traffic"},
diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index fc3498ae8..a637e1e59 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -2426,7 +2426,7 @@ static command_t CommandTable[] = {
     {"dump",        CmdHFiClassReader_Dump,     IfPm3Iclass,     "[options..] Authenticate and Dump iClass tag's AA1"},
     {"eload",       CmdHFiClassELoad,           IfPm3Iclass,     "[f <fname>] (experimental) Load data into iClass emulator memory"},
     {"encryptblk",  CmdHFiClassEncryptBlk,      AlwaysAvailable, "<BlockData> Encrypt given block data"},
-    {"list",        CmdHFiClassList,            IfPm3Iclass,     "            List iClass history"},
+    {"list",        CmdHFiClassList,            AlwaysAvailable,     "            List iClass history"},
     {"loclass",     CmdHFiClass_loclass,        AlwaysAvailable, "[options..] Use loclass to perform bruteforce of reader attack dump"},
     {"lookup",      CmdHFiClassLookUp,          AlwaysAvailable, "[options..] Uses authentication trace to check for key in dictionary file"},
     {"managekeys",  CmdHFiClassManageKeys,      AlwaysAvailable, "[options..] Manage the keys to use with iClass"},
diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index 4b71fcfe3..dabde228b 100644
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -1281,7 +1281,7 @@ static command_t CommandTable[] =  {
     {"crc",     CmdLegicCalcCrc,  AlwaysAvailable, "Calculate Legic CRC over given bytes"},
     {"eload",   CmdLegicELoad,    IfPm3Legicrf,    "Load binary dump to emulator memory"},
     {"esave",   CmdLegicESave,    IfPm3Legicrf,    "Save emulator memory to binary file"},
-    {"list",    CmdLegicList,     IfPm3Legicrf,    "List LEGIC history"},
+    {"list",    CmdLegicList,     AlwaysAvailable,    "List LEGIC history"},
     {"wipe",    CmdLegicWipe,     IfPm3Legicrf,    "Wipe a LEGIC Prime tag"},
     {NULL, NULL, NULL, NULL}
 };
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index ceebb5ea4..30264ba24 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -3551,7 +3551,7 @@ static int CmdHF14AMfList(const char *Cmd) {
 
 static command_t CommandTable[] = {
     {"help",        CmdHelp,                AlwaysAvailable, "This help"},
-    {"list",        CmdHF14AMfList,         IfPm3Iso14443a,  "List Mifare history"},
+    {"list",        CmdHF14AMfList,         AlwaysAvailable,  "List Mifare history"},
     {"darkside",    CmdHF14AMfDarkside,     IfPm3Iso14443a,  "Darkside attack. read parity error messages."},
     {"nested",      CmdHF14AMfNested,       IfPm3Iso14443a,  "Nested attack. Test nested authentication"},
     {"hardnested",  CmdHF14AMfNestedHard,   IfPm3Iso14443a,  "Nested attack for hardened Mifare cards"},
diff --git a/client/cmdhftopaz.c b/client/cmdhftopaz.c
index c594a3f15..284cdc1f9 100644
--- a/client/cmdhftopaz.c
+++ b/client/cmdhftopaz.c
@@ -509,7 +509,7 @@ static command_t CommandTable[] = {
     {"sim",     CmdHFTopazSim,      IfPm3Iso14443a,  "<UID> -- Simulate Topaz tag"},
     {"sniff",   CmdHF14ASniff,      IfPm3Iso14443a,  "Sniff Topaz reader-tag communication"},
     {"raw",     CmdHFTopazCmdRaw,   IfPm3Iso14443a,  "Send raw hex data to tag"},
-    {"list",    CmdHFTopazList,     IfPm3Iso14443a,  "List Topaz history"},
+    {"list",    CmdHFTopazList,     AlwaysAvailable,  "List Topaz history"},
     {NULL,      NULL,               0, NULL}
 };
 
diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index f3c3b9253..ca3866805 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -1956,7 +1956,7 @@ static command_t CommandTable[] =  {
     {"sim",         CmdEmvSim,                      IfPm3Iso14443,   "simulate EMV tag"},
     {"clone",       CmdEmvClone,                    IfPm3Iso14443,   "clone an EMV tag"},
     */
-    {"list",        CmdEMVList,                     IfPm3Iso14443,   "List ISO7816 history"},
+    {"list",        CmdEMVList,                     AlwaysAvailable,   "List ISO7816 history"},
     {"roca",        CmdEMVRoca,                     IfPm3Iso14443,   "Extract public keys and run ROCA test"},
     {NULL, NULL, NULL, NULL}
 };

From 2ec05efa3a0bd0ef4d5e98ac2c2585f54ad90ed5 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 2 May 2019 12:24:00 +0200
Subject: [PATCH 1570/1938] remove outdated & unused loclass files

---
 client/loclass/loclass_main.h |   4 --
 client/loclass/main.c         | 120 ----------------------------------
 2 files changed, 124 deletions(-)
 delete mode 100644 client/loclass/loclass_main.h
 delete mode 100644 client/loclass/main.c

diff --git a/client/loclass/loclass_main.h b/client/loclass/loclass_main.h
deleted file mode 100644
index b6d58a8bc..000000000
--- a/client/loclass/loclass_main.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef LOCLASS_MAIN_H
-#define LOCLASS_MAIN_H
-
-#endif // LOCLASS_MAIN_H
diff --git a/client/loclass/main.c b/client/loclass/main.c
deleted file mode 100644
index 8fb9c0494..000000000
--- a/client/loclass/main.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/*****************************************************************************
- * WARNING
- *
- * THIS CODE IS CREATED FOR EXPERIMENTATION AND EDUCATIONAL USE ONLY.
- *
- * USAGE OF THIS CODE IN OTHER WAYS MAY INFRINGE UPON THE INTELLECTUAL
- * PROPERTY OF OTHER PARTIES, SUCH AS INSIDE SECURE AND HID GLOBAL,
- * AND MAY EXPOSE YOU TO AN INFRINGEMENT ACTION FROM THOSE PARTIES.
- *
- * THIS CODE SHOULD NEVER BE USED TO INFRINGE PATENTS OR INTELLECTUAL PROPERTY RIGHTS.
- *
- *****************************************************************************
- *
- * This file is part of loclass. It is a reconstructon of the cipher engine
- * used in iClass, and RFID techology.
- *
- * The implementation is based on the work performed by
- * Flavio D. Garcia, Gerhard de Koning Gans, Roel Verdult and
- * Milosch Meriac in the paper "Dismantling IClass".
- *
- * Copyright (C) 2014 Martin Holst Swende
- *
- * This is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation, or, at your option, any later version.
- *
- * This file is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with loclass.  If not, see <http://www.gnu.org/licenses/>.
- *
- *
- ****************************************************************************/
-
-
-#include <stdio.h>
-#include <stdint.h>
-#include <stdbool.h>
-#include <string.h>
-#include <unistd.h>
-#include <ctype.h>
-#include "cipherutils.h"
-#include "cipher.h"
-#include "ikeys.h"
-#include "fileutils.h"
-#include "elite_crack.h"
-
-int unitTests() {
-    int errors = testCipherUtils();
-    errors += testMAC();
-    errors += doKeyTests(0);
-    errors += testElite();
-    if (errors) {
-        PrintAndLogDevice(NORMAL, "OBS! There were errors!!!");
-    }
-    return errors;
-}
-int showHelp() {
-    PrintAndLogDevice(NORMAL, "Usage: loclass [options]");
-    PrintAndLogDevice(NORMAL, "Options:");
-    PrintAndLogDevice(NORMAL, "-t                 Perform self-test");
-    PrintAndLogDevice(NORMAL, "-h                 Show this help");
-    PrintAndLogDevice(NORMAL, "-f <filename>      Bruteforce iclass dumpfile");
-    PrintAndLogDevice(NORMAL, "                   An iclass dumpfile is assumed to consist of an arbitrary number of malicious CSNs, and their protocol responses");
-    PrintAndLogDevice(NORMAL, "                   The binary format of the file is expected to be as follows: ");
-    PrintAndLogDevice(NORMAL, "                   <8 byte CSN><8 byte CC><4 byte NR><4 byte MAC>");
-    PrintAndLogDevice(NORMAL, "                   <8 byte CSN><8 byte CC><4 byte NR><4 byte MAC>");
-    PrintAndLogDevice(NORMAL, "                   <8 byte CSN><8 byte CC><4 byte NR><4 byte MAC>");
-    PrintAndLogDevice(NORMAL, "                  ... totalling N*24 bytes");
-    PrintAndLogDevice(NORMAL, "                  Check iclass_dump.bin for an example");
-
-    return 0;
-}
-
-int main(int argc, char **argv) {
-    PrintAndLogDevice(NORMAL, "IClass Cipher version 1.2, Copyright (C) 2014 Martin Holst Swende\n");
-    PrintAndLogDevice(NORMAL, "Comes with ABSOLUTELY NO WARRANTY");
-    PrintAndLogDevice(NORMAL, "Released as GPLv2\n");
-    PrintAndLogDevice(NORMAL, "WARNING");
-    PrintAndLogDevice(NORMAL, "");
-    PrintAndLogDevice(NORMAL, "THIS TOOL IS CREATED FOR EXPERIMENTATION AND EDUCATIONAL USE ONLY. ");
-    PrintAndLogDevice(NORMAL, "");
-    PrintAndLogDevice(NORMAL, "USAGE OF THIS TOOL IN OTHER WAYS MAY INFRINGE UPON THE INTELLECTUAL ");
-    PrintAndLogDevice(NORMAL, "PROPERTY OF OTHER PARTIES, SUCH AS INSIDE SECURE AND HID GLOBAL, ");
-    PrintAndLogDevice(NORMAL, "AND MAY EXPOSE YOU TO AN INFRINGEMENT ACTION FROM THOSE PARTIES. ");
-    PrintAndLogDevice(NORMAL, "");
-    PrintAndLogDevice(NORMAL, "THIS TOOL SHOULD NEVER BE USED TO INFRINGE PATENTS OR INTELLECTUAL PROPERTY RIGHTS. ");
-
-
-    char *fileName = NULL;
-    int c;
-    while ((c = getopt(argc, argv, "thf:")) != -1)
-        switch (c) {
-            case 't':
-                return unitTests();
-            case 'h':
-                return showHelp();
-            case 'f':
-                fileName = optarg;
-                return bruteforceFileNoKeys(fileName);
-            case '?':
-                if (optopt == 'f')
-                    fprintf(stderr, "Option -%c requires an argument.\n", optopt);
-                else if (isprint(optopt))
-                    fprintf(stderr, "Unknown option `-%c'.\n", optopt);
-                else
-                    fprintf(stderr,
-                            "Unknown option character `\\x%x'.\n",
-                            optopt);
-                return 1;
-                //default:
-                //showHelp();
-        }
-    showHelp();
-    return 0;
-}
-

From f33d0bf2069c5b78c88ab77f3f45af0935bca1b4 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 3 May 2019 08:40:21 +0200
Subject: [PATCH 1571/1938] hw tune: block client till button pressed

---
 armsrc/appmain.c |  4 +++-
 client/cmdhf.c   | 11 +++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index bb7272c85..65233d718 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -319,7 +319,9 @@ void MeasureAntennaTuningHf(void) {
         DbprintfEx(FLAG_INPLACE, "%u mV / %5u V", volt, (uint16_t)(volt / 1000));
     }
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-    Dbprintf("\n[+] cancelled", 1);
+    DbprintfEx(FLAG_NEWLINE, "");
+    Dbprintf("[+] cancelled", 1);
+    reply_ng(CMD_MEASURE_ANTENNA_TUNING_HF, PM3_EOPABORTED, NULL, 0);
 }
 
 void ReadMem(int addr) {
diff --git a/client/cmdhf.c b/client/cmdhf.c
index ab34e39fc..40bd863cb 100644
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -85,8 +85,15 @@ int CmdHFTune(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     PrintAndLogEx(SUCCESS, "Measuring HF antenna, press button to exit");
     clearCommandBuffer();
-    SendCommandOLD(CMD_MEASURE_ANTENNA_TUNING_HF, 0, 0, 0, NULL, 0);
-    return 0;
+    SendCommandNG(CMD_MEASURE_ANTENNA_TUNING_HF, NULL, 0);
+    PacketResponseNG resp;
+    if (!WaitForResponseTimeout(CMD_MEASURE_ANTENNA_TUNING_HF, &resp, 1000)) {
+        PrintAndLogEx(WARNING, "Timeout while waiting for Proxmark HF measure, aborting");
+        return PM3_ETIMEOUT;
+    }
+    if (resp.status!=PM3_EOPABORTED)
+        return resp.status;
+    return PM3_SUCCESS;
 }
 
 int CmdHFSniff(const char *Cmd) {

From b723126deb588650155475048ab6e4faf276a718 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 3 May 2019 09:04:28 +0200
Subject: [PATCH 1572/1938] Make smartcard support detection dynamic

---
 armsrc/appmain.c   | 16 +++++++++-------
 client/cmdparser.c | 18 +++++++++---------
 common/i2c.c       | 20 ++++++++++++++++----
 common/i2c.h       |  1 +
 4 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 65233d718..b7693a96c 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -441,15 +441,20 @@ void SendCapabilities(void) {
 
 #ifdef WITH_FLASH
     capabilities.compiled_with_flash = true;
+    // TODO
+    capabilities.hw_available_flash = true;
 #else
     capabilities.compiled_with_flash = false;
+    capabilities.hw_available_flash = false;
 #endif
 #ifdef WITH_SMARTCARD
     capabilities.compiled_with_smartcard = true;
+    uint8_t maj, min;
+    capabilities.hw_available_smartcard = I2C_get_version(&maj, &min) == PM3_SUCCESS;
 #else
     capabilities.compiled_with_smartcard = false;
+    capabilities.hw_available_smartcard = false;
 #endif
-
 #ifdef WITH_FPC
     capabilities.compiled_with_fpc = true;
 #else
@@ -457,8 +462,11 @@ void SendCapabilities(void) {
 #endif
 #ifdef WITH_FPC_HOST
     capabilities.compiled_with_fpc_host = true;
+    // TODO
+    capabilities.hw_available_fpc_host = true;
 #else
     capabilities.compiled_with_fpc_host = false;
+    capabilities.hw_available_fpc_host = false;
 #endif
 #ifdef WITH_LF
     capabilities.compiled_with_lf = true;
@@ -510,12 +518,6 @@ void SendCapabilities(void) {
 #else
     capabilities.compiled_with_lcd = false;
 #endif
-
-// TODO
-//    capabilities.hw_available_flash
-//    capabilities.hw_available_smartcard
-//    capabilities.hw_available_fpc_host
-
     reply_ng(CMD_CAPABILITIES, PM3_SUCCESS, (uint8_t *)&capabilities, sizeof(capabilities));
 }
 
diff --git a/client/cmdparser.c b/client/cmdparser.c
index c7bd7a01e..8d942c168 100644
--- a/client/cmdparser.c
+++ b/client/cmdparser.c
@@ -30,17 +30,17 @@ bool IfPm3Present(void) {
 bool IfPm3Flash(void) {
     if (!IfPm3Present())
         return false;
-// TODO
-//    capabilities.hw_available_flash
-    return pm3_capabilities.compiled_with_flash;
+    if (!pm3_capabilities.compiled_with_flash)
+        return false;
+    return pm3_capabilities.hw_available_flash;
 }
 
 bool IfPm3Smartcard(void) {
     if (!IfPm3Present())
         return false;
-// TODO
-//    capabilities.hw_available_smartcard
-    return pm3_capabilities.compiled_with_smartcard;
+    if (!pm3_capabilities.compiled_with_smartcard)
+        return false;
+    return pm3_capabilities.hw_available_smartcard;
 }
 
 bool IfPm3Fpc(void) {
@@ -52,9 +52,9 @@ bool IfPm3Fpc(void) {
 bool IfPm3FpcHost(void) {
     if (!IfPm3Present())
         return false;
-// TODO
-//    capabilities.hw_available_fpc_host
-    return pm3_capabilities.compiled_with_fpc_host;
+    if (!pm3_capabilities.compiled_with_fpc_host)
+        return false;
+    return pm3_capabilities.hw_available_fpc_host;
 }
 
 bool IfPm3Lf(void) {
diff --git a/common/i2c.c b/common/i2c.c
index 0b26bb0dc..ceb548948 100644
--- a/common/i2c.c
+++ b/common/i2c.c
@@ -594,13 +594,25 @@ bool I2C_WriteFW(uint8_t *data, uint8_t len, uint8_t msb, uint8_t lsb, uint8_t d
 
 void I2C_print_status(void) {
     DbpString(_BLUE_("Smart card module (ISO 7816)"));
+    uint8_t maj, min;
+    if (I2C_get_version(&maj, &min) == PM3_SUCCESS)
+        Dbprintf("  version.................v%x.%02d", maj, min);
+    else
+        DbpString("  version................." _RED_("FAILED"));
+}
+
+int I2C_get_version(uint8_t *maj, uint8_t *min) {
     uint8_t resp[] = {0, 0, 0, 0};
     I2C_Reset_EnterMainProgram();
     uint8_t len = I2C_BufferRead(resp, sizeof(resp), I2C_DEVICE_CMD_GETVERSION, I2C_DEVICE_ADDRESS_MAIN);
-    if (len > 0)
-        Dbprintf("  version.................v%x.%02d", resp[0], resp[1]);
-    else
-        DbpString("  version................." _RED_("FAILED"));
+    if (len > 0) {
+        Dbprintf("  version.................v%x.%02d", maj, min);
+        *maj = resp[0];
+        *min = resp[1];
+        return PM3_SUCCESS;
+    } else {
+        return PM3_EDEVNOTSUPP;
+    }
 }
 
 // Will read response from smart card module,  retries 3 times to get the data.
diff --git a/common/i2c.h b/common/i2c.h
index 648d0d8d9..52be70ef0 100644
--- a/common/i2c.h
+++ b/common/i2c.h
@@ -47,4 +47,5 @@ void SmartCardUpgrade(uint64_t arg0);
 void SmartCardSetBaud(uint64_t arg0);
 void SmartCardSetClock(uint64_t arg0);
 void I2C_print_status(void);
+int I2C_get_version(uint8_t *maj, uint8_t *min);
 #endif

From 35a738f962d045f07eaba08890a5c1342a7dd053 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 3 May 2019 09:06:47 +0200
Subject: [PATCH 1573/1938] Forgot debug string

---
 common/i2c.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/common/i2c.c b/common/i2c.c
index ceb548948..df5450f9f 100644
--- a/common/i2c.c
+++ b/common/i2c.c
@@ -606,7 +606,6 @@ int I2C_get_version(uint8_t *maj, uint8_t *min) {
     I2C_Reset_EnterMainProgram();
     uint8_t len = I2C_BufferRead(resp, sizeof(resp), I2C_DEVICE_CMD_GETVERSION, I2C_DEVICE_ADDRESS_MAIN);
     if (len > 0) {
-        Dbprintf("  version.................v%x.%02d", maj, min);
         *maj = resp[0];
         *min = resp[1];
         return PM3_SUCCESS;

From cb34e554fe364c6f04c0bdebac4ef04e15c3cec5 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 3 May 2019 09:41:28 +0200
Subject: [PATCH 1574/1938] chg: info log = yellow

---
 client/ui.c | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/client/ui.c b/client/ui.c
index 1dc5a1dca..8049f128f 100644
--- a/client/ui.c
+++ b/client/ui.c
@@ -30,16 +30,6 @@ pthread_mutex_t print_lock = PTHREAD_MUTEX_INITIALIZER;
 static const char *logfilename = "proxmark3.log";
 static void fPrintAndLog(FILE *stream, const char *fmt, ...);
 
-/*
-static float complex cexpf(float complex Z) {
-    float complex  Res;
-    double rho = exp(__real__ Z);
-    __real__ Res = rho * cosf(__imag__ Z);
-    __imag__ Res = rho * sinf(__imag__ Z);
-    return Res;
-}
-*/
-
 void PrintAndLogOptions(const char *str[][2], size_t size, size_t space) {
     char buff[2000] = "Options:\n";
     char format[2000] = "";
@@ -94,8 +84,10 @@ void PrintAndLogEx(logLevel_t level, const char *fmt, ...) {
         case WARNING:
             strncpy(prefix, _CYAN_("[!]"), sizeof(prefix) - 1);
             break;
+        case INFO:       
+            strncpy(prefix, _YELLOW_("[=]"), sizeof(prefix) - 1);
+            break;
         case NORMAL:
-        case INFO:
             strncpy(prefix, prefixes[level], sizeof(prefix) - 1);
             break;
     }

From 337fccf20656555d51c8869df7035122bf5f6e55 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 3 May 2019 11:25:05 +0200
Subject: [PATCH 1575/1938] chg: don't print "running.."

---
 proxmark3.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/proxmark3.sh b/proxmark3.sh
index 0d7b36657..b4cbd49fd 100755
--- a/proxmark3.sh
+++ b/proxmark3.sh
@@ -60,6 +60,6 @@ if [ "$PORT" = "" ]; then
     exit 1
 fi
 
-echo Running "$CMD" "$PORT" $ARG1 $ARG2 "$@"
+#echo Running "$CMD" "$PORT" $ARG1 $ARG2 "$@"
 "$CMD" "$PORT" $ARG1 $ARG2 "$@"
 exit $?

From 535559a140a2f6d1aadd0d4f5c14f26477e08d3f Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 3 May 2019 11:25:55 +0200
Subject: [PATCH 1576/1938] textual

---
 client/flasher.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/client/flasher.c b/client/flasher.c
index 874717215..844b7accf 100644
--- a/client/flasher.c
+++ b/client/flasher.c
@@ -99,14 +99,13 @@ int main(int argc, char **argv) {
         PrintAndLogEx(NORMAL, "\n");
     }
 
-    PrintAndLogEx(SUCCESS, _BLUE_("Resetting hardware..."));
-
     res = flash_stop_flashing();
     if (res < 0)
         return -1;
 
     CloseProxmark();
 
-    PrintAndLogEx(SUCCESS, _BLUE_("All done.") "\n\nHave a nice day!");
+    PrintAndLogEx(SUCCESS, _BLUE_("All done."));
+    PrintAndLogEx(SUCCESS, "\nHave a nice day!");
     return 0;
 }

From 584a3465871e89c9bf29fea7ca61f41f5fbe407c Mon Sep 17 00:00:00 2001
From: Gtpy <13873777+gtpy@users.noreply.github.com>
Date: Fri, 3 May 2019 16:57:56 +0200
Subject: [PATCH 1577/1938] Missing Rename USB -> PM3

Missing Rename USB -> PM3 to avoid misleading interpretations 27f7057
---
 armsrc/Standalone/hf_young.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/armsrc/Standalone/hf_young.c b/armsrc/Standalone/hf_young.c
index c9f89da7e..fc72df2ac 100644
--- a/armsrc/Standalone/hf_young.c
+++ b/armsrc/Standalone/hf_young.c
@@ -210,7 +210,7 @@ void RunMod() {
                 if (button_action == 0) {  // No button action, proceed with sim
 
                     uint8_t flags = FLAG_4B_UID_IN_DATA;
-                    uint8_t data[USB_CMD_DATA_SIZE] = {0}; // in case there is a read command received we shouldn't break
+                    uint8_t data[PM3_CMD_DATA_SIZE] = {0}; // in case there is a read command received we shouldn't break
 
                     memcpy(data, uids[selected].uid, uids[selected].uidlen);
 

From ed1950a0f573ca61e80af2a859312edea37f5026 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 3 May 2019 17:53:32 +0200
Subject: [PATCH 1578/1938] fix: cross thread communictions of timeout variable

---
 client/comms.c | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/client/comms.c b/client/comms.c
index 8ee60bbe4..1497d4d7a 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -250,7 +250,7 @@ static void PacketResponseReceived(PacketResponseNG *packet) {
 //                packet->ng ? "NG" : "OLD", packet->magic, packet->length, packet->status, packet->crc, packet->cmd);
 
     // we got a packet, reset WaitForResponseTimeout timeout
-    timeout_start_time = msclock();
+    __atomic_store_n(&timeout_start_time,  msclock(), __ATOMIC_SEQ_CST);
 
     switch (packet->cmd) {
         // First check if we are handling a debug message
@@ -674,29 +674,29 @@ bool WaitForResponseTimeoutW(uint32_t cmd, PacketResponseNG *response, size_t ms
     if (ms_timeout != (size_t) -1)
         ms_timeout += communication_delay();
 
-    timeout_start_time = msclock();
-
+    __atomic_store_n(&timeout_start_time,  msclock(), __ATOMIC_SEQ_CST);
+    uint64_t tmp_clk;
+    
     // Wait until the command is received
     while (true) {
 
         while (getReply(response)) {
             if (cmd == CMD_UNKNOWN || response->cmd == cmd) {
-//                PrintAndLogEx(INFO, "Waited %i ms", msclock() - timeout_start_time);
                 return true;
             }
         }
 
-        if (msclock() - timeout_start_time > ms_timeout)
+        tmp_clk = __atomic_load_n(&timeout_start_time, __ATOMIC_SEQ_CST);
+        if (msclock() - tmp_clk > ms_timeout)
             break;
 
-        if (msclock() - timeout_start_time > 3000 && show_warning) {
+        if (msclock() - tmp_clk > 3000 && show_warning) {
             // 3 seconds elapsed (but this doesn't mean the timeout was exceeded)
             PrintAndLogEx(INFO, "Waiting for a response from the proxmark3...");
             PrintAndLogEx(INFO, "You can cancel this operation by pressing the pm3 button");
             show_warning = false;
         }
     }
-//    PrintAndLogEx(INFO, "Wait timeout after %i ms", msclock() - timeout_start_time);
     return false;
 }
 
@@ -758,8 +758,9 @@ bool GetFromDevice(DeviceMemType_t memtype, uint8_t *dest, uint32_t bytes, uint3
 static bool dl_it(uint8_t *dest, uint32_t bytes, uint32_t start_index, PacketResponseNG *response, size_t ms_timeout, bool show_warning, uint32_t rec_cmd) {
 
     uint32_t bytes_completed = 0;
-    timeout_start_time = msclock();
-
+    __atomic_store_n(&timeout_start_time,  msclock(), __ATOMIC_SEQ_CST);
+    uint64_t tmp_clk;
+    
     // Add delay depending on the communication channel & speed
     if (ms_timeout != (size_t) -1)
         ms_timeout += communication_delay();
@@ -795,12 +796,13 @@ static bool dl_it(uint8_t *dest, uint32_t bytes, uint32_t start_index, PacketRes
             }
         }
 
-        if (msclock() - timeout_start_time > ms_timeout) {
+        tmp_clk = __atomic_load_n(&timeout_start_time, __ATOMIC_SEQ_CST);
+        if (msclock() - tmp_clk > ms_timeout) {
             PrintAndLogEx(FAILED, "Timed out while trying to download data from device");
             break;
         }
 
-        if (msclock() - timeout_start_time > 3000 && show_warning) {
+        if (msclock() - tmp_clk > 3000 && show_warning) {
             // 3 seconds elapsed (but this doesn't mean the timeout was exceeded)
             PrintAndLogEx(NORMAL, "Waiting for a response from the Proxmark3...");
             PrintAndLogEx(NORMAL, "You can cancel this operation by pressing the pm3 button");

From a49ae2d0ceb4ab0b302e6b8e1c728c6d8386b77d Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 3 May 2019 21:33:00 +0200
Subject: [PATCH 1579/1938] FIX:  slow reconfigure on mingw of serial port

---
 client/comms.c     | 23 ++++++++++++++++++++---
 client/proxmark3.c |  1 +
 uart/uart_win32.c  |  2 --
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/client/comms.c b/client/comms.c
index 1497d4d7a..7a0d9db8c 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -49,6 +49,8 @@ static int cmd_tail = 0;
 
 // to lock rxBuffer operations from different threads
 static pthread_mutex_t rxBufferMutex = PTHREAD_MUTEX_INITIALIZER;
+// serial port access from different threads
+static pthread_mutex_t spMutex = PTHREAD_MUTEX_INITIALIZER;
 
 // Global start time for WaitForResponseTimeout & dl_it, so we can reset timeout when we get packets
 // as sending lot of these packets can slow down things wuite a lot on slow links (e.g. hw status or lf read at 9600)
@@ -352,6 +354,10 @@ __attribute__((force_align_arg_pointer))
         rxlen = 0;
         bool ACK_received = false;
         bool error = false;
+        
+        
+        pthread_mutex_lock(&spMutex);
+
         if (uart_receive(sp, (uint8_t *)&rx_raw.pre, sizeof(PacketResponseNGPreamble), &rxlen) && (rxlen == sizeof(PacketResponseNGPreamble))) {
             rx.magic = rx_raw.pre.magic;
             uint16_t length = rx_raw.pre.length;
@@ -459,6 +465,9 @@ __attribute__((force_align_arg_pointer))
                 error = true;
             }
         }
+        
+        pthread_mutex_unlock(&spMutex);
+                        
         // TODO if error, shall we resync ?
 
         pthread_mutex_lock(&txBufferMutex);
@@ -592,12 +601,20 @@ int TestProxmark(void) {
             if (conn.send_via_fpc) {
                 PrintAndLogEx(INFO, "UART Serial baudrate: " _YELLOW_("%u") "\n", conn.uart_speed);
             }
-
+           
             // reconfigure.
             if (conn.send_via_fpc == false) {
-                uart_reconfigure_timeouts(sp, UART_USB_CLIENT_RX_TIMEOUT_MS);
-            }
+                
+                pthread_mutex_lock(&spMutex);
+                int res = uart_reconfigure_timeouts(sp, UART_USB_CLIENT_RX_TIMEOUT_MS);
+                pthread_mutex_unlock(&spMutex);
 
+                if ( res != PM3_SUCCESS ) {
+                    PrintAndLogEx(ERR, "UART reconfigure failed");
+                    return res;
+                }
+
+            }
             return PM3_SUCCESS;
         } else {
             return PM3_ETIMEOUT;
diff --git a/client/proxmark3.c b/client/proxmark3.c
index 1dde3d61e..58b6a5325 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -496,6 +496,7 @@ int main(int argc, char *argv[]) {
         CloseProxmark();
         session.pm3_present = false;
     }
+    
     if (!session.pm3_present)
         PrintAndLogEx(INFO, "Running in " _YELLOW_("OFFLINE") "mode. Check \"%s -h\" if it's not what you want.\n", exec_name);
 
diff --git a/uart/uart_win32.c b/uart/uart_win32.c
index 9939eee1c..b5f7b9302 100644
--- a/uart/uart_win32.c
+++ b/uart/uart_win32.c
@@ -49,7 +49,6 @@ typedef struct {
 } serial_port_windows;
 
 int uart_reconfigure_timeouts(serial_port sp, uint32_t value) {
-
     serial_port_windows *spw;
     spw = (serial_port_windows *)sp;
     spw->ct.ReadIntervalTimeout         = value;
@@ -60,7 +59,6 @@ int uart_reconfigure_timeouts(serial_port sp, uint32_t value) {
 
     if (!SetCommTimeouts(spw->hPort, &spw->ct)) {
         uart_close(spw);
-        printf("[!] UART error while setting comm time outs\n");
         return PM3_EIO;
     }
 

From 8e2d5370f94fbe74005a8495ea56f06d0fb15286 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 3 May 2019 21:58:47 +0200
Subject: [PATCH 1580/1938] fix:  seems the mutex messed up on ubuntu but there
 it works without.

---
 client/comms.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/client/comms.c b/client/comms.c
index 7a0d9db8c..8a94def2a 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -27,7 +27,6 @@ communication_arg_t conn;
 capabilities_t pm3_capabilities;
 
 static pthread_t USB_communication_thread;
-//static pthread_t FPC_communication_thread;
 
 // Transmit buffer.
 static PacketCommandOLD txBuffer;
@@ -355,7 +354,6 @@ __attribute__((force_align_arg_pointer))
         bool ACK_received = false;
         bool error = false;
         
-        
         pthread_mutex_lock(&spMutex);
 
         if (uart_receive(sp, (uint8_t *)&rx_raw.pre, sizeof(PacketResponseNGPreamble), &rxlen) && (rxlen == sizeof(PacketResponseNGPreamble))) {
@@ -486,6 +484,8 @@ __attribute__((force_align_arg_pointer))
         }
 
         if (txBuffer_pending) {
+            
+            pthread_mutex_lock(&spMutex);
             if (txBufferNGLen) { // NG packet
                 if (!uart_send(sp, (uint8_t *) &txBufferNG, txBufferNGLen)) {
                     //counter_to_offline++;
@@ -498,6 +498,8 @@ __attribute__((force_align_arg_pointer))
                     PrintAndLogEx(WARNING, "sending bytes to Proxmark3 device " _RED_("failed"));
                 }
             }
+            pthread_mutex_unlock(&spMutex);
+            
             txBuffer_pending = false;
 
             // tell main thread that txBuffer is empty
@@ -560,7 +562,7 @@ bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode,
         conn.send_via_fpc = false;
 
         pthread_create(&USB_communication_thread, NULL, &uart_communication, &conn);
-        //pthread_create(&FPC_communication_thread, NULL, &uart_communication, &conn);
+
         fflush(stdout);
         // create a mutex to avoid interlacing print commands from our different threads
         //pthread_mutex_init(&print_lock, NULL);
@@ -604,11 +606,14 @@ int TestProxmark(void) {
            
             // reconfigure.
             if (conn.send_via_fpc == false) {
-                
-                pthread_mutex_lock(&spMutex);
-                int res = uart_reconfigure_timeouts(sp, UART_USB_CLIENT_RX_TIMEOUT_MS);
-                pthread_mutex_unlock(&spMutex);
 
+#if defined(_WIN32)
+                pthread_mutex_lock(&spMutex);
+#endif                
+                int res = uart_reconfigure_timeouts(sp, UART_USB_CLIENT_RX_TIMEOUT_MS);
+#if defined(_WIN32)
+                pthread_mutex_unlock(&spMutex);
+#endif
                 if ( res != PM3_SUCCESS ) {
                     PrintAndLogEx(ERR, "UART reconfigure failed");
                     return res;
@@ -633,7 +638,6 @@ void CloseProxmark(void) {
     }
 #else
     pthread_join(USB_communication_thread, NULL);
-    //pthread_join(FPC_communication_thread, NULL);
 #endif
 
     if (sp) {

From 3176684f4aa1cceb7ccb67c7942c057a09b902b2 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 3 May 2019 22:30:17 +0200
Subject: [PATCH 1581/1938] Add usart dev cmds & dynamic flash support
 capability

---
 CHANGELOG.md             |   2 +-
 Makefile                 |   8 ++-
 armsrc/Makefile          |  10 ++-
 armsrc/appmain.c         | 130 +++++++++++++++------------------------
 armsrc/fpgaloader.c      |   6 +-
 client/Makefile          |   9 ++-
 client/cmdanalyse.c      |  42 +------------
 client/cmdhw.c           |  13 ++--
 client/cmdmain.c         |  31 +++++-----
 client/cmdmain.h         |   1 +
 client/cmdparser.c       |  21 +++++--
 client/cmdparser.h       |   5 +-
 client/comms.c           |  15 +++--
 client/comms.h           |   2 +-
 common/Makefile.hal      |  69 +++++++++++++--------
 common/cmd.c             |   8 +--
 doc/new_frame_format.txt |   2 +-
 include/pm3_cmd.h        |  16 ++---
 18 files changed, 185 insertions(+), 205 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 68657412f..df0190b6f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,7 +43,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
  - Change better strong wave detection for biphase (@iceman)
  - Add 'script run test_t55x7' (@iceman)
  - Add new lua scripting support for some t55xx commands (@iceman)
- - *WIP* Add FPC usart with pm3 client: WITH_FPC_HOST. (@doegox)
+ - Add FPC USART for BT add-on with pm3 client. (@doegox)
  - Add '-b baudrate' option to the pm3 client. (@doegox)
  - Change 'lf t55xx info': tell if known configuration block0. (@iceman)
  - Fix/Add FPC usart: fix TX, bring RX, full speed. (@doegox)
diff --git a/Makefile b/Makefile
index a474fadd3..d968781f4 100644
--- a/Makefile
+++ b/Makefile
@@ -28,15 +28,19 @@ ifeq ($(PLATFORM),)
   ifeq ($(PLATFORM),)
     PLATFORM=PM3RDV4
   else
-    ${info using saved PLATFORM '$(PLATFORM)'}
+    ${info using saved PLATFORM:        '$(PLATFORM)'}
+  endif
+  ifneq ($(PLATFORM_EXTRAS),)
+    ${info using saved PLATFORM_EXTRAS: '$(PLATFORM_EXTRAS)'}
   endif
 endif
 
 include common/Makefile.hal
 
 $(info ===================================================================)
-$(info PLATFORM:          $(PLATFORM))
 $(info Platform name:     $(PLTNAME))
+$(info PLATFORM:          $(PLATFORM))
+$(info PLATFORM_EXTRAS:   $(PLATFORM_EXTRAS))
 $(info Included options:  $(PLATFORM_DEFS_INFO))
 $(info Standalone mode:   $(PLATFORM_DEFS_INFO_STANDALONE))
 $(info ===================================================================)
diff --git a/armsrc/Makefile b/armsrc/Makefile
index 705cbb021..01193a4f8 100644
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -14,12 +14,16 @@ ifeq ($(PLTNAME),)
   ifeq ($(PLATFORM),)
     PLATFORM=PM3RDV4
   else
-    ${info using saved PLATFORM '$(PLATFORM)'}
+    ${info using saved PLATFORM:        '$(PLATFORM)'}
+  endif
+  ifneq ($(PLATFORM_EXTRAS),)
+    ${info using saved PLATFORM_EXTRAS: '$(PLATFORM_EXTRAS)'}
   endif
   include ../common/Makefile.hal
   $(info ===================================================================)
-  $(info PLATFORM:          $(PLATFORM))
   $(info Platform name:     $(PLTNAME))
+  $(info PLATFORM:          $(PLATFORM))
+  $(info PLATFORM_EXTRAS:   $(PLATFORM_EXTRAS))
   $(info Included options:  $(PLATFORM_DEFS_INFO))
   $(info Standalone mode:   $(PLATFORM_DEFS_INFO_STANDALONE))
   $(info ===================================================================)
@@ -56,7 +60,7 @@ else
 	SRC_SMARTCARD =
 endif
 
-ifneq (,$(findstring WITH_FPC,$(APP_CFLAGS)))
+ifneq (,$(findstring WITH_FPC_USART,$(APP_CFLAGS)))
 	SRC_FPC = usart.c
 else
 	SRC_FPC =
diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index b7693a96c..cebfd71e2 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -36,7 +36,7 @@
 #include "i2c.h"
 #endif
 
-#ifdef WITH_FPC
+#ifdef WITH_FPC_USART
 #include "usart.h"
 #endif
 
@@ -441,8 +441,7 @@ void SendCapabilities(void) {
 
 #ifdef WITH_FLASH
     capabilities.compiled_with_flash = true;
-    // TODO
-    capabilities.hw_available_flash = true;
+    capabilities.hw_available_flash = FlashInit();
 #else
     capabilities.compiled_with_flash = false;
     capabilities.hw_available_flash = false;
@@ -455,18 +454,23 @@ void SendCapabilities(void) {
     capabilities.compiled_with_smartcard = false;
     capabilities.hw_available_smartcard = false;
 #endif
-#ifdef WITH_FPC
-    capabilities.compiled_with_fpc = true;
+#ifdef WITH_FPC_USART
+    capabilities.compiled_with_fpc_usart = true;
 #else
-    capabilities.compiled_with_fpc = false;
+    capabilities.compiled_with_fpc_usart = false;
 #endif
-#ifdef WITH_FPC_HOST
-    capabilities.compiled_with_fpc_host = true;
-    // TODO
-    capabilities.hw_available_fpc_host = true;
+#ifdef WITH_FPC_USART_DEV
+    capabilities.compiled_with_fpc_usart_dev = true;
 #else
-    capabilities.compiled_with_fpc_host = false;
-    capabilities.hw_available_fpc_host = false;
+    capabilities.compiled_with_fpc_usart_dev = false;
+#endif
+#ifdef WITH_FPC_USART_HOST
+    capabilities.compiled_with_fpc_usart_host = true;
+    // TODO
+    capabilities.hw_available_fpc_usart_btaddon = true;
+#else
+    capabilities.compiled_with_fpc_usart_host = false;
+    capabilities.hw_available_fpc_usart_btaddon = false;
 #endif
 #ifdef WITH_LF
     capabilities.compiled_with_lf = true;
@@ -1181,79 +1185,45 @@ static void PacketReceived(PacketCommandNG *packet) {
         }
 #endif
 
-#ifdef WITH_FPC
-        case CMD_FPC_SEND: {
-
-
-            StartTicks();
-            DbpString("Mutual USB/FPC sending from device to client");
-
-            /*
-            char at[11] = {'\0'};
-            static const char* s_at = "AT+BAUD8\0D\0A";
-            strncat(at, s_at, sizeof(at) - strlen(at) - 1);
-            DbpString("Try AT baud rate setting");
-            usart_init();
-            int16_t res = usart_writebuffer_sync((uint8_t*)&at, sizeof(at));
-            WaitMS(1);
-            Dbprintf("SEND %d | %c%c%c%c%c%c%c%c%c%c%c", res,  at[0], at[1], at[2], at[3], at[4], at[5], at[6], at[7], at[8], at[9], at[10]);
-
-            uint8_t my_rx[20];
-            memset(my_rx, 0, sizeof(my_rx));
-            res = usart_readbuffer(my_rx);
-            WaitMS(1);
-            Dbprintf("GOT  %d | %c%c%c%c%c%c%c%c", res,  my_rx[0], my_rx[1], my_rx[2], my_rx[3], my_rx[4], my_rx[5], my_rx[6], my_rx[7]);
-            */
-
-
-            char dest[USART_FIFOLEN] = {'\0'};
+#ifdef WITH_FPC_USART_DEV
+        case CMD_USART_TX: {
+            usart_writebuffer_sync(packet->data.asBytes, packet->length);
+            reply_ng(CMD_USART_TX, PM3_SUCCESS, NULL, 0);
+            break;
+        }
+        case CMD_USART_RX: {
+            uint8_t dest[USART_FIFOLEN] = {'\0'};
             uint16_t available = usart_rxdata_available();
             if (available > 0) {
-                Dbprintf("RX DATA!");
-                uint16_t len = usart_read_ng((uint8_t *)dest, available);
-                dest[len] = '\0';
-                Dbprintf("RX: %d | %02X %02X %02X %02X %02X %02X %02X %02X ", len,  dest[0], dest[1], dest[2], dest[3], dest[4], dest[5], dest[6], dest[7]);
+                uint16_t len = usart_read_ng(dest, available);
+                reply_ng(CMD_USART_RX, PM3_SUCCESS, dest, len);
+            } else {
+                reply_ng(CMD_USART_RX, PM3_ENODATA, NULL, 0);
             }
-
-            static const char *welcome = "Proxmark3 Serial interface via FPC ready\r\n";
-            usart_writebuffer_sync((uint8_t *)welcome, strlen(welcome));
-
-            sprintf(dest, "| bytes 0x%02x 0x%02x 0x%02x 0x%02x\r\n"
-                    , packet->data.asBytes[0]
-                    , packet->data.asBytes[1]
-                    , packet->data.asBytes[2]
-                    , packet->data.asBytes[3]
-                   );
-            usart_writebuffer_sync((uint8_t *)dest, strlen(dest));
-
-
-            LED_A_ON();
-
-
-            //usb
-            reply_old(CMD_DEBUG_PRINT_STRING, strlen(dest), 0, 0, dest, strlen(dest));
-            LED_A_OFF();
-            /*
-            uint8_t my_rx[sizeof(PacketCommandOLD)];
-            while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
-                LED_B_INV();
-                if (usart_read_ng(my_rx) ) {
-                    //PacketReceived(my_rx, sizeof(my_rx));
-
-                    PacketCommandOLD *my = (PacketCommandOLD *)my_rx;
-                    if (my->cmd > 0 ) {
-                        Dbprintf("received command: 0x%04x and args: %d %d %d", my->cmd, my->arg[0], my->arg[1], my->arg[2]);
-                    }
-                }
+            break;
+        }
+        case CMD_USART_TXRX: {
+            struct p {
+                uint32_t waittime;
+                uint8_t data[PM3_CMD_DATA_SIZE - sizeof(uint32_t)];
+            } PACKED;
+            struct p *payload = (struct p *) &packet->data.asBytes;
+            usart_writebuffer_sync(payload->data, packet->length - sizeof(payload->waittime));
+            uint16_t available;
+            WaitMS(payload->waittime);
+            uint8_t dest[USART_FIFOLEN] = {'\0'};
+            available = usart_rxdata_available();
+            // Dbprintf("avail (%u)",  available);
+            if (available > 0) {
+                uint16_t len = usart_read_ng(dest, available);
+                reply_ng(CMD_USART_TXRX, PM3_SUCCESS, dest, len);
+            } else {
+                reply_ng(CMD_USART_TXRX, PM3_ENODATA, NULL, 0);
             }
-            */
-            //reply_old(CMD_DEBUG_PRINT_STRING, strlen(dest), 0, 0, dest, strlen(dest));
-
-            reply_old(CMD_ACK, 0, 0, 0, 0, 0);
-            StopTicks();
             break;
         }
 #endif
+
         case CMD_BUFF_CLEAR:
             BigBuf_Clear();
             BigBuf_free();
@@ -1525,7 +1495,7 @@ static void PacketReceived(PacketCommandNG *packet) {
                 case 2:
                     SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
                     break;
-#ifndef WITH_FPC
+#ifndef WITH_FPC_USART
                 case 1:
                     SetAdcMuxFor(GPIO_MUXSEL_LORAW);
                     break;
@@ -1642,7 +1612,7 @@ void  __attribute__((noreturn)) AppMain(void) {
     I2C_init();
 #endif
 
-#ifdef WITH_FPC
+#ifdef WITH_FPC_USART
     usart_init();
 #endif
 
diff --git a/armsrc/fpgaloader.c b/armsrc/fpgaloader.c
index 520cce855..dcaaa238a 100644
--- a/armsrc/fpgaloader.c
+++ b/armsrc/fpgaloader.c
@@ -450,8 +450,8 @@ void FpgaWriteConfWord(uint8_t v) {
 //-----------------------------------------------------------------------------
 void SetAdcMuxFor(uint32_t whichGpio) {
 
-#ifndef WITH_FPC
-    // When compiled without FPC support
+#ifndef WITH_FPC_USART
+    // When compiled without FPC USART support
     AT91C_BASE_PIOA->PIO_OER =
         GPIO_MUXSEL_HIPKD |
         GPIO_MUXSEL_LOPKD |
@@ -472,7 +472,7 @@ void SetAdcMuxFor(uint32_t whichGpio) {
 #else
     if ((whichGpio == GPIO_MUXSEL_LORAW) || (whichGpio == GPIO_MUXSEL_HIRAW))
         return;
-    // FPC serial uses HIRAW/LOWRAW pins, so they are excluded here.
+    // FPC USART uses HIRAW/LOWRAW pins, so they are excluded here.
     AT91C_BASE_PIOA->PIO_OER = GPIO_MUXSEL_HIPKD | GPIO_MUXSEL_LOPKD;
     AT91C_BASE_PIOA->PIO_PER = GPIO_MUXSEL_HIPKD | GPIO_MUXSEL_LOPKD;
     LOW(GPIO_MUXSEL_HIPKD);
diff --git a/client/Makefile b/client/Makefile
index 9b35d6df8..bc6770bb7 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -10,12 +10,16 @@ ifeq ($(PLTNAME),)
   ifeq ($(PLATFORM),)
     PLATFORM=PM3RDV4
   else
-    ${info using saved PLATFORM '$(PLATFORM)'}
+    ${info using saved PLATFORM:        '$(PLATFORM)'}
+  endif
+  ifneq ($(PLATFORM_EXTRAS),)
+    ${info using saved PLATFORM_EXTRAS: '$(PLATFORM_EXTRAS)'}
   endif
   include ../common/Makefile.hal
   $(info ===================================================================)
-  $(info PLATFORM:          $(PLATFORM))
   $(info Platform name:     $(PLTNAME))
+  $(info PLATFORM:          $(PLATFORM))
+  $(info PLATFORM_EXTRAS:   $(PLATFORM_EXTRAS))
   $(info Included options:  $(PLATFORM_DEFS_INFO))
   $(info Standalone mode:   $(PLATFORM_DEFS_INFO_STANDALONE))
   $(info ===================================================================)
@@ -222,6 +226,7 @@ CMDSRCS =	crapto1/crapto1.c \
 			cmdtrace.c \
 			cmdflashmem.c \
 			cmdsmartcard.c \
+			cmdusart.c \
 			cmdparser.c \
 			cmdmain.c \
 			pm3_binlib.c \
diff --git a/client/cmdanalyse.c b/client/cmdanalyse.c
index ede26699b..459a144c9 100644
--- a/client/cmdanalyse.c
+++ b/client/cmdanalyse.c
@@ -485,47 +485,7 @@ static char *pb(uint32_t b) {
 
 static int CmdAnalyseA(const char *Cmd) {
 
-    int hexlen = 0;
-    uint8_t cmdp = 0;
-    bool errors = false;
-    uint8_t data[PM3_CMD_DATA_SIZE] = {0x00};
-
-    if (!IfPm3Fpc()) {
-        PrintAndLogEx(ERR, "Device has no FPC USART support");
-        return PM3_EDEVNOTSUPP;
-    }
-
-    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-        switch (tolower(param_getchar(Cmd, cmdp))) {
-            case 'd':
-                param_gethex_ex(Cmd, cmdp + 1, data, &hexlen);
-                hexlen >>= 1;
-                if (hexlen != sizeof(data)) {
-                    PrintAndLogEx(WARNING, "Read %d bytes of %u", hexlen, sizeof(data));
-                }
-                cmdp += 2;
-                break;
-            case 'h':
-                return usage_analyse_a();
-            default:
-                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-                errors = true;
-                break;
-        }
-    }
-    //Validations
-    if (errors || cmdp == 0) return usage_analyse_a();
-
-
-    clearCommandBuffer();
-    SendCommandOLD(CMD_FPC_SEND, 0, 0, 0, data, PM3_CMD_DATA_SIZE);
-
-    PacketResponseNG resp;
-    if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
-        return 1;
-    }
-    PrintAndLogEx(NORMAL, "got ack.  Status %d", resp.oldarg[0]);
-    return 0;
+    return usage_analyse_a();
     /*
         PrintAndLogEx(NORMAL, "-- " _BLUE_("its my message") "\n");
         PrintAndLogEx(NORMAL, "-- " _RED_("its my message") "\n");
diff --git a/client/cmdhw.c b/client/cmdhw.c
index 337ee4e0f..68f0609a1 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -498,11 +498,14 @@ void pm3_version(bool verbose) {
         PrintAndLogEx(NORMAL, "\n" _BLUE_(" [ Proxmark3 RFID instrument ]") "\n");
         PrintAndLogEx(NORMAL, "\n [ CLIENT ]");
         PrintAndLogEx(NORMAL, "  client: RRG/Iceman"); // TODO version info?
-        PrintAndLogEx(NORMAL, "\n [ PROXMARK ]");
-        PrintAndLogEx(NORMAL, "  external flash:          %s", IfPm3Flash() ? _GREEN_("present") : _YELLOW_("absent"));
-        PrintAndLogEx(NORMAL, "  smartcard reader:        %s", IfPm3Smartcard() ? _GREEN_("present") : _YELLOW_("absent"));
-        PrintAndLogEx(NORMAL, "  USART for addon support: %s\n", IfPm3FpcHost() ? _GREEN_("present") : _YELLOW_("absent"));
-
+        PrintAndLogEx(NORMAL, "\n [ PROXMARK RDV4 ]");
+        PrintAndLogEx(NORMAL, "  external flash:                  %s", IfPm3Flash() ? _GREEN_("present") : _YELLOW_("absent"));
+        PrintAndLogEx(NORMAL, "  smartcard reader:                %s", IfPm3Smartcard() ? _GREEN_("present") : _YELLOW_("absent"));
+        PrintAndLogEx(NORMAL, "\n [ PROXMARK RDV4 Extras ]");
+        PrintAndLogEx(NORMAL, "  FPC USART for BT add-on support: %s", IfPm3FpcUsartHost() ? _GREEN_("present") : _YELLOW_("absent"));
+        if (IfPm3FpcUsartDevFromUsb())
+            PrintAndLogEx(NORMAL, "  FPC USART for developer support: %s", _GREEN_("present"));
+        PrintAndLogEx(NORMAL, "");
         PrintAndLogEx(NORMAL, (char *)resp.data.asBytes);
         lookupChipID(resp.oldarg[0], resp.oldarg[1]);
     }
diff --git a/client/cmdmain.c b/client/cmdmain.c
index 646df1b3c..126f7d822 100644
--- a/client/cmdmain.c
+++ b/client/cmdmain.c
@@ -42,21 +42,22 @@ static int CmdRev(const char *Cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",    CmdHelp,      AlwaysAvailable, "This help. Use '<command> help' for details of a particular command."},
-    {"analyse", CmdAnalyse,   AlwaysAvailable, "{ Analyse utils... }"},
-    {"data",    CmdData,      AlwaysAvailable, "{ Plot window / data buffer manipulation... }"},
-    {"hf",      CmdHF,        AlwaysAvailable, "{ High Frequency commands... }"},
-    {"hw",      CmdHW,        AlwaysAvailable, "{ Hardware commands... }"},
-    {"lf",      CmdLF,        AlwaysAvailable, "{ Low Frequency commands... }"},
-    {"emv",     CmdEMV,       AlwaysAvailable, "{ EMV iso14443 and iso7816... }"},
-    {"rem",     CmdRem,       AlwaysAvailable, "{ Add text to row in log file }"},
-    {"reveng",  CmdRev,       AlwaysAvailable, "{ Crc calculations from the RevEng software... }"},
-    {"script",  CmdScript,    AlwaysAvailable, "{ Scripting commands }"},
-    {"trace",   CmdTrace,     AlwaysAvailable, "{ Trace manipulation... }"},
-    {"mem",     CmdFlashMem,  IfPm3Flash,      "{ Flash Memory manipulation... }"},
-    {"sc",      CmdSmartcard, IfPm3Smartcard,  "{ Smart card ISO7816 commands... }"},
-    {"quit",    CmdQuit,      AlwaysAvailable, ""},
-    {"exit",    CmdQuit,      AlwaysAvailable, "Exit program"},
+    {"help",    CmdHelp,      AlwaysAvailable,         "This help. Use '<command> help' for details of a particular command."},
+    {"analyse", CmdAnalyse,   AlwaysAvailable,         "{ Analyse utils... }"},
+    {"data",    CmdData,      AlwaysAvailable,         "{ Plot window / data buffer manipulation... }"},
+    {"hf",      CmdHF,        AlwaysAvailable,         "{ High Frequency commands... }"},
+    {"hw",      CmdHW,        AlwaysAvailable,         "{ Hardware commands... }"},
+    {"lf",      CmdLF,        AlwaysAvailable,         "{ Low Frequency commands... }"},
+    {"emv",     CmdEMV,       AlwaysAvailable,         "{ EMV iso14443 and iso7816... }"},
+    {"rem",     CmdRem,       AlwaysAvailable,         "{ Add text to row in log file }"},
+    {"reveng",  CmdRev,       AlwaysAvailable,         "{ Crc calculations from the RevEng software... }"},
+    {"script",  CmdScript,    AlwaysAvailable,         "{ Scripting commands }"},
+    {"trace",   CmdTrace,     AlwaysAvailable,         "{ Trace manipulation... }"},
+    {"mem",     CmdFlashMem,  IfPm3Flash,              "{ Flash Memory manipulation... }"},
+    {"sc",      CmdSmartcard, IfPm3Smartcard,          "{ Smart card ISO7816 commands... }"},
+    {"usart",   CmdUsart,     IfPm3FpcUsartDevFromUsb, "{ USART commands... }"},
+    {"quit",    CmdQuit,      AlwaysAvailable,         ""},
+    {"exit",    CmdQuit,      AlwaysAvailable,         "Exit program"},
     {NULL, NULL, NULL, NULL}
 };
 
diff --git a/client/cmdmain.h b/client/cmdmain.h
index f5e9bab68..e3c513550 100644
--- a/client/cmdmain.h
+++ b/client/cmdmain.h
@@ -34,6 +34,7 @@
 #include "emv/cmdemv.h"   // EMV
 #include "cmdflashmem.h"  // rdv40 flashmem commands
 #include "cmdsmartcard.h" // rdv40 smart card ISO7816 commands
+#include "cmdusart.h"     // rdv40 FPC USART commands
 
 int CommandReceived(char *Cmd);
 command_t *getTopLevelCommandTable(void);
diff --git a/client/cmdparser.c b/client/cmdparser.c
index 8d942c168..a892bab1f 100644
--- a/client/cmdparser.c
+++ b/client/cmdparser.c
@@ -43,18 +43,27 @@ bool IfPm3Smartcard(void) {
     return pm3_capabilities.hw_available_smartcard;
 }
 
-bool IfPm3Fpc(void) {
+bool IfPm3FpcUsart(void) {
     if (!IfPm3Present())
         return false;
-    return pm3_capabilities.compiled_with_fpc;
+    return pm3_capabilities.compiled_with_fpc_usart;
 }
 
-bool IfPm3FpcHost(void) {
+bool IfPm3FpcUsartHost(void) {
     if (!IfPm3Present())
         return false;
-    if (!pm3_capabilities.compiled_with_fpc_host)
+    return pm3_capabilities.compiled_with_fpc_usart_host;
+}
+
+bool IfPm3FpcUsartDevFromUsb(void) {
+    // true if FPC USART developer support and if talking from USB-CDC interface
+    if (!IfPm3Present())
         return false;
-    return pm3_capabilities.hw_available_fpc_host;
+    if (!pm3_capabilities.compiled_with_fpc_usart_dev)
+        return false;
+    if (conn.send_via_fpc_usart)
+        PrintAndLogEx(WARNING, "This command is not available via FPC, only via " _YELLOW_("USB-CDC"));
+    return !conn.send_via_fpc_usart;
 }
 
 bool IfPm3Lf(void) {
@@ -156,7 +165,7 @@ int CmdsParse(const command_t Commands[], const char *Cmd) {
             if (Commands[i].IsAvailable()) {
                 break;
             } else {
-                PrintAndLogEx(WARNING, "This command is only available in " _YELLOW_("online") "mode");
+                PrintAndLogEx(WARNING, "This command is " _YELLOW_("not available") "in this mode");
                 return PM3_ENOTIMPL;
             }
         }
diff --git a/client/cmdparser.h b/client/cmdparser.h
index 36788d226..8f58abeb8 100644
--- a/client/cmdparser.h
+++ b/client/cmdparser.h
@@ -24,8 +24,9 @@ bool AlwaysAvailable(void);
 bool IfPm3Present(void);
 bool IfPm3Flash(void);
 bool IfPm3Smartcard(void);
-bool IfPm3Fpc(void);
-bool IfPm3FpcHost(void);
+bool IfPm3FpcUsart(void);
+bool IfPm3FpcUsartHost(void);
+bool IfPm3FpcUsartDevFromUsb(void);
 bool IfPm3Lf(void);
 bool IfPm3Hitag(void);
 bool IfPm3Hfsniff(void);
diff --git a/client/comms.c b/client/comms.c
index 8a94def2a..e717ac26d 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -138,7 +138,7 @@ static void SendCommandNG_internal(uint16_t cmd, uint8_t *data, size_t len, bool
     txBufferNG.pre.cmd = cmd;
     memcpy(&txBufferNG.data, data, len);
 
-    if ((conn.send_via_fpc && conn.send_with_crc_on_fpc) || ((!conn.send_via_fpc) && conn.send_with_crc_on_usb)) {
+    if ((conn.send_via_fpc_usart && conn.send_with_crc_on_fpc) || ((!conn.send_via_fpc_usart) && conn.send_with_crc_on_usb)) {
         uint8_t first, second;
         compute_crc(CRC_14443_A, (uint8_t *)&txBufferNG, sizeof(PacketCommandNGPreamble) + len, &first, &second);
         tx_post->crc = (first << 8) + second;
@@ -559,7 +559,7 @@ bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode,
         conn.send_with_crc_on_usb = false;
         conn.send_with_crc_on_fpc = true;
         // "Session" flag, to tell via which interface next msgs should be sent: USB or FPC USART
-        conn.send_via_fpc = false;
+        conn.send_via_fpc_usart = false;
 
         pthread_create(&USB_communication_thread, NULL, &uart_communication, &conn);
 
@@ -597,16 +597,15 @@ int TestProxmark(void) {
         SendCommandNG(CMD_CAPABILITIES, NULL, 0);
         if (WaitForResponseTimeoutW(CMD_PING, &resp, 1000, false)) {
             memcpy(&pm3_capabilities, resp.data.asBytes, resp.length);
-            conn.send_via_fpc = pm3_capabilities.via_fpc;
+            conn.send_via_fpc_usart = pm3_capabilities.via_fpc;
             conn.uart_speed = pm3_capabilities.baudrate;
-            PrintAndLogEx(INFO, "Communicating with PM3 over %s", conn.send_via_fpc ? _YELLOW_("FPC UART") : _YELLOW_("USB-CDC"));
-            if (conn.send_via_fpc) {
+            PrintAndLogEx(INFO, "Communicating with PM3 over %s", conn.send_via_fpc_usart ? _YELLOW_("FPC UART") : _YELLOW_("USB-CDC"));
+            if (conn.send_via_fpc_usart) {
                 PrintAndLogEx(INFO, "UART Serial baudrate: " _YELLOW_("%u") "\n", conn.uart_speed);
             }
            
             // reconfigure.
-            if (conn.send_via_fpc == false) {
-
+            if (conn.send_via_fpc_usart == false) {
 #if defined(_WIN32)
                 pthread_mutex_lock(&spMutex);
 #endif                
@@ -669,7 +668,7 @@ void CloseProxmark(void) {
 //           ~ = 12000000 / USART_BAUD_RATE
 // Let's take 2x (maybe we need more for BT link?)
 static size_t communication_delay(void) {
-    if (conn.send_via_fpc)  // needed also for Windows USB USART??
+    if (conn.send_via_fpc_usart)  // needed also for Windows USB USART??
         return 2 * (12000000 / conn.uart_speed);
     return 100;
 }
diff --git a/client/comms.h b/client/comms.h
index 9edf030cd..b34c03f55 100644
--- a/client/comms.h
+++ b/client/comms.h
@@ -46,7 +46,7 @@ typedef struct {
     bool send_with_crc_on_usb;
     bool send_with_crc_on_fpc;
     // "Session" flag, to tell via which interface next msgs are sent: USB or FPC USART
-    bool send_via_fpc;
+    bool send_via_fpc_usart;
     // To memorise baudrate
     uint32_t uart_speed;
 } communication_arg_t;
diff --git a/common/Makefile.hal b/common/Makefile.hal
index a40da3a9c..e42793482 100644
--- a/common/Makefile.hal
+++ b/common/Makefile.hal
@@ -1,22 +1,26 @@
 define KNOWN_PLATFORMS
 
-+--------------------------------------------------------+
-| PLATFORM      | DESCRIPTION                            |
-+--------------------------------------------------------+
-| PM3RDV4 (def) | Proxmark3 rdv4      with AT91SAM7S512  |
-+--------------------------------------------------------+
-| PM3RDV4FPC    | Proxmark3 rdv4+FPC     (experimental)  |
-+--------------------------------------------------------+
-| PM3EVO        | Proxmark3 EVO       with AT91SAM7S512  |
-+--------------------------------------------------------+
-| PM3EASY       | Proxmark3 rdv3 Easy with AT91SAM7S256  |
-+--------------------------------------------------------+
-| PM3RDV2       | Proxmark3 rdv2      with AT91SAM7S512  |
-+--------------------------------------------------------+
-| PM3OLD256     | Proxmark3 V1        with AT91SAM7S256  |
-+--------------------------------------------------------+
-| PM3OLD512     | Proxmark3 V1        with AT91SAM7S512  |
-+--------------------------------------------------------+
++==========================================================+
+| PLATFORM        | DESCRIPTION                            |
++==========================================================+
+| PM3RDV4 (def)   | Proxmark3 rdv4      with AT91SAM7S512  |
++----------------------------------------------------------+
+| PM3EVO          | Proxmark3 EVO       with AT91SAM7S512  |
++----------------------------------------------------------+
+| PM3EASY         | Proxmark3 rdv3 Easy with AT91SAM7S256  |
++----------------------------------------------------------+
+| PM3RDV2         | Proxmark3 rdv2      with AT91SAM7S512  |
++----------------------------------------------------------+
+| PM3OLD256       | Proxmark3 V1        with AT91SAM7S256  |
++----------------------------------------------------------+
+| PM3OLD512       | Proxmark3 V1        with AT91SAM7S512  |
++----------------------------------------------------------+
+
++==========================================================+
+| PLATFORM_EXTRAS | DESCRIPTION                            |
++==========================================================+
+| BTADDON         | Proxmark3 rdv4 BT add-on               |
++----------------------------------------------------------+
 
 Options to define platform:
 (1) Run make with PLATFORM specified as follows:
@@ -25,6 +29,12 @@ make PLATFORM=PM3EASY
 (2) Save a file called Makefile.platform with contents:
 PLATFORM=PM3EASY
 
+or if you have a Proxmark 3 RDV4 with the BT add-on:
+PLATFORM=PM3RDV4
+PLATFORM_EXTRAS=BTADDON
+
+!! Make sure to "make clean" when you change platform settings !!
+
 endef
 
 PLTNAME = Unknown Platform
@@ -33,10 +43,6 @@ ifeq ($(PLATFORM),PM3RDV4)
   MCU = AT91SAM7S512
   PLATFORM_DEFS = -DWITH_SMARTCARD -DWITH_FLASH
   PLTNAME = Proxmark3 rdv4
-else ifeq ($(PLATFORM),PM3RDV4FPC)
-  MCU = AT91SAM7S512
-  PLATFORM_DEFS = -DWITH_SMARTCARD -DWITH_FLASH -DWITH_FPC_HOST
-  PLTNAME = Proxmark3 rdv4
 else ifeq ($(PLATFORM),PM3EVO)
   MCU = AT91SAM7S512
   PLTNAME = Proxmark3 EVO
@@ -56,6 +62,20 @@ else
   $(error Invalid or empty PLATFORM: $(PLATFORM). Known platforms: $(KNOWN_PLATFORMS))
 endif
 
+# parsing additional PLATFORM_EXTRAS tokens
+PLATFORM_EXTRAS_TMP:=$(PLATFORM_EXTRAS)
+ifneq (,$(findstring BTADDON,$(PLATFORM_EXTRAS_TMP)))
+  PLATFORM_DEFS += -DWITH_FPC_USART_HOST
+  PLATFORM_EXTRAS_TMP := $(strip $(filter-out BTADDON,$(PLATFORM_EXTRAS_TMP)))
+endif
+ifneq (,$(findstring FPC_USART_DEV,$(PLATFORM_EXTRAS_TMP)))
+  PLATFORM_DEFS += -DWITH_FPC_USART_DEV
+  PLATFORM_EXTRAS_TMP := $(strip $(filter-out FPC_USART_DEV,$(PLATFORM_EXTRAS_TMP)))
+endif
+ifneq (,$(PLATFORM_EXTRAS_TMP))
+  $(error Unknown PLATFORM_EXTRAS token(s): $(PLATFORM_EXTRAS_TMP))
+endif
+
 # common LF support
 PLATFORM_DEFS += \
 	-DWITH_LF \
@@ -90,9 +110,9 @@ $(info $(findstring WITH_STANDALONE_*,$(PLATFORM_DEFS)))
 
 # Add flags dependencies :
 
-# WITH_FPC_* needs WITH_FPC :
-ifneq (,$(findstring WITH_FPC_,$(PLATFORM_DEFS)))
-  PLATFORM_DEFS += -DWITH_FPC
+# WITH_FPC_USART_* needs WITH_FPC_USART :
+ifneq (,$(findstring WITH_FPC_USART_,$(PLATFORM_DEFS)))
+  PLATFORM_DEFS += -DWITH_FPC_USART
 endif
 
 PLATFORM_DEFS_INFO = $(strip $(filter-out STANDALONE%, $(subst -DWITH_,,$(PLATFORM_DEFS))))
@@ -105,6 +125,7 @@ endif
 
 
 export PLATFORM
+export PLATFORM_EXTRAS
 export PLTNAME
 export MCU
 export PLATFORM_DEFS
diff --git a/common/cmd.c b/common/cmd.c
index caf85748e..c94f22689 100644
--- a/common/cmd.c
+++ b/common/cmd.c
@@ -38,7 +38,7 @@ bool reply_with_crc_on_fpc = true;
 // "Session" flag, to tell via which interface next msgs should be sent: USB or FPC USART
 bool reply_via_fpc = false;
 
-#ifdef WITH_FPC_HOST
+#ifdef WITH_FPC_USART_HOST
 extern void Dbprintf(const char *fmt, ...);
 #define Dbprintf_usb(...) {\
         bool tmp = reply_via_fpc;\
@@ -71,7 +71,7 @@ int reply_old(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *d
     // Send frame and make sure all bytes are transmitted
 
     if (reply_via_fpc) {
-#ifdef WITH_FPC_HOST
+#ifdef WITH_FPC_USART_HOST
         result = usart_writebuffer_sync((uint8_t *)&txcmd, sizeof(PacketResponseOLD));
 //        Dbprintf_usb("Sent %i bytes over usart", len);
 #else
@@ -123,7 +123,7 @@ static int reply_ng_internal(uint16_t cmd, int16_t status, uint8_t *data, size_t
     // Send frame and make sure all bytes are transmitted
 
     if (reply_via_fpc) {
-#ifdef WITH_FPC_HOST
+#ifdef WITH_FPC_USART_HOST
         result = usart_writebuffer_sync((uint8_t *)&txBufferNG, txBufferNGLen);
 //        Dbprintf_usb("Sent %i bytes over usart", len);
 #else
@@ -225,7 +225,7 @@ int receive_ng(PacketCommandNG *rx) {
     if (usb_poll_validate_length())
         return receive_ng_internal(rx, usb_read_ng, false);
 
-#ifdef WITH_FPC_HOST
+#ifdef WITH_FPC_USART_HOST
     // Check if there is a FPC packet available
     if (usart_rxdata_available() > 0)
         return receive_ng_internal(rx, usart_read_ng, true);
diff --git a/doc/new_frame_format.txt b/doc/new_frame_format.txt
index c8383a3bc..bbed9ab73 100644
--- a/doc/new_frame_format.txt
+++ b/doc/new_frame_format.txt
@@ -296,7 +296,7 @@ Empirically measured delay (FTDI cable) with "hw pingng 512" :
   9600 -> 1100..1150ms
 (client/comms.c)
 static size_t communication_delay(void) {
-    if (conn.send_via_fpc)  // needed also for Windows USB USART??
+    if (conn.send_via_fpc_usart)  // needed also for Windows USB USART??
         return 2 * (12000000 / uart_speed);
     return 100;
 }
diff --git a/include/pm3_cmd.h b/include/pm3_cmd.h
index ffbdc4734..a96ece807 100644
--- a/include/pm3_cmd.h
+++ b/include/pm3_cmd.h
@@ -144,8 +144,9 @@ typedef struct {
     // rdv4
     bool compiled_with_flash;
     bool compiled_with_smartcard;
-    bool compiled_with_fpc;
-    bool compiled_with_fpc_host;
+    bool compiled_with_fpc_usart;
+    bool compiled_with_fpc_usart_dev;
+    bool compiled_with_fpc_usart_host;
     // lf
     bool compiled_with_lf;
     bool compiled_with_hitag;
@@ -165,7 +166,7 @@ typedef struct {
     bool hw_available_flash;
     bool hw_available_smartcard;
     // rdv4 bt addon
-    bool hw_available_fpc_host;
+    bool hw_available_fpc_usart_btaddon;
 } PACKED capabilities_t;
 
 extern capabilities_t pm3_capabilities;
@@ -211,9 +212,10 @@ extern capabilities_t pm3_capabilities;
 #define CMD_SMART_SETBAUD                                                 0x0144
 #define CMD_SMART_SETCLOCK                                                0x0145
 
-// RDV40,  FPC serial
-#define CMD_FPC_SEND                                                      0x0160
-#define CMD_FPC_READ                                                      0x0161
+// RDV40,  FPC USART
+#define CMD_USART_RX                                                      0x0160
+#define CMD_USART_TX                                                      0x0161
+#define CMD_USART_TXRX                                                    0x0162
 
 // For low-frequency tags
 #define CMD_READ_TI_TYPE                                                  0x0202
@@ -459,7 +461,7 @@ extern capabilities_t pm3_capabilities;
 // File error                           client:     error related to file access on host
 #define PM3_EFILE             -13
 
-// No data                              pm3:        reserved, no host frame available (not really an error)
+// No data                              pm3:        no data available, no host frame available (not really an error)
 #define PM3_ENODATA           -98
 // Quit program                         client:     reserved, order to quit the program
 #define PM3_EFATAL            -99

From 1cff822f1e3b4b171a97f05c02692c4cd8a5dc1c Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 3 May 2019 22:37:04 +0200
Subject: [PATCH 1582/1938] remove warning

---
 client/cmdparser.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/client/cmdparser.c b/client/cmdparser.c
index a892bab1f..5a40538e7 100644
--- a/client/cmdparser.c
+++ b/client/cmdparser.c
@@ -61,8 +61,6 @@ bool IfPm3FpcUsartDevFromUsb(void) {
         return false;
     if (!pm3_capabilities.compiled_with_fpc_usart_dev)
         return false;
-    if (conn.send_via_fpc_usart)
-        PrintAndLogEx(WARNING, "This command is not available via FPC, only via " _YELLOW_("USB-CDC"));
     return !conn.send_via_fpc_usart;
 }
 

From ed1ff3db7e3c336d612bfaf3f08ccdf011bedb02 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 4 May 2019 11:33:48 +0200
Subject: [PATCH 1583/1938] forgot 2 files in the merge :( my bad

---
 client/cmdusart.c | 374 ++++++++++++++++++++++++++++++++++++++++++++++
 client/cmdusart.h |  24 +++
 2 files changed, 398 insertions(+)
 create mode 100644 client/cmdusart.c
 create mode 100644 client/cmdusart.h

diff --git a/client/cmdusart.c b/client/cmdusart.c
new file mode 100644
index 000000000..8a328e2cb
--- /dev/null
+++ b/client/cmdusart.c
@@ -0,0 +1,374 @@
+//-----------------------------------------------------------------------------
+// Copyright (C) 2016 iceman
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// Analyse bytes commands
+//-----------------------------------------------------------------------------
+#include "cmdusart.h"
+
+static int CmdHelp(const char *Cmd);
+
+static int usage_usart_tx(void) {
+    PrintAndLogEx(NORMAL, "Send string over USART");
+    PrintAndLogEx(NORMAL, "WARNING: it will have side-effects if used in USART HOST mode!");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  usart tx [h] \"string\"");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "           h          This help");
+    PrintAndLogEx(NORMAL, "           d string   string to send");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      usart tx d \"AT+VERSION\"");
+    PrintAndLogEx(NORMAL, "      usart tx d \"AT+VERSION\\r\\n\"");
+    PrintAndLogEx(NORMAL, "expected output: nothing");
+    return PM3_SUCCESS;
+}
+
+static int usage_usart_txhex(void) {
+    PrintAndLogEx(NORMAL, "Send bytes over USART");
+    PrintAndLogEx(NORMAL, "WARNING: it will have side-effects if used in USART HOST mode!");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  usart txhex [h] d <bytes>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "           h          This help");
+    PrintAndLogEx(NORMAL, "           d <bytes>  bytes to send");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      usart txhex d 504d33620a80000000010100f09f988ef09fa5b36233");
+    PrintAndLogEx(NORMAL, "expected output: nothing");
+    return PM3_SUCCESS;
+}
+
+static int usage_usart_rx(void) {
+    PrintAndLogEx(NORMAL, "Receive string over USART");
+    PrintAndLogEx(NORMAL, "WARNING: it will have side-effects if used in USART HOST mode!");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  usart rx [h]");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "           h          This help");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "expected output: Received string");
+    return PM3_SUCCESS;
+}
+
+static int usage_usart_rxhex(void) {
+    PrintAndLogEx(NORMAL, "Receive bytes over USART");
+    PrintAndLogEx(NORMAL, "WARNING: it will have side-effects if used in USART HOST mode!");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  usart rx [h]");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "           h          This help");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "expected output: Received bytes");
+    return PM3_SUCCESS;
+}
+
+static int usage_usart_txrx(void) {
+    PrintAndLogEx(NORMAL, "Send string over USART and wait for response");
+    PrintAndLogEx(NORMAL, "WARNING: if used in USART HOST mode, you can only send AT commands");
+    PrintAndLogEx(NORMAL, "to add-on when BT connection is not established (LED needs to be blinking)");
+    PrintAndLogEx(NORMAL, "Any other usage in USART HOST mode will have side-effects!");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  usart txrx [h] [t <timeout>] \"string\"");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "           h           This help");
+    PrintAndLogEx(NORMAL, "           t <timeout> timeout in ms, default is 1000ms");
+    PrintAndLogEx(NORMAL, "           d string    string to send");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "    Talking to the BT add-on (when no connection):");
+    PrintAndLogEx(NORMAL, "      usart txrx d \"AT+VERSION\"");
+    PrintAndLogEx(NORMAL, "    Talking to a target requiring longer time and end-of-line chars:");
+    PrintAndLogEx(NORMAL, "      usart txrx t 2000 d \"AT+SOMESTUFF\\r\\n\"");
+    PrintAndLogEx(NORMAL, "expected output: Received string");
+    return PM3_SUCCESS;
+}
+
+static int usart_tx(uint8_t *data, size_t len) {
+    clearCommandBuffer();
+    SendCommandNG(CMD_USART_TX, data, len);
+    PacketResponseNG resp;
+    if (!WaitForResponseTimeout(CMD_USART_TX, &resp, 1000)) {
+        return PM3_ETIMEOUT;
+    }
+    return resp.status;
+}
+
+static int usart_rx(uint8_t *data, size_t *len) {
+    clearCommandBuffer();
+    SendCommandNG(CMD_USART_RX, NULL, 0);
+    PacketResponseNG resp;
+    if (!WaitForResponseTimeout(CMD_USART_RX, &resp, 1000)) {
+        return PM3_ETIMEOUT;
+    }
+    if (resp.status == PM3_SUCCESS) {
+        *len = resp.length;
+        memcpy(data, resp.data.asBytes, resp.length);
+    }
+    return resp.status;
+}
+
+static int usart_txrx(uint8_t *srcdata, size_t srclen, uint8_t *dstdata, size_t *dstlen, uint32_t waittime) {
+    clearCommandBuffer();
+    struct {
+        uint32_t waittime;
+        uint8_t data[PM3_CMD_DATA_SIZE - sizeof(uint32_t)];
+    } PACKED payload;
+    payload.waittime = waittime;
+    if (srclen >= sizeof(payload.data))
+        return PM3_EOVFLOW;
+    memcpy(payload.data, srcdata, srclen);
+    SendCommandNG(CMD_USART_TXRX, (uint8_t *)&payload, srclen + sizeof(payload.waittime));
+    PacketResponseNG resp;
+    if (!WaitForResponseTimeout(CMD_USART_TXRX, &resp, 1000)) {
+        return PM3_ETIMEOUT;
+    }
+    if (resp.status == PM3_SUCCESS) {
+        *dstlen = resp.length;
+        memcpy(dstdata, resp.data.asBytes, resp.length);
+    }
+    return resp.status;
+}
+
+static int CmdUsartTX(const char *Cmd) {
+    uint8_t cmdp = 0;
+    bool errors = false;
+    char string[PM3_CMD_DATA_SIZE] = {0};
+
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+            case 'h':
+                return usage_usart_tx();
+            case 'd':
+                if (param_getstr(Cmd, cmdp + 1, string, sizeof(string)) >= sizeof(string)) {
+                    PrintAndLogEx(FAILED, "String too long");
+                    errors = true;
+                    break;
+                }
+                cmdp += 2;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                errors = true;
+                break;
+        }
+    }
+    //Validations
+    if (errors || cmdp == 0) {
+        usage_usart_tx();
+        return PM3_EINVARG;
+    }
+    char string2[PM3_CMD_DATA_SIZE] = {0};
+    size_t i2 = 0;
+    size_t n = strlen(string);
+    for (size_t i = 0; i < n; i++) {
+        if ((string[i] == '\\') && (i < n - 1) && (string[i + 1] == '\\')) {
+            i++;
+            string2[i2++] = '\\';
+            continue;
+        }
+        if ((string[i] == '\\') && (i < n - 1) && (string[i + 1] == '"')) {
+            i++;
+            string2[i2++] = '"';
+            continue;
+        }
+        if (string[i] == '"') {
+            continue;
+        }
+        if ((string[i] == '\\') && (i < n - 1) && (string[i + 1] == 'r')) {
+            i++;
+            string2[i2++] = '\r';
+            continue;
+        }
+        if ((string[i] == '\\') && (i < n - 1) && (string[i + 1] == 'n')) {
+            i++;
+            string2[i2++] = '\n';
+            continue;
+        }
+        string2[i2++] = string[i];
+    }
+    return usart_tx((uint8_t *)string2, strlen(string2));
+}
+
+static int CmdUsartRX(const char *Cmd) {
+    uint8_t cmdp = 0;
+    bool errors = false;
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+            case 'h':
+                return usage_usart_rx();
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                errors = true;
+                break;
+        }
+    }
+    //Validations
+    if (errors) {
+        usage_usart_rx();
+        return PM3_EINVARG;
+    }
+    uint8_t data[PM3_CMD_DATA_SIZE] = {0x00};
+    size_t len = 0;
+    int ret = usart_rx(data, &len);
+    if (ret != PM3_SUCCESS)
+        return ret;
+    PrintAndLogEx(NORMAL, "RX:%.*s", len, data);
+    return PM3_SUCCESS;
+}
+
+static int CmdUsartTXRX(const char *Cmd) {
+    uint8_t cmdp = 0;
+    bool errors = false;
+    char string[PM3_CMD_DATA_SIZE] = {0};
+    uint32_t waittime = 1000;
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+            case 'h':
+                return usage_usart_txrx();
+            case 'd':
+                if (param_getstr(Cmd, cmdp + 1, string, sizeof(string)) >= sizeof(string)) {
+                    PrintAndLogEx(FAILED, "String too long");
+                    errors = true;
+                    break;
+                }
+                cmdp += 2;
+                break;
+            case 't':
+                waittime = param_get32ex(Cmd, cmdp + 1, 1000, 10);
+                cmdp += 2;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                errors = true;
+                break;
+        }
+    }
+    //Validations
+    if (errors || cmdp == 0) {
+        usage_usart_txrx();
+        return PM3_EINVARG;
+    }
+    char string2[PM3_CMD_DATA_SIZE] = {0};
+    size_t i2 = 0;
+    size_t n = strlen(string);
+    for (size_t i = 0; i < n; i++) {
+        if ((string[i] == '\\') && (i < n - 1) && (string[i + 1] == '\\')) {
+            i++;
+            string2[i2++] = '\\';
+            continue;
+        }
+        if ((string[i] == '\\') && (i < n - 1) && (string[i + 1] == '"')) {
+            i++;
+            string2[i2++] = '"';
+            continue;
+        }
+        if (string[i] == '"') {
+            continue;
+        }
+        if ((string[i] == '\\') && (i < n - 1) && (string[i + 1] == 'r')) {
+            i++;
+            string2[i2++] = '\r';
+            continue;
+        }
+        if ((string[i] == '\\') && (i < n - 1) && (string[i + 1] == 'n')) {
+            i++;
+            string2[i2++] = '\n';
+            continue;
+        }
+        string2[i2++] = string[i];
+    }
+    uint8_t data[PM3_CMD_DATA_SIZE] = {0x00};
+    size_t len = 0;
+    PrintAndLogEx(NORMAL, "TX (%3u):%.*s", strlen(string2), strlen(string2), string2);
+    int ret = usart_txrx((uint8_t *)string2, strlen(string2), data, &len, waittime);
+    if (ret != PM3_SUCCESS)
+        return ret;
+    PrintAndLogEx(NORMAL, "RX (%3u):%.*s", len, len, data);
+    return PM3_SUCCESS;
+}
+
+static int CmdUsartTXhex(const char *Cmd) {
+    int hexlen, len = 0;
+    uint8_t cmdp = 0;
+    bool errors = false;
+    uint8_t data[PM3_CMD_DATA_SIZE] = {0x00};
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+            case 'h':
+                return usage_usart_txhex();
+            case 'd':
+                if (param_gethex_ex(Cmd, cmdp + 1, data, &hexlen)) {
+                    PrintAndLogEx(ERR, "Error parsing bytes");
+                    return PM3_EINVARG;
+                }
+                len = hexlen >> 1;
+                cmdp += 2;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                errors = true;
+                break;
+        }
+    }
+    //Validations
+    if (errors || cmdp == 0) {
+        usage_usart_txhex();
+        return PM3_EINVARG;
+    }
+    return usart_tx(data, len);
+}
+
+static int CmdUsartRXhex(const char *Cmd) {
+    uint8_t cmdp = 0;
+    bool errors = false;
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+            case 'h':
+                return usage_usart_rxhex();
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                errors = true;
+                break;
+        }
+    }
+    //Validations
+    if (errors) {
+        usage_usart_rxhex();
+        return PM3_EINVARG;
+    }
+
+    uint8_t data[PM3_CMD_DATA_SIZE] = {0x00};
+    size_t len = 0;
+    int ret = usart_rx(data, &len);
+    if (ret != PM3_SUCCESS)
+        return ret;
+
+    print_hex_break(data, len, 32);
+    return PM3_SUCCESS;
+}
+
+static command_t CommandTable[] = {
+    {"help",         CmdHelp,            AlwaysAvailable,         "This help"},
+    {"tx",           CmdUsartTX,         IfPm3FpcUsartDevFromUsb, "Send string over USART"},
+    {"rx",           CmdUsartRX,         IfPm3FpcUsartDevFromUsb, "Receive string over USART"},
+    {"txrx",         CmdUsartTXRX,       IfPm3FpcUsartDevFromUsb, "Send string over USART and wait for response"},
+    {"txhex",        CmdUsartTXhex,      IfPm3FpcUsartDevFromUsb, "Send bytes over USART"},
+    {"rxhex",        CmdUsartRXhex,      IfPm3FpcUsartDevFromUsb, "Receive bytes over USART"},
+//    {"bridge",       CmdUsartBridge,     IfPm3FpcUsartDevFromUsb, "Bridge USB-CDC & USART"},
+    {NULL, NULL, NULL, NULL}
+};
+
+static int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
+    CmdsHelp(CommandTable);
+    return 0;
+}
+
+int CmdUsart(const char *Cmd) {
+    clearCommandBuffer();
+    return CmdsParse(CommandTable, Cmd);
+}
diff --git a/client/cmdusart.h b/client/cmdusart.h
new file mode 100644
index 000000000..f2e4d02dd
--- /dev/null
+++ b/client/cmdusart.h
@@ -0,0 +1,24 @@
+//-----------------------------------------------------------------------------
+// Copyright (C) 2016 iceman <iceman at ...>
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// Data and Graph commands
+//-----------------------------------------------------------------------------
+
+#ifndef CMDUSART_H__
+#define CMDUSART_H__
+
+#include <stdlib.h>       // size_t
+#include <string.h>
+#include <unistd.h>
+#include "cmdmain.h"
+#include "proxmark3.h"
+#include "ui.h"           // PrintAndLog
+#include "util.h"
+//#include "util_posix.h"   // msclock
+
+int CmdUsart(const char *Cmd);
+#endif

From 2497ec2eec650230f4042cda1d23613132f09337 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 4 May 2019 11:36:35 +0200
Subject: [PATCH 1584/1938] More USB_CMD -> PM3_CMD

---
 armsrc/Standalone/hf_colin.c |  2 +-
 doc/new_frame_format.txt     | 24 ++++++++++++------------
 include/pm3_cmd.h            |  4 ++--
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/armsrc/Standalone/hf_colin.c b/armsrc/Standalone/hf_colin.c
index 098cfa1b6..dd6de79e3 100644
--- a/armsrc/Standalone/hf_colin.c
+++ b/armsrc/Standalone/hf_colin.c
@@ -28,7 +28,7 @@ int curlline;
 /*
 void cjPrintBigArray(const char *bigar, int len, uint8_t newlines, uint8_t debug)
 {
-    uint32_t chunksize = (USB_CMD_DATA_SIZE / 4);
+    uint32_t chunksize = (PM3_CMD_DATA_SIZE / 4);
     uint8_t totalchunks = len / chunksize;
     uint8_t last_chunksize = len - (totalchunks * chunksize);
     char chunk[chunksize + 1];
diff --git a/doc/new_frame_format.txt b/doc/new_frame_format.txt
index bbed9ab73..1d4d4abed 100644
--- a/doc/new_frame_format.txt
+++ b/doc/new_frame_format.txt
@@ -10,11 +10,11 @@ Previously, frames were, in both directions like this:
     uint64_t cmd;
     uint64_t arg[3];
     union {
-        uint8_t  asBytes[USB_CMD_DATA_SIZE];
-        uint32_t asDwords[USB_CMD_DATA_SIZE / 4];
+        uint8_t  asBytes[PM3_CMD_DATA_SIZE];
+        uint32_t asDwords[PM3_CMD_DATA_SIZE / 4];
     } d;
 
-with USB_CMD_DATA_SIZE = 512 and there was no API abstraction, everybody was forging/parsing these frames.
+with PM3_CMD_DATA_SIZE = 512 and there was no API abstraction, everybody was forging/parsing these frames.
 So the frame size was fixed, 544 bytes, even for simple ACKs.
 When snooping the USB transfers, we can observe the host is sending 544b Bulk USB frames while the Proxmark3 is limited by its internal buffers and is sending 128b, 128b, 128b, 128b, 32b, so in total 5 packets.
 
@@ -34,7 +34,7 @@ For commands being sent to the Proxmark:
     uint16_t crc;
 
 * magic:  arbitrary magic ("PM3a") to help re-sync if needed
-* length: length of the variable payload, 0 if none, max 512 (USB_CMD_DATA_SIZE) for now.
+* length: length of the variable payload, 0 if none, max 512 (PM3_CMD_DATA_SIZE) for now.
 * ng:     flag to tell if the data is following the new format (ng) or the old one, see transition notes below
 * cmd:    as previously, on 16b as it's enough
 * data:   variable length payload
@@ -51,7 +51,7 @@ For responses from the Proxmark:
     uint16_t crc;
 
 * magic:  arbitrary magic ("PM3a") to help re-sync if needed
-* length: length of the variable payload, 0 if none, max 512 (USB_CMD_DATA_SIZE) for now.
+* length: length of the variable payload, 0 if none, max 512 (PM3_CMD_DATA_SIZE) for now.
 * ng:     flag to tell if the data is following the new format (ng) or the old one, see transition notes below
 * status: a field to send back the status of the command execution
 * cmd:    as previously, on 16b as it's enough
@@ -92,8 +92,8 @@ typedef struct {
     uint16_t crc;        //  NG
     uint64_t oldarg[3];  //  OLD
     union {
-        uint8_t  asBytes[USB_CMD_DATA_SIZE];
-        uint32_t asDwords[USB_CMD_DATA_SIZE / 4];
+        uint8_t  asBytes[PM3_CMD_DATA_SIZE];
+        uint32_t asDwords[PM3_CMD_DATA_SIZE / 4];
     } data;
     bool ng;             // does it store NG data or OLD data?
 } PACKED PacketCommandNG;
@@ -106,8 +106,8 @@ typedef struct {
     uint16_t crc;        //  NG
     uint64_t oldarg[3];  //  OLD
     union {
-        uint8_t  asBytes[USB_CMD_DATA_SIZE];
-        uint32_t asDwords[USB_CMD_DATA_SIZE / 4];
+        uint8_t  asBytes[PM3_CMD_DATA_SIZE];
+        uint32_t asDwords[PM3_CMD_DATA_SIZE / 4];
     } data;
     bool ng;             // does it store NG data or OLD data?
 } PACKED PacketResponseNG;
@@ -123,10 +123,10 @@ void SendCommandMIX(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, v
 *****************************************
 
 So cmds should make the transition from SendCommandOLD to SendCommandNG to benefit from smaller frames (and armsrc handlers adjusted accordingly of course).
-SendCommandMIX is a transition fct: it uses the same API as SendCommandOLD but benefits somehow from variable length frames. It occupies at least 24b of data for the oldargs and real data is therefore limited to USB_CMD_DATA_SIZE - 24 (defined as USB_CMD_DATA_SIZE_MIX). Besides the size limitation, the receiver handler doesn't know if this was an OLD frame or a MIX frame, it gets its oldargs and data as usual.
+SendCommandMIX is a transition fct: it uses the same API as SendCommandOLD but benefits somehow from variable length frames. It occupies at least 24b of data for the oldargs and real data is therefore limited to PM3_CMD_DATA_SIZE - 24 (defined as PM3_CMD_DATA_SIZE_MIX). Besides the size limitation, the receiver handler doesn't know if this was an OLD frame or a MIX frame, it gets its oldargs and data as usual.
 Warning : it makes sense to move from SendCommandOLD to SendCommandMIX only for *commands with small payloads*.
 * otherwise both have about the same size
-* SendCommandMIX has a smaller payload (USB_CMD_DATA_SIZE_MIX < USB_CMD_DATA_SIZE) so it's risky to blindly move from OLD to MIX if there is a large payload.
+* SendCommandMIX has a smaller payload (PM3_CMD_DATA_SIZE_MIX < PM3_CMD_DATA_SIZE) so it's risky to blindly move from OLD to MIX if there is a large payload.
 
 Internally these functions prepare the new or old frames and call uart_communication which calls uart_send.
 
@@ -151,7 +151,7 @@ int16_t reply_mix(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, voi
 *****************************************
 
 So replies should make the transition from reply_old to reply_ng to benefit from smaller frames (and client reception adjusted accordingly of course).
-reply_mix is a transition fct: it uses the same API as reply_old but benefits somehow from variable length frames. It occupies at least 24b of data for the oldargs and real data is therefore limited to USB_CMD_DATA_SIZE - 24. Besides the size limitation, the client command doesn't know if this was an OLD frame or a MIX frame, it gets its oldargs and data as usual.
+reply_mix is a transition fct: it uses the same API as reply_old but benefits somehow from variable length frames. It occupies at least 24b of data for the oldargs and real data is therefore limited to PM3_CMD_DATA_SIZE - 24. Besides the size limitation, the client command doesn't know if this was an OLD frame or a MIX frame, it gets its oldargs and data as usual.
 
 Example with CMD_PING that supports both styles (from client CmdPing or CmdPingNG) and replies with the new frame format when it receives new command format:
     if (packet->ng) {
diff --git a/include/pm3_cmd.h b/include/pm3_cmd.h
index a96ece807..387b7bb9f 100644
--- a/include/pm3_cmd.h
+++ b/include/pm3_cmd.h
@@ -10,8 +10,8 @@
 // own protocol.
 //-----------------------------------------------------------------------------
 
-#ifndef __USB_CMD_H
-#define __USB_CMD_H
+#ifndef __PM3_CMD_H
+#define __PM3_CMD_H
 
 // Use it e.g. when using slow links such as BT
 #define USART_SLOW_LINK

From 6b5a0f8319bd6e0367fb2b8db2fa6da0cbfe4ef6 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 4 May 2019 23:56:59 +0200
Subject: [PATCH 1585/1938] Rename and unguard
 CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K ans it's used more generally than LF

---
 armsrc/appmain.c  | 8 ++++----
 client/comms.c    | 6 +++---
 include/pm3_cmd.h | 4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index cebfd71e2..cfdfb2ea0 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -386,7 +386,7 @@ void printUSBSpeed(void) {
     LED_B_ON();
 
     while (end_time < start_time + USB_SPEED_TEST_MIN_TIME) {
-        reply_ng(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K, PM3_SUCCESS, test_data, PM3_CMD_DATA_SIZE);
+        reply_ng(CMD_DOWNLOADED_BIGBUF, PM3_SUCCESS, test_data, PM3_CMD_DATA_SIZE);
         end_time = GetTickCount();
         bytes_transferred += PM3_CMD_DATA_SIZE;
     }
@@ -1246,8 +1246,7 @@ static void PacketReceived(PacketCommandNG *packet) {
             SpinDelay(200);
             LED_D_OFF(); // LED D indicates field ON or OFF
             break;
-#ifdef WITH_LF
-        case CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K: {
+        case CMD_DOWNLOAD_BIGBUF: {
             LED_B_ON();
             uint8_t *mem = BigBuf_get_addr();
             uint32_t startidx = packet->oldarg[0];
@@ -1259,7 +1258,7 @@ static void PacketReceived(PacketCommandNG *packet) {
 
             for (size_t i = 0; i < numofbytes; i += PM3_CMD_DATA_SIZE) {
                 size_t len = MIN((numofbytes - i), PM3_CMD_DATA_SIZE);
-                int result = reply_old(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K, i, len, BigBuf_get_traceLen(), mem + startidx + i, len);
+                int result = reply_old(CMD_DOWNLOADED_BIGBUF, i, len, BigBuf_get_traceLen(), mem + startidx + i, len);
                 if (result != PM3_SUCCESS)
                     Dbprintf("transfer to client failed ::  | bytes between %d - %d (%d) | result: %d", i, i + len, len, result);
             }
@@ -1273,6 +1272,7 @@ static void PacketReceived(PacketCommandNG *packet) {
             LED_B_OFF();
             break;
         }
+#ifdef WITH_LF
         case CMD_UPLOAD_SIM_SAMPLES_125K: {
             // iceman; since changing fpga_bitstreams clears bigbuff, Its better to call it before.
             // to be able to use this one for uploading data to device
diff --git a/client/comms.c b/client/comms.c
index e717ac26d..0acec93d4 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -295,7 +295,7 @@ static void PacketResponseReceived(PacketResponseNG *packet) {
             break;
         }
         // iceman:  hw status - down the path on device, runs printusbspeed which starts sending a lot of
-        // CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K packages which is not dealt with. I wonder if simply ignoring them will
+        // CMD_DOWNLOAD_BIGBUF packages which is not dealt with. I wonder if simply ignoring them will
         // work. lets try it.
         default: {
             storeReply(packet);
@@ -755,8 +755,8 @@ bool GetFromDevice(DeviceMemType_t memtype, uint8_t *dest, uint32_t bytes, uint3
 
     switch (memtype) {
         case BIG_BUF: {
-            SendCommandOLD(CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K, start_index, bytes, 0, NULL, 0);
-            return dl_it(dest, bytes, start_index, response, ms_timeout, show_warning, CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K);
+            SendCommandOLD(CMD_DOWNLOAD_BIGBUF, start_index, bytes, 0, NULL, 0);
+            return dl_it(dest, bytes, start_index, response, ms_timeout, show_warning, CMD_DOWNLOADED_BIGBUF);
         }
         case BIG_BUF_EML: {
             SendCommandOLD(CMD_DOWNLOAD_EML_BIGBUF, start_index, bytes, 0, NULL, 0);
diff --git a/include/pm3_cmd.h b/include/pm3_cmd.h
index 387b7bb9f..9f245d0e7 100644
--- a/include/pm3_cmd.h
+++ b/include/pm3_cmd.h
@@ -223,8 +223,8 @@ extern capabilities_t pm3_capabilities;
 #define CMD_DOWNLOADED_RAW_BITS_TI_TYPE                                   0x0204
 #define CMD_ACQUIRE_RAW_ADC_SAMPLES_125K                                  0x0205
 #define CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K                         0x0206
-#define CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K                                 0x0207
-#define CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K                               0x0208
+#define CMD_DOWNLOAD_BIGBUF                                               0x0207
+#define CMD_DOWNLOADED_BIGBUF                                             0x0208
 #define CMD_UPLOAD_SIM_SAMPLES_125K                                       0x0209
 #define CMD_SIMULATE_TAG_125K                                             0x020A
 #define CMD_HID_DEMOD_FSK                                                 0x020B

From 43833cc9ac2b92b47c819d3c0ec3c5a1453b4db8 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 5 May 2019 00:02:33 +0200
Subject: [PATCH 1586/1938] faster connection speed test and rename USB->Conn

---
 armsrc/appmain.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index cfdfb2ea0..989783dd1 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -370,13 +370,13 @@ void SendVersion(void) {
     reply_old(CMD_ACK, *(AT91C_DBGU_CIDR), text_and_rodata_section_size + compressed_data_section_size, 0, VersionString, strlen(VersionString));
 }
 
-// measure the USB Speed by sending SpeedTestBufferSize bytes to client and measuring the elapsed time.
+// measure the Connection Speed by sending SpeedTestBufferSize bytes to client and measuring the elapsed time.
 // Note: this mimics GetFromBigbuf(), i.e. we have the overhead of the PacketCommandNG structure included.
-void printUSBSpeed(void) {
+void printConnSpeed(void) {
     DbpString(_BLUE_("Transfer Speed"));
     Dbprintf("  Sending packets to client...");
 
-#define USB_SPEED_TEST_MIN_TIME 1500 // in milliseconds
+#define CONN_SPEED_TEST_MIN_TIME 500 // in milliseconds
     uint8_t *test_data = BigBuf_get_addr();
     uint32_t end_time;
 
@@ -385,7 +385,7 @@ void printUSBSpeed(void) {
 
     LED_B_ON();
 
-    while (end_time < start_time + USB_SPEED_TEST_MIN_TIME) {
+    while (end_time < start_time + CONN_SPEED_TEST_MIN_TIME) {
         reply_ng(CMD_DOWNLOADED_BIGBUF, PM3_SUCCESS, test_data, PM3_CMD_DATA_SIZE);
         end_time = GetTickCount();
         bytes_transferred += PM3_CMD_DATA_SIZE;
@@ -413,7 +413,7 @@ void SendStatus(void) {
     printConfig();      // LF Sampling config
     printT55xxConfig(); // LF T55XX Config
 #endif
-    printUSBSpeed();
+    printConnSpeed();
     DbpString(_BLUE_("Various"));
     Dbprintf("  MF_DBGLEVEL.............%d", MF_DBGLEVEL);
     Dbprintf("  ToSendMax...............%d", ToSendMax);

From 4bb6b46713bf80be906abd26cd4446e7699df97e Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 5 May 2019 00:18:18 +0200
Subject: [PATCH 1587/1938] reorganize doc

---
 README.md                                     |  25 +-
 .../Arch-Linux-Installation-Instructions.md   |   0
 .../Coverity-Scan-Config-&-Run.md             |   0
 .../Kali-Installation-Instructions.md         |   0
 ...OS-X-Homebrew-Installation-Instructions.md |   0
 .../Parrot-OS-Proxmark3-RDV4-installation.md  |   0
 .../Ubuntu-Installation-Instructions.md       |   0
 .../Windows-Installation-Instructions.md      |   0
 .../md/Use_of_Proxmark}/1_Validation.md       |   0
 .../2_Configuration-and-Verification.md       |   0
 .../3_Commands-and-Features.md                |   0
 ...xmark source and firmware upgrading v1.pdf | Bin
 .../Proxmark III - Ubuntu GSG v1.pdf          | Bin
 .../Proxmark III - Windows 7 GSG v1.pdf       | Bin
 .../Proxmark III - Windows XP SP3 GSG v1.pdf  | Bin
 .../RFID_Antenna-Basic-Form.stl               | Bin
 .../RFID_Antenna-With-Lanyard-Hook.stl        | Bin
 doc/{ => original_proxmark3}/proxmark3.brd    | Bin
 doc/{ => original_proxmark3}/proxmark3.pdf    | Bin
 doc/{ => original_proxmark3}/proxmark3.sch    | Bin
 doc/{ => original_proxmark3}/proxmark3.xls    | Bin
 .../proxmark3_schema.pdf                      | Bin
 doc/{ => original_proxmark3}/system.txt       | 552 +++++++++---------
 23 files changed, 291 insertions(+), 286 deletions(-)
 rename {Installation_Instructions => doc/md/Installation_Instructions}/Arch-Linux-Installation-Instructions.md (100%)
 rename {Installation_Instructions => doc/md/Installation_Instructions}/Coverity-Scan-Config-&-Run.md (100%)
 rename {Installation_Instructions => doc/md/Installation_Instructions}/Kali-Installation-Instructions.md (100%)
 rename {Installation_Instructions => doc/md/Installation_Instructions}/Mac-OS-X-Homebrew-Installation-Instructions.md (100%)
 rename {Installation_Instructions => doc/md/Installation_Instructions}/Parrot-OS-Proxmark3-RDV4-installation.md (100%)
 rename {Installation_Instructions => doc/md/Installation_Instructions}/Ubuntu-Installation-Instructions.md (100%)
 rename {Installation_Instructions => doc/md/Installation_Instructions}/Windows-Installation-Instructions.md (100%)
 rename {Use_of_Proxmark => doc/md/Use_of_Proxmark}/1_Validation.md (100%)
 rename {Use_of_Proxmark => doc/md/Use_of_Proxmark}/2_Configuration-and-Verification.md (100%)
 rename {Use_of_Proxmark => doc/md/Use_of_Proxmark}/3_Commands-and-Features.md (100%)
 rename doc/{ => original_proxmark3}/Compiling Proxmark source and firmware upgrading v1.pdf (100%)
 rename doc/{ => original_proxmark3}/Proxmark III - Ubuntu GSG v1.pdf (100%)
 rename doc/{ => original_proxmark3}/Proxmark III - Windows 7 GSG v1.pdf (100%)
 rename doc/{ => original_proxmark3}/Proxmark III - Windows XP SP3 GSG v1.pdf (100%)
 rename doc/{ => original_proxmark3}/RFID_Antenna-Basic-Form.stl (100%)
 rename doc/{ => original_proxmark3}/RFID_Antenna-With-Lanyard-Hook.stl (100%)
 rename doc/{ => original_proxmark3}/proxmark3.brd (100%)
 rename doc/{ => original_proxmark3}/proxmark3.pdf (100%)
 rename doc/{ => original_proxmark3}/proxmark3.sch (100%)
 rename doc/{ => original_proxmark3}/proxmark3.xls (100%)
 rename doc/{ => original_proxmark3}/proxmark3_schema.pdf (100%)
 rename doc/{ => original_proxmark3}/system.txt (98%)

diff --git a/README.md b/README.md
index 972dfa9f9..27e64810a 100644
--- a/README.md
+++ b/README.md
@@ -16,19 +16,24 @@ alt="Yuotube" width="100%" height="auto" border="10" /></a>
 
 | FAQ's & Updates     | Installation        | Use of the Proxmark |
 | ------------- |:-------------:| -----:|
-|[Whats changed?](#whats-changed)  | [Setup and build for ArchLinux](/Installation_Instructions/Arch-Linux-Installation-Instructions.md) | [Validating proxmark client functionality](/Use_of_Proxmark/1_Validation.md)|
-|[Development](#development) | [Setup and build for UBUNTU](/Installation_Instructions/Ubuntu-Installation-Instructions.md)  | [First Use and Verification](/Use_of_Proxmark/2_Configuration-and-Verification.md) |
-| [Why don't you add this or that functionality?](#why-dont-you-add-this-or-that-functionality)  | [Homebrew (Mac OS X) & Upgrading HomeBrew Tap Forumula](/Installation_Instructions/Mac-OS-X-Homebrew-Installation-Instructions.md) | [Commands & Features](/Use_of_Proxmark/3_Commands-and-Features.md)|
-|[Why didn't you based it on offical PM3 Master?](#why-didnt-you-based-it-on-offical-pm3-master) |[ParrotOS Installation ](/Installation_Instructions/Parrot-OS-Proxmark3-RDV4-installation.md)|[PM3 GUI](#pm3-gui)
-|[Notices](#notices)|[Setup and build for Windows](/Installation_Instructions/Windows-Installation-Instructions.md)||
-|[Issues](#issues)|[Coverity Scan Config & Run](/Installation_Instructions/Coverity-Scan-Config-%26-Run.md)||
-||[Kali Linux Installation Instructions](/Installation_Instructions/Kali-Installation-Instructions.md)|
+|[Whats changed?](#whats-changed)  | [Setup and build for ArchLinux](/doc/md/Installation_Instructions/Arch-Linux-Installation-Instructions.md) | [Validating proxmark client functionality](/doc/md/Use_of_Proxmark/1_Validation.md)|
+|[Development](#development) | [Setup and build for UBUNTU](/doc/md/Installation_Instructions/Ubuntu-Installation-Instructions.md)  | [First Use and Verification](/doc/md/Use_of_Proxmark/2_Configuration-and-Verification.md) |
+| [Why don't you add this or that functionality?](#why-dont-you-add-this-or-that-functionality)  | [Homebrew (Mac OS X) & Upgrading HomeBrew Tap Forumula](/doc/md/Installation_Instructions/Mac-OS-X-Homebrew-Installation-Instructions.md) | [Commands & Features](/doc/md/Use_of_Proxmark/3_Commands-and-Features.md)|
+|[Why didn't you based it on offical PM3 Master?](#why-didnt-you-based-it-on-offical-pm3-master) |[ParrotOS Installation ](/doc/md/Installation_Instructions/Parrot-OS-Proxmark3-RDV4-installation.md)|[PM3 GUI](#pm3-gui)
+|[Notices](#notices)|[Setup and build for Windows](/doc/md/Installation_Instructions/Windows-Installation-Instructions.md)||
+|[Issues](#issues)|[Coverity Scan Config & Run](/doc/md/Installation_Instructions/Coverity-Scan-Config-%26-Run.md)||
+||[Kali Linux Installation Instructions](/doc/md/Installation_Instructions/Kali-Installation-Instructions.md)|
 
 ---
 ## Whats changed?
-	* added flash memory 256kb.
-	* added smart card module
-	* added FPC connector
+
+On the hardware side:
+
+  * added flash memory 256kb.
+  * added smart card module
+  * added FPC connector
+
+On the software side: quite a lot, see the [Changelog file](CHANGELOG.md).
 
 ## Development
 This fork now compiles just fine on 
diff --git a/Installation_Instructions/Arch-Linux-Installation-Instructions.md b/doc/md/Installation_Instructions/Arch-Linux-Installation-Instructions.md
similarity index 100%
rename from Installation_Instructions/Arch-Linux-Installation-Instructions.md
rename to doc/md/Installation_Instructions/Arch-Linux-Installation-Instructions.md
diff --git a/Installation_Instructions/Coverity-Scan-Config-&-Run.md b/doc/md/Installation_Instructions/Coverity-Scan-Config-&-Run.md
similarity index 100%
rename from Installation_Instructions/Coverity-Scan-Config-&-Run.md
rename to doc/md/Installation_Instructions/Coverity-Scan-Config-&-Run.md
diff --git a/Installation_Instructions/Kali-Installation-Instructions.md b/doc/md/Installation_Instructions/Kali-Installation-Instructions.md
similarity index 100%
rename from Installation_Instructions/Kali-Installation-Instructions.md
rename to doc/md/Installation_Instructions/Kali-Installation-Instructions.md
diff --git a/Installation_Instructions/Mac-OS-X-Homebrew-Installation-Instructions.md b/doc/md/Installation_Instructions/Mac-OS-X-Homebrew-Installation-Instructions.md
similarity index 100%
rename from Installation_Instructions/Mac-OS-X-Homebrew-Installation-Instructions.md
rename to doc/md/Installation_Instructions/Mac-OS-X-Homebrew-Installation-Instructions.md
diff --git a/Installation_Instructions/Parrot-OS-Proxmark3-RDV4-installation.md b/doc/md/Installation_Instructions/Parrot-OS-Proxmark3-RDV4-installation.md
similarity index 100%
rename from Installation_Instructions/Parrot-OS-Proxmark3-RDV4-installation.md
rename to doc/md/Installation_Instructions/Parrot-OS-Proxmark3-RDV4-installation.md
diff --git a/Installation_Instructions/Ubuntu-Installation-Instructions.md b/doc/md/Installation_Instructions/Ubuntu-Installation-Instructions.md
similarity index 100%
rename from Installation_Instructions/Ubuntu-Installation-Instructions.md
rename to doc/md/Installation_Instructions/Ubuntu-Installation-Instructions.md
diff --git a/Installation_Instructions/Windows-Installation-Instructions.md b/doc/md/Installation_Instructions/Windows-Installation-Instructions.md
similarity index 100%
rename from Installation_Instructions/Windows-Installation-Instructions.md
rename to doc/md/Installation_Instructions/Windows-Installation-Instructions.md
diff --git a/Use_of_Proxmark/1_Validation.md b/doc/md/Use_of_Proxmark/1_Validation.md
similarity index 100%
rename from Use_of_Proxmark/1_Validation.md
rename to doc/md/Use_of_Proxmark/1_Validation.md
diff --git a/Use_of_Proxmark/2_Configuration-and-Verification.md b/doc/md/Use_of_Proxmark/2_Configuration-and-Verification.md
similarity index 100%
rename from Use_of_Proxmark/2_Configuration-and-Verification.md
rename to doc/md/Use_of_Proxmark/2_Configuration-and-Verification.md
diff --git a/Use_of_Proxmark/3_Commands-and-Features.md b/doc/md/Use_of_Proxmark/3_Commands-and-Features.md
similarity index 100%
rename from Use_of_Proxmark/3_Commands-and-Features.md
rename to doc/md/Use_of_Proxmark/3_Commands-and-Features.md
diff --git a/doc/Compiling Proxmark source and firmware upgrading v1.pdf b/doc/original_proxmark3/Compiling Proxmark source and firmware upgrading v1.pdf
similarity index 100%
rename from doc/Compiling Proxmark source and firmware upgrading v1.pdf
rename to doc/original_proxmark3/Compiling Proxmark source and firmware upgrading v1.pdf
diff --git a/doc/Proxmark III - Ubuntu GSG v1.pdf b/doc/original_proxmark3/Proxmark III - Ubuntu GSG v1.pdf
similarity index 100%
rename from doc/Proxmark III - Ubuntu GSG v1.pdf
rename to doc/original_proxmark3/Proxmark III - Ubuntu GSG v1.pdf
diff --git a/doc/Proxmark III - Windows 7 GSG v1.pdf b/doc/original_proxmark3/Proxmark III - Windows 7 GSG v1.pdf
similarity index 100%
rename from doc/Proxmark III - Windows 7 GSG v1.pdf
rename to doc/original_proxmark3/Proxmark III - Windows 7 GSG v1.pdf
diff --git a/doc/Proxmark III - Windows XP SP3 GSG v1.pdf b/doc/original_proxmark3/Proxmark III - Windows XP SP3 GSG v1.pdf
similarity index 100%
rename from doc/Proxmark III - Windows XP SP3 GSG v1.pdf
rename to doc/original_proxmark3/Proxmark III - Windows XP SP3 GSG v1.pdf
diff --git a/doc/RFID_Antenna-Basic-Form.stl b/doc/original_proxmark3/RFID_Antenna-Basic-Form.stl
similarity index 100%
rename from doc/RFID_Antenna-Basic-Form.stl
rename to doc/original_proxmark3/RFID_Antenna-Basic-Form.stl
diff --git a/doc/RFID_Antenna-With-Lanyard-Hook.stl b/doc/original_proxmark3/RFID_Antenna-With-Lanyard-Hook.stl
similarity index 100%
rename from doc/RFID_Antenna-With-Lanyard-Hook.stl
rename to doc/original_proxmark3/RFID_Antenna-With-Lanyard-Hook.stl
diff --git a/doc/proxmark3.brd b/doc/original_proxmark3/proxmark3.brd
similarity index 100%
rename from doc/proxmark3.brd
rename to doc/original_proxmark3/proxmark3.brd
diff --git a/doc/proxmark3.pdf b/doc/original_proxmark3/proxmark3.pdf
similarity index 100%
rename from doc/proxmark3.pdf
rename to doc/original_proxmark3/proxmark3.pdf
diff --git a/doc/proxmark3.sch b/doc/original_proxmark3/proxmark3.sch
similarity index 100%
rename from doc/proxmark3.sch
rename to doc/original_proxmark3/proxmark3.sch
diff --git a/doc/proxmark3.xls b/doc/original_proxmark3/proxmark3.xls
similarity index 100%
rename from doc/proxmark3.xls
rename to doc/original_proxmark3/proxmark3.xls
diff --git a/doc/proxmark3_schema.pdf b/doc/original_proxmark3/proxmark3_schema.pdf
similarity index 100%
rename from doc/proxmark3_schema.pdf
rename to doc/original_proxmark3/proxmark3_schema.pdf
diff --git a/doc/system.txt b/doc/original_proxmark3/system.txt
similarity index 98%
rename from doc/system.txt
rename to doc/original_proxmark3/system.txt
index a3ae86055..b0d47f1a5 100644
--- a/doc/system.txt
+++ b/doc/original_proxmark3/system.txt
@@ -1,276 +1,276 @@
-
-This is outdated.
-
----
-
-INTRODUCTION TO THE proxmark3
-=============================
-
-The proxmark3 device is designed to manipulate RFID tags in a number of
-different ways. For example, a proxmark3 can:
-
-    * read a low-frequency (~100 kHz) or high-frequency (13.56 MHz) tag,
-      including the ISO-standard tags; standards that require
-      bidirectional communication between the reader and the tag are
-      not a problem
-
-    * emulate a low- or high-frequency tag, in a way very similar to the
-      way that a real tag behaves (e.g., it derives its timing from the
-      incident carrier)
-
-    * eavesdrop on the signals exchanged between another reader and tag
-
-    * measure the resonant frequency of an antenna, to a certain extent
-      (this is a convenience when building a test setup for the previous
-      three functions)
-
-The proxmark3 may be thought of as a direct-sampling software radio.
-There is some complication, though, because of the usual dynamic range
-issue in dealing with signals in RFID systems (large signal due to
-the reader, small signal due to the tag). Some analog processing is
-therefore used to fix this before the signal is digitized. (Although,
-it is possible to digitize the signal from the antenna directly, with
-appropriate population options. It is just not usually a good idea.)
-
-SYSTEM ARCHITECTURE
-===================
-
-The ANTENNA sends and receives signals over the air. It is external to
-the board; it connects through SV2. Separate pins on the connector are
-used for the low- and high-frequency antennas, and the analog receive
-paths are separate. The antennas are inductive loops, which are resonated
-by on-board capacitors.
-
-On the transmit side, the antennas are excited by large numbers of
-paralleled bus driver buffers. By tri-stating some of the buffers, it
-is possible to vary the transmit strength. This may be used to generate
-a modulated carrier. The buffers are driven by signals from the FPGA,
-as are the output enables. The antennas are excited as series circuits,
-which permits a large input power for a relatively small input voltage.
-
-By driving all of the buffers low, it is possible to make the antenna
-look to the receive path like a parallel LC circuit; this provides a
-high-voltage output signal. This is typically what will be done when we
-are not actively transmitting a carrier (i.e., behaving as a reader).
-
-On the receive side, there are two possibilities, which are selected by
-RLY1. A mechanical relay is used, because the signal from the antenna is
-likely to be more positive or negative than the highest or lowest supply
-voltages on-board. In the usual case (PEAK-DETECTED mode), the received
-signal is peak-detected by an analog circuit, then filtered slightly,
-and then digitized by the ADC. This is the case for both the low- and
-high-frequency paths, although the details of the circuits for the
-two cases are somewhat different. This receive path would typically
-be selected when the device is behaving as a reader, or when it is
-eavesdropping at close range.
-
-It is also possible to digitize the signal from the antenna directly (RAW
-mode), after passing it through a gain stage. This is more likely to be
-useful in reading signals at long range, but the available dynamic range
-will be poor, since it is limited by the 8-bit A/D. These modes would be
-very appropriate, for example, for the heavily-discussed attacks in which
-a tag's ID is learned from the data broadcast by a reader performing an
-anticollision loop, because there is no dynamic range problem there. It
-would also be possible to program the proxmark3 to receive broadcast AM
-radio, with certain changes in component values.
-
-In either case, an analog signal is digitized by the ADC (IC8), and
-from there goes in to the FPGA (IC1). The FPGA is big enough that it
-can perform DSP operations itself. For some high-frequency standards,
-the subcarriers are fast enough that it would be inconvenient to do all
-the math on a general-purpose CPU. The FPGA can therefore correlate for
-the desired signal itself, and simply report the total to the ARM. For
-low-frequency tags, it probably makes sense just to pass data straight
-through to the ARM.
-
-The FPGA communicates with the ARM through either its SPI port (the ARM
-is the master) or its generic synchronous serial port (again, the ARM
-is the master). The ARM connects to the outside world over USB.
-
-DETAILS: POWER DISTRIBUTION
-===========================
-
-I make a half-hearted attempt to meet the USB power specs; this adds a
-bit of complexity. I have not made measurements to determine how close
-I come to succeeding, but I think that the suspend current might turn
-out to be a pain.
-
-The +3V3 rail is always powered, whenever we are plugged in to USB. This
-is generated by an LDO, which burns a quiescent current of 150 uA
-(typical) already. The only thing powered from the +3V3 rail is the ARM,
-which can presumably do smart power control when we are in suspend.
-
-The ARM generates two signals to switch power to the rest of the board:
-FPGA_ON, and NVDD_ON. When NVDD_ON goes low, the Vdd rail comes up to
-about five volts (the filtered-but-unregulated USB voltage). This powers
-most of the analog circuitry, including the ADC and all of the opamps
-and comparators in the receive path, and the coil drivers as well. Vdd
-also feeds the +3V3-FPGA and +2v5 regulators, which power only the
-FPGA. These regulators are enabled by FPGA_ON, so the FPGA is powered
-only when NVDD_ON is asserted low, and FPGA_ON is asserted high.
-
-DETAILS: FPGA
-=============
-
-The FPGA is a Spartan-II. This is a little bit old, but it is widely
-available, inexpensive, and five-volt tolerant. For development, the FPGA
-is configured over JTAG (SV5). In operation, the FPGA is configured in
-slave serial mode by the ARM, from a bitstream stored in the ARM's flash.
-
-Power to the FPGA is managed by regulators IC13 and IC12, both of which
-have shutdown. These generate the FPGA's VCCO (+3v3) and VCCINT (+2v5)
-supplies. I am a little bit worried about the power-on surge, since we
-run off USB. At the very minimum, the FPGA should not get power until
-we have enumerated and requested the full 500 mA available from USB. The
-large electrolytic capacitors C37 and C38 will presumably help with this.
-
-The logic is written in Verilog, of course for webpack. I have structured
-the FPGA in terms of `major modes:' the FPGA's `major mode' determines
-which of several modules is connected to the FPGA's I/O pins. A separate
-module is used for each of the FPGA's function; for example, there is
-now a module to read a 125 kHz tag, simulate a 125 kHz tag, transmit to
-an ISO 15693 tag, and receive from an ISO 15693 tag.
-
-DETAILS: ANALOG RECEIVE PATH
-============================
-
-For `slow' signals, I use an MCP6294 opamp. This has a GBW of 10 MHz,
-which is more than enough for the low-frequency stuff, and enough for
-all of the subcarrier frequencies that I know of at high frequency. In
-practice, the `slow' signals are all the signals following the peak
-detector. These signals are usually centred around the generated
-voltage Vmid.
-
-For `fast' signals, I use an AD8052. This is a very fast voltage-feedback
-amplifier (~100 MHz GBW). I use it immediately after the antenna for
-both the low- and high-frequency cases, as a sort of an ugly LNA. It is
-not optimal, but it certainly made the design easy.
-
-An ordinary CD4066 is used to multiplex the four possible signals
-(low/high frequency paths, RAW/PEAK-DETECTED). There is a potential
-problem at startup, when the ARM is in reset; there are pull-ups on the
-lines that control the mux, so all of the switches turn on. This shorts
-the four opamp outputs together through the on-resistance of the switch.
-All four outputs float to the same DC voltage with no signal, however,
-and the on-resistance of the switches is fairly large, so I don't think
-that will be a problem in practice.
-
-Comparators are used to generate clock signals when the device is
-emulating a tag. These clock signals are generated from the signal on the
-antenna, and therefore from the signal transmitted by the reader. This
-allows us to clock ourselves off the reader, just like a real tag would.
-These signals go in to the FPGA. There is a potential problem when the
-FPGA is powered down; these outputs might go high and try to power the
-FPGA through the protection diodes. My present solution to this is a
-couple of resistors, which is not very elegeant.
-
-The high-frequency peak-detected receive path contains population options
-for many features that I do not currently use. A lot of these are just
-me guessing that if I provide options for different series and shunt
-passives, perhaps it will come in handy in some way. The Zener diodes D10
-and D11 are optional, but may protect the front end from an overvoltage
-(which will fry the peak detector diodes) when the `simulated tag'
-is read by a powerful reader.
-
-DETAILS: ANALOG TRANSMIT PATH
-=============================
-
-The coil drivers are just ACT244 bus buffers. I parallel eight of them
-for each antenna (eight for the high-frequency antenna, eight for the
-low-frequency antenna). This should easily provide a hundred milliamps
-coil drive or so, which is more than enough for anything that I imagine
-doing with the device. The drivers hit the coil with a square wave
-voltage, however, which means that it is only the bandpass filter effect
-of a resonant antenna that suppresses the odd harmonics. In practice it
-would probably take heroic efforts (high antenna Q) to meet the FCC/CE
-harmonic specs; and in practice no one cares.
-
-The tx strength, given good antenna tuning, is determined by the series
-resistors. Choose the ratios to stay within the rated current of the
-buffers, and to achieve the desired power ratios by enabling or disabling
-nOEs for the desired modulation index. It is useful to populate one of the
-resistors as a high value (~10k) for the simulated tag modes; this allows
-us to look at the incident carrier without loading the reader very much.
-
-DETAILS: ARM
-============
-
-Atmel makes a number of pin-compatible ARMs, with slightly different
-peripherals, and different amounts of flash and RAM. It is necessary
-to choose a device with enough flash not just for the ARM's program,
-but also for the FPGA image (which is loaded by the ARM).
-
-The ARM is responsible for programming the FPGA. It also supplies a
-clock to the FPGA (although the FPGA clock can also run off the 13.56
-MHz clock not used for anything else, which is obviously asynchronous
-to anything in the ARM).
-
-It is necessary to use JTAG to bring the ARM for the first time; at
-that point you can load a bootrom, and subsequently load new software
-over USB. It might be possible to use the ARM's pre-loaded bootloader
-(see datasheet) instead of JTAG, but I wanted the JTAG anyways for
-debugging, so I did not bother. I used a Wiggler clone, with Macraigor's
-OCD Commander. More expensive tools would work as well.
-
-USB SOFTWARE
-============
-
-At present I enumerate as an HID device. This saves me writing a driver,
-but it forces me to do interrupt transfers for everything. This limits
-speed and is not very elegant. A real USB driver would be nice, maybe
-even one that could do stuff like going isochronous to stream samples
-from the A/D for processing on the PC.
-
-PRETENDING TO BE A TAG
-======================
-
-It is not possible, with the given topology, to open-circuit the antenna
-entirely and still look at the signal received on it. The simulated tag
-modes must therefore switch between slight loading and heavy loading,
-not open- and short-circuts across the antenna, evening though they do
-not depend upon the incident carrier for power (just timing information).
-
-RECEIVING SIGNAL STRAIGHT FROM THE ANTENNAS
-===========================================
-
-There is a path straight from the antenna to the A/D, bypassing the peak
-detector assembly. This goes through a gain stage (just a fast voltage
-feedback opamp), and from there straight in to the mux.
-
-It is necessary to energize the relay to connect these paths. If the
-coil is driven (as if to excite and read a tag) while these paths are
-connected, then damage will probably result. Most likely the opamp
-will fry.
-
-READING A TAG
-=============
-
-The tag is excited by a carrier transmitted by the reader. This is
-generated by IC9 and IC10, using some combination of buffers. The transmit
-power is determined by selecting the right combination of PWR_OEx pins;
-drive more of them low for more power. This can be used to modulate the
-transmitted signal, and thus send information to the tag.
-
-The received signal from the antenna is first peak-detected, and then
-high-pass filtered to reject the unmodulated carrier. The signal is
-amplified a bit, and goes in to the A/D mux from there. The A/D is
-controlled by the FPGA. For 13.56 MHz tags, it is easiest to do everything
-synchronous to the 13.56 MHz carrier.
-
-INTERFACE FROM THE ARM TO THE FPGA
-==================================
-
-The FPGA and the ARM can communicate in two main ways: using the ARM's
-general-purpose synchronous serial port (the SSP), or using the ARM's
-SPI port. The SPI port is used to configure the FPGA. The ARM writes a
-configuration word to the FPGA, which determines what operation will
-be performed (e.g. read 13.56 MHz vs. read 125 kHz vs. read 134 kHz
-vs...). The SPI is used exclusively for configuration.
-
-The SSP is used for actual data sent over the air. The ARM's SSP can
-work in slave mode, which means that we can send the data using clocks
-generated by the FPGA (either from the PCK0 clock, which the ARM itself
-supplies, or from the 13.56 MHz clock, which is certainly not going to
-be synchronous to anything in the ARM), which saves synchronizing logic
-in the FPGA. The SSP is bi-directional and full-duplex.
-
+
+This is outdated.
+
+---
+
+INTRODUCTION TO THE proxmark3
+=============================
+
+The proxmark3 device is designed to manipulate RFID tags in a number of
+different ways. For example, a proxmark3 can:
+
+    * read a low-frequency (~100 kHz) or high-frequency (13.56 MHz) tag,
+      including the ISO-standard tags; standards that require
+      bidirectional communication between the reader and the tag are
+      not a problem
+
+    * emulate a low- or high-frequency tag, in a way very similar to the
+      way that a real tag behaves (e.g., it derives its timing from the
+      incident carrier)
+
+    * eavesdrop on the signals exchanged between another reader and tag
+
+    * measure the resonant frequency of an antenna, to a certain extent
+      (this is a convenience when building a test setup for the previous
+      three functions)
+
+The proxmark3 may be thought of as a direct-sampling software radio.
+There is some complication, though, because of the usual dynamic range
+issue in dealing with signals in RFID systems (large signal due to
+the reader, small signal due to the tag). Some analog processing is
+therefore used to fix this before the signal is digitized. (Although,
+it is possible to digitize the signal from the antenna directly, with
+appropriate population options. It is just not usually a good idea.)
+
+SYSTEM ARCHITECTURE
+===================
+
+The ANTENNA sends and receives signals over the air. It is external to
+the board; it connects through SV2. Separate pins on the connector are
+used for the low- and high-frequency antennas, and the analog receive
+paths are separate. The antennas are inductive loops, which are resonated
+by on-board capacitors.
+
+On the transmit side, the antennas are excited by large numbers of
+paralleled bus driver buffers. By tri-stating some of the buffers, it
+is possible to vary the transmit strength. This may be used to generate
+a modulated carrier. The buffers are driven by signals from the FPGA,
+as are the output enables. The antennas are excited as series circuits,
+which permits a large input power for a relatively small input voltage.
+
+By driving all of the buffers low, it is possible to make the antenna
+look to the receive path like a parallel LC circuit; this provides a
+high-voltage output signal. This is typically what will be done when we
+are not actively transmitting a carrier (i.e., behaving as a reader).
+
+On the receive side, there are two possibilities, which are selected by
+RLY1. A mechanical relay is used, because the signal from the antenna is
+likely to be more positive or negative than the highest or lowest supply
+voltages on-board. In the usual case (PEAK-DETECTED mode), the received
+signal is peak-detected by an analog circuit, then filtered slightly,
+and then digitized by the ADC. This is the case for both the low- and
+high-frequency paths, although the details of the circuits for the
+two cases are somewhat different. This receive path would typically
+be selected when the device is behaving as a reader, or when it is
+eavesdropping at close range.
+
+It is also possible to digitize the signal from the antenna directly (RAW
+mode), after passing it through a gain stage. This is more likely to be
+useful in reading signals at long range, but the available dynamic range
+will be poor, since it is limited by the 8-bit A/D. These modes would be
+very appropriate, for example, for the heavily-discussed attacks in which
+a tag's ID is learned from the data broadcast by a reader performing an
+anticollision loop, because there is no dynamic range problem there. It
+would also be possible to program the proxmark3 to receive broadcast AM
+radio, with certain changes in component values.
+
+In either case, an analog signal is digitized by the ADC (IC8), and
+from there goes in to the FPGA (IC1). The FPGA is big enough that it
+can perform DSP operations itself. For some high-frequency standards,
+the subcarriers are fast enough that it would be inconvenient to do all
+the math on a general-purpose CPU. The FPGA can therefore correlate for
+the desired signal itself, and simply report the total to the ARM. For
+low-frequency tags, it probably makes sense just to pass data straight
+through to the ARM.
+
+The FPGA communicates with the ARM through either its SPI port (the ARM
+is the master) or its generic synchronous serial port (again, the ARM
+is the master). The ARM connects to the outside world over USB.
+
+DETAILS: POWER DISTRIBUTION
+===========================
+
+I make a half-hearted attempt to meet the USB power specs; this adds a
+bit of complexity. I have not made measurements to determine how close
+I come to succeeding, but I think that the suspend current might turn
+out to be a pain.
+
+The +3V3 rail is always powered, whenever we are plugged in to USB. This
+is generated by an LDO, which burns a quiescent current of 150 uA
+(typical) already. The only thing powered from the +3V3 rail is the ARM,
+which can presumably do smart power control when we are in suspend.
+
+The ARM generates two signals to switch power to the rest of the board:
+FPGA_ON, and NVDD_ON. When NVDD_ON goes low, the Vdd rail comes up to
+about five volts (the filtered-but-unregulated USB voltage). This powers
+most of the analog circuitry, including the ADC and all of the opamps
+and comparators in the receive path, and the coil drivers as well. Vdd
+also feeds the +3V3-FPGA and +2v5 regulators, which power only the
+FPGA. These regulators are enabled by FPGA_ON, so the FPGA is powered
+only when NVDD_ON is asserted low, and FPGA_ON is asserted high.
+
+DETAILS: FPGA
+=============
+
+The FPGA is a Spartan-II. This is a little bit old, but it is widely
+available, inexpensive, and five-volt tolerant. For development, the FPGA
+is configured over JTAG (SV5). In operation, the FPGA is configured in
+slave serial mode by the ARM, from a bitstream stored in the ARM's flash.
+
+Power to the FPGA is managed by regulators IC13 and IC12, both of which
+have shutdown. These generate the FPGA's VCCO (+3v3) and VCCINT (+2v5)
+supplies. I am a little bit worried about the power-on surge, since we
+run off USB. At the very minimum, the FPGA should not get power until
+we have enumerated and requested the full 500 mA available from USB. The
+large electrolytic capacitors C37 and C38 will presumably help with this.
+
+The logic is written in Verilog, of course for webpack. I have structured
+the FPGA in terms of `major modes:' the FPGA's `major mode' determines
+which of several modules is connected to the FPGA's I/O pins. A separate
+module is used for each of the FPGA's function; for example, there is
+now a module to read a 125 kHz tag, simulate a 125 kHz tag, transmit to
+an ISO 15693 tag, and receive from an ISO 15693 tag.
+
+DETAILS: ANALOG RECEIVE PATH
+============================
+
+For `slow' signals, I use an MCP6294 opamp. This has a GBW of 10 MHz,
+which is more than enough for the low-frequency stuff, and enough for
+all of the subcarrier frequencies that I know of at high frequency. In
+practice, the `slow' signals are all the signals following the peak
+detector. These signals are usually centred around the generated
+voltage Vmid.
+
+For `fast' signals, I use an AD8052. This is a very fast voltage-feedback
+amplifier (~100 MHz GBW). I use it immediately after the antenna for
+both the low- and high-frequency cases, as a sort of an ugly LNA. It is
+not optimal, but it certainly made the design easy.
+
+An ordinary CD4066 is used to multiplex the four possible signals
+(low/high frequency paths, RAW/PEAK-DETECTED). There is a potential
+problem at startup, when the ARM is in reset; there are pull-ups on the
+lines that control the mux, so all of the switches turn on. This shorts
+the four opamp outputs together through the on-resistance of the switch.
+All four outputs float to the same DC voltage with no signal, however,
+and the on-resistance of the switches is fairly large, so I don't think
+that will be a problem in practice.
+
+Comparators are used to generate clock signals when the device is
+emulating a tag. These clock signals are generated from the signal on the
+antenna, and therefore from the signal transmitted by the reader. This
+allows us to clock ourselves off the reader, just like a real tag would.
+These signals go in to the FPGA. There is a potential problem when the
+FPGA is powered down; these outputs might go high and try to power the
+FPGA through the protection diodes. My present solution to this is a
+couple of resistors, which is not very elegeant.
+
+The high-frequency peak-detected receive path contains population options
+for many features that I do not currently use. A lot of these are just
+me guessing that if I provide options for different series and shunt
+passives, perhaps it will come in handy in some way. The Zener diodes D10
+and D11 are optional, but may protect the front end from an overvoltage
+(which will fry the peak detector diodes) when the `simulated tag'
+is read by a powerful reader.
+
+DETAILS: ANALOG TRANSMIT PATH
+=============================
+
+The coil drivers are just ACT244 bus buffers. I parallel eight of them
+for each antenna (eight for the high-frequency antenna, eight for the
+low-frequency antenna). This should easily provide a hundred milliamps
+coil drive or so, which is more than enough for anything that I imagine
+doing with the device. The drivers hit the coil with a square wave
+voltage, however, which means that it is only the bandpass filter effect
+of a resonant antenna that suppresses the odd harmonics. In practice it
+would probably take heroic efforts (high antenna Q) to meet the FCC/CE
+harmonic specs; and in practice no one cares.
+
+The tx strength, given good antenna tuning, is determined by the series
+resistors. Choose the ratios to stay within the rated current of the
+buffers, and to achieve the desired power ratios by enabling or disabling
+nOEs for the desired modulation index. It is useful to populate one of the
+resistors as a high value (~10k) for the simulated tag modes; this allows
+us to look at the incident carrier without loading the reader very much.
+
+DETAILS: ARM
+============
+
+Atmel makes a number of pin-compatible ARMs, with slightly different
+peripherals, and different amounts of flash and RAM. It is necessary
+to choose a device with enough flash not just for the ARM's program,
+but also for the FPGA image (which is loaded by the ARM).
+
+The ARM is responsible for programming the FPGA. It also supplies a
+clock to the FPGA (although the FPGA clock can also run off the 13.56
+MHz clock not used for anything else, which is obviously asynchronous
+to anything in the ARM).
+
+It is necessary to use JTAG to bring the ARM for the first time; at
+that point you can load a bootrom, and subsequently load new software
+over USB. It might be possible to use the ARM's pre-loaded bootloader
+(see datasheet) instead of JTAG, but I wanted the JTAG anyways for
+debugging, so I did not bother. I used a Wiggler clone, with Macraigor's
+OCD Commander. More expensive tools would work as well.
+
+USB SOFTWARE
+============
+
+At present I enumerate as an HID device. This saves me writing a driver,
+but it forces me to do interrupt transfers for everything. This limits
+speed and is not very elegant. A real USB driver would be nice, maybe
+even one that could do stuff like going isochronous to stream samples
+from the A/D for processing on the PC.
+
+PRETENDING TO BE A TAG
+======================
+
+It is not possible, with the given topology, to open-circuit the antenna
+entirely and still look at the signal received on it. The simulated tag
+modes must therefore switch between slight loading and heavy loading,
+not open- and short-circuts across the antenna, evening though they do
+not depend upon the incident carrier for power (just timing information).
+
+RECEIVING SIGNAL STRAIGHT FROM THE ANTENNAS
+===========================================
+
+There is a path straight from the antenna to the A/D, bypassing the peak
+detector assembly. This goes through a gain stage (just a fast voltage
+feedback opamp), and from there straight in to the mux.
+
+It is necessary to energize the relay to connect these paths. If the
+coil is driven (as if to excite and read a tag) while these paths are
+connected, then damage will probably result. Most likely the opamp
+will fry.
+
+READING A TAG
+=============
+
+The tag is excited by a carrier transmitted by the reader. This is
+generated by IC9 and IC10, using some combination of buffers. The transmit
+power is determined by selecting the right combination of PWR_OEx pins;
+drive more of them low for more power. This can be used to modulate the
+transmitted signal, and thus send information to the tag.
+
+The received signal from the antenna is first peak-detected, and then
+high-pass filtered to reject the unmodulated carrier. The signal is
+amplified a bit, and goes in to the A/D mux from there. The A/D is
+controlled by the FPGA. For 13.56 MHz tags, it is easiest to do everything
+synchronous to the 13.56 MHz carrier.
+
+INTERFACE FROM THE ARM TO THE FPGA
+==================================
+
+The FPGA and the ARM can communicate in two main ways: using the ARM's
+general-purpose synchronous serial port (the SSP), or using the ARM's
+SPI port. The SPI port is used to configure the FPGA. The ARM writes a
+configuration word to the FPGA, which determines what operation will
+be performed (e.g. read 13.56 MHz vs. read 125 kHz vs. read 134 kHz
+vs...). The SPI is used exclusively for configuration.
+
+The SSP is used for actual data sent over the air. The ARM's SSP can
+work in slave mode, which means that we can send the data using clocks
+generated by the FPGA (either from the PCK0 clock, which the ARM itself
+supplies, or from the 13.56 MHz clock, which is certainly not going to
+be synchronous to anything in the ARM), which saves synchronizing logic
+in the FPGA. The SSP is bi-directional and full-duplex.
+

From bfed6602b88be3230c463404b4638a630f38e429 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 5 May 2019 00:24:29 +0200
Subject: [PATCH 1588/1938] readme typos

---
 README.md | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 27e64810a..8d3dd2bd8 100644
--- a/README.md
+++ b/README.md
@@ -16,16 +16,16 @@ alt="Yuotube" width="100%" height="auto" border="10" /></a>
 
 | FAQ's & Updates     | Installation        | Use of the Proxmark |
 | ------------- |:-------------:| -----:|
-|[Whats changed?](#whats-changed)  | [Setup and build for ArchLinux](/doc/md/Installation_Instructions/Arch-Linux-Installation-Instructions.md) | [Validating proxmark client functionality](/doc/md/Use_of_Proxmark/1_Validation.md)|
+|[What has changed?](#what-has-changed)  | [Setup and build for ArchLinux](/doc/md/Installation_Instructions/Arch-Linux-Installation-Instructions.md) | [Validating proxmark client functionality](/doc/md/Use_of_Proxmark/1_Validation.md)|
 |[Development](#development) | [Setup and build for UBUNTU](/doc/md/Installation_Instructions/Ubuntu-Installation-Instructions.md)  | [First Use and Verification](/doc/md/Use_of_Proxmark/2_Configuration-and-Verification.md) |
-| [Why don't you add this or that functionality?](#why-dont-you-add-this-or-that-functionality)  | [Homebrew (Mac OS X) & Upgrading HomeBrew Tap Forumula](/doc/md/Installation_Instructions/Mac-OS-X-Homebrew-Installation-Instructions.md) | [Commands & Features](/doc/md/Use_of_Proxmark/3_Commands-and-Features.md)|
-|[Why didn't you based it on offical PM3 Master?](#why-didnt-you-based-it-on-offical-pm3-master) |[ParrotOS Installation ](/doc/md/Installation_Instructions/Parrot-OS-Proxmark3-RDV4-installation.md)|[PM3 GUI](#pm3-gui)
+| [Why don't you add this or that functionality?](#why-dont-you-add-this-or-that-functionality)  | [Homebrew (Mac OS X) & Upgrading HomeBrew Tap Formula](/doc/md/Installation_Instructions/Mac-OS-X-Homebrew-Installation-Instructions.md) | [Commands & Features](/doc/md/Use_of_Proxmark/3_Commands-and-Features.md)|
+|[Why didn't you base it on official PM3 Master?](#why-didnt-you-base-it-on-official-pm3-master) |[ParrotOS Installation ](/doc/md/Installation_Instructions/Parrot-OS-Proxmark3-RDV4-installation.md)|[PM3 GUI](#pm3-gui)
 |[Notices](#notices)|[Setup and build for Windows](/doc/md/Installation_Instructions/Windows-Installation-Instructions.md)||
 |[Issues](#issues)|[Coverity Scan Config & Run](/doc/md/Installation_Instructions/Coverity-Scan-Config-%26-Run.md)||
 ||[Kali Linux Installation Instructions](/doc/md/Installation_Instructions/Kali-Installation-Instructions.md)|
 
 ---
-## Whats changed?
+## What has changed?
 
 On the hardware side:
 
@@ -44,22 +44,22 @@ This fork now compiles just fine on
    - WSL (Windows subsystem linux) on Windows 10
    - Docker container
 ---	
-## Why didn't you based it on offical PM3 Master?
-The separation from offical pm3 repo gives us very much freedom to create a firmware/client that suits the RDV40 features. We don't want to mess up the offical pm3 repo with RDV40 specific code.
+## Why didn't you base it on official PM3 Master?
+The separation from official pm3 repo gives us a lot of freedom to create a firmware/client that suits the RDV40 features. We don't want to mess up the official pm3 repo with RDV40 specific code.
 
 ## Why don't you add this or that functionality?
 Give us a hint, and we'll see if we can't merge in the stuff you have. 
 	
 ## PM3 GUI
 The official PM3-GUI from Gaucho will not work.
-The new universial GUI will work. [Proxmark3 Universal GUI](https://github.com/burma69/PM3UniversalGUI) 
+The new universal GUI will work. [Proxmark3 Universal GUI](https://github.com/burma69/PM3UniversalGUI) 
 
 ## Notices
 Kali and ArchLinux users usually must kill their modem manager in order for the proxmark3 to enumerate properly.   
 `sudo apt remove modemmanager`
 		   
 ## Issues
-Please see the [Proxmark Forum](http://www.proxmark.org/forum/index.php) and see if your issue is listed in the first instance google is your friend :) Questions will be answered via the forum by Iceman and the team. 
+Please see the [Proxmark Forum](http://www.proxmark.org/forum/index.php) and see if your issue is listed in the first instance Google is your friend :) Questions will be answered via the forum by Iceman and the team. 
 
 ## The end
 

From fa82f245170df6686eab967e39d3aba29c28f946 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 5 May 2019 00:41:20 +0200
Subject: [PATCH 1589/1938] hacking.txt -> .md + ref in readme

---
 HACKING.txt => HACKING.md | 165 ++++++++++++++++++++------------------
 README.md                 |   2 +
 2 files changed, 89 insertions(+), 78 deletions(-)
 rename HACKING.txt => HACKING.md (67%)

diff --git a/HACKING.txt b/HACKING.md
similarity index 67%
rename from HACKING.txt
rename to HACKING.md
index 9d7bdaedc..dcbdfd34f 100644
--- a/HACKING.txt
+++ b/HACKING.md
@@ -1,5 +1,7 @@
-    "Coding styles are like assholes, everyone has one and no one likes anyone elses."
-    --Eric Warmenhoven
+_"Coding styles are like assholes, everyone has one and no one likes anyone elses."_
+--Eric Warmenhoven
+
+# Overview
 
 The Proxmark3 codebase is pretty messy and in the process of being cleaned up,
 so we don't have clear guidelines on how to place new code just yet. However,
@@ -8,99 +10,106 @@ please don't make things worse.
 However, we have established a set of coding style guidelines in order to
 clean up the code consistently and keep it consistent in the future.
 Look around and respect the same style.
+
 Helper script to get some uniformity in the style:
 
-$ make style
+`$ make style`
 
-It makes use of "astyle" so be sure to install it first.
+It makes use of `astyle` so be sure to install it first.
 
 
-=== INDENTATION ===
+# Indentation
 
 Don't use tabs, editors are messing them up too easily.
 Increment unit is four spaces.
 
-If you use "make style", this will be done for you.
+If you use `make style`, this will be done for you.
 
-=== WIDTH ===
+# Width
 
 Try to keep lines to a reasonable length. 80 characters is a good mark; using an
 editor that shows a vertical line is a great idea. However, don't break a line
 just because you're slightly over, it's not worth it. No 200-character lines,
 though.
 
-=== MACROS ===
+# Macros
 
-#defines, function-like or not, are all UPPERCASE unless you're emulating a
+`#define`, function-like or not, are all UPPERCASE unless you're emulating a
 well-known function name.
 
-=== IDENTIFIERS ===
+# Identifiers
 
 Functions, local variables, and arguments are all named using
-underscores_as_spaces. Global variables are Evil and are prepended with g_ to
+`underscores_as_spaces`. Global variables are Evil and are prepended with `g_` to
 distinguish them. Avoid them.
 
 Single-character variables are a bad idea. Exceptions: loop iterators and maybe
-simple byte pointers (*p) in very obvious places. If you have more than one
+simple byte pointers (`*p`) in very obvious places. If you have more than one
 such pointer, use a real name. If you have more than a couple nested loops,
 complex logic, or indices that differ in interpretation or purpose, use real
 names instead of i,j,k.
 
-=== DATA TYPES ===
+# Data types
 
-Use stdint.h types (uint32_t and friends) unless you have a reason not to. Don't
-use microsoft-style DWORD and the like, we're getting rid of those. Avoid char
-for buffers, uint8_t is more obvious when you're not working with strings. Use
-'const' where things are const. Try to use size_t for sizes.
+Use `stdint.h` types (`uint32_t` and friends) unless you have a reason not to. Don't
+use microsoft-style `DWORD` and the like, we're getting rid of those. Avoid char
+for buffers, `uint8_t` is more obvious when you're not working with strings. Use
+`const` where things are const. Try to use `size_t` for sizes.
 
 Pointers and reference operators are attached to the variable name:
+```
     void *ptr;
+```
 not:
+```
     void* ptr;
+```
 otherwise you're tempted to write:
+```
     void* in, out;
+```
 and you'll fail.
 
-"make style" will take care of pointers & reference operators.
+`make style` will take care of pointers & reference operators.
 
-=== EXPRESSIONS ===
+# Expressions
 
 In general, use whitespace around binary operators - no unspaced blobs of an
-expression. "make style" will take care of whitespaces around operators.
+expression. `make style` will take care of whitespaces around operators.
 
 For example,
-
+```
     if (5 * a < b && some_bool_var)
-
+```
 but not
-
+```
     if (5*a<b&&some_bool_var)
-
-For equality with constants, use i == 0xF00, not 0xF00 == i. The compiler warns
-you about = vs == anyway, and you shouldn't be screwing that one up by now
+```
+For equality with constants, use `i == 0xF00`, not `0xF00 == i`. The compiler warns
+you about `=` vs `==` anyway, and you shouldn't be screwing that one up by now
 anyway.
 
-=== IF / FOR / WHILE / etc. ===
+# If / for / while etc
 
 Put the opening brace on the same line, with a space before it.
 There should be a space between the construct name (if/for/whatever) and the
 opening parenthesis, and there should be a space between the closing parenthesis
 and the opening brace, and no space between parenthesis and expression.
-"make style" will take care of all that.
+`make style` will take care of all that.
 
 If you do split the condition, put the binary operators that join the lines at
 the beginning of the following lines, not at the end of the prior lines.
 
-For generic for() iterator variables, declare them in-line:
-
+For generic `for()` iterator variables, declare them in-line:
+```
     for (int i = 0; i < 10; i++) {
         ...
     }
-
+```
 Note the spaces after the semicolons.
 
 if/else should be laid out as follows:
-
+```
     if (foo) {
         ...
     } else if (bar) {
@@ -108,68 +117,68 @@ if/else should be laid out as follows:
     } else {
         ...
     }
+```
+You can skip braces around 1-line statements but don't mix braces vs. no braces.
 
-You can skip braces around 1 line statements but don't mix braces vs. no braces.
-
-=== FUNCTIONS ===
+# Functions
 
 Put the return type on the same line.
 Put a space after a comma in argument lists.
 Open the brace after the declaration (after a space).
-"make style" will take care of all that.
-
+`make style` will take care of all that.
+```
 void foo(int a_thing, int something_else) {
     ...
 }
-
-Functions with no arguments are declared as f(void), not f().
+```
+Functions with no arguments are declared as `f(void)`, not `f()`.
 Use static for functions that aren't exported, and put exported functions
 in a header file (one header file per source file with exported functions
 usually, no huge headers with all functions). 
-
+```
 void baz(void) {
     foo(bluh, blah);
 }
-
-Function names should be separated_with_underscores(), except for standard
-functions (memcpy, etc.). It may make sense to break this rule for very common,
-generic functions that look like library functions (e.g. dprintf()).
+```
+Function names should be `separated_with_underscores()`, except for standard
+functions (`memcpy`, etc.). It may make sense to break this rule for very common,
+generic functions that look like library functions (e.g. `dprintf()`).
 
 Don't use single-character arguments.
 Exception: very short functions with one argument that's really obvious:
-
+```
 static int ascii(char c) {
     if (c < 0x20 || c >= 0x7f)
         return '.';
     else
         return c;
 }
-
+```
 vs.
-
+```
 static void hexdump(void *buf, size_t len) {
     ...
 }
-
+```
 As a general guideline, functions shouldn't usually be much more than 30-50
 lines. Above, the general algorithm won't be easily apparent, and you're
 probably missing some factoring/restructuring opportunity.
 
-=== STRUCTS / UNIONS / ENUMS ===
+# Structs / unions / enums
 
 Use typedefs when defining structs. The type should be named something_t.
-
+```
 typedef struct {
     blah blah;
 } prox_cmd_t;
-
+```
 You can use anonymous enums to replace lots of sequential or mostly-sequential
 #defines.
 
-=== SWITCH ===
-
-Indent once for the case: labels, then again for the body. Like this:
+# Switch
 
+Indent once for the `case:` labels, then again for the body. Like this:
+```
 switch(bar) {
     case OPTION_A:
         do_stuff();
@@ -178,19 +187,19 @@ switch(bar) {
         do_other_stuff();
         break;
 }
-
-"make style" will take care of the indentation.
+```
+`make style` will take care of the indentation.
 
 If you fall through into another case, add an explicit comment;
 otherwise, it can look confusing.
 
-If your switch() is too long or has too many cases, it should be cleaned up.
+If your `switch()` is too long or has too many cases, it should be cleaned up.
 Split off the cases into functions, break the switch() into parent and children
 switches (e.g. command and subcommand), or use an array of function pointers or
 the like. In other words, use common sense and your brain.
 
 If you need local scope variables for a case, you can add braces:
-
+```
 switch(bar) {
     case OPTION_A: {
         int baz = 5 * bar;
@@ -198,37 +207,37 @@ switch(bar) {
         break;
     }
     ...
-
+```
 But at that point you should probably consider using a separate function.
 
-=== COMMENTS ===
+# Comments
 
 Use //, it's shorter:
-
+```
 // this does foo
 ...
 
 // baz:
 // This does blah blah blah .....
 // blah blah...
-
-/* */ can be used to comment blocks of code, but you should probably remove
+```
+`/* */` can be used to comment blocks of code, but you should probably remove
 them anyway - we have version control, it's easy to fetch old code if needed,
-so avoid committing commented out chunks of code. The same goes for #if 0.
+so avoid committing commented out chunks of code. The same goes for `#if 0`.
 
-=== FILE ===
+# File
 
-Please use common sense and restrain yourself from having a thousands+++ line
+Please use common sense and restrain yourself from having a thousands line
 file. Functions in a file should have something *specific* in common. Over time
 sub-categories can arise and should therefore yield to file splitting.
 
-For these reasons, vague and general filenames (e.g. util.*, global.*, misc.*,
-main.*, and the like) should be very limited, if not prohibited.
+For these reasons, vague and general filenames (e.g. `util.*`, `global.*`, `misc.*`,
+`main.*`, and the like) should be very limited, if not prohibited.
 
-=== FILE HEADERS ===
+# File headers
 
 License/description header first:
-
+```
 //-----------------------------------------------------------------------------
 // YOUR COPYRIGHT LINE GOES HERE
 //
@@ -238,27 +247,27 @@ License/description header first:
 //-----------------------------------------------------------------------------
 // FILE DESCRIPTION GOES HERE
 //-----------------------------------------------------------------------------
-
+```
 If you modify a file in any non-trivial way (add code, etc.), add your copyright
 to the top with the current year.
 
-=== HEADER FILES ===
+# Header files
 
 Use the following include guard format:
-
+```
 #ifndef FOOBAR_H__
 #define FOOBAR_H__
 
 ...
 
 #endif // FOOBAR_H__
+```
+Keep in mind that `__FOOBAR_H` would be reserved by the implementation and thus
+you shouldn't use it (same for `_FOOBAR_H`).
 
-Keep in mind that __FOOBAR_H would be reserved by the implementation and thus
-you shouldn't use it (same for _FOOBAR_H).
-
-=== WHITESPACE ===
+# Whitespace
 
 Avoid trailing whitespace (no line should end in tab or space).
 Keep a newline (blank line) at the end of each file.
 
-"make style" will take care of both.
+`make style` will take care of both.
diff --git a/README.md b/README.md
index 8d3dd2bd8..314c61ac0 100644
--- a/README.md
+++ b/README.md
@@ -43,6 +43,8 @@ This fork now compiles just fine on
    - ParrotOS
    - WSL (Windows subsystem linux) on Windows 10
    - Docker container
+
+If you intend to contribute to the code, please read the [coding style notes](HACKING.md) first.
 ---	
 ## Why didn't you base it on official PM3 Master?
 The separation from official pm3 repo gives us a lot of freedom to create a firmware/client that suits the RDV40 features. We don't want to mess up the official pm3 repo with RDV40 specific code.

From bd9a9373ce2e3a6af0bffe3246a784dd079f2132 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 5 May 2019 00:42:07 +0200
Subject: [PATCH 1590/1938] readme: avoid spurious title

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 314c61ac0..fd698c3d0 100644
--- a/README.md
+++ b/README.md
@@ -45,6 +45,7 @@ This fork now compiles just fine on
    - Docker container
 
 If you intend to contribute to the code, please read the [coding style notes](HACKING.md) first.
+
 ---	
 ## Why didn't you base it on official PM3 Master?
 The separation from official pm3 repo gives us a lot of freedom to create a firmware/client that suits the RDV40 features. We don't want to mess up the official pm3 repo with RDV40 specific code.

From c6e717294d9131638ef59910d05cacaa025fef65 Mon Sep 17 00:00:00 2001
From: Iceman <iceman@iuse.se>
Date: Sun, 5 May 2019 17:19:53 +0200
Subject: [PATCH 1591/1938] Update README.md

---
 README.md | 37 ++++++++++++++++---------------------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/README.md b/README.md
index fd698c3d0..9b49d1c41 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-Proxmark3 RDV4.0 Dedicated Github
-===============
+# Proxmark3 RDV4.0 Dedicated Github
+
 This repo is based on iceman fork for proxmark3. It is dedicated to bringing the most out of the new features for proxmark3 RDV4.0 new hardware and design.
 
 [![Build status](https://ci.appveyor.com/api/projects/status/ct5blik2wa96bv0x/branch/master?svg=true)](https://ci.appveyor.com/project/iceman1001/proxmark3-ji4wj/branch/master)
@@ -13,18 +13,17 @@ alt="Yuotube" width="100%" height="auto" border="10" /></a>
 
 # PROXMARK INSTALLATION AND OVERVIEW
 
-
 | FAQ's & Updates     | Installation        | Use of the Proxmark |
 | ------------- |:-------------:| -----:|
 |[What has changed?](#what-has-changed)  | [Setup and build for ArchLinux](/doc/md/Installation_Instructions/Arch-Linux-Installation-Instructions.md) | [Validating proxmark client functionality](/doc/md/Use_of_Proxmark/1_Validation.md)|
 |[Development](#development) | [Setup and build for UBUNTU](/doc/md/Installation_Instructions/Ubuntu-Installation-Instructions.md)  | [First Use and Verification](/doc/md/Use_of_Proxmark/2_Configuration-and-Verification.md) |
-| [Why don't you add this or that functionality?](#why-dont-you-add-this-or-that-functionality)  | [Homebrew (Mac OS X) & Upgrading HomeBrew Tap Formula](/doc/md/Installation_Instructions/Mac-OS-X-Homebrew-Installation-Instructions.md) | [Commands & Features](/doc/md/Use_of_Proxmark/3_Commands-and-Features.md)|
-|[Why didn't you base it on official PM3 Master?](#why-didnt-you-base-it-on-official-pm3-master) |[ParrotOS Installation ](/doc/md/Installation_Instructions/Parrot-OS-Proxmark3-RDV4-installation.md)|[PM3 GUI](#pm3-gui)
-|[Notices](#notices)|[Setup and build for Windows](/doc/md/Installation_Instructions/Windows-Installation-Instructions.md)||
+|[Notices](#notices)  | [Homebrew (Mac OS X) & Upgrading HomeBrew Tap Formula](/doc/md/Installation_Instructions/Mac-OS-X-Homebrew-Installation-Instructions.md) | [Commands & Features](/doc/md/Use_of_Proxmark/3_Commands-and-Features.md)|
+| [Why didn't you base it on official PM3 Master?](#Why-didn't-you-base-it-on-official-PM3-Master?) |[ParrotOS Installation ](/doc/md/Installation_Instructions/Parrot-OS-Proxmark3-RDV4-installation.md)|
+|[PM3 GUI](#pm3-gui) |[Setup and build for Windows](/doc/md/Installation_Instructions/Windows-Installation-Instructions.md)||
 |[Issues](#issues)|[Coverity Scan Config & Run](/doc/md/Installation_Instructions/Coverity-Scan-Config-%26-Run.md)||
-||[Kali Linux Installation Instructions](/doc/md/Installation_Instructions/Kali-Installation-Instructions.md)|
+|[Donations](#Donations)|[Kali Linux Installation Instructions](/doc/md/Installation_Instructions/Kali-Installation-Instructions.md)|
+
 
----
 ## What has changed?
 
 On the hardware side:
@@ -38,7 +37,7 @@ On the software side: quite a lot, see the [Changelog file](CHANGELOG.md).
 ## Development
 This fork now compiles just fine on 
    - Windows/mingw environment with Qt5.6.1 & GCC 4.8
-   - Ubuntu 1404, 1510, 1604, 1804
+   - Ubuntu 1404, 1510, 1604, 1804, 1904
    - Mac OS X / Homebrew
    - ParrotOS
    - WSL (Windows subsystem linux) on Windows 10
@@ -46,30 +45,26 @@ This fork now compiles just fine on
 
 If you intend to contribute to the code, please read the [coding style notes](HACKING.md) first.
 
+## Notices
+Kali and ArchLinux users usually must kill their modem manager in order for the proxmark3 to enumerate properly.   
+`sudo apt remove modemmanager`
+
 ---	
 ## Why didn't you base it on official PM3 Master?
 The separation from official pm3 repo gives us a lot of freedom to create a firmware/client that suits the RDV40 features. We don't want to mess up the official pm3 repo with RDV40 specific code.
-
-## Why don't you add this or that functionality?
-Give us a hint, and we'll see if we can't merge in the stuff you have. 
 	
 ## PM3 GUI
 The official PM3-GUI from Gaucho will not work.
 The new universal GUI will work. [Proxmark3 Universal GUI](https://github.com/burma69/PM3UniversalGUI) 
 
-## Notices
-Kali and ArchLinux users usually must kill their modem manager in order for the proxmark3 to enumerate properly.   
-`sudo apt remove modemmanager`
-		   
-## Issues
+	   
+## Issues  
 Please see the [Proxmark Forum](http://www.proxmark.org/forum/index.php) and see if your issue is listed in the first instance Google is your friend :) Questions will be answered via the forum by Iceman and the team. 
 
 ## The end
 
-[@herrmann1001](https://mobile.twitter.com/herrmann1001) at host iuse.se
-July 2018, Sweden
-updated Feb 2019 [@5w0rdfish](https://mobile.twitter.com/5w0rdFish)
+- [@herrmann1001](https://mobile.twitter.com/herrmann1001) July 2018
+- updated Feb 2019 [@5w0rdfish](https://mobile.twitter.com/5w0rdFish)
 
 # Donations
 Nothing says thank you as much as a donation,  https://www.patreon.com/iceman1001
-

From 71c37dcb04297774dc2015a252405afae6936c51 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 5 May 2019 18:42:09 +0200
Subject: [PATCH 1592/1938] alphabet order

---
 client/cmdmain.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/cmdmain.c b/client/cmdmain.c
index 126f7d822..311e2d6de 100644
--- a/client/cmdmain.c
+++ b/client/cmdmain.c
@@ -45,16 +45,16 @@ static command_t CommandTable[] = {
     {"help",    CmdHelp,      AlwaysAvailable,         "This help. Use '<command> help' for details of a particular command."},
     {"analyse", CmdAnalyse,   AlwaysAvailable,         "{ Analyse utils... }"},
     {"data",    CmdData,      AlwaysAvailable,         "{ Plot window / data buffer manipulation... }"},
+    {"emv",     CmdEMV,       AlwaysAvailable,         "{ EMV iso14443 and iso7816... }"},
     {"hf",      CmdHF,        AlwaysAvailable,         "{ High Frequency commands... }"},
     {"hw",      CmdHW,        AlwaysAvailable,         "{ Hardware commands... }"},
     {"lf",      CmdLF,        AlwaysAvailable,         "{ Low Frequency commands... }"},
-    {"emv",     CmdEMV,       AlwaysAvailable,         "{ EMV iso14443 and iso7816... }"},
+    {"mem",     CmdFlashMem,  IfPm3Flash,              "{ Flash Memory manipulation... }"},
     {"rem",     CmdRem,       AlwaysAvailable,         "{ Add text to row in log file }"},
     {"reveng",  CmdRev,       AlwaysAvailable,         "{ Crc calculations from the RevEng software... }"},
+    {"sc",      CmdSmartcard, IfPm3Smartcard,          "{ Smart card ISO7816 commands... }"},
     {"script",  CmdScript,    AlwaysAvailable,         "{ Scripting commands }"},
     {"trace",   CmdTrace,     AlwaysAvailable,         "{ Trace manipulation... }"},
-    {"mem",     CmdFlashMem,  IfPm3Flash,              "{ Flash Memory manipulation... }"},
-    {"sc",      CmdSmartcard, IfPm3Smartcard,          "{ Smart card ISO7816 commands... }"},
     {"usart",   CmdUsart,     IfPm3FpcUsartDevFromUsb, "{ USART commands... }"},
     {"quit",    CmdQuit,      AlwaysAvailable,         ""},
     {"exit",    CmdQuit,      AlwaysAvailable,         "Exit program"},

From 5b86284b49039d82cad7ee389325550596003346 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 5 May 2019 19:53:58 +0200
Subject: [PATCH 1593/1938] update docs

---
 Makefile                                      |  14 +-
 README.md                                     |  18 +--
 .../Coverity-Scan-Config-&-Run.md             |   0
 .../Arch-Linux-Installation-Instructions.md   |  60 --------
 .../Kali-Installation-Instructions.md         |  98 -------------
 .../Linux-Installation-Instructions.md        |  89 ++++++++++++
 ...OS-X-Homebrew-Installation-Instructions.md |  47 ++++---
 .../ModemManager-Must-Be-Discarded.md         | 132 ++++++++++++++++++
 .../Parrot-OS-Proxmark3-RDV4-installation.md  |  98 -------------
 .../Ubuntu-Installation-Instructions.md       | 102 --------------
 .../Windows-Installation-Instructions.md      |  41 ++----
 .../0_Compilation-Instructions.md             |  36 +++++
 doc/md/Use_of_Proxmark/1_Validation.md        | 127 ++++++++++-------
 .../2_Configuration-and-Verification.md       |  70 ++++++----
 .../3_Commands-and-Features.md                |  38 +++--
 15 files changed, 464 insertions(+), 506 deletions(-)
 rename doc/md/{Installation_Instructions => Development}/Coverity-Scan-Config-&-Run.md (100%)
 delete mode 100644 doc/md/Installation_Instructions/Arch-Linux-Installation-Instructions.md
 delete mode 100644 doc/md/Installation_Instructions/Kali-Installation-Instructions.md
 create mode 100644 doc/md/Installation_Instructions/Linux-Installation-Instructions.md
 create mode 100644 doc/md/Installation_Instructions/ModemManager-Must-Be-Discarded.md
 delete mode 100644 doc/md/Installation_Instructions/Parrot-OS-Proxmark3-RDV4-installation.md
 delete mode 100644 doc/md/Installation_Instructions/Ubuntu-Installation-Instructions.md
 create mode 100644 doc/md/Use_of_Proxmark/0_Compilation-Instructions.md

diff --git a/Makefile b/Makefile
index d968781f4..5efaae390 100644
--- a/Makefile
+++ b/Makefile
@@ -61,7 +61,7 @@ recovery/%: FORCE bootrom/% armsrc/%
 	$(MAKE) -C recovery $(patsubst recovery/%,%,$@)
 FORCE: # Dummy target to force remake in the subdirectories, even if files exist (this Makefile doesn't know about the prerequisites)
 
-.PHONY: all clean help _test bootrom flash-bootrom os flash-os flash-all recovery client mfkey nounce2key style checks FORCE
+.PHONY: all clean help _test bootrom flash-bootrom os flash-os flash-all recovery client mfkey nounce2key style checks FORCE udev accessrights
 
 help:
 	@echo "Multi-OS Makefile"
@@ -114,14 +114,16 @@ newtarbin:
 tarbin: newtarbin client/tarbin armsrc/tarbin bootrom/tarbin
 	$(GZIP) proxmark3-$(platform)-bin.tar
 
-# configure system
-#  - to ignore PM3 device as a modem (blacklist)
-#  - add user to the dialout group
-# you may need to logout, relogin to get this access right correct.
-# Finally,  you might need to run the proxmark3 client under SUDO on some systems
+# configure system to ignore PM3 device as a modem (ModemManager blacklist, effective *only* if ModemManager is not using _strict_ policy)
+# Read doc/md/ModemManager-Must-Be-Discarded.md for more info
 udev:
 	sudo cp -rf driver/77-pm3-usb-device-blacklist.rules /etc/udev/rules.d/77-pm3-usb-device-blacklist.rules
 	sudo udevadm control --reload-rules
+
+# configure system to add user to the dialout group
+# you need to logout, relogin to get this access right correct.
+# Finally,  you might need to run the proxmark3 client under SUDO on some systems
+accessrights:
 ifneq ($(wildcard /etc/arch-release),) #If user is running ArchLinux
 	sudo usermod -aG uucp $(USER) #Use specific command and group
 else
diff --git a/README.md b/README.md
index fd698c3d0..adf4be8b6 100644
--- a/README.md
+++ b/README.md
@@ -16,13 +16,11 @@ alt="Yuotube" width="100%" height="auto" border="10" /></a>
 
 | FAQ's & Updates     | Installation        | Use of the Proxmark |
 | ------------- |:-------------:| -----:|
-|[What has changed?](#what-has-changed)  | [Setup and build for ArchLinux](/doc/md/Installation_Instructions/Arch-Linux-Installation-Instructions.md) | [Validating proxmark client functionality](/doc/md/Use_of_Proxmark/1_Validation.md)|
-|[Development](#development) | [Setup and build for UBUNTU](/doc/md/Installation_Instructions/Ubuntu-Installation-Instructions.md)  | [First Use and Verification](/doc/md/Use_of_Proxmark/2_Configuration-and-Verification.md) |
-| [Why don't you add this or that functionality?](#why-dont-you-add-this-or-that-functionality)  | [Homebrew (Mac OS X) & Upgrading HomeBrew Tap Formula](/doc/md/Installation_Instructions/Mac-OS-X-Homebrew-Installation-Instructions.md) | [Commands & Features](/doc/md/Use_of_Proxmark/3_Commands-and-Features.md)|
-|[Why didn't you base it on official PM3 Master?](#why-didnt-you-base-it-on-official-pm3-master) |[ParrotOS Installation ](/doc/md/Installation_Instructions/Parrot-OS-Proxmark3-RDV4-installation.md)|[PM3 GUI](#pm3-gui)
-|[Notices](#notices)|[Setup and build for Windows](/doc/md/Installation_Instructions/Windows-Installation-Instructions.md)||
-|[Issues](#issues)|[Coverity Scan Config & Run](/doc/md/Installation_Instructions/Coverity-Scan-Config-%26-Run.md)||
-||[Kali Linux Installation Instructions](/doc/md/Installation_Instructions/Kali-Installation-Instructions.md)|
+|[What has changed?](#what-has-changed)  | [Setup and build for Linux](/doc/md/Installation_Instructions/Linux-Installation-Instructions.md) | [Compilation Instructions](/doc/md/Use_of_Proxmark/0_Compilation-Instructions.md)|
+|[Development](#development) | [Important notes on ModemManager for Linux users](/doc/md/Installation_Instructions/ModemManager-Must-Be-Discarded.md) | [Validating proxmark client functionality](/doc/md/Use_of_Proxmark/1_Validation.md) |
+| [Why don't you add this or that functionality?](#why-dont-you-add-this-or-that-functionality)  | [Homebrew (Mac OS X) & Upgrading HomeBrew Tap Formula](/doc/md/Installation_Instructions/Mac-OS-X-Homebrew-Installation-Instructions.md) | [First Use and Verification](/doc/md/Use_of_Proxmark/2_Configuration-and-Verification.md)|
+|[Why didn't you base it on official PM3 Master?](#why-didnt-you-base-it-on-official-pm3-master) |[Setup and build for Windows](/doc/md/Installation_Instructions/Windows-Installation-Instructions.md)|[Commands & Features](/doc/md/Use_of_Proxmark/3_Commands-and-Features.md)
+|[Issues](#issues)||[PM3 GUI](#pm3-gui)|
 
 ---
 ## What has changed?
@@ -46,6 +44,8 @@ This fork now compiles just fine on
 
 If you intend to contribute to the code, please read the [coding style notes](HACKING.md) first.
 
+Internal notes on [Coverity Scan Config & Run](/doc/md/Development/Coverity-Scan-Config-%26-Run.md).
+
 ---	
 ## Why didn't you base it on official PM3 Master?
 The separation from official pm3 repo gives us a lot of freedom to create a firmware/client that suits the RDV40 features. We don't want to mess up the official pm3 repo with RDV40 specific code.
@@ -57,10 +57,6 @@ Give us a hint, and we'll see if we can't merge in the stuff you have.
 The official PM3-GUI from Gaucho will not work.
 The new universal GUI will work. [Proxmark3 Universal GUI](https://github.com/burma69/PM3UniversalGUI) 
 
-## Notices
-Kali and ArchLinux users usually must kill their modem manager in order for the proxmark3 to enumerate properly.   
-`sudo apt remove modemmanager`
-		   
 ## Issues
 Please see the [Proxmark Forum](http://www.proxmark.org/forum/index.php) and see if your issue is listed in the first instance Google is your friend :) Questions will be answered via the forum by Iceman and the team. 
 
diff --git a/doc/md/Installation_Instructions/Coverity-Scan-Config-&-Run.md b/doc/md/Development/Coverity-Scan-Config-&-Run.md
similarity index 100%
rename from doc/md/Installation_Instructions/Coverity-Scan-Config-&-Run.md
rename to doc/md/Development/Coverity-Scan-Config-&-Run.md
diff --git a/doc/md/Installation_Instructions/Arch-Linux-Installation-Instructions.md b/doc/md/Installation_Instructions/Arch-Linux-Installation-Instructions.md
deleted file mode 100644
index 28245dbfa..000000000
--- a/doc/md/Installation_Instructions/Arch-Linux-Installation-Instructions.md
+++ /dev/null
@@ -1,60 +0,0 @@
-# Setup and build for ArchLinux
-
-## Notes
-
-Kali and ArchLinux users usually must kill their modem manager in order for the proxmark3 to enumerate properly.   
-`sudo apt remove modemmanager`
-
-## Manual Installation
-Run
-```sh
-sudo pacman -Sy base-devel p7zip libusb readline ncurses arm-none-eabi-newlib --needed
-```
-```sh 
-yaourt -S termcap
-```
-
-```sh
-sudo apt remove modemmanager
-```
-or 
-```sh
-systemctl stop ModemManager
-systemctl disable ModemManager
-```
-
-Clone fork
-```sh
-git clone https://github.com/RfidResearchGroup/proxmark3.git
-```
-
-Get the latest commits
-```sh
-git pull
-```
-
-Install the blacklist rules and  add user to dialout group (if you on a Linux/ubuntu/debian). 
-If you do this one, you need to logout and login in again to make sure your rights got changed.
-```sh
-make udev
-```
-
-Clean and complete compilation
-```sh
-make clean && make all
-```
-	
-Flash the BOOTROM & FULLIMAGE
-```sh
-client/flasher /dev/ttyACM0 -b bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf
-```
-	
-Change into the client folder
-```sh
-cd client
-```
-	
-Run the client
-```sh 
-./proxmark3 /dev/ttyACM0
-```
diff --git a/doc/md/Installation_Instructions/Kali-Installation-Instructions.md b/doc/md/Installation_Instructions/Kali-Installation-Instructions.md
deleted file mode 100644
index 4d65afead..000000000
--- a/doc/md/Installation_Instructions/Kali-Installation-Instructions.md
+++ /dev/null
@@ -1,98 +0,0 @@
-# Kali Installation
-Kali users usually must kill their modem manager in order for the proxmark3 to enumerate properly.
-```sh 
-sudo apt remove modemmanager
-```
-
-# Video Installation guide
-[![Kali Installation tutorial](https://github.com/5w0rdfish/Proxmark3-RDV4-ParrotOS/blob/master/screenshot-www.youtube.com-2019.03.17-20-44-33.png)](https://youtu.be/t5eBPS6lV3E "Kali Linux Installation Tutorial")
-
-
----
-## Manual Install
-First what we want to do is get an update for the system. If you need to upgrade do this **before** the install
-An upgrade was carried out prior to following these instructions. 
-
-### Update
-```sh
-sudo apt-get update
-``` 
-### Requirements.
-
-```sh
-sudo apt-get install p7zip git build-essential libreadline5 libreadline-dev \
-libusb-0.1-4 libusb-dev libqt4-dev perl pkg-config wget libncurses5-dev gcc-arm-none-eabi
-```
-If you do get any issues during the requirements installation, I have found it to help using the synaptic package manager. 
-
-### Clone Fork 
-```sh
-git clone https://github.com/RfidResearchGroup/proxmark3.git
-```
-
-### Change directory into the directory created
-```sh
-cd proxmark3
-```
-
-### Get the latest commits
-```sh
-git pull
-```
-
-### Remove Modem Manager
-```sh
-sudo apt remove modemmanager
-```
-### Reboot Kali
-```sh
- reboot
-```
-
-### Change directory back to proxmark3
-```sh
-cd proxmark3
-```
-
-### Clean and Compile
-Clean and complete compile
-
-```sh
- make clean && make all
-```
-### Check Connection
-Once this is complete run the following comands to make sure the proxmark is being picked up by your computer. 
-
-```sh
-sudo dmesg | grep -i usb
-```
-It should show up as a CDC device:
-```sh
-[10416.555108] usb 2-1.2: Product: PM3
-[10416.555111] usb 2-1.2: Manufacturer: proxmark.org
-[10416.555871] cdc_acm 2-1.2:1.0: ttyACM0: USB ACM device
-```
-
-### Flash the BOOTROM & FULLIMAGE
- ```sh
- client/flasher /dev/ttyACM0 -b bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf
-```
-> **Note**  If you have any issues connecting or during the flash, follow the steps listed [here](https://github.com/RfidResearchGroup/proxmark3/issues/35) and use the command sudo apt remove modemmanager 
-
-
-### Change into the client folder
-
-```sh
-cd client
-```
-
-### Run the client 
- ```sh
-./proxmark3 /dev/ttyACM0
-```
- 
-### Run a test command
- ```sh
-hw tune
-```
-
diff --git a/doc/md/Installation_Instructions/Linux-Installation-Instructions.md b/doc/md/Installation_Instructions/Linux-Installation-Instructions.md
new file mode 100644
index 000000000..27d315359
--- /dev/null
+++ b/doc/md/Installation_Instructions/Linux-Installation-Instructions.md
@@ -0,0 +1,89 @@
+# External resources
+
+You might want to follow one of these external resources to get an overview, but please still read carefully this page as some instructions may vary.
+
+* [Kali Video Installation guide](https://youtu.be/t5eBPS6lV3E "Kali Linux Installation Tutorial")
+* [Ubuntu Video Installation guide](https://youtu.be/DThmkH8CdMo "Ubuntu Installation Tutorial")
+* [ParrotOS Video Installation guide](https://youtu.be/Wl9AsrU4igo "ParrotOS Installation Tutorial")
+
+![Linux Installation Video Screenshot](https://github.com/5w0rdfish/Proxmark3-RDV4-ParrotOS/blob/master/screenshot-www.youtube.com-2019.03.17-20-44-33.png)
+
+* ParrotOS: some further notes can be found at @5w0rdfish repo [Proxmark Installation for Parrot OS](https://github.com/5w0rdfish/Proxmark3-RDV4-ParrotOS)
+* Ubuntu 14.04.2 LTS, 15.10 or 16.04 GC updates on the [Proxmark3 Ubuntu wiki page](https://github.com/Proxmark/proxmark3/wiki/Ubuntu%20Linux)
+* A nice and cool install script made by @daveio is found here: https://github.com/daveio/attacksurface/blob/master/proxmark3/pm3-setup.sh (unavailable?)
+* Iceman has also added this script to the fork. https://github.com/RfidResearchGroup/proxmark3/blob/master/install.sh
+
+
+# Install the required dependencies
+
+## On Debian / Ubuntu / Kali / ParrotOS
+
+First what we want to do is get an update for the system. If you need to upgrade do this **before** the install. An upgrade was carried out prior to following these instructions. 
+
+Update the packages list
+```sh
+sudo apt-get update
+``` 
+Install the requirements
+
+```sh
+sudo apt-get install p7zip git ca-certificates build-essential libreadline5 libreadline-dev \
+libusb-0.1-4 libusb-dev libqt4-dev perl pkg-config wget libncurses5-dev gcc-arm-none-eabi libstdc++-arm-none-eabi-newlib
+```
+
+## On ArchLinux
+
+```sh
+sudo pacman -Sy base-devel p7zip libusb readline ncurses arm-none-eabi-newlib --needed
+```
+```sh
+yaourt -S termcap
+```
+
+# Clone the RRG/Iceman repository
+
+```sh
+git clone https://github.com/RfidResearchGroup/proxmark3.git
+```
+
+# Check ModemManager
+
+**Very important**: make sure ModemManager will not interfer, otherwise it could brick your Proxmark3!
+Read carefully [this page about ModemManager](ModemManager-Must-Be-Discarded.md) and follow its instructions.
+
+# Check connection
+
+Check the proxmark is being picked up by your computer. Plug it in, then:
+
+```sh
+sudo dmesg | grep -i usb
+```
+It should show up as a CDC device:
+```
+usb 2-1.2: Product: PM3
+usb 2-1.2: Manufacturer: proxmark.org
+cdc_acm 2-1.2:1.0: ttyACM0: USB ACM device
+```
+And a new `/dev/ttyACM0` should have appeared.
+
+# Get permissions to use /dev/ttyACM0
+
+Add current user to the proper group to get permission to use `/dev/ttyACM0`.
+
+This step can be done from the RRG/Iceman Proxmark3 repo with:
+
+```sh
+make accessrights
+```
+
+Then, you *need* to logout and login in again for your new group membership to be fully effective.
+
+To test you have the proper read & write rights, plug the Proxmark3 and execute:
+```sh
+[ -r /dev/ttyACM0 ] && [ -w /dev/ttyACM0 ] && echo ok
+```
+It must return `ok`. Otherwise this means you've a permissions problem to fix.
+
+# Compile and use the project
+
+Now you're ready to follow the [compilation instructions](/doc/md/Use_of_Proxmark/0_Compilation-Instructions.md).
diff --git a/doc/md/Installation_Instructions/Mac-OS-X-Homebrew-Installation-Instructions.md b/doc/md/Installation_Instructions/Mac-OS-X-Homebrew-Installation-Instructions.md
index 61ab754d5..0f6151869 100644
--- a/doc/md/Installation_Instructions/Mac-OS-X-Homebrew-Installation-Instructions.md
+++ b/doc/md/Installation_Instructions/Mac-OS-X-Homebrew-Installation-Instructions.md
@@ -1,6 +1,6 @@
-## Homebrew (Mac OS X)
-These instructions comes from @Chrisfu, where I got the proxmark3.rb scriptfile from.
-Further questions about Mac & Homebrew,  contact @Chrisfu  (https://github.com/chrisfu/)
+# Homebrew (Mac OS X)
+These instructions comes from @Chrisfu, where we got the proxmark3.rb scriptfile from.
+For further questions about Mac & Homebrew,  contact @Chrisfu  (https://github.com/chrisfu/)
 
 1. Install homebrew if you haven't yet already done so: http://brew.sh/
 
@@ -8,22 +8,37 @@ Further questions about Mac & Homebrew,  contact @Chrisfu  (https://github.com/c
 
 3. Install Proxmark3: `brew install proxmark3` for stable release or `brew install --HEAD proxmark3` for latest non-stable from GitHub.
 
-Upgrading HomeBrew tap formula
------------------------------
-*This method is useful for those looking to run bleeding-edge versions of iceman's client. Keep this in mind when attempting to update your HomeBrew tap formula as this procedure could easily cause a build to break if an update is unstable on macOS.* 
+## Upgrading HomeBrew tap formula
+
+*This method is useful for those looking to run bleeding-edge versions of RRG/iceman's client. Keep this in mind when attempting to update your HomeBrew tap formula as this procedure could easily cause a build to break if an update is unstable on macOS.* 
 
 Tested on macOS High Sierra 10.13.2
 
-*Note: This assumes you have already installed iceman's fork from HomeBrew as mentioned above*
+*Note: This assumes you have already installed RRG/iceman's fork from HomeBrew as mentioned above*
 
-1. Force HomeBrew to pull the latest source from github
-`brew upgrade --fetch-HEAD RfidResearchGroup/proxmark3`
+Force HomeBrew to pull the latest source from github
+```
+brew upgrade --fetch-HEAD RfidResearchGroup/proxmark3
+```
+
+## Flash the BOOTROM & FULLIMAGE
+
+With your Proxmark3 unplugged from your machine, press and hold the button on your Proxmark3 as you plug it into a USB port. Continue to hold the button until after this step is complete and the `proxmark3-flasher` command outputs "Have a nice day!"*
+
+`$ sudo proxmark3-flasher /dev/tty.usbmodem881 -b /usr/local/Cellar/proxmark3/HEAD-6a710ef/share/firmware/bootrom.elf /usr/local/Cellar/proxmark3/HEAD-6a710ef/share/firmware/fullimage.elf`
+
+## Run the client
+
+```sh
+sudo proxmark3 /dev/tty.usbmodem881
+```
+
+## Next steps
+
+For the next steps, please read the following pages:
+
+* [Validating proxmark client functionality](/doc/md/Use_of_Proxmark/1_Validation.md)
+* [First Use and Verification](/doc/md/Use_of_Proxmark/2_Configuration-and-Verification.md)
+* [Commands & Features](/doc/md/Use_of_Proxmark/3_Commands-and-Features.md)|
  
-2. Flash the bootloader & fullimage.elf
-  * With your Proxmark3 unplugged from your machine, press and hold the button on your Proxmark 3 as you plug it into a USB port. Continue to hold the button until after this step is complete and the `proxmark3-flasher` command outputs "Have a nice day!"*
-   `$ sudo proxmark3-flasher /dev/tty.usbmodem881 -b /usr/local/Cellar/proxmark3/HEAD-6a710ef/share/firmware/bootrom.elf /usr/local/Cellar/proxmark3/HEAD-6a710ef/share/firmware/fullimage.elf`
 
-
-`$ sudo proxmark3-flasher /dev/tty.usbmodem881 `
-
-4. Enjoy the update
diff --git a/doc/md/Installation_Instructions/ModemManager-Must-Be-Discarded.md b/doc/md/Installation_Instructions/ModemManager-Must-Be-Discarded.md
new file mode 100644
index 000000000..68b69ea7b
--- /dev/null
+++ b/doc/md/Installation_Instructions/ModemManager-Must-Be-Discarded.md
@@ -0,0 +1,132 @@
+# If you're a Linux user
+
+ModemManager is a real threat that can lead to a bricked Proxmark3, read this very attentively.
+
+**The problem:**
+
+ModemManager is pre-installed on many different Linux distributions, very probably yours as well.
+It's intended to prepare and configure the mobile broadband (2G/3G/4G) devices, whether they are built-in or dongles.
+Some are serial, so when the Proxmark3 is plugged and a `/dev/ttyACM0` appears, ModemManager attempts to talk to it to see if it's a modem replying to AT commands.
+
+Now imagine what happens when you're flashing your Proxmark3 and ModemManager suddently starts sending bytes to it at the same time...
+Yes it makes the flashing failing. And if it happens while you're flashing the bootloader, it will require a JTAG device to unbrick the Proxmark3.
+
+ModemManager is a threat for the Proxmark3, but also for many other embedded devices, such as some Arduino platforms.
+
+# Solution 1: remove ModemManager
+
+If you don't need ModemManager, the safest is to remove it entirely.
+
+On Debian-alike (Ubuntu, Kali,...):
+```sh
+sudo apt remove modemmanager
+```
+On Archlinux:
+```sh
+sudo pacman -R modemmanager
+```
+
+# Solution 2: disable ModemManager
+
+```sh
+sudo systemctl stop ModemManager
+sudo systemctl disable ModemManager
+```
+
+# Solution 3: use filtering udev rules
+
+If you *really* need ModemManager, e.g. for your 4G device, you'll have to use some filtering rules to make sure it doesn't interfer with the Proxmark3. 
+
+Once you have cloned the Proxmark3 repository, you can run `make udev` to install udev rules that will tell ModemManager to not look at your Proxmark3.
+
+**BEWARE** it will not work if your ModemManager installation is using a `strict` policy, which is the case on some distributions.
+So you'll need first to check what `filter-policy` is used on your distribution:
+
+```sh
+systemctl status ModemManager
+```
+```
+● ModemManager.service - Modem Manager
+   Loaded: loaded (/lib/systemd/system/ModemManager.service...
+   Active: active (running) since ...
+   ...
+   CGroup: /system.slice/ModemManager.service
+           └─XXXX /usr/sbin/ModemManager --filter-policy=strict
+```
+
+If it's using `filter-policy=strict`, either look at [solution 4](#solution-4-use-global-ttyACM-filtering-rule) or change the filter policy of your system.
+
+In any case, it's very important that you test if the filtering is effective before attempting to flash your Proxmark3, see section [Testing ModemManager filtering effectiveness](#Testing-ModemManager-filtering-effectiveness).
+
+# Solution 4: use global ttyACM filtering rule
+
+Edit the system ModemManager configuration:
+```sh
+sudo systemctl edit ModemManager.service
+```
+And add the following content to add a global ttyACM filtering rule:
+```
+[Service]
+Environment="MM_FILTER_RULE_TTY_ACM_INTERFACE=0"
+```
+This will create the following file: `/etc/systemd/system/ModemManager.service.d/override.conf`. Then restart the service:
+```sh
+sudo service ModemManager restart
+```
+
+It's very important that you test if the filtering is effective before attempting to flash your Proxmark3, see section [Testing ModemManager filtering effectiveness](#Testing-ModemManager-filtering-effectiveness).
+
+# Testing ModemManager filtering effectiveness
+
+If you chose to keep ModemManager, test the filtering effectiveness before attempting to flash Proxmark3.
+
+**Reboot**
+
+Turn systemd debug on and watch logs:
+```sh
+sudo mmcli -G DEBUG
+sudo journalctl -f|grep "ModemManager.*\[filter\]"
+```
+Now plug in the Proxmark 3.
+
+If ModemManager interfers, you'll get logs like this:
+```
+ModemManager[xxxxx]: <debug> [filter] (tty/ttyACM0): port allowed: cdc-acm interface reported AT-capable
+```
+It it's the case, you *need to fix your ModemManager issues* before using the Proxmark3.
+
+When ModemManager is properly filtering `/dev/ttyACM0`:
+```
+ModemManager[xxxxx]: <debug> [filter] (tty/ttyACM0) port filtered: forbidden
+```
+If this is the case, you're fine and you can safely use and flash the PRoxmark3 on your system.
+
+To turn systemd debug off again:
+```sh
+sudo mmcli -G ERR
+```
+
+# I didn't read carefully this page and now my Proxmark3 is not responding
+
+First of all, follow the instructions above to make sure ModemManager will not interfer with the Proxmark3 anymore.
+
+Now there are two possibilities:
+
+## Only the fullimage is damaged
+
+If the flashing of the fullimage failed, you can still force the Proxmark to start in bootloader mode by keeping the button pressed while you're plugging it in and while you're attempting to flash it again.
+
+In short:
+
+* unplug device
+* press button and keep it pressed (IMPORTANT)
+* plug in device
+* run flash command `sudo client/flasher /dev/ttyACM0 armsrc/obj/fullimage.elf`
+* wait until flash is finished
+* release button
+* un/plug device
+
+## The bootloader is damaged
+
+If attempting to flash via the button fails, this means your bootloader is corrupted.
+You'll have no other choice than flashing it via an external JTAG instrument.
diff --git a/doc/md/Installation_Instructions/Parrot-OS-Proxmark3-RDV4-installation.md b/doc/md/Installation_Instructions/Parrot-OS-Proxmark3-RDV4-installation.md
deleted file mode 100644
index 7b6187e1a..000000000
--- a/doc/md/Installation_Instructions/Parrot-OS-Proxmark3-RDV4-installation.md
+++ /dev/null
@@ -1,98 +0,0 @@
-
-# Parrot OS Installation
-
-## Notes
-
-Some further notes can be found at @5w0rdfish repo [Proxmark Installation for Parrot OS](https://github.com/5w0rdfish/Proxmark3-RDV4-ParrotOS)
-
-# Video Installation guide
-[![ParrotOS Installation tutorial](https://github.com/5w0rdfish/Proxmark3-RDV4-ParrotOS/blob/master/screenshot-www.youtube.com-2019.03.17-20-44-33.png)](https://youtu.be/Wl9AsrU4igo "ParrotOS Installation Tutorial")
-
-
----
-## Manual Install
-First what we want to do is get an update for the system. If you need to upgrade do this **before** the install
-
-### Update
-```sh
-sudo apt-get update
-``` 
-### Requirements.
-
-```sh
-sudo apt-get install p7zip git build-essential libreadline5 libreadline-dev \
-libusb-0.1-4 libusb-dev libqt4-dev perl pkg-config wget libncurses5-dev gcc-arm-none-eabi
-```
-If you do get any issues during the requirements installation, I have found it to help using the synaptic package manager. 
-
-### Clone Fork 
-```sh
-git clone https://github.com/RfidResearchGroup/proxmark3.git
-```
-
-### Change directory into the directory created
-```sh
-cd proxmark3
-```
-
-### Get the latest commits
-```sh
-git pull
-```
-
-### Make Udev
-Iceman has made the udev script which takes care of the blacklist rules. This should take care of the remove modem manager.
-The make udev command also create's an alias for the pm3 under /dev which you will use to connect to the proxmark. 
-
-```sh
-sudo make udev
-```
-
-> **Note**  If you have any issues connecting or during the flash, follow the steps listed [here](https://github.com/RfidResearchGroup/proxmark3/issues/35) and use the command sudo apt remove modemmanager 
-
-Log out and log back in again. And now we are all set to take the next step. 
-
-### Clean and Compile
-Clean and complete compilation *within the proxmark3 folder*
-
-```sh
- make clean && make all
-```
-### Check Connection
-Once this is complete run the following comands to make sure the proxmark is being picked up by your computer. 
-
-```sh
-sudo dmesg | grep -i usb
-```
-It should show up as a CDC device:
-```sh
-[10416.555108] usb 2-1.2: Product: PM3
-[10416.555111] usb 2-1.2: Manufacturer: proxmark.org
-[10416.555871] cdc_acm 2-1.2:1.0: ttyACM0: USB ACM device
-```
-
-### Flash the BOOTROM & FULLIMAGE
- ```sh
- client/flasher /dev/ttyACM0 -b bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf
-```
-### Change into the client folder
-
-```sh
-cd client
-```
-### Run the client
- ``` sh 
-./proxmark3 /dev/pm #press tab on the keyboard for it to detect the proxmark
-```
-or  
-
-### Run the client 
- ```sh
-./proxmark3 /dev/ttyACM0
-```
- 
-### Run a test command
- ```sh
-hw tune
-```
-
diff --git a/doc/md/Installation_Instructions/Ubuntu-Installation-Instructions.md b/doc/md/Installation_Instructions/Ubuntu-Installation-Instructions.md
deleted file mode 100644
index 6df3b704e..000000000
--- a/doc/md/Installation_Instructions/Ubuntu-Installation-Instructions.md
+++ /dev/null
@@ -1,102 +0,0 @@
-# Setup and build for UBUNTU
-## Notes
-GC made updates to allow this to build easily on Ubuntu 14.04.2 LTS, 15.10 or 16.04
-See the [Proxmark3 Ubuntu wiki page](https://github.com/Proxmark/proxmark3/wiki/Ubuntu%20Linux)
-
-A nice and cool install script made by @daveio is found here: 
-https://github.com/daveio/attacksurface/blob/master/proxmark3/pm3-setup.sh
-
-Iceman has also added this script to the fork.
-https://github.com/RfidResearchGroup/proxmark3/blob/master/install.sh
-
-# Video Installation guide
-[![ParrotOS Installation tutorial](https://github.com/5w0rdfish/Proxmark3-RDV4-ParrotOS/blob/master/screenshot-www.youtube.com-2019.03.17-20-44-33.png)](https://youtu.be/DThmkH8CdMo "Ubuntu Installation Tutorial")
-
----
-## Manual Installation
-### Update
-
-```sh
-sudo apt-get update
-```
-### Requirements
-
-```sh
-sudo apt-get install p7zip git build-essential libreadline5 libreadline-dev libusb-0.1-4 libusb-dev libqt4-dev perl pkg-config wget libncurses5-dev gcc-arm-none-eabi
-```
-
-### Clone Fork 
-
-```sh
-git clone https://github.com/RfidResearchGroup/proxmark3.git
-```
-### Change Directory
-
-```sh
-cd proxmark3
-```
-
-### Get the latest commits
-
-```sh
-git pull
-```
-
-### Install the blacklist rules and add user to dialout group. 
-
-```sh
-sudo make udev
-```
-
-### Restart
-Restart Ubuntu
-
-### Enter proxmark folder
-```sh
-cd proxmark3
-```
-### Clean and Compile
-```sh
-make clean && make all
-```
-### Check Connection
-Once this is complete run the following comands to make sure the proxmark is being picked up by your computer. 
-
-```sh
-sudo dmesg | grep -i usb
-```
-
-### Flash the BOOTROM & FULLIMAGE
- ```sh
- client/flasher /dev/ttyACM0 -b bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf
-```
-
-### Issues 
-If you have issues with the install please try the following below or head on over to the proxmark forum.
-#### Remove Modem Manager
-
-```sh
-sudo apt remove modemmanager
-```
-and then restart ubuntu.
-
-### Change into the client folder
-```sh
-cd client
-```
-	
-### Run the client
- ``` sh 
-./proxmark3 /dev/pm #press tab on the keyboard for it to detect the proxmark
-```
-or  
-
-### Run the client 
- ```sh
-./proxmark3 /dev/ttyACM0
-```
- 
-### Run a test command
- ```sh
-hw tune
-```
diff --git a/doc/md/Installation_Instructions/Windows-Installation-Instructions.md b/doc/md/Installation_Instructions/Windows-Installation-Instructions.md
index 6a20a510f..b140bc168 100644
--- a/doc/md/Installation_Instructions/Windows-Installation-Instructions.md
+++ b/doc/md/Installation_Instructions/Windows-Installation-Instructions.md
@@ -30,54 +30,37 @@ Download the required proxspace repo. https://github.com/Gator96100/ProxSpace/
 Extract 'ProxSpace' to a location on drive without spaces. 
 For example D:\OneDrive\Documents\GitHub is ok whereas C:\My Documents\My Projects\proxspace is not.
 
-### Clone RFID RESEARCH GROUP files
+### Clone the RRG/Iceman repository
 
-Clone fork
 ```sh
 git clone https://github.com/RfidResearchGroup/proxmark3.git
 ```
+
 ### Copy files to Proxspace
 
-Copy all the contents from the proxmark3 folder into the proxspace pm3 folder
+Copy all the contents from the `proxmark3` folder into the proxspace `pm3` folder
 
 ### Run the .bat
 
-Run runme.bat or runme64.bat depending on your Windows architecture.
+Run `runme.bat` or `runme64.bat` depending on your Windows architecture.
 
-Please note you will need to use / as you are using BASH.
+Please note you will need to use `/` as you are using BASH.
 
-### Make 
+### Compile and use the project
 
-CLEAN COMPILE inside the pm3 window.
-```sh
-make clean && make all
-```
-### Flash the image
+Now you're ready to follow the [compilation instructions](/doc/md/Use_of_Proxmark/0_Compilation-Instructions.md).
+
+The only differences are that executables end with `.exe` (e.g. `client/flasher.exe`) and that the Proxmark3 port is one of your `comX` ports where "X" is the com port number assigned to proxmark3 under Windows.
+
+So flashing will resemble
 
-Flash the BOOTROM & FULLIMAGE
 ```sh
 client/flasher.exe comX -b bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf
 ```
-	
-### Run the client
 
-Assuming you have Proxmark3 Windows drivers installed you can run the Proxmark software where "X" is the com port number assigned to proxmark3 under Windows. 
+And running the client will resemble
 
-Change into the client folder
 ```sh
 cd client
-```
-
-Run the client	
-```sh
 ./proxmark3.exe comX
 ```
-
-### Test
-
-Check your firmware revision on the Proxmark III with 
-```sh
-hw ver
-```
-For basic help type help. Or for help on a set of sub commands type the command followed by help. For example hf mf help.
-Make sure you head over to the use of [proxmark area](https://github.com/5w0rdfish/proxmark3/tree/master/Use_of_Proxmark) to help you get on your way!
diff --git a/doc/md/Use_of_Proxmark/0_Compilation-Instructions.md b/doc/md/Use_of_Proxmark/0_Compilation-Instructions.md
new file mode 100644
index 000000000..4950e2f6e
--- /dev/null
+++ b/doc/md/Use_of_Proxmark/0_Compilation-Instructions.md
@@ -0,0 +1,36 @@
+# Compilation instructions
+
+## Get the latest commits
+
+```sh
+cd proxmark3
+git pull
+```
+
+## Clean and compile everything
+
+```sh
+make clean && make all
+```
+
+## Flash the BOOTROM & FULLIMAGE
+
+```sh
+client/flasher /dev/ttyACM0 -b bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf
+```
+
+## Run the client
+
+```sh
+cd client
+./proxmark3 /dev/ttyACM0
+```
+
+## Next steps
+
+For the next steps, please read the following pages:
+
+* [Validating proxmark client functionality](/doc/md/Use_of_Proxmark/1_Validation.md)
+* [First Use and Verification](/doc/md/Use_of_Proxmark/2_Configuration-and-Verification.md)
+* [Commands & Features](/doc/md/Use_of_Proxmark/3_Commands-and-Features.md)|
+ 
diff --git a/doc/md/Use_of_Proxmark/1_Validation.md b/doc/md/Use_of_Proxmark/1_Validation.md
index 334150fe8..e774df4dd 100644
--- a/doc/md/Use_of_Proxmark/1_Validation.md
+++ b/doc/md/Use_of_Proxmark/1_Validation.md
@@ -1,57 +1,86 @@
 ## 1. Validating proxmark client functionality
 
 If all went well you should get some information about the firmware and memory usage as well as the prompt,  something like this.
-We should be able to answer ..can I connect to my proxmark device?   does it respond?
 
->[=] UART Setting serial baudrate 460800
->
->Proxmark3 RFID instrument
->
-> [ CLIENT ]
->
-> client: iceman build for RDV40 with flashmem; smartcard;
->
-> [ ARM ]
->
-> bootrom: iceman/master/4517531c-dirty-unclean 2018-12-13 15:42:24
->
->   os: iceman/master/5a34550a-dirty-unclean 2019-01-07 23:04:07
->
-> [ FPGA ]
->
-> LF image built for 2s30vq100 on 2018/ 9/ 8 at 13:57:51
->
-> HF image built for 2s30vq100 on 2018/ 9/ 3 at 21:40:23
->
-> [ Hardware ]
->
->--= uC: AT91SAM7S512 Rev B
->
->--= Embedded Processor: ARM7TDMI
->
->--= Nonvolatile Program Memory Size: 512K bytes, Used: 247065 bytes (47%) Free: 277223 bytes (53%)
->
->--= Second Nonvolatile Program Memory Size: None
->
->--= Internal SRAM Size: 64K bytes
->
->--= Architecture Identifier: AT91SAM7Sxx Series
->
->--= Nonvolatile Program Memory Type: Embedded Flash Memory
->
-> pm3 -->
+```
 
-### Run the following commands
-    pm3 --> hw status
-    pm3 --> hw version
-    pm3 --> hw tune
+██████╗ ███╗   ███╗ ████╗      ...iceman fork
+██╔══██╗████╗ ████║   ══█║       ...dedicated to RDV40 
+██████╔╝██╔████╔██║ ████╔╝ 
+██╔═══╝ ██║╚██╔╝██║   ══█║     iceman@icesql.net
+██║     ██║ ╚═╝ ██║ ████╔╝    https://github.com/rfidresearchgroup/proxmark3/
+╚═╝     ╚═╝     ╚═╝ ╚═══╝  pre-release v4.0
 
-You are now ready to use your newly upgraded proxmark3 device.  Many commands uses the **h** parameter to show a help text. The client uses a arcaic command structure which will be hard to grasp at first.  Here are some commands to start off with.
+Support iceman on patreon,   https://www.patreon.com/iceman1001/
 
-    pm3 --> hf
-    pm3 --> hf 14a info
-    pm3 --> lf
-    pm3 --> lf search
 
-### Quit client
-    pm3 --> quit
+[=] Using UART port /dev/pm3-0 
+[=] Communicating with PM3 over USB-CDC 
+
+ [ Proxmark3 RFID instrument ] 
+
+
+ [ CLIENT ]
+  client: RRG/Iceman
+
+ [ PROXMARK RDV4 ]
+  external flash:                  present 
+  smartcard reader:                present 
+
+ [ PROXMARK RDV4 Extras ]
+  FPC USART for BT add-on support: absent 
+
+ [ ARM ]
+ bootrom: RRG/Iceman/master/5ab9716e 2019-05-01 11:02:08
+      os: RRG/Iceman/master/6b5a0f83 2019-05-04 23:57:47
+
+ [ FPGA ]
+ LF image built for 2s30vq100 on 2019/ 4/18 at  9:35:32
+ HF image built for 2s30vq100 on 2018/ 9/ 3 at 21:40:23
+
+ [ Hardware ] 
+  --= uC: AT91SAM7S512 Rev B
+  --= Embedded Processor: ARM7TDMI
+  --= Nonvolatile Program Memory Size: 512K bytes, Used: 250913 bytes (48%) Free: 273375 bytes (52%)
+  --= Second Nonvolatile Program Memory Size: None
+  --= Internal SRAM Size: 64K bytes
+  --= Architecture Identifier: AT91SAM7Sxx Series
+  --= Nonvolatile Program Memory Type: Embedded Flash Memory
+
+
+pm3 --> 
+```
+
+This `pm3 --> ` is the Proxmark3 interactive prompt.
+
+
+### To get interactive help
+
+For basic help type `help`. Or for help on a set of sub commands type the command followed by `help`. For example `hf mf help`.
+
+### First tests
+
+These commands will return some info about your Proxmark software and hardware status.
+```
+pm3 --> hw status
+pm3 --> hw version
+pm3 --> hw tune
+```
+
+You are now ready to use your newly flashed proxmark3 device.  Many commands uses the `h` parameter to show a help text.
+
+### To quit the client
+```
+pm3 --> quit
+```
+or simple press `CTRL-D`.
+
+## Next steps
+
+Some configuration steps are still needed.
+
+For the next steps, please read the following pages:
+
+* [First Use and Verification](/doc/md/Use_of_Proxmark/2_Configuration-and-Verification.md)
+* [Commands & Features](/doc/md/Use_of_Proxmark/3_Commands-and-Features.md)|
+ 
diff --git a/doc/md/Use_of_Proxmark/2_Configuration-and-Verification.md b/doc/md/Use_of_Proxmark/2_Configuration-and-Verification.md
index e226652c6..97353c4c2 100644
--- a/doc/md/Use_of_Proxmark/2_Configuration-and-Verification.md
+++ b/doc/md/Use_of_Proxmark/2_Configuration-and-Verification.md
@@ -1,38 +1,56 @@
 ### First things on your RDV40
 You will need to run these commands to make sure your rdv4 is prepared
-
-    pm3 --> mem load f default_keys m
-    pm3 --> mem load f default_pwd t
-    pm3 --> mem load f default_iclass_keys i
-    pm3 --> lf t55xx deviceconfig a 29 b 17 c 15 d 47 e 15 p
+```
+pm3 --> mem load f default_keys m
+pm3 --> mem load f default_pwd t
+pm3 --> mem load f default_iclass_keys i
+pm3 --> lf t55xx deviceconfig a 29 b 17 c 15 d 47 e 15 p
+```
 
 ### Verify sim module firmware version
+
 To make sure you got the latest sim module firmware.
+
 _Lastest version is v3.11_
 
-    pm3 --> hw status
+```
+pm3 --> hw status
+```
 
 Find version in the long output,  look for these two lines
 
-    #db# Smart card module (ISO 7816)
-    #db#   version.................v2.06
+```
+#db# Smart card module (ISO 7816)
+#db#   version.................v2.06
+```
 
-This version is obselete. The following command upgrades your device sim module firmware.
-Don't not turn of your device during the execution of this command.
+This version is obsolete. The following command upgrades your device sim module firmware.
+Don't not turn off your device during the execution of this command!!
 
-    pm3 --> sc upgrade f ../tools/simmodule/SIM011.BIN 
-    
-You get the following output,  this is a successful execution.    
-    
-    [!] WARNING - Smartcard socket firmware upgrade.          
-    [!] A dangerous command, do wrong and you will brick the smart card socket          
-    [+] Smartcard socket firmware uploading to PM3          
-    ..
-    [+] Smartcard socket firmware updating,  don't turn off your PM3!          
-    #db# FW 0000          
-    #db# FW 0080          
-    #db# FW 0100          
-    #db# FW 0180          
-    #db# FW 0200          
-    #db# FW 0280          
-    [+] Smartcard socket firmware upgraded successful        
+```
+pm3 --> sc upgrade f ../tools/simmodule/SIM011.BIN 
+```
+
+You get the following output if the execution was successful:
+
+```
+[!] WARNING - Smartcard socket firmware upgrade.
+[!] A dangerous command, do wrong and you will brick the smart card socket
+[+] Smartcard socket firmware uploading to PM3
+..
+[+] Smartcard socket firmware updating,  don't turn off your PM3!
+#db# FW 0000
+#db# FW 0080
+#db# FW 0100
+#db# FW 0180
+#db# FW 0200
+#db# FW 0280
+[+] Smartcard socket firmware upgraded successful        
+```
+
+## Next steps
+
+For the next steps, please read the following page:
+
+* [Commands & Features](/doc/md/Use_of_Proxmark/3_Commands-and-Features.md)|
+ 
diff --git a/doc/md/Use_of_Proxmark/3_Commands-and-Features.md b/doc/md/Use_of_Proxmark/3_Commands-and-Features.md
index ecc9aae0f..deb7036d7 100644
--- a/doc/md/Use_of_Proxmark/3_Commands-and-Features.md
+++ b/doc/md/Use_of_Proxmark/3_Commands-and-Features.md
@@ -1,21 +1,37 @@
 
 # Commands and Features
 
+Please make sure you've gone through the following pages firstly:
+
+* [Compilation Instructions](/doc/md/Use_of_Proxmark/0_Compilation-Instructions.md)
+* [Validating proxmark client functionality](/doc/md/Use_of_Proxmark/1_Validation.md)
+* [First Use and Verification](/doc/md/Use_of_Proxmark/2_Configuration-and-Verification.md)
+
+## To get interactive help
+
+As seen before, for basic help type `help`. Or for help on a set of sub commands type the command followed by `help`. For example `hf mf help`.  Many commands uses the `h` parameter to show a help text.
+
 ## New Features in RDV4
 
 Further details coming soon
 
-### Run the following commands
-    pm3 --> hw status
-    pm3 --> hw version
-    pm3 --> hw tune
+## Useful commands
 
-You are now ready to use your newly upgraded proxmark3 device.  Many commands uses the **h** parameter to show a help text. The client uses a arcaic command structure which will be hard to grasp at first.  Here are some commands to start off with.
+Here are some commands to start off with.
 
-    pm3 --> hf
-    pm3 --> hf 14a info
-    pm3 --> lf
-    pm3 --> lf search
+To get an overview of the available commands for LF RFID and HF RFID:
+```
+pm3 --> lf
+pm3 --> hf
+```
 
-### Quit client
-    pm3 --> quit
+To search quickly for known LF or HF tags:
+```
+pm3 --> lf search
+pm3 --> hf search
+```
+
+To get info on a ISO14443-A tag:
+```
+pm3 --> hf 14a info
+```

From d7109f0d664de03a75f21ffe2a6879b2fedbbdb8 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 5 May 2019 20:05:02 +0200
Subject: [PATCH 1594/1938] minor tweaks in doc

---
 README.md                                                  | 2 ++
 doc/md/Use_of_Proxmark/0_Compilation-Instructions.md       | 2 +-
 doc/md/Use_of_Proxmark/1_Validation.md                     | 2 +-
 doc/md/Use_of_Proxmark/2_Configuration-and-Verification.md | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index b18c6b640..b8ad98c99 100644
--- a/README.md
+++ b/README.md
@@ -44,7 +44,9 @@ This fork now compiles just fine on
 If you intend to contribute to the code, please read the [coding style notes](HACKING.md) first.
 
 Internal notes on [Coverity Scan Config & Run](/doc/md/Development/Coverity-Scan-Config-%26-Run.md).
+
 ---
+
 ## Why didn't you base it on official PM3 Master?
 
 The separation from official pm3 repo gives us a lot of freedom to create a firmware/client that suits the RDV40 features. We don't want to mess up the official pm3 repo with RDV40 specific code.
diff --git a/doc/md/Use_of_Proxmark/0_Compilation-Instructions.md b/doc/md/Use_of_Proxmark/0_Compilation-Instructions.md
index 4950e2f6e..ffe312aac 100644
--- a/doc/md/Use_of_Proxmark/0_Compilation-Instructions.md
+++ b/doc/md/Use_of_Proxmark/0_Compilation-Instructions.md
@@ -32,5 +32,5 @@ For the next steps, please read the following pages:
 
 * [Validating proxmark client functionality](/doc/md/Use_of_Proxmark/1_Validation.md)
 * [First Use and Verification](/doc/md/Use_of_Proxmark/2_Configuration-and-Verification.md)
-* [Commands & Features](/doc/md/Use_of_Proxmark/3_Commands-and-Features.md)|
+* [Commands & Features](/doc/md/Use_of_Proxmark/3_Commands-and-Features.md)
  
diff --git a/doc/md/Use_of_Proxmark/1_Validation.md b/doc/md/Use_of_Proxmark/1_Validation.md
index e774df4dd..507648e64 100644
--- a/doc/md/Use_of_Proxmark/1_Validation.md
+++ b/doc/md/Use_of_Proxmark/1_Validation.md
@@ -82,5 +82,5 @@ Some configuration steps are still needed.
 For the next steps, please read the following pages:
 
 * [First Use and Verification](/doc/md/Use_of_Proxmark/2_Configuration-and-Verification.md)
-* [Commands & Features](/doc/md/Use_of_Proxmark/3_Commands-and-Features.md)|
+* [Commands & Features](/doc/md/Use_of_Proxmark/3_Commands-and-Features.md)
  
diff --git a/doc/md/Use_of_Proxmark/2_Configuration-and-Verification.md b/doc/md/Use_of_Proxmark/2_Configuration-and-Verification.md
index 97353c4c2..736ef70a5 100644
--- a/doc/md/Use_of_Proxmark/2_Configuration-and-Verification.md
+++ b/doc/md/Use_of_Proxmark/2_Configuration-and-Verification.md
@@ -52,5 +52,5 @@ You get the following output if the execution was successful:
 
 For the next steps, please read the following page:
 
-* [Commands & Features](/doc/md/Use_of_Proxmark/3_Commands-and-Features.md)|
+* [Commands & Features](/doc/md/Use_of_Proxmark/3_Commands-and-Features.md)
  

From 65bd945b54b44e38d909653124761a51c13b2e32 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 5 May 2019 22:04:35 +0200
Subject: [PATCH 1595/1938] style

---
 client/cmdhf.c     |  2 +-
 client/comms.c     | 20 ++++++++++----------
 client/proxmark3.c |  2 +-
 client/ui.c        |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/client/cmdhf.c b/client/cmdhf.c
index 40bd863cb..24d30d40c 100644
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -91,7 +91,7 @@ int CmdHFTune(const char *Cmd) {
         PrintAndLogEx(WARNING, "Timeout while waiting for Proxmark HF measure, aborting");
         return PM3_ETIMEOUT;
     }
-    if (resp.status!=PM3_EOPABORTED)
+    if (resp.status != PM3_EOPABORTED)
         return resp.status;
     return PM3_SUCCESS;
 }
diff --git a/client/comms.c b/client/comms.c
index 0acec93d4..516318df1 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -353,7 +353,7 @@ __attribute__((force_align_arg_pointer))
         rxlen = 0;
         bool ACK_received = false;
         bool error = false;
-        
+
         pthread_mutex_lock(&spMutex);
 
         if (uart_receive(sp, (uint8_t *)&rx_raw.pre, sizeof(PacketResponseNGPreamble), &rxlen) && (rxlen == sizeof(PacketResponseNGPreamble))) {
@@ -463,9 +463,9 @@ __attribute__((force_align_arg_pointer))
                 error = true;
             }
         }
-        
+
         pthread_mutex_unlock(&spMutex);
-                        
+
         // TODO if error, shall we resync ?
 
         pthread_mutex_lock(&txBufferMutex);
@@ -484,7 +484,7 @@ __attribute__((force_align_arg_pointer))
         }
 
         if (txBuffer_pending) {
-            
+
             pthread_mutex_lock(&spMutex);
             if (txBufferNGLen) { // NG packet
                 if (!uart_send(sp, (uint8_t *) &txBufferNG, txBufferNGLen)) {
@@ -499,7 +499,7 @@ __attribute__((force_align_arg_pointer))
                 }
             }
             pthread_mutex_unlock(&spMutex);
-            
+
             txBuffer_pending = false;
 
             // tell main thread that txBuffer is empty
@@ -603,17 +603,17 @@ int TestProxmark(void) {
             if (conn.send_via_fpc_usart) {
                 PrintAndLogEx(INFO, "UART Serial baudrate: " _YELLOW_("%u") "\n", conn.uart_speed);
             }
-           
+
             // reconfigure.
             if (conn.send_via_fpc_usart == false) {
 #if defined(_WIN32)
                 pthread_mutex_lock(&spMutex);
-#endif                
+#endif
                 int res = uart_reconfigure_timeouts(sp, UART_USB_CLIENT_RX_TIMEOUT_MS);
 #if defined(_WIN32)
                 pthread_mutex_unlock(&spMutex);
 #endif
-                if ( res != PM3_SUCCESS ) {
+                if (res != PM3_SUCCESS) {
                     PrintAndLogEx(ERR, "UART reconfigure failed");
                     return res;
                 }
@@ -696,7 +696,7 @@ bool WaitForResponseTimeoutW(uint32_t cmd, PacketResponseNG *response, size_t ms
 
     __atomic_store_n(&timeout_start_time,  msclock(), __ATOMIC_SEQ_CST);
     uint64_t tmp_clk;
-    
+
     // Wait until the command is received
     while (true) {
 
@@ -780,7 +780,7 @@ static bool dl_it(uint8_t *dest, uint32_t bytes, uint32_t start_index, PacketRes
     uint32_t bytes_completed = 0;
     __atomic_store_n(&timeout_start_time,  msclock(), __ATOMIC_SEQ_CST);
     uint64_t tmp_clk;
-    
+
     // Add delay depending on the communication channel & speed
     if (ms_timeout != (size_t) -1)
         ms_timeout += communication_delay();
diff --git a/client/proxmark3.c b/client/proxmark3.c
index 58b6a5325..170d97b58 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -496,7 +496,7 @@ int main(int argc, char *argv[]) {
         CloseProxmark();
         session.pm3_present = false;
     }
-    
+
     if (!session.pm3_present)
         PrintAndLogEx(INFO, "Running in " _YELLOW_("OFFLINE") "mode. Check \"%s -h\" if it's not what you want.\n", exec_name);
 
diff --git a/client/ui.c b/client/ui.c
index 8049f128f..a2a364536 100644
--- a/client/ui.c
+++ b/client/ui.c
@@ -84,7 +84,7 @@ void PrintAndLogEx(logLevel_t level, const char *fmt, ...) {
         case WARNING:
             strncpy(prefix, _CYAN_("[!]"), sizeof(prefix) - 1);
             break;
-        case INFO:       
+        case INFO:
             strncpy(prefix, _YELLOW_("[=]"), sizeof(prefix) - 1);
             break;
         case NORMAL:

From eb7aa033ff7b3b28e633792a43aea726094f1812 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 5 May 2019 22:34:22 +0200
Subject: [PATCH 1596/1938] Add fast mode support for RX NG frames

---
 client/comms.c | 11 ++++++++---
 client/comms.h |  1 +
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/client/comms.c b/client/comms.c
index 516318df1..2c809cae7 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -374,16 +374,19 @@ __attribute__((force_align_arg_pointer))
                     } else {
 
 
-                        if (rx.ng) {
+                        if (rx.ng) {      // Received a valid NG frame
                             memcpy(&rx.data, &rx_raw.data, length);
                             rx.length = length;
+                            if ((rx.cmd == conn.last_command) && (rx.status == PM3_SUCCESS)) {
+                                ACK_received = true;
+                            }
                         } else {
                             uint64_t arg[3];
                             if (length < sizeof(arg)) {
                                 PrintAndLogEx(WARNING, "Received MIX packet frame with incompatible length: 0x%04x", length);
                                 error = true;
                             }
-                            if (!error) {
+                            if (!error) { // Received a valid MIX frame
                                 memcpy(arg, &rx_raw.data, sizeof(arg));
                                 rx.oldarg[0] = arg[0];
                                 rx.oldarg[1] = arg[1];
@@ -414,7 +417,7 @@ __attribute__((force_align_arg_pointer))
                         }
                     }
                 }
-                if (!error) {
+                if (!error) {             // Received a valid OLD frame
 #ifdef COMMS_DEBUG
                     PrintAndLogEx(NORMAL, "Receiving %s:", rx.ng ? "NG" : "MIX");
 #endif
@@ -491,12 +494,14 @@ __attribute__((force_align_arg_pointer))
                     //counter_to_offline++;
                     PrintAndLogEx(WARNING, "sending bytes to Proxmark3 device " _RED_("failed"));
                 }
+                conn.last_command = txBufferNG.pre.cmd;
                 txBufferNGLen = 0;
             } else {
                 if (!uart_send(sp, (uint8_t *) &txBuffer, sizeof(PacketCommandOLD))) {
                     //counter_to_offline++;
                     PrintAndLogEx(WARNING, "sending bytes to Proxmark3 device " _RED_("failed"));
                 }
+                conn.last_command = txBuffer.cmd;
             }
             pthread_mutex_unlock(&spMutex);
 
diff --git a/client/comms.h b/client/comms.h
index b34c03f55..ff1edbbcc 100644
--- a/client/comms.h
+++ b/client/comms.h
@@ -49,6 +49,7 @@ typedef struct {
     bool send_via_fpc_usart;
     // To memorise baudrate
     uint32_t uart_speed;
+    uint16_t last_command;
 } communication_arg_t;
 
 extern communication_arg_t conn;

From cffd14a96b98a89c13710ece2989cf561918ca42 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 6 May 2019 14:11:23 +0200
Subject: [PATCH 1597/1938] chg: reconnect to a disconnected proxmark3 device
 without restarting the client.   Old functionality restored :) chg: renamed
 thread chg: easier if-statements for USART

---
 client/comms.c     | 96 +++++++++++++++++++++++-----------------------
 client/comms.h     |  2 +
 client/proxmark3.c | 31 ++++++---------
 3 files changed, 63 insertions(+), 66 deletions(-)

diff --git a/client/comms.c b/client/comms.c
index 2c809cae7..1f3fbb30a 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -22,11 +22,13 @@
 // Serial port that we are communicating with the PM3 on.
 static serial_port sp = NULL;
 static char *serial_port_name = NULL;
+static uint32_t _speed = 0;
 
 communication_arg_t conn;
 capabilities_t pm3_capabilities;
 
-static pthread_t USB_communication_thread;
+static pthread_t communication_thread;
+static bool comm_thread_dead = false;
 
 // Transmit buffer.
 static PacketCommandOLD txBuffer;
@@ -304,33 +306,10 @@ static void PacketResponseReceived(PacketResponseNG *packet) {
     }
 }
 
-/*
-bool hookUpPM3() {
-    bool ret = false;
-    sp = uart_open( comport, speed );
-
-    if (sp == INVALID_SERIAL_PORT) {
-        PrintAndLogEx(WARNING, "Reconnect failed, retrying...  (reason: invalid serial port)\n");
-        sp = NULL;
-        serial_port_name = NULL;
-        ret = false;
-        session.pm3_present = false;
-    } else if (sp == CLAIMED_SERIAL_PORT) {
-        PrintAndLogEx(WARNING, "Reconnect failed, retrying... (reason: serial port is claimed by another process)\n");
-        sp = NULL;
-        serial_port_name = NULL;
-        ret = false;
-        session.pm3_present = false;
-    } else {
-        PrintAndLogEx(SUCCESS, "Proxmark3 reconnected\n");
-        serial_port_name = ;
-        ret = true;
-        session.pm3_present = true;
-    }
-    return ret;
-}
-*/
 
+// The communications thread.
+// signals to main thread when a response is ready to process.
+// 
 static void
 #ifdef __has_attribute
 #if __has_attribute(force_align_arg_pointer)
@@ -340,20 +319,27 @@ __attribute__((force_align_arg_pointer))
 *uart_communication(void *targ) {
     communication_arg_t *connection = (communication_arg_t *)targ;
     uint32_t rxlen;
-
+    uint8_t counter_to_offline = 0;
     PacketResponseNG rx;
     PacketResponseNGRaw rx_raw;
-    //int counter_to_offline = 0;
 
 #if defined(__MACH__) && defined(__APPLE__)
     disableAppNap("Proxmark3 polling UART");
 #endif
 
+// is this connection->run a cross thread call?
+
     while (connection->run) {
         rxlen = 0;
         bool ACK_received = false;
         bool error = false;
 
+        // three failed attempts
+        if ( counter_to_offline >= 3 ) {
+            __atomic_test_and_set(&comm_thread_dead, __ATOMIC_SEQ_CST);
+            break;
+        }
+
         pthread_mutex_lock(&spMutex);
 
         if (uart_receive(sp, (uint8_t *)&rx_raw.pre, sizeof(PacketResponseNGPreamble), &rxlen) && (rxlen == sizeof(PacketResponseNGPreamble))) {
@@ -491,14 +477,14 @@ __attribute__((force_align_arg_pointer))
             pthread_mutex_lock(&spMutex);
             if (txBufferNGLen) { // NG packet
                 if (!uart_send(sp, (uint8_t *) &txBufferNG, txBufferNGLen)) {
-                    //counter_to_offline++;
+                    counter_to_offline++;
                     PrintAndLogEx(WARNING, "sending bytes to Proxmark3 device " _RED_("failed"));
                 }
                 conn.last_command = txBufferNG.pre.cmd;
                 txBufferNGLen = 0;
             } else {
                 if (!uart_send(sp, (uint8_t *) &txBuffer, sizeof(PacketCommandOLD))) {
-                    //counter_to_offline++;
+                    counter_to_offline++;
                     PrintAndLogEx(WARNING, "sending bytes to Proxmark3 device " _RED_("failed"));
                 }
                 conn.last_command = txBuffer.cmd;
@@ -514,18 +500,30 @@ __attribute__((force_align_arg_pointer))
         pthread_mutex_unlock(&txBufferMutex);
     }
 
-    // when this reader thread dies, we close the serial port.
+    // when thread dies, we close the serial port.
     uart_close(sp);
     sp = NULL;
 
 #if defined(__MACH__) && defined(__APPLE__)
     enableAppNap();
 #endif
-
+   
     pthread_exit(NULL);
     return NULL;
 }
 
+bool IsCommunicationThreadDead(void) {
+    return comm_thread_dead;
+}
+
+bool ReConnectProxmark(void) {   
+   char *port = serial_port_name;
+   bool res = OpenProxmark(port, true, 20, false, _speed);
+   if ( res )
+        __atomic_clear(&comm_thread_dead, __ATOMIC_SEQ_CST);
+   return res;
+}
+
 bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode, uint32_t speed) {
 
     char *portname = (char *)port;
@@ -548,16 +546,17 @@ bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode,
     if (sp == INVALID_SERIAL_PORT) {
         PrintAndLogEx(WARNING, "\n" _RED_("ERROR:") "invalid serial port " _YELLOW_("%s"), portname);
         sp = NULL;
-        serial_port_name = NULL;
+        //serial_port_name = NULL;
         return false;
     } else if (sp == CLAIMED_SERIAL_PORT) {
         PrintAndLogEx(WARNING, "\n" _RED_("ERROR:") "serial port " _YELLOW_("%s") " is claimed by another process", portname);
         sp = NULL;
-        serial_port_name = NULL;
+        //serial_port_name = NULL;
         return false;
     } else {
-        // start the USB communication thread
+        // start the communication thread
         serial_port_name = portname;
+        _speed = speed;
         conn.run = true;
         conn.block_after_ACK = flash_mode;
         // Flags to tell where to add CRC on sent replies
@@ -566,7 +565,7 @@ bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode,
         // "Session" flag, to tell via which interface next msgs should be sent: USB or FPC USART
         conn.send_via_fpc_usart = false;
 
-        pthread_create(&USB_communication_thread, NULL, &uart_communication, &conn);
+        pthread_create(&communication_thread, NULL, &uart_communication, &conn);
 
         fflush(stdout);
         // create a mutex to avoid interlacing print commands from our different threads
@@ -583,16 +582,20 @@ int TestProxmark(void) {
     uint8_t data[len];
     for (uint16_t i = 0; i < len; i++)
         data[i] = i & 0xFF;
+    
     SendCommandNG(CMD_PING, data, len);
+
+    uint32_t timeout = 1000;
+    
 #ifdef USART_SLOW_LINK
+    timeout = 10000;
     // 10s timeout for slow FPC, e.g. over BT
     // as this is the very first command sent to the pm3
-    // that initiates the BT connection
-    if (WaitForResponseTimeoutW(CMD_PING, &resp, 10000, false)) {
-#else
-    if (WaitForResponseTimeoutW(CMD_PING, &resp, 1000, false)) {
+    // that initiates the BT connection    
 #endif
 
+    if (WaitForResponseTimeoutW(CMD_PING, &resp, timeout, false)) {
+        
         bool error = false;
         if (len)
             error = memcmp(data, resp.data.asBytes, len) != 0;
@@ -600,6 +603,7 @@ int TestProxmark(void) {
             return PM3_EIO;
 
         SendCommandNG(CMD_CAPABILITIES, NULL, 0);
+        
         if (WaitForResponseTimeoutW(CMD_PING, &resp, 1000, false)) {
             memcpy(&pm3_capabilities, resp.data.asBytes, resp.length);
             conn.send_via_fpc_usart = pm3_capabilities.via_fpc;
@@ -619,10 +623,8 @@ int TestProxmark(void) {
                 pthread_mutex_unlock(&spMutex);
 #endif
                 if (res != PM3_SUCCESS) {
-                    PrintAndLogEx(ERR, "UART reconfigure failed");
                     return res;
                 }
-
             }
             return PM3_SUCCESS;
         } else {
@@ -637,11 +639,11 @@ void CloseProxmark(void) {
     conn.run = false;
 
 #ifdef __BIONIC__
-    if (USB_communication_thread != 0) {
-        pthread_join(USB_communication_thread, NULL);
+    if (communication_thread != 0) {
+        pthread_join(communication_thread, NULL);
     }
 #else
-    pthread_join(USB_communication_thread, NULL);
+    pthread_join(communication_thread, NULL);
 #endif
 
     if (sp) {
@@ -660,7 +662,7 @@ void CloseProxmark(void) {
     // Clean up our state
     sp = NULL;
     serial_port_name = NULL;
-    memset(&USB_communication_thread, 0, sizeof(pthread_t));
+    memset(&communication_thread, 0, sizeof(pthread_t));
 }
 
 // Gives a rough estimate of the communication delay based on channel & baudrate
diff --git a/client/comms.h b/client/comms.h
index ff1edbbcc..70c0526bf 100644
--- a/client/comms.h
+++ b/client/comms.h
@@ -62,6 +62,8 @@ void SendCommandMIX(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, v
 void clearCommandBuffer(void);
 
 #define FLASHMODE_SPEED 460800
+bool IsCommunicationThreadDead(void);
+bool ReConnectProxmark(void);
 bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode, uint32_t speed);
 int TestProxmark(void);
 void CloseProxmark(void);
diff --git a/client/proxmark3.c b/client/proxmark3.c
index 170d97b58..c5bfb1cb2 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -52,6 +52,7 @@ static void showBanner(void) {
     fflush(stdout);
 }
 
+// Main thread of PM3 Client
 void
 #ifdef __has_attribute
 #if __has_attribute(force_align_arg_pointer)
@@ -95,25 +96,16 @@ main_loop(char *script_cmds_file, char *script_cmd) {
     // loops every time enter is pressed...
     while (1) {
         bool printprompt = false;
-        // this should hook up the PM3 again.
-        /*
-        if ( !session.pm3_present ) {
-
-            // sets the global variable, SP and offline)
-            session.pm3_present = hookUpPM3();
-
-            // usb and the reader_thread is NULL,  create a new reader thread.
-            if (session.pm3_present) {
-                rarg.run = 1;
-                pthread_create(&reader_thread, NULL, &uart_receiver, &rarg);
-                // cache Version information now:
-                if ( execCommand || script_cmds_file || stdinOnPipe)
-                    CmdVersion("s");
-                else
-                    CmdVersion("");
+        
+        // If communications thread goes down. Device disconnected then this should hook up PM3 again.
+        if ( IsCommunicationThreadDead() ) {
+            PrintAndLogEx(ERR, _RED_("ERROR:") "cannot communicate with the Proxmark, waiting for device to reconnect...");
+            session.pm3_present = ReConnectProxmark();
+            if (session.pm3_present && (TestProxmark() != PM3_SUCCESS)) {
+                session.pm3_present = false;
+                continue;
             }
         }
-        */
 
         // If there is a script file
         if (sf) {
@@ -190,12 +182,13 @@ main_loop(char *script_cmds_file, char *script_cmd) {
             if (cmd[0] != '\0') {
                 if (printprompt)
                     PrintAndLogEx(NORMAL, PROXPROMPT"%s", cmd);
+                
                 int ret = CommandReceived(cmd);
+                
                 HIST_ENTRY *entry = history_get(history_length);
                 if ((!entry) || (strcmp(entry->line, cmd) != 0))
                     add_history(cmd);
 
-//                PrintAndLogEx(NORMAL, "RETVAL: %d\n", ret);
                 // exit or quit
                 if (ret == PM3_EFATAL)
                     break;
@@ -409,7 +402,7 @@ int main(int argc, char *argv[]) {
             continue;
         }
 
-        // execute pm3 command
+        // execute pm3 command file
         if (strcmp(argv[i], "-s") == 0 || strcmp(argv[i], "--script-file") == 0) {
             if (i + 1 == argc) {
                 PrintAndLogEx(ERR, _RED_("ERROR:") "missing script file specification after -s\n");

From 3a902a7a4c4cfaa72aa6815a1e72d185ad5b23a4 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 6 May 2019 14:38:56 +0200
Subject: [PATCH 1598/1938] chg: add some helptexts

---
 client/cmdhw.c | 48 +++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 37 insertions(+), 11 deletions(-)

diff --git a/client/cmdhw.c b/client/cmdhw.c
index 68f0609a1..ce286fb8e 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -23,6 +23,32 @@
 
 static int CmdHelp(const char *Cmd);
 
+static int usage_hw_detectreader(void) {
+    PrintAndLogEx(NORMAL, "Start to detect presences of reader field");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  hw detectreader [h] <L|H>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "           h          This help");
+    PrintAndLogEx(NORMAL, "           <type>     L = 125/134 kHz, H = 13.56 mHz");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      hw detectreader L");
+    return PM3_SUCCESS;
+}
+
+static int usage_hw_setmux(void) {
+    PrintAndLogEx(NORMAL, "Set mux mode");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  hw setmux [h] <lopkd | loraw | hipkd | hiraw>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "           h          This help");
+    PrintAndLogEx(NORMAL, "           <type>     Low peak, Low raw, Hi peak, Hi raw");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      hw setmux lopkd");
+    return PM3_SUCCESS;
+}
+
 static void lookupChipID(uint32_t iChipID, uint32_t mem_used) {
     char asBuff[120];
     memset(asBuff, 0, sizeof(asBuff));
@@ -309,18 +335,16 @@ static void lookupChipID(uint32_t iChipID, uint32_t mem_used) {
 
 static int CmdDetectReader(const char *Cmd) {
     uint16_t arg = 0;
-    char c = tolower(Cmd[0]);
+    char c = toupper(Cmd[0]);
     switch (c) {
-        case 'l':
+        case 'L':
             arg = 1;
             break;
-        case 'h':
+        case 'H':
             arg = 2;
             break;
         default: {
-            PrintAndLogEx(NORMAL, "use 'detectreader'");
-            PrintAndLogEx(NORMAL, "    'detectreader l'   -- 125/134 kHz");
-            PrintAndLogEx(NORMAL, "    'detectreader h'   -- 13.56 mHz");
+            usage_hw_detectreader();
             return PM3_EINVARG;
         }
     }
@@ -388,17 +412,19 @@ static int CmdSetDivisor(const char *Cmd) {
 static int CmdSetMux(const char *Cmd) {
 
     if (strlen(Cmd) < 5) {
-        PrintAndLogEx(NORMAL, "expected:  lopkd | loraw | hipkd | hiraw");
+        usage_hw_setmux();
         return PM3_EINVARG;
     }
 
-    uint16_t arg = 0;
+    str_lower((char *)Cmd);
+ 
+    uint8_t arg = 0;
     if (strcmp(Cmd, "lopkd") == 0)      arg = 0;
     else if (strcmp(Cmd, "loraw") == 0) arg = 1;
     else if (strcmp(Cmd, "hipkd") == 0) arg = 2;
     else if (strcmp(Cmd, "hiraw") == 0) arg = 3;
     else {
-        PrintAndLogEx(NORMAL, "expected:  lopkd | loraw | hipkd | hiraw");
+        usage_hw_setmux();
         return PM3_EINVARG;
     }
     clearCommandBuffer();
@@ -421,8 +447,8 @@ static int CmdStatus(const char *Cmd) {
     clearCommandBuffer();
     PacketResponseNG resp;
     SendCommandOLD(CMD_STATUS, 0, 0, 0, NULL, 0);
-    if (!WaitForResponseTimeout(CMD_ACK, &resp, 1900))
-        PrintAndLogEx(NORMAL, "Status command failed. USB Speed Test timed out");
+    if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000))
+        PrintAndLogEx(NORMAL, "Status command failed. Communication speed test timed out");
     return PM3_SUCCESS;
 }
 

From dd82c42588df4d0c70f325500b4b3cda8d5f4881 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 6 May 2019 15:37:40 +0200
Subject: [PATCH 1599/1938] fix #185 - Only -mno-ms-bitfields on MINGW 
 (@doegox)

---
 client/Makefile | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/client/Makefile b/client/Makefile
index bc6770bb7..c9069a276 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -41,6 +41,8 @@ MV = mv
 ENV_LDFLAGS := $(LDFLAGS)
 ENV_CFLAGS := $(CFLAGS)
 
+platform = $(shell uname)
+
 VPATH = ../common ../zlib ../uart
 OBJDIR = obj
 
@@ -55,11 +57,14 @@ CBORLIB = $(CBORLIBPATH)/tinycbor.a
 LIBS = -I../zlib -I../uart -I../liblua -I$(MBEDTLSLIBPATH) -I$(JANSSONLIBPATH) -I$(CBORLIBPATH)
 INCLUDES_CLIENT = -I. -I../include -I../common -I/opt/local/include $(LIBS)
 LDFLAGS = $(ENV_LDFLAGS)
-CFLAGS = $(ENV_CFLAGS) -std=c99 -D_ISOC99_SOURCE -DPRESETS $(INCLUDES_CLIENT) -Wall -g -O3 -mno-ms-bitfields
+
+CFLAGS = $(ENV_CFLAGS) -std=c99 -D_ISOC99_SOURCE -DPRESETS $(INCLUDES_CLIENT) -Wall -g -O3
+ifneq (,$(findstring MINGW,$(platform)))
+    CFLAGS += -mno-ms-bitfields
+endif
 CXXFLAGS = -I../include -Wall -O3
 
 LUAPLATFORM = generic
-platform = $(shell uname)
 ifneq (,$(findstring MINGW,$(platform)))
     LUAPLATFORM = mingw
 else

From 5fbaabc9b278961cd2f3448420204173fab34dc6 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Mon, 6 May 2019 19:49:15 +0200
Subject: [PATCH 1600/1938] update doc, remove obsolete info

---
 .../Linux-Installation-Instructions.md             | 14 +++++++++-----
 .../Windows-Installation-Instructions.md           |  6 ------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/doc/md/Installation_Instructions/Linux-Installation-Instructions.md b/doc/md/Installation_Instructions/Linux-Installation-Instructions.md
index 27d315359..5eb8bc66b 100644
--- a/doc/md/Installation_Instructions/Linux-Installation-Instructions.md
+++ b/doc/md/Installation_Instructions/Linux-Installation-Instructions.md
@@ -1,6 +1,6 @@
 # External resources
 
-You might want to follow one of these external resources to get an overview, but please still read carefully this page as some instructions may vary.
+You might want to follow one of these external resources to get an overview, but please still read carefully this page as some instructions may have evolved.
 
 * [Kali Video Installation guide](https://youtu.be/t5eBPS6lV3E "Kali Linux Installation Tutorial")
 * [Ubuntu Video Installation guide](https://youtu.be/DThmkH8CdMo "Ubuntu Installation Tutorial")
@@ -9,11 +9,8 @@ You might want to follow one of these external resources to get an overview, but
 ![Linux Installation Video Screenshot](https://github.com/5w0rdfish/Proxmark3-RDV4-ParrotOS/blob/master/screenshot-www.youtube.com-2019.03.17-20-44-33.png)
 
 * ParrotOS: some further notes can be found at @5w0rdfish repo [Proxmark Installation for Parrot OS](https://github.com/5w0rdfish/Proxmark3-RDV4-ParrotOS)
-* Ubuntu 14.04.2 LTS, 15.10 or 16.04 GC updates on the [Proxmark3 Ubuntu wiki page](https://github.com/Proxmark/proxmark3/wiki/Ubuntu%20Linux)
-* A nice and cool install script made by @daveio is found here: https://github.com/daveio/attacksurface/blob/master/proxmark3/pm3-setup.sh (unavailable?)
 * Iceman has also added this script to the fork. https://github.com/RfidResearchGroup/proxmark3/blob/master/install.sh
 
-
 # Install the required dependencies
 
 ## On Debian / Ubuntu / Kali / ParrotOS
@@ -31,15 +28,22 @@ sudo apt-get install p7zip git ca-certificates build-essential libreadline5 libr
 libusb-0.1-4 libusb-dev libqt4-dev perl pkg-config wget libncurses5-dev gcc-arm-none-eabi libstdc++-arm-none-eabi-newlib
 ```
 
+If you don't need the graphical components of the Proxmark3 client, you can skip the installation of `libqt4-dev`.
+
+If you get some (non blocking) error at runtime such as _Gtk-Message: Failed to load module "canberra-gtk-module"_ you may have to install `libcanberra-gtk-module`.
+
 ## On ArchLinux
 
 ```sh
-sudo pacman -Sy base-devel p7zip libusb readline ncurses arm-none-eabi-newlib --needed
+sudo pacman -Sy base-devel p7zip libusb readline ncurses arm-none-eabi-gcc arm-none-eabi-newlib git --needed
 ```
+Additional AUR packages:
 ```sh
 yaourt -S termcap
 ```
 
+Note that with only these requirements, you will not get the graphical components of the Proxmark3 client. (Untested: how to get it? `yaourt -S qt4` ?)
+
 # Clone the RRG/Iceman repository
 
 ```sh
diff --git a/doc/md/Installation_Instructions/Windows-Installation-Instructions.md b/doc/md/Installation_Instructions/Windows-Installation-Instructions.md
index b140bc168..ac88906da 100644
--- a/doc/md/Installation_Instructions/Windows-Installation-Instructions.md
+++ b/doc/md/Installation_Instructions/Windows-Installation-Instructions.md
@@ -2,12 +2,6 @@
 You will need to use the Gator96100 Proxspace package to assist in your windows installation.
 This can be downloaded from https://github.com/Gator96100/ProxSpace/
 
-## Notes
-If you receive gcc errors using v3.1 during build, download and use v2.2. This may help resolve the issue.
-
-- https://github.com/Gator96100/ProxSpace/releases/tag/v3.1   (release v3.1 with gcc v7.3.0 )
-- https://github.com/Gator96100/ProxSpace/releases/tag/v2.2   (release v2.2 with gcc v5.3.0 arm-none-eabi-gcc v7.1.0)
-
 ---
 # Video Installation guide
 [![Windows Installation tutorial](https://github.com/5w0rdfish/Proxmark3-RDV4-ParrotOS/blob/master/screenshot-www.youtube.com-2019.03.17-20-44-33.png)](https://youtu.be/zzF0NCMJnYU "Windows Installation Tutorial")

From c6b8c0c4727818dac3c5fcec9afce6ca2a0704be Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Mon, 6 May 2019 20:45:59 +0200
Subject: [PATCH 1601/1938] manual Makefile style (as some tabs need to be
 preserved)

---
 Makefile               |  50 +++----
 armsrc/Makefile        | 124 ++++++++---------
 client/Makefile        | 296 ++++++++++++++++++++---------------------
 common/Makefile.common |   8 +-
 common/Makefile.hal    |  60 ++++-----
 5 files changed, 269 insertions(+), 269 deletions(-)

diff --git a/Makefile b/Makefile
index 5efaae390..0a91f50a8 100644
--- a/Makefile
+++ b/Makefile
@@ -3,36 +3,36 @@ GZIP=gzip
 #  amount of shell command line parsing going on. echo "" on
 #  Windows yields literal "", on Linux yields an empty line
 ifeq ($(shell echo ""),)
-  # This is probably a proper system, so we can use uname
-  DELETE=rm -rf
-  FLASH_TOOL=client/flasher
-  platform=$(shell uname)
-  ifneq (,$(findstring MINGW,$(platform)))
+    # This is probably a proper system, so we can use uname
+    DELETE=rm -rf
+    FLASH_TOOL=client/flasher
+    platform=$(shell uname)
+    ifneq (,$(findstring MINGW,$(platform)))
+        FLASH_PORT=com3
+        PATHSEP=\\#
+    else
+        FLASH_PORT=/dev/ttyACM0
+        PATHSEP=/
+    endif
+else
+    # Assume that we are running on native Windows
+    DELETE=del /q
+    FLASH_TOOL=client/flasher.exe
+    platform=Windows
     FLASH_PORT=com3
     PATHSEP=\\#
-  else
-    FLASH_PORT=/dev/ttyACM0
-    PATHSEP=/
-  endif
-else
-  # Assume that we are running on native Windows
-  DELETE=del /q
-  FLASH_TOOL=client/flasher.exe
-  platform=Windows
-  FLASH_PORT=com3
-  PATHSEP=\\#
 endif
 
 ifeq ($(PLATFORM),)
-  -include Makefile.platform
-  ifeq ($(PLATFORM),)
-    PLATFORM=PM3RDV4
-  else
-    ${info using saved PLATFORM:        '$(PLATFORM)'}
-  endif
-  ifneq ($(PLATFORM_EXTRAS),)
-    ${info using saved PLATFORM_EXTRAS: '$(PLATFORM_EXTRAS)'}
-  endif
+    -include Makefile.platform
+    ifeq ($(PLATFORM),)
+        PLATFORM=PM3RDV4
+    else
+        ${info using saved PLATFORM:        '$(PLATFORM)'}
+    endif
+    ifneq ($(PLATFORM_EXTRAS),)
+        ${info using saved PLATFORM_EXTRAS: '$(PLATFORM_EXTRAS)'}
+    endif
 endif
 
 include common/Makefile.hal
diff --git a/armsrc/Makefile b/armsrc/Makefile
index 01193a4f8..dc661edc6 100644
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -10,31 +10,31 @@ APP_INCLUDES = apps.h
 
 # This Makefile might have been called directly, not via the root Makefile, so:
 ifeq ($(PLTNAME),)
-  -include ../Makefile.platform
-  ifeq ($(PLATFORM),)
-    PLATFORM=PM3RDV4
-  else
-    ${info using saved PLATFORM:        '$(PLATFORM)'}
-  endif
-  ifneq ($(PLATFORM_EXTRAS),)
-    ${info using saved PLATFORM_EXTRAS: '$(PLATFORM_EXTRAS)'}
-  endif
-  include ../common/Makefile.hal
-  $(info ===================================================================)
-  $(info Platform name:     $(PLTNAME))
-  $(info PLATFORM:          $(PLATFORM))
-  $(info PLATFORM_EXTRAS:   $(PLATFORM_EXTRAS))
-  $(info Included options:  $(PLATFORM_DEFS_INFO))
-  $(info Standalone mode:   $(PLATFORM_DEFS_INFO_STANDALONE))
-  $(info ===================================================================)
+    -include ../Makefile.platform
+    ifeq ($(PLATFORM),)
+        PLATFORM=PM3RDV4
+    else
+        ${info using saved PLATFORM:        '$(PLATFORM)'}
+    endif
+    ifneq ($(PLATFORM_EXTRAS),)
+        ${info using saved PLATFORM_EXTRAS: '$(PLATFORM_EXTRAS)'}
+    endif
+    include ../common/Makefile.hal
+    $(info ===================================================================)
+    $(info Platform name:     $(PLTNAME))
+    $(info PLATFORM:          $(PLATFORM))
+    $(info PLATFORM_EXTRAS:   $(PLATFORM_EXTRAS))
+    $(info Included options:  $(PLATFORM_DEFS_INFO))
+    $(info Standalone mode:   $(PLATFORM_DEFS_INFO_STANDALONE))
+    $(info ===================================================================)
 endif
 
 #remove one of the following defines and comment out the relevant line
 #in the next section to remove that particular feature from compilation.
 # NO space,TABs after the "\" sign.
 APP_CFLAGS = $(PLATFORM_DEFS) \
-			 -DON_DEVICE \
-			 -fno-strict-aliasing -ffunction-sections -fdata-sections
+             -DON_DEVICE \
+             -fno-strict-aliasing -ffunction-sections -fdata-sections
 
 SRC_LF = lfops.c lfsampling.c pcf7931.c lfdemod.c
 SRC_ISO15693 = iso15693.c iso15693tools.c
@@ -49,21 +49,21 @@ SRC_LEGIC = legicrf.c legicrfsim.c legic_prng.c
 
 # RDV40 related hardware support
 ifneq (,$(findstring WITH_FLASH,$(APP_CFLAGS)))
-	SRC_FLASH = flashmem.c
+    SRC_FLASH = flashmem.c
 else
-	SRC_FLASH =
+    SRC_FLASH =
 endif
 
 ifneq (,$(findstring WITH_SMARTCARD,$(APP_CFLAGS)))
-	SRC_SMARTCARD = i2c.c
+    SRC_SMARTCARD = i2c.c
 else
-	SRC_SMARTCARD =
+    SRC_SMARTCARD =
 endif
 
 ifneq (,$(findstring WITH_FPC_USART,$(APP_CFLAGS)))
-	SRC_FPC = usart.c
+    SRC_FPC = usart.c
 else
-	SRC_FPC =
+    SRC_FPC =
 endif
 
 ifneq (,$(findstring WITH_HITAG,$(APP_CFLAGS)))
@@ -84,35 +84,35 @@ endif
 SRC_STANDALONE = placeholder.c
 # WITH_STANDALONE_LF_ICERUN
 ifneq (,$(findstring WITH_STANDALONE_LF_ICERUN,$(APP_CFLAGS)))
-	SRC_STANDALONE = lf_icerun.c
+    SRC_STANDALONE = lf_icerun.c
 endif
 # WITH_STANDALONE_LF_SAMYRUN
 ifneq (,$(findstring WITH_STANDALONE_LF_SAMYRUN,$(APP_CFLAGS)))
-	SRC_STANDALONE = lf_samyrun.c
+    SRC_STANDALONE = lf_samyrun.c
 endif
 # WITH_STANDALONE_LF_PROXBRUTE
 ifneq (,$(findstring WITH_STANDALONE_LF_PROXBRUTE,$(APP_CFLAGS)))
-	SRC_STANDALONE = lf_proxbrute.c
+    SRC_STANDALONE = lf_proxbrute.c
 endif
 # WITH_STANDALONE_LF_HIDBRUTE
 ifneq (,$(findstring WITH_STANDALONE_LF_HIDBRUTE,$(APP_CFLAGS)))
-	SRC_STANDALONE = lf_hidbrute.c
+    SRC_STANDALONE = lf_hidbrute.c
 endif
 # WITH_STANDALONE_HF_YOUNG
 ifneq (,$(findstring WITH_STANDALONE_HF_YOUNG,$(APP_CFLAGS)))
-	SRC_STANDALONE = hf_young.c
+    SRC_STANDALONE = hf_young.c
 endif
 # WITH_STANDALONE_HF_MATTYRUN
 ifneq (,$(findstring WITH_STANDALONE_HF_MATTYRUN,$(APP_CFLAGS)))
-	SRC_STANDALONE = hf_mattyrun.c
+    SRC_STANDALONE = hf_mattyrun.c
 endif
 # WITH_STANDALONE_HF_COLIN
 ifneq (,$(findstring WITH_STANDALONE_HF_COLIN,$(APP_CFLAGS)))
-	SRC_STANDALONE = vtsend.c hf_colin.c
+    SRC_STANDALONE = vtsend.c hf_colin.c
 endif
 # WITH_STANDALONE_HF_BOG
 ifneq (,$(findstring WITH_STANDALONE_HF_BOG,$(APP_CFLAGS)))
-	SRC_STANDALONE = hf_bog.c
+    SRC_STANDALONE = hf_bog.c
 endif
 
 #the FPGA bitstream files. Note: order matters!
@@ -132,42 +132,42 @@ APP_CFLAGS += -I. -fno-stack-protector -fno-pie
 
 # Compile these in thumb mode (small size)
 THUMBSRC = start.c \
-	protocols.c \
-	$(SRC_LCD) \
-	$(SRC_ISO15693) \
-	$(SRC_LF) \
-	$(SRC_ZLIB) \
-	$(SRC_LEGIC) \
-	$(SRC_FLASH) \
-	$(SRC_SMARTCARD) \
-	$(SRC_FPC) \
+    protocols.c \
+    $(SRC_LCD) \
+    $(SRC_ISO15693) \
+    $(SRC_LF) \
+    $(SRC_ZLIB) \
+    $(SRC_LEGIC) \
+    $(SRC_FLASH) \
+    $(SRC_SMARTCARD) \
+    $(SRC_FPC) \
     $(SRC_HITAG) \
-	appmain.c \
-	printf.c \
-	commonutil.c \
-	util.c \
-	string.c \
-	BigBuf.c \
-	ticks.c \
-	hfsnoop.c
+    appmain.c \
+    printf.c \
+    commonutil.c \
+    util.c \
+    string.c \
+    BigBuf.c \
+    ticks.c \
+    hfsnoop.c
 
 
 # These are to be compiled in ARM mode
 ARMSRC = fpgaloader.c \
-	$(SRC_ISO14443a) \
-	$(SRC_ISO14443b) \
-	$(SRC_CRAPTO1) \
-	$(SRC_ICLASS) \
-	$(SRC_EMV) \
-	$(SRC_CRC) \
-	$(SRC_FELICA) \
-	$(SRC_STANDALONE) \
-	parity.c \
-	usb_cdc.c \
-	cmd.c
+    $(SRC_ISO14443a) \
+    $(SRC_ISO14443b) \
+    $(SRC_CRAPTO1) \
+    $(SRC_ICLASS) \
+    $(SRC_EMV) \
+    $(SRC_CRC) \
+    $(SRC_FELICA) \
+    $(SRC_STANDALONE) \
+    parity.c \
+    usb_cdc.c \
+    cmd.c
 
 VERSIONSRC = version.c \
-	fpga_version_info.c
+    fpga_version_info.c
 
 # Do not move this inclusion before the definition of {THUMB,ASM,ARM}SRC
 include ../common/Makefile.common
diff --git a/client/Makefile b/client/Makefile
index c9069a276..318e2f1bd 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -68,10 +68,10 @@ LUAPLATFORM = generic
 ifneq (,$(findstring MINGW,$(platform)))
     LUAPLATFORM = mingw
 else
-	ifeq ($(platform),Darwin)
+    ifeq ($(platform),Darwin)
     LUAPLATFORM = macosx
-	OBJCSRCS = util_darwin.m
-	LDFLAGS += -framework Foundation -framework AppKit
+    OBJCSRCS = util_darwin.m
+    LDFLAGS += -framework Foundation -framework AppKit
 else
     LUALIB +=  -ldl
     LDLIBS +=  -ltermcap -lncurses
@@ -86,26 +86,26 @@ MOC = $(shell pkg-config --variable=host_bins Qt5Core)/moc
 UIC = $(shell pkg-config --variable=host_bins Qt5Core)/uic
 ifeq ($(QTINCLUDES), )
 # if Qt5 not found check for correctly configured Qt4
-	QTINCLUDES = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null)
-	QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
-	MOC = $(shell pkg-config --variable=moc_location QtCore)
-	UIC = $(shell pkg-config --variable=uic_location QtCore)
+    QTINCLUDES = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null)
+    QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
+    MOC = $(shell pkg-config --variable=moc_location QtCore)
+    UIC = $(shell pkg-config --variable=uic_location QtCore)
 else
-	CXXFLAGS += -std=c++11 -fPIC
+    CXXFLAGS += -std=c++11 -fPIC
 endif
 ifeq ($(QTINCLUDES), )
 # if both pkg-config commands failed, search in common places
-	ifneq ($(QTDIR), )
-		QTINCLUDES = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
-		QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4
-		ifneq ($(wildcard $(QTDIR)/include/QtWidgets),)
-			QTINCLUDES += -I$(QTDIR)/include/QtWidgets
-			QTLDLIBS = -L$(QTDIR)/lib -lQt5Widgets -lQt5Gui -lQt5Core
-			CXXFLAGS += -std=c++11 -fPIC
-		endif
-		MOC = $(QTDIR)/bin/moc
-		UIC = $(QTDIR)/bin/uic
-	endif
+    ifneq ($(QTDIR), )
+        QTINCLUDES = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
+        QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4
+        ifneq ($(wildcard $(QTDIR)/include/QtWidgets),)
+            QTINCLUDES += -I$(QTDIR)/include/QtWidgets
+            QTLDLIBS = -L$(QTDIR)/lib -lQt5Widgets -lQt5Gui -lQt5Core
+            CXXFLAGS += -std=c++11 -fPIC
+        endif
+        MOC = $(QTDIR)/bin/moc
+        UIC = $(QTDIR)/bin/uic
+    endif
 endif
 
 
@@ -124,139 +124,139 @@ DEPFLAGS = -MT $@ -MMD -MP -MF $(OBJDIR)/$*.Td
 POSTCOMPILE = $(MV) -f $(OBJDIR)/$*.Td $(OBJDIR)/$*.d
 
 CORESRCS =  uart_posix.c \
-			uart_win32.c \
-			ui.c \
-			commonutil.c \
-			util.c \
-			util_posix.c \
-			scandir.c \
-			crc16.c \
-			comms.c
+            uart_win32.c \
+            ui.c \
+            commonutil.c \
+            util.c \
+            util_posix.c \
+            scandir.c \
+            crc16.c \
+            comms.c
 
-CMDSRCS =	crapto1/crapto1.c \
-			crapto1/crypto1.c \
-			mifare/mfkey.c \
-			tea.c \
-			fido/additional_ca.c \
-			fido/cose.c \
-			fido/cbortools.c \
-			fido/fidocore.c \
-			crypto/asn1dump.c \
-			crypto/libpcrypto.c\
-			crypto/asn1utils.c\
-			cliparser/argtable3.c\
-			cliparser/cliparser.c\
-			loclass/cipher.c \
-			loclass/cipherutils.c \
-			loclass/ikeys.c \
-			loclass/elite_crack.c \
-			loclass/fileutils.c \
-			whereami.c \
-			mifare/mifarehost.c \
-			parity.c \
-			crc.c \
-			crc64.c \
-			legic_prng.c \
-			iso15693tools.c \
-			prng.c \
-			graph.c \
-			cmddata.c \
-			lfdemod.c \
-			emv/crypto_polarssl.c\
-			emv/crypto.c\
-			emv/emv_pk.c\
-			emv/emv_pki.c\
-			emv/emv_pki_priv.c\
-			emv/test/cryptotest.c\
-			emv/apduinfo.c \
-			emv/dump.c \
-			emv/tlv.c \
-			emv/emv_tags.c \
-			emv/dol.c \
-			emv/emvjson.c\
-			emv/emvcore.c \
-			emv/test/crypto_test.c\
-			emv/test/sda_test.c\
-			emv/test/dda_test.c\
-			emv/test/cda_test.c\
-			emv/cmdemv.c \
-			emv/emv_roca.c \
+CMDSRCS =    crapto1/crapto1.c \
+            crapto1/crypto1.c \
+            mifare/mfkey.c \
+            tea.c \
+            fido/additional_ca.c \
+            fido/cose.c \
+            fido/cbortools.c \
+            fido/fidocore.c \
+            crypto/asn1dump.c \
+            crypto/libpcrypto.c\
+            crypto/asn1utils.c\
+            cliparser/argtable3.c\
+            cliparser/cliparser.c\
+            loclass/cipher.c \
+            loclass/cipherutils.c \
+            loclass/ikeys.c \
+            loclass/elite_crack.c \
+            loclass/fileutils.c \
+            whereami.c \
+            mifare/mifarehost.c \
+            parity.c \
+            crc.c \
+            crc64.c \
+            legic_prng.c \
+            iso15693tools.c \
+            prng.c \
+            graph.c \
+            cmddata.c \
+            lfdemod.c \
+            emv/crypto_polarssl.c\
+            emv/crypto.c\
+            emv/emv_pk.c\
+            emv/emv_pki.c\
+            emv/emv_pki_priv.c\
+            emv/test/cryptotest.c\
+            emv/apduinfo.c \
+            emv/dump.c \
+            emv/tlv.c \
+            emv/emv_tags.c \
+            emv/dol.c \
+            emv/emvjson.c\
+            emv/emvcore.c \
+            emv/test/crypto_test.c\
+            emv/test/sda_test.c\
+            emv/test/dda_test.c\
+            emv/test/cda_test.c\
+            emv/cmdemv.c \
+            emv/emv_roca.c \
             mifare/mifare4.c \
             mifare/mad.c \
             mifare/ndef.c \
-			cmdanalyse.c \
-			cmdhf.c \
-			cmdhflist.c \
-			cmdhf14a.c \
-			cmdhf14b.c \
-			cmdhf15.c \
-			cmdhfepa.c \
-			cmdhflegic.c \
-			cmdhficlass.c \
-			cmdhfmf.c \
+            cmdanalyse.c \
+            cmdhf.c \
+            cmdhflist.c \
+            cmdhf14a.c \
+            cmdhf14b.c \
+            cmdhf15.c \
+            cmdhfepa.c \
+            cmdhflegic.c \
+            cmdhficlass.c \
+            cmdhfmf.c \
             cmdhfmfu.c \
             cmdhfmfp.c \
-			cmdhfmfhard.c \
+            cmdhfmfhard.c \
             hardnested/hardnested_bruteforce.c \
-			cmdhfmfdes.c \
-			cmdhftopaz.c \
-			cmdhffido.c \
-			cmdhffelica.c \
-			cmdhw.c \
-			cmdlf.c \
-			cmdlfawid.c \
-			cmdlfcotag.c \
-			cmdlfem4x.c \
-			cmdlffdx.c \
-			cmdlfguard.c \
-			cmdlfhid.c \
-			cmdlfhitag.c \
-			cmdlfio.c \
-			cmdlfindala.c \
-			cmdlfjablotron.c \
-			cmdlfkeri.c \
-			cmdlfnexwatch.c \
-			cmdlfnedap.c \
-			cmdlfnoralsy.c \
-			cmdlfpac.c \
-			cmdlfparadox.c \
-			cmdlfpcf7931.c \
-			cmdlfpresco.c \
-			cmdlfpyramid.c \
-			cmdlfsecurakey.c \
-			cmdlft55xx.c \
-			cmdlfti.c \
-			cmdlfviking.c \
-			cmdlfvisa2000.c \
-			cmdtrace.c \
-			cmdflashmem.c \
-			cmdsmartcard.c \
-			cmdusart.c \
-			cmdparser.c \
-			cmdmain.c \
-			pm3_binlib.c \
-			scripting.c \
-			cmdscript.c \
-			pm3_bitlib.c \
-			protocols.c \
-			cmdcrc.c \
-			reveng/preset.c \
-			reveng/reveng.c \
-			reveng/cli.c \
-			reveng/bmpbit.c \
-			reveng/model.c \
-			reveng/poly.c \
-			bucketsort.c
+            cmdhfmfdes.c \
+            cmdhftopaz.c \
+            cmdhffido.c \
+            cmdhffelica.c \
+            cmdhw.c \
+            cmdlf.c \
+            cmdlfawid.c \
+            cmdlfcotag.c \
+            cmdlfem4x.c \
+            cmdlffdx.c \
+            cmdlfguard.c \
+            cmdlfhid.c \
+            cmdlfhitag.c \
+            cmdlfio.c \
+            cmdlfindala.c \
+            cmdlfjablotron.c \
+            cmdlfkeri.c \
+            cmdlfnexwatch.c \
+            cmdlfnedap.c \
+            cmdlfnoralsy.c \
+            cmdlfpac.c \
+            cmdlfparadox.c \
+            cmdlfpcf7931.c \
+            cmdlfpresco.c \
+            cmdlfpyramid.c \
+            cmdlfsecurakey.c \
+            cmdlft55xx.c \
+            cmdlfti.c \
+            cmdlfviking.c \
+            cmdlfvisa2000.c \
+            cmdtrace.c \
+            cmdflashmem.c \
+            cmdsmartcard.c \
+            cmdusart.c \
+            cmdparser.c \
+            cmdmain.c \
+            pm3_binlib.c \
+            scripting.c \
+            cmdscript.c \
+            pm3_bitlib.c \
+            protocols.c \
+            cmdcrc.c \
+            reveng/preset.c \
+            reveng/reveng.c \
+            reveng/cli.c \
+            reveng/bmpbit.c \
+            reveng/model.c \
+            reveng/poly.c \
+            bucketsort.c
 
 cpu_arch = $(shell uname -m)
 ifneq ($(findstring 86, $(cpu_arch)), )
-	MULTIARCHSRCS = hardnested/hardnested_bf_core.c hardnested/hardnested_bitarray_core.c
+    MULTIARCHSRCS = hardnested/hardnested_bf_core.c hardnested/hardnested_bitarray_core.c
 endif
 ifneq ($(findstring amd64, $(cpu_arch)), )
-	MULTIARCHSRCS = hardnested/hardnested_bf_core.c hardnested/hardnested_bitarray_core.c
+    MULTIARCHSRCS = hardnested/hardnested_bf_core.c hardnested/hardnested_bitarray_core.c
 endif
 ifeq ($(MULTIARCHSRCS), )
-	CMDSRCS += hardnested/hardnested_bf_core.c hardnested/hardnested_bitarray_core.c
+    CMDSRCS += hardnested/hardnested_bf_core.c hardnested/hardnested_bitarray_core.c
 endif
 
 ZLIBSRCS = deflate.c adler32.c trees.c zutil.c inflate.c inffast.c inftrees.c
@@ -270,10 +270,10 @@ CMDOBJS = $(CMDSRCS:%.c=$(OBJDIR)/%.o)
 OBJCOBJS = $(OBJCSRCS:%.m=$(OBJDIR)/%.o)
 ZLIBOBJS = $(ZLIBSRCS:%.c=$(OBJDIR)/%.o)
 MULTIARCHOBJS = $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_NOSIMD.o) \
-			$(MULTIARCHSRCS:%.c=$(OBJDIR)/%_MMX.o) \
-			$(MULTIARCHSRCS:%.c=$(OBJDIR)/%_SSE2.o) \
-			$(MULTIARCHSRCS:%.c=$(OBJDIR)/%_AVX.o) \
-			$(MULTIARCHSRCS:%.c=$(OBJDIR)/%_AVX2.o)
+            $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_MMX.o) \
+            $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_SSE2.o) \
+            $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_AVX.o) \
+            $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_AVX2.o)
 
 SUPPORTS_AVX512 :=  $(shell echo | gcc -E -mavx512f - > /dev/null 2>&1 && echo "True" )
 
@@ -284,12 +284,12 @@ HARD_SWITCH_AVX = -mmmx -msse2 -mavx -mno-avx2
 HARD_SWITCH_AVX2 = -mmmx -msse2 -mavx -mavx2
 HARD_SWITCH_AVX512 = -mmmx -msse2 -mavx -mavx2 -mavx512f
 ifeq "$(SUPPORTS_AVX512)" "True"
-	HARD_SWITCH_NOSIMD += -mno-avx512f
-	HARD_SWITCH_MMX += -mno-avx512f
-	HARD_SWITCH_SSE2 += -mno-avx512f
-	HARD_SWITCH_AVX += -mno-avx512f
-	HARD_SWITCH_AVX2 += -mno-avx512f
-	MULTIARCHOBJS +=  $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_AVX512.o)
+    HARD_SWITCH_NOSIMD += -mno-avx512f
+    HARD_SWITCH_MMX += -mno-avx512f
+    HARD_SWITCH_SSE2 += -mno-avx512f
+    HARD_SWITCH_AVX += -mno-avx512f
+    HARD_SWITCH_AVX2 += -mno-avx512f
+    MULTIARCHOBJS +=  $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_AVX512.o)
 endif
 
 BINS = proxmark3 flasher fpga_compress
diff --git a/common/Makefile.common b/common/Makefile.common
index a0e44fbe9..bbdf1d0e4 100644
--- a/common/Makefile.common
+++ b/common/Makefile.common
@@ -89,15 +89,15 @@ $(VERSIONOBJ): $(OBJDIR)/%.o: %.c $(INCLUDES)
 # without touching start address or RAM addresses (.bss and .data sections)
 # See ldscript.common. -- Henryk Plötz <henryk@ploetzli.ch> 2009-08-27
 OBJCOPY_TRANSLATIONS = --no-change-warnings \
-	--change-addresses -0x100000 --change-start 0 \
-	--change-section-address .bss+0 --change-section-address .data-0x100000 \
-	--change-section-address .commonarea+0
+    --change-addresses -0x100000 --change-start 0 \
+    --change-section-address .bss+0 --change-section-address .data-0x100000 \
+    --change-section-address .commonarea+0
 $(OBJDIR)/%.s19: $(OBJDIR)/%.elf
 	$(OBJCOPY) -Osrec --srec-forceS3 --strip-debug $(OBJCOPY_TRANSLATIONS) $^ $@
 
 # easy printing of MAKE VARIABLES
 print-%: ; @echo $* = $($*) 
-	
+
 # Automatic dependency generation
 DEPENDENCY_FILES = $(patsubst %.c,$(OBJDIR)/%.d,$(notdir $(THUMBSRC))) \
 	$(patsubst %.c,$(OBJDIR)/%.d,$(notdir $(ARMSRC))) \
diff --git a/common/Makefile.hal b/common/Makefile.hal
index e42793482..58eddb86e 100644
--- a/common/Makefile.hal
+++ b/common/Makefile.hal
@@ -40,56 +40,56 @@ endef
 PLTNAME = Unknown Platform
 
 ifeq ($(PLATFORM),PM3RDV4)
-  MCU = AT91SAM7S512
-  PLATFORM_DEFS = -DWITH_SMARTCARD -DWITH_FLASH
-  PLTNAME = Proxmark3 rdv4
+    MCU = AT91SAM7S512
+    PLATFORM_DEFS = -DWITH_SMARTCARD -DWITH_FLASH
+    PLTNAME = Proxmark3 rdv4
 else ifeq ($(PLATFORM),PM3EVO)
-  MCU = AT91SAM7S512
-  PLTNAME = Proxmark3 EVO
+    MCU = AT91SAM7S512
+    PLTNAME = Proxmark3 EVO
 else ifeq ($(PLATFORM),PM3EASY)
-  MCU = AT91SAM7S256
-  PLTNAME = Proxmark3 rdv3 Easy
+    MCU = AT91SAM7S256
+    PLTNAME = Proxmark3 rdv3 Easy
 else ifeq ($(PLATFORM),PM3RDV2)
-  MCU = AT91SAM7S512
-  PLTNAME = Proxmark3 rdv2
+    MCU = AT91SAM7S512
+    PLTNAME = Proxmark3 rdv2
 else ifeq ($(PLATFORM),PM3OLD256)
-  MCU = AT91SAM7S256
-  PLTNAME = Proxmark3 V1 with AT91SAM7S256
+    MCU = AT91SAM7S256
+    PLTNAME = Proxmark3 V1 with AT91SAM7S256
 else ifeq ($(PLATFORM),PM3OLD512)
-  MCU = AT91SAM7S512
-  PLTNAME = Proxmark3 V1 with AT91SAM7S512
+    MCU = AT91SAM7S512
+    PLTNAME = Proxmark3 V1 with AT91SAM7S512
 else
-  $(error Invalid or empty PLATFORM: $(PLATFORM). Known platforms: $(KNOWN_PLATFORMS))
+    $(error Invalid or empty PLATFORM: $(PLATFORM). Known platforms: $(KNOWN_PLATFORMS))
 endif
 
 # parsing additional PLATFORM_EXTRAS tokens
 PLATFORM_EXTRAS_TMP:=$(PLATFORM_EXTRAS)
 ifneq (,$(findstring BTADDON,$(PLATFORM_EXTRAS_TMP)))
-  PLATFORM_DEFS += -DWITH_FPC_USART_HOST
-  PLATFORM_EXTRAS_TMP := $(strip $(filter-out BTADDON,$(PLATFORM_EXTRAS_TMP)))
+    PLATFORM_DEFS += -DWITH_FPC_USART_HOST
+    PLATFORM_EXTRAS_TMP := $(strip $(filter-out BTADDON,$(PLATFORM_EXTRAS_TMP)))
 endif
 ifneq (,$(findstring FPC_USART_DEV,$(PLATFORM_EXTRAS_TMP)))
-  PLATFORM_DEFS += -DWITH_FPC_USART_DEV
-  PLATFORM_EXTRAS_TMP := $(strip $(filter-out FPC_USART_DEV,$(PLATFORM_EXTRAS_TMP)))
+    PLATFORM_DEFS += -DWITH_FPC_USART_DEV
+    PLATFORM_EXTRAS_TMP := $(strip $(filter-out FPC_USART_DEV,$(PLATFORM_EXTRAS_TMP)))
 endif
 ifneq (,$(PLATFORM_EXTRAS_TMP))
-  $(error Unknown PLATFORM_EXTRAS token(s): $(PLATFORM_EXTRAS_TMP))
+    $(error Unknown PLATFORM_EXTRAS token(s): $(PLATFORM_EXTRAS_TMP))
 endif
 
 # common LF support
 PLATFORM_DEFS += \
-	-DWITH_LF \
-	-DWITH_HITAG
+    -DWITH_LF \
+    -DWITH_HITAG
 
 # common HF support
 PLATFORM_DEFS += \
-	-DWITH_ISO15693 \
-	-DWITH_LEGICRF \
-	-DWITH_ISO14443b \
-	-DWITH_ISO14443a \
-	-DWITH_ICLASS \
-	-DWITH_FELICA \
-	-DWITH_HFSNIFF
+    -DWITH_ISO15693 \
+    -DWITH_LEGICRF \
+    -DWITH_ISO14443b \
+    -DWITH_ISO14443a \
+    -DWITH_ICLASS \
+    -DWITH_FELICA \
+    -DWITH_HFSNIFF
 
 # Standalone mode
 # !! Choose only one !!
@@ -112,7 +112,7 @@ $(info $(findstring WITH_STANDALONE_*,$(PLATFORM_DEFS)))
 
 # WITH_FPC_USART_* needs WITH_FPC_USART :
 ifneq (,$(findstring WITH_FPC_USART_,$(PLATFORM_DEFS)))
-  PLATFORM_DEFS += -DWITH_FPC_USART
+    PLATFORM_DEFS += -DWITH_FPC_USART
 endif
 
 PLATFORM_DEFS_INFO = $(strip $(filter-out STANDALONE%, $(subst -DWITH_,,$(PLATFORM_DEFS))))
@@ -120,7 +120,7 @@ PLATFORM_DEFS_INFO_STANDALONE = $(strip $(subst STANDALONE_,, $(filter STANDALON
 
 # Check that only one Standalone mode has been chosen
 ifneq (,$(word 2, $(PLATFORM_DEFS_INFO_STANDALONE)))
-  $(error You must choose only one Standalone mode!: $(PLATFORM_DEFS_INFO_STANDALONE))
+    $(error You must choose only one Standalone mode!: $(PLATFORM_DEFS_INFO_STANDALONE))
 endif
 
 

From 52396e8b5a1fd1427bd66b56fe0d5990a0f9e31d Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 6 May 2019 22:40:06 +0200
Subject: [PATCH 1602/1938] textual

---
 client/cmdhw.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/cmdhw.c b/client/cmdhw.c
index ce286fb8e..a6d4a18dd 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -468,7 +468,7 @@ static int CmdPingNG(const char *Cmd) {
     uint32_t len = strtol(Cmd, NULL, 0);
     if (len > PM3_CMD_DATA_SIZE)
         len = PM3_CMD_DATA_SIZE;
-    PrintAndLogEx(NORMAL, "PingNG sent with payload len=%d", len);
+    PrintAndLogEx(INFO, "PingNG sent with payload len=%d", len);
     clearCommandBuffer();
     PacketResponseNG resp;
     uint8_t data[PM3_CMD_DATA_SIZE] = {0};
@@ -479,9 +479,9 @@ static int CmdPingNG(const char *Cmd) {
         bool error = false;
         if (len)
             error = memcmp(data, resp.data.asBytes, len) != 0;
-        PrintAndLogEx(NORMAL, "PingNG response received, content is %s", error ? _RED_("NOT ok") : _GREEN_("ok"));
+        PrintAndLogEx((error)? ERR:SUCCESS, "PingNG response received, content is %s", error ? _RED_("NOT ok") : _GREEN_("ok"));
     } else
-        PrintAndLogEx(NORMAL, "PingNG response " _RED_("timeout"));
+        PrintAndLogEx(WARNING, "PingNG response " _RED_("timeout"));
     return PM3_SUCCESS;
 }
 

From 29a160c905b6253e70c83dc3665db7c09deb5707 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 6 May 2019 22:41:00 +0200
Subject: [PATCH 1603/1938] reconnect version2 yolo

---
 client/cmddata.c   |  1 +
 client/comms.c     | 48 ++++++++++++++++++++++++++++------------------
 client/proxmark3.c |  2 --
 include/pm3_cmd.h  |  3 ++-
 uart/uart.h        |  4 ++--
 uart/uart_posix.c  | 27 +++++++++++++-------------
 uart/uart_win32.c  | 33 +++++++++++++++++++++++++++----
 7 files changed, 77 insertions(+), 41 deletions(-)

diff --git a/client/cmddata.c b/client/cmddata.c
index 962b537a0..f4e6594a9 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -235,6 +235,7 @@ static int usage_data_fsktonrz() {
     return 0;
 }
 
+
 //set the demod buffer with given array of binary (one bit per byte)
 //by marshmellow
 void setDemodBuff(uint8_t *buff, size_t size, size_t start_idx) {
diff --git a/client/comms.c b/client/comms.c
index 1f3fbb30a..25636589c 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -319,7 +319,7 @@ __attribute__((force_align_arg_pointer))
 *uart_communication(void *targ) {
     communication_arg_t *connection = (communication_arg_t *)targ;
     uint32_t rxlen;
-    uint8_t counter_to_offline = 0;
+    bool sendfailed = false;
     PacketResponseNG rx;
     PacketResponseNGRaw rx_raw;
 
@@ -327,22 +327,25 @@ __attribute__((force_align_arg_pointer))
     disableAppNap("Proxmark3 polling UART");
 #endif
 
-// is this connection->run a cross thread call?
-
+    // is this connection->run a cross thread call?
     while (connection->run) {
         rxlen = 0;
         bool ACK_received = false;
         bool error = false;
+        int res;
 
-        // three failed attempts
-        if ( counter_to_offline >= 3 ) {
+        // Signal to main thread that communications seems off.
+        // main thread will kill and restart this thread.
+        if ( sendfailed ) {
+            PrintAndLogEx(WARNING, "sending bytes to Proxmark3 device " _RED_("failed"));
             __atomic_test_and_set(&comm_thread_dead, __ATOMIC_SEQ_CST);
             break;
         }
 
         pthread_mutex_lock(&spMutex);
-
-        if (uart_receive(sp, (uint8_t *)&rx_raw.pre, sizeof(PacketResponseNGPreamble), &rxlen) && (rxlen == sizeof(PacketResponseNGPreamble))) {
+        
+        res = uart_receive(sp, (uint8_t *)&rx_raw.pre, sizeof(PacketResponseNGPreamble), &rxlen);
+        if ((res == PM3_SUCCESS) && (rxlen == sizeof(PacketResponseNGPreamble))) {
             rx.magic = rx_raw.pre.magic;
             uint16_t length = rx_raw.pre.length;
             rx.ng = rx_raw.pre.ng;
@@ -354,12 +357,13 @@ __attribute__((force_align_arg_pointer))
                     error = true;
                 }
                 if ((!error) && (length > 0)) { // Get the variable length payload
-                    if ((!uart_receive(sp, (uint8_t *)&rx_raw.data, length, &rxlen)) || (rxlen != length)) {
+                
+                    res = uart_receive(sp, (uint8_t *)&rx_raw.data, length, &rxlen);
+                    if ( (res != PM3_SUCCESS) || (rxlen != length)) {
                         PrintAndLogEx(WARNING, "Received packet frame error variable part too short? %d/%d", rxlen, length);
                         error = true;
                     } else {
 
-
                         if (rx.ng) {      // Received a valid NG frame
                             memcpy(&rx.data, &rx_raw.data, length);
                             rx.length = length;
@@ -387,7 +391,8 @@ __attribute__((force_align_arg_pointer))
                     }
                 }
                 if (!error) {                        // Get the postamble
-                    if ((!uart_receive(sp, (uint8_t *)&rx_raw.foopost, sizeof(PacketResponseNGPostamble), &rxlen)) || (rxlen != sizeof(PacketResponseNGPostamble))) {
+                    res = uart_receive(sp, (uint8_t *)&rx_raw.foopost, sizeof(PacketResponseNGPostamble), &rxlen);
+                    if ((res != PM3_SUCCESS) || (rxlen != sizeof(PacketResponseNGPostamble))) {
                         PrintAndLogEx(WARNING, "Received packet frame error fetching postamble");
                         error = true;
                     }
@@ -417,7 +422,9 @@ __attribute__((force_align_arg_pointer))
             } else {                               // Old style reply
                 PacketResponseOLD rx_old;
                 memcpy(&rx_old, &rx_raw.pre, sizeof(PacketResponseNGPreamble));
-                if ((!uart_receive(sp, ((uint8_t *)&rx_old) + sizeof(PacketResponseNGPreamble), sizeof(PacketResponseOLD) - sizeof(PacketResponseNGPreamble), &rxlen)) || (rxlen != sizeof(PacketResponseOLD) - sizeof(PacketResponseNGPreamble))) {
+                
+                res = uart_receive(sp, ((uint8_t *)&rx_old) + sizeof(PacketResponseNGPreamble), sizeof(PacketResponseOLD) - sizeof(PacketResponseNGPreamble), &rxlen);
+                if ((res != PM3_SUCCESS) || (rxlen != sizeof(PacketResponseOLD) - sizeof(PacketResponseNGPreamble))) {
                     PrintAndLogEx(WARNING, "Received packet OLD frame payload error too short? %d/%d", rxlen, sizeof(PacketResponseOLD) - sizeof(PacketResponseNGPreamble));
                     error = true;
                 }
@@ -476,23 +483,25 @@ __attribute__((force_align_arg_pointer))
 
             pthread_mutex_lock(&spMutex);
             if (txBufferNGLen) { // NG packet
-                if (!uart_send(sp, (uint8_t *) &txBufferNG, txBufferNGLen)) {
-                    counter_to_offline++;
-                    PrintAndLogEx(WARNING, "sending bytes to Proxmark3 device " _RED_("failed"));
+                res = uart_send(sp, (uint8_t *) &txBufferNG, txBufferNGLen);
+                if (res == PM3_EIO) {
+                    sendfailed = true;
                 }
                 conn.last_command = txBufferNG.pre.cmd;
                 txBufferNGLen = 0;
             } else {
-                if (!uart_send(sp, (uint8_t *) &txBuffer, sizeof(PacketCommandOLD))) {
-                    counter_to_offline++;
-                    PrintAndLogEx(WARNING, "sending bytes to Proxmark3 device " _RED_("failed"));
+                res = uart_send(sp, (uint8_t *) &txBuffer, sizeof(PacketCommandOLD));
+                if (res == PM3_EIO) {
+                    sendfailed = true;
                 }
                 conn.last_command = txBuffer.cmd;
             }
             pthread_mutex_unlock(&spMutex);
 
             txBuffer_pending = false;
-
+            
+            // main thread doesn't know send failed...
+            
             // tell main thread that txBuffer is empty
             pthread_cond_signal(&txBufferSig);
         }
@@ -513,7 +522,8 @@ __attribute__((force_align_arg_pointer))
 }
 
 bool IsCommunicationThreadDead(void) {
-    return comm_thread_dead;
+    bool ret = __atomic_load_n(&comm_thread_dead, __ATOMIC_SEQ_CST);
+    return ret;
 }
 
 bool ReConnectProxmark(void) {   
diff --git a/client/proxmark3.c b/client/proxmark3.c
index c5bfb1cb2..c0c745f09 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -99,11 +99,9 @@ main_loop(char *script_cmds_file, char *script_cmd) {
         
         // If communications thread goes down. Device disconnected then this should hook up PM3 again.
         if ( IsCommunicationThreadDead() ) {
-            PrintAndLogEx(ERR, _RED_("ERROR:") "cannot communicate with the Proxmark, waiting for device to reconnect...");
             session.pm3_present = ReConnectProxmark();
             if (session.pm3_present && (TestProxmark() != PM3_SUCCESS)) {
                 session.pm3_present = false;
-                continue;
             }
         }
 
diff --git a/include/pm3_cmd.h b/include/pm3_cmd.h
index 9f245d0e7..cba00e7f0 100644
--- a/include/pm3_cmd.h
+++ b/include/pm3_cmd.h
@@ -460,7 +460,8 @@ extern capabilities_t pm3_capabilities;
 #define PM3_EMALLOC           -12
 // File error                           client:     error related to file access on host
 #define PM3_EFILE             -13
-
+// Generic TTY error
+#define PM3_ENOTTY            -14
 // No data                              pm3:        no data available, no host frame available (not really an error)
 #define PM3_ENODATA           -98
 // Quit program                         client:     reserved, order to quit the program
diff --git a/uart/uart.h b/uart/uart.h
index fe51f0643..efd582c0b 100644
--- a/uart/uart.h
+++ b/uart/uart.h
@@ -89,13 +89,13 @@ void uart_close(const serial_port sp);
  * partial read may have completed into the buffer by the corresponding
  * implementation, so pszRxLen should be checked to see if any data was written.
  */
-bool uart_receive(const serial_port sp, uint8_t *pbtRx, uint32_t pszMaxRxLen, uint32_t *pszRxLen);
+int uart_receive(const serial_port sp, uint8_t *pbtRx, uint32_t pszMaxRxLen, uint32_t *pszRxLen);
 
 /* Sends a buffer to a given serial port.
  *   pbtTx: A pointer to a buffer containing the data to send.
  *   len: The amount of data to be sent.
  */
-bool uart_send(const serial_port sp, const uint8_t *pbtTx, const uint32_t len);
+int uart_send(const serial_port sp, const uint8_t *pbtTx, const uint32_t len);
 
 /* Sets the current speed of the serial port, in baud.
  */
diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index c80ad295b..f158cb9e8 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -235,7 +235,7 @@ void uart_close(const serial_port sp) {
     free(sp);
 }
 
-bool uart_receive(const serial_port sp, uint8_t *pbtRx, uint32_t pszMaxRxLen, uint32_t *pszRxLen) {
+int uart_receive(const serial_port sp, uint8_t *pbtRx, uint32_t pszMaxRxLen, uint32_t *pszRxLen) {
     uint32_t byteCount;  // FIONREAD returns size on 32b
     fd_set rfds;
     struct timeval tv;
@@ -252,24 +252,24 @@ bool uart_receive(const serial_port sp, uint8_t *pbtRx, uint32_t pszMaxRxLen, ui
 
         // Read error
         if (res < 0) {
-            return false;
+            return PM3_EIO;
         }
 
         // Read time-out
         if (res == 0) {
             if (*pszRxLen == 0) {
                 // We received no data
-                return false;
+                return PM3_ENODATA;
             } else {
                 // We received some data, but nothing more is available
-                return true;
+                return PM3_SUCCESS;
             }
         }
 
         // Retrieve the count of the incoming bytes
         res = ioctl(((serial_port_unix *)sp)->fd, FIONREAD, &byteCount);
 //        printf("UART:: RX ioctl res %d byteCount %u\n", res, byteCount);
-        if (res < 0) return false;
+        if (res < 0) return PM3_ENOTTY;
 
         // Cap the number of bytes, so we don't overrun the buffer
         if (pszMaxRxLen - (*pszRxLen) < byteCount) {
@@ -282,21 +282,21 @@ bool uart_receive(const serial_port sp, uint8_t *pbtRx, uint32_t pszMaxRxLen, ui
 
         // Stop if the OS has some troubles reading the data
         if (res <= 0) {
-            return false;
+            return PM3_EIO;
         }
 
         *pszRxLen += res;
 
         if (*pszRxLen == pszMaxRxLen) {
             // We have all the data we wanted.
-            return true;
+            return PM3_SUCCESS;
         }
     } while (byteCount);
 
-    return true;
+    return PM3_SUCCESS;
 }
 
-bool uart_send(const serial_port sp, const uint8_t *pbtTx, const uint32_t len) {
+int uart_send(const serial_port sp, const uint8_t *pbtTx, const uint32_t len) {
     uint32_t pos = 0;
     fd_set rfds;
     struct timeval tv;
@@ -311,24 +311,25 @@ bool uart_send(const serial_port sp, const uint8_t *pbtTx, const uint32_t len) {
         // Write error
         if (res < 0) {
             printf("UART:: write error (%d)\n", res);
-            return false;
+            return PM3_ENOTTY;
         }
 
         // Write time-out
         if (res == 0) {
             printf("UART:: write time-out\n");
-            return false;
+            return PM3_ETIMEOUT;
         }
 
         // Send away the bytes
         res = write(((serial_port_unix *)sp)->fd, pbtTx + pos, len - pos);
 
         // Stop if the OS has some troubles sending the data
-        if (res <= 0) return false;
+        if (res <= 0) 
+            return PM3_EIO;
 
         pos += res;
     }
-    return true;
+    return PM3_SUCCESS;
 }
 
 bool uart_set_speed(serial_port sp, const uint32_t uiPortSpeed) {
diff --git a/uart/uart_win32.c b/uart/uart_win32.c
index b5f7b9302..d04a4aca1 100644
--- a/uart/uart_win32.c
+++ b/uart/uart_win32.c
@@ -162,13 +162,38 @@ uint32_t uart_get_speed(const serial_port sp) {
     return 0;
 }
 
-bool uart_receive(const serial_port sp, uint8_t *pbtRx, uint32_t pszMaxRxLen, uint32_t *pszRxLen) {
-    return ReadFile(((serial_port_windows *)sp)->hPort, pbtRx, pszMaxRxLen, (LPDWORD)pszRxLen, NULL);
+int uart_receive(const serial_port sp, uint8_t *pbtRx, uint32_t pszMaxRxLen, uint32_t *pszRxLen) {
+	int res = ReadFile(((serial_port_windows *)sp)->hPort, pbtRx, pszMaxRxLen, (LPDWORD)pszRxLen, NULL); 
+    if ( res )      
+        return PM3_SUCCESS;
+
+    int errorcode = GetLastError();
+
+    // disconnected device
+    if (res == 0 && errorcode == 2) {
+        return PM3_EIO;
+    }
+
+    printf("[!]res %d | rx errorcode == %d \n",res, errorcode);    
+    return res; 
 }
 
-bool uart_send(const serial_port sp, const uint8_t *p_tx, const uint32_t len) {
+int uart_send(const serial_port sp, const uint8_t *p_tx, const uint32_t len) {
     DWORD txlen = 0;
-    return WriteFile(((serial_port_windows *)sp)->hPort, p_tx, len, &txlen, NULL);
+    int res = WriteFile(((serial_port_windows *)sp)->hPort, p_tx, len, &txlen, NULL);
+    int errorcode = GetLastError();
+    if ( res == 0 ) {
+        printf("[!]res %d | send errorcode == %d \n",res, errorcode);
+    }
+    
+    if (res == 0 && errorcode == 2) {
+        return PM3_EIO;
+    }
+    if ( res )      
+        return PM3_SUCCESS;
+
+    printf("[!!]res %d | send errorcode == %d \n",res, errorcode); 
+    return PM3_ENOTTY;
 }
 
 #endif

From ec5876ba35d56e543829044a8d8aeef3c2d73cdf Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Mon, 6 May 2019 23:23:45 +0200
Subject: [PATCH 1604/1938] Linux: Detect soon when pm3 is unplugged

---
 client/comms.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/client/comms.c b/client/comms.c
index 25636589c..dafc24709 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -319,7 +319,7 @@ __attribute__((force_align_arg_pointer))
 *uart_communication(void *targ) {
     communication_arg_t *connection = (communication_arg_t *)targ;
     uint32_t rxlen;
-    bool sendfailed = false;
+    bool commfailed = false;
     PacketResponseNG rx;
     PacketResponseNGRaw rx_raw;
 
@@ -336,8 +336,8 @@ __attribute__((force_align_arg_pointer))
 
         // Signal to main thread that communications seems off.
         // main thread will kill and restart this thread.
-        if ( sendfailed ) {
-            PrintAndLogEx(WARNING, "sending bytes to Proxmark3 device " _RED_("failed"));
+        if ( commfailed ) {
+            PrintAndLogEx(WARNING, "Communicating with Proxmark3 device " _RED_("failed"));
             __atomic_test_and_set(&comm_thread_dead, __ATOMIC_SEQ_CST);
             break;
         }
@@ -458,6 +458,9 @@ __attribute__((force_align_arg_pointer))
                 PrintAndLogEx(WARNING, "Received packet frame preamble too short: %d/%d", rxlen, sizeof(PacketResponseNGPreamble));
                 error = true;
             }
+            if (res == PM3_ENOTTY) {
+                commfailed = true;
+            }
         }
 
         pthread_mutex_unlock(&spMutex);
@@ -485,14 +488,14 @@ __attribute__((force_align_arg_pointer))
             if (txBufferNGLen) { // NG packet
                 res = uart_send(sp, (uint8_t *) &txBufferNG, txBufferNGLen);
                 if (res == PM3_EIO) {
-                    sendfailed = true;
+                    commfailed = true;
                 }
                 conn.last_command = txBufferNG.pre.cmd;
                 txBufferNGLen = 0;
             } else {
                 res = uart_send(sp, (uint8_t *) &txBuffer, sizeof(PacketCommandOLD));
                 if (res == PM3_EIO) {
-                    sendfailed = true;
+                    commfailed = true;
                 }
                 conn.last_command = txBuffer.cmd;
             }

From 1c7016360543d6f98aea9c9a4a4f57791e285cae Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 7 May 2019 01:06:01 +0200
Subject: [PATCH 1605/1938] reconnect fast

---
 client/proxmark3.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/client/proxmark3.c b/client/proxmark3.c
index c0c745f09..3115af727 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -52,6 +52,17 @@ static void showBanner(void) {
     fflush(stdout);
 }
 
+int check_comm(void) {
+    // If communications thread goes down. Device disconnected then this should hook up PM3 again.
+    if ( IsCommunicationThreadDead() ) {
+        session.pm3_present = ReConnectProxmark();
+        if (session.pm3_present && (TestProxmark() != PM3_SUCCESS)) {
+            session.pm3_present = false;
+        }
+    }
+    return 0;
+}
+
 // Main thread of PM3 Client
 void
 #ifdef __has_attribute
@@ -96,14 +107,6 @@ main_loop(char *script_cmds_file, char *script_cmd) {
     // loops every time enter is pressed...
     while (1) {
         bool printprompt = false;
-        
-        // If communications thread goes down. Device disconnected then this should hook up PM3 again.
-        if ( IsCommunicationThreadDead() ) {
-            session.pm3_present = ReConnectProxmark();
-            if (session.pm3_present && (TestProxmark() != PM3_SUCCESS)) {
-                session.pm3_present = false;
-            }
-        }
 
         // If there is a script file
         if (sf) {
@@ -155,6 +158,7 @@ main_loop(char *script_cmds_file, char *script_cmd) {
                         printprompt = true;
 
                 } else {
+                    rl_event_hook = check_comm;
                     cmd = readline(PROXPROMPT);
                     fflush(NULL);
                 }

From 86aa593b1b45e89d00223c563c753504bd05de85 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 7 May 2019 09:37:43 +0200
Subject: [PATCH 1606/1938] chg: use dynamic arrays.

---
 armsrc/appmain.c | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 989783dd1..f7fc81b57 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -422,11 +422,6 @@ void SendStatus(void) {
     DbpString(_BLUE_("Installed StandAlone Mode"));
     ModInfo();
 
-    //DbpString("Running ");
-    //Dbprintf("  Is Device attached to USB| %s", USB_ATTACHED() ? "Yes" : "No");
-    //Dbprintf("  Is Device attached to FPC| %s", send_using_0 ? "Yes" : "No");
-    //Dbprintf("  Is USB_reconnect value   | %d", GetUSBreconnect() );
-    //Dbprintf("  Is USB_configured value  | %d", GetUSBconfigured() );
 
     reply_old(CMD_ACK, 1, 0, 0, 0, 0);
 }
@@ -1187,22 +1182,29 @@ static void PacketReceived(PacketCommandNG *packet) {
 
 #ifdef WITH_FPC_USART_DEV
         case CMD_USART_TX: {
+            LED_B_ON();
             usart_writebuffer_sync(packet->data.asBytes, packet->length);
             reply_ng(CMD_USART_TX, PM3_SUCCESS, NULL, 0);
+            LED_B_OFF();
             break;
         }
         case CMD_USART_RX: {
-            uint8_t dest[USART_FIFOLEN] = {'\0'};
+            LED_B_ON();
+            uint8_t *dest = BigBuf_malloc(USART_FIFOLEN);
             uint16_t available = usart_rxdata_available();
+            
             if (available > 0) {
                 uint16_t len = usart_read_ng(dest, available);
                 reply_ng(CMD_USART_RX, PM3_SUCCESS, dest, len);
             } else {
                 reply_ng(CMD_USART_RX, PM3_ENODATA, NULL, 0);
             }
+            BigBuf_free();
+            LED_B_OFF();
             break;
         }
         case CMD_USART_TXRX: {
+            LED_B_ON();
             struct p {
                 uint32_t waittime;
                 uint8_t data[PM3_CMD_DATA_SIZE - sizeof(uint32_t)];
@@ -1211,7 +1213,9 @@ static void PacketReceived(PacketCommandNG *packet) {
             usart_writebuffer_sync(payload->data, packet->length - sizeof(payload->waittime));
             uint16_t available;
             WaitMS(payload->waittime);
-            uint8_t dest[USART_FIFOLEN] = {'\0'};
+
+            uint8_t *dest = BigBuf_malloc(USART_FIFOLEN);
+            
             available = usart_rxdata_available();
             // Dbprintf("avail (%u)",  available);
             if (available > 0) {
@@ -1220,6 +1224,8 @@ static void PacketReceived(PacketCommandNG *packet) {
             } else {
                 reply_ng(CMD_USART_TXRX, PM3_ENODATA, NULL, 0);
             }
+            BigBuf_free();
+            LED_B_OFF();
             break;
         }
 #endif

From 2fca0d80b32d9e4a14297f9f35d8abddfc1dac11 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 7 May 2019 09:39:02 +0200
Subject: [PATCH 1607/1938] cleaning

---
 common/cmd.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/common/cmd.c b/common/cmd.c
index c94f22689..8a26f56e0 100644
--- a/common/cmd.c
+++ b/common/cmd.c
@@ -73,7 +73,6 @@ int reply_old(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *d
     if (reply_via_fpc) {
 #ifdef WITH_FPC_USART_HOST
         result = usart_writebuffer_sync((uint8_t *)&txcmd, sizeof(PacketResponseOLD));
-//        Dbprintf_usb("Sent %i bytes over usart", len);
 #else
         return PM3_EDEVNOTSUPP;
 #endif
@@ -87,8 +86,6 @@ int reply_old(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *d
 static int reply_ng_internal(uint16_t cmd, int16_t status, uint8_t *data, size_t len, bool ng) {
     PacketResponseNGRaw txBufferNG;
     size_t txBufferNGLen;
-//    for (size_t i = 0; i < sizeof(txBufferNG); i++)
-//        ((uint8_t *)&txBufferNG)[i] = 0x00;
 
     // Compose the outgoing command frame
     txBufferNG.pre.magic = RESPONSENG_PREAMBLE_MAGIC;
@@ -125,14 +122,12 @@ static int reply_ng_internal(uint16_t cmd, int16_t status, uint8_t *data, size_t
     if (reply_via_fpc) {
 #ifdef WITH_FPC_USART_HOST
         result = usart_writebuffer_sync((uint8_t *)&txBufferNG, txBufferNGLen);
-//        Dbprintf_usb("Sent %i bytes over usart", len);
 #else
         return PM3_EDEVNOTSUPP;
 #endif
     } else {
         result = usb_write((uint8_t *)&txBufferNG, txBufferNGLen);
     }
-
     return result;
 }
 
@@ -151,27 +146,34 @@ int reply_mix(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *d
     memcpy(cmddata, arg, sizeof(arg));
     if (len && data)
         memcpy(cmddata + sizeof(arg), data, len);
+    
     return reply_ng_internal(cmd, status, cmddata, len + sizeof(arg), false);
 }
 
 static int receive_ng_internal(PacketCommandNG *rx, uint32_t read_ng(uint8_t *data, size_t len), bool fpc) {
     PacketCommandNGRaw rx_raw;
     size_t bytes = read_ng((uint8_t *)&rx_raw.pre, sizeof(PacketCommandNGPreamble));
+    
     if (bytes == 0)
         return PM3_ENODATA;
+    
     if (bytes != sizeof(PacketCommandNGPreamble))
         return PM3_EIO;
+    
     rx->magic = rx_raw.pre.magic;
     rx->ng = rx_raw.pre.ng;
     uint16_t length = rx_raw.pre.length;
     rx->cmd = rx_raw.pre.cmd;
+    
     if (rx->magic == COMMANDNG_PREAMBLE_MAGIC) { // New style NG command
         if (length > PM3_CMD_DATA_SIZE)
             return PM3_EOVFLOW;
+        
         // Get the core and variable length payload
         bytes = read_ng((uint8_t *)&rx_raw.data, length);
         if (bytes != length)
             return PM3_EIO;
+        
         if (rx->ng) {
             memcpy(rx->data.asBytes, rx_raw.data, length);
             rx->length = length;
@@ -179,6 +181,7 @@ static int receive_ng_internal(PacketCommandNG *rx, uint32_t read_ng(uint8_t *da
             uint64_t arg[3];
             if (length < sizeof(arg))
                 return PM3_EIO;
+            
             memcpy(arg, rx_raw.data, sizeof(arg));
             rx->oldarg[0] = arg[0];
             rx->oldarg[1] = arg[1];
@@ -190,6 +193,7 @@ static int receive_ng_internal(PacketCommandNG *rx, uint32_t read_ng(uint8_t *da
         bytes = read_ng((uint8_t *)&rx_raw.foopost, sizeof(PacketCommandNGPostamble));
         if (bytes != sizeof(PacketCommandNGPostamble))
             return PM3_EIO;
+        
         // Check CRC, accept MAGIC as placeholder
         rx->crc = rx_raw.foopost.crc;
         if (rx->crc != COMMANDNG_POSTAMBLE_MAGIC) {
@@ -205,6 +209,7 @@ static int receive_ng_internal(PacketCommandNG *rx, uint32_t read_ng(uint8_t *da
         bytes = read_ng(((uint8_t *)&rx_old) + sizeof(PacketCommandNGPreamble), sizeof(PacketCommandOLD) - sizeof(PacketCommandNGPreamble));
         if (bytes != sizeof(PacketCommandOLD) - sizeof(PacketCommandNGPreamble))
             return PM3_EIO;
+        
         reply_via_fpc = fpc;
         rx->ng = false;
         rx->magic = 0;

From fba239b3e2740b80952a643c16d91b40b54882d6 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 7 May 2019 09:39:23 +0200
Subject: [PATCH 1608/1938] color

---
 common/i2c.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/i2c.c b/common/i2c.c
index df5450f9f..e4d3a4723 100644
--- a/common/i2c.c
+++ b/common/i2c.c
@@ -596,7 +596,7 @@ void I2C_print_status(void) {
     DbpString(_BLUE_("Smart card module (ISO 7816)"));
     uint8_t maj, min;
     if (I2C_get_version(&maj, &min) == PM3_SUCCESS)
-        Dbprintf("  version.................v%x.%02d", maj, min);
+        Dbprintf("  version................." _YELLOW_("v%x.%02d"), maj, min);
     else
         DbpString("  version................." _RED_("FAILED"));
 }

From 61d250a7f82e45872a900c2ad6e551122ee070f4 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 7 May 2019 11:05:05 +0200
Subject: [PATCH 1609/1938] add: 'hw connect'  - lets you connect to a
 specified serial port.  If already connected, it disconnects current port
 before.

---
 client/cmdhw.c     | 61 ++++++++++++++++++++++++++++++++++++++++------
 client/proxmark3.c |  8 ++++--
 uart/uart_win32.c  |  9 +++----
 3 files changed, 62 insertions(+), 16 deletions(-)

diff --git a/client/cmdhw.c b/client/cmdhw.c
index a6d4a18dd..01c9cf350 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -37,7 +37,7 @@ static int usage_hw_detectreader(void) {
 }
 
 static int usage_hw_setmux(void) {
-    PrintAndLogEx(NORMAL, "Set mux mode");
+    PrintAndLogEx(NORMAL, "Set the ADC mux to a specific value");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  hw setmux [h] <lopkd | loraw | hipkd | hiraw>");
     PrintAndLogEx(NORMAL, "Options:");
@@ -49,6 +49,20 @@ static int usage_hw_setmux(void) {
     return PM3_SUCCESS;
 }
 
+static int usage_hw_connect(void) {
+    PrintAndLogEx(NORMAL, "Connects to a Proxmark3 device via specified serial port");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  hw connect [h] <port>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "           h          This help");
+    PrintAndLogEx(NORMAL, "           <port>   serial port to connect to");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      hw connect /dev/ttyACM0    -- *nix ");
+    PrintAndLogEx(NORMAL, "      hw connect com3            -- windows");
+    return PM3_SUCCESS;
+}
+
 static void lookupChipID(uint32_t iChipID, uint32_t mem_used) {
     char asBuff[120];
     memset(asBuff, 0, sizeof(asBuff));
@@ -426,7 +440,7 @@ static int CmdSetMux(const char *Cmd) {
     else {
         usage_hw_setmux();
         return PM3_EINVARG;
-    }
+        }
     clearCommandBuffer();
     SendCommandOLD(CMD_SET_ADC_MUX, arg, 0, 0, NULL, 0);
     return PM3_SUCCESS;
@@ -458,9 +472,9 @@ static int CmdPing(const char *Cmd) {
     PacketResponseNG resp;
     SendCommandMIX(CMD_PING, 0, 0, 0, NULL, 0);
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1000))
-        PrintAndLogEx(NORMAL, "Ping " _GREEN_("successful"));
+        PrintAndLogEx(SUCCESS, "Ping " _GREEN_("successful"));
     else
-        PrintAndLogEx(NORMAL, "Ping " _RED_("failed"));
+        PrintAndLogEx(WARNING, "Ping " _RED_("failed"));
     return PM3_SUCCESS;
 }
 
@@ -485,21 +499,52 @@ static int CmdPingNG(const char *Cmd) {
     return PM3_SUCCESS;
 }
 
+static int CmdConnect(const char *Cmd) {
+
+    if (tolower(Cmd[0] == 'h'))
+        return usage_hw_connect();
+
+    char *port = NULL;
+    port = (char *)Cmd;
+
+    if (port != NULL) {
+        
+        // if we were already connected,  disconnect first.
+        if (session.pm3_present) {
+            PrintAndLogEx(INFO, "Disconnecting from current serial port");
+            CloseProxmark();
+            session.pm3_present = false;
+        }
+
+        // try to open serial port
+        session.pm3_present = OpenProxmark(port, false, 20, false, USART_BAUD_RATE);
+
+        if (session.pm3_present && (TestProxmark() != PM3_SUCCESS)) {
+            PrintAndLogEx(ERR, _RED_("ERROR:") "cannot communicate with the Proxmark\n");
+            CloseProxmark();
+            session.pm3_present = false;
+        } else {
+        }
+    }
+    return PM3_SUCCESS;
+}
+
 static command_t CommandTable[] = {
     {"help",          CmdHelp,        AlwaysAvailable, "This help"},
+    {"connect",       CmdConnect,     AlwaysAvailable, "connect Proxmark3 to serial port"},
     {"detectreader",  CmdDetectReader, IfPm3Present,    "['l'|'h'] -- Detect external reader field (option 'l' or 'h' to limit to LF or HF)"},
     {"fpgaoff",       CmdFPGAOff,     IfPm3Present,    "Set FPGA off"},
     {"lcd",           CmdLCD,         IfPm3Lcd,        "<HEX command> <count> -- Send command/data to LCD"},
     {"lcdreset",      CmdLCDReset,    IfPm3Lcd,        "Hardware reset LCD"},
+    {"ping",          CmdPing,        IfPm3Present,    "Test if the Proxmark3 is responding"},
+    {"pingng",        CmdPingNG,      IfPm3Present,    "Test if the Proxmark3 is responsive, using new frame format (experimental)"},
     {"readmem",       CmdReadmem,     IfPm3Present,    "[address] -- Read memory at decimal address from flash"},
     {"reset",         CmdReset,       IfPm3Present,    "Reset the Proxmark3"},
     {"setlfdivisor",  CmdSetDivisor,  IfPm3Present,    "<19 - 255> -- Drive LF antenna at 12Mhz/(divisor+1)"},
-    {"setmux",        CmdSetMux,      IfPm3Present,    "<loraw|hiraw|lopkd|hipkd> -- Set the ADC mux to a specific value"},
+    {"setmux",        CmdSetMux,      IfPm3Present,    "Set the ADC mux to a specific value"},
+    {"status",        CmdStatus,      IfPm3Present,    "Show runtime status information about the connected Proxmark3"},
     {"tune",          CmdTune,        IfPm3Present,    "Measure antenna tuning"},
     {"version",       CmdVersion,     IfPm3Present,    "Show version information about the connected Proxmark3"},
-    {"status",        CmdStatus,      IfPm3Present,    "Show runtime status information about the connected Proxmark3"},
-    {"ping",          CmdPing,        IfPm3Present,    "Test if the Proxmark3 is responding"},
-    {"pingng",        CmdPingNG,      IfPm3Present,    "Test if the Proxmark3 is responsive, using new frame format (experimental)"},
     {NULL, NULL, NULL, NULL}
 };
 
diff --git a/client/proxmark3.c b/client/proxmark3.c
index 3115af727..1543c7f6e 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -158,8 +158,12 @@ main_loop(char *script_cmds_file, char *script_cmd) {
                         printprompt = true;
 
                 } else {
-                    rl_event_hook = check_comm;
-                    cmd = readline(PROXPROMPT);
+                    //rl_event_hook = check_comm;
+                    if (session.pm3_present )
+                        cmd = readline(PROXPROMPT);
+                    else
+                        cmd = readline("[offline] "PROXPROMPT);
+                    
                     fflush(NULL);
                 }
             }
diff --git a/uart/uart_win32.c b/uart/uart_win32.c
index d04a4aca1..8dc5300ad 100644
--- a/uart/uart_win32.c
+++ b/uart/uart_win32.c
@@ -181,16 +181,13 @@ int uart_receive(const serial_port sp, uint8_t *pbtRx, uint32_t pszMaxRxLen, uin
 int uart_send(const serial_port sp, const uint8_t *p_tx, const uint32_t len) {
     DWORD txlen = 0;
     int res = WriteFile(((serial_port_windows *)sp)->hPort, p_tx, len, &txlen, NULL);
-    int errorcode = GetLastError();
-    if ( res == 0 ) {
-        printf("[!]res %d | send errorcode == %d \n",res, errorcode);
-    }
+    if ( res )      
+        return PM3_SUCCESS;
     
+    int errorcode = GetLastError();
     if (res == 0 && errorcode == 2) {
         return PM3_EIO;
     }
-    if ( res )      
-        return PM3_SUCCESS;
 
     printf("[!!]res %d | send errorcode == %d \n",res, errorcode); 
     return PM3_ENOTTY;

From fb7445a027776ad08b5ede5f488f5f5dedf3e272 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 7 May 2019 11:42:36 +0200
Subject: [PATCH 1610/1938] chg: 'hw connect' - make port optional.  Reused
 previous serial port

---
 client/cmdhw.c | 36 +++++++++++++++++-------------------
 client/comms.c |  4 ++++
 client/comms.h |  1 +
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/client/cmdhw.c b/client/cmdhw.c
index 01c9cf350..616237063 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -6,6 +6,7 @@
 // the license.
 //-----------------------------------------------------------------------------
 // Hardware commands
+// low-level hardware control
 //-----------------------------------------------------------------------------
 
 #include <stdio.h>
@@ -19,8 +20,6 @@
 #include "cmdmain.h"
 #include "cmddata.h"
 
-/* low-level hardware control */
-
 static int CmdHelp(const char *Cmd);
 
 static int usage_hw_detectreader(void) {
@@ -58,8 +57,7 @@ static int usage_hw_connect(void) {
     PrintAndLogEx(NORMAL, "           <port>   serial port to connect to");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
-    PrintAndLogEx(NORMAL, "      hw connect /dev/ttyACM0    -- *nix ");
-    PrintAndLogEx(NORMAL, "      hw connect com3            -- windows");
+    PrintAndLogEx(NORMAL, "      hw connect "SERIAL_PORT_H);
     return PM3_SUCCESS;
 }
 
@@ -507,24 +505,24 @@ static int CmdConnect(const char *Cmd) {
     char *port = NULL;
     port = (char *)Cmd;
 
-    if (port != NULL) {
+    // default back to previous used serial port
+    if (strlen(port) == 0 )
+        GetSavedSerialPortName( &port );
         
-        // if we were already connected,  disconnect first.
-        if (session.pm3_present) {
-            PrintAndLogEx(INFO, "Disconnecting from current serial port");
-            CloseProxmark();
-            session.pm3_present = false;
-        }
+    // if we were already connected,  disconnect first.
+    if (session.pm3_present) {
+        PrintAndLogEx(INFO, "Disconnecting from current serial port");
+        CloseProxmark();
+        session.pm3_present = false;
+    }
 
-        // try to open serial port
-        session.pm3_present = OpenProxmark(port, false, 20, false, USART_BAUD_RATE);
+    // try to open serial port
+    session.pm3_present = OpenProxmark(port, false, 20, false, USART_BAUD_RATE);
 
-        if (session.pm3_present && (TestProxmark() != PM3_SUCCESS)) {
-            PrintAndLogEx(ERR, _RED_("ERROR:") "cannot communicate with the Proxmark\n");
-            CloseProxmark();
-            session.pm3_present = false;
-        } else {
-        }
+    if (session.pm3_present && (TestProxmark() != PM3_SUCCESS)) {
+        PrintAndLogEx(ERR, _RED_("ERROR:") "cannot communicate with the Proxmark\n");
+        CloseProxmark();
+        session.pm3_present = false;
     }
     return PM3_SUCCESS;
 }
diff --git a/client/comms.c b/client/comms.c
index dafc24709..c28aef238 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -59,6 +59,10 @@ static uint64_t timeout_start_time;
 
 static bool dl_it(uint8_t *dest, uint32_t bytes, uint32_t start_index, PacketResponseNG *response, size_t ms_timeout, bool show_warning, uint32_t rec_cmd);
 
+void GetSavedSerialPortName( char **dest ) {
+    *dest = serial_port_name;
+}
+
 void SendCommand(PacketCommandOLD *c) {
 
 #ifdef COMMS_DEBUG
diff --git a/client/comms.h b/client/comms.h
index 70c0526bf..7eb3345c5 100644
--- a/client/comms.h
+++ b/client/comms.h
@@ -62,6 +62,7 @@ void SendCommandMIX(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, v
 void clearCommandBuffer(void);
 
 #define FLASHMODE_SPEED 460800
+void GetSavedSerialPortName( char **dest );
 bool IsCommunicationThreadDead(void);
 bool ReConnectProxmark(void);
 bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode, uint32_t speed);

From bb19e42bbddb6c27e31c5a15a6395c1cf097e5ae Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 7 May 2019 11:44:29 +0200
Subject: [PATCH 1611/1938] textual

---
 client/cmdhw.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/cmdhw.c b/client/cmdhw.c
index 616237063..8cff17552 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -411,13 +411,13 @@ static int CmdSetDivisor(const char *Cmd) {
     uint16_t arg = strtol(Cmd, NULL, 0);
 
     if (arg < 19 || arg > 255) {
-        PrintAndLogEx(NORMAL, "divisor must be between 19 and 255");
+        PrintAndLogEx(ERR, "divisor must be between 19 and 255");
         return PM3_EINVARG;
     }
     // 12 000 000 (12Mhz)
     clearCommandBuffer();
     SendCommandOLD(CMD_SET_LF_DIVISOR, arg, 0, 0, NULL, 0);
-    PrintAndLogEx(NORMAL, "Divisor set, expected %.1f KHz", ((double)12000 / (arg + 1)));
+    PrintAndLogEx(SUCCESS, "Divisor set, expected %.1f KHz", ((double)12000 / (arg + 1)));
     return PM3_SUCCESS;
 }
 
@@ -460,7 +460,7 @@ static int CmdStatus(const char *Cmd) {
     PacketResponseNG resp;
     SendCommandOLD(CMD_STATUS, 0, 0, 0, NULL, 0);
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000))
-        PrintAndLogEx(NORMAL, "Status command failed. Communication speed test timed out");
+        PrintAndLogEx(WARNING, "Status command failed. Communication speed test timed out");
     return PM3_SUCCESS;
 }
 

From f68a398e42416f17f7c94dce75f9a40a2b1d3c48 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 7 May 2019 11:46:12 +0200
Subject: [PATCH 1612/1938] rename

---
 client/cmdhw.c     |  2 +-
 client/flasher.c   |  2 +-
 client/proxmark3.c | 12 ++++++------
 uart/uart.h        |  6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/client/cmdhw.c b/client/cmdhw.c
index 8cff17552..64528006a 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -57,7 +57,7 @@ static int usage_hw_connect(void) {
     PrintAndLogEx(NORMAL, "           <port>   serial port to connect to");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
-    PrintAndLogEx(NORMAL, "      hw connect "SERIAL_PORT_H);
+    PrintAndLogEx(NORMAL, "      hw connect "SERIAL_PORT_EXAMPLE_H);
     return PM3_SUCCESS;
 }
 
diff --git a/client/flasher.c b/client/flasher.c
index 844b7accf..80b59d90d 100644
--- a/client/flasher.c
+++ b/client/flasher.c
@@ -25,7 +25,7 @@
 static void usage(char *argv0) {
     PrintAndLogEx(NORMAL, "Usage:   %s <port> [-b] image.elf [image.elf...]\n", argv0);
     PrintAndLogEx(NORMAL, "\t-b\tEnable flashing of bootloader area (DANGEROUS)\n");
-    PrintAndLogEx(NORMAL, "\nExample:\n\n\t %s "SERIAL_PORT_H" armsrc/obj/fullimage.elf", argv0);
+    PrintAndLogEx(NORMAL, "\nExample:\n\n\t %s "SERIAL_PORT_EXAMPLE_H" armsrc/obj/fullimage.elf", argv0);
 #ifdef __linux__
     PrintAndLogEx(NORMAL, "\nNote (Linux): if the flasher gets stuck in 'Waiting for Proxmark3 to reappear on <DEVICE>',");
     PrintAndLogEx(NORMAL, "              you need to blacklist Proxmark3 for modem-manager - see wiki for more details:\n");
diff --git a/client/proxmark3.c b/client/proxmark3.c
index 1543c7f6e..ffbe344e2 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -276,15 +276,15 @@ static void show_help(bool showFullHelp, char *exec_name) {
         PrintAndLogEx(NORMAL, "\nsamples:");
         PrintAndLogEx(NORMAL, "      %s -h\n", exec_name);
         PrintAndLogEx(NORMAL, "      %s -m\n", exec_name);
-        PrintAndLogEx(NORMAL, "      %s "SERIAL_PORT_H" -f             -- flush output everytime\n", exec_name);
-        PrintAndLogEx(NORMAL, "      %s "SERIAL_PORT_H" -w             -- wait for serial port\n", exec_name);
+        PrintAndLogEx(NORMAL, "      %s "SERIAL_PORT_EXAMPLE_H" -f             -- flush output everytime\n", exec_name);
+        PrintAndLogEx(NORMAL, "      %s "SERIAL_PORT_EXAMPLE_H" -w             -- wait for serial port\n", exec_name);
         PrintAndLogEx(NORMAL, "\n  how to run Proxmark3 client\n");
-        PrintAndLogEx(NORMAL, "      %s "SERIAL_PORT_H"                -- runs the pm3 client\n", exec_name);
+        PrintAndLogEx(NORMAL, "      %s "SERIAL_PORT_EXAMPLE_H"                -- runs the pm3 client\n", exec_name);
         PrintAndLogEx(NORMAL, "      %s                             -- runs the pm3 client in OFFLINE mode\n", exec_name);
         PrintAndLogEx(NORMAL, "\n  how to execute different commands from terminal\n");
-        PrintAndLogEx(NORMAL, "      %s "SERIAL_PORT_H" -c \"hf mf chk 1* ?\"   -- execute cmd and quit client\n", exec_name);
-        PrintAndLogEx(NORMAL, "      %s "SERIAL_PORT_H" -l hf_read            -- execute lua script " _YELLOW_("`hf_read`")"and quit client\n", exec_name);
-        PrintAndLogEx(NORMAL, "      %s "SERIAL_PORT_H" -s mycmds.txt         -- execute each pm3 cmd in file and quit client\n", exec_name);
+        PrintAndLogEx(NORMAL, "      %s "SERIAL_PORT_EXAMPLE_H" -c \"hf mf chk 1* ?\"   -- execute cmd and quit client\n", exec_name);
+        PrintAndLogEx(NORMAL, "      %s "SERIAL_PORT_EXAMPLE_H" -l hf_read            -- execute lua script " _YELLOW_("`hf_read`")"and quit client\n", exec_name);
+        PrintAndLogEx(NORMAL, "      %s "SERIAL_PORT_EXAMPLE_H" -s mycmds.txt         -- execute each pm3 cmd in file and quit client\n", exec_name);
     }
 }
 
diff --git a/uart/uart.h b/uart/uart.h
index efd582c0b..b359d6af2 100644
--- a/uart/uart.h
+++ b/uart/uart.h
@@ -45,11 +45,11 @@
 
 
 #if defined (_WIN32)
-#define SERIAL_PORT_H   "com3"
+#define SERIAL_PORT_EXAMPLE_H   "com3"
 #elif defined(__APPLE__)
-#define SERIAL_PORT_H   "/dev/cu.usbmodem"
+#define SERIAL_PORT_EXAMPLE_H   "/dev/cu.usbmodem"
 #else
-#define SERIAL_PORT_H   "/dev/ttyACM0"
+#define SERIAL_PORT_EXAMPLE_H   "/dev/ttyACM0"
 #endif
 
 /* serial_port is declared as a void*, which you should cast to whatever type

From 6113d6bbb45a889e46ee6b3e0a21422bb116d87a Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 7 May 2019 12:05:23 +0200
Subject: [PATCH 1613/1938] chg: init timeout values everytime.

---
 uart/uart_posix.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index f158cb9e8..9e7ab0765 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -82,6 +82,9 @@ serial_port uart_open(const char *pcPortName, uint32_t speed) {
     serial_port_unix *sp = calloc(sizeof(serial_port_unix), sizeof(uint8_t));
     if (sp == 0) return INVALID_SERIAL_PORT;
 
+    // init timeouts
+    uart_reconfigure_timeouts(sp, UART_FPC_CLIENT_RX_TIMEOUT_MS);
+
     if (memcmp(pcPortName, "tcp:", 4) == 0) {
         struct addrinfo *addr, *rp;
         char *addrstr = strdup(pcPortName + 4);
@@ -147,7 +150,6 @@ serial_port uart_open(const char *pcPortName, uint32_t speed) {
         return sp;
     }
 
-
     sp->fd = open(pcPortName, O_RDWR | O_NOCTTY | O_NDELAY | O_NONBLOCK);
     if (sp->fd == -1) {
         uart_close(sp);
@@ -200,15 +202,12 @@ serial_port uart_open(const char *pcPortName, uint32_t speed) {
     tcflush(sp->fd, TCIOFLUSH);
 
     if (!uart_set_speed(sp, speed)) {
-        // trying some fallbacks automatically
+        // try fallback automatically
         speed = 115200;
         if (!uart_set_speed(sp, speed)) {
-            speed = 9600;
-            if (!uart_set_speed(sp, speed)) {
-                uart_close(sp);
-                printf("[!] UART error while setting baudrate\n");
-                return INVALID_SERIAL_PORT;
-            }
+            uart_close(sp);
+            printf("[!] UART error while setting baudrate\n");
+            return INVALID_SERIAL_PORT;
         }
     }
     conn.uart_speed = uart_get_speed(sp);

From 7785dcbce4b647b6bc1f11c95004f4aacc66724c Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 7 May 2019 12:05:37 +0200
Subject: [PATCH 1614/1938] chg: less fallbacks

---
 uart/uart_win32.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/uart/uart_win32.c b/uart/uart_win32.c
index 8dc5300ad..dffd84b93 100644
--- a/uart/uart_win32.c
+++ b/uart/uart_win32.c
@@ -106,15 +106,12 @@ serial_port uart_open(const char *pcPortName, uint32_t speed) {
     uart_reconfigure_timeouts(sp, UART_FPC_CLIENT_RX_TIMEOUT_MS);
 
     if (!uart_set_speed(sp, speed)) {
-        // trying some fallbacks automatically
+        // try fallback automatically
         speed = 115200;
         if (!uart_set_speed(sp, speed)) {
-            speed = 9600;
-            if (!uart_set_speed(sp, speed)) {
-                uart_close(sp);
-                printf("[!] UART error while setting baudrate\n");
-                return INVALID_SERIAL_PORT;
-            }
+            uart_close(sp);
+            printf("[!] UART error while setting baudrate\n");
+            return INVALID_SERIAL_PORT;
         }
     }
     conn.uart_speed = uart_get_speed(sp);

From de54d35d5f9feff46001063be72f9a51f7870819 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 7 May 2019 12:11:36 +0200
Subject: [PATCH 1615/1938] unplug detection

---
 client/comms.c     |  9 +--------
 client/comms.h     |  1 -
 client/proxmark3.c | 10 ++++------
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/client/comms.c b/client/comms.c
index c28aef238..8f143d5e3 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -533,14 +533,6 @@ bool IsCommunicationThreadDead(void) {
     return ret;
 }
 
-bool ReConnectProxmark(void) {   
-   char *port = serial_port_name;
-   bool res = OpenProxmark(port, true, 20, false, _speed);
-   if ( res )
-        __atomic_clear(&comm_thread_dead, __ATOMIC_SEQ_CST);
-   return res;
-}
-
 bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode, uint32_t speed) {
 
     char *portname = (char *)port;
@@ -583,6 +575,7 @@ bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode,
         conn.send_via_fpc_usart = false;
 
         pthread_create(&communication_thread, NULL, &uart_communication, &conn);
+        __atomic_clear(&comm_thread_dead, __ATOMIC_SEQ_CST);
 
         fflush(stdout);
         // create a mutex to avoid interlacing print commands from our different threads
diff --git a/client/comms.h b/client/comms.h
index 7eb3345c5..501ee18e7 100644
--- a/client/comms.h
+++ b/client/comms.h
@@ -64,7 +64,6 @@ void clearCommandBuffer(void);
 #define FLASHMODE_SPEED 460800
 void GetSavedSerialPortName( char **dest );
 bool IsCommunicationThreadDead(void);
-bool ReConnectProxmark(void);
 bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode, uint32_t speed);
 int TestProxmark(void);
 void CloseProxmark(void);
diff --git a/client/proxmark3.c b/client/proxmark3.c
index ffbe344e2..0080a6a27 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -54,11 +54,9 @@ static void showBanner(void) {
 
 int check_comm(void) {
     // If communications thread goes down. Device disconnected then this should hook up PM3 again.
-    if ( IsCommunicationThreadDead() ) {
-        session.pm3_present = ReConnectProxmark();
-        if (session.pm3_present && (TestProxmark() != PM3_SUCCESS)) {
-            session.pm3_present = false;
-        }
+    if ( IsCommunicationThreadDead() && session.pm3_present) {
+        session.pm3_present = false;
+        PrintAndLogEx(INFO, "Running in " _YELLOW_("OFFLINE") "mode. Use \"hw connect\" to reconnect\n");
     }
     return 0;
 }
@@ -158,7 +156,7 @@ main_loop(char *script_cmds_file, char *script_cmd) {
                         printprompt = true;
 
                 } else {
-                    //rl_event_hook = check_comm;
+                    rl_event_hook = check_comm;
                     if (session.pm3_present )
                         cmd = readline(PROXPROMPT);
                     else

From a20392edf340e50ca9aa1144aef38cc4441fca3b Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 7 May 2019 12:18:51 +0200
Subject: [PATCH 1616/1938] change offline prompt asap

---
 client/proxmark3.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/proxmark3.c b/client/proxmark3.c
index 0080a6a27..b8ca3e4ff 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -55,6 +55,7 @@ static void showBanner(void) {
 int check_comm(void) {
     // If communications thread goes down. Device disconnected then this should hook up PM3 again.
     if ( IsCommunicationThreadDead() && session.pm3_present) {
+        rl_set_prompt("[offline] "PROXPROMPT);
         session.pm3_present = false;
         PrintAndLogEx(INFO, "Running in " _YELLOW_("OFFLINE") "mode. Use \"hw connect\" to reconnect\n");
     }

From f85280ad41b40a625421b2df82e3cb35f4c4181e Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 7 May 2019 12:28:17 +0200
Subject: [PATCH 1617/1938] fix: 'hw connect' - if pm3 client was in offline
 more to start with,  check..

---
 client/cmdhw.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/client/cmdhw.c b/client/cmdhw.c
index 64528006a..9ad9780c9 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -508,14 +508,20 @@ static int CmdConnect(const char *Cmd) {
     // default back to previous used serial port
     if (strlen(port) == 0 )
         GetSavedSerialPortName( &port );
-        
+
+    if ( port == NULL ) {
+        return usage_hw_connect();
+    }
     // if we were already connected,  disconnect first.
-    if (session.pm3_present) {
+    //if (session.pm3_present) {
         PrintAndLogEx(INFO, "Disconnecting from current serial port");
         CloseProxmark();
         session.pm3_present = false;
-    }
+    //}
 
+    // set timeouts
+    //int res = uart_reconfigure_timeouts(sp, UART_USB_CLIENT_RX_TIMEOUT_MS);
+    
     // try to open serial port
     session.pm3_present = OpenProxmark(port, false, 20, false, USART_BAUD_RATE);
 

From b91e21edde0320f197fe28fcc0d62e5e292dbfd6 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 7 May 2019 12:29:26 +0200
Subject: [PATCH 1618/1938] better output from setting prompt,  cursor is still
 inside ...

---
 client/proxmark3.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/proxmark3.c b/client/proxmark3.c
index b8ca3e4ff..4d185afb2 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -57,7 +57,8 @@ int check_comm(void) {
     if ( IsCommunicationThreadDead() && session.pm3_present) {
         rl_set_prompt("[offline] "PROXPROMPT);
         session.pm3_present = false;
-        PrintAndLogEx(INFO, "Running in " _YELLOW_("OFFLINE") "mode. Use \"hw connect\" to reconnect\n");
+        PrintAndLogEx(INFO, "\nRunning in " _YELLOW_("OFFLINE") "mode. Use \"hw connect\" to reconnect\n");
+        
     }
     return 0;
 }

From 0bd704448d53ec36fc7cb7e0cba197547d635110 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 7 May 2019 13:17:13 +0200
Subject: [PATCH 1619/1938] sample platform file.

uncomment second row, in order to compile for BT etc.
---
 Makefile.platform | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 Makefile.platform

diff --git a/Makefile.platform b/Makefile.platform
new file mode 100644
index 000000000..7b76f1af6
--- /dev/null
+++ b/Makefile.platform
@@ -0,0 +1,2 @@
+PLATFORM=PM3RDV4
+#PLATFORM_EXTRAS=BTADDON FPC_USART_DEV
\ No newline at end of file

From 63485527ade86ea78aeca07cc4987381946663d2 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 7 May 2019 13:29:00 +0200
Subject: [PATCH 1620/1938] rename platform file sample

---
 Makefile.platform        | 2 --
 Makefile.platform.sample | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)
 delete mode 100644 Makefile.platform
 create mode 100644 Makefile.platform.sample

diff --git a/Makefile.platform b/Makefile.platform
deleted file mode 100644
index 7b76f1af6..000000000
--- a/Makefile.platform
+++ /dev/null
@@ -1,2 +0,0 @@
-PLATFORM=PM3RDV4
-#PLATFORM_EXTRAS=BTADDON FPC_USART_DEV
\ No newline at end of file
diff --git a/Makefile.platform.sample b/Makefile.platform.sample
new file mode 100644
index 000000000..8ef572461
--- /dev/null
+++ b/Makefile.platform.sample
@@ -0,0 +1,3 @@
+# If you want to use it, copy this file as Makefile.platform and adjust it to your needs
+PLATFORM=PM3RDV4
+#PLATFORM_EXTRAS=BTADDON

From f60977695aac7eccd2b1da0e642b87fc01c00cc7 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 7 May 2019 14:41:20 +0200
Subject: [PATCH 1621/1938] cleaning up

---
 armsrc/appmain.c  |  3 ++-
 armsrc/flashmem.c |  6 +++---
 client/comms.c    | 13 ++-----------
 client/comms.h    |  1 +
 4 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index f7fc81b57..89b5d1cf1 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1641,7 +1641,8 @@ void  __attribute__((noreturn)) AppMain(void) {
         if (ret == PM3_SUCCESS) {
             PacketReceived(&rx);
         } else if (ret != PM3_ENODATA) {
-            Dbprintf("Error in frame reception: %d", ret);
+            
+            Dbprintf("Error in frame reception: %d %s", ret, (ret == PM3_EIO)?"PM3_EIO":"");
             // TODO if error, shall we resync ?
         }
 
diff --git a/armsrc/flashmem.c b/armsrc/flashmem.c
index 3ec746074..a134ebbd0 100644
--- a/armsrc/flashmem.c
+++ b/armsrc/flashmem.c
@@ -529,13 +529,13 @@ void Flashmem_print_status(void) {
     uint8_t dev_id = Flash_ReadID();
     switch (dev_id) {
         case 0x11 :
-            DbpString("  Memory size.............2 mbits / 256kb");
+            DbpString("  Memory size............." _YELLOW_("2 mbits / 256kb"));
             break;
         case 0x10 :
-            DbpString("  Memory size..... .......1 mbits / 128kb");
+            DbpString("  Memory size..... ......." _YELLOW_("1 mbits / 128kb"));
             break;
         case 0x05 :
-            DbpString("  Memory size.............512 kbits / 64kb");
+            DbpString("  Memory size............." _YELLOW_("512 kbits / 64kb"));
             break;
         default :
             DbpString("  Device ID..............." _YELLOW_(" -->  Unknown  <--"));
diff --git a/client/comms.c b/client/comms.c
index 8f143d5e3..7f6691390 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -21,8 +21,6 @@
 
 // Serial port that we are communicating with the PM3 on.
 static serial_port sp = NULL;
-static char *serial_port_name = NULL;
-static uint32_t _speed = 0;
 
 communication_arg_t conn;
 capabilities_t pm3_capabilities;
@@ -60,7 +58,7 @@ static uint64_t timeout_start_time;
 static bool dl_it(uint8_t *dest, uint32_t bytes, uint32_t start_index, PacketResponseNG *response, size_t ms_timeout, bool show_warning, uint32_t rec_cmd);
 
 void GetSavedSerialPortName( char **dest ) {
-    *dest = serial_port_name;
+    *dest = conn.serial_port_name;
 }
 
 void SendCommand(PacketCommandOLD *c) {
@@ -555,17 +553,14 @@ bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode,
     if (sp == INVALID_SERIAL_PORT) {
         PrintAndLogEx(WARNING, "\n" _RED_("ERROR:") "invalid serial port " _YELLOW_("%s"), portname);
         sp = NULL;
-        //serial_port_name = NULL;
         return false;
     } else if (sp == CLAIMED_SERIAL_PORT) {
         PrintAndLogEx(WARNING, "\n" _RED_("ERROR:") "serial port " _YELLOW_("%s") " is claimed by another process", portname);
         sp = NULL;
-        //serial_port_name = NULL;
         return false;
     } else {
         // start the communication thread
-        serial_port_name = portname;
-        _speed = speed;
+        conn.serial_port_name = portname;
         conn.run = true;
         conn.block_after_ACK = flash_mode;
         // Flags to tell where to add CRC on sent replies
@@ -664,14 +659,10 @@ void CloseProxmark(void) {
     // Fix for linux, it seems that it is extremely slow to release the serial port file descriptor /dev/*
     //
     // This may be disabled at compile-time with -DNO_UNLINK (used for a JNI-based serial port on Android).
-    if (serial_port_name) {
-        unlink(serial_port_name);
-    }
 #endif
 
     // Clean up our state
     sp = NULL;
-    serial_port_name = NULL;
     memset(&communication_thread, 0, sizeof(pthread_t));
 }
 
diff --git a/client/comms.h b/client/comms.h
index 501ee18e7..58387fc66 100644
--- a/client/comms.h
+++ b/client/comms.h
@@ -50,6 +50,7 @@ typedef struct {
     // To memorise baudrate
     uint32_t uart_speed;
     uint16_t last_command;
+    uint8_t *serial_port_name;
 } communication_arg_t;
 
 extern communication_arg_t conn;

From 43db2a50e20574b9b5583e841fe34b7b4fa2b90e Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 7 May 2019 14:48:53 +0200
Subject: [PATCH 1622/1938] cleaning

---
 client/cmdhw.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/client/cmdhw.c b/client/cmdhw.c
index 9ad9780c9..4041e793f 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -512,15 +512,13 @@ static int CmdConnect(const char *Cmd) {
     if ( port == NULL ) {
         return usage_hw_connect();
     }
+    
     // if we were already connected,  disconnect first.
     //if (session.pm3_present) {
         PrintAndLogEx(INFO, "Disconnecting from current serial port");
         CloseProxmark();
         session.pm3_present = false;
     //}
-
-    // set timeouts
-    //int res = uart_reconfigure_timeouts(sp, UART_USB_CLIENT_RX_TIMEOUT_MS);
     
     // try to open serial port
     session.pm3_present = OpenProxmark(port, false, 20, false, USART_BAUD_RATE);

From f2a954b422b372cb43b79481e4bac2f9119aac95 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 7 May 2019 15:40:01 +0200
Subject: [PATCH 1623/1938] chg: save serial port name as copy.

---
 client/cmdhw.c | 31 +++++++++++++++++++++----------
 client/comms.c | 22 +++++++---------------
 client/comms.h |  3 +--
 3 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/client/cmdhw.c b/client/cmdhw.c
index 4041e793f..51ab755b8 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -503,22 +503,29 @@ static int CmdConnect(const char *Cmd) {
         return usage_hw_connect();
 
     char *port = NULL;
-    port = (char *)Cmd;
-
+    bool shall_free = false;
+    
     // default back to previous used serial port
-    if (strlen(port) == 0 )
-        GetSavedSerialPortName( &port );
+    if (strlen(Cmd) == 0 ) {
+        int len = strlen((char *)conn.serial_port_name);
+        if ( len == 0 ) {
+            return usage_hw_connect();
+        }
+        port = calloc(len + 1, sizeof(uint8_t));
+        memcpy(port, conn.serial_port_name, len);
+        shall_free = true;
+    } else {
+        port = (char *)Cmd;
+    }
 
     if ( port == NULL ) {
         return usage_hw_connect();
     }
     
-    // if we were already connected,  disconnect first.
-    //if (session.pm3_present) {
-        PrintAndLogEx(INFO, "Disconnecting from current serial port");
-        CloseProxmark();
-        session.pm3_present = false;
-    //}
+    // always disconnect first.
+    PrintAndLogEx(INFO, "Disconnecting from current serial port");
+    CloseProxmark();
+    session.pm3_present = false;
     
     // try to open serial port
     session.pm3_present = OpenProxmark(port, false, 20, false, USART_BAUD_RATE);
@@ -528,6 +535,10 @@ static int CmdConnect(const char *Cmd) {
         CloseProxmark();
         session.pm3_present = false;
     }
+
+    if ( shall_free )
+        free(port);
+    
     return PM3_SUCCESS;
 }
 
diff --git a/client/comms.c b/client/comms.c
index 7f6691390..53315c160 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -57,10 +57,6 @@ static uint64_t timeout_start_time;
 
 static bool dl_it(uint8_t *dest, uint32_t bytes, uint32_t start_index, PacketResponseNG *response, size_t ms_timeout, bool show_warning, uint32_t rec_cmd);
 
-void GetSavedSerialPortName( char **dest ) {
-    *dest = conn.serial_port_name;
-}
-
 void SendCommand(PacketCommandOLD *c) {
 
 #ifdef COMMS_DEBUG
@@ -560,7 +556,9 @@ bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode,
         return false;
     } else {
         // start the communication thread
-        conn.serial_port_name = portname;
+        uint16_t len = MIN( strlen(portname), FILE_PATH_SIZE - 1);
+        memset(conn.serial_port_name, 0, FILE_PATH_SIZE);
+        memcpy(conn.serial_port_name, portname, len);
         conn.run = true;
         conn.block_after_ACK = flash_mode;
         // Flags to tell where to add CRC on sent replies
@@ -655,12 +653,6 @@ void CloseProxmark(void) {
         uart_close(sp);
     }
 
-#if defined(__linux__) && !defined(NO_UNLINK)
-    // Fix for linux, it seems that it is extremely slow to release the serial port file descriptor /dev/*
-    //
-    // This may be disabled at compile-time with -DNO_UNLINK (used for a JNI-based serial port on Android).
-#endif
-
     // Clean up our state
     sp = NULL;
     memset(&communication_thread, 0, sizeof(pthread_t));
@@ -763,19 +755,19 @@ bool GetFromDevice(DeviceMemType_t memtype, uint8_t *dest, uint32_t bytes, uint3
 
     switch (memtype) {
         case BIG_BUF: {
-            SendCommandOLD(CMD_DOWNLOAD_BIGBUF, start_index, bytes, 0, NULL, 0);
+            SendCommandMIX(CMD_DOWNLOAD_BIGBUF, start_index, bytes, 0, NULL, 0);
             return dl_it(dest, bytes, start_index, response, ms_timeout, show_warning, CMD_DOWNLOADED_BIGBUF);
         }
         case BIG_BUF_EML: {
-            SendCommandOLD(CMD_DOWNLOAD_EML_BIGBUF, start_index, bytes, 0, NULL, 0);
+            SendCommandMIX(CMD_DOWNLOAD_EML_BIGBUF, start_index, bytes, 0, NULL, 0);
             return dl_it(dest, bytes, start_index, response, ms_timeout, show_warning, CMD_DOWNLOADED_EML_BIGBUF);
         }
         case FLASH_MEM: {
-            SendCommandOLD(CMD_FLASHMEM_DOWNLOAD, start_index, bytes, 0, NULL, 0);
+            SendCommandMIX(CMD_FLASHMEM_DOWNLOAD, start_index, bytes, 0, NULL, 0);
             return dl_it(dest, bytes, start_index, response, ms_timeout, show_warning, CMD_FLASHMEM_DOWNLOADED);
         }
         case SIM_MEM: {
-            //SendCommandOLD(CMD_DOWNLOAD_SIM_MEM, start_index, bytes, 0, NULL, 0);
+            //SendCommandMIX(CMD_DOWNLOAD_SIM_MEM, start_index, bytes, 0, NULL, 0);
             //return dl_it(dest, bytes, start_index, response, ms_timeout, show_warning, CMD_DOWNLOADED_SIMMEM);
             return false;
         }
diff --git a/client/comms.h b/client/comms.h
index 58387fc66..547a46af6 100644
--- a/client/comms.h
+++ b/client/comms.h
@@ -50,7 +50,7 @@ typedef struct {
     // To memorise baudrate
     uint32_t uart_speed;
     uint16_t last_command;
-    uint8_t *serial_port_name;
+    uint8_t serial_port_name[FILE_PATH_SIZE];
 } communication_arg_t;
 
 extern communication_arg_t conn;
@@ -63,7 +63,6 @@ void SendCommandMIX(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, v
 void clearCommandBuffer(void);
 
 #define FLASHMODE_SPEED 460800
-void GetSavedSerialPortName( char **dest );
 bool IsCommunicationThreadDead(void);
 bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode, uint32_t speed);
 int TestProxmark(void);

From 7eb76855591a4e2d5401789fb7ec17ae3372f552 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 7 May 2019 15:57:22 +0200
Subject: [PATCH 1624/1938] cleaning up, simplify

---
 client/cmdhw.c | 16 +++-------------
 client/comms.c | 11 ++++++-----
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/client/cmdhw.c b/client/cmdhw.c
index 51ab755b8..3334fbfe8 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -503,7 +503,6 @@ static int CmdConnect(const char *Cmd) {
         return usage_hw_connect();
 
     char *port = NULL;
-    bool shall_free = false;
     
     // default back to previous used serial port
     if (strlen(Cmd) == 0 ) {
@@ -511,9 +510,7 @@ static int CmdConnect(const char *Cmd) {
         if ( len == 0 ) {
             return usage_hw_connect();
         }
-        port = calloc(len + 1, sizeof(uint8_t));
-        memcpy(port, conn.serial_port_name, len);
-        shall_free = true;
+        port = (char *)conn.serial_port_name;
     } else {
         port = (char *)Cmd;
     }
@@ -521,13 +518,10 @@ static int CmdConnect(const char *Cmd) {
     if ( port == NULL ) {
         return usage_hw_connect();
     }
-    
-    // always disconnect first.
+
     PrintAndLogEx(INFO, "Disconnecting from current serial port");
     CloseProxmark();
-    session.pm3_present = false;
-    
-    // try to open serial port
+
     session.pm3_present = OpenProxmark(port, false, 20, false, USART_BAUD_RATE);
 
     if (session.pm3_present && (TestProxmark() != PM3_SUCCESS)) {
@@ -535,10 +529,6 @@ static int CmdConnect(const char *Cmd) {
         CloseProxmark();
         session.pm3_present = false;
     }
-
-    if ( shall_free )
-        free(port);
-    
     return PM3_SUCCESS;
 }
 
diff --git a/client/comms.c b/client/comms.c
index 53315c160..939df553d 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -556,9 +556,11 @@ bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode,
         return false;
     } else {
         // start the communication thread
-        uint16_t len = MIN( strlen(portname), FILE_PATH_SIZE - 1);
-        memset(conn.serial_port_name, 0, FILE_PATH_SIZE);
-        memcpy(conn.serial_port_name, portname, len);
+        if ( portname != (char*)conn.serial_port_name) {
+            uint16_t len = MIN( strlen(portname), FILE_PATH_SIZE - 1);
+            memset(conn.serial_port_name, 0, FILE_PATH_SIZE);
+            memcpy(conn.serial_port_name, portname, len);
+        }
         conn.run = true;
         conn.block_after_ACK = flash_mode;
         // Flags to tell where to add CRC on sent replies
@@ -571,8 +573,7 @@ bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode,
         __atomic_clear(&comm_thread_dead, __ATOMIC_SEQ_CST);
 
         fflush(stdout);
-        // create a mutex to avoid interlacing print commands from our different threads
-        //pthread_mutex_init(&print_lock, NULL);
+
         return true;
     }
 }

From cb991b4d2cb9997376c3538bddd028427135c786 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 7 May 2019 17:31:07 +0200
Subject: [PATCH 1625/1938] make sure CloseProxmark sets pm3_present.

---
 client/cmdhw.c     |  9 ++++-----
 client/comms.c     |  2 ++
 client/proxmark3.c | 10 +++++-----
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/client/cmdhw.c b/client/cmdhw.c
index 3334fbfe8..27235c10a 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -515,19 +515,18 @@ static int CmdConnect(const char *Cmd) {
         port = (char *)Cmd;
     }
 
-    if ( port == NULL ) {
+    if ( port == NULL )
         return usage_hw_connect();
-    }
 
-    PrintAndLogEx(INFO, "Disconnecting from current serial port");
-    CloseProxmark();
+    if ( session.pm3_present ) {
+        CloseProxmark();
+    }
 
     session.pm3_present = OpenProxmark(port, false, 20, false, USART_BAUD_RATE);
 
     if (session.pm3_present && (TestProxmark() != PM3_SUCCESS)) {
         PrintAndLogEx(ERR, _RED_("ERROR:") "cannot communicate with the Proxmark\n");
         CloseProxmark();
-        session.pm3_present = false;
     }
     return PM3_SUCCESS;
 }
diff --git a/client/comms.c b/client/comms.c
index 939df553d..69c932590 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -657,6 +657,8 @@ void CloseProxmark(void) {
     // Clean up our state
     sp = NULL;
     memset(&communication_thread, 0, sizeof(pthread_t));
+    
+    session.pm3_present = false;
 }
 
 // Gives a rough estimate of the communication delay based on channel & baudrate
diff --git a/client/proxmark3.c b/client/proxmark3.c
index 4d185afb2..92cefa60c 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -56,9 +56,9 @@ int check_comm(void) {
     // If communications thread goes down. Device disconnected then this should hook up PM3 again.
     if ( IsCommunicationThreadDead() && session.pm3_present) {
         rl_set_prompt("[offline] "PROXPROMPT);
-        session.pm3_present = false;
-        PrintAndLogEx(INFO, "\nRunning in " _YELLOW_("OFFLINE") "mode. Use \"hw connect\" to reconnect\n");
-        
+        rl_forced_update_display (); 
+        CloseProxmark();     
+        PrintAndLogEx(INFO, "Running in " _YELLOW_("OFFLINE") "mode. Use \"hw connect\" to reconnect\n");
     }
     return 0;
 }
@@ -487,13 +487,13 @@ int main(int argc, char *argv[]) {
     set_my_executable_path();
 
     // try to open USB connection to Proxmark
-    if (port != NULL)
+    if (port != NULL) {
         session.pm3_present = OpenProxmark(port, waitCOMPort, 20, false, speed);
+    }
 
     if (session.pm3_present && (TestProxmark() != PM3_SUCCESS)) {
         PrintAndLogEx(ERR, _RED_("ERROR:") "cannot communicate with the Proxmark\n");
         CloseProxmark();
-        session.pm3_present = false;
     }
 
     if (!session.pm3_present)

From 119b1e7c81fe528962438a15f92b2d7114cee054 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 7 May 2019 18:50:45 +0200
Subject: [PATCH 1626/1938] chg: mem commands - sendMIX

---
 client/cmdflashmem.c | 40 +++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/client/cmdflashmem.c b/client/cmdflashmem.c
index 4627dfebb..884e33ead 100644
--- a/client/cmdflashmem.c
+++ b/client/cmdflashmem.c
@@ -122,8 +122,7 @@ static int CmdFlashMemRead(const char *Cmd) {
                 cmdp += 2;
                 break;
             case 'h':
-                usage_flashmem_read();
-                return PM3_SUCCESS;
+                return usage_flashmem_read();
             default:
                 PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
                 errors = true;
@@ -142,7 +141,7 @@ static int CmdFlashMemRead(const char *Cmd) {
     }
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_FLASHMEM_READ, start_index, len, 0, NULL, 0);
+    SendCommandMIX(CMD_FLASHMEM_READ, start_index, len, 0, NULL, 0);
     return PM3_SUCCESS;
 }
 
@@ -150,16 +149,16 @@ static int CmdFlashmemSpiBaudrate(const char *Cmd) {
 
     char ctmp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) < 1 || ctmp == 'h') {
-        usage_flashmem_spibaud();
-        return PM3_EINVARG;
+        return usage_flashmem_spibaud();
     }
+    
     uint32_t baudrate = param_get32ex(Cmd, 0, 0, 10);
     baudrate = baudrate * 1000000;
     if (baudrate != FLASH_BAUD && baudrate != FLASH_MINBAUD) {
         usage_flashmem_spibaud();
         return PM3_EINVARG;
     }
-    SendCommandOLD(CMD_FLASHMEM_SET_SPIBAUDRATE, baudrate, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_FLASHMEM_SET_SPIBAUDRATE, baudrate, 0, 0, NULL, 0);
     return PM3_SUCCESS;
 }
 
@@ -174,8 +173,7 @@ static int CmdFlashMemLoad(const char *Cmd) {
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
             case 'h':
-                usage_flashmem_load();
-                return PM3_SUCCESS;
+                return usage_flashmem_load();
             case 'f':
                 if (param_getstr(Cmd, cmdp + 1, filename, FILE_PATH_SIZE) >= FILE_PATH_SIZE) {
                     PrintAndLogEx(FAILED, "Filename too long");
@@ -278,13 +276,15 @@ static int CmdFlashMemLoad(const char *Cmd) {
     //Send to device
     uint32_t bytes_sent = 0;
     uint32_t bytes_remaining = datalen;
+
+    // fast push mode
+    conn.block_after_ACK = true;
+    
     while (bytes_remaining > 0) {
         uint32_t bytes_in_packet = MIN(FLASH_MEM_BLOCK_SIZE, bytes_remaining);
 
         clearCommandBuffer();
-        if (bytes_remaining > bytes_in_packet)
-            // fast push mode
-            conn.block_after_ACK = true;
+
         SendCommandOLD(CMD_FLASHMEM_WRITE, start_index + bytes_sent, bytes_in_packet, 0, data + bytes_sent, bytes_in_packet);
 
         bytes_remaining -= bytes_in_packet;
@@ -297,16 +297,17 @@ static int CmdFlashMemLoad(const char *Cmd) {
             free(data);
             return PM3_ETIMEOUT;
         }
-        conn.block_after_ACK = false;
 
         uint8_t isok  = resp.oldarg[0] & 0xFF;
         if (!isok) {
+            conn.block_after_ACK = false;            
             PrintAndLogEx(FAILED, "Flash write fail [offset %u]", bytes_sent);
             return PM3_EFLASH;
         }
     }
-    free(data);
 
+    conn.block_after_ACK = false;
+    free(data);
     PrintAndLogEx(SUCCESS, "Wrote %u bytes to offset %u", datalen, start_index);
     return PM3_SUCCESS;
 }
@@ -320,8 +321,7 @@ static int CmdFlashMemSave(const char *Cmd) {
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
             case 'h':
-                usage_flashmem_save();
-                return PM3_EINVARG;
+                return usage_flashmem_save();
             case 'l':
                 len = param_get32ex(Cmd, cmdp + 1, FLASH_MEM_MAX_SIZE, 10);
                 cmdp += 2;
@@ -379,8 +379,7 @@ static int CmdFlashMemWipe(const char *Cmd) {
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
             case 'h':
-                usage_flashmem_wipe();
-                return PM3_SUCCESS;
+                return usage_flashmem_wipe();
             case 'p':
                 page = param_get8ex(Cmd, cmdp + 1, 0, 10);
                 if (page > 2) {
@@ -408,7 +407,7 @@ static int CmdFlashMemWipe(const char *Cmd) {
     }
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_FLASHMEM_WIPE, page, initalwipe, 0, NULL, 0);
+    SendCommandMIX(CMD_FLASHMEM_WIPE, page, initalwipe, 0, NULL, 0);
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 8000)) {
         PrintAndLogEx(WARNING, "timeout while waiting for reply.");
@@ -434,8 +433,7 @@ static int CmdFlashMemInfo(const char *Cmd) {
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
             case 'h':
-                usage_flashmem_info();
-                return PM3_SUCCESS;
+                return usage_flashmem_info();
             case 's': {
                 shall_sign = true;
                 cmdp++;
@@ -459,7 +457,7 @@ static int CmdFlashMemInfo(const char *Cmd) {
     }
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_FLASHMEM_INFO, 0, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_FLASHMEM_INFO, 0, 0, 0, NULL, 0);
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         PrintAndLogEx(WARNING, "timeout while waiting for reply.");

From 0c20c1a9d10fca63526a50a9770d82c13f8f4523 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 7 May 2019 19:03:25 +0200
Subject: [PATCH 1627/1938] convert to MIX for simple send commands.

---
 client/cmddata.c |  2 +-
 client/cmdhw.c   | 13 +++++++++----
 client/util.h    |  2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/client/cmddata.c b/client/cmddata.c
index f4e6594a9..e0fd2fa5c 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -876,7 +876,7 @@ static int CmdBuffClear(const char *Cmd) {
     if (cmdp == 'h') return usage_data_buffclear();
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_BUFF_CLEAR, 0, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_BUFF_CLEAR, 0, 0, 0, NULL, 0);
     ClearGraph(true);
     return 0;
 }
diff --git a/client/cmdhw.c b/client/cmdhw.c
index 27235c10a..f086b4c99 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -370,7 +370,7 @@ static int CmdDetectReader(const char *Cmd) {
 static int CmdFPGAOff(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     clearCommandBuffer();
-    SendCommandOLD(CMD_FPGA_MAJOR_MODE_OFF, 0, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_FPGA_MAJOR_MODE_OFF, 0, 0, 0, NULL, 0);
     return PM3_SUCCESS;
 }
 
@@ -399,7 +399,7 @@ static int CmdReadmem(const char *Cmd) {
 static int CmdReset(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     clearCommandBuffer();
-    SendCommandOLD(CMD_HARDWARE_RESET, 0, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_HARDWARE_RESET, 0, 0, 0, NULL, 0);
     return PM3_SUCCESS;
 }
 
@@ -458,7 +458,7 @@ static int CmdStatus(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     clearCommandBuffer();
     PacketResponseNG resp;
-    SendCommandOLD(CMD_STATUS, 0, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_STATUS, 0, 0, 0, NULL, 0);
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000))
         PrintAndLogEx(WARNING, "Status command failed. Communication speed test timed out");
     return PM3_SUCCESS;
@@ -564,9 +564,12 @@ int CmdHW(const char *Cmd) {
 void pm3_version(bool verbose) {
     if (!verbose)
         return;
+    
     PacketResponseNG resp;
     clearCommandBuffer();
-    SendCommandOLD(CMD_VERSION, 0, 0, 0, NULL, 0);
+    
+    SendCommandMIX(CMD_VERSION, 0, 0, 0, NULL, 0);
+    
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {
         PrintAndLogEx(NORMAL, "\n" _BLUE_(" [ Proxmark3 RFID instrument ]") "\n");
         PrintAndLogEx(NORMAL, "\n [ CLIENT ]");
@@ -576,8 +579,10 @@ void pm3_version(bool verbose) {
         PrintAndLogEx(NORMAL, "  smartcard reader:                %s", IfPm3Smartcard() ? _GREEN_("present") : _YELLOW_("absent"));
         PrintAndLogEx(NORMAL, "\n [ PROXMARK RDV4 Extras ]");
         PrintAndLogEx(NORMAL, "  FPC USART for BT add-on support: %s", IfPm3FpcUsartHost() ? _GREEN_("present") : _YELLOW_("absent"));
+        
         if (IfPm3FpcUsartDevFromUsb())
             PrintAndLogEx(NORMAL, "  FPC USART for developer support: %s", _GREEN_("present"));
+        
         PrintAndLogEx(NORMAL, "");
         PrintAndLogEx(NORMAL, (char *)resp.data.asBytes);
         lookupChipID(resp.oldarg[0], resp.oldarg[1]);
diff --git a/client/util.h b/client/util.h
index 0222097b7..e194bb5be 100644
--- a/client/util.h
+++ b/client/util.h
@@ -115,7 +115,7 @@
 
 #ifndef DropField
 #define DropField() { \
-        clearCommandBuffer(); SendCommandOLD(CMD_READER_ISO_14443a, 0, 0, 0, NULL, 0); \
+        clearCommandBuffer(); SendCommandMIX(CMD_READER_ISO_14443a, 0, 0, 0, NULL, 0); \
     }
 #endif
 

From 39272ba1fb69c10e6a96de079ba2621fb27d1961 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 7 May 2019 19:13:14 +0200
Subject: [PATCH 1628/1938] convert sendOLD -> MIX for simple cmds

---
 client/cmdhf14a.c          | 2 +-
 client/cmdhficlass.c       | 2 +-
 client/cmdhflegic.c        | 2 +-
 client/cmdhfmf.c           | 4 ++--
 client/cmdlf.c             | 2 +-
 client/mifare/mifarehost.c | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 773aca7ff..0fdece610 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -1079,7 +1079,7 @@ static int CmdHF14AAntiFuzz(const char *Cmd) {
 
     CLIParserFree();
     clearCommandBuffer();
-    SendCommandOLD(CMD_ANTIFUZZ_ISO_14443a, arg0, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_ANTIFUZZ_ISO_14443a, arg0, 0, 0, NULL, 0);
     return 0;
 }
 
diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index a637e1e59..54195c155 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -281,7 +281,7 @@ static int CmdHFiClassList(const char *Cmd) {
 static int CmdHFiClassSniff(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_hf_iclass_sniff();
-    SendCommandOLD(CMD_SNIFF_ICLASS, 0, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_SNIFF_ICLASS, 0, 0, 0, NULL, 0);
     return 0;
 }
 
diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index dabde228b..88e96155e 100644
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -808,7 +808,7 @@ int legic_get_type(legic_card_select_t *card) {
     if (card == NULL) return 1;
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_LEGIC_INFO, 0, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_LEGIC_INFO, 0, 0, 0, NULL, 0);
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500))
         return 2;
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 30264ba24..51de727c9 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -2291,7 +2291,7 @@ static int CmdHF14AMfSniff(const char *Cmd) {
     PrintAndLogEx(NORMAL, "-------------------------------------------------------------------------\n");
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_MIFARE_SNIFFER, 0, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_MIFARE_SNIFFER, 0, 0, 0, NULL, 0);
 
     PacketResponseNG resp;
 
@@ -2420,7 +2420,7 @@ int CmdHF14AMfDbg(const char *Cmd) {
     uint8_t dbgMode = param_get8ex(Cmd, 0, 0, 10);
     if (dbgMode > 4) return usage_hf14_dbg();
 
-    SendCommandOLD(CMD_MIFARE_SET_DBGMODE, dbgMode, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_MIFARE_SET_DBGMODE, dbgMode, 0, 0, NULL, 0);
     return 0;
 }
 
diff --git a/client/cmdlf.c b/client/cmdlf.c
index 9330b2ff4..163d9e4b7 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -390,7 +390,7 @@ int CmdLFSniff(const char *Cmd) {
     if (cmdp == 'h') return usage_lf_sniff();
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_LF_SNIFF_RAW_ADC_SAMPLES, 0, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_LF_SNIFF_RAW_ADC_SAMPLES, 0, 0, 0, NULL, 0);
     WaitForResponse(CMD_ACK, NULL);
     getSamples(0, false);
     return 0;
diff --git a/client/mifare/mifarehost.c b/client/mifare/mifarehost.c
index f9f80aa5c..e071e5a7d 100644
--- a/client/mifare/mifarehost.c
+++ b/client/mifare/mifarehost.c
@@ -906,7 +906,7 @@ returns:
 int detect_classic_nackbug(bool verbose) {
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_MIFARE_NACK_DETECT, 0, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_MIFARE_NACK_DETECT, 0, 0, 0, NULL, 0);
     PacketResponseNG resp;
 
     if (verbose)
@@ -991,7 +991,7 @@ void detect_classic_magic(void) {
     uint8_t isGeneration = 0;
     PacketResponseNG resp;
     clearCommandBuffer();
-    SendCommandOLD(CMD_MIFARE_CIDENT, 0, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_MIFARE_CIDENT, 0, 0, 0, NULL, 0);
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500))
         isGeneration = resp.oldarg[0] & 0xff;
 

From 290f2b625b4df9aa110b9b4473d95f88d4beea2c Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 7 May 2019 19:51:33 +0200
Subject: [PATCH 1629/1938] Automated upgrades SendCommandOLD/MIX 0,0,0,NULL,0
 -> NG and SendCommandOLD ....,NULL,0 -> MIX

---
 client/cmddata.c                              |  4 ++--
 client/cmdflashmem.c                          |  2 +-
 client/cmdhf.c                                |  2 +-
 client/cmdhf14a.c                             | 18 +++++++-------
 client/cmdhf14b.c                             | 24 +++++++++----------
 client/cmdhf15.c                              |  6 ++---
 client/cmdhfepa.c                             |  4 ++--
 client/cmdhffelica.c                          | 10 ++++----
 client/cmdhficlass.c                          | 18 +++++++-------
 client/cmdhflegic.c                           |  8 +++----
 client/cmdhfmf.c                              | 14 +++++------
 client/cmdhfmfdes.c                           |  2 +-
 client/cmdhfmfdesfire.c                       |  4 ++--
 client/cmdhfmfhard.c                          |  2 +-
 client/cmdhfmfp.c                             |  2 +-
 client/cmdhfmfu.c                             |  8 +++----
 client/cmdhftopaz.c                           |  4 ++--
 client/cmdhw.c                                | 22 ++++++++---------
 client/cmdlf.c                                |  8 +++----
 client/cmdlfawid.c                            | 10 ++++----
 client/cmdlfcotag.c                           |  2 +-
 client/cmdlfem4x.c                            |  8 +++----
 client/cmdlffdx.c                             |  2 +-
 client/cmdlfguard.c                           |  2 +-
 client/cmdlfhid.c                             | 12 +++++-----
 client/cmdlfhitag.c                           |  8 +++----
 client/cmdlfio.c                              |  4 ++--
 client/cmdlfjablotron.c                       |  2 +-
 client/cmdlfkeri.c                            |  2 +-
 client/cmdlfnedap.c                           |  2 +-
 client/cmdlfnoralsy.c                         |  2 +-
 client/cmdlfpcf7931.c                         |  2 +-
 client/cmdlfpresco.c                          |  2 +-
 client/cmdlfpyramid.c                         |  2 +-
 client/cmdlft55xx.c                           |  8 +++----
 client/cmdlfti.c                              |  4 ++--
 client/cmdlfviking.c                          |  2 +-
 client/cmdlfvisa2000.c                        |  2 +-
 client/cmdsmartcard.c                         | 10 ++++----
 client/deprecated-hid-flasher/flasher/flash.c | 12 +++++-----
 client/flash.c                                | 12 +++++-----
 client/mifare/mifarehost.c                    | 10 ++++----
 client/scripting.c                            |  4 ++--
 43 files changed, 144 insertions(+), 144 deletions(-)

diff --git a/client/cmddata.c b/client/cmddata.c
index e0fd2fa5c..0b63b043d 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -876,7 +876,7 @@ static int CmdBuffClear(const char *Cmd) {
     if (cmdp == 'h') return usage_data_buffclear();
 
     clearCommandBuffer();
-    SendCommandMIX(CMD_BUFF_CLEAR, 0, 0, 0, NULL, 0);
+    SendCommandNG(CMD_BUFF_CLEAR, NULL, 0);
     ClearGraph(true);
     return 0;
 }
@@ -1530,7 +1530,7 @@ int CmdTuneSamples(const char *Cmd) {
     PrintAndLogEx(INFO, "\nMeasuring antenna characteristics, please wait...");
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_MEASURE_ANTENNA_TUNING, 0, 0, 0, NULL, 0);
+    SendCommandNG(CMD_MEASURE_ANTENNA_TUNING, NULL, 0);
     PacketResponseNG resp;
     while (!WaitForResponseTimeout(CMD_MEASURED_ANTENNA_TUNING, &resp, 2000)) {
         timeout++;
diff --git a/client/cmdflashmem.c b/client/cmdflashmem.c
index 884e33ead..ebc78994e 100644
--- a/client/cmdflashmem.c
+++ b/client/cmdflashmem.c
@@ -457,7 +457,7 @@ static int CmdFlashMemInfo(const char *Cmd) {
     }
 
     clearCommandBuffer();
-    SendCommandMIX(CMD_FLASHMEM_INFO, 0, 0, 0, NULL, 0);
+    SendCommandNG(CMD_FLASHMEM_INFO, NULL, 0);
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         PrintAndLogEx(WARNING, "timeout while waiting for reply.");
diff --git a/client/cmdhf.c b/client/cmdhf.c
index 24d30d40c..65dbaaef1 100644
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -104,7 +104,7 @@ int CmdHFSniff(const char *Cmd) {
     int skiptriggers =  param_get32ex(Cmd, 1, 0, 10);
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_HF_SNIFFER, skippairs, skiptriggers, 0, NULL, 0);
+    SendCommandMIX(CMD_HF_SNIFFER, skippairs, skiptriggers, 0, NULL, 0);
     return 0;
 }
 
diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 0fdece610..45f4224e5 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -228,7 +228,7 @@ static int CmdHF14AList(const char *Cmd) {
 }
 
 int Hf14443_4aGetCardData(iso14a_card_select_t *card) {
-    SendCommandOLD(CMD_READER_ISO_14443a, ISO14A_CONNECT, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_READER_ISO_14443a, ISO14A_CONNECT, 0, 0, NULL, 0);
 
     PacketResponseNG resp;
     WaitForResponse(CMD_ACK, &resp);
@@ -298,7 +298,7 @@ static int CmdHF14AReader(const char *Cmd) {
         cm |= ISO14A_NO_DISCONNECT;
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_READER_ISO_14443a, cm, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_READER_ISO_14443a, cm, 0, 0, NULL, 0);
 
     if (ISO14A_CONNECT & cm) {
         PacketResponseNG resp;
@@ -383,7 +383,7 @@ static int CmdHF14ACUIDs(const char *Cmd) {
         }
 
         // execute anticollision procedure
-        SendCommandOLD(CMD_READER_ISO_14443a, ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0, NULL, 0);
+        SendCommandMIX(CMD_READER_ISO_14443a, ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0, NULL, 0);
 
         PacketResponseNG resp;
         WaitForResponse(CMD_ACK, &resp);
@@ -508,7 +508,7 @@ int CmdHF14ASniff(const char *Cmd) {
         if (ctmp == 'r') param |= 0x02;
     }
     clearCommandBuffer();
-    SendCommandOLD(CMD_SNIFF_ISO_14443a, param, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_SNIFF_ISO_14443a, param, 0, 0, NULL, 0);
     return 0;
 }
 
@@ -522,7 +522,7 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
         PacketResponseNG resp;
 
         // Anticollision + SELECT card
-        SendCommandOLD(CMD_READER_ISO_14443a, ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0, NULL, 0);
+        SendCommandMIX(CMD_READER_ISO_14443a, ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0, NULL, 0);
         if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
             PrintAndLogEx(ERR, "Proxmark3 connection timeout.");
             return 1;
@@ -616,7 +616,7 @@ static int SelectCard14443_4(bool disconnect, iso14a_card_select_t *card) {
     DropField();
 
     // Anticollision + SELECT card
-    SendCommandOLD(CMD_READER_ISO_14443a, ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_READER_ISO_14443a, ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0, NULL, 0);
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         PrintAndLogEx(ERR, "Proxmark3 connection timeout.");
         return 1;
@@ -693,7 +693,7 @@ static int CmdExchangeAPDU(bool chainingin, uint8_t *datain, int datainlen, bool
     if (datain)
         SendCommandOLD(CMD_READER_ISO_14443a, ISO14A_APDU | ISO14A_NO_DISCONNECT | cmdc, (datainlen & 0xFFFF), 0, datain, datainlen & 0xFFFF);
     else
-        SendCommandOLD(CMD_READER_ISO_14443a, ISO14A_APDU | ISO14A_NO_DISCONNECT | cmdc, 0, 0, NULL, 0);
+        SendCommandMIX(CMD_READER_ISO_14443a, ISO14A_APDU | ISO14A_NO_DISCONNECT | cmdc, 0, 0, NULL, 0);
 
     uint8_t *recv;
     PacketResponseNG resp;
@@ -1142,7 +1142,7 @@ int CmdHF14A(const char *Cmd) {
 
 int infoHF14A(bool verbose, bool do_nack_test) {
     clearCommandBuffer();
-    SendCommandOLD(CMD_READER_ISO_14443a, ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_READER_ISO_14443a, ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0, NULL, 0);
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         if (verbose) PrintAndLogEx(WARNING, "iso14443a card select failed");
@@ -1194,7 +1194,7 @@ int infoHF14A(bool verbose, bool do_nack_test) {
 
             // reconnect for further tests
             clearCommandBuffer();
-            SendCommandOLD(CMD_READER_ISO_14443a, ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0, NULL, 0);
+            SendCommandMIX(CMD_READER_ISO_14443a, ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0, NULL, 0);
             WaitForResponse(CMD_ACK, &resp);
 
             memcpy(&card, (iso14a_card_select_t *)resp.data.asBytes, sizeof(iso14a_card_select_t));
diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c
index 89126d618..94a89a2bc 100644
--- a/client/cmdhf14b.c
+++ b/client/cmdhf14b.c
@@ -109,13 +109,13 @@ static int usage_hf_14b_dump(void) {
 /*
 static void switch_on_field_14b(void) {
     clearCommandBuffer();
-    SendCommandOLD(CMD_ISO_14443B_COMMAND, ISO14B_CONNECT, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_ISO_14443B_COMMAND, ISO14B_CONNECT, 0, 0, NULL, 0);
 }
 */
 
 static int switch_off_field_14b(void) {
     clearCommandBuffer();
-    SendCommandOLD(CMD_ISO_14443B_COMMAND, ISO14B_DISCONNECT, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_ISO_14443B_COMMAND, ISO14B_DISCONNECT, 0, 0, NULL, 0);
     return 0;
 }
 
@@ -170,7 +170,7 @@ static int CmdHF14BSim(const char *Cmd) {
     }
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_SIMULATE_TAG_ISO_14443B, pupi, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_SIMULATE_TAG_ISO_14443B, pupi, 0, 0, NULL, 0);
     return 0;
 }
 
@@ -180,7 +180,7 @@ static int CmdHF14BSniff(const char *Cmd) {
     if (cmdp == 'h') return usage_hf_14b_sniff();
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_SNIFF_ISO_14443B, 0, 0, 0, NULL, 0);
+    SendCommandNG(CMD_SNIFF_ISO_14443B, NULL, 0);
     return 0;
 }
 
@@ -301,7 +301,7 @@ static bool get_14b_UID(iso14b_card_select_t *card) {
     while (retry--) {
 
         clearCommandBuffer();
-        SendCommandOLD(CMD_ISO_14443B_COMMAND, ISO14B_CONNECT | ISO14B_SELECT_SR | ISO14B_DISCONNECT, 0, 0, NULL, 0);
+        SendCommandMIX(CMD_ISO_14443B_COMMAND, ISO14B_CONNECT | ISO14B_SELECT_SR | ISO14B_DISCONNECT, 0, 0, NULL, 0);
         if (WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
 
             uint8_t status = resp.oldarg[0];
@@ -317,7 +317,7 @@ static bool get_14b_UID(iso14b_card_select_t *card) {
     while (retry--) {
 
         clearCommandBuffer();
-        SendCommandOLD(CMD_ISO_14443B_COMMAND, ISO14B_CONNECT | ISO14B_SELECT_STD | ISO14B_DISCONNECT, 0, 0, NULL, 0);
+        SendCommandMIX(CMD_ISO_14443B_COMMAND, ISO14B_CONNECT | ISO14B_SELECT_STD | ISO14B_DISCONNECT, 0, 0, NULL, 0);
         if (WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
 
             uint8_t status = resp.oldarg[0];
@@ -501,7 +501,7 @@ static bool HF14B_Std_Info(bool verbose) {
 
     // 14b get and print UID only (general info)
     clearCommandBuffer();
-    SendCommandOLD(CMD_ISO_14443B_COMMAND, ISO14B_CONNECT | ISO14B_SELECT_STD | ISO14B_DISCONNECT, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_ISO_14443B_COMMAND, ISO14B_CONNECT | ISO14B_SELECT_STD | ISO14B_DISCONNECT, 0, 0, NULL, 0);
     PacketResponseNG resp;
 
     if (!WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
@@ -541,7 +541,7 @@ static bool HF14B_Std_Info(bool verbose) {
 static bool HF14B_ST_Info(bool verbose) {
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_ISO_14443B_COMMAND, ISO14B_CONNECT | ISO14B_SELECT_SR | ISO14B_DISCONNECT, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_ISO_14443B_COMMAND, ISO14B_CONNECT | ISO14B_SELECT_SR | ISO14B_DISCONNECT, 0, 0, NULL, 0);
     PacketResponseNG resp;
 
     if (!WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
@@ -597,7 +597,7 @@ static bool HF14B_ST_Reader(bool verbose) {
 
     // SRx get and print general info about SRx chip from UID
     clearCommandBuffer();
-    SendCommandOLD(CMD_ISO_14443B_COMMAND, ISO14B_CONNECT | ISO14B_SELECT_SR | ISO14B_DISCONNECT, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_ISO_14443B_COMMAND, ISO14B_CONNECT | ISO14B_SELECT_SR | ISO14B_DISCONNECT, 0, 0, NULL, 0);
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
         if (verbose) PrintAndLogEx(WARNING, "command execution timeout");
@@ -636,7 +636,7 @@ static bool HF14B_Std_Reader(bool verbose) {
 
     // 14b get and print UID only (general info)
     clearCommandBuffer();
-    SendCommandOLD(CMD_ISO_14443B_COMMAND, ISO14B_CONNECT | ISO14B_SELECT_STD | ISO14B_DISCONNECT, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_ISO_14443B_COMMAND, ISO14B_CONNECT | ISO14B_SELECT_STD | ISO14B_DISCONNECT, 0, 0, NULL, 0);
     PacketResponseNG resp;
 
     if (!WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
@@ -745,7 +745,7 @@ static int CmdHF14BReadSri(const char *Cmd) {
     uint8_t blocks = (tagtype == 1) ? 0x7F : 0x0F;
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_READ_SRI_TAG, blocks, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_READ_SRI_TAG, blocks, 0, 0, NULL, 0);
     return 0;
 }
 // New command to write a SRI512/SRIX4K tag.
@@ -884,7 +884,7 @@ static int CmdHF14BDump(const char *Cmd) {
 
     PacketResponseNG resp;
     clearCommandBuffer();
-    SendCommandOLD(CMD_ISO_14443B_COMMAND,  ISO14B_CONNECT | ISO14B_SELECT_SR, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_ISO_14443B_COMMAND,  ISO14B_CONNECT | ISO14B_SELECT_SR, 0, 0, NULL, 0);
 
     //select
     if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index 65bb963d5..72d456e2e 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -575,7 +575,7 @@ static int CmdHF15Samples(const char *Cmd) {
     if (cmdp == 'h') return usage_15_samples();
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_15693, 0, 0, 0, NULL, 0);
+    SendCommandNG(CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_15693, NULL, 0);
 
     getSamples(0, false);
     return 0;
@@ -672,7 +672,7 @@ static int CmdHF15Record(const char *Cmd) {
     if (cmdp == 'h') return usage_15_record();
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_RECORD_RAW_ADC_SAMPLES_ISO_15693, 0, 0, 0, NULL, 0);
+    SendCommandNG(CMD_RECORD_RAW_ADC_SAMPLES_ISO_15693, NULL, 0);
     return 0;
 }
 
@@ -713,7 +713,7 @@ static int CmdHF15Afi(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "press pm3-button to cancel");
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_ISO_15693_FIND_AFI, strtol(Cmd, NULL, 0), 0, 0, NULL, 0);
+    SendCommandMIX(CMD_ISO_15693_FIND_AFI, strtol(Cmd, NULL, 0), 0, 0, NULL, 0);
     return 0;
 }
 
diff --git a/client/cmdhfepa.c b/client/cmdhfepa.c
index c2dbc0163..f0d06cda4 100644
--- a/client/cmdhfepa.c
+++ b/client/cmdhfepa.c
@@ -32,7 +32,7 @@ static int CmdHFEPACollectPACENonces(const char *Cmd) {
     for (uint32_t i = 0; i < n; i++) {
         // execute PACE
         clearCommandBuffer();
-        SendCommandOLD(CMD_EPA_PACE_COLLECT_NONCE, (int)m, 0, 0, NULL, 0);
+        SendCommandMIX(CMD_EPA_PACE_COLLECT_NONCE, (int)m, 0, 0, NULL, 0);
         PacketResponseNG resp;
         WaitForResponse(CMD_ACK, &resp);
 
@@ -135,7 +135,7 @@ static int CmdHFEPAPACEReplay(const char *Cmd) {
 
     // now perform the replay
     clearCommandBuffer();
-    SendCommandOLD(CMD_EPA_PACE_REPLAY, 0, 0, 0, NULL, 0);
+    SendCommandNG(CMD_EPA_PACE_REPLAY, NULL, 0);
     WaitForResponse(CMD_ACK, &resp);
     if (resp.oldarg[0] != 0) {
         PrintAndLogEx(NORMAL, "\nPACE replay failed in step %u!", (uint32_t)resp.oldarg[0]);
diff --git a/client/cmdhffelica.c b/client/cmdhffelica.c
index 65559e1a8..888b49607 100644
--- a/client/cmdhffelica.c
+++ b/client/cmdhffelica.c
@@ -173,7 +173,7 @@ static int CmdHFFelicaSniff(const char *Cmd) {
     if (errors || cmdp == 0) return usage_hf_felica_sniff();
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_FELICA_SNIFF, samples2skip, triggers2skip, 0, NULL, 0);
+    SendCommandMIX(CMD_FELICA_SNIFF, samples2skip, triggers2skip, 0, NULL, 0);
     return 0;
 }
 
@@ -186,7 +186,7 @@ static int CmdHFFelicaSimLite(const char *Cmd) {
         return usage_hf_felica_simlite();
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_FELICA_LITE_SIM, uid, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_FELICA_LITE_SIM, uid, 0, 0, NULL, 0);
     return 0;
 }
 
@@ -349,7 +349,7 @@ static int CmdHFFelicaDumpLite(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "FeliCa lite - dump started");
     PrintAndLogEx(SUCCESS, "press pm3-button to cancel");
     clearCommandBuffer();
-    SendCommandOLD(CMD_FELICA_LITE_DUMP, 0, 0, 0, NULL, 0);
+    SendCommandNG(CMD_FELICA_LITE_DUMP, NULL, 0);
     PacketResponseNG resp;
 
     uint8_t timeout = 0;
@@ -560,11 +560,11 @@ int CmdHFFelica(const char *Cmd) {
 int readFelicaUid(bool verbose) {
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_FELICA_COMMAND, FELICA_CONNECT, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_FELICA_COMMAND, FELICA_CONNECT, 0, 0, NULL, 0);
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         if (verbose) PrintAndLogEx(WARNING, "FeliCa card select failed");
-        //SendCommandOLD(CMD_FELICA_COMMAND, 0, 0, 0, NULL, 0);
+        //SendCommandNG(CMD_FELICA_COMMAND, NULL, 0);
         return 0;
     }
 
diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index 54195c155..023cf9107 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -281,7 +281,7 @@ static int CmdHFiClassList(const char *Cmd) {
 static int CmdHFiClassSniff(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_hf_iclass_sniff();
-    SendCommandMIX(CMD_SNIFF_ICLASS, 0, 0, 0, NULL, 0);
+    SendCommandNG(CMD_SNIFF_ICLASS, NULL, 0);
     return 0;
 }
 
@@ -605,7 +605,7 @@ static int CmdHFiClassELoad(const char *Cmd) {
 
     // Disable fast mode and send a dummy command to make it effective
     conn.block_after_ACK = false;
-    SendCommandMIX(CMD_PING, 0, 0, 0, NULL, 0);
+    SendCommandNG(CMD_PING, NULL, 0);
     WaitForResponseTimeout(CMD_ACK, NULL, 1000);
 
     PrintAndLogEx(SUCCESS, "sent %d bytes of data to device emulator memory", bytes_sent);
@@ -771,7 +771,7 @@ static bool select_only(uint8_t *CSN, uint8_t *CCNR, bool use_credit_key, bool v
         flags |= FLAG_ICLASS_READER_CEDITKEY;
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_READER_ICLASS, flags, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_READER_ICLASS, flags, 0, 0, NULL, 0);
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 4000)) {
         PrintAndLogEx(WARNING, "command execute timeout");
         return false;
@@ -937,7 +937,7 @@ static int CmdHFiClassReader_Dump(const char *Cmd) {
     uint8_t tag_data[255 * 8];
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_READER_ICLASS, flags, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_READER_ICLASS, flags, 0, 0, NULL, 0);
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 4500)) {
         PrintAndLogEx(WARNING, "command execute timeout");
         DropField();
@@ -975,7 +975,7 @@ static int CmdHFiClassReader_Dump(const char *Cmd) {
 
     // begin dump
     clearCommandBuffer();
-    SendCommandOLD(CMD_ICLASS_DUMP, blockno, numblks - blockno + 1, 0, NULL, 0);
+    SendCommandMIX(CMD_ICLASS_DUMP, blockno, numblks - blockno + 1, 0, NULL, 0);
     while (true) {
         printf(".");
         fflush(stdout);
@@ -1031,7 +1031,7 @@ static int CmdHFiClassReader_Dump(const char *Cmd) {
         if (maxBlk > blockno + numblks + 1) {
             // setup dump and start
             clearCommandBuffer();
-            SendCommandOLD(CMD_ICLASS_DUMP, blockno + blocksRead, maxBlk - (blockno + blocksRead), 0, NULL, 0);
+            SendCommandMIX(CMD_ICLASS_DUMP, blockno + blocksRead, maxBlk - (blockno + blocksRead), 0, NULL, 0);
             if (!WaitForResponseTimeout(CMD_ACK, &resp, 4500)) {
                 PrintAndLogEx(WARNING, "command execute timeout 2");
                 return 0;
@@ -1359,7 +1359,7 @@ static int ReadBlock(uint8_t *KEY, uint8_t blockno, uint8_t keyType, bool elite,
 
     PacketResponseNG resp;
     clearCommandBuffer();
-    SendCommandOLD(CMD_ICLASS_READBLOCK, blockno, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_ICLASS_READBLOCK, blockno, 0, 0, NULL, 0);
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 4500)) {
         PrintAndLogEx(WARNING, "Command execute timeout");
         return 0;
@@ -2037,7 +2037,7 @@ out:
 
     // Disable fast mode and send a dummy command to make it effective
     conn.block_after_ACK = false;
-    SendCommandMIX(CMD_PING, 0, 0, 0, NULL, 0);
+    SendCommandNG(CMD_PING, NULL, 0);
     WaitForResponseTimeout(CMD_ACK, NULL, 1000);
 
     DropField();
@@ -2464,7 +2464,7 @@ int readIclass(bool loop, bool verbose) {
     while (!ukbhit()) {
 
         clearCommandBuffer();
-        SendCommandOLD(CMD_READER_ICLASS, flags, 0, 0, NULL, 0);
+        SendCommandMIX(CMD_READER_ICLASS, flags, 0, 0, NULL, 0);
         if (WaitForResponseTimeout(CMD_ACK, &resp, 4500)) {
             uint8_t readStatus = resp.oldarg[0] & 0xff;
             uint8_t *data = resp.data.asBytes;
diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index 88e96155e..57a123964 100644
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -527,7 +527,7 @@ static int CmdLegicRfSim(const char *Cmd) {
     uint64_t id = 1;
     sscanf(Cmd, " %" SCNi64, &id);
     clearCommandBuffer();
-    SendCommandOLD(CMD_SIMULATE_TAG_LEGIC_RF, id, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_SIMULATE_TAG_LEGIC_RF, id, 0, 0, NULL, 0);
     return 0;
 }
 
@@ -755,7 +755,7 @@ int legic_read_mem(uint32_t offset, uint32_t len, uint32_t iv, uint8_t *out, uin
     legic_chk_iv(&iv);
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_READER_LEGIC_RF, offset, len, iv, NULL, 0);
+    SendCommandMIX(CMD_READER_LEGIC_RF, offset, len, iv, NULL, 0);
     PacketResponseNG resp;
 
     uint8_t timeout = 0;
@@ -808,7 +808,7 @@ int legic_get_type(legic_card_select_t *card) {
     if (card == NULL) return 1;
 
     clearCommandBuffer();
-    SendCommandMIX(CMD_LEGIC_INFO, 0, 0, 0, NULL, 0);
+    SendCommandNG(CMD_LEGIC_INFO, NULL, 0);
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500))
         return 2;
@@ -893,7 +893,7 @@ static int CmdLegicDump(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "Reading tag memory %d b...", dumplen);
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_READER_LEGIC_RF, 0x00, dumplen, 0x55, NULL, 0);
+    SendCommandMIX(CMD_READER_LEGIC_RF, 0x00, dumplen, 0x55, NULL, 0);
     PacketResponseNG resp;
 
     uint8_t timeout = 0;
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 51de727c9..82eb6c208 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -411,7 +411,7 @@ static int usage_hf14_nack(void) {
 
 static int GetHFMF14AUID(uint8_t *uid, int *uidlen) {
     clearCommandBuffer();
-    SendCommandOLD(CMD_READER_ISO_14443a, ISO14A_CONNECT, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_READER_ISO_14443a, ISO14A_CONNECT, 0, 0, NULL, 0);
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         PrintAndLogEx(WARNING, "iso14443a card select failed");
@@ -2026,7 +2026,7 @@ out:
 
     // Disable fast mode and send a dummy command to make it effective
     conn.block_after_ACK = false;
-    SendCommandMIX(CMD_PING, 0, 0, 0, NULL, 0);
+    SendCommandNG(CMD_PING, NULL, 0);
     WaitForResponseTimeout(CMD_ACK, NULL, 1000);
 
 
@@ -2291,7 +2291,7 @@ static int CmdHF14AMfSniff(const char *Cmd) {
     PrintAndLogEx(NORMAL, "-------------------------------------------------------------------------\n");
 
     clearCommandBuffer();
-    SendCommandMIX(CMD_MIFARE_SNIFFER, 0, 0, 0, NULL, 0);
+    SendCommandNG(CMD_MIFARE_SNIFFER, NULL, 0);
 
     PacketResponseNG resp;
 
@@ -2506,7 +2506,7 @@ static int CmdHF14AMfEClear(const char *Cmd) {
     if (c == 'h') return usage_hf14_eclr();
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_MIFARE_EML_MEMCLR, 0, 0, 0, NULL, 0);
+    SendCommandNG(CMD_MIFARE_EML_MEMCLR, NULL, 0);
     return 0;
 }
 
@@ -2711,7 +2711,7 @@ static int CmdHF14AMfECFill(const char *Cmd) {
 
     PrintAndLogEx(NORMAL, "--params: numSectors: %d, keyType: %c\n", numSectors, (keyType == 0) ? 'A' : 'B');
     clearCommandBuffer();
-    SendCommandOLD(CMD_MIFARE_EML_CARDLOAD, numSectors, keyType, 0, NULL, 0);
+    SendCommandMIX(CMD_MIFARE_EML_CARDLOAD, numSectors, keyType, 0, NULL, 0);
     return 0;
 }
 
@@ -3276,7 +3276,7 @@ static int CmdHF14AMfice(const char *Cmd) {
         flags |= initialize ? 0x0001 : 0;
         flags |= slow ? 0x0002 : 0;
         clearCommandBuffer();
-        SendCommandOLD(CMD_MIFARE_ACQUIRE_NONCES, blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, flags, NULL, 0);
+        SendCommandMIX(CMD_MIFARE_ACQUIRE_NONCES, blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, flags, NULL, 0);
 
         if (!WaitForResponseTimeout(CMD_ACK, &resp, 3000)) goto out;
         if (resp.oldarg[0])  goto out;
@@ -3308,7 +3308,7 @@ out:
     }
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_MIFARE_ACQUIRE_NONCES, blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, 4, NULL, 0);
+    SendCommandMIX(CMD_MIFARE_ACQUIRE_NONCES, blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, 4, NULL, 0);
     return 0;
 }
 
diff --git a/client/cmdhfmfdes.c b/client/cmdhfmfdes.c
index f5218ebb1..daadf0cab 100644
--- a/client/cmdhfmfdes.c
+++ b/client/cmdhfmfdes.c
@@ -111,7 +111,7 @@ static int CmdHF14ADesRb(const char *Cmd) {
 static int CmdHF14ADesInfo(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
 
-    SendCommandOLD(CMD_MIFARE_DESFIRE_INFO, 0, 0, 0, NULL, 0);
+    SendCommandNG(CMD_MIFARE_DESFIRE_INFO, NULL, 0);
     PacketResponseNG resp;
 
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
diff --git a/client/cmdhfmfdesfire.c b/client/cmdhfmfdesfire.c
index b93edd02a..d09a56eea 100644
--- a/client/cmdhfmfdesfire.c
+++ b/client/cmdhfmfdesfire.c
@@ -58,7 +58,7 @@ static int CmdHF14AMfDESAuth(const char *Cmd) {
     //DES_set_key((DES_cblock *)key2,&ks2);
 
     //Auth1
-    SendCommandOLD(CMD_MIFARE_DES_AUTH1, blockNo, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_MIFARE_DES_AUTH1, blockNo, 0, 0, NULL, 0);
     PacketResponseNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         uint8_t isOK  = resp.oldarg[0] & 0xff;
@@ -155,7 +155,7 @@ static int CmdHF14AMfAESAuth(const char *Cmd) {
     AES_set_decrypt_key(key, 128, &key_d);
 
     //Auth1
-    SendCommandOLD(CMD_MIFARE_DES_AUTH1, blockNo, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_MIFARE_DES_AUTH1, blockNo, 0, 0, NULL, 0);
     PacketResponseNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         uint8_t isOK  = resp.oldarg[0] & 0xff;
diff --git a/client/cmdhfmfhard.c b/client/cmdhfmfhard.c
index 038a2bd4c..cdbd092d8 100644
--- a/client/cmdhfmfhard.c
+++ b/client/cmdhfmfhard.c
@@ -1393,7 +1393,7 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
             if (!WaitForResponseTimeout(CMD_ACK, &resp, 3000)) {
                 //strange second call (iceman)
                 clearCommandBuffer();
-                SendCommandOLD(CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES, blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, 4, NULL, 0);
+                SendCommandMIX(CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES, blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, 4, NULL, 0);
                 return 1;
             }
             if (resp.oldarg[0]) return resp.oldarg[0];  // error during nested_hard
diff --git a/client/cmdhfmfp.c b/client/cmdhfmfp.c
index e9bff0128..e69410e38 100644
--- a/client/cmdhfmfp.c
+++ b/client/cmdhfmfp.c
@@ -42,7 +42,7 @@ static int CmdHFMFPInfo(const char *cmd) {
     infoHF14A(false, false);
 
     // Mifare Plus info
-    SendCommandOLD(CMD_READER_ISO_14443a, ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_READER_ISO_14443a, ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0, NULL, 0);
 
     PacketResponseNG resp;
     WaitForResponse(CMD_ACK, &resp);
diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index c38d8355b..4f31f89bb 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -459,7 +459,7 @@ static char *getUlev1CardSizeStr(uint8_t fsize) {
 
 static void ul_switch_on_field(void) {
     clearCommandBuffer();
-    SendCommandOLD(CMD_READER_ISO_14443a, ISO14A_CONNECT | ISO14A_NO_DISCONNECT | ISO14A_NO_RATS, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_READER_ISO_14443a, ISO14A_CONNECT | ISO14A_NO_DISCONNECT | ISO14A_NO_RATS, 0, 0, NULL, 0);
 }
 
 static int ul_send_cmd_raw(uint8_t *cmd, uint8_t cmdlen, uint8_t *response, uint16_t responseLength) {
@@ -2485,7 +2485,7 @@ static int CmdHF14AMfUCSetUid(const char *Cmd) {
 
     // read block2.
     clearCommandBuffer();
-    SendCommandOLD(CMD_MIFAREU_READBL, 2, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_MIFAREU_READBL, 2, 0, 0, NULL, 0);
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         PrintAndLogEx(WARNING, "Command execute timeout");
         return 2;
@@ -2543,7 +2543,7 @@ static int CmdHF14AMfUGenDiverseKeys(const char *Cmd) {
     if (cmdp == 'r') {
         // read uid from tag
         clearCommandBuffer();
-        SendCommandOLD(CMD_READER_ISO_14443a, ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0, NULL, 0);
+        SendCommandMIX(CMD_READER_ISO_14443a, ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0, NULL, 0);
         PacketResponseNG resp;
         WaitForResponse(CMD_ACK, &resp);
         iso14a_card_select_t card;
@@ -2657,7 +2657,7 @@ static int CmdHF14AMfUPwdGen(const char *Cmd) {
     if (cmdp == 'r') {
         // read uid from tag
         clearCommandBuffer();
-        SendCommandOLD(CMD_READER_ISO_14443a, ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0, NULL, 0);
+        SendCommandMIX(CMD_READER_ISO_14443a, ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0, NULL, 0);
         PacketResponseNG resp;
         WaitForResponse(CMD_ACK, &resp);
         iso14a_card_select_t card;
diff --git a/client/cmdhftopaz.c b/client/cmdhftopaz.c
index 284cdc1f9..dc5064359 100644
--- a/client/cmdhftopaz.c
+++ b/client/cmdhftopaz.c
@@ -31,11 +31,11 @@ static struct {
 } topaz_tag;
 
 static void topaz_switch_on_field(void) {
-    SendCommandOLD(CMD_READER_ISO_14443a, ISO14A_CONNECT | ISO14A_NO_SELECT | ISO14A_NO_DISCONNECT | ISO14A_TOPAZMODE | ISO14A_NO_RATS, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_READER_ISO_14443a, ISO14A_CONNECT | ISO14A_NO_SELECT | ISO14A_NO_DISCONNECT | ISO14A_TOPAZMODE | ISO14A_NO_RATS, 0, 0, NULL, 0);
 }
 
 static void topaz_switch_off_field(void) {
-    SendCommandOLD(CMD_READER_ISO_14443a, 0, 0, 0, NULL, 0);
+    SendCommandNG(CMD_READER_ISO_14443a, NULL, 0);
 }
 
 // send a raw topaz command, returns the length of the response (0 in case of error)
diff --git a/client/cmdhw.c b/client/cmdhw.c
index f086b4c99..7a8906cd3 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -362,7 +362,7 @@ static int CmdDetectReader(const char *Cmd) {
     }
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_LISTEN_READER_FIELD, arg, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_LISTEN_READER_FIELD, arg, 0, 0, NULL, 0);
     return PM3_SUCCESS;
 }
 
@@ -370,7 +370,7 @@ static int CmdDetectReader(const char *Cmd) {
 static int CmdFPGAOff(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     clearCommandBuffer();
-    SendCommandMIX(CMD_FPGA_MAJOR_MODE_OFF, 0, 0, 0, NULL, 0);
+    SendCommandNG(CMD_FPGA_MAJOR_MODE_OFF, NULL, 0);
     return PM3_SUCCESS;
 }
 
@@ -379,27 +379,27 @@ static int CmdLCD(const char *Cmd) {
     sscanf(Cmd, "%x %d", &i, &j);
     while (j--) {
         clearCommandBuffer();
-        SendCommandOLD(CMD_LCD, i & 0x1ff, 0, 0, NULL, 0);
+        SendCommandMIX(CMD_LCD, i & 0x1ff, 0, 0, NULL, 0);
     }
     return PM3_SUCCESS;
 }
 
 static int CmdLCDReset(const char *Cmd) {
     clearCommandBuffer();
-    SendCommandOLD(CMD_LCD_RESET, strtol(Cmd, NULL, 0), 0, 0, NULL, 0);
+    SendCommandMIX(CMD_LCD_RESET, strtol(Cmd, NULL, 0), 0, 0, NULL, 0);
     return PM3_SUCCESS;
 }
 
 static int CmdReadmem(const char *Cmd) {
     clearCommandBuffer();
-    SendCommandOLD(CMD_READ_MEM, strtol(Cmd, NULL, 0), 0, 0, NULL, 0);
+    SendCommandMIX(CMD_READ_MEM, strtol(Cmd, NULL, 0), 0, 0, NULL, 0);
     return PM3_SUCCESS;
 }
 
 static int CmdReset(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     clearCommandBuffer();
-    SendCommandMIX(CMD_HARDWARE_RESET, 0, 0, 0, NULL, 0);
+    SendCommandNG(CMD_HARDWARE_RESET, NULL, 0);
     return PM3_SUCCESS;
 }
 
@@ -416,7 +416,7 @@ static int CmdSetDivisor(const char *Cmd) {
     }
     // 12 000 000 (12Mhz)
     clearCommandBuffer();
-    SendCommandOLD(CMD_SET_LF_DIVISOR, arg, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_SET_LF_DIVISOR, arg, 0, 0, NULL, 0);
     PrintAndLogEx(SUCCESS, "Divisor set, expected %.1f KHz", ((double)12000 / (arg + 1)));
     return PM3_SUCCESS;
 }
@@ -440,7 +440,7 @@ static int CmdSetMux(const char *Cmd) {
         return PM3_EINVARG;
         }
     clearCommandBuffer();
-    SendCommandOLD(CMD_SET_ADC_MUX, arg, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_SET_ADC_MUX, arg, 0, 0, NULL, 0);
     return PM3_SUCCESS;
 }
 
@@ -458,7 +458,7 @@ static int CmdStatus(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     clearCommandBuffer();
     PacketResponseNG resp;
-    SendCommandMIX(CMD_STATUS, 0, 0, 0, NULL, 0);
+    SendCommandNG(CMD_STATUS, NULL, 0);
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000))
         PrintAndLogEx(WARNING, "Status command failed. Communication speed test timed out");
     return PM3_SUCCESS;
@@ -468,7 +468,7 @@ static int CmdPing(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     clearCommandBuffer();
     PacketResponseNG resp;
-    SendCommandMIX(CMD_PING, 0, 0, 0, NULL, 0);
+    SendCommandNG(CMD_PING, NULL, 0);
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1000))
         PrintAndLogEx(SUCCESS, "Ping " _GREEN_("successful"));
     else
@@ -568,7 +568,7 @@ void pm3_version(bool verbose) {
     PacketResponseNG resp;
     clearCommandBuffer();
     
-    SendCommandMIX(CMD_VERSION, 0, 0, 0, NULL, 0);
+    SendCommandNG(CMD_VERSION, NULL, 0);
     
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {
         PrintAndLogEx(NORMAL, "\n" _BLUE_(" [ Proxmark3 RFID instrument ]") "\n");
diff --git a/client/cmdlf.c b/client/cmdlf.c
index 163d9e4b7..85f876d27 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -335,7 +335,7 @@ int CmdLFSetConfig(const char *Cmd) {
 bool lf_read(bool silent, uint32_t samples) {
     if (!session.pm3_present) return false;
     clearCommandBuffer();
-    SendCommandOLD(CMD_ACQUIRE_RAW_ADC_SAMPLES_125K, silent, samples, 0, NULL, 0);
+    SendCommandMIX(CMD_ACQUIRE_RAW_ADC_SAMPLES_125K, silent, samples, 0, NULL, 0);
 
     PacketResponseNG resp;
     if (g_lf_threshold_set) {
@@ -390,7 +390,7 @@ int CmdLFSniff(const char *Cmd) {
     if (cmdp == 'h') return usage_lf_sniff();
 
     clearCommandBuffer();
-    SendCommandMIX(CMD_LF_SNIFF_RAW_ADC_SAMPLES, 0, 0, 0, NULL, 0);
+    SendCommandNG(CMD_LF_SNIFF_RAW_ADC_SAMPLES, NULL, 0);
     WaitForResponse(CMD_ACK, NULL);
     getSamples(0, false);
     return 0;
@@ -438,7 +438,7 @@ int CmdLFSim(const char *Cmd) {
     PrintAndLogEx(NORMAL, "Simulating");
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_SIMULATE_TAG_125K, GraphTraceLen, gap, 0, NULL, 0);
+    SendCommandMIX(CMD_SIMULATE_TAG_125K, GraphTraceLen, gap, 0, NULL, 0);
     return 0;
 }
 
@@ -722,7 +722,7 @@ int CmdLFSimBidir(const char *Cmd) {
     // Set ADC to twice the carrier for a slight supersampling
     // HACK: not implemented in ARMSRC.
     PrintAndLogEx(INFO, "Not implemented yet.");
-    SendCommandOLD(CMD_LF_SIMULATE_BIDIR, 47, 384, 0, NULL, 0);
+    SendCommandMIX(CMD_LF_SIMULATE_BIDIR, 47, 384, 0, NULL, 0);
     return 0;
 }
 
diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c
index 046df1ce9..8e29e77bf 100644
--- a/client/cmdlfawid.c
+++ b/client/cmdlfawid.c
@@ -87,9 +87,9 @@ static int usage_lf_awid_brute(void) {
 }
 
 static bool sendPing(void) {
-    SendCommandOLD(CMD_PING, 1, 2, 3, NULL, 0);
-    SendCommandOLD(CMD_PING, 1, 2, 3, NULL, 0);
-    SendCommandOLD(CMD_PING, 1, 2, 3, NULL, 0);
+    SendCommandMIX(CMD_PING, 1, 2, 3, NULL, 0);
+    SendCommandMIX(CMD_PING, 1, 2, 3, NULL, 0);
+    SendCommandMIX(CMD_PING, 1, 2, 3, NULL, 0);
     clearCommandBuffer();
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000))
@@ -167,7 +167,7 @@ static int CmdAWIDRead_device(const char *Cmd) {
     if (Cmd[0] == 'h' || Cmd[0] == 'H') return usage_lf_awid_read();
     uint8_t findone = (Cmd[0] == '1') ? 1 : 0;
     clearCommandBuffer();
-    SendCommandOLD(CMD_AWID_DEMOD_FSK, findone, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_AWID_DEMOD_FSK, findone, 0, 0, NULL, 0);
     return 0;
 }
 */
@@ -385,7 +385,7 @@ static int CmdAWIDClone(const char *Cmd) {
 
     for (uint8_t i = 0; i < 4; i++) {
         clearCommandBuffer();
-        SendCommandOLD(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, NULL, 0);
+        SendCommandMIX(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, NULL, 0);
         if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
             return -1;
diff --git a/client/cmdlfcotag.c b/client/cmdlfcotag.c
index 9875d969f..45de81aff 100644
--- a/client/cmdlfcotag.c
+++ b/client/cmdlfcotag.c
@@ -75,7 +75,7 @@ static int CmdCOTAGRead(const char *Cmd) {
     sscanf(Cmd, "%u", &rawsignal);
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_COTAG, rawsignal, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_COTAG, rawsignal, 0, 0, NULL, 0);
     if (!WaitForResponseTimeout(CMD_ACK, NULL, 7000)) {
         PrintAndLogEx(WARNING, "command execution time out");
         return -1;
diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index dc06f02d5..35d486fc8 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -389,7 +389,7 @@ int AskEm410xDemod(const char *Cmd, uint32_t *hi, uint64_t *lo, bool verbose) {
 static int CmdEM410xRead_device(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     uint8_t findone = (cmdp == '1') ? 1 : 0;
-    SendCommandOLD(CMD_EM410X_DEMOD, findone, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_EM410X_DEMOD, findone, 0, 0, NULL, 0);
     return 0;
 }
 */
@@ -647,7 +647,7 @@ static int CmdEM410xWrite(const char *Cmd) {
         return 0;
     }
 
-    SendCommandOLD(CMD_EM410X_WRITE_TAG, card, (uint32_t)(id >> 32), (uint32_t)id, NULL, 0);
+    SendCommandMIX(CMD_EM410X_WRITE_TAG, card, (uint32_t)(id >> 32), (uint32_t)id, NULL, 0);
     return 0;
 }
 
@@ -1126,7 +1126,7 @@ static bool demodEM4x05resp(uint32_t *word) {
 //////////////// 4205 / 4305 commands
 static int EM4x05ReadWord_ext(uint8_t addr, uint32_t pwd, bool usePwd, uint32_t *word) {
     clearCommandBuffer();
-    SendCommandOLD(CMD_EM4X_READ_WORD, addr, pwd, usePwd, NULL, 0);
+    SendCommandMIX(CMD_EM4X_READ_WORD, addr, pwd, usePwd, NULL, 0);
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         PrintAndLogEx(DEBUG, "timeout while waiting for reply.");
@@ -1228,7 +1228,7 @@ static int CmdEM4x05Write(const char *Cmd) {
     uint16_t flag = (addr << 8) | (usePwd);
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_EM4X_WRITE_WORD, flag, data, pwd, NULL, 0);
+    SendCommandMIX(CMD_EM4X_WRITE_WORD, flag, data, pwd, NULL, 0);
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
         PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
diff --git a/client/cmdlffdx.c b/client/cmdlffdx.c
index 6ad487888..d652673e8 100644
--- a/client/cmdlffdx.c
+++ b/client/cmdlffdx.c
@@ -285,7 +285,7 @@ static int CmdFdxClone(const char *Cmd) {
 
     for (int i = 4; i >= 0; --i) {
         clearCommandBuffer();
-        SendCommandOLD(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, NULL, 0);
+        SendCommandMIX(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, NULL, 0);
         if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
             return -1;
diff --git a/client/cmdlfguard.c b/client/cmdlfguard.c
index 420398b66..a01b6dbaa 100644
--- a/client/cmdlfguard.c
+++ b/client/cmdlfguard.c
@@ -175,7 +175,7 @@ static int CmdGuardClone(const char *Cmd) {
 
     for (i = 0; i < 4; ++i) {
         clearCommandBuffer();
-        SendCommandOLD(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, NULL, 0);
+        SendCommandMIX(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, NULL, 0);
         if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
             return -1;
diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c
index 13ab591fa..fc9decced 100644
--- a/client/cmdlfhid.c
+++ b/client/cmdlfhid.c
@@ -93,9 +93,9 @@ static int usage_lf_hid_brute(void) {
 
 // sending three times.  Didn't seem to break the previous sim?
 static bool sendPing(void) {
-    SendCommandOLD(CMD_PING, 1, 2, 3, NULL, 0);
-    SendCommandOLD(CMD_PING, 1, 2, 3, NULL, 0);
-    SendCommandOLD(CMD_PING, 1, 2, 3, NULL, 0);
+    SendCommandMIX(CMD_PING, 1, 2, 3, NULL, 0);
+    SendCommandMIX(CMD_PING, 1, 2, 3, NULL, 0);
+    SendCommandMIX(CMD_PING, 1, 2, 3, NULL, 0);
     clearCommandBuffer();
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000))
@@ -111,7 +111,7 @@ static bool sendTry(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint32_t delay, ui
     calcWiegand(fmtlen, fc, cn, bits, 0);
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_HID_SIM_TAG, bytebits_to_byte(bits, 32), bytebits_to_byte(bits + 32, 32), 0, NULL, 0);
+    SendCommandMIX(CMD_HID_SIM_TAG, bytebits_to_byte(bits, 32), bytebits_to_byte(bits + 32, 32), 0, NULL, 0);
 
     msleep(delay);
     sendPing();
@@ -239,7 +239,7 @@ static int CmdHIDRead_device(const char *Cmd) {
     if (Cmd[0] == 'h' || Cmd[0] == 'H') return usage_lf_hid_read();
     uint8_t findone = (Cmd[0] == '1') ? 1 : 0;
     clearCommandBuffer();
-    SendCommandOLD(CMD_HID_DEMOD_FSK, findone, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_HID_DEMOD_FSK, findone, 0, 0, NULL, 0);
     return 0;
 }
 */
@@ -259,7 +259,7 @@ static int CmdHIDSim(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation");
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_HID_SIM_TAG, hi, lo, 0, NULL, 0);
+    SendCommandMIX(CMD_HID_SIM_TAG, hi, lo, 0, NULL, 0);
     return 0;
 }
 
diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index 86eb3930a..0c48b22de 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -261,7 +261,7 @@ static int CmdLFHitagSniff(const char *Cmd) {
     if (ctmp == 'h') return usage_hitag_sniff();
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_SNIFF_HITAG, 0, 0, 0, NULL, 0);
+    SendCommandNG(CMD_SNIFF_HITAG, NULL, 0);
     return 0;
 }
 
@@ -339,7 +339,7 @@ static int CmdLFHitagSim(const char *Cmd) {
     if (tag_mem_supplied) {
         SendCommandOLD(cmd, 1, 0, 0, data, datalen);
     } else {
-        SendCommandOLD(cmd, 0, 0, 0, NULL, 0);
+        SendCommandNG(cmd, NULL, 0);
     }
 
     free(data);
@@ -457,7 +457,7 @@ static void printHitagConfiguration(uint8_t config) {
 static bool getHitagUid(uint32_t *uid) {
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_READER_HITAG, RHT2F_UID_ONLY, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_READER_HITAG, RHT2F_UID_ONLY, 0, 0, NULL, 0);
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         PrintAndLogEx(WARNING, "timeout while waiting for reply.");
@@ -632,7 +632,7 @@ static int CmdLFHitagCheckChallenges(const char *Cmd) {
     if (file_given)
         SendCommandOLD(CMD_TEST_HITAGS_TRACES, 1, 0, 0, data, datalen);
     else
-        SendCommandOLD(CMD_TEST_HITAGS_TRACES, 0, 0, 0, NULL, 0);
+        SendCommandNG(CMD_TEST_HITAGS_TRACES, NULL, 0);
 
     free(data);
     return 0;
diff --git a/client/cmdlfio.c b/client/cmdlfio.c
index 16214052b..50e0ae9d8 100644
--- a/client/cmdlfio.c
+++ b/client/cmdlfio.c
@@ -67,7 +67,7 @@ static int CmdIOProxRead_device(const char *Cmd) {
     if (Cmd[0] == 'h' || Cmd[0] == 'H') return usage_lf_io_read();
     int findone = (Cmd[0] == '1') ? 1 : 0;
     clearCommandBuffer();
-    SendCommandOLD(CMD_IO_DEMOD_FSK, findone, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_IO_DEMOD_FSK, findone, 0, 0, NULL, 0);
     return 0;
 }
 */
@@ -252,7 +252,7 @@ static int CmdIOProxClone(const char *Cmd) {
     print_blocks(blocks, 3);
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_IO_CLONE_TAG, blocks[1], blocks[2], 0, NULL, 0);
+    SendCommandMIX(CMD_IO_CLONE_TAG, blocks[1], blocks[2], 0, NULL, 0);
     return 0;
 }
 
diff --git a/client/cmdlfjablotron.c b/client/cmdlfjablotron.c
index c31923510..4fea2b1b9 100644
--- a/client/cmdlfjablotron.c
+++ b/client/cmdlfjablotron.c
@@ -159,7 +159,7 @@ static int CmdJablotronClone(const char *Cmd) {
 
     for (uint8_t i = 0; i < 3; i++) {
         clearCommandBuffer();
-        SendCommandOLD(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, NULL, 0);
+        SendCommandMIX(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, NULL, 0);
         if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
             return -1;
diff --git a/client/cmdlfkeri.c b/client/cmdlfkeri.c
index 8d0111914..f722837ba 100644
--- a/client/cmdlfkeri.c
+++ b/client/cmdlfkeri.c
@@ -150,7 +150,7 @@ static int CmdKeriClone(const char *Cmd) {
 
     for (uint8_t i = 0; i < 3; i++) {
         clearCommandBuffer();
-        SendCommandOLD(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, NULL, 0);
+        SendCommandMIX(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, NULL, 0);
         if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
             return -1;
diff --git a/client/cmdlfnedap.c b/client/cmdlfnedap.c
index e4a09ad34..ff5800322 100644
--- a/client/cmdlfnedap.c
+++ b/client/cmdlfnedap.c
@@ -206,7 +206,7 @@ static int CmdLFNedapClone(const char *Cmd) {
 
     for (uint8_t i = 0; i<5; ++i ) {
         clearCommandBuffer();
-        SendCommandOLD(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, NULL, 0);
+        SendCommandMIX(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, NULL, 0);
         if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)){
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
             return -1;
diff --git a/client/cmdlfnoralsy.c b/client/cmdlfnoralsy.c
index 417ac534f..9455ce916 100644
--- a/client/cmdlfnoralsy.c
+++ b/client/cmdlfnoralsy.c
@@ -158,7 +158,7 @@ static int CmdNoralsyClone(const char *Cmd) {
 
     for (uint8_t i = 0; i < 4; i++) {
         clearCommandBuffer();
-        SendCommandOLD(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, NULL, 0);
+        SendCommandMIX(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, NULL, 0);
         if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
             return -1;
diff --git a/client/cmdlfpcf7931.c b/client/cmdlfpcf7931.c
index 1574cd033..c9f5711ef 100644
--- a/client/cmdlfpcf7931.c
+++ b/client/cmdlfpcf7931.c
@@ -101,7 +101,7 @@ static int CmdLFPCF7931Read(const char *Cmd) {
 
     PacketResponseNG resp;
     clearCommandBuffer();
-    SendCommandOLD(CMD_PCF7931_READ, 0, 0, 0, NULL, 0);
+    SendCommandNG(CMD_PCF7931_READ, NULL, 0);
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         PrintAndLogEx(WARNING, "command execution time out");
         return 1;
diff --git a/client/cmdlfpresco.c b/client/cmdlfpresco.c
index e81a436fa..8222bb0be 100644
--- a/client/cmdlfpresco.c
+++ b/client/cmdlfpresco.c
@@ -124,7 +124,7 @@ static int CmdPrescoClone(const char *Cmd) {
 
     for (uint8_t i = 0; i < 5; i++) {
         clearCommandBuffer();
-        SendCommandOLD(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, NULL, 0);
+        SendCommandMIX(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, NULL, 0);
         if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
             return -1;
diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c
index 351299204..0823abb77 100644
--- a/client/cmdlfpyramid.c
+++ b/client/cmdlfpyramid.c
@@ -236,7 +236,7 @@ static int CmdPyramidClone(const char *Cmd) {
 
     for (uint8_t i = 0; i < 5; ++i) {
         clearCommandBuffer();
-        SendCommandOLD(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, NULL, 0);
+        SendCommandMIX(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, NULL, 0);
         if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
             return -1;
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index cb21ef215..12cb5846a 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1019,7 +1019,7 @@ static int CmdT55xxWakeUp(const char *Cmd) {
     if (errors) return usage_t55xx_wakup();
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_T55XX_WAKEUP, password, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_T55XX_WAKEUP, password, 0, 0, NULL, 0);
     PrintAndLogEx(SUCCESS, "Wake up command sent. Try read now");
     return 0;
 }
@@ -1516,7 +1516,7 @@ bool AquireData(uint8_t page, uint8_t block, bool pwdmode, uint32_t password) {
     // arg2: password
     uint8_t arg0 = (page << 1 | (pwdmode));
     clearCommandBuffer();
-    SendCommandOLD(CMD_T55XX_READ_BLOCK, arg0, block, password, NULL, 0);
+    SendCommandMIX(CMD_T55XX_READ_BLOCK, arg0, block, password, NULL, 0);
     if (!WaitForResponseTimeout(CMD_ACK, NULL, 2500)) {
         PrintAndLogEx(WARNING, "command execution time out");
         return false;
@@ -1775,7 +1775,7 @@ static void t55x7_create_config_block(int tagtype) {
 static int CmdResetRead(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     clearCommandBuffer();
-    SendCommandOLD(CMD_T55XX_RESET_READ, 0, 0, 0, NULL, 0);
+    SendCommandNG(CMD_T55XX_RESET_READ, NULL, 0);
     if (!WaitForResponseTimeout(CMD_ACK, NULL, 2500)) {
         PrintAndLogEx(WARNING, "command execution time out");
         return 0;
@@ -1855,7 +1855,7 @@ static int CmdT55xxChkPwds(const char *Cmd) {
 
     if (cmdp == 'm') {
         clearCommandBuffer();
-        SendCommandOLD(CMD_T55XX_CHKPWDS, 0, 0, 0, NULL, 0);
+        SendCommandNG(CMD_T55XX_CHKPWDS, NULL, 0);
         PacketResponseNG resp;
 
         while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
diff --git a/client/cmdlfti.c b/client/cmdlfti.c
index 3c6b22ed1..03017f949 100644
--- a/client/cmdlfti.c
+++ b/client/cmdlfti.c
@@ -276,7 +276,7 @@ out:
 static int CmdTIRead(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     clearCommandBuffer();
-    SendCommandOLD(CMD_READ_TI_TYPE, 0, 0, 0, NULL, 0);
+    SendCommandNG(CMD_READ_TI_TYPE, NULL, 0);
     return 0;
 }
 
@@ -294,7 +294,7 @@ static int CmdTIWrite(const char *Cmd) {
         return 1;
     }
     clearCommandBuffer();
-    SendCommandOLD(CMD_WRITE_TI_TYPE, arg0, arg1, arg2, NULL, 0);
+    SendCommandMIX(CMD_WRITE_TI_TYPE, arg0, arg1, arg2, NULL, 0);
     return 0;
 }
 
diff --git a/client/cmdlfviking.c b/client/cmdlfviking.c
index d21c30076..75b84bed4 100644
--- a/client/cmdlfviking.c
+++ b/client/cmdlfviking.c
@@ -89,7 +89,7 @@ static int CmdVikingClone(const char *Cmd) {
     PrintAndLogEx(INFO, "Preparing to clone Viking tag - ID: %08X, Raw: %08X%08X", id, (uint32_t)(rawID >> 32), (uint32_t)(rawID & 0xFFFFFFFF));
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_VIKING_CLONE_TAG, rawID >> 32, rawID & 0xFFFFFFFF, Q5, NULL, 0);
+    SendCommandMIX(CMD_VIKING_CLONE_TAG, rawID >> 32, rawID & 0xFFFFFFFF, Q5, NULL, 0);
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
         PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
diff --git a/client/cmdlfvisa2000.c b/client/cmdlfvisa2000.c
index f0b7c7c13..2980b0a5c 100644
--- a/client/cmdlfvisa2000.c
+++ b/client/cmdlfvisa2000.c
@@ -170,7 +170,7 @@ static int CmdVisa2kClone(const char *Cmd) {
 
     for (uint8_t i = 0; i < 4; i++) {
         clearCommandBuffer();
-        SendCommandOLD(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, NULL, 0);
+        SendCommandMIX(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, NULL, 0);
         if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
             return -1;
diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index 342aa67f4..973dc29a6 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -664,7 +664,7 @@ static int CmdSmartUpgrade(const char *Cmd) {
 
     // trigger the firmware upgrade
     clearCommandBuffer();
-    SendCommandOLD(CMD_SMART_UPGRADE, firmware_size, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_SMART_UPGRADE, firmware_size, 0, 0, NULL, 0);
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         PrintAndLogEx(WARNING, "timeout while waiting for reply.");
@@ -702,7 +702,7 @@ static int CmdSmartInfo(const char *Cmd) {
     if (errors) return usage_sm_info();
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_SMART_ATR, 0, 0, 0, NULL, 0);
+    SendCommandNG(CMD_SMART_ATR, NULL, 0);
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         if (!silent) PrintAndLogEx(WARNING, "smart card select failed");
@@ -776,7 +776,7 @@ static int CmdSmartReader(const char *Cmd) {
     if (errors) return usage_sm_reader();
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_SMART_ATR, 0, 0, 0, NULL, 0);
+    SendCommandNG(CMD_SMART_ATR, NULL, 0);
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         if (!silent) PrintAndLogEx(WARNING, "smart card select failed");
@@ -821,7 +821,7 @@ static int CmdSmartSetClock(const char *Cmd) {
     if (errors || cmdp == 0) return usage_sm_setclock();
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_SMART_SETCLOCK, clock1, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_SMART_SETCLOCK, clock1, 0, 0, NULL, 0);
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         PrintAndLogEx(WARNING, "smart card select failed");
@@ -1185,7 +1185,7 @@ bool smart_select(bool silent, smart_card_atr_t *atr) {
         memset(atr, 0, sizeof(smart_card_atr_t));
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_SMART_ATR, 0, 0, 0, NULL, 0);
+    SendCommandNG(CMD_SMART_ATR, NULL, 0);
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         if (!silent) PrintAndLogEx(WARNING, "smart card select failed");
diff --git a/client/deprecated-hid-flasher/flasher/flash.c b/client/deprecated-hid-flasher/flasher/flash.c
index e7a7a774e..9091cc12f 100644
--- a/client/deprecated-hid-flasher/flasher/flash.c
+++ b/client/deprecated-hid-flasher/flasher/flash.c
@@ -260,7 +260,7 @@ fail:
 
 // Get the state of the proxmark, backwards compatible
 static int get_proxmark_state(uint32_t *state) {
-    SendCommandOLD(CMD_DEVICE_INFO, 0, 0, 0, NULL, 0);
+    SendCommandNG(CMD_DEVICE_INFO, NULL, 0);
     PacketResponseOLD resp;
     ReceiveCommand(&resp);
 
@@ -307,11 +307,11 @@ static int enter_bootloader(void) {
                 && (state & DEVICE_INFO_FLAG_OSIMAGE_PRESENT)) {
             // New style handover: Send CMD_START_FLASH, which will reset the board
             // and enter the bootrom on the next boot.
-            SendCommandOLD(CMD_START_FLASH, 0, 0, 0, NULL, 0);
+            SendCommandNG(CMD_START_FLASH, NULL, 0);
             fprintf(stderr, "(Press and release the button only to abort)\n");
         } else {
             // Old style handover: Ask the user to press the button, then reset the board
-            SendCommandOLD(CMD_HARDWARE_RESET, 0, 0, 0, NULL, 0);
+            SendCommandNG(CMD_HARDWARE_RESET, NULL, 0);
             fprintf(stderr, "Press and hold down button NOW if your bootloader requires it.\n");
         }
         fprintf(stderr, "Waiting for Proxmark3 to reappear on USB...");
@@ -356,9 +356,9 @@ int flash_start_flashing(int enable_bl_writes) {
         // This command is stupid. Why the heck does it care which area we're
         // flashing, as long as it's not the bootloader area? The mind boggles.
         if (enable_bl_writes) {
-            SendCommandOLD(CMD_START_FLASH, FLASH_START, FLASH_END, START_FLASH_MAGIC, NULL, 0);
+            SendCommandMIX(CMD_START_FLASH, FLASH_START, FLASH_END, START_FLASH_MAGIC, NULL, 0);
         } else {
-            SendCommandOLD(CMD_START_FLASH, BOOTLOADER_END, FLASH_END, 0, NULL, 0);
+            SendCommandMIX(CMD_START_FLASH, BOOTLOADER_END, FLASH_END, 0, NULL, 0);
         }
         return wait_for_ack();
     } else {
@@ -440,7 +440,7 @@ void flash_free(flash_file_t *ctx) {
 
 // just reset the unit
 int flash_stop_flashing(void) {
-    SendCommandOLD(CMD_HARDWARE_RESET, 0, 0, 0, NULL, 0);
+    SendCommandNG(CMD_HARDWARE_RESET, NULL, 0);
     msleep(100);
     return 0;
 }
diff --git a/client/flash.c b/client/flash.c
index 322fc3e49..b3ad88859 100644
--- a/client/flash.c
+++ b/client/flash.c
@@ -259,7 +259,7 @@ fail:
 
 // Get the state of the proxmark, backwards compatible
 static int get_proxmark_state(uint32_t *state) {
-    SendCommandOLD(CMD_DEVICE_INFO, 0, 0, 0, NULL, 0);
+    SendCommandNG(CMD_DEVICE_INFO, NULL, 0);
     PacketResponseNG resp;
     WaitForResponse(CMD_UNKNOWN, &resp);  // wait for any response. No timeout.
 
@@ -304,11 +304,11 @@ static int enter_bootloader(char *serial_port_name) {
                 && (state & DEVICE_INFO_FLAG_OSIMAGE_PRESENT)) {
             // New style handover: Send CMD_START_FLASH, which will reset the board
             // and enter the bootrom on the next boot.
-            SendCommandOLD(CMD_START_FLASH, 0, 0, 0, NULL, 0);
+            SendCommandNG(CMD_START_FLASH, NULL, 0);
             PrintAndLogEx(SUCCESS, "(Press and release the button only to " _YELLOW_("abort") ")");
         } else {
             // Old style handover: Ask the user to press the button, then reset the board
-            SendCommandOLD(CMD_HARDWARE_RESET, 0, 0, 0, NULL, 0);
+            SendCommandNG(CMD_HARDWARE_RESET, NULL, 0);
             PrintAndLogEx(SUCCESS, "Press and hold down button NOW if your bootloader requires it.");
         }
         msleep(100);
@@ -359,9 +359,9 @@ int flash_start_flashing(int enable_bl_writes, char *serial_port_name) {
         PacketResponseNG resp;
 
         if (enable_bl_writes) {
-            SendCommandOLD(CMD_START_FLASH, FLASH_START, FLASH_END, START_FLASH_MAGIC, NULL, 0);
+            SendCommandMIX(CMD_START_FLASH, FLASH_START, FLASH_END, START_FLASH_MAGIC, NULL, 0);
         } else {
-            SendCommandOLD(CMD_START_FLASH, BOOTLOADER_END, FLASH_END, 0, NULL, 0);
+            SendCommandMIX(CMD_START_FLASH, BOOTLOADER_END, FLASH_END, 0, NULL, 0);
         }
         return wait_for_ack(&resp);
     } else {
@@ -445,7 +445,7 @@ void flash_free(flash_file_t *ctx) {
 
 // just reset the unit
 int flash_stop_flashing(void) {
-    SendCommandOLD(CMD_HARDWARE_RESET, 0, 0, 0, NULL, 0);
+    SendCommandNG(CMD_HARDWARE_RESET, NULL, 0);
     msleep(100);
     return 0;
 }
diff --git a/client/mifare/mifarehost.c b/client/mifare/mifarehost.c
index e071e5a7d..b64f07105 100644
--- a/client/mifare/mifarehost.c
+++ b/client/mifare/mifarehost.c
@@ -25,7 +25,7 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
 
     while (true) {
         clearCommandBuffer();
-        SendCommandOLD(CMD_READER_MIFARE, arg0, blockno, key_type, NULL, 0);
+        SendCommandMIX(CMD_READER_MIFARE, arg0, blockno, key_type, NULL, 0);
 
         //flush queue
         while (ukbhit()) {
@@ -446,7 +446,7 @@ int mfReadSector(uint8_t sectorNo, uint8_t keyType, uint8_t *key, uint8_t *data)
 // EMULATOR
 int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount) {
     clearCommandBuffer();
-    SendCommandOLD(CMD_MIFARE_EML_MEMGET, blockNum, blocksCount, 0, NULL, 0);
+    SendCommandMIX(CMD_MIFARE_EML_MEMGET, blockNum, blocksCount, 0, NULL, 0);
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return PM3_ETIMEOUT;
     memcpy(data, resp.data.asBytes, blocksCount * 16);
@@ -517,7 +517,7 @@ int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, uint8_t params) {
 
 int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params) {
     clearCommandBuffer();
-    SendCommandOLD(CMD_MIFARE_CGETBLOCK, params, blockNo, 0, NULL, 0);
+    SendCommandMIX(CMD_MIFARE_CGETBLOCK, params, blockNo, 0, NULL, 0);
     PacketResponseNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
         uint8_t isOK  = resp.oldarg[0] & 0xff;
@@ -906,7 +906,7 @@ returns:
 int detect_classic_nackbug(bool verbose) {
 
     clearCommandBuffer();
-    SendCommandMIX(CMD_MIFARE_NACK_DETECT, 0, 0, 0, NULL, 0);
+    SendCommandNG(CMD_MIFARE_NACK_DETECT, NULL, 0);
     PacketResponseNG resp;
 
     if (verbose)
@@ -991,7 +991,7 @@ void detect_classic_magic(void) {
     uint8_t isGeneration = 0;
     PacketResponseNG resp;
     clearCommandBuffer();
-    SendCommandMIX(CMD_MIFARE_CIDENT, 0, 0, 0, NULL, 0);
+    SendCommandNG(CMD_MIFARE_CIDENT, NULL, 0);
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500))
         isGeneration = resp.oldarg[0] & 0xff;
 
diff --git a/client/scripting.c b/client/scripting.c
index 468c63cfa..c8fa2f163 100644
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -45,7 +45,7 @@ static int l_fast_push_mode(lua_State *L) {
 
     // Disable fast mode and send a dummy command to make it effective
     if (enable == false) {
-        SendCommandMIX(CMD_PING, 0, 0, 0, NULL, 0);
+        SendCommandNG(CMD_PING, NULL, 0);
         WaitForResponseTimeout(CMD_ACK, NULL, 1000);
     }
 
@@ -86,7 +86,7 @@ static int l_SendCommand(lua_State *L) {
  * @return
  */
 static int l_SendCommandOLD(lua_State *L) {
-//  SendCommandOLD(CMD_HF_SNIFFER, skippairs, skiptriggers, 0, NULL, 0);
+//  SendCommandMIX(CMD_HF_SNIFFER, skippairs, skiptriggers, 0, NULL, 0);
 // (uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len)
 
     uint64_t cmd, arg0, arg1, arg2;

From 061321c353ba6df0e5af7f10ea8c58f866659c17 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 7 May 2019 20:13:01 +0200
Subject: [PATCH 1630/1938] flash still need old cmds

---
 client/deprecated-hid-flasher/flasher/flash.c | 12 ++++++------
 client/flash.c                                | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/client/deprecated-hid-flasher/flasher/flash.c b/client/deprecated-hid-flasher/flasher/flash.c
index 9091cc12f..e7a7a774e 100644
--- a/client/deprecated-hid-flasher/flasher/flash.c
+++ b/client/deprecated-hid-flasher/flasher/flash.c
@@ -260,7 +260,7 @@ fail:
 
 // Get the state of the proxmark, backwards compatible
 static int get_proxmark_state(uint32_t *state) {
-    SendCommandNG(CMD_DEVICE_INFO, NULL, 0);
+    SendCommandOLD(CMD_DEVICE_INFO, 0, 0, 0, NULL, 0);
     PacketResponseOLD resp;
     ReceiveCommand(&resp);
 
@@ -307,11 +307,11 @@ static int enter_bootloader(void) {
                 && (state & DEVICE_INFO_FLAG_OSIMAGE_PRESENT)) {
             // New style handover: Send CMD_START_FLASH, which will reset the board
             // and enter the bootrom on the next boot.
-            SendCommandNG(CMD_START_FLASH, NULL, 0);
+            SendCommandOLD(CMD_START_FLASH, 0, 0, 0, NULL, 0);
             fprintf(stderr, "(Press and release the button only to abort)\n");
         } else {
             // Old style handover: Ask the user to press the button, then reset the board
-            SendCommandNG(CMD_HARDWARE_RESET, NULL, 0);
+            SendCommandOLD(CMD_HARDWARE_RESET, 0, 0, 0, NULL, 0);
             fprintf(stderr, "Press and hold down button NOW if your bootloader requires it.\n");
         }
         fprintf(stderr, "Waiting for Proxmark3 to reappear on USB...");
@@ -356,9 +356,9 @@ int flash_start_flashing(int enable_bl_writes) {
         // This command is stupid. Why the heck does it care which area we're
         // flashing, as long as it's not the bootloader area? The mind boggles.
         if (enable_bl_writes) {
-            SendCommandMIX(CMD_START_FLASH, FLASH_START, FLASH_END, START_FLASH_MAGIC, NULL, 0);
+            SendCommandOLD(CMD_START_FLASH, FLASH_START, FLASH_END, START_FLASH_MAGIC, NULL, 0);
         } else {
-            SendCommandMIX(CMD_START_FLASH, BOOTLOADER_END, FLASH_END, 0, NULL, 0);
+            SendCommandOLD(CMD_START_FLASH, BOOTLOADER_END, FLASH_END, 0, NULL, 0);
         }
         return wait_for_ack();
     } else {
@@ -440,7 +440,7 @@ void flash_free(flash_file_t *ctx) {
 
 // just reset the unit
 int flash_stop_flashing(void) {
-    SendCommandNG(CMD_HARDWARE_RESET, NULL, 0);
+    SendCommandOLD(CMD_HARDWARE_RESET, 0, 0, 0, NULL, 0);
     msleep(100);
     return 0;
 }
diff --git a/client/flash.c b/client/flash.c
index b3ad88859..322fc3e49 100644
--- a/client/flash.c
+++ b/client/flash.c
@@ -259,7 +259,7 @@ fail:
 
 // Get the state of the proxmark, backwards compatible
 static int get_proxmark_state(uint32_t *state) {
-    SendCommandNG(CMD_DEVICE_INFO, NULL, 0);
+    SendCommandOLD(CMD_DEVICE_INFO, 0, 0, 0, NULL, 0);
     PacketResponseNG resp;
     WaitForResponse(CMD_UNKNOWN, &resp);  // wait for any response. No timeout.
 
@@ -304,11 +304,11 @@ static int enter_bootloader(char *serial_port_name) {
                 && (state & DEVICE_INFO_FLAG_OSIMAGE_PRESENT)) {
             // New style handover: Send CMD_START_FLASH, which will reset the board
             // and enter the bootrom on the next boot.
-            SendCommandNG(CMD_START_FLASH, NULL, 0);
+            SendCommandOLD(CMD_START_FLASH, 0, 0, 0, NULL, 0);
             PrintAndLogEx(SUCCESS, "(Press and release the button only to " _YELLOW_("abort") ")");
         } else {
             // Old style handover: Ask the user to press the button, then reset the board
-            SendCommandNG(CMD_HARDWARE_RESET, NULL, 0);
+            SendCommandOLD(CMD_HARDWARE_RESET, 0, 0, 0, NULL, 0);
             PrintAndLogEx(SUCCESS, "Press and hold down button NOW if your bootloader requires it.");
         }
         msleep(100);
@@ -359,9 +359,9 @@ int flash_start_flashing(int enable_bl_writes, char *serial_port_name) {
         PacketResponseNG resp;
 
         if (enable_bl_writes) {
-            SendCommandMIX(CMD_START_FLASH, FLASH_START, FLASH_END, START_FLASH_MAGIC, NULL, 0);
+            SendCommandOLD(CMD_START_FLASH, FLASH_START, FLASH_END, START_FLASH_MAGIC, NULL, 0);
         } else {
-            SendCommandMIX(CMD_START_FLASH, BOOTLOADER_END, FLASH_END, 0, NULL, 0);
+            SendCommandOLD(CMD_START_FLASH, BOOTLOADER_END, FLASH_END, 0, NULL, 0);
         }
         return wait_for_ack(&resp);
     } else {
@@ -445,7 +445,7 @@ void flash_free(flash_file_t *ctx) {
 
 // just reset the unit
 int flash_stop_flashing(void) {
-    SendCommandNG(CMD_HARDWARE_RESET, NULL, 0);
+    SendCommandOLD(CMD_HARDWARE_RESET, 0, 0, 0, NULL, 0);
     msleep(100);
     return 0;
 }

From 532dbf28a191c87c7c62ecb008656decc3efd4c5 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 7 May 2019 20:37:23 +0200
Subject: [PATCH 1631/1938] let OpenPm be responsible of setting
 session.pm3_present

---
 client/cmdhw.c     | 2 +-
 client/comms.c     | 1 +
 client/flasher.c   | 3 +--
 client/proxmark3.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/cmdhw.c b/client/cmdhw.c
index 7a8906cd3..4eda2dc66 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -522,7 +522,7 @@ static int CmdConnect(const char *Cmd) {
         CloseProxmark();
     }
 
-    session.pm3_present = OpenProxmark(port, false, 20, false, USART_BAUD_RATE);
+    OpenProxmark(port, false, 20, false, USART_BAUD_RATE);
 
     if (session.pm3_present && (TestProxmark() != PM3_SUCCESS)) {
         PrintAndLogEx(ERR, _RED_("ERROR:") "cannot communicate with the Proxmark\n");
diff --git a/client/comms.c b/client/comms.c
index 69c932590..504f40c9e 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -571,6 +571,7 @@ bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode,
 
         pthread_create(&communication_thread, NULL, &uart_communication, &conn);
         __atomic_clear(&comm_thread_dead, __ATOMIC_SEQ_CST);
+        session.pm3_present = true;
 
         fflush(stdout);
 
diff --git a/client/flasher.c b/client/flasher.c
index 80b59d90d..88c154605 100644
--- a/client/flasher.c
+++ b/client/flasher.c
@@ -77,8 +77,7 @@ int main(int argc, char **argv) {
 
     char *serial_port_name = argv[1];
 
-    session.pm3_present = OpenProxmark(serial_port_name, true, 60, true, FLASHMODE_SPEED);
-    if (session.pm3_present) {
+    if (OpenProxmark(serial_port_name, true, 60, true, FLASHMODE_SPEED)) {
         PrintAndLogEx(NORMAL, _GREEN_("Found"));
     } else {
         PrintAndLogEx(ERR, "Could not find Proxmark3 on " _RED_("%s") ".\n", serial_port_name);
diff --git a/client/proxmark3.c b/client/proxmark3.c
index 92cefa60c..9a90c2b8f 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -488,7 +488,7 @@ int main(int argc, char *argv[]) {
 
     // try to open USB connection to Proxmark
     if (port != NULL) {
-        session.pm3_present = OpenProxmark(port, waitCOMPort, 20, false, speed);
+        OpenProxmark(port, waitCOMPort, 20, false, speed);
     }
 
     if (session.pm3_present && (TestProxmark() != PM3_SUCCESS)) {

From bf0ab55833f530faf4ef3f4704f8f23cf7905c1b Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 7 May 2019 20:47:05 +0200
Subject: [PATCH 1632/1938] text

---
 client/flash.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/flash.c b/client/flash.c
index 322fc3e49..943b8c8b7 100644
--- a/client/flash.c
+++ b/client/flash.c
@@ -316,8 +316,7 @@ static int enter_bootloader(char *serial_port_name) {
         // Let time to OS to make the port disappear
         msleep(1000);
 
-        bool opened = OpenProxmark(serial_port_name, true, 60, true, FLASHMODE_SPEED);
-        if (opened) {
+        if (OpenProxmark(serial_port_name, true, 60, true, FLASHMODE_SPEED)) {
             PrintAndLogEx(NORMAL, " " _GREEN_("Found"));
             return 0;
         } else {
@@ -445,6 +444,7 @@ void flash_free(flash_file_t *ctx) {
 
 // just reset the unit
 int flash_stop_flashing(void) {
+    PrintAndLogEx(SUCCESS, _BLUE_("Resetting hardware...") "Subsequent communication error is " _BLUE_("normal"));
     SendCommandOLD(CMD_HARDWARE_RESET, 0, 0, 0, NULL, 0);
     msleep(100);
     return 0;

From c180c8df205d4c42411c783b0b9ef7f2f128a47a Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 7 May 2019 21:35:22 +0200
Subject: [PATCH 1633/1938] chg: hw ping - shouldnt be converted yet..

---
 client/cmdhw.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdhw.c b/client/cmdhw.c
index 4eda2dc66..f1f011509 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -468,7 +468,7 @@ static int CmdPing(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     clearCommandBuffer();
     PacketResponseNG resp;
-    SendCommandNG(CMD_PING, NULL, 0);
+    SendCommandMIX(CMD_PING, 0, 0, 0, NULL, 0);
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1000))
         PrintAndLogEx(SUCCESS, "Ping " _GREEN_("successful"));
     else

From df555be792d99cc5a184d36b1742183f0ffb83d9 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 7 May 2019 21:49:45 +0200
Subject: [PATCH 1634/1938] chg: script run didump - use MIX

---
 client/scripts/didump.lua | 118 ++++++++++++++++++++++----------------
 1 file changed, 68 insertions(+), 50 deletions(-)

diff --git a/client/scripts/didump.lua b/client/scripts/didump.lua
index b6bc03a11..990291b57 100644
--- a/client/scripts/didump.lua
+++ b/client/scripts/didump.lua
@@ -7,29 +7,36 @@ local lib14a = require('read14a')
 local json = require('dkjson')
 local toys = require('default_toys_di')
 
-example =[[
+copyright = ''
+author = 'Iceman'
+version = 'v1.0.1'
+desc = [[
+This is a script to dump and decrypt the data of a specific type of Mifare Mini token.
+The dump is decrypted. If a raw dump is wanted, use the -r parameter
+]]
+example = [[
     script run didump
     script run didump -t
     script run didump -r
 ]]
-author = "Iceman"
-usage = "script run didump -h -t"
-desc = [[
-This is a script to dump and decrypt the data of a specific type of Mifare Mini token.
-The dump is decrypted. If a raw dump is wanted, use the -r parameter
+usage = [[
+script run didump -h -t -r
+
 Arguments:
-    -h             : this help
-    -r             : raw
-    -t             : selftest
+      h   this helptext
+      r   raw
+      t   selftest
 ]]
 
-local band=bit32.band
-local bor=bit32.bor
-local bnot=bit32.bnot
-local bxor=bit32.bxor
-local lsh=bit32.lshift
-local rsh=bit32.rshift
+-- Some shortcuts
+local band = bit32.band
+local bor = bit32.bor
+local bnot = bit32.bnot
+local bxor = bit32.bxor
+local lsh = bit32.lshift
+local rsh = bit32.rshift
 
+-- Some globals
 local FOO = 'AF62D2EC0491968CC52A1A7165F865FE'
 local BAR = '286329204469736E65792032303133'
 local MIS = '0A14FD0507FF4BCD026BA83F0A3B89A9'
@@ -44,29 +51,33 @@ local CHECKSUM_OFFSET = 12; -- +1???
 -- A debug printout-function
 local function dbg(args)
     if not DEBUG then return end
-    if type(args) == "table" then
+    if type(args) == 'table' then
         local i = 1
         while args[i] do
-            print("###", args[i])
+            print('###', args[i])
             i = i+1
         end
     else
-        print("###", args)
+        print('###', args)
     end
 end
 ---
 -- This is only meant to be used when errors occur
 local function oops(err)
-    print("ERROR: ",err)
+    print('ERROR: ', err)
     core.clearCommandBuffer()
-    return false
+    return nil, err
 end
 ---
 -- Usage help
 local function help()
+    print(copyright)
+    print(author)
+    print(version)
     print(desc)
-    print("Example usage")
+    print('Example usage')
     print(example)
+    print(usage)
 end
 ---
 --
@@ -370,21 +381,7 @@ local function updateChecksum(data)
     return string.format("%s%X", part, chksum)
 end
 ---
--- receives the answer from deviceside, used with a readblock command
-local function waitCmd()
-    local response = core.WaitForResponseTimeout(cmds.CMD_ACK,TIMEOUT)
-    if response then
-        local count,cmd,arg0 = bin.unpack('LL',response)
-        if(arg0==1) then
-            local count,arg1,arg2,data = bin.unpack('LLH511',response,count)
-            return data:sub(1,32)
-        else
-            return nil, "Couldn't read block.."
-        end
-    end
-    return nil, "No response from device"
-end
-
+--
 local function keygen(uid)
     local data = MIS..uid..BAR
     local hash = utils.ConvertAsciiToBytes(utils.Sha1Hex(data))
@@ -397,7 +394,6 @@ local function keygen(uid)
         hash[6+1]
         )
 end
-
 --- encode 'table' into a json formatted string
 --
 local function convert_to_json( obj )
@@ -449,6 +445,29 @@ local function create_key(uid)
     key = key..utils.SwapEndiannessStr( sha:sub(25,32), 32 )
     return key
 end
+---
+-- decode response and get the blockdata from a normal mifare read command
+local function getblockdata(response)
+    if not response then
+        return nil, 'No response from device'
+    end
+
+    local count, cmd, arg0 = bin.unpack('LL', response)
+    if arg0 == 1 then
+        local count, arg1, arg2, data = bin.unpack('LLH511', response, count)
+        return data:sub(1, 32)
+    else
+        return nil, "Couldn't read block.. ["..arg0.."]"
+    end
+end
+
+local function readblock( blocknum, key )
+    -- Read block N
+    local c = Command:newMIX{cmd = cmds.CMD_MIFARE_READBL, arg1 = blocknum, data = key}
+    local b, err = getblockdata(c:sendMIX())
+    if not b then return oops(err) end
+    return b
+end
 --- reads all blocks from tag
 --
 local function readtag(mfkey, aeskey )
@@ -463,11 +482,8 @@ local function readtag(mfkey, aeskey )
         end
 
         -- read block from tag.
-        cmd = Command:new{cmd = cmds.CMD_MIFARE_READBL, arg1 = blockNo ,arg2 = 0,arg3 = 0, data = mfkey}
-        local err = core.SendCommand(cmd:getBytes())
-        if err then return oops(err) end
-        local blockdata, err = waitCmd()
-        if err then return oops(err) end
+        local blockdata = readblock(blockNo, mfkey)
+        if not blockdata then return oops('[!] failed reading block') end
 
         -- rules:
         -- the following blocks is NOT encrypted
@@ -488,7 +504,6 @@ local function readtag(mfkey, aeskey )
         else
             -- Sectorblocks, not encrypted, but we add our known key to it since it is normally zeros.
             blockdata = mfkey..blockdata:sub(13,20)..mfkey
-            --dbg(blockdata:sub(13,20))
         end
         table.insert(tagdata, blockdata)
     end
@@ -549,12 +564,12 @@ function main(args)
 
     -- Read the parameters
     for o, a in getopt.getopt(args, 'htdevi:') do
-        if o == "h" then help() return end
-        if o == "t" then return selftest() end
-        if o == "d" then shall_dec = true end
-        if o == "e" then shall_enc = true end
-        if o == "v" then shall_validate = true end
-        if o == "i" then input = load_json(a) end
+        if o == 'h' then help() return end
+        if o == 't' then return selftest() end
+        if o == 'd' then shall_dec = true end
+        if o == 'e' then shall_enc = true end
+        if o == 'v' then shall_validate = true end
+        if o == 'i' then input = load_json(a) end
     end
 
     -- Turn off Debug
@@ -562,7 +577,10 @@ function main(args)
 
     -- GET TAG UID
     tag, err = lib14a.read(false, true)
-    if not tag then return oops(err) end
+    if err then 
+        lib14a.disconnect()
+        return oops(err)
+    end
     core.clearCommandBuffer()
 
     -- simple tag check

From c99845b3d190c75f0ec1df2842f796e9b6b0aa6d Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 7 May 2019 21:56:05 +0200
Subject: [PATCH 1635/1938] fix:  rename to match the new file

---
 client/lualibs/commands.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/lualibs/commands.lua b/client/lualibs/commands.lua
index ca959291f..59825d2ca 100644
--- a/client/lualibs/commands.lua
+++ b/client/lualibs/commands.lua
@@ -1,8 +1,8 @@
 --[[
-Handle Proxmark USB Commands
+Handle Proxmark Communication Commands
 --]]
 
-local _commands = require('usb_cmd')
+local _commands = require('pm3_cmd')
 local util = require('utils')
 local TIMEOUT = 2000
 

From 07b6535f7e4d138ccfa556c59b23f519c8e34833 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 7 May 2019 22:03:11 +0200
Subject: [PATCH 1636/1938] chg: script run didump - helptexts

---
 client/scripts/didump.lua | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/client/scripts/didump.lua b/client/scripts/didump.lua
index 990291b57..a3601102c 100644
--- a/client/scripts/didump.lua
+++ b/client/scripts/didump.lua
@@ -16,16 +16,28 @@ The dump is decrypted. If a raw dump is wanted, use the -r parameter
 ]]
 example = [[
     script run didump
+    
+    -- selftest
     script run didump -t
+    
+    -- Generate raw dump,  into json.
     script run didump -r
+    
+    -- load file
+    script run didump -i dumpdata.json
 ]]
 usage = [[
-script run didump -h -t -r
+script run didump -h -t -r -d -e -v -i dumpdata.json
 
 Arguments:
-      h   this helptext
-      r   raw
-      t   selftest
+      h                 this helptext
+      r                 raw
+      t                 selftest
+      d                 decrypt data
+      e                 encrypt data
+      v                 validate data
+      i dumpdata.json   load json dump file
+    end      
 ]]
 
 -- Some shortcuts

From 6cb6f8739eff48aec6e718cc19eaa7f8096650b8 Mon Sep 17 00:00:00 2001
From: Iceman <iceman@iuse.se>
Date: Tue, 7 May 2019 22:04:45 +0200
Subject: [PATCH 1637/1938] Update .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 38058230d..60b048377 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,5 +61,6 @@ ppls patches/*
 
 client/lualibs/mf_default_keys.lua
 client/lualibs/usb_cmd.lua
+client/lualibs/pm3_cmd.lua
 # recompiled
 fpga_version_info.c

From 75325aef8630e8054408baa1822250c29b19b45f Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 7 May 2019 22:08:46 +0200
Subject: [PATCH 1638/1938] textual

---
 client/scripts/calc_di.lua | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/client/scripts/calc_di.lua b/client/scripts/calc_di.lua
index 9a8c051a4..7b8c304db 100644
--- a/client/scripts/calc_di.lua
+++ b/client/scripts/calc_di.lua
@@ -33,21 +33,22 @@ local bxor = bit32.bxor
 -- A debug printout-function
 local function dbg(args)
     if not DEBUG then return end
-    if type(args) == "table" then
+    if type(args) == 'table' then
         local i = 1
         while args[i] do
             dbg(args[i])
             i = i+1
         end
     else
-        print("###", args)
+        print('###', args)
     end
 end
 ---
 -- This is only meant to be used when errors occur
 local function oops(err)
-    print("ERROR: ",err)
-    return nil,err
+    print('ERROR: ', err)
+    core.clearCommandBuffer()
+    return nil, err
 end
 ---
 -- Usage help
@@ -58,6 +59,7 @@ local function help()
     print(desc)
     print('Example usage')
     print(example)
+    print(usage)
 end
 ---
 -- Exit message
@@ -142,8 +144,8 @@ local function main(args)
 
     -- Arguments for the script
     for o, a in getopt.getopt(args, 'hu:') do
-        if o == "h" then return help() end
-        if o == "u" then uid = a; useUID = true end
+        if o == 'h' then return help() end
+        if o == 'u' then uid = a; useUID = true end
     end
 
     if useUID then
@@ -160,7 +162,7 @@ local function main(args)
         -- simple tag check
         if 0x09 ~= tag.sak then
             if 0x4400 ~= tag.atqa then
-                return oops(('[fail] found tag %s :: looking for Mifare Mini 0.3k'):format(tag.name))
+                return oops(('[!] found tag %s :: looking for Mifare Mini 0.3k'):format(tag.name))
             end
         end
         uid = tag.uid

From 2af7255f629d247437c7afc7d625ab568dd7bcf8 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 7 May 2019 22:12:18 +0200
Subject: [PATCH 1639/1938] textual

---
 client/scripts/calc_ev1_it.lua | 18 ++++++++++--------
 client/scripts/tnp3clone.lua   |  8 ++++----
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/client/scripts/calc_ev1_it.lua b/client/scripts/calc_ev1_it.lua
index b4e995e96..89e778023 100644
--- a/client/scripts/calc_ev1_it.lua
+++ b/client/scripts/calc_ev1_it.lua
@@ -31,22 +31,22 @@ local bxor = bit32.bxor
 -- A debug printout-function
 local function dbg(args)
     if not DEBUG then return end
-
-    if type(args) == "table" then
+    if type(args) == 'table' then
         local i = 1
         while args[i] do
             dbg(args[i])
             i = i+1
         end
     else
-        print("###", args)
+        print('###', args)
     end
 end
 ---
 -- This is only meant to be used when errors occur
 local function oops(err)
-    print("ERROR: ",err)
-    return nil,err
+    print('ERROR: ', err)
+    core.clearCommandBuffer()
+    return nil, err
 end
 ---
 -- Usage help
@@ -57,10 +57,11 @@ local function help()
     print(desc)
     print("Example usage")
     print(example)
+    print(usage)    
 end
 --
 -- Exit message
-function exitMsg(msg)
+local function exitMsg(msg)
     print( string.rep('--',20) )
     print( string.rep('--',20) )
     print(msg)
@@ -138,6 +139,7 @@ local function pwdgen(uid)
     local pwd3 = bxor( entry[4], uidbytes[7])
     return string.format('%02X%02X%02X%02X', pwd0, pwd1, pwd2, pwd3)
 end
+
 --
 -- main
 local function main(args)
@@ -151,8 +153,8 @@ local function main(args)
 
     -- Arguments for the script
     for o, a in getopt.getopt(args, 'hu:') do
-        if o == "h" then return help() end
-        if o == "u" then uid = a; useUID = true end
+        if o == 'h' then return help() end
+        if o == 'u' then uid = a; useUID = true end
     end
 
     if useUID then
diff --git a/client/scripts/tnp3clone.lua b/client/scripts/tnp3clone.lua
index 1e3545a1b..b168c9d1a 100644
--- a/client/scripts/tnp3clone.lua
+++ b/client/scripts/tnp3clone.lua
@@ -135,11 +135,11 @@ local function main(args)
     --13-14
 
     -- find tag
-    result, err = lib14a.read(false, true)
-    if not result then return oops(err) end
+    local card, err = lib14a.read(false, true)
+    if not card then return oops(err) end
 
     -- load keys
-    local akeys  = pre.GetAll(result.uid)
+    local akeys  = pre.GetAll(card.uid)
     local keyA = akeys:sub(1, 12 )
 
     local b0 = readblock(0, keyA)
@@ -154,7 +154,7 @@ local function main(args)
     core.clearCommandBuffer()
 
     -- wipe card.
-    local cmd  = (csetuid..'%s %s %s w'):format(result.uid, atqa, sak)
+    local cmd  = (csetuid..'%s %s %s w'):format(card.uid, atqa, sak)
     core.console(cmd)
     core.clearCommandBuffer()
 

From c81bce6bf2410a66019e3d318db4e075641364df Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 7 May 2019 22:15:26 +0200
Subject: [PATCH 1640/1938] textual

---
 client/scripts/calc_mizip.lua | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/client/scripts/calc_mizip.lua b/client/scripts/calc_mizip.lua
index 8844f6d66..4ca7cb496 100644
--- a/client/scripts/calc_mizip.lua
+++ b/client/scripts/calc_mizip.lua
@@ -3,8 +3,9 @@ local getopt = require('getopt')
 local lib14a = require('read14a')
 local utils =  require('utils')
 
+copyright = ''
 author = 'Iceman'
-version = 'v1.0.0'
+version = 'v1.0.1'
 desc = [[
 This script calculates mifare keys based on uid diversification for mizip.
 Algo not found by me.
@@ -28,30 +29,31 @@ local bxor = bit32.bxor
 local _xortable = {
     --[[ sector key A/B, 6byte xor
     --]]
-    {1, "09125a2589e5", "F12C8453D821"},
-    {2, "AB75C937922F", "73E799FE3241"},
-    {3, "E27241AF2C09", "AA4D137656AE"},
-    {4, "317AB72F4490", "B01327272DFD"},
+    {1, '09125a2589e5', 'F12C8453D821'},
+    {2, 'AB75C937922F', '73E799FE3241'},
+    {3, 'E27241AF2C09', 'AA4D137656AE'},
+    {4, '317AB72F4490', 'B01327272DFD'},
 }
 ---
 -- A debug printout-function
 local function dbg(args)
     if not DEBUG then return end
-    if type(args) == "table" then
+    if type(args) == 'table' then
         local i = 1
         while args[i] do
             dbg(args[i])
             i = i+1
         end
     else
-        print("###", args)
+        print('###', args)
     end
 end
 ---
 -- This is only meant to be used when errors occur
 local function oops(err)
-    print("ERROR: ",err)
-    return nil,err
+    print('ERROR: ', err)
+    core.clearCommandBuffer()
+    return nil, err
 end
 ---
 -- Usage help
@@ -62,6 +64,7 @@ local function help()
     print(desc)
     print("Example usage")
     print(example)
+    print(usage)    
 end
 --
 -- Exit message
@@ -163,8 +166,8 @@ local function main(args)
 
     -- Arguments for the script
     for o, a in getopt.getopt(args, 'hu:') do
-        if o == "h" then return help() end
-        if o == "u" then uid = a ; useUID = true end
+        if o == 'h' then return help() end
+        if o == 'u' then uid = a ; useUID = true end
     end
 
     if useUID then
@@ -181,7 +184,7 @@ local function main(args)
         -- simple tag check
         if 0x09 ~= tag.sak then
             if 0x4400 ~= tag.atqa then
-                return oops(('[fail] found tag %s :: looking for Mifare Mini 0.3k'):format(tag.name))
+                return oops(('[!] found tag %s :: looking for Mifare Mini 0.3k'):format(tag.name))
             end
         end
         uid = tag.uid

From b73146533a0d98de9a38b171628ab5de9c7a32cb Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 7 May 2019 22:33:26 +0200
Subject: [PATCH 1641/1938] using MIX

---
 client/lualibs/read14a.lua |  4 +-
 client/lualibs/read14b.lua | 93 +++++++++++++-------------------------
 2 files changed, 33 insertions(+), 64 deletions(-)

diff --git a/client/lualibs/read14a.lua b/client/lualibs/read14a.lua
index 37f13decb..de4535c2f 100644
--- a/client/lualibs/read14a.lua
+++ b/client/lualibs/read14a.lua
@@ -120,13 +120,13 @@ end
 -- @return if successfull: an table containing card info
 -- @return if unsuccessfull : nil, error
 local function waitFor14443a()
-    print("Waiting for card... press any key to quit")
+    print('Waiting for card... press any key to quit')
     while not core.ukbhit() do
         res, err = read14443a()
         if res then return res end
         -- err means that there was no response from card
     end
-    return nil, "Aborted by user"
+    return nil, 'Aborted by user'
 end
 
 -- Sends an instruction to do nothing, only disconnect
diff --git a/client/lualibs/read14b.lua b/client/lualibs/read14b.lua
index 59e451ba4..52b2903bd 100644
--- a/client/lualibs/read14b.lua
+++ b/client/lualibs/read14b.lua
@@ -2,7 +2,7 @@
     This is a library to read 14443b tags. It can be used something like this
 
     local reader = require('read14b')
-    result, err = reader.select1443b()
+    result, err = reader.read14443b()
     if not result then
         print(err)
         return
@@ -13,7 +13,10 @@
 -- Loads the commands-library
 local cmds = require('commands')
 local utils = require('utils')
+
+-- Shouldn't take longer than 2.5 seconds
 local TIMEOUT = 2500
+
 local ISO14B_COMMAND = {
     ISO14B_CONNECT = 1,
     ISO14B_DISCONNECT = 2,
@@ -41,45 +44,16 @@ local function parse1443b(data)
     --]]
 
     local count, uid, uidlen, atqb, chipid, cid = bin.unpack('H10CH7CC',data)
-    uid = uid:sub(1, 2*uidlen)
-    return { uid = uid, uidlen = uidlen, atqb = atqb, chipid = chipid, cid = cid }
+    uid = uid:sub(1, 2 * uidlen)
+    return { 
+        uid = uid,
+        uidlen = uidlen,
+        atqb = atqb,
+        chipid = chipid,
+        cid = cid
+    }
 end
 
---- Sends a USBpacket to the device
--- @param command - the usb packet to send
--- @param ignoreresponse - if set to true, we don't read the device answer packet
---      which is usually recipe for fail. If not sent, the host will wait 2s for a
---      response of type CMD_ACK
--- @return packet,nil if successfull
---         nil, errormessage if unsuccessfull
-local function sendToDevice(cmd, ignoreresponse)
-    --core.clearCommandBuffer()
-    local bytes = cmd:getBytes()
-    local count,c,arg0,arg1,arg2 = bin.unpack('LLLL',bytes)
-    local err = core.SendCommand(cmd:getBytes())
-    if err then
-        print('ERROR',err)
-        return nil, err
-    end
-    if ignoreresponse then return nil,nil end
-
-    local response = core.WaitForResponseTimeout(cmds.CMD_ACK, TIMEOUT)
-    return response,nil
-end
---- Picks out and displays the data read from a tag
--- Specifically, takes a usb packet, converts to a Command
--- (as in commands.lua), takes the data-array and
--- reads the number of bytes specified in arg1 (arg0 in c-struct)
--- and displays the data
--- @param usbpacket the data received from the device
-local function showData(usbpacket)
-    local response = Command.parse(usbpacket)
-    local len = response.arg2 * 2
-    local data = string.sub(response.data, 0, len);
-    print("<< ",data)
-end
-
-
 -- This function does a connect and retrieves some info
 -- @return if successfull: an table containing card info
 -- @return if unsuccessfull : nil, error
@@ -95,18 +69,22 @@ local function read14443b(disconnect)
         flags = flags + ISO14B_COMMAND.ISO14B_DISCONNECT
     end
 
-    command = Command:new{cmd = cmds.CMD_ISO_14443B_COMMAND, arg1 = flags}
-    local result, err = sendToDevice(command, false)
+    command = Command:newMIX{
+            cmd = cmds.CMD_ISO_14443B_COMMAND,
+            arg1 = flags
+            }
+    
+    local result, err = command:sendMIX()
     if result then
         local count,cmd,arg0,arg1,arg2 = bin.unpack('LLLL',result)
         if arg0 == 0 then
             data = string.sub(result, count)
             info, err = parse1443b(data)
         else
-            err = "iso14443b card select failed"
+            err = 'iso14443b card select failed'
         end
     else
-        err = "No response from card"
+        err = 'No response from card'
     end
 
     if err then
@@ -115,43 +93,34 @@ local function read14443b(disconnect)
     end
     return info
 end
---PING / PONG - Custom Anticollison for Navigo.
--- AA / BB ?!?
--- local ping = ('BA00')
--- result, err = sendRaw(ping, 1, 1)
--- if result then
-    -- resp = Command.parse( result )
-    -- if arg1 == 0 then
-        -- return nil, "iso14443b card - PING/PONG failed"
-    -- end
-    -- showData(result)
--- else
-    -- err = "No response from card"
-    -- print(err)
-    -- return nil, err
--- end
-
 
 ---
 -- Waits for a mifare card to be placed within the vicinity of the reader.
 -- @return if successfull: an table containing card info
 -- @return if unsuccessfull : nil, error
 local function waitFor14443b()
-    print("Waiting for card... press any key to quit")
+    print('Waiting for card... press any key to quit')
     while not core.ukbhit() do
         res, err = read14443b(false)
         if res then return res end
         -- err means that there was no response from card
     end
-    return nil, "Aborted by user"
+    return nil, 'Aborted by user'
+end
+
+-- Sends an instruction to do nothing, only disconnect
+local function disconnect14443b()
+    local c = Command:newMIX{cmd = cmds.CMD_READER_ISO_14443b}
+    -- We can ignore the response here, no ACK is returned for this command
+    -- Check /armsrc/iso14443b.c, ReaderIso14443b() for details
+    return c.sendMIX(true)
 end
 
 local library = {
     read = read14443b,
     waitFor14443b = waitFor14443b,
     parse1443b  = parse1443b,
-    sendToDevice = sendToDevice,
-    showData = showData,
+    disconnect = disconnect14443b,
     ISO14B_COMMAND = ISO14B_COMMAND,
 }
 

From b52a4a53b085806e278b0f42518a756829841eb8 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 7 May 2019 22:33:51 +0200
Subject: [PATCH 1642/1938] textual

---
 client/lualibs/taglib.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/lualibs/taglib.lua b/client/lualibs/taglib.lua
index 0612ed2d3..8ba9272d1 100644
--- a/client/lualibs/taglib.lua
+++ b/client/lualibs/taglib.lua
@@ -115,10 +115,10 @@ return {
     lookupManufacturer = function (value)
         if type(value) == 'string' then
             local v = tonumber(value, 16)
-            print(string.format("WARNING: lookupManufacturer expects numeric value, converted %s into %x", value,v))
+            print(string.format('WARNING: lookupManufacturer expects numeric value, converted %s into %x', value,v))
             value = v
         end
 
-        return m[value] or "no tag-info available"
+        return m[value] or 'no tag-info available'
     end,
 }

From 6fbd45aaedb72ddaaf08801c29f4760e15725024 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 7 May 2019 22:46:00 +0200
Subject: [PATCH 1643/1938] 15 - use NG and refactoring

---
 client/lualibs/read14a.lua |  2 +-
 client/lualibs/read15.lua  | 88 ++++++++++++++++++--------------------
 2 files changed, 43 insertions(+), 47 deletions(-)

diff --git a/client/lualibs/read14a.lua b/client/lualibs/read14a.lua
index de4535c2f..6fe7f8bd1 100644
--- a/client/lualibs/read14a.lua
+++ b/client/lualibs/read14a.lua
@@ -96,7 +96,7 @@ local function read14443a(dont_disconnect, no_rats)
         command.arg1 = command.arg1 + ISO14A_COMMAND.ISO14A_NO_RATS
     end
 
-    local result,err = command:sendMIX()
+    local result, err = command:sendMIX()
     if result then
         local count,cmd,arg0,arg1,arg2 = bin.unpack('LLLL',result)
         if arg0 == 0 then
diff --git a/client/lualibs/read15.lua b/client/lualibs/read15.lua
index 5d231ad52..e045cccad 100644
--- a/client/lualibs/read15.lua
+++ b/client/lualibs/read15.lua
@@ -13,27 +13,15 @@
 -- Loads the commands-library
 local cmds = require('commands')
 local utils = require('utils')
-local TIMEOUT = 2000 -- Shouldn't take longer than 2 seconds
 
+ -- Shouldn't take longer than 2 seconds
+local TIMEOUT = 2000
 
---- Sends a USBpacket to the device
--- @param command - the usb packet to send
--- @param ignoreresponse - if set to true, we don't read the device answer packet
---      which is usually recipe for fail. If not sent, the host will wait 2s for a
---      response of type CMD_ACK
--- @return packet,nil if successfull
---         nil, errormessage if unsuccessfull
-local function sendToDevice(command, ignoreresponse)
-    local err = core.SendCommand(command:getBytes())
-    if err then
-        print(err)
-        return nil, err
-    end
-    if ignoreresponse then return nil, nil end
-
-    local response = core.WaitForResponseTimeout(cmds.CMD_ACK, TIMEOUT)
-    return response, nil
-end
+local ISO15_COMMAND = {
+    ISO15_REQ_SUBCARRIER_SINGLE = 0,
+    ISO15_REQ_DATARATE_HIGH = 2,
+    ISO15_REQ_NONINVENTORY = 0,
+}
 
 local function errorString15693(number)
     local errors = {}
@@ -50,7 +38,6 @@ local function errorString15693(number)
     return errors[number] or "Reserved for Future Use or Custom command error."
 end
 
-
 local function parse15693(data)
     local bytes = utils.ConvertAsciiToBytes(data)
     local tmp = utils.ConvertAsciiToHex(data)
@@ -59,14 +46,14 @@ local function parse15693(data)
     local crcStr = utils.Crc15(tmp, #tmp)
 
     if string.sub(crcStr, #crcStr - 3) ~= '470F' then
-        print("CRC", crc )
-        return nil, "CRC failed"
+        print('CRC', crc )
+        return nil, 'CRC failed'
     end
 
     if bytes[1] % 2 == 1 then
         -- Above is a poor-mans bit check:
         -- recv[0] & ISO15_RES_ERROR //(0x01)
-        local err = "Tag returned error %i: %s"
+        local err = 'Tag returned error %i: %s'
         err = string.format(err, bytes[1], errorString15693(bytes[1]))
         return nil, err
     end
@@ -82,7 +69,6 @@ end
 local function read15693(slow, dont_readresponse)
 
 --[[
-
     We start by trying this command:
     MANDATORY (present in ALL iso15693 tags) command (the example below is sent to a tag different from the above one):
 
@@ -108,11 +94,13 @@ local function read15693(slow, dont_readresponse)
 
     data = utils.Crc15("260100")
 
-    command = Command:new{cmd = cmds.CMD_ISO_15693_COMMAND,
-                                arg1 = #data / 2,
-                                arg2 = 1,
-                                arg3 = 1,
-                                data = data}
+    command = Command:newMIX{
+            cmd = cmds.CMD_ISO_15693_COMMAND,
+            arg1 = #data / 2,
+            arg2 = 1,
+            arg3 = 1,
+            data = data
+            }
 
     if slow then
         command.arg2 = 0
@@ -121,24 +109,23 @@ local function read15693(slow, dont_readresponse)
         command.arg3 = 0
     end
 
-    local result, err = sendToDevice(command, dont_readresponse)
-    if not result then
-        print(err)
-        return nil, "15693 identify: no answer"
-    end
-
-    local count, cmd, len, arg2, arg3 = bin.unpack('LLLL', result)
-    if  len > 0 then
+    local result, err = command:sendMIX()
+    if result then
+        local count, cmd, len, arg2, arg3 = bin.unpack('LLLL', result)
+        if len == 0 then
+            return nil, 'iso15693 card select failed'
+        end
         data = string.sub(result, count, count+len-1)
         info, err = parse15693(data)
-        if err then
-            print(err)
-            return nil, err
-        end
-        return info
     else
-        return nil, "Failed to get response"
+        err = 'No response from card'
     end
+    
+    if err then
+        print(err)
+        return nil, err
+    end
+    return info
 end
 
 ---
@@ -146,19 +133,28 @@ end
 -- @return if successfull: an table containing card info
 -- @return if unsuccessfull : nil, error
 local function waitFor15693()
-    print("Waiting for card... press any key to quit")
+    print('Waiting for card... press any key to quit')
     while not core.ukbhit() do
         res, err = read15693()
         if res then return res end
         -- err means that there was no response from card
     end
-    return nil, "Aborted by user"
+    return nil, 'Aborted by user'
 end
+
+-- Sends an instruction to do nothing, only disconnect
+local function disconnect15693()
+    local c = Command:newMIX{cmd = cmds.CMD_ISO_15693_COMMAND}
+    -- We can ignore the response here, no ACK is returned for this command
+    -- Check /armsrc/iso14443a.c, ReaderIso14443a() for details
+    return c.sendMIX(true)
+end
+
 local library = {
     read = read15693,
     waitFor15693 = waitFor15693,
     parse15693 = parse15693,
-    sendToDevice = sendToDevice,
+    disconnect = disconnect15693,
 }
 
 return library

From 9bf961cb8a9a9fd32f96252889c9794775a54ffd Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 7 May 2019 22:48:18 +0200
Subject: [PATCH 1644/1938] refactoring

---
 client/scripts/calypso.lua | 101 ++++++++++++++++++++-----------------
 client/scripts/cmdline.lua |   8 ++-
 2 files changed, 60 insertions(+), 49 deletions(-)

diff --git a/client/scripts/calypso.lua b/client/scripts/calypso.lua
index 74de3cb9a..6b0a95151 100644
--- a/client/scripts/calypso.lua
+++ b/client/scripts/calypso.lua
@@ -4,27 +4,22 @@ local lib14b = require('read14b')
 local utils = require('utils')
 local iso7816 = require('7816_error')
 
-example = "script runs 14b raw commands to query a CAPLYPSO tag"
-author = "Iceman, 2016"
-desc =
-[[
+copyright = ''
+author = 'Iceman'
+version = 'v1.0.1'
+desc = [[
 This is a script to communicate with a CALYSPO / 14443b tag using the '14b raw' commands
+]]
+example = [[
+    script run calypso -b 11223344
+
+]]
+usage = [[
+script run calypso -h -b
 
 Arguments:
-    -b              123
-Examples :
-    script run f -b 11223344
-    script run f
-
-Examples :
-
-# 1. Connect and don't disconnect
-script run f
-# 2. Send mf auth, read response
-script run f
-# 3. disconnect
-script run f
-
+      h   this helptext
+      b   raw bytes to send
 ]]
 
 --[[
@@ -61,23 +56,34 @@ end
 ---
 -- A debug printout-function
 local function dbg(args)
-    if DEBUG then
-        print("###", args)
+    if not DEBUG then return end
+    if type(args) == 'table' then
+        local i = 1
+        while args[i] do
+            dbg(args[i])
+            i = i+1
+        end
+    else
+        print('###', args)
     end
 end
 ---
 -- This is only meant to be used when errors occur
 local function oops(err)
-    print("ERROR: ", err)
+    print('ERROR: ', err)
     calypso_switch_off_field()
     return nil, err
 end
 ---
 -- Usage help
 local function help()
+    print(copyright)
+    print(author)
+    print(version)
     print(desc)
-    print("Example usage")
+    print('Example usage')
     print(example)
+    print(usage))
 end
 --
 -- helper function,  give current count of items in lua-table.
@@ -185,26 +191,26 @@ local _calypso_cmds = {
 --  Electronic Transaction log file
 
 
-    --["01.Select ICC file"]    = '0294 a4 00 0002 3f00',
-    ["01.Select ICC file"]    = '0294 a4 080004 3f00 0002',
-    ["02.ICC"]                = '0394 b2 01 041d',
-    ["03.Select EnvHol file"] = '0294 a4 080004 2000 2001',
-    ["04.EnvHol1"]            = '0394 b2 01 041d',
-    ["05.Select EvLog file"]  = '0294 a4 080004 2000 2010',
-    ["06.EvLog1"]             = '0394 b2 01 041d',
-    ["07.EvLog2"]             = '0294 b2 02 041d',
-    ["08.EvLog3"]             = '0394 b2 03 041d',
-    ["09.Select ConList file"]= '0294 a4 080004 2000 2050',
-    ["10.ConList"]            = '0394 b2 01 041d',
-    ["11.Select Contra file"] = '0294 a4 080004 2000 2020',
-    ["12.Contra1"]            = '0394 b2 01 041d',
-    ["13.Contra2"]            = '0294 b2 02 041d',
-    ["14.Contra3"]            = '0394 b2 03 041d',
-    ["15.Contra4"]            = '0294 b2 04 041d',
-    ["16.Select Counter file"]= '0394 a4 080004 2000 2069',
-    ["17.Counter"]            = '0294 b2 01 041d',
-    ["18.Select SpecEv file"] = '0394 a4 080004 2000 2040',
-    ["19.SpecEv1"]            = '0294 b2 01 041d',
+    --['01.Select ICC file']    = '0294 a4 00 0002 3f00',
+    ['01.Select ICC file']    = '0294 a4 080004 3f00 0002',
+    ['02.ICC']                = '0394 b2 01 041d',
+    ['03.Select EnvHol file'] = '0294 a4 080004 2000 2001',
+    ['04.EnvHol1']            = '0394 b2 01 041d',
+    ['05.Select EvLog file']  = '0294 a4 080004 2000 2010',
+    ['06.EvLog1']             = '0394 b2 01 041d',
+    ['07.EvLog2']             = '0294 b2 02 041d',
+    ['08.EvLog3']             = '0394 b2 03 041d',
+    ['09.Select ConList file']= '0294 a4 080004 2000 2050',
+    ['10.ConList']            = '0394 b2 01 041d',
+    ['11.Select Contra file'] = '0294 a4 080004 2000 2020',
+    ['12.Contra1']            = '0394 b2 01 041d',
+    ['13.Contra2']            = '0294 b2 02 041d',
+    ['14.Contra3']            = '0394 b2 03 041d',
+    ['15.Contra4']            = '0294 b2 04 041d',
+    ['16.Select Counter file']= '0394 a4 080004 2000 2069',
+    ['17.Counter']            = '0294 b2 01 041d',
+    ['18.Select SpecEv file'] = '0394 a4 080004 2000 2040',
+    ['19.SpecEv1']            = '0294 b2 01 041d',
 }
 
 ---
@@ -218,7 +224,8 @@ function main(args)
     local data, apdu, flags, uid, cid, result, err, card
     -- Read the parameters
     for o, a in getopt.getopt(args, 'h') do
-        if o == "h" then return help() end
+        if o == 'h' then return help() end
+        if o == 'b' then bytes = a end
     end
 
     calypso_switch_on_field()
@@ -248,7 +255,7 @@ function main(args)
         --result, err = calypso_send_cmd_raw('0294a40800043f000002',false)  --select ICC file
         for i, apdu in spairs(_calypso_cmds) do
             print('>>', i )
-            apdu = apdu:gsub("%s+","")
+            apdu = apdu:gsub('%s+', '')
             result, err = calypso_send_cmd_raw(apdu , false)
             if result then
                 calypso_apdu_status(result.data)
@@ -263,12 +270,12 @@ end
 -- a simple selftest function, tries to convert
 function selftest()
     DEBUG = true
-    dbg("Performing test")
-    dbg("Tests done")
+    dbg('Performing test')
+    dbg('Tests done')
 end
 -- Flip the switch here to perform a sanity check.
 -- It read a nonce in two different ways, as specified in the usage-section
-if "--test"==args then
+if '--test'==args then
     selftest()
 else
     -- Call the main
diff --git a/client/scripts/cmdline.lua b/client/scripts/cmdline.lua
index 29627afc7..dc1e752c1 100644
--- a/client/scripts/cmdline.lua
+++ b/client/scripts/cmdline.lua
@@ -1,12 +1,16 @@
+--[[
+A sampe script file on how to implement at cmd line inteface.
+--]]
+
 print("This is how a cmd-line interface could be implemented\nPrint 'exit' to exit.\n")
 local answer
 repeat
     io.write("$>")
     io.flush()
-    answer=io.read()
+    answer = io.read()
     if answer ~= 'exit' then
         local func = assert(loadstring("return " .. answer))
         io.write("\n"..tostring(func() or "").."\n");
     end--]]
-until answer=="exit"
+until answer == "exit"
 print("Bye\n");

From 3c533db308d46d462a3f8687d66cb69b785be02e Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 7 May 2019 22:59:29 +0200
Subject: [PATCH 1645/1938] refactoring NG

---
 client/lualibs/read14b.lua | 10 +++++++++-
 client/scripts/calypso.lua | 39 +++++++++++---------------------------
 2 files changed, 20 insertions(+), 29 deletions(-)

diff --git a/client/lualibs/read14b.lua b/client/lualibs/read14b.lua
index 52b2903bd..8d28408f1 100644
--- a/client/lualibs/read14b.lua
+++ b/client/lualibs/read14b.lua
@@ -108,9 +108,16 @@ local function waitFor14443b()
     return nil, 'Aborted by user'
 end
 
+---
+-- turns on the HF field.
+local function connect14443b()
+    local c = Command:newMIX{cmd = cmds.CMD_ISO_14443B_COMMAND, arg1 = ISO14B_COMMAND.ISO14B_CONNECT}
+    return c.sendMIX(true)
+end
+---
 -- Sends an instruction to do nothing, only disconnect
 local function disconnect14443b()
-    local c = Command:newMIX{cmd = cmds.CMD_READER_ISO_14443b}
+    local c = Command:newMIX{cmd = cmds.CMD_ISO_14443B_COMMAND, arg1 = ISO14B_COMMAND.ISO14B_DISCONNECT}
     -- We can ignore the response here, no ACK is returned for this command
     -- Check /armsrc/iso14443b.c, ReaderIso14443b() for details
     return c.sendMIX(true)
@@ -120,6 +127,7 @@ local library = {
     read = read14443b,
     waitFor14443b = waitFor14443b,
     parse1443b  = parse1443b,
+    connect = connect14443b,
     disconnect = disconnect14443b,
     ISO14B_COMMAND = ISO14B_COMMAND,
 }
diff --git a/client/scripts/calypso.lua b/client/scripts/calypso.lua
index 6b0a95151..a5e35b82a 100644
--- a/client/scripts/calypso.lua
+++ b/client/scripts/calypso.lua
@@ -28,21 +28,6 @@ Check there for details about data format and how commands are interpreted on th
 device-side.
 ]]
 
----
---
-local function calypso_switch_on_field()
-    local flags = lib14b.ISO14B_COMMAND.ISO14B_CONNECT
-    local c = Command:new{cmd = cmds.CMD_ISO_14443B_COMMAND, arg1 = flags}
-    return lib14b.sendToDevice(c, true)
-end
----
--- Disconnect (poweroff) the antenna forcing a disconnect of a 14b tag.
-local function calypso_switch_off_field()
-    local flags = lib14b.ISO14B_COMMAND.ISO14B_DISCONNECT
-    local c = Command:new{cmd = cmds.CMD_ISO_14443B_COMMAND, arg1 = flags}
-    return lib14b.sendToDevice(c, true)
-end
-
 local function calypso_parse(result)
     local r = Command.parse(result)
     local len = r.arg2 * 2
@@ -71,7 +56,7 @@ end
 -- This is only meant to be used when errors occur
 local function oops(err)
     print('ERROR: ', err)
-    calypso_switch_off_field()
+    lib14b.disconnect()
     return nil, err
 end
 ---
@@ -128,15 +113,13 @@ local function calypso_send_cmd_raw(data, ignoreresponse )
 
     data = data or "00"
 
-    command = Command:new{cmd = cmds.CMD_ISO_14443B_COMMAND,
-                            arg1 = flags,
-                            arg2 = #data/2, -- LEN of data, half the length of the ASCII-string hex string
-                            arg3 = 0,
-                            data = data}    -- data bytes (commands etc)
-    result, err = lib14b.sendToDevice(command, false)
-
-    if ignoreresponse then return response, err end
-
+    command = Command:newMIX{
+            cmd = cmds.CMD_ISO_14443B_COMMAND,
+            arg1 = flags,
+            arg2 = #data/2, -- LEN of data, half the length of the ASCII-string hex string
+            data = data}    -- data bytes (commands etc)
+            
+    result, err = command:sendMIX(ignoreresponse)
     if result then
         local r = calypso_parse(result)
         return r, nil
@@ -228,8 +211,8 @@ function main(args)
         if o == 'b' then bytes = a end
     end
 
-    calypso_switch_on_field()
-
+    lib14b.connect()
+    
     -- Select 14b tag.
     card, err = lib14b.waitFor14443b()
     if not card then return oops(err) end
@@ -264,7 +247,7 @@ function main(args)
                 print('<< no answer')
             end
         end
-    calypso_switch_off_field()
+    lib14b.disconnect()
 end
 ---
 -- a simple selftest function, tries to convert

From 6b472f6c56878881d2017dc090499c40ffe03200 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 7 May 2019 23:04:29 +0200
Subject: [PATCH 1646/1938] textual

---
 client/scripts/formatMifare.lua | 90 ++++++++++++++++-----------------
 1 file changed, 45 insertions(+), 45 deletions(-)

diff --git a/client/scripts/formatMifare.lua b/client/scripts/formatMifare.lua
index f53a05eff..e200d92cb 100644
--- a/client/scripts/formatMifare.lua
+++ b/client/scripts/formatMifare.lua
@@ -4,6 +4,19 @@ local bin = require('bin')
 local lib14a = require('read14a')
 local utils = require('utils')
 
+copyright = ''
+author = 'Iceman'
+version = 'v1.0.1'
+desc = [[
+This script will generate 'hf mf wrbl' commands for each block to format a Mifare card.
+
+Alla datablocks gets 0x00
+As default the script sets the keys A/B to 0xFFFFFFFFFFFF
+and the access bytes will become 0x78,0x77,0x88
+The GDB will become 0x00
+
+The script will skip the manufactoring block 0.
+]]
 example = [[
     -- generate commands
     1. script run formatMifare
@@ -14,22 +27,8 @@ example = [[
     -- generate commands and execute them against card.
     3. script run formatMifare -x
 ]]
-copyright = ''
-version = ''
-author = 'Iceman'
 usage = [[
-   script run formatMifare -k <key> -n <key> -a <access> -x
-]]
-desc = [[
-This script will generate 'hf mf wrbl' commands for each block to format a Mifare card.
-
-Alla datablocks gets 0x00
-As default the script sets the keys A/B to 0xFFFFFFFFFFFF
-and the access bytes will become 0x78,0x77,0x88
-The GDB will become 0x00
-
-The script will skip the manufactoring block 0.
-
+script run formatMifare -k <key> -n <key> -a <access> -x
 
 Arguments:
     -h             - this help
@@ -38,6 +37,7 @@ Arguments:
     -a <access>    - the new access bytes that will be written to the card
     -x             - execute the commands aswell.
 ]]
+
 local TIMEOUT = 2000 -- Shouldn't take longer than 2 seconds
 local DEBUG = true -- the debug flag
 local CmdString = 'hf mf wrbl %d B %s %s'
@@ -45,39 +45,39 @@ local numBlocks = 64
 local numSectors = 16
 ---
 -- A debug printout-function
-function dbg(args)
-    if not DEBUG then
-        return
-    end
-
-    if type(args) == "table" then
+local function dbg(args)
+    if not DEBUG then return end
+    if type(args) == 'table' then
         local i = 1
-        while result[i] do
-            dbg(result[i])
+        while args[i] do
+            dbg(args[i])
             i = i+1
         end
     else
-        print("###", args)
+        print('###', args)
     end
 end
 ---
 -- This is only meant to be used when errors occur
-function oops(err)
-    print("ERROR: ",err)
+local function oops(err)
+    print('ERROR:', err)
+    core.clearCommandBuffer()
+    return nil, err
 end
 ---
 -- Usage help
-function help()
+local function help()
     print(copyright)
     print(author)
     print(version)
     print(desc)
-    print("Example usage")
+    print('Example usage')
     print(example)
+    print(usage)
 end
 --
 -- Exit message
-function ExitMsg(msg)
+local function ExitMsg(msg)
     print( string.rep('--',20) )
     print( string.rep('--',20) )
     print(msg)
@@ -91,7 +91,7 @@ function GetCardInfo()
         print(err)
         return
     end
-    print(("Found:  %s"):format(result.name))
+    print(('Found:  %s'):format(result.name))
 
     core.clearCommandBuffer()
 
@@ -138,11 +138,11 @@ local function main(args)
 
     -- Arguments for the script
     for o, a in getopt.getopt(args, 'hk:n:a:x') do
-        if o == "h" then return help() end
-        if o == "k" then OldKey = a end
-        if o == "n" then NewKey = a end
-        if o == "a" then Accessbytes = a end
-        if o == "x" then x = true end
+        if o == 'h' then return help() end
+        if o == 'k' then OldKey = a end
+        if o == 'n' then NewKey = a end
+        if o == 'a' then Accessbytes = a end
+        if o == 'x' then x = true end
     end
 
     -- validate input args.
@@ -169,29 +169,29 @@ local function main(args)
     print( string.format('Old key:    %s', OldKey))
     print( string.format('New key:    %s', NewKey))
     print( string.format('New Access: %s', Accessbytes))
-    print( string.rep('--',20) )
+    print( string.rep('--', 20) )
 
-        -- Set new block data
-    local EMPTY_BL = string.rep('00',16)
-    local EMPTY_SECTORTRAIL = string.format('%s%s%s%s',NewKey,Accessbytes,'00',NewKey)
+    -- Set new block data
+    local EMPTY_BL = string.rep('00', 16)
+    local EMPTY_SECTORTRAIL = string.format('%s%s%s%s', NewKey, Accessbytes, '00', NewKey)
 
-    dbg( string.format('New sector-trailer : %s',EMPTY_SECTORTRAIL))
-    dbg( string.format('New emptyblock: %s',EMPTY_BL))
+    dbg( string.format('New sector-trailer : %s', EMPTY_SECTORTRAIL))
+    dbg( string.format('New emptyblock: %s', EMPTY_BL))
     dbg('')
 
     if x then
         print('[Warning] you have used the EXECUTE parameter, which means this will run these commands against card.')
     end
     -- Ask
-    local dialogResult = utils.confirm("Do you want to erase this card")
+    local dialogResult = utils.confirm('Do you want to erase this card')
     if dialogResult == false then
         return ExitMsg('Quiting it is then. Your wish is my command...')
     end
 
-    print( string.rep('--',20) )
+    print( string.rep('--', 20) )
 
     -- main loop
-    for block=0,numBlocks,1 do
+    for block = 0, numBlocks, 1 do
 
         local reminder = (block+1) % 4
         local cmd
@@ -207,7 +207,7 @@ local function main(args)
         end
 
         if core.ukbhit() then
-            print("aborted by user")
+            print('aborted by user')
             break
         end
     end

From e799717880482a1a5c62709c5473c2b3e13dfd95 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 7 May 2019 23:12:58 +0200
Subject: [PATCH 1647/1938] refactored NG

---
 client/scripts/14araw.lua | 120 +++++++++++++++++++++-----------------
 1 file changed, 66 insertions(+), 54 deletions(-)

diff --git a/client/scripts/14araw.lua b/client/scripts/14araw.lua
index e0448d9db..776ff754e 100644
--- a/client/scripts/14araw.lua
+++ b/client/scripts/14araw.lua
@@ -2,11 +2,27 @@ local cmds = require('commands')
 local getopt = require('getopt')
 local lib14a = require('read14a')
 
-example = "script run 14araw -x 6000F57b"
+copyright = ''
 author = "Martin Holst Swende"
-desc =
-[[
+version = 'v1.0.1'
+desc = [[
 This is a script to allow raw 1444a commands to be sent and received.
+]]
+example = [[
+    # 1. Connect and don't disconnect
+    script run 14araw -p
+    
+    # 2. Send mf auth, read response (nonce)
+    script run 14araw -o -x 6000F57b -p
+    
+    # 3. disconnect
+    script run 14araw -o
+
+    # All three steps in one go:
+    script run 14araw -x 6000F57b
+]]
+usage = [[ 
+script run 14araw -x 6000F57b
 
 Arguments:
     -o              do not connect - use this only if you previously used -p to stay connected
@@ -17,18 +33,6 @@ Arguments:
     -d              Debug flag
     -t              Topaz mode
     -3              ISO14443-4 (use RATS)
-
-Examples :
-
-# 1. Connect and don't disconnect
-script run 14araw -p
-# 2. Send mf auth, read response (nonce)
-script run 14araw -o -x 6000F57b -p
-# 3. disconnect
-script run 14araw -o
-
-# All three steps in one go:
-script run 14araw -x 6000F57b
 ]]
 
 --[[
@@ -41,7 +45,6 @@ device-side.
 ]]
 
 -- Some globals
-local TIMEOUT = 2000 -- Shouldn't take longer than 2 seconds
 local DEBUG = false -- the debug flag
 
 -------------------------------
@@ -51,21 +54,34 @@ local DEBUG = false -- the debug flag
 ---
 -- A debug printout-function
 local function dbg(args)
-    if DEBUG then
-        print("###", args)
+    if not DEBUG then return end
+    if type(args) == 'table' then
+        local i = 1
+        while args[i] do
+            dbg(args[i])
+            i = i+1
+        end
+    else
+        print('###', args)
     end
 end
 ---
 -- This is only meant to be used when errors occur
 local function oops(err)
-    print("ERROR: ",err)
+    print('ERROR:', err)
+    core.clearCommandBuffer()
+    return nil, err
 end
 ---
 -- Usage help
 local function help()
+    print(copyright)
+    print(author)
+    print(version)
     print(desc)
-    print("Example usage")
+    print('Example usage')
     print(example)
+    print(usage)
 end
 ---
 -- The main entry point
@@ -83,31 +99,35 @@ function main(args)
 
     -- Read the parameters
     for o, a in getopt.getopt(args, 'orcpx:dt3') do
-        if o == "o" then doconnect = false end
-        if o == "r" then ignore_response = true end
-        if o == "c" then append_crc = true end
-        if o == "p" then stayconnected = true end
-        if o == "x" then payload = a end
-        if o == "d" then DEBUG = true end
-        if o == "t" then topaz_mode = true end
-        if o == "3" then no_rats = true end
+        if o == 'o' then doconnect = false end
+        if o == 'r' then ignore_response = true end
+        if o == 'c' then append_crc = true end
+        if o == 'p' then stayconnected = true end
+        if o == 'x' then payload = a end
+        if o == 'd' then DEBUG = true end
+        if o == 't' then topaz_mode = true end
+        if o == '3' then no_rats = true end
     end
 
     -- First of all, connect
     if doconnect then
         dbg("doconnect")
-        -- We reuse the connect functionality from a
-        -- common library
-        info, err = lib14a.read(true, no_rats)
 
-        if err then return oops(err) end
-        print(("Connected to card, uid = %s"):format(info.uid))
+        info, err = lib14a.read(true, no_rats)
+        if err then
+            lib14a.disconnect()
+            return oops(err)
+        end
+        print(('Connected to card, uid = %s'):format(info.uid))
     end
 
     -- The actual raw payload, if any
     if payload then
-        res,err = sendRaw(payload,{ignore_response = ignore_response, topaz_mode = topaz_mode, append_crc = append_crc})
-        if err then return oops(err) end
+        res, err = sendRaw(payload,{ignore_response = ignore_response, topaz_mode = topaz_mode, append_crc = append_crc})
+        if err then 
+            lib14a.disconnect()
+            return oops(err)
+        end
 
         if not ignoreresponse then
             -- Display the returned data
@@ -116,7 +136,7 @@ function main(args)
     end
     -- And, perhaps disconnect?
     if not stayconnected then
-        disconnect()
+        lib14a.disconnect()
     end
 end
 
@@ -132,11 +152,10 @@ function showdata(usbpacket)
     --print("data length:",len)
     local data = string.sub(tostring(cmd_response.data), 0, len);
     print("<< ",data)
-    --print("----------------")
 end
 
 function sendRaw(rawdata, options)
-    print(">> ", rawdata)
+    print('>> ', rawdata)
 
     local flags = lib14a.ISO14A_COMMAND.ISO14A_NO_DISCONNECT + lib14a.ISO14A_COMMAND.ISO14A_RAW
 
@@ -147,39 +166,32 @@ function sendRaw(rawdata, options)
         flags = flags + lib14a.ISO14A_COMMAND.ISO14A_APPEND_CRC
     end
 
-    local command = Command:new{cmd = cmds.CMD_READER_ISO_14443a,
+    local command = Command:newMIX{cmd = cmds.CMD_READER_ISO_14443a,
                                 arg1 = flags, -- Send raw
                                 -- arg2 contains the length, which is half the length
                                 -- of the ASCII-string rawdata
                                 arg2 = string.len(rawdata)/2,
                                 data = rawdata}
-    return lib14a.sendToDevice(command, options.ignore_response)
+    return  command:sendMIX(options.ignore_response)
 end
 
--- Sends an instruction to do nothing, only disconnect
-function disconnect()
-    local command = Command:new{cmd = cmds.CMD_READER_ISO_14443a, arg1 = 0,}
-    -- We can ignore the response here, no ACK is returned for this command
-    -- Check /armsrc/iso14443a.c, ReaderIso14443a() for details
-    return lib14a.sendToDevice(command,true)
-end
 
 -------------------------
 -- Testing
 -------------------------
 function selftest()
     DEBUG = true
-    dbg("Performing test")
+    dbg('Performing test')
     main()
-    main("-p")
-    main(" -o -x 6000F57b -p")
-    main("-o")
-    main("-x 6000F57b")
-    dbg("Tests done")
+    main('-p')
+    main(' -o -x 6000F57b -p')
+    main('-o')
+    main('-x 6000F57b')
+    dbg('Tests done')
 end
 -- Flip the switch here to perform a sanity check.
 -- It read a nonce in two different ways, as specified in the usage-section
-if "--test"==args then
+if '--test'==args then
     selftest()
 else
     -- Call the main

From 7ccff2db4adfc0bbf39d5f513d4403695681d818 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 7 May 2019 23:19:22 +0200
Subject: [PATCH 1648/1938] textual

---
 client/scripts/emul2dump.lua | 49 +++++++++++++++++++----------
 client/scripts/emul2html.lua | 61 ++++++++++++++++++++++--------------
 2 files changed, 71 insertions(+), 39 deletions(-)

diff --git a/client/scripts/emul2dump.lua b/client/scripts/emul2dump.lua
index 0cbc3a4c2..2ce229e7f 100644
--- a/client/scripts/emul2dump.lua
+++ b/client/scripts/emul2dump.lua
@@ -2,37 +2,54 @@ local getopt = require('getopt')
 local bin = require('bin')
 local dumplib = require('html_dumplib')
 
+copyright = ''
+author = 'Iceman'
+version = 'v1.0.1'
+desc =[[
+This script takes an dumpfile on EML (ASCII) format and converts it to the PM3 dumpbin file to be used with `hf mf restore`
+]]
 example =[[
     1. script run emul2dump
     2. script run emul2dump -i myfile.eml
     3. script run emul2dump -i myfile.eml -o myfile.bin
 ]]
-author = "Iceman"
-usage = "script run emul2dump [-i <file>] [-o <file>]"
-desc =[[
-This script takes an dumpfile on EML (ASCII) format and converts it to the PM3 dumpbin file to be used with "hf mf restore"
+usage = [[
+script run emul2dump [-i <file>] [-o <file>]
 
 Arguments:
     -h              This help
     -i <filename>   Specifies the dump-file (input). If omitted, 'dumpdata.eml' is used
     -o <filename>   Specifies the output file. If omitted, <currdate>.bin is used.
-]]
 
+]]
 ---
 -- This is only meant to be used when errors occur
-function oops(err)
-    print("ERROR: ",err)
+local function oops(err)
+    if not DEBUG then return end
+    if type(args) == 'table' then
+        local i = 1
+        while args[i] do
+            dbg(args[i])
+            i = i+1
+        end
+    else
+        print('###', args)
+    end
 end
 ---
 -- Usage help
-function help()
+local function help()
+    print(copyright)
+    print(author)
+    print(version)
     print(desc)
-    print("Example usage")
+    print('Example usage')
     print(example)
+    print(usage)
 end
 --
 -- Exit message
-function ExitMsg(msg)
+local function ExitMsg(msg)
     print( string.rep('--',20) )
     print( string.rep('--',20) )
     print(msg)
@@ -41,20 +58,20 @@ end
 
 local function main(args)
 
-    local input = "dumpdata.eml"
-    local output  = os.date("%Y-%m-%d_%H%M%S.bin");
+    local input = 'dumpdata.eml'
+    local output  = os.date('%Y-%m-%d_%H%M%S.bin');
 
     -- Arguments for the script
     for o, a in getopt.getopt(args, 'hi:o:') do
-        if o == "h" then return help() end
-        if o == "i" then input = a end
-        if o == "o" then output = a end
+        if o == 'h' then return help() end
+        if o == 'i' then input = a end
+        if o == 'o' then output = a end
     end
 
     local filename, err = dumplib.convert_eml_to_bin(input,output)
     if err then return oops(err) end
 
-    ExitMsg(("Wrote a BIN dump to the file %s"):format(filename))
+    ExitMsg(('Wrote a BIN dump to the file %s'):format(filename))
 end
 
 main(args)
diff --git a/client/scripts/emul2html.lua b/client/scripts/emul2html.lua
index 36230f8af..879250077 100644
--- a/client/scripts/emul2html.lua
+++ b/client/scripts/emul2html.lua
@@ -4,12 +4,18 @@ getopt = require('getopt')
 bin = require('bin')
 dumplib = require('html_dumplib')
 
-example = "script run emul2html -o dumpdata.eml "
-author = "Martin Holst Swende"
-usage = "script run htmldump [-i <file>] [-o <file>]"
-desc =[[
+copyright = ''
+author = 'Martin Holst Swende'
+version = 'v1.0.1'
+desc = [[
 This script takes a dumpfile on EML (ASCII) format and produces a html based dump, which is a
 bit more easily analyzed.
+]]
+example = [[
+    script run emul2html -o dumpdata.eml
+]]
+usage = [[
+script run htmldump [-i <file>] [-o <file>]
 
 Arguments:
     -h              This help
@@ -18,45 +24,54 @@ Arguments:
 
 ]]
 
--------------------------------
--- Some utilities
--------------------------------
-
+-- Some globals
+local DEBUG = false -- the debug flag
 ---
 -- A debug printout-function
-function dbg(args)
-    if DEBUG then
-        print("###", args)
+local function dbg(args)
+    if not DEBUG then return end
+    if type(args) == 'table' then
+        local i = 1
+        while args[i] do
+            dbg(args[i])
+            i = i+1
+        end
+    else
+        print('###', args)
     end
 end
 ---
 -- This is only meant to be used when errors occur
-function oops(err)
-    print("ERROR: ",err)
+local function oops(err)
+    print('ERROR:', err)
+    core.clearCommandBuffer()
+    return nil, err
 end
-
-
 ---
 -- Usage help
-function help()
+local function help()
+    print(copyright)
+    print(author)
+    print(version)
     print(desc)
-    print("Example usage")
+    print('Example usage')
     print(example)
+    print(usage)
 end
 
 local function main(args)
 
-    local input = "dumpdata.eml"
-    local output = os.date("%Y-%m-%d_%H%M%S.html");
+    local input = 'dumpdata.eml'
+    local output = os.date('%Y-%m-%d_%H%M%S.html');
     for o, a in getopt.getopt(args, 'i:o:h') do
-        if o == "h" then return help() end
-        if o == "i" then input = a end
-        if o == "o" then output = a end
+        if o == 'h' then return help() end
+        if o == 'i' then input = a end
+        if o == 'o' then output = a end
     end
     local filename, err = dumplib.convert_eml_to_html(input,output)
     if err then return oops(err) end
 
-    print(("Wrote a HTML dump to the file %s"):format(filename))
+    print(('Wrote a HTML dump to the file %s'):format(filename))
 end
 
 --[[

From e1bb05b35eb4d83c0ec4e554d6313d58bfacdbfa Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 7 May 2019 23:21:56 +0200
Subject: [PATCH 1649/1938] refactor

---
 client/scripts/ufodump.lua | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/client/scripts/ufodump.lua b/client/scripts/ufodump.lua
index 655d6e7ed..12f7cb9b2 100644
--- a/client/scripts/ufodump.lua
+++ b/client/scripts/ufodump.lua
@@ -6,8 +6,7 @@ local utils = require('utils')
 copyright = ''
 author = 'Iceman'
 version = 'v1.0.1'
-desc =
-[[
+desc = [[
 This is a script that reads AZTEK iso14443a tags.
 It starts from block 0,  and ends at default block 20.  Use 'b' to say different endblock.
 xor:  the first three block (0,1,2) is not XORED.  The rest seems to be xored.
@@ -106,14 +105,6 @@ function sendRaw(rawdata, options)
 
     return command:sendMIX(options.ignore_response)
 end
---
--- Sends an instruction to do nothing, only disconnect
-function disconnect()
-    local command = Command:newMIX{cmd = cmds.CMD_READER_ISO_14443a, arg1 = 0,}
-    -- We can ignore the response here, no ACK is returned for this command
-    -- Check /armsrc/iso14443a.c, ReaderIso14443a() for details
-    return command:sendMIX(true)
-end
 ---
 -- The main entry point
 function main(args)
@@ -130,7 +121,10 @@ function main(args)
 
     -- First of all, connect
     info, err = lib14a.read(true, true)
-    if err then disconnect() return oops(err) end
+    if err then 
+        lib14a.disconnect()
+        return oops(err)
+    end
     core.clearCommandBuffer()
 
     local blockData = {}
@@ -143,7 +137,10 @@ function main(args)
     for block = 00, endblock do
         local cmd = string.format('10%02x00', block)
         res, err = sendRaw(cmd , {ignore_response = ignore_response})
-        if err then disconnect() return oops(err) end
+        if err then 
+            lib14a.disconnect()
+            return oops(err)
+        end
 
         local cmd_response = Command.parse(res)
         local len = tonumber(cmd_response.arg1) * 2
@@ -153,7 +150,7 @@ function main(args)
         table.insert(blockData, data)
     end
     print("----+------------------+-------------------")
-    disconnect()
+    lib14a.disconnect()
 
     local filename, err = utils.WriteDumpFile(info.uid, blockData)
     if err then return oops(err) end

From a59f2a1b60b30983ae646ddd018576ea26bde35b Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 7 May 2019 23:27:16 +0200
Subject: [PATCH 1650/1938] refactor NG

---
 client/scripts/amiibo.lua | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/client/scripts/amiibo.lua b/client/scripts/amiibo.lua
index 2bcd2a07e..3d8e026dd 100644
--- a/client/scripts/amiibo.lua
+++ b/client/scripts/amiibo.lua
@@ -15,9 +15,13 @@ local luamiibo = luamiibo_open()
 
 local function nfc_read_amiibo ()
 
-   local command = Command:new{cmd = cmds.CMD_MIFAREU_READCARD, arg1 = 0, arg2 = 135}
+   local command = Command:newMIX{
+                cmd = cmds.CMD_MIFAREU_READCARD,
+                arg1 = 0,
+                arg2 = 135
+                }
 
-   local result, err = reader.sendToDevice(command)
+   local result, err = command.sendMIX()
    if result then
       -- Do Mifare Ultralight read
       local count, cmd, arg0, data_len, offset = bin.unpack('LLLL', result)
@@ -85,8 +89,13 @@ local function emulate_amiibo (amiibo_data)
    print(string.format('Simulating with UID: 0x%04x 0x%04x', uid_first, uid_second))
 
    -- Begin simulating NTAG215
-   local simCmd = Command:new{cmd = cmds.CMD_SIMULATE_TAG_ISO_14443a, arg1 = 7, arg2 = uid_first, arg3 = uid_second}
-   local _, err = reader.sendToDevice(simCmd)
+   local simCmd = Command:newMIX{
+                cmd = cmds.CMD_SIMULATE_TAG_ISO_14443a,
+                arg1 = 7,
+                arg2 = uid_first,
+                arg3 = uid_second
+                }
+   local _, err = simCmd.sendMIX()
    if err then
       print('Failed to start simulator', err)
       return

From 89e25a4d1dd02de76c7eb82ec6507ac7790c2416 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 7 May 2019 23:34:05 +0200
Subject: [PATCH 1651/1938] textual

---
 client/scripts/dumptoemul-mfu.lua | 56 +++++++++++++++-----------
 client/scripts/dumptoemul.lua     | 66 ++++++++++++++++++-------------
 2 files changed, 70 insertions(+), 52 deletions(-)

diff --git a/client/scripts/dumptoemul-mfu.lua b/client/scripts/dumptoemul-mfu.lua
index fb14077d5..672f05e8f 100644
--- a/client/scripts/dumptoemul-mfu.lua
+++ b/client/scripts/dumptoemul-mfu.lua
@@ -4,13 +4,17 @@ getopt = require('getopt')
 bin = require('bin')
 
 copyright = ''
-version = ''
-example = "script run dumptoemul-mfu -i dumpdata-foobar.bin"
 author = "Martin Holst Swende \n @Marshmellow \n @iceman"
-usage = "script run dumptoemul-mfu [-i <file>] [-o <file>]"
+version = 'v1.0.1'
 desc =[[
 This script takes a dumpfile from 'hf mfu dump' and converts it to a format that can be used
 by the emulator
+]]
+example = [[
+    script run dumptoemul-mfu -i dumpdata-foobar.bin
+]]
+usage = [[
+script run dumptoemul-mfu [-i <file>] [-o <file>]
 
 Arguments:
     -h              This help
@@ -18,13 +22,13 @@ Arguments:
     -o <filename>   Specifies the output file. If omitted, <uid>.eml is used.
 
 ]]
+
 local DEBUG = false
 
 ---
 -- A debug printout-function
 local function dbg(args)
     if not DEBUG then return end
-
     if type(args) == 'table' then
         local i = 1
         while result[i] do
@@ -38,16 +42,20 @@ end
 ---
 -- This is only meant to be used when errors occur
 local function oops(err)
-    print('ERROR: ',err)
-    return nil,err
+    print('ERROR:', err)
+    core.clearCommandBuffer()
+    return nil, err
 end
 ---
 -- Usage help
-function help()
-    print(desc)
+local function help()
+    print(copyright)
     print(author)
-    print("Example usage")
+    print(version)
+    print(desc)
+    print('Example usage')
     print(example)
+    print(usage)
 end
 
 local function convert_to_ascii(hexdata)
@@ -64,38 +72,38 @@ local function convert_to_ascii(hexdata)
 end
 
 local function readdump(infile)
-     t = infile:read("*all")
+     t = infile:read('*all')
      len = string.len(t)
-     local len,hex = bin.unpack(("H%d"):format(len),t)
+     local len,hex = bin.unpack(('H%d'):format(len),t)
      return hex
 end
 
 local function convert_to_emulform(hexdata)
     if string.len(hexdata) % 8 ~= 0 then
-        return oops(("Bad data, length should be a multiple of 8 (was %d)"):format(string.len(hexdata)))
+        return oops(('Bad data, length should be a multiple of 8 (was %d)'):format(string.len(hexdata)))
     end
-    local ascii,i = "";
+    local ascii,i = '';
     for i = 1, string.len(hexdata), 8 do
-        ascii = ascii..string.sub(hexdata, i, i+7).."\n"
+        ascii = ascii..string.sub(hexdata, i, i+7)..'\n'
     end
     return string.sub(ascii, 1, -2)
 end
 
 local function main(args)
 
-    local input = "dumpdata.bin"
+    local input = 'dumpdata.bin'
     local output
 
     for o, a in getopt.getopt(args, 'i:o:h') do
-        if o == "h" then return help() end
-        if o == "i" then input = a end
-        if o == "o" then output = a end
+        if o == 'h' then return help() end
+        if o == 'i' then input = a end
+        if o == 'o' then output = a end
     end
     -- Validate the parameters
 
-    local infile = io.open(input, "rb")
+    local infile = io.open(input, 'rb')
     if infile == nil then
-        return oops("Could not read file ", input)
+        return oops('Could not read file ', input)
     end
     local dumpdata = readdump(infile)
     -- The hex-data is now in ascii-format,
@@ -109,19 +117,19 @@ local function main(args)
     -- 119,120 bcc0
     -- 121---  UID last four bytes
     local uid = string.sub(dumpdata, 113, 113+5)..string.sub(dumpdata, 113+8, 113+8+7)
-    output = output or (uid .. ".eml")
+    output = output or (uid .. '.eml')
 
     -- Format some linebreaks
     dumpdata = convert_to_emulform(dumpdata)
 
-    local outfile = io.open(output, "w")
+    local outfile = io.open(output, 'w')
     if outfile == nil then
-        return oops("Could not write to file ", output)
+        return oops('Could not write to file ', output)
     end
 
     outfile:write(dumpdata:lower())
     io.close(outfile)
-    print(("Wrote an emulator-dump to the file %s"):format(output))
+    print(('Wrote an emulator-dump to the file %s'):format(output))
 end
 
 --[[
diff --git a/client/scripts/dumptoemul.lua b/client/scripts/dumptoemul.lua
index 08e5e03dd..e364ccc8b 100644
--- a/client/scripts/dumptoemul.lua
+++ b/client/scripts/dumptoemul.lua
@@ -3,12 +3,18 @@
 getopt = require('getopt')
 bin = require('bin')
 
-example = "script run dumptoemul -i dumpdata-foobar.bin"
-author = "Martin Holst Swende"
-usage = "script run dumptoemul [-i <file>] [-o <file>]"
-desc =[[
+copyright = ''
+author = 'Martin Holst Swende'
+version = 'v1.0.1'
+desc = [[
 This script takes a dumpfile from 'hf mf dump' and converts it to a format that can be used
 by the emulator
+]]
+example = [[
+    script run dumptoemul -i dumpdata-foobar.bin
+]]
+usage = [[
+script run dumptoemul [-i <file>] [-o <file>]
 
 Arguments:
     -h              This help
@@ -16,6 +22,7 @@ Arguments:
     -o <filename>   Specifies the output file. If omitted, <uid>.eml is used.
 
 ]]
+
 local DEBUG = false
 -------------------------------
 -- Some utilities
@@ -25,7 +32,6 @@ local DEBUG = false
 -- A debug printout-function
 local function dbg(args)
     if not DEBUG then return end
-
     if type(args) == 'table' then
         local i = 1
         while result[i] do
@@ -39,83 +45,87 @@ end
 ---
 -- This is only meant to be used when errors occur
 local function oops(err)
-    print('ERROR: ',err)
-    return nil,err
+    print('ERROR:', err)
+    core.clearCommandBuffer()
+    return nil, err
 end
 ---
 -- Usage help
 function help()
-    print(desc)
+    print(copyright)
     print(author)
-    print("Example usage")
+    print(version)
+    print(desc)
+    print('Example usage')
     print(example)
+    print(usage)
 end
 
 local function convert_to_ascii(hexdata)
     if string.len(hexdata) % 32 ~= 0 then
-        return oops(("Bad data, length should be a multiple of 32 (was %d)"):format(string.len(hexdata)))
+        return oops(('Bad data, length should be a multiple of 32 (was %d)'):format(string.len(hexdata)))
     end
 
-    local js,i = "[";
+    local js,i = '[';
     for i = 1, string.len(hexdata),32 do
         js = js .."'" ..string.sub(hexdata,i,i+31).."',\n"
     end
-    js = js .. "]"
+    js = js .. ']'
     return js
 end
 
 local function readdump(infile)
-     t = infile:read("*all")
+     t = infile:read('*all')
      len = string.len(t)
-     local len,hex = bin.unpack(("H%d"):format(len),t)
+     local len,hex = bin.unpack(('H%d'):format(len),t)
      return hex
 end
 
 local function convert_to_emulform(hexdata)
     if string.len(hexdata) % 32 ~= 0 then
-        return oops(("Bad data, length should be a multiple of 32 (was %d)"):format(string.len(hexdata)))
+        return oops(('Bad data, length should be a multiple of 32 (was %d)'):format(string.len(hexdata)))
     end
-    local ascii,i = "";
+    local ascii,i = '';
     for i = 1, string.len(hexdata),32 do
-        ascii = ascii..string.sub(hexdata,i,i+31).."\n"
+        ascii = ascii..string.sub(hexdata,i,i+31)..'\n'
     end
     return string.sub(ascii, 1, -2)
 end
 
 local function main(args)
 
-    local input = "dumpdata.bin"
+    local input = 'dumpdata.bin'
     local output
 
     for o, a in getopt.getopt(args, 'i:o:h') do
-        if o == "h" then return help() end
-        if o == "i" then input = a end
-        if o == "o" then output = a end
+        if o == 'h' then return help() end
+        if o == 'i' then input = a end
+        if o == 'o' then output = a end
     end
     -- Validate the parameters
 
-    local infile = io.open(input, "rb")
+    local infile = io.open(input, 'rb')
     if infile == nil then
-        return oops("Could not read file ", input)
+        return oops('Could not read file ', input)
     end
     local dumpdata = readdump(infile)
     -- The hex-data is now in ascii-format,
 
     -- But first, check the uid
-    local uid = string.sub(dumpdata,1,8)
-    output = output or (uid .. ".eml")
+    local uid = string.sub(dumpdata, 1, 8)
+    output = output or (uid .. '.eml')
 
     -- Format some linebreaks
     dumpdata = convert_to_emulform(dumpdata)
 
-    local outfile = io.open(output, "w")
+    local outfile = io.open(output, 'w')
     if outfile == nil then
-        return oops("Could not write to file ", output)
+        return oops('Could not write to file ', output)
     end
 
     outfile:write(dumpdata:lower())
     io.close(outfile)
-    print(("Wrote an emulator-dump to the file %s"):format(output))
+    print(('Wrote an emulator-dump to the file %s'):format(output))
 end
 
 

From 2f1061f95b277a0fc621b52538de9c3c623c07ee Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 7 May 2019 23:35:09 +0200
Subject: [PATCH 1652/1938] rework ping

---
 armsrc/appmain.c     |  6 +-----
 client/cmdhficlass.c |  4 ++--
 client/cmdhfmf.c     |  2 +-
 client/cmdhw.c       | 30 ++++++++++++------------------
 client/cmdlfawid.c   |  8 ++++----
 client/cmdlfhid.c    |  8 ++++----
 client/comms.c       |  1 -
 client/scripting.c   |  2 +-
 8 files changed, 25 insertions(+), 36 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 89b5d1cf1..99aeca262 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1521,11 +1521,7 @@ static void PacketReceived(PacketCommandNG *packet) {
         case CMD_CAPABILITIES:
             SendCapabilities();
         case CMD_PING:
-            if (packet->ng) {
-                reply_ng(CMD_PING, PM3_SUCCESS, packet->data.asBytes, packet->length);
-            } else {
-                reply_mix(CMD_ACK, reply_via_fpc, 0, 0, 0, 0);
-            }
+            reply_ng(CMD_PING, PM3_SUCCESS, packet->data.asBytes, packet->length);
             break;
 #ifdef WITH_LCD
         case CMD_LCD_RESET:
diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index 023cf9107..ddafd5a46 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -606,7 +606,7 @@ static int CmdHFiClassELoad(const char *Cmd) {
     // Disable fast mode and send a dummy command to make it effective
     conn.block_after_ACK = false;
     SendCommandNG(CMD_PING, NULL, 0);
-    WaitForResponseTimeout(CMD_ACK, NULL, 1000);
+    WaitForResponseTimeout(CMD_PING, NULL, 1000);
 
     PrintAndLogEx(SUCCESS, "sent %d bytes of data to device emulator memory", bytes_sent);
     return 0;
@@ -2038,7 +2038,7 @@ out:
     // Disable fast mode and send a dummy command to make it effective
     conn.block_after_ACK = false;
     SendCommandNG(CMD_PING, NULL, 0);
-    WaitForResponseTimeout(CMD_ACK, NULL, 1000);
+    WaitForResponseTimeout(CMD_PING, NULL, 1000);
 
     DropField();
     free(pre);
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 82eb6c208..9f127917a 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -2027,7 +2027,7 @@ out:
     // Disable fast mode and send a dummy command to make it effective
     conn.block_after_ACK = false;
     SendCommandNG(CMD_PING, NULL, 0);
-    WaitForResponseTimeout(CMD_ACK, NULL, 1000);
+    WaitForResponseTimeout(CMD_PING, NULL, 1000);
 
 
     if (createDumpFile) {
diff --git a/client/cmdhw.c b/client/cmdhw.c
index 4eda2dc66..51ae266fc 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -465,22 +465,14 @@ static int CmdStatus(const char *Cmd) {
 }
 
 static int CmdPing(const char *Cmd) {
-    (void)Cmd; // Cmd is not used so far
-    clearCommandBuffer();
-    PacketResponseNG resp;
-    SendCommandNG(CMD_PING, NULL, 0);
-    if (WaitForResponseTimeout(CMD_ACK, &resp, 1000))
-        PrintAndLogEx(SUCCESS, "Ping " _GREEN_("successful"));
-    else
-        PrintAndLogEx(WARNING, "Ping " _RED_("failed"));
-    return PM3_SUCCESS;
-}
-
-static int CmdPingNG(const char *Cmd) {
     uint32_t len = strtol(Cmd, NULL, 0);
     if (len > PM3_CMD_DATA_SIZE)
         len = PM3_CMD_DATA_SIZE;
-    PrintAndLogEx(INFO, "PingNG sent with payload len=%d", len);
+    if (len) {
+        PrintAndLogEx(INFO, "Ping sent with payload len=%d", len);
+    } else {
+        PrintAndLogEx(INFO, "Ping sent");
+    }
     clearCommandBuffer();
     PacketResponseNG resp;
     uint8_t data[PM3_CMD_DATA_SIZE] = {0};
@@ -489,11 +481,14 @@ static int CmdPingNG(const char *Cmd) {
     SendCommandNG(CMD_PING, data, len);
     if (WaitForResponseTimeout(CMD_PING, &resp, 1000)) {
         bool error = false;
-        if (len)
+        if (len) {
             error = memcmp(data, resp.data.asBytes, len) != 0;
-        PrintAndLogEx((error)? ERR:SUCCESS, "PingNG response received, content is %s", error ? _RED_("NOT ok") : _GREEN_("ok"));
+            PrintAndLogEx((error)? ERR:SUCCESS, "Ping response " _GREEN_("received") "and content is %s", error ? _RED_("NOT ok") : _GREEN_("ok"));
+        } else {
+            PrintAndLogEx((error)? ERR:SUCCESS, "Ping response " _GREEN_("received"));
+        }
     } else
-        PrintAndLogEx(WARNING, "PingNG response " _RED_("timeout"));
+        PrintAndLogEx(WARNING, "Ping response " _RED_("timeout"));
     return PM3_SUCCESS;
 }
 
@@ -538,8 +533,7 @@ static command_t CommandTable[] = {
     {"fpgaoff",       CmdFPGAOff,     IfPm3Present,    "Set FPGA off"},
     {"lcd",           CmdLCD,         IfPm3Lcd,        "<HEX command> <count> -- Send command/data to LCD"},
     {"lcdreset",      CmdLCDReset,    IfPm3Lcd,        "Hardware reset LCD"},
-    {"ping",          CmdPing,        IfPm3Present,    "Test if the Proxmark3 is responding"},
-    {"pingng",        CmdPingNG,      IfPm3Present,    "Test if the Proxmark3 is responsive, using new frame format (experimental)"},
+    {"ping",          CmdPing,        IfPm3Present,    "Test if the Proxmark3 is responsive"},
     {"readmem",       CmdReadmem,     IfPm3Present,    "[address] -- Read memory at decimal address from flash"},
     {"reset",         CmdReset,       IfPm3Present,    "Reset the Proxmark3"},
     {"setlfdivisor",  CmdSetDivisor,  IfPm3Present,    "<19 - 255> -- Drive LF antenna at 12Mhz/(divisor+1)"},
diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c
index 8e29e77bf..946656276 100644
--- a/client/cmdlfawid.c
+++ b/client/cmdlfawid.c
@@ -87,12 +87,12 @@ static int usage_lf_awid_brute(void) {
 }
 
 static bool sendPing(void) {
-    SendCommandMIX(CMD_PING, 1, 2, 3, NULL, 0);
-    SendCommandMIX(CMD_PING, 1, 2, 3, NULL, 0);
-    SendCommandMIX(CMD_PING, 1, 2, 3, NULL, 0);
+    SendCommandNG(CMD_PING, NULL, 0);
+    SendCommandNG(CMD_PING, NULL, 0);
+    SendCommandNG(CMD_PING, NULL, 0);
     clearCommandBuffer();
     PacketResponseNG resp;
-    if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000))
+    if (!WaitForResponseTimeout(CMD_PING, &resp, 1000))
         return false;
     return true;
 }
diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c
index fc9decced..b712cb50f 100644
--- a/client/cmdlfhid.c
+++ b/client/cmdlfhid.c
@@ -93,12 +93,12 @@ static int usage_lf_hid_brute(void) {
 
 // sending three times.  Didn't seem to break the previous sim?
 static bool sendPing(void) {
-    SendCommandMIX(CMD_PING, 1, 2, 3, NULL, 0);
-    SendCommandMIX(CMD_PING, 1, 2, 3, NULL, 0);
-    SendCommandMIX(CMD_PING, 1, 2, 3, NULL, 0);
+    SendCommandNG(CMD_PING, NULL, 0);
+    SendCommandNG(CMD_PING, NULL, 0);
+    SendCommandNG(CMD_PING, NULL, 0);
     clearCommandBuffer();
     PacketResponseNG resp;
-    if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000))
+    if (!WaitForResponseTimeout(CMD_PING, &resp, 1000))
         return false;
     return true;
 }
diff --git a/client/comms.c b/client/comms.c
index 504f40c9e..c48a1bcdd 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -608,7 +608,6 @@ int TestProxmark(void) {
             return PM3_EIO;
 
         SendCommandNG(CMD_CAPABILITIES, NULL, 0);
-        
         if (WaitForResponseTimeoutW(CMD_PING, &resp, 1000, false)) {
             memcpy(&pm3_capabilities, resp.data.asBytes, resp.length);
             conn.send_via_fpc_usart = pm3_capabilities.via_fpc;
diff --git a/client/scripting.c b/client/scripting.c
index c8fa2f163..91fc5b427 100644
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -46,7 +46,7 @@ static int l_fast_push_mode(lua_State *L) {
     // Disable fast mode and send a dummy command to make it effective
     if (enable == false) {
         SendCommandNG(CMD_PING, NULL, 0);
-        WaitForResponseTimeout(CMD_ACK, NULL, 1000);
+        WaitForResponseTimeout(CMD_PING, NULL, 1000);
     }
 
     //Push the retval on the stack

From 9c95a2e8aa471d9ddb1a63a1a36e1df784b37136 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 7 May 2019 23:37:15 +0200
Subject: [PATCH 1653/1938] textual

---
 client/scripts/e.lua | 55 +++++++++++++++++++++++++++-----------------
 1 file changed, 34 insertions(+), 21 deletions(-)

diff --git a/client/scripts/e.lua b/client/scripts/e.lua
index 1f9a14eb0..580e89a54 100644
--- a/client/scripts/e.lua
+++ b/client/scripts/e.lua
@@ -1,39 +1,52 @@
 local getopt = require('getopt')
 local utils = require('utils')
 
-example = "script calculates many different checksums (CRC) over the provided hex input"
-author = "Iceman"
-desc =
-[[
+copyright = ''
+author = 'Iceman'
+version = 'v1.0.1'
+desc = [[
 This script calculates many checksums (CRC) over the provided hex input.
-
-Arguments:
-    -b              data in hex
-    -w              bitwidth of the CRC family of algorithm. <optional> defaults to all known CRC presets.
-Examples :
+]]
+example = [[
     script run e -b 010203040506070809
     script run e -b 010203040506070809 -w 16
 ]]
-
+usage = [[
+Arguments:
+     -b       data in hex
+     -w       bitwidth of the CRC family of algorithm. <optional> defaults to all known CRC presets.
+]]
 ---
 -- A debug printout-function
-function dbg(args)
-    if DEBUG then
-        print("###", args)
+local function dbg(args)
+    if not DEBUG then return end
+    if type(args) == 'table' then
+        local i = 1
+        while args[i] do
+            dbg(args[i])
+            i = i+1
+        end
+    else
+        print('###', args)
     end
 end
 ---
 -- This is only meant to be used when errors occur
-function oops(err)
-    print("[!] ERROR: ",err)
-    return nil,err
+local function oops(err)
+    print('ERROR:', err)
+    core.clearCommandBuffer()
+    return nil, err
 end
 ---
 -- Usage help
-function help()
+local function help()
+    print(copyright)
+    print(author)
+    print(version)
     print(desc)
-    print("Example usage")
+    print('Example usage')
     print(example)
+    print(usage)
 end
 ---
 -- The main entry point
@@ -44,9 +57,9 @@ function main(args)
 
     -- Read the parameters
     for o, a in getopt.getopt(args, 'hb:w:') do
-        if o == "h" then return help() end
-        if o == "b" then data = a end
-        if o == "w" then width = a end
+        if o == 'h' then return help() end
+        if o == 'b' then data = a end
+        if o == 'w' then width = a end
     end
 
     data = data or '01020304'

From d313804e78eee62d74db46ccb8c9fd883d1d2c0f Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 7 May 2019 23:41:41 +0200
Subject: [PATCH 1654/1938] textual

---
 client/scripts/htmldump.lua    | 54 ++++++++++++++++++++++------------
 client/scripts/iso15_magic.lua | 32 ++++++++++----------
 2 files changed, 53 insertions(+), 33 deletions(-)

diff --git a/client/scripts/htmldump.lua b/client/scripts/htmldump.lua
index afd76abee..0101c14a8 100644
--- a/client/scripts/htmldump.lua
+++ b/client/scripts/htmldump.lua
@@ -4,12 +4,18 @@ getopt = require('getopt')
 bin = require('bin')
 dumplib = require('html_dumplib')
 
-example = "script run htmldump -o mifarecard_foo.html"
-author = "Martin Holst Swende"
-usage = "script run htmldump [-i <file>] [-o <file>]"
+copyright = ''
+author = 'Martin Holst Swende'
+version = 'v1.0.1'
 desc =[[
 This script takes a dumpfile and produces a html based dump, which is a
 bit more easily analyzed.
+]]
+example = [[
+    script run htmldump -o mifarecard_foo.html
+]]
+usage = [[
+script run htmldump [-i <file>] [-o <file>]
 
 Arguments:
     -h              This help
@@ -17,44 +23,56 @@ Arguments:
     -o <filename>   Speciies the output file. If omitted, <curtime>.html is used.
 
 ]]
-
 -------------------------------
 -- Some utilities
 -------------------------------
 
 ---
 -- A debug printout-function
-function dbg(args)
-    if DEBUG then
-        print("###", args)
+local function dbg(args)
+    if not DEBUG then return end
+    if type(args) == 'table' then
+        local i = 1
+        while args[i] do
+            dbg(args[i])
+            i = i+1
+        end
+    else
+        print('###', args)
     end
 end
 ---
 -- This is only meant to be used when errors occur
-function oops(err)
-    print("ERROR: ",err)
+local function oops(err)
+    print('ERROR:', err)
+    core.clearCommandBuffer()
+    return nil, err
 end
 ---
 -- Usage help
-function help()
+local function help()
+    print(copyright)
+    print(author)
+    print(version)
     print(desc)
-    print("Example usage")
+    print('Example usage')
     print(example)
+    print(usage)
 end
 
 local function main(args)
 
-    local input = "dumpdata.bin"
-    local output = os.date("%Y-%m-%d_%H%M%S.html");
+    local input = 'dumpdata.bin'
+    local output = os.date('%Y-%m-%d_%H%M%S.html');
     for o, a in getopt.getopt(args, 'i:o:h') do
-        if o == "h" then return help() end
-        if o == "i" then input = a end
-        if o == "o" then output = a end
+        if o == 'h' then return help() end
+        if o == 'i' then input = a end
+        if o == 'o' then output = a end
     end
-    local filename, err = dumplib.convert_bin_to_html(input,output,16)
+    local filename, err = dumplib.convert_bin_to_html(input,output, 16)
     if err then return oops(err) end
 
-    print(("Wrote a HTML dump to the file %s"):format(filename))
+    print(('Wrote a HTML dump to the file %s'):format(filename))
 end
 
 --[[
diff --git a/client/scripts/iso15_magic.lua b/client/scripts/iso15_magic.lua
index 939c7a943..ba94465e4 100644
--- a/client/scripts/iso15_magic.lua
+++ b/client/scripts/iso15_magic.lua
@@ -5,7 +5,7 @@ local utils =  require('utils')
 
 copyright = 'Copyright (c) 2018 IceSQL AB. All rights reserved.'
 author = 'Christian Herrmann'
-version = 'v1.0.4'
+version = 'v1.0.5'
 desc = [[
 This script tries to set UID on a IS15693 SLIX magic card
 Remember the UID  ->MUST<- start with 0xE0
@@ -32,20 +32,21 @@ local DEBUG = true
 -- A debug printout-function
 local function dbg(args)
     if not DEBUG then return end
-    if type(args) == "table" then
+    if type(args) == 'table' then
         local i = 1
         while args[i] do
             dbg(args[i])
             i = i+1
         end
     else
-        print("###", args)
+        print('###', args)
     end
 end
 ---
 -- This is only meant to be used when errors occur
 local function oops(err)
-    print("ERROR: ",err)
+    print('ERROR:', err)
+    core.clearCommandBuffer()
     return nil, err
 end
 ---
@@ -57,24 +58,25 @@ local function help()
     print(desc)
     print('Example usage')
     print(example)
+    print(usage)
 end
 --
 --- Set UID on magic command enabled on a ICEMAN based REPO
 local function magicUID_iceman(b0, b1)
     print('Using backdoor Magic tag function')
-    core.console("hf 15 raw -2 -c 02213E00000000")
-    core.console("hf 15 raw -2 -c 02213F69960000")
-    core.console("hf 15 raw -2 -c 022138"..b1)
-    core.console("hf 15 raw -2 -c 022139"..b0)
+    core.console('hf 15 raw -2 -c 02213E00000000')
+    core.console('hf 15 raw -2 -c 02213F69960000')
+    core.console('hf 15 raw -2 -c 022138'..b1)
+    core.console('hf 15 raw -2 -c 022139'..b0)
 end
 --
 --- Set UID on magic command enabled,  OFFICAL REPO
 local function magicUID_offical(b0, b1)
     print('Using backdoor Magic tag function OFFICAL REPO')
-    core.console("hf 15 cmd raw -c 02213E00000000")
-    core.console("hf 15 cmd raw -c 02213F69960000")
-    core.console("hf 15 cmd raw -c 022138"..b1)
-    core.console("hf 15 cmd raw -c 022139"..b0)
+    core.console('hf 15 cmd raw -c 02213E00000000')
+    core.console('hf 15 cmd raw -c 02213F69960000')
+    core.console('hf 15 cmd raw -c 022138'..b1)
+    core.console('hf 15 cmd raw -c 022139'..b0)
 end
 ---
 -- The main entry point
@@ -89,9 +91,9 @@ function main(args)
 
     -- Read the parameters
     for o, a in getopt.getopt(args, 'hu:a') do
-        if o == "h" then return help() end
-        if o == "u" then uid = a end
-        if o == "a" then use_iceman = false end
+        if o == 'h' then return help() end
+        if o == 'u' then uid = a end
+        if o == 'a' then use_iceman = false end
     end
 
     -- uid string checks

From 81feb56003ea22da2027b2d37a6d32fe07121840 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 7 May 2019 23:44:46 +0200
Subject: [PATCH 1655/1938] text

---
 client/scripts/lf_bulk.lua | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/client/scripts/lf_bulk.lua b/client/scripts/lf_bulk.lua
index dc59572f3..d93eb4bfb 100644
--- a/client/scripts/lf_bulk.lua
+++ b/client/scripts/lf_bulk.lua
@@ -6,7 +6,7 @@ local getopt = require('getopt')
 
 copyright = ''
 author = "Brian Redbeard"
-version = 'v1.0.0'
+version = 'v1.0.1'
 desc = [[
 Perform bulk enrollment of 26 bit H10301 style RFID Tags
 For more info, check the comments in the code
@@ -32,21 +32,22 @@ local lshift = bit32.lshift
 -- A debug printout-function
 local function dbg(args)
     if not DEBUG then return end
-    if type(args) == "table" then
+    if type(args) == 'table' then
         local i = 1
         while args[i] do
             dbg(args[i])
             i = i+1
         end
     else
-        print("###", args)
+        print('###', args)
     end
 end
 ---
 -- This is only meant to be used when errors occur
 local function oops(err)
-    print("ERROR: ",err)
-    return nil,err
+    print('ERROR:', err)
+    core.clearCommandBuffer()
+    return nil, errr
 end
 ---
 -- Usage help
@@ -57,6 +58,7 @@ local function help()
     print(desc)
     print('Example usage')
     print(example)
+    print(usage)    
 end
 ---
 -- Exit message
@@ -68,7 +70,7 @@ local function exitMsg(msg)
 end
 --[[Implement a function to simply visualize the bitstream in a text format
 --This is especially helpful for troubleshooting bitwise math issues]]--
-function toBits(num,bits)
+local function toBits(num,bits)
     -- returns a table of bits, most significant first.
     bits = bits or math.max(1, select(2, math.frexp(num)))
     local t = {} -- will contain the bits
@@ -86,7 +88,7 @@ end
   default to this and so counting some ones is good enough for me
 ]]--
 local function evenparity(s)
-    local _, count = string.gsub(s, "1", "")
+    local _, count = string.gsub(s, '1', '')
     local p = count % 2
     if (p == 0) then
         return false
@@ -126,7 +128,7 @@ local function cardHex(i, f)
     preamble = bor(0, lshift(1, 5))
     bits = bor(bits, lshift(1, 26))
 
-    return ("%04x%08x"):format(preamble, bits)
+    return ('%04x%08x'):format(preamble, bits)
 end
 ---
 -- main
@@ -145,31 +147,31 @@ local function main(args)
         if o == 'h' then return help() end
         if o == 'f' then
             if isempty(a) then
-                print("You did not supply a facility code, using 0")
+                print('You did not supply a facility code, using 0')
                 facility = 0
             else
                 facility = a
             end
         end
         if o == 'b' then
-            if isempty(a) then return oops("You must supply the flag -b (base id)") end
+            if isempty(a) then return oops('You must supply the flag -b (base id)') end
             baseid = a
         end
         if o == 'c' then
-            if isempty(a) then return oops("You must supply the flag -c (count)") end
+            if isempty(a) then return oops('You must supply the flag -c (count)') end
             count = a
         end
     end
 
     --Due to my earlier complaints about how this specific getopt library
-    --works, specifying ":" does not enforce supplying a value, thus we
+    --works, specifying ':' does not enforce supplying a value, thus we
     --need to do these checks all over again.
-    if isempty(baseid) then return oops("You must supply the flag -b (base id)") end
-    if isempty(count) then return oops("You must supply the flag -c (count)") end
+    if isempty(baseid) then return oops('You must supply the flag -b (base id)') end
+    if isempty(count) then return oops('You must supply the flag -c (count)') end
 
     --If the facility ID is non specified, ensure we code it as zero
     if isempty(facility) then
-        print("Using 0 for the facility code as -f was not supplied")
+        print('Using 0 for the facility code as -f was not supplied')
         facility = 0
     end
 
@@ -183,8 +185,8 @@ local function main(args)
 
     for cardnum = baseid, endid do
         local card = cardHex(cardnum, facility)
-        print("Press enter to program card "..cardnum..":"..facility.." (hex: "..card..")")
-        --This would be better with "press any key", but we'll take what we can get.
+        print('Press enter to program card '..cardnum..':'..facility..' (hex: '..card..')')
+        --This would be better with 'press any key', but we'll take what we can get.
         io.read()
         core.console( ('lf hid clone %s'):format(card) )
     end

From a5f19cde79521c9f96052abdbbfc5150b598ca2a Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 7 May 2019 23:46:37 +0200
Subject: [PATCH 1656/1938] textual

---
 client/scripts/mifare_autopwn.lua | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/scripts/mifare_autopwn.lua b/client/scripts/mifare_autopwn.lua
index cc37f6103..a9859ac25 100644
--- a/client/scripts/mifare_autopwn.lua
+++ b/client/scripts/mifare_autopwn.lua
@@ -5,7 +5,7 @@ local utils = require('utils')
 
 copyright = ''
 author = "Martin Holst Swende"
-version = 'v1.0.1'
+version = 'v1.0.2'
 desc = [[
 This is a script which automates cracking and dumping mifare classic cards. It sets itself into
 'listening'-mode, after which it cracks and dumps any mifare classic card that you
@@ -148,7 +148,7 @@ end
 -- The main entry point
 local function main(args)
 
-    local verbose, exit, res, uid, err, _, sak
+    local verbose, _exit, res, uid, err, _, sak
     local seen_uids = {}
     local key = ''
     local print_message = true
@@ -159,7 +159,7 @@ local function main(args)
         if o == 'k' then key = a end
     end
 
-    while not exit do
+    while not _exit do
         if print_message then
             print('Waiting for card or press any key to stop')
             print_message = false
@@ -205,7 +205,7 @@ local function main(args)
                 -- Dump info
                 dump(uid, sak)
 
-                if #key == 12 then exit = true end
+                if #key == 12 then _exit = true end
             else
                 print('Card found, darkside attack useless PRNG hardend on UID', uid)
             end

From 5b087a053c71cce274acc44daadeceefcf457107 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 7 May 2019 23:53:06 +0200
Subject: [PATCH 1657/1938] fix: script run legic_buffer2card -  correct params
 for write command

---
 client/scripts/legic_buffer2card.lua | 53 ++++++++++++++++------------
 1 file changed, 31 insertions(+), 22 deletions(-)

diff --git a/client/scripts/legic_buffer2card.lua b/client/scripts/legic_buffer2card.lua
index 68440b8ac..462880ce5 100644
--- a/client/scripts/legic_buffer2card.lua
+++ b/client/scripts/legic_buffer2card.lua
@@ -1,32 +1,41 @@
--- this script writes bytes 8 to 256 on the Legic MIM256
-example = "Script writes to Legic Prime Tag from position 0x07 until 0xFF with the value 0x01"
-author = "Mosci"
-desc =
-[[
-This is a script which writes value 0x01 to bytes from position 0x07 until 0xFF on a Legic Prime Tag (MIM256 or MIM1024)
-(created with 'hf legic save my_dump.hex')
-
-optional arguments :
-    -h       - Help text
-
-Examples :
-    script run legic_buffer2card
-]]
-
 local utils = require('utils')
 local getopt = require('getopt')
+-- this script writes bytes 8 to 256 on the Legic MIM256
+
+copyright = ''
+author = 'Mosci'
+version = 'v1.0.1'
+desc =
+[[
+This is a script which writes value 0x01 to bytes from position 0x07 until 0xFF on a Legic Prime Tag (MIM256 or MIM1024)  -- (created with 'hf legic save my_dump.hex') --
+]]
+example = [[
+    script run legic_buffer2card
+]]
+usage = [[
+script run legic_buffer2card -h
+
+Arguments
+    -h       - Help text
+]]
+
 ---
 -- This is only meant to be used when errors occur
-function oops(err)
-    print("ERROR: ",err)
+local function oops(err)
+    print('ERROR:', err)
+    core.clearCommandBuffer()
     return nil, err
-   end
+end
 ---
 -- Usage help
-function help()
+local function help()
+    print(copyright)
+    print(author)
+    print(version)
     print(desc)
-    print("Example usage")
+    print('Example usage')
     print(example)
+    print(usage)
 end
 --
 -- simple loop-write from 0x07 to 0xff
@@ -34,13 +43,13 @@ function main()
 
     -- parse arguments for the script
     for o, a in getopt.getopt(args, 'h') do
-        if o == "h" then return help() end
+        if o == 'h' then return help() end
     end
 
     local cmd = ''
     local i
     for i = 7, 255 do
-        cmd = ('hf legic write 0x%02x 0x01'):format(i)
+        cmd = ('hf legic write o %02x d 01'):format(i)
         print(cmd)
         core.clearCommandBuffer()
         core.console(cmd)

From 02ea378e381daed32ec48ec9a2d8b86261b2f023 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 8 May 2019 00:02:08 +0200
Subject: [PATCH 1658/1938] Wow, two improbable bugs were cancelling each other

---
 armsrc/appmain.c | 1 +
 client/comms.c   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 99aeca262..2a9636496 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1520,6 +1520,7 @@ static void PacketReceived(PacketCommandNG *packet) {
             break;
         case CMD_CAPABILITIES:
             SendCapabilities();
+            break;
         case CMD_PING:
             reply_ng(CMD_PING, PM3_SUCCESS, packet->data.asBytes, packet->length);
             break;
diff --git a/client/comms.c b/client/comms.c
index c48a1bcdd..1fb59757b 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -608,7 +608,7 @@ int TestProxmark(void) {
             return PM3_EIO;
 
         SendCommandNG(CMD_CAPABILITIES, NULL, 0);
-        if (WaitForResponseTimeoutW(CMD_PING, &resp, 1000, false)) {
+        if (WaitForResponseTimeoutW(CMD_CAPABILITIES, &resp, 1000, false)) {
             memcpy(&pm3_capabilities, resp.data.asBytes, resp.length);
             conn.send_via_fpc_usart = pm3_capabilities.via_fpc;
             conn.uart_speed = pm3_capabilities.baudrate;

From 6401452eb6456dc4666d8fe3ebd808945a723f21 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 8 May 2019 00:06:12 +0200
Subject: [PATCH 1659/1938] remove hw_available_fpc_usart_btaddon

---
 armsrc/appmain.c  | 3 ---
 include/pm3_cmd.h | 4 ----
 2 files changed, 7 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 2a9636496..e19816743 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -461,11 +461,8 @@ void SendCapabilities(void) {
 #endif
 #ifdef WITH_FPC_USART_HOST
     capabilities.compiled_with_fpc_usart_host = true;
-    // TODO
-    capabilities.hw_available_fpc_usart_btaddon = true;
 #else
     capabilities.compiled_with_fpc_usart_host = false;
-    capabilities.hw_available_fpc_usart_btaddon = false;
 #endif
 #ifdef WITH_LF
     capabilities.compiled_with_lf = true;
diff --git a/include/pm3_cmd.h b/include/pm3_cmd.h
index cba00e7f0..d0797c18c 100644
--- a/include/pm3_cmd.h
+++ b/include/pm3_cmd.h
@@ -137,7 +137,6 @@ typedef struct {
     uint16_t read_gap;
 } t55xx_config;
 
-// TODO add more fields to report all hw & sw capabilities of pm3
 typedef struct {
     uint32_t baudrate;
     bool via_fpc;
@@ -161,12 +160,9 @@ typedef struct {
     // misc
     bool compiled_with_lcd;
 
-    // Following are not yet implemented:
     // rdv4
     bool hw_available_flash;
     bool hw_available_smartcard;
-    // rdv4 bt addon
-    bool hw_available_fpc_usart_btaddon;
 } PACKED capabilities_t;
 
 extern capabilities_t pm3_capabilities;

From 8ebd5e0579cd997e6dbaeea1d04c38f3e19933ae Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 8 May 2019 00:07:20 +0200
Subject: [PATCH 1660/1938] textual,  fixes to legic commands used.  Needs
 testing

---
 client/scripts/Legic_clone.lua | 211 +++++++++++++++++----------------
 1 file changed, 112 insertions(+), 99 deletions(-)

diff --git a/client/scripts/Legic_clone.lua b/client/scripts/Legic_clone.lua
index 21d756d0e..9a8df9c1d 100644
--- a/client/scripts/Legic_clone.lua
+++ b/client/scripts/Legic_clone.lua
@@ -84,12 +84,20 @@
     as seen on this example: addr 0x05..0x08 & 0x0c must have been set to this values - otherwise kghCRC will not be created by a official reader (not accepted)
 --]]
 
-example = "Script create a clone-dump of a dump from a Legic Prime Tag"
-author = "Mosci"
-desc =
-[[
+copyright = ''
+author = 'Mosci'
+version = 'v1.0.1'
+desc = [[
 This is a script which create a clone-dump of a dump from a Legic Prime Tag (MIM256 or MIM1024)
 (created with 'hf legic save my_dump.hex')
+]]
+example = [[
+    script run legic_clone -i my_dump.hex -o my_clone.hex -c f8
+    script run legic_clone -i my_dump.hex -d -s
+]]
+usage = [[
+script run legic_clone -h -i <file> -o <file> -c <crc> -d -s -w
+
 requiered arguments:
     -i <input file>     (file to read data from)
 
@@ -103,55 +111,58 @@ optional arguments :
 
     e.g.:
     hint: using the CRC '00' will result in a plain dump ( -c 00 )
-
-Examples :
-    script run legic_clone -i my_dump.hex -o my_clone.hex -c f8
-    script run legic_clone -i my_dump.hex -d -s
 ]]
-
 local utils = require('utils')
 local getopt = require('getopt')
 local bxor = bit32.bxor
 
 -- we need always 2 digits
-function prepend_zero(s)
-    if (string.len(s)==1) then return "0" .. s
+local function prepend_zero(s)
+    if (string.len(s) == 1) then 
+        return '0' .. s
     else
-        if (string.len(s)==0) then return "00"
-        else return s
+        if (string.len(s) == 0) then 
+            return '00'
+        else
+            return s
         end
     end
 end
 
 ---
 -- This is only meant to be used when errors occur
-function oops(err)
-    print("ERROR: ",err)
+local function oops(err)
+    print('ERROR:', err)
+    core.clearCommandBuffer()
     return nil, err
 end
 
 ---
 -- Usage help
-function help()
+local function help()
+    print(copyright)
+    print(author)
+    print(version)
     print(desc)
-    print("Example usage")
+    print('Example usage')
     print(example)
+    print(usage)
 end
 
 -- Check availability of file
-function file_check(file_name)
-  local file_found=io.open(file_name, "r")
-  if file_found==nil then
-    file_found=false
-  else
-    file_found=true
-  end
-  return file_found
+local function file_check(file_name)
+    local file_found = io.open(file_name, "r")
+    if not file_found then
+        file_found = false
+    else
+        file_found = true
+    end
+    return file_found
 end
 
 --- xor-wrapper
 -- xor all from addr 0x22 (start counting from 1 => 23)
-function xorme(hex, xor, index)
+local function xorme(hex, xor, index)
     if ( index >= 23 ) then
         return ('%02x'):format(bxor( tonumber(hex,16) , tonumber(xor,16) ))
     else
@@ -160,7 +171,7 @@ function xorme(hex, xor, index)
 end
 
 -- read input-file into array
-function getInputBytes(infile)
+local function getInputBytes(infile)
     local line
     local bytes = {}
 
@@ -183,26 +194,26 @@ function getInputBytes(infile)
 end
 
 -- write to file
-function writeOutputBytes(bytes, outfile)
+local function writeOutputBytes(bytes, outfile)
     local line
-    local bcnt=0
+    local bcnt = 0
     local fho,err = io.open(outfile,"w")
     if err then print("OOps ... faild to open output-file ".. outfile); return false; end
 
     for i = 1, #bytes do
         if (bcnt == 0) then
-            line=bytes[i]
+            line = bytes[i]
         elseif (bcnt <= 7) then
-            line=line.." "..bytes[i]
+            line = line.." "..bytes[i]
         end
         if (bcnt == 7) then
             -- write line to new file
             fho:write(line.."\n")
             -- reset counter & line
-            bcnt=-1
-            line=""
+            bcnt = -1
+            line = ""
         end
-        bcnt=bcnt+1
+        bcnt = bcnt + 1
     end
     fho:close()
     print("\nwrote ".. #bytes .." bytes to " .. outfile)
@@ -210,7 +221,7 @@ function writeOutputBytes(bytes, outfile)
 end
 
 -- xore certain bytes
-function xorBytes(inBytes, crc)
+local function xorBytes(inBytes, crc)
     local bytes = {}
     for index = 1, #inBytes do
         bytes[index] = xorme(inBytes[index], crc, index)
@@ -229,27 +240,27 @@ end
 function getSegmentData(bytes, start, index)
     local raw, len, valid, last, wrp, wrc, rd, crc
     local segment = {}
-    segment[0] = bytes[start].." "..bytes[start+1].." "..bytes[start+2].." "..bytes[start+3]
+    segment[0] = bytes[start]..' '..bytes[start+1]..' '..bytes[start+2]..' '..bytes[start+3]
     -- flag = high nibble of byte 1
     segment[1] = string.sub(bytes[start+1],0,1)
 
     -- valid = bit 6 of byte 1
-    segment[2] = tonumber(bit32.extract("0x"..bytes[start+1],6,1),16)
+    segment[2] = tonumber(bit32.extract('0x'..bytes[start+1],6,1),16)
 
     -- last = bit 7 of byte 1
-    segment[3] = tonumber(bit32.extract("0x"..bytes[start+1],7,1),16)
+    segment[3] = tonumber(bit32.extract('0x'..bytes[start+1],7,1),16)
 
     -- len = (byte 0)+(bit0-3 of byte 1)
-  segment[4] = tonumber(("%03x"):format(tonumber(bit32.extract("0x"..bytes[start+1],0,3),16)..tonumber(bytes[start],16)),16)
+  segment[4] = tonumber(('%03x'):format(tonumber(bit32.extract('0x'..bytes[start+1],0,3),16)..tonumber(bytes[start],16)),16)
 
     -- wrp (write proteted) = byte 2
     segment[5] = tonumber(bytes[start+2])
 
     -- wrc (write control) - bit 4-6 of byte 3
-    segment[6] = tonumber(bit32.extract("0x"..bytes[start+3],4,3),16)
+    segment[6] = tonumber(bit32.extract('0x'..bytes[start+3],4,3),16)
 
     -- rd (read disabled) - bit 7 of byte 3
-    segment[7] = tonumber(bit32.extract("0x"..bytes[start+3],7,1),16)
+    segment[7] = tonumber(bit32.extract('0x'..bytes[start+3],7,1),16)
 
     -- crc byte 4
     segment[8] = bytes[start+4]
@@ -266,40 +277,40 @@ end
 -- checks if a segment does have a kghCRC
 -- returns boolean false if no kgh has being detected or the kghCRC if a kgh was detected
 function CheckKgh(bytes, segStart, segEnd)
-  if (bytes[8]=='9f' and bytes[9]=='ff' and bytes[13]=='11') then
-    local i
-    local data = {}
-    segStart=tonumber(segStart,10)
-    segEnd=tonumber(segEnd,10)
-    local dataLen = segEnd-segStart-5
-    --- gather creadentials for verify
-    local WRP = bytes[(segStart+2)]
-    local WRC = ("%02x"):format(tonumber(bit32.extract("0x"..bytes[segStart+3],4,3),16))
-    local RD = ("%02x"):format(tonumber(bit32.extract("0x"..bytes[segStart+3],7,1),16))
-    local XX = "00"
-    cmd = bytes[1]..bytes[2]..bytes[3]..bytes[4]..WRP..WRC..RD..XX
-    for i=(segStart+5), (segStart+5+dataLen-2) do
-      cmd = cmd..bytes[i]
-    end
-    local KGH=("%02x"):format(utils.Crc8Legic(cmd))
-    if (KGH==bytes[segEnd-1]) then
-      return KGH
+    if (bytes[8]=='9f' and bytes[9]=='ff' and bytes[13]=='11') then
+        local i
+        local data = {}
+        segStart = tonumber(segStart, 10)
+        segEnd = tonumber(segEnd, 10)
+        local dataLen = segEnd-segStart-5
+        --- gather creadentials for verify
+        local WRP = bytes[(segStart+2)]
+        local WRC = ("%02x"):format(tonumber(bit32.extract("0x"..bytes[segStart+3],4,3),16))
+        local RD = ("%02x"):format(tonumber(bit32.extract("0x"..bytes[segStart+3],7,1),16))
+        local XX = "00"
+        cmd = bytes[1]..bytes[2]..bytes[3]..bytes[4]..WRP..WRC..RD..XX
+        for i = (segStart+5), (segStart+5+dataLen-2) do
+            cmd = cmd..bytes[i]
+        end
+        local KGH = ("%02x"):format(utils.Crc8Legic(cmd))
+        if (KGH == bytes[segEnd-1]) then
+            return KGH
+        else
+            return false
+        end
     else
-      return false
+        return false
     end
-  else
-    return false
-  end
 end
 
 -- get only the addresses of segemnt-crc's and the length of bytes
 function getSegmentCrcBytes(bytes)
-    local start=23
-    local index=0
+    local start = 23
+    local index = 0
     local crcbytes = {}
     repeat
         seg = getSegmentData(bytes,start,index)
-        crcbytes[index]= seg[10]
+        crcbytes[index] = seg[10]
         start = start + seg[4]
         index = index + 1
     until (seg[3] == 1 or tonumber(seg[9]) == 126 )
@@ -310,33 +321,33 @@ end
 -- print segment-data (hf legic decode like)
 function displaySegments(bytes)
     --display segment header(s)
-    start=23
-    index="00"
+    start = 23
+    index = '00'
 
     --repeat until last-flag ist set to 1 or segment-index has reached 126
     repeat
-        wrc=""
-        wrp=""
-        pld=""
-        Seg = getSegmentData(bytes,start,index)
-    KGH = CheckKgh(bytes,start,(start+tonumber(Seg[4],10)))
+        wrc = ''
+        wrp = ''
+        pld = ''
+        Seg = getSegmentData(bytes, start, index)
+        KGH = CheckKgh(bytes, start, (start+tonumber(Seg[4],10)))
         printSegment(Seg)
 
         -- wrc
-        if(Seg[6]>0) then
+        if (Seg[6] > 0) then
             print("WRC protected area:")
             -- length of wrc = wrc
             for i=1, Seg[6] do
                 -- starts at (segment-start + segment-header + segment-crc)-1
-                wrc = wrc..bytes[(start+4+1+i)-1].." "
+                wrc = wrc..bytes[(start+4+1+i)-1]..' '
             end
             print(wrc)
-        elseif(Seg[5]>0) then
+        elseif (Seg[5] > 0) then
             print("Remaining write protected area:")
             -- length of wrp = (wrp-wrc)
             for i=1, (Seg[5]-Seg[6]) do
                 -- starts at (segment-start + segment-header + segment-crc + wrc)-1
-                wrp = wrp..bytes[(start+4+1+Seg[6]+i)-1].." "
+                wrp = wrp..bytes[(start+4+1+Seg[6]+i)-1]..' '
             end
             print(wrp)
         end
@@ -346,10 +357,12 @@ function displaySegments(bytes)
         --length of payload = segment-len - segment-header - segment-crc - wrp -wrc
         for i=1, (Seg[4]-4-1-Seg[5]-Seg[6]) do
             -- starts at (segment-start + segment-header + segment-crc + segment-wrp + segemnt-wrc)-1
-            pld = pld..bytes[(start+4+1+Seg[5]+Seg[6]+i)-1].." "
+            pld = pld..bytes[(start+4+1+Seg[5]+Seg[6]+i)-1]..' '
         end
         print(pld)
-    if (KGH) then print("'Kaba Group Header' detected"); end
+        if (KGH) then 
+            print("'Kaba Group Header' detected")
+        end
         start = start+Seg[4]
         index = prepend_zero(tonumber(Seg[9])+1)
 
@@ -382,7 +395,7 @@ function writeToTag(plainBytes)
     print("\nthese are the MCD MSN0 MSN1 MSN2 from the Tag that has being read:")
     cmd = 'data hexsamples 4'
     core.console(cmd)
-  print("^^ use this values as input for the following answers (one 2-digit-value per question/answer):")
+    print("^^ use this values as input for the following answers (one 2-digit-value per question/answer):")
     -- enter MCD & MSN (in hex)
     MCD  = utils.input("type in  MCD as 2-digit value - e.g.: 00", plainBytes[1])
     MSN0 = utils.input("type in MSN0 as 2-digit value - e.g.: 01", plainBytes[2])
@@ -398,10 +411,10 @@ function writeToTag(plainBytes)
     SegCrcs = getSegmentCrcBytes(plainBytes)
     for i=0, (#SegCrcs-1) do
     -- SegCrcs[i]-4 = address of first byte of segmentHeader (low byte segment-length)
-    segLen=tonumber(("%1x"):format(tonumber(bit32.extract("0x"..plainBytes[(SegCrcs[i]-3)],0,3),16))..("%02x"):format(tonumber(plainBytes[SegCrcs[i]-4],16)),16)
-    segStart=(SegCrcs[i]-4)
-    segEnd=(SegCrcs[i]-4+segLen)
-    KGH=CheckKgh(plainBytes,segStart,segEnd)
+    segLen = tonumber(("%1x"):format(tonumber(bit32.extract("0x"..plainBytes[(SegCrcs[i]-3)],0,3),16))..("%02x"):format(tonumber(plainBytes[SegCrcs[i]-4],16)),16)
+    segStart = (SegCrcs[i]-4)
+    segEnd = (SegCrcs[i]-4+segLen)
+    KGH = CheckKgh(plainBytes,segStart,segEnd)
     if (KGH) then
       print("'Kaba Group Header' detected - re-calculate...")
     end
@@ -424,17 +437,17 @@ function writeToTag(plainBytes)
         WriteBytes = utils.input("enter number of bytes to write?", SegCrcs[#SegCrcs])
 
         -- load file into pm3-buffer
-        cmd = 'hf legic load myLegicClone.hex'
+        cmd = 'hf legic eload myLegicClone.hex'
         core.console(cmd)
 
         -- write pm3-buffer to Tag
         for i=0, WriteBytes do
             if ( i<5 or i>6) then
-                cmd = ('hf legic write 0x%02x 0x01'):format(i)
+                cmd = ('hf legic write o %02x d 01'):format(i)
                 core.console(cmd)
             elseif (i == 6) then
                 -- write DCF in reverse order (requires 'mosci-patch')
-                cmd = 'hf legic write 0x05 0x02'
+                cmd = 'hf legic write o 05 d 02'
                 core.console(cmd)
             else
                 print("skipping byte 0x05 - will be written next step")
@@ -447,7 +460,7 @@ end
 -- main function
 function main(args)
     -- some variables
-    local i=0
+    local i = 0
     local oldcrc, newcrc, infile, outfile
     local bytes = {}
     local segments = {}
@@ -455,19 +468,19 @@ function main(args)
     -- parse arguments for the script
     for o, a in getopt.getopt(args, 'hwsdc:i:o:') do
         -- output file
-        if o == "o" then
+        if o == 'o' then
             outfile = a
             ofs = true
             if (file_check(a)) then
-                local answer = utils.confirm("\nthe output-file "..a.." alredy exists!\nthis will delete the previous content!\ncontinue?")
-                if (answer==false) then return oops("quiting") end
+                local answer = utils.confirm('\nthe output-file '..a..' alredy exists!\nthis will delete the previous content!\ncontinue?')
+                if (answer==false) then return oops('quiting') end
             end
         end
         -- input file
-        if o == "i" then
+        if o == 'i' then
             infile = a
             if (file_check(infile)==false) then
-                return oops("input file: "..infile.." not found")
+                return oops('input file: '..infile..' not found')
             else
                 bytes = getInputBytes(infile)
                 oldcrc = bytes[5]
@@ -477,21 +490,21 @@ function main(args)
             i = i+1
         end
         -- new crc
-        if o == "c" then
+        if o == 'c' then
             newcrc = a
             ncs = true
         end
         -- display segments switch
-        if o == "d" then ds = true; end
+        if o == 'd' then ds = true; end
         -- display summary switch
-        if o == "s" then ss = true; end
+        if o == 's' then ss = true; end
         -- write to tag switch
-        if o == "w" then ws = true; end
+        if o == 'w' then ws = true; end
         -- help
-        if o == "h" then return help() end
+        if o == 'h' then return help() end
     end
 
-    if (not ifs) then return oops("option -i <input file> is required but missing") end
+    if (not ifs) then return oops('option -i <input file> is required but missing') end
 
     -- bytes to plain
     bytes = xorBytes(bytes, oldcrc)

From 01efa71e2725eb468f8b9c5cc44428018bdcef7a Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 8 May 2019 00:10:03 +0200
Subject: [PATCH 1661/1938] use NG

---
 client/scripts/mifareplus.lua | 38 ++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/client/scripts/mifareplus.lua b/client/scripts/mifareplus.lua
index b559b6beb..88c830b92 100644
--- a/client/scripts/mifareplus.lua
+++ b/client/scripts/mifareplus.lua
@@ -4,7 +4,7 @@ local getopt = require('getopt')
 
 copyright = ''
 author = 'Dominic Celiano'
-version = 'v1.0.0'
+version = 'v1.0.1'
 desc =
 [[
 Purpose: Lua script to communicate with the Mifare Plus EV1, including personalization (setting the keys) and proximity check. Manually edit the file to add to the commands you can send the card.
@@ -14,8 +14,13 @@ Please read the NXP manual before running this script to prevent making irrevers
     - Make sure you choose your card size correctly (2kB or 4kB).
 Small changes can be to made this script to communicate with the Mifare Plus S, X, or SE.
 ]]
+example = [[
+    -- default
+    script run mifareplus
+]]
 usage = [[
 script run mifareplus -h
+
 Arguments:
     -h             : this help
 ]]
@@ -41,7 +46,8 @@ READPLAINNOMACUNMACED = '0336'
 ---
 -- This is only meant to be used when errors occur
 local function oops(err)
-    print('ERROR: ',err)
+    print('ERROR:', err)
+    core.clearCommandBuffer()
     return nil, err
 end
 ---
@@ -53,6 +59,7 @@ local function help()
     print(desc)
     print('Example usage')
     print(example)
+    print(usage)
 end
 ---
 -- Used to send raw data to the firmware to subsequently forward the data to the card.
@@ -67,12 +74,13 @@ local function sendRaw(rawdata, crc, power)
         flags = flags + lib14a.ISO14A_COMMAND.ISO14A_NO_DISCONNECT
     end
 
-    local command = Command:new{cmd = cmds.CMD_READER_ISO_14443a,
+    local command = Command:newMIX{cmd = cmds.CMD_READER_ISO_14443a,
                                 arg1 = flags, -- Send raw
                                 arg2 = string.len(rawdata) / 2, -- arg2 contains the length, which is half the length of the ASCII-string rawdata
-                                data = rawdata}
+                                data = rawdata
+                                }
     local ignore_response = false
-    local result, err = lib14a.sendToDevice(command, ignore_response)
+    local result, err = command.sendMIX(ignore_response)
     if result then
         --unpack the first 4 parts of the result as longs, and the last as an extremely long string to later be cut down based on arg1, the number of bytes returned
         local count,cmd,arg1,arg2,arg3,data = bin.unpack('LLLLH512',result)
@@ -90,14 +98,6 @@ local function sendRaw(rawdata, crc, power)
     end
 end
 
--- Sends an instruction to do nothing, only disconnect
-local function disconnect()
-    local command = Command:new{cmd = cmds.CMD_READER_ISO_14443a, arg1 = 0,}
-    -- We can ignore the response here, no ACK is returned for this command
-    -- Check /armsrc/iso14443a.c, ReaderIso14443a() for details
-    return lib14a.sendToDevice(command,true)
-end
-
 local function writePerso()
     -- Used to write any data, including the keys (Key A and Key B), for all the sectors.
     -- writePerso() command parameters:
@@ -311,11 +311,17 @@ function main(args)
     -- Initialize the card using the already-present read14a library
     -- Perform RATS and PPS (Protocol and Parameter Selection) check to finish the ISO 14443-4 protocol.
     info,err = lib14a.read(true, false)
-    if not info then oops(err); disconnect(); return; end
+    if not info then 
+        lib14a.disconnect()
+        return oops(err)
+    end
 
     --
     response = sendRaw("D01100", true, true)
-    if not response then oops("No response from PPS check"); disconnect(); return;  end
+    if not response then 
+        lib14a.disconnect()
+        return oops("No response from PPS check")
+    end
 
     print("Connected to")
     print(" Type : "..info.name)
@@ -343,7 +349,7 @@ function main(args)
     -- Power off the Proxmark
     sendRaw(POWEROFF, false, false)
 
-    disconnect()
+    lib14a.disconnect()
 end
 
 main(args)

From 40480a49d8d3674989e2cfddb8264f6d97354c54 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 8 May 2019 00:15:39 +0200
Subject: [PATCH 1662/1938] compact capabilities

---
 include/pm3_cmd.h | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/include/pm3_cmd.h b/include/pm3_cmd.h
index d0797c18c..e2d9a9974 100644
--- a/include/pm3_cmd.h
+++ b/include/pm3_cmd.h
@@ -139,30 +139,30 @@ typedef struct {
 
 typedef struct {
     uint32_t baudrate;
-    bool via_fpc;
+    bool via_fpc                       :1;
     // rdv4
-    bool compiled_with_flash;
-    bool compiled_with_smartcard;
-    bool compiled_with_fpc_usart;
-    bool compiled_with_fpc_usart_dev;
-    bool compiled_with_fpc_usart_host;
+    bool compiled_with_flash           :1;
+    bool compiled_with_smartcard       :1;
+    bool compiled_with_fpc_usart       :1;
+    bool compiled_with_fpc_usart_dev   :1;
+    bool compiled_with_fpc_usart_host  :1;
     // lf
-    bool compiled_with_lf;
-    bool compiled_with_hitag;
+    bool compiled_with_lf              :1;
+    bool compiled_with_hitag           :1;
     // hf
-    bool compiled_with_hfsniff;
-    bool compiled_with_iso14443a;
-    bool compiled_with_iso14443b;
-    bool compiled_with_iso15693;
-    bool compiled_with_felica;
-    bool compiled_with_legicrf;
-    bool compiled_with_iclass;
+    bool compiled_with_hfsniff         :1;
+    bool compiled_with_iso14443a       :1;
+    bool compiled_with_iso14443b       :1;
+    bool compiled_with_iso15693        :1;
+    bool compiled_with_felica          :1;
+    bool compiled_with_legicrf         :1;
+    bool compiled_with_iclass          :1;
     // misc
-    bool compiled_with_lcd;
+    bool compiled_with_lcd             :1;
 
     // rdv4
-    bool hw_available_flash;
-    bool hw_available_smartcard;
+    bool hw_available_flash            :1;
+    bool hw_available_smartcard        :1;
 } PACKED capabilities_t;
 
 extern capabilities_t pm3_capabilities;

From df2203d9c3c5eb52c96ed939f03a4b5f402e05fa Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 8 May 2019 00:58:36 +0200
Subject: [PATCH 1663/1938] hw command text

---
 client/cmdhw.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/cmdhw.c b/client/cmdhw.c
index 51ae266fc..45bb40771 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -51,10 +51,10 @@ static int usage_hw_setmux(void) {
 static int usage_hw_connect(void) {
     PrintAndLogEx(NORMAL, "Connects to a Proxmark3 device via specified serial port");
     PrintAndLogEx(NORMAL, "");
-    PrintAndLogEx(NORMAL, "Usage:  hw connect [h] <port>");
+    PrintAndLogEx(NORMAL, "Usage:  hw connect [h] [<port>]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "           h          This help");
-    PrintAndLogEx(NORMAL, "           <port>   serial port to connect to");
+    PrintAndLogEx(NORMAL, "           <port>     Serial port to connect to, else retry the last used one");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "      hw connect "SERIAL_PORT_EXAMPLE_H);

From c867b3bc9a67a674dcc1ff9e8fa3205e7ce1f168 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 8 May 2019 01:24:46 +0200
Subject: [PATCH 1664/1938] Add cmd: usart btpin to change add-on BT PIN

---
 client/cmdparser.c |  9 +++++
 client/cmdparser.h |  1 +
 client/cmdusart.c  | 91 ++++++++++++++++++++++++++++++++++++++++++----
 3 files changed, 94 insertions(+), 7 deletions(-)

diff --git a/client/cmdparser.c b/client/cmdparser.c
index 5a40538e7..077ba8ac5 100644
--- a/client/cmdparser.c
+++ b/client/cmdparser.c
@@ -55,6 +55,15 @@ bool IfPm3FpcUsartHost(void) {
     return pm3_capabilities.compiled_with_fpc_usart_host;
 }
 
+bool IfPm3FpcUsartHostFromUsb(void) {
+    // true if FPC USART Host support and if talking from USB-CDC interface
+    if (!IfPm3Present())
+        return false;
+    if (!pm3_capabilities.compiled_with_fpc_usart_host)
+        return false;
+    return !conn.send_via_fpc_usart;
+}
+
 bool IfPm3FpcUsartDevFromUsb(void) {
     // true if FPC USART developer support and if talking from USB-CDC interface
     if (!IfPm3Present())
diff --git a/client/cmdparser.h b/client/cmdparser.h
index 8f58abeb8..c5aa5460e 100644
--- a/client/cmdparser.h
+++ b/client/cmdparser.h
@@ -26,6 +26,7 @@ bool IfPm3Flash(void);
 bool IfPm3Smartcard(void);
 bool IfPm3FpcUsart(void);
 bool IfPm3FpcUsartHost(void);
+bool IfPm3FpcUsartHostFromUsb(void);
 bool IfPm3FpcUsartDevFromUsb(void);
 bool IfPm3Lf(void);
 bool IfPm3Hitag(void);
diff --git a/client/cmdusart.c b/client/cmdusart.c
index 8a328e2cb..309ca3cf1 100644
--- a/client/cmdusart.c
+++ b/client/cmdusart.c
@@ -11,6 +11,24 @@
 
 static int CmdHelp(const char *Cmd);
 
+static int usage_usart_bt_pin(void) {
+    PrintAndLogEx(NORMAL, "Change BT add-on PIN");
+    PrintAndLogEx(NORMAL, "WARNING: this requires");
+    PrintAndLogEx(NORMAL, "      1) BTpower to be turned ON");
+    PrintAndLogEx(NORMAL, "      2) BT add-on to NOT be connected");
+    PrintAndLogEx(NORMAL, "      => the blue LED must blink");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  usart btpin [h] d NNNN");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "           h          This help");
+    PrintAndLogEx(NORMAL, "           d NNNN     Desired PIN");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Example:");
+    PrintAndLogEx(NORMAL, "      usart btpin 1234");
+    PrintAndLogEx(NORMAL, "expected output: nothing");
+    return PM3_SUCCESS;
+}
+
 static int usage_usart_tx(void) {
     PrintAndLogEx(NORMAL, "Send string over USART");
     PrintAndLogEx(NORMAL, "WARNING: it will have side-effects if used in USART HOST mode!");
@@ -133,6 +151,64 @@ static int usart_txrx(uint8_t *srcdata, size_t srclen, uint8_t *dstdata, size_t
     return resp.status;
 }
 
+static int CmdUsartBtPin(const char *Cmd) {
+    uint8_t cmdp = 0;
+    bool errors = false;
+    char pin[5] = {0};
+
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+            case 'h':
+                return usage_usart_bt_pin();
+            case 'd':
+                if (param_getstr(Cmd, cmdp + 1, pin, sizeof(pin)) != sizeof(pin)-1) {
+                    PrintAndLogEx(FAILED, "PIN has wrong length, must be 4 digits");
+                    errors = true;
+                    break;
+                }
+                for (size_t i = 0; i < sizeof(pin) - 1; i++) {
+                    if ((pin[i] < '0') || (pin[i] > '9')) {
+                        PrintAndLogEx(FAILED, "PIN has wrong char \"%c\", must be 4 digits", pin[i]);
+                        errors = true;
+                        break;
+                    }
+                }
+                cmdp += 2;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                errors = true;
+                break;
+        }
+    }
+    //Validations
+    if (errors || cmdp == 0) {
+        usage_usart_bt_pin();
+        return PM3_EINVARG;
+    }
+    char string[6 + sizeof(pin)] = {0};
+    sprintf(string, "AT+PIN%s", pin);
+    uint8_t data[PM3_CMD_DATA_SIZE] = {0x00};
+    size_t len = 0;
+//    PrintAndLogEx(NORMAL, "TX (%3u):%.*s", strlen(string), strlen(string), string);
+    int ret = usart_txrx((uint8_t *)string, strlen(string), data, &len, 600);
+    if (ret == PM3_ENODATA) {
+        PrintAndLogEx(FAILED, "No response from add-on, is it ON and blinking?");
+        return ret;
+    }
+    if (ret != PM3_SUCCESS) {
+        PrintAndLogEx(FAILED, "Command failed, ret=%i", ret);
+        return ret;
+    }
+//    PrintAndLogEx(NORMAL, "RX (%3u):%.*s", len, len, data);
+    if (strcmp((char*)data, "OKsetPIN") == 0) {
+        PrintAndLogEx(NORMAL, "PIN changed " _GREEN_("successfully"));
+    } else {
+        PrintAndLogEx(WARNING, "Unexpected answer: %.*s", len, data);
+    }
+    return PM3_SUCCESS;
+}
+
 static int CmdUsartTX(const char *Cmd) {
     uint8_t cmdp = 0;
     bool errors = false;
@@ -352,13 +428,14 @@ static int CmdUsartRXhex(const char *Cmd) {
 }
 
 static command_t CommandTable[] = {
-    {"help",         CmdHelp,            AlwaysAvailable,         "This help"},
-    {"tx",           CmdUsartTX,         IfPm3FpcUsartDevFromUsb, "Send string over USART"},
-    {"rx",           CmdUsartRX,         IfPm3FpcUsartDevFromUsb, "Receive string over USART"},
-    {"txrx",         CmdUsartTXRX,       IfPm3FpcUsartDevFromUsb, "Send string over USART and wait for response"},
-    {"txhex",        CmdUsartTXhex,      IfPm3FpcUsartDevFromUsb, "Send bytes over USART"},
-    {"rxhex",        CmdUsartRXhex,      IfPm3FpcUsartDevFromUsb, "Receive bytes over USART"},
-//    {"bridge",       CmdUsartBridge,     IfPm3FpcUsartDevFromUsb, "Bridge USB-CDC & USART"},
+    {"help",         CmdHelp,            AlwaysAvailable,          "This help"},
+    {"btpin",        CmdUsartBtPin,      IfPm3FpcUsartHostFromUsb, "Change BT add-on PIN"},
+    {"tx",           CmdUsartTX,         IfPm3FpcUsartDevFromUsb,  "Send string over USART"},
+    {"rx",           CmdUsartRX,         IfPm3FpcUsartDevFromUsb,  "Receive string over USART"},
+    {"txrx",         CmdUsartTXRX,       IfPm3FpcUsartDevFromUsb,  "Send string over USART and wait for response"},
+    {"txhex",        CmdUsartTXhex,      IfPm3FpcUsartDevFromUsb,  "Send bytes over USART"},
+    {"rxhex",        CmdUsartRXhex,      IfPm3FpcUsartDevFromUsb,  "Receive bytes over USART"},
+//    {"bridge",       CmdUsartBridge,     IfPm3FpcUsartDevFromUsb,  "Bridge USB-CDC & USART"},
     {NULL, NULL, NULL, NULL}
 };
 

From f49d7e6d3984a645db8e167b537b25141f0d072c Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 8 May 2019 01:32:32 +0200
Subject: [PATCH 1665/1938] remove SendCommand

---
 client/comms.c     | 29 ++++++++++++-----------------
 client/comms.h     |  1 -
 client/scripting.c | 21 ---------------------
 3 files changed, 12 insertions(+), 39 deletions(-)

diff --git a/client/comms.c b/client/comms.c
index 1fb59757b..a1609eac3 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -57,15 +57,22 @@ static uint64_t timeout_start_time;
 
 static bool dl_it(uint8_t *dest, uint32_t bytes, uint32_t start_index, PacketResponseNG *response, size_t ms_timeout, bool show_warning, uint32_t rec_cmd);
 
-void SendCommand(PacketCommandOLD *c) {
+void SendCommandOLD(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len) {
+    PacketCommandOLD c = {CMD_UNKNOWN, {0, 0, 0}, {{0}}};
+    c.cmd = cmd;
+    c.arg[0] = arg0;
+    c.arg[1] = arg1;
+    c.arg[2] = arg2;
+    if (len && data)
+        memcpy(&c.d, data, len);
 
 #ifdef COMMS_DEBUG
     PrintAndLogEx(NORMAL, "Sending %s", "OLD");
 #endif
 #ifdef COMMS_DEBUG_RAW
-    print_hex_break((uint8_t *)&c->cmd, sizeof(c->cmd), 32);
-    print_hex_break((uint8_t *)&c->arg, sizeof(c->arg), 32);
-    print_hex_break((uint8_t *)&c->d, sizeof(c->d), 32);
+    print_hex_break((uint8_t *)&c.cmd, sizeof(c.cmd), 32);
+    print_hex_break((uint8_t *)&c.arg, sizeof(c.arg), 32);
+    print_hex_break((uint8_t *)&c.d, sizeof(c.d), 32);
 #endif
 
     if (!session.pm3_present) {
@@ -83,7 +90,7 @@ void SendCommand(PacketCommandOLD *c) {
         pthread_cond_wait(&txBufferSig, &txBufferMutex);
     }
 
-    txBuffer = *c;
+    txBuffer = c;
     txBuffer_pending = true;
 
     // tell communication thread that a new command can be send
@@ -94,18 +101,6 @@ void SendCommand(PacketCommandOLD *c) {
 //__atomic_test_and_set(&txcmd_pending, __ATOMIC_SEQ_CST);
 }
 
-// Let's move slowly to an API closer to SendCommandNG
-void SendCommandOLD(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len) {
-    PacketCommandOLD c = {CMD_UNKNOWN, {0, 0, 0}, {{0}}};
-    c.cmd = cmd;
-    c.arg[0] = arg0;
-    c.arg[1] = arg1;
-    c.arg[2] = arg2;
-    if (len && data)
-        memcpy(&c.d, data, len);
-    SendCommand(&c);
-}
-
 static void SendCommandNG_internal(uint16_t cmd, uint8_t *data, size_t len, bool ng) {
 #ifdef COMMS_DEBUG
     PrintAndLogEx(NORMAL, "Sending %s", ng ? "NG" : "MIX");
diff --git a/client/comms.h b/client/comms.h
index 547a46af6..6505e23d7 100644
--- a/client/comms.h
+++ b/client/comms.h
@@ -56,7 +56,6 @@ typedef struct {
 extern communication_arg_t conn;
 
 void *uart_receiver(void *targ);
-void SendCommand(PacketCommandOLD *c);
 void SendCommandOLD(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
 void SendCommandNG(uint16_t cmd, uint8_t *data, size_t len);
 void SendCommandMIX(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
diff --git a/client/scripting.c b/client/scripting.c
index 91fc5b427..87de2c088 100644
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -54,26 +54,6 @@ static int l_fast_push_mode(lua_State *L) {
     return 1;
 }
 
-/**
- * The following params expected:
- *  UsbCommand c
- *@brief l_SendCommand
- * @param L
- * @return
- */
-static int l_SendCommand(lua_State *L) {
-    size_t size;
-    const char *data = luaL_checklstring(L, 1, &size);
-    if (size != sizeof(PacketCommandOLD)) {
-        printf("Got data size %d, expected %d", (int) size, (int) sizeof(PacketCommandOLD));
-        lua_pushstring(L, "Wrong data size");
-        return 1;
-    }
-
-    SendCommand((PacketCommandOLD *)data);
-    return 0;
-}
-
 /**
  * The following params expected:
  * @brief l_SendCommandOLD
@@ -1042,7 +1022,6 @@ static int setLuaPath(lua_State *L, const char *path) {
 
 int set_pm3_libraries(lua_State *L) {
     static const luaL_Reg libs[] = {
-        {"SendCommand",                 l_SendCommand},
         {"SendCommandOLD",              l_SendCommandOLD},
         {"SendCommandMIX",              l_SendCommandMIX},
         {"SendCommandNG",               l_SendCommandNG},

From 68e5b3c3558dde9fdb01ffcb0c9bbc86968566a1 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 8 May 2019 01:35:51 +0200
Subject: [PATCH 1666/1938] style

---
 armsrc/appmain.c               |  8 ++++----
 client/cmdflashmem.c           |  6 +++---
 client/cmdhw.c                 | 28 +++++++++++++-------------
 client/cmdusart.c              |  4 ++--
 client/comms.c                 | 32 +++++++++++++++---------------
 client/lualibs/read14b.lua     |  4 ++--
 client/lualibs/read15.lua      |  2 +-
 client/proxmark3.c             | 14 ++++++-------
 client/scripts/14araw.lua      |  8 ++++----
 client/scripts/Legic_clone.lua |  6 +++---
 client/scripts/calc_ev1_it.lua |  2 +-
 client/scripts/calc_mizip.lua  |  2 +-
 client/scripts/calypso.lua     |  4 ++--
 client/scripts/didump.lua      | 10 +++++-----
 client/scripts/lf_bulk.lua     |  2 +-
 client/scripts/mifareplus.lua  |  4 ++--
 client/scripts/ufodump.lua     |  4 ++--
 common/cmd.c                   | 20 +++++++++----------
 include/pm3_cmd.h              | 36 +++++++++++++++++-----------------
 uart/uart_posix.c              |  2 +-
 uart/uart_win32.c              | 14 ++++++-------
 21 files changed, 106 insertions(+), 106 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index e19816743..d1da448db 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1189,7 +1189,7 @@ static void PacketReceived(PacketCommandNG *packet) {
             LED_B_ON();
             uint8_t *dest = BigBuf_malloc(USART_FIFOLEN);
             uint16_t available = usart_rxdata_available();
-            
+
             if (available > 0) {
                 uint16_t len = usart_read_ng(dest, available);
                 reply_ng(CMD_USART_RX, PM3_SUCCESS, dest, len);
@@ -1212,7 +1212,7 @@ static void PacketReceived(PacketCommandNG *packet) {
             WaitMS(payload->waittime);
 
             uint8_t *dest = BigBuf_malloc(USART_FIFOLEN);
-            
+
             available = usart_rxdata_available();
             // Dbprintf("avail (%u)",  available);
             if (available > 0) {
@@ -1635,8 +1635,8 @@ void  __attribute__((noreturn)) AppMain(void) {
         if (ret == PM3_SUCCESS) {
             PacketReceived(&rx);
         } else if (ret != PM3_ENODATA) {
-            
-            Dbprintf("Error in frame reception: %d %s", ret, (ret == PM3_EIO)?"PM3_EIO":"");
+
+            Dbprintf("Error in frame reception: %d %s", ret, (ret == PM3_EIO) ? "PM3_EIO" : "");
             // TODO if error, shall we resync ?
         }
 
diff --git a/client/cmdflashmem.c b/client/cmdflashmem.c
index ebc78994e..a259a3e40 100644
--- a/client/cmdflashmem.c
+++ b/client/cmdflashmem.c
@@ -151,7 +151,7 @@ static int CmdFlashmemSpiBaudrate(const char *Cmd) {
     if (strlen(Cmd) < 1 || ctmp == 'h') {
         return usage_flashmem_spibaud();
     }
-    
+
     uint32_t baudrate = param_get32ex(Cmd, 0, 0, 10);
     baudrate = baudrate * 1000000;
     if (baudrate != FLASH_BAUD && baudrate != FLASH_MINBAUD) {
@@ -279,7 +279,7 @@ static int CmdFlashMemLoad(const char *Cmd) {
 
     // fast push mode
     conn.block_after_ACK = true;
-    
+
     while (bytes_remaining > 0) {
         uint32_t bytes_in_packet = MIN(FLASH_MEM_BLOCK_SIZE, bytes_remaining);
 
@@ -300,7 +300,7 @@ static int CmdFlashMemLoad(const char *Cmd) {
 
         uint8_t isok  = resp.oldarg[0] & 0xFF;
         if (!isok) {
-            conn.block_after_ACK = false;            
+            conn.block_after_ACK = false;
             PrintAndLogEx(FAILED, "Flash write fail [offset %u]", bytes_sent);
             return PM3_EFLASH;
         }
diff --git a/client/cmdhw.c b/client/cmdhw.c
index 45bb40771..b9b2f047e 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -429,7 +429,7 @@ static int CmdSetMux(const char *Cmd) {
     }
 
     str_lower((char *)Cmd);
- 
+
     uint8_t arg = 0;
     if (strcmp(Cmd, "lopkd") == 0)      arg = 0;
     else if (strcmp(Cmd, "loraw") == 0) arg = 1;
@@ -438,7 +438,7 @@ static int CmdSetMux(const char *Cmd) {
     else {
         usage_hw_setmux();
         return PM3_EINVARG;
-        }
+    }
     clearCommandBuffer();
     SendCommandMIX(CMD_SET_ADC_MUX, arg, 0, 0, NULL, 0);
     return PM3_SUCCESS;
@@ -483,9 +483,9 @@ static int CmdPing(const char *Cmd) {
         bool error = false;
         if (len) {
             error = memcmp(data, resp.data.asBytes, len) != 0;
-            PrintAndLogEx((error)? ERR:SUCCESS, "Ping response " _GREEN_("received") "and content is %s", error ? _RED_("NOT ok") : _GREEN_("ok"));
+            PrintAndLogEx((error) ? ERR : SUCCESS, "Ping response " _GREEN_("received") "and content is %s", error ? _RED_("NOT ok") : _GREEN_("ok"));
         } else {
-            PrintAndLogEx((error)? ERR:SUCCESS, "Ping response " _GREEN_("received"));
+            PrintAndLogEx((error) ? ERR : SUCCESS, "Ping response " _GREEN_("received"));
         }
     } else
         PrintAndLogEx(WARNING, "Ping response " _RED_("timeout"));
@@ -498,11 +498,11 @@ static int CmdConnect(const char *Cmd) {
         return usage_hw_connect();
 
     char *port = NULL;
-    
+
     // default back to previous used serial port
-    if (strlen(Cmd) == 0 ) {
+    if (strlen(Cmd) == 0) {
         int len = strlen((char *)conn.serial_port_name);
-        if ( len == 0 ) {
+        if (len == 0) {
             return usage_hw_connect();
         }
         port = (char *)conn.serial_port_name;
@@ -510,10 +510,10 @@ static int CmdConnect(const char *Cmd) {
         port = (char *)Cmd;
     }
 
-    if ( port == NULL )
+    if (port == NULL)
         return usage_hw_connect();
 
-    if ( session.pm3_present ) {
+    if (session.pm3_present) {
         CloseProxmark();
     }
 
@@ -558,12 +558,12 @@ int CmdHW(const char *Cmd) {
 void pm3_version(bool verbose) {
     if (!verbose)
         return;
-    
+
     PacketResponseNG resp;
     clearCommandBuffer();
-    
+
     SendCommandNG(CMD_VERSION, NULL, 0);
-    
+
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {
         PrintAndLogEx(NORMAL, "\n" _BLUE_(" [ Proxmark3 RFID instrument ]") "\n");
         PrintAndLogEx(NORMAL, "\n [ CLIENT ]");
@@ -573,10 +573,10 @@ void pm3_version(bool verbose) {
         PrintAndLogEx(NORMAL, "  smartcard reader:                %s", IfPm3Smartcard() ? _GREEN_("present") : _YELLOW_("absent"));
         PrintAndLogEx(NORMAL, "\n [ PROXMARK RDV4 Extras ]");
         PrintAndLogEx(NORMAL, "  FPC USART for BT add-on support: %s", IfPm3FpcUsartHost() ? _GREEN_("present") : _YELLOW_("absent"));
-        
+
         if (IfPm3FpcUsartDevFromUsb())
             PrintAndLogEx(NORMAL, "  FPC USART for developer support: %s", _GREEN_("present"));
-        
+
         PrintAndLogEx(NORMAL, "");
         PrintAndLogEx(NORMAL, (char *)resp.data.asBytes);
         lookupChipID(resp.oldarg[0], resp.oldarg[1]);
diff --git a/client/cmdusart.c b/client/cmdusart.c
index 309ca3cf1..17738b5a7 100644
--- a/client/cmdusart.c
+++ b/client/cmdusart.c
@@ -161,7 +161,7 @@ static int CmdUsartBtPin(const char *Cmd) {
             case 'h':
                 return usage_usart_bt_pin();
             case 'd':
-                if (param_getstr(Cmd, cmdp + 1, pin, sizeof(pin)) != sizeof(pin)-1) {
+                if (param_getstr(Cmd, cmdp + 1, pin, sizeof(pin)) != sizeof(pin) - 1) {
                     PrintAndLogEx(FAILED, "PIN has wrong length, must be 4 digits");
                     errors = true;
                     break;
@@ -201,7 +201,7 @@ static int CmdUsartBtPin(const char *Cmd) {
         return ret;
     }
 //    PrintAndLogEx(NORMAL, "RX (%3u):%.*s", len, len, data);
-    if (strcmp((char*)data, "OKsetPIN") == 0) {
+    if (strcmp((char *)data, "OKsetPIN") == 0) {
         PrintAndLogEx(NORMAL, "PIN changed " _GREEN_("successfully"));
     } else {
         PrintAndLogEx(WARNING, "Unexpected answer: %.*s", len, data);
diff --git a/client/comms.c b/client/comms.c
index a1609eac3..11e8b25dc 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -302,7 +302,7 @@ static void PacketResponseReceived(PacketResponseNG *packet) {
 
 // The communications thread.
 // signals to main thread when a response is ready to process.
-// 
+//
 static void
 #ifdef __has_attribute
 #if __has_attribute(force_align_arg_pointer)
@@ -329,14 +329,14 @@ __attribute__((force_align_arg_pointer))
 
         // Signal to main thread that communications seems off.
         // main thread will kill and restart this thread.
-        if ( commfailed ) {
+        if (commfailed) {
             PrintAndLogEx(WARNING, "Communicating with Proxmark3 device " _RED_("failed"));
             __atomic_test_and_set(&comm_thread_dead, __ATOMIC_SEQ_CST);
             break;
         }
 
         pthread_mutex_lock(&spMutex);
-        
+
         res = uart_receive(sp, (uint8_t *)&rx_raw.pre, sizeof(PacketResponseNGPreamble), &rxlen);
         if ((res == PM3_SUCCESS) && (rxlen == sizeof(PacketResponseNGPreamble))) {
             rx.magic = rx_raw.pre.magic;
@@ -350,9 +350,9 @@ __attribute__((force_align_arg_pointer))
                     error = true;
                 }
                 if ((!error) && (length > 0)) { // Get the variable length payload
-                
+
                     res = uart_receive(sp, (uint8_t *)&rx_raw.data, length, &rxlen);
-                    if ( (res != PM3_SUCCESS) || (rxlen != length)) {
+                    if ((res != PM3_SUCCESS) || (rxlen != length)) {
                         PrintAndLogEx(WARNING, "Received packet frame error variable part too short? %d/%d", rxlen, length);
                         error = true;
                     } else {
@@ -415,7 +415,7 @@ __attribute__((force_align_arg_pointer))
             } else {                               // Old style reply
                 PacketResponseOLD rx_old;
                 memcpy(&rx_old, &rx_raw.pre, sizeof(PacketResponseNGPreamble));
-                
+
                 res = uart_receive(sp, ((uint8_t *)&rx_old) + sizeof(PacketResponseNGPreamble), sizeof(PacketResponseOLD) - sizeof(PacketResponseNGPreamble), &rxlen);
                 if ((res != PM3_SUCCESS) || (rxlen != sizeof(PacketResponseOLD) - sizeof(PacketResponseNGPreamble))) {
                     PrintAndLogEx(WARNING, "Received packet OLD frame payload error too short? %d/%d", rxlen, sizeof(PacketResponseOLD) - sizeof(PacketResponseNGPreamble));
@@ -495,9 +495,9 @@ __attribute__((force_align_arg_pointer))
             pthread_mutex_unlock(&spMutex);
 
             txBuffer_pending = false;
-            
+
             // main thread doesn't know send failed...
-            
+
             // tell main thread that txBuffer is empty
             pthread_cond_signal(&txBufferSig);
         }
@@ -512,7 +512,7 @@ __attribute__((force_align_arg_pointer))
 #if defined(__MACH__) && defined(__APPLE__)
     enableAppNap();
 #endif
-   
+
     pthread_exit(NULL);
     return NULL;
 }
@@ -551,8 +551,8 @@ bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode,
         return false;
     } else {
         // start the communication thread
-        if ( portname != (char*)conn.serial_port_name) {
-            uint16_t len = MIN( strlen(portname), FILE_PATH_SIZE - 1);
+        if (portname != (char *)conn.serial_port_name) {
+            uint16_t len = MIN(strlen(portname), FILE_PATH_SIZE - 1);
             memset(conn.serial_port_name, 0, FILE_PATH_SIZE);
             memcpy(conn.serial_port_name, portname, len);
         }
@@ -582,20 +582,20 @@ int TestProxmark(void) {
     uint8_t data[len];
     for (uint16_t i = 0; i < len; i++)
         data[i] = i & 0xFF;
-    
+
     SendCommandNG(CMD_PING, data, len);
 
     uint32_t timeout = 1000;
-    
+
 #ifdef USART_SLOW_LINK
     timeout = 10000;
     // 10s timeout for slow FPC, e.g. over BT
     // as this is the very first command sent to the pm3
-    // that initiates the BT connection    
+    // that initiates the BT connection
 #endif
 
     if (WaitForResponseTimeoutW(CMD_PING, &resp, timeout, false)) {
-        
+
         bool error = false;
         if (len)
             error = memcmp(data, resp.data.asBytes, len) != 0;
@@ -652,7 +652,7 @@ void CloseProxmark(void) {
     // Clean up our state
     sp = NULL;
     memset(&communication_thread, 0, sizeof(pthread_t));
-    
+
     session.pm3_present = false;
 }
 
diff --git a/client/lualibs/read14b.lua b/client/lualibs/read14b.lua
index 8d28408f1..3102acb04 100644
--- a/client/lualibs/read14b.lua
+++ b/client/lualibs/read14b.lua
@@ -45,7 +45,7 @@ local function parse1443b(data)
 
     local count, uid, uidlen, atqb, chipid, cid = bin.unpack('H10CH7CC',data)
     uid = uid:sub(1, 2 * uidlen)
-    return { 
+    return {
         uid = uid,
         uidlen = uidlen,
         atqb = atqb,
@@ -73,7 +73,7 @@ local function read14443b(disconnect)
             cmd = cmds.CMD_ISO_14443B_COMMAND,
             arg1 = flags
             }
-    
+
     local result, err = command:sendMIX()
     if result then
         local count,cmd,arg0,arg1,arg2 = bin.unpack('LLLL',result)
diff --git a/client/lualibs/read15.lua b/client/lualibs/read15.lua
index e045cccad..88cce5484 100644
--- a/client/lualibs/read15.lua
+++ b/client/lualibs/read15.lua
@@ -120,7 +120,7 @@ local function read15693(slow, dont_readresponse)
     else
         err = 'No response from card'
     end
-    
+
     if err then
         print(err)
         return nil, err
diff --git a/client/proxmark3.c b/client/proxmark3.c
index 9a90c2b8f..cd215b66a 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -54,10 +54,10 @@ static void showBanner(void) {
 
 int check_comm(void) {
     // If communications thread goes down. Device disconnected then this should hook up PM3 again.
-    if ( IsCommunicationThreadDead() && session.pm3_present) {
+    if (IsCommunicationThreadDead() && session.pm3_present) {
         rl_set_prompt("[offline] "PROXPROMPT);
-        rl_forced_update_display (); 
-        CloseProxmark();     
+        rl_forced_update_display();
+        CloseProxmark();
         PrintAndLogEx(INFO, "Running in " _YELLOW_("OFFLINE") "mode. Use \"hw connect\" to reconnect\n");
     }
     return 0;
@@ -159,11 +159,11 @@ main_loop(char *script_cmds_file, char *script_cmd) {
 
                 } else {
                     rl_event_hook = check_comm;
-                    if (session.pm3_present )
+                    if (session.pm3_present)
                         cmd = readline(PROXPROMPT);
                     else
                         cmd = readline("[offline] "PROXPROMPT);
-                    
+
                     fflush(NULL);
                 }
             }
@@ -188,9 +188,9 @@ main_loop(char *script_cmds_file, char *script_cmd) {
             if (cmd[0] != '\0') {
                 if (printprompt)
                     PrintAndLogEx(NORMAL, PROXPROMPT"%s", cmd);
-                
+
                 int ret = CommandReceived(cmd);
-                
+
                 HIST_ENTRY *entry = history_get(history_length);
                 if ((!entry) || (strcmp(entry->line, cmd) != 0))
                     add_history(cmd);
diff --git a/client/scripts/14araw.lua b/client/scripts/14araw.lua
index 776ff754e..3bc5c060e 100644
--- a/client/scripts/14araw.lua
+++ b/client/scripts/14araw.lua
@@ -11,17 +11,17 @@ This is a script to allow raw 1444a commands to be sent and received.
 example = [[
     # 1. Connect and don't disconnect
     script run 14araw -p
-    
+
     # 2. Send mf auth, read response (nonce)
     script run 14araw -o -x 6000F57b -p
-    
+
     # 3. disconnect
     script run 14araw -o
 
     # All three steps in one go:
     script run 14araw -x 6000F57b
 ]]
-usage = [[ 
+usage = [[
 script run 14araw -x 6000F57b
 
 Arguments:
@@ -124,7 +124,7 @@ function main(args)
     -- The actual raw payload, if any
     if payload then
         res, err = sendRaw(payload,{ignore_response = ignore_response, topaz_mode = topaz_mode, append_crc = append_crc})
-        if err then 
+        if err then
             lib14a.disconnect()
             return oops(err)
         end
diff --git a/client/scripts/Legic_clone.lua b/client/scripts/Legic_clone.lua
index 9a8df9c1d..4313102b0 100644
--- a/client/scripts/Legic_clone.lua
+++ b/client/scripts/Legic_clone.lua
@@ -118,10 +118,10 @@ local bxor = bit32.bxor
 
 -- we need always 2 digits
 local function prepend_zero(s)
-    if (string.len(s) == 1) then 
+    if (string.len(s) == 1) then
         return '0' .. s
     else
-        if (string.len(s) == 0) then 
+        if (string.len(s) == 0) then
             return '00'
         else
             return s
@@ -360,7 +360,7 @@ function displaySegments(bytes)
             pld = pld..bytes[(start+4+1+Seg[5]+Seg[6]+i)-1]..' '
         end
         print(pld)
-        if (KGH) then 
+        if (KGH) then
             print("'Kaba Group Header' detected")
         end
         start = start+Seg[4]
diff --git a/client/scripts/calc_ev1_it.lua b/client/scripts/calc_ev1_it.lua
index 89e778023..c5cc5d110 100644
--- a/client/scripts/calc_ev1_it.lua
+++ b/client/scripts/calc_ev1_it.lua
@@ -57,7 +57,7 @@ local function help()
     print(desc)
     print("Example usage")
     print(example)
-    print(usage)    
+    print(usage)
 end
 --
 -- Exit message
diff --git a/client/scripts/calc_mizip.lua b/client/scripts/calc_mizip.lua
index 4ca7cb496..f0c76bc57 100644
--- a/client/scripts/calc_mizip.lua
+++ b/client/scripts/calc_mizip.lua
@@ -64,7 +64,7 @@ local function help()
     print(desc)
     print("Example usage")
     print(example)
-    print(usage)    
+    print(usage)
 end
 --
 -- Exit message
diff --git a/client/scripts/calypso.lua b/client/scripts/calypso.lua
index a5e35b82a..696f08e8b 100644
--- a/client/scripts/calypso.lua
+++ b/client/scripts/calypso.lua
@@ -118,7 +118,7 @@ local function calypso_send_cmd_raw(data, ignoreresponse )
             arg1 = flags,
             arg2 = #data/2, -- LEN of data, half the length of the ASCII-string hex string
             data = data}    -- data bytes (commands etc)
-            
+
     result, err = command:sendMIX(ignoreresponse)
     if result then
         local r = calypso_parse(result)
@@ -212,7 +212,7 @@ function main(args)
     end
 
     lib14b.connect()
-    
+
     -- Select 14b tag.
     card, err = lib14b.waitFor14443b()
     if not card then return oops(err) end
diff --git a/client/scripts/didump.lua b/client/scripts/didump.lua
index a3601102c..9f3f51d71 100644
--- a/client/scripts/didump.lua
+++ b/client/scripts/didump.lua
@@ -16,13 +16,13 @@ The dump is decrypted. If a raw dump is wanted, use the -r parameter
 ]]
 example = [[
     script run didump
-    
+
     -- selftest
     script run didump -t
-    
+
     -- Generate raw dump,  into json.
     script run didump -r
-    
+
     -- load file
     script run didump -i dumpdata.json
 ]]
@@ -37,7 +37,7 @@ Arguments:
       e                 encrypt data
       v                 validate data
       i dumpdata.json   load json dump file
-    end      
+    end
 ]]
 
 -- Some shortcuts
@@ -589,7 +589,7 @@ function main(args)
 
     -- GET TAG UID
     tag, err = lib14a.read(false, true)
-    if err then 
+    if err then
         lib14a.disconnect()
         return oops(err)
     end
diff --git a/client/scripts/lf_bulk.lua b/client/scripts/lf_bulk.lua
index d93eb4bfb..5e8562ae7 100644
--- a/client/scripts/lf_bulk.lua
+++ b/client/scripts/lf_bulk.lua
@@ -58,7 +58,7 @@ local function help()
     print(desc)
     print('Example usage')
     print(example)
-    print(usage)    
+    print(usage)
 end
 ---
 -- Exit message
diff --git a/client/scripts/mifareplus.lua b/client/scripts/mifareplus.lua
index 88c830b92..02e1e6c76 100644
--- a/client/scripts/mifareplus.lua
+++ b/client/scripts/mifareplus.lua
@@ -311,14 +311,14 @@ function main(args)
     -- Initialize the card using the already-present read14a library
     -- Perform RATS and PPS (Protocol and Parameter Selection) check to finish the ISO 14443-4 protocol.
     info,err = lib14a.read(true, false)
-    if not info then 
+    if not info then
         lib14a.disconnect()
         return oops(err)
     end
 
     --
     response = sendRaw("D01100", true, true)
-    if not response then 
+    if not response then
         lib14a.disconnect()
         return oops("No response from PPS check")
     end
diff --git a/client/scripts/ufodump.lua b/client/scripts/ufodump.lua
index 12f7cb9b2..0f6a51a76 100644
--- a/client/scripts/ufodump.lua
+++ b/client/scripts/ufodump.lua
@@ -121,7 +121,7 @@ function main(args)
 
     -- First of all, connect
     info, err = lib14a.read(true, true)
-    if err then 
+    if err then
         lib14a.disconnect()
         return oops(err)
     end
@@ -137,7 +137,7 @@ function main(args)
     for block = 00, endblock do
         local cmd = string.format('10%02x00', block)
         res, err = sendRaw(cmd , {ignore_response = ignore_response})
-        if err then 
+        if err then
             lib14a.disconnect()
             return oops(err)
         end
diff --git a/common/cmd.c b/common/cmd.c
index 8a26f56e0..b7abf16ee 100644
--- a/common/cmd.c
+++ b/common/cmd.c
@@ -146,34 +146,34 @@ int reply_mix(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *d
     memcpy(cmddata, arg, sizeof(arg));
     if (len && data)
         memcpy(cmddata + sizeof(arg), data, len);
-    
+
     return reply_ng_internal(cmd, status, cmddata, len + sizeof(arg), false);
 }
 
 static int receive_ng_internal(PacketCommandNG *rx, uint32_t read_ng(uint8_t *data, size_t len), bool fpc) {
     PacketCommandNGRaw rx_raw;
     size_t bytes = read_ng((uint8_t *)&rx_raw.pre, sizeof(PacketCommandNGPreamble));
-    
+
     if (bytes == 0)
         return PM3_ENODATA;
-    
+
     if (bytes != sizeof(PacketCommandNGPreamble))
         return PM3_EIO;
-    
+
     rx->magic = rx_raw.pre.magic;
     rx->ng = rx_raw.pre.ng;
     uint16_t length = rx_raw.pre.length;
     rx->cmd = rx_raw.pre.cmd;
-    
+
     if (rx->magic == COMMANDNG_PREAMBLE_MAGIC) { // New style NG command
         if (length > PM3_CMD_DATA_SIZE)
             return PM3_EOVFLOW;
-        
+
         // Get the core and variable length payload
         bytes = read_ng((uint8_t *)&rx_raw.data, length);
         if (bytes != length)
             return PM3_EIO;
-        
+
         if (rx->ng) {
             memcpy(rx->data.asBytes, rx_raw.data, length);
             rx->length = length;
@@ -181,7 +181,7 @@ static int receive_ng_internal(PacketCommandNG *rx, uint32_t read_ng(uint8_t *da
             uint64_t arg[3];
             if (length < sizeof(arg))
                 return PM3_EIO;
-            
+
             memcpy(arg, rx_raw.data, sizeof(arg));
             rx->oldarg[0] = arg[0];
             rx->oldarg[1] = arg[1];
@@ -193,7 +193,7 @@ static int receive_ng_internal(PacketCommandNG *rx, uint32_t read_ng(uint8_t *da
         bytes = read_ng((uint8_t *)&rx_raw.foopost, sizeof(PacketCommandNGPostamble));
         if (bytes != sizeof(PacketCommandNGPostamble))
             return PM3_EIO;
-        
+
         // Check CRC, accept MAGIC as placeholder
         rx->crc = rx_raw.foopost.crc;
         if (rx->crc != COMMANDNG_POSTAMBLE_MAGIC) {
@@ -209,7 +209,7 @@ static int receive_ng_internal(PacketCommandNG *rx, uint32_t read_ng(uint8_t *da
         bytes = read_ng(((uint8_t *)&rx_old) + sizeof(PacketCommandNGPreamble), sizeof(PacketCommandOLD) - sizeof(PacketCommandNGPreamble));
         if (bytes != sizeof(PacketCommandOLD) - sizeof(PacketCommandNGPreamble))
             return PM3_EIO;
-        
+
         reply_via_fpc = fpc;
         rx->ng = false;
         rx->magic = 0;
diff --git a/include/pm3_cmd.h b/include/pm3_cmd.h
index e2d9a9974..d6c06ec4f 100644
--- a/include/pm3_cmd.h
+++ b/include/pm3_cmd.h
@@ -139,30 +139,30 @@ typedef struct {
 
 typedef struct {
     uint32_t baudrate;
-    bool via_fpc                       :1;
+    bool via_fpc                       : 1;
     // rdv4
-    bool compiled_with_flash           :1;
-    bool compiled_with_smartcard       :1;
-    bool compiled_with_fpc_usart       :1;
-    bool compiled_with_fpc_usart_dev   :1;
-    bool compiled_with_fpc_usart_host  :1;
+    bool compiled_with_flash           : 1;
+    bool compiled_with_smartcard       : 1;
+    bool compiled_with_fpc_usart       : 1;
+    bool compiled_with_fpc_usart_dev   : 1;
+    bool compiled_with_fpc_usart_host  : 1;
     // lf
-    bool compiled_with_lf              :1;
-    bool compiled_with_hitag           :1;
+    bool compiled_with_lf              : 1;
+    bool compiled_with_hitag           : 1;
     // hf
-    bool compiled_with_hfsniff         :1;
-    bool compiled_with_iso14443a       :1;
-    bool compiled_with_iso14443b       :1;
-    bool compiled_with_iso15693        :1;
-    bool compiled_with_felica          :1;
-    bool compiled_with_legicrf         :1;
-    bool compiled_with_iclass          :1;
+    bool compiled_with_hfsniff         : 1;
+    bool compiled_with_iso14443a       : 1;
+    bool compiled_with_iso14443b       : 1;
+    bool compiled_with_iso15693        : 1;
+    bool compiled_with_felica          : 1;
+    bool compiled_with_legicrf         : 1;
+    bool compiled_with_iclass          : 1;
     // misc
-    bool compiled_with_lcd             :1;
+    bool compiled_with_lcd             : 1;
 
     // rdv4
-    bool hw_available_flash            :1;
-    bool hw_available_smartcard        :1;
+    bool hw_available_flash            : 1;
+    bool hw_available_smartcard        : 1;
 } PACKED capabilities_t;
 
 extern capabilities_t pm3_capabilities;
diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index 9e7ab0765..8d6cb8141 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -323,7 +323,7 @@ int uart_send(const serial_port sp, const uint8_t *pbtTx, const uint32_t len) {
         res = write(((serial_port_unix *)sp)->fd, pbtTx + pos, len - pos);
 
         // Stop if the OS has some troubles sending the data
-        if (res <= 0) 
+        if (res <= 0)
             return PM3_EIO;
 
         pos += res;
diff --git a/uart/uart_win32.c b/uart/uart_win32.c
index dffd84b93..fe25a2887 100644
--- a/uart/uart_win32.c
+++ b/uart/uart_win32.c
@@ -160,8 +160,8 @@ uint32_t uart_get_speed(const serial_port sp) {
 }
 
 int uart_receive(const serial_port sp, uint8_t *pbtRx, uint32_t pszMaxRxLen, uint32_t *pszRxLen) {
-	int res = ReadFile(((serial_port_windows *)sp)->hPort, pbtRx, pszMaxRxLen, (LPDWORD)pszRxLen, NULL); 
-    if ( res )      
+    int res = ReadFile(((serial_port_windows *)sp)->hPort, pbtRx, pszMaxRxLen, (LPDWORD)pszRxLen, NULL);
+    if (res)
         return PM3_SUCCESS;
 
     int errorcode = GetLastError();
@@ -171,22 +171,22 @@ int uart_receive(const serial_port sp, uint8_t *pbtRx, uint32_t pszMaxRxLen, uin
         return PM3_EIO;
     }
 
-    printf("[!]res %d | rx errorcode == %d \n",res, errorcode);    
-    return res; 
+    printf("[!]res %d | rx errorcode == %d \n", res, errorcode);
+    return res;
 }
 
 int uart_send(const serial_port sp, const uint8_t *p_tx, const uint32_t len) {
     DWORD txlen = 0;
     int res = WriteFile(((serial_port_windows *)sp)->hPort, p_tx, len, &txlen, NULL);
-    if ( res )      
+    if (res)
         return PM3_SUCCESS;
-    
+
     int errorcode = GetLastError();
     if (res == 0 && errorcode == 2) {
         return PM3_EIO;
     }
 
-    printf("[!!]res %d | send errorcode == %d \n",res, errorcode); 
+    printf("[!!]res %d | send errorcode == %d \n", res, errorcode);
     return PM3_ENOTTY;
 }
 

From c190ac09553334e06b096034e9a0040237f2354b Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 8 May 2019 11:14:29 +0200
Subject: [PATCH 1667/1938] Hide conn error when hw reset, as suggested by
 @iceman

---
 client/cmdhw.c | 1 +
 client/comms.c | 4 +++-
 client/flash.c | 1 -
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/client/cmdhw.c b/client/cmdhw.c
index b9b2f047e..b6bcfb5eb 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -400,6 +400,7 @@ static int CmdReset(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     clearCommandBuffer();
     SendCommandNG(CMD_HARDWARE_RESET, NULL, 0);
+    PrintAndLogEx(INFO, "Proxmark3 has been reset.");
     return PM3_SUCCESS;
 }
 
diff --git a/client/comms.c b/client/comms.c
index 11e8b25dc..e19c74dd7 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -330,7 +330,9 @@ __attribute__((force_align_arg_pointer))
         // Signal to main thread that communications seems off.
         // main thread will kill and restart this thread.
         if (commfailed) {
-            PrintAndLogEx(WARNING, "Communicating with Proxmark3 device " _RED_("failed"));
+            if (conn.last_command != CMD_HARDWARE_RESET) {
+                PrintAndLogEx(WARNING, "Communicating with Proxmark3 device " _RED_("failed"));
+            }
             __atomic_test_and_set(&comm_thread_dead, __ATOMIC_SEQ_CST);
             break;
         }
diff --git a/client/flash.c b/client/flash.c
index 943b8c8b7..d9ffe1384 100644
--- a/client/flash.c
+++ b/client/flash.c
@@ -444,7 +444,6 @@ void flash_free(flash_file_t *ctx) {
 
 // just reset the unit
 int flash_stop_flashing(void) {
-    PrintAndLogEx(SUCCESS, _BLUE_("Resetting hardware...") "Subsequent communication error is " _BLUE_("normal"));
     SendCommandOLD(CMD_HARDWARE_RESET, 0, 0, 0, NULL, 0);
     msleep(100);
     return 0;

From e93b4e3c6137959223635a93cf02d80bf7e06284 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 8 May 2019 11:17:14 +0200
Subject: [PATCH 1668/1938] Remove usb_cmd refs

---
 .gitignore                | 1 -
 client/scripts/mfkeys.lua | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 60b048377..d002b5ac1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,7 +60,6 @@ ppls patches/*
 *- Copy.*
 
 client/lualibs/mf_default_keys.lua
-client/lualibs/usb_cmd.lua
 client/lualibs/pm3_cmd.lua
 # recompiled
 fpga_version_info.c
diff --git a/client/scripts/mfkeys.lua b/client/scripts/mfkeys.lua
index f04059b67..d89eb2e44 100644
--- a/client/scripts/mfkeys.lua
+++ b/client/scripts/mfkeys.lua
@@ -29,7 +29,7 @@ Arguments:
     -p             : print keys
 ]]
 
-local PM3_SUCCESS = 0 -- needs to be refactored into own like usb_cmd
+local PM3_SUCCESS = 0 -- needs to be refactored into own like pm3_cmd
 
 local TIMEOUT = 10000 -- 10 seconds
 ---

From 4fd520c6d440c95695e95b2f49c802310127fe83 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 8 May 2019 13:31:58 +0200
Subject: [PATCH 1669/1938] Introduce SendCommandBL

---
 client/comms.c |  7 +++++++
 client/comms.h |  1 +
 client/flash.c | 14 +++++++-------
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/client/comms.c b/client/comms.c
index e19c74dd7..38b9ff812 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -57,6 +57,13 @@ static uint64_t timeout_start_time;
 
 static bool dl_it(uint8_t *dest, uint32_t bytes, uint32_t start_index, PacketResponseNG *response, size_t ms_timeout, bool show_warning, uint32_t rec_cmd);
 
+// Simple alias to track usages linked to the Bootloader, these commands must not be migrated.
+// - commands sent to enter bootloader mode as we might have to talk to old firmwares
+// - commands sent to the bootloader as it only supports OLD frames (which will always be the case for old BL)
+void SendCommandBL(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len) {
+    SendCommandOLD(cmd, arg0, arg1, arg2, data, len);
+}
+
 void SendCommandOLD(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len) {
     PacketCommandOLD c = {CMD_UNKNOWN, {0, 0, 0}, {{0}}};
     c.cmd = cmd;
diff --git a/client/comms.h b/client/comms.h
index 6505e23d7..380c763b2 100644
--- a/client/comms.h
+++ b/client/comms.h
@@ -56,6 +56,7 @@ typedef struct {
 extern communication_arg_t conn;
 
 void *uart_receiver(void *targ);
+void SendCommandBL(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
 void SendCommandOLD(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
 void SendCommandNG(uint16_t cmd, uint8_t *data, size_t len);
 void SendCommandMIX(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
diff --git a/client/flash.c b/client/flash.c
index d9ffe1384..891efaeb3 100644
--- a/client/flash.c
+++ b/client/flash.c
@@ -259,7 +259,7 @@ fail:
 
 // Get the state of the proxmark, backwards compatible
 static int get_proxmark_state(uint32_t *state) {
-    SendCommandOLD(CMD_DEVICE_INFO, 0, 0, 0, NULL, 0);
+    SendCommandBL(CMD_DEVICE_INFO, 0, 0, 0, NULL, 0);
     PacketResponseNG resp;
     WaitForResponse(CMD_UNKNOWN, &resp);  // wait for any response. No timeout.
 
@@ -304,11 +304,11 @@ static int enter_bootloader(char *serial_port_name) {
                 && (state & DEVICE_INFO_FLAG_OSIMAGE_PRESENT)) {
             // New style handover: Send CMD_START_FLASH, which will reset the board
             // and enter the bootrom on the next boot.
-            SendCommandOLD(CMD_START_FLASH, 0, 0, 0, NULL, 0);
+            SendCommandBL(CMD_START_FLASH, 0, 0, 0, NULL, 0);
             PrintAndLogEx(SUCCESS, "(Press and release the button only to " _YELLOW_("abort") ")");
         } else {
             // Old style handover: Ask the user to press the button, then reset the board
-            SendCommandOLD(CMD_HARDWARE_RESET, 0, 0, 0, NULL, 0);
+            SendCommandBL(CMD_HARDWARE_RESET, 0, 0, 0, NULL, 0);
             PrintAndLogEx(SUCCESS, "Press and hold down button NOW if your bootloader requires it.");
         }
         msleep(100);
@@ -358,9 +358,9 @@ int flash_start_flashing(int enable_bl_writes, char *serial_port_name) {
         PacketResponseNG resp;
 
         if (enable_bl_writes) {
-            SendCommandOLD(CMD_START_FLASH, FLASH_START, FLASH_END, START_FLASH_MAGIC, NULL, 0);
+            SendCommandBL(CMD_START_FLASH, FLASH_START, FLASH_END, START_FLASH_MAGIC, NULL, 0);
         } else {
-            SendCommandOLD(CMD_START_FLASH, BOOTLOADER_END, FLASH_END, 0, NULL, 0);
+            SendCommandBL(CMD_START_FLASH, BOOTLOADER_END, FLASH_END, 0, NULL, 0);
         }
         return wait_for_ack(&resp);
     } else {
@@ -375,7 +375,7 @@ static int write_block(uint32_t address, uint8_t *data, uint32_t length) {
     memset(block_buf, 0xFF, BLOCK_SIZE);
     memcpy(block_buf, data, length);
     PacketResponseNG resp;
-    SendCommandOLD(CMD_FINISH_WRITE, address, 0, 0, block_buf, length);
+    SendCommandBL(CMD_FINISH_WRITE, address, 0, 0, block_buf, length);
     int ret = wait_for_ack(&resp);
     if (ret && resp.oldarg[0]) {
         uint32_t lock_bits = resp.oldarg[0] >> 16;
@@ -444,7 +444,7 @@ void flash_free(flash_file_t *ctx) {
 
 // just reset the unit
 int flash_stop_flashing(void) {
-    SendCommandOLD(CMD_HARDWARE_RESET, 0, 0, 0, NULL, 0);
+    SendCommandBL(CMD_HARDWARE_RESET, 0, 0, 0, NULL, 0);
     msleep(100);
     return 0;
 }

From 2f2796be7e0882b0f81deaba1b6dee170fdff6f7 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 8 May 2019 13:32:17 +0200
Subject: [PATCH 1670/1938] Fix deprecated-hid-flasher

---
 client/deprecated-hid-flasher/flasher/flash.c   | 16 ++++++++--------
 client/deprecated-hid-flasher/flasher/proxusb.c | 11 +++++++++--
 client/deprecated-hid-flasher/flasher/proxusb.h |  6 +++---
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/client/deprecated-hid-flasher/flasher/flash.c b/client/deprecated-hid-flasher/flasher/flash.c
index e7a7a774e..179693d8b 100644
--- a/client/deprecated-hid-flasher/flasher/flash.c
+++ b/client/deprecated-hid-flasher/flasher/flash.c
@@ -260,7 +260,7 @@ fail:
 
 // Get the state of the proxmark, backwards compatible
 static int get_proxmark_state(uint32_t *state) {
-    SendCommandOLD(CMD_DEVICE_INFO, 0, 0, 0, NULL, 0);
+    SendCommandBL(CMD_DEVICE_INFO, 0, 0, 0, NULL, 0);
     PacketResponseOLD resp;
     ReceiveCommand(&resp);
 
@@ -307,11 +307,11 @@ static int enter_bootloader(void) {
                 && (state & DEVICE_INFO_FLAG_OSIMAGE_PRESENT)) {
             // New style handover: Send CMD_START_FLASH, which will reset the board
             // and enter the bootrom on the next boot.
-            SendCommandOLD(CMD_START_FLASH, 0, 0, 0, NULL, 0);
+            SendCommandBL(CMD_START_FLASH, 0, 0, 0, NULL, 0);
             fprintf(stderr, "(Press and release the button only to abort)\n");
         } else {
             // Old style handover: Ask the user to press the button, then reset the board
-            SendCommandOLD(CMD_HARDWARE_RESET, 0, 0, 0, NULL, 0);
+            SendCommandBL(CMD_HARDWARE_RESET, 0, 0, 0, NULL, 0);
             fprintf(stderr, "Press and hold down button NOW if your bootloader requires it.\n");
         }
         fprintf(stderr, "Waiting for Proxmark3 to reappear on USB...");
@@ -356,9 +356,9 @@ int flash_start_flashing(int enable_bl_writes) {
         // This command is stupid. Why the heck does it care which area we're
         // flashing, as long as it's not the bootloader area? The mind boggles.
         if (enable_bl_writes) {
-            SendCommandOLD(CMD_START_FLASH, FLASH_START, FLASH_END, START_FLASH_MAGIC, NULL, 0);
+            SendCommandBL(CMD_START_FLASH, FLASH_START, FLASH_END, START_FLASH_MAGIC, NULL, 0);
         } else {
-            SendCommandOLD(CMD_START_FLASH, BOOTLOADER_END, FLASH_END, 0, NULL, 0);
+            SendCommandBL(CMD_START_FLASH, BOOTLOADER_END, FLASH_END, 0, NULL, 0);
         }
         return wait_for_ack();
     } else {
@@ -376,12 +376,12 @@ static int write_block(uint32_t address, uint8_t *data, uint32_t length) {
     memcpy(block_buf, data, length);
 
     for (int i = 0; i < 240; i += 48) {
-        SendCommandOLD(CMD_SETUP_WRITE, i / 4, 0, 0, block_buf + i, 48);
+        SendCommandBL(CMD_SETUP_WRITE, i / 4, 0, 0, block_buf + i, 48);
         if (wait_for_ack() < 0)
             return -1;
     }
 
-    SendCommandOLD(CMD_FINISH_WRITE, address, 0, 0, block_buf + 240, 16);
+    SendCommandBL(CMD_FINISH_WRITE, address, 0, 0, block_buf + 240, 16);
     return wait_for_ack();
 }
 
@@ -440,7 +440,7 @@ void flash_free(flash_file_t *ctx) {
 
 // just reset the unit
 int flash_stop_flashing(void) {
-    SendCommandOLD(CMD_HARDWARE_RESET, 0, 0, 0, NULL, 0);
+    SendCommandBL(CMD_HARDWARE_RESET, 0, 0, 0, NULL, 0);
     msleep(100);
     return 0;
 }
diff --git a/client/deprecated-hid-flasher/flasher/proxusb.c b/client/deprecated-hid-flasher/flasher/proxusb.c
index eabe756bd..1edf7e094 100644
--- a/client/deprecated-hid-flasher/flasher/proxusb.c
+++ b/client/deprecated-hid-flasher/flasher/proxusb.c
@@ -21,14 +21,21 @@ static unsigned int claimed_iface = 0;
 unsigned char return_on_error = 0;
 unsigned char error_occured = 0;
 
-void SendCommand(PacketCommandOLD *c) {
+void SendCommandBL(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len) {
     int ret;
+    PacketCommandOLD c = {CMD_UNKNOWN, {0, 0, 0}, {{0}}};
+    c.cmd = cmd;
+    c.arg[0] = arg0;
+    c.arg[1] = arg1;
+    c.arg[2] = arg2;
+    if (len && data)
+        memcpy(&c.d, data, len);
 
 #if 0
     printf("Sending %d bytes\n", sizeof(PacketCommandOLD));
 #endif
 
-    ret = usb_bulk_write(devh, 0x01, (char *)c, sizeof(PacketCommandOLD), 1000);
+    ret = usb_bulk_write(devh, 0x01, (char *)&c, sizeof(PacketCommandOLD), 1000);
     if (ret < 0) {
         error_occured = 1;
         if (return_on_error)
diff --git a/client/deprecated-hid-flasher/flasher/proxusb.h b/client/deprecated-hid-flasher/flasher/proxusb.h
index 520b97eb3..125347255 100644
--- a/client/deprecated-hid-flasher/flasher/proxusb.h
+++ b/client/deprecated-hid-flasher/flasher/proxusb.h
@@ -26,9 +26,9 @@
 extern unsigned char return_on_error;
 extern unsigned char error_occured;
 
-void SendCommand(PacketCommand *c);
-bool ReceiveCommandPoll(PacketCommand *c);
-void ReceiveCommand(PacketCommand *c);
+void SendCommandBL(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
+bool ReceiveCommandPoll(PacketResponseOLD *c);
+void ReceiveCommand(PacketResponseOLD *c);
 struct usb_dev_handle *FindProxmark(int verbose, unsigned int *iface);
 struct usb_dev_handle *OpenProxmark(int verbose);
 void CloseProxmark(void);

From 2f71d951e16ac9fefc89181f5b36429ef7380335 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 8 May 2019 19:16:37 +0200
Subject: [PATCH 1671/1938] iclass: avoid last ping in fast modes

---
 client/cmdhficlass.c | 27 ++++++++-------------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index ddafd5a46..5b22979cc 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -529,13 +529,6 @@ static int CmdHFiClassReader_Replay(const char *Cmd) {
     return 0;
 }
 
-/*
-static int iclassEmlSetMem(uint8_t *data, int blockNum, int blocksCount) {
-    clearCommandBuffer();
-    SendCommandOLD(CMD_MIFARE_EML_MEMSET, blockNum, blocksCount, 0, data, blocksCount * 16);
-    return 0;
-}
-*/
 static int CmdHFiClassELoad(const char *Cmd) {
 
     char ctmp = tolower(param_getchar(Cmd, 0));
@@ -596,6 +589,10 @@ static int CmdHFiClassELoad(const char *Cmd) {
 
     while (bytes_remaining > 0) {
         uint32_t bytes_in_packet = MIN(PM3_CMD_DATA_SIZE, bytes_remaining);
+        if (bytes_in_packet == bytes_remaining) {
+            // Disable fast mode on last packet
+            conn.block_after_ACK = false;
+        }
         clearCommandBuffer();
         SendCommandOLD(CMD_ICLASS_EML_MEMSET, bytes_sent, bytes_in_packet, 0, dump + bytes_sent, bytes_in_packet);
         bytes_remaining -= bytes_in_packet;
@@ -603,11 +600,6 @@ static int CmdHFiClassELoad(const char *Cmd) {
     }
     free(dump);
 
-    // Disable fast mode and send a dummy command to make it effective
-    conn.block_after_ACK = false;
-    SendCommandNG(CMD_PING, NULL, 0);
-    WaitForResponseTimeout(CMD_PING, NULL, 1000);
-
     PrintAndLogEx(SUCCESS, "sent %d bytes of data to device emulator memory", bytes_sent);
     return 0;
 }
@@ -1966,9 +1958,11 @@ static int CmdHFiClassCheckKeys(const char *Cmd) {
         uint32_t keys = ((keycnt - i)  > chunksize) ? chunksize : keycnt - i;
 
         // last chunk?
-        if (keys == keycnt - i)
+        if (keys == keycnt - i) {
             lastChunk = true;
-
+            // Disable fast mode on last command
+            conn.block_after_ACK = false;
+        }
         uint32_t flags = lastChunk << 8;
         // bit 16
         //   - 1 indicates credit key
@@ -2035,11 +2029,6 @@ out:
 
     PrintAndLogEx(SUCCESS, "\nTime in iclass checkkeys: %.0f seconds\n", (float)t1 / 1000.0);
 
-    // Disable fast mode and send a dummy command to make it effective
-    conn.block_after_ACK = false;
-    SendCommandNG(CMD_PING, NULL, 0);
-    WaitForResponseTimeout(CMD_PING, NULL, 1000);
-
     DropField();
     free(pre);
     free(keyBlock);

From 93171e3d74deda68db87f80fb2202982cefaec89 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 8 May 2019 19:34:11 +0200
Subject: [PATCH 1672/1938] fast mode on sc upgrade, no much diff

---
 client/cmdsmartcard.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index 973dc29a6..c8c33dd4c 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -643,8 +643,15 @@ static int CmdSmartUpgrade(const char *Cmd) {
     uint32_t bytes_sent = 0;
     uint32_t bytes_remaining = firmware_size;
 
+    // fast push mode
+    conn.block_after_ACK = true;
+
     while (bytes_remaining > 0) {
         uint32_t bytes_in_packet = MIN(PM3_CMD_DATA_SIZE, bytes_remaining);
+        if (bytes_in_packet == bytes_remaining) {
+            // Disable fast mode on last packet
+            conn.block_after_ACK = false;
+        }
         clearCommandBuffer();
         SendCommandOLD(CMD_SMART_UPLOAD, index + bytes_sent, bytes_in_packet, 0, dump + bytes_sent, bytes_in_packet);
         if (!WaitForResponseTimeout(CMD_ACK, NULL, 2000)) {

From e7362d5e6a3acf2beef69fa57cf221e1f461bc08 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 8 May 2019 19:48:53 +0200
Subject: [PATCH 1673/1938] fast mode on legic cmds

---
 client/cmdhflegic.c | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index 57a123964..ed956bdf9 100644
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -832,10 +832,15 @@ void legic_chk_iv(uint32_t *iv) {
     }
 }
 void legic_seteml(uint8_t *src, uint32_t offset, uint32_t numofbytes) {
-
+    // fast push mode
+    conn.block_after_ACK = true;
     for (size_t i = offset; i < numofbytes; i += PM3_CMD_DATA_SIZE) {
 
         size_t len = MIN((numofbytes - i), PM3_CMD_DATA_SIZE);
+        if (len == numofbytes - i) {
+            // Disable fast mode on last packet
+            conn.block_after_ACK = false;
+        }
         clearCommandBuffer();
         SendCommandOLD(CMD_LEGIC_ESET, i, len, 0, src + i, len);
     }
@@ -1039,11 +1044,18 @@ static int CmdLegicRestore(const char *Cmd) {
 
     PrintAndLogEx(SUCCESS, "Restoring to card");
 
+    // fast push mode
+    conn.block_after_ACK = true;
+
     // transfer to device
     PacketResponseNG resp;
     for (size_t i = 7; i < numofbytes; i += PM3_CMD_DATA_SIZE) {
 
         size_t len = MIN((numofbytes - i), PM3_CMD_DATA_SIZE);
+        if (len == numofbytes - i) {
+            // Disable fast mode on last packet
+            conn.block_after_ACK = false;
+        }
         clearCommandBuffer();
         SendCommandOLD(CMD_WRITER_LEGIC_RF, i, len, 0x55, data + i, len);
 
@@ -1227,6 +1239,8 @@ static int CmdLegicWipe(const char *Cmd) {
     legic_print_type(card.cardsize, 0);
 
     PrintAndLogEx(SUCCESS, "Erasing");
+    // fast push mode
+    conn.block_after_ACK = true;
 
     // transfer to device
     PacketResponseNG resp;
@@ -1235,6 +1249,10 @@ static int CmdLegicWipe(const char *Cmd) {
         printf(".");
         fflush(stdout);
         size_t len = MIN((card.cardsize - i), PM3_CMD_DATA_SIZE);
+        if (len == card.cardsize - i) {
+            // Disable fast mode on last packet
+            conn.block_after_ACK = false;
+        }
         clearCommandBuffer();
         SendCommandOLD(CMD_WRITER_LEGIC_RF, i, len, 0x55, data + i, len);
 

From c72e74275db6dbd7c0d031a1438d2a61e79b5bae Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 8 May 2019 20:13:07 +0200
Subject: [PATCH 1674/1938] fast mode on epa pace replay

---
 client/cmdhfepa.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/client/cmdhfepa.c b/client/cmdhfepa.c
index f0d06cda4..e88e1679e 100644
--- a/client/cmdhfepa.c
+++ b/client/cmdhfepa.c
@@ -109,6 +109,8 @@ static int CmdHFEPAPACEReplay(const char *Cmd) {
 
     // transfer the APDUs to the Proxmark
     uint8_t data[PM3_CMD_DATA_SIZE];
+    // fast push mode
+    conn.block_after_ACK = true;
     for (int i = 0; i < sizeof(apdu_lengths); i++) {
         // transfer the APDU in several parts if necessary
         for (int j = 0; j * sizeof(data) < apdu_lengths[i]; j++) {
@@ -117,6 +119,10 @@ static int CmdHFEPAPACEReplay(const char *Cmd) {
             if (packet_length > sizeof(data)) {
                 packet_length = sizeof(data);
             }
+            if ((i == sizeof(apdu_lengths)-1) && (j * sizeof(data) >= apdu_lengths[i] - 1)) {
+                // Disable fast mode on last packet
+                conn.block_after_ACK = false;
+            }
             memcpy(data, // + (j * sizeof(data)),
                    apdus[i] + (j * sizeof(data)),
                    packet_length);

From 77398550b0c7fee1bebf32c0134fe12f9355aa07 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 8 May 2019 21:54:15 +0200
Subject: [PATCH 1675/1938] fast mode on Mifare emulator upload

---
 client/cmdhfmf.c | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 9f127917a..db36e2c97 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -1267,12 +1267,18 @@ static int CmdHF14AMfNested(const char *Cmd) {
 
         // transfer them to the emulator
         if (transferToEml) {
+            // fast push mode
+            conn.block_after_ACK = true;
             for (i = 0; i < SectorsCnt; i++) {
                 mfEmlGetMem(keyBlock, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
                 if (e_sector[i].foundKey[0])
                     num_to_bytes(e_sector[i].Key[0], 6, keyBlock);
                 if (e_sector[i].foundKey[1])
                     num_to_bytes(e_sector[i].Key[1], 6, &keyBlock[10]);
+                if (i == SectorsCnt - 1) {
+                    // Disable fast mode on last packet
+                    conn.block_after_ACK = false;
+                }
                 mfEmlSetMem(keyBlock, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
             }
             PrintAndLogEx(SUCCESS, "keys transferred to emulator memory.");
@@ -1723,6 +1729,8 @@ out:
         printKeyTable(sectorsCnt, e_sector);
 
         if (transferToEml) {
+            // fast push mode
+            conn.block_after_ACK = true;
             uint8_t block[16] = {0x00};
             for (i = 0; i < sectorsCnt; ++i) {
                 uint8_t blockno = FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1;
@@ -1731,6 +1739,10 @@ out:
                     num_to_bytes(e_sector[i].Key[0], 6, block);
                 if (e_sector[i].foundKey[1])
                     num_to_bytes(e_sector[i].Key[1], 6, block + 10);
+                if (i == sectorsCnt - 1) {
+                    // Disable fast mode on last packet
+                    conn.block_after_ACK = false;
+                }
                 mfEmlSetMem(block, blockno, 1);
             }
             PrintAndLogEx(SUCCESS, "Found keys have been transferred to the emulator memory");
@@ -2011,6 +2023,8 @@ out:
     printKeyTable(SectorsCnt, e_sector);
 
     if (transferToEml) {
+        // fast push mode
+        conn.block_after_ACK = true;
         uint8_t block[16] = {0x00};
         for (i = 0; i < SectorsCnt; ++i) {
             uint8_t blockno = FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1;
@@ -2019,6 +2033,10 @@ out:
                 num_to_bytes(e_sector[i].Key[0], 6, block);
             if (e_sector[i].foundKey[1])
                 num_to_bytes(e_sector[i].Key[1], 6, block + 10);
+            if (i == SectorsCnt - 1) {
+                // Disable fast mode on last packet
+                conn.block_after_ACK = false;
+            }
             mfEmlSetMem(block, blockno, 1);
         }
         PrintAndLogEx(SUCCESS, "Found keys have been transferred to the emulator memory");
@@ -2599,8 +2617,14 @@ int CmdHF14AMfELoad(const char *Cmd) {
 
     PrintAndLogEx(INFO, "Copying to emulator memory");
 
+    // fast push mode
+    conn.block_after_ACK = true;
     blockNum = 0;
     while (datalen) {
+        if (datalen == blockWidth) {
+            // Disable fast mode on last packet
+            conn.block_after_ACK = false;
+        }
 
         if (mfEmlSetMem_xt(data + counter, blockNum, 1, blockWidth)) {
             PrintAndLogEx(FAILED, "Cant set emul block: %3d", blockNum);
@@ -3111,7 +3135,13 @@ static int CmdHF14AMfCSave(const char *Cmd) {
 
     if (fillEmulator) {
         PrintAndLogEx(INFO, "uploading to emulator memory");
+        // fast push mode
+        conn.block_after_ACK = true;
         for (i = 0; i < numblocks; i += 5) {
+            if (i == numblocks - 1) {
+                // Disable fast mode on last packet
+                conn.block_after_ACK = false;
+            }
             if (mfEmlSetMem(dump + (i * MFBLOCK_SIZE), i, 5)) {
                 PrintAndLogEx(WARNING, "Cant set emul block: %d", i);
             }

From 962f45e3e6f1eaa940c59ed1bc3bbda115e6c4b9 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 8 May 2019 22:02:14 +0200
Subject: [PATCH 1676/1938] mf nested: remove compilation warning

---
 client/cmdhfmf.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index db36e2c97..d39581ea2 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -1053,7 +1053,7 @@ static int CmdHF14AMfRestore(const char *Cmd) {
 }
 
 static int CmdHF14AMfNested(const char *Cmd) {
-    int i, res, iterations;
+    int i, iterations;
     sector_t *e_sector = NULL;
     uint8_t blockNo = 0;
     uint8_t keyType = 0;
@@ -1176,8 +1176,7 @@ static int CmdHF14AMfNested(const char *Cmd) {
         }
 
         PrintAndLogEx(SUCCESS, "Testing known keys. Sector count=%d", SectorsCnt);
-        res = mfCheckKeys_fast(SectorsCnt, true, true, 1, MIFARE_DEFAULTKEYS_SIZE + 1, keyBlock, e_sector, false);
-        // TODO check result!!
+        mfCheckKeys_fast(SectorsCnt, true, true, 1, MIFARE_DEFAULTKEYS_SIZE + 1, keyBlock, e_sector, false);
 
         uint64_t t2 = msclock() - t1;
         PrintAndLogEx(SUCCESS, "Time to check %d known keys: %.0f seconds\n", MIFARE_DEFAULTKEYS_SIZE, (float)t2 / 1000.0);
@@ -1214,7 +1213,7 @@ static int CmdHF14AMfNested(const char *Cmd) {
                             e_sector[sectorNo].foundKey[trgKeyType] = 1;
                             e_sector[sectorNo].Key[trgKeyType] = bytes_to_num(keyBlock, 6);
 
-                            res = mfCheckKeys_fast(SectorsCnt, true, true, 2, 1, keyBlock, e_sector, false);
+                            mfCheckKeys_fast(SectorsCnt, true, true, 2, 1, keyBlock, e_sector, false);
                             continue;
 
                         default :

From d088ed4232593030c5638b244359e025aff84f48 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 8 May 2019 22:43:35 +0200
Subject: [PATCH 1677/1938] fast mode on LF techs using t55xx write block

---
 client/cmdlfawid.c      | 6 ++++++
 client/cmdlffdx.c       | 6 ++++++
 client/cmdlfguard.c     | 9 +++++++--
 client/cmdlfjablotron.c | 6 ++++++
 client/cmdlfkeri.c      | 6 ++++++
 client/cmdlfnedap.c     | 8 +++++++-
 client/cmdlfnoralsy.c   | 6 ++++++
 client/cmdlfpresco.c    | 6 ++++++
 client/cmdlfpyramid.c   | 8 +++++++-
 client/cmdlfvisa2000.c  | 6 ++++++
 10 files changed, 63 insertions(+), 4 deletions(-)

diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c
index 946656276..c2d4bc63b 100644
--- a/client/cmdlfawid.c
+++ b/client/cmdlfawid.c
@@ -383,7 +383,13 @@ static int CmdAWIDClone(const char *Cmd) {
 
     PacketResponseNG resp;
 
+    // fast push mode
+    conn.block_after_ACK = true;
     for (uint8_t i = 0; i < 4; i++) {
+        if (i == 3) {
+            // Disable fast mode on last packet
+            conn.block_after_ACK = false;
+        }
         clearCommandBuffer();
         SendCommandMIX(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, NULL, 0);
         if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
diff --git a/client/cmdlffdx.c b/client/cmdlffdx.c
index d652673e8..49d91344b 100644
--- a/client/cmdlffdx.c
+++ b/client/cmdlffdx.c
@@ -283,7 +283,13 @@ static int CmdFdxClone(const char *Cmd) {
 
     PacketResponseNG resp;
 
+    // fast push mode
+    conn.block_after_ACK = true;
     for (int i = 4; i >= 0; --i) {
+        if (i == 0) {
+            // Disable fast mode on last packet
+            conn.block_after_ACK = false;
+        }
         clearCommandBuffer();
         SendCommandMIX(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, NULL, 0);
         if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
diff --git a/client/cmdlfguard.c b/client/cmdlfguard.c
index a01b6dbaa..2476711ef 100644
--- a/client/cmdlfguard.c
+++ b/client/cmdlfguard.c
@@ -142,7 +142,6 @@ static int CmdGuardClone(const char *Cmd) {
     if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_guard_clone();
 
     uint32_t facilitycode = 0, cardnumber = 0, fc = 0, cn = 0, fmtlen = 0;
-    uint8_t i;
     uint8_t bs[96];
     memset(bs, 0x00, sizeof(bs));
 
@@ -173,7 +172,13 @@ static int CmdGuardClone(const char *Cmd) {
 
     PacketResponseNG resp;
 
-    for (i = 0; i < 4; ++i) {
+    // fast push mode
+    conn.block_after_ACK = true;
+    for (uint8_t i = 0; i < 4; i++) {
+        if (i == 3) {
+            // Disable fast mode on last packet
+            conn.block_after_ACK = false;
+        }
         clearCommandBuffer();
         SendCommandMIX(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, NULL, 0);
         if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
diff --git a/client/cmdlfjablotron.c b/client/cmdlfjablotron.c
index 4fea2b1b9..c2d4b6a78 100644
--- a/client/cmdlfjablotron.c
+++ b/client/cmdlfjablotron.c
@@ -157,7 +157,13 @@ static int CmdJablotronClone(const char *Cmd) {
 
     PacketResponseNG resp;
 
+    // fast push mode
+    conn.block_after_ACK = true;
     for (uint8_t i = 0; i < 3; i++) {
+        if (i == 2) {
+            // Disable fast mode on last packet
+            conn.block_after_ACK = false;
+        }
         clearCommandBuffer();
         SendCommandMIX(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, NULL, 0);
         if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
diff --git a/client/cmdlfkeri.c b/client/cmdlfkeri.c
index f722837ba..b99560567 100644
--- a/client/cmdlfkeri.c
+++ b/client/cmdlfkeri.c
@@ -148,7 +148,13 @@ static int CmdKeriClone(const char *Cmd) {
 
     PacketResponseNG resp;
 
+    // fast push mode
+    conn.block_after_ACK = true;
     for (uint8_t i = 0; i < 3; i++) {
+        if (i == 2) {
+            // Disable fast mode on last packet
+            conn.block_after_ACK = false;
+        }
         clearCommandBuffer();
         SendCommandMIX(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, NULL, 0);
         if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
diff --git a/client/cmdlfnedap.c b/client/cmdlfnedap.c
index ff5800322..417d4f6cf 100644
--- a/client/cmdlfnedap.c
+++ b/client/cmdlfnedap.c
@@ -204,7 +204,13 @@ static int CmdLFNedapClone(const char *Cmd) {
 
     PacketResponseNG resp;
 
-    for (uint8_t i = 0; i<5; ++i ) {
+    // fast push mode
+    conn.block_after_ACK = true;
+    for (uint8_t i = 0; i < 5; i++) {
+        if (i == 4) {
+            // Disable fast mode on last packet
+            conn.block_after_ACK = false;
+        }
         clearCommandBuffer();
         SendCommandMIX(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, NULL, 0);
         if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)){
diff --git a/client/cmdlfnoralsy.c b/client/cmdlfnoralsy.c
index 9455ce916..667a80d16 100644
--- a/client/cmdlfnoralsy.c
+++ b/client/cmdlfnoralsy.c
@@ -156,7 +156,13 @@ static int CmdNoralsyClone(const char *Cmd) {
 
     PacketResponseNG resp;
 
+    // fast push mode
+    conn.block_after_ACK = true;
     for (uint8_t i = 0; i < 4; i++) {
+        if (i == 3) {
+            // Disable fast mode on last packet
+            conn.block_after_ACK = false;
+        }
         clearCommandBuffer();
         SendCommandMIX(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, NULL, 0);
         if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
diff --git a/client/cmdlfpresco.c b/client/cmdlfpresco.c
index 8222bb0be..b710fd112 100644
--- a/client/cmdlfpresco.c
+++ b/client/cmdlfpresco.c
@@ -122,7 +122,13 @@ static int CmdPrescoClone(const char *Cmd) {
 
     PacketResponseNG resp;
 
+    // fast push mode
+    conn.block_after_ACK = true;
     for (uint8_t i = 0; i < 5; i++) {
+        if (i == 4) {
+            // Disable fast mode on last packet
+            conn.block_after_ACK = false;
+        }
         clearCommandBuffer();
         SendCommandMIX(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, NULL, 0);
         if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c
index 0823abb77..f5d848672 100644
--- a/client/cmdlfpyramid.c
+++ b/client/cmdlfpyramid.c
@@ -234,7 +234,13 @@ static int CmdPyramidClone(const char *Cmd) {
 
     PacketResponseNG resp;
 
-    for (uint8_t i = 0; i < 5; ++i) {
+    // fast push mode
+    conn.block_after_ACK = true;
+    for (uint8_t i = 0; i < 5; i++) {
+        if (i == 4) {
+            // Disable fast mode on last packet
+            conn.block_after_ACK = false;
+        }
         clearCommandBuffer();
         SendCommandMIX(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, NULL, 0);
         if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
diff --git a/client/cmdlfvisa2000.c b/client/cmdlfvisa2000.c
index 2980b0a5c..2d5808f29 100644
--- a/client/cmdlfvisa2000.c
+++ b/client/cmdlfvisa2000.c
@@ -168,7 +168,13 @@ static int CmdVisa2kClone(const char *Cmd) {
 
     PacketResponseNG resp;
 
+    // fast push mode
+    conn.block_after_ACK = true;
     for (uint8_t i = 0; i < 4; i++) {
+        if (i == 3) {
+            // Disable fast mode on last packet
+            conn.block_after_ACK = false;
+        }
         clearCommandBuffer();
         SendCommandMIX(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, NULL, 0);
         if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {

From ddd62e2848fe3fa5f216719893fa210f8d3d05ca Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 8 May 2019 22:45:20 +0200
Subject: [PATCH 1678/1938] text

---
 client/cmdlf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdlf.c b/client/cmdlf.c
index 85f876d27..8e504df82 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -432,7 +432,7 @@ int CmdLFSim(const char *Cmd) {
     }
     printf("\n");
 
-    // Disable fast mode and send a dummy command to make it effective
+    // Disable fast mode before last command
     conn.block_after_ACK = false;
 
     PrintAndLogEx(NORMAL, "Simulating");

From 2c104822791abf10e5ad78908147fb70c550b43a Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 9 May 2019 00:08:59 +0200
Subject: [PATCH 1679/1938] all LF sim: client waits till button pressed

---
 armsrc/appmain.c        |  1 +
 armsrc/lfops.c          |  6 +++++-
 client/cmdlf.c          | 24 ++++++++++++++++++++----
 client/cmdlfawid.c      |  6 +++++-
 client/cmdlffdx.c       |  6 +++++-
 client/cmdlfguard.c     |  6 +++++-
 client/cmdlfhid.c       |  6 +++++-
 client/cmdlfindala.c    |  6 +++++-
 client/cmdlfio.c        |  6 +++++-
 client/cmdlfjablotron.c |  6 +++++-
 client/cmdlfkeri.c      |  7 +++++--
 client/cmdlfnedap.c     |  6 +++++-
 client/cmdlfnoralsy.c   |  6 +++++-
 client/cmdlfparadox.c   |  8 ++++++--
 client/cmdlfpresco.c    |  6 +++++-
 client/cmdlfpyramid.c   |  6 +++++-
 client/cmdlfviking.c    |  6 +++++-
 client/cmdlfvisa2000.c  |  6 +++++-
 client/comms.c          |  4 ++--
 19 files changed, 104 insertions(+), 24 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index d1da448db..ef3d099d0 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -799,6 +799,7 @@ static void PacketReceived(PacketCommandNG *packet) {
         case CMD_SIMULATE_TAG_125K:
             LED_A_ON();
             SimulateTagLowFrequency(packet->oldarg[0], packet->oldarg[1], 1);
+            reply_ng(CMD_SIMULATE_TAG_125K, PM3_EOPABORTED, NULL, 0);
             LED_A_OFF();
             break;
         case CMD_LF_SIMULATE_BIDIR:
diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index 31418d5b5..2fed8d962 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -595,7 +595,7 @@ void SimulateTagLowFrequencyEx(int period, int gap, int ledcontrol, int numcycle
             if (x != numcycles) {
                 ++x;
             } else {
-                // exit without turning of field
+                // exit without turning off field
                 return;
             }
         }
@@ -819,6 +819,7 @@ void CmdHIDsimTAGEx(uint32_t hi, uint32_t lo, int ledcontrol, int numcycles) {
 void CmdHIDsimTAG(uint32_t hi, uint32_t lo, int ledcontrol) {
     CmdHIDsimTAGEx(hi, lo, ledcontrol, -1);
     DbpString("[!] simulation finished");
+    reply_ng(CMD_HID_SIM_TAG, PM3_EOPABORTED, NULL, 0);
 }
 
 // prepare a waveform pattern in the buffer based on the ID given then
@@ -859,6 +860,7 @@ void CmdFSKsimTAG(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *bits, int
     if (ledcontrol) LED_A_ON();
     SimulateTagLowFrequency(n, 0, ledcontrol);
     if (ledcontrol) LED_A_OFF();
+    reply_ng(CMD_FSK_SIM_TAG, PM3_EOPABORTED, NULL, 0);
 }
 
 // compose ask waveform for one bit(ASK)
@@ -943,6 +945,7 @@ void CmdASKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *bits, int
     if (ledcontrol) LED_A_ON();
     SimulateTagLowFrequency(n, 0, ledcontrol);
     if (ledcontrol) LED_A_OFF();
+    reply_ng(CMD_ASK_SIM_TAG, PM3_EOPABORTED, NULL, 0);
 }
 
 //carrier can be 2,4 or 8
@@ -992,6 +995,7 @@ void CmdPSKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *bits, int
     if (ledcontrol) LED_A_ON();
     SimulateTagLowFrequency(n, 0, ledcontrol);
     if (ledcontrol) LED_A_OFF();
+    reply_ng(CMD_PSK_SIM_TAG, PM3_EOPABORTED, NULL, 0);
 }
 
 // loop to get raw HID waveform then FSK demodulate the TAG ID from it
diff --git a/client/cmdlf.c b/client/cmdlf.c
index 8e504df82..af6b97bf6 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -439,7 +439,11 @@ int CmdLFSim(const char *Cmd) {
 
     clearCommandBuffer();
     SendCommandMIX(CMD_SIMULATE_TAG_125K, GraphTraceLen, gap, 0, NULL, 0);
-    return 0;
+    PacketResponseNG resp;
+    WaitForResponse(CMD_SIMULATE_TAG_125K, &resp);
+    if (resp.status!=PM3_EOPABORTED)
+        return resp.status;
+    return PM3_SUCCESS;
 }
 
 // by marshmellow - sim fsk data given clock, fcHigh, fcLow, invert
@@ -526,7 +530,11 @@ int CmdLFfskSim(const char *Cmd) {
     SendCommandOLD(CMD_FSK_SIM_TAG, fcHigh << 8 | fcLow, (separator << 8) | clk, size, DemodBuffer, size);
 
     setClockGrid(clk, 0);
-    return 0;
+    PacketResponseNG resp;
+    WaitForResponse(CMD_FSK_SIM_TAG, &resp);
+    if (resp.status!=PM3_EOPABORTED)
+        return resp.status;
+    return PM3_SUCCESS;
 }
 
 // by marshmellow - sim ask data given clock, invert, manchester or raw, separator
@@ -611,7 +619,11 @@ int CmdLFaskSim(const char *Cmd) {
     PrintAndLogEx(NORMAL, "preparing to sim ask data: %d bits", size);
     clearCommandBuffer();
     SendCommandOLD(CMD_ASK_SIM_TAG, clk << 8 | encoding, invert << 8 | separator, size, DemodBuffer, size);
-    return 0;
+    PacketResponseNG resp;
+    WaitForResponse(CMD_ASK_SIM_TAG, &resp);
+    if (resp.status!=PM3_EOPABORTED)
+        return resp.status;
+    return PM3_SUCCESS;
 }
 
 // by marshmellow - sim psk data given carrier, clock, invert
@@ -714,7 +726,11 @@ int CmdLFpskSim(const char *Cmd) {
     PrintAndLogEx(DEBUG, "DEBUG: Sending DemodBuffer Length: %d", size);
     clearCommandBuffer();
     SendCommandOLD(CMD_PSK_SIM_TAG, clk << 8 | carrier, invert, size, DemodBuffer, size);
-    return 0;
+    PacketResponseNG resp;
+    WaitForResponse(CMD_PSK_SIM_TAG, &resp);
+    if (resp.status!=PM3_EOPABORTED)
+        return resp.status;
+    return PM3_SUCCESS;
 }
 
 int CmdLFSimBidir(const char *Cmd) {
diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c
index c2d4bc63b..ff7c111bd 100644
--- a/client/cmdlfawid.c
+++ b/client/cmdlfawid.c
@@ -343,7 +343,11 @@ static int CmdAWIDSim(const char *Cmd) {
     // 96   --- Bitstream length: 96-bits == 12 bytes
     clearCommandBuffer();
     SendCommandOLD(CMD_FSK_SIM_TAG, (high << 8) + low, (invert << 8) + clk, sizeof(bits), bits, sizeof(bits));
-    return 0;
+    PacketResponseNG resp;
+    WaitForResponse(CMD_FSK_SIM_TAG, &resp);
+    if (resp.status!=PM3_EOPABORTED)
+        return resp.status;
+    return PM3_SUCCESS;
 }
 
 static int CmdAWIDClone(const char *Cmd) {
diff --git a/client/cmdlffdx.c b/client/cmdlffdx.c
index 49d91344b..29797474c 100644
--- a/client/cmdlffdx.c
+++ b/client/cmdlffdx.c
@@ -322,7 +322,11 @@ static int CmdFdxSim(const char *Cmd) {
     getFDXBits(animalid, countryid, 1, 0, 0, data);
     clearCommandBuffer();
     SendCommandOLD(CMD_ASK_SIM_TAG, clk << 8 | encoding, invert << 8 | separator, sizeof(data), data, sizeof(data));
-    return 0;
+    PacketResponseNG resp;
+    WaitForResponse(CMD_ASK_SIM_TAG, &resp);
+    if (resp.status!=PM3_EOPABORTED)
+        return resp.status;
+    return PM3_SUCCESS;
 }
 
 static command_t CommandTable[] = {
diff --git a/client/cmdlfguard.c b/client/cmdlfguard.c
index 2476711ef..cf5a05056 100644
--- a/client/cmdlfguard.c
+++ b/client/cmdlfguard.c
@@ -216,7 +216,11 @@ static int CmdGuardSim(const char *Cmd) {
 
     clearCommandBuffer();
     SendCommandOLD(CMD_ASK_SIM_TAG, (clock1 << 8) | encoding, (invert << 8) | separator, sizeof(bs), bs, sizeof(bs));
-    return 0;
+    PacketResponseNG resp;
+    WaitForResponse(CMD_ASK_SIM_TAG, &resp);
+    if (resp.status!=PM3_EOPABORTED)
+        return resp.status;
+    return PM3_SUCCESS;
 }
 
 static command_t CommandTable[] = {
diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c
index b712cb50f..facc3aab7 100644
--- a/client/cmdlfhid.c
+++ b/client/cmdlfhid.c
@@ -260,7 +260,11 @@ static int CmdHIDSim(const char *Cmd) {
 
     clearCommandBuffer();
     SendCommandMIX(CMD_HID_SIM_TAG, hi, lo, 0, NULL, 0);
-    return 0;
+    PacketResponseNG resp;
+    WaitForResponse(CMD_HID_SIM_TAG, &resp);
+    if (resp.status!=PM3_EOPABORTED)
+        return resp.status;
+    return PM3_SUCCESS;
 }
 
 static int CmdHIDClone(const char *Cmd) {
diff --git a/client/cmdlfindala.c b/client/cmdlfindala.c
index d1d99db78..f6e4d2850 100644
--- a/client/cmdlfindala.c
+++ b/client/cmdlfindala.c
@@ -402,7 +402,11 @@ static int CmdIndalaSim(const char *Cmd) {
 
     clearCommandBuffer();
     SendCommandOLD(CMD_PSK_SIM_TAG, clk << 8 | carrier, invert, sizeof(bits), bits, sizeof(bits));
-    return 0;
+    PacketResponseNG resp;
+    WaitForResponse(CMD_PSK_SIM_TAG, &resp);
+    if (resp.status!=PM3_EOPABORTED)
+        return resp.status;
+    return PM3_SUCCESS;
 }
 
 // iceman - needs refactoring
diff --git a/client/cmdlfio.c b/client/cmdlfio.c
index 50e0ae9d8..6e7ca1e79 100644
--- a/client/cmdlfio.c
+++ b/client/cmdlfio.c
@@ -212,7 +212,11 @@ static int CmdIOProxSim(const char *Cmd) {
     // size --- 64 bits == 8 bytes
     clearCommandBuffer();
     SendCommandOLD(CMD_FSK_SIM_TAG, high << 8 | low, invert << 8 | clk, sizeof(bits), bits, sizeof(bits));
-    return 0;
+    PacketResponseNG resp;
+    WaitForResponse(CMD_FSK_SIM_TAG, &resp);
+    if (resp.status!=PM3_EOPABORTED)
+        return resp.status;
+    return PM3_SUCCESS;
 }
 
 static int CmdIOProxClone(const char *Cmd) {
diff --git a/client/cmdlfjablotron.c b/client/cmdlfjablotron.c
index c2d4b6a78..86752bc82 100644
--- a/client/cmdlfjablotron.c
+++ b/client/cmdlfjablotron.c
@@ -195,7 +195,11 @@ static int CmdJablotronSim(const char *Cmd) {
     getJablotronBits(fullcode, data);
     clearCommandBuffer();
     SendCommandOLD(CMD_ASK_SIM_TAG, clk << 8 | encoding, invert << 8 | separator, sizeof(data), data, sizeof(data));
-    return 0;
+    PacketResponseNG resp;
+    WaitForResponse(CMD_ASK_SIM_TAG, &resp);
+    if (resp.status!=PM3_EOPABORTED)
+        return resp.status;
+    return PM3_SUCCESS;
 }
 
 static command_t CommandTable[] = {
diff --git a/client/cmdlfkeri.c b/client/cmdlfkeri.c
index b99560567..fff641b44 100644
--- a/client/cmdlfkeri.c
+++ b/client/cmdlfkeri.c
@@ -189,8 +189,11 @@ static int CmdKeriSim(const char *Cmd) {
 
     clearCommandBuffer();
     SendCommandOLD(CMD_PSK_SIM_TAG, clk << 8 | carrier, invert, sizeof(bits), bits, sizeof(bits));
-
-    return 0;
+    PacketResponseNG resp;
+    WaitForResponse(CMD_PSK_SIM_TAG, &resp);
+    if (resp.status!=PM3_EOPABORTED)
+        return resp.status;
+    return PM3_SUCCESS;
 }
 
 static command_t CommandTable[] = {
diff --git a/client/cmdlfnedap.c b/client/cmdlfnedap.c
index 417d4f6cf..03ff95d27 100644
--- a/client/cmdlfnedap.c
+++ b/client/cmdlfnedap.c
@@ -249,7 +249,11 @@ static int CmdLFNedapSim(const char *Cmd) {
 
     clearCommandBuffer();
     SendCommandOLD(CMD_ASK_SIM_TAG, clk << 8 | encoding, invert << 8 | separator, sizeof(bs), bs, sizeof(bs));
-    return 0;
+    PacketResponseNG resp;
+    WaitForResponse(CMD_ASK_SIM_TAG, &resp);
+    if (resp.status!=PM3_EOPABORTED)
+        return resp.status;
+    return PM3_SUCCESS;
 }
 
 static int CmdLFNedapChk(const char *Cmd) {
diff --git a/client/cmdlfnoralsy.c b/client/cmdlfnoralsy.c
index 667a80d16..cca9e38ff 100644
--- a/client/cmdlfnoralsy.c
+++ b/client/cmdlfnoralsy.c
@@ -198,7 +198,11 @@ static int CmdNoralsySim(const char *Cmd) {
 
     clearCommandBuffer();
     SendCommandOLD(CMD_ASK_SIM_TAG, clk << 8 | encoding, invert << 8 | separator, sizeof(bits), bits, sizeof(bits));
-    return 0;
+    PacketResponseNG resp;
+    WaitForResponse(CMD_ASK_SIM_TAG, &resp);
+    if (resp.status!=PM3_EOPABORTED)
+        return resp.status;
+    return PM3_SUCCESS;
 }
 
 static command_t CommandTable[] = {
diff --git a/client/cmdlfparadox.c b/client/cmdlfparadox.c
index 6b836c846..9b3744878 100644
--- a/client/cmdlfparadox.c
+++ b/client/cmdlfparadox.c
@@ -136,9 +136,13 @@ static int CmdParadoxSim(const char *Cmd) {
 
     clearCommandBuffer();
     SendCommandOLD(CMD_FSK_SIM_TAG, high << 8 | low, invert << 8 | clk, sizeof(bs), bs, sizeof(bs));
+    PacketResponseNG resp;
+    WaitForResponse(CMD_FSK_SIM_TAG, &resp);
+    if (resp.status!=PM3_EOPABORTED)
+        return resp.status;
+    return PM3_SUCCESS;
 
-    PrintAndLogEx(NORMAL, "UNFINISHED");
-    return 0;
+//    PrintAndLogEx(NORMAL, "UNFINISHED");
 }
 
 static command_t CommandTable[] = {
diff --git a/client/cmdlfpresco.c b/client/cmdlfpresco.c
index b710fd112..15068d9e5 100644
--- a/client/cmdlfpresco.c
+++ b/client/cmdlfpresco.c
@@ -154,7 +154,11 @@ static int CmdPrescoSim(const char *Cmd) {
     uint8_t data[128];
     getPrescoBits(fullcode, data);
     SendCommandOLD(CMD_ASK_SIM_TAG, clk << 8 | encoding, invert << 8 | separator, sizeof(data), data, sizeof(data));
-    return 0;
+    PacketResponseNG resp;
+    WaitForResponse(CMD_ASK_SIM_TAG, &resp);
+    if (resp.status!=PM3_EOPABORTED)
+        return resp.status;
+    return PM3_SUCCESS;
 }
 
 static command_t CommandTable[] = {
diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c
index f5d848672..8201e0a18 100644
--- a/client/cmdlfpyramid.c
+++ b/client/cmdlfpyramid.c
@@ -278,7 +278,11 @@ static int CmdPyramidSim(const char *Cmd) {
 
     clearCommandBuffer();
     SendCommandOLD(CMD_FSK_SIM_TAG, high << 8 | low, invert << 8 | clk, sizeof(bs), bs, sizeof(bs));
-    return 0;
+    PacketResponseNG resp;
+    WaitForResponse(CMD_FSK_SIM_TAG, &resp);
+    if (resp.status!=PM3_EOPABORTED)
+        return resp.status;
+    return PM3_SUCCESS;
 }
 
 static command_t CommandTable[] = {
diff --git a/client/cmdlfviking.c b/client/cmdlfviking.c
index 75b84bed4..c5ad9b055 100644
--- a/client/cmdlfviking.c
+++ b/client/cmdlfviking.c
@@ -117,7 +117,11 @@ static int CmdVikingSim(const char *Cmd) {
     num_to_bytebits(rawID, sizeof(data), data);
     clearCommandBuffer();
     SendCommandOLD(CMD_ASK_SIM_TAG, clk << 8 | encoding, invert << 8 | separator, sizeof(data), data, sizeof(data));
-    return 0;
+    PacketResponseNG resp;
+    WaitForResponse(CMD_ASK_SIM_TAG, &resp);
+    if (resp.status!=PM3_EOPABORTED)
+        return resp.status;
+    return PM3_SUCCESS;
 }
 
 static command_t CommandTable[] = {
diff --git a/client/cmdlfvisa2000.c b/client/cmdlfvisa2000.c
index 2d5808f29..72ffaff38 100644
--- a/client/cmdlfvisa2000.c
+++ b/client/cmdlfvisa2000.c
@@ -205,7 +205,11 @@ static int CmdVisa2kSim(const char *Cmd) {
 
     clearCommandBuffer();
     SendCommandOLD(CMD_ASK_SIM_TAG, clk << 8 | encoding, invert << 8 | separator, sizeof(data), data, sizeof(data));
-    return 0;
+    PacketResponseNG resp;
+    WaitForResponse(CMD_ASK_SIM_TAG, &resp);
+    if (resp.status!=PM3_EOPABORTED)
+        return resp.status;
+    return PM3_SUCCESS;
 }
 
 static command_t CommandTable[] = {
diff --git a/client/comms.c b/client/comms.c
index 38b9ff812..764b70089 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -714,12 +714,12 @@ bool WaitForResponseTimeoutW(uint32_t cmd, PacketResponseNG *response, size_t ms
         }
 
         tmp_clk = __atomic_load_n(&timeout_start_time, __ATOMIC_SEQ_CST);
-        if (msclock() - tmp_clk > ms_timeout)
+        if ((ms_timeout != (size_t) -1) && (msclock() - tmp_clk > ms_timeout))
             break;
 
         if (msclock() - tmp_clk > 3000 && show_warning) {
             // 3 seconds elapsed (but this doesn't mean the timeout was exceeded)
-            PrintAndLogEx(INFO, "Waiting for a response from the proxmark3...");
+//            PrintAndLogEx(INFO, "Waiting for a response from the proxmark3...");
             PrintAndLogEx(INFO, "You can cancel this operation by pressing the pm3 button");
             show_warning = false;
         }

From 84f696451daa50d345f3b9e0792389209ce238b7 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 9 May 2019 01:07:34 +0200
Subject: [PATCH 1680/1938] units

---
 armsrc/iclass.c       |  2 +-
 armsrc/iso14443b.c    |  2 +-
 armsrc/lfsampling.c   |  6 +++---
 armsrc/lfsampling.h   |  4 ++--
 client/cmdhw.c        |  4 ++--
 client/cmdlf.c        | 12 ++++++------
 client/cmdsmartcard.c |  2 +-
 fpga/hi_simulate.v    |  2 +-
 8 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/armsrc/iclass.c b/armsrc/iclass.c
index 8d52ba209..651254716 100644
--- a/armsrc/iclass.c
+++ b/armsrc/iclass.c
@@ -1071,7 +1071,7 @@ static void CodeIClassTagAnswer(const uint8_t *cmd, int len) {
     /*
      * SOF comprises 3 parts;
      * * An unmodulated time of 56.64 us
-     * * 24 pulses of 423.75 KHz (fc/32)
+     * * 24 pulses of 423.75 kHz (fc/32)
      * * A logic 1, which starts with an unmodulated time of 18.88us
      *   followed by 8 pulses of 423.75kHz (fc/32)
      *
diff --git a/armsrc/iso14443b.c b/armsrc/iso14443b.c
index e72625761..ee90b7729 100644
--- a/armsrc/iso14443b.c
+++ b/armsrc/iso14443b.c
@@ -180,7 +180,7 @@ static void CodeIso14443bAsTag(const uint8_t *cmd, int len) {
     * Reader to card | ASK  - Amplitude Shift Keying Modulation (PCD to PICC for Type B) (NRZ-L encodig)
     * Card to reader | BPSK - Binary Phase Shift Keying Modulation, (PICC to PCD for Type B)
     *
-    * fc - carrier frequency 13.56mHz
+    * fc - carrier frequency 13.56 MHz
     * TR0 - Guard Time per 14443-2
     * TR1 - Synchronization Time per 14443-2
     * TR2 - PICC to PCD Frame Delay Time (per 14443-3 Amendment 1)
diff --git a/armsrc/lfsampling.c b/armsrc/lfsampling.c
index 1767f2e64..191f01d5e 100644
--- a/armsrc/lfsampling.c
+++ b/armsrc/lfsampling.c
@@ -20,7 +20,7 @@ sample_config config = { 1, 8, 1, 95, 0 } ;
 
 void printConfig() {
     DbpString(_BLUE_("LF Sampling config"));
-    Dbprintf("  [q] divisor.............%d (%d KHz)", config.divisor, 12000 / (config.divisor + 1));
+    Dbprintf("  [q] divisor.............%d (%d kHz)", config.divisor, 12000 / (config.divisor + 1));
     Dbprintf("  [b] bps.................%d", config.bits_per_sample);
     Dbprintf("  [d] decimation..........%d", config.decimation);
     Dbprintf("  [a] averaging...........%s", (config.averaging) ? "Yes" : "No");
@@ -76,8 +76,8 @@ void pushBit(BitstreamOut *stream, uint8_t bit) {
 /**
 * Setup the FPGA to listen for samples. This method downloads the FPGA bitstream
 * if not already loaded, sets divisor and starts up the antenna.
-* @param divisor : 1, 88> 255 or negative ==> 134.8 KHz
-*                  0 or 95 ==> 125 KHz
+* @param divisor : 1, 88> 255 or negative ==> 134.8 kHz
+*                  0 or 95 ==> 125 kHz
 *
 **/
 void LFSetupFPGAForADC(int divisor, bool lf_field) {
diff --git a/armsrc/lfsampling.h b/armsrc/lfsampling.h
index 8556cd327..e3c7a0b4d 100644
--- a/armsrc/lfsampling.h
+++ b/armsrc/lfsampling.h
@@ -59,8 +59,8 @@ uint32_t DoAcquisition_config(bool silent, int sample_size);
 /**
 * Setup the FPGA to listen for samples. This method downloads the FPGA bitstream
 * if not already loaded, sets divisor and starts up the antenna.
-* @param divisor : 1, 88> 255 or negative ==> 134.8 KHz
-*                  0 or 95 ==> 125 KHz
+* @param divisor : 1, 88> 255 or negative ==> 134.8 kHz
+*                  0 or 95 ==> 125 kHz
 *
 **/
 void LFSetupFPGAForADC(int divisor, bool lf_field);
diff --git a/client/cmdhw.c b/client/cmdhw.c
index b6bcfb5eb..668714703 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -28,7 +28,7 @@ static int usage_hw_detectreader(void) {
     PrintAndLogEx(NORMAL, "Usage:  hw detectreader [h] <L|H>");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "           h          This help");
-    PrintAndLogEx(NORMAL, "           <type>     L = 125/134 kHz, H = 13.56 mHz");
+    PrintAndLogEx(NORMAL, "           <type>     L = 125/134 kHz, H = 13.56 MHz");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "      hw detectreader L");
@@ -418,7 +418,7 @@ static int CmdSetDivisor(const char *Cmd) {
     // 12 000 000 (12Mhz)
     clearCommandBuffer();
     SendCommandMIX(CMD_SET_LF_DIVISOR, arg, 0, 0, NULL, 0);
-    PrintAndLogEx(SUCCESS, "Divisor set, expected %.1f KHz", ((double)12000 / (arg + 1)));
+    PrintAndLogEx(SUCCESS, "Divisor set, expected %.1f kHz", ((double)12000 / (arg + 1)));
     return PM3_SUCCESS;
 }
 
diff --git a/client/cmdlf.c b/client/cmdlf.c
index af6b97bf6..e6cf31c26 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -55,18 +55,18 @@ static int usage_lf_config(void) {
     PrintAndLogEx(NORMAL, "Usage: lf config [h] [H|<divisor>] [b <bps>] [d <decim>] [a 0|1]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       h             This help");
-    PrintAndLogEx(NORMAL, "       L             Low frequency (125 KHz)");
-    PrintAndLogEx(NORMAL, "       H             High frequency (134 KHz)");
-    PrintAndLogEx(NORMAL, "       q <divisor>   Manually set divisor. 88-> 134KHz, 95-> 125 Hz");
+    PrintAndLogEx(NORMAL, "       L             Low frequency (125 kHz)");
+    PrintAndLogEx(NORMAL, "       H             High frequency (134 kHz)");
+    PrintAndLogEx(NORMAL, "       q <divisor>   Manually set divisor. 88-> 134 kHz, 95-> 125 kHz");
     PrintAndLogEx(NORMAL, "       b <bps>       Sets resolution of bits per sample. Default (max): 8");
     PrintAndLogEx(NORMAL, "       d <decim>     Sets decimation. A value of N saves only 1 in N samples. Default: 1");
     PrintAndLogEx(NORMAL, "       a [0|1]       Averaging - if set, will average the stored sample value when decimating. Default: 1");
     PrintAndLogEx(NORMAL, "       t <threshold> Sets trigger threshold. 0 means no threshold (range: 0-128)");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "      lf config b 8 L");
-    PrintAndLogEx(NORMAL, "                    Samples at 125KHz, 8bps.");
+    PrintAndLogEx(NORMAL, "                    Samples at 125 kHz, 8bps.");
     PrintAndLogEx(NORMAL, "      lf config H b 4 d 3");
-    PrintAndLogEx(NORMAL, "                    Samples at 134KHz, averages three samples into one, stored with ");
+    PrintAndLogEx(NORMAL, "                    Samples at 134 kHz, averages three samples into one, stored with ");
     PrintAndLogEx(NORMAL, "                    a resolution of 4 bits per sample.");
     PrintAndLogEx(NORMAL, "      lf read");
     PrintAndLogEx(NORMAL, "                    Performs a read (active field)");
@@ -919,7 +919,7 @@ int CmdLFfind(const char *Cmd) {
     //if (demodFermax())          { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Fermax ID") " found!"); goto out;}
     //if (demodFlex())            { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Flex ID") " found!"); goto out;}
 
-    PrintAndLogEx(FAILED, _RED_("No known 125/134 KHz tags found!"));
+    PrintAndLogEx(FAILED, _RED_("No known 125/134 kHz tags found!"));
 
     if (testRaw == 'u') {
         //test unknown tag formats (raw mode)
diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index c8c33dd4c..bf252f3d7 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -751,7 +751,7 @@ static int CmdSmartInfo(const char *Cmd) {
 
     if (Di && Fi) {
         PrintAndLogEx(NORMAL, "\t- Cycles/ETU %d", Fi / Di);
-        PrintAndLogEx(NORMAL, "\t- %.1f bits/sec at 4MHz", (float)4000000 / (Fi / Di));
+        PrintAndLogEx(NORMAL, "\t- %.1f bits/sec at 4 MHz", (float)4000000 / (Fi / Di));
         PrintAndLogEx(NORMAL, "\t- %.1f bits/sec at Fmax (%.1fMHz)", (F * 1000000) / (Fi / Di), F);
     } else {
         PrintAndLogEx(WARNING, "\t- Di or Fi is RFU.");
diff --git a/fpga/hi_simulate.v b/fpga/hi_simulate.v
index 78650c4a9..aea6b743b 100644
--- a/fpga/hi_simulate.v
+++ b/fpga/hi_simulate.v
@@ -63,7 +63,7 @@ reg ssp_clk;
 always @(negedge adc_clk)
 begin
     if(mod_type == 3'b101)
-      // Get bit every at 53KHz (every 8th carrier bit of 424kHz)
+      // Get bit every at 53kHz (every 8th carrier bit of 424kHz)
       ssp_clk <= ssp_clk_divider[7];
     else if(mod_type == 3'b010)
       // Get next bit at 212kHz

From 730927a81dd341e4dc6bdb05c477cdf81b45843f Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 9 May 2019 12:33:13 +0200
Subject: [PATCH 1681/1938] NG->MIX for few cmds where the zeroes were actual
 args

CMD_READER_ISO_14443a
CMD_EPA_PACE_REPLAY
CMD_TEST_HITAGS_TRACES
CMD_FELICA_COMMAND
---
 client/cmdhfepa.c    | 2 +-
 client/cmdhffelica.c | 2 +-
 client/cmdhftopaz.c  | 2 +-
 client/cmdlfhitag.c  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/cmdhfepa.c b/client/cmdhfepa.c
index e88e1679e..9be248199 100644
--- a/client/cmdhfepa.c
+++ b/client/cmdhfepa.c
@@ -141,7 +141,7 @@ static int CmdHFEPAPACEReplay(const char *Cmd) {
 
     // now perform the replay
     clearCommandBuffer();
-    SendCommandNG(CMD_EPA_PACE_REPLAY, NULL, 0);
+    SendCommandMIX(CMD_EPA_PACE_REPLAY, 0, 0, 0, NULL, 0);
     WaitForResponse(CMD_ACK, &resp);
     if (resp.oldarg[0] != 0) {
         PrintAndLogEx(NORMAL, "\nPACE replay failed in step %u!", (uint32_t)resp.oldarg[0]);
diff --git a/client/cmdhffelica.c b/client/cmdhffelica.c
index 888b49607..6f3e28737 100644
--- a/client/cmdhffelica.c
+++ b/client/cmdhffelica.c
@@ -564,7 +564,7 @@ int readFelicaUid(bool verbose) {
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         if (verbose) PrintAndLogEx(WARNING, "FeliCa card select failed");
-        //SendCommandNG(CMD_FELICA_COMMAND, NULL, 0);
+        //SendCommandMIX(CMD_FELICA_COMMAND, 0, 0, 0, NULL, 0);
         return 0;
     }
 
diff --git a/client/cmdhftopaz.c b/client/cmdhftopaz.c
index dc5064359..973821ffd 100644
--- a/client/cmdhftopaz.c
+++ b/client/cmdhftopaz.c
@@ -35,7 +35,7 @@ static void topaz_switch_on_field(void) {
 }
 
 static void topaz_switch_off_field(void) {
-    SendCommandNG(CMD_READER_ISO_14443a, NULL, 0);
+    SendCommandMIX(CMD_READER_ISO_14443a, 0, 0, 0, NULL, 0);
 }
 
 // send a raw topaz command, returns the length of the response (0 in case of error)
diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index 0c48b22de..330ac5934 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -632,7 +632,7 @@ static int CmdLFHitagCheckChallenges(const char *Cmd) {
     if (file_given)
         SendCommandOLD(CMD_TEST_HITAGS_TRACES, 1, 0, 0, data, datalen);
     else
-        SendCommandNG(CMD_TEST_HITAGS_TRACES, NULL, 0);
+        SendCommandMIX(CMD_TEST_HITAGS_TRACES, 0, 0, 0, NULL, 0);
 
     free(data);
     return 0;

From 7195ce9b27af5c67cd32956f166b25c4a13ee2cf Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 9 May 2019 13:25:14 +0200
Subject: [PATCH 1682/1938] remove iso15 getUID timeout msg

---
 client/cmdhf15.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index 72d456e2e..a862b6d01 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -224,9 +224,6 @@ static int getUID(uint8_t *buf) {
         }
     } // retry
 
-    if (retry >= 3)
-        PrintAndLogEx(WARNING, "timeout while waiting for reply.");
-
     return 0;
 }
 

From 107b3873fb858465ad9833bbb778ff561f211370 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 9 May 2019 15:24:41 +0200
Subject: [PATCH 1683/1938] fix 14a sniff timings by moving away debug msg

---
 armsrc/iso14443a.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 2b5c3f06f..9f870e546 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -509,6 +509,8 @@ void RAMFUNC SniffIso14443a(uint8_t param) {
     // Set up the demodulator for the reader -> tag commands
     UartInit(receivedCmd, receivedCmdPar);
 
+    DbpString("Starting to sniff");
+
     // Setup and start DMA.
     if (!FpgaSetupSscDma((uint8_t *) dmaBuf, DMA_BUFFER_SIZE)) {
         if (MF_DBGLEVEL > 1) Dbprintf("FpgaSetupSscDma failed. Exiting");
@@ -523,8 +525,6 @@ void RAMFUNC SniffIso14443a(uint8_t param) {
 
     uint32_t rx_samples = 0;
 
-    DbpString("Starting to sniff");
-
     // loop and listen
     while (!BUTTON_PRESS()) {
         WDT_HIT();

From 2bee7e12f6b2eabc816d57a9e48c2743a5f97b7a Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 9 May 2019 20:05:12 +0200
Subject: [PATCH 1684/1938] Fix hf mfu dump on ULC: UID in filename

---
 client/cmdhfmfu.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index 4f31f89bb..bb761e1a5 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -2020,9 +2020,11 @@ static int CmdHF14AMfUDump(const char *Cmd) {
     if (fileNameLen < 1) {
 
         PrintAndLogEx(INFO, "Using UID as filename");
-
+        uint8_t uid[7] = {0};
+        memcpy(uid, (uint8_t *)&dump_file_data.data, 3);
+        memcpy(uid + 3, (uint8_t *)&dump_file_data.data + 4, 4);
         fptr += sprintf(fptr, "hf-mfu-");
-        FillFileNameByUID(fptr, card.uid, "-dump", card.uidlen);
+        FillFileNameByUID(fptr, uid, "-dump", sizeof(uid));
     }
     uint16_t datalen = pages * 4 + MFU_DUMP_PREFIX_LENGTH;
     saveFile(filename, ".bin", (uint8_t *)&dump_file_data, datalen);

From 39c794193049985b2fd5c1ce1046bce92588d4ba Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 9 May 2019 20:20:54 +0200
Subject: [PATCH 1685/1938] style

---
 client/cmdhfepa.c       | 2 +-
 client/cmdlf.c          | 8 ++++----
 client/cmdlfawid.c      | 2 +-
 client/cmdlffdx.c       | 2 +-
 client/cmdlfguard.c     | 2 +-
 client/cmdlfhid.c       | 2 +-
 client/cmdlfindala.c    | 2 +-
 client/cmdlfio.c        | 2 +-
 client/cmdlfjablotron.c | 2 +-
 client/cmdlfkeri.c      | 2 +-
 client/cmdlfnedap.c     | 2 +-
 client/cmdlfnoralsy.c   | 2 +-
 client/cmdlfparadox.c   | 2 +-
 client/cmdlfpresco.c    | 2 +-
 client/cmdlfpyramid.c   | 2 +-
 client/cmdlfviking.c    | 2 +-
 client/cmdlfvisa2000.c  | 2 +-
 17 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/client/cmdhfepa.c b/client/cmdhfepa.c
index 9be248199..9aeaabefd 100644
--- a/client/cmdhfepa.c
+++ b/client/cmdhfepa.c
@@ -119,7 +119,7 @@ static int CmdHFEPAPACEReplay(const char *Cmd) {
             if (packet_length > sizeof(data)) {
                 packet_length = sizeof(data);
             }
-            if ((i == sizeof(apdu_lengths)-1) && (j * sizeof(data) >= apdu_lengths[i] - 1)) {
+            if ((i == sizeof(apdu_lengths) - 1) && (j * sizeof(data) >= apdu_lengths[i] - 1)) {
                 // Disable fast mode on last packet
                 conn.block_after_ACK = false;
             }
diff --git a/client/cmdlf.c b/client/cmdlf.c
index e6cf31c26..86e218066 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -441,7 +441,7 @@ int CmdLFSim(const char *Cmd) {
     SendCommandMIX(CMD_SIMULATE_TAG_125K, GraphTraceLen, gap, 0, NULL, 0);
     PacketResponseNG resp;
     WaitForResponse(CMD_SIMULATE_TAG_125K, &resp);
-    if (resp.status!=PM3_EOPABORTED)
+    if (resp.status != PM3_EOPABORTED)
         return resp.status;
     return PM3_SUCCESS;
 }
@@ -532,7 +532,7 @@ int CmdLFfskSim(const char *Cmd) {
     setClockGrid(clk, 0);
     PacketResponseNG resp;
     WaitForResponse(CMD_FSK_SIM_TAG, &resp);
-    if (resp.status!=PM3_EOPABORTED)
+    if (resp.status != PM3_EOPABORTED)
         return resp.status;
     return PM3_SUCCESS;
 }
@@ -621,7 +621,7 @@ int CmdLFaskSim(const char *Cmd) {
     SendCommandOLD(CMD_ASK_SIM_TAG, clk << 8 | encoding, invert << 8 | separator, size, DemodBuffer, size);
     PacketResponseNG resp;
     WaitForResponse(CMD_ASK_SIM_TAG, &resp);
-    if (resp.status!=PM3_EOPABORTED)
+    if (resp.status != PM3_EOPABORTED)
         return resp.status;
     return PM3_SUCCESS;
 }
@@ -728,7 +728,7 @@ int CmdLFpskSim(const char *Cmd) {
     SendCommandOLD(CMD_PSK_SIM_TAG, clk << 8 | carrier, invert, size, DemodBuffer, size);
     PacketResponseNG resp;
     WaitForResponse(CMD_PSK_SIM_TAG, &resp);
-    if (resp.status!=PM3_EOPABORTED)
+    if (resp.status != PM3_EOPABORTED)
         return resp.status;
     return PM3_SUCCESS;
 }
diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c
index ff7c111bd..67c87773e 100644
--- a/client/cmdlfawid.c
+++ b/client/cmdlfawid.c
@@ -345,7 +345,7 @@ static int CmdAWIDSim(const char *Cmd) {
     SendCommandOLD(CMD_FSK_SIM_TAG, (high << 8) + low, (invert << 8) + clk, sizeof(bits), bits, sizeof(bits));
     PacketResponseNG resp;
     WaitForResponse(CMD_FSK_SIM_TAG, &resp);
-    if (resp.status!=PM3_EOPABORTED)
+    if (resp.status != PM3_EOPABORTED)
         return resp.status;
     return PM3_SUCCESS;
 }
diff --git a/client/cmdlffdx.c b/client/cmdlffdx.c
index 29797474c..d8bdb819f 100644
--- a/client/cmdlffdx.c
+++ b/client/cmdlffdx.c
@@ -324,7 +324,7 @@ static int CmdFdxSim(const char *Cmd) {
     SendCommandOLD(CMD_ASK_SIM_TAG, clk << 8 | encoding, invert << 8 | separator, sizeof(data), data, sizeof(data));
     PacketResponseNG resp;
     WaitForResponse(CMD_ASK_SIM_TAG, &resp);
-    if (resp.status!=PM3_EOPABORTED)
+    if (resp.status != PM3_EOPABORTED)
         return resp.status;
     return PM3_SUCCESS;
 }
diff --git a/client/cmdlfguard.c b/client/cmdlfguard.c
index cf5a05056..1d2a6cbf4 100644
--- a/client/cmdlfguard.c
+++ b/client/cmdlfguard.c
@@ -218,7 +218,7 @@ static int CmdGuardSim(const char *Cmd) {
     SendCommandOLD(CMD_ASK_SIM_TAG, (clock1 << 8) | encoding, (invert << 8) | separator, sizeof(bs), bs, sizeof(bs));
     PacketResponseNG resp;
     WaitForResponse(CMD_ASK_SIM_TAG, &resp);
-    if (resp.status!=PM3_EOPABORTED)
+    if (resp.status != PM3_EOPABORTED)
         return resp.status;
     return PM3_SUCCESS;
 }
diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c
index facc3aab7..330fbcb56 100644
--- a/client/cmdlfhid.c
+++ b/client/cmdlfhid.c
@@ -262,7 +262,7 @@ static int CmdHIDSim(const char *Cmd) {
     SendCommandMIX(CMD_HID_SIM_TAG, hi, lo, 0, NULL, 0);
     PacketResponseNG resp;
     WaitForResponse(CMD_HID_SIM_TAG, &resp);
-    if (resp.status!=PM3_EOPABORTED)
+    if (resp.status != PM3_EOPABORTED)
         return resp.status;
     return PM3_SUCCESS;
 }
diff --git a/client/cmdlfindala.c b/client/cmdlfindala.c
index f6e4d2850..4d9cd6009 100644
--- a/client/cmdlfindala.c
+++ b/client/cmdlfindala.c
@@ -404,7 +404,7 @@ static int CmdIndalaSim(const char *Cmd) {
     SendCommandOLD(CMD_PSK_SIM_TAG, clk << 8 | carrier, invert, sizeof(bits), bits, sizeof(bits));
     PacketResponseNG resp;
     WaitForResponse(CMD_PSK_SIM_TAG, &resp);
-    if (resp.status!=PM3_EOPABORTED)
+    if (resp.status != PM3_EOPABORTED)
         return resp.status;
     return PM3_SUCCESS;
 }
diff --git a/client/cmdlfio.c b/client/cmdlfio.c
index 6e7ca1e79..c041032af 100644
--- a/client/cmdlfio.c
+++ b/client/cmdlfio.c
@@ -214,7 +214,7 @@ static int CmdIOProxSim(const char *Cmd) {
     SendCommandOLD(CMD_FSK_SIM_TAG, high << 8 | low, invert << 8 | clk, sizeof(bits), bits, sizeof(bits));
     PacketResponseNG resp;
     WaitForResponse(CMD_FSK_SIM_TAG, &resp);
-    if (resp.status!=PM3_EOPABORTED)
+    if (resp.status != PM3_EOPABORTED)
         return resp.status;
     return PM3_SUCCESS;
 }
diff --git a/client/cmdlfjablotron.c b/client/cmdlfjablotron.c
index 86752bc82..e3e22afa6 100644
--- a/client/cmdlfjablotron.c
+++ b/client/cmdlfjablotron.c
@@ -197,7 +197,7 @@ static int CmdJablotronSim(const char *Cmd) {
     SendCommandOLD(CMD_ASK_SIM_TAG, clk << 8 | encoding, invert << 8 | separator, sizeof(data), data, sizeof(data));
     PacketResponseNG resp;
     WaitForResponse(CMD_ASK_SIM_TAG, &resp);
-    if (resp.status!=PM3_EOPABORTED)
+    if (resp.status != PM3_EOPABORTED)
         return resp.status;
     return PM3_SUCCESS;
 }
diff --git a/client/cmdlfkeri.c b/client/cmdlfkeri.c
index fff641b44..389b47fc4 100644
--- a/client/cmdlfkeri.c
+++ b/client/cmdlfkeri.c
@@ -191,7 +191,7 @@ static int CmdKeriSim(const char *Cmd) {
     SendCommandOLD(CMD_PSK_SIM_TAG, clk << 8 | carrier, invert, sizeof(bits), bits, sizeof(bits));
     PacketResponseNG resp;
     WaitForResponse(CMD_PSK_SIM_TAG, &resp);
-    if (resp.status!=PM3_EOPABORTED)
+    if (resp.status != PM3_EOPABORTED)
         return resp.status;
     return PM3_SUCCESS;
 }
diff --git a/client/cmdlfnedap.c b/client/cmdlfnedap.c
index 03ff95d27..77d00fb5c 100644
--- a/client/cmdlfnedap.c
+++ b/client/cmdlfnedap.c
@@ -251,7 +251,7 @@ static int CmdLFNedapSim(const char *Cmd) {
     SendCommandOLD(CMD_ASK_SIM_TAG, clk << 8 | encoding, invert << 8 | separator, sizeof(bs), bs, sizeof(bs));
     PacketResponseNG resp;
     WaitForResponse(CMD_ASK_SIM_TAG, &resp);
-    if (resp.status!=PM3_EOPABORTED)
+    if (resp.status != PM3_EOPABORTED)
         return resp.status;
     return PM3_SUCCESS;
 }
diff --git a/client/cmdlfnoralsy.c b/client/cmdlfnoralsy.c
index cca9e38ff..1f1231a51 100644
--- a/client/cmdlfnoralsy.c
+++ b/client/cmdlfnoralsy.c
@@ -200,7 +200,7 @@ static int CmdNoralsySim(const char *Cmd) {
     SendCommandOLD(CMD_ASK_SIM_TAG, clk << 8 | encoding, invert << 8 | separator, sizeof(bits), bits, sizeof(bits));
     PacketResponseNG resp;
     WaitForResponse(CMD_ASK_SIM_TAG, &resp);
-    if (resp.status!=PM3_EOPABORTED)
+    if (resp.status != PM3_EOPABORTED)
         return resp.status;
     return PM3_SUCCESS;
 }
diff --git a/client/cmdlfparadox.c b/client/cmdlfparadox.c
index 9b3744878..62b157386 100644
--- a/client/cmdlfparadox.c
+++ b/client/cmdlfparadox.c
@@ -138,7 +138,7 @@ static int CmdParadoxSim(const char *Cmd) {
     SendCommandOLD(CMD_FSK_SIM_TAG, high << 8 | low, invert << 8 | clk, sizeof(bs), bs, sizeof(bs));
     PacketResponseNG resp;
     WaitForResponse(CMD_FSK_SIM_TAG, &resp);
-    if (resp.status!=PM3_EOPABORTED)
+    if (resp.status != PM3_EOPABORTED)
         return resp.status;
     return PM3_SUCCESS;
 
diff --git a/client/cmdlfpresco.c b/client/cmdlfpresco.c
index 15068d9e5..34d144316 100644
--- a/client/cmdlfpresco.c
+++ b/client/cmdlfpresco.c
@@ -156,7 +156,7 @@ static int CmdPrescoSim(const char *Cmd) {
     SendCommandOLD(CMD_ASK_SIM_TAG, clk << 8 | encoding, invert << 8 | separator, sizeof(data), data, sizeof(data));
     PacketResponseNG resp;
     WaitForResponse(CMD_ASK_SIM_TAG, &resp);
-    if (resp.status!=PM3_EOPABORTED)
+    if (resp.status != PM3_EOPABORTED)
         return resp.status;
     return PM3_SUCCESS;
 }
diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c
index 8201e0a18..fd3363d8a 100644
--- a/client/cmdlfpyramid.c
+++ b/client/cmdlfpyramid.c
@@ -280,7 +280,7 @@ static int CmdPyramidSim(const char *Cmd) {
     SendCommandOLD(CMD_FSK_SIM_TAG, high << 8 | low, invert << 8 | clk, sizeof(bs), bs, sizeof(bs));
     PacketResponseNG resp;
     WaitForResponse(CMD_FSK_SIM_TAG, &resp);
-    if (resp.status!=PM3_EOPABORTED)
+    if (resp.status != PM3_EOPABORTED)
         return resp.status;
     return PM3_SUCCESS;
 }
diff --git a/client/cmdlfviking.c b/client/cmdlfviking.c
index c5ad9b055..588d335a8 100644
--- a/client/cmdlfviking.c
+++ b/client/cmdlfviking.c
@@ -119,7 +119,7 @@ static int CmdVikingSim(const char *Cmd) {
     SendCommandOLD(CMD_ASK_SIM_TAG, clk << 8 | encoding, invert << 8 | separator, sizeof(data), data, sizeof(data));
     PacketResponseNG resp;
     WaitForResponse(CMD_ASK_SIM_TAG, &resp);
-    if (resp.status!=PM3_EOPABORTED)
+    if (resp.status != PM3_EOPABORTED)
         return resp.status;
     return PM3_SUCCESS;
 }
diff --git a/client/cmdlfvisa2000.c b/client/cmdlfvisa2000.c
index 72ffaff38..e6df8cad2 100644
--- a/client/cmdlfvisa2000.c
+++ b/client/cmdlfvisa2000.c
@@ -207,7 +207,7 @@ static int CmdVisa2kSim(const char *Cmd) {
     SendCommandOLD(CMD_ASK_SIM_TAG, clk << 8 | encoding, invert << 8 | separator, sizeof(data), data, sizeof(data));
     PacketResponseNG resp;
     WaitForResponse(CMD_ASK_SIM_TAG, &resp);
-    if (resp.status!=PM3_EOPABORTED)
+    if (resp.status != PM3_EOPABORTED)
         return resp.status;
     return PM3_SUCCESS;
 }

From 7928a824345a0d96aa97fd73326a9c6d6585b916 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 10 May 2019 07:46:49 +0200
Subject: [PATCH 1686/1938] uart_win32: Remove debug msgs

---
 uart/uart_win32.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/uart/uart_win32.c b/uart/uart_win32.c
index fe25a2887..e516a42d7 100644
--- a/uart/uart_win32.c
+++ b/uart/uart_win32.c
@@ -171,7 +171,7 @@ int uart_receive(const serial_port sp, uint8_t *pbtRx, uint32_t pszMaxRxLen, uin
         return PM3_EIO;
     }
 
-    printf("[!]res %d | rx errorcode == %d \n", res, errorcode);
+//    printf("[!]res %d | rx errorcode == %d \n", res, errorcode);
     return res;
 }
 
@@ -186,7 +186,7 @@ int uart_send(const serial_port sp, const uint8_t *p_tx, const uint32_t len) {
         return PM3_EIO;
     }
 
-    printf("[!!]res %d | send errorcode == %d \n", res, errorcode);
+//    printf("[!!]res %d | send errorcode == %d \n", res, errorcode);
     return PM3_ENOTTY;
 }
 

From fa87266efcf819e0a52d250f3846ca95b0943205 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 10 May 2019 08:37:52 +0200
Subject: [PATCH 1687/1938] update new format doc

---
 doc/new_frame_format.txt | 83 +++++++++++++++++++++++-----------------
 include/pm3_cmd.h        |  2 +-
 2 files changed, 49 insertions(+), 36 deletions(-)

diff --git a/doc/new_frame_format.txt b/doc/new_frame_format.txt
index 1d4d4abed..76e4a7217 100644
--- a/doc/new_frame_format.txt
+++ b/doc/new_frame_format.txt
@@ -118,11 +118,13 @@ On the client, for sending frames:
 (client->comms.c)
 *****************************************
 void SendCommandNG(uint16_t cmd, uint8_t *data, size_t len);
+void SendCommandBL(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
 void SendCommandOLD(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
 void SendCommandMIX(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
 *****************************************
 
 So cmds should make the transition from SendCommandOLD to SendCommandNG to benefit from smaller frames (and armsrc handlers adjusted accordingly of course).
+SendCommandBL is for Bootloader-related activities, see Bootrom section.
 SendCommandMIX is a transition fct: it uses the same API as SendCommandOLD but benefits somehow from variable length frames. It occupies at least 24b of data for the oldargs and real data is therefore limited to PM3_CMD_DATA_SIZE - 24 (defined as PM3_CMD_DATA_SIZE_MIX). Besides the size limitation, the receiver handler doesn't know if this was an OLD frame or a MIX frame, it gets its oldargs and data as usual.
 Warning : it makes sense to move from SendCommandOLD to SendCommandMIX only for *commands with small payloads*.
 * otherwise both have about the same size
@@ -153,12 +155,12 @@ int16_t reply_mix(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, voi
 So replies should make the transition from reply_old to reply_ng to benefit from smaller frames (and client reception adjusted accordingly of course).
 reply_mix is a transition fct: it uses the same API as reply_old but benefits somehow from variable length frames. It occupies at least 24b of data for the oldargs and real data is therefore limited to PM3_CMD_DATA_SIZE - 24. Besides the size limitation, the client command doesn't know if this was an OLD frame or a MIX frame, it gets its oldargs and data as usual.
 
-Example with CMD_PING that supports both styles (from client CmdPing or CmdPingNG) and replies with the new frame format when it receives new command format:
+Example of a handler that supports both OLD/MIX and NG command styles and replies with the new frame format when it receives new command format:
     if (packet->ng) {
-        reply_ng(CMD_PING, PM3_SUCCESS, packet->data.asBytes, packet->length);
+        reply_ng(CMD_FOOBAR, PM3_SUCCESS, packet->data.asBytes, packet->length);
     } else {
-        // reply_old(CMD_ACK, reply_via_fpc, 0, 0, 0, 0);
-        reply_mix(CMD_ACK, reply_via_fpc, 0, 0, 0, 0);
+        // reply_old(CMD_ACK, 0, 0, 0, packet->data.asBytes, packet->length);
+        reply_mix(CMD_ACK, 0, 0, 0, packet->data.asBytes, packet->length);
     }
 
 On the client, for receiving frames:
@@ -183,8 +185,8 @@ In short, to move from one format to the other, we need for each command:
 
 Meanwhile, a fast transition to MIX frames can be done with:
 
-* (client TX) SendCommandOLD -> SendCommandMIX (but check the limited data size)
-* (pm3 TX) reply_old -> reply_mix (but check the limited data size)
+* (client TX) SendCommandOLD -> SendCommandMIX (but check the limited data size PM3_CMD_DATA_SIZE -> PM3_CMD_DATA_SIZE_MIX)
+* (pm3 TX) reply_old -> reply_mix (but check the limited data size PM3_CMD_DATA_SIZE -> PM3_CMD_DATA_SIZE_MIX)
 
 Bootrom
 =======
@@ -193,6 +195,8 @@ Bootrom code will still use the old frame format to remain compatible with other
 * almost all frames convey 512b of payload, so difference in overhead is neglictible
 * bringing flash over usart sounds risky and would be terribly slow anyway (115200 bauds vs. 7M bauds).
 
+SendCommandBL is the same as SendCommandOLD with a different name to be sure not to migrate it.
+
 On the Proxmark3, for receiving frames:
 ---------------------------------------
 (bootrom/bootrom.c)
@@ -276,21 +280,30 @@ USART_BAUD_RATE defined there
     linux usb: #db#   USB Transfer Speed PM3 -> Client = 666624 Bytes/s (equiv. to ~7Mbaud)
 
 
-(uart/uart_posix.c)
-// Receiving from USART need more than 30ms as we used on USB
-// else we get errors about "Received packet frame ... too short"
-// Now we're using 100ms
-// FTDI   9600 hw status -> we need 20ms
-// FTDI 115200 hw status -> we need 50ms
-// FTDI 460800 hw status -> we need 30ms
-struct timeval timeout = {
-    .tv_sec  =      0, // 0 second
-    .tv_usec = 100000  // 100 000 micro seconds
-};
+(pm3_cmd.h)
+
+Receiving from USART need more than 30ms as we used on USB
+else we get errors about partial packet reception
+FTDI   9600 hw status        -> we need 20ms
+FTDI 115200 hw status        -> we need 50ms
+FTDI 460800 hw status        -> we need 30ms
+BT   115200 hf mf fchk 1 dic -> we need 140ms
+
+# define UART_FPC_CLIENT_RX_TIMEOUT_MS  170
+# define UART_USB_CLIENT_RX_TIMEOUT_MS  20
+# define UART_TCP_CLIENT_RX_TIMEOUT_MS  300
+
+This goes to uart_posix.c timeval struct
+and uart_win32.c serial_port_windows struct
+
+It starts at UART_FPC_CLIENT_RX_TIMEOUT_MS and once we detect we're working over USB
+it's reduced to UART_USB_CLIENT_RX_TIMEOUT_MS.
+
+
 
 Add automatically some communication delay in the WaitForResponseTimeout & dl_it timeouts
 Only when using FPC, timeout = 2* empirically measured delay (FTDI cable)
-Empirically measured delay (FTDI cable) with "hw pingng 512" :
+Empirically measured delay (FTDI cable) with "hw ping 512" :
    usb ->    6..  32ms
 460800 ->   40..  70ms
   9600 -> 1100..1150ms
@@ -311,8 +324,12 @@ Needed to tune pm3 RX usart maxtry
 uint32_t usart_read_ng(uint8_t *data, size_t len) {
 // Empirical max try observed: 3000000 / USART_BAUD_RATE
 // Let's take 10x
-uint32_t maxtry = 10 * ( 3000000 / USART_BAUD_RATE );
-
+uint32_t tryconstant = 0;
+#ifdef USART_SLOW_LINK
+    // Experienced up to 13200 tries on BT link even at 460800
+    tryconstant = 50000;
+#endif
+    uint32_t maxtry = 10 * (3000000 / USART_BAUD_RATE) + tryconstant;
 
 
 DbpStringEx using reply_old:
@@ -382,7 +399,7 @@ Or if it's too complex to determine when we're sending the last command:
     }
     // Disable fast mode and send a dummy command to make it effective
     conn.block_after_ACK = false;
-    SendCommandMIX(CMD_PING, 0, 0, 0, NULL, 0);
+    SendCommandNG(CMD_PING, NULL, 0);
     WaitForResponseTimeout(CMD_ACK, NULL, 1000);
     return PM3_SUCCESS;
 
@@ -392,6 +409,10 @@ Reference frames
 
 For helping debug...
 
+OLD command and reply packets are 544 bytes.
+NG & MIX command packets are between 10 and 522 bytes.
+NG & MIX reply packets are between 12 and 524 bytes.
+
 On linux USB
 * sent packets can be 544
 * received packets are max 128, so 544 = 128+128+128+128+32
@@ -399,34 +420,26 @@ On linux UART (FTDI)
 * sent packets are max 256, so 544 = 256+256+32
 * received packets are max 512, so 544 = 512+32
 
-Initial connection:
+"hw ping" (old version, mix reply)
 TestProxmark: SendCommandOLD(CMD_PING, 0, 0, 0, NULL, 0);
 ->544=0901000000000000000000000000000000000000000000000000000000000000  -> OLD
 CMD_PING: reply_mix(CMD_ACK, reply_via_fpc, 0, 0, 0, 0);
 <-36=504d336218000000ff0000000000000000000000000000000000000000000000   <- MIX
-main_loop pm3_version: SendCommandOLD(CMD_VERSION, 0, 0, 0, NULL, 0);
-->544=0701000000000000000000000000000000000000000000000000000000000000  -> OLD
-SendVersion:  reply_old(CMD_ACK,...);
-<-128=ff000000000000004f0a0b270000000009710300000000000000000000000000  <- OLD
-<-128=6572696d656e74616c5f7661726c656e2f33646431663163372d64697274792d
-<-128=484620696d616765206275696c7420666f7220327333307671313030206f6e20
-<-128=0000000000000000000000000000000000000000000000000000000000000000
-<-32=0000000000000000000000000000000000000000000000000000000000000000
 
-"hw ping"
+"hw ping" (intermediate version using MIX)
 CmdPing  SendCommandMIX(CMD_PING, 0, 0, 0, NULL, 0);
 ->34=504d336118000901000000000000000000000000000000000000000000000000   -> MIX
 CMD_PING reply_mix(CMD_ACK, reply_via_fpc, 0, 0, 0, 0);
 <-36=504d336218000000ff0000000000000000000000000000000000000000000000   <- MIX
 
-"hw pingng"
-CmdPingNG  SendCommandNG(CMD_PING, data, len);
+"hw ping" (current version)
+CmdPing  SendCommandNG(CMD_PING, data, len);
 ->10=504d3361008009016133                                               -> NG
 CMD_PING reply_ng(CMD_PING, PM3_SUCCESS, packet->data.asBytes, packet->length);
 <-12=504d33620080000009016233                                           <- NG
 
-"hw pingng 512"
-CmdPingNG  SendCommandNG(CMD_PING, data, len);
+"hw ping 512"
+CmdPing  SendCommandNG(CMD_PING, data, len);
 ->522=504d336100820901000102030405060708090a0b0c0d0e0f1011121314151617  -> NG
 CMD_PING reply_ng(CMD_PING, PM3_SUCCESS, packet->data.asBytes, packet->length);
 <-128=504d3362008200000901000102030405060708090a0b0c0d0e0f101112131415  <- NG
diff --git a/include/pm3_cmd.h b/include/pm3_cmd.h
index d6c06ec4f..102b87b82 100644
--- a/include/pm3_cmd.h
+++ b/include/pm3_cmd.h
@@ -473,7 +473,7 @@ extern capabilities_t pm3_capabilities;
 // all zero's configure: no timeout for read/write used.
 // took settings from libnfc/buses/uart.c
 
-// uart_windows.c
+// uart_windows.c & uart_posix.c
 # define UART_FPC_CLIENT_RX_TIMEOUT_MS  170
 # define UART_USB_CLIENT_RX_TIMEOUT_MS  20
 # define UART_TCP_CLIENT_RX_TIMEOUT_MS  300

From 94b782ee107c9981e0eb2172bdada78bad462f30 Mon Sep 17 00:00:00 2001
From: Uli Heilmeier <uh@heilmeier.eu>
Date: Fri, 10 May 2019 12:24:38 +0200
Subject: [PATCH 1688/1938] client/Makefile: use brew libreadline on macOS

Make sure we use libreadline from brew and not the default macOS shipped one.
Otherwise compilation fails for undefined rl_event_hook
---
 client/Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/Makefile b/client/Makefile
index 318e2f1bd..72b124d73 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -72,6 +72,8 @@ else
     LUAPLATFORM = macosx
     OBJCSRCS = util_darwin.m
     LDFLAGS += -framework Foundation -framework AppKit
+    LDLIBS := -L/usr/local/opt/readline/lib $(LDLIBS)
+    LIBS := -I/usr/local/opt/readline/include $(LIBS)
 else
     LUALIB +=  -ldl
     LDLIBS +=  -ltermcap -lncurses

From 0119e13ff31007ca473a02f334f1897412ebb37b Mon Sep 17 00:00:00 2001
From: Uli Heilmeier <uh@heilmeier.eu>
Date: Fri, 10 May 2019 14:50:09 +0200
Subject: [PATCH 1689/1938] client/comms.c: fix buffer overflow

Don't copy more bytes into pm3_capabilities as its size.

Fix: RfidResearchGroup/proxmark3#189
---
 client/comms.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/comms.c b/client/comms.c
index 764b70089..187761ae0 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -613,7 +613,7 @@ int TestProxmark(void) {
 
         SendCommandNG(CMD_CAPABILITIES, NULL, 0);
         if (WaitForResponseTimeoutW(CMD_CAPABILITIES, &resp, 1000, false)) {
-            memcpy(&pm3_capabilities, resp.data.asBytes, resp.length);
+            memcpy(&pm3_capabilities, resp.data.asBytes, MIN(sizeof(capabilities_t), resp.length));
             conn.send_via_fpc_usart = pm3_capabilities.via_fpc;
             conn.uart_speed = pm3_capabilities.baudrate;
             PrintAndLogEx(INFO, "Communicating with PM3 over %s", conn.send_via_fpc_usart ? _YELLOW_("FPC UART") : _YELLOW_("USB-CDC"));

From a1c24c6c7df20ec205e4859a278f088332eecc90 Mon Sep 17 00:00:00 2001
From: Uli Heilmeier <uh@heilmeier.eu>
Date: Thu, 9 May 2019 16:34:06 +0200
Subject: [PATCH 1690/1938] Cmdtrace: Show trace ouput in hexdump format

Adding option 'x' to show trace output for 14a in hexdump format.
This output can be imported into Wireshark using the 'Import from Hex Dump' option.
Encapsulation type should be set to 'ISO 14443' and Max Frame Length to 256.

Format defined at https://www.kaiser.cx/pcap-iso14443.html
---
 client/cmdtrace.c | 95 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 95 insertions(+)

diff --git a/client/cmdtrace.c b/client/cmdtrace.c
index e50a2b2c4..eb0c70732 100644
--- a/client/cmdtrace.c
+++ b/client/cmdtrace.c
@@ -20,6 +20,8 @@ static int usage_trace_list() {
     PrintAndLogEx(NORMAL, "Usage:  trace list <protocol> [f][c| <0|1>");
     PrintAndLogEx(NORMAL, "    f      - show frame delay times as well");
     PrintAndLogEx(NORMAL, "    c      - mark CRC bytes");
+    PrintAndLogEx(NORMAL, "    x      - show hexdump to convert to pcap(ng) or to import into Wireshark using encapsulation type \"ISO 14443\"");
+    PrintAndLogEx(NORMAL, "             syntax to use: `text2pcap -t \"%%S.\" -l 264 -n <input-text-file> <output-pcapng-file>`");
     PrintAndLogEx(NORMAL, "    <0|1>  - use data from Tracebuffer, if not set, try reading data from tag.");
     PrintAndLogEx(NORMAL, "Supported <protocol> values:");
     PrintAndLogEx(NORMAL, "    raw    - just show raw data without annotations");
@@ -102,6 +104,90 @@ static bool merge_topaz_reader_frames(uint32_t timestamp, uint32_t *duration, ui
     return true;
 }
 
+static uint16_t printHexLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, uint8_t protocol) {
+    // sanity check
+    if (tracepos + sizeof(uint32_t) + sizeof(uint16_t) + sizeof(uint16_t) > traceLen) return traceLen;
+
+    bool isResponse;
+    uint16_t data_len, parity_len;
+    uint32_t timestamp;
+
+    timestamp = *((uint32_t *)(trace + tracepos));
+    tracepos += 4;
+
+
+    // currently we don't use duration, so we skip it
+    tracepos += 2;
+
+    data_len = *((uint16_t *)(trace + tracepos));
+    tracepos += 2;
+
+    if (data_len & 0x8000) {
+        data_len &= 0x7fff;
+        isResponse = true;
+    } else {
+        isResponse = false;
+    }
+    parity_len = (data_len - 1) / 8 + 1;
+
+    if (tracepos + data_len + parity_len > traceLen) {
+        return traceLen;
+    }
+    uint8_t *frame = trace + tracepos;
+    tracepos += data_len;
+    //currently we don't use parity bytes, so we skip it
+    tracepos += parity_len;
+
+    if (data_len == 0) {
+        PrintAndLogEx(NORMAL, "<empty trace - possible error>");
+        return tracepos;
+    }
+
+    switch (protocol) {
+        case ISO_14443A:
+            {
+            /* https://www.kaiser.cx/pcap-iso14443.html defines a pseudo header:
+             * version (currently 0x00), event (Rdr: 0xfe, Tag: 0xff), length (2 bytes)
+             * to convert to pcap(ng) via text2pcap or to import into Wireshark
+             * we use format timestamp, newline, offset (0x000000), pseudo header, data
+             * `text2pcap -t "%S." -l 264 -n <input-text-file> <output-pcapng-file>`
+             */
+            char line[(data_len *3) + 1];
+            char *ptr = &line[0];
+
+            for (int j = 0; j < data_len ; j++) {
+                 ptr += sprintf (ptr, "%02x", frame[j]);
+                 ptr += sprintf (ptr, " ");
+            }
+
+            char data_len_str[5];
+            char temp_str1[3] = {0};
+            char temp_str2[3] = {0};
+
+            sprintf(data_len_str, "%04x", data_len);
+            strncat(temp_str1, data_len_str, 2);
+	    temp_str1[2] = '\0';
+            strncat(temp_str2, data_len_str + 2, 2);
+	    temp_str2[2] = '\0';
+
+            PrintAndLogEx(NORMAL, "0.%010u", timestamp);
+            PrintAndLogEx(NORMAL, "000000 00 %s %s %s %s",
+                         (isResponse ? "ff" : "fe"),
+                         temp_str1,
+                         temp_str2,
+                         line);
+            return tracepos;
+            }
+       default:
+            PrintAndLogEx(NORMAL, "Currently only 14a supported");
+            return traceLen;
+    }
+
+    if (is_last_record(tracepos, trace, traceLen)) return traceLen;
+
+    return tracepos;
+}
+
 static uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, uint8_t protocol, bool showWaitCycles, bool markCRCBytes) {
     // sanity check
     if (tracepos + sizeof(uint32_t) + sizeof(uint16_t) + sizeof(uint16_t) > traceLen) return traceLen;
@@ -592,6 +678,7 @@ int CmdTraceList(const char *Cmd) {
 
     bool showWaitCycles = false;
     bool markCRCBytes = false;
+    bool showHex = false;
     bool isOnline = true;
     bool errors = false;
     uint8_t protocol = 0;
@@ -618,6 +705,10 @@ int CmdTraceList(const char *Cmd) {
                     markCRCBytes = true;
                     cmdp++;
                     break;
+                case 'x':
+                    showHex = true;
+                    cmdp++;
+                    break;
                 case '0':
                     isOnline = true;
                     cmdp++;
@@ -695,6 +786,10 @@ int CmdTraceList(const char *Cmd) {
     PrintAndLogEx(INFO, "");
     if (protocol == FELICA) {
         printFelica(traceLen, trace);
+    } else if (showHex) {
+        while (tracepos < traceLen) {
+            tracepos = printHexLine(tracepos, traceLen, trace, protocol);
+        }
     } else {
         PrintAndLogEx(NORMAL, "Start = Start of Start Bit, End = End of last modulation. Src = Source of Transfer");
         if (protocol == ISO_14443A || protocol == PROTO_MIFARE)

From 3412e9d8c55eae57b0366a393b1aa6c84b642499 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 10 May 2019 19:00:18 +0200
Subject: [PATCH 1691/1938] Capabilities versionning, would also detect
 platform struct pack issues

---
 armsrc/appmain.c  | 1 +
 client/comms.c    | 5 +++++
 include/pm3_cmd.h | 3 ++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index ef3d099d0..6b9bfaf6f 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -428,6 +428,7 @@ void SendStatus(void) {
 
 void SendCapabilities(void) {
     capabilities_t capabilities;
+    capabilities.version = CAPABILITIES_VERSION;
     capabilities.via_fpc = reply_via_fpc;
     if (reply_via_fpc)
         capabilities.baudrate = USART_BAUD_RATE;
diff --git a/client/comms.c b/client/comms.c
index 187761ae0..ab5ab27ab 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -613,6 +613,11 @@ int TestProxmark(void) {
 
         SendCommandNG(CMD_CAPABILITIES, NULL, 0);
         if (WaitForResponseTimeoutW(CMD_CAPABILITIES, &resp, 1000, false)) {
+            if ((resp.length != sizeof(pm3_capabilities)) || (resp.data.asBytes[0] != CAPABILITIES_VERSION)) {
+                PrintAndLogEx(ERR, _RED_("Capabilities structure version sent by Proxmark3 is not the same as the one used by the client!"));
+                PrintAndLogEx(ERR, _RED_("Please flash the Proxmark with the same version as the client."));
+                return PM3_EDEVNOTSUPP;
+            }
             memcpy(&pm3_capabilities, resp.data.asBytes, MIN(sizeof(capabilities_t), resp.length));
             conn.send_via_fpc_usart = pm3_capabilities.via_fpc;
             conn.uart_speed = pm3_capabilities.baudrate;
diff --git a/include/pm3_cmd.h b/include/pm3_cmd.h
index 102b87b82..ae576e087 100644
--- a/include/pm3_cmd.h
+++ b/include/pm3_cmd.h
@@ -138,6 +138,7 @@ typedef struct {
 } t55xx_config;
 
 typedef struct {
+    uint8_t version;
     uint32_t baudrate;
     bool via_fpc                       : 1;
     // rdv4
@@ -164,7 +165,7 @@ typedef struct {
     bool hw_available_flash            : 1;
     bool hw_available_smartcard        : 1;
 } PACKED capabilities_t;
-
+#define CAPABILITIES_VERSION 1
 extern capabilities_t pm3_capabilities;
 
 // For the bootloader

From 345f936054fe57069c634c50e561f78c22666a8b Mon Sep 17 00:00:00 2001
From: Uli Heilmeier <uh@heilmeier.eu>
Date: Fri, 10 May 2019 22:39:54 +0200
Subject: [PATCH 1692/1938] Doc: Update macOS install instruction

Reviewed install instructions for macOS and updated where necessary.
---
 ...OS-X-Homebrew-Installation-Instructions.md | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/doc/md/Installation_Instructions/Mac-OS-X-Homebrew-Installation-Instructions.md b/doc/md/Installation_Instructions/Mac-OS-X-Homebrew-Installation-Instructions.md
index 0f6151869..34b9c3aa5 100644
--- a/doc/md/Installation_Instructions/Mac-OS-X-Homebrew-Installation-Instructions.md
+++ b/doc/md/Installation_Instructions/Mac-OS-X-Homebrew-Installation-Instructions.md
@@ -12,25 +12,33 @@ For further questions about Mac & Homebrew,  contact @Chrisfu  (https://github.c
 
 *This method is useful for those looking to run bleeding-edge versions of RRG/iceman's client. Keep this in mind when attempting to update your HomeBrew tap formula as this procedure could easily cause a build to break if an update is unstable on macOS.* 
 
-Tested on macOS High Sierra 10.13.2
+Tested on macOS Mojave 10.14.4
 
 *Note: This assumes you have already installed RRG/iceman's fork from HomeBrew as mentioned above*
 
 Force HomeBrew to pull the latest source from github
-```
-brew upgrade --fetch-HEAD RfidResearchGroup/proxmark3
+
+```sh
+brew upgrade --fetch-HEAD proxmark3
 ```
 
 ## Flash the BOOTROM & FULLIMAGE
 
-With your Proxmark3 unplugged from your machine, press and hold the button on your Proxmark3 as you plug it into a USB port. Continue to hold the button until after this step is complete and the `proxmark3-flasher` command outputs "Have a nice day!"*
+With your Proxmark3 unplugged from your machine, press and hold the button on your Proxmark3 as you plug it into a USB port. Continue to hold the button until after this step is complete and the `proxmark3-flasher` command outputs "Have a nice day!"
+
+```sh
+sudo proxmark3-flasher /dev/tty.usbmodemiceman1 -b /usr/local/Cellar/proxmark3/HEAD-<Commit-ID>/share/firmware/bootrom.elf /usr/local/Cellar/proxmark3/HEAD-<Commit-ID>/share/firmware/fullimage.elf
+```
+
+> Replace \<Commit-ID\> with the HEAD-XXXX ID displayed by brew.  
+> Depending on the firmware version your Proxmark3 can also appear as `/dev/tty.usbmodem881`
+
 
-`$ sudo proxmark3-flasher /dev/tty.usbmodem881 -b /usr/local/Cellar/proxmark3/HEAD-6a710ef/share/firmware/bootrom.elf /usr/local/Cellar/proxmark3/HEAD-6a710ef/share/firmware/fullimage.elf`
 
 ## Run the client
 
 ```sh
-sudo proxmark3 /dev/tty.usbmodem881
+sudo proxmark3 /dev/tty.usbmodemiceman1
 ```
 
 ## Next steps

From d44a5712a7a2aeb8169e137ac9958299ad6351d9 Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Sun, 12 May 2019 18:43:20 +0200
Subject: [PATCH 1693/1938] add: default key for library / parking

---
 client/default_keys.dic | 1519 ++++++++++++++++++++-------------------
 1 file changed, 761 insertions(+), 758 deletions(-)

diff --git a/client/default_keys.dic b/client/default_keys.dic
index cd23d9a0d..e98f28926 100644
--- a/client/default_keys.dic
+++ b/client/default_keys.dic
@@ -1,758 +1,761 @@
-#
-# Mifare Default Keys
-#   -- iceman fork version --
-#   -- contribute to this list, sharing is caring --
-#
-ffffffffffff,//Defaultkey(firstkeyusedbyprogramifnouserdefinedkey)
-000000000000,//Blankkey
-a0a1a2a3a4a5,//NFCForumMADkey
-b0b1b2b3b4b5,
-c0c1c2c3c4c5,
-d0d1d2d3d4d5,
-aabbccddeeff,
-4d3a99c351dd,
-1a982c7e459a,
-d3f7d3f7d3f7,// key A Wien
-5a1b85fce20a,// key B Wien
-714c5c886e97,
-587ee5f9350f,
-a0478cc39091,
-533cb6c723f6,
-8fd0a4f256e9,
-#
-# more Keys from mf_default_keys.lua
-000000000001,
-000000000002,
-00000000000a,
-00000000000b,
-00000ffe2488,--VästtrafikenKeyB
-010203040506,
-0123456789ab,
-0297927c0f77,--VästtrafikenKeyA
-100000000000,
-111111111111,
-123456789abc,
-12f2ee3478c1,
-14d446e33363,
-1999a3554a55,
-200000000000,
-222222222222,
-26940b21ff5d,--RKFSLKeyA
-27dd91f1fcf1,
-2BA9621E0A36,--DirectoryandeventlogKeyB
-333333333333,
-33f974b42769,
-34d1df9934c5,
-434f4d4d4f41,--RKFJOJOGROUPKeyA
-434f4d4d4f42,--RKFJOJOGROUPKeyB
-43ab19ef5c31,
-444444444444,
-47524f555041,--RKFJOJOGROUPKeyA
-47524f555042,--RKFJOJOGROUPKeyB
-4AF9D7ADEBE4,--DirectoryandeventlogKeyA
-4b0b20107ccb,--TNP3xxx
-505249564141,--RKFJOJOPRIVAKeyA
-505249564142,--RKFJOJOPRIVAKeyB
-505249565441,
-505249565442,
-54726176656c,--VästtrafikenKeyA
-555555555555,
-55f5a5dd38c9,
-569369c5a0e5,--kiev
-5c598c9c58b5,--RKFSLKeyB
-632193be1c3c,--kiev
-644672bd4afe,--kiev
-666666666666,
-722bfcc5375f,--RKFRejskortDanmarkKeyA
-776974687573,--VästtrafikenKeyB
-777777777777,
-888888888888,
-8fe644038790,--kiev
-999999999999,
-99c636334433,
-9de89e070277,--kiev
-a00000000000,
-a053a292a4af,
-a64598a77478,--RKFSLKeyA
-a94133013401,
-aaaaaaaaaaaa,
-abcdef123456,--Keyfromladyada.net
-b00000000000,
-b127c6f41436,
-b5ff67cba951,--kiev
-bbbbbbbbbbbb,
-bd493a3962b6,
-c934fe34d934,
-cccccccccccc,
-dddddddddddd,
-e4d2770a89be,--RKFSLKeyB
-ee0042f88840,--VästtrafikenKeyB
-eeeeeeeeeeee,
-eff603e1efe9,--kiev
-f14ee7cae863,--kiev
-f1a97341a9fc,
-f1d83f964314,--RKFRejskortDanmarkKeyB
-fc00018778f7,--VästtrafikenKeyA, RKFÖstgötaTrafikenKeyA
-44ab09010845,-- hotel system
-85fed980ea5a,-- hotel system
-314B49474956,--VIGIK1KeyA
-564c505f4d41,--VIGIK1KeyB
-ba5b895da162,--VIGIK1KeyB
-4143414F5250,
-#
-# Data from: http://irq5.io/2013/04/13/decoding-bcard-conference-badges/
-f4a9ef2afc6d,--BCARD KeyB
-#
-#
-a9f953def0a3,--
-75ccb59c9bed,-- mystery KeyA Mifare 1k EV1 (S50) Sector 17!
-4b791bea7bcc,-- mystery KeyB Mifare 1k EV1 (S50) Sector 17!
-#
-# Here be BIP keys...
-3A42F33AF429,
-1FC235AC1309,
-6338A371C0ED,
-243F160918D1,
-F124C2578AD0,
-9AFC42372AF1,
-32AC3B90AC13,
-682D401ABB09,
-4AD1E273EAF1,
-067DB45454A9,
-E2C42591368A,
-15FC4C7613FE,
-2A3C347A1200,
-68D30288910A,
-16F3D5AB1139,
-F59A36A2546D,
-937A4FFF3011,
-64E3C10394C2,
-35C3D2CAEE88,
-B736412614AF,
-693143F10368,
-324F5DF65310,
-A3F97428DD01,
-643FB6DE2217,
-63F17A449AF0,
-82F435DEDF01,
-C4652C54261C,
-0263DE1278F3,
-D49E2826664F,
-51284C3686A6,
-3DF14C8000A1,
-6A470D54127C,
-#
-# Data from: http://pastebin.com/AK9Bftpw
-48ffe71294a0, -- Länstrafiken i Västerbotten
-e3429281efc1, -- Länstrafiken i Västerbotten
-16f21a82ec84, -- Länstrafiken i Västerbotten
-460722122510, -- Länstrafiken i Västerbotten
-#
-# 3dprinter
-AAFB06045877, --EPI Envisionte# 3dprinter
-#
-# gym
-3e65e4fb65b3, --Fysiken A
-25094df6f148, --Fysiken B
-#
-# 24-7
-D21762B2DE3B,
-0E83A374B513,
-1F1FFE000000,
-A10F303FC879,
-1322285230b8,
-0C71BCFB7E72,
-C3C88C6340B8,
-F101622750B7,
-1F107328DC8D,
-710732200D34,
-7C335FB121B5,
-B39AE17435DC,
-#
-#
-454841585443, -- key A
-#
-# Data from: http://pastebin.com/gQ6nk38G
-D39BB83F5297,
-85675B200017,
-528C9DFFE28C,
-C82EC29E3235,
-3E3554AF0E12,
-491CDCFB7752,
-22C1BAE1AACD,
-5F146716E373,
-740E9A4F9AAF,
-AC0E24C75527,
-97184D136233,
-E444D53D359F,
-17758856B182,
-A8966C7CC54B,
-C6AD00254562,
-AE3FF4EEA0DB,
-5EB8F884C8D1,
-FEE470A4CB58,
-75D8690F21B6,
-871B8C085997,
-97D1101F18B0,
-75EDE6A84460,
-DF27A8F1CB8E,
-B0C9DD55DD4D,
-#
-# Data from: http://bit.ly/1bdSbJl
-A0B0C0D0E0F0,
-A1B1C1D1E1F1,
-#
-# Data from: msk social
-2735fc181807,
-2aba9519f574,
-84fd7f7a12b6,
-186d8c4b93f9,
-3a4bba8adaf0,
-8765b17968a2,
-40ead80721ce,
-0db5e6523f7c,
-51119dae5216,
-83e3549ce42d,
-136bdb246cac,
-7de02a7f6025,
-bf23a53c1f63,
-cb9a1f2d7368,
-c7c0adb3284f,
-9f131d8c2057,
-67362d90f973,
-6202a38f69e2,
-100533b89331,
-653a87594079,
-d8a274b2e026,
-b20b83cb145c,
-9afa6cb4fc3d,
-#
-# Data from http://pastebin.com/RRJUEDCM
-0d258fe90296,
-e55a3ca71826,
-a4f204203f56,
-eeb420209d0c,
-911e52fd7ce4,
-752fbb5b7b45,
-66b03aca6ee9,
-48734389edc3,
-17193709adf4,
-1acc3189578c,
-c2b7ec7d4eb1,
-369a4663acd2,
-#
-# Data from https://github.com/zhangjingye03/zxcardumper
-# zxcard Key A/B
-668770666644,
-003003003003,
-#
-# Data from: http://phreakerclub.com/forum/showthread.php?p=41266
-26973ea74321,
-71f3a315ad26,
-51044efb5aab,
-ac70ca327a04,
-eb0a8ff88ade,
-#
-# Data from: https://github.com/RadioWar/NFCGUI
-44dd5a385aaf,
-21a600056cb0,
-b1aca33180a5,
-dd61eb6bce22,
-1565a172770f,
-3e84d2612e2a,
-f23442436765,
-79674f96c771,
-87df99d496cb,
-c5132c8980bc,
-a21680c27773,
-f26e21edcee2,
-675557ecc92e,
-f4396e468114,
-6db17c16b35b,
-4186562a5bb2,
-2feae851c199,
-db1a3338b2eb,
-157b10d84c6b,
-a643f952ea57,
-df37dcb6afb3,
-4c32baf326e0,
-91ce16c07ac5,
-3c5d1c2bcd18,
-c3f19ec592a2,
-f72a29005459,
-185fa3438949,
-321a695bd266,
-d327083a60a7,
-45635ef66ef3,
-5481986d2d62,
-cba6ae869ad5,
-645a166b1eeb,
-a7abbc77cc9e,
-f792c4c76a5c,
-bfb6796a11db,
-#
-# Data from Salto A/B
-6A1987C40A21,
-7F33625BC129,
-#
-# Data from forum
-2338b4913111,
-#
-# Data from stoye
-cb779c50e1bd,
-a27d3804c259,
-003cc420001a,
-f9861526130f,
-381ece050fbd,
-a57186bdd2b9,
-48c739e21a04,
-36abf5874ed7,
-649d2abbbd20,
-bbe8fffcf363,
-ab4e7045e97d,
-340e40f81cd8,
-e4f65c0ef32c,
-d2a597d76936,
-a920f32fe93a,
-86afd95200f7,
-9b832a9881ff,
-26643965b16e,
-0c669993c776,
-b468d1991af9,
-d9a37831dce5,
-2fc1f32f51b1,
-0ffbf65b5a14,
-c5cfe06d9ea3,
-c0dece673829,
-#
-a56c2df9a26d,
-#
-# Data from: https://pastebin.com/vbwast74
-#
-68d3f7307c89,
-568c9083f71c,--Smart Rider. Western Australian Public Transport Cards
-# Vigik Keys
-# Various sources :
-# * https://github.com/DumpDos/Vigik
-# * http://newffr.com/viewtopic.php?&forum=235&topic=11559
-# * Own dumps
-021209197591,  // BTCINO UNDETERMINED SPREAKD 0x01->0x13 key
-2ef720f2af76,
-414c41524f4e,
-424c41524f4e,
-4a6352684677,
-bf1f4424af76,
-536653644c65,
-#
-# Intratone Cogelec
-# Data from http://bouzdeck.com/rfid/32-cloning-a-mifare-classic-1k-tag.html
-484558414354,
-a22ae129c013,
-49fae4e3849f,
-38fcf33072e0,
-8ad5517b4b18,
-509359f131b1,
-6c78928e1317,
-aa0720018738,
-a6cac2886412,
-62d0c424ed8e,
-e64a986a5d94,
-8fa1d601d0a2,
-89347350bd36,
-66d2b7dc39ef,
-6bc1e1ae547d,
-22729a9bd40f,
-#
-# Data from https://dfir.lu/blog/cloning-a-mifare-classic-1k-tag.html
-925b158f796f,
-fad63ecb5891,
-bba840ba1c57,
-cc6b3b3cd263,
-6245e47352e6,
-8ed41e8b8056,
-2dd39a54e1f3,
-6d4c5b3658d2,
-1877ed29435a,
-52264716efde,
-961c0db4a7ed,
-703140fd6d86,
-157c9a513fa5,
-e2a5dc8e066f,
-#
-# Data from a oyster card
-374bf468607f,
-bfc8e353af63,
-15cafd6159f6,
-62efd80ab715,
-987a7f7f1a35,
-c4104fa3c526,
-4c961f23e6be,
-67546972bc69,
-f4cd5d4c13ff,
-94414c1a07dc,
-16551d52fd20,
-9cb290282f7d,
-77a84170b574,
-ed646c83a4f3,
-e703589db50b,
-513c85d06cde,
-95093f0b2e22,
-543b01b27a95,
-c6d375b99972,
-ee4cc572b40e,
-5106ca7e4a69,
-c96bd1ce607f,
-167a1be102e0,
-a8d0d850a606,
-a2abb693ce34,
-7b296c40c486,
-91f93a5564c9,
-e10623e7a016,
-b725f9cbf183,
-#
-# Data from FDi tag
-8829da9daf76,
-#
-# Data from GitHub issue
-0A7932DC7E65,
-11428B5BCE06,
-11428B5BCE07,
-11428B5BCE08,
-11428B5BCE09,
-11428B5BCE0A,
-11428B5BCE0F,
-18971D893494,
-25D60050BF6E,
-3FA7217EC575,
-44F0B5FBE344,
-7B296F353C6B,
-8553263F4FF0,
-8E5D33A6ED51,
-9F42971E8322,
-C620318EF179,
-D4FE03CE5B06,
-D4FE03CE5B07,
-D4FE03CE5B08,
-D4FE03CE5B09,
-D4FE03CE5B0A,
-D4FE03CE5B0F,
-E241E8AFCBAF,
-#
-# Data from forum post
-123F8888F322,
-050908080008,
-#
-# Data from hoist
-4f9f59c9c875,
-#
-# Data from pastebin
-66f3ed00fed7,
-f7a39753d018,
-#
-# Data from https://pastebin.com/Z7pEeZif
-386B4D634A65,
-666E564F4A44,
-564777315276,
-476242304C53,
-6A696B646631,
-4D3248735131,
-425A73484166,
-57784A533069,
-345547514B4D,
-4C6B69723461,
-4E4175623670,
-4D5076656D58,
-686A736A356E,
-484A57696F4A,
-6F4B6D644178,
-744E326B3441,
-70564650584F,
-584F66326877,
-6D4E334B6C48,
-6A676C315142,
-77494C526339,
-623055724556,
-356D46474348,
-4E32336C6E38,
-57734F6F6974,
-436A46587552,
-5544564E6E67,
-6F506F493353,
-31646241686C,
-77646B633657,
-#
-# Data from TransPert
-2031d1e57a3b,
-53c11f90822a,
-9189449ea24e,
-#
-# data from Github
-410b9b40b872,
-2cb1a90071c8,
-#
-# data from
-8697389ACA26,
-1AB23CD45EF6,
-013889343891,
-#
-#
-0000000018de,
-16ddcb6b3f24,
-#
-# Data from https://pastebin.com/vwDRZW7d
-EC0A9B1A9E06,--Vingcard Mifare 4k Staff card
-6C94E1CED026,--Vingcard Mifare 4k Staff card
-0F230695923F,--Vingcard Mifare 4k Staff card
-0000014B5C31,--Vingcard Mifare 4k Staff card
-#
-BEDB604CC9D1,
-B8A1F613CF3D,
-B578F38A5C61,
-AD4FB33388BF,
-69FB7B7CD8EE,
-2A6D9205E7CA,
-2a2c13cc242a,
-27FBC86A00D0,
-01FA3FC68349,
-#
-6D44B5AAF464,--Smart Rider. Western Australian Public Transport Cards
-1717E34A7A8A,--Smart Rider. Western Australian Public Transport Cards
-#
-6B6579737472,--RFIDeas
-#
-484944204953,--HID MIFARE Classic 1k Key
-204752454154,--HID MIFARE Classic 1k Key
-3B7E4FD575AD,--HID MIFARE SO
-11496F97752A,--HID MIFARE SO
-#
-415A54454B4D,--Luxeo/Aztek cashless vending
-#
-321958042333,--BQT
-#
-160A91D29A9C,--Aperio KEY_A Sector 1, 12, 13, 14, 15 Data Start 0 Length 48
-#
-b7bf0c13066e,--Gallagher
-#
-# Boston, MA, USA Transit - MBTA Charlie Card
-3060206f5b0a,-- charlie
-5ec39b022f2b,-- charlie
-3a09594c8587,-- charlie
-f1b9f5669cc8,-- charlie
-f662248e7e89,-- charlie
-62387b8d250d,-- charlie
-f238d78ff48f,-- charlie
-9dc282d46217,-- charlie
-afd0ba94d624,-- charlie
-92ee4dc87191,-- charlie
-b35a0e4acc09,-- charlie
-756ef55e2507,-- charlie
-447ab7fd5a6b,-- charlie
-932b9cb730ef,-- charlie
-1f1a0a111b5b,-- charlie
-ad9e0a1ca2f7,-- charlie
-d58023ba2bdc,-- charlie
-62ced42a6d87,-- charlie
-2548a443df28,-- charlie
-2ed3b15e7c0f,-- charlie
-#
-60012e9ba3fa,
-#
-de1fcbec764b,
-81bfbe8cacba,
-bff123126c9b,
-2f47741062a0,
-b4166b0a27ea,
-a170d9b59f95,
-400bc9be8976,
-d80511fc2ab4,
-1fcef3005bcf,
-bb467463acd6,
-e67c8010502d,
-ff58ba1b4478,
-# Data from https://pastebin.com/Kz8xp4ev
-fbf225dc5d58,
-#
-# Data  https://pastebin.com/BEm6bdAE
-# vingcard.txt
-4708111c8604,
-3d50d902ea48,
-96a301bce267,
-6700f10fec09,
-7a09cc1db70a,
-560f7cff2d81,
-66b31e64ca4b,
-9e53491f685b,
-3a09911d860c,
-8a036920ac0c,
-361f69d2c462,
-d9bcde7fc489,
-0c03a720f208,
-6018522fac02,
-#
-# Data from https://pastebin.com/4t2yFMgt
-# Mifare technische Universität Graz TUG
-D58660D1ACDE,
-50A11381502C,
-C01FC822C6E5,
-0854BF31111E,
-# More keys:
-8a19d40cf2b5,
-ae8587108640,
-135b88a94b8b, SafLock standalone door locks.
-#
-# Russian Troika card
-08B386463229,
-0E8F64340BA4,
-0F1C63013DBA,
-2AA05ED1856F,
-2B7F3253FAC5,
-69A32F1C2F19,
-73068F118C13,
-9BECDF3D9273,
-A73F5DC1D333,
-A82607B01C0D,
-AE3D65A3DAD4,
-CD4C61C26E3D,
-D3EAFB5DF46D,
-E35173494A81,
-FBC2793D540B,
-5125974CD391,
-ECF751084A80,
-7545DF809202,
-AB16584C972A,
-7A38E3511A38,
-C8454C154CB5,
-04C297B91308,
-EFCB0E689DB3,
-07894FFEC1D6,
-FBA88F109B32,
-2FE3CB83EA43,
-B90DE525CEB6,
-1CC219E9FEC1,
-A74332F74994,
-764CD061F1E6,
-8F79C4FD8A01,
-CD64E567ABCD,
-CE26ECB95252,
-ABA208516740,
-9868925175BA,
-16A27AF45407,
-372CC880F216,
-3EBCE0925B2F,
-73E5B9D9D3A4,
-0DB520C78C1C,
-70D901648CB9,
-C11F4597EFB5,
-B39D19A280DF,
-403D706BA880,
-7038CD25C408,
-6B02733BB6EC,
-EAAC88E5DC99,
-4ACEC1205D75,
-2910989B6880,
-31C7610DE3B0,
-5EFBAECEF46B,
-F8493407799D,
-6B8BD9860763,
-D3A297DC2698,
-#
-# Keys from MifareClassicTool project
-044CE1872BC3,
-045CECA15535,
-0BE5FAC8B06A,
-0CE7CD2CC72B,
-0EB23CC8110B,
-0F01CEFF2742,
-0F318130ED18,
-114D6BE9440C,
-18E3A02B5EFF,
-19FC84A3784B,
-1B61B2E78C75,
-22052B480D11,
-3367BFAA91DB,
-3A8A139C20B4,
-42E9B54E51AB,
-46D78E850A7E,
-4B609876BBA3,
-518DC6EEA089,
-6B07877E2C5C,
-7259FA0197C6,
-72F96BDD3714,
-7413B599C4EA,
-77DABC9825E1,
-7A396F0D633D,
-7A86AA203788,
-8791B2CCB5C4,
-8A8D88151A00,
-8C97CD7A0E56,
-8E26E45E7D65,
-9D993C5D4EF4,
-9EA3387A63C1,
-A3FAA6DAFF67,
-A7141147D430,
-AAFB06045877,
-ACFFFFFFFFFF,
-AFCEF64C9913,
-B27ADDFB64B0,
-B81F2B0C2F66,
-B9F8A7D83978,
-BAFF3053B496,
-BB52F8CCE07F,
-BC2D1791DEC1,
-BC4580B7F20B,
-C65D4EAA645B,
-C76BF71A2509,
-D5524F591EED,
-E328A1C7156D,
-E4821A377B75,
-E56AC127DD45,
-EA0FD73CB149,
-FC0001877BF7,
-FD8705E721B0,
-00ada2cd516d,
-#
-#
-D3F7D3F7D3F7
-##
-237a4d0d9119,
-0ed7846c2bc9,
-FFFFD06F83E3,
-FFFFAE82366C,
-F89C86B2A961,
-F83466888612,
-ED3A7EFBFF56,
-E96246531342,
-E1DD284379D4,
-DFED39FFBB76,
-DB5181C92CBE,
-CFC738403AB0,
-BCFE01BCFE01,
-BA28CFD15EE8,
-B0699AD03D17,
-AABBCC660429,
-A4EF6C3BB692,
-A2B2C9D187FB,
-9B1DD7C030A1,
-9AEDF9931EC1,
-8F9B229047AC,
-872B71F9D15A,
-833FBD3CFE51,
-5D293AFC8D7E,
-5554AAA96321,
-474249437569,
-435330666666,
-1A2B3C4D5E6F,
-123456ABCDEF,
-83BAB5ACAD62,
-64E2283FCF5E,
-64A2EE93B12B,
-46868F6D5677,
-40E5EA1EFC00,
-37D4DCA92451,
-2012053082AD,
-2011092119F1,
-200306202033,
-1795902DBAF9,
-17505586EF02,
-022FE48B3072,
-013940233313,
+#
+# Mifare Default Keys
+#   -- iceman fork version --
+#   -- contribute to this list, sharing is caring --
+#
+ffffffffffff,//Defaultkey(firstkeyusedbyprogramifnouserdefinedkey)
+000000000000,//Blankkey
+a0a1a2a3a4a5,//NFCForumMADkey
+b0b1b2b3b4b5,
+c0c1c2c3c4c5,
+d0d1d2d3d4d5,
+aabbccddeeff,
+4d3a99c351dd,
+1a982c7e459a,
+d3f7d3f7d3f7,// key A Wien
+5a1b85fce20a,// key B Wien
+714c5c886e97,
+587ee5f9350f,
+a0478cc39091,
+533cb6c723f6,
+8fd0a4f256e9,
+#
+d2ece8b9395e,  //lib
+#
+# more Keys from mf_default_keys.lua
+000000000001,
+000000000002,
+00000000000a,
+00000000000b,
+00000ffe2488,--VästtrafikenKeyB
+010203040506,
+0123456789ab,
+0297927c0f77,--VästtrafikenKeyA
+100000000000,
+111111111111,
+123456789abc,
+12f2ee3478c1,
+14d446e33363,
+1999a3554a55,
+200000000000,
+222222222222,
+26940b21ff5d,--RKFSLKeyA
+27dd91f1fcf1,
+2BA9621E0A36,--DirectoryandeventlogKeyB
+333333333333,
+33f974b42769,
+34d1df9934c5,
+434f4d4d4f41,--RKFJOJOGROUPKeyA
+434f4d4d4f42,--RKFJOJOGROUPKeyB
+43ab19ef5c31,
+444444444444,
+47524f555041,--RKFJOJOGROUPKeyA
+47524f555042,--RKFJOJOGROUPKeyB
+4AF9D7ADEBE4,--DirectoryandeventlogKeyA
+4b0b20107ccb,--TNP3xxx
+505249564141,--RKFJOJOPRIVAKeyA
+505249564142,--RKFJOJOPRIVAKeyB
+505249565441,
+505249565442,
+54726176656c,--VästtrafikenKeyA
+555555555555,
+55f5a5dd38c9,
+569369c5a0e5,--kiev
+5c598c9c58b5,--RKFSLKeyB
+632193be1c3c,--kiev
+644672bd4afe,--kiev
+666666666666,
+722bfcc5375f,--RKFRejskortDanmarkKeyA
+776974687573,--VästtrafikenKeyB
+777777777777,
+888888888888,
+8fe644038790,--kiev
+999999999999,
+99c636334433,
+9de89e070277,--kiev
+a00000000000,
+a053a292a4af,
+a64598a77478,--RKFSLKeyA
+a94133013401,
+aaaaaaaaaaaa,
+abcdef123456,--Keyfromladyada.net
+b00000000000,
+b127c6f41436,
+b5ff67cba951,--kiev
+bbbbbbbbbbbb,
+bd493a3962b6,
+c934fe34d934,
+cccccccccccc,
+dddddddddddd,
+e4d2770a89be,--RKFSLKeyB
+ee0042f88840,--VästtrafikenKeyB
+eeeeeeeeeeee,
+eff603e1efe9,--kiev
+f14ee7cae863,--kiev
+f1a97341a9fc,
+f1d83f964314,--RKFRejskortDanmarkKeyB
+fc00018778f7,--VästtrafikenKeyA, RKFÖstgötaTrafikenKeyA
+44ab09010845,-- hotel system
+85fed980ea5a,-- hotel system
+314B49474956,--VIGIK1KeyA
+564c505f4d41,--VIGIK1KeyB
+ba5b895da162,--VIGIK1KeyB
+4143414F5250,
+#
+# Data from: http://irq5.io/2013/04/13/decoding-bcard-conference-badges/
+f4a9ef2afc6d,--BCARD KeyB
+#
+#
+a9f953def0a3,--
+75ccb59c9bed,-- mystery KeyA Mifare 1k EV1 (S50) Sector 17!
+4b791bea7bcc,-- mystery KeyB Mifare 1k EV1 (S50) Sector 17!
+#
+# Here be BIP keys...
+3A42F33AF429,
+1FC235AC1309,
+6338A371C0ED,
+243F160918D1,
+F124C2578AD0,
+9AFC42372AF1,
+32AC3B90AC13,
+682D401ABB09,
+4AD1E273EAF1,
+067DB45454A9,
+E2C42591368A,
+15FC4C7613FE,
+2A3C347A1200,
+68D30288910A,
+16F3D5AB1139,
+F59A36A2546D,
+937A4FFF3011,
+64E3C10394C2,
+35C3D2CAEE88,
+B736412614AF,
+693143F10368,
+324F5DF65310,
+A3F97428DD01,
+643FB6DE2217,
+63F17A449AF0,
+82F435DEDF01,
+C4652C54261C,
+0263DE1278F3,
+D49E2826664F,
+51284C3686A6,
+3DF14C8000A1,
+6A470D54127C,
+#
+# Data from: http://pastebin.com/AK9Bftpw
+48ffe71294a0, -- Länstrafiken i Västerbotten
+e3429281efc1, -- Länstrafiken i Västerbotten
+16f21a82ec84, -- Länstrafiken i Västerbotten
+460722122510, -- Länstrafiken i Västerbotten
+#
+# 3dprinter
+AAFB06045877, --EPI Envisionte# 3dprinter
+#
+# gym
+3e65e4fb65b3, --Fysiken A
+25094df6f148, --Fysiken B
+#
+# 24-7
+D21762B2DE3B,
+0E83A374B513,
+1F1FFE000000,
+A10F303FC879,
+1322285230b8,
+0C71BCFB7E72,
+C3C88C6340B8,
+F101622750B7,
+1F107328DC8D,
+710732200D34,
+7C335FB121B5,
+B39AE17435DC,
+#
+#
+454841585443, -- key A
+#
+# Data from: http://pastebin.com/gQ6nk38G
+D39BB83F5297,
+85675B200017,
+528C9DFFE28C,
+C82EC29E3235,
+3E3554AF0E12,
+491CDCFB7752,
+22C1BAE1AACD,
+5F146716E373,
+740E9A4F9AAF,
+AC0E24C75527,
+97184D136233,
+E444D53D359F,
+17758856B182,
+A8966C7CC54B,
+C6AD00254562,
+AE3FF4EEA0DB,
+5EB8F884C8D1,
+FEE470A4CB58,
+75D8690F21B6,
+871B8C085997,
+97D1101F18B0,
+75EDE6A84460,
+DF27A8F1CB8E,
+B0C9DD55DD4D,
+#
+# Data from: http://bit.ly/1bdSbJl
+A0B0C0D0E0F0,
+A1B1C1D1E1F1,
+#
+# Data from: msk social
+2735fc181807,
+2aba9519f574,
+84fd7f7a12b6,
+186d8c4b93f9,
+3a4bba8adaf0,
+8765b17968a2,
+40ead80721ce,
+0db5e6523f7c,
+51119dae5216,
+83e3549ce42d,
+136bdb246cac,
+7de02a7f6025,
+bf23a53c1f63,
+cb9a1f2d7368,
+c7c0adb3284f,
+9f131d8c2057,
+67362d90f973,
+6202a38f69e2,
+100533b89331,
+653a87594079,
+d8a274b2e026,
+b20b83cb145c,
+9afa6cb4fc3d,
+#
+# Data from http://pastebin.com/RRJUEDCM
+0d258fe90296,
+e55a3ca71826,
+a4f204203f56,
+eeb420209d0c,
+911e52fd7ce4,
+752fbb5b7b45,
+66b03aca6ee9,
+48734389edc3,
+17193709adf4,
+1acc3189578c,
+c2b7ec7d4eb1,
+369a4663acd2,
+#
+# Data from https://github.com/zhangjingye03/zxcardumper
+# zxcard Key A/B
+668770666644,
+003003003003,
+#
+# Data from: http://phreakerclub.com/forum/showthread.php?p=41266
+26973ea74321,
+71f3a315ad26,
+51044efb5aab,
+ac70ca327a04,
+eb0a8ff88ade,
+#
+# Data from: https://github.com/RadioWar/NFCGUI
+44dd5a385aaf,
+21a600056cb0,
+b1aca33180a5,
+dd61eb6bce22,
+1565a172770f,
+3e84d2612e2a,
+f23442436765,
+79674f96c771,
+87df99d496cb,
+c5132c8980bc,
+a21680c27773,
+f26e21edcee2,
+675557ecc92e,
+f4396e468114,
+6db17c16b35b,
+4186562a5bb2,
+2feae851c199,
+db1a3338b2eb,
+157b10d84c6b,
+a643f952ea57,
+df37dcb6afb3,
+4c32baf326e0,
+91ce16c07ac5,
+3c5d1c2bcd18,
+c3f19ec592a2,
+f72a29005459,
+185fa3438949,
+321a695bd266,
+d327083a60a7,
+45635ef66ef3,
+5481986d2d62,
+cba6ae869ad5,
+645a166b1eeb,
+a7abbc77cc9e,
+f792c4c76a5c,
+bfb6796a11db,
+#
+# Data from Salto A/B
+6A1987C40A21,
+7F33625BC129,
+#
+# Data from forum
+2338b4913111,
+#
+# Data from stoye
+cb779c50e1bd,
+a27d3804c259,
+003cc420001a,
+f9861526130f,
+381ece050fbd,
+a57186bdd2b9,
+48c739e21a04,
+36abf5874ed7,
+649d2abbbd20,
+bbe8fffcf363,
+ab4e7045e97d,
+340e40f81cd8,
+e4f65c0ef32c,
+d2a597d76936,
+a920f32fe93a,
+86afd95200f7,
+9b832a9881ff,
+26643965b16e,
+0c669993c776,
+b468d1991af9,
+d9a37831dce5,
+2fc1f32f51b1,
+0ffbf65b5a14,
+c5cfe06d9ea3,
+c0dece673829,
+#
+a56c2df9a26d,
+#
+# Data from: https://pastebin.com/vbwast74
+#
+68d3f7307c89,
+568c9083f71c,--Smart Rider. Western Australian Public Transport Cards
+# Vigik Keys
+# Various sources :
+# * https://github.com/DumpDos/Vigik
+# * http://newffr.com/viewtopic.php?&forum=235&topic=11559
+# * Own dumps
+021209197591,  // BTCINO UNDETERMINED SPREAKD 0x01->0x13 key
+2ef720f2af76,
+414c41524f4e,
+424c41524f4e,
+4a6352684677,
+bf1f4424af76,
+536653644c65,
+#
+# Intratone Cogelec
+# Data from http://bouzdeck.com/rfid/32-cloning-a-mifare-classic-1k-tag.html
+484558414354,
+a22ae129c013,
+49fae4e3849f,
+38fcf33072e0,
+8ad5517b4b18,
+509359f131b1,
+6c78928e1317,
+aa0720018738,
+a6cac2886412,
+62d0c424ed8e,
+e64a986a5d94,
+8fa1d601d0a2,
+89347350bd36,
+66d2b7dc39ef,
+6bc1e1ae547d,
+22729a9bd40f,
+#
+# Data from https://dfir.lu/blog/cloning-a-mifare-classic-1k-tag.html
+925b158f796f,
+fad63ecb5891,
+bba840ba1c57,
+cc6b3b3cd263,
+6245e47352e6,
+8ed41e8b8056,
+2dd39a54e1f3,
+6d4c5b3658d2,
+1877ed29435a,
+52264716efde,
+961c0db4a7ed,
+703140fd6d86,
+157c9a513fa5,
+e2a5dc8e066f,
+#
+# Data from a oyster card
+374bf468607f,
+bfc8e353af63,
+15cafd6159f6,
+62efd80ab715,
+987a7f7f1a35,
+c4104fa3c526,
+4c961f23e6be,
+67546972bc69,
+f4cd5d4c13ff,
+94414c1a07dc,
+16551d52fd20,
+9cb290282f7d,
+77a84170b574,
+ed646c83a4f3,
+e703589db50b,
+513c85d06cde,
+95093f0b2e22,
+543b01b27a95,
+c6d375b99972,
+ee4cc572b40e,
+5106ca7e4a69,
+c96bd1ce607f,
+167a1be102e0,
+a8d0d850a606,
+a2abb693ce34,
+7b296c40c486,
+91f93a5564c9,
+e10623e7a016,
+b725f9cbf183,
+#
+# Data from FDi tag
+8829da9daf76,
+#
+# Data from GitHub issue
+0A7932DC7E65,
+11428B5BCE06,
+11428B5BCE07,
+11428B5BCE08,
+11428B5BCE09,
+11428B5BCE0A,
+11428B5BCE0F,
+18971D893494,
+25D60050BF6E,
+3FA7217EC575,
+44F0B5FBE344,
+7B296F353C6B,
+8553263F4FF0,
+8E5D33A6ED51,
+9F42971E8322,
+C620318EF179,
+D4FE03CE5B06,
+D4FE03CE5B07,
+D4FE03CE5B08,
+D4FE03CE5B09,
+D4FE03CE5B0A,
+D4FE03CE5B0F,
+E241E8AFCBAF,
+#
+# Data from forum post
+123F8888F322,
+050908080008,
+#
+# Data from hoist
+4f9f59c9c875,
+#
+# Data from pastebin
+66f3ed00fed7,
+f7a39753d018,
+#
+# Data from https://pastebin.com/Z7pEeZif
+386B4D634A65,
+666E564F4A44,
+564777315276,
+476242304C53,
+6A696B646631,
+4D3248735131,
+425A73484166,
+57784A533069,
+345547514B4D,
+4C6B69723461,
+4E4175623670,
+4D5076656D58,
+686A736A356E,
+484A57696F4A,
+6F4B6D644178,
+744E326B3441,
+70564650584F,
+584F66326877,
+6D4E334B6C48,
+6A676C315142,
+77494C526339,
+623055724556,
+356D46474348,
+4E32336C6E38,
+57734F6F6974,
+436A46587552,
+5544564E6E67,
+6F506F493353,
+31646241686C,
+77646B633657,
+#
+# Data from TransPert
+2031d1e57a3b,
+53c11f90822a,
+9189449ea24e,
+#
+# data from Github
+410b9b40b872,
+2cb1a90071c8,
+#
+# data from
+8697389ACA26,
+1AB23CD45EF6,
+013889343891,
+#
+#
+0000000018de,
+16ddcb6b3f24,
+#
+# Data from https://pastebin.com/vwDRZW7d
+EC0A9B1A9E06,--Vingcard Mifare 4k Staff card
+6C94E1CED026,--Vingcard Mifare 4k Staff card
+0F230695923F,--Vingcard Mifare 4k Staff card
+0000014B5C31,--Vingcard Mifare 4k Staff card
+#
+BEDB604CC9D1,
+B8A1F613CF3D,
+B578F38A5C61,
+AD4FB33388BF,
+69FB7B7CD8EE,
+2A6D9205E7CA,
+2a2c13cc242a,
+27FBC86A00D0,
+01FA3FC68349,
+#
+6D44B5AAF464,--Smart Rider. Western Australian Public Transport Cards
+1717E34A7A8A,--Smart Rider. Western Australian Public Transport Cards
+#
+6B6579737472,--RFIDeas
+#
+484944204953,--HID MIFARE Classic 1k Key
+204752454154,--HID MIFARE Classic 1k Key
+3B7E4FD575AD,--HID MIFARE SO
+11496F97752A,--HID MIFARE SO
+#
+415A54454B4D,--Luxeo/Aztek cashless vending
+#
+321958042333,--BQT
+#
+160A91D29A9C,--Aperio KEY_A Sector 1, 12, 13, 14, 15 Data Start 0 Length 48
+#
+b7bf0c13066e,--Gallagher
+#
+# Boston, MA, USA Transit - MBTA Charlie Card
+3060206f5b0a,-- charlie
+5ec39b022f2b,-- charlie
+3a09594c8587,-- charlie
+f1b9f5669cc8,-- charlie
+f662248e7e89,-- charlie
+62387b8d250d,-- charlie
+f238d78ff48f,-- charlie
+9dc282d46217,-- charlie
+afd0ba94d624,-- charlie
+92ee4dc87191,-- charlie
+b35a0e4acc09,-- charlie
+756ef55e2507,-- charlie
+447ab7fd5a6b,-- charlie
+932b9cb730ef,-- charlie
+1f1a0a111b5b,-- charlie
+ad9e0a1ca2f7,-- charlie
+d58023ba2bdc,-- charlie
+62ced42a6d87,-- charlie
+2548a443df28,-- charlie
+2ed3b15e7c0f,-- charlie
+#
+60012e9ba3fa,
+#
+de1fcbec764b,
+81bfbe8cacba,
+bff123126c9b,
+2f47741062a0,
+b4166b0a27ea,
+a170d9b59f95,
+400bc9be8976,
+d80511fc2ab4,
+1fcef3005bcf,
+bb467463acd6,
+e67c8010502d,
+ff58ba1b4478,
+# Data from https://pastebin.com/Kz8xp4ev
+fbf225dc5d58,
+#
+# Data  https://pastebin.com/BEm6bdAE
+# vingcard.txt
+4708111c8604,
+3d50d902ea48,
+96a301bce267,
+6700f10fec09,
+7a09cc1db70a,
+560f7cff2d81,
+66b31e64ca4b,
+9e53491f685b,
+3a09911d860c,
+8a036920ac0c,
+361f69d2c462,
+d9bcde7fc489,
+0c03a720f208,
+6018522fac02,
+#
+# Data from https://pastebin.com/4t2yFMgt
+# Mifare technische Universität Graz TUG
+D58660D1ACDE,
+50A11381502C,
+C01FC822C6E5,
+0854BF31111E,
+# More keys:
+8a19d40cf2b5,
+ae8587108640,
+135b88a94b8b, SafLock standalone door locks.
+#
+# Russian Troika card
+08B386463229,
+0E8F64340BA4,
+0F1C63013DBA,
+2AA05ED1856F,
+2B7F3253FAC5,
+69A32F1C2F19,
+73068F118C13,
+9BECDF3D9273,
+A73F5DC1D333,
+A82607B01C0D,
+AE3D65A3DAD4,
+CD4C61C26E3D,
+D3EAFB5DF46D,
+E35173494A81,
+FBC2793D540B,
+5125974CD391,
+ECF751084A80,
+7545DF809202,
+AB16584C972A,
+7A38E3511A38,
+C8454C154CB5,
+04C297B91308,
+EFCB0E689DB3,
+07894FFEC1D6,
+FBA88F109B32,
+2FE3CB83EA43,
+B90DE525CEB6,
+1CC219E9FEC1,
+A74332F74994,
+764CD061F1E6,
+8F79C4FD8A01,
+CD64E567ABCD,
+CE26ECB95252,
+ABA208516740,
+9868925175BA,
+16A27AF45407,
+372CC880F216,
+3EBCE0925B2F,
+73E5B9D9D3A4,
+0DB520C78C1C,
+70D901648CB9,
+C11F4597EFB5,
+B39D19A280DF,
+403D706BA880,
+7038CD25C408,
+6B02733BB6EC,
+EAAC88E5DC99,
+4ACEC1205D75,
+2910989B6880,
+31C7610DE3B0,
+5EFBAECEF46B,
+F8493407799D,
+6B8BD9860763,
+D3A297DC2698,
+#
+# Keys from MifareClassicTool project
+044CE1872BC3,
+045CECA15535,
+0BE5FAC8B06A,
+0CE7CD2CC72B,
+0EB23CC8110B,
+0F01CEFF2742,
+0F318130ED18,
+114D6BE9440C,
+18E3A02B5EFF,
+19FC84A3784B,
+1B61B2E78C75,
+22052B480D11,
+3367BFAA91DB,
+3A8A139C20B4,
+42E9B54E51AB,
+46D78E850A7E,
+4B609876BBA3,
+518DC6EEA089,
+6B07877E2C5C,
+7259FA0197C6,
+72F96BDD3714,
+7413B599C4EA,
+77DABC9825E1,
+7A396F0D633D,
+7A86AA203788,
+8791B2CCB5C4,
+8A8D88151A00,
+8C97CD7A0E56,
+8E26E45E7D65,
+9D993C5D4EF4,
+9EA3387A63C1,
+A3FAA6DAFF67,
+A7141147D430,
+AAFB06045877,
+ACFFFFFFFFFF,
+AFCEF64C9913,
+B27ADDFB64B0,
+B81F2B0C2F66,
+B9F8A7D83978,
+BAFF3053B496,
+BB52F8CCE07F,
+BC2D1791DEC1,
+BC4580B7F20B,
+C65D4EAA645B,
+C76BF71A2509,
+D5524F591EED,
+E328A1C7156D,
+E4821A377B75,
+E56AC127DD45,
+EA0FD73CB149,
+FC0001877BF7,
+FD8705E721B0,
+00ada2cd516d,
+#
+#
+D3F7D3F7D3F7
+##
+237a4d0d9119,
+0ed7846c2bc9,
+FFFFD06F83E3,
+FFFFAE82366C,
+F89C86B2A961,
+F83466888612,
+ED3A7EFBFF56,
+E96246531342,
+E1DD284379D4,
+DFED39FFBB76,
+DB5181C92CBE,
+CFC738403AB0,
+BCFE01BCFE01,
+BA28CFD15EE8,
+B0699AD03D17,
+AABBCC660429,
+A4EF6C3BB692,
+A2B2C9D187FB,
+9B1DD7C030A1,
+9AEDF9931EC1,
+8F9B229047AC,
+872B71F9D15A,
+833FBD3CFE51,
+5D293AFC8D7E,
+5554AAA96321,
+474249437569,
+435330666666,
+1A2B3C4D5E6F,
+123456ABCDEF,
+83BAB5ACAD62,
+64E2283FCF5E,
+64A2EE93B12B,
+46868F6D5677,
+40E5EA1EFC00,
+37D4DCA92451,
+2012053082AD,
+2011092119F1,
+200306202033,
+1795902DBAF9,
+17505586EF02,
+022FE48B3072,
+013940233313,
+

From a2c70e54812d4142cb3f8345e9cbee05345261f0 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 12 May 2019 20:37:51 +0200
Subject: [PATCH 1694/1938] Add .dic to gitattributes for LF, remove existing
 CR

---
 .gitattributes          |    1 +
 client/default_keys.dic | 1522 +++++++++++++++++++--------------------
 2 files changed, 762 insertions(+), 761 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index de1ad82c8..c695ce496 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -12,4 +12,5 @@ fpga/fpga.bit -crlf -diff
 *.lua text=auto eol=lf
 *.py text=auto eol=lf
 *.pl text=auto eol=lf
+*.dic text=auto eol=lf
 Makefile text=auto eol=lf
diff --git a/client/default_keys.dic b/client/default_keys.dic
index e98f28926..e2b1bd228 100644
--- a/client/default_keys.dic
+++ b/client/default_keys.dic
@@ -1,761 +1,761 @@
-#
-# Mifare Default Keys
-#   -- iceman fork version --
-#   -- contribute to this list, sharing is caring --
-#
-ffffffffffff,//Defaultkey(firstkeyusedbyprogramifnouserdefinedkey)
-000000000000,//Blankkey
-a0a1a2a3a4a5,//NFCForumMADkey
-b0b1b2b3b4b5,
-c0c1c2c3c4c5,
-d0d1d2d3d4d5,
-aabbccddeeff,
-4d3a99c351dd,
-1a982c7e459a,
-d3f7d3f7d3f7,// key A Wien
-5a1b85fce20a,// key B Wien
-714c5c886e97,
-587ee5f9350f,
-a0478cc39091,
-533cb6c723f6,
-8fd0a4f256e9,
-#
-d2ece8b9395e,  //lib
-#
-# more Keys from mf_default_keys.lua
-000000000001,
-000000000002,
-00000000000a,
-00000000000b,
-00000ffe2488,--VästtrafikenKeyB
-010203040506,
-0123456789ab,
-0297927c0f77,--VästtrafikenKeyA
-100000000000,
-111111111111,
-123456789abc,
-12f2ee3478c1,
-14d446e33363,
-1999a3554a55,
-200000000000,
-222222222222,
-26940b21ff5d,--RKFSLKeyA
-27dd91f1fcf1,
-2BA9621E0A36,--DirectoryandeventlogKeyB
-333333333333,
-33f974b42769,
-34d1df9934c5,
-434f4d4d4f41,--RKFJOJOGROUPKeyA
-434f4d4d4f42,--RKFJOJOGROUPKeyB
-43ab19ef5c31,
-444444444444,
-47524f555041,--RKFJOJOGROUPKeyA
-47524f555042,--RKFJOJOGROUPKeyB
-4AF9D7ADEBE4,--DirectoryandeventlogKeyA
-4b0b20107ccb,--TNP3xxx
-505249564141,--RKFJOJOPRIVAKeyA
-505249564142,--RKFJOJOPRIVAKeyB
-505249565441,
-505249565442,
-54726176656c,--VästtrafikenKeyA
-555555555555,
-55f5a5dd38c9,
-569369c5a0e5,--kiev
-5c598c9c58b5,--RKFSLKeyB
-632193be1c3c,--kiev
-644672bd4afe,--kiev
-666666666666,
-722bfcc5375f,--RKFRejskortDanmarkKeyA
-776974687573,--VästtrafikenKeyB
-777777777777,
-888888888888,
-8fe644038790,--kiev
-999999999999,
-99c636334433,
-9de89e070277,--kiev
-a00000000000,
-a053a292a4af,
-a64598a77478,--RKFSLKeyA
-a94133013401,
-aaaaaaaaaaaa,
-abcdef123456,--Keyfromladyada.net
-b00000000000,
-b127c6f41436,
-b5ff67cba951,--kiev
-bbbbbbbbbbbb,
-bd493a3962b6,
-c934fe34d934,
-cccccccccccc,
-dddddddddddd,
-e4d2770a89be,--RKFSLKeyB
-ee0042f88840,--VästtrafikenKeyB
-eeeeeeeeeeee,
-eff603e1efe9,--kiev
-f14ee7cae863,--kiev
-f1a97341a9fc,
-f1d83f964314,--RKFRejskortDanmarkKeyB
-fc00018778f7,--VästtrafikenKeyA, RKFÖstgötaTrafikenKeyA
-44ab09010845,-- hotel system
-85fed980ea5a,-- hotel system
-314B49474956,--VIGIK1KeyA
-564c505f4d41,--VIGIK1KeyB
-ba5b895da162,--VIGIK1KeyB
-4143414F5250,
-#
-# Data from: http://irq5.io/2013/04/13/decoding-bcard-conference-badges/
-f4a9ef2afc6d,--BCARD KeyB
-#
-#
-a9f953def0a3,--
-75ccb59c9bed,-- mystery KeyA Mifare 1k EV1 (S50) Sector 17!
-4b791bea7bcc,-- mystery KeyB Mifare 1k EV1 (S50) Sector 17!
-#
-# Here be BIP keys...
-3A42F33AF429,
-1FC235AC1309,
-6338A371C0ED,
-243F160918D1,
-F124C2578AD0,
-9AFC42372AF1,
-32AC3B90AC13,
-682D401ABB09,
-4AD1E273EAF1,
-067DB45454A9,
-E2C42591368A,
-15FC4C7613FE,
-2A3C347A1200,
-68D30288910A,
-16F3D5AB1139,
-F59A36A2546D,
-937A4FFF3011,
-64E3C10394C2,
-35C3D2CAEE88,
-B736412614AF,
-693143F10368,
-324F5DF65310,
-A3F97428DD01,
-643FB6DE2217,
-63F17A449AF0,
-82F435DEDF01,
-C4652C54261C,
-0263DE1278F3,
-D49E2826664F,
-51284C3686A6,
-3DF14C8000A1,
-6A470D54127C,
-#
-# Data from: http://pastebin.com/AK9Bftpw
-48ffe71294a0, -- Länstrafiken i Västerbotten
-e3429281efc1, -- Länstrafiken i Västerbotten
-16f21a82ec84, -- Länstrafiken i Västerbotten
-460722122510, -- Länstrafiken i Västerbotten
-#
-# 3dprinter
-AAFB06045877, --EPI Envisionte# 3dprinter
-#
-# gym
-3e65e4fb65b3, --Fysiken A
-25094df6f148, --Fysiken B
-#
-# 24-7
-D21762B2DE3B,
-0E83A374B513,
-1F1FFE000000,
-A10F303FC879,
-1322285230b8,
-0C71BCFB7E72,
-C3C88C6340B8,
-F101622750B7,
-1F107328DC8D,
-710732200D34,
-7C335FB121B5,
-B39AE17435DC,
-#
-#
-454841585443, -- key A
-#
-# Data from: http://pastebin.com/gQ6nk38G
-D39BB83F5297,
-85675B200017,
-528C9DFFE28C,
-C82EC29E3235,
-3E3554AF0E12,
-491CDCFB7752,
-22C1BAE1AACD,
-5F146716E373,
-740E9A4F9AAF,
-AC0E24C75527,
-97184D136233,
-E444D53D359F,
-17758856B182,
-A8966C7CC54B,
-C6AD00254562,
-AE3FF4EEA0DB,
-5EB8F884C8D1,
-FEE470A4CB58,
-75D8690F21B6,
-871B8C085997,
-97D1101F18B0,
-75EDE6A84460,
-DF27A8F1CB8E,
-B0C9DD55DD4D,
-#
-# Data from: http://bit.ly/1bdSbJl
-A0B0C0D0E0F0,
-A1B1C1D1E1F1,
-#
-# Data from: msk social
-2735fc181807,
-2aba9519f574,
-84fd7f7a12b6,
-186d8c4b93f9,
-3a4bba8adaf0,
-8765b17968a2,
-40ead80721ce,
-0db5e6523f7c,
-51119dae5216,
-83e3549ce42d,
-136bdb246cac,
-7de02a7f6025,
-bf23a53c1f63,
-cb9a1f2d7368,
-c7c0adb3284f,
-9f131d8c2057,
-67362d90f973,
-6202a38f69e2,
-100533b89331,
-653a87594079,
-d8a274b2e026,
-b20b83cb145c,
-9afa6cb4fc3d,
-#
-# Data from http://pastebin.com/RRJUEDCM
-0d258fe90296,
-e55a3ca71826,
-a4f204203f56,
-eeb420209d0c,
-911e52fd7ce4,
-752fbb5b7b45,
-66b03aca6ee9,
-48734389edc3,
-17193709adf4,
-1acc3189578c,
-c2b7ec7d4eb1,
-369a4663acd2,
-#
-# Data from https://github.com/zhangjingye03/zxcardumper
-# zxcard Key A/B
-668770666644,
-003003003003,
-#
-# Data from: http://phreakerclub.com/forum/showthread.php?p=41266
-26973ea74321,
-71f3a315ad26,
-51044efb5aab,
-ac70ca327a04,
-eb0a8ff88ade,
-#
-# Data from: https://github.com/RadioWar/NFCGUI
-44dd5a385aaf,
-21a600056cb0,
-b1aca33180a5,
-dd61eb6bce22,
-1565a172770f,
-3e84d2612e2a,
-f23442436765,
-79674f96c771,
-87df99d496cb,
-c5132c8980bc,
-a21680c27773,
-f26e21edcee2,
-675557ecc92e,
-f4396e468114,
-6db17c16b35b,
-4186562a5bb2,
-2feae851c199,
-db1a3338b2eb,
-157b10d84c6b,
-a643f952ea57,
-df37dcb6afb3,
-4c32baf326e0,
-91ce16c07ac5,
-3c5d1c2bcd18,
-c3f19ec592a2,
-f72a29005459,
-185fa3438949,
-321a695bd266,
-d327083a60a7,
-45635ef66ef3,
-5481986d2d62,
-cba6ae869ad5,
-645a166b1eeb,
-a7abbc77cc9e,
-f792c4c76a5c,
-bfb6796a11db,
-#
-# Data from Salto A/B
-6A1987C40A21,
-7F33625BC129,
-#
-# Data from forum
-2338b4913111,
-#
-# Data from stoye
-cb779c50e1bd,
-a27d3804c259,
-003cc420001a,
-f9861526130f,
-381ece050fbd,
-a57186bdd2b9,
-48c739e21a04,
-36abf5874ed7,
-649d2abbbd20,
-bbe8fffcf363,
-ab4e7045e97d,
-340e40f81cd8,
-e4f65c0ef32c,
-d2a597d76936,
-a920f32fe93a,
-86afd95200f7,
-9b832a9881ff,
-26643965b16e,
-0c669993c776,
-b468d1991af9,
-d9a37831dce5,
-2fc1f32f51b1,
-0ffbf65b5a14,
-c5cfe06d9ea3,
-c0dece673829,
-#
-a56c2df9a26d,
-#
-# Data from: https://pastebin.com/vbwast74
-#
-68d3f7307c89,
-568c9083f71c,--Smart Rider. Western Australian Public Transport Cards
-# Vigik Keys
-# Various sources :
-# * https://github.com/DumpDos/Vigik
-# * http://newffr.com/viewtopic.php?&forum=235&topic=11559
-# * Own dumps
-021209197591,  // BTCINO UNDETERMINED SPREAKD 0x01->0x13 key
-2ef720f2af76,
-414c41524f4e,
-424c41524f4e,
-4a6352684677,
-bf1f4424af76,
-536653644c65,
-#
-# Intratone Cogelec
-# Data from http://bouzdeck.com/rfid/32-cloning-a-mifare-classic-1k-tag.html
-484558414354,
-a22ae129c013,
-49fae4e3849f,
-38fcf33072e0,
-8ad5517b4b18,
-509359f131b1,
-6c78928e1317,
-aa0720018738,
-a6cac2886412,
-62d0c424ed8e,
-e64a986a5d94,
-8fa1d601d0a2,
-89347350bd36,
-66d2b7dc39ef,
-6bc1e1ae547d,
-22729a9bd40f,
-#
-# Data from https://dfir.lu/blog/cloning-a-mifare-classic-1k-tag.html
-925b158f796f,
-fad63ecb5891,
-bba840ba1c57,
-cc6b3b3cd263,
-6245e47352e6,
-8ed41e8b8056,
-2dd39a54e1f3,
-6d4c5b3658d2,
-1877ed29435a,
-52264716efde,
-961c0db4a7ed,
-703140fd6d86,
-157c9a513fa5,
-e2a5dc8e066f,
-#
-# Data from a oyster card
-374bf468607f,
-bfc8e353af63,
-15cafd6159f6,
-62efd80ab715,
-987a7f7f1a35,
-c4104fa3c526,
-4c961f23e6be,
-67546972bc69,
-f4cd5d4c13ff,
-94414c1a07dc,
-16551d52fd20,
-9cb290282f7d,
-77a84170b574,
-ed646c83a4f3,
-e703589db50b,
-513c85d06cde,
-95093f0b2e22,
-543b01b27a95,
-c6d375b99972,
-ee4cc572b40e,
-5106ca7e4a69,
-c96bd1ce607f,
-167a1be102e0,
-a8d0d850a606,
-a2abb693ce34,
-7b296c40c486,
-91f93a5564c9,
-e10623e7a016,
-b725f9cbf183,
-#
-# Data from FDi tag
-8829da9daf76,
-#
-# Data from GitHub issue
-0A7932DC7E65,
-11428B5BCE06,
-11428B5BCE07,
-11428B5BCE08,
-11428B5BCE09,
-11428B5BCE0A,
-11428B5BCE0F,
-18971D893494,
-25D60050BF6E,
-3FA7217EC575,
-44F0B5FBE344,
-7B296F353C6B,
-8553263F4FF0,
-8E5D33A6ED51,
-9F42971E8322,
-C620318EF179,
-D4FE03CE5B06,
-D4FE03CE5B07,
-D4FE03CE5B08,
-D4FE03CE5B09,
-D4FE03CE5B0A,
-D4FE03CE5B0F,
-E241E8AFCBAF,
-#
-# Data from forum post
-123F8888F322,
-050908080008,
-#
-# Data from hoist
-4f9f59c9c875,
-#
-# Data from pastebin
-66f3ed00fed7,
-f7a39753d018,
-#
-# Data from https://pastebin.com/Z7pEeZif
-386B4D634A65,
-666E564F4A44,
-564777315276,
-476242304C53,
-6A696B646631,
-4D3248735131,
-425A73484166,
-57784A533069,
-345547514B4D,
-4C6B69723461,
-4E4175623670,
-4D5076656D58,
-686A736A356E,
-484A57696F4A,
-6F4B6D644178,
-744E326B3441,
-70564650584F,
-584F66326877,
-6D4E334B6C48,
-6A676C315142,
-77494C526339,
-623055724556,
-356D46474348,
-4E32336C6E38,
-57734F6F6974,
-436A46587552,
-5544564E6E67,
-6F506F493353,
-31646241686C,
-77646B633657,
-#
-# Data from TransPert
-2031d1e57a3b,
-53c11f90822a,
-9189449ea24e,
-#
-# data from Github
-410b9b40b872,
-2cb1a90071c8,
-#
-# data from
-8697389ACA26,
-1AB23CD45EF6,
-013889343891,
-#
-#
-0000000018de,
-16ddcb6b3f24,
-#
-# Data from https://pastebin.com/vwDRZW7d
-EC0A9B1A9E06,--Vingcard Mifare 4k Staff card
-6C94E1CED026,--Vingcard Mifare 4k Staff card
-0F230695923F,--Vingcard Mifare 4k Staff card
-0000014B5C31,--Vingcard Mifare 4k Staff card
-#
-BEDB604CC9D1,
-B8A1F613CF3D,
-B578F38A5C61,
-AD4FB33388BF,
-69FB7B7CD8EE,
-2A6D9205E7CA,
-2a2c13cc242a,
-27FBC86A00D0,
-01FA3FC68349,
-#
-6D44B5AAF464,--Smart Rider. Western Australian Public Transport Cards
-1717E34A7A8A,--Smart Rider. Western Australian Public Transport Cards
-#
-6B6579737472,--RFIDeas
-#
-484944204953,--HID MIFARE Classic 1k Key
-204752454154,--HID MIFARE Classic 1k Key
-3B7E4FD575AD,--HID MIFARE SO
-11496F97752A,--HID MIFARE SO
-#
-415A54454B4D,--Luxeo/Aztek cashless vending
-#
-321958042333,--BQT
-#
-160A91D29A9C,--Aperio KEY_A Sector 1, 12, 13, 14, 15 Data Start 0 Length 48
-#
-b7bf0c13066e,--Gallagher
-#
-# Boston, MA, USA Transit - MBTA Charlie Card
-3060206f5b0a,-- charlie
-5ec39b022f2b,-- charlie
-3a09594c8587,-- charlie
-f1b9f5669cc8,-- charlie
-f662248e7e89,-- charlie
-62387b8d250d,-- charlie
-f238d78ff48f,-- charlie
-9dc282d46217,-- charlie
-afd0ba94d624,-- charlie
-92ee4dc87191,-- charlie
-b35a0e4acc09,-- charlie
-756ef55e2507,-- charlie
-447ab7fd5a6b,-- charlie
-932b9cb730ef,-- charlie
-1f1a0a111b5b,-- charlie
-ad9e0a1ca2f7,-- charlie
-d58023ba2bdc,-- charlie
-62ced42a6d87,-- charlie
-2548a443df28,-- charlie
-2ed3b15e7c0f,-- charlie
-#
-60012e9ba3fa,
-#
-de1fcbec764b,
-81bfbe8cacba,
-bff123126c9b,
-2f47741062a0,
-b4166b0a27ea,
-a170d9b59f95,
-400bc9be8976,
-d80511fc2ab4,
-1fcef3005bcf,
-bb467463acd6,
-e67c8010502d,
-ff58ba1b4478,
-# Data from https://pastebin.com/Kz8xp4ev
-fbf225dc5d58,
-#
-# Data  https://pastebin.com/BEm6bdAE
-# vingcard.txt
-4708111c8604,
-3d50d902ea48,
-96a301bce267,
-6700f10fec09,
-7a09cc1db70a,
-560f7cff2d81,
-66b31e64ca4b,
-9e53491f685b,
-3a09911d860c,
-8a036920ac0c,
-361f69d2c462,
-d9bcde7fc489,
-0c03a720f208,
-6018522fac02,
-#
-# Data from https://pastebin.com/4t2yFMgt
-# Mifare technische Universität Graz TUG
-D58660D1ACDE,
-50A11381502C,
-C01FC822C6E5,
-0854BF31111E,
-# More keys:
-8a19d40cf2b5,
-ae8587108640,
-135b88a94b8b, SafLock standalone door locks.
-#
-# Russian Troika card
-08B386463229,
-0E8F64340BA4,
-0F1C63013DBA,
-2AA05ED1856F,
-2B7F3253FAC5,
-69A32F1C2F19,
-73068F118C13,
-9BECDF3D9273,
-A73F5DC1D333,
-A82607B01C0D,
-AE3D65A3DAD4,
-CD4C61C26E3D,
-D3EAFB5DF46D,
-E35173494A81,
-FBC2793D540B,
-5125974CD391,
-ECF751084A80,
-7545DF809202,
-AB16584C972A,
-7A38E3511A38,
-C8454C154CB5,
-04C297B91308,
-EFCB0E689DB3,
-07894FFEC1D6,
-FBA88F109B32,
-2FE3CB83EA43,
-B90DE525CEB6,
-1CC219E9FEC1,
-A74332F74994,
-764CD061F1E6,
-8F79C4FD8A01,
-CD64E567ABCD,
-CE26ECB95252,
-ABA208516740,
-9868925175BA,
-16A27AF45407,
-372CC880F216,
-3EBCE0925B2F,
-73E5B9D9D3A4,
-0DB520C78C1C,
-70D901648CB9,
-C11F4597EFB5,
-B39D19A280DF,
-403D706BA880,
-7038CD25C408,
-6B02733BB6EC,
-EAAC88E5DC99,
-4ACEC1205D75,
-2910989B6880,
-31C7610DE3B0,
-5EFBAECEF46B,
-F8493407799D,
-6B8BD9860763,
-D3A297DC2698,
-#
-# Keys from MifareClassicTool project
-044CE1872BC3,
-045CECA15535,
-0BE5FAC8B06A,
-0CE7CD2CC72B,
-0EB23CC8110B,
-0F01CEFF2742,
-0F318130ED18,
-114D6BE9440C,
-18E3A02B5EFF,
-19FC84A3784B,
-1B61B2E78C75,
-22052B480D11,
-3367BFAA91DB,
-3A8A139C20B4,
-42E9B54E51AB,
-46D78E850A7E,
-4B609876BBA3,
-518DC6EEA089,
-6B07877E2C5C,
-7259FA0197C6,
-72F96BDD3714,
-7413B599C4EA,
-77DABC9825E1,
-7A396F0D633D,
-7A86AA203788,
-8791B2CCB5C4,
-8A8D88151A00,
-8C97CD7A0E56,
-8E26E45E7D65,
-9D993C5D4EF4,
-9EA3387A63C1,
-A3FAA6DAFF67,
-A7141147D430,
-AAFB06045877,
-ACFFFFFFFFFF,
-AFCEF64C9913,
-B27ADDFB64B0,
-B81F2B0C2F66,
-B9F8A7D83978,
-BAFF3053B496,
-BB52F8CCE07F,
-BC2D1791DEC1,
-BC4580B7F20B,
-C65D4EAA645B,
-C76BF71A2509,
-D5524F591EED,
-E328A1C7156D,
-E4821A377B75,
-E56AC127DD45,
-EA0FD73CB149,
-FC0001877BF7,
-FD8705E721B0,
-00ada2cd516d,
-#
-#
-D3F7D3F7D3F7
-##
-237a4d0d9119,
-0ed7846c2bc9,
-FFFFD06F83E3,
-FFFFAE82366C,
-F89C86B2A961,
-F83466888612,
-ED3A7EFBFF56,
-E96246531342,
-E1DD284379D4,
-DFED39FFBB76,
-DB5181C92CBE,
-CFC738403AB0,
-BCFE01BCFE01,
-BA28CFD15EE8,
-B0699AD03D17,
-AABBCC660429,
-A4EF6C3BB692,
-A2B2C9D187FB,
-9B1DD7C030A1,
-9AEDF9931EC1,
-8F9B229047AC,
-872B71F9D15A,
-833FBD3CFE51,
-5D293AFC8D7E,
-5554AAA96321,
-474249437569,
-435330666666,
-1A2B3C4D5E6F,
-123456ABCDEF,
-83BAB5ACAD62,
-64E2283FCF5E,
-64A2EE93B12B,
-46868F6D5677,
-40E5EA1EFC00,
-37D4DCA92451,
-2012053082AD,
-2011092119F1,
-200306202033,
-1795902DBAF9,
-17505586EF02,
-022FE48B3072,
-013940233313,
-
+#
+# Mifare Default Keys
+#   -- iceman fork version --
+#   -- contribute to this list, sharing is caring --
+#
+ffffffffffff,//Defaultkey(firstkeyusedbyprogramifnouserdefinedkey)
+000000000000,//Blankkey
+a0a1a2a3a4a5,//NFCForumMADkey
+b0b1b2b3b4b5,
+c0c1c2c3c4c5,
+d0d1d2d3d4d5,
+aabbccddeeff,
+4d3a99c351dd,
+1a982c7e459a,
+d3f7d3f7d3f7,// key A Wien
+5a1b85fce20a,// key B Wien
+714c5c886e97,
+587ee5f9350f,
+a0478cc39091,
+533cb6c723f6,
+8fd0a4f256e9,
+#
+d2ece8b9395e,  //lib
+#
+# more Keys from mf_default_keys.lua
+000000000001,
+000000000002,
+00000000000a,
+00000000000b,
+00000ffe2488,--VästtrafikenKeyB
+010203040506,
+0123456789ab,
+0297927c0f77,--VästtrafikenKeyA
+100000000000,
+111111111111,
+123456789abc,
+12f2ee3478c1,
+14d446e33363,
+1999a3554a55,
+200000000000,
+222222222222,
+26940b21ff5d,--RKFSLKeyA
+27dd91f1fcf1,
+2BA9621E0A36,--DirectoryandeventlogKeyB
+333333333333,
+33f974b42769,
+34d1df9934c5,
+434f4d4d4f41,--RKFJOJOGROUPKeyA
+434f4d4d4f42,--RKFJOJOGROUPKeyB
+43ab19ef5c31,
+444444444444,
+47524f555041,--RKFJOJOGROUPKeyA
+47524f555042,--RKFJOJOGROUPKeyB
+4AF9D7ADEBE4,--DirectoryandeventlogKeyA
+4b0b20107ccb,--TNP3xxx
+505249564141,--RKFJOJOPRIVAKeyA
+505249564142,--RKFJOJOPRIVAKeyB
+505249565441,
+505249565442,
+54726176656c,--VästtrafikenKeyA
+555555555555,
+55f5a5dd38c9,
+569369c5a0e5,--kiev
+5c598c9c58b5,--RKFSLKeyB
+632193be1c3c,--kiev
+644672bd4afe,--kiev
+666666666666,
+722bfcc5375f,--RKFRejskortDanmarkKeyA
+776974687573,--VästtrafikenKeyB
+777777777777,
+888888888888,
+8fe644038790,--kiev
+999999999999,
+99c636334433,
+9de89e070277,--kiev
+a00000000000,
+a053a292a4af,
+a64598a77478,--RKFSLKeyA
+a94133013401,
+aaaaaaaaaaaa,
+abcdef123456,--Keyfromladyada.net
+b00000000000,
+b127c6f41436,
+b5ff67cba951,--kiev
+bbbbbbbbbbbb,
+bd493a3962b6,
+c934fe34d934,
+cccccccccccc,
+dddddddddddd,
+e4d2770a89be,--RKFSLKeyB
+ee0042f88840,--VästtrafikenKeyB
+eeeeeeeeeeee,
+eff603e1efe9,--kiev
+f14ee7cae863,--kiev
+f1a97341a9fc,
+f1d83f964314,--RKFRejskortDanmarkKeyB
+fc00018778f7,--VästtrafikenKeyA, RKFÖstgötaTrafikenKeyA
+44ab09010845,-- hotel system
+85fed980ea5a,-- hotel system
+314B49474956,--VIGIK1KeyA
+564c505f4d41,--VIGIK1KeyB
+ba5b895da162,--VIGIK1KeyB
+4143414F5250,
+#
+# Data from: http://irq5.io/2013/04/13/decoding-bcard-conference-badges/
+f4a9ef2afc6d,--BCARD KeyB
+#
+#
+a9f953def0a3,--
+75ccb59c9bed,-- mystery KeyA Mifare 1k EV1 (S50) Sector 17!
+4b791bea7bcc,-- mystery KeyB Mifare 1k EV1 (S50) Sector 17!
+#
+# Here be BIP keys...
+3A42F33AF429,
+1FC235AC1309,
+6338A371C0ED,
+243F160918D1,
+F124C2578AD0,
+9AFC42372AF1,
+32AC3B90AC13,
+682D401ABB09,
+4AD1E273EAF1,
+067DB45454A9,
+E2C42591368A,
+15FC4C7613FE,
+2A3C347A1200,
+68D30288910A,
+16F3D5AB1139,
+F59A36A2546D,
+937A4FFF3011,
+64E3C10394C2,
+35C3D2CAEE88,
+B736412614AF,
+693143F10368,
+324F5DF65310,
+A3F97428DD01,
+643FB6DE2217,
+63F17A449AF0,
+82F435DEDF01,
+C4652C54261C,
+0263DE1278F3,
+D49E2826664F,
+51284C3686A6,
+3DF14C8000A1,
+6A470D54127C,
+#
+# Data from: http://pastebin.com/AK9Bftpw
+48ffe71294a0, -- Länstrafiken i Västerbotten
+e3429281efc1, -- Länstrafiken i Västerbotten
+16f21a82ec84, -- Länstrafiken i Västerbotten
+460722122510, -- Länstrafiken i Västerbotten
+#
+# 3dprinter
+AAFB06045877, --EPI Envisionte# 3dprinter
+#
+# gym
+3e65e4fb65b3, --Fysiken A
+25094df6f148, --Fysiken B
+#
+# 24-7
+D21762B2DE3B,
+0E83A374B513,
+1F1FFE000000,
+A10F303FC879,
+1322285230b8,
+0C71BCFB7E72,
+C3C88C6340B8,
+F101622750B7,
+1F107328DC8D,
+710732200D34,
+7C335FB121B5,
+B39AE17435DC,
+#
+#
+454841585443, -- key A
+#
+# Data from: http://pastebin.com/gQ6nk38G
+D39BB83F5297,
+85675B200017,
+528C9DFFE28C,
+C82EC29E3235,
+3E3554AF0E12,
+491CDCFB7752,
+22C1BAE1AACD,
+5F146716E373,
+740E9A4F9AAF,
+AC0E24C75527,
+97184D136233,
+E444D53D359F,
+17758856B182,
+A8966C7CC54B,
+C6AD00254562,
+AE3FF4EEA0DB,
+5EB8F884C8D1,
+FEE470A4CB58,
+75D8690F21B6,
+871B8C085997,
+97D1101F18B0,
+75EDE6A84460,
+DF27A8F1CB8E,
+B0C9DD55DD4D,
+#
+# Data from: http://bit.ly/1bdSbJl
+A0B0C0D0E0F0,
+A1B1C1D1E1F1,
+#
+# Data from: msk social
+2735fc181807,
+2aba9519f574,
+84fd7f7a12b6,
+186d8c4b93f9,
+3a4bba8adaf0,
+8765b17968a2,
+40ead80721ce,
+0db5e6523f7c,
+51119dae5216,
+83e3549ce42d,
+136bdb246cac,
+7de02a7f6025,
+bf23a53c1f63,
+cb9a1f2d7368,
+c7c0adb3284f,
+9f131d8c2057,
+67362d90f973,
+6202a38f69e2,
+100533b89331,
+653a87594079,
+d8a274b2e026,
+b20b83cb145c,
+9afa6cb4fc3d,
+#
+# Data from http://pastebin.com/RRJUEDCM
+0d258fe90296,
+e55a3ca71826,
+a4f204203f56,
+eeb420209d0c,
+911e52fd7ce4,
+752fbb5b7b45,
+66b03aca6ee9,
+48734389edc3,
+17193709adf4,
+1acc3189578c,
+c2b7ec7d4eb1,
+369a4663acd2,
+#
+# Data from https://github.com/zhangjingye03/zxcardumper
+# zxcard Key A/B
+668770666644,
+003003003003,
+#
+# Data from: http://phreakerclub.com/forum/showthread.php?p=41266
+26973ea74321,
+71f3a315ad26,
+51044efb5aab,
+ac70ca327a04,
+eb0a8ff88ade,
+#
+# Data from: https://github.com/RadioWar/NFCGUI
+44dd5a385aaf,
+21a600056cb0,
+b1aca33180a5,
+dd61eb6bce22,
+1565a172770f,
+3e84d2612e2a,
+f23442436765,
+79674f96c771,
+87df99d496cb,
+c5132c8980bc,
+a21680c27773,
+f26e21edcee2,
+675557ecc92e,
+f4396e468114,
+6db17c16b35b,
+4186562a5bb2,
+2feae851c199,
+db1a3338b2eb,
+157b10d84c6b,
+a643f952ea57,
+df37dcb6afb3,
+4c32baf326e0,
+91ce16c07ac5,
+3c5d1c2bcd18,
+c3f19ec592a2,
+f72a29005459,
+185fa3438949,
+321a695bd266,
+d327083a60a7,
+45635ef66ef3,
+5481986d2d62,
+cba6ae869ad5,
+645a166b1eeb,
+a7abbc77cc9e,
+f792c4c76a5c,
+bfb6796a11db,
+#
+# Data from Salto A/B
+6A1987C40A21,
+7F33625BC129,
+#
+# Data from forum
+2338b4913111,
+#
+# Data from stoye
+cb779c50e1bd,
+a27d3804c259,
+003cc420001a,
+f9861526130f,
+381ece050fbd,
+a57186bdd2b9,
+48c739e21a04,
+36abf5874ed7,
+649d2abbbd20,
+bbe8fffcf363,
+ab4e7045e97d,
+340e40f81cd8,
+e4f65c0ef32c,
+d2a597d76936,
+a920f32fe93a,
+86afd95200f7,
+9b832a9881ff,
+26643965b16e,
+0c669993c776,
+b468d1991af9,
+d9a37831dce5,
+2fc1f32f51b1,
+0ffbf65b5a14,
+c5cfe06d9ea3,
+c0dece673829,
+#
+a56c2df9a26d,
+#
+# Data from: https://pastebin.com/vbwast74
+#
+68d3f7307c89,
+568c9083f71c,--Smart Rider. Western Australian Public Transport Cards
+# Vigik Keys
+# Various sources :
+# * https://github.com/DumpDos/Vigik
+# * http://newffr.com/viewtopic.php?&forum=235&topic=11559
+# * Own dumps
+021209197591,  // BTCINO UNDETERMINED SPREAKD 0x01->0x13 key
+2ef720f2af76,
+414c41524f4e,
+424c41524f4e,
+4a6352684677,
+bf1f4424af76,
+536653644c65,
+#
+# Intratone Cogelec
+# Data from http://bouzdeck.com/rfid/32-cloning-a-mifare-classic-1k-tag.html
+484558414354,
+a22ae129c013,
+49fae4e3849f,
+38fcf33072e0,
+8ad5517b4b18,
+509359f131b1,
+6c78928e1317,
+aa0720018738,
+a6cac2886412,
+62d0c424ed8e,
+e64a986a5d94,
+8fa1d601d0a2,
+89347350bd36,
+66d2b7dc39ef,
+6bc1e1ae547d,
+22729a9bd40f,
+#
+# Data from https://dfir.lu/blog/cloning-a-mifare-classic-1k-tag.html
+925b158f796f,
+fad63ecb5891,
+bba840ba1c57,
+cc6b3b3cd263,
+6245e47352e6,
+8ed41e8b8056,
+2dd39a54e1f3,
+6d4c5b3658d2,
+1877ed29435a,
+52264716efde,
+961c0db4a7ed,
+703140fd6d86,
+157c9a513fa5,
+e2a5dc8e066f,
+#
+# Data from a oyster card
+374bf468607f,
+bfc8e353af63,
+15cafd6159f6,
+62efd80ab715,
+987a7f7f1a35,
+c4104fa3c526,
+4c961f23e6be,
+67546972bc69,
+f4cd5d4c13ff,
+94414c1a07dc,
+16551d52fd20,
+9cb290282f7d,
+77a84170b574,
+ed646c83a4f3,
+e703589db50b,
+513c85d06cde,
+95093f0b2e22,
+543b01b27a95,
+c6d375b99972,
+ee4cc572b40e,
+5106ca7e4a69,
+c96bd1ce607f,
+167a1be102e0,
+a8d0d850a606,
+a2abb693ce34,
+7b296c40c486,
+91f93a5564c9,
+e10623e7a016,
+b725f9cbf183,
+#
+# Data from FDi tag
+8829da9daf76,
+#
+# Data from GitHub issue
+0A7932DC7E65,
+11428B5BCE06,
+11428B5BCE07,
+11428B5BCE08,
+11428B5BCE09,
+11428B5BCE0A,
+11428B5BCE0F,
+18971D893494,
+25D60050BF6E,
+3FA7217EC575,
+44F0B5FBE344,
+7B296F353C6B,
+8553263F4FF0,
+8E5D33A6ED51,
+9F42971E8322,
+C620318EF179,
+D4FE03CE5B06,
+D4FE03CE5B07,
+D4FE03CE5B08,
+D4FE03CE5B09,
+D4FE03CE5B0A,
+D4FE03CE5B0F,
+E241E8AFCBAF,
+#
+# Data from forum post
+123F8888F322,
+050908080008,
+#
+# Data from hoist
+4f9f59c9c875,
+#
+# Data from pastebin
+66f3ed00fed7,
+f7a39753d018,
+#
+# Data from https://pastebin.com/Z7pEeZif
+386B4D634A65,
+666E564F4A44,
+564777315276,
+476242304C53,
+6A696B646631,
+4D3248735131,
+425A73484166,
+57784A533069,
+345547514B4D,
+4C6B69723461,
+4E4175623670,
+4D5076656D58,
+686A736A356E,
+484A57696F4A,
+6F4B6D644178,
+744E326B3441,
+70564650584F,
+584F66326877,
+6D4E334B6C48,
+6A676C315142,
+77494C526339,
+623055724556,
+356D46474348,
+4E32336C6E38,
+57734F6F6974,
+436A46587552,
+5544564E6E67,
+6F506F493353,
+31646241686C,
+77646B633657,
+#
+# Data from TransPert
+2031d1e57a3b,
+53c11f90822a,
+9189449ea24e,
+#
+# data from Github
+410b9b40b872,
+2cb1a90071c8,
+#
+# data from
+8697389ACA26,
+1AB23CD45EF6,
+013889343891,
+#
+#
+0000000018de,
+16ddcb6b3f24,
+#
+# Data from https://pastebin.com/vwDRZW7d
+EC0A9B1A9E06,--Vingcard Mifare 4k Staff card
+6C94E1CED026,--Vingcard Mifare 4k Staff card
+0F230695923F,--Vingcard Mifare 4k Staff card
+0000014B5C31,--Vingcard Mifare 4k Staff card
+#
+BEDB604CC9D1,
+B8A1F613CF3D,
+B578F38A5C61,
+AD4FB33388BF,
+69FB7B7CD8EE,
+2A6D9205E7CA,
+2a2c13cc242a,
+27FBC86A00D0,
+01FA3FC68349,
+#
+6D44B5AAF464,--Smart Rider. Western Australian Public Transport Cards
+1717E34A7A8A,--Smart Rider. Western Australian Public Transport Cards
+#
+6B6579737472,--RFIDeas
+#
+484944204953,--HID MIFARE Classic 1k Key
+204752454154,--HID MIFARE Classic 1k Key
+3B7E4FD575AD,--HID MIFARE SO
+11496F97752A,--HID MIFARE SO
+#
+415A54454B4D,--Luxeo/Aztek cashless vending
+#
+321958042333,--BQT
+#
+160A91D29A9C,--Aperio KEY_A Sector 1, 12, 13, 14, 15 Data Start 0 Length 48
+#
+b7bf0c13066e,--Gallagher
+#
+# Boston, MA, USA Transit - MBTA Charlie Card
+3060206f5b0a,-- charlie
+5ec39b022f2b,-- charlie
+3a09594c8587,-- charlie
+f1b9f5669cc8,-- charlie
+f662248e7e89,-- charlie
+62387b8d250d,-- charlie
+f238d78ff48f,-- charlie
+9dc282d46217,-- charlie
+afd0ba94d624,-- charlie
+92ee4dc87191,-- charlie
+b35a0e4acc09,-- charlie
+756ef55e2507,-- charlie
+447ab7fd5a6b,-- charlie
+932b9cb730ef,-- charlie
+1f1a0a111b5b,-- charlie
+ad9e0a1ca2f7,-- charlie
+d58023ba2bdc,-- charlie
+62ced42a6d87,-- charlie
+2548a443df28,-- charlie
+2ed3b15e7c0f,-- charlie
+#
+60012e9ba3fa,
+#
+de1fcbec764b,
+81bfbe8cacba,
+bff123126c9b,
+2f47741062a0,
+b4166b0a27ea,
+a170d9b59f95,
+400bc9be8976,
+d80511fc2ab4,
+1fcef3005bcf,
+bb467463acd6,
+e67c8010502d,
+ff58ba1b4478,
+# Data from https://pastebin.com/Kz8xp4ev
+fbf225dc5d58,
+#
+# Data  https://pastebin.com/BEm6bdAE
+# vingcard.txt
+4708111c8604,
+3d50d902ea48,
+96a301bce267,
+6700f10fec09,
+7a09cc1db70a,
+560f7cff2d81,
+66b31e64ca4b,
+9e53491f685b,
+3a09911d860c,
+8a036920ac0c,
+361f69d2c462,
+d9bcde7fc489,
+0c03a720f208,
+6018522fac02,
+#
+# Data from https://pastebin.com/4t2yFMgt
+# Mifare technische Universität Graz TUG
+D58660D1ACDE,
+50A11381502C,
+C01FC822C6E5,
+0854BF31111E,
+# More keys:
+8a19d40cf2b5,
+ae8587108640,
+135b88a94b8b, SafLock standalone door locks.
+#
+# Russian Troika card
+08B386463229,
+0E8F64340BA4,
+0F1C63013DBA,
+2AA05ED1856F,
+2B7F3253FAC5,
+69A32F1C2F19,
+73068F118C13,
+9BECDF3D9273,
+A73F5DC1D333,
+A82607B01C0D,
+AE3D65A3DAD4,
+CD4C61C26E3D,
+D3EAFB5DF46D,
+E35173494A81,
+FBC2793D540B,
+5125974CD391,
+ECF751084A80,
+7545DF809202,
+AB16584C972A,
+7A38E3511A38,
+C8454C154CB5,
+04C297B91308,
+EFCB0E689DB3,
+07894FFEC1D6,
+FBA88F109B32,
+2FE3CB83EA43,
+B90DE525CEB6,
+1CC219E9FEC1,
+A74332F74994,
+764CD061F1E6,
+8F79C4FD8A01,
+CD64E567ABCD,
+CE26ECB95252,
+ABA208516740,
+9868925175BA,
+16A27AF45407,
+372CC880F216,
+3EBCE0925B2F,
+73E5B9D9D3A4,
+0DB520C78C1C,
+70D901648CB9,
+C11F4597EFB5,
+B39D19A280DF,
+403D706BA880,
+7038CD25C408,
+6B02733BB6EC,
+EAAC88E5DC99,
+4ACEC1205D75,
+2910989B6880,
+31C7610DE3B0,
+5EFBAECEF46B,
+F8493407799D,
+6B8BD9860763,
+D3A297DC2698,
+#
+# Keys from MifareClassicTool project
+044CE1872BC3,
+045CECA15535,
+0BE5FAC8B06A,
+0CE7CD2CC72B,
+0EB23CC8110B,
+0F01CEFF2742,
+0F318130ED18,
+114D6BE9440C,
+18E3A02B5EFF,
+19FC84A3784B,
+1B61B2E78C75,
+22052B480D11,
+3367BFAA91DB,
+3A8A139C20B4,
+42E9B54E51AB,
+46D78E850A7E,
+4B609876BBA3,
+518DC6EEA089,
+6B07877E2C5C,
+7259FA0197C6,
+72F96BDD3714,
+7413B599C4EA,
+77DABC9825E1,
+7A396F0D633D,
+7A86AA203788,
+8791B2CCB5C4,
+8A8D88151A00,
+8C97CD7A0E56,
+8E26E45E7D65,
+9D993C5D4EF4,
+9EA3387A63C1,
+A3FAA6DAFF67,
+A7141147D430,
+AAFB06045877,
+ACFFFFFFFFFF,
+AFCEF64C9913,
+B27ADDFB64B0,
+B81F2B0C2F66,
+B9F8A7D83978,
+BAFF3053B496,
+BB52F8CCE07F,
+BC2D1791DEC1,
+BC4580B7F20B,
+C65D4EAA645B,
+C76BF71A2509,
+D5524F591EED,
+E328A1C7156D,
+E4821A377B75,
+E56AC127DD45,
+EA0FD73CB149,
+FC0001877BF7,
+FD8705E721B0,
+00ada2cd516d,
+#
+#
+D3F7D3F7D3F7
+##
+237a4d0d9119,
+0ed7846c2bc9,
+FFFFD06F83E3,
+FFFFAE82366C,
+F89C86B2A961,
+F83466888612,
+ED3A7EFBFF56,
+E96246531342,
+E1DD284379D4,
+DFED39FFBB76,
+DB5181C92CBE,
+CFC738403AB0,
+BCFE01BCFE01,
+BA28CFD15EE8,
+B0699AD03D17,
+AABBCC660429,
+A4EF6C3BB692,
+A2B2C9D187FB,
+9B1DD7C030A1,
+9AEDF9931EC1,
+8F9B229047AC,
+872B71F9D15A,
+833FBD3CFE51,
+5D293AFC8D7E,
+5554AAA96321,
+474249437569,
+435330666666,
+1A2B3C4D5E6F,
+123456ABCDEF,
+83BAB5ACAD62,
+64E2283FCF5E,
+64A2EE93B12B,
+46868F6D5677,
+40E5EA1EFC00,
+37D4DCA92451,
+2012053082AD,
+2011092119F1,
+200306202033,
+1795902DBAF9,
+17505586EF02,
+022FE48B3072,
+013940233313,
+

From 4929b16bf932399a22891a66884ed6801753c520 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 12 May 2019 20:38:03 +0200
Subject: [PATCH 1695/1938] style

---
 client/cmdtrace.c | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/client/cmdtrace.c b/client/cmdtrace.c
index eb0c70732..914bf06d6 100644
--- a/client/cmdtrace.c
+++ b/client/cmdtrace.c
@@ -144,20 +144,19 @@ static uint16_t printHexLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trac
     }
 
     switch (protocol) {
-        case ISO_14443A:
-            {
+        case ISO_14443A: {
             /* https://www.kaiser.cx/pcap-iso14443.html defines a pseudo header:
              * version (currently 0x00), event (Rdr: 0xfe, Tag: 0xff), length (2 bytes)
              * to convert to pcap(ng) via text2pcap or to import into Wireshark
              * we use format timestamp, newline, offset (0x000000), pseudo header, data
              * `text2pcap -t "%S." -l 264 -n <input-text-file> <output-pcapng-file>`
              */
-            char line[(data_len *3) + 1];
+            char line[(data_len * 3) + 1];
             char *ptr = &line[0];
 
             for (int j = 0; j < data_len ; j++) {
-                 ptr += sprintf (ptr, "%02x", frame[j]);
-                 ptr += sprintf (ptr, " ");
+                ptr += sprintf(ptr, "%02x", frame[j]);
+                ptr += sprintf(ptr, " ");
             }
 
             char data_len_str[5];
@@ -166,19 +165,19 @@ static uint16_t printHexLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trac
 
             sprintf(data_len_str, "%04x", data_len);
             strncat(temp_str1, data_len_str, 2);
-	    temp_str1[2] = '\0';
+            temp_str1[2] = '\0';
             strncat(temp_str2, data_len_str + 2, 2);
-	    temp_str2[2] = '\0';
+            temp_str2[2] = '\0';
 
             PrintAndLogEx(NORMAL, "0.%010u", timestamp);
             PrintAndLogEx(NORMAL, "000000 00 %s %s %s %s",
-                         (isResponse ? "ff" : "fe"),
-                         temp_str1,
-                         temp_str2,
-                         line);
+                          (isResponse ? "ff" : "fe"),
+                          temp_str1,
+                          temp_str2,
+                          line);
             return tracepos;
-            }
-       default:
+        }
+        default:
             PrintAndLogEx(NORMAL, "Currently only 14a supported");
             return traceLen;
     }

From afabd59995e7602ce05c49f87622e79756f34a91 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 13 May 2019 09:39:43 +0200
Subject: [PATCH 1696/1938] FIX: leftover residue from sending different
 packages OLD/MIX/NG, is now cleaned before.

---
 armsrc/appmain.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 6b9bfaf6f..bb87705a0 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1633,6 +1633,8 @@ void  __attribute__((noreturn)) AppMain(void) {
 
         // Check if there is a packet available
         PacketCommandNG rx;
+        memset(&rx.data, 0, sizeof(rx.data));
+            
         int ret = receive_ng(&rx);
         if (ret == PM3_SUCCESS) {
             PacketReceived(&rx);

From 6caf571a4401de1c5c681ac53f0e587a131b51db Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Mon, 13 May 2019 10:35:30 +0200
Subject: [PATCH 1697/1938]  NG->MIX for hitag cmds where the zeroes were
 actual args

---
 client/cmdlfhitag.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index 330ac5934..ea9539453 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -339,7 +339,7 @@ static int CmdLFHitagSim(const char *Cmd) {
     if (tag_mem_supplied) {
         SendCommandOLD(cmd, 1, 0, 0, data, datalen);
     } else {
-        SendCommandNG(cmd, NULL, 0);
+        SendCommandMIX(cmd, 0, 0, 0, NULL, 0);
     }
 
     free(data);

From 0e827b1083a1f5fe4616a57526fa1d3dbbe1af3a Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Mon, 13 May 2019 12:21:09 +0200
Subject: [PATCH 1698/1938] Fix CMD_T55XX_WRITE_BLOCK expecting data and
 sending NULL

---
 client/cmdlfawid.c      | 3 ++-
 client/cmdlffdx.c       | 3 ++-
 client/cmdlfguard.c     | 3 ++-
 client/cmdlfjablotron.c | 3 ++-
 client/cmdlfkeri.c      | 3 ++-
 client/cmdlfnedap.c     | 3 ++-
 client/cmdlfnoralsy.c   | 3 ++-
 client/cmdlfpresco.c    | 3 ++-
 client/cmdlfpyramid.c   | 3 ++-
 client/cmdlfvisa2000.c  | 3 ++-
 10 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c
index 67c87773e..02a90413c 100644
--- a/client/cmdlfawid.c
+++ b/client/cmdlfawid.c
@@ -395,7 +395,8 @@ static int CmdAWIDClone(const char *Cmd) {
             conn.block_after_ACK = false;
         }
         clearCommandBuffer();
-        SendCommandMIX(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, NULL, 0);
+        uint8_t data[] = {0};
+        SendCommandMIX(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, data, sizeof(data));
         if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
             return -1;
diff --git a/client/cmdlffdx.c b/client/cmdlffdx.c
index d8bdb819f..ca1337adc 100644
--- a/client/cmdlffdx.c
+++ b/client/cmdlffdx.c
@@ -291,7 +291,8 @@ static int CmdFdxClone(const char *Cmd) {
             conn.block_after_ACK = false;
         }
         clearCommandBuffer();
-        SendCommandMIX(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, NULL, 0);
+        uint8_t data[] = {0};
+        SendCommandMIX(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, data, sizeof(data));
         if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
             return -1;
diff --git a/client/cmdlfguard.c b/client/cmdlfguard.c
index 1d2a6cbf4..fb1310376 100644
--- a/client/cmdlfguard.c
+++ b/client/cmdlfguard.c
@@ -180,7 +180,8 @@ static int CmdGuardClone(const char *Cmd) {
             conn.block_after_ACK = false;
         }
         clearCommandBuffer();
-        SendCommandMIX(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, NULL, 0);
+        uint8_t data[] = {0};
+        SendCommandMIX(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, data, sizeof(data));
         if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
             return -1;
diff --git a/client/cmdlfjablotron.c b/client/cmdlfjablotron.c
index e3e22afa6..a9694c343 100644
--- a/client/cmdlfjablotron.c
+++ b/client/cmdlfjablotron.c
@@ -165,7 +165,8 @@ static int CmdJablotronClone(const char *Cmd) {
             conn.block_after_ACK = false;
         }
         clearCommandBuffer();
-        SendCommandMIX(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, NULL, 0);
+        uint8_t data[] = {0};
+        SendCommandMIX(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, data, sizeof(data));
         if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
             return -1;
diff --git a/client/cmdlfkeri.c b/client/cmdlfkeri.c
index 389b47fc4..1575902f8 100644
--- a/client/cmdlfkeri.c
+++ b/client/cmdlfkeri.c
@@ -156,7 +156,8 @@ static int CmdKeriClone(const char *Cmd) {
             conn.block_after_ACK = false;
         }
         clearCommandBuffer();
-        SendCommandMIX(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, NULL, 0);
+        uint8_t data[] = {0};
+        SendCommandMIX(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, data, sizeof(data));
         if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
             return -1;
diff --git a/client/cmdlfnedap.c b/client/cmdlfnedap.c
index 77d00fb5c..63a869851 100644
--- a/client/cmdlfnedap.c
+++ b/client/cmdlfnedap.c
@@ -212,7 +212,8 @@ static int CmdLFNedapClone(const char *Cmd) {
             conn.block_after_ACK = false;
         }
         clearCommandBuffer();
-        SendCommandMIX(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, NULL, 0);
+        uint8_t data[] = {0};
+        SendCommandMIX(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, data, sizeof(data));
         if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)){
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
             return -1;
diff --git a/client/cmdlfnoralsy.c b/client/cmdlfnoralsy.c
index 1f1231a51..54a1ebd4c 100644
--- a/client/cmdlfnoralsy.c
+++ b/client/cmdlfnoralsy.c
@@ -164,7 +164,8 @@ static int CmdNoralsyClone(const char *Cmd) {
             conn.block_after_ACK = false;
         }
         clearCommandBuffer();
-        SendCommandMIX(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, NULL, 0);
+        uint8_t data[] = {0};
+        SendCommandMIX(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, data, sizeof(data));
         if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
             return -1;
diff --git a/client/cmdlfpresco.c b/client/cmdlfpresco.c
index 34d144316..999889bcd 100644
--- a/client/cmdlfpresco.c
+++ b/client/cmdlfpresco.c
@@ -130,7 +130,8 @@ static int CmdPrescoClone(const char *Cmd) {
             conn.block_after_ACK = false;
         }
         clearCommandBuffer();
-        SendCommandMIX(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, NULL, 0);
+        uint8_t data[] = {0};
+        SendCommandMIX(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, data, sizeof(data));
         if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
             return -1;
diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c
index fd3363d8a..abefce26b 100644
--- a/client/cmdlfpyramid.c
+++ b/client/cmdlfpyramid.c
@@ -242,7 +242,8 @@ static int CmdPyramidClone(const char *Cmd) {
             conn.block_after_ACK = false;
         }
         clearCommandBuffer();
-        SendCommandMIX(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, NULL, 0);
+        uint8_t data[] = {0};
+        SendCommandMIX(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, data, sizeof(data));
         if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
             return -1;
diff --git a/client/cmdlfvisa2000.c b/client/cmdlfvisa2000.c
index e6df8cad2..05d127a34 100644
--- a/client/cmdlfvisa2000.c
+++ b/client/cmdlfvisa2000.c
@@ -176,7 +176,8 @@ static int CmdVisa2kClone(const char *Cmd) {
             conn.block_after_ACK = false;
         }
         clearCommandBuffer();
-        SendCommandMIX(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, NULL, 0);
+        uint8_t data[] = {0};
+        SendCommandMIX(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, data, sizeof(data));
         if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
             return -1;

From 20f7b2f3ec77a287943cf527dc24228dfe1f25bb Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Mon, 13 May 2019 12:25:11 +0200
Subject: [PATCH 1699/1938] Remove support for old in MifareChkKeys, not needed
 anymore

---
 armsrc/appmain.c   |  2 +-
 armsrc/apps.h      |  2 +-
 armsrc/mifarecmd.c | 26 +++++++-------------------
 3 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index bb87705a0..13c2e6489 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1029,7 +1029,7 @@ static void PacketReceived(PacketCommandNG *packet) {
             MifareNested(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
             break;
         case CMD_MIFARE_CHKKEYS: {
-            MifareChkKeys(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes, packet->ng);
+            MifareChkKeys(packet->data.asBytes);
             break;
         }
         case CMD_MIFARE_CHKKEYS_FAST: {
diff --git a/armsrc/apps.h b/armsrc/apps.h
index d2fdf5bac..ce37c3373 100644
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -153,7 +153,7 @@ void MifareUWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain);
 void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain);
 void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *datain);
 void MifareAcquireNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *datain);
-void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain, bool ng);
+void MifareChkKeys(uint8_t *datain);
 void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain);
 void MifareSetDbgLvl(uint16_t arg0);
 void MifareEMemClr(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain);
diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index 1c6d0b589..0f391522d 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -1516,7 +1516,7 @@ OUT:
     }
 }
 
-void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain, bool ng) {
+void MifareChkKeys(uint8_t *datain) {
 
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 
@@ -1538,18 +1538,11 @@ void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain, b
     uint8_t blockNo, keyType, keyCount;
     bool clearTrace, have_uid = false;
 
-    if (ng) {
-        keyType = datain[0];
-        blockNo = datain[1];
-        clearTrace = datain[2];
-        keyCount = datain[3];
-        datain += 4;
-    } else {
-        blockNo = arg0 & 0xFF;
-        keyType = (arg0 >> 8) & 0xFF;
-        clearTrace = arg1;
-        keyCount = arg2;
-    }
+    keyType = datain[0];
+    blockNo = datain[1];
+    clearTrace = datain[2];
+    keyCount = datain[3];
+    datain += 4;
 
     LEDsoff();
     LED_A_ON();
@@ -1607,12 +1600,7 @@ void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain, b
 
     LED_B_ON();
 
-    if (ng) {
-        reply_ng(CMD_MIFARE_CHKKEYS, PM3_SUCCESS, (uint8_t *)&keyresult, sizeof(keyresult));
-    } else {
-        reply_mix(CMD_ACK, keyresult.found, 0, 0, (uint8_t *)&keyresult.key, sizeof(keyresult.key));
-    }
-//    reply_old(CMD_ACK, keyresult.found, 0, 0, (uint8_t*)&keyresult.key, sizeof(keyresult.key));
+    reply_ng(CMD_MIFARE_CHKKEYS, PM3_SUCCESS, (uint8_t *)&keyresult, sizeof(keyresult));
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     LEDsoff();
 

From f85420d6f31928f5bb99a9d62838f4cca38ea687 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Mon, 13 May 2019 12:27:00 +0200
Subject: [PATCH 1700/1938] Remove unused oldarg in SniffHitag

---
 armsrc/appmain.c | 2 +-
 armsrc/hitag2.c  | 2 +-
 armsrc/hitag2.h  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 13c2e6489..fc4799ea0 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -866,7 +866,7 @@ static void PacketReceived(PacketCommandNG *packet) {
 
 #ifdef WITH_HITAG
         case CMD_SNIFF_HITAG: // Eavesdrop Hitag tag, args = type
-            SniffHitag(packet->oldarg[0]);
+            SniffHitag();
             break;
         case CMD_SIMULATE_HITAG: // Simulate Hitag tag, args = memory content
             SimulateHitagTag((bool)packet->oldarg[0], packet->data.asBytes);
diff --git a/armsrc/hitag2.c b/armsrc/hitag2.c
index 9dacca28a..e291ece36 100644
--- a/armsrc/hitag2.c
+++ b/armsrc/hitag2.c
@@ -681,7 +681,7 @@ static bool hitag2_read_uid(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t
 }
 
 // Hitag2 Sniffing
-void SniffHitag(uint32_t type) {
+void SniffHitag(void) {
 
     StopTicks();
 
diff --git a/armsrc/hitag2.h b/armsrc/hitag2.h
index 2260e5f8d..c62a2a221 100644
--- a/armsrc/hitag2.h
+++ b/armsrc/hitag2.h
@@ -15,7 +15,7 @@
 #include <stdbool.h>
 #include "hitag.h"
 
-void SniffHitag(uint32_t type);
+void SniffHitag(void);
 void SimulateHitagTag(bool tag_mem_supplied, uint8_t *data);
 void ReaderHitag(hitag_function htf, hitag_data *htd);
 void WriterHitag(hitag_function htf, hitag_data *htd, int page);

From 1edf4e1ef2e8217a301c69cd77f9d1d03c91ef45 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Mon, 13 May 2019 12:30:27 +0200
Subject: [PATCH 1701/1938] remove unused args in MifareEMemClr

---
 armsrc/appmain.c   | 2 +-
 armsrc/apps.h      | 2 +-
 armsrc/mifarecmd.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index fc4799ea0..61189c0e4 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1045,7 +1045,7 @@ static void PacketReceived(PacketCommandNG *packet) {
             MifareSetDbgLvl(packet->oldarg[0]);
             break;
         case CMD_MIFARE_EML_MEMCLR:
-            MifareEMemClr(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
+            MifareEMemClr();
             break;
         case CMD_MIFARE_EML_MEMSET:
             MifareEMemSet(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
diff --git a/armsrc/apps.h b/armsrc/apps.h
index ce37c3373..4f75935c8 100644
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -156,7 +156,7 @@ void MifareAcquireNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *
 void MifareChkKeys(uint8_t *datain);
 void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain);
 void MifareSetDbgLvl(uint16_t arg0);
-void MifareEMemClr(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain);
+void MifareEMemClr(void);
 void MifareEMemSet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain);
 void MifareEMemGet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain);
 void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain);
diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index 0f391522d..94d152693 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -1625,7 +1625,7 @@ void MifareSetDbgLvl(uint16_t arg0) {
 // destroy the Emulator Memory.
 //-----------------------------------------------------------------------------
 
-void MifareEMemClr(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain) {
+void MifareEMemClr(void) {
     FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
     emlClearMem();
 }

From 09afadc9658af92ad3b057d47c5eb12541e768e1 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Mon, 13 May 2019 12:49:41 +0200
Subject: [PATCH 1702/1938] Remove unused args in some MF cmds

---
 armsrc/appmain.c   | 12 ++++++------
 armsrc/apps.h      | 10 +++++-----
 armsrc/mifarecmd.c | 10 +++++-----
 armsrc/mifaresim.c |  2 +-
 armsrc/mifaresim.h |  2 +-
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 61189c0e4..26119ab25 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -993,7 +993,7 @@ static void PacketReceived(PacketCommandNG *packet) {
             ReaderMifare(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2]);
             break;
         case CMD_MIFARE_READBL:
-            MifareReadBlock(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
+            MifareReadBlock(packet->oldarg[0], packet->oldarg[1], packet->data.asBytes);
             break;
         case CMD_MIFAREU_READBL:
             MifareUReadBlock(packet->oldarg[0], packet->oldarg[1], packet->data.asBytes);
@@ -1008,10 +1008,10 @@ static void PacketReceived(PacketCommandNG *packet) {
             MifareUSetPwd(packet->oldarg[0], packet->data.asBytes);
             break;
         case CMD_MIFARE_READSC:
-            MifareReadSector(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
+            MifareReadSector(packet->oldarg[0], packet->oldarg[1], packet->data.asBytes);
             break;
         case CMD_MIFARE_WRITEBL:
-            MifareWriteBlock(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
+            MifareWriteBlock(packet->oldarg[0], packet->oldarg[1], packet->data.asBytes);
             break;
         //case CMD_MIFAREU_WRITEBL_COMPAT:
         //MifareUWriteBlockCompat(packet->oldarg[0], packet->data.asBytes);
@@ -1037,7 +1037,7 @@ static void PacketReceived(PacketCommandNG *packet) {
             break;
         }
         case CMD_SIMULATE_MIFARE_CARD:
-            Mifare1ksim(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
+            Mifare1ksim(packet->oldarg[0], packet->oldarg[1], packet->data.asBytes);
             break;
 
         // emulator
@@ -1051,10 +1051,10 @@ static void PacketReceived(PacketCommandNG *packet) {
             MifareEMemSet(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
             break;
         case CMD_MIFARE_EML_MEMGET:
-            MifareEMemGet(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
+            MifareEMemGet(packet->oldarg[0], packet->oldarg[1]);
             break;
         case CMD_MIFARE_EML_CARDLOAD:
-            MifareECardLoad(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
+            MifareECardLoad(packet->oldarg[0], packet->oldarg[1]);
             break;
 
         // Work with "magic Chinese" card
diff --git a/armsrc/apps.h b/armsrc/apps.h
index 4f75935c8..f3bbbe2c8 100644
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -142,12 +142,12 @@ void EPA_PACE_Collect_Nonce(PacketCommandNG *c);
 void EPA_PACE_Replay(PacketCommandNG *c);
 
 // mifarecmd.h
-void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain);
+void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain);
 void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain);
 void MifareUC_Auth(uint8_t arg0, uint8_t *keybytes);
 void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain);
-void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain);
-void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain);
+void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t *datain);
+void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain);
 //void MifareUWriteBlockCompat(uint8_t arg0,uint8_t *datain);
 void MifareUWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain);
 void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain);
@@ -158,8 +158,8 @@ void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *da
 void MifareSetDbgLvl(uint16_t arg0);
 void MifareEMemClr(void);
 void MifareEMemSet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain);
-void MifareEMemGet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain);
-void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain);
+void MifareEMemGet(uint32_t arg0, uint32_t arg1);
+void MifareECardLoad(uint32_t arg0, uint32_t arg1);
 void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain);  // Work with "magic Chinese" card
 void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain);
 void MifareCIdent();  // is "magic chinese" card?
diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index 94d152693..2e4cb865b 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -38,7 +38,7 @@ static uint8_t dummy_answer = 0;
 // Select, Authenticate, Read a MIFARE tag.
 // read block
 //-----------------------------------------------------------------------------
-void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) {
+void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain) {
     // params
     uint8_t blockNo = arg0;
     uint8_t keyType = arg1;
@@ -198,7 +198,7 @@ void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain) {
 // Select, Authenticate, Read a MIFARE tag.
 // read sector (data = 4 x 16 bytes = 64 bytes, or 16 x 16 bytes = 256 bytes)
 //-----------------------------------------------------------------------------
-void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) {
+void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t *datain) {
     // params
     uint8_t sectorNo = arg0;
     uint8_t keyType = arg1;
@@ -363,7 +363,7 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
 // Select, Authenticate, Write a MIFARE tag.
 // read block
 //-----------------------------------------------------------------------------
-void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) {
+void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain) {
     // params
     uint8_t blockNo = arg0;
     uint8_t keyType = arg1;
@@ -1636,7 +1636,7 @@ void MifareEMemSet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)
     emlSetMem_xt(datain, arg0, arg1, arg2); // data, block num, blocks count, block byte width
 }
 
-void MifareEMemGet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain) {
+void MifareEMemGet(uint32_t arg0, uint32_t arg1) {
     FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
     uint8_t buf[PM3_CMD_DATA_SIZE] = {0x00};
     emlGetMem(buf, arg0, arg1); // data, block num, blocks count (max 4)
@@ -1650,7 +1650,7 @@ void MifareEMemGet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)
 // Load a card into the emulator memory
 //
 //-----------------------------------------------------------------------------
-void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain) {
+void MifareECardLoad(uint32_t arg0, uint32_t arg1) {
     uint64_t ui64Key;
     uint32_t cuid = 0;
     uint8_t numSectors = arg0;
diff --git a/armsrc/mifaresim.c b/armsrc/mifaresim.c
index f25b72d51..501d93a8a 100644
--- a/armsrc/mifaresim.c
+++ b/armsrc/mifaresim.c
@@ -415,7 +415,7 @@ static bool MifareSimInit(uint16_t flags, uint8_t *datain, tag_response_info_t *
 *@param exitAfterNReads, exit simulation after n blocks have been read, 0 is infinite ...
 * (unless reader attack mode enabled then it runs util it gets enough nonces to recover all keys attmpted)
 */
-void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *datain) {
+void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t *datain) {
     tag_response_info_t *responses;
     uint8_t	cardSTATE = MFEMUL_NOFIELD;
     uint8_t uid_len = 0; // 4,7, 10
diff --git a/armsrc/mifaresim.h b/armsrc/mifaresim.h
index 7f92815d5..2dc9650cc 100644
--- a/armsrc/mifaresim.h
+++ b/armsrc/mifaresim.h
@@ -19,7 +19,7 @@
 # define CheckCrc14A(data, len)	check_crc(CRC_14443_A, (data), (len))
 #endif
 
-void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *datain);
+void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t *datain);
 
 #define AC_DATA_READ             0
 #define AC_DATA_WRITE            1

From d2a4ade2afe17f8794031a26069cd043418326ca Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 13 May 2019 13:23:53 +0200
Subject: [PATCH 1703/1938] chg:  lf t55xx write - now uses NG frames.

---
 armsrc/appmain.c        |  3 ++-
 armsrc/apps.h           |  4 +--
 armsrc/lfops.c          | 54 ++++++++++++++++++++++++-----------------
 client/cmdlfawid.c      | 13 +++++++---
 client/cmdlffdx.c       | 12 ++++++---
 client/cmdlfguard.c     | 12 ++++++---
 client/cmdlfjablotron.c | 12 ++++++---
 client/cmdlfkeri.c      | 13 +++++++---
 client/cmdlfnedap.c     | 11 ++++++---
 client/cmdlfnoralsy.c   | 11 ++++++---
 client/cmdlfpresco.c    | 11 ++++++---
 client/cmdlfpyramid.c   | 11 ++++++---
 client/cmdlft55xx.c     | 45 +++++++++++++++++++++-------------
 client/cmdlfvisa2000.c  | 12 ++++++---
 include/pm3_cmd.h       |  8 ++++++
 15 files changed, 159 insertions(+), 73 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 26119ab25..3c09a30c6 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -820,7 +820,8 @@ static void PacketReceived(PacketCommandNG *packet) {
             break;
         }
         case CMD_T55XX_WRITE_BLOCK:
-            T55xxWriteBlock(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes[0]);
+            // uses NG format
+            T55xxWriteBlock(packet->data.asBytes);
             break;
         case CMD_T55XX_WAKEUP:
             T55xxWakeUp(packet->oldarg[0]);
diff --git a/armsrc/apps.h b/armsrc/apps.h
index f3bbbe2c8..fd16e44e6 100644
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -100,8 +100,8 @@ void WriteEM410x(uint32_t card, uint32_t id_hi, uint32_t id_lo);
 void CopyIndala64toT55x7(uint32_t hi, uint32_t lo); // Clone Indala 64-bit tag by UID to T55x7
 void CopyIndala224toT55x7(uint32_t uid1, uint32_t uid2, uint32_t uid3, uint32_t uid4, uint32_t uid5, uint32_t uid6, uint32_t uid7); // Clone Indala 224-bit tag by UID to T55x7
 void T55xxResetRead(void);
-void T55xxWriteBlock(uint32_t Data, uint8_t Block, uint32_t Pwd, uint8_t arg);
-void T55xxWriteBlockExt(uint32_t Data, uint8_t Block, uint32_t Pwd, uint8_t arg);
+void T55xxWriteBlock(uint8_t *data);
+void T55xxWriteBlockExt(uint32_t data, uint8_t blockno, uint32_t pwd, uint8_t flags);
 void T55xxReadBlock(uint16_t arg0, uint8_t Block, uint32_t Pwd);
 void T55xxWakeUp(uint32_t Pwd);
 void T55xx_ChkPwds(void);
diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index 2fed8d962..c5b703b13 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -1397,11 +1397,11 @@ void T55xxResetRead(void) {
 }
 
 // Write one card block in page 0, no lock
-void T55xxWriteBlockExt(uint32_t Data, uint8_t Block, uint32_t Pwd, uint8_t arg) {
+void T55xxWriteBlockExt(uint32_t data, uint8_t blockno, uint32_t pwd, uint8_t flags) {
     LED_A_ON();
-    bool PwdMode = arg & 0x1;
-    uint8_t Page = (arg & 0x2) >> 1;
-    bool testMode = arg & 0x4;
+    bool pwd_mode = (flags & 0x1);
+    uint8_t page = (flags & 0x2) >> 1;
+    bool test_mode = (flags & 0x4 >> 3);
     uint32_t i = 0;
 
     // Set up FPGA, 125kHz
@@ -1409,30 +1409,38 @@ void T55xxWriteBlockExt(uint32_t Data, uint8_t Block, uint32_t Pwd, uint8_t arg)
 
     // make sure tag is fully powered up...
     WaitMS(4);
+    
     // Trigger T55x7 in mode.
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     WaitUS(t_config.start_gap);
 
-    if (testMode) Dbprintf("TestMODE");
-    // Std Opcode 10
-    T55xxWriteBit(testMode ? 0 : 1);
-    T55xxWriteBit(testMode ? 1 : Page); //Page 0
-
-    if (PwdMode) {
-        // Send Pwd
-        for (i = 0x80000000; i != 0; i >>= 1)
-            T55xxWriteBit(Pwd & i);
+    if (test_mode) {
+        Dbprintf("T55xx writing with ", _YELLOW_("test mode enabled"));
+        // undocmented testmode opcode 01
+        T55xxWriteBit(0);
+        T55xxWriteBit(1);
+    } else {
+        // std opcode 10 == page 0
+        // std opcode 11 == page 1
+        T55xxWriteBit(1);
+        T55xxWriteBit(page);        
     }
-    // Send Lock bit
+
+    if (pwd_mode) {
+        // Send pwd
+        for (i = 0x80000000; i != 0; i >>= 1)
+            T55xxWriteBit(pwd & i);
+    }
+    // Send lock bit
     T55xxWriteBit(0);
 
-    // Send Data
+    // Send data
     for (i = 0x80000000; i != 0; i >>= 1)
-        T55xxWriteBit(Data & i);
+        T55xxWriteBit(data & i);
 
-    // Send Block number
+    // Send block number
     for (i = 0x04; i != 0; i >>= 1)
-        T55xxWriteBit(Block & i);
+        T55xxWriteBit(blockno & i);
 
     // Perform write (nominal is 5.6 ms for T55x7 and 18ms for E5550,
     // so wait a little more)
@@ -1441,7 +1449,7 @@ void T55xxWriteBlockExt(uint32_t Data, uint8_t Block, uint32_t Pwd, uint8_t arg)
     //  - programming takes ~5.6ms for t5577 ~18ms for E5550 or t5567
     //  so we should wait 1 clock + 5.6ms then read response?
     //  but we need to know we are dealing with t5577 vs t5567 vs e5550 (or q5) marshmellow...
-    if (testMode) {
+    if (test_mode) {
         //TESTMODE TIMING TESTS:
         // <566us does nothing
         // 566-568 switches between wiping to 0s and doing nothing
@@ -1469,9 +1477,11 @@ void T55xxWriteBlockExt(uint32_t Data, uint8_t Block, uint32_t Pwd, uint8_t arg)
 }
 
 // Write one card block in page 0, no lock
-void T55xxWriteBlock(uint32_t Data, uint8_t Block, uint32_t Pwd, uint8_t arg) {
-    T55xxWriteBlockExt(Data, Block, Pwd, arg);
-    reply_old(CMD_ACK, 0, 0, 0, 0, 0);
+// uses NG format
+void T55xxWriteBlock(uint8_t *data) {
+    t55xx_write_block_t *c = (t55xx_write_block_t *)data;    
+    T55xxWriteBlockExt(c->data, c->blockno, c->pwd, c->flags);    
+    reply_ng(CMD_T55XX_WRITE_BLOCK, PM3_SUCCESS, NULL, 0);
 }
 
 // Read one card block in page [page]
diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c
index 02a90413c..b19149987 100644
--- a/client/cmdlfawid.c
+++ b/client/cmdlfawid.c
@@ -395,9 +395,16 @@ static int CmdAWIDClone(const char *Cmd) {
             conn.block_after_ACK = false;
         }
         clearCommandBuffer();
-        uint8_t data[] = {0};
-        SendCommandMIX(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, data, sizeof(data));
-        if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
+
+        t55xx_write_block_t ng;
+        
+        ng.data = blocks[i];
+        ng.pwd = 0;
+        ng.blockno = i;
+        ng.flags = 0;
+        
+        SendCommandNG(CMD_T55XX_WRITE_BLOCK, (uint8_t *)&ng, sizeof(ng));
+        if (!WaitForResponseTimeout(CMD_T55XX_WRITE_BLOCK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
             return -1;
         }
diff --git a/client/cmdlffdx.c b/client/cmdlffdx.c
index ca1337adc..2ce1b1cb7 100644
--- a/client/cmdlffdx.c
+++ b/client/cmdlffdx.c
@@ -291,9 +291,15 @@ static int CmdFdxClone(const char *Cmd) {
             conn.block_after_ACK = false;
         }
         clearCommandBuffer();
-        uint8_t data[] = {0};
-        SendCommandMIX(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, data, sizeof(data));
-        if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
+
+        t55xx_write_block_t ng;
+        ng.data = blocks[i];
+        ng.pwd = 0;
+        ng.blockno = i;
+        ng.flags = 0;
+        
+        SendCommandNG(CMD_T55XX_WRITE_BLOCK, (uint8_t *)&ng, sizeof(ng));
+        if (!WaitForResponseTimeout(CMD_T55XX_WRITE_BLOCK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
             return -1;
         }
diff --git a/client/cmdlfguard.c b/client/cmdlfguard.c
index fb1310376..65ff7ff48 100644
--- a/client/cmdlfguard.c
+++ b/client/cmdlfguard.c
@@ -180,9 +180,15 @@ static int CmdGuardClone(const char *Cmd) {
             conn.block_after_ACK = false;
         }
         clearCommandBuffer();
-        uint8_t data[] = {0};
-        SendCommandMIX(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, data, sizeof(data));
-        if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
+
+        t55xx_write_block_t ng;
+        ng.data = blocks[i];
+        ng.pwd = 0;
+        ng.blockno = i;
+        ng.flags = 0;
+
+        SendCommandNG(CMD_T55XX_WRITE_BLOCK, (uint8_t *)&ng, sizeof(ng));
+        if (!WaitForResponseTimeout(CMD_T55XX_WRITE_BLOCK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
             return -1;
         }
diff --git a/client/cmdlfjablotron.c b/client/cmdlfjablotron.c
index a9694c343..8189f01ed 100644
--- a/client/cmdlfjablotron.c
+++ b/client/cmdlfjablotron.c
@@ -165,9 +165,15 @@ static int CmdJablotronClone(const char *Cmd) {
             conn.block_after_ACK = false;
         }
         clearCommandBuffer();
-        uint8_t data[] = {0};
-        SendCommandMIX(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, data, sizeof(data));
-        if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
+        
+        t55xx_write_block_t ng;
+        ng.data = blocks[i];
+        ng.pwd = 0;
+        ng.blockno = i;
+        ng.flags = 0;
+
+        SendCommandNG(CMD_T55XX_WRITE_BLOCK, (uint8_t *)&ng, sizeof(ng));        
+        if (!WaitForResponseTimeout(CMD_T55XX_WRITE_BLOCK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
             return -1;
         }
diff --git a/client/cmdlfkeri.c b/client/cmdlfkeri.c
index 1575902f8..04ca2d210 100644
--- a/client/cmdlfkeri.c
+++ b/client/cmdlfkeri.c
@@ -145,7 +145,6 @@ static int CmdKeriClone(const char *Cmd) {
     blocks[2] = data & 0xFFFFFFFF;
     print_blocks(blocks, 3);
 
-
     PacketResponseNG resp;
 
     // fast push mode
@@ -156,9 +155,15 @@ static int CmdKeriClone(const char *Cmd) {
             conn.block_after_ACK = false;
         }
         clearCommandBuffer();
-        uint8_t data[] = {0};
-        SendCommandMIX(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, data, sizeof(data));
-        if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
+
+        t55xx_write_block_t ng;
+        ng.data = blocks[i];
+        ng.pwd = 0;
+        ng.blockno = i;
+        ng.flags = 0;
+
+        SendCommandNG(CMD_T55XX_WRITE_BLOCK, (uint8_t *)&ng, sizeof(ng));
+        if (!WaitForResponseTimeout(CMD_T55XX_WRITE_BLOCK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
             return -1;
         }
diff --git a/client/cmdlfnedap.c b/client/cmdlfnedap.c
index 63a869851..22a9b011e 100644
--- a/client/cmdlfnedap.c
+++ b/client/cmdlfnedap.c
@@ -212,9 +212,14 @@ static int CmdLFNedapClone(const char *Cmd) {
             conn.block_after_ACK = false;
         }
         clearCommandBuffer();
-        uint8_t data[] = {0};
-        SendCommandMIX(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, data, sizeof(data));
-        if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)){
+        t55xx_write_block_t ng;
+        ng.data = blocks[i];
+        ng.pwd = 0;
+        ng.blockno = i;
+        ng.flags = 0;
+
+        SendCommandNG(CMD_T55XX_WRITE_BLOCK, (uint8_t *)&ng, sizeof(ng));
+        if (!WaitForResponseTimeout(CMD_T55XX_WRITE_BLOCK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
             return -1;
         }
diff --git a/client/cmdlfnoralsy.c b/client/cmdlfnoralsy.c
index 54a1ebd4c..ee3881b82 100644
--- a/client/cmdlfnoralsy.c
+++ b/client/cmdlfnoralsy.c
@@ -164,9 +164,14 @@ static int CmdNoralsyClone(const char *Cmd) {
             conn.block_after_ACK = false;
         }
         clearCommandBuffer();
-        uint8_t data[] = {0};
-        SendCommandMIX(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, data, sizeof(data));
-        if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
+        t55xx_write_block_t ng;
+        ng.data = blocks[i];
+        ng.pwd = 0;
+        ng.blockno = i;
+        ng.flags = 0;
+
+        SendCommandNG(CMD_T55XX_WRITE_BLOCK, (uint8_t *)&ng, sizeof(ng));
+        if (!WaitForResponseTimeout(CMD_T55XX_WRITE_BLOCK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
             return -1;
         }
diff --git a/client/cmdlfpresco.c b/client/cmdlfpresco.c
index 999889bcd..e6ad6fc1f 100644
--- a/client/cmdlfpresco.c
+++ b/client/cmdlfpresco.c
@@ -130,9 +130,14 @@ static int CmdPrescoClone(const char *Cmd) {
             conn.block_after_ACK = false;
         }
         clearCommandBuffer();
-        uint8_t data[] = {0};
-        SendCommandMIX(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, data, sizeof(data));
-        if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
+        t55xx_write_block_t ng;
+        ng.data = blocks[i];
+        ng.pwd = 0;
+        ng.blockno = i;
+        ng.flags = 0;
+
+        SendCommandNG(CMD_T55XX_WRITE_BLOCK, (uint8_t *)&ng, sizeof(ng));
+        if (!WaitForResponseTimeout(CMD_T55XX_WRITE_BLOCK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
             return -1;
         }
diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c
index abefce26b..81dc36bba 100644
--- a/client/cmdlfpyramid.c
+++ b/client/cmdlfpyramid.c
@@ -242,9 +242,14 @@ static int CmdPyramidClone(const char *Cmd) {
             conn.block_after_ACK = false;
         }
         clearCommandBuffer();
-        uint8_t data[] = {0};
-        SendCommandMIX(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, data, sizeof(data));
-        if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
+        t55xx_write_block_t ng;
+        ng.data = blocks[i];
+        ng.pwd = 0;
+        ng.blockno = i;
+        ng.flags = 0;
+
+        SendCommandNG(CMD_T55XX_WRITE_BLOCK, (uint8_t *)&ng, sizeof(ng));
+        if (!WaitForResponseTimeout(CMD_T55XX_WRITE_BLOCK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
             return -1;
         }
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 12cb5846a..dfb087084 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1041,6 +1041,11 @@ static int CmdT55xxWriteBlock(const char *Cmd) {
             case 'b':
                 errors |= param_getdec(Cmd, cmdp + 1, &block);
                 cmdp += 2;
+                
+                if (block > 7) {
+                    PrintAndLogEx(WARNING, "Block number must be between 0 and 7");
+                    errors = true;
+                }
                 break;
             case 'd':
                 data = param_get32ex(Cmd, cmdp + 1, 0, 16);
@@ -1068,31 +1073,37 @@ static int CmdT55xxWriteBlock(const char *Cmd) {
     }
     if (errors || !gotdata) return usage_t55xx_write();
 
-    if (block > 7) {
-        PrintAndLogEx(WARNING, "Block number must be between 0 and 7");
-        return 0;
-    }
-
     PacketResponseNG resp;
-    uint8_t flags[1] = {0};
-    flags[0] = (page1) ? 0x2 : 0;
-    flags[0] |= (testMode) ? 0x4 : 0;
+    uint8_t flags;
+    flags = (usepwd) ? 0x1 : 0;
+    flags |= (page1) ? 0x2 : 0;
+    flags |= (testMode) ? 0x4 : 0;
 
     char pwdStr[16] = {0};
     snprintf(pwdStr, sizeof(pwdStr), "pwd: 0x%08X", password);
 
     PrintAndLogEx(INFO, "Writing page %d  block: %02d  data: 0x%08X %s", page1, block, data, (usepwd) ? pwdStr : "");
 
-    uint64_t arg_pwd = 0;
-    //Password mode
-    if (usepwd) {
-        arg_pwd = password;
-        flags[0] |= 0x1;
-    }
-
     clearCommandBuffer();
-    SendCommandOLD(CMD_T55XX_WRITE_BLOCK, data, block, arg_pwd, flags, sizeof(flags));
-    if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
+    
+    /*
+        OLD style
+       arg0 = data, (4 bytes)
+       arg1 = block (1 byte)
+       arg2 = password (4 bytes)
+       flags = data[0] (1 byte)
+       
+       new style
+       uses struct in pm3_cmd.h
+    */
+    t55xx_write_block_t ng;
+    ng.data = data;
+    ng.pwd = password;
+    ng.blockno = block;
+    ng.flags = flags;
+    
+    SendCommandNG(CMD_T55XX_WRITE_BLOCK, (uint8_t *)&ng, sizeof(ng));
+    if (!WaitForResponseTimeout(CMD_T55XX_WRITE_BLOCK, &resp, 1500)) {
         PrintAndLogEx(WARNING, "Error occurred, device did not ACK write operation. (May be due to old firmware)");
         return 0;
     }
diff --git a/client/cmdlfvisa2000.c b/client/cmdlfvisa2000.c
index 05d127a34..39fe007e2 100644
--- a/client/cmdlfvisa2000.c
+++ b/client/cmdlfvisa2000.c
@@ -176,9 +176,15 @@ static int CmdVisa2kClone(const char *Cmd) {
             conn.block_after_ACK = false;
         }
         clearCommandBuffer();
-        uint8_t data[] = {0};
-        SendCommandMIX(CMD_T55XX_WRITE_BLOCK, blocks[i], i, 0, data, sizeof(data));
-        if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
+        t55xx_write_block_t ng;
+        ng.data = blocks[i];
+        ng.pwd = 0;
+        ng.blockno = i;
+        ng.flags = 0;
+
+        SendCommandNG(CMD_T55XX_WRITE_BLOCK, (uint8_t *)&ng, sizeof(ng));
+        if (!WaitForResponseTimeout(CMD_T55XX_WRITE_BLOCK, &resp, T55XX_WRITE_TIMEOUT)) {
+
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
             return -1;
         }
diff --git a/include/pm3_cmd.h b/include/pm3_cmd.h
index ae576e087..2f175799b 100644
--- a/include/pm3_cmd.h
+++ b/include/pm3_cmd.h
@@ -168,6 +168,14 @@ typedef struct {
 #define CAPABILITIES_VERSION 1
 extern capabilities_t pm3_capabilities;
 
+// For CMD_T55XX_WRITE_BLOCK
+typedef struct {
+    uint32_t data;
+    uint32_t pwd;
+    uint8_t blockno;
+    uint8_t flags;
+} PACKED t55xx_write_block_t;
+
 // For the bootloader
 #define CMD_DEVICE_INFO                                                   0x0000
 #define CMD_SETUP_WRITE                                                   0x0001

From 1e345b135682338e7a20e093e61691af8a6d6f01 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Mon, 13 May 2019 13:31:11 +0200
Subject: [PATCH 1704/1938] remove unused arg from MifareAcquireNonces

---
 armsrc/appmain.c   | 2 +-
 armsrc/apps.h      | 2 +-
 armsrc/mifarecmd.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 3c09a30c6..60f1631c3 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1024,7 +1024,7 @@ static void PacketReceived(PacketCommandNG *packet) {
             MifareAcquireEncryptedNonces(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
             break;
         case CMD_MIFARE_ACQUIRE_NONCES:
-            MifareAcquireNonces(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
+            MifareAcquireNonces(packet->oldarg[0], packet->oldarg[2]);
             break;
         case CMD_MIFARE_NESTED:
             MifareNested(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
diff --git a/armsrc/apps.h b/armsrc/apps.h
index fd16e44e6..e7d600b8c 100644
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -152,7 +152,7 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain);
 void MifareUWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain);
 void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain);
 void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *datain);
-void MifareAcquireNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *datain);
+void MifareAcquireNonces(uint32_t arg0, uint32_t flags);
 void MifareChkKeys(uint8_t *datain);
 void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain);
 void MifareSetDbgLvl(uint16_t arg0);
diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index 2e4cb865b..0ce2a1554 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -616,7 +616,7 @@ int valid_nonce(uint32_t Nt, uint32_t NtEnc, uint32_t Ks1, uint8_t *parity) {
             (oddparity8((Nt >> 8) & 0xFF) == ((parity[2]) ^ oddparity8((NtEnc >> 8) & 0xFF) ^ BIT(Ks1, 0)))) ? 1 : 0;
 }
 
-void MifareAcquireNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *datain) {
+void MifareAcquireNonces(uint32_t arg0, uint32_t flags) {
 
     uint8_t uid[10] = {0x00};
     uint8_t answer[MAX_MIFARE_FRAME_SIZE] = {0x00};

From 801cb959677d38a2f6edf57bc7e021e912c7d49f Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 13 May 2019 13:36:54 +0200
Subject: [PATCH 1705/1938] fix: 'lf t55xx write' - wrong bitshift

---
 armsrc/lfops.c      | 4 ++--
 client/cmdlft55xx.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index c5b703b13..a49f205c4 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -1401,7 +1401,7 @@ void T55xxWriteBlockExt(uint32_t data, uint8_t blockno, uint32_t pwd, uint8_t fl
     LED_A_ON();
     bool pwd_mode = (flags & 0x1);
     uint8_t page = (flags & 0x2) >> 1;
-    bool test_mode = (flags & 0x4 >> 3);
+    bool test_mode = (flags & 0x4) >> 2;
     uint32_t i = 0;
 
     // Set up FPGA, 125kHz
@@ -1415,7 +1415,7 @@ void T55xxWriteBlockExt(uint32_t data, uint8_t blockno, uint32_t pwd, uint8_t fl
     WaitUS(t_config.start_gap);
 
     if (test_mode) {
-        Dbprintf("T55xx writing with ", _YELLOW_("test mode enabled"));
+        Dbprintf("T55xx writing with %s", _YELLOW_("test mode enabled"));
         // undocmented testmode opcode 01
         T55xxWriteBit(0);
         T55xxWriteBit(1);
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index dfb087084..10654fb19 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1103,7 +1103,7 @@ static int CmdT55xxWriteBlock(const char *Cmd) {
     ng.flags = flags;
     
     SendCommandNG(CMD_T55XX_WRITE_BLOCK, (uint8_t *)&ng, sizeof(ng));
-    if (!WaitForResponseTimeout(CMD_T55XX_WRITE_BLOCK, &resp, 1500)) {
+    if (!WaitForResponseTimeout(CMD_T55XX_WRITE_BLOCK, &resp, 2000)) {
         PrintAndLogEx(WARNING, "Error occurred, device did not ACK write operation. (May be due to old firmware)");
         return 0;
     }

From 6a6902e57db6f463f73b64f529cb5185f39e7250 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 13 May 2019 16:51:26 +0200
Subject: [PATCH 1706/1938] chg: luascripts now uses t55xx write NG frame
 format

---
 client/scripts/test_t55x7.lua     | 23 ++++++++++++-----------
 client/scripts/test_t55x7_ask.lua | 16 ++++++++--------
 client/scripts/test_t55x7_bi.lua  | 15 ++++++++-------
 client/scripts/test_t55x7_fsk.lua | 13 ++++++-------
 client/scripts/test_t55x7_psk.lua | 14 +++++++-------
 5 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/client/scripts/test_t55x7.lua b/client/scripts/test_t55x7.lua
index 412f4acb8..fddb19817 100644
--- a/client/scripts/test_t55x7.lua
+++ b/client/scripts/test_t55x7.lua
@@ -39,7 +39,8 @@ Arguments:
     -h       this help
 ]]
 
-local DEBUG = false -- the debug flag
+local DEBUG = true -- the debug flag
+local TIMEOUT = 1500
 local total_tests = 0
 local total_pass = 0
 
@@ -237,7 +238,9 @@ local function test(modulation)
 
     local process_block0_cmds = {}
     local y
-    local block = '00'
+    local password = '00000000'
+    local block = '00'   -- configuration block 0
+    local flags = '00'   -- page 0, no pwd, no testmode
 
     local s = ('Start test of %s'):format(modulation)
     print(s)
@@ -251,16 +254,14 @@ local function test(modulation)
         local p_config_cmd = process_block0_cmds[_]
         local errors = 0
         core.clearCommandBuffer()
-
+        
         -- Write Config block
         dbg(('lf t55xx write b 0 d %s'):format(p_config_cmd))
-        local config = tonumber(p_config_cmd, 16)
-        local wc = Command:newMIX{
-                                cmd = cmds.CMD_T55XX_WRITE_BLOCK
-                                , arg1 = config
-                                , arg2 = block
-                                }
-        local response, err = wc:sendMIX(false)
+
+        local data = ('%s%s%s%s'):format(utils.SwapEndiannessStr(p_config_cmd, 32), password, block, flags)
+
+        local wc = Command:newNG{cmd = cmds.CMD_T55XX_WRITE_BLOCK, data = data}
+        local response, err = wc:sendNG(false, TIMEOUT)
         if not response then return oops(err) end
 
         -- Detect
@@ -309,7 +310,7 @@ local function main(args)
 
     -- Adjust this table to set which configurations should be tested
 --    local test_modes = { 'PSK1', 'PSK2', 'PSK3', 'FSK1', 'FSK2', 'FSK1A', 'FSK2A', 'ASK', 'BI' }
-    local test_modes = { 'ASK', 'PSK1' }
+    local test_modes = { 'ASK' }
 
     for _ = 1, #test_modes do
         res = WipeCard()
diff --git a/client/scripts/test_t55x7_ask.lua b/client/scripts/test_t55x7_ask.lua
index 0570aa855..ecf02346b 100644
--- a/client/scripts/test_t55x7_ask.lua
+++ b/client/scripts/test_t55x7_ask.lua
@@ -48,6 +48,7 @@ Arguments:
 ]]
 
 local DEBUG = true -- the debug flag
+local TIMEOUT = 1500
 
 --BLOCK 0 = 00008040 ASK / MAN
 local config1 = '00'
@@ -101,7 +102,9 @@ end
 
 local function test()
     local y
+    local password = '00000000'
     local block = '00'
+    local flags = '00'
     for y = 0x0, 0x1d, 0x4 do
         for _ = 1, #procedurecmds do
             local pcmd = procedurecmds[_]
@@ -111,14 +114,11 @@ local function test()
             elseif _ == 1 then
 
                 local config = pcmd:format(config1, y, config2)
-                dbg(('lf t55xx write b 0  d %s'):format(config))
-                config = tonumber(config, 16)
-                local wc = Command:newMIX{
-                                        cmd = cmds.CMD_T55XX_WRITE_BLOCK
-                                        , arg1 = config
-                                        , arg2 = block
-                                        }
-                local response, err = wc:sendMIX(false)
+                dbg(('lf t55xx write b 0 d %s'):format(config))
+                local data = ('%s%s%s%s'):format(utils.SwapEndiannessStr(config, 32), password, block, flags)
+
+                local wc = Command:newNG{cmd = cmds.CMD_T55XX_WRITE_BLOCK, data = data}
+                local response, err = wc:sendNG(false, TIMEOUT)
                 if not response then return oops(err) end
 
             else
diff --git a/client/scripts/test_t55x7_bi.lua b/client/scripts/test_t55x7_bi.lua
index 67f9ccec3..0b0239717 100644
--- a/client/scripts/test_t55x7_bi.lua
+++ b/client/scripts/test_t55x7_bi.lua
@@ -42,6 +42,7 @@ Arguments:
 ]]
 
 local DEBUG = true -- the debug flag
+local TIMEOUT = 1500
 
 --BLOCK 0 = 00010040 BIPHASE
 local config1 = '00'
@@ -95,7 +96,9 @@ end
 
 local function test()
     local y
+    local password = '00000000'
     local block = '00'
+    local flags = '00'
     for y = 1, 0x1D, 4 do
         for _ = 1, #procedurecmds do
             local pcmd = procedurecmds[_]
@@ -107,13 +110,11 @@ local function test()
                 local config = pcmd:format(config1, y, config2)
                 dbg(('lf t55xx write b 0 d %s'):format(config))
 
-                config = tonumber(config, 16)
-                local wc = Command:newMIX{
-                                        cmd = cmds.CMD_T55XX_WRITE_BLOCK
-                                        , arg1 = config
-                                        , arg2 = block
-                                        }
-                local response, err = wc:sendMIX(false)
+                local data = ('%s%s%s%s'):format(utils.SwapEndiannessStr(config, 32), password, block, flags)
+
+                local wc = Command:newNG{cmd = cmds.CMD_T55XX_WRITE_BLOCK, data = data}
+                local response, err = wc:sendNG(false, TIMEOUT)
+
                 if not response then return oops(err) end
             else
                 dbg(pcmd)
diff --git a/client/scripts/test_t55x7_fsk.lua b/client/scripts/test_t55x7_fsk.lua
index b58c213d1..abf4692d7 100644
--- a/client/scripts/test_t55x7_fsk.lua
+++ b/client/scripts/test_t55x7_fsk.lua
@@ -44,6 +44,7 @@ Arguments:
 ]]
 
 local DEBUG = true -- the debug flag
+local TIMEOUT = 1500
 
 --BLOCK 0 = 00008040 FSK
 local config1 = '00'
@@ -97,7 +98,9 @@ end
 
 local function test(modulation)
     local y
+    local password = '00000000'
     local block = '00'
+    local flags = '00'
     for y = 0x0, 0x1d, 0x4 do
         for _ = 1, #procedurecmds do
             local pcmd = procedurecmds[_]
@@ -108,14 +111,10 @@ local function test(modulation)
 
                 local config = pcmd:format(config1, y, modulation, config2)
                 dbg(('lf t55xx write b 0 d %s'):format(config))
+                local data = ('%s%s%s%s'):format(utils.SwapEndiannessStr(config, 32), password, block, flags)
 
-                config = tonumber(config,16)
-                local wc = Command:newMIX{
-                                        cmd = cmds.CMD_T55XX_WRITE_BLOCK
-                                        , arg1 = config
-                                        , arg2 = block
-                                        }
-                local response, err = wc:sendMIX(false)
+                local wc = Command:newNG{cmd = cmds.CMD_T55XX_WRITE_BLOCK, data = data}
+                local response, err = wc:sendNG(false, TIMEOUT)
                 if not response then return oops(err) end
             else
                 dbg(pcmd)
diff --git a/client/scripts/test_t55x7_psk.lua b/client/scripts/test_t55x7_psk.lua
index 43798ff47..2c0efa163 100644
--- a/client/scripts/test_t55x7_psk.lua
+++ b/client/scripts/test_t55x7_psk.lua
@@ -40,6 +40,7 @@ Arguments:
 ]]
 
 local DEBUG = true -- the debug flag
+local TIMEOUT = 1500
 
 -- --BLOCK 0 = 00 08 80 40 PSK
              -- -----------
@@ -97,7 +98,9 @@ end
 local function test(modulation)
     local bitrate
     local clockrate
+    local password = '00000000'
     local block = '00'
+    local flags = '00'
     for bitrate = 0x0, 0x1d, 0x4 do
 
         for clockrate = 0,8,4 do
@@ -114,13 +117,10 @@ local function test(modulation)
                     local config = cmd:format(bitrate, modulation, clockrate)
                     dbg(('lf t55xx write b 0 d %s'):format(config))
 
-                    config = tonumber(config, 16)
-                    local wc = Command:newMIX{
-                                            cmd = cmds.CMD_T55XX_WRITE_BLOCK
-                                            , arg1 = config
-                                            , arg2 = block
-                                            }
-                    local response, err = wc:sendMIX(false)
+                    local data = ('%s%s%s%s'):format(utils.SwapEndiannessStr(config, 32), password, block, flags)
+
+                    local wc = Command:newNG{cmd = cmds.CMD_T55XX_WRITE_BLOCK, data = data}
+                    local response, err = wc:sendNG(false, TIMEOUT)
                     if not response then return oops(err) end
                 else
                     dbg(cmd)

From e4f00c52dae72468fc599affdacfc2a9d2dde53e Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Mon, 13 May 2019 20:29:18 +0200
Subject: [PATCH 1707/1938] Fix #194 Graph window loops to end if you scroll
 left past 0

---
 client/proxguiqt.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/client/proxguiqt.cpp b/client/proxguiqt.cpp
index e2ef546f6..8357c785f 100644
--- a/client/proxguiqt.cpp
+++ b/client/proxguiqt.cpp
@@ -586,7 +586,7 @@ void Plot::mouseMoveEvent(QMouseEvent *event) {
 }
 
 void Plot::keyPressEvent(QKeyEvent *event) {
-    int offset;
+    uint32_t offset;
 
     if (event->modifiers() & Qt::ShiftModifier) {
         if (PlotGridX)
@@ -623,9 +623,15 @@ void Plot::keyPressEvent(QKeyEvent *event) {
 
         case Qt::Key_Left:
             if (GraphPixelsPerPoint < 20) {
-                GraphStart -= offset;
+                if (GraphStart >= offset) {
+                    GraphStart -= offset;
+                } else {
+                    GraphStart = 0;
+                }
             } else {
-                GraphStart--;
+                if (GraphStart > 0) {
+                    GraphStart--;
+                }
             }
             break;
 

From d05cd5ff2b25146e3728a4f333724b3b3e1107b6 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Mon, 13 May 2019 22:32:44 +0200
Subject: [PATCH 1708/1938] Internal packet structs don't need to be packed,
 only the wired structs

---
 include/pm3_cmd.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/pm3_cmd.h b/include/pm3_cmd.h
index 2f175799b..de66f312f 100644
--- a/include/pm3_cmd.h
+++ b/include/pm3_cmd.h
@@ -65,7 +65,7 @@ typedef struct {
         uint32_t asDwords[PM3_CMD_DATA_SIZE / 4];
     } data;
     bool ng;             // does it store NG data or OLD data?
-} PACKED PacketCommandNG;
+} PacketCommandNG;
 
 // For reception and CRC check
 typedef struct {
@@ -111,7 +111,7 @@ typedef struct {
         uint32_t asDwords[PM3_CMD_DATA_SIZE / 4];
     } data;
     bool ng;             // does it store NG data or OLD data?
-} PACKED PacketResponseNG;
+} PacketResponseNG;
 
 // For reception and CRC check
 typedef struct {

From ff7cd9d84d899695836b2657672191e149f0baec Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Mon, 13 May 2019 23:11:05 +0200
Subject: [PATCH 1709/1938] CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES needs 6 bytes
 of data.

used as SendCommandMIX(CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES, blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, 4, NULL, 0);
sent to MifareAcquireEncryptedNonces(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *datain) {
  [...]
  uint64_t ui64Key = bytes_to_num(datain, 6);

=> we should always send 6 bytes for "bytes_to_num"
---
 client/cmdhfmfhard.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/client/cmdhfmfhard.c b/client/cmdhfmfhard.c
index cdbd092d8..672064987 100644
--- a/client/cmdhfmfhard.c
+++ b/client/cmdhfmfhard.c
@@ -1385,15 +1385,16 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
         flags |= field_off ? 0x0004 : 0;
 
         clearCommandBuffer();
-        SendCommandOLD(CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES, blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, flags, key, 6);
+        SendCommandMIX(CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES, blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, flags, key, 6);
 
         if (field_off) break;
 
         if (initialize) {
             if (!WaitForResponseTimeout(CMD_ACK, &resp, 3000)) {
+                uint8_t nullkey[6] = {0};
                 //strange second call (iceman)
                 clearCommandBuffer();
-                SendCommandMIX(CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES, blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, 4, NULL, 0);
+                SendCommandMIX(CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES, blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, 4, nullkey, sizeof(nullkey));
                 return 1;
             }
             if (resp.oldarg[0]) return resp.oldarg[0];  // error during nested_hard

From 995d782bb0a7ceb5e915660319bdbe22ce2419b7 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Mon, 13 May 2019 23:15:07 +0200
Subject: [PATCH 1710/1938] CMD_READER_HITAG requires always a hitag_data
 struct

used as SendCommandMIX(CMD_READER_HITAG, RHT2F_UID_ONLY, 0, 0, NULL, 0);
sent to ReaderHitag((hitag_function)packet->oldarg[0], (hitag_data *)packet->data.asBytes);
void ReaderHitag(hitag_function htf, hitag_data *htd)
=> we should always send a hitag_data struct
---
 client/cmdlfhitag.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index ea9539453..a22c43c1b 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -455,9 +455,10 @@ static void printHitagConfiguration(uint8_t config) {
 }
 
 static bool getHitagUid(uint32_t *uid) {
-
+    hitag_data htd;
+    memset(&htd, 0, sizeof(htd));
     clearCommandBuffer();
-    SendCommandMIX(CMD_READER_HITAG, RHT2F_UID_ONLY, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_READER_HITAG, RHT2F_UID_ONLY, 0, 0, &htd, sizeof(htd));
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         PrintAndLogEx(WARNING, "timeout while waiting for reply.");

From 7ed7a9de40a4868e34c5702ebcef472f8ec6264d Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 14 May 2019 00:36:58 +0200
Subject: [PATCH 1711/1938] Rework hf tune to make it synchronous (needed for
 rdv4)

---
 armsrc/appmain.c  | 47 ++++++++++++++++++++++++++---------------------
 client/cmdhf.c    | 43 ++++++++++++++++++++++++++++++++++++-------
 client/ui.c       | 12 ++++++++----
 client/ui.h       |  2 +-
 include/pm3_cmd.h |  4 +++-
 5 files changed, 74 insertions(+), 34 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 60f1631c3..6c820b4b3 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -55,6 +55,7 @@ uint8_t ToSend[TOSEND_BUFFER_SIZE];
 int ToSendMax = -1;
 static int ToSendBit;
 struct common_area common_area __attribute__((section(".commonarea")));
+int button_status = BUTTON_NO_CLICK;
 
 void ToSendReset(void) {
     ToSendMax = -1;
@@ -300,28 +301,17 @@ void MeasureAntennaTuning(void) {
     LEDsoff();
 }
 
-void MeasureAntennaTuningHf(void) {
+uint16_t MeasureAntennaTuningHfData(void) {
     uint16_t volt = 0; // in mV
-    // Let the FPGA drive the high-frequency antenna around 13.56 MHz.
-    FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-    FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
-    SpinDelay(50);
     volt = (MAX_ADC_HF_VOLTAGE * AvgAdc(ADC_CHAN_HF)) >> 10;
     bool use_high = (volt > MAX_ADC_HF_VOLTAGE - 300);
 
-    while (!BUTTON_PRESS()) {
-        SpinDelay(20);
-        if (!use_high) {
-            volt = (MAX_ADC_HF_VOLTAGE * AvgAdc(ADC_CHAN_HF)) >> 10;
-        } else {
-            volt = (MAX_ADC_HF_VOLTAGE_RDV40 * AvgAdc(ADC_CHAN_HF_RDV40)) >> 10;
-        }
-        DbprintfEx(FLAG_INPLACE, "%u mV / %5u V", volt, (uint16_t)(volt / 1000));
+    if (!use_high) {
+        volt = (MAX_ADC_HF_VOLTAGE * AvgAdc(ADC_CHAN_HF)) >> 10;
+    } else {
+        volt = (MAX_ADC_HF_VOLTAGE_RDV40 * AvgAdc(ADC_CHAN_HF_RDV40)) >> 10;
     }
-    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-    DbprintfEx(FLAG_NEWLINE, "");
-    Dbprintf("[+] cancelled", 1);
-    reply_ng(CMD_MEASURE_ANTENNA_TUNING_HF, PM3_EOPABORTED, NULL, 0);
+    return volt;
 }
 
 void ReadMem(int addr) {
@@ -1239,8 +1229,23 @@ static void PacketReceived(PacketCommandNG *packet) {
             MeasureAntennaTuning();
             break;
 
-        case CMD_MEASURE_ANTENNA_TUNING_HF:
-            MeasureAntennaTuningHf();
+        case CMD_MEASURE_ANTENNA_TUNING_HF_START:
+            // Let the FPGA drive the high-frequency antenna around 13.56 MHz.
+            FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
+            FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
+            reply_ng(CMD_MEASURE_ANTENNA_TUNING_HF_START, PM3_SUCCESS, NULL, 0);
+            break;
+
+        case CMD_MEASURE_ANTENNA_TUNING_HF_SAMPLE:
+            if (button_status == BUTTON_SINGLE_CLICK)
+                reply_ng(CMD_MEASURE_ANTENNA_TUNING_HF_SAMPLE, PM3_EOPABORTED, NULL, 0);
+            uint16_t volt = MeasureAntennaTuningHfData();
+            reply_ng(CMD_MEASURE_ANTENNA_TUNING_HF_SAMPLE, PM3_SUCCESS, (uint8_t *)&volt, sizeof(volt));
+            break;
+
+        case CMD_MEASURE_ANTENNA_TUNING_HF_STOP:
+            FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+            reply_ng(CMD_MEASURE_ANTENNA_TUNING_HF_STOP, PM3_SUCCESS, NULL, 0);
             break;
 
         case CMD_LISTEN_READER_FIELD:
@@ -1646,8 +1651,8 @@ void  __attribute__((noreturn)) AppMain(void) {
         }
 
         // Press button for one second to enter a possible standalone mode
-        if (BUTTON_HELD(1000) > 0) {
-
+        button_status = BUTTON_HELD(1000);
+        if (button_status == BUTTON_HOLD) {
             /*
             * So this is the trigger to execute a standalone mod.  Generic entrypoint by following the standalone/standalone.h headerfile
             * All standalone mod "main loop" should be the RunMod() function.
diff --git a/client/cmdhf.c b/client/cmdhf.c
index 65dbaaef1..b1bb6fa25 100644
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -20,6 +20,7 @@ static int usage_hf_search() {
     PrintAndLogEx(NORMAL, "");
     return 0;
 }
+
 static int usage_hf_sniff() {
     PrintAndLogEx(NORMAL, "The high frequence sniffer will assign all available memory on device for sniffed data");
     PrintAndLogEx(NORMAL, "Use " _YELLOW_("'data samples'")" command to download from device,  and " _YELLOW_("'data plot'")" to look at it");
@@ -36,6 +37,16 @@ static int usage_hf_sniff() {
     return 0;
 }
 
+static int usage_hf_tune() {
+    PrintAndLogEx(NORMAL, "Usage: hf tune [<iter>]");
+    PrintAndLogEx(NORMAL, "Continuously measure HF antenna tuning.");
+    PrintAndLogEx(NORMAL, "Press button to interrupt.");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       <iter>               - number of iterations (default: infinite)");
+    PrintAndLogEx(NORMAL, "");
+    return 0;
+}
+
 int CmdHFSearch(const char *Cmd) {
 
     char cmdp = tolower(param_getchar(Cmd, 0));
@@ -82,17 +93,35 @@ int CmdHFSearch(const char *Cmd) {
 }
 
 int CmdHFTune(const char *Cmd) {
-    (void)Cmd; // Cmd is not used so far
-    PrintAndLogEx(SUCCESS, "Measuring HF antenna, press button to exit");
-    clearCommandBuffer();
-    SendCommandNG(CMD_MEASURE_ANTENNA_TUNING_HF, NULL, 0);
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (cmdp == 'h') return usage_hf_tune();
+    int iter =  param_get32ex(Cmd, 0, 0, 10);
+
     PacketResponseNG resp;
-    if (!WaitForResponseTimeout(CMD_MEASURE_ANTENNA_TUNING_HF, &resp, 1000)) {
+    PrintAndLogEx(SUCCESS, "Measuring HF antenna, click button to exit");
+    clearCommandBuffer();
+    SendCommandNG(CMD_MEASURE_ANTENNA_TUNING_HF_START, NULL, 0);
+    if (!WaitForResponseTimeout(CMD_MEASURE_ANTENNA_TUNING_HF_START, &resp, 1000)) {
         PrintAndLogEx(WARNING, "Timeout while waiting for Proxmark HF measure, aborting");
         return PM3_ETIMEOUT;
     }
-    if (resp.status != PM3_EOPABORTED)
-        return resp.status;
+    for (uint8_t i=0; iter == 0 || i< iter; i++) { // loop forever (till button pressed) if iter = 0 (default)
+        SendCommandNG(CMD_MEASURE_ANTENNA_TUNING_HF_SAMPLE, NULL, 0);
+        if (!WaitForResponseTimeout(CMD_MEASURE_ANTENNA_TUNING_HF_SAMPLE, &resp, 1000)) {
+            PrintAndLogEx(WARNING, "Timeout while waiting for Proxmark HF measure, aborting");
+            return PM3_ETIMEOUT;
+        }
+        if (resp.status == PM3_EOPABORTED)
+            break;
+        uint16_t volt = resp.data.asDwords[0];
+        PrintAndLogEx(INPLACE, "%u mV / %5u V", volt, (uint16_t)(volt / 1000));
+    }
+    SendCommandNG(CMD_MEASURE_ANTENNA_TUNING_HF_STOP, NULL, 0);
+    if (!WaitForResponseTimeout(CMD_MEASURE_ANTENNA_TUNING_HF_STOP, &resp, 1000)) {
+        PrintAndLogEx(WARNING, "Timeout while waiting for Proxmark HF measure, aborting");
+        return PM3_ETIMEOUT;
+    }
+    PrintAndLogEx(SUCCESS, "Done.");
     return PM3_SUCCESS;
 }
 
diff --git a/client/ui.c b/client/ui.c
index a2a364536..023f5b444 100644
--- a/client/ui.c
+++ b/client/ui.c
@@ -63,8 +63,6 @@ void PrintAndLogEx(logLevel_t level, const char *fmt, ...) {
     char buffer2[MAX_PRINT_BUFFER + 20] = {0};
     char *token = NULL;
     char *tmp_ptr = NULL;
-    //   {NORMAL, SUCCESS, INFO, FAILED, WARNING, ERR, DEBUG}
-    static const char *prefixes[7] = { "", "[+] ", "[=] ", "[-] ", "[!] ", "[!!] ", "[#] "};
     FILE *stream = stdout;
 
     switch (level) {
@@ -88,7 +86,8 @@ void PrintAndLogEx(logLevel_t level, const char *fmt, ...) {
             strncpy(prefix, _YELLOW_("[=]"), sizeof(prefix) - 1);
             break;
         case NORMAL:
-            strncpy(prefix, prefixes[level], sizeof(prefix) - 1);
+        case INPLACE:
+            // no prefixes for normal & inplace
             break;
     }
 
@@ -97,11 +96,16 @@ void PrintAndLogEx(logLevel_t level, const char *fmt, ...) {
     vsnprintf(buffer, sizeof(buffer), fmt, args);
     va_end(args);
 
-    // no prefixes for normal
+    // no prefixes for normal & inplace
     if (level == NORMAL) {
         fPrintAndLog(stream, "%s", buffer);
         return;
     }
+    if (level == INPLACE) {
+        printf("%s\r", buffer);
+        fflush(stdout);
+        return;
+    }
 
     if (strchr(buffer, '\n')) {
 
diff --git a/client/ui.h b/client/ui.h
index 4f70b54cd..6e70b053d 100644
--- a/client/ui.h
+++ b/client/ui.h
@@ -38,7 +38,7 @@ extern session_arg_t session;
 #define M_PI 3.14159265358979323846264338327
 #endif
 #define MAX_PRINT_BUFFER 2048
-typedef enum logLevel {NORMAL, SUCCESS, INFO, FAILED, WARNING, ERR, DEBUG} logLevel_t;
+typedef enum logLevel {NORMAL, SUCCESS, INFO, FAILED, WARNING, ERR, DEBUG, INPLACE} logLevel_t;
 
 void ShowGui(void);
 void HideGraphWindow(void);
diff --git a/include/pm3_cmd.h b/include/pm3_cmd.h
index de66f312f..a725ccab9 100644
--- a/include/pm3_cmd.h
+++ b/include/pm3_cmd.h
@@ -335,7 +335,9 @@ typedef struct {
 
 // For measurements of the antenna tuning
 #define CMD_MEASURE_ANTENNA_TUNING                                        0x0400
-#define CMD_MEASURE_ANTENNA_TUNING_HF                                     0x0401
+#define CMD_MEASURE_ANTENNA_TUNING_HF_START                               0x0401
+#define CMD_MEASURE_ANTENNA_TUNING_HF_SAMPLE                              0x0402
+#define CMD_MEASURE_ANTENNA_TUNING_HF_STOP                                0x0403
 #define CMD_MEASURED_ANTENNA_TUNING                                       0x0410
 #define CMD_LISTEN_READER_FIELD                                           0x0420
 

From 528da6ec3270302fdb12b343733805363a3c4016 Mon Sep 17 00:00:00 2001
From: mcd1992 <theanonbutinf@gmail.com>
Date: Mon, 13 May 2019 19:39:27 -0500
Subject: [PATCH 1712/1938] Added paged moving to the plot GUI

---
 client/proxguiqt.cpp | 32 ++++++++++++++++++++++++++++----
 client/proxguiqt.h   |  4 ++--
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/client/proxguiqt.cpp b/client/proxguiqt.cpp
index 8357c785f..fb0f51d26 100644
--- a/client/proxguiqt.cpp
+++ b/client/proxguiqt.cpp
@@ -33,8 +33,8 @@ extern "C" {
 
 bool g_useOverlays = false;
 int g_absVMax = 0;
-uint32_t startMax;
-int PageWidth;
+uint32_t startMax; // Maximum offset in the graph (right side of graph)
+uint32_t PageWidth; // How many samples are currently visible on this 'page' / graph
 int unlockStart = 0;
 
 void ProxGuiQT::ShowGraphWindow(void) {
@@ -483,6 +483,7 @@ void Plot::paintEvent(QPaintEvent *event) {
 
     QRect plotRect(WIDTH_AXES, 0, width() - WIDTH_AXES, height() - HEIGHT_INFO);
     QRect infoRect(0, height() - HEIGHT_INFO, width(), HEIGHT_INFO);
+    PageWidth = plotRect.width() / GraphPixelsPerPoint;
 
     //Grey background
     painter.fillRect(rect(), QColor(60, 60, 60));
@@ -586,7 +587,7 @@ void Plot::mouseMoveEvent(QMouseEvent *event) {
 }
 
 void Plot::keyPressEvent(QKeyEvent *event) {
-    uint32_t offset;
+    uint32_t offset; // Left/right movement offset (in sample size)
 
     if (event->modifiers() & Qt::ShiftModifier) {
         if (PlotGridX)
@@ -651,7 +652,6 @@ void Plot::keyPressEvent(QKeyEvent *event) {
             break;
 
         case Qt::Key_H:
-
             puts("\n-----------------------------------------------------------------------");
             puts("PLOT window keystrokes");
             puts("\tKey                      Action");
@@ -662,6 +662,10 @@ void Plot::keyPressEvent(QKeyEvent *event) {
             puts("\tH                        Show help");
             puts("\tL                        Toggle lock grid relative to samples");
             puts("\tQ                        Hide window");
+            puts("\tHOME                     Move to the start of the graph");
+            puts("\tEND                      Move to the end of the graph");
+            puts("\tPGUP                     Page left");
+            puts("\tPGDOWN                   Page right");
             puts("\tLEFT                     Move left");
             puts("\t<CTLR> LEFT              Move left 1 sample");
             puts("\t<SHIFT> LEFT             Page left");
@@ -685,6 +689,26 @@ void Plot::keyPressEvent(QKeyEvent *event) {
             master->hide();
             break;
 
+        case Qt::Key_Home:
+            GraphStart = 0;
+            break;
+
+        case Qt::Key_End:
+            GraphStart = startMax;
+            break;
+
+        case Qt::Key_PageUp:
+            if (GraphStart >= PageWidth) {
+                GraphStart -= PageWidth;
+            } else {
+                GraphStart = 0;
+            }
+            break;
+
+        case Qt::Key_PageDown:
+            GraphStart += PageWidth;
+            break;
+
         default:
             QWidget::keyPressEvent(event);
             return;
diff --git a/client/proxguiqt.h b/client/proxguiqt.h
index f8f919307..458a70058 100644
--- a/client/proxguiqt.h
+++ b/client/proxguiqt.h
@@ -31,8 +31,8 @@ class ProxWidget;
 class Plot: public QWidget {
   private:
     QWidget *master;
-    uint32_t GraphStart;
-    double GraphPixelsPerPoint;
+    uint32_t GraphStart; // Starting point/offset for the left side of the graph
+    double GraphPixelsPerPoint; // How many visual pixels are between each sample point (x axis)
     uint32_t CursorAPos;
     uint32_t CursorBPos;
     void PlotGraph(int *buffer, size_t len, QRect r, QRect r2, QPainter *painter, int graphNum);

From c281f71f59873597985ffd1b500e5cd3ccbc76df Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 14 May 2019 08:25:26 +0200
Subject: [PATCH 1713/1938] hf tune: group commands

---
 armsrc/appmain.c  | 41 ++++++++++++++++++++++++-----------------
 client/cmdhf.c    | 25 +++++++++++++++----------
 client/ui.c       |  2 +-
 include/pm3_cmd.h |  4 +---
 4 files changed, 41 insertions(+), 31 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 6c820b4b3..a506f1419 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1229,23 +1229,30 @@ static void PacketReceived(PacketCommandNG *packet) {
             MeasureAntennaTuning();
             break;
 
-        case CMD_MEASURE_ANTENNA_TUNING_HF_START:
-            // Let the FPGA drive the high-frequency antenna around 13.56 MHz.
-            FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-            FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
-            reply_ng(CMD_MEASURE_ANTENNA_TUNING_HF_START, PM3_SUCCESS, NULL, 0);
-            break;
-
-        case CMD_MEASURE_ANTENNA_TUNING_HF_SAMPLE:
-            if (button_status == BUTTON_SINGLE_CLICK)
-                reply_ng(CMD_MEASURE_ANTENNA_TUNING_HF_SAMPLE, PM3_EOPABORTED, NULL, 0);
-            uint16_t volt = MeasureAntennaTuningHfData();
-            reply_ng(CMD_MEASURE_ANTENNA_TUNING_HF_SAMPLE, PM3_SUCCESS, (uint8_t *)&volt, sizeof(volt));
-            break;
-
-        case CMD_MEASURE_ANTENNA_TUNING_HF_STOP:
-            FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-            reply_ng(CMD_MEASURE_ANTENNA_TUNING_HF_STOP, PM3_SUCCESS, NULL, 0);
+        case CMD_MEASURE_ANTENNA_TUNING_HF:
+            if (packet->length != 1)
+                reply_ng(CMD_MEASURE_ANTENNA_TUNING_HF, PM3_EINVARG, NULL, 0);
+            switch (packet->data.asBytes[0]) {
+                case 1: // MEASURE_ANTENNA_TUNING_HF_START
+                    // Let the FPGA drive the high-frequency antenna around 13.56 MHz.
+                    FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
+                    FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
+                    reply_ng(CMD_MEASURE_ANTENNA_TUNING_HF, PM3_SUCCESS, NULL, 0);
+                    break;
+                case 2:
+                    if (button_status == BUTTON_SINGLE_CLICK)
+                        reply_ng(CMD_MEASURE_ANTENNA_TUNING_HF, PM3_EOPABORTED, NULL, 0);
+                    uint16_t volt = MeasureAntennaTuningHfData();
+                    reply_ng(CMD_MEASURE_ANTENNA_TUNING_HF, PM3_SUCCESS, (uint8_t *)&volt, sizeof(volt));
+                    break;
+                case 3:
+                    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+                    reply_ng(CMD_MEASURE_ANTENNA_TUNING_HF, PM3_SUCCESS, NULL, 0);
+                    break;
+                default:
+                    reply_ng(CMD_MEASURE_ANTENNA_TUNING_HF, PM3_EINVARG, NULL, 0);
+                    break;
+            }
             break;
 
         case CMD_LISTEN_READER_FIELD:
diff --git a/client/cmdhf.c b/client/cmdhf.c
index b1bb6fa25..bed207991 100644
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -100,27 +100,32 @@ int CmdHFTune(const char *Cmd) {
     PacketResponseNG resp;
     PrintAndLogEx(SUCCESS, "Measuring HF antenna, click button to exit");
     clearCommandBuffer();
-    SendCommandNG(CMD_MEASURE_ANTENNA_TUNING_HF_START, NULL, 0);
-    if (!WaitForResponseTimeout(CMD_MEASURE_ANTENNA_TUNING_HF_START, &resp, 1000)) {
-        PrintAndLogEx(WARNING, "Timeout while waiting for Proxmark HF measure, aborting");
+    uint8_t mode[] = {1};
+    SendCommandNG(CMD_MEASURE_ANTENNA_TUNING_HF, mode, sizeof(mode));
+    if (!WaitForResponseTimeout(CMD_MEASURE_ANTENNA_TUNING_HF, &resp, 1000)) {
+        PrintAndLogEx(WARNING, "Timeout while waiting for Proxmark HF initialization, aborting");
         return PM3_ETIMEOUT;
     }
-    for (uint8_t i=0; iter == 0 || i< iter; i++) { // loop forever (till button pressed) if iter = 0 (default)
-        SendCommandNG(CMD_MEASURE_ANTENNA_TUNING_HF_SAMPLE, NULL, 0);
-        if (!WaitForResponseTimeout(CMD_MEASURE_ANTENNA_TUNING_HF_SAMPLE, &resp, 1000)) {
+    mode[0] = 2;
+    // loop forever (till button pressed) if iter = 0 (default)
+    for (uint8_t i=0; iter == 0 || i< iter; i++) {
+        SendCommandNG(CMD_MEASURE_ANTENNA_TUNING_HF, mode, sizeof(mode));
+        if (!WaitForResponseTimeout(CMD_MEASURE_ANTENNA_TUNING_HF, &resp, 1000)) {
             PrintAndLogEx(WARNING, "Timeout while waiting for Proxmark HF measure, aborting");
             return PM3_ETIMEOUT;
         }
-        if (resp.status == PM3_EOPABORTED)
+        if ((resp.status == PM3_EOPABORTED) || (resp.length != sizeof(uint16_t)))
             break;
         uint16_t volt = resp.data.asDwords[0];
         PrintAndLogEx(INPLACE, "%u mV / %5u V", volt, (uint16_t)(volt / 1000));
     }
-    SendCommandNG(CMD_MEASURE_ANTENNA_TUNING_HF_STOP, NULL, 0);
-    if (!WaitForResponseTimeout(CMD_MEASURE_ANTENNA_TUNING_HF_STOP, &resp, 1000)) {
-        PrintAndLogEx(WARNING, "Timeout while waiting for Proxmark HF measure, aborting");
+    mode[0] = 3;
+    SendCommandNG(CMD_MEASURE_ANTENNA_TUNING_HF, mode, sizeof(mode));
+    if (!WaitForResponseTimeout(CMD_MEASURE_ANTENNA_TUNING_HF, &resp, 1000)) {
+        PrintAndLogEx(WARNING, "Timeout while waiting for Proxmark HF shutdown, aborting");
         return PM3_ETIMEOUT;
     }
+    PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(SUCCESS, "Done.");
     return PM3_SUCCESS;
 }
diff --git a/client/ui.c b/client/ui.c
index 023f5b444..010ee8499 100644
--- a/client/ui.c
+++ b/client/ui.c
@@ -102,7 +102,7 @@ void PrintAndLogEx(logLevel_t level, const char *fmt, ...) {
         return;
     }
     if (level == INPLACE) {
-        printf("%s\r", buffer);
+        printf("\r%s", buffer);
         fflush(stdout);
         return;
     }
diff --git a/include/pm3_cmd.h b/include/pm3_cmd.h
index a725ccab9..de66f312f 100644
--- a/include/pm3_cmd.h
+++ b/include/pm3_cmd.h
@@ -335,9 +335,7 @@ typedef struct {
 
 // For measurements of the antenna tuning
 #define CMD_MEASURE_ANTENNA_TUNING                                        0x0400
-#define CMD_MEASURE_ANTENNA_TUNING_HF_START                               0x0401
-#define CMD_MEASURE_ANTENNA_TUNING_HF_SAMPLE                              0x0402
-#define CMD_MEASURE_ANTENNA_TUNING_HF_STOP                                0x0403
+#define CMD_MEASURE_ANTENNA_TUNING_HF                                     0x0401
 #define CMD_MEASURED_ANTENNA_TUNING                                       0x0410
 #define CMD_LISTEN_READER_FIELD                                           0x0420
 

From 42d025d01a11b0bb25fca98b4434841fa81fd71e Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 14 May 2019 08:29:24 +0200
Subject: [PATCH 1714/1938] Slight rework of hw tune

---
 armsrc/appmain.c  | 2 +-
 client/cmddata.c  | 2 +-
 include/pm3_cmd.h | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index a506f1419..883d735d1 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -296,7 +296,7 @@ void MeasureAntennaTuning(void) {
     arg2 <<= 32;
     arg2 |= peakf;
 
-    reply_old(CMD_MEASURED_ANTENNA_TUNING, arg0, v_hf, arg2, LF_Results, 256);
+    reply_mix(CMD_MEASURE_ANTENNA_TUNING, arg0, v_hf, arg2, LF_Results, 256);
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     LEDsoff();
 }
diff --git a/client/cmddata.c b/client/cmddata.c
index 0b63b043d..c13cbe904 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -1532,7 +1532,7 @@ int CmdTuneSamples(const char *Cmd) {
     clearCommandBuffer();
     SendCommandNG(CMD_MEASURE_ANTENNA_TUNING, NULL, 0);
     PacketResponseNG resp;
-    while (!WaitForResponseTimeout(CMD_MEASURED_ANTENNA_TUNING, &resp, 2000)) {
+    while (!WaitForResponseTimeout(CMD_MEASURE_ANTENNA_TUNING, &resp, 2000)) {
         timeout++;
         printf(".");
         fflush(stdout);
diff --git a/include/pm3_cmd.h b/include/pm3_cmd.h
index de66f312f..6e455b36f 100644
--- a/include/pm3_cmd.h
+++ b/include/pm3_cmd.h
@@ -336,7 +336,6 @@ typedef struct {
 // For measurements of the antenna tuning
 #define CMD_MEASURE_ANTENNA_TUNING                                        0x0400
 #define CMD_MEASURE_ANTENNA_TUNING_HF                                     0x0401
-#define CMD_MEASURED_ANTENNA_TUNING                                       0x0410
 #define CMD_LISTEN_READER_FIELD                                           0x0420
 
 // For direct FPGA control

From d535d5a37894e8708773a44067aef58152c0f226 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 14 May 2019 08:40:16 +0200
Subject: [PATCH 1715/1938] hf tune: can be interrupted by keyboard

---
 client/cmdhf.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/client/cmdhf.c b/client/cmdhf.c
index bed207991..a7fe79194 100644
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -40,7 +40,7 @@ static int usage_hf_sniff() {
 static int usage_hf_tune() {
     PrintAndLogEx(NORMAL, "Usage: hf tune [<iter>]");
     PrintAndLogEx(NORMAL, "Continuously measure HF antenna tuning.");
-    PrintAndLogEx(NORMAL, "Press button to interrupt.");
+    PrintAndLogEx(NORMAL, "Press button or keyboard to interrupt.");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       <iter>               - number of iterations (default: infinite)");
     PrintAndLogEx(NORMAL, "");
@@ -98,7 +98,7 @@ int CmdHFTune(const char *Cmd) {
     int iter =  param_get32ex(Cmd, 0, 0, 10);
 
     PacketResponseNG resp;
-    PrintAndLogEx(SUCCESS, "Measuring HF antenna, click button to exit");
+    PrintAndLogEx(SUCCESS, "Measuring HF antenna, click button or press a key to exit");
     clearCommandBuffer();
     uint8_t mode[] = {1};
     SendCommandNG(CMD_MEASURE_ANTENNA_TUNING_HF, mode, sizeof(mode));
@@ -109,6 +109,11 @@ int CmdHFTune(const char *Cmd) {
     mode[0] = 2;
     // loop forever (till button pressed) if iter = 0 (default)
     for (uint8_t i=0; iter == 0 || i< iter; i++) {
+        if (ukbhit()) { // abort by keyboard press
+            int gc = getchar();
+            (void)gc;
+            break;
+        }
         SendCommandNG(CMD_MEASURE_ANTENNA_TUNING_HF, mode, sizeof(mode));
         if (!WaitForResponseTimeout(CMD_MEASURE_ANTENNA_TUNING_HF, &resp, 1000)) {
             PrintAndLogEx(WARNING, "Timeout while waiting for Proxmark HF measure, aborting");

From 28398222e649bacdd42c0b9514682ad6a632e5b6 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 14 May 2019 11:18:33 +0200
Subject: [PATCH 1716/1938] chg: 'hf tune' - now with prefix :)

---
 client/ui.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/ui.c b/client/ui.c
index 010ee8499..fa7f24a2d 100644
--- a/client/ui.c
+++ b/client/ui.c
@@ -102,7 +102,7 @@ void PrintAndLogEx(logLevel_t level, const char *fmt, ...) {
         return;
     }
     if (level == INPLACE) {
-        printf("\r%s", buffer);
+        printf("\r[*] %s", buffer);
         fflush(stdout);
         return;
     }

From 48c71aeef61c721c7435af68519b4737e1628ecc Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 14 May 2019 11:54:25 +0200
Subject: [PATCH 1717/1938] fix: 'script run legic' - also save as binary.  
 https://github.com/RfidResearchGroup/proxmark3/issues/193

if binary file exists,  it will try to increase filename counter to find a non-existing name.
---
 client/scripts/legic.lua | 47 +++++++++++++++++++++++++++++++++-------
 1 file changed, 39 insertions(+), 8 deletions(-)

diff --git a/client/scripts/legic.lua b/client/scripts/legic.lua
index 97fd64f11..0bd7104f7 100644
--- a/client/scripts/legic.lua
+++ b/client/scripts/legic.lua
@@ -292,13 +292,13 @@ end
 ---
 -- check availability of file
 function file_check(file_name)
-  local file_found=io.open(file_name, "r")
-  if file_found==nil then
-    return false
-  else
-    file_found:close()
-    return true
-  end
+    local file_found = io.open(file_name, "r")
+    if file_found == nil then
+        return false
+    else
+        file_found:close()
+        return true
+    end
 end
 
 ---
@@ -638,6 +638,30 @@ local function readFile(filename)
     return tag
 end
 
+local function save_BIN(data, filename)
+    local outfile
+    local counter = 1
+    local ext = filename:match("^.+(%..+)$")
+    local fn = filename
+    
+    -- Make sure we don't overwrite a file
+    while file_check(fn) do
+        fn = filename:gsub(ext,  tostring(counter)..ext)
+        print(filename, fn)
+        counter = counter + 1
+    end
+    
+    outfile = io.open(fn, 'wb')
+
+    local i = 1
+    while data[i] do
+        outfile:write(data[i])
+        i = i + 1
+    end
+
+    outfile:close()
+    return fn
+end
 ---
 -- write bytes to file
 function writeFile(bytes, filename)
@@ -653,7 +677,9 @@ function writeFile(bytes, filename)
     if err then
         return oops("OOps ... failed to open output-file ".. filename)
     end
+
     bytes = xorBytes(bytes, bytes[5])
+    
     for i = 1, #bytes do
         if (bcnt == 0) then
             line = bytes[i]
@@ -670,7 +696,12 @@ function writeFile(bytes, filename)
         bcnt = bcnt + 1
     end
     fho:close()
-    print("\nwrote ".. #bytes .." bytes to " .. filename)
+    
+    -- save binary
+    local fn_bin = save_BIN(bytes, filename)
+    
+    print("\nwrote ".. #bytes * 3 .." bytes to " .. filename)
+    print("\nwrote ".. #bytes .." bytes to " .. fn_bin)
     return true
 end
 

From 62cf4ad8a70ac3dba6b6d8ea3552e25d154fc194 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 14 May 2019 12:35:25 +0200
Subject: [PATCH 1718/1938] fancy INPLACE

---
 client/ui.c | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/client/ui.c b/client/ui.c
index fa7f24a2d..5d0d4c836 100644
--- a/client/ui.c
+++ b/client/ui.c
@@ -52,6 +52,9 @@ void PrintAndLogOptions(const char *str[][2], size_t size, size_t space) {
     }
     PrintAndLogEx(NORMAL, "%s", buff);
 }
+
+uint8_t PrintAndLogEx_spinidx = 0;
+
 void PrintAndLogEx(logLevel_t level, const char *fmt, ...) {
 
     // skip debug messages if client debugging is turned off i.e. 'DATA SETDEBUG 0'
@@ -64,7 +67,7 @@ void PrintAndLogEx(logLevel_t level, const char *fmt, ...) {
     char *token = NULL;
     char *tmp_ptr = NULL;
     FILE *stream = stdout;
-
+    char *spinner[] = {_YELLOW_("[\\]"), _YELLOW_("[|]"), _YELLOW_("[/]"), _YELLOW_("[-]")};
     switch (level) {
         case ERR:
             strncpy(prefix, _RED_("[!!]"), sizeof(prefix) - 1);
@@ -85,9 +88,14 @@ void PrintAndLogEx(logLevel_t level, const char *fmt, ...) {
         case INFO:
             strncpy(prefix, _YELLOW_("[=]"), sizeof(prefix) - 1);
             break;
-        case NORMAL:
         case INPLACE:
-            // no prefixes for normal & inplace
+            strncpy(prefix, spinner[PrintAndLogEx_spinidx], sizeof(prefix) - 1);
+            PrintAndLogEx_spinidx++;
+            if (PrintAndLogEx_spinidx == ARRAYLEN(spinner))
+               PrintAndLogEx_spinidx = 0;
+            break;
+        case NORMAL:
+            // no prefixes for normal
             break;
     }
 
@@ -101,11 +109,6 @@ void PrintAndLogEx(logLevel_t level, const char *fmt, ...) {
         fPrintAndLog(stream, "%s", buffer);
         return;
     }
-    if (level == INPLACE) {
-        printf("\r[*] %s", buffer);
-        fflush(stdout);
-        return;
-    }
 
     if (strchr(buffer, '\n')) {
 
@@ -131,7 +134,12 @@ void PrintAndLogEx(logLevel_t level, const char *fmt, ...) {
         fPrintAndLog(stream, "%s", buffer2);
     } else {
         snprintf(buffer2, sizeof(buffer2), "%s%s", prefix, buffer);
-        fPrintAndLog(stream, "%s", buffer2);
+        if (level == INPLACE) {
+            fprintf(stream, "\r%s", buffer2);
+            fflush(stream);
+        } else {
+            fPrintAndLog(stream, "%s", buffer2);
+        }
     }
 }
 

From d792f015a21ef084bed6c88dc2617cf9a612e164 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 14 May 2019 12:36:37 +0200
Subject: [PATCH 1719/1938] fix: 'script run legic' - bytes was in string
 format,

---
 client/scripts/legic.lua | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/client/scripts/legic.lua b/client/scripts/legic.lua
index 0bd7104f7..cd375f2cf 100644
--- a/client/scripts/legic.lua
+++ b/client/scripts/legic.lua
@@ -653,14 +653,17 @@ local function save_BIN(data, filename)
     
     outfile = io.open(fn, 'wb')
 
+    local bytes = utils.ConvertHexToBytes(data)
+
     local i = 1
-    while data[i] do
-        outfile:write(data[i])
+    while bytes[i] do
+    
+        outfile:write(bytes[i])
         i = i + 1
     end
 
     outfile:close()
-    return fn
+    return fn, #bytes
 end
 ---
 -- write bytes to file
@@ -698,10 +701,10 @@ function writeFile(bytes, filename)
     fho:close()
     
     -- save binary
-    local fn_bin = save_BIN(bytes, filename)
+    local fn_bin, num_of_bytes = save_BIN(bytes, filename)
     
     print("\nwrote ".. #bytes * 3 .." bytes to " .. filename)
-    print("\nwrote ".. #bytes .." bytes to " .. fn_bin)
+    print("\nwrote ".. num_of_bytes .." bytes to " .. fn_bin)
     return true
 end
 

From 1147c9faf8780ce6c91368e708d9562c69647e96 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 14 May 2019 12:51:45 +0200
Subject: [PATCH 1720/1938] Use ARRAYLEN

---
 armsrc/epa.c             | 2 +-
 armsrc/hitagS.c          | 2 +-
 client/cmdhf14a.c        | 6 +++---
 client/cmdhf15.c         | 2 +-
 client/crypto/asn1dump.c | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/armsrc/epa.c b/armsrc/epa.c
index c29ead02f..7d994d756 100644
--- a/armsrc/epa.c
+++ b/armsrc/epa.c
@@ -431,7 +431,7 @@ int EPA_PACE_MSE_Set_AT(pace_version_info_t pace_version_info, uint8_t password)
 // Perform the PACE protocol by replaying given APDUs
 //-----------------------------------------------------------------------------
 void EPA_PACE_Replay(PacketCommandNG *c) {
-    uint32_t timings[sizeof(apdu_lengths_replay) / sizeof(apdu_lengths_replay[0])] = {0};
+    uint32_t timings[ARRAYLEN(apdu_lengths_replay)] = {0};
 
     // if an APDU has been passed, save it
     if (c->oldarg[0] != 0) {
diff --git a/armsrc/hitagS.c b/armsrc/hitagS.c
index 2c8bdb1a2..fc38d10b3 100644
--- a/armsrc/hitagS.c
+++ b/armsrc/hitagS.c
@@ -1930,7 +1930,7 @@ void check_challenges(bool file_given, uint8_t *data) {
             }
             txlen = 64;
 
-            if (u1 >= (sizeof(unlocker) / sizeof(unlocker[0])))
+            if (u1 >= ARRAYLEN(unlocker))
                 bStop = !false;
             for (i = 0; i < 8; i++)
                 tx[i] = unlocker[u1][i];
diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 45f4224e5..5d3ec4965 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -650,7 +650,7 @@ static int SelectCard14443_4(bool disconnect, iso14a_card_select_t *card) {
         // get frame length from ATS in data field
         if (resp.oldarg[0] > 1) {
             uint8_t fsci = resp.data.asBytes[1] & 0x0f;
-            if (fsci < sizeof(atsFSC) / sizeof(atsFSC[0]))
+            if (fsci < ARRAYLEN(atsFSC))
                 frameLength = atsFSC[fsci];
         }
     } else {
@@ -658,7 +658,7 @@ static int SelectCard14443_4(bool disconnect, iso14a_card_select_t *card) {
         iso14a_card_select_t *vcard = (iso14a_card_select_t *) resp.data.asBytes;
         if (vcard->ats_len > 1) {
             uint8_t fsci = vcard->ats[1] & 0x0f;
-            if (fsci < sizeof(atsFSC) / sizeof(atsFSC[0]))
+            if (fsci < ARRAYLEN(atsFSC))
                 frameLength = atsFSC[fsci];
         }
 
@@ -1296,7 +1296,7 @@ int infoHF14A(bool verbose, bool do_nack_test) {
                           (tb1 ? "" : " NOT"),
                           (tc1 ? "" : " NOT"),
                           fsci,
-                          fsci < sizeof(atsFSC) / sizeof(atsFSC[0]) ? atsFSC[fsci] : -1
+                          fsci < ARRAYLEN(atsFSC) ? atsFSC[fsci] : -1
                          );
         }
         pos = 2;
diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index a862b6d01..022a941b2 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -1244,7 +1244,7 @@ static int CmdHF15Restore(const char *Cmd) {
         for (int j = 0; j < blocksize; j++)
             snprintf(hex + j * 2, 3, "%02X", buff[j]);
 
-        for (int j = 0; j < sizeof(uid) / sizeof(uid[0]); j++)
+        for (int j = 0; j < ARRAYLEN(uid); j++)
             snprintf(buff + j * 2, 3, "%02X", uid[j]);
 
         //TODO: Addressed mode currently not work
diff --git a/client/crypto/asn1dump.c b/client/crypto/asn1dump.c
index e197749a0..2c720ad04 100644
--- a/client/crypto/asn1dump.c
+++ b/client/crypto/asn1dump.c
@@ -99,7 +99,7 @@ static int asn1_tlv_compare(const void *a, const void *b) {
 }
 
 static const struct asn1_tag *asn1_get_tag(const struct tlv *tlv) {
-    struct asn1_tag *tag = bsearch(tlv, asn1_tags, sizeof(asn1_tags) / sizeof(asn1_tags[0]),
+    struct asn1_tag *tag = bsearch(tlv, asn1_tags, ARRAYLEN(asn1_tags),
                                    sizeof(asn1_tags[0]), asn1_tlv_compare);
 
     return tag ? tag : &asn1_tags[0];

From 1186753bf6bc40dd31252abe84a04dff64aca805 Mon Sep 17 00:00:00 2001
From: Aaron McDaniel <theanonbutinf@gmail.com>
Date: Tue, 14 May 2019 10:12:46 -0500
Subject: [PATCH 1721/1938] Added clamp to PageDown case in plot GUI and
 updated changelog

---
 CHANGELOG.md         | 1 +
 client/proxguiqt.cpp | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index df0190b6f..b390bbc56 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -219,6 +219,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
  - Added  `hf fido` `assert` and `make` commands from fido2 protocol (authenticatorMakeCredential and authenticatorGetAssertion) (@merlokk)
  - Added trailer block decoding to `hf mf rdbl` and `hf mf cgetbl` (@merlokk)
  - Added `hf mf mad` and `hf mfp mad` MAD decode, check and print commands (@merlokk)
+ - Add home, end, pageup, and pagedown keybinds to the plot GUI. Also fix paged movement in GUI. (@mcd1992)
  
 ### Fixed
 - Changed driver file proxmark3.inf to support both old and new Product/Vendor IDs (piwi)
diff --git a/client/proxguiqt.cpp b/client/proxguiqt.cpp
index fb0f51d26..344f48b03 100644
--- a/client/proxguiqt.cpp
+++ b/client/proxguiqt.cpp
@@ -707,6 +707,8 @@ void Plot::keyPressEvent(QKeyEvent *event) {
 
         case Qt::Key_PageDown:
             GraphStart += PageWidth;
+            if (GraphStart > startMax)
+                GraphStart = startMax;
             break;
 
         default:

From 8bfe669430559e732c9ac7fe4ebac85123c72228 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 14 May 2019 17:13:29 +0200
Subject: [PATCH 1722/1938] fix: 'script run legic'  - at last,  it now saves
 in EML and BIN format.

---
 client/scripts/legic.lua | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/client/scripts/legic.lua b/client/scripts/legic.lua
index cd375f2cf..beac38501 100644
--- a/client/scripts/legic.lua
+++ b/client/scripts/legic.lua
@@ -641,29 +641,25 @@ end
 local function save_BIN(data, filename)
     local outfile
     local counter = 1
-    local ext = filename:match("^.+(%..+)$")
+    local ext = filename:match("^.+(%..+)$") or ''
     local fn = filename
-    
+
     -- Make sure we don't overwrite a file
     while file_check(fn) do
-        fn = filename:gsub(ext,  tostring(counter)..ext)
-        print(filename, fn)
+        fn = filename:gsub(ext, tostring(counter)..ext)
         counter = counter + 1
     end
-    
+
     outfile = io.open(fn, 'wb')
 
-    local bytes = utils.ConvertHexToBytes(data)
-
     local i = 1
-    while bytes[i] do
-    
-        outfile:write(bytes[i])
+    while data[i] do
+        local byte = string.char(tonumber(data[i], 16))
+        outfile:write(byte)
         i = i + 1
     end
-
     outfile:close()
-    return fn, #bytes
+    return fn, #data
 end
 ---
 -- write bytes to file
@@ -701,10 +697,14 @@ function writeFile(bytes, filename)
     fho:close()
     
     -- save binary
-    local fn_bin, num_of_bytes = save_BIN(bytes, filename)
+    local fn_bin, fn_bin_num = save_BIN(bytes, filename)
+    
+    print("\nwrote "..acyellow..(#bytes * 3)..acoff.." bytes to " ..acyellow..filename..acoff)
+    
+    if fn_bin and fn_bin_num then
+        print("\nwrote "..acyellow..fn_bin_num..acoff.." bytes to BINARY file "..acyellow..fn_bin..acoff)
+    end
     
-    print("\nwrote ".. #bytes * 3 .." bytes to " .. filename)
-    print("\nwrote ".. num_of_bytes .." bytes to " .. fn_bin)
     return true
 end
 

From 36ecc4be974b884d430460663398e1715703906a Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 14 May 2019 11:42:17 -0400
Subject: [PATCH 1723/1938] style

---
 client/cmdhf.c | 2 +-
 client/ui.c    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/cmdhf.c b/client/cmdhf.c
index a7fe79194..7e42202a9 100644
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -108,7 +108,7 @@ int CmdHFTune(const char *Cmd) {
     }
     mode[0] = 2;
     // loop forever (till button pressed) if iter = 0 (default)
-    for (uint8_t i=0; iter == 0 || i< iter; i++) {
+    for (uint8_t i = 0; iter == 0 || i < iter; i++) {
         if (ukbhit()) { // abort by keyboard press
             int gc = getchar();
             (void)gc;
diff --git a/client/ui.c b/client/ui.c
index 5d0d4c836..91aaed35a 100644
--- a/client/ui.c
+++ b/client/ui.c
@@ -92,7 +92,7 @@ void PrintAndLogEx(logLevel_t level, const char *fmt, ...) {
             strncpy(prefix, spinner[PrintAndLogEx_spinidx], sizeof(prefix) - 1);
             PrintAndLogEx_spinidx++;
             if (PrintAndLogEx_spinidx == ARRAYLEN(spinner))
-               PrintAndLogEx_spinidx = 0;
+                PrintAndLogEx_spinidx = 0;
             break;
         case NORMAL:
             // no prefixes for normal

From 586e2ebabdc7c84fb1585cc168c38c53ff9c7239 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 14 May 2019 11:42:58 -0400
Subject: [PATCH 1724/1938] textual

---
 client/scripts/legic.lua | 72 ++++++++++++++++++++--------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/client/scripts/legic.lua b/client/scripts/legic.lua
index beac38501..ba38c183b 100644
--- a/client/scripts/legic.lua
+++ b/client/scripts/legic.lua
@@ -580,7 +580,7 @@ function writeToTag(tag)
 
     -- write data to file
     if (taglen > 0) then
-        WriteBytes = utils.input(acyellow.."enter number of bytes to write?"..acoff, taglen)
+        WriteBytes = input(acyellow.."enter number of bytes to write?"..acoff, taglen)
         -- load file into pm3-buffer
         if (type(filename) ~= "string") then
             filename = input(acyellow.."filename to load to pm3-buffer?"..acoff, "legic.temp")
@@ -619,7 +619,7 @@ local function readFile(filename)
     local bytes = {}
     local tag = {}
     if  file_check(filename) == false then
-        return oops("input file: "..filename.." not found")
+        return oops("input file: "..acyellow..filename..acoff.." not found")
     end
 
     bytes = getInputBytes(filename)
@@ -678,7 +678,7 @@ function writeFile(bytes, filename)
     end
 
     bytes = xorBytes(bytes, bytes[5])
-    
+
     for i = 1, #bytes do
         if (bcnt == 0) then
             line = bytes[i]
@@ -695,16 +695,16 @@ function writeFile(bytes, filename)
         bcnt = bcnt + 1
     end
     fho:close()
-    
+
     -- save binary
     local fn_bin, fn_bin_num = save_BIN(bytes, filename)
-    
+
     print("\nwrote "..acyellow..(#bytes * 3)..acoff.." bytes to " ..acyellow..filename..acoff)
-    
+
     if fn_bin and fn_bin_num then
         print("\nwrote "..acyellow..fn_bin_num..acoff.." bytes to BINARY file "..acyellow..fn_bin..acoff)
     end
-    
+
     return true
 end
 
@@ -728,16 +728,16 @@ end
 ---
 -- save mapping to file
 local function saveTagMap(map, filename)
-    if (string.len(filename)>0) then
-        if (file_check(filename)) then
-            local answer = confirm("\nthe output-file "..filename.." alredy exists!\nthis will delete the previous content!\ncontinue?")
+    if #filename > 0 then
+        if file_check(filename) then
+            local answer = confirm("\nthe output-file "..acyellow..filename..acoff.." alredy exists!\nthis will delete the previous content!\ncontinue?")
             if not answer then return print("user abort") end
         end
     end
 
     local line
     local fho,err = io.open(filename, "w")
-    if err then oops("OOps ... faild to open output-file ".. filename) end
+    if err then oops("OOps ... faild to open output-file "..acyellow..filename..acoff) end
 
     -- write line to new file
     for k, v in pairs(map) do
@@ -812,8 +812,8 @@ function loadTagMap(filename)
   local line, fields
   local temp={}
   local offset=0
-    if (file_check(filename)==false) then
-        return oops("input file: "..filename.." not found")
+    if not file_check(filename) then
+        return oops("input file: "..acyellow..filename..acoff.." not found")
     else
         local fhi,err = io.open(filename)
     while true do
@@ -821,11 +821,11 @@ function loadTagMap(filename)
         if line == nil then
         break
       else
-        fields=split(line)
+        fields = split(line)
       end
-        if (#fields==2) then
-        if (fields[1]=='offset') then
-          offset=tonumber(fields[2],10)
+        if (#fields == 2) then
+        if (fields[1] == 'offset') then
+          offset = tonumber(fields[2],10)
         end
         -- map-name
         map[fields[1]]=fields[2]
@@ -1102,10 +1102,10 @@ end
 ---
 -- check if byte is highlighted or not
 function check4Highlight(addr, tagMap)
-  local res=false
+  local res = false
   for _, v in pairs(tagMap.mappings) do
     if (addr >= v['start'] and addr <= v['end'] ) then
-      res= v['highlight']
+      res = v['highlight']
     end
   end
   return res
@@ -1116,7 +1116,7 @@ end
 function addMapping(tag, tagMap, x)
   if (type(x) ~= "number") then x = #tagMap.mappings + 1 end
   local bytes = tagToBytes(tag)
-  local myMapping={}
+  local myMapping = {}
   myMapping['name']  = input(accyan.."enter Maping-Name:"..acoff, string.format("mapping %d", #tagMap.mappings+1))
   myMapping['start'] = tonumber(input(accyan.."enter start-addr:"..acoff, '1'), 10)
   myMapping['end']   = tonumber(input(accyan.."enter end-addr:"..acoff, #bytes), 10)
@@ -1193,11 +1193,11 @@ end
 -- map all token data
 function mapTokenData(tagMap, mname, mstart, mend, mhigh)
   --if ( not mhigh ) then mhigh=false end
-  local myMapping={}
-  myMapping['name'] =mname
-  myMapping['start']=mstart
-  myMapping['end']  =mend
-  myMapping['highlight']=mhigh
+  local myMapping = {}
+  myMapping['name'] = mname
+  myMapping['start'] = mstart
+  myMapping['end'] = mend
+  myMapping['highlight'] = mhigh
   table.insert(tagMap.mappings, myMapping)
   return tagMap
 end
@@ -1290,7 +1290,7 @@ function dumpCDF(tag)
     end
 
     return res
-  else print("no valid Tag in dumpCDF") end
+  else print(acred.."no valid Tag in dumpCDF"..acoff) end
 end
 
 ---
@@ -1350,7 +1350,7 @@ function dumpSegment(tag, index)
     dp=0
     return res
   else
-    return print("Segment not found")
+    return print(acred.."Segment not found"..acoff)
   end
 end
 
@@ -2351,11 +2351,11 @@ function modifyMode()
     ---
     -- save values of mainTAG to a file (xored with MCC of mainTAG)
     ["sf"] = function(x)
-              if(istable(inTAG)) then
-                outfile=input("enter filename:", "legic.temp")
-                bytes=tagToBytes(inTAG)
+              if istable(inTAG) then
+                outfile = input("enter filename:", "legic.temp")
+                bytes = tagToBytes(inTAG)
                 --bytes=xorBytes(bytes, inTAG.MCC)
-                if (bytes) then
+                if bytes then
                   writeFile(bytes, outfile)
                 end
                end
@@ -2363,10 +2363,10 @@ function modifyMode()
     ---
     -- save values of mainTAG to a file (xored with 'specific' MCC)
     ["xf"] = function(x)
-              if(istable(inTAG)) then
-                outfile=input("enter filename:", "legic.temp")
-                crc=input("enter new crc: ('00' for a plain dump)", inTAG.MCC)
-                print("obfuscate witth: "..crc)
+              if istable(inTAG) then
+                outfile = input("enter filename:", "legic.temp")
+                crc = input("enter new crc: ('00' for a plain dump)", inTAG.MCC)
+                print("obfuscate with: "..crc)
                 bytes=tagToBytes(inTAG)
                 bytes[5]=crc
                 if (bytes) then
@@ -2436,7 +2436,7 @@ function modifyMode()
     ---
     -- load a tagMap
     ["lm"] = function(x)
-                tagMap=loadTagMap(input(accyan.."enter filename:"..acoff, "Legic.map"))
+                tagMap = loadTagMap(input(accyan.."enter filename:"..acoff, "Legic.map"))
               end,
     ---
     -- dump single segment

From a988c8ffefe401d4eb03464b85dce771a19cc98a Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 14 May 2019 14:57:56 -0400
Subject: [PATCH 1725/1938] chg: hw status - now prints number of dictionary
 keys loaded. Dont print if zero/default empty 0xffff

---
 armsrc/appmain.c  |  3 ++-
 armsrc/flashmem.c | 35 +++++++++++++++++++++++++++++++++++
 armsrc/flashmem.h |  1 +
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 883d735d1..e86360849 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -412,6 +412,7 @@ void SendStatus(void) {
     DbpString(_BLUE_("Installed StandAlone Mode"));
     ModInfo();
 
+    Flashmem_print_info();
 
     reply_old(CMD_ACK, 1, 0, 0, 0, 0);
 }
@@ -1647,7 +1648,7 @@ void  __attribute__((noreturn)) AppMain(void) {
         // Check if there is a packet available
         PacketCommandNG rx;
         memset(&rx.data, 0, sizeof(rx.data));
-            
+
         int ret = receive_ng(&rx);
         if (ret == PM3_SUCCESS) {
             PacketReceived(&rx);
diff --git a/armsrc/flashmem.c b/armsrc/flashmem.c
index a134ebbd0..fcfc9bcb2 100644
--- a/armsrc/flashmem.c
+++ b/armsrc/flashmem.c
@@ -551,3 +551,38 @@ void Flashmem_print_status(void) {
 
     FlashStop();
 }
+
+void Flashmem_print_info(void) {
+    if (!FlashInit()) return;
+
+    DbpString(_BLUE_("Flash memory dictionary loaded"));
+
+    // load dictionary offsets.
+    uint8_t keysum[2];
+    uint16_t num;
+
+    uint16_t isok = Flash_ReadDataCont(DEFAULT_MF_KEYS_OFFSET, keysum, 2);
+    if (isok == 2) {
+        num = ((keysum[1] << 8) | keysum[0]);
+        if (num != 0xFFFF && num != 0x0)
+            Dbprintf("  Mifare................%d keys", num);
+    }
+
+    isok = Flash_ReadDataCont(DEFAULT_T55XX_KEYS_OFFSET, keysum, 2);
+    if (isok == 2) {
+        num = ((keysum[1] << 8) | keysum[0]);
+        if (num != 0xFFFF && num != 0x0)
+            Dbprintf("  T55x7.................%d keys", num);
+    }
+
+    isok = Flash_ReadDataCont(DEFAULT_ICLASS_KEYS_OFFSET, keysum, 2);
+    if (isok == 2) {
+        num = ((keysum[1] << 8) | keysum[0]);
+        if (num != 0xFFFF && num != 0x0)
+            Dbprintf("  iClass................%d keys", num);
+    }
+
+    FlashStop();
+}
+
+
diff --git a/armsrc/flashmem.h b/armsrc/flashmem.h
index db0c70790..4016e66bd 100644
--- a/armsrc/flashmem.h
+++ b/armsrc/flashmem.h
@@ -141,5 +141,6 @@ uint16_t Flash_Write(uint32_t address, uint8_t *in, uint16_t len);
 uint16_t Flash_WriteData(uint32_t address, uint8_t *in, uint16_t len);
 uint16_t Flash_WriteDataCont(uint32_t address, uint8_t *in, uint16_t len);
 void Flashmem_print_status(void);
+void Flashmem_print_info(void);
 
 #endif

From 63cf6be691c5687260b542cf7d911d43b8e4bcaf Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 14 May 2019 16:20:34 -0400
Subject: [PATCH 1726/1938] guarded

---
 armsrc/appmain.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index e86360849..816ab256d 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -412,7 +412,9 @@ void SendStatus(void) {
     DbpString(_BLUE_("Installed StandAlone Mode"));
     ModInfo();
 
+#ifdef WITH_FLASH
     Flashmem_print_info();
+#endif
 
     reply_old(CMD_ACK, 1, 0, 0, 0, 0);
 }

From 8401eb4e1411a34d49ad76a1994876d67499f17c Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 15 May 2019 02:15:19 +0200
Subject: [PATCH 1727/1938] Add usart btfactory

---
 armsrc/appmain.c  |  16 ++-
 client/cmdusart.c | 270 ++++++++++++++++++++++++++++++++++++++++++++++
 common/usart.c    |  45 ++++++--
 common/usart.h    |   8 +-
 include/pm3_cmd.h |   1 +
 5 files changed, 325 insertions(+), 15 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 816ab256d..c28d1448c 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -424,7 +424,7 @@ void SendCapabilities(void) {
     capabilities.version = CAPABILITIES_VERSION;
     capabilities.via_fpc = reply_via_fpc;
     if (reply_via_fpc)
-        capabilities.baudrate = USART_BAUD_RATE;
+        capabilities.baudrate = usart_baudrate;
     else
         capabilities.baudrate = 0; // no real baudrate for USB-CDC
 
@@ -1173,7 +1173,7 @@ static void PacketReceived(PacketCommandNG *packet) {
         }
 #endif
 
-#ifdef WITH_FPC_USART_DEV
+#ifdef WITH_FPC_USART
         case CMD_USART_TX: {
             LED_B_ON();
             usart_writebuffer_sync(packet->data.asBytes, packet->length);
@@ -1221,6 +1221,16 @@ static void PacketReceived(PacketCommandNG *packet) {
             LED_B_OFF();
             break;
         }
+        case CMD_USART_CONFIG: {
+            struct p {
+                uint32_t baudrate;
+                uint8_t parity;
+            } PACKED;
+            struct p *payload = (struct p *) &packet->data.asBytes;
+            usart_init(payload->baudrate, payload->parity);
+            reply_ng(CMD_USART_CONFIG, PM3_SUCCESS, NULL, 0);
+            break;
+        }
 #endif
 
         case CMD_BUFF_CLEAR:
@@ -1631,7 +1641,7 @@ void  __attribute__((noreturn)) AppMain(void) {
 #endif
 
 #ifdef WITH_FPC_USART
-    usart_init();
+    usart_init(USART_BAUD_RATE, USART_PARITY);
 #endif
 
     // This is made as late as possible to ensure enumeration without timeout
diff --git a/client/cmdusart.c b/client/cmdusart.c
index 17738b5a7..2f69fa343 100644
--- a/client/cmdusart.c
+++ b/client/cmdusart.c
@@ -29,6 +29,20 @@ static int usage_usart_bt_pin(void) {
     return PM3_SUCCESS;
 }
 
+static int usage_usart_bt_factory(void) {
+    PrintAndLogEx(NORMAL, "Reset BT add-on to factory settings");
+    PrintAndLogEx(NORMAL, "WARNING: process only if strictly needed!");
+    PrintAndLogEx(NORMAL, "This requires");
+    PrintAndLogEx(NORMAL, "      1) BTpower to be turned ON");
+    PrintAndLogEx(NORMAL, "      2) BT add-on to NOT be connected");
+    PrintAndLogEx(NORMAL, "      => the blue LED must blink");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  usart btfactory [h]");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "           h          This help");
+    return PM3_SUCCESS;
+}
+
 static int usage_usart_tx(void) {
     PrintAndLogEx(NORMAL, "Send string over USART");
     PrintAndLogEx(NORMAL, "WARNING: it will have side-effects if used in USART HOST mode!");
@@ -105,6 +119,23 @@ static int usage_usart_txrx(void) {
     return PM3_SUCCESS;
 }
 
+static int usage_usart_config(void) {
+    PrintAndLogEx(NORMAL, "Configure USART");
+    PrintAndLogEx(NORMAL, "WARNING: it will have side-effects if used in USART HOST mode!");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Usage:  usart config [h] [b <baudrate>] [p <N|O|E>]");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "           h             This help");
+    PrintAndLogEx(NORMAL, "           b <baudrate>  Baudrate");
+    PrintAndLogEx(NORMAL, "           p <N|O|E>     Parity (None/Odd/Even)");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "      usart config b 9600");
+    PrintAndLogEx(NORMAL, "      usart config b 9600 p N");
+    PrintAndLogEx(NORMAL, "      usart config p E");
+    return PM3_SUCCESS;
+}
+
 static int usart_tx(uint8_t *data, size_t len) {
     clearCommandBuffer();
     SendCommandNG(CMD_USART_TX, data, len);
@@ -151,6 +182,243 @@ static int usart_txrx(uint8_t *srcdata, size_t srclen, uint8_t *dstdata, size_t
     return resp.status;
 }
 
+static int set_usart_config(uint32_t baudrate, uint8_t parity) {
+    clearCommandBuffer();
+    struct {
+        uint32_t baudrate;
+        uint8_t parity;
+    } PACKED payload;
+    payload.baudrate = baudrate;
+    payload.parity = parity;
+    SendCommandNG(CMD_USART_CONFIG, (uint8_t *)&payload, sizeof(payload));
+    PacketResponseNG resp;
+    if (!WaitForResponseTimeout(CMD_USART_CONFIG, &resp, 1000)) {
+        return PM3_ETIMEOUT;
+    }
+    return resp.status;
+}
+
+static int CmdUsartConfig(const char *Cmd) {
+    uint8_t cmdp = 0;
+    bool errors = false;
+    uint32_t baudrate = 0;
+    uint8_t parity = 0;
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+            case 'h':
+                return usage_usart_config();
+            case 'p':
+                switch (tolower(param_getchar(Cmd, cmdp + 1))) {
+                    case 'n':
+                        parity = 'N';
+                        break;
+                    case 'o':
+                        parity = 'O';
+                        break;
+                    case 'e':
+                        parity = 'E';
+                        break;
+                    default:
+                        PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp + 1));
+                        errors = true;
+                        break;
+                }
+                cmdp += 2;
+                break;
+            case 'b':
+                baudrate = param_get32ex(Cmd, cmdp + 1, 0, 10);
+                if (baudrate == 0) {
+                    PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp + 1));
+                    errors = true;
+                }
+                cmdp += 2;
+                break;
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                errors = true;
+                break;
+        }
+    }
+    //Validations
+    if (errors || ((baudrate == 0) && (parity == 0))) {
+        usage_usart_config();
+        return PM3_EINVARG;
+    }
+    return set_usart_config(baudrate, parity);
+}
+
+static int usart_bt_testcomm(uint32_t baudrate, uint8_t parity) {
+    int ret = set_usart_config(baudrate, parity);
+    if (ret != PM3_SUCCESS)
+        return ret;
+    char *string = "AT+VERSION";
+    uint8_t data[PM3_CMD_DATA_SIZE] = {0x00};
+    size_t len = 0;
+    PrintAndLogEx(NORMAL, "TX (%3u):%.*s at %u 8%c1", strlen(string), strlen(string), string, baudrate, parity);
+    ret = usart_txrx((uint8_t *)string, strlen(string), data, &len, 1000); // such large timeout needed
+    if (ret == PM3_SUCCESS) {
+        PrintAndLogEx(NORMAL, "RX (%3u):%.*s", len, len, data);
+        if (strcmp((char *)data, "hc01.comV2.0") == 0) {
+            PrintAndLogEx(SUCCESS, "Add-on " _GREEN_("found!"), len, len, data);
+            return PM3_SUCCESS;
+        }
+    }
+    return PM3_ENODATA;
+}
+
+static int CmdUsartBtFactory(const char *Cmd) {
+    uint8_t cmdp = 0;
+    bool errors = false;
+    uint32_t baudrate = 0;
+    uint8_t parity = 0;
+    while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+            case 'h':
+                return usage_usart_bt_factory();
+            default:
+                PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                errors = true;
+                break;
+        }
+    }
+    //Validations
+    if (errors) {
+        usage_usart_bt_factory();
+        return PM3_EINVARG;
+    }
+    PrintAndLogEx(WARNING, "This requires BT turned ON and NOT connected!");
+    PrintAndLogEx(WARNING, "Is the blue light blinking? [y/n]");
+    while(!ukbhit()) {
+        msleep(200);
+    }
+    int gc = getchar();
+    if (gc != 'y') {
+        PrintAndLogEx(NORMAL, "");
+        PrintAndLogEx(FAILED, "Aborting.");
+        return PM3_EOPABORTED;
+    }
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(INFO, "Trying to detect current settings... Please be patient.");
+    bool found = false;
+    found = usart_bt_testcomm(USART_BAUD_RATE, USART_PARITY) == PM3_SUCCESS;
+    if (found) {
+        baudrate = USART_BAUD_RATE;
+        parity = USART_PARITY;
+    } else {
+        uint32_t brs[] = {1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400, 460800, 921600, 1382400};
+        uint8_t ps[] = { 'N', 'O', 'E' };
+        for (uint8_t ip = 0; (ip < ARRAYLEN(ps)) && (!found); ip++) {
+            for (uint8_t ibr = 0; (ibr < ARRAYLEN(brs)) && (!found); ibr++) {
+                found = usart_bt_testcomm(brs[ibr], ps[ip]) == PM3_SUCCESS;
+                if (found) {
+                    baudrate = brs[ibr];
+                    parity = ps[ip];
+                }
+            }
+        }
+    }
+    if (!found) {
+        PrintAndLogEx(FAILED, "Sorry, add-on not found. Abort.");
+        return PM3_EFATAL;
+    }
+    PrintAndLogEx(INFO, "Reconfiguring add-on to default settings.");
+    char *string;
+    uint8_t data[PM3_CMD_DATA_SIZE];
+    size_t len;
+
+    memset(data, 0, sizeof(data));
+    len = 0;
+    string = "AT+NAMEPM3_RDV4.0";
+    PrintAndLogEx(NORMAL, "TX (%3u):%.*s", strlen(string), strlen(string), string);
+    int ret = usart_txrx((uint8_t *)string, strlen(string), data, &len, 1000);
+    if (ret == PM3_SUCCESS) {
+        PrintAndLogEx(NORMAL, "RX (%3u):%.*s", len, len, data);
+        if (strcmp((char *)data, "OKsetname") == 0) {
+            PrintAndLogEx(SUCCESS, "Name set to " _GREEN_("PM3_RDV4.0"));
+        } else {
+            PrintAndLogEx(WARNING, "Unexpected response to AT+NAME: " _YELLOW_("%.*s"), len, data);
+        }
+    } else {
+        PrintAndLogEx(WARNING, "Lost contact with add-on, please try again");
+        return PM3_EFATAL;
+    }
+
+    memset(data, 0, sizeof(data));
+    len = 0;
+    string = "AT+PIN1234";
+    PrintAndLogEx(NORMAL, "TX (%3u):%.*s", strlen(string), strlen(string), string);
+    ret = usart_txrx((uint8_t *)string, strlen(string), data, &len, 1000);
+    if (ret == PM3_SUCCESS) {
+        PrintAndLogEx(NORMAL, "RX (%3u):%.*s", len, len, data);
+        if (strcmp((char *)data, "OKsetPIN") == 0) {
+            PrintAndLogEx(SUCCESS, "PIN set to " _GREEN_("1234"));
+        } else {
+            PrintAndLogEx(WARNING, "Unexpected response to AT+PIN: " _YELLOW_("%.*s"), len, data);
+        }
+    } else {
+        PrintAndLogEx(WARNING, "Lost contact with add-on, please try again");
+        return PM3_EFATAL;
+    }
+
+    // parity must be changed before baudrate
+    if (parity != USART_PARITY) {
+        memset(data, 0, sizeof(data));
+        len = 0;
+        string = "AT+PN";
+        PrintAndLogEx(NORMAL, "TX (%3u):%.*s", strlen(string), strlen(string), string);
+        ret = usart_txrx((uint8_t *)string, strlen(string), data, &len, 1000);
+        if (ret == PM3_SUCCESS) {
+            PrintAndLogEx(NORMAL, "RX (%3u):%.*s", len, len, data);
+            if (strcmp((char *)data, "OK None") == 0) {
+                PrintAndLogEx(SUCCESS, "Parity set to " _GREEN_("None"));
+            } else {
+                PrintAndLogEx(WARNING, "Unexpected response to AT+P: " _YELLOW_("%.*s"), len, data);
+            }
+        } else {
+            PrintAndLogEx(WARNING, "Lost contact with add-on, please try again");
+            return PM3_EFATAL;
+        }
+    }
+
+    if (baudrate != USART_BAUD_RATE) {
+        memset(data, 0, sizeof(data));
+        len = 0;
+        string = "AT+BAUD8";
+        PrintAndLogEx(NORMAL, "TX (%3u):%.*s", strlen(string), strlen(string), string);
+        ret = usart_txrx((uint8_t *)string, strlen(string), data, &len, 1000);
+        if (ret == PM3_SUCCESS) {
+            PrintAndLogEx(NORMAL, "RX (%3u):%.*s", len, len, data);
+            if (strcmp((char *)data, "OK115200") == 0) {
+                PrintAndLogEx(SUCCESS, "Baudrate set to " _GREEN_("115200"));
+            } else {
+                PrintAndLogEx(WARNING, "Unexpected response to AT+BAUD: " _YELLOW_("%.*s"), len, data);
+            }
+        } else {
+            PrintAndLogEx(WARNING, "Lost contact with add-on, please try again");
+            return PM3_EFATAL;
+        }
+    }
+
+    if ((baudrate != USART_BAUD_RATE) || (parity != USART_PARITY)) {
+        PrintAndLogEx(WARNING, "Add-on uart settings changed, please turn BT add-on OFF and ON again, then press any key.");
+        while(!ukbhit()) {
+            msleep(200);
+        }
+        int gc = getchar();
+        (void)gc;
+        PrintAndLogEx(NORMAL, "");
+        PrintAndLogEx(INFO, "Trying to connect add-on with the new settings.");
+        found = usart_bt_testcomm(USART_BAUD_RATE, USART_PARITY) == PM3_SUCCESS;
+        if (!found) {
+            PrintAndLogEx(WARNING, "Lost contact with add-on, please try again");
+            return PM3_EFATAL;
+        }
+    }
+
+    PrintAndLogEx(SUCCESS, "Add-on successfully " _GREEN_("reset"));
+    return PM3_SUCCESS;
+}
+
 static int CmdUsartBtPin(const char *Cmd) {
     uint8_t cmdp = 0;
     bool errors = false;
@@ -430,11 +698,13 @@ static int CmdUsartRXhex(const char *Cmd) {
 static command_t CommandTable[] = {
     {"help",         CmdHelp,            AlwaysAvailable,          "This help"},
     {"btpin",        CmdUsartBtPin,      IfPm3FpcUsartHostFromUsb, "Change BT add-on PIN"},
+    {"btfactory",    CmdUsartBtFactory,  IfPm3FpcUsartHostFromUsb, "Reset BT add-on to factory settings"},
     {"tx",           CmdUsartTX,         IfPm3FpcUsartDevFromUsb,  "Send string over USART"},
     {"rx",           CmdUsartRX,         IfPm3FpcUsartDevFromUsb,  "Receive string over USART"},
     {"txrx",         CmdUsartTXRX,       IfPm3FpcUsartDevFromUsb,  "Send string over USART and wait for response"},
     {"txhex",        CmdUsartTXhex,      IfPm3FpcUsartDevFromUsb,  "Send bytes over USART"},
     {"rxhex",        CmdUsartRXhex,      IfPm3FpcUsartDevFromUsb,  "Receive bytes over USART"},
+    {"config",       CmdUsartConfig,     IfPm3FpcUsartDevFromUsb,  "Configure USART"},
 //    {"bridge",       CmdUsartBridge,     IfPm3FpcUsartDevFromUsb,  "Bridge USB-CDC & USART"},
     {NULL, NULL, NULL, NULL}
 };
diff --git a/common/usart.c b/common/usart.c
index 3e10d13bf..d7819d598 100644
--- a/common/usart.c
+++ b/common/usart.c
@@ -16,6 +16,8 @@ volatile AT91PS_USART pUS1 = AT91C_BASE_US1;
 volatile AT91PS_PIO pPIO   = AT91C_BASE_PIOA;
 volatile AT91PS_PDC pPDC   = AT91C_BASE_PDC_US1;
 
+uint32_t usart_baudrate = 0;
+uint8_t usart_parity = 0;
 /*
 void usart_close(void) {
     // Reset the USART mode
@@ -170,7 +172,12 @@ inline int usart_writebuffer_sync(uint8_t *data, size_t len) {
     return PM3_SUCCESS;
 }
 
-void usart_init(void) {
+void usart_init(uint32_t baudrate, uint8_t parity) {
+
+    if (baudrate != 0)
+        usart_baudrate = baudrate;
+    if ((parity == 'N') || (parity == 'O') || (parity == 'E'))
+        usart_parity = parity;
 
     // For a nice detailed sample, interrupt driven but still relevant.
     // See https://www.sparkfun.com/datasheets/DevTools/SAM7/at91sam7%20serial%20communications.pdf
@@ -192,18 +199,33 @@ void usart_init(void) {
     pPIO->PIO_PPUER |= (AT91C_PA21_RXD1 | AT91C_PA22_TXD1);
 
     // set mode
-    pUS1->US_MR = AT91C_US_USMODE_NORMAL |      // normal mode
-                  AT91C_US_CLKS_CLOCK |            // MCK (48MHz)
-                  AT91C_US_OVER |                  // oversampling
-                  AT91C_US_CHRL_8_BITS |           // 8 bits
-                  AT91C_US_PAR_NONE |              // parity: none
-                  AT91C_US_NBSTOP_1_BIT |          // 1 stop bit
-                  AT91C_US_CHMODE_NORMAL;          // channel mode: normal
+    uint32_t mode = AT91C_US_USMODE_NORMAL |      // normal mode
+                    AT91C_US_CLKS_CLOCK |            // MCK (48MHz)
+                    AT91C_US_OVER |                  // oversampling
+                    AT91C_US_CHRL_8_BITS |           // 8 bits
+                    AT91C_US_NBSTOP_1_BIT |          // 1 stop bit
+                    AT91C_US_CHMODE_NORMAL;          // channel mode: normal
+
+    switch(usart_parity) {
+        case 'N':
+            mode |= AT91C_US_PAR_NONE;               // parity: none
+            break;
+        case 'O':
+            mode |= AT91C_US_PAR_ODD;                // parity: odd
+            break;
+        case 'E':
+            mode |= AT91C_US_PAR_EVEN;               // parity: even
+            break;
+    }
+    pUS1->US_MR = mode;
 
     // all interrupts disabled
     pUS1->US_IDR = 0xFFFF;
 
-    pUS1->US_BRGR =  48054841 / (USART_BAUD_RATE << 3);
+    // note that for very large baudrates, error is not neglectible:
+    // b921600  => 8.6%
+    // b1382400 => 8.6%
+    pUS1->US_BRGR =  48054841 / (usart_baudrate << 3);
 
     // Write the Timeguard Register
     pUS1->US_TTGR = 0;
@@ -219,9 +241,14 @@ void usart_init(void) {
     pUS1->US_RPR = (uint32_t)us_inbuf1;
     pUS1->US_RCR = USART_BUFFLEN;
     usart_cur_inbuf = us_inbuf1;
+    usart_cur_inbuf_off = 0;
     pUS1->US_RNPR = (uint32_t)us_inbuf2;
     pUS1->US_RNCR = USART_BUFFLEN;
 
+    // Initialize our fifo
+    us_rxfifo_low = 0;
+    us_rxfifo_high = 0;
+
     // re-enable receiver / transmitter
     pUS1->US_CR = (AT91C_US_RXEN | AT91C_US_TXEN);
 
diff --git a/common/usart.h b/common/usart.h
index c6581526b..fd437c952 100644
--- a/common/usart.h
+++ b/common/usart.h
@@ -7,10 +7,12 @@
 //#define USART_BAUD_RATE 9600
 #define USART_BAUD_RATE 115200
 //#define USART_BAUD_RATE 460800
+extern uint32_t usart_baudrate;
+#define USART_PARITY 'N'
+extern uint8_t usart_parity;
 
-
-void usart_init(void);
-void usart_close(void);
+void usart_init(uint32_t baudrate, uint8_t parity);
+//void usart_close(void);
 
 int usart_writebuffer_sync(uint8_t *data, size_t len);
 uint32_t usart_read_ng(uint8_t *data, size_t len);
diff --git a/include/pm3_cmd.h b/include/pm3_cmd.h
index 6e455b36f..eff5d44f5 100644
--- a/include/pm3_cmd.h
+++ b/include/pm3_cmd.h
@@ -221,6 +221,7 @@ typedef struct {
 #define CMD_USART_RX                                                      0x0160
 #define CMD_USART_TX                                                      0x0161
 #define CMD_USART_TXRX                                                    0x0162
+#define CMD_USART_CONFIG                                                  0x0163
 
 // For low-frequency tags
 #define CMD_READ_TI_TYPE                                                  0x0202

From 1e314554744d9db841ce1204272b13bf649ab2c1 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 15 May 2019 02:18:23 -0400
Subject: [PATCH 1728/1938] textual

---
 client/cmdusart.c | 43 +++++++++++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/client/cmdusart.c b/client/cmdusart.c
index 2f69fa343..89fa07d62 100644
--- a/client/cmdusart.c
+++ b/client/cmdusart.c
@@ -251,13 +251,16 @@ static int usart_bt_testcomm(uint32_t baudrate, uint8_t parity) {
     int ret = set_usart_config(baudrate, parity);
     if (ret != PM3_SUCCESS)
         return ret;
+
     char *string = "AT+VERSION";
     uint8_t data[PM3_CMD_DATA_SIZE] = {0x00};
     size_t len = 0;
-    PrintAndLogEx(NORMAL, "TX (%3u):%.*s at %u 8%c1", strlen(string), strlen(string), string, baudrate, parity);
+
+    PrintAndLogEx(SUCCESS, "TX (%3u):%.*s at %u 8%c1", strlen(string), strlen(string), string, baudrate, parity);
+
     ret = usart_txrx((uint8_t *)string, strlen(string), data, &len, 1000); // such large timeout needed
     if (ret == PM3_SUCCESS) {
-        PrintAndLogEx(NORMAL, "RX (%3u):%.*s", len, len, data);
+        PrintAndLogEx(SUCCESS, "RX (%3u):%.*s", len, len, data);
         if (strcmp((char *)data, "hc01.comV2.0") == 0) {
             PrintAndLogEx(SUCCESS, "Add-on " _GREEN_("found!"), len, len, data);
             return PM3_SUCCESS;
@@ -286,21 +289,24 @@ static int CmdUsartBtFactory(const char *Cmd) {
         usage_usart_bt_factory();
         return PM3_EINVARG;
     }
+
     PrintAndLogEx(WARNING, "This requires BT turned ON and NOT connected!");
     PrintAndLogEx(WARNING, "Is the blue light blinking? [y/n]");
     while(!ukbhit()) {
         msleep(200);
     }
-    int gc = getchar();
+
+    int gc = tolower(getchar());
     if (gc != 'y') {
         PrintAndLogEx(NORMAL, "");
         PrintAndLogEx(FAILED, "Aborting.");
         return PM3_EOPABORTED;
     }
+
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(INFO, "Trying to detect current settings... Please be patient.");
-    bool found = false;
-    found = usart_bt_testcomm(USART_BAUD_RATE, USART_PARITY) == PM3_SUCCESS;
+
+    bool found = usart_bt_testcomm(USART_BAUD_RATE, USART_PARITY) == PM3_SUCCESS;
     if (found) {
         baudrate = USART_BAUD_RATE;
         parity = USART_PARITY;
@@ -317,22 +323,24 @@ static int CmdUsartBtFactory(const char *Cmd) {
             }
         }
     }
+
     if (!found) {
         PrintAndLogEx(FAILED, "Sorry, add-on not found. Abort.");
         return PM3_EFATAL;
     }
+
     PrintAndLogEx(INFO, "Reconfiguring add-on to default settings.");
     char *string;
     uint8_t data[PM3_CMD_DATA_SIZE];
-    size_t len;
-
+    size_t len = 0;
     memset(data, 0, sizeof(data));
-    len = 0;
+
     string = "AT+NAMEPM3_RDV4.0";
-    PrintAndLogEx(NORMAL, "TX (%3u):%.*s", strlen(string), strlen(string), string);
+    PrintAndLogEx(SUCCESS, "TX (%3u):%.*s", strlen(string), strlen(string), string);
+
     int ret = usart_txrx((uint8_t *)string, strlen(string), data, &len, 1000);
     if (ret == PM3_SUCCESS) {
-        PrintAndLogEx(NORMAL, "RX (%3u):%.*s", len, len, data);
+        PrintAndLogEx(SUCCESS, "RX (%3u):%.*s", len, len, data);
         if (strcmp((char *)data, "OKsetname") == 0) {
             PrintAndLogEx(SUCCESS, "Name set to " _GREEN_("PM3_RDV4.0"));
         } else {
@@ -346,10 +354,11 @@ static int CmdUsartBtFactory(const char *Cmd) {
     memset(data, 0, sizeof(data));
     len = 0;
     string = "AT+PIN1234";
-    PrintAndLogEx(NORMAL, "TX (%3u):%.*s", strlen(string), strlen(string), string);
+    PrintAndLogEx(SUCCESS, "TX (%3u):%.*s", strlen(string), strlen(string), string);
+
     ret = usart_txrx((uint8_t *)string, strlen(string), data, &len, 1000);
     if (ret == PM3_SUCCESS) {
-        PrintAndLogEx(NORMAL, "RX (%3u):%.*s", len, len, data);
+        PrintAndLogEx(SUCCESS, "RX (%3u):%.*s", len, len, data);
         if (strcmp((char *)data, "OKsetPIN") == 0) {
             PrintAndLogEx(SUCCESS, "PIN set to " _GREEN_("1234"));
         } else {
@@ -365,10 +374,11 @@ static int CmdUsartBtFactory(const char *Cmd) {
         memset(data, 0, sizeof(data));
         len = 0;
         string = "AT+PN";
-        PrintAndLogEx(NORMAL, "TX (%3u):%.*s", strlen(string), strlen(string), string);
+        PrintAndLogEx(SUCCESS, "TX (%3u):%.*s", strlen(string), strlen(string), string);
+
         ret = usart_txrx((uint8_t *)string, strlen(string), data, &len, 1000);
         if (ret == PM3_SUCCESS) {
-            PrintAndLogEx(NORMAL, "RX (%3u):%.*s", len, len, data);
+            PrintAndLogEx(SUCCESS, "RX (%3u):%.*s", len, len, data);
             if (strcmp((char *)data, "OK None") == 0) {
                 PrintAndLogEx(SUCCESS, "Parity set to " _GREEN_("None"));
             } else {
@@ -384,10 +394,11 @@ static int CmdUsartBtFactory(const char *Cmd) {
         memset(data, 0, sizeof(data));
         len = 0;
         string = "AT+BAUD8";
-        PrintAndLogEx(NORMAL, "TX (%3u):%.*s", strlen(string), strlen(string), string);
+        PrintAndLogEx(SUCCESS, "TX (%3u):%.*s", strlen(string), strlen(string), string);
+
         ret = usart_txrx((uint8_t *)string, strlen(string), data, &len, 1000);
         if (ret == PM3_SUCCESS) {
-            PrintAndLogEx(NORMAL, "RX (%3u):%.*s", len, len, data);
+            PrintAndLogEx(SUCCESS, "RX (%3u):%.*s", len, len, data);
             if (strcmp((char *)data, "OK115200") == 0) {
                 PrintAndLogEx(SUCCESS, "Baudrate set to " _GREEN_("115200"));
             } else {

From bc090857b82118dda8e4abf9b1821e8767f6fbf3 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 15 May 2019 08:57:15 +0200
Subject: [PATCH 1729/1938] text

---
 client/cmdusart.c | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/client/cmdusart.c b/client/cmdusart.c
index 89fa07d62..887849c9e 100644
--- a/client/cmdusart.c
+++ b/client/cmdusart.c
@@ -16,7 +16,7 @@ static int usage_usart_bt_pin(void) {
     PrintAndLogEx(NORMAL, "WARNING: this requires");
     PrintAndLogEx(NORMAL, "      1) BTpower to be turned ON");
     PrintAndLogEx(NORMAL, "      2) BT add-on to NOT be connected");
-    PrintAndLogEx(NORMAL, "      => the blue LED must blink");
+    PrintAndLogEx(NORMAL, "      => the add-on blue LED must blink");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  usart btpin [h] d NNNN");
     PrintAndLogEx(NORMAL, "Options:");
@@ -31,11 +31,11 @@ static int usage_usart_bt_pin(void) {
 
 static int usage_usart_bt_factory(void) {
     PrintAndLogEx(NORMAL, "Reset BT add-on to factory settings");
-    PrintAndLogEx(NORMAL, "WARNING: process only if strictly needed!");
+    PrintAndLogEx(NORMAL, _RED_("WARNING: process only if strictly needed!"));
     PrintAndLogEx(NORMAL, "This requires");
     PrintAndLogEx(NORMAL, "      1) BTpower to be turned ON");
     PrintAndLogEx(NORMAL, "      2) BT add-on to NOT be connected");
-    PrintAndLogEx(NORMAL, "      => the blue LED must blink");
+    PrintAndLogEx(NORMAL, "      => the add-on blue LED must blink");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  usart btfactory [h]");
     PrintAndLogEx(NORMAL, "Options:");
@@ -45,7 +45,7 @@ static int usage_usart_bt_factory(void) {
 
 static int usage_usart_tx(void) {
     PrintAndLogEx(NORMAL, "Send string over USART");
-    PrintAndLogEx(NORMAL, "WARNING: it will have side-effects if used in USART HOST mode!");
+    PrintAndLogEx(NORMAL, _RED_("WARNING: it will have side-effects if used in USART HOST mode!"));
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  usart tx [h] \"string\"");
     PrintAndLogEx(NORMAL, "Options:");
@@ -61,7 +61,7 @@ static int usage_usart_tx(void) {
 
 static int usage_usart_txhex(void) {
     PrintAndLogEx(NORMAL, "Send bytes over USART");
-    PrintAndLogEx(NORMAL, "WARNING: it will have side-effects if used in USART HOST mode!");
+    PrintAndLogEx(NORMAL, _RED_("WARNING: it will have side-effects if used in USART HOST mode!"));
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  usart txhex [h] d <bytes>");
     PrintAndLogEx(NORMAL, "Options:");
@@ -76,7 +76,7 @@ static int usage_usart_txhex(void) {
 
 static int usage_usart_rx(void) {
     PrintAndLogEx(NORMAL, "Receive string over USART");
-    PrintAndLogEx(NORMAL, "WARNING: it will have side-effects if used in USART HOST mode!");
+    PrintAndLogEx(NORMAL, _RED_("WARNING: it will have side-effects if used in USART HOST mode!"));
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  usart rx [h]");
     PrintAndLogEx(NORMAL, "Options:");
@@ -88,7 +88,7 @@ static int usage_usart_rx(void) {
 
 static int usage_usart_rxhex(void) {
     PrintAndLogEx(NORMAL, "Receive bytes over USART");
-    PrintAndLogEx(NORMAL, "WARNING: it will have side-effects if used in USART HOST mode!");
+    PrintAndLogEx(NORMAL, _RED_("WARNING: it will have side-effects if used in USART HOST mode!"));
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  usart rx [h]");
     PrintAndLogEx(NORMAL, "Options:");
@@ -100,9 +100,9 @@ static int usage_usart_rxhex(void) {
 
 static int usage_usart_txrx(void) {
     PrintAndLogEx(NORMAL, "Send string over USART and wait for response");
-    PrintAndLogEx(NORMAL, "WARNING: if used in USART HOST mode, you can only send AT commands");
-    PrintAndLogEx(NORMAL, "to add-on when BT connection is not established (LED needs to be blinking)");
-    PrintAndLogEx(NORMAL, "Any other usage in USART HOST mode will have side-effects!");
+    PrintAndLogEx(NORMAL, _YELLOW_("WARNING: if used in USART HOST mode, you can only send AT commands"));
+    PrintAndLogEx(NORMAL, _YELLOW_("to add-on when BT connection is not established (LED needs to be blinking)"));
+    PrintAndLogEx(NORMAL, _RED_("Any other usage in USART HOST mode will have side-effects!"));
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  usart txrx [h] [t <timeout>] \"string\"");
     PrintAndLogEx(NORMAL, "Options:");
@@ -121,7 +121,8 @@ static int usage_usart_txrx(void) {
 
 static int usage_usart_config(void) {
     PrintAndLogEx(NORMAL, "Configure USART");
-    PrintAndLogEx(NORMAL, "WARNING: it will have side-effects if used in USART HOST mode!");
+    PrintAndLogEx(NORMAL, _RED_("WARNING: it will have side-effects if used in USART HOST mode!"));
+    PrintAndLogEx(NORMAL, "The changes are not permanent, restart Proxmark3 to get default settings back.");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  usart config [h] [b <baudrate>] [p <N|O|E>]");
     PrintAndLogEx(NORMAL, "Options:");
@@ -290,8 +291,9 @@ static int CmdUsartBtFactory(const char *Cmd) {
         return PM3_EINVARG;
     }
 
+    PrintAndLogEx(WARNING, _RED_("WARNING: process only if strictly needed!"));
     PrintAndLogEx(WARNING, "This requires BT turned ON and NOT connected!");
-    PrintAndLogEx(WARNING, "Is the blue light blinking? [y/n]");
+    PrintAndLogEx(WARNING, "Is the add-on blue light blinking? (Say 'n' if you want to abort) [y/n]");
     while(!ukbhit()) {
         msleep(200);
     }

From 0740d14faaab9de57512a715be730bf95304b3bd Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 15 May 2019 10:24:06 +0200
Subject: [PATCH 1730/1938] chg: some unifiying return values

---
 client/cmddata.c           |  8 ++--
 client/cmdhficlass.c       | 78 +++++++++++++++++++-------------------
 client/cmdhflegic.c        | 12 +++---
 client/cmdlfhitag.c        |  2 +-
 client/cmdsmartcard.c      |  6 +--
 client/loclass/fileutils.c | 26 ++++++-------
 6 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/client/cmddata.c b/client/cmddata.c
index c13cbe904..1d2541ccb 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -1622,7 +1622,7 @@ static int CmdLoad(const char *Cmd) {
     FILE *f = fopen(filename, "r");
     if (!f) {
         PrintAndLogEx(WARNING, "couldn't open '%s'", filename);
-        return 0;
+        return PM3_EFILE;
     }
 
     GraphTraceLen = 0;
@@ -1649,7 +1649,7 @@ static int CmdLoad(const char *Cmd) {
     setClockGrid(0, 0);
     DemodBufferLen = 0;
     RepaintGraphWindow();
-    return 0;
+    return PM3_SUCCESS;
 }
 
 // trim graph from the end
@@ -1742,7 +1742,7 @@ static int CmdSave(const char *Cmd) {
     FILE *f = fopen(filename, "w");
     if (!f) {
         PrintAndLogEx(WARNING, "couldn't open '%s'", filename);
-        return 0;
+        return PM3_EFILE;
     }
 
     for (uint32_t i = 0; i < GraphTraceLen; i++)
@@ -1752,7 +1752,7 @@ static int CmdSave(const char *Cmd) {
         fclose(f);
 
     PrintAndLogEx(SUCCESS, "saved to '%s'", Cmd);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdScale(const char *Cmd) {
diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index 5b22979cc..0c3cb9281 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -275,14 +275,14 @@ static int CmdHFiClassList(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     //PrintAndLogEx(NORMAL, "Deprecated command, use 'hf list iclass' instead");
     CmdTraceList("iclass");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdHFiClassSniff(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_hf_iclass_sniff();
     SendCommandNG(CMD_SNIFF_ICLASS, NULL, 0);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdHFiClassSim(const char *Cmd) {
@@ -501,7 +501,7 @@ static int CmdHFiClassSim(const char *Cmd) {
             break;
         }
     }
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdHFiClassReader(const char *Cmd) {
@@ -525,8 +525,8 @@ static int CmdHFiClassReader_Replay(const char *Cmd) {
     }
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_READER_ICLASS_REPLAY, readerType, 0, 0, MAC, 4);
-    return 0;
+    SendCommandMIX(CMD_READER_ICLASS_REPLAY, readerType, 0, 0, MAC, 4);
+    return PM3_SUCCESS;
 }
 
 static int CmdHFiClassELoad(const char *Cmd) {
@@ -547,7 +547,7 @@ static int CmdHFiClassELoad(const char *Cmd) {
     FILE *f = fopen(filename, "rb");
     if (!f) {
         PrintAndLogEx(FAILED, "File: " _YELLOW_("%s") ": not found or locked.", filename);
-        return 1;
+        return PM3_EFILE;
     }
 
     // get filesize in order to malloc memory
@@ -601,14 +601,14 @@ static int CmdHFiClassELoad(const char *Cmd) {
     free(dump);
 
     PrintAndLogEx(SUCCESS, "sent %d bytes of data to device emulator memory", bytes_sent);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int readKeyfile(const char *filename, size_t len, uint8_t *buffer) {
     FILE *f = fopen(filename, "rb");
     if (!f) {
-        PrintAndLogEx(WARNING, "Failed to read from file '%s'", filename);
-        return 1;
+        PrintAndLogEx(FAILED, "File: " _YELLOW_("%s") ": not found or locked.", filename);
+        return PM3_EFILE;
     }
     fseek(f, 0, SEEK_END);
     long fsize = ftell(f);
@@ -625,7 +625,7 @@ static int readKeyfile(const char *filename, size_t len, uint8_t *buffer) {
         PrintAndLogEx(WARNING, "Warning, could only read %d bytes, expected %d", bytes_read, len);
         return 1;
     }
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdHFiClassDecrypt(const char *Cmd) {
@@ -644,8 +644,8 @@ static int CmdHFiClassDecrypt(const char *Cmd) {
     if (opt == 'f' && param_getstr(Cmd, 1, filename, sizeof(filename)) > 0) {
         f = fopen(filename, "rb");
         if (!f) {
-            PrintAndLogEx(WARNING, "could not find file %s", filename);
-            return 1;
+            PrintAndLogEx(FAILED, "File: " _YELLOW_("%s") ": not found or locked.", filename);
+            return PM3_EFILE;
         }
     } else {
         return usage_hf_iclass_decrypt();
@@ -712,7 +712,7 @@ static int CmdHFiClassDecrypt(const char *Cmd) {
     saveFile(outfilename, ".bin", decrypted, fsize);
     printIclassDumpContents(decrypted, 1, (fsize / 8), fsize);
     free(decrypted);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int iClassEncryptBlkData(uint8_t *blkData) {
@@ -745,7 +745,7 @@ static int CmdHFiClassEncryptBlk(const char *Cmd) {
     if (!iClassEncryptBlkData(blkData)) return 0;
 
     printvar("encrypted block", blkData, 8);
-    return 1;
+    return PM3_SUCCESS;
 }
 
 static void Calc_wb_mac(uint8_t blockno, uint8_t *data, uint8_t *div_key, uint8_t MAC[4]) {
@@ -1272,8 +1272,8 @@ static int CmdHFiClassCloneTag(const char *Cmd) {
     // file handling and reading
     f = fopen(filename, "rb");
     if (!f) {
-        PrintAndLogEx(WARNING, "failed to read file '%s'", filename);
-        return 1;
+        PrintAndLogEx(FAILED, "File: " _YELLOW_("%s") ": not found or locked.", filename);
+        return PM3_EFILE;
     }
 
     if (startblock < 5) {
@@ -1331,7 +1331,7 @@ static int CmdHFiClassCloneTag(const char *Cmd) {
         PrintAndLogEx(WARNING, "command execute timeout");
         return 0;
     }
-    return 1;
+    return PM3_SUCCESS;
 }
 
 static int ReadBlock(uint8_t *KEY, uint8_t blockno, uint8_t keyType, bool elite, bool rawkey, bool verbose, bool auth) {
@@ -1461,7 +1461,7 @@ static int CmdHFiClass_loclass(const char *Cmd) {
         if (errors) PrintAndLogDevice(WARNING, "There were errors!!!");
         return errors;
     }
-    return 0;
+    return PM3_SUCCESS;
 }
 
 void printIclassDumpContents(uint8_t *iclass_dump, uint8_t startblock, uint8_t endblock, size_t filesize) {
@@ -1520,8 +1520,8 @@ static int CmdHFiClassReadTagFile(const char *Cmd) {
     // file handling and reading
     f = fopen(filename, "rb");
     if (!f) {
-        PrintAndLogEx(WARNING, "Failed to read from file '%s'", filename);
-        return 1;
+        PrintAndLogEx(FAILED, "File: " _YELLOW_("%s") ": not found or locked.", filename);
+        return PM3_EFILE;
     }
     fseek(f, 0, SEEK_END);
     long fsize = ftell(f);
@@ -1547,7 +1547,7 @@ static int CmdHFiClassReadTagFile(const char *Cmd) {
     PrintAndLogEx(NORMAL, "CSN   |00| %s|\n", sprint_hex(csn, 8));
     printIclassDumpContents(dump, startblock, endblock, bytes_read);
     free(dump);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 void HFiClassCalcDivKey(uint8_t *CSN, uint8_t *KEY, uint8_t *div_key, bool elite) {
@@ -1670,15 +1670,15 @@ static int CmdHFiClassCalcNewKey(const char *Cmd) {
             return 0;
 
     HFiClassCalcNewKey(CSN, OLDKEY, NEWKEY, xor_div_key, elite, oldElite, true);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int loadKeys(char *filename) {
     FILE *f;
     f = fopen(filename, "rb");
     if (!f) {
-        PrintAndLogEx(WARNING, "Failed to read from file '%s'", filename);
-        return 0;
+        PrintAndLogEx(FAILED, "File: " _YELLOW_("%s") ": not found or locked.", filename);
+        return PM3_EFILE;
     }
     fseek(f, 0, SEEK_END);
     long fsize = ftell(f);
@@ -1709,24 +1709,24 @@ static int loadKeys(char *filename) {
 
     free(dump);
     PrintAndLogEx(SUCCESS, "%u keys loaded", i);
-    return 1;
+    return PM3_SUCCESS;
 }
 
 static int saveKeys(char *filename) {
     FILE *f;
     f = fopen(filename, "wb");
     if (!f) {
-        PrintAndLogEx(NORMAL, "[!] error opening file %s\n", filename);
-        return 0;
+        PrintAndLogEx(FAILED, "File: " _YELLOW_("%s") ": not found or locked.", filename);
+        return PM3_EFILE;
     }
     for (uint8_t i = 0; i < ICLASS_KEYS_MAX; i++) {
         if (fwrite(iClass_Key_Table[i], 8, 1, f) != 1) {
-            PrintAndLogEx(WARNING, "save key failed to write to file: %s", filename);
+            PrintAndLogEx(WARNING, "save key failed to write to file:" _YELLOW_("%s"), filename);
             break;
         }
     }
     fclose(f);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int printKeys(void) {
@@ -1734,7 +1734,7 @@ static int printKeys(void) {
     for (uint8_t i = 0; i < ICLASS_KEYS_MAX; i++)
         PrintAndLogEx(NORMAL, "%u: %s", i, sprint_hex(iClass_Key_Table[i], 8));
     PrintAndLogEx(NORMAL, "");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdHFiClassManageKeys(const char *Cmd) {
@@ -1824,7 +1824,7 @@ static int CmdHFiClassManageKeys(const char *Cmd) {
             return saveKeys(filename);
             break;
     }
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdHFiClassCheckKeys(const char *Cmd) {
@@ -2032,7 +2032,7 @@ out:
     DropField();
     free(pre);
     free(keyBlock);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int cmp_uint32(const void *a, const void *b) {
@@ -2184,7 +2184,7 @@ static int CmdHFiClassLookUp(const char *Cmd) {
     free(prekey);
     free(keyBlock);
     PrintAndLogEx(NORMAL, "");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 int LoadDictionaryKeyFile(char *filename, uint8_t **keys, int *keycnt) {
@@ -2234,7 +2234,7 @@ int LoadDictionaryKeyFile(char *filename, uint8_t **keys, int *keycnt) {
     }
     fclose(f);
     PrintAndLogEx(SUCCESS, "Loaded " _GREEN_("%2d") " keys from %s", *keycnt, filename);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 // precalc diversified keys and their MAC
@@ -2253,7 +2253,7 @@ int GenerateMacFromKeyFile(uint8_t *CSN, uint8_t *CCNR, bool use_raw, bool use_e
 
         doMAC(CCNR, div_key, list[i].mac);
     }
-    return 0;
+    return PM3_SUCCESS;
 }
 
 int GenerateFromKeyFile(uint8_t *CSN, uint8_t *CCNR, bool use_raw, bool use_elite, uint8_t *keys, int keycnt, iclass_prekey_t *list) {
@@ -2273,7 +2273,7 @@ int GenerateFromKeyFile(uint8_t *CSN, uint8_t *CCNR, bool use_raw, bool use_elit
         // generate MAC
         doMAC(CCNR, div_key, list[i].mac);
     }
-    return 0;
+    return PM3_SUCCESS;
 }
 
 // print diversified keys
@@ -2403,7 +2403,7 @@ static int CmdHFiClassPermuteKey(const char *Cmd) {
         permutekey(key, key_iclass_format);
         PrintAndLogEx(SUCCESS, "holiman std key | %s \n", sprint_hex(key_iclass_format, 8));
     }
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static command_t CommandTable[] = {
@@ -2433,7 +2433,7 @@ static command_t CommandTable[] = {
 static int CmdHelp(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 int CmdHFiClass(const char *Cmd) {
@@ -2503,6 +2503,6 @@ int readIclass(bool loop, bool verbose) {
         if (!loop) break;
     }
     DropField();
-    return 0;
+    return PM3_SUCCESS;
 }
 
diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index ed956bdf9..8bd976030 100644
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -947,14 +947,14 @@ static int CmdLegicDump(const char *Cmd) {
         PrintAndLogEx(WARNING, "Could not create file name %s", filename);
         if (data)
             free(data);
-        return 5;
+        return PM3_EFILE;
     }
     fwrite(data, 1, readlen, f);
     fflush(f);
     fclose(f);
     free(data);
     PrintAndLogEx(SUCCESS, "Wrote %d bytes to %s", readlen, filename);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdLegicRestore(const char *Cmd) {
@@ -1017,7 +1017,7 @@ static int CmdLegicRestore(const char *Cmd) {
     if (!f) {
         PrintAndLogEx(WARNING, "File %s not found or locked", filename);
         free(data);
-        return 3;
+        return PM3_EFILE;
     }
 
     // verify size of dumpfile is the same as card.
@@ -1083,7 +1083,7 @@ static int CmdLegicRestore(const char *Cmd) {
 
     free(data);
     PrintAndLogEx(SUCCESS, "\nWrote %d bytes to card from file %s", numofbytes, filename);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdLegicELoad(const char *Cmd) {
@@ -1133,7 +1133,7 @@ static int CmdLegicELoad(const char *Cmd) {
     if (!f) {
         PrintAndLogEx(WARNING, "File %s not found or locked", filename);
         free(data);
-        return 1;
+        return PM3_EFILE;
     }
 
     // load file
@@ -1153,7 +1153,7 @@ static int CmdLegicELoad(const char *Cmd) {
 
     free(data);
     PrintAndLogEx(SUCCESS, "\nLoaded %d bytes from file: %s  to emulator memory", numofbytes, filename);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdLegicESave(const char *Cmd) {
diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index a22c43c1b..998512575 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -177,7 +177,7 @@ static int CmdLFHitagList(const char *Cmd) {
         f = fopen(filename, "wb");
         if (!f) {
             PrintAndLogEx(WARNING, "Error: Could not open file [%s]", filename);
-            return 1;
+            return PM3_EFILE;
         }
     }
 
diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index bf252f3d7..d6870e579 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -559,7 +559,7 @@ static int CmdSmartUpgrade(const char *Cmd) {
     f = fopen(filename, "rb");
     if (!f) {
         PrintAndLogEx(FAILED, "Firmware file " _YELLOW_("%s") " not found or locked.", filename);
-        return 1;
+        return PM3_EFILE;
     }
 
     // get filesize in order to malloc memory
@@ -588,7 +588,7 @@ static int CmdSmartUpgrade(const char *Cmd) {
     if (!f) {
         PrintAndLogEx(FAILED, "SHA-512 file not found or locked.");
         free(dump);
-        return 1;
+        return PM3_EFILE;
     }
 
     // get filesize in order to malloc memory
@@ -683,7 +683,7 @@ static int CmdSmartUpgrade(const char *Cmd) {
     } else {
         PrintAndLogEx(FAILED, "Sim module firmware upgrade " _RED_("failed"));
     }
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdSmartInfo(const char *Cmd) {
diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index a592e7dfc..cb16a7fa3 100644
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -102,14 +102,14 @@ int saveFile(const char *preferredName, const char *suffix, const void *data, si
     if (!f) {
         PrintAndLogDevice(WARNING, "file not found or locked. '" _YELLOW_("%s")"'", fileName);
         free(fileName);
-        return 1;
+        return PM3_EFILE;
     }
     fwrite(data, 1, datalen, f);
     fflush(f);
     fclose(f);
     PrintAndLogDevice(SUCCESS, "saved %u bytes to binary file " _YELLOW_("%s"), datalen, fileName);
     free(fileName);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 int saveFileEML(const char *preferredName, uint8_t *data, size_t datalen, size_t blocksize) {
@@ -118,7 +118,7 @@ int saveFileEML(const char *preferredName, uint8_t *data, size_t datalen, size_t
     char *fileName = newfilenamemcopy(preferredName, ".eml");
     if (fileName == NULL) return 1;
 
-    int retval = 0;
+    int retval = PM3_SUCCESS;
     int blocks = datalen / blocksize;
     uint16_t currblock = 1;
 
@@ -128,7 +128,7 @@ int saveFileEML(const char *preferredName, uint8_t *data, size_t datalen, size_t
     FILE *f = fopen(fileName, "w+");
     if (!f) {
         PrintAndLogDevice(WARNING, "file not found or locked. '" _YELLOW_("%s")"'", fileName);
-        retval =  1;
+        retval = PM3_EFILE;
         goto out;
     }
 
@@ -163,7 +163,7 @@ int saveFileJSON(const char *preferredName, JSONFileType ftype, uint8_t *data, s
     char *fileName = newfilenamemcopy(preferredName, ".json");
     if (fileName == NULL) return 1;
 
-    int retval = 0;
+    int retval = PM3_SUCCESS;
 
     json_t *root = json_object();
     JsonSaveStr(root, "Created", "proxmark3");
@@ -292,13 +292,13 @@ int loadFile(const char *preferredName, const char *suffix, void *data, size_t m
     char *fileName = filenamemcopy(preferredName, suffix);
     if (fileName == NULL) return 1;
 
-    int retval = 0;
+    int retval = PM3_SUCCESS;
 
     FILE *f = fopen(fileName, "rb");
     if (!f) {
         PrintAndLogDevice(WARNING, "file not found or locked. '" _YELLOW_("%s")"'", fileName);
         free(fileName);
-        return 1;
+        return PM3_EFILE;
     }
 
     // get filesize in order to malloc memory
@@ -354,12 +354,12 @@ int loadFileEML(const char *preferredName, void *data, size_t *datalen) {
     if (fileName == NULL) return 1;
 
     size_t counter = 0;
-    int retval = 0, hexlen = 0;
+    int retval = PM3_SUCCESS, hexlen = 0;
 
     FILE *f = fopen(fileName, "r");
     if (!f) {
         PrintAndLogDevice(WARNING, "file not found or locked. '" _YELLOW_("%s")"'", fileName);
-        retval = 1;
+        retval = PM3_EFILE;
         goto out;
     }
 
@@ -411,7 +411,7 @@ int loadFileJSON(const char *preferredName, void *data, size_t maxdatalen, size_
     json_t *root;
     json_error_t error;
 
-    int retval = 0;
+    int retval = PM3_SUCCESS;
 
     root = json_load_file(fileName, 0, &error);
     if (!root) {
@@ -528,12 +528,12 @@ int loadFileDICTIONARY(const char *preferredName, void *data, size_t *datalen, u
     char line[255];
 
     size_t counter = 0;
-    int retval = 0;
+    int retval = PM3_SUCCESS;
 
     FILE *f = fopen(fileName, "r");
     if (!f) {
         PrintAndLogDevice(WARNING, "file not found or locked. '" _YELLOW_("%s")"'", fileName);
-        retval = 1;
+        retval = PM3_EFILE;
         goto out;
     }
 
@@ -602,7 +602,7 @@ int convertOldMfuDump(uint8_t **dump, size_t *dumplen) {
     free(*dump);
     *dump = (uint8_t *) mfu_dump;
     PrintAndLogDevice(SUCCESS, "old mfu dump format, was converted on load to " _GREEN_("%d") " pages", mfu_dump->pages + 1);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 

From 46f6548d1fc5f8faadb2a686d5ddb18b2f73b71d Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 15 May 2019 10:24:25 +0200
Subject: [PATCH 1731/1938] to send MIX,..

---
 armsrc/iclass.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/armsrc/iclass.c b/armsrc/iclass.c
index 651254716..a4e2cf895 100644
--- a/armsrc/iclass.c
+++ b/armsrc/iclass.c
@@ -2332,7 +2332,7 @@ void iClass_Authentication_fast(uint64_t arg0, uint64_t arg1, uint8_t *datain) {
 
 out:
     // send keyindex.
-    reply_old(CMD_ACK, isOK, i, 0, 0, 0);
+    reply_mix(CMD_ACK, isOK, i, 0, 0, 0);
 
     if (isOK >= 1 || lastChunk) {
         switch_off();
@@ -2360,7 +2360,7 @@ bool iClass_ReadBlock(uint8_t blockno, uint8_t *data, uint8_t len) {
 void iClass_ReadBlk(uint8_t blockno) {
     uint8_t data[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
     bool isOK = iClass_ReadBlock(blockno, data, sizeof(data));
-    reply_old(CMD_ACK, isOK, 0, 0, data, sizeof(data));
+    reply_mix(CMD_ACK, isOK, 0, 0, data, sizeof(data));
     switch_off();
 }
 
@@ -2394,7 +2394,7 @@ void iClass_Dump(uint8_t blockno, uint8_t numblks) {
         memcpy(dataout + (blkCnt * 8), blockdata, 8);
     }
     //return pointer to dump memory in arg3
-    reply_old(CMD_ACK, isOK, blkCnt, BigBuf_max_traceLen(), 0, 0);
+    reply_mix(CMD_ACK, isOK, blkCnt, BigBuf_max_traceLen(), 0, 0);
     switch_off();
     BigBuf_free();
 }

From fae572a56925004fd94cb34125c95f2e80f7316a Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 15 May 2019 04:31:52 -0400
Subject: [PATCH 1732/1938] mix

---
 armsrc/iclass.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/armsrc/iclass.c b/armsrc/iclass.c
index a4e2cf895..03b4b408f 100644
--- a/armsrc/iclass.c
+++ b/armsrc/iclass.c
@@ -2229,7 +2229,7 @@ void iClass_ReadCheck(uint8_t blockno, uint8_t keytype) {
     uint8_t resp[] = {0, 0, 0, 0, 0, 0, 0, 0};
     size_t isOK = 0;
     isOK = sendCmdGetResponseWithRetries(readcheck, sizeof(readcheck), resp, sizeof(resp), 6);
-    reply_old(CMD_ACK, isOK, 0, 0, 0, 0);
+    reply_mix(CMD_ACK, isOK, 0, 0, 0, 0);
     switch_off();
 }
 
@@ -2248,7 +2248,7 @@ void iClass_Authentication(uint8_t *mac) {
 
     // 6 retries
     bool isOK = sendCmdGetResponseWithRetries(check, sizeof(check), resp, 4, 6);
-    reply_old(CMD_ACK, isOK, 0, 0, 0, 0);
+    reply_mix(CMD_ACK, isOK, 0, 0, 0, 0);
 }
 
 typedef struct iclass_premac {
@@ -2424,7 +2424,7 @@ bool iClass_WriteBlock_ext(uint8_t blockno, uint8_t *data) {
 // turn off afterwards
 void iClass_WriteBlock(uint8_t blockno, uint8_t *data) {
     bool isOK = iClass_WriteBlock_ext(blockno, data);
-    reply_old(CMD_ACK, isOK, 0, 0, 0, 0);
+    reply_mix(CMD_ACK, isOK, 0, 0, 0, 0);
     switch_off();
 }
 
@@ -2451,6 +2451,6 @@ void iClass_Clone(uint8_t startblock, uint8_t endblock, uint8_t *data) {
     else
         DbpString("Clone incomplete");
 
-    reply_old(CMD_ACK, 1, 0, 0, 0, 0);
+    reply_mix(CMD_ACK, 1, 0, 0, 0, 0);
     switch_off();
 }

From 0edf5500febeaa81e74d7119b5c019537a0bef6c Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 15 May 2019 12:02:22 +0200
Subject: [PATCH 1733/1938] mix

---
 client/mifare/mifarehost.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/mifare/mifarehost.c b/client/mifare/mifarehost.c
index b64f07105..f0184cd72 100644
--- a/client/mifare/mifarehost.c
+++ b/client/mifare/mifarehost.c
@@ -869,7 +869,7 @@ int detect_classic_prng(void) {
     uint32_t flags = ISO14A_CONNECT | ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_RATS;
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_READER_ISO_14443a, flags, sizeof(cmd), 0, cmd, sizeof(cmd));
+    SendCommandMIX(CMD_READER_ISO_14443a, flags, sizeof(cmd), 0, cmd, sizeof(cmd));
 
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
         PrintAndLogEx(WARNING, "PRNG UID: Reply timeout.");

From 41acc98d8718e05478af5589db76a1459bb8bf35 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 15 May 2019 12:03:00 +0200
Subject: [PATCH 1734/1938] mix

---
 armsrc/iso14443a.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 9f870e546..4560348b3 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -2425,7 +2425,7 @@ void ReaderIso14443a(PacketCommandNG *c) {
         if (!(param & ISO14A_NO_SELECT)) {
             iso14a_card_select_t *card = (iso14a_card_select_t *)buf;
             arg0 = iso14443a_select_card(NULL, card, NULL, true, 0, param & ISO14A_NO_RATS);
-            reply_old(CMD_ACK, arg0, card->uidlen, 0, buf, sizeof(iso14a_card_select_t));
+            reply_mix(CMD_ACK, arg0, card->uidlen, 0, buf, sizeof(iso14a_card_select_t));
             if (arg0 == 0)
                 goto OUT;
         }
@@ -2786,7 +2786,7 @@ void ReaderMifare(bool first_try, uint8_t block, uint8_t keytype) {
     memcpy(buf + 16, ks_list, 8);
     memcpy(buf + 24, mf_nr_ar, 8);
 
-    reply_old(CMD_ACK, isOK, 0, 0, buf, sizeof(buf));
+    reply_mix(CMD_ACK, isOK, 0, 0, buf, sizeof(buf));
 
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     LEDsoff();
@@ -3012,7 +3012,7 @@ void DetectNACKbug() {
 
     // num_nacks = number of nacks recieved. should be only 1. if not its a clone card which always sends NACK (parity == 0) ?
     // i  =  number of authentications sent.  Not always 256, since we are trying to sync but close to it.
-    reply_old(CMD_ACK, isOK, num_nacks, i, 0, 0);
+    reply_mix(CMD_ACK, isOK, num_nacks, i, 0, 0);
 
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     LEDsoff();

From 65ff4f0e92a3e8a02e32ff36e6f76c9ce5936056 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 15 May 2019 06:52:22 -0400
Subject: [PATCH 1735/1938] chg: hf mf setmod - uses NG

---
 armsrc/appmain.c           |  2 +-
 armsrc/apps.h              |  2 +-
 armsrc/mifarecmd.c         | 13 ++++++++-----
 client/cmdhfmf.c           | 20 +++++++++++++-------
 client/mifare/mifarehost.c | 20 +-------------------
 5 files changed, 24 insertions(+), 33 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index c28d1448c..8e4b1933b 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1066,7 +1066,7 @@ static void PacketReceived(PacketCommandNG *packet) {
 //            SniffMifare(packet->oldarg[0]);
 //            break;
         case CMD_MIFARE_SETMOD:
-            MifareSetMod(packet->oldarg[0], packet->data.asBytes);
+            MifareSetMod(packet->data.asBytes);
             break;
         //mifare desfire
         case CMD_MIFARE_DESFIRE_READBL:
diff --git a/armsrc/apps.h b/armsrc/apps.h
index e7d600b8c..045dc907b 100644
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -163,7 +163,7 @@ void MifareECardLoad(uint32_t arg0, uint32_t arg1);
 void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain);  // Work with "magic Chinese" card
 void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain);
 void MifareCIdent();  // is "magic chinese" card?
-void MifareSetMod(uint8_t mod, uint8_t *key);
+void MifareSetMod(uint8_t *datain);
 void MifareUSetPwd(uint8_t arg0, uint8_t *datain);
 void OnSuccessMagic();
 void OnErrorMagic(uint8_t reason);
diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index 0ce2a1554..43b06593b 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -1999,11 +1999,13 @@ void OnErrorMagic(uint8_t reason) {
     OnSuccessMagic();
 }
 
-void MifareSetMod(uint8_t mod, uint8_t *key) {
-    uint64_t ui64Key = bytes_to_num(key, 6);
+void MifareSetMod(uint8_t *datain) {
+
+    uint8_t mod = datain[0];
+    uint64_t ui64Key = bytes_to_num(datain + 1, 6);
 
     // variables
-    uint8_t isOK = 0;
+    uint16_t isOK = PM3_EFATAL;
     uint8_t uid[10] = {0};
     uint32_t cuid = 0;
     struct Crypto1State mpcs = {0, 0};
@@ -2042,14 +2044,15 @@ void MifareSetMod(uint8_t mod, uint8_t *key) {
             break;
         }
 
-        isOK = 1;
+        isOK = PM3_SUCCESS;
         break;
     }
 
     crypto1_destroy(pcs);
 
     LED_B_ON();
-    reply_old(CMD_ACK, isOK, 0, 0, 0, 0);
+    reply_ng(CMD_MIFARE_SETMOD, isOK, NULL, 0);
+
     LED_B_OFF();
 
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index d39581ea2..4a39109c3 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -3205,19 +3205,25 @@ static int CmdHf14AMfSetMod(const char *Cmd) {
         return 1;
     }
 
+    uint8_t data[7];
+    data[0] = mod;
+    memcpy(data+1, key, 6);
+
     clearCommandBuffer();
-    SendCommandOLD(CMD_MIFARE_SETMOD, mod, 0, 0, key, 6);
+    SendCommandNG(CMD_MIFARE_SETMOD, data, sizeof(data));
 
     PacketResponseNG resp;
-    if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-        uint8_t ok = resp.oldarg[0] & 0xff;
-        PrintAndLogEx(SUCCESS, "isOk:%02x", ok);
-        if (!ok)
-            PrintAndLogEx(FAILED, "Failed.");
+    if (WaitForResponseTimeout(CMD_MIFARE_SETMOD, &resp, 1500)) {
+        
+        if (resp.status == PM3_SUCCESS) 
+            PrintAndLogEx(SUCCESS, "Success");
+        else
+            PrintAndLogEx(FAILED, "Failed");
+
     } else {
         PrintAndLogEx(WARNING, "Command execute timeout");
     }
-    return 0;
+    return PM3_SUCCESS;
 }
 
 // Mifare NACK bug detection
diff --git a/client/mifare/mifarehost.c b/client/mifare/mifarehost.c
index f0184cd72..d1ae6a595 100644
--- a/client/mifare/mifarehost.c
+++ b/client/mifare/mifarehost.c
@@ -912,26 +912,8 @@ int detect_classic_nackbug(bool verbose) {
     if (verbose)
         PrintAndLogEx(SUCCESS, "press pm3-button on the Proxmark3 device to abort both Proxmark3 and client.\n");
 
-    // for nice animation
-    bool term = !isatty(STDIN_FILENO);
-#if defined(__linux__) || (__APPLE__)
-    char star[] = {'-', '\\', '|', '/'};
-    uint8_t staridx = 0;
-#endif
-
     while (true) {
-
-        if (term) {
-            printf(".");
-        } else {
-            printf(
-#if defined(__linux__) || (__APPLE__)
-                _GREEN_("\e[s%c\e[u"), star[(staridx++ % 4) ]
-#else
-                "."
-#endif
-            );
-        }
+        printf(".");
         fflush(stdout);
         if (ukbhit()) {
             int gc = getchar();

From 50c59fb6b25be124e271ad56e058896584b70990 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 15 May 2019 07:03:19 -0400
Subject: [PATCH 1736/1938] chg: cident - uses NG

---
 armsrc/mifarecmd.c         | 5 ++++-
 client/mifare/mifarehost.c | 6 ++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index 43b06593b..52e08f83e 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -1945,6 +1945,7 @@ void MifareCIdent() {
     uint8_t *buf = BigBuf_malloc(PM3_CMD_DATA_SIZE);
     uint8_t *uid = BigBuf_malloc(10);
     uint32_t cuid = 0;
+    uint8_t data[1] = {0x00};
 
     iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
 
@@ -1982,7 +1983,9 @@ TEST2:
     };
 
 OUT:
-    reply_old(CMD_ACK, isGen, 0, 0, 0, 0);
+	
+    data[0] = isGen;
+    reply_ng(CMD_MIFARE_CIDENT, PM3_SUCCESS, data, sizeof(data));
     // turns off
     OnSuccessMagic();
     BigBuf_free();
diff --git a/client/mifare/mifarehost.c b/client/mifare/mifarehost.c
index d1ae6a595..078eb467a 100644
--- a/client/mifare/mifarehost.c
+++ b/client/mifare/mifarehost.c
@@ -974,8 +974,10 @@ void detect_classic_magic(void) {
     PacketResponseNG resp;
     clearCommandBuffer();
     SendCommandNG(CMD_MIFARE_CIDENT, NULL, 0);
-    if (WaitForResponseTimeout(CMD_ACK, &resp, 1500))
-        isGeneration = resp.oldarg[0] & 0xff;
+    if (WaitForResponseTimeout(CMD_MIFARE_CIDENT, &resp, 1500)) {
+        if ( resp.status == PM3_SUCCESS )
+            isGeneration = resp.data.asBytes[0];
+    }
 
     switch (isGeneration) {
         case 1:

From bfe2cff383eef5caacda3392a0519c5d31df7e9e Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 15 May 2019 07:47:46 -0400
Subject: [PATCH 1737/1938] chg: hf mf nack - now uses NG

---
 armsrc/iso14443a.c         | 18 ++++++++++++++----
 armsrc/mifarecmd.c         |  2 +-
 client/mifare/mifarehost.c | 17 ++++++++++-------
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 4560348b3..aace17db7 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -2806,8 +2806,8 @@ void DetectNACKbug() {
     uint8_t par[1] = {0};    // maximum 8 Bytes to be sent here, 1 byte parity is therefore enough
 
     uint32_t nt = 0, previous_nt = 0, nt_attacked = 0, cuid = 0;
-    int32_t isOK = 0, catch_up_cycles = 0, last_catch_up = 0;
-    uint8_t cascade_levels = 0, num_nacks = 0;
+    int32_t catch_up_cycles = 0, last_catch_up = 0;
+    uint8_t cascade_levels = 0, num_nacks = 0, isOK = 0;
     uint16_t elapsed_prng_sequences = 1;
     uint16_t consecutive_resyncs = 0;
     uint16_t unexpected_random = 0;
@@ -2816,6 +2816,8 @@ void DetectNACKbug() {
     bool have_uid = false;
     bool received_nack;
 
+    int32_t status = PM3_SUCCESS;
+
     // Mifare Classic's random generator repeats every 2^16 cycles (and so do the nonces).
     int32_t sync_cycles = PRNG_SEQUENCE_LENGTH;
 
@@ -2843,7 +2845,7 @@ void DetectNACKbug() {
 
         // Test if the action was cancelled
         if (BUTTON_PRESS()) {
-            isOK = 99;
+            status = PM3_EOPABORTED;
             break;
         }
 
@@ -3001,6 +3003,7 @@ void DetectNACKbug() {
 
         // tried all 256 possible parities without success.
         if (par[0] == 0) {
+            // did we get one NACK?
             if (num_nacks == 1)
                 isOK = 1;
             break;
@@ -3012,8 +3015,15 @@ void DetectNACKbug() {
 
     // num_nacks = number of nacks recieved. should be only 1. if not its a clone card which always sends NACK (parity == 0) ?
     // i  =  number of authentications sent.  Not always 256, since we are trying to sync but close to it.
-    reply_mix(CMD_ACK, isOK, num_nacks, i, 0, 0);
 
+    uint8_t *data = BigBuf_malloc(4);
+    data[0] = isOK;
+    data[1] = num_nacks;
+    num_to_bytes(i, 2, data + 2);
+    reply_ng(CMD_MIFARE_NACK_DETECT, status, data, 4);
+
+    //reply_mix(CMD_ACK, isOK, num_nacks, i, 0, 0);
+    BigBuf_free();
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     LEDsoff();
     set_tracing(false);
diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index 52e08f83e..df041683f 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -1998,7 +1998,7 @@ void OnSuccessMagic() {
 }
 void OnErrorMagic(uint8_t reason) {
     //          ACK, ISOK, reason,0,0,0
-    reply_old(CMD_ACK, 0, reason, 0, 0, 0);
+    reply_mix(CMD_ACK, 0, reason, 0, 0, 0);
     OnSuccessMagic();
 }
 
diff --git a/client/mifare/mifarehost.c b/client/mifare/mifarehost.c
index 078eb467a..2fa5b0775 100644
--- a/client/mifare/mifarehost.c
+++ b/client/mifare/mifarehost.c
@@ -921,10 +921,16 @@ int detect_classic_nackbug(bool verbose) {
             return PM3_EOPABORTED;
         }
 
-        if (WaitForResponseTimeout(CMD_ACK, &resp, 500)) {
-            int32_t ok = resp.oldarg[0];
-            uint32_t nacks = resp.oldarg[1];
-            uint32_t auths = resp.oldarg[2];
+        if (WaitForResponseTimeout(CMD_MIFARE_NACK_DETECT, &resp, 500)) {
+
+            if ( resp.status == PM3_EOPABORTED ) {
+                PrintAndLogEx(WARNING, "button pressed. Aborted.");
+                return PM3_EOPABORTED;
+            }
+
+            uint8_t ok = resp.data.asBytes[0];
+            uint8_t nacks = resp.data.asBytes[1];
+            uint16_t auths = bytes_to_num(resp.data.asBytes + 2, 2);
             PrintAndLogEx(NORMAL, "");
 
             if (verbose) {
@@ -932,9 +938,6 @@ int detect_classic_nackbug(bool verbose) {
                 PrintAndLogEx(SUCCESS, "num of received NACK  : %u", nacks);
             }
             switch (ok) {
-                case 99 :
-                    PrintAndLogEx(WARNING, "button pressed. Aborted.");
-                    return PM3_EOPABORTED;
                 case 96 :
                 case 98 : {
                     if (verbose)

From 088d34eb3e202be43cfbc2640925e7d8c0d2fc7c Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 15 May 2019 08:20:04 -0400
Subject: [PATCH 1738/1938] chg: hf mf nack - keep sync if started without card
 over antenna

---
 armsrc/iso14443a.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index aace17db7..15d17d8b8 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -2844,7 +2844,7 @@ void DetectNACKbug() {
         WDT_HIT();
 
         // Test if the action was cancelled
-        if (BUTTON_PRESS()) {
+        if (BUTTON_PRESS() || usb_poll_validate_length()) {
             status = PM3_EOPABORTED;
             break;
         }
@@ -2853,7 +2853,8 @@ void DetectNACKbug() {
         if (!have_uid) { // need a full select cycle to get the uid first
             iso14a_card_select_t card_info;
             if (!iso14443a_select_card(uid, &card_info, &cuid, true, 0, true)) {
-                if (MF_DBGLEVEL >= MF_DBG_ERROR)    Dbprintf("Mifare: Can't select card (ALL)");
+                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Mifare: Can't select card (ALL)");
+                i = 0;
                 continue;
             }
             switch (card_info.uidlen) {
@@ -2867,12 +2868,16 @@ void DetectNACKbug() {
                     cascade_levels = 3;
                     break;
                 default:
-                    break;
+                    i = 0;
+                    have_uid = false;
+                    continue;
             }
             have_uid = true;
         } else { // no need for anticollision. We can directly select the card
             if (!iso14443a_fast_select_card(uid, cascade_levels)) {
                 if (MF_DBGLEVEL >= MF_DBG_ERROR)    Dbprintf("Mifare: Can't select card (UID)");
+                i = 0;
+                have_uid = false;
                 continue;
             }
         }

From d4c3d07701f9a2be655acd667a79cbc47fbb9185 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 15 May 2019 16:56:54 +0200
Subject: [PATCH 1739/1938] fix:  failed compilation without btaddon option 
 (@merlokk)

---
 armsrc/appmain.c | 6 ++++--
 common/usart.h   | 2 --
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 8e4b1933b..0659113d2 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -423,10 +423,12 @@ void SendCapabilities(void) {
     capabilities_t capabilities;
     capabilities.version = CAPABILITIES_VERSION;
     capabilities.via_fpc = reply_via_fpc;
+    
+    capabilities.baudrate = 0; // no real baudrate for USB-CDC
+#ifdef WITH_FPC_USART
     if (reply_via_fpc)
         capabilities.baudrate = usart_baudrate;
-    else
-        capabilities.baudrate = 0; // no real baudrate for USB-CDC
+#endif
 
 #ifdef WITH_FLASH
     capabilities.compiled_with_flash = true;
diff --git a/common/usart.h b/common/usart.h
index fd437c952..146e2e0d7 100644
--- a/common/usart.h
+++ b/common/usart.h
@@ -12,8 +12,6 @@ extern uint32_t usart_baudrate;
 extern uint8_t usart_parity;
 
 void usart_init(uint32_t baudrate, uint8_t parity);
-//void usart_close(void);
-
 int usart_writebuffer_sync(uint8_t *data, size_t len);
 uint32_t usart_read_ng(uint8_t *data, size_t len);
 uint16_t usart_rxdata_available(void);

From b4e8be82f462825d339a39729c38348234f7dd5a Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 16 May 2019 00:29:30 +0200
Subject: [PATCH 1740/1938] remove spMutex, use atomic test&set instead

---
 client/comms.c    | 16 +---------------
 uart/uart.h       |  2 +-
 uart/uart_posix.c | 13 +++++++++----
 uart/uart_win32.c | 18 ++++++++++++++++--
 4 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/client/comms.c b/client/comms.c
index ab5ab27ab..1f88c9a27 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -48,8 +48,6 @@ static int cmd_tail = 0;
 
 // to lock rxBuffer operations from different threads
 static pthread_mutex_t rxBufferMutex = PTHREAD_MUTEX_INITIALIZER;
-// serial port access from different threads
-static pthread_mutex_t spMutex = PTHREAD_MUTEX_INITIALIZER;
 
 // Global start time for WaitForResponseTimeout & dl_it, so we can reset timeout when we get packets
 // as sending lot of these packets can slow down things wuite a lot on slow links (e.g. hw status or lf read at 9600)
@@ -344,8 +342,6 @@ __attribute__((force_align_arg_pointer))
             break;
         }
 
-        pthread_mutex_lock(&spMutex);
-
         res = uart_receive(sp, (uint8_t *)&rx_raw.pre, sizeof(PacketResponseNGPreamble), &rxlen);
         if ((res == PM3_SUCCESS) && (rxlen == sizeof(PacketResponseNGPreamble))) {
             rx.magic = rx_raw.pre.magic;
@@ -465,8 +461,6 @@ __attribute__((force_align_arg_pointer))
             }
         }
 
-        pthread_mutex_unlock(&spMutex);
-
         // TODO if error, shall we resync ?
 
         pthread_mutex_lock(&txBufferMutex);
@@ -486,7 +480,6 @@ __attribute__((force_align_arg_pointer))
 
         if (txBuffer_pending) {
 
-            pthread_mutex_lock(&spMutex);
             if (txBufferNGLen) { // NG packet
                 res = uart_send(sp, (uint8_t *) &txBufferNG, txBufferNGLen);
                 if (res == PM3_EIO) {
@@ -501,7 +494,6 @@ __attribute__((force_align_arg_pointer))
                 }
                 conn.last_command = txBuffer.cmd;
             }
-            pthread_mutex_unlock(&spMutex);
 
             txBuffer_pending = false;
 
@@ -628,13 +620,7 @@ int TestProxmark(void) {
 
             // reconfigure.
             if (conn.send_via_fpc_usart == false) {
-#if defined(_WIN32)
-                pthread_mutex_lock(&spMutex);
-#endif
-                int res = uart_reconfigure_timeouts(sp, UART_USB_CLIENT_RX_TIMEOUT_MS);
-#if defined(_WIN32)
-                pthread_mutex_unlock(&spMutex);
-#endif
+                int res = uart_reconfigure_timeouts(UART_USB_CLIENT_RX_TIMEOUT_MS);
                 if (res != PM3_SUCCESS) {
                     return res;
                 }
diff --git a/uart/uart.h b/uart/uart.h
index b359d6af2..a4f2f1f85 100644
--- a/uart/uart.h
+++ b/uart/uart.h
@@ -107,6 +107,6 @@ uint32_t uart_get_speed(const serial_port sp);
 
 /* Reconfigure timeouts
  */
-int uart_reconfigure_timeouts(serial_port sp, uint32_t value);
+int uart_reconfigure_timeouts(uint32_t value);
 #endif // _UART_H_
 
diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index 8d6cb8141..4ece303dc 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -73,8 +73,12 @@ struct timeval timeout = {
     .tv_usec = UART_FPC_CLIENT_RX_TIMEOUT_MS * 1000
 };
 
-int uart_reconfigure_timeouts(serial_port sp, uint32_t value) {
-    timeout.tv_usec = value * 1000;
+uint32_t newtimeout_value = 0;
+bool newtimeout_nopending = true;
+
+int uart_reconfigure_timeouts(uint32_t value) {
+    newtimeout_value = value;
+    __atomic_clear(&newtimeout_nopending, __ATOMIC_SEQ_CST);
     return PM3_SUCCESS;
 }
 
@@ -83,7 +87,7 @@ serial_port uart_open(const char *pcPortName, uint32_t speed) {
     if (sp == 0) return INVALID_SERIAL_PORT;
 
     // init timeouts
-    uart_reconfigure_timeouts(sp, UART_FPC_CLIENT_RX_TIMEOUT_MS);
+    timeout.tv_usec = UART_FPC_CLIENT_RX_TIMEOUT_MS * 1000;
 
     if (memcmp(pcPortName, "tcp:", 4) == 0) {
         struct addrinfo *addr, *rp;
@@ -241,7 +245,6 @@ int uart_receive(const serial_port sp, uint8_t *pbtRx, uint32_t pszMaxRxLen, uin
 
     // Reset the output count
     *pszRxLen = 0;
-
     do {
         // Reset file descriptor
         FD_ZERO(&rfds);
@@ -299,6 +302,8 @@ int uart_send(const serial_port sp, const uint8_t *pbtTx, const uint32_t len) {
     uint32_t pos = 0;
     fd_set rfds;
     struct timeval tv;
+    if (__atomic_test_and_set(&newtimeout_nopending, __ATOMIC_SEQ_CST) == 0)
+        timeout.tv_usec = newtimeout_value * 1000;
 
     while (pos < len) {
         // Reset file descriptor
diff --git a/uart/uart_win32.c b/uart/uart_win32.c
index e516a42d7..6dd51e614 100644
--- a/uart/uart_win32.c
+++ b/uart/uart_win32.c
@@ -48,7 +48,19 @@ typedef struct {
     COMMTIMEOUTS ct;  // Serial port time-out configuration
 } serial_port_windows;
 
-int uart_reconfigure_timeouts(serial_port sp, uint32_t value) {
+uint32_t newtimeout_value = 0;
+bool newtimeout_nopending = true;
+
+int uart_reconfigure_timeouts(uint32_t value) {
+    newtimeout_value = value;
+    __atomic_clear(&newtimeout_nopending, __ATOMIC_SEQ_CST);
+    return PM3_SUCCESS;
+}
+
+static int uart_reconfigure_timeouts_polling(serial_port sp) {
+    if (__atomic_test_and_set(&newtimeout_nopending, __ATOMIC_SEQ_CST) != 0)
+        return PM3_SUCCESS;
+
     serial_port_windows *spw;
     spw = (serial_port_windows *)sp;
     spw->ct.ReadIntervalTimeout         = value;
@@ -103,7 +115,8 @@ serial_port uart_open(const char *pcPortName, uint32_t speed) {
         return INVALID_SERIAL_PORT;
     }
 
-    uart_reconfigure_timeouts(sp, UART_FPC_CLIENT_RX_TIMEOUT_MS);
+    uart_reconfigure_timeouts(UART_FPC_CLIENT_RX_TIMEOUT_MS);
+    uart_reconfigure_timeouts_polling(sp);
 
     if (!uart_set_speed(sp, speed)) {
         // try fallback automatically
@@ -176,6 +189,7 @@ int uart_receive(const serial_port sp, uint8_t *pbtRx, uint32_t pszMaxRxLen, uin
 }
 
 int uart_send(const serial_port sp, const uint8_t *p_tx, const uint32_t len) {
+    uart_reconfigure_timeouts_polling(sp);
     DWORD txlen = 0;
     int res = WriteFile(((serial_port_windows *)sp)->hPort, p_tx, len, &txlen, NULL);
     if (res)

From 27c556b69a94d846533ea56523a7d425209fd054 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 16 May 2019 07:32:34 +0200
Subject: [PATCH 1741/1938] fix:  now compiles on mingw

---
 uart/uart_win32.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/uart/uart_win32.c b/uart/uart_win32.c
index 6dd51e614..a514f8148 100644
--- a/uart/uart_win32.c
+++ b/uart/uart_win32.c
@@ -63,10 +63,10 @@ static int uart_reconfigure_timeouts_polling(serial_port sp) {
 
     serial_port_windows *spw;
     spw = (serial_port_windows *)sp;
-    spw->ct.ReadIntervalTimeout         = value;
+    spw->ct.ReadIntervalTimeout         = newtimeout_value;
     spw->ct.ReadTotalTimeoutMultiplier  = 0;
-    spw->ct.ReadTotalTimeoutConstant    = value;
-    spw->ct.WriteTotalTimeoutMultiplier = value;
+    spw->ct.ReadTotalTimeoutConstant    = newtimeout_value;
+    spw->ct.WriteTotalTimeoutMultiplier = newtimeout_value;
     spw->ct.WriteTotalTimeoutConstant   = 0;
 
     if (!SetCommTimeouts(spw->hPort, &spw->ct)) {

From c125b3e9fe7a3222fd5ed7bb8bdf2aae256ad200 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 16 May 2019 07:33:02 +0200
Subject: [PATCH 1742/1938] chg: less nesting

---
 client/comms.c | 70 +++++++++++++++++++++++++-------------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/client/comms.c b/client/comms.c
index 1f88c9a27..74ff518de 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -595,43 +595,43 @@ int TestProxmark(void) {
     // that initiates the BT connection
 #endif
 
-    if (WaitForResponseTimeoutW(CMD_PING, &resp, timeout, false)) {
-
-        bool error = false;
-        if (len)
-            error = memcmp(data, resp.data.asBytes, len) != 0;
-        if (error)
-            return PM3_EIO;
-
-        SendCommandNG(CMD_CAPABILITIES, NULL, 0);
-        if (WaitForResponseTimeoutW(CMD_CAPABILITIES, &resp, 1000, false)) {
-            if ((resp.length != sizeof(pm3_capabilities)) || (resp.data.asBytes[0] != CAPABILITIES_VERSION)) {
-                PrintAndLogEx(ERR, _RED_("Capabilities structure version sent by Proxmark3 is not the same as the one used by the client!"));
-                PrintAndLogEx(ERR, _RED_("Please flash the Proxmark with the same version as the client."));
-                return PM3_EDEVNOTSUPP;
-            }
-            memcpy(&pm3_capabilities, resp.data.asBytes, MIN(sizeof(capabilities_t), resp.length));
-            conn.send_via_fpc_usart = pm3_capabilities.via_fpc;
-            conn.uart_speed = pm3_capabilities.baudrate;
-            PrintAndLogEx(INFO, "Communicating with PM3 over %s", conn.send_via_fpc_usart ? _YELLOW_("FPC UART") : _YELLOW_("USB-CDC"));
-            if (conn.send_via_fpc_usart) {
-                PrintAndLogEx(INFO, "UART Serial baudrate: " _YELLOW_("%u") "\n", conn.uart_speed);
-            }
-
-            // reconfigure.
-            if (conn.send_via_fpc_usart == false) {
-                int res = uart_reconfigure_timeouts(UART_USB_CLIENT_RX_TIMEOUT_MS);
-                if (res != PM3_SUCCESS) {
-                    return res;
-                }
-            }
-            return PM3_SUCCESS;
-        } else {
-            return PM3_ETIMEOUT;
-        }
-    } else {
+    if (WaitForResponseTimeoutW(CMD_PING, &resp, timeout, false) == 0) {
         return PM3_ETIMEOUT;
     }
+
+    bool error = false;
+    if (len)
+        error = memcmp(data, resp.data.asBytes, len) != 0;
+    
+    if (error)
+        return PM3_EIO;
+
+    SendCommandNG(CMD_CAPABILITIES, NULL, 0);
+    if (WaitForResponseTimeoutW(CMD_CAPABILITIES, &resp, 1000, false) == 0) {
+        return PM3_ETIMEOUT;
+    }
+        
+    if ((resp.length != sizeof(pm3_capabilities)) || (resp.data.asBytes[0] != CAPABILITIES_VERSION)) {
+        PrintAndLogEx(ERR, _RED_("Capabilities structure version sent by Proxmark3 is not the same as the one used by the client!"));
+        PrintAndLogEx(ERR, _RED_("Please flash the Proxmark with the same version as the client."));
+        return PM3_EDEVNOTSUPP;
+    }
+
+    memcpy(&pm3_capabilities, resp.data.asBytes, MIN(sizeof(capabilities_t), resp.length));
+    conn.send_via_fpc_usart = pm3_capabilities.via_fpc;
+    conn.uart_speed = pm3_capabilities.baudrate;
+        
+    PrintAndLogEx(INFO, "Communicating with PM3 over %s", conn.send_via_fpc_usart ? _YELLOW_("FPC UART") : _YELLOW_("USB-CDC"));
+        
+    if (conn.send_via_fpc_usart) {
+        PrintAndLogEx(INFO, "UART Serial baudrate: " _YELLOW_("%u") "\n", conn.uart_speed);
+    } else {
+        int res = uart_reconfigure_timeouts(UART_USB_CLIENT_RX_TIMEOUT_MS);
+        if (res != PM3_SUCCESS) {
+            return res;
+        }
+    }
+    return PM3_SUCCESS;
 }
 
 void CloseProxmark(void) {

From b206ecfad37983f6fae0cfdfcd592b7ac09768b4 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 16 May 2019 07:44:52 +0200
Subject: [PATCH 1743/1938] chg: revert logic

---
 uart/uart_posix.c | 8 +++++---
 uart/uart_win32.c | 7 ++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index 4ece303dc..52f57a05d 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -74,11 +74,11 @@ struct timeval timeout = {
 };
 
 uint32_t newtimeout_value = 0;
-bool newtimeout_nopending = true;
+bool newtimeout_pending = false;
 
 int uart_reconfigure_timeouts(uint32_t value) {
     newtimeout_value = value;
-    __atomic_clear(&newtimeout_nopending, __ATOMIC_SEQ_CST);
+    __atomic_test_and_set(&newtimeout_pending, __ATOMIC_SEQ_CST);
     return PM3_SUCCESS;
 }
 
@@ -302,7 +302,9 @@ int uart_send(const serial_port sp, const uint8_t *pbtTx, const uint32_t len) {
     uint32_t pos = 0;
     fd_set rfds;
     struct timeval tv;
-    if (__atomic_test_and_set(&newtimeout_nopending, __ATOMIC_SEQ_CST) == 0)
+    
+    bool shall_update = __atomic_load_n(&newtimeout_pending, __ATOMIC_SEQ_CST);
+    if ( shall_update )
         timeout.tv_usec = newtimeout_value * 1000;
 
     while (pos < len) {
diff --git a/uart/uart_win32.c b/uart/uart_win32.c
index a514f8148..4f9515dcb 100644
--- a/uart/uart_win32.c
+++ b/uart/uart_win32.c
@@ -49,16 +49,17 @@ typedef struct {
 } serial_port_windows;
 
 uint32_t newtimeout_value = 0;
-bool newtimeout_nopending = true;
+bool newtimeout_pending = true;
 
 int uart_reconfigure_timeouts(uint32_t value) {
     newtimeout_value = value;
-    __atomic_clear(&newtimeout_nopending, __ATOMIC_SEQ_CST);
+    __atomic_test_and_set(&newtimeout_pending, __ATOMIC_SEQ_CST);    
     return PM3_SUCCESS;
 }
 
 static int uart_reconfigure_timeouts_polling(serial_port sp) {
-    if (__atomic_test_and_set(&newtimeout_nopending, __ATOMIC_SEQ_CST) != 0)
+    bool shall_update = __atomic_load_n(&newtimeout_pending, __ATOMIC_SEQ_CST);
+    if ( shall_update == false )
         return PM3_SUCCESS;
 
     serial_port_windows *spw;

From 9b85f8032177d9423ab5d9a3b70107fddc0fa20c Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 16 May 2019 08:02:56 +0200
Subject: [PATCH 1744/1938] chg: the reconnect now works good on ubuntu and
 mingw (for me :)) chg: increased timeout for FPC from 170 -> 200.  Mingw
 seems slower.

---
 client/comms.c    | 11 +++++++----
 include/pm3_cmd.h |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/client/comms.c b/client/comms.c
index 74ff518de..d6bf91d7c 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -623,13 +623,16 @@ int TestProxmark(void) {
         
     PrintAndLogEx(INFO, "Communicating with PM3 over %s", conn.send_via_fpc_usart ? _YELLOW_("FPC UART") : _YELLOW_("USB-CDC"));
         
+    int res;
     if (conn.send_via_fpc_usart) {
         PrintAndLogEx(INFO, "UART Serial baudrate: " _YELLOW_("%u") "\n", conn.uart_speed);
+        res = uart_reconfigure_timeouts(UART_FPC_CLIENT_RX_TIMEOUT_MS);
     } else {
-        int res = uart_reconfigure_timeouts(UART_USB_CLIENT_RX_TIMEOUT_MS);
-        if (res != PM3_SUCCESS) {
-            return res;
-        }
+        res = uart_reconfigure_timeouts(UART_USB_CLIENT_RX_TIMEOUT_MS);
+    }
+
+    if (res != PM3_SUCCESS) {
+        return res;
     }
     return PM3_SUCCESS;
 }
diff --git a/include/pm3_cmd.h b/include/pm3_cmd.h
index eff5d44f5..6608b8477 100644
--- a/include/pm3_cmd.h
+++ b/include/pm3_cmd.h
@@ -483,7 +483,7 @@ typedef struct {
 // took settings from libnfc/buses/uart.c
 
 // uart_windows.c & uart_posix.c
-# define UART_FPC_CLIENT_RX_TIMEOUT_MS  170
+# define UART_FPC_CLIENT_RX_TIMEOUT_MS  200
 # define UART_USB_CLIENT_RX_TIMEOUT_MS  20
 # define UART_TCP_CLIENT_RX_TIMEOUT_MS  300
 

From b5e4a60a15810160899e67430599d52fc6adb670 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 16 May 2019 12:35:40 +0200
Subject: [PATCH 1745/1938] timeout reconfiguration: flag was never cleared and
 some more changes:

* clear newtimeout_pending flag
* fix initial newtimeout_pending flag value on win32
* remove all _atomic as anyway a load+clear wouldn't be atomic and we're not in a critical situation: just one writer seldomly called on reconnect
* move new timeout poll to uart_recv for faster deployment
* remove redundant uart_reconfigure_timeouts(UART_FPC_CLIENT_RX_TIMEOUT_MS);
---
 client/comms.c    | 11 ++++-------
 uart/uart_posix.c | 10 +++++-----
 uart/uart_win32.c | 10 +++++-----
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/client/comms.c b/client/comms.c
index d6bf91d7c..74ff518de 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -623,16 +623,13 @@ int TestProxmark(void) {
         
     PrintAndLogEx(INFO, "Communicating with PM3 over %s", conn.send_via_fpc_usart ? _YELLOW_("FPC UART") : _YELLOW_("USB-CDC"));
         
-    int res;
     if (conn.send_via_fpc_usart) {
         PrintAndLogEx(INFO, "UART Serial baudrate: " _YELLOW_("%u") "\n", conn.uart_speed);
-        res = uart_reconfigure_timeouts(UART_FPC_CLIENT_RX_TIMEOUT_MS);
     } else {
-        res = uart_reconfigure_timeouts(UART_USB_CLIENT_RX_TIMEOUT_MS);
-    }
-
-    if (res != PM3_SUCCESS) {
-        return res;
+        int res = uart_reconfigure_timeouts(UART_USB_CLIENT_RX_TIMEOUT_MS);
+        if (res != PM3_SUCCESS) {
+            return res;
+        }
     }
     return PM3_SUCCESS;
 }
diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index 52f57a05d..0f8e88c13 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -78,7 +78,7 @@ bool newtimeout_pending = false;
 
 int uart_reconfigure_timeouts(uint32_t value) {
     newtimeout_value = value;
-    __atomic_test_and_set(&newtimeout_pending, __ATOMIC_SEQ_CST);
+    newtimeout_pending = true;
     return PM3_SUCCESS;
 }
 
@@ -243,6 +243,10 @@ int uart_receive(const serial_port sp, uint8_t *pbtRx, uint32_t pszMaxRxLen, uin
     fd_set rfds;
     struct timeval tv;
 
+    if ( newtimeout_pending ) {
+        timeout.tv_usec = newtimeout_value * 1000;
+        newtimeout_pending = false;
+    }
     // Reset the output count
     *pszRxLen = 0;
     do {
@@ -303,10 +307,6 @@ int uart_send(const serial_port sp, const uint8_t *pbtTx, const uint32_t len) {
     fd_set rfds;
     struct timeval tv;
     
-    bool shall_update = __atomic_load_n(&newtimeout_pending, __ATOMIC_SEQ_CST);
-    if ( shall_update )
-        timeout.tv_usec = newtimeout_value * 1000;
-
     while (pos < len) {
         // Reset file descriptor
         FD_ZERO(&rfds);
diff --git a/uart/uart_win32.c b/uart/uart_win32.c
index 4f9515dcb..ba1d0de89 100644
--- a/uart/uart_win32.c
+++ b/uart/uart_win32.c
@@ -49,18 +49,18 @@ typedef struct {
 } serial_port_windows;
 
 uint32_t newtimeout_value = 0;
-bool newtimeout_pending = true;
+bool newtimeout_pending = false;
 
 int uart_reconfigure_timeouts(uint32_t value) {
     newtimeout_value = value;
-    __atomic_test_and_set(&newtimeout_pending, __ATOMIC_SEQ_CST);    
+    newtimeout_pending = true;
     return PM3_SUCCESS;
 }
 
 static int uart_reconfigure_timeouts_polling(serial_port sp) {
-    bool shall_update = __atomic_load_n(&newtimeout_pending, __ATOMIC_SEQ_CST);
-    if ( shall_update == false )
+    if ( newtimeout_pending == false )
         return PM3_SUCCESS;
+    newtimeout_pending = false;
 
     serial_port_windows *spw;
     spw = (serial_port_windows *)sp;
@@ -174,6 +174,7 @@ uint32_t uart_get_speed(const serial_port sp) {
 }
 
 int uart_receive(const serial_port sp, uint8_t *pbtRx, uint32_t pszMaxRxLen, uint32_t *pszRxLen) {
+    uart_reconfigure_timeouts_polling(sp);
     int res = ReadFile(((serial_port_windows *)sp)->hPort, pbtRx, pszMaxRxLen, (LPDWORD)pszRxLen, NULL);
     if (res)
         return PM3_SUCCESS;
@@ -190,7 +191,6 @@ int uart_receive(const serial_port sp, uint8_t *pbtRx, uint32_t pszMaxRxLen, uin
 }
 
 int uart_send(const serial_port sp, const uint8_t *p_tx, const uint32_t len) {
-    uart_reconfigure_timeouts_polling(sp);
     DWORD txlen = 0;
     int res = WriteFile(((serial_port_windows *)sp)->hPort, p_tx, len, &txlen, NULL);
     if (res)

From 362d7b69566ad21234921e3936c3e5f990d22291 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 16 May 2019 13:16:23 +0200
Subject: [PATCH 1746/1938] Fix win32 uart_receive disconnected device error
 code (@iceman)

---
 uart/uart_win32.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/uart/uart_win32.c b/uart/uart_win32.c
index ba1d0de89..a797a7cd6 100644
--- a/uart/uart_win32.c
+++ b/uart/uart_win32.c
@@ -181,13 +181,13 @@ int uart_receive(const serial_port sp, uint8_t *pbtRx, uint32_t pszMaxRxLen, uin
 
     int errorcode = GetLastError();
 
-    // disconnected device
     if (res == 0 && errorcode == 2) {
         return PM3_EIO;
     }
 
 //    printf("[!]res %d | rx errorcode == %d \n", res, errorcode);
-    return res;
+    // disconnected device
+    return PM3_ENOTTY;
 }
 
 int uart_send(const serial_port sp, const uint8_t *p_tx, const uint32_t len) {
@@ -202,6 +202,7 @@ int uart_send(const serial_port sp, const uint8_t *p_tx, const uint32_t len) {
     }
 
 //    printf("[!!]res %d | send errorcode == %d \n", res, errorcode);
+    // disconnected device
     return PM3_ENOTTY;
 }
 

From e9eb764358b8fbbe0c9c84101df9fbafd6ad532f Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 16 May 2019 20:12:00 +0200
Subject: [PATCH 1747/1938] Fix MCK in usart, our MCK is 16*12/2/2

---
 client/ui.c    | 4 +++-
 common/usart.c | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/client/ui.c b/client/ui.c
index 91aaed35a..f233da60a 100644
--- a/client/ui.c
+++ b/client/ui.c
@@ -135,7 +135,9 @@ void PrintAndLogEx(logLevel_t level, const char *fmt, ...) {
     } else {
         snprintf(buffer2, sizeof(buffer2), "%s%s", prefix, buffer);
         if (level == INPLACE) {
-            fprintf(stream, "\r%s", buffer2);
+            char buffer3[MAX_PRINT_BUFFER + 20] = {0};
+            memcpy_filter_ansi(buffer3, buffer2, sizeof(buffer2), !session.supports_colors);
+            fprintf(stream, "\r%s", buffer3);
             fflush(stream);
         } else {
             fPrintAndLog(stream, "%s", buffer2);
diff --git a/common/usart.c b/common/usart.c
index d7819d598..ecae58d0b 100644
--- a/common/usart.c
+++ b/common/usart.c
@@ -225,7 +225,7 @@ void usart_init(uint32_t baudrate, uint8_t parity) {
     // note that for very large baudrates, error is not neglectible:
     // b921600  => 8.6%
     // b1382400 => 8.6%
-    pUS1->US_BRGR =  48054841 / (usart_baudrate << 3);
+    pUS1->US_BRGR =  48000000 / (usart_baudrate << 3);
 
     // Write the Timeguard Register
     pUS1->US_TTGR = 0;

From 10dc959f34deb2885432a3d09eb88fcaaf32c836 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 18 May 2019 17:47:29 +0200
Subject: [PATCH 1748/1938] btfactory: reset role as well

---
 client/cmdusart.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/client/cmdusart.c b/client/cmdusart.c
index 887849c9e..75d00d24c 100644
--- a/client/cmdusart.c
+++ b/client/cmdusart.c
@@ -353,6 +353,24 @@ static int CmdUsartBtFactory(const char *Cmd) {
         return PM3_EFATAL;
     }
 
+    memset(data, 0, sizeof(data));
+    len = 0;
+    string = "AT+ROLE=S";
+    PrintAndLogEx(SUCCESS, "TX (%3u):%.*s", strlen(string), strlen(string), string);
+
+    ret = usart_txrx((uint8_t *)string, strlen(string), data, &len, 1000);
+    if (ret == PM3_SUCCESS) {
+        PrintAndLogEx(SUCCESS, "RX (%3u):%.*s", len, len, data);
+        if (strcmp((char *)data, "OK+ROLE:S") == 0) {
+            PrintAndLogEx(SUCCESS, "Role set to " _GREEN_("Slave"));
+        } else {
+            PrintAndLogEx(WARNING, "Unexpected response to AT+ROLE=S: " _YELLOW_("%.*s"), len, data);
+        }
+    } else {
+        PrintAndLogEx(WARNING, "Lost contact with add-on, please try again");
+        return PM3_EFATAL;
+    }
+
     memset(data, 0, sizeof(data));
     len = 0;
     string = "AT+PIN1234";

From a4f410407587ecc200eca6898aabf0d60e2cc4ba Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 18 May 2019 17:53:08 +0200
Subject: [PATCH 1749/1938] textual

---
 armsrc/Standalone/lf_hidbrute.c | 2 +-
 client/comms.h                  | 2 +-
 client/scripts/brutesim.lua     | 2 +-
 client/scripts/legic.lua        | 2 +-
 client/scripts/mfkeys.lua       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/armsrc/Standalone/lf_hidbrute.c b/armsrc/Standalone/lf_hidbrute.c
index fbd71a704..9840791dc 100644
--- a/armsrc/Standalone/lf_hidbrute.c
+++ b/armsrc/Standalone/lf_hidbrute.c
@@ -10,7 +10,7 @@
 //
 // PROXMARK3 - HID CORPORATE 1000 BRUTEFORCER (STAND-ALONE MODE)
 //
-// This version of Proxmark3 firmware adds one extra stand-alone mode to proxmark3 firmware.
+// This version of Proxmark3 firmware adds one extra stand-alone mode.
 // The new stand-alone mode allows to execute a bruteforce on HID Corporate 1000 readers, by
 // reading a specific badge and bruteforcing the Card Number (incrementing and decrementing it),
 // mainteining the same Facility Code of the original badge.
diff --git a/client/comms.h b/client/comms.h
index 380c763b2..6ec14331d 100644
--- a/client/comms.h
+++ b/client/comms.h
@@ -6,7 +6,7 @@
 // at your option, any later version. See the LICENSE.txt file for the text of
 // the license.
 //-----------------------------------------------------------------------------
-// Code for communicating with the proxmark3 hardware.
+// Code for communicating with the Proxmark3 hardware.
 //-----------------------------------------------------------------------------
 
 #ifndef COMMS_H_
diff --git a/client/scripts/brutesim.lua b/client/scripts/brutesim.lua
index 863fff88b..4d58c5c52 100644
--- a/client/scripts/brutesim.lua
+++ b/client/scripts/brutesim.lua
@@ -19,7 +19,7 @@ desc = [[
 
 *SUPPORTED TAGS: pyramid, awid, fdx, jablotron, noralsy, presco, visa2000, 14a, hid
 
-This script uses the proxmark3 implementations of simulation to bruteforce given ranges of id.
+This script uses the Proxmark3 implementations of simulation to bruteforce given ranges of id.
 It uses both LF and HF simulations.
 
     -- Author note
diff --git a/client/scripts/legic.lua b/client/scripts/legic.lua
index ba38c183b..9637ef6c8 100644
--- a/client/scripts/legic.lua
+++ b/client/scripts/legic.lua
@@ -2687,7 +2687,7 @@ function modifyMode()
               end,
   }
   repeat
-    -- defualt message / prompt
+    -- default message / prompt
     ic=input("Legic command? ('h' for help - 'q' for quit)", "h")
     -- command actions decisions (first match, longer commands before shorter)
     if (type(actions[string.lower(string.sub(ic,0,3))])=='function') then
diff --git a/client/scripts/mfkeys.lua b/client/scripts/mfkeys.lua
index d89eb2e44..7d4a726d6 100644
--- a/client/scripts/mfkeys.lua
+++ b/client/scripts/mfkeys.lua
@@ -1,5 +1,5 @@
 --[[
-    This is an example of Lua-scripting within proxmark3. This is a lua-side
+    This is an example of Lua-scripting within Proxmark3. This is a lua-side
     implementation of hf mf chk
 
     This code is licensed to you under the terms of the GNU GPL, version 2 or,

From cba5d181248b7b82406e8fde1b97eb1ad5afd168 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 18 May 2019 17:55:11 +0200
Subject: [PATCH 1750/1938] use MIX

---
 client/lualibs/emulator.lua | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/client/lualibs/emulator.lua b/client/lualibs/emulator.lua
index 36ef38ac1..843d8f9f1 100644
--- a/client/lualibs/emulator.lua
+++ b/client/lualibs/emulator.lua
@@ -10,18 +10,18 @@ local Emulator = {
 }
 
 function Emulator:set_mem (data, clear_first)
-   if clear_first then
-      -- Clear out the emulator memory first
-      local emuMemclearCmd = Command:new{cmd = cmds.CMD_MIFARE_EML_MEMCLR, arg1 = 0, arg2 = 0, arg3 = 0}
+    if clear_first then
+        -- Clear out the emulator memory first
+        local memclrCmd = Command:newMIX{cmd = cmds.CMD_MIFARE_EML_MEMCLR}
 
-      local _, err = reader.sendToDevice(emuMemclearCmd)
-      if err then
-         print('Failed to clear emulator memory:', err)
-         return false
-      else
-         print('Cleared emulator memory')
-      end
-   end
+        local _, err = memclrCmd.sendMIX()
+        if err then
+            print('Failed to clear emulator memory:', err)
+            return false
+        else
+            print('Cleared emulator memory')
+        end
+    end
 
    -- Can fit 32 16 byte blocks per command (512 total bytes max)
    for i = 0, (data:len() / self.BLOCK_SZ) do
@@ -30,13 +30,13 @@ function Emulator:set_mem (data, clear_first)
 
       -- arg1: start block number
       -- arg2: block count
-      local emuMemsetCmd = Command:new{cmd = cmds.CMD_MIFARE_EML_MEMSET,
+      local memsetCmd = Command:newMIX{cmd = cmds.CMD_MIFARE_EML_MEMSET,
                                        data = utils.hexlify(cur_out_block),
                                        arg1 = i * self.BLOCK_COUNT,
                                        arg2 = self.BLOCK_COUNT}
 
       -- Send command and wait for response
-      local _, err = reader.sendToDevice(emuMemsetCmd)
+      local _, err = memsetCmd.sendMIX()
       if err then
          print('Failed setting memory', err)
          return false
@@ -57,12 +57,12 @@ function Emulator:get_mem (size)
    for i = 0, (size / (MAX_BLOCKS * 16)) do
       -- arg1: start block number
       -- arg2: block count (max 4)
-      local emuMemGetCmd = Command:new{cmd = cmds.CMD_MIFARE_EML_MEMGET,
+      local getmemCmd = Command:newMIX{cmd = cmds.CMD_MIFARE_EML_MEMGET,
                                        arg1 = i * MAX_BLOCKS,
                                        arg2 = MAX_BLOCKS,
                                        arg3 = 0}
 
-      local response, err = reader.sendToDevice(emuMemGetCmd)
+      local response, err = getmemCmd.sendMIX()
       if err then
          print('Failed getting memory:', err)
          return false

From 687f7f369747096ab5f43a6f4dd4cbe38d375a71 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 18 May 2019 17:56:03 +0200
Subject: [PATCH 1751/1938] consistent output

---
 client/util.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/client/util.c b/client/util.c
index 50bbe0516..254c369ec 100644
--- a/client/util.c
+++ b/client/util.c
@@ -76,7 +76,7 @@ void AddLogLine(const char *fn, const char *data, const char *c) {
 
     f = fopen(filename, "a");
     if (!f) {
-        printf("Could not append log file %s", filename);
+        PrintAndLogEx(ERR, "Could not append log file" _YELLOW_("%s"), filename);
         return;
     }
 
@@ -117,13 +117,10 @@ void AddLogCurrentDT(const char *fn) {
 // param uidlen - length of uid array.
 void FillFileNameByUID(char *filenamePrefix, const uint8_t *uid, const char *ext, const int uidlen) {
     if (filenamePrefix == NULL || uid == NULL || ext == NULL) {
-        printf("[!] error parameter is NULL\n");
         return;
     }
 
-    int len = 0;
-    len = strlen(filenamePrefix);
-    //memset(fn, 0x00, FILE_PATH_SIZE);
+    int len = strlen(filenamePrefix);
 
     for (int j = 0; j < uidlen; j++)
         sprintf(filenamePrefix + len + j * 2, "%02X", uid[j]);
@@ -623,7 +620,7 @@ int param_getstr(const char *line, int paramnum, char *str, size_t buffersize) {
 
     // Prevent out of bounds errors
     if (en - bg + 1 >= buffersize) {
-        printf("out of bounds error: want %d bytes have %zu bytes\n", en - bg + 1 + 1, buffersize);
+        PrintAndLogEx(ERR, "out of bounds error: want %d bytes have %zu bytes\n", en - bg + 1 + 1, buffersize);
         return 0;
     }
 

From fb7ac7b0eab60724bd9893fdd78286a04ec58bf6 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 18 May 2019 17:56:46 +0200
Subject: [PATCH 1752/1938] baudrate 230400 works good on PM3 device
 communicating with BT add-on (Blue Shark)

---
 common/usart.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/usart.h b/common/usart.h
index 146e2e0d7..5cf549ba9 100644
--- a/common/usart.h
+++ b/common/usart.h
@@ -6,6 +6,7 @@
 
 //#define USART_BAUD_RATE 9600
 #define USART_BAUD_RATE 115200
+//#define USART_BAUD_RATE 230400
 //#define USART_BAUD_RATE 460800
 extern uint32_t usart_baudrate;
 #define USART_PARITY 'N'

From d3d98282acd0ae068ebc788f799cf8bb9f7684b5 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 18 May 2019 17:57:30 +0200
Subject: [PATCH 1753/1938] comments about Fractional parts in the baudrate
 generator

---
 common/usart.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/common/usart.c b/common/usart.c
index ecae58d0b..e6c7373c5 100644
--- a/common/usart.c
+++ b/common/usart.c
@@ -199,7 +199,7 @@ void usart_init(uint32_t baudrate, uint8_t parity) {
     pPIO->PIO_PPUER |= (AT91C_PA21_RXD1 | AT91C_PA22_TXD1);
 
     // set mode
-    uint32_t mode = AT91C_US_USMODE_NORMAL |      // normal mode
+    uint32_t mode = AT91C_US_USMODE_NORMAL |         // normal mode
                     AT91C_US_CLKS_CLOCK |            // MCK (48MHz)
                     AT91C_US_OVER |                  // oversampling
                     AT91C_US_CHRL_8_BITS |           // 8 bits
@@ -222,9 +222,20 @@ void usart_init(uint32_t baudrate, uint8_t parity) {
     // all interrupts disabled
     pUS1->US_IDR = 0xFFFF;
 
+    // http://ww1.microchip.com/downloads/en/DeviceDoc/doc6175.pdf
     // note that for very large baudrates, error is not neglectible:
     // b921600  => 8.6%
     // b1382400 => 8.6%
+    // FP, Fractional Part  (Datasheet p402, Supported in AT91SAM512 / 256) (31.6.1.3)
+    // FP = 0 disabled;
+    // FP = 1-7 Baudrate resolution,
+    // CD, Clock divider,
+    //    sync == 0 , (async?)
+    //       OVER = 0,  -no
+    //          baudrate == selected clock/16/CD
+    //       OVER = 1,  -yes we are oversampling
+    //          baudrate == selected clock/8/CD    --> this is ours
+    // 
     pUS1->US_BRGR =  48000000 / (usart_baudrate << 3);
 
     // Write the Timeguard Register

From 24a4d053b31444c0442118013899b7af0523c75f Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 18 May 2019 18:02:30 +0200
Subject: [PATCH 1754/1938] chg:  prompt now shows which channel is used.

---
 client/proxmark3.c | 16 ++++++++++------
 client/proxmark3.h |  3 +++
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/client/proxmark3.c b/client/proxmark3.c
index cd215b66a..d45ddb3e8 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -55,7 +55,7 @@ static void showBanner(void) {
 int check_comm(void) {
     // If communications thread goes down. Device disconnected then this should hook up PM3 again.
     if (IsCommunicationThreadDead() && session.pm3_present) {
-        rl_set_prompt("[offline] "PROXPROMPT);
+        rl_set_prompt(PROXPROMPT_OFFLINE);
         rl_forced_update_display();
         CloseProxmark();
         PrintAndLogEx(INFO, "Running in " _YELLOW_("OFFLINE") "mode. Use \"hw connect\" to reconnect\n");
@@ -159,10 +159,14 @@ main_loop(char *script_cmds_file, char *script_cmd) {
 
                 } else {
                     rl_event_hook = check_comm;
-                    if (session.pm3_present)
-                        cmd = readline(PROXPROMPT);
+                    if (session.pm3_present) {
+                        if ( conn.send_via_fpc_usart == false )
+                            cmd = readline(PROXPROMPT_USB);
+                        else 
+                            cmd = readline(PROXPROMPT_FPC);
+                    }
                     else
-                        cmd = readline("[offline] "PROXPROMPT);
+                        cmd = readline(PROXPROMPT_OFFLINE);
 
                     fflush(NULL);
                 }
@@ -270,9 +274,9 @@ static void show_help(bool showFullHelp, char *exec_name) {
         PrintAndLogEx(NORMAL, "      -b/--baud                           serial port speed (only needed for physical UART, not for USB-CDC or BT)");
         PrintAndLogEx(NORMAL, "      -w/--wait                           20sec waiting the serial port to appear in the OS");
         PrintAndLogEx(NORMAL, "      -f/--flush                          output will be flushed after every print");
-        PrintAndLogEx(NORMAL, "      -c/--command <command>              execute one proxmark3 command (or several separated by ';').");
+        PrintAndLogEx(NORMAL, "      -c/--command <command>              execute one Proxmark3 command (or several separated by ';').");
         PrintAndLogEx(NORMAL, "      -l/--lua <lua script file>          execute lua script.");
-        PrintAndLogEx(NORMAL, "      -s/--script-file <cmd_script_file>  script file with one proxmark3 command per line");
+        PrintAndLogEx(NORMAL, "      -s/--script-file <cmd_script_file>  script file with one Proxmark3 command per line");
         PrintAndLogEx(NORMAL, "\nsamples:");
         PrintAndLogEx(NORMAL, "      %s -h\n", exec_name);
         PrintAndLogEx(NORMAL, "      %s -m\n", exec_name);
diff --git a/client/proxmark3.h b/client/proxmark3.h
index afebc1c0a..7fea9a092 100644
--- a/client/proxmark3.h
+++ b/client/proxmark3.h
@@ -16,6 +16,9 @@
 #include "cmdscript.h"  // CmdScriptRun
 
 #define PROXPROMPT "pm3 --> "
+#define PROXPROMPT_USB "[usb] pm3 --> "
+#define PROXPROMPT_FPC "[fpc] pm3 --> "
+#define PROXPROMPT_OFFLINE "[offline] pm3 --> "
 
 #ifdef __cplusplus
 extern "C" {

From faf3a95a4569092feeed92ce0588e0b0c9dc8e77 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 18 May 2019 18:06:14 +0200
Subject: [PATCH 1755/1938] chg: 'hw connect' - new params.  p <port>  b
 <baudrate> a correct call is now

hw connect p com6 b 115200

This will set baudrate between Client and BT White Dongle.
---
 client/cmdhw.c | 66 ++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 48 insertions(+), 18 deletions(-)

diff --git a/client/cmdhw.c b/client/cmdhw.c
index 668714703..117f692f9 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -27,8 +27,8 @@ static int usage_hw_detectreader(void) {
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  hw detectreader [h] <L|H>");
     PrintAndLogEx(NORMAL, "Options:");
-    PrintAndLogEx(NORMAL, "           h          This help");
-    PrintAndLogEx(NORMAL, "           <type>     L = 125/134 kHz, H = 13.56 MHz");
+    PrintAndLogEx(NORMAL, "       h          This help");
+    PrintAndLogEx(NORMAL, "       <type>     L = 125/134 kHz, H = 13.56 MHz");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "      hw detectreader L");
@@ -40,8 +40,8 @@ static int usage_hw_setmux(void) {
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  hw setmux [h] <lopkd | loraw | hipkd | hiraw>");
     PrintAndLogEx(NORMAL, "Options:");
-    PrintAndLogEx(NORMAL, "           h          This help");
-    PrintAndLogEx(NORMAL, "           <type>     Low peak, Low raw, Hi peak, Hi raw");
+    PrintAndLogEx(NORMAL, "       h          This help");
+    PrintAndLogEx(NORMAL, "       <type>     Low peak, Low raw, Hi peak, Hi raw");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "      hw setmux lopkd");
@@ -50,14 +50,17 @@ static int usage_hw_setmux(void) {
 
 static int usage_hw_connect(void) {
     PrintAndLogEx(NORMAL, "Connects to a Proxmark3 device via specified serial port");
+    PrintAndLogEx(NORMAL, "Baudrate here is only for physical UART or UART-BT, " _YELLOW_("not")"for USB-CDC or blue shark add-on");
     PrintAndLogEx(NORMAL, "");
-    PrintAndLogEx(NORMAL, "Usage:  hw connect [h] [<port>]");
+    PrintAndLogEx(NORMAL, "Usage:  hw connect [h] p <port> b <baudrate>");
     PrintAndLogEx(NORMAL, "Options:");
-    PrintAndLogEx(NORMAL, "           h          This help");
-    PrintAndLogEx(NORMAL, "           <port>     Serial port to connect to, else retry the last used one");
+    PrintAndLogEx(NORMAL, "       h              This help");
+    PrintAndLogEx(NORMAL, "       p <port>       Serial port to connect to, else retry the last used one");
+    PrintAndLogEx(NORMAL, "       b <baudrate>   Baudrate");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
-    PrintAndLogEx(NORMAL, "      hw connect "SERIAL_PORT_EXAMPLE_H);
+    PrintAndLogEx(NORMAL, "      hw connect p "SERIAL_PORT_EXAMPLE_H);
+    PrintAndLogEx(NORMAL, "      hw connect p "SERIAL_PORT_EXAMPLE_H" b 115200");
     return PM3_SUCCESS;
 }
 
@@ -495,35 +498,62 @@ static int CmdPing(const char *Cmd) {
 
 static int CmdConnect(const char *Cmd) {
 
-    if (tolower(Cmd[0] == 'h'))
-        return usage_hw_connect();
-
-    char *port = NULL;
-
+    char *port= NULL;
+    uint32_t baudrate = USART_BAUD_RATE;
+    uint8_t cmdp = 0;
+    int sl;
+    
+    while (param_getchar(Cmd, cmdp) != 0x00) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
+            case 'h':
+                return usage_hw_connect();
+            case 'p':
+                sl = param_getlength(Cmd, cmdp + 1);
+                sl += 1;
+                port = (char *)calloc(sl, sizeof(uint8_t));
+                if ( port == NULL ) {
+                    PrintAndLogEx(WARNING, "Failed to allocate memory");
+                    return 1;
+                }
+                param_getstr(Cmd, cmdp + 1, port, sl);
+                cmdp += 2;
+                break;
+            case 'b':
+                baudrate = param_get32ex(Cmd, cmdp + 1, USART_BAUD_RATE, 10);
+                cmdp += 2;
+                break;
+            default:
+                cmdp++;
+                break;
+        }
+    }
+    
     // default back to previous used serial port
-    if (strlen(Cmd) == 0) {
+    if (port == NULL || strlen(port) == 0) {
         int len = strlen((char *)conn.serial_port_name);
         if (len == 0) {
             return usage_hw_connect();
         }
         port = (char *)conn.serial_port_name;
-    } else {
-        port = (char *)Cmd;
     }
 
     if (port == NULL)
         return usage_hw_connect();
 
+    printf("Port:: %s  Baud:: %u\n", port, baudrate);
+
     if (session.pm3_present) {
         CloseProxmark();
     }
 
-    OpenProxmark(port, false, 20, false, USART_BAUD_RATE);
+    // 10 second timeout
+    OpenProxmark(port, false, 10, false, baudrate);
 
     if (session.pm3_present && (TestProxmark() != PM3_SUCCESS)) {
-        PrintAndLogEx(ERR, _RED_("ERROR:") "cannot communicate with the Proxmark\n");
+        PrintAndLogEx(ERR, _RED_("ERROR:") "cannot communicate with the Proxmark3\n");
         CloseProxmark();
     }
+    free(port);
     return PM3_SUCCESS;
 }
 

From e6d64df6d0552e6ebd507e6b4e8736fc45d63ad3 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 18 May 2019 18:41:24 +0200
Subject: [PATCH 1756/1938] Fixing segfault

---
 client/cmdhw.c | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/client/cmdhw.c b/client/cmdhw.c
index 117f692f9..e287beaf6 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -52,7 +52,7 @@ static int usage_hw_connect(void) {
     PrintAndLogEx(NORMAL, "Connects to a Proxmark3 device via specified serial port");
     PrintAndLogEx(NORMAL, "Baudrate here is only for physical UART or UART-BT, " _YELLOW_("not")"for USB-CDC or blue shark add-on");
     PrintAndLogEx(NORMAL, "");
-    PrintAndLogEx(NORMAL, "Usage:  hw connect [h] p <port> b <baudrate>");
+    PrintAndLogEx(NORMAL, "Usage:  hw connect [h] [p <port>] [b <baudrate>]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       h              This help");
     PrintAndLogEx(NORMAL, "       p <port>       Serial port to connect to, else retry the last used one");
@@ -501,23 +501,18 @@ static int CmdConnect(const char *Cmd) {
     char *port= NULL;
     uint32_t baudrate = USART_BAUD_RATE;
     uint8_t cmdp = 0;
-    int sl;
     
     while (param_getchar(Cmd, cmdp) != 0x00) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
             case 'h':
                 return usage_hw_connect();
-            case 'p':
-                sl = param_getlength(Cmd, cmdp + 1);
-                sl += 1;
-                port = (char *)calloc(sl, sizeof(uint8_t));
-                if ( port == NULL ) {
-                    PrintAndLogEx(WARNING, "Failed to allocate memory");
-                    return 1;
-                }
-                param_getstr(Cmd, cmdp + 1, port, sl);
+            case 'p': {
+                int bg, en;
+                if (param_getptr(Cmd, &bg, &en, cmdp + 1)) break;
+                port = (char *)Cmd + bg;
                 cmdp += 2;
                 break;
+            }
             case 'b':
                 baudrate = param_get32ex(Cmd, cmdp + 1, USART_BAUD_RATE, 10);
                 cmdp += 2;
@@ -553,7 +548,6 @@ static int CmdConnect(const char *Cmd) {
         PrintAndLogEx(ERR, _RED_("ERROR:") "cannot communicate with the Proxmark3\n");
         CloseProxmark();
     }
-    free(port);
     return PM3_SUCCESS;
 }
 

From 413440fdabd826d158a41fcff3e080c46a5a6105 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 18 May 2019 18:45:15 +0200
Subject: [PATCH 1757/1938] hw connect: detect invalid usages

---
 client/cmdhw.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/cmdhw.c b/client/cmdhw.c
index e287beaf6..98c29f69b 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -518,8 +518,8 @@ static int CmdConnect(const char *Cmd) {
                 cmdp += 2;
                 break;
             default:
-                cmdp++;
-                break;
+                usage_hw_connect();
+                return PM3_EINVARG;
         }
     }
     

From d4ad0da33503c9f0519be6782be3304f26395ab7 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 18 May 2019 18:51:05 +0200
Subject: [PATCH 1758/1938] textual,

---
 client/comms.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/client/comms.c b/client/comms.c
index 74ff518de..20472ce5b 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -577,22 +577,23 @@ bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode,
 
 // check if we can communicate with Pm3
 int TestProxmark(void) {
-    clearCommandBuffer();
+
     PacketResponseNG resp;
     uint16_t len = 32;
     uint8_t data[len];
     for (uint16_t i = 0; i < len; i++)
         data[i] = i & 0xFF;
 
+    clearCommandBuffer();
     SendCommandNG(CMD_PING, data, len);
 
     uint32_t timeout = 1000;
 
 #ifdef USART_SLOW_LINK
-    timeout = 10000;
     // 10s timeout for slow FPC, e.g. over BT
     // as this is the very first command sent to the pm3
     // that initiates the BT connection
+    timeout = 10000;
 #endif
 
     if (WaitForResponseTimeoutW(CMD_PING, &resp, timeout, false) == 0) {
@@ -624,7 +625,7 @@ int TestProxmark(void) {
     PrintAndLogEx(INFO, "Communicating with PM3 over %s", conn.send_via_fpc_usart ? _YELLOW_("FPC UART") : _YELLOW_("USB-CDC"));
         
     if (conn.send_via_fpc_usart) {
-        PrintAndLogEx(INFO, "UART Serial baudrate: " _YELLOW_("%u") "\n", conn.uart_speed);
+        PrintAndLogEx(INFO, "PM3 UART serial baudrate: " _YELLOW_("%u") "\n", conn.uart_speed);
     } else {
         int res = uart_reconfigure_timeouts(UART_USB_CLIENT_RX_TIMEOUT_MS);
         if (res != PM3_SUCCESS) {
@@ -710,7 +711,7 @@ bool WaitForResponseTimeoutW(uint32_t cmd, PacketResponseNG *response, size_t ms
 
         if (msclock() - tmp_clk > 3000 && show_warning) {
             // 3 seconds elapsed (but this doesn't mean the timeout was exceeded)
-//            PrintAndLogEx(INFO, "Waiting for a response from the proxmark3...");
+//            PrintAndLogEx(INFO, "Waiting for a response from the Proxmark3...");
             PrintAndLogEx(INFO, "You can cancel this operation by pressing the pm3 button");
             show_warning = false;
         }

From f0ec37b7423918bac5922d3228af093a22a14b64 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 18 May 2019 21:35:46 +0200
Subject: [PATCH 1759/1938] fix hw connect parsing

---
 client/cmdhw.c | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/client/cmdhw.c b/client/cmdhw.c
index 98c29f69b..f5b6f94ab 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -498,23 +498,23 @@ static int CmdPing(const char *Cmd) {
 
 static int CmdConnect(const char *Cmd) {
 
-    char *port= NULL;
     uint32_t baudrate = USART_BAUD_RATE;
     uint8_t cmdp = 0;
+    char port[FILE_PATH_SIZE] = {0};
     
     while (param_getchar(Cmd, cmdp) != 0x00) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
             case 'h':
                 return usage_hw_connect();
             case 'p': {
-                int bg, en;
-                if (param_getptr(Cmd, &bg, &en, cmdp + 1)) break;
-                port = (char *)Cmd + bg;
+                param_getstr(Cmd, cmdp + 1, port, sizeof(port));
                 cmdp += 2;
                 break;
             }
             case 'b':
                 baudrate = param_get32ex(Cmd, cmdp + 1, USART_BAUD_RATE, 10);
+                if (baudrate == 0)
+                    return usage_hw_connect();
                 cmdp += 2;
                 break;
             default:
@@ -524,17 +524,13 @@ static int CmdConnect(const char *Cmd) {
     }
     
     // default back to previous used serial port
-    if (port == NULL || strlen(port) == 0) {
-        int len = strlen((char *)conn.serial_port_name);
-        if (len == 0) {
+    if (strlen(port) == 0) {
+        if (strlen((char *)conn.serial_port_name) == 0) {
             return usage_hw_connect();
         }
-        port = (char *)conn.serial_port_name;
+        memcpy(port, conn.serial_port_name, sizeof(port));
     }
 
-    if (port == NULL)
-        return usage_hw_connect();
-
     printf("Port:: %s  Baud:: %u\n", port, baudrate);
 
     if (session.pm3_present) {

From 13cd6ab61a85a63cd035a748a5d9735423ec3225 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 18 May 2019 21:38:21 +0200
Subject: [PATCH 1760/1938] add support for higher speeds.

---
 uart/uart_posix.c | 6 ++++++
 uart/uart_win32.c | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index 0f8e88c13..ba948132e 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -412,6 +412,12 @@ bool uart_set_speed(serial_port sp, const uint32_t uiPortSpeed) {
             stPortSpeed = B921600;
             break;
 #  endif
+#  ifdef B1382400
+        case 1382400:
+            stPortSpeed = B1382400;
+            break;
+#  endif
+
         default:
             return false;
     };
diff --git a/uart/uart_win32.c b/uart/uart_win32.c
index a797a7cd6..b02ddd7ef 100644
--- a/uart/uart_win32.c
+++ b/uart/uart_win32.c
@@ -150,6 +150,8 @@ bool uart_set_speed(serial_port sp, const uint32_t uiPortSpeed) {
         case 115200:
         case 230400:
         case 460800:
+        case 921600:
+        case 1382400:
             break;
         default:
             return false;

From ec796f4d8187840fb1016fafcec5d847489db6a4 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 18 May 2019 21:40:45 +0200
Subject: [PATCH 1761/1938] chg: add fractional for 921600, 1382400 baudrate

---
 common/usart.c | 8 +++++++-
 common/usart.h | 3 +++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/common/usart.c b/common/usart.c
index e6c7373c5..b804ac8df 100644
--- a/common/usart.c
+++ b/common/usart.c
@@ -236,7 +236,13 @@ void usart_init(uint32_t baudrate, uint8_t parity) {
     //       OVER = 1,  -yes we are oversampling
     //          baudrate == selected clock/8/CD    --> this is ours
     // 
-    pUS1->US_BRGR =  48000000 / (usart_baudrate << 3);
+    uint32_t fractional = 0;
+    if ( baudrate == 921600 )
+        fractional = 4;
+    else if ( baudrate == 1382400 )
+        fractional = 2;
+    uint32_t brgr = 48000000 / (usart_baudrate << 3);
+    pUS1->US_BRGR =  (fractional << 16) | brgr;
 
     // Write the Timeguard Register
     pUS1->US_TTGR = 0;
diff --git a/common/usart.h b/common/usart.h
index 5cf549ba9..5fa0873c9 100644
--- a/common/usart.h
+++ b/common/usart.h
@@ -8,6 +8,9 @@
 #define USART_BAUD_RATE 115200
 //#define USART_BAUD_RATE 230400
 //#define USART_BAUD_RATE 460800
+//#define USART_BAUD_RATE 921600
+//#define USART_BAUD_RATE 1382400
+
 extern uint32_t usart_baudrate;
 #define USART_PARITY 'N'
 extern uint8_t usart_parity;

From b17da830edadb8462e02a95a00b4a58302cce71b Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 18 May 2019 22:20:47 +0200
Subject: [PATCH 1762/1938] Compute fp on the fly

---
 common/usart.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/common/usart.c b/common/usart.c
index b804ac8df..734896e42 100644
--- a/common/usart.c
+++ b/common/usart.c
@@ -236,13 +236,11 @@ void usart_init(uint32_t baudrate, uint8_t parity) {
     //       OVER = 1,  -yes we are oversampling
     //          baudrate == selected clock/8/CD    --> this is ours
     // 
-    uint32_t fractional = 0;
-    if ( baudrate == 921600 )
-        fractional = 4;
-    else if ( baudrate == 1382400 )
-        fractional = 2;
     uint32_t brgr = 48000000 / (usart_baudrate << 3);
-    pUS1->US_BRGR =  (fractional << 16) | brgr;
+    // doing fp = round((mck / (usart_baudrate << 3) - brgr) * 8) with integers:
+    uint32_t fp = ((16 * 48000000 / (usart_baudrate << 3) - 16 * brgr)+1)/2;
+
+    pUS1->US_BRGR =  (fp << 16) | brgr;
 
     // Write the Timeguard Register
     pUS1->US_TTGR = 0;

From dae7b4a6a0107280397af57f79264d15f52bf32d Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Mon, 20 May 2019 01:03:56 +0200
Subject: [PATCH 1763/1938] Add UART notes

---
 doc/uart_notes.md | 152 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 152 insertions(+)
 create mode 100644 doc/uart_notes.md

diff --git a/doc/uart_notes.md b/doc/uart_notes.md
new file mode 100644
index 000000000..1b82617d0
--- /dev/null
+++ b/doc/uart_notes.md
@@ -0,0 +1,152 @@
+# Various notes about UART and baudrates
+
+Proxmark3 RDV4 can interact with the client program running on a host via several means, let's go through each of them and study the notion of baudrate.
+
+
+## USB-CDC ACM
+
+USB CDC (Communications Device Class) ACM (Abstract Control Model) is a way to emulate serial ports over USB.
+On the host, it appears as a virtual serial port, e.g. `/dev/ttyACM0`.
+
+This is the basic way to communicate with all versions of Proxmark3 (with fairly recent FW, it used to be USB-HID-based long time ago).
+On the Proxmark side, USB-CDC is provided by `common/usb_cdc.c`.
+
+In the USB CDC ACM descriptors, the Proxmark3 advertises a baudrate (USART_BAUD_RATE) but this is purely informative and has no real meaning.
+The real communication speed relates only to the USB link and is roughly about 7Mbps.
+In USB CDC ACM the host could "set" other baudrates and the USB CDC device would be informed of the changes (see `SET_LINE_CODING` and `GET_LINE_CODING`), which is potentially interesting if, behind, it has to configure a real UART, but we're not in this type of setup so baudrate notion on USB CDC (visible e.g. with `stty -F /dev/ttyACM0`) can simply be totally ignored. 
+
+## Proxmark3 FPC USART
+
+Proxmark3 RDV4 has a FPC connector outputting on 2 pins a USART from the ARM:
+
+|FPC  |ARM  |Function| GPIO
+|---|---|---|---|
+|6  | 11| RXD1 |PA21
+|7  | 14| TXD1 |PA22
+
+USART support is in `common/usart.c`.
+
+There are mainly two ways to use this USART:
+* connect the host client to the Proxmark3 via this USART instead of USB-CDC, this is the `FPC_USART_HOST`. The most used way is through the BT add-on (blue shark) that we will cover later. Instead of BT add-on, we can also use e.g. a FTDI cable (mostly for internal development, it's much slower than USB-CDC anyway) or in the future other ways to connect the host such as a USART-to-Wi-Fi bridge.
+* connect "slave" devices to the Proxmark3 to add functionnalities. In such case, the host client will use USB-CDC and the USART will be use to, e.g. connect the Proxmark3 to various daughterboards. These is no such example of daughterboard as of today, except when we're talking to the BT add-on in its AT configuration mode.
+
+This USART can be reached from the host client (if connected via USB-CDC) through the following commands, available in `FPC_USART_DEV` build:
+* `usart config`, to configure the baudrate and the parity of the Proxmark3 USART
+* `usart txrx/tx/rx/txhex/rxhex` to transmit and receive bytes
+
+So, `usart config` changes the Proxmark3 USART baudrate and parity, while e.g. `usart txrx d AT+Px` and `usart txrx d AT+BAUDx` changes the BT add-on parity and baudrate.
+And for things to work fine, both sets have to match!
+
+Internally, the desired baudrate is converted to UART settings: a BRGR and a FP. The resulting baudrate will be close to but not always equal to the desired baudrate. Serial ports typically have some error tolerance in the actual baudrates. Theoretically < 2.5% on each side (so 5% in total), < 2% to be on the safe side. In the current firmware configuration, the Proxmark3 can provide any baudrate up to 2Mbauds with an error of max 2%, and selected baudrates up to 6Mbauds. TODO to be tested.
+
+## Proxmark3 FPC USART + BT add-on (blue shark)
+
+### BT add-on AT configuration mode
+
+When the BT add-on is turned on but no actively connected to a host, it's in a configuration mode where it accepts "AT" commands and its blue LED is blinking at about 1Hz.
+
+Some specific commands are available in `BTADDON` build, only to configure specific features of the BT add-on:
+* `usart btpin`, to change the BT add-on PIN
+* `usart btfactory`, to guess the current BT add-on UART settings and to reset its configuration.
+
+`usart btfactory` changes several times the Proxmark3 USART baudrate and parity till it matches the BT add-on settings, then changes the baudrate and parity of the add-on to a default value, then changes the Proxmark USART to the same default values, so everything should be back in order. (`btfactory` does more but we're only interested in baudrate in this discussion)
+
+Manual configuration is also possible with `usart txrx d AT+Px` and `usart txrx d AT+BAUDx`.
+
+### BT add-on connected mode
+
+When the BT add-on is paired with a host and the host establishes an active connection, the blue LED turns on steadily.
+
+The add-on acts as a bridge, between its UART and the BT communication channel, here a RFCOMM channel.
+
+### RFCOMM
+
+The Bluetooth RFCOMM protocol provides an emulation of serial ports over the L2CAP protocol ([ref](https://www.amd.e-technik.uni-rostock.de/ma/gol/lectures/wirlec/bluetooth_info/rfcomm.html)).
+
+As for USB-CDC, the real speed of the link is unrelated to serial baudrate notion. Litterature mentions a maximal value of 360kbps for some implementations, but the HC-06 Bluetooth module within the BT add-on is limited as the vast majority of similar devices to 128kbps.
+
+### BT add-on baudrate
+
+Which baudrate will make sense?
+
+* The Proxmark can set its USART baudrate to any value with a decent error up to large values.
+* The BT add-on supports a set of fixed baudrates: 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400, 460800, 921600, 1382400
+* The HC-06 RFCOMM is limited to 128kbps (and has an internal 8Mbit buffer)
+
+Using 115200 is safe and within the 128kbps limit.
+
+Using 230400 allows to maximize the BT channel capacity, but the gain is limited, about 10-15% faster than 115200. There is also a risk to take into account: you're delivering data too fast to the HC-06 than what it's capable to send over RFCOMM. So you're filling the internal buffer faster than it can be emptied. If you're doing it for too many data, you'll reach a point where data will be lost (once the internal buffer is full), which is observable with `hw status` for higher baudrates at the time of writing (`b17da830edadb8462e02a95a00b4a58302cce71b`).
+
+### BT on host side: internal BT
+
+On the other side of the BT link is the host. If it has built-in Bluetooth, the host can present a virtual serial port to the Proxmark3 client.
+E.g. on Linux, `rfcomm` allows to create such bindings of a BT device and a virtual port: `rfcomm bind rfcomm0 20:19:04:20:04:08` will create the virtual port `/dev/rfcomm0`.
+As any virtual serial port you may set a specific baudrate to that port, but it is meaningless as anyway the RFCOMM link will run at 128kbps (at least when talking to HC-06 add-on).
+
+Note that the rfcomm implementation separates pairing from actual connection:
+* you will pair once at the very first connection, pairing will be remembered for next connections (pairing will be lost if you reconfigure the BT add-on settings).
+* every time `/dev/rfcomm0` is opened by a program, e.g. Proxmark3 client, it will establish the link and the BT add-on blue LED will be on steadily.
+* when the program closes, the link will be closed and the BT add-on blue LED will blink again, showing that the BT ad-on is in AT configuration mode.
+
+### BT on host side: HC-06 dongle
+
+On the other side of the BT link is the host. If it does not have a built-in Bluetooth, the host can use
+* a generic BT add-on, and we're back in the previous case
+* or a BT-UART bridge as the one sold with the BT add-on, which is what we'll discuss in this section
+
+It's actually bundling a HC-06 and some USB-UART chip together in a single dongle.
+
+The HC-06 is the same as the one in the BT add-on, but working in *master* mode. When it's configured with the same settings as the BT add-on, it will connect automatically to it.
+One difference with native BT seen in the previous section is that the link will be always active (BT add-on blue LED and dongle HC-06 LED will both be steadily on).
+So if you need to enter AT configuration mode on the BT add-on or on the dongle, you need to turn off the other device to break the RFCOMM connection.
+
+When the dongle is plugged on the host, a serial port is allocated, `/dev/ttyUSB0` on Linux. Contrarily to the `/dev/ttyACM0` of the Proxmark3, `/dev/ttyUSB0` is controlling a real UART, the one in the USB-UART chip of the dongle, probably a CP2102.
+
+For the host to talk properly to the HC-06 dongle, the USB-UART chip has to use the exact same baudrate as the one configured into the HC-06 dongle.
+
+The USB-UART speed is selected when a program opens the port. E.g.
+* the Proxmark3 client:
+  * when launched, via the option `-b`
+  * when reconnecting, via option `b` of `hw connect`
+* the Python script meant to configure HC-06 dongle. The baudrate is given as option to `serial.Serial()` when opening `/dev/ttyUSB0`.
+
+### HC-06 dongle AT configuration mode
+
+When the BT add-on is turned off, the HC-06 dongle will not be connected and will fall back into its AT configuration mode (its LED is blinking).
+
+`tools/btaddon/hc06_factory_master.py` changes several times the USB-UART baudrate and parity till it matches the HC-06 dongle settings, then changes the baudrate and parity of the dongle to a default value. (`hc06_factory.py` does more but we're only interested in baudrate in this discussion)
+
+TODO tools/btaddon/hc06_factory_master.py
+
+## Proxmark3 FPC USART + FTDI
+
+Just for completeness, let's mention the possibility to connect the Proxmark3 to the host via FPC and a USB-UART bridge such as a FTDI cable (or CP2102, ch341, PL2303...).
+It's not very interesting because USB-CDC is faster anyway.
+
+In that case, Proxmark3 USART settings (configured e.g. via `usart config` while connected by USB-CDC) have to match FTDI cable settings, selected by the program opening the serial port (`/dev/ttyUSB0`).
+
+## BT add-on + FTDI
+
+Just for completeness, let's mention the possibility to connect the BT add-on to the host via FPC and a USB-UART bridge such as a FTDI cable (or CP2102, ch341, PL2303...).
+The only interest is for debug purposes, e.g. to reconfigure an add-on from the host rather than from the Proxmark3 itself.
+It was used at some point to recover manually from BAUDB/BAUDC but now the PRoxmark3 firmware supports directly these high baudrates.
+
+Connect a FPC breakout to the BT add-on.
+The FPC breakout is meant to be connected to the Proxmark3, not the add-on, so the pinout order is reversed.
+The RX/TX logic is also reversed: TX referred to Proxmark3 TX, so now we must connect FTDI TX to TX and not RX.
+Add-on gets powered externally via the "battery" pin.
+
+|FTDI | FPC breakout |  Add-on|
+|-----|--------------|--------|
+|GND  | (PWR_OE1)   |  GND   |
+|CTS  | | |
+|5V   | (LF_VMID)   |  Vin?  |
+|TXO  | (5V)        |  RX    |
+|RXI  | (HF_IN)     |  TX    |
+|DTR  | | |
+
+Turn BTpower switch ON, leave Battery switch OFF
+
+Use e.g. `tools/btaddon/hc06_factory_slave.py`
+
+TODO tools/btaddon/hc06_factory_slave.py

From 983e63d82f7598b259130bb5dd02b117f162c21b Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 20 May 2019 04:28:34 -0400
Subject: [PATCH 1764/1938] hw commands - uses NG

---
 armsrc/appmain.c | 34 ++++++++++++++++++++++++++--------
 armsrc/apps.h    |  2 +-
 client/cmdhw.c   | 36 +++++++++++++++++++++++++-----------
 3 files changed, 52 insertions(+), 20 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 0659113d2..b09cd4caa 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -325,8 +325,8 @@ extern struct version_information version_information;
 /* bootrom version information is pointed to from _bootphase1_version_pointer */
 extern char *_bootphase1_version_pointer, _flash_start, _flash_end, _bootrom_start, _bootrom_end, __data_src_start__;
 void SendVersion(void) {
-    char temp[PM3_CMD_DATA_SIZE]; /* Limited data payload in USB packets */
-    char VersionString[PM3_CMD_DATA_SIZE] = { '\0' };
+    char temp[PM3_CMD_DATA_SIZE - 12]; /* Limited data payload in USB packets */
+    char VersionString[PM3_CMD_DATA_SIZE - 12] = { '\0' };
 
     /* Try to find the bootrom version information. Expect to find a pointer at
      * symbol _bootphase1_version_pointer, perform slight sanity checks on the
@@ -357,7 +357,21 @@ void SendVersion(void) {
     // Send Chip ID and used flash memory
     uint32_t text_and_rodata_section_size = (uint32_t)&__data_src_start__ - (uint32_t)&_flash_start;
     uint32_t compressed_data_section_size = common_area.arg1;
-    reply_old(CMD_ACK, *(AT91C_DBGU_CIDR), text_and_rodata_section_size + compressed_data_section_size, 0, VersionString, strlen(VersionString));
+
+    struct p {
+        uint32_t id;
+        uint32_t section_size;
+        uint32_t versionstr_len;
+        char versionstr[PM3_CMD_DATA_SIZE - 12];
+    } PACKED;
+
+    struct p payload;
+    payload.id = *(AT91C_DBGU_CIDR);
+    payload.section_size = text_and_rodata_section_size + compressed_data_section_size;
+    payload.versionstr_len = strlen(VersionString);
+    memcpy(payload.versionstr, VersionString, strlen(VersionString)); 
+
+    reply_ng(CMD_VERSION, PM3_SUCCESS, (uint8_t*)&payload, 12 + strlen(VersionString));
 }
 
 // measure the Connection Speed by sending SpeedTestBufferSize bytes to client and measuring the elapsed time.
@@ -551,7 +565,7 @@ at the same place! :-)
 */
 #define LIGHT_LEVELS 20
 
-void ListenReaderField(int limit) {
+void ListenReaderField(uint8_t limit) {
 #define LF_ONLY 1
 #define HF_ONLY 2
 #define REPORT_CHANGE 10    // report new values only if they have changed at least by REPORT_CHANGE
@@ -1271,7 +1285,9 @@ static void PacketReceived(PacketCommandNG *packet) {
             break;
 
         case CMD_LISTEN_READER_FIELD:
-            ListenReaderField(packet->oldarg[0]);
+            if (packet->length != sizeof(uint8_t) )
+                break;
+            ListenReaderField(packet->data.asBytes[0]);
             break;
 
         case CMD_FPGA_MAJOR_MODE_OFF: // ## FPGA Control
@@ -1346,7 +1362,9 @@ static void PacketReceived(PacketCommandNG *packet) {
             break;
         }
         case CMD_READ_MEM:
-            ReadMem(packet->oldarg[0]);
+            if (packet->length != sizeof(uint32_t))
+                break;
+            ReadMem(packet->data.asDwords[0]);
             break;
 #ifdef WITH_FLASH
         case CMD_FLASHMEM_SET_SPIBAUDRATE:
@@ -1517,11 +1535,11 @@ static void PacketReceived(PacketCommandNG *packet) {
 #endif
         case CMD_SET_LF_DIVISOR:
             FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-            FpgaSendCommand(FPGA_CMD_SET_DIVISOR, packet->oldarg[0]);
+            FpgaSendCommand(FPGA_CMD_SET_DIVISOR, packet->data.asBytes[0]);
             break;
 
         case CMD_SET_ADC_MUX:
-            switch (packet->oldarg[0]) {
+            switch (packet->data.asBytes[0]) {
                 case 0:
                     SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
                     break;
diff --git a/armsrc/apps.h b/armsrc/apps.h
index 045dc907b..c37ac7c67 100644
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -62,7 +62,7 @@ void print_result(char *name, uint8_t *buf, size_t len);
 //void PrintToSendBuffer(void);
 void ToSendStuffBit(int b);
 void ToSendReset(void);
-void ListenReaderField(int limit);
+void ListenReaderField(uint8_t limit);
 extern int ToSendMax;
 extern uint8_t ToSend[];
 
diff --git a/client/cmdhw.c b/client/cmdhw.c
index f5b6f94ab..e57899019 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -24,6 +24,7 @@ static int CmdHelp(const char *Cmd);
 
 static int usage_hw_detectreader(void) {
     PrintAndLogEx(NORMAL, "Start to detect presences of reader field");
+    PrintAndLogEx(NORMAL, "press pm3 button to change modes and finally exit");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  hw detectreader [h] <L|H>");
     PrintAndLogEx(NORMAL, "Options:");
@@ -349,7 +350,7 @@ static void lookupChipID(uint32_t iChipID, uint32_t mem_used) {
 }
 
 static int CmdDetectReader(const char *Cmd) {
-    uint16_t arg = 0;
+    uint8_t arg = 0;
     char c = toupper(Cmd[0]);
     switch (c) {
         case 'L':
@@ -365,7 +366,7 @@ static int CmdDetectReader(const char *Cmd) {
     }
 
     clearCommandBuffer();
-    SendCommandMIX(CMD_LISTEN_READER_FIELD, arg, 0, 0, NULL, 0);
+    SendCommandNG(CMD_LISTEN_READER_FIELD, (uint8_t *)&arg, sizeof(arg));
     return PM3_SUCCESS;
 }
 
@@ -388,14 +389,16 @@ static int CmdLCD(const char *Cmd) {
 }
 
 static int CmdLCDReset(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far    
     clearCommandBuffer();
-    SendCommandMIX(CMD_LCD_RESET, strtol(Cmd, NULL, 0), 0, 0, NULL, 0);
+    SendCommandNG(CMD_LCD_RESET, NULL, 0);
     return PM3_SUCCESS;
 }
 
 static int CmdReadmem(const char *Cmd) {
+    uint32_t address = strtol(Cmd, NULL, 0);
     clearCommandBuffer();
-    SendCommandMIX(CMD_READ_MEM, strtol(Cmd, NULL, 0), 0, 0, NULL, 0);
+    SendCommandNG(CMD_READ_MEM, (uint8_t *)&address, sizeof(address));
     return PM3_SUCCESS;
 }
 
@@ -412,15 +415,15 @@ static int CmdReset(const char *Cmd) {
  * 600kHz.
  */
 static int CmdSetDivisor(const char *Cmd) {
-    uint16_t arg = strtol(Cmd, NULL, 0);
+    uint8_t arg = param_get8ex(Cmd, 0, 95, 10);
 
-    if (arg < 19 || arg > 255) {
+    if (arg < 19) {
         PrintAndLogEx(ERR, "divisor must be between 19 and 255");
         return PM3_EINVARG;
     }
     // 12 000 000 (12Mhz)
     clearCommandBuffer();
-    SendCommandMIX(CMD_SET_LF_DIVISOR, arg, 0, 0, NULL, 0);
+    SendCommandNG(CMD_SET_LF_DIVISOR, (uint8_t *)&arg, sizeof(arg));
     PrintAndLogEx(SUCCESS, "Divisor set, expected %.1f kHz", ((double)12000 / (arg + 1)));
     return PM3_SUCCESS;
 }
@@ -444,7 +447,7 @@ static int CmdSetMux(const char *Cmd) {
         return PM3_EINVARG;
     }
     clearCommandBuffer();
-    SendCommandMIX(CMD_SET_ADC_MUX, arg, 0, 0, NULL, 0);
+    SendCommandNG(CMD_SET_ADC_MUX, (uint8_t *)&arg, sizeof(arg));
     return PM3_SUCCESS;
 }
 
@@ -585,7 +588,7 @@ void pm3_version(bool verbose) {
 
     SendCommandNG(CMD_VERSION, NULL, 0);
 
-    if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {
+    if (WaitForResponseTimeout(CMD_VERSION, &resp, 1000)) {
         PrintAndLogEx(NORMAL, "\n" _BLUE_(" [ Proxmark3 RFID instrument ]") "\n");
         PrintAndLogEx(NORMAL, "\n [ CLIENT ]");
         PrintAndLogEx(NORMAL, "  client: RRG/Iceman"); // TODO version info?
@@ -599,8 +602,19 @@ void pm3_version(bool verbose) {
             PrintAndLogEx(NORMAL, "  FPC USART for developer support: %s", _GREEN_("present"));
 
         PrintAndLogEx(NORMAL, "");
-        PrintAndLogEx(NORMAL, (char *)resp.data.asBytes);
-        lookupChipID(resp.oldarg[0], resp.oldarg[1]);
+
+        struct p {
+            uint32_t id;
+            uint32_t section_size;
+            uint32_t versionstr_len;
+            char versionstr[PM3_CMD_DATA_SIZE - 12];
+        } PACKED;
+
+        struct p *payload = (struct p *)&resp.data.asBytes;
+
+        PrintAndLogEx(NORMAL,  payload->versionstr);
+
+        lookupChipID(payload->id, payload->section_size);
     }
     PrintAndLogEx(NORMAL, "\n");
 }

From ce4198f5f2642722cf8a88e9f38d29095e89728a Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 20 May 2019 07:11:16 -0400
Subject: [PATCH 1765/1938] new pwds - white cloner (mwalker)

---
 client/default_pwd.dic | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/client/default_pwd.dic b/client/default_pwd.dic
index 42c06460f..aa2b23719 100644
--- a/client/default_pwd.dic
+++ b/client/default_pwd.dic
@@ -16,6 +16,10 @@ AA55BBBB,
 A5B4C3D2,
 # ref.  http://www.proxmark.org/forum/viewtopic.php?pid=30379#p30379
 1C0B5848,
+# http://www.proxmark.org/forum/viewtopic.php?pid=35075#p35075
+00434343,
+44B44CAE,
+88661858,  
 # paxton bullit?
 575F4F4B,
 #

From d7f1ab2175e52bfdb9124f67d9aff10d7f641078 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 20 May 2019 09:15:45 -0400
Subject: [PATCH 1766/1938] chg: lf cmdread - now uses NG

---
 armsrc/appmain.c    | 12 ++++++++--
 armsrc/lfops.c      | 10 ++++-----
 armsrc/lfsampling.c |  2 +-
 client/cmdlf.c      | 53 ++++++++++++++++++++++++++++++---------------
 4 files changed, 52 insertions(+), 25 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index b09cd4caa..484150293 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -755,9 +755,17 @@ static void PacketReceived(PacketCommandNG *packet) {
             reply_old(CMD_ACK, bits, 0, 0, 0, 0);
             break;
         }
-        case CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K:
-            ModThenAcquireRawAdcSamples125k(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
+        case CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K: {
+            struct p {
+               uint32_t delay;
+               uint16_t ones;
+               uint16_t zeros;
+            } PACKED;
+            struct p *payload;
+            payload = (struct p*)packet->data.asBytes;
+            ModThenAcquireRawAdcSamples125k(payload->delay, payload->zeros, payload->ones, packet->data.asBytes+8);
             break;
+            }
         case CMD_LF_SNIFF_RAW_ADC_SAMPLES: {
             uint32_t bits = SniffLF();
             reply_old(CMD_ACK, bits, 0, 0, 0, 0);
diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index a49f205c4..2793b90a6 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -242,7 +242,7 @@ void ModThenAcquireRawAdcSamples125k(uint32_t delay_off, uint32_t period_0, uint
     // Turn off antenna
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     // tell client we are done
-    reply_old(CMD_ACK, 0, 0, 0, 0, 0);
+    reply_ng(CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K, PM3_SUCCESS, NULL, 0);
 }
 
 /* blank r/w tag data stream
@@ -1409,7 +1409,7 @@ void T55xxWriteBlockExt(uint32_t data, uint8_t blockno, uint32_t pwd, uint8_t fl
 
     // make sure tag is fully powered up...
     WaitMS(4);
-    
+
     // Trigger T55x7 in mode.
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     WaitUS(t_config.start_gap);
@@ -1423,7 +1423,7 @@ void T55xxWriteBlockExt(uint32_t data, uint8_t blockno, uint32_t pwd, uint8_t fl
         // std opcode 10 == page 0
         // std opcode 11 == page 1
         T55xxWriteBit(1);
-        T55xxWriteBit(page);        
+        T55xxWriteBit(page);
     }
 
     if (pwd_mode) {
@@ -1479,8 +1479,8 @@ void T55xxWriteBlockExt(uint32_t data, uint8_t blockno, uint32_t pwd, uint8_t fl
 // Write one card block in page 0, no lock
 // uses NG format
 void T55xxWriteBlock(uint8_t *data) {
-    t55xx_write_block_t *c = (t55xx_write_block_t *)data;    
-    T55xxWriteBlockExt(c->data, c->blockno, c->pwd, c->flags);    
+    t55xx_write_block_t *c = (t55xx_write_block_t *)data;
+    T55xxWriteBlockExt(c->data, c->blockno, c->pwd, c->flags);
     reply_ng(CMD_T55XX_WRITE_BLOCK, PM3_SUCCESS, NULL, 0);
 }
 
diff --git a/armsrc/lfsampling.c b/armsrc/lfsampling.c
index 191f01d5e..b8a76c016 100644
--- a/armsrc/lfsampling.c
+++ b/armsrc/lfsampling.c
@@ -199,7 +199,7 @@ uint32_t DoAcquisition(uint8_t decimation, uint32_t bits_per_sample, bool averag
     }
 
     if (!silent) {
-        Dbprintf("Done, saved %d out of %d seen samples at %d bits/sample", sample_total_saved, sample_total_numbers, bits_per_sample);
+        Dbprintf("Done, saved " _YELLOW_("%d")"out of " _YELLOW_("%d")"seen samples at " _YELLOW_("%d")"bits/sample", sample_total_saved, sample_total_numbers, bits_per_sample);
         Dbprintf("buffer samples: %02x %02x %02x %02x %02x %02x %02x %02x ...",
                  dest[0], dest[1], dest[2], dest[3], dest[4], dest[5], dest[6], dest[7]);
     }
diff --git a/client/cmdlf.c b/client/cmdlf.c
index 86e218066..62e45051e 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -145,32 +145,37 @@ static int usage_lf_find(void) {
 int CmdLFCommandRead(const char *Cmd) {
 
     bool errors = false;
-
-    uint32_t arg0 = 0;
-    uint32_t arg1 = 0;
-    uint32_t arg2 = 0;
-    uint8_t data[PM3_CMD_DATA_SIZE];
     uint16_t datalen = 0;
 
+    struct p {
+        uint32_t delay;
+        uint16_t ones;
+        uint16_t zeros;
+        uint8_t data[PM3_CMD_DATA_SIZE - 8];
+    } PACKED;
+
+    struct p payload;
+
+
     uint8_t cmdp = 0;
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
             case 'h':
                 return usage_lf_cmdread();
-            case 'c':
-                datalen = param_getstr(Cmd, cmdp + 1, (char *)&data, sizeof(data));
+            case 'c':  // cmd bytes 1010
+                datalen = param_getstr(Cmd, cmdp + 1, (char *)&payload.data, sizeof(payload.data));
                 cmdp += 2;
                 break;
-            case 'd':
-                arg0 = param_get32ex(Cmd, cmdp + 1, 0, 10);
+            case 'd':  // delay
+                payload.delay = param_get32ex(Cmd, cmdp + 1, 0, 10);
                 cmdp += 2;
                 break;
-            case 'z':
-                arg1 = param_get32ex(Cmd, cmdp + 1, 0, 10) & 0xFFFF;
+            case 'z':  // zero
+                payload.zeros = param_get32ex(Cmd, cmdp + 1, 0, 10) & 0xFFFF;
                 cmdp += 2;
                 break;
-            case 'o':
-                arg2 = param_get32ex(Cmd, cmdp + 1, 0, 10) & 0xFFFF;
+            case 'o':  // ones
+                payload.ones = param_get32ex(Cmd, cmdp + 1, 0, 10) & 0xFFFF;
                 cmdp += 2;
                 break;
             default:
@@ -183,12 +188,26 @@ int CmdLFCommandRead(const char *Cmd) {
     //Validations
     if (errors || cmdp == 0)  return usage_lf_cmdread();
 
+    PrintAndLogEx(SUCCESS, "Sending");
     clearCommandBuffer();
-    SendCommandOLD(CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K, arg0, arg1, arg2, data, datalen);
+    SendCommandNG(CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K, (uint8_t*)&payload, 8 + datalen );
 
-    WaitForResponse(CMD_ACK, NULL);
-    getSamples(0, true);
-    return 0;
+    printf("\n");
+    uint8_t i = 10;
+    while ( !WaitForResponseTimeout(CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K, NULL, 2000 ) && i != 0) {
+        printf(".");
+        fflush(stdout);
+        i--;
+    }
+    printf("\n");
+
+    if ( i ) {
+        PrintAndLogEx(SUCCESS, "Downloading response signal data");
+        getSamples(0, true);
+        return PM3_SUCCESS;
+    }
+    PrintAndLogEx(WARNING, "timeout while waiting for reply.");
+    return PM3_EOPABORTED;
 }
 
 int CmdFlexdemod(const char *Cmd) {

From ab8826fed892c4edc17cdd3506daa95ef4c67388 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 20 May 2019 09:50:04 -0400
Subject: [PATCH 1767/1938] chg: lf config - uses NG

---
 client/cmdlf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdlf.c b/client/cmdlf.c
index 62e45051e..c7ee7de92 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -347,7 +347,7 @@ int CmdLFSetConfig(const char *Cmd) {
     sample_config config = { decimation, bps, averaging, divisor, trigger_threshold };
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_SET_LF_SAMPLING_CONFIG, 0, 0, 0, &config, sizeof(sample_config));
+    SendCommandNG(CMD_SET_LF_SAMPLING_CONFIG, (uint8_t *)&config, sizeof(sample_config));
     return 0;
 }
 

From 178c922218b7c8aa3a50adf4e6010587e5ebb991 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 20 May 2019 10:48:51 -0400
Subject: [PATCH 1768/1938] chg: lf read - now uses NG

---
 armsrc/appmain.c | 10 ++++++++--
 client/cmdlf.c   | 28 ++++++++++++++++++++--------
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 484150293..6a9c8404a 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -751,8 +751,14 @@ static void PacketReceived(PacketCommandNG *packet) {
             setSamplingConfig((sample_config *) packet->data.asBytes);
             break;
         case CMD_ACQUIRE_RAW_ADC_SAMPLES_125K: {
-            uint32_t bits = SampleLF(packet->oldarg[0], packet->oldarg[1]);
-            reply_old(CMD_ACK, bits, 0, 0, 0, 0);
+            struct p {
+                uint8_t silent;
+                uint32_t samples;
+            } PACKED;
+            struct p *payload;
+            payload = (struct p*)packet->data.asBytes;
+            uint32_t bits = SampleLF(payload->silent, payload->samples);
+            reply_ng(CMD_ACQUIRE_RAW_ADC_SAMPLES_125K, PM3_SUCCESS, (uint8_t *)&bits, sizeof(bits));
             break;
         }
         case CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K: {
diff --git a/client/cmdlf.c b/client/cmdlf.c
index c7ee7de92..440560513 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -207,7 +207,7 @@ int CmdLFCommandRead(const char *Cmd) {
         return PM3_SUCCESS;
     }
     PrintAndLogEx(WARNING, "timeout while waiting for reply.");
-    return PM3_EOPABORTED;
+    return PM3_ETIMEOUT;
 }
 
 int CmdFlexdemod(const char *Cmd) {
@@ -353,22 +353,34 @@ int CmdLFSetConfig(const char *Cmd) {
 
 bool lf_read(bool silent, uint32_t samples) {
     if (!session.pm3_present) return false;
+
+    struct p {
+        uint8_t silent;
+        uint32_t samples;
+    } PACKED;
+
+    struct p payload;
+    payload.silent = silent;
+    payload.samples = samples;
+
     clearCommandBuffer();
-    SendCommandMIX(CMD_ACQUIRE_RAW_ADC_SAMPLES_125K, silent, samples, 0, NULL, 0);
+    SendCommandNG(CMD_ACQUIRE_RAW_ADC_SAMPLES_125K, (uint8_t *)&payload, sizeof(payload));
 
     PacketResponseNG resp;
     if (g_lf_threshold_set) {
-        WaitForResponse(CMD_ACK, &resp);
+        WaitForResponse(CMD_ACQUIRE_RAW_ADC_SAMPLES_125K, &resp);
     } else {
-        if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
+        if (!WaitForResponseTimeout(CMD_ACQUIRE_RAW_ADC_SAMPLES_125K, &resp, 2500)) {
             PrintAndLogEx(WARNING, "command execution time out");
-            return false;
+            return PM3_ETIMEOUT;
         }
     }
-    // resp.oldarg[0] is bits read not bytes read.
-    getSamples(resp.oldarg[0] / 8, silent);
 
-    return true;
+    // resp.oldarg[0] is bits read not bytes read.
+    uint32_t bits = (resp.data.asDwords[0] / 8 );
+    getSamples(bits, silent);
+
+    return PM3_SUCCESS;
 }
 
 int CmdLFRead(const char *Cmd) {

From f0c173ccba4aae8e93b19bde401902326dad8a41 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 20 May 2019 10:50:23 -0400
Subject: [PATCH 1769/1938] style

---
 client/cmdlfawid.c      | 4 ++--
 client/cmdlffdx.c       | 2 +-
 client/cmdlfjablotron.c | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c
index b19149987..1fc642e10 100644
--- a/client/cmdlfawid.c
+++ b/client/cmdlfawid.c
@@ -397,12 +397,12 @@ static int CmdAWIDClone(const char *Cmd) {
         clearCommandBuffer();
 
         t55xx_write_block_t ng;
-        
+
         ng.data = blocks[i];
         ng.pwd = 0;
         ng.blockno = i;
         ng.flags = 0;
-        
+
         SendCommandNG(CMD_T55XX_WRITE_BLOCK, (uint8_t *)&ng, sizeof(ng));
         if (!WaitForResponseTimeout(CMD_T55XX_WRITE_BLOCK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
diff --git a/client/cmdlffdx.c b/client/cmdlffdx.c
index 2ce1b1cb7..1db282c7d 100644
--- a/client/cmdlffdx.c
+++ b/client/cmdlffdx.c
@@ -297,7 +297,7 @@ static int CmdFdxClone(const char *Cmd) {
         ng.pwd = 0;
         ng.blockno = i;
         ng.flags = 0;
-        
+
         SendCommandNG(CMD_T55XX_WRITE_BLOCK, (uint8_t *)&ng, sizeof(ng));
         if (!WaitForResponseTimeout(CMD_T55XX_WRITE_BLOCK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
diff --git a/client/cmdlfjablotron.c b/client/cmdlfjablotron.c
index 8189f01ed..768a7a8ca 100644
--- a/client/cmdlfjablotron.c
+++ b/client/cmdlfjablotron.c
@@ -165,14 +165,14 @@ static int CmdJablotronClone(const char *Cmd) {
             conn.block_after_ACK = false;
         }
         clearCommandBuffer();
-        
+
         t55xx_write_block_t ng;
         ng.data = blocks[i];
         ng.pwd = 0;
         ng.blockno = i;
         ng.flags = 0;
 
-        SendCommandNG(CMD_T55XX_WRITE_BLOCK, (uint8_t *)&ng, sizeof(ng));        
+        SendCommandNG(CMD_T55XX_WRITE_BLOCK, (uint8_t *)&ng, sizeof(ng));
         if (!WaitForResponseTimeout(CMD_T55XX_WRITE_BLOCK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
             return -1;

From b55e8126534cf618f790873147d3df731d8b946c Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 20 May 2019 10:55:42 -0400
Subject: [PATCH 1770/1938] chg: ignore makefile.platform

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index d002b5ac1..32f879cc7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,9 @@
 version.c
 *.json
 
+# new build file for add-ons.
+Makefile.platform
+
 !client/hardnested/*.bin
 !client/hardnested/tables/*.z
 client/ui/ui_overlays.h

From cbc42336d6245c418486813eb47c08fb64bb3b3d Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 20 May 2019 15:24:47 -0400
Subject: [PATCH 1771/1938] fix: lf nedap sim - error when adding parity

---
 client/cmdlfnedap.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/client/cmdlfnedap.c b/client/cmdlfnedap.c
index 22a9b011e..028ed57fa 100644
--- a/client/cmdlfnedap.c
+++ b/client/cmdlfnedap.c
@@ -381,13 +381,8 @@ int getNedapBits(uint32_t cn, uint8_t *nedapBits) {
     num_to_bytebits((0 >> 0) & 0xFF, 8, pre + 110);
     num_to_bytebits((0 >> 8) & 0xFF, 8, pre + 119);
 
-
-    // add paritybits (bitsource, dest, sourcelen, paritylen, parityType (odd, even,)
-    addParity(pre, pre + 64, 64, 8, 1);
-    addParity(pre + 64, pre + 64, 64, 8, 1);
-
-    pre[63] = GetParity(DemodBuffer, EVEN, 63);
-    pre[127] = GetParity(DemodBuffer + 64, EVEN, 63);
+    pre[63] = GetParity(pre, EVEN, 63);
+    pre[127] = GetParity(pre + 64, EVEN, 63);
 
     memcpy(nedapBits, pre, 128);
 

From fe6cbfc8fdb12cb0aacdb3142feb459041ff6433 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Mon, 20 May 2019 21:37:50 +0200
Subject: [PATCH 1772/1938] baudrates & btfactory

---
 client/cmdusart.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/client/cmdusart.c b/client/cmdusart.c
index 75d00d24c..8d685f420 100644
--- a/client/cmdusart.c
+++ b/client/cmdusart.c
@@ -271,6 +271,9 @@ static int usart_bt_testcomm(uint32_t baudrate, uint8_t parity) {
 }
 
 static int CmdUsartBtFactory(const char *Cmd) {
+// take care to define compatible settings:
+# define BTADDON_BAUD_AT  "AT+BAUD8"
+# define BTADDON_BAUD_NUM "115200"
     uint8_t cmdp = 0;
     bool errors = false;
     uint32_t baudrate = 0;
@@ -291,6 +294,12 @@ static int CmdUsartBtFactory(const char *Cmd) {
         return PM3_EINVARG;
     }
 
+    if (USART_BAUD_RATE != atoi(BTADDON_BAUD_NUM)) {
+        PrintAndLogEx(WARNING, _RED_("WARNING:") "current Proxmark3 firmware has default USART baudrate = %i", USART_BAUD_RATE);
+        PrintAndLogEx(WARNING, "Current btfactory implementation is hardcoded to " BTADDON_BAUD_NUM " bauds");
+        return PM3_ENOTIMPL;
+    }
+
     PrintAndLogEx(WARNING, _RED_("WARNING: process only if strictly needed!"));
     PrintAndLogEx(WARNING, "This requires BT turned ON and NOT connected!");
     PrintAndLogEx(WARNING, "Is the add-on blue light blinking? (Say 'n' if you want to abort) [y/n]");
@@ -413,14 +422,14 @@ static int CmdUsartBtFactory(const char *Cmd) {
     if (baudrate != USART_BAUD_RATE) {
         memset(data, 0, sizeof(data));
         len = 0;
-        string = "AT+BAUD8";
+        string = BTADDON_BAUD_AT;
         PrintAndLogEx(SUCCESS, "TX (%3u):%.*s", strlen(string), strlen(string), string);
 
         ret = usart_txrx((uint8_t *)string, strlen(string), data, &len, 1000);
         if (ret == PM3_SUCCESS) {
             PrintAndLogEx(SUCCESS, "RX (%3u):%.*s", len, len, data);
-            if (strcmp((char *)data, "OK115200") == 0) {
-                PrintAndLogEx(SUCCESS, "Baudrate set to " _GREEN_("115200"));
+            if (strcmp((char *)data, "OK" BTADDON_BAUD_NUM) == 0) {
+                PrintAndLogEx(SUCCESS, "Baudrate set to " _GREEN_(BTADDON_BAUD_NUM));
             } else {
                 PrintAndLogEx(WARNING, "Unexpected response to AT+BAUD: " _YELLOW_("%.*s"), len, data);
             }

From 325825d4a831c3e4d49862ef08d7cc30d6df15d4 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 21 May 2019 00:40:11 +0200
Subject: [PATCH 1773/1938] hc06 scripts

---
 doc/uart_notes.md                |   7 +-
 tools/btaddon/hc06_console_AT.py |  45 +++++++++++++
 tools/btaddon/hc06_factory.py    | 108 +++++++++++++++++++++++++++++++
 3 files changed, 155 insertions(+), 5 deletions(-)
 create mode 100755 tools/btaddon/hc06_console_AT.py
 create mode 100755 tools/btaddon/hc06_factory.py

diff --git a/doc/uart_notes.md b/doc/uart_notes.md
index 1b82617d0..33e661747 100644
--- a/doc/uart_notes.md
+++ b/doc/uart_notes.md
@@ -114,9 +114,7 @@ The USB-UART speed is selected when a program opens the port. E.g.
 
 When the BT add-on is turned off, the HC-06 dongle will not be connected and will fall back into its AT configuration mode (its LED is blinking).
 
-`tools/btaddon/hc06_factory_master.py` changes several times the USB-UART baudrate and parity till it matches the HC-06 dongle settings, then changes the baudrate and parity of the dongle to a default value. (`hc06_factory.py` does more but we're only interested in baudrate in this discussion)
-
-TODO tools/btaddon/hc06_factory_master.py
+`tools/btaddon/hc06_factory.py` changes several times the USB-UART baudrate and parity till it matches the HC-06 dongle settings, then changes the baudrate and parity of the dongle to a default value. (`hc06_factory.py` does more but we're only interested in baudrate in this discussion)
 
 ## Proxmark3 FPC USART + FTDI
 
@@ -147,6 +145,5 @@ Add-on gets powered externally via the "battery" pin.
 
 Turn BTpower switch ON, leave Battery switch OFF
 
-Use e.g. `tools/btaddon/hc06_factory_slave.py`
+Use e.g. `tools/btaddon/hc06_factory.py` with `role = b'S'`
 
-TODO tools/btaddon/hc06_factory_slave.py
diff --git a/tools/btaddon/hc06_console_AT.py b/tools/btaddon/hc06_console_AT.py
new file mode 100755
index 000000000..d6405ebec
--- /dev/null
+++ b/tools/btaddon/hc06_console_AT.py
@@ -0,0 +1,45 @@
+#!/usr/bin/env python3
+
+import sys
+import time
+import serial
+
+if len(sys.argv) < 2:
+    print('Usage: %s <baudrate>' % sys.argv[0])
+    sys.exit(1)
+baudrate = int(sys.argv[1])
+ser = serial.Serial(
+    port='/dev/ttyUSB0',
+    baudrate=baudrate,
+    parity=serial.PARITY_NONE,
+    stopbits=serial.STOPBITS_ONE,
+    bytesize=serial.EIGHTBITS
+)
+
+ser.isOpen()
+ser.write(b'AT')
+out = b''
+time.sleep(1)
+while ser.inWaiting() > 0:
+    out += ser.read(1)
+if out != b'OK':
+    ser.close()
+    print("HC-06 dongle not found. Abort.")
+    exit(1)
+print('Enter your commands below.\r\nInsert "exit" to leave the application.')
+
+while 1 :
+    # get keyboard input
+    inp = input(">> ")
+    inp = inp.encode('utf8')
+    if inp == 'exit':
+        ser.close()
+        exit()
+    else:
+        ser.write(inp)
+        out = b''
+        time.sleep(1)
+        while ser.inWaiting() > 0:
+            out += ser.read(1)
+        if out != b'':
+            print("<< " + out.decode('utf8'))
diff --git a/tools/btaddon/hc06_factory.py b/tools/btaddon/hc06_factory.py
new file mode 100755
index 000000000..e4e460289
--- /dev/null
+++ b/tools/btaddon/hc06_factory.py
@@ -0,0 +1,108 @@
+#!/usr/bin/env python3
+
+import time
+import serial
+
+name = b'PM3_RDV4.0'
+pin  = b'1234'
+role = b'M'
+#role = b'S'
+
+ser = None
+
+baud2id = {
+       9600:b'4',
+      19200:b'5',
+      38400:b'6',
+      57600:b'7',
+     115200:b'8',
+     230400:b'9',
+     460800:b'A',
+     921600:b'B',
+    1382400:b'C'
+}
+
+p2c={
+    serial.PARITY_NONE:b'N',
+    serial.PARITY_ODD: b'O',
+    serial.PARITY_EVEN:b'E'
+}
+
+def send(cmd):
+    print("<<" + cmd.decode('utf8'))
+    ser.write(cmd)
+    out = b''
+    time.sleep(1)
+    while ser.inWaiting() > 0:
+        out += ser.read(1)
+    if out != b'':
+        print(">>" + out.decode('utf8'))
+    return out
+
+def usart_bt_testcomm(baudrate, parity):
+    print("Configuring UART: %i 8%s1" % (baudrate, p2c[parity].decode('utf8')))
+    global ser
+    ser = serial.Serial(
+        port='/dev/ttyUSB0',
+        baudrate=baudrate,
+        parity=parity,
+        stopbits=serial.STOPBITS_ONE,
+        bytesize=serial.EIGHTBITS
+    )
+    ser.isOpen()
+    resp=send(b'AT')
+    if resp != b'OK':
+        ser.close()
+    return resp == b'OK'
+
+if __name__ == '__main__':
+    print("WARNING: process only if strictly needed!")
+    print("This requires HC-06 dongle turned ON and NOT connected!")
+    if input("Is the HC-06 dingle LED blinking? (Say 'n' if you want to abort) [y/n] ") != 'y':
+        print("Aborting.")
+        exit(1)
+
+    print("\nTrying to detect current settings... Please be patient.")
+
+    if not usart_bt_testcomm(115200, serial.PARITY_NONE):
+        brs = [1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400, 460800, 921600, 1382400]
+        ps = [ serial.PARITY_NONE, serial.PARITY_ODD, serial.PARITY_EVEN ]
+        ibr = 0
+        ip = 0
+        for p, b in [(i, j) for i in ps for j in brs]:
+            if usart_bt_testcomm(b, p):
+                break
+        else:
+            print("Sorry, add-on not found. Abort.")
+            exit(1)
+
+    print("Reconfiguring add-on to default settings.")
+
+    resp=send(b'AT+VERSION')
+# Change name:
+    resp=send(b'AT+NAME%s' % name)
+# Change BT PIN:
+    resp=send(b'AT+PIN%s' % pin)
+# Change BT ROLE:
+    resp=send(b'AT+ROLE=%s' % role)
+# Change BT Parity N:
+    resp=send(b'AT+PN')
+# Change BT 115200:
+    resp=send(b'AT+BAUD%s' % baud2id[115200])
+    ser.close()
+
+    time.sleep(1)
+    print("Trying to connect add-on with the new settings.")
+    ser = serial.Serial(
+        port='/dev/ttyUSB0',
+        baudrate=115200,
+        parity=serial.PARITY_NONE,
+        stopbits=serial.STOPBITS_ONE,
+        bytesize=serial.EIGHTBITS
+    )
+    ser.isOpen()
+    if (send(b'AT') == b'OK'):
+        print("HC-06 dongle successfully reset")
+    else:
+        print("Lost contact with add-on, please try again")
+    ser.close()

From e463be64e0c5bc369144401a97d41ef949b2d6b4 Mon Sep 17 00:00:00 2001
From: Iceman <iceman@iuse.se>
Date: Tue, 21 May 2019 09:38:44 +0200
Subject: [PATCH 1774/1938] added AT commandlist for HC-06

---
 doc/uart_notes.md | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/doc/uart_notes.md b/doc/uart_notes.md
index 33e661747..48e01e2d0 100644
--- a/doc/uart_notes.md
+++ b/doc/uart_notes.md
@@ -147,3 +147,33 @@ Turn BTpower switch ON, leave Battery switch OFF
 
 Use e.g. `tools/btaddon/hc06_factory.py` with `role = b'S'`
 
+## HC-06 AT Commands
+
+The HC-06 supports a subset of the AT commands and they are listed below. The commands are limited and varies in how to give parameters. A pure informatative command like AT+VERSION just returns a string with current firmware the HC-06 has installed.
+The BAUD/PIN/NAME/P/LED commands takes its parameter direct after the command. 
+ 
+ AT+BAUD8
+ CCCCCCCP
+
+ where AT+BAUD is the command part and 8 is the parameter.  The 8 indicates a baudrate of 11520.
+ 
+ AT+ROLE=S
+ CCCCCCCPP
+ 
+where AT+ROLE uses a equal sign to denote the parameter. 
+
+```
+AT+VERSION    -- prints firmware version
+AT+BAUD8      -- set baudrate 115200
+AT+PIN1234    -- set PINCODE to 1234. (must be numbers)
+AT+NAMEpm3    -- set devicename to `pm3`
+AT+ROLE=S     -- set device role to `slave`
+AT+ROLE=M     -- set device role to `master`
+AT+LED0       -- turn LED off
+AT+LED1       -- turn LED on
+AT+PN         -- set NO partiy
+AT+PE         -- set EVEN parity
+AT+PO         -- set ODD parity
+```
+
+We recommend you use the scripts when trying to set these parameters.

From fa55aed4eed3fd067458ee572f42d7a7364d5394 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 21 May 2019 22:22:32 +0200
Subject: [PATCH 1775/1938] text

---
 doc/uart_notes.md | 51 +++++++++++++++++++++++++----------------------
 1 file changed, 27 insertions(+), 24 deletions(-)

diff --git a/doc/uart_notes.md b/doc/uart_notes.md
index 48e01e2d0..7b5c3af61 100644
--- a/doc/uart_notes.md
+++ b/doc/uart_notes.md
@@ -149,31 +149,34 @@ Use e.g. `tools/btaddon/hc06_factory.py` with `role = b'S'`
 
 ## HC-06 AT Commands
 
-The HC-06 supports a subset of the AT commands and they are listed below. The commands are limited and varies in how to give parameters. A pure informatative command like AT+VERSION just returns a string with current firmware the HC-06 has installed.
-The BAUD/PIN/NAME/P/LED commands takes its parameter direct after the command. 
- 
- AT+BAUD8
- CCCCCCCP
+The HC-06 supports a subset of the AT commands and they are listed below. The commands are limited and vary in how to give parameters. A pure informative command like AT+VERSION just returns a string with current firmware the HC-06 has installed.
 
- where AT+BAUD is the command part and 8 is the parameter.  The 8 indicates a baudrate of 11520.
+The BAUD/PIN/NAME/P/LED commands take their parameter directly after the command. E.g.:
  
- AT+ROLE=S
- CCCCCCCPP
- 
-where AT+ROLE uses a equal sign to denote the parameter. 
+    AT+BAUD8
+           ^   parameter
+       ^^^^    command
 
-```
-AT+VERSION    -- prints firmware version
-AT+BAUD8      -- set baudrate 115200
-AT+PIN1234    -- set PINCODE to 1234. (must be numbers)
-AT+NAMEpm3    -- set devicename to `pm3`
-AT+ROLE=S     -- set device role to `slave`
-AT+ROLE=M     -- set device role to `master`
-AT+LED0       -- turn LED off
-AT+LED1       -- turn LED on
-AT+PN         -- set NO partiy
-AT+PE         -- set EVEN parity
-AT+PO         -- set ODD parity
-```
+The "8" indicates a baudrate of 115200.
 
-We recommend you use the scripts when trying to set these parameters.
+The ROLE command takes its parameter after an equal sign:
+
+    AT+ROLE=S
+            ^  parameter
+       ^^^^    command
+
+|Command            |Description                                           |Reply         |
+|-------------------|------------------------------------------------------|--------------|
+|`AT+VERSION`       |print firmware version                                |`hc01.comV2.0`|
+|`AT+BAUD8`         |set baudrate to 115200                                |`OK115200`    |
+|`AT+PIN1234`       |set PINCODE to 1234. (must be numbers)                |`OKsetPIN`    |
+|`AT+NAMEPM3_RDV4.0`|set device name (as shown to BT hosts) to `PM3_RDV4.0`|`OKsetname`   |
+|`AT+ROLE=S`        |set device role to *slave*                            |`OK+ROLE:S`   |
+|`AT+ROLE=M`        |set device role to *master*                           |`OK+ROLE:M`   |
+|`AT+LED0`          |turn LED off                                          |`LED OFF`     |
+|`AT+LED1`          |turn LED on                                           |`LED ON`      |
+|`AT+PN`            |set NO parity                                         |`OK None`     |
+|`AT+PE`            |set EVEN parity                                       |`OK Even`     |
+|`AT+PO`            |set ODD parity                                        |`OK Odd`      |
+
+We recommend you to use the scripts when trying to set these parameters.

From 272f501ed76718d3d05cc5a86e7df5f382988df8 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 21 May 2019 23:01:07 +0200
Subject: [PATCH 1776/1938] uart note on master

---
 doc/uart_notes.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/uart_notes.md b/doc/uart_notes.md
index 7b5c3af61..1490f85d1 100644
--- a/doc/uart_notes.md
+++ b/doc/uart_notes.md
@@ -180,3 +180,5 @@ The ROLE command takes its parameter after an equal sign:
 |`AT+PO`            |set ODD parity                                        |`OK Odd`      |
 
 We recommend you to use the scripts when trying to set these parameters.
+
+We've noticed that the HC-06 in Master mode doesn't always reply properly to the commands, especially to AT+VERSION. If you have such a problem, temporarily switch it to Slave mode, power cycle it and send again AT+VERSION.

From e22be4b47ba00d9cf43a234dca1eb44e73643f59 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 22 May 2019 00:05:19 +0200
Subject: [PATCH 1777/1938] uart high speed tested

---
 doc/uart_notes.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/uart_notes.md b/doc/uart_notes.md
index 1490f85d1..d074bddc8 100644
--- a/doc/uart_notes.md
+++ b/doc/uart_notes.md
@@ -37,7 +37,7 @@ This USART can be reached from the host client (if connected via USB-CDC) throug
 So, `usart config` changes the Proxmark3 USART baudrate and parity, while e.g. `usart txrx d AT+Px` and `usart txrx d AT+BAUDx` changes the BT add-on parity and baudrate.
 And for things to work fine, both sets have to match!
 
-Internally, the desired baudrate is converted to UART settings: a BRGR and a FP. The resulting baudrate will be close to but not always equal to the desired baudrate. Serial ports typically have some error tolerance in the actual baudrates. Theoretically < 2.5% on each side (so 5% in total), < 2% to be on the safe side. In the current firmware configuration, the Proxmark3 can provide any baudrate up to 2Mbauds with an error of max 2%, and selected baudrates up to 6Mbauds. TODO to be tested.
+Internally, the desired baudrate is converted to UART settings: a BRGR and a FP. The resulting baudrate will be close to but not always equal to the desired baudrate. Serial ports typically have some error tolerance in the actual baudrates. Theoretically < 2.5% on each side (so 5% in total), < 2% to be on the safe side. In the current firmware configuration, the Proxmark3 can provide any baudrate up to 2Mbauds with an error of max 2%, and selected baudrates up to 6Mbauds (tested with a FTDI C232HM DDHSL-0 cable).
 
 ## Proxmark3 FPC USART + BT add-on (blue shark)
 

From 13b461cab222be4d83d313ef99fc5c6d58ffcb4b Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 22 May 2019 00:06:51 +0200
Subject: [PATCH 1778/1938] usart txrx: wait reply depends on rx waittime

---
 client/cmdusart.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdusart.c b/client/cmdusart.c
index 8d685f420..7da6d1298 100644
--- a/client/cmdusart.c
+++ b/client/cmdusart.c
@@ -173,7 +173,7 @@ static int usart_txrx(uint8_t *srcdata, size_t srclen, uint8_t *dstdata, size_t
     memcpy(payload.data, srcdata, srclen);
     SendCommandNG(CMD_USART_TXRX, (uint8_t *)&payload, srclen + sizeof(payload.waittime));
     PacketResponseNG resp;
-    if (!WaitForResponseTimeout(CMD_USART_TXRX, &resp, 1000)) {
+    if (!WaitForResponseTimeout(CMD_USART_TXRX, &resp, waittime + 500)) {
         return PM3_ETIMEOUT;
     }
     if (resp.status == PM3_SUCCESS) {

From 69bab29834cbc63007acfa18a20793bfd9871788 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 22 May 2019 05:58:16 -0400
Subject: [PATCH 1779/1938] chg: params

---
 client/graph.c | 12 +++++++-----
 client/graph.h |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/client/graph.c b/client/graph.c
index d2a816125..363dd0d61 100644
--- a/client/graph.c
+++ b/client/graph.c
@@ -16,13 +16,15 @@ int s_Buff[MAX_GRAPH_TRACE_LEN];
 /* write a manchester bit to the graph
 TODO,  verfy that this doesn't overflow buffer  (iceman)
 */
-void AppendGraph(bool redraw, int clock, int bit) {
-    int i;
+void AppendGraph(bool redraw, uint16_t clock, int bit) {
+    uint8_t half = clock / 2;
+    uint8_t i;
     //set first half the clock bit (all 1's or 0's for a 0 or 1 bit)
-    for (i = 0; i < (int)(clock / 2); ++i)
-        GraphBuffer[GraphTraceLen++] = bit ;
+    for (i = 0; i < half; ++i)
+        GraphBuffer[GraphTraceLen++] = bit;
+
     //set second half of the clock bit (all 0's or 1's for a 0 or 1 bit)
-    for (i = (int)(clock / 2); i < clock; ++i)
+    for (; i < clock; ++i)
         GraphBuffer[GraphTraceLen++] = bit ^ 1;
 
     if (redraw)
diff --git a/client/graph.h b/client/graph.h
index accd64de8..2733bf475 100644
--- a/client/graph.h
+++ b/client/graph.h
@@ -18,7 +18,7 @@
 #include "lfdemod.h"
 #include "cmddata.h" //for g_debugmode
 
-void AppendGraph(bool redraw, int clock, int bit);
+void AppendGraph(bool redraw, uint16_t clock, int bit);
 size_t ClearGraph(bool redraw);
 size_t getFromGraphBuf(uint8_t *buff);
 int GetAskClock(const char *str, bool printAns);

From 94487552407b2460f266927e60317e900c6dcb4f Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 22 May 2019 05:58:48 -0400
Subject: [PATCH 1780/1938] chg: not fatal

---
 armsrc/mifarecmd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index df041683f..c4f0ae3df 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -2008,7 +2008,7 @@ void MifareSetMod(uint8_t *datain) {
     uint64_t ui64Key = bytes_to_num(datain + 1, 6);
 
     // variables
-    uint16_t isOK = PM3_EFATAL;
+    uint16_t isOK = PM3_EUNDEF;
     uint8_t uid[10] = {0};
     uint32_t cuid = 0;
     struct Crypto1State mpcs = {0, 0};

From 750739efe4e1d2b643e7bec6a1c2ec08c86b5fbd Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 22 May 2019 05:59:43 -0400
Subject: [PATCH 1781/1938] chg: not fatal

---
 client/cmdusart.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/client/cmdusart.c b/client/cmdusart.c
index 7da6d1298..e5261c79c 100644
--- a/client/cmdusart.c
+++ b/client/cmdusart.c
@@ -337,7 +337,7 @@ static int CmdUsartBtFactory(const char *Cmd) {
 
     if (!found) {
         PrintAndLogEx(FAILED, "Sorry, add-on not found. Abort.");
-        return PM3_EFATAL;
+        return PM3_ESOFT;
     }
 
     PrintAndLogEx(INFO, "Reconfiguring add-on to default settings.");
@@ -359,7 +359,7 @@ static int CmdUsartBtFactory(const char *Cmd) {
         }
     } else {
         PrintAndLogEx(WARNING, "Lost contact with add-on, please try again");
-        return PM3_EFATAL;
+        return PM3_ESOFT;
     }
 
     memset(data, 0, sizeof(data));
@@ -377,7 +377,7 @@ static int CmdUsartBtFactory(const char *Cmd) {
         }
     } else {
         PrintAndLogEx(WARNING, "Lost contact with add-on, please try again");
-        return PM3_EFATAL;
+        return PM3_ESOFT;
     }
 
     memset(data, 0, sizeof(data));
@@ -395,7 +395,7 @@ static int CmdUsartBtFactory(const char *Cmd) {
         }
     } else {
         PrintAndLogEx(WARNING, "Lost contact with add-on, please try again");
-        return PM3_EFATAL;
+        return PM3_ESOFT;
     }
 
     // parity must be changed before baudrate
@@ -415,7 +415,7 @@ static int CmdUsartBtFactory(const char *Cmd) {
             }
         } else {
             PrintAndLogEx(WARNING, "Lost contact with add-on, please try again");
-            return PM3_EFATAL;
+            return PM3_ESOFT;
         }
     }
 
@@ -435,7 +435,7 @@ static int CmdUsartBtFactory(const char *Cmd) {
             }
         } else {
             PrintAndLogEx(WARNING, "Lost contact with add-on, please try again");
-            return PM3_EFATAL;
+            return PM3_ESOFT;
         }
     }
 
@@ -451,7 +451,7 @@ static int CmdUsartBtFactory(const char *Cmd) {
         found = usart_bt_testcomm(USART_BAUD_RATE, USART_PARITY) == PM3_SUCCESS;
         if (!found) {
             PrintAndLogEx(WARNING, "Lost contact with add-on, please try again");
-            return PM3_EFATAL;
+            return PM3_ESOFT;
         }
     }
 

From a1db12bcaedaf76e1ad0ad74f10fa9d486f0cd10 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 22 May 2019 06:01:27 -0400
Subject: [PATCH 1782/1938] chg: info

---
 common/lfdemod.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/lfdemod.c b/common/lfdemod.c
index 9ff28f4d5..a581198fa 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -1466,15 +1466,15 @@ static int cleanAskRawDemod(uint8_t *bits, size_t *size, int clk, int invert, in
         } else { //transition
             if ((bits[i] >= high && !waveHigh) || (bits[i] <= low && waveHigh)) {
 
-                // 8  ::   8-2-1 =  5   8+2+1 = 11
-                // 16 ::  16-4-1 = 11  16+4+1 = 21
-                // 32 ::  32-8-1 = 23  32+8+1 = 41
-
+                // 8  ::    8-2-1 =  5   8+2+1 = 11
+                // 16 ::   16-4-1 = 11  16+4+1 = 21
+                // 32 ::   32-8-1 = 23  32+8+1 = 41
+                // 64 ::  64-16-1 = 47 64+16+1 = 81
                 if (smplCnt > clk - cl_4 - 1) { //full clock
 
                     if (smplCnt > clk + cl_4 + 1) { //too many samples
                         errCnt++;
-                        if (g_debugMode == 2) prnt("DEBUG ASK: cleanAskRawDemod ASK Modulation Error FULL at: %u  [%u]", i, smplCnt);
+                        if (g_debugMode == 2) prnt("DEBUG ASK: cleanAskRawDemod ASK Modulation Error FULL at: %u  [%u > %u]", i, smplCnt, clk + cl_4 + 1);
                         bits[bitCnt++] = 7;
                     } else if (waveHigh) {
                         bits[bitCnt++] = invert;

From ad394a2d6bec42d22a0097b70bec47e4ac523c99 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 22 May 2019 08:32:30 -0400
Subject: [PATCH 1783/1938] chg: lf em 410x_sim - reworked to NG\n chg: lf em
 410x_demod - now can demod the simulation data.

---
 armsrc/appmain.c        |  38 +++++++---
 client/cmdlf.c          |  67 ++++++++++++-----
 client/cmdlfem4x.c      | 155 ++++++++++++++++++++++++----------------
 client/cmdlfindala.c    |  24 +++----
 client/cmdlfkeri.c      |  18 ++---
 client/cmdlfnexwatch.c  |  10 +--
 client/cmdlfnoralsy.c   |  37 +++++-----
 client/cmdlfpresco.c    |  21 +++---
 client/cmdlfsecurakey.c |  16 +++--
 client/cmdlft55xx.c     |  34 ++++-----
 client/cmdlfvisa2000.c  |  28 ++++----
 11 files changed, 271 insertions(+), 177 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 6a9c8404a..a75434d4d 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -822,7 +822,14 @@ static void PacketReceived(PacketCommandNG *packet) {
             break;
         case CMD_SIMULATE_TAG_125K:
             LED_A_ON();
-            SimulateTagLowFrequency(packet->oldarg[0], packet->oldarg[1], 1);
+            struct p {
+                uint16_t len;
+                uint16_t gap;
+            } PACKED;
+            struct p *payload;
+            payload = (struct p*)packet->data.asBytes;
+            // length, start gap, led control
+            SimulateTagLowFrequency(payload->len, payload->gap, 1);
             reply_ng(CMD_SIMULATE_TAG_125K, PM3_EOPABORTED, NULL, 0);
             LED_A_OFF();
             break;
@@ -1339,17 +1346,32 @@ static void PacketReceived(PacketCommandNG *packet) {
         case CMD_UPLOAD_SIM_SAMPLES_125K: {
             // iceman; since changing fpga_bitstreams clears bigbuff, Its better to call it before.
             // to be able to use this one for uploading data to device
-            // arg1 = 0 upload for LF usage
+            // flag = 
+            //    b0  0 upload for LF usage 
             //        1 upload for HF usage
-#define FPGA_LF 1
-            if (packet->oldarg[1] == FPGA_LF)
-                FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-            else
+            //    b1  0 skip
+            //        1 clear bigbuff
+            struct p {
+                uint8_t flag;
+                uint16_t offset;
+                uint8_t *data;
+            };
+            struct p* payload = (struct p*)packet->data.asBytes;
+
+
+            if ((payload->flag & 0x1) == 0x1)
                 FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
+            else
+                FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
+            
+            if ((payload->flag & 0x2) == 0x2) {
+                BigBuf_Clear_ext(false);
+                BigBuf_free();
+            }
 
             uint8_t *mem = BigBuf_get_addr();
-            memcpy(mem + packet->oldarg[0], packet->data.asBytes, PM3_CMD_DATA_SIZE);
-            reply_old(CMD_ACK, 1, 0, 0, 0, 0);
+            memcpy(mem + payload->offset, &payload->data, PM3_CMD_DATA_SIZE - 3);    
+            reply_ng(CMD_UPLOAD_SIM_SAMPLES_125K, PM3_SUCCESS, NULL, 0);
             break;
         }
 #endif
diff --git a/client/cmdlf.c b/client/cmdlf.c
index 440560513..c67c0f150 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -48,7 +48,7 @@ static int usage_lf_sniff(void) {
 
     PrintAndLogEx(NORMAL, "Usage: lf sniff [h]");
     PrintAndLogEx(NORMAL, "Options:");
-    PrintAndLogEx(NORMAL, "      h         This help");
+    PrintAndLogEx(NORMAL, "       h         This help");
     return 0;
 }
 static int usage_lf_config(void) {
@@ -427,11 +427,12 @@ int CmdLFSniff(const char *Cmd) {
     return 0;
 }
 
-static void ChkBitstream(const char *str) {
+static void ChkBitstream() {
     // convert to bitstream if necessary
     for (int i = 0; i < (int)(GraphTraceLen / 2); i++) {
         if (GraphBuffer[i] > 1 || GraphBuffer[i] < 0) {
             CmdGetBitStream("");
+	    PrintAndLogEx(INFO, " called cmdgetbitstream");
             break;
         }
     }
@@ -442,36 +443,68 @@ int CmdLFSim(const char *Cmd) {
 #define FPGA_LF 1
 #define FPGA_HF 2
 
-    int gap = 0;
-    sscanf(Cmd, "%i", &gap);
+    uint16_t gap = param_get32ex(Cmd, 0, 0, 10) & 0xFFFF;
 
     // convert to bitstream if necessary
-    ChkBitstream(Cmd);
+    ChkBitstream();
 
-    PrintAndLogEx(DEBUG, "DEBUG: Sending [%d bytes]\n", GraphTraceLen);
+    PrintAndLogEx(DEBUG, "DEBUG: Uploading %d bytes", GraphTraceLen);
+
+    struct pupload {
+        uint8_t flag;
+        uint16_t offset;
+        uint8_t data[PM3_CMD_DATA_SIZE - 3];
+    } PACKED;
+    struct pupload payload_up;
+
+    // flag = 
+    //    b0  0 upload for LF usage 
+    //        1 upload for HF usage
+    //    b1  0 skip
+    //        1 clear bigbuff
+    payload_up.flag |= 0x2;
 
     // fast push mode
     conn.block_after_ACK = true;
 
     //can send only 512 bits at a time (1 byte sent per bit...)
-    for (uint16_t i = 0; i < GraphTraceLen; i += PM3_CMD_DATA_SIZE) {
+    for (uint16_t i = 0; i < GraphTraceLen; i += PM3_CMD_DATA_SIZE - 3) {
+
+        size_t len = MIN((GraphTraceLen - i), PM3_CMD_DATA_SIZE - 3);
         clearCommandBuffer();
-        SendCommandOLD(CMD_UPLOAD_SIM_SAMPLES_125K, i, FPGA_LF, 0, &GraphBuffer[i], PM3_CMD_DATA_SIZE);
-        WaitForResponse(CMD_ACK, NULL);
+        payload_up.offset = i;
+
+        for(uint16_t j = 0; j < len; j++)
+            payload_up.data[j] = GraphBuffer[i+j];
+
+        SendCommandNG(CMD_UPLOAD_SIM_SAMPLES_125K, (uint8_t *)&payload_up, sizeof(struct pupload));
+        WaitForResponse(CMD_UPLOAD_SIM_SAMPLES_125K, NULL);
         printf(".");
         fflush(stdout);
+
+        payload_up.flag = 0;
     }
-    printf("\n");
 
     // Disable fast mode before last command
     conn.block_after_ACK = false;
 
-    PrintAndLogEx(NORMAL, "Simulating");
+    PrintAndLogEx(INFO, "\nSimulating");
+
+    struct p {
+        uint16_t len;
+        uint16_t gap;
+    } PACKED;
+    struct p payload;
+    payload.len = GraphTraceLen;
+    payload.gap = gap;	
 
     clearCommandBuffer();
-    SendCommandMIX(CMD_SIMULATE_TAG_125K, GraphTraceLen, gap, 0, NULL, 0);
+    SendCommandNG(CMD_SIMULATE_TAG_125K, (uint8_t *)&payload, sizeof(payload));
+
     PacketResponseNG resp;
     WaitForResponse(CMD_SIMULATE_TAG_125K, &resp);
+
+    PrintAndLogEx(INFO, "Done");
     if (resp.status != PM3_EOPABORTED)
         return resp.status;
     return PM3_SUCCESS;
@@ -966,20 +999,20 @@ int CmdLFfind(const char *Cmd) {
 
         //fsk
         if (GetFskClock("", false)) {
-            if (FSKrawDemod("", true)) {
+            if (FSKrawDemod("", true) == PM3_SUCCESS) {
                 PrintAndLogEx(NORMAL, "\nUnknown FSK Modulated Tag found!");
                 goto out;
             }
         }
 
         bool st = true;
-        if (ASKDemod_ext("0 0 0", true, false, 1, &st)) {
+        if (ASKDemod_ext("0 0 0", true, false, 1, &st) == PM3_SUCCESS) {
             PrintAndLogEx(NORMAL, "\nUnknown ASK Modulated and Manchester encoded Tag found!");
             PrintAndLogEx(NORMAL, "if it does not look right it could instead be ASK/Biphase - try " _YELLOW_("'data rawdemod ab'"));
             goto out;
         }
 
-        if (CmdPSK1rawDemod("")) {
+        if (CmdPSK1rawDemod("") == PM3_SUCCESS) {
             PrintAndLogEx(NORMAL, "Possible unknown PSK1 Modulated Tag found above!");
             PrintAndLogEx(NORMAL, "    Could also be PSK2 - try " _YELLOW_("'data rawdemod p2'"));
             PrintAndLogEx(NORMAL, "    Could also be PSK3 - [currently not supported]");
@@ -992,7 +1025,7 @@ int CmdLFfind(const char *Cmd) {
 out:
     // identify chipset
     CheckChipType(isOnline);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static command_t CommandTable[] = {
@@ -1044,5 +1077,5 @@ int CmdLF(const char *Cmd) {
 int CmdHelp(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
-    return 0;
+    return PM3_SUCCESS;
 }
diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 35d486fc8..1823c343d 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -29,7 +29,7 @@ static int usage_lf_em410x_demod(void) {
     PrintAndLogEx(NORMAL, "           lf em 410x_demod 32 1   = demod an EM410x Tag ID from GraphBuffer using a clock of RF/32 and inverting data");
     PrintAndLogEx(NORMAL, "           lf em 410x_demod 1      = demod an EM410x Tag ID from GraphBuffer while inverting data");
     PrintAndLogEx(NORMAL, "           lf em 410x_demod 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;
+    return PM3_SUCCESS;
 }
 static int usage_lf_em410x_write(void) {
     PrintAndLogEx(NORMAL, "Writes EM410x ID to a T55x7 / T5555 (Q5) tag");
@@ -42,7 +42,7 @@ static int usage_lf_em410x_write(void) {
     PrintAndLogEx(NORMAL, "       <clock>   - 16|32|40|64, optional, set R/F clock rate, defaults to 64");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "      lf em 410x_write 0F0368568B 1       = write ID to t55x7 card");
-    return 0;
+    return PM3_SUCCESS;
 }
 static int usage_lf_em410x_ws(void) {
     PrintAndLogEx(NORMAL, "Watch 'nd Spoof, activates reader, waits until a EM410x tag gets presented then it starts simulating the found UID");
@@ -52,7 +52,7 @@ static int usage_lf_em410x_ws(void) {
     PrintAndLogEx(NORMAL, "       h         - this help");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "      lf em 410x_spoof");
-    return 0;
+    return PM3_SUCCESS;
 }
 static int usage_lf_em410x_sim(void) {
     PrintAndLogEx(NORMAL, "Simulating EM410x tag");
@@ -65,7 +65,7 @@ static int usage_lf_em410x_sim(void) {
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "      lf em 410x_sim 0F0368568B");
     PrintAndLogEx(NORMAL, "      lf em 410x_sim 0F0368568B 32");
-    return 0;
+    return PM3_SUCCESS;
 }
 static int usage_lf_em410x_brute(void) {
     PrintAndLogEx(NORMAL, "Bruteforcing by emulating EM410x tag");
@@ -81,7 +81,7 @@ static int usage_lf_em410x_brute(void) {
     PrintAndLogEx(NORMAL, "      lf em 410x_brute ids.txt c 32");
     PrintAndLogEx(NORMAL, "      lf em 410x_brute ids.txt d 3000");
     PrintAndLogEx(NORMAL, "      lf em 410x_brute ids.txt d 3000 c 32");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 //////////////// 4050 / 4450 commands
@@ -95,7 +95,7 @@ static int usage_lf_em4x50_dump(void) {
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "      lf em 4x50_dump");
     PrintAndLogEx(NORMAL, "      lf em 4x50_dump 11223344");
-    return 0;
+    return PM3_SUCCESS;
 }
 static int usage_lf_em4x50_read(void) {
     PrintAndLogEx(NORMAL, "Read EM 4x50/EM4x69.  Tag must be on antenna. ");
@@ -108,7 +108,7 @@ static int usage_lf_em4x50_read(void) {
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "      lf em 4x50_read 1");
     PrintAndLogEx(NORMAL, "      lf em 4x50_read 1 11223344");
-    return 0;
+    return PM3_SUCCESS;
 }
 static int usage_lf_em4x50_write(void) {
     PrintAndLogEx(NORMAL, "Write EM 4x50/4x69.  Tag must be on antenna. ");
@@ -122,7 +122,7 @@ static int usage_lf_em4x50_write(void) {
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "      lf em 4x50_write 1 deadc0de");
     PrintAndLogEx(NORMAL, "      lf em 4x50_write 1 deadc0de 11223344");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 //////////////// 4205 / 4305 commands
@@ -136,7 +136,7 @@ static int usage_lf_em4x05_dump(void) {
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "      lf em 4x05_dump");
     PrintAndLogEx(NORMAL, "      lf em 4x05_dump 11223344");
-    return 0;
+    return PM3_SUCCESS;
 }
 static int usage_lf_em4x05_read(void) {
     PrintAndLogEx(NORMAL, "Read EM4x05/EM4x69.  Tag must be on antenna. ");
@@ -149,7 +149,7 @@ static int usage_lf_em4x05_read(void) {
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "      lf em 4x05_read 1");
     PrintAndLogEx(NORMAL, "      lf em 4x05_read 1 11223344");
-    return 0;
+    return PM3_SUCCESS;
 }
 static int usage_lf_em4x05_write(void) {
     PrintAndLogEx(NORMAL, "Write EM4x05/4x69.  Tag must be on antenna. ");
@@ -163,7 +163,7 @@ static int usage_lf_em4x05_write(void) {
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "      lf em 4x05_write 1 deadc0de");
     PrintAndLogEx(NORMAL, "      lf em 4x05_write 1 deadc0de 11223344");
-    return 0;
+    return PM3_SUCCESS;
 }
 static int usage_lf_em4x05_info(void) {
     PrintAndLogEx(NORMAL, "Tag information EM4205/4305/4469//4569 tags.  Tag must be on antenna.");
@@ -175,7 +175,7 @@ static int usage_lf_em4x05_info(void) {
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "      lf em 4x05_info");
     PrintAndLogEx(NORMAL, "      lf em 4x05_info deadc0de");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 /* Read the ID of an EM410x tag.
@@ -193,7 +193,11 @@ static void ConstructEM410xEmulGraph(const char *uid, const  uint8_t clock) {
     int i, j, binary[4], parity[4];
     uint32_t n;
     /* clear our graph */
-    ClearGraph(false);
+    ClearGraph(true);
+
+   /* write 16 zero bit sledge */
+    for (i = 0; i < 10; i++)
+        AppendGraph(false, clock, 0);
 
     /* write 9 start bits */
     for (i = 0; i < 9; i++)
@@ -239,7 +243,7 @@ void printEM410x(uint32_t hi, uint64_t id) {
 
     if (!id && !hi) return;
 
-    PrintAndLogEx(SUCCESS, "EM410x %s pattern found", (hi) ? "XL" : "");
+    PrintAndLogEx(SUCCESS, "EM410x%s pattern found", (hi) ? " XL	" : "");
 
     uint64_t n = 1;
     uint64_t id2lo = 0;
@@ -252,11 +256,11 @@ void printEM410x(uint32_t hi, uint64_t id) {
 
     if (hi) {
         //output 88 bit em id
-        PrintAndLogEx(NORMAL, "\nEM TAG ID      : %06X%016" PRIX64, hi, id);
+        PrintAndLogEx(NORMAL, "\nEM TAG ID      : "_YELLOW_("%06X%016" PRIX64), hi, id);
     } else {
         //output 40 bit em id
-        PrintAndLogEx(NORMAL, "\nEM TAG ID      : %010" PRIX64, id);
-        PrintAndLogEx(NORMAL, "\nPossible de-scramble patterns");
+        PrintAndLogEx(NORMAL, "\nEM TAG ID      : "_YELLOW_("%010" PRIX64), id);
+        PrintAndLogEx(NORMAL, "\nPossible de-scramble patterns\n");
         PrintAndLogEx(NORMAL, "Unique TAG ID  : %010" PRIX64, id2lo);
         PrintAndLogEx(NORMAL, "HoneyWell IdentKey {");
         PrintAndLogEx(NORMAL, "DEZ 8          : %08" PRIu64, id & 0xFFFFFF);
@@ -343,7 +347,7 @@ int AskEm410xDecode(bool verbose, uint32_t *hi, uint64_t *lo) {
     size_t size = sizeof(bits);
     if (!getDemodBuff(bits, &size)) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - Em410x problem during copy from ASK demod");
-        return 0;
+        return PM3_ESOFT;
     }
 
     int ans = Em410xDecode(bits, &size, &idx, hi, lo);
@@ -358,11 +362,11 @@ int AskEm410xDecode(bool verbose, uint32_t *hi, uint64_t *lo) {
         else if (ans == -6)
             PrintAndLogEx(DEBUG, "DEBUG: Error - Em410x parity failed");
 
-        return 0;
+        return PM3_ESOFT;
     }
     if (!lo && !hi) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - Em410x decoded to all zeros");
-        return 0;
+        return PM3_ESOFT;
     }
 
     //set GraphBuffer for clone or sim command
@@ -376,11 +380,39 @@ int AskEm410xDecode(bool verbose, uint32_t *hi, uint64_t *lo) {
     if (verbose)
         printEM410x(*hi, *lo);
 
-    return 1;
+    return PM3_SUCCESS;
+}
+static bool isBitstream(void) {
+    // convert to bitstream if necessary
+    for (int i = 0; i < GraphTraceLen; i++) {
+        if (GraphBuffer[i] > 1 || GraphBuffer[i] < 0) {
+            return false;
+        }
+    }
+    return true;
 }
 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;
+
+    // em410x simulation etc uses 0/1 as signal data. This must be converted in order to demod it back again
+    if ( isBitstream() ) {
+        for (int i = 0; i < GraphTraceLen; i++) {
+            if (GraphBuffer[i] == 1)
+                GraphBuffer[i] = 127;
+            else
+                GraphBuffer[i] = -127;
+        }
+        uint8_t bits[GraphTraceLen];
+        memset(bits, 0, sizeof(bits));
+        size_t size = getFromGraphBuf(bits);
+
+        // set signal properties low/high/mean/amplitude and is_noise detection
+        computeSignalProperties(bits, size);
+        RepaintGraphWindow();
+    }
+
+    if (ASKDemod_ext(Cmd, false, false, 1, &st) != PM3_SUCCESS) 
+	return PM3_ESOFT;
     return AskEm410xDecode(verbose, hi, lo);
 }
 /*
@@ -404,10 +436,11 @@ static int CmdEM410xDemod(const char *Cmd) {
     uint32_t hi = 0;
     uint64_t lo = 0;
 
-    if (AskEm410xDemod(Cmd, &hi, &lo, true) != 1) return 0;
+    if (AskEm410xDemod(Cmd, &hi, &lo, true) != PM3_SUCCESS) 
+	return PM3_ESOFT;
 
     g_em410xid = lo;
-    return 1;
+    return PM3_SUCCESS;
 }
 
 // this read is the "normal" read,  which download lf signal and tries to demod here.
@@ -424,19 +457,19 @@ static int CmdEM410xSim(const char *Cmd) {
     uint8_t uid[5] = {0x00};
 
     /* clock is 64 in EM410x tags */
-    uint8_t clock1 = 64;
+    uint8_t clk = 64;
 
     if (param_gethex(Cmd, 0, uid, 10)) {
         PrintAndLogEx(FAILED, "UID must include 10 HEX symbols");
         return 0;
     }
 
-    param_getdec(Cmd, 1, &clock1);
+    param_getdec(Cmd, 1, &clk);
 
-    PrintAndLogEx(SUCCESS, "Starting simulating UID %02X%02X%02X%02X%02X  clock: %d", uid[0], uid[1], uid[2], uid[3], uid[4], clock1);
+    PrintAndLogEx(SUCCESS, "Starting simulating UID "_YELLOW_("%02X%02X%02X%02X%02X")"clock: "_YELLOW_("%d"), uid[0], uid[1], uid[2], uid[3], uid[4], clk);
     PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation");
 
-    ConstructEM410xEmulGraph(Cmd, clock1);
+    ConstructEM410xEmulGraph(Cmd, clk);
 
     CmdLFSim("0"); //240 start_gap.
     return 0;
@@ -470,18 +503,18 @@ static int CmdEM410xBrute(const char *Cmd) {
     int filelen = param_getstr(Cmd, 0, filename, FILE_PATH_SIZE);
     if (filelen == 0) {
         PrintAndLogEx(WARNING, "Error: Please specify a filename");
-        return 1;
+        return PM3_EINVARG;
     }
 
     if ((f = fopen(filename, "r")) == NULL) {
-        PrintAndLogEx(WARNING, "Error: Could not open UIDs file [%s]", filename);
-        return 1;
+        PrintAndLogEx(WARNING, "Error: Could not open UIDs file ["_YELLOW_("%s")"]", filename);
+        return PM3_EFILE;
     }
 
     uidBlock = calloc(stUidBlock, 5);
     if (uidBlock == NULL) {
         fclose(f);
-        return 1;
+        return PM3_ESOFT;
     }
 
     while (fgets(buf, sizeof(buf), f)) {
@@ -495,7 +528,7 @@ static int CmdEM410xBrute(const char *Cmd) {
             PrintAndLogEx(FAILED, "UIDs must include 10 HEX symbols");
             free(uidBlock);
             fclose(f);
-            return 1;
+            return PM3_ESOFT;
         }
 
         buf[10] = 0;
@@ -506,7 +539,7 @@ static int CmdEM410xBrute(const char *Cmd) {
                 PrintAndLogEx(WARNING, "Cannot allocate memory for UIDs");
                 free(uidBlock);
                 fclose(f);
-                return 1;
+                return PM3_ESOFT;
             }
             uidBlock = p;
         }
@@ -521,10 +554,10 @@ static int CmdEM410xBrute(const char *Cmd) {
     if (uidcnt == 0) {
         PrintAndLogEx(FAILED, "No UIDs found in file");
         free(uidBlock);
-        return 1;
+        return PM3_ESOFT;
     }
 
-    PrintAndLogEx(SUCCESS, "Loaded %d UIDs from %s, pause delay: %d ms", uidcnt, filename, delay);
+    PrintAndLogEx(SUCCESS, "Loaded "_YELLOW_("%d")" UIDs from "_YELLOW_("%s")", pause delay:"_YELLOW_("%d")"ms", uidcnt, filename, delay);
 
     // loop
     for (uint32_t c = 0; c < uidcnt; ++c) {
@@ -536,7 +569,7 @@ static int CmdEM410xBrute(const char *Cmd) {
             (void)gc;
             PrintAndLogEx(WARNING, "\nAborted via keyboard!\n");
             free(uidBlock);
-            return 0;
+            return PM3_EOPABORTED;
         }
 
         sprintf(testuid, "%010" PRIX64, bytes_to_num(uidBlock + 5 * c, 5));
@@ -550,7 +583,7 @@ static int CmdEM410xBrute(const char *Cmd) {
     }
 
     free(uidBlock);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 /* Function is equivalent of lf read + data samples + em410xread
@@ -575,8 +608,8 @@ static int CmdEM410xWatch(const char *Cmd) {
         }
         lf_read(true, 8201);
 
-    } while (!CmdEM410xRead(""));
-    return 0;
+    } while (CmdEM410xRead("") != PM3_SUCCESS);
+    return PM3_SUCCESS;
 }
 
 //currently only supports manchester modulations
@@ -587,9 +620,9 @@ static int CmdEM410xWatchnSpoof(const char *Cmd) {
 
     // loops if the captured ID was in XL-format.
     CmdEM410xWatch(Cmd);
-    PrintAndLogEx(SUCCESS, "# Replaying captured ID: %010" PRIx64, g_em410xid);
+    PrintAndLogEx(SUCCESS, "# Replaying captured ID: "_YELLOW_("%010" PRIx64), g_em410xid);
     CmdLFaskSim("");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdEM410xWrite(const char *Cmd) {
@@ -605,21 +638,21 @@ static int CmdEM410xWrite(const char *Cmd) {
     // Check ID
     if (id == 0xFFFFFFFFFFFFFFFF) {
         PrintAndLogEx(WARNING, "Error! ID is required.\n");
-        return 0;
+        return PM3_EINVARG;
     }
     if (id >= 0x10000000000) {
         PrintAndLogEx(WARNING, "Error! Given EM410x ID is longer than 40 bits.\n");
-        return 0;
+        return PM3_EINVARG;
     }
 
     // Check Card
     if (card == 0xFF) {
         PrintAndLogEx(WARNING, "Error! Card type required.\n");
-        return 0;
+        return PM3_EINVARG;
     }
     if (card < 0) {
         PrintAndLogEx(WARNING, "Error! Bad card type selected.\n");
-        return 0;
+        return PM3_EINVARG;
     }
 
     // Check Clock
@@ -628,8 +661,8 @@ static int CmdEM410xWrite(const char *Cmd) {
 
     // Allowed clock rates: 16, 32, 40 and 64
     if ((clock1 != 16) && (clock1 != 32) && (clock1 != 64) && (clock1 != 40)) {
-        PrintAndLogEx(WARNING, "Error! Clock rate %d not valid. Supported clock rates are 16, 32, 40 and 64.\n", clock1);
-        return 0;
+        PrintAndLogEx(WARNING, "Error! Clock rate" _YELLOW_("%d")" not valid. Supported clock rates are 16, 32, 40 and 64.\n", clock1);
+        return PM3_EINVARG;
     }
 
     if (card == 1) {
@@ -644,11 +677,11 @@ static int CmdEM410xWrite(const char *Cmd) {
         card = (card & 0xFF) | ((clock1 << 8) & 0xFF00);
     } else {
         PrintAndLogEx(FAILED, "Error! Bad card type selected.\n");
-        return 0;
+        return PM3_ESOFT;
     }
 
     SendCommandMIX(CMD_EM410X_WRITE_TAG, card, (uint32_t)(id >> 32), (uint32_t)id, NULL, 0);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 //**************** Start of EM4x50 Code ************************
@@ -961,13 +994,13 @@ static int CmdEM4x50Write(const char *Cmd) {
     uint8_t ctmp = tolower(param_getchar(Cmd, 0));
     if (ctmp == 'h') return usage_lf_em4x50_write();
     PrintAndLogEx(NORMAL, "no implemented yet");
-    return 0;
+    return PM3_SUCCESS;
 }
 static int CmdEM4x50Dump(const char *Cmd) {
     uint8_t ctmp = tolower(param_getchar(Cmd, 0));
     if (ctmp == 'h') return usage_lf_em4x50_dump();
     PrintAndLogEx(NORMAL, "no implemented yet");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 #define EM_PREAMBLE_LEN 6
@@ -1016,13 +1049,13 @@ static bool doPreambleSearch(size_t *startIdx) {
 
 static bool detectFSK() {
     // detect fsk clock
-    if (!GetFskClock("", false)) {
+    if (GetFskClock("", false) == 0) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - EM: FSK clock failed");
         return false;
     }
     // demod
     int ans = FSKrawDemod("0 0", false);
-    if (!ans) {
+    if (ans != PM3_SUCCESS) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - EM: FSK Demod failed");
         return false;
     }
@@ -1038,12 +1071,12 @@ static bool detectPSK() {
     //demod
     //try psk1 -- 0 0 6 (six errors?!?)
     ans = PSKDemod("0 0 6", false);
-    if (!ans) {
+    if (ans != PM3_SUCCESS) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - EM: PSK1 Demod failed");
 
         //try psk1 inverted
         ans = PSKDemod("0 1 6", false);
-        if (!ans) {
+        if (ans != PM3_SUCCESS) {
             PrintAndLogEx(DEBUG, "DEBUG: Error - EM: PSK1 inverted Demod failed");
             return false;
         }
@@ -1055,7 +1088,7 @@ static bool detectPSK() {
 // try manchester - NOTE: ST only applies to T55x7 tags.
 static bool detectASK_MAN() {
     bool stcheck = false;
-    if (!ASKDemod_ext("0 0 0", false, false, 1, &stcheck)) {
+    if (ASKDemod_ext("0 0 0", false, false, 1, &stcheck) != PM3_SUCCESS) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - EM: ASK/Manchester Demod failed");
         return false;
     }
@@ -1064,11 +1097,11 @@ static bool detectASK_MAN() {
 
 static bool detectASK_BI() {
     int ans = ASKbiphaseDemod("0 0 1", false);
-    if (!ans) {
+    if (ans != PM3_SUCCESS) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - EM: ASK/biphase normal demod failed");
 
         ans = ASKbiphaseDemod("0 1 1", false);
-        if (!ans) {
+        if (ans != PM3_SUCCESS) {
             PrintAndLogEx(DEBUG, "DEBUG: Error - EM: ASK/biphase inverted demod failed");
             return false;
         }
@@ -1130,10 +1163,10 @@ static int EM4x05ReadWord_ext(uint8_t addr, uint32_t pwd, bool usePwd, uint32_t
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
         PrintAndLogEx(DEBUG, "timeout while waiting for reply.");
-        return -1;
+        return PM3_ETIMEOUT;
     }
     if (!downloadSamplesEM()) {
-        return -1;
+        return PM3_ESOFT;
     }
 
     return demodEM4x05resp(word);
diff --git a/client/cmdlfindala.c b/client/cmdlfindala.c
index 4d9cd6009..1b8b513e0 100644
--- a/client/cmdlfindala.c
+++ b/client/cmdlfindala.c
@@ -33,7 +33,7 @@ static int usage_lf_indala_demod(void) {
     PrintAndLogEx(NORMAL, "        lf indala demod 32       = demod a Indala tag from GraphBuffer using a clock of RF/32");
     PrintAndLogEx(NORMAL, "        lf indala demod 32 1     = demod a Indala tag from GraphBuffer using a clock of RF/32 and inverting data");
     PrintAndLogEx(NORMAL, "        lf indala demod 64 1 0   = demod a Indala tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int usage_lf_indala_sim(void) {
@@ -47,7 +47,7 @@ static int usage_lf_indala_sim(void) {
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "       lf indala sim deadc0de");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 // Indala 26 bit decode
@@ -64,9 +64,9 @@ static int CmdIndalaDemod(const char *Cmd) {
     else
         ans = PSKDemod("32", true);
 
-    if (!ans) {
+    if (ans != PM3_SUCCESS) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - Indala can't demod signal: %d", ans);
-        return 0;
+        return PM3_ESOFT;
     }
 
     uint8_t invert = 0;
@@ -83,7 +83,7 @@ static int CmdIndalaDemod(const char *Cmd) {
             PrintAndLogEx(DEBUG, "DEBUG: Error - Indala: size not correct: %d", size);
         else
             PrintAndLogEx(DEBUG, "DEBUG: Error - Indala: error demoding psk idx: %d", idx);
-        return 0;
+        return PM3_ESOFT;
     }
     setDemodBuff(DemodBuffer, size, idx);
     setClockGrid(g_DemodClock, g_DemodStartIdx + (idx * g_DemodClock));
@@ -160,7 +160,7 @@ static int CmdIndalaDemod(const char *Cmd) {
         PrintAndLogEx(DEBUG, "DEBUG: Indala - printing demodbuffer");
         printDemodBuff();
     }
-    return 1;
+    return PM3_SUCCESS;
 }
 
 // older alternative indala demodulate (has some positives and negatives)
@@ -223,7 +223,7 @@ static int CmdIndalaDemodAlt(const char *Cmd) {
         PrintAndLogEx(INFO, "Recovered %d raw bits, expected: %d", rawbit, GraphTraceLen / 32);
         PrintAndLogEx(INFO, "worst metric (0=best..7=worst): %d at pos %d", worst, worstPos);
     } else {
-        return 0;
+        return PM3_ESOFT;
     }
 
     // Finding the start of a UID
@@ -252,7 +252,7 @@ static int CmdIndalaDemodAlt(const char *Cmd) {
 
     if (start == rawbit - uidlen + 1) {
         PrintAndLogEx(FAILED, "nothing to wait for");
-        return 0;
+        return PM3_ESOFT;
     }
 
     // Inverting signal if needed
@@ -278,7 +278,7 @@ static int CmdIndalaDemodAlt(const char *Cmd) {
         }
         showbits[bit + 1] = '\0';
         PrintAndLogEx(SUCCESS, "Partial UID | %s", showbits);
-        return 0;
+        return PM3_SUCCESS;
     } else {
         for (bit = 0; bit < uidlen; bit++) {
             bits[bit] = rawbits[i++];
@@ -358,7 +358,7 @@ static int CmdIndalaDemodAlt(const char *Cmd) {
     }
 
     RepaintGraphWindow();
-    return 1;
+    return PM3_SUCCESS;
 }
 
 // this read is the "normal" read,  which download lf signal and tries to demod here.
@@ -457,7 +457,7 @@ static int CmdIndalaClone(const char *Cmd) {
         SendCommandOLD(CMD_INDALA_CLONE_TAG, 0, 0, 0, datawords, sizeof(datawords));
     }
 
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static command_t CommandTable[] = {
@@ -473,7 +473,7 @@ static command_t CommandTable[] = {
 static int CmdHelp(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 int CmdLFINDALA(const char *Cmd) {
diff --git a/client/cmdlfkeri.c b/client/cmdlfkeri.c
index 04ca2d210..f906d13b5 100644
--- a/client/cmdlfkeri.c
+++ b/client/cmdlfkeri.c
@@ -21,7 +21,7 @@ static int usage_lf_keri_clone(void) {
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "       lf keri clone 112233");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int usage_lf_keri_sim(void) {
@@ -35,15 +35,15 @@ static int usage_lf_keri_sim(void) {
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "       lf keri sim 112233");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdKeriDemod(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
 
-    if (!PSKDemod("", false)) {
+    if (PSKDemod("", false) != PM3_SUCCESS) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - KERI: PSK1 Demod failed");
-        return 0;
+        return PM3_ESOFT;
     }
     bool invert = false;
     size_t size = DemodBufferLen;
@@ -58,7 +58,7 @@ static int CmdKeriDemod(const char *Cmd) {
         else
             PrintAndLogEx(DEBUG, "DEBUG: Error - KERI: ans: %d", idx);
 
-        return 0;
+        return PM3_ESOFT;
     }
     setDemodBuff(DemodBuffer, size, idx);
     setClockGrid(g_DemodClock, g_DemodStartIdx + (idx * g_DemodClock));
@@ -95,7 +95,7 @@ static int CmdKeriDemod(const char *Cmd) {
 
         CmdPrintDemodBuff("x");
     }
-    return 1;
+    return PM3_SUCCESS;
 }
 
 static int CmdKeriRead(const char *Cmd) {
@@ -165,11 +165,11 @@ static int CmdKeriClone(const char *Cmd) {
         SendCommandNG(CMD_T55XX_WRITE_BLOCK, (uint8_t *)&ng, sizeof(ng));
         if (!WaitForResponseTimeout(CMD_T55XX_WRITE_BLOCK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
-            return -1;
+            return PM3_ETIMEOUT;
         }
     }
 
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdKeriSim(const char *Cmd) {
@@ -214,7 +214,7 @@ static command_t CommandTable[] = {
 static int CmdHelp(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 int CmdLFKeri(const char *Cmd) {
diff --git a/client/cmdlfnexwatch.c b/client/cmdlfnexwatch.c
index 6c8e9e143..280ebc90d 100644
--- a/client/cmdlfnexwatch.c
+++ b/client/cmdlfnexwatch.c
@@ -15,9 +15,9 @@ static int CmdHelp(const char *Cmd);
 static int CmdNexWatchDemod(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
 
-    if (!PSKDemod("", false)) {
+    if (PSKDemod("", false) != PM3_SUCCESS) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - NexWatch can't demod signal");
-        return 0;
+        return PM3_ESOFT;
     }
     bool invert = false;
     size_t size = DemodBufferLen;
@@ -36,7 +36,7 @@ static int CmdNexWatchDemod(const char *Cmd) {
         else
             PrintAndLogEx(DEBUG, "DEBUG: Error - NexWatch error %d", idx);
 
-        return 0;
+        return PM3_ESOFT;
     }
 
     setDemodBuff(DemodBuffer, size, idx + 4);
@@ -64,7 +64,7 @@ static int CmdNexWatchDemod(const char *Cmd) {
     }
 
     CmdPrintDemodBuff("x");
-    return 1;
+    return PM3_SUCCESS;
 }
 
 //by marshmellow
@@ -84,7 +84,7 @@ static command_t CommandTable[] = {
 static int CmdHelp(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 int CmdLFNEXWATCH(const char *Cmd) {
diff --git a/client/cmdlfnoralsy.c b/client/cmdlfnoralsy.c
index ee3881b82..f6ff78645 100644
--- a/client/cmdlfnoralsy.c
+++ b/client/cmdlfnoralsy.c
@@ -22,7 +22,7 @@ static int usage_lf_noralsy_clone(void) {
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "       lf noralsy clone 112233");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int usage_lf_noralsy_sim(void) {
@@ -37,7 +37,7 @@ static int usage_lf_noralsy_sim(void) {
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "       lf noralsy sim 112233");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static uint8_t noralsy_chksum(uint8_t *bits, uint8_t len) {
@@ -53,13 +53,13 @@ static int CmdNoralsyDemod(const char *Cmd) {
 
     //ASK / Manchester
     bool st = true;
-    if (!ASKDemod_ext("32 0 0", false, false, 1, &st)) {
+    if (ASKDemod_ext("32 0 0", false, false, 1, &st) != PM3_SUCCESS) {
         if (g_debugMode) PrintAndLogEx(DEBUG, "DEBUG: Error - Noralsy: ASK/Manchester Demod failed");
-        return 0;
+        return PM3_ESOFT;
     }
     if (!st) {
         if (g_debugMode) PrintAndLogEx(DEBUG, "DEBUG: Error - Noralsy: sequence terminator not found");
-        return 0;
+        return PM3_ESOFT;
     }
 
     size_t size = DemodBufferLen;
@@ -75,7 +75,7 @@ static int CmdNoralsyDemod(const char *Cmd) {
             else
                 PrintAndLogEx(DEBUG, "DEBUG: Error - Noralsy: ans: %d", ans);
         }
-        return 0;
+        return PM3_ESOFT;
     }
     setDemodBuff(DemodBuffer, 96, ans);
     setClockGrid(g_DemodClock, g_DemodStartIdx + (ans * g_DemodClock));
@@ -103,11 +103,11 @@ static int CmdNoralsyDemod(const char *Cmd) {
     // test checksums
     if (chk1 != calc1) {
         if (g_debugMode) PrintAndLogEx(DEBUG, "DEBUG: Error - Noralsy: checksum 1 failed %x - %x\n", chk1, calc1);
-        return 0;
+        return PM3_ESOFT;
     }
     if (chk2 != calc2) {
         if (g_debugMode) PrintAndLogEx(DEBUG, "DEBUG: Error - Noralsy: checksum 2 failed %x - %x\n", chk2, calc2);
-        return 0;
+        return PM3_ESOFT;
     }
 
     PrintAndLogEx(SUCCESS, "Noralsy Tag Found: Card ID %u, Year: %u Raw: %08X%08X%08X", cardid, year, raw1, raw2, raw3);
@@ -115,7 +115,7 @@ static int CmdNoralsyDemod(const char *Cmd) {
         PrintAndLogEx(WARNING, "Unknown bits set in first block! Expected 0xBB0214FF, Found: 0x%08X", raw1);
         PrintAndLogEx(WARNING, "Please post this output in forum to further research on this format");
     }
-    return 1;
+    return PM3_SUCCESS;
 }
 
 static int CmdNoralsyRead(const char *Cmd) {
@@ -141,9 +141,9 @@ static int CmdNoralsyClone(const char *Cmd) {
     if (param_getchar(Cmd, 2) == 'Q' || param_getchar(Cmd, 2) == 'q')
         blocks[0] = T5555_MODULATION_MANCHESTER | T5555_SET_BITRATE(32) | T5555_ST_TERMINATOR | 3 << T5555_MAXBLOCK_SHIFT;
 
-    if (!getnoralsyBits(id, year, bits)) {
+    if (getnoralsyBits(id, year, bits) != PM3_SUCCESS) {
         PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
-        return 1;
+        return PM3_ESOFT;
     }
 
     //
@@ -173,10 +173,10 @@ static int CmdNoralsyClone(const char *Cmd) {
         SendCommandNG(CMD_T55XX_WRITE_BLOCK, (uint8_t *)&ng, sizeof(ng));
         if (!WaitForResponseTimeout(CMD_T55XX_WRITE_BLOCK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
-            return -1;
+            return PM3_ETIMEOUT;
         }
     }
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdNoralsySim(const char *Cmd) {
@@ -188,16 +188,17 @@ static int CmdNoralsySim(const char *Cmd) {
     uint32_t id = 0;
 
     char cmdp = param_getchar(Cmd, 0);
-    if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_noralsy_sim();
+    if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H')
+        return usage_lf_noralsy_sim();
 
     id = param_get32ex(Cmd, 0, 0, 10);
     year = param_get32ex(Cmd, 1, 2000, 10);
 
     uint8_t clk = 32, encoding = 1, separator = 1, invert = 0;
 
-    if (!getnoralsyBits(id, year, bits)) {
+    if (getnoralsyBits(id, year, bits) != PM3_SUCCESS) {
         PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
-        return 1;
+        return PM3_ESOFT;
     }
 
     PrintAndLogEx(SUCCESS, "Simulating Noralsy - CardId: %u", id);
@@ -223,7 +224,7 @@ static command_t CommandTable[] = {
 static int CmdHelp(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 int CmdLFNoralsy(const char *Cmd) {
@@ -256,7 +257,7 @@ int getnoralsyBits(uint32_t id, uint16_t year, uint8_t *bits) {
     num_to_bytebits(chksum, 4, bits + 72);
     chksum = noralsy_chksum(bits, 76);
     num_to_bytebits(chksum, 4, bits + 76);
-    return 1;
+    return PM3_SUCCESS;
 }
 
 // by iceman
diff --git a/client/cmdlfpresco.c b/client/cmdlfpresco.c
index e6ad6fc1f..1345b717e 100644
--- a/client/cmdlfpresco.c
+++ b/client/cmdlfpresco.c
@@ -21,7 +21,7 @@ static int usage_lf_presco_clone(void) {
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "       lf presco clone d 123456789");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int usage_lf_presco_sim(void) {
@@ -37,16 +37,16 @@ static int usage_lf_presco_sim(void) {
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "       lf presco sim d 123456789");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 //see ASKDemod for what args are accepted
 static int CmdPrescoDemod(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     bool st = true;
-    if (!ASKDemod_ext("32 0 0 0 0 a", false, false, 1, &st)) {
+    if (ASKDemod_ext("32 0 0 0 0 a", false, false, 1, &st) != PM3_SUCCESS) {
         PrintAndLogEx(DEBUG, "DEBUG: Error Presco ASKDemod failed");
-        return 0;
+        return PM3_ESOFT;
     }
     size_t size = DemodBufferLen;
     int ans = detectPresco(DemodBuffer, &size);
@@ -59,7 +59,7 @@ static int CmdPrescoDemod(const char *Cmd) {
             PrintAndLogEx(DEBUG, "DEBUG: Error - Presco: Size not correct: %d", size);
         else
             PrintAndLogEx(DEBUG, "DEBUG: Error - Presco: ans: %d", ans);
-        return 0;
+        return PM3_ESOFT;
     }
     setDemodBuff(DemodBuffer, 128, ans);
     setClockGrid(g_DemodClock, g_DemodStartIdx + (ans * g_DemodClock));
@@ -78,7 +78,7 @@ static int CmdPrescoDemod(const char *Cmd) {
     sprintf(cmd, "H %08X", cardid);
     getWiegandFromPresco(cmd, &sitecode, &usercode, &fullcode, &Q5);
     PrintAndLogEx(SUCCESS, "SiteCode %u, UserCode %u, FullCode, %08X", sitecode, usercode, fullcode);
-    return 1;
+    return PM3_SUCCESS;
 }
 
 //see ASKDemod for what args are accepted
@@ -139,10 +139,10 @@ static int CmdPrescoClone(const char *Cmd) {
         SendCommandNG(CMD_T55XX_WRITE_BLOCK, (uint8_t *)&ng, sizeof(ng));
         if (!WaitForResponseTimeout(CMD_T55XX_WRITE_BLOCK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
-            return -1;
+            return PM3_ETIMEOUT;
         }
     }
-    return 0;
+    return PM3_SUCCESS;
 }
 
 // takes base 12 ID converts to hex
@@ -151,7 +151,8 @@ static int CmdPrescoSim(const char *Cmd) {
     uint32_t sitecode = 0, usercode = 0, fullcode = 0;
     bool Q5 = false;
     // get wiegand from printed number.
-    if (getWiegandFromPresco(Cmd, &sitecode, &usercode, &fullcode, &Q5) == -1) return usage_lf_presco_sim();
+    if (getWiegandFromPresco(Cmd, &sitecode, &usercode, &fullcode, &Q5) == -1) 
+        return usage_lf_presco_sim();
 
     uint8_t clk = 32, encoding = 1, separator = 1, invert = 0;
 
@@ -178,7 +179,7 @@ static command_t CommandTable[] = {
 static int CmdHelp(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 int CmdLFPresco(const char *Cmd) {
diff --git a/client/cmdlfsecurakey.c b/client/cmdlfsecurakey.c
index 6da3e474b..7eb1e8a07 100644
--- a/client/cmdlfsecurakey.c
+++ b/client/cmdlfsecurakey.c
@@ -17,11 +17,13 @@ static int CmdSecurakeyDemod(const char *Cmd) {
 
     //ASK / Manchester
     bool st = false;
-    if (!ASKDemod_ext("40 0 0", false, false, 1, &st)) {
+    if (ASKDemod_ext("40 0 0", false, false, 1, &st) != PM3_SUCCESS) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - Securakey: ASK/Manchester Demod failed");
-        return 0;
+        return PM3_ESOFT;
     }
-    if (st) return 0;
+    if (st) 
+        return PM3_ESOFT;
+
     size_t size = DemodBufferLen;
     int ans = detectSecurakey(DemodBuffer, &size);
     if (ans < 0) {
@@ -33,7 +35,7 @@ static int CmdSecurakeyDemod(const char *Cmd) {
             PrintAndLogEx(DEBUG, "DEBUG: Error - Securakey: Size not correct: %d", size);
         else
             PrintAndLogEx(DEBUG, "DEBUG: Error - Securakey: ans: %d", ans);
-        return 0;
+        return PM3_ESOFT;
     }
     setDemodBuff(DemodBuffer, 96, ans);
     setClockGrid(g_DemodClock, g_DemodStartIdx + (ans * g_DemodClock));
@@ -69,7 +71,7 @@ static int CmdSecurakeyDemod(const char *Cmd) {
     uint32_t fc = 0, lWiegand = 0, rWiegand = 0;
     if (bitLen > 40) { //securakey's max bitlen is 40 bits...
         PrintAndLogEx(DEBUG, "DEBUG: Error bitLen too long: %u", bitLen);
-        return 0;
+        return PM3_ESOFT;
     }
     // get left 1/2 wiegand & right 1/2 wiegand (for parity test and wiegand print)
     lWiegand = bytebits_to_byte(bits_no_spacer + 48 - bitLen, bitLen / 2);
@@ -91,7 +93,7 @@ static int CmdSecurakeyDemod(const char *Cmd) {
     PrintAndLogEx(INFO, "\nHow the FC translates to printed FC is unknown");
     PrintAndLogEx(INFO, "How the checksum is calculated is unknown");
     PrintAndLogEx(INFO, "Help the community identify this format further\n by sharing your tag on the pm3 forum or with forum members");
-    return 1;
+    return PM3_SUCCESS;
 }
 
 static int CmdSecurakeyRead(const char *Cmd) {
@@ -111,7 +113,7 @@ static command_t CommandTable[] = {
 static int CmdHelp(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 int CmdLFSecurakey(const char *Cmd) {
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 10654fb19..59a3fae14 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -493,14 +493,14 @@ bool DecodeT55xxBlock(void) {
         default:
             return false;
     }
-    return (bool) ans;
+    return (ans == PM3_SUCCESS);
 }
 
 static bool DecodeT5555TraceBlock(void) {
     DemodBufferLen = 0x00;
 
     // According to datasheet. Always: RF/64, not inverted, Manchester
-    return (bool) ASKDemod("64 0 1", false, false, 1);
+    return (ASKDemod("64 0 1", false, false, 1) == PM3_SUCCESS);
 }
 
 // sanity check. Don't use proxmark if it is offline and you didn't specify useGraphbuf
@@ -597,7 +597,7 @@ bool tryDetectModulation(void) {
             // false = no emSearch
             // 1 = Ask/Man
             // st = true
-            if (ASKDemod_ext("0 0 1", false, false, 1, &tests[hits].ST) && test(DEMOD_ASK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
+            if ((ASKDemod_ext("0 0 1", false, false, 1, &tests[hits].ST) == PM3_SUCCESS) && test(DEMOD_ASK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
                 tests[hits].modulation = DEMOD_ASK;
                 tests[hits].bitrate = bitRate;
                 tests[hits].inverted = false;
@@ -610,7 +610,7 @@ bool tryDetectModulation(void) {
             // false = no emSearch
             // 1 = Ask/Man
             // st = true
-            if (ASKDemod_ext("0 1 1", false, false, 1, &tests[hits].ST)  && test(DEMOD_ASK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
+            if ((ASKDemod_ext("0 1 1", false, false, 1, &tests[hits].ST) == PM3_SUCCESS) && test(DEMOD_ASK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
                 tests[hits].modulation = DEMOD_ASK;
                 tests[hits].bitrate = bitRate;
                 tests[hits].inverted = true;
@@ -661,7 +661,7 @@ bool tryDetectModulation(void) {
             save_restoreGB(GRAPH_SAVE);
             // skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)
             CmdLtrim("160");
-            if (PSKDemod("0 0 6", false) && test(DEMOD_PSK1, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
+            if ( (PSKDemod("0 0 6", false) == PM3_SUCCESS) && test(DEMOD_PSK1, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
                 tests[hits].modulation = DEMOD_PSK1;
                 tests[hits].bitrate = bitRate;
                 tests[hits].inverted = false;
@@ -669,7 +669,7 @@ bool tryDetectModulation(void) {
                 tests[hits].ST = false;
                 ++hits;
             }
-            if (PSKDemod("0 1 6", false) && test(DEMOD_PSK1, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
+            if ((PSKDemod("0 1 6", false) == PM3_SUCCESS) && test(DEMOD_PSK1, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
                 tests[hits].modulation = DEMOD_PSK1;
                 tests[hits].bitrate = bitRate;
                 tests[hits].inverted = true;
@@ -679,7 +679,7 @@ bool tryDetectModulation(void) {
             }
             //ICEMAN: are these PSKDemod calls needed?
             // PSK2 - needs a call to psk1TOpsk2.
-            if (PSKDemod("0 0 6", false)) {
+            if (PSKDemod("0 0 6", false) == PM3_SUCCESS) {
                 psk1TOpsk2(DemodBuffer, DemodBufferLen);
                 if (test(DEMOD_PSK2, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
                     tests[hits].modulation = DEMOD_PSK2;
@@ -691,7 +691,7 @@ bool tryDetectModulation(void) {
                 }
             } // inverse waves does not affect this demod
             // PSK3 - needs a call to psk1TOpsk2.
-            if (PSKDemod("0 0 6", false)) {
+            if (PSKDemod("0 0 6", false) == PM3_SUCCESS) {
                 psk1TOpsk2(DemodBuffer, DemodBufferLen);
                 if (test(DEMOD_PSK3, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
                     tests[hits].modulation = DEMOD_PSK3;
@@ -1041,7 +1041,7 @@ static int CmdT55xxWriteBlock(const char *Cmd) {
             case 'b':
                 errors |= param_getdec(Cmd, cmdp + 1, &block);
                 cmdp += 2;
-                
+
                 if (block > 7) {
                     PrintAndLogEx(WARNING, "Block number must be between 0 and 7");
                     errors = true;
@@ -1085,14 +1085,14 @@ static int CmdT55xxWriteBlock(const char *Cmd) {
     PrintAndLogEx(INFO, "Writing page %d  block: %02d  data: 0x%08X %s", page1, block, data, (usepwd) ? pwdStr : "");
 
     clearCommandBuffer();
-    
+
     /*
         OLD style
        arg0 = data, (4 bytes)
        arg1 = block (1 byte)
        arg2 = password (4 bytes)
        flags = data[0] (1 byte)
-       
+
        new style
        uses struct in pm3_cmd.h
     */
@@ -1101,7 +1101,7 @@ static int CmdT55xxWriteBlock(const char *Cmd) {
     ng.pwd = password;
     ng.blockno = block;
     ng.flags = flags;
-    
+
     SendCommandNG(CMD_T55XX_WRITE_BLOCK, (uint8_t *)&ng, sizeof(ng));
     if (!WaitForResponseTimeout(CMD_T55XX_WRITE_BLOCK, &resp, 2000)) {
         PrintAndLogEx(WARNING, "Error occurred, device did not ACK write operation. (May be due to old firmware)");
@@ -2148,13 +2148,13 @@ bool tryDetectP1(bool getData) {
     // try ask clock detect.  it could be another type even if successful.
     clk = GetAskClock("", false);
     if (clk > 0) {
-        if (ASKDemod_ext("0 0 1", false, false, 1, &st) &&
+        if ((ASKDemod_ext("0 0 1", false, false, 1, &st) == PM3_SUCCESS) &&
                 preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
                 (DemodBufferLen == 32 || DemodBufferLen == 64)) {
             return true;
         }
         st = true;
-        if (ASKDemod_ext("0 1 1", false, false, 1, &st)  &&
+        if ((ASKDemod_ext("0 1 1", false, false, 1, &st) == PM3_SUCCESS) &&
                 preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
                 (DemodBufferLen == 32 || DemodBufferLen == 64)) {
             return true;
@@ -2194,20 +2194,20 @@ bool tryDetectP1(bool getData) {
         // save_restoreGB(GRAPH_SAVE);
         // skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)
         //CmdLtrim("160");
-        if (PSKDemod("0 0 6", false) &&
+        if ((PSKDemod("0 0 6", false) == PM3_SUCCESS) &&
                 preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
                 (DemodBufferLen == 32 || DemodBufferLen == 64)) {
             //save_restoreGB(GRAPH_RESTORE);
             return true;
         }
-        if (PSKDemod("0 1 6", false) &&
+        if ((PSKDemod("0 1 6", false) == PM3_SUCCESS) &&
                 preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
                 (DemodBufferLen == 32 || DemodBufferLen == 64)) {
             //save_restoreGB(GRAPH_RESTORE);
             return true;
         }
         // PSK2 - needs a call to psk1TOpsk2.
-        if (PSKDemod("0 0 6", false)) {
+        if (PSKDemod("0 0 6", false) == PM3_SUCCESS) {
             psk1TOpsk2(DemodBuffer, DemodBufferLen);
             if (preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
                     (DemodBufferLen == 32 || DemodBufferLen == 64)) {
diff --git a/client/cmdlfvisa2000.c b/client/cmdlfvisa2000.c
index 39fe007e2..26734112e 100644
--- a/client/cmdlfvisa2000.c
+++ b/client/cmdlfvisa2000.c
@@ -25,7 +25,7 @@ static int usage_lf_visa2k_clone(void) {
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "      lf visa2000 clone 112233");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int usage_lf_visa2k_sim(void) {
@@ -39,7 +39,7 @@ static int usage_lf_visa2k_sim(void) {
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "        lf visa2000 sim 112233");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static uint8_t visa_chksum(uint32_t id) {
@@ -90,10 +90,10 @@ static int CmdVisa2kDemod(const char *Cmd) {
 
     //ASK / Manchester
     bool st = true;
-    if (!ASKDemod_ext("64 0 0", false, false, 1, &st)) {
+    if (ASKDemod_ext("64 0 0", false, false, 1, &st) != PM3_SUCCESS) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - Visa2k: ASK/Manchester Demod failed");
         save_restoreGB(GRAPH_RESTORE);
-        return 0;
+        return PM3_ESOFT;
     }
     size_t size = DemodBufferLen;
     int ans = detectVisa2k(DemodBuffer, &size);
@@ -108,7 +108,7 @@ static int CmdVisa2kDemod(const char *Cmd) {
             PrintAndLogEx(DEBUG, "DEBUG: Error - Visa2k: ans: %d", ans);
 
         save_restoreGB(GRAPH_RESTORE);
-        return 0;
+        return PM3_ESOFT;
     }
     setDemodBuff(DemodBuffer, 96, ans);
     setClockGrid(g_DemodClock, g_DemodStartIdx + (ans * g_DemodClock));
@@ -126,7 +126,7 @@ static int CmdVisa2kDemod(const char *Cmd) {
     if (chk != calc) {
         PrintAndLogEx(DEBUG, "DEBUG: error: Visa2000 checksum failed %x - %x\n", chk, calc);
         save_restoreGB(GRAPH_RESTORE);
-        return 0;
+        return PM3_ESOFT;
     }
     // parity
     uint8_t calc_par = visa_parity(raw2);
@@ -134,10 +134,10 @@ static int CmdVisa2kDemod(const char *Cmd) {
     if (calc_par != chk_par) {
         PrintAndLogEx(DEBUG, "DEBUG: error: Visa2000 parity failed %x - %x\n", chk_par, calc_par);
         save_restoreGB(GRAPH_RESTORE);
-        return 0;
+        return PM3_ESOFT;
     }
     PrintAndLogEx(SUCCESS, "Visa2000 Tag Found: Card ID %u,  Raw: %08X%08X%08X", raw2,  raw1, raw2, raw3);
-    return 1;
+    return PM3_SUCCESS;
 }
 
 // 64*96*2=12288 samples just in case we just missed the first preamble we can still catch 2 of them
@@ -152,7 +152,8 @@ static int CmdVisa2kClone(const char *Cmd) {
     uint32_t blocks[4] = {T55x7_MODULATION_MANCHESTER | T55x7_BITRATE_RF_64 | T55x7_ST_TERMINATOR | 3 << T55x7_MAXBLOCK_SHIFT, BL0CK1, 0};
 
     char cmdp = tolower(param_getchar(Cmd, 0));
-    if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_visa2k_clone();
+    if (strlen(Cmd) == 0 || cmdp == 'h')
+        return usage_lf_visa2k_clone();
 
     id = param_get32ex(Cmd, 0, 0, 10);
 
@@ -186,17 +187,18 @@ static int CmdVisa2kClone(const char *Cmd) {
         if (!WaitForResponseTimeout(CMD_T55XX_WRITE_BLOCK, &resp, T55XX_WRITE_TIMEOUT)) {
 
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
-            return -1;
+            return PM3_ETIMEOUT;
         }
     }
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdVisa2kSim(const char *Cmd) {
 
     uint32_t id = 0;
     char cmdp = param_getchar(Cmd, 0);
-    if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_visa2k_sim();
+    if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H')
+        return usage_lf_visa2k_sim();
 
     id = param_get32ex(Cmd, 0, 0, 10);
 
@@ -231,7 +233,7 @@ static command_t CommandTable[] = {
 static int CmdHelp(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 int CmdLFVisa2k(const char *Cmd) {

From 9925159bcd50a2c384da20fcdfeadf8f27888a04 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 22 May 2019 08:33:33 -0400
Subject: [PATCH 1784/1938] chg: return codes

---
 client/cmddata.c | 218 +++++++++++++++++++++++------------------------
 1 file changed, 108 insertions(+), 110 deletions(-)

diff --git a/client/cmddata.c b/client/cmddata.c
index 1d2541ccb..558cf357d 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -10,7 +10,6 @@
 #include "cmddata.h"
 
 uint8_t DemodBuffer[MAX_DEMOD_BUF_LEN];
-//uint8_t g_debugMode = 0;
 size_t DemodBufferLen = 0;
 size_t g_DemodStartIdx = 0;
 int g_DemodClock = 0;
@@ -24,7 +23,7 @@ static int usage_data_printdemodbuf(void) {
     PrintAndLogEx(NORMAL, "       x          output in hex (omit for binary output)");
     PrintAndLogEx(NORMAL, "       o <offset> enter offset in # of bits");
     PrintAndLogEx(NORMAL, "       l <length> enter length to print in # of bits or hex characters respectively");
-    return 0;
+    return PM3_SUCCESS;
 }
 static int usage_data_manrawdecode(void) {
     PrintAndLogEx(NORMAL, "Usage:  data manrawdecode [invert] [maxErr]");
@@ -34,7 +33,7 @@ static int usage_data_manrawdecode(void) {
     PrintAndLogEx(NORMAL, "  [maxErr]  set number of errors allowed (default = 20)");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "   Example: data manrawdecode   = decode manchester bitstream from the demodbuffer");
-    return 0;
+    return PM3_SUCCESS;
 }
 static int usage_data_biphaserawdecode(void) {
     PrintAndLogEx(NORMAL, "Usage:  data biphaserawdecode [offset] [invert] [maxErr]");
@@ -48,7 +47,7 @@ static int usage_data_biphaserawdecode(void) {
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "   Example: data biphaserawdecode     = decode biphase bitstream from the demodbuffer");
     PrintAndLogEx(NORMAL, "   Example: data biphaserawdecode 1 1 = decode biphase bitstream from the demodbuffer, set offset, and invert output");
-    return 0;
+    return PM3_SUCCESS;
 }
 static int usage_data_rawdemod(void) {
     PrintAndLogEx(NORMAL, "Usage:  data rawdemod [modulation] <help>|<options>");
@@ -65,7 +64,7 @@ static int usage_data_rawdemod(void) {
     PrintAndLogEx(NORMAL, "          : data rawdemod nr           = demod GraphBuffer using: nrz/direct - autodetect");
     PrintAndLogEx(NORMAL, "          : data rawdemod p1           = demod GraphBuffer using: psk1 - autodetect");
     PrintAndLogEx(NORMAL, "          : data rawdemod p2           = demod GraphBuffer using: psk2 - autodetect");
-    return 0;
+    return PM3_SUCCESS;
 }
 static int usage_data_rawdemod_am(void) {
     PrintAndLogEx(NORMAL, "Usage:  data rawdemod am <s> [clock] <invert> [maxError] [maxLen] [amplify]");
@@ -81,7 +80,7 @@ static int usage_data_rawdemod_am(void) {
     PrintAndLogEx(NORMAL, "          : data rawdemod am 32 1   = demod an ask/manchester tag from GraphBuffer using a clock of RF/32 and inverting data");
     PrintAndLogEx(NORMAL, "          : data rawdemod am 1      = demod an ask/manchester tag from GraphBuffer while inverting data");
     PrintAndLogEx(NORMAL, "          : data rawdemod am 64 1 0 = demod an ask/manchester tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors");
-    return 0;
+    return PM3_SUCCESS;
 }
 static int usage_data_rawdemod_ab(void) {
     PrintAndLogEx(NORMAL, "Usage:  data rawdemod ab [offset] [clock] <invert> [maxError] [maxLen] <amplify>");
@@ -104,7 +103,7 @@ static int usage_data_rawdemod_ab(void) {
     PrintAndLogEx(NORMAL, "          : data rawdemod ab 0 1          = demod an ask/biph tag from GraphBuffer while inverting data");
     PrintAndLogEx(NORMAL, "          : data rawdemod ab 0 64 1 0     = demod an ask/biph tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors");
     PrintAndLogEx(NORMAL, "          : data rawdemod ab 0 64 1 0 0 a = demod an ask/biph tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors, and amp");
-    return 0;
+    return PM3_SUCCESS;
 }
 static int usage_data_rawdemod_ar(void) {
     PrintAndLogEx(NORMAL, "Usage:  data rawdemod ar [clock] <invert> [maxError] [maxLen] [amplify]");
@@ -121,7 +120,7 @@ static int usage_data_rawdemod_ar(void) {
     PrintAndLogEx(NORMAL, "          : data rawdemod ar 1          = demod an ask tag from GraphBuffer while inverting data");
     PrintAndLogEx(NORMAL, "          : data rawdemod ar 64 1 0     = demod an ask tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors");
     PrintAndLogEx(NORMAL, "          : data rawdemod ar 64 1 0 0 a = demod an ask tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors, and amp");
-    return 0;
+    return PM3_SUCCESS;
 }
 static int usage_data_rawdemod_fs(void) {
     PrintAndLogEx(NORMAL, "Usage:  data rawdemod fs [clock] <invert> [fchigh] [fclow]");
@@ -137,7 +136,7 @@ static int usage_data_rawdemod_fs(void) {
     PrintAndLogEx(NORMAL, "          : data rawdemod fs 64 0 8 5  = demod an fsk1 RF/64 tag from GraphBuffer");
     PrintAndLogEx(NORMAL, "          : data rawdemod fs 50 0 10 8 = demod an fsk2 RF/50 tag from GraphBuffer");
     PrintAndLogEx(NORMAL, "          : data rawdemod fs 50 1 10 8 = demod an fsk2a RF/50 tag from GraphBuffer");
-    return 0;
+    return PM3_SUCCESS;
 }
 static int usage_data_rawdemod_nr(void) {
     PrintAndLogEx(NORMAL, "Usage:  data rawdemod nr [clock] <0|1> [maxError]");
@@ -150,7 +149,7 @@ static int usage_data_rawdemod_nr(void) {
     PrintAndLogEx(NORMAL, "          : data rawdemod nr 32 1   = demod a nrz/direct tag from GraphBuffer using a clock of RF/32 and inverting data");
     PrintAndLogEx(NORMAL, "          : data rawdemod nr 1      = demod a nrz/direct tag from GraphBuffer while inverting data");
     PrintAndLogEx(NORMAL, "          : data rawdemod nr 64 1 0 = demod a nrz/direct tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors");
-    return 0;
+    return PM3_SUCCESS;
 }
 static int usage_data_rawdemod_p1(void) {
     PrintAndLogEx(NORMAL, "Usage:  data rawdemod p1 [clock] <0|1> [maxError]");
@@ -163,7 +162,7 @@ static int usage_data_rawdemod_p1(void) {
     PrintAndLogEx(NORMAL, "          : data rawdemod p1 32 1   = demod a psk1 tag from GraphBuffer using a clock of RF/32 and inverting data");
     PrintAndLogEx(NORMAL, "          : data rawdemod p1 1      = demod a psk1 tag from GraphBuffer while inverting data");
     PrintAndLogEx(NORMAL, "          : data rawdemod p1 64 1 0 = demod a psk1 tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors");
-    return 0;
+    return PM3_SUCCESS;
 }
 static int usage_data_rawdemod_p2(void) {
     PrintAndLogEx(NORMAL, "Usage:  data rawdemod p2 [clock] <0|1> [maxError]");
@@ -176,7 +175,7 @@ static int usage_data_rawdemod_p2(void) {
     PrintAndLogEx(NORMAL, "          : data rawdemod p2 32 1    = demod a psk2 tag from GraphBuffer using a clock of RF/32 and inverting output");
     PrintAndLogEx(NORMAL, "          : data rawdemod p2 1       = demod a psk2 tag from GraphBuffer, autodetect clock and invert output");
     PrintAndLogEx(NORMAL, "          : data rawdemod p2 64 1 0  = demod a psk2 tag from GraphBuffer using a clock of RF/64, inverting output and allowing 0 demod errors");
-    return 0;
+    return PM3_SUCCESS;
 }
 static int usage_data_autocorr(void) {
     PrintAndLogEx(NORMAL, "Autocorrelate is used to detect repeating sequences. We use it as detection of length in bits a message inside the signal is");
@@ -185,7 +184,7 @@ static int usage_data_autocorr(void) {
     PrintAndLogEx(NORMAL, "       h              This help");
     PrintAndLogEx(NORMAL, "       w <window>     window length for correlation - default = 4000");
     PrintAndLogEx(NORMAL, "       g              save back to GraphBuffer (overwrite)");
-    return 0;
+    return PM3_SUCCESS;
 }
 static int usage_data_undecimate(void) {
     PrintAndLogEx(NORMAL, "Usage: data undec [factor]");
@@ -194,7 +193,7 @@ static int usage_data_undecimate(void) {
     PrintAndLogEx(NORMAL, "       h            This help");
     PrintAndLogEx(NORMAL, "       factor       The number of times to repeat each sample.[default:2]");
     PrintAndLogEx(NORMAL, "Example: 'data undec 3'");
-    return 0;
+    return PM3_SUCCESS;
 }
 static int usage_data_detectclock(void) {
     PrintAndLogEx(NORMAL, "Usage:  data detectclock [modulation] <clock>");
@@ -206,24 +205,24 @@ static int usage_data_detectclock(void) {
     PrintAndLogEx(NORMAL, "            data detectclock f    = detect the clock of an fsk modulated wave in the GraphBuffer");
     PrintAndLogEx(NORMAL, "            data detectclock p    = detect the clock of an psk modulated wave in the GraphBuffer");
     PrintAndLogEx(NORMAL, "            data detectclock n    = detect the clock of an nrz/direct modulated wave in the GraphBuffer");
-    return 0;
+    return PM3_SUCCESS;
 }
 static int usage_data_hex2bin(void) {
     PrintAndLogEx(NORMAL, "Usage: data hex2bin <hex_digits>");
     PrintAndLogEx(NORMAL, "       This function will ignore all non-hexadecimal characters (but stop reading on whitespace)");
-    return 0;
+    return PM3_SUCCESS;
 }
 static int usage_data_bin2hex(void) {
     PrintAndLogEx(NORMAL, "Usage: data bin2hex <binary_digits>");
     PrintAndLogEx(NORMAL, "       This function will ignore all characters not 1 or 0 (but stop reading on whitespace)");
-    return 0;
+    return PM3_SUCCESS;
 }
 static int usage_data_buffclear(void) {
     PrintAndLogEx(NORMAL, "This function clears the bigbuff on deviceside");
     PrintAndLogEx(NORMAL, "Usage: data buffclear [h]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       h              This help");
-    return 0;
+    return PM3_SUCCESS;
 }
 static int usage_data_fsktonrz() {
     PrintAndLogEx(NORMAL, "Usage: data fsktonrz c <clock> l <fc_low> f <fc_high>");
@@ -232,7 +231,7 @@ static int usage_data_fsktonrz() {
     PrintAndLogEx(NORMAL, "       c <clock>    enter the a clock (omit to autodetect)");
     PrintAndLogEx(NORMAL, "       l <fc_low>   enter a field clock (omit to autodetect)");
     PrintAndLogEx(NORMAL, "       f <fc_high>  enter a field clock (omit to autodetect)");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 
@@ -367,7 +366,7 @@ static int CmdSetDebugMode(const char *Cmd) {
     int demod = 0;
     sscanf(Cmd, "%i", &demod);
     g_debugMode = (uint8_t)demod;
-    return 1;
+    return PM3_SUCCESS;
 }
 
 //by marshmellow
@@ -420,7 +419,7 @@ int CmdPrintDemodBuff(const char *Cmd) {
 
     if (DemodBufferLen == 0) {
         PrintAndLogEx(NORMAL, "Demodbuffer is empty");
-        return 0;
+        return PM3_ESOFT;
     }
     length = (length > (DemodBufferLen - offset)) ? DemodBufferLen - offset : length;
 
@@ -428,13 +427,13 @@ int CmdPrintDemodBuff(const char *Cmd) {
         char *buf = (char *)(DemodBuffer + offset);
         int numBits = binarraytohex(hex, sizeof(hex), buf, length);
         if (numBits == 0) {
-            return 0;
+            return PM3_ESOFT;
         }
         PrintAndLogEx(NORMAL, "DemodBuffer: %s", hex);
     } else {
         PrintAndLogEx(NORMAL, "DemodBuffer:\n%s", sprint_bin_break(DemodBuffer + offset, length, 32));
     }
-    return 1;
+    return PM3_SUCCESS;
 }
 
 //by marshmellow
@@ -445,7 +444,7 @@ int CmdGetBitStream(const char *Cmd) {
         GraphBuffer[i] = (GraphBuffer[i] >= 1) ? 1 : 0;
 
     RepaintGraphWindow();
-    return 0;
+    return PM3_SUCCESS;
 }
 
 //by marshmellow
@@ -469,7 +468,7 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
 
     if (invert != 0 && invert != 1) {
         PrintAndLogEx(WARNING, "Invalid argument: %s", Cmd);
-        return 0;
+        return PM3_EINVARG;
     }
 
     if (clk == 1) {
@@ -481,7 +480,7 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
 
     PrintAndLogEx(DEBUG, "DEBUG: (ASKDemod_ext) #samples from graphbuff: %d", BitLen);
 
-    if (BitLen < 255) return 0;
+    if (BitLen < 255) return PM3_ESOFT;
 
     if (maxLen < BitLen && maxLen != 0) BitLen = maxLen;
 
@@ -515,12 +514,12 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
 
     if (errCnt < 0 || BitLen < 16) { //if fatal error (or -1)
         PrintAndLogEx(DEBUG, "DEBUG: (ASKDemod_ext) No data found errors:%d, invert:%c, bitlen:%d, clock:%d", errCnt, (invert) ? 'Y' : 'N', BitLen, clk);
-        return 0;
+        return PM3_ESOFT;
     }
 
     if (errCnt > maxErr) {
         PrintAndLogEx(DEBUG, "DEBUG: (ASKDemod_ext) Too many errors found, errors:%d, bits:%d, clock:%d", errCnt, BitLen, clk);
-        return 0;
+        return PM3_ESOFT;
     }
 
     if (verbose) PrintAndLogEx(DEBUG, "DEBUG: (ASKDemod_ext) Using clock:%d, invert:%d, bits found:%d", clk, invert, BitLen);
@@ -544,7 +543,7 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
     if (emSearch)
         AskEm410xDecode(true, &hi, &lo);
 
-    return 1;
+    return PM3_SUCCESS;
 }
 int ASKDemod(const char *Cmd, bool verbose, bool emSearch, uint8_t askType) {
     bool st = false;
@@ -579,7 +578,7 @@ static int Cmdmandecoderaw(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) > 5 || cmdp == 'h') return usage_data_manrawdecode();
 
-    if (DemodBufferLen == 0) return 0;
+    if (DemodBufferLen == 0) return PM3_ESOFT;
 
     uint8_t bits[MAX_DEMOD_BUF_LEN] = {0};
 
@@ -593,7 +592,7 @@ static int Cmdmandecoderaw(const char *Cmd) {
 
     if (high > 7 || low < 0) {
         PrintAndLogEx(WARNING, "Error: please raw demod the wave first then manchester raw decode");
-        return 0;
+        return PM3_ESOFT;
     }
 
     sscanf(Cmd, "%i %i", &invert, &maxErr);
@@ -602,7 +601,7 @@ static int Cmdmandecoderaw(const char *Cmd) {
     errCnt = manrawdecode(bits, &size, invert, &alignPos);
     if (errCnt >= maxErr) {
         PrintAndLogEx(WARNING, "Too many errors: %d", errCnt);
-        return 0;
+        return PM3_ESOFT;
     }
 
     PrintAndLogEx(NORMAL, "Manchester Decoded - # errors:%d - data:", errCnt);
@@ -618,7 +617,7 @@ static int Cmdmandecoderaw(const char *Cmd) {
             printEM410x(hi, id);
         }
     }
-    return 1;
+    return PM3_SUCCESS;
 }
 
 /*
@@ -639,21 +638,21 @@ static int CmdBiphaseDecodeRaw(const char *Cmd) {
     sscanf(Cmd, "%i %i %i", &offset, &invert, &maxErr);
     if (DemodBufferLen == 0) {
         PrintAndLogEx(WARNING, "DemodBuffer Empty - run " _YELLOW_("'data rawdemod ar'")" first");
-        return 0;
+        return PM3_ESOFT;
     }
 
     uint8_t bits[MAX_DEMOD_BUF_LEN] = {0};
     size = sizeof(bits);
-    if (!getDemodBuff(bits, &size)) return 0;
+    if (!getDemodBuff(bits, &size)) return PM3_ESOFT;
 
     errCnt = BiphaseRawDecode(bits, &size, &offset, invert);
     if (errCnt < 0) {
         PrintAndLogEx(WARNING, "Error during decode:%d", errCnt);
-        return 0;
+        return PM3_ESOFT;
     }
     if (errCnt > maxErr) {
         PrintAndLogEx(WARNING, "Too many errors attempting to decode: %d", errCnt);
-        return 0;
+        return PM3_ESOFT;
     }
 
     if (errCnt > 0)
@@ -667,7 +666,7 @@ static int CmdBiphaseDecodeRaw(const char *Cmd) {
         setDemodBuff(DemodBuffer, DemodBufferLen - offset, offset);
 
     setClockGrid(g_DemodClock, g_DemodStartIdx + g_DemodClock * offset / 2);
-    return 1;
+    return PM3_SUCCESS;
 }
 
 //by marshmellow
@@ -681,25 +680,25 @@ int ASKbiphaseDemod(const char *Cmd, bool verbose) {
     size_t size = getFromGraphBuf(BitStream);
     if (size == 0) {
         PrintAndLogEx(DEBUG, "DEBUG: no data in graphbuf");
-        return 0;
+        return PM3_ESOFT;
     }
     int startIdx = 0;
     //invert here inverts the ask raw demoded bits which has no effect on the demod, but we need the pointer
     int errCnt = askdemod_ext(BitStream, &size, &clk, &invert, maxErr, 0, 0, &startIdx);
     if (errCnt < 0 || errCnt > maxErr) {
         PrintAndLogEx(DEBUG, "DEBUG: no data or error found %d, clock: %d", errCnt, clk);
-        return 0;
+        return PM3_ESOFT;
     }
 
     //attempt to Biphase decode BitStream
     errCnt = BiphaseRawDecode(BitStream, &size, &offset, invert);
     if (errCnt < 0) {
         if (g_debugMode || verbose) PrintAndLogEx(DEBUG, "DEBUG: Error BiphaseRawDecode: %d", errCnt);
-        return 0;
+        return PM3_ESOFT;
     }
     if (errCnt > maxErr) {
         if (g_debugMode || verbose) PrintAndLogEx(DEBUG, "DEBUG: Error BiphaseRawDecode too many errors: %d", errCnt);
-        return 0;
+        return PM3_ESOFT;
     }
     //success set DemodBuffer and return
     setDemodBuff(BitStream, size, 0);
@@ -708,7 +707,7 @@ int ASKbiphaseDemod(const char *Cmd, bool verbose) {
         PrintAndLogEx(NORMAL, "Biphase Decoded using offset: %d - clock: %d - # errors:%d - data:", offset, clk, errCnt);
         printDemodBuff();
     }
-    return 1;
+    return PM3_SUCCESS;
 }
 //by marshmellow - see ASKbiphaseDemod
 static int Cmdaskbiphdemod(const char *Cmd) {
@@ -855,7 +854,7 @@ static int CmdBitsamples(const char *Cmd) {
 
     if (!GetFromDevice(BIG_BUF, got, sizeof(got), 0, NULL, 2500, false)) {
         PrintAndLogEx(WARNING, "command execution time out");
-        return false;
+        return PM3_ETIMEOUT;
     }
 
     for (size_t j = 0; j < sizeof(got); j++) {
@@ -868,7 +867,7 @@ static int CmdBitsamples(const char *Cmd) {
     }
     GraphTraceLen = cnt;
     RepaintGraphWindow();
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdBuffClear(const char *Cmd) {
@@ -878,7 +877,7 @@ static int CmdBuffClear(const char *Cmd) {
     clearCommandBuffer();
     SendCommandNG(CMD_BUFF_CLEAR, NULL, 0);
     ClearGraph(true);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdDec(const char *Cmd) {
@@ -888,7 +887,7 @@ static int CmdDec(const char *Cmd) {
     GraphTraceLen /= 2;
     PrintAndLogEx(NORMAL, "decimated by 2");
     RepaintGraphWindow();
-    return 0;
+    return PM3_SUCCESS;
 }
 /**
  * Undecimate - I'd call it 'interpolate', but we'll save that
@@ -917,7 +916,7 @@ static int CmdUndec(const char *Cmd) {
     memcpy(GraphBuffer, swap, s_index * sizeof(int));
     GraphTraceLen = s_index;
     RepaintGraphWindow();
-    return 0;
+    return PM3_SUCCESS;
 }
 
 //by marshmellow
@@ -937,7 +936,7 @@ static int CmdGraphShiftZero(const char *Cmd) {
         GraphBuffer[i] = shiftedVal;
     }
     CmdNorm("");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 int AskEdgeDetect(const int *in, int *out, int len, int threshold) {
@@ -949,7 +948,7 @@ int AskEdgeDetect(const int *in, int *out, int len, int threshold) {
             last = -127;
         out[i - 1] = last;
     }
-    return 0;
+    return PM3_SUCCESS;
 }
 
 //by marshmellow
@@ -1044,11 +1043,11 @@ int FSKrawDemod(const char *Cmd, bool verbose) {
     }
 
     if (getSignalProperties()->isnoise)
-        return 0;
+        return PM3_ESOFT;
 
     uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
     size_t BitLen = getFromGraphBuf(bits);
-    if (BitLen == 0) return 0;
+    if (BitLen == 0) return PM3_ESOFT;
 
     //get field clock lengths
     if (!fchigh || !fclow) {
@@ -1079,11 +1078,11 @@ int FSKrawDemod(const char *Cmd, bool verbose) {
             PrintAndLogEx(NORMAL, "%s decoded bitstream:", GetFSKType(fchigh, fclow, invert));
             printDemodBuff();
         }
-        return 1;
+        return PM3_SUCCESS;
     } else {
         PrintAndLogEx(DEBUG, "no FSK data found");
     }
-    return 0;
+    return PM3_SUCCESS;
 }
 
 //by marshmellow
@@ -1110,26 +1109,26 @@ int PSKDemod(const char *Cmd, bool verbose) {
     }
     if (invert != 0 && invert != 1) {
         if (g_debugMode || verbose) PrintAndLogEx(WARNING, "Invalid argument: %s", Cmd);
-        return 0;
+        return PM3_EINVARG;
     }
 
     if (getSignalProperties()->isnoise)
-        return 0;
+        return PM3_ESOFT;
 
     uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
     size_t bitlen = getFromGraphBuf(bits);
     if (bitlen == 0)
-        return 0;
+        return PM3_ESOFT;
 
     int startIdx = 0;
     int errCnt = pskRawDemod_ext(bits, &bitlen, &clk, &invert, &startIdx);
     if (errCnt > maxErr) {
         if (g_debugMode || verbose) PrintAndLogEx(DEBUG, "DEBUG: (PSKdemod) Too many errors found, clk: %d, invert: %d, numbits: %d, errCnt: %d", clk, invert, bitlen, errCnt);
-        return 0;
+        return PM3_ESOFT;
     }
     if (errCnt < 0 || bitlen < 16) { //throw away static - allow 1 and -1 (in case of threshold command first)
         if (g_debugMode || verbose) PrintAndLogEx(DEBUG, "DEBUG: (PSKdemod) no data found, clk: %d, invert: %d, numbits: %d, errCnt: %d", clk, invert, bitlen, errCnt);
-        return 0;
+        return PM3_ESOFT;
     }
     if (verbose || g_debugMode) {
         PrintAndLogEx(DEBUG, "DEBUG: (PSKdemod) Using Clock:%d, invert:%d, Bits Found:%d", clk, invert, bitlen);
@@ -1140,15 +1139,15 @@ int PSKDemod(const char *Cmd, bool verbose) {
     //prime demod buffer for output
     setDemodBuff(bits, bitlen, 0);
     setClockGrid(clk, startIdx);
-    return 1;
+    return PM3_SUCCESS;
 }
 
 static int CmdIdteckDemod(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
 
-    if (!PSKDemod("", false)) {
+    if (PSKDemod("", false) != PM3_SUCCESS) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - Idteck PSKDemod failed");
-        return 0;
+        return PM3_ESOFT;
     }
     size_t size = DemodBufferLen;
 
@@ -1168,9 +1167,9 @@ static int CmdIdteckDemod(const char *Cmd) {
             PrintAndLogEx(DEBUG, "DEBUG: Error - Idteck: idx: %d", idx);
 
         // if didn't find preamble try again inverting
-        if (!PSKDemod("1", false)) {
+        if (PSKDemod("1", false) != PM3_SUCCESS) {
             PrintAndLogEx(DEBUG, "DEBUG: Error - Idteck PSKDemod failed");
-            return 0;
+            return PM3_ESOFT;
         }
         idx = detectIdteck(DemodBuffer, &size);
         if (idx < 0) {
@@ -1186,7 +1185,7 @@ static int CmdIdteckDemod(const char *Cmd) {
             else
                 PrintAndLogEx(DEBUG, "DEBUG: Error - Idteck: idx: %d", idx);
 
-            return 0;
+            return PM3_ESOFT;
         }
     }
     setDemodBuff(DemodBuffer, 64, idx);
@@ -1201,7 +1200,7 @@ static int CmdIdteckDemod(const char *Cmd) {
 
     //output
     PrintAndLogEx(SUCCESS, "IDTECK Tag Found: Card ID %u ,  Raw: %08X%08X", id, raw1, raw2);
-    return 1;
+    return PM3_SUCCESS;
 }
 
 int demodIdteck(void) {
@@ -1225,25 +1224,25 @@ int NRZrawDemod(const char *Cmd, bool verbose) {
 
     if (invert != 0 && invert != 1) {
         PrintAndLogEx(WARNING, "(NRZrawDemod) Invalid argument: %s", Cmd);
-        return 0;
+        return PM3_EINVARG;
     }
 
     if (getSignalProperties()->isnoise)
-        return 0;
+        return PM3_ESOFT;
 
     uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
     size_t BitLen = getFromGraphBuf(bits);
 
-    if (BitLen == 0) return 0;
+    if (BitLen == 0) return PM3_ESOFT;
 
     errCnt = nrzRawDemod(bits, &BitLen, &clk, &invert, &clkStartIdx);
     if (errCnt > maxErr) {
         PrintAndLogEx(DEBUG, "DEBUG: (NRZrawDemod) Too many errors found, clk: %d, invert: %d, numbits: %d, errCnt: %d", clk, invert, BitLen, errCnt);
-        return 0;
+        return PM3_ESOFT;
     }
     if (errCnt < 0 || BitLen < 16) { //throw away static - allow 1 and -1 (in case of threshold command first)
         PrintAndLogEx(DEBUG, "DEBUG: (NRZrawDemod) no data found, clk: %d, invert: %d, numbits: %d, errCnt: %d", clk, invert, BitLen, errCnt);
-        return 0;
+        return PM3_ESOFT;
     }
     if (verbose || g_debugMode) PrintAndLogEx(DEBUG, "DEBUG: (NRZrawDemod) Tried NRZ Demod using Clock: %d - invert: %d - Bits Found: %d", clk, invert, BitLen);
     //prime demod buffer for output
@@ -1257,7 +1256,7 @@ int NRZrawDemod(const char *Cmd, bool verbose) {
         // Now output the bitstream to the scrollback by line of 16 bits
         printDemodBuff();
     }
-    return 1;
+    return PM3_SUCCESS;
 }
 
 static int CmdNRZrawDemod(const char *Cmd) {
@@ -1277,14 +1276,14 @@ int CmdPSK1rawDemod(const char *Cmd) {
 
     int ans = PSKDemod(Cmd, true);
     //output
-    if (!ans) {
+    if (ans != PM3_SUCCESS) {
         if (g_debugMode) PrintAndLogEx(WARNING, "Error demoding: %d", ans);
-        return 0;
+        return PM3_ESOFT;
     }
     PrintAndLogEx(NORMAL, "PSK1 demoded bitstream:");
     // Now output the bitstream to the scrollback by line of 16 bits
     printDemodBuff();
-    return 1;
+    return PM3_SUCCESS;
 }
 
 // by marshmellow
@@ -1294,15 +1293,15 @@ static int CmdPSK2rawDemod(const char *Cmd) {
     if (strlen(Cmd) > 16 || cmdp == 'h') return usage_data_rawdemod_p2();
 
     int ans = PSKDemod(Cmd, true);
-    if (!ans) {
+    if (ans != PM3_SUCCESS) {
         if (g_debugMode) PrintAndLogEx(WARNING, "Error demoding: %d", ans);
-        return 0;
+        return PM3_ESOFT;
     }
     psk1TOpsk2(DemodBuffer, DemodBufferLen);
     PrintAndLogEx(NORMAL, "PSK2 demoded bitstream:");
     // Now output the bitstream to the scrollback by line of 16 bits
     printDemodBuff();
-    return 1;
+    return PM3_SUCCESS;
 }
 
 // by marshmellow - combines all raw demod functions into one menu command
@@ -1358,13 +1357,13 @@ int CmdGrid(const char *Cmd) {
     PlotGridXdefault = PlotGridX;
     PlotGridYdefault = PlotGridY;
     RepaintGraphWindow();
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdSetGraphMarkers(const char *Cmd) {
     sscanf(Cmd, "%i %i", &CursorCPos, &CursorDPos);
     RepaintGraphWindow();
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdHexsamples(const char *Cmd) {
@@ -1382,12 +1381,12 @@ static int CmdHexsamples(const char *Cmd) {
 
     if (offset + requested > sizeof(got)) {
         PrintAndLogEx(NORMAL, "Tried to read past end of buffer, <bytes> + <offset> > %d", BIGBUF_SIZE);
-        return 0;
+        return PM3_EINVARG;
     }
 
     if (!GetFromDevice(BIG_BUF, got, requested, offset, NULL, 2500, false)) {
         PrintAndLogEx(WARNING, "command execution time out");
-        return false;
+        return PM3_ESOFT;
     }
 
     uint8_t i = 0;
@@ -1407,13 +1406,13 @@ static int CmdHexsamples(const char *Cmd) {
             string_buf[0] = '\0';
         }
     }
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdHide(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     HideGraphWindow();
-    return 0;
+    return PM3_SUCCESS;
 }
 
 //zero mean GraphBuffer
@@ -1428,7 +1427,7 @@ int CmdHpf(const char *Cmd) {
     computeSignalProperties(bits, size);
 
     RepaintGraphWindow();
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static bool _headBit(BitstreamOut *stream) {
@@ -1460,7 +1459,7 @@ int getSamples(uint32_t n, bool silent) {
     PacketResponseNG response;
     if (!GetFromDevice(BIG_BUF, got, n, 0, &response, 10000, true)) {
         PrintAndLogEx(WARNING, "timeout while waiting for reply.");
-        return 1;
+        return PM3_ETIMEOUT;
     }
 
     if (!silent) PrintAndLogEx(NORMAL, "Data fetched");
@@ -1503,7 +1502,7 @@ int getSamples(uint32_t n, bool silent) {
     setClockGrid(0, 0);
     DemodBufferLen = 0;
     RepaintGraphWindow();
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdSamples(const char *Cmd) {
@@ -1538,7 +1537,7 @@ int CmdTuneSamples(const char *Cmd) {
         fflush(stdout);
         if (timeout > 7) {
             PrintAndLogEx(WARNING, "\nNo response from Proxmark3. Aborting...");
-            return 1;
+            return PM3_ETIMEOUT;
         }
     }
     PrintAndLogEx(NORMAL, "\n");
@@ -1608,7 +1607,7 @@ int CmdTuneSamples(const char *Cmd) {
         PrintAndLogEx(FAILED, "\nNot showing LF tuning graph since all values is zero.\n\n");
     }
 
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdLoad(const char *Cmd) {
@@ -1658,14 +1657,14 @@ int CmdLtrim(const char *Cmd) {
     uint32_t ds = strtoul(Cmd, NULL, 10);
 
     // sanitycheck
-    if (GraphTraceLen <= ds) return 1;
+    if (GraphTraceLen <= ds) return PM3_ESOFT;
 
     for (uint32_t i = ds; i < GraphTraceLen; ++i)
         GraphBuffer[i - ds] = GraphBuffer[i];
 
     GraphTraceLen -= ds;
     RepaintGraphWindow();
-    return 0;
+    return PM3_SUCCESS;
 }
 
 // trim graph from the beginning
@@ -1674,11 +1673,11 @@ static int CmdRtrim(const char *Cmd) {
     uint32_t ds = strtoul(Cmd, NULL, 10);
 
     // sanitycheck
-    if (GraphTraceLen <= ds) return 1;
+    if (GraphTraceLen <= ds) return PM3_ESOFT;
 
     GraphTraceLen = ds;
     RepaintGraphWindow();
-    return 0;
+    return PM3_SUCCESS;
 }
 
 // trim graph (middle) piece
@@ -1686,7 +1685,7 @@ static int CmdMtrim(const char *Cmd) {
     uint32_t start = 0, stop = 0;
     sscanf(Cmd, "%u %u", &start, &stop);
 
-    if (start > GraphTraceLen || stop > GraphTraceLen || start > stop) return 1;
+    if (start > GraphTraceLen || stop > GraphTraceLen || start > stop) return PM3_ESOFT;
 
     // leave start position sample
     start++;
@@ -1695,7 +1694,7 @@ static int CmdMtrim(const char *Cmd) {
     for (uint32_t i = 0; i < GraphTraceLen; i++)
         GraphBuffer[i] = GraphBuffer[start + i];
 
-    return 0;
+    return PM3_SUCCESS;
 }
 
 int CmdNorm(const char *Cmd) {
@@ -1721,13 +1720,13 @@ int CmdNorm(const char *Cmd) {
     computeSignalProperties(bits, size);
 
     RepaintGraphWindow();
-    return 0;
+    return PM3_SUCCESS;
 }
 
 int CmdPlot(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     ShowGraphWindow();
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdSave(const char *Cmd) {
@@ -1748,10 +1747,9 @@ static int CmdSave(const char *Cmd) {
     for (uint32_t i = 0; i < GraphTraceLen; i++)
         fprintf(f, "%d\n", GraphBuffer[i]);
 
-    if (f)
-        fclose(f);
+    fclose(f);
 
-    PrintAndLogEx(SUCCESS, "saved to '%s'", Cmd);
+    PrintAndLogEx(SUCCESS, "saved to " _YELLOW_("'%s'"), Cmd);
     return PM3_SUCCESS;
 }
 
@@ -1762,7 +1760,7 @@ static int CmdScale(const char *Cmd) {
         CursorScaleFactor = 1;
     }
     RepaintGraphWindow();
-    return 0;
+    return PM3_SUCCESS;
 }
 
 int directionalThreshold(const int *in, int *out, size_t len, int8_t up, int8_t down) {
@@ -1791,7 +1789,7 @@ int directionalThreshold(const int *in, int *out, size_t len, int8_t up, int8_t
 
     // Align with first edited sample.
     out[0] = out[1];
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdDirectionalThreshold(const char *Cmd) {
@@ -1809,7 +1807,7 @@ static int CmdDirectionalThreshold(const char *Cmd) {
     computeSignalProperties(bits, size);
 
     RepaintGraphWindow();
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdZerocrossings(const char *Cmd) {
@@ -1841,7 +1839,7 @@ static int CmdZerocrossings(const char *Cmd) {
     computeSignalProperties(bits, size);
 
     RepaintGraphWindow();
-    return 0;
+    return PM3_SUCCESS;
 }
 
 /**
@@ -1876,7 +1874,7 @@ static int Cmdbin2hex(const char *Cmd) {
 
     PrintAndLogEx(NORMAL, "%s", sprint_hex(arr, bytelen));
     free(arr);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int Cmdhex2bin(const char *Cmd) {
@@ -1901,7 +1899,7 @@ static int Cmdhex2bin(const char *Cmd) {
             printf("%d", (x >> (3 - i)) & 1);
     }
     PrintAndLogEx(NORMAL, "\n");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 /* // example of FSK2 RF/50 Tones
@@ -1998,7 +1996,7 @@ static int FSKToNRZ(int *data, size_t *dataLen, uint8_t clk, uint8_t LowToneFC,
         if (g_debugMode > 1) {
             PrintAndLogEx(NORMAL, "DEBUG FSKtoNRZ: no fsk clocks found");
         }
-        return 0;
+        return PM3_ESOFT;
     }
 
     int LowTone[clk];
@@ -2041,7 +2039,7 @@ static int FSKToNRZ(int *data, size_t *dataLen, uint8_t clk, uint8_t LowToneFC,
     }
     // update dataLen to what we put back to the data sample buffer
     *dataLen -= (clk + LowToneFC);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdFSKToNRZ(const char *Cmd) {
@@ -2094,7 +2092,7 @@ static int CmdDataIIR(const char *Cmd) {
     // set signal properties low/high/mean/amplitude and is_noise detection
     computeSignalProperties(bits, size);
     RepaintGraphWindow();
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static command_t CommandTable[] = {
@@ -2141,7 +2139,7 @@ static command_t CommandTable[] = {
 static int CmdHelp(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 int CmdData(const char *Cmd) {

From d546f395348d7b7c71f66a81ff0477402398920d Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 22 May 2019 08:48:23 -0400
Subject: [PATCH 1785/1938] chg: cmdlft55xx return codes

---
 client/cmdlft55xx.c | 158 ++++++++++++++++++++++----------------------
 1 file changed, 80 insertions(+), 78 deletions(-)

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 59a3fae14..7610447ca 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -40,7 +40,7 @@ static int usage_t55xx_config() {
     PrintAndLogEx(NORMAL, "      lf t55xx config d FSK i 1      - FSK demodulation, inverse data");
     PrintAndLogEx(NORMAL, "      lf t55xx config d FSK i 1 o 3  - FSK demodulation, inverse data, offset=3,start from position 3 to decode data");
     PrintAndLogEx(NORMAL, "");
-    return 0;
+    return PM3_SUCCESS;
 }
 static int usage_t55xx_read() {
     PrintAndLogEx(NORMAL, "Usage:  lf t55xx read [b <block>] [p <password>] <override_safety> <page1>");
@@ -58,7 +58,7 @@ static int usage_t55xx_read() {
     PrintAndLogEx(NORMAL, "      lf t55xx read b 0 p feedbeef      - read data from block 0 password feedbeef");
     PrintAndLogEx(NORMAL, "      lf t55xx read b 0 p feedbeef o    - read data from block 0 password feedbeef safety check");
     PrintAndLogEx(NORMAL, "");
-    return 0;
+    return PM3_SUCCESS;
 }
 static int usage_t55xx_write() {
     PrintAndLogEx(NORMAL, "Usage:  lf t55xx write [b <block>] [d <data>] [p <password>] [1] [t]");
@@ -73,7 +73,7 @@ static int usage_t55xx_write() {
     PrintAndLogEx(NORMAL, "      lf t55xx write b 3 d 11223344            - write 11223344 to block 3");
     PrintAndLogEx(NORMAL, "      lf t55xx write b 3 d 11223344 p feedbeef - write 11223344 to block 3 password feedbeef");
     PrintAndLogEx(NORMAL, "");
-    return 0;
+    return PM3_SUCCESS;
 }
 static int usage_t55xx_trace() {
     PrintAndLogEx(NORMAL, "Usage:  lf t55xx trace [1]");
@@ -84,7 +84,7 @@ static int usage_t55xx_trace() {
     PrintAndLogEx(NORMAL, "      lf t55xx trace");
     PrintAndLogEx(NORMAL, "      lf t55xx trace 1");
     PrintAndLogEx(NORMAL, "");
-    return 0;
+    return PM3_SUCCESS;
 }
 static int usage_t55xx_info() {
     PrintAndLogEx(NORMAL, "Usage:  lf t55xx info [1] [d <data> [q]]");
@@ -101,7 +101,7 @@ static int usage_t55xx_info() {
     PrintAndLogEx(NORMAL, "      lf t55xx info d 00083040");
     PrintAndLogEx(NORMAL, "      lf t55xx info d 6001805A q");
     PrintAndLogEx(NORMAL, "");
-    return 0;
+    return PM3_SUCCESS;
 }
 static int usage_t55xx_dump() {
     PrintAndLogEx(NORMAL, "Usage:  lf t55xx dump <password> [o]");
@@ -113,7 +113,7 @@ static int usage_t55xx_dump() {
     PrintAndLogEx(NORMAL, "      lf t55xx dump");
     PrintAndLogEx(NORMAL, "      lf t55xx dump feedbeef o");
     PrintAndLogEx(NORMAL, "");
-    return 0;
+    return PM3_SUCCESS;
 }
 static int usage_t55xx_detect() {
     PrintAndLogEx(NORMAL, "Usage:  lf t55xx detect [1] [p <password>]");
@@ -126,7 +126,7 @@ static int usage_t55xx_detect() {
     PrintAndLogEx(NORMAL, "      lf t55xx detect 1");
     PrintAndLogEx(NORMAL, "      lf t55xx detect p 11223344");
     PrintAndLogEx(NORMAL, "");
-    return 0;
+    return PM3_SUCCESS;
 }
 static int usage_t55xx_detectP1() {
     PrintAndLogEx(NORMAL, "Command: Detect Page 1 of a t55xx chip");
@@ -140,7 +140,7 @@ static int usage_t55xx_detectP1() {
     PrintAndLogEx(NORMAL, "      lf t55xx p1detect 1");
     PrintAndLogEx(NORMAL, "      lf t55xx p1detect p 11223344");
     PrintAndLogEx(NORMAL, "");
-    return 0;
+    return PM3_SUCCESS;
 }
 static int usage_t55xx_wakup() {
     PrintAndLogEx(NORMAL, "Usage:  lf t55xx wakeup [h] p <password>");
@@ -151,7 +151,7 @@ static int usage_t55xx_wakup() {
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "      lf t55xx wakeup p 11223344  - send wakeup password");
-    return 0;
+    return PM3_SUCCESS;
 }
 static int usage_t55xx_chk() {
     PrintAndLogEx(NORMAL, "This command uses a dictionary attack");
@@ -168,7 +168,7 @@ static int usage_t55xx_chk() {
     PrintAndLogEx(NORMAL, "       lf t55xx chk m");
     PrintAndLogEx(NORMAL, "       lf t55xx chk i default_pwd.dic");
     PrintAndLogEx(NORMAL, "");
-    return 0;
+    return PM3_SUCCESS;
 }
 static int usage_t55xx_bruteforce() {
     PrintAndLogEx(NORMAL, "This command uses bruteforce to scan a number range");
@@ -185,7 +185,7 @@ static int usage_t55xx_bruteforce() {
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "       lf t55xx bruteforce aaaaaa77 aaaaaa99");
     PrintAndLogEx(NORMAL, "");
-    return 0;
+    return PM3_SUCCESS;
 }
 static int usage_t55xx_recoverpw() {
     PrintAndLogEx(NORMAL, "This command uses a few tricks to try to recover mangled password");
@@ -203,7 +203,7 @@ static int usage_t55xx_recoverpw() {
     PrintAndLogEx(NORMAL, "       lf t55xx recoverpw");
     PrintAndLogEx(NORMAL, "       lf t55xx recoverpw 51243648");
     PrintAndLogEx(NORMAL, "");
-    return 0;
+    return PM3_SUCCESS;
 }
 static int usage_t55xx_wipe() {
     PrintAndLogEx(NORMAL, "Usage:  lf t55xx wipe [h] [Q5]");
@@ -215,7 +215,7 @@ static int usage_t55xx_wipe() {
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "      lf t55xx wipe    -  wipes a t55x7 tag,    config block 0x000880E0");
     PrintAndLogEx(NORMAL, "      lf t55xx wipe Q5 -  wipes a t5555 Q5 tag, config block 0x6001F004");
-    return 0;
+    return PM3_SUCCESS;
 }
 static int usage_lf_deviceconfig() {
     PrintAndLogEx(NORMAL, "Sets t55x7 timings for direkt commands. The timings are set here in Field Clocks (FC), \nwhich is converted to (US) on device");
@@ -233,7 +233,7 @@ static int usage_lf_deviceconfig() {
     PrintAndLogEx(NORMAL, "      lf t55xx deviceconfig a 29 b 17 c 15 d 47 e 15   - default T55XX");
     PrintAndLogEx(NORMAL, "      lf t55xx deviceconfig a 55 b 14 c 21 d 30        - default EM4305");
     PrintAndLogEx(NORMAL, "");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdHelp(const char *Cmd);
@@ -365,7 +365,7 @@ int T55xxReadBlock(uint8_t block, bool page1, bool usepwd, bool override, uint32
         // try reading the config block and verify that PWD bit is set before doing this!
         if (!override) {
 
-            if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, false, 0)) return 0;
+            if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, false, 0)) return PM3_ESOFT;
 
             if (!tryDetectModulation()) {
                 PrintAndLogEx(NORMAL, "Safety Check: Could not detect if PWD bit is set in config block. Exits.");
@@ -380,11 +380,11 @@ int T55xxReadBlock(uint8_t block, bool page1, bool usepwd, bool override, uint32
         }
     }
 
-    if (!AquireData(page1, block, usepwd, password)) return 0;
-    if (!DecodeT55xxBlock()) return 0;
+    if (!AquireData(page1, block, usepwd, password)) return PM3_ESOFT;
+    if (!DecodeT55xxBlock()) return PM3_ESOFT;
 
     printT55xxBlock(block);
-    return 1;
+    return PM3_SUCCESS;
 }
 
 static int CmdT55xxReadBlock(const char *Cmd) {
@@ -426,7 +426,7 @@ static int CmdT55xxReadBlock(const char *Cmd) {
 
     if (block > 7 && block != REGULAR_READ_MODE_BLOCK) {
         PrintAndLogEx(NORMAL, "Block must be between 0 and 7");
-        return 0;
+        return PM3_ESOFT;
     }
 
     printT5xxHeader(page1);
@@ -507,9 +507,9 @@ static bool DecodeT5555TraceBlock(void) {
 static int SanityOfflineCheck(bool useGraphBuffer) {
     if (!useGraphBuffer && !session.pm3_present) {
         PrintAndLogEx(WARNING, "Your proxmark3 device is offline. Specify [1] to use graphbuffer data instead");
-        return 0;
+        return PM3_ENODATA;
     }
-    return 1;
+    return PM3_SUCCESS;
 }
 
 static int CmdT55xxDetect(const char *Cmd) {
@@ -541,17 +541,17 @@ static int CmdT55xxDetect(const char *Cmd) {
     if (errors) return usage_t55xx_detect();
 
     // sanity check.
-    if (!SanityOfflineCheck(useGB)) return 1;
+    if (!SanityOfflineCheck(useGB)) return PM3_ENODATA;
 
     if (!useGB) {
         if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, usepwd, password))
-            return 1;
+            return PM3_ENODATA;
     }
 
     if (!tryDetectModulation())
         PrintAndLogEx(WARNING, "Could not detect modulation automatically. Try setting it manually with " _YELLOW_("\'lf t55xx config\'"));
 
-    return 0;
+    return PM3_SUCCESS;
 }
 
 // detect configuration?
@@ -564,7 +564,7 @@ bool tryDetectModulation(void) {
     ans = fskClocks(&fc1, &fc2, (uint8_t *)&clk, &firstClockEdge);
 
     if (ans && ((fc1 == 10 && fc2 == 8) || (fc1 == 8 && fc2 == 5))) {
-        if (FSKrawDemod("0 0", false) && test(DEMOD_FSK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
+        if ( (FSKrawDemod("0 0", false) == PM3_SUCCESS) && test(DEMOD_FSK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
             tests[hits].modulation = DEMOD_FSK;
             if (fc1 == 8 && fc2 == 5)
                 tests[hits].modulation = DEMOD_FSK1a;
@@ -576,7 +576,7 @@ bool tryDetectModulation(void) {
             tests[hits].ST = false;
             ++hits;
         }
-        if (FSKrawDemod("0 1", false) && test(DEMOD_FSK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
+        if ( (FSKrawDemod("0 1", false) == PM3_SUCCESS) && test(DEMOD_FSK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
             tests[hits].modulation = DEMOD_FSK;
             if (fc1 == 8 && fc2 == 5)
                 tests[hits].modulation = DEMOD_FSK1;
@@ -617,7 +617,7 @@ bool tryDetectModulation(void) {
                 tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
                 ++hits;
             }
-            if (ASKbiphaseDemod("0 0 0 2", false) && test(DEMOD_BI, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
+            if ((ASKbiphaseDemod("0 0 0 2", false) == PM3_SUCCESS) && test(DEMOD_BI, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
                 tests[hits].modulation = DEMOD_BI;
                 tests[hits].bitrate = bitRate;
                 tests[hits].inverted = false;
@@ -625,7 +625,7 @@ bool tryDetectModulation(void) {
                 tests[hits].ST = false;
                 ++hits;
             }
-            if (ASKbiphaseDemod("0 0 1 2", false) && test(DEMOD_BIa, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
+            if ((ASKbiphaseDemod("0 0 1 2", false) == PM3_SUCCESS) && test(DEMOD_BIa, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
                 tests[hits].modulation = DEMOD_BIa;
                 tests[hits].bitrate = bitRate;
                 tests[hits].inverted = true;
@@ -636,7 +636,7 @@ bool tryDetectModulation(void) {
         }
         clk = GetNrzClock("", false);
         if (clk > 8) { //clock of rf/8 is likely a false positive, so don't use it.
-            if (NRZrawDemod("0 0 1", false)  && test(DEMOD_NRZ, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
+            if ((NRZrawDemod("0 0 1", false) == PM3_SUCCESS) && test(DEMOD_NRZ, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
                 tests[hits].modulation = DEMOD_NRZ;
                 tests[hits].bitrate = bitRate;
                 tests[hits].inverted = false;
@@ -645,7 +645,7 @@ bool tryDetectModulation(void) {
                 ++hits;
             }
 
-            if (NRZrawDemod("0 1 1", false)  && test(DEMOD_NRZ, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
+            if ((NRZrawDemod("0 1 1", false) == PM3_SUCCESS) && test(DEMOD_NRZ, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
                 tests[hits].modulation = DEMOD_NRZ;
                 tests[hits].bitrate = bitRate;
                 tests[hits].inverted = true;
@@ -982,7 +982,7 @@ int special(const char *Cmd) {
 
         PrintAndLogEx(NORMAL, "%02d | 0x%08X | %s", j, blockData, sprint_bin(bits, 32));
     }
-    return 0;
+    return PM3_SUCCESS;
 }
 
 int printConfiguration(t55xx_conf_block_t b) {
@@ -994,7 +994,7 @@ int printConfiguration(t55xx_conf_block_t b) {
     PrintAndLogEx(NORMAL, "Seq. Term. : %s", (b.ST) ? _GREEN_("Yes") : "No");
     PrintAndLogEx(NORMAL, "Block0     : 0x%08X", b.block0);
     PrintAndLogEx(NORMAL, "");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdT55xxWakeUp(const char *Cmd) {
@@ -1021,7 +1021,7 @@ static int CmdT55xxWakeUp(const char *Cmd) {
     clearCommandBuffer();
     SendCommandMIX(CMD_T55XX_WAKEUP, password, 0, 0, NULL, 0);
     PrintAndLogEx(SUCCESS, "Wake up command sent. Try read now");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdT55xxWriteBlock(const char *Cmd) {
@@ -1105,9 +1105,9 @@ static int CmdT55xxWriteBlock(const char *Cmd) {
     SendCommandNG(CMD_T55XX_WRITE_BLOCK, (uint8_t *)&ng, sizeof(ng));
     if (!WaitForResponseTimeout(CMD_T55XX_WRITE_BLOCK, &resp, 2000)) {
         PrintAndLogEx(WARNING, "Error occurred, device did not ACK write operation. (May be due to old firmware)");
-        return 0;
+        return PM3_ETIMEOUT;
     }
-    return 1;
+    return PM3_SUCCESS;
 }
 
 static int CmdT55xxReadTrace(const char *Cmd) {
@@ -1116,21 +1116,21 @@ static int CmdT55xxReadTrace(const char *Cmd) {
 
     if (strlen(Cmd) == 0) {
         // sanity check.
-        if (!SanityOfflineCheck(false)) return 1;
+        if (!SanityOfflineCheck(false)) return PM3_ENODATA;
 
         bool pwdmode = false;
         uint32_t password = 0;
         if (!AquireData(T55x7_PAGE1, T55x7_TRACE_BLOCK1, pwdmode, password))
-            return 1;
+            return PM3_ENODATA;
     }
 
     if (config.Q5) {
-        if (!DecodeT5555TraceBlock()) return 1;
+        if (!DecodeT5555TraceBlock()) return PM3_ESOFT;
     } else {
-        if (!DecodeT55xxBlock()) return 1;
+        if (!DecodeT55xxBlock()) return PM3_ESOFT;
     }
 
-    if (!DemodBufferLen) return 1;
+    if (!DemodBufferLen) return PM3_ESOFT;
 
     RepaintGraphWindow();
     uint8_t repeat = (config.offset > 5) ? 32 : 0;
@@ -1145,7 +1145,7 @@ static int CmdT55xxReadTrace(const char *Cmd) {
 
         if (hdr != 0x1FF) {
             PrintAndLogEx(FAILED, "Invalid Q5 Trace data header (expected 0x1FF, found %X)", hdr);
-            return 1;
+            return PM3_ESOFT;
         }
 
         t5555_tracedata_t data = {.bl1 = bl1, .bl2 = bl2, .icr = 0, .lotidc = '?', .lotid = 0, .wafer = 0, .dw = 0};
@@ -1197,7 +1197,7 @@ static int CmdT55xxReadTrace(const char *Cmd) {
         si += 8;
         if (data.acl != 0xE0) {
             PrintAndLogEx(FAILED, "The modulation is most likely wrong since the ACL is not 0xE0. ");
-            return 1;
+            return PM3_ESOFT;
         }
 
         data.mfc     = PackBits(si, 8,  DemodBuffer);
@@ -1231,7 +1231,7 @@ static int CmdT55xxReadTrace(const char *Cmd) {
 
         printT55x7Trace(data, repeat);
     }
-    return 0;
+    return PM3_SUCCESS;
 }
 
 void printT55x7Trace(t55x7_tracedata_t data, uint8_t repeat) {
@@ -1397,18 +1397,18 @@ static int CmdT55xxInfo(const char *Cmd) {
 
     if (!frombuff && !gotdata) {
         // sanity check.
-        if (!SanityOfflineCheck(false)) return 1;
+        if (!SanityOfflineCheck(false)) return PM3_ENODATA;
 
         bool pwdmode = false;
         uint32_t password = 0;
         if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, pwdmode, password))
-            return 1;
+            return PM3_ENODATA;
     }
     if (!gotdata) {
-        if (!DecodeT55xxBlock()) return 1;
+        if (!DecodeT55xxBlock()) return PM3_ESOFT;
 
         // too little space to start with
-        if (DemodBufferLen < 32 + config.offset) return 1;
+        if (DemodBufferLen < 32 + config.offset) return PM3_ESOFT;
 
         //PrintAndLogEx(NORMAL, "Offset+32 ==%d\n DemodLen == %d", config.offset + 32, DemodBufferLen);
         block0   = PackBits(config.offset, 32, DemodBuffer);
@@ -1491,7 +1491,7 @@ static int CmdT55xxInfo(const char *Cmd) {
 
     PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
 
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdT55xxDump(const char *Cmd) {
@@ -1516,7 +1516,7 @@ static int CmdT55xxDump(const char *Cmd) {
     for (uint8_t i = 0; i < 4; i++)
         T55xxReadBlock(i, 1, usepwd, override, password);
 
-    return 1;
+    return PM3_SUCCESS;
 }
 
 bool AquireData(uint8_t page, uint8_t block, bool pwdmode, uint32_t password) {
@@ -1789,16 +1789,16 @@ static int CmdResetRead(const char *Cmd) {
     SendCommandNG(CMD_T55XX_RESET_READ, NULL, 0);
     if (!WaitForResponseTimeout(CMD_ACK, NULL, 2500)) {
         PrintAndLogEx(WARNING, "command execution time out");
-        return 0;
+        return PM3_ETIMEOUT;
     }
 
     uint8_t got[BIGBUF_SIZE - 1];
     if (!GetFromDevice(BIG_BUF, got, sizeof(got), 0, NULL, 2500, false)) {
         PrintAndLogEx(WARNING, "command execution time out");
-        return 0;
+        return PM3_ETIMEOUT;
     }
     setGraphBuf(got, sizeof(got));
-    return 1;
+    return PM3_SUCCESS;
 }
 
 static int CmdT55xxWipe(const char *Cmd) {
@@ -1828,7 +1828,7 @@ static int CmdT55xxWipe(const char *Cmd) {
 
         memset(writeData, 0x00, sizeof(writeData));
     }
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static bool IsCancelled(void) {
@@ -1858,7 +1858,7 @@ static int CmdT55xxChkPwds(const char *Cmd) {
 
         // now try to validate it..
         PrintAndLogEx(WARNING, "\n Block 7 was readable");
-        return 1;
+        return PM3_SUCCESS;
     }
     */
 
@@ -1875,7 +1875,7 @@ static int CmdT55xxChkPwds(const char *Cmd) {
             fflush(stdout);
             if (timeout > 180) {
                 PrintAndLogEx(WARNING, "\nNo response from Proxmark3. Aborting...");
-                return 2;
+                return PM3_ENODATA;
             }
         }
 
@@ -1911,14 +1911,14 @@ static int CmdT55xxChkPwds(const char *Cmd) {
         keyBlock = calloc(4 * 200, sizeof(uint8_t));
         if (keyBlock == NULL) {
             PrintAndLogDevice(WARNING, "error, cannot allocate memory ");
-            return 1;
+            return PM3_ESOFT;
         }
 
         int res = loadFileDICTIONARY(filename, keyBlock, &datalen, 4, &keycount);
         if (res || keycount == 0) {
             PrintAndLogEx(WARNING, "No keys found in file");
             free(keyBlock);
-            return 1;
+            return PM3_ESOFT;
         }
 
         // loop
@@ -1928,12 +1928,12 @@ static int CmdT55xxChkPwds(const char *Cmd) {
             if (!session.pm3_present) {
                 PrintAndLogEx(WARNING, "Device offline\n");
                 free(keyBlock);
-                return 2;
+                return PM3_ENODATA;
             }
 
             if (IsCancelled()) {
                 free(keyBlock);
-                return 0;
+                return PM3_EOPABORTED;
             }
 
             curr_password = bytes_to_num(keyBlock + 4 * c, 4);
@@ -1959,7 +1959,7 @@ static int CmdT55xxChkPwds(const char *Cmd) {
 out:
     t1 = msclock() - t1;
     PrintAndLogEx(SUCCESS, "\nTime in check pwd: %.0f seconds\n", (float)t1 / 1000.0);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 // Bruteforce - incremental password range search
@@ -1992,7 +1992,7 @@ static int CmdT55xxBruteForce(const char *Cmd) {
         fflush(stdout);
 
         if (IsCancelled()) {
-            return 0;
+            return PM3_EOPABORTED;
         }
 
         found = tryOnePassword(curr);
@@ -2012,7 +2012,7 @@ static int CmdT55xxBruteForce(const char *Cmd) {
 
     t1 = msclock() - t1;
     PrintAndLogEx(SUCCESS, "\nTime in bruteforce: %.0f seconds\n", (float)t1 / 1000.0);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 int tryOnePassword(uint32_t password) {
@@ -2051,7 +2051,7 @@ static int CmdT55xxRecoverPW(const char *Cmd) {
         bit++;
 
         if (IsCancelled())
-            return 0;
+            return PM3_EOPABORTED;
     }
 
     // now try to use partial original password, since block 7 should have been completely
@@ -2077,7 +2077,7 @@ static int CmdT55xxRecoverPW(const char *Cmd) {
         prev_password = curr_password;
 
         if (IsCancelled())
-            return 0;
+            return PM3_EOPABORTED;
     }
 
     // from high bit to low
@@ -2099,7 +2099,7 @@ static int CmdT55xxRecoverPW(const char *Cmd) {
         prev_password = curr_password;
 
         if (IsCancelled())
-            return 0;
+            return PM3_EOPABORTED;
     }
 
 out:
@@ -2111,7 +2111,7 @@ out:
     else
         PrintAndLogEx(WARNING, "Recover pwd failed");
 
-    return 0;
+    return PM3_SUCCESS;
 }
 
 // note length of data returned is different for different chips.
@@ -2132,12 +2132,12 @@ bool tryDetectP1(bool getData) {
     // try fsk clock detect. if successful it cannot be any other type of modulation...  (in theory...)
     ans = fskClocks(&fc1, &fc2, (uint8_t *)&clk, &firstClockEdge);
     if (ans && ((fc1 == 10 && fc2 == 8) || (fc1 == 8 && fc2 == 5))) {
-        if (FSKrawDemod("0 0", false) &&
+        if ((FSKrawDemod("0 0", false) == PM3_SUCCESS) &&
                 preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
                 (DemodBufferLen == 32 || DemodBufferLen == 64)) {
             return true;
         }
-        if (FSKrawDemod("0 1", false) &&
+        if ((FSKrawDemod("0 1", false) == PM3_SUCCESS) &&
                 preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
                 (DemodBufferLen == 32 || DemodBufferLen == 64)) {
             return true;
@@ -2159,12 +2159,12 @@ bool tryDetectP1(bool getData) {
                 (DemodBufferLen == 32 || DemodBufferLen == 64)) {
             return true;
         }
-        if (ASKbiphaseDemod("0 0 0 2", false) &&
+        if ((ASKbiphaseDemod("0 0 0 2", false) == PM3_SUCCESS) &&
                 preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
                 (DemodBufferLen == 32 || DemodBufferLen == 64)) {
             return true;
         }
-        if (ASKbiphaseDemod("0 0 1 2", false) &&
+        if ((ASKbiphaseDemod("0 0 1 2", false) == PM3_SUCCESS) &&
                 preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
                 (DemodBufferLen == 32 || DemodBufferLen == 64)) {
             return true;
@@ -2174,12 +2174,12 @@ bool tryDetectP1(bool getData) {
     // try NRZ clock detect.  it could be another type even if successful.
     clk = GetNrzClock("", false); //has the most false positives :(
     if (clk > 0) {
-        if (NRZrawDemod("0 0 1", false)  &&
+        if ((NRZrawDemod("0 0 1", false) == PM3_SUCCESS) &&
                 preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
                 (DemodBufferLen == 32 || DemodBufferLen == 64)) {
             return true;
         }
-        if (NRZrawDemod("0 1 1", false)  &&
+        if ((NRZrawDemod("0 1 1", false) == PM3_SUCCESS)  &&
                 preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
                 (DemodBufferLen == 32 || DemodBufferLen == 64)) {
             return true;
@@ -2255,11 +2255,13 @@ static int CmdT55xxDetectPage1(const char *Cmd) {
 
     if (!useGB) {
         if (!AquireData(T55x7_PAGE1, T55x7_TRACE_BLOCK1, usepwd, password))
-            return false;
+            return PM3_ENODATA;
     }
-    bool success = tryDetectP1(false);
-    if (success) PrintAndLogEx(SUCCESS, "T55xx chip found!");
-    return success;
+
+    if (tryDetectP1(false))
+        PrintAndLogEx(SUCCESS, "T55xx chip found!");
+
+    return PM3_SUCCESS;
 }
 
 static int CmdT55xxSetDeviceConfig(const char *Cmd) {
@@ -2309,7 +2311,7 @@ static int CmdT55xxSetDeviceConfig(const char *Cmd) {
 
     clearCommandBuffer();
     SendCommandOLD(CMD_SET_LF_T55XX_CONFIG, shall_persist, 0, 0, &conf, sizeof(t55xx_config));
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static command_t CommandTable[] = {
@@ -2336,7 +2338,7 @@ static command_t CommandTable[] = {
 static int CmdHelp(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 int CmdLFT55XX(const char *Cmd) {

From 486211599dbe4de6288ac92c812c2a34f43f3c30 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 22 May 2019 08:57:08 -0400
Subject: [PATCH 1786/1938] chg: return codes

---
 client/cmdlffdx.c       | 38 +++++++++++++++++++-------------------
 client/cmdlfguard.c     | 30 +++++++++++++++---------------
 client/cmdlfjablotron.c | 24 ++++++++++++------------
 3 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/client/cmdlffdx.c b/client/cmdlffdx.c
index 1db282c7d..0211fcad1 100644
--- a/client/cmdlffdx.c
+++ b/client/cmdlffdx.c
@@ -46,7 +46,7 @@ static int usage_lf_fdx_clone(void) {
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "       lf fdx clone 999 112233");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int usage_lf_fdx_sim(void) {
@@ -61,7 +61,7 @@ static int usage_lf_fdx_sim(void) {
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "       lf fdx sim 999 112233");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 // clearing the topbit needed for the preambl detection.
@@ -105,23 +105,23 @@ static int CmdFDXBdemodBI(const char *Cmd) {
     errCnt = askdemod(bs, &size, &clk, &invert, maxErr, 0, 0);
     if (errCnt < 0 || errCnt > maxErr) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - FDXB no data or error found %d, clock: %d", errCnt, clk);
-        return 0;
+        return PM3_ESOFT;
     }
 
     errCnt = BiphaseRawDecode(bs, &size, &offset, 1);
     if (errCnt < 0 || errCnt > maxErr) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - FDXB BiphaseRawDecode: %d", errCnt);
-        return 0;
+        return PM3_ESOFT;
     }
 
     int preambleIndex = detectFDXB(bs, &size);
     if (preambleIndex < 0) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - FDXB preamble not found :: %d", preambleIndex);
-        return 0;
+        return PM3_ESOFT;
     }
     if (size != 128) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - FDXB incorrect data length found");
-        return 0;
+        return PM3_ESOFT;
     }
 
     setDemodBuff(bs, 128, preambleIndex);
@@ -130,7 +130,7 @@ static int CmdFDXBdemodBI(const char *Cmd) {
     size = removeParity(bs, preambleIndex + 11, 9, 2, 117);
     if (size != 104) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - FDXB error removeParity:: %d", size);
-        return 0;
+        return PM3_ESOFT;
     }
     PrintAndLogEx(SUCCESS, "\nFDX-B / ISO 11784/5 Animal Tag ID Found:");
 
@@ -164,7 +164,7 @@ static int CmdFDXBdemodBI(const char *Cmd) {
         char *bin = sprint_bin_break(bs, size, 16);
         PrintAndLogEx(DEBUG, "DEBUG BinStream:\n%s", bin);
     }
-    return 1;
+    return PM3_SUCCESS;
 }
 */
 
@@ -175,9 +175,9 @@ static int CmdFdxDemod(const char *Cmd) {
 
     //Differential Biphase / di-phase (inverted biphase)
     //get binary from ask wave
-    if (!ASKbiphaseDemod("0 32 1 100", false)) {
+    if (ASKbiphaseDemod("0 32 1 100", false) != PM3_SUCCESS) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - FDX-B ASKbiphaseDemod failed");
-        return 0;
+        return PM3_ESOFT;
     }
     size_t size = DemodBufferLen;
     int preambleIndex = detectFDXB(DemodBuffer, &size);
@@ -191,7 +191,7 @@ static int CmdFdxDemod(const char *Cmd) {
             PrintAndLogEx(DEBUG, "DEBUG: Error - FDX-B Size not correct: %d", size);
         else
             PrintAndLogEx(DEBUG, "DEBUG: Error - FDX-B ans: %d", preambleIndex);
-        return 0;
+        return PM3_ESOFT;
     }
 
     // set and leave DemodBuffer intact
@@ -201,7 +201,7 @@ static int CmdFdxDemod(const char *Cmd) {
     size = removeParity(DemodBuffer, 11, 9, 2, 117);
     if (size != 104) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - FDX-B error removeParity: %d", size);
-        return 0;
+        return PM3_ESOFT;
     }
 
     //got a good demod
@@ -237,7 +237,7 @@ static int CmdFdxDemod(const char *Cmd) {
     // set block 0 for later
     //g_DemodConfig = T55x7_MODULATION_DIPHASE | T55x7_BITRATE_RF_32 | 4 << T55x7_MAXBLOCK_SHIFT;
 
-    return 1;
+    return PM3_SUCCESS;
 }
 
 static int CmdFdxRead(const char *Cmd) {
@@ -263,9 +263,9 @@ static int CmdFdxClone(const char *Cmd) {
     verify_values(countryid, animalid);
 
     // getFDXBits(uint64_t national_id, uint16_t country, uint8_t isanimal, uint8_t isextended, uint32_t extended, uint8_t *bits)
-    if (!getFDXBits(animalid, countryid, 1, 0, 0, bs)) {
+    if (getFDXBits(animalid, countryid, 1, 0, 0, bs) != PM3_SUCCESS) {
         PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
-        return 1;
+        return PM3_ESOFT;
     }
 
     //Q5
@@ -301,10 +301,10 @@ static int CmdFdxClone(const char *Cmd) {
         SendCommandNG(CMD_T55XX_WRITE_BLOCK, (uint8_t *)&ng, sizeof(ng));
         if (!WaitForResponseTimeout(CMD_T55XX_WRITE_BLOCK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
-            return -1;
+            return PM3_ETIMEOUT;
         }
     }
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdFdxSim(const char *Cmd) {
@@ -348,7 +348,7 @@ static command_t CommandTable[] = {
 static int CmdHelp(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 int CmdLFFdx(const char *Cmd) {
@@ -421,6 +421,6 @@ int getFDXBits(uint64_t national_id, uint16_t country, uint8_t isanimal, uint8_t
     num_to_bytebitsLSBF(extended >> 0, 8, bits + 101);
     num_to_bytebitsLSBF(extended >> 8, 8, bits + 110);
     num_to_bytebitsLSBF(extended >> 16, 8, bits + 119);
-    return 1;
+    return PM3_SUCCESS;
 }
 
diff --git a/client/cmdlfguard.c b/client/cmdlfguard.c
index 65ff7ff48..53c912f15 100644
--- a/client/cmdlfguard.c
+++ b/client/cmdlfguard.c
@@ -24,7 +24,7 @@ static int usage_lf_guard_clone(void) {
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "       lf gprox clone 26 123 11223");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int usage_lf_guard_sim(void) {
@@ -41,7 +41,7 @@ static int usage_lf_guard_sim(void) {
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "       lf gprox sim 26 123 11223");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 //by marshmellow
@@ -54,9 +54,9 @@ static int CmdGuardDemod(const char *Cmd) {
 
     //Differential Biphase
     //get binary from ask wave
-    if (!ASKbiphaseDemod("0 64 0 0", false)) {
+    if (ASKbiphaseDemod("0 64 0 0", false) != PM3_SUCCESS) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - gProxII ASKbiphaseDemod failed");
-        return 0;
+        return PM3_ESOFT;
     }
 
     size_t size = DemodBufferLen;
@@ -74,7 +74,7 @@ static int CmdGuardDemod(const char *Cmd) {
             PrintAndLogEx(DEBUG, "DEBUG: Error - gProxII wrong spacerbits");
         else
             PrintAndLogEx(DEBUG, "DEBUG: Error - gProxII ans: %d", preambleIndex);
-        return 0;
+        return PM3_ESOFT;
     }
 
     //got a good demod of 96 bits
@@ -89,7 +89,7 @@ static int CmdGuardDemod(const char *Cmd) {
     size_t len = removeParity(bits_no_spacer, 0, 5, 3, 90); //source, startloc, paritylen, ptype, length_to_run
     if (len != 72) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - gProxII spacer removal did not produce 72 bits: %u, start: %u", len, startIdx);
-        return 0;
+        return PM3_ESOFT;
     }
     // get key and then get all 8 bytes of payload decoded
     xorKey = (uint8_t)bytebits_to_byteLSBF(bits_no_spacer, 8);
@@ -128,7 +128,7 @@ static int CmdGuardDemod(const char *Cmd) {
     else
         PrintAndLogEx(SUCCESS, "Unknown G-Prox-II Fmt Found: Format Len: %u, Raw: %08x%08x%08x", fmtLen, raw1, raw2, raw3);
 
-    return 1;
+    return PM3_SUCCESS;
 }
 
 static int CmdGuardRead(const char *Cmd) {
@@ -154,9 +154,9 @@ static int CmdGuardClone(const char *Cmd) {
     facilitycode = (fc & 0x000000FF);
     cardnumber = (cn & 0x0000FFFF);
 
-    if (!getGuardBits(fmtlen, facilitycode, cardnumber, bs)) {
+    if (getGuardBits(fmtlen, facilitycode, cardnumber, bs) != PM3_SUCCESS) {
         PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
-        return 1;
+        return PM3_ESOFT;
     }
 
     // Q5
@@ -190,10 +190,10 @@ static int CmdGuardClone(const char *Cmd) {
         SendCommandNG(CMD_T55XX_WRITE_BLOCK, (uint8_t *)&ng, sizeof(ng));
         if (!WaitForResponseTimeout(CMD_T55XX_WRITE_BLOCK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
-            return -1;
+            return PM3_ETIMEOUT;
         }
     }
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdGuardSim(const char *Cmd) {
@@ -214,9 +214,9 @@ static int CmdGuardSim(const char *Cmd) {
     facilitycode = (fc & 0x000000FF);
     cardnumber = (cn & 0x0000FFFF);
 
-    if (!getGuardBits(fmtlen, facilitycode, cardnumber, bs)) {
+    if (getGuardBits(fmtlen, facilitycode, cardnumber, bs) != PM3_SUCCESS) {
         PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
-        return 1;
+        return PM3_ESOFT;
     }
 
     PrintAndLogEx(SUCCESS, "Simulating Guardall - Facility Code: %u, CardNumber: %u", facilitycode, cardnumber);
@@ -242,7 +242,7 @@ static command_t CommandTable[] = {
 static int CmdHelp(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 int CmdLFGuard(const char *Cmd) {
@@ -374,6 +374,6 @@ int getGuardBits(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint8_t *guardBits) {
     guardBits[5] = 0;
 
     PrintAndLogEx(DEBUG, " FIN | %s\n", sprint_bin(guardBits, 96));
-    return 1;
+    return PM3_SUCCESS;
 }
 
diff --git a/client/cmdlfjablotron.c b/client/cmdlfjablotron.c
index 768a7a8ca..b6fcacf40 100644
--- a/client/cmdlfjablotron.c
+++ b/client/cmdlfjablotron.c
@@ -22,7 +22,7 @@ static int usage_lf_jablotron_clone(void) {
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "       lf jablotron clone 112233");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int usage_lf_jablotron_sim(void) {
@@ -36,7 +36,7 @@ static int usage_lf_jablotron_sim(void) {
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "       lf jablotron sim 112233");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static uint8_t jablontron_chksum(uint8_t *bits) {
@@ -65,9 +65,9 @@ static int CmdJablotronDemod(const char *Cmd) {
 
     //Differential Biphase / di-phase (inverted biphase)
     //get binary from ask wave
-    if (!ASKbiphaseDemod("0 64 1 0", false)) {
+    if (ASKbiphaseDemod("0 64 1 0", false) != PM3_SUCCESS) {
         if (g_debugMode) PrintAndLogEx(DEBUG, "DEBUG: Error - Jablotron ASKbiphaseDemod failed");
-        return 0;
+        return PM3_ESOFT;
     }
     size_t size = DemodBufferLen;
     int ans = detectJablotron(DemodBuffer, &size);
@@ -84,7 +84,7 @@ static int CmdJablotronDemod(const char *Cmd) {
             else
                 PrintAndLogEx(DEBUG, "DEBUG: Error - Jablotron ans: %d", ans);
         }
-        return 0;
+        return PM3_ESOFT;
     }
 
     setDemodBuff(DemodBuffer, 64, ans);
@@ -113,7 +113,7 @@ static int CmdJablotronDemod(const char *Cmd) {
                   (uint16_t)(id >> 16) & 0xFFFF,
                   (uint16_t)id & 0xFFFF
                  );
-    return 1;
+    return PM3_SUCCESS;
 }
 
 static int CmdJablotronRead(const char *Cmd) {
@@ -144,9 +144,9 @@ static int CmdJablotronClone(const char *Cmd) {
         PrintAndLogEx(INFO, "Card Number Truncated to 39bits: %"PRIx64, fullcode);
     }
 
-    if (!getJablotronBits(fullcode, bits)) {
+    if (getJablotronBits(fullcode, bits) != PM3_SUCCESS) {
         PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
-        return 1;
+        return PM3_ESOFT;
     }
 
     blocks[1] = bytebits_to_byte(bits, 32);
@@ -175,10 +175,10 @@ static int CmdJablotronClone(const char *Cmd) {
         SendCommandNG(CMD_T55XX_WRITE_BLOCK, (uint8_t *)&ng, sizeof(ng));
         if (!WaitForResponseTimeout(CMD_T55XX_WRITE_BLOCK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
-            return -1;
+            return PM3_ETIMEOUT;
         }
     }
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdJablotronSim(const char *Cmd) {
@@ -221,7 +221,7 @@ static command_t CommandTable[] = {
 static int CmdHelp(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 int CmdLFJablotron(const char *Cmd) {
@@ -239,7 +239,7 @@ int getJablotronBits(uint64_t fullcode, uint8_t *bits) {
     //chksum byte
     uint8_t chksum = jablontron_chksum(bits);
     num_to_bytebits(chksum, 8, bits + 56);
-    return 1;
+    return PM3_SUCCESS;
 }
 
 // ASK/Diphase fc/64 (inverted Biphase)

From 420ca1b235572d0881ac147eef7774ae02276847 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 22 May 2019 09:04:38 -0400
Subject: [PATCH 1787/1938] more returns

---
 client/cmdlfpac.c      | 10 +++++-----
 client/cmdlfvisa2000.c |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/cmdlfpac.c b/client/cmdlfpac.c
index eb745abb3..b9d6f1449 100644
--- a/client/cmdlfpac.c
+++ b/client/cmdlfpac.c
@@ -15,9 +15,9 @@ static int CmdHelp(const char *Cmd);
 static int CmdPacDemod(const char *Cmd) {
 
     //NRZ
-    if (!NRZrawDemod(Cmd, false)) {
+    if (NRZrawDemod(Cmd, false) != PM3_SUCCESS) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - PAC: NRZ Demod failed");
-        return 0;
+        return PM3_ESOFT;
     }
     size_t size = DemodBufferLen;
     int ans = detectPac(DemodBuffer, &size);
@@ -31,7 +31,7 @@ static int CmdPacDemod(const char *Cmd) {
         else
             PrintAndLogEx(DEBUG, "DEBUG: Error - PAC: ans: %d", ans);
 
-        return 0;
+        return PM3_ESOFT;
     }
     setDemodBuff(DemodBuffer, 128, ans);
     setClockGrid(g_DemodClock, g_DemodStartIdx + (ans * g_DemodClock));
@@ -48,7 +48,7 @@ static int CmdPacDemod(const char *Cmd) {
 
     PrintAndLogEx(NORMAL, "PAC/Stanley Tag Found -- Raw: %08X%08X%08X%08X", raw1, raw2, raw3, raw4);
     PrintAndLogEx(NORMAL, "\nHow the Raw ID is translated by the reader is unknown");
-    return 1;
+    return PM3_SUCCESS;
 }
 
 static int CmdPacRead(const char *Cmd) {
@@ -66,7 +66,7 @@ static command_t CommandTable[] = {
 static int CmdHelp(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 int CmdLFPac(const char *Cmd) {
diff --git a/client/cmdlfvisa2000.c b/client/cmdlfvisa2000.c
index 26734112e..e07bf75cb 100644
--- a/client/cmdlfvisa2000.c
+++ b/client/cmdlfvisa2000.c
@@ -86,7 +86,7 @@ static int CmdVisa2kDemod(const char *Cmd) {
 
     save_restoreGB(GRAPH_SAVE);
 
-    //sCmdAskEdgeDetect("");
+    //CmdAskEdgeDetect("");
 
     //ASK / Manchester
     bool st = true;

From 461a90eeafa69a48a7cb023b215dc81b0b6500e0 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 22 May 2019 09:28:12 -0400
Subject: [PATCH 1788/1938] chg: lf em - and even more return codes

---
 client/cmdlfem4x.c | 79 ++++++++++++++++++++++++----------------------
 1 file changed, 41 insertions(+), 38 deletions(-)

diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 1823c343d..a3719fa6c 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -422,7 +422,7 @@ static int CmdEM410xRead_device(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     uint8_t findone = (cmdp == '1') ? 1 : 0;
     SendCommandMIX(CMD_EM410X_DEMOD, findone, 0, 0, NULL, 0);
-    return 0;
+    return PM3_SUCCESS;
 }
 */
 //by marshmellow
@@ -461,7 +461,7 @@ static int CmdEM410xSim(const char *Cmd) {
 
     if (param_gethex(Cmd, 0, uid, 10)) {
         PrintAndLogEx(FAILED, "UID must include 10 HEX symbols");
-        return 0;
+        return PM3_EINVARG;
     }
 
     param_getdec(Cmd, 1, &clk);
@@ -472,7 +472,7 @@ static int CmdEM410xSim(const char *Cmd) {
     ConstructEM410xEmulGraph(Cmd, clk);
 
     CmdLFSim("0"); //240 start_gap.
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdEM410xBrute(const char *Cmd) {
@@ -722,15 +722,15 @@ static bool EM_ByteParityTest(uint8_t *bs, size_t size, uint8_t rows, uint8_t co
 //c012345678| 0
 //            |- must be zero
 
-static bool EMwordparitytest(uint8_t *bits) {
+static int EMwordparitytest(uint8_t *bits) {
 
     // last row/col parity must be 0
-    if (bits[44] != 0) return false;
+    if (bits[44] != 0) return PM3_ESOFT;
 
     // col parity check
     uint8_t c1 = bytebits_to_byte(bits, 8) ^ bytebits_to_byte(bits + 9, 8) ^ bytebits_to_byte(bits + 18, 8) ^ bytebits_to_byte(bits + 27, 8);
     uint8_t c2 = bytebits_to_byte(bits + 36, 8);
-    if (c1 != c2) return false;
+    if (c1 != c2) return PM3_ESOFT;
 
     // row parity check
     uint8_t rowP = 0;
@@ -740,13 +740,13 @@ static bool EMwordparitytest(uint8_t *bits) {
         if (i > 0 && (i % 9) == 0) {
 
             if (rowP != EVEN)
-                return false;
+                return PM3_ESOFT;
 
             rowP = 0;
         }
     }
     // all checks ok.
-    return true;
+    return PM3_SUCCESS;
 }
 
 //////////////// 4050 / 4450 commands
@@ -860,7 +860,7 @@ int EM4x50Read(const char *Cmd, bool verbose) {
         }
         if (!clk) {
             if (verbose || g_debugMode) PrintAndLogEx(WARNING, "Error: EM4x50 - didn't find a clock");
-            return 0;
+            return PM3_ESOFT;
         }
     } else tol = clk / 8;
 
@@ -905,9 +905,9 @@ int EM4x50Read(const char *Cmd, bool verbose) {
             PrintAndLogEx(NORMAL, "No data found!, clock tried:%d", clk);
             PrintAndLogEx(NORMAL, "Try again with more samples.");
             PrintAndLogEx(NORMAL, "  or after a 'data askedge' command to clean up the read");
-            return 0;
+            return PM3_ESOFT;
         }
-    } else if (start < 0) return 0;
+    } else if (start < 0) return PM3_ESOFT;
 
     start = skip;
     snprintf(tmp2, sizeof(tmp2), "%d %d 1000 %d", clk, invert, clk * 47);
@@ -941,9 +941,9 @@ int EM4x50Read(const char *Cmd, bool verbose) {
 
         i += 2;
 
-        if (ASKDemod(tmp2, false, false, 1) < 1) {
+        if (ASKDemod(tmp2, false, false, 1) != PM3_SUCCESS) {
             save_restoreGB(GRAPH_RESTORE);
-            return 0;
+            return PM3_ESOFT;
         }
         //set DemodBufferLen to just one block
         DemodBufferLen = skip / clk;
@@ -975,14 +975,14 @@ int EM4x50Read(const char *Cmd, bool verbose) {
 
         PrintAndLogEx(NORMAL, "Parities checks | %s", (AllPTest) ? _GREEN_("Passed") : _RED_("Fail"));
 
-        if (AllPTest == 0) {
+        if (AllPTest == false) {
             PrintAndLogEx(NORMAL, "Try cleaning the read samples with " _YELLOW_("'data askedge'"));
         }
     }
 
     //restore GraphBuffer
     save_restoreGB(GRAPH_RESTORE);
-    return (int)AllPTest;
+    return AllPTest ? PM3_SUCCESS : PM3_ESOFT;
 }
 
 static int CmdEM4x50Read(const char *Cmd) {
@@ -1110,30 +1110,30 @@ static bool detectASK_BI() {
 }
 
 // param: idx - start index in demoded data.
-static bool setDemodBufferEM(uint32_t *word, size_t idx) {
+static int setDemodBufferEM(uint32_t *word, size_t idx) {
 
     //test for even parity bits.
     uint8_t parity[45] = {0};
     memcpy(parity, DemodBuffer, 45);
-    if (!EMwordparitytest(parity)) {
+    if (EMwordparitytest(parity) != PM3_SUCCESS) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - EM Parity tests failed");
-        return false;
+        return PM3_ESOFT;
     }
 
     // test for even parity bits and remove them. (leave out the end row of parities so 36 bits)
     if (!removeParity(DemodBuffer, idx + EM_PREAMBLE_LEN, 9, 0, 36)) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - EM, failed removing parity");
-        return false;
+        return PM3_ESOFT;
     }
     setDemodBuff(DemodBuffer, 32, 0);
     *word = bytebits_to_byteLSBF(DemodBuffer, 32);
-    return true;
+    return PM3_SUCCESS;
 }
 
 // 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...
-static bool demodEM4x05resp(uint32_t *word) {
+static int demodEM4x05resp(uint32_t *word) {
     size_t idx = 0;
     *word = 0;
     if (detectASK_MAN() && doPreambleSearch(&idx))
@@ -1153,7 +1153,7 @@ static bool demodEM4x05resp(uint32_t *word) {
         if (doPreambleSearch(&idx))
             return setDemodBufferEM(word, idx);
     }
-    return false;
+    return PM3_ESOFT;
 }
 
 //////////////// 4205 / 4305 commands
@@ -1249,7 +1249,7 @@ static int CmdEM4x05Write(const char *Cmd) {
 
     if (addr > 15) {
         PrintAndLogEx(NORMAL, "Address must be between 0 and 15");
-        return 1;
+        return PM3_EINVARG;
     }
     if (pwd == 1)
         PrintAndLogEx(NORMAL, "Writing address %d data %08X", addr, data);
@@ -1265,11 +1265,11 @@ static int CmdEM4x05Write(const char *Cmd) {
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
         PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
-        return -1;
+        return PM3_ETIMEOUT;
     }
 
     if (!downloadSamplesEM())
-        return -1;
+        return PM3_ENODATA;
 
     //need 0 bits demoded (after preamble) to verify write cmd
     uint32_t dummy = 0;
@@ -1443,8 +1443,7 @@ static void printEM4x05ProtectionBits(uint32_t word) {
 
 //quick test for EM4x05/EM4x69 tag
 bool EM4x05IsBlock0(uint32_t *word) {
-    int res = EM4x05ReadWord_ext(0, 0, false, word);
-    return (res > 0) ? true : false;
+    return (EM4x05ReadWord_ext(0, 0, false, word) == PM3_SUCCESS);
 }
 
 static int CmdEM4x05Info(const char *Cmd) {
@@ -1466,8 +1465,8 @@ static int CmdEM4x05Info(const char *Cmd) {
 
     // read word 0 (chip info)
     // block 0 can be read even without a password.
-    if (!EM4x05IsBlock0(&block0))
-        return -1;
+    if (EM4x05IsBlock0(&block0) == false)
+        return PM3_ESOFT;
 
     // read word 1 (serial #) doesn't need pwd
     // continue if failed, .. non blocking fail.
@@ -1476,24 +1475,28 @@ static int CmdEM4x05Info(const char *Cmd) {
 
     // read word 4 (config block)
     // needs password if one is set
-    if (EM4x05ReadWord_ext(EM_CONFIG_BLOCK, pwd, usePwd, &word) != 1)
-        return 0;
+    if (EM4x05ReadWord_ext(EM_CONFIG_BLOCK, pwd, usePwd, &word) != PM3_SUCCESS)
+        return PM3_ESOFT;
 
     printEM4x05config(word);
 
     // read word 14 and 15 to see which is being used for the protection bits
-    if (EM4x05ReadWord_ext(EM_PROT1_BLOCK, pwd, usePwd, &word) != 1) {
-        return 0;
+    if (EM4x05ReadWord_ext(EM_PROT1_BLOCK, pwd, usePwd, &word) != PM3_SUCCESS) {
+        return PM3_ESOFT;
     }
     // if status bit says this is not the used protection word
     if (!(word & 0x8000)) {
-        if (EM4x05ReadWord_ext(EM_PROT2_BLOCK, pwd, usePwd, &word) != 1)
-            return 0;
+        if (EM4x05ReadWord_ext(EM_PROT2_BLOCK, pwd, usePwd, &word) != PM3_SUCCESS)
+            return PM3_ESOFT;
     }
+
     //something went wrong
-    if (!(word & 0x8000)) return 0;
+    if (!(word & 0x8000)) 
+        return PM3_ESOFT;
+
     printEM4x05ProtectionBits(word);
-    return 1;
+
+    return PM3_SUCCESS;
 }
 
 static command_t CommandTable[] = {
@@ -1519,7 +1522,7 @@ static command_t CommandTable[] = {
 static int CmdHelp(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 int CmdLFEM4X(const char *Cmd) {

From 24458e1392e10a592970ae26128d95d908af70fa Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 22 May 2019 09:40:58 -0400
Subject: [PATCH 1789/1938] chg: lf search - works again

---
 client/cmdlf.c | 56 +++++++++++++++++++++++++-------------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/client/cmdlf.c b/client/cmdlf.c
index c67c0f150..7ae06643d 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -930,7 +930,7 @@ int CmdLFfind(const char *Cmd) {
 
     if (GraphTraceLen < minLength) {
         PrintAndLogEx(FAILED, "Data in Graphbuffer was too small.");
-        return 0;
+        return PM3_ESOFT;
     }
 
     PrintAndLogEx(INFO, "NOTE: some demods output possible binary");
@@ -946,42 +946,42 @@ int CmdLFfind(const char *Cmd) {
         if (getSignalProperties()->isnoise) {
 
             if (IfPm3Hitag()) {
-                if (readHitagUid()) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Hitag") " found!"); return 1;}
+                if (readHitagUid()) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Hitag") " found!"); return PM3_SUCCESS;}
             }
-            if (readCOTAGUid()) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("COTAG ID") " found!"); return 1;}
+            if (readCOTAGUid()) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("COTAG ID") " found!"); return PM3_SUCCESS;}
 
             PrintAndLogEx(FAILED, "\n" _YELLOW_("No data found!") " - Signal looks like noise. Maybe not an LF tag?");
-            return 0;
+            return PM3_ESOFT;
         }
     }
 
-    if (EM4x50Read("", false))  { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("EM4x50 ID") " found!"); return 1;}
+    if (EM4x50Read("", false) == PM3_SUCCESS)  { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("EM4x50 ID") " found!"); return PM3_SUCCESS;}
 
-    if (demodHID())             { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("HID Prox ID") " found!"); goto out;}
-    if (demodAWID())            { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("AWID ID") " found!"); goto out;}
-    if (demodParadox())         { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Paradox ID") " found!"); goto out;}
+    if (demodHID() == PM3_SUCCESS)             { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("HID Prox ID") " found!"); goto out;}
+    if (demodAWID() == PM3_SUCCESS)            { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("AWID ID") " found!"); goto out;}
+    if (demodParadox() == PM3_SUCCESS)         { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Paradox ID") " found!"); goto out;}
 
-    if (demodEM410x())          { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("EM410x ID") " found!"); goto out;}
-    if (demodFDX())             { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("FDX-B ID") " found!"); goto out;}
-    if (demodGuard())           { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Guardall G-Prox II ID") " found!"); goto out; }
-    if (demodIdteck())          { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Idteck ID") " found!"); goto out;}
-    if (demodIndala())          { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Indala ID") " found!");  goto out;}
-    if (demodIOProx())          { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("IO Prox ID") " found!"); goto out;}
-    if (demodJablotron())       { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Jablotron ID") " found!"); goto out;}
-    if (demodNedap())           { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("NEDAP ID") " found!"); goto out;}
-    if (demodNexWatch())        { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("NexWatch ID") " found!"); goto out;}
-    if (demodNoralsy())         { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Noralsy ID") " found!"); goto out;}
-    if (demodKeri())            { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("KERI ID") " found!"); goto out;}
-    if (demodPac())             { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("PAC/Stanley ID") " found!"); goto out;}
+    if (demodEM410x() == PM3_SUCCESS)          { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("EM410x ID") " found!"); goto out;}
+    if (demodFDX() == PM3_SUCCESS)             { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("FDX-B ID") " found!"); goto out;}
+    if (demodGuard() == PM3_SUCCESS)           { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Guardall G-Prox II ID") " found!"); goto out; }
+    if (demodIdteck() == PM3_SUCCESS)          { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Idteck ID") " found!"); goto out;}
+    if (demodIndala() == PM3_SUCCESS)          { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Indala ID") " found!");  goto out;}
+    if (demodIOProx() == PM3_SUCCESS)          { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("IO Prox ID") " found!"); goto out;}
+    if (demodJablotron() == PM3_SUCCESS)       { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Jablotron ID") " found!"); goto out;}
+    if (demodNedap() == PM3_SUCCESS)           { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("NEDAP ID") " found!"); goto out;}
+    if (demodNexWatch() == PM3_SUCCESS)        { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("NexWatch ID") " found!"); goto out;}
+    if (demodNoralsy() == PM3_SUCCESS)         { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Noralsy ID") " found!"); goto out;}
+    if (demodKeri() == PM3_SUCCESS)            { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("KERI ID") " found!"); goto out;}
+    if (demodPac() == PM3_SUCCESS)             { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("PAC/Stanley ID") " found!"); goto out;}
 
-    if (demodPresco())          { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Presco ID") " found!"); goto out;}
-    if (demodPyramid())         { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Pyramid ID") " found!"); goto out;}
-    if (demodSecurakey())       { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Securakey ID") " found!"); goto out;}
-    if (demodViking())          { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Viking ID") " found!"); goto out;}
-    if (demodVisa2k())          { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Visa2000 ID") " found!"); goto out;}
-    if (demodTI())              { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Texas Instrument ID") " found!"); goto out;}
-    //if (demodFermax())          { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Fermax ID") " found!"); goto out;}
-    //if (demodFlex())            { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Flex ID") " found!"); goto out;}
+    if (demodPresco() == PM3_SUCCESS)          { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Presco ID") " found!"); goto out;}
+    if (demodPyramid() == PM3_SUCCESS)         { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Pyramid ID") " found!"); goto out;}
+    if (demodSecurakey() == PM3_SUCCESS)       { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Securakey ID") " found!"); goto out;}
+    if (demodViking() == PM3_SUCCESS)          { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Viking ID") " found!"); goto out;}
+    if (demodVisa2k() == PM3_SUCCESS)          { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Visa2000 ID") " found!"); goto out;}
+    if (demodTI() == PM3_SUCCESS)              { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Texas Instrument ID") " found!"); goto out;}
+    //if (demodFermax() == PM3_SUCCESS)          { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Fermax ID") " found!"); goto out;}
+    //if (demodFlex() == PM3_SUCCESS)            { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Flex ID") " found!"); goto out;}
 
     PrintAndLogEx(FAILED, _RED_("No known 125/134 kHz tags found!"));
 

From e191dc777d47edcfd335f94bf97306ba87ab597b Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 22 May 2019 09:43:39 -0400
Subject: [PATCH 1790/1938] chg - returns

---
 client/cmdlfti.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/client/cmdlfti.c b/client/cmdlfti.c
index 03017f949..3baa8c2e6 100644
--- a/client/cmdlfti.c
+++ b/client/cmdlfti.c
@@ -87,7 +87,7 @@ static int CmdTIDemod(const char *Cmd) {
     int i, j, TagType;
     int lowSum = 0, highSum = 0;;
     int lowTot = 0, highTot = 0;
-    int retval = 0;
+    int retval = PM3_ESOFT;
 
     for (i = 0; i < GraphTraceLen - convLen; i++) {
         lowSum = 0;
@@ -216,7 +216,7 @@ static int CmdTIDemod(const char *Cmd) {
         goto out;
     } else if (TagType == 0x7E) {
         PrintAndLogEx(INFO, "Readonly TI tag detected.");
-        retval = 1;
+        retval = PM3_SUCCESS;
         goto out;
     } else if (TagType == 0xFE) {
         PrintAndLogEx(INFO, "Rewriteable TI tag detected.");
@@ -259,14 +259,14 @@ static int CmdTIDemod(const char *Cmd) {
         if (crc != (shift2 & 0xFFFF))
             PrintAndLogEx(WARNING, "Error: CRC mismatch, calculated %04X, got %04X", crc, shift2 & 0xFFFF);
 
-        retval = 1;
+        retval = PM3_SUCCESS;
         goto out;
     } else {
         PrintAndLogEx(WARNING, "Unknown tag type.");
     }
 
 out:
-    if (retval == 0)
+    if (retval != PM3_SUCCESS)
         save_restoreGB(GRAPH_RESTORE);
 
     return retval;
@@ -277,7 +277,7 @@ static int CmdTIRead(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     clearCommandBuffer();
     SendCommandNG(CMD_READ_TI_TYPE, NULL, 0);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 // write new data to a r/w TI tag
@@ -291,11 +291,11 @@ static int CmdTIWrite(const char *Cmd) {
 
     if (res < 2) {
         PrintAndLogEx(WARNING, "Please specify the data as two hex strings, optionally the CRC as a third");
-        return 1;
+        return PM3_EINVARG;
     }
     clearCommandBuffer();
     SendCommandMIX(CMD_WRITE_TI_TYPE, arg0, arg1, arg2, NULL, 0);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static command_t CommandTable[] = {
@@ -309,7 +309,7 @@ static command_t CommandTable[] = {
 static int CmdHelp(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 int CmdLFTI(const char *Cmd) {

From 66361ec6a3d2fa587abc5537555407e643c3c4a5 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 22 May 2019 09:44:55 -0400
Subject: [PATCH 1791/1938] chg - returns

---
 client/cmdlfviking.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/client/cmdlfviking.c b/client/cmdlfviking.c
index 588d335a8..d8d2554cf 100644
--- a/client/cmdlfviking.c
+++ b/client/cmdlfviking.c
@@ -20,7 +20,7 @@ static int usage_lf_viking_clone(void) {
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "       lf viking clone 1A337 Q5");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int usage_lf_viking_sim(void) {
@@ -34,7 +34,7 @@ static int usage_lf_viking_sim(void) {
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "       lf viking sim 1A337");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 //by marshmellow
@@ -42,14 +42,14 @@ static int usage_lf_viking_sim(void) {
 static int CmdVikingDemod(const char *Cmd) {
     if (!ASKDemod(Cmd, false, false, 1)) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - Viking ASKDemod failed");
-        return 0;
+        return PM3_ESOFT;
     }
     size_t size = DemodBufferLen;
 
     int ans = detectViking(DemodBuffer, &size);
     if (ans < 0) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - Viking Demod %d %s", ans, (ans == -5) ? "[chksum error]" : "");
-        return 0;
+        return PM3_ESOFT;
     }
     //got a good demod
     uint32_t raw1 = bytebits_to_byte(DemodBuffer + ans, 32);
@@ -60,7 +60,7 @@ static int CmdVikingDemod(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "Raw: %08X%08X", raw1, raw2);
     setDemodBuff(DemodBuffer, 64, ans);
     setClockGrid(g_DemodClock, g_DemodStartIdx + (ans * g_DemodClock));
-    return 1;
+    return PM3_SUCCESS;
 }
 
 //by marshmellow
@@ -93,9 +93,9 @@ static int CmdVikingClone(const char *Cmd) {
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
         PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
-        return -1;
+        return PM3_ETIMEOUT;
     }
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdVikingSim(const char *Cmd) {
@@ -136,7 +136,7 @@ static command_t CommandTable[] = {
 static int CmdHelp(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 int CmdLFViking(const char *Cmd) {

From 09b66e500dc26857941d43fe09e37bb0b2429e04 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 22 May 2019 09:46:40 -0400
Subject: [PATCH 1792/1938] chg - returns

---
 client/cmdlfpyramid.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c
index 81dc36bba..5d438a1de 100644
--- a/client/cmdlfpyramid.c
+++ b/client/cmdlfpyramid.c
@@ -25,7 +25,7 @@ static int usage_lf_pyramid_clone(void) {
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "       lf pyramid clone 123 11223");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int usage_lf_pyramid_sim(void) {
@@ -42,7 +42,7 @@ static int usage_lf_pyramid_sim(void) {
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "       lf pyramid sim 123 11223");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 //by marshmellow
@@ -55,7 +55,7 @@ static int CmdPyramidDemod(const char *Cmd) {
     size_t size = getFromGraphBuf(bits);
     if (size == 0) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - Pyramid not enough samples");
-        return 0;
+        return PM3_ESOFT;
     }
     //get binary from fsk wave
     int waveIdx = 0;
@@ -73,7 +73,7 @@ static int CmdPyramidDemod(const char *Cmd) {
             PrintAndLogEx(DEBUG, "DEBUG: Error - Pyramid: size not correct: %d", size);
         else
             PrintAndLogEx(DEBUG, "DEBUG: Error - Pyramid: error demoding fsk idx: %d", idx);
-        return 0;
+        return PM3_ESOFT;
     }
     setDemodBuff(bits, size, idx);
     setClockGrid(50, waveIdx + (idx * 50));
@@ -121,7 +121,7 @@ static int CmdPyramidDemod(const char *Cmd) {
             PrintAndLogEx(DEBUG, "DEBUG: Error - Pyramid: parity check failed - IDX: %d, hi3: %08X", idx, rawHi3);
         else
             PrintAndLogEx(DEBUG, "DEBUG: Error - Pyramid: at parity check - tag size does not match Pyramid format, SIZE: %d, IDX: %d, hi3: %08X", size, idx, rawHi3);
-        return 0;
+        return PM3_ESOFT;
     }
 
     // ok valid card found!
@@ -189,7 +189,7 @@ static int CmdPyramidDemod(const char *Cmd) {
     if (g_debugMode)
         printDemodBuff();
 
-    return 1;
+    return PM3_SUCCESS;
 }
 
 static int CmdPyramidRead(const char *Cmd) {
@@ -214,7 +214,7 @@ static int CmdPyramidClone(const char *Cmd) {
 
     if (!getPyramidBits(facilitycode, cardnumber, bs)) {
         PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
-        return 1;
+        return PM3_ESOFT;
     }
 
     //Pyramid - compat mode, FSK2a, data rate 50, 4 data blocks
@@ -251,10 +251,10 @@ static int CmdPyramidClone(const char *Cmd) {
         SendCommandNG(CMD_T55XX_WRITE_BLOCK, (uint8_t *)&ng, sizeof(ng));
         if (!WaitForResponseTimeout(CMD_T55XX_WRITE_BLOCK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
-            return -1;
+            return PM3_ETIMEOUT;
         }
     }
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdPyramidSim(const char *Cmd) {
@@ -277,7 +277,7 @@ static int CmdPyramidSim(const char *Cmd) {
 
     if (!getPyramidBits(facilitycode, cardnumber, bs)) {
         PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
-        return 1;
+        return ESOFT;
     }
 
     PrintAndLogEx(SUCCESS, "Simulating Farpointe/Pyramid - Facility Code: %u, CardNumber: %u", facilitycode, cardnumber);
@@ -308,7 +308,7 @@ int CmdLFPyramid(const char *Cmd) {
 int CmdHelp(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 // Works for 26bits.
@@ -339,7 +339,7 @@ int getPyramidBits(uint32_t fc, uint32_t cn, uint8_t *pyramidBits) {
 
     uint32_t crc = CRC8Maxim(csBuff, 13);
     num_to_bytebits(crc, 8, pyramidBits + 120);
-    return 1;
+    return PM3_SUCCESS;
 }
 
 int demodPyramid(void) {

From f8749c9ee94eab095ac9086b05a1d2e560da8a41 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 22 May 2019 09:47:03 -0400
Subject: [PATCH 1793/1938] chg - returns

---
 client/cmdlfpyramid.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c
index 5d438a1de..a30e3aa58 100644
--- a/client/cmdlfpyramid.c
+++ b/client/cmdlfpyramid.c
@@ -277,7 +277,7 @@ static int CmdPyramidSim(const char *Cmd) {
 
     if (!getPyramidBits(facilitycode, cardnumber, bs)) {
         PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
-        return ESOFT;
+        return PM3_ESOFT;
     }
 
     PrintAndLogEx(SUCCESS, "Simulating Farpointe/Pyramid - Facility Code: %u, CardNumber: %u", facilitycode, cardnumber);

From da2c8d0292ff3da44180b0a177ed9e3356627502 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 22 May 2019 09:48:57 -0400
Subject: [PATCH 1794/1938] chg - returns

---
 client/cmdlfpresco.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/cmdlfpresco.c b/client/cmdlfpresco.c
index 1345b717e..4c33334e6 100644
--- a/client/cmdlfpresco.c
+++ b/client/cmdlfpresco.c
@@ -212,7 +212,7 @@ int getWiegandFromPresco(const char *Cmd, uint32_t *sitecode, uint32_t *usercode
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
             case 'h':
-                return -1;
+                return PM3_EINVARG;
             case 'c':
                 hex = true;
                 //get hex
@@ -222,7 +222,7 @@ int getWiegandFromPresco(const char *Cmd, uint32_t *sitecode, uint32_t *usercode
             case 'd':
                 //param get string int param_getstr(const char *line, int paramnum, char * str)
                 stringlen = param_getstr(Cmd, cmdp + 1, id, sizeof(id));
-                if (stringlen < 2) return -1;
+                if (stringlen < 2) return PM3_EINVARG;
                 cmdp += 2;
                 break;
             case 'q':
@@ -236,7 +236,7 @@ int getWiegandFromPresco(const char *Cmd, uint32_t *sitecode, uint32_t *usercode
         }
     }
     //Validations
-    if (errors || cmdp == 0) return -1;
+    if (errors || cmdp == 0) return PM3_EINVARG;
 
     if (!hex) {
         for (int index = 0; index < strlen(id); ++index) {
@@ -259,7 +259,7 @@ int getWiegandFromPresco(const char *Cmd, uint32_t *sitecode, uint32_t *usercode
 
     *usercode = *fullcode & 0x0000FFFF; //% 65566
     *sitecode = (*fullcode >> 24) & 0x000000FF;  // /= 16777216;
-    return 0;
+    return PM3_SUCCESS;
 }
 
 // calc not certain - intended to get bitstream for programming / sim
@@ -268,7 +268,7 @@ int getPrescoBits(uint32_t fullcode, uint8_t *prescoBits) {
     num_to_bytebits(0x00000000, 32, prescoBits + 32);
     num_to_bytebits(0x00000000, 32, prescoBits + 64);
     num_to_bytebits(fullcode, 32, prescoBits + 96);
-    return 1;
+    return PM3_SUCCESS;
 }
 
 int demodPresco(void) {

From 8266514ef0cbab5dfecc31f6cd2ce19efc2bbc9c Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 22 May 2019 09:53:10 -0400
Subject: [PATCH 1795/1938] chg - returns

---
 client/cmdlfnedap.c | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/client/cmdlfnedap.c b/client/cmdlfnedap.c
index 028ed57fa..918b5151e 100644
--- a/client/cmdlfnedap.c
+++ b/client/cmdlfnedap.c
@@ -22,7 +22,7 @@ static int usage_lf_nedap_clone(void) {
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "       lf nedap clone 112233");
-    return 0;
+    return PM3_SUCCESS;
 }
 */
 
@@ -37,7 +37,7 @@ static int usage_lf_nedap_sim(void) {
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "       lf nedap sim 112233");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 //NEDAP demod - ASK/Biphase (or Diphase),  RF/64 with preamble of 1111111110  (always a 128 bit data stream)
@@ -45,9 +45,9 @@ static int usage_lf_nedap_sim(void) {
 static int CmdLFNedapDemod(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     //raw ask demod no start bit finding just get binary from wave
-    if (!ASKbiphaseDemod("0 64 1 0", false)) {
+    if (ASKbiphaseDemod("0 64 1 0", false) != PM3_SUCCESS) {
         if (g_debugMode) PrintAndLogEx(DEBUG, "DEBUG: Error - Nedap ASKbiphaseDemod failed");
-        return 0;
+        return PM3_ESOFT;
     }
     size_t size = DemodBufferLen;
     int idx = detectNedap(DemodBuffer, &size);
@@ -66,7 +66,7 @@ static int CmdLFNedapDemod(const char *Cmd) {
             else
                 PrintAndLogEx(DEBUG, "DEBUG: Error - Nedap idx: %d", idx);
         }
-        return 0;
+        return PM3_ESOFT;
     }
 
     /* Index map                                                      E                                                                              E
@@ -102,13 +102,13 @@ static int CmdLFNedapDemod(const char *Cmd) {
     uint8_t firstParity = GetParity(DemodBuffer, EVEN, 63);
     if (firstParity != DemodBuffer[63]) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - Nedap 1st 64bit parity check failed:  %d|%d ", DemodBuffer[63], firstParity);
-        return 0;
+        return PM3_ESOFT;
     }
 
     uint8_t secondParity = GetParity(DemodBuffer + 64, EVEN, 63);
     if (secondParity != DemodBuffer[127]) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - Nedap 2st 64bit parity check failed:  %d|%d ", DemodBuffer[127], secondParity);
-        return 0;
+        return PM3_ESOFT;
     }
 
     // ok valid card found!
@@ -136,7 +136,7 @@ static int CmdLFNedapDemod(const char *Cmd) {
         PrintAndLogEx(DEBUG, "BIN:\n%s", sprint_bin_break(DemodBuffer, 128, 64));
     }
 
-    return 1;
+    return PM3_SUCCESS;
 }
 /*
 configuration
@@ -181,9 +181,9 @@ static int CmdLFNedapClone(const char *Cmd) {
 
     cardnumber = (cn & 0x00FFFFFF);
 
-    if ( !getNedapBits(cardnumber, bits)) {
+    if ( getNedapBits(cardnumber, bits) == PM3_SUCCESS ) {
         PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
-        return 1;
+        return PM3_ESOFT;
     }
 
     ((ASK/DIphase   data rawdemod ab 0 64 1 0
@@ -221,10 +221,10 @@ static int CmdLFNedapClone(const char *Cmd) {
         SendCommandNG(CMD_T55XX_WRITE_BLOCK, (uint8_t *)&ng, sizeof(ng));
         if (!WaitForResponseTimeout(CMD_T55XX_WRITE_BLOCK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
-            return -1;
+            return PM3_ETIMEOUT;
         }
     }
-    return 0;
+    return PM3_SUCCESS;
 }
 */
 
@@ -245,9 +245,9 @@ static int CmdLFNedapSim(const char *Cmd) {
     // NEDAP,  Biphase = 2, clock 64, inverted,  (DIPhase == inverted BIphase
     uint8_t  clk = 64, encoding = 2, separator = 0, invert = 1;
 
-    if (!getNedapBits(cardnumber, bs)) {
+    if (getNedapBits(cardnumber, bs) != PM3_SUCCESS) {
         PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
-        return 1;
+        return PM3_ESOFT;
     }
 
     PrintAndLogEx(SUCCESS, "bin  %s", sprint_bin_break(bs, 128, 32));
@@ -306,7 +306,7 @@ static int CmdLFNedapChk(const char *Cmd) {
     }
 
     PrintAndLogEx(SUCCESS, "Nedap checksum: 0x%X", ((ch << 8) | cl));
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static command_t CommandTable[] = {
@@ -322,7 +322,7 @@ static command_t CommandTable[] = {
 static int CmdHelp(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 int CmdLFNedap(const char *Cmd) {
@@ -387,7 +387,7 @@ int getNedapBits(uint32_t cn, uint8_t *nedapBits) {
     memcpy(nedapBits, pre, 128);
 
     // 1111111110001011010000010110100011001001000010110101001101011001000110011010010000000000100001110001001000000001000101011100111
-    return 1;
+    return PM3_SUCCESS;
 }
 /*
  - UID: 001630

From 160110f56d7c811235aab5e7c10c6da3789f4b38 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 22 May 2019 09:57:29 -0400
Subject: [PATCH 1796/1938] chg - returns

---
 client/cmdlfio.c | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/client/cmdlfio.c b/client/cmdlfio.c
index c041032af..386a882ac 100644
--- a/client/cmdlfio.c
+++ b/client/cmdlfio.c
@@ -25,7 +25,7 @@ static int usage_lf_io_read(void) {
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "        lf io read");
     PrintAndLogEx(NORMAL, "        lf io read 1");
-    return 0;
+    return PM3_SUCCESS;
 }
 */
 static int usage_lf_io_sim(void) {
@@ -41,7 +41,7 @@ static int usage_lf_io_sim(void) {
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "       lf io sim 26 101 1337");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int usage_lf_io_clone(void) {
@@ -58,7 +58,7 @@ static int usage_lf_io_clone(void) {
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "       lf io clone 26 101 1337");
-    return 0;
+    return PM3_SUCCESS;
 }
 /*
 // this read loops on device side.
@@ -68,7 +68,7 @@ static int CmdIOProxRead_device(const char *Cmd) {
     int findone = (Cmd[0] == '1') ? 1 : 0;
     clearCommandBuffer();
     SendCommandMIX(CMD_IO_DEMOD_FSK, findone, 0, 0, NULL, 0);
-    return 0;
+    return PM3_SUCCESS;
 }
 */
 //by marshmellow
@@ -76,13 +76,12 @@ static int CmdIOProxRead_device(const char *Cmd) {
 //print ioprox ID and some format details
 static int CmdIOProxDemod(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
-    int retval = 0;
-    int idx = 0;
+    int idx = 0, retval = PM3_SUCCESS;
     uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
     size_t size = getFromGraphBuf(bits);
     if (size < 65) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - IO prox not enough samples in GraphBuffer");
-        return 0;
+        return PM3_ESOFT;
     }
     //get binary from fsk wave
     int waveIdx = 0;
@@ -105,7 +104,7 @@ static int CmdIOProxDemod(const char *Cmd) {
                 PrintAndLogEx(DEBUG, "DEBUG: Error - IO prox error demoding fsk %d", idx);
             }
         }
-        return 0;
+        return PM3_ESOFT;
     }
     setDemodBuff(bits, size, idx);
     setClockGrid(64, waveIdx + (idx * 64));
@@ -115,7 +114,7 @@ static int CmdIOProxDemod(const char *Cmd) {
             PrintAndLogEx(DEBUG, "DEBUG: Error - IO prox data not found - FSK Bits: %d", size);
             if (size > 92) PrintAndLogEx(DEBUG, "%s", sprint_bin_break(bits, 92, 16));
         }
-        return retval;
+        return PM3_ESOFT;
     }
 
     //Index map
@@ -154,12 +153,12 @@ static int CmdIOProxDemod(const char *Cmd) {
 
     if (crc == calccrc) {
         snprintf(crcStr, 3, "ok");
-        retval = 1;
+
     } else {
         PrintAndLogEx(DEBUG, "DEBUG: Error - IO prox crc failed");
 
         snprintf(crcStr, sizeof(crcStr), "failed 0x%02X != 0x%02X", crc, calccrc);
-        retval = 0;
+        retval = PM3_ESOFT;
     }
 
     PrintAndLogEx(SUCCESS, "IO Prox XSF(%02d)%02x:%05d (%08x%08x) [crc %s]", version, facilitycode, number, code, code2, crcStr);
@@ -202,9 +201,9 @@ static int CmdIOProxSim(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "Simulating IOProx version: %u FC: %u; CN: %u\n", version, fc, cn);
     PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation or run another command");
 
-    if (!getIOProxBits(version, fc, cn, bits)) {
+    if (getIOProxBits(version, fc, cn, bits) != PM3_SUCCESS) {
         PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
-        return 1;
+        return PM3_ESOFT;
     }
     // IOProx uses: fcHigh: 10, fcLow: 8, clk: 64, invert: 1
     // arg1 --- fcHigh<<8 + fcLow
@@ -241,9 +240,9 @@ static int CmdIOProxClone(const char *Cmd) {
         PrintAndLogEx(INFO, "Card Number Truncated to 16-bits (IOProx): %u", cn);
     }
 
-    if (!getIOProxBits(version, fc, cn, bits)) {
+    if (getIOProxBits(version, fc, cn, bits) != PM3_SUCCESS) {
         PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
-        return 1;
+        return PM3_ESOFT;
     }
 
     if (param_getchar(Cmd, 3) == 'Q' || param_getchar(Cmd, 3) == 'q')
@@ -257,7 +256,7 @@ static int CmdIOProxClone(const char *Cmd) {
 
     clearCommandBuffer();
     SendCommandMIX(CMD_IO_CLONE_TAG, blocks[1], blocks[2], 0, NULL, 0);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static command_t CommandTable[] = {
@@ -272,7 +271,7 @@ static command_t CommandTable[] = {
 static int CmdHelp(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 int CmdLFIO(const char *Cmd) {
@@ -348,6 +347,6 @@ int getIOProxBits(uint8_t version, uint8_t fc, uint16_t cn, uint8_t *bits) {
     memcpy(bits, pre, sizeof(pre));
 
     PrintAndLogEx(SUCCESS, "IO raw bits:\n %s \n", sprint_bin(bits, 64));
-    return 1;
+    return PM3_SUCCESS;
 }
 

From 1e4f7b7f683164e93a754002c1f3af3f187e9570 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 22 May 2019 10:07:27 -0400
Subject: [PATCH 1797/1938] chg - returns

---
 client/cmdlfawid.c | 60 +++++++++++++++++++++++-----------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c
index 1fc642e10..d24f3617b 100644
--- a/client/cmdlfawid.c
+++ b/client/cmdlfawid.c
@@ -27,7 +27,7 @@ static int usage_lf_awid_read(void) {
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "       lf awid read");
     PrintAndLogEx(NORMAL, "       lf awid read 1");
-    return 0;
+    return PM3_SUCCESS;
 }
 */
 static int usage_lf_awid_sim(void) {
@@ -44,7 +44,7 @@ static int usage_lf_awid_sim(void) {
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "       lf awid sim 26 224 1337");
     PrintAndLogEx(NORMAL, "       lf awid sim 50 2001 deadc0de");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int usage_lf_awid_clone(void) {
@@ -62,7 +62,7 @@ static int usage_lf_awid_clone(void) {
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "       lf awid clone 26 224 1337");
     PrintAndLogEx(NORMAL, "       lf awid clone 50 2001 13371337");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int usage_lf_awid_brute(void) {
@@ -83,28 +83,28 @@ static int usage_lf_awid_brute(void) {
     PrintAndLogEx(NORMAL, "       lf awid brute a 26 f 224");
     PrintAndLogEx(NORMAL, "       lf awid brute a 50 f 2001 d 2000");
     PrintAndLogEx(NORMAL, "       lf awid brute v a 50 f 2001 c 200 d 2000");
-    return 0;
+    return PM3_SUCCESS;
 }
 
-static bool sendPing(void) {
+static int sendPing(void) {
     SendCommandNG(CMD_PING, NULL, 0);
     SendCommandNG(CMD_PING, NULL, 0);
     SendCommandNG(CMD_PING, NULL, 0);
     clearCommandBuffer();
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_PING, &resp, 1000))
-        return false;
-    return true;
+        return PM3_ETIMEOUT;
+    return PM3_SUCCESS;
 }
 
-static bool sendTry(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint32_t delay, uint8_t *bits, size_t bs_len, bool verbose) {
+static int sendTry(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint32_t delay, uint8_t *bits, size_t bs_len, bool verbose) {
 
     if (verbose)
         PrintAndLogEx(INFO, "Trying FC: %u; CN: %u", fc, cn);
 
-    if (!getAWIDBits(fmtlen, fc, cn, bits)) {
+    if (getAWIDBits(fmtlen, fc, cn, bits) != PM3_SUCCESS) {
         PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
-        return false;
+        return PM3_ESOFT;
     }
 
     uint8_t clk = 50, high = 10, low = 8, invert = 1;
@@ -113,8 +113,7 @@ static bool sendTry(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint32_t delay, ui
     SendCommandOLD(CMD_FSK_SIM_TAG, (high << 8) + low, (invert << 8) + clk, bs_len, bits, bs_len);
 
     msleep(delay);
-    sendPing();
-    return true;
+    return sendPing();
 }
 
 static void verify_values(uint8_t *fmtlen, uint32_t *fc, uint32_t *cn) {
@@ -168,7 +167,7 @@ static int CmdAWIDRead_device(const char *Cmd) {
     uint8_t findone = (Cmd[0] == '1') ? 1 : 0;
     clearCommandBuffer();
     SendCommandMIX(CMD_AWID_DEMOD_FSK, findone, 0, 0, NULL, 0);
-    return 0;
+    return PM3_SUCCESS;
 }
 */
 //by marshmellow
@@ -180,7 +179,7 @@ static int CmdAWIDDemod(const char *Cmd) {
     size_t size = getFromGraphBuf(bits);
     if (size == 0) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - AWID not enough samples");
-        return 0;
+        return PM3_ESOFT;
     }
     //get binary from fsk wave
     int waveIdx = 0;
@@ -200,7 +199,7 @@ static int CmdAWIDDemod(const char *Cmd) {
         else
             PrintAndLogEx(DEBUG, "DEBUG: Error - AWID error demoding fsk %d", idx);
 
-        return 0;
+        return PM3_ESOFT;
     }
 
     setDemodBuff(bits, size, idx);
@@ -228,7 +227,7 @@ static int CmdAWIDDemod(const char *Cmd) {
     size = removeParity(bits, idx + 8, 4, 1, 88);
     if (size != 66) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - AWID at parity check-tag size does not match AWID format");
-        return 0;
+        return PM3_ESOFT;
     }
     // ok valid card found!
 
@@ -302,7 +301,7 @@ static int CmdAWIDDemod(const char *Cmd) {
     if (g_debugMode)
         printDemodBuff();
 
-    return 1;
+    return PM3_SUCCESS;
 }
 
 // this read is the "normal" read,  which download lf signal and tries to demod here.
@@ -330,9 +329,9 @@ static int CmdAWIDSim(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "Simulating AWID %u -- FC: %u; CN: %u\n", fmtlen, fc, cn);
     PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation or run another command");
 
-    if (!getAWIDBits(fmtlen, fc, cn, bits)) {
+    if ( getAWIDBits(fmtlen, fc, cn, bits) != PM3_SUCCESS ) {
         PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
-        return 1;
+        return PM3_ESOFT;
     }
 
     uint8_t clk = 50, high = 10, low = 8, invert = 1;
@@ -373,9 +372,9 @@ static int CmdAWIDClone(const char *Cmd) {
 
     verify_values(&fmtlen, &fc, &cn);
 
-    if (!getAWIDBits(fmtlen, fc, cn, bs)) {
+    if ( getAWIDBits(fmtlen, fc, cn, bs) != PM3_SUCCESS ) {
         PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
-        return 1;
+        return PM3_ESOFT;
     }
 
     blocks[1] = bytebits_to_byte(bs, 32);
@@ -406,10 +405,10 @@ static int CmdAWIDClone(const char *Cmd) {
         SendCommandNG(CMD_T55XX_WRITE_BLOCK, (uint8_t *)&ng, sizeof(ng));
         if (!WaitForResponseTimeout(CMD_T55XX_WRITE_BLOCK, &resp, T55XX_WRITE_TIMEOUT)) {
             PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
-            return -1;
+            return PM3_ETIMEOUT;
         }
     }
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdAWIDBrute(const char *Cmd) {
@@ -487,7 +486,7 @@ static int CmdAWIDBrute(const char *Cmd) {
 
         if (!session.pm3_present) {
             PrintAndLogEx(WARNING, "Device offline\n");
-            return  2;
+            return PM3_ENODATA;
         }
         if (ukbhit()) {
             int gc = getchar();
@@ -498,14 +497,14 @@ static int CmdAWIDBrute(const char *Cmd) {
 
         // Do one up
         if (up < 0xFFFF)
-            if (!sendTry(fmtlen, fc, up++, delay, bits, size, verbose)) return 1;
+            if ( sendTry(fmtlen, fc, up++, delay, bits, size, verbose) != PM3_SUCCESS) return PM3_ESOFT;
 
         // Do one down  (if cardnumber is given)
         if (cn > 1)
             if (down > 1)
-                if (!sendTry(fmtlen, fc, --down, delay, bits, size, verbose)) return 1;
+                if ( sendTry(fmtlen, fc, --down, delay, bits, size, verbose) != PM3_SUCCESS) return PM3_ESOFT;
     }
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static command_t CommandTable[] = {
@@ -521,7 +520,7 @@ static command_t CommandTable[] = {
 static int CmdHelp(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 int CmdLFAWID(const char *Cmd) {
@@ -576,11 +575,12 @@ int getAWIDBits(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint8_t *bits) {
     // add AWID 4bit parity
     size_t bitLen = addParity(pre, bits + 8, 66, 4, 1);
 
-    if (bitLen != 88) return 0;
+    if (bitLen != 88) 
+        return PM3_ESOFT;
 
     PrintAndLogEx(SUCCESS, "awid raw bits:\n %s \n", sprint_bin(bits, bitLen));
 
-    return 1;
+    return PM3_SUCCESS;
 }
 
 int demodAWID(void) {

From 150fc205b22bde3f9828e9bf5faeb8d8ecd8e8f3 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 22 May 2019 10:10:48 -0400
Subject: [PATCH 1798/1938] chg - returns

---
 client/cmdlfhid.c | 45 ++++++++++++++++++++++-----------------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c
index 330fbcb56..5d0556ade 100644
--- a/client/cmdlfhid.c
+++ b/client/cmdlfhid.c
@@ -29,7 +29,7 @@ static int usage_lf_hid_read(void) {
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "       lf hid read");
     PrintAndLogEx(NORMAL, "       lf hid read 1");
-    return 0;
+    return PM3_SUCCESS;
 }
 */
 static int usage_lf_hid_wiegand(void) {
@@ -43,7 +43,7 @@ static int usage_lf_hid_wiegand(void) {
     PrintAndLogEx(NORMAL, "       CN            - card number");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "      lf hid wiegand 0 101 2001");
-    return 0;
+    return PM3_SUCCESS;
 }
 static int usage_lf_hid_sim(void) {
     PrintAndLogEx(NORMAL, "Enables simulation of HID card with card number.");
@@ -55,7 +55,7 @@ static int usage_lf_hid_sim(void) {
     PrintAndLogEx(NORMAL, "       ID  - HID id");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "      lf hid sim 2006ec0c86");
-    return 0;
+    return PM3_SUCCESS;
 }
 static int usage_lf_hid_clone(void) {
     PrintAndLogEx(NORMAL, "Clone HID to T55x7.  Tag must be on antenna. ");
@@ -68,7 +68,7 @@ static int usage_lf_hid_clone(void) {
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "      lf hid clone 2006ec0c86");
     PrintAndLogEx(NORMAL, "      lf hid clone 2006ec0c86 L");
-    return 0;
+    return PM3_SUCCESS;
 }
 static int usage_lf_hid_brute(void) {
     PrintAndLogEx(NORMAL, "Enables bruteforce of HID readers with specified facility code.");
@@ -88,21 +88,21 @@ static int usage_lf_hid_brute(void) {
     PrintAndLogEx(NORMAL, "       lf hid brute a 26 f 224");
     PrintAndLogEx(NORMAL, "       lf hid brute a 26 f 21 d 2000");
     PrintAndLogEx(NORMAL, "       lf hid brute v a 26 f 21 c 200 d 2000");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 // sending three times.  Didn't seem to break the previous sim?
-static bool sendPing(void) {
+static int sendPing(void) {
     SendCommandNG(CMD_PING, NULL, 0);
     SendCommandNG(CMD_PING, NULL, 0);
     SendCommandNG(CMD_PING, NULL, 0);
     clearCommandBuffer();
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_PING, &resp, 1000))
-        return false;
-    return true;
+        return PM3_ETIMEOUT;
+    return PM3_SUCCESS;
 }
-static bool sendTry(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint32_t delay, uint8_t *bits, bool verbose) {
+static int sendTry(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint32_t delay, uint8_t *bits, bool verbose) {
 
     // this should be optional.
     if (verbose)
@@ -114,8 +114,7 @@ static bool sendTry(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint32_t delay, ui
     SendCommandMIX(CMD_HID_SIM_TAG, bytebits_to_byte(bits, 32), bytebits_to_byte(bits + 32, 32), 0, NULL, 0);
 
     msleep(delay);
-    sendPing();
-    return true;
+    return sendPing();
 }
 
 //by marshmellow (based on existing demod + holiman's refactor)
@@ -130,7 +129,7 @@ static int CmdHIDDemod(const char *Cmd) {
     size_t size = getFromGraphBuf(bits);
     if (size == 0) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - HID not enough samples");
-        return 0;
+        return PM3_ESOFT;
     }
     //get binary from fsk wave
     int waveIdx = 0;
@@ -150,7 +149,7 @@ static int CmdHIDDemod(const char *Cmd) {
         else
             PrintAndLogEx(DEBUG, "DEBUG: Error - HID error demoding fsk %d", idx);
 
-        return 0;
+        return PM3_ESOFT;
     }
 
     setDemodBuff(bits, size, idx);
@@ -158,7 +157,7 @@ static int CmdHIDDemod(const char *Cmd) {
 
     if (hi2 == 0 && hi == 0 && lo == 0) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - HID no values found");
-        return 0;
+        return PM3_ESOFT;
     }
 
     if (hi2 != 0) { //extra large HID tags
@@ -223,7 +222,7 @@ static int CmdHIDDemod(const char *Cmd) {
     if (g_debugMode)
         printDemodBuff();
 
-    return 1;
+    return PM3_SUCCESS;
 }
 
 // this read is the "normal" read,  which download lf signal and tries to demod here.
@@ -240,7 +239,7 @@ static int CmdHIDRead_device(const char *Cmd) {
     uint8_t findone = (Cmd[0] == '1') ? 1 : 0;
     clearCommandBuffer();
     SendCommandMIX(CMD_HID_DEMOD_FSK, findone, 0, 0, NULL, 0);
-    return 0;
+    return PM3_SUCCESS;
 }
 */
 static int CmdHIDSim(const char *Cmd) {
@@ -296,7 +295,7 @@ static int CmdHIDClone(const char *Cmd) {
 
     clearCommandBuffer();
     SendCommandOLD(CMD_HID_CLONE_TAG, hi2, hi, lo, longid, sizeof(longid));
-    return 0;
+    return PM3_SUCCESS;
 }
 
 /*
@@ -505,7 +504,7 @@ static int CmdHIDWiegand(const char *Cmd) {
                      );
     }
     PrintAndLogEx(NORMAL, "----+-----+-----+-------+-----------+--------------------");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdHIDBrute(const char *Cmd) {
@@ -575,7 +574,7 @@ static int CmdHIDBrute(const char *Cmd) {
 
         if (!session.pm3_present) {
             PrintAndLogEx(WARNING, "Device offline\n");
-            return  2;
+            return PM3_ENODATA;
         }
 
         if (ukbhit()) {
@@ -587,14 +586,14 @@ static int CmdHIDBrute(const char *Cmd) {
 
         // Do one up
         if (up < 0xFFFF)
-            if (!sendTry(fmtlen, fc, up++, delay, bits, verbose)) return 1;
+            if ( sendTry(fmtlen, fc, up++, delay, bits, verbose) != PM3_SUCCESS) return PM3_ESOFT;
 
         // Do one down  (if cardnumber is given)
         if (cn > 1)
             if (down > 1)
-                if (!sendTry(fmtlen, fc, --down, delay, bits, verbose)) return 1;
+                if (sendTry(fmtlen, fc, --down, delay, bits, verbose) != PM3_SUCCESS) return PM3_ESOFT;
     }
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static command_t CommandTable[] = {
@@ -611,7 +610,7 @@ static command_t CommandTable[] = {
 static int CmdHelp(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 int CmdLFHID(const char *Cmd) {

From 794d109f301d02649de331b9a21c05a3aedc188c Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 22 May 2019 11:59:39 -0400
Subject: [PATCH 1799/1938] chg: lf t55 - fixes / read block uses NG

---
 armsrc/appmain.c      | 12 +++++++++---
 armsrc/apps.h         |  2 +-
 armsrc/lfops.c        | 35 +++++++++++++++--------------------
 client/cmdlfparadox.c | 14 +++++++-------
 client/cmdlft55xx.c   | 28 ++++++++++++++++++++--------
 5 files changed, 52 insertions(+), 39 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index a75434d4d..bf5db7598 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -826,8 +826,7 @@ static void PacketReceived(PacketCommandNG *packet) {
                 uint16_t len;
                 uint16_t gap;
             } PACKED;
-            struct p *payload;
-            payload = (struct p*)packet->data.asBytes;
+            struct p *payload = (struct p*)packet->data.asBytes;
             // length, start gap, led control
             SimulateTagLowFrequency(payload->len, payload->gap, 1);
             reply_ng(CMD_SIMULATE_TAG_125K, PM3_EOPABORTED, NULL, 0);
@@ -846,7 +845,14 @@ static void PacketReceived(PacketCommandNG *packet) {
             );
             break;
         case CMD_T55XX_READ_BLOCK: {
-            T55xxReadBlock(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2]);
+            struct p {
+                uint32_t password;
+                uint8_t blockno;
+                uint8_t page;
+                bool pwdmode;
+            } PACKED;
+            struct p* payload = (struct p*) packet->data.asBytes;
+            T55xxReadBlock(payload->page, payload->pwdmode, false, payload->blockno, payload->password);
             break;
         }
         case CMD_T55XX_WRITE_BLOCK:
diff --git a/armsrc/apps.h b/armsrc/apps.h
index c37ac7c67..86dd4488c 100644
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -102,7 +102,7 @@ void CopyIndala224toT55x7(uint32_t uid1, uint32_t uid2, uint32_t uid3, uint32_t
 void T55xxResetRead(void);
 void T55xxWriteBlock(uint8_t *data);
 void T55xxWriteBlockExt(uint32_t data, uint8_t blockno, uint32_t pwd, uint8_t flags);
-void T55xxReadBlock(uint16_t arg0, uint8_t Block, uint32_t Pwd);
+void T55xxReadBlock(uint8_t page, bool pwd_mode, bool brute_mem, uint8_t block, uint32_t pwd);
 void T55xxWakeUp(uint32_t Pwd);
 void T55xx_ChkPwds(void);
 
diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index 2793b90a6..18aeadb07 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -1485,18 +1485,13 @@ void T55xxWriteBlock(uint8_t *data) {
 }
 
 // Read one card block in page [page]
-void T55xxReadBlock(uint16_t arg0, uint8_t Block, uint32_t Pwd) {
+void T55xxReadBlock(uint8_t page, bool pwd_mode, bool brute_mem, uint8_t block, uint32_t pwd) {
     LED_A_ON();
-    bool PwdMode = arg0 & 0x1;
-    uint8_t Page = (arg0 & 0x2) >> 1;
-    bool brute_mem =  arg0 & 0x4;
-    uint32_t i;
-
-    // regular read mode
-    bool RegReadMode = (Block == 0xFF);
-
+    bool regular_readmode = (block == 0xFF);
     uint8_t start_wait = 4;
     size_t samples = 12000;
+    uint32_t i;
+
     if (brute_mem) {
         start_wait = 0;
         samples = 1024;
@@ -1506,7 +1501,7 @@ void T55xxReadBlock(uint16_t arg0, uint8_t Block, uint32_t Pwd) {
     BigBuf_Clear_keep_EM();
 
     //make sure block is at max 7
-    Block &= 0x7;
+    block &= 0x7;
 
     // Set up FPGA, 125kHz to power up the tag
     LFSetupFPGAForADC(95, true);
@@ -1519,20 +1514,20 @@ void T55xxReadBlock(uint16_t arg0, uint8_t Block, uint32_t Pwd) {
 
     // Opcode 1[page]
     T55xxWriteBit(1);
-    T55xxWriteBit(Page); //Page 0
+    T55xxWriteBit(page); //Page 0
 
-    if (PwdMode) {
+    if (pwd_mode) {
         // Send Pwd
         for (i = 0x80000000; i != 0; i >>= 1)
-            T55xxWriteBit(Pwd & i);
+            T55xxWriteBit(pwd & i);
     }
     // Send a zero bit separation
     T55xxWriteBit(0);
 
     // Send Block number (if direct access mode)
-    if (!RegReadMode)
+    if (!regular_readmode)
         for (i = 0x04; i != 0; i >>= 1)
-            T55xxWriteBit(Block & i);
+            T55xxWriteBit(block & i);
 
     // Turn field on to read the response
     // 137*8 seems to get to the start of data pretty well...
@@ -1546,7 +1541,7 @@ void T55xxReadBlock(uint16_t arg0, uint8_t Block, uint32_t Pwd) {
     // Turn the field off
     if (!brute_mem) {
         FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-        reply_old(CMD_ACK, 0, 0, 0, 0, 0);
+        reply_ng(CMD_T55XX_READ_BLOCK, PM3_SUCCESS, NULL, 0);
         LED_A_OFF();
     }
 }
@@ -1566,7 +1561,9 @@ void T55xx_ChkPwds() {
     uint8_t x = 32;
     while (x--) {
         b1 = 0;
-        T55xxReadBlock(4, 1, 0);
+
+//        T55xxReadBlock(uint8_t page, bool pwd_mode, bool brute_mem, uint8_t block, uint32_t pwd)
+        T55xxReadBlock(0, 0, true, 1, 0);
         for (uint16_t j = 0; j < 1024; ++j)
             b1 += buf[j];
 
@@ -1578,7 +1575,6 @@ void T55xx_ChkPwds() {
     baseline >>= 5;
     Dbprintf("[=] Baseline determined [%u]", baseline);
 
-
     uint8_t *pwds = BigBuf_get_EM_addr();
     uint16_t pwdCount = 0;
     uint32_t candidate = 0;
@@ -1612,8 +1608,7 @@ void T55xx_ChkPwds() {
 
         pwd = bytes_to_num(pwds + i * 4, 4);
 
-
-        T55xxReadBlock(5, 0, pwd);
+        T55xxReadBlock(0, true, true, 0, pwd);
 
         // calc mean of BigBuf 1024 samples.
         uint32_t sum = 0;
diff --git a/client/cmdlfparadox.c b/client/cmdlfparadox.c
index 62b157386..f6e00bcd0 100644
--- a/client/cmdlfparadox.c
+++ b/client/cmdlfparadox.c
@@ -34,7 +34,7 @@ static int usage_lf_paradox_sim(void) {
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "       lf paradox sim 123 11223");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 //by marshmellow
@@ -47,7 +47,7 @@ static int CmdParadoxDemod(const char *Cmd) {
     size_t size = getFromGraphBuf(bits);
     if (size == 0) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - Paradox not enough samples");
-        return 0;
+        return PM3_ESOFT;
     }
 
     uint32_t hi2 = 0, hi = 0, lo = 0;
@@ -69,7 +69,7 @@ static int CmdParadoxDemod(const char *Cmd) {
         else
             PrintAndLogEx(DEBUG, "DEBUG: Error - Paradox error demoding fsk %d", idx);
 
-        return 0;
+        return PM3_ESOFT;
     }
 
     setDemodBuff(bits, size, idx);
@@ -77,7 +77,7 @@ static int CmdParadoxDemod(const char *Cmd) {
 
     if (hi2 == 0 && hi == 0 && lo == 0) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - Paradox no value found");
-        return 0;
+        return PM3_ESOFT;
     }
 
     uint32_t fc = ((hi & 0x3) << 6) | (lo >> 26);
@@ -100,7 +100,7 @@ static int CmdParadoxDemod(const char *Cmd) {
     if (g_debugMode)
         printDemodBuff();
 
-    return 1;
+    return PM3_SUCCESS;
 }
 //by marshmellow
 //see ASKDemod for what args are accepted
@@ -127,7 +127,7 @@ static int CmdParadoxSim(const char *Cmd) {
     facilitycode = (fc & 0x000000FF);
     cardnumber = (cn & 0x0000FFFF);
 
-    // if ( !GetParadoxBits(facilitycode, cardnumber, bs)) {
+    // if ( GetParadoxBits(facilitycode, cardnumber, bs) != PM3_SUCCESS) {
     // PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
     // return 1;
     // }
@@ -157,7 +157,7 @@ static command_t CommandTable[] = {
 static int CmdHelp(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 int CmdLFParadox(const char *Cmd) {
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 7610447ca..7046227eb 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -541,7 +541,7 @@ static int CmdT55xxDetect(const char *Cmd) {
     if (errors) return usage_t55xx_detect();
 
     // sanity check.
-    if (!SanityOfflineCheck(useGB)) return PM3_ENODATA;
+    if (SanityOfflineCheck(useGB) != PM3_SUCCESS) return PM3_ENODATA;
 
     if (!useGB) {
         if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, usepwd, password))
@@ -1116,7 +1116,7 @@ static int CmdT55xxReadTrace(const char *Cmd) {
 
     if (strlen(Cmd) == 0) {
         // sanity check.
-        if (!SanityOfflineCheck(false)) return PM3_ENODATA;
+        if (SanityOfflineCheck(false) != PM3_SUCCESS) return PM3_ENODATA;
 
         bool pwdmode = false;
         uint32_t password = 0;
@@ -1397,7 +1397,7 @@ static int CmdT55xxInfo(const char *Cmd) {
 
     if (!frombuff && !gotdata) {
         // sanity check.
-        if (!SanityOfflineCheck(false)) return PM3_ENODATA;
+        if (SanityOfflineCheck(false) != PM3_SUCCESS) return PM3_ENODATA;
 
         bool pwdmode = false;
         uint32_t password = 0;
@@ -1521,14 +1521,26 @@ static int CmdT55xxDump(const char *Cmd) {
 
 bool AquireData(uint8_t page, uint8_t block, bool pwdmode, uint32_t password) {
     // arg0 bitmodes:
-    //  bit0 = pwdmode
-    //  bit1 = page to read from
+    //  b0 = pwdmode
+    //  b1 = page to read from
+    //  b2 = brute_mem (armside function)
     // arg1: which block to read
     // arg2: password
-    uint8_t arg0 = (page << 1 | (pwdmode));
+    struct p {
+        uint32_t password;
+        uint8_t blockno;
+        uint8_t page;
+        bool pwdmode;
+    } PACKED;
+    struct p payload;
+    payload.password = password;
+    payload.blockno = block;
+    payload.page = page & 0x1;
+    payload.pwdmode = pwdmode;
+
     clearCommandBuffer();
-    SendCommandMIX(CMD_T55XX_READ_BLOCK, arg0, block, password, NULL, 0);
-    if (!WaitForResponseTimeout(CMD_ACK, NULL, 2500)) {
+    SendCommandNG(CMD_T55XX_READ_BLOCK, (uint8_t*)&payload, sizeof(payload));
+    if (!WaitForResponseTimeout(CMD_T55XX_READ_BLOCK, NULL, 2500)) {
         PrintAndLogEx(WARNING, "command execution time out");
         return false;
     }

From e0c9e2b0d161a720bcbceff67e8662acc5cd3a70 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 22 May 2019 23:30:52 +0200
Subject: [PATCH 1800/1938] rework usart RX timings

---
 armsrc/appmain.c  | 46 +++++++++++++++++++++++++++++++++++++++-------
 armsrc/ticks.c    |  7 +++++++
 armsrc/ticks.h    |  1 +
 client/cmdusart.c | 30 +++++++++++++++++++++++-------
 4 files changed, 70 insertions(+), 14 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index bf5db7598..78c9a8571 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1226,9 +1226,29 @@ static void PacketReceived(PacketCommandNG *packet) {
         }
         case CMD_USART_RX: {
             LED_B_ON();
+            struct p {
+                uint32_t waittime;
+            } PACKED;
+            struct p *payload = (struct p *) &packet->data.asBytes;
+            uint16_t available;
+            uint16_t pre_available = 0;
             uint8_t *dest = BigBuf_malloc(USART_FIFOLEN);
-            uint16_t available = usart_rxdata_available();
-
+            uint32_t wait = payload->waittime;
+            uint32_t ti = GetTickCount();
+            while (true) {
+                WaitMS(50);
+                available = usart_rxdata_available();
+                if (available > pre_available) {
+                    // When receiving data, reset timer and shorten timeout
+                    ti = GetTickCount();
+                    wait = 50;
+                    pre_available = available;
+                    continue;
+                }
+                // We stop either after waittime if no data or 50ms after last data received
+                if (GetTickCountDelta(ti) > wait)
+                    break;
+            }
             if (available > 0) {
                 uint16_t len = usart_read_ng(dest, available);
                 reply_ng(CMD_USART_RX, PM3_SUCCESS, dest, len);
@@ -1248,12 +1268,24 @@ static void PacketReceived(PacketCommandNG *packet) {
             struct p *payload = (struct p *) &packet->data.asBytes;
             usart_writebuffer_sync(payload->data, packet->length - sizeof(payload->waittime));
             uint16_t available;
-            WaitMS(payload->waittime);
-
+            uint16_t pre_available = 0;
             uint8_t *dest = BigBuf_malloc(USART_FIFOLEN);
-
-            available = usart_rxdata_available();
-            // Dbprintf("avail (%u)",  available);
+            uint32_t wait = payload->waittime;
+            uint32_t ti = GetTickCount();
+            while (true) {
+                WaitMS(50);
+                available = usart_rxdata_available();
+                if (available > pre_available) {
+                    // When receiving data, reset timer and shorten timeout
+                    ti = GetTickCount();
+                    wait = 50;
+                    pre_available = available;
+                    continue;
+                }
+                // We stop either after waittime if no data or 50ms after last data received
+                if (GetTickCountDelta(ti) > wait)
+                    break;
+            }
             if (available > 0) {
                 uint16_t len = usart_read_ng(dest, available);
                 reply_ng(CMD_USART_TXRX, PM3_SUCCESS, dest, len);
diff --git a/armsrc/ticks.c b/armsrc/ticks.c
index 73f68147f..7ece25b93 100644
--- a/armsrc/ticks.c
+++ b/armsrc/ticks.c
@@ -62,6 +62,13 @@ uint32_t RAMFUNC GetTickCount(void) {
     return AT91C_BASE_RTTC->RTTC_RTVR;// was * 2;
 }
 
+uint32_t RAMFUNC GetTickCountDelta(uint32_t start_ticks) {
+    uint32_t stop_ticks = AT91C_BASE_RTTC->RTTC_RTVR;
+    if (stop_ticks > start_ticks)
+        return stop_ticks - start_ticks;
+    return (UINT32_MAX - start_ticks) + stop_ticks;
+}
+
 //  -------------------------------------------------------------------------
 //  microseconds timer
 //  -------------------------------------------------------------------------
diff --git a/armsrc/ticks.h b/armsrc/ticks.h
index c6715e177..9ff0d6000 100644
--- a/armsrc/ticks.h
+++ b/armsrc/ticks.h
@@ -27,6 +27,7 @@ void SpinDelayUs(int us);
 
 void StartTickCount(void);
 uint32_t RAMFUNC GetTickCount(void);
+uint32_t RAMFUNC GetTickCountDelta(uint32_t start_ticks);
 
 void StartCountUS(void);
 uint32_t RAMFUNC GetCountUS(void);
diff --git a/client/cmdusart.c b/client/cmdusart.c
index e5261c79c..a13aa7a6c 100644
--- a/client/cmdusart.c
+++ b/client/cmdusart.c
@@ -75,12 +75,13 @@ static int usage_usart_txhex(void) {
 }
 
 static int usage_usart_rx(void) {
-    PrintAndLogEx(NORMAL, "Receive string over USART");
+    PrintAndLogEx(NORMAL, "Receive string over USART [t <timeout>]");
     PrintAndLogEx(NORMAL, _RED_("WARNING: it will have side-effects if used in USART HOST mode!"));
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Usage:  usart rx [h]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "           h          This help");
+    PrintAndLogEx(NORMAL, "           t <timeout> timeout in ms, default is 0ms");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "expected output: Received string");
     return PM3_SUCCESS;
@@ -90,9 +91,10 @@ static int usage_usart_rxhex(void) {
     PrintAndLogEx(NORMAL, "Receive bytes over USART");
     PrintAndLogEx(NORMAL, _RED_("WARNING: it will have side-effects if used in USART HOST mode!"));
     PrintAndLogEx(NORMAL, "");
-    PrintAndLogEx(NORMAL, "Usage:  usart rx [h]");
+    PrintAndLogEx(NORMAL, "Usage:  usart rxhex [h] [t <timeout>]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "           h          This help");
+    PrintAndLogEx(NORMAL, "           t <timeout> timeout in ms, default is 0ms");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "expected output: Received bytes");
     return PM3_SUCCESS;
@@ -147,11 +149,15 @@ static int usart_tx(uint8_t *data, size_t len) {
     return resp.status;
 }
 
-static int usart_rx(uint8_t *data, size_t *len) {
+static int usart_rx(uint8_t *data, size_t *len, uint32_t waittime) {
     clearCommandBuffer();
-    SendCommandNG(CMD_USART_RX, NULL, 0);
+    struct {
+        uint32_t waittime;
+    } PACKED payload;
+    payload.waittime = waittime;
+    SendCommandNG(CMD_USART_RX, (uint8_t *)&payload, sizeof(payload));
     PacketResponseNG resp;
-    if (!WaitForResponseTimeout(CMD_USART_RX, &resp, 1000)) {
+    if (!WaitForResponseTimeout(CMD_USART_RX, &resp, waittime + 500)) {
         return PM3_ETIMEOUT;
     }
     if (resp.status == PM3_SUCCESS) {
@@ -580,10 +586,15 @@ static int CmdUsartTX(const char *Cmd) {
 static int CmdUsartRX(const char *Cmd) {
     uint8_t cmdp = 0;
     bool errors = false;
+    uint32_t waittime = 0;
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
             case 'h':
                 return usage_usart_rx();
+            case 't':
+                waittime = param_get32ex(Cmd, cmdp + 1, 0, 10);
+                cmdp += 2;
+                break;
             default:
                 PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
                 errors = true;
@@ -597,7 +608,7 @@ static int CmdUsartRX(const char *Cmd) {
     }
     uint8_t data[PM3_CMD_DATA_SIZE] = {0x00};
     size_t len = 0;
-    int ret = usart_rx(data, &len);
+    int ret = usart_rx(data, &len, waittime);
     if (ret != PM3_SUCCESS)
         return ret;
     PrintAndLogEx(NORMAL, "RX:%.*s", len, data);
@@ -709,10 +720,15 @@ static int CmdUsartTXhex(const char *Cmd) {
 static int CmdUsartRXhex(const char *Cmd) {
     uint8_t cmdp = 0;
     bool errors = false;
+    uint32_t waittime = 0;
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
             case 'h':
                 return usage_usart_rxhex();
+            case 't':
+                waittime = param_get32ex(Cmd, cmdp + 1, 0, 10);
+                cmdp += 2;
+                break;
             default:
                 PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
                 errors = true;
@@ -727,7 +743,7 @@ static int CmdUsartRXhex(const char *Cmd) {
 
     uint8_t data[PM3_CMD_DATA_SIZE] = {0x00};
     size_t len = 0;
-    int ret = usart_rx(data, &len);
+    int ret = usart_rx(data, &len, waittime);
     if (ret != PM3_SUCCESS)
         return ret;
 

From 49de1a16559675881498aecc5fa14fdc3a20f07e Mon Sep 17 00:00:00 2001
From: Eloff <eloff@mail.ru>
Date: Thu, 23 May 2019 00:59:35 +0300
Subject: [PATCH 1801/1938] fix: 'hf 14a sim' ultralight COMPATIBLE_WRITE
 command, chg: 'hf 14a sim' incoming commands length checks, reorder block
 conditions

---
 armsrc/iso14443a.c | 409 ++++++++++++++++++++++++++-------------------
 1 file changed, 235 insertions(+), 174 deletions(-)

diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 15d17d8b8..c9d9ab281 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -1080,7 +1080,18 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
     int len = 0;
 
     // To control where we are in the protocol
-    int order = 0;
+#define ORDER_NONE           0
+#define ORDER_REQA           1
+#define ORDER_SELECT_ALL_CL1 2
+#define ORDER_SELECT_CL1     3
+#define ORDER_HALTED         5
+#define ORDER_WUPA           6
+#define ORDER_AUTH           7
+#define ORDER_SELECT_ALL_CL2 20
+#define ORDER_SELECT_CL2     30
+#define ORDER_EV1_COMP_WRITE 40
+#define ORDER_RATS           70
+    int order = ORDER_NONE;
     int lastorder;
 
     // Just to allow some checks
@@ -1089,6 +1100,9 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
     int cmdsRecvd = 0;
     tag_response_info_t *p_response;
 
+    // compatible write block number
+    uint8_t wrblock = 0;
+
     clear_trace();
     set_tracing(true);
     LED_A_ON();
@@ -1104,169 +1118,29 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
 
         // Okay, look at the command now.
         lastorder = order;
-        if (receivedCmd[0] == ISO14443A_CMD_REQA) { // Received a REQUEST
-            p_response = &responses[ATQA];
-            order = 1;
-        } else if (receivedCmd[0] == ISO14443A_CMD_WUPA) { // Received a WAKEUP
-            p_response = &responses[ATQA];
-            order = 6;
-        } else if (receivedCmd[1] == 0x20 && receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT) {    // Received request for UID (cascade 1)
-            p_response = &responses[UIDC1];
-            order = 2;
-        } else if (receivedCmd[1] == 0x20 && receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2) {  // Received request for UID (cascade 2)
-            p_response = &responses[UIDC2];
-            order = 20;
-        } else if (receivedCmd[1] == 0x70 && receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT) {    // Received a SELECT (cascade 1)
-            p_response = &responses[SAKC1];
-            order = 3;
-        } else if (receivedCmd[1] == 0x70 && receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2) {  // Received a SELECT (cascade 2)
-            p_response = &responses[SAKC2];
-            order = 30;
-        } else if (receivedCmd[0] == ISO14443A_CMD_READBLOCK) {    // Received a (plain) READ
-            uint8_t block = receivedCmd[1];
-            // if Ultralight or NTAG (4 byte blocks)
-            if (tagType == 7 || tagType == 2) {
-                if (block > pages) {
-                    // send NACK 0x0 == invalid argument
-                    EmSend4bit(CARD_NACK_IV);
-                } else {
-                    // first blocks of emu are header
-                    uint16_t start = block * 4 + MFU_DUMP_PREFIX_LENGTH;
-                    uint8_t emdata[MAX_MIFARE_FRAME_SIZE];
-                    emlGetMemBt(emdata, start, 16);
-                    AddCrc14A(emdata, 16);
-                    EmSendCmd(emdata, sizeof(emdata));
-                }
-                // We already responded, do not send anything with the EmSendCmd14443aRaw() that is called below
-                p_response = NULL;
-            } else if (tagType == 9 && block == 1) {
-                // FM11005SH.   16blocks,  4bytes / block.
-                //   block0 = 2byte Customer ID (CID), 2byte Manufacture ID (MID)
-                //   block1 = 4byte UID.
-                p_response = &responses[UIDC1];
-            } else { // all other tags (16 byte block tags)
-                uint8_t emdata[MAX_MIFARE_FRAME_SIZE];
-                emlGetMemBt(emdata, block, 16);
-                AddCrc14A(emdata, 16);
-                EmSendCmd(emdata, sizeof(emdata));
-                // EmSendCmd(data+(4*receivedCmd[1]),16);
-                // Dbprintf("Read request from reader: %x %x",receivedCmd[0],receivedCmd[1]);
-                // We already responded, do not send anything with the EmSendCmd14443aRaw() that is called below
-                p_response = NULL;
-            }
-        } else if (receivedCmd[0] == MIFARE_ULEV1_FASTREAD) {    // Received a FAST READ (ranged read)
-            uint8_t block1 = receivedCmd[1];
-            uint8_t block2 = receivedCmd[2];
-            if (block1 > pages) {
-                // send NACK 0x0 == invalid argument
-                EmSend4bit(CARD_NACK_IV);
-            } else {
-                uint8_t emdata[MAX_FRAME_SIZE];
+
+        //
+        // we need to check "ordered" states before, because received data may be same to any command - is wrong!!!
+        //
+
+        if (order == ORDER_EV1_COMP_WRITE && len == 18) {
+            // MIFARE_ULC_COMP_WRITE part 2
+            // 16 bytes data + 2 bytes crc, only least significant 4 bytes are written
+            bool isCrcCorrect = CheckCrc14A(receivedCmd, len);
+            if (isCrcCorrect) {
                 // first blocks of emu are header
-                int start = block1 * 4 + MFU_DUMP_PREFIX_LENGTH;
-                len   = (block2 - block1 + 1) * 4;
-                emlGetMemBt(emdata, start, len);
-                AddCrc14A(emdata, len);
-                EmSendCmd(emdata, len + 2);
-            }
-            p_response = NULL;
-        } else if ((receivedCmd[0] == MIFARE_ULC_WRITE || receivedCmd[0] == MIFARE_ULC_COMP_WRITE) && (tagType == 2 || tagType == 7)) {        // Received a WRITE
-            // cmd + block + 4/16 bytes data + 2 bytes crc
-            if (len == 8 || len == 20) {
-                bool isCrcCorrect = CheckCrc14A(receivedCmd, len);
-                if (isCrcCorrect) {
-                    uint8_t block = receivedCmd[1];
-                    if (block > pages) {
-                        // send NACK 0x0 == invalid argument
-                        EmSend4bit(CARD_NACK_IV);
-                    } else {
-                        // first blocks of emu are header
-                        emlSetMem_xt(&receivedCmd[2], block + MFU_DUMP_PREFIX_LENGTH / 4, 1, 4);
-                        // send ACK
-                        EmSend4bit(CARD_ACK);
-                    }
-                } else {
-                    // send NACK 0x1 == crc/parity error
-                    EmSend4bit(CARD_NACK_PA);
-                }
+                emlSetMem_xt(receivedCmd, wrblock + MFU_DUMP_PREFIX_LENGTH / 4, 1, 4);
+                // send ACK
+                EmSend4bit(CARD_ACK);
             } else {
-                // send NACK 0x0 == invalid argument
-                EmSend4bit(CARD_NACK_IV);
+                // send NACK 0x1 == crc/parity error
+                EmSend4bit(CARD_NACK_PA);
             }
+            order = ORDER_NONE; // back to work state
             p_response = NULL;
-        } else if (receivedCmd[0] == MIFARE_ULEV1_READSIG && tagType == 7) {    // Received a READ SIGNATURE --
-            p_response = &responses[SIGNATURE];
-        } else if (receivedCmd[0] == MIFARE_ULEV1_READ_CNT && tagType == 7) {    // Received a READ COUNTER --
-            uint8_t index = receivedCmd[1];
-            if (index > 2) {
-                // send NACK 0x0 == invalid argument
-                EmSend4bit(0x00);
-            } else {
-                uint8_t cmd[] =  {0x00, 0x00, 0x00, 0x14, 0xa5};
-                htole24(counters[index], cmd);
-                AddCrc14A(cmd, sizeof(cmd) - 2);
-                EmSendCmd(cmd, sizeof(cmd));
-            }
-            p_response = NULL;
-        } else if (receivedCmd[0] == MIFARE_ULEV1_INCR_CNT && tagType == 7) {    // Received a INC COUNTER --
-            uint8_t index = receivedCmd[1];
-            if (index > 2) {
-                // send NACK 0x0 == invalid argument
-                EmSend4bit(0x00);
-            } else {
-                uint32_t val = le24toh(receivedCmd + 2) + counters[index];
-                // if new value + old value is bigger 24bits,  fail
-                if (val > 0xFFFFFF) {
-                    // send NACK 0x4 == counter overflow
-                    EmSend4bit(CARD_NACK_NA);
-                } else {
-                    counters[index] = val;
-                    // send ACK
-                    EmSend4bit(CARD_ACK);
-                }
-            }
-            p_response = NULL;
-        } else if (receivedCmd[0] == MIFARE_ULEV1_CHECKTEAR && tagType == 7) {    // Received a CHECK_TEARING_EVENT --
-            // first 12 blocks of emu are [getversion answer - check tearing - pack - 0x00 - signature]
-            uint8_t index = receivedCmd[1];
-            if (index > 2) {
-                // send NACK 0x0 == invalid argument
-                EmSend4bit(0x00);
-            } else {
-                uint8_t cmd[3];
-                cmd[0] = tearings[index];
-                AddCrc14A(cmd, sizeof(cmd) - 2);
-                EmSendCmd(cmd, sizeof(cmd));
-            }
-            p_response = NULL;
-        } else if (receivedCmd[0] == ISO14443A_CMD_HALT) {    // Received a HALT
-            LogTrace(receivedCmd, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
-            p_response = NULL;
-        } else if (receivedCmd[0] == MIFARE_AUTH_KEYA || receivedCmd[0] == MIFARE_AUTH_KEYB) {    // Received an authentication request
-            if (tagType == 7) {     // IF NTAG /EV1  0x60 == GET_VERSION, not a authentication request.
-                p_response = &responses[VERSION];
-            } else {
-                cardAUTHKEY = receivedCmd[0] - 0x60;
-                cardAUTHSC = receivedCmd[1] / 4; // received block num
 
-                // incease nonce at AUTH requests. this is time consuming.
-                nonce = prng_successor(GetTickCount(), 32);
-                num_to_bytes(nonce, 4, dynamic_response_info.response);
-                dynamic_response_info.response_n = 4;
-
-                prepare_tag_modulation(&dynamic_response_info, DYNAMIC_MODULATION_BUFFER_SIZE);
-                p_response = &dynamic_response_info;
-                order = 7;
-            }
-        } else if (receivedCmd[0] == ISO14443A_CMD_RATS) {    // Received a RATS request
-            if (tagType == 1 || tagType == 2) {    // RATS not supported
-                EmSend4bit(CARD_NACK_NA);
-                p_response = NULL;
-            } else {
-                p_response = &responses[RATS];
-                order = 70;
-            }
-        } else if (order == 7 && len == 8) { // Received {nr] and {ar} (part of authentication)
+        } else if (order == ORDER_AUTH && len == 8) {
+            // Received {nr] and {ar} (part of authentication)
             LogTrace(receivedCmd, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
             uint32_t nr = bytes_to_num(receivedCmd, 4);
             uint32_t ar = bytes_to_num(receivedCmd + 4, 4);
@@ -1328,25 +1202,211 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
                         break;
                 }
             }
+            order = ORDER_NONE; // back to work state
             p_response = NULL;
 
-        } else if (receivedCmd[0] == MIFARE_ULC_AUTH_1) {  // ULC authentication, or Desfire Authentication
-        } else if (receivedCmd[0] == MIFARE_ULEV1_AUTH) { // NTAG / EV-1 authentication
-            if (tagType == 7) {
-                // PWD stored in dump now
-                uint8_t pwd[4];
-                emlGetMemBt(pwd, (pages - 1) * 4 + MFU_DUMP_PREFIX_LENGTH, sizeof(pwd));
-                if (memcmp(receivedCmd + 1, pwd, 4) == 0) {
-                    p_response = &responses[PACK]; // precompiled PACK
+            //
+            // now check commands in received buffer
+            //
+
+        } else if (receivedCmd[0] == ISO14443A_CMD_REQA && len == 1) { // Received a REQUEST
+            p_response = &responses[ATQA];
+            order = ORDER_REQA;
+        } else if (receivedCmd[0] == ISO14443A_CMD_WUPA && len == 1) { // Received a WAKEUP
+            p_response = &responses[ATQA];
+            order = ORDER_WUPA;
+        } else if (receivedCmd[1] == 0x20 && receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT && len == 2) {    // Received request for UID (cascade 1)
+            p_response = &responses[UIDC1];
+            order = ORDER_SELECT_ALL_CL1;
+        } else if (receivedCmd[1] == 0x20 && receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2 && len == 2) {  // Received request for UID (cascade 2)
+            p_response = &responses[UIDC2];
+            order = ORDER_SELECT_ALL_CL2;
+        } else if (receivedCmd[1] == 0x70 && receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT && len == 9) {    // Received a SELECT (cascade 1)
+            p_response = &responses[SAKC1];
+            order = ORDER_SELECT_CL1;
+        } else if (receivedCmd[1] == 0x70 && receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2 && len == 9) {  // Received a SELECT (cascade 2)
+            p_response = &responses[SAKC2];
+            order = ORDER_SELECT_CL2;
+        } else if (receivedCmd[0] == ISO14443A_CMD_READBLOCK && len == 4) {    // Received a (plain) READ
+            uint8_t block = receivedCmd[1];
+            // if Ultralight or NTAG (4 byte blocks)
+            if (tagType == 7 || tagType == 2) {
+                if (block > pages) {
+                    // send NACK 0x0 == invalid argument
+                    EmSend4bit(CARD_NACK_IV);
                 } else {
+                    // first blocks of emu are header
+                    uint16_t start = block * 4 + MFU_DUMP_PREFIX_LENGTH;
+                    uint8_t emdata[MAX_MIFARE_FRAME_SIZE];
+                    emlGetMemBt(emdata, start, 16);
+                    AddCrc14A(emdata, 16);
+                    EmSendCmd(emdata, sizeof(emdata));
+                }
+                // We already responded, do not send anything with the EmSendCmd14443aRaw() that is called below
+                p_response = NULL;
+            } else if (tagType == 9 && block == 1) {
+                // FM11005SH.   16blocks,  4bytes / block.
+                //   block0 = 2byte Customer ID (CID), 2byte Manufacture ID (MID)
+                //   block1 = 4byte UID.
+                p_response = &responses[UIDC1];
+            } else { // all other tags (16 byte block tags)
+                uint8_t emdata[MAX_MIFARE_FRAME_SIZE];
+                emlGetMemBt(emdata, block, 16);
+                AddCrc14A(emdata, 16);
+                EmSendCmd(emdata, sizeof(emdata));
+                // EmSendCmd(data+(4*receivedCmd[1]),16);
+                // Dbprintf("Read request from reader: %x %x",receivedCmd[0],receivedCmd[1]);
+                // We already responded, do not send anything with the EmSendCmd14443aRaw() that is called below
+                p_response = NULL;
+            }
+        } else if (receivedCmd[0] == MIFARE_ULEV1_FASTREAD && len == 5) {    // Received a FAST READ (ranged read)
+            uint8_t block1 = receivedCmd[1];
+            uint8_t block2 = receivedCmd[2];
+            if (block1 > pages) {
+                // send NACK 0x0 == invalid argument
+                EmSend4bit(CARD_NACK_IV);
+            } else {
+                uint8_t emdata[MAX_FRAME_SIZE];
+                // first blocks of emu are header
+                int start = block1 * 4 + MFU_DUMP_PREFIX_LENGTH;
+                len   = (block2 - block1 + 1) * 4;
+                emlGetMemBt(emdata, start, len);
+                AddCrc14A(emdata, len);
+                EmSendCmd(emdata, len + 2);
+            }
+            p_response = NULL;
+        } else if (receivedCmd[0] == MIFARE_ULC_WRITE && len == 8 && (tagType == 2 || tagType == 7)) {        // Received a WRITE
+            // cmd + block + 4 bytes data + 2 bytes crc
+            bool isCrcCorrect = CheckCrc14A(receivedCmd, len);
+            if (isCrcCorrect) {
+                uint8_t block = receivedCmd[1];
+                if (block > pages) {
+                    // send NACK 0x0 == invalid argument
+                    EmSend4bit(CARD_NACK_IV);
+                } else {
+                    // first blocks of emu are header
+                    emlSetMem_xt(&receivedCmd[2], block + MFU_DUMP_PREFIX_LENGTH / 4, 1, 4);
+                    // send ACK
+                    EmSend4bit(CARD_ACK);
+                }
+            } else {
+                // send NACK 0x1 == crc/parity error
+                EmSend4bit(CARD_NACK_PA);
+            }
+            p_response = NULL;
+        } else if (receivedCmd[0] == MIFARE_ULC_COMP_WRITE && len == 4 && (tagType == 2 || tagType == 7)) {
+            // cmd + block + 2 bytes crc
+            bool isCrcCorrect = CheckCrc14A(receivedCmd, len);
+            if (isCrcCorrect) {
+                wrblock = receivedCmd[1];
+                if (wrblock > pages) {
+                    // send NACK 0x0 == invalid argument
+                    EmSend4bit(CARD_NACK_IV);
+                } else {
+                    // send ACK
+                    EmSend4bit(CARD_ACK);
+                    // go to part 2
+                    order = ORDER_EV1_COMP_WRITE;
+                }
+            } else {
+                // send NACK 0x1 == crc/parity error
+                EmSend4bit(CARD_NACK_PA);
+            }
+            p_response = NULL;
+        } else if (receivedCmd[0] == MIFARE_ULEV1_READSIG && len == 4 && tagType == 7) {    // Received a READ SIGNATURE --
+            p_response = &responses[SIGNATURE];
+        } else if (receivedCmd[0] == MIFARE_ULEV1_READ_CNT && len == 4 && tagType == 7) {    // Received a READ COUNTER --
+            uint8_t index = receivedCmd[1];
+            if (index > 2) {
+                // send NACK 0x0 == invalid argument
+                EmSend4bit(CARD_NACK_IV);
+            } else {
+                uint8_t cmd[] =  {0x00, 0x00, 0x00, 0x14, 0xa5};
+                htole24(counters[index], cmd);
+                AddCrc14A(cmd, sizeof(cmd) - 2);
+                EmSendCmd(cmd, sizeof(cmd));
+            }
+            p_response = NULL;
+        } else if (receivedCmd[0] == MIFARE_ULEV1_INCR_CNT && len == 8 && tagType == 7) {    // Received a INC COUNTER --
+            uint8_t index = receivedCmd[1];
+            if (index > 2) {
+                // send NACK 0x0 == invalid argument
+                EmSend4bit(CARD_NACK_IV);
+            } else {
+                uint32_t val = le24toh(receivedCmd + 2) + counters[index];
+                // if new value + old value is bigger 24bits,  fail
+                if (val > 0xFFFFFF) {
+                    // send NACK 0x4 == counter overflow
                     EmSend4bit(CARD_NACK_NA);
-                    uint32_t pwd = bytes_to_num(receivedCmd + 1, 4);
-                    if (MF_DBGLEVEL >= MF_DBG_DEBUG) Dbprintf("Auth attempt: %08x", pwd);
-                    p_response = NULL;
+                } else {
+                    counters[index] = val;
+                    // send ACK
+                    EmSend4bit(CARD_ACK);
                 }
             }
-        } else if (receivedCmd[0] == MIFARE_ULEV1_VCSL) {
-            EmSend4bit(CARD_NACK_NA);
+            p_response = NULL;
+        } else if (receivedCmd[0] == MIFARE_ULEV1_CHECKTEAR && len == 4 && tagType == 7) {    // Received a CHECK_TEARING_EVENT --
+            // first 12 blocks of emu are [getversion answer - check tearing - pack - 0x00 - signature]
+            uint8_t index = receivedCmd[1];
+            if (index > 2) {
+                // send NACK 0x0 == invalid argument
+                EmSend4bit(CARD_NACK_IV);
+            } else {
+                uint8_t cmd[3];
+                cmd[0] = tearings[index];
+                AddCrc14A(cmd, sizeof(cmd) - 2);
+                EmSendCmd(cmd, sizeof(cmd));
+            }
+            p_response = NULL;
+        } else if (receivedCmd[0] == ISO14443A_CMD_HALT && len == 4) {    // Received a HALT
+            LogTrace(receivedCmd, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+            p_response = NULL;
+            order = ORDER_HALTED;
+        } else if (receivedCmd[0] == MIFARE_ULEV1_VERSION && len == 3 && (tagType == 2 || tagType == 7)) {
+            p_response = &responses[VERSION];
+        } else if ((receivedCmd[0] == MIFARE_AUTH_KEYA || receivedCmd[0] == MIFARE_AUTH_KEYB) && len == 4 && tagType != 2 && tagType != 7) {    // Received an authentication request
+            cardAUTHKEY = receivedCmd[0] - 0x60;
+            cardAUTHSC = receivedCmd[1] / 4; // received block num
+
+            // incease nonce at AUTH requests. this is time consuming.
+            nonce = prng_successor(GetTickCount(), 32);
+            num_to_bytes(nonce, 4, dynamic_response_info.response);
+            dynamic_response_info.response_n = 4;
+
+            prepare_tag_modulation(&dynamic_response_info, DYNAMIC_MODULATION_BUFFER_SIZE);
+            p_response = &dynamic_response_info;
+            order = ORDER_AUTH;
+        } else if (receivedCmd[0] == ISO14443A_CMD_RATS && len == 4) {    // Received a RATS request
+            if (tagType == 1 || tagType == 2) {    // RATS not supported
+                EmSend4bit(CARD_NACK_NA);
+                p_response = NULL;
+            } else {
+                p_response = &responses[RATS];
+                order = ORDER_RATS;
+            }
+        } else if (receivedCmd[0] == MIFARE_ULC_AUTH_1) {  // ULC authentication, or Desfire Authentication
+            LogTrace(receivedCmd, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
+            p_response = NULL;
+        } else if (receivedCmd[0] == MIFARE_ULEV1_AUTH && len == 7 && tagType == 7) { // NTAG / EV-1 authentication
+            // PWD stored in dump now
+            uint8_t pwd[4];
+            emlGetMemBt(pwd, (pages - 1) * 4 + MFU_DUMP_PREFIX_LENGTH, sizeof(pwd));
+            if (memcmp(receivedCmd + 1, pwd, 4) == 0) {
+                uint8_t cmd[4];
+                emlGetMemBt(cmd, pages * 4 + MFU_DUMP_PREFIX_LENGTH, 2);
+                AddCrc14A(cmd, sizeof(cmd) - 2);
+                EmSendCmd(cmd, sizeof(cmd));
+            } else {
+                EmSend4bit(CARD_NACK_NA);
+                uint32_t pwd = bytes_to_num(receivedCmd + 1, 4);
+                if (MF_DBGLEVEL >= MF_DBG_DEBUG) Dbprintf("Auth attempt: %08x", pwd);
+            }
+            p_response = NULL;
+        } else if (receivedCmd[0] == MIFARE_ULEV1_VCSL && len == 23 && tagType == 7) {
+            uint8_t cmd[3];
+            emlGetMemBt(cmd, (pages - 2) * 4 + 1 + MFU_DUMP_PREFIX_LENGTH, 1);
+            AddCrc14A(cmd, sizeof(cmd) - 2);
+            EmSendCmd(cmd, sizeof(cmd));
             p_response = NULL;
         } else {
             // Check for ISO 14443A-4 compliant commands, look at left nibble
@@ -1407,6 +1467,7 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
                     }
                     // Do not respond
                     dynamic_response_info.response_n = 0;
+                    order = ORDER_NONE; // back to work state
                 }
                 break;
             }
@@ -1429,10 +1490,10 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
         }
 
         // Count number of wakeups received after a halt
-        if (order == 6 && lastorder == 5) { happened++; }
+        if (order == ORDER_WUPA && lastorder == ORDER_HALTED) { happened++; }
 
         // Count number of other messages after a halt
-        if (order != 6 && lastorder == 5) { happened2++; }
+        if (order != ORDER_WUPA && lastorder == ORDER_HALTED) { happened2++; }
 
         cmdsRecvd++;
 

From 86ee0658cf601ba5e5a7263218f3b6fc1f4271a8 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 23 May 2019 00:05:45 +0200
Subject: [PATCH 1802/1938] rework rx timings in python scripts

---
 tools/btaddon/hc06_console_AT.py | 16 +++++++++++++---
 tools/btaddon/hc06_factory.py    | 24 +++++++++++++++++-------
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/tools/btaddon/hc06_console_AT.py b/tools/btaddon/hc06_console_AT.py
index d6405ebec..6520aa9aa 100755
--- a/tools/btaddon/hc06_console_AT.py
+++ b/tools/btaddon/hc06_console_AT.py
@@ -38,8 +38,18 @@ while 1 :
     else:
         ser.write(inp)
         out = b''
-        time.sleep(1)
-        while ser.inWaiting() > 0:
-            out += ser.read(1)
+        wait = 1
+        ti = time.perf_counter()
+        while True:
+            time.sleep(0.05)
+            if (ser.in_waiting > 0):
+                # When receiving data, reset timer and shorten timeout
+                ti = time.perf_counter()
+                wait = 0.05
+                out += ser.read(1)
+                continue
+            # We stop either after 1s if no data or 50ms after last data received
+            if time.perf_counter() - ti > wait:
+                break
         if out != b'':
             print("<< " + out.decode('utf8'))
diff --git a/tools/btaddon/hc06_factory.py b/tools/btaddon/hc06_factory.py
index e4e460289..f6d0f25b2 100755
--- a/tools/btaddon/hc06_factory.py
+++ b/tools/btaddon/hc06_factory.py
@@ -6,7 +6,7 @@ import serial
 name = b'PM3_RDV4.0'
 pin  = b'1234'
 role = b'M'
-#role = b'S'
+role = b'S'
 
 ser = None
 
@@ -28,13 +28,23 @@ p2c={
     serial.PARITY_EVEN:b'E'
 }
 
-def send(cmd):
+def send(cmd, timeout=1):
     print("<<" + cmd.decode('utf8'))
     ser.write(cmd)
     out = b''
-    time.sleep(1)
-    while ser.inWaiting() > 0:
-        out += ser.read(1)
+    wait = timeout
+    ti = time.perf_counter()
+    while True:
+        time.sleep(0.05)
+        if (ser.in_waiting > 0):
+            # When receiving data, reset timer and shorten timeout
+            ti = time.perf_counter()
+            wait = 0.05
+            out += ser.read(1)
+            continue
+        # We stop either after 1s if no data or 50ms after last data received
+        if time.perf_counter() - ti > wait:
+            break
     if out != b'':
         print(">>" + out.decode('utf8'))
     return out
@@ -58,7 +68,7 @@ def usart_bt_testcomm(baudrate, parity):
 if __name__ == '__main__':
     print("WARNING: process only if strictly needed!")
     print("This requires HC-06 dongle turned ON and NOT connected!")
-    if input("Is the HC-06 dingle LED blinking? (Say 'n' if you want to abort) [y/n] ") != 'y':
+    if input("Is the HC-06 dongle LED blinking? (Say 'n' if you want to abort) [y/n] ") != 'y':
         print("Aborting.")
         exit(1)
 
@@ -101,7 +111,7 @@ if __name__ == '__main__':
         bytesize=serial.EIGHTBITS
     )
     ser.isOpen()
-    if (send(b'AT') == b'OK'):
+    if (send(b'AT', timeout=2) == b'OK'):
         print("HC-06 dongle successfully reset")
     else:
         print("Lost contact with add-on, please try again")

From 0ec9323df0eb40a66d434ac9d3abcc8d3ccbd7ca Mon Sep 17 00:00:00 2001
From: Eloff <eloff@mail.ru>
Date: Thu, 23 May 2019 01:30:23 +0300
Subject: [PATCH 1803/1938] PACK-response to EV1 PASSWORD request no more used
 as precompiled sequense

---
 armsrc/iso14443a.c | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index c9d9ab281..9f44bbc1c 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -832,8 +832,6 @@ static bool SimulateIso14443aInit(int tagType, int flags, uint8_t *data, tag_res
     static uint8_t rSAKc2[3]  = { 0x00 };
     // dummy ATS (pseudo-ATR), answer to RATS
     static uint8_t rRATS[] = { 0x04, 0x58, 0x80, 0x02, 0x00, 0x00 };
-    // PACK response to PWD AUTH for EV1/NTAG
-    static uint8_t rPACK[4] = { 0x00 };
     // GET_VERSION response for EV1/NTAG
     static uint8_t rVERSION[10] = { 0x00 };
     // READ_SIG response for EV1/NTAG
@@ -850,7 +848,7 @@ static bool SimulateIso14443aInit(int tagType, int flags, uint8_t *data, tag_res
             sak = 0x00;
             // some first pages of UL/NTAG dump is special data
             mfu_dump_t *mfu_header = (mfu_dump_t *) BigBuf_get_EM_addr();
-            *pages = mfu_header->pages;
+            *pages = MAX(mfu_header->pages, 15);
         }
         break;
         case 3: { // MIFARE DESFire
@@ -880,7 +878,7 @@ static bool SimulateIso14443aInit(int tagType, int flags, uint8_t *data, tag_res
             sak = 0x00;
             // some first pages of UL/NTAG dump is special data
             mfu_dump_t *mfu_header = (mfu_dump_t *) BigBuf_get_EM_addr();
-            *pages = mfu_header->pages;
+            *pages = MAX(mfu_header->pages, 19);
             // counters and tearing flags
             for (int i = 0; i < 3; i++) {
                 counters[i] = le24toh(mfu_header->counter_tearing[i]);
@@ -892,9 +890,6 @@ static bool SimulateIso14443aInit(int tagType, int flags, uint8_t *data, tag_res
             // READ_SIG
             memcpy(rSIGN, mfu_header->signature, 32);
             AddCrc14A(rSIGN, sizeof(rSIGN) - 2);
-            // PACK, from last page of dump
-            emlGetMemBt(rPACK, MFU_DUMP_PREFIX_LENGTH + mfu_header->pages * 4, 2);
-            AddCrc14A(rPACK, sizeof(rPACK) - 2);
         }
         break;
         case 8: { // MIFARE Classic 4k
@@ -973,7 +968,7 @@ static bool SimulateIso14443aInit(int tagType, int flags, uint8_t *data, tag_res
     // TC(1) = 0x02: CID supported, NAD not supported
     AddCrc14A(rRATS, sizeof(rRATS) - 2);
 
-#define TAG_RESPONSE_COUNT 9
+#define TAG_RESPONSE_COUNT 8
     static tag_response_info_t responses_init[TAG_RESPONSE_COUNT] = {
         { .response = rATQA,      .response_n = sizeof(rATQA)      },  // Answer to request - respond with card type
         { .response = rUIDc1,     .response_n = sizeof(rUIDc1)     },  // Anticollision cascade1 - respond with uid
@@ -981,15 +976,14 @@ static bool SimulateIso14443aInit(int tagType, int flags, uint8_t *data, tag_res
         { .response = rSAKc1,     .response_n = sizeof(rSAKc1)     },  // Acknowledge select - cascade 1
         { .response = rSAKc2,     .response_n = sizeof(rSAKc2)     },  // Acknowledge select - cascade 2
         { .response = rRATS,      .response_n = sizeof(rRATS)      },  // dummy ATS (pseudo-ATR), answer to RATS
-        { .response = rPACK,      .response_n = sizeof(rPACK)      },  // EV1/NTAG PACK response
         { .response = rVERSION,   .response_n = sizeof(rVERSION)   },  // EV1/NTAG GET_VERSION response
         { .response = rSIGN,      .response_n = sizeof(rSIGN)      }   // EV1/NTAG READ_SIG response
     };
 
-    // "precompile" responses. There are 9 predefined responses with a total of 72 bytes data to transmit.
+    // "precompile" responses. There are 8 predefined responses with a total of 68 bytes data to transmit.
     // Coded responses need one byte per bit to transfer (data, parity, start, stop, correction)
-    // 72 * 8 data bits, 72 * 1 parity bits, 9 start bits, 9 stop bits, 9 correction bits -- 675 bytes buffer
-#define ALLOCATED_TAG_MODULATION_BUFFER_SIZE 675
+    // 68 * 8 data bits, 68 * 1 parity bits, 8 start bits, 8 stop bits, 8 correction bits -- 636 bytes buffer
+#define ALLOCATED_TAG_MODULATION_BUFFER_SIZE 636
 
     uint8_t *free_buffer = BigBuf_malloc(ALLOCATED_TAG_MODULATION_BUFFER_SIZE);
     // modulation buffer pointer and current buffer free space size
@@ -1015,9 +1009,8 @@ static bool SimulateIso14443aInit(int tagType, int flags, uint8_t *data, tag_res
 #define SAKC1     3
 #define SAKC2     4
 #define RATS      5
-#define PACK      6
-#define VERSION   7
-#define SIGNATURE 8
+#define VERSION   6
+#define SIGNATURE 7
 
     return true;
 }

From 522297896c0cf75d023348d61590f95cc345b63a Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 23 May 2019 00:39:50 +0200
Subject: [PATCH 1804/1938] Use GetTickCountDelta everywhere

---
 armsrc/Standalone/hf_colin.c | 18 +++++++++---------
 armsrc/appmain.c             | 13 ++++++-------
 armsrc/iso14443a.c           | 20 +++++++++++++-------
 3 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/armsrc/Standalone/hf_colin.c b/armsrc/Standalone/hf_colin.c
index dd6de79e3..9776d4b46 100644
--- a/armsrc/Standalone/hf_colin.c
+++ b/armsrc/Standalone/hf_colin.c
@@ -105,8 +105,8 @@ void ReadLastTagFromFlash() {
     }
     Flash_CheckBusy(BUSY_TIMEOUT);
 
-    uint32_t end_time;
-    uint32_t start_time = end_time = GetTickCount();
+    uint32_t start_time = GetTickCount();
+    uint32_t delta_time = 0;
 
     for (size_t i = 0; i < len; i += size) {
         len = MIN((len - i), size);
@@ -121,7 +121,7 @@ void ReadLastTagFromFlash() {
             return;
         }
     }
-    end_time = GetTickCount();
+    delta_time = GetTickCountDelta(start_time);
     DbprintfEx(FLAG_NEWLINE, "[OK] Last tag recovered from FLASHMEM set to emulator");
     cjSetCursLeft();
     DbprintfEx(FLAG_NEWLINE, "%s[IN]%s %s%dms%s for TAG_FLASH_READ", _GREEN_, _WHITE_, _YELLOW_, end_time - start_time, _WHITE_);
@@ -155,8 +155,8 @@ void WriteTagToFlash(uint8_t index, size_t size) {
     Flash_WriteEnable();
     Flash_Erase4k(0, 0);
 
-    uint32_t end_time;
-    uint32_t start_time = end_time = GetTickCount();
+    uint32_t start_time = GetTickCount();
+    uint32_t delta_time = 0;
 
     while (bytes_remaining > 0) {
         Flash_CheckBusy(BUSY_TIMEOUT);
@@ -184,7 +184,7 @@ void WriteTagToFlash(uint8_t index, size_t size) {
         LED_C_INV();
         LED_D_INV();
     }
-    end_time = GetTickCount();
+    delta_time = GetTickCountDelta(start_time);
 
     DbprintfEx(FLAG_NEWLINE, "[OK] TAG WRITTEN TO FLASH ! [0-to offset %u]", bytes_sent);
     cjSetCursLeft();
@@ -393,8 +393,8 @@ failtag:
     cjSetCursRight();
     DbprintfEx(FLAG_NEWLINE, "--------+--------------------+-------");
 
-    uint32_t end_time;
-    uint32_t start_time = end_time = GetTickCount();
+    uint32_t start_time = GetTickCount();
+    uint32_t delta_time = 0;
 
     //---------------------------------------------------------------------------
     // WE SHOULD FIND A WAY TO GET UID TO AVOID THIS "TESTRUN"
@@ -736,7 +736,7 @@ failtag:
         }
     }
 
-    end_time = GetTickCount();
+    delta_time = GetTickCountDelta(start_time);
     cjSetCursLeft();
 
     DbprintfEx(FLAG_NEWLINE, "%s>>%s Time for VIGIK break :%s%dms%s", _GREEN_, _WHITE_, _YELLOW_, end_time - start_time, _WHITE_);
diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 78c9a8571..cdd63efe3 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -382,23 +382,22 @@ void printConnSpeed(void) {
 
 #define CONN_SPEED_TEST_MIN_TIME 500 // in milliseconds
     uint8_t *test_data = BigBuf_get_addr();
-    uint32_t end_time;
-
-    uint32_t start_time = end_time = GetTickCount();
+    uint32_t start_time = GetTickCount();
+    uint32_t delta_time = 0;
     uint32_t bytes_transferred = 0;
 
     LED_B_ON();
 
-    while (end_time < start_time + CONN_SPEED_TEST_MIN_TIME) {
+    while (delta_time < CONN_SPEED_TEST_MIN_TIME) {
         reply_ng(CMD_DOWNLOADED_BIGBUF, PM3_SUCCESS, test_data, PM3_CMD_DATA_SIZE);
-        end_time = GetTickCount();
         bytes_transferred += PM3_CMD_DATA_SIZE;
+        delta_time = GetTickCountDelta(start_time);
     }
     LED_B_OFF();
 
-    Dbprintf("  Time elapsed............%dms", end_time - start_time);
+    Dbprintf("  Time elapsed............%dms", delta_time);
     Dbprintf("  Bytes transferred.......%d", bytes_transferred);
-    Dbprintf("  Transfer Speed PM3 -> Client = " _YELLOW_("%d") " bytes/s", 1000 * bytes_transferred / (end_time - start_time));
+    Dbprintf("  Transfer Speed PM3 -> Client = " _YELLOW_("%d") " bytes/s", 1000 * bytes_transferred / delta_time);
 }
 
 /**
diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 15d17d8b8..8be3f3640 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -1623,7 +1623,7 @@ void CodeIso14443aAsReaderPar(const uint8_t *cmd, uint16_t len, const uint8_t *p
 int EmGetCmd(uint8_t *received, uint16_t *len, uint8_t *par) {
     *len = 0;
 
-    uint32_t timer = 0, vtime;
+    uint32_t timer = 0;
     int analogCnt = 0;
     int analogAVG = 0;
 
@@ -1662,11 +1662,17 @@ int EmGetCmd(uint8_t *received, uint16_t *len, uint8_t *par) {
             AT91C_BASE_ADC->ADC_CR = AT91C_ADC_START;
             if (analogCnt >= 32) {
                 if ((MAX_ADC_HF_VOLTAGE_RDV40 * (analogAVG / analogCnt) >> 10) < MF_MINFIELDV) {
-                    vtime = GetTickCount();
-                    if (!timer) timer = vtime;
-                    // 50ms no field --> card to idle state
-                    if (vtime - timer > 50) return 2;
-                } else if (timer) timer = 0;
+                    if (timer == 0) {
+                        timer = GetTickCount();
+                    } else {
+                        // 50ms no field --> card to idle state
+                        if (GetTickCountDelta(timer) > 50) {
+                            return 2;
+                        }
+                    }
+                } else {
+                    timer = 0;
+                }
                 analogCnt = 0;
                 analogAVG = 0;
             }
@@ -2041,7 +2047,7 @@ static int GetATQA(uint8_t *resp, uint8_t *resp_par) {
         ReaderTransmitBitsPar(wupa, 7, NULL, NULL);
         // Receive the ATQA
         len = ReaderReceive(resp, resp_par);
-    } while (len == 0 && GetTickCount() <= start_time + WUPA_RETRY_TIMEOUT);
+    } while (len == 0 && GetTickCountDelta(start_time) <= WUPA_RETRY_TIMEOUT);
 
     iso14a_set_timeout(save_iso14a_timeout);
     return len;

From e7a464f5e7b3780fa05186647b9c3a7abe517da9 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 23 May 2019 00:40:23 +0200
Subject: [PATCH 1805/1938] hf_colin: fix colors compilation

---
 armsrc/Standalone/hf_colin.c | 76 ++++++++++++++++++------------------
 armsrc/Standalone/hf_colin.h | 16 ++++----
 2 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/armsrc/Standalone/hf_colin.c b/armsrc/Standalone/hf_colin.c
index 9776d4b46..32e3a4f8c 100644
--- a/armsrc/Standalone/hf_colin.c
+++ b/armsrc/Standalone/hf_colin.c
@@ -124,7 +124,7 @@ void ReadLastTagFromFlash() {
     delta_time = GetTickCountDelta(start_time);
     DbprintfEx(FLAG_NEWLINE, "[OK] Last tag recovered from FLASHMEM set to emulator");
     cjSetCursLeft();
-    DbprintfEx(FLAG_NEWLINE, "%s[IN]%s %s%dms%s for TAG_FLASH_READ", _GREEN_, _WHITE_, _YELLOW_, end_time - start_time, _WHITE_);
+    DbprintfEx(FLAG_NEWLINE, "%s[IN]%s %s%dms%s for TAG_FLASH_READ", _XGREEN_, _XWHITE_, _XYELLOW_, delta_time, _XWHITE_);
     cjSetCursLeft();
     FlashStop();
     SpinOff(0);
@@ -188,7 +188,7 @@ void WriteTagToFlash(uint8_t index, size_t size) {
 
     DbprintfEx(FLAG_NEWLINE, "[OK] TAG WRITTEN TO FLASH ! [0-to offset %u]", bytes_sent);
     cjSetCursLeft();
-    DbprintfEx(FLAG_NEWLINE, "%s[IN]%s %s%dms%s for TAG_FLASH_WRITE", _GREEN_, _WHITE_, _YELLOW_, end_time - start_time, _WHITE_);
+    DbprintfEx(FLAG_NEWLINE, "%s[IN]%s %s%dms%s for TAG_FLASH_WRITE", _XGREEN_, _XWHITE_, _XYELLOW_, delta_time, _XWHITE_);
     cjSetCursLeft();
     FlashStop();
     SpinOff(0);
@@ -329,8 +329,8 @@ void RunMod() {
     // banner:
     vtsend_reset(NULL);
     DbprintfEx(FLAG_NEWLINE, "\r\n%s", clearTerm);
-    DbprintfEx(FLAG_NEWLINE, "%s%s%s", _CYAN_, sub_banner, _WHITE_);
-    DbprintfEx(FLAG_NEWLINE, "%s>>%s C.J.B's MifareFastPwn Started\r\n", _RED_, _WHITE_);
+    DbprintfEx(FLAG_NEWLINE, "%s%s%s", _XCYAN_, sub_banner, _XWHITE_);
+    DbprintfEx(FLAG_NEWLINE, "%s>>%s C.J.B's MifareFastPwn Started\r\n", _XRED_, _XWHITE_);
 
     currline = 20;
     curlline = 20;
@@ -370,16 +370,16 @@ failtag:
 
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     vtsend_cursor_position_restore(NULL);
-    DbprintfEx(FLAG_NEWLINE, "\t\t\t%s[   GOT a Tag !   ]%s", _GREEN_, _WHITE_);
+    DbprintfEx(FLAG_NEWLINE, "\t\t\t%s[   GOT a Tag !   ]%s", _XGREEN_, _XWHITE_);
     cjSetCursLeft();
     DbprintfEx(FLAG_NEWLINE, "\t\t\t       `---> Breaking keys ---->");
     cjSetCursRight();
 
-    DbprintfEx(FLAG_NEWLINE, "\t%sGOT TAG :%s %08x%s", _RED_, _CYAN_, cjcuid, _WHITE_);
+    DbprintfEx(FLAG_NEWLINE, "\t%sGOT TAG :%s %08x%s", _XRED_, _XCYAN_, cjcuid, _XWHITE_);
 
     if (cjcuid == 0) {
         cjSetCursLeft();
-        DbprintfEx(FLAG_NEWLINE, "%s>>%s BUG: 0000_CJCUID! Retrying...", _RED_, _WHITE_);
+        DbprintfEx(FLAG_NEWLINE, "%s>>%s BUG: 0000_CJCUID! Retrying...", _XRED_, _XWHITE_);
         SpinErr(0, 100, 8);
         goto failtag;
     }
@@ -452,19 +452,19 @@ failtag:
                     // COMMON SCHEME 1  : INFINITRON/HEXACT
                     case 0x484558414354:
                         cjSetCursLeft();
-                        DbprintfEx(FLAG_NEWLINE, "%s>>>>>>>>>>>>!*STOP*!<<<<<<<<<<<<<<%s", _RED_, _WHITE_);
+                        DbprintfEx(FLAG_NEWLINE, "%s>>>>>>>>>>>>!*STOP*!<<<<<<<<<<<<<<%s", _XRED_, _XWHITE_);
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NEWLINE, "    .TAG SEEMS %sDETERMINISTIC%s.     ", _GREEN_, _WHITE_);
+                        DbprintfEx(FLAG_NEWLINE, "    .TAG SEEMS %sDETERMINISTIC%s.     ", _XGREEN_, _XWHITE_);
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NEWLINE, "%sDetected: %s INFI_HEXACT_VIGIK_TAG%s", _ORANGE_, _CYAN_, _WHITE_);
+                        DbprintfEx(FLAG_NEWLINE, "%sDetected: %s INFI_HEXACT_VIGIK_TAG%s", _XORANGE_, _XCYAN_, _XWHITE_);
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NEWLINE, "...%s[%sKey_derivation_schemeTest%s]%s...", _YELLOW_, _GREEN_, _YELLOW_, _GREEN_);
+                        DbprintfEx(FLAG_NEWLINE, "...%s[%sKey_derivation_schemeTest%s]%s...", _XYELLOW_, _XGREEN_, _XYELLOW_, _XGREEN_);
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NEWLINE, "%s>>>>>>>>>>>>!*DONE*!<<<<<<<<<<<<<<%s", _GREEN_, _WHITE_);
+                        DbprintfEx(FLAG_NEWLINE, "%s>>>>>>>>>>>>!*DONE*!<<<<<<<<<<<<<<%s", _XGREEN_, _XWHITE_);
                         ;
                         // Type 0 / A first
                         uint16_t t = 0;
@@ -597,19 +597,19 @@ failtag:
                     case 0x8829da9daf76:
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NEWLINE, "%s>>>>>>>>>>>>!*STOP*!<<<<<<<<<<<<<<%s", _RED_, _WHITE_);
+                        DbprintfEx(FLAG_NEWLINE, "%s>>>>>>>>>>>>!*STOP*!<<<<<<<<<<<<<<%s", _XRED_, _XWHITE_);
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NEWLINE, "    .TAG SEEMS %sDETERMINISTIC%s.     ", _GREEN_, _WHITE_);
+                        DbprintfEx(FLAG_NEWLINE, "    .TAG SEEMS %sDETERMINISTIC%s.     ", _XGREEN_, _XWHITE_);
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NEWLINE, "%sDetected :%sURMET_CAPTIVE_VIGIK_TAG%s", _ORANGE_, _CYAN_, _WHITE_);
+                        DbprintfEx(FLAG_NEWLINE, "%sDetected :%sURMET_CAPTIVE_VIGIK_TAG%s", _XORANGE_, _XCYAN_, _XWHITE_);
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NEWLINE, "...%s[%sKey_derivation_schemeTest%s]%s...", _YELLOW_, _GREEN_, _YELLOW_, _GREEN_);
+                        DbprintfEx(FLAG_NEWLINE, "...%s[%sKey_derivation_schemeTest%s]%s...", _XYELLOW_, _XGREEN_, _XYELLOW_, _XGREEN_);
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NEWLINE, "%s>>>>>>>>>>>>!*DONE*!<<<<<<<<<<<<<<%s", _GREEN_, _WHITE_);
+                        DbprintfEx(FLAG_NEWLINE, "%s>>>>>>>>>>>>!*DONE*!<<<<<<<<<<<<<<%s", _XGREEN_, _XWHITE_);
                         cjSetCursLeft();
 
                         // emlClearMem();
@@ -639,19 +639,19 @@ failtag:
                     case 0x424c41524f4e:
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NEWLINE, "%s>>>>>>>>>>>>!*STOP*!<<<<<<<<<<<<<<%s", _RED_, _WHITE_);
+                        DbprintfEx(FLAG_NEWLINE, "%s>>>>>>>>>>>>!*STOP*!<<<<<<<<<<<<<<%s", _XRED_, _XWHITE_);
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NEWLINE, "    .TAG SEEMS %sDETERMINISTIC%s.     ", _GREEN_, _WHITE_);
+                        DbprintfEx(FLAG_NEWLINE, "    .TAG SEEMS %sDETERMINISTIC%s.     ", _XGREEN_, _XWHITE_);
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NEWLINE, "%s  Detected :%sNORALSY_VIGIK_TAG %s", _ORANGE_, _CYAN_, _WHITE_);
+                        DbprintfEx(FLAG_NEWLINE, "%s  Detected :%sNORALSY_VIGIK_TAG %s", _XORANGE_, _XCYAN_, _XWHITE_);
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NEWLINE, "...%s[%sKey_derivation_schemeTest%s]%s...", _YELLOW_, _GREEN_, _YELLOW_, _GREEN_);
+                        DbprintfEx(FLAG_NEWLINE, "...%s[%sKey_derivation_schemeTest%s]%s...", _XYELLOW_, _XGREEN_, _XYELLOW_, _XGREEN_);
                         cjSetCursLeft();
 
-                        DbprintfEx(FLAG_NEWLINE, "%s>>>>>>>>>>>>!*DONE*!<<<<<<<<<<<<<<%s", _GREEN_, _WHITE_);
+                        DbprintfEx(FLAG_NEWLINE, "%s>>>>>>>>>>>>!*DONE*!<<<<<<<<<<<<<<%s", _XGREEN_, _XWHITE_);
 
                         t = 0;
                         for (uint16_t s = 0; s < sectorsCnt; s++) {
@@ -692,7 +692,7 @@ failtag:
     if (!allKeysFound) {
         cjSetCursLeft();
         cjTabulize();
-        DbprintfEx(FLAG_NEWLINE, "%s[ FAIL ]%s\r\n->did not found all the keys :'(", _RED_, _WHITE_);
+        DbprintfEx(FLAG_NEWLINE, "%s[ FAIL ]%s\r\n->did not found all the keys :'(", _XRED_, _XWHITE_);
         cjSetCursLeft();
         SpinErr(1, 100, 8);
         SpinOff(100);
@@ -711,18 +711,18 @@ failtag:
     }
     cjSetCursLeft();
 
-    DbprintfEx(FLAG_NEWLINE, "%s>>%s Setting Keys->Emulator MEM...[%sOK%s]", _YELLOW_, _WHITE_, _GREEN_, _WHITE_);
+    DbprintfEx(FLAG_NEWLINE, "%s>>%s Setting Keys->Emulator MEM...[%sOK%s]", _XYELLOW_, _XWHITE_, _XGREEN_, _XWHITE_);
 
     /* filling TAG to emulator */
     uint8_t filled = 0;
     cjSetCursLeft();
 
-    DbprintfEx(FLAG_NEWLINE, "%s>>%s Filling Emulator <- from A keys...", _YELLOW_, _WHITE_);
+    DbprintfEx(FLAG_NEWLINE, "%s>>%s Filling Emulator <- from A keys...", _XYELLOW_, _XWHITE_);
     e_MifareECardLoad(sectorsCnt, 0, 0, &filled);
     if (filled != 1) {
         cjSetCursLeft();
 
-        DbprintfEx(FLAG_NEWLINE, "%s>>%s W_FAILURE ! %sTrying fallback B keys....", _RED_, _ORANGE_, _WHITE_);
+        DbprintfEx(FLAG_NEWLINE, "%s>>%s W_FAILURE ! %sTrying fallback B keys....", _XRED_, _XORANGE_, _XWHITE_);
 
         /* no trace, no dbg  */
         e_MifareECardLoad(sectorsCnt, 1, 0, &filled);
@@ -739,7 +739,7 @@ failtag:
     delta_time = GetTickCountDelta(start_time);
     cjSetCursLeft();
 
-    DbprintfEx(FLAG_NEWLINE, "%s>>%s Time for VIGIK break :%s%dms%s", _GREEN_, _WHITE_, _YELLOW_, end_time - start_time, _WHITE_);
+    DbprintfEx(FLAG_NEWLINE, "%s>>%s Time for VIGIK break :%s%dms%s", _XGREEN_, _XWHITE_, _XYELLOW_, delta_time, _XWHITE_);
 
     vtsend_cursor_position_save(NULL);
     vtsend_set_attribute(NULL, 1);
@@ -758,11 +758,11 @@ readysim:
     DbprintfEx(FLAG_NEWLINE, "-> We launch Emulation ->");
     cjSetCursLeft();
 
-    DbprintfEx(FLAG_NEWLINE, "%s!> HOLD ON : %s When you'll click, simm will stop", _RED_, _WHITE_);
+    DbprintfEx(FLAG_NEWLINE, "%s!> HOLD ON : %s When you'll click, simm will stop", _XRED_, _XWHITE_);
     cjSetCursLeft();
 
-    DbprintfEx(FLAG_NEWLINE, "Then %s immediately %s we'll try to %s dump our emulator state%s \r\nin a %s chinese tag%s", _RED_, _WHITE_, _YELLOW_, _WHITE_,
-               _CYAN_, _WHITE_);
+    DbprintfEx(FLAG_NEWLINE, "Then %s immediately %s we'll try to %s dump our emulator state%s \r\nin a %s chinese tag%s", _XRED_, _XWHITE_, _XYELLOW_, _XWHITE_,
+               _XCYAN_, _XWHITE_);
     cjSetCursLeft();
     cjSetCursLeft();
 
@@ -777,7 +777,7 @@ readysim:
     LED_C_OFF();
     SpinOff(50);
     vtsend_cursor_position_restore(NULL);
-    DbprintfEx(FLAG_NEWLINE, "[   SIMUL ENDED   ]%s", _GREEN_, _WHITE_);
+    DbprintfEx(FLAG_NEWLINE, "[   SIMUL ENDED   ]%s", _XGREEN_, _XWHITE_);
     cjSetCursLeft();
 
     DbprintfEx(FLAG_NEWLINE, "<- We're out of Emulation");
@@ -789,7 +789,7 @@ readysim:
     saMifareMakeTag();
     cjSetCursLeft();
     vtsend_cursor_position_restore(NULL);
-    DbprintfEx(FLAG_NEWLINE, "%s[ CLONED? ]", _CYAN_);
+    DbprintfEx(FLAG_NEWLINE, "%s[ CLONED? ]", _XCYAN_);
 
     DbprintfEx(FLAG_NEWLINE, "-> End Cloning.");
     WDT_HIT();
@@ -799,7 +799,7 @@ readysim:
     cjTabulize();
     vtsend_set_attribute(NULL, 0);
     vtsend_set_attribute(NULL, 7);
-    DbprintfEx(FLAG_NEWLINE, "- [ LA FIN ] -\r\n%s`-> You can take shell back :) ...", _WHITE_);
+    DbprintfEx(FLAG_NEWLINE, "- [ LA FIN ] -\r\n%s`-> You can take shell back :) ...", _XWHITE_);
     cjSetCursLeft();
     vtsend_set_attribute(NULL, 0);
     SpinErr(3, 100, 16);
@@ -909,7 +909,7 @@ int cjat91_saMifareChkKeys(uint8_t blockNo, uint8_t keyType, bool clearTrace, ui
         // if (!iso14443a_fast_select_card(cjuid, 0)) {
         if (!iso14443a_select_card(cjuid, NULL, &cjcuid, true, 0, true)) {
             cjSetCursLeft();
-            DbprintfEx(FLAG_NEWLINE, "%sFATAL%s : E_MF_LOSTTAG", _RED_, _WHITE_);
+            DbprintfEx(FLAG_NEWLINE, "%sFATAL%s : E_MF_LOSTTAG", _XRED_, _XWHITE_);
             return -1;
         }
 
@@ -968,7 +968,7 @@ void saMifareMakeTag(void) {
             if (currfline > 53) {
                 currfline = 54;
             }
-            DbprintfEx(FLAG_NEWLINE, "Block :%02x %sOK%s", blockNum, _GREEN_, _WHITE_);
+            DbprintfEx(FLAG_NEWLINE, "Block :%02x %sOK%s", blockNum, _XGREEN_, _XWHITE_);
             //                                                      DbprintfEx(FLAG_RAWPRINT,"FATAL:E_MF_CHINESECOOK_NORICE");
             //                                                      cfail=1;
             // return;
@@ -977,15 +977,15 @@ void saMifareMakeTag(void) {
             cjSetCursLeft();
             cjSetCursLeft();
 
-            DbprintfEx(FLAG_NEWLINE, "`--> %sFAIL%s : CHN_FAIL_BLK_%02x_NOK", _RED_, _WHITE_, blockNum);
+            DbprintfEx(FLAG_NEWLINE, "`--> %sFAIL%s : CHN_FAIL_BLK_%02x_NOK", _XRED_, _XWHITE_, blockNum);
             cjSetCursFRight();
-            DbprintfEx(FLAG_NEWLINE, "%s>>>>%s STOP AT %02x", _RED_, _WHITE_, blockNum);
+            DbprintfEx(FLAG_NEWLINE, "%s>>>>%s STOP AT %02x", _XRED_, _XWHITE_, blockNum);
             cfail++;
             break;
         }
         cjSetCursFRight();
 
-        DbprintfEx(FLAG_NEWLINE, "%s>>>>>>>> END <<<<<<<<%s", _YELLOW_, _WHITE_);
+        DbprintfEx(FLAG_NEWLINE, "%s>>>>>>>> END <<<<<<<<%s", _XYELLOW_, _XWHITE_);
         // break;
         /*if (cfail == 1) {
                 DbprintfEx(FLAG_RAWPRINT,"FATAL: E_MF_HARA_KIRI_\r\n");
diff --git a/armsrc/Standalone/hf_colin.h b/armsrc/Standalone/hf_colin.h
index 251620626..982764dd4 100644
--- a/armsrc/Standalone/hf_colin.h
+++ b/armsrc/Standalone/hf_colin.h
@@ -30,14 +30,14 @@
 #include "apps.h"
 #include "printf.h"
 
-#define _RED_ "\x1b[31m"
-#define _GREEN_ "\x1b[32m"
-#define _YELLOW_ "\x1b[33m"
-#define _BLUE_ "\x1b[34m"
-#define _MAGENTA_ "\x1b[35m"
-#define _CYAN_ "\x1b[36m"
-#define _WHITE_ "\x1b[0m"
-#define _ORANGE_ _YELLOW_
+#define _XRED_ "\x1b[31m"
+#define _XGREEN_ "\x1b[32m"
+#define _XYELLOW_ "\x1b[33m"
+#define _XBLUE_ "\x1b[34m"
+#define _XMAGENTA_ "\x1b[35m"
+#define _XCYAN_ "\x1b[36m"
+#define _XWHITE_ "\x1b[0m"
+#define _XORANGE_ _XYELLOW_
 
 int cjat91_saMifareChkKeys(uint8_t blockNo, uint8_t keyType, bool clearTrace, uint8_t keyCount, uint8_t *datain, uint64_t *key);
 void e_MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain);

From 81053d8c428fa8389105d1caf08ae34a45482cf8 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 23 May 2019 03:03:24 -0400
Subject: [PATCH 1806/1938] fix: standalone mode mattyrun now compiles

---
 armsrc/Standalone/hf_mattyrun.c | 20 ++++++++++----------
 armsrc/apps.h                   |  2 +-
 armsrc/mifarecmd.c              |  3 ++-
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/armsrc/Standalone/hf_mattyrun.c b/armsrc/Standalone/hf_mattyrun.c
index 002a50c51..6362c170b 100644
--- a/armsrc/Standalone/hf_mattyrun.c
+++ b/armsrc/Standalone/hf_mattyrun.c
@@ -235,7 +235,7 @@ void RunMod() {
     uint64_t key64;                 // Defines current key
     uint8_t *keyBlock;              // Where the keys will be held in memory.
     uint8_t stKeyBlock = 20;        // Set the quantity of keys in the block.
-    uint8_t filled = 0;             // Used to check if the memory was filled with success.
+    int filled;                     // Used to check if the memory was filled with success.
     bool keyFound = false;
 
     /*
@@ -369,26 +369,26 @@ void RunMod() {
         if (ecfill) {
 
             Dbprintf("\tFilling in with key A.");
-            MifareECardLoad(sectorsCnt, 0, 0, &filled);
-            if (filled != 1) {
+            filled = MifareECardLoad(sectorsCnt, 0);
+            if (filled != PM3_SUCCESS) {
                 Dbprintf("\t✕ Failed filling with A.");
             }
 
             Dbprintf("\tFilling in with key B.");
-            MifareECardLoad(sectorsCnt, 1, 0, &filled);
-            if (filled != 1) {
+            filled = MifareECardLoad(sectorsCnt, 1);
+            if (filled != PM3_SUCCESS) {
                 Dbprintf("\t✕ Failed filling with B.");
             }
 
-            if ((filled == 1) && simulation) {
-                Dbprintf("\t✓ Filled, simulation started.");
+            if ((filled == PM3_SUCCESS) && simulation) {
+                Dbprintf("\t✓ Emulator memory filled, simulation started.");
 
                 // This will tell the fpga to emulate using previous keys and current target tag content.
                 Dbprintf("\t Press button to abort simulation at anytime.");
 
                 LED_B_ON(); // green
                 // assuming arg0==0,  use hardcoded uid 0xdeadbeaf
-                Mifare1ksim(FLAG_4B_UID_IN_DATA | FLAG_UID_IN_EMUL, 0, 0, uid);
+                Mifare1ksim(FLAG_4B_UID_IN_DATA | FLAG_UID_IN_EMUL, 0, uid);
                 LED_B_OFF();
 
                 /*
@@ -428,8 +428,8 @@ void RunMod() {
                     }
 
                 }
-            } else if (filled != 1) {
-                Dbprintf("\t✕ Memory could not be filled due to errors.");
+            } else if (filled != PM3_SUCCESS) {
+                Dbprintf("\t✕ Emulator memory could not be filled due to errors.");
                 LED_C_ON();
             }
         }
diff --git a/armsrc/apps.h b/armsrc/apps.h
index 86dd4488c..3aeedbcee 100644
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -159,7 +159,7 @@ void MifareSetDbgLvl(uint16_t arg0);
 void MifareEMemClr(void);
 void MifareEMemSet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain);
 void MifareEMemGet(uint32_t arg0, uint32_t arg1);
-void MifareECardLoad(uint32_t arg0, uint32_t arg1);
+int MifareECardLoad(uint32_t arg0, uint32_t arg1);
 void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain);  // Work with "magic Chinese" card
 void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain);
 void MifareCIdent();  // is "magic chinese" card?
diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index c4f0ae3df..c1dbaced8 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -1650,7 +1650,7 @@ void MifareEMemGet(uint32_t arg0, uint32_t arg1) {
 // Load a card into the emulator memory
 //
 //-----------------------------------------------------------------------------
-void MifareECardLoad(uint32_t arg0, uint32_t arg1) {
+int MifareECardLoad(uint32_t arg0, uint32_t arg1) {
     uint64_t ui64Key;
     uint32_t cuid = 0;
     uint8_t numSectors = arg0;
@@ -1726,6 +1726,7 @@ void MifareECardLoad(uint32_t arg0, uint32_t arg1) {
     if (MF_DBGLEVEL >= 2) DbpString("EMUL FILL SECTORS FINISHED");
 
     set_tracing(false);
+    return (isOK) ? PM3_SUCCESS : PM3_EUNDEF;
 }
 
 

From e5a9e31b9f96570c531980393deefb27cedfb46d Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 23 May 2019 03:11:01 -0400
Subject: [PATCH 1807/1938] fix: standalone mode VIGIKPWN now compiles

---
 armsrc/Standalone/hf_colin.c | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/armsrc/Standalone/hf_colin.c b/armsrc/Standalone/hf_colin.c
index 32e3a4f8c..9c3b14c32 100644
--- a/armsrc/Standalone/hf_colin.c
+++ b/armsrc/Standalone/hf_colin.c
@@ -714,19 +714,19 @@ failtag:
     DbprintfEx(FLAG_NEWLINE, "%s>>%s Setting Keys->Emulator MEM...[%sOK%s]", _XYELLOW_, _XWHITE_, _XGREEN_, _XWHITE_);
 
     /* filling TAG to emulator */
-    uint8_t filled = 0;
+    int filled;
     cjSetCursLeft();
 
     DbprintfEx(FLAG_NEWLINE, "%s>>%s Filling Emulator <- from A keys...", _XYELLOW_, _XWHITE_);
-    e_MifareECardLoad(sectorsCnt, 0, 0, &filled);
-    if (filled != 1) {
+    filled = e_MifareECardLoad(sectorsCnt, 0);
+    if (filled != PM3_SUCCESS) {
         cjSetCursLeft();
 
         DbprintfEx(FLAG_NEWLINE, "%s>>%s W_FAILURE ! %sTrying fallback B keys....", _XRED_, _XORANGE_, _XWHITE_);
 
         /* no trace, no dbg  */
-        e_MifareECardLoad(sectorsCnt, 1, 0, &filled);
-        if (filled != 1) {
+        filled = e_MifareECardLoad(sectorsCnt, 1);
+        if (filled != PM3_SUCCESS) {
             cjSetCursLeft();
 
             DbprintfEx(FLAG_NEWLINE, "FATAL:EML_FALLBACKFILL_B");
@@ -773,7 +773,7 @@ readysim:
 
     SpinOff(100);
     LED_C_ON();
-    Mifare1ksim(FLAG_4B_UID_IN_DATA | FLAG_UID_IN_EMUL, 0, 0, cjuid);
+    Mifare1ksim(FLAG_4B_UID_IN_DATA | FLAG_UID_IN_EMUL, 0, cjuid);
     LED_C_OFF();
     SpinOff(50);
     vtsend_cursor_position_restore(NULL);
@@ -812,11 +812,11 @@ readysim:
  * - *datain used as error return
  * - tracing is falsed
  */
-void e_MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain) {
+int e_MifareECardLoad(uint32_t numofsectors, uint8_t keytype) {
     MF_DBGLEVEL = MF_DBG_NONE;
 
-    uint8_t numSectors = arg0;
-    uint8_t keyType = arg1;
+    uint8_t numSectors = numofsectors;
+    uint8_t keyType = keytype;
 
     struct Crypto1State mpcs = {0, 0};
     struct Crypto1State *pcs;
@@ -864,7 +864,6 @@ void e_MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *dat
                 break;
             };
             if (isOK) {
-                *datain = 1;
                 if (blockNo < NumBlocksPerSector(s) - 1) {
                     emlSetMem(dataoutbuf, FirstBlockOfSector(s) + blockNo, 1);
                 } else {
@@ -873,8 +872,6 @@ void e_MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *dat
                     memcpy(&dataoutbuf2[6], &dataoutbuf[6], 4);
                     emlSetMem(dataoutbuf2, FirstBlockOfSector(s) + blockNo, 1);
                 }
-            } else {
-                *datain = 0;
             }
         }
     }
@@ -888,8 +885,7 @@ void e_MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *dat
 
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 
-    if (MF_DBGLEVEL >= 2)
-        DbpString("EMUL FILL SECTORS FINISHED\n");
+    return (isOK) ? PM3_SUCCESS : PM3_EUNDEF;
 }
 
 /* the chk function is a piwi’ed(tm) check that will try all keys for

From 4b89938dcd395322302d95eaf74ac66ed7412c87 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 23 May 2019 03:11:05 -0400
Subject: [PATCH 1808/1938] fix: standalone mode VIGIKPWN now compiles

---
 armsrc/Standalone/hf_colin.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/armsrc/Standalone/hf_colin.h b/armsrc/Standalone/hf_colin.h
index 982764dd4..8c8e391e1 100644
--- a/armsrc/Standalone/hf_colin.h
+++ b/armsrc/Standalone/hf_colin.h
@@ -40,7 +40,7 @@
 #define _XORANGE_ _XYELLOW_
 
 int cjat91_saMifareChkKeys(uint8_t blockNo, uint8_t keyType, bool clearTrace, uint8_t keyCount, uint8_t *datain, uint64_t *key);
-void e_MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain);
+int e_MifareECardLoad(uint32_t numofsectors, uint8_t keytype);
 void saMifareMakeTag(void);
 int saMifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain);
 void WriteTagToFlash(uint8_t index, size_t size);

From 2988249fe7441706420d0e1550bbfc1f3ce1be3b Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 23 May 2019 03:11:35 -0400
Subject: [PATCH 1809/1938] style

---
 armsrc/mifaresim.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/armsrc/mifaresim.c b/armsrc/mifaresim.c
index 501d93a8a..3e49e379e 100644
--- a/armsrc/mifaresim.c
+++ b/armsrc/mifaresim.c
@@ -417,7 +417,7 @@ static bool MifareSimInit(uint16_t flags, uint8_t *datain, tag_response_info_t *
 */
 void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t *datain) {
     tag_response_info_t *responses;
-    uint8_t	cardSTATE = MFEMUL_NOFIELD;
+    uint8_t cardSTATE = MFEMUL_NOFIELD;
     uint8_t uid_len = 0; // 4,7, 10
     uint32_t cuid = 0;
 

From bb45aad212322186a558367cc38ba7debf1cdb01 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 23 May 2019 03:40:01 -0400
Subject: [PATCH 1810/1938] fix: mattyrun - use 10/7/4 uid (@McEloff)

---
 armsrc/Standalone/hf_mattyrun.c | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/armsrc/Standalone/hf_mattyrun.c b/armsrc/Standalone/hf_mattyrun.c
index 6362c170b..b34af0571 100644
--- a/armsrc/Standalone/hf_mattyrun.c
+++ b/armsrc/Standalone/hf_mattyrun.c
@@ -37,6 +37,7 @@ on a blank card.
 
 uint8_t uid[10];
 uint32_t cuid;
+iso14a_card_select_t p_card;
 
 //-----------------------------------------------------------------------------
 // Matt's StandAlone mod.
@@ -74,7 +75,7 @@ static int saMifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_
     while (true) {
         // get UID from chip
         if (workFlags & 0x01) {
-            if (!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
+            if (!iso14443a_select_card(uid, &p_card, &cuid, true, 0, true)) {
                 DbprintfEx(FLAG_NEWLINE, "Can't select card");
                 break;
             };
@@ -167,7 +168,7 @@ static int saMifareChkKeys(uint8_t blockNo, uint8_t keyType, bool clearTrace, ui
 
         /* no need for anticollision. just verify tag is still here */
         // if (!iso14443a_fast_select_card(cjuid, 0)) {
-        if (!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
+        if (!iso14443a_select_card(uid, &p_card, &cuid, true, 0, true)) {
             DbprintfEx(FLAG_NEWLINE, "FATAL : E_MF_LOSTTAG");
             return -1;
         }
@@ -388,7 +389,19 @@ void RunMod() {
 
                 LED_B_ON(); // green
                 // assuming arg0==0,  use hardcoded uid 0xdeadbeaf
-                Mifare1ksim(FLAG_4B_UID_IN_DATA | FLAG_UID_IN_EMUL, 0, uid);
+                uint16_t flags;
+                switch (p_card.uidlen){
+                    case 10: 
+                        flags = FLAG_10B_UID_IN_DATA;
+                        break;
+                    case 7:
+                        flags = FLAG_7B_UID_IN_DATA;
+                        break;
+                    default:
+                        flags = FLAG_4B_UID_IN_DATA;
+                        break;
+                }
+                Mifare1ksim(flags | FLAG_MF_1K, 0, uid);
                 LED_B_OFF();
 
                 /*

From cd9092c58a79d45661163d9e6551e2c89d183a64 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 23 May 2019 03:44:06 -0400
Subject: [PATCH 1811/1938] fix: VIGIKPWN - use 10/7/4 uid (@McEloff)

---
 armsrc/Standalone/hf_colin.c | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/armsrc/Standalone/hf_colin.c b/armsrc/Standalone/hf_colin.c
index 9c3b14c32..22467f2d3 100644
--- a/armsrc/Standalone/hf_colin.c
+++ b/armsrc/Standalone/hf_colin.c
@@ -16,6 +16,7 @@
 
 uint8_t cjuid[10];
 uint32_t cjcuid;
+iso14a_card_select_t p_card;
 int currline;
 int currfline;
 int curlline;
@@ -350,7 +351,7 @@ failtag:
     LED_A_ON();
     uint8_t ticker = 0;
     //while (!BUTTON_PRESS() && !iso14443a_select_card(cjuid, NULL, &cjcuid, true, 0, true))
-    while (!iso14443a_select_card(cjuid, NULL, &cjcuid, true, 0, true)) {
+    while (!iso14443a_select_card(cjuid, &p_card, &cjcuid, true, 0, true)) {
         WDT_HIT();
 
         ticker++;
@@ -773,7 +774,20 @@ readysim:
 
     SpinOff(100);
     LED_C_ON();
-    Mifare1ksim(FLAG_4B_UID_IN_DATA | FLAG_UID_IN_EMUL, 0, cjuid);
+
+    uint16_t flags;
+    switch (p_card.uidlen){
+        case 10: 
+            flags = FLAG_10B_UID_IN_DATA;
+            break;
+        case 7:
+            flags = FLAG_7B_UID_IN_DATA;
+            break;
+        default:
+            flags = FLAG_4B_UID_IN_DATA;
+            break;
+    }
+    Mifare1ksim(flags | FLAG_MF_1K, 0, cjuid);
     LED_C_OFF();
     SpinOff(50);
     vtsend_cursor_position_restore(NULL);
@@ -832,7 +846,7 @@ int e_MifareECardLoad(uint32_t numofsectors, uint8_t keytype) {
 
     bool isOK = true;
 
-    if (!iso14443a_select_card(cjuid, NULL, &cjcuid, true, 0, true)) {
+    if (!iso14443a_select_card(cjuid, &p_card, &cjcuid, true, 0, true)) {
         isOK = false;
         if (MF_DBGLEVEL >= 1)
             DbprintfEx(FLAG_RAWPRINT, "Can't select card");
@@ -903,7 +917,7 @@ int cjat91_saMifareChkKeys(uint8_t blockNo, uint8_t keyType, bool clearTrace, ui
 
         /* no need for anticollision. just verify tag is still here */
         // if (!iso14443a_fast_select_card(cjuid, 0)) {
-        if (!iso14443a_select_card(cjuid, NULL, &cjcuid, true, 0, true)) {
+        if (!iso14443a_select_card(cjuid, &p_card, &cjcuid, true, 0, true)) {
             cjSetCursLeft();
             DbprintfEx(FLAG_NEWLINE, "%sFATAL%s : E_MF_LOSTTAG", _XRED_, _XWHITE_);
             return -1;
@@ -1034,7 +1048,7 @@ int saMifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *data
 
         // get UID from chip
         if (workFlags & 0x01) {
-            if (!iso14443a_select_card(cjuid, NULL, &cjcuid, true, 0, true)) {
+            if (!iso14443a_select_card(cjuid, &p_card, &cjcuid, true, 0, true)) {
                 DbprintfEx(FLAG_NEWLINE, "Can't select card");
                 break;
             };

From 78d7077f0109851ab1a8706c266fd95b0c4ce2dc Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 23 May 2019 05:02:28 -0400
Subject: [PATCH 1812/1938] chg: more keys

---
 client/default_keys.dic | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/client/default_keys.dic b/client/default_keys.dic
index e2b1bd228..0e977ad2d 100644
--- a/client/default_keys.dic
+++ b/client/default_keys.dic
@@ -101,6 +101,8 @@ fc00018778f7,--VästtrafikenKeyA, RKFÖstgötaTrafikenKeyA
 564c505f4d41,--VIGIK1KeyB
 ba5b895da162,--VIGIK1KeyB
 4143414F5250,
+a9b43414F585,--Tehran Railway
+1FB235AC1388,--Tehran Railway
 #
 # Data from: http://irq5.io/2013/04/13/decoding-bcard-conference-badges/
 f4a9ef2afc6d,--BCARD KeyB
@@ -758,4 +760,10 @@ A2B2C9D187FB,
 17505586EF02,
 022FE48B3072,
 013940233313,
-
+#
+# mostlikely diverised individual keys.
+# data from: https://github.com/korsehindi/proxmark3/commit/24fdbfa9a1d5c996aaa5c192bc07e4ab28db4c5c
+491CDC863104,
+A2F63A485632,
+98631ED2B229,
+19F1FFE02563,

From f8dbf6138ab5e1cf9e8cac91b179050ec77ef726 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 23 May 2019 06:12:20 -0400
Subject: [PATCH 1813/1938] fix: lf sim - dont forget to PACK your structs on
 both sides\n chg: data convertbitstream - converts bit to max/min in order to
 facilitate demodulation of simulation data

---
 armsrc/appmain.c   |  2 +-
 armsrc/lfops.c     | 13 +++++++------
 client/cmddata.c   | 19 ++++++++++++++++---
 client/cmdlf.c     | 10 +++++-----
 client/cmdlfem4x.c | 28 ++++------------------------
 client/cmdlfhid.c  |  9 ++++++++-
 client/graph.c     | 33 ++++++++++++++++++++++++++++++---
 client/graph.h     | 11 +++++++----
 8 files changed, 78 insertions(+), 47 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index cdd63efe3..a6e136718 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1392,7 +1392,7 @@ static void PacketReceived(PacketCommandNG *packet) {
                 uint8_t flag;
                 uint16_t offset;
                 uint8_t *data;
-            };
+            } PACKED;
             struct p* payload = (struct p*)packet->data.asBytes;
 
 
diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index 18aeadb07..fbf13f239 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -587,7 +587,7 @@ void SimulateTagLowFrequencyEx(int period, int gap, int ledcontrol, int numcycle
     AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
     AT91C_BASE_PIOA->PIO_ODR = GPIO_SSC_CLK;
 
-    uint8_t check = 1;
+    uint16_t check = 1;
 
     for (;;) {
 
@@ -606,13 +606,16 @@ void SimulateTagLowFrequencyEx(int period, int gap, int ledcontrol, int numcycle
         // used as a simple detection of a reader field?
         while (!(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_CLK)) {
             WDT_HIT();
-            if (!check) {
+            if ( check == 1000) {
                 if (usb_poll_validate_length() || BUTTON_PRESS())
                     goto OUT;
+                check = 0;
             }
             ++check;
         }
 
+        if (ledcontrol) LED_D_OFF();
+
         if (buf[i])
             OPEN_COIL();
         else
@@ -621,9 +624,10 @@ void SimulateTagLowFrequencyEx(int period, int gap, int ledcontrol, int numcycle
         //wait until SSC_CLK goes LOW
         while (AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_CLK) {
             WDT_HIT();
-            if (!check) {
+            if (check == 1000) {
                 if (usb_poll_validate_length() || BUTTON_PRESS())
                     goto OUT;
+                check = 0;
             }
             ++check;
         }
@@ -636,8 +640,6 @@ void SimulateTagLowFrequencyEx(int period, int gap, int ledcontrol, int numcycle
                 WaitUS(gap);
             }
         }
-
-        if (ledcontrol) LED_D_OFF();
     }
 OUT:
     StopTicks();
@@ -818,7 +820,6 @@ void CmdHIDsimTAGEx(uint32_t hi, uint32_t lo, int ledcontrol, int numcycles) {
 
 void CmdHIDsimTAG(uint32_t hi, uint32_t lo, int ledcontrol) {
     CmdHIDsimTAGEx(hi, lo, ledcontrol, -1);
-    DbpString("[!] simulation finished");
     reply_ng(CMD_HID_SIM_TAG, PM3_EOPABORTED, NULL, 0);
 }
 
diff --git a/client/cmddata.c b/client/cmddata.c
index 558cf357d..fb8e2be2f 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -446,6 +446,16 @@ int CmdGetBitStream(const char *Cmd) {
     RepaintGraphWindow();
     return PM3_SUCCESS;
 }
+int CmdConvertBitStream(const char *Cmd) {
+
+    if ( isGraphBitstream() ) {
+        convertGraphFromBitstream();
+    } else {
+        // get high, low
+        convertGraphFromBitstreamEx(-126, -127);
+    }
+    return PM3_SUCCESS;
+}
 
 //by marshmellow
 //Cmd Args: Clock, invert, maxErr, maxLen as integers and amplify as char == 'a'
@@ -844,7 +854,9 @@ static int CmdAutoCorr(const char *Cmd) {
     //Validations
     if (errors || cmdp == 0) return usage_data_autocorr();
 
-    return AutoCorrelate(GraphBuffer, GraphBuffer, GraphTraceLen, window, updateGrph, true);
+    AutoCorrelate(GraphBuffer, GraphBuffer, GraphTraceLen, window, updateGrph, true);
+
+    return PM3_SUCCESS;
 }
 
 static int CmdBitsamples(const char *Cmd) {
@@ -1481,7 +1493,7 @@ int getSamples(uint32_t n, bool silent) {
         int j = 0;
         for (j = 0; j * bits_per_sample < n * 8 && j < n; j++) {
             uint8_t sample = getByte(bits_per_sample, &bout);
-            GraphBuffer[j] = ((int) sample) - 128;
+            GraphBuffer[j] = ((int) sample) - 127;
         }
         GraphTraceLen = j;
 
@@ -1489,7 +1501,7 @@ int getSamples(uint32_t n, bool silent) {
 
     } else {
         for (int j = 0; j < n; j++) {
-            GraphBuffer[j] = ((int)got[j]) - 128;
+            GraphBuffer[j] = ((int)got[j]) - 127;
         }
         GraphTraceLen = n;
     }
@@ -2103,6 +2115,7 @@ static command_t CommandTable[] = {
     {"bin2hex",         Cmdbin2hex,              AlwaysAvailable, "<digits> -- Converts binary to hexadecimal"},
     {"bitsamples",      CmdBitsamples,           IfPm3Present,    "Get raw samples as bitstring"},
     {"buffclear",       CmdBuffClear,            AlwaysAvailable, "Clears bigbuff on deviceside and graph window"},
+    {"convertbitstream", CmdConvertBitStream,    AlwaysAvailable, "Convert GraphBuffer's 0/1 values to 127 / -127"},
     {"dec",             CmdDec,                  AlwaysAvailable, "Decimate samples"},
     {"detectclock",     CmdDetectClockRate,      AlwaysAvailable, "[<a|f|n|p>] Detect ASK, FSK, NRZ, PSK clock rate of wave in GraphBuffer"},
     {"fsktonrz",        CmdFSKToNRZ,             AlwaysAvailable, "Convert fsk2 to nrz wave for alternate fsk demodulating (for weak fsk)"},
diff --git a/client/cmdlf.c b/client/cmdlf.c
index 7ae06643d..76e26c03e 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -454,15 +454,14 @@ int CmdLFSim(const char *Cmd) {
         uint8_t flag;
         uint16_t offset;
         uint8_t data[PM3_CMD_DATA_SIZE - 3];
-    } PACKED;
-    struct pupload payload_up;
+    } PACKED payload_up;
 
     // flag = 
     //    b0  0 upload for LF usage 
     //        1 upload for HF usage
     //    b1  0 skip
     //        1 clear bigbuff
-    payload_up.flag |= 0x2;
+    payload_up.flag = 0x2;
 
     // fast push mode
     conn.block_after_ACK = true;
@@ -477,18 +476,19 @@ int CmdLFSim(const char *Cmd) {
         for(uint16_t j = 0; j < len; j++)
             payload_up.data[j] = GraphBuffer[i+j];
 
+      
         SendCommandNG(CMD_UPLOAD_SIM_SAMPLES_125K, (uint8_t *)&payload_up, sizeof(struct pupload));
         WaitForResponse(CMD_UPLOAD_SIM_SAMPLES_125K, NULL);
         printf(".");
         fflush(stdout);
-
         payload_up.flag = 0;
     }
 
     // Disable fast mode before last command
     conn.block_after_ACK = false;
+    printf("\n");
 
-    PrintAndLogEx(INFO, "\nSimulating");
+    PrintAndLogEx(INFO, "Simulating");
 
     struct p {
         uint16_t len;
diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index a3719fa6c..a5e304a86 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -196,7 +196,7 @@ static void ConstructEM410xEmulGraph(const char *uid, const  uint8_t clock) {
     ClearGraph(true);
 
    /* write 16 zero bit sledge */
-    for (i = 0; i < 10; i++)
+    for (i = 0; i < 20; i++)
         AppendGraph(false, clock, 0);
 
     /* write 9 start bits */
@@ -382,33 +382,13 @@ int AskEm410xDecode(bool verbose, uint32_t *hi, uint64_t *lo) {
 
     return PM3_SUCCESS;
 }
-static bool isBitstream(void) {
-    // convert to bitstream if necessary
-    for (int i = 0; i < GraphTraceLen; i++) {
-        if (GraphBuffer[i] > 1 || GraphBuffer[i] < 0) {
-            return false;
-        }
-    }
-    return true;
-}
+
 int AskEm410xDemod(const char *Cmd, uint32_t *hi, uint64_t *lo, bool verbose) {
     bool st = true;
 
     // em410x simulation etc uses 0/1 as signal data. This must be converted in order to demod it back again
-    if ( isBitstream() ) {
-        for (int i = 0; i < GraphTraceLen; i++) {
-            if (GraphBuffer[i] == 1)
-                GraphBuffer[i] = 127;
-            else
-                GraphBuffer[i] = -127;
-        }
-        uint8_t bits[GraphTraceLen];
-        memset(bits, 0, sizeof(bits));
-        size_t size = getFromGraphBuf(bits);
-
-        // set signal properties low/high/mean/amplitude and is_noise detection
-        computeSignalProperties(bits, size);
-        RepaintGraphWindow();
+    if ( isGraphBitstream() ) {
+        convertGraphFromBitstream();
     }
 
     if (ASKDemod_ext(Cmd, false, false, 1, &st) != PM3_SUCCESS) 
diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c
index 5d0556ade..e8c3fabc1 100644
--- a/client/cmdlfhid.c
+++ b/client/cmdlfhid.c
@@ -122,10 +122,16 @@ static int sendTry(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint32_t delay, uin
 //print full HID Prox ID and some bit format details if found
 static int CmdHIDDemod(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
+
+    // HID simulation etc uses 0/1 as signal data. This must be converted in order to demod it back again
+    if ( isGraphBitstream() ) {
+        convertGraphFromBitstream();
+    }
+
     //raw fsk demod no manchester decoding no start bit finding just get binary from wave
     uint32_t hi2 = 0, hi = 0, lo = 0;
 
-    uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
+    uint8_t bits[GraphTraceLen];
     size_t size = getFromGraphBuf(bits);
     if (size == 0) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - HID not enough samples");
@@ -261,6 +267,7 @@ static int CmdHIDSim(const char *Cmd) {
     SendCommandMIX(CMD_HID_SIM_TAG, hi, lo, 0, NULL, 0);
     PacketResponseNG resp;
     WaitForResponse(CMD_HID_SIM_TAG, &resp);
+    PrintAndLogEx(INFO, "Done");
     if (resp.status != PM3_EOPABORTED)
         return resp.status;
     return PM3_SUCCESS;
diff --git a/client/graph.c b/client/graph.c
index 363dd0d61..c70d6f434 100644
--- a/client/graph.c
+++ b/client/graph.c
@@ -58,7 +58,6 @@ void save_restoreGB(uint8_t saveOpt) {
         GridOffset = SavedGridOffsetAdj;
         RepaintGraphWindow();
     }
-    return;
 }
 
 void setGraphBuf(uint8_t *buff, size_t size) {
@@ -74,7 +73,6 @@ void setGraphBuf(uint8_t *buff, size_t size) {
 
     GraphTraceLen = size;
     RepaintGraphWindow();
-    return;
 }
 
 size_t getFromGraphBuf(uint8_t *buff) {
@@ -90,13 +88,42 @@ size_t getFromGraphBuf(uint8_t *buff) {
 }
 
 // A simple test to see if there is any data inside Graphbuffer.
-bool HasGraphData() {
+bool HasGraphData(void) {
     if (GraphTraceLen == 0) {
         PrintAndLogEx(NORMAL, "No data available, try reading something first");
         return false;
     }
     return true;
 }
+bool isGraphBitstream(void) {
+    // convert to bitstream if necessary
+    for (int i = 0; i < GraphTraceLen; i++) {
+        if (GraphBuffer[i] > 1 || GraphBuffer[i] < 0) {
+            return false;
+        }
+    }
+    return true;
+}
+void convertGraphFromBitstream() {
+    convertGraphFromBitstreamEx(1, 0); 
+}
+void convertGraphFromBitstreamEx(int hi, int low) {
+    for (int i = 0; i < GraphTraceLen; i++) {
+        if (GraphBuffer[i] == hi)
+            GraphBuffer[i] = 127;
+        else if ( GraphBuffer[i] == low ) 
+            GraphBuffer[i] = -127;
+        else
+            GraphBuffer[i] = 0;
+    }
+    uint8_t bits[GraphTraceLen];
+    memset(bits, 0, sizeof(bits));
+    size_t size = getFromGraphBuf(bits);
+
+    // set signal properties low/high/mean/amplitude and is_noise detection
+    computeSignalProperties(bits, size);
+    RepaintGraphWindow();
+}
 
 // Get or auto-detect ask clock rate
 int GetAskClock(const char *str, bool printAns) {
diff --git a/client/graph.h b/client/graph.h
index 2733bf475..fca93a889 100644
--- a/client/graph.h
+++ b/client/graph.h
@@ -20,17 +20,20 @@
 
 void AppendGraph(bool redraw, uint16_t clock, int bit);
 size_t ClearGraph(bool redraw);
+bool HasGraphData(void);
+void setGraphBuf(uint8_t *buff, size_t size);
+void save_restoreGB(uint8_t saveOpt);
 size_t getFromGraphBuf(uint8_t *buff);
+void convertGraphFromBitstream(void);
+void convertGraphFromBitstreamEx(int hi, int low);
+bool isGraphBitstream(void);
+
 int GetAskClock(const char *str, bool printAns);
 int GetPskClock(const char *str, bool printAns);
 uint8_t GetPskCarrier(const char *str, bool printAns);
 int GetNrzClock(const char *str, bool printAns);
 int GetFskClock(const char *str, bool printAns);
 bool fskClocks(uint8_t *fc1, uint8_t *fc2, uint8_t *rf1, int *firstClockEdge);
-void setGraphBuf(uint8_t *buff, size_t size);
-void save_restoreGB(uint8_t saveOpt);
-
-bool HasGraphData(void);
 
 // Max graph trace len: 40000 (bigbuf) * 8 (at 1 bit per sample)
 #ifndef MAX_GRAPH_TRACE_LEN

From 33c10f260d9aa2ad694e9c312fa5f07c267fbf6e Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 23 May 2019 10:29:33 -0400
Subject: [PATCH 1814/1938] chg: hf 14a sim / hf mf sim - check buttonpress/usb
 frame fewer times in order not to disrupt simulation (@McEloff)

---
 armsrc/iso14443a.c | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 39d1fcf05..48b7fddee 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -744,7 +744,7 @@ static void Code4bitAnswerAsTag(uint8_t cmd) {
 // stop when button is pressed
 // or return TRUE when command is captured
 //-----------------------------------------------------------------------------
-static int GetIso14443aCommandFromReader(uint8_t *received, uint8_t *par, int *len) {
+static bool GetIso14443aCommandFromReader(uint8_t *received, uint8_t *par, int *len) {
     // Set FPGA mode to "simulated ISO 14443 tag", no modulation (listen
     // only, since we are receiving, not transmitting).
     // Signal field is off with the appropriate LED
@@ -758,7 +758,15 @@ static int GetIso14443aCommandFromReader(uint8_t *received, uint8_t *par, int *l
     uint8_t b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
     (void)b;
 
-    while (!BUTTON_PRESS()) {
+    uint16_t check = 0;
+
+    for (;;) {
+        if ( check == 1000 ) {
+            if ( BUTTON_PRESS() || usb_poll_validate_length() )
+                return false;
+            check = 0;
+        }
+        ++check;
         WDT_HIT();
 
         if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
@@ -1704,10 +1712,17 @@ int EmGetCmd(uint8_t *received, uint16_t *len, uint8_t *par) {
     uint8_t b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
     (void)b;
 
+    uint16_t check = 0;
+
     for (;;) {
         WDT_HIT();
 
-        if (BUTTON_PRESS()) return 1;
+        if ( check == 1000 ) {
+          if (BUTTON_PRESS() || usb_poll_validate_length())
+              return 1;
+          check = 0;
+        }
+        ++check;
 
         // test if the field exists
         if (AT91C_BASE_ADC->ADC_SR & ADC_END_OF_CONVERSION(ADC_CHAN_HF)) {

From 0564931450ce7bff09ea17349ac1d255de9e64b6 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 23 May 2019 10:51:19 -0400
Subject: [PATCH 1815/1938] fix: lf sim -  if called with empty graphbuffer all
 strange things happend, like turning on HF field

---
 armsrc/appmain.c | 12 +++---------
 armsrc/lfops.c   |  4 +++-
 client/cmdlf.c   | 48 ++++++++++++++++++++++++++++++++----------------
 3 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index a6e136718..8f17aa3a5 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1384,9 +1384,7 @@ static void PacketReceived(PacketCommandNG *packet) {
             // iceman; since changing fpga_bitstreams clears bigbuff, Its better to call it before.
             // to be able to use this one for uploading data to device
             // flag = 
-            //    b0  0 upload for LF usage 
-            //        1 upload for HF usage
-            //    b1  0 skip
+            //    b0  0 skip
             //        1 clear bigbuff
             struct p {
                 uint8_t flag;
@@ -1395,13 +1393,9 @@ static void PacketReceived(PacketCommandNG *packet) {
             } PACKED;
             struct p* payload = (struct p*)packet->data.asBytes;
 
-
-            if ((payload->flag & 0x1) == 0x1)
-                FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-            else
-                FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
+            FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
             
-            if ((payload->flag & 0x2) == 0x2) {
+            if ((payload->flag & 0x1) == 0x1) {
                 BigBuf_Clear_ext(false);
                 BigBuf_free();
             }
diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index fbf13f239..a8f6af53b 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -587,7 +587,7 @@ void SimulateTagLowFrequencyEx(int period, int gap, int ledcontrol, int numcycle
     AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
     AT91C_BASE_PIOA->PIO_ODR = GPIO_SSC_CLK;
 
-    uint16_t check = 1;
+    uint16_t check = 0;
 
     for (;;) {
 
@@ -621,6 +621,8 @@ void SimulateTagLowFrequencyEx(int period, int gap, int ledcontrol, int numcycle
         else
             SHORT_COIL();
 
+        check = 0;
+
         //wait until SSC_CLK goes LOW
         while (AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_CLK) {
             WDT_HIT();
diff --git a/client/cmdlf.c b/client/cmdlf.c
index 76e26c03e..910b2255a 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -26,7 +26,7 @@ static int usage_lf_cmdread(void) {
     PrintAndLogEx(NORMAL, "       ************* Use lf config to configure options.");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "      lf cmdread d 80 z 100 o 200 c 11000");
-    return 0;
+    return PM3_SUCCESS;
 }
 static int usage_lf_read(void) {
     PrintAndLogEx(NORMAL, "Usage: lf read [h] [s] [d numofsamples]");
@@ -39,7 +39,19 @@ static int usage_lf_read(void) {
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "         lf read s d 12000     - collects 12000samples silent");
     PrintAndLogEx(NORMAL, "         lf read s");
-    return 0;
+    return PM3_SUCCESS;
+}
+static int usage_lf_sim(void) {
+    PrintAndLogEx(NORMAL, "Simulate low frequence signal.");
+    PrintAndLogEx(NORMAL, "Use " _YELLOW_("'lf config'")" to set parameters.");
+    PrintAndLogEx(NORMAL, "Usage: lf sim [h] <startgap>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h            This help");
+    PrintAndLogEx(NORMAL, "       <startgap>   This help");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "         lf sim 240     - start simulating with 240ms gap");
+    PrintAndLogEx(NORMAL, "         lf sim");
+    return PM3_SUCCESS;
 }
 static int usage_lf_sniff(void) {
     PrintAndLogEx(NORMAL, "Sniff low frequence signal.");
@@ -49,7 +61,7 @@ static int usage_lf_sniff(void) {
     PrintAndLogEx(NORMAL, "Usage: lf sniff [h]");
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "       h         This help");
-    return 0;
+    return PM3_SUCCESS;
 }
 static int usage_lf_config(void) {
     PrintAndLogEx(NORMAL, "Usage: lf config [h] [H|<divisor>] [b <bps>] [d <decim>] [a 0|1]");
@@ -72,7 +84,7 @@ static int usage_lf_config(void) {
     PrintAndLogEx(NORMAL, "                    Performs a read (active field)");
     PrintAndLogEx(NORMAL, "      lf sniff");
     PrintAndLogEx(NORMAL, "                    Performs a sniff (no active field)");
-    return 0;
+    return PM3_SUCCESS;
 }
 static int usage_lf_simfsk(void) {
     PrintAndLogEx(NORMAL, "Usage: lf simfsk [h] [c <clock>] [H <fcHigh>] [L <fcLow>] [d <hexdata>]");
@@ -97,7 +109,7 @@ static int usage_lf_simfsk(void) {
     PrintAndLogEx(NORMAL, "       lf simfsk c 64 H 10 L 8 d 010203     -  FSK2  rf/64  data 010203");
     PrintAndLogEx(NORMAL, "       lf simfsk c 64 H 8 L 10 d 010203     -  FSK2a rf/64  data 010203");
     PrintAndLogEx(NORMAL, "");
-    return 0;
+    return PM3_SUCCESS;
 }
 static int usage_lf_simask(void) {
     PrintAndLogEx(NORMAL, "Usage: lf simask [c <clock>] [i] [b|m|r] [s] [d <raw hex to sim>]");
@@ -110,7 +122,7 @@ static int usage_lf_simask(void) {
     PrintAndLogEx(NORMAL, "       r              sim ask/raw");
     PrintAndLogEx(NORMAL, "       s              add t55xx Sequence Terminator gap - default: no gaps (only manchester)");
     PrintAndLogEx(NORMAL, "       d <hexdata>    Data to sim as hex - omit to sim from DemodBuffer");
-    return 0;
+    return PM3_SUCCESS;
 }
 static int usage_lf_simpsk(void) {
     PrintAndLogEx(NORMAL, "Usage: lf simpsk [1|2|3] [c <clock>] [i] [r <carrier>] [d <raw hex to sim>]");
@@ -123,7 +135,7 @@ static int usage_lf_simpsk(void) {
     PrintAndLogEx(NORMAL, "       3              set PSK3");
     PrintAndLogEx(NORMAL, "       r <carrier>    2|4|8 are valid carriers: default = 2");
     PrintAndLogEx(NORMAL, "       d <hexdata>    Data to sim as hex - omit to sim from DemodBuffer");
-    return 0;
+    return PM3_SUCCESS;
 }
 static int usage_lf_find(void) {
     PrintAndLogEx(NORMAL, "Usage:  lf search [h] <0|1> [u]");
@@ -137,7 +149,7 @@ static int usage_lf_find(void) {
     PrintAndLogEx(NORMAL, "      lf search 1   = use data from GraphBuffer & search for known tags");
     PrintAndLogEx(NORMAL, "      lf search u   = try reading data from tag & search for known and unknown tags");
     PrintAndLogEx(NORMAL, "      lf search 1 u = use data from GraphBuffer & search for known and unknown tags");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 
@@ -440,8 +452,15 @@ static void ChkBitstream() {
 //Attempt to simulate any wave in buffer (one bit per output sample)
 // converts GraphBuffer to bitstream (based on zero crossings) if needed.
 int CmdLFSim(const char *Cmd) {
-#define FPGA_LF 1
-#define FPGA_HF 2
+
+    uint8_t cmdp = tolower(param_getchar(Cmd, 0));
+    if (cmdp == 'h') return usage_lf_sim();
+
+    // sanity check
+    if ( GraphTraceLen < 20 ) {
+        PrintAndLogEx(ERR, "No data in Graphbuffer");
+        return PM3_ENODATA;
+    }
 
     uint16_t gap = param_get32ex(Cmd, 0, 0, 10) & 0xFFFF;
 
@@ -457,11 +476,9 @@ int CmdLFSim(const char *Cmd) {
     } PACKED payload_up;
 
     // flag = 
-    //    b0  0 upload for LF usage 
-    //        1 upload for HF usage
-    //    b1  0 skip
+    //    b0  0 
     //        1 clear bigbuff
-    payload_up.flag = 0x2;
+    payload_up.flag = 0x1;
 
     // fast push mode
     conn.block_after_ACK = true;
@@ -493,8 +510,7 @@ int CmdLFSim(const char *Cmd) {
     struct p {
         uint16_t len;
         uint16_t gap;
-    } PACKED;
-    struct p payload;
+    } PACKED payload;
     payload.len = GraphTraceLen;
     payload.gap = gap;	
 

From 263d662783ffaf8e89ed8ccdff7e80be5d41142b Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 23 May 2019 13:16:06 -0400
Subject: [PATCH 1816/1938] chg: lf fsksim - uses NG

---
 armsrc/appmain.c | 20 +++++++++----
 armsrc/apps.h    |  4 ++-
 armsrc/lfops.c   | 19 +++++-------
 client/cmdlf.c   | 77 +++++++++++++++++++++++++++++++++---------------
 client/cmdlf.h   |  2 +-
 5 files changed, 79 insertions(+), 43 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 8f17aa3a5..a78db3da6 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -754,8 +754,7 @@ static void PacketReceived(PacketCommandNG *packet) {
                 uint8_t silent;
                 uint32_t samples;
             } PACKED;
-            struct p *payload;
-            payload = (struct p*)packet->data.asBytes;
+            struct p *payload = (struct p*)packet->data.asBytes;
             uint32_t bits = SampleLF(payload->silent, payload->samples);
             reply_ng(CMD_ACQUIRE_RAW_ADC_SAMPLES_125K, PM3_SUCCESS, (uint8_t *)&bits, sizeof(bits));
             break;
@@ -766,8 +765,7 @@ static void PacketReceived(PacketCommandNG *packet) {
                uint16_t ones;
                uint16_t zeros;
             } PACKED;
-            struct p *payload;
-            payload = (struct p*)packet->data.asBytes;
+            struct p *payload = (struct p*)packet->data.asBytes;
             ModThenAcquireRawAdcSamples125k(payload->delay, payload->zeros, payload->ones, packet->data.asBytes+8);
             break;
             }
@@ -784,9 +782,19 @@ static void PacketReceived(PacketCommandNG *packet) {
         case CMD_HID_SIM_TAG:
             CmdHIDsimTAG(packet->oldarg[0], packet->oldarg[1], 1);
             break;
-        case CMD_FSK_SIM_TAG:
-            CmdFSKsimTAG(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes, 1);
+        case CMD_FSK_SIM_TAG: {
+	    struct p {
+		uint8_t fchigh;
+		uint8_t fclow;
+		uint8_t separator;
+		uint8_t clock;
+		uint16_t datalen;
+	    } PACKED;
+            struct p *payload = (struct p*)packet->data.asBytes;
+
+            CmdFSKsimTAG(payload->fchigh, payload->fclow, payload->separator, payload->clock, payload->datalen, packet->data.asBytes + 6, 1);
             break;
+            }
         case CMD_ASK_SIM_TAG:
             CmdASKsimTag(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes, 1);
             break;
diff --git a/armsrc/apps.h b/armsrc/apps.h
index 3aeedbcee..6e845349b 100644
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -86,7 +86,9 @@ void SimulateTagLowFrequency(int period, int gap, int ledcontrol);
 void SimulateTagLowFrequencyBidir(int divisor, int max_bitlen);
 void CmdHIDsimTAGEx(uint32_t hi, uint32_t lo, int ledcontrol, int numcycles);
 void CmdHIDsimTAG(uint32_t hi, uint32_t lo, int ledcontrol);
-void CmdFSKsimTAG(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *bits, int ledcontrol);
+
+void CmdFSKsimTAG(uint8_t fchigh, uint8_t fclow, uint8_t separator, uint8_t clock, uint16_t bitslen, uint8_t *bits, int ledcontrol);
+
 void CmdASKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *bits, int ledcontrol);
 void CmdPSKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *bits, int ledcontrol);
 void CmdHIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol);
diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index a8f6af53b..4d4141503 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -828,7 +828,8 @@ void CmdHIDsimTAG(uint32_t hi, uint32_t lo, int ledcontrol) {
 // prepare a waveform pattern in the buffer based on the ID given then
 // simulate a FSK tag until the button is pressed
 // arg1 contains fcHigh and fcLow, arg2 contains STT marker and clock
-void CmdFSKsimTAG(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *bits, int ledcontrol) {
+void CmdFSKsimTAG(uint8_t fchigh, uint8_t fclow, uint8_t separator, uint8_t clock, uint16_t bitslen, uint8_t *bits, int ledcontrol) {
+//void CmdFSKsimTAG(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *bits, int ledcontrol) {
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
 
     // free eventually allocated BigBuf memory
@@ -838,27 +839,23 @@ void CmdFSKsimTAG(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *bits, int
     set_tracing(false);
 
     int n = 0, i = 0;
-    uint8_t fcHigh = arg1 >> 8;
-    uint8_t fcLow = arg1 & 0xFF;
     uint16_t modCnt = 0;
-    uint8_t clk = arg2 & 0xFF;
-    uint8_t stt = (arg2 >> 8) & 1;
 
-    if (stt) {
-        //int fsktype = ( fcHigh == 8 && fcLow == 5) ? 1 : 2;
+    if (separator) {
+        //int fsktype = ( fchigh == 8 && fclow == 5) ? 1 : 2;
         //fcSTT(&n);
     }
 
-    for (i = 0; i < size; i++) {
+    for (i = 0; i < bitslen; i++) {
         if (bits[i])
-            fcAll(fcLow, &n, clk, &modCnt);
+            fcAll(fclow, &n, clock, &modCnt);
         else
-            fcAll(fcHigh, &n, clk, &modCnt);
+            fcAll(fchigh, &n, clock, &modCnt);
     }
 
     WDT_HIT();
 
-    Dbprintf("Simulating with fcHigh: %d, fcLow: %d, clk: %d, STT: %d, n: %d", fcHigh, fcLow, clk, stt, n);
+    Dbprintf("Simulating with fcHigh: %d, fcLow: %d, clk: %d, STT: %d, n: %d", fchigh, fclow, clock, separator, n);
 
     if (ledcontrol) LED_A_ON();
     SimulateTagLowFrequency(n, 0, ledcontrol);
diff --git a/client/cmdlf.c b/client/cmdlf.c
index 910b2255a..8eae6a681 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -42,12 +42,12 @@ static int usage_lf_read(void) {
     return PM3_SUCCESS;
 }
 static int usage_lf_sim(void) {
-    PrintAndLogEx(NORMAL, "Simulate low frequence signal.");
+    PrintAndLogEx(NORMAL, "Simulate low frequence tag from graphbuffer.");
     PrintAndLogEx(NORMAL, "Use " _YELLOW_("'lf config'")" to set parameters.");
-    PrintAndLogEx(NORMAL, "Usage: lf sim [h] <startgap>");
+    PrintAndLogEx(NORMAL, "Usage: lf sim [h] <gap>");
     PrintAndLogEx(NORMAL, "Options:");
-    PrintAndLogEx(NORMAL, "       h            This help");
-    PrintAndLogEx(NORMAL, "       <startgap>   This help");
+    PrintAndLogEx(NORMAL, "       h         This help");
+    PrintAndLogEx(NORMAL, "       <gap>     Start gap (in microseconds)");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "         lf sim 240     - start simulating with 240ms gap");
     PrintAndLogEx(NORMAL, "         lf sim");
@@ -156,6 +156,8 @@ static int usage_lf_find(void) {
 /* send a LF command before reading */
 int CmdLFCommandRead(const char *Cmd) {
 
+    if (!session.pm3_present) return PM3_ENOTTY;
+
     bool errors = false;
     uint16_t datalen = 0;
 
@@ -164,10 +166,7 @@ int CmdLFCommandRead(const char *Cmd) {
         uint16_t ones;
         uint16_t zeros;
         uint8_t data[PM3_CMD_DATA_SIZE - 8];
-    } PACKED;
-
-    struct p payload;
-
+    } PACKED payload;
 
     uint8_t cmdp = 0;
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
@@ -251,7 +250,7 @@ int CmdFlexdemod(const char *Cmd) {
 
     if (start == size - LONG_WAIT) {
         PrintAndLogEx(WARNING, "nothing to wait for");
-        return 0;
+        return PM3_ENODATA;
     }
 
     data[start] = 4;
@@ -294,10 +293,13 @@ int CmdFlexdemod(const char *Cmd) {
         }
     }
     RepaintGraphWindow();
-    return 0;
+    return PM3_SUCCESS;
 }
 
 int CmdLFSetConfig(const char *Cmd) {
+
+    if (!session.pm3_present) return PM3_ENOTTY;
+
     uint8_t divisor =  0;//Frequency divisor
     uint8_t bps = 0; // Bits per sample
     uint8_t decimation = 0; //How many to keep
@@ -360,11 +362,11 @@ int CmdLFSetConfig(const char *Cmd) {
 
     clearCommandBuffer();
     SendCommandNG(CMD_SET_LF_SAMPLING_CONFIG, (uint8_t *)&config, sizeof(sample_config));
-    return 0;
+    return PM3_SUCCESS;
 }
 
-bool lf_read(bool silent, uint32_t samples) {
-    if (!session.pm3_present) return false;
+int lf_read(bool silent, uint32_t samples) {
+    if (!session.pm3_present) return PM3_ENOTTY;
 
     struct p {
         uint8_t silent;
@@ -397,7 +399,7 @@ bool lf_read(bool silent, uint32_t samples) {
 
 int CmdLFRead(const char *Cmd) {
 
-    if (!session.pm3_present) return 0;
+    if (!session.pm3_present) return PM3_ENOTTY;
 
     bool errors = false;
     bool silent = false;
@@ -429,6 +431,9 @@ int CmdLFRead(const char *Cmd) {
 }
 
 int CmdLFSniff(const char *Cmd) {
+
+    if (!session.pm3_present) return PM3_ENOTTY;
+
     uint8_t cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_lf_sniff();
 
@@ -436,7 +441,7 @@ int CmdLFSniff(const char *Cmd) {
     SendCommandNG(CMD_LF_SNIFF_RAW_ADC_SAMPLES, NULL, 0);
     WaitForResponse(CMD_ACK, NULL);
     getSamples(0, false);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static void ChkBitstream() {
@@ -444,7 +449,7 @@ static void ChkBitstream() {
     for (int i = 0; i < (int)(GraphTraceLen / 2); i++) {
         if (GraphBuffer[i] > 1 || GraphBuffer[i] < 0) {
             CmdGetBitStream("");
-	    PrintAndLogEx(INFO, " called cmdgetbitstream");
+	    PrintAndLogEx(INFO, "Converted to bitstream");
             break;
         }
     }
@@ -453,8 +458,7 @@ static void ChkBitstream() {
 // converts GraphBuffer to bitstream (based on zero crossings) if needed.
 int CmdLFSim(const char *Cmd) {
 
-    uint8_t cmdp = tolower(param_getchar(Cmd, 0));
-    if (cmdp == 'h') return usage_lf_sim();
+    if (!session.pm3_present) return PM3_ENOTTY;
 
     // sanity check
     if ( GraphTraceLen < 20 ) {
@@ -462,6 +466,9 @@ int CmdLFSim(const char *Cmd) {
         return PM3_ENODATA;
     }
 
+    uint8_t cmdp = tolower(param_getchar(Cmd, 0));
+    if (cmdp == 'h') return usage_lf_sim();
+
     uint16_t gap = param_get32ex(Cmd, 0, 0, 10) & 0xFFFF;
 
     // convert to bitstream if necessary
@@ -601,17 +608,39 @@ int CmdLFfskSim(const char *Cmd) {
     if (fcHigh == 0) fcHigh = 10;
     if (fcLow == 0) fcLow = 8;
 
+    struct {
+        uint8_t fchigh;
+        uint8_t fclow;
+        uint8_t separator;
+        uint8_t clock;
+        uint16_t datalen;
+        uint8_t data[PM3_CMD_DATA_SIZE - 6];
+    } PACKED payload;
+
+    payload.fchigh = fcHigh;
+    payload.fclow =  fcLow;
+    payload.separator = separator;
+    payload.clock = clk;
+
     size_t size = DemodBufferLen;
-    if (size > PM3_CMD_DATA_SIZE) {
-        PrintAndLogEx(NORMAL, "DemodBuffer too long for current implementation - length: %d - max: %d", size, PM3_CMD_DATA_SIZE);
-        size = PM3_CMD_DATA_SIZE;
+    if (size > sizeof(payload.data)) {
+        PrintAndLogEx(NORMAL, "DemodBuffer too long for current implementation - length: %d - max: %d", size, sizeof(payload.data));
+        size = sizeof(payload.data);
     }
+
+    payload.datalen = (uint16_t)size;
+    memcpy(payload.data, DemodBuffer, size);
+
+    PrintAndLogEx(INFO, "Simulating");
+
     clearCommandBuffer();
-    SendCommandOLD(CMD_FSK_SIM_TAG, fcHigh << 8 | fcLow, (separator << 8) | clk, size, DemodBuffer, size);
+    SendCommandNG(CMD_FSK_SIM_TAG, (uint8_t *)&payload, 6 + payload.datalen);
 
     setClockGrid(clk, 0);
     PacketResponseNG resp;
     WaitForResponse(CMD_FSK_SIM_TAG, &resp);
+
+    PrintAndLogEx(INFO, "Done");
     if (resp.status != PM3_EOPABORTED)
         return resp.status;
     return PM3_SUCCESS;
@@ -819,7 +848,7 @@ int CmdLFSimBidir(const char *Cmd) {
     // HACK: not implemented in ARMSRC.
     PrintAndLogEx(INFO, "Not implemented yet.");
     SendCommandMIX(CMD_LF_SIMULATE_BIDIR, 47, 384, 0, NULL, 0);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 // ICEMAN,  todo,   swap from Graphbuffer.
@@ -892,7 +921,7 @@ int CmdVchDemod(const char *Cmd) {
         }
         RepaintGraphWindow();
     }
-    return 0;
+    return PM3_SUCCESS;
 }
 
 //by marshmellow
diff --git a/client/cmdlf.h b/client/cmdlf.h
index 0f0466204..89299beaf 100644
--- a/client/cmdlf.h
+++ b/client/cmdlf.h
@@ -69,6 +69,6 @@ int CmdLFSniff(const char *Cmd);
 int CmdVchDemod(const char *Cmd);
 int CmdLFfind(const char *Cmd);
 
-bool lf_read(bool silent, uint32_t samples);
+int lf_read(bool silent, uint32_t samples);
 
 #endif

From 270afb89aac18247e2a4e2517b067fc882e1f4ad Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 23 May 2019 20:43:42 +0200
Subject: [PATCH 1817/1938] Trying C99 dyn structs as suggested by @iceman

---
 armsrc/appmain.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index a78db3da6..12e0493a4 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1270,10 +1270,10 @@ static void PacketReceived(PacketCommandNG *packet) {
             LED_B_ON();
             struct p {
                 uint32_t waittime;
-                uint8_t data[PM3_CMD_DATA_SIZE - sizeof(uint32_t)];
+                uint8_t data[];
             } PACKED;
             struct p *payload = (struct p *) &packet->data.asBytes;
-            usart_writebuffer_sync(payload->data, packet->length - sizeof(payload->waittime));
+            usart_writebuffer_sync(payload->data, packet->length - sizeof(payload));
             uint16_t available;
             uint16_t pre_available = 0;
             uint8_t *dest = BigBuf_malloc(USART_FIFOLEN);

From fda181890c4c6ffbcbcff92dec9f8c9f1401d897 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 23 May 2019 20:54:21 +0200
Subject: [PATCH 1818/1938] nested structs on the sender, for more lean packet
 size computation

---
 client/cmdusart.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/client/cmdusart.c b/client/cmdusart.c
index a13aa7a6c..08dac0368 100644
--- a/client/cmdusart.c
+++ b/client/cmdusart.c
@@ -169,15 +169,18 @@ static int usart_rx(uint8_t *data, size_t *len, uint32_t waittime) {
 
 static int usart_txrx(uint8_t *srcdata, size_t srclen, uint8_t *dstdata, size_t *dstlen, uint32_t waittime) {
     clearCommandBuffer();
-    struct {
+    struct payload_header {
         uint32_t waittime;
+    } PACKED;
+    struct {
+        struct payload_header header;
         uint8_t data[PM3_CMD_DATA_SIZE - sizeof(uint32_t)];
     } PACKED payload;
-    payload.waittime = waittime;
+    payload.header.waittime = waittime;
     if (srclen >= sizeof(payload.data))
         return PM3_EOVFLOW;
     memcpy(payload.data, srcdata, srclen);
-    SendCommandNG(CMD_USART_TXRX, (uint8_t *)&payload, srclen + sizeof(payload.waittime));
+    SendCommandNG(CMD_USART_TXRX, (uint8_t *)&payload, srclen + sizeof(payload.header));
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_USART_TXRX, &resp, waittime + 500)) {
         return PM3_ETIMEOUT;

From de694d7cca13c4666f77c57c7ad8061ad3c5b139 Mon Sep 17 00:00:00 2001
From: Albert Einstein <javastraat@hotmail.com>
Date: Thu, 23 May 2019 21:04:48 +0200
Subject: [PATCH 1819/1938] modified help in fchk and chk

---
 client/cmdhfmf.c | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 4a39109c3..e1ec60b1c 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -127,9 +127,9 @@ static int usage_hf14_nested(void) {
     PrintAndLogEx(NORMAL, "      d    write keys to binary file `hf-mf-<UID>-key.bin`");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
-    PrintAndLogEx(NORMAL, "      hf mf nested 1 0 A FFFFFFFFFFFF ");
-    PrintAndLogEx(NORMAL, "      hf mf nested 1 0 A FFFFFFFFFFFF t ");
-    PrintAndLogEx(NORMAL, "      hf mf nested 1 0 A FFFFFFFFFFFF d ");
+    PrintAndLogEx(NORMAL, "      hf mf nested 1 0 A FFFFFFFFFFFF     -- nested attack against 1k,block 0, Key A using key FFFFFFFFFFFF");
+    PrintAndLogEx(NORMAL, "      hf mf nested 1 0 A FFFFFFFFFFFF t   -- and transfer keys into emulator memory");
+    PrintAndLogEx(NORMAL, "      hf mf nested 1 0 A FFFFFFFFFFFF d   -- or write keys to binary file ");
     PrintAndLogEx(NORMAL, "      hf mf nested o 0 A FFFFFFFFFFFF 4 A");
     return 0;
 }
@@ -179,9 +179,10 @@ static int usage_hf14_chk(void) {
     PrintAndLogEx(NORMAL, "      t    write keys to emulator memory\n");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
-    PrintAndLogEx(NORMAL, "      hf mf chk 0 A 1234567890ab keys.dic     -- target block 0, Key A");
-    PrintAndLogEx(NORMAL, "      hf mf chk *1 ? t                        -- target all blocks, all keys, 1K, write to emulator memory");
-    PrintAndLogEx(NORMAL, "      hf mf chk *1 ? d                        -- target all blocks, all keys, 1K, write to file");
+    PrintAndLogEx(NORMAL, "      hf mf chk 0 A 1234567890ab       -- target block 0, Key A using key 1234567890ab");
+    PrintAndLogEx(NORMAL, "      hf mf chk 0 A default_keys.dic   -- target block 0, Key A using default dictionary file");
+    PrintAndLogEx(NORMAL, "      hf mf chk *1 ? t                 -- target all blocks, all keys, 1K, write to emulator memory");
+    PrintAndLogEx(NORMAL, "      hf mf chk *1 ? d                 -- target all blocks, all keys, 1K, write to file");
     return 0;
 }
 static int usage_hf14_chk_fast(void) {
@@ -199,11 +200,12 @@ static int usage_hf14_chk_fast(void) {
     PrintAndLogEx(NORMAL, "      m    use dictionary from flashmemory\n");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
-    PrintAndLogEx(NORMAL, "      hf mf fchk 1 1234567890ab keys.dic    -- target 1K using key 1234567890ab, using dictionary file");
-    PrintAndLogEx(NORMAL, "      hf mf fchk 1 t                        -- target 1K, write to emulator memory");
-    PrintAndLogEx(NORMAL, "      hf mf fchk 1 d                        -- target 1K, write to file");
+    PrintAndLogEx(NORMAL, "      hf mf fchk 1 1234567890ab       -- target 1K using key 1234567890ab");
+    PrintAndLogEx(NORMAL, "      hf mf fchk 1 default_keys.dic   -- target 1K using default dictionary file");
+    PrintAndLogEx(NORMAL, "      hf mf fchk 1 t                  -- target 1K, write to emulator memory");
+    PrintAndLogEx(NORMAL, "      hf mf fchk 1 d                  -- target 1K, write to file");
     if (IfPm3Flash())
-        PrintAndLogEx(NORMAL, "      hf mf fchk 1 m                        -- target 1K, use dictionary from flashmemory");
+        PrintAndLogEx(NORMAL, "      hf mf fchk 1 m                  -- target 1K, use dictionary from flashmemory");
     return 0;
 }
 static int usage_hf14_keybrute(void) {

From 684e93d61a20b25b77d9a4edf99072e73c6c6e97 Mon Sep 17 00:00:00 2001
From: Albert Einstein <javastraat@hotmail.com>
Date: Thu, 23 May 2019 21:06:15 +0200
Subject: [PATCH 1820/1938] added keys

---
 client/default_keys.dic | 80 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 80 insertions(+)

diff --git a/client/default_keys.dic b/client/default_keys.dic
index 0e977ad2d..78dc5f62f 100644
--- a/client/default_keys.dic
+++ b/client/default_keys.dic
@@ -767,3 +767,83 @@ A2B2C9D187FB,
 A2F63A485632,
 98631ED2B229,
 19F1FFE02563,
+#OMNITEC.ES HOTEL TIMECARD / MAINTENANCECARD
+AFBECD120454,
+#OMNITEC.ES HOTEL EMERGENCYCARD
+842146108088,
+# MORE KEYS:
+8A19D40CF2B5,
+AE8587108640,
+#TAPCARD PUBLIC TRANSPORT LA
+EA1B88DF0A76,
+D1991E71E2C5,
+05F89678CFCF,
+D31463A7AB6D,
+C38197C36420,
+772219470B38,
+1C1532A6F1BC,
+FA38F70215AD,
+E907470D31CC,
+160F4B7AB806,
+1D28C58BBE8A,
+B3830B95CA34,
+6A0E215D1EEB,
+E41E6199318F,
+C4F271F5F0B3,
+1E352F9E19E5,
+0E0E8C6D8EB6,
+C342F825B01B,
+CB911A1A1929,
+E65B66089AFC,
+B81846F06EDF,
+37FC71221B46,
+880C09CFA23C,
+6476FA0746E7,
+419A13811554,
+2C60E904539C,
+4ECCA6236400,
+10F2BBAA4D1C,
+4857DD68ECD9,
+C6A76CB2F3B5,
+E3AD9E9BA5D4,
+6C9EC046C1A4,
+#ROC HIGHSCHOOL ACCESSCARD
+A0A1A2A3A4A5,
+B021669B44BB,
+A0A1A2A3A4A5,  
+B18CDCDE52B7,  
+A22647F422AE,  
+B268F7C9CA63,  
+A37A30004AC9,  
+B3630C9F11C8,  
+A4CDFF3B1848,  
+B42C4DFD7A90,  
+A541538F1416, 
+B5F454568271,  
+A6C028A12FBB,  
+B6323F550F54,  
+A7D71AC06DC2,  
+B7C344A36D88,  
+A844F4F52385,  
+B8457ACC5F5D,  
+A9A4045DCE77,  
+B9B8B7B6B5B3,  
+AA4D051954AC,  
+BA729428E808,  
+AB28A44AD5F5,  
+BB320A757099,  
+AC45AD2D620D,  
+BCF5A6B5E13F,  
+AD5645062534,  
+BDF837787A71,  
+AE43F36C1A9A,  
+BE7C4F6C7A9A,  
+5EC7938F140A,  
+82D58AA49CCB,
+#CYBERCENTER MUNICH
+B5FF67CBA951,
+8DF73772DD63,
+E2A759DFC2BF,
+#MELONCARD
+323334353637,
+

From 38d0b37e1e12d0960da0e2a82a90778cb7b41fc9 Mon Sep 17 00:00:00 2001
From: Albert Einstein <javastraat@hotmail.com>
Date: Thu, 23 May 2019 21:08:52 +0200
Subject: [PATCH 1821/1938] added keys

---
 client/default_keys.dic | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/client/default_keys.dic b/client/default_keys.dic
index 78dc5f62f..15c51f9ac 100644
--- a/client/default_keys.dic
+++ b/client/default_keys.dic
@@ -840,10 +840,6 @@ AE43F36C1A9A,
 BE7C4F6C7A9A,  
 5EC7938F140A,  
 82D58AA49CCB,
-#CYBERCENTER MUNICH
-B5FF67CBA951,
-8DF73772DD63,
-E2A759DFC2BF,
 #MELONCARD
 323334353637,
 

From c13e2f09a181595c0cb861d258c5e226e67b7d1f Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 23 May 2019 17:07:12 -0400
Subject: [PATCH 1822/1938] chg: lf simfsk\nlf paradox sim\nlf awid sim\n\lf
 ioprox sim\nlf pyramid sim - NG

---
 armsrc/appmain.c      | 12 ++----------
 client/cmdlf.c        | 30 ++++++++++--------------------
 client/cmdlfawid.c    | 27 ++++++++++++++++++++++-----
 client/cmdlfio.c      | 17 +++++++++++++----
 client/cmdlfparadox.c | 11 ++++++++++-
 client/cmdlfpyramid.c | 19 ++++++++++++++-----
 include/pm3_cmd.h     |  9 +++++++++
 7 files changed, 80 insertions(+), 45 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 12e0493a4..75bf8e86e 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -783,16 +783,8 @@ static void PacketReceived(PacketCommandNG *packet) {
             CmdHIDsimTAG(packet->oldarg[0], packet->oldarg[1], 1);
             break;
         case CMD_FSK_SIM_TAG: {
-	    struct p {
-		uint8_t fchigh;
-		uint8_t fclow;
-		uint8_t separator;
-		uint8_t clock;
-		uint16_t datalen;
-	    } PACKED;
-            struct p *payload = (struct p*)packet->data.asBytes;
-
-            CmdFSKsimTAG(payload->fchigh, payload->fclow, payload->separator, payload->clock, payload->datalen, packet->data.asBytes + 6, 1);
+            lf_fsksim_t *payload = (lf_fsksim_t *)packet->data.asBytes;
+            CmdFSKsimTAG(payload->fchigh, payload->fclow, payload->separator, payload->clock, packet->length - sizeof(lf_fsksim_t), payload->data, 1);
             break;
             }
         case CMD_ASK_SIM_TAG:
diff --git a/client/cmdlf.c b/client/cmdlf.c
index 8eae6a681..0f3d9c8ac 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -608,33 +608,23 @@ int CmdLFfskSim(const char *Cmd) {
     if (fcHigh == 0) fcHigh = 10;
     if (fcLow == 0) fcLow = 8;
 
-    struct {
-        uint8_t fchigh;
-        uint8_t fclow;
-        uint8_t separator;
-        uint8_t clock;
-        uint16_t datalen;
-        uint8_t data[PM3_CMD_DATA_SIZE - 6];
-    } PACKED payload;
-
-    payload.fchigh = fcHigh;
-    payload.fclow =  fcLow;
-    payload.separator = separator;
-    payload.clock = clk;
-
     size_t size = DemodBufferLen;
-    if (size > sizeof(payload.data)) {
-        PrintAndLogEx(NORMAL, "DemodBuffer too long for current implementation - length: %d - max: %d", size, sizeof(payload.data));
-        size = sizeof(payload.data);
+    if (size > (PM3_CMD_DATA_SIZE - sizeof(lf_fsksim_t))) {
+        PrintAndLogEx(NORMAL, "DemodBuffer too long for current implementation - length: %d - max: %d", size, PM3_CMD_DATA_SIZE - sizeof(lf_fsksim_t));
+        size = PM3_CMD_DATA_SIZE - sizeof(lf_fsksim_t);
     }
 
-    payload.datalen = (uint16_t)size;
-    memcpy(payload.data, DemodBuffer, size);
+    lf_fsksim_t *payload = calloc(1, sizeof(lf_fsksim_t) + size);
+    payload->fchigh = fcHigh;
+    payload->fclow =  fcLow;
+    payload->separator = separator;
+    payload->clock = clk;
+    memcpy(payload->data, DemodBuffer, size);
 
     PrintAndLogEx(INFO, "Simulating");
 
     clearCommandBuffer();
-    SendCommandNG(CMD_FSK_SIM_TAG, (uint8_t *)&payload, 6 + payload.datalen);
+    SendCommandNG(CMD_FSK_SIM_TAG, (uint8_t *)payload,  sizeof(lf_fsksim_t) + size);
 
     setClockGrid(clk, 0);
     PacketResponseNG resp;
diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c
index d24f3617b..d283181b6 100644
--- a/client/cmdlfawid.c
+++ b/client/cmdlfawid.c
@@ -109,8 +109,15 @@ static int sendTry(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint32_t delay, uin
 
     uint8_t clk = 50, high = 10, low = 8, invert = 1;
 
+    lf_fsksim_t *payload = calloc(1, sizeof(lf_fsksim_t) + bs_len);
+    payload->fchigh = high;
+    payload->fclow = low;
+    payload->separator = invert;
+    payload->clock = clk;
+    memcpy(payload->data, bits, bs_len);
+
     clearCommandBuffer();
-    SendCommandOLD(CMD_FSK_SIM_TAG, (high << 8) + low, (invert << 8) + clk, bs_len, bits, bs_len);
+    SendCommandNG(CMD_FSK_SIM_TAG, (uint8_t *)payload,  sizeof(lf_fsksim_t) + bs_len);
 
     msleep(delay);
     return sendPing();
@@ -313,8 +320,8 @@ static int CmdAWIDRead(const char *Cmd) {
 static int CmdAWIDSim(const char *Cmd) {
     uint32_t fc = 0, cn = 0;
     uint8_t fmtlen = 0;
-    uint8_t bits[96];
-    memset(bits, 0x00, sizeof(bits));
+    uint8_t bs[96];
+    memset(bs, 0x00, sizeof(bs));
 
     char cmdp = param_getchar(Cmd, 0);
     if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_awid_sim();
@@ -329,7 +336,7 @@ static int CmdAWIDSim(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "Simulating AWID %u -- FC: %u; CN: %u\n", fmtlen, fc, cn);
     PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation or run another command");
 
-    if ( getAWIDBits(fmtlen, fc, cn, bits) != PM3_SUCCESS ) {
+    if ( getAWIDBits(fmtlen, fc, cn, bs) != PM3_SUCCESS ) {
         PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
         return PM3_ESOFT;
     }
@@ -340,10 +347,20 @@ static int CmdAWIDSim(const char *Cmd) {
     // arg1 --- fcHigh<<8 + fcLow
     // arg2 --- Inversion and clk setting
     // 96   --- Bitstream length: 96-bits == 12 bytes
+    lf_fsksim_t *payload = calloc(1, sizeof(lf_fsksim_t) + sizeof(bs));
+    payload->fchigh = high;
+    payload->fclow =  low;
+    payload->separator = invert;
+    payload->clock = clk;
+    memcpy(payload->data, bs, sizeof(bs));
+
     clearCommandBuffer();
-    SendCommandOLD(CMD_FSK_SIM_TAG, (high << 8) + low, (invert << 8) + clk, sizeof(bits), bits, sizeof(bits));
+    SendCommandNG(CMD_FSK_SIM_TAG, (uint8_t *)payload,  sizeof(lf_fsksim_t) + sizeof(bs));
+
     PacketResponseNG resp;
     WaitForResponse(CMD_FSK_SIM_TAG, &resp);
+
+    PrintAndLogEx(INFO, "Done");
     if (resp.status != PM3_EOPABORTED)
         return resp.status;
     return PM3_SUCCESS;
diff --git a/client/cmdlfio.c b/client/cmdlfio.c
index 386a882ac..694cbc550 100644
--- a/client/cmdlfio.c
+++ b/client/cmdlfio.c
@@ -178,8 +178,8 @@ static int CmdIOProxRead(const char *Cmd) {
 static int CmdIOProxSim(const char *Cmd) {
     uint16_t cn = 0;
     uint8_t version = 0, fc = 0;
-    uint8_t bits[64];
-    memset(bits, 0x00, sizeof(bits));
+    uint8_t bs[64];
+    memset(bs, 0x00, sizeof(bs));
 
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_io_sim();
@@ -201,7 +201,7 @@ static int CmdIOProxSim(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "Simulating IOProx version: %u FC: %u; CN: %u\n", version, fc, cn);
     PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation or run another command");
 
-    if (getIOProxBits(version, fc, cn, bits) != PM3_SUCCESS) {
+    if (getIOProxBits(version, fc, cn, bs) != PM3_SUCCESS) {
         PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
         return PM3_ESOFT;
     }
@@ -209,10 +209,19 @@ static int CmdIOProxSim(const char *Cmd) {
     // arg1 --- fcHigh<<8 + fcLow
     // arg2 --- Invert and clk setting
     // size --- 64 bits == 8 bytes
+    lf_fsksim_t *payload = calloc(1, sizeof(lf_fsksim_t) + sizeof(bs));
+    payload->fchigh = high;
+    payload->fclow =  low;
+    payload->separator = invert;
+    payload->clock = clk;
+    memcpy(payload->data, bs, sizeof(bs));
     clearCommandBuffer();
-    SendCommandOLD(CMD_FSK_SIM_TAG, high << 8 | low, invert << 8 | clk, sizeof(bits), bits, sizeof(bits));
+    SendCommandNG(CMD_FSK_SIM_TAG, (uint8_t *)payload,  sizeof(lf_fsksim_t) + sizeof(bs));
+
     PacketResponseNG resp;
     WaitForResponse(CMD_FSK_SIM_TAG, &resp);
+
+    PrintAndLogEx(INFO, "Done");
     if (resp.status != PM3_EOPABORTED)
         return resp.status;
     return PM3_SUCCESS;
diff --git a/client/cmdlfparadox.c b/client/cmdlfparadox.c
index f6e00bcd0..e837d2fe5 100644
--- a/client/cmdlfparadox.c
+++ b/client/cmdlfparadox.c
@@ -134,10 +134,19 @@ static int CmdParadoxSim(const char *Cmd) {
 
     PrintAndLogEx(NORMAL, "Simulating Paradox - Facility Code: %u, CardNumber: %u", facilitycode, cardnumber);
 
+    lf_fsksim_t *payload = calloc(1, sizeof(lf_fsksim_t) + sizeof(bs));
+    payload->fchigh = high;
+    payload->fclow =  low;
+    payload->separator = invert;
+    payload->clock = clk;
+    memcpy(payload->data, bs, sizeof(bs));
     clearCommandBuffer();
-    SendCommandOLD(CMD_FSK_SIM_TAG, high << 8 | low, invert << 8 | clk, sizeof(bs), bs, sizeof(bs));
+    SendCommandNG(CMD_FSK_SIM_TAG, (uint8_t *)payload,  sizeof(lf_fsksim_t) + sizeof(bs));
+
     PacketResponseNG resp;
     WaitForResponse(CMD_FSK_SIM_TAG, &resp);
+
+    PrintAndLogEx(INFO, "Done");
     if (resp.status != PM3_EOPABORTED)
         return resp.status;
     return PM3_SUCCESS;
diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c
index a30e3aa58..5f3e2fb05 100644
--- a/client/cmdlfpyramid.c
+++ b/client/cmdlfpyramid.c
@@ -212,7 +212,7 @@ static int CmdPyramidClone(const char *Cmd) {
     facilitycode = (fc & 0x000000FF);
     cardnumber = (cn & 0x0000FFFF);
 
-    if (!getPyramidBits(facilitycode, cardnumber, bs)) {
+    if (getPyramidBits(facilitycode, cardnumber, bs) != PM3_SUCCESS) {
         PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
         return PM3_ESOFT;
     }
@@ -275,17 +275,27 @@ static int CmdPyramidSim(const char *Cmd) {
     facilitycode = (fc & 0x000000FF);
     cardnumber = (cn & 0x0000FFFF);
 
-    if (!getPyramidBits(facilitycode, cardnumber, bs)) {
+    if (getPyramidBits(facilitycode, cardnumber, bs) != PM3_SUCCESS) {
         PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
         return PM3_ESOFT;
     }
 
     PrintAndLogEx(SUCCESS, "Simulating Farpointe/Pyramid - Facility Code: %u, CardNumber: %u", facilitycode, cardnumber);
 
+    lf_fsksim_t *payload = calloc(1, sizeof(lf_fsksim_t) + sizeof(bs));
+    payload->fchigh = high;
+    payload->fclow =  low;
+    payload->separator = invert;
+    payload->clock = clk;
+    memcpy(payload->data, bs, sizeof(bs));
+
     clearCommandBuffer();
-    SendCommandOLD(CMD_FSK_SIM_TAG, high << 8 | low, invert << 8 | clk, sizeof(bs), bs, sizeof(bs));
+    SendCommandNG(CMD_FSK_SIM_TAG, (uint8_t *)payload,  sizeof(lf_fsksim_t) + sizeof(bs));
+
     PacketResponseNG resp;
     WaitForResponse(CMD_FSK_SIM_TAG, &resp);
+
+    PrintAndLogEx(INFO, "Done");
     if (resp.status != PM3_EOPABORTED)
         return resp.status;
     return PM3_SUCCESS;
@@ -323,8 +333,7 @@ int getPyramidBits(uint32_t fc, uint32_t cn, uint8_t *pyramidBits) {
     // Get 26 wiegand from FacilityCode, CardNumber
     uint8_t wiegand[24];
     memset(wiegand, 0x00, sizeof(wiegand));
-    num_to_bytebits(fc, 8, wiegand);
-    num_to_bytebits(cn, 16, wiegand + 8);
+    num_to_bytebits(fc, 8, wiegand);    num_to_bytebits(cn, 16, wiegand + 8);
 
     // add wiegand parity bits (dest, source, len)
     wiegand_add_parity(pre + 80, wiegand, 24);
diff --git a/include/pm3_cmd.h b/include/pm3_cmd.h
index 6608b8477..a98eb8f89 100644
--- a/include/pm3_cmd.h
+++ b/include/pm3_cmd.h
@@ -176,6 +176,15 @@ typedef struct {
     uint8_t flags;
 } PACKED t55xx_write_block_t;
 
+// For CMD_FSK_SIM_TAG
+typedef struct {
+    uint8_t fchigh;
+    uint8_t fclow;
+    uint8_t separator;
+    uint8_t clock;
+    uint8_t data[];
+} PACKED lf_fsksim_t;
+
 // For the bootloader
 #define CMD_DEVICE_INFO                                                   0x0000
 #define CMD_SETUP_WRITE                                                   0x0001

From ed9a5e6d6ff82c971ae2fc5ae0d0e51ab8c3db51 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 23 May 2019 18:31:56 -0400
Subject: [PATCH 1823/1938] chg: textual

---
 armsrc/appmain.c     |  2 +-
 armsrc/flashmem.c    | 16 ++++++++--------
 armsrc/lfsampling.c  |  2 +-
 client/cmdflashmem.c |  1 -
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 75bf8e86e..7a86c5b49 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -397,7 +397,7 @@ void printConnSpeed(void) {
 
     Dbprintf("  Time elapsed............%dms", delta_time);
     Dbprintf("  Bytes transferred.......%d", bytes_transferred);
-    Dbprintf("  Transfer Speed PM3 -> Client = " _YELLOW_("%d") " bytes/s", 1000 * bytes_transferred / delta_time);
+    Dbprintf("  Transfer Speed PM3 -> Client = " _YELLOW_("%d") "bytes/s", 1000 * bytes_transferred / delta_time);
 }
 
 /**
diff --git a/armsrc/flashmem.c b/armsrc/flashmem.c
index fcfc9bcb2..5bdbfff90 100644
--- a/armsrc/flashmem.c
+++ b/armsrc/flashmem.c
@@ -518,7 +518,7 @@ void Flash_EraseChip(void) {
 
 void Flashmem_print_status(void) {
     DbpString(_BLUE_("Flash memory"));
-    Dbprintf("  Baudrate................%dMHz", FLASHMEM_SPIBAUDRATE / 1000000);
+    Dbprintf("  Baudrate................" _GREEN_("%d MHz"), FLASHMEM_SPIBAUDRATE / 1000000);
 
     if (!FlashInit()) {
         DbpString("  Init...................." _RED_("FAILED"));
@@ -529,13 +529,13 @@ void Flashmem_print_status(void) {
     uint8_t dev_id = Flash_ReadID();
     switch (dev_id) {
         case 0x11 :
-            DbpString("  Memory size............." _YELLOW_("2 mbits / 256kb"));
+            DbpString("  Memory size............." _YELLOW_("2 mbits / 256 kb"));
             break;
         case 0x10 :
-            DbpString("  Memory size..... ......." _YELLOW_("1 mbits / 128kb"));
+            DbpString("  Memory size..... ......." _YELLOW_("1 mbits / 128 kb"));
             break;
         case 0x05 :
-            DbpString("  Memory size............." _YELLOW_("512 kbits / 64kb"));
+            DbpString("  Memory size............." _YELLOW_("512 kbits / 64 kb"));
             break;
         default :
             DbpString("  Device ID..............." _YELLOW_(" -->  Unknown  <--"));
@@ -544,7 +544,7 @@ void Flashmem_print_status(void) {
 
     uint8_t uid[8] = {0, 0, 0, 0, 0, 0, 0, 0};
     Flash_UniqueID(uid);
-    Dbprintf("  Unique ID...............0x%02x%02x%02x%02x%02x%02x%02x%02x",
+    Dbprintf("  Unique ID...............0x%02X%02X%02X%02X%02X%02X%02X%02X",
              uid[7], uid[6], uid[5], uid[4],
              uid[3], uid[2], uid[1], uid[0]
             );
@@ -565,21 +565,21 @@ void Flashmem_print_info(void) {
     if (isok == 2) {
         num = ((keysum[1] << 8) | keysum[0]);
         if (num != 0xFFFF && num != 0x0)
-            Dbprintf("  Mifare................%d keys", num);
+            Dbprintf("  Mifare................"_YELLOW_("%d")"keys", num);
     }
 
     isok = Flash_ReadDataCont(DEFAULT_T55XX_KEYS_OFFSET, keysum, 2);
     if (isok == 2) {
         num = ((keysum[1] << 8) | keysum[0]);
         if (num != 0xFFFF && num != 0x0)
-            Dbprintf("  T55x7.................%d keys", num);
+            Dbprintf("  T55x7................."_YELLOW_("%d")"keys", num);
     }
 
     isok = Flash_ReadDataCont(DEFAULT_ICLASS_KEYS_OFFSET, keysum, 2);
     if (isok == 2) {
         num = ((keysum[1] << 8) | keysum[0]);
         if (num != 0xFFFF && num != 0x0)
-            Dbprintf("  iClass................%d keys", num);
+            Dbprintf("  iClass................"_YELLOW_("%d")"keys", num);
     }
 
     FlashStop();
diff --git a/armsrc/lfsampling.c b/armsrc/lfsampling.c
index b8a76c016..53215581e 100644
--- a/armsrc/lfsampling.c
+++ b/armsrc/lfsampling.c
@@ -20,7 +20,7 @@ sample_config config = { 1, 8, 1, 95, 0 } ;
 
 void printConfig() {
     DbpString(_BLUE_("LF Sampling config"));
-    Dbprintf("  [q] divisor.............%d (%d kHz)", config.divisor, 12000 / (config.divisor + 1));
+    Dbprintf("  [q] divisor.............%d ( "_GREEN_("%d kHz")")", config.divisor, 12000 / (config.divisor + 1));
     Dbprintf("  [b] bps.................%d", config.bits_per_sample);
     Dbprintf("  [d] decimation..........%d", config.decimation);
     Dbprintf("  [a] averaging...........%s", (config.averaging) ? "Yes" : "No");
diff --git a/client/cmdflashmem.c b/client/cmdflashmem.c
index a259a3e40..f9477cdd8 100644
--- a/client/cmdflashmem.c
+++ b/client/cmdflashmem.c
@@ -14,7 +14,6 @@
 #include "mbedtls/base64.h"
 
 #define MCK 48000000
-//#define FLASH_BAUD 24000000
 #define FLASH_MINFAST 24000000 //33000000
 #define FLASH_BAUD MCK/2
 #define FLASH_FASTBAUD MCK

From 9426f61922396ee21582eb38b42697462f5a9536 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 23 May 2019 18:32:17 -0400
Subject: [PATCH 1824/1938] chg: lf sim - free mem?

---
 client/cmdlf.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/cmdlf.c b/client/cmdlf.c
index 0f3d9c8ac..05f61bdf1 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -626,6 +626,8 @@ int CmdLFfskSim(const char *Cmd) {
     clearCommandBuffer();
     SendCommandNG(CMD_FSK_SIM_TAG, (uint8_t *)payload,  sizeof(lf_fsksim_t) + size);
 
+    free(payload);
+
     setClockGrid(clk, 0);
     PacketResponseNG resp;
     WaitForResponse(CMD_FSK_SIM_TAG, &resp);

From d32c4d5267f6e76f15547dc056d3c89f16d513a6 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 23 May 2019 18:50:24 -0400
Subject: [PATCH 1825/1938] chg: resized flashmem offset for dictionaries to
 fit

---
 client/cmdflashmem.c |  6 +++---
 include/common.h     | 13 +++++++++----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/client/cmdflashmem.c b/client/cmdflashmem.c
index f9477cdd8..a09ac0ce1 100644
--- a/client/cmdflashmem.c
+++ b/client/cmdflashmem.c
@@ -307,7 +307,7 @@ static int CmdFlashMemLoad(const char *Cmd) {
 
     conn.block_after_ACK = false;
     free(data);
-    PrintAndLogEx(SUCCESS, "Wrote %u bytes to offset %u", datalen, start_index);
+    PrintAndLogEx(SUCCESS, "Wrote "_GREEN_("%u")"bytes to offset "_GREEN_("%u"), datalen, start_index);
     return PM3_SUCCESS;
 }
 static int CmdFlashMemSave(const char *Cmd) {
@@ -357,9 +357,9 @@ static int CmdFlashMemSave(const char *Cmd) {
         return PM3_EMALLOC;
     }
 
-    PrintAndLogEx(NORMAL, "downloading %u bytes from flashmem", len);
+    PrintAndLogEx(NORMAL, "downloading"_YELLOW_("%u")"bytes from flashmem", len);
     if (!GetFromDevice(FLASH_MEM, dump, len, start_index, NULL, -1, true)) {
-        PrintAndLogEx(FAILED, "ERROR; downloading flashmem");
+        PrintAndLogEx(FAILED, "ERROR; downloading from flashmemory");
         free(dump);
         return PM3_EFLASH;
     }
diff --git a/include/common.h b/include/common.h
index bfb831c2f..eccbc4864 100644
--- a/include/common.h
+++ b/include/common.h
@@ -90,18 +90,23 @@ extern uint32_t FLASHMEM_SPIBAUDRATE;
 # define T55XX_CONFIG_OFFSET (FLASH_MEM_MAX_4K_SECTOR - 0x2000)
 #endif
 
+// Reserved space for T55XX PWD = 4 kb
 #ifndef DEFAULT_T55XX_KEYS_OFFSET
 # define DEFAULT_T55XX_KEYS_OFFSET (FLASH_MEM_MAX_4K_SECTOR - 0x3000)
 #endif
 
-#ifndef DEFAULT_MF_KEYS_OFFSET
-# define DEFAULT_MF_KEYS_OFFSET (FLASH_MEM_MAX_4K_SECTOR - 0x4000)
+// Reserved space for iClass keys = 4 kb
+#ifndef DEFAULT_ICLASS_KEYS_OFFSET
+# define DEFAULT_ICLASS_KEYS_OFFSET (FLASH_MEM_MAX_4K_SECTOR - 0x4000)
 #endif
 
-#ifndef DEFAULT_ICLASS_KEYS_OFFSET
-# define DEFAULT_ICLASS_KEYS_OFFSET (FLASH_MEM_MAX_4K_SECTOR - 0x5000)
+// Reserved space for MIFARE Keys = 8 kb
+#ifndef DEFAULT_MF_KEYS_OFFSET
+# define DEFAULT_MF_KEYS_OFFSET (FLASH_MEM_MAX_4K_SECTOR - 0x6000)
 #endif
 
+
+
 // RDV40,  validation structure to help identifying that client/firmware is talking with RDV40
 typedef struct {
     uint8_t magic[4];

From 98b75e43a53987441e2af835f2fac81fd762acd3 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 24 May 2019 06:22:43 -0400
Subject: [PATCH 1826/1938] fix: lf t55xx wipe

---
 client/cmdlft55xx.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 7046227eb..9ba81d27f 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1830,13 +1830,13 @@ static int CmdT55xxWipe(const char *Cmd) {
     else
         snprintf(ptrData, sizeof(writeData), "b 0 d 000880E0 p 0");
 
-    if (!CmdT55xxWriteBlock(ptrData)) PrintAndLogEx(WARNING, "Error writing blk 0");
+    if (CmdT55xxWriteBlock(ptrData) != PM3_SUCCESS) PrintAndLogEx(WARNING, "Error writing blk 0");
 
     for (uint8_t blk = 1; blk < 8; blk++) {
 
         snprintf(ptrData, sizeof(writeData), "b %d d 0", blk);
 
-        if (!CmdT55xxWriteBlock(ptrData)) PrintAndLogEx(WARNING, "Error writing blk %d", blk);
+        if (CmdT55xxWriteBlock(ptrData) != PM3_SUCCESS) PrintAndLogEx(WARNING, "Error writing blk %d", blk);
 
         memset(writeData, 0x00, sizeof(writeData));
     }

From e727fe5818cbba21c21c9da97bbc79cb2baa535e Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 24 May 2019 07:06:08 -0400
Subject: [PATCH 1827/1938] chf: lf asksim - uses NG

---
 armsrc/appmain.c        |  6 ++++--
 armsrc/apps.h           |  3 ++-
 armsrc/lfops.c          |  6 +-----
 client/cmdlf.c          | 23 ++++++++++++++++++-----
 client/cmdlffdx.c       | 22 ++++++++++++++++------
 client/cmdlfguard.c     | 24 +++++++++++++++++-------
 client/cmdlfjablotron.c | 19 +++++++++++++++----
 client/cmdlfnedap.c     | 17 +++++++++++++----
 client/cmdlfnoralsy.c   | 21 +++++++++++++++------
 client/cmdlfpresco.c    | 21 ++++++++++++++++-----
 client/cmdlft55xx.c     |  2 +-
 client/cmdlfviking.c    | 28 +++++++++++++++++++---------
 client/cmdlfvisa2000.c  | 23 ++++++++++++++++-------
 include/pm3_cmd.h       |  9 +++++++++
 14 files changed, 162 insertions(+), 62 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 7a86c5b49..24dd79826 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -787,9 +787,11 @@ static void PacketReceived(PacketCommandNG *packet) {
             CmdFSKsimTAG(payload->fchigh, payload->fclow, payload->separator, payload->clock, packet->length - sizeof(lf_fsksim_t), payload->data, 1);
             break;
             }
-        case CMD_ASK_SIM_TAG:
-            CmdASKsimTag(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes, 1);
+        case CMD_ASK_SIM_TAG: {
+            lf_asksim_t *payload = (lf_asksim_t *)packet->data.asBytes;
+            CmdASKsimTAG(payload->encoding, payload->invert, payload->separator, payload->clock, packet->length - sizeof(lf_asksim_t), payload->data, 1);
             break;
+            }
         case CMD_PSK_SIM_TAG:
             CmdPSKsimTag(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes, 1);
             break;
diff --git a/armsrc/apps.h b/armsrc/apps.h
index 6e845349b..7ca3d5178 100644
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -88,9 +88,10 @@ void CmdHIDsimTAGEx(uint32_t hi, uint32_t lo, int ledcontrol, int numcycles);
 void CmdHIDsimTAG(uint32_t hi, uint32_t lo, int ledcontrol);
 
 void CmdFSKsimTAG(uint8_t fchigh, uint8_t fclow, uint8_t separator, uint8_t clock, uint16_t bitslen, uint8_t *bits, int ledcontrol);
+void CmdASKsimTAG(uint8_t encoding, uint8_t invert, uint8_t separator, uint8_t clk, size_t size, uint8_t *bits, int ledcontrol);
 
-void CmdASKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *bits, int ledcontrol);
 void CmdPSKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *bits, int ledcontrol);
+
 void CmdHIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol);
 void CmdAWIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol); // Realtime demodulation mode for AWID26
 void CmdEM410xdemod(int findone, uint32_t *high, uint64_t *low, int ledcontrol);
diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index 4d4141503..5cff85796 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -903,15 +903,11 @@ static void stAskSimBit(int *n, uint8_t clock) {
 }
 
 // args clock, ask/man or askraw, invert, transmission separator
-void CmdASKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *bits, int ledcontrol) {
+void CmdASKsimTAG(uint8_t encoding, uint8_t invert, uint8_t separator, uint8_t clk, size_t size, uint8_t *bits, int ledcontrol) {
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
     set_tracing(false);
 
     int n = 0, i = 0;
-    uint8_t clk = (arg1 >> 8) & 0xFF;
-    uint8_t encoding = arg1 & 0xFF;
-    uint8_t separator = arg2 & 1;
-    uint8_t invert = (arg2 >> 8) & 1;
 
     if (encoding == 2) { //biphase
         uint8_t phase = 0;
diff --git a/client/cmdlf.c b/client/cmdlf.c
index 05f61bdf1..34fe95dda 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -712,16 +712,29 @@ int CmdLFaskSim(const char *Cmd) {
     if (encoding == 0) clk /= 2; //askraw needs to double the clock speed
 
     size_t size = DemodBufferLen;
-    if (size > PM3_CMD_DATA_SIZE) {
-        PrintAndLogEx(NORMAL, "DemodBuffer too long for current implementation - length: %d - max: %d", size, PM3_CMD_DATA_SIZE);
-        size = PM3_CMD_DATA_SIZE;
+    if (size > (PM3_CMD_DATA_SIZE - sizeof(lf_asksim_t))) {
+        PrintAndLogEx(NORMAL, "DemodBuffer too long for current implementation - length: %d - max: %d", size, PM3_CMD_DATA_SIZE - sizeof(lf_asksim_t));
+        size = PM3_CMD_DATA_SIZE - sizeof(lf_asksim_t);
     }
 
-    PrintAndLogEx(NORMAL, "preparing to sim ask data: %d bits", size);
+
+    lf_asksim_t *payload = calloc(1, sizeof(lf_asksim_t) + size);
+    payload->encoding =  encoding;
+    payload->invert = invert;
+    payload->separator = separator;
+    payload->clock = clk;
+    memcpy(payload->data, DemodBuffer, size);
+
+    PrintAndLogEx(INFO, "Simulating");
+
     clearCommandBuffer();
-    SendCommandOLD(CMD_ASK_SIM_TAG, clk << 8 | encoding, invert << 8 | separator, size, DemodBuffer, size);
+    SendCommandNG(CMD_ASK_SIM_TAG, (uint8_t *)payload,  sizeof(lf_asksim_t) + size);
+    free(payload);
+
     PacketResponseNG resp;
     WaitForResponse(CMD_ASK_SIM_TAG, &resp);
+
+    PrintAndLogEx(INFO, "Done");
     if (resp.status != PM3_EOPABORTED)
         return resp.status;
     return PM3_SUCCESS;
diff --git a/client/cmdlffdx.c b/client/cmdlffdx.c
index 0211fcad1..6f019b169 100644
--- a/client/cmdlffdx.c
+++ b/client/cmdlffdx.c
@@ -319,18 +319,28 @@ static int CmdFdxSim(const char *Cmd) {
 
     verify_values(countryid, animalid);
 
-    // 32, no STT, BIPHASE INVERTED == diphase
-    uint8_t clk = 32, encoding = 2, separator = 0, invert = 1;
-
     PrintAndLogEx(SUCCESS, "Simulating FDX-B animal ID: %04u-%"PRIu64, countryid, animalid);
 
-    uint8_t data[128];
+    uint8_t bs[128];
     //getFDXBits(uint64_t national_id, uint16_t country, uint8_t isanimal, uint8_t isextended, uint32_t extended, uint8_t *bits)
-    getFDXBits(animalid, countryid, 1, 0, 0, data);
+    getFDXBits(animalid, countryid, 1, 0, 0, bs);
+
+    // 32, no STT, BIPHASE INVERTED == diphase
+    lf_asksim_t *payload = calloc(1, sizeof(lf_asksim_t) + sizeof(bs));
+    payload->encoding = 2;
+    payload->invert = 1;
+    payload->separator = 0;
+    payload->clock = 32;
+    memcpy(payload->data, bs, sizeof(bs));
+
     clearCommandBuffer();
-    SendCommandOLD(CMD_ASK_SIM_TAG, clk << 8 | encoding, invert << 8 | separator, sizeof(data), data, sizeof(data));
+    SendCommandNG(CMD_ASK_SIM_TAG, (uint8_t *)payload,  sizeof(lf_asksim_t) + sizeof(bs));
+    free(payload);
+ 
     PacketResponseNG resp;
     WaitForResponse(CMD_ASK_SIM_TAG, &resp);
+
+    PrintAndLogEx(INFO, "Done");
     if (resp.status != PM3_EOPABORTED)
         return resp.status;
     return PM3_SUCCESS;
diff --git a/client/cmdlfguard.c b/client/cmdlfguard.c
index 53c912f15..54073fc02 100644
--- a/client/cmdlfguard.c
+++ b/client/cmdlfguard.c
@@ -138,8 +138,8 @@ static int CmdGuardRead(const char *Cmd) {
 
 static int CmdGuardClone(const char *Cmd) {
 
-    char cmdp = param_getchar(Cmd, 0);
-    if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_guard_clone();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_guard_clone();
 
     uint32_t facilitycode = 0, cardnumber = 0, fc = 0, cn = 0, fmtlen = 0;
     uint8_t bs[96];
@@ -198,12 +198,10 @@ static int CmdGuardClone(const char *Cmd) {
 
 static int CmdGuardSim(const char *Cmd) {
 
-    // Guard uses:  clk: 64, invert: 0, encoding: 2 (ASK Biphase)
-    uint8_t clock1 = 64, encoding = 2, separator = 0, invert = 0;
     uint32_t facilitycode = 0, cardnumber = 0, fc = 0, cn = 0, fmtlen = 0;
 
-    char cmdp = param_getchar(Cmd, 0);
-    if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_guard_sim();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_guard_sim();
 
     if (sscanf(Cmd, "%u %u %u", &fmtlen, &fc, &cn) != 3) return usage_lf_guard_sim();
 
@@ -221,10 +219,22 @@ static int CmdGuardSim(const char *Cmd) {
 
     PrintAndLogEx(SUCCESS, "Simulating Guardall - Facility Code: %u, CardNumber: %u", facilitycode, cardnumber);
 
+    // Guard uses:  clk: 64, invert: 0, encoding: 2 (ASK Biphase)
+    lf_asksim_t *payload = calloc(1, sizeof(lf_asksim_t) + sizeof(bs));
+    payload->encoding =  2;
+    payload->invert = 0;
+    payload->separator = 0;
+    payload->clock = 64;
+    memcpy(payload->data, bs, sizeof(bs));
+
     clearCommandBuffer();
-    SendCommandOLD(CMD_ASK_SIM_TAG, (clock1 << 8) | encoding, (invert << 8) | separator, sizeof(bs), bs, sizeof(bs));
+    SendCommandNG(CMD_ASK_SIM_TAG, (uint8_t *)payload,  sizeof(lf_asksim_t) + sizeof(bs));
+    free(payload);
+
     PacketResponseNG resp;
     WaitForResponse(CMD_ASK_SIM_TAG, &resp);
+
+    PrintAndLogEx(INFO, "Done");
     if (resp.status != PM3_EOPABORTED)
         return resp.status;
     return PM3_SUCCESS;
diff --git a/client/cmdlfjablotron.c b/client/cmdlfjablotron.c
index b6fcacf40..a5b9166ac 100644
--- a/client/cmdlfjablotron.c
+++ b/client/cmdlfjablotron.c
@@ -195,15 +195,26 @@ static int CmdJablotronSim(const char *Cmd) {
         PrintAndLogEx(INFO, "Card Number Truncated to 39bits: %"PRIx64, fullcode);
     }
 
-    uint8_t clk = 64, encoding = 2, separator = 0, invert = 1;
     PrintAndLogEx(SUCCESS, "Simulating Jablotron - FullCode: %"PRIx64, fullcode);
 
-    uint8_t data[64];
-    getJablotronBits(fullcode, data);
+    uint8_t bs[64];
+    getJablotronBits(fullcode, bs);
+
+    lf_asksim_t *payload = calloc(1, sizeof(lf_asksim_t) + sizeof(bs));
+    payload->encoding =  2;
+    payload->invert = 1;
+    payload->separator = 0;
+    payload->clock = 64;
+    memcpy(payload->data, bs, sizeof(bs));
+
     clearCommandBuffer();
-    SendCommandOLD(CMD_ASK_SIM_TAG, clk << 8 | encoding, invert << 8 | separator, sizeof(data), data, sizeof(data));
+    SendCommandNG(CMD_ASK_SIM_TAG, (uint8_t *)payload,  sizeof(lf_asksim_t) + sizeof(bs));
+    free(payload);
+
     PacketResponseNG resp;
     WaitForResponse(CMD_ASK_SIM_TAG, &resp);
+
+    PrintAndLogEx(INFO, "Done");
     if (resp.status != PM3_EOPABORTED)
         return resp.status;
     return PM3_SUCCESS;
diff --git a/client/cmdlfnedap.c b/client/cmdlfnedap.c
index 918b5151e..636a23b33 100644
--- a/client/cmdlfnedap.c
+++ b/client/cmdlfnedap.c
@@ -242,9 +242,6 @@ static int CmdLFNedapSim(const char *Cmd) {
     uint8_t bs[128];
     memset(bs, 0x00, sizeof(bs));
 
-    // NEDAP,  Biphase = 2, clock 64, inverted,  (DIPhase == inverted BIphase
-    uint8_t  clk = 64, encoding = 2, separator = 0, invert = 1;
-
     if (getNedapBits(cardnumber, bs) != PM3_SUCCESS) {
         PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
         return PM3_ESOFT;
@@ -253,10 +250,22 @@ static int CmdLFNedapSim(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "bin  %s", sprint_bin_break(bs, 128, 32));
     PrintAndLogEx(SUCCESS, "Simulating Nedap - CardNumber: %u", cardnumber);
 
+    // NEDAP,  Biphase = 2, clock 64, inverted,  (DIPhase == inverted BIphase)
+    lf_asksim_t *payload = calloc(1, sizeof(lf_asksim_t) + sizeof(bs));
+    payload->encoding = 2;
+    payload->invert = 1;
+    payload->separator = 0;
+    payload->clock = 64;
+    memcpy(payload->data, bs, sizeof(bs));
+
     clearCommandBuffer();
-    SendCommandOLD(CMD_ASK_SIM_TAG, clk << 8 | encoding, invert << 8 | separator, sizeof(bs), bs, sizeof(bs));
+    SendCommandNG(CMD_ASK_SIM_TAG, (uint8_t *)payload,  sizeof(lf_asksim_t) + sizeof(bs));
+    free(payload);
+
     PacketResponseNG resp;
     WaitForResponse(CMD_ASK_SIM_TAG, &resp);
+
+    PrintAndLogEx(INFO, "Done");
     if (resp.status != PM3_EOPABORTED)
         return resp.status;
     return PM3_SUCCESS;
diff --git a/client/cmdlfnoralsy.c b/client/cmdlfnoralsy.c
index f6ff78645..9e3413405 100644
--- a/client/cmdlfnoralsy.c
+++ b/client/cmdlfnoralsy.c
@@ -181,8 +181,8 @@ static int CmdNoralsyClone(const char *Cmd) {
 
 static int CmdNoralsySim(const char *Cmd) {
 
-    uint8_t bits[96];
-    memset(bits, 0, sizeof(bits));
+    uint8_t bs[96];
+    memset(bs, 0, sizeof(bs));
 
     uint16_t year = 0;
     uint32_t id = 0;
@@ -194,19 +194,28 @@ static int CmdNoralsySim(const char *Cmd) {
     id = param_get32ex(Cmd, 0, 0, 10);
     year = param_get32ex(Cmd, 1, 2000, 10);
 
-    uint8_t clk = 32, encoding = 1, separator = 1, invert = 0;
-
-    if (getnoralsyBits(id, year, bits) != PM3_SUCCESS) {
+    if (getnoralsyBits(id, year, bs) != PM3_SUCCESS) {
         PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
         return PM3_ESOFT;
     }
 
     PrintAndLogEx(SUCCESS, "Simulating Noralsy - CardId: %u", id);
 
+    lf_asksim_t *payload = calloc(1, sizeof(lf_asksim_t) + sizeof(bs));
+    payload->encoding = 1;
+    payload->invert = 0;
+    payload->separator = 1;
+    payload->clock = 32;
+    memcpy(payload->data, bs, sizeof(bs));
+
     clearCommandBuffer();
-    SendCommandOLD(CMD_ASK_SIM_TAG, clk << 8 | encoding, invert << 8 | separator, sizeof(bits), bits, sizeof(bits));
+    SendCommandNG(CMD_ASK_SIM_TAG, (uint8_t *)payload,  sizeof(lf_asksim_t) + sizeof(bs));
+    free(payload);
+
     PacketResponseNG resp;
     WaitForResponse(CMD_ASK_SIM_TAG, &resp);
+
+    PrintAndLogEx(INFO, "Done");
     if (resp.status != PM3_EOPABORTED)
         return resp.status;
     return PM3_SUCCESS;
diff --git a/client/cmdlfpresco.c b/client/cmdlfpresco.c
index 4c33334e6..e0a9bb351 100644
--- a/client/cmdlfpresco.c
+++ b/client/cmdlfpresco.c
@@ -154,15 +154,26 @@ static int CmdPrescoSim(const char *Cmd) {
     if (getWiegandFromPresco(Cmd, &sitecode, &usercode, &fullcode, &Q5) == -1) 
         return usage_lf_presco_sim();
 
-    uint8_t clk = 32, encoding = 1, separator = 1, invert = 0;
-
     PrintAndLogEx(SUCCESS, "Simulating Presco - SiteCode: %u, UserCode: %u, FullCode: %08X", sitecode, usercode, fullcode);
 
-    uint8_t data[128];
-    getPrescoBits(fullcode, data);
-    SendCommandOLD(CMD_ASK_SIM_TAG, clk << 8 | encoding, invert << 8 | separator, sizeof(data), data, sizeof(data));
+    uint8_t bs[128];
+    getPrescoBits(fullcode, bs);
+
+    lf_asksim_t *payload = calloc(1, sizeof(lf_asksim_t) + sizeof(bs));
+    payload->encoding = 1;
+    payload->invert = 0;
+    payload->separator = 1;
+    payload->clock = 32;
+    memcpy(payload->data, bs, sizeof(bs));
+
+    clearCommandBuffer();
+    SendCommandNG(CMD_ASK_SIM_TAG, (uint8_t *)payload,  sizeof(lf_asksim_t) + sizeof(bs));
+    free(payload);
+
     PacketResponseNG resp;
     WaitForResponse(CMD_ASK_SIM_TAG, &resp);
+
+    PrintAndLogEx(INFO, "Done");
     if (resp.status != PM3_EOPABORTED)
         return resp.status;
     return PM3_SUCCESS;
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 9ba81d27f..8bf6ede8b 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1866,7 +1866,7 @@ static int CmdT55xxChkPwds(const char *Cmd) {
 
     /*
     // block 7,  page1 = false, usepwd = false, override = false, pwd = 00000000
-    if ( T55xxReadBlock(7, false, false, false, 0x00000000) ) {
+    if ( T55xxReadBlock(7, false, false, false, 0x00000000) == PM3_SUCCESS) {
 
         // now try to validate it..
         PrintAndLogEx(WARNING, "\n Block 7 was readable");
diff --git a/client/cmdlfviking.c b/client/cmdlfviking.c
index d8d2554cf..138945531 100644
--- a/client/cmdlfviking.c
+++ b/client/cmdlfviking.c
@@ -74,8 +74,8 @@ static int CmdVikingClone(const char *Cmd) {
     uint32_t id = 0;
     uint64_t rawID = 0;
     bool Q5 = false;
-    char cmdp = param_getchar(Cmd, 0);
-    if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_viking_clone();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_viking_clone();
 
     id = param_get32ex(Cmd, 0, 0, 16);
     if (id == 0) return usage_lf_viking_clone();
@@ -101,10 +101,8 @@ static int CmdVikingClone(const char *Cmd) {
 static int CmdVikingSim(const char *Cmd) {
     uint32_t id = 0;
     uint64_t rawID = 0;
-    uint8_t clk = 32, encoding = 1, separator = 0, invert = 0;
-
-    char cmdp = param_getchar(Cmd, 0);
-    if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_viking_sim();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_viking_sim();
 
     id = param_get32ex(Cmd, 0, 0, 16);
     if (id == 0) return usage_lf_viking_sim();
@@ -113,12 +111,24 @@ static int CmdVikingSim(const char *Cmd) {
 
     PrintAndLogEx(SUCCESS, "Simulating Viking - ID: %08X, Raw: %08X%08X", id, (uint32_t)(rawID >> 32), (uint32_t)(rawID & 0xFFFFFFFF));
 
-    uint8_t data[64];
-    num_to_bytebits(rawID, sizeof(data), data);
+    uint8_t bs[64];
+    num_to_bytebits(rawID, sizeof(bs), bs);
+
+    lf_asksim_t *payload = calloc(1, sizeof(lf_asksim_t) + sizeof(bs));
+    payload->encoding = 1;
+    payload->invert = 0;
+    payload->separator = 0;
+    payload->clock = 32;
+    memcpy(payload->data, bs, sizeof(bs));
+
     clearCommandBuffer();
-    SendCommandOLD(CMD_ASK_SIM_TAG, clk << 8 | encoding, invert << 8 | separator, sizeof(data), data, sizeof(data));
+    SendCommandNG(CMD_ASK_SIM_TAG, (uint8_t *)payload,  sizeof(lf_asksim_t) + sizeof(bs));
+    free(payload);
+
     PacketResponseNG resp;
     WaitForResponse(CMD_ASK_SIM_TAG, &resp);
+
+    PrintAndLogEx(INFO, "Done");
     if (resp.status != PM3_EOPABORTED)
         return resp.status;
     return PM3_SUCCESS;
diff --git a/client/cmdlfvisa2000.c b/client/cmdlfvisa2000.c
index e07bf75cb..b717f65dd 100644
--- a/client/cmdlfvisa2000.c
+++ b/client/cmdlfvisa2000.c
@@ -196,26 +196,35 @@ static int CmdVisa2kClone(const char *Cmd) {
 static int CmdVisa2kSim(const char *Cmd) {
 
     uint32_t id = 0;
-    char cmdp = param_getchar(Cmd, 0);
-    if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H')
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) == 0 || cmdp == 'h')
         return usage_lf_visa2k_sim();
 
     id = param_get32ex(Cmd, 0, 0, 10);
 
-    uint8_t clk = 64, encoding = 1, separator = 1, invert = 0;
-
     PrintAndLogEx(SUCCESS, "Simulating Visa2000 - CardId: %u", id);
 
     uint32_t blocks[3] = { BL0CK1, id, (visa_parity(id) << 4) | visa_chksum(id) };
 
-    uint8_t data[96];
+    uint8_t bs[96];
     for (int i = 0; i < 3; ++i)
-        num_to_bytebits(blocks[i], 32, data + i * 32);
+        num_to_bytebits(blocks[i], 32, bs + i * 32);
+
+    lf_asksim_t *payload = calloc(1, sizeof(lf_asksim_t) + sizeof(bs));
+    payload->encoding =  1;
+    payload->invert = 0;
+    payload->separator = 1;
+    payload->clock = 64;
+    memcpy(payload->data, bs, sizeof(bs));
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_ASK_SIM_TAG, clk << 8 | encoding, invert << 8 | separator, sizeof(data), data, sizeof(data));
+    SendCommandNG(CMD_ASK_SIM_TAG, (uint8_t *)payload,  sizeof(lf_asksim_t) + sizeof(bs));
+    free(payload);
+
     PacketResponseNG resp;
     WaitForResponse(CMD_ASK_SIM_TAG, &resp);
+
+    PrintAndLogEx(INFO, "Done");
     if (resp.status != PM3_EOPABORTED)
         return resp.status;
     return PM3_SUCCESS;
diff --git a/include/pm3_cmd.h b/include/pm3_cmd.h
index a98eb8f89..bfa114f19 100644
--- a/include/pm3_cmd.h
+++ b/include/pm3_cmd.h
@@ -185,6 +185,15 @@ typedef struct {
     uint8_t data[];
 } PACKED lf_fsksim_t;
 
+// For CMD_ASK_SIM_TAG
+typedef struct {
+    uint8_t encoding;
+    uint8_t invert;
+    uint8_t separator;
+    uint8_t clock;
+    uint8_t data[];
+} PACKED lf_asksim_t;
+
 // For the bootloader
 #define CMD_DEVICE_INFO                                                   0x0000
 #define CMD_SETUP_WRITE                                                   0x0001

From 80a91eba11016bdad3af23c932d7f6a6b9b24f4d Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 24 May 2019 07:22:50 -0400
Subject: [PATCH 1828/1938] chg: need to free some

---
 client/cmdlf.c        |  5 +++--
 client/cmdlfawid.c    | 29 +++++++++++++----------------
 client/cmdlfio.c      | 13 ++++++-------
 client/cmdlfparadox.c |  4 ++--
 client/cmdlfpyramid.c | 23 +++++++++++------------
 5 files changed, 35 insertions(+), 39 deletions(-)

diff --git a/client/cmdlf.c b/client/cmdlf.c
index 34fe95dda..d83a40283 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -625,7 +625,6 @@ int CmdLFfskSim(const char *Cmd) {
 
     clearCommandBuffer();
     SendCommandNG(CMD_FSK_SIM_TAG, (uint8_t *)payload,  sizeof(lf_fsksim_t) + size);
-
     free(payload);
 
     setClockGrid(clk, 0);
@@ -717,7 +716,6 @@ int CmdLFaskSim(const char *Cmd) {
         size = PM3_CMD_DATA_SIZE - sizeof(lf_asksim_t);
     }
 
-
     lf_asksim_t *payload = calloc(1, sizeof(lf_asksim_t) + size);
     payload->encoding =  encoding;
     payload->invert = invert;
@@ -838,10 +836,13 @@ int CmdLFpskSim(const char *Cmd) {
         size = PM3_CMD_DATA_SIZE;
     }
     PrintAndLogEx(DEBUG, "DEBUG: Sending DemodBuffer Length: %d", size);
+
     clearCommandBuffer();
     SendCommandOLD(CMD_PSK_SIM_TAG, clk << 8 | carrier, invert, size, DemodBuffer, size);
     PacketResponseNG resp;
     WaitForResponse(CMD_PSK_SIM_TAG, &resp);
+
+    PrintAndLogEx(INFO, "Done");
     if (resp.status != PM3_EOPABORTED)
         return resp.status;
     return PM3_SUCCESS;
diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c
index d283181b6..e9169d864 100644
--- a/client/cmdlfawid.c
+++ b/client/cmdlfawid.c
@@ -107,17 +107,16 @@ static int sendTry(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint32_t delay, uin
         return PM3_ESOFT;
     }
 
-    uint8_t clk = 50, high = 10, low = 8, invert = 1;
-
     lf_fsksim_t *payload = calloc(1, sizeof(lf_fsksim_t) + bs_len);
-    payload->fchigh = high;
-    payload->fclow = low;
-    payload->separator = invert;
-    payload->clock = clk;
+    payload->fchigh = 10;
+    payload->fclow = 8;
+    payload->separator = 1;
+    payload->clock = 50;
     memcpy(payload->data, bits, bs_len);
 
     clearCommandBuffer();
     SendCommandNG(CMD_FSK_SIM_TAG, (uint8_t *)payload,  sizeof(lf_fsksim_t) + bs_len);
+    free(payload);
 
     msleep(delay);
     return sendPing();
@@ -186,7 +185,7 @@ static int CmdAWIDDemod(const char *Cmd) {
     size_t size = getFromGraphBuf(bits);
     if (size == 0) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - AWID not enough samples");
-        return PM3_ESOFT;
+        return PM3_ENODATA;
     }
     //get binary from fsk wave
     int waveIdx = 0;
@@ -323,8 +322,8 @@ static int CmdAWIDSim(const char *Cmd) {
     uint8_t bs[96];
     memset(bs, 0x00, sizeof(bs));
 
-    char cmdp = param_getchar(Cmd, 0);
-    if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_awid_sim();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_awid_sim();
 
     fmtlen = param_get8(Cmd, 0);
     fc = param_get32ex(Cmd, 1, 0, 10);
@@ -340,22 +339,20 @@ static int CmdAWIDSim(const char *Cmd) {
         PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
         return PM3_ESOFT;
     }
-
-    uint8_t clk = 50, high = 10, low = 8, invert = 1;
-
     // AWID uses: FSK2a fcHigh: 10, fcLow: 8, clk: 50, invert: 1
     // arg1 --- fcHigh<<8 + fcLow
     // arg2 --- Inversion and clk setting
     // 96   --- Bitstream length: 96-bits == 12 bytes
     lf_fsksim_t *payload = calloc(1, sizeof(lf_fsksim_t) + sizeof(bs));
-    payload->fchigh = high;
-    payload->fclow =  low;
-    payload->separator = invert;
-    payload->clock = clk;
+    payload->fchigh = 10;
+    payload->fclow =  8;
+    payload->separator = 1;
+    payload->clock = 50;
     memcpy(payload->data, bs, sizeof(bs));
 
     clearCommandBuffer();
     SendCommandNG(CMD_FSK_SIM_TAG, (uint8_t *)payload,  sizeof(lf_fsksim_t) + sizeof(bs));
+    free(payload);
 
     PacketResponseNG resp;
     WaitForResponse(CMD_FSK_SIM_TAG, &resp);
diff --git a/client/cmdlfio.c b/client/cmdlfio.c
index 694cbc550..4fb1b6dda 100644
--- a/client/cmdlfio.c
+++ b/client/cmdlfio.c
@@ -195,9 +195,6 @@ static int CmdIOProxSim(const char *Cmd) {
         PrintAndLogEx(INFO, "Card Number Truncated to 16-bits (IOProx): %u", cn);
     }
 
-    // clock 64, FSK2a fcHIGH 10 | fcLOW 8
-    uint8_t clk = 64, invert = 1, high = 10, low = 8;
-
     PrintAndLogEx(SUCCESS, "Simulating IOProx version: %u FC: %u; CN: %u\n", version, fc, cn);
     PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation or run another command");
 
@@ -210,13 +207,15 @@ static int CmdIOProxSim(const char *Cmd) {
     // arg2 --- Invert and clk setting
     // size --- 64 bits == 8 bytes
     lf_fsksim_t *payload = calloc(1, sizeof(lf_fsksim_t) + sizeof(bs));
-    payload->fchigh = high;
-    payload->fclow =  low;
-    payload->separator = invert;
-    payload->clock = clk;
+    payload->fchigh = 10;
+    payload->fclow = 8;
+    payload->separator = 1;
+    payload->clock = 64;
     memcpy(payload->data, bs, sizeof(bs));
+
     clearCommandBuffer();
     SendCommandNG(CMD_FSK_SIM_TAG, (uint8_t *)payload,  sizeof(lf_fsksim_t) + sizeof(bs));
+    free(payload);
 
     PacketResponseNG resp;
     WaitForResponse(CMD_FSK_SIM_TAG, &resp);
diff --git a/client/cmdlfparadox.c b/client/cmdlfparadox.c
index e837d2fe5..684730ef3 100644
--- a/client/cmdlfparadox.c
+++ b/client/cmdlfparadox.c
@@ -140,8 +140,10 @@ static int CmdParadoxSim(const char *Cmd) {
     payload->separator = invert;
     payload->clock = clk;
     memcpy(payload->data, bs, sizeof(bs));
+
     clearCommandBuffer();
     SendCommandNG(CMD_FSK_SIM_TAG, (uint8_t *)payload,  sizeof(lf_fsksim_t) + sizeof(bs));
+    free(payload);
 
     PacketResponseNG resp;
     WaitForResponse(CMD_FSK_SIM_TAG, &resp);
@@ -150,8 +152,6 @@ static int CmdParadoxSim(const char *Cmd) {
     if (resp.status != PM3_EOPABORTED)
         return resp.status;
     return PM3_SUCCESS;
-
-//    PrintAndLogEx(NORMAL, "UNFINISHED");
 }
 
 static command_t CommandTable[] = {
diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c
index 5f3e2fb05..80ef7b94f 100644
--- a/client/cmdlfpyramid.c
+++ b/client/cmdlfpyramid.c
@@ -199,8 +199,8 @@ static int CmdPyramidRead(const char *Cmd) {
 
 static int CmdPyramidClone(const char *Cmd) {
 
-    char cmdp = param_getchar(Cmd, 0);
-    if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_pyramid_clone();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_pyramid_clone();
 
     uint32_t facilitycode = 0, cardnumber = 0, fc = 0, cn = 0;
     uint32_t blocks[5];
@@ -259,17 +259,14 @@ static int CmdPyramidClone(const char *Cmd) {
 
 static int CmdPyramidSim(const char *Cmd) {
 
-    char cmdp = param_getchar(Cmd, 0);
-    if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_pyramid_sim();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_pyramid_sim();
 
     uint32_t facilitycode = 0, cardnumber = 0, fc = 0, cn = 0;
 
     uint8_t bs[128];
     memset(bs, 0x00, sizeof(bs));
-
-    // Pyramid uses:  fcHigh: 10, fcLow: 8, clk: 50, invert: 0
-    uint8_t clk = 50, invert = 0, high = 10, low = 8;
-
+    
     if (sscanf(Cmd, "%u %u", &fc, &cn) != 2) return usage_lf_pyramid_sim();
 
     facilitycode = (fc & 0x000000FF);
@@ -282,15 +279,17 @@ static int CmdPyramidSim(const char *Cmd) {
 
     PrintAndLogEx(SUCCESS, "Simulating Farpointe/Pyramid - Facility Code: %u, CardNumber: %u", facilitycode, cardnumber);
 
+    // Pyramid uses:  fcHigh: 10, fcLow: 8, clk: 50, invert: 0
     lf_fsksim_t *payload = calloc(1, sizeof(lf_fsksim_t) + sizeof(bs));
-    payload->fchigh = high;
-    payload->fclow =  low;
-    payload->separator = invert;
-    payload->clock = clk;
+    payload->fchigh = 10;
+    payload->fclow =  8;
+    payload->separator = 0;
+    payload->clock = 50;
     memcpy(payload->data, bs, sizeof(bs));
 
     clearCommandBuffer();
     SendCommandNG(CMD_FSK_SIM_TAG, (uint8_t *)payload,  sizeof(lf_fsksim_t) + sizeof(bs));
+    free(payload);
 
     PacketResponseNG resp;
     WaitForResponse(CMD_FSK_SIM_TAG, &resp);

From 0d1438d15693c77036b2fd44a6fc5401d2dc4916 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 24 May 2019 09:11:30 -0400
Subject: [PATCH 1829/1938] chg: lf psksim - uses NG

---
 armsrc/appmain.c     | 10 ++++++----
 armsrc/apps.h        | 14 +++++++-------
 armsrc/lfops.c       | 25 +++++++++++--------------
 client/cmdlf.c       | 19 ++++++++++++++-----
 client/cmdlfawid.c   |  7 ++++---
 client/cmdlfindala.c | 23 +++++++++++++++++------
 client/cmdlfkeri.c   | 23 +++++++++++++++++------
 include/pm3_cmd.h    | 13 +++++++++++--
 8 files changed, 87 insertions(+), 47 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 24dd79826..b9b77f6ea 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -784,17 +784,19 @@ static void PacketReceived(PacketCommandNG *packet) {
             break;
         case CMD_FSK_SIM_TAG: {
             lf_fsksim_t *payload = (lf_fsksim_t *)packet->data.asBytes;
-            CmdFSKsimTAG(payload->fchigh, payload->fclow, payload->separator, payload->clock, packet->length - sizeof(lf_fsksim_t), payload->data, 1);
+            CmdFSKsimTAG(payload->fchigh, payload->fclow, payload->separator, payload->clock, packet->length - sizeof(lf_fsksim_t), payload->data, true);
             break;
             }
         case CMD_ASK_SIM_TAG: {
             lf_asksim_t *payload = (lf_asksim_t *)packet->data.asBytes;
-            CmdASKsimTAG(payload->encoding, payload->invert, payload->separator, payload->clock, packet->length - sizeof(lf_asksim_t), payload->data, 1);
+            CmdASKsimTAG(payload->encoding, payload->invert, payload->separator, payload->clock, packet->length - sizeof(lf_asksim_t), payload->data, true);
             break;
             }
-        case CMD_PSK_SIM_TAG:
-            CmdPSKsimTag(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes, 1);
+        case CMD_PSK_SIM_TAG: {
+            lf_psksim_t *payload = (lf_psksim_t *)packet->data.asBytes;
+            CmdPSKsimTag(payload->carrier, payload->invert, payload->clock, packet->length - sizeof(lf_psksim_t), payload->data, true);
             break;
+            }
         case CMD_HID_CLONE_TAG:
             CopyHIDtoT55x7(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes[0]);
             break;
diff --git a/armsrc/apps.h b/armsrc/apps.h
index 7ca3d5178..952185244 100644
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -81,16 +81,16 @@ void WriteTItag(uint32_t idhi, uint32_t idlo, uint16_t crc);
 
 void AcquireTiType(void);
 void AcquireRawBitsTI(void);
-void SimulateTagLowFrequencyEx(int period, int gap, int ledcontrol, int numcycles);
-void SimulateTagLowFrequency(int period, int gap, int ledcontrol);
+void SimulateTagLowFrequencyEx(int period, int gap, bool ledcontrol, int numcycles);
+void SimulateTagLowFrequency(int period, int gap, bool ledcontrol);
 void SimulateTagLowFrequencyBidir(int divisor, int max_bitlen);
-void CmdHIDsimTAGEx(uint32_t hi, uint32_t lo, int ledcontrol, int numcycles);
-void CmdHIDsimTAG(uint32_t hi, uint32_t lo, int ledcontrol);
 
-void CmdFSKsimTAG(uint8_t fchigh, uint8_t fclow, uint8_t separator, uint8_t clock, uint16_t bitslen, uint8_t *bits, int ledcontrol);
-void CmdASKsimTAG(uint8_t encoding, uint8_t invert, uint8_t separator, uint8_t clk, size_t size, uint8_t *bits, int ledcontrol);
+void CmdHIDsimTAGEx(uint32_t hi, uint32_t lo, bool ledcontrol, int numcycles);
+void CmdHIDsimTAG(uint32_t hi, uint32_t lo, bool ledcontrol);
 
-void CmdPSKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *bits, int ledcontrol);
+void CmdFSKsimTAG(uint8_t fchigh, uint8_t fclow, uint8_t separator, uint8_t clk, uint16_t bitslen, uint8_t *bits, bool ledcontrol);
+void CmdASKsimTAG(uint8_t encoding, uint8_t invert, uint8_t separator, uint8_t clk, uint16_t size, uint8_t *bits, bool ledcontrol);
+void CmdPSKsimTag(uint8_t carrier, uint8_t invert, uint8_t clk, uint16_t size, uint8_t *bits, bool ledcontrol);
 
 void CmdHIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol);
 void CmdAWIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol); // Realtime demodulation mode for AWID26
diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index 5cff85796..f52226181 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -561,7 +561,7 @@ void WriteTItag(uint32_t idhi, uint32_t idlo, uint16_t crc) {
 
 // note:   a call to FpgaDownloadAndGo(FPGA_BITSTREAM_LF) must be done before, but
 //  this may destroy the bigbuf so be sure this is called before calling SimulateTagLowFrequencyEx
-void SimulateTagLowFrequencyEx(int period, int gap, int ledcontrol, int numcycles) {
+void SimulateTagLowFrequencyEx(int period, int gap, bool ledcontrol, int numcycles) {
 
     // start us timer
     StartTicks();
@@ -649,7 +649,7 @@ OUT:
     LED_D_OFF();
 }
 
-void SimulateTagLowFrequency(int period, int gap, int ledcontrol) {
+void SimulateTagLowFrequency(int period, int gap, bool ledcontrol) {
     SimulateTagLowFrequencyEx(period, gap, ledcontrol, -1);
 }
 
@@ -757,7 +757,7 @@ static void fcAll(uint8_t fc, int *n, uint8_t clock, uint16_t *modCnt) {
 
 // prepare a waveform pattern in the buffer based on the ID given then
 // simulate a HID tag until the button is pressed
-void CmdHIDsimTAGEx(uint32_t hi, uint32_t lo, int ledcontrol, int numcycles) {
+void CmdHIDsimTAGEx(uint32_t hi, uint32_t lo, bool ledcontrol, int numcycles) {
 
     if (hi > 0xFFF) {
         DbpString("[!] tags can only have 44 bits. - USE lf simfsk for larger tags");
@@ -820,7 +820,7 @@ void CmdHIDsimTAGEx(uint32_t hi, uint32_t lo, int ledcontrol, int numcycles) {
     if (ledcontrol) LED_A_OFF();
 }
 
-void CmdHIDsimTAG(uint32_t hi, uint32_t lo, int ledcontrol) {
+void CmdHIDsimTAG(uint32_t hi, uint32_t lo, bool ledcontrol) {
     CmdHIDsimTAGEx(hi, lo, ledcontrol, -1);
     reply_ng(CMD_HID_SIM_TAG, PM3_EOPABORTED, NULL, 0);
 }
@@ -828,8 +828,8 @@ void CmdHIDsimTAG(uint32_t hi, uint32_t lo, int ledcontrol) {
 // prepare a waveform pattern in the buffer based on the ID given then
 // simulate a FSK tag until the button is pressed
 // arg1 contains fcHigh and fcLow, arg2 contains STT marker and clock
-void CmdFSKsimTAG(uint8_t fchigh, uint8_t fclow, uint8_t separator, uint8_t clock, uint16_t bitslen, uint8_t *bits, int ledcontrol) {
-//void CmdFSKsimTAG(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *bits, int ledcontrol) {
+void CmdFSKsimTAG(uint8_t fchigh, uint8_t fclow, uint8_t separator, uint8_t clk, uint16_t bitslen, uint8_t *bits, bool ledcontrol) {
+
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
 
     // free eventually allocated BigBuf memory
@@ -848,14 +848,14 @@ void CmdFSKsimTAG(uint8_t fchigh, uint8_t fclow, uint8_t separator, uint8_t cloc
 
     for (i = 0; i < bitslen; i++) {
         if (bits[i])
-            fcAll(fclow, &n, clock, &modCnt);
+            fcAll(fclow, &n, clk, &modCnt);
         else
-            fcAll(fchigh, &n, clock, &modCnt);
+            fcAll(fchigh, &n, clk, &modCnt);
     }
 
     WDT_HIT();
 
-    Dbprintf("Simulating with fcHigh: %d, fcLow: %d, clk: %d, STT: %d, n: %d", fchigh, fclow, clock, separator, n);
+    Dbprintf("Simulating with fcHigh: %d, fcLow: %d, clk: %d, STT: %d, n: %d", fchigh, fclow, clk, separator, n);
 
     if (ledcontrol) LED_A_ON();
     SimulateTagLowFrequency(n, 0, ledcontrol);
@@ -903,7 +903,7 @@ static void stAskSimBit(int *n, uint8_t clock) {
 }
 
 // args clock, ask/man or askraw, invert, transmission separator
-void CmdASKsimTAG(uint8_t encoding, uint8_t invert, uint8_t separator, uint8_t clk, size_t size, uint8_t *bits, int ledcontrol) {
+void CmdASKsimTAG(uint8_t encoding, uint8_t invert, uint8_t separator, uint8_t clk, uint16_t size, uint8_t *bits, bool ledcontrol) {
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
     set_tracing(false);
 
@@ -967,14 +967,11 @@ static void pskSimBit(uint8_t waveLen, int *n, uint8_t clk, uint8_t *curPhase, b
 }
 
 // args clock, carrier, invert,
-void CmdPSKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *bits, int ledcontrol) {
+void CmdPSKsimTag(uint8_t carrier, uint8_t invert, uint8_t clk, uint16_t size, uint8_t *bits, bool ledcontrol) {
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
     set_tracing(false);
 
     int n = 0, i = 0;
-    uint8_t clk = arg1 >> 8;
-    uint8_t carrier = arg1 & 0xFF;
-    uint8_t invert = arg2 & 0xFF;
     uint8_t curPhase = 0;
     for (i = 0; i < size; i++) {
         if (bits[i] == curPhase) {
diff --git a/client/cmdlf.c b/client/cmdlf.c
index d83a40283..207ab77ef 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -831,14 +831,23 @@ int CmdLFpskSim(const char *Cmd) {
         }
     }
     size_t size = DemodBufferLen;
-    if (size > PM3_CMD_DATA_SIZE) {
-        PrintAndLogEx(NORMAL, "DemodBuffer too long for current implementation - length: %d - max: %d", size, PM3_CMD_DATA_SIZE);
-        size = PM3_CMD_DATA_SIZE;
+    if (size > (PM3_CMD_DATA_SIZE - sizeof(lf_psksim_t))) {
+        PrintAndLogEx(NORMAL, "DemodBuffer too long for current implementation - length: %d - max: %d", size, PM3_CMD_DATA_SIZE - sizeof(lf_psksim_t));
+        size = PM3_CMD_DATA_SIZE - sizeof(lf_psksim_t);
     }
-    PrintAndLogEx(DEBUG, "DEBUG: Sending DemodBuffer Length: %d", size);
+
+    lf_psksim_t *payload = calloc(1, sizeof(lf_psksim_t) + size);
+    payload->carrier =  carrier;
+    payload->invert = invert;
+    payload->clock = clk;
+    memcpy(payload->data, DemodBuffer, size);
+
+    PrintAndLogEx(INFO, "Simulating");
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_PSK_SIM_TAG, clk << 8 | carrier, invert, size, DemodBuffer, size);
+    SendCommandNG(CMD_PSK_SIM_TAG, (uint8_t *)payload,  sizeof(lf_psksim_t) + size);
+    free(payload);
+
     PacketResponseNG resp;
     WaitForResponse(CMD_PSK_SIM_TAG, &resp);
 
diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c
index e9169d864..3864676d8 100644
--- a/client/cmdlfawid.c
+++ b/client/cmdlfawid.c
@@ -332,13 +332,14 @@ static int CmdAWIDSim(const char *Cmd) {
 
     verify_values(&fmtlen, &fc, &cn);
 
-    PrintAndLogEx(SUCCESS, "Simulating AWID %u -- FC: %u; CN: %u\n", fmtlen, fc, cn);
-    PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation or run another command");
-
     if ( getAWIDBits(fmtlen, fc, cn, bs) != PM3_SUCCESS ) {
         PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
         return PM3_ESOFT;
     }
+
+    PrintAndLogEx(SUCCESS, "Simulating AWID %u -- FC: %u; CN: %u\n", fmtlen, fc, cn);
+    PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation or run another command");
+
     // AWID uses: FSK2a fcHigh: 10, fcLow: 8, clk: 50, invert: 1
     // arg1 --- fcHigh<<8 + fcLow
     // arg2 --- Inversion and clk setting
diff --git a/client/cmdlfindala.c b/client/cmdlfindala.c
index 1b8b513e0..d0eabfc4b 100644
--- a/client/cmdlfindala.c
+++ b/client/cmdlfindala.c
@@ -372,8 +372,8 @@ static int CmdIndalaSim(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_indala_sim();
 
-    uint8_t bits[224];
-    memset(bits, 0x00, sizeof(bits));
+    uint8_t bs[224];
+    memset(bs, 0x00, sizeof(bs));
 
     // uid
     uint8_t hexuid[100];
@@ -386,24 +386,35 @@ static int CmdIndalaSim(const char *Cmd) {
     uint8_t counter = 223;
     for (uint8_t i = 0; i < len; i++) {
         for (uint8_t j = 0; j < 8; j++) {
-            bits[counter--] = hexuid[i] & 1;
+            bs[counter--] = hexuid[i] & 1;
             hexuid[i] >>= 1;
         }
     }
 
     // indala PSK
-    uint8_t clk = 32, carrier = 2, invert = 0;
-
     // It has to send either 64bits (8bytes) or 224bits (28bytes).  Zero padding needed if not.
     // lf simpsk 1 c 32 r 2 d 0102030405060708
 
     PrintAndLogEx(SUCCESS, "Simulating Indala UID: %s",  sprint_hex(hexuid, len));
     PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation or run another command");
 
+    // indala PSK,  clock 32, carrier 0
+    lf_psksim_t *payload = calloc(1, sizeof(lf_psksim_t) + sizeof(bs));
+    payload->carrier =  2;
+    payload->invert = 0;
+    payload->clock = 32;
+    memcpy(payload->data, bs, sizeof(bs));
+
+    PrintAndLogEx(INFO, "Simulating");
+
     clearCommandBuffer();
-    SendCommandOLD(CMD_PSK_SIM_TAG, clk << 8 | carrier, invert, sizeof(bits), bits, sizeof(bits));
+    SendCommandNG(CMD_PSK_SIM_TAG, (uint8_t *)payload,  sizeof(lf_psksim_t) + sizeof(bs));
+    free(payload);
+
     PacketResponseNG resp;
     WaitForResponse(CMD_PSK_SIM_TAG, &resp);
+
+    PrintAndLogEx(INFO, "Done");
     if (resp.status != PM3_EOPABORTED)
         return resp.status;
     return PM3_SUCCESS;
diff --git a/client/cmdlfkeri.c b/client/cmdlfkeri.c
index f906d13b5..d38dcfea6 100644
--- a/client/cmdlfkeri.c
+++ b/client/cmdlfkeri.c
@@ -175,28 +175,39 @@ static int CmdKeriClone(const char *Cmd) {
 static int CmdKeriSim(const char *Cmd) {
 
     char cmdp = tolower(param_getchar(Cmd, 0));
-    if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_keri_sim();
+    if (strlen(Cmd) == 0 || cmdp == 'h') 
+        return usage_lf_keri_sim();
 
     uint64_t internalid = param_get32ex(Cmd, 0, 0, 10);
     internalid |= 0x80000000;
     internalid <<= 3;
     internalid += 7;
 
-    uint8_t bits[64] = {0x00};
+    uint8_t bs[64] = {0x00};
     // loop to bits
     uint8_t j = 0;
     for (int8_t i = 63; i >= 0; --i) {
-        bits[j++] = ((internalid >> i) & 1);
+        bs[j++] = ((internalid >> i) & 1);
     }
 
-    uint8_t clk = 32, carrier = 2, invert = 0;
-
     PrintAndLogEx(SUCCESS, "Simulating KERI - Internal Id: %u", internalid);
 
+    lf_psksim_t *payload = calloc(1, sizeof(lf_psksim_t) + sizeof(bs));
+    payload->carrier =  2;
+    payload->invert = 0;
+    payload->clock = 32;
+    memcpy(payload->data, bs, sizeof(bs));
+
+    PrintAndLogEx(INFO, "Simulating");
+
     clearCommandBuffer();
-    SendCommandOLD(CMD_PSK_SIM_TAG, clk << 8 | carrier, invert, sizeof(bits), bits, sizeof(bits));
+    SendCommandNG(CMD_PSK_SIM_TAG, (uint8_t *)payload,  sizeof(lf_psksim_t) + sizeof(bs));
+    free(payload);
+
     PacketResponseNG resp;
     WaitForResponse(CMD_PSK_SIM_TAG, &resp);
+
+    PrintAndLogEx(INFO, "Done");
     if (resp.status != PM3_EOPABORTED)
         return resp.status;
     return PM3_SUCCESS;
diff --git a/include/pm3_cmd.h b/include/pm3_cmd.h
index bfa114f19..caacf7e1c 100644
--- a/include/pm3_cmd.h
+++ b/include/pm3_cmd.h
@@ -176,7 +176,7 @@ typedef struct {
     uint8_t flags;
 } PACKED t55xx_write_block_t;
 
-// For CMD_FSK_SIM_TAG
+// For CMD_FSK_SIM_TAG (FSK)
 typedef struct {
     uint8_t fchigh;
     uint8_t fclow;
@@ -185,7 +185,7 @@ typedef struct {
     uint8_t data[];
 } PACKED lf_fsksim_t;
 
-// For CMD_ASK_SIM_TAG
+// For CMD_ASK_SIM_TAG (ASK)
 typedef struct {
     uint8_t encoding;
     uint8_t invert;
@@ -194,6 +194,15 @@ typedef struct {
     uint8_t data[];
 } PACKED lf_asksim_t;
 
+// For CMD_PSK_SIM_TAG (PSK)
+typedef struct {
+    uint8_t carrier;
+    uint8_t invert;
+    uint8_t clock;
+    uint8_t data[];
+} PACKED lf_psksim_t;
+
+
 // For the bootloader
 #define CMD_DEVICE_INFO                                                   0x0000
 #define CMD_SETUP_WRITE                                                   0x0001

From 10fc50aff88fa46f48aa95c0d652eef4a6af831b Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 24 May 2019 09:48:31 -0400
Subject: [PATCH 1830/1938] fix: lf viking demod - works :)

---
 client/cmdlfviking.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdlfviking.c b/client/cmdlfviking.c
index 138945531..bc22a0b66 100644
--- a/client/cmdlfviking.c
+++ b/client/cmdlfviking.c
@@ -40,7 +40,7 @@ static int usage_lf_viking_sim(void) {
 //by marshmellow
 //see ASKDemod for what args are accepted
 static int CmdVikingDemod(const char *Cmd) {
-    if (!ASKDemod(Cmd, false, false, 1)) {
+    if (ASKDemod(Cmd, false, false, 1) != PM3_SUCCESS) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - Viking ASKDemod failed");
         return PM3_ESOFT;
     }

From 20b39d55f2b178fbe9631912cf31a6f4529c7945 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 24 May 2019 10:27:21 -0400
Subject: [PATCH 1831/1938] fix: lf presco - show helptexts again

---
 client/cmdlfpresco.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/cmdlfpresco.c b/client/cmdlfpresco.c
index e0a9bb351..76a67f2b7 100644
--- a/client/cmdlfpresco.c
+++ b/client/cmdlfpresco.c
@@ -97,7 +97,7 @@ static int CmdPrescoClone(const char *Cmd) {
     uint32_t blocks[5] = {T55x7_MODULATION_MANCHESTER | T55x7_BITRATE_RF_32 | 4 << T55x7_MAXBLOCK_SHIFT | T55x7_ST_TERMINATOR, 0, 0, 0, 0};
 
     // get wiegand from printed number.
-    if (getWiegandFromPresco(Cmd, &sitecode, &usercode, &fullcode, &Q5) == -1) return usage_lf_presco_clone();
+    if (getWiegandFromPresco(Cmd, &sitecode, &usercode, &fullcode, &Q5) == PM3_EINVARG) return usage_lf_presco_clone();
 
     if (Q5)
         blocks[0] = T5555_MODULATION_MANCHESTER | T5555_SET_BITRATE(32) | 4 << T5555_MAXBLOCK_SHIFT | T5555_ST_TERMINATOR;
@@ -151,7 +151,7 @@ static int CmdPrescoSim(const char *Cmd) {
     uint32_t sitecode = 0, usercode = 0, fullcode = 0;
     bool Q5 = false;
     // get wiegand from printed number.
-    if (getWiegandFromPresco(Cmd, &sitecode, &usercode, &fullcode, &Q5) == -1) 
+    if (getWiegandFromPresco(Cmd, &sitecode, &usercode, &fullcode, &Q5) == PM3_EINVARG) 
         return usage_lf_presco_sim();
 
     PrintAndLogEx(SUCCESS, "Simulating Presco - SiteCode: %u, UserCode: %u, FullCode: %08X", sitecode, usercode, fullcode);

From 2d972f8cb945eaaeaa95342b1fe63637333eb59e Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 24 May 2019 10:31:31 -0400
Subject: [PATCH 1832/1938] style

---
 client/cmdlfio.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/cmdlfio.c b/client/cmdlfio.c
index 4fb1b6dda..ad37b9fd7 100644
--- a/client/cmdlfio.c
+++ b/client/cmdlfio.c
@@ -234,8 +234,8 @@ static int CmdIOProxClone(const char *Cmd) {
     uint8_t bits[64];
     memset(bits, 0, sizeof(bits));
 
-    char cmdp = param_getchar(Cmd, 0);
-    if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_io_clone();
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) == 0 || cmdp == 'h') return usage_lf_io_clone();
 
     version = param_get8(Cmd, 0);
     fc = param_get8(Cmd, 1);

From abc66484e5838e72d1746fcc8bb3224fe5e6781a Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 25 May 2019 09:06:44 -0400
Subject: [PATCH 1833/1938] fix: 14a raw commands - running lua scripts works
 again for MIX/NG frames

---
 client/lualibs/commands.lua | 41 ++++++++++++++-----------------------
 client/lualibs/read14a.lua  |  6 +++---
 client/scripting.c          | 38 ++++++++++++++++++++++++++++++++--
 3 files changed, 54 insertions(+), 31 deletions(-)

diff --git a/client/lualibs/commands.lua b/client/lualibs/commands.lua
index 59825d2ca..5b94cf2de 100644
--- a/client/lualibs/commands.lua
+++ b/client/lualibs/commands.lua
@@ -142,33 +142,18 @@ function Command:sendMIX( ignore_response, timeout )
     end
 
     -- lets digest
-    local data
-    local count, cmd, length, magic, status, crc, arg1, arg2, arg3 = bin.unpack('SSIsSLLL', response)
+    data = nil
+    cmd = nil
+    arg1 = nil
+    arg2 = nil
+    arg3 = nil
+    local count, length, magic, status, crc, ng
+
+--         S    S       I      s       S    L     L     L
+    count, cmd, length, magic, status, crc, arg1, arg2, arg3 = bin.unpack('SSIsSLLL', response)
     count, data, ng = bin.unpack('H'..length..'C', response, count)
 
---[[  uncomment if you want to debug
-    self.resp_cmd = cmd
-    self.resp_length = length
-    self.resp_magic = magic
-    self.resp_status = status
-    self.resp_crc = crc
-    self.resp_arg1 = arg1
-    self.resp_arg2 = arg2
-    self.resp_arg3 = arg3
-    self.resp_data = data
-    self.resp_ng = ng
-    self:__responsetostring()
---]]
-
     local packed = bin.pack("LLLLH", cmd, arg1, arg2, arg3, data)
-    --[[
-    return { Cmd = cmd,
-            Arg1 = arg1,
-            Arg2 = arg2,
-            Arg3 = arg3,
-            Data = data,
-    }
-    --]]
     return packed, nil;
 end
 function Command:sendNG( ignore_response, timeout )
@@ -185,8 +170,12 @@ function Command:sendNG( ignore_response, timeout )
     if response == nil then
         return nil, 'Error, waiting for response timed out :: '..msg
     end
-    local data
-    local count, cmd, length, magic, status, crc, arg0, arg1, arg2 = bin.unpack('SSIsSLLL', response)
+
+    data = nil
+    cmd = nil
+    local count, length, magic, status, crc, arg0, arg1, arg2 
+
+    count, cmd, length, magic, status, crc, arg0, arg1, arg2 = bin.unpack('SSIsSLLL', response)
     count, data, ng = bin.unpack('H'..length..'C', response, count)
 
 --[[  uncomment if you want to debug
diff --git a/client/lualibs/read14a.lua b/client/lualibs/read14a.lua
index 6fe7f8bd1..fbb92cbd5 100644
--- a/client/lualibs/read14a.lua
+++ b/client/lualibs/read14a.lua
@@ -63,7 +63,7 @@ local function parse14443a(data)
     } __attribute__((__packed__)) iso14a_card_select_t;
     --]]
 
-    local count, uid, uidlen, atqa, sak, ats_len, ats = bin.unpack('H10CH2CC',data)
+    local count, uid, uidlen, atqa, sak, ats_len, ats = bin.unpack('H10CH2CC', data)
     uid = uid:sub(1, 2 * uidlen)
     local man_byte = tonumber(uid:sub(1,2), 16)
 
@@ -98,8 +98,8 @@ local function read14443a(dont_disconnect, no_rats)
 
     local result, err = command:sendMIX()
     if result then
-        local count,cmd,arg0,arg1,arg2 = bin.unpack('LLLL',result)
-        if arg0 == 0 then
+        local count, cmd, arg1, arg2, arg3 = bin.unpack('LLLL',result)
+        if arg1 == 0 then
             return nil, 'iso14443a card select failed'
         end
         data = string.sub(result, count)
diff --git a/client/scripting.c b/client/scripting.c
index 87de2c088..19914c258 100644
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -303,11 +303,45 @@ static int l_WaitForResponseTimeout(lua_State *L) {
         ms_timeout = luaL_checkunsigned(L, 2);
 
     PacketResponseNG resp;
-    if (WaitForResponseTimeout(cmd, &resp, ms_timeout) == 0)
+    if (WaitForResponseTimeout(cmd, &resp, ms_timeout) == false)
         return returnToLuaWithError(L, "No response from the device");
 
+    char foo[sizeof(PacketResponseNG)];
+    n = 0;
+
+    memcpy(foo + n, &resp.cmd, sizeof(resp.cmd));
+    n += sizeof(resp.cmd);
+
+    memcpy(foo + n, &resp.length, sizeof(resp.length));
+    n += sizeof(resp.length);
+
+    memcpy(foo + n, &resp.magic, sizeof(resp.magic));
+    n += sizeof(resp.magic);
+
+    memcpy(foo + n, &resp.status, sizeof(resp.status));
+    n += sizeof(resp.status);
+
+    memcpy(foo + n, &resp.crc, sizeof(resp.crc));
+    n += sizeof(resp.crc);
+
+    memcpy(foo + n, &resp.oldarg[0], sizeof(resp.oldarg[0]));
+    n += sizeof(resp.oldarg[0]);
+
+    memcpy(foo + n, &resp.oldarg[1], sizeof(resp.oldarg[1]));
+    n += sizeof(resp.oldarg[1]);
+
+    memcpy(foo + n, &resp.oldarg[2], sizeof(resp.oldarg[2]));
+    n += sizeof(resp.oldarg[2]);
+
+    memcpy(foo + n, resp.data.asBytes, sizeof(resp.data));
+    n += sizeof(resp.data);
+
+    memcpy(foo + n, &resp.ng, sizeof(resp.ng));
+    n += sizeof(resp.ng);
+
     //Push it as a string
-    lua_pushlstring(L, (const char *)&resp, sizeof(PacketResponseNG));
+    lua_pushlstring(L, (const char *)&foo, sizeof(foo));
+
     return 1;
 }
 

From 37c30c039547523178b5c2eb0b4b952c76a76c22 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 25 May 2019 13:27:43 -0400
Subject: [PATCH 1834/1938] fix: askdemod - enhances which solves some viking
 demod errors

---
 client/cmddata.c     |  5 +++--
 client/cmdlfcotag.c  | 20 ++++++++++----------
 client/cmdlfviking.c | 34 +++++++++++++++++-----------------
 common/lfdemod.c     | 39 ++++++++++++++++++++++++---------------
 common/lfdemod.h     |  2 +-
 5 files changed, 55 insertions(+), 45 deletions(-)

diff --git a/client/cmddata.c b/client/cmddata.c
index fb8e2be2f..59558c621 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -584,7 +584,8 @@ static int Cmdmandecoderaw(const char *Cmd) {
     size_t size = 0;
     int high = 0, low = 0;
     size_t i = 0;
-    int errCnt = 0, invert = 0, maxErr = 20;
+    uint16_t errCnt = 0;
+    int invert = 0, maxErr = 20;
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) > 5 || cmdp == 'h') return usage_data_manrawdecode();
 
@@ -610,7 +611,7 @@ static int Cmdmandecoderaw(const char *Cmd) {
     uint8_t alignPos = 0;
     errCnt = manrawdecode(bits, &size, invert, &alignPos);
     if (errCnt >= maxErr) {
-        PrintAndLogEx(WARNING, "Too many errors: %d", errCnt);
+        PrintAndLogEx(WARNING, "Too many errors: %u", errCnt);
         return PM3_ESOFT;
     }
 
diff --git a/client/cmdlfcotag.c b/client/cmdlfcotag.c
index 45de81aff..d7c6eff7a 100644
--- a/client/cmdlfcotag.c
+++ b/client/cmdlfcotag.c
@@ -22,7 +22,7 @@ static int usage_lf_cotag_read(void) {
     PrintAndLogEx(NORMAL, "Example:");
     PrintAndLogEx(NORMAL, "        lf cotag read 0");
     PrintAndLogEx(NORMAL, "        lf cotag read 1");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 // COTAG demod should be able to use GraphBuffer,
@@ -35,10 +35,10 @@ static int CmdCOTAGDemod(const char *Cmd) {
     memcpy(bits, DemodBuffer, COTAG_BITS);
 
     uint8_t alignPos = 0;
-    int err = manrawdecode(bits, &bitlen, 1, &alignPos);
-    if (err) {
+    uint16_t err = manrawdecode(bits, &bitlen, 1, &alignPos);
+    if (err == 0xFFFF) {
         if (g_debugMode) PrintAndLogEx(DEBUG, "DEBUG: Error - COTAG too many errors: %d", err);
-        return -1;
+        return PM3_ESOFT;
     }
 
     setDemodBuff(bits, bitlen, 0);
@@ -60,7 +60,7 @@ static int CmdCOTAGDemod(const char *Cmd) {
         1001 1100 1100 0001                     10000101
     */
     PrintAndLogEx(SUCCESS, "COTAG Found: FC %u, CN: %u Raw: %08X%08X%08X%08X", fc, cn, raw1, raw2, raw3, raw4);
-    return 1;
+    return PM3_SUCCESS;
 }
 
 // When reading a COTAG.
@@ -78,7 +78,7 @@ static int CmdCOTAGRead(const char *Cmd) {
     SendCommandMIX(CMD_COTAG, rawsignal, 0, 0, NULL, 0);
     if (!WaitForResponseTimeout(CMD_ACK, NULL, 7000)) {
         PrintAndLogEx(WARNING, "command execution time out");
-        return -1;
+        return PM3_ETIMEOUT;
     }
 
     switch (rawsignal) {
@@ -93,13 +93,13 @@ static int CmdCOTAGRead(const char *Cmd) {
 
             if (!GetFromDevice(BIG_BUF, DemodBuffer, COTAG_BITS, 0, NULL, 1000, false)) {
                 PrintAndLogEx(WARNING, "timeout while waiting for reply.");
-                return -1;
+                return PM3_ETIMEOUT;
             }
             DemodBufferLen = COTAG_BITS;
             return CmdCOTAGDemod("");
         }
     }
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static command_t CommandTable[] = {
@@ -112,7 +112,7 @@ static command_t CommandTable[] = {
 static int CmdHelp(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 int CmdLFCOTAG(const char *Cmd) {
@@ -125,5 +125,5 @@ int demodCOTAG(void) {
 }
 
 int readCOTAGUid(void) {
-    return CmdCOTAGRead("") > 0;
+    return (CmdCOTAGRead("") == PM3_SUCCESS);
 }
diff --git a/client/cmdlfviking.c b/client/cmdlfviking.c
index bc22a0b66..750070a34 100644
--- a/client/cmdlfviking.c
+++ b/client/cmdlfviking.c
@@ -45,10 +45,9 @@ static int CmdVikingDemod(const char *Cmd) {
         return PM3_ESOFT;
     }
     size_t size = DemodBufferLen;
-
     int ans = detectViking(DemodBuffer, &size);
     if (ans < 0) {
-        PrintAndLogEx(DEBUG, "DEBUG: Error - Viking Demod %d %s", ans, (ans == -5) ? "[chksum error]" : "");
+        PrintAndLogEx(DEBUG, "DEBUG: Error - Viking Demod %d %s", ans, (ans == -5) ? _RED_("[chksum error]") : "");
         return PM3_ESOFT;
     }
     //got a good demod
@@ -56,8 +55,8 @@ static int CmdVikingDemod(const char *Cmd) {
     uint32_t raw2 = bytebits_to_byte(DemodBuffer + ans + 32, 32);
     uint32_t cardid = bytebits_to_byte(DemodBuffer + ans + 24, 32);
     uint8_t  checksum = bytebits_to_byte(DemodBuffer + ans + 32 + 24, 8);
-    PrintAndLogEx(SUCCESS, "Viking Tag Found: Card ID %08X, Checksum: %02X", cardid, checksum);
-    PrintAndLogEx(SUCCESS, "Raw: %08X%08X", raw1, raw2);
+    PrintAndLogEx(SUCCESS, "Viking Tag Found: Card ID " _YELLOW_("%08X")" checksum "_YELLOW_("%02X"), cardid, checksum);
+    PrintAndLogEx(SUCCESS, "Raw hex: %08X%08X", raw1, raw2);
     setDemodBuff(DemodBuffer, 64, ans);
     setClockGrid(g_DemodClock, g_DemodStartIdx + (ans * g_DemodClock));
     return PM3_SUCCESS;
@@ -86,7 +85,7 @@ static int CmdVikingClone(const char *Cmd) {
 
     rawID = getVikingBits(id);
 
-    PrintAndLogEx(INFO, "Preparing to clone Viking tag - ID: %08X, Raw: %08X%08X", id, (uint32_t)(rawID >> 32), (uint32_t)(rawID & 0xFFFFFFFF));
+    PrintAndLogEx(INFO, "Preparing to clone Viking tag - ID " _YELLOW_("%08X")" raw " _YELLOW_("%08X%08X"), id, (uint32_t)(rawID >> 32), (uint32_t)(rawID & 0xFFFFFFFF));
 
     clearCommandBuffer();
     SendCommandMIX(CMD_VIKING_CLONE_TAG, rawID >> 32, rawID & 0xFFFFFFFF, Q5, NULL, 0);
@@ -109,7 +108,7 @@ static int CmdVikingSim(const char *Cmd) {
 
     rawID = getVikingBits(id);
 
-    PrintAndLogEx(SUCCESS, "Simulating Viking - ID: %08X, Raw: %08X%08X", id, (uint32_t)(rawID >> 32), (uint32_t)(rawID & 0xFFFFFFFF));
+    PrintAndLogEx(SUCCESS, "Simulating Viking - ID " _YELLOW_("%08X")" raw "_YELLOW_("%08X%08X"), id, (uint32_t)(rawID >> 32), (uint32_t)(rawID & 0xFFFFFFFF));
 
     uint8_t bs[64];
     num_to_bytebits(rawID, sizeof(bs), bs);
@@ -164,22 +163,23 @@ uint64_t getVikingBits(uint32_t id) {
 }
 // by marshmellow
 // find viking preamble 0xF200 in already demoded data
-int detectViking(uint8_t *dest, size_t *size) {
+int detectViking(uint8_t *src, size_t *size) {
     //make sure buffer has data
-    if (*size < 64 * 2) return -2;
+    if (*size < 64) return -2;
     size_t startIdx = 0;
     uint8_t preamble[] = {1, 1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-    if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
+    if (!preambleSearch(src, preamble, sizeof(preamble), size, &startIdx))
         return -4; //preamble not found
 
-    uint32_t checkCalc = bytebits_to_byte(dest + startIdx, 8) ^
-                         bytebits_to_byte(dest + startIdx + 8, 8) ^
-                         bytebits_to_byte(dest + startIdx + 16, 8) ^
-                         bytebits_to_byte(dest + startIdx + 24, 8) ^
-                         bytebits_to_byte(dest + startIdx + 32, 8) ^
-                         bytebits_to_byte(dest + startIdx + 40, 8) ^
-                         bytebits_to_byte(dest + startIdx + 48, 8) ^
-                         bytebits_to_byte(dest + startIdx + 56, 8);
+    uint32_t checkCalc = bytebits_to_byte(src + startIdx, 8) ^
+                         bytebits_to_byte(src + startIdx + 8, 8) ^
+                         bytebits_to_byte(src + startIdx + 16, 8) ^
+                         bytebits_to_byte(src + startIdx + 24, 8) ^
+                         bytebits_to_byte(src + startIdx + 32, 8) ^
+                         bytebits_to_byte(src + startIdx + 40, 8) ^
+                         bytebits_to_byte(src + startIdx + 48, 8) ^
+                         bytebits_to_byte(src + startIdx + 56, 8);
+
     if (checkCalc != 0xA8) return -5;
     if (*size != 64) return -6;
     //return start position
diff --git a/common/lfdemod.c b/common/lfdemod.c
index a581198fa..f7cc0fc31 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -315,10 +315,10 @@ static int getClosestClock(int testclk) {
     uint16_t clocks[] = {8, 16, 32, 40, 50, 64, 100, 128, 256, 384};
     uint8_t limit[]  = {1,  2,  4,  4,  5,  8,   8,   8,   8,   8};
 
-    for (uint8_t i = 0; i < 10; i++)
+    for (uint8_t i = 0; i < 10; i++) {
         if (testclk >= clocks[i] - limit[i] && testclk <= clocks[i] + limit[i])
             return clocks[i];
-
+    }
     return 0;
 }
 
@@ -480,17 +480,19 @@ bool DetectCleanAskWave(uint8_t *dest, size_t size, uint8_t high, uint8_t low) {
 // by marshmellow
 // to help detect clocks on heavily clipped samples
 // based on count of low to low
-int DetectStrongAskClock(uint8_t *dest, size_t size, int high, int low, int *clock) {
+int DetectStrongAskClock(uint8_t *src, size_t size, int high, int low, int *clock) {
     size_t i = 100;
     size_t minClk = 512;
     uint16_t shortestWaveIdx = 0;
 
     // get to first full low to prime loop and skip incomplete first pulse
-    getNextHigh(dest, size, high, &i);
-    getNextLow(dest, size, low, &i);
+    getNextHigh(src, size, high, &i);
+    getNextLow(src, size, low, &i);
 
     if (i == size)
         return -1;
+    if (size < 512)
+        return -2;
 
     // clock, numoftimes, first idx
     uint16_t tmpclk[10][3] = {
@@ -507,12 +509,12 @@ int DetectStrongAskClock(uint8_t *dest, size_t size, int high, int low, int *clo
     };
 
     // loop through all samples (well, we don't want to go out-of-bounds)
-    while (i < size - 512) {
+    while (i < (size - 512)) {
         // measure from low to low
         size_t startwave = i;
 
-        getNextHigh(dest, size, high, &i);
-        getNextLow(dest, size, low, &i);
+        getNextHigh(src, size, high, &i);
+        getNextLow(src, size, low, &i);
 
         //get minimum measured distance
         if (i - startwave < minClk && i < size) {
@@ -1401,17 +1403,18 @@ int BiphaseRawDecode(uint8_t *bits, size_t *size, int *offset, int invert) {
 //take 10 and 01 and manchester decode
 //run through 2 times and take least errCnt
 // "," indicates 00 or 11 wrong bit
-int manrawdecode(uint8_t *bits, size_t *size, uint8_t invert, uint8_t *alignPos) {
+uint16_t manrawdecode(uint8_t *bits, size_t *size, uint8_t invert, uint8_t *alignPos) {
 
     // sanity check
-    if (*size < 16) return -1;
+    if (*size < 16) return 0xFFFF;
 
     int errCnt = 0, bestErr = 1000;
     uint16_t bitnum = 0, maxBits = 512, bestRun = 0;
     size_t i, k;
 
     //find correct start position [alignment]
-    for (k = 0; k < 2; ++k) {
+    for (k = 0; k < 2; k++) {
+
         for (i = k; i < *size - 1; i += 2) {
 
             if (bits[i] == bits[i + 1])
@@ -1431,7 +1434,7 @@ int manrawdecode(uint8_t *bits, size_t *size, uint8_t invert, uint8_t *alignPos)
 
     *alignPos = bestRun;
     //decode
-    for (i = bestRun; i < *size - 1; i += 2) {
+    for (i = bestRun; i < *size; i += 2) {
         if (bits[i] == 1 && (bits[i + 1] == 0)) {
             bits[bitnum++] = invert;
         } else if ((bits[i] == 0) && bits[i + 1] == 1) {
@@ -1448,7 +1451,7 @@ int manrawdecode(uint8_t *bits, size_t *size, uint8_t invert, uint8_t *alignPos)
 //by marshmellow
 //demodulates strong heavily clipped samples
 //RETURN: num of errors.  if 0, is ok.
-static int cleanAskRawDemod(uint8_t *bits, size_t *size, int clk, int invert, int high, int low, int *startIdx) {
+static uint16_t cleanAskRawDemod(uint8_t *bits, size_t *size, int clk, int invert, int high, int low, int *startIdx) {
     *startIdx = 0;
     size_t bitCnt = 0, smplCnt = 1, errCnt = 0, pos = 0;
     uint8_t cl_4 = clk / 4;
@@ -1463,7 +1466,8 @@ static int cleanAskRawDemod(uint8_t *bits, size_t *size, int clk, int invert, in
             smplCnt++;
         } else if (bits[i] <= low && !waveHigh) {
             smplCnt++;
-        } else { //transition
+        } else {
+         //transition
             if ((bits[i] >= high && !waveHigh) || (bits[i] <= low && waveHigh)) {
 
                 // 8  ::    8-2-1 =  5   8+2+1 = 11
@@ -1472,7 +1476,8 @@ static int cleanAskRawDemod(uint8_t *bits, size_t *size, int clk, int invert, in
                 // 64 ::  64-16-1 = 47 64+16+1 = 81
                 if (smplCnt > clk - cl_4 - 1) { //full clock
 
-                    if (smplCnt > clk + cl_4 + 1) { //too many samples
+                    if (smplCnt > clk + cl_4 + 1) { 
+                        //too many samples
                         errCnt++;
                         if (g_debugMode == 2) prnt("DEBUG ASK: cleanAskRawDemod ASK Modulation Error FULL at: %u  [%u > %u]", i, smplCnt, clk + cl_4 + 1);
                         bits[bitCnt++] = 7;
@@ -1515,6 +1520,7 @@ static int cleanAskRawDemod(uint8_t *bits, size_t *size, int clk, int invert, in
             }
         }
     }
+
     *size = bitCnt;
 
     if (*startIdx < 0)
@@ -1823,6 +1829,7 @@ static size_t aggregate_bits(uint8_t *dest, size_t size, uint8_t clk, uint8_t in
         }
         memset(dest + numBits, dest[i - 1] ^ invert, n);
         numBits += n;
+        if (g_debugMode == 2) prnt("DEBUG (aggregate_bits) extra bits in the end");
     }
     return numBits;
 }
@@ -1833,7 +1840,9 @@ size_t fskdemod(uint8_t *dest, size_t size, uint8_t rfLen, uint8_t invert, uint8
     if (signalprop.isnoise) return 0;
     // FSK demodulator
     size = fsk_wave_demod(dest, size, fchigh, fclow, start_idx);
+    if (g_debugMode == 2) prnt("DEBUG (fskdemod) got %zu bits", size);
     size = aggregate_bits(dest, size, rfLen, invert, fchigh, fclow, start_idx);
+    if (g_debugMode == 2) prnt("DEBUG (fskdemod) got %zu bits", size);
     return size;
 }
 
diff --git a/common/lfdemod.h b/common/lfdemod.h
index a9fe3f70b..47a0c4e5e 100644
--- a/common/lfdemod.h
+++ b/common/lfdemod.h
@@ -66,7 +66,7 @@ size_t   fskdemod(uint8_t *dest, size_t size, uint8_t rfLen, uint8_t invert, uin
 void     getHiLo(int *high, int *low, uint8_t fuzzHi, uint8_t fuzzLo);
 uint32_t manchesterEncode2Bytes(uint16_t datain);
 int      ManchesterEncode(uint8_t *bits, size_t size);
-int      manrawdecode(uint8_t *bits, size_t *size, uint8_t invert, uint8_t *alignPos);
+uint16_t manrawdecode(uint8_t *bits, size_t *size, uint8_t invert, uint8_t *alignPos);
 int      nrzRawDemod(uint8_t *dest, size_t *size, int *clk, int *invert, int *startIdx);
 bool     parityTest(uint32_t bits, uint8_t bitLen, uint8_t pType);
 bool     preambleSearch(uint8_t *bits, uint8_t *preamble, size_t pLen, size_t *size, size_t *startIdx);

From 6df94abf71fa2f56c07326f463a6d2ae048a1a29 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 25 May 2019 13:32:54 -0400
Subject: [PATCH 1835/1938] textual

---
 client/cmdlf.c | 54 +++++++++++++++++++++++++-------------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/client/cmdlf.c b/client/cmdlf.c
index 207ab77ef..d3b942866 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -952,7 +952,7 @@ static bool CheckChipType(bool getDeviceData) {
     //check for em4x05/em4x69 chips first
     uint32_t word = 0;
     if (EM4x05IsBlock0(&word)) {
-        PrintAndLogEx(SUCCESS, "\nChipset detection : " _GREEN_("EM4x05/EM4x69") " found");
+        PrintAndLogEx(SUCCESS, "\nChipset detection : " _GREEN_("EM4x05/EM4x69") "found");
         PrintAndLogEx(SUCCESS, "Try " _YELLOW_("`lf em 4x05`") " commands");
         retval = true;
         goto out;
@@ -960,8 +960,8 @@ static bool CheckChipType(bool getDeviceData) {
 
     //check for t55xx chip...
     if (tryDetectP1(true)) {
-        PrintAndLogEx(SUCCESS, "\nChipset detection : " _GREEN_("T55xx") " found");
-        PrintAndLogEx(SUCCESS, "Try " _YELLOW_("`lf t55xx`")" commands");
+        PrintAndLogEx(SUCCESS, "\nChipset detection : " _GREEN_("T55xx") "found");
+        PrintAndLogEx(SUCCESS, "Try " _YELLOW_("`lf t55xx`")"commands");
         retval = true;
         goto out;
     }
@@ -1015,33 +1015,33 @@ int CmdLFfind(const char *Cmd) {
         }
     }
 
-    if (EM4x50Read("", false) == PM3_SUCCESS)  { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("EM4x50 ID") " found!"); return PM3_SUCCESS;}
+    if (EM4x50Read("", false) == PM3_SUCCESS)  { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("EM4x50 ID") "found!"); return PM3_SUCCESS;}
 
-    if (demodHID() == PM3_SUCCESS)             { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("HID Prox ID") " found!"); goto out;}
-    if (demodAWID() == PM3_SUCCESS)            { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("AWID ID") " found!"); goto out;}
-    if (demodParadox() == PM3_SUCCESS)         { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Paradox ID") " found!"); goto out;}
+    if (demodHID() == PM3_SUCCESS)             { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("HID Prox ID") "found!"); goto out;}
+    if (demodAWID() == PM3_SUCCESS)            { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("AWID ID") "found!"); goto out;}
+    if (demodParadox() == PM3_SUCCESS)         { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Paradox ID") "found!"); goto out;}
 
-    if (demodEM410x() == PM3_SUCCESS)          { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("EM410x ID") " found!"); goto out;}
-    if (demodFDX() == PM3_SUCCESS)             { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("FDX-B ID") " found!"); goto out;}
-    if (demodGuard() == PM3_SUCCESS)           { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Guardall G-Prox II ID") " found!"); goto out; }
-    if (demodIdteck() == PM3_SUCCESS)          { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Idteck ID") " found!"); goto out;}
-    if (demodIndala() == PM3_SUCCESS)          { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Indala ID") " found!");  goto out;}
-    if (demodIOProx() == PM3_SUCCESS)          { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("IO Prox ID") " found!"); goto out;}
-    if (demodJablotron() == PM3_SUCCESS)       { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Jablotron ID") " found!"); goto out;}
-    if (demodNedap() == PM3_SUCCESS)           { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("NEDAP ID") " found!"); goto out;}
-    if (demodNexWatch() == PM3_SUCCESS)        { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("NexWatch ID") " found!"); goto out;}
-    if (demodNoralsy() == PM3_SUCCESS)         { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Noralsy ID") " found!"); goto out;}
-    if (demodKeri() == PM3_SUCCESS)            { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("KERI ID") " found!"); goto out;}
-    if (demodPac() == PM3_SUCCESS)             { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("PAC/Stanley ID") " found!"); goto out;}
+    if (demodEM410x() == PM3_SUCCESS)          { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("EM410x ID") "found!"); goto out;}
+    if (demodFDX() == PM3_SUCCESS)             { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("FDX-B ID") "found!"); goto out;}
+    if (demodGuard() == PM3_SUCCESS)           { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Guardall G-Prox II ID") "found!"); goto out; }
+    if (demodIdteck() == PM3_SUCCESS)          { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Idteck ID") "found!"); goto out;}
+    if (demodIndala() == PM3_SUCCESS)          { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Indala ID") "found!");  goto out;}
+    if (demodIOProx() == PM3_SUCCESS)          { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("IO Prox ID") "found!"); goto out;}
+    if (demodJablotron() == PM3_SUCCESS)       { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Jablotron ID") "found!"); goto out;}
+    if (demodNedap() == PM3_SUCCESS)           { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("NEDAP ID") "found!"); goto out;}
+    if (demodNexWatch() == PM3_SUCCESS)        { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("NexWatch ID") "found!"); goto out;}
+    if (demodNoralsy() == PM3_SUCCESS)         { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Noralsy ID") "found!"); goto out;}
+    if (demodKeri() == PM3_SUCCESS)            { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("KERI ID") "found!"); goto out;}
+    if (demodPac() == PM3_SUCCESS)             { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("PAC/Stanley ID") "found!"); goto out;}
 
-    if (demodPresco() == PM3_SUCCESS)          { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Presco ID") " found!"); goto out;}
-    if (demodPyramid() == PM3_SUCCESS)         { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Pyramid ID") " found!"); goto out;}
-    if (demodSecurakey() == PM3_SUCCESS)       { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Securakey ID") " found!"); goto out;}
-    if (demodViking() == PM3_SUCCESS)          { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Viking ID") " found!"); goto out;}
-    if (demodVisa2k() == PM3_SUCCESS)          { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Visa2000 ID") " found!"); goto out;}
-    if (demodTI() == PM3_SUCCESS)              { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Texas Instrument ID") " found!"); goto out;}
-    //if (demodFermax() == PM3_SUCCESS)          { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Fermax ID") " found!"); goto out;}
-    //if (demodFlex() == PM3_SUCCESS)            { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Flex ID") " found!"); goto out;}
+    if (demodPresco() == PM3_SUCCESS)          { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Presco ID") "found!"); goto out;}
+    if (demodPyramid() == PM3_SUCCESS)         { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Pyramid ID") "found!"); goto out;}
+    if (demodSecurakey() == PM3_SUCCESS)       { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Securakey ID") "found!"); goto out;}
+    if (demodViking() == PM3_SUCCESS)          { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Viking ID") "found!"); goto out;}
+    if (demodVisa2k() == PM3_SUCCESS)          { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Visa2000 ID") "found!"); goto out;}
+    if (demodTI() == PM3_SUCCESS)              { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Texas Instrument ID") "found!"); goto out;}
+    //if (demodFermax() == PM3_SUCCESS)          { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Fermax ID") "found!"); goto out;}
+    //if (demodFlex() == PM3_SUCCESS)            { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Flex ID") "found!"); goto out;}
 
     PrintAndLogEx(FAILED, _RED_("No known 125/134 kHz tags found!"));
 

From ade858b4f5fd092c3e5e2199bea2c07d455848a0 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 25 May 2019 15:56:56 -0400
Subject: [PATCH 1836/1938] fix: script run read_pwd_mem - wrong offsets for
 -i/-t/-m

---
 client/scripts/read_pwd_mem.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/scripts/read_pwd_mem.lua b/client/scripts/read_pwd_mem.lua
index 783a53b12..4aa2e6299 100644
--- a/client/scripts/read_pwd_mem.lua
+++ b/client/scripts/read_pwd_mem.lua
@@ -86,9 +86,9 @@ local function main(args)
         -- keylength
         if o == 'k' then keylength = tonumber(a); usedkey = true end
 
-        if o == 'm' then keylength =6; usedkey = true; offset = 0x3F000-0x4000; end
+        if o == 'm' then keylength =6; usedkey = true; offset = 0x3F000-0x6000; end
         if o == 't' then keylength =4; usedkey = true; offset = 0x3F000-0x3000; end
-        if o == 'i' then keylength =8; usedkey = true; offset = 0x3F000-0x5000; end
+        if o == 'i' then keylength =8; usedkey = true; offset = 0x3F000-0x4000; end
     end
 
     if length < 0 or length > 256 then

From 51e4df533e79399fef1672325d2ec57fdcc27986 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 26 May 2019 17:48:20 +0200
Subject: [PATCH 1837/1938] New button behaviour in bootloader mode:

- Keep button pressed when powering to force entering bootloader
  - Once in bootloader more, you can release the button
- When in bootloader mode (no matter how you entered that mode)
  - One button press to quit bootloader mode and boot main image
---
 bootrom/bootrom.c   | 28 +++++++++++++++-------------
 include/proxmark3.h |  1 +
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/bootrom/bootrom.c b/bootrom/bootrom.c
index 7caa01360..005dbf662 100644
--- a/bootrom/bootrom.c
+++ b/bootrom/bootrom.c
@@ -220,11 +220,14 @@ void UsbPacketReceived(uint8_t *packet, int len) {
         reply_old(CMD_ACK, arg0, 0, 0, 0, 0);
 }
 
-static void flash_mode(int externally_entered) {
+static void flash_mode(void) {
     start_addr = 0;
     end_addr = 0;
     bootrom_unlocked = 0;
     uint8_t rx[sizeof(PacketCommandOLD)];
+    common_area.command = COMMON_AREA_COMMAND_NONE;
+    if (!common_area.flags.button_pressed && BUTTON_PRESS())
+        common_area.flags.button_pressed = 1;
 
     usb_enable();
 
@@ -241,17 +244,17 @@ static void flash_mode(int externally_entered) {
             }
         }
 
-        if (!externally_entered && !BUTTON_PRESS()) {
+        if (common_area.flags.button_pressed && !BUTTON_PRESS()) {
+            common_area.flags.button_pressed = 0;
+        }
+        if (!common_area.flags.button_pressed && BUTTON_PRESS()) {
             /* Perform a reset to leave flash mode */
+            common_area.flags.button_pressed = 1;
             usb_disable();
             LED_B_ON();
             AT91C_BASE_RSTC->RSTC_RCR = RST_CONTROL_KEY | AT91C_RSTC_PROCRST;
             for (;;) {};
         }
-        if (externally_entered && BUTTON_PRESS()) {
-            /* Let the user's button press override the automatic leave */
-            externally_entered = 0;
-        }
     }
 }
 
@@ -342,14 +345,13 @@ void BootROM(void) {
     }
     common_area.flags.bootrom_present = 1;
 
-    if (common_area.command == COMMON_AREA_COMMAND_ENTER_FLASH_MODE) {
-        common_area.command = COMMON_AREA_COMMAND_NONE;
-        flash_mode(1);
-    } else if (BUTTON_PRESS()) {
-        flash_mode(0);
-    } else if (_osimage_entry == 0xffffffffU) {
-        flash_mode(1);
+    if ((common_area.command == COMMON_AREA_COMMAND_ENTER_FLASH_MODE) ||
+        (!common_area.flags.button_pressed && BUTTON_PRESS()) ||
+        (_osimage_entry == 0xffffffffU)) {
+        flash_mode();
     } else {
+        // clear button status, even if button still pressed
+        common_area.flags.button_pressed = 0;
         // jump to Flash address of the osimage entry point (LSBit set for thumb mode)
         __asm("bx %0\n" : : "r"(((int)&_osimage_entry) | 0x1));
     }
diff --git a/include/proxmark3.h b/include/proxmark3.h
index 3cdf3147e..8748e82d8 100644
--- a/include/proxmark3.h
+++ b/include/proxmark3.h
@@ -128,6 +128,7 @@ struct common_area {
     struct {
         unsigned int bootrom_present: 1; /* Set when a bootrom that is capable of parsing the common area is present */
         unsigned int osimage_present: 1; /* Set when a osimage that is capable of parsing the common area is present */
+        unsigned int button_pressed: 1;
     } __attribute__((packed)) flags;
     int arg1, arg2;
 } __attribute__((packed));

From b05796c7c4ec60dc5e7087e402182c2c4aaeb833 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 26 May 2019 13:42:27 -0400
Subject: [PATCH 1838/1938] chg: hf mf dbg\nchg: hf mf sim\nchg: hf 14a sim -
 uses NG

---
 armsrc/appmain.c   | 25 ++++++++++++++++++++-----
 armsrc/apps.h      |  1 -
 armsrc/iso14443a.c |  2 +-
 armsrc/iso14443a.h |  2 +-
 armsrc/mifaresim.c | 10 ++++++----
 client/cmdhf14a.c  | 38 +++++++++++++++++++++-----------------
 client/cmdhfmf.c   | 23 +++++++++++++++++------
 7 files changed, 66 insertions(+), 35 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index b9b77f6ea..089b7f7c5 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1017,9 +1017,16 @@ static void PacketReceived(PacketCommandNG *packet) {
         case CMD_READER_ISO_14443a:
             ReaderIso14443a(packet);
             break;
-        case CMD_SIMULATE_TAG_ISO_14443a:
-            SimulateIso14443aTag(packet->oldarg[0], packet->oldarg[1], packet->data.asBytes);  // ## Simulate iso14443a tag - pass tag type & UID
+        case CMD_SIMULATE_TAG_ISO_14443a: {
+            struct p {
+               uint8_t tagtype;
+               uint8_t flags;
+               uint8_t uid[10];
+            } PACKED;
+            struct p* payload = (struct p*) packet->data.asBytes;            
+            SimulateIso14443aTag(payload->tagtype, payload->flags, payload->uid);  // ## Simulate iso14443a tag - pass tag type & UID
             break;
+            }
         case CMD_ANTIFUZZ_ISO_14443a:
             iso14443a_antifuzz(packet->oldarg[0]);
             break;
@@ -1076,13 +1083,20 @@ static void PacketReceived(PacketCommandNG *packet) {
             MifareChkKeys_fast(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
             break;
         }
-        case CMD_SIMULATE_MIFARE_CARD:
-            Mifare1ksim(packet->oldarg[0], packet->oldarg[1], packet->data.asBytes);
+        case CMD_SIMULATE_MIFARE_CARD: {
+            struct p {
+               uint16_t flags;
+               uint8_t exitAfter;
+               uint8_t uid[10];
+            } PACKED;
+            struct p* payload = (struct p*) packet->data.asBytes;   
+            Mifare1ksim(payload->flags, payload->exitAfter, payload->uid);
+            }
             break;
 
         // emulator
         case CMD_MIFARE_SET_DBGMODE:
-            MifareSetDbgLvl(packet->oldarg[0]);
+            MifareSetDbgLvl(packet->data.asBytes[0]);
             break;
         case CMD_MIFARE_EML_MEMCLR:
             MifareEMemClr();
@@ -1362,6 +1376,7 @@ static void PacketReceived(PacketCommandNG *packet) {
             uint8_t *mem = BigBuf_get_addr();
             uint32_t startidx = packet->oldarg[0];
             uint32_t numofbytes = packet->oldarg[1];
+
             // arg0 = startindex
             // arg1 = length bytes to transfer
             // arg2 = BigBuf tracelen
diff --git a/armsrc/apps.h b/armsrc/apps.h
index 952185244..756567185 100644
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -129,7 +129,6 @@ void ClearFpgaShiftingRegisters(void);
 
 // iso14443a.h
 void RAMFUNC SniffIso14443a(uint8_t param);
-void SimulateIso14443aTag(int tagType, int flags, uint8_t *data);
 void ReaderIso14443a(PacketCommandNG *c);
 
 // Also used in iclass.c
diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 48b7fddee..38edc7a1b 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -1028,7 +1028,7 @@ static bool SimulateIso14443aInit(int tagType, int flags, uint8_t *data, tag_res
 // response to send, and send it.
 // 'hf 14a sim'
 //-----------------------------------------------------------------------------
-void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
+void SimulateIso14443aTag(uint8_t tagType, uint8_t flags, uint8_t *data) {
 
 #define ATTACK_KEY_COUNT 8 // keep same as define in cmdhfmf.c -> readerAttack()
 
diff --git a/armsrc/iso14443a.h b/armsrc/iso14443a.h
index 4d898e18d..5ebc3e645 100644
--- a/armsrc/iso14443a.h
+++ b/armsrc/iso14443a.h
@@ -119,7 +119,7 @@ RAMFUNC bool MillerDecoding(uint8_t bit, uint32_t non_real_time);
 RAMFUNC int ManchesterDecoding(uint8_t bit, uint16_t offset, uint32_t non_real_time);
 
 void RAMFUNC SniffIso14443a(uint8_t param);
-void SimulateIso14443aTag(int tagType, int flags, uint8_t *data);
+void SimulateIso14443aTag(uint8_t tagType, uint8_t flags, uint8_t *data);
 void iso14443a_antifuzz(uint32_t flags);
 void ReaderIso14443a(PacketCommandNG *c);
 void ReaderTransmit(uint8_t *frame, uint16_t len, uint32_t *timing);
diff --git a/armsrc/mifaresim.c b/armsrc/mifaresim.c
index 3e49e379e..c503c2926 100644
--- a/armsrc/mifaresim.c
+++ b/armsrc/mifaresim.c
@@ -960,7 +960,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t *datain) {
 
                 // Collect AR/NR per keytype & sector
                 if ((flags & FLAG_NR_AR_ATTACK) == FLAG_NR_AR_ATTACK) {
-                    if (MF_DBGLEVEL >= 0)	Dbprintf("FLAG_NR_AR_ATTACK");
+
                     for (uint8_t i = 0; i < ATTACK_KEY_COUNT; i++) {
                         if (ar_nr_collected[i + mM] == 0 || ((cardAUTHSC == ar_nr_resp[i + mM].sector) && (cardAUTHKEY == ar_nr_resp[i + mM].keytype) && (ar_nr_collected[i + mM] > 0))) {
                             // if first auth for sector, or matches sector and keytype of previous auth
@@ -989,6 +989,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t *datain) {
                                         ar_nr_resp[i + mM].nonce2 = nonce;
                                         ar_nr_resp[i + mM].nr2 = nr;
                                         ar_nr_resp[i + mM].ar2 = ar;
+                                        
                                         if (!gettingMoebius) {
                                             nonce2_count++;
                                             // check if this was the last second nonce we need for std attack
@@ -1005,7 +1006,8 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t *datain) {
                                         } else {
                                             moebius_n_count++;
                                             // if we've collected all the nonces we need - finish.
-                                            if (nonce1_count == moebius_n_count) finished = true;
+                                            if (nonce1_count == moebius_n_count) 
+                                                finished = true;
                                         }
                                     }
                                     ar_nr_collected[i + mM]++;
@@ -1149,7 +1151,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t *datain) {
 
 
     // NR AR ATTACK
-    if (((flags & FLAG_NR_AR_ATTACK) == FLAG_NR_AR_ATTACK) && (MF_DBGLEVEL >= 1)) {
+    if (((flags & FLAG_NR_AR_ATTACK) == FLAG_NR_AR_ATTACK) && (MF_DBGLEVEL >= MF_DBG_INFO)) {
         for (uint8_t	i = 0; i < ATTACK_KEY_COUNT; i++) {
             if (ar_nr_collected[i] == 2) {
                 Dbprintf("Collected two pairs of AR/NR which can be used to extract %s from reader for sector %d:", (i < ATTACK_KEY_COUNT / 2) ? "keyA" : "keyB", ar_nr_resp[i].sector);
@@ -1180,7 +1182,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t *datain) {
         }
     }
 
-    if (MF_DBGLEVEL >= 1)	{
+    if (MF_DBGLEVEL >= MF_DBG_ERROR)	{
         Dbprintf("Emulator stopped. Tracing: %d  trace length: %d ", get_tracing(), BigBuf_get_traceLen());
     }
 
diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 5d3ec4965..61fbf3379 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -406,24 +406,21 @@ static int CmdHF14ACUIDs(const char *Cmd) {
 }
 // ## simulate iso14443a tag
 int CmdHF14ASim(const char *Cmd) {
-    bool errors = false;
-    uint8_t flags = 0;
-    uint8_t tagtype = 1;
-    uint8_t cmdp = 0;
-    uint8_t uid[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+
     int uidlen = 0;
+    uint8_t flags = 0, tagtype = 1, cmdp = 0;
+    uint8_t uid[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
     bool useUIDfromEML = true;
     bool setEmulatorMem = false;
     bool verbose = false;
+    bool errors = false;
     nonces_t data[1];
 
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-        switch (param_getchar(Cmd, cmdp)) {
+        switch (tolower(param_getchar(Cmd, cmdp))) {
             case 'h':
-            case 'H':
                 return usage_hf_14a_sim();
             case 't':
-            case 'T':
                 // Retrieve the tag type
                 tagtype = param_get8ex(Cmd, cmdp + 1, 0, 10);
                 if (tagtype == 0)
@@ -431,15 +428,15 @@ int CmdHF14ASim(const char *Cmd) {
                 cmdp += 2;
                 break;
             case 'u':
-            case 'U':
                 // Retrieve the full 4,7,10 byte long uid
                 param_gethex_ex(Cmd, cmdp + 1, uid, &uidlen);
+                uidlen >>= 1;
                 switch (uidlen) {
-                    //case 20: flags |= FLAG_10B_UID_IN_DATA; break;
-                    case 14:
+                    //case 10: flags |= FLAG_10B_UID_IN_DATA; break;
+                    case 7:
                         flags |= FLAG_7B_UID_IN_DATA;
                         break;
-                    case  8:
+                    case 4:
                         flags |= FLAG_4B_UID_IN_DATA;
                         break;
                     default:
@@ -447,23 +444,20 @@ int CmdHF14ASim(const char *Cmd) {
                         break;
                 }
                 if (!errors) {
-                    PrintAndLogEx(SUCCESS, "Emulating ISO/IEC 14443 type A tag with %d byte UID (%s)", uidlen >> 1, sprint_hex(uid, uidlen >> 1));
+                    PrintAndLogEx(SUCCESS, "Emulating ISO/IEC 14443 type A tag with %d byte UID (%s)", uidlen, sprint_hex(uid, uidlen));
                     useUIDfromEML = false;
                 }
                 cmdp += 2;
                 break;
             case 'v':
-            case 'V':
                 verbose = true;
                 cmdp++;
                 break;
             case 'x':
-            case 'X':
                 flags |= FLAG_NR_AR_ATTACK;
                 cmdp++;
                 break;
             case 'e':
-            case 'E':
                 setEmulatorMem = true;
                 cmdp++;
                 break;
@@ -480,8 +474,18 @@ int CmdHF14ASim(const char *Cmd) {
     if (useUIDfromEML)
         flags |= FLAG_UID_IN_EMUL;
 
+    struct {
+       uint8_t tagtype;
+       uint8_t flags;
+       uint8_t uid[10];
+    } PACKED payload;
+    
+    payload.tagtype = tagtype;
+    payload.flags = flags;
+    memcpy(payload.uid, uid, uidlen);
+    
     clearCommandBuffer();
-    SendCommandOLD(CMD_SIMULATE_TAG_ISO_14443a,  tagtype, flags, 0, uid, uidlen >> 1);
+    SendCommandNG(CMD_SIMULATE_TAG_ISO_14443a, (uint8_t *)&payload, sizeof(payload));
     PacketResponseNG resp;
 
     PrintAndLogEx(SUCCESS, "press pm3-button to abort simulation");
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index e1ec60b1c..6f5ce0bcc 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -2200,16 +2200,17 @@ static int CmdHF14AMfSim(const char *Cmd) {
                 break;
             case 'u':
                 param_gethex_ex(Cmd, cmdp + 1, uid, &uidlen);
+                uidlen >>= 1;
                 switch (uidlen) {
-                    case 20:
+                    case 10:
                         flags |= FLAG_10B_UID_IN_DATA;
                         sprintf(uidsize, "10 byte");
                         break;
-                    case 14:
+                    case 7:
                         flags |= FLAG_7B_UID_IN_DATA;
                         sprintf(uidsize, "7 byte");
                         break;
-                    case  8:
+                    case 4:
                         flags |= FLAG_4B_UID_IN_DATA;
                         sprintf(uidsize, "4 byte");
                         break;
@@ -2243,7 +2244,7 @@ static int CmdHF14AMfSim(const char *Cmd) {
     PrintAndLogEx(INFO, _YELLOW_("Mifare %s") " | %s UID  " _YELLOW_("%s") ""
                   , csize
                   , uidsize
-                  , (uidlen == 0) ? "N/A" : sprint_hex(uid, uidlen >> 1)
+                  , (uidlen == 0) ? "N/A" : sprint_hex(uid, uidlen)
                  );
 
     PrintAndLogEx(INFO, "Options [ numreads: %d, flags: %d (0x%02x) ]"
@@ -2251,8 +2252,18 @@ static int CmdHF14AMfSim(const char *Cmd) {
                   , flags
                   , flags);
 
+    struct {
+       uint16_t flags;
+       uint8_t exitAfter;
+       uint8_t uid[10];
+    } PACKED payload;
+    
+    payload.flags = flags;
+    payload.exitAfter = exitAfterNReads;
+    memcpy(payload.uid, uid, uidlen);
+    
     clearCommandBuffer();
-    SendCommandOLD(CMD_SIMULATE_MIFARE_CARD, flags, exitAfterNReads, 0, uid, sizeof(uid));
+    SendCommandNG(CMD_SIMULATE_MIFARE_CARD, (uint8_t *)&payload, sizeof(payload));
     PacketResponseNG resp;
 
     if (flags & FLAG_INTERACTIVE) {
@@ -2439,7 +2450,7 @@ int CmdHF14AMfDbg(const char *Cmd) {
     uint8_t dbgMode = param_get8ex(Cmd, 0, 0, 10);
     if (dbgMode > 4) return usage_hf14_dbg();
 
-    SendCommandMIX(CMD_MIFARE_SET_DBGMODE, dbgMode, 0, 0, NULL, 0);
+    SendCommandNG(CMD_MIFARE_SET_DBGMODE, &dbgMode, 1);
     return 0;
 }
 

From 58bed70ad07667d7b0d910dabf5a2c785e56b386 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 26 May 2019 15:00:49 -0400
Subject: [PATCH 1839/1938] chg: hf 14a sim - uses NG

---
 armsrc/appmain.c   |  2 +-
 armsrc/iso14443a.c | 20 ++++++++++++--------
 client/cmdhf14a.c  | 28 +++++++++++++++-------------
 include/pm3_cmd.h  |  2 ++
 4 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 089b7f7c5..267fbe66d 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1012,7 +1012,7 @@ static void PacketReceived(PacketCommandNG *packet) {
 
 #ifdef WITH_ISO14443a
         case CMD_SNIFF_ISO_14443a:
-            SniffIso14443a(packet->oldarg[0]);
+            SniffIso14443a(packet->data.asBytes[0]);
             break;
         case CMD_READER_ISO_14443a:
             ReaderIso14443a(packet);
diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 38edc7a1b..763eada77 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -626,7 +626,7 @@ void RAMFUNC SniffIso14443a(uint8_t param) {
 
     if (MF_DBGLEVEL >= MF_DBG_ERROR) {
         Dbprintf("maxDataLen=%d, Uart.state=%x, Uart.len=%d", maxDataLen, Uart.state, Uart.len);
-        Dbprintf("traceLen=%d, Uart.output[0]=%08x", BigBuf_get_traceLen(), (uint32_t)Uart.output[0]);
+        Dbprintf("traceLen=" _YELLOW_("%d")", Uart.output[0]="_YELLOW_("%08x"), BigBuf_get_traceLen(), (uint32_t)Uart.output[0]);
     }
     switch_off();
 }
@@ -912,7 +912,7 @@ static bool SimulateIso14443aInit(int tagType, int flags, uint8_t *data, tag_res
         }
         break;
         default: {
-            if (MF_DBGLEVEL >= MF_DBG_ERROR)    Dbprintf("Error: unkown tagtype (%d)", tagType);
+            if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Error: unkown tagtype (%d)", tagType);
             return false;
         }
         break;
@@ -957,7 +957,7 @@ static bool SimulateIso14443aInit(int tagType, int flags, uint8_t *data, tag_res
         sak &= 0xFB;
         *cuid = bytes_to_num(data, 4);
     } else {
-        if (MF_DBGLEVEL >= MF_DBG_ERROR)    Dbprintf("[-] ERROR: UID size not defined");
+        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("[-] ERROR: UID size not defined");
         return false;
     }
 
@@ -1047,7 +1047,7 @@ void SimulateIso14443aTag(uint8_t tagType, uint8_t flags, uint8_t *data) {
 
     nonces_t ar_nr_nonces[ATTACK_KEY_COUNT]; // for attack types moebius
     memset(ar_nr_nonces, 0x00, sizeof(ar_nr_nonces));
-    uint8_t    moebius_count = 0;
+    uint8_t moebius_count = 0;
 
     // command buffers
     uint8_t receivedCmd[MAX_FRAME_SIZE] = { 0x00 };
@@ -1069,9 +1069,9 @@ void SimulateIso14443aTag(uint8_t tagType, uint8_t flags, uint8_t *data) {
     // free eventually allocated BigBuf memory but keep Emulator Memory
     BigBuf_free_keep_EM();
 
-
     if (SimulateIso14443aInit(tagType, flags, data, &responses, &cuid, counters, tearings, &pages) == false) {
         BigBuf_free_keep_EM();
+        reply_ng(CMD_SIMULATE_MIFARE_CARD, PM3_EINIT, NULL, 0);
         return;
     }
 
@@ -1095,6 +1095,8 @@ void SimulateIso14443aTag(uint8_t tagType, uint8_t flags, uint8_t *data) {
     int order = ORDER_NONE;
     int lastorder;
 
+    int retval = PM3_SUCCESS;
+    
     // Just to allow some checks
     int happened = 0;
     int happened2 = 0;
@@ -1113,6 +1115,7 @@ void SimulateIso14443aTag(uint8_t tagType, uint8_t flags, uint8_t *data) {
         // Clean receive command buffer
         if (!GetIso14443aCommandFromReader(receivedCmd, receivedCmdPar, &len)) {
             Dbprintf("Emulator stopped.  Trace length: %d ", BigBuf_get_traceLen());
+            retval = PM3_EOPABORTED;
             break;
         }
         p_response = NULL;
@@ -1189,8 +1192,8 @@ void SimulateIso14443aTag(uint8_t tagType, uint8_t flags, uint8_t *data) {
                         ar_nr_nonces[index].ar2 = ar;
                         ar_nr_nonces[index].state = SECOND;
 
-                        // send to client
-                        reply_old(CMD_ACK, CMD_SIMULATE_MIFARE_CARD, 0, 0, &ar_nr_nonces[index], sizeof(nonces_t));
+                        // send to client  (one struct nonces_t)
+                        reply_ng(CMD_SIMULATE_MIFARE_CARD, PM3_SUCCESS, (uint8_t*)&ar_nr_nonces[index], sizeof(nonces_t) );
 
                         ar_nr_nonces[index].state = EMPTY;
                         ar_nr_nonces[index].sector = 0;
@@ -1503,7 +1506,6 @@ void SimulateIso14443aTag(uint8_t tagType, uint8_t flags, uint8_t *data) {
         }
     }
 
-    reply_old(CMD_ACK, 1, 0, 0, 0, 0);
     switch_off();
 
     set_tracing(false);
@@ -1515,6 +1517,8 @@ void SimulateIso14443aTag(uint8_t tagType, uint8_t flags, uint8_t *data) {
         Dbprintf("-[ Num of received cmd  [%d]", cmdsRecvd);
         Dbprintf("-[ Num of moebius tries [%d]", moebius_count);
     }
+    
+    reply_ng(CMD_SIMULATE_MIFARE_CARD, retval, NULL, 0);
 }
 
 // prepare a delayed transfer. This simply shifts ToSend[] by a number
diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 61fbf3379..9289abe22 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -414,7 +414,6 @@ int CmdHF14ASim(const char *Cmd) {
     bool setEmulatorMem = false;
     bool verbose = false;
     bool errors = false;
-    nonces_t data[1];
 
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
@@ -491,29 +490,32 @@ int CmdHF14ASim(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "press pm3-button to abort simulation");
 
     while (!ukbhit()) {
-        if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) continue;
-        if (!(flags & FLAG_NR_AR_ATTACK)) break;
-        if ((resp.oldarg[0] & 0xffff) != CMD_SIMULATE_MIFARE_CARD) break;
-
-        memcpy(data, resp.data.asBytes, sizeof(data));
+        if (WaitForResponseTimeout(CMD_SIMULATE_MIFARE_CARD, &resp, 1500) == 0) continue;
+        if (resp.status != PM3_SUCCESS) break;
+        
+        if ((flags & FLAG_NR_AR_ATTACK) != FLAG_NR_AR_ATTACK) break;
+        
+        nonces_t *data = (nonces_t*)resp.data.asBytes;
         readerAttack(data[0], setEmulatorMem, verbose);
     }
-    showSectorTable();
-    return 0;
+    if (resp.status == PM3_EOPABORTED && ((flags & FLAG_NR_AR_ATTACK) == FLAG_NR_AR_ATTACK) )
+        showSectorTable();
+
+    PrintAndLogEx(INFO, "Done");
+    return PM3_SUCCESS;
 }
 
 int CmdHF14ASniff(const char *Cmd) {
-    int param = 0;
-    uint8_t ctmp;
-    for (int i = 0; i < 2; i++) {
+    uint8_t param = 0, ctmp;
+    for (uint8_t i = 0; i < 2; i++) {
         ctmp = tolower(param_getchar(Cmd, i));
         if (ctmp == 'h') return usage_hf_14a_sniff();
         if (ctmp == 'c') param |= 0x01;
         if (ctmp == 'r') param |= 0x02;
     }
     clearCommandBuffer();
-    SendCommandMIX(CMD_SNIFF_ISO_14443a, param, 0, 0, NULL, 0);
-    return 0;
+    SendCommandNG(CMD_SNIFF_ISO_14443a, (uint8_t *)&param, sizeof(uint8_t));
+    return PM3_SUCCESS;
 }
 
 int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
diff --git a/include/pm3_cmd.h b/include/pm3_cmd.h
index caacf7e1c..f0b20858f 100644
--- a/include/pm3_cmd.h
+++ b/include/pm3_cmd.h
@@ -494,6 +494,8 @@ typedef struct {
 #define PM3_EFILE             -13
 // Generic TTY error
 #define PM3_ENOTTY            -14
+// Initialization error                 pm3:        error related to trying to initalize the pm3 / fpga for different operations
+#define PM3_EINIT             -15
 // No data                              pm3:        no data available, no host frame available (not really an error)
 #define PM3_ENODATA           -98
 // Quit program                         client:     reserved, order to quit the program

From 59f0afb3395ff6460b840c26c59c92b98c7a4396 Mon Sep 17 00:00:00 2001
From: Iceman <iceman@iuse.se>
Date: Mon, 27 May 2019 09:54:05 +0200
Subject: [PATCH 1840/1938] Create bt manual v1.0

draft
---
 doc/bt manual v1.0 | 84 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 84 insertions(+)
 create mode 100644 doc/bt manual v1.0

diff --git a/doc/bt manual v1.0 b/doc/bt manual v1.0
new file mode 100644
index 000000000..b384229aa
--- /dev/null
+++ b/doc/bt manual v1.0	
@@ -0,0 +1,84 @@
+1.	FEATURES
+
+•	Built-in Bluetooth 2.0 with EDR Bluetooth module, default baud rate 115200.
+•	Built-in 400 mAh polymer lithium-ion battery, typical standby time up to 3.5 hours.
+•	Additional heat dissipating fins can significantly reduce the temperature when the HF antenna is in operation for a long time.
+•	Complete lithium charging management system, seamless switching power supply. Full overcharge and overdischarge protection.
+•	Bluetooth has an independent power switch that can be turned on or off.
+•	It's compact and easy to carry. The clamp structure is easy to install and replace.
+
+
+It can easily connect to Bluetooth mobile phone, portable computer, etc. Without USB cable, complicated permissions or driver settings.
+
+Built-in battery can support standalone mode, off-line sniffing, off-line reading & simulation, etc. The temperature of the device is stable.
+
+
+
+2.	PARAMETER
+
+•	Battery capacity:	400 mAh
+•	Standby time:	3.5h@StandBy; 2.9h@LF-On; 50min@HF-On;
+•	Charging Current:	200mA (Plug in USB Default Charging)
+•	Charging time:	2.5h
+•	Bluetooth power:	4dBm, -85 dBm@2Mbps
+•	Bluetooth distance:	6m (depending on the environment and device orientation)
+•	Size and weight:	54.4mm*29.4mm*13.5mm 24g
+
+
+3.	ASSEMBLY STEPS
+
+①	Remove the plastic upper case of PM3 RDV40 by opener.
+②	The antenna is temporarily removed with a screwdriver to expose the FPC interface.
+③	Turn off all power switches, insert the FPC wire into the FPC connector, and lock the FPC connector.
+④	Tear off the blue film of heat conductive double-sided tape. Align the add-on to the hole positions and gently insert it into the case.
+⑤	Assembly finished!
+
+
+  
+
+
+4.	CONNECT WITH BLUETOOTH
+
+(1)	Connecting rdv4.0 with Bluetooth on mobile phone or computer
+①	Open Bluetooth and search for a device named PM3_RDV4.0.
+②	Enter the paired password 1234 and establish the connection.
+③	The blue state LED on the ADD-ON will keep blinking after the connection is established. Only when the mobile phone or computer opens the correct COM port, the blue LED turns on solid, indicating that the connection is successful.
+
+(2)	Fast connection using dedicated USB Bluetooth adapter
+①	Install driver:
+http://www.silabs.com/products/development-tools/software/usb-to-uart-bridge-vcp-drivers  
+②	Insert the adapter into the USB port. The adapter will search automatically and establish the connection. The adapter will remember the device that was first connected and after that the same device will be connected.
+③	The adapter button can be used to delete memory so that other add-on can be searched and connected.
+④	After the connection is established, the blue state LED on ADD-ON will turn on solid.
+                               
+
+
+Compiling / Flashing 
+Please download the latest source code from RRG's Github repo:
+https://github.com/RfidResearchGroup/proxmark3
+
+
+
+5.	OTHER NOTES
+
+(1)	UART and LED behavior
+
+Bluetooth is connected to PM3 RDV4.0 via UART. The USB and UART interfaces of RDV4.0 can coexist without conflict, and no special switching is required. 
+
+The following link has helpful notes on UART usage and baud rates:
+https://github.com/RfidResearchGroup/proxmark3/blob/master/doc/uart_notes.md
+
+(2)	Disassembly
+
+There is a heat conductive double-sided tape inside the Add-on, which has strong adhesive force. Therefore, if add-on needs to be removed, it needs to be pulled out from the heat sink end with greater efforts. Each disassembly will reduce the viscidity of double-sided tape. When double-sided tape is well protected, it will not affect the second use. Thermal conductivity will be slightly worse and will therefore have a direct impact on the thermal performance of the heat sink.
+
+(3)	Battery charging
+
+The battery charging circuit is turned on by default. Any time a USB cable is inserted, the battery will be automatically charged. The red LED will remain bright when charging. 
+The red LED will be extinguished when charging is completed.
+
+(4)	Get better signals
+
+For the better heat dissipation, we have used a cast metal enclosure for the add-on. As a result Bluetooth wireless signals are sacrificed. For example, if the back of ADDON is facing the Bluetooth host, the signal is very bad and the distance will be reduced. The best signal strength can be obtained when the front glass faces the Bluetooth host.
+	If the PM3 is not responding, it may be due to a poor Bluetooth connection. To improve performance, try repositioning the PM3 so the glass face is directed toward the host.
+

From 72cbe74c8f60933bc0b6b4134042b15e626a46ac Mon Sep 17 00:00:00 2001
From: Iceman <iceman@iuse.se>
Date: Mon, 27 May 2019 09:56:23 +0200
Subject: [PATCH 1841/1938] Delete bt manual v1.0

---
 doc/bt manual v1.0 | 84 ----------------------------------------------
 1 file changed, 84 deletions(-)
 delete mode 100644 doc/bt manual v1.0

diff --git a/doc/bt manual v1.0 b/doc/bt manual v1.0
deleted file mode 100644
index b384229aa..000000000
--- a/doc/bt manual v1.0	
+++ /dev/null
@@ -1,84 +0,0 @@
-1.	FEATURES
-
-•	Built-in Bluetooth 2.0 with EDR Bluetooth module, default baud rate 115200.
-•	Built-in 400 mAh polymer lithium-ion battery, typical standby time up to 3.5 hours.
-•	Additional heat dissipating fins can significantly reduce the temperature when the HF antenna is in operation for a long time.
-•	Complete lithium charging management system, seamless switching power supply. Full overcharge and overdischarge protection.
-•	Bluetooth has an independent power switch that can be turned on or off.
-•	It's compact and easy to carry. The clamp structure is easy to install and replace.
-
-
-It can easily connect to Bluetooth mobile phone, portable computer, etc. Without USB cable, complicated permissions or driver settings.
-
-Built-in battery can support standalone mode, off-line sniffing, off-line reading & simulation, etc. The temperature of the device is stable.
-
-
-
-2.	PARAMETER
-
-•	Battery capacity:	400 mAh
-•	Standby time:	3.5h@StandBy; 2.9h@LF-On; 50min@HF-On;
-•	Charging Current:	200mA (Plug in USB Default Charging)
-•	Charging time:	2.5h
-•	Bluetooth power:	4dBm, -85 dBm@2Mbps
-•	Bluetooth distance:	6m (depending on the environment and device orientation)
-•	Size and weight:	54.4mm*29.4mm*13.5mm 24g
-
-
-3.	ASSEMBLY STEPS
-
-①	Remove the plastic upper case of PM3 RDV40 by opener.
-②	The antenna is temporarily removed with a screwdriver to expose the FPC interface.
-③	Turn off all power switches, insert the FPC wire into the FPC connector, and lock the FPC connector.
-④	Tear off the blue film of heat conductive double-sided tape. Align the add-on to the hole positions and gently insert it into the case.
-⑤	Assembly finished!
-
-
-  
-
-
-4.	CONNECT WITH BLUETOOTH
-
-(1)	Connecting rdv4.0 with Bluetooth on mobile phone or computer
-①	Open Bluetooth and search for a device named PM3_RDV4.0.
-②	Enter the paired password 1234 and establish the connection.
-③	The blue state LED on the ADD-ON will keep blinking after the connection is established. Only when the mobile phone or computer opens the correct COM port, the blue LED turns on solid, indicating that the connection is successful.
-
-(2)	Fast connection using dedicated USB Bluetooth adapter
-①	Install driver:
-http://www.silabs.com/products/development-tools/software/usb-to-uart-bridge-vcp-drivers  
-②	Insert the adapter into the USB port. The adapter will search automatically and establish the connection. The adapter will remember the device that was first connected and after that the same device will be connected.
-③	The adapter button can be used to delete memory so that other add-on can be searched and connected.
-④	After the connection is established, the blue state LED on ADD-ON will turn on solid.
-                               
-
-
-Compiling / Flashing 
-Please download the latest source code from RRG's Github repo:
-https://github.com/RfidResearchGroup/proxmark3
-
-
-
-5.	OTHER NOTES
-
-(1)	UART and LED behavior
-
-Bluetooth is connected to PM3 RDV4.0 via UART. The USB and UART interfaces of RDV4.0 can coexist without conflict, and no special switching is required. 
-
-The following link has helpful notes on UART usage and baud rates:
-https://github.com/RfidResearchGroup/proxmark3/blob/master/doc/uart_notes.md
-
-(2)	Disassembly
-
-There is a heat conductive double-sided tape inside the Add-on, which has strong adhesive force. Therefore, if add-on needs to be removed, it needs to be pulled out from the heat sink end with greater efforts. Each disassembly will reduce the viscidity of double-sided tape. When double-sided tape is well protected, it will not affect the second use. Thermal conductivity will be slightly worse and will therefore have a direct impact on the thermal performance of the heat sink.
-
-(3)	Battery charging
-
-The battery charging circuit is turned on by default. Any time a USB cable is inserted, the battery will be automatically charged. The red LED will remain bright when charging. 
-The red LED will be extinguished when charging is completed.
-
-(4)	Get better signals
-
-For the better heat dissipation, we have used a cast metal enclosure for the add-on. As a result Bluetooth wireless signals are sacrificed. For example, if the back of ADDON is facing the Bluetooth host, the signal is very bad and the distance will be reduced. The best signal strength can be obtained when the front glass faces the Bluetooth host.
-	If the PM3 is not responding, it may be due to a poor Bluetooth connection. To improve performance, try repositioning the PM3 so the glass face is directed toward the host.
-

From c06830b8f1975f17092bbbdd1c6213a607a2bade Mon Sep 17 00:00:00 2001
From: Iceman <iceman@iuse.se>
Date: Mon, 27 May 2019 09:57:07 +0200
Subject: [PATCH 1842/1938] Create bt_manual_v10.md

---
 doc/bt_manual_v10.md | 84 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 84 insertions(+)
 create mode 100644 doc/bt_manual_v10.md

diff --git a/doc/bt_manual_v10.md b/doc/bt_manual_v10.md
new file mode 100644
index 000000000..b384229aa
--- /dev/null
+++ b/doc/bt_manual_v10.md
@@ -0,0 +1,84 @@
+1.	FEATURES
+
+•	Built-in Bluetooth 2.0 with EDR Bluetooth module, default baud rate 115200.
+•	Built-in 400 mAh polymer lithium-ion battery, typical standby time up to 3.5 hours.
+•	Additional heat dissipating fins can significantly reduce the temperature when the HF antenna is in operation for a long time.
+•	Complete lithium charging management system, seamless switching power supply. Full overcharge and overdischarge protection.
+•	Bluetooth has an independent power switch that can be turned on or off.
+•	It's compact and easy to carry. The clamp structure is easy to install and replace.
+
+
+It can easily connect to Bluetooth mobile phone, portable computer, etc. Without USB cable, complicated permissions or driver settings.
+
+Built-in battery can support standalone mode, off-line sniffing, off-line reading & simulation, etc. The temperature of the device is stable.
+
+
+
+2.	PARAMETER
+
+•	Battery capacity:	400 mAh
+•	Standby time:	3.5h@StandBy; 2.9h@LF-On; 50min@HF-On;
+•	Charging Current:	200mA (Plug in USB Default Charging)
+•	Charging time:	2.5h
+•	Bluetooth power:	4dBm, -85 dBm@2Mbps
+•	Bluetooth distance:	6m (depending on the environment and device orientation)
+•	Size and weight:	54.4mm*29.4mm*13.5mm 24g
+
+
+3.	ASSEMBLY STEPS
+
+①	Remove the plastic upper case of PM3 RDV40 by opener.
+②	The antenna is temporarily removed with a screwdriver to expose the FPC interface.
+③	Turn off all power switches, insert the FPC wire into the FPC connector, and lock the FPC connector.
+④	Tear off the blue film of heat conductive double-sided tape. Align the add-on to the hole positions and gently insert it into the case.
+⑤	Assembly finished!
+
+
+  
+
+
+4.	CONNECT WITH BLUETOOTH
+
+(1)	Connecting rdv4.0 with Bluetooth on mobile phone or computer
+①	Open Bluetooth and search for a device named PM3_RDV4.0.
+②	Enter the paired password 1234 and establish the connection.
+③	The blue state LED on the ADD-ON will keep blinking after the connection is established. Only when the mobile phone or computer opens the correct COM port, the blue LED turns on solid, indicating that the connection is successful.
+
+(2)	Fast connection using dedicated USB Bluetooth adapter
+①	Install driver:
+http://www.silabs.com/products/development-tools/software/usb-to-uart-bridge-vcp-drivers  
+②	Insert the adapter into the USB port. The adapter will search automatically and establish the connection. The adapter will remember the device that was first connected and after that the same device will be connected.
+③	The adapter button can be used to delete memory so that other add-on can be searched and connected.
+④	After the connection is established, the blue state LED on ADD-ON will turn on solid.
+                               
+
+
+Compiling / Flashing 
+Please download the latest source code from RRG's Github repo:
+https://github.com/RfidResearchGroup/proxmark3
+
+
+
+5.	OTHER NOTES
+
+(1)	UART and LED behavior
+
+Bluetooth is connected to PM3 RDV4.0 via UART. The USB and UART interfaces of RDV4.0 can coexist without conflict, and no special switching is required. 
+
+The following link has helpful notes on UART usage and baud rates:
+https://github.com/RfidResearchGroup/proxmark3/blob/master/doc/uart_notes.md
+
+(2)	Disassembly
+
+There is a heat conductive double-sided tape inside the Add-on, which has strong adhesive force. Therefore, if add-on needs to be removed, it needs to be pulled out from the heat sink end with greater efforts. Each disassembly will reduce the viscidity of double-sided tape. When double-sided tape is well protected, it will not affect the second use. Thermal conductivity will be slightly worse and will therefore have a direct impact on the thermal performance of the heat sink.
+
+(3)	Battery charging
+
+The battery charging circuit is turned on by default. Any time a USB cable is inserted, the battery will be automatically charged. The red LED will remain bright when charging. 
+The red LED will be extinguished when charging is completed.
+
+(4)	Get better signals
+
+For the better heat dissipation, we have used a cast metal enclosure for the add-on. As a result Bluetooth wireless signals are sacrificed. For example, if the back of ADDON is facing the Bluetooth host, the signal is very bad and the distance will be reduced. The best signal strength can be obtained when the front glass faces the Bluetooth host.
+	If the PM3 is not responding, it may be due to a poor Bluetooth connection. To improve performance, try repositioning the PM3 so the glass face is directed toward the host.
+

From 2e477b423deacf9ef7d643698f7daef5ba8ade8c Mon Sep 17 00:00:00 2001
From: Iceman <iceman@iuse.se>
Date: Mon, 27 May 2019 10:00:58 +0200
Subject: [PATCH 1843/1938] Update bt_manual_v10.md

---
 doc/bt_manual_v10.md | 74 ++++++++++++++++++++------------------------
 1 file changed, 33 insertions(+), 41 deletions(-)

diff --git a/doc/bt_manual_v10.md b/doc/bt_manual_v10.md
index b384229aa..d1ef0ec0b 100644
--- a/doc/bt_manual_v10.md
+++ b/doc/bt_manual_v10.md
@@ -1,11 +1,11 @@
-1.	FEATURES
+### 1.	FEATURES
 
-•	Built-in Bluetooth 2.0 with EDR Bluetooth module, default baud rate 115200.
-•	Built-in 400 mAh polymer lithium-ion battery, typical standby time up to 3.5 hours.
-•	Additional heat dissipating fins can significantly reduce the temperature when the HF antenna is in operation for a long time.
-•	Complete lithium charging management system, seamless switching power supply. Full overcharge and overdischarge protection.
-•	Bluetooth has an independent power switch that can be turned on or off.
-•	It's compact and easy to carry. The clamp structure is easy to install and replace.
+*	Built-in Bluetooth 2.0 with EDR Bluetooth module, default baud rate 115200.
+*	Built-in 400 mAh polymer lithium-ion battery, typical standby time up to 3.5 hours.
+*	Additional heat dissipating fins can significantly reduce the temperature when the HF antenna is in operation for a long time.
+*	Complete lithium charging management system, seamless switching power supply. Full overcharge and overdischarge protection.
+*	Bluetooth has an independent power switch that can be turned on or off.
+*	It's compact and easy to carry. The clamp structure is easy to install and replace.
 
 
 It can easily connect to Bluetooth mobile phone, portable computer, etc. Without USB cable, complicated permissions or driver settings.
@@ -14,52 +14,44 @@ Built-in battery can support standalone mode, off-line sniffing, off-line readin
 
 
 
-2.	PARAMETER
+### 2.	PARAMETER
 
-•	Battery capacity:	400 mAh
-•	Standby time:	3.5h@StandBy; 2.9h@LF-On; 50min@HF-On;
-•	Charging Current:	200mA (Plug in USB Default Charging)
-•	Charging time:	2.5h
-•	Bluetooth power:	4dBm, -85 dBm@2Mbps
-•	Bluetooth distance:	6m (depending on the environment and device orientation)
-•	Size and weight:	54.4mm*29.4mm*13.5mm 24g
+*	Battery capacity:	400 mAh
+*	Standby time:		3.5h@StandBy; 2.9h@LF-On; 50min@HF-On;
+*	Charging Current:	200mA (Plug in USB Default Charging)
+*	Charging time:	2.5h
+*	Bluetooth power:	4dBm, -85 dBm@2Mbps
+*	Bluetooth distance:	6m (depending on the environment and device orientation)
+*	Size and weight:	54.4mm*29.4mm*13.5mm 24g
 
 
-3.	ASSEMBLY STEPS
+### 3.	ASSEMBLY STEPS
 
-①	Remove the plastic upper case of PM3 RDV40 by opener.
-②	The antenna is temporarily removed with a screwdriver to expose the FPC interface.
-③	Turn off all power switches, insert the FPC wire into the FPC connector, and lock the FPC connector.
-④	Tear off the blue film of heat conductive double-sided tape. Align the add-on to the hole positions and gently insert it into the case.
-⑤	Assembly finished!
+*	Remove the plastic upper case of PM3 RDV40 by opener.
+*	The antenna is temporarily removed with a screwdriver to expose the FPC interface.
+*	Turn off all power switches, insert the FPC wire into the FPC connector, and lock the FPC connector.
+*	Tear off the blue film of heat conductive double-sided tape. Align the add-on to the hole positions and gently insert it into the case.
+*	Assembly finished!
 
+### 4.	CONNECT WITH BLUETOOTH
 
-  
+#### (1)	Connecting rdv4.0 with Bluetooth on mobile phone or computer
+*	Open Bluetooth and search for a device named PM3_RDV4.0.
+*	Enter the paired password 1234 and establish the connection.
+*	The blue state LED on the ADD-ON will keep blinking after the connection is established. Only when the mobile phone or computer opens the correct COM port, the blue LED turns on solid, indicating that the connection is successful.
 
-
-4.	CONNECT WITH BLUETOOTH
-
-(1)	Connecting rdv4.0 with Bluetooth on mobile phone or computer
-①	Open Bluetooth and search for a device named PM3_RDV4.0.
-②	Enter the paired password 1234 and establish the connection.
-③	The blue state LED on the ADD-ON will keep blinking after the connection is established. Only when the mobile phone or computer opens the correct COM port, the blue LED turns on solid, indicating that the connection is successful.
-
-(2)	Fast connection using dedicated USB Bluetooth adapter
-①	Install driver:
+#### (2)	Fast connection using dedicated USB Bluetooth adapter
+*	Install driver:
 http://www.silabs.com/products/development-tools/software/usb-to-uart-bridge-vcp-drivers  
-②	Insert the adapter into the USB port. The adapter will search automatically and establish the connection. The adapter will remember the device that was first connected and after that the same device will be connected.
-③	The adapter button can be used to delete memory so that other add-on can be searched and connected.
-④	After the connection is established, the blue state LED on ADD-ON will turn on solid.
+*	Insert the adapter into the USB port. The adapter will search automatically and establish the connection. The adapter will remember the device that was first connected and after that the same device will be connected.
+*	The adapter button can be used to delete memory so that other add-on can be searched and connected.
+*	After the connection is established, the blue state LED on ADD-ON will turn on solid.
                                
-
-
-Compiling / Flashing 
+### 5. Compiling / Flashing 
 Please download the latest source code from RRG's Github repo:
 https://github.com/RfidResearchGroup/proxmark3
 
-
-
-5.	OTHER NOTES
+### 6.	OTHER NOTES
 
 (1)	UART and LED behavior
 

From 973984f8c7dca286afe27c10d1b4991d5c249c02 Mon Sep 17 00:00:00 2001
From: Iceman <iceman@iuse.se>
Date: Mon, 27 May 2019 10:03:10 +0200
Subject: [PATCH 1844/1938] Update bt_manual_v10.md

---
 doc/bt_manual_v10.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/bt_manual_v10.md b/doc/bt_manual_v10.md
index d1ef0ec0b..a212c7f33 100644
--- a/doc/bt_manual_v10.md
+++ b/doc/bt_manual_v10.md
@@ -1,3 +1,7 @@
+# MANUAL 
+## Bluetooth / Battery add-on 'Blue Shark'
+_rev. v1.0 (draft)_
+
 ### 1.	FEATURES
 
 *	Built-in Bluetooth 2.0 with EDR Bluetooth module, default baud rate 115200.

From 050cb16683d461a258778b833fdaba2fb27799c5 Mon Sep 17 00:00:00 2001
From: Iceman <iceman@iuse.se>
Date: Mon, 27 May 2019 10:04:27 +0200
Subject: [PATCH 1845/1938] Update bt_manual_v10.md

---
 doc/bt_manual_v10.md | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/doc/bt_manual_v10.md b/doc/bt_manual_v10.md
index a212c7f33..ed47cba7a 100644
--- a/doc/bt_manual_v10.md
+++ b/doc/bt_manual_v10.md
@@ -1,5 +1,5 @@
 # MANUAL 
-## Bluetooth / Battery add-on 'Blue Shark'
+### Bluetooth / Battery add-on 'Blue Shark'
 _rev. v1.0 (draft)_
 
 ### 1.	FEATURES
@@ -57,24 +57,20 @@ https://github.com/RfidResearchGroup/proxmark3
 
 ### 6.	OTHER NOTES
 
-(1)	UART and LED behavior
-
+#### (1)	UART and LED behavior
 Bluetooth is connected to PM3 RDV4.0 via UART. The USB and UART interfaces of RDV4.0 can coexist without conflict, and no special switching is required. 
 
 The following link has helpful notes on UART usage and baud rates:
 https://github.com/RfidResearchGroup/proxmark3/blob/master/doc/uart_notes.md
 
-(2)	Disassembly
-
+#### (2)	Disassembly
 There is a heat conductive double-sided tape inside the Add-on, which has strong adhesive force. Therefore, if add-on needs to be removed, it needs to be pulled out from the heat sink end with greater efforts. Each disassembly will reduce the viscidity of double-sided tape. When double-sided tape is well protected, it will not affect the second use. Thermal conductivity will be slightly worse and will therefore have a direct impact on the thermal performance of the heat sink.
 
-(3)	Battery charging
-
+#### (3)	Battery charging
 The battery charging circuit is turned on by default. Any time a USB cable is inserted, the battery will be automatically charged. The red LED will remain bright when charging. 
 The red LED will be extinguished when charging is completed.
 
-(4)	Get better signals
-
+#### (4)	Get better signals
 For the better heat dissipation, we have used a cast metal enclosure for the add-on. As a result Bluetooth wireless signals are sacrificed. For example, if the back of ADDON is facing the Bluetooth host, the signal is very bad and the distance will be reduced. The best signal strength can be obtained when the front glass faces the Bluetooth host.
 	If the PM3 is not responding, it may be due to a poor Bluetooth connection. To improve performance, try repositioning the PM3 so the glass face is directed toward the host.
 

From f9d5083bccff3eb21889482c4a9e307a90da8b13 Mon Sep 17 00:00:00 2001
From: Iceman <iceman@iuse.se>
Date: Mon, 27 May 2019 10:10:57 +0200
Subject: [PATCH 1846/1938] Update bt_manual_v10.md

---
 doc/bt_manual_v10.md | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/doc/bt_manual_v10.md b/doc/bt_manual_v10.md
index ed47cba7a..2bfa0f465 100644
--- a/doc/bt_manual_v10.md
+++ b/doc/bt_manual_v10.md
@@ -17,60 +17,63 @@ It can easily connect to Bluetooth mobile phone, portable computer, etc. Without
 Built-in battery can support standalone mode, off-line sniffing, off-line reading & simulation, etc. The temperature of the device is stable.
 
 
-
 ### 2.	PARAMETER
 
 *	Battery capacity:	400 mAh
-*	Standby time:		3.5h@StandBy; 2.9h@LF-On; 50min@HF-On;
+*	Standby time:		3.5h @ StandBy; 2.9h @ LF-On; 50min @ HF-On;
 *	Charging Current:	200mA (Plug in USB Default Charging)
-*	Charging time:	2.5h
-*	Bluetooth power:	4dBm, -85 dBm@2Mbps
+*	Charging time:		2.5h
+*	Bluetooth power:	4dBm, -85 dBm @ 2Mbps
 *	Bluetooth distance:	6m (depending on the environment and device orientation)
-*	Size and weight:	54.4mm*29.4mm*13.5mm 24g
+*	Size and weight:	54.4mm * 29.4mm * 13.5mm 24g
 
 
 ### 3.	ASSEMBLY STEPS
 
-*	Remove the plastic upper case of PM3 RDV40 by opener.
+*	Unplug your Proxmark3 RDV4.0 device from any usb cable.
+*	Remove the plastic upper case of Proxmark3 RDV4.0 with opener.
 *	The antenna is temporarily removed with a screwdriver to expose the FPC interface.
 *	Turn off all power switches, insert the FPC wire into the FPC connector, and lock the FPC connector.
 *	Tear off the blue film of heat conductive double-sided tape. Align the add-on to the hole positions and gently insert it into the case.
 *	Assembly finished!
 
+
 ### 4.	CONNECT WITH BLUETOOTH
 
-#### (1)	Connecting rdv4.0 with Bluetooth on mobile phone or computer
+#### (1)	Connecting your RDV4.0 with Bluetooth on mobile phone or computer
 *	Open Bluetooth and search for a device named PM3_RDV4.0.
 *	Enter the paired password 1234 and establish the connection.
-*	The blue state LED on the ADD-ON will keep blinking after the connection is established. Only when the mobile phone or computer opens the correct COM port, the blue LED turns on solid, indicating that the connection is successful.
+*	The blue state LED on the add-on will keep blinking after the connection is established. Only when the mobile phone or computer opens the correct COM port, the blue LED turns on solid, indicating that the connection is successful.
 
 #### (2)	Fast connection using dedicated USB Bluetooth adapter
 *	Install driver:
 http://www.silabs.com/products/development-tools/software/usb-to-uart-bridge-vcp-drivers  
 *	Insert the adapter into the USB port. The adapter will search automatically and establish the connection. The adapter will remember the device that was first connected and after that the same device will be connected.
 *	The adapter button can be used to delete memory so that other add-on can be searched and connected.
-*	After the connection is established, the blue state LED on ADD-ON will turn on solid.
-                               
+*	After the connection is established, the blue state LED on add-on will turn on solid.
+
+
 ### 5. Compiling / Flashing 
-Please download the latest source code from RRG's Github repo:
+Please download the latest source code from Rfid Research Group's Github repo:
 https://github.com/RfidResearchGroup/proxmark3
 
+
 ### 6.	OTHER NOTES
 
 #### (1)	UART and LED behavior
-Bluetooth is connected to PM3 RDV4.0 via UART. The USB and UART interfaces of RDV4.0 can coexist without conflict, and no special switching is required. 
+Bluetooth is connected to Proxmark3 RDV4.0 via UART. The USB and UART interfaces of RDV4.0 can coexist without conflict, and no special switching is required. 
 
 The following link has helpful notes on UART usage and baud rates:
 https://github.com/RfidResearchGroup/proxmark3/blob/master/doc/uart_notes.md
 
 #### (2)	Disassembly
-There is a heat conductive double-sided tape inside the Add-on, which has strong adhesive force. Therefore, if add-on needs to be removed, it needs to be pulled out from the heat sink end with greater efforts. Each disassembly will reduce the viscidity of double-sided tape. When double-sided tape is well protected, it will not affect the second use. Thermal conductivity will be slightly worse and will therefore have a direct impact on the thermal performance of the heat sink.
+There is a heat conductive double-sided tape inside the add-on, which has strong adhesive force. Therefore, if add-on needs to be removed, it needs to be pulled out from the heat sink end with greater efforts. Each disassembly will reduce the viscidity of double-sided tape. When double-sided tape is well protected, it will not affect the second use. Thermal conductivity will be slightly worse and will therefore have a direct impact on the thermal performance of the heat sink.
 
 #### (3)	Battery charging
 The battery charging circuit is turned on by default. Any time a USB cable is inserted, the battery will be automatically charged. The red LED will remain bright when charging. 
 The red LED will be extinguished when charging is completed.
 
 #### (4)	Get better signals
-For the better heat dissipation, we have used a cast metal enclosure for the add-on. As a result Bluetooth wireless signals are sacrificed. For example, if the back of ADDON is facing the Bluetooth host, the signal is very bad and the distance will be reduced. The best signal strength can be obtained when the front glass faces the Bluetooth host.
-	If the PM3 is not responding, it may be due to a poor Bluetooth connection. To improve performance, try repositioning the PM3 so the glass face is directed toward the host.
+For the better heat dissipation, we have used a cast metal enclosure for the add-on. As a result Bluetooth wireless signals are sacrificed. For example, if the back of add-on is facing the Bluetooth host, the signal is very bad and the distance will be reduced. The best signal strength can be obtained when the front glass faces the Bluetooth host.
+	If the Proxmark3 is not responding, it may be due to a poor Bluetooth connection. To improve performance, try repositioning the Proxmark3 so the glass face is directed toward the host.
 

From 36d1cb0eb8e8c179b6403420f063ec2bc755be7f Mon Sep 17 00:00:00 2001
From: Iceman <iceman@iuse.se>
Date: Mon, 27 May 2019 10:16:46 +0200
Subject: [PATCH 1847/1938] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b8ad98c99..cb54ad77a 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ alt="Yuotube" width="100%" height="auto" border="10" /></a>
 |[Development](#development) | [Important notes on ModemManager for Linux users](/doc/md/Installation_Instructions/ModemManager-Must-Be-Discarded.md) | [Validating proxmark client functionality](/doc/md/Use_of_Proxmark/1_Validation.md) |
 |[Why didn't you base it on official PM3 Master?](#why-didnt-you-base-it-on-official-pm3-master)| [Homebrew (Mac OS X) & Upgrading HomeBrew Tap Formula](/doc/md/Installation_Instructions/Mac-OS-X-Homebrew-Installation-Instructions.md) | [First Use and Verification](/doc/md/Use_of_Proxmark/2_Configuration-and-Verification.md)|
 |[PM3 GUI](#pm3-gui)|[Setup and build for Windows](/doc/md/Installation_Instructions/Windows-Installation-Instructions.md)|[Commands & Features](/doc/md/Use_of_Proxmark/3_Commands-and-Features.md)|
-|[Issues](#issues)|||
+|[Issues](#issues)|[Blue shark](/doc/bt_manual_v10.md) ||
 |[Donations](#Donations)|||
 
 ## What has changed?

From 08c3088e0810c41bf3140924710c19739d22cc93 Mon Sep 17 00:00:00 2001
From: Iceman <iceman@iuse.se>
Date: Mon, 27 May 2019 10:25:34 +0200
Subject: [PATCH 1848/1938] Update bt_manual_v10.md

added linux / windows instructions (@doegox )
---
 doc/bt_manual_v10.md | 49 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/doc/bt_manual_v10.md b/doc/bt_manual_v10.md
index 2bfa0f465..530879492 100644
--- a/doc/bt_manual_v10.md
+++ b/doc/bt_manual_v10.md
@@ -40,6 +40,8 @@ Built-in battery can support standalone mode, off-line sniffing, off-line readin
 
 ### 4.	CONNECT WITH BLUETOOTH
 
+#### Windows
+
 #### (1)	Connecting your RDV4.0 with Bluetooth on mobile phone or computer
 *	Open Bluetooth and search for a device named PM3_RDV4.0.
 *	Enter the paired password 1234 and establish the connection.
@@ -52,6 +54,53 @@ http://www.silabs.com/products/development-tools/software/usb-to-uart-bridge-vcp
 *	The adapter button can be used to delete memory so that other add-on can be searched and connected.
 *	After the connection is established, the blue state LED on add-on will turn on solid.
 
+#### Linux
+
+#### (1) Connecting rdv4.0 with Bluetooth on Linux computer
+
+1. Find the MAC address of the Bluetooth add-on, named PM3_RDV4.0.
+	
+```sh
+sudo hcitool scan
+Scanning ...
+  aa:bb:cc:dd:ee:ff PM3_RDV4.0
+```
+	Instead of aa:bb:cc:dd:ee:ff, you'll see your MAC address.
+
+2. Bind your BT add-on MAC address to a serial port
+```sh
+sudo rfcomm bind rfcomm0 aa:bb:cc:dd:ee:ff
+```
+3. The blue state LED on the add-on will keep blinking after the
+connection is established. Only when the Proxmark3 client opens the
+/dev/rfcomm0 port, the blue LED turns on solid, indicating that the
+connection is successful.
+
+4. Use Proxmark client on BT-serial port
+```sh
+./proxmark /dev/rfcomm0
+```
+The first time, your OS will ask you for pairing. The default PIN is
+1234. If PIN is not typed in quickly, the client might timeout. Simply
+restart it again after pairing.
+
+#### (2) Fast connection using dedicated USB Bluetooth adapter under Linux
+
+  1. Insert the adapter into the USB port. The adapter will search
+automatically and establish the connection. The adapter will remember
+the device that was first connected and after that the same device will
+be connected.
+
+  2. The adapter button can be used to delete memory so that other add-on
+can be searched and connected.
+
+  3. After the connection is established, the blue state LED on add-on will
+turn on solid.
+
+  4. a serial port /dev/ttyUSB0 will be created, use Proxmark3 client on it
+```sh
+./proxmark /dev/ttyUSB0
+```
 
 ### 5. Compiling / Flashing 
 Please download the latest source code from Rfid Research Group's Github repo:

From 07064ca81407e5a687f846b1e6a69e710d822e85 Mon Sep 17 00:00:00 2001
From: Iceman <iceman@iuse.se>
Date: Mon, 27 May 2019 11:00:10 +0200
Subject: [PATCH 1849/1938] Update bt_manual_v10.md

---
 doc/bt_manual_v10.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/bt_manual_v10.md b/doc/bt_manual_v10.md
index 530879492..97ac28804 100644
--- a/doc/bt_manual_v10.md
+++ b/doc/bt_manual_v10.md
@@ -53,6 +53,7 @@ http://www.silabs.com/products/development-tools/software/usb-to-uart-bridge-vcp
 *	Insert the adapter into the USB port. The adapter will search automatically and establish the connection. The adapter will remember the device that was first connected and after that the same device will be connected.
 *	The adapter button can be used to delete memory so that other add-on can be searched and connected.
 *	After the connection is established, the blue state LED on add-on will turn on solid.
+*	look for _CP2104 USB tp UART bridge controller_ under devices in order to get the assigned serial port
 
 #### Linux
 

From 53f2058c7a986034bad1ed80001a29b889d7c645 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 27 May 2019 07:46:27 -0400
Subject: [PATCH 1850/1938] chf: hf mf eget\nhf mf eset\nhf mf eclr - uses NG

---
 armsrc/appmain.c           | 29 ++++++++++++++++------
 armsrc/apps.h              |  7 ++++--
 armsrc/mifarecmd.c         | 29 ++++++++++++++++------
 armsrc/mifareutil.c        |  5 ++--
 armsrc/mifareutil.h        |  2 +-
 client/cmdhfmf.c           | 25 ++++++++-----------
 client/mifare/mifarehost.c | 50 ++++++++++++++++++++++++++++++++++----
 7 files changed, 106 insertions(+), 41 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 267fbe66d..fe947ce08 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -771,7 +771,7 @@ static void PacketReceived(PacketCommandNG *packet) {
             }
         case CMD_LF_SNIFF_RAW_ADC_SAMPLES: {
             uint32_t bits = SniffLF();
-            reply_old(CMD_ACK, bits, 0, 0, 0, 0);
+            reply_mix(CMD_ACK, bits, 0, 0, 0, 0);
             break;
         }
         case CMD_HID_DEMOD_FSK: {
@@ -1091,22 +1091,37 @@ static void PacketReceived(PacketCommandNG *packet) {
             } PACKED;
             struct p* payload = (struct p*) packet->data.asBytes;   
             Mifare1ksim(payload->flags, payload->exitAfter, payload->uid);
-            }
             break;
-
+        }
         // emulator
         case CMD_MIFARE_SET_DBGMODE:
             MifareSetDbgLvl(packet->data.asBytes[0]);
+            reply_ng(CMD_MIFARE_SET_DBGMODE, PM3_SUCCESS, NULL, 0);   
             break;
         case CMD_MIFARE_EML_MEMCLR:
             MifareEMemClr();
+            reply_ng(CMD_MIFARE_EML_MEMCLR, PM3_SUCCESS, NULL, 0);               
             break;
-        case CMD_MIFARE_EML_MEMSET:
-            MifareEMemSet(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
+        case CMD_MIFARE_EML_MEMSET: {
+            struct p {
+                uint8_t blockno;
+                uint8_t blockcnt;
+                uint8_t blockwidth;
+                uint8_t data[];
+            } PACKED;
+            struct p* payload = (struct p*) packet->data.asBytes;
+            MifareEMemSet(payload->blockno, payload->blockcnt, payload->blockwidth, payload->data);
             break;
-        case CMD_MIFARE_EML_MEMGET:
-            MifareEMemGet(packet->oldarg[0], packet->oldarg[1]);
+        }
+        case CMD_MIFARE_EML_MEMGET: {
+            struct p {
+                uint8_t blockno;
+                uint8_t blockcnt;
+            } PACKED;
+            struct p* payload = (struct p*) packet->data.asBytes;
+            MifareEMemGet(payload->blockno, payload->blockcnt);
             break;
+        }
         case CMD_MIFARE_EML_CARDLOAD:
             MifareECardLoad(packet->oldarg[0], packet->oldarg[1]);
             break;
diff --git a/armsrc/apps.h b/armsrc/apps.h
index 756567185..de307f6b9 100644
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -158,13 +158,16 @@ void MifareAcquireNonces(uint32_t arg0, uint32_t flags);
 void MifareChkKeys(uint8_t *datain);
 void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain);
 void MifareSetDbgLvl(uint16_t arg0);
+
 void MifareEMemClr(void);
-void MifareEMemSet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain);
-void MifareEMemGet(uint32_t arg0, uint32_t arg1);
+void MifareEMemSet(uint8_t blockno, uint8_t blockcnt, uint8_t blockwidth, uint8_t *datain);
+void MifareEMemGet(uint8_t blockno, uint8_t blockcnt);
 int MifareECardLoad(uint32_t arg0, uint32_t arg1);
+
 void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain);  // Work with "magic Chinese" card
 void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain);
 void MifareCIdent();  // is "magic chinese" card?
+
 void MifareSetMod(uint8_t *datain);
 void MifareUSetPwd(uint8_t arg0, uint8_t *datain);
 void OnSuccessMagic();
diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index c1dbaced8..8670beaca 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -1627,23 +1627,36 @@ void MifareSetDbgLvl(uint16_t arg0) {
 
 void MifareEMemClr(void) {
     FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-    emlClearMem();
+    emlClearMem(); 
 }
 
-void MifareEMemSet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain) {
+void MifareEMemSet(uint8_t blockno, uint8_t blockcnt, uint8_t blockwidth, uint8_t *datain) {
     FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-    if (arg2 == 0) arg2 = 16; // backwards compat... default bytewidth
-    emlSetMem_xt(datain, arg0, arg1, arg2); // data, block num, blocks count, block byte width
+
+    if (blockwidth == 0)
+        blockwidth = 16; // backwards compat... default bytewidth
+        
+    emlSetMem_xt(datain, blockno, blockcnt, blockwidth); // data, block num, blocks count, block byte width
 }
 
-void MifareEMemGet(uint32_t arg0, uint32_t arg1) {
+void MifareEMemGet(uint8_t blockno, uint8_t blockcnt) {
     FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-    uint8_t buf[PM3_CMD_DATA_SIZE] = {0x00};
-    emlGetMem(buf, arg0, arg1); // data, block num, blocks count (max 4)
+    
+    // 
+    size_t size = blockcnt * 16;
+    if ( size > PM3_CMD_DATA_SIZE) {
+        reply_ng(CMD_MIFARE_EML_MEMGET, PM3_EMALLOC, NULL, 0);
+        return;
+    }
+    
+    uint8_t *buf = BigBuf_malloc(size);
+    
+    emlGetMem(buf, blockno, blockcnt); // data, block num, blocks count (max 4)
 
     LED_B_ON();
-    reply_old(CMD_ACK, arg0, arg1, 0, buf, PM3_CMD_DATA_SIZE);
+    reply_ng(CMD_MIFARE_EML_MEMGET, PM3_SUCCESS, buf, size);
     LED_B_OFF();
+    BigBuf_free_keep_EM();
 }
 
 //-----------------------------------------------------------------------------
diff --git a/armsrc/mifareutil.c b/armsrc/mifareutil.c
index 306f7a14e..18c710733 100644
--- a/armsrc/mifareutil.c
+++ b/armsrc/mifareutil.c
@@ -1,4 +1,3 @@
-//-----------------------------------------------------------------------------
 // Merlok, May 2011, 2012
 // Many authors, whom made it possible
 //
@@ -530,9 +529,9 @@ void emlGetMem(uint8_t *data, int blockNum, int blocksCount) {
     memcpy(data, emCARD + blockNum * 16, blocksCount * 16);
 }
 
-void emlGetMemBt(uint8_t *data, int bytePtr, int byteCount) {
+void emlGetMemBt(uint8_t *data, int offset, int byteCount) {
     uint8_t *emCARD = BigBuf_get_EM_addr();
-    memcpy(data, emCARD + bytePtr, byteCount);
+    memcpy(data, emCARD + offset, byteCount);
 }
 
 int emlCheckValBl(int blockNum) {
diff --git a/armsrc/mifareutil.h b/armsrc/mifareutil.h
index 110f41eaa..a2086c5e7 100644
--- a/armsrc/mifareutil.h
+++ b/armsrc/mifareutil.h
@@ -108,7 +108,7 @@ void emlClearMem(void);
 void emlSetMem(uint8_t *data, int blockNum, int blocksCount);
 void emlSetMem_xt(uint8_t *data, int blockNum, int blocksCount, int blockBtWidth);
 void emlGetMem(uint8_t *data, int blockNum, int blocksCount);
-void emlGetMemBt(uint8_t *data, int bytePtr, int byteCount);
+void emlGetMemBt(uint8_t *data, int offset, int byteCount);
 uint64_t emlGetKey(int sectorNum, int keyType);
 int emlGetValBl(uint32_t *blReg, uint8_t *blBlock, int blockNum);
 int emlSetValBl(uint32_t blReg, uint8_t blBlock, int blockNum);
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 6f5ce0bcc..1f3d5a66e 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -2514,21 +2514,17 @@ void printKeyTable(uint8_t sectorscnt, sector_t *e_sector) {
 
 // EMULATOR COMMANDS
 static int CmdHF14AMfEGet(const char *Cmd) {
-    uint8_t blockNo = 0;
-    uint8_t data[16] = {0x00};
     char c = tolower(param_getchar(Cmd, 0));
-
     if (strlen(Cmd) < 1 || c == 'h') return usage_hf14_eget();
 
-    blockNo = param_get8(Cmd, 0);
+    uint8_t data[16] = {0x00};
+    uint8_t blockNo = param_get8(Cmd, 0);
 
     PrintAndLogEx(NORMAL, "");
-    if (!mfEmlGetMem(data, blockNo, 1)) {
+    if (mfEmlGetMem(data, blockNo, 1) == PM3_SUCCESS) {
         PrintAndLogEx(NORMAL, "data[%3d]:%s", blockNo, sprint_hex(data, sizeof(data)));
-    } else {
-        PrintAndLogEx(WARNING, "Command execute timeout");
     }
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdHF14AMfEClear(const char *Cmd) {
@@ -2537,23 +2533,22 @@ static int CmdHF14AMfEClear(const char *Cmd) {
 
     clearCommandBuffer();
     SendCommandNG(CMD_MIFARE_EML_MEMCLR, NULL, 0);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdHF14AMfESet(const char *Cmd) {
     char c = tolower(param_getchar(Cmd, 0));
-    uint8_t memBlock[16];
-    uint8_t blockNo = 0;
-    memset(memBlock, 0x00, sizeof(memBlock));
-
     if (strlen(Cmd) < 3 || c == 'h')
         return usage_hf14_eset();
+        
+    uint8_t memBlock[16];
+    memset(memBlock, 0x00, sizeof(memBlock));
 
-    blockNo = param_get8(Cmd, 0);
+    uint8_t blockNo = param_get8(Cmd, 0);
 
     if (param_gethex(Cmd, 1, memBlock, 32)) {
         PrintAndLogEx(WARNING, "block data must include 32 HEX symbols");
-        return 1;
+        return PM3_ESOFT;
     }
 
     //  1 - blocks count
diff --git a/client/mifare/mifarehost.c b/client/mifare/mifarehost.c
index 2fa5b0775..076d3f092 100644
--- a/client/mifare/mifarehost.c
+++ b/client/mifare/mifarehost.c
@@ -445,12 +445,33 @@ int mfReadSector(uint8_t sectorNo, uint8_t keyType, uint8_t *key, uint8_t *data)
 
 // EMULATOR
 int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount) {
+
+    size_t size = blocksCount * 16;
+    if (size > PM3_CMD_DATA_SIZE) {
+        return PM3_ESOFT;
+    }
+
+    struct {
+        uint8_t blockno;
+        uint8_t blockcnt;
+    } PACKED payload;
+      
+    payload.blockno = blockNum;
+    payload.blockcnt = blocksCount;
+    
     clearCommandBuffer();
-    SendCommandMIX(CMD_MIFARE_EML_MEMGET, blockNum, blocksCount, 0, NULL, 0);
+    SendCommandNG(CMD_MIFARE_EML_MEMGET, (uint8_t*)&payload, sizeof(payload));
+    
     PacketResponseNG resp;
-    if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return PM3_ETIMEOUT;
-    memcpy(data, resp.data.asBytes, blocksCount * 16);
-    return PM3_SUCCESS;
+    if (WaitForResponseTimeout(CMD_MIFARE_EML_MEMGET, &resp, 1500) == 0) {
+        PrintAndLogEx(WARNING, "Command execute timeout");
+        return PM3_ETIMEOUT;
+    }
+
+    if (resp.status == PM3_SUCCESS)
+        memcpy(data, resp.data.asBytes, size);
+
+    return resp.status;
 }
 
 int mfEmlSetMem(uint8_t *data, int blockNum, int blocksCount) {
@@ -458,8 +479,27 @@ int mfEmlSetMem(uint8_t *data, int blockNum, int blocksCount) {
 }
 
 int mfEmlSetMem_xt(uint8_t *data, int blockNum, int blocksCount, int blockBtWidth) {
+    
+    struct p {
+        uint8_t blockno;
+        uint8_t blockcnt;
+        uint8_t blockwidth;
+        uint8_t data[];
+    } PACKED;
+    
+    size_t size = blocksCount * blockBtWidth;
+    if (size > (PM3_CMD_DATA_SIZE - sizeof(struct p))) {
+        return PM3_ESOFT;
+    }
+
+    struct p *payload = calloc(1, sizeof(struct p) + size);
+    payload->blockno = blockNum;
+    payload->blockcnt = blocksCount;
+    payload->blockwidth = blockBtWidth;
+    memcpy(payload->data, data, size);
+   
     clearCommandBuffer();
-    SendCommandOLD(CMD_MIFARE_EML_MEMSET, blockNum, blocksCount, blockBtWidth, data, blocksCount * blockBtWidth);
+    SendCommandNG(CMD_MIFARE_EML_MEMSET, (uint8_t*)payload, sizeof(payload) + size );
     return PM3_SUCCESS;
 }
 

From 548d6429ed459549dfdc95806f06eaa86c11cde0 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 27 May 2019 09:15:53 -0400
Subject: [PATCH 1851/1938] return codes

---
 client/cliparser/cliparser.h |   8 +-
 client/cmdhfmf.c             | 162 ++++++++++++++++++-----------------
 2 files changed, 86 insertions(+), 84 deletions(-)

diff --git a/client/cliparser/cliparser.h b/client/cliparser/cliparser.h
index 66a800f61..7da509757 100644
--- a/client/cliparser/cliparser.h
+++ b/client/cliparser/cliparser.h
@@ -28,10 +28,10 @@
 #define arg_strx1(shortopts, longopts, datatype, glossary) (arg_strn((shortopts), (longopts), (datatype), 1, 250, (glossary)))
 #define arg_strx0(shortopts, longopts, datatype, glossary) (arg_strn((shortopts), (longopts), (datatype), 0, 250, (glossary)))
 
-#define CLIExecWithReturn(cmd, atbl, ifempty) if (CLIParserParseString(cmd, atbl, arg_getsize(atbl), ifempty)){CLIParserFree();return 0;}
-#define CLIGetHexBLessWithReturn(paramnum, data, datalen, delta) if (CLIParamHexToBuf(arg_get_str(paramnum), data, sizeof(data) - (delta), datalen)) {CLIParserFree();return 1;}
-#define CLIGetHexWithReturn(paramnum, data, datalen) if (CLIParamHexToBuf(arg_get_str(paramnum), data, sizeof(data), datalen)) {CLIParserFree();return 1;}
-#define CLIGetStrWithReturn(paramnum, data, datalen) if (CLIParamStrToBuf(arg_get_str(paramnum), data, sizeof(data), datalen)) {CLIParserFree();return 1;}
+#define CLIExecWithReturn(cmd, atbl, ifempty) if (CLIParserParseString(cmd, atbl, arg_getsize(atbl), ifempty)){CLIParserFree();return PM3_ESOFT;}
+#define CLIGetHexBLessWithReturn(paramnum, data, datalen, delta) if (CLIParamHexToBuf(arg_get_str(paramnum), data, sizeof(data) - (delta), datalen)) {CLIParserFree();return PM3_ESOFT;}
+#define CLIGetHexWithReturn(paramnum, data, datalen) if (CLIParamHexToBuf(arg_get_str(paramnum), data, sizeof(data), datalen)) {CLIParserFree();return PM3_ESOFT;}
+#define CLIGetStrWithReturn(paramnum, data, datalen) if (CLIParamStrToBuf(arg_get_str(paramnum), data, sizeof(data), datalen)) {CLIParserFree();return PM3_ESOFT;}
 
 int CLIParserInit(const char *vprogramName, const char *vprogramHint, const char *vprogramHelp);
 int CLIParserParseString(const char *str, void *vargtable[], size_t vargtableLen, bool allowEmptyExec);
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 1f3d5a66e..874005e34 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -1781,7 +1781,7 @@ out:
     free(keyBlock);
     free(e_sector);
     PrintAndLogEx(NORMAL, "");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdHF14AMfChk(const char *Cmd) {
@@ -1808,7 +1808,7 @@ static int CmdHF14AMfChk(const char *Cmd) {
     int i, keycnt = 0;
 
     keyBlock = calloc(MIFARE_DEFAULTKEYS_SIZE, 6);
-    if (keyBlock == NULL) return 1;
+    if (keyBlock == NULL) return PM3_EMALLOC;
 
     for (int cnt = 0; cnt < MIFARE_DEFAULTKEYS_SIZE; cnt++)
         num_to_bytes(g_mifare_default_keys[cnt], 6, (uint8_t *)(keyBlock + cnt * 6));
@@ -1837,7 +1837,7 @@ static int CmdHF14AMfChk(const char *Cmd) {
             default:
                 PrintAndLogEx(FAILED, "Key type must be A , B or ?");
                 free(keyBlock);
-                return 1;
+                return PM3_ESOFT;
         };
     }
 
@@ -1858,7 +1858,7 @@ static int CmdHF14AMfChk(const char *Cmd) {
                 if (!p) {
                     PrintAndLogEx(FAILED, "cannot allocate memory for Keys");
                     free(keyBlock);
-                    return 2;
+                    return PM3_EMALLOC;
                 }
                 keyBlock = p;
             }
@@ -1903,7 +1903,7 @@ static int CmdHF14AMfChk(const char *Cmd) {
                         PrintAndLogEx(FAILED, "Cannot allocate memory for defKeys");
                         free(keyBlock);
                         fclose(f);
-                        return 2;
+                        return PM3_EMALLOC;
                     }
                     keyBlock = p;
                 }
@@ -1930,7 +1930,7 @@ static int CmdHF14AMfChk(const char *Cmd) {
     e_sector = calloc(SectorsCnt, sizeof(sector_t));
     if (e_sector == NULL) {
         free(keyBlock);
-        return 1;
+        return PM3_EMALLOC;
     }
 
     // empty e_sector
@@ -2048,13 +2048,12 @@ out:
     SendCommandNG(CMD_PING, NULL, 0);
     WaitForResponseTimeout(CMD_PING, NULL, 1000);
 
-
     if (createDumpFile) {
         fptr = GenerateFilename("hf-mf-", "-key.bin");
         if (fptr == NULL) {
             free(keyBlock);
             free(e_sector);
-            return 1;
+            return PM3_EFILE;
         }
 
         FILE *fkeys = fopen(fptr, "wb");
@@ -2062,7 +2061,7 @@ out:
             PrintAndLogEx(WARNING, "Could not create file " _YELLOW_("%s"), fptr);
             free(keyBlock);
             free(e_sector);
-            return 1;
+            return PM3_EFILE;
         }
         PrintAndLogEx(INFO, "Printing keys to binary file " _YELLOW_("%s")"...", fptr);
 
@@ -2081,7 +2080,7 @@ out:
     free(keyBlock);
     free(e_sector);
     PrintAndLogEx(NORMAL, "");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 sector_t *k_sector = NULL;
@@ -2279,7 +2278,7 @@ static int CmdHF14AMfSim(const char *Cmd) {
         }
         showSectorTable();
     }
-    return 0;
+    return PM3_SUCCESS;
 }
 /*
 static int CmdHF14AMfSniff(const char *Cmd) {
@@ -2439,7 +2438,7 @@ static int CmdHF14AMfSniff(const char *Cmd) {
     } // while (true)
 
     free(buf);
-    return 0;
+    return PM3_SUCCESS;
 }
 */
 int CmdHF14AMfDbg(const char *Cmd) {
@@ -2451,7 +2450,7 @@ int CmdHF14AMfDbg(const char *Cmd) {
     if (dbgMode > 4) return usage_hf14_dbg();
 
     SendCommandNG(CMD_MIFARE_SET_DBGMODE, &dbgMode, 1);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdHF14AMfKeyBrute(const char *Cmd) {
@@ -2482,7 +2481,7 @@ static int CmdHF14AMfKeyBrute(const char *Cmd) {
 
     t1 = msclock() - t1;
     PrintAndLogEx(SUCCESS, "\ntime in keybrute: %.0f seconds\n", (float)t1 / 1000.0);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 void printKeyTable(uint8_t sectorscnt, sector_t *e_sector) {
@@ -2602,14 +2601,14 @@ int CmdHF14AMfELoad(const char *Cmd) {
     int res = loadFileEML(filename, data, &datalen);
     if (res) {
         free(data);
-        return 1;
+        return PM3_EFILE;
     }
 
     // 64 or 256 blocks.
     if ((datalen % blockWidth) != 0) {
         PrintAndLogEx(FAILED, "File content error. Size doesn't match blockwidth ");
         free(data);
-        return 2;
+        return PM3_ESOFT;
     }
 
     // convert old mfu format to new
@@ -2636,7 +2635,7 @@ int CmdHF14AMfELoad(const char *Cmd) {
         if (mfEmlSetMem_xt(data + counter, blockNum, 1, blockWidth)) {
             PrintAndLogEx(FAILED, "Cant set emul block: %3d", blockNum);
             free(data);
-            return 3;
+            return PM3_ESOFT;
         }
         printf(".");
         fflush(stdout);
@@ -2652,18 +2651,18 @@ int CmdHF14AMfELoad(const char *Cmd) {
         if ((blockNum != numBlocks)) {
             PrintAndLogEx(FAILED, "Warning, Ultralight/Ntag file content, Loaded %d blocks into emulator memory", blockNum);
             free(data);
-            return 0;
+            return PM3_SUCCESS;
         }
     } else {
         if ((blockNum != numBlocks)) {
             PrintAndLogEx(FAILED, "Error, file content, Only loaded %d blocks, must be %d blocks into emulator memory", blockNum, numBlocks);
             free(data);
-            return 4;
+            return PM3_SUCCESS;
         }
     }
     PrintAndLogEx(SUCCESS, "Loaded %d blocks from file: " _YELLOW_("%s"), blockNum, filename);
     free(data);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdHF14AMfESave(const char *Cmd) {
@@ -2690,7 +2689,7 @@ static int CmdHF14AMfESave(const char *Cmd) {
     dump = calloc(bytes, sizeof(uint8_t));
     if (!dump) {
         PrintAndLogEx(WARNING, "Fail, cannot allocate memory");
-        return 1;
+        return PM3_EMALLOC;
     }
     memset(dump, 0, bytes);
 
@@ -2698,7 +2697,7 @@ static int CmdHF14AMfESave(const char *Cmd) {
     if (!GetFromDevice(BIG_BUF_EML, dump, bytes, 0, NULL, 2500, false)) {
         PrintAndLogEx(WARNING, "Fail, transfer from device time-out");
         free(dump);
-        return 2;
+        return PM3_ETIMEOUT;
     }
 
     len = param_getstr(Cmd, nameParamNo, filename, sizeof(filename));
@@ -2714,7 +2713,7 @@ static int CmdHF14AMfESave(const char *Cmd) {
     saveFileEML(filename, dump, bytes, MFBLOCK_SIZE);
     saveFileJSON(filename, jsfCardMemory, dump, bytes);
     free(dump);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdHF14AMfECFill(const char *Cmd) {
@@ -2727,7 +2726,7 @@ static int CmdHF14AMfECFill(const char *Cmd) {
 
     if (c != 'a' &&  c != 'b') {
         PrintAndLogEx(WARNING, "Key type must be A or B");
-        return 1;
+        return PM3_ESOFT;
     }
     if (c != 'a')
         keyType = 1;
@@ -2743,7 +2742,7 @@ static int CmdHF14AMfECFill(const char *Cmd) {
     PrintAndLogEx(NORMAL, "--params: numSectors: %d, keyType: %c\n", numSectors, (keyType == 0) ? 'A' : 'B');
     clearCommandBuffer();
     SendCommandMIX(CMD_MIFARE_EML_CARDLOAD, numSectors, keyType, 0, NULL, 0);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdHF14AMfEKeyPrn(const char *Cmd) {
@@ -2767,7 +2766,7 @@ static int CmdHF14AMfEKeyPrn(const char *Cmd) {
     PrintAndLogEx(NORMAL, "|sec|key A           |key B           |");
     PrintAndLogEx(NORMAL, "|---|----------------|----------------|");
     for (i = 0; i < numSectors; i++) {
-        if (mfEmlGetMem(data, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1)) {
+        if (mfEmlGetMem(data, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1) != PM3_SUCCESS) {
             PrintAndLogEx(WARNING, "error get block %d", FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1);
             break;
         }
@@ -2776,7 +2775,7 @@ static int CmdHF14AMfEKeyPrn(const char *Cmd) {
         PrintAndLogEx(NORMAL, "|%03d|  %012" PRIx64 "  |  %012" PRIx64 "  |", i, keyA, keyB);
     }
     PrintAndLogEx(NORMAL, "|---|----------------|----------------|");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 // CHINESE MAGIC COMMANDS
@@ -2808,12 +2807,12 @@ static int CmdHF14AMfCSetUID(const char *Cmd) {
         if (param_getchar(Cmd, argi)) {
             if (param_gethex(Cmd, argi, atqa, 4)) {
                 PrintAndLogEx(WARNING, "ATQA must include 4 HEX symbols");
-                return 1;
+                return PM3_ESOFT;
             }
             argi++;
             if (!param_getchar(Cmd, argi) || param_gethex(Cmd, argi, sak, 2)) {
                 PrintAndLogEx(WARNING, "SAK must include 2 HEX symbols");
-                return 1;
+                return PM3_ESOFT;
             }
             argi++;
         } else
@@ -2832,12 +2831,12 @@ static int CmdHF14AMfCSetUID(const char *Cmd) {
     res = mfCSetUID(uid, (atqaPresent) ? atqa : NULL, (atqaPresent) ? sak : NULL, oldUid, wipeCard);
     if (res) {
         PrintAndLogEx(WARNING, "Can't set UID. error=%d", res);
-        return 1;
+        return PM3_ESOFT;
     }
 
     PrintAndLogEx(SUCCESS, "old UID:%s", sprint_hex(oldUid, 4));
     PrintAndLogEx(SUCCESS, "new UID:%s", sprint_hex(uid, 4));
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdHF14AMfCSetBlk(const char *Cmd) {
@@ -2862,9 +2861,9 @@ static int CmdHF14AMfCSetBlk(const char *Cmd) {
     res = mfCSetBlock(blockNo, block, NULL, params);
     if (res) {
         PrintAndLogEx(WARNING, "Can't write block. error=%d", res);
-        return 1;
+        return PM3_ESOFT;
     }
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdHF14AMfCLoad(const char *Cmd) {
@@ -2900,17 +2899,22 @@ static int CmdHF14AMfCLoad(const char *Cmd) {
 
             if (mfCSetBlock(blockNum, buf8, NULL, flags)) {
                 PrintAndLogEx(WARNING, "Cant set magic card block: %d", blockNum);
-                return 3;
+                return PM3_ESOFT;
             }
             printf(".");
             fflush(stdout);
         }
         PrintAndLogEx(NORMAL, "\n");
-        return 0;
+        return PM3_SUCCESS;
     }
 
     size_t maxdatalen = 4096;
     uint8_t *data = calloc(maxdatalen, sizeof(uint8_t));
+    if (!data) {
+        PrintAndLogEx(WARNING, "Fail, cannot allocate memory");
+        return PM3_EMALLOC;
+    }
+    
     size_t datalen = 0;
     int res = 0;
     if (fillFromBin) {
@@ -2926,17 +2930,14 @@ static int CmdHF14AMfCLoad(const char *Cmd) {
     if (res) {
         if (data)
             free(data);
-        return 1;
+        return PM3_EFILE;
     }
 
-//  PrintAndLogEx(INFO, "DATA | %s", sprint_hex(data+1000, 24) );
-
-
     // 64 or 256blocks.
     if (datalen != 1024 && datalen != 4096) {
         PrintAndLogEx(WARNING, "File content error. ");
         free(data);
-        return 2;
+        return PM3_EFILE;
     }
 
     PrintAndLogEx(INFO, "Copying to magic card");
@@ -2956,7 +2957,7 @@ static int CmdHF14AMfCLoad(const char *Cmd) {
         if (mfCSetBlock(blockNum, data + (16 * blockNum), NULL, flags)) {
             PrintAndLogEx(WARNING, "Can't set magic card block: %d", blockNum);
             free(data);
-            return 3;
+            return PM3_ESOFT;
         }
 
         datalen -= 16;
@@ -2974,19 +2975,18 @@ static int CmdHF14AMfCLoad(const char *Cmd) {
     if (blockNum != 16 * 4 && blockNum != 32 * 4 + 8 * 16) {
         PrintAndLogEx(WARNING, "File content error. There must be 64 blocks");
         free(data);
-        return 4;
+        return PM3_EFILE;
     }
 
     PrintAndLogEx(SUCCESS, "Card loaded %d blocks from file", blockNum);
     free(data);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdHF14AMfCGetBlk(const char *Cmd) {
     uint8_t data[16] = {0};
     uint8_t blockNo = 0;
     int res;
-    memset(data, 0x00, sizeof(data));
 
     char ctmp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) < 1 || ctmp == 'h') return usage_hf14_cgetblk();
@@ -2998,7 +2998,7 @@ static int CmdHF14AMfCGetBlk(const char *Cmd) {
     res = mfCGetBlock(blockNo, data, MAGIC_SINGLE);
     if (res) {
         PrintAndLogEx(WARNING, "Can't read block. error=%d", res);
-        return 1;
+        return PM3_ESOFT;
     }
 
     PrintAndLogEx(NORMAL, "data: %s", sprint_hex(data, sizeof(data)));
@@ -3016,7 +3016,7 @@ static int CmdHF14AMfCGetBlk(const char *Cmd) {
         PrintAndLogEx(NORMAL, "UserData: %s", sprint_hex_inrow(&data[9], 1));
     }
 
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdHF14AMfCGetSc(const char *Cmd) {
@@ -3030,7 +3030,7 @@ static int CmdHF14AMfCGetSc(const char *Cmd) {
     sector = param_get8(Cmd, 0);
     if (sector > 39) {
         PrintAndLogEx(WARNING, "Sector number must be less then 40");
-        return 1;
+        return PM3_ESOFT;
     }
 
     PrintAndLogEx(NORMAL, "\n  # | data    |  Sector | %02d/ 0x%02X ", sector, sector);
@@ -3051,11 +3051,11 @@ static int CmdHF14AMfCGetSc(const char *Cmd) {
         res = mfCGetBlock(start + i, data, flags);
         if (res) {
             PrintAndLogEx(WARNING, "Can't read block. %d error=%d", start + i, res);
-            return 1;
+            return PM3_ESOFT;
         }
         PrintAndLogEx(NORMAL, "%3d | %s", start + i, sprint_hex(data, 16));
     }
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdHF14AMfCSave(const char *Cmd) {
@@ -3119,9 +3119,8 @@ static int CmdHF14AMfCSave(const char *Cmd) {
     dump = calloc(bytes, sizeof(uint8_t));
     if (!dump) {
         PrintAndLogEx(WARNING, "Fail, cannot allocate memory");
-        return 1;
+        return PM3_EMALLOC;
     }
-    memset(dump, 0, bytes);
 
     flags = MAGIC_INIT + MAGIC_WUPC;
     for (i = 0; i < numblocks; i++) {
@@ -3131,7 +3130,7 @@ static int CmdHF14AMfCSave(const char *Cmd) {
         if (mfCGetBlock(i, dump + (i * MFBLOCK_SIZE), flags)) {
             PrintAndLogEx(WARNING, "Cant get block: %d", i);
             free(dump);
-            return 2;
+            return PM3_ESOFT;
         }
     }
 
@@ -3163,7 +3162,7 @@ static int CmdHF14AMfCSave(const char *Cmd) {
     saveFileEML(filename, dump, bytes, MFBLOCK_SIZE);
     saveFileJSON(filename, jsfCardMemory, dump, bytes);
     free(dump);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 //needs nt, ar, at, Data to decrypt
@@ -3179,7 +3178,7 @@ static int CmdHf14AMfDecryptBytes(const char *Cmd) {
     int len = param_getlength(Cmd, 3);
     if (len & 1) {
         PrintAndLogEx(WARNING, "Uneven hex string length. LEN=%d", len);
-        return 1;
+        return PM3_ESOFT;
     }
 
     PrintAndLogEx(NORMAL, "nt\t%08X", nt);
@@ -3187,11 +3186,16 @@ static int CmdHf14AMfDecryptBytes(const char *Cmd) {
     PrintAndLogEx(NORMAL, "at enc\t%08X", at_enc);
 
     uint8_t *data = calloc(len, sizeof(uint8_t));
+    if (!data) {
+        PrintAndLogEx(WARNING, "Fail, cannot allocate memory");
+        return PM3_EMALLOC;
+    }
+    
     param_gethex_ex(Cmd, 3, data, &len);
     len >>= 1;
     tryDecryptWord(nt, ar_enc, at_enc, data, len);
     free(data);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdHf14AMfSetMod(const char *Cmd) {
@@ -3210,7 +3214,7 @@ static int CmdHf14AMfSetMod(const char *Cmd) {
         PrintAndLogEx(NORMAL, "Usage: hf mf setmod <0|1> <block 0 key A>");
         PrintAndLogEx(NORMAL, "       0 = normal modulation");
         PrintAndLogEx(NORMAL, "       1 = strong modulation (default)");
-        return 1;
+        return PM3_ESOFT;
     }
 
     uint8_t data[7];
@@ -3237,16 +3241,15 @@ static int CmdHf14AMfSetMod(const char *Cmd) {
 // Mifare NACK bug detection
 static int CmdHf14AMfNack(const char *Cmd) {
 
-    bool verbose = false;
     char ctmp = tolower(param_getchar(Cmd, 0));
     if (ctmp == 'h') return usage_hf14_nack();
-    if (ctmp == 'v') verbose = true;
+    bool verbose = (ctmp == 'v');
 
     if (verbose)
         PrintAndLogEx(INFO, "Started testing card for NACK bug. Press key to abort");
 
     detect_classic_nackbug(verbose);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdHF14AMfice(const char *Cmd) {
@@ -3284,7 +3287,7 @@ static int CmdHF14AMfice(const char *Cmd) {
             default:
                 PrintAndLogEx(WARNING, "Unknown parameter '%c'\n", ctmp);
                 usage_hf14_ice();
-                return 1;
+                return PM3_ESOFT;
         }
         cmdp++;
     }
@@ -3292,15 +3295,15 @@ static int CmdHF14AMfice(const char *Cmd) {
     if (filename[0] == '\0') {
         fptr = GenerateFilename("hf-mf-", "-nonces.bin");
         if (fptr == NULL)
-            return 1;
+            return PM3_EFILE;
         strcpy(filename, fptr);
     }
 
-    PrintAndLogEx(NORMAL, "Collecting %u nonces \n", limit);
+    PrintAndLogEx(NORMAL, "Collecting "_YELLOW_("%u")"nonces \n", limit);
 
     if ((fnonces = fopen(filename, "wb")) == NULL) {
         PrintAndLogEx(WARNING, "Could not create file " _YELLOW_("%s"), filename);
-        return 3;
+        return PM3_EFILE;
     }
 
     clearCommandBuffer();
@@ -3352,7 +3355,7 @@ out:
 
     clearCommandBuffer();
     SendCommandMIX(CMD_MIFARE_ACQUIRE_NONCES, blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, 4, NULL, 0);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdHF14AMfAuth4(const char *Cmd) {
@@ -3380,12 +3383,12 @@ static int CmdHF14AMfAuth4(const char *Cmd) {
 
     if (keynlen != 2) {
         PrintAndLogEx(ERR, "<Key Num> must be 2 bytes long instead of: %d", keynlen);
-        return 1;
+        return PM3_ESOFT;
     }
 
     if (keylen != 16) {
         PrintAndLogEx(ERR, "<Key Value> must be 16 bytes long instead of: %d", keylen);
-        return 1;
+        return PM3_ESOFT;
     }
 
     return MifareAuth4(NULL, keyn, key, true, false, true);
@@ -3427,7 +3430,7 @@ static int CmdHF14AMfMAD(const char *Cmd) {
     uint8_t sector10[16 * 4] = {0};
     if (mfReadSector(MF_MAD1_SECTOR, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector0)) {
         PrintAndLogEx(ERR, "read sector 0 error. card don't have MAD or don't have MAD on default keys.");
-        return 2;
+        return PM3_ESOFT;
     }
 
     if (verbose) {
@@ -3441,7 +3444,7 @@ static int CmdHF14AMfMAD(const char *Cmd) {
     if (haveMAD2) {
         if (mfReadSector(MF_MAD2_SECTOR, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector10)) {
             PrintAndLogEx(ERR, "read sector 0x10 error. card don't have MAD or don't have MAD on default keys.");
-            return 2;
+            return PM3_ESOFT;
         }
 
         MAD2DecodeAndPrint(sector10, verbose);
@@ -3455,7 +3458,7 @@ static int CmdHF14AMfMAD(const char *Cmd) {
         size_t madlen = 0;
         if (MADDecode(sector0, sector10, mad, &madlen)) {
             PrintAndLogEx(ERR, "can't decode mad.");
-            return 10;
+            return PM3_ESOFT;
         }
 
         uint8_t akey[6] = {0};
@@ -3470,7 +3473,7 @@ static int CmdHF14AMfMAD(const char *Cmd) {
                 if (mfReadSector(i + 1, keyB ? MF_KEY_B : MF_KEY_A, akey, vsector)) {
                     PrintAndLogEx(NORMAL, "");
                     PrintAndLogEx(ERR, "read sector %d error.", i + 1);
-                    return 2;
+                    return PM3_ESOFT;
                 }
 
                 for (int j = 0; j < (verbose ? 4 : 3); j ++)
@@ -3479,7 +3482,7 @@ static int CmdHF14AMfMAD(const char *Cmd) {
         }
     }
 
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdHFMFNDEF(const char *Cmd) {
@@ -3530,7 +3533,7 @@ static int CmdHFMFNDEF(const char *Cmd) {
 
     if (mfReadSector(MF_MAD1_SECTOR, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector0)) {
         PrintAndLogEx(ERR, "read sector 0 error. card don't have MAD or don't have MAD on default keys.");
-        return 2;
+        return PM3_ESOFT;
     }
 
     bool haveMAD2 = false;
@@ -3543,7 +3546,7 @@ static int CmdHFMFNDEF(const char *Cmd) {
     if (haveMAD2) {
         if (mfReadSector(MF_MAD2_SECTOR, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector10)) {
             PrintAndLogEx(ERR, "read sector 0x10 error. card don't have MAD or don't have MAD on default keys.");
-            return 2;
+            return PM3_ESOFT;
         }
     }
 
@@ -3551,7 +3554,7 @@ static int CmdHFMFNDEF(const char *Cmd) {
     size_t madlen = 0;
     if (MADDecode(sector0, (haveMAD2 ? sector10 : NULL), mad, &madlen)) {
         PrintAndLogEx(ERR, "can't decode mad.");
-        return 10;
+        return PM3_ESOFT;
     }
 
     printf("data reading:");
@@ -3560,7 +3563,7 @@ static int CmdHFMFNDEF(const char *Cmd) {
             uint8_t vsector[16 * 4] = {0};
             if (mfReadSector(i + 1, keyB ? MF_KEY_B : MF_KEY_A, ndefkey, vsector)) {
                 PrintAndLogEx(ERR, "read sector %d error.", i + 1);
-                return 2;
+                return PM3_ESOFT;
             }
 
             memcpy(&data[datalen], vsector, 16 * 3);
@@ -3573,7 +3576,7 @@ static int CmdHFMFNDEF(const char *Cmd) {
 
     if (!datalen) {
         PrintAndLogEx(ERR, "no NDEF data.");
-        return 11;
+        return PM3_SUCCESS;
     }
 
     if (verbose2) {
@@ -3583,13 +3586,12 @@ static int CmdHFMFNDEF(const char *Cmd) {
 
     NDEFDecodeAndPrint(data, datalen, verbose);
 
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdHF14AMfList(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
-    CmdTraceList("mf");
-    return 0;
+    return CmdTraceList("mf");
 }
 
 static command_t CommandTable[] = {
@@ -3640,7 +3642,7 @@ static command_t CommandTable[] = {
 static int CmdHelp(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 int CmdHFMF(const char *Cmd) {

From 30f10f787d39626b49733e9ed7c3cc8e0f4dcce7 Mon Sep 17 00:00:00 2001
From: Iceman <iceman@iuse.se>
Date: Mon, 27 May 2019 17:26:20 +0200
Subject: [PATCH 1852/1938] Update bt_manual_v10.md

added images
---
 doc/bt_manual_v10.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/bt_manual_v10.md b/doc/bt_manual_v10.md
index 97ac28804..79b5c1acb 100644
--- a/doc/bt_manual_v10.md
+++ b/doc/bt_manual_v10.md
@@ -37,6 +37,9 @@ Built-in battery can support standalone mode, off-line sniffing, off-line readin
 *	Tear off the blue film of heat conductive double-sided tape. Align the add-on to the hole positions and gently insert it into the case.
 *	Assembly finished!
 
+<p align='center'>
+<img src="http://www.icedev.se/proxmark3/blueshark/addon_open_1.jpg" alt="Image of blue shark add-on open fit" width="300"><img src="http://www.icedev.se/proxmark3/blueshark/addon_fitted_1.jpg" alt="Image of blue shark add-on fitted" width="300">
+</p>
 
 ### 4.	CONNECT WITH BLUETOOTH
 
@@ -102,6 +105,8 @@ turn on solid.
 ```sh
 ./proxmark /dev/ttyUSB0
 ```
+<p align='center'>
+<img src="http://www.icedev.se/proxmark3/blueshark/addon_hc06_dongle_1.jpg" alt="Image of blue shark add-on HC-06 white dongle" width="300"></p>
 
 ### 5. Compiling / Flashing 
 Please download the latest source code from Rfid Research Group's Github repo:

From 74fb740c2102e4f59cb2af70e0e2539bcf7f3482 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 28 May 2019 05:15:12 -0400
Subject: [PATCH 1853/1938] fix: lf em 4x05 - use correct paritytest
 (@marshmellow)\nchg: lf em 4x05_read\n chg: lf em 4x05_write - uses NG

---
 armsrc/appmain.c    | 23 +++++++++++++---
 armsrc/apps.h       |  4 ++-
 armsrc/lfops.c      | 29 ++++++++++++--------
 client/cmddata.c    |  7 +++--
 client/cmdlfem4x.c  | 67 ++++++++++++++++++++++++++++++---------------
 client/cmdlft55xx.c | 16 +++++------
 common/lfdemod.c    | 33 ++++++++++++----------
 common/lfdemod.h    |  2 +-
 8 files changed, 115 insertions(+), 66 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index fe947ce08..f8b675fa0 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -884,12 +884,27 @@ static void PacketReceived(PacketCommandNG *packet) {
                 packet->oldarg[2]
             );
             break;
-        case CMD_EM4X_READ_WORD:
-            EM4xReadWord(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2]);
+        case CMD_EM4X_READ_WORD: {
+           struct p {
+                uint32_t password;
+                uint8_t address;
+                uint8_t usepwd;
+            } PACKED;
+            struct p* payload = (struct p*) packet->data.asBytes;
+            EM4xReadWord(payload->address, payload->password, payload->usepwd);
             break;
-        case CMD_EM4X_WRITE_WORD:
-            EM4xWriteWord(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2]);
+            }
+        case CMD_EM4X_WRITE_WORD: {
+           struct p {
+                uint32_t password;
+                uint32_t data;
+                uint8_t address;
+                uint8_t usepwd;
+            } PACKED;
+            struct p* payload = (struct p*) packet->data.asBytes;
+            EM4xWriteWord(payload->address, payload->data, payload->password, payload->usepwd);
             break;
+            }
         case CMD_AWID_DEMOD_FSK:  {
             uint32_t high, low;
             // Set realtime AWID demodulation
diff --git a/armsrc/apps.h b/armsrc/apps.h
index de307f6b9..a5866ebd5 100644
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -110,8 +110,10 @@ void T55xxWakeUp(uint32_t Pwd);
 void T55xx_ChkPwds(void);
 
 void TurnReadLFOn(uint32_t delay);
+
 void EM4xReadWord(uint8_t addr, uint32_t pwd, uint8_t usepwd);
-void EM4xWriteWord(uint32_t flag, uint32_t data, uint32_t pwd);
+void EM4xWriteWord(uint8_t addr, uint32_t data, uint32_t pwd, uint8_t usepwd);
+
 void Cotag(uint32_t arg0);
 void setT55xxConfig(uint8_t arg0, t55xx_config *c);
 t55xx_config *getT55xxConfig(void);
diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index f52226181..a45c20d16 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -901,6 +901,12 @@ static void stAskSimBit(int *n, uint8_t clock) {
     memset(dest + (*n) + clock * 3, 1, clock);
     *n += clock * 4;
 }
+static void leadingZeroAskSimBits(int *n, uint8_t clock) {
+    uint8_t *dest = BigBuf_get_addr();
+    memset(dest + (*n), 0, clock * 8);
+    *n += clock * 8;
+}
+
 
 // args clock, ask/man or askraw, invert, transmission separator
 void CmdASKsimTAG(uint8_t encoding, uint8_t invert, uint8_t separator, uint8_t clk, uint16_t size, uint8_t *bits, bool ledcontrol) {
@@ -909,23 +915,25 @@ void CmdASKsimTAG(uint8_t encoding, uint8_t invert, uint8_t separator, uint8_t c
 
     int n = 0, i = 0;
 
+    leadingZeroAskSimBits(&n, clk);
+
     if (encoding == 2) { //biphase
         uint8_t phase = 0;
         for (i = 0; i < size; i++) {
-            biphaseSimBit(bits[i]^invert, &n, clk, &phase);
+            biphaseSimBit(bits[i] ^ invert, &n, clk, &phase);
         }
         if (phase == 1) { //run a second set inverted to keep phase in check
             for (i = 0; i < size; i++) {
-                biphaseSimBit(bits[i]^invert, &n, clk, &phase);
+                biphaseSimBit(bits[i] ^ invert, &n, clk, &phase);
             }
         }
     } else {  // ask/manchester || ask/raw
         for (i = 0; i < size; i++) {
-            askSimBit(bits[i]^invert, &n, clk, encoding);
+            askSimBit(bits[i] ^ invert, &n, clk, encoding);
         }
         if (encoding == 0 && bits[0] == bits[size - 1]) { //run a second set inverted (for ask/raw || biphase phase)
             for (i = 0; i < size; i++) {
-                askSimBit(bits[i]^invert ^ 1, &n, clk, encoding);
+                askSimBit(bits[i] ^ invert ^ 1, &n, clk, encoding);
             }
         }
     }
@@ -1202,7 +1210,7 @@ void CmdEM410xdemod(int findone, uint32_t *high, uint64_t *low, int ledcontrol)
         errCnt = askdemod(dest, &size, &clk, &invert, maxErr, 0, 1);
         WDT_HIT();
 
-        if (errCnt < 0) continue;
+        if (errCnt > 50) continue;
 
         errCnt = Em410xDecode(dest, &size, &idx, &hi, &lo);
         if (errCnt == 1) {
@@ -2030,16 +2038,13 @@ void EM4xReadWord(uint8_t addr, uint32_t pwd, uint8_t usepwd) {
     DoPartialAcquisition(20, true, 6000, 1000);
 
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-    reply_old(CMD_ACK, 0, 0, 0, 0, 0);
+    reply_ng(CMD_EM4X_READ_WORD, PM3_SUCCESS, NULL, 0);
     LED_A_OFF();
 }
 
-void EM4xWriteWord(uint32_t flag, uint32_t data, uint32_t pwd) {
+void EM4xWriteWord(uint8_t addr, uint32_t data, uint32_t pwd, uint8_t usepwd) {
 
     LED_A_ON();
-
-    bool usePwd = (flag & 0xF);
-    uint8_t addr = (flag >> 8) & 0xFF;
     uint8_t len;
 
     //clear buffer now so it does not interfere with timing later
@@ -2051,7 +2056,7 @@ void EM4xWriteWord(uint32_t flag, uint32_t data, uint32_t pwd) {
     * 0000 1010 ok.
     * 0000 0001 fail
     **/
-    if (usePwd) EM4xLogin(pwd);
+    if (usepwd) EM4xLogin(pwd);
 
     forward_ptr = forwardLink_data;
     len = Prepare_Cmd(FWD_CMD_WRITE);
@@ -2066,7 +2071,7 @@ void EM4xWriteWord(uint32_t flag, uint32_t data, uint32_t pwd) {
     DoPartialAcquisition(20, true, 6000, 1000);
 
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-    reply_old(CMD_ACK, 0, 0, 0, 0, 0);
+    reply_ng(CMD_EM4X_WRITE_WORD, PM3_SUCCESS, NULL, 0);
     LED_A_OFF();
 }
 
diff --git a/client/cmddata.c b/client/cmddata.c
index 59558c621..caeca4d3e 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -532,7 +532,7 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
         return PM3_ESOFT;
     }
 
-    if (verbose) PrintAndLogEx(DEBUG, "DEBUG: (ASKDemod_ext) Using clock:%d, invert:%d, bits found:%d", clk, invert, BitLen);
+    if (verbose) PrintAndLogEx(DEBUG, "DEBUG: (ASKDemod_ext) Using clock:%d, invert:%d, bits found:%d, start index %d", clk, invert, BitLen, startIdx);
 
     //output
     setDemodBuff(bits, BitLen, 0);
@@ -684,7 +684,7 @@ static int CmdBiphaseDecodeRaw(const char *Cmd) {
 // - ASK Demod then Biphase decode GraphBuffer samples
 int ASKbiphaseDemod(const char *Cmd, bool verbose) {
     //ask raw demod GraphBuffer first
-    int offset = 0, clk = 0, invert = 0, maxErr = 100;
+    int offset = 0, clk = 0, invert = 0, maxErr = 50;
     sscanf(Cmd, "%i %i %i %i", &offset, &clk, &invert, &maxErr);
 
     uint8_t BitStream[MAX_DEMOD_BUF_LEN];
@@ -711,11 +711,12 @@ int ASKbiphaseDemod(const char *Cmd, bool verbose) {
         if (g_debugMode || verbose) PrintAndLogEx(DEBUG, "DEBUG: Error BiphaseRawDecode too many errors: %d", errCnt);
         return PM3_ESOFT;
     }
+
     //success set DemodBuffer and return
     setDemodBuff(BitStream, size, 0);
     setClockGrid(clk, startIdx + clk * offset / 2);
     if (g_debugMode || verbose) {
-        PrintAndLogEx(NORMAL, "Biphase Decoded using offset: %d - clock: %d - # errors:%d - data:", offset, clk, errCnt);
+        PrintAndLogEx(NORMAL, "Biphase Decoded using offset %d | clock %d | #errors %d | start index %d\ndata\n", offset, clk, errCnt, (startIdx + clk * offset / 2) );
         printDemodBuff();
     }
     return PM3_SUCCESS;
diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index a5e304a86..9b175f212 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -702,6 +702,7 @@ static bool EM_ByteParityTest(uint8_t *bs, size_t size, uint8_t rows, uint8_t co
 //c012345678| 0
 //            |- must be zero
 
+/*
 static int EMwordparitytest(uint8_t *bits) {
 
     // last row/col parity must be 0
@@ -728,6 +729,7 @@ static int EMwordparitytest(uint8_t *bits) {
     // all checks ok.
     return PM3_SUCCESS;
 }
+*/
 
 //////////////// 4050 / 4450 commands
 
@@ -1095,8 +1097,8 @@ static int setDemodBufferEM(uint32_t *word, size_t idx) {
     //test for even parity bits.
     uint8_t parity[45] = {0};
     memcpy(parity, DemodBuffer, 45);
-    if (EMwordparitytest(parity) != PM3_SUCCESS) {
-        PrintAndLogEx(DEBUG, "DEBUG: Error - EM Parity tests failed");
+    if (!EM_EndParityTest(DemodBuffer + idx + EM_PREAMBLE_LEN, 45, 5, 9, 0)) {
+        PrintAndLogEx(DEBUG, "DEBUG: Error - End Parity check failed");    
         return PM3_ESOFT;
     }
 
@@ -1138,10 +1140,21 @@ static int demodEM4x05resp(uint32_t *word) {
 
 //////////////// 4205 / 4305 commands
 static int EM4x05ReadWord_ext(uint8_t addr, uint32_t pwd, bool usePwd, uint32_t *word) {
+
+   struct {
+        uint32_t password;
+        uint8_t address;
+        uint8_t usepwd;
+    } PACKED payload;
+    
+    payload.password = pwd;
+    payload.address = addr;
+    payload.usepwd = usePwd;
+    
     clearCommandBuffer();
-    SendCommandMIX(CMD_EM4X_READ_WORD, addr, pwd, usePwd, NULL, 0);
+    SendCommandNG(CMD_EM4X_READ_WORD, (uint8_t *)&payload, sizeof(payload));
     PacketResponseNG resp;
-    if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
+    if (!WaitForResponseTimeout(CMD_EM4X_READ_WORD, &resp, 2500)) {
         PrintAndLogEx(DEBUG, "timeout while waiting for reply.");
         return PM3_ETIMEOUT;
     }
@@ -1165,7 +1178,7 @@ static int CmdEM4x05Dump(const char *Cmd) {
     if (pwd != 1)
         usePwd = true;
 
-    int success = 1;
+    int success = PM3_SUCCESS;
     uint32_t word = 0;
     PrintAndLogEx(NORMAL, "Addr | data   | ascii");
     PrintAndLogEx(NORMAL, "-----+--------+------");
@@ -1193,13 +1206,13 @@ static int CmdEM4x05Read(const char *Cmd) {
     if (strlen(Cmd) == 0 || ctmp == 'h') return usage_lf_em4x05_read();
 
     addr = param_get8ex(Cmd, 0, 50, 10);
-    pwd =  param_get32ex(Cmd, 1, 1, 16);
+    pwd =  param_get32ex(Cmd, 1, 0xFFFFFFFF, 16);
 
     if (addr > 15) {
         PrintAndLogEx(NORMAL, "Address must be between 0 and 15");
-        return 1;
+        return PM3_ESOFT;
     }
-    if (pwd == 1) {
+    if (pwd == 0xFFFFFFFF) {
         PrintAndLogEx(NORMAL, "Reading address %02u", addr);
     } else {
         usePwd = true;
@@ -1207,12 +1220,12 @@ static int CmdEM4x05Read(const char *Cmd) {
     }
 
     uint32_t word = 0;
-    int isOk = EM4x05ReadWord_ext(addr, pwd, usePwd, &word);
-    if (isOk)
+    int status = EM4x05ReadWord_ext(addr, pwd, usePwd, &word);
+    if (status == PM3_SUCCESS)
         PrintAndLogEx(NORMAL, "Address %02d | %08X - %s", addr, word, (addr > 13) ? "Lock" : "");
     else
         PrintAndLogEx(NORMAL, "Read Address %02d | " _RED_("Fail"), addr);
-    return isOk;
+    return status;
 }
 
 static int CmdEM4x05Write(const char *Cmd) {
@@ -1225,25 +1238,35 @@ static int CmdEM4x05Write(const char *Cmd) {
 
     addr = param_get8ex(Cmd, 0, 50, 10);
     data = param_get32ex(Cmd, 1, 0, 16);
-    pwd =  param_get32ex(Cmd, 2, 1, 16);
+    pwd =  param_get32ex(Cmd, 2, 0xFFFFFFFF, 16);
 
     if (addr > 15) {
         PrintAndLogEx(NORMAL, "Address must be between 0 and 15");
         return PM3_EINVARG;
     }
-    if (pwd == 1)
+    if (pwd == 0xFFFFFFFF)
         PrintAndLogEx(NORMAL, "Writing address %d data %08X", addr, data);
     else {
         usePwd = true;
         PrintAndLogEx(NORMAL, "Writing address %d data %08X using password %08X", addr, data, pwd);
     }
 
-    uint16_t flag = (addr << 8) | (usePwd);
-
+   struct {
+        uint32_t password;
+        uint32_t data;
+        uint8_t address;
+        uint8_t usepwd;
+    } PACKED payload;
+    
+    payload.password = pwd;
+    payload.data = data;
+    payload.address = addr;
+    payload.usepwd = usePwd;
+    
     clearCommandBuffer();
-    SendCommandMIX(CMD_EM4X_WRITE_WORD, flag, data, pwd, NULL, 0);
+    SendCommandNG(CMD_EM4X_WRITE_WORD, (uint8_t*)&payload, sizeof(payload));
     PacketResponseNG resp;
-    if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
+    if (!WaitForResponseTimeout(CMD_EM4X_WRITE_WORD, &resp, 2000)) {
         PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
         return PM3_ETIMEOUT;
     }
@@ -1253,12 +1276,12 @@ static int CmdEM4x05Write(const char *Cmd) {
 
     //need 0 bits demoded (after preamble) to verify write cmd
     uint32_t dummy = 0;
-    int isOk = demodEM4x05resp(&dummy);
-    if (isOk)
+    int status = demodEM4x05resp(&dummy);
+    if (status == PM3_SUCCESS)
         PrintAndLogEx(NORMAL, "Write " _GREEN_("Verified"));
     else
         PrintAndLogEx(NORMAL, "Write could " _RED_("not") "be verified");
-    return isOk;
+    return status;
 }
 
 static void printEM4x05config(uint32_t wordData) {
@@ -1438,9 +1461,9 @@ static int CmdEM4x05Info(const char *Cmd) {
     if (ctmp == 'h') return usage_lf_em4x05_info();
 
     // for now use default input of 1 as invalid (unlikely 1 will be a valid password...)
-    pwd = param_get32ex(Cmd, 0, 1, 16);
+    pwd = param_get32ex(Cmd, 0, 0xFFFFFFFF, 16);
 
-    if (pwd != 1)
+    if (pwd != 0xFFFFFFFF)
         usePwd = true;
 
     // read word 0 (chip info)
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 8bf6ede8b..3bccd79ba 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1585,28 +1585,28 @@ char *GetBitRateStr(uint32_t id, bool xmode) {
     } else {
         switch (id) {
             case 0:
-                snprintf(retStr, sizeof(buf), "%u - RF/8", id);
+                snprintf(retStr, sizeof(buf), "%u - "_GREEN_("RF/8"), id);
                 break;
             case 1:
-                snprintf(retStr, sizeof(buf), "%u - RF/16", id);
+                snprintf(retStr, sizeof(buf), "%u - "_GREEN_("RF/16"), id);
                 break;
             case 2:
-                snprintf(retStr, sizeof(buf), "%u - RF/32", id);
+                snprintf(retStr, sizeof(buf), "%u - "_GREEN_("RF/32"), id);
                 break;
             case 3:
-                snprintf(retStr, sizeof(buf), "%u - RF/40", id);
+                snprintf(retStr, sizeof(buf), "%u - "_GREEN_("RF/40"), id);
                 break;
             case 4:
-                snprintf(retStr, sizeof(buf), "%u - RF/50", id);
+                snprintf(retStr, sizeof(buf), "%u - "_GREEN_("RF/50"), id);
                 break;
             case 5:
-                snprintf(retStr, sizeof(buf), "%u - RF/64", id);
+                snprintf(retStr, sizeof(buf), "%u - "_GREEN_("RF/64"), id);
                 break;
             case 6:
-                snprintf(retStr, sizeof(buf), "%u - RF/100", id);
+                snprintf(retStr, sizeof(buf), "%u - "_GREEN_("RF/100"), id);
                 break;
             case 7:
-                snprintf(retStr, sizeof(buf), "%u - RF/128", id);
+                snprintf(retStr, sizeof(buf), "%u - "_GREEN_("RF/128"), id);
                 break;
             default:
                 snprintf(retStr, sizeof(buf), "%u - " _RED_("(Unknown)"), id);
diff --git a/common/lfdemod.c b/common/lfdemod.c
index f7cc0fc31..f27c26931 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -41,7 +41,7 @@
 #include <stdint.h>  // for uint_32+
 #include <stdbool.h> // for bool
 #include "parity.h"  // for parity test
-
+#include "commonutil.h" // colors
 //**********************************************************************************************
 //---------------------------------Utilities Section--------------------------------------------
 //**********************************************************************************************
@@ -82,7 +82,7 @@ static void printSignal(void) {
     prnt("  low...........%d", signalprop.low);
     prnt("  mean..........%d", signalprop.mean);
     prnt("  amplitude.....%d", signalprop.amplitude);
-    prnt("  is Noise......%s", (signalprop.isnoise) ? "Yes" : "No");
+    prnt("  is Noise......%s", (signalprop.isnoise) ? _RED_("Yes") : _GREEN_("No"));
     prnt("  THRESHOLD noise amplitude......%d", NOISE_AMPLITUDE_THRESHOLD);
 }
 
@@ -567,7 +567,7 @@ int DetectStrongAskClock(uint8_t *src, size_t size, int high, int low, int *cloc
 int DetectASKClock(uint8_t *dest, size_t size, int *clock, int maxErr) {
 
     //don't need to loop through entire array. (cotag has clock of 384)
-    uint16_t loopCnt = 1500;
+    uint16_t loopCnt = 2000;
 
     // not enough samples
     if (size <= loopCnt + 60) {
@@ -1459,6 +1459,7 @@ static uint16_t cleanAskRawDemod(uint8_t *bits, size_t *size, int clk, int inver
     bool waveHigh = true;
 
     getNextHigh(bits, *size, high, &pos);
+//    getNextLow(bits, *size, low, &pos);
 
     // sample counts,   like clock = 32.. it tries to find  32/4 = 8,  32/2 = 16
     for (size_t i = pos; i < *size; i++) {
@@ -1488,8 +1489,10 @@ static uint16_t cleanAskRawDemod(uint8_t *bits, size_t *size, int clk, int inver
                         bits[bitCnt++] = invert ^ 1;
                         bits[bitCnt++] = invert ^ 1;
                     }
-                    if (*startIdx == 0)
+                    if (*startIdx == 0) {
                         *startIdx = i - clk;
+                         prnt("DEBUG ASK: cleanAskRawDemod minus clock [%d]", *startIdx);
+                    }
                     waveHigh = !waveHigh;
                     smplCnt = 0;
 
@@ -1507,8 +1510,10 @@ static uint16_t cleanAskRawDemod(uint8_t *bits, size_t *size, int clk, int inver
                     } else if (!waveHigh) {
                         bits[bitCnt++] = invert ^ 1;
                     }
-                    if (*startIdx == 0)
+                    if (*startIdx == 0) {
                         *startIdx = i - cl_2;
+                         prnt("DEBUG ASK: cleanAskRawDemod minus half clock [%d]", *startIdx);
+                    }
                     waveHigh = !waveHigh;
                     smplCnt = 0;
                 } else {
@@ -1523,10 +1528,12 @@ static uint16_t cleanAskRawDemod(uint8_t *bits, size_t *size, int clk, int inver
 
     *size = bitCnt;
 
+/*
     if (*startIdx < 0)
         *startIdx = 0;
+*/
 
-    if (g_debugMode == 2) prnt("DEBUG ASK: cleanAskRawDemod Startidx %u ", *startIdx);
+    if (g_debugMode == 2) prnt("DEBUG ASK: cleanAskRawDemod Startidx %d", *startIdx);
 
     return errCnt;
 }
@@ -1553,30 +1560,26 @@ int askdemod_ext(uint8_t *bits, size_t *size, int *clk, int *invert, int maxErr,
 
     if (g_debugMode == 2) prnt("DEBUG (askdemod_ext) clk %d, beststart %d, amp %d", *clk, start, amp);
 
-    //start pos from detect ask clock is 1/2 clock offset
-    // NOTE: can be negative (demod assumes rest of wave was there)
-    *startIdx = start - (*clk / 2);
-    uint16_t initLoopMax = 1024;
-    if (initLoopMax > *size) initLoopMax = *size;
-
     // Detect high and lows
     //25% clip in case highs and lows aren't clipped [marshmellow]
     int high, low;
-    //getHiLo(bits, initLoopMax, &high, &low, 75, 75);
     getHiLo(&high, &low, 75, 75);
 
     size_t errCnt = 0;
     // if clean clipped waves detected run alternate demod
     if (DetectCleanAskWave(bits, *size, high, low)) {
 
-        if (g_debugMode == 2) prnt("DEBUG: (askdemod_ext) Clean wave detected");
+        //start pos from detect ask clock is 1/2 clock offset
+        // NOTE: can be negative (demod assumes rest of wave was there)
+        *startIdx = start - (*clk / 2);
+        if (g_debugMode == 2) prnt("DEBUG: (askdemod_ext) Clean wave detected  --- startindex %d", *startIdx);
 
         errCnt = cleanAskRawDemod(bits, size, *clk, *invert, high, low, startIdx);
 
         if (askType) { //ask/manchester
             uint8_t alignPos = 0;
             errCnt = manrawdecode(bits, size, 0, &alignPos);
-            *startIdx += *clk / 2 * alignPos;
+            *startIdx += ((*clk / 2) * alignPos);
 
             if (g_debugMode)
                 prnt("DEBUG: (askdemod_ext) CLEAN: startIdx %i, alignPos %u , bestError %u", *startIdx, alignPos, errCnt);
diff --git a/common/lfdemod.h b/common/lfdemod.h
index 47a0c4e5e..4c9671ed4 100644
--- a/common/lfdemod.h
+++ b/common/lfdemod.h
@@ -21,7 +21,7 @@
 #include "parity.h"  // for parity test
 
 //might not be high enough for noisy environments
-#define NOISE_AMPLITUDE_THRESHOLD 15
+#define NOISE_AMPLITUDE_THRESHOLD 8
 //ignore buffer with less than x samples
 #define SIGNAL_MIN_SAMPLES 100
 //ignore first x samples of the buffer

From 8ed6c18497b51ccb9e62334e592fc8f4e17a6a1c Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 28 May 2019 05:22:38 -0400
Subject: [PATCH 1854/1938] style

---
 client/cmdlf.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/cmdlf.c b/client/cmdlf.c
index d3b942866..bb1e1f3a3 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -1006,9 +1006,9 @@ int CmdLFfind(const char *Cmd) {
         if (getSignalProperties()->isnoise) {
 
             if (IfPm3Hitag()) {
-                if (readHitagUid()) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Hitag") " found!"); return PM3_SUCCESS;}
+                if (readHitagUid()) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Hitag") "found!"); return PM3_SUCCESS;}
             }
-            if (readCOTAGUid()) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("COTAG ID") " found!"); return PM3_SUCCESS;}
+            if (readCOTAGUid()) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("COTAG ID") "found!"); return PM3_SUCCESS;}
 
             PrintAndLogEx(FAILED, "\n" _YELLOW_("No data found!") " - Signal looks like noise. Maybe not an LF tag?");
             return PM3_ESOFT;

From 0004b1075e9362934c0e4e3ea1c7613ab2ee3d13 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 28 May 2019 05:23:48 -0400
Subject: [PATCH 1855/1938] chg: lf cotag demod - adjusted error trigger

---
 client/cmdlfcotag.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/cmdlfcotag.c b/client/cmdlfcotag.c
index d7c6eff7a..1637e293c 100644
--- a/client/cmdlfcotag.c
+++ b/client/cmdlfcotag.c
@@ -36,8 +36,8 @@ static int CmdCOTAGDemod(const char *Cmd) {
 
     uint8_t alignPos = 0;
     uint16_t err = manrawdecode(bits, &bitlen, 1, &alignPos);
-    if (err == 0xFFFF) {
-        if (g_debugMode) PrintAndLogEx(DEBUG, "DEBUG: Error - COTAG too many errors: %d", err);
+    if (err > 50 ) {
+        PrintAndLogEx(DEBUG, "DEBUG: Error - COTAG too many errors: %d", err);
         return PM3_ESOFT;
     }
 

From d1ae9dc76e17671a0ac24b27c6ac391c3c02f952 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 28 May 2019 05:24:36 -0400
Subject: [PATCH 1856/1938] cleanup

---
 common/lfdemod.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/common/lfdemod.c b/common/lfdemod.c
index f27c26931..0bc4d8d96 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -103,8 +103,7 @@ void computeSignalProperties(uint8_t *samples, uint32_t size) {
     // we can detect noise
     signalprop.isnoise =  signalprop.amplitude < NOISE_AMPLITUDE_THRESHOLD;
 
-    if (g_debugMode)
-        printSignal();
+    printSignal();
 }
 
 void removeSignalOffset(uint8_t *samples, uint32_t size) {
@@ -146,8 +145,7 @@ void getHiLo(int *high, int *low, uint8_t fuzzHi, uint8_t fuzzLo) {
         *low =  signalprop.low;
     }
 
-    if (g_debugMode)
-        prnt("getHiLo fuzzed: High %d | Low %d", *high, *low);
+    prnt("getHiLo fuzzed: High %d | Low %d", *high, *low);
 }
 
 // by marshmellow
@@ -271,12 +269,13 @@ bool preambleSearchEx(uint8_t *bits, uint8_t *preamble, size_t pLen, size_t *siz
             //first index found
             foundCnt++;
             if (foundCnt == 1) {
-                if (g_debugMode) prnt("DEBUG: (preambleSearchEx) preamble found at %i", idx);
+                prnt("DEBUG: (preambleSearchEx) preamble found at %i", idx);
                 *startIdx = idx;
-                if (findone) return true;
+                if (findone) 
+                    return true;
             }
             if (foundCnt == 2) {
-                if (g_debugMode) prnt("DEBUG: (preambleSearchEx) preamble 2 found at %i", idx);
+                prnt("DEBUG: (preambleSearchEx) preamble 2 found at %i", idx);
                 *size = idx - *startIdx;
                 return true;
             }
@@ -1581,13 +1580,12 @@ int askdemod_ext(uint8_t *bits, size_t *size, int *clk, int *invert, int maxErr,
             errCnt = manrawdecode(bits, size, 0, &alignPos);
             *startIdx += ((*clk / 2) * alignPos);
 
-            if (g_debugMode)
-                prnt("DEBUG: (askdemod_ext) CLEAN: startIdx %i, alignPos %u , bestError %u", *startIdx, alignPos, errCnt);
+            prnt("DEBUG: (askdemod_ext) CLEAN: startIdx %i, alignPos %u , bestError %u", *startIdx, alignPos, errCnt);
         }
         return errCnt;
     }
 
-    if (g_debugMode) prnt("DEBUG: (askdemod_ext) Weak wave detected: startIdx %i", *startIdx);
+    prnt("DEBUG: (askdemod_ext) Weak wave detected: startIdx %i", *startIdx);
 
     int lastBit;  //set first clock check - can go negative
     size_t i, bitnum = 0;     //output counter

From caee0a1f6a7dde52ec819489c321ed222d5f2159 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 28 May 2019 08:00:33 -0400
Subject: [PATCH 1857/1938] key

---
 client/default_keys.dic | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/client/default_keys.dic b/client/default_keys.dic
index 15c51f9ac..ddbafd848 100644
--- a/client/default_keys.dic
+++ b/client/default_keys.dic
@@ -761,6 +761,9 @@ A2B2C9D187FB,
 022FE48B3072,
 013940233313,
 #
+# Hotel Adina
+9EBC3EB37130,
+#
 # mostlikely diverised individual keys.
 # data from: https://github.com/korsehindi/proxmark3/commit/24fdbfa9a1d5c996aaa5c192bc07e4ab28db4c5c
 491CDC863104,

From ffc24d672b87e4de80dc9e7e0309fac681d393e0 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 28 May 2019 13:18:33 -0400
Subject: [PATCH 1858/1938] keys

---
 client/default_keys.dic | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/client/default_keys.dic b/client/default_keys.dic
index ddbafd848..3582ed394 100644
--- a/client/default_keys.dic
+++ b/client/default_keys.dic
@@ -845,4 +845,19 @@ BE7C4F6C7A9A,
 82D58AA49CCB,
 #MELONCARD
 323334353637,
-
+#
+#
+CEE3632EEFF5,
+827ED62B31A7,
+03EA4053C6ED,
+C0BEEFEC850B,
+F57F410E18FF,
+0AF7DB99AEE4,
+A7FB4824ACBF,
+207FFED492FD,
+1CFA22DBDFC3,
+30FFB6B056F5,
+39CF885474DD,
+00F0BD116D70,
+4CFF128FA3EF,
+10F3BEBC01DF,

From cee2fc7a34ae8973b5969c36780c3ea4073f4131 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 28 May 2019 13:20:56 -0400
Subject: [PATCH 1859/1938] hf mf rdbl - uses NG

---
 armsrc/appmain.c             |   6 +-
 armsrc/apps.h                |   3 +-
 armsrc/mifarecmd.c           |  34 +++----
 client/cmdhfmf.c             | 184 +++++++++++++++++++++--------------
 client/cmdhfmfdes.c          |   9 +-
 client/scripts/didump.lua    |  18 ++--
 client/scripts/tnp3clone.lua |  18 ++--
 client/scripts/tnp3dump.lua  |  29 +++---
 include/pm3_cmd.h            |   6 ++
 9 files changed, 178 insertions(+), 129 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index f8b675fa0..3a48e7b58 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1054,9 +1054,11 @@ static void PacketReceived(PacketCommandNG *packet) {
         case CMD_READER_MIFARE:
             ReaderMifare(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2]);
             break;
-        case CMD_MIFARE_READBL:
-            MifareReadBlock(packet->oldarg[0], packet->oldarg[1], packet->data.asBytes);
+        case CMD_MIFARE_READBL: {
+            mf_readblock_t *payload = (mf_readblock_t *)packet->data.asBytes;
+            MifareReadBlock(payload->blockno, payload->keytype, payload->key);
             break;
+            }
         case CMD_MIFAREU_READBL:
             MifareUReadBlock(packet->oldarg[0], packet->oldarg[1], packet->data.asBytes);
             break;
diff --git a/armsrc/apps.h b/armsrc/apps.h
index a5866ebd5..561a08b0d 100644
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -146,7 +146,8 @@ void EPA_PACE_Collect_Nonce(PacketCommandNG *c);
 void EPA_PACE_Replay(PacketCommandNG *c);
 
 // mifarecmd.h
-void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain);
+void MifareReadBlock(uint8_t blockNo, uint8_t keyType, uint8_t *datain);
+
 void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain);
 void MifareUC_Auth(uint8_t arg0, uint8_t *keybytes);
 void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain);
diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index 8670beaca..7b5a6518a 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -38,18 +38,16 @@ static uint8_t dummy_answer = 0;
 // Select, Authenticate, Read a MIFARE tag.
 // read block
 //-----------------------------------------------------------------------------
-void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain) {
+void MifareReadBlock(uint8_t blockNo, uint8_t keyType, uint8_t *datain) {
     // params
-    uint8_t blockNo = arg0;
-    uint8_t keyType = arg1;
     uint64_t ui64Key = 0;
     ui64Key = bytes_to_num(datain, 6);
 
     // variables
-    uint8_t isOK = 0;
     uint8_t dataoutbuf[16] = {0x00};
     uint8_t uid[10] = {0x00};
-    uint32_t cuid = 0;
+    uint32_t cuid = 0, status = PM3_EOPABORTED;
+    
     struct Crypto1State mpcs = {0, 0};
     struct Crypto1State *pcs;
     pcs = &mpcs;
@@ -84,7 +82,7 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain) {
             break;
         };
 
-        isOK = 1;
+        status = PM3_SUCCESS;
         break;
     }
 
@@ -93,7 +91,7 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain) {
     if (MF_DBGLEVEL >= 2) DbpString("READ BLOCK FINISHED");
 
     LED_B_ON();
-    reply_old(CMD_ACK, isOK, 0, 0, dataoutbuf, 16);
+    reply_ng(CMD_MIFARE_READBL, status, dataoutbuf, 16);
     LED_B_OFF();
 
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
@@ -129,7 +127,7 @@ void MifareUC_Auth(uint8_t arg0, uint8_t *keybytes) {
         FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
         LEDsoff();
     }
-    reply_old(CMD_ACK, 1, 0, 0, 0, 0);
+    reply_mix(CMD_ACK, 1, 0, 0, 0, 0);
 }
 
 // Arg0 = BlockNo,
@@ -189,7 +187,7 @@ void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain) {
         return;
     }
 
-    reply_old(CMD_ACK, 1, 0, 0, dataout, 16);
+    reply_mix(CMD_ACK, 1, 0, 0, dataout, 16);
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     LEDsoff();
 }
@@ -352,7 +350,7 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
 
     countblocks *= 4;
 
-    reply_old(CMD_ACK, 1, countblocks, BigBuf_max_traceLen(), 0, 0);
+    reply_mix(CMD_ACK, 1, countblocks, BigBuf_max_traceLen(), 0, 0);
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     LEDsoff();
     BigBuf_free();
@@ -419,7 +417,7 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain) {
 
     if (MF_DBGLEVEL >= 2) DbpString("WRITE BLOCK FINISHED");
 
-    reply_old(CMD_ACK, isOK, 0, 0, 0, 0);
+    reply_mix(CMD_ACK, isOK, 0, 0, 0, 0);
 
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     LEDsoff();
@@ -461,7 +459,7 @@ void MifareUWriteBlockCompat(uint8_t arg0, uint8_t *datain)
 
     if (MF_DBGLEVEL >= 2)   DbpString("WRITE BLOCK FINISHED");
 
-    reply_old(CMD_ACK,1,0,0,0,0);
+    reply_mix(CMD_ACK,1,0,0,0,0);
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     LEDsoff();
 }
@@ -530,7 +528,7 @@ void MifareUWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain) {
 
     if (MF_DBGLEVEL >= 2) DbpString("WRITE BLOCK FINISHED");
 
-    reply_old(CMD_ACK, 1, 0, 0, 0, 0);
+    reply_mix(CMD_ACK, 1, 0, 0, 0, 0);
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     LEDsoff();
     set_tracing(false);
@@ -603,7 +601,7 @@ void MifareUSetPwd(uint8_t arg0, uint8_t *datain) {
         return;
     };
 
-    reply_old(CMD_ACK, 1, 0, 0, 0, 0);
+    reply_mix(CMD_ACK, 1, 0, 0, 0, 0);
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     LEDsoff();
     set_tracing(false);
@@ -1054,7 +1052,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)
     memcpy(buf + 16, &target_ks[1], 4);
 
     LED_B_ON();
-    reply_old(CMD_ACK, isOK, 0, targetBlockNo + (targetKeyType * 0x100), buf, sizeof(buf));
+    reply_mix(CMD_ACK, isOK, 0, targetBlockNo + (targetKeyType * 0x100), buf, sizeof(buf));
     LED_B_OFF();
 
     if (MF_DBGLEVEL >= 3) DbpString("NESTED FINISHED");
@@ -1512,7 +1510,7 @@ OUT:
         BigBuf_Clear_ext(false);
     } else {
         // partial/none keys found
-        reply_old(CMD_ACK, foundkeys, 0, 0, 0, 0);
+        reply_mix(CMD_ACK, foundkeys, 0, 0, 0, 0);
     }
 }
 
@@ -1862,7 +1860,7 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain) {
     } // end while
 
     if (isOK)
-        reply_old(CMD_ACK, 1, 0, 0, uid, sizeof(uid));
+        reply_mix(CMD_ACK, 1, 0, 0, uid, sizeof(uid));
     else
         OnErrorMagic(errormsg);
 
@@ -2102,7 +2100,7 @@ void Mifare_DES_Auth1(uint8_t arg0, uint8_t *datain) {
     }
 
     if (MF_DBGLEVEL >= MF_DBG_EXTENDED) DbpString("AUTH 1 FINISHED");
-    reply_old(CMD_ACK, 1, cuid, 0, dataout, sizeof(dataout));
+    reply_mix(CMD_ACK, 1, cuid, 0, dataout, sizeof(dataout));
 }
 
 void Mifare_DES_Auth2(uint32_t arg0, uint8_t *datain) {
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 874005e34..d12a3356f 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -549,14 +549,14 @@ static int CmdHF14AMfRdBl(const char *Cmd) {
         PrintAndLogEx(NORMAL, "Usage:  hf mf rdbl    <block number> <key A/B> <key (12 hex symbols)>");
         PrintAndLogEx(NORMAL, "Examples:");
         PrintAndLogEx(NORMAL, "        hf mf rdbl 0 A FFFFFFFFFFFF ");
-        return 0;
+        return PM3_SUCCESS;
     }
 
     blockNo = param_get8(Cmd, 0);
     cmdp = tolower(param_getchar(Cmd, 1));
     if (cmdp == 0x00) {
         PrintAndLogEx(NORMAL, "Key type must be A or B");
-        return 1;
+        return PM3_ESOFT;
     }
 
     if (cmdp != 'a')
@@ -564,23 +564,27 @@ static int CmdHF14AMfRdBl(const char *Cmd) {
 
     if (param_gethex(Cmd, 2, key, 12)) {
         PrintAndLogEx(NORMAL, "Key must include 12 HEX symbols");
-        return 1;
+        return PM3_ESOFT;
     }
     PrintAndLogEx(NORMAL, "--block no:%d, key type:%c, key:%s ", blockNo, keyType ? 'B' : 'A', sprint_hex(key, 6));
 
+    mf_readblock_t payload;
+    payload.blockno = blockNo;
+    payload.keytype = keyType;
+    memcpy(payload.key, key, sizeof(payload.key));
+    
     clearCommandBuffer();
-    SendCommandOLD(CMD_MIFARE_READBL, blockNo, keyType, 0, key, 6);
+    SendCommandNG(CMD_MIFARE_READBL, (uint8_t*)&payload, sizeof(mf_readblock_t));
 
     PacketResponseNG resp;
-    if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-        uint8_t isOK  = resp.oldarg[0] & 0xff;
+    if (WaitForResponseTimeout(CMD_MIFARE_READBL, &resp, 1500)) {
         uint8_t *data = resp.data.asBytes;
 
-        if (isOK) {
-            PrintAndLogEx(NORMAL, "isOk:%02x data:%s", isOK, sprint_hex(data, 16));
+        if (resp.status == PM3_SUCCESS) {
+            PrintAndLogEx(NORMAL, "data: %s", sprint_hex(data, 16));
         } else {
-            PrintAndLogEx(NORMAL, "isOk:%02x", isOK);
-            return 1;
+            PrintAndLogEx(FAILED, "failed reading block");
+            return PM3_ESOFT;
         }
 
         if (mfIsSectorTrailer(blockNo) && (data[6] || data[7] || data[8])) {
@@ -595,7 +599,7 @@ static int CmdHF14AMfRdBl(const char *Cmd) {
         }
     } else {
         PrintAndLogEx(WARNING, "Command execute timeout");
-        return 2;
+        return PM3_ETIMEOUT;
     }
 
     return 0;
@@ -612,19 +616,19 @@ static int CmdHF14AMfRdSc(const char *Cmd) {
         PrintAndLogEx(NORMAL, "Usage:  hf mf rdsc    <sector number> <key A/B> <key (12 hex symbols)>");
         PrintAndLogEx(NORMAL, "Examples:");
         PrintAndLogEx(NORMAL, "        hf mf rdsc 0 A FFFFFFFFFFFF ");
-        return 0;
+        return PM3_SUCCESS;
     }
 
     sectorNo = param_get8(Cmd, 0);
     if (sectorNo > MIFARE_4K_MAXSECTOR) {
         PrintAndLogEx(NORMAL, "Sector number must be less than 40");
-        return 1;
+        return PM3_ESOFT;
     }
 
     cmdp = tolower(param_getchar(Cmd, 1));
     if (cmdp != 'a' && cmdp != 'b') {
         PrintAndLogEx(NORMAL, "Key type must be A or B");
-        return 1;
+        return PM3_ESOFT;
     }
 
     if (cmdp != 'a')
@@ -632,7 +636,7 @@ static int CmdHF14AMfRdSc(const char *Cmd) {
 
     if (param_gethex(Cmd, 2, key, 12)) {
         PrintAndLogEx(NORMAL, "Key must include 12 HEX symbols");
-        return 1;
+        return PM3_ESOFT;
     }
     PrintAndLogEx(NORMAL, "--sector no:%d key type:%c key:%s ", sectorNo, keyType ? 'B' : 'A', sprint_hex(key, 6));
 
@@ -665,7 +669,7 @@ static int CmdHF14AMfRdSc(const char *Cmd) {
         PrintAndLogEx(WARNING, "Command execute timeout");
     }
 
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static uint16_t NumOfBlocks(char card) {
@@ -761,14 +765,14 @@ static int CmdHF14AMfDump(const char *Cmd) {
     if (keyFilename[0] == 0x00) {
         fptr = GenerateFilename("hf-mf-", "-key.bin");
         if (fptr == NULL)
-            return 1;
+            return PM3_ESOFT;
 
         strcpy(keyFilename, fptr);
     }
 
     if ((f = fopen(keyFilename, "rb")) == NULL) {
         PrintAndLogEx(WARNING, "Could not find file " _YELLOW_("%s"), keyFilename);
-        return 1;
+        return PM3_EFILE;
     }
 
     // Read keys A from file
@@ -778,7 +782,7 @@ static int CmdHF14AMfDump(const char *Cmd) {
         if (bytes_read != 6) {
             PrintAndLogEx(WARNING, "File reading error.");
             fclose(f);
-            return 2;
+            return PM3_EFILE;
         }
     }
 
@@ -788,7 +792,7 @@ static int CmdHF14AMfDump(const char *Cmd) {
         if (bytes_read != 6) {
             PrintAndLogEx(WARNING, "File reading error.");
             fclose(f);
-            return 2;
+            return PM3_EFILE;
         }
     }
 
@@ -799,14 +803,21 @@ static int CmdHF14AMfDump(const char *Cmd) {
     uint8_t tries;
     for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
         for (tries = 0; tries < MIFARE_SECTOR_RETRY; tries++) {
+            printf("."); 
+            fflush(NULL);
+            
+            mf_readblock_t payload;
+            payload.blockno = FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1;
+            payload.keytype = 0;
+            memcpy(payload.key, keyA[sectorNo], sizeof(payload.key));
 
             clearCommandBuffer();
-            SendCommandOLD(CMD_MIFARE_READBL, FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 0, 0, keyA[sectorNo], 6);
+            SendCommandNG(CMD_MIFARE_READBL, (uint8_t*)&payload, sizeof(mf_readblock_t));
+
+            if (WaitForResponseTimeout(CMD_MIFARE_READBL, &resp, 1500)) {
 
-            if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-                uint8_t isOK = resp.oldarg[0] & 0xff;
                 uint8_t *data = resp.data.asBytes;
-                if (isOK) {
+                if (resp.status == PM3_SUCCESS) {
                     rights[sectorNo][0] = ((data[7] & 0x10) >> 2) | ((data[8] & 0x1) << 1) | ((data[8] & 0x10) >> 4); // C1C2C3 for data area 0
                     rights[sectorNo][1] = ((data[7] & 0x20) >> 3) | ((data[8] & 0x2) << 0) | ((data[8] & 0x20) >> 5); // C1C2C3 for data area 1
                     rights[sectorNo][2] = ((data[7] & 0x40) >> 4) | ((data[8] & 0x4) >> 1) | ((data[8] & 0x40) >> 6); // C1C2C3 for data area 2
@@ -824,43 +835,63 @@ static int CmdHF14AMfDump(const char *Cmd) {
             }
         }
     }
-
+    printf("\n");
     PrintAndLogEx(SUCCESS, "Finished reading sector access bits");
     PrintAndLogEx(INFO, "Dumping all blocks from card...");
 
-    bool isOK = true;
-    for (sectorNo = 0; isOK && sectorNo < numSectors; sectorNo++) {
-        for (blockNo = 0; isOK && blockNo < NumBlocksPerSector(sectorNo); blockNo++) {
+    mf_readblock_t payload;
+    for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
+        for (blockNo = 0; blockNo < NumBlocksPerSector(sectorNo); blockNo++) {
             bool received = false;
 
             for (tries = 0; tries < MIFARE_SECTOR_RETRY; tries++) {
                 if (blockNo == NumBlocksPerSector(sectorNo) - 1) { // sector trailer. At least the Access Conditions can always be read with key A.
-                    clearCommandBuffer();
-                    SendCommandOLD(CMD_MIFARE_READBL, FirstBlockOfSector(sectorNo) + blockNo, 0, 0, keyA[sectorNo], 6);
-                    received = WaitForResponseTimeout(CMD_ACK, &resp, 1500);
+                
+                    payload.blockno = FirstBlockOfSector(sectorNo) + blockNo;
+                    payload.keytype = 0;
+                    memcpy(payload.key, keyA[sectorNo], sizeof(payload.key));
+
+                    clearCommandBuffer();                    
+                    SendCommandNG(CMD_MIFARE_READBL, (uint8_t*)&payload, sizeof(mf_readblock_t));
+                    received = WaitForResponseTimeout(CMD_MIFARE_READBL, &resp, 1500);
+                    printf("A\n");                    
                 } else {                                           // data block. Check if it can be read with key A or key B
                     uint8_t data_area = (sectorNo < 32) ? blockNo : blockNo / 5;
                     if ((rights[sectorNo][data_area] == 0x03) || (rights[sectorNo][data_area] == 0x05)) { // only key B would work
-                        SendCommandOLD(CMD_MIFARE_READBL, FirstBlockOfSector(sectorNo) + blockNo, 1, 0, keyB[sectorNo], 6);
-                        received = WaitForResponseTimeout(CMD_ACK, &resp, 1500);
-                    } else if (rights[sectorNo][data_area] == 0x07) {                                     // no key would work
-                        isOK = false;
-                        PrintAndLogEx(WARNING, "access rights do not allow reading of sector %2d block %3d", sectorNo, blockNo);
-                        tries = MIFARE_SECTOR_RETRY;
-                    } else {                                                                              // key A would work
+
+                        payload.blockno = FirstBlockOfSector(sectorNo) + blockNo;
+                        payload.keytype = 1;
+                        memcpy(payload.key, keyB[sectorNo], sizeof(payload.key));
+                        
                         clearCommandBuffer();
-                        SendCommandOLD(CMD_MIFARE_READBL, FirstBlockOfSector(sectorNo) + blockNo, 0, 0, keyA[sectorNo], 6);
-                        received = WaitForResponseTimeout(CMD_ACK, &resp, 1500);
+                        SendCommandNG(CMD_MIFARE_READBL, (uint8_t*)&payload, sizeof(mf_readblock_t));
+                        received = WaitForResponseTimeout(CMD_MIFARE_READBL, &resp, 1500);
+                        printf("B\n");
+                    } else if (rights[sectorNo][data_area] == 0x07) {                                     // no key would work
+                        PrintAndLogEx(WARNING, "access rights do not allow reading of sector %2d block %3d", sectorNo, blockNo);
+                        // where do you want to go??  Next sector or block?
+                        break;
+                    } else {                                                                              // key A would work
+
+                        payload.blockno = FirstBlockOfSector(sectorNo) + blockNo;
+                        payload.keytype = 0;
+                        memcpy(payload.key, keyA[sectorNo], sizeof(payload.key));
+                        
+                        clearCommandBuffer();
+                        SendCommandNG(CMD_MIFARE_READBL, (uint8_t*)&payload, sizeof(mf_readblock_t));
+                        received = WaitForResponseTimeout(CMD_MIFARE_READBL, &resp, 1500);
+                        printf("C\n");
                     }
                 }
                 if (received) {
-                    isOK  = resp.oldarg[0] & 0xff;
-                    if (isOK) break;
+                    if (resp.status == PM3_SUCCESS) {
+                        // break the re-try loop
+                        break;
+                    }
                 }
             }
 
             if (received) {
-                isOK  = resp.oldarg[0] & 0xff;
                 uint8_t *data  = resp.data.asBytes;
                 if (blockNo == NumBlocksPerSector(sectorNo) - 1) { // sector trailer. Fill in the keys.
                     data[0]  = (keyA[sectorNo][0]);
@@ -876,7 +907,7 @@ static int CmdHF14AMfDump(const char *Cmd) {
                     data[14] = (keyB[sectorNo][4]);
                     data[15] = (keyB[sectorNo][5]);
                 }
-                if (isOK) {
+                if (resp.status == PM3_SUCCESS) {
                     memcpy(carddata[FirstBlockOfSector(sectorNo) + blockNo], data, 16);
                     PrintAndLogEx(SUCCESS, "successfully read block %2d of sector %2d.", blockNo, sectorNo);
                 } else {
@@ -884,19 +915,13 @@ static int CmdHF14AMfDump(const char *Cmd) {
                     break;
                 }
             } else {
-                isOK = false;
                 PrintAndLogEx(WARNING, "command execute timeout when trying to read block %2d of sector %2d.", blockNo, sectorNo);
                 break;
             }
         }
     }
 
-    if (isOK == 0) {
-        PrintAndLogEx(FAILED, "Something went wrong");
-        return 0;
-    }
-
-    PrintAndLogEx(SUCCESS, "\nSuccedded in dumping all blocks");
+    PrintAndLogEx(SUCCESS, "\nSucceded in dumping all blocks");
 
     if (strlen(dataFilename) < 1) {
         fptr = dataFilename;
@@ -909,7 +934,7 @@ static int CmdHF14AMfDump(const char *Cmd) {
     saveFile(dataFilename, ".bin", (uint8_t *)carddata, bytes);
     saveFileEML(dataFilename, (uint8_t *)carddata, bytes, MFBLOCK_SIZE);
     saveFileJSON(dataFilename, jsfCardMemory, (uint8_t *)carddata, bytes);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdHF14AMfRestore(const char *Cmd) {
@@ -1051,7 +1076,7 @@ static int CmdHF14AMfRestore(const char *Cmd) {
     }
     fclose(fdump);
     PrintAndLogEx(INFO, "Finish restore");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdHF14AMfNested(const char *Cmd) {
@@ -1081,7 +1106,7 @@ static int CmdHF14AMfNested(const char *Cmd) {
 
     if (ctmp != 'a' && ctmp != 'b') {
         PrintAndLogEx(WARNING, "key type must be A or B");
-        return 1;
+        return PM3_EINVARG;
     }
 
     if (ctmp != 'a')
@@ -1089,7 +1114,7 @@ static int CmdHF14AMfNested(const char *Cmd) {
 
     if (param_gethex(Cmd, 3, key, 12)) {
         PrintAndLogEx(WARNING, "key must include 12 HEX symbols");
-        return 1;
+        return PM3_EINVARG;
     }
 
     if (cmdp == 'o') {
@@ -1097,7 +1122,7 @@ static int CmdHF14AMfNested(const char *Cmd) {
         ctmp = tolower(param_getchar(Cmd, 5));
         if (ctmp != 'a' && ctmp != 'b') {
             PrintAndLogEx(WARNING, "target key type must be A or B");
-            return 1;
+            return PM3_EINVARG;
         }
         if (ctmp != 'a') {
             trgKeyType = 1;
@@ -1158,16 +1183,16 @@ static int CmdHF14AMfNested(const char *Cmd) {
                     mfEmlSetMem(keyBlock, sectortrailer, 1);
                     PrintAndLogEx(SUCCESS, "Key transferred to emulator memory.");
                 }
-                return 0;
+                return PM3_SUCCESS;
             default :
                 PrintAndLogEx(WARNING, "Unknown Error.\n");
         }
-        return 2;
+        return PM3_SUCCESS;
     } else { // ------------------------------------  multiple sectors working
         uint64_t t1 = msclock();
 
         e_sector = calloc(SectorsCnt, sizeof(sector_t));
-        if (e_sector == NULL) return 1;
+        if (e_sector == NULL) return PM3_EMALLOC;
 
         //test current key and additional standard keys first
         // add parameter key
@@ -1222,7 +1247,7 @@ static int CmdHF14AMfNested(const char *Cmd) {
                             PrintAndLogEx(WARNING, "unknown Error.\n");
                     }
                     free(e_sector);
-                    return 2;
+                    return PM3_ESOFT;
                 }
             }
         }
@@ -1241,16 +1266,19 @@ static int CmdHF14AMfNested(const char *Cmd) {
 
                 PrintAndLogEx(SUCCESS, "reading block %d", sectrail);
 
-                uint8_t txdata[6];
-                num_to_bytes(e_sector[i].Key[0], 6, txdata); // KEY A
+                mf_readblock_t payload;
+                payload.blockno = sectrail;
+                payload.keytype = 0;
+
+                num_to_bytes(e_sector[i].Key[0], 6, payload.key); // KEY A
+                
                 clearCommandBuffer();
-                SendCommandOLD(CMD_MIFARE_READBL, sectrail, 0, 0, txdata, sizeof(txdata));
+                SendCommandNG(CMD_MIFARE_READBL, (uint8_t *)&payload, sizeof(mf_readblock_t) );
 
                 PacketResponseNG resp;
-                if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) continue;
+                if (!WaitForResponseTimeout(CMD_MIFARE_READBL, &resp, 1500)) continue;
 
-                uint8_t isOK  = resp.oldarg[0] & 0xff;
-                if (!isOK) continue;
+                if (resp.status != PM3_SUCCESS) continue;
 
                 uint8_t *data = resp.data.asBytes;
                 key64 = bytes_to_num(data + 10, 6);
@@ -1272,10 +1300,13 @@ static int CmdHF14AMfNested(const char *Cmd) {
             conn.block_after_ACK = true;
             for (i = 0; i < SectorsCnt; i++) {
                 mfEmlGetMem(keyBlock, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
+                
                 if (e_sector[i].foundKey[0])
                     num_to_bytes(e_sector[i].Key[0], 6, keyBlock);
+                    
                 if (e_sector[i].foundKey[1])
                     num_to_bytes(e_sector[i].Key[1], 6, &keyBlock[10]);
+                    
                 if (i == SectorsCnt - 1) {
                     // Disable fast mode on last packet
                     conn.block_after_ACK = false;
@@ -1290,13 +1321,13 @@ static int CmdHF14AMfNested(const char *Cmd) {
             fptr = GenerateFilename("hf-mf-", "-key.bin");
             if (fptr == NULL) {
                 free(e_sector);
-                return 1;
+                return PM3_ESOFT;
             }
 
             if ((fkeys = fopen(fptr, "wb")) == NULL) {
                 PrintAndLogEx(WARNING, "could not create file " _YELLOW_("%s"), fptr);
                 free(e_sector);
-                return 1;
+                return PM3_EFILE;
             }
 
             PrintAndLogEx(SUCCESS, "saving keys to binary file " _YELLOW_("%s"), fptr);
@@ -1321,7 +1352,7 @@ static int CmdHF14AMfNested(const char *Cmd) {
         }
         free(e_sector);
     }
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdHF14AMfNestedHard(const char *Cmd) {
@@ -1997,16 +2028,19 @@ static int CmdHF14AMfChk(const char *Cmd) {
 
                 PrintAndLogEx(NORMAL, "Reading block %d", sectrail);
 
-                uint8_t txdata[6];
-                num_to_bytes(e_sector[i].Key[0], 6, txdata); // KEY A
+                mf_readblock_t payload;
+                payload.blockno = sectrail;
+                payload.keytype = 0;
+
+                num_to_bytes(e_sector[i].Key[0], 6, payload.key); // KEY A
+                
                 clearCommandBuffer();
-                SendCommandOLD(CMD_MIFARE_READBL, sectrail, 0, 0, txdata, sizeof(txdata));
+                SendCommandNG(CMD_MIFARE_READBL, (uint8_t *)&payload, sizeof(mf_readblock_t) );
 
                 PacketResponseNG resp;
-                if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) continue;
+                if (!WaitForResponseTimeout(CMD_MIFARE_READBL, &resp, 1500)) continue;
 
-                uint8_t isOK  = resp.oldarg[0] & 0xff;
-                if (!isOK) continue;
+                if (resp.status != PM3_SUCCESS) continue;
 
                 uint8_t *data = resp.data.asBytes;
                 key64 = bytes_to_num(data + 10, 6);
diff --git a/client/cmdhfmfdes.c b/client/cmdhfmfdes.c
index daadf0cab..c36084ce6 100644
--- a/client/cmdhfmfdes.c
+++ b/client/cmdhfmfdes.c
@@ -90,14 +90,15 @@ static int CmdHF14ADesRb(const char *Cmd) {
     }
     PrintAndLogEx(NORMAL, "--block no:%02x key type:%02x key:%s ", blockNo, keyType, sprint_hex(key, 6));
 
-    SendCommandOLD(CMD_MIFARE_READBL, blockNo, keyType, 0, key, 6);
+
+    mf_readblock_t payload = { blockNo, keyType, key };
+    SendCommandNG(CMD_MIFARE_READBL, (uint8_t *)payload, sizeof(mf_readblock_t) );
 
     PacketResponseNG resp;
-    if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
-    uint8_t                isOK  = resp.oldarg[0] & 0xff;
+    if (WaitForResponseTimeout(CMD_MIFARE_READBL, &resp, 1500)) {
     uint8_t              * data  = resp.data.asBytes;
 
-    if (isOK)
+    if (resp.status == PM3_SUCCESS)
     PrintAndLogEx(NORMAL, "isOk:%02x data:%s", isOK, sprint_hex(data, 16));
     else
     PrintAndLogEx(NORMAL, "isOk:%02x", isOK);
diff --git a/client/scripts/didump.lua b/client/scripts/didump.lua
index 9f3f51d71..e85ec8bb9 100644
--- a/client/scripts/didump.lua
+++ b/client/scripts/didump.lua
@@ -49,6 +49,7 @@ local lsh = bit32.lshift
 local rsh = bit32.rshift
 
 -- Some globals
+local PM3_SUCCESS = 0
 local FOO = 'AF62D2EC0491968CC52A1A7165F865FE'
 local BAR = '286329204469736E65792032303133'
 local MIS = '0A14FD0507FF4BCD026BA83F0A3B89A9'
@@ -463,20 +464,19 @@ local function getblockdata(response)
     if not response then
         return nil, 'No response from device'
     end
-
-    local count, cmd, arg0 = bin.unpack('LL', response)
-    if arg0 == 1 then
-        local count, arg1, arg2, data = bin.unpack('LLH511', response, count)
-        return data:sub(1, 32)
+    if response.Status == PM3_SUCCESS then
+        return response.Data
     else
-        return nil, "Couldn't read block.. ["..arg0.."]"
+        return nil, "Couldn't read block.. ["..response.Status.."]"
     end
 end
 
-local function readblock( blocknum, key )
+local function readblock( blockno, key )
     -- Read block N
-    local c = Command:newMIX{cmd = cmds.CMD_MIFARE_READBL, arg1 = blocknum, data = key}
-    local b, err = getblockdata(c:sendMIX())
+    local keytype = '00'
+    local data = ('%02x%s%s'):format(blockno, keytype, key)
+    local c = Command:newNG{cmd = cmds.CMD_MIFARE_READBL, data = data}
+    local b, err = getblockdata(c:sendNG(false))
     if not b then return oops(err) end
     return b
 end
diff --git a/client/scripts/tnp3clone.lua b/client/scripts/tnp3clone.lua
index b168c9d1a..18dd6edfb 100644
--- a/client/scripts/tnp3clone.lua
+++ b/client/scripts/tnp3clone.lua
@@ -40,6 +40,9 @@ Arguments:
     023c - Special
     0020 - Swapforce
 ]]
+
+local PM3_SUCCESS = 0
+
 ---
 -- This is only meant to be used when errors occur
 local function oops(err)
@@ -63,20 +66,19 @@ local function getblockdata(response)
     if not response then
         return nil, 'No response from device'
     end
-
-    local count, cmd, arg0 = bin.unpack('LL', response)
-    if arg0 == 1 then
-        local count, arg1, arg2, data = bin.unpack('LLH511', response, count)
-        return data:sub(1, 32)
+    if response.Status == PM3_SUCCESS then
+        return response.Data
     else
-        return nil, "Couldn't read block.. ["..arg0.."]"
+        return nil, "Couldn't read block.. ["..response.Status.."]"
     end
 end
 
 local function readblock( blocknum, keyA )
     -- Read block N
-    local c = Command:newMIX{cmd = cmds.CMD_MIFARE_READBL, arg1 = blocknum, data = keyA}
-    local b, err = getblockdata(c:sendMIX())
+    local keytype = '00'
+    local data = ('%02x%s%s'):format(blocknum, keytype, keyA)
+    local c = Command:newNG{cmd = cmds.CMD_MIFARE_READBL, data = data}
+    local b, err = getblockdata(c:sendNG(false))
     if not b then return oops(err) end
     return b
 end
diff --git a/client/scripts/tnp3dump.lua b/client/scripts/tnp3dump.lua
index 7da530f7d..9e3c62519 100644
--- a/client/scripts/tnp3dump.lua
+++ b/client/scripts/tnp3dump.lua
@@ -35,6 +35,8 @@ Arguments:
     -p             : Use the precalc to find all keys
     -o             : filename for the saved dumps
 ]]
+
+local PM3_SUCCESS = 0
 local RANDOM = '20436F707972696768742028432920323031302041637469766973696F6E2E20416C6C205269676874732052657365727665642E20'
 local DEBUG = false -- the debug flag
 local numBlocks = 64
@@ -91,13 +93,10 @@ local function getblockdata(response)
     if not response then
         return nil, 'No response from device'
     end
-
-    local count, cmd, arg0 = bin.unpack('LL', response)
-    if arg0 == 1 then
-        local count, arg1, arg2, data = bin.unpack('LLH511', response, count)
-        return data:sub(1, 32)
+    if response.Status == PM3_SUCCESS then
+        return response.Data
     else
-        return nil, "Couldn't read block.. ["..arg0.."]"
+        return nil, "Couldn't read block.. ["..response.Status.."]"
     end
 end
 
@@ -167,16 +166,21 @@ local function main(args)
     local block0, block1
     -- Read block 0
     dbg('Reading block 0')
-    cmd = Command:newMIX{cmd = cmds.CMD_MIFARE_READBL, arg1 = 0, data = keyA}
-    block0, err = getblockdata(cmd:sendMIX(false))
+    local blockno = '00'
+    local keytype = '00'
+    local data = ('%s%s%s'):format(blockno, keytype, keyA)
+    cmd = Command:newNG{cmd = cmds.CMD_MIFARE_READBL, data = data}
+    block0, err = getblockdata(cmd:sendNG(false))
     if not block0 then return oops(err) end
 
     core.clearCommandBuffer()
 
     -- Read block 1
     dbg('Reading block 1')
-    cmd = Command:newMIX{cmd = cmds.CMD_MIFARE_READBL, arg1 = 1, data = keyA}
-    block1, err = getblockdata(cmd:sendMIX(false))
+    local blockno = '01'
+    data = ('%s%s%s'):format(blockno, keytype, keyA)
+    cmd = Command:newNG{cmd = cmds.CMD_MIFARE_READBL, data = data}
+    block1, err = getblockdata(cmd:sendNG(false))
     if not block1 then return oops(err) end
 
     core.clearCommandBuffer()
@@ -203,8 +207,9 @@ local function main(args)
 
         pos = (math.floor( blockNo / 4 ) * 12)+1
         key = akeys:sub(pos, pos + 11 )
-        cmd = Command:newMIX{cmd = cmds.CMD_MIFARE_READBL, arg1 = blockNo, data = key}
-        local blockdata, err = getblockdata(cmd:sendMIX(false))
+        data = ('%02x%s%s'):format(blockNo, keytype, key)
+        cmd = Command:newNG{cmd = cmds.CMD_MIFARE_READBL, data = data}
+        local blockdata, err = getblockdata(cmd:sendNG(false))
         if not blockdata then return oops(err) end
 
         if  blockNo%4 ~= 3 then
diff --git a/include/pm3_cmd.h b/include/pm3_cmd.h
index f0b20858f..4ff2add80 100644
--- a/include/pm3_cmd.h
+++ b/include/pm3_cmd.h
@@ -202,6 +202,12 @@ typedef struct {
     uint8_t data[];
 } PACKED lf_psksim_t;
 
+typedef struct {
+   uint8_t blockno;
+   uint8_t keytype;
+   uint8_t key[6];
+} PACKED mf_readblock_t;
+
 
 // For the bootloader
 #define CMD_DEVICE_INFO                                                   0x0000

From d2fb18f648a50e74bab534a7d119cb363e12b7e4 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 29 May 2019 08:55:12 +0200
Subject: [PATCH 1860/1938] chg: 'hf mf dump' - remove debug statements

---
 client/cmdhfmf.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index d12a3356f..49f91ce4b 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -854,7 +854,6 @@ static int CmdHF14AMfDump(const char *Cmd) {
                     clearCommandBuffer();                    
                     SendCommandNG(CMD_MIFARE_READBL, (uint8_t*)&payload, sizeof(mf_readblock_t));
                     received = WaitForResponseTimeout(CMD_MIFARE_READBL, &resp, 1500);
-                    printf("A\n");                    
                 } else {                                           // data block. Check if it can be read with key A or key B
                     uint8_t data_area = (sectorNo < 32) ? blockNo : blockNo / 5;
                     if ((rights[sectorNo][data_area] == 0x03) || (rights[sectorNo][data_area] == 0x05)) { // only key B would work
@@ -866,7 +865,6 @@ static int CmdHF14AMfDump(const char *Cmd) {
                         clearCommandBuffer();
                         SendCommandNG(CMD_MIFARE_READBL, (uint8_t*)&payload, sizeof(mf_readblock_t));
                         received = WaitForResponseTimeout(CMD_MIFARE_READBL, &resp, 1500);
-                        printf("B\n");
                     } else if (rights[sectorNo][data_area] == 0x07) {                                     // no key would work
                         PrintAndLogEx(WARNING, "access rights do not allow reading of sector %2d block %3d", sectorNo, blockNo);
                         // where do you want to go??  Next sector or block?
@@ -880,7 +878,6 @@ static int CmdHF14AMfDump(const char *Cmd) {
                         clearCommandBuffer();
                         SendCommandNG(CMD_MIFARE_READBL, (uint8_t*)&payload, sizeof(mf_readblock_t));
                         received = WaitForResponseTimeout(CMD_MIFARE_READBL, &resp, 1500);
-                        printf("C\n");
                     }
                 }
                 if (received) {

From b378d373ad518cfc69ad21dc8d7c08cdd90cb6ad Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 29 May 2019 04:00:02 -0400
Subject: [PATCH 1861/1938] chg: USB doesnt need extra delay

---
 client/comms.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/comms.c b/client/comms.c
index 20472ce5b..89e9ec610 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -669,7 +669,7 @@ void CloseProxmark(void) {
 static size_t communication_delay(void) {
     if (conn.send_via_fpc_usart)  // needed also for Windows USB USART??
         return 2 * (12000000 / conn.uart_speed);
-    return 100;
+    return 0;
 }
 
 /**
@@ -690,7 +690,7 @@ bool WaitForResponseTimeoutW(uint32_t cmd, PacketResponseNG *response, size_t ms
         response = &resp;
 
     // Add delay depending on the communication channel & speed
-    if (ms_timeout != (size_t) -1)
+    if (ms_timeout != (size_t) - 1)
         ms_timeout += communication_delay();
 
     __atomic_store_n(&timeout_start_time,  msclock(), __ATOMIC_SEQ_CST);

From 9923765c0a5ea9e2ff521cf11750ea5e518aed5e Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder@google.com>
Date: Wed, 29 May 2019 16:10:54 +0200
Subject: [PATCH 1862/1938] Specify that we need TCP and not UDP connection

Relevant man pages say that with our previous
code libc might return either. Glibc returns tcp but
bionic returns udp. So specify it explicitly
---
 uart/uart_posix.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index ba948132e..915878e37 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -90,7 +90,7 @@ serial_port uart_open(const char *pcPortName, uint32_t speed) {
     timeout.tv_usec = UART_FPC_CLIENT_RX_TIMEOUT_MS * 1000;
 
     if (memcmp(pcPortName, "tcp:", 4) == 0) {
-        struct addrinfo *addr, *rp;
+        struct addrinfo *addr = NULL, *rp;
         char *addrstr = strdup(pcPortName + 4);
 
         if (addrstr == NULL) {
@@ -110,7 +110,13 @@ serial_port uart_open(const char *pcPortName, uint32_t speed) {
             portstr = "7901";
         }
 
-        int s = getaddrinfo(addrstr, portstr, NULL, &addr);
+        struct addrinfo info;
+
+        memset (&info, 0, sizeof(info));
+
+        info.ai_socktype = SOCK_STREAM;
+
+        int s = getaddrinfo(addrstr, portstr, &info, &addr);
         if (s != 0) {
             printf("Error: getaddrinfo: %s\n", gai_strerror(s));
             freeaddrinfo(addr);

From e71235aeb9c3bd164341f38af3f9ad00d9259023 Mon Sep 17 00:00:00 2001
From: Iceman <iceman@iuse.se>
Date: Thu, 30 May 2019 19:21:06 +0200
Subject: [PATCH 1863/1938] Update bt_manual_v10.md

---
 doc/bt_manual_v10.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/bt_manual_v10.md b/doc/bt_manual_v10.md
index 79b5c1acb..1650d8eb0 100644
--- a/doc/bt_manual_v10.md
+++ b/doc/bt_manual_v10.md
@@ -6,6 +6,7 @@ _rev. v1.0 (draft)_
 
 *	Built-in Bluetooth 2.0 with EDR Bluetooth module, default baud rate 115200.
 *	Built-in 400 mAh polymer lithium-ion battery, typical standby time up to 3.5 hours.
+*       400 charges (standard LIPO)
 *	Additional heat dissipating fins can significantly reduce the temperature when the HF antenna is in operation for a long time.
 *	Complete lithium charging management system, seamless switching power supply. Full overcharge and overdischarge protection.
 *	Bluetooth has an independent power switch that can be turned on or off.

From 9056b29e8b68a5ed952897a62687b19b3db27423 Mon Sep 17 00:00:00 2001
From: Iceman <iceman@iuse.se>
Date: Thu, 30 May 2019 19:22:03 +0200
Subject: [PATCH 1864/1938] Update bt_manual_v10.md

---
 doc/bt_manual_v10.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/bt_manual_v10.md b/doc/bt_manual_v10.md
index 1650d8eb0..ef5f85184 100644
--- a/doc/bt_manual_v10.md
+++ b/doc/bt_manual_v10.md
@@ -6,7 +6,6 @@ _rev. v1.0 (draft)_
 
 *	Built-in Bluetooth 2.0 with EDR Bluetooth module, default baud rate 115200.
 *	Built-in 400 mAh polymer lithium-ion battery, typical standby time up to 3.5 hours.
-*       400 charges (standard LIPO)
 *	Additional heat dissipating fins can significantly reduce the temperature when the HF antenna is in operation for a long time.
 *	Complete lithium charging management system, seamless switching power supply. Full overcharge and overdischarge protection.
 *	Bluetooth has an independent power switch that can be turned on or off.
@@ -24,6 +23,7 @@ Built-in battery can support standalone mode, off-line sniffing, off-line readin
 *	Standby time:		3.5h @ StandBy; 2.9h @ LF-On; 50min @ HF-On;
 *	Charging Current:	200mA (Plug in USB Default Charging)
 *	Charging time:		2.5h
+*	Num of charges:         400 -> 70% capacity (standard LIPO)
 *	Bluetooth power:	4dBm, -85 dBm @ 2Mbps
 *	Bluetooth distance:	6m (depending on the environment and device orientation)
 *	Size and weight:	54.4mm * 29.4mm * 13.5mm 24g

From 295945634f788e5a5d36614c9315d4f4cdf5e40b Mon Sep 17 00:00:00 2001
From: Oleg Moiseenko <807634+merlokk@users.noreply.github.com>
Date: Thu, 30 May 2019 20:30:08 +0300
Subject: [PATCH 1865/1938] Update README.md

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index cb54ad77a..b2eea79f9 100644
--- a/README.md
+++ b/README.md
@@ -59,6 +59,8 @@ The new universal GUI will work. [Proxmark3 Universal GUI](https://github.com/bu
 
 Please see the [Proxmark Forum](http://www.proxmark.org/forum/index.php) and see if your issue is listed in the first instance Google is your friend :) Questions will be answered via the forum by Iceman and the team. 
 
+It's need to have good USB cable to connect proxmark to USB. If you have stability problems (pm3 resets, firmware hangs, especially firmware hangs just after start and etc) - check your cable with USB tester (or try to change it). It needs to have resistance like 0.3 Om or less.
+
 ## The end
 
 - [@herrmann1001](https://mobile.twitter.com/herrmann1001) July 2018

From 430742a3b65ba1a499750a11540d5313c12fb183 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 31 May 2019 11:25:49 +0200
Subject: [PATCH 1866/1938] chg: 'mem info - public key'

---
 client/cmdflashmem.c | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/client/cmdflashmem.c b/client/cmdflashmem.c
index a09ac0ce1..bd844b35c 100644
--- a/client/cmdflashmem.c
+++ b/client/cmdflashmem.c
@@ -485,21 +485,18 @@ static int CmdFlashMemInfo(const char *Cmd) {
     print_hex_break(mem.signature, sizeof(mem.signature), 32);
 
 //-------------------------------------------------------------------------------
-// Example RSA-1024 keypair, for test purposes  (from common/polarssl/rsa.c)
+// RRG Public RSA Key
 //
 
-// public key modulus N
-#define RSA_N   "9292758453063D803DD603D5E777D788" \
-    "8ED1D5BF35786190FA2F23EBC0848AEA" \
-    "DDA92CA6C3D80B32C4D109BE0F36D6AE" \
-    "7130B9CED7ACDF54CFC7555AC14EEBAB" \
-    "93A89813FBF3C4F8066D2D800F7C38A8" \
-    "1AE31942917403FF4946B0A83D3D3E05" \
-    "EE57C6F5F5606FB5D4BC6CD34EE0801A" \
-    "5E94BB77B07507233A0BC7BAC8F90F79"
-
 // public key Exponent E
-#define RSA_E   "10001"
+#define RSA_E "010001" 
+
+// public key modulus N
+#define RSA_N "E28D809BF323171D11D1ACA4C32A5B7E0A8974FD171E75AD120D60E9B76968FF4B0A6364AE50583F9555B8EE1A725F279E949246DF0EFCE4C02B9F3ACDCC623F9337F21C0C066FFB703D8BFCB5067F309E056772096642C2B1A8F50305D5EC33DB7FB5A3C8AC42EB635AE3C148C910750ABAA280CE82DC2F180F49F30A1393B5" 
+
+//-------------------------------------------------------------------------------
+// Example RSA-1024 keypair, for test purposes  (from common/polarssl/rsa.c)
+//
 
 // private key  Exponent D
 #define RSA_D   "24BF6185468786FDD303083D25E64EFC" \

From 53e48d70cd708b922aaab274a45aa93a025f3d66 Mon Sep 17 00:00:00 2001
From: Fl0-0 <tonymontana277@hotmail.fr>
Date: Fri, 31 May 2019 14:44:32 +0200
Subject: [PATCH 1867/1938] Makefile platform option for standalone mode

Signed-off-by: Fl0-0 <tonymontana277@hotmail.fr>
---
 Makefile.platform.sample |  1 +
 common/Makefile.hal      | 28 ++++++++++++++++++++--------
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/Makefile.platform.sample b/Makefile.platform.sample
index 8ef572461..217cdccc6 100644
--- a/Makefile.platform.sample
+++ b/Makefile.platform.sample
@@ -1,3 +1,4 @@
 # If you want to use it, copy this file as Makefile.platform and adjust it to your needs
 PLATFORM=PM3RDV4
 #PLATFORM_EXTRAS=BTADDON
+#STANDALONE=HF_COLIN
diff --git a/common/Makefile.hal b/common/Makefile.hal
index 58eddb86e..3f7727730 100644
--- a/common/Makefile.hal
+++ b/common/Makefile.hal
@@ -33,6 +33,9 @@ or if you have a Proxmark 3 RDV4 with the BT add-on:
 PLATFORM=PM3RDV4
 PLATFORM_EXTRAS=BTADDON
 
+Option to choose standalone mode, e.g. HF_COLIN
+SANDALONE=HF_COLIN
+
 !! Make sure to "make clean" when you change platform settings !!
 
 endef
@@ -93,14 +96,23 @@ PLATFORM_DEFS += \
 
 # Standalone mode
 # !! Choose only one !!
-PLATFORM_DEFS += -DWITH_STANDALONE_LF_SAMYRUN
-#PLATFORM_DEFS += -DWITH_STANDALONE_LF_ICERUN
-#PLATFORM_DEFS += -DWITH_STANDALONE_LF_PROXBRUTE
-#PLATFORM_DEFS += -DWITH_STANDALONE_LF_HIDBRUTE
-#PLATFORM_DEFS += -DWITH_STANDALONE_HF_YOUNG
-#PLATFORM_DEFS += -DWITH_STANDALONE_HF_MATTYRUN
-#PLATFORM_DEFS += -DWITH_STANDALONE_HF_COLIN
-#PLATFORM_DEFS += -DWITH_STANDALONE_HF_BOG
+ifneq (,$(findstring LF_ICERUN,$(STANDALONE)))
+    PLATFORM_DEFS += -DWITH_STANDALONE_LF_ICERUN
+else ifneq (,$(findstring LF_PROXBRUTE,$(STANDALONE)))
+    PLATFORM_DEFS += -DWITH_STANDALONE_LF_PROXBRUTE
+else ifneq (,$(findstring LF_HIDBRUTE,$(STANDALONE)))
+    PLATFORM_DEFS += -DWITH_STANDALONE_LF_HIDBRUTE
+else ifneq (,$(findstring HF_YOUNG,$(STANDALONE)))
+    PLATFORM_DEFS += -DWITH_STANDALONE_HF_YOUNG
+else ifneq (,$(findstring HF_MATTYRUN,$(STANDALONE)))
+    PLATFORM_DEFS += -DWITH_STANDALONE_HF_MATTYRUN
+else ifneq (,$(findstring HF_COLIN,$(STANDALONE)))
+    PLATFORM_DEFS += -DWITH_STANDALONE_HF_COLIN
+else ifneq (,$(findstring HF_BOG,$(STANDALONE)))
+    PLATFORM_DEFS += -DWITH_STANDALONE_HF_BOG
+else
+    PLATFORM_DEFS += -DWITH_STANDALONE_LF_SAMYRUN
+endif
 
 $(info $(findstring WITH_STANDALONE_*,$(PLATFORM_DEFS)))
 

From 1560d1f1b316465734c0d48302b79e331d251a45 Mon Sep 17 00:00:00 2001
From: Fl0-0 <tonymontana277@hotmail.fr>
Date: Fri, 31 May 2019 14:54:44 +0200
Subject: [PATCH 1868/1938] using saved STANDALONE print

---
 Makefile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Makefile b/Makefile
index 0a91f50a8..7dbdd9453 100644
--- a/Makefile
+++ b/Makefile
@@ -33,6 +33,9 @@ ifeq ($(PLATFORM),)
     ifneq ($(PLATFORM_EXTRAS),)
         ${info using saved PLATFORM_EXTRAS: '$(PLATFORM_EXTRAS)'}
     endif
+    ifneq ($(STANDALONE),)
+        ${info using saved STANDALONE:      '$(STANDALONE)'}
+    endif
 endif
 
 include common/Makefile.hal

From d5c45a73685a085fad5c48fe3c4d32f5e0c7548c Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 31 May 2019 17:14:57 +0200
Subject: [PATCH 1869/1938] fix: 'mem load'  - erased wrong offsets for
 dictionaries MF/ICLASS.

---
 armsrc/appmain.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 3a48e7b58..6f75d0ccd 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1537,12 +1537,13 @@ static void PacketReceived(PacketCommandNG *packet) {
             Flash_CheckBusy(BUSY_TIMEOUT);
             Flash_WriteEnable();
 
-            if (startidx == DEFAULT_T55XX_KEYS_OFFSET)
+            if (startidx == DEFAULT_T55XX_KEYS_OFFSET) {
                 Flash_Erase4k(3, 0xC);
-            else if (startidx ==  DEFAULT_MF_KEYS_OFFSET)
+            } else if (startidx ==  DEFAULT_MF_KEYS_OFFSET) {
+                Flash_Erase4k(3, 0x9);
+            } else if (startidx == DEFAULT_ICLASS_KEYS_OFFSET) {
                 Flash_Erase4k(3, 0xB);
-            else if (startidx == DEFAULT_ICLASS_KEYS_OFFSET)
-                Flash_Erase4k(3, 0xA);
+            }
 
             Flash_CheckBusy(BUSY_TIMEOUT);
             Flash_WriteEnable();

From d87daf8b76f1964e136ab76b43c904c3715289be Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 31 May 2019 17:15:54 +0200
Subject: [PATCH 1870/1938] fix: 'mem load' - wrong offsets erased for
 dictionaries (MF/ICLASS)

---
 armsrc/appmain.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 6f75d0ccd..556721385 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1541,6 +1541,7 @@ static void PacketReceived(PacketCommandNG *packet) {
                 Flash_Erase4k(3, 0xC);
             } else if (startidx ==  DEFAULT_MF_KEYS_OFFSET) {
                 Flash_Erase4k(3, 0x9);
+                Flash_Erase4k(3, 0xA);
             } else if (startidx == DEFAULT_ICLASS_KEYS_OFFSET) {
                 Flash_Erase4k(3, 0xB);
             }

From a8b09eba3189bc4eb1da14754470fee064e5329d Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 31 May 2019 19:06:22 +0200
Subject: [PATCH 1871/1938] chg: 'hf mfu info' - typo

---
 client/cmdhfmfu.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index bb761e1a5..fc1c8da75 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -686,6 +686,10 @@ static int ndef_print_CC(uint8_t *data) {
     if (data[0] != 0xE1)
         return -1;
 
+//NFC Forum Type 1,2,3,4
+//
+// 4 has 1.1 (11)
+
 // b7, b6 major version
 // b5, b4 minor version
 // b3, b2 read
@@ -736,7 +740,7 @@ static int ndef_print_CC(uint8_t *data) {
     PrintAndLogEx(NORMAL, "       : %s / %s", rStr, wStr);
 
     PrintAndLogEx(NORMAL, "  %02X : Physical Memory Size: %d bytes", data[2], data[2] * 8);
-    if (data[2] == 0x96)
+    if (data[2] == 0x06)
         PrintAndLogEx(NORMAL, "  %02X : NDEF Memory Size: %d bytes", data[2], 48);
     else if (data[2] == 0x12)
         PrintAndLogEx(NORMAL, "  %02X : NDEF Memory Size: %d bytes", data[2], 144);

From 0a3791ea3acaf35cdc067785ef55bc110c84d40b Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 31 May 2019 19:10:01 +0200
Subject: [PATCH 1872/1938] chg: 'lualibs - 14a minor adaptation

---
 client/lualibs/read14a.lua | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/client/lualibs/read14a.lua b/client/lualibs/read14a.lua
index fbb92cbd5..6c44445de 100644
--- a/client/lualibs/read14a.lua
+++ b/client/lualibs/read14a.lua
@@ -63,7 +63,7 @@ local function parse14443a(data)
     } __attribute__((__packed__)) iso14a_card_select_t;
     --]]
 
-    local count, uid, uidlen, atqa, sak, ats_len, ats = bin.unpack('H10CH2CC', data)
+    local count, uid, uidlen, atqa, sak, ats_len, ats = bin.unpack('H10CH2CCH', data)
     uid = uid:sub(1, 2 * uidlen)
     local man_byte = tonumber(uid:sub(1,2), 16)
 
@@ -73,7 +73,8 @@ local function parse14443a(data)
         sak = sak,
         name = tostring_14443a(sak),
         data = data,
-        manufacturer = taglib.lookupManufacturer(man_byte)
+        manufacturer = taglib.lookupManufacturer(man_byte),
+        ats = ats
     }
 end
 
@@ -103,7 +104,7 @@ local function read14443a(dont_disconnect, no_rats)
             return nil, 'iso14443a card select failed'
         end
         data = string.sub(result, count)
-        info, err = parse14443a(data)
+        info = parse14443a(data)
     else
         err = 'No response from card'
     end
@@ -112,7 +113,7 @@ local function read14443a(dont_disconnect, no_rats)
         print(err)
         return nil, err
     end
-    return info
+    return info, nil
 end
 
 ---

From ecc62add269a39af4e1c24b0f0c474ed743b150b Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 31 May 2019 14:07:07 -0400
Subject: [PATCH 1873/1938] fix return check

---
 client/cmdhfmf.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 49f91ce4b..172d58418 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -720,6 +720,8 @@ static uint8_t NumBlocksPerSector(uint8_t sectorNo) {
 
 static int CmdHF14AMfDump(const char *Cmd) {
 
+    uint64_t t1 = msclock();
+
     uint8_t sectorNo, blockNo;
     uint8_t keyA[40][6];
     uint8_t keyB[40][6];
@@ -801,12 +803,12 @@ static int CmdHF14AMfDump(const char *Cmd) {
     PrintAndLogEx(INFO, "Reading sector access bits...");
 
     uint8_t tries;
+    mf_readblock_t payload;
     for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
         for (tries = 0; tries < MIFARE_SECTOR_RETRY; tries++) {
             printf("."); 
             fflush(NULL);
             
-            mf_readblock_t payload;
             payload.blockno = FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1;
             payload.keytype = 0;
             memcpy(payload.key, keyA[sectorNo], sizeof(payload.key));
@@ -839,7 +841,6 @@ static int CmdHF14AMfDump(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "Finished reading sector access bits");
     PrintAndLogEx(INFO, "Dumping all blocks from card...");
 
-    mf_readblock_t payload;
     for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
         for (blockNo = 0; blockNo < NumBlocksPerSector(sectorNo); blockNo++) {
             bool received = false;
@@ -917,7 +918,9 @@ static int CmdHF14AMfDump(const char *Cmd) {
             }
         }
     }
-
+    
+    PrintAndLogEx(SUCCESS, "time: %" PRIu64 " seconds\n", (msclock() - t1) / 1000);
+    
     PrintAndLogEx(SUCCESS, "\nSucceded in dumping all blocks");
 
     if (strlen(dataFilename) < 1) {
@@ -2663,7 +2666,7 @@ int CmdHF14AMfELoad(const char *Cmd) {
             conn.block_after_ACK = false;
         }
 
-        if (mfEmlSetMem_xt(data + counter, blockNum, 1, blockWidth)) {
+        if (mfEmlSetMem_xt(data + counter, blockNum, 1, blockWidth) != PM3_SUCCESS) {
             PrintAndLogEx(FAILED, "Cant set emul block: %3d", blockNum);
             free(data);
             return PM3_ESOFT;
@@ -3179,7 +3182,7 @@ static int CmdHF14AMfCSave(const char *Cmd) {
                 // Disable fast mode on last packet
                 conn.block_after_ACK = false;
             }
-            if (mfEmlSetMem(dump + (i * MFBLOCK_SIZE), i, 5)) {
+            if (mfEmlSetMem(dump + (i * MFBLOCK_SIZE), i, 5) != PM3_SUCCESS) {
                 PrintAndLogEx(WARNING, "Cant set emul block: %d", i);
             }
             printf(".");

From 9dc658b45eac7b3ad1bfae9f1016fd01a5a156f3 Mon Sep 17 00:00:00 2001
From: Fl0-0 <tonymontana277@hotmail.fr>
Date: Fri, 31 May 2019 20:09:01 +0200
Subject: [PATCH 1874/1938] Spelling & default LF_SAMYRUN example

---
 Makefile.platform.sample | 2 +-
 common/Makefile.hal      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile.platform.sample b/Makefile.platform.sample
index 217cdccc6..b0d6cf5fe 100644
--- a/Makefile.platform.sample
+++ b/Makefile.platform.sample
@@ -1,4 +1,4 @@
 # If you want to use it, copy this file as Makefile.platform and adjust it to your needs
 PLATFORM=PM3RDV4
 #PLATFORM_EXTRAS=BTADDON
-#STANDALONE=HF_COLIN
+#STANDALONE=LF_SAMYRUN
diff --git a/common/Makefile.hal b/common/Makefile.hal
index 3f7727730..d22b336fe 100644
--- a/common/Makefile.hal
+++ b/common/Makefile.hal
@@ -33,8 +33,8 @@ or if you have a Proxmark 3 RDV4 with the BT add-on:
 PLATFORM=PM3RDV4
 PLATFORM_EXTRAS=BTADDON
 
-Option to choose standalone mode, e.g. HF_COLIN
-SANDALONE=HF_COLIN
+Option to choose standalone mode, e.g. LF_SAMYRUN
+STANDALONE=LF_SAMYRUN
 
 !! Make sure to "make clean" when you change platform settings !!
 

From ebf714fc6493bc9cbfad41f81d17203f376532bc Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 31 May 2019 21:37:11 +0200
Subject: [PATCH 1875/1938] doc

---
 doc/bt_manual_v10.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/doc/bt_manual_v10.md b/doc/bt_manual_v10.md
index ef5f85184..95197b472 100644
--- a/doc/bt_manual_v10.md
+++ b/doc/bt_manual_v10.md
@@ -33,7 +33,7 @@ Built-in battery can support standalone mode, off-line sniffing, off-line readin
 
 *	Unplug your Proxmark3 RDV4.0 device from any usb cable.
 *	Remove the plastic upper case of Proxmark3 RDV4.0 with opener.
-*	The antenna is temporarily removed with a screwdriver to expose the FPC interface.
+*	Remove temporarily the antenna with a screwdriver to expose the FPC interface.
 *	Turn off all power switches, insert the FPC wire into the FPC connector, and lock the FPC connector.
 *	Tear off the blue film of heat conductive double-sided tape. Align the add-on to the hole positions and gently insert it into the case.
 *	Assembly finished!
@@ -70,12 +70,16 @@ sudo hcitool scan
 Scanning ...
   aa:bb:cc:dd:ee:ff PM3_RDV4.0
 ```
-	Instead of aa:bb:cc:dd:ee:ff, you'll see your MAC address.
+
+Instead of aa:bb:cc:dd:ee:ff, you'll see your MAC address.
 
 2. Bind your BT add-on MAC address to a serial port
 ```sh
 sudo rfcomm bind rfcomm0 aa:bb:cc:dd:ee:ff
 ```
+
+Replace `aa:bb:cc:dd:ee:ff` by yourMAC address.
+
 3. The blue state LED on the add-on will keep blinking after the
 connection is established. Only when the Proxmark3 client opens the
 /dev/rfcomm0 port, the blue LED turns on solid, indicating that the

From b2ecb02adceb1bb82bc534ed9b5cfca8441298fb Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 31 May 2019 21:38:16 +0200
Subject: [PATCH 1876/1938] doc

---
 doc/bt_manual_v10.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/bt_manual_v10.md b/doc/bt_manual_v10.md
index 95197b472..7846c6bce 100644
--- a/doc/bt_manual_v10.md
+++ b/doc/bt_manual_v10.md
@@ -71,18 +71,18 @@ Scanning ...
   aa:bb:cc:dd:ee:ff PM3_RDV4.0
 ```
 
-Instead of aa:bb:cc:dd:ee:ff, you'll see your MAC address.
+Instead of `aa:bb:cc:dd:ee:ff`, you'll see your MAC address.
 
 2. Bind your BT add-on MAC address to a serial port
 ```sh
 sudo rfcomm bind rfcomm0 aa:bb:cc:dd:ee:ff
 ```
 
-Replace `aa:bb:cc:dd:ee:ff` by yourMAC address.
+Replace `aa:bb:cc:dd:ee:ff` by your MAC address.
 
 3. The blue state LED on the add-on will keep blinking after the
 connection is established. Only when the Proxmark3 client opens the
-/dev/rfcomm0 port, the blue LED turns on solid, indicating that the
+`/dev/rfcomm0` port, the blue LED turns on solid, indicating that the
 connection is successful.
 
 4. Use Proxmark client on BT-serial port
@@ -106,7 +106,7 @@ can be searched and connected.
   3. After the connection is established, the blue state LED on add-on will
 turn on solid.
 
-  4. a serial port /dev/ttyUSB0 will be created, use Proxmark3 client on it
+  4. a serial port `/dev/ttyUSB0` will be created, use Proxmark3 client on it
 ```sh
 ./proxmark /dev/ttyUSB0
 ```

From a937d474829ca71d2b2e6edad22bbcebaa9fb825 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 31 May 2019 21:39:45 +0200
Subject: [PATCH 1877/1938] doc

---
 doc/bt_manual_v10.md | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/doc/bt_manual_v10.md b/doc/bt_manual_v10.md
index 7846c6bce..22adda87e 100644
--- a/doc/bt_manual_v10.md
+++ b/doc/bt_manual_v10.md
@@ -51,7 +51,11 @@ Built-in battery can support standalone mode, off-line sniffing, off-line readin
 *	Enter the paired password 1234 and establish the connection.
 *	The blue state LED on the add-on will keep blinking after the connection is established. Only when the mobile phone or computer opens the correct COM port, the blue LED turns on solid, indicating that the connection is successful.
 
-#### (2)	Fast connection using dedicated USB Bluetooth adapter
+#### (2)	Fast connection using dedicated USB Bluetooth adapter under Windows
+
+<p align='center'>
+<img src="http://www.icedev.se/proxmark3/blueshark/addon_hc06_dongle_1.jpg" alt="Image of blue shark add-on HC-06 white dongle" width="300"></p>
+
 *	Install driver:
 http://www.silabs.com/products/development-tools/software/usb-to-uart-bridge-vcp-drivers  
 *	Insert the adapter into the USB port. The adapter will search automatically and establish the connection. The adapter will remember the device that was first connected and after that the same device will be connected.
@@ -95,6 +99,9 @@ restart it again after pairing.
 
 #### (2) Fast connection using dedicated USB Bluetooth adapter under Linux
 
+<p align='center'>
+<img src="http://www.icedev.se/proxmark3/blueshark/addon_hc06_dongle_1.jpg" alt="Image of blue shark add-on HC-06 white dongle" width="300"></p>
+
   1. Insert the adapter into the USB port. The adapter will search
 automatically and establish the connection. The adapter will remember
 the device that was first connected and after that the same device will
@@ -110,8 +117,6 @@ turn on solid.
 ```sh
 ./proxmark /dev/ttyUSB0
 ```
-<p align='center'>
-<img src="http://www.icedev.se/proxmark3/blueshark/addon_hc06_dongle_1.jpg" alt="Image of blue shark add-on HC-06 white dongle" width="300"></p>
 
 ### 5. Compiling / Flashing 
 Please download the latest source code from Rfid Research Group's Github repo:

From 2cffd0f2beb7bfb08ae0cdb9ed7c5f82c0f996b5 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 31 May 2019 21:44:06 +0200
Subject: [PATCH 1878/1938] doc

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b2eea79f9..a834463ad 100644
--- a/README.md
+++ b/README.md
@@ -59,7 +59,7 @@ The new universal GUI will work. [Proxmark3 Universal GUI](https://github.com/bu
 
 Please see the [Proxmark Forum](http://www.proxmark.org/forum/index.php) and see if your issue is listed in the first instance Google is your friend :) Questions will be answered via the forum by Iceman and the team. 
 
-It's need to have good USB cable to connect proxmark to USB. If you have stability problems (pm3 resets, firmware hangs, especially firmware hangs just after start and etc) - check your cable with USB tester (or try to change it). It needs to have resistance like 0.3 Om or less.
+It's needed to have a good USB cable to connect Proxmark3 to USB. If you have stability problems (Proxmark3 resets, firmware hangs, especially firmware hangs just after start, etc.) - check your cable with a USB tester (or try to change it). It needs to have a resistance smaller or equal to 0.3 Ohm.
 
 ## The end
 

From 501919a34ab229c99a86a0f46618afd8e83f1d33 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 31 May 2019 23:07:09 +0200
Subject: [PATCH 1879/1938] flashmem: text

---
 client/cmdflashmem.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/client/cmdflashmem.c b/client/cmdflashmem.c
index bd844b35c..bdc8dc33a 100644
--- a/client/cmdflashmem.c
+++ b/client/cmdflashmem.c
@@ -50,7 +50,9 @@ static int usage_flashmem_read(void) {
 }
 static int usage_flashmem_load(void) {
     PrintAndLogEx(NORMAL, "Loads binary file into flash memory on device");
-    PrintAndLogEx(NORMAL, "Usage:  mem load o <offset> f <file name> m t i");
+    PrintAndLogEx(NORMAL, "Usage:  mem load [o <offset>] f <file name> [m|t|i]");
+    PrintAndLogEx(NORMAL, "Warning: mem area to be written must have been wiped first");
+    PrintAndLogEx(NORMAL, "(this is already taken care when loading dictionaries)");
     PrintAndLogEx(NORMAL, "  o <offset>    :      offset in memory");
     PrintAndLogEx(NORMAL, "  f <filename>  :      file name");
     PrintAndLogEx(NORMAL, "  m             :      upload 6 bytes keys (mifare key dictionary)");
@@ -67,7 +69,7 @@ static int usage_flashmem_load(void) {
 }
 static int usage_flashmem_save(void) {
     PrintAndLogEx(NORMAL, "Saves flash memory on device into the file");
-    PrintAndLogEx(NORMAL, " Usage:  mem save o <offset> l <length> f <file name>");
+    PrintAndLogEx(NORMAL, " Usage:  mem save [o <offset>] [l <length>] f <file name>");
     PrintAndLogEx(NORMAL, "  o <offset>    :      offset in memory");
     PrintAndLogEx(NORMAL, "  l <length>    :      length");
     PrintAndLogEx(NORMAL, "  f <filename>  :      file name");
@@ -88,19 +90,18 @@ static int usage_flashmem_wipe(void) {
 //  PrintAndLogEx(NORMAL, "  i           :      inital total wipe");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
-    PrintAndLogEx(NORMAL, "        mem wipe ");     // wipe page 0,1,2
     PrintAndLogEx(NORMAL, "        mem wipe p 0");  // wipes first page.
     return PM3_SUCCESS;
 }
 static int usage_flashmem_info(void) {
     PrintAndLogEx(NORMAL, "Collect signature and verify it from flash memory\n");
-    PrintAndLogEx(NORMAL, " Usage:  mem info [h|s|w]");
-    PrintAndLogEx(NORMAL, "  s    :      create a signature");
-    PrintAndLogEx(NORMAL, "  w    :      write signature to flash memory");
+    PrintAndLogEx(NORMAL, " Usage:  mem info");
+//    PrintAndLogEx(NORMAL, "  s    :      create a signature");
+//    PrintAndLogEx(NORMAL, "  w    :      write signature to flash memory");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "        mem info");
-    PrintAndLogEx(NORMAL, "        mem info s");
+//    PrintAndLogEx(NORMAL, "        mem info s");
     return PM3_SUCCESS;
 }
 
@@ -357,7 +358,7 @@ static int CmdFlashMemSave(const char *Cmd) {
         return PM3_EMALLOC;
     }
 
-    PrintAndLogEx(NORMAL, "downloading"_YELLOW_("%u")"bytes from flashmem", len);
+    PrintAndLogEx(INFO, "downloading "_YELLOW_("%u")"bytes from flashmem", len);
     if (!GetFromDevice(FLASH_MEM, dump, len, start_index, NULL, -1, true)) {
         PrintAndLogEx(FAILED, "ERROR; downloading from flashmemory");
         free(dump);

From 0898c0c9d10fde9ca60d2eb8aa2f6b17689a9599 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 31 May 2019 23:17:30 +0200
Subject: [PATCH 1880/1938] Fix FLASH_MEM_MAX_SIZE

---
 include/common.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/common.h b/include/common.h
index eccbc4864..c52370de0 100644
--- a/include/common.h
+++ b/include/common.h
@@ -62,7 +62,7 @@ extern uint32_t FLASHMEM_SPIBAUDRATE;
 #endif
 
 #ifndef FLASH_MEM_MAX_SIZE
-# define FLASH_MEM_MAX_SIZE     0x3FFFF  // (262143)
+# define FLASH_MEM_MAX_SIZE     0x40000  // (262143)
 #endif
 
 #ifndef FLASH_MEM_MAX_4K_SECTOR
@@ -79,7 +79,8 @@ extern uint32_t FLASHMEM_SPIBAUDRATE;
 #endif
 
 #ifndef FLASH_MEM_SIGNATURE_OFFSET
-# define FLASH_MEM_SIGNATURE_OFFSET (FLASH_MEM_MAX_SIZE - FLASH_MEM_SIGNATURE_LEN)
+// -1 for historical compatibility with already released Proxmark3 RDV4.0 devices
+# define FLASH_MEM_SIGNATURE_OFFSET (FLASH_MEM_MAX_SIZE - FLASH_MEM_SIGNATURE_LEN - 1)
 #endif
 
 #ifndef T55XX_CONFIG_LEN

From 77dea3212038db4e1fe6c69c648a71aedea2684e Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 31 May 2019 23:18:17 +0200
Subject: [PATCH 1881/1938] text

---
 include/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/common.h b/include/common.h
index c52370de0..682c8da94 100644
--- a/include/common.h
+++ b/include/common.h
@@ -62,7 +62,7 @@ extern uint32_t FLASHMEM_SPIBAUDRATE;
 #endif
 
 #ifndef FLASH_MEM_MAX_SIZE
-# define FLASH_MEM_MAX_SIZE     0x40000  // (262143)
+# define FLASH_MEM_MAX_SIZE     0x40000  // (262144)
 #endif
 
 #ifndef FLASH_MEM_MAX_4K_SECTOR

From e98c4e246d97eb40c4a8ca7287bd872dbab2476f Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 1 Jun 2019 00:23:38 +0200
Subject: [PATCH 1882/1938] rework standalone makefile

---
 armsrc/Makefile             |  3 ++
 armsrc/Standalone/readme.md | 21 +++++++------
 client/Makefile             |  3 ++
 common/Makefile.hal         | 61 ++++++++++++++++++++++---------------
 4 files changed, 54 insertions(+), 34 deletions(-)

diff --git a/armsrc/Makefile b/armsrc/Makefile
index dc661edc6..a364bd187 100644
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -19,6 +19,9 @@ ifeq ($(PLTNAME),)
     ifneq ($(PLATFORM_EXTRAS),)
         ${info using saved PLATFORM_EXTRAS: '$(PLATFORM_EXTRAS)'}
     endif
+    ifneq ($(STANDALONE),)
+        ${info using saved STANDALONE:      '$(STANDALONE)'}
+    endif
     include ../common/Makefile.hal
     $(info ===================================================================)
     $(info Platform name:     $(PLTNAME))
diff --git a/armsrc/Standalone/readme.md b/armsrc/Standalone/readme.md
index c9f7946ad..491d4ab4d 100644
--- a/armsrc/Standalone/readme.md
+++ b/armsrc/Standalone/readme.md
@@ -60,17 +60,18 @@ This leads to your next step, your DEFINE name needed in Makefile.
 
 ## Update COMMON/MAKEFILE.HAL
 
-Add your suggested DEFINE to the samples of directive flag provided in the `common/Makefile.hal`.
+Add your mode to the `common/Makefile.hal` help and modes list:
 ```
-#PLATFORM_DEFS += -DWITH_STANDALONE_LF_SAMYRUN
-#PLATFORM_DEFS += -DWITH_STANDALONE_LF_ICERUN
-#PLATFORM_DEFS += -DWITH_STANDALONE_LF_PROXBRUTE
-#PLATFORM_DEFS += -DWITH_STANDALONE_LF_HIDBRUTE
-#PLATFORM_DEFS += -DWITH_STANDALONE_HF_YOUNG
-#PLATFORM_DEFS += -DWITH_STANDALONE_HF_MATTYRUN
-#PLATFORM_DEFS += -DWITH_STANDALONE_HF_COLIN
-#PLATFORM_DEFS += -DWITH_STANDALONE_HF_BOG
-#PLATFORM_DEFS += -DWITH_STANDALONE_LF_FOO
++==========================================================+
+| STANDALONE      | DESCRIPTION                            |
++==========================================================+
+...
++----------------------------------------------------------+
+| LF_FOO          | My foobar mode will make you coffee    |
++----------------------------------------------------------+
+
+STANDALONE_MODES := LF_SAMYRUN LF_ICERUN LF_PROXBRUTE LF_HIDBRUTE LF_FOO
+STANDALONE_MODES += HF_YOUNG HF_MATTYRUN HF_COLIN HF_BOG
 ```
 
 ## Update ARMSRC/MAKEFILE
diff --git a/client/Makefile b/client/Makefile
index 72b124d73..6153f5ded 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -15,6 +15,9 @@ ifeq ($(PLTNAME),)
   ifneq ($(PLATFORM_EXTRAS),)
     ${info using saved PLATFORM_EXTRAS: '$(PLATFORM_EXTRAS)'}
   endif
+  ifneq ($(STANDALONE),)
+    ${info using saved STANDALONE:      '$(STANDALONE)'}
+  endif
   include ../common/Makefile.hal
   $(info ===================================================================)
   $(info Platform name:     $(PLTNAME))
diff --git a/common/Makefile.hal b/common/Makefile.hal
index d22b336fe..63d5638fd 100644
--- a/common/Makefile.hal
+++ b/common/Makefile.hal
@@ -1,4 +1,6 @@
-define KNOWN_PLATFORMS
+define KNOWN_DEFINITIONS
+
+Known definitions:
 
 +==========================================================+
 | PLATFORM        | DESCRIPTION                            |
@@ -22,18 +24,40 @@ define KNOWN_PLATFORMS
 | BTADDON         | Proxmark3 rdv4 BT add-on               |
 +----------------------------------------------------------+
 
-Options to define platform:
-(1) Run make with PLATFORM specified as follows:
-make PLATFORM=PM3EASY
++==========================================================+
+| STANDALONE      | DESCRIPTION                            |
++==========================================================+
+| (none: def)     | By default no standalone mode          |
++----------------------------------------------------------+
+| LF_SAMYRUN      |                                        |
++----------------------------------------------------------+
+| LF_ICERUN       |                                        |
++----------------------------------------------------------+
+| LF_PROXBRUTE    |                                        |
++----------------------------------------------------------+
+| LF_HIDBRUTE     |                                        |
++----------------------------------------------------------+
+| HF_YOUNG        |                                        |
++----------------------------------------------------------+
+| HF_MATTYRUN     |                                        |
++----------------------------------------------------------+
+| HF_COLIN        |                                        |
++----------------------------------------------------------+
+| HF_BOG          |                                        |
++----------------------------------------------------------+
+
+
+Options to define platform, platform extras and/or standalone mode:
+(1) Run make with PLATFORM, PLATFORM_EXTRAS and/or STANDALONE as follows:
+make PLATFORM=PM3EASY STANDALONE=LF_SAMYRUN
 
 (2) Save a file called Makefile.platform with contents:
 PLATFORM=PM3EASY
+STANDALONE=LF_SAMYRUN
 
 or if you have a Proxmark 3 RDV4 with the BT add-on:
 PLATFORM=PM3RDV4
 PLATFORM_EXTRAS=BTADDON
-
-Option to choose standalone mode, e.g. LF_SAMYRUN
 STANDALONE=LF_SAMYRUN
 
 !! Make sure to "make clean" when you change platform settings !!
@@ -62,7 +86,7 @@ else ifeq ($(PLATFORM),PM3OLD512)
     MCU = AT91SAM7S512
     PLTNAME = Proxmark3 V1 with AT91SAM7S512
 else
-    $(error Invalid or empty PLATFORM: $(PLATFORM). Known platforms: $(KNOWN_PLATFORMS))
+    $(error Invalid or empty PLATFORM: $(PLATFORM). $(KNOWN_DEFINITIONS))
 endif
 
 # parsing additional PLATFORM_EXTRAS tokens
@@ -95,23 +119,12 @@ PLATFORM_DEFS += \
     -DWITH_HFSNIFF
 
 # Standalone mode
-# !! Choose only one !!
-ifneq (,$(findstring LF_ICERUN,$(STANDALONE)))
-    PLATFORM_DEFS += -DWITH_STANDALONE_LF_ICERUN
-else ifneq (,$(findstring LF_PROXBRUTE,$(STANDALONE)))
-    PLATFORM_DEFS += -DWITH_STANDALONE_LF_PROXBRUTE
-else ifneq (,$(findstring LF_HIDBRUTE,$(STANDALONE)))
-    PLATFORM_DEFS += -DWITH_STANDALONE_LF_HIDBRUTE
-else ifneq (,$(findstring HF_YOUNG,$(STANDALONE)))
-    PLATFORM_DEFS += -DWITH_STANDALONE_HF_YOUNG
-else ifneq (,$(findstring HF_MATTYRUN,$(STANDALONE)))
-    PLATFORM_DEFS += -DWITH_STANDALONE_HF_MATTYRUN
-else ifneq (,$(findstring HF_COLIN,$(STANDALONE)))
-    PLATFORM_DEFS += -DWITH_STANDALONE_HF_COLIN
-else ifneq (,$(findstring HF_BOG,$(STANDALONE)))
-    PLATFORM_DEFS += -DWITH_STANDALONE_HF_BOG
-else
-    PLATFORM_DEFS += -DWITH_STANDALONE_LF_SAMYRUN
+STANDALONE_MODES := LF_SAMYRUN LF_ICERUN LF_PROXBRUTE LF_HIDBRUTE
+STANDALONE_MODES += HF_YOUNG HF_MATTYRUN HF_COLIN HF_BOG
+ifneq ($(filter $(STANDALONE),$(STANDALONE_MODES)),)
+    PLATFORM_DEFS += -DWITH_STANDALONE_$(STANDALONE)
+else ifneq ($(STANDALONE),)
+    $(error Invalid STANDALONE: $(STANDALONE). $(KNOWN_DEFINITIONS))
 endif
 
 $(info $(findstring WITH_STANDALONE_*,$(PLATFORM_DEFS)))

From 940cb1f64f312a54e212ce360b86844fc20a1f79 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 1 Jun 2019 00:39:03 +0200
Subject: [PATCH 1883/1938] standalone doc

---
 common/Makefile.hal | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/common/Makefile.hal b/common/Makefile.hal
index 63d5638fd..9b687b7f4 100644
--- a/common/Makefile.hal
+++ b/common/Makefile.hal
@@ -27,26 +27,33 @@ Known definitions:
 +==========================================================+
 | STANDALONE      | DESCRIPTION                            |
 +==========================================================+
-| (none: def)     | By default no standalone mode          |
+| (def)           | By default, no standalone mode         |
 +----------------------------------------------------------+
-| LF_SAMYRUN      |                                        |
+| LF_ICERUN       | standalone mode skeleton               |
+|                 | - iceman                               |
 +----------------------------------------------------------+
-| LF_ICERUN       |                                        |
+| LF_SAMYRUN      | HID26 read/clone/sim                   |
+|                 | - Samy Kamkar                          |
 +----------------------------------------------------------+
-| LF_PROXBRUTE    |                                        |
+| LF_PROXBRUTE    | HID ProxII bruteforce                  |
+|                 | - Brad Antoniewicz                     |
 +----------------------------------------------------------+
-| LF_HIDBRUTE     |                                        |
+| LF_HIDBRUTE     | HID corporate 1000 bruteforce          |
+|                 | - Federico dotta & Maurizio Agazzini   |
 +----------------------------------------------------------+
-| HF_YOUNG        |                                        |
+| HF_YOUNG        | Mifare sniff/simulation                |
+|                 | - Craig Young                          |
 +----------------------------------------------------------+
-| HF_MATTYRUN     |                                        |
+| HF_MATTYRUN     | Mifare sniff/clone                     |
+|                 | - Matías A. Ré Medina                  |
 +----------------------------------------------------------+
-| HF_COLIN        |                                        |
+| HF_COLIN        | Mifare ultra fast sniff/sim/clone      |
+|                 | - Colin Brigato                        |
 +----------------------------------------------------------+
-| HF_BOG          |                                        |
+| HF_BOG          | 14a sniff with ULC/ULEV1/NTAG auth     |
+|                 | storing in flashmem - Bogito           |
 +----------------------------------------------------------+
 
-
 Options to define platform, platform extras and/or standalone mode:
 (1) Run make with PLATFORM, PLATFORM_EXTRAS and/or STANDALONE as follows:
 make PLATFORM=PM3EASY STANDALONE=LF_SAMYRUN

From 5e83fcbd58d987e74069072e5280abea1be14757 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 1 Jun 2019 00:59:11 +0200
Subject: [PATCH 1884/1938] client Makefile doesn't use PLATFORM_DEFS anymore

---
 client/Makefile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/client/Makefile b/client/Makefile
index 6153f5ded..1c4df85bf 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -121,8 +121,6 @@ else
     QTGUIOBJS = $(OBJDIR)/guidummy.o
 endif
 
-CFLAGS += $(PLATFORM_DEFS)
-
 # Flags to generate temporary dependency files
 DEPFLAGS = -MT $@ -MMD -MP -MF $(OBJDIR)/$*.Td
 # make temporary to final dependeny files after successful compilation

From 9b668e3827dcf2f9b88ebae64b24668612ced7cc Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 1 Jun 2019 01:03:34 +0200
Subject: [PATCH 1885/1938] client Makefile doesn't depend on platform specs
 anymore

---
 client/Makefile | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/client/Makefile b/client/Makefile
index 1c4df85bf..78704b9a2 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -4,30 +4,6 @@
 # the license.
 #-----------------------------------------------------------------------------
 
-# This Makefile might have been called directly, not via the root Makefile, so:
-ifeq ($(PLTNAME),)
-  -include ../Makefile.platform
-  ifeq ($(PLATFORM),)
-    PLATFORM=PM3RDV4
-  else
-    ${info using saved PLATFORM:        '$(PLATFORM)'}
-  endif
-  ifneq ($(PLATFORM_EXTRAS),)
-    ${info using saved PLATFORM_EXTRAS: '$(PLATFORM_EXTRAS)'}
-  endif
-  ifneq ($(STANDALONE),)
-    ${info using saved STANDALONE:      '$(STANDALONE)'}
-  endif
-  include ../common/Makefile.hal
-  $(info ===================================================================)
-  $(info Platform name:     $(PLTNAME))
-  $(info PLATFORM:          $(PLATFORM))
-  $(info PLATFORM_EXTRAS:   $(PLATFORM_EXTRAS))
-  $(info Included options:  $(PLATFORM_DEFS_INFO))
-  $(info Standalone mode:   $(PLATFORM_DEFS_INFO_STANDALONE))
-  $(info ===================================================================)
-endif
-
 # reveng will compile without macros, but these may be useful:
 # Add -DBMPMACRO to use bitmap size constant macros (edit config.h)
 # Add -DNOFORCE  to disable the -F switch

From 355319e36aab6360d67f29a7a446c00e3b054e66 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 1 Jun 2019 01:37:02 +0200
Subject: [PATCH 1886/1938] Automate make clean when platform definitions are
 changed

---
 .gitignore          |  2 ++
 Makefile            | 21 +++++++++++++++++----
 armsrc/Makefile     |  6 ++++++
 common/Makefile.hal |  9 +++++++++
 4 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 32f879cc7..bad050e8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,8 @@ version.c
 
 # new build file for add-ons.
 Makefile.platform
+# Cache for detecting platform def changes
+.Makefile.options.cache
 
 !client/hardnested/*.bin
 !client/hardnested/tables/*.z
diff --git a/Makefile b/Makefile
index 7dbdd9453..1b27be069 100644
--- a/Makefile
+++ b/Makefile
@@ -25,6 +25,7 @@ endif
 
 ifeq ($(PLATFORM),)
     -include Makefile.platform
+    -include .Makefile.options.cache
     ifeq ($(PLATFORM),)
         PLATFORM=PM3RDV4
     else
@@ -54,17 +55,17 @@ mfkey/%: FORCE
 	$(MAKE) -C tools/mfkey $(patsubst mfkey/%,%,$@)
 nonce2key/%: FORCE
 	$(MAKE) -C tools/nonce2key $(patsubst nonce2key/%,%,$@)
-bootrom/%: FORCE
+bootrom/%: FORCE cleanifplatformchanged
 	$(MAKE) -C bootrom $(patsubst bootrom/%,%,$@)
-armsrc/%: FORCE
+armsrc/%: FORCE cleanifplatformchanged
 	$(MAKE) -C armsrc $(patsubst armsrc/%,%,$@)
 client/%: FORCE
 	$(MAKE) -C client $(patsubst client/%,%,$@)
-recovery/%: FORCE bootrom/% armsrc/%
+recovery/%: FORCE cleanifplatformchanged bootrom/% armsrc/%
 	$(MAKE) -C recovery $(patsubst recovery/%,%,$@)
 FORCE: # Dummy target to force remake in the subdirectories, even if files exist (this Makefile doesn't know about the prerequisites)
 
-.PHONY: all clean help _test bootrom flash-bootrom os flash-os flash-all recovery client mfkey nounce2key style checks FORCE udev accessrights
+.PHONY: all clean help _test bootrom flash-bootrom os flash-os flash-all recovery client mfkey nounce2key style checks FORCE udev accessrights cleanifplatformchanged
 
 help:
 	@echo "Multi-OS Makefile"
@@ -117,6 +118,18 @@ newtarbin:
 tarbin: newtarbin client/tarbin armsrc/tarbin bootrom/tarbin
 	$(GZIP) proxmark3-$(platform)-bin.tar
 
+# detect if there were changes in the platform definitions, requiring a clean
+cleanifplatformchanged:
+ifeq ($(PLATFORM_CHANGED), true)
+	echo "Platform definitions changed, cleaning bootrom/armsrc/recovery first..."
+	$(MAKE) -C bootrom clean
+	$(MAKE) -C armsrc clean
+	$(MAKE) -C recovery clean
+	@echo CACHED_PLATFORM=$(PLATFORM) > .Makefile.options.cache
+	@echo CACHED_PLATFORM_EXTRAS=$(PLATFORM_EXTRAS) >> .Makefile.options.cache
+	@echo CACHED_PLATFORM_DEFS=$(PLATFORM_DEFS) >> .Makefile.options.cache
+endif
+
 # configure system to ignore PM3 device as a modem (ModemManager blacklist, effective *only* if ModemManager is not using _strict_ policy)
 # Read doc/md/ModemManager-Must-Be-Discarded.md for more info
 udev:
diff --git a/armsrc/Makefile b/armsrc/Makefile
index a364bd187..e7788776a 100644
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -11,6 +11,7 @@ APP_INCLUDES = apps.h
 # This Makefile might have been called directly, not via the root Makefile, so:
 ifeq ($(PLTNAME),)
     -include ../Makefile.platform
+    -include ../.Makefile.options.cache
     ifeq ($(PLATFORM),)
         PLATFORM=PM3RDV4
     else
@@ -30,6 +31,11 @@ ifeq ($(PLTNAME),)
     $(info Included options:  $(PLATFORM_DEFS_INFO))
     $(info Standalone mode:   $(PLATFORM_DEFS_INFO_STANDALONE))
     $(info ===================================================================)
+
+# detect if there were changes in the platform definitions, requiring a clean
+ifeq ($(PLATFORM_CHANGED), true)
+    $(error platform definitions have been changed, please "make clean" at the root of the project)
+endif
 endif
 
 #remove one of the following defines and comment out the relevant line
diff --git a/common/Makefile.hal b/common/Makefile.hal
index 9b687b7f4..98ad81da0 100644
--- a/common/Makefile.hal
+++ b/common/Makefile.hal
@@ -163,3 +163,12 @@ export MCU
 export PLATFORM_DEFS
 export PLATFORM_DEFS_INFO
 export PLATFORM_DEFS_INFO_STANDALONE
+
+PLATFORM_CHANGED=false
+ifneq ($(PLATFORM), $(CACHED_PLATFORM))
+    PLATFORM_CHANGED=true
+else ifneq ($(PLATFORM_EXTRAS), $(CACHED_PLATFORM_EXTRAS))
+    PLATFORM_CHANGED=true
+else ifneq ($(PLATFORM_DEFS), $(CACHED_PLATFORM_DEFS))
+    PLATFORM_CHANGED=true
+endif

From 1c2b6458f2346df674cc358ca12a8d37c61f76cd Mon Sep 17 00:00:00 2001
From: Fl0-0 <tonymontana277@hotmail.fr>
Date: Sat, 1 Jun 2019 11:33:50 +0200
Subject: [PATCH 1887/1938] Changelog standalone Makefile.hal &
 Makefile.platform

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b390bbc56..8c057babc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [unreleased][unreleased]
+ - Add STANDALONE option to Makefile.hal (@Fl0-0)
  - Add support new frame format in all Lua scripts (@iceman)
  - Add CMD_CAPABILITIES for pm3 to inform dynamically the client (@doegox)
  - Change baudrate handling, make it clear it's only indicative for USB-CDC & BT (@doegox)

From 5a80490d43cf25e3ec206740a1a4e1a77b617cef Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 1 Jun 2019 09:36:15 -0400
Subject: [PATCH 1888/1938] fix: skeleton compiles

---
 armsrc/Standalone/lf_icerun.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/armsrc/Standalone/lf_icerun.c b/armsrc/Standalone/lf_icerun.c
index bb1d8f6ac..5ce5a7955 100644
--- a/armsrc/Standalone/lf_icerun.c
+++ b/armsrc/Standalone/lf_icerun.c
@@ -35,7 +35,6 @@ void RunMod() {
             break;
     }
 
-out:
     DbpString("[=] exiting");
     LEDsoff();
 }

From 3bf26f2808be867b069dcaae28cf4a523e89c2e7 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 1 Jun 2019 22:49:28 +0200
Subject: [PATCH 1889/1938] simplify makefile

---
 Makefile            | 26 ++------------------------
 armsrc/Makefile     | 25 +++----------------------
 common/Makefile.hal | 11 +++++++++++
 3 files changed, 16 insertions(+), 46 deletions(-)

diff --git a/Makefile b/Makefile
index 1b27be069..122c0bb3c 100644
--- a/Makefile
+++ b/Makefile
@@ -23,32 +23,10 @@ else
     PATHSEP=\\#
 endif
 
-ifeq ($(PLATFORM),)
-    -include Makefile.platform
-    -include .Makefile.options.cache
-    ifeq ($(PLATFORM),)
-        PLATFORM=PM3RDV4
-    else
-        ${info using saved PLATFORM:        '$(PLATFORM)'}
-    endif
-    ifneq ($(PLATFORM_EXTRAS),)
-        ${info using saved PLATFORM_EXTRAS: '$(PLATFORM_EXTRAS)'}
-    endif
-    ifneq ($(STANDALONE),)
-        ${info using saved STANDALONE:      '$(STANDALONE)'}
-    endif
-endif
-
+-include Makefile.platform
+-include .Makefile.options.cache
 include common/Makefile.hal
 
-$(info ===================================================================)
-$(info Platform name:     $(PLTNAME))
-$(info PLATFORM:          $(PLATFORM))
-$(info PLATFORM_EXTRAS:   $(PLATFORM_EXTRAS))
-$(info Included options:  $(PLATFORM_DEFS_INFO))
-$(info Standalone mode:   $(PLATFORM_DEFS_INFO_STANDALONE))
-$(info ===================================================================)
-
 all clean: %: client/% bootrom/% armsrc/% recovery/% mfkey/% nonce2key/%
 
 mfkey/%: FORCE
diff --git a/armsrc/Makefile b/armsrc/Makefile
index e7788776a..1c580c005 100644
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -12,30 +12,11 @@ APP_INCLUDES = apps.h
 ifeq ($(PLTNAME),)
     -include ../Makefile.platform
     -include ../.Makefile.options.cache
-    ifeq ($(PLATFORM),)
-        PLATFORM=PM3RDV4
-    else
-        ${info using saved PLATFORM:        '$(PLATFORM)'}
-    endif
-    ifneq ($(PLATFORM_EXTRAS),)
-        ${info using saved PLATFORM_EXTRAS: '$(PLATFORM_EXTRAS)'}
-    endif
-    ifneq ($(STANDALONE),)
-        ${info using saved STANDALONE:      '$(STANDALONE)'}
-    endif
     include ../common/Makefile.hal
-    $(info ===================================================================)
-    $(info Platform name:     $(PLTNAME))
-    $(info PLATFORM:          $(PLATFORM))
-    $(info PLATFORM_EXTRAS:   $(PLATFORM_EXTRAS))
-    $(info Included options:  $(PLATFORM_DEFS_INFO))
-    $(info Standalone mode:   $(PLATFORM_DEFS_INFO_STANDALONE))
-    $(info ===================================================================)
-
 # detect if there were changes in the platform definitions, requiring a clean
-ifeq ($(PLATFORM_CHANGED), true)
-    $(error platform definitions have been changed, please "make clean" at the root of the project)
-endif
+    ifeq ($(PLATFORM_CHANGED), true)
+        $(error platform definitions have been changed, please "make clean" at the root of the project)
+    endif
 endif
 
 #remove one of the following defines and comment out the relevant line
diff --git a/common/Makefile.hal b/common/Makefile.hal
index 98ad81da0..5faf8a56d 100644
--- a/common/Makefile.hal
+++ b/common/Makefile.hal
@@ -1,3 +1,6 @@
+# Default platform if no platform specified
+PLATFORM?=PM3RDV4
+
 define KNOWN_DEFINITIONS
 
 Known definitions:
@@ -172,3 +175,11 @@ else ifneq ($(PLATFORM_EXTRAS), $(CACHED_PLATFORM_EXTRAS))
 else ifneq ($(PLATFORM_DEFS), $(CACHED_PLATFORM_DEFS))
     PLATFORM_CHANGED=true
 endif
+
+$(info ===================================================================)
+$(info Platform name:     $(PLTNAME))
+$(info PLATFORM:          $(PLATFORM))
+$(info PLATFORM_EXTRAS:   $(PLATFORM_EXTRAS))
+$(info Included options:  $(PLATFORM_DEFS_INFO))
+$(info Standalone mode:   $(PLATFORM_DEFS_INFO_STANDALONE))
+$(info ===================================================================)

From 8c0cd4cfa245959d1fe95ce57f0e973dc40bef41 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 2 Jun 2019 00:25:25 +0200
Subject: [PATCH 1890/1938] Cleaner makefile execution, use 'make Q=' if you
 want to see full lines

---
 Makefile                 | 40 ++++++++++------
 armsrc/Makefile          | 56 ++++++++++++++---------
 bootrom/Makefile         | 21 +++++----
 client/Makefile          | 99 ++++++++++++++++++++++++----------------
 client/jansson/Makefile  | 15 ++++--
 client/tinycbor/Makefile | 15 ++++--
 common/Makefile.common   | 19 ++++++--
 common/mbedtls/Makefile  | 15 ++++--
 fpga/Makefile            | 34 ++++++++------
 liblua/Makefile          | 44 +++++++++++-------
 recovery/Makefile        | 11 +++--
 tools/mfkey/Makefile     | 12 +++--
 tools/nonce2key/Makefile | 17 +++++--
 13 files changed, 253 insertions(+), 145 deletions(-)

diff --git a/Makefile b/Makefile
index 122c0bb3c..e6b2f6fbe 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,7 @@
+# Hide full compilation line:
+Q?=@
+# To see full command lines, use make Q=
+
 GZIP=gzip
 # Windows' echo echos its input verbatim, on Posix there is some
 #  amount of shell command line parsing going on. echo "" on
@@ -30,17 +34,23 @@ include common/Makefile.hal
 all clean: %: client/% bootrom/% armsrc/% recovery/% mfkey/% nonce2key/%
 
 mfkey/%: FORCE
-	$(MAKE) -C tools/mfkey $(patsubst mfkey/%,%,$@)
+	$(info [*] MAKE $@)
+	$(Q)$(MAKE) --no-print-directory -C tools/mfkey $(patsubst mfkey/%,%,$@)
 nonce2key/%: FORCE
-	$(MAKE) -C tools/nonce2key $(patsubst nonce2key/%,%,$@)
+	$(info [*] MAKE $@)
+	$(Q)$(MAKE) --no-print-directory -C tools/nonce2key $(patsubst nonce2key/%,%,$@)
 bootrom/%: FORCE cleanifplatformchanged
-	$(MAKE) -C bootrom $(patsubst bootrom/%,%,$@)
+	$(info [*] MAKE $@)
+	$(Q)$(MAKE) --no-print-directory -C bootrom $(patsubst bootrom/%,%,$@)
 armsrc/%: FORCE cleanifplatformchanged
-	$(MAKE) -C armsrc $(patsubst armsrc/%,%,$@)
+	$(info [*] MAKE $@)
+	$(Q)$(MAKE) --no-print-directory -C armsrc $(patsubst armsrc/%,%,$@)
 client/%: FORCE
-	$(MAKE) -C client $(patsubst client/%,%,$@)
+	$(info [*] MAKE $@)
+	$(Q)$(MAKE) --no-print-directory -C client $(patsubst client/%,%,$@)
 recovery/%: FORCE cleanifplatformchanged bootrom/% armsrc/%
-	$(MAKE) -C recovery $(patsubst recovery/%,%,$@)
+	$(info [*] MAKE $@)
+	$(Q)$(MAKE) --no-print-directory -C recovery $(patsubst recovery/%,%,$@)
 FORCE: # Dummy target to force remake in the subdirectories, even if files exist (this Makefile doesn't know about the prerequisites)
 
 .PHONY: all clean help _test bootrom flash-bootrom os flash-os flash-all recovery client mfkey nounce2key style checks FORCE udev accessrights cleanifplatformchanged
@@ -67,6 +77,7 @@ help:
 	@echo "+ checks        - Detect various encoding issues in source code"
 	@echo
 	@echo "Possible platforms: try \"make PLATFORM=\" for more info, default is PM3RDV4"
+	@echo "To see full command lines, use make Q="
 
 client: client/all
 
@@ -94,18 +105,19 @@ newtarbin:
 	@touch proxmark3-$(platform)-bin.tar
 
 tarbin: newtarbin client/tarbin armsrc/tarbin bootrom/tarbin
-	$(GZIP) proxmark3-$(platform)-bin.tar
+	$(info GEN proxmark3-$(platform)-bin.tar)
+	$(Q)$(GZIP) proxmark3-$(platform)-bin.tar
 
 # detect if there were changes in the platform definitions, requiring a clean
 cleanifplatformchanged:
 ifeq ($(PLATFORM_CHANGED), true)
-	echo "Platform definitions changed, cleaning bootrom/armsrc/recovery first..."
-	$(MAKE) -C bootrom clean
-	$(MAKE) -C armsrc clean
-	$(MAKE) -C recovery clean
-	@echo CACHED_PLATFORM=$(PLATFORM) > .Makefile.options.cache
-	@echo CACHED_PLATFORM_EXTRAS=$(PLATFORM_EXTRAS) >> .Makefile.options.cache
-	@echo CACHED_PLATFORM_DEFS=$(PLATFORM_DEFS) >> .Makefile.options.cache
+	$(info [!] Platform definitions changed, cleaning bootrom/armsrc/recovery first...)
+	$(Q)$(MAKE) --no-print-directory -C bootrom clean
+	$(Q)$(MAKE) --no-print-directory -C armsrc clean
+	$(Q)$(MAKE) --no-print-directory -C recovery clean
+	$(Q)echo CACHED_PLATFORM=$(PLATFORM) > .Makefile.options.cache
+	$(Q)echo CACHED_PLATFORM_EXTRAS=$(PLATFORM_EXTRAS) >> .Makefile.options.cache
+	$(Q)echo CACHED_PLATFORM_DEFS=$(PLATFORM_DEFS) >> .Makefile.options.cache
 endif
 
 # configure system to ignore PM3 device as a modem (ModemManager blacklist, effective *only* if ModemManager is not using _strict_ policy)
diff --git a/armsrc/Makefile b/armsrc/Makefile
index 1c580c005..d55b0e5a7 100644
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -1,4 +1,3 @@
-
 # This code is licensed to you under the terms of the GNU GPL, version 2 or,
 # at your option, any later version. See the LICENSE.txt file for the text of
 # the license.
@@ -173,53 +172,66 @@ all: $(OBJS)
 
 # version.c should be remade on every time fullimage.stage1.elf should be remade
 version.c: default_version.c $(OBJDIR)/fpga_version_info.o $(OBJDIR)/fpga_all.o $(THUMBOBJ) $(ARMOBJ)
-	perl ../tools/mkversion.pl .. > $@ || $(COPY) $^ $@
+	$(info [-] GEN $@)
+	$(Q)perl ../tools/mkversion.pl .. > $@ || $(COPY) $^ $@
 
 fpga_version_info.c: $(FPGA_BITSTREAMS) $(FPGA_COMPRESSOR)
-	$(FPGA_COMPRESSOR) -v $(filter %.bit,$^) $@
+	$(info [-] GEN $@)
+	$(Q)$(FPGA_COMPRESSOR) -v $(filter %.bit,$^) $@
 
 $(OBJDIR)/fpga_all.o: $(OBJDIR)/fpga_all.bit.z
-	$(OBJCOPY) -O elf32-littlearm -I binary -B arm --prefix-sections=fpga_all_bit $^ $@
+	$(info [-] GEN $@)
+	$(Q)$(OBJCOPY) -O elf32-littlearm -I binary -B arm --prefix-sections=fpga_all_bit $^ $@
 
 $(OBJDIR)/fpga_all.bit.z: $(FPGA_BITSTREAMS) $(FPGA_COMPRESSOR)
-	$(FPGA_COMPRESSOR) $(filter %.bit,$^) $@
+	$(info [-] GEN $@)
+	$(Q)$(FPGA_COMPRESSOR) $(filter %.bit,$^) $@
 
 $(FPGA_COMPRESSOR):
-		$(MAKE) -C ../client $(notdir $(FPGA_COMPRESSOR))
+	$(info [*] MAKE $@)
+	$(Q)$(MAKE) --no-print-directory -C ../client $(notdir $(FPGA_COMPRESSOR))
 
 $(OBJDIR)/fullimage.stage1.elf: $(VERSIONOBJ) $(OBJDIR)/fpga_all.o $(THUMBOBJ) $(ARMOBJ)
-	$(CC) $(LDFLAGS) -Wl,-T,ldscript,-Map,$(patsubst %.elf,%.map,$@) -o $@ $^ $(LIBS)
+	$(info [=] LD $@)
+	$(Q)$(CC) $(LDFLAGS) -Wl,-T,ldscript,-Map,$(patsubst %.elf,%.map,$@) -o $@ $^ $(LIBS)
 
 $(OBJDIR)/fullimage.nodata.bin: $(OBJDIR)/fullimage.stage1.elf
-	$(OBJCOPY) -O binary -I elf32-littlearm --remove-section .data $^ $@
+	$(info [-] GEN $@)
+	$(Q)$(OBJCOPY) -O binary -I elf32-littlearm --remove-section .data $^ $@
 
 $(OBJDIR)/fullimage.nodata.o: $(OBJDIR)/fullimage.nodata.bin
-	$(OBJCOPY) -O elf32-littlearm -I binary -B arm --rename-section .data=stage1_image $^ $@
+	$(info [-] GEN $@)
+	$(Q)$(OBJCOPY) -O elf32-littlearm -I binary -B arm --rename-section .data=stage1_image $^ $@
 
 $(OBJDIR)/fullimage.data.bin: $(OBJDIR)/fullimage.stage1.elf
-	$(OBJCOPY) -O binary -I elf32-littlearm --only-section .data $^ $@
+	$(info [-] GEN $@)
+	$(Q)$(OBJCOPY) -O binary -I elf32-littlearm --only-section .data $^ $@
 
 $(OBJDIR)/fullimage.data.bin.z: $(OBJDIR)/fullimage.data.bin $(FPGA_COMPRESSOR)
-	$(FPGA_COMPRESSOR) $(filter %.bin,$^) $@
+	$(info [-] GEN $@)
+	$(Q)$(FPGA_COMPRESSOR) $(filter %.bin,$^) $@
 
 $(OBJDIR)/fullimage.data.o: $(OBJDIR)/fullimage.data.bin.z
-	$(OBJCOPY) -O elf32-littlearm -I binary -B arm --rename-section .data=compressed_data $^ $@
+	$(info [-] GEN $@)
+	$(Q)$(OBJCOPY) -O elf32-littlearm -I binary -B arm --rename-section .data=compressed_data $^ $@
 
 $(OBJDIR)/fullimage.elf: $(OBJDIR)/fullimage.nodata.o $(OBJDIR)/fullimage.data.o
-	$(CC) $(LDFLAGS) -Wl,-T,ldscript,-e,_osimage_entry,-Map,$(patsubst %.elf,%.map,$@) -o $@ $^
+	$(info [=] LD $@)
+	$(Q)$(CC) $(LDFLAGS) -Wl,-T,ldscript,-e,_osimage_entry,-Map,$(patsubst %.elf,%.map,$@) -o $@ $^
 
 tarbin: $(OBJS)
-	$(TAR) $(TARFLAGS) ../proxmark3-$(platform)-bin.tar $(OBJS:%=armsrc/%) $(OBJS:%.s19=armsrc/%.elf)
+	$(info TAR $@)
+	$(Q)$(TAR) $(TARFLAGS) ../proxmark3-$(platform)-bin.tar $(OBJS:%=armsrc/%) $(OBJS:%.s19=armsrc/%.elf)
 
 clean:
-	$(DELETE) $(OBJDIR)$(PATHSEP)*.o
-	$(DELETE) $(OBJDIR)$(PATHSEP)*.elf
-	$(DELETE) $(OBJDIR)$(PATHSEP)*.s19
-	$(DELETE) $(OBJDIR)$(PATHSEP)*.map
-	$(DELETE) $(OBJDIR)$(PATHSEP)*.d
-	$(DELETE) $(OBJDIR)$(PATHSEP)*.z
-	$(DELETE) $(OBJDIR)$(PATHSEP)*.bin
-	$(DELETE) version.c
+	$(Q)$(DELETE) $(OBJDIR)$(PATHSEP)*.o
+	$(Q)$(DELETE) $(OBJDIR)$(PATHSEP)*.elf
+	$(Q)$(DELETE) $(OBJDIR)$(PATHSEP)*.s19
+	$(Q)$(DELETE) $(OBJDIR)$(PATHSEP)*.map
+	$(Q)$(DELETE) $(OBJDIR)$(PATHSEP)*.d
+	$(Q)$(DELETE) $(OBJDIR)$(PATHSEP)*.z
+	$(Q)$(DELETE) $(OBJDIR)$(PATHSEP)*.bin
+	$(Q)$(DELETE) version.c
 
 .PHONY: all clean help
 help:
diff --git a/bootrom/Makefile b/bootrom/Makefile
index 9cd8871df..afc4162a7 100644
--- a/bootrom/Makefile
+++ b/bootrom/Makefile
@@ -35,23 +35,26 @@ OBJS = $(OBJDIR)/bootrom.s19
 
 # version.c should be remade on every compilation
 version.c: default_version.c
-	perl ../tools/mkversion.pl .. > $@ || $(COPY) $^ $@
+	$(info [=] GEN $@)
+	$(Q)perl ../tools/mkversion.pl .. > $@ || $(COPY) $^ $@
 
 all: $(OBJS)
 
 tarbin: $(OBJS)
-	$(TAR) $(TARFLAGS) ../proxmark3-$(platform)-bin.tar $(OBJS:%=bootrom/%) $(OBJS:%.s19=bootrom/%.elf)
+	$(info [=] GEN $@)
+	$(Q)$(TAR) $(TARFLAGS) ../proxmark3-$(platform)-bin.tar $(OBJS:%=bootrom/%) $(OBJS:%.s19=bootrom/%.elf)
 
 $(OBJDIR)/bootrom.elf: $(VERSIONOBJ) $(ASMOBJ) $(ARMOBJ) $(THUMBOBJ)
-	$(CC) $(LDFLAGS) -Wl,-T,ldscript-flash,-Map,$(patsubst %.elf,%.map,$@) -o $@ $^ $(LIBS)
+	$(info [=] LD $@)
+	$(Q)$(CC) $(LDFLAGS) -Wl,-T,ldscript-flash,-Map,$(patsubst %.elf,%.map,$@) -o $@ $^ $(LIBS)
 
 clean:
-	$(DELETE) $(OBJDIR)$(PATHSEP)*.o
-	$(DELETE) $(OBJDIR)$(PATHSEP)*.elf
-	$(DELETE) $(OBJDIR)$(PATHSEP)*.s19
-	$(DELETE) $(OBJDIR)$(PATHSEP)*.map
-	$(DELETE) $(OBJDIR)$(PATHSEP)*.d
-	$(DELETE) version.c
+	$(Q)$(DELETE) $(OBJDIR)$(PATHSEP)*.o
+	$(Q)$(DELETE) $(OBJDIR)$(PATHSEP)*.elf
+	$(Q)$(DELETE) $(OBJDIR)$(PATHSEP)*.s19
+	$(Q)$(DELETE) $(OBJDIR)$(PATHSEP)*.map
+	$(Q)$(DELETE) $(OBJDIR)$(PATHSEP)*.d
+	$(Q)$(DELETE) version.c
 
 .PHONY: all clean help
 help:
diff --git a/client/Makefile b/client/Makefile
index 78704b9a2..38a40a835 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -9,6 +9,10 @@
 # Add -DNOFORCE  to disable the -F switch
 # Add -DPRESETS  to compile with preset models (edit config.h)
 
+# Hide full compilation line:
+Q?=@
+# To see full command lines, use make Q=
+
 CC = gcc
 CXX = g++
 LD = g++
@@ -282,53 +286,61 @@ all-static: proxmark3 flasher fpga_compress
 
 proxmark3: LDLIBS+=$(LUALIB) $(JANSSONLIB) $(MBEDTLSLIB) $(CBORLIB) $(QTLDLIBS)
 proxmark3: $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(OBJCOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(ZLIBOBJS) lualibs/pm3_cmd.lua lualibs/mf_default_keys.lua
-	$(LD) $(LDFLAGS) $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(OBJCOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(ZLIBOBJS) $(LDLIBS)  -o $@
+	$(info [=] LD $@)
+	$(Q)$(LD) $(LDFLAGS) $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(OBJCOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(ZLIBOBJS) $(LDLIBS)  -o $@
 
 flasher: $(OBJDIR)/flash.o $(OBJDIR)/flasher.o $(COREOBJS) $(OBJCOBJS)
-	$(LD) $(LDFLAGS) $^ $(LDLIBS) -o $@
+	$(info [=] LD $@)
+	$(Q)$(LD) $(LDFLAGS) $^ $(LDLIBS) -o $@
 
 fpga_compress: $(OBJDIR)/fpga_compress.o $(ZLIBOBJS)
-	$(LD) $(LDFLAGS) $(ZLIBFLAGS) $^ $(LDLIBS) -o $@
+	$(info [=] LD $@)
+	$(Q)$(LD) $(LDFLAGS) $(ZLIBFLAGS) $^ $(LDLIBS) -o $@
 
 proxgui.cpp: ui/ui_overlays.h
 
 proxguiqt.moc.cpp: proxguiqt.h
-	$(MOC) -o$@ $^
+	$(info [-] MOC $@)
+	$(Q)$(MOC) -o$@ $^
 
 ui/ui_overlays.h: ui/overlays.ui
-	$(UIC) $^ > $@
+	$(info [-] UIC $@)
+	$(Q)$(UIC) $^ > $@
 
 lualibs/pm3_cmd.lua: ../include/pm3_cmd.h
-	awk -f pm3_cmd_h2lua.awk $^ > $@
+	$(info [=] GEN $@)
+	$(Q)awk -f pm3_cmd_h2lua.awk $^ > $@
 
 lualibs/mf_default_keys.lua : default_keys.dic
-	awk -f default_keys_dic2lua.awk $^ > $@
+	$(info [=] GEN $@)
+	$(Q)awk -f default_keys_dic2lua.awk $^ > $@
 
 clean:
-	$(RM) $(CLEAN)
-	cd ../liblua && $(MAKE) clean
-	cd $(JANSSONLIBPATH) && $(MAKE) clean
-	cd $(MBEDTLSLIBPATH) && $(MAKE) clean
-	cd $(CBORLIBPATH) && $(MAKE) clean
+	$(Q)$(RM) $(CLEAN)
+	$(Q)$(MAKE) --no-print-directory -C ../liblua clean
+	$(Q)$(MAKE) --no-print-directory -C $(JANSSONLIBPATH) clean
+	$(Q)$(MAKE) --no-print-directory -C $(MBEDTLSLIBPATH) clean
+	$(Q)$(MAKE) --no-print-directory -C $(CBORLIBPATH) clean
 
 tarbin: $(BINS)
-	$(TAR) $(TARFLAGS) ../proxmark3-$(platform)-bin.tar $(BINS:%=client/%) $(WINBINS:%=client/%)
+	$(info [=] TAR ../proxmark3-$(platform)-bin.tar)
+	$(Q)$(TAR) $(TARFLAGS) ../proxmark3-$(platform)-bin.tar $(BINS:%=client/%) $(WINBINS:%=client/%)
 
 lua_build:
-	@echo Compiling liblua, using platform $(LUAPLATFORM)
-	cd ../liblua && $(MAKE) $(LUAPLATFORM)
+	$(info [*] MAKE liblua for $(LUAPLATFORM))
+	$(Q)$(MAKE) --no-print-directory -C ../liblua $(LUAPLATFORM)
 
 jansson_build:
-	@echo Compiling jansson
-	cd $(JANSSONLIBPATH) && $(MAKE) all
+	$(info [*] MAKE jansson)
+	$(Q)$(MAKE) --no-print-directory -C $(JANSSONLIBPATH) all
 
 mbedtls_build:
-	@echo Compiling mbedtls
-	cd $(MBEDTLSLIBPATH) && $(MAKE) all
+	$(info [*] MAKE mbedtls)
+	$(Q)$(MAKE) --no-print-directory -C $(MBEDTLSLIBPATH) all
 
 cbor_build:
-	@echo Compiling tinycbor
-	cd $(CBORLIBPATH) && $(MAKE) all
+	$(info [*] MAKE tinycbor)
+	$(Q)$(MAKE) --no-print-directory -C $(CBORLIBPATH) all
 
 .PHONY: all clean
 
@@ -336,43 +348,52 @@ cbor_build:
 print-%: ; @echo $* = $($*)
 
 $(OBJDIR)/%_NOSIMD.o : %.c $(OBJDIR)/%_NOSIMD.d
-	$(CC) $(DEPFLAGS:%.Td=%_NOSIMD.Td) $(CFLAGS) $(HARD_SWITCH_NOSIMD) -c -o $@ $<
-	$(MV) -f $(OBJDIR)/$*_NOSIMD.Td $(OBJDIR)/$*_NOSIMD.d
+	$(info [-] CC(NOSIMD) $<)
+	$(Q)$(CC) $(DEPFLAGS:%.Td=%_NOSIMD.Td) $(CFLAGS) $(HARD_SWITCH_NOSIMD) -c -o $@ $<
+	$(Q)$(MV) -f $(OBJDIR)/$*_NOSIMD.Td $(OBJDIR)/$*_NOSIMD.d
 
 $(OBJDIR)/%_MMX.o : %.c $(OBJDIR)/%_MMX.d
-	$(CC) $(DEPFLAGS:%.Td=%_MMX.Td) $(CFLAGS) $(HARD_SWITCH_MMX) -c -o $@ $<
-	$(MV) -f $(OBJDIR)/$*_MMX.Td $(OBJDIR)/$*_MMX.d
+	$(info [-] CC(MMX) $<)
+	$(Q)$(CC) $(DEPFLAGS:%.Td=%_MMX.Td) $(CFLAGS) $(HARD_SWITCH_MMX) -c -o $@ $<
+	$(Q)$(MV) -f $(OBJDIR)/$*_MMX.Td $(OBJDIR)/$*_MMX.d
 
 $(OBJDIR)/%_SSE2.o : %.c $(OBJDIR)/%_SSE2.d
-	$(CC) $(DEPFLAGS:%.Td=%_SSE2.Td) $(CFLAGS) $(HARD_SWITCH_SSE2) -c -o $@ $<
-	$(MV) -f $(OBJDIR)/$*_SSE2.Td $(OBJDIR)/$*_SSE2.d
+	$(info [-] CC(SSE2) $<)
+	$(Q)$(CC) $(DEPFLAGS:%.Td=%_SSE2.Td) $(CFLAGS) $(HARD_SWITCH_SSE2) -c -o $@ $<
+	$(Q)$(MV) -f $(OBJDIR)/$*_SSE2.Td $(OBJDIR)/$*_SSE2.d
 
 $(OBJDIR)/%_AVX.o : %.c $(OBJDIR)/%_AVX.d
-	$(CC) $(DEPFLAGS:%.Td=%_AVX.Td) $(CFLAGS) $(HARD_SWITCH_AVX) -c -o $@ $<
-	$(MV) -f $(OBJDIR)/$*_AVX.Td $(OBJDIR)/$*_AVX.d
+	$(info [-] CC(AVX) $<)
+	$(Q)$(CC) $(DEPFLAGS:%.Td=%_AVX.Td) $(CFLAGS) $(HARD_SWITCH_AVX) -c -o $@ $<
+	$(Q)$(MV) -f $(OBJDIR)/$*_AVX.Td $(OBJDIR)/$*_AVX.d
 
 $(OBJDIR)/%_AVX2.o : %.c $(OBJDIR)/%_AVX2.d
-	$(CC) $(DEPFLAGS:%.Td=%_AVX2.Td) $(CFLAGS) $(HARD_SWITCH_AVX2) -c -o $@ $<
-	$(MV) -f $(OBJDIR)/$*_AVX2.Td $(OBJDIR)/$*_AVX2.d
+	$(info [-] CC(AVX2) $<)
+	$(Q)$(CC) $(DEPFLAGS:%.Td=%_AVX2.Td) $(CFLAGS) $(HARD_SWITCH_AVX2) -c -o $@ $<
+	$(Q)$(MV) -f $(OBJDIR)/$*_AVX2.Td $(OBJDIR)/$*_AVX2.d
 
 $(OBJDIR)/%_AVX512.o : %.c $(OBJDIR)/%_AVX512.d
-	$(CC) $(DEPFLAGS:%.Td=%_AVX512.Td) $(CFLAGS) $(HARD_SWITCH_AVX512) -c -o $@ $<
-	$(MV) -f $(OBJDIR)/$*_AVX512.Td $(OBJDIR)/$*_AVX512.d
+	$(info [-] CC(AVX512) $<)
+	$(Q)$(CC) $(DEPFLAGS:%.Td=%_AVX512.Td) $(CFLAGS) $(HARD_SWITCH_AVX512) -c -o $@ $<
+	$(Q)$(MV) -f $(OBJDIR)/$*_AVX512.Td $(OBJDIR)/$*_AVX512.d
 
 %.o: %.c
 $(OBJDIR)/%.o : %.c $(OBJDIR)/%.d
-	$(CC) $(DEPFLAGS) $(CFLAGS) $(ZLIBFLAGS) -c -o $@ $<
-	$(POSTCOMPILE)
+	$(info [-] CC $<)
+	$(Q)$(CC) $(DEPFLAGS) $(CFLAGS) $(ZLIBFLAGS) -c -o $@ $<
+	$(Q)$(POSTCOMPILE)
 
 %.o: %.cpp
 $(OBJDIR)/%.o : %.cpp $(OBJDIR)/%.d
-	$(CXX) $(DEPFLAGS) $(CXXFLAGS) $(QTINCLUDES) -c -o $@ $<
-	$(POSTCOMPILE)
+	$(info [-] CXX $<)
+	$(Q)$(CXX) $(DEPFLAGS) $(CXXFLAGS) $(QTINCLUDES) -c -o $@ $<
+	$(Q)$(POSTCOMPILE)
 
 %.o: %.m
 $(OBJDIR)/%.o : %.m $(OBJDIR)/%.d
-	$(CC) $(DEPFLAGS) $(CFLAGS) -c -o $@ $<
-	$(POSTCOMPILE)
+	$(info [-] CC $<)
+	$(Q)$(CC) $(DEPFLAGS) $(CFLAGS) -c -o $@ $<
+	$(Q)$(POSTCOMPILE)
 
 #$(CMDOBJS) $(COREOBJS): $(notdir $(%.c)) %.d
 #	$(CC) $(DEPFLAGS) $(CFLAGS) -c -o $@ $<
diff --git a/client/jansson/Makefile b/client/jansson/Makefile
index 8e138462b..0ef29827a 100644
--- a/client/jansson/Makefile
+++ b/client/jansson/Makefile
@@ -1,3 +1,6 @@
+# Hide full compilation line:
+Q?=@
+# To see full command lines, use make Q=
 
 include_HEADERS = jansson.h
 nodist_include_HEADERS = jansson_config.h
@@ -50,17 +53,19 @@ MYLIBS=
 MYOBJS=
 
 $(LIB_A): $(CMDOBJS)
-	$(AR) $(LIB_A) $(CMDOBJS)
-	$(RANLIB) $(LIB_A)
+	$(info [=] AR $@)
+	$(Q)$(AR) $(LIB_A) $(CMDOBJS)
+	$(Q)$(RANLIB) $(LIB_A)
 
 all: $(LIB_A)
 
 clean:
-	$(RM) $(CLEAN)
-	$(RM) $(LIB_A)
+	$(Q)$(RM) $(CLEAN)
+	$(Q)$(RM) $(LIB_A)
 
 %.o: %.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(CFLAGS) -c -o $@ $< $(LIBS)
+	$(info [-] CC $<)
+	$(Q)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(CFLAGS) -c -o $@ $< $(LIBS)
 
 .PHONY: all clean
 
diff --git a/client/tinycbor/Makefile b/client/tinycbor/Makefile
index 86e356bbd..17f60a49c 100644
--- a/client/tinycbor/Makefile
+++ b/client/tinycbor/Makefile
@@ -1,3 +1,6 @@
+# Hide full compilation line:
+Q?=@
+# To see full command lines, use make Q=
 
 LIB_A = tinycbor.a
 tinycbor_SOURCES = \
@@ -32,17 +35,19 @@ MYLIBS=
 MYOBJS=
 
 $(LIB_A): $(CMDOBJS)
-	$(AR) $(LIB_A) $(CMDOBJS)
-	$(RANLIB) $(LIB_A)
+	$(info [=] AR $@)
+	$(Q)$(AR) $(LIB_A) $(CMDOBJS)
+	$(Q)$(RANLIB) $(LIB_A)
 
 all: $(LIB_A)
 
 clean:
-	$(RM) $(CLEAN)
-	$(RM) $(LIB_A)
+	$(Q)$(RM) $(CLEAN)
+	$(Q)$(RM) $(LIB_A)
 
 %.o: %.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(CFLAGS) -c -o $@ $< $(LIBS)
+	$(info [-] CC $<)
+	$(Q)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(CFLAGS) -c -o $@ $< $(LIBS)
 
 .PHONY: all clean
 
diff --git a/common/Makefile.common b/common/Makefile.common
index bbdf1d0e4..a743b911b 100644
--- a/common/Makefile.common
+++ b/common/Makefile.common
@@ -13,6 +13,10 @@
 # variables
 #
 
+# Hide full compilation line:
+Q?=@
+# To see full command lines, use make Q=
+
 # Make sure that all is the default target
 # (The including Makefile still needs to define what 'all' is)
 
@@ -74,16 +78,20 @@ ASMOBJ   = $(patsubst %.s,$(OBJDIR)/%.o,$(notdir $(ASMSRC)))
 VERSIONOBJ = $(patsubst %.c,$(OBJDIR)/%.o,$(notdir $(VERSIONSRC)))
 
 $(THUMBOBJ): $(OBJDIR)/%.o: %.c $(INCLUDES)
-	$(CC) $(CFLAGS) -mthumb -mthumb-interwork -o $@ $< 
+	$(info [-] CC $<)
+	$(Q)$(CC) $(CFLAGS) -mthumb -mthumb-interwork -o $@ $< 
 
 $(ARMOBJ): $(OBJDIR)/%.o: %.c $(INCLUDES)
-	$(CC) $(CFLAGS) -mthumb-interwork -o $@ $< 
+	$(info [-] CC $<)
+	$(Q)$(CC) $(CFLAGS) -mthumb-interwork -o $@ $< 
 
 $(ASMOBJ): $(OBJDIR)/%.o: %.s
-	$(CC) $(CFLAGS) -mthumb-interwork -o $@ $<
+	$(info [-] CC $<)
+	$(Q)$(CC) $(CFLAGS) -mthumb-interwork -o $@ $<
 
 $(VERSIONOBJ): $(OBJDIR)/%.o: %.c $(INCLUDES)
-	$(CC) $(CFLAGS) -mthumb -mthumb-interwork -o $@ $< 
+	$(info [-] CC $<)
+	$(Q)$(CC) $(CFLAGS) -mthumb -mthumb-interwork -o $@ $< 
 
 # This objcopy call translates physical flash addresses to logical addresses
 # without touching start address or RAM addresses (.bss and .data sections)
@@ -93,7 +101,8 @@ OBJCOPY_TRANSLATIONS = --no-change-warnings \
     --change-section-address .bss+0 --change-section-address .data-0x100000 \
     --change-section-address .commonarea+0
 $(OBJDIR)/%.s19: $(OBJDIR)/%.elf
-	$(OBJCOPY) -Osrec --srec-forceS3 --strip-debug $(OBJCOPY_TRANSLATIONS) $^ $@
+	$(info [=] GEN $@)
+	$(Q)$(OBJCOPY) -Osrec --srec-forceS3 --strip-debug $(OBJCOPY_TRANSLATIONS) $^ $@
 
 # easy printing of MAKE VARIABLES
 print-%: ; @echo $* = $($*) 
diff --git a/common/mbedtls/Makefile b/common/mbedtls/Makefile
index 11bb22f07..485101306 100644
--- a/common/mbedtls/Makefile
+++ b/common/mbedtls/Makefile
@@ -1,3 +1,6 @@
+# Hide full compilation line:
+Q?=@
+# To see full command lines, use make Q=
 
 LIB_A = libmbedtls.a
 mbedtls_SOURCES = \
@@ -73,17 +76,19 @@ MYLIBS=
 MYOBJS=
 
 $(LIB_A): $(CMDOBJS)
-	$(AR) $(LIB_A) $(CMDOBJS)
-	$(RANLIB) $(LIB_A)
+	$(info [=] AR $@)
+	$(Q)$(AR) $(LIB_A) $(CMDOBJS)
+	$(Q)$(RANLIB) $(LIB_A)
 
 all: $(LIB_A)
 
 clean:
-	$(RM) $(CLEAN)
-	$(RM) $(LIB_A)
+	$(Q)$(RM) $(CLEAN)
+	$(Q)$(RM) $(LIB_A)
 
 %.o: %.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(CFLAGS) -c -o $@ $< $(LIBS)
+	$(info [-] CC $<)
+	$(Q)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(CFLAGS) -c -o $@ $< $(LIBS)
 
 .PHONY: all clean
 
diff --git a/fpga/Makefile b/fpga/Makefile
index 0a30cad29..ba9fec28b 100644
--- a/fpga/Makefile
+++ b/fpga/Makefile
@@ -2,33 +2,39 @@ include ../common/Makefile.common      # for $(DETECTED_OS)
 
 all: fpga_lf.bit fpga_hf.bit
 clean:
-	$(DELETE) *.bgn *.drc *.ncd *.ngd *_par.xrpt *-placed.* *-placed_pad.* *_usage.xml xst_hf.srp xst_lf.srp
-	$(DELETE) *.map *.ngc *.xrpt *.pcf *.rbt *_auto_* *.bld *.mrp *.ngm *.unroutes *_summary.xml netlist.lst xst
+	$(Q)$(DELETE) *.bgn *.drc *.ncd *.ngd *_par.xrpt *-placed.* *-placed_pad.* *_usage.xml xst_hf.srp xst_lf.srp
+	$(Q)$(DELETE) *.map *.ngc *.xrpt *.pcf *.rbt *_auto_* *.bld *.mrp *.ngm *.unroutes *_summary.xml netlist.lst xst
 
 fpga_hf.ngc: fpga_hf.v fpga.ucf xst_hf.scr util.v hi_simulate.v hi_read_tx.v hi_read_rx_xcorr.v hi_iso14443a.v hi_sniffer.v hi_flite.v
-	$(DELETE) $@
-	$(XILINX_TOOLS_PREFIX)xst -ifn xst_hf.scr
+	$(Q)$(DELETE) $@
+	$(info [-] XST $@)
+	$(Q)$(XILINX_TOOLS_PREFIX)xst -ifn xst_hf.scr
 
 
 fpga_lf.ngc: fpga_lf.v fpga.ucf xst_lf.scr util.v clk_divider.v lo_edge_detect.v lo_read.v lo_passthru.v lp20khz_1MSa_iir_filter.v min_max_tracker.v lf_edge_detect.v
-	$(DELETE) $@
-	$(XILINX_TOOLS_PREFIX)xst -ifn xst_lf.scr
+	$(Q)$(DELETE) $@
+	$(info [-] XST $@)
+	$(Q)$(XILINX_TOOLS_PREFIX)xst -ifn xst_lf.scr
 
 %.ngd: %.ngc
-	$(DELETE) $@
-	$(XILINX_TOOLS_PREFIX)ngdbuild -aul -p xc2s30-5-vq100 -nt timestamp -uc fpga.ucf $< $@
+	$(Q)$(DELETE) $@
+	$(info [-] NGD $@)
+	$(Q)$(XILINX_TOOLS_PREFIX)ngdbuild -aul -p xc2s30-5-vq100 -nt timestamp -uc fpga.ucf $< $@
 
 %.ncd: %.ngd
-	$(DELETE) $@
-	$(XILINX_TOOLS_PREFIX)map -p xc2s30-5-vq100 $<
+	$(Q)$(DELETE) $@
+	$(info [-] MAP $@)
+	$(Q)$(XILINX_TOOLS_PREFIX)map -p xc2s30-5-vq100 $<
 
 %-placed.ncd: %.ncd
-	$(DELETE) $@
-	$(XILINX_TOOLS_PREFIX)par $< $@
+	$(Q)$(DELETE) $@
+	$(info [-] PAR $@)
+	$(Q)$(XILINX_TOOLS_PREFIX)par $< $@
 
 %.bit: %-placed.ncd
-	$(DELETE) $@ $*.drc $*.rbt
-	$(XILINX_TOOLS_PREFIX)bitgen $< $@
+	$(Q)$(DELETE) $@ $*.drc $*.rbt
+	$(info [=] BITGEN $@)
+	$(Q)$(XILINX_TOOLS_PREFIX)bitgen $< $@
 
 .PHONY: all clean help
 help:
diff --git a/liblua/Makefile b/liblua/Makefile
index 89a11e71f..3460c67b5 100644
--- a/liblua/Makefile
+++ b/liblua/Makefile
@@ -3,6 +3,10 @@
 
 # == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT =======================
 
+# Hide full compilation line:
+Q?=@
+# To see full command lines, use make Q=
+
 # Your platform. See PLATS for possible values.
 PLAT= none
 
@@ -26,6 +30,10 @@ MYOBJS=
 
 # == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE =======
 
+%.o: %.c
+	$(info [-] CC $<)
+	$(Q)$(CC) -c $(CFLAGS) $(CPPFLAGS) -o $@ $<
+
 PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
 
 LUA_A=	liblua.a
@@ -56,20 +64,24 @@ o:	$(ALL_O)
 a:	$(ALL_A)
 
 $(LUA_A): $(BASE_O)
-	$(AR) $@ $(BASE_O)
-	$(RANLIB) $@
+	$(info [=] AR $@)
+	$(Q)$(AR) $@ $(BASE_O)
+	$(Q)$(RANLIB) $@
 
 $(LUA_T): $(LUA_O) $(LUA_A)
-	$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
+	$(info [=] LD $@)
+	$(Q)$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
 
 $(LUAC_T): $(LUAC_O) $(LUA_A)
-	$(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
+	$(info [=] LD $@)
+	$(Q)$(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
 
 clean:
-	$(RM) $(ALL_T) $(ALL_O)
+	$(Q)$(RM) $(ALL_T) $(ALL_O)
 
 depend:
-	@$(CC) $(CFLAGS) -MM l*.c
+	$(info GEN DEPS)
+	$(Q)$(CC) $(CFLAGS) -MM l*.c
 
 echo:
 	@echo "PLAT= $(PLAT)"
@@ -89,36 +101,36 @@ none:
 	@echo "   $(PLATS)"
 
 aix:
-	$(MAKE) $(ALL) CC="xlc" CFLAGS="-O2 -DLUA_USE_POSIX -DLUA_USE_DLOPEN" SYSLIBS="-ldl" SYSLDFLAGS="-brtl -bexpall"
+	$(Q)$(MAKE) $(ALL) CC="xlc" CFLAGS="-O2 -DLUA_USE_POSIX -DLUA_USE_DLOPEN" SYSLIBS="-ldl" SYSLDFLAGS="-brtl -bexpall"
 
 ansi:
-	$(MAKE) $(ALL) SYSCFLAGS="-DLUA_ANSI"
+	$(Q)$(MAKE) $(ALL) SYSCFLAGS="-DLUA_ANSI"
 
 bsd:
-	$(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" SYSLIBS="-Wl,-E"
+	$(Q)$(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" SYSLIBS="-Wl,-E"
 
 freebsd:
-	$(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" SYSLIBS="-Wl,-E -lreadline"
+	$(Q)$(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" SYSLIBS="-Wl,-E -lreadline"
 
 generic: $(ALL)
 
 linux:
-	$(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" SYSLIBS="-Wl,-E -ldl -lreadline -ltermcap -lncurses"
+	$(Q)$(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" SYSLIBS="-Wl,-E -ldl -lreadline -ltermcap -lncurses"
 
 macosx:
-	$(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_MACOSX" SYSLIBS="-lreadline"
+	$(Q)$(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_MACOSX" SYSLIBS="-lreadline"
 
 mingw:
-	$(MAKE) "LUA_A=lua52.dll" "LUA_T=lua.exe" \
+	$(Q)$(MAKE) "LUA_A=lua52.dll" "LUA_T=lua.exe" \
 	"AR=$(CC) -shared -o" "RANLIB=strip --strip-unneeded" \
 	"SYSCFLAGS=-DLUA_BUILD_AS_DLL" "SYSLIBS=" "SYSLDFLAGS=-s" lua.exe
-	$(MAKE) "LUAC_T=luac.exe" luac.exe
+	$(Q)$(MAKE) "LUAC_T=luac.exe" luac.exe
 
 posix:
-	$(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_POSIX"
+	$(Q)$(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_POSIX"
 
 solaris:
-	$(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" SYSLIBS="-ldl"
+	$(Q)$(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" SYSLIBS="-ldl"
 
 # list targets that do not create files (but not all makes understand .PHONY)
 .PHONY: all $(PLATS) default o a clean depend echo none
diff --git a/recovery/Makefile b/recovery/Makefile
index 7806d14b4..601f93055 100644
--- a/recovery/Makefile
+++ b/recovery/Makefile
@@ -5,14 +5,17 @@ BINS = bootrom.bin fullimage.bin proxmark3_recovery.bin
 all: $(BINS)
 
 bootrom.bin: ../bootrom/obj/bootrom.elf
-	$(OBJCOPY) --gap-fill=0xff --pad-to 0x00102000 -O binary $^ $@
+	$(info [=] GEN $@)
+	$(Q)$(OBJCOPY) --gap-fill=0xff --pad-to 0x00102000 -O binary $^ $@
 
 fullimage.bin: ../armsrc/obj/fullimage.elf
-	$(OBJCOPY) --gap-fill=0xff -O binary $^ $@
+	$(info [=] GEN $@)
+	$(Q)$(OBJCOPY) --gap-fill=0xff -O binary $^ $@
 
 proxmark3_recovery.bin: bootrom.bin fullimage.bin
-	cat bootrom.bin fullimage.bin > $@
+	$(info [=] GEN $@)
+	$(Q)cat bootrom.bin fullimage.bin > $@
 
 clean:
-	rm -f $(BINS)
+	$(Q)rm -f $(BINS)
 
diff --git a/tools/mfkey/Makefile b/tools/mfkey/Makefile
index ed245d02d..e54ad1782 100644
--- a/tools/mfkey/Makefile
+++ b/tools/mfkey/Makefile
@@ -1,3 +1,7 @@
+# Hide full compilation line:
+Q?=@
+# To see full command lines, use make Q=
+
 VPATH = ../../common ../../common/crapto1 ../../client
 CC = gcc
 LD = gcc
@@ -10,10 +14,12 @@ EXES = mfkey32 mfkey32v2 mfkey64
 all: $(OBJS) $(EXES)
 
 %.o : %.c
-	$(CC) $(CFLAGS) -c -o $@ $<
+	$(info [-] CC $<)
+	$(Q)$(CC) $(CFLAGS) -c -o $@ $<
 
 % : %.c $(OBJS)
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $<
+	$(info [=] LD $@)
+	$(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $<
 
 clean:
-	rm -f $(OBJS) $(EXES)
+	$(Q)rm -f $(OBJS) $(EXES)
diff --git a/tools/nonce2key/Makefile b/tools/nonce2key/Makefile
index 44657419a..9335caf6c 100644
--- a/tools/nonce2key/Makefile
+++ b/tools/nonce2key/Makefile
@@ -1,3 +1,7 @@
+# Hide full compilation line:
+Q?=@
+# To see full command lines, use make Q=
+
 CC = gcc
 CFLAGS = -std=c99 -Wall -O3 -I.
 LDFLAGS = -std=c99 -Wall
@@ -9,15 +13,20 @@ PROG := nonce2key
 all: $(PROG)
 
 $(PROG): $(OBJ)
-	$(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@
+	$(info [=] LD $@)
+	$(Q)$(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@
 
 clean:
-	@$(RM) $(DEP) $(OBJ) $(PROG)
+	$(Q)$(RM) $(DEP) $(OBJ) $(PROG)
 
 ifneq ($(filter clean,$(MAKECMDGOALS)),clean)
 -include $(DEP)
 endif
 
 %.d: %.c
-	$(info GEN $@)
-	@$(CC) -MM $(CFLAGS) $< | sed 's/\($*\)\.o[ :]*/\1.o $@ : /g' > $@
+	$(info [-] GEN $@)
+	$(Q)$(CC) -MM $(CFLAGS) $< | sed 's/\($*\)\.o[ :]*/\1.o $@ : /g' > $@
+
+%.o: %.c
+	$(info [-] CC $<)
+	$(Q)$(CC) -c $(CFLAGS) $(CPPFLAGS) -o $@ $<

From eb9495aa37e3c41e6e420e7a51d30c23f376abc1 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 2 Jun 2019 10:17:52 +0200
Subject: [PATCH 1891/1938] default standalone mode

---
 common/Makefile.hal | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/common/Makefile.hal b/common/Makefile.hal
index 5faf8a56d..d6fefda94 100644
--- a/common/Makefile.hal
+++ b/common/Makefile.hal
@@ -1,5 +1,8 @@
 # Default platform if no platform specified
 PLATFORM?=PM3RDV4
+# Default standalone if no standalone specified
+# (you can set explicitly STANDALONE= to disable standalone modes)
+STANDALONE?=LF_SAMYRUN
 
 define KNOWN_DEFINITIONS
 
@@ -30,14 +33,14 @@ Known definitions:
 +==========================================================+
 | STANDALONE      | DESCRIPTION                            |
 +==========================================================+
-| (def)           | By default, no standalone mode         |
+|                 | No standalone mode                     |
++----------------------------------------------------------+
+| LF_SAMYRUN (def)| HID26 read/clone/sim                   |
+|                 | - Samy Kamkar                          |
 +----------------------------------------------------------+
 | LF_ICERUN       | standalone mode skeleton               |
 |                 | - iceman                               |
 +----------------------------------------------------------+
-| LF_SAMYRUN      | HID26 read/clone/sim                   |
-|                 | - Samy Kamkar                          |
-+----------------------------------------------------------+
 | LF_PROXBRUTE    | HID ProxII bruteforce                  |
 |                 | - Brad Antoniewicz                     |
 +----------------------------------------------------------+
@@ -59,19 +62,18 @@ Known definitions:
 
 Options to define platform, platform extras and/or standalone mode:
 (1) Run make with PLATFORM, PLATFORM_EXTRAS and/or STANDALONE as follows:
-make PLATFORM=PM3EASY STANDALONE=LF_SAMYRUN
+make PLATFORM=PM3EASY STANDALONE=HF_COLIN
 
 (2) Save a file called Makefile.platform with contents:
 PLATFORM=PM3EASY
-STANDALONE=LF_SAMYRUN
 
 or if you have a Proxmark 3 RDV4 with the BT add-on:
 PLATFORM=PM3RDV4
 PLATFORM_EXTRAS=BTADDON
-STANDALONE=LF_SAMYRUN
-
-!! Make sure to "make clean" when you change platform settings !!
 
+Default standalone mode is LF_SAMYRUN.
+To disable standalone modes, set explicitly an empty STANDALONE:
+STANDALONE=
 endef
 
 PLTNAME = Unknown Platform
@@ -158,6 +160,10 @@ ifneq (,$(word 2, $(PLATFORM_DEFS_INFO_STANDALONE)))
     $(error You must choose only one Standalone mode!: $(PLATFORM_DEFS_INFO_STANDALONE))
 endif
 
+# info when no standalone mode
+ifeq (,$(PLATFORM_DEFS_INFO_STANDALONE))
+    PLATFORM_DEFS_INFO_STANDALONE = No standalone mode selected
+endif
 
 export PLATFORM
 export PLATFORM_EXTRAS

From bed595f5b2db445aa7d38c2a84b40d6d2479e755 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 2 Jun 2019 10:19:13 +0200
Subject: [PATCH 1892/1938] liblua: remove warning

---
 liblua/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/liblua/Makefile b/liblua/Makefile
index 3460c67b5..c305ece5d 100644
--- a/liblua/Makefile
+++ b/liblua/Makefile
@@ -15,7 +15,7 @@ CFLAGS= -O3 -Wall -DLUA_COMPAT_ALL $(SYSCFLAGS) $(MYCFLAGS)
 LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS)
 LIBS= -lm $(SYSLIBS) $(MYLIBS)
 
-AR= ar rcu
+AR= ar rc
 RANLIB= ranlib
 RM= rm -f
 

From fe9e1dc7336ef3a50352467700f70482e05c0d0f Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 2 Jun 2019 11:47:10 +0200
Subject: [PATCH 1893/1938] remap LEDs

---
 armsrc/Standalone/hf_young.c     | 14 +++++++-------
 armsrc/Standalone/lf_hidbrute.c  |  8 ++++----
 armsrc/Standalone/lf_proxbrute.c | 10 +++++-----
 armsrc/Standalone/lf_samyrun.c   |  6 +++---
 armsrc/util.c                    | 21 ++++++++++-----------
 armsrc/util.h                    | 16 ++++++++++++----
 6 files changed, 41 insertions(+), 34 deletions(-)

diff --git a/armsrc/Standalone/hf_young.c b/armsrc/Standalone/hf_young.c
index fc72df2ac..e2afec266 100644
--- a/armsrc/Standalone/hf_young.c
+++ b/armsrc/Standalone/hf_young.c
@@ -47,7 +47,7 @@ void RunMod() {
             iGotoRecord = 0;
             LEDsoff();
             LED(selected + 1, 0);
-            LED(LED_RED2, 0);
+            LED(LED_D, 0);
 
             // record
             Dbprintf("Enabling iso14443a reader mode for [Bank: %d]...", selected);
@@ -99,10 +99,10 @@ void RunMod() {
             Dbprintf("ATQA = %02X%02X", uids[selected].atqa[0], uids[selected].atqa[1]);
             Dbprintf("SAK = %02X", uids[selected].sak);
             LEDsoff();
-            LED(LED_GREEN,  200);
-            LED(LED_ORANGE, 200);
-            LED(LED_GREEN,  200);
-            LED(LED_ORANGE, 200);
+            LED(LED_B,  200);
+            LED(LED_A, 200);
+            LED(LED_B,  200);
+            LED(LED_A, 200);
 
             LEDsoff();
             LED(selected + 1, 0);
@@ -118,7 +118,7 @@ void RunMod() {
             iGotoClone = 0;
             LEDsoff();
             LED(selected + 1, 0);
-            LED(LED_ORANGE, 250);
+            LED(LED_A, 250);
 
             // magiccards holds 4bytes uid.  *usually*
             uint32_t tmpuid = bytes_to_num(uids[selected].uid, 4);
@@ -200,7 +200,7 @@ void RunMod() {
             LED(selected + 1, 0);
 
             // Begin transmitting
-            LED(LED_GREEN, 0);
+            LED(LED_B, 0);
             DbpString("Playing");
             for (; ;) {
                 // exit from Standalone Mode,   send a usbcommand.
diff --git a/armsrc/Standalone/lf_hidbrute.c b/armsrc/Standalone/lf_hidbrute.c
index 9840791dc..3a7866821 100644
--- a/armsrc/Standalone/lf_hidbrute.c
+++ b/armsrc/Standalone/lf_hidbrute.c
@@ -58,7 +58,7 @@ void RunMod() {
         if (button_pressed > 0 && cardRead == 0) {
             LEDsoff();
             LED(selected + 1, 0);
-            LED(LED_RED2, 0);
+            LED(LED_D, 0);
 
             // record
             DbpString("[=] starting recording");
@@ -83,7 +83,7 @@ void RunMod() {
         } else if (button_pressed > 0 && cardRead == 1) {
             LEDsoff();
             LED(selected + 1, 0);
-            LED(LED_ORANGE, 0);
+            LED(LED_A, 0);
 
             // record
             Dbprintf("[=] cloning %x %x %08x", selected, high[selected], low[selected]);
@@ -122,7 +122,7 @@ void RunMod() {
             // Begin transmitting
             if (playing && selected != 2) {
 
-                LED(LED_GREEN, 0);
+                LED(LED_B, 0);
                 DbpString("[=] playing");
 
                 // wait for button to be released
@@ -155,7 +155,7 @@ void RunMod() {
                     continue;
                 }
 
-                LED(LED_GREEN, 0);
+                LED(LED_B, 0);
                 DbpString("[=] entering bruteforce mode");
                 // wait for button to be released
                 while (BUTTON_PRESS())
diff --git a/armsrc/Standalone/lf_proxbrute.c b/armsrc/Standalone/lf_proxbrute.c
index c9fce3ac6..3336e9ee9 100644
--- a/armsrc/Standalone/lf_proxbrute.c
+++ b/armsrc/Standalone/lf_proxbrute.c
@@ -43,7 +43,7 @@ void RunMod() {
         if (button_pressed > 0 && cardRead == 0) {
             LEDsoff();
             LED(selected + 1, 0);
-            LED(LED_RED2, 0);
+            LED(LED_D, 0);
 
             // record
             DbpString("[=] starting recording");
@@ -68,7 +68,7 @@ void RunMod() {
         } else if (button_pressed > 0 && cardRead == 1) {
             LEDsoff();
             LED(selected + 1, 0);
-            LED(LED_ORANGE, 0);
+            LED(LED_A, 0);
 
             // record
             Dbprintf("[=] cloning %x %x %08x", selected, high[selected], low[selected]);
@@ -105,7 +105,7 @@ void RunMod() {
 
             // Begin transmitting
             if (playing) {
-                LED(LED_GREEN, 0);
+                LED(LED_B, 0);
                 DbpString("[=] playing");
                 // wait for button to be released
                 while (BUTTON_PRESS())
@@ -125,8 +125,8 @@ void RunMod() {
                 if (selected == 1) {
                     DbpString("[=] entering ProxBrute Mode");
                     Dbprintf("[=] current Tag: Selected = %x Facility = %08x ID = %08x", selected, high[selected], low[selected]);
-                    LED(LED_ORANGE, 0);
-                    LED(LED_RED, 0);
+                    LED(LED_A, 0);
+                    LED(LED_C, 0);
                     for (uint16_t i = low[selected] - 1; i > 0; i--) {
                         if (BUTTON_PRESS()) {
                             DbpString("[-] told to stop");
diff --git a/armsrc/Standalone/lf_samyrun.c b/armsrc/Standalone/lf_samyrun.c
index 8b3ae5360..e1ba185d1 100644
--- a/armsrc/Standalone/lf_samyrun.c
+++ b/armsrc/Standalone/lf_samyrun.c
@@ -44,7 +44,7 @@ void RunMod() {
         if (button_pressed > 0 && cardRead == 0) {
             LEDsoff();
             LED(selected + 1, 0);
-            LED(LED_RED2, 0);
+            LED(LED_D, 0);
 
             // record
             DbpString("[=] starting recording");
@@ -71,7 +71,7 @@ void RunMod() {
         } else if (button_pressed > 0 && cardRead == 1) {
             LEDsoff();
             LED(selected + 1, 0);
-            LED(LED_ORANGE, 0);
+            LED(LED_A, 0);
 
             // record
             Dbprintf("[=] cloning %x %x %08x", selected, high[selected], low[selected]);
@@ -110,7 +110,7 @@ void RunMod() {
             // Begin transmitting
             if (playing) {
 
-                LED(LED_GREEN, 0);
+                LED(LED_B, 0);
                 DbpString("[=] playing");
 
                 // wait for button to be released
diff --git a/armsrc/util.c b/armsrc/util.c
index 60b4723b4..b50715541 100644
--- a/armsrc/util.c
+++ b/armsrc/util.c
@@ -82,15 +82,14 @@ void LEDsoff() {
     LED_D_OFF();
 }
 
-// LEDs: R(C) O(A) G(B) -- R(D) [1, 2, 4 and 8]
 void LED(int led, int ms) {
-    if (led & LED_RED)
-        LED_C_ON();
-    if (led & LED_ORANGE)
+    if (led & LED_A) // Proxmark3 historical mapping: LED_ORANGE
         LED_A_ON();
-    if (led & LED_GREEN)
+    if (led & LED_B) // Proxmark3 historical mapping: LED_GREEN
         LED_B_ON();
-    if (led & LED_RED2)
+    if (led & LED_C) // Proxmark3 historical mapping: LED_RED
+        LED_C_ON();
+    if (led & LED_D) // Proxmark3 historical mapping: LED_RED2
         LED_D_ON();
 
     if (!ms)
@@ -98,13 +97,13 @@ void LED(int led, int ms) {
 
     SpinDelay(ms);
 
-    if (led & LED_RED)
-        LED_C_OFF();
-    if (led & LED_ORANGE)
+    if (led & LED_A)
         LED_A_OFF();
-    if (led & LED_GREEN)
+    if (led & LED_B)
         LED_B_OFF();
-    if (led & LED_RED2)
+    if (led & LED_C)
+        LED_C_OFF();
+    if (led & LED_D)
         LED_D_OFF();
 }
 
diff --git a/armsrc/util.h b/armsrc/util.h
index 1ea6ae741..86e8cfb7f 100644
--- a/armsrc/util.h
+++ b/armsrc/util.h
@@ -32,10 +32,18 @@
 #define BYTEx(x, n) (((x) >> (n * 8)) & 0xff )
 #endif
 
-#define LED_RED 1
-#define LED_ORANGE 2
-#define LED_GREEN 4
-#define LED_RED2 8
+// Proxmark3 RDV4.0 LEDs
+#define LED_A 1
+#define LED_B 2
+#define LED_C 4
+#define LED_D 8
+
+// Proxmark3 historical LEDs
+#define LED_ORANGE LED_A
+#define LED_GREEN  LED_B
+#define LED_RED    LED_C
+#define LED_RED2   LED_D
+
 #define BUTTON_HOLD 1
 #define BUTTON_NO_CLICK 0
 #define BUTTON_SINGLE_CLICK -1

From 7e31e7f930c62e5cb6d1388d6d33424ae58d4fbb Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 2 Jun 2019 15:51:17 +0200
Subject: [PATCH 1894/1938] say when no extra is selected

---
 common/Makefile.hal | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/common/Makefile.hal b/common/Makefile.hal
index d6fefda94..ff3f83a4c 100644
--- a/common/Makefile.hal
+++ b/common/Makefile.hal
@@ -160,6 +160,12 @@ ifneq (,$(word 2, $(PLATFORM_DEFS_INFO_STANDALONE)))
     $(error You must choose only one Standalone mode!: $(PLATFORM_DEFS_INFO_STANDALONE))
 endif
 
+PLATFORM_EXTRAS_INFO = $(PLATFORM_EXTRAS)
+# info when no extra
+ifeq (,$(PLATFORM_EXTRAS_INFO))
+    PLATFORM_EXTRAS_INFO = No extra selected
+endif
+
 # info when no standalone mode
 ifeq (,$(PLATFORM_DEFS_INFO_STANDALONE))
     PLATFORM_DEFS_INFO_STANDALONE = No standalone mode selected
@@ -167,6 +173,7 @@ endif
 
 export PLATFORM
 export PLATFORM_EXTRAS
+export PLATFORM_EXTRAS_INFO
 export PLTNAME
 export MCU
 export PLATFORM_DEFS
@@ -185,7 +192,7 @@ endif
 $(info ===================================================================)
 $(info Platform name:     $(PLTNAME))
 $(info PLATFORM:          $(PLATFORM))
-$(info PLATFORM_EXTRAS:   $(PLATFORM_EXTRAS))
+$(info Platform extras:   $(PLATFORM_EXTRAS_INFO))
 $(info Included options:  $(PLATFORM_DEFS_INFO))
 $(info Standalone mode:   $(PLATFORM_DEFS_INFO_STANDALONE))
 $(info ===================================================================)

From a23be5e6b37d1107b456c64dae15e1ce4128d4b1 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 2 Jun 2019 15:52:58 +0200
Subject: [PATCH 1895/1938] make help: remove spurious parenthesis

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index e6b2f6fbe..a202f921d 100644
--- a/Makefile
+++ b/Makefile
@@ -63,9 +63,9 @@ help:
 	@echo "+ clean         - Clean in all targets"
 	@echo
 	@echo "+ bootrom       - Make bootrom"
-	@echo "+ os            - Make armsrc \(includes fpga\)"
+	@echo "+ os            - Make armsrc (includes fpga)"
 	@echo "+ flash-bootrom - Make bootrom and flash it"
-	@echo "+ flash-os      - Make armsrc and flash os image \(includes fpga\)"
+	@echo "+ flash-os      - Make armsrc and flash os image (includes fpga)"
 	@echo "+ flash-all     - Make bootrom and armsrc and flash bootrom and os image"
 	@echo "+ recovery      - Make bootrom and armsrc images for JTAG flashing"
 	@echo

From 742fe168300285f99101c3a91e4354a5de7b7c02 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 2 Jun 2019 16:04:35 +0200
Subject: [PATCH 1896/1938] Makefile verbose mode: make V=1 as for CMake

---
 Makefile                 | 8 +++++---
 client/Makefile          | 6 ++++--
 client/jansson/Makefile  | 6 ++++--
 client/tinycbor/Makefile | 6 ++++--
 common/Makefile.common   | 7 ++++---
 common/mbedtls/Makefile  | 6 ++++--
 liblua/Makefile          | 6 ++++--
 tools/mfkey/Makefile     | 6 ++++--
 tools/nonce2key/Makefile | 6 ++++--
 9 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/Makefile b/Makefile
index a202f921d..910aa62f6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,8 @@
 # Hide full compilation line:
-Q?=@
-# To see full command lines, use make Q=
+ifneq ($(V),1)
+  Q?=@
+endif
+# To see full command lines, use make V=1
 
 GZIP=gzip
 # Windows' echo echos its input verbatim, on Posix there is some
@@ -77,7 +79,7 @@ help:
 	@echo "+ checks        - Detect various encoding issues in source code"
 	@echo
 	@echo "Possible platforms: try \"make PLATFORM=\" for more info, default is PM3RDV4"
-	@echo "To see full command lines, use make Q="
+	@echo "To activate verbose mode, use make V=1"
 
 client: client/all
 
diff --git a/client/Makefile b/client/Makefile
index 38a40a835..c3300b0cd 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -10,8 +10,10 @@
 # Add -DPRESETS  to compile with preset models (edit config.h)
 
 # Hide full compilation line:
-Q?=@
-# To see full command lines, use make Q=
+ifneq ($(V),1)
+  Q?=@
+endif
+# To see full command lines, use make V=1
 
 CC = gcc
 CXX = g++
diff --git a/client/jansson/Makefile b/client/jansson/Makefile
index 0ef29827a..323d26216 100644
--- a/client/jansson/Makefile
+++ b/client/jansson/Makefile
@@ -1,6 +1,8 @@
 # Hide full compilation line:
-Q?=@
-# To see full command lines, use make Q=
+ifneq ($(V),1)
+  Q?=@
+endif
+# To see full command lines, use make V=1
 
 include_HEADERS = jansson.h
 nodist_include_HEADERS = jansson_config.h
diff --git a/client/tinycbor/Makefile b/client/tinycbor/Makefile
index 17f60a49c..8124196eb 100644
--- a/client/tinycbor/Makefile
+++ b/client/tinycbor/Makefile
@@ -1,6 +1,8 @@
 # Hide full compilation line:
-Q?=@
-# To see full command lines, use make Q=
+ifneq ($(V),1)
+  Q?=@
+endif
+# To see full command lines, use make V=1
 
 LIB_A = tinycbor.a
 tinycbor_SOURCES = \
diff --git a/common/Makefile.common b/common/Makefile.common
index a743b911b..132507547 100644
--- a/common/Makefile.common
+++ b/common/Makefile.common
@@ -13,9 +13,10 @@
 # variables
 #
 
-# Hide full compilation line:
-Q?=@
-# To see full command lines, use make Q=
+ifneq ($(V),1)
+  Q?=@
+endif
+# To see full command lines, use make V=1
 
 # Make sure that all is the default target
 # (The including Makefile still needs to define what 'all' is)
diff --git a/common/mbedtls/Makefile b/common/mbedtls/Makefile
index 485101306..fa0dff05f 100644
--- a/common/mbedtls/Makefile
+++ b/common/mbedtls/Makefile
@@ -1,6 +1,8 @@
 # Hide full compilation line:
-Q?=@
-# To see full command lines, use make Q=
+ifneq ($(V),1)
+  Q?=@
+endif
+# To see full command lines, use make V=1
 
 LIB_A = libmbedtls.a
 mbedtls_SOURCES = \
diff --git a/liblua/Makefile b/liblua/Makefile
index c305ece5d..bf2a4fa3c 100644
--- a/liblua/Makefile
+++ b/liblua/Makefile
@@ -4,8 +4,10 @@
 # == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT =======================
 
 # Hide full compilation line:
-Q?=@
-# To see full command lines, use make Q=
+ifneq ($(V),1)
+  Q?=@
+endif
+# To see full command lines, use make V=1
 
 # Your platform. See PLATS for possible values.
 PLAT= none
diff --git a/tools/mfkey/Makefile b/tools/mfkey/Makefile
index e54ad1782..24508265a 100644
--- a/tools/mfkey/Makefile
+++ b/tools/mfkey/Makefile
@@ -1,6 +1,8 @@
 # Hide full compilation line:
-Q?=@
-# To see full command lines, use make Q=
+ifneq ($(V),1)
+  Q?=@
+endif
+# To see full command lines, use make V=1
 
 VPATH = ../../common ../../common/crapto1 ../../client
 CC = gcc
diff --git a/tools/nonce2key/Makefile b/tools/nonce2key/Makefile
index 9335caf6c..481c3e275 100644
--- a/tools/nonce2key/Makefile
+++ b/tools/nonce2key/Makefile
@@ -1,6 +1,8 @@
 # Hide full compilation line:
-Q?=@
-# To see full command lines, use make Q=
+ifneq ($(V),1)
+  Q?=@
+endif
+# To see full command lines, use make V=1
 
 CC = gcc
 CFLAGS = -std=c99 -Wall -O3 -I.

From 27493a7b902710e5535b374232a173bcef1221fd Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 2 Jun 2019 16:23:57 +0200
Subject: [PATCH 1897/1938] makefile: silent fpga_compressor stdout by default

---
 armsrc/Makefile | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/armsrc/Makefile b/armsrc/Makefile
index d55b0e5a7..7fda76b99 100644
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -185,7 +185,11 @@ $(OBJDIR)/fpga_all.o: $(OBJDIR)/fpga_all.bit.z
 
 $(OBJDIR)/fpga_all.bit.z: $(FPGA_BITSTREAMS) $(FPGA_COMPRESSOR)
 	$(info [-] GEN $@)
-	$(Q)$(FPGA_COMPRESSOR) $(filter %.bit,$^) $@
+ifeq ($(Q),@)
+	@$(FPGA_COMPRESSOR) $(filter %.bit,$^) $@ >/dev/null
+else
+	$(FPGA_COMPRESSOR) $(filter %.bit,$^) $@
+endif
 
 $(FPGA_COMPRESSOR):
 	$(info [*] MAKE $@)
@@ -209,7 +213,11 @@ $(OBJDIR)/fullimage.data.bin: $(OBJDIR)/fullimage.stage1.elf
 
 $(OBJDIR)/fullimage.data.bin.z: $(OBJDIR)/fullimage.data.bin $(FPGA_COMPRESSOR)
 	$(info [-] GEN $@)
-	$(Q)$(FPGA_COMPRESSOR) $(filter %.bin,$^) $@
+ifeq ($(Q),@)
+	@$(FPGA_COMPRESSOR) $(filter %.bin,$^) $@ >/dev/null
+else
+	$(FPGA_COMPRESSOR) $(filter %.bin,$^) $@
+endif
 
 $(OBJDIR)/fullimage.data.o: $(OBJDIR)/fullimage.data.bin.z
 	$(info [-] GEN $@)

From 3cb6912d8e7a4f6468185c9971cbd1835e527cf3 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 2 Jun 2019 16:39:50 +0200
Subject: [PATCH 1898/1938] update btaddon doc

---
 doc/bt_manual_v10.md | 34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/doc/bt_manual_v10.md b/doc/bt_manual_v10.md
index 22adda87e..81d87acc6 100644
--- a/doc/bt_manual_v10.md
+++ b/doc/bt_manual_v10.md
@@ -17,7 +17,7 @@ It can easily connect to Bluetooth mobile phone, portable computer, etc. Without
 Built-in battery can support standalone mode, off-line sniffing, off-line reading & simulation, etc. The temperature of the device is stable.
 
 
-### 2.	PARAMETER
+### 2.	PARAMETERS
 
 *	Battery capacity:	400 mAh
 *	Standby time:		3.5h @ StandBy; 2.9h @ LF-On; 50min @ HF-On;
@@ -42,7 +42,32 @@ Built-in battery can support standalone mode, off-line sniffing, off-line readin
 <img src="http://www.icedev.se/proxmark3/blueshark/addon_open_1.jpg" alt="Image of blue shark add-on open fit" width="300"><img src="http://www.icedev.se/proxmark3/blueshark/addon_fitted_1.jpg" alt="Image of blue shark add-on fitted" width="300">
 </p>
 
-### 4.	CONNECT WITH BLUETOOTH
+### 4.	COMPILATION / FLASHING
+
+Please download the latest source code from Rfid Research Group's Github repo:
+https://github.com/RfidResearchGroup/proxmark3
+
+To compile the client and firmware with FPC support, the easiest way is to 
+
+1. Copy the sample file:  `Makefile.platform.sample`  ⇒   `Makefile.platform`
+2. Edit `Makefile.platform`,  uncomment the line `#PLATFORM_EXTRAS=BTADDON` by removing the `#`
+3. Recompile the project:
+   * `make clean; make -j8`
+4. Flash the firmware
+
+You are now ready to run the client with the serial port you got from your BT device on your laptop etc.  
+See instructions below.
+
+### 5.	CONNECT WITH BLUETOOTH
+
+You can have both USB cable connect and BT active at the same time and connect to either serial port.  
+You can also switch serial port from inside the proxmark3 client using the new command `hw connect`.
+
+### Default settings
+
+1. Serial: `115200 8N1`
+2. Name:  `PM3_RDV4.0`
+3. Pin: `1234`
 
 #### Windows
 
@@ -118,11 +143,6 @@ turn on solid.
 ./proxmark /dev/ttyUSB0
 ```
 
-### 5. Compiling / Flashing 
-Please download the latest source code from Rfid Research Group's Github repo:
-https://github.com/RfidResearchGroup/proxmark3
-
-
 ### 6.	OTHER NOTES
 
 #### (1)	UART and LED behavior

From b7016e0bedc6f070577d4f767b66a208e467423b Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 2 Jun 2019 17:42:14 +0200
Subject: [PATCH 1899/1938] frame format doc: txt to md

---
 doc/new_frame_format.md  | 466 +++++++++++++++++++++++++++++++++++++++
 doc/new_frame_format.txt | 450 -------------------------------------
 2 files changed, 466 insertions(+), 450 deletions(-)
 create mode 100644 doc/new_frame_format.md
 delete mode 100644 doc/new_frame_format.txt

diff --git a/doc/new_frame_format.md b/doc/new_frame_format.md
new file mode 100644
index 000000000..76424f8b6
--- /dev/null
+++ b/doc/new_frame_format.md
@@ -0,0 +1,466 @@
+# New frame format documentation
+
+This document is primarily intended for developers only.
+
+A major change is the support of variable length frames between host and Proxmark3.  
+This is a step especially important for usage over FPC/USART/BT.
+
+## Old format
+
+Previously, frames were, in both directions like this:
+
+    uint64_t cmd;
+    uint64_t arg[3];
+    union {
+        uint8_t  asBytes[PM3_CMD_DATA_SIZE];
+        uint32_t asDwords[PM3_CMD_DATA_SIZE / 4];
+    } d;
+
+with PM3_CMD_DATA_SIZE = 512 and there was no API abstraction, everybody was forging/parsing these frames.  
+So the frame size was fixed, 544 bytes, even for simple ACKs.  
+When snooping the USB transfers, we can observe the host is sending 544b Bulk USB frames while the Proxmark3 is limited by its internal buffers and is sending 128b, 128b, 128b, 128b, 32b, so in total 5 packets.
+
+## New format
+
+Even if we make the payload part variable in the old format, we've still a minimum of 32 bytes per frame with fields arbitrarily large.
+So we designed a new format from scratch:
+
+For commands being sent to the Proxmark3:
+
+    uint32_t magic;
+    uint16_t length : 15;
+    bool ng : 1;
+    uint16_t cmd;
+    uint8_t  data[length];
+    uint16_t crc;
+
+* `magic`:  arbitrary magic (`PM3a`) to help re-sync if needed
+* `length`: length of the variable payload, 0 if none, max 512 (PM3_CMD_DATA_SIZE) for now.
+* `ng`:     flag to tell if the data is following the new format (ng) or the old one, see transition notes below
+* `cmd`:    as previously, on 16b as it's enough
+* `data`:   variable length payload
+* `crc`:    either an actual CRC (crc14a) or a Magic placeholder (`a3`)
+
+For responses from the Proxmark:
+
+    uint32_t magic;
+    uint16_t length : 15;
+    bool ng : 1;
+    int16_t  status;
+    uint16_t cmd;
+    uint8_t  data[length];
+    uint16_t crc;
+
+* `magic`:  arbitrary magic (`PM3b`) to help re-sync if needed
+* `length`: length of the variable payload, 0 if none, max 512 (PM3_CMD_DATA_SIZE) for now.
+* `ng`:     flag to tell if the data is following the new format (ng) or the old one, see transition notes below
+* `status`: a field to send back the status of the command execution
+* `cmd`:    as previously, on 16b as it's enough
+* `data`:   variable length payload
+* `crc`:    either an actual CRC (crc14a) or a Magic placeholder (`a3`)
+
+We used to send an anonymous ACK, now we're replying with the corresponding command name and a status.
+CRC is optional and on reception, the magic `a3` is accepted as placeholder. If it's different then it's checked as a CRC.
+By default CRC is user over USART and is disabled over USB, on both directions.
+
+Internal structures used to handle these packets are:
+* PacketCommandNGPreamble
+* PacketCommandNGPostamble
+* PacketCommandNGRaw
+* PacketResponseNGPreamble
+* PacketResponseNGPostamble
+* PacketResponseNGRaw
+
+But they are abstracted from the developer view with a new API. See below.
+
+## Transition
+
+Because it's a long transition to clean all the code from the old format and because we don't want to break stuffs when flashing the bootloader, the old frames are still supported together with the new frames. The old structure is now called `PacketCommandOLD` and `PacketResponseOLD` and it's also abstracted from the developer view with the new API.
+
+## New format API
+
+So the new API is a merge of the old and the new frame formats, to ensure a smooth transition.
+
+The boolean `ng` indicates if the structure is storing data from the old or the new format.
+Old format can come from either old 544b frames or mixed frames (variable length but still with oldargs).
+After the full transition, we might remove the fields `oldarg` and `ng`.
+`PacketCommandNG` and `PacketResponseNG` are the structs used by the API, as seen in a previous section, there are other variable-sized packed structs specifically for the data transmission.
+
+    typedef struct {
+        uint16_t cmd;
+        uint16_t length;
+        uint32_t magic;      //  NG
+        uint16_t crc;        //  NG
+        uint64_t oldarg[3];  //  OLD
+        union {
+            uint8_t  asBytes[PM3_CMD_DATA_SIZE];
+            uint32_t asDwords[PM3_CMD_DATA_SIZE / 4];
+        } data;
+        bool ng;             // does it store NG data or OLD data?
+    } PacketCommandNG;
+
+    typedef struct {
+        uint16_t cmd;
+        uint16_t length;
+        uint32_t magic;      //  NG
+        int16_t  status;     //  NG
+        uint16_t crc;        //  NG
+        uint64_t oldarg[3];  //  OLD
+        union {
+            uint8_t  asBytes[PM3_CMD_DATA_SIZE];
+            uint32_t asDwords[PM3_CMD_DATA_SIZE / 4];
+        } data;
+        bool ng;             // does it store NG data or OLD data?
+    } PacketResponseNG;
+
+
+### On the client, for sending frames:
+
+(`client/comms.c`)
+
+    void SendCommandNG(uint16_t cmd, uint8_t *data, size_t len);
+    void SendCommandBL(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
+    void SendCommandOLD(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
+    void SendCommandMIX(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
+
+So cmds should make the transition from `SendCommandOLD` to `SendCommandNG` to benefit from smaller frames (and armsrc handlers adjusted accordingly of course).  
+`SendCommandBL` is for Bootloader-related activities, see Bootrom section.  
+`SendCommandMIX` is a transition fct: it uses the same API as `SendCommandOLD` but benefits somehow from variable length frames. It occupies at least 24b of data for the oldargs and real data is therefore limited to PM3_CMD_DATA_SIZE - 24 (defined as PM3_CMD_DATA_SIZE_MIX). Besides the size limitation, the receiver handler doesn't know if this was an OLD frame or a MIX frame, it gets its oldargs and data as usual.  
+Warning : it makes sense to move from `SendCommandOLD` to `SendCommandMIX` only for *commands with small payloads*.
+* otherwise both have about the same size
+* `SendCommandMIX` has a smaller payload (PM3_CMD_DATA_SIZE_MIX < PM3_CMD_DATA_SIZE) so it's risky to blindly move from OLD to MIX if there is a large payload.
+
+Internally these functions prepare the new or old frames and call `uart_communication` which calls `uart_send`.
+
+### On the Proxmark3, for receiving frames:
+
+(`armsrc/appmain.c`)
+
+    PacketCommandNG
+
+`AppMain` calls `receive_ng`(`common/cmd.c`) which calls `usb_read_ng`/`usart_read_ng` to get a `PacketCommandNG`, then passes it to `PacketReceived`.
+(no matter if it's an old frame or a new frame, check `PacketCommandNG.ng` field to know if there are `oldargs`)  
+`PacketReceive` is the commands broker.  
+Old handlers will still find their stuff in `PacketCommandNG.oldarg` field.
+
+### On the Proxmark3, for sending frames:
+
+(`common/cmd.c`)
+
+    int16_t reply_ng(uint16_t cmd, int16_t status, uint8_t *data, size_t len)
+    int16_t reply_old(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len)
+    int16_t reply_mix(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len)
+
+So replies should make the transition from `reply_old` to `reply_ng` to benefit from smaller frames (and client reception adjusted accordingly of course).  
+`reply_mix` is a transition fct: it uses the same API as reply_old but benefits somehow from variable length frames. It occupies at least 24b of data for the oldargs and real data is therefore limited to PM3_CMD_DATA_SIZE - 24. Besides the size limitation, the client command doesn't know if this was an OLD frame or a MIX frame, it gets its oldargs and data as usual.
+
+Example of a handler that supports both OLD/MIX and NG command styles and replies with the new frame format when it receives new command format:
+
+    if (packet->ng) {
+        reply_ng(CMD_FOOBAR, PM3_SUCCESS, packet->data.asBytes, packet->length);
+    } else {
+        // reply_old(CMD_ACK, 0, 0, 0, packet->data.asBytes, packet->length);
+        reply_mix(CMD_ACK, 0, 0, 0, packet->data.asBytes, packet->length);
+    }
+
+### On the client, for receiving frames:
+
+(`client/comms.c`)
+
+    WaitForResponseTimeout ⇒ PacketResponseNG
+
+`uart_communication` calls `uart_receive` and create a `PacketResponseNG`, then passes it to `PacketResponseReceived`.
+`PacketResponseReceived` treats it immediately (prints) or stores it with `storeReply`.
+Commands do `WaitForResponseTimeoutW` (or `dl_it`) which uses `getReply` to fetch responses.
+
+## API transition
+
+In short, to move from one format to the other, we need for each command:
+
+* (client TX) `SendCommandOLD` ⇒ `SendCommandNG` (with all stuff in ad-hoc PACKED structs in `data` field)
+* (pm3 RX) `PacketCommandNG` parsing, from `oldarg` to only the `data` field
+* (pm3 TX) `reply_old` ⇒ `reply_ng` (with all stuff in ad-hoc PACKED structs in `data` field)
+* (client RX) `PacketResponseNG` parsing, from `oldarg` to only the `data` field
+
+Meanwhile, a fast transition to MIX frames can be done with:
+
+* (client TX) `SendCommandOLD` ⇒ `SendCommandMIX` (but check the limited data size PM3_CMD_DATA_SIZE ⇒ PM3_CMD_DATA_SIZE_MIX)
+* (pm3 TX) `reply_old` ⇒ `reply_mix` (but check the limited data size PM3_CMD_DATA_SIZE ⇒ PM3_CMD_DATA_SIZE_MIX)
+
+## Bootrom
+
+Bootrom code will still use the old frame format to remain compatible with other repos supporting the old format and because it would hardly gain anything from the new format:
+* almost all frames convey 512b of payload, so difference in overhead is neglictible
+* bringing flash over usart sounds risky and would be terribly slow anyway (115200 bauds vs. 7M bauds).
+
+`SendCommandBL` is the same as `SendCommandOLD` with a different name to be sure not to migrate it.
+
+### On the Proxmark3, for receiving frames:
+
+(`bootrom/bootrom.c`)
+
+    usb_read (common/usb_cdc.c) ⇒ UsbPacketReceived (bootrom.c)
+      ⇒ CMD_DEVICE_INFO / CMD_START_FLASH / CMD_FINISH_WRITE / CMD_HARDWARE_RESET / CMD_SETUP_WRITE
+
+also `usb_enable`, `usb_disable` (`common/usb_cdc.c`)
+
+### On the Proxmark3, for sending frames:
+
+(`bootrom/bootrom.c`)
+
+    reply_old (bootrom.c) ⇒ usb_write (common/usb_cdc.c)
+
+also `usb_enable`, `usb_disable` (`common/usb_cdc.c`)
+
+### On the client, for sending frames:
+
+Therefore, the flasher client (`client/flasher.c` + `client/flash.c`) must still use these old frames.  
+It uses a few commands in common with current client code:
+
+    OpenProxmark
+    CloseProxmark
+    SendCommandOLD
+      ⇒ CMD_DEVICE_INFO / CMD_START_FLASH / CMD_FINISH_WRITE / CMD_HARDWARE_RESET
+
+### On the client, for receiving frames:
+
+As usual, old frames are still supported
+
+    WaitForResponseTimeout ⇒ PacketResponseNG
+
+## New usart RX FIFO
+
+USART code has been rewritten to cope with unknown size packets.
+* using USART full duplex with double DMA buffer on RX & TX
+* using internal FIFO for RX
+
+`usart_init`:
+* USART is activated all way long from usart_init(), no need to touch it in RX/TX routines: `pUS1->US_PTCR = AT91C_PDC_RXTEN | AT91C_PDC_TXTEN`
+
+`usart_writebuffer_sync`:
+* still using DMA but accepts arbitrary packet sizes
+* removed unneeded memcpy
+* wait for DMA buffer to be treated before returning, therefore "sync"
+* we could make an async version but caller must be sure the DMA buffer remains available!
+* as it's sync, no need for next DMA buffer
+
+`usart_read_ng`:
+* user tells expected packet length
+* relies on usart_rxdata_available to know if there is data in our FIFO buffer
+* fetches data from our FIFO
+* dynamic number of tries (depending on FPC speed) to wait for asked data
+
+`usart_rxdata_available`:
+* polls usart_fill_rxfifo
+* returns number of bytes available in our FIFO
+
+`usart_fill_rxfifo`:
+* if next DMA buffer got moved to current buffer (`US_RNCR == 0`), it means one DMA buffer is full
+  * transfer current DMA buffer data to our FIFO
+  * swap to the other DMA buffer
+  * provide the emptied DMA buffer as next DMA buffer
+* if current DMA buffer is partially filled
+  * transfer available data to our FIFO
+  * remember how many bytes we already copied to our FIFO
+
+## Timings
+
+Reference (before new format):
+
+    linux usb: #db#   USB Transfer Speed PM3 ⇒ Client = 545109 Bytes/s
+On a Windows VM:
+
+    proxspace usb: #db#   USB Transfer Speed PM3 ⇒ Client = 233998 Bytes/s
+
+Over USART:
+
+(`common/usart.h`)  
+USART_BAUD_RATE defined there
+
+         9600: #db#   USB Transfer Speed PM3 ⇒ Client =    934 Bytes/s
+       115200: #db#   USB Transfer Speed PM3 ⇒ Client =  11137 Bytes/s
+       460800: #db#   USB Transfer Speed PM3 ⇒ Client =  43119 Bytes/s
+    linux usb: #db#   USB Transfer Speed PM3 ⇒ Client = 666624 Bytes/s (equiv. to ~7Mbaud)
+
+
+(`pm3_cmd.h`)
+
+Receiving from USART need more than 30ms as we used on USB
+else we get errors about partial packet reception
+
+    FTDI   9600 hw status        ⇒ we need 20ms
+    FTDI 115200 hw status        ⇒ we need 50ms
+    FTDI 460800 hw status        ⇒ we need 30ms
+    BT   115200 hf mf fchk 1 dic ⇒ we need 140ms
+
+    # define UART_FPC_CLIENT_RX_TIMEOUT_MS  170
+    # define UART_USB_CLIENT_RX_TIMEOUT_MS  20
+    # define UART_TCP_CLIENT_RX_TIMEOUT_MS  300
+
+This goes to `uart_posix.c` `timeval` struct
+and `uart_win32.c` `serial_port_windows` struct
+
+It starts at UART_FPC_CLIENT_RX_TIMEOUT_MS and once we detect we're working over USB
+it's reduced to UART_USB_CLIENT_RX_TIMEOUT_MS.
+
+
+
+Add automatically some communication delay in the `WaitForResponseTimeout` & `dl_it` timeouts.  
+Only when using FPC, timeout = 2* empirically measured delay (FTDI cable).  
+Empirically measured delay (FTDI cable) with "hw ping 512" :
+
+       usb ⇒    6..  32ms
+    460800 ⇒   40..  70ms
+      9600 ⇒ 1100..1150ms
+
+(`client/comms.c`)
+
+    static size_t communication_delay(void) {
+        if (conn.send_via_fpc_usart)  // needed also for Windows USB USART??
+            return 2 * (12000000 / uart_speed);
+        return 100;
+    }
+
+Because some commands send a lot of frames before finishing (hw status, lf read,...),
+`WaitForResponseTimeout` & `dl_it` timeouts are reset at each packet reception,
+so timeout is actually counted after latest received packet,
+it doesn't depend anymore on the number of received packets.
+
+It was needed to tune pm3 RX usart `maxtry` :
+
+(`common/usart.c`)
+
+    uint32_t usart_read_ng(uint8_t *data, size_t len) {
+    // Empirical max try observed: 3000000 / USART_BAUD_RATE
+    // Let's take 10x
+    uint32_t tryconstant = 0;
+    #ifdef USART_SLOW_LINK
+        // Experienced up to 13200 tries on BT link even at 460800
+        tryconstant = 50000;
+    #endif
+        uint32_t maxtry = 10 * (3000000 / USART_BAUD_RATE) + tryconstant;
+
+
+`DbpStringEx` using `reply_old`:
+
+    time client/proxmark3 -p /dev/ttyACM0 -c "hw status"
+    2.52s
+    time client/proxmark3 -p /dev/ttyUSB0 -b 460800 -c "hw status"
+    3.03s
+    time client/proxmark3 -p /dev/ttyUSB0 -b 115200 -c "hw status"
+    4.88s
+    time client/proxmark3 -p /dev/ttyUSB0 -b 9600 -c "hw status"
+    26.5s
+
+`DbpStringEx` using `reply_mix`:
+
+    time client/proxmark3 -p /dev/ttyUSB0 -b 9600 -c "hw status"
+    7.08s
+
+`DbpStringEx` using `reply_ng`:
+
+    time client/proxmark3 -p /dev/ttyACM0 -c "hw status"
+    2.10s
+    time client/proxmark3 -p /dev/ttyUSB0 -b 460800 -c "hw status"
+    2.22s
+    time client/proxmark3 -p /dev/ttyUSB0 -b 115200 -c "hw status"
+    2.43s
+    time client/proxmark3 -p /dev/ttyUSB0 -b 9600 -c "hw status"
+    5.75s
+
+    time client/proxmark3 -p /dev/ttyUSB0 -b 9600 -c "lf read"
+    50.38s
+    time client/proxmark3 -p /dev/ttyUSB0 -b 115200 -c "lf read"
+    6.28s
+
+    time client/proxmark3 -p /dev/ttyACM0 -c "mem save f foo_usb"
+    1.48s
+    time client/proxmark3 -p /dev/ttyUSB0 -b 115200 -c "mem save f foo_fpc"
+    25.34s
+
+
+Sending multiple commands can still be slow because it waits regularly for incoming RX frames and the timings are quite conservative because of BT (see struct timeval timeout in uart_posix.c, now at 200ms). When one knows there is no response to wait before the next command, he can use the same trick as in the flasher:
+
+    // fast push mode
+    conn.block_after_ACK = true;
+    some loop {
+        if (sending_last_command)
+            // Disable fast mode
+            conn.block_after_ACK = false;
+        SendCommandOLD / SendCommandMix
+        if (!WaitForResponseTimeout(CMD_ACK, &resp, some_timeout)) {
+            ....
+            conn.block_after_ACK = false;
+            return PM3_ETIMEOUT;
+        }
+    }
+    return PM3_SUCCESS;
+
+Or if it's too complex to determine when we're sending the last command:
+
+    // fast push mode
+    conn.block_after_ACK = true;
+    some loop {
+        SendCommandOLD / SendCommandMIX
+        if (!WaitForResponseTimeout(CMD_ACK, &resp, some_timeout)) {
+            ....
+            conn.block_after_ACK = false;
+            return PM3_ETIMEOUT;
+        }
+    }
+    // Disable fast mode and send a dummy command to make it effective
+    conn.block_after_ACK = false;
+    SendCommandNG(CMD_PING, NULL, 0);
+    WaitForResponseTimeout(CMD_ACK, NULL, 1000);
+    return PM3_SUCCESS;
+
+
+## Reference frames
+
+
+For helping debug...
+
+* OLD command and reply packets are 544 bytes.
+* NG & MIX command packets are between 10 and 522 bytes.
+* NG & MIX reply packets are between 12 and 524 bytes.
+
+On linux USB
+* sent packets can be 544
+* received packets are max 128, so 544 = 128+128+128+128+32
+
+On linux UART (FTDI)
+* sent packets are max 256, so 544 = 256+256+32
+* received packets are max 512, so 544 = 512+32
+
+`hw ping` (old version, mix reply)
+
+    TestProxmark: SendCommandOLD(CMD_PING, 0, 0, 0, NULL, 0);
+    ->544=0901000000000000000000000000000000000000000000000000000000000000  -> OLD
+    CMD_PING: reply_mix(CMD_ACK, reply_via_fpc, 0, 0, 0, 0);
+    <-36=504d336218000000ff0000000000000000000000000000000000000000000000   <- MIX
+
+`hw ping` (intermediate version using MIX)
+
+    CmdPing  SendCommandMIX(CMD_PING, 0, 0, 0, NULL, 0);
+    ->34=504d336118000901000000000000000000000000000000000000000000000000   -> MIX
+    CMD_PING reply_mix(CMD_ACK, reply_via_fpc, 0, 0, 0, 0);
+    <-36=504d336218000000ff0000000000000000000000000000000000000000000000   <- MIX
+
+`hw ping` (current NG version)
+
+    CmdPing  SendCommandNG(CMD_PING, data, len);
+    ->10=504d3361008009016133                                               -> NG
+    CMD_PING reply_ng(CMD_PING, PM3_SUCCESS, packet->data.asBytes, packet->length);
+    <-12=504d33620080000009016233                                           <- NG
+
+`hw ping 512` (NG)
+
+    CmdPing  SendCommandNG(CMD_PING, data, len);
+    ->522=504d336100820901000102030405060708090a0b0c0d0e0f1011121314151617  -> NG
+    CMD_PING reply_ng(CMD_PING, PM3_SUCCESS, packet->data.asBytes, packet->length);
+    <-128=504d3362008200000901000102030405060708090a0b0c0d0e0f101112131415  <- NG
+    <-128=767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495
+    <-128=f6f7f8f9fafbfcfdfeff000102030405060708090a0b0c0d0e0f101112131415
+    <-128=767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495
+    <-12=f6f7f8f9fafbfcfdfeff6233
+
diff --git a/doc/new_frame_format.txt b/doc/new_frame_format.txt
deleted file mode 100644
index 76e4a7217..000000000
--- a/doc/new_frame_format.txt
+++ /dev/null
@@ -1,450 +0,0 @@
-
-A major change is the support of variable length frames between host and Proxmark3.
-This is a step especially important for usage over FPC/USART/BT.
-
-Old format
-==========
-
-Previously, frames were, in both directions like this:
-
-    uint64_t cmd;
-    uint64_t arg[3];
-    union {
-        uint8_t  asBytes[PM3_CMD_DATA_SIZE];
-        uint32_t asDwords[PM3_CMD_DATA_SIZE / 4];
-    } d;
-
-with PM3_CMD_DATA_SIZE = 512 and there was no API abstraction, everybody was forging/parsing these frames.
-So the frame size was fixed, 544 bytes, even for simple ACKs.
-When snooping the USB transfers, we can observe the host is sending 544b Bulk USB frames while the Proxmark3 is limited by its internal buffers and is sending 128b, 128b, 128b, 128b, 32b, so in total 5 packets.
-
-New format
-==========
-
-Even if we make the payload part variable in the old format, we've still a minimum of 32 bytes per frame with fields arbitrarily large.
-So we designed a new format from scratch:
-
-For commands being sent to the Proxmark:
-
-    uint32_t magic;
-    uint16_t length : 15;
-    bool ng : 1;
-    uint16_t cmd;
-    uint8_t  data[length];
-    uint16_t crc;
-
-* magic:  arbitrary magic ("PM3a") to help re-sync if needed
-* length: length of the variable payload, 0 if none, max 512 (PM3_CMD_DATA_SIZE) for now.
-* ng:     flag to tell if the data is following the new format (ng) or the old one, see transition notes below
-* cmd:    as previously, on 16b as it's enough
-* data:   variable length payload
-* crc:    either an actual CRC (crc14a) or a Magic placeholder ("a3")
-
-For responses from the Proxmark:
-
-    uint32_t magic;
-    uint16_t length : 15;
-    bool ng : 1;
-    int16_t  status;
-    uint16_t cmd;
-    uint8_t  data[length];
-    uint16_t crc;
-
-* magic:  arbitrary magic ("PM3a") to help re-sync if needed
-* length: length of the variable payload, 0 if none, max 512 (PM3_CMD_DATA_SIZE) for now.
-* ng:     flag to tell if the data is following the new format (ng) or the old one, see transition notes below
-* status: a field to send back the status of the command execution
-* cmd:    as previously, on 16b as it's enough
-* data:   variable length payload
-* crc:    either an actual CRC (crc14a) or a Magic placeholder ("a3")
-
-We used to send an anonymous ACK, now we're replying with the corresponding command name and a status.
-CRC is optional and on reception, the magic "a3" is accepted as placeholder. If it's different then it's checked as a CRC.
-By default CRC is user over USART and is disabled over USB, on both directions.
-
-Internal structures used to handle these packets are:
-* PacketCommandNGPreamble
-* PacketCommandNGPostamble
-* PacketCommandNGRaw
-* PacketResponseNGPreamble
-* PacketResponseNGPostamble
-* PacketResponseNGRaw
-
-But they are abstracted from the developer view with a new API.
-
-Transition
-==========
-
-Because it's a long transition to clean all the code from the old format and because we don't want to break stuffs when flashing the bootloader, the old frames are still supported together with the new frames. The old structure is now called PacketCommandOLD and PacketResponseOLD and it's also abstracted from the developer view with the new API.
-
-New format API
-==============
-
-So the new API is a merge of the old and the new frame formats, to ensure a smooth transition.
-The boolean "ng" indicates if the structure is storing data from the old or the new format.
-Old format can come from either old 544b frames or mixed frames (variable length but still with oldargs).
-After the full transition, we might remove the fields "oldarg" and "ng".
-
-typedef struct {
-    uint16_t cmd;
-    uint16_t length;
-    uint32_t magic;      //  NG
-    uint16_t crc;        //  NG
-    uint64_t oldarg[3];  //  OLD
-    union {
-        uint8_t  asBytes[PM3_CMD_DATA_SIZE];
-        uint32_t asDwords[PM3_CMD_DATA_SIZE / 4];
-    } data;
-    bool ng;             // does it store NG data or OLD data?
-} PACKED PacketCommandNG;
-
-typedef struct {
-    uint16_t cmd;
-    uint16_t length;
-    uint32_t magic;      //  NG
-    int16_t  status;     //  NG
-    uint16_t crc;        //  NG
-    uint64_t oldarg[3];  //  OLD
-    union {
-        uint8_t  asBytes[PM3_CMD_DATA_SIZE];
-        uint32_t asDwords[PM3_CMD_DATA_SIZE / 4];
-    } data;
-    bool ng;             // does it store NG data or OLD data?
-} PACKED PacketResponseNG;
-
-
-On the client, for sending frames:
-----------------------------------
-(client->comms.c)
-*****************************************
-void SendCommandNG(uint16_t cmd, uint8_t *data, size_t len);
-void SendCommandBL(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
-void SendCommandOLD(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
-void SendCommandMIX(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
-*****************************************
-
-So cmds should make the transition from SendCommandOLD to SendCommandNG to benefit from smaller frames (and armsrc handlers adjusted accordingly of course).
-SendCommandBL is for Bootloader-related activities, see Bootrom section.
-SendCommandMIX is a transition fct: it uses the same API as SendCommandOLD but benefits somehow from variable length frames. It occupies at least 24b of data for the oldargs and real data is therefore limited to PM3_CMD_DATA_SIZE - 24 (defined as PM3_CMD_DATA_SIZE_MIX). Besides the size limitation, the receiver handler doesn't know if this was an OLD frame or a MIX frame, it gets its oldargs and data as usual.
-Warning : it makes sense to move from SendCommandOLD to SendCommandMIX only for *commands with small payloads*.
-* otherwise both have about the same size
-* SendCommandMIX has a smaller payload (PM3_CMD_DATA_SIZE_MIX < PM3_CMD_DATA_SIZE) so it's risky to blindly move from OLD to MIX if there is a large payload.
-
-Internally these functions prepare the new or old frames and call uart_communication which calls uart_send.
-
-On the Proxmark3, for receiving frames:
----------------------------------------
-(armsrc/appmain.c)
-*****************************************
-PacketCommandNG
-*****************************************
-AppMain calls receive_ng(common/cmd.c) which calls usb_read_ng/usart_read_ng to get a PacketCommandNG, then passes it to PacketReceived.
-(no matter if it's an old frame or a new frame, check PacketCommandNG "ng" field to know if there are oldargs)
-PacketReceive is the commands broker.
-Old handlers will still find their stuff in "oldarg" field.
-
-On the Proxmark3, for sending frames:
--------------------------------------
-(common/cmd.c)
-*****************************************
-int16_t reply_ng(uint16_t cmd, int16_t status, uint8_t *data, size_t len)
-int16_t reply_old(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len)
-int16_t reply_mix(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len)
-*****************************************
-
-So replies should make the transition from reply_old to reply_ng to benefit from smaller frames (and client reception adjusted accordingly of course).
-reply_mix is a transition fct: it uses the same API as reply_old but benefits somehow from variable length frames. It occupies at least 24b of data for the oldargs and real data is therefore limited to PM3_CMD_DATA_SIZE - 24. Besides the size limitation, the client command doesn't know if this was an OLD frame or a MIX frame, it gets its oldargs and data as usual.
-
-Example of a handler that supports both OLD/MIX and NG command styles and replies with the new frame format when it receives new command format:
-    if (packet->ng) {
-        reply_ng(CMD_FOOBAR, PM3_SUCCESS, packet->data.asBytes, packet->length);
-    } else {
-        // reply_old(CMD_ACK, 0, 0, 0, packet->data.asBytes, packet->length);
-        reply_mix(CMD_ACK, 0, 0, 0, packet->data.asBytes, packet->length);
-    }
-
-On the client, for receiving frames:
-------------------------------------
-(client->comms.c)
-*****************************************
-WaitForResponseTimeout -> PacketResponseNG
-*****************************************
-uart_communication calls uart_receive and create a PacketResponseNG, then passes it to PacketResponseReceived.
-PacketResponseReceived treats it immediately (prints) or stores it with storeReply.
-Commands do WaitForResponseTimeoutW (or dl_it) which uses getReply to fetch responses.
-
-API transition
-==============
-
-In short, to move from one format to the other, we need for each command:
-
-* (client TX) SendCommandOLD -> SendCommandNG (with all stuff in ad-hoc structs in "data" field)
-* (pm3 RX) PacketCommandNG parsing, from "oldarg" to only the "data" field
-* (pm3 TX) reply_old -> reply_ng (with all stuff in ad-hoc structs in "data" field)
-* (client RX) PacketResponseNG parsing, from "oldarg" to only the "data" field
-
-Meanwhile, a fast transition to MIX frames can be done with:
-
-* (client TX) SendCommandOLD -> SendCommandMIX (but check the limited data size PM3_CMD_DATA_SIZE -> PM3_CMD_DATA_SIZE_MIX)
-* (pm3 TX) reply_old -> reply_mix (but check the limited data size PM3_CMD_DATA_SIZE -> PM3_CMD_DATA_SIZE_MIX)
-
-Bootrom
-=======
-
-Bootrom code will still use the old frame format to remain compatible with other repos supporting the old format and because it would hardly gain anything from the new format:
-* almost all frames convey 512b of payload, so difference in overhead is neglictible
-* bringing flash over usart sounds risky and would be terribly slow anyway (115200 bauds vs. 7M bauds).
-
-SendCommandBL is the same as SendCommandOLD with a different name to be sure not to migrate it.
-
-On the Proxmark3, for receiving frames:
----------------------------------------
-(bootrom/bootrom.c)
-usb_read (common/usb_cdc.c) -> UsbPacketReceived (bootrom.c)
-  -> CMD_DEVICE_INFO / CMD_START_FLASH / CMD_FINISH_WRITE / CMD_HARDWARE_RESET / CMD_SETUP_WRITE
-also usb_enable, usb_disable (common/usb_cdc.c)
-
-On the Proxmark3, for sending frames:
--------------------------------------
-(bootrom/bootrom.c)
-reply_old (bootrom.c) -> usb_write (common/usb_cdc.c)
-also usb_enable, usb_disable (common/usb_cdc.c)
-
-On the client, for sending frames:
--------------------------------------
-
-Therefore, the flasher client (client/flasher.c + client->flash.c) must still use these old frames.
-It uses a few commands in common with current client code:
-OpenProxmark
-CloseProxmark
-SendCommandOLD
-  -> CMD_DEVICE_INFO / CMD_START_FLASH / CMD_FINISH_WRITE / CMD_HARDWARE_RESET
-
-On the client, for receiving frames:
-------------------------------------
-As usual, old frames are still supported
-WaitForResponseTimeout -> PacketResponseNG
-
-New usart RX FIFO
-=================
-
-USART code has been rewritten to cope with unknown size packets.
-* using USART full duplex with double DMA buffer on RX & TX
-* using internal FIFO for RX
-
-usart_init:
-* USART is activated all way long from usart_init(), no need to touch it in RX/TX routines: pUS1->US_PTCR = AT91C_PDC_RXTEN | AT91C_PDC_TXTEN
-
-usart_writebuffer_sync:
-* still using DMA but accepts arbitrary packet sizes
-* removed unneeded memcpy
-* wait for DMA buffer to be treated before returning, therefore "sync"
-* we could make an async version but caller must be sure the DMA buffer remains available!
-* as it's sync, no need for next DMA buffer
-
-usart_read_ng:
-* user tells expected packet length
-* relies on usart_rxdata_available to know if there is data in our FIFO buffer
-* fetches data from our FIFO
-* dynamic number of tries (depending on FPC speed) to wait for asked data
-
-usart_rxdata_available:
-* polls usart_fill_rxfifo
-* returns number of bytes available in our FIFO
-
-usart_fill_rxfifo:
-* if next DMA buffer got moved to current buffer (US_RNCR == 0), it means one DMA buffer is full
-  * transfer current DMA buffer data to our FIFO
-  * swap to the other DMA buffer
-  * provide the emptied DMA buffer as next DMA buffer
-* if current DMA buffer is partially filled
-  * transfer available data to our FIFO
-  * remember how many bytes we already copied to our FIFO
-
-Timings
-=======
-
-Reference (before new format):
-
-    linux usb: #db#   USB Transfer Speed PM3 -> Client = 545109 Bytes/s
-On a Windows VM:
-proxspace usb: #db#   USB Transfer Speed PM3 -> Client = 233998 Bytes/s
-
-
-(common/usart.h)
-USART_BAUD_RATE defined there
-
-         9600: #db#   USB Transfer Speed PM3 -> Client =    934 Bytes/s
-       115200: #db#   USB Transfer Speed PM3 -> Client =  11137 Bytes/s
-       460800: #db#   USB Transfer Speed PM3 -> Client =  43119 Bytes/s
-    linux usb: #db#   USB Transfer Speed PM3 -> Client = 666624 Bytes/s (equiv. to ~7Mbaud)
-
-
-(pm3_cmd.h)
-
-Receiving from USART need more than 30ms as we used on USB
-else we get errors about partial packet reception
-FTDI   9600 hw status        -> we need 20ms
-FTDI 115200 hw status        -> we need 50ms
-FTDI 460800 hw status        -> we need 30ms
-BT   115200 hf mf fchk 1 dic -> we need 140ms
-
-# define UART_FPC_CLIENT_RX_TIMEOUT_MS  170
-# define UART_USB_CLIENT_RX_TIMEOUT_MS  20
-# define UART_TCP_CLIENT_RX_TIMEOUT_MS  300
-
-This goes to uart_posix.c timeval struct
-and uart_win32.c serial_port_windows struct
-
-It starts at UART_FPC_CLIENT_RX_TIMEOUT_MS and once we detect we're working over USB
-it's reduced to UART_USB_CLIENT_RX_TIMEOUT_MS.
-
-
-
-Add automatically some communication delay in the WaitForResponseTimeout & dl_it timeouts
-Only when using FPC, timeout = 2* empirically measured delay (FTDI cable)
-Empirically measured delay (FTDI cable) with "hw ping 512" :
-   usb ->    6..  32ms
-460800 ->   40..  70ms
-  9600 -> 1100..1150ms
-(client/comms.c)
-static size_t communication_delay(void) {
-    if (conn.send_via_fpc_usart)  // needed also for Windows USB USART??
-        return 2 * (12000000 / uart_speed);
-    return 100;
-}
-
-Because some commands send a lot of frames before finishing (hw status, lf read,...),
-WaitForResponseTimeout & dl_it timeouts are reset at each packet reception,
-so timeout is actually counted after latest received packet,
-it doesn't depend anymore on the number of received packets.
-
-Needed to tune pm3 RX usart maxtry
-(common/usart.c)
-uint32_t usart_read_ng(uint8_t *data, size_t len) {
-// Empirical max try observed: 3000000 / USART_BAUD_RATE
-// Let's take 10x
-uint32_t tryconstant = 0;
-#ifdef USART_SLOW_LINK
-    // Experienced up to 13200 tries on BT link even at 460800
-    tryconstant = 50000;
-#endif
-    uint32_t maxtry = 10 * (3000000 / USART_BAUD_RATE) + tryconstant;
-
-
-DbpStringEx using reply_old:
-time client/proxmark3 -p /dev/ttyACM0 -c "hw status"
-2.52s
-time client/proxmark3 -p /dev/ttyUSB0 -b 460800 -c "hw status"
-3.03s
-time client/proxmark3 -p /dev/ttyUSB0 -b 115200 -c "hw status"
-4.88s
-DbpStringEx using reply_old:
-time client/proxmark3 -p /dev/ttyUSB0 -b 9600 -c "hw status"
-26.5s
-
-DbpStringEx using reply_mix:
-time client/proxmark3 -p /dev/ttyUSB0 -b 9600 -c "hw status"
-7.08s
-
-DbpStringEx using reply_ng:
-time client/proxmark3 -p /dev/ttyACM0 -c "hw status"
-2.10s
-time client/proxmark3 -p /dev/ttyUSB0 -b 460800 -c "hw status"
-2.22s
-time client/proxmark3 -p /dev/ttyUSB0 -b 115200 -c "hw status"
-2.43s
-time client/proxmark3 -p /dev/ttyUSB0 -b 9600 -c "hw status"
-5.75s
-
-time client/proxmark3 -p /dev/ttyUSB0 -b 9600 -c "lf read"
-50.38s
-time client/proxmark3 -p /dev/ttyUSB0 -b 115200 -c "lf read"
-6.28s
-
-time client/proxmark3 -p /dev/ttyACM0 -c "mem save f foo_usb"
-1.48s
-time client/proxmark3 -p /dev/ttyUSB0 -b 115200 -c "mem save f foo_fpc"
-25.34s
-
-
-Sending multiple commands can still be slow because it waits regularly for incoming RX frames and the timings are quite conservative because of BT (see struct timeval timeout in uart_posix.c, now at 200ms). When one knows there is no response to wait before the next command, he can use the same trick as in the flasher:
-
-    // fast push mode
-    conn.block_after_ACK = true;
-    some loop {
-        if (sending_last_command)
-            // Disable fast mode
-            conn.block_after_ACK = false;
-        SendCommandOLD / SendCommandMix
-        if (!WaitForResponseTimeout(CMD_ACK, &resp, some_timeout)) {
-            ....
-            conn.block_after_ACK = false;
-            return PM3_ETIMEOUT;
-        }
-    }
-    return PM3_SUCCESS;
-
-Or if it's too complex to determine when we're sending the last command:
-
-    // fast push mode
-    conn.block_after_ACK = true;
-    some loop {
-        SendCommandOLD / SendCommandMIX
-        if (!WaitForResponseTimeout(CMD_ACK, &resp, some_timeout)) {
-            ....
-            conn.block_after_ACK = false;
-            return PM3_ETIMEOUT;
-        }
-    }
-    // Disable fast mode and send a dummy command to make it effective
-    conn.block_after_ACK = false;
-    SendCommandNG(CMD_PING, NULL, 0);
-    WaitForResponseTimeout(CMD_ACK, NULL, 1000);
-    return PM3_SUCCESS;
-
-
-Reference frames
-================
-
-For helping debug...
-
-OLD command and reply packets are 544 bytes.
-NG & MIX command packets are between 10 and 522 bytes.
-NG & MIX reply packets are between 12 and 524 bytes.
-
-On linux USB
-* sent packets can be 544
-* received packets are max 128, so 544 = 128+128+128+128+32
-On linux UART (FTDI)
-* sent packets are max 256, so 544 = 256+256+32
-* received packets are max 512, so 544 = 512+32
-
-"hw ping" (old version, mix reply)
-TestProxmark: SendCommandOLD(CMD_PING, 0, 0, 0, NULL, 0);
-->544=0901000000000000000000000000000000000000000000000000000000000000  -> OLD
-CMD_PING: reply_mix(CMD_ACK, reply_via_fpc, 0, 0, 0, 0);
-<-36=504d336218000000ff0000000000000000000000000000000000000000000000   <- MIX
-
-"hw ping" (intermediate version using MIX)
-CmdPing  SendCommandMIX(CMD_PING, 0, 0, 0, NULL, 0);
-->34=504d336118000901000000000000000000000000000000000000000000000000   -> MIX
-CMD_PING reply_mix(CMD_ACK, reply_via_fpc, 0, 0, 0, 0);
-<-36=504d336218000000ff0000000000000000000000000000000000000000000000   <- MIX
-
-"hw ping" (current version)
-CmdPing  SendCommandNG(CMD_PING, data, len);
-->10=504d3361008009016133                                               -> NG
-CMD_PING reply_ng(CMD_PING, PM3_SUCCESS, packet->data.asBytes, packet->length);
-<-12=504d33620080000009016233                                           <- NG
-
-"hw ping 512"
-CmdPing  SendCommandNG(CMD_PING, data, len);
-->522=504d336100820901000102030405060708090a0b0c0d0e0f1011121314151617  -> NG
-CMD_PING reply_ng(CMD_PING, PM3_SUCCESS, packet->data.asBytes, packet->length);
-<-128=504d3362008200000901000102030405060708090a0b0c0d0e0f101112131415  <- NG
-<-128=767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495
-<-128=f6f7f8f9fafbfcfdfeff000102030405060708090a0b0c0d0e0f101112131415
-<-128=767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495
-<-12=f6f7f8f9fafbfcfdfeff6233
-

From d7614684f859ae089c8ab6b5bb882d9ecf3c8362 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 2 Jun 2019 23:20:02 +0200
Subject: [PATCH 1900/1938] Make sure standalone modes can be launched when
 connected on USB without client

---
 armsrc/appmain.c   |  6 +++++-
 client/proxmark3.c |  4 ++++
 common/cmd.c       | 53 +++++++++++++++++++++++++---------------------
 common/cmd.h       | 31 ++++++++++++++++++++++++++-
 common/usart.c     |  9 +-------
 include/pm3_cmd.h  |  4 +++-
 6 files changed, 72 insertions(+), 35 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 556721385..c54fb6626 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -436,7 +436,7 @@ void SendCapabilities(void) {
     capabilities_t capabilities;
     capabilities.version = CAPABILITIES_VERSION;
     capabilities.via_fpc = reply_via_fpc;
-    
+    capabilities.via_usb = reply_via_usb;
     capabilities.baudrate = 0; // no real baudrate for USB-CDC
 #ifdef WITH_FPC_USART
     if (reply_via_fpc)
@@ -742,6 +742,10 @@ static void PacketReceived(PacketCommandNG *packet) {
     */
 
     switch (packet->cmd) {
+        case CMD_QUIT_SESSION:
+            reply_via_fpc = false;
+            reply_via_usb = false;
+            break;
 #ifdef WITH_LF
         case CMD_SET_LF_T55XX_CONFIG:
             setT55xxConfig(packet->oldarg[0], (t55xx_config *) packet->data.asBytes);
diff --git a/client/proxmark3.c b/client/proxmark3.c
index d45ddb3e8..a59f507c1 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -211,6 +211,10 @@ main_loop(char *script_cmds_file, char *script_cmd) {
         }
     } // end while
 
+    clearCommandBuffer();
+    SendCommandNG(CMD_QUIT_SESSION, NULL, 0);
+    msleep(100); // Make sure command is sent before killing client
+
     if (sf)
         fclose(sf);
 
diff --git a/common/cmd.c b/common/cmd.c
index b7abf16ee..6af0437d1 100644
--- a/common/cmd.c
+++ b/common/cmd.c
@@ -37,15 +37,7 @@ bool reply_with_crc_on_usb = false;
 bool reply_with_crc_on_fpc = true;
 // "Session" flag, to tell via which interface next msgs should be sent: USB or FPC USART
 bool reply_via_fpc = false;
-
-#ifdef WITH_FPC_USART_HOST
-extern void Dbprintf(const char *fmt, ...);
-#define Dbprintf_usb(...) {\
-        bool tmp = reply_via_fpc;\
-        reply_via_fpc = false;\
-        Dbprintf(__VA_ARGS__);\
-        reply_via_fpc = tmp;}
-#endif
+bool reply_via_usb = false;
 
 int reply_old(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len) {
     PacketResponseOLD txcmd;
@@ -67,20 +59,25 @@ int reply_old(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *d
         }
     }
 
-    int result = PM3_EUNDEF;
+    int resultfpc = PM3_EUNDEF;
+    int resultusb = PM3_EUNDEF;
     // Send frame and make sure all bytes are transmitted
 
+    if (reply_via_usb) {
+        resultusb = usb_write((uint8_t *)&txcmd, sizeof(PacketResponseOLD));
+    }
+
     if (reply_via_fpc) {
 #ifdef WITH_FPC_USART_HOST
-        result = usart_writebuffer_sync((uint8_t *)&txcmd, sizeof(PacketResponseOLD));
+        resultfpc = usart_writebuffer_sync((uint8_t *)&txcmd, sizeof(PacketResponseOLD));
 #else
         return PM3_EDEVNOTSUPP;
 #endif
-    } else {
-        result = usb_write((uint8_t *)&txcmd, sizeof(PacketResponseOLD));
     }
-
-    return result;
+    // we got two results, let's prioritize the faulty one and USB over FPC.
+    if (reply_via_usb && (resultusb != PM3_SUCCESS)) return resultusb;
+    if (reply_via_fpc && (resultfpc != PM3_SUCCESS)) return resultfpc;
+    return PM3_SUCCESS;
 }
 
 static int reply_ng_internal(uint16_t cmd, int16_t status, uint8_t *data, size_t len, bool ng) {
@@ -107,7 +104,8 @@ static int reply_ng_internal(uint16_t cmd, int16_t status, uint8_t *data, size_t
     }
 
     PacketResponseNGPostamble *tx_post = (PacketResponseNGPostamble *)((uint8_t *)&txBufferNG + sizeof(PacketResponseNGPreamble) + len);
-    if ((reply_via_fpc && reply_with_crc_on_fpc) || ((!reply_via_fpc) && reply_with_crc_on_usb)) {
+    // Note: if we send to both FPC & USB, we'll set CRC for both if any of them require CRC
+    if ((reply_via_fpc && reply_with_crc_on_fpc) || ((reply_via_usb) && reply_with_crc_on_usb)) {
         uint8_t first, second;
         compute_crc(CRC_14443_A, (uint8_t *)&txBufferNG, sizeof(PacketResponseNGPreamble) + len, &first, &second);
         tx_post->crc = (first << 8) + second;
@@ -116,19 +114,24 @@ static int reply_ng_internal(uint16_t cmd, int16_t status, uint8_t *data, size_t
     }
     txBufferNGLen = sizeof(PacketResponseNGPreamble) + len + sizeof(PacketResponseNGPostamble);
 
-    int result = PM3_EUNDEF;
+    int resultfpc = PM3_EUNDEF;
+    int resultusb = PM3_EUNDEF;
     // Send frame and make sure all bytes are transmitted
 
+    if (reply_via_usb) {
+        resultusb = usb_write((uint8_t *)&txBufferNG, txBufferNGLen);
+    }
     if (reply_via_fpc) {
 #ifdef WITH_FPC_USART_HOST
-        result = usart_writebuffer_sync((uint8_t *)&txBufferNG, txBufferNGLen);
+        resultfpc = usart_writebuffer_sync((uint8_t *)&txBufferNG, txBufferNGLen);
 #else
         return PM3_EDEVNOTSUPP;
 #endif
-    } else {
-        result = usb_write((uint8_t *)&txBufferNG, txBufferNGLen);
     }
-    return result;
+    // we got two results, let's prioritize the faulty one and USB over FPC.
+    if (reply_via_usb && (resultusb != PM3_SUCCESS)) return resultusb;
+    if (reply_via_fpc && (resultfpc != PM3_SUCCESS)) return resultfpc;
+    return PM3_SUCCESS;
 }
 
 int reply_ng(uint16_t cmd, int16_t status, uint8_t *data, size_t len) {
@@ -150,7 +153,7 @@ int reply_mix(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *d
     return reply_ng_internal(cmd, status, cmddata, len + sizeof(arg), false);
 }
 
-static int receive_ng_internal(PacketCommandNG *rx, uint32_t read_ng(uint8_t *data, size_t len), bool fpc) {
+static int receive_ng_internal(PacketCommandNG *rx, uint32_t read_ng(uint8_t *data, size_t len), bool usb, bool fpc) {
     PacketCommandNGRaw rx_raw;
     size_t bytes = read_ng((uint8_t *)&rx_raw.pre, sizeof(PacketCommandNGPreamble));
 
@@ -202,6 +205,7 @@ static int receive_ng_internal(PacketCommandNG *rx, uint32_t read_ng(uint8_t *da
             if ((first << 8) + second != rx->crc)
                 return PM3_EIO;
         }
+        reply_via_usb = usb;
         reply_via_fpc = fpc;
     } else {                               // Old style command
         PacketCommandOLD rx_old;
@@ -210,6 +214,7 @@ static int receive_ng_internal(PacketCommandNG *rx, uint32_t read_ng(uint8_t *da
         if (bytes != sizeof(PacketCommandOLD) - sizeof(PacketCommandNGPreamble))
             return PM3_EIO;
 
+        reply_via_usb = usb;
         reply_via_fpc = fpc;
         rx->ng = false;
         rx->magic = 0;
@@ -228,12 +233,12 @@ int receive_ng(PacketCommandNG *rx) {
 
     // Check if there is a packet available
     if (usb_poll_validate_length())
-        return receive_ng_internal(rx, usb_read_ng, false);
+        return receive_ng_internal(rx, usb_read_ng, true, false);
 
 #ifdef WITH_FPC_USART_HOST
     // Check if there is a FPC packet available
     if (usart_rxdata_available() > 0)
-        return receive_ng_internal(rx, usart_read_ng, true);
+        return receive_ng_internal(rx, usart_read_ng, false, true);
 #endif
     return PM3_ENODATA;
 }
diff --git a/common/cmd.h b/common/cmd.h
index 352da88d4..261a1e1a0 100644
--- a/common/cmd.h
+++ b/common/cmd.h
@@ -47,8 +47,37 @@ int receive_ng(PacketCommandNG *rx);
 // Flags to tell where to add CRC on sent replies
 extern bool reply_with_crc_on_usb;
 extern bool reply_with_crc_on_fpc;
-// "Session" flag, to tell via which interface next msgs should be sent: USB or FPC USART
+// "Session" flag, to tell via which interface next msgs should be sent: USB and/or FPC USART
 extern bool reply_via_fpc;
+extern bool reply_via_usb;
+
+extern void Dbprintf(const char *fmt, ...);
+#define Dbprintf_usb(...) {\
+        bool tmpfpc = reply_via_fpc;\
+        bool tmpusb = reply_via_usb;\
+        reply_via_fpc = false;\
+        reply_via_usb = true;\
+        Dbprintf(__VA_ARGS__);\
+        reply_via_fpc = tmpfpc;\
+        reply_via_usb = tmpusb;}
+
+#define Dbprintf_fpc(...) {\
+        bool tmpfpc = reply_via_fpc;\
+        bool tmpusb = reply_via_usb;\
+        reply_via_fpc = true;\
+        reply_via_usb = false;\
+        Dbprintf(__VA_ARGS__);\
+        reply_via_fpc = tmpfpc;\
+        reply_via_usb = tmpusb;}
+
+#define Dbprintf_all(...) {\
+        bool tmpfpc = reply_via_fpc;\
+        bool tmpusb = reply_via_usb;\
+        reply_via_fpc = true;\
+        reply_via_usb = true;\
+        Dbprintf(__VA_ARGS__);\
+        reply_via_fpc = tmpfpc;\
+        reply_via_usb = tmpusb;}
 
 #endif // _PROXMARK_CMD_H_
 
diff --git a/common/usart.c b/common/usart.c
index 734896e42..3b1587f40 100644
--- a/common/usart.c
+++ b/common/usart.c
@@ -8,6 +8,7 @@
 //-----------------------------------------------------------------------------
 // The main USART code, for serial communications over FPC connector
 //-----------------------------------------------------------------------------
+#include "cmd.h"
 #include "usart.h"
 #include "string.h"
 #include "../armsrc/ticks.h"  // startcountus
@@ -109,14 +110,6 @@ uint16_t usart_rxdata_available(void) {
         return sizeof(us_rxfifo) - us_rxfifo_low + us_rxfifo_high;
 }
 
-extern bool reply_via_fpc;
-extern void Dbprintf(const char *fmt, ...);
-#define Dbprintf_usb(...) {\
-        bool tmp = reply_via_fpc;\
-        reply_via_fpc = false;\
-        Dbprintf(__VA_ARGS__);\
-        reply_via_fpc = tmp;}
-
 uint32_t usart_read_ng(uint8_t *data, size_t len) {
     if (len == 0) return 0;
     uint32_t packetSize, nbBytesRcv = 0;
diff --git a/include/pm3_cmd.h b/include/pm3_cmd.h
index 4ff2add80..9f05f71f3 100644
--- a/include/pm3_cmd.h
+++ b/include/pm3_cmd.h
@@ -141,6 +141,7 @@ typedef struct {
     uint8_t version;
     uint32_t baudrate;
     bool via_fpc                       : 1;
+    bool via_usb                       : 1;
     // rdv4
     bool compiled_with_flash           : 1;
     bool compiled_with_smartcard       : 1;
@@ -165,7 +166,7 @@ typedef struct {
     bool hw_available_flash            : 1;
     bool hw_available_smartcard        : 1;
 } PACKED capabilities_t;
-#define CAPABILITIES_VERSION 1
+#define CAPABILITIES_VERSION 2
 extern capabilities_t pm3_capabilities;
 
 // For CMD_T55XX_WRITE_BLOCK
@@ -232,6 +233,7 @@ typedef struct {
 #define CMD_DOWNLOAD_EML_BIGBUF                                           0x0110
 #define CMD_DOWNLOADED_EML_BIGBUF                                         0x0111
 #define CMD_CAPABILITIES                                                  0x0112
+#define CMD_QUIT_SESSION                                                  0x0113
 
 // RDV40, Flash memory operations
 #define CMD_FLASHMEM_READ                                                 0x0120

From 3b12ba2e9319706e23f2b041262781146c20dc49 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Mon, 3 Jun 2019 00:01:08 +0200
Subject: [PATCH 1901/1938] replace usb_poll_validate_length() by
 data_available() that supports USART too

---
 armsrc/Standalone/hf_young.c     |  6 +++---
 armsrc/Standalone/lf_hidbrute.c  |  2 +-
 armsrc/Standalone/lf_icerun.c    |  2 +-
 armsrc/Standalone/lf_proxbrute.c |  2 +-
 armsrc/Standalone/lf_samyrun.c   |  2 +-
 armsrc/Standalone/readme.md      |  2 +-
 armsrc/felica.c                  |  2 +-
 armsrc/hfsnoop.c                 |  2 +-
 armsrc/hitag2.c                  |  8 ++++----
 armsrc/hitagS.c                  |  6 +++---
 armsrc/iclass.c                  |  8 ++++----
 armsrc/iso14443a.c               |  6 +++---
 armsrc/iso14443b.c               |  2 +-
 armsrc/iso15693.c                |  2 +-
 armsrc/legicrfsim.c              |  2 +-
 armsrc/lfops.c                   | 14 +++++++-------
 armsrc/lfsampling.c              |  8 ++++----
 armsrc/mifarecmd.c               |  4 ++--
 armsrc/mifaresim.c               |  2 +-
 armsrc/util.c                    |  8 ++++++++
 armsrc/util.h                    |  1 +
 21 files changed, 50 insertions(+), 41 deletions(-)

diff --git a/armsrc/Standalone/hf_young.c b/armsrc/Standalone/hf_young.c
index e2afec266..59d1750b9 100644
--- a/armsrc/Standalone/hf_young.c
+++ b/armsrc/Standalone/hf_young.c
@@ -39,7 +39,7 @@ void RunMod() {
     for (;;) {
         WDT_HIT();
         // exit from Standalone Mode,   send a usbcommand.
-        if (usb_poll_validate_length()) return;
+        if (data_available()) return;
 
         SpinDelay(300);
 
@@ -57,7 +57,7 @@ void RunMod() {
 
             for (;;) {
                 // exit from Standalone Mode,   send a usbcommand.
-                if (usb_poll_validate_length()) return;
+                if (data_available()) return;
 
                 if (BUTTON_PRESS()) {
                     if (cardRead[selected]) {
@@ -204,7 +204,7 @@ void RunMod() {
             DbpString("Playing");
             for (; ;) {
                 // exit from Standalone Mode,   send a usbcommand.
-                if (usb_poll_validate_length()) return;
+                if (data_available()) return;
 
                 int button_action = BUTTON_HELD(1000);
                 if (button_action == 0) {  // No button action, proceed with sim
diff --git a/armsrc/Standalone/lf_hidbrute.c b/armsrc/Standalone/lf_hidbrute.c
index 3a7866821..06b0049ad 100644
--- a/armsrc/Standalone/lf_hidbrute.c
+++ b/armsrc/Standalone/lf_hidbrute.c
@@ -48,7 +48,7 @@ void RunMod() {
         WDT_HIT();
 
         // exit from SamyRun,   send a usbcommand.
-        if (usb_poll_validate_length()) break;
+        if (data_available()) break;
 
         // Was our button held down or pressed?
         int button_pressed = BUTTON_HELD(1000);
diff --git a/armsrc/Standalone/lf_icerun.c b/armsrc/Standalone/lf_icerun.c
index 5ce5a7955..e62c79329 100644
--- a/armsrc/Standalone/lf_icerun.c
+++ b/armsrc/Standalone/lf_icerun.c
@@ -24,7 +24,7 @@ void RunMod() {
         WDT_HIT();
 
         // exit from IceRun,   send a usbcommand.
-        if (usb_poll_validate_length()) break;
+        if (data_available()) break;
 
         // Was our button held down or pressed?
         int button_pressed = BUTTON_HELD(1000);
diff --git a/armsrc/Standalone/lf_proxbrute.c b/armsrc/Standalone/lf_proxbrute.c
index 3336e9ee9..d10a1fbfe 100644
--- a/armsrc/Standalone/lf_proxbrute.c
+++ b/armsrc/Standalone/lf_proxbrute.c
@@ -33,7 +33,7 @@ void RunMod() {
         WDT_HIT();
 
         // exit from SamyRun,   send a usbcommand.
-        if (usb_poll_validate_length()) break;
+        if (data_available()) break;
 
         // Was our button held down or pressed?
         int button_pressed = BUTTON_HELD(1000);
diff --git a/armsrc/Standalone/lf_samyrun.c b/armsrc/Standalone/lf_samyrun.c
index e1ba185d1..03c2ddd12 100644
--- a/armsrc/Standalone/lf_samyrun.c
+++ b/armsrc/Standalone/lf_samyrun.c
@@ -32,7 +32,7 @@ void RunMod() {
         WDT_HIT();
 
         // exit from SamyRun,   send a usbcommand.
-        if (usb_poll_validate_length()) break;
+        if (data_available()) break;
 
         // Was our button held down or pressed?
         int button_pressed = BUTTON_HELD(1000);
diff --git a/armsrc/Standalone/readme.md b/armsrc/Standalone/readme.md
index 491d4ab4d..529bc7f70 100644
--- a/armsrc/Standalone/readme.md
+++ b/armsrc/Standalone/readme.md
@@ -34,7 +34,7 @@ void RunMod(void) {
         WDT_HIT();
 
         // exit from standalone mode, just send a usbcommand
-        if (usb_poll_validate_length()) break;
+        if (data_available()) break;
 
         // do your standalone stuff..
     }
diff --git a/armsrc/felica.c b/armsrc/felica.c
index 6efff73e0..58d976774 100644
--- a/armsrc/felica.c
+++ b/armsrc/felica.c
@@ -731,7 +731,7 @@ void felica_dump_lite_s() {
     uint16_t cnt = 0, cntfails = 0;
     uint8_t *dest = BigBuf_get_addr();
 
-    while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
+    while (!BUTTON_PRESS() && !data_available()) {
 
         WDT_HIT();
 
diff --git a/armsrc/hfsnoop.c b/armsrc/hfsnoop.c
index 11ceff3d9..bb5d8699c 100644
--- a/armsrc/hfsnoop.c
+++ b/armsrc/hfsnoop.c
@@ -46,7 +46,7 @@ void HfSniff(int samplesToSkip, int triggersToSkip) {
     SpinDelay(100);
 
     uint16_t r = 0;
-    while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
+    while (!BUTTON_PRESS() && !data_available()) {
         WDT_HIT();
 
         if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
diff --git a/armsrc/hitag2.c b/armsrc/hitag2.c
index e291ece36..4f3a1856d 100644
--- a/armsrc/hitag2.c
+++ b/armsrc/hitag2.c
@@ -751,7 +751,7 @@ void SniffHitag(void) {
     bSkip = true;
     tag_sof = 4;
 
-    while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
+    while (!BUTTON_PRESS() && !data_available()) {
         // Watchdog hit
         WDT_HIT();
 
@@ -978,7 +978,7 @@ void SimulateHitagTag(bool tag_mem_supplied, uint8_t *data) {
     // synchronized startup procedure
     while (AT91C_BASE_TC0->TC_CV > 0) {}; // wait until TC0 returned to zero
 
-    while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
+    while (!BUTTON_PRESS() && !data_available()) {
         // Watchdog hit
         WDT_HIT();
 
@@ -1203,7 +1203,7 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
     }
     uint8_t attempt_count = 0;
 
-    while (!bStop && !BUTTON_PRESS() && !usb_poll_validate_length()) {
+    while (!bStop && !BUTTON_PRESS() && !data_available()) {
 
         WDT_HIT();
 
@@ -1464,7 +1464,7 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
         return;
     }
 
-    while (!bStop && !BUTTON_PRESS() && !usb_poll_validate_length()) {
+    while (!bStop && !BUTTON_PRESS() && !data_available()) {
 
         WDT_HIT();
 
diff --git a/armsrc/hitagS.c b/armsrc/hitagS.c
index fc38d10b3..83263bbfd 100644
--- a/armsrc/hitagS.c
+++ b/armsrc/hitagS.c
@@ -1022,7 +1022,7 @@ void SimulateHitagSTag(bool tag_mem_supplied, uint8_t *data) {
     // synchronized startup procedure
     while (AT91C_BASE_TC0->TC_CV > 0); // wait until TC0 returned to zero
 
-    while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
+    while (!BUTTON_PRESS() && !data_available()) {
 
         WDT_HIT();
 
@@ -1228,7 +1228,7 @@ void ReadHitagS(hitag_function htf, hitag_data *htd) {
     // Reset the received frame, frame count and timing info
     t_wait = 200;
 
-    while (!bStop && !BUTTON_PRESS() && !usb_poll_validate_length())  {
+    while (!bStop && !BUTTON_PRESS() && !data_available())  {
 
         WDT_HIT();
 
@@ -1558,7 +1558,7 @@ void WritePageHitagS(hitag_function htf, hitag_data *htd, int page) {
     reset_sof = 1;
     t_wait = 200;
 
-    while (!bStop && !BUTTON_PRESS() && !usb_poll_validate_length()) {
+    while (!bStop && !BUTTON_PRESS() && !data_available()) {
 
         WDT_HIT();
 
diff --git a/armsrc/iclass.c b/armsrc/iclass.c
index 03b4b408f..c12c9dc1f 100644
--- a/armsrc/iclass.c
+++ b/armsrc/iclass.c
@@ -1993,7 +1993,7 @@ void ReaderIClass(uint8_t arg0) {
 
     setupIclassReader();
 
-    bool userCancelled = BUTTON_PRESS() || usb_poll_validate_length();
+    bool userCancelled = BUTTON_PRESS() || data_available();
     while (!userCancelled) {
 
         WDT_HIT();
@@ -2092,7 +2092,7 @@ void ReaderIClass(uint8_t arg0) {
             }
         }
         LED_B_OFF();
-        userCancelled = BUTTON_PRESS() || usb_poll_validate_length();
+        userCancelled = BUTTON_PRESS() || data_available();
     }
 
     if (userCancelled) {
@@ -2290,7 +2290,7 @@ void iClass_Authentication_fast(uint64_t arg0, uint64_t arg1, uint8_t *datain) {
     uint8_t startup_limit = 10;
     while (read_status != 2) {
 
-        if (BUTTON_PRESS() && !usb_poll_validate_length()) goto out;
+        if (BUTTON_PRESS() && !data_available()) goto out;
 
         read_status = handshakeIclassTag_ext(card_data, use_credit_key);
         if (startup_limit-- == 0) {
@@ -2305,7 +2305,7 @@ void iClass_Authentication_fast(uint64_t arg0, uint64_t arg1, uint8_t *datain) {
     for (i = 0; i < keyCount; i++) {
 
         // Allow button press / usb cmd to interrupt device
-        if (BUTTON_PRESS() && !usb_poll_validate_length()) break;
+        if (BUTTON_PRESS() && !data_available()) break;
 
         WDT_HIT();
         LED_B_ON();
diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 763eada77..8d5bceccc 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -762,7 +762,7 @@ static bool GetIso14443aCommandFromReader(uint8_t *received, uint8_t *par, int *
 
     for (;;) {
         if ( check == 1000 ) {
-            if ( BUTTON_PRESS() || usb_poll_validate_length() )
+            if ( BUTTON_PRESS() || data_available() )
                 return false;
             check = 0;
         }
@@ -1722,7 +1722,7 @@ int EmGetCmd(uint8_t *received, uint16_t *len, uint8_t *par) {
         WDT_HIT();
 
         if ( check == 1000 ) {
-          if (BUTTON_PRESS() || usb_poll_validate_length())
+          if (BUTTON_PRESS() || data_available())
               return 1;
           check = 0;
         }
@@ -2923,7 +2923,7 @@ void DetectNACKbug() {
         WDT_HIT();
 
         // Test if the action was cancelled
-        if (BUTTON_PRESS() || usb_poll_validate_length()) {
+        if (BUTTON_PRESS() || data_available()) {
             status = PM3_EOPABORTED;
             break;
         }
diff --git a/armsrc/iso14443b.c b/armsrc/iso14443b.c
index ee90b7729..ffdfc41dd 100644
--- a/armsrc/iso14443b.c
+++ b/armsrc/iso14443b.c
@@ -619,7 +619,7 @@ void SimulateIso14443bTag(uint32_t pupi) {
     memcpy(encodedOK, ToSend, ToSendMax);
 
     // Simulation loop
-    while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
+    while (!BUTTON_PRESS() && !data_available()) {
         WDT_HIT();
 
         // find reader field
diff --git a/armsrc/iso15693.c b/armsrc/iso15693.c
index f1a06a7bb..c7d15a824 100644
--- a/armsrc/iso15693.c
+++ b/armsrc/iso15693.c
@@ -891,7 +891,7 @@ void SimTagIso15693(uint32_t parameter, uint8_t *uid) {
     uint8_t cmd[CMD_INV_RESP] = {0};
     BuildInventoryResponse(cmd, uid);
 
-    while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
+    while (!BUTTON_PRESS() && !data_available()) {
         WDT_HIT();
 
         // Listen to reader
diff --git a/armsrc/legicrfsim.c b/armsrc/legicrfsim.c
index c32558921..0500e3e32 100644
--- a/armsrc/legicrfsim.c
+++ b/armsrc/legicrfsim.c
@@ -459,7 +459,7 @@ void LegicRfSimulate(uint8_t cardtype) {
 
     LED_A_ON();
     DbpString("Starting Legic emulator, press button to end");
-    while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
+    while (!BUTTON_PRESS() && !data_available()) {
         WDT_HIT();
 
         // wait for carrier, restart after timeout
diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index a45c20d16..870b56303 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -607,7 +607,7 @@ void SimulateTagLowFrequencyEx(int period, int gap, bool ledcontrol, int numcycl
         while (!(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_CLK)) {
             WDT_HIT();
             if ( check == 1000) {
-                if (usb_poll_validate_length() || BUTTON_PRESS())
+                if (data_available() || BUTTON_PRESS())
                     goto OUT;
                 check = 0;
             }
@@ -627,7 +627,7 @@ void SimulateTagLowFrequencyEx(int period, int gap, bool ledcontrol, int numcycl
         while (AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_CLK) {
             WDT_HIT();
             if (check == 1000) {
-                if (usb_poll_validate_length() || BUTTON_PRESS())
+                if (data_available() || BUTTON_PRESS())
                     goto OUT;
                 check = 0;
             }
@@ -1011,7 +1011,7 @@ void CmdHIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol)
     //clear read buffer
     BigBuf_Clear_keep_EM();
 
-    while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
+    while (!BUTTON_PRESS() && !data_available()) {
 
         WDT_HIT();
         if (ledcontrol) LED_A_ON();
@@ -1105,7 +1105,7 @@ void CmdAWIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol)
 
     LFSetupFPGAForADC(95, true);
 
-    while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
+    while (!BUTTON_PRESS() && !data_available()) {
 
         WDT_HIT();
         if (ledcontrol) LED_A_ON();
@@ -1197,7 +1197,7 @@ void CmdEM410xdemod(int findone, uint32_t *high, uint64_t *low, int ledcontrol)
 
     LFSetupFPGAForADC(95, true);
 
-    while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
+    while (!BUTTON_PRESS() && !data_available()) {
 
         WDT_HIT();
         if (ledcontrol) LED_A_ON();
@@ -1263,7 +1263,7 @@ void CmdIOdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol) {
     // Configure to go in 125Khz listen mode
     LFSetupFPGAForADC(95, true);
 
-    while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
+    while (!BUTTON_PRESS() && !data_available()) {
         WDT_HIT();
         if (ledcontrol) LED_A_ON();
 
@@ -1603,7 +1603,7 @@ void T55xx_ChkPwds() {
     uint32_t pwd = 0, curr = 0, prev = 0;
     for (uint16_t i = 0; i < pwdCount; ++i) {
 
-        if (BUTTON_PRESS() && !usb_poll_validate_length()) {
+        if (BUTTON_PRESS() && !data_available()) {
             goto OUT;
         }
 
diff --git a/armsrc/lfsampling.c b/armsrc/lfsampling.c
index 53215581e..aca064ecc 100644
--- a/armsrc/lfsampling.c
+++ b/armsrc/lfsampling.c
@@ -137,7 +137,7 @@ uint32_t DoAcquisition(uint8_t decimation, uint32_t bits_per_sample, bool averag
     uint32_t sample_total_saved = 0;
     uint32_t cancel_counter = 0;
 
-    while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
+    while (!BUTTON_PRESS() && !data_available()) {
         WDT_HIT();
 
         if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
@@ -283,7 +283,7 @@ void doT55x7Acquisition(size_t sample_size) {
     bool highFound = false;
     bool lowFound = false;
 
-    while (!BUTTON_PRESS() && !usb_poll_validate_length() && skipCnt < 1000 && (i < bufsize)) {
+    while (!BUTTON_PRESS() && !data_available() && skipCnt < 1000 && (i < bufsize)) {
         WDT_HIT();
 
 
@@ -348,7 +348,7 @@ void doCotagAcquisition(size_t sample_size) {
     uint16_t i = 0;
     uint16_t noise_counter = 0;
 
-    while (!BUTTON_PRESS() && !usb_poll_validate_length() && (i < bufsize) && (noise_counter < (COTAG_T1 << 1))) {
+    while (!BUTTON_PRESS() && !data_available() && (i < bufsize) && (noise_counter < (COTAG_T1 << 1))) {
         WDT_HIT();
 
         if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
@@ -398,7 +398,7 @@ uint32_t doCotagAcquisitionManchester() {
     uint8_t curr = 0, prev = 0;
     uint16_t noise_counter = 0;
 
-    while (!BUTTON_PRESS() && !usb_poll_validate_length() && (sample_counter < bufsize)  && (noise_counter < (COTAG_T1 << 1))) {
+    while (!BUTTON_PRESS() && !data_available() && (sample_counter < bufsize)  && (noise_counter < (COTAG_T1 << 1))) {
         WDT_HIT();
 
         if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index 7b5a6518a..f64723355 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -1328,7 +1328,7 @@ void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *da
                 //if ( i % 100 == 0) Dbprintf("ChkKeys_fast: sector %d | checking %d | %d found | s_point %d", s, i, foundkeys, s_point);
 
                 // Allow button press / usb cmd to interrupt device
-                if (BUTTON_PRESS() && !usb_poll_validate_length()) {
+                if (BUTTON_PRESS() && !data_available()) {
                     goto OUT;
                 }
 
@@ -1420,7 +1420,7 @@ void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *da
         for (uint16_t i = 0; i < keyCount; i++) {
 
             // Allow button press / usb cmd to interrupt device
-            if (BUTTON_PRESS() && !usb_poll_validate_length()) break;
+            if (BUTTON_PRESS() && !data_available()) break;
 
             // found all keys?
             if (foundkeys == allkeys)
diff --git a/armsrc/mifaresim.c b/armsrc/mifaresim.c
index c503c2926..8ad397ac3 100644
--- a/armsrc/mifaresim.c
+++ b/armsrc/mifaresim.c
@@ -502,7 +502,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t *datain) {
     bool finished = false;
     bool button_pushed = BUTTON_PRESS();
 
-    while (!button_pushed && !finished && !usb_poll_validate_length()) {
+    while (!button_pushed && !finished && !data_available()) {
         WDT_HIT();
 
         // find reader field
diff --git a/armsrc/util.c b/armsrc/util.c
index b50715541..cad2d2ac5 100644
--- a/armsrc/util.c
+++ b/armsrc/util.c
@@ -300,3 +300,11 @@ void FormatVersionInformation(char *dst, int len, const char *prefix, void *vers
     strncat(dst, v->buildtime, len - strlen(dst) - 1);
     strncat(dst, "\n", len - strlen(dst) - 1);
 }
+
+bool data_available(void) {
+#ifdef WITH_FPC_USART_HOST
+    return usb_poll_validate_length() || (usart_rxdata_available() > 0);
+#else
+    return usb_poll_validate_length();
+#endif
+}
diff --git a/armsrc/util.h b/armsrc/util.h
index 86e8cfb7f..8649f0431 100644
--- a/armsrc/util.h
+++ b/armsrc/util.h
@@ -92,5 +92,6 @@ void SpinUp(uint32_t speed);
 int BUTTON_CLICKED(int ms);
 int BUTTON_HELD(int ms);
 void FormatVersionInformation(char *dst, int len, const char *prefix, void *version_information);
+bool data_available(void);
 
 #endif

From 4761ea13f73e31318b2796fff3ddb8b30c118f56 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 6 Jun 2019 10:05:09 +0200
Subject: [PATCH 1902/1938] MF_DBGLEVEL => DBGLEVEL (pm3 side)

---
 armsrc/Standalone/hf_bog.c      |  16 +--
 armsrc/Standalone/hf_colin.c    |  14 +--
 armsrc/Standalone/hf_mattyrun.c |   2 +-
 armsrc/appmain.c                |   5 +-
 armsrc/apps.h                   |   1 -
 armsrc/felica.c                 |   6 +-
 armsrc/flashmem.c               |  16 +--
 armsrc/fpgaloader.c             |   4 +-
 armsrc/iclass.c                 |  26 ++---
 armsrc/iso14443a.c              |  48 ++++----
 armsrc/iso14443b.c              |  18 +--
 armsrc/iso14443b.h              |   2 +-
 armsrc/iso15693.c               |  18 +--
 armsrc/lfops.c                  |   4 +-
 armsrc/mifarecmd.c              | 197 +++++++++++++++-----------------
 armsrc/mifaredesfire.c          |  24 ++--
 armsrc/mifaresim.c              | 168 +++++++++++++--------------
 armsrc/mifaresniff.c            |   2 +-
 armsrc/mifareutil.c             |  68 +++++------
 common/i2c.c                    |  16 +--
 include/common.h                |  12 +-
 21 files changed, 329 insertions(+), 338 deletions(-)

diff --git a/armsrc/Standalone/hf_bog.c b/armsrc/Standalone/hf_bog.c
index 151282f3a..0ee0a9066 100644
--- a/armsrc/Standalone/hf_bog.c
+++ b/armsrc/Standalone/hf_bog.c
@@ -52,7 +52,7 @@ void EraseMemory() {
     Flash_WriteEnable();
     Flash_Erase4k(0, 0);
 
-    if (MF_DBGLEVEL > 1) Dbprintf("[!] Erased flash!");
+    if (DBGLEVEL > 1) Dbprintf("[!] Erased flash!");
     FlashStop();
     SpinDelay(100);
 }
@@ -97,7 +97,7 @@ void RAMFUNC SniffAndStore(uint8_t param) {
 
     // Setup and start DMA.
     if (!FpgaSetupSscDma((uint8_t *) dmaBuf, DMA_BUFFER_SIZE)) {
-        if (MF_DBGLEVEL > 1) Dbprintf("FpgaSetupSscDma failed. Exiting");
+        if (DBGLEVEL > 1) Dbprintf("FpgaSetupSscDma failed. Exiting");
         return;
     }
 
@@ -163,7 +163,7 @@ void RAMFUNC SniffAndStore(uint8_t param) {
 
                     if (triggered) {
                         if ((receivedCmd) && ((receivedCmd[0] == MIFARE_ULEV1_AUTH) || (receivedCmd[0] == MIFARE_ULC_AUTH_1))) {
-                            if (MF_DBGLEVEL > 1) Dbprintf("PWD-AUTH KEY: 0x%02x%02x%02x%02x", receivedCmd[1], receivedCmd[2], receivedCmd[3], receivedCmd[4]);
+                            if (DBGLEVEL > 1) Dbprintf("PWD-AUTH KEY: 0x%02x%02x%02x%02x", receivedCmd[1], receivedCmd[2], receivedCmd[3], receivedCmd[4]);
 
                             // temporarily save the captured pwd in our array
                             memcpy(&capturedPwds[4 * auth_attempts], receivedCmd + 1, 4);
@@ -230,26 +230,26 @@ void RAMFUNC SniffAndStore(uint8_t param) {
 
     // Write stuff to flash
     if (auth_attempts > 0) {
-        if (MF_DBGLEVEL > 1) Dbprintf("[!] Authentication attempts = %u", auth_attempts);
+        if (DBGLEVEL > 1) Dbprintf("[!] Authentication attempts = %u", auth_attempts);
 
         // Setting the SPI Baudrate to 48MHz to avoid the bit-flip issue (https://github.com/RfidResearchGroup/proxmark3/issues/34)
         FlashmemSetSpiBaudrate(48000000);
 
         // Find the offset in flash mem to continue writing the auth attempts
         uint8_t memoffset = FindOffsetInFlash();
-        if (MF_DBGLEVEL > 1) Dbprintf("[!] Memory offset = %u", memoffset);
+        if (DBGLEVEL > 1) Dbprintf("[!] Memory offset = %u", memoffset);
 
         if ((memoffset + 4 * auth_attempts) > 0xFF) {
             // We opt to keep the new data only
             memoffset = 0;
-            if (MF_DBGLEVEL > 1) Dbprintf("[!] Size of total data > 256 bytes. Discarding the old data.");
+            if (DBGLEVEL > 1) Dbprintf("[!] Size of total data > 256 bytes. Discarding the old data.");
         }
 
         // Get previous data from flash mem
         uint8_t *previousdata = BigBuf_malloc(memoffset);
         if (memoffset > 0) {
             uint16_t readlen = Flash_ReadData(0, previousdata, memoffset);
-            if (MF_DBGLEVEL > 1) Dbprintf("[!] Read %u bytes from flash mem", readlen);
+            if (DBGLEVEL > 1) Dbprintf("[!] Read %u bytes from flash mem", readlen);
         }
 
         // create new bigbuf to hold all data
@@ -267,7 +267,7 @@ void RAMFUNC SniffAndStore(uint8_t param) {
 
         // Write total data to flash mem
         uint16_t writelen = Flash_WriteData(0, total_data, memoffset + 4 * auth_attempts);
-        if (MF_DBGLEVEL > 1) Dbprintf("[!] Wrote %u bytes into flash mem", writelen);
+        if (DBGLEVEL > 1) Dbprintf("[!] Wrote %u bytes into flash mem", writelen);
 
         // If pwd saved successfully, blink led A three times
         if (writelen > 0) {
diff --git a/armsrc/Standalone/hf_colin.c b/armsrc/Standalone/hf_colin.c
index 22467f2d3..b16f1c610 100644
--- a/armsrc/Standalone/hf_colin.c
+++ b/armsrc/Standalone/hf_colin.c
@@ -827,7 +827,7 @@ readysim:
  * - tracing is falsed
  */
 int e_MifareECardLoad(uint32_t numofsectors, uint8_t keytype) {
-    MF_DBGLEVEL = MF_DBG_NONE;
+    DBGLEVEL = DBG_NONE;
 
     uint8_t numSectors = numofsectors;
     uint8_t keyType = keytype;
@@ -848,7 +848,7 @@ int e_MifareECardLoad(uint32_t numofsectors, uint8_t keytype) {
 
     if (!iso14443a_select_card(cjuid, &p_card, &cjcuid, true, 0, true)) {
         isOK = false;
-        if (MF_DBGLEVEL >= 1)
+        if (DBGLEVEL >= 1)
             DbprintfEx(FLAG_RAWPRINT, "Can't select card");
     }
 
@@ -857,14 +857,14 @@ int e_MifareECardLoad(uint32_t numofsectors, uint8_t keytype) {
         if (s == 0) {
             if (isOK && mifare_classic_auth(pcs, cjcuid, FirstBlockOfSector(s), keyType, ui64Key, AUTH_FIRST)) {
 
-                if (MF_DBGLEVEL >= 1)
+                if (DBGLEVEL >= 1)
                     DbprintfEx(FLAG_NEWLINE, "Sector[%2d]. Auth error", s);
                 break;
             }
         } else {
             if (isOK && mifare_classic_auth(pcs, cjcuid, FirstBlockOfSector(s), keyType, ui64Key, AUTH_NESTED)) {
                 isOK = false;
-                if (MF_DBGLEVEL >= 1)
+                if (DBGLEVEL >= 1)
                     DbprintfEx(FLAG_NEWLINE, "Sector[%2d]. Auth nested error", s);
                 break;
             }
@@ -873,7 +873,7 @@ int e_MifareECardLoad(uint32_t numofsectors, uint8_t keytype) {
         for (uint8_t blockNo = 0; isOK && blockNo < NumBlocksPerSector(s); blockNo++) {
             if (isOK && mifare_classic_readblock(pcs, cjcuid, FirstBlockOfSector(s) + blockNo, dataoutbuf)) {
                 isOK = false;
-                if (MF_DBGLEVEL >= 1)
+                if (DBGLEVEL >= 1)
                     DbprintfEx(FLAG_NEWLINE, "Error reading sector %2d block %2d", s, blockNo);
                 break;
             };
@@ -891,7 +891,7 @@ int e_MifareECardLoad(uint32_t numofsectors, uint8_t keytype) {
     }
 
     if (mifare_classic_halt(pcs, cjcuid)) {
-        if (MF_DBGLEVEL >= 1)
+        if (DBGLEVEL >= 1)
             DbprintfEx(FLAG_NEWLINE, "Halt error");
     };
 
@@ -905,7 +905,7 @@ int e_MifareECardLoad(uint32_t numofsectors, uint8_t keytype) {
 /* the chk function is a piwi’ed(tm) check that will try all keys for
 a particular sector. also no tracing no dbg */
 int cjat91_saMifareChkKeys(uint8_t blockNo, uint8_t keyType, bool clearTrace, uint8_t keyCount, uint8_t *datain, uint64_t *key) {
-    MF_DBGLEVEL = MF_DBG_NONE;
+    DBGLEVEL = DBG_NONE;
     iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
     set_tracing(false);
 
diff --git a/armsrc/Standalone/hf_mattyrun.c b/armsrc/Standalone/hf_mattyrun.c
index b34af0571..e7be77bd7 100644
--- a/armsrc/Standalone/hf_mattyrun.c
+++ b/armsrc/Standalone/hf_mattyrun.c
@@ -156,7 +156,7 @@ static int saMifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_
 /* the chk function is a piwi’ed(tm) check that will try all keys for
 a particular sector. also no tracing no dbg */
 static int saMifareChkKeys(uint8_t blockNo, uint8_t keyType, bool clearTrace, uint8_t keyCount, uint8_t *datain, uint64_t *key) {
-    MF_DBGLEVEL = MF_DBG_NONE;
+    DBGLEVEL = DBG_NONE;
     iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
     set_tracing(false);
 
diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index c54fb6626..916801954 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -418,7 +418,7 @@ void SendStatus(void) {
 #endif
     printConnSpeed();
     DbpString(_BLUE_("Various"));
-    Dbprintf("  MF_DBGLEVEL.............%d", MF_DBGLEVEL);
+    Dbprintf("  DBGLEVEL................%d", DBGLEVEL);
     Dbprintf("  ToSendMax...............%d", ToSendMax);
     Dbprintf("  ToSendBit...............%d", ToSendBit);
     Dbprintf("  ToSend BUFFERSIZE.......%d", TOSEND_BUFFER_SIZE);
@@ -1116,7 +1116,8 @@ static void PacketReceived(PacketCommandNG *packet) {
         }
         // emulator
         case CMD_MIFARE_SET_DBGMODE:
-            MifareSetDbgLvl(packet->data.asBytes[0]);
+            DBGLEVEL = packet->data.asBytes[0];
+            Dbprintf("Debug level: %d", DBGLEVEL);
             reply_ng(CMD_MIFARE_SET_DBGMODE, PM3_SUCCESS, NULL, 0);   
             break;
         case CMD_MIFARE_EML_MEMCLR:
diff --git a/armsrc/apps.h b/armsrc/apps.h
index 561a08b0d..59832d6b4 100644
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -160,7 +160,6 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
 void MifareAcquireNonces(uint32_t arg0, uint32_t flags);
 void MifareChkKeys(uint8_t *datain);
 void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain);
-void MifareSetDbgLvl(uint16_t arg0);
 
 void MifareEMemClr(void);
 void MifareEMemSet(uint8_t blockno, uint8_t blockcnt, uint8_t blockwidth, uint8_t *datain);
diff --git a/armsrc/felica.c b/armsrc/felica.c
index 58d976774..48b6f4464 100644
--- a/armsrc/felica.c
+++ b/armsrc/felica.c
@@ -176,7 +176,7 @@ static void Process18092Byte(uint8_t bt) {
                 FelicaFrame.crc_ok = check_crc(CRC_FELICA, FelicaFrame.framebytes + 2, FelicaFrame.len - 2);
                 FelicaFrame.state = STATE_FULL;
                 FelicaFrame.rem_len = 0;
-                if (MF_DBGLEVEL > 3) Dbprintf("[+] got 2 crc bytes [%s]", (FelicaFrame.crc_ok) ? "OK" : "No");
+                if (DBGLEVEL > 3) Dbprintf("[+] got 2 crc bytes [%s]", (FelicaFrame.crc_ok) ? "OK" : "No");
             }
             break;
         }
@@ -477,7 +477,7 @@ static void iso18092_setup(uint8_t fpga_minor_mode) {
 // d.asBytes command bytes to send
 void felica_sendraw(PacketCommandNG *c) {
 
-    if (MF_DBGLEVEL > 3) Dbprintf("FeliCa_sendraw Enter");
+    if (DBGLEVEL > 3) Dbprintf("FeliCa_sendraw Enter");
 
     felica_command_t param = c->oldarg[0];
     size_t len = c->oldarg[1] & 0xffff;
@@ -537,7 +537,7 @@ OUT:
     //Resetting Frame mode (First set in fpgaloader.c)
     AT91C_BASE_SSC->SSC_RFMR = SSC_FRAME_MODE_BITS_IN_WORD(8) | AT91C_SSC_MSBF | SSC_FRAME_MODE_WORDS_PER_TRANSFER(0);
 
-    if (MF_DBGLEVEL > 3) Dbprintf("FeliCa_sendraw Exit");
+    if (DBGLEVEL > 3) Dbprintf("FeliCa_sendraw Exit");
 }
 
 void felica_sniff(uint32_t samplesToSkip, uint32_t triggersToSkip) {
diff --git a/armsrc/flashmem.c b/armsrc/flashmem.c
index 5bdbfff90..4584d41b2 100644
--- a/armsrc/flashmem.c
+++ b/armsrc/flashmem.c
@@ -149,7 +149,7 @@ void FlashStop(void) {
     // SPI disable
     AT91C_BASE_SPI->SPI_CR = AT91C_SPI_SPIDIS;
 
-    if (MF_DBGLEVEL > 3) Dbprintf("FlashStop");
+    if (DBGLEVEL > 3) Dbprintf("FlashStop");
 
     StopTicks();
 }
@@ -189,7 +189,7 @@ bool Flash_CheckBusy(uint32_t timeout) {
     StartCountUS();
     uint32_t _time = GetCountUS();
 
-    if (MF_DBGLEVEL > 3) Dbprintf("Checkbusy in...");
+    if (DBGLEVEL > 3) Dbprintf("Checkbusy in...");
 
     do {
         if (!(Flash_ReadStat1() & BUSY)) {
@@ -218,7 +218,7 @@ uint8_t Flash_ReadID(void) {
     uint8_t man_id = FlashSendByte(0xFF);
     uint8_t dev_id = FlashSendLastByte(0xFF);
 
-    if (MF_DBGLEVEL > 3) Dbprintf("Flash ReadID  |  Man ID %02x | Device ID %02x", man_id, dev_id);
+    if (DBGLEVEL > 3) Dbprintf("Flash ReadID  |  Man ID %02x | Device ID %02x", man_id, dev_id);
 
     if ((man_id == WINBOND_MANID) && (dev_id == WINBOND_DEVID))
         return dev_id;
@@ -325,7 +325,7 @@ uint16_t Flash_WriteData(uint32_t address, uint8_t *in, uint16_t len) {
     }
 
     if (!FlashInit()) {
-        if (MF_DBGLEVEL > 3) Dbprintf("Flash_WriteData init fail");
+        if (DBGLEVEL > 3) Dbprintf("Flash_WriteData init fail");
         return 0;
     }
 
@@ -415,7 +415,7 @@ out:
 
 bool Flash_WipeMemoryPage(uint8_t page) {
     if (!FlashInit()) {
-        if (MF_DBGLEVEL > 3) Dbprintf("Flash_WriteData init fail");
+        if (DBGLEVEL > 3) Dbprintf("Flash_WriteData init fail");
         return false;
     }
     Flash_ReadStat1();
@@ -431,7 +431,7 @@ bool Flash_WipeMemoryPage(uint8_t page) {
 // Wipes flash memory completely, fills with 0xFF
 bool Flash_WipeMemory() {
     if (!FlashInit()) {
-        if (MF_DBGLEVEL > 3) Dbprintf("Flash_WriteData init fail");
+        if (DBGLEVEL > 3) Dbprintf("Flash_WriteData init fail");
         return false;
     }
     Flash_ReadStat1();
@@ -458,7 +458,7 @@ bool Flash_WipeMemory() {
 // enable the flash write
 void Flash_WriteEnable() {
     FlashSendLastByte(WRITEENABLE);
-    if (MF_DBGLEVEL > 3) Dbprintf("Flash Write enabled");
+    if (DBGLEVEL > 3) Dbprintf("Flash Write enabled");
 }
 
 // erase 4K at one time
@@ -479,7 +479,7 @@ bool Flash_Erase4k(uint8_t block, uint8_t sector) {
 // execution time: 0,3s / 300ms
 bool Flash_Erase32k(uint32_t address) {
     if (address & (32*1024 - 1)) {
-        if ( MF_DBGLEVEL > 1 ) Dbprintf("Flash_Erase32k : Address is not align at 4096");
+        if ( DBGLEVEL > 1 ) Dbprintf("Flash_Erase32k : Address is not align at 4096");
         return false;
     }
     FlashSendByte(BLOCK32ERASE);
diff --git a/armsrc/fpgaloader.c b/armsrc/fpgaloader.c
index dcaaa238a..7e920a360 100644
--- a/armsrc/fpgaloader.c
+++ b/armsrc/fpgaloader.c
@@ -398,7 +398,7 @@ void FpgaDownloadAndGo(int bitstream_version) {
     z_stream compressed_fpga_stream;
     uint8_t output_buffer[OUTPUT_BUFFER_LEN] = {0x00};
 
-    bool verbose = (MF_DBGLEVEL > 3);
+    bool verbose = (DBGLEVEL > 3);
 
     // make sure that we have enough memory to decompress
     BigBuf_free();
@@ -496,7 +496,7 @@ int FpgaGetCurrent(void) {
 // if HF,  Disable SSC DMA
 // turn off trace and leds off.
 void switch_off(void) {
-    if (MF_DBGLEVEL > 3) Dbprintf("switch_off");
+    if (DBGLEVEL > 3) Dbprintf("switch_off");
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     if (downloaded_bitstream == FPGA_BITSTREAM_HF)
         FpgaDisableSscDma();
diff --git a/armsrc/iclass.c b/armsrc/iclass.c
index c12c9dc1f..25d224184 100644
--- a/armsrc/iclass.c
+++ b/armsrc/iclass.c
@@ -798,7 +798,7 @@ static RAMFUNC int ManchesterDecoding_iclass(uint32_t v) {
 // Both sides of communication!
 //=============================================================================
 static void iclass_setup_sniff(void) {
-    if (MF_DBGLEVEL > 3) Dbprintf("iclass_setup_sniff Enter");
+    if (DBGLEVEL > 3) Dbprintf("iclass_setup_sniff Enter");
 
     LEDsoff();
 
@@ -823,7 +823,7 @@ static void iclass_setup_sniff(void) {
     uart_init(BigBuf_malloc(ICLASS_BUFFER_SIZE));
     //UartInit(BigBuf_malloc(ICLASS_BUFFER_SIZE));
 
-    if (MF_DBGLEVEL > 1) {
+    if (DBGLEVEL > 1) {
         // Print debug information about the buffer sizes
         Dbprintf("[+] Sniffing buffers initialized:");
         Dbprintf("  Trace: %i bytes", BigBuf_max_traceLen());
@@ -841,7 +841,7 @@ static void iclass_setup_sniff(void) {
     StartCountSspClk();
 
     LED_A_ON();
-    if (MF_DBGLEVEL > 3) Dbprintf("[+] iclass_setup_sniff Exit");
+    if (DBGLEVEL > 3) Dbprintf("[+] iclass_setup_sniff Exit");
 }
 
 //-----------------------------------------------------------------------------
@@ -869,7 +869,7 @@ void RAMFUNC SniffIClass(void) {
 
     // Setup and start DMA.
     if (!FpgaSetupSscDma(dmaBuf, ICLASS_DMA_BUFFER_SIZE)) {
-        if (MF_DBGLEVEL > 1) DbpString("[-] FpgaSetupSscDma failed. Exiting");
+        if (DBGLEVEL > 1) DbpString("[-] FpgaSetupSscDma failed. Exiting");
         return;
     }
 
@@ -964,7 +964,7 @@ void RAMFUNC SniffIClass(void) {
         }
     } // end main loop
 
-    if (MF_DBGLEVEL >= 1) {
+    if (DBGLEVEL >= 1) {
         DbpString("[+] Sniff statistics:");
         Dbhexdump(ICLASS_DMA_BUFFER_SIZE, data, false);
     }
@@ -1149,7 +1149,7 @@ static void CodeIClassTagSOF() {
 // turn off afterwards
 void SimulateIClass(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain) {
 
-    if (MF_DBGLEVEL > 3) Dbprintf("[+] iClass_simulate Enter");
+    if (DBGLEVEL > 3) Dbprintf("[+] iClass_simulate Enter");
 
     LEDsoff();
 
@@ -1519,7 +1519,7 @@ int doIClassSimulation(int simulationMode, uint8_t *reader_mac_buf) {
 
                 if (simulationMode == MODE_EXIT_AFTER_MAC) {
 
-                    if (MF_DBGLEVEL ==  MF_DBG_EXTENDED) {
+                    if (DBGLEVEL ==  DBG_EXTENDED) {
                         Dbprintf("[+] CSN: %02x %02x %02x %02x %02x %02x %02x %02x", csn[0], csn[1], csn[2], csn[3], csn[4], csn[5], csn[6], csn[7]);
                         Dbprintf("[+] RDR:  (len=%02d): %02x %02x %02x %02x %02x %02x %02x %02x %02x", len,
                                  receivedCmd[0], receivedCmd[1], receivedCmd[2],
@@ -1584,7 +1584,7 @@ int doIClassSimulation(int simulationMode, uint8_t *reader_mac_buf) {
         } else {
             //#db# Unknown command received from reader (len=5): 26 1 0 f6 a 44 44 44 44
             // Never seen this command before
-            if (MF_DBGLEVEL ==  MF_DBG_EXTENDED)
+            if (DBGLEVEL ==  DBG_EXTENDED)
                 print_result("[-] Unhandled command received ", receivedCmd, len);
 
             // Do not respond
@@ -2000,7 +2000,7 @@ void ReaderIClass(uint8_t arg0) {
 
         // if only looking for one card try 2 times if we missed it the first time
         if (try_once && tryCnt > 2) {
-            if (MF_DBGLEVEL > 1) DbpString("Failed to find a tag");
+            if (DBGLEVEL > 1) DbpString("Failed to find a tag");
             break;
         }
 
@@ -2024,7 +2024,7 @@ void ReaderIClass(uint8_t arg0) {
                 result_status |= FLAG_ICLASS_READER_CONF;
                 memcpy(card_data + 8, resp, 8);
             } else {
-                if (MF_DBGLEVEL > 1) DbpString("Failed to dump config block");
+                if (DBGLEVEL > 1) DbpString("Failed to dump config block");
             }
         }
 
@@ -2034,7 +2034,7 @@ void ReaderIClass(uint8_t arg0) {
                 result_status |= FLAG_ICLASS_READER_AIA;
                 memcpy(card_data + (8 * 5), resp, 8);
             } else {
-                if (MF_DBGLEVEL > 1) DbpString("Failed to dump AA block");
+                if (DBGLEVEL > 1) DbpString("Failed to dump AA block");
             }
         }
 
@@ -2053,7 +2053,7 @@ void ReaderIClass(uint8_t arg0) {
         //  only useful if looping in arm (not try_once && not abort_after_read)
         if (memcmp(last_csn, card_data, 8) != 0) {
             // If caller requires that we get Conf, CC, AA, continue until we got it
-            if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
+            if (DBGLEVEL >= DBG_EXTENDED) {
                 Dbprintf("STATUS %02X | CSN %c | CONF %c | CC %c | AIA %c | ONCE %c | 1TRY %c",
                          result_status,
                          (result_status & FLAG_ICLASS_READER_CSN) ? 'Y' : 'N',
@@ -2079,7 +2079,7 @@ void ReaderIClass(uint8_t arg0) {
             if (flagReadConfig)
                 send |= (result_status & FLAG_ICLASS_READER_CONF);
 
-            if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("SEND %c",  send ? 'y' : 'n');
+            if (DBGLEVEL >= DBG_EXTENDED) Dbprintf("SEND %c",  send ? 'y' : 'n');
 
             if (send) {
                 reply_old(CMD_ACK, result_status, 0, 0, card_data, sizeof(card_data));
diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 8d5bceccc..330dc357e 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -513,7 +513,7 @@ void RAMFUNC SniffIso14443a(uint8_t param) {
 
     // Setup and start DMA.
     if (!FpgaSetupSscDma((uint8_t *) dmaBuf, DMA_BUFFER_SIZE)) {
-        if (MF_DBGLEVEL > 1) Dbprintf("FpgaSetupSscDma failed. Exiting");
+        if (DBGLEVEL > 1) Dbprintf("FpgaSetupSscDma failed. Exiting");
         return;
     }
 
@@ -624,7 +624,7 @@ void RAMFUNC SniffIso14443a(uint8_t param) {
         }
     } // end main loop
 
-    if (MF_DBGLEVEL >= MF_DBG_ERROR) {
+    if (DBGLEVEL >= DBG_ERROR) {
         Dbprintf("maxDataLen=%d, Uart.state=%x, Uart.len=%d", maxDataLen, Uart.state, Uart.len);
         Dbprintf("traceLen=" _YELLOW_("%d")", Uart.output[0]="_YELLOW_("%08x"), BigBuf_get_traceLen(), (uint32_t)Uart.output[0]);
     }
@@ -912,7 +912,7 @@ static bool SimulateIso14443aInit(int tagType, int flags, uint8_t *data, tag_res
         }
         break;
         default: {
-            if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Error: unkown tagtype (%d)", tagType);
+            if (DBGLEVEL >= DBG_ERROR) Dbprintf("Error: unkown tagtype (%d)", tagType);
             return false;
         }
         break;
@@ -957,7 +957,7 @@ static bool SimulateIso14443aInit(int tagType, int flags, uint8_t *data, tag_res
         sak &= 0xFB;
         *cuid = bytes_to_num(data, 4);
     } else {
-        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("[-] ERROR: UID size not defined");
+        if (DBGLEVEL >= DBG_ERROR) Dbprintf("[-] ERROR: UID size not defined");
         return false;
     }
 
@@ -1003,7 +1003,7 @@ static bool SimulateIso14443aInit(int tagType, int flags, uint8_t *data, tag_res
     for (size_t i = 0; i < TAG_RESPONSE_COUNT; i++) {
         if (prepare_allocated_tag_modulation(&responses_init[i], &free_buffer_pointer, &free_buffer_size) == false) {
             BigBuf_free_keep_EM();
-            if (MF_DBGLEVEL >= MF_DBG_ERROR)    Dbprintf("Not enough modulation buffer size, exit after %d elements", i);
+            if (DBGLEVEL >= DBG_ERROR)    Dbprintf("Not enough modulation buffer size, exit after %d elements", i);
             return false;
         }
     }
@@ -1403,7 +1403,7 @@ void SimulateIso14443aTag(uint8_t tagType, uint8_t flags, uint8_t *data) {
             } else {
                 EmSend4bit(CARD_NACK_NA);
                 uint32_t pwd = bytes_to_num(receivedCmd + 1, 4);
-                if (MF_DBGLEVEL >= MF_DBG_DEBUG) Dbprintf("Auth attempt: %08x", pwd);
+                if (DBGLEVEL >= DBG_DEBUG) Dbprintf("Auth attempt: %08x", pwd);
             }
             p_response = NULL;
         } else if (receivedCmd[0] == MIFARE_ULEV1_VCSL && len == 23 && tagType == 7) {
@@ -1465,7 +1465,7 @@ void SimulateIso14443aTag(uint8_t tagType, uint8_t flags, uint8_t *data) {
                 default: {
                     // Never seen this command before
                     LogTrace(receivedCmd, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
-                    if (MF_DBGLEVEL >= MF_DBG_DEBUG) {
+                    if (DBGLEVEL >= DBG_DEBUG) {
                         Dbprintf("Received unknown command (len=%d):", len);
                         Dbhexdump(len, receivedCmd, false);
                     }
@@ -1485,7 +1485,7 @@ void SimulateIso14443aTag(uint8_t tagType, uint8_t flags, uint8_t *data) {
                 dynamic_response_info.response_n += 2;
 
                 if (prepare_tag_modulation(&dynamic_response_info, DYNAMIC_MODULATION_BUFFER_SIZE) == false) {
-                    if (MF_DBGLEVEL >= MF_DBG_DEBUG) DbpString("Error preparing tag response");
+                    if (DBGLEVEL >= DBG_DEBUG) DbpString("Error preparing tag response");
                     LogTrace(receivedCmd, Uart.len, Uart.startTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime * 16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, true);
                     break;
                 }
@@ -1511,7 +1511,7 @@ void SimulateIso14443aTag(uint8_t tagType, uint8_t flags, uint8_t *data) {
     set_tracing(false);
     BigBuf_free_keep_EM();
 
-    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
+    if (DBGLEVEL >= DBG_EXTENDED) {
         Dbprintf("-[ Wake ups after halt  [%d]", happened);
         Dbprintf("-[ Messages after halt  [%d]", happened2);
         Dbprintf("-[ Num of received cmd  [%d]", cmdsRecvd);
@@ -1563,7 +1563,7 @@ static void TransmitFor14443a(const uint8_t *cmd, uint16_t len, uint32_t *timing
         else
             PrepareDelayedTransfer(*timing & 0x00000007);        // Delay transfer (fine tuning - up to 7 MF clock ticks)
 
-        if (MF_DBGLEVEL >= MF_DBG_EXTENDED && GetCountSspClk() >= (*timing & 0xfffffff8))
+        if (DBGLEVEL >= DBG_EXTENDED && GetCountSspClk() >= (*timing & 0xfffffff8))
             Dbprintf("TransmitFor14443a: Missed timing");
         while (GetCountSspClk() < (*timing & 0xfffffff8)) {};    // Delay transfer (multiple of 8 MF clock ticks)
         LastTimeProxToAirStart = *timing;
@@ -1891,7 +1891,7 @@ int EmSendPrecompiledCmd(tag_response_info_t *p_response) {
                (LastTimeProxToAirStart + p_response->ProxToAirDuration) * 16 + DELAY_ARM2AIR_AS_TAG,
                par);
 
-    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
+    if (DBGLEVEL >= DBG_EXTENDED) {
         Dbprintf("response_info->response %02X", p_response->response);
         Dbprintf("response_info->response_n %02X", p_response->response_n);
         Dbprintf("response_info->par %02X", &(p_response->par));
@@ -2058,12 +2058,12 @@ void iso14443a_antifuzz(uint32_t flags) {
             }
 
             EmSendCmdEx(resp, 5, true);
-            if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("ANTICOLL or SELECT %x", received[1]);
+            if (DBGLEVEL >= DBG_EXTENDED) Dbprintf("ANTICOLL or SELECT %x", received[1]);
             LED_D_INV();
 
             continue;
         } else if (received[1] == 0x20 && received[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2) {  // Received request for UID (cascade 2)
-            if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("ANTICOLL or SELECT_2");
+            if (DBGLEVEL >= DBG_EXTENDED) Dbprintf("ANTICOLL or SELECT_2");
         } else if (received[1] == 0x70 && received[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT) {    // Received a SELECT (cascade 1)
         } else if (received[1] == 0x70 && received[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2) {  // Received a SELECT (cascade 2)
         } else {
@@ -2681,7 +2681,7 @@ void ReaderMifare(bool first_try, uint8_t block, uint8_t keytype) {
         if (!have_uid) { // need a full select cycle to get the uid first
             iso14a_card_select_t card_info;
             if (!iso14443a_select_card(uid, &card_info, &cuid, true, 0, true)) {
-                if (MF_DBGLEVEL >= MF_DBG_ERROR)    Dbprintf("Mifare: Can't select card (ALL)");
+                if (DBGLEVEL >= DBG_ERROR)    Dbprintf("Mifare: Can't select card (ALL)");
                 continue;
             }
             switch (card_info.uidlen) {
@@ -2700,7 +2700,7 @@ void ReaderMifare(bool first_try, uint8_t block, uint8_t keytype) {
             have_uid = true;
         } else { // no need for anticollision. We can directly select the card
             if (!iso14443a_fast_select_card(uid, cascade_levels)) {
-                if (MF_DBGLEVEL >= MF_DBG_ERROR)    Dbprintf("Mifare: Can't select card (UID)");
+                if (DBGLEVEL >= DBG_ERROR)    Dbprintf("Mifare: Can't select card (UID)");
                 continue;
             }
         }
@@ -2772,7 +2772,7 @@ void ReaderMifare(bool first_try, uint8_t block, uint8_t keytype) {
                     sync_time = GetCountSspClk() & 0xfffffff8;
                 }
 
-                if (MF_DBGLEVEL >= MF_DBG_EXTENDED)
+                if (DBGLEVEL >= DBG_EXTENDED)
                     Dbprintf("calibrating in cycle %d. nt_distance=%d, elapsed_prng_sequences=%d, new sync_cycles: %d\n", i, nt_distance, elapsed_prng_sequences, sync_cycles);
 
                 LED_B_OFF();
@@ -2799,13 +2799,13 @@ void ReaderMifare(bool first_try, uint8_t block, uint8_t keytype) {
             }
 
             if (consecutive_resyncs < 3) {
-                if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
+                if (DBGLEVEL >= DBG_EXTENDED) {
                     Dbprintf("Lost sync in cycle %d. nt_distance=%d. Consecutive Resyncs = %d. Trying one time catch up...\n", i, catch_up_cycles, consecutive_resyncs);
                 }
             } else {
                 sync_cycles += catch_up_cycles;
 
-                if (MF_DBGLEVEL >= MF_DBG_EXTENDED)
+                if (DBGLEVEL >= DBG_EXTENDED)
                     Dbprintf("Lost sync in cycle %d for the fourth time consecutively (nt_distance = %d). Adjusting sync_cycles to %d.\n", i, catch_up_cycles, sync_cycles);
 
                 last_catch_up = 0;
@@ -2855,7 +2855,7 @@ void ReaderMifare(bool first_try, uint8_t block, uint8_t keytype) {
 
     mf_nr_ar[3] &= 0x1F;
 
-    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Number of sent auth requestes: %u", i);
+    if (DBGLEVEL >= DBG_EXTENDED) Dbprintf("Number of sent auth requestes: %u", i);
 
     uint8_t buf[32] = {0x00};
     memset(buf, 0x00, sizeof(buf));
@@ -2932,7 +2932,7 @@ void DetectNACKbug() {
         if (!have_uid) { // need a full select cycle to get the uid first
             iso14a_card_select_t card_info;
             if (!iso14443a_select_card(uid, &card_info, &cuid, true, 0, true)) {
-                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Mifare: Can't select card (ALL)");
+                if (DBGLEVEL >= DBG_ERROR) Dbprintf("Mifare: Can't select card (ALL)");
                 i = 0;
                 continue;
             }
@@ -2954,7 +2954,7 @@ void DetectNACKbug() {
             have_uid = true;
         } else { // no need for anticollision. We can directly select the card
             if (!iso14443a_fast_select_card(uid, cascade_levels)) {
-                if (MF_DBGLEVEL >= MF_DBG_ERROR)    Dbprintf("Mifare: Can't select card (UID)");
+                if (DBGLEVEL >= DBG_ERROR)    Dbprintf("Mifare: Can't select card (UID)");
                 i = 0;
                 have_uid = false;
                 continue;
@@ -3034,7 +3034,7 @@ void DetectNACKbug() {
                     break;
                 }
 
-                if (MF_DBGLEVEL >= MF_DBG_EXTENDED)
+                if (DBGLEVEL >= DBG_EXTENDED)
                     Dbprintf("calibrating in cycle %d. nt_distance=%d, elapsed_prng_sequences=%d, new sync_cycles: %d\n", i, nt_distance, elapsed_prng_sequences, sync_cycles);
 
                 continue;
@@ -3061,13 +3061,13 @@ void DetectNACKbug() {
             }
 
             if (consecutive_resyncs < 3) {
-                if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
+                if (DBGLEVEL >= DBG_EXTENDED) {
                     Dbprintf("Lost sync in cycle %d. nt_distance=%d. Consecutive Resyncs = %d. Trying one time catch up...\n", i, catch_up_cycles, consecutive_resyncs);
                 }
             } else {
                 sync_cycles += catch_up_cycles;
 
-                if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
+                if (DBGLEVEL >= DBG_EXTENDED) {
                     Dbprintf("Lost sync in cycle %d for the fourth time consecutively (nt_distance = %d). Adjusting sync_cycles to %d.\n", i, catch_up_cycles, sync_cycles);
                     Dbprintf("nt [%08x] attacted [%08x]", nt, nt_attacked);
                 }
diff --git a/armsrc/iso14443b.c b/armsrc/iso14443b.c
index ffdfc41dd..24c993f0b 100644
--- a/armsrc/iso14443b.c
+++ b/armsrc/iso14443b.c
@@ -159,14 +159,14 @@ static void iso14b_set_timeout(uint32_t timeout) {
         timeout = MAX_TIMEOUT;
 
     iso14b_timeout = timeout;
-    if (MF_DBGLEVEL >= 3) Dbprintf("ISO14443B Timeout set to %ld fwt", iso14b_timeout);
+    if (DBGLEVEL >= 3) Dbprintf("ISO14443B Timeout set to %ld fwt", iso14b_timeout);
 }
 static void iso14b_set_maxframesize(uint16_t size) {
     if (size > 256)
         size = MAX_FRAME_SIZE;
 
     Uart.byteCntMax = size;
-    if (MF_DBGLEVEL >= 3) Dbprintf("ISO14443B Max frame size set to %d bytes", Uart.byteCntMax);
+    if (DBGLEVEL >= 3) Dbprintf("ISO14443B Max frame size set to %d bytes", Uart.byteCntMax);
 }
 
 //-----------------------------------------------------------------------------
@@ -714,7 +714,7 @@ void SimulateIso14443bTag(uint32_t pupi) {
 
         ++cmdsReceived;
     }
-    if (MF_DBGLEVEL >= 2)
+    if (DBGLEVEL >= 2)
         Dbprintf("Emulator stopped. Trace length: %d ", BigBuf_get_traceLen());
     switch_off(); //simulate
 }
@@ -960,7 +960,7 @@ static void GetTagSamplesFor14443bDemod() {
 
     // Setup and start DMA.
     if (!FpgaSetupSscDma((uint8_t *) dmaBuf, ISO14443B_DMA_BUFFER_SIZE)) {
-        if (MF_DBGLEVEL > 1) Dbprintf("FpgaSetupSscDma failed. Exiting");
+        if (DBGLEVEL > 1) Dbprintf("FpgaSetupSscDma failed. Exiting");
         return;
     }
 
@@ -1161,7 +1161,7 @@ uint8_t iso14443b_apdu(uint8_t const *message, size_t message_length, uint8_t *r
 
     // VALIDATE CRC
     if (!check_crc(CRC_14443_B, Demod.output, Demod.len)) {
-        if (MF_DBGLEVEL > 3) Dbprintf("crc fail ICE");
+        if (DBGLEVEL > 3) Dbprintf("crc fail ICE");
         return 0;
     }
     // copy response contents
@@ -1419,7 +1419,7 @@ static void iso1444b_setup_sniff(void) {
     DemodInit(BigBuf_malloc(MAX_FRAME_SIZE));
     UartInit(BigBuf_malloc(MAX_FRAME_SIZE));
 
-    if (MF_DBGLEVEL > 1) {
+    if (DBGLEVEL > 1) {
         // Print debug information about the buffer sizes
         Dbprintf("[+] Sniff buffers initialized:");
         Dbprintf("[+]   trace: %i bytes", BigBuf_max_traceLen());
@@ -1478,7 +1478,7 @@ void RAMFUNC SniffIso14443b(void) {
 
     // Setup and start DMA.
     if (!FpgaSetupSscDma((uint8_t *) dmaBuf, ISO14443B_DMA_BUFFER_SIZE)) {
-        if (MF_DBGLEVEL > 1) Dbprintf("[!] FpgaSetupSscDma failed. Exiting");
+        if (DBGLEVEL > 1) Dbprintf("[!] FpgaSetupSscDma failed. Exiting");
         BigBuf_free();
         return;
     }
@@ -1542,7 +1542,7 @@ void RAMFUNC SniffIso14443b(void) {
         }
     }
 
-    if (MF_DBGLEVEL >= 2) {
+    if (DBGLEVEL >= 2) {
         DbpString("[+] Sniff statistics:");
         Dbprintf("[+]  uart State: %x  ByteCount: %i  ByteCountMax: %i", Uart.state,  Uart.byteCnt,  Uart.byteCntMax);
         Dbprintf("[+]  trace length: %i", BigBuf_get_traceLen());
@@ -1575,7 +1575,7 @@ void SendRawCommand14443B_Ex(PacketCommandNG *c) {
     uint32_t sendlen = sizeof(iso14b_card_select_t);
     uint8_t buf[PM3_CMD_DATA_SIZE] = {0x00};
 
-    if (MF_DBGLEVEL > 3) Dbprintf("14b raw: param, %04x", param);
+    if (DBGLEVEL > 3) Dbprintf("14b raw: param, %04x", param);
 
     // turn on trigger (LED_A)
     if ((param & ISO14B_REQUEST_TRIGGER) == ISO14B_REQUEST_TRIGGER)
diff --git a/armsrc/iso14443b.h b/armsrc/iso14443b.h
index 2618b0770..5ea3d530b 100644
--- a/armsrc/iso14443b.h
+++ b/armsrc/iso14443b.h
@@ -18,7 +18,7 @@ extern "C" {
 #endif
 
 #include "proxmark3.h"
-#include "common.h"  // access to global variable: MF_DBGLEVEL
+#include "common.h"  // access to global variable: DBGLEVEL
 #include "apps.h"
 #include "util.h"
 #include "string.h"
diff --git a/armsrc/iso15693.c b/armsrc/iso15693.c
index c7d15a824..e42a35499 100644
--- a/armsrc/iso15693.c
+++ b/armsrc/iso15693.c
@@ -330,7 +330,7 @@ static int DemodAnswer(uint8_t *received, uint8_t *dest, uint16_t samplecount) {
         // Even things out by the length of the target waveform.
         corr0 *= 4;
         corr1 *= 4;
-        // if (MF_DBGLEVEL >= MF_DBG_EXTENDED)
+        // if (DBGLEVEL >= DBG_EXTENDED)
         // Dbprintf("Corr1 %d, Corr0 %d, CorrEOF %d", corr1, corr0, corrEOF);
 
         if (corrEOF > corr1 && corrEOF > corr0)
@@ -356,12 +356,12 @@ static int DemodAnswer(uint8_t *received, uint8_t *dest, uint16_t samplecount) {
         }
     }
 
-    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("ice: demod bytes %u", k);
+    if (DBGLEVEL >= DBG_EXTENDED) Dbprintf("ice: demod bytes %u", k);
 
     if (mask != 0x01) { // this happens, when we miss the EOF
 
         // TODO: for some reason this happens quite often
-        if (MF_DBGLEVEL >= MF_DBG_ERROR && k != 0) Dbprintf("[!] error, uneven octet! (extra bits!) mask %02x", mask);
+        if (DBGLEVEL >= DBG_ERROR && k != 0) Dbprintf("[!] error, uneven octet! (extra bits!) mask %02x", mask);
         //if (mask < 0x08) k--; // discard the last uneven octet;
         // 0x08 is an assumption - but works quite often
     }
@@ -785,7 +785,7 @@ void DbdecodeIso15693Answer(int len, uint8_t *d) {
         else
             strncat(status, "[!] crc fail", DBD15STATLEN - strlen(status));
 
-        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("%s", status);
+        if (DBGLEVEL >= DBG_ERROR) Dbprintf("%s", status);
     }
 }
 
@@ -838,7 +838,7 @@ void ReaderIso15693(uint32_t parameter) {
         uid[6] = answer1[3];
         uid[7] = answer1[2];
 
-        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
+        if (DBGLEVEL >= DBG_EXTENDED) {
             Dbprintf("[+] UID = %02X%02X%02X%02X%02X%02X%02X%02X",
                      uid[0], uid[1], uid[2], uid[3],
                      uid[4], uid[5], uid[5], uid[6]
@@ -852,7 +852,7 @@ void ReaderIso15693(uint32_t parameter) {
         reply_old(CMD_ACK, 1, sizeof(uid), 0, uid, sizeof(uid));
     }
 
-    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
+    if (DBGLEVEL >= DBG_EXTENDED) {
         Dbprintf("[+] %d octets read from IDENTIFY request:", answerLen1);
         DbdecodeIso15693Answer(answerLen1, answer1);
         Dbhexdump(answerLen1, answer1, true);
@@ -904,7 +904,7 @@ void SimTagIso15693(uint32_t parameter, uint8_t *uid) {
             TransmitTo15693Reader(ToSend, ToSendMax, &tsamples, &wait);
             LogTrace(cmd, CMD_INV_RESP, time_start << 4, (GetCountSspClk() - time_start) << 4, NULL, true);
 
-            if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
+            if (DBGLEVEL >= DBG_EXTENDED) {
                 Dbprintf("[+] %d octets read from reader command: %x %x %x %x %x %x %x %x", ans,
                          buf[0], buf[1], buf[2], buf[3],
                          buf[4], buf[5], buf[6], buf[7]
@@ -978,7 +978,7 @@ void DirectTag15693Command(uint32_t datalen, uint32_t speed, uint32_t recv, uint
     uint8_t buf[ISO15_MAX_FRAME];
     memset(buf, 0x00, sizeof(buf));
 
-    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
+    if (DBGLEVEL >= DBG_EXTENDED) {
         DbpString("[+] SEND");
         Dbhexdump(datalen, data, true);
     }
@@ -992,7 +992,7 @@ void DirectTag15693Command(uint32_t datalen, uint32_t speed, uint32_t recv, uint
         reply_old(CMD_ACK, buflen, 0, 0, buf, buflen);
         LED_B_OFF();
 
-        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
+        if (DBGLEVEL >= DBG_EXTENDED) {
             DbpString("[+] RECV");
             DbdecodeIso15693Answer(buflen, buf);
             Dbhexdump(buflen, buf, true);
diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index 870b56303..de4c412ca 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -99,7 +99,7 @@ void setT55xxConfig(uint8_t arg0, t55xx_config *c) {
     Flash_Erase4k(3, 0xD);
     res = Flash_Write(T55XX_CONFIG_OFFSET, buf, T55XX_CONFIG_LEN);
 
-    if (res == T55XX_CONFIG_LEN && MF_DBGLEVEL > 1) {
+    if (res == T55XX_CONFIG_LEN && DBGLEVEL > 1) {
         DbpString("T55XX Config save success");
     }
 
@@ -137,7 +137,7 @@ void loadT55xxConfig(void) {
     memcpy((uint8_t *)&t_config, buf, T55XX_CONFIG_LEN);
 
     if (isok == T55XX_CONFIG_LEN) {
-        if (MF_DBGLEVEL > 1) DbpString("T55XX Config load success");
+        if (DBGLEVEL > 1) DbpString("T55XX Config load success");
     }
 #endif
 }
diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index f64723355..f7a710c0e 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -63,22 +63,22 @@ void MifareReadBlock(uint8_t blockNo, uint8_t keyType, uint8_t *datain) {
 
     while (true) {
         if (!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
-            if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
+            if (DBGLEVEL >= 1) Dbprintf("Can't select card");
             break;
         };
 
         if (mifare_classic_auth(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST)) {
-            if (MF_DBGLEVEL >= 1) Dbprintf("Auth error");
+            if (DBGLEVEL >= 1) Dbprintf("Auth error");
             break;
         };
 
         if (mifare_classic_readblock(pcs, cuid, blockNo, dataoutbuf)) {
-            if (MF_DBGLEVEL >= 1) Dbprintf("Read block error");
+            if (DBGLEVEL >= 1) Dbprintf("Read block error");
             break;
         };
 
         if (mifare_classic_halt(pcs, cuid)) {
-            if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
+            if (DBGLEVEL >= 1) Dbprintf("Halt error");
             break;
         };
 
@@ -88,7 +88,7 @@ void MifareReadBlock(uint8_t blockNo, uint8_t keyType, uint8_t *datain) {
 
     crypto1_destroy(pcs);
 
-    if (MF_DBGLEVEL >= 2) DbpString("READ BLOCK FINISHED");
+    if (DBGLEVEL >= 2) DbpString("READ BLOCK FINISHED");
 
     LED_B_ON();
     reply_ng(CMD_MIFARE_READBL, status, dataoutbuf, 16);
@@ -112,13 +112,13 @@ void MifareUC_Auth(uint8_t arg0, uint8_t *keybytes) {
     set_tracing(true);
 
     if (!iso14443a_select_card(NULL, NULL, NULL, true, 0, true)) {
-        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card");
+        if (DBGLEVEL >= DBG_ERROR) Dbprintf("Can't select card");
         OnError(0);
         return;
     };
 
     if (!mifare_ultra_auth(keybytes)) {
-        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication failed");
+        if (DBGLEVEL >= DBG_ERROR) Dbprintf("Authentication failed");
         OnError(1);
         return;
     }
@@ -148,7 +148,7 @@ void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain) {
 
     int len = iso14443a_select_card(NULL, NULL, NULL, true, 0, true);
     if (!len) {
-        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card (RC:%02X)", len);
+        if (DBGLEVEL >= DBG_ERROR) Dbprintf("Can't select card (RC:%02X)", len);
         OnError(1);
         return;
     }
@@ -176,13 +176,13 @@ void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain) {
     }
 
     if (mifare_ultra_readblock(blockNo, dataout)) {
-        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Read block error");
+        if (DBGLEVEL >= DBG_ERROR) Dbprintf("Read block error");
         OnError(2);
         return;
     }
 
     if (mifare_ultra_halt()) {
-        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Halt error");
+        if (DBGLEVEL >= DBG_ERROR) Dbprintf("Halt error");
         OnError(3);
         return;
     }
@@ -224,28 +224,28 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t *datain) {
     isOK = 1;
     if (!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
         isOK = 0;
-        if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
+        if (DBGLEVEL >= 1) Dbprintf("Can't select card");
     }
 
 
     if (isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_FIRST)) {
         isOK = 0;
-        if (MF_DBGLEVEL >= 1) Dbprintf("Auth error");
+        if (DBGLEVEL >= 1) Dbprintf("Auth error");
     }
 
     for (uint8_t blockNo = 0; isOK && blockNo < NumBlocksPerSector(sectorNo); blockNo++) {
         if (mifare_classic_readblock(pcs, cuid, FirstBlockOfSector(sectorNo) + blockNo, dataoutbuf + 16 * blockNo)) {
             isOK = 0;
-            if (MF_DBGLEVEL >= 1) Dbprintf("Read sector %2d block %2d error", sectorNo, blockNo);
+            if (DBGLEVEL >= 1) Dbprintf("Read sector %2d block %2d error", sectorNo, blockNo);
             break;
         }
     }
 
     if (mifare_classic_halt(pcs, cuid)) {
-        if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
+        if (DBGLEVEL >= 1) Dbprintf("Halt error");
     }
 
-    if (MF_DBGLEVEL >= 2) DbpString("READ SECTOR FINISHED");
+    if (DBGLEVEL >= 2) DbpString("READ SECTOR FINISHED");
 
     crypto1_destroy(pcs);
 
@@ -288,7 +288,7 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
 
     int len = iso14443a_select_card(NULL, NULL, NULL, true, 0, true);
     if (!len) {
-        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card (RC:%d)", len);
+        if (DBGLEVEL >= DBG_ERROR) Dbprintf("Can't select card (RC:%d)", len);
         OnError(1);
         return;
     }
@@ -325,7 +325,7 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
         len = mifare_ultra_readblock(blockNo + i, dataout + 4 * i);
 
         if (len) {
-            if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Read block %d error", i);
+            if (DBGLEVEL >= DBG_ERROR) Dbprintf("Read block %d error", i);
             // if no blocks read - error out
             if (i == 0) {
                 OnError(2);
@@ -341,12 +341,12 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
 
     len = mifare_ultra_halt();
     if (len) {
-        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Halt error");
+        if (DBGLEVEL >= DBG_ERROR) Dbprintf("Halt error");
         OnError(3);
         return;
     }
 
-    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Blocks read %d", countblocks);
+    if (DBGLEVEL >= DBG_EXTENDED) Dbprintf("Blocks read %d", countblocks);
 
     countblocks *= 4;
 
@@ -390,22 +390,22 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain) {
 
     while (true) {
         if (!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
-            if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
+            if (DBGLEVEL >= 1) Dbprintf("Can't select card");
             break;
         };
 
         if (mifare_classic_auth(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST)) {
-            if (MF_DBGLEVEL >= 1) Dbprintf("Auth error");
+            if (DBGLEVEL >= 1) Dbprintf("Auth error");
             break;
         };
 
         if (mifare_classic_writeblock(pcs, cuid, blockNo, blockdata)) {
-            if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
+            if (DBGLEVEL >= 1) Dbprintf("Write block error");
             break;
         };
 
         if (mifare_classic_halt(pcs, cuid)) {
-            if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
+            if (DBGLEVEL >= 1) Dbprintf("Halt error");
             break;
         };
 
@@ -415,7 +415,7 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain) {
 
     crypto1_destroy(pcs);
 
-    if (MF_DBGLEVEL >= 2) DbpString("WRITE BLOCK FINISHED");
+    if (DBGLEVEL >= 2) DbpString("WRITE BLOCK FINISHED");
 
     reply_mix(CMD_ACK, isOK, 0, 0, 0, 0);
 
@@ -441,23 +441,23 @@ void MifareUWriteBlockCompat(uint8_t arg0, uint8_t *datain)
     iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
 
     if(!iso14443a_select_card(uid, NULL, NULL, true, 0, true)) {
-        if (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");
+        if (DBGLEVEL >= 1)   Dbprintf("Can't select card");
         OnError(0);
         return;
     };
 
     if(mifare_ultra_writeblock_compat(blockNo, blockdata)) {
-        if (MF_DBGLEVEL >= 1)   Dbprintf("Write block error");
+        if (DBGLEVEL >= 1)   Dbprintf("Write block error");
         OnError(0);
         return; };
 
     if(mifare_ultra_halt()) {
-        if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");
+        if (DBGLEVEL >= 1)   Dbprintf("Halt error");
         OnError(0);
         return;
     };
 
-    if (MF_DBGLEVEL >= 2)   DbpString("WRITE BLOCK FINISHED");
+    if (DBGLEVEL >= 2)   DbpString("WRITE BLOCK FINISHED");
 
     reply_mix(CMD_ACK,1,0,0,0,0);
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
@@ -487,7 +487,7 @@ void MifareUWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain) {
     set_tracing(true);
 
     if (!iso14443a_select_card(NULL, NULL, NULL, true, 0, true)) {
-        if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
+        if (DBGLEVEL >= 1) Dbprintf("Can't select card");
         OnError(0);
         return;
     };
@@ -515,18 +515,18 @@ void MifareUWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain) {
     }
 
     if (mifare_ultra_writeblock(blockNo, blockdata)) {
-        if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
+        if (DBGLEVEL >= 1) Dbprintf("Write block error");
         OnError(0);
         return;
     };
 
     if (mifare_ultra_halt()) {
-        if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
+        if (DBGLEVEL >= 1) Dbprintf("Halt error");
         OnError(0);
         return;
     };
 
-    if (MF_DBGLEVEL >= 2) DbpString("WRITE BLOCK FINISHED");
+    if (DBGLEVEL >= 2) DbpString("WRITE BLOCK FINISHED");
 
     reply_mix(CMD_ACK, 1, 0, 0, 0, 0);
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
@@ -550,7 +550,7 @@ void MifareUSetPwd(uint8_t arg0, uint8_t *datain) {
     set_tracing(true);
 
     if (!iso14443a_select_card(NULL, NULL, NULL, true, 0, true)) {
-        if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
+        if (DBGLEVEL >= 1) Dbprintf("Can't select card");
         OnError(0);
         return;
     };
@@ -560,7 +560,7 @@ void MifareUSetPwd(uint8_t arg0, uint8_t *datain) {
     blockdata[2] = pwd[5];
     blockdata[3] = pwd[4];
     if (mifare_ultra_writeblock(44, blockdata)) {
-        if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
+        if (DBGLEVEL >= 1) Dbprintf("Write block error");
         OnError(44);
         return;
     };
@@ -570,7 +570,7 @@ void MifareUSetPwd(uint8_t arg0, uint8_t *datain) {
     blockdata[2] = pwd[1];
     blockdata[3] = pwd[0];
     if (mifare_ultra_writeblock(45, blockdata)) {
-        if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
+        if (DBGLEVEL >= 1) Dbprintf("Write block error");
         OnError(45);
         return;
     };
@@ -580,7 +580,7 @@ void MifareUSetPwd(uint8_t arg0, uint8_t *datain) {
     blockdata[2] = pwd[13];
     blockdata[3] = pwd[12];
     if (mifare_ultra_writeblock(46, blockdata)) {
-        if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
+        if (DBGLEVEL >= 1) Dbprintf("Write block error");
         OnError(46);
         return;
     };
@@ -590,13 +590,13 @@ void MifareUSetPwd(uint8_t arg0, uint8_t *datain) {
     blockdata[2] = pwd[9];
     blockdata[3] = pwd[8];
     if (mifare_ultra_writeblock(47, blockdata)) {
-        if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
+        if (DBGLEVEL >= 1) Dbprintf("Write block error");
         OnError(47);
         return;
     };
 
     if (mifare_ultra_halt()) {
-        if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
+        if (DBGLEVEL >= 1) Dbprintf("Halt error");
         OnError(0);
         return;
     };
@@ -655,7 +655,7 @@ void MifareAcquireNonces(uint32_t arg0, uint32_t flags) {
         if (!have_uid) { // need a full select cycle to get the uid first
             iso14a_card_select_t card_info;
             if (!iso14443a_select_card(uid, &card_info, &cuid, true, 0, true)) {
-                if (MF_DBGLEVEL >= 1) Dbprintf("AcquireNonces: Can't select card (ALL)");
+                if (DBGLEVEL >= 1) Dbprintf("AcquireNonces: Can't select card (ALL)");
                 continue;
             }
             switch (card_info.uidlen) {
@@ -674,7 +674,7 @@ void MifareAcquireNonces(uint32_t arg0, uint32_t flags) {
             have_uid = true;
         } else { // no need for anticollision. We can directly select the card
             if (!iso14443a_fast_select_card(uid, cascade_levels)) {
-                if (MF_DBGLEVEL >= 1) Dbprintf("AcquireNonces: Can't select card (UID)");
+                if (DBGLEVEL >= 1) Dbprintf("AcquireNonces: Can't select card (UID)");
                 continue;
             }
         }
@@ -689,7 +689,7 @@ void MifareAcquireNonces(uint32_t arg0, uint32_t flags) {
         CHK_TIMEOUT();
 
         if (len != 4) {
-            if (MF_DBGLEVEL >= 2) Dbprintf("AcquireNonces: Auth1 error");
+            if (DBGLEVEL >= 2) Dbprintf("AcquireNonces: Auth1 error");
             continue;
         }
 
@@ -707,7 +707,7 @@ void MifareAcquireNonces(uint32_t arg0, uint32_t flags) {
     reply_old(CMD_ACK, isOK, cuid, num_nonces - 1, buf, sizeof(buf));
     LED_B_OFF();
 
-    if (MF_DBGLEVEL >= 3) DbpString("AcquireNonces finished");
+    if (DBGLEVEL >= 3) DbpString("AcquireNonces finished");
 
     if (field_off) {
         FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
@@ -773,7 +773,7 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
         if (!have_uid) { // need a full select cycle to get the uid first
             iso14a_card_select_t card_info;
             if (!iso14443a_select_card(uid, &card_info, &cuid, true, 0, true)) {
-                if (MF_DBGLEVEL >= 1) Dbprintf("AcquireNonces: Can't select card (ALL)");
+                if (DBGLEVEL >= 1) Dbprintf("AcquireNonces: Can't select card (ALL)");
                 continue;
             }
             switch (card_info.uidlen) {
@@ -792,7 +792,7 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
             have_uid = true;
         } else { // no need for anticollision. We can directly select the card
             if (!iso14443a_fast_select_card(uid, cascade_levels)) {
-                if (MF_DBGLEVEL >= 1) Dbprintf("AcquireNonces: Can't select card (UID)");
+                if (DBGLEVEL >= 1) Dbprintf("AcquireNonces: Can't select card (UID)");
                 continue;
             }
         }
@@ -802,7 +802,7 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
 
         uint32_t nt1;
         if (mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1, NULL)) {
-            if (MF_DBGLEVEL >= 1) Dbprintf("AcquireNonces: Auth1 error");
+            if (DBGLEVEL >= 1) Dbprintf("AcquireNonces: Auth1 error");
             continue;
         }
 
@@ -813,7 +813,7 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
         CHK_TIMEOUT();
 
         if (len != 4) {
-            if (MF_DBGLEVEL >= 1) Dbprintf("AcquireNonces: Auth2 error len=%d", len);
+            if (DBGLEVEL >= 1) Dbprintf("AcquireNonces: Auth2 error len=%d", len);
             continue;
         }
 
@@ -835,7 +835,7 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
     reply_old(CMD_ACK, isOK, cuid, num_nonces, buf, sizeof(buf));
     LED_B_OFF();
 
-    if (MF_DBGLEVEL >= 3) DbpString("AcquireEncryptedNonces finished");
+    if (DBGLEVEL >= 3) DbpString("AcquireEncryptedNonces finished");
 
     if (field_off) {
         FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
@@ -912,27 +912,27 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)
 
             // prepare next select. No need to power down the card.
             if (mifare_classic_halt(pcs, cuid)) {
-                if (MF_DBGLEVEL >= 2) Dbprintf("Nested: Halt error");
+                if (DBGLEVEL >= 2) Dbprintf("Nested: Halt error");
                 rtr--;
                 continue;
             }
 
             if (!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
-                if (MF_DBGLEVEL >= 2) Dbprintf("Nested: Can't select card");
+                if (DBGLEVEL >= 2) Dbprintf("Nested: Can't select card");
                 rtr--;
                 continue;
             };
 
             auth1_time = 0;
             if (mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1, &auth1_time)) {
-                if (MF_DBGLEVEL >= 2) Dbprintf("Nested: Auth1 error");
+                if (DBGLEVEL >= 2) Dbprintf("Nested: Auth1 error");
                 rtr--;
                 continue;
             };
             auth2_time = (delta_time) ? auth1_time + delta_time : 0;
 
             if (mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_NESTED, &nt2, &auth2_time)) {
-                if (MF_DBGLEVEL >= 2) Dbprintf("Nested: Auth2 error");
+                if (DBGLEVEL >= 2) Dbprintf("Nested: Auth2 error");
                 rtr--;
                 continue;
             };
@@ -951,7 +951,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)
                 } else {
                     delta_time = auth2_time - auth1_time + 32;  // allow some slack for proper timing
                 }
-                if (MF_DBGLEVEL >= 3) Dbprintf("Nested: calibrating... ntdist=%d", i);
+                if (DBGLEVEL >= 3) Dbprintf("Nested: calibrating... ntdist=%d", i);
             } else {
                 unsuccessfull_tries++;
                 if (unsuccessfull_tries > NESTED_MAX_TRIES) { // card isn't vulnerable to nested attack (random numbers are not predictable)
@@ -962,7 +962,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)
 
         davg = (davg + (rtr - 1) / 2) / (rtr - 1);
 
-        if (MF_DBGLEVEL >= 3) Dbprintf("rtr=%d isOK=%d min=%d max=%d avg=%d, delta_time=%d", rtr, isOK, dmin, dmax, davg, delta_time);
+        if (DBGLEVEL >= 3) Dbprintf("rtr=%d isOK=%d min=%d max=%d avg=%d, delta_time=%d", rtr, isOK, dmin, dmax, davg, delta_time);
 
         dmin = davg - 2;
         dmax = davg + 2;
@@ -981,18 +981,18 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)
 
             // prepare next select. No need to power down the card.
             if (mifare_classic_halt(pcs, cuid)) {
-                if (MF_DBGLEVEL >= 2) Dbprintf("Nested: Halt error");
+                if (DBGLEVEL >= 2) Dbprintf("Nested: Halt error");
                 continue;
             }
 
             if (!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
-                if (MF_DBGLEVEL >= 2) Dbprintf("Nested: Can't select card");
+                if (DBGLEVEL >= 2) Dbprintf("Nested: Can't select card");
                 continue;
             };
 
             auth1_time = 0;
             if (mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1, &auth1_time)) {
-                if (MF_DBGLEVEL >= 2) Dbprintf("Nested: Auth1 error");
+                if (DBGLEVEL >= 2) Dbprintf("Nested: Auth1 error");
                 continue;
             };
 
@@ -1001,12 +1001,12 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)
 
             len = mifare_sendcmd_short(pcs, AUTH_NESTED, 0x60 + (targetKeyType & 0x01), targetBlockNo, receivedAnswer, par, &auth2_time);
             if (len != 4) {
-                if (MF_DBGLEVEL >= 2) Dbprintf("Nested: Auth2 error len=%d", len);
+                if (DBGLEVEL >= 2) Dbprintf("Nested: Auth2 error len=%d", len);
                 continue;
             };
 
             nt2 = bytes_to_num(receivedAnswer, 4);
-            if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: Testing nt1=%08x nt2enc=%08x nt2par=%02x", i + 1, nt1, nt2, par[0]);
+            if (DBGLEVEL >= 3) Dbprintf("Nonce#%d: Testing nt1=%08x nt2enc=%08x nt2par=%02x", i + 1, nt1, nt2, par[0]);
 
             // Parity validity check
             for (j = 0; j < 4; j++) {
@@ -1021,7 +1021,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)
 
                 if (valid_nonce(nttest, nt2, ks1, par_array)) {
                     if (ncount > 0) { // we are only interested in disambiguous nonces, try again
-                        if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: dismissed (ambigous), ntdist=%d", i + 1, j);
+                        if (DBGLEVEL >= 3) Dbprintf("Nonce#%d: dismissed (ambigous), ntdist=%d", i + 1, j);
                         target_nt[i] = 0;
                         break;
                     }
@@ -1030,13 +1030,13 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)
                     ncount++;
                     if (i == 1 && target_nt[1] == target_nt[0]) { // we need two different nonces
                         target_nt[i] = 0;
-                        if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#2: dismissed (= nonce#1), ntdist=%d", j);
+                        if (DBGLEVEL >= 3) Dbprintf("Nonce#2: dismissed (= nonce#1), ntdist=%d", j);
                         break;
                     }
-                    if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: valid, ntdist=%d", i + 1, j);
+                    if (DBGLEVEL >= 3) Dbprintf("Nonce#%d: valid, ntdist=%d", i + 1, j);
                 }
             }
-            if (target_nt[i] == 0 && j == dmax + 1 && MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: dismissed (all invalid)", i + 1);
+            if (target_nt[i] == 0 && j == dmax + 1 && DBGLEVEL >= 3) Dbprintf("Nonce#%d: dismissed (all invalid)", i + 1);
         }
     }
 
@@ -1055,7 +1055,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)
     reply_mix(CMD_ACK, isOK, 0, targetBlockNo + (targetKeyType * 0x100), buf, sizeof(buf));
     LED_B_OFF();
 
-    if (MF_DBGLEVEL >= 3) DbpString("NESTED FINISHED");
+    if (DBGLEVEL >= 3) DbpString("NESTED FINISHED");
 
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     LEDsoff();
@@ -1147,7 +1147,7 @@ void chkKey_scanA(struct chk_t *c, struct sector_t *k_sector, uint8_t *found, ui
             found[(s * 2)] = 1;
             ++*foundkeys;
 
-            if (MF_DBGLEVEL >= 3) Dbprintf("ChkKeys_fast: Scan A found (%d)", c->block);
+            if (DBGLEVEL >= 3) Dbprintf("ChkKeys_fast: Scan A found (%d)", c->block);
         }
     }
 }
@@ -1165,7 +1165,7 @@ void chkKey_scanB(struct chk_t *c, struct sector_t *k_sector, uint8_t *found, ui
             found[(s * 2) + 1] = 1;
             ++*foundkeys;
 
-            if (MF_DBGLEVEL >= 3) Dbprintf("ChkKeys_fast: Scan B found (%d)", c->block);
+            if (DBGLEVEL >= 3) Dbprintf("ChkKeys_fast: Scan B found (%d)", c->block);
         }
     }
 }
@@ -1190,7 +1190,7 @@ void chkKey_loopBonly(struct chk_t *c, struct sector_t *k_sector, uint8_t *found
                 found[(s * 2) + 1] = 1;
                 ++*foundkeys;
 
-                if (MF_DBGLEVEL >= 3) Dbprintf("ChkKeys_fast: Reading B found (%d)", c->block);
+                if (DBGLEVEL >= 3) Dbprintf("ChkKeys_fast: Reading B found (%d)", c->block);
 
                 // try quick find all B?
                 // assume: keys comes in groups. Find one B, test against all B.
@@ -1281,7 +1281,7 @@ void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *da
 
         iso14a_card_select_t card_info;
         if (!iso14443a_select_card(uid, &card_info, &cuid, true, 0, true)) {
-            if (MF_DBGLEVEL >= 1) Dbprintf("ChkKeys_fast: Can't select card (ALL)");
+            if (DBGLEVEL >= 1) Dbprintf("ChkKeys_fast: Can't select card (ALL)");
             goto OUT;
         }
 
@@ -1558,7 +1558,7 @@ void MifareChkKeys(uint8_t *datain) {
         if (!have_uid) { // need a full select cycle to get the uid first
             iso14a_card_select_t card_info;
             if (!iso14443a_select_card(uid, &card_info, &cuid, true, 0, true)) {
-                if (MF_DBGLEVEL >= 1) Dbprintf("ChkKeys: Can't select card (ALL)");
+                if (DBGLEVEL >= 1) Dbprintf("ChkKeys: Can't select card (ALL)");
                 --i; // try same key once again
                 continue;
             }
@@ -1578,7 +1578,7 @@ void MifareChkKeys(uint8_t *datain) {
             have_uid = true;
         } else { // no need for anticollision. We can directly select the card
             if (!iso14443a_select_card(uid, NULL, NULL, false, cascade_levels, true)) {
-                if (MF_DBGLEVEL >= 1) Dbprintf("ChkKeys: Can't select card (UID)");
+                if (DBGLEVEL >= 1) Dbprintf("ChkKeys: Can't select card (UID)");
                 --i; // try same key once again
                 continue;
             }
@@ -1606,15 +1606,6 @@ void MifareChkKeys(uint8_t *datain) {
     crypto1_destroy(pcs);
 }
 
-//-----------------------------------------------------------------------------
-// MIFARE commands set debug level
-//
-//-----------------------------------------------------------------------------
-void MifareSetDbgLvl(uint16_t arg0) {
-    MF_DBGLEVEL = arg0;
-    Dbprintf("Debug level: %d", MF_DBGLEVEL);
-}
-
 //-----------------------------------------------------------------------------
 // Work with emulator memory
 //
@@ -1687,20 +1678,20 @@ int MifareECardLoad(uint32_t arg0, uint32_t arg1) {
 
     if (!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
         isOK = false;
-        if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
+        if (DBGLEVEL >= 1) Dbprintf("Can't select card");
     }
 
     for (uint8_t sectorNo = 0; isOK && sectorNo < numSectors; sectorNo++) {
         ui64Key = emlGetKey(sectorNo, keyType);
         if (sectorNo == 0) {
             if (isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_FIRST)) {
-                if (MF_DBGLEVEL >= 1) Dbprintf("Sector[%2d]. Auth error", sectorNo);
+                if (DBGLEVEL >= 1) Dbprintf("Sector[%2d]. Auth error", sectorNo);
                 break;
             }
         } else {
             if (isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_NESTED)) {
                 isOK = false;
-                if (MF_DBGLEVEL >= 1) Dbprintf("Sector[%2d]. Auth nested error", sectorNo);
+                if (DBGLEVEL >= 1) Dbprintf("Sector[%2d]. Auth nested error", sectorNo);
                 break;
             }
         }
@@ -1708,7 +1699,7 @@ int MifareECardLoad(uint32_t arg0, uint32_t arg1) {
         for (uint8_t blockNo = 0; isOK && blockNo < NumBlocksPerSector(sectorNo); blockNo++) {
             if (isOK && mifare_classic_readblock(pcs, cuid, FirstBlockOfSector(sectorNo) + blockNo, dataoutbuf)) {
                 isOK = false;
-                if (MF_DBGLEVEL >= 1) Dbprintf("Error reading sector %2d block %2d", sectorNo, blockNo);
+                if (DBGLEVEL >= 1) Dbprintf("Error reading sector %2d block %2d", sectorNo, blockNo);
                 break;
             }
             if (isOK) {
@@ -1725,7 +1716,7 @@ int MifareECardLoad(uint32_t arg0, uint32_t arg1) {
     }
 
     if (mifare_classic_halt(pcs, cuid))
-        if (MF_DBGLEVEL >= 1)
+        if (DBGLEVEL >= 1)
             Dbprintf("Halt error");
 
     //  ----------------------------- crypto1 destroy
@@ -1734,7 +1725,7 @@ int MifareECardLoad(uint32_t arg0, uint32_t arg1) {
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     LEDsoff();
 
-    if (MF_DBGLEVEL >= 2) DbpString("EMUL FILL SECTORS FINISHED");
+    if (DBGLEVEL >= 2) DbpString("EMUL FILL SECTORS FINISHED");
 
     set_tracing(false);
     return (isOK) ? PM3_SUCCESS : PM3_EUNDEF;
@@ -1790,7 +1781,7 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain) {
         // read UID and return to client with write
         if (workFlags & MAGIC_UID) {
             if (!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
-                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card");
+                if (DBGLEVEL >= DBG_ERROR) Dbprintf("Can't select card");
                 errormsg = MAGIC_UID;
             }
             mifare_classic_halt_ex(NULL);
@@ -1801,14 +1792,14 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain) {
         if (workFlags & MAGIC_WIPE) {
             ReaderTransmitBitsPar(wupC1, 7, NULL, NULL);
             if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
-                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("wupC1 error");
+                if (DBGLEVEL >= DBG_ERROR) Dbprintf("wupC1 error");
                 errormsg = MAGIC_WIPE;
                 break;
             }
 
             ReaderTransmit(wipeC, sizeof(wipeC), NULL);
             if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
-                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("wipeC error");
+                if (DBGLEVEL >= DBG_ERROR) Dbprintf("wipeC error");
                 errormsg = MAGIC_WIPE;
                 break;
             }
@@ -1820,7 +1811,7 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain) {
         if (workFlags & MAGIC_WUPC) {
             ReaderTransmitBitsPar(wupC1, 7, NULL, NULL);
             if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
-                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("wupC1 error");
+                if (DBGLEVEL >= DBG_ERROR) Dbprintf("wupC1 error");
                 errormsg = MAGIC_WUPC;
                 break;
             }
@@ -1828,7 +1819,7 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain) {
             if (!is1b) {
                 ReaderTransmit(wupC2, sizeof(wupC2), NULL);
                 if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
-                    if (MF_DBGLEVEL >= MF_DBG_INFO) Dbprintf("Assuming Magic Gen 1B tag. [wupC2 failed]");
+                    if (DBGLEVEL >= DBG_INFO) Dbprintf("Assuming Magic Gen 1B tag. [wupC2 failed]");
                     is1b = true;
                     continue;
                 }
@@ -1836,7 +1827,7 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain) {
         }
 
         if ((mifare_sendcmd_short(NULL, 0, ISO14443A_CMD_WRITEBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL) != 1) || (receivedAnswer[0] != 0x0a)) {
-            if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("write block send command error");
+            if (DBGLEVEL >= DBG_ERROR) Dbprintf("write block send command error");
             errormsg = 4;
             break;
         }
@@ -1846,7 +1837,7 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain) {
 
         ReaderTransmit(data, sizeof(data), NULL);
         if ((ReaderReceive(receivedAnswer, receivedAnswerPar) != 1) || (receivedAnswer[0] != 0x0a)) {
-            if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("write block send data error");
+            if (DBGLEVEL >= DBG_ERROR) Dbprintf("write block send data error");
             errormsg = 0;
             break;
         }
@@ -1898,7 +1889,7 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain) {
         if (workFlags & MAGIC_WUPC) {
             ReaderTransmitBitsPar(wupC1, 7, NULL, NULL);
             if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
-                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("wupC1 error");
+                if (DBGLEVEL >= DBG_ERROR) Dbprintf("wupC1 error");
                 errormsg = MAGIC_WUPC;
                 break;
             }
@@ -1906,7 +1897,7 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain) {
             if (!is1b)  {
                 ReaderTransmit(wupC2, sizeof(wupC2), NULL);
                 if (!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
-                    if (MF_DBGLEVEL >= MF_DBG_INFO) Dbprintf("Assuming Magic Gen 1B tag. [wupC2 failed]");
+                    if (DBGLEVEL >= DBG_INFO) Dbprintf("Assuming Magic Gen 1B tag. [wupC2 failed]");
                     is1b = true;
                     continue;
                 }
@@ -1915,7 +1906,7 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain) {
 
         // read block
         if ((mifare_sendcmd_short(NULL, 0, ISO14443A_CMD_READBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL) != 18)) {
-            if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("read block send command error");
+            if (DBGLEVEL >= DBG_ERROR) Dbprintf("read block send command error");
             errormsg = 0;
             break;
         }
@@ -2040,22 +2031,22 @@ void MifareSetMod(uint8_t *datain) {
 
     while (true) {
         if (!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
-            if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
+            if (DBGLEVEL >= 1) Dbprintf("Can't select card");
             break;
         }
 
         if (mifare_classic_auth(pcs, cuid, 0, 0, ui64Key, AUTH_FIRST)) {
-            if (MF_DBGLEVEL >= 1) Dbprintf("Auth error");
+            if (DBGLEVEL >= 1) Dbprintf("Auth error");
             break;
         }
 
         if (((respLen = mifare_sendcmd_short(pcs, 1, 0x43, mod, receivedAnswer, receivedAnswerPar, NULL)) != 1) || (receivedAnswer[0] != 0x0a)) {
-            if (MF_DBGLEVEL >= 1) Dbprintf("SetMod error; response[0]: %hhX, len: %d", receivedAnswer[0], respLen);
+            if (DBGLEVEL >= 1) Dbprintf("SetMod error; response[0]: %hhX, len: %d", receivedAnswer[0], respLen);
             break;
         }
 
         if (mifare_classic_halt(pcs, cuid)) {
-            if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
+            if (DBGLEVEL >= 1) Dbprintf("Halt error");
             break;
         }
 
@@ -2088,18 +2079,18 @@ void Mifare_DES_Auth1(uint8_t arg0, uint8_t *datain) {
 
     int len = iso14443a_select_card(uid, NULL, &cuid, true, 0, false);
     if (!len) {
-        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card");
+        if (DBGLEVEL >= DBG_ERROR) Dbprintf("Can't select card");
         OnError(1);
         return;
     };
 
     if (mifare_desfire_des_auth1(cuid, dataout)) {
-        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication part1: Fail.");
+        if (DBGLEVEL >= DBG_ERROR) Dbprintf("Authentication part1: Fail.");
         OnError(4);
         return;
     }
 
-    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) DbpString("AUTH 1 FINISHED");
+    if (DBGLEVEL >= DBG_EXTENDED) DbpString("AUTH 1 FINISHED");
     reply_mix(CMD_ACK, 1, cuid, 0, dataout, sizeof(dataout));
 }
 
@@ -2114,12 +2105,12 @@ void Mifare_DES_Auth2(uint32_t arg0, uint8_t *datain) {
     isOK = mifare_desfire_des_auth2(cuid, key, dataout);
 
     if (isOK) {
-        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Authentication part2: Failed");
+        if (DBGLEVEL >= DBG_EXTENDED) Dbprintf("Authentication part2: Failed");
         OnError(4);
         return;
     }
 
-    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) DbpString("AUTH 2 FINISHED");
+    if (DBGLEVEL >= DBG_EXTENDED) DbpString("AUTH 2 FINISHED");
 
     reply_old(CMD_ACK, isOK, 0, 0, dataout, sizeof(dataout));
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
diff --git a/armsrc/mifaredesfire.c b/armsrc/mifaredesfire.c
index c152bcb9f..9cfb0492f 100644
--- a/armsrc/mifaredesfire.c
+++ b/armsrc/mifaredesfire.c
@@ -24,7 +24,7 @@ bool InitDesfireCard() {
     set_tracing(true);
 
     if (!iso14443a_select_card(NULL, &card, NULL, true, 0, false)) {
-        if (MF_DBGLEVEL >= MF_DBG_ERROR) DbpString("Can't select card");
+        if (DBGLEVEL >= DBG_ERROR) DbpString("Can't select card");
         OnError(1);
         return false;
     }
@@ -52,7 +52,7 @@ void MifareSendCommand(uint8_t arg0, uint8_t arg1, uint8_t *datain) {
     uint8_t resp[RECEIVE_SIZE];
     memset(resp, 0, sizeof(resp));
 
-    if (MF_DBGLEVEL >= 4) {
+    if (DBGLEVEL >= 4) {
         Dbprintf(" flags : %02X", flags);
         Dbprintf(" len   : %02X", datalen);
         print_result(" RX    : ", datain, datalen);
@@ -67,7 +67,7 @@ void MifareSendCommand(uint8_t arg0, uint8_t arg1, uint8_t *datain) {
     }
 
     int len = DesfireAPDU(datain, datalen, resp);
-    if (MF_DBGLEVEL >= 4)
+    if (DBGLEVEL >= 4)
         print_result("ERR <--: ", resp, len);
 
     if (!len) {
@@ -106,13 +106,13 @@ void MifareDesfireGetInformation() {
 
     // card select - information
     if (!iso14443a_select_card(NULL, &card, NULL, true, 0, false)) {
-        if (MF_DBGLEVEL >= MF_DBG_ERROR) DbpString("Can't select card");
+        if (DBGLEVEL >= DBG_ERROR) DbpString("Can't select card");
         OnError(1);
         return;
     }
 
     if (card.uidlen != 7) {
-        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Wrong UID size. Expected 7byte got %d", card.uidlen);
+        if (DBGLEVEL >= DBG_ERROR) Dbprintf("Wrong UID size. Expected 7byte got %d", card.uidlen);
         OnError(2);
         return;
     }
@@ -236,7 +236,7 @@ void MifareDES_Auth1(uint8_t arg0, uint8_t arg1, uint8_t arg2,  uint8_t *datain)
             cmd[1] = arg2;  //keynumber
             len = DesfireAPDU(cmd, 2, resp);
             if (!len) {
-                if (MF_DBGLEVEL >= MF_DBG_ERROR) {
+                if (DBGLEVEL >= DBG_ERROR) {
                     DbpString("Authentication failed. Card timeout.");
                 }
                 OnError(3);
@@ -288,7 +288,7 @@ void MifareDES_Auth1(uint8_t arg0, uint8_t arg1, uint8_t arg2,  uint8_t *datain)
 
             len = DesfireAPDU(cmd, 17, resp);
             if (!len) {
-                if (MF_DBGLEVEL >= MF_DBG_ERROR) {
+                if (DBGLEVEL >= DBG_ERROR) {
                     DbpString("Authentication failed. Card timeout.");
                 }
                 OnError(3);
@@ -438,7 +438,7 @@ void MifareDES_Auth1(uint8_t arg0, uint8_t arg1, uint8_t arg2,  uint8_t *datain)
 
             AesCtx ctx;
             if (AesCtxIni(&ctx, IV, key->data, KEY128, CBC) < 0) {
-                if (MF_DBGLEVEL >= 4) {
+                if (DBGLEVEL >= 4) {
                     DbpString("AES context failed to init");
                 }
                 OnError(7);
@@ -449,7 +449,7 @@ void MifareDES_Auth1(uint8_t arg0, uint8_t arg1, uint8_t arg2,  uint8_t *datain)
             cmd[1] = 0x00;  //keynumber
             len = DesfireAPDU(cmd, 2, resp);
             if (!len) {
-                if (MF_DBGLEVEL >= MF_DBG_ERROR) {
+                if (DBGLEVEL >= DBG_ERROR) {
                     DbpString("Authentication failed. Card timeout.");
                 }
                 OnError(3);
@@ -470,7 +470,7 @@ void MifareDES_Auth1(uint8_t arg0, uint8_t arg1, uint8_t arg2,  uint8_t *datain)
 
             len = DesfireAPDU(cmd, 33, resp);  // 1 + 32 == 33
             if (!len) {
-                if (MF_DBGLEVEL >= MF_DBG_ERROR) {
+                if (DBGLEVEL >= DBG_ERROR) {
                     DbpString("Authentication failed. Card timeout.");
                 }
                 OnError(3);
@@ -511,14 +511,14 @@ int DesfireAPDU(uint8_t *cmd, size_t cmd_len, uint8_t *dataout) {
 
     wrappedLen = CreateAPDU(cmd, cmd_len, wCmd);
 
-    if (MF_DBGLEVEL >= 4)
+    if (DBGLEVEL >= 4)
         print_result("WCMD <--: ", wCmd, wrappedLen);
 
     ReaderTransmit(wCmd, wrappedLen, NULL);
 
     len = ReaderReceive(resp, par);
     if (!len) {
-        if (MF_DBGLEVEL >= 4) Dbprintf("fukked");
+        if (DBGLEVEL >= 4) Dbprintf("fukked");
         return false; //DATA LINK ERROR
     }
     // if we received an I- or R(ACK)-Block with a block number equal to the
diff --git a/armsrc/mifaresim.c b/armsrc/mifaresim.c
index 8ad397ac3..5d83277fc 100644
--- a/armsrc/mifaresim.c
+++ b/armsrc/mifaresim.c
@@ -11,11 +11,11 @@
 //-----------------------------------------------------------------------------
 
 // Verbose Mode:
-// MF_DBG_NONE          0
-// MF_DBG_ERROR         1
-// MF_DBG_INFO          2
-// MF_DBG_DEBUG         3
-// MF_DBG_EXTENDED      4
+// DBG_NONE          0
+// DBG_ERROR         1
+// DBG_INFO          2
+// DBG_DEBUG         3
+// DBG_EXTENDED      4
 
 //  /!\ Printing Debug message is disrupting emulation,
 //  Only use with caution during debugging
@@ -42,30 +42,30 @@ static bool IsTrailerAccessAllowed(uint8_t blockNo, uint8_t keytype, uint8_t act
                  | ((sector_trailer[8] >> 7) & 0x01);
     switch (action) {
         case AC_KEYA_READ: {
-            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("IsTrailerAccessAllowed: AC_KEYA_READ");
+            if (DBGLEVEL >= DBG_EXTENDED)	Dbprintf("IsTrailerAccessAllowed: AC_KEYA_READ");
             return false;
         }
         case AC_KEYA_WRITE: {
-            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("IsTrailerAccessAllowed: AC_KEYA_WRITE");
+            if (DBGLEVEL >= DBG_EXTENDED)	Dbprintf("IsTrailerAccessAllowed: AC_KEYA_WRITE");
             return ((keytype == AUTHKEYA && (AC == 0x00 || AC == 0x01))
                     || (keytype == AUTHKEYB && (AC == 0x04 || AC == 0x03)));
         }
         case AC_KEYB_READ: {
-            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("IsTrailerAccessAllowed: AC_KEYB_READ");
+            if (DBGLEVEL >= DBG_EXTENDED)	Dbprintf("IsTrailerAccessAllowed: AC_KEYB_READ");
             return (keytype == AUTHKEYA && (AC == 0x00 || AC == 0x02 || AC == 0x01));
         }
         case AC_KEYB_WRITE: {
-            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("IsTrailerAccessAllowed: AC_KEYB_WRITE");
+            if (DBGLEVEL >= DBG_EXTENDED)	Dbprintf("IsTrailerAccessAllowed: AC_KEYB_WRITE");
             return ((keytype == AUTHKEYA && (AC == 0x00 || AC == 0x04))
                     || (keytype == AUTHKEYB && (AC == 0x04 || AC == 0x03)));
         }
         case AC_AC_READ: {
-            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("IsTrailerAccessAllowed: AC_AC_READ");
+            if (DBGLEVEL >= DBG_EXTENDED)	Dbprintf("IsTrailerAccessAllowed: AC_AC_READ");
             return ((keytype == AUTHKEYA)
                     || (keytype == AUTHKEYB && !(AC == 0x00 || AC == 0x02 || AC == 0x01)));
         }
         case AC_AC_WRITE: {
-            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("IsTrailerAccessAllowed: AC_AC_WRITE");
+            if (DBGLEVEL >= DBG_EXTENDED)	Dbprintf("IsTrailerAccessAllowed: AC_AC_WRITE");
             return ((keytype == AUTHKEYA && (AC == 0x01))
                     || (keytype == AUTHKEYB && (AC == 0x03 || AC == 0x05)));
         }
@@ -93,46 +93,46 @@ static bool IsDataAccessAllowed(uint8_t blockNo, uint8_t keytype, uint8_t action
             AC = ((sector_trailer[7] >> 2) & 0x04)
                  | ((sector_trailer[8] << 1) & 0x02)
                  | ((sector_trailer[8] >> 4) & 0x01);
-            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("IsDataAccessAllowed: case 0x00 - %02x", AC);
+            if (DBGLEVEL >= DBG_EXTENDED)	Dbprintf("IsDataAccessAllowed: case 0x00 - %02x", AC);
             break;
         }
         case 0x01: {
             AC = ((sector_trailer[7] >> 3) & 0x04)
                  | ((sector_trailer[8] >> 0) & 0x02)
                  | ((sector_trailer[8] >> 5) & 0x01);
-            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("IsDataAccessAllowed: case 0x01 - %02x", AC);
+            if (DBGLEVEL >= DBG_EXTENDED)	Dbprintf("IsDataAccessAllowed: case 0x01 - %02x", AC);
             break;
         }
         case 0x02: {
             AC = ((sector_trailer[7] >> 4) & 0x04)
                  | ((sector_trailer[8] >> 1) & 0x02)
                  | ((sector_trailer[8] >> 6) & 0x01);
-            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("IsDataAccessAllowed: case 0x02  - %02x", AC);
+            if (DBGLEVEL >= DBG_EXTENDED)	Dbprintf("IsDataAccessAllowed: case 0x02  - %02x", AC);
             break;
         }
         default:
-            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("IsDataAccessAllowed: Error");
+            if (DBGLEVEL >= DBG_EXTENDED)	Dbprintf("IsDataAccessAllowed: Error");
             return false;
     }
 
     switch (action) {
         case AC_DATA_READ: {
-            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("IsDataAccessAllowed - AC_DATA_READ: OK");
+            if (DBGLEVEL >= DBG_EXTENDED)	Dbprintf("IsDataAccessAllowed - AC_DATA_READ: OK");
             return ((keytype == AUTHKEYA && !(AC == 0x03 || AC == 0x05 || AC == 0x07))
                     || (keytype == AUTHKEYB && !(AC == 0x07)));
         }
         case AC_DATA_WRITE: {
-            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("IsDataAccessAllowed - AC_DATA_WRITE: OK");
+            if (DBGLEVEL >= DBG_EXTENDED)	Dbprintf("IsDataAccessAllowed - AC_DATA_WRITE: OK");
             return ((keytype == AUTHKEYA && (AC == 0x00))
                     || (keytype == AUTHKEYB && (AC == 0x00 || AC == 0x04 || AC == 0x06 || AC == 0x03)));
         }
         case AC_DATA_INC: {
-            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("IsDataAccessAllowed - AC_DATA_INC: OK");
+            if (DBGLEVEL >= DBG_EXTENDED)	Dbprintf("IsDataAccessAllowed - AC_DATA_INC: OK");
             return ((keytype == AUTHKEYA && (AC == 0x00))
                     || (keytype == AUTHKEYB && (AC == 0x00 || AC == 0x06)));
         }
         case AC_DATA_DEC_TRANS_REST: {
-            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("AC_DATA_DEC_TRANS_REST: OK");
+            if (DBGLEVEL >= DBG_EXTENDED)	Dbprintf("AC_DATA_DEC_TRANS_REST: OK");
             return ((keytype == AUTHKEYA && (AC == 0x00 || AC == 0x06 || AC == 0x01))
                     || (keytype == AUTHKEYB && (AC == 0x00 || AC == 0x06 || AC == 0x01)));
         }
@@ -257,14 +257,14 @@ static bool MifareSimInit(uint16_t flags, uint8_t *datain, tag_response_info_t *
     if ((flags & FLAG_4B_UID_IN_DATA) == FLAG_4B_UID_IN_DATA) { 	// get UID from datain
         memcpy(rUIDBCC1, datain, 4);
         *uid_len = 4;
-        if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("MifareSimInit - FLAG_4B_UID_IN_DATA => Get UID from datain: %02X - Flag: %02X - UIDBCC1: %02X", FLAG_4B_UID_IN_DATA, flags, rUIDBCC1);
+        if (DBGLEVEL >= DBG_EXTENDED)	Dbprintf("MifareSimInit - FLAG_4B_UID_IN_DATA => Get UID from datain: %02X - Flag: %02X - UIDBCC1: %02X", FLAG_4B_UID_IN_DATA, flags, rUIDBCC1);
 
 
         // save CUID
         *cuid = bytes_to_num(rUIDBCC1, 4);
         // BCC
         rUIDBCC1[4] = rUIDBCC1[0] ^ rUIDBCC1[1] ^ rUIDBCC1[2] ^ rUIDBCC1[3];
-        if (MF_DBGLEVEL >= MF_DBG_NONE)	{
+        if (DBGLEVEL >= DBG_NONE)	{
             Dbprintf("4B UID: %02x%02x%02x%02x", rUIDBCC1[0], rUIDBCC1[1], rUIDBCC1[2], rUIDBCC1[3]);
         }
 
@@ -275,7 +275,7 @@ static bool MifareSimInit(uint16_t flags, uint8_t *datain, tag_response_info_t *
         memcpy(&rUIDBCC1[1], datain, 3);
         memcpy(rUIDBCC2, datain + 3, 4);
         *uid_len = 7;
-        if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("MifareSimInit - FLAG_7B_UID_IN_DATA => Get UID from datain: %02X - Flag: %02X - UIDBCC1: %02X", FLAG_7B_UID_IN_DATA, flags, rUIDBCC1);
+        if (DBGLEVEL >= DBG_EXTENDED)	Dbprintf("MifareSimInit - FLAG_7B_UID_IN_DATA => Get UID from datain: %02X - Flag: %02X - UIDBCC1: %02X", FLAG_7B_UID_IN_DATA, flags, rUIDBCC1);
 
         // save CUID
         *cuid = bytes_to_num(rUIDBCC2, 4);
@@ -284,7 +284,7 @@ static bool MifareSimInit(uint16_t flags, uint8_t *datain, tag_response_info_t *
         // BCC
         rUIDBCC1[4] = rUIDBCC1[0] ^ rUIDBCC1[1] ^ rUIDBCC1[2] ^ rUIDBCC1[3];
         rUIDBCC2[4] = rUIDBCC2[0] ^ rUIDBCC2[1] ^ rUIDBCC2[2] ^ rUIDBCC2[3];
-        if (MF_DBGLEVEL >= MF_DBG_NONE)	{
+        if (DBGLEVEL >= DBG_NONE)	{
             Dbprintf("7B UID: %02x %02x %02x %02x %02x %02x %02x",
                      rUIDBCC1[1], rUIDBCC1[2], rUIDBCC1[3], rUIDBCC2[0], rUIDBCC2[1], rUIDBCC2[2], rUIDBCC2[3]);
         }
@@ -297,7 +297,7 @@ static bool MifareSimInit(uint16_t flags, uint8_t *datain, tag_response_info_t *
         memcpy(&rUIDBCC2[1], datain + 3, 3);
         memcpy(rUIDBCC3,    datain + 6, 4);
         *uid_len = 10;
-        if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("MifareSimInit - FLAG_10B_UID_IN_DATA => Get UID from datain: %02X - Flag: %02X - UIDBCC1: %02X", FLAG_10B_UID_IN_DATA, flags, rUIDBCC1);
+        if (DBGLEVEL >= DBG_EXTENDED)	Dbprintf("MifareSimInit - FLAG_10B_UID_IN_DATA => Get UID from datain: %02X - Flag: %02X - UIDBCC1: %02X", FLAG_10B_UID_IN_DATA, flags, rUIDBCC1);
 
         // save CUID
         *cuid = bytes_to_num(rUIDBCC3, 4);
@@ -309,7 +309,7 @@ static bool MifareSimInit(uint16_t flags, uint8_t *datain, tag_response_info_t *
         rUIDBCC2[4] = rUIDBCC2[0] ^ rUIDBCC2[1] ^ rUIDBCC2[2] ^ rUIDBCC2[3];
         rUIDBCC3[4] = rUIDBCC3[0] ^ rUIDBCC3[1] ^ rUIDBCC3[2] ^ rUIDBCC3[3];
 
-        if (MF_DBGLEVEL >= MF_DBG_NONE)	{
+        if (DBGLEVEL >= DBG_NONE)	{
             Dbprintf("10B UID: %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x",
                      rUIDBCC1[1], rUIDBCC1[2], rUIDBCC1[3],
                      rUIDBCC2[1], rUIDBCC2[2], rUIDBCC2[3],
@@ -522,18 +522,18 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t *datain) {
         if (res == 2) { //Field is off!
             LEDsoff();
             cardSTATE = MFEMUL_NOFIELD;
-            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("cardSTATE = MFEMUL_NOFIELD");
+            if (DBGLEVEL >= DBG_EXTENDED)	Dbprintf("cardSTATE = MFEMUL_NOFIELD");
             continue;
         } else if (res == 1) { // button pressed
             button_pushed = true;
-            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("Button pressed");
+            if (DBGLEVEL >= DBG_EXTENDED)	Dbprintf("Button pressed");
             break;
         }
 
         // WUPA in HALTED state or REQA or WUPA in any other state
         if (receivedCmd_len == 1 && ((receivedCmd[0] == ISO14443A_CMD_REQA && cardSTATE != MFEMUL_HALTED) || receivedCmd[0] == ISO14443A_CMD_WUPA)) {
             selTimer = GetTickCount();
-            if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("EmSendPrecompiledCmd(&responses[ATQA]);");
+            if (DBGLEVEL >= DBG_EXTENDED)	Dbprintf("EmSendPrecompiledCmd(&responses[ATQA]);");
             EmSendPrecompiledCmd(&responses[ATQA]);
 
             // init crypto block
@@ -552,12 +552,12 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t *datain) {
 
         switch (cardSTATE) {
             case MFEMUL_NOFIELD:
-                if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("MFEMUL_NOFIELD");
+                if (DBGLEVEL >= DBG_EXTENDED)	Dbprintf("MFEMUL_NOFIELD");
             case MFEMUL_HALTED:
-                if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("MFEMUL_HALTED");
+                if (DBGLEVEL >= DBG_EXTENDED)	Dbprintf("MFEMUL_HALTED");
             case MFEMUL_IDLE: {
                 LogTrace(uart->output, uart->len, uart->startTime * 16 - DELAY_AIR2ARM_AS_TAG, uart->endTime * 16 - DELAY_AIR2ARM_AS_TAG, uart->parity, true);
-                if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("MFEMUL_IDLE");
+                if (DBGLEVEL >= DBG_EXTENDED)	Dbprintf("MFEMUL_IDLE");
                 break;
             }
 
@@ -591,14 +591,14 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t *datain) {
                 if (uid_index < 0) {
                     LogTrace(uart->output, uart->len, uart->startTime * 16 - DELAY_AIR2ARM_AS_TAG, uart->endTime * 16 - DELAY_AIR2ARM_AS_TAG, uart->parity, true);
                     cardSTATE_TO_IDLE();
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_SELECT] Incorrect cascade level received");
+                    if (DBGLEVEL >= DBG_EXTENDED) Dbprintf("[MFEMUL_SELECT] Incorrect cascade level received");
                     break;
                 }
 
                 // Incoming SELECT ALL for any cascade level
                 if (receivedCmd_len == 2 && receivedCmd[1] == 0x20) {
                     EmSendPrecompiledCmd(&responses[uid_index]);
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("SELECT ALL - EmSendPrecompiledCmd(%02x)", &responses[uid_index]);
+                    if (DBGLEVEL >= DBG_EXTENDED) Dbprintf("SELECT ALL - EmSendPrecompiledCmd(%02x)", &responses[uid_index]);
                     break;
                 }
 
@@ -609,17 +609,17 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t *datain) {
                                         (uid_len == 7  && uid_index == UIDBCC2) ||
                                         (uid_len == 10 && uid_index == UIDBCC3);
                         EmSendPrecompiledCmd(&responses[finished ? SAK : SAKuid]);
-                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("SELECT CLx %02x%02x%02x%02x received", receivedCmd[2], receivedCmd[3], receivedCmd[4], receivedCmd[5]);
+                        if (DBGLEVEL >= DBG_EXTENDED) Dbprintf("SELECT CLx %02x%02x%02x%02x received", receivedCmd[2], receivedCmd[3], receivedCmd[4], receivedCmd[5]);
                         if (finished) {
                             LED_B_ON();
                             cardSTATE = MFEMUL_WORK;
-                            if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_SELECT] cardSTATE = MFEMUL_WORK");
+                            if (DBGLEVEL >= DBG_EXTENDED) Dbprintf("[MFEMUL_SELECT] cardSTATE = MFEMUL_WORK");
                         }
                     } else {
                         // IDLE, not our UID
                         LogTrace(uart->output, uart->len, uart->startTime * 16 - DELAY_AIR2ARM_AS_TAG, uart->endTime * 16 - DELAY_AIR2ARM_AS_TAG, uart->parity, true);
                         cardSTATE_TO_IDLE();
-                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_SELECT] cardSTATE = MFEMUL_IDLE");
+                        if (DBGLEVEL >= DBG_EXTENDED) Dbprintf("[MFEMUL_SELECT] cardSTATE = MFEMUL_IDLE");
                     }
                     break;
                 }
@@ -630,12 +630,12 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t *datain) {
                     if (memcmp(&receivedCmd[2], responses[uid_index].response, receivedCmd_len - 2) == 0) {
                         // response missing part of UID via relative array index
                         EmSendPrecompiledCmd(&responses[uid_index + receivedCmd_len - 2]);
-                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("SELECT ANTICOLLISION - EmSendPrecompiledCmd(%02x)", &responses[uid_index]);
+                        if (DBGLEVEL >= DBG_EXTENDED) Dbprintf("SELECT ANTICOLLISION - EmSendPrecompiledCmd(%02x)", &responses[uid_index]);
                     } else {
                         // IDLE, not our UID or split-byte frame anti-collision (not supports)
                         LogTrace(uart->output, uart->len, uart->startTime * 16 - DELAY_AIR2ARM_AS_TAG, uart->endTime * 16 - DELAY_AIR2ARM_AS_TAG, uart->parity, true);
                         cardSTATE_TO_IDLE();
-                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_SELECT] cardSTATE = MFEMUL_IDLE");
+                        if (DBGLEVEL >= DBG_EXTENDED) Dbprintf("[MFEMUL_SELECT] cardSTATE = MFEMUL_IDLE");
                     }
                     break;
                 }
@@ -643,17 +643,17 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t *datain) {
                 // Unknown selection procedure
                 LogTrace(uart->output, uart->len, uart->startTime * 16 - DELAY_AIR2ARM_AS_TAG, uart->endTime * 16 - DELAY_AIR2ARM_AS_TAG, uart->parity, true);
                 cardSTATE_TO_IDLE();
-                if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_SELECT] Unknown selection procedure");
+                if (DBGLEVEL >= DBG_EXTENDED) Dbprintf("[MFEMUL_SELECT] Unknown selection procedure");
                 break;
             }
 
             // WORK
             case MFEMUL_WORK: {
 
-                if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("[MFEMUL_WORK] Enter in case");
+                if (DBGLEVEL >= DBG_EXTENDED)	Dbprintf("[MFEMUL_WORK] Enter in case");
 
                 if (receivedCmd_len == 0) {
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] NO CMD received");
+                    if (DBGLEVEL >= DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] NO CMD received");
                     break;
                 }
 
@@ -661,7 +661,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t *datain) {
                 if (encrypted_data) {
                     // decrypt seqence
                     mf_crypto1_decryptEx(pcs, receivedCmd, receivedCmd_len, receivedCmd_dec);
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] Decrypt seqence");
+                    if (DBGLEVEL >= DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] Decrypt seqence");
                 } else {
                     // Data in clear
                     memcpy(receivedCmd_dec, receivedCmd, receivedCmd_len);
@@ -669,7 +669,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t *datain) {
 
                 if (!CheckCrc14A(receivedCmd_dec, receivedCmd_len)) { // all commands must have a valid CRC
                     EmSend4bit(encrypted_data ? mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA) : CARD_NACK_NA);
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] All commands must have a valid CRC %02X (%d)", receivedCmd_dec, receivedCmd_len);
+                    if (DBGLEVEL >= DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] All commands must have a valid CRC %02X (%d)", receivedCmd_dec, receivedCmd_len);
                     break;
                 }
 
@@ -683,7 +683,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t *datain) {
                     // if authenticating to a block that shouldn't exist - as long as we are not doing the reader attack
                     if (receivedCmd_dec[1] > MIFARE_4K_MAXBLOCK && !((flags & FLAG_NR_AR_ATTACK) == FLAG_NR_AR_ATTACK)) {
                         EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
-                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Reader tried to operate (0x%02x) on out of range block: %d (0x%02x), nacking", receivedCmd_dec[0], receivedCmd_dec[1], receivedCmd_dec[1]);
+                        if (DBGLEVEL >= DBG_EXTENDED) Dbprintf("Reader tried to operate (0x%02x) on out of range block: %d (0x%02x), nacking", receivedCmd_dec[0], receivedCmd_dec[1], receivedCmd_dec[1]);
                         break;
                     }
 
@@ -698,7 +698,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t *datain) {
                     // cardAUTHKEY: 61 => Auth use Key B
                     cardAUTHKEY = receivedCmd_dec[0] & 0x01;
 
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] KEY %c: %012" PRIx64, (cardAUTHKEY == 0) ? 'A' : 'B', emlGetKey(cardAUTHSC, cardAUTHKEY));
+                    if (DBGLEVEL >= DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] KEY %c: %012" PRIx64, (cardAUTHKEY == 0) ? 'A' : 'B', emlGetKey(cardAUTHSC, cardAUTHKEY));
 
                     // first authentication
                     crypto1_destroy(pcs);
@@ -712,7 +712,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t *datain) {
                         crypto1_word(pcs, cuid ^ nonce, 0);
                         // rAUTH_NT contains prepared nonce for authenticate
                         EmSendCmd(rAUTH_NT, sizeof(rAUTH_NT));
-                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] Reader authenticating for block %d (0x%02x) with key %c - nonce: %02X - ciud: %02X", receivedCmd_dec[1], receivedCmd_dec[1], (cardAUTHKEY == 0) ? 'A' : 'B', rAUTH_AT, cuid);
+                        if (DBGLEVEL >= DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] Reader authenticating for block %d (0x%02x) with key %c - nonce: %02X - ciud: %02X", receivedCmd_dec[1], receivedCmd_dec[1], (cardAUTHKEY == 0) ? 'A' : 'B', rAUTH_AT, cuid);
                     } else {
                         // nested authentication
                         /*
@@ -723,11 +723,11 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t *datain) {
                         // we need calculate parity bits for non-encrypted sequence
                         mf_crypto1_encryptEx(pcs, rAUTH_NT, rAUTH_NT_keystream, response, 4, response_par);
                         EmSendCmdPar(response, 4, response_par);
-                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] Reader doing nested authentication for block %d (0x%02x) with key %c", receivedCmd_dec[1], receivedCmd_dec[1], (cardAUTHKEY == 0) ? 'A' : 'B');
+                        if (DBGLEVEL >= DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] Reader doing nested authentication for block %d (0x%02x) with key %c", receivedCmd_dec[1], receivedCmd_dec[1], (cardAUTHKEY == 0) ? 'A' : 'B');
                     }
 
                     cardSTATE = MFEMUL_AUTH1;
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] cardSTATE = MFEMUL_AUTH1 - rAUTH_NT: %02X", rAUTH_NT);
+                    if (DBGLEVEL >= DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] cardSTATE = MFEMUL_AUTH1 - rAUTH_NT: %02X", rAUTH_NT);
                     break;
                 }
 
@@ -754,18 +754,18 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t *datain) {
                     // all other commands must be encrypted (authenticated)
                     if (!encrypted_data) {
                         EmSend4bit(CARD_NACK_NA);
-                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] Commands must be encrypted (authenticated)");
+                        if (DBGLEVEL >= DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] Commands must be encrypted (authenticated)");
                         break;
                     }
                     // Check if Block num is not too far
                     if (receivedCmd_dec[1] > MIFARE_4K_MAXBLOCK) {
                         EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
-                        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("[MFEMUL_WORK] Reader tried to operate (0x%02x) on out of range block: %d (0x%02x), nacking", receivedCmd_dec[0], receivedCmd_dec[1], receivedCmd_dec[1]);
+                        if (DBGLEVEL >= DBG_ERROR) Dbprintf("[MFEMUL_WORK] Reader tried to operate (0x%02x) on out of range block: %d (0x%02x), nacking", receivedCmd_dec[0], receivedCmd_dec[1], receivedCmd_dec[1]);
                         break;
                     }
                     if (MifareBlockToSector(receivedCmd_dec[1]) != cardAUTHSC) {
                         EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
-                        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("[MFEMUL_WORK] Reader tried to operate (0x%02x) on block (0x%02x) not authenticated for (0x%02x), nacking", receivedCmd_dec[0], receivedCmd_dec[1], cardAUTHSC);
+                        if (DBGLEVEL >= DBG_ERROR) Dbprintf("[MFEMUL_WORK] Reader tried to operate (0x%02x) on block (0x%02x) not authenticated for (0x%02x), nacking", receivedCmd_dec[0], receivedCmd_dec[1], cardAUTHSC);
                         break;
                     }
                 }
@@ -773,9 +773,9 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t *datain) {
                 // case MFEMUL_WORK => CMD READ block
                 if (receivedCmd_len == 4 && receivedCmd_dec[0] == ISO14443A_CMD_READBLOCK) {
                     blockNo = receivedCmd_dec[1];
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] Reader reading block %d (0x%02x)", blockNo, blockNo);
+                    if (DBGLEVEL >= DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] Reader reading block %d (0x%02x)", blockNo, blockNo);
                     emlGetMem(response, blockNo, 1);
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED)  {
+                    if (DBGLEVEL >= DBG_EXTENDED)  {
                         Dbprintf("[MFEMUL_WORK - ISO14443A_CMD_READBLOCK] Data Block[%d]: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", blockNo,
                                  response[0], response[1], response[2], response[3],  response[4],  response[5],  response[6],
                                  response[7], response[8], response[9], response[10], response[11], response[12], response[13],
@@ -801,26 +801,26 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t *datain) {
 
                         if (!IsAccessAllowed(blockNo, cardAUTHKEY, AC_KEYA_READ)) {
                             memset(response, 0x00, 6); 	// keyA can never be read
-                            if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK - IsSectorTrailer] keyA can never be read - block %d (0x%02x)", blockNo, blockNo);
+                            if (DBGLEVEL >= DBG_EXTENDED) Dbprintf("[MFEMUL_WORK - IsSectorTrailer] keyA can never be read - block %d (0x%02x)", blockNo, blockNo);
                         }
                         if (!IsAccessAllowed(blockNo, cardAUTHKEY, AC_KEYB_READ)) {
                             memset(response + 10, 0x00, 6); 	// keyB cannot be read
-                            if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK - IsSectorTrailer] keyB cannot be read - block %d (0x%02x)", blockNo, blockNo);
+                            if (DBGLEVEL >= DBG_EXTENDED) Dbprintf("[MFEMUL_WORK - IsSectorTrailer] keyB cannot be read - block %d (0x%02x)", blockNo, blockNo);
                         }
                         if (!IsAccessAllowed(blockNo, cardAUTHKEY, AC_AC_READ)) {
                             memset(response + 6, 0x00, 4); 	// AC bits cannot be read
-                            if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK - IsAccessAllowed] AC bits cannot be read - block %d (0x%02x)", blockNo, blockNo);
+                            if (DBGLEVEL >= DBG_EXTENDED) Dbprintf("[MFEMUL_WORK - IsAccessAllowed] AC bits cannot be read - block %d (0x%02x)", blockNo, blockNo);
                         }
                     } else {
                         if (!IsAccessAllowed(blockNo, cardAUTHKEY, AC_DATA_READ)) {
                             memset(response, 0x00, 16);		// datablock cannot be read
-                            if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK - IsAccessAllowed] Data block %d (0x%02x) cannot be read", blockNo, blockNo);
+                            if (DBGLEVEL >= DBG_EXTENDED) Dbprintf("[MFEMUL_WORK - IsAccessAllowed] Data block %d (0x%02x) cannot be read", blockNo, blockNo);
                         }
                     }
                     AddCrc14A(response, 16);
                     mf_crypto1_encrypt(pcs, response, MAX_MIFARE_FRAME_SIZE, response_par);
                     EmSendCmdPar(response, MAX_MIFARE_FRAME_SIZE, response_par);
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
+                    if (DBGLEVEL >= DBG_EXTENDED) {
                         Dbprintf("[MFEMUL_WORK - EmSendCmdPar] Data Block[%d]: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", blockNo,
                                  response[0], response[1], response[2], response[3],  response[4],  response[5],  response[6],
                                  response[7], response[8], response[9], response[10], response[11], response[12], response[13],
@@ -839,20 +839,20 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t *datain) {
                 // case MFEMUL_WORK => CMD WRITEBLOCK
                 if (receivedCmd_len == 4 && receivedCmd_dec[0] == ISO14443A_CMD_WRITEBLOCK) {
                     blockNo = receivedCmd_dec[1];
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] RECV 0xA0 write block %d (%02x)", blockNo, blockNo);
+                    if (DBGLEVEL >= DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] RECV 0xA0 write block %d (%02x)", blockNo, blockNo);
                     EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_ACK));
                     cardWRBL = blockNo;
                     cardSTATE = MFEMUL_WRITEBL2;
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] cardSTATE = MFEMUL_WRITEBL2");
+                    if (DBGLEVEL >= DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] cardSTATE = MFEMUL_WRITEBL2");
                     break;
                 }
 
                 // case MFEMUL_WORK => CMD INC/DEC/REST
                 if (receivedCmd_len == 4 && (receivedCmd_dec[0] == MIFARE_CMD_INC || receivedCmd_dec[0] == MIFARE_CMD_DEC || receivedCmd_dec[0] == MIFARE_CMD_RESTORE)) {
                     blockNo = receivedCmd_dec[1];
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] RECV 0x%02x inc(0xC1)/dec(0xC0)/restore(0xC2) block %d (%02x)", receivedCmd_dec[0], blockNo, blockNo);
+                    if (DBGLEVEL >= DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] RECV 0x%02x inc(0xC1)/dec(0xC0)/restore(0xC2) block %d (%02x)", receivedCmd_dec[0], blockNo, blockNo);
                     if (emlCheckValBl(blockNo)) {
-                        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("[MFEMUL_WORK] Reader tried to operate on block, but emlCheckValBl failed, nacking");
+                        if (DBGLEVEL >= DBG_ERROR) Dbprintf("[MFEMUL_WORK] Reader tried to operate on block, but emlCheckValBl failed, nacking");
                         EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
                         break;
                     }
@@ -862,19 +862,19 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t *datain) {
                     // INC
                     if (receivedCmd_dec[0] == MIFARE_CMD_INC) {
                         cardSTATE = MFEMUL_INTREG_INC;
-                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] cardSTATE = MFEMUL_INTREG_INC");
+                        if (DBGLEVEL >= DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] cardSTATE = MFEMUL_INTREG_INC");
                     }
 
                     // DEC
                     if (receivedCmd_dec[0] == MIFARE_CMD_DEC) {
                         cardSTATE = MFEMUL_INTREG_DEC;
-                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] cardSTATE = MFEMUL_INTREG_DEC");
+                        if (DBGLEVEL >= DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] cardSTATE = MFEMUL_INTREG_DEC");
                     }
 
                     // REST
                     if (receivedCmd_dec[0] == MIFARE_CMD_RESTORE) {
                         cardSTATE = MFEMUL_INTREG_REST;
-                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] cardSTATE = MFEMUL_INTREG_REST");
+                        if (DBGLEVEL >= DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] cardSTATE = MFEMUL_INTREG_REST");
                     }
                     break;
 
@@ -884,7 +884,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t *datain) {
                 // case MFEMUL_WORK => CMD TRANSFER
                 if (receivedCmd_len == 4 && receivedCmd_dec[0] == MIFARE_CMD_TRANSFER) {
                     blockNo = receivedCmd_dec[1];
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] RECV 0x%02x transfer block %d (%02x)", receivedCmd_dec[0], blockNo, blockNo);
+                    if (DBGLEVEL >= DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] RECV 0x%02x transfer block %d (%02x)", receivedCmd_dec[0], blockNo, blockNo);
                     if (emlSetValBl(cardINTREG, cardINTBLOCK, receivedCmd_dec[1]))
                         EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
                     else
@@ -899,7 +899,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t *datain) {
                     LED_C_OFF();
                     cardSTATE = MFEMUL_HALTED;
                     cardAUTHKEY = AUTHKEYNONE;
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("[MFEMUL_WORK] cardSTATE = MFEMUL_HALTED");
+                    if (DBGLEVEL >= DBG_EXTENDED)	Dbprintf("[MFEMUL_WORK] cardSTATE = MFEMUL_HALTED");
                     break;
                 }
 
@@ -912,10 +912,10 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t *datain) {
                             EmSendCmdPar(response, rats_len, response_par);
                         } else
                             EmSendCmd(rats, rats_len);
-                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("[MFEMUL_WORK] RCV RATS => ACK");
+                        if (DBGLEVEL >= DBG_EXTENDED)	Dbprintf("[MFEMUL_WORK] RCV RATS => ACK");
                     } else {
                         EmSend4bit(encrypted_data ? mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA) : CARD_NACK_NA);
-                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("[MFEMUL_WORK] RCV RATS => NACK");
+                        if (DBGLEVEL >= DBG_EXTENDED)	Dbprintf("[MFEMUL_WORK] RCV RATS => NACK");
                     }
                     break;
                 }
@@ -930,28 +930,28 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t *datain) {
                             EmSendCmdPar(response, receivedCmd_len, response_par);
                         } else
                             EmSendCmd(receivedCmd_dec, receivedCmd_len);
-                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("[MFEMUL_WORK] RCV NXP DESELECT => ACK");
+                        if (DBGLEVEL >= DBG_EXTENDED)	Dbprintf("[MFEMUL_WORK] RCV NXP DESELECT => ACK");
                     } else {
                         EmSend4bit(encrypted_data ? mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA) : CARD_NACK_NA);
-                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("[MFEMUL_WORK] RCV NXP DESELECT => NACK");
+                        if (DBGLEVEL >= DBG_EXTENDED)	Dbprintf("[MFEMUL_WORK] RCV NXP DESELECT => NACK");
                     }
                     break;
                 }
 
                 // case MFEMUL_WORK => command not allowed
-                if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("Received command not allowed, nacking");
+                if (DBGLEVEL >= DBG_EXTENDED)	Dbprintf("Received command not allowed, nacking");
                 EmSend4bit(encrypted_data ? mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA) : CARD_NACK_NA);
                 break;
             }
 
             // AUTH1
             case MFEMUL_AUTH1: {
-                if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("[MFEMUL_AUTH1] Enter case");
+                if (DBGLEVEL >= DBG_EXTENDED)	Dbprintf("[MFEMUL_AUTH1] Enter case");
 
                 if (receivedCmd_len != 8) {
                     cardSTATE_TO_IDLE();
                     LogTrace(uart->output, uart->len, uart->startTime * 16 - DELAY_AIR2ARM_AS_TAG, uart->endTime * 16 - DELAY_AIR2ARM_AS_TAG, uart->parity, true);
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("MFEMUL_AUTH1: receivedCmd_len != 8 (%d) => cardSTATE_TO_IDLE())", receivedCmd_len);
+                    if (DBGLEVEL >= DBG_EXTENDED)	Dbprintf("MFEMUL_AUTH1: receivedCmd_len != 8 (%d) => cardSTATE_TO_IDLE())", receivedCmd_len);
                     break;
                 }
 
@@ -1025,7 +1025,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t *datain) {
 
                 // test if auth KO
                 if (cardRr != prng_successor(nonce, 64)) {
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
+                    if (DBGLEVEL >= DBG_EXTENDED) {
                         Dbprintf("[MFEMUL_AUTH1] AUTH FAILED for sector %d with key %c. [nr=%08x  cardRr=%08x] [nt=%08x succ=%08x]"
                                  , cardAUTHSC
                                  , (cardAUTHKEY == 0) ? 'A' : 'B'
@@ -1046,7 +1046,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t *datain) {
                 mf_crypto1_encrypt(pcs, rAUTH_AT, 4, response_par);
                 EmSendCmdPar(rAUTH_AT, 4, response_par);
 
-                if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
+                if (DBGLEVEL >= DBG_EXTENDED) {
                     Dbprintf("[MFEMUL_AUTH1] AUTH COMPLETED for sector %d with key %c. time=%d",
                              cardAUTHSC,
                              cardAUTHKEY == 0 ? 'A' : 'B',
@@ -1055,7 +1055,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t *datain) {
                 }
                 LED_C_ON();
                 cardSTATE = MFEMUL_WORK;
-                if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_AUTH1] cardSTATE = MFEMUL_WORK");
+                if (DBGLEVEL >= DBG_EXTENDED) Dbprintf("[MFEMUL_AUTH1] cardSTATE = MFEMUL_WORK");
                 break;
             }
 
@@ -1083,12 +1083,12 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t *datain) {
                         emlSetMem(receivedCmd_dec, cardWRBL, 1);
                         EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_ACK));	// always ACK?
                         cardSTATE = MFEMUL_WORK;
-                        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WRITEBL2] cardSTATE = MFEMUL_WORK");
+                        if (DBGLEVEL >= DBG_EXTENDED) Dbprintf("[MFEMUL_WRITEBL2] cardSTATE = MFEMUL_WORK");
                         break;
                     }
                 }
                 cardSTATE_TO_IDLE();
-                if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WRITEBL2] cardSTATE = MFEMUL_IDLE");
+                if (DBGLEVEL >= DBG_EXTENDED) Dbprintf("[MFEMUL_WRITEBL2] cardSTATE = MFEMUL_IDLE");
                 LogTrace(uart->output, uart->len, uart->startTime * 16 - DELAY_AIR2ARM_AS_TAG, uart->endTime * 16 - DELAY_AIR2ARM_AS_TAG, uart->parity, true);
                 break;
             }
@@ -1106,7 +1106,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t *datain) {
                     cardINTREG = cardINTREG + ans;
 
                     cardSTATE = MFEMUL_WORK;
-                    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_INTREG_INC] cardSTATE = MFEMUL_WORK");
+                    if (DBGLEVEL >= DBG_EXTENDED) Dbprintf("[MFEMUL_INTREG_INC] cardSTATE = MFEMUL_WORK");
                     break;
                 }
             }
@@ -1125,7 +1125,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t *datain) {
                 LogTrace(uart->output, uart->len, uart->startTime * 16 - DELAY_AIR2ARM_AS_TAG, uart->endTime * 16 - DELAY_AIR2ARM_AS_TAG, uart->parity, true);
                 cardINTREG = cardINTREG - ans;
                 cardSTATE = MFEMUL_WORK;
-                if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_INTREG_DEC] cardSTATE = MFEMUL_WORK");
+                if (DBGLEVEL >= DBG_EXTENDED) Dbprintf("[MFEMUL_INTREG_DEC] cardSTATE = MFEMUL_WORK");
                 break;
             }
 
@@ -1139,7 +1139,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t *datain) {
                 }
                 LogTrace(uart->output, uart->len, uart->startTime * 16 - DELAY_AIR2ARM_AS_TAG, uart->endTime * 16 - DELAY_AIR2ARM_AS_TAG, uart->parity, true);
                 cardSTATE = MFEMUL_WORK;
-                if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_INTREG_REST] cardSTATE = MFEMUL_WORK");
+                if (DBGLEVEL >= DBG_EXTENDED) Dbprintf("[MFEMUL_INTREG_REST] cardSTATE = MFEMUL_WORK");
                 break;
             }
 
@@ -1151,7 +1151,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t *datain) {
 
 
     // NR AR ATTACK
-    if (((flags & FLAG_NR_AR_ATTACK) == FLAG_NR_AR_ATTACK) && (MF_DBGLEVEL >= MF_DBG_INFO)) {
+    if (((flags & FLAG_NR_AR_ATTACK) == FLAG_NR_AR_ATTACK) && (DBGLEVEL >= DBG_INFO)) {
         for (uint8_t	i = 0; i < ATTACK_KEY_COUNT; i++) {
             if (ar_nr_collected[i] == 2) {
                 Dbprintf("Collected two pairs of AR/NR which can be used to extract %s from reader for sector %d:", (i < ATTACK_KEY_COUNT / 2) ? "keyA" : "keyB", ar_nr_resp[i].sector);
@@ -1182,7 +1182,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t *datain) {
         }
     }
 
-    if (MF_DBGLEVEL >= MF_DBG_ERROR)	{
+    if (DBGLEVEL >= DBG_ERROR)	{
         Dbprintf("Emulator stopped. Tracing: %d  trace length: %d ", get_tracing(), BigBuf_get_traceLen());
     }
 
diff --git a/armsrc/mifaresniff.c b/armsrc/mifaresniff.c
index 790614c01..0c69c0381 100644
--- a/armsrc/mifaresniff.c
+++ b/armsrc/mifaresniff.c
@@ -76,7 +76,7 @@ void RAMFUNC SniffMifare(uint8_t param) {
     // Setup and start DMA.
     // set transfer address and number of bytes. Start transfer.
     if (!FpgaSetupSscDma(dmaBuf, DMA_BUFFER_SIZE)) {
-        if (MF_DBGLEVEL > 1) Dbprintf("[!] FpgaSetupSscDma failed. Exiting");
+        if (DBGLEVEL > 1) Dbprintf("[!] FpgaSetupSscDma failed. Exiting");
         return;
     }
 
diff --git a/armsrc/mifareutil.c b/armsrc/mifareutil.c
index 18c710733..6142198a5 100644
--- a/armsrc/mifareutil.c
+++ b/armsrc/mifareutil.c
@@ -9,7 +9,7 @@
 //-----------------------------------------------------------------------------
 #include "mifareutil.h"
 
-int MF_DBGLEVEL = MF_DBG_ERROR;
+int DBGLEVEL = DBG_ERROR;
 
 // crypto1 helpers
 void mf_crypto1_decryptEx(struct Crypto1State *pcs, uint8_t *data_in, int len, uint8_t *data_out) {
@@ -66,7 +66,7 @@ int mifare_sendcmd(uint8_t cmd, uint8_t *data, uint8_t data_size, uint8_t *answe
     ReaderTransmit(dcmd, sizeof(dcmd), timing);
     int len = ReaderReceive(answer, answer_parity);
     if (!len) {
-        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("%02X Cmd failed. Card timeout.", cmd);
+        if (DBGLEVEL >= DBG_ERROR) Dbprintf("%02X Cmd failed. Card timeout.", cmd);
         len = ReaderReceive(answer, answer_parity);
     }
     return len;
@@ -152,7 +152,7 @@ int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockN
     }
 
     // some statistic
-    if (!ntptr && (MF_DBGLEVEL >= MF_DBG_EXTENDED))
+    if (!ntptr && (DBGLEVEL >= DBG_EXTENDED))
         Dbprintf("auth uid: %08x | nr: %08x | nt: %08x", uid, nr, nt);
 
     // save Nt
@@ -182,14 +182,14 @@ int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockN
     // Receive 4 byte tag answer
     len = ReaderReceive(receivedAnswer, receivedAnswerPar);
     if (!len) {
-        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Authentication failed. Card timeout.");
+        if (DBGLEVEL >= DBG_EXTENDED) Dbprintf("Authentication failed. Card timeout.");
         return 2;
     }
 
     ntpp = prng_successor(nt, 32) ^ crypto1_word(pcs, 0, 0);
 
     if (ntpp != bytes_to_num(receivedAnswer, 4)) {
-        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Authentication failed. Error card response.");
+        if (DBGLEVEL >= DBG_EXTENDED) Dbprintf("Authentication failed. Error card response.");
         return 3;
     }
     return 0;
@@ -204,18 +204,18 @@ int mifare_classic_readblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blo
 
     len = mifare_sendcmd_short(pcs, 1, ISO14443A_CMD_READBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL);
     if (len == 1) {
-        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", receivedAnswer[0]);
+        if (DBGLEVEL >= DBG_ERROR) Dbprintf("Cmd Error: %02x", receivedAnswer[0]);
         return 1;
     }
     if (len != 18) {
-        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: wrong response len: %x  (expected 18)", len);
+        if (DBGLEVEL >= DBG_ERROR) Dbprintf("Cmd Error: wrong response len: %x  (expected 18)", len);
         return 2;
     }
 
     memcpy(bt, receivedAnswer + 16, 2);
     AddCrc14A(receivedAnswer, 16);
     if (bt[0] != receivedAnswer[16] || bt[1] != receivedAnswer[17]) {
-        if (MF_DBGLEVEL >= MF_DBG_INFO) Dbprintf("Cmd CRC response error.");
+        if (DBGLEVEL >= DBG_INFO) Dbprintf("Cmd CRC response error.");
         return 3;
     }
 
@@ -232,17 +232,17 @@ int mifare_ul_ev1_auth(uint8_t *keybytes, uint8_t *pack) {
     uint8_t key[4] = {0x00, 0x00, 0x00, 0x00};
     memcpy(key, keybytes, 4);
 
-    if (MF_DBGLEVEL >= MF_DBG_EXTENDED)
+    if (DBGLEVEL >= DBG_EXTENDED)
         Dbprintf("EV1 Auth : %02x%02x%02x%02x", key[0], key[1], key[2], key[3]);
 
     len = mifare_sendcmd(MIFARE_ULEV1_AUTH, key, sizeof(key), resp, respPar, NULL);
 
     if (len != 4) {
-        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x %u", resp[0], len);
+        if (DBGLEVEL >= DBG_ERROR) Dbprintf("Cmd Error: %02x %u", resp[0], len);
         return 0;
     }
 
-    if (MF_DBGLEVEL >= MF_DBG_EXTENDED)
+    if (DBGLEVEL >= DBG_EXTENDED)
         Dbprintf("Auth Resp: %02x%02x%02x%02x", resp[0], resp[1], resp[2], resp[3]);
 
     memcpy(pack, resp, 4);
@@ -267,7 +267,7 @@ int mifare_ultra_auth(uint8_t *keybytes) {
     // REQUEST AUTHENTICATION
     len = mifare_sendcmd_short(NULL, 1, MIFARE_ULC_AUTH_1, 0x00, resp, respPar, NULL);
     if (len != 11) {
-        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", resp[0]);
+        if (DBGLEVEL >= DBG_ERROR) Dbprintf("Cmd Error: %02x", resp[0]);
         return 0;
     }
 
@@ -280,7 +280,7 @@ int mifare_ultra_auth(uint8_t *keybytes) {
     memcpy(rnd_ab, random_a, 8);
     memcpy(rnd_ab + 8, random_b, 8);
 
-    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
+    if (DBGLEVEL >= DBG_EXTENDED) {
         Dbprintf("enc_B: %02x %02x %02x %02x %02x %02x %02x %02x",
                  enc_random_b[0], enc_random_b[1], enc_random_b[2], enc_random_b[3], enc_random_b[4], enc_random_b[5], enc_random_b[6], enc_random_b[7]);
 
@@ -299,7 +299,7 @@ int mifare_ultra_auth(uint8_t *keybytes) {
 
     len = mifare_sendcmd(MIFARE_ULC_AUTH_2, rnd_ab, sizeof(rnd_ab), resp, respPar, NULL);
     if (len != 11) {
-        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", resp[0]);
+        if (DBGLEVEL >= DBG_ERROR) Dbprintf("Cmd Error: %02x", resp[0]);
         return 0;
     }
 
@@ -310,11 +310,11 @@ int mifare_ultra_auth(uint8_t *keybytes) {
     // decrypt    out, in, length, key, iv
     tdes_2key_dec(resp_random_a, enc_resp, 8, key, enc_random_b);
     if (memcmp(resp_random_a, random_a, 8) != 0) {
-        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("failed authentication");
+        if (DBGLEVEL >= DBG_ERROR) Dbprintf("failed authentication");
         return 0;
     }
 
-    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
+    if (DBGLEVEL >= DBG_EXTENDED) {
         Dbprintf("e_AB: %02x %02x %02x %02x %02x %02x %02x %02x",
                  rnd_ab[0], rnd_ab[1], rnd_ab[2], rnd_ab[3],
                  rnd_ab[4], rnd_ab[5], rnd_ab[6], rnd_ab[7]);
@@ -342,18 +342,18 @@ int mifare_ultra_readblockEx(uint8_t blockNo, uint8_t *blockData) {
 
     len = mifare_sendcmd_short(NULL, 1, ISO14443A_CMD_READBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL);
     if (len == 1) {
-        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", receivedAnswer[0]);
+        if (DBGLEVEL >= DBG_ERROR) Dbprintf("Cmd Error: %02x", receivedAnswer[0]);
         return 1;
     }
     if (len != 18) {
-        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: card timeout. len: %x", len);
+        if (DBGLEVEL >= DBG_ERROR) Dbprintf("Cmd Error: card timeout. len: %x", len);
         return 2;
     }
 
     memcpy(bt, receivedAnswer + 16, 2);
     AddCrc14A(receivedAnswer, 16);
     if (bt[0] != receivedAnswer[16] || bt[1] != receivedAnswer[17]) {
-        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd CRC response error.");
+        if (DBGLEVEL >= DBG_ERROR) Dbprintf("Cmd CRC response error.");
         return 3;
     }
 
@@ -394,7 +394,7 @@ int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t bl
     len = mifare_sendcmd_short(pcs, 1, ISO14443A_CMD_WRITEBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL);
 
     if ((len != 1) || (receivedAnswer[0] != 0x0A)) {   //  0x0a - ACK
-        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", receivedAnswer[0]);
+        if (DBGLEVEL >= DBG_ERROR) Dbprintf("Cmd Error: %02x", receivedAnswer[0]);
         return 1;
     }
 
@@ -419,7 +419,7 @@ int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t bl
     res |= (crypto1_bit(pcs, 0, 0) ^ BIT(receivedAnswer[0], 3)) << 3;
 
     if ((len != 1) || (res != 0x0A)) {
-        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd send data2 Error: %02x", res);
+        if (DBGLEVEL >= DBG_ERROR) Dbprintf("Cmd send data2 Error: %02x", res);
         return 2;
     }
     return 0;
@@ -436,7 +436,7 @@ int mifare_ultra_writeblock_compat(uint8_t blockNo, uint8_t *blockData) {
     len = mifare_sendcmd_short(NULL, true, ISO14443A_CMD_WRITEBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL);
 
     if ((len != 1) || (receivedAnswer[0] != 0x0A)) {   //  0x0a - ACK
-        if (MF_DBGLEVEL >= MF_DBG_ERROR)
+        if (DBGLEVEL >= DBG_ERROR)
             Dbprintf("Cmd Addr Error: %02x", receivedAnswer[0]);
         return 1;
     }
@@ -449,7 +449,7 @@ int mifare_ultra_writeblock_compat(uint8_t blockNo, uint8_t *blockData) {
     len = ReaderReceive(receivedAnswer, receivedAnswerPar);
 
     if ((len != 1) || (receivedAnswer[0] != 0x0A)) {   //  0x0a - ACK
-        if (MF_DBGLEVEL >= MF_DBG_ERROR)
+        if (DBGLEVEL >= DBG_ERROR)
             Dbprintf("Cmd Data Error: %02x %d", receivedAnswer[0],len);
         return 2;
     }
@@ -469,7 +469,7 @@ int mifare_ultra_writeblock(uint8_t blockNo, uint8_t *blockData) {
     len = mifare_sendcmd(MIFARE_ULC_WRITE, block, sizeof(block), receivedAnswer, receivedAnswerPar, NULL);
 
     if (receivedAnswer[0] != 0x0A) {   //  0x0a - ACK
-        if (MF_DBGLEVEL >= MF_DBG_ERROR)
+        if (DBGLEVEL >= DBG_ERROR)
             Dbprintf("Cmd Send Error: %02x %d", receivedAnswer[0], len);
         return 1;
     }
@@ -479,7 +479,7 @@ int mifare_classic_halt_ex(struct Crypto1State *pcs) {
     uint8_t receivedAnswer[4] = {0x00, 0x00, 0x00, 0x00};
     uint16_t len = mifare_sendcmd_short(pcs, (pcs == NULL) ? CRYPT_NONE : CRYPT_ALL, ISO14443A_CMD_HALT, 0x00, receivedAnswer, NULL, NULL);
     if (len != 0) {
-        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("halt warning. response len: %x", len);
+        if (DBGLEVEL >= DBG_EXTENDED) Dbprintf("halt warning. response len: %x", len);
         return 1;
     }
     return 0;
@@ -493,7 +493,7 @@ int mifare_ultra_halt() {
     uint8_t receivedAnswer[4] = {0x00, 0x00, 0x00, 0x00};
     len = mifare_sendcmd_short(NULL, CRYPT_NONE, ISO14443A_CMD_HALT, 0x00, receivedAnswer, NULL, NULL);
     if (len != 0) {
-        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("halt warning. response len: %x", len);
+        if (DBGLEVEL >= DBG_EXTENDED) Dbprintf("halt warning. response len: %x", len);
         return 1;
     }
     return 0;
@@ -602,10 +602,10 @@ void emlClearMem(void) {
 
 uint8_t SectorTrailer(uint8_t blockNo) {
     if (blockNo <= MIFARE_2K_MAXBLOCK) {
-        if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("Sector Trailer for block %d : %d", blockNo, (blockNo | 0x03));
+        if (DBGLEVEL >= DBG_EXTENDED)	Dbprintf("Sector Trailer for block %d : %d", blockNo, (blockNo | 0x03));
         return (blockNo | 0x03);
     } else {
-        if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	Dbprintf("Sector Trailer for block %d : %d", blockNo, (blockNo | 0x0f));
+        if (DBGLEVEL >= DBG_EXTENDED)	Dbprintf("Sector Trailer for block %d : %d", blockNo, (blockNo | 0x0f));
         return (blockNo | 0x0f);
     }
 }
@@ -622,7 +622,7 @@ int mifare_sendcmd_special(struct Crypto1State *pcs, uint8_t crypted, uint8_t cm
     ReaderTransmit(dcmd, sizeof(dcmd), NULL);
     int len = ReaderReceive(answer, answer_parity);
     if (!len) {
-        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication failed. Card timeout.");
+        if (DBGLEVEL >= DBG_ERROR) Dbprintf("Authentication failed. Card timeout.");
         return 1;
     }
     return len;
@@ -637,7 +637,7 @@ int mifare_sendcmd_special2(struct Crypto1State *pcs, uint8_t crypted, uint8_t c
     ReaderTransmit(dcmd, sizeof(dcmd), NULL);
     int len = ReaderReceive(answer, answer_parity);
     if (!len) {
-        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication failed. Card timeout.");
+        if (DBGLEVEL >= DBG_ERROR) Dbprintf("Authentication failed. Card timeout.");
         return 1;
     }
     return len;
@@ -653,13 +653,13 @@ int mifare_desfire_des_auth1(uint32_t uid, uint8_t *blockData) {
 
     len = mifare_sendcmd_special(NULL, 1, 0x02, data, receivedAnswer, receivedAnswerPar, NULL);
     if (len == 1) {
-        if (MF_DBGLEVEL >= MF_DBG_ERROR)
+        if (DBGLEVEL >= DBG_ERROR)
             Dbprintf("Cmd Error: %02x", receivedAnswer[0]);
         return 1;
     }
 
     if (len == 12) {
-        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
+        if (DBGLEVEL >= DBG_EXTENDED) {
             Dbprintf("Auth1 Resp: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
                      receivedAnswer[0], receivedAnswer[1], receivedAnswer[2], receivedAnswer[3], receivedAnswer[4],
                      receivedAnswer[5], receivedAnswer[6], receivedAnswer[7], receivedAnswer[8], receivedAnswer[9],
@@ -683,13 +683,13 @@ int mifare_desfire_des_auth2(uint32_t uid, uint8_t *key, uint8_t *blockData) {
     len = mifare_sendcmd_special2(NULL, 1, 0x03, data, receivedAnswer, receivedAnswerPar, NULL);
 
     if ((receivedAnswer[0] == 0x03) && (receivedAnswer[1] == 0xae)) {
-        if (MF_DBGLEVEL >= MF_DBG_ERROR)
+        if (DBGLEVEL >= DBG_ERROR)
             Dbprintf("Auth Error: %02x %02x", receivedAnswer[0], receivedAnswer[1]);
         return 1;
     }
 
     if (len == 12) {
-        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
+        if (DBGLEVEL >= DBG_EXTENDED) {
             Dbprintf("Auth2 Resp: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
                      receivedAnswer[0], receivedAnswer[1], receivedAnswer[2], receivedAnswer[3], receivedAnswer[4],
                      receivedAnswer[5], receivedAnswer[6], receivedAnswer[7], receivedAnswer[8], receivedAnswer[9],
diff --git a/common/i2c.c b/common/i2c.c
index e4d3a4723..8a8b6693b 100644
--- a/common/i2c.c
+++ b/common/i2c.c
@@ -342,7 +342,7 @@ bool I2C_WriteCmd(uint8_t device_cmd, uint8_t device_address) {
 
     I2C_Stop();
     if (bBreak) {
-        if (MF_DBGLEVEL > 3) DbpString(I2C_ERROR);
+        if (DBGLEVEL > 3) DbpString(I2C_ERROR);
         return false;
     }
     return true;
@@ -372,7 +372,7 @@ bool I2C_WriteByte(uint8_t data, uint8_t device_cmd, uint8_t device_address) {
 
     I2C_Stop();
     if (bBreak) {
-        if (MF_DBGLEVEL > 3) DbpString(I2C_ERROR);
+        if (DBGLEVEL > 3) DbpString(I2C_ERROR);
         return false;
     }
     return true;
@@ -410,7 +410,7 @@ bool I2C_BufferWrite(uint8_t *data, uint8_t len, uint8_t device_cmd, uint8_t dev
 
     I2C_Stop();
     if (bBreak) {
-        if (MF_DBGLEVEL > 3) DbpString(I2C_ERROR);
+        if (DBGLEVEL > 3) DbpString(I2C_ERROR);
         return false;
     }
     return true;
@@ -453,7 +453,7 @@ int16_t I2C_BufferRead(uint8_t *data, uint8_t len, uint8_t device_cmd, uint8_t d
 
     if (bBreak) {
         I2C_Stop();
-        if (MF_DBGLEVEL > 3) DbpString(I2C_ERROR);
+        if (DBGLEVEL > 3) DbpString(I2C_ERROR);
         return 0;
     }
 
@@ -522,7 +522,7 @@ int16_t I2C_ReadFW(uint8_t *data, uint8_t len, uint8_t msb, uint8_t lsb, uint8_t
 
     if (bBreak) {
         I2C_Stop();
-        if (MF_DBGLEVEL > 3) DbpString(I2C_ERROR);
+        if (DBGLEVEL > 3) DbpString(I2C_ERROR);
         return 0;
     }
 
@@ -586,7 +586,7 @@ bool I2C_WriteFW(uint8_t *data, uint8_t len, uint8_t msb, uint8_t lsb, uint8_t d
 
     I2C_Stop();
     if (bBreak) {
-        if (MF_DBGLEVEL > 3) DbpString(I2C_ERROR);
+        if (DBGLEVEL > 3) DbpString(I2C_ERROR);
         return false;
     }
     return true;
@@ -684,7 +684,7 @@ bool GetATR(smart_card_atr_t *card_ptr) {
                 chksum ^= card_ptr->atr[i];
 
             if (chksum) {
-                if (MF_DBGLEVEL > 2) DbpString("Wrong ATR checksum");
+                if (DBGLEVEL > 2) DbpString("Wrong ATR checksum");
             }
         }
     }
@@ -740,7 +740,7 @@ void SmartCardRaw(uint64_t arg0, uint64_t arg1, uint8_t *data) {
         // asBytes = A0 A4 00 00 02
         // arg1 = len 5
         bool res = I2C_BufferWrite(data, arg1, ((flags & SC_RAW_T0) ? I2C_DEVICE_CMD_SEND_T0 : I2C_DEVICE_CMD_SEND), I2C_DEVICE_ADDRESS_MAIN);
-        if (!res && MF_DBGLEVEL > 3) DbpString(I2C_ERROR);
+        if (!res && DBGLEVEL > 3) DbpString(I2C_ERROR);
 
         // read bytes from module
         len = ISO7618_MAX_FRAME;
diff --git a/include/common.h b/include/common.h
index 682c8da94..ec17c256e 100644
--- a/include/common.h
+++ b/include/common.h
@@ -23,12 +23,12 @@ extern "C" {
 typedef unsigned char byte_t;
 
 // debug
-#define MF_DBG_NONE          0 // no messages
-#define MF_DBG_ERROR         1 // errors only
-#define MF_DBG_INFO          2 // errors + info messages
-#define MF_DBG_DEBUG         3 // errors + info + debug messages
-#define MF_DBG_EXTENDED      4 // errors + info + debug + breaking debug messages
-extern int MF_DBGLEVEL;
+#define DBG_NONE          0 // no messages
+#define DBG_ERROR         1 // errors only
+#define DBG_INFO          2 // errors + info messages
+#define DBG_DEBUG         3 // errors + info + debug messages
+#define DBG_EXTENDED      4 // errors + info + debug + breaking debug messages
+extern int DBGLEVEL;
 
 // Flashmem spi baudrate
 extern uint32_t FLASHMEM_SPIBAUDRATE;

From 1a39ec3026a0f185fa9228d38710221af775e376 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 6 Jun 2019 11:31:47 +0200
Subject: [PATCH 1903/1938] hf mf/mfu dbg => hw dbg

---
 armsrc/appmain.c            |  4 ++--
 client/cmdhfmf.c            | 28 ----------------------------
 client/cmdhfmfu.c           |  1 -
 client/cmdhw.c              | 29 +++++++++++++++++++++++++++++
 client/scripts/didump.lua   |  2 +-
 client/scripts/ntag_3d.lua  |  4 ++--
 client/scripts/tnp3dump.lua |  2 +-
 client/scripts/tnp3sim.lua  |  2 +-
 include/pm3_cmd.h           |  2 +-
 9 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 916801954..14a14c4dd 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1115,10 +1115,10 @@ static void PacketReceived(PacketCommandNG *packet) {
             break;
         }
         // emulator
-        case CMD_MIFARE_SET_DBGMODE:
+        case CMD_SET_DBGMODE:
             DBGLEVEL = packet->data.asBytes[0];
             Dbprintf("Debug level: %d", DBGLEVEL);
-            reply_ng(CMD_MIFARE_SET_DBGMODE, PM3_SUCCESS, NULL, 0);   
+            reply_ng(CMD_SET_DBGMODE, PM3_SUCCESS, NULL, 0);
             break;
         case CMD_MIFARE_EML_MEMCLR:
             MifareEMemClr();
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 172d58418..3aaa5187f 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -85,21 +85,6 @@ static int usage_hf14_mfsim(void) {
     PrintAndLogEx(NORMAL, "           hf mf sim u 11223344 i x");
     return 0;
 }
-static int usage_hf14_dbg(void) {
-    PrintAndLogEx(NORMAL, "Usage:  hf mf dbg [h] <debug level>");
-    PrintAndLogEx(NORMAL, "Options:");
-    PrintAndLogEx(NORMAL, "           h    this help");
-    PrintAndLogEx(NORMAL, "       <debug level>  (Optional) see list for valid levels");
-    PrintAndLogEx(NORMAL, "           0 - no debug messages");
-    PrintAndLogEx(NORMAL, "           1 - error messages");
-    PrintAndLogEx(NORMAL, "           2 - plus information messages");
-    PrintAndLogEx(NORMAL, "           3 - plus debug messages");
-    PrintAndLogEx(NORMAL, "           4 - print even debug messages in timing critical functions");
-    PrintAndLogEx(NORMAL, "               Note: this option therefore may cause malfunction itself");
-    PrintAndLogEx(NORMAL, "Examples:");
-    PrintAndLogEx(NORMAL, "           hf mf dbg 3");
-    return 0;
-}
 /*
  * static int usage_hf14_sniff(void) {
     PrintAndLogEx(NORMAL, "It continuously gets data from the field and saves it to: log, emulator, emulator file.");
@@ -2475,18 +2460,6 @@ static int CmdHF14AMfSniff(const char *Cmd) {
     return PM3_SUCCESS;
 }
 */
-int CmdHF14AMfDbg(const char *Cmd) {
-
-    char ctmp = tolower(param_getchar(Cmd, 0));
-    if (strlen(Cmd) < 1 || ctmp == 'h') return usage_hf14_dbg();
-
-    uint8_t dbgMode = param_get8ex(Cmd, 0, 0, 10);
-    if (dbgMode > 4) return usage_hf14_dbg();
-
-    SendCommandNG(CMD_MIFARE_SET_DBGMODE, &dbgMode, 1);
-    return PM3_SUCCESS;
-}
-
 static int CmdHF14AMfKeyBrute(const char *Cmd) {
 
     uint8_t blockNo = 0, keytype = 0;
@@ -3640,7 +3613,6 @@ static command_t CommandTable[] = {
     {"fchk",        CmdHF14AMfChk_fast,     IfPm3Iso14443a,  "Check keys fast, targets all keys on card"},
     {"decrypt",     CmdHf14AMfDecryptBytes, AlwaysAvailable, "[nt] [ar_enc] [at_enc] [data] - to decrypt sniff or trace"},
     {"-----------", CmdHelp,                IfPm3Iso14443a,  ""},
-    {"dbg",         CmdHF14AMfDbg,          IfPm3Iso14443a,  "Set default debug mode"},
     {"rdbl",        CmdHF14AMfRdBl,         IfPm3Iso14443a,  "Read MIFARE classic block"},
     {"rdsc",        CmdHF14AMfRdSc,         IfPm3Iso14443a,  "Read MIFARE classic sector"},
     {"dump",        CmdHF14AMfDump,         IfPm3Iso14443a,  "Dump MIFARE classic tag to binary file"},
diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index fc1c8da75..77624ee59 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -2706,7 +2706,6 @@ static int CmdHF14AMfUPwdGen(const char *Cmd) {
 //------------------------------------
 static command_t CommandTable[] = {
     {"help",    CmdHelp,                   AlwaysAvailable, "This help"},
-    {"dbg",     CmdHF14AMfDbg,             IfPm3Iso14443a,  "Set default debug mode"},
     {"info",    CmdHF14AMfUInfo,           IfPm3Iso14443a,  "Tag information"},
     {"dump",    CmdHF14AMfUDump,           IfPm3Iso14443a,  "Dump Ultralight / Ultralight-C / NTAG tag to binary file"},
     {"restore", CmdHF14AMfURestore,        IfPm3Iso14443a,  "Restore a dump onto a MFU MAGIC tag"},
diff --git a/client/cmdhw.c b/client/cmdhw.c
index e57899019..008bcfe2d 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -22,6 +22,22 @@
 
 static int CmdHelp(const char *Cmd);
 
+static int usage_dbg(void) {
+    PrintAndLogEx(NORMAL, "Usage:  hw dbg [h] <debug level>");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "           h    this help");
+    PrintAndLogEx(NORMAL, "       <debug level>  (Optional) see list for valid levels");
+    PrintAndLogEx(NORMAL, "           0 - no debug messages");
+    PrintAndLogEx(NORMAL, "           1 - error messages");
+    PrintAndLogEx(NORMAL, "           2 - plus information messages");
+    PrintAndLogEx(NORMAL, "           3 - plus debug messages");
+    PrintAndLogEx(NORMAL, "           4 - print even debug messages in timing critical functions");
+    PrintAndLogEx(NORMAL, "               Note: this option therefore may cause malfunction itself");
+    PrintAndLogEx(NORMAL, "Examples:");
+    PrintAndLogEx(NORMAL, "           hw dbg 3");
+    return 0;
+}
+
 static int usage_hw_detectreader(void) {
     PrintAndLogEx(NORMAL, "Start to detect presences of reader field");
     PrintAndLogEx(NORMAL, "press pm3 button to change modes and finally exit");
@@ -349,6 +365,18 @@ static void lookupChipID(uint32_t iChipID, uint32_t mem_used) {
     PrintAndLogEx(NORMAL, "  --= Nonvolatile Program Memory Type: %s", asBuff);
 }
 
+int CmdDbg(const char *Cmd) {
+
+    char ctmp = tolower(param_getchar(Cmd, 0));
+    if (strlen(Cmd) < 1 || ctmp == 'h') return usage_dbg();
+
+    uint8_t dbgMode = param_get8ex(Cmd, 0, 0, 10);
+    if (dbgMode > 4) return usage_dbg();
+
+    SendCommandNG(CMD_SET_DBGMODE, &dbgMode, 1);
+    return PM3_SUCCESS;
+}
+
 static int CmdDetectReader(const char *Cmd) {
     uint8_t arg = 0;
     char c = toupper(Cmd[0]);
@@ -552,6 +580,7 @@ static int CmdConnect(const char *Cmd) {
 
 static command_t CommandTable[] = {
     {"help",          CmdHelp,        AlwaysAvailable, "This help"},
+    {"dbg",           CmdDbg,         IfPm3Present,    "Set Proxmark3 debug level"},
     {"connect",       CmdConnect,     AlwaysAvailable, "connect Proxmark3 to serial port"},
     {"detectreader",  CmdDetectReader, IfPm3Present,    "['l'|'h'] -- Detect external reader field (option 'l' or 'h' to limit to LF or HF)"},
     {"fpgaoff",       CmdFPGAOff,     IfPm3Present,    "Set FPGA off"},
diff --git a/client/scripts/didump.lua b/client/scripts/didump.lua
index e85ec8bb9..b0cc964ee 100644
--- a/client/scripts/didump.lua
+++ b/client/scripts/didump.lua
@@ -551,7 +551,7 @@ local function selftest()
     print ('VALID KEY      :: 29564af75805')
 end
 local function setdevicedebug( status )
-    local c = 'hf mf dbg '
+    local c = 'hw dbg '
     if status then
         c = c..'1'
     else
diff --git a/client/scripts/ntag_3d.lua b/client/scripts/ntag_3d.lua
index e5b4205d8..ff2c68d0f 100644
--- a/client/scripts/ntag_3d.lua
+++ b/client/scripts/ntag_3d.lua
@@ -185,7 +185,7 @@ end
 local function write_tag(uid, t)
 
     print('Writing to tag')
-    core.console('hf mf dbg 0')
+    core.console('hw dbg 0')
     utils.Sleep(0.5)
 
     local cmd = ''
@@ -203,7 +203,7 @@ local function write_tag(uid, t)
     --dynamic
     core.console(('hf mfu wrbl b 40 d %s k %08X'):format(t[40], pwd))
 
-    core.console('hf mf dbg 1')
+    core.console('hw dbg 1')
     utils.Sleep(0.5)
     print('Done')
 end
diff --git a/client/scripts/tnp3dump.lua b/client/scripts/tnp3dump.lua
index 9e3c62519..00070eacc 100644
--- a/client/scripts/tnp3dump.lua
+++ b/client/scripts/tnp3dump.lua
@@ -128,7 +128,7 @@ local function main(args)
     end
 
     -- Turn off Debug
-    local cmdSetDbgOff = "hf mf dbg 0"
+    local cmdSetDbgOff = "hw dbg 0"
     core.console( cmdSetDbgOff)
     utils.Sleep(0.5)
 
diff --git a/client/scripts/tnp3sim.lua b/client/scripts/tnp3sim.lua
index 8e595363e..f1b58f95e 100644
--- a/client/scripts/tnp3sim.lua
+++ b/client/scripts/tnp3sim.lua
@@ -368,7 +368,7 @@ local function main(args)
     end
 
     -- Turn off Debug
-    local cmdSetDbgOff = 'hf mf dbg 0'
+    local cmdSetDbgOff = 'hw dbg 0'
     core.console( cmdSetDbgOff)
     utils.Sleep(0.5)
 
diff --git a/include/pm3_cmd.h b/include/pm3_cmd.h
index 9f05f71f3..b8c62dac7 100644
--- a/include/pm3_cmd.h
+++ b/include/pm3_cmd.h
@@ -234,6 +234,7 @@ typedef struct {
 #define CMD_DOWNLOADED_EML_BIGBUF                                         0x0111
 #define CMD_CAPABILITIES                                                  0x0112
 #define CMD_QUIT_SESSION                                                  0x0113
+#define CMD_SET_DBGMODE                                                   0x0114
 
 // RDV40, Flash memory operations
 #define CMD_FLASHMEM_READ                                                 0x0120
@@ -378,7 +379,6 @@ typedef struct {
 #define CMD_FPGA_MAJOR_MODE_OFF                                           0x0500
 
 // For mifare commands
-#define CMD_MIFARE_SET_DBGMODE                                            0x0600
 #define CMD_MIFARE_EML_MEMCLR                                             0x0601
 #define CMD_MIFARE_EML_MEMSET                                             0x0602
 #define CMD_MIFARE_EML_MEMGET                                             0x0603

From 7a06a77283c7890db29829b07b82a2efd2b85783 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Thu, 6 Jun 2019 11:34:33 +0200
Subject: [PATCH 1904/1938] text of data setdebugmode

---
 client/cmddata.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmddata.c b/client/cmddata.c
index caeca4d3e..9811d1b62 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -2141,7 +2141,7 @@ static command_t CommandTable[] = {
     {"save",            CmdSave,                 AlwaysAvailable, "<filename> -- Save trace (from graph window)"},
     {"setgraphmarkers", CmdSetGraphMarkers,      AlwaysAvailable, "[orange_marker] [blue_marker] (in graph window)"},
     {"scale",           CmdScale,                AlwaysAvailable, "<int> -- Set cursor display scale"},
-    {"setdebugmode",    CmdSetDebugMode,         AlwaysAvailable, "<0|1|2> -- Turn on or off Debugging Level for lf demods"},
+    {"setdebugmode",    CmdSetDebugMode,         AlwaysAvailable, "<0|1|2> -- Set Debugging Level on client side"},
     {"shiftgraphzero",  CmdGraphShiftZero,       AlwaysAvailable, "<shift> -- Shift 0 for Graphed wave + or - shift value"},
     {"dirthreshold",    CmdDirectionalThreshold, AlwaysAvailable, "<thres up> <thres down> -- Max rising higher up-thres/ Min falling lower down-thres, keep rest as prev."},
     {"tune",            CmdTuneSamples,          IfPm3Present,    "Get hw tune samples for graph window"},

From 0288b452d4c314058e5e25a1b89cd61780b4c6c4 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 6 Jun 2019 14:57:38 +0200
Subject: [PATCH 1905/1938] comment

---
 include/common.h | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/include/common.h b/include/common.h
index ec17c256e..186fddaaf 100644
--- a/include/common.h
+++ b/include/common.h
@@ -52,11 +52,12 @@ extern uint32_t FLASHMEM_SPIBAUDRATE;
 // RDV40 Section
 // 256kb divided into 4k sectors.
 //
-// last 4k sector = signature
-// second last 4k sector = settings
-// third last 4k sector = default MF keys dictionary
-// forth last 4k sector = default LF keys dictionary
-
+// 0x3F000 - 1 4kb sector = signature
+// 0x3E000 - 1 4kb sector = settings
+// 0x3D000 - 1 4kb sector = default T55XX keys dictionary
+// 0x3B000 - 1 4kb sector = default ICLASS keys dictionary
+// 0x39000 - 2 4kb sectors = default MFC keys dictionary
+// 
 #ifndef FLASH_MEM_BLOCK_SIZE
 # define FLASH_MEM_BLOCK_SIZE   256
 #endif

From ac6b0ec1ce7973a63b7f2dbc496e75d1e104f9ce Mon Sep 17 00:00:00 2001
From: Iceman <iceman@iuse.se>
Date: Fri, 7 Jun 2019 13:08:15 +0200
Subject: [PATCH 1906/1938] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a834463ad..eddeaa759 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ alt="Yuotube" width="100%" height="auto" border="10" /></a>
 |[Development](#development) | [Important notes on ModemManager for Linux users](/doc/md/Installation_Instructions/ModemManager-Must-Be-Discarded.md) | [Validating proxmark client functionality](/doc/md/Use_of_Proxmark/1_Validation.md) |
 |[Why didn't you base it on official PM3 Master?](#why-didnt-you-base-it-on-official-pm3-master)| [Homebrew (Mac OS X) & Upgrading HomeBrew Tap Formula](/doc/md/Installation_Instructions/Mac-OS-X-Homebrew-Installation-Instructions.md) | [First Use and Verification](/doc/md/Use_of_Proxmark/2_Configuration-and-Verification.md)|
 |[PM3 GUI](#pm3-gui)|[Setup and build for Windows](/doc/md/Installation_Instructions/Windows-Installation-Instructions.md)|[Commands & Features](/doc/md/Use_of_Proxmark/3_Commands-and-Features.md)|
-|[Issues](#issues)|[Blue shark](/doc/bt_manual_v10.md) ||
+|[Issues](#issues)|[Blue shark manual](/doc/bt_manual_v10.md) ||
 |[Donations](#Donations)|||
 
 ## What has changed?

From 732bc766f9a9a0ec1033b16111fbf263c1a50a21 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 7 Jun 2019 18:41:39 +0200
Subject: [PATCH 1907/1938] Reduce some var scopes

---
 armsrc/Standalone/hf_mattyrun.c |  4 +-
 armsrc/Standalone/hf_young.c    |  3 +-
 armsrc/appmain.c                |  3 +-
 armsrc/des.c                    |  4 +-
 armsrc/desfire_crypto.c         |  3 +-
 armsrc/epa.c                    |  9 ++--
 armsrc/hitag2.c                 |  6 +--
 armsrc/hitagS.c                 | 93 +++++++++++++++------------------
 armsrc/iso14443a.c              | 45 ++++++----------
 armsrc/iso14443b.c              | 38 ++++++--------
 armsrc/iso15693.c               |  6 +--
 armsrc/lfops.c                  | 22 ++++----
 armsrc/mifarecmd.c              | 19 ++++---
 armsrc/mifaredesfire.c          |  8 +--
 armsrc/mifaresniff.c            |  4 +-
 armsrc/optimized_cipher.c       | 12 ++---
 armsrc/printf.c                 |  6 +--
 armsrc/string.c                 |  6 +--
 bootrom/bootrom.c               |  3 +-
 client/cmdcrc.c                 | 22 ++++----
 client/cmddata.c                | 13 +++--
 client/cmdhf14a.c               |  7 ++-
 client/cmdhf14b.c               |  2 +-
 client/cmdhf15.c                |  7 ++-
 client/cmdhficlass.c            | 38 ++++++--------
 client/cmdhfmf.c                | 75 ++++++++++++--------------
 client/cmdhfmfhard.c            | 25 ++++-----
 client/cmdhfmfu.c               | 21 ++++----
 client/cmdlfem4x.c              |  3 +-
 client/cmdlfindala.c            | 25 +++++----
 client/cmdlfnedap.c             | 13 +++--
 client/cmdlfpresco.c            |  3 +-
 client/cmdlfpyramid.c           | 19 ++++---
 client/cmdlft55xx.c             |  3 +-
 client/comms.c                  |  6 +--
 client/emv/apduinfo.c           |  3 +-
 client/fido/cose.c              |  2 +-
 client/fpga_compress.c          | 14 ++---
 client/loclass/ikeys.c          | 23 ++++----
 client/mifare/mfkey.c           |  4 +-
 client/mifare/mifarehost.c      | 14 ++---
 client/pm3_binlib.c             |  3 +-
 client/scripting.c              |  4 +-
 client/ui.c                     |  6 +--
 common/bucketsort.c             |  3 +-
 common/crapto1/crapto1.c        | 28 +++++-----
 common/crc16.c                  | 18 +++----
 common/lfdemod.c                |  6 +--
 common/usart.c                  |  4 +-
 common/usb_cdc.c                |  3 +-
 tools/nonce2key/crapto1.c       |  4 +-
 tools/nonce2key/nonce2key.c     | 12 ++---
 52 files changed, 318 insertions(+), 409 deletions(-)

diff --git a/armsrc/Standalone/hf_mattyrun.c b/armsrc/Standalone/hf_mattyrun.c
index e7be77bd7..541bedf2e 100644
--- a/armsrc/Standalone/hf_mattyrun.c
+++ b/armsrc/Standalone/hf_mattyrun.c
@@ -223,7 +223,6 @@ void RunMod() {
     */
     bool printKeys = false;         // Prints keys
     bool transferToEml = true;      // Transfer keys to emulator memory
-    bool ecfill = true;             // Fill emulator memory with cards content.
     bool simulation = true;         // Simulates an exact copy of the target tag
     bool fillFromEmulator = false;  // Dump emulator memory.
 
@@ -236,7 +235,6 @@ void RunMod() {
     uint64_t key64;                 // Defines current key
     uint8_t *keyBlock;              // Where the keys will be held in memory.
     uint8_t stKeyBlock = 20;        // Set the quantity of keys in the block.
-    int filled;                     // Used to check if the memory was filled with success.
     bool keyFound = false;
 
     /*
@@ -368,7 +366,7 @@ void RunMod() {
         }
         Dbprintf("\t✓ Found keys have been transferred to the emulator memory.");
         if (ecfill) {
-
+            int filled;
             Dbprintf("\tFilling in with key A.");
             filled = MifareECardLoad(sectorsCnt, 0);
             if (filled != PM3_SUCCESS) {
diff --git a/armsrc/Standalone/hf_young.c b/armsrc/Standalone/hf_young.c
index 59d1750b9..6b56935bd 100644
--- a/armsrc/Standalone/hf_young.c
+++ b/armsrc/Standalone/hf_young.c
@@ -160,13 +160,14 @@ void RunMod() {
                             Bytes 5-7 are reserved SAK and ATQA for mifare classic
                     -Use mfCSetBlock(0, block0, oldUID, wantWipe, MAGIC_SINGLE) to write it
             */
-            uint8_t oldBlock0[16] = {0}, newBlock0[16] = {0}, testBlock0[16] = {0};
+            uint8_t oldBlock0[16] = {0}, newBlock0[16] = {0};
             // arg0 = Flags, arg1=blockNo
             MifareCGetBlock(params, 0, oldBlock0);
             if (oldBlock0[0] == 0 && oldBlock0[0] == oldBlock0[1]  && oldBlock0[1] == oldBlock0[2] && oldBlock0[2] == oldBlock0[3]) {
                 Dbprintf("No changeable tag detected. Returning to replay mode for bank[%d]", selected);
                 playing = 1;
             } else {
+                uint8_t testBlock0[16] = {0};
                 Dbprintf("UID from target tag: %02X%02X%02X%02X", oldBlock0[0], oldBlock0[1], oldBlock0[2], oldBlock0[3]);
                 memcpy(newBlock0 + 5, oldBlock0 + 5, 11);
 
diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 14a14c4dd..ef6ce30d2 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1465,7 +1465,6 @@ static void PacketReceived(PacketCommandNG *packet) {
         case CMD_DOWNLOAD_EML_BIGBUF: {
             LED_B_ON();
             uint8_t *mem = BigBuf_get_EM_addr();
-            size_t len = 0;
             uint32_t startidx = packet->oldarg[0];
             uint32_t numofbytes = packet->oldarg[1];
 
@@ -1474,7 +1473,7 @@ static void PacketReceived(PacketCommandNG *packet) {
             // arg2 = RFU
 
             for (size_t i = 0; i < numofbytes; i += PM3_CMD_DATA_SIZE) {
-                len = MIN((numofbytes - i), PM3_CMD_DATA_SIZE);
+                size_t len = MIN((numofbytes - i), PM3_CMD_DATA_SIZE);
                 int result = reply_old(CMD_DOWNLOADED_EML_BIGBUF, i, len, 0, mem + startidx + i, len);
                 if (result != PM3_SUCCESS)
                     Dbprintf("transfer to client failed ::  | bytes between %d - %d (%d) | result: %d", i, i + len, len, result);
diff --git a/armsrc/des.c b/armsrc/des.c
index 6229ac8f6..41b30734c 100644
--- a/armsrc/des.c
+++ b/armsrc/des.c
@@ -208,9 +208,9 @@ void permute(const uint8_t *ptable, const uint8_t *in, uint8_t *out) {
     ob = ptable[1];
     ptable = &(ptable[2]);
     for (byte = 0; byte < ob; ++byte) {
-        uint8_t x, t = 0;
+        uint8_t t = 0;
         for (bit = 0; bit < 8; ++bit) {
-            x = *ptable++ - 1;
+            uint8_t x = *ptable++ - 1;
             t <<= 1;
             if ((in[x / 8]) & (0x80 >> (x % 8))) {
                 t |= 0x01;
diff --git a/armsrc/desfire_crypto.c b/armsrc/desfire_crypto.c
index e29d46492..496f8ae31 100644
--- a/armsrc/desfire_crypto.c
+++ b/armsrc/desfire_crypto.c
@@ -288,7 +288,6 @@ void *mifare_cryto_preprocess_data(desfiretag_t tag, void *data, size_t *nbytes,
 
 void *mifare_cryto_postprocess_data(desfiretag_t tag, void *data, size_t *nbytes, int communication_settings) {
     void *res = data;
-    size_t edl;
     void *edata = NULL;
     uint8_t first_cmac_byte = 0x00;
 
@@ -322,7 +321,7 @@ void *mifare_cryto_postprocess_data(desfiretag_t tag, void *data, size_t *nbytes
                             break;
                         }
 
-                        edl = enciphered_data_length(tag, *nbytes - 1, communication_settings);
+                        size_t edl = enciphered_data_length(tag, *nbytes - 1, communication_settings);
                         edata = malloc(edl);
 
                         memcpy(edata, data, *nbytes - 1);
diff --git a/armsrc/epa.c b/armsrc/epa.c
index 7d994d756..fabeec6d2 100644
--- a/armsrc/epa.c
+++ b/armsrc/epa.c
@@ -496,19 +496,17 @@ void EPA_PACE_Replay(PacketCommandNG *c) {
 // Returns 0 on success or a non-zero error code on failure
 //-----------------------------------------------------------------------------
 int EPA_Setup() {
-    int return_code = 0;
     uint8_t uid[10];
-    uint8_t pps_response[3];
-    uint8_t pps_response_par[1];
     iso14a_card_select_t card_a_info;
-    iso14b_card_select_t card_b_info;
 
     // first, look for type A cards
     // power up the field
     iso14443a_setup(FPGA_HF_ISO14443A_READER_MOD);
     // select the card
-    return_code = iso14443a_select_card(uid, &card_a_info, NULL, true, 0, false);
+    int return_code = iso14443a_select_card(uid, &card_a_info, NULL, true, 0, false);
     if (return_code == 1) {
+        uint8_t pps_response[3];
+        uint8_t pps_response_par[1];
         // send the PPS request
         ReaderTransmit((uint8_t *)pps, sizeof(pps), NULL);
         return_code = ReaderReceive(pps_response, pps_response_par);
@@ -523,6 +521,7 @@ int EPA_Setup() {
     // if we're here, there is no type A card, so we look for type B
     // power up the field
     iso14443b_setup();
+    iso14b_card_select_t card_b_info;
     // select the card
     return_code = iso14443b_select_card(&card_b_info);
     if (return_code == 0) {
diff --git a/armsrc/hitag2.c b/armsrc/hitag2.c
index 4f3a1856d..70f6281dc 100644
--- a/armsrc/hitag2.c
+++ b/armsrc/hitag2.c
@@ -1366,9 +1366,7 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
     uint8_t *tx = txbuf;
     size_t txlen = 0;
     int lastbit;
-    bool bSkip;
     int reset_sof;
-    int tag_sof;
     int t_wait = HITAG_T_WAIT_MAX;
     bool bStop;
 
@@ -1515,8 +1513,8 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
         memset(rx, 0x00, sizeof(rx));
         rxlen = 0;
         lastbit = 1;
-        bSkip = true;
-        tag_sof = reset_sof;
+        bool bSkip = true;
+        int tag_sof = reset_sof;
         response = 0;
         uint32_t errorCount = 0;
 
diff --git a/armsrc/hitagS.c b/armsrc/hitagS.c
index 83263bbfd..8d00b881d 100644
--- a/armsrc/hitagS.c
+++ b/armsrc/hitagS.c
@@ -295,8 +295,6 @@ static int check_select(uint8_t *rx, uint32_t uid) {
 static void hitagS_handle_reader_command(uint8_t *rx, const size_t rxlen,
                                          uint8_t *tx, size_t *txlen) {
     uint8_t rx_air[HITAG_FRAME_LEN];
-    uint8_t page;
-    int i;
     uint64_t state;
     unsigned char crc;
 
@@ -330,7 +328,7 @@ static void hitagS_handle_reader_command(uint8_t *rx, const size_t rxlen,
             }
             //send uid as a response
             *txlen = 32;
-            for (i = 0; i < 4; i++)
+            for (int i = 0; i < 4; i++)
                 tx[i] = (tag.uid >> (24 - (i * 8))) & 0xff;
         }
         break;
@@ -357,13 +355,13 @@ static void hitagS_handle_reader_command(uint8_t *rx, const size_t rxlen,
                 }
 
                 //send configuration
-                for (i = 0; i < 4; i++)
+                for (int i = 0; i < 4; i++)
                     tx[i] = (tag.pages[0][1] >> (i * 8)) & 0xff;
                 tx[3] = 0xff;
                 if (tag.mode != HT_STANDARD) {
                     *txlen = 40;
                     crc = CRC_PRESET;
-                    for (i = 0; i < 4; i++)
+                    for (int i = 0; i < 4; i++)
                         calc_crc(&crc, tx[i], 8);
                     tx[4] = crc;
                 }
@@ -399,7 +397,7 @@ static void hitagS_handle_reader_command(uint8_t *rx, const size_t rxlen,
                     break;
             }
 
-            for (i = 0; i < 4; i++)
+            for (int i = 0; i < 4; i++)
                 _hitag2_byte(&state);
 
             //send con2, pwdh0, pwdl0, pwdl1 encrypted as a response
@@ -490,7 +488,7 @@ static void hitagS_handle_reader_command(uint8_t *rx, const size_t rxlen,
             //write page, write block, read page or read block command received
             if ((rx[0] & 0xf0) == 0xc0) { //read page
                 //send page data
-                page = ((rx[0] & 0x0f) * 16) + ((rx[1] & 0xf0) / 16);
+                uint8_t page = ((rx[0] & 0x0f) * 16) + ((rx[1] & 0xf0) / 16);
                 *txlen = 32;
                 tx[0] = (tag.pages[page / 4][page % 4]) & 0xff;
                 tx[1] = (tag.pages[page / 4][page % 4] >> 8) & 0xff;
@@ -520,7 +518,7 @@ static void hitagS_handle_reader_command(uint8_t *rx, const size_t rxlen,
                     //add crc8
                     *txlen = 40;
                     crc = CRC_PRESET;
-                    for (i = 0; i < 4; i++)
+                    for (int i = 0; i < 4; i++)
                         calc_crc(&crc, tx[i], 8);
                     tx[4] = crc;
                 }
@@ -531,10 +529,10 @@ static void hitagS_handle_reader_command(uint8_t *rx, const size_t rxlen,
                     *txlen = 0;
                 }
             } else if ((rx[0] & 0xf0) == 0xd0) { //read block
-                page = ((rx[0] & 0x0f) * 16) + ((rx[1] & 0xf0) / 16);
+                uint8_t page = ((rx[0] & 0x0f) * 16) + ((rx[1] & 0xf0) / 16);
                 *txlen = 32 * 4;
                 //send page,...,page+3 data
-                for (i = 0; i < 4; i++) {
+                for (int i = 0; i < 4; i++) {
                     tx[0 + i * 4] = (tag.pages[page / 4][page % 4]) & 0xff;
                     tx[1 + i * 4] = (tag.pages[page / 4][page % 4] >> 8) & 0xff;
                     tx[2 + i * 4] = (tag.pages[page / 4][page % 4] >> 16) & 0xff;
@@ -563,7 +561,7 @@ static void hitagS_handle_reader_command(uint8_t *rx, const size_t rxlen,
                     //add crc8
                     *txlen = 32 * 4 + 8;
                     crc = CRC_PRESET;
-                    for (i = 0; i < 16; i++)
+                    for (int i = 0; i < 16; i++)
                         calc_crc(&crc, tx[i], 8);
                     tx[16] = crc;
                 }
@@ -573,7 +571,7 @@ static void hitagS_handle_reader_command(uint8_t *rx, const size_t rxlen,
                     *txlen = 0;
                 }
             } else if ((rx[0] & 0xf0) == 0x80) { //write page
-                page = ((rx[0] & 0x0f) * 16) + ((rx[1] & 0xf0) / 16);
+                uint8_t page = ((rx[0] & 0x0f) * 16) + ((rx[1] & 0xf0) / 16);
 
                 switch (tag.mode) {
                     case HT_STANDARD:
@@ -604,7 +602,7 @@ static void hitagS_handle_reader_command(uint8_t *rx, const size_t rxlen,
                 }
 
             } else if ((rx[0] & 0xf0) == 0x90) { //write block
-                page = ((rx[0] & 0x0f) * 6) + ((rx[1] & 0xf0) / 16);
+                uint8_t page = ((rx[0] & 0x0f) * 6) + ((rx[1] & 0xf0) / 16);
                 switch (tag.mode) {
                     case HT_STANDARD:
                         sof_bits = 1;
@@ -647,10 +645,8 @@ static void hitagS_handle_reader_command(uint8_t *rx, const size_t rxlen,
 static int hitagS_handle_tag_auth(hitag_function htf, uint64_t key, uint64_t NrAr, uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t *txlen) {
     uint8_t rx_air[HITAG_FRAME_LEN];
     int response_bit[200];
-    int i, j, z;
     unsigned char mask = 1;
     unsigned char uid[32];
-    uint8_t uid1, uid2, uid3, uid4;
     unsigned char crc;
     uint64_t state;
     uint8_t auth_ks[4];
@@ -664,9 +660,9 @@ static int hitagS_handle_tag_auth(hitag_function htf, uint64_t key, uint64_t NrA
             Dbprintf("authentication failed!");
             return -1;
         }
-        z = 0;
-        for (i = 0; i < 10; i++) {
-            for (j = 0; j < 8; j++) {
+        int z = 0;
+        for (int i = 0; i < 10; i++) {
+            for (int j = 0; j < 8; j++) {
                 response_bit[z] = 0;
                 if ((rx[i] & ((mask << 7) >> j)) != 0)
                     response_bit[z] = 1;
@@ -674,13 +670,13 @@ static int hitagS_handle_tag_auth(hitag_function htf, uint64_t key, uint64_t NrA
             }
         }
         uint16_t k = 0;
-        for (i = 5; i < z; i += 2) {
+        for (int i = 5; i < z; i += 2) {
             uid[k] = response_bit[i];
             k++;
             if (k > 31)
                 break;
         }
-        uid1 = (uid[0] << 7)
+        uint8_t uid1 = (uid[0] << 7)
                | (uid[1] << 6)
                | (uid[2] << 5)
                | (uid[3] << 4)
@@ -689,7 +685,7 @@ static int hitagS_handle_tag_auth(hitag_function htf, uint64_t key, uint64_t NrA
                | (uid[6] << 1)
                | uid[7];
 
-        uid2 = (uid[8] << 7)
+        uint8_t uid2 = (uid[8] << 7)
                | (uid[9] << 6)
                | (uid[10] << 5)
                | (uid[11] << 4)
@@ -698,7 +694,7 @@ static int hitagS_handle_tag_auth(hitag_function htf, uint64_t key, uint64_t NrA
                | (uid[14] << 1)
                | uid[15];
 
-        uid3 = (uid[16] << 7)
+        uint8_t uid3 = (uid[16] << 7)
                | (uid[17] << 6)
                | (uid[18] << 5)
                | (uid[19] << 4)
@@ -707,7 +703,7 @@ static int hitagS_handle_tag_auth(hitag_function htf, uint64_t key, uint64_t NrA
                | (uid[22] << 1)
                | uid[23];
 
-        uid4 = (uid[24] << 7)
+        uint8_t uid4 = (uid[24] << 7)
                | (uid[25] << 6)
                | (uid[26] << 5)
                | (uid[27] << 4)
@@ -730,19 +726,19 @@ static int hitagS_handle_tag_auth(hitag_function htf, uint64_t key, uint64_t NrA
         calc_crc(&crc, uid3, 8);
         calc_crc(&crc, uid4, 8);
 
-        for (i = 0; i < 100; i++) {
+        for (int i = 0; i < 100; i++) {
             response_bit[i] = 0;
         }
 
-        for (i = 0; i < 5; i++) {
+        for (int i = 0; i < 5; i++) {
             response_bit[i] = 0;
         }
-
-        for (i = 5; i < 37; i++) {
+        int i = 5;
+        for (; i < 37; i++) {
             response_bit[i] = uid[i - 5];
         }
 
-        for (j = 0; j < 8; j++) {
+        for (int j = 0; j < 8; j++) {
             response_bit[i] = 0;
             if ((crc & ((mask << 7) >> j)) != 0)
                 response_bit[i] = 1;
@@ -750,7 +746,7 @@ static int hitagS_handle_tag_auth(hitag_function htf, uint64_t key, uint64_t NrA
         }
 
         k = 0;
-        for (i = 0; i < 6; i++) {
+        for (int i = 0; i < 6; i++) {
             tx[i] = (response_bit[k] << 7)
                     | (response_bit[k + 1] << 6)
                     | (response_bit[k + 2] << 5)
@@ -766,9 +762,9 @@ static int hitagS_handle_tag_auth(hitag_function htf, uint64_t key, uint64_t NrA
         tag.pstate = HT_INIT;
     } else if (tag.pstate == HT_INIT && rxlen == 44) {
         // received configuration after select command
-        z = 0;
-        for (i = 0; i < 6; i++) {
-            for (j = 0; j < 8; j++) {
+        int z = 0;
+        for (int i = 0; i < 6; i++) {
+            for (int j = 0; j < 8; j++) {
                 response_bit[z] = 0;
                 if ((rx[i] & ((mask << 7) >> j)) != 0)
                     response_bit[z] = 1;
@@ -819,7 +815,7 @@ static int hitagS_handle_tag_auth(hitag_function htf, uint64_t key, uint64_t NrA
                 if (htf == 02 || htf == 04) { //RHTS_KEY //WHTS_KEY
                     state = _hitag2_init(REV64(key), REV32(tag.uid), REV32(rnd));
 
-                    for (i = 0; i < 4; i++) {
+                    for (int i = 0; i < 4; i++) {
                         auth_ks[i] = _hitag2_byte(&state) ^ 0xff;
                     }
                     *txlen = 64;
@@ -836,7 +832,7 @@ static int hitagS_handle_tag_auth(hitag_function htf, uint64_t key, uint64_t NrA
                         Dbprintf("%02X %02X %02X %02X %02X %02X %02X %02X", tx[0],
                                  tx[1], tx[2], tx[3], tx[4], tx[5], tx[6], tx[7]);
                 } else if (htf == 01 || htf == 03) { //RHTS_CHALLENGE //WHTS_CHALLENGE
-                    for (i = 0; i < 8; i++)
+                    for (int i = 0; i < 8; i++)
                         tx[i] = ((NrAr >> (56 - (i * 8))) & 0xff);
                 }
                 end = true;
@@ -869,7 +865,7 @@ static int hitagS_handle_tag_auth(hitag_function htf, uint64_t key, uint64_t NrA
         if (htf == 02 || htf == 04) { //RHTS_KEY //WHTS_KEY
             {
                 state = _hitag2_init(REV64(key), REV32(tag.uid), REV32(rnd));
-                for (i = 0; i < 5; i++)
+                for (int i = 0; i < 5; i++)
                     _hitag2_byte(&state);
 
                 pwdh0 = ((rx[1] & 0x0f) * 16 + ((rx[2] & 0xf0) / 16)) ^ _hitag2_byte(&state);
@@ -1133,9 +1129,7 @@ void ReadHitagS(hitag_function htf, hitag_data *htd) {
     uint8_t *tx = txbuf;
     size_t txlen = 0;
     int lastbit = 1;
-    bool bSkip;
     int reset_sof = 1;
-    int tag_sof;
     int t_wait = HITAG_T_WAIT_MAX;
     bool bStop = false;
     int sendNum = 0;
@@ -1369,8 +1363,8 @@ void ReadHitagS(hitag_function htf, hitag_data *htd) {
         memset(rx, 0x00, sizeof(rx));
         rxlen = 0;
         lastbit = 1;
-        bSkip = true;
-        tag_sof = reset_sof;
+        bool bSkip = true;
+        int tag_sof = reset_sof;
         response = 0;
 
         // Receive frame, watch for at most T0*EOF periods
@@ -1462,9 +1456,7 @@ void WritePageHitagS(hitag_function htf, hitag_data *htd, int page) {
     uint8_t *tx = txbuf;
     size_t txlen = 0;
     int lastbit;
-    bool bSkip;
     int reset_sof;
-    int tag_sof;
     int t_wait = HITAG_T_WAIT_MAX;
     bool bStop;
     unsigned char crc;
@@ -1659,8 +1651,8 @@ void WritePageHitagS(hitag_function htf, hitag_data *htd, int page) {
         memset(rx, 0x00, sizeof(rx));
         rxlen = 0;
         lastbit = 1;
-        bSkip = true;
-        tag_sof = reset_sof;
+        bool bSkip = true;
+        int tag_sof = reset_sof;
         response = 0;
         uint32_t errorCount = 0;
 
@@ -1754,12 +1746,11 @@ void check_challenges(bool file_given, uint8_t *data) {
     uint8_t rx[HITAG_FRAME_LEN];
     uint8_t unlocker[60][8];
     int u1 = 0;
-    size_t rxlen = 0, txlen = 0;
+    size_t rxlen = 0;
     uint8_t txbuf[HITAG_FRAME_LEN];
-    uint8_t *tx;
     int t_wait = HITAG_T_WAIT_MAX;
-    int lastbit, reset_sof, tag_sof, STATE = 0;;
-    bool bSkip, bStop;
+    int lastbit, reset_sof, STATE = 0;;
+    bool bStop;
     int response_bit[200];
     unsigned char mask = 1;
     unsigned char uid[32];
@@ -1837,8 +1828,8 @@ void check_challenges(bool file_given, uint8_t *data) {
             LogTrace(rx, nbytes(rxlen), response, 0, NULL, false);
         }
 
-        tx = txbuf;
-        txlen = 0;
+        uint8_t *tx = txbuf;
+        size_t txlen = 0;
         if (rxlen == 0) {
             if (STATE == 2)
                 // challenge failed
@@ -1968,8 +1959,8 @@ void check_challenges(bool file_given, uint8_t *data) {
         memset(rx, 0x00, sizeof(rx));
         rxlen = 0;
         lastbit = 1;
-        bSkip = true;
-        tag_sof = reset_sof;
+        bool bSkip = true;
+        int tag_sof = reset_sof;
         response = 0;
 
         // Receive frame, watch for at most T0*EOF periods
diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 330dc357e..6eeb6d966 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -1093,7 +1093,6 @@ void SimulateIso14443aTag(uint8_t tagType, uint8_t flags, uint8_t *data) {
 #define ORDER_EV1_COMP_WRITE 40
 #define ORDER_RATS           70
     int order = ORDER_NONE;
-    int lastorder;
 
     int retval = PM3_SUCCESS;
     
@@ -1101,7 +1100,6 @@ void SimulateIso14443aTag(uint8_t tagType, uint8_t flags, uint8_t *data) {
     int happened = 0;
     int happened2 = 0;
     int cmdsRecvd = 0;
-    tag_response_info_t *p_response;
 
     // compatible write block number
     uint8_t wrblock = 0;
@@ -1118,10 +1116,10 @@ void SimulateIso14443aTag(uint8_t tagType, uint8_t flags, uint8_t *data) {
             retval = PM3_EOPABORTED;
             break;
         }
-        p_response = NULL;
+        tag_response_info_t *p_response = NULL;
 
         // Okay, look at the command now.
-        lastorder = order;
+        int lastorder = order;
 
         //
         // we need to check "ordered" states before, because received data may be same to any command - is wrong!!!
@@ -1527,17 +1525,16 @@ void PrepareDelayedTransfer(uint16_t delay) {
     delay &= 0x07;
     if (!delay) return;
 
-    uint8_t bitmask = 0, bits_to_shift;
+    uint8_t bitmask = 0;
     uint8_t bits_shifted = 0;
-    uint16_t i = 0;
 
-    for (i = 0; i < delay; i++)
+    for (uint16_t i = 0; i < delay; i++)
         bitmask |= (0x01 << i);
 
     ToSend[ToSendMax++] = 0x00;
 
-    for (i = 0; i < ToSendMax; i++) {
-        bits_to_shift = ToSend[i] & bitmask;
+    for (uint16_t i = 0; i < ToSendMax; i++) {
+        uint8_t bits_to_shift = ToSend[i] & bitmask;
         ToSend[i] = ToSend[i] >> delay;
         ToSend[i] = ToSend[i] | (bits_shifted << (8 - delay));
         bits_shifted = bits_to_shift;
@@ -1600,9 +1597,7 @@ static void TransmitFor14443a(const uint8_t *cmd, uint16_t len, uint32_t *timing
 // Prepare reader command (in bits, support short frames) to send to FPGA
 //-----------------------------------------------------------------------------
 void CodeIso14443aBitsAsReaderPar(const uint8_t *cmd, uint16_t bits, const uint8_t *par) {
-    int i, j;
     int last = 0;
-    uint8_t b;
 
     ToSendReset();
 
@@ -1612,11 +1607,11 @@ void CodeIso14443aBitsAsReaderPar(const uint8_t *cmd, uint16_t bits, const uint8
 
     size_t bytecount = nbytes(bits);
     // Generate send structure for the data bits
-    for (i = 0; i < bytecount; i++) {
+    for (int i = 0; i < bytecount; i++) {
         // Get the current byte to send
-        b = cmd[i];
+        uint8_t b = cmd[i];
         size_t bitsleft = MIN((bits - (i * 8)), 8);
-
+        int j;
         for (j = 0; j < bitsleft; j++) {
             if (b & 1) {
                 // Sequence X
@@ -2078,25 +2073,22 @@ void iso14443a_antifuzz(uint32_t flags) {
 
 static void iso14a_set_ATS_times(uint8_t *ats) {
 
-    uint8_t tb1;
-    uint8_t fwi, sfgi;
-    uint32_t fwt, sfgt;
-
     if (ats[0] > 1) {                           // there is a format byte T0
         if ((ats[1] & 0x20) == 0x20) {          // there is an interface byte TB(1)
+            uint8_t tb1;
             if ((ats[1] & 0x10) == 0x10) {      // there is an interface byte TA(1) preceding TB(1)
                 tb1 = ats[3];
             } else {
                 tb1 = ats[2];
             }
-            fwi = (tb1 & 0xf0) >> 4;            // frame waiting time integer (FWI)
+            uint8_t fwi = (tb1 & 0xf0) >> 4;            // frame waiting time integer (FWI)
             if (fwi != 15) {
-                fwt = 256 * 16 * (1 << fwi);    // frame waiting time (FWT) in 1/fc
+                uint32_t fwt = 256 * 16 * (1 << fwi);    // frame waiting time (FWT) in 1/fc
                 iso14a_set_timeout(fwt / (8 * 16));
             }
-            sfgi = tb1 & 0x0f;                  // startup frame guard time integer (SFGI)
+            uint8_t sfgi = tb1 & 0x0f;                  // startup frame guard time integer (SFGI)
             if (sfgi != 0 && sfgi != 15) {
-                sfgt = 256 * 16 * (1 << sfgi);  // startup frame guard time (SFGT) in 1/fc
+                uint32_t sfgt = 256 * 16 * (1 << sfgi);  // startup frame guard time (SFGT) in 1/fc
                 NextTransferTime = MAX(NextTransferTime, Demod.endTime + (sfgt - DELAY_AIR2ARM_AS_READER - DELAY_ARM2AIR_AS_READER) / 16);
             }
         }
@@ -2144,7 +2136,6 @@ int iso14443a_select_card(uint8_t *uid_ptr, iso14a_card_select_t *p_card, uint32
 
     uint8_t sak = 0x04; // cascade uid
     int cascade_level = 0;
-    int len;
 
     if (p_card) {
         p_card->uidlen = 0;
@@ -2271,7 +2262,7 @@ int iso14443a_select_card(uint8_t *uid_ptr, iso14a_card_select_t *p_card, uint32
 
         AddCrc14A(rats, 2);
         ReaderTransmit(rats, sizeof(rats), NULL);
-        len = ReaderReceive(resp, resp_par);
+        int len = ReaderReceive(resp, resp_par);
 
         if (!len) return 0;
 
@@ -2639,7 +2630,6 @@ void ReaderMifare(bool first_try, uint8_t block, uint8_t keytype) {
     uint16_t sync_tries = 0;
 
     bool have_uid = false;
-    bool received_nack;
     uint8_t cascade_levels = 0;
 
     // static variables here, is re-used in the next call
@@ -2667,7 +2657,7 @@ void ReaderMifare(bool first_try, uint8_t block, uint8_t keytype) {
     uint16_t i;
     for (i = 0; true; ++i) {
 
-        received_nack = false;
+        bool received_nack = false;
 
         WDT_HIT();
 
@@ -2893,7 +2883,6 @@ void DetectNACKbug() {
     uint16_t sync_tries = 0;
     uint32_t sync_time = 0;
     bool have_uid = false;
-    bool received_nack;
 
     int32_t status = PM3_SUCCESS;
 
@@ -2912,7 +2901,7 @@ void DetectNACKbug() {
     uint16_t i;
     for (i = 1; true; ++i) {
 
-        received_nack = false;
+        bool received_nack = false;
 
         // Cards always leaks a NACK, no matter the parity
         if ((i == 10) && (num_nacks == i - 1)) {
diff --git a/armsrc/iso14443b.c b/armsrc/iso14443b.c
index 24c993f0b..241484d01 100644
--- a/armsrc/iso14443b.c
+++ b/armsrc/iso14443b.c
@@ -237,9 +237,6 @@ static void CodeIso14443bAsTag(const uint8_t *cmd, int len) {
     *
     */
 
-    int i, j;
-    uint8_t b;
-
     ToSendReset();
 
     // Transmit a burst of ones, as the initial thing that lets the
@@ -252,23 +249,23 @@ static void CodeIso14443bAsTag(const uint8_t *cmd, int len) {
 
     // Send SOF.
     // 10-11 ETU * 4times samples ZEROS
-    for (i = 0; i < 10; i++) { SEND4STUFFBIT(0); }
+    for (int i = 0; i < 10; i++) { SEND4STUFFBIT(0); }
     //for(i = 0; i < 10; i++) { ToSendStuffBit(0); }
 
     // 2-3 ETU * 4times samples ONES
-    for (i = 0; i < 3; i++)  { SEND4STUFFBIT(1); }
+    for (int i = 0; i < 3; i++)  { SEND4STUFFBIT(1); }
     //for(i = 0; i < 3; i++)  { ToSendStuffBit(1); }
 
     // data
-    for (i = 0; i < len; ++i) {
+    for (int i = 0; i < len; ++i) {
 
         // Start bit
         SEND4STUFFBIT(0);
         //ToSendStuffBit(0);
 
         // Data bits
-        b = cmd[i];
-        for (j = 0; j < 8; ++j) {
+        uint8_t b = cmd[i];
+        for (int j = 0; j < 8; ++j) {
             // if(b & 1) {
             // SEND4STUFFBIT(1);
             // //ToSendStuffBit(1);
@@ -292,11 +289,11 @@ static void CodeIso14443bAsTag(const uint8_t *cmd, int len) {
 
     // Send EOF.
     // 10-11 ETU * 4 sample rate = ZEROS
-    for (i = 0; i < 10; i++) { SEND4STUFFBIT(0); }
+    for (int i = 0; i < 10; i++) { SEND4STUFFBIT(0); }
     //for(i = 0; i < 10; i++) { ToSendStuffBit(0); }
 
     // why this?
-    for (i = 0; i < 40; i++) { SEND4STUFFBIT(1); }
+    for (int i = 0; i < 40; i++) { SEND4STUFFBIT(1); }
     //for(i = 0; i < 40; i++) { ToSendStuffBit(1); }
 
     // Convert from last byte pos to length
@@ -945,7 +942,7 @@ static RAMFUNC int Handle14443bTagSamplesDemod(int ci, int cq) {
  *  quiet: set to 'TRUE' to disable debug output
  */
 static void GetTagSamplesFor14443bDemod() {
-    bool gotFrame, finished = false;
+    bool finished = false;
 //    int lastRxCounter = ISO14443B_DMA_BUFFER_SIZE;
     uint32_t time_0 = 0, time_stop = 0;
 
@@ -991,7 +988,7 @@ static void GetTagSamplesFor14443bDemod() {
         }
 
         // https://github.com/Proxmark/proxmark3/issues/103
-        gotFrame =  Handle14443bTagSamplesDemod(ci, cq);
+        bool gotFrame =  Handle14443bTagSamplesDemod(ci, cq);
         time_stop = GetCountSspClk() - time_0;
 
         finished = (time_stop > iso14b_timeout || gotFrame);
@@ -1058,14 +1055,12 @@ static void CodeIso14443bAsReader(const uint8_t *cmd, int len) {
     *   QUESTION:  how long is a 1 or 0 in pulses in the xcorr_848 mode?
     *              1 "stuffbit" = 1ETU (9us)
     */
-    int i;
-    uint8_t b;
 
     ToSendReset();
 
     // Send SOF
     // 10-11 ETUs of ZERO
-    for (i = 0; i < 10; ++i) ToSendStuffBit(0);
+    for (int i = 0; i < 10; ++i) ToSendStuffBit(0);
 
     // 2-3 ETUs of ONE
     ToSendStuffBit(1);
@@ -1074,11 +1069,11 @@ static void CodeIso14443bAsReader(const uint8_t *cmd, int len) {
 
     // Sending cmd, LSB
     // from here we add BITS
-    for (i = 0; i < len; ++i) {
+    for (int i = 0; i < len; ++i) {
         // Start bit
         ToSendStuffBit(0);
         // Data bits
-        b = cmd[i];
+        uint8_t b = cmd[i];
         // if (  b & 1 )    ToSendStuffBit(1); else ToSendStuffBit(0);
         // if ( (b>>1) & 1) ToSendStuffBit(1); else ToSendStuffBit(0);
         // if ( (b>>2) & 1) ToSendStuffBit(1); else ToSendStuffBit(0);
@@ -1108,13 +1103,13 @@ static void CodeIso14443bAsReader(const uint8_t *cmd, int len) {
 
     // Send EOF
     // 10-11 ETUs of ZERO
-    for (i = 0; i < 10; ++i) ToSendStuffBit(0);
+    for (int i = 0; i < 10; ++i) ToSendStuffBit(0);
 
     // Transition time. TR0 - guard time
     // 8ETUS minum?
     // Per specification, Subcarrier must be stopped no later than 2 ETUs after EOF.
     // I'm guessing this is for the FPGA to be able to send all bits before we switch to listening mode
-    for (i = 0; i < 24 ; ++i) ToSendStuffBit(1);
+    for (int i = 0; i < 24 ; ++i) ToSendStuffBit(1);
 
     // TR1 - Synchronization time
     // Convert from last character reference to length
@@ -1462,7 +1457,6 @@ static void iso1444b_setup_sniff(void) {
 void RAMFUNC SniffIso14443b(void) {
 
     uint32_t time_0 = 0, time_start = 0, time_stop;
-    int ci, cq;
 
     // We won't start recording the frames that we acquire until we trigger;
     // a good trigger condition to get started is probably when we see a
@@ -1490,8 +1484,8 @@ void RAMFUNC SniffIso14443b(void) {
     while (!BUTTON_PRESS()) {
         WDT_HIT();
 
-        ci = data[0];
-        cq = data[1];
+        int ci = data[0];
+        int cq = data[1];
         data += 2;
 
         if (data >= dmaBuf + ISO14443B_DMA_BUFFER_SIZE) {
diff --git a/armsrc/iso15693.c b/armsrc/iso15693.c
index e42a35499..374b2be23 100644
--- a/armsrc/iso15693.c
+++ b/armsrc/iso15693.c
@@ -736,9 +736,9 @@ int SendDataTag(uint8_t *send, int sendlen, bool init, int speed, uint8_t *outda
 // Decodes a message from a tag and displays its metadata and content
 #define DBD15STATLEN 48
 void DbdecodeIso15693Answer(int len, uint8_t *d) {
-    char status[DBD15STATLEN + 1] = {0};
 
     if (len > 3) {
+        char status[DBD15STATLEN + 1] = {0};
         if (d[0] & (1 << 3))
             strncat(status, "ProtExt ", DBD15STATLEN - strlen(status));
         if (d[0] & 1) {
@@ -802,9 +802,6 @@ void DbdecodeIso15693Answer(int len, uint8_t *d) {
 void ReaderIso15693(uint32_t parameter) {
     int answerLen1 = 0;
     int tsamples = 0, wait = 0, elapsed = 0;
-
-    uint8_t uid[8] = {0, 0, 0, 0, 0, 0, 0, 0};
-
     // set up device/fpga
     Iso15693InitReader();
 
@@ -829,6 +826,7 @@ void ReaderIso15693(uint32_t parameter) {
 
     // we should do a better check than this
     if (answerLen1 >= 12) {
+        uint8_t uid[8];
         uid[0] = answer1[9]; // always E0
         uid[1] = answer1[8]; // IC Manufacturer code
         uid[2] = answer1[7];
diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index de4c412ca..5af13b76d 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -1151,24 +1151,20 @@ void CmdAWIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol)
         // w = wiegand parity
         // (26 bit format shown)
 
-        uint32_t fac = 0;
-        uint32_t cardnum = 0;
-        uint32_t code1 = 0;
-        uint32_t code2 = 0;
         uint8_t fmtLen = bytebits_to_byte(dest, 8);
         if (fmtLen == 26) {
-            fac = bytebits_to_byte(dest + 9, 8);
-            cardnum = bytebits_to_byte(dest + 17, 16);
-            code1 = bytebits_to_byte(dest + 8, fmtLen);
+            uint32_t fac = bytebits_to_byte(dest + 9, 8);
+            uint32_t cardnum = bytebits_to_byte(dest + 17, 16);
+            uint32_t code1 = bytebits_to_byte(dest + 8, fmtLen);
             Dbprintf("AWID Found - BitLength: %d, FC: %d, Card: %d - Wiegand: %x, Raw: %08x%08x%08x", fmtLen, fac, cardnum, code1, rawHi2, rawHi, rawLo);
         } else {
-            cardnum = bytebits_to_byte(dest + 8 + (fmtLen - 17), 16);
+            uint32_t cardnum = bytebits_to_byte(dest + 8 + (fmtLen - 17), 16);
             if (fmtLen > 32) {
-                code1 = bytebits_to_byte(dest + 8, fmtLen - 32);
-                code2 = bytebits_to_byte(dest + 8 + (fmtLen - 32), 32);
+                uint32_t code1 = bytebits_to_byte(dest + 8, fmtLen - 32);
+                uint32_t code2 = bytebits_to_byte(dest + 8 + (fmtLen - 32), 32);
                 Dbprintf("AWID Found - BitLength: %d -unknown BitLength- (%d) - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, cardnum, code1, code2, rawHi2, rawHi, rawLo);
             } else {
-                code1 = bytebits_to_byte(dest + 8, fmtLen);
+                uint32_t code1 = bytebits_to_byte(dest + 8, fmtLen);
                 Dbprintf("AWID Found - BitLength: %d -unknown BitLength- (%d) - Wiegand: %x, Raw: %08x%08x%08x", fmtLen, cardnum, code1, rawHi2, rawHi, rawLo);
             }
         }
@@ -1189,7 +1185,7 @@ void CmdEM410xdemod(int findone, uint32_t *high, uint64_t *low, int ledcontrol)
     uint8_t *dest = BigBuf_get_addr();
 
     size_t size, idx = 0;
-    int clk = 0, invert = 0, errCnt, maxErr = 20;
+    int clk = 0, invert = 0, maxErr = 20;
     uint32_t hi = 0;
     uint64_t lo = 0;
 
@@ -1207,7 +1203,7 @@ void CmdEM410xdemod(int findone, uint32_t *high, uint64_t *low, int ledcontrol)
         size  = BigBuf_max_traceLen();
         //askdemod and manchester decode
         if (size > 16385) size = 16385; //big enough to catch 2 sequences of largest format
-        errCnt = askdemod(dest, &size, &clk, &invert, maxErr, 0, 1);
+        int errCnt = askdemod(dest, &size, &clk, &invert, maxErr, 0, 1);
         WDT_HIT();
 
         if (errCnt > 50) continue;
diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index f7a710c0e..eee4fdb44 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -861,11 +861,10 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)
     ui64Key = bytes_to_num(datain, 6);
 
     // variables
-    uint16_t rtr, i, j, len;
-    uint16_t davg = 0;
+    uint16_t i, j, len;
     static uint16_t dmin, dmax;
     uint8_t uid[10] = {0x00};
-    uint32_t cuid = 0, nt1, nt2, nttmp, nttest, ks1;
+    uint32_t cuid = 0, nt1, nt2, nttest, ks1;
     uint8_t par[1] = {0x00};
     uint32_t target_nt[2] = {0x00}, target_ks[2] = {0x00};
 
@@ -893,15 +892,16 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)
     // statistics on nonce distance
     int16_t isOK = 0;
 #define NESTED_MAX_TRIES 12
-    uint16_t unsuccessfull_tries = 0;
     if (arg2) { // calibrate: for first call only. Otherwise reuse previous calibration
         LED_B_ON();
         WDT_HIT();
 
-        davg = dmax = 0;
+        uint16_t unsuccessfull_tries = 0;
+        uint16_t davg = 0;
+        dmax = 0;
         dmin = 2000;
         delta_time = 0;
-
+        uint16_t rtr;
         for (rtr = 0; rtr < 17; rtr++) {
 
             // Test if the action was cancelled
@@ -937,7 +937,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)
                 continue;
             };
 
-            nttmp = prng_successor(nt1, 100); //NXP Mifare is typical around 840,but for some unlicensed/compatible mifare card this can be 160
+            uint32_t nttmp = prng_successor(nt1, 100); //NXP Mifare is typical around 840,but for some unlicensed/compatible mifare card this can be 160
             for (i = 101; i < 1200; i++) {
                 nttmp = prng_successor(nttmp, 1);
                 if (nttmp == nt2) break;
@@ -1653,7 +1653,6 @@ void MifareEMemGet(uint8_t blockno, uint8_t blockcnt) {
 //
 //-----------------------------------------------------------------------------
 int MifareECardLoad(uint32_t arg0, uint32_t arg1) {
-    uint64_t ui64Key;
     uint32_t cuid = 0;
     uint8_t numSectors = arg0;
     uint8_t keyType = arg1;
@@ -1682,7 +1681,7 @@ int MifareECardLoad(uint32_t arg0, uint32_t arg1) {
     }
 
     for (uint8_t sectorNo = 0; isOK && sectorNo < numSectors; sectorNo++) {
-        ui64Key = emlGetKey(sectorNo, keyType);
+        uint64_t ui64Key = emlGetKey(sectorNo, keyType);
         if (sectorNo == 0) {
             if (isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_FIRST)) {
                 if (DBGLEVEL >= 1) Dbprintf("Sector[%2d]. Auth error", sectorNo);
@@ -2016,7 +2015,6 @@ void MifareSetMod(uint8_t *datain) {
     uint32_t cuid = 0;
     struct Crypto1State mpcs = {0, 0};
     struct Crypto1State *pcs = &mpcs;
-    int respLen;
     uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0};
     uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0};
 
@@ -2040,6 +2038,7 @@ void MifareSetMod(uint8_t *datain) {
             break;
         }
 
+        int respLen;
         if (((respLen = mifare_sendcmd_short(pcs, 1, 0x43, mod, receivedAnswer, receivedAnswerPar, NULL)) != 1) || (receivedAnswer[0] != 0x0a)) {
             if (DBGLEVEL >= 1) Dbprintf("SetMod error; response[0]: %hhX, len: %d", receivedAnswer[0], respLen);
             break;
diff --git a/armsrc/mifaredesfire.c b/armsrc/mifaredesfire.c
index 9cfb0492f..bda31790d 100644
--- a/armsrc/mifaredesfire.c
+++ b/armsrc/mifaredesfire.c
@@ -174,22 +174,18 @@ void MifareDES_Auth1(uint8_t arg0, uint8_t arg1, uint8_t arg2,  uint8_t *datain)
     int len = 0;
     //uint8_t PICC_MASTER_KEY8[8] = { 0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47};
     uint8_t PICC_MASTER_KEY16[16] = { 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f };
-    uint8_t null_key_data8[8] = {0x00};
     //uint8_t null_key_data16[16] = {0x00};
     //uint8_t new_key_data8[8]  = { 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77};
     //uint8_t new_key_data16[16]  = { 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x88,0x99,0xAA,0xBB,0xCC,0xDD,0xEE,0xFF};
 
     uint8_t resp[256] = {0x00};
-    uint8_t IV[16] = {0x00};
 
     size_t datalen = datain[0];
 
     uint8_t cmd[40] = {0x00};
     uint8_t encRndB[16] = {0x00};
     uint8_t decRndB[16] = {0x00};
-    uint8_t nonce[16] = {0x00};
     uint8_t both[32] = {0x00};
-    uint8_t encBoth[32] = {0x00};
 
     InitDesfireCard();
 
@@ -217,6 +213,7 @@ void MifareDES_Auth1(uint8_t arg0, uint8_t arg1, uint8_t arg2,  uint8_t *datain)
             } else {
                 if (arg1 == 1) {
                     if (datain[1] == 0xff) {
+                        uint8_t null_key_data8[8] = {0x00};
                         memcpy(keybytes, null_key_data8, 8);
                     } else {
                         memcpy(keybytes, datain + 1, datalen);
@@ -437,6 +434,7 @@ void MifareDES_Auth1(uint8_t arg0, uint8_t arg1, uint8_t arg2,  uint8_t *datain)
             Desfire_aes_key_new(keybytes, key);
 
             AesCtx ctx;
+            uint8_t IV[16] = {0x00};
             if (AesCtxIni(&ctx, IV, key->data, KEY128, CBC) < 0) {
                 if (DBGLEVEL >= 4) {
                     DbpString("AES context failed to init");
@@ -461,8 +459,10 @@ void MifareDES_Auth1(uint8_t arg0, uint8_t arg1, uint8_t arg2,  uint8_t *datain)
             // dekryptera tagnonce.
             AesDecrypt(&ctx, encRndB, decRndB, 16);
             rol(decRndB, 16);
+            uint8_t nonce[16] = {0x00};
             memcpy(both, nonce, 16);
             memcpy(both + 16, decRndB, 16);
+            uint8_t encBoth[32] = {0x00};
             AesEncrypt(&ctx, both, encBoth, 32);
 
             cmd[0] = ADDITIONAL_FRAME;
diff --git a/armsrc/mifaresniff.c b/armsrc/mifaresniff.c
index 0c69c0381..1d7f576af 100644
--- a/armsrc/mifaresniff.c
+++ b/armsrc/mifaresniff.c
@@ -309,13 +309,13 @@ bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint8_t *parity, ui
 */
 
 void RAMFUNC MfSniffSend() {
-    uint16_t chunksize, tracelen = BigBuf_get_traceLen();
+    uint16_t tracelen = BigBuf_get_traceLen();
     int packlen = tracelen; // total number of bytes to send
     uint8_t *data = BigBuf_get_addr();
 
     while (packlen > 0) {
         LED_B_ON();
-        chunksize = MIN(PM3_CMD_DATA_SIZE, packlen); // chunk size 512
+        uint16_t chunksize = MIN(PM3_CMD_DATA_SIZE, packlen); // chunk size 512
         reply_old(CMD_ACK, 1, tracelen, chunksize, data + tracelen - packlen, chunksize);
         packlen -= chunksize;
         LED_B_OFF();
diff --git a/armsrc/optimized_cipher.c b/armsrc/optimized_cipher.c
index fee3c156f..4894bf6bc 100644
--- a/armsrc/optimized_cipher.c
+++ b/armsrc/optimized_cipher.c
@@ -111,9 +111,8 @@ void opt_successor(const uint8_t *k, State *s, bool y, State *successor) {
 
 void opt_suc(const uint8_t *k, State *s, uint8_t *in, uint8_t length, bool add32Zeroes) {
     State x2;
-    int i;
-    uint8_t head;
-    for (i = 0; i < length; i++) {
+    for (int i = 0; i < length; i++) {
+        uint8_t head;
         head = 1 & (in[i] >> 7);
         opt_successor(k, s, head, &x2);
 
@@ -141,7 +140,7 @@ void opt_suc(const uint8_t *k, State *s, uint8_t *in, uint8_t length, bool add32
 
     //For tag MAC, an additional 32 zeroes
     if (add32Zeroes) {
-        for (i = 0; i < 16; i++) {
+        for (int i = 0; i < 16; i++) {
             opt_successor(k, s, 0, &x2);
             opt_successor(k, &x2, 0, s);
         }
@@ -149,10 +148,9 @@ void opt_suc(const uint8_t *k, State *s, uint8_t *in, uint8_t length, bool add32
 }
 
 void opt_output(const uint8_t *k, State *s,  uint8_t *buffer) {
-    uint8_t bout, times = 0;
     State temp = {0, 0, 0, 0};
-    for (; times < 4; times++) {
-        bout = 0;
+    for (uint8_t times = 0; times < 4; times++) {
+        uint8_t bout = 0;
         bout |= (s->r & 0x4) << 5;
         opt_successor(k, s, 0, &temp);
         bout |= (temp.r & 0x4) << 4;
diff --git a/armsrc/printf.c b/armsrc/printf.c
index e2862f79e..d0d873e7d 100644
--- a/armsrc/printf.c
+++ b/armsrc/printf.c
@@ -60,12 +60,10 @@ char const hex2ascii_data[] = "0123456789abcdefghijklmnopqrstuvwxyz";
  */
 static char *
 ksprintn(char *nbuf, uintmax_t num, int base, int *lenp, int upper) {
-    char *p, c;
-
-    p = nbuf;
+    char *p = nbuf;
     *p = '\0';
     do {
-        c = hex2ascii(num % base);
+        char c = hex2ascii(num % base);
         *++p = upper ? toupper(c) : c;
     } while (num /= base);
     if (lenp)
diff --git a/armsrc/string.c b/armsrc/string.c
index 517c59e0a..5c154643c 100644
--- a/armsrc/string.c
+++ b/armsrc/string.c
@@ -80,10 +80,10 @@ char *strcat(char *dest, const char *src) {
 
 /* reverse:  reverse string s in place */
 void strreverse(char s[]) {
-    int c, i, j;
+    int j = strlen(s) - 1;
 
-    for (i = 0, j = strlen(s) - 1; i < j; i++, j--) {
-        c = s[i];
+    for (int i = 0; i < j; i++, j--) {
+        int c = s[i];
         s[i] = s[j];
         s[j] = c;
     }
diff --git a/bootrom/bootrom.c b/bootrom/bootrom.c
index 005dbf662..30521fe01 100644
--- a/bootrom/bootrom.c
+++ b/bootrom/bootrom.c
@@ -114,7 +114,6 @@ static void Fatal(void) {
 void UsbPacketReceived(uint8_t *packet, int len) {
     int i, dont_ack = 0;
     PacketCommandOLD *c = (PacketCommandOLD *)packet;
-    volatile uint32_t *p;
 
     //if ( len != sizeof(PacketCommandOLD`)) Fatal();
 
@@ -136,7 +135,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
             /* The temporary write buffer of the embedded flash controller is mapped to the
             * whole memory region, only the last 8 bits are decoded.
             */
-            p = (volatile uint32_t *)&_flash_start;
+            volatile uint32_t *p = (volatile uint32_t *)&_flash_start;
             for (i = 0; i < 12; i++)
                 p[i + arg0] = c->d.asDwords[i];
         }
diff --git a/client/cmdcrc.c b/client/cmdcrc.c
index e5d62d46e..58cab45e5 100644
--- a/client/cmdcrc.c
+++ b/client/cmdcrc.c
@@ -13,8 +13,6 @@
 
 static int split(char *str, char *arr[MAX_ARGS]) {
     int beginIndex = 0;
-    int endIndex;
-    int maxWords = MAX_ARGS;
     int wordCnt = 0;
 
     while (1) {
@@ -24,7 +22,7 @@ static int split(char *str, char *arr[MAX_ARGS]) {
         if (str[beginIndex] == '\0') {
             break;
         }
-        endIndex = beginIndex;
+        int endIndex = beginIndex;
         while (str[endIndex] && !isspace(str[endIndex])) {
             ++endIndex;
         }
@@ -33,7 +31,7 @@ static int split(char *str, char *arr[MAX_ARGS]) {
         memcpy(tmp, &str[beginIndex], len);
         arr[wordCnt++] = tmp;
         beginIndex = endIndex;
-        if (wordCnt == maxWords)
+        if (wordCnt == MAX_ARGS)
             break;
     }
     return wordCnt;
@@ -45,10 +43,8 @@ int GetModels(char *Models[], int *count, uint8_t *width) {
     /* default values */
     static model_t model = MZERO;
 
-    int ibperhx = 8;//, obperhx = 8;
-    int rflags = 0, uflags = 0; /* search and UI flags */
     poly_t apoly, crc, qpoly = PZERO, *apolys = NULL, *pptr = NULL, *qptr = NULL;
-    model_t pset = model, *candmods, *mptr;
+    model_t pset = model;
 
     /* stdin must be binary */
 #ifdef _WIN32
@@ -81,6 +77,8 @@ int GetModels(char *Models[], int *count, uint8_t *width) {
         mfree(&model);
     } else { //reveng -s
 
+        int ibperhx = 8;//, obperhx = 8;
+        int rflags = 0, uflags = 0; /* search and UI flags */
         if (~model.flags & P_MULXN) {
             PrintAndLogEx(WARNING, "cannot search for non-Williams compliant models");
             return 0;
@@ -108,9 +106,9 @@ int GetModels(char *Models[], int *count, uint8_t *width) {
         /* scan against preset models */
         if (~uflags & C_NOPCK) {
             pass = 0;
-            int Cnt = 0, psets;
+            int Cnt = 0;
             do {
-                psets = mcount();
+                int psets = mcount();
 
                 while (psets) {
                     mbynum(&pset, --psets);
@@ -192,7 +190,8 @@ int GetModels(char *Models[], int *count, uint8_t *width) {
         pass = 0;
         int args = 0;
         do {
-            mptr = candmods = reveng(&model, qpoly, rflags, args, apolys);
+            model_t *candmods = reveng(&model, qpoly, rflags, args, apolys);
+            model_t *mptr = candmods;
             if (mptr && plen(mptr->spoly)) {
                 uflags |= C_RESULT;
             }
@@ -396,7 +395,6 @@ static int CmdrevengSearch(const char *Cmd) {
     uint8_t width[NMODELS] = {0};
     int count = 0;
 
-    uint8_t crcChars;
     char result[30];
     char revResult[30];
     int ans = GetModels(Models, &count, width);
@@ -410,7 +408,7 @@ static int CmdrevengSearch(const char *Cmd) {
             continue;
         }*/
         // round up to # of characters in this model's crc
-        crcChars = ((width[i] + 7) / 8) * 2;
+        uint8_t crcChars = ((width[i] + 7) / 8) * 2;
         // can't test a model that has more crc digits than our data
         if (crcChars >= dataLen)
             continue;
diff --git a/client/cmddata.c b/client/cmddata.c
index 9811d1b62..59bc5df73 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -384,7 +384,6 @@ void printDemodBuff(void) {
 }
 
 int CmdPrintDemodBuff(const char *Cmd) {
-    char hex[512] = {0x00};
     bool hexMode = false;
     bool errors = false;
     uint32_t offset = 0;
@@ -425,6 +424,7 @@ int CmdPrintDemodBuff(const char *Cmd) {
 
     if (hexMode) {
         char *buf = (char *)(DemodBuffer + offset);
+        char hex[512] = {0x00};
         int numBits = binarraytohex(hex, sizeof(hex), buf, length);
         if (numBits == 0) {
             return PM3_ESOFT;
@@ -745,15 +745,13 @@ int AutoCorrelate(const int *in, int *out, size_t len, size_t window, bool SaveG
 
     //test
     double autocv = 0.0;    // Autocovariance value
-    double ac_value;        // Computed autocorrelation value to be returned
-    double variance;        // Computed variance
-    double mean;
     size_t correlation = 0;
     int lastmax = 0;
 
     // in, len, 4000
-    mean = compute_mean(in, len);
-    variance = compute_variance(in, len);
+    double mean = compute_mean(in, len);
+    // Computed variance
+    double variance = compute_variance(in, len);
 
     static int CorrelBuffer[MAX_GRAPH_TRACE_LEN];
 
@@ -766,8 +764,9 @@ int AutoCorrelate(const int *in, int *out, size_t len, size_t window, bool SaveG
 
         CorrelBuffer[i] = autocv;
 
+        // Computed autocorrelation value to be returned
         // Autocorrelation is autocovariance divided by variance
-        ac_value = autocv / variance;
+        double ac_value = autocv / variance;
 
         // keep track of which distance is repeating.
         if (ac_value > 1) {
diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 9289abe22..3b87799a6 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -506,9 +506,9 @@ int CmdHF14ASim(const char *Cmd) {
 }
 
 int CmdHF14ASniff(const char *Cmd) {
-    uint8_t param = 0, ctmp;
+    uint8_t param = 0;
     for (uint8_t i = 0; i < 2; i++) {
-        ctmp = tolower(param_getchar(Cmd, i));
+        uint8_t ctmp = tolower(param_getchar(Cmd, i));
         if (ctmp == 'h') return usage_hf_14a_sniff();
         if (ctmp == 'c') param |= 0x01;
         if (ctmp == 'r') param |= 0x02;
@@ -701,11 +701,10 @@ static int CmdExchangeAPDU(bool chainingin, uint8_t *datain, int datainlen, bool
     else
         SendCommandMIX(CMD_READER_ISO_14443a, ISO14A_APDU | ISO14A_NO_DISCONNECT | cmdc, 0, 0, NULL, 0);
 
-    uint8_t *recv;
     PacketResponseNG resp;
 
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-        recv = resp.data.asBytes;
+        uint8_t *recv = resp.data.asBytes;
         int iLen = resp.oldarg[0];
         uint8_t res = resp.oldarg[1];
 
diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c
index 94a89a2bc..c95494b7a 100644
--- a/client/cmdhf14b.c
+++ b/client/cmdhf14b.c
@@ -121,7 +121,6 @@ static int switch_off_field_14b(void) {
 
 static bool waitCmd14b(bool verbose) {
 
-    uint8_t data[PM3_CMD_DATA_SIZE] = {0x00};
     PacketResponseNG resp;
 
     if (WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
@@ -130,6 +129,7 @@ static bool waitCmd14b(bool verbose) {
 
         uint16_t len = (resp.oldarg[1] & 0xFFFF);
 
+        uint8_t data[PM3_CMD_DATA_SIZE] = {0x00};
         memcpy(data, resp.data.asBytes, len);
 
         if (verbose) {
diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index 022a941b2..6f6d1ebc2 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -1160,9 +1160,8 @@ static int CmdHF15Restore(const char *Cmd) {
     char newCmdPrefix[FILE_PATH_SIZE + 1] = {0x00}, tmpCmd[FILE_PATH_SIZE + 262] = {0x00};
     char param[FILE_PATH_SIZE] = "";
     char hex[255] = "";
-    uint8_t retries = 3, tried = 0, i = 0;
+    uint8_t retries = 3, i = 0;
     int retval = 0;
-    size_t bytes_read;
 
     while (param_getchar(Cmd, cmdp) != 0x00) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
@@ -1226,11 +1225,11 @@ static int CmdHF15Restore(const char *Cmd) {
     PrintAndLogEx(INFO, "Restoring data blocks.");
 
     while (1) {
-        tried = 0;
+        uint8_t tried = 0;
         hex[0] = 0x00;
         tmpCmd[0] = 0x00;
 
-        bytes_read = fread(buff, 1, blocksize, f);
+        size_t bytes_read = fread(buff, 1, blocksize, f);
         if (bytes_read == 0) {
             PrintAndLogEx(SUCCESS, "File reading done `%s`", filename);
             fclose(f);
diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index 0c3cb9281..2bdb91fa1 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -308,8 +308,6 @@ static int CmdHFiClassSim(const char *Cmd) {
         return usage_hf_iclass_sim();
     }
 
-    uint8_t numberOfCSNs = 0;
-
     /*
             // pre-defined 8 CSN by Holiman
             uint8_t csns[8*NUM_CSNS] = {
@@ -478,9 +476,8 @@ static int CmdHFiClassSim(const char *Cmd) {
 
             //KEYROLL 2
             memset(dump, 0, datalen);
-            uint8_t resp_index = 0;
             for (uint8_t i = 0; i < NUM_CSNS; i++) {
-                resp_index = (i + NUM_CSNS) * 16;
+                uint8_t resp_index = (i + NUM_CSNS) * 16;
                 // Copy CSN
                 memcpy(dump + i * MAC_ITEM_SIZE, csns + i * 8, 8);
                 // copy EPURSE
@@ -496,6 +493,7 @@ static int CmdHFiClassSim(const char *Cmd) {
         case 1:
         case 3:
         default: {
+            uint8_t numberOfCSNs = 0;
             clearCommandBuffer();
             SendCommandOLD(CMD_SIMULATE_TAG_ICLASS, simType, numberOfCSNs, 0, CSN, 8);
             break;
@@ -1303,7 +1301,6 @@ static int CmdHFiClassCloneTag(const char *Cmd) {
         return 0;
     }
 
-    uint8_t *ptr;
     uint8_t data[(endblock - startblock) * 12];
     // calculate all mac for every the block we will write
     for (i = startblock; i <= endblock; i++) {
@@ -1312,7 +1309,7 @@ static int CmdHFiClassCloneTag(const char *Cmd) {
         // memcpy(pointer,tag_data[i - 6],8) 8 bytes
         // memcpy(pointer + 8,mac,sizoof(mac) 4 bytes;
         // next one
-        ptr = data + (i - startblock) * 12;
+        uint8_t *ptr = data + (i - startblock) * 12;
         memcpy(ptr, &(tag_data[i - startblock].d[0]), 8);
         memcpy(ptr + 8, MAC, 4);
     }
@@ -1335,11 +1332,10 @@ static int CmdHFiClassCloneTag(const char *Cmd) {
 }
 
 static int ReadBlock(uint8_t *KEY, uint8_t blockno, uint8_t keyType, bool elite, bool rawkey, bool verbose, bool auth) {
-    uint8_t MAC[4] = {0x00, 0x00, 0x00, 0x00};
-    uint8_t div_key[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-
     // block 0,1 should always be able to read,  and block 5 on some cards.
     if (auth || blockno >= 2) {
+        uint8_t MAC[4] = {0x00, 0x00, 0x00, 0x00};
+        uint8_t div_key[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
         if (!select_and_auth(KEY, MAC, div_key, (keyType == 0x18), elite, rawkey, verbose))
             return 0;
     } else {
@@ -1445,8 +1441,8 @@ static int CmdHFiClass_loclass(const char *Cmd) {
     if (strlen(Cmd) < 1 || opt == 'h')
         usage_hf_iclass_loclass();
 
-    char fileName[FILE_PATH_SIZE] = {0};
     if (opt == 'f') {
+        char fileName[FILE_PATH_SIZE] = {0};
         if (param_getstr(Cmd, 1, fileName, sizeof(fileName)) > 0) {
             return bruteforceFileNoKeys(fileName);
         } else {
@@ -1551,9 +1547,9 @@ static int CmdHFiClassReadTagFile(const char *Cmd) {
 }
 
 void HFiClassCalcDivKey(uint8_t *CSN, uint8_t *KEY, uint8_t *div_key, bool elite) {
-    uint8_t keytable[128] = {0};
-    uint8_t key_index[8] = {0};
     if (elite) {
+        uint8_t keytable[128] = {0};
+        uint8_t key_index[8] = {0};
         uint8_t key_sel[8] = { 0 };
         uint8_t key_sel_p[8] = { 0 };
         hash2(KEY, keytable);
@@ -1595,7 +1591,6 @@ static int CmdHFiClassCalcNewKey(const char *Cmd) {
     uint8_t NEWKEY[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
     uint8_t xor_div_key[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
     uint8_t CSN[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-    uint8_t CCNR[12] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
     uint8_t keyNbr = 0;
     uint8_t dataLen = 0;
     char tempStr[50] = {0};
@@ -1665,9 +1660,11 @@ static int CmdHFiClassCalcNewKey(const char *Cmd) {
     }
     if (errors || cmdp < 4) return usage_hf_iclass_calc_newkey();
 
-    if (!givenCSN)
+    if (!givenCSN) {
+        uint8_t CCNR[12] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
         if (!select_only(CSN, CCNR, false, true))
             return 0;
+    }
 
     HFiClassCalcNewKey(CSN, OLDKEY, NEWKEY, xor_div_key, elite, oldElite, true);
     return PM3_SUCCESS;
@@ -2318,11 +2315,10 @@ static void permute(uint8_t *data, uint8_t len, uint8_t *output) {
         PrintAndLogEx(NORMAL, "[!] wrong key size\n");
         return;
     }
-    uint8_t i, j, p, mask;
-    for (i = 0; i < KEY_SIZE; ++i) {
-        p = 0;
-        mask = 0x80 >> i;
-        for (j = 0; j < KEY_SIZE; ++j) {
+    for (uint8_t i = 0; i < KEY_SIZE; ++i) {
+        uint8_t p = 0;
+        uint8_t mask = 0x80 >> i;
+        for (uint8_t j = 0; j < KEY_SIZE; ++j) {
             p >>= 1;
             if (data[j] & mask)
                 p |= 0x80;
@@ -2377,8 +2373,6 @@ static void generate(uint8_t *data, uint8_t len) {
 static int CmdHFiClassPermuteKey(const char *Cmd) {
 
     uint8_t key[8] = {0};
-    uint8_t key_std_format[8] = {0};
-    uint8_t key_iclass_format[8] = {0};
     uint8_t data[16] = {0};
     bool isReverse = false;
     int len = 0;
@@ -2396,10 +2390,12 @@ static int CmdHFiClassPermuteKey(const char *Cmd) {
 
     if (isReverse) {
         generate_rev(data, len);
+        uint8_t key_std_format[8] = {0};
         permutekey_rev(key, key_std_format);
         PrintAndLogEx(SUCCESS, "holiman iclass key | %s \n", sprint_hex(key_std_format, 8));
     } else {
         generate(data, len);
+        uint8_t key_iclass_format[8] = {0};
         permutekey(key, key_iclass_format);
         PrintAndLogEx(SUCCESS, "holiman std key | %s \n", sprint_hex(key_iclass_format, 8));
     }
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 3aaa5187f..3a23b5047 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -591,10 +591,8 @@ static int CmdHF14AMfRdBl(const char *Cmd) {
 }
 
 static int CmdHF14AMfRdSc(const char *Cmd) {
-    int i;
-    uint8_t isOK, sectorNo = 0, keyType = 0;
+    uint8_t sectorNo = 0, keyType = 0;
     uint8_t key[6] = {0, 0, 0, 0, 0, 0};
-    uint8_t *data  = NULL;
     char cmdp = 0x00;
 
     if (strlen(Cmd) < 3) {
@@ -631,12 +629,12 @@ static int CmdHF14AMfRdSc(const char *Cmd) {
 
     PacketResponseNG resp;
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-        isOK  = resp.oldarg[0] & 0xff;
-        data  = resp.data.asBytes;
+        uint8_t isOK  = resp.oldarg[0] & 0xff;
+        uint8_t *data  = resp.data.asBytes;
 
         PrintAndLogEx(NORMAL, "isOk:%02x", isOK);
         if (isOK) {
-            for (i = 0; i < (sectorNo < 32 ? 3 : 15); i++) {
+            for (int i = 0; i < (sectorNo < 32 ? 3 : 15); i++) {
                 PrintAndLogEx(NORMAL, "data   : %s", sprint_hex(data + i * 16, 16));
             }
             PrintAndLogEx(NORMAL, "trailer: %s", sprint_hex(data + (sectorNo < 32 ? 3 : 15) * 16, 16));
@@ -644,7 +642,7 @@ static int CmdHF14AMfRdSc(const char *Cmd) {
             PrintAndLogEx(NORMAL, "Trailer decoded:");
             int bln = mfFirstBlockOfSector(sectorNo);
             int blinc = (mfNumBlocksPerSector(sectorNo) > 4) ? 5 : 1;
-            for (i = 0; i < 4; i++) {
+            for (int i = 0; i < 4; i++) {
                 PrintAndLogEx(NORMAL, "Access block %d%s: %s", bln, ((blinc > 1) && (i < 3) ? "+" : ""), mfGetAccessConditionsDesc(i, &(data + (sectorNo < 32 ? 3 : 15) * 16)[6]));
                 bln += blinc;
             }
@@ -1065,9 +1063,7 @@ static int CmdHF14AMfRestore(const char *Cmd) {
 }
 
 static int CmdHF14AMfNested(const char *Cmd) {
-    int i, iterations;
     sector_t *e_sector = NULL;
-    uint8_t blockNo = 0;
     uint8_t keyType = 0;
     uint8_t trgBlockNo = 0;
     uint8_t trgKeyType = 0;
@@ -1077,16 +1073,12 @@ static int CmdHF14AMfNested(const char *Cmd) {
     uint64_t key64 = 0;
     bool transferToEml = false;
     bool createDumpFile = false;
-    FILE *fkeys;
-    uint8_t standart[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
-    uint8_t tempkey[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
-    char *fptr;
 
     if (strlen(Cmd) < 3) return usage_hf14_nested();
 
     char cmdp, ctmp;
     cmdp = tolower(param_getchar(Cmd, 0));
-    blockNo = param_get8(Cmd, 1);
+    uint8_t blockNo = param_get8(Cmd, 1);
     ctmp = tolower(param_getchar(Cmd, 2));
 
     if (ctmp != 'a' && ctmp != 'b') {
@@ -1195,10 +1187,10 @@ static int CmdHF14AMfNested(const char *Cmd) {
         PrintAndLogEx(SUCCESS, "enter nested attack");
 
         // nested sectors
-        iterations = 0;
+//        int iterations = 0;
         bool calibrate = true;
 
-        for (i = 0; i < MIFARE_SECTOR_RETRY; i++) {
+        for (int i = 0; i < MIFARE_SECTOR_RETRY; i++) {
             for (uint8_t sectorNo = 0; sectorNo < SectorsCnt; ++sectorNo) {
                 for (trgKeyType = 0; trgKeyType < 2; ++trgKeyType) {
 
@@ -1217,11 +1209,11 @@ static int CmdHF14AMfNested(const char *Cmd) {
                             break;
                         case -4 : //key not found
                             calibrate = false;
-                            iterations++;
+//                            iterations++;
                             continue;
                         case -5 :
                             calibrate = false;
-                            iterations++;
+//                            iterations++;
                             e_sector[sectorNo].foundKey[trgKeyType] = 1;
                             e_sector[sectorNo].Key[trgKeyType] = bytes_to_num(keyBlock, 6);
 
@@ -1243,7 +1235,7 @@ static int CmdHF14AMfNested(const char *Cmd) {
 
         // 20160116 If Sector A is found, but not Sector B,  try just reading it of the tag?
         PrintAndLogEx(INFO, "trying to read key B...");
-        for (i = 0; i < SectorsCnt; i++) {
+        for (int i = 0; i < SectorsCnt; i++) {
             // KEY A  but not KEY B
             if (e_sector[i].foundKey[0] && !e_sector[i].foundKey[1]) {
 
@@ -1283,7 +1275,7 @@ static int CmdHF14AMfNested(const char *Cmd) {
         if (transferToEml) {
             // fast push mode
             conn.block_after_ACK = true;
-            for (i = 0; i < SectorsCnt; i++) {
+            for (int i = 0; i < SectorsCnt; i++) {
                 mfEmlGetMem(keyBlock, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
                 
                 if (e_sector[i].foundKey[0])
@@ -1303,12 +1295,12 @@ static int CmdHF14AMfNested(const char *Cmd) {
 
         // Create dump file
         if (createDumpFile) {
-            fptr = GenerateFilename("hf-mf-", "-key.bin");
+            char *fptr = GenerateFilename("hf-mf-", "-key.bin");
             if (fptr == NULL) {
                 free(e_sector);
                 return PM3_ESOFT;
             }
-
+            FILE *fkeys;
             if ((fkeys = fopen(fptr, "wb")) == NULL) {
                 PrintAndLogEx(WARNING, "could not create file " _YELLOW_("%s"), fptr);
                 free(e_sector);
@@ -1316,7 +1308,9 @@ static int CmdHF14AMfNested(const char *Cmd) {
             }
 
             PrintAndLogEx(SUCCESS, "saving keys to binary file " _YELLOW_("%s"), fptr);
-            for (i = 0; i < SectorsCnt; i++) {
+            uint8_t standart[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
+            uint8_t tempkey[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
+            for (int i = 0; i < SectorsCnt; i++) {
                 if (e_sector[i].foundKey[0]) {
                     num_to_bytes(e_sector[i].Key[0], 6, tempkey);
                     fwrite(tempkey, 1, 6, fkeys);
@@ -1324,7 +1318,7 @@ static int CmdHF14AMfNested(const char *Cmd) {
                     fwrite(&standart, 1, 6, fkeys);
                 }
             }
-            for (i = 0; i < SectorsCnt; i++) {
+            for (int i = 0; i < SectorsCnt; i++) {
                 if (e_sector[i].foundKey[1]) {
                     num_to_bytes(e_sector[i].Key[1], 6, tempkey);
                     fwrite(tempkey, 1, 6, fkeys);
@@ -2756,7 +2750,6 @@ static int CmdHF14AMfEKeyPrn(const char *Cmd) {
     int i;
     uint8_t numSectors;
     uint8_t data[16];
-    uint64_t keyA, keyB;
 
     char c = tolower(param_getchar(Cmd, 0));
     if (c == 'h')
@@ -2777,8 +2770,8 @@ static int CmdHF14AMfEKeyPrn(const char *Cmd) {
             PrintAndLogEx(WARNING, "error get block %d", FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1);
             break;
         }
-        keyA = bytes_to_num(data, 6);
-        keyB = bytes_to_num(data + 10, 6);
+        uint64_t keyA = bytes_to_num(data, 6);
+        uint64_t keyB = bytes_to_num(data + 10, 6);
         PrintAndLogEx(NORMAL, "|%03d|  %012" PRIx64 "  |  %012" PRIx64 "  |", i, keyA, keyB);
     }
     PrintAndLogEx(NORMAL, "|---|----------------|----------------|");
@@ -2875,9 +2868,7 @@ static int CmdHF14AMfCSetBlk(const char *Cmd) {
 
 static int CmdHF14AMfCLoad(const char *Cmd) {
 
-    uint8_t buf8[16] = {0x00};
     uint8_t fillFromEmulator = 0;
-    int blockNum, flags = 0;
     bool fillFromJson = false;
     bool fillFromBin = false;
     char fileName[50] = {0};
@@ -2895,7 +2886,9 @@ static int CmdHF14AMfCLoad(const char *Cmd) {
 
 
     if (fillFromEmulator) {
-        for (blockNum = 0; blockNum < 16 * 4; blockNum += 1) {
+        for (int blockNum = 0; blockNum < 16 * 4; blockNum += 1) {
+            int flags = 0;
+            uint8_t buf8[16] = {0x00};
             if (mfEmlGetMem(buf8, blockNum, 1)) {
                 PrintAndLogEx(WARNING, "Cant get block: %d", blockNum);
                 return 2;
@@ -2949,7 +2942,8 @@ static int CmdHF14AMfCLoad(const char *Cmd) {
 
     PrintAndLogEx(INFO, "Copying to magic card");
 
-    blockNum = 0;
+    int blockNum = 0;
+    int flags = 0;
     while (datalen) {
 
         // switch on field and send magic sequence
@@ -2992,17 +2986,15 @@ static int CmdHF14AMfCLoad(const char *Cmd) {
 
 static int CmdHF14AMfCGetBlk(const char *Cmd) {
     uint8_t data[16] = {0};
-    uint8_t blockNo = 0;
-    int res;
 
     char ctmp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) < 1 || ctmp == 'h') return usage_hf14_cgetblk();
 
-    blockNo = param_get8(Cmd, 0);
+    uint8_t blockNo = param_get8(Cmd, 0);
 
     PrintAndLogEx(NORMAL, "--block number:%2d ", blockNo);
 
-    res = mfCGetBlock(blockNo, data, MAGIC_SINGLE);
+    int res = mfCGetBlock(blockNo, data, MAGIC_SINGLE);
     if (res) {
         PrintAndLogEx(WARNING, "Can't read block. error=%d", res);
         return PM3_ESOFT;
@@ -3028,13 +3020,11 @@ static int CmdHF14AMfCGetBlk(const char *Cmd) {
 
 static int CmdHF14AMfCGetSc(const char *Cmd) {
     uint8_t data[16] = {0};
-    uint8_t sector = 0;
-    int i, res, flags;
 
     char ctmp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) < 1 || ctmp == 'h') return usage_hf14_cgetsc();
 
-    sector = param_get8(Cmd, 0);
+    uint8_t sector = param_get8(Cmd, 0);
     if (sector > 39) {
         PrintAndLogEx(WARNING, "Sector number must be less then 40");
         return PM3_ESOFT;
@@ -3049,13 +3039,13 @@ static int CmdHF14AMfCGetSc(const char *Cmd) {
         start = 128 + (sector - 32) * 16;
     }
 
-    flags = MAGIC_INIT + MAGIC_WUPC;
+    int flags = MAGIC_INIT + MAGIC_WUPC;
 
-    for (i = 0; i < blocks; i++) {
+    for (int i = 0; i < blocks; i++) {
         if (i == 1) flags = 0;
         if (i == blocks - 1) flags = MAGIC_HALT + MAGIC_OFF;
 
-        res = mfCGetBlock(start + i, data, flags);
+        int res = mfCGetBlock(start + i, data, flags);
         if (res) {
             PrintAndLogEx(WARNING, "Can't read block. %d error=%d", start + i, res);
             return PM3_ESOFT;
@@ -3075,10 +3065,9 @@ static int CmdHF14AMfCSave(const char *Cmd) {
     int i, len, flags;
     uint8_t numblocks = 0, cmdp = 0;
     uint16_t bytes = 0;
-    char ctmp;
 
     while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
-        ctmp = tolower(param_getchar(Cmd, cmdp));
+        char ctmp = tolower(param_getchar(Cmd, cmdp));
         switch (ctmp) {
             case 'e':
                 useuid = true;
diff --git a/client/cmdhfmfhard.c b/client/cmdhfmfhard.c
index 672064987..8ae1b6d1a 100644
--- a/client/cmdhfmfhard.c
+++ b/client/cmdhfmfhard.c
@@ -1038,12 +1038,7 @@ static void estimate_sum_a8(void) {
 static int read_nonce_file(char *filename) {
     FILE *fnonces = NULL;
     char progress_text[80] = "";
-    size_t bytes_read;
-    uint8_t trgBlockNo;
-    uint8_t trgKeyType;
     uint8_t read_buf[9];
-    uint32_t nt_enc1, nt_enc2;
-    uint8_t par_enc;
 
     num_acquired_nonces = 0;
     if ((fnonces = fopen(filename, "rb")) == NULL) {
@@ -1052,21 +1047,21 @@ static int read_nonce_file(char *filename) {
     }
     snprintf(progress_text, 80, "Reading nonces from file %s...", filename);
     hardnested_print_progress(0, progress_text, (float)(1LL << 47), 0);
-    bytes_read = fread(read_buf, 1, 6, fnonces);
+    size_t bytes_read = fread(read_buf, 1, 6, fnonces);
     if (bytes_read != 6) {
         PrintAndLogEx(WARNING, "File reading error.");
         fclose(fnonces);
         return 1;
     }
     cuid = bytes_to_num(read_buf, 4);
-    trgBlockNo = bytes_to_num(read_buf + 4, 1);
-    trgKeyType = bytes_to_num(read_buf + 5, 1);
+    uint8_t trgBlockNo = bytes_to_num(read_buf + 4, 1);
+    uint8_t trgKeyType = bytes_to_num(read_buf + 5, 1);
 
     bytes_read = fread(read_buf, 1, 9, fnonces);
     while (bytes_read == 9) {
-        nt_enc1 = bytes_to_num(read_buf, 4);
-        nt_enc2 = bytes_to_num(read_buf + 4, 4);
-        par_enc = bytes_to_num(read_buf + 8, 1);
+        uint32_t nt_enc1 = bytes_to_num(read_buf, 4);
+        uint32_t nt_enc2 = bytes_to_num(read_buf + 4, 4);
+        uint8_t par_enc = bytes_to_num(read_buf + 8, 1);
         add_nonce(nt_enc1, par_enc >> 4);
         add_nonce(nt_enc2, par_enc & 0x0f);
         num_acquired_nonces += 2;
@@ -1416,14 +1411,12 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
         }
 
         if (!initialize) {
-            uint32_t nt_enc1, nt_enc2;
-            uint8_t par_enc;
             uint16_t num_sampled_nonces = resp.oldarg[2];
             uint8_t *bufp = resp.data.asBytes;
             for (uint16_t i = 0; i < num_sampled_nonces; i += 2) {
-                nt_enc1 = bytes_to_num(bufp, 4);
-                nt_enc2 = bytes_to_num(bufp + 4, 4);
-                par_enc = bytes_to_num(bufp + 8, 1);
+                uint32_t nt_enc1 = bytes_to_num(bufp, 4);
+                uint32_t nt_enc2 = bytes_to_num(bufp + 4, 4);
+                uint8_t par_enc = bytes_to_num(bufp + 8, 1);
 
                 //PrintAndLogEx(NORMAL, "Encrypted nonce: %08x, encrypted_parity: %02x\n", nt_enc1, par_enc >> 4);
                 num_acquired_nonces += add_nonce(nt_enc1, par_enc >> 4);
diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index 77624ee59..740bfa065 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -1051,9 +1051,6 @@ uint32_t GetHF14AMfU_Type(void) {
 
     TagTypeUL_t tagtype = UNKNOWN;
     iso14a_card_select_t card;
-    uint8_t version[10] = {0x00};
-    int status = 0;
-    int len;
 
     if (!ul_select(&card)) return UL_ERROR;
 
@@ -1066,7 +1063,8 @@ uint32_t GetHF14AMfU_Type(void) {
 
     if (card.uid[0] != 0x05) {
 
-        len  = ulev1_getVersion(version, sizeof(version));
+        uint8_t version[10] = {0x00};
+        int len  = ulev1_getVersion(version, sizeof(version));
         DropField();
 
         switch (len) {
@@ -1112,7 +1110,7 @@ uint32_t GetHF14AMfU_Type(void) {
 
             // do UL_C check first...
             uint8_t nonce[11] = {0x00};
-            status = ulc_requestAuthentication(nonce, sizeof(nonce));
+            int status = ulc_requestAuthentication(nonce, sizeof(nonce));
             DropField();
             if (status > 1) {
                 tagtype = UL_C;
@@ -1944,10 +1942,8 @@ static int CmdHF14AMfUDump(const char *Cmd) {
 
     iso14a_card_select_t card;
     mfu_dump_t dump_file_data;
-    uint8_t get_pack[] = {0, 0};
     uint8_t get_version[] = {0, 0, 0, 0, 0, 0, 0, 0};
     uint8_t get_counter_tearing[][4] = {{0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}};
-    uint8_t dummy_pack[] = {0, 0};
     uint8_t get_signature[32];
     memset(get_signature, 0, sizeof(get_signature));
 
@@ -1955,6 +1951,7 @@ static int CmdHF14AMfUDump(const char *Cmd) {
     //  VERSION, SIGNATURE, COUNTERS, TEARING, PACK,
     if (!(tagtype & UL_C || tagtype & UL)) {
         //attempt to read pack
+        uint8_t get_pack[] = {0, 0};
         if (!ul_auth_select(&card, tagtype, true, authKeyPtr, get_pack, sizeof(get_pack))) {
             //reset pack
             get_pack[0] = 0;
@@ -1969,9 +1966,10 @@ static int CmdHF14AMfUDump(const char *Cmd) {
             memcpy(data + (pages * 4) - 4, get_pack, sizeof(get_pack));
         }
 
-        if (hasAuthKey)
+        if (hasAuthKey) {
+            uint8_t dummy_pack[] = {0, 0};
             ul_auth_select(&card, tagtype, hasAuthKey, authKeyPtr, dummy_pack, sizeof(dummy_pack));
-        else
+        } else
             ul_select(&card);
 
         ulev1_getVersion(get_version, sizeof(get_version));
@@ -1981,9 +1979,10 @@ static int CmdHF14AMfUDump(const char *Cmd) {
         }
 
         DropField();
-        if (hasAuthKey)
+        if (hasAuthKey) {
+            uint8_t dummy_pack[] = {0, 0};
             ul_auth_select(&card, tagtype, hasAuthKey, authKeyPtr, dummy_pack, sizeof(dummy_pack));
-        else
+        } else
             ul_select(&card);
 
         ulev1_readSignature(get_signature, sizeof(get_signature));
diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 9b175f212..4b74a5811 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -898,7 +898,6 @@ int EM4x50Read(const char *Cmd, bool verbose) {
     // get rid of leading crap
     snprintf(tmp, sizeof(tmp), "%i", skip);
     CmdLtrim(tmp);
-    bool pTest;
     bool AllPTest = true;
     // now work through remaining buffer printing out data blocks
     block = 0;
@@ -930,7 +929,7 @@ int EM4x50Read(const char *Cmd, bool verbose) {
         //set DemodBufferLen to just one block
         DemodBufferLen = skip / clk;
         //test parities
-        pTest = EM_ByteParityTest(DemodBuffer, DemodBufferLen, 5, 9, 0);
+        bool pTest = EM_ByteParityTest(DemodBuffer, DemodBufferLen, 5, 9, 0);
         pTest &= EM_EndParityTest(DemodBuffer, DemodBufferLen, 5, 9, 0);
         AllPTest &= pTest;
         //get output
diff --git a/client/cmdlfindala.c b/client/cmdlfindala.c
index d0eabfc4b..41c292a5b 100644
--- a/client/cmdlfindala.c
+++ b/client/cmdlfindala.c
@@ -89,9 +89,8 @@ static int CmdIndalaDemod(const char *Cmd) {
     setClockGrid(g_DemodClock, g_DemodStartIdx + (idx * g_DemodClock));
 
     //convert UID to HEX
-    uint32_t uid1, uid2, uid3, uid4, uid5, uid6, uid7;
-    uid1 = bytebits_to_byte(DemodBuffer, 32);
-    uid2 = bytebits_to_byte(DemodBuffer + 32, 32);
+    uint32_t uid1 = bytebits_to_byte(DemodBuffer, 32);
+    uint32_t uid2 = bytebits_to_byte(DemodBuffer + 32, 32);
     uint64_t foo = (((uint64_t)uid1 << 32) & 0x1FFFFFFF) | (uid2 & 0x7FFFFFFF);
 
     if (DemodBufferLen == 64) {
@@ -137,11 +136,11 @@ static int CmdIndalaDemod(const char *Cmd) {
 
 
     } else {
-        uid3 = bytebits_to_byte(DemodBuffer + 64, 32);
-        uid4 = bytebits_to_byte(DemodBuffer + 96, 32);
-        uid5 = bytebits_to_byte(DemodBuffer + 128, 32);
-        uid6 = bytebits_to_byte(DemodBuffer + 160, 32);
-        uid7 = bytebits_to_byte(DemodBuffer + 192, 32);
+        uint32_t uid3 = bytebits_to_byte(DemodBuffer + 64, 32);
+        uint32_t uid4 = bytebits_to_byte(DemodBuffer + 96, 32);
+        uint32_t uid5 = bytebits_to_byte(DemodBuffer + 128, 32);
+        uint32_t uid6 = bytebits_to_byte(DemodBuffer + 160, 32);
+        uint32_t uid7 = bytebits_to_byte(DemodBuffer + 192, 32);
         PrintAndLogEx(
             SUCCESS
             , "Indala Found - bitlength %d, Raw 0x%x%08x%08x%08x%08x%08x%08x"
@@ -288,9 +287,9 @@ static int CmdIndalaDemodAlt(const char *Cmd) {
     }
 
     //convert UID to HEX
-    uint32_t uid1, uid2, uid3, uid4, uid5, uid6, uid7;
     int idx;
-    uid1 = uid2 = 0;
+    uint32_t uid1 = 0;
+    uint32_t uid2 = 0;
 
     if (uidlen == 64) {
         for (idx = 0; idx < 64; idx++) {
@@ -304,7 +303,11 @@ static int CmdIndalaDemodAlt(const char *Cmd) {
         }
         PrintAndLogEx(SUCCESS, "UID | %s (%x%08x)", showbits, uid1, uid2);
     } else {
-        uid3 = uid4 = uid5 = uid6 = uid7 = 0;
+        uint32_t uid3 = 0;
+        uint32_t uid4 = 0;
+        uint32_t uid5 = 0;
+        uint32_t uid6 = 0;
+        uint32_t uid7 = 0;
 
         for (idx = 0; idx < 224; idx++) {
             uid1 = (uid1 << 1) | (uid2 >> 31);
diff --git a/client/cmdlfnedap.c b/client/cmdlfnedap.c
index 636a23b33..d081ff56c 100644
--- a/client/cmdlfnedap.c
+++ b/client/cmdlfnedap.c
@@ -284,20 +284,19 @@ static int CmdLFNedapChk(const char *Cmd) {
     //uint8_t last = GetParity(data, EVEN, 62);
     //PrintAndLogEx(NORMAL, "TEST PARITY::  %d | %d ", DemodBuffer[62], last);
 
-    uint8_t cl = 0x1D, ch = 0x1D, carry = 0;
-    uint8_t al, bl, temp;
+    uint8_t cl = 0x1D, ch = 0x1D;
 
     for (int i = len; i >= 0; --i) {
-        al = data[i];
+        uint8_t al = data[i];
         for (int j = 8; j > 0; --j) {
 
-            bl = al ^ ch;
+            uint8_t bl = al ^ ch;
             //PrintAndLogEx(NORMAL, "BL %02x | CH %02x \n", al, ch);
 
-            carry = (cl & 0x80) ? 1 : 0;
+            uint8_t carry = (cl & 0x80) ? 1 : 0;
             cl <<= 1;
 
-            temp = (ch & 0x80) ? 1 : 0;
+            uint8_t temp = (ch & 0x80) ? 1 : 0;
             ch = (ch << 1) | carry;
             carry = temp;
 
@@ -305,7 +304,7 @@ static int CmdLFNedapChk(const char *Cmd) {
             al <<= 1;
 
             carry = (bl & 0x80) ? 1 : 0;
-            bl <<= 1;
+//            bl <<= 1;
 
             if (carry) {
                 cl ^= 0x21;
diff --git a/client/cmdlfpresco.c b/client/cmdlfpresco.c
index 76a67f2b7..8f3e22ee1 100644
--- a/client/cmdlfpresco.c
+++ b/client/cmdlfpresco.c
@@ -213,7 +213,6 @@ int detectPresco(uint8_t *dest, size_t *size) {
 // convert base 12 ID to sitecode & usercode & 8 bit other unknown code
 int getWiegandFromPresco(const char *Cmd, uint32_t *sitecode, uint32_t *usercode, uint32_t *fullcode, bool *Q5) {
 
-    uint8_t val = 0;
     bool hex = false, errors = false;
     uint8_t cmdp = 0;
     char id[11];
@@ -250,8 +249,8 @@ int getWiegandFromPresco(const char *Cmd, uint32_t *sitecode, uint32_t *usercode
     if (errors || cmdp == 0) return PM3_EINVARG;
 
     if (!hex) {
+        uint8_t val = 0;
         for (int index = 0; index < strlen(id); ++index) {
-
             // Get value from number string.
             if (id[index] == '*')
                 val = 10;
diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c
index 80ef7b94f..f5db47cb3 100644
--- a/client/cmdlfpyramid.c
+++ b/client/cmdlfpyramid.c
@@ -154,28 +154,27 @@ static int CmdPyramidDemod(const char *Cmd) {
     }
 
     uint8_t fmtLen = size - j - 8;
-    uint32_t fc, cardnum, code1;
 
     if (fmtLen == 26) {
-        fc = bytebits_to_byte(bits + 73, 8);
-        cardnum = bytebits_to_byte(bits + 81, 16);
-        code1 = bytebits_to_byte(bits + 72, fmtLen);
+        uint32_t fc = bytebits_to_byte(bits + 73, 8);
+        uint32_t cardnum = bytebits_to_byte(bits + 81, 16);
+        uint32_t code1 = bytebits_to_byte(bits + 72, fmtLen);
         PrintAndLogEx(SUCCESS, "Pyramid ID Found - BitLength: %d, FC: %d, Card: %d - Wiegand: %x, Raw: %08x%08x%08x%08x", fmtLen, fc, cardnum, code1, rawHi3, rawHi2, rawHi, rawLo);
     } else if (fmtLen == 45) {
         fmtLen = 42; //end = 10 bits not 7 like 26 bit fmt
-        fc = bytebits_to_byte(bits + 53, 10);
-        cardnum = bytebits_to_byte(bits + 63, 32);
+        uint32_t fc = bytebits_to_byte(bits + 53, 10);
+        uint32_t cardnum = bytebits_to_byte(bits + 63, 32);
         PrintAndLogEx(SUCCESS, "Pyramid ID Found - BitLength: %d, FC: %d, Card: %d - Raw: %08x%08x%08x%08x", fmtLen, fc, cardnum, rawHi3, rawHi2, rawHi, rawLo);
         /*
             } else if (fmtLen > 32) {
-                cardnum = bytebits_to_byte(bits + 81, 16);
-                //code1 = bytebits_to_byte(bits+(size-fmtLen),fmtLen-32);
+                uint32_t cardnum = bytebits_to_byte(bits + 81, 16);
+                //uint32_t code1 = bytebits_to_byte(bits+(size-fmtLen),fmtLen-32);
                 //code2 = bytebits_to_byte(bits+(size-32),32);
                 PrintAndLogEx(SUCCESS, "Pyramid ID Found - BitLength: %d -unknown BitLength- (%d), Raw: %08x%08x%08x%08x", fmtLen, cardnum, rawHi3, rawHi2, rawHi, rawLo);
                 */
     } else {
-        cardnum = bytebits_to_byte(bits + 81, 16);
-        //code1 = bytebits_to_byte(bits+(size-fmtLen),fmtLen);
+        uint32_t cardnum = bytebits_to_byte(bits + 81, 16);
+        //uint32_t code1 = bytebits_to_byte(bits+(size-fmtLen),fmtLen);
         PrintAndLogEx(SUCCESS, "Pyramid ID Found - BitLength: %d -unknown BitLength- (%d), Raw: %08x%08x%08x%08x", fmtLen, cardnum, rawHi3, rawHi2, rawHi, rawLo);
     }
 
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 3bccd79ba..d78119059 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -918,9 +918,8 @@ static bool testBitRate(uint8_t readRate, uint8_t clk) {
 bool test(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk, bool *Q5) {
 
     if (DemodBufferLen < 64) return false;
-    uint8_t si;
     for (uint8_t idx = 28; idx < 64; idx++) {
-        si = idx;
+        uint8_t si = idx;
         if (PackBits(si, 28, DemodBuffer) == 0x00) continue;
 
         uint8_t safer    = PackBits(si, 4, DemodBuffer);
diff --git a/client/comms.c b/client/comms.c
index 89e9ec610..7d4a9dc9c 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -694,7 +694,6 @@ bool WaitForResponseTimeoutW(uint32_t cmd, PacketResponseNG *response, size_t ms
         ms_timeout += communication_delay();
 
     __atomic_store_n(&timeout_start_time,  msclock(), __ATOMIC_SEQ_CST);
-    uint64_t tmp_clk;
 
     // Wait until the command is received
     while (true) {
@@ -705,7 +704,7 @@ bool WaitForResponseTimeoutW(uint32_t cmd, PacketResponseNG *response, size_t ms
             }
         }
 
-        tmp_clk = __atomic_load_n(&timeout_start_time, __ATOMIC_SEQ_CST);
+        uint64_t tmp_clk = __atomic_load_n(&timeout_start_time, __ATOMIC_SEQ_CST);
         if ((ms_timeout != (size_t) -1) && (msclock() - tmp_clk > ms_timeout))
             break;
 
@@ -778,7 +777,6 @@ static bool dl_it(uint8_t *dest, uint32_t bytes, uint32_t start_index, PacketRes
 
     uint32_t bytes_completed = 0;
     __atomic_store_n(&timeout_start_time,  msclock(), __ATOMIC_SEQ_CST);
-    uint64_t tmp_clk;
 
     // Add delay depending on the communication channel & speed
     if (ms_timeout != (size_t) -1)
@@ -815,7 +813,7 @@ static bool dl_it(uint8_t *dest, uint32_t bytes, uint32_t start_index, PacketRes
             }
         }
 
-        tmp_clk = __atomic_load_n(&timeout_start_time, __ATOMIC_SEQ_CST);
+        uint64_t tmp_clk = __atomic_load_n(&timeout_start_time, __ATOMIC_SEQ_CST);
         if (msclock() - tmp_clk > ms_timeout) {
             PrintAndLogEx(FAILED, "Timed out while trying to download data from device");
             break;
diff --git a/client/emv/apduinfo.c b/client/emv/apduinfo.c
index 27e48156c..df44ef961 100644
--- a/client/emv/apduinfo.c
+++ b/client/emv/apduinfo.c
@@ -279,14 +279,13 @@ static int CodeCmp(const char *code1, const char *code2) {
 
 const APDUCode *GetAPDUCode(uint8_t sw1, uint8_t sw2) {
     char buf[6] = {0};
-    int res;
     int mineq = APDUCodeTableLen;
     int mineqindx = 0;
 
     sprintf(buf, "%02X%02X", sw1, sw2);
 
     for (int i = 0; i < APDUCodeTableLen; i++) {
-        res = CodeCmp(APDUCodeTable[i].ID, buf);
+        int res = CodeCmp(APDUCodeTable[i].ID, buf);
 
         // equal
         if (res == 0) {
diff --git a/client/fido/cose.c b/client/fido/cose.c
index 82f6999b8..c62d6cfb3 100644
--- a/client/fido/cose.c
+++ b/client/fido/cose.c
@@ -220,9 +220,9 @@ int COSEGetECDSAKey(uint8_t *data, size_t datalen, bool verbose, uint8_t *public
     }
 
     // d - private key
-    uint8_t private_key[128] = {0};
     res = CborMapGetKeyById(&parser, &map, data, datalen, -4);
     if (!res) {
+        uint8_t private_key[128] = {0};
         res = CborGetBinStringValue(&map, private_key, sizeof(private_key), &len);
         cbor_check(res);
         if (verbose)
diff --git a/client/fpga_compress.c b/client/fpga_compress.c
index 7e5616813..7cd4652e1 100644
--- a/client/fpga_compress.c
+++ b/client/fpga_compress.c
@@ -397,10 +397,6 @@ static int generate_fpga_version_info(FILE *infile[], char *infile_names[], int
 }
 
 int main(int argc, char **argv) {
-    FILE **infiles;
-    char **infile_names;
-    FILE *outfile;
-
     if (argc == 1 || argc == 2) {
         usage();
         return (EXIT_FAILURE);
@@ -408,7 +404,7 @@ int main(int argc, char **argv) {
 
     if (!strcmp(argv[1], "-d")) { // Decompress
 
-        infiles = calloc(1, sizeof(FILE *));
+        FILE **infiles = calloc(1, sizeof(FILE *));
         if (argc != 4) {
             usage();
             free(infiles);
@@ -420,7 +416,7 @@ int main(int argc, char **argv) {
             free(infiles);
             return (EXIT_FAILURE);
         }
-        outfile = fopen(argv[3], "wb");
+        FILE *outfile = fopen(argv[3], "wb");
         if (outfile == NULL) {
             fprintf(stderr, "Error. Cannot open output file %s\n\n", argv[3]);
             free(infiles);
@@ -450,8 +446,8 @@ int main(int argc, char **argv) {
             num_input_files = argc - 2;
         }
 
-        infiles = calloc(num_input_files, sizeof(FILE *));
-        infile_names = calloc(num_input_files, sizeof(char *));
+        FILE **infiles = calloc(num_input_files, sizeof(FILE *));
+        char **infile_names = calloc(num_input_files, sizeof(char *));
         for (uint16_t i = 0; i < num_input_files; i++) {
             infile_names[i] = argv[i + ((hardnested_mode || generate_version_file) ? 2 : 1)];
             infiles[i] = fopen(infile_names[i], "rb");
@@ -462,7 +458,7 @@ int main(int argc, char **argv) {
                 return (EXIT_FAILURE);
             }
         }
-        outfile = fopen(argv[argc - 1], "wb");
+        FILE *outfile = fopen(argv[argc - 1], "wb");
         if (outfile == NULL) {
             fprintf(stderr, "Error. Cannot open output file %s\n\n", argv[argc - 1]);
             free(infile_names);
diff --git a/client/loclass/ikeys.c b/client/loclass/ikeys.c
index 0c0235b31..70605942f 100644
--- a/client/loclass/ikeys.c
+++ b/client/loclass/ikeys.c
@@ -257,17 +257,15 @@ void hash0(uint64_t c, uint8_t k[8]) {
     // z0-z7 6 bits each : 48 bits
     uint8_t x = (c & 0xFF00000000000000) >> 56;
     uint8_t y = (c & 0x00FF000000000000) >> 48;
-    int n;
-    uint8_t zn, zn4, _zn, _zn4;
     uint64_t zP = 0;
 
-    for (n = 0;  n < 4 ; n++) {
-        zn = getSixBitByte(c, n);
+    for (int n = 0;  n < 4 ; n++) {
+        uint8_t zn = getSixBitByte(c, n);
 
-        zn4 = getSixBitByte(c, n + 4);
+        uint8_t zn4 = getSixBitByte(c, n + 4);
 
-        _zn = (zn % (63 - n)) + n;
-        _zn4 = (zn4 % (64 - n)) + n;
+        uint8_t _zn = (zn % (63 - n)) + n;
+        uint8_t _zn4 = (zn4 % (64 - n)) + n;
 
         pushbackSixBitByte(&zP, _zn, n);
         pushbackSixBitByte(&zP, _zn4, n + 4);
@@ -300,9 +298,8 @@ void hash0(uint64_t c, uint8_t k[8]) {
 
     printState("0|0|z~", zTilde);
 
-    int i;
-    int zerocounter = 0 ;
-    for (i = 0; i < 8; i++) {
+//    int zerocounter = 0 ;
+    for (int i = 0; i < 8; i++) {
         // the key on index i is first a bit from y
         // then six bits from z,
         // then a bit from p
@@ -340,9 +337,9 @@ void hash0(uint64_t c, uint8_t k[8]) {
             k[i] |= zTilde_i & 0x7E;
             k[i] |= (~p_i) & 1;
         }
-        if ((k[i] & 1) == 0) {
-            zerocounter++;
-        }
+//        if ((k[i] & 1) == 0) {
+//            zerocounter++;
+//        }
     }
 }
 /**
diff --git a/client/mifare/mfkey.c b/client/mifare/mfkey.c
index 3ce2975b9..178da7fe4 100644
--- a/client/mifare/mfkey.c
+++ b/client/mifare/mfkey.c
@@ -45,7 +45,7 @@ uint32_t intersection(uint64_t *listA, uint64_t *listB) {
 uint32_t nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint32_t ar, uint64_t par_info, uint64_t ks_info, uint64_t **keys) {
     struct Crypto1State *states;
     uint32_t i, pos;
-    uint8_t bt, ks3x[8], par[8][8];
+    uint8_t ks3x[8], par[8][8];
     uint64_t key_recovered;
     uint64_t *keylist;
 
@@ -54,7 +54,7 @@ uint32_t nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint32_t ar, uint64_t
 
     for (pos = 0; pos < 8; pos++) {
         ks3x[7 - pos] = (ks_info >> (pos * 8)) & 0x0F;
-        bt = (par_info >> (pos * 8)) & 0xFF;
+        uint8_t bt = (par_info >> (pos * 8)) & 0xFF;
 
         par[7 - pos][0] = (bt >> 0) & 1;
         par[7 - pos][1] = (bt >> 1) & 1;
diff --git a/client/mifare/mifarehost.c b/client/mifare/mifarehost.c
index 076d3f092..7bbd61812 100644
--- a/client/mifare/mifarehost.c
+++ b/client/mifare/mifarehost.c
@@ -339,16 +339,16 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo,
     while (p1 <= statelists[0].tail.sltail && p2 <= statelists[1].tail.sltail) {
         if (Compare16Bits(p1, p2) == 0) {
 
-            struct Crypto1State savestate, *savep = &savestate;
+            struct Crypto1State savestate;
             savestate = *p1;
-            while (Compare16Bits(p1, savep) == 0 && p1 <= statelists[0].tail.sltail) {
+            while (Compare16Bits(p1, &savestate) == 0 && p1 <= statelists[0].tail.sltail) {
                 *p3 = *p1;
                 lfsr_rollback_word(p3, statelists[0].nt ^ statelists[0].uid, 0);
                 p3++;
                 p1++;
             }
             savestate = *p2;
-            while (Compare16Bits(p2, savep) == 0 && p2 <= statelists[1].tail.sltail) {
+            while (Compare16Bits(p2, &savestate) == 0 && p2 <= statelists[1].tail.sltail) {
                 *p4 = *p2;
                 lfsr_rollback_word(p4, statelists[1].nt ^ statelists[1].uid, 0);
                 p4++;
@@ -710,10 +710,6 @@ void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len, bool i
 }
 
 int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
-    uint32_t nt = 0;      // tag challenge
-    uint32_t nr_enc = 0;  // encrypted reader challenge
-    uint32_t ar_enc = 0;  // encrypted reader response
-    uint32_t at_enc = 0;  // encrypted tag response
     if (traceState == TRACE_ERROR)
         return PM3_ESOFT;
 
@@ -831,6 +827,10 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
             break;
         case TRACE_AUTH_OK:
             if (len == 4) {
+                uint32_t nt = 0;      // tag challenge
+                uint32_t nr_enc = 0;  // encrypted reader challenge
+                uint32_t ar_enc = 0;  // encrypted reader response
+                uint32_t at_enc = 0;  // encrypted tag response
                 traceState = TRACE_IDLE;
                 // encrypted tag response
                 at_enc = bytes_to_num(data, 4);
diff --git a/client/pm3_binlib.c b/client/pm3_binlib.c
index c90fc96f9..d694ee3b0 100644
--- a/client/pm3_binlib.c
+++ b/client/pm3_binlib.c
@@ -167,12 +167,11 @@ static int l_unpack(lua_State *L) {       /** unpack(f,s, [init]) */
                 case OP_HEX: {
                     luaL_Buffer buf;
                     char hdigit = '0';
-                    int val = 0;
                     luaL_buffinit(L, &buf);
                     N++;
                     if (i + N > len) {done = 1; break;}
                     for (unsigned int ii = i; ii < i + N; ii++) {
-                        val = s[ii] & 0xF0;
+                        int val = s[ii] & 0xF0;
                         val = val >> 4;
                         hdigit = HEXDIGITS(val);
                         luaL_addlstring(&buf, &hdigit, 1);
diff --git a/client/scripting.c b/client/scripting.c
index 19914c258..cfa361256 100644
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -338,6 +338,7 @@ static int l_WaitForResponseTimeout(lua_State *L) {
 
     memcpy(foo + n, &resp.ng, sizeof(resp.ng));
     n += sizeof(resp.ng);
+    (void) n;
 
     //Push it as a string
     lua_pushlstring(L, (const char *)&foo, sizeof(foo));
@@ -995,7 +996,7 @@ static int l_T55xx_detect(lua_State *L) {
 //
 static int l_ndefparse(lua_State *L) {
 
-    size_t len = 0, size;
+    size_t size;
 
     //Check number of arguments
     int n = lua_gettop(L);
@@ -1021,7 +1022,6 @@ static int l_ndefparse(lua_State *L) {
         for (int i = 0; i < size; i += 2) {
             sscanf(&p_data[i], "%02x", &tmp);
             data[i >> 1] = tmp & 0xFF;
-            len++;
         }
     }
 
diff --git a/client/ui.c b/client/ui.c
index f233da60a..0dcaca9e6 100644
--- a/client/ui.c
+++ b/client/ui.c
@@ -234,13 +234,13 @@ void memcpy_filter_ansi(void *dest, const void *src, size_t n, bool filter) {
         uint8_t *rsrc = (uint8_t *)src;
         uint16_t si = 0;
         for (uint16_t i = 0; i < n; i++) {
-            if ((rsrc[i] == '\x1b')
-                    && (i < n - 1)
+            if ((i < n - 1)
+                    && (rsrc[i] == '\x1b')
                     && (rsrc[i + 1] >= 0x40)
                     && (rsrc[i + 1] <= 0x5F)) {  // entering ANSI sequence
 
                 i++;
-                if ((rsrc[i] == '[') && (i < n - 1)) { // entering CSI sequence
+                if ((i < n - 1) && (rsrc[i] == '[')) { // entering CSI sequence
                     i++;
 
                     while ((i < n - 1) && (rsrc[i] >= 0x30) && (rsrc[i] <= 0x3F)) { // parameter bytes
diff --git a/common/bucketsort.c b/common/bucketsort.c
index dd70755ec..9ede6ee6e 100644
--- a/common/bucketsort.c
+++ b/common/bucketsort.c
@@ -29,10 +29,9 @@ extern void bucket_sort_intersect(uint32_t *const estart, uint32_t *const estop,
 
     // write back intersecting buckets as sorted list.
     // fill in bucket_info with head and tail of the bucket contents in the list and number of non-empty buckets.
-    uint32_t nonempty_bucket;
     for (uint32_t i = 0; i < 2; i++) {
         p1 = start[i];
-        nonempty_bucket = 0;
+        uint32_t nonempty_bucket = 0;
         for (uint32_t j = 0x00; j <= 0xff; j++) {
             if (bucket[0][j].bp != bucket[0][j].head && bucket[1][j].bp != bucket[1][j].head) { // non-empty intersecting buckets only
                 bucket_info->bucket_info[i][nonempty_bucket].head = p1;
diff --git a/common/crapto1/crapto1.c b/common/crapto1/crapto1.c
index a74fbb36c..ba55227b5 100644
--- a/common/crapto1/crapto1.c
+++ b/common/crapto1/crapto1.c
@@ -369,12 +369,12 @@ uint32_t lfsr_rollback_word(struct Crypto1State *s, uint32_t in, int fb) {
  */
 static uint16_t *dist = 0;
 int nonce_distance(uint32_t from, uint32_t to) {
-    uint16_t x, i;
     if (!dist) {
         dist = calloc(2 << 16,  sizeof(uint8_t));
         if (!dist)
             return -1;
-        for (x = i = 1; i; ++i) {
+        uint16_t x = 1;
+        for (uint16_t i = 1; i; ++i) {
             dist[(x & 0xff) << 8 | x >> 8] = i;
             x = x >> 1 | (x ^ x >> 2 ^ x >> 3 ^ x >> 5) << 15;
         }
@@ -412,12 +412,12 @@ uint32_t *lfsr_prefix_ks(uint8_t ks[8], int isodd) {
     uint32_t *candidates = calloc(4 << 10, sizeof(uint8_t));
     if (!candidates) return 0;
 
-    uint32_t c,  entry;
-    int size = 0, i, good;
+    int size = 0;
 
-    for (i = 0; i < 1 << 21; ++i) {
-        for (c = 0, good = 1; good && c < 8; ++c) {
-            entry = i ^ fastfwd[isodd][c];
+    for (int i = 0; i < 1 << 21; ++i) {
+        int good = 1;
+        for (uint32_t c = 0; good && c < 8; ++c) {
+            uint32_t entry = i ^ fastfwd[isodd][c];
             good &= (BIT(ks[c], isodd) == filter(entry >> 1));
             good &= (BIT(ks[c], isodd + 2) == filter(entry));
         }
@@ -434,24 +434,24 @@ uint32_t *lfsr_prefix_ks(uint8_t ks[8], int isodd) {
  * helper function which eliminates possible secret states using parity bits
  */
 static struct Crypto1State *check_pfx_parity(uint32_t prefix, uint32_t rresp, uint8_t parities[8][8], uint32_t odd, uint32_t even, struct Crypto1State *sl, uint32_t no_par) {
-    uint32_t ks1, nr, ks2, rr, ks3, c, good = 1;
+    uint32_t good = 1;
 
-    for (c = 0; good && c < 8; ++c) {
+    for (uint32_t c = 0; good && c < 8; ++c) {
         sl->odd = odd ^ fastfwd[1][c];
         sl->even = even ^ fastfwd[0][c];
 
         lfsr_rollback_bit(sl, 0, 0);
         lfsr_rollback_bit(sl, 0, 0);
 
-        ks3 = lfsr_rollback_bit(sl, 0, 0);
-        ks2 = lfsr_rollback_word(sl, 0, 0);
-        ks1 = lfsr_rollback_word(sl, prefix | c << 5, 1);
+        uint32_t ks3 = lfsr_rollback_bit(sl, 0, 0);
+        uint32_t ks2 = lfsr_rollback_word(sl, 0, 0);
+        uint32_t ks1 = lfsr_rollback_word(sl, prefix | c << 5, 1);
 
         if (no_par)
             break;
 
-        nr = ks1 ^ (prefix | c << 5);
-        rr = ks2 ^ rresp;
+        uint32_t nr = ks1 ^ (prefix | c << 5);
+        uint32_t rr = ks2 ^ rresp;
 
         good &= evenparity32(nr & 0x000000ff) ^ parities[c][3] ^ BIT(ks2, 24);
         good &= evenparity32(rr & 0xff000000) ^ parities[c][4] ^ BIT(ks2, 16);
diff --git a/common/crc16.c b/common/crc16.c
index 917de3595..47d408660 100644
--- a/common/crc16.c
+++ b/common/crc16.c
@@ -51,16 +51,14 @@ void init_table(CrcType_t crctype) {
 
 void generate_table(uint16_t polynomial, bool refin) {
 
-    uint16_t i, j, crc, c;
-
-    for (i = 0; i < 256; i++) {
-        crc = 0;
+    for (uint16_t i = 0; i < 256; i++) {
+        uint16_t c, crc = 0;
         if (refin)
             c = reflect8(i) << 8;
         else
             c = i << 8;
 
-        for (j = 0; j < 8; j++) {
+        for (uint16_t j = 0; j < 8; j++) {
 
             if ((crc ^ c) & 0x8000)
                 crc = (crc << 1) ^ polynomial;
@@ -109,11 +107,10 @@ uint16_t crc16_fast(uint8_t const *d, size_t n, uint16_t initval, bool refin, bo
 
 // bit looped solution  TODO REMOVED
 uint16_t update_crc16_ex(uint16_t crc, uint8_t c, uint16_t polynomial) {
-    uint16_t i, v, tmp = 0;
+    uint16_t tmp = 0;
+    uint16_t v = (crc ^ c) & 0xff;
 
-    v = (crc ^ c) & 0xff;
-
-    for (i = 0; i < 8; i++) {
+    for (uint16_t i = 0; i < 8; i++) {
 
         if ((tmp ^ v) & 1)
             tmp = (tmp >> 1) ^ polynomial;
@@ -133,9 +130,8 @@ uint16_t Crc16(uint8_t const *d, size_t length, uint16_t remainder, uint16_t pol
     if (length == 0)
         return (~remainder);
 
-    uint8_t c;
     for (uint32_t i = 0; i < length; ++i) {
-        c = d[i];
+        uint8_t c = d[i];
         if (refin) c = reflect8(c);
 
         // xor in at msb
diff --git a/common/lfdemod.c b/common/lfdemod.c
index 0bc4d8d96..a3aaf3f26 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -333,7 +333,7 @@ void getNextHigh(uint8_t *samples, size_t size, int high, size_t *i) {
 
 // load wave counters
 bool loadWaveCounters(uint8_t *samples, size_t size, int lowToLowWaveLen[], int highToLowWaveLen[], int *waveCnt, int *skip, int *minClk, int *high, int *low) {
-    size_t i = 0, firstLow, firstHigh;
+    size_t i = 0;
     //size_t testsize = (size < 512) ? size : 512;
 
     // just noise - no super good detection. good enough
@@ -352,10 +352,10 @@ bool loadWaveCounters(uint8_t *samples, size_t size, int lowToLowWaveLen[], int
     // populate tmpbuff buffer with pulse lengths
     while (i < size) {
         // measure from low to low
-        firstLow = i;
+        size_t firstLow = i;
         //find first high point for this wave
         getNextHigh(samples, size, *high, &i);
-        firstHigh = i;
+        size_t firstHigh = i;
 
         getNextLow(samples, size, *low, &i);
 
diff --git a/common/usart.c b/common/usart.c
index 3b1587f40..c7b4a5ebb 100644
--- a/common/usart.c
+++ b/common/usart.c
@@ -112,7 +112,7 @@ uint16_t usart_rxdata_available(void) {
 
 uint32_t usart_read_ng(uint8_t *data, size_t len) {
     if (len == 0) return 0;
-    uint32_t packetSize, nbBytesRcv = 0;
+    uint32_t nbBytesRcv = 0;
     uint32_t try = 0;
 //    uint32_t highest_observed_try = 0;
     // Empirical max try observed: 3000000 / USART_BAUD_RATE
@@ -129,7 +129,7 @@ uint32_t usart_read_ng(uint8_t *data, size_t len) {
     while (len) {
         uint32_t available = usart_rxdata_available();
 
-        packetSize = MIN(available, len);
+        uint32_t packetSize = MIN(available, len);
         if (available > 0) {
 //            Dbprintf_usb("Dbg USART ask %d bytes, available %d bytes, packetsize %d bytes", len, available, packetSize);
 //            highest_observed_try = MAX(highest_observed_try, try);
diff --git a/common/usb_cdc.c b/common/usb_cdc.c
index 63d5c66d0..25a5d80d9 100644
--- a/common/usb_cdc.c
+++ b/common/usb_cdc.c
@@ -766,11 +766,10 @@ int usb_write(const uint8_t *data, const size_t len) {
 //* \brief Send Data through the control endpoint
 //*----------------------------------------------------------------------------
 void AT91F_USB_SendData(AT91PS_UDP pUdp, const char *pData, uint32_t length) {
-    uint32_t cpt = 0;
     AT91_REG csr;
 
     do {
-        cpt = MIN(length, AT91C_EP_CONTROL_SIZE);
+        uint32_t cpt = MIN(length, AT91C_EP_CONTROL_SIZE);
         length -= cpt;
 
         while (cpt--)
diff --git a/tools/nonce2key/crapto1.c b/tools/nonce2key/crapto1.c
index bc9165f0e..3be92c0f2 100644
--- a/tools/nonce2key/crapto1.c
+++ b/tools/nonce2key/crapto1.c
@@ -428,12 +428,12 @@ uint32_t lfsr_rollback_word(struct Crypto1State *s, uint32_t in, int fb) {
  */
 static uint16_t *dist = 0;
 int nonce_distance(uint32_t from, uint32_t to) {
-    uint16_t x, i;
     if (!dist) {
         dist = calloc(2 << 16,  sizeof(uint8_t));
         if (!dist)
             return -1;
-        for (x = i = 1; i; ++i) {
+        uint16_t x = 1;
+        for (uint16_t i = 1; i; ++i) {
             dist[(x & 0xff) << 8 | x >> 8] = i;
             x = x >> 1 | (x ^ x >> 2 ^ x >> 3 ^ x >> 5) << 15;
         }
diff --git a/tools/nonce2key/nonce2key.c b/tools/nonce2key/nonce2key.c
index 7c1514a28..f4cb10e62 100644
--- a/tools/nonce2key/nonce2key.c
+++ b/tools/nonce2key/nonce2key.c
@@ -5,8 +5,8 @@
 
 int main(const int argc, const char *argv[]) {
     struct Crypto1State *state;
-    uint32_t pos, uid, nt, nr, rr, nr_diff;
-    uint8_t bt, i, ks3x[8], par[8][8];
+    uint32_t pos, uid, nt, nr, rr;
+    uint8_t ks3x[8], par[8][8];
     uint64_t key_recovered;
     uint64_t par_info;
     uint64_t ks_info;
@@ -28,9 +28,9 @@ int main(const int argc, const char *argv[]) {
 
     for (pos = 0; pos < 8; pos++) {
         ks3x[7 - pos] = (ks_info >> (pos * 8)) & 0x0f;
-        bt = (par_info >> (pos * 8)) & 0xff;
+        uint8_t bt = (par_info >> (pos * 8)) & 0xff;
 
-        for (i = 0; i < 8; i++) {
+        for (uint8_t i = 0; i < 8; i++) {
             par[7 - pos][i] = (bt >> i) & 0x01;
         }
     }
@@ -38,8 +38,8 @@ int main(const int argc, const char *argv[]) {
     printf("|diff|{nr}    |ks3|ks3^5|parity         |\n");
     printf("+----+--------+---+-----+---------------+\n");
 
-    for (i = 0; i < 8; i++) {
-        nr_diff = nr | i << 5;
+    for (uint8_t i = 0; i < 8; i++) {
+        uint32_t nr_diff = nr | i << 5;
         printf("| %02x |%08x| %01x |  %01x  |", i << 5, nr_diff, ks3x[i], ks3x[i] ^ 5);
 
         for (pos = 0; pos < 7; pos++)

From f7dfd2a1f2f12328e9210da60d6ac1d2ec72008e Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 7 Jun 2019 21:26:03 +0200
Subject: [PATCH 1908/1938] Fix arg names mismatches between decl & def

---
 armsrc/apps.h        |  4 ++--
 client/cmdlfviking.h |  2 +-
 common/lfdemod.c     | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/armsrc/apps.h b/armsrc/apps.h
index 59832d6b4..41a1f0271 100644
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -45,9 +45,9 @@ void ReadMem(int addr);
 void __attribute__((noreturn)) AppMain(void);
 //void DbpIntegers(int a, int b, int c);
 void DbpString(char *str);
-void DbpStringEx(uint32_t cmd, char *str);
+void DbpStringEx(uint32_t flags, char *str);
 void Dbprintf(const char *fmt, ...);
-void DbprintfEx(uint32_t cmd, const char *fmt, ...);
+void DbprintfEx(uint32_t flags, const char *fmt, ...);
 void Dbhexdump(int len, uint8_t *d, bool bAsci);
 
 // ADC Vref = 3300mV, and an (10M+1M):1M voltage divider on the HF input can measure voltages up to 36300 mV
diff --git a/client/cmdlfviking.h b/client/cmdlfviking.h
index 2baea6364..8789515d6 100644
--- a/client/cmdlfviking.h
+++ b/client/cmdlfviking.h
@@ -24,7 +24,7 @@
 int CmdLFViking(const char *Cmd);
 
 int demodViking(void);
-int detectViking(uint8_t *dest, size_t *size);
+int detectViking(uint8_t *src, size_t *size);
 uint64_t getVikingBits(uint32_t id);
 
 #endif
diff --git a/common/lfdemod.c b/common/lfdemod.c
index a3aaf3f26..7bdd27580 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -479,14 +479,14 @@ bool DetectCleanAskWave(uint8_t *dest, size_t size, uint8_t high, uint8_t low) {
 // by marshmellow
 // to help detect clocks on heavily clipped samples
 // based on count of low to low
-int DetectStrongAskClock(uint8_t *src, size_t size, int high, int low, int *clock) {
+int DetectStrongAskClock(uint8_t *dest, size_t size, int high, int low, int *clock) {
     size_t i = 100;
     size_t minClk = 512;
     uint16_t shortestWaveIdx = 0;
 
     // get to first full low to prime loop and skip incomplete first pulse
-    getNextHigh(src, size, high, &i);
-    getNextLow(src, size, low, &i);
+    getNextHigh(dest, size, high, &i);
+    getNextLow(dest, size, low, &i);
 
     if (i == size)
         return -1;
@@ -512,8 +512,8 @@ int DetectStrongAskClock(uint8_t *src, size_t size, int high, int low, int *cloc
         // measure from low to low
         size_t startwave = i;
 
-        getNextHigh(src, size, high, &i);
-        getNextLow(src, size, low, &i);
+        getNextHigh(dest, size, high, &i);
+        getNextLow(dest, size, low, &i);
 
         //get minimum measured distance
         if (i - startwave < minClk && i < size) {

From 5eeb35641837693ba8b614649981bcd8cbe9f7a4 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 7 Jun 2019 21:39:45 +0200
Subject: [PATCH 1909/1938] appmain switch unified style, avoid few shadowed
 vars as well

---
 armsrc/appmain.c | 419 +++++++++++++++++++++++++++++------------------
 1 file changed, 260 insertions(+), 159 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index ef6ce30d2..23b55a23b 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -369,9 +369,9 @@ void SendVersion(void) {
     payload.id = *(AT91C_DBGU_CIDR);
     payload.section_size = text_and_rodata_section_size + compressed_data_section_size;
     payload.versionstr_len = strlen(VersionString);
-    memcpy(payload.versionstr, VersionString, strlen(VersionString)); 
+    memcpy(payload.versionstr, VersionString, strlen(VersionString));
 
-    reply_ng(CMD_VERSION, PM3_SUCCESS, (uint8_t*)&payload, 12 + strlen(VersionString));
+    reply_ng(CMD_VERSION, PM3_SUCCESS, (uint8_t *)&payload, 12 + strlen(VersionString));
 }
 
 // measure the Connection Speed by sending SpeedTestBufferSize bytes to client and measuring the elapsed time.
@@ -747,32 +747,34 @@ static void PacketReceived(PacketCommandNG *packet) {
             reply_via_usb = false;
             break;
 #ifdef WITH_LF
-        case CMD_SET_LF_T55XX_CONFIG:
+        case CMD_SET_LF_T55XX_CONFIG: {
             setT55xxConfig(packet->oldarg[0], (t55xx_config *) packet->data.asBytes);
             break;
-        case CMD_SET_LF_SAMPLING_CONFIG:
+        }
+        case CMD_SET_LF_SAMPLING_CONFIG: {
             setSamplingConfig((sample_config *) packet->data.asBytes);
             break;
+        }
         case CMD_ACQUIRE_RAW_ADC_SAMPLES_125K: {
             struct p {
                 uint8_t silent;
                 uint32_t samples;
             } PACKED;
-            struct p *payload = (struct p*)packet->data.asBytes;
+            struct p *payload = (struct p *)packet->data.asBytes;
             uint32_t bits = SampleLF(payload->silent, payload->samples);
             reply_ng(CMD_ACQUIRE_RAW_ADC_SAMPLES_125K, PM3_SUCCESS, (uint8_t *)&bits, sizeof(bits));
             break;
         }
         case CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K: {
             struct p {
-               uint32_t delay;
-               uint16_t ones;
-               uint16_t zeros;
+                uint32_t delay;
+                uint16_t ones;
+                uint16_t zeros;
             } PACKED;
-            struct p *payload = (struct p*)packet->data.asBytes;
-            ModThenAcquireRawAdcSamples125k(payload->delay, payload->zeros, payload->ones, packet->data.asBytes+8);
+            struct p *payload = (struct p *)packet->data.asBytes;
+            ModThenAcquireRawAdcSamples125k(payload->delay, payload->zeros, payload->ones, packet->data.asBytes + 8);
             break;
-            }
+        }
         case CMD_LF_SNIFF_RAW_ADC_SAMPLES: {
             uint32_t bits = SniffLF();
             reply_mix(CMD_ACK, bits, 0, 0, 0, 0);
@@ -783,74 +785,84 @@ static void PacketReceived(PacketCommandNG *packet) {
             CmdHIDdemodFSK(packet->oldarg[0], &high, &low, 1);
             break;
         }
-        case CMD_HID_SIM_TAG:
+        case CMD_HID_SIM_TAG: {
             CmdHIDsimTAG(packet->oldarg[0], packet->oldarg[1], 1);
             break;
+        }
         case CMD_FSK_SIM_TAG: {
             lf_fsksim_t *payload = (lf_fsksim_t *)packet->data.asBytes;
             CmdFSKsimTAG(payload->fchigh, payload->fclow, payload->separator, payload->clock, packet->length - sizeof(lf_fsksim_t), payload->data, true);
             break;
-            }
+        }
         case CMD_ASK_SIM_TAG: {
             lf_asksim_t *payload = (lf_asksim_t *)packet->data.asBytes;
             CmdASKsimTAG(payload->encoding, payload->invert, payload->separator, payload->clock, packet->length - sizeof(lf_asksim_t), payload->data, true);
             break;
-            }
+        }
         case CMD_PSK_SIM_TAG: {
             lf_psksim_t *payload = (lf_psksim_t *)packet->data.asBytes;
             CmdPSKsimTag(payload->carrier, payload->invert, payload->clock, packet->length - sizeof(lf_psksim_t), payload->data, true);
             break;
-            }
-        case CMD_HID_CLONE_TAG:
+        }
+        case CMD_HID_CLONE_TAG: {
             CopyHIDtoT55x7(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes[0]);
             break;
+        }
         case CMD_IO_DEMOD_FSK: {
             uint32_t high, low;
             CmdIOdemodFSK(packet->oldarg[0], &high, &low, 1);
             break;
         }
-        case CMD_IO_CLONE_TAG:
+        case CMD_IO_CLONE_TAG: {
             CopyIOtoT55x7(packet->oldarg[0], packet->oldarg[1]);
             break;
+        }
         case CMD_EM410X_DEMOD: {
             uint32_t high;
             uint64_t low;
             CmdEM410xdemod(packet->oldarg[0], &high, &low, 1);
             break;
         }
-        case CMD_EM410X_WRITE_TAG:
+        case CMD_EM410X_WRITE_TAG: {
             WriteEM410x(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2]);
             break;
-        case CMD_READ_TI_TYPE:
+        }
+        case CMD_READ_TI_TYPE: {
             ReadTItag();
             break;
-        case CMD_WRITE_TI_TYPE:
+        }
+        case CMD_WRITE_TI_TYPE: {
             WriteTItag(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2]);
             break;
-        case CMD_SIMULATE_TAG_125K:
+        }
+        case CMD_SIMULATE_TAG_125K: {
             LED_A_ON();
             struct p {
                 uint16_t len;
                 uint16_t gap;
             } PACKED;
-            struct p *payload = (struct p*)packet->data.asBytes;
+            struct p *payload = (struct p *)packet->data.asBytes;
             // length, start gap, led control
             SimulateTagLowFrequency(payload->len, payload->gap, 1);
             reply_ng(CMD_SIMULATE_TAG_125K, PM3_EOPABORTED, NULL, 0);
             LED_A_OFF();
             break;
-        case CMD_LF_SIMULATE_BIDIR:
+        }
+        case CMD_LF_SIMULATE_BIDIR: {
             SimulateTagLowFrequencyBidir(packet->oldarg[0], packet->oldarg[1]);
             break;
-        case CMD_INDALA_CLONE_TAG:
+        }
+        case CMD_INDALA_CLONE_TAG: {
             CopyIndala64toT55x7(packet->data.asDwords[0], packet->data.asDwords[1]);
             break;
-        case CMD_INDALA_CLONE_TAG_L:
+        }
+        case CMD_INDALA_CLONE_TAG_L: {
             CopyIndala224toT55x7(
                 packet->data.asDwords[0], packet->data.asDwords[1], packet->data.asDwords[2], packet->data.asDwords[3],
                 packet->data.asDwords[4], packet->data.asDwords[5], packet->data.asDwords[6]
             );
             break;
+        }
         case CMD_T55XX_READ_BLOCK: {
             struct p {
                 uint32_t password;
@@ -858,27 +870,32 @@ static void PacketReceived(PacketCommandNG *packet) {
                 uint8_t page;
                 bool pwdmode;
             } PACKED;
-            struct p* payload = (struct p*) packet->data.asBytes;
+            struct p *payload = (struct p *) packet->data.asBytes;
             T55xxReadBlock(payload->page, payload->pwdmode, false, payload->blockno, payload->password);
             break;
         }
-        case CMD_T55XX_WRITE_BLOCK:
+        case CMD_T55XX_WRITE_BLOCK: {
             // uses NG format
             T55xxWriteBlock(packet->data.asBytes);
             break;
-        case CMD_T55XX_WAKEUP:
+        }
+        case CMD_T55XX_WAKEUP: {
             T55xxWakeUp(packet->oldarg[0]);
             break;
-        case CMD_T55XX_RESET_READ:
+        }
+        case CMD_T55XX_RESET_READ: {
             T55xxResetRead();
             break;
-        case CMD_T55XX_CHKPWDS:
+        }
+        case CMD_T55XX_CHKPWDS: {
             T55xx_ChkPwds();
             break;
-        case CMD_PCF7931_READ:
+        }
+        case CMD_PCF7931_READ: {
             ReadPCF7931();
             break;
-        case CMD_PCF7931_WRITE:
+        }
+        case CMD_PCF7931_WRITE: {
             WritePCF7931(
                 packet->data.asBytes[0], packet->data.asBytes[1], packet->data.asBytes[2], packet->data.asBytes[3],
                 packet->data.asBytes[4], packet->data.asBytes[5], packet->data.asBytes[6], packet->data.asBytes[9],
@@ -888,104 +905,124 @@ static void PacketReceived(PacketCommandNG *packet) {
                 packet->oldarg[2]
             );
             break;
+        }
         case CMD_EM4X_READ_WORD: {
-           struct p {
+            struct p {
                 uint32_t password;
                 uint8_t address;
                 uint8_t usepwd;
             } PACKED;
-            struct p* payload = (struct p*) packet->data.asBytes;
+            struct p *payload = (struct p *) packet->data.asBytes;
             EM4xReadWord(payload->address, payload->password, payload->usepwd);
             break;
-            }
+        }
         case CMD_EM4X_WRITE_WORD: {
-           struct p {
+            struct p {
                 uint32_t password;
                 uint32_t data;
                 uint8_t address;
                 uint8_t usepwd;
             } PACKED;
-            struct p* payload = (struct p*) packet->data.asBytes;
+            struct p *payload = (struct p *) packet->data.asBytes;
             EM4xWriteWord(payload->address, payload->data, payload->password, payload->usepwd);
             break;
-            }
+        }
         case CMD_AWID_DEMOD_FSK:  {
             uint32_t high, low;
             // Set realtime AWID demodulation
             CmdAWIDdemodFSK(packet->oldarg[0], &high, &low, 1);
             break;
         }
-        case CMD_VIKING_CLONE_TAG:
+        case CMD_VIKING_CLONE_TAG: {
             CopyVikingtoT55xx(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2]);
             break;
-        case CMD_COTAG:
+        }
+        case CMD_COTAG: {
             Cotag(packet->oldarg[0]);
             break;
+        }
 #endif
 
 #ifdef WITH_HITAG
-        case CMD_SNIFF_HITAG: // Eavesdrop Hitag tag, args = type
+        case CMD_SNIFF_HITAG: { // Eavesdrop Hitag tag, args = type
             SniffHitag();
             break;
-        case CMD_SIMULATE_HITAG: // Simulate Hitag tag, args = memory content
+        }
+        case CMD_SIMULATE_HITAG: { // Simulate Hitag tag, args = memory content
             SimulateHitagTag((bool)packet->oldarg[0], packet->data.asBytes);
             break;
-        case CMD_READER_HITAG: // Reader for Hitag tags, args = type and function
+        }
+        case CMD_READER_HITAG: { // Reader for Hitag tags, args = type and function
             ReaderHitag((hitag_function)packet->oldarg[0], (hitag_data *)packet->data.asBytes);
             break;
-        case CMD_SIMULATE_HITAG_S:// Simulate Hitag s tag, args = memory content
+        }
+        case CMD_SIMULATE_HITAG_S: { // Simulate Hitag s tag, args = memory content
             SimulateHitagSTag((bool)packet->oldarg[0], packet->data.asBytes);
             break;
-        case CMD_TEST_HITAGS_TRACES:// Tests every challenge within the given file
+        }
+        case CMD_TEST_HITAGS_TRACES: { // Tests every challenge within the given file
             check_challenges((bool)packet->oldarg[0], packet->data.asBytes);
             break;
-        case CMD_READ_HITAG_S: //Reader for only Hitag S tags, args = key or challenge
+        }
+        case CMD_READ_HITAG_S: { //Reader for only Hitag S tags, args = key or challenge
             ReadHitagS((hitag_function)packet->oldarg[0], (hitag_data *)packet->data.asBytes);
             break;
-        case CMD_WR_HITAG_S: //writer for Hitag tags args=data to write,page and key or challenge
+        }
+        case CMD_WR_HITAG_S: { //writer for Hitag tags args=data to write,page and key or challenge
             if ((hitag_function)packet->oldarg[0] < 10) {
                 WritePageHitagS((hitag_function)packet->oldarg[0], (hitag_data *)packet->data.asBytes, packet->oldarg[2]);
             } else {
                 WriterHitag((hitag_function)packet->oldarg[0], (hitag_data *)packet->data.asBytes, packet->oldarg[2]);
             }
             break;
+        }
 #endif
 
 #ifdef WITH_ISO15693
-        case CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_15693:
+        case CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_15693: {
             AcquireRawAdcSamplesIso15693();
             break;
-        case CMD_RECORD_RAW_ADC_SAMPLES_ISO_15693:
+        }
+        case CMD_RECORD_RAW_ADC_SAMPLES_ISO_15693: {
             RecordRawAdcSamplesIso15693();
             break;
-        case CMD_ISO_15693_COMMAND:
+        }
+        case CMD_ISO_15693_COMMAND: {
             DirectTag15693Command(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
             break;
-        case CMD_ISO_15693_FIND_AFI:
+        }
+        case CMD_ISO_15693_FIND_AFI: {
             BruteforceIso15693Afi(packet->oldarg[0]);
             break;
-        case CMD_READER_ISO_15693:
+        }
+        case CMD_READER_ISO_15693: {
             ReaderIso15693(packet->oldarg[0]);
             break;
-        case CMD_SIMTAG_ISO_15693:
+        }
+        case CMD_SIMTAG_ISO_15693: {
             SimTagIso15693(packet->oldarg[0], packet->data.asBytes);
             break;
+        }
 #endif
 
 #ifdef WITH_LEGICRF
-        case CMD_SIMULATE_TAG_LEGIC_RF:
+        case CMD_SIMULATE_TAG_LEGIC_RF: {
             LegicRfSimulate(packet->oldarg[0]);
             break;
-        case CMD_WRITER_LEGIC_RF:
+        }
+        case CMD_WRITER_LEGIC_RF: {
             LegicRfWriter(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
             break;
-        case CMD_READER_LEGIC_RF:
+        }
+        case CMD_READER_LEGIC_RF: {
             LegicRfReader(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2]);
             break;
-        case CMD_LEGIC_INFO:
+        }
+        case CMD_LEGIC_INFO: {
             LegicRfInfo();
             break;
-        case CMD_LEGIC_ESET:
+        }
+        case CMD_LEGIC_ESET: {
             //-----------------------------------------------------------------------------
             // Note: we call FpgaDownloadAndGo(FPGA_BITSTREAM_HF) here although FPGA is not
             // involved in dealing with emulator memory. But if it is called later, it might
@@ -996,106 +1033,132 @@ static void PacketReceived(PacketCommandNG *packet) {
             FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
             emlSet(packet->data.asBytes, packet->oldarg[0], packet->oldarg[1]);
             break;
+        }
 #endif
 
 #ifdef WITH_ISO14443b
-        case CMD_READ_SRI_TAG:
+        case CMD_READ_SRI_TAG: {
             ReadSTMemoryIso14443b(packet->oldarg[0]);
             break;
-        case CMD_SNIFF_ISO_14443B:
+        }
+        case CMD_SNIFF_ISO_14443B: {
             SniffIso14443b();
             break;
-        case CMD_SIMULATE_TAG_ISO_14443B:
+        }
+        case CMD_SIMULATE_TAG_ISO_14443B: {
             SimulateIso14443bTag(packet->oldarg[0]);
             break;
-        case CMD_ISO_14443B_COMMAND:
+        }
+        case CMD_ISO_14443B_COMMAND: {
             //SendRawCommand14443B(packet->oldarg[0],packet->oldarg[1],packet->oldarg[2],packet->data.asBytes);
             SendRawCommand14443B_Ex(packet);
             break;
+        }
 #endif
 
 #ifdef WITH_FELICA
-        case CMD_FELICA_COMMAND:
+        case CMD_FELICA_COMMAND: {
             felica_sendraw(packet);
             break;
-        case CMD_FELICA_LITE_SIM:
+        }
+        case CMD_FELICA_LITE_SIM: {
             felica_sim_lite(packet->oldarg[0]);
             break;
-        case CMD_FELICA_SNIFF:
+        }
+        case CMD_FELICA_SNIFF: {
             felica_sniff(packet->oldarg[0], packet->oldarg[1]);
             break;
-        case CMD_FELICA_LITE_DUMP:
+        }
+        case CMD_FELICA_LITE_DUMP: {
             felica_dump_lite_s();
             break;
+        }
 #endif
 
 #ifdef WITH_ISO14443a
-        case CMD_SNIFF_ISO_14443a:
+        case CMD_SNIFF_ISO_14443a: {
             SniffIso14443a(packet->data.asBytes[0]);
             break;
-        case CMD_READER_ISO_14443a:
+        }
+        case CMD_READER_ISO_14443a: {
             ReaderIso14443a(packet);
             break;
+        }
         case CMD_SIMULATE_TAG_ISO_14443a: {
             struct p {
-               uint8_t tagtype;
-               uint8_t flags;
-               uint8_t uid[10];
+                uint8_t tagtype;
+                uint8_t flags;
+                uint8_t uid[10];
             } PACKED;
-            struct p* payload = (struct p*) packet->data.asBytes;            
+            struct p *payload = (struct p *) packet->data.asBytes;
             SimulateIso14443aTag(payload->tagtype, payload->flags, payload->uid);  // ## Simulate iso14443a tag - pass tag type & UID
             break;
-            }
-        case CMD_ANTIFUZZ_ISO_14443a:
+        }
+        case CMD_ANTIFUZZ_ISO_14443a: {
             iso14443a_antifuzz(packet->oldarg[0]);
             break;
-        case CMD_EPA_PACE_COLLECT_NONCE:
+        }
+        case CMD_EPA_PACE_COLLECT_NONCE: {
             EPA_PACE_Collect_Nonce(packet);
             break;
-        case CMD_EPA_PACE_REPLAY:
+        }
+        case CMD_EPA_PACE_REPLAY: {
             EPA_PACE_Replay(packet);
             break;
-        case CMD_READER_MIFARE:
+        }
+        case CMD_READER_MIFARE: {
             ReaderMifare(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2]);
             break;
+        }
         case CMD_MIFARE_READBL: {
             mf_readblock_t *payload = (mf_readblock_t *)packet->data.asBytes;
             MifareReadBlock(payload->blockno, payload->keytype, payload->key);
             break;
-            }
-        case CMD_MIFAREU_READBL:
+        }
+        case CMD_MIFAREU_READBL: {
             MifareUReadBlock(packet->oldarg[0], packet->oldarg[1], packet->data.asBytes);
             break;
-        case CMD_MIFAREUC_AUTH:
+        }
+        case CMD_MIFAREUC_AUTH: {
             MifareUC_Auth(packet->oldarg[0], packet->data.asBytes);
             break;
-        case CMD_MIFAREU_READCARD:
+        }
+        case CMD_MIFAREU_READCARD: {
             MifareUReadCard(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
             break;
-        case CMD_MIFAREUC_SETPWD:
+        }
+        case CMD_MIFAREUC_SETPWD: {
             MifareUSetPwd(packet->oldarg[0], packet->data.asBytes);
             break;
-        case CMD_MIFARE_READSC:
+        }
+        case CMD_MIFARE_READSC: {
             MifareReadSector(packet->oldarg[0], packet->oldarg[1], packet->data.asBytes);
             break;
-        case CMD_MIFARE_WRITEBL:
+        }
+        case CMD_MIFARE_WRITEBL: {
             MifareWriteBlock(packet->oldarg[0], packet->oldarg[1], packet->data.asBytes);
             break;
-        //case CMD_MIFAREU_WRITEBL_COMPAT:
+        }
+        //case CMD_MIFAREU_WRITEBL_COMPAT: {
         //MifareUWriteBlockCompat(packet->oldarg[0], packet->data.asBytes);
         //break;
-        case CMD_MIFAREU_WRITEBL:
+        //}
+        case CMD_MIFAREU_WRITEBL: {
             MifareUWriteBlock(packet->oldarg[0], packet->oldarg[1], packet->data.asBytes);
             break;
-        case CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES:
+        }
+        case CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES: {
             MifareAcquireEncryptedNonces(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
             break;
-        case CMD_MIFARE_ACQUIRE_NONCES:
+        }
+        case CMD_MIFARE_ACQUIRE_NONCES: {
             MifareAcquireNonces(packet->oldarg[0], packet->oldarg[2]);
             break;
-        case CMD_MIFARE_NESTED:
+        }
+        case CMD_MIFARE_NESTED: {
             MifareNested(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
             break;
+        }
         case CMD_MIFARE_CHKKEYS: {
             MifareChkKeys(packet->data.asBytes);
             break;
@@ -1106,24 +1169,26 @@ static void PacketReceived(PacketCommandNG *packet) {
         }
         case CMD_SIMULATE_MIFARE_CARD: {
             struct p {
-               uint16_t flags;
-               uint8_t exitAfter;
-               uint8_t uid[10];
+                uint16_t flags;
+                uint8_t exitAfter;
+                uint8_t uid[10];
             } PACKED;
-            struct p* payload = (struct p*) packet->data.asBytes;   
+            struct p *payload = (struct p *) packet->data.asBytes;
             Mifare1ksim(payload->flags, payload->exitAfter, payload->uid);
             break;
         }
         // emulator
-        case CMD_SET_DBGMODE:
+        case CMD_SET_DBGMODE: {
             DBGLEVEL = packet->data.asBytes[0];
             Dbprintf("Debug level: %d", DBGLEVEL);
             reply_ng(CMD_SET_DBGMODE, PM3_SUCCESS, NULL, 0);
             break;
-        case CMD_MIFARE_EML_MEMCLR:
+        }
+        case CMD_MIFARE_EML_MEMCLR: {
             MifareEMemClr();
-            reply_ng(CMD_MIFARE_EML_MEMCLR, PM3_SUCCESS, NULL, 0);               
+            reply_ng(CMD_MIFARE_EML_MEMCLR, PM3_SUCCESS, NULL, 0);
             break;
+        }
         case CMD_MIFARE_EML_MEMSET: {
             struct p {
                 uint8_t blockno;
@@ -1131,7 +1196,7 @@ static void PacketReceived(PacketCommandNG *packet) {
                 uint8_t blockwidth;
                 uint8_t data[];
             } PACKED;
-            struct p* payload = (struct p*) packet->data.asBytes;
+            struct p *payload = (struct p *) packet->data.asBytes;
             MifareEMemSet(payload->blockno, payload->blockcnt, payload->blockwidth, payload->data);
             break;
         }
@@ -1140,104 +1205,131 @@ static void PacketReceived(PacketCommandNG *packet) {
                 uint8_t blockno;
                 uint8_t blockcnt;
             } PACKED;
-            struct p* payload = (struct p*) packet->data.asBytes;
+            struct p *payload = (struct p *) packet->data.asBytes;
             MifareEMemGet(payload->blockno, payload->blockcnt);
             break;
         }
-        case CMD_MIFARE_EML_CARDLOAD:
+        case CMD_MIFARE_EML_CARDLOAD: {
             MifareECardLoad(packet->oldarg[0], packet->oldarg[1]);
             break;
-
+        }
         // Work with "magic Chinese" card
-        case CMD_MIFARE_CSETBLOCK:
+        case CMD_MIFARE_CSETBLOCK: {
             MifareCSetBlock(packet->oldarg[0], packet->oldarg[1], packet->data.asBytes);
             break;
-        case CMD_MIFARE_CGETBLOCK:
+        }
+        case CMD_MIFARE_CGETBLOCK: {
             MifareCGetBlock(packet->oldarg[0], packet->oldarg[1], packet->data.asBytes);
             break;
-        case CMD_MIFARE_CIDENT:
+        }
+        case CMD_MIFARE_CIDENT: {
             MifareCIdent();
             break;
+        }
         // mifare sniffer
-//        case CMD_MIFARE_SNIFFER:
+//        case CMD_MIFARE_SNIFFER: {
 //            SniffMifare(packet->oldarg[0]);
 //            break;
-        case CMD_MIFARE_SETMOD:
+//        }
+        case CMD_MIFARE_SETMOD: {
             MifareSetMod(packet->data.asBytes);
             break;
+        }
         //mifare desfire
-        case CMD_MIFARE_DESFIRE_READBL:
+        case CMD_MIFARE_DESFIRE_READBL: {
             break;
-        case CMD_MIFARE_DESFIRE_WRITEBL:
+        }
+        case CMD_MIFARE_DESFIRE_WRITEBL: {
             break;
-        case CMD_MIFARE_DESFIRE_AUTH1:
+        }
+        case CMD_MIFARE_DESFIRE_AUTH1: {
             MifareDES_Auth1(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
             break;
-        case CMD_MIFARE_DESFIRE_AUTH2:
+        }
+        case CMD_MIFARE_DESFIRE_AUTH2: {
             //MifareDES_Auth2(packet->oldarg[0],packet->data.asBytes);
             break;
-        case CMD_MIFARE_DES_READER:
+        }
+        case CMD_MIFARE_DES_READER: {
             //readermifaredes(packet->oldarg[0], packet->oldarg[1], packet->data.asBytes);
             break;
-        case CMD_MIFARE_DESFIRE_INFO:
+        }
+        case CMD_MIFARE_DESFIRE_INFO: {
             MifareDesfireGetInformation();
             break;
-        case CMD_MIFARE_DESFIRE:
+        }
+        case CMD_MIFARE_DESFIRE: {
             MifareSendCommand(packet->oldarg[0], packet->oldarg[1], packet->data.asBytes);
             break;
-        case CMD_MIFARE_COLLECT_NONCES:
+        }
+        case CMD_MIFARE_COLLECT_NONCES: {
             break;
-        case CMD_MIFARE_NACK_DETECT:
+        }
+        case CMD_MIFARE_NACK_DETECT: {
             DetectNACKbug();
             break;
+        }
 #endif
 
 #ifdef WITH_ICLASS
         // Makes use of ISO14443a FPGA Firmware
-        case CMD_SNIFF_ICLASS:
+        case CMD_SNIFF_ICLASS: {
             SniffIClass();
             break;
-        case CMD_SIMULATE_TAG_ICLASS:
+        }
+        case CMD_SIMULATE_TAG_ICLASS: {
             SimulateIClass(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
             break;
-        case CMD_READER_ICLASS:
+        }
+        case CMD_READER_ICLASS: {
             ReaderIClass(packet->oldarg[0]);
             break;
-        case CMD_READER_ICLASS_REPLAY:
+        }
+        case CMD_READER_ICLASS_REPLAY: {
             ReaderIClass_Replay(packet->oldarg[0], packet->data.asBytes);
             break;
-        case CMD_ICLASS_EML_MEMSET:
+        }
+        case CMD_ICLASS_EML_MEMSET: {
             //iceman, should call FPGADOWNLOAD before, since it corrupts BigBuf
             FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
             emlSet(packet->data.asBytes, packet->oldarg[0], packet->oldarg[1]);
             break;
-        case CMD_ICLASS_WRITEBLOCK:
+        }
+        case CMD_ICLASS_WRITEBLOCK: {
             iClass_WriteBlock(packet->oldarg[0], packet->data.asBytes);
             break;
-        case CMD_ICLASS_READCHECK:  // auth step 1
+        }
+        case CMD_ICLASS_READCHECK: { // auth step 1
             iClass_ReadCheck(packet->oldarg[0], packet->oldarg[1]);
             break;
-        case CMD_ICLASS_READBLOCK:
+        }
+        case CMD_ICLASS_READBLOCK: {
             iClass_ReadBlk(packet->oldarg[0]);
             break;
-        case CMD_ICLASS_AUTHENTICATION: //check
+        }
+        case CMD_ICLASS_AUTHENTICATION: { //check
             iClass_Authentication(packet->data.asBytes);
             break;
-        case CMD_ICLASS_CHECK_KEYS:
+        }
+        case CMD_ICLASS_CHECK_KEYS: {
             iClass_Authentication_fast(packet->oldarg[0], packet->oldarg[1], packet->data.asBytes);
             break;
-        case CMD_ICLASS_DUMP:
+        }
+        case CMD_ICLASS_DUMP: {
             iClass_Dump(packet->oldarg[0], packet->oldarg[1]);
             break;
-        case CMD_ICLASS_CLONE:
+        }
+        case CMD_ICLASS_CLONE: {
             iClass_Clone(packet->oldarg[0], packet->oldarg[1], packet->data.asBytes);
             break;
+        }
 #endif
 
 #ifdef WITH_HFSNIFF
-        case CMD_HF_SNIFFER:
+        case CMD_HF_SNIFFER: {
             HfSniff(packet->oldarg[0], packet->oldarg[1]);
             break;
+        }
 #endif
 
 #ifdef WITH_SMARTCARD
@@ -1361,17 +1453,16 @@ static void PacketReceived(PacketCommandNG *packet) {
             break;
         }
 #endif
-
-        case CMD_BUFF_CLEAR:
+        case CMD_BUFF_CLEAR: {
             BigBuf_Clear();
             BigBuf_free();
             break;
-
-        case CMD_MEASURE_ANTENNA_TUNING:
+        }
+        case CMD_MEASURE_ANTENNA_TUNING: {
             MeasureAntennaTuning();
             break;
-
-        case CMD_MEASURE_ANTENNA_TUNING_HF:
+        }
+        case CMD_MEASURE_ANTENNA_TUNING_HF: {
             if (packet->length != 1)
                 reply_ng(CMD_MEASURE_ANTENNA_TUNING_HF, PM3_EINVARG, NULL, 0);
             switch (packet->data.asBytes[0]) {
@@ -1396,18 +1487,19 @@ static void PacketReceived(PacketCommandNG *packet) {
                     break;
             }
             break;
-
-        case CMD_LISTEN_READER_FIELD:
-            if (packet->length != sizeof(uint8_t) )
+        }
+        case CMD_LISTEN_READER_FIELD: {
+            if (packet->length != sizeof(uint8_t))
                 break;
             ListenReaderField(packet->data.asBytes[0]);
             break;
-
-        case CMD_FPGA_MAJOR_MODE_OFF: // ## FPGA Control
+        }
+        case CMD_FPGA_MAJOR_MODE_OFF: { // ## FPGA Control
             FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
             SpinDelay(200);
             LED_D_OFF(); // LED D indicates field ON or OFF
             break;
+        }
         case CMD_DOWNLOAD_BIGBUF: {
             LED_B_ON();
             uint8_t *mem = BigBuf_get_addr();
@@ -1439,7 +1531,7 @@ static void PacketReceived(PacketCommandNG *packet) {
         case CMD_UPLOAD_SIM_SAMPLES_125K: {
             // iceman; since changing fpga_bitstreams clears bigbuff, Its better to call it before.
             // to be able to use this one for uploading data to device
-            // flag = 
+            // flag =
             //    b0  0 skip
             //        1 clear bigbuff
             struct p {
@@ -1447,17 +1539,17 @@ static void PacketReceived(PacketCommandNG *packet) {
                 uint16_t offset;
                 uint8_t *data;
             } PACKED;
-            struct p* payload = (struct p*)packet->data.asBytes;
+            struct p *payload = (struct p *)packet->data.asBytes;
 
             FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-            
+
             if ((payload->flag & 0x1) == 0x1) {
                 BigBuf_Clear_ext(false);
                 BigBuf_free();
             }
 
             uint8_t *mem = BigBuf_get_addr();
-            memcpy(mem + payload->offset, &payload->data, PM3_CMD_DATA_SIZE - 3);    
+            memcpy(mem + payload->offset, &payload->data, PM3_CMD_DATA_SIZE - 3);
             reply_ng(CMD_UPLOAD_SIM_SAMPLES_125K, PM3_SUCCESS, NULL, 0);
             break;
         }
@@ -1483,15 +1575,17 @@ static void PacketReceived(PacketCommandNG *packet) {
             LED_B_OFF();
             break;
         }
-        case CMD_READ_MEM:
+        case CMD_READ_MEM: {
             if (packet->length != sizeof(uint32_t))
                 break;
             ReadMem(packet->data.asDwords[0]);
             break;
+        }
 #ifdef WITH_FLASH
-        case CMD_FLASHMEM_SET_SPIBAUDRATE:
+        case CMD_FLASHMEM_SET_SPIBAUDRATE: {
             FlashmemSetSpiBaudrate(packet->oldarg[0]);
             break;
+        }
         case CMD_FLASHMEM_READ: {
             LED_B_ON();
             uint32_t startidx = packet->oldarg[0];
@@ -1657,12 +1751,12 @@ static void PacketReceived(PacketCommandNG *packet) {
             break;
         }
 #endif
-        case CMD_SET_LF_DIVISOR:
+        case CMD_SET_LF_DIVISOR: {
             FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
             FpgaSendCommand(FPGA_CMD_SET_DIVISOR, packet->data.asBytes[0]);
             break;
-
-        case CMD_SET_ADC_MUX:
+        }
+        case CMD_SET_ADC_MUX: {
             switch (packet->data.asBytes[0]) {
                 case 0:
                     SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
@@ -1680,30 +1774,36 @@ static void PacketReceived(PacketCommandNG *packet) {
 #endif
             }
             break;
-
-        case CMD_VERSION:
+        }
+        case CMD_VERSION: {
             SendVersion();
             break;
-        case CMD_STATUS:
+        }
+        case CMD_STATUS: {
             SendStatus();
             break;
-        case CMD_CAPABILITIES:
+        }
+        case CMD_CAPABILITIES: {
             SendCapabilities();
             break;
-        case CMD_PING:
+        }
+        case CMD_PING: {
             reply_ng(CMD_PING, PM3_SUCCESS, packet->data.asBytes, packet->length);
             break;
+        }
 #ifdef WITH_LCD
-        case CMD_LCD_RESET:
+        case CMD_LCD_RESET: {
             LCDReset();
             break;
-        case CMD_LCD:
+        }
+        case CMD_LCD: {
             LCDSend(packet->oldarg[0]);
             break;
+        }
 #endif
         case CMD_SETUP_WRITE:
         case CMD_FINISH_WRITE:
-        case CMD_HARDWARE_RESET:
+        case CMD_HARDWARE_RESET: {
             usb_disable();
 
             // (iceman) why this wait?
@@ -1712,8 +1812,8 @@ static void PacketReceived(PacketCommandNG *packet) {
             // We're going to reset, and the bootrom will take control.
             for (;;) {}
             break;
-
-        case CMD_START_FLASH:
+        }
+        case CMD_START_FLASH: {
             if (common_area.flags.bootrom_present) {
                 common_area.command = COMMON_AREA_COMMAND_ENTER_FLASH_MODE;
             }
@@ -1722,7 +1822,7 @@ static void PacketReceived(PacketCommandNG *packet) {
             // We're going to flash, and the bootrom will take control.
             for (;;) {}
             break;
-
+        }
         case CMD_DEVICE_INFO: {
             uint32_t dev_info = DEVICE_INFO_FLAG_OSIMAGE_PRESENT | DEVICE_INFO_FLAG_CURRENT_MODE_OS;
             if (common_area.flags.bootrom_present) {
@@ -1731,9 +1831,10 @@ static void PacketReceived(PacketCommandNG *packet) {
             reply_old(CMD_DEVICE_INFO, dev_info, 0, 0, 0, 0);
             break;
         }
-        default:
+        default: {
             Dbprintf("%s: 0x%04x", "unknown command:", packet->cmd);
             break;
+        }
     }
 }
 

From a55e597e362d966789575f11e6dc8dce0936e6c7 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 7 Jun 2019 21:40:33 +0200
Subject: [PATCH 1910/1938] make style

---
 armsrc/Standalone/hf_colin.c    |  4 +--
 armsrc/Standalone/hf_mattyrun.c |  4 +--
 armsrc/hitagS.c                 | 56 ++++++++++++++---------------
 armsrc/iso14443a.c              | 18 +++++-----
 armsrc/lfops.c                  |  2 +-
 armsrc/mifarecmd.c              | 18 +++++-----
 armsrc/mifaresim.c              |  4 +--
 bootrom/bootrom.c               |  4 +--
 client/cmddata.c                |  4 +--
 client/cmdflashmem.c            |  4 +--
 client/cmdhf14a.c               | 18 +++++-----
 client/cmdhfmf.c                | 64 ++++++++++++++++-----------------
 client/cmdhw.c                  |  6 ++--
 client/cmdlf.c                  | 24 ++++++-------
 client/cmdlfawid.c              | 10 +++---
 client/cmdlfcotag.c             |  2 +-
 client/cmdlfem4x.c              | 30 ++++++++--------
 client/cmdlffdx.c               |  2 +-
 client/cmdlfhid.c               |  4 +--
 client/cmdlfkeri.c              |  2 +-
 client/cmdlfpresco.c            |  2 +-
 client/cmdlfpyramid.c           |  5 +--
 client/cmdlfsecurakey.c         |  2 +-
 client/cmdlft55xx.c             |  8 ++---
 client/cmdusart.c               |  4 +--
 client/comms.c                  |  8 ++---
 client/graph.c                  |  4 +--
 client/lualibs/commands.lua     |  2 +-
 client/mifare/mifarehost.c      | 20 +++++------
 client/proxmark3.c              |  7 ++--
 client/scripts/test_t55x7.lua   |  2 +-
 common/lfdemod.c                | 18 +++++-----
 common/usart.c                  |  8 ++---
 include/common.h                |  2 +-
 include/pm3_cmd.h               |  6 ++--
 uart/uart_posix.c               |  6 ++--
 uart/uart_win32.c               |  2 +-
 37 files changed, 193 insertions(+), 193 deletions(-)

diff --git a/armsrc/Standalone/hf_colin.c b/armsrc/Standalone/hf_colin.c
index b16f1c610..76eefcc14 100644
--- a/armsrc/Standalone/hf_colin.c
+++ b/armsrc/Standalone/hf_colin.c
@@ -776,8 +776,8 @@ readysim:
     LED_C_ON();
 
     uint16_t flags;
-    switch (p_card.uidlen){
-        case 10: 
+    switch (p_card.uidlen) {
+        case 10:
             flags = FLAG_10B_UID_IN_DATA;
             break;
         case 7:
diff --git a/armsrc/Standalone/hf_mattyrun.c b/armsrc/Standalone/hf_mattyrun.c
index 541bedf2e..2030953c0 100644
--- a/armsrc/Standalone/hf_mattyrun.c
+++ b/armsrc/Standalone/hf_mattyrun.c
@@ -388,8 +388,8 @@ void RunMod() {
                 LED_B_ON(); // green
                 // assuming arg0==0,  use hardcoded uid 0xdeadbeaf
                 uint16_t flags;
-                switch (p_card.uidlen){
-                    case 10: 
+                switch (p_card.uidlen) {
+                    case 10:
                         flags = FLAG_10B_UID_IN_DATA;
                         break;
                     case 7:
diff --git a/armsrc/hitagS.c b/armsrc/hitagS.c
index 8d00b881d..11d371f80 100644
--- a/armsrc/hitagS.c
+++ b/armsrc/hitagS.c
@@ -677,40 +677,40 @@ static int hitagS_handle_tag_auth(hitag_function htf, uint64_t key, uint64_t NrA
                 break;
         }
         uint8_t uid1 = (uid[0] << 7)
-               | (uid[1] << 6)
-               | (uid[2] << 5)
-               | (uid[3] << 4)
-               | (uid[4] << 3)
-               | (uid[5] << 2)
-               | (uid[6] << 1)
-               | uid[7];
+                       | (uid[1] << 6)
+                       | (uid[2] << 5)
+                       | (uid[3] << 4)
+                       | (uid[4] << 3)
+                       | (uid[5] << 2)
+                       | (uid[6] << 1)
+                       | uid[7];
 
         uint8_t uid2 = (uid[8] << 7)
-               | (uid[9] << 6)
-               | (uid[10] << 5)
-               | (uid[11] << 4)
-               | (uid[12] << 3)
-               | (uid[13] << 2)
-               | (uid[14] << 1)
-               | uid[15];
+                       | (uid[9] << 6)
+                       | (uid[10] << 5)
+                       | (uid[11] << 4)
+                       | (uid[12] << 3)
+                       | (uid[13] << 2)
+                       | (uid[14] << 1)
+                       | uid[15];
 
         uint8_t uid3 = (uid[16] << 7)
-               | (uid[17] << 6)
-               | (uid[18] << 5)
-               | (uid[19] << 4)
-               | (uid[20] << 3)
-               | (uid[21] << 2)
-               | (uid[22] << 1)
-               | uid[23];
+                       | (uid[17] << 6)
+                       | (uid[18] << 5)
+                       | (uid[19] << 4)
+                       | (uid[20] << 3)
+                       | (uid[21] << 2)
+                       | (uid[22] << 1)
+                       | uid[23];
 
         uint8_t uid4 = (uid[24] << 7)
-               | (uid[25] << 6)
-               | (uid[26] << 5)
-               | (uid[27] << 4)
-               | (uid[28] << 3)
-               | (uid[29] << 2)
-               | (uid[30] << 1)
-               | uid[31];
+                       | (uid[25] << 6)
+                       | (uid[26] << 5)
+                       | (uid[27] << 4)
+                       | (uid[28] << 3)
+                       | (uid[29] << 2)
+                       | (uid[30] << 1)
+                       | uid[31];
 
         if (DEBUG)
             Dbprintf("UID: %02X %02X %02X %02X", uid1, uid2, uid3, uid4);
diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 6eeb6d966..cfc912607 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -761,8 +761,8 @@ static bool GetIso14443aCommandFromReader(uint8_t *received, uint8_t *par, int *
     uint16_t check = 0;
 
     for (;;) {
-        if ( check == 1000 ) {
-            if ( BUTTON_PRESS() || data_available() )
+        if (check == 1000) {
+            if (BUTTON_PRESS() || data_available())
                 return false;
             check = 0;
         }
@@ -1095,7 +1095,7 @@ void SimulateIso14443aTag(uint8_t tagType, uint8_t flags, uint8_t *data) {
     int order = ORDER_NONE;
 
     int retval = PM3_SUCCESS;
-    
+
     // Just to allow some checks
     int happened = 0;
     int happened2 = 0;
@@ -1191,7 +1191,7 @@ void SimulateIso14443aTag(uint8_t tagType, uint8_t flags, uint8_t *data) {
                         ar_nr_nonces[index].state = SECOND;
 
                         // send to client  (one struct nonces_t)
-                        reply_ng(CMD_SIMULATE_MIFARE_CARD, PM3_SUCCESS, (uint8_t*)&ar_nr_nonces[index], sizeof(nonces_t) );
+                        reply_ng(CMD_SIMULATE_MIFARE_CARD, PM3_SUCCESS, (uint8_t *)&ar_nr_nonces[index], sizeof(nonces_t));
 
                         ar_nr_nonces[index].state = EMPTY;
                         ar_nr_nonces[index].sector = 0;
@@ -1515,7 +1515,7 @@ void SimulateIso14443aTag(uint8_t tagType, uint8_t flags, uint8_t *data) {
         Dbprintf("-[ Num of received cmd  [%d]", cmdsRecvd);
         Dbprintf("-[ Num of moebius tries [%d]", moebius_count);
     }
-    
+
     reply_ng(CMD_SIMULATE_MIFARE_CARD, retval, NULL, 0);
 }
 
@@ -1716,10 +1716,10 @@ int EmGetCmd(uint8_t *received, uint16_t *len, uint8_t *par) {
     for (;;) {
         WDT_HIT();
 
-        if ( check == 1000 ) {
-          if (BUTTON_PRESS() || data_available())
-              return 1;
-          check = 0;
+        if (check == 1000) {
+            if (BUTTON_PRESS() || data_available())
+                return 1;
+            check = 0;
         }
         ++check;
 
diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index 5af13b76d..2e58c10f6 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -606,7 +606,7 @@ void SimulateTagLowFrequencyEx(int period, int gap, bool ledcontrol, int numcycl
         // used as a simple detection of a reader field?
         while (!(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_CLK)) {
             WDT_HIT();
-            if ( check == 1000) {
+            if (check == 1000) {
                 if (data_available() || BUTTON_PRESS())
                     goto OUT;
                 check = 0;
diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index eee4fdb44..9ea089bfe 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -47,7 +47,7 @@ void MifareReadBlock(uint8_t blockNo, uint8_t keyType, uint8_t *datain) {
     uint8_t dataoutbuf[16] = {0x00};
     uint8_t uid[10] = {0x00};
     uint32_t cuid = 0, status = PM3_EOPABORTED;
-    
+
     struct Crypto1State mpcs = {0, 0};
     struct Crypto1State *pcs;
     pcs = &mpcs;
@@ -1616,7 +1616,7 @@ void MifareChkKeys(uint8_t *datain) {
 
 void MifareEMemClr(void) {
     FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-    emlClearMem(); 
+    emlClearMem();
 }
 
 void MifareEMemSet(uint8_t blockno, uint8_t blockcnt, uint8_t blockwidth, uint8_t *datain) {
@@ -1624,22 +1624,22 @@ void MifareEMemSet(uint8_t blockno, uint8_t blockcnt, uint8_t blockwidth, uint8_
 
     if (blockwidth == 0)
         blockwidth = 16; // backwards compat... default bytewidth
-        
+
     emlSetMem_xt(datain, blockno, blockcnt, blockwidth); // data, block num, blocks count, block byte width
 }
 
 void MifareEMemGet(uint8_t blockno, uint8_t blockcnt) {
     FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-    
-    // 
+
+    //
     size_t size = blockcnt * 16;
-    if ( size > PM3_CMD_DATA_SIZE) {
+    if (size > PM3_CMD_DATA_SIZE) {
         reply_ng(CMD_MIFARE_EML_MEMGET, PM3_EMALLOC, NULL, 0);
         return;
     }
-    
+
     uint8_t *buf = BigBuf_malloc(size);
-    
+
     emlGetMem(buf, blockno, blockcnt); // data, block num, blocks count (max 4)
 
     LED_B_ON();
@@ -1985,7 +1985,7 @@ TEST2:
     };
 
 OUT:
-	
+
     data[0] = isGen;
     reply_ng(CMD_MIFARE_CIDENT, PM3_SUCCESS, data, sizeof(data));
     // turns off
diff --git a/armsrc/mifaresim.c b/armsrc/mifaresim.c
index 5d83277fc..160cf9dcd 100644
--- a/armsrc/mifaresim.c
+++ b/armsrc/mifaresim.c
@@ -989,7 +989,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t *datain) {
                                         ar_nr_resp[i + mM].nonce2 = nonce;
                                         ar_nr_resp[i + mM].nr2 = nr;
                                         ar_nr_resp[i + mM].ar2 = ar;
-                                        
+
                                         if (!gettingMoebius) {
                                             nonce2_count++;
                                             // check if this was the last second nonce we need for std attack
@@ -1006,7 +1006,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t *datain) {
                                         } else {
                                             moebius_n_count++;
                                             // if we've collected all the nonces we need - finish.
-                                            if (nonce1_count == moebius_n_count) 
+                                            if (nonce1_count == moebius_n_count)
                                                 finished = true;
                                         }
                                     }
diff --git a/bootrom/bootrom.c b/bootrom/bootrom.c
index 30521fe01..b2811cc6d 100644
--- a/bootrom/bootrom.c
+++ b/bootrom/bootrom.c
@@ -345,8 +345,8 @@ void BootROM(void) {
     common_area.flags.bootrom_present = 1;
 
     if ((common_area.command == COMMON_AREA_COMMAND_ENTER_FLASH_MODE) ||
-        (!common_area.flags.button_pressed && BUTTON_PRESS()) ||
-        (_osimage_entry == 0xffffffffU)) {
+            (!common_area.flags.button_pressed && BUTTON_PRESS()) ||
+            (_osimage_entry == 0xffffffffU)) {
         flash_mode();
     } else {
         // clear button status, even if button still pressed
diff --git a/client/cmddata.c b/client/cmddata.c
index 59bc5df73..de58ef7ac 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -448,7 +448,7 @@ int CmdGetBitStream(const char *Cmd) {
 }
 int CmdConvertBitStream(const char *Cmd) {
 
-    if ( isGraphBitstream() ) {
+    if (isGraphBitstream()) {
         convertGraphFromBitstream();
     } else {
         // get high, low
@@ -716,7 +716,7 @@ int ASKbiphaseDemod(const char *Cmd, bool verbose) {
     setDemodBuff(BitStream, size, 0);
     setClockGrid(clk, startIdx + clk * offset / 2);
     if (g_debugMode || verbose) {
-        PrintAndLogEx(NORMAL, "Biphase Decoded using offset %d | clock %d | #errors %d | start index %d\ndata\n", offset, clk, errCnt, (startIdx + clk * offset / 2) );
+        PrintAndLogEx(NORMAL, "Biphase Decoded using offset %d | clock %d | #errors %d | start index %d\ndata\n", offset, clk, errCnt, (startIdx + clk * offset / 2));
         printDemodBuff();
     }
     return PM3_SUCCESS;
diff --git a/client/cmdflashmem.c b/client/cmdflashmem.c
index bdc8dc33a..dafda3ae6 100644
--- a/client/cmdflashmem.c
+++ b/client/cmdflashmem.c
@@ -490,10 +490,10 @@ static int CmdFlashMemInfo(const char *Cmd) {
 //
 
 // public key Exponent E
-#define RSA_E "010001" 
+#define RSA_E "010001"
 
 // public key modulus N
-#define RSA_N "E28D809BF323171D11D1ACA4C32A5B7E0A8974FD171E75AD120D60E9B76968FF4B0A6364AE50583F9555B8EE1A725F279E949246DF0EFCE4C02B9F3ACDCC623F9337F21C0C066FFB703D8BFCB5067F309E056772096642C2B1A8F50305D5EC33DB7FB5A3C8AC42EB635AE3C148C910750ABAA280CE82DC2F180F49F30A1393B5" 
+#define RSA_N "E28D809BF323171D11D1ACA4C32A5B7E0A8974FD171E75AD120D60E9B76968FF4B0A6364AE50583F9555B8EE1A725F279E949246DF0EFCE4C02B9F3ACDCC623F9337F21C0C066FFB703D8BFCB5067F309E056772096642C2B1A8F50305D5EC33DB7FB5A3C8AC42EB635AE3C148C910750ABAA280CE82DC2F180F49F30A1393B5"
 
 //-------------------------------------------------------------------------------
 // Example RSA-1024 keypair, for test purposes  (from common/polarssl/rsa.c)
diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 3b87799a6..17746d9b8 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -474,15 +474,15 @@ int CmdHF14ASim(const char *Cmd) {
         flags |= FLAG_UID_IN_EMUL;
 
     struct {
-       uint8_t tagtype;
-       uint8_t flags;
-       uint8_t uid[10];
+        uint8_t tagtype;
+        uint8_t flags;
+        uint8_t uid[10];
     } PACKED payload;
-    
+
     payload.tagtype = tagtype;
     payload.flags = flags;
     memcpy(payload.uid, uid, uidlen);
-    
+
     clearCommandBuffer();
     SendCommandNG(CMD_SIMULATE_TAG_ISO_14443a, (uint8_t *)&payload, sizeof(payload));
     PacketResponseNG resp;
@@ -492,13 +492,13 @@ int CmdHF14ASim(const char *Cmd) {
     while (!ukbhit()) {
         if (WaitForResponseTimeout(CMD_SIMULATE_MIFARE_CARD, &resp, 1500) == 0) continue;
         if (resp.status != PM3_SUCCESS) break;
-        
+
         if ((flags & FLAG_NR_AR_ATTACK) != FLAG_NR_AR_ATTACK) break;
-        
-        nonces_t *data = (nonces_t*)resp.data.asBytes;
+
+        nonces_t *data = (nonces_t *)resp.data.asBytes;
         readerAttack(data[0], setEmulatorMem, verbose);
     }
-    if (resp.status == PM3_EOPABORTED && ((flags & FLAG_NR_AR_ATTACK) == FLAG_NR_AR_ATTACK) )
+    if (resp.status == PM3_EOPABORTED && ((flags & FLAG_NR_AR_ATTACK) == FLAG_NR_AR_ATTACK))
         showSectorTable();
 
     PrintAndLogEx(INFO, "Done");
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 3a23b5047..4fa3d8dc0 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -557,9 +557,9 @@ static int CmdHF14AMfRdBl(const char *Cmd) {
     payload.blockno = blockNo;
     payload.keytype = keyType;
     memcpy(payload.key, key, sizeof(payload.key));
-    
+
     clearCommandBuffer();
-    SendCommandNG(CMD_MIFARE_READBL, (uint8_t*)&payload, sizeof(mf_readblock_t));
+    SendCommandNG(CMD_MIFARE_READBL, (uint8_t *)&payload, sizeof(mf_readblock_t));
 
     PacketResponseNG resp;
     if (WaitForResponseTimeout(CMD_MIFARE_READBL, &resp, 1500)) {
@@ -789,15 +789,15 @@ static int CmdHF14AMfDump(const char *Cmd) {
     mf_readblock_t payload;
     for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {
         for (tries = 0; tries < MIFARE_SECTOR_RETRY; tries++) {
-            printf("."); 
+            printf(".");
             fflush(NULL);
-            
+
             payload.blockno = FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1;
             payload.keytype = 0;
             memcpy(payload.key, keyA[sectorNo], sizeof(payload.key));
 
             clearCommandBuffer();
-            SendCommandNG(CMD_MIFARE_READBL, (uint8_t*)&payload, sizeof(mf_readblock_t));
+            SendCommandNG(CMD_MIFARE_READBL, (uint8_t *)&payload, sizeof(mf_readblock_t));
 
             if (WaitForResponseTimeout(CMD_MIFARE_READBL, &resp, 1500)) {
 
@@ -830,13 +830,13 @@ static int CmdHF14AMfDump(const char *Cmd) {
 
             for (tries = 0; tries < MIFARE_SECTOR_RETRY; tries++) {
                 if (blockNo == NumBlocksPerSector(sectorNo) - 1) { // sector trailer. At least the Access Conditions can always be read with key A.
-                
+
                     payload.blockno = FirstBlockOfSector(sectorNo) + blockNo;
                     payload.keytype = 0;
                     memcpy(payload.key, keyA[sectorNo], sizeof(payload.key));
 
-                    clearCommandBuffer();                    
-                    SendCommandNG(CMD_MIFARE_READBL, (uint8_t*)&payload, sizeof(mf_readblock_t));
+                    clearCommandBuffer();
+                    SendCommandNG(CMD_MIFARE_READBL, (uint8_t *)&payload, sizeof(mf_readblock_t));
                     received = WaitForResponseTimeout(CMD_MIFARE_READBL, &resp, 1500);
                 } else {                                           // data block. Check if it can be read with key A or key B
                     uint8_t data_area = (sectorNo < 32) ? blockNo : blockNo / 5;
@@ -845,9 +845,9 @@ static int CmdHF14AMfDump(const char *Cmd) {
                         payload.blockno = FirstBlockOfSector(sectorNo) + blockNo;
                         payload.keytype = 1;
                         memcpy(payload.key, keyB[sectorNo], sizeof(payload.key));
-                        
+
                         clearCommandBuffer();
-                        SendCommandNG(CMD_MIFARE_READBL, (uint8_t*)&payload, sizeof(mf_readblock_t));
+                        SendCommandNG(CMD_MIFARE_READBL, (uint8_t *)&payload, sizeof(mf_readblock_t));
                         received = WaitForResponseTimeout(CMD_MIFARE_READBL, &resp, 1500);
                     } else if (rights[sectorNo][data_area] == 0x07) {                                     // no key would work
                         PrintAndLogEx(WARNING, "access rights do not allow reading of sector %2d block %3d", sectorNo, blockNo);
@@ -858,9 +858,9 @@ static int CmdHF14AMfDump(const char *Cmd) {
                         payload.blockno = FirstBlockOfSector(sectorNo) + blockNo;
                         payload.keytype = 0;
                         memcpy(payload.key, keyA[sectorNo], sizeof(payload.key));
-                        
+
                         clearCommandBuffer();
-                        SendCommandNG(CMD_MIFARE_READBL, (uint8_t*)&payload, sizeof(mf_readblock_t));
+                        SendCommandNG(CMD_MIFARE_READBL, (uint8_t *)&payload, sizeof(mf_readblock_t));
                         received = WaitForResponseTimeout(CMD_MIFARE_READBL, &resp, 1500);
                     }
                 }
@@ -901,9 +901,9 @@ static int CmdHF14AMfDump(const char *Cmd) {
             }
         }
     }
-    
+
     PrintAndLogEx(SUCCESS, "time: %" PRIu64 " seconds\n", (msclock() - t1) / 1000);
-    
+
     PrintAndLogEx(SUCCESS, "\nSucceded in dumping all blocks");
 
     if (strlen(dataFilename) < 1) {
@@ -1248,9 +1248,9 @@ static int CmdHF14AMfNested(const char *Cmd) {
                 payload.keytype = 0;
 
                 num_to_bytes(e_sector[i].Key[0], 6, payload.key); // KEY A
-                
+
                 clearCommandBuffer();
-                SendCommandNG(CMD_MIFARE_READBL, (uint8_t *)&payload, sizeof(mf_readblock_t) );
+                SendCommandNG(CMD_MIFARE_READBL, (uint8_t *)&payload, sizeof(mf_readblock_t));
 
                 PacketResponseNG resp;
                 if (!WaitForResponseTimeout(CMD_MIFARE_READBL, &resp, 1500)) continue;
@@ -1277,13 +1277,13 @@ static int CmdHF14AMfNested(const char *Cmd) {
             conn.block_after_ACK = true;
             for (int i = 0; i < SectorsCnt; i++) {
                 mfEmlGetMem(keyBlock, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
-                
+
                 if (e_sector[i].foundKey[0])
                     num_to_bytes(e_sector[i].Key[0], 6, keyBlock);
-                    
+
                 if (e_sector[i].foundKey[1])
                     num_to_bytes(e_sector[i].Key[1], 6, &keyBlock[10]);
-                    
+
                 if (i == SectorsCnt - 1) {
                     // Disable fast mode on last packet
                     conn.block_after_ACK = false;
@@ -2012,9 +2012,9 @@ static int CmdHF14AMfChk(const char *Cmd) {
                 payload.keytype = 0;
 
                 num_to_bytes(e_sector[i].Key[0], 6, payload.key); // KEY A
-                
+
                 clearCommandBuffer();
-                SendCommandNG(CMD_MIFARE_READBL, (uint8_t *)&payload, sizeof(mf_readblock_t) );
+                SendCommandNG(CMD_MIFARE_READBL, (uint8_t *)&payload, sizeof(mf_readblock_t));
 
                 PacketResponseNG resp;
                 if (!WaitForResponseTimeout(CMD_MIFARE_READBL, &resp, 1500)) continue;
@@ -2265,15 +2265,15 @@ static int CmdHF14AMfSim(const char *Cmd) {
                   , flags);
 
     struct {
-       uint16_t flags;
-       uint8_t exitAfter;
-       uint8_t uid[10];
+        uint16_t flags;
+        uint8_t exitAfter;
+        uint8_t uid[10];
     } PACKED payload;
-    
+
     payload.flags = flags;
     payload.exitAfter = exitAfterNReads;
     memcpy(payload.uid, uid, uidlen);
-    
+
     clearCommandBuffer();
     SendCommandNG(CMD_SIMULATE_MIFARE_CARD, (uint8_t *)&payload, sizeof(payload));
     PacketResponseNG resp;
@@ -2540,7 +2540,7 @@ static int CmdHF14AMfESet(const char *Cmd) {
     char c = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) < 3 || c == 'h')
         return usage_hf14_eset();
-        
+
     uint8_t memBlock[16];
     memset(memBlock, 0x00, sizeof(memBlock));
 
@@ -2914,7 +2914,7 @@ static int CmdHF14AMfCLoad(const char *Cmd) {
         PrintAndLogEx(WARNING, "Fail, cannot allocate memory");
         return PM3_EMALLOC;
     }
-    
+
     size_t datalen = 0;
     int res = 0;
     if (fillFromBin) {
@@ -3186,7 +3186,7 @@ static int CmdHf14AMfDecryptBytes(const char *Cmd) {
         PrintAndLogEx(WARNING, "Fail, cannot allocate memory");
         return PM3_EMALLOC;
     }
-    
+
     param_gethex_ex(Cmd, 3, data, &len);
     len >>= 1;
     tryDecryptWord(nt, ar_enc, at_enc, data, len);
@@ -3215,15 +3215,15 @@ static int CmdHf14AMfSetMod(const char *Cmd) {
 
     uint8_t data[7];
     data[0] = mod;
-    memcpy(data+1, key, 6);
+    memcpy(data + 1, key, 6);
 
     clearCommandBuffer();
     SendCommandNG(CMD_MIFARE_SETMOD, data, sizeof(data));
 
     PacketResponseNG resp;
     if (WaitForResponseTimeout(CMD_MIFARE_SETMOD, &resp, 1500)) {
-        
-        if (resp.status == PM3_SUCCESS) 
+
+        if (resp.status == PM3_SUCCESS)
             PrintAndLogEx(SUCCESS, "Success");
         else
             PrintAndLogEx(FAILED, "Failed");
diff --git a/client/cmdhw.c b/client/cmdhw.c
index 008bcfe2d..871d3bfbd 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -417,7 +417,7 @@ static int CmdLCD(const char *Cmd) {
 }
 
 static int CmdLCDReset(const char *Cmd) {
-    (void)Cmd; // Cmd is not used so far    
+    (void)Cmd; // Cmd is not used so far
     clearCommandBuffer();
     SendCommandNG(CMD_LCD_RESET, NULL, 0);
     return PM3_SUCCESS;
@@ -532,7 +532,7 @@ static int CmdConnect(const char *Cmd) {
     uint32_t baudrate = USART_BAUD_RATE;
     uint8_t cmdp = 0;
     char port[FILE_PATH_SIZE] = {0};
-    
+
     while (param_getchar(Cmd, cmdp) != 0x00) {
         switch (tolower(param_getchar(Cmd, cmdp))) {
             case 'h':
@@ -553,7 +553,7 @@ static int CmdConnect(const char *Cmd) {
                 return PM3_EINVARG;
         }
     }
-    
+
     // default back to previous used serial port
     if (strlen(port) == 0) {
         if (strlen((char *)conn.serial_port_name) == 0) {
diff --git a/client/cmdlf.c b/client/cmdlf.c
index bb1e1f3a3..9bc954e43 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -201,18 +201,18 @@ int CmdLFCommandRead(const char *Cmd) {
 
     PrintAndLogEx(SUCCESS, "Sending");
     clearCommandBuffer();
-    SendCommandNG(CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K, (uint8_t*)&payload, 8 + datalen );
+    SendCommandNG(CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K, (uint8_t *)&payload, 8 + datalen);
 
     printf("\n");
     uint8_t i = 10;
-    while ( !WaitForResponseTimeout(CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K, NULL, 2000 ) && i != 0) {
+    while (!WaitForResponseTimeout(CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K, NULL, 2000) && i != 0) {
         printf(".");
         fflush(stdout);
         i--;
     }
     printf("\n");
 
-    if ( i ) {
+    if (i) {
         PrintAndLogEx(SUCCESS, "Downloading response signal data");
         getSamples(0, true);
         return PM3_SUCCESS;
@@ -391,7 +391,7 @@ int lf_read(bool silent, uint32_t samples) {
     }
 
     // resp.oldarg[0] is bits read not bytes read.
-    uint32_t bits = (resp.data.asDwords[0] / 8 );
+    uint32_t bits = (resp.data.asDwords[0] / 8);
     getSamples(bits, silent);
 
     return PM3_SUCCESS;
@@ -449,7 +449,7 @@ static void ChkBitstream() {
     for (int i = 0; i < (int)(GraphTraceLen / 2); i++) {
         if (GraphBuffer[i] > 1 || GraphBuffer[i] < 0) {
             CmdGetBitStream("");
-	    PrintAndLogEx(INFO, "Converted to bitstream");
+            PrintAndLogEx(INFO, "Converted to bitstream");
             break;
         }
     }
@@ -461,7 +461,7 @@ int CmdLFSim(const char *Cmd) {
     if (!session.pm3_present) return PM3_ENOTTY;
 
     // sanity check
-    if ( GraphTraceLen < 20 ) {
+    if (GraphTraceLen < 20) {
         PrintAndLogEx(ERR, "No data in Graphbuffer");
         return PM3_ENODATA;
     }
@@ -482,8 +482,8 @@ int CmdLFSim(const char *Cmd) {
         uint8_t data[PM3_CMD_DATA_SIZE - 3];
     } PACKED payload_up;
 
-    // flag = 
-    //    b0  0 
+    // flag =
+    //    b0  0
     //        1 clear bigbuff
     payload_up.flag = 0x1;
 
@@ -497,10 +497,10 @@ int CmdLFSim(const char *Cmd) {
         clearCommandBuffer();
         payload_up.offset = i;
 
-        for(uint16_t j = 0; j < len; j++)
-            payload_up.data[j] = GraphBuffer[i+j];
+        for (uint16_t j = 0; j < len; j++)
+            payload_up.data[j] = GraphBuffer[i + j];
+
 
-      
         SendCommandNG(CMD_UPLOAD_SIM_SAMPLES_125K, (uint8_t *)&payload_up, sizeof(struct pupload));
         WaitForResponse(CMD_UPLOAD_SIM_SAMPLES_125K, NULL);
         printf(".");
@@ -519,7 +519,7 @@ int CmdLFSim(const char *Cmd) {
         uint16_t gap;
     } PACKED payload;
     payload.len = GraphTraceLen;
-    payload.gap = gap;	
+    payload.gap = gap;
 
     clearCommandBuffer();
     SendCommandNG(CMD_SIMULATE_TAG_125K, (uint8_t *)&payload, sizeof(payload));
diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c
index 3864676d8..7cb24d9c2 100644
--- a/client/cmdlfawid.c
+++ b/client/cmdlfawid.c
@@ -332,7 +332,7 @@ static int CmdAWIDSim(const char *Cmd) {
 
     verify_values(&fmtlen, &fc, &cn);
 
-    if ( getAWIDBits(fmtlen, fc, cn, bs) != PM3_SUCCESS ) {
+    if (getAWIDBits(fmtlen, fc, cn, bs) != PM3_SUCCESS) {
         PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
         return PM3_ESOFT;
     }
@@ -387,7 +387,7 @@ static int CmdAWIDClone(const char *Cmd) {
 
     verify_values(&fmtlen, &fc, &cn);
 
-    if ( getAWIDBits(fmtlen, fc, cn, bs) != PM3_SUCCESS ) {
+    if (getAWIDBits(fmtlen, fc, cn, bs) != PM3_SUCCESS) {
         PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
         return PM3_ESOFT;
     }
@@ -512,12 +512,12 @@ static int CmdAWIDBrute(const char *Cmd) {
 
         // Do one up
         if (up < 0xFFFF)
-            if ( sendTry(fmtlen, fc, up++, delay, bits, size, verbose) != PM3_SUCCESS) return PM3_ESOFT;
+            if (sendTry(fmtlen, fc, up++, delay, bits, size, verbose) != PM3_SUCCESS) return PM3_ESOFT;
 
         // Do one down  (if cardnumber is given)
         if (cn > 1)
             if (down > 1)
-                if ( sendTry(fmtlen, fc, --down, delay, bits, size, verbose) != PM3_SUCCESS) return PM3_ESOFT;
+                if (sendTry(fmtlen, fc, --down, delay, bits, size, verbose) != PM3_SUCCESS) return PM3_ESOFT;
     }
     return PM3_SUCCESS;
 }
@@ -590,7 +590,7 @@ int getAWIDBits(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint8_t *bits) {
     // add AWID 4bit parity
     size_t bitLen = addParity(pre, bits + 8, 66, 4, 1);
 
-    if (bitLen != 88) 
+    if (bitLen != 88)
         return PM3_ESOFT;
 
     PrintAndLogEx(SUCCESS, "awid raw bits:\n %s \n", sprint_bin(bits, bitLen));
diff --git a/client/cmdlfcotag.c b/client/cmdlfcotag.c
index 1637e293c..0f5e7a835 100644
--- a/client/cmdlfcotag.c
+++ b/client/cmdlfcotag.c
@@ -36,7 +36,7 @@ static int CmdCOTAGDemod(const char *Cmd) {
 
     uint8_t alignPos = 0;
     uint16_t err = manrawdecode(bits, &bitlen, 1, &alignPos);
-    if (err > 50 ) {
+    if (err > 50) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - COTAG too many errors: %d", err);
         return PM3_ESOFT;
     }
diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 4b74a5811..93f6b5b3e 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -195,7 +195,7 @@ static void ConstructEM410xEmulGraph(const char *uid, const  uint8_t clock) {
     /* clear our graph */
     ClearGraph(true);
 
-   /* write 16 zero bit sledge */
+    /* write 16 zero bit sledge */
     for (i = 0; i < 20; i++)
         AppendGraph(false, clock, 0);
 
@@ -387,12 +387,12 @@ int AskEm410xDemod(const char *Cmd, uint32_t *hi, uint64_t *lo, bool verbose) {
     bool st = true;
 
     // em410x simulation etc uses 0/1 as signal data. This must be converted in order to demod it back again
-    if ( isGraphBitstream() ) {
+    if (isGraphBitstream()) {
         convertGraphFromBitstream();
     }
 
-    if (ASKDemod_ext(Cmd, false, false, 1, &st) != PM3_SUCCESS) 
-	return PM3_ESOFT;
+    if (ASKDemod_ext(Cmd, false, false, 1, &st) != PM3_SUCCESS)
+        return PM3_ESOFT;
     return AskEm410xDecode(verbose, hi, lo);
 }
 /*
@@ -416,8 +416,8 @@ static int CmdEM410xDemod(const char *Cmd) {
     uint32_t hi = 0;
     uint64_t lo = 0;
 
-    if (AskEm410xDemod(Cmd, &hi, &lo, true) != PM3_SUCCESS) 
-	return PM3_ESOFT;
+    if (AskEm410xDemod(Cmd, &hi, &lo, true) != PM3_SUCCESS)
+        return PM3_ESOFT;
 
     g_em410xid = lo;
     return PM3_SUCCESS;
@@ -1097,7 +1097,7 @@ static int setDemodBufferEM(uint32_t *word, size_t idx) {
     uint8_t parity[45] = {0};
     memcpy(parity, DemodBuffer, 45);
     if (!EM_EndParityTest(DemodBuffer + idx + EM_PREAMBLE_LEN, 45, 5, 9, 0)) {
-        PrintAndLogEx(DEBUG, "DEBUG: Error - End Parity check failed");    
+        PrintAndLogEx(DEBUG, "DEBUG: Error - End Parity check failed");
         return PM3_ESOFT;
     }
 
@@ -1140,16 +1140,16 @@ static int demodEM4x05resp(uint32_t *word) {
 //////////////// 4205 / 4305 commands
 static int EM4x05ReadWord_ext(uint8_t addr, uint32_t pwd, bool usePwd, uint32_t *word) {
 
-   struct {
+    struct {
         uint32_t password;
         uint8_t address;
         uint8_t usepwd;
     } PACKED payload;
-    
+
     payload.password = pwd;
     payload.address = addr;
     payload.usepwd = usePwd;
-    
+
     clearCommandBuffer();
     SendCommandNG(CMD_EM4X_READ_WORD, (uint8_t *)&payload, sizeof(payload));
     PacketResponseNG resp;
@@ -1250,20 +1250,20 @@ static int CmdEM4x05Write(const char *Cmd) {
         PrintAndLogEx(NORMAL, "Writing address %d data %08X using password %08X", addr, data, pwd);
     }
 
-   struct {
+    struct {
         uint32_t password;
         uint32_t data;
         uint8_t address;
         uint8_t usepwd;
     } PACKED payload;
-    
+
     payload.password = pwd;
     payload.data = data;
     payload.address = addr;
     payload.usepwd = usePwd;
-    
+
     clearCommandBuffer();
-    SendCommandNG(CMD_EM4X_WRITE_WORD, (uint8_t*)&payload, sizeof(payload));
+    SendCommandNG(CMD_EM4X_WRITE_WORD, (uint8_t *)&payload, sizeof(payload));
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_EM4X_WRITE_WORD, &resp, 2000)) {
         PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
@@ -1493,7 +1493,7 @@ static int CmdEM4x05Info(const char *Cmd) {
     }
 
     //something went wrong
-    if (!(word & 0x8000)) 
+    if (!(word & 0x8000))
         return PM3_ESOFT;
 
     printEM4x05ProtectionBits(word);
diff --git a/client/cmdlffdx.c b/client/cmdlffdx.c
index 6f019b169..8cf93b12f 100644
--- a/client/cmdlffdx.c
+++ b/client/cmdlffdx.c
@@ -336,7 +336,7 @@ static int CmdFdxSim(const char *Cmd) {
     clearCommandBuffer();
     SendCommandNG(CMD_ASK_SIM_TAG, (uint8_t *)payload,  sizeof(lf_asksim_t) + sizeof(bs));
     free(payload);
- 
+
     PacketResponseNG resp;
     WaitForResponse(CMD_ASK_SIM_TAG, &resp);
 
diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c
index e8c3fabc1..8045c5699 100644
--- a/client/cmdlfhid.c
+++ b/client/cmdlfhid.c
@@ -124,7 +124,7 @@ static int CmdHIDDemod(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
 
     // HID simulation etc uses 0/1 as signal data. This must be converted in order to demod it back again
-    if ( isGraphBitstream() ) {
+    if (isGraphBitstream()) {
         convertGraphFromBitstream();
     }
 
@@ -593,7 +593,7 @@ static int CmdHIDBrute(const char *Cmd) {
 
         // Do one up
         if (up < 0xFFFF)
-            if ( sendTry(fmtlen, fc, up++, delay, bits, verbose) != PM3_SUCCESS) return PM3_ESOFT;
+            if (sendTry(fmtlen, fc, up++, delay, bits, verbose) != PM3_SUCCESS) return PM3_ESOFT;
 
         // Do one down  (if cardnumber is given)
         if (cn > 1)
diff --git a/client/cmdlfkeri.c b/client/cmdlfkeri.c
index d38dcfea6..38d575587 100644
--- a/client/cmdlfkeri.c
+++ b/client/cmdlfkeri.c
@@ -175,7 +175,7 @@ static int CmdKeriClone(const char *Cmd) {
 static int CmdKeriSim(const char *Cmd) {
 
     char cmdp = tolower(param_getchar(Cmd, 0));
-    if (strlen(Cmd) == 0 || cmdp == 'h') 
+    if (strlen(Cmd) == 0 || cmdp == 'h')
         return usage_lf_keri_sim();
 
     uint64_t internalid = param_get32ex(Cmd, 0, 0, 10);
diff --git a/client/cmdlfpresco.c b/client/cmdlfpresco.c
index 8f3e22ee1..a51155e78 100644
--- a/client/cmdlfpresco.c
+++ b/client/cmdlfpresco.c
@@ -151,7 +151,7 @@ static int CmdPrescoSim(const char *Cmd) {
     uint32_t sitecode = 0, usercode = 0, fullcode = 0;
     bool Q5 = false;
     // get wiegand from printed number.
-    if (getWiegandFromPresco(Cmd, &sitecode, &usercode, &fullcode, &Q5) == PM3_EINVARG) 
+    if (getWiegandFromPresco(Cmd, &sitecode, &usercode, &fullcode, &Q5) == PM3_EINVARG)
         return usage_lf_presco_sim();
 
     PrintAndLogEx(SUCCESS, "Simulating Presco - SiteCode: %u, UserCode: %u, FullCode: %08X", sitecode, usercode, fullcode);
diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c
index f5db47cb3..91b895bcb 100644
--- a/client/cmdlfpyramid.c
+++ b/client/cmdlfpyramid.c
@@ -265,7 +265,7 @@ static int CmdPyramidSim(const char *Cmd) {
 
     uint8_t bs[128];
     memset(bs, 0x00, sizeof(bs));
-    
+
     if (sscanf(Cmd, "%u %u", &fc, &cn) != 2) return usage_lf_pyramid_sim();
 
     facilitycode = (fc & 0x000000FF);
@@ -331,7 +331,8 @@ int getPyramidBits(uint32_t fc, uint32_t cn, uint8_t *pyramidBits) {
     // Get 26 wiegand from FacilityCode, CardNumber
     uint8_t wiegand[24];
     memset(wiegand, 0x00, sizeof(wiegand));
-    num_to_bytebits(fc, 8, wiegand);    num_to_bytebits(cn, 16, wiegand + 8);
+    num_to_bytebits(fc, 8, wiegand);
+    num_to_bytebits(cn, 16, wiegand + 8);
 
     // add wiegand parity bits (dest, source, len)
     wiegand_add_parity(pre + 80, wiegand, 24);
diff --git a/client/cmdlfsecurakey.c b/client/cmdlfsecurakey.c
index 7eb1e8a07..82df3b659 100644
--- a/client/cmdlfsecurakey.c
+++ b/client/cmdlfsecurakey.c
@@ -21,7 +21,7 @@ static int CmdSecurakeyDemod(const char *Cmd) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - Securakey: ASK/Manchester Demod failed");
         return PM3_ESOFT;
     }
-    if (st) 
+    if (st)
         return PM3_ESOFT;
 
     size_t size = DemodBufferLen;
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index d78119059..463665de7 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -564,7 +564,7 @@ bool tryDetectModulation(void) {
     ans = fskClocks(&fc1, &fc2, (uint8_t *)&clk, &firstClockEdge);
 
     if (ans && ((fc1 == 10 && fc2 == 8) || (fc1 == 8 && fc2 == 5))) {
-        if ( (FSKrawDemod("0 0", false) == PM3_SUCCESS) && test(DEMOD_FSK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
+        if ((FSKrawDemod("0 0", false) == PM3_SUCCESS) && test(DEMOD_FSK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
             tests[hits].modulation = DEMOD_FSK;
             if (fc1 == 8 && fc2 == 5)
                 tests[hits].modulation = DEMOD_FSK1a;
@@ -576,7 +576,7 @@ bool tryDetectModulation(void) {
             tests[hits].ST = false;
             ++hits;
         }
-        if ( (FSKrawDemod("0 1", false) == PM3_SUCCESS) && test(DEMOD_FSK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
+        if ((FSKrawDemod("0 1", false) == PM3_SUCCESS) && test(DEMOD_FSK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
             tests[hits].modulation = DEMOD_FSK;
             if (fc1 == 8 && fc2 == 5)
                 tests[hits].modulation = DEMOD_FSK1;
@@ -661,7 +661,7 @@ bool tryDetectModulation(void) {
             save_restoreGB(GRAPH_SAVE);
             // skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)
             CmdLtrim("160");
-            if ( (PSKDemod("0 0 6", false) == PM3_SUCCESS) && test(DEMOD_PSK1, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
+            if ((PSKDemod("0 0 6", false) == PM3_SUCCESS) && test(DEMOD_PSK1, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
                 tests[hits].modulation = DEMOD_PSK1;
                 tests[hits].bitrate = bitRate;
                 tests[hits].inverted = false;
@@ -1538,7 +1538,7 @@ bool AquireData(uint8_t page, uint8_t block, bool pwdmode, uint32_t password) {
     payload.pwdmode = pwdmode;
 
     clearCommandBuffer();
-    SendCommandNG(CMD_T55XX_READ_BLOCK, (uint8_t*)&payload, sizeof(payload));
+    SendCommandNG(CMD_T55XX_READ_BLOCK, (uint8_t *)&payload, sizeof(payload));
     if (!WaitForResponseTimeout(CMD_T55XX_READ_BLOCK, NULL, 2500)) {
         PrintAndLogEx(WARNING, "command execution time out");
         return false;
diff --git a/client/cmdusart.c b/client/cmdusart.c
index 08dac0368..d9a5445c1 100644
--- a/client/cmdusart.c
+++ b/client/cmdusart.c
@@ -312,7 +312,7 @@ static int CmdUsartBtFactory(const char *Cmd) {
     PrintAndLogEx(WARNING, _RED_("WARNING: process only if strictly needed!"));
     PrintAndLogEx(WARNING, "This requires BT turned ON and NOT connected!");
     PrintAndLogEx(WARNING, "Is the add-on blue light blinking? (Say 'n' if you want to abort) [y/n]");
-    while(!ukbhit()) {
+    while (!ukbhit()) {
         msleep(200);
     }
 
@@ -450,7 +450,7 @@ static int CmdUsartBtFactory(const char *Cmd) {
 
     if ((baudrate != USART_BAUD_RATE) || (parity != USART_PARITY)) {
         PrintAndLogEx(WARNING, "Add-on uart settings changed, please turn BT add-on OFF and ON again, then press any key.");
-        while(!ukbhit()) {
+        while (!ukbhit()) {
             msleep(200);
         }
         int gc = getchar();
diff --git a/client/comms.c b/client/comms.c
index 7d4a9dc9c..e95af6415 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -603,7 +603,7 @@ int TestProxmark(void) {
     bool error = false;
     if (len)
         error = memcmp(data, resp.data.asBytes, len) != 0;
-    
+
     if (error)
         return PM3_EIO;
 
@@ -611,7 +611,7 @@ int TestProxmark(void) {
     if (WaitForResponseTimeoutW(CMD_CAPABILITIES, &resp, 1000, false) == 0) {
         return PM3_ETIMEOUT;
     }
-        
+
     if ((resp.length != sizeof(pm3_capabilities)) || (resp.data.asBytes[0] != CAPABILITIES_VERSION)) {
         PrintAndLogEx(ERR, _RED_("Capabilities structure version sent by Proxmark3 is not the same as the one used by the client!"));
         PrintAndLogEx(ERR, _RED_("Please flash the Proxmark with the same version as the client."));
@@ -621,9 +621,9 @@ int TestProxmark(void) {
     memcpy(&pm3_capabilities, resp.data.asBytes, MIN(sizeof(capabilities_t), resp.length));
     conn.send_via_fpc_usart = pm3_capabilities.via_fpc;
     conn.uart_speed = pm3_capabilities.baudrate;
-        
+
     PrintAndLogEx(INFO, "Communicating with PM3 over %s", conn.send_via_fpc_usart ? _YELLOW_("FPC UART") : _YELLOW_("USB-CDC"));
-        
+
     if (conn.send_via_fpc_usart) {
         PrintAndLogEx(INFO, "PM3 UART serial baudrate: " _YELLOW_("%u") "\n", conn.uart_speed);
     } else {
diff --git a/client/graph.c b/client/graph.c
index c70d6f434..4af3261d2 100644
--- a/client/graph.c
+++ b/client/graph.c
@@ -105,13 +105,13 @@ bool isGraphBitstream(void) {
     return true;
 }
 void convertGraphFromBitstream() {
-    convertGraphFromBitstreamEx(1, 0); 
+    convertGraphFromBitstreamEx(1, 0);
 }
 void convertGraphFromBitstreamEx(int hi, int low) {
     for (int i = 0; i < GraphTraceLen; i++) {
         if (GraphBuffer[i] == hi)
             GraphBuffer[i] = 127;
-        else if ( GraphBuffer[i] == low ) 
+        else if (GraphBuffer[i] == low)
             GraphBuffer[i] = -127;
         else
             GraphBuffer[i] = 0;
diff --git a/client/lualibs/commands.lua b/client/lualibs/commands.lua
index 5b94cf2de..d9d358736 100644
--- a/client/lualibs/commands.lua
+++ b/client/lualibs/commands.lua
@@ -173,7 +173,7 @@ function Command:sendNG( ignore_response, timeout )
 
     data = nil
     cmd = nil
-    local count, length, magic, status, crc, arg0, arg1, arg2 
+    local count, length, magic, status, crc, arg0, arg1, arg2
 
     count, cmd, length, magic, status, crc, arg0, arg1, arg2 = bin.unpack('SSIsSLLL', response)
     count, data, ng = bin.unpack('H'..length..'C', response, count)
diff --git a/client/mifare/mifarehost.c b/client/mifare/mifarehost.c
index 7bbd61812..893664e86 100644
--- a/client/mifare/mifarehost.c
+++ b/client/mifare/mifarehost.c
@@ -455,13 +455,13 @@ int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount) {
         uint8_t blockno;
         uint8_t blockcnt;
     } PACKED payload;
-      
+
     payload.blockno = blockNum;
     payload.blockcnt = blocksCount;
-    
+
     clearCommandBuffer();
-    SendCommandNG(CMD_MIFARE_EML_MEMGET, (uint8_t*)&payload, sizeof(payload));
-    
+    SendCommandNG(CMD_MIFARE_EML_MEMGET, (uint8_t *)&payload, sizeof(payload));
+
     PacketResponseNG resp;
     if (WaitForResponseTimeout(CMD_MIFARE_EML_MEMGET, &resp, 1500) == 0) {
         PrintAndLogEx(WARNING, "Command execute timeout");
@@ -479,14 +479,14 @@ int mfEmlSetMem(uint8_t *data, int blockNum, int blocksCount) {
 }
 
 int mfEmlSetMem_xt(uint8_t *data, int blockNum, int blocksCount, int blockBtWidth) {
-    
+
     struct p {
         uint8_t blockno;
         uint8_t blockcnt;
         uint8_t blockwidth;
         uint8_t data[];
     } PACKED;
-    
+
     size_t size = blocksCount * blockBtWidth;
     if (size > (PM3_CMD_DATA_SIZE - sizeof(struct p))) {
         return PM3_ESOFT;
@@ -497,9 +497,9 @@ int mfEmlSetMem_xt(uint8_t *data, int blockNum, int blocksCount, int blockBtWidt
     payload->blockcnt = blocksCount;
     payload->blockwidth = blockBtWidth;
     memcpy(payload->data, data, size);
-   
+
     clearCommandBuffer();
-    SendCommandNG(CMD_MIFARE_EML_MEMSET, (uint8_t*)payload, sizeof(payload) + size );
+    SendCommandNG(CMD_MIFARE_EML_MEMSET, (uint8_t *)payload, sizeof(payload) + size);
     return PM3_SUCCESS;
 }
 
@@ -963,7 +963,7 @@ int detect_classic_nackbug(bool verbose) {
 
         if (WaitForResponseTimeout(CMD_MIFARE_NACK_DETECT, &resp, 500)) {
 
-            if ( resp.status == PM3_EOPABORTED ) {
+            if (resp.status == PM3_EOPABORTED) {
                 PrintAndLogEx(WARNING, "button pressed. Aborted.");
                 return PM3_EOPABORTED;
             }
@@ -1018,7 +1018,7 @@ void detect_classic_magic(void) {
     clearCommandBuffer();
     SendCommandNG(CMD_MIFARE_CIDENT, NULL, 0);
     if (WaitForResponseTimeout(CMD_MIFARE_CIDENT, &resp, 1500)) {
-        if ( resp.status == PM3_SUCCESS )
+        if (resp.status == PM3_SUCCESS)
             isGeneration = resp.data.asBytes[0];
     }
 
diff --git a/client/proxmark3.c b/client/proxmark3.c
index a59f507c1..879b3630b 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -160,12 +160,11 @@ main_loop(char *script_cmds_file, char *script_cmd) {
                 } else {
                     rl_event_hook = check_comm;
                     if (session.pm3_present) {
-                        if ( conn.send_via_fpc_usart == false )
+                        if (conn.send_via_fpc_usart == false)
                             cmd = readline(PROXPROMPT_USB);
-                        else 
+                        else
                             cmd = readline(PROXPROMPT_FPC);
-                    }
-                    else
+                    } else
                         cmd = readline(PROXPROMPT_OFFLINE);
 
                     fflush(NULL);
diff --git a/client/scripts/test_t55x7.lua b/client/scripts/test_t55x7.lua
index fddb19817..c06d2848a 100644
--- a/client/scripts/test_t55x7.lua
+++ b/client/scripts/test_t55x7.lua
@@ -254,7 +254,7 @@ local function test(modulation)
         local p_config_cmd = process_block0_cmds[_]
         local errors = 0
         core.clearCommandBuffer()
-        
+
         -- Write Config block
         dbg(('lf t55xx write b 0 d %s'):format(p_config_cmd))
 
diff --git a/common/lfdemod.c b/common/lfdemod.c
index 7bdd27580..b364b16c0 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -271,7 +271,7 @@ bool preambleSearchEx(uint8_t *bits, uint8_t *preamble, size_t pLen, size_t *siz
             if (foundCnt == 1) {
                 prnt("DEBUG: (preambleSearchEx) preamble found at %i", idx);
                 *startIdx = idx;
-                if (findone) 
+                if (findone)
                     return true;
             }
             if (foundCnt == 2) {
@@ -1467,7 +1467,7 @@ static uint16_t cleanAskRawDemod(uint8_t *bits, size_t *size, int clk, int inver
         } else if (bits[i] <= low && !waveHigh) {
             smplCnt++;
         } else {
-         //transition
+            //transition
             if ((bits[i] >= high && !waveHigh) || (bits[i] <= low && waveHigh)) {
 
                 // 8  ::    8-2-1 =  5   8+2+1 = 11
@@ -1476,7 +1476,7 @@ static uint16_t cleanAskRawDemod(uint8_t *bits, size_t *size, int clk, int inver
                 // 64 ::  64-16-1 = 47 64+16+1 = 81
                 if (smplCnt > clk - cl_4 - 1) { //full clock
 
-                    if (smplCnt > clk + cl_4 + 1) { 
+                    if (smplCnt > clk + cl_4 + 1) {
                         //too many samples
                         errCnt++;
                         if (g_debugMode == 2) prnt("DEBUG ASK: cleanAskRawDemod ASK Modulation Error FULL at: %u  [%u > %u]", i, smplCnt, clk + cl_4 + 1);
@@ -1490,7 +1490,7 @@ static uint16_t cleanAskRawDemod(uint8_t *bits, size_t *size, int clk, int inver
                     }
                     if (*startIdx == 0) {
                         *startIdx = i - clk;
-                         prnt("DEBUG ASK: cleanAskRawDemod minus clock [%d]", *startIdx);
+                        prnt("DEBUG ASK: cleanAskRawDemod minus clock [%d]", *startIdx);
                     }
                     waveHigh = !waveHigh;
                     smplCnt = 0;
@@ -1511,7 +1511,7 @@ static uint16_t cleanAskRawDemod(uint8_t *bits, size_t *size, int clk, int inver
                     }
                     if (*startIdx == 0) {
                         *startIdx = i - cl_2;
-                         prnt("DEBUG ASK: cleanAskRawDemod minus half clock [%d]", *startIdx);
+                        prnt("DEBUG ASK: cleanAskRawDemod minus half clock [%d]", *startIdx);
                     }
                     waveHigh = !waveHigh;
                     smplCnt = 0;
@@ -1527,10 +1527,10 @@ static uint16_t cleanAskRawDemod(uint8_t *bits, size_t *size, int clk, int inver
 
     *size = bitCnt;
 
-/*
-    if (*startIdx < 0)
-        *startIdx = 0;
-*/
+    /*
+        if (*startIdx < 0)
+            *startIdx = 0;
+    */
 
     if (g_debugMode == 2) prnt("DEBUG ASK: cleanAskRawDemod Startidx %d", *startIdx);
 
diff --git a/common/usart.c b/common/usart.c
index c7b4a5ebb..ced1e5e6b 100644
--- a/common/usart.c
+++ b/common/usart.c
@@ -199,7 +199,7 @@ void usart_init(uint32_t baudrate, uint8_t parity) {
                     AT91C_US_NBSTOP_1_BIT |          // 1 stop bit
                     AT91C_US_CHMODE_NORMAL;          // channel mode: normal
 
-    switch(usart_parity) {
+    switch (usart_parity) {
         case 'N':
             mode |= AT91C_US_PAR_NONE;               // parity: none
             break;
@@ -228,12 +228,12 @@ void usart_init(uint32_t baudrate, uint8_t parity) {
     //          baudrate == selected clock/16/CD
     //       OVER = 1,  -yes we are oversampling
     //          baudrate == selected clock/8/CD    --> this is ours
-    // 
+    //
     uint32_t brgr = 48000000 / (usart_baudrate << 3);
     // doing fp = round((mck / (usart_baudrate << 3) - brgr) * 8) with integers:
-    uint32_t fp = ((16 * 48000000 / (usart_baudrate << 3) - 16 * brgr)+1)/2;
+    uint32_t fp = ((16 * 48000000 / (usart_baudrate << 3) - 16 * brgr) + 1) / 2;
 
-    pUS1->US_BRGR =  (fp << 16) | brgr;
+    pUS1->US_BRGR = (fp << 16) | brgr;
 
     // Write the Timeguard Register
     pUS1->US_TTGR = 0;
diff --git a/include/common.h b/include/common.h
index 186fddaaf..3dbf77622 100644
--- a/include/common.h
+++ b/include/common.h
@@ -57,7 +57,7 @@ extern uint32_t FLASHMEM_SPIBAUDRATE;
 // 0x3D000 - 1 4kb sector = default T55XX keys dictionary
 // 0x3B000 - 1 4kb sector = default ICLASS keys dictionary
 // 0x39000 - 2 4kb sectors = default MFC keys dictionary
-// 
+//
 #ifndef FLASH_MEM_BLOCK_SIZE
 # define FLASH_MEM_BLOCK_SIZE   256
 #endif
diff --git a/include/pm3_cmd.h b/include/pm3_cmd.h
index b8c62dac7..772ec02b9 100644
--- a/include/pm3_cmd.h
+++ b/include/pm3_cmd.h
@@ -204,9 +204,9 @@ typedef struct {
 } PACKED lf_psksim_t;
 
 typedef struct {
-   uint8_t blockno;
-   uint8_t keytype;
-   uint8_t key[6];
+    uint8_t blockno;
+    uint8_t keytype;
+    uint8_t key[6];
 } PACKED mf_readblock_t;
 
 
diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index 915878e37..93b7229ce 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -112,7 +112,7 @@ serial_port uart_open(const char *pcPortName, uint32_t speed) {
 
         struct addrinfo info;
 
-        memset (&info, 0, sizeof(info));
+        memset(&info, 0, sizeof(info));
 
         info.ai_socktype = SOCK_STREAM;
 
@@ -249,7 +249,7 @@ int uart_receive(const serial_port sp, uint8_t *pbtRx, uint32_t pszMaxRxLen, uin
     fd_set rfds;
     struct timeval tv;
 
-    if ( newtimeout_pending ) {
+    if (newtimeout_pending) {
         timeout.tv_usec = newtimeout_value * 1000;
         newtimeout_pending = false;
     }
@@ -312,7 +312,7 @@ int uart_send(const serial_port sp, const uint8_t *pbtTx, const uint32_t len) {
     uint32_t pos = 0;
     fd_set rfds;
     struct timeval tv;
-    
+
     while (pos < len) {
         // Reset file descriptor
         FD_ZERO(&rfds);
diff --git a/uart/uart_win32.c b/uart/uart_win32.c
index b02ddd7ef..bea698bdb 100644
--- a/uart/uart_win32.c
+++ b/uart/uart_win32.c
@@ -58,7 +58,7 @@ int uart_reconfigure_timeouts(uint32_t value) {
 }
 
 static int uart_reconfigure_timeouts_polling(serial_port sp) {
-    if ( newtimeout_pending == false )
+    if (newtimeout_pending == false)
         return PM3_SUCCESS;
     newtimeout_pending = false;
 

From d3f26fe7b71ec0cc5bc566166a587a2b4c81e719 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 8 Jun 2019 10:09:13 -0400
Subject: [PATCH 1911/1938] style

---
 client/cmddata.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmddata.c b/client/cmddata.c
index de58ef7ac..dbebc93dc 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -716,7 +716,7 @@ int ASKbiphaseDemod(const char *Cmd, bool verbose) {
     setDemodBuff(BitStream, size, 0);
     setClockGrid(clk, startIdx + clk * offset / 2);
     if (g_debugMode || verbose) {
-        PrintAndLogEx(NORMAL, "Biphase Decoded using offset %d | clock %d | #errors %d | start index %d\ndata\n", offset, clk, errCnt, (startIdx + clk * offset / 2));
+        PrintAndLogEx(DEBUG, "Biphase Decoded using offset %d | clock %d | #errors %d | start index %d\ndata\n", offset, clk, errCnt, (startIdx + clk * offset / 2));
         printDemodBuff();
     }
     return PM3_SUCCESS;

From 7fd7b539bec83b402b87e89d69e3ec871eb8ab8c Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 8 Jun 2019 10:10:04 -0400
Subject: [PATCH 1912/1938] textual

---
 client/cmdlf.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/client/cmdlf.c b/client/cmdlf.c
index 9bc954e43..8459eca3a 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -957,7 +957,7 @@ static bool CheckChipType(bool getDeviceData) {
         retval = true;
         goto out;
     }
-
+        
     //check for t55xx chip...
     if (tryDetectP1(true)) {
         PrintAndLogEx(SUCCESS, "\nChipset detection : " _GREEN_("T55xx") "found");
@@ -1084,7 +1084,9 @@ int CmdLFfind(const char *Cmd) {
     }
 out:
     // identify chipset
-    CheckChipType(isOnline);
+    if ( CheckChipType(isOnline) == false ) {
+        PrintAndLogEx(DEBUG, "Automatic chip type detection " _RED_("failed") );
+    }
     return PM3_SUCCESS;
 }
 

From a6fc729f22d6d7707e8230f8d0afbe6bd773545e Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 8 Jun 2019 10:11:18 -0400
Subject: [PATCH 1913/1938] style

---
 client/cmdlft55xx.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 463665de7..923e50110 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -2155,7 +2155,7 @@ bool tryDetectP1(bool getData) {
         }
         return false;
     }
-
+    
     // try ask clock detect.  it could be another type even if successful.
     clk = GetAskClock("", false);
     if (clk > 0) {
@@ -2164,24 +2164,27 @@ bool tryDetectP1(bool getData) {
                 (DemodBufferLen == 32 || DemodBufferLen == 64)) {
             return true;
         }
+       
         st = true;
         if ((ASKDemod_ext("0 1 1", false, false, 1, &st) == PM3_SUCCESS) &&
                 preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
                 (DemodBufferLen == 32 || DemodBufferLen == 64)) {
             return true;
         }
+        
         if ((ASKbiphaseDemod("0 0 0 2", false) == PM3_SUCCESS) &&
                 preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
                 (DemodBufferLen == 32 || DemodBufferLen == 64)) {
             return true;
         }
+
         if ((ASKbiphaseDemod("0 0 1 2", false) == PM3_SUCCESS) &&
                 preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
                 (DemodBufferLen == 32 || DemodBufferLen == 64)) {
             return true;
         }
     }
-
+    
     // try NRZ clock detect.  it could be another type even if successful.
     clk = GetNrzClock("", false); //has the most false positives :(
     if (clk > 0) {

From 34d794d9fd514073563c4813e976c5c00381fa75 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 8 Jun 2019 10:16:15 -0400
Subject: [PATCH 1914/1938] debug output

---
 common/lfdemod.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/common/lfdemod.c b/common/lfdemod.c
index b364b16c0..ef18b59ef 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -103,7 +103,8 @@ void computeSignalProperties(uint8_t *samples, uint32_t size) {
     // we can detect noise
     signalprop.isnoise =  signalprop.amplitude < NOISE_AMPLITUDE_THRESHOLD;
 
-    printSignal();
+    if (g_debugMode) 
+        printSignal();
 }
 
 void removeSignalOffset(uint8_t *samples, uint32_t size) {
@@ -1364,6 +1365,8 @@ static int millerRawDecode(uint8_t *bits, size_t *size, int invert) {
 int BiphaseRawDecode(uint8_t *bits, size_t *size, int *offset, int invert) {
     //sanity check
     if (*size < 51) return -1;
+ 
+    if ( *offset < 0 ) *offset = 0;
 
     uint16_t bitnum = 0;
     uint16_t errCnt = 0;
@@ -1378,7 +1381,8 @@ int BiphaseRawDecode(uint8_t *bits, size_t *size, int *offset, int invert) {
     }
     if (!offsetA && offsetB) ++*offset;
 
-    for (i = *offset; i < *size - 3; i += 2) {
+    // main loop
+    for (i = *offset; i < *size - 1; i += 2) {
         //check for phase error
         if (bits[i + 1] == bits[i + 2]) {
             bits[bitnum++] = 7;
@@ -1527,11 +1531,6 @@ static uint16_t cleanAskRawDemod(uint8_t *bits, size_t *size, int clk, int inver
 
     *size = bitCnt;
 
-    /*
-        if (*startIdx < 0)
-            *startIdx = 0;
-    */
-
     if (g_debugMode == 2) prnt("DEBUG ASK: cleanAskRawDemod Startidx %d", *startIdx);
 
     return errCnt;

From fd2ac38ac311e2fb9c2055b7ef36fdad8944224c Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 8 Jun 2019 15:24:12 -0400
Subject: [PATCH 1915/1938] chg: lf em 4x05_info

---
 client/cmdlfem4x.c | 43 +++++++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 93f6b5b3e..6a5fae76f 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -884,9 +884,9 @@ int EM4x50Read(const char *Cmd, bool verbose) {
         if (start >= 0) {
             PrintAndLogEx(NORMAL, "\nNote: one block = 50 bits (32 data, 12 parity, 6 marker)");
         } else {
-            PrintAndLogEx(NORMAL, "No data found!, clock tried:%d", clk);
+            PrintAndLogEx(NORMAL, "No data found!, clock tried: " _YELLOW_("%d"), clk);
             PrintAndLogEx(NORMAL, "Try again with more samples.");
-            PrintAndLogEx(NORMAL, "  or after a 'data askedge' command to clean up the read");
+            PrintAndLogEx(NORMAL, "  or after a " _YELLOW_("'data askedge'") " command to clean up the read");
             return PM3_ESOFT;
         }
     } else if (start < 0) return PM3_ESOFT;
@@ -1372,19 +1372,19 @@ static void printEM4x05config(uint32_t wordData) {
     uint8_t pigeon = (wordData & (1 << 26)) >> 26;
     PrintAndLogEx(NORMAL, "ConfigWord: %08X (Word 4)\n", wordData);
     PrintAndLogEx(NORMAL, "Config Breakdown:");
-    PrintAndLogEx(NORMAL, " Data Rate:  %02u | RF/%u", wordData & 0x3F, datarate);
-    PrintAndLogEx(NORMAL, "   Encoder:   %u | %s", encoder, enc);
+    PrintAndLogEx(NORMAL, " Data Rate:  %02u | "_YELLOW_("RF/%u"), wordData & 0x3F, datarate);
+    PrintAndLogEx(NORMAL, "   Encoder:   %u | " _YELLOW_("%s"), encoder, enc);
     PrintAndLogEx(NORMAL, "    PSK CF:   %u | %s", PSKcf, cf);
     PrintAndLogEx(NORMAL, "     Delay:   %u | %s", delay, cdelay);
     PrintAndLogEx(NORMAL, " LastWordR:  %02u | Address of last word for default read - meaning %u blocks are output", LWR, numblks);
-    PrintAndLogEx(NORMAL, " ReadLogin:   %u | Read Login is %s", readLogin, readLogin ? "Required" : "Not Required");
-    PrintAndLogEx(NORMAL, "   ReadHKL:   %u | Read Housekeeping Words Login is %s", readHKL, readHKL ? "Required" : "Not Required");
-    PrintAndLogEx(NORMAL, "WriteLogin:   %u | Write Login is %s", writeLogin, writeLogin ? "Required" : "Not Required");
-    PrintAndLogEx(NORMAL, "  WriteHKL:   %u | Write Housekeeping Words Login is %s", writeHKL, writeHKL ? "Required" : "Not Required");
-    PrintAndLogEx(NORMAL, "    R.A.W.:   %u | Read After Write is %s", raw, raw ? "On" : "Off");
-    PrintAndLogEx(NORMAL, "   Disable:   %u | Disable Command is %s", disable, disable ? "Accepted" : "Not Accepted");
-    PrintAndLogEx(NORMAL, "    R.T.F.:   %u | Reader Talk First is %s", rtf, rtf ? "Enabled" : "Disabled");
-    PrintAndLogEx(NORMAL, "    Pigeon:   %u | Pigeon Mode is %s\n", pigeon, pigeon ? "Enabled" : "Disabled");
+    PrintAndLogEx(NORMAL, " ReadLogin:   %u | Read login is %s", readLogin, readLogin ? _YELLOW_("required") :  _GREEN_("not required") );
+    PrintAndLogEx(NORMAL, "   ReadHKL:   %u | Read housekeeping words login is %s", readHKL, readHKL ? _YELLOW_("required") : _GREEN_("not required") );
+    PrintAndLogEx(NORMAL, "WriteLogin:   %u | Write login is %s", writeLogin, writeLogin ? _YELLOW_("required") :  _GREEN_("not required") );
+    PrintAndLogEx(NORMAL, "  WriteHKL:   %u | Write housekeeping words login is %s", writeHKL, writeHKL ? _YELLOW_("required") :  _GREEN_("not Required") );
+    PrintAndLogEx(NORMAL, "    R.A.W.:   %u | Read after write is %s", raw, raw ? "on" : "off");
+    PrintAndLogEx(NORMAL, "   Disable:   %u | Disable command is %s", disable, disable ? "accepted" : "not accepted");
+    PrintAndLogEx(NORMAL, "    R.T.F.:   %u | Reader talk first is %s", rtf, rtf ? _YELLOW_("enabled") : "disabled");
+    PrintAndLogEx(NORMAL, "    Pigeon:   %u | Pigeon mode is %s\n", pigeon, pigeon ? _YELLOW_("enabled") : "disabled");
 }
 
 static void printEM4x05info(uint32_t block0, uint32_t serial) {
@@ -1393,24 +1393,27 @@ static void printEM4x05info(uint32_t block0, uint32_t serial) {
     uint8_t cap = (block0 >> 5) & 3;
     uint16_t custCode = (block0 >> 9) & 0x3FF;
 
+    char ctstr[50];
+    snprintf(ctstr, sizeof(ctstr), "\n Chip Type:   %u | ", chipType);
     switch (chipType) {
         case 9:
-            PrintAndLogEx(NORMAL, "\n Chip Type:   %u | EM4305", chipType);
+            snprintf(ctstr + strlen(ctstr), sizeof(ctstr) - strlen(ctstr), _YELLOW_("%s"), "EM4305");
             break;
         case 8:
-            PrintAndLogEx(NORMAL, "\n Chip Type:   %u | EM4205", chipType);
+            snprintf(ctstr + strlen(ctstr), sizeof(ctstr) - strlen(ctstr), _YELLOW_("%s"), "EM4205");        
             break;
         case 4:
-            PrintAndLogEx(NORMAL, " Chip Type:   %u | Unknown", chipType);
+            snprintf(ctstr + strlen(ctstr), sizeof(ctstr) - strlen(ctstr), _YELLOW_("%s"), "Unknown");
             break;
         case 2:
-            PrintAndLogEx(NORMAL, " Chip Type:   %u | EM4469", chipType);
+            snprintf(ctstr + strlen(ctstr), sizeof(ctstr) - strlen(ctstr), _YELLOW_("%s"), "EM4469");
             break;
         //add more here when known
         default:
-            PrintAndLogEx(NORMAL, " Chip Type:   %u Unknown", chipType);
+            snprintf(ctstr + strlen(ctstr), sizeof(ctstr) - strlen(ctstr), _YELLOW_("%s"), "Unknown");
             break;
     }
+    PrintAndLogEx(NORMAL, "%s", ctstr);
 
     switch (cap) {
         case 3:
@@ -1432,14 +1435,14 @@ static void printEM4x05info(uint32_t block0, uint32_t serial) {
 
     PrintAndLogEx(NORMAL, " Cust Code: %03u | %s", custCode, (custCode == 0x200) ? "Default" : "Unknown");
     if (serial != 0)
-        PrintAndLogEx(NORMAL, "\n  Serial #: %08X\n", serial);
+        PrintAndLogEx(NORMAL, "\n  Serial #: " _YELLOW_("%08X") "\n", serial);
 }
 
 static void printEM4x05ProtectionBits(uint32_t word) {
     for (uint8_t i = 0; i < 15; i++) {
-        PrintAndLogEx(NORMAL, "      Word:  %02u | %s", i, (((1 << i) & word) || i < 2) ? "Is Write Locked" : "Is Not Write Locked");
+        PrintAndLogEx(NORMAL, "      Word:  %02u | %s", i, (((1 << i) & word) || i < 2) ? _RED_("write Locked") : "unlocked");
         if (i == 14)
-            PrintAndLogEx(NORMAL, "      Word:  %02u | %s", i + 1, (((1 << i) & word) || i < 2) ? "Is Write Locked" : "Is Not Write Locked");
+            PrintAndLogEx(NORMAL, "      Word:  %02u | %s", i + 1, (((1 << i) & word) || i < 2) ? _RED_("write locked") : "unlocked");
     }
 }
 

From e7d00dce83bdaa112a88dba799f80258bff6ba6b Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 8 Jun 2019 15:26:05 -0400
Subject: [PATCH 1916/1938] chg: upgrade always possible

---
 client/cmdsmartcard.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index d6870e579..c8529fa23 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -1130,7 +1130,7 @@ static command_t CommandTable[] = {
     {"info",     CmdSmartInfo,          IfPm3Smartcard,  "Tag information"},
     {"reader",   CmdSmartReader,        IfPm3Smartcard,  "Act like an IS07816 reader"},
     {"raw",      CmdSmartRaw,           IfPm3Smartcard,  "Send raw hex data to tag"},
-    {"upgrade",  CmdSmartUpgrade,       IfPm3Smartcard,  "Upgrade sim module firmware"},
+    {"upgrade",  CmdSmartUpgrade,       AlwaysAvailable,  "Upgrade sim module firmware"},
     {"setclock", CmdSmartSetClock,      IfPm3Smartcard,  "Set clock speed"},
     {"brute",    CmdSmartBruteforceSFI, IfPm3Smartcard,  "Bruteforce SFI"},
     {NULL, NULL, NULL, NULL}

From b344e7c13372676d8857d44573c1b2f78c9858fe Mon Sep 17 00:00:00 2001
From: Albert Einstein <javastraat@hotmail.com>
Date: Sun, 9 Jun 2019 10:27:20 +0200
Subject: [PATCH 1917/1938] <added keys for Transportes Insular La Palma
 (Public Transport)>

---
 client/default_keys.dic | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/client/default_keys.dic b/client/default_keys.dic
index 3582ed394..f02428c18 100644
--- a/client/default_keys.dic
+++ b/client/default_keys.dic
@@ -861,3 +861,36 @@ A7FB4824ACBF,
 00F0BD116D70,
 4CFF128FA3EF,
 10F3BEBC01DF,
+#Transportes Insular La Palma
+0172066b2f03,
+0000085f0000,
+1a80b93f7107,
+70172066b2f0,
+b1a80c94f710,
+0b0172066b2f,
+0f1a81c95071,
+f0f0172066b2,
+1131a81d9507,
+2f130172066b,
+71171a82d951,
+b2f170172066,
+1711b1a82e96,
+6b2f1b017206,
+62711f1a83e9,
+66b2f1f01720,
+97271231a83f,
+066b2f230172,
+f97371271a84,
+2066b2f27017,
+50983712b1a8,
+72066b2f2b01,
+850984712f1a,
+172066b2f2f0,
+a85198481331,
+0172066b2f33,
+1a8619858137,
+70172066b2f3,
+b1a862985913,
+3b0172066b2f,
+3f1a87298691,
+f3f0172066b2,

From db578e9f5f3884e0b042c62b39cda43880f48e7d Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 9 Jun 2019 04:59:16 -0400
Subject: [PATCH 1918/1938] fix: read14a.lua - wrong call

---
 client/lualibs/read14a.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/lualibs/read14a.lua b/client/lualibs/read14a.lua
index 6c44445de..5cdf5a2e4 100644
--- a/client/lualibs/read14a.lua
+++ b/client/lualibs/read14a.lua
@@ -135,7 +135,7 @@ local function disconnect14443a()
     local c = Command:newMIX{cmd = cmds.CMD_READER_ISO_14443a}
     -- We can ignore the response here, no ACK is returned for this command
     -- Check /armsrc/iso14443a.c, ReaderIso14443a() for details
-    return c.sendMIX(true)
+    return c:sendMIX(true)
 end
 
 local library = {

From 32f5ba852014de38b3cd6abdbe9694478dad3ed6 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 9 Jun 2019 08:15:31 -0400
Subject: [PATCH 1919/1938] fix: drifting

---
 armsrc/lfsampling.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/armsrc/lfsampling.c b/armsrc/lfsampling.c
index aca064ecc..fb52411d4 100644
--- a/armsrc/lfsampling.c
+++ b/armsrc/lfsampling.c
@@ -136,8 +136,19 @@ uint32_t DoAcquisition(uint8_t decimation, uint32_t bits_per_sample, bool averag
     uint32_t sample_total_numbers = 0;
     uint32_t sample_total_saved = 0;
     uint32_t cancel_counter = 0;
-
-    while (!BUTTON_PRESS() && !data_available()) {
+    
+    uint16_t checker=0;
+  
+    while (true) {
+        if ( checker == 1000 ) {
+            if (BUTTON_PRESS() || data_available())
+                break;
+            else
+                checker = 0;
+        } else {
+            ++checker;
+        }
+    
         WDT_HIT();
 
         if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {

From 8eb90d0cb91791836f50923566022643bbf70f4f Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 9 Jun 2019 09:32:34 -0400
Subject: [PATCH 1920/1938] more delays

---
 armsrc/lfsampling.c | 40 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 36 insertions(+), 4 deletions(-)

diff --git a/armsrc/lfsampling.c b/armsrc/lfsampling.c
index fb52411d4..c5a075e7a 100644
--- a/armsrc/lfsampling.c
+++ b/armsrc/lfsampling.c
@@ -137,7 +137,7 @@ uint32_t DoAcquisition(uint8_t decimation, uint32_t bits_per_sample, bool averag
     uint32_t sample_total_saved = 0;
     uint32_t cancel_counter = 0;
     
-    uint16_t checker=0;
+    uint16_t checker = 0;
   
     while (true) {
         if ( checker == 1000 ) {
@@ -293,8 +293,19 @@ void doT55x7Acquisition(size_t sample_size) {
     bool startFound = false;
     bool highFound = false;
     bool lowFound = false;
+    
+    uint16_t checker = 0;
+  
+    while ( skipCnt < 1000 && (i < bufsize)) {
+        if ( checker == 1000 ) {
+            if (BUTTON_PRESS() || data_available())
+                break;
+            else
+                checker = 0;
+        } else {
+            ++checker;
+        }
 
-    while (!BUTTON_PRESS() && !data_available() && skipCnt < 1000 && (i < bufsize)) {
         WDT_HIT();
 
 
@@ -359,7 +370,18 @@ void doCotagAcquisition(size_t sample_size) {
     uint16_t i = 0;
     uint16_t noise_counter = 0;
 
-    while (!BUTTON_PRESS() && !data_available() && (i < bufsize) && (noise_counter < (COTAG_T1 << 1))) {
+    uint16_t checker = 0;
+  
+    while ((i < bufsize) && (noise_counter < (COTAG_T1 << 1))) {
+        if ( checker == 1000 ) {
+            if (BUTTON_PRESS() || data_available())
+                break;
+            else
+                checker = 0;
+        } else {
+            ++checker;
+        }
+
         WDT_HIT();
 
         if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
@@ -408,8 +430,18 @@ uint32_t doCotagAcquisitionManchester() {
     uint16_t sample_counter = 0, period = 0;
     uint8_t curr = 0, prev = 0;
     uint16_t noise_counter = 0;
+    uint16_t checker = 0;
+  
+    while ((sample_counter < bufsize) && (noise_counter < (COTAG_T1 << 1))) {
+        if ( checker == 1000 ) {
+            if (BUTTON_PRESS() || data_available())
+                break;
+            else
+                checker = 0;
+        } else {
+            ++checker;
+        }
 
-    while (!BUTTON_PRESS() && !data_available() && (sample_counter < bufsize)  && (noise_counter < (COTAG_T1 << 1))) {
         WDT_HIT();
 
         if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {

From 7afc4b7b3b264f8774f57715ae638f5c2f80b581 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 9 Jun 2019 18:08:46 +0200
Subject: [PATCH 1921/1938] chg: cleanup

---
 uart/uart_win32.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/uart/uart_win32.c b/uart/uart_win32.c
index bea698bdb..5a5f8b9d3 100644
--- a/uart/uart_win32.c
+++ b/uart/uart_win32.c
@@ -187,8 +187,6 @@ int uart_receive(const serial_port sp, uint8_t *pbtRx, uint32_t pszMaxRxLen, uin
         return PM3_EIO;
     }
 
-//    printf("[!]res %d | rx errorcode == %d \n", res, errorcode);
-    // disconnected device
     return PM3_ENOTTY;
 }
 
@@ -202,9 +200,6 @@ int uart_send(const serial_port sp, const uint8_t *p_tx, const uint32_t len) {
     if (res == 0 && errorcode == 2) {
         return PM3_EIO;
     }
-
-//    printf("[!!]res %d | send errorcode == %d \n", res, errorcode);
-    // disconnected device
     return PM3_ENOTTY;
 }
 

From dd9005719a87a3e946dba830070c04cb7e75860e Mon Sep 17 00:00:00 2001
From: Iceman <iceman@iuse.se>
Date: Sun, 9 Jun 2019 22:39:07 +0200
Subject: [PATCH 1922/1938] Update README.md

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index eddeaa759..b61ec89f7 100644
--- a/README.md
+++ b/README.md
@@ -20,6 +20,8 @@ alt="Yuotube" width="100%" height="auto" border="10" /></a>
 |[Why didn't you base it on official PM3 Master?](#why-didnt-you-base-it-on-official-pm3-master)| [Homebrew (Mac OS X) & Upgrading HomeBrew Tap Formula](/doc/md/Installation_Instructions/Mac-OS-X-Homebrew-Installation-Instructions.md) | [First Use and Verification](/doc/md/Use_of_Proxmark/2_Configuration-and-Verification.md)|
 |[PM3 GUI](#pm3-gui)|[Setup and build for Windows](/doc/md/Installation_Instructions/Windows-Installation-Instructions.md)|[Commands & Features](/doc/md/Use_of_Proxmark/3_Commands-and-Features.md)|
 |[Issues](#issues)|[Blue shark manual](/doc/bt_manual_v10.md) ||
+|[Notes on UART](/doc/uart_notes.md)|||
+|[Notes on Frame format](/doc/new_frame_format.md)|||
 |[Donations](#Donations)|||
 
 ## What has changed?

From 1ebfa897c87e78b090b6b6d2706415a9a5214923 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 12 Jun 2019 06:41:23 -0700
Subject: [PATCH 1923/1938] remove some cppcheck warnings

---
 armsrc/Standalone/hf_mattyrun.c |  10 ++--
 armsrc/desfire_crypto.c         |   2 +
 armsrc/hitag2.c                 |  26 +++++----
 armsrc/hitagS.c                 | 100 +++++++++++++++++---------------
 armsrc/iclass.c                 |   2 +-
 armsrc/iso14443a.c              |  19 +++---
 armsrc/mifarecmd.c              |   2 +-
 armsrc/mifaresim.c              |   6 +-
 client/cliparser/argtable3.c    |  20 +++----
 client/cmdanalyse.c             |   3 +-
 client/cmddata.c                |   4 +-
 client/cmdhf14a.c               |   3 +-
 client/cmdhflist.c              |   2 +-
 client/cmdhfmfdes.c             |   4 +-
 client/cmdhfmfhard.c            |   9 ++-
 client/cmdhfmfp.c               |  18 +++---
 client/cmdhfmfu.c               |  14 ++---
 client/cmdhftopaz.c             |   2 +-
 client/cmdlfhid.c               |   8 +--
 client/cmdlfkeri.c              |   2 +-
 client/cmdlfnexwatch.c          |   2 +-
 client/cmdusart.c               |  22 ++++---
 client/comms.c                  |   7 ++-
 client/loclass/cipher.c         |   4 +-
 24 files changed, 145 insertions(+), 146 deletions(-)

diff --git a/armsrc/Standalone/hf_mattyrun.c b/armsrc/Standalone/hf_mattyrun.c
index 2030953c0..66147c2fb 100644
--- a/armsrc/Standalone/hf_mattyrun.c
+++ b/armsrc/Standalone/hf_mattyrun.c
@@ -387,19 +387,19 @@ void RunMod() {
 
                 LED_B_ON(); // green
                 // assuming arg0==0,  use hardcoded uid 0xdeadbeaf
-                uint16_t flags;
+                uint16_t simflags;
                 switch (p_card.uidlen) {
                     case 10:
-                        flags = FLAG_10B_UID_IN_DATA;
+                        simflags = FLAG_10B_UID_IN_DATA;
                         break;
                     case 7:
-                        flags = FLAG_7B_UID_IN_DATA;
+                        simflags = FLAG_7B_UID_IN_DATA;
                         break;
                     default:
-                        flags = FLAG_4B_UID_IN_DATA;
+                        simflags = FLAG_4B_UID_IN_DATA;
                         break;
                 }
-                Mifare1ksim(flags | FLAG_MF_1K, 0, uid);
+                Mifare1ksim(simflags | FLAG_MF_1K, 0, uid);
                 LED_B_OFF();
 
                 /*
diff --git a/armsrc/desfire_crypto.c b/armsrc/desfire_crypto.c
index 496f8ae31..10ddf4162 100644
--- a/armsrc/desfire_crypto.c
+++ b/armsrc/desfire_crypto.c
@@ -89,6 +89,8 @@ void cmac(const desfirekey_t key, uint8_t *ivect, const uint8_t *data, size_t le
 }
 
 size_t key_block_size(const desfirekey_t key) {
+    if (key == NULL)
+        return 0;
     size_t block_size = 8;
     switch (key->type) {
         case T_DES:
diff --git a/armsrc/hitag2.c b/armsrc/hitag2.c
index 70f6281dc..2a7cf2859 100644
--- a/armsrc/hitag2.c
+++ b/armsrc/hitag2.c
@@ -685,7 +685,7 @@ void SniffHitag(void) {
 
     StopTicks();
 
-    int frame_count;
+//    int frame_count;
     int response;
     int overflow;
     bool rising_edge;
@@ -743,7 +743,7 @@ void SniffHitag(void) {
 
     // Reset the received frame, frame count and timing info
     memset(rx, 0x00, sizeof(rx));
-    frame_count = 0;
+//    frame_count = 0;
     response = 0;
     overflow = 0;
     reader_frame = false;
@@ -850,7 +850,7 @@ void SniffHitag(void) {
 
         // Check if frame was captured
         if (rxlen > 0) {
-            frame_count++;
+//            frame_count++;
             LogTrace(rx, nbytes(rxlen), response, 0, NULL, reader_frame);
 
             // Check if we recognize a valid authentication attempt
@@ -901,7 +901,8 @@ void SimulateHitagTag(bool tag_mem_supplied, uint8_t *data) {
 
     StopTicks();
 
-    int frame_count = 0, response = 0, overflow = 0;
+//    int frame_count = 0;
+    int response = 0, overflow = 0;
     uint8_t rx[HITAG_FRAME_LEN];
     size_t rxlen = 0;
     uint8_t tx[HITAG_FRAME_LEN];
@@ -915,7 +916,7 @@ void SimulateHitagTag(bool tag_mem_supplied, uint8_t *data) {
 
     auth_table_len = 0;
     auth_table_pos = 0;
-    uint8_t *auth_table = BigBuf_malloc(AUTH_TABLE_LENGTH);
+    auth_table = BigBuf_malloc(AUTH_TABLE_LENGTH);
     memset(auth_table, 0x00, AUTH_TABLE_LENGTH);
 
     // Reset the received frame, frame count and timing info
@@ -1018,7 +1019,7 @@ void SimulateHitagTag(bool tag_mem_supplied, uint8_t *data) {
 
         // Check if frame was captured
         if (rxlen > 4) {
-            frame_count++;
+//            frame_count++;
             LogTrace(rx, nbytes(rxlen), response, response, NULL, true);
 
             // Disable timer 1 with external trigger to avoid triggers during our own modulation
@@ -1074,7 +1075,7 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
 
     StopTicks();
 
-    int frame_count = 0;
+//    int frame_count = 0;
     int response = 0;
     uint8_t rx[HITAG_FRAME_LEN];
     size_t rxlen = 0;
@@ -1209,7 +1210,7 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
 
         // Check if frame was captured and store it
         if (rxlen > 0) {
-            frame_count++;
+//            frame_count++;
             LogTrace(rx, nbytes(rxlen), response, response, NULL, false);
         }
 
@@ -1265,7 +1266,7 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
 
         // Add transmitted frame to total count
         if (txlen > 0) {
-            frame_count++;
+//            frame_count++;
             LogTrace(tx, nbytes(txlen), HITAG_T_WAIT_2, HITAG_T_WAIT_2, NULL, true);
         }
 
@@ -1359,7 +1360,8 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
 
     StopTicks();
 
-    int frame_count = 0, response = 0;
+//    int frame_count = 0;
+    int response = 0;
     uint8_t rx[HITAG_FRAME_LEN];
     size_t rxlen = 0;
     uint8_t txbuf[HITAG_FRAME_LEN];
@@ -1468,7 +1470,7 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
 
         // Check if frame was captured and store it
         if (rxlen > 0) {
-            frame_count++;
+//            frame_count++;
             LogTrace(rx, nbytes(rxlen), response, response, NULL, false);
         }
 
@@ -1505,7 +1507,7 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
 
         // Add transmitted frame to total count
         if (txlen > 0) {
-            frame_count++;
+//            frame_count++;
             LogTrace(tx, nbytes(txlen), HITAG_T_WAIT_2, HITAG_T_WAIT_2, NULL, true);
         }
 
diff --git a/armsrc/hitagS.c b/armsrc/hitagS.c
index 11d371f80..d52e18fd4 100644
--- a/armsrc/hitagS.c
+++ b/armsrc/hitagS.c
@@ -35,9 +35,9 @@ static int temp2 = 0;
 static int sof_bits;               // number of start-of-frame bits
 static uint8_t pwdh0, pwdl0, pwdl1; // password bytes
 static uint32_t rnd = 0x74124485;  // randomnumber
-static int test = 0;
 size_t blocknr;
 bool end = false;
+//#define SENDBIT_TEST
 
 #define ht2bs_4a(a,b,c,d)   (~(((a|b)&c)^(a|d)^b))
 #define ht2bs_4b(a,b,c,d)   (~(((d|c)&(a^b))^(d|a|b)))
@@ -220,33 +220,33 @@ static void hitag_reader_send_bit(int bit) {
 
     HIGH(GPIO_SSC_DOUT);
 
-    if (test == 1) {
-        // Wait for 4-10 times the carrier period
-        while (AT91C_BASE_TC0->TC_CV < T0 * 6) {};
+#ifdef SENDBIT_TEST
+    // Wait for 4-10 times the carrier period
+    while (AT91C_BASE_TC0->TC_CV < T0 * 6) {};
 
-        LOW(GPIO_SSC_DOUT);
+    LOW(GPIO_SSC_DOUT);
 
-        if (bit == 0) {
-            // Zero bit: |_-|
-            while (AT91C_BASE_TC0->TC_CV < T0 * 11) {};
-        } else {
-            // One bit: |_--|
-            while (AT91C_BASE_TC0->TC_CV < T0 * 14) {};
-        }
+    if (bit == 0) {
+        // Zero bit: |_-|
+        while (AT91C_BASE_TC0->TC_CV < T0 * 11) {};
     } else {
-        // Wait for 4-10 times the carrier period
-        while (AT91C_BASE_TC0->TC_CV < T0 * 6) {};
-
-        LOW(GPIO_SSC_DOUT);
-
-        if (bit == 0) {
-            // Zero bit: |_-|
-            while (AT91C_BASE_TC0->TC_CV < T0 * 22) {};
-        } else {
-            // One bit: |_--|
-            while (AT91C_BASE_TC0->TC_CV < T0 * 28) {};
-        }
+        // One bit: |_--|
+        while (AT91C_BASE_TC0->TC_CV < T0 * 14) {};
     }
+#else
+    // Wait for 4-10 times the carrier period
+    while (AT91C_BASE_TC0->TC_CV < T0 * 6) {};
+
+    LOW(GPIO_SSC_DOUT);
+
+    if (bit == 0) {
+        // Zero bit: |_-|
+        while (AT91C_BASE_TC0->TC_CV < T0 * 22) {};
+    } else {
+        // One bit: |_--|
+        while (AT91C_BASE_TC0->TC_CV < T0 * 28) {};
+    }
+#endif
 
     LED_A_OFF();
 }
@@ -275,11 +275,10 @@ static void hitag_reader_send_frame(const uint8_t *frame, size_t frame_len) {
  */
 static int check_select(uint8_t *rx, uint32_t uid) {
     unsigned char resp[48];
-    int i;
     uint32_t ans = 0x0;
-    for (i = 0; i < 48; i++)
+    for (int i = 0; i < 48; i++)
         resp[i] = (rx[i / 8] >> (7 - (i % 8))) & 0x1;
-    for (i = 0; i < 32; i++)
+    for (int i = 0; i < 32; i++)
         ans += resp[5 + i] << (31 - i);
 
     temp_uid = ans;
@@ -733,18 +732,19 @@ static int hitagS_handle_tag_auth(hitag_function htf, uint64_t key, uint64_t NrA
         for (int i = 0; i < 5; i++) {
             response_bit[i] = 0;
         }
-        int i = 5;
-        for (; i < 37; i++) {
-            response_bit[i] = uid[i - 5];
-        }
+        {
+            int i = 5;
+            for (; i < 37; i++) {
+                response_bit[i] = uid[i - 5];
+            }
 
-        for (int j = 0; j < 8; j++) {
-            response_bit[i] = 0;
-            if ((crc & ((mask << 7) >> j)) != 0)
-                response_bit[i] = 1;
-            i++;
+            for (int j = 0; j < 8; j++) {
+                response_bit[i] = 0;
+                if ((crc & ((mask << 7) >> j)) != 0)
+                    response_bit[i] = 1;
+                i++;
+            }
         }
-
         k = 0;
         for (int i = 0; i < 6; i++) {
             tx[i] = (response_bit[k] << 7)
@@ -892,7 +892,8 @@ void SimulateHitagSTag(bool tag_mem_supplied, uint8_t *data) {
 
     StopTicks();
 
-    int frame_count = 0, response = 0, overflow = 0;
+//    int frame_count = 0;
+    int response = 0, overflow = 0;
     int i, j;
     uint8_t rx[HITAG_FRAME_LEN];
     size_t rxlen = 0;
@@ -1058,7 +1059,7 @@ void SimulateHitagSTag(bool tag_mem_supplied, uint8_t *data) {
 
         // Check if frame was captured
         if (rxlen > 0) {
-            frame_count++;
+//            frame_count++;
             LogTrace(rx, nbytes(rxlen), response, 0, NULL, true);
 
             // Disable timer 1 with external trigger to avoid triggers during our own modulation
@@ -1121,7 +1122,8 @@ void ReadHitagS(hitag_function htf, hitag_data *htd) {
     StopTicks();
 
     int i, j, z, k;
-    int frame_count = 0, response = 0;
+//    int frame_count = 0;
+    int response = 0;
     int response_bit[200];
     uint8_t rx[HITAG_FRAME_LEN];
     size_t rxlen = 0;
@@ -1228,7 +1230,7 @@ void ReadHitagS(hitag_function htf, hitag_data *htd) {
 
         // Check if frame was captured and store it
         if (rxlen > 0) {
-            frame_count++;
+//            frame_count++;
             LogTrace(rx, nbytes(rxlen), response, 0, NULL, false);
         }
 
@@ -1355,7 +1357,7 @@ void ReadHitagS(hitag_function htf, hitag_data *htd) {
 
         // Add transmitted frame to total count
         if (txlen > 0) {
-            frame_count++;
+//            frame_count++;
             LogTrace(tx, nbytes(txlen), HITAG_T_WAIT_2, 0, NULL, true);
         }
 
@@ -1449,7 +1451,8 @@ void WritePageHitagS(hitag_function htf, hitag_data *htd, int page) {
 
     StopTicks();
 
-    int frame_count = 0, response = 0;
+//    int frame_count = 0;
+    int response = 0;
     uint8_t rx[HITAG_FRAME_LEN];
     size_t rxlen = 0;
     uint8_t txbuf[HITAG_FRAME_LEN];
@@ -1556,7 +1559,7 @@ void WritePageHitagS(hitag_function htf, hitag_data *htd, int page) {
 
         // Check if frame was captured and store it
         if (rxlen > 0) {
-            frame_count++;
+//            frame_count++;
             LogTrace(rx, nbytes(rxlen), response, 0, NULL, false);
         }
 
@@ -1643,7 +1646,7 @@ void WritePageHitagS(hitag_function htf, hitag_data *htd, int page) {
 
         // Add transmitted frame to total count
         if (txlen > 0) {
-            frame_count++;
+//            frame_count++;
             LogTrace(tx, nbytes(txlen), HITAG_T_WAIT_2, 0, NULL, true);
         }
 
@@ -1741,7 +1744,8 @@ void WritePageHitagS(hitag_function htf, hitag_data *htd, int page) {
  */
 void check_challenges(bool file_given, uint8_t *data) {
     int i, j, z, k;
-    int frame_count = 0, response = 0;
+//    int frame_count = 0;
+    int response = 0;
     uint8_t uid_byte[4];
     uint8_t rx[HITAG_FRAME_LEN];
     uint8_t unlocker[60][8];
@@ -1824,7 +1828,7 @@ void check_challenges(bool file_given, uint8_t *data) {
 
         // Check if frame was captured and store it
         if (rxlen > 0) {
-            frame_count++;
+//            frame_count++;
             LogTrace(rx, nbytes(rxlen), response, 0, NULL, false);
         }
 
@@ -1951,7 +1955,7 @@ void check_challenges(bool file_given, uint8_t *data) {
 
         // Add transmitted frame to total count
         if (txlen > 0) {
-            frame_count++;
+//            frame_count++;
             LogTrace(tx, nbytes(txlen), HITAG_T_WAIT_2, 0, NULL, true);
         }
 
diff --git a/armsrc/iclass.c b/armsrc/iclass.c
index 25d224184..1662a963a 100644
--- a/armsrc/iclass.c
+++ b/armsrc/iclass.c
@@ -153,7 +153,6 @@ static void uart_init(uint8_t *data) {
 static void uart_bit(uint8_t bit) {
     static uint8_t buf = 0xff;
     static uint8_t n_buf;
-    static uint8_t msg_byte;
     static int nmsg_byte;
     buf <<= 1;
     buf |= bit ? 1 : 0;
@@ -166,6 +165,7 @@ static void uart_bit(uint8_t bit) {
             nmsg_byte = 0;
         }
     } else {
+        static uint8_t msg_byte;
         n_buf++;
         if (n_buf == 8) {
             msg_byte >>= 2;
diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index cfc912607..b5e612ec9 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -1400,8 +1400,7 @@ void SimulateIso14443aTag(uint8_t tagType, uint8_t flags, uint8_t *data) {
                 EmSendCmd(cmd, sizeof(cmd));
             } else {
                 EmSend4bit(CARD_NACK_NA);
-                uint32_t pwd = bytes_to_num(receivedCmd + 1, 4);
-                if (DBGLEVEL >= DBG_DEBUG) Dbprintf("Auth attempt: %08x", pwd);
+                if (DBGLEVEL >= DBG_DEBUG) Dbprintf("Auth attempt: %08x", bytes_to_num(receivedCmd + 1, 4));
             }
             p_response = NULL;
         } else if (receivedCmd[0] == MIFARE_ULEV1_VCSL && len == 23 && tagType == 7) {
@@ -2126,13 +2125,8 @@ static int GetATQA(uint8_t *resp, uint8_t *resp_par) {
 // requests ATS unless no_rats is true
 int iso14443a_select_card(uint8_t *uid_ptr, iso14a_card_select_t *p_card, uint32_t *cuid_ptr, bool anticollision, uint8_t num_cascades, bool no_rats) {
 
-    uint8_t sel_all[]    = { ISO14443A_CMD_ANTICOLL_OR_SELECT, 0x20 };
-    uint8_t sel_uid[]    = { ISO14443A_CMD_ANTICOLL_OR_SELECT, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-    uint8_t rats[]       = { ISO14443A_CMD_RATS, 0x80, 0x00, 0x00 }; // FSD=256, FSDI=8, CID=0
     uint8_t resp[MAX_FRAME_SIZE] = {0}; // theoretically. A usual RATS will be much smaller
     uint8_t resp_par[MAX_PARITY_SIZE] = {0};
-    uint8_t uid_resp[4] = {0};
-    size_t uid_resp_len = 0;
 
     uint8_t sak = 0x04; // cascade uid
     int cascade_level = 0;
@@ -2166,6 +2160,9 @@ int iso14443a_select_card(uint8_t *uid_ptr, iso14a_card_select_t *p_card, uint32
     // While the UID is not complete, the 3nd bit (from the right) is set in the SAK.
     for (; sak & 0x04; cascade_level++) {
         // SELECT_* (L1: 0x93, L2: 0x95, L3: 0x97)
+        uint8_t sel_all[]    = { ISO14443A_CMD_ANTICOLL_OR_SELECT, 0x20 };
+        uint8_t sel_uid[]    = { ISO14443A_CMD_ANTICOLL_OR_SELECT, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+        uint8_t uid_resp[4] = {0};
         sel_uid[0] = sel_all[0] = 0x93 + cascade_level * 2;
 
         if (anticollision) {
@@ -2213,7 +2210,7 @@ int iso14443a_select_card(uint8_t *uid_ptr, iso14a_card_select_t *p_card, uint32
                 memcpy(uid_resp, uid_ptr + cascade_level * 3, 4);
             }
         }
-        uid_resp_len = 4;
+        size_t uid_resp_len = 4;
 
         // calculate crypto UID. Always use last 4 Bytes.
         if (cuid_ptr)
@@ -2259,7 +2256,7 @@ int iso14443a_select_card(uint8_t *uid_ptr, iso14a_card_select_t *p_card, uint32
 
     // RATS, Request for answer to select
     if (!no_rats) {
-
+        uint8_t rats[]       = { ISO14443A_CMD_RATS, 0x80, 0x00, 0x00 }; // FSD=256, FSDI=8, CID=0
         AddCrc14A(rats, 2);
         ReaderTransmit(rats, sizeof(rats), NULL);
         int len = ReaderReceive(resp, resp_par);
@@ -2281,8 +2278,6 @@ int iso14443a_select_card(uint8_t *uid_ptr, iso14a_card_select_t *p_card, uint32
 }
 
 int iso14443a_fast_select_card(uint8_t *uid_ptr, uint8_t num_cascades) {
-    uint8_t sel_all[]    = { ISO14443A_CMD_ANTICOLL_OR_SELECT, 0x20 };
-    uint8_t sel_uid[]    = { ISO14443A_CMD_ANTICOLL_OR_SELECT, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
     uint8_t resp[5] = {0}; // theoretically. A usual RATS will be much smaller
     uint8_t resp_par[1] = {0};
     uint8_t uid_resp[4] = {0};
@@ -2298,6 +2293,8 @@ int iso14443a_fast_select_card(uint8_t *uid_ptr, uint8_t num_cascades) {
     // which case we need to make a cascade 2 request and select - this is a long UID
     // While the UID is not complete, the 3nd bit (from the right) is set in the SAK.
     for (; sak & 0x04; cascade_level++) {
+        uint8_t sel_all[]    = { ISO14443A_CMD_ANTICOLL_OR_SELECT, 0x20 };
+        uint8_t sel_uid[]    = { ISO14443A_CMD_ANTICOLL_OR_SELECT, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
         // SELECT_* (L1: 0x93, L2: 0x95, L3: 0x97)
         sel_uid[0] = sel_all[0] = 0x93 + cascade_level * 2;
 
diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index 9ea089bfe..26b6583fc 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -1956,10 +1956,10 @@ void MifareCIdent() {
     if (!ReaderReceive(rec, recpar) || (rec[0] != 0x0a)) {
         goto TEST2;
     };
-    isGen = GEN_1B;
 
     ReaderTransmit(wupC2, sizeof(wupC2), NULL);
     if (!ReaderReceive(rec, recpar) || (rec[0] != 0x0a)) {
+        isGen = GEN_1B;
         goto OUT;
     };
     isGen = GEN_1A;
diff --git a/armsrc/mifaresim.c b/armsrc/mifaresim.c
index 160cf9dcd..714beb284 100644
--- a/armsrc/mifaresim.c
+++ b/armsrc/mifaresim.c
@@ -605,12 +605,12 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t *datain) {
                 // Incoming SELECT CLx for any cascade level
                 if (receivedCmd_len == 9 && receivedCmd[1] == 0x70) {
                     if (memcmp(&receivedCmd[2], responses[uid_index].response, 4) == 0) {
-                        bool finished = (uid_len == 4  && uid_index == UIDBCC1) ||
+                        bool cl_finished = (uid_len == 4  && uid_index == UIDBCC1) ||
                                         (uid_len == 7  && uid_index == UIDBCC2) ||
                                         (uid_len == 10 && uid_index == UIDBCC3);
-                        EmSendPrecompiledCmd(&responses[finished ? SAK : SAKuid]);
+                        EmSendPrecompiledCmd(&responses[cl_finished ? SAK : SAKuid]);
                         if (DBGLEVEL >= DBG_EXTENDED) Dbprintf("SELECT CLx %02x%02x%02x%02x received", receivedCmd[2], receivedCmd[3], receivedCmd[4], receivedCmd[5]);
-                        if (finished) {
+                        if (cl_finished) {
                             LED_B_ON();
                             cardSTATE = MFEMUL_WORK;
                             if (DBGLEVEL >= DBG_EXTENDED) Dbprintf("[MFEMUL_SELECT] cardSTATE = MFEMUL_WORK");
diff --git a/client/cliparser/argtable3.c b/client/cliparser/argtable3.c
index 5c6947670..9d83dc33c 100644
--- a/client/cliparser/argtable3.c
+++ b/client/cliparser/argtable3.c
@@ -341,26 +341,24 @@ gcd(int a, int b) {
 static void
 permute_args(int panonopt_start, int panonopt_end, int opt_end,
              char *const *nargv) {
-    int cstart, cyclelen, i, j, ncycle, nnonopts, nopts, pos;
-    char *swap;
 
     /*
      * compute lengths of blocks and number and size of cycles
      */
-    nnonopts = panonopt_end - panonopt_start;
-    nopts = opt_end - panonopt_end;
-    ncycle = gcd(nnonopts, nopts);
-    cyclelen = (opt_end - panonopt_start) / ncycle;
+    int nnonopts = panonopt_end - panonopt_start;
+    int nopts = opt_end - panonopt_end;
+    int ncycle = gcd(nnonopts, nopts);
+    int cyclelen = (opt_end - panonopt_start) / ncycle;
 
-    for (i = 0; i < ncycle; i++) {
-        cstart = panonopt_end + i;
-        pos = cstart;
-        for (j = 0; j < cyclelen; j++) {
+    for (int i = 0; i < ncycle; i++) {
+        int cstart = panonopt_end + i;
+        int pos = cstart;
+        for (int j = 0; j < cyclelen; j++) {
             if (pos >= panonopt_end)
                 pos -= nnonopts;
             else
                 pos += nopts;
-            swap = nargv[pos];
+            char *swap = nargv[pos];
             /* LINTED const cast */
             ((char **) nargv)[pos] = nargv[cstart];
             /* LINTED const cast */
diff --git a/client/cmdanalyse.c b/client/cmdanalyse.c
index 459a144c9..1eee47c78 100644
--- a/client/cmdanalyse.c
+++ b/client/cmdanalyse.c
@@ -222,7 +222,6 @@ static uint16_t calcBSDchecksum4(uint8_t *bytes, uint8_t len, uint32_t mask) {
 // measuring LFSR maximum length
 static int CmdAnalyseLfsr(const char *Cmd) {
 
-    uint16_t lfsr;  /* Any nonzero start state will work. */
     uint8_t iv = param_get8ex(Cmd, 0, 0, 16);
     uint8_t find = param_get8ex(Cmd, 1, 0, 16);
 
@@ -232,7 +231,7 @@ static int CmdAnalyseLfsr(const char *Cmd) {
     for (uint8_t i = 0x01; i < 0x30; i += 1) {
         legic_prng_init(iv);
         legic_prng_forward(i);
-        lfsr = legic_prng_get_bits(12);
+        uint16_t lfsr = legic_prng_get_bits(12);  /* Any nonzero start state will work. */
         PrintAndLogEx(NORMAL, " %02X | %03X | %03X | %03X \n", i, lfsr, 0x40 ^ lfsr, find ^ lfsr);
     }
     return 0;
diff --git a/client/cmddata.c b/client/cmddata.c
index dbebc93dc..d6a4e8e73 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -935,12 +935,12 @@ static int CmdUndec(const char *Cmd) {
 //by marshmellow
 //shift graph zero up or down based on input + or -
 static int CmdGraphShiftZero(const char *Cmd) {
-    int shift = 0, shiftedVal;
+    int shift = 0;
     //set options from parameters entered with the command
     sscanf(Cmd, "%i", &shift);
 
     for (size_t i = 0; i < GraphTraceLen; i++) {
-        shiftedVal = GraphBuffer[i] + shift;
+        int shiftedVal = GraphBuffer[i] + shift;
 
         if (shiftedVal > 127)
             shiftedVal = 127;
diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 17746d9b8..018431a28 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -788,7 +788,8 @@ int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool lea
             }
 
             // check R-block ACK
-            if ((*dataoutlen == 0) && (*dataoutlen != 0 || chaining != chainBlockNotLast)) {
+//TODO check this one...
+            if ((*dataoutlen == 0) && (*dataoutlen != 0 || chaining != chainBlockNotLast)) { // *dataoutlen!=0. 'A && (!A || B)' is equivalent to 'A && B'
                 if (!leaveSignalON)
                     DropField();
 
diff --git a/client/cmdhflist.c b/client/cmdhflist.c
index ab1f8da1d..13766e299 100644
--- a/client/cmdhflist.c
+++ b/client/cmdhflist.c
@@ -1067,7 +1067,6 @@ void annotateMifare(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize, uint8
 
 bool DecodeMifareData(uint8_t *cmd, uint8_t cmdsize, uint8_t *parity, bool isResponse, uint8_t *mfData, size_t *mfDataLen) {
     static struct Crypto1State *traceCrypto1;
-    static uint64_t mfLastKey;
 
     *mfDataLen = 0;
 
@@ -1085,6 +1084,7 @@ bool DecodeMifareData(uint8_t *cmd, uint8_t cmdsize, uint8_t *parity, bool isRes
         return false;
 
     if (MifareAuthState == masFirstData) {
+        static uint64_t mfLastKey;
         if (AuthData.first_auth) {
             AuthData.ks2 = AuthData.ar_enc ^ prng_successor(AuthData.nt, 64);
             AuthData.ks3 = AuthData.at_enc ^ prng_successor(AuthData.nt, 96);
diff --git a/client/cmdhfmfdes.c b/client/cmdhfmfdes.c
index c36084ce6..d9023da47 100644
--- a/client/cmdhfmfdes.c
+++ b/client/cmdhfmfdes.c
@@ -610,10 +610,10 @@ static int CmdHF14ADesAuth(const char *Cmd) {
 
     uint8_t isOK  = resp.oldarg[0] & 0xff;
     if (isOK) {
-        uint8_t *data = resp.data.asBytes;
+        uint8_t *session = resp.data.asBytes;
 
         PrintAndLogEx(NORMAL, "  Key        :%s", sprint_hex(key, keylength));
-        PrintAndLogEx(NORMAL, "  SESSION    :%s", sprint_hex(data, keylength));
+        PrintAndLogEx(NORMAL, "  SESSION    :%s", sprint_hex(session, keylength));
         PrintAndLogEx(NORMAL, "-------------------------------------------------------------");
         //PrintAndLogEx(NORMAL, "  Expected   :B5 21 9E E8 1A A7 49 9D 21 96 68 7E 13 97 38 56");
     } else {
diff --git a/client/cmdhfmfhard.c b/client/cmdhfmfhard.c
index 8ae1b6d1a..2b96d8d77 100644
--- a/client/cmdhfmfhard.c
+++ b/client/cmdhfmfhard.c
@@ -825,12 +825,11 @@ static int compare_sum_a8_guess(const void *b1, const void *b2) {
 
 
 static float check_smallest_bitflip_bitarrays(void) {
-    uint32_t num_odd, num_even;
     uint64_t smallest = 1LL << 48;
     // initialize best_first_bytes, do a rough estimation on remaining states
     for (uint16_t i = 0; i < 256; i++) {
-        num_odd = nonces[i].num_states_bitarray[ODD_STATE];
-        num_even = nonces[i].num_states_bitarray[EVEN_STATE]; // * (float)nonces[i^0x80].num_states_bitarray[EVEN_STATE] / num_all_bitflips_bitarray[EVEN_STATE];
+        uint32_t num_odd = nonces[i].num_states_bitarray[ODD_STATE];
+        uint32_t num_even = nonces[i].num_states_bitarray[EVEN_STATE]; // * (float)nonces[i^0x80].num_states_bitarray[EVEN_STATE] / num_all_bitflips_bitarray[EVEN_STATE];
         if ((uint64_t)num_odd * num_even < smallest) {
             smallest = (uint64_t)num_odd * num_even;
             best_first_byte_smallest_bitarray = i;
@@ -838,8 +837,8 @@ static float check_smallest_bitflip_bitarrays(void) {
     }
 
 #if defined (DEBUG_REDUCTION)
-    num_odd = nonces[best_first_byte_smallest_bitarray].num_states_bitarray[ODD_STATE];
-    num_even = nonces[best_first_byte_smallest_bitarray].num_states_bitarray[EVEN_STATE]; // * (float)nonces[best_first_byte_smallest_bitarray^0x80].num_states_bitarray[EVEN_STATE] / num_all_bitflips_bitarray[EVEN_STATE];
+    uint32_t num_odd = nonces[best_first_byte_smallest_bitarray].num_states_bitarray[ODD_STATE];
+    uint32_t num_even = nonces[best_first_byte_smallest_bitarray].num_states_bitarray[EVEN_STATE]; // * (float)nonces[best_first_byte_smallest_bitarray^0x80].num_states_bitarray[EVEN_STATE] / num_all_bitflips_bitarray[EVEN_STATE];
     PrintAndLogEx(NORMAL, "0x%02x: %8d * %8d = %12" PRIu64 " (2^%1.1f)\n", best_first_byte_smallest_bitarray, num_odd, num_even, (uint64_t)num_odd * num_even, log((uint64_t)num_odd * num_even) / log(2.0));
 #endif
     return (float)smallest / 2.0;
diff --git a/client/cmdhfmfp.c b/client/cmdhfmfp.c
index e69410e38..fb1118b81 100644
--- a/client/cmdhfmfp.c
+++ b/client/cmdhfmfp.c
@@ -394,8 +394,8 @@ static int CmdHFMFPRdbl(const char *cmd) {
     if (verbose)
         PrintAndLogEx(INFO, "--block:%d sector[%d]:%02x key:%04x", blockn, mfNumBlocksPerSector(sectorNum), sectorNum, uKeyNum);
 
-    mf4Session session;
-    int res = MifareAuth4(&session, keyn, key, true, true, verbose);
+    mf4Session mf4session;
+    int res = MifareAuth4(&mf4session, keyn, key, true, true, verbose);
     if (res) {
         PrintAndLogEx(ERR, "Authentication error: %d", res);
         return res;
@@ -404,7 +404,7 @@ static int CmdHFMFPRdbl(const char *cmd) {
     uint8_t data[250] = {0};
     int datalen = 0;
     uint8_t mac[8] = {0};
-    res = MFPReadBlock(&session, plain, blockn & 0xff, blocksCount, false, false, data, sizeof(data), &datalen, mac);
+    res = MFPReadBlock(&mf4session, plain, blockn & 0xff, blocksCount, false, false, data, sizeof(data), &datalen, mac);
     if (res) {
         PrintAndLogEx(ERR, "Read error: %d", res);
         return res;
@@ -493,8 +493,8 @@ static int CmdHFMFPRdsc(const char *cmd) {
     if (verbose)
         PrintAndLogEx(INFO, "--sector[%d]:%02x key:%04x", mfNumBlocksPerSector(sectorNum), sectorNum, uKeyNum);
 
-    mf4Session session;
-    int res = MifareAuth4(&session, keyn, key, true, true, verbose);
+    mf4Session mf4session;
+    int res = MifareAuth4(&mf4session, keyn, key, true, true, verbose);
     if (res) {
         PrintAndLogEx(ERR, "Authentication error: %d", res);
         return res;
@@ -504,7 +504,7 @@ static int CmdHFMFPRdsc(const char *cmd) {
     int datalen = 0;
     uint8_t mac[8] = {0};
     for (int n = mfFirstBlockOfSector(sectorNum); n < mfFirstBlockOfSector(sectorNum) + mfNumBlocksPerSector(sectorNum); n++) {
-        res = MFPReadBlock(&session, plain, n & 0xff, 1, false, true, data, sizeof(data), &datalen, mac);
+        res = MFPReadBlock(&mf4session, plain, n & 0xff, 1, false, true, data, sizeof(data), &datalen, mac);
         if (res) {
             PrintAndLogEx(ERR, "Read error: %d", res);
             DropField();
@@ -597,8 +597,8 @@ static int CmdHFMFPWrbl(const char *cmd) {
     if (verbose)
         PrintAndLogEx(INFO, "--block:%d sector[%d]:%02x key:%04x", blockNum & 0xff, mfNumBlocksPerSector(sectorNum), sectorNum, uKeyNum);
 
-    mf4Session session;
-    int res = MifareAuth4(&session, keyn, key, true, true, verbose);
+    mf4Session mf4session;
+    int res = MifareAuth4(&mf4session, keyn, key, true, true, verbose);
     if (res) {
         PrintAndLogEx(ERR, "Authentication error: %d", res);
         return res;
@@ -607,7 +607,7 @@ static int CmdHFMFPWrbl(const char *cmd) {
     uint8_t data[250] = {0};
     int datalen = 0;
     uint8_t mac[8] = {0};
-    res = MFPWriteBlock(&session, blockNum & 0xff, datain, false, false, data, sizeof(data), &datalen, mac);
+    res = MFPWriteBlock(&mf4session, blockNum & 0xff, datain, false, false, data, sizeof(data), &datalen, mac);
     if (res) {
         PrintAndLogEx(ERR, "Write error: %d", res);
         DropField();
diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index 740bfa065..eb7d26c4f 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -696,13 +696,13 @@ static int ndef_print_CC(uint8_t *data) {
 // 00 always, 01 rfu, 10 proprietary, 11 rfu
 // b1, b0 write
 // 00 always, 01 rfo, 10 proprietary, 11 never
-    uint8_t write = data[1] & 0x03;
-    uint8_t read  = (data[1] & 0x0C) >> 2;
-    uint8_t minor = (data[1] & 0x30) >> 4;
-    uint8_t major = (data[1] & 0xC0) >> 6;
+    uint8_t cc_write = data[1] & 0x03;
+    uint8_t cc_read  = (data[1] & 0x0C) >> 2;
+    uint8_t cc_minor = (data[1] & 0x30) >> 4;
+    uint8_t cc_major = (data[1] & 0xC0) >> 6;
 
     char wStr[50];
-    switch (write) {
+    switch (cc_write) {
         case 0:
             sprintf(wStr, "Write access granted without any security");
             break;
@@ -717,7 +717,7 @@ static int ndef_print_CC(uint8_t *data) {
             break;
     }
     char rStr[46];
-    switch (read) {
+    switch (cc_read) {
         case 0:
             sprintf(rStr, "Read access granted without any security");
             break;
@@ -736,7 +736,7 @@ static int ndef_print_CC(uint8_t *data) {
     PrintAndLogEx(NORMAL, "  %02X : NDEF Magic Number", data[0]);
 
 //    PrintAndLogEx(NORMAL, "  %02X : version %d.%d supported by tag", data[1], (data[1] & 0xF0) >> 4, data[1] & 0x0F);
-    PrintAndLogEx(NORMAL, "  %02X : version %d.%d supported by tag", data[1], major, minor);
+    PrintAndLogEx(NORMAL, "  %02X : version %d.%d supported by tag", data[1], cc_major, cc_minor);
     PrintAndLogEx(NORMAL, "       : %s / %s", rStr, wStr);
 
     PrintAndLogEx(NORMAL, "  %02X : Physical Memory Size: %d bytes", data[2], data[2] * 8);
diff --git a/client/cmdhftopaz.c b/client/cmdhftopaz.c
index 973821ffd..2b743a574 100644
--- a/client/cmdhftopaz.c
+++ b/client/cmdhftopaz.c
@@ -271,7 +271,7 @@ static void topaz_print_control_TLVs(uint8_t *memory) {
                           bytes_locked_per_bit);
             lock_TLV_present = true;
             dynamic_lock_area_t *old = topaz_tag.dynamic_lock_areas;
-            dynamic_lock_area_t *new = topaz_tag.dynamic_lock_areas;
+            dynamic_lock_area_t *new;
             if (old == NULL) {
                 new = topaz_tag.dynamic_lock_areas = (dynamic_lock_area_t *) calloc(sizeof(dynamic_lock_area_t), sizeof(uint8_t));
             } else {
diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c
index 8045c5699..b300858d2 100644
--- a/client/cmdlfhid.c
+++ b/client/cmdlfhid.c
@@ -209,12 +209,8 @@ static int CmdHIDDemod(const char *Cmd) {
             }
         } else { //if bit 38 is not set then 37 bit format is used
             fmtLen = 37;
-            fc = 0;
-            cardnum = 0;
-            if (fmtLen == 37) {
-                cardnum = (lo >> 1) & 0x7FFFF;
-                fc = ((hi & 0xF) << 12) | (lo >> 20);
-            }
+            cardnum = (lo >> 1) & 0x7FFFF;
+            fc = ((hi & 0xF) << 12) | (lo >> 20);
         }
         if (fmtLen == 32 && (lo & 0x40000000)) { //if 32 bit and Kastle bit set
             PrintAndLogEx(SUCCESS, "HID Prox TAG (Kastle format) ID: %08x (%u) - Format Len: 32bit - CC: %u - FC: %u - Card: %u", lo, (lo >> 1) & 0xFFFF, cc, fc, cardnum);
diff --git a/client/cmdlfkeri.c b/client/cmdlfkeri.c
index 38d575587..82d1b9f84 100644
--- a/client/cmdlfkeri.c
+++ b/client/cmdlfkeri.c
@@ -237,7 +237,6 @@ int CmdLFKeri(const char *Cmd) {
 int detectKeri(uint8_t *dest, size_t *size, bool *invert) {
 
     uint8_t preamble[] = {1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1};
-    uint8_t preamble_i[] = {0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0};
 
     // sanity check.
     if (*size < sizeof(preamble) + 100) return -1;
@@ -247,6 +246,7 @@ int detectKeri(uint8_t *dest, size_t *size, bool *invert) {
     if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx)) {
 
         // if didn't find preamble try again inverting
+        uint8_t preamble_i[] = {0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0};
         if (!preambleSearch(DemodBuffer, preamble_i, sizeof(preamble_i), size, &startIdx))
             return -2;
 
diff --git a/client/cmdlfnexwatch.c b/client/cmdlfnexwatch.c
index 280ebc90d..e543dd635 100644
--- a/client/cmdlfnexwatch.c
+++ b/client/cmdlfnexwatch.c
@@ -95,7 +95,6 @@ int CmdLFNEXWATCH(const char *Cmd) {
 int detectNexWatch(uint8_t *dest, size_t *size, bool *invert) {
 
     uint8_t preamble[28]   = {0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-    uint8_t preamble_i[28] = {1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
     // sanity check.
     if (*size < sizeof(preamble) + 100) return -1;
 
@@ -103,6 +102,7 @@ int detectNexWatch(uint8_t *dest, size_t *size, bool *invert) {
 
     if (!preambleSearch(DemodBuffer, preamble, sizeof(preamble), size, &startIdx)) {
         // if didn't find preamble try again inverting
+        uint8_t preamble_i[28] = {1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
         if (!preambleSearch(DemodBuffer, preamble_i, sizeof(preamble_i), size, &startIdx)) return -4;
         *invert ^= 1;
     }
diff --git a/client/cmdusart.c b/client/cmdusart.c
index d9a5445c1..e57834545 100644
--- a/client/cmdusart.c
+++ b/client/cmdusart.c
@@ -316,8 +316,7 @@ static int CmdUsartBtFactory(const char *Cmd) {
         msleep(200);
     }
 
-    int gc = tolower(getchar());
-    if (gc != 'y') {
+    if (tolower(getchar()) != 'y') {
         PrintAndLogEx(NORMAL, "");
         PrintAndLogEx(FAILED, "Aborting.");
         return PM3_EOPABORTED;
@@ -453,8 +452,7 @@ static int CmdUsartBtFactory(const char *Cmd) {
         while (!ukbhit()) {
             msleep(200);
         }
-        int gc = getchar();
-        (void)gc;
+        getchar();
         PrintAndLogEx(NORMAL, "");
         PrintAndLogEx(INFO, "Trying to connect add-on with the new settings.");
         found = usart_bt_testcomm(USART_BAUD_RATE, USART_PARITY) == PM3_SUCCESS;
@@ -558,12 +556,12 @@ static int CmdUsartTX(const char *Cmd) {
     size_t i2 = 0;
     size_t n = strlen(string);
     for (size_t i = 0; i < n; i++) {
-        if ((string[i] == '\\') && (i < n - 1) && (string[i + 1] == '\\')) {
+        if ((i < n - 1) && (string[i] == '\\') && (string[i + 1] == '\\')) {
             i++;
             string2[i2++] = '\\';
             continue;
         }
-        if ((string[i] == '\\') && (i < n - 1) && (string[i + 1] == '"')) {
+        if ((i < n - 1) && (string[i] == '\\') && (string[i + 1] == '"')) {
             i++;
             string2[i2++] = '"';
             continue;
@@ -571,12 +569,12 @@ static int CmdUsartTX(const char *Cmd) {
         if (string[i] == '"') {
             continue;
         }
-        if ((string[i] == '\\') && (i < n - 1) && (string[i + 1] == 'r')) {
+        if ((i < n - 1) && (string[i] == '\\') && (string[i + 1] == 'r')) {
             i++;
             string2[i2++] = '\r';
             continue;
         }
-        if ((string[i] == '\\') && (i < n - 1) && (string[i + 1] == 'n')) {
+        if ((i < n - 1) && (string[i] == '\\') && (string[i + 1] == 'n')) {
             i++;
             string2[i2++] = '\n';
             continue;
@@ -654,12 +652,12 @@ static int CmdUsartTXRX(const char *Cmd) {
     size_t i2 = 0;
     size_t n = strlen(string);
     for (size_t i = 0; i < n; i++) {
-        if ((string[i] == '\\') && (i < n - 1) && (string[i + 1] == '\\')) {
+        if ((i < n - 1) && (string[i] == '\\') && (string[i + 1] == '\\')) {
             i++;
             string2[i2++] = '\\';
             continue;
         }
-        if ((string[i] == '\\') && (i < n - 1) && (string[i + 1] == '"')) {
+        if ((i < n - 1) && (string[i] == '\\') && (string[i + 1] == '"')) {
             i++;
             string2[i2++] = '"';
             continue;
@@ -667,12 +665,12 @@ static int CmdUsartTXRX(const char *Cmd) {
         if (string[i] == '"') {
             continue;
         }
-        if ((string[i] == '\\') && (i < n - 1) && (string[i + 1] == 'r')) {
+        if ((i < n - 1) && (string[i] == '\\') && (string[i + 1] == 'r')) {
             i++;
             string2[i2++] = '\r';
             continue;
         }
-        if ((string[i] == '\\') && (i < n - 1) && (string[i + 1] == 'n')) {
+        if ((i < n - 1) && (string[i] == '\\') && (string[i + 1] == 'n')) {
             i++;
             string2[i2++] = '\n';
             continue;
diff --git a/client/comms.c b/client/comms.c
index e95af6415..350af3d55 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -119,6 +119,10 @@ static void SendCommandNG_internal(uint16_t cmd, uint8_t *data, size_t len, bool
         PrintAndLogEx(WARNING, "Sending %d bytes of payload is too much, abort", len);
         return;
     }
+    if (data == NULL) {
+        PrintAndLogEx(WARNING, "SendCommandNG_internal NULL pointer, abort");
+        return;
+    }
 
     PacketCommandNGPostamble *tx_post = (PacketCommandNGPostamble *)((uint8_t *)&txBufferNG + sizeof(PacketCommandNGPreamble) + len);
 
@@ -601,8 +605,7 @@ int TestProxmark(void) {
     }
 
     bool error = false;
-    if (len)
-        error = memcmp(data, resp.data.asBytes, len) != 0;
+    error = memcmp(data, resp.data.asBytes, len) != 0;
 
     if (error)
         return PM3_EIO;
diff --git a/client/loclass/cipher.c b/client/loclass/cipher.c
index 76a3c1375..fe676e83d 100644
--- a/client/loclass/cipher.c
+++ b/client/loclass/cipher.c
@@ -108,9 +108,9 @@ static uint8_t _select(bool x, bool y, uint8_t r) {
     bool r6 = r >> 1 & 0x1;
     bool r7 = r & 0x1;
 
-    bool z0 = (r0 & r2) ^ (r1 & !r3) ^ (r2 | r4);
+    bool z0 = (r0 & r2) ^ (r1 & (!r3)) ^ (r2 | r4);
     bool z1 = (r0 | r2) ^ (r5 | r7) ^ r1 ^ r6 ^ x ^ y;
-    bool z2 = (r3 & !r5) ^ (r4 & r6) ^ r7 ^ x;
+    bool z2 = (r3 & (!r5)) ^ (r4 & r6) ^ r7 ^ x;
 
     // The three bitz z0.. z1 are packed into a uint8_t:
     // 00000ZZZ

From 2382ad551b3a6a15600e457b803a587933a55f38 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 12 Jun 2019 13:57:02 -0700
Subject: [PATCH 1924/1938] update msleep in deprecated-hid-flasher

---
 client/deprecated-hid-flasher/flasher/sleep.h | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/client/deprecated-hid-flasher/flasher/sleep.h b/client/deprecated-hid-flasher/flasher/sleep.h
index 62d9f4d16..f3aac0c8f 100644
--- a/client/deprecated-hid-flasher/flasher/sleep.h
+++ b/client/deprecated-hid-flasher/flasher/sleep.h
@@ -1,10 +1,4 @@
 //-----------------------------------------------------------------------------
-// Copyright (C) 2010 iZsh <izsh at fail0verflow.com>
-//
-// This code is licensed to you under the terms of the GNU GPL, version 2 or,
-// at your option, any later version. See the LICENSE.txt file for the text of
-// the license.
-//-----------------------------------------------------------------------------
 // platform-independant sleep macros
 //-----------------------------------------------------------------------------
 
@@ -12,13 +6,18 @@
 #define SLEEP_H__
 
 #ifdef _WIN32
-#include <windows.h>
-#define sleep(n) Sleep(1000 * n)
-#define msleep(n) Sleep(n)
+    #include <windows.h>
+    #define msleep(n) Sleep(n)
 #else
-#include <unistd.h>
-#define msleep(n) usleep(1000 * n)
+    #include <time.h>
+    #include <errno.h>
+    static void nsleep(uint64_t n) {
+        struct timespec timeout;
+        timeout.tv_sec = n / 1000000000;
+        timeout.tv_nsec = n % 1000000000;
+        while (nanosleep(&timeout, &timeout) && errno == EINTR);
+    }
+    #define msleep(n) nsleep(1000000 * (uint64_t)n)
 #endif
 
 #endif
-

From 04f8c27febe16d251880d92ff3b4aa08f344e48c Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 12 Jun 2019 14:59:00 -0700
Subject: [PATCH 1925/1938] clarify usart baudrates

---
 common/usart.h | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/common/usart.h b/common/usart.h
index 5fa0873c9..ef0691df5 100644
--- a/common/usart.h
+++ b/common/usart.h
@@ -6,10 +6,13 @@
 
 //#define USART_BAUD_RATE 9600
 #define USART_BAUD_RATE 115200
+
+// BT HC-06 physical layer runs at 128kbps
+// so it's possible to gain a little bit by using 230400
+// with some risk to overflow its internal buffers:
 //#define USART_BAUD_RATE 230400
-//#define USART_BAUD_RATE 460800
-//#define USART_BAUD_RATE 921600
-//#define USART_BAUD_RATE 1382400
+
+// Higher baudrates are pointless, only increasing overflow risk
 
 extern uint32_t usart_baudrate;
 #define USART_PARITY 'N'

From f1f50c869ae0cacb3412b827358807b47e7e2b1d Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 12 Jun 2019 15:22:25 -0700
Subject: [PATCH 1926/1938] changelog

---
 CHANGELOG.md | 49 +++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 47 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c057babc..de1f4f293 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,11 +3,57 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [unreleased][unreleased]
+ - Change: updates to README (@iceman)
+ - Change: hf mf/mfu dbg => hw dbg (@doegox)
+ - Change: replace usb_poll_validate_length() by data_available() that supports USART too (@doegox)
+ - Make sure standalone modes can be launched when connected on USB without client (@doegox)
+ - Change: cleaner makefile execution, use 'make V=1' if you want to see full lines (@doegox)
+ - Change: automate make clean when platform definitions are changed (@doegox)
  - Add STANDALONE option to Makefile.hal (@Fl0-0)
+ - Change: mem info - production public key to verify rdv4.0 flash  signature (@iceman)
+ - Fix specify that we need TCP and not UDP connection (@phcoder)
+ - Change: lf cotag demod - adjusted error trigger (@iceman)
+ - Add documentation on BT add-on (@iceman/@doegox)
+ - Change: new button behaviour in bootloader mode, no need to keep it pressed, press again to interrupt (@doegox)
+ - Change: new keys in dicts, new mem layout to accomodate them (@iceman/various)
+ - Fix lf sim -  if called with empty graphbuffer all strange things happend, like turning on HF field (@iceman)
+ - Change: hf 14a sim / hf mf sim - check buttonpress/usb frame fewer times in order not to disrupt simulation (@McEloff)
+ - Change: data convertbitstream - converts bit to max/min in order to facilitate demodulation of simulation data (@iceman)
+ - Change: lf em 410x_demod - now can demod the simulation data (@iceman)
+ - Add HC-06 scripts for BT add-on (@doegox)
+ - Fix lf nedap sim - error when adding parity (@iceman)
+ - Add documentation on UART and baudrates (@doegox/@iceman)
+ - Change: prompt now shows which channel is used (@iceman)
+ - Change: USART baudrates computation, up to 6Mbps (@iceman/@doegox)
+ - Change: hf mf nack - keep sync if started without card over antenna
+ - Add usart btfactory - to reset a misconfigured BT add-on (@doegox)
+ - Change: hw status - now prints number of dictionary keys loaded (@iceman)
+ - Add home, end, pageup, and pagedown keybinds to the plot GUI. Also fix paged movement in GUI. (@mcd1992)
+ - Change legic.lua saves data in EML and BIN formats (@iceman)
+ - Change hf tune - is now synchronous (for BT add-on) and can be interrupted by kbd (@doegox)
+ - Change: update macOS install instruction (@ Uli Heilmeier)
+ - Add trace ouput in hexdump format for Wireshark import (@ Uli Heilmeier)
+ - Add usart btpin - to change BT add-on PIN (@doegox)
+ - Add reconnection support (@iceman/@doegox)
+ - Add usart tx/rx/... - USART developer commands (@doegox)
+ - Add PLATFORM_EXTRAS, WITH_FPC_USART_HOST, BTADDON Makefile configuration (@doegox)
+ - Fix slow reconfigure on mingw of serial port (@iceman)
+ - Fix cross thread communictions of timeout variable (@iceman)
+ - Change: client is now "universal", adapting to Proxmark3 capabilities (@doegox)
+ - Add disconnect support to Lua (@iceman)
+ - Change: handles FPC/FLASH FW more gracefully on non-RDV4 pm3 (@doegox)
+ - Add JTAG support for Shikra (@NinjaStyle82)
+ - Change: smart color handling: only if linux and on real term (@doegox)
+ - Change: reconfigure uart timeouts when compiled for FPC and connecting over USB (@iceman)
+ - Change: fast push for many commands (@iceman/@doegox)
+ - Add: fast push for Lua (@iceman)
+ - Add NDEF parser in Lua (@iceman)
+ - Change: improve NDEF parser (@iceman)
+ - Change: all commands got migrated to MIX/NG packet format (@iceman/@doegox)
+ - Fix: Mifare Ultralight read block missing bytes (@doegox)
  - Add support new frame format in all Lua scripts (@iceman)
  - Add CMD_CAPABILITIES for pm3 to inform dynamically the client (@doegox)
  - Change baudrate handling, make it clear it's only indicative for USB-CDC & BT (@doegox)
- - Change much faster flashmem writes (@doegox)
  - Change: new progressive light scheme for 'hw detectreader' (@doegox)
  - Add common error definitions system for retvals (@doegox)
  - Change USART RX & TX code and fix delays handling to make it more robust, especially over BT (@doegox)
@@ -220,7 +266,6 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
  - Added  `hf fido` `assert` and `make` commands from fido2 protocol (authenticatorMakeCredential and authenticatorGetAssertion) (@merlokk)
  - Added trailer block decoding to `hf mf rdbl` and `hf mf cgetbl` (@merlokk)
  - Added `hf mf mad` and `hf mfp mad` MAD decode, check and print commands (@merlokk)
- - Add home, end, pageup, and pagedown keybinds to the plot GUI. Also fix paged movement in GUI. (@mcd1992)
  
 ### Fixed
 - Changed driver file proxmark3.inf to support both old and new Product/Vendor IDs (piwi)

From a48f2e232f0c30429663d5ad39fe8d95e8b90e29 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 13 Jun 2019 12:23:25 -0400
Subject: [PATCH 1927/1938] convert NG

---
 armsrc/lfops.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index 2e58c10f6..09a1632cb 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -1389,7 +1389,7 @@ void T55xxResetRead(void) {
 
     // Turn the field off
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); // field off
-    reply_old(CMD_ACK, 0, 0, 0, 0, 0);
+    reply_mix(CMD_ACK, 0, 0, 0, 0, 0);
     LED_A_OFF();
 }
 
@@ -1635,7 +1635,7 @@ void T55xx_ChkPwds() {
 
 OUT:
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-    reply_old(CMD_ACK, ret, candidate, 0, 0, 0);
+    reply_mix(CMD_ACK, ret, candidate, 0, 0, 0);
     LEDsoff();
 }
 
@@ -1763,7 +1763,7 @@ void CopyVikingtoT55xx(uint32_t block1, uint32_t block2, uint8_t Q5) {
     // Program the data blocks for supplied ID and the block 0 config
     WriteT55xx(data, 0, 3);
     LED_D_OFF();
-    reply_old(CMD_ACK, 0, 0, 0, 0, 0);
+    reply_mix(CMD_ACK, 0, 0, 0, 0, 0);
 }
 
 // Define 9bit header for EM410x tags
@@ -2121,7 +2121,7 @@ void Cotag(uint32_t arg0) {
 
     // Turn the field off
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); // field off
-    reply_old(CMD_ACK, 0, 0, 0, 0, 0);
+    reply_mix(CMD_ACK, 0, 0, 0, 0, 0);
     LEDsoff();
 }
 

From 283cc8d12a22c125c313e3b50bd4ca4b651a29a4 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 13 Jun 2019 12:28:30 -0400
Subject: [PATCH 1928/1938] convert NG

---
 armsrc/legicrf.c | 16 ++++++++--------
 common/i2c.c     |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/armsrc/legicrf.c b/armsrc/legicrf.c
index 2d3bf742f..1b689550d 100644
--- a/armsrc/legicrf.c
+++ b/armsrc/legicrf.c
@@ -402,7 +402,7 @@ void LegicRfInfo(void) {
     // establish shared secret and detect card type
     uint8_t card_type = setup_phase(0x01);
     if (init_card(card_type, &card) != 0) {
-        reply_old(CMD_ACK, 0, 0, 0, 0, 0);
+        reply_mix(CMD_ACK, 0, 0, 0, 0, 0);
         goto OUT;
     }
 
@@ -410,7 +410,7 @@ void LegicRfInfo(void) {
     for (uint8_t i = 0; i < sizeof(card.uid); ++i) {
         int16_t byte = read_byte(i, card.cmdsize);
         if (byte == -1) {
-            reply_old(CMD_ACK, 0, 0, 0, 0, 0);
+            reply_mix(CMD_ACK, 0, 0, 0, 0, 0);
             goto OUT;
         }
         card.uid[i] = byte & 0xFF;
@@ -420,7 +420,7 @@ void LegicRfInfo(void) {
     int16_t mcc = read_byte(4, card.cmdsize);
     int16_t calc_mcc = CRC8Legic(card.uid, 4);;
     if (mcc != calc_mcc) {
-        reply_old(CMD_ACK, 0, 0, 0, 0, 0);
+        reply_mix(CMD_ACK, 0, 0, 0, 0, 0);
         goto OUT;
     }
 
@@ -439,7 +439,7 @@ void LegicRfReader(uint16_t offset, uint16_t len, uint8_t iv) {
     // establish shared secret and detect card type
     uint8_t card_type = setup_phase(iv);
     if (init_card(card_type, &card) != 0) {
-        reply_old(CMD_ACK, 0, 0, 0, 0, 0);
+        reply_mix(CMD_ACK, 0, 0, 0, 0, 0);
         goto OUT;
     }
 
@@ -451,7 +451,7 @@ void LegicRfReader(uint16_t offset, uint16_t len, uint8_t iv) {
     for (uint16_t i = 0; i < len; ++i) {
         int16_t byte = read_byte(offset + i, card.cmdsize);
         if (byte == -1) {
-            reply_old(CMD_ACK, 0, 0, 0, 0, 0);
+            reply_mix(CMD_ACK, 0, 0, 0, 0, 0);
             goto OUT;
         }
         legic_mem[i] = byte;
@@ -471,14 +471,14 @@ void LegicRfWriter(uint16_t offset, uint16_t len, uint8_t iv, uint8_t *data) {
 
     // uid is not writeable
     if (offset <= WRITE_LOWERLIMIT) {
-        reply_old(CMD_ACK, 0, 0, 0, 0, 0);
+        reply_mix(CMD_ACK, 0, 0, 0, 0, 0);
         goto OUT;
     }
 
     // establish shared secret and detect card type
     uint8_t card_type = setup_phase(iv);
     if (init_card(card_type, &card) != 0) {
-        reply_old(CMD_ACK, 0, 0, 0, 0, 0);
+        reply_mix(CMD_ACK, 0, 0, 0, 0, 0);
         goto OUT;
     }
 
@@ -491,7 +491,7 @@ void LegicRfWriter(uint16_t offset, uint16_t len, uint8_t iv, uint8_t *data) {
     while (len-- > 0 && !BUTTON_PRESS()) {
         if (!write_byte(len + offset, data[len], card.addrsize)) {
             Dbprintf("operation failed | %02X | %02X | %02X", len + offset, len, data[len]);
-            reply_old(CMD_ACK, 0, 0, 0, 0, 0);
+            reply_mix(CMD_ACK, 0, 0, 0, 0, 0);
             goto OUT;
         }
     }
diff --git a/common/i2c.c b/common/i2c.c
index 8a8b6693b..d51cba4a3 100644
--- a/common/i2c.c
+++ b/common/i2c.c
@@ -811,7 +811,7 @@ void SmartCardUpgrade(uint64_t arg0) {
         length -= size;
         pos += size;
     }
-    reply_old(CMD_ACK, isOK, pos, 0, 0, 0);
+    reply_mix(CMD_ACK, isOK, pos, 0, 0, 0);
     LED_C_OFF();
     BigBuf_free();
 }
@@ -828,7 +828,7 @@ void SmartCardSetClock(uint64_t arg0) {
     // start [C0 05 xx] stop
     I2C_WriteByte(arg0, I2C_DEVICE_CMD_SIM_CLC, I2C_DEVICE_ADDRESS_MAIN);
 
-    reply_old(CMD_ACK, 1, 0, 0, 0, 0);
+    reply_mix(CMD_ACK, 1, 0, 0, 0, 0);
     set_tracing(false);
     LEDsoff();
 }

From f11500f60fd5f240b331b904bdc49d80d386c898 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 13 Jun 2019 15:13:41 -0400
Subject: [PATCH 1929/1938] revert and double check empty buffers

---
 client/comms.c | 7 ++-----
 client/util.c  | 6 ++++++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/client/comms.c b/client/comms.c
index 350af3d55..5aa704728 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -119,10 +119,6 @@ static void SendCommandNG_internal(uint16_t cmd, uint8_t *data, size_t len, bool
         PrintAndLogEx(WARNING, "Sending %d bytes of payload is too much, abort", len);
         return;
     }
-    if (data == NULL) {
-        PrintAndLogEx(WARNING, "SendCommandNG_internal NULL pointer, abort");
-        return;
-    }
 
     PacketCommandNGPostamble *tx_post = (PacketCommandNGPostamble *)((uint8_t *)&txBufferNG + sizeof(PacketCommandNGPreamble) + len);
 
@@ -140,7 +136,8 @@ static void SendCommandNG_internal(uint16_t cmd, uint8_t *data, size_t len, bool
     txBufferNG.pre.ng = ng;
     txBufferNG.pre.length = len;
     txBufferNG.pre.cmd = cmd;
-    memcpy(&txBufferNG.data, data, len);
+    if ( len > 0 && data ) 
+        memcpy(&txBufferNG.data, data, len);
 
     if ((conn.send_via_fpc_usart && conn.send_with_crc_on_fpc) || ((!conn.send_via_fpc_usart) && conn.send_with_crc_on_usb)) {
         uint8_t first, second;
diff --git a/client/util.c b/client/util.c
index 254c369ec..568a022f1 100644
--- a/client/util.c
+++ b/client/util.c
@@ -170,6 +170,8 @@ bool CheckStringIsHEXValue(const char *value) {
 void hex_to_buffer(const uint8_t *buf, const uint8_t *hex_data, const size_t hex_len, const size_t hex_max_len,
                    const size_t min_str_len, const size_t spaces_between, bool uppercase) {
 
+    if (buf == NULL ) return;
+    
     char *tmp = (char *)buf;
     size_t i;
     memset(tmp, 0x00, hex_max_len);
@@ -195,12 +197,16 @@ void hex_to_buffer(const uint8_t *buf, const uint8_t *hex_data, const size_t hex
 
 // printing and converting functions
 void print_hex(const uint8_t *data, const size_t len) {
+    if (data == NULL || len == 0 ) return;
+    
     for (size_t i = 0; i < len; i++)
         printf("%02x ", data[i]);
     printf("\n");
 }
 
 void print_hex_break(const uint8_t *data, const size_t len, uint8_t breaks) {
+    if (data == NULL || len == 0 ) return;
+    
     int rownum = 0;
     printf("[%02d] | ", rownum);
     for (size_t i = 0; i < len; ++i) {

From 7961ff982d63a947ede3428b710bbc8a6ac43895 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 15 Jun 2019 12:05:40 -0400
Subject: [PATCH 1930/1938] unique and added some more keys from @korsehindi

---
 client/default_keys.dic | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/client/default_keys.dic b/client/default_keys.dic
index f02428c18..5add442e7 100644
--- a/client/default_keys.dic
+++ b/client/default_keys.dic
@@ -770,14 +770,18 @@ A2B2C9D187FB,
 A2F63A485632,
 98631ED2B229,
 19F1FFE02563,
-#OMNITEC.ES HOTEL TIMECARD / MAINTENANCECARD
+563A22C01FC8, -- Argentina
+43CA22C13091, -- Argentina
+25094DF2C1BD, -- Argentina
+#
+# OMNITEC.ES HOTEL TIMECARD / MAINTENANCECARD
 AFBECD120454,
-#OMNITEC.ES HOTEL EMERGENCYCARD
+#
+# OMNITEC.ES HOTEL EMERGENCYCARD
 842146108088,
-# MORE KEYS:
-8A19D40CF2B5,
-AE8587108640,
-#TAPCARD PUBLIC TRANSPORT LA
+#
+# TAPCARD PUBLIC TRANSPORT LA
+#
 EA1B88DF0A76,
 D1991E71E2C5,
 05F89678CFCF,
@@ -810,10 +814,10 @@ B81846F06EDF,
 C6A76CB2F3B5,
 E3AD9E9BA5D4,
 6C9EC046C1A4,
-#ROC HIGHSCHOOL ACCESSCARD
-A0A1A2A3A4A5,
+#
+# ROC HIGHSCHOOL ACCESSCARD
+#
 B021669B44BB,
-A0A1A2A3A4A5,  
 B18CDCDE52B7,  
 A22647F422AE,  
 B268F7C9CA63,  
@@ -840,10 +844,12 @@ BCF5A6B5E13F,
 AD5645062534,  
 BDF837787A71,  
 AE43F36C1A9A,  
-BE7C4F6C7A9A,  
+BE7C4F6C7A9A,
 5EC7938F140A,  
 82D58AA49CCB,
-#MELONCARD
+#
+# MELONCARD 
+#
 323334353637,
 #
 #
@@ -861,7 +867,9 @@ A7FB4824ACBF,
 00F0BD116D70,
 4CFF128FA3EF,
 10F3BEBC01DF,
-#Transportes Insular La Palma
+#
+# Transportes Insular La Palma
+#
 0172066b2f03,
 0000085f0000,
 1a80b93f7107,
@@ -894,3 +902,5 @@ b1a862985913,
 3b0172066b2f,
 3f1a87298691,
 f3f0172066b2,
+
+

From ca9ed6f691e11b93acfcb4935955a1571dbd65dc Mon Sep 17 00:00:00 2001
From: Iceman <iceman@iuse.se>
Date: Mon, 17 Jun 2019 09:38:50 +0200
Subject: [PATCH 1931/1938] Update readme.md

---
 armsrc/Standalone/readme.md | 35 ++++++++++++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/armsrc/Standalone/readme.md b/armsrc/Standalone/readme.md
index 529bc7f70..491490b1b 100644
--- a/armsrc/Standalone/readme.md
+++ b/armsrc/Standalone/readme.md
@@ -1,4 +1,4 @@
-# StandAlone Modes
+# Standalone Modes
 
 This contains functionality for different StandAlone modes. The fullimage will be built given the correct compiler flags used. Build targets for these files are contained in `armsrc/Makefile` and `common/Makefile.hal`
 
@@ -100,10 +100,39 @@ void ModInfo(void) {
 ````
 
 ## Compiling your standalone mode
-Once all this is done, you and others can now easily compile different standalone modes by just selecting one of the standalone modes in `common/Makefile.hal`, e.g.:
+Once all this is done, you and others can now easily compile different standalone modes by just selecting one of the standalone modes (list in `common/Makefile.hal` or ) , e.g.:
 
+- rename  Makefile.platform.sample -> Makefile.platform
+- edit the "STANDALONE" row inside Makefile.platform.  You need to uncomment it and add your standalone mode name
+
+Makefile.platform.sample
 ```
-PLATFORM_DEFS += -DWITH_STANDALONE_LF_FOO
+# If you want to use it, copy this file as Makefile.platform and adjust it to your needs
+PLATFORM=PM3RDV4
+#PLATFORM_EXTRAS=BTADDON
+#STANDALONE=LF_SAMYRUN
+```
+ becomes
+ 
+ Makefile.platform
+ ```
+# If you want to use it, copy this file as Makefile.platform and adjust it to your needs
+PLATFORM=PM3RDV4
+#PLATFORM_EXTRAS=BTADDON
+STANDALONE=LF_FOO
 ```
 
 Remember only one can be selected at a time for now.
+
+The final steps is to 
+- force recompilation of all code.  ```make clean```
+- compile ```make -j8```
+- flash your device
+- connect to your device
+- press button long time to trigger ledshow and enter your new standalone mode
+- if connected with usb / fpc ,  you can also see debug statements from your device in standalone mode. Useful for debugging :)
+
+When compiling you will see a header showing what configurations your project compiled with.
+Make sure it says your standalone mode name.  
+
+Happy hacking!

From 75a78c1aa9ded88452a82be454e89e152742d061 Mon Sep 17 00:00:00 2001
From: Iceman <iceman@iuse.se>
Date: Mon, 17 Jun 2019 09:42:47 +0200
Subject: [PATCH 1932/1938] Update README.md

---
 README.md | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/README.md b/README.md
index b61ec89f7..dd50b5cba 100644
--- a/README.md
+++ b/README.md
@@ -5,10 +5,6 @@ This repo is based on iceman fork for proxmark3. It is dedicated to bringing the
 [![Build status](https://ci.appveyor.com/api/projects/status/ct5blik2wa96bv0x/branch/master?svg=true)](https://ci.appveyor.com/project/iceman1001/proxmark3-ji4wj/branch/master)
 [![Latest release](https://img.shields.io/github/release/RfidResearchGroup/proxmark3.svg)](https://github.com/RfidResearchGroup/proxmark3/releases/latest)
 
-<a href="http://www.youtube.com/watch?feature=player_embedded&v=uyJ-y0kSWfc
-" target="_blank"><img src="https://github.com/5w0rdfish/proxmark3/blob/master/prox.png" 
-alt="Yuotube" width="100%" height="auto" border="10" /></a>
-
 ---
 
 # PROXMARK INSTALLATION AND OVERVIEW
@@ -22,6 +18,7 @@ alt="Yuotube" width="100%" height="auto" border="10" /></a>
 |[Issues](#issues)|[Blue shark manual](/doc/bt_manual_v10.md) ||
 |[Notes on UART](/doc/uart_notes.md)|||
 |[Notes on Frame format](/doc/new_frame_format.md)|||
+|[Developing standalone mode](/armsrc/Standalone/readme.md)|[Wiki about standalone mode](https://github.com/RfidResearchGroup/proxmark3/wiki/Standalone-mode) ||
 |[Donations](#Donations)|||
 
 ## What has changed?

From ec1939ff0463531e042b38d6cc3be64bddcefafa Mon Sep 17 00:00:00 2001
From: Iceman <iceman@iuse.se>
Date: Mon, 17 Jun 2019 09:49:10 +0200
Subject: [PATCH 1933/1938] Update README.md

---
 README.md | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index dd50b5cba..01704df6d 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Proxmark3 RDV4.0 Dedicated Github
 
-This repo is based on iceman fork for proxmark3. It is dedicated to bringing the most out of the new features for proxmark3 RDV4.0 new hardware and design.
+This repo is based on iceman fork for Proxmark3. It is dedicated to bringing the most out of the new features for Proxmark3 RDV4.0 new hardware and design.
 
 [![Build status](https://ci.appveyor.com/api/projects/status/ct5blik2wa96bv0x/branch/master?svg=true)](https://ci.appveyor.com/project/iceman1001/proxmark3-ji4wj/branch/master)
 [![Latest release](https://img.shields.io/github/release/RfidResearchGroup/proxmark3.svg)](https://github.com/RfidResearchGroup/proxmark3/releases/latest)
@@ -43,16 +43,18 @@ This fork now compiles just fine on
 If you intend to contribute to the code, please read the [coding style notes](HACKING.md) first.
 
 Internal notes on [Coverity Scan Config & Run](/doc/md/Development/Coverity-Scan-Config-%26-Run.md).
-
+Internal notes on UART
+Internal notes on Frame format
+Internal notes on standalone mode
 ---
 
-## Why didn't you base it on official PM3 Master?
+## Why didn't you base it on official Proxmark3 Master?
 
-The separation from official pm3 repo gives us a lot of freedom to create a firmware/client that suits the RDV40 features. We don't want to mess up the official pm3 repo with RDV40 specific code.
+The separation from official Proxmark3 repo gives us a lot of freedom to create a firmware/client that suits the RDV40 features. We don't want to mess up the official Proxmark3 repo with RDV40 specific code.
 
-## PM3 GUI
+## Proxmark3 GUI
 The official PM3-GUI from Gaucho will not work.
-The new universal GUI will work. [Proxmark3 Universal GUI](https://github.com/burma69/PM3UniversalGUI) 
+The new universal GUI will work. [Proxmark3 Universal GUI](https://github.com/burma69/PM3UniversalGUI) Almost, change needed in order to show helptext when client isn't connected to a device.
 
 ## Issues
 
@@ -66,4 +68,8 @@ It's needed to have a good USB cable to connect Proxmark3 to USB. If you have st
 - updated Feb 2019 [@5w0rdfish](https://mobile.twitter.com/5w0rdFish)
 
 # Donations
-Nothing says thank you as much as a donation,  https://www.patreon.com/iceman1001
+Nothing says thank you as much as a donation. So if you feel the love, do feel free to become a iceman patron. For some tiers it comes with rewards.
+
+https://www.patreon.com/iceman1001
+
+All support is welcome!

From 45dc0fbc4274c3f681796873e8619f407e7bc414 Mon Sep 17 00:00:00 2001
From: Iceman <iceman@iuse.se>
Date: Mon, 17 Jun 2019 09:50:17 +0200
Subject: [PATCH 1934/1938] Update README.md

---
 README.md | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 01704df6d..489a04044 100644
--- a/README.md
+++ b/README.md
@@ -42,11 +42,12 @@ This fork now compiles just fine on
 
 If you intend to contribute to the code, please read the [coding style notes](HACKING.md) first.
 
-Internal notes on [Coverity Scan Config & Run](/doc/md/Development/Coverity-Scan-Config-%26-Run.md).
-Internal notes on UART
-Internal notes on Frame format
-Internal notes on standalone mode
----
+- Internal notes on [Coverity Scan Config & Run](/doc/md/Development/Coverity-Scan-Config-%26-Run.md).
+- Internal notes on UART
+- Internal notes on Frame format
+- Internal notes on standalone mode
+
+
 
 ## Why didn't you base it on official Proxmark3 Master?
 

From 7d563b1dc77263ce5e4573ccc90ea722588e2b9c Mon Sep 17 00:00:00 2001
From: TheBizzotech <39496124+TheBizzotech@users.noreply.github.com>
Date: Fri, 21 Jun 2019 21:36:14 +0200
Subject: [PATCH 1935/1938] Update bt_manual_v10.md

Troubleshoot MacOS issues with Blue Shark pairing:


#### MacOS

#### (1) Connecting rdv4.0 with Bluetooth on MacOS

With MacOS Mojave 10.14.5 you could experience some continuosly disconnecting and difficult to recconnect the device at the system wakeup, to avoid this problem do a PRAM reset before to add your Proxmark3 RDV4 Blue Shark:

  1. Open a Terminal and execute this command: sudo rm -R /Library/Preferences/com.apple.Bluetooth.plist.
  2. Shut down your Mac.
  3. Then turn it on and immediately press and hold these four keys together: Option, Command, P, and R.
  4. You can release the keys after about 20 seconds, during which your Mac might appear to restart.

After reboot you can go ahead to pairing your Proxmark3 RDV4 Blue Shark:

  5. Make sure the Blue Shark BT switch is turned ON
  6. On your Mac, choose Apple menu -> System Preferences, then click Bluetooth.
  7. Select the device in the list, then click Connect and add the 1234 pwd.
---
 doc/bt_manual_v10.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/doc/bt_manual_v10.md b/doc/bt_manual_v10.md
index 81d87acc6..7508b902d 100644
--- a/doc/bt_manual_v10.md
+++ b/doc/bt_manual_v10.md
@@ -143,6 +143,24 @@ turn on solid.
 ./proxmark /dev/ttyUSB0
 ```
 
+#### MacOS
+
+#### (1) Connecting rdv4.0 with Bluetooth on MacOS
+
+With MacOS Mojave 10.14.5 you could experience some continuosly disconnecting and difficult to recconnect the device at the system wakeup, to avoid this problem do a PRAM reset before to add your Proxmark3 RDV4 Blue Shark:
+
+  1. Open a Terminal and execute this command: sudo rm -R /Library/Preferences/com.apple.Bluetooth.plist.
+  2. Shut down your Mac.
+  3. Then turn it on and immediately press and hold these four keys together: Option, Command, P, and R.
+  4. You can release the keys after about 20 seconds, during which your Mac might appear to restart.
+
+After reboot you can go ahead to pairing your Proxmark3 RDV4 Blue Shark:
+
+  5. Make sure the Blue Shark BT switch is turned ON
+  6. On your Mac, choose Apple menu -> System Preferences, then click Bluetooth.
+  7. Select the device in the list, then click Connect and add the 1234 pwd.
+
+
 ### 6.	OTHER NOTES
 
 #### (1)	UART and LED behavior

From e3590135634d0cedd0a54f79525252291da26216 Mon Sep 17 00:00:00 2001
From: Eric Betts <bettse@fastmail.fm>
Date: Sat, 22 Jun 2019 14:35:29 -0700
Subject: [PATCH 1936/1938] Add homebrew details to blueshark manual

---
 doc/bt_manual_v10.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/bt_manual_v10.md b/doc/bt_manual_v10.md
index 7508b902d..88f2acdaf 100644
--- a/doc/bt_manual_v10.md
+++ b/doc/bt_manual_v10.md
@@ -44,6 +44,8 @@ Built-in battery can support standalone mode, off-line sniffing, off-line readin
 
 ### 4.	COMPILATION / FLASHING
 
+#### From Source
+
 Please download the latest source code from Rfid Research Group's Github repo:
 https://github.com/RfidResearchGroup/proxmark3
 
@@ -58,6 +60,12 @@ To compile the client and firmware with FPC support, the easiest way is to
 You are now ready to run the client with the serial port you got from your BT device on your laptop etc.  
 See instructions below.
 
+#### Homebrew (macOS)
+From the [homebrew-proxmark3 readme](https://github.com/RfidResearchGroup/homebrew-proxmark3)
+
+1. `brew tap rfidresearchgroup/proxmark3`
+2. `brew install --with-blueshark proxmark3`
+
 ### 5.	CONNECT WITH BLUETOOTH
 
 You can have both USB cable connect and BT active at the same time and connect to either serial port.  

From 7e1d4a54adb53313537ffe33868387ef76cc6f52 Mon Sep 17 00:00:00 2001
From: Jacopo Jannone <jacopo.jannone@jacopojannone.com>
Date: Sun, 23 Jun 2019 11:53:48 +0200
Subject: [PATCH 1937/1938] Fix syntax errors with Calypso & 14443b Lua

---
 client/lualibs/read14b.lua | 4 ++--
 client/scripts/calypso.lua | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/lualibs/read14b.lua b/client/lualibs/read14b.lua
index 3102acb04..0421bee5b 100644
--- a/client/lualibs/read14b.lua
+++ b/client/lualibs/read14b.lua
@@ -112,7 +112,7 @@ end
 -- turns on the HF field.
 local function connect14443b()
     local c = Command:newMIX{cmd = cmds.CMD_ISO_14443B_COMMAND, arg1 = ISO14B_COMMAND.ISO14B_CONNECT}
-    return c.sendMIX(true)
+    return c:sendMIX(true)
 end
 ---
 -- Sends an instruction to do nothing, only disconnect
@@ -120,7 +120,7 @@ local function disconnect14443b()
     local c = Command:newMIX{cmd = cmds.CMD_ISO_14443B_COMMAND, arg1 = ISO14B_COMMAND.ISO14B_DISCONNECT}
     -- We can ignore the response here, no ACK is returned for this command
     -- Check /armsrc/iso14443b.c, ReaderIso14443b() for details
-    return c.sendMIX(true)
+    return c:sendMIX(true)
 end
 
 local library = {
diff --git a/client/scripts/calypso.lua b/client/scripts/calypso.lua
index 696f08e8b..de512c5c8 100644
--- a/client/scripts/calypso.lua
+++ b/client/scripts/calypso.lua
@@ -68,7 +68,7 @@ local function help()
     print(desc)
     print('Example usage')
     print(example)
-    print(usage))
+    print(usage)
 end
 --
 -- helper function,  give current count of items in lua-table.

From c6d245b8439786084b2758acb75a7e0fd93f7ec4 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 23 Jun 2019 08:13:17 -0400
Subject: [PATCH 1938/1938] fix: syntax erros in luascripts

---
 client/lualibs/emulator.lua   | 6 +++---
 client/lualibs/read15.lua     | 2 +-
 client/scripts/amiibo.lua     | 4 ++--
 client/scripts/mifareplus.lua | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/client/lualibs/emulator.lua b/client/lualibs/emulator.lua
index 843d8f9f1..af92d5cf8 100644
--- a/client/lualibs/emulator.lua
+++ b/client/lualibs/emulator.lua
@@ -14,7 +14,7 @@ function Emulator:set_mem (data, clear_first)
         -- Clear out the emulator memory first
         local memclrCmd = Command:newMIX{cmd = cmds.CMD_MIFARE_EML_MEMCLR}
 
-        local _, err = memclrCmd.sendMIX()
+        local _, err = memclrCmd:sendMIX()
         if err then
             print('Failed to clear emulator memory:', err)
             return false
@@ -36,7 +36,7 @@ function Emulator:set_mem (data, clear_first)
                                        arg2 = self.BLOCK_COUNT}
 
       -- Send command and wait for response
-      local _, err = memsetCmd.sendMIX()
+      local _, err = memsetCmd:sendMIX()
       if err then
          print('Failed setting memory', err)
          return false
@@ -62,7 +62,7 @@ function Emulator:get_mem (size)
                                        arg2 = MAX_BLOCKS,
                                        arg3 = 0}
 
-      local response, err = getmemCmd.sendMIX()
+      local response, err = getmemCmd:sendMIX()
       if err then
          print('Failed getting memory:', err)
          return false
diff --git a/client/lualibs/read15.lua b/client/lualibs/read15.lua
index 88cce5484..0b9a6476e 100644
--- a/client/lualibs/read15.lua
+++ b/client/lualibs/read15.lua
@@ -147,7 +147,7 @@ local function disconnect15693()
     local c = Command:newMIX{cmd = cmds.CMD_ISO_15693_COMMAND}
     -- We can ignore the response here, no ACK is returned for this command
     -- Check /armsrc/iso14443a.c, ReaderIso14443a() for details
-    return c.sendMIX(true)
+    return c:sendMIX(true)
 end
 
 local library = {
diff --git a/client/scripts/amiibo.lua b/client/scripts/amiibo.lua
index 3d8e026dd..73366de02 100644
--- a/client/scripts/amiibo.lua
+++ b/client/scripts/amiibo.lua
@@ -21,7 +21,7 @@ local function nfc_read_amiibo ()
                 arg2 = 135
                 }
 
-   local result, err = command.sendMIX()
+   local result, err = command:sendMIX()
    if result then
       -- Do Mifare Ultralight read
       local count, cmd, arg0, data_len, offset = bin.unpack('LLLL', result)
@@ -95,7 +95,7 @@ local function emulate_amiibo (amiibo_data)
                 arg2 = uid_first,
                 arg3 = uid_second
                 }
-   local _, err = simCmd.sendMIX()
+   local _, err = simCmd:sendMIX()
    if err then
       print('Failed to start simulator', err)
       return
diff --git a/client/scripts/mifareplus.lua b/client/scripts/mifareplus.lua
index 02e1e6c76..a81be26d8 100644
--- a/client/scripts/mifareplus.lua
+++ b/client/scripts/mifareplus.lua
@@ -80,7 +80,7 @@ local function sendRaw(rawdata, crc, power)
                                 data = rawdata
                                 }
     local ignore_response = false
-    local result, err = command.sendMIX(ignore_response)
+    local result, err = command:sendMIX(ignore_response)
     if result then
         --unpack the first 4 parts of the result as longs, and the last as an extremely long string to later be cut down based on arg1, the number of bytes returned
         local count,cmd,arg1,arg2,arg3,data = bin.unpack('LLLLH512',result)